diff --git a/.gitmodules b/.gitmodules
index 557bbbb..0a2d772 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,8 +1,9 @@
-[submodule "libs/protobuf/third_party/googletest"]
-	path = libs/protobuf/third_party/googletest
-	url = https://github.com/google/googletest.git
-	ignore = dirty
-
-[submodule "libs/protobuf/third_party/benchmark"]
-	path = libs/protobuf/third_party/benchmark
-	url = https://github.com/google/benchmark.git
+[submodule "protobuf"]
+	path = libs/protobuf
+	url = https://github.com/protocolbuffers/protobuf.git
+[submodule "libs/libzmq"]
+	path = libs/libzmq
+	url = https://github.com/zeromq/libzmq.git
+[submodule "libs/cppzmq"]
+	path = libs/cppzmq
+	url = https://github.com/zeromq/cppzmq.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9917cf8..ef9ee21 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,11 +25,13 @@ IF(NOT TARGET cppzmq)
 ENDIF()
 
 
-
+IF(NOT TARGET protobuf)
+set(ABSL_PROPAGATE_CXX_STD ON CACHE INTERNAL "")
 set(protobuf_BUILD_TESTS OFF CACHE INTERNAL "")
 set(protobuf_BUILD_EXAMPLES OFF CACHE INTERNAL "")
 add_subdirectory(libs/protobuf )
 include(protobuf)
+ENDIF()
 
 protobuf_generate_cpp(PROTO_PATH  include/WHISPER/Messages/Protos/ CPP_PATH include/WHISPER/Messages/Protos HPP_PATH include/WHISPER/Messages/Protos)
 
diff --git a/include/WHISPER/Messages/Protos/join.pb.cc b/include/WHISPER/Messages/Protos/join.pb.cc
index 2abbb8b..de0a927 100644
--- a/include/WHISPER/Messages/Protos/join.pb.cc
+++ b/include/WHISPER/Messages/Protos/join.pb.cc
@@ -4,274 +4,300 @@
 #include "join.pb.h"
 
 #include <algorithm>
-
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/extension_set.h>
-#include <google/protobuf/wire_format_lite.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/generated_message_reflection.h>
-#include <google/protobuf/reflection_ops.h>
-#include <google/protobuf/wire_format.h>
+#include "google/protobuf/io/coded_stream.h"
+#include "google/protobuf/extension_set.h"
+#include "google/protobuf/wire_format_lite.h"
+#include "google/protobuf/descriptor.h"
+#include "google/protobuf/generated_message_reflection.h"
+#include "google/protobuf/reflection_ops.h"
+#include "google/protobuf/wire_format.h"
+#include "google/protobuf/generated_message_tctable_impl.h"
 // @@protoc_insertion_point(includes)
-#include <google/protobuf/port_def.inc>
 
+// Must be included last.
+#include "google/protobuf/port_def.inc"
 PROTOBUF_PRAGMA_INIT_SEG
-
-namespace _pb = ::PROTOBUF_NAMESPACE_ID;
-namespace _pbi = _pb::internal;
-
+namespace _pb = ::google::protobuf;
+namespace _pbi = ::google::protobuf::internal;
+namespace _fl = ::google::protobuf::internal::field_layout;
 namespace messages {
 namespace join {
-PROTOBUF_CONSTEXPR Join::Join(
-    ::_pbi::ConstantInitialized): _impl_{
-    /*decltype(_impl_.srcaddress_)*/{&::_pbi::fixed_address_empty_string, ::_pbi::ConstantInitialized{}}
-  , /*decltype(_impl_.port_)*/0u
-  , /*decltype(_impl_._cached_size_)*/{}} {}
+
+inline constexpr Join::Impl_::Impl_(
+    ::_pbi::ConstantInitialized) noexcept
+      : srcaddress_(
+            &::google::protobuf::internal::fixed_address_empty_string,
+            ::_pbi::ConstantInitialized()),
+        port_{0u},
+        _cached_size_{0} {}
+
+template <typename>
+PROTOBUF_CONSTEXPR Join::Join(::_pbi::ConstantInitialized)
+    : _impl_(::_pbi::ConstantInitialized()) {}
 struct JoinDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR JoinDefaultTypeInternal()
-      : _instance(::_pbi::ConstantInitialized{}) {}
+  PROTOBUF_CONSTEXPR JoinDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
   ~JoinDefaultTypeInternal() {}
   union {
     Join _instance;
   };
 };
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 JoinDefaultTypeInternal _Join_default_instance_;
+
+PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
+    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 JoinDefaultTypeInternal _Join_default_instance_;
 }  // namespace join
 }  // namespace messages
 static ::_pb::Metadata file_level_metadata_join_2eproto[1];
-static constexpr ::_pb::EnumDescriptor const** file_level_enum_descriptors_join_2eproto = nullptr;
-static constexpr ::_pb::ServiceDescriptor const** file_level_service_descriptors_join_2eproto = nullptr;
-
-const uint32_t TableStruct_join_2eproto::offsets[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = {
-  ~0u,  // no _has_bits_
-  PROTOBUF_FIELD_OFFSET(::messages::join::Join, _internal_metadata_),
-  ~0u,  // no _extensions_
-  ~0u,  // no _oneof_case_
-  ~0u,  // no _weak_field_map_
-  ~0u,  // no _inlined_string_donated_
-  PROTOBUF_FIELD_OFFSET(::messages::join::Join, _impl_.port_),
-  PROTOBUF_FIELD_OFFSET(::messages::join::Join, _impl_.srcaddress_),
+static constexpr const ::_pb::EnumDescriptor**
+    file_level_enum_descriptors_join_2eproto = nullptr;
+static constexpr const ::_pb::ServiceDescriptor**
+    file_level_service_descriptors_join_2eproto = nullptr;
+const ::uint32_t
+    TableStruct_join_2eproto::offsets[] ABSL_ATTRIBUTE_SECTION_VARIABLE(
+        protodesc_cold) = {
+        ~0u,  // no _has_bits_
+        PROTOBUF_FIELD_OFFSET(::messages::join::Join, _internal_metadata_),
+        ~0u,  // no _extensions_
+        ~0u,  // no _oneof_case_
+        ~0u,  // no _weak_field_map_
+        ~0u,  // no _inlined_string_donated_
+        ~0u,  // no _split_
+        ~0u,  // no sizeof(Split)
+        PROTOBUF_FIELD_OFFSET(::messages::join::Join, _impl_.port_),
+        PROTOBUF_FIELD_OFFSET(::messages::join::Join, _impl_.srcaddress_),
 };
-static const ::_pbi::MigrationSchema schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = {
-  { 0, -1, -1, sizeof(::messages::join::Join)},
+
+static const ::_pbi::MigrationSchema
+    schemas[] ABSL_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
+        {0, -1, -1, sizeof(::messages::join::Join)},
 };
 
 static const ::_pb::Message* const file_default_instances[] = {
-  &::messages::join::_Join_default_instance_._instance,
+    &::messages::join::_Join_default_instance_._instance,
 };
-
-const char descriptor_table_protodef_join_2eproto[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) =
-  "\n\njoin.proto\022\rmessages.join\"(\n\004Join\022\014\n\004p"
-  "ort\030\001 \001(\r\022\022\n\nsrcAddress\030\002 \001(\tb\006proto3"
-  ;
-static ::_pbi::once_flag descriptor_table_join_2eproto_once;
+const char descriptor_table_protodef_join_2eproto[] ABSL_ATTRIBUTE_SECTION_VARIABLE(
+    protodesc_cold) = {
+    "\n\njoin.proto\022\rmessages.join\"(\n\004Join\022\014\n\004p"
+    "ort\030\001 \001(\r\022\022\n\nsrcAddress\030\002 \001(\tb\006proto3"
+};
+static ::absl::once_flag descriptor_table_join_2eproto_once;
 const ::_pbi::DescriptorTable descriptor_table_join_2eproto = {
-    false, false, 77, descriptor_table_protodef_join_2eproto,
+    false,
+    false,
+    77,
+    descriptor_table_protodef_join_2eproto,
     "join.proto",
-    &descriptor_table_join_2eproto_once, nullptr, 0, 1,
-    schemas, file_default_instances, TableStruct_join_2eproto::offsets,
-    file_level_metadata_join_2eproto, file_level_enum_descriptors_join_2eproto,
+    &descriptor_table_join_2eproto_once,
+    nullptr,
+    0,
+    1,
+    schemas,
+    file_default_instances,
+    TableStruct_join_2eproto::offsets,
+    file_level_metadata_join_2eproto,
+    file_level_enum_descriptors_join_2eproto,
     file_level_service_descriptors_join_2eproto,
 };
+
+// This function exists to be marked as weak.
+// It can significantly speed up compilation by breaking up LLVM's SCC
+// in the .pb.cc translation units. Large translation units see a
+// reduction of more than 35% of walltime for optimized builds. Without
+// the weak attribute all the messages in the file, including all the
+// vtables and everything they use become part of the same SCC through
+// a cycle like:
+// GetMetadata -> descriptor table -> default instances ->
+//   vtables -> GetMetadata
+// By adding a weak function here we break the connection from the
+// individual vtables back into the descriptor table.
 PROTOBUF_ATTRIBUTE_WEAK const ::_pbi::DescriptorTable* descriptor_table_join_2eproto_getter() {
   return &descriptor_table_join_2eproto;
 }
-
 // Force running AddDescriptors() at dynamic initialization time.
-PROTOBUF_ATTRIBUTE_INIT_PRIORITY2 static ::_pbi::AddDescriptorsRunner dynamic_init_dummy_join_2eproto(&descriptor_table_join_2eproto);
+PROTOBUF_ATTRIBUTE_INIT_PRIORITY2
+static ::_pbi::AddDescriptorsRunner dynamic_init_dummy_join_2eproto(&descriptor_table_join_2eproto);
 namespace messages {
 namespace join {
-
 // ===================================================================
 
 class Join::_Internal {
  public:
 };
 
-Join::Join(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                         bool is_message_owned)
-  : ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned) {
-  SharedCtor(arena, is_message_owned);
+Join::Join(::google::protobuf::Arena* arena)
+    : ::google::protobuf::Message(arena) {
+  SharedCtor(arena);
   // @@protoc_insertion_point(arena_constructor:messages.join.Join)
 }
-Join::Join(const Join& from)
-  : ::PROTOBUF_NAMESPACE_ID::Message() {
-  Join* const _this = this; (void)_this;
-  new (&_impl_) Impl_{
-      decltype(_impl_.srcaddress_){}
-    , decltype(_impl_.port_){}
-    , /*decltype(_impl_._cached_size_)*/{}};
+inline PROTOBUF_NDEBUG_INLINE Join::Impl_::Impl_(
+    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
+    const Impl_& from)
+      : srcaddress_(arena, from.srcaddress_),
+        _cached_size_{0} {}
+
+Join::Join(
+    ::google::protobuf::Arena* arena,
+    const Join& from)
+    : ::google::protobuf::Message(arena) {
+  Join* const _this = this;
+  (void)_this;
+  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
+      from._internal_metadata_);
+  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
+  _impl_.port_ = from._impl_.port_;
 
-  _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-  _impl_.srcaddress_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.srcaddress_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (!from._internal_srcaddress().empty()) {
-    _this->_impl_.srcaddress_.Set(from._internal_srcaddress(), 
-      _this->GetArenaForAllocation());
-  }
-  _this->_impl_.port_ = from._impl_.port_;
   // @@protoc_insertion_point(copy_constructor:messages.join.Join)
 }
+inline PROTOBUF_NDEBUG_INLINE Join::Impl_::Impl_(
+    ::google::protobuf::internal::InternalVisibility visibility,
+    ::google::protobuf::Arena* arena)
+      : srcaddress_(arena),
+        _cached_size_{0} {}
 
-inline void Join::SharedCtor(
-    ::_pb::Arena* arena, bool is_message_owned) {
-  (void)arena;
-  (void)is_message_owned;
-  new (&_impl_) Impl_{
-      decltype(_impl_.srcaddress_){}
-    , decltype(_impl_.port_){0u}
-    , /*decltype(_impl_._cached_size_)*/{}
-  };
-  _impl_.srcaddress_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.srcaddress_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+inline void Join::SharedCtor(::_pb::Arena* arena) {
+  new (&_impl_) Impl_(internal_visibility(), arena);
+  _impl_.port_ = {};
 }
-
 Join::~Join() {
   // @@protoc_insertion_point(destructor:messages.join.Join)
-  if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) {
-  (void)arena;
-    return;
-  }
+  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
   SharedDtor();
 }
-
 inline void Join::SharedDtor() {
-  GOOGLE_DCHECK(GetArenaForAllocation() == nullptr);
+  ABSL_DCHECK(GetArena() == nullptr);
   _impl_.srcaddress_.Destroy();
+  _impl_.~Impl_();
 }
 
-void Join::SetCachedSize(int size) const {
-  _impl_._cached_size_.Set(size);
+const ::google::protobuf::MessageLite::ClassData*
+Join::GetClassData() const {
+  PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::ClassData
+      _data_ = {
+          Join::MergeImpl,
+           nullptr,  // OnDemandRegisterArenaDtor
+           &::google::protobuf::Message::kDescriptorMethods,
+              PROTOBUF_FIELD_OFFSET(Join, _impl_._cached_size_),
+      };
+  return &_data_;
 }
-
-void Join::Clear() {
+PROTOBUF_NOINLINE void Join::Clear() {
 // @@protoc_insertion_point(message_clear_start:messages.join.Join)
-  uint32_t cached_has_bits = 0;
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  ::uint32_t cached_has_bits = 0;
   // Prevent compiler warnings about cached_has_bits being unused
   (void) cached_has_bits;
 
   _impl_.srcaddress_.ClearToEmpty();
   _impl_.port_ = 0u;
-  _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>();
+  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
 }
 
-const char* Join::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) {
-#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure
-  while (!ctx->Done(&ptr)) {
-    uint32_t tag;
-    ptr = ::_pbi::ReadTag(ptr, &tag);
-    switch (tag >> 3) {
-      // uint32 port = 1;
-      case 1:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 8)) {
-          _impl_.port_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr);
-          CHK_(ptr);
-        } else
-          goto handle_unusual;
-        continue;
-      // string srcAddress = 2;
-      case 2:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 18)) {
-          auto str = _internal_mutable_srcaddress();
-          ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx);
-          CHK_(ptr);
-          CHK_(::_pbi::VerifyUTF8(str, "messages.join.Join.srcAddress"));
-        } else
-          goto handle_unusual;
-        continue;
-      default:
-        goto handle_unusual;
-    }  // switch
-  handle_unusual:
-    if ((tag == 0) || ((tag & 7) == 4)) {
-      CHK_(ptr);
-      ctx->SetLastTag(tag);
-      goto message_done;
-    }
-    ptr = UnknownFieldParse(
-        tag,
-        _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(),
-        ptr, ctx);
-    CHK_(ptr != nullptr);
-  }  // while
-message_done:
+const char* Join::_InternalParse(
+    const char* ptr, ::_pbi::ParseContext* ctx) {
+  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
   return ptr;
-failure:
-  ptr = nullptr;
-  goto message_done;
-#undef CHK_
 }
 
-uint8_t* Join::_InternalSerialize(
-    uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const {
+
+PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
+const ::_pbi::TcParseTable<1, 2, 0, 37, 2> Join::_table_ = {
+  {
+    0,  // no _has_bits_
+    0, // no _extensions_
+    2, 8,  // max_field_number, fast_idx_mask
+    offsetof(decltype(_table_), field_lookup_table),
+    4294967292,  // skipmap
+    offsetof(decltype(_table_), field_entries),
+    2,  // num_field_entries
+    0,  // num_aux_entries
+    offsetof(decltype(_table_), field_names),  // no aux_entries
+    &_Join_default_instance_._instance,
+    ::_pbi::TcParser::GenericFallback,  // fallback
+  }, {{
+    // string srcAddress = 2;
+    {::_pbi::TcParser::FastUS1,
+     {18, 63, 0, PROTOBUF_FIELD_OFFSET(Join, _impl_.srcaddress_)}},
+    // uint32 port = 1;
+    {::_pbi::TcParser::SingularVarintNoZag1<::uint32_t, offsetof(Join, _impl_.port_), 63>(),
+     {8, 63, 0, PROTOBUF_FIELD_OFFSET(Join, _impl_.port_)}},
+  }}, {{
+    65535, 65535
+  }}, {{
+    // uint32 port = 1;
+    {PROTOBUF_FIELD_OFFSET(Join, _impl_.port_), 0, 0,
+    (0 | ::_fl::kFcSingular | ::_fl::kUInt32)},
+    // string srcAddress = 2;
+    {PROTOBUF_FIELD_OFFSET(Join, _impl_.srcaddress_), 0, 0,
+    (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)},
+  }},
+  // no aux_entries
+  {{
+    "\22\0\12\0\0\0\0\0"
+    "messages.join.Join"
+    "srcAddress"
+  }},
+};
+
+::uint8_t* Join::_InternalSerialize(
+    ::uint8_t* target,
+    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
   // @@protoc_insertion_point(serialize_to_array_start:messages.join.Join)
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
+  ::uint32_t cached_has_bits = 0;
+  (void)cached_has_bits;
 
   // uint32 port = 1;
   if (this->_internal_port() != 0) {
     target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteUInt32ToArray(1, this->_internal_port(), target);
+    target = ::_pbi::WireFormatLite::WriteUInt32ToArray(
+        1, this->_internal_port(), target);
   }
 
   // string srcAddress = 2;
   if (!this->_internal_srcaddress().empty()) {
-    ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String(
-      this->_internal_srcaddress().data(), static_cast<int>(this->_internal_srcaddress().length()),
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE,
-      "messages.join.Join.srcAddress");
-    target = stream->WriteStringMaybeAliased(
-        2, this->_internal_srcaddress(), target);
+    const std::string& _s = this->_internal_srcaddress();
+    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
+        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "messages.join.Join.srcAddress");
+    target = stream->WriteStringMaybeAliased(2, _s, target);
   }
 
   if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-        _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream);
+    target =
+        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
+            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
   }
   // @@protoc_insertion_point(serialize_to_array_end:messages.join.Join)
   return target;
 }
 
-size_t Join::ByteSizeLong() const {
+::size_t Join::ByteSizeLong() const {
 // @@protoc_insertion_point(message_byte_size_start:messages.join.Join)
-  size_t total_size = 0;
+  ::size_t total_size = 0;
 
-  uint32_t cached_has_bits = 0;
+  ::uint32_t cached_has_bits = 0;
   // Prevent compiler warnings about cached_has_bits being unused
   (void) cached_has_bits;
 
   // string srcAddress = 2;
   if (!this->_internal_srcaddress().empty()) {
-    total_size += 1 +
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize(
-        this->_internal_srcaddress());
+    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
+                                    this->_internal_srcaddress());
   }
 
   // uint32 port = 1;
   if (this->_internal_port() != 0) {
-    total_size += ::_pbi::WireFormatLite::UInt32SizePlusOne(this->_internal_port());
+    total_size += ::_pbi::WireFormatLite::UInt32SizePlusOne(
+        this->_internal_port());
   }
 
   return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
 }
 
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData Join::_class_data_ = {
-    ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck,
-    Join::MergeImpl
-};
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*Join::GetClassData() const { return &_class_data_; }
 
-
-void Join::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) {
+void Join::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
   auto* const _this = static_cast<Join*>(&to_msg);
   auto& from = static_cast<const Join&>(from_msg);
   // @@protoc_insertion_point(class_specific_merge_from_start:messages.join.Join)
-  GOOGLE_DCHECK_NE(&from, _this);
-  uint32_t cached_has_bits = 0;
+  ABSL_DCHECK_NE(&from, _this);
+  ::uint32_t cached_has_bits = 0;
   (void) cached_has_bits;
 
   if (!from._internal_srcaddress().empty()) {
@@ -280,7 +306,7 @@ void Join::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_
   if (from._internal_port() != 0) {
     _this->_internal_set_port(from._internal_port());
   }
-  _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
+  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
 }
 
 void Join::CopyFrom(const Join& from) {
@@ -290,37 +316,30 @@ void Join::CopyFrom(const Join& from) {
   MergeFrom(from);
 }
 
-bool Join::IsInitialized() const {
+PROTOBUF_NOINLINE bool Join::IsInitialized() const {
   return true;
 }
 
-void Join::InternalSwap(Join* other) {
+void Join::InternalSwap(Join* PROTOBUF_RESTRICT other) {
   using std::swap;
-  auto* lhs_arena = GetArenaForAllocation();
-  auto* rhs_arena = other->GetArenaForAllocation();
+  auto* arena = GetArena();
+  ABSL_DCHECK_EQ(arena, other->GetArena());
   _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::InternalSwap(
-      &_impl_.srcaddress_, lhs_arena,
-      &other->_impl_.srcaddress_, rhs_arena
-  );
-  swap(_impl_.port_, other->_impl_.port_);
+  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.srcaddress_, &other->_impl_.srcaddress_, arena);
+        swap(_impl_.port_, other->_impl_.port_);
 }
 
-::PROTOBUF_NAMESPACE_ID::Metadata Join::GetMetadata() const {
+::google::protobuf::Metadata Join::GetMetadata() const {
   return ::_pbi::AssignDescriptors(
       &descriptor_table_join_2eproto_getter, &descriptor_table_join_2eproto_once,
       file_level_metadata_join_2eproto[0]);
 }
-
 // @@protoc_insertion_point(namespace_scope)
 }  // namespace join
 }  // namespace messages
-PROTOBUF_NAMESPACE_OPEN
-template<> PROTOBUF_NOINLINE ::messages::join::Join*
-Arena::CreateMaybeMessage< ::messages::join::Join >(Arena* arena) {
-  return Arena::CreateMessageInternal< ::messages::join::Join >(arena);
-}
-PROTOBUF_NAMESPACE_CLOSE
-
+namespace google {
+namespace protobuf {
+}  // namespace protobuf
+}  // namespace google
 // @@protoc_insertion_point(global_scope)
-#include <google/protobuf/port_undef.inc>
+#include "google/protobuf/port_undef.inc"
diff --git a/include/WHISPER/Messages/Protos/join.pb.h b/include/WHISPER/Messages/Protos/join.pb.h
index 4ca2e52..264485b 100644
--- a/include/WHISPER/Messages/Protos/join.pb.h
+++ b/include/WHISPER/Messages/Protos/join.pb.h
@@ -1,49 +1,60 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: join.proto
+// Protobuf C++ Version: 4.24.0-main
 
-#ifndef GOOGLE_PROTOBUF_INCLUDED_join_2eproto
-#define GOOGLE_PROTOBUF_INCLUDED_join_2eproto
+#ifndef GOOGLE_PROTOBUF_INCLUDED_join_2eproto_2epb_2eh
+#define GOOGLE_PROTOBUF_INCLUDED_join_2eproto_2epb_2eh
 
 #include <limits>
 #include <string>
+#include <type_traits>
+#include <utility>
 
-#include <google/protobuf/port_def.inc>
-#if PROTOBUF_VERSION < 3021000
-#error This file was generated by a newer version of protoc which is
-#error incompatible with your Protocol Buffer headers. Please update
-#error your headers.
-#endif
-#if 3021012 < PROTOBUF_MIN_PROTOC_VERSION
-#error This file was generated by an older version of protoc which is
-#error incompatible with your Protocol Buffer headers. Please
-#error regenerate this file with a newer version of protoc.
-#endif
+#include "google/protobuf/port_def.inc"
+#if PROTOBUF_VERSION < 4025000
+#error "This file was generated by a newer version of protoc which is"
+#error "incompatible with your Protocol Buffer headers. Please update"
+#error "your headers."
+#endif  // PROTOBUF_VERSION
 
-#include <google/protobuf/port_undef.inc>
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/arena.h>
-#include <google/protobuf/arenastring.h>
-#include <google/protobuf/generated_message_util.h>
-#include <google/protobuf/metadata_lite.h>
-#include <google/protobuf/generated_message_reflection.h>
-#include <google/protobuf/message.h>
-#include <google/protobuf/repeated_field.h>  // IWYU pragma: export
-#include <google/protobuf/extension_set.h>  // IWYU pragma: export
-#include <google/protobuf/unknown_field_set.h>
+#if 4025000 < PROTOBUF_MIN_PROTOC_VERSION
+#error "This file was generated by an older version of protoc which is"
+#error "incompatible with your Protocol Buffer headers. Please"
+#error "regenerate this file with a newer version of protoc."
+#endif  // PROTOBUF_MIN_PROTOC_VERSION
+#include "google/protobuf/port_undef.inc"
+#include "google/protobuf/io/coded_stream.h"
+#include "google/protobuf/arena.h"
+#include "google/protobuf/arenastring.h"
+#include "google/protobuf/generated_message_tctable_decl.h"
+#include "google/protobuf/generated_message_util.h"
+#include "google/protobuf/metadata_lite.h"
+#include "google/protobuf/generated_message_reflection.h"
+#include "google/protobuf/message.h"
+#include "google/protobuf/repeated_field.h"  // IWYU pragma: export
+#include "google/protobuf/extension_set.h"  // IWYU pragma: export
+#include "google/protobuf/unknown_field_set.h"
 // @@protoc_insertion_point(includes)
-#include <google/protobuf/port_def.inc>
+
+// Must be included last.
+#include "google/protobuf/port_def.inc"
+
 #define PROTOBUF_INTERNAL_EXPORT_join_2eproto
-PROTOBUF_NAMESPACE_OPEN
+
+namespace google {
+namespace protobuf {
 namespace internal {
 class AnyMetadata;
 }  // namespace internal
-PROTOBUF_NAMESPACE_CLOSE
+}  // namespace protobuf
+}  // namespace google
 
 // Internal implementation detail -- do not use these members.
 struct TableStruct_join_2eproto {
-  static const uint32_t offsets[];
+  static const ::uint32_t offsets[];
 };
-extern const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable descriptor_table_join_2eproto;
+extern const ::google::protobuf::internal::DescriptorTable
+    descriptor_table_join_2eproto;
 namespace messages {
 namespace join {
 class Join;
@@ -51,22 +62,29 @@ struct JoinDefaultTypeInternal;
 extern JoinDefaultTypeInternal _Join_default_instance_;
 }  // namespace join
 }  // namespace messages
-PROTOBUF_NAMESPACE_OPEN
-template<> ::messages::join::Join* Arena::CreateMaybeMessage<::messages::join::Join>(Arena*);
-PROTOBUF_NAMESPACE_CLOSE
+namespace google {
+namespace protobuf {
+}  // namespace protobuf
+}  // namespace google
+
 namespace messages {
 namespace join {
 
 // ===================================================================
 
+
+// -------------------------------------------------------------------
+
 class Join final :
-    public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:messages.join.Join) */ {
+    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:messages.join.Join) */ {
  public:
   inline Join() : Join(nullptr) {}
   ~Join() override;
-  explicit PROTOBUF_CONSTEXPR Join(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
+  template<typename = void>
+  explicit PROTOBUF_CONSTEXPR Join(::google::protobuf::internal::ConstantInitialized);
 
-  Join(const Join& from);
+  inline Join(const Join& from)
+      : Join(nullptr, from) {}
   Join(Join&& from) noexcept
     : Join() {
     *this = ::std::move(from);
@@ -78,9 +96,9 @@ class Join final :
   }
   inline Join& operator=(Join&& from) noexcept {
     if (this == &from) return *this;
-    if (GetOwningArena() == from.GetOwningArena()
+    if (GetArena() == from.GetArena()
   #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetOwningArena() != nullptr
+        && GetArena() != nullptr
   #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
     ) {
       InternalSwap(&from);
@@ -90,13 +108,22 @@ class Join final :
     return *this;
   }
 
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() {
+  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
+      ABSL_ATTRIBUTE_LIFETIME_BOUND {
+    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
+  }
+  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
+      ABSL_ATTRIBUTE_LIFETIME_BOUND {
+    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
+  }
+
+  static const ::google::protobuf::Descriptor* descriptor() {
     return GetDescriptor();
   }
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() {
+  static const ::google::protobuf::Descriptor* GetDescriptor() {
     return default_instance().GetMetadata().descriptor;
   }
-  static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() {
+  static const ::google::protobuf::Reflection* GetReflection() {
     return default_instance().GetMetadata().reflection;
   }
   static const Join& default_instance() {
@@ -115,65 +142,62 @@ class Join final :
   inline void Swap(Join* other) {
     if (other == this) return;
   #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() != nullptr &&
-        GetOwningArena() == other->GetOwningArena()) {
+    if (GetArena() != nullptr &&
+        GetArena() == other->GetArena()) {
    #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() == other->GetOwningArena()) {
+    if (GetArena() == other->GetArena()) {
   #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
       InternalSwap(other);
     } else {
-      ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
+      ::google::protobuf::internal::GenericSwap(this, other);
     }
   }
   void UnsafeArenaSwap(Join* other) {
     if (other == this) return;
-    GOOGLE_DCHECK(GetOwningArena() == other->GetOwningArena());
+    ABSL_DCHECK(GetArena() == other->GetArena());
     InternalSwap(other);
   }
 
   // implements Message ----------------------------------------------
 
-  Join* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
+  Join* New(::google::protobuf::Arena* arena = nullptr) const final {
     return CreateMaybeMessage<Join>(arena);
   }
-  using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
+  using ::google::protobuf::Message::CopyFrom;
   void CopyFrom(const Join& from);
-  using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
+  using ::google::protobuf::Message::MergeFrom;
   void MergeFrom( const Join& from) {
     Join::MergeImpl(*this, from);
   }
   private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg);
+  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
   public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
+  ABSL_ATTRIBUTE_REINITIALIZES void Clear() final;
   bool IsInitialized() const final;
 
-  size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  uint8_t* _InternalSerialize(
-      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
+  ::size_t ByteSizeLong() const final;
+  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
+  ::uint8_t* _InternalSerialize(
+      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
+  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
 
   private:
-  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
+  void SharedCtor(::google::protobuf::Arena* arena);
   void SharedDtor();
-  void SetCachedSize(int size) const final;
   void InternalSwap(Join* other);
 
   private:
-  friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
-  static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
+  friend class ::google::protobuf::internal::AnyMetadata;
+  static ::absl::string_view FullMessageName() {
     return "messages.join.Join";
   }
   protected:
-  explicit Join(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                       bool is_message_owned = false);
+  explicit Join(::google::protobuf::Arena* arena);
+  Join(::google::protobuf::Arena* arena, const Join& from);
+  const ::google::protobuf::MessageLite::ClassData* GetClassData() const final;
   public:
 
-  static const ClassData _class_data_;
-  const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*GetClassData() const final;
-
-  ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final;
+  ::google::protobuf::Metadata GetMetadata() const final;
 
   // nested types ----------------------------------------------------
 
@@ -184,134 +208,166 @@ class Join final :
     kPortFieldNumber = 1,
   };
   // string srcAddress = 2;
-  void clear_srcaddress();
+  void clear_srcaddress() ;
   const std::string& srcaddress() const;
-  template <typename ArgT0 = const std::string&, typename... ArgT>
-  void set_srcaddress(ArgT0&& arg0, ArgT... args);
+  template <typename Arg_ = const std::string&, typename... Args_>
+  void set_srcaddress(Arg_&& arg, Args_... args);
   std::string* mutable_srcaddress();
   PROTOBUF_NODISCARD std::string* release_srcaddress();
-  void set_allocated_srcaddress(std::string* srcaddress);
+  void set_allocated_srcaddress(std::string* value);
+
   private:
   const std::string& _internal_srcaddress() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_srcaddress(const std::string& value);
+  inline PROTOBUF_ALWAYS_INLINE void _internal_set_srcaddress(
+      const std::string& value);
   std::string* _internal_mutable_srcaddress();
-  public:
 
+  public:
   // uint32 port = 1;
-  void clear_port();
-  uint32_t port() const;
-  void set_port(uint32_t value);
-  private:
-  uint32_t _internal_port() const;
-  void _internal_set_port(uint32_t value);
-  public:
+  void clear_port() ;
+  ::uint32_t port() const;
+  void set_port(::uint32_t value);
 
+  private:
+  ::uint32_t _internal_port() const;
+  void _internal_set_port(::uint32_t value);
+
+  public:
   // @@protoc_insertion_point(class_scope:messages.join.Join)
  private:
   class _Internal;
 
-  template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
-  typedef void InternalArenaConstructable_;
-  typedef void DestructorSkippable_;
+  friend class ::google::protobuf::internal::TcParser;
+  static const ::google::protobuf::internal::TcParseTable<
+      1, 2, 0,
+      37, 2>
+      _table_;
+  friend class ::google::protobuf::MessageLite;
+  friend class ::google::protobuf::Arena;
+  template <typename T>
+  friend class ::google::protobuf::Arena::InternalHelper;
+  using InternalArenaConstructable_ = void;
+  using DestructorSkippable_ = void;
   struct Impl_ {
-    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr srcaddress_;
-    uint32_t port_;
-    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
+
+        inline explicit constexpr Impl_(
+            ::google::protobuf::internal::ConstantInitialized) noexcept;
+        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
+                              ::google::protobuf::Arena* arena);
+        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
+                              ::google::protobuf::Arena* arena, const Impl_& from);
+    ::google::protobuf::internal::ArenaStringPtr srcaddress_;
+    ::uint32_t port_;
+    mutable ::google::protobuf::internal::CachedSize _cached_size_;
+    PROTOBUF_TSAN_DECLARE_MEMBER
   };
   union { Impl_ _impl_; };
   friend struct ::TableStruct_join_2eproto;
 };
+
 // ===================================================================
 
 
+
+
 // ===================================================================
 
+
 #ifdef __GNUC__
-  #pragma GCC diagnostic push
-  #pragma GCC diagnostic ignored "-Wstrict-aliasing"
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wstrict-aliasing"
 #endif  // __GNUC__
+// -------------------------------------------------------------------
+
 // Join
 
 // uint32 port = 1;
 inline void Join::clear_port() {
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_.port_ = 0u;
 }
-inline uint32_t Join::_internal_port() const {
-  return _impl_.port_;
-}
-inline uint32_t Join::port() const {
+inline ::uint32_t Join::port() const {
   // @@protoc_insertion_point(field_get:messages.join.Join.port)
   return _internal_port();
 }
-inline void Join::_internal_set_port(uint32_t value) {
-  
-  _impl_.port_ = value;
-}
-inline void Join::set_port(uint32_t value) {
+inline void Join::set_port(::uint32_t value) {
   _internal_set_port(value);
   // @@protoc_insertion_point(field_set:messages.join.Join.port)
 }
+inline ::uint32_t Join::_internal_port() const {
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  return _impl_.port_;
+}
+inline void Join::_internal_set_port(::uint32_t value) {
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  ;
+  _impl_.port_ = value;
+}
 
 // string srcAddress = 2;
 inline void Join::clear_srcaddress() {
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_.srcaddress_.ClearToEmpty();
 }
-inline const std::string& Join::srcaddress() const {
+inline const std::string& Join::srcaddress() const
+    ABSL_ATTRIBUTE_LIFETIME_BOUND {
   // @@protoc_insertion_point(field_get:messages.join.Join.srcAddress)
   return _internal_srcaddress();
 }
-template <typename ArgT0, typename... ArgT>
-inline PROTOBUF_ALWAYS_INLINE
-void Join::set_srcaddress(ArgT0&& arg0, ArgT... args) {
- 
- _impl_.srcaddress_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+template <typename Arg_, typename... Args_>
+inline PROTOBUF_ALWAYS_INLINE void Join::set_srcaddress(Arg_&& arg,
+                                                     Args_... args) {
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  ;
+  _impl_.srcaddress_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
   // @@protoc_insertion_point(field_set:messages.join.Join.srcAddress)
 }
-inline std::string* Join::mutable_srcaddress() {
+inline std::string* Join::mutable_srcaddress() ABSL_ATTRIBUTE_LIFETIME_BOUND {
   std::string* _s = _internal_mutable_srcaddress();
   // @@protoc_insertion_point(field_mutable:messages.join.Join.srcAddress)
   return _s;
 }
 inline const std::string& Join::_internal_srcaddress() const {
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.srcaddress_.Get();
 }
 inline void Join::_internal_set_srcaddress(const std::string& value) {
-  
-  _impl_.srcaddress_.Set(value, GetArenaForAllocation());
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  ;
+  _impl_.srcaddress_.Set(value, GetArena());
 }
 inline std::string* Join::_internal_mutable_srcaddress() {
-  
-  return _impl_.srcaddress_.Mutable(GetArenaForAllocation());
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  ;
+  return _impl_.srcaddress_.Mutable( GetArena());
 }
 inline std::string* Join::release_srcaddress() {
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:messages.join.Join.srcAddress)
   return _impl_.srcaddress_.Release();
 }
-inline void Join::set_allocated_srcaddress(std::string* srcaddress) {
-  if (srcaddress != nullptr) {
-    
-  } else {
-    
-  }
-  _impl_.srcaddress_.SetAllocated(srcaddress, GetArenaForAllocation());
-#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (_impl_.srcaddress_.IsDefault()) {
-    _impl_.srcaddress_.Set("", GetArenaForAllocation());
-  }
-#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+inline void Join::set_allocated_srcaddress(std::string* value) {
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  _impl_.srcaddress_.SetAllocated(value, GetArena());
+  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+        if (_impl_.srcaddress_.IsDefault()) {
+          _impl_.srcaddress_.Set("", GetArena());
+        }
+  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:messages.join.Join.srcAddress)
 }
 
 #ifdef __GNUC__
-  #pragma GCC diagnostic pop
+#pragma GCC diagnostic pop
 #endif  // __GNUC__
 
 // @@protoc_insertion_point(namespace_scope)
-
 }  // namespace join
 }  // namespace messages
 
+
 // @@protoc_insertion_point(global_scope)
 
-#include <google/protobuf/port_undef.inc>
-#endif  // GOOGLE_PROTOBUF_INCLUDED_GOOGLE_PROTOBUF_INCLUDED_join_2eproto
+#include "google/protobuf/port_undef.inc"
+
+#endif  // GOOGLE_PROTOBUF_INCLUDED_join_2eproto_2epb_2eh
diff --git a/include/WHISPER/Messages/Protos/leave.pb.cc b/include/WHISPER/Messages/Protos/leave.pb.cc
index 9c650d8..2447cd9 100644
--- a/include/WHISPER/Messages/Protos/leave.pb.cc
+++ b/include/WHISPER/Messages/Protos/leave.pb.cc
@@ -4,274 +4,300 @@
 #include "leave.pb.h"
 
 #include <algorithm>
-
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/extension_set.h>
-#include <google/protobuf/wire_format_lite.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/generated_message_reflection.h>
-#include <google/protobuf/reflection_ops.h>
-#include <google/protobuf/wire_format.h>
+#include "google/protobuf/io/coded_stream.h"
+#include "google/protobuf/extension_set.h"
+#include "google/protobuf/wire_format_lite.h"
+#include "google/protobuf/descriptor.h"
+#include "google/protobuf/generated_message_reflection.h"
+#include "google/protobuf/reflection_ops.h"
+#include "google/protobuf/wire_format.h"
+#include "google/protobuf/generated_message_tctable_impl.h"
 // @@protoc_insertion_point(includes)
-#include <google/protobuf/port_def.inc>
 
+// Must be included last.
+#include "google/protobuf/port_def.inc"
 PROTOBUF_PRAGMA_INIT_SEG
-
-namespace _pb = ::PROTOBUF_NAMESPACE_ID;
-namespace _pbi = _pb::internal;
-
+namespace _pb = ::google::protobuf;
+namespace _pbi = ::google::protobuf::internal;
+namespace _fl = ::google::protobuf::internal::field_layout;
 namespace messages {
 namespace leave {
-PROTOBUF_CONSTEXPR Leave::Leave(
-    ::_pbi::ConstantInitialized): _impl_{
-    /*decltype(_impl_.srcaddress_)*/{&::_pbi::fixed_address_empty_string, ::_pbi::ConstantInitialized{}}
-  , /*decltype(_impl_.port_)*/0u
-  , /*decltype(_impl_._cached_size_)*/{}} {}
+
+inline constexpr Leave::Impl_::Impl_(
+    ::_pbi::ConstantInitialized) noexcept
+      : srcaddress_(
+            &::google::protobuf::internal::fixed_address_empty_string,
+            ::_pbi::ConstantInitialized()),
+        port_{0u},
+        _cached_size_{0} {}
+
+template <typename>
+PROTOBUF_CONSTEXPR Leave::Leave(::_pbi::ConstantInitialized)
+    : _impl_(::_pbi::ConstantInitialized()) {}
 struct LeaveDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR LeaveDefaultTypeInternal()
-      : _instance(::_pbi::ConstantInitialized{}) {}
+  PROTOBUF_CONSTEXPR LeaveDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
   ~LeaveDefaultTypeInternal() {}
   union {
     Leave _instance;
   };
 };
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 LeaveDefaultTypeInternal _Leave_default_instance_;
+
+PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
+    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 LeaveDefaultTypeInternal _Leave_default_instance_;
 }  // namespace leave
 }  // namespace messages
 static ::_pb::Metadata file_level_metadata_leave_2eproto[1];
-static constexpr ::_pb::EnumDescriptor const** file_level_enum_descriptors_leave_2eproto = nullptr;
-static constexpr ::_pb::ServiceDescriptor const** file_level_service_descriptors_leave_2eproto = nullptr;
-
-const uint32_t TableStruct_leave_2eproto::offsets[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = {
-  ~0u,  // no _has_bits_
-  PROTOBUF_FIELD_OFFSET(::messages::leave::Leave, _internal_metadata_),
-  ~0u,  // no _extensions_
-  ~0u,  // no _oneof_case_
-  ~0u,  // no _weak_field_map_
-  ~0u,  // no _inlined_string_donated_
-  PROTOBUF_FIELD_OFFSET(::messages::leave::Leave, _impl_.port_),
-  PROTOBUF_FIELD_OFFSET(::messages::leave::Leave, _impl_.srcaddress_),
+static constexpr const ::_pb::EnumDescriptor**
+    file_level_enum_descriptors_leave_2eproto = nullptr;
+static constexpr const ::_pb::ServiceDescriptor**
+    file_level_service_descriptors_leave_2eproto = nullptr;
+const ::uint32_t
+    TableStruct_leave_2eproto::offsets[] ABSL_ATTRIBUTE_SECTION_VARIABLE(
+        protodesc_cold) = {
+        ~0u,  // no _has_bits_
+        PROTOBUF_FIELD_OFFSET(::messages::leave::Leave, _internal_metadata_),
+        ~0u,  // no _extensions_
+        ~0u,  // no _oneof_case_
+        ~0u,  // no _weak_field_map_
+        ~0u,  // no _inlined_string_donated_
+        ~0u,  // no _split_
+        ~0u,  // no sizeof(Split)
+        PROTOBUF_FIELD_OFFSET(::messages::leave::Leave, _impl_.port_),
+        PROTOBUF_FIELD_OFFSET(::messages::leave::Leave, _impl_.srcaddress_),
 };
-static const ::_pbi::MigrationSchema schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = {
-  { 0, -1, -1, sizeof(::messages::leave::Leave)},
+
+static const ::_pbi::MigrationSchema
+    schemas[] ABSL_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
+        {0, -1, -1, sizeof(::messages::leave::Leave)},
 };
 
 static const ::_pb::Message* const file_default_instances[] = {
-  &::messages::leave::_Leave_default_instance_._instance,
+    &::messages::leave::_Leave_default_instance_._instance,
 };
-
-const char descriptor_table_protodef_leave_2eproto[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) =
-  "\n\013leave.proto\022\016messages.leave\")\n\005Leave\022\014"
-  "\n\004port\030\001 \001(\r\022\022\n\nsrcAddress\030\002 \001(\tb\006proto3"
-  ;
-static ::_pbi::once_flag descriptor_table_leave_2eproto_once;
+const char descriptor_table_protodef_leave_2eproto[] ABSL_ATTRIBUTE_SECTION_VARIABLE(
+    protodesc_cold) = {
+    "\n\013leave.proto\022\016messages.leave\")\n\005Leave\022\014"
+    "\n\004port\030\001 \001(\r\022\022\n\nsrcAddress\030\002 \001(\tb\006proto3"
+};
+static ::absl::once_flag descriptor_table_leave_2eproto_once;
 const ::_pbi::DescriptorTable descriptor_table_leave_2eproto = {
-    false, false, 80, descriptor_table_protodef_leave_2eproto,
+    false,
+    false,
+    80,
+    descriptor_table_protodef_leave_2eproto,
     "leave.proto",
-    &descriptor_table_leave_2eproto_once, nullptr, 0, 1,
-    schemas, file_default_instances, TableStruct_leave_2eproto::offsets,
-    file_level_metadata_leave_2eproto, file_level_enum_descriptors_leave_2eproto,
+    &descriptor_table_leave_2eproto_once,
+    nullptr,
+    0,
+    1,
+    schemas,
+    file_default_instances,
+    TableStruct_leave_2eproto::offsets,
+    file_level_metadata_leave_2eproto,
+    file_level_enum_descriptors_leave_2eproto,
     file_level_service_descriptors_leave_2eproto,
 };
+
+// This function exists to be marked as weak.
+// It can significantly speed up compilation by breaking up LLVM's SCC
+// in the .pb.cc translation units. Large translation units see a
+// reduction of more than 35% of walltime for optimized builds. Without
+// the weak attribute all the messages in the file, including all the
+// vtables and everything they use become part of the same SCC through
+// a cycle like:
+// GetMetadata -> descriptor table -> default instances ->
+//   vtables -> GetMetadata
+// By adding a weak function here we break the connection from the
+// individual vtables back into the descriptor table.
 PROTOBUF_ATTRIBUTE_WEAK const ::_pbi::DescriptorTable* descriptor_table_leave_2eproto_getter() {
   return &descriptor_table_leave_2eproto;
 }
-
 // Force running AddDescriptors() at dynamic initialization time.
-PROTOBUF_ATTRIBUTE_INIT_PRIORITY2 static ::_pbi::AddDescriptorsRunner dynamic_init_dummy_leave_2eproto(&descriptor_table_leave_2eproto);
+PROTOBUF_ATTRIBUTE_INIT_PRIORITY2
+static ::_pbi::AddDescriptorsRunner dynamic_init_dummy_leave_2eproto(&descriptor_table_leave_2eproto);
 namespace messages {
 namespace leave {
-
 // ===================================================================
 
 class Leave::_Internal {
  public:
 };
 
-Leave::Leave(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                         bool is_message_owned)
-  : ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned) {
-  SharedCtor(arena, is_message_owned);
+Leave::Leave(::google::protobuf::Arena* arena)
+    : ::google::protobuf::Message(arena) {
+  SharedCtor(arena);
   // @@protoc_insertion_point(arena_constructor:messages.leave.Leave)
 }
-Leave::Leave(const Leave& from)
-  : ::PROTOBUF_NAMESPACE_ID::Message() {
-  Leave* const _this = this; (void)_this;
-  new (&_impl_) Impl_{
-      decltype(_impl_.srcaddress_){}
-    , decltype(_impl_.port_){}
-    , /*decltype(_impl_._cached_size_)*/{}};
+inline PROTOBUF_NDEBUG_INLINE Leave::Impl_::Impl_(
+    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
+    const Impl_& from)
+      : srcaddress_(arena, from.srcaddress_),
+        _cached_size_{0} {}
+
+Leave::Leave(
+    ::google::protobuf::Arena* arena,
+    const Leave& from)
+    : ::google::protobuf::Message(arena) {
+  Leave* const _this = this;
+  (void)_this;
+  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
+      from._internal_metadata_);
+  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
+  _impl_.port_ = from._impl_.port_;
 
-  _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-  _impl_.srcaddress_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.srcaddress_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (!from._internal_srcaddress().empty()) {
-    _this->_impl_.srcaddress_.Set(from._internal_srcaddress(), 
-      _this->GetArenaForAllocation());
-  }
-  _this->_impl_.port_ = from._impl_.port_;
   // @@protoc_insertion_point(copy_constructor:messages.leave.Leave)
 }
+inline PROTOBUF_NDEBUG_INLINE Leave::Impl_::Impl_(
+    ::google::protobuf::internal::InternalVisibility visibility,
+    ::google::protobuf::Arena* arena)
+      : srcaddress_(arena),
+        _cached_size_{0} {}
 
-inline void Leave::SharedCtor(
-    ::_pb::Arena* arena, bool is_message_owned) {
-  (void)arena;
-  (void)is_message_owned;
-  new (&_impl_) Impl_{
-      decltype(_impl_.srcaddress_){}
-    , decltype(_impl_.port_){0u}
-    , /*decltype(_impl_._cached_size_)*/{}
-  };
-  _impl_.srcaddress_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.srcaddress_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+inline void Leave::SharedCtor(::_pb::Arena* arena) {
+  new (&_impl_) Impl_(internal_visibility(), arena);
+  _impl_.port_ = {};
 }
-
 Leave::~Leave() {
   // @@protoc_insertion_point(destructor:messages.leave.Leave)
-  if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) {
-  (void)arena;
-    return;
-  }
+  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
   SharedDtor();
 }
-
 inline void Leave::SharedDtor() {
-  GOOGLE_DCHECK(GetArenaForAllocation() == nullptr);
+  ABSL_DCHECK(GetArena() == nullptr);
   _impl_.srcaddress_.Destroy();
+  _impl_.~Impl_();
 }
 
-void Leave::SetCachedSize(int size) const {
-  _impl_._cached_size_.Set(size);
+const ::google::protobuf::MessageLite::ClassData*
+Leave::GetClassData() const {
+  PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::ClassData
+      _data_ = {
+          Leave::MergeImpl,
+           nullptr,  // OnDemandRegisterArenaDtor
+           &::google::protobuf::Message::kDescriptorMethods,
+              PROTOBUF_FIELD_OFFSET(Leave, _impl_._cached_size_),
+      };
+  return &_data_;
 }
-
-void Leave::Clear() {
+PROTOBUF_NOINLINE void Leave::Clear() {
 // @@protoc_insertion_point(message_clear_start:messages.leave.Leave)
-  uint32_t cached_has_bits = 0;
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  ::uint32_t cached_has_bits = 0;
   // Prevent compiler warnings about cached_has_bits being unused
   (void) cached_has_bits;
 
   _impl_.srcaddress_.ClearToEmpty();
   _impl_.port_ = 0u;
-  _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>();
+  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
 }
 
-const char* Leave::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) {
-#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure
-  while (!ctx->Done(&ptr)) {
-    uint32_t tag;
-    ptr = ::_pbi::ReadTag(ptr, &tag);
-    switch (tag >> 3) {
-      // uint32 port = 1;
-      case 1:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 8)) {
-          _impl_.port_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr);
-          CHK_(ptr);
-        } else
-          goto handle_unusual;
-        continue;
-      // string srcAddress = 2;
-      case 2:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 18)) {
-          auto str = _internal_mutable_srcaddress();
-          ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx);
-          CHK_(ptr);
-          CHK_(::_pbi::VerifyUTF8(str, "messages.leave.Leave.srcAddress"));
-        } else
-          goto handle_unusual;
-        continue;
-      default:
-        goto handle_unusual;
-    }  // switch
-  handle_unusual:
-    if ((tag == 0) || ((tag & 7) == 4)) {
-      CHK_(ptr);
-      ctx->SetLastTag(tag);
-      goto message_done;
-    }
-    ptr = UnknownFieldParse(
-        tag,
-        _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(),
-        ptr, ctx);
-    CHK_(ptr != nullptr);
-  }  // while
-message_done:
+const char* Leave::_InternalParse(
+    const char* ptr, ::_pbi::ParseContext* ctx) {
+  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
   return ptr;
-failure:
-  ptr = nullptr;
-  goto message_done;
-#undef CHK_
 }
 
-uint8_t* Leave::_InternalSerialize(
-    uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const {
+
+PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
+const ::_pbi::TcParseTable<1, 2, 0, 39, 2> Leave::_table_ = {
+  {
+    0,  // no _has_bits_
+    0, // no _extensions_
+    2, 8,  // max_field_number, fast_idx_mask
+    offsetof(decltype(_table_), field_lookup_table),
+    4294967292,  // skipmap
+    offsetof(decltype(_table_), field_entries),
+    2,  // num_field_entries
+    0,  // num_aux_entries
+    offsetof(decltype(_table_), field_names),  // no aux_entries
+    &_Leave_default_instance_._instance,
+    ::_pbi::TcParser::GenericFallback,  // fallback
+  }, {{
+    // string srcAddress = 2;
+    {::_pbi::TcParser::FastUS1,
+     {18, 63, 0, PROTOBUF_FIELD_OFFSET(Leave, _impl_.srcaddress_)}},
+    // uint32 port = 1;
+    {::_pbi::TcParser::SingularVarintNoZag1<::uint32_t, offsetof(Leave, _impl_.port_), 63>(),
+     {8, 63, 0, PROTOBUF_FIELD_OFFSET(Leave, _impl_.port_)}},
+  }}, {{
+    65535, 65535
+  }}, {{
+    // uint32 port = 1;
+    {PROTOBUF_FIELD_OFFSET(Leave, _impl_.port_), 0, 0,
+    (0 | ::_fl::kFcSingular | ::_fl::kUInt32)},
+    // string srcAddress = 2;
+    {PROTOBUF_FIELD_OFFSET(Leave, _impl_.srcaddress_), 0, 0,
+    (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)},
+  }},
+  // no aux_entries
+  {{
+    "\24\0\12\0\0\0\0\0"
+    "messages.leave.Leave"
+    "srcAddress"
+  }},
+};
+
+::uint8_t* Leave::_InternalSerialize(
+    ::uint8_t* target,
+    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
   // @@protoc_insertion_point(serialize_to_array_start:messages.leave.Leave)
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
+  ::uint32_t cached_has_bits = 0;
+  (void)cached_has_bits;
 
   // uint32 port = 1;
   if (this->_internal_port() != 0) {
     target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteUInt32ToArray(1, this->_internal_port(), target);
+    target = ::_pbi::WireFormatLite::WriteUInt32ToArray(
+        1, this->_internal_port(), target);
   }
 
   // string srcAddress = 2;
   if (!this->_internal_srcaddress().empty()) {
-    ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String(
-      this->_internal_srcaddress().data(), static_cast<int>(this->_internal_srcaddress().length()),
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE,
-      "messages.leave.Leave.srcAddress");
-    target = stream->WriteStringMaybeAliased(
-        2, this->_internal_srcaddress(), target);
+    const std::string& _s = this->_internal_srcaddress();
+    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
+        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "messages.leave.Leave.srcAddress");
+    target = stream->WriteStringMaybeAliased(2, _s, target);
   }
 
   if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-        _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream);
+    target =
+        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
+            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
   }
   // @@protoc_insertion_point(serialize_to_array_end:messages.leave.Leave)
   return target;
 }
 
-size_t Leave::ByteSizeLong() const {
+::size_t Leave::ByteSizeLong() const {
 // @@protoc_insertion_point(message_byte_size_start:messages.leave.Leave)
-  size_t total_size = 0;
+  ::size_t total_size = 0;
 
-  uint32_t cached_has_bits = 0;
+  ::uint32_t cached_has_bits = 0;
   // Prevent compiler warnings about cached_has_bits being unused
   (void) cached_has_bits;
 
   // string srcAddress = 2;
   if (!this->_internal_srcaddress().empty()) {
-    total_size += 1 +
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize(
-        this->_internal_srcaddress());
+    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
+                                    this->_internal_srcaddress());
   }
 
   // uint32 port = 1;
   if (this->_internal_port() != 0) {
-    total_size += ::_pbi::WireFormatLite::UInt32SizePlusOne(this->_internal_port());
+    total_size += ::_pbi::WireFormatLite::UInt32SizePlusOne(
+        this->_internal_port());
   }
 
   return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
 }
 
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData Leave::_class_data_ = {
-    ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck,
-    Leave::MergeImpl
-};
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*Leave::GetClassData() const { return &_class_data_; }
 
-
-void Leave::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) {
+void Leave::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
   auto* const _this = static_cast<Leave*>(&to_msg);
   auto& from = static_cast<const Leave&>(from_msg);
   // @@protoc_insertion_point(class_specific_merge_from_start:messages.leave.Leave)
-  GOOGLE_DCHECK_NE(&from, _this);
-  uint32_t cached_has_bits = 0;
+  ABSL_DCHECK_NE(&from, _this);
+  ::uint32_t cached_has_bits = 0;
   (void) cached_has_bits;
 
   if (!from._internal_srcaddress().empty()) {
@@ -280,7 +306,7 @@ void Leave::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF
   if (from._internal_port() != 0) {
     _this->_internal_set_port(from._internal_port());
   }
-  _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
+  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
 }
 
 void Leave::CopyFrom(const Leave& from) {
@@ -290,37 +316,30 @@ void Leave::CopyFrom(const Leave& from) {
   MergeFrom(from);
 }
 
-bool Leave::IsInitialized() const {
+PROTOBUF_NOINLINE bool Leave::IsInitialized() const {
   return true;
 }
 
-void Leave::InternalSwap(Leave* other) {
+void Leave::InternalSwap(Leave* PROTOBUF_RESTRICT other) {
   using std::swap;
-  auto* lhs_arena = GetArenaForAllocation();
-  auto* rhs_arena = other->GetArenaForAllocation();
+  auto* arena = GetArena();
+  ABSL_DCHECK_EQ(arena, other->GetArena());
   _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::InternalSwap(
-      &_impl_.srcaddress_, lhs_arena,
-      &other->_impl_.srcaddress_, rhs_arena
-  );
-  swap(_impl_.port_, other->_impl_.port_);
+  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.srcaddress_, &other->_impl_.srcaddress_, arena);
+        swap(_impl_.port_, other->_impl_.port_);
 }
 
-::PROTOBUF_NAMESPACE_ID::Metadata Leave::GetMetadata() const {
+::google::protobuf::Metadata Leave::GetMetadata() const {
   return ::_pbi::AssignDescriptors(
       &descriptor_table_leave_2eproto_getter, &descriptor_table_leave_2eproto_once,
       file_level_metadata_leave_2eproto[0]);
 }
-
 // @@protoc_insertion_point(namespace_scope)
 }  // namespace leave
 }  // namespace messages
-PROTOBUF_NAMESPACE_OPEN
-template<> PROTOBUF_NOINLINE ::messages::leave::Leave*
-Arena::CreateMaybeMessage< ::messages::leave::Leave >(Arena* arena) {
-  return Arena::CreateMessageInternal< ::messages::leave::Leave >(arena);
-}
-PROTOBUF_NAMESPACE_CLOSE
-
+namespace google {
+namespace protobuf {
+}  // namespace protobuf
+}  // namespace google
 // @@protoc_insertion_point(global_scope)
-#include <google/protobuf/port_undef.inc>
+#include "google/protobuf/port_undef.inc"
diff --git a/include/WHISPER/Messages/Protos/leave.pb.h b/include/WHISPER/Messages/Protos/leave.pb.h
index 607b435..04769a9 100644
--- a/include/WHISPER/Messages/Protos/leave.pb.h
+++ b/include/WHISPER/Messages/Protos/leave.pb.h
@@ -1,49 +1,60 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: leave.proto
+// Protobuf C++ Version: 4.24.0-main
 
-#ifndef GOOGLE_PROTOBUF_INCLUDED_leave_2eproto
-#define GOOGLE_PROTOBUF_INCLUDED_leave_2eproto
+#ifndef GOOGLE_PROTOBUF_INCLUDED_leave_2eproto_2epb_2eh
+#define GOOGLE_PROTOBUF_INCLUDED_leave_2eproto_2epb_2eh
 
 #include <limits>
 #include <string>
+#include <type_traits>
+#include <utility>
 
-#include <google/protobuf/port_def.inc>
-#if PROTOBUF_VERSION < 3021000
-#error This file was generated by a newer version of protoc which is
-#error incompatible with your Protocol Buffer headers. Please update
-#error your headers.
-#endif
-#if 3021012 < PROTOBUF_MIN_PROTOC_VERSION
-#error This file was generated by an older version of protoc which is
-#error incompatible with your Protocol Buffer headers. Please
-#error regenerate this file with a newer version of protoc.
-#endif
+#include "google/protobuf/port_def.inc"
+#if PROTOBUF_VERSION < 4025000
+#error "This file was generated by a newer version of protoc which is"
+#error "incompatible with your Protocol Buffer headers. Please update"
+#error "your headers."
+#endif  // PROTOBUF_VERSION
 
-#include <google/protobuf/port_undef.inc>
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/arena.h>
-#include <google/protobuf/arenastring.h>
-#include <google/protobuf/generated_message_util.h>
-#include <google/protobuf/metadata_lite.h>
-#include <google/protobuf/generated_message_reflection.h>
-#include <google/protobuf/message.h>
-#include <google/protobuf/repeated_field.h>  // IWYU pragma: export
-#include <google/protobuf/extension_set.h>  // IWYU pragma: export
-#include <google/protobuf/unknown_field_set.h>
+#if 4025000 < PROTOBUF_MIN_PROTOC_VERSION
+#error "This file was generated by an older version of protoc which is"
+#error "incompatible with your Protocol Buffer headers. Please"
+#error "regenerate this file with a newer version of protoc."
+#endif  // PROTOBUF_MIN_PROTOC_VERSION
+#include "google/protobuf/port_undef.inc"
+#include "google/protobuf/io/coded_stream.h"
+#include "google/protobuf/arena.h"
+#include "google/protobuf/arenastring.h"
+#include "google/protobuf/generated_message_tctable_decl.h"
+#include "google/protobuf/generated_message_util.h"
+#include "google/protobuf/metadata_lite.h"
+#include "google/protobuf/generated_message_reflection.h"
+#include "google/protobuf/message.h"
+#include "google/protobuf/repeated_field.h"  // IWYU pragma: export
+#include "google/protobuf/extension_set.h"  // IWYU pragma: export
+#include "google/protobuf/unknown_field_set.h"
 // @@protoc_insertion_point(includes)
-#include <google/protobuf/port_def.inc>
+
+// Must be included last.
+#include "google/protobuf/port_def.inc"
+
 #define PROTOBUF_INTERNAL_EXPORT_leave_2eproto
-PROTOBUF_NAMESPACE_OPEN
+
+namespace google {
+namespace protobuf {
 namespace internal {
 class AnyMetadata;
 }  // namespace internal
-PROTOBUF_NAMESPACE_CLOSE
+}  // namespace protobuf
+}  // namespace google
 
 // Internal implementation detail -- do not use these members.
 struct TableStruct_leave_2eproto {
-  static const uint32_t offsets[];
+  static const ::uint32_t offsets[];
 };
-extern const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable descriptor_table_leave_2eproto;
+extern const ::google::protobuf::internal::DescriptorTable
+    descriptor_table_leave_2eproto;
 namespace messages {
 namespace leave {
 class Leave;
@@ -51,22 +62,29 @@ struct LeaveDefaultTypeInternal;
 extern LeaveDefaultTypeInternal _Leave_default_instance_;
 }  // namespace leave
 }  // namespace messages
-PROTOBUF_NAMESPACE_OPEN
-template<> ::messages::leave::Leave* Arena::CreateMaybeMessage<::messages::leave::Leave>(Arena*);
-PROTOBUF_NAMESPACE_CLOSE
+namespace google {
+namespace protobuf {
+}  // namespace protobuf
+}  // namespace google
+
 namespace messages {
 namespace leave {
 
 // ===================================================================
 
+
+// -------------------------------------------------------------------
+
 class Leave final :
-    public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:messages.leave.Leave) */ {
+    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:messages.leave.Leave) */ {
  public:
   inline Leave() : Leave(nullptr) {}
   ~Leave() override;
-  explicit PROTOBUF_CONSTEXPR Leave(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
+  template<typename = void>
+  explicit PROTOBUF_CONSTEXPR Leave(::google::protobuf::internal::ConstantInitialized);
 
-  Leave(const Leave& from);
+  inline Leave(const Leave& from)
+      : Leave(nullptr, from) {}
   Leave(Leave&& from) noexcept
     : Leave() {
     *this = ::std::move(from);
@@ -78,9 +96,9 @@ class Leave final :
   }
   inline Leave& operator=(Leave&& from) noexcept {
     if (this == &from) return *this;
-    if (GetOwningArena() == from.GetOwningArena()
+    if (GetArena() == from.GetArena()
   #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetOwningArena() != nullptr
+        && GetArena() != nullptr
   #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
     ) {
       InternalSwap(&from);
@@ -90,13 +108,22 @@ class Leave final :
     return *this;
   }
 
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() {
+  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
+      ABSL_ATTRIBUTE_LIFETIME_BOUND {
+    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
+  }
+  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
+      ABSL_ATTRIBUTE_LIFETIME_BOUND {
+    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
+  }
+
+  static const ::google::protobuf::Descriptor* descriptor() {
     return GetDescriptor();
   }
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() {
+  static const ::google::protobuf::Descriptor* GetDescriptor() {
     return default_instance().GetMetadata().descriptor;
   }
-  static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() {
+  static const ::google::protobuf::Reflection* GetReflection() {
     return default_instance().GetMetadata().reflection;
   }
   static const Leave& default_instance() {
@@ -115,65 +142,62 @@ class Leave final :
   inline void Swap(Leave* other) {
     if (other == this) return;
   #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() != nullptr &&
-        GetOwningArena() == other->GetOwningArena()) {
+    if (GetArena() != nullptr &&
+        GetArena() == other->GetArena()) {
    #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() == other->GetOwningArena()) {
+    if (GetArena() == other->GetArena()) {
   #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
       InternalSwap(other);
     } else {
-      ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
+      ::google::protobuf::internal::GenericSwap(this, other);
     }
   }
   void UnsafeArenaSwap(Leave* other) {
     if (other == this) return;
-    GOOGLE_DCHECK(GetOwningArena() == other->GetOwningArena());
+    ABSL_DCHECK(GetArena() == other->GetArena());
     InternalSwap(other);
   }
 
   // implements Message ----------------------------------------------
 
-  Leave* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
+  Leave* New(::google::protobuf::Arena* arena = nullptr) const final {
     return CreateMaybeMessage<Leave>(arena);
   }
-  using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
+  using ::google::protobuf::Message::CopyFrom;
   void CopyFrom(const Leave& from);
-  using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
+  using ::google::protobuf::Message::MergeFrom;
   void MergeFrom( const Leave& from) {
     Leave::MergeImpl(*this, from);
   }
   private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg);
+  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
   public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
+  ABSL_ATTRIBUTE_REINITIALIZES void Clear() final;
   bool IsInitialized() const final;
 
-  size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  uint8_t* _InternalSerialize(
-      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
+  ::size_t ByteSizeLong() const final;
+  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
+  ::uint8_t* _InternalSerialize(
+      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
+  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
 
   private:
-  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
+  void SharedCtor(::google::protobuf::Arena* arena);
   void SharedDtor();
-  void SetCachedSize(int size) const final;
   void InternalSwap(Leave* other);
 
   private:
-  friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
-  static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
+  friend class ::google::protobuf::internal::AnyMetadata;
+  static ::absl::string_view FullMessageName() {
     return "messages.leave.Leave";
   }
   protected:
-  explicit Leave(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                       bool is_message_owned = false);
+  explicit Leave(::google::protobuf::Arena* arena);
+  Leave(::google::protobuf::Arena* arena, const Leave& from);
+  const ::google::protobuf::MessageLite::ClassData* GetClassData() const final;
   public:
 
-  static const ClassData _class_data_;
-  const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*GetClassData() const final;
-
-  ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final;
+  ::google::protobuf::Metadata GetMetadata() const final;
 
   // nested types ----------------------------------------------------
 
@@ -184,134 +208,166 @@ class Leave final :
     kPortFieldNumber = 1,
   };
   // string srcAddress = 2;
-  void clear_srcaddress();
+  void clear_srcaddress() ;
   const std::string& srcaddress() const;
-  template <typename ArgT0 = const std::string&, typename... ArgT>
-  void set_srcaddress(ArgT0&& arg0, ArgT... args);
+  template <typename Arg_ = const std::string&, typename... Args_>
+  void set_srcaddress(Arg_&& arg, Args_... args);
   std::string* mutable_srcaddress();
   PROTOBUF_NODISCARD std::string* release_srcaddress();
-  void set_allocated_srcaddress(std::string* srcaddress);
+  void set_allocated_srcaddress(std::string* value);
+
   private:
   const std::string& _internal_srcaddress() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_srcaddress(const std::string& value);
+  inline PROTOBUF_ALWAYS_INLINE void _internal_set_srcaddress(
+      const std::string& value);
   std::string* _internal_mutable_srcaddress();
-  public:
 
+  public:
   // uint32 port = 1;
-  void clear_port();
-  uint32_t port() const;
-  void set_port(uint32_t value);
-  private:
-  uint32_t _internal_port() const;
-  void _internal_set_port(uint32_t value);
-  public:
+  void clear_port() ;
+  ::uint32_t port() const;
+  void set_port(::uint32_t value);
 
+  private:
+  ::uint32_t _internal_port() const;
+  void _internal_set_port(::uint32_t value);
+
+  public:
   // @@protoc_insertion_point(class_scope:messages.leave.Leave)
  private:
   class _Internal;
 
-  template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
-  typedef void InternalArenaConstructable_;
-  typedef void DestructorSkippable_;
+  friend class ::google::protobuf::internal::TcParser;
+  static const ::google::protobuf::internal::TcParseTable<
+      1, 2, 0,
+      39, 2>
+      _table_;
+  friend class ::google::protobuf::MessageLite;
+  friend class ::google::protobuf::Arena;
+  template <typename T>
+  friend class ::google::protobuf::Arena::InternalHelper;
+  using InternalArenaConstructable_ = void;
+  using DestructorSkippable_ = void;
   struct Impl_ {
-    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr srcaddress_;
-    uint32_t port_;
-    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
+
+        inline explicit constexpr Impl_(
+            ::google::protobuf::internal::ConstantInitialized) noexcept;
+        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
+                              ::google::protobuf::Arena* arena);
+        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
+                              ::google::protobuf::Arena* arena, const Impl_& from);
+    ::google::protobuf::internal::ArenaStringPtr srcaddress_;
+    ::uint32_t port_;
+    mutable ::google::protobuf::internal::CachedSize _cached_size_;
+    PROTOBUF_TSAN_DECLARE_MEMBER
   };
   union { Impl_ _impl_; };
   friend struct ::TableStruct_leave_2eproto;
 };
+
 // ===================================================================
 
 
+
+
 // ===================================================================
 
+
 #ifdef __GNUC__
-  #pragma GCC diagnostic push
-  #pragma GCC diagnostic ignored "-Wstrict-aliasing"
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wstrict-aliasing"
 #endif  // __GNUC__
+// -------------------------------------------------------------------
+
 // Leave
 
 // uint32 port = 1;
 inline void Leave::clear_port() {
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_.port_ = 0u;
 }
-inline uint32_t Leave::_internal_port() const {
-  return _impl_.port_;
-}
-inline uint32_t Leave::port() const {
+inline ::uint32_t Leave::port() const {
   // @@protoc_insertion_point(field_get:messages.leave.Leave.port)
   return _internal_port();
 }
-inline void Leave::_internal_set_port(uint32_t value) {
-  
-  _impl_.port_ = value;
-}
-inline void Leave::set_port(uint32_t value) {
+inline void Leave::set_port(::uint32_t value) {
   _internal_set_port(value);
   // @@protoc_insertion_point(field_set:messages.leave.Leave.port)
 }
+inline ::uint32_t Leave::_internal_port() const {
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  return _impl_.port_;
+}
+inline void Leave::_internal_set_port(::uint32_t value) {
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  ;
+  _impl_.port_ = value;
+}
 
 // string srcAddress = 2;
 inline void Leave::clear_srcaddress() {
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_.srcaddress_.ClearToEmpty();
 }
-inline const std::string& Leave::srcaddress() const {
+inline const std::string& Leave::srcaddress() const
+    ABSL_ATTRIBUTE_LIFETIME_BOUND {
   // @@protoc_insertion_point(field_get:messages.leave.Leave.srcAddress)
   return _internal_srcaddress();
 }
-template <typename ArgT0, typename... ArgT>
-inline PROTOBUF_ALWAYS_INLINE
-void Leave::set_srcaddress(ArgT0&& arg0, ArgT... args) {
- 
- _impl_.srcaddress_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+template <typename Arg_, typename... Args_>
+inline PROTOBUF_ALWAYS_INLINE void Leave::set_srcaddress(Arg_&& arg,
+                                                     Args_... args) {
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  ;
+  _impl_.srcaddress_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
   // @@protoc_insertion_point(field_set:messages.leave.Leave.srcAddress)
 }
-inline std::string* Leave::mutable_srcaddress() {
+inline std::string* Leave::mutable_srcaddress() ABSL_ATTRIBUTE_LIFETIME_BOUND {
   std::string* _s = _internal_mutable_srcaddress();
   // @@protoc_insertion_point(field_mutable:messages.leave.Leave.srcAddress)
   return _s;
 }
 inline const std::string& Leave::_internal_srcaddress() const {
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.srcaddress_.Get();
 }
 inline void Leave::_internal_set_srcaddress(const std::string& value) {
-  
-  _impl_.srcaddress_.Set(value, GetArenaForAllocation());
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  ;
+  _impl_.srcaddress_.Set(value, GetArena());
 }
 inline std::string* Leave::_internal_mutable_srcaddress() {
-  
-  return _impl_.srcaddress_.Mutable(GetArenaForAllocation());
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  ;
+  return _impl_.srcaddress_.Mutable( GetArena());
 }
 inline std::string* Leave::release_srcaddress() {
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:messages.leave.Leave.srcAddress)
   return _impl_.srcaddress_.Release();
 }
-inline void Leave::set_allocated_srcaddress(std::string* srcaddress) {
-  if (srcaddress != nullptr) {
-    
-  } else {
-    
-  }
-  _impl_.srcaddress_.SetAllocated(srcaddress, GetArenaForAllocation());
-#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (_impl_.srcaddress_.IsDefault()) {
-    _impl_.srcaddress_.Set("", GetArenaForAllocation());
-  }
-#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+inline void Leave::set_allocated_srcaddress(std::string* value) {
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  _impl_.srcaddress_.SetAllocated(value, GetArena());
+  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+        if (_impl_.srcaddress_.IsDefault()) {
+          _impl_.srcaddress_.Set("", GetArena());
+        }
+  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:messages.leave.Leave.srcAddress)
 }
 
 #ifdef __GNUC__
-  #pragma GCC diagnostic pop
+#pragma GCC diagnostic pop
 #endif  // __GNUC__
 
 // @@protoc_insertion_point(namespace_scope)
-
 }  // namespace leave
 }  // namespace messages
 
+
 // @@protoc_insertion_point(global_scope)
 
-#include <google/protobuf/port_undef.inc>
-#endif  // GOOGLE_PROTOBUF_INCLUDED_GOOGLE_PROTOBUF_INCLUDED_leave_2eproto
+#include "google/protobuf/port_undef.inc"
+
+#endif  // GOOGLE_PROTOBUF_INCLUDED_leave_2eproto_2epb_2eh
diff --git a/include/WHISPER/Messages/Protos/message.pb.cc b/include/WHISPER/Messages/Protos/message.pb.cc
index e21df8d..8bd7769 100644
--- a/include/WHISPER/Messages/Protos/message.pb.cc
+++ b/include/WHISPER/Messages/Protos/message.pb.cc
@@ -4,359 +4,406 @@
 #include "message.pb.h"
 
 #include <algorithm>
-
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/extension_set.h>
-#include <google/protobuf/wire_format_lite.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/generated_message_reflection.h>
-#include <google/protobuf/reflection_ops.h>
-#include <google/protobuf/wire_format.h>
+#include "google/protobuf/io/coded_stream.h"
+#include "google/protobuf/extension_set.h"
+#include "google/protobuf/wire_format_lite.h"
+#include "google/protobuf/descriptor.h"
+#include "google/protobuf/generated_message_reflection.h"
+#include "google/protobuf/reflection_ops.h"
+#include "google/protobuf/wire_format.h"
+#include "google/protobuf/generated_message_tctable_impl.h"
 // @@protoc_insertion_point(includes)
-#include <google/protobuf/port_def.inc>
 
+// Must be included last.
+#include "google/protobuf/port_def.inc"
 PROTOBUF_PRAGMA_INIT_SEG
-
-namespace _pb = ::PROTOBUF_NAMESPACE_ID;
-namespace _pbi = _pb::internal;
-
+namespace _pb = ::google::protobuf;
+namespace _pbi = ::google::protobuf::internal;
+namespace _fl = ::google::protobuf::internal::field_layout;
 namespace messages {
 namespace header {
-PROTOBUF_CONSTEXPR Message::Message(
-    ::_pbi::ConstantInitialized): _impl_{
-    /*decltype(_impl_.senderuuid_)*/{&::_pbi::fixed_address_empty_string, ::_pbi::ConstantInitialized{}}
-  , /*decltype(_impl_.payload_)*/nullptr
-  , /*decltype(_impl_.topic_)*/0u
-  , /*decltype(_impl_.msgtype_)*/0u
-  , /*decltype(_impl_._cached_size_)*/{}} {}
+
+inline constexpr Message::Impl_::Impl_(
+    ::_pbi::ConstantInitialized) noexcept
+      : _cached_size_{0},
+        senderuuid_(
+            &::google::protobuf::internal::fixed_address_empty_string,
+            ::_pbi::ConstantInitialized()),
+        payload_{nullptr},
+        topic_{0u},
+        msgtype_{0u} {}
+
+template <typename>
+PROTOBUF_CONSTEXPR Message::Message(::_pbi::ConstantInitialized)
+    : _impl_(::_pbi::ConstantInitialized()) {}
 struct MessageDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR MessageDefaultTypeInternal()
-      : _instance(::_pbi::ConstantInitialized{}) {}
+  PROTOBUF_CONSTEXPR MessageDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
   ~MessageDefaultTypeInternal() {}
   union {
     Message _instance;
   };
 };
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 MessageDefaultTypeInternal _Message_default_instance_;
+
+PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
+    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 MessageDefaultTypeInternal _Message_default_instance_;
 }  // namespace header
 }  // namespace messages
 static ::_pb::Metadata file_level_metadata_message_2eproto[1];
-static constexpr ::_pb::EnumDescriptor const** file_level_enum_descriptors_message_2eproto = nullptr;
-static constexpr ::_pb::ServiceDescriptor const** file_level_service_descriptors_message_2eproto = nullptr;
-
-const uint32_t TableStruct_message_2eproto::offsets[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = {
-  ~0u,  // no _has_bits_
-  PROTOBUF_FIELD_OFFSET(::messages::header::Message, _internal_metadata_),
-  ~0u,  // no _extensions_
-  ~0u,  // no _oneof_case_
-  ~0u,  // no _weak_field_map_
-  ~0u,  // no _inlined_string_donated_
-  PROTOBUF_FIELD_OFFSET(::messages::header::Message, _impl_.topic_),
-  PROTOBUF_FIELD_OFFSET(::messages::header::Message, _impl_.msgtype_),
-  PROTOBUF_FIELD_OFFSET(::messages::header::Message, _impl_.senderuuid_),
-  PROTOBUF_FIELD_OFFSET(::messages::header::Message, _impl_.payload_),
+static constexpr const ::_pb::EnumDescriptor**
+    file_level_enum_descriptors_message_2eproto = nullptr;
+static constexpr const ::_pb::ServiceDescriptor**
+    file_level_service_descriptors_message_2eproto = nullptr;
+const ::uint32_t
+    TableStruct_message_2eproto::offsets[] ABSL_ATTRIBUTE_SECTION_VARIABLE(
+        protodesc_cold) = {
+        PROTOBUF_FIELD_OFFSET(::messages::header::Message, _impl_._has_bits_),
+        PROTOBUF_FIELD_OFFSET(::messages::header::Message, _internal_metadata_),
+        ~0u,  // no _extensions_
+        ~0u,  // no _oneof_case_
+        ~0u,  // no _weak_field_map_
+        ~0u,  // no _inlined_string_donated_
+        ~0u,  // no _split_
+        ~0u,  // no sizeof(Split)
+        PROTOBUF_FIELD_OFFSET(::messages::header::Message, _impl_.topic_),
+        PROTOBUF_FIELD_OFFSET(::messages::header::Message, _impl_.msgtype_),
+        PROTOBUF_FIELD_OFFSET(::messages::header::Message, _impl_.senderuuid_),
+        PROTOBUF_FIELD_OFFSET(::messages::header::Message, _impl_.payload_),
+        ~0u,
+        ~0u,
+        ~0u,
+        0,
 };
-static const ::_pbi::MigrationSchema schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = {
-  { 0, -1, -1, sizeof(::messages::header::Message)},
+
+static const ::_pbi::MigrationSchema
+    schemas[] ABSL_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
+        {0, 12, -1, sizeof(::messages::header::Message)},
 };
 
 static const ::_pb::Message* const file_default_instances[] = {
-  &::messages::header::_Message_default_instance_._instance,
+    &::messages::header::_Message_default_instance_._instance,
 };
-
-const char descriptor_table_protodef_message_2eproto[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) =
-  "\n\rmessage.proto\022\017messages.header\032\031google"
-  "/protobuf/any.proto\"d\n\007Message\022\r\n\005topic\030"
-  "\001 \001(\r\022\017\n\007msgType\030\002 \001(\r\022\022\n\nsenderUUID\030\003 \001"
-  "(\t\022%\n\007payload\030\005 \001(\0132\024.google.protobuf.An"
-  "yb\006proto3"
-  ;
-static const ::_pbi::DescriptorTable* const descriptor_table_message_2eproto_deps[1] = {
-  &::descriptor_table_google_2fprotobuf_2fany_2eproto,
+const char descriptor_table_protodef_message_2eproto[] ABSL_ATTRIBUTE_SECTION_VARIABLE(
+    protodesc_cold) = {
+    "\n\rmessage.proto\022\017messages.header\032\031google"
+    "/protobuf/any.proto\"d\n\007Message\022\r\n\005topic\030"
+    "\001 \001(\r\022\017\n\007msgType\030\002 \001(\r\022\022\n\nsenderUUID\030\003 \001"
+    "(\t\022%\n\007payload\030\005 \001(\0132\024.google.protobuf.An"
+    "yb\006proto3"
 };
-static ::_pbi::once_flag descriptor_table_message_2eproto_once;
+static const ::_pbi::DescriptorTable* const descriptor_table_message_2eproto_deps[1] =
+    {
+        &::descriptor_table_google_2fprotobuf_2fany_2eproto,
+};
+static ::absl::once_flag descriptor_table_message_2eproto_once;
 const ::_pbi::DescriptorTable descriptor_table_message_2eproto = {
-    false, false, 169, descriptor_table_protodef_message_2eproto,
+    false,
+    false,
+    169,
+    descriptor_table_protodef_message_2eproto,
     "message.proto",
-    &descriptor_table_message_2eproto_once, descriptor_table_message_2eproto_deps, 1, 1,
-    schemas, file_default_instances, TableStruct_message_2eproto::offsets,
-    file_level_metadata_message_2eproto, file_level_enum_descriptors_message_2eproto,
+    &descriptor_table_message_2eproto_once,
+    descriptor_table_message_2eproto_deps,
+    1,
+    1,
+    schemas,
+    file_default_instances,
+    TableStruct_message_2eproto::offsets,
+    file_level_metadata_message_2eproto,
+    file_level_enum_descriptors_message_2eproto,
     file_level_service_descriptors_message_2eproto,
 };
+
+// This function exists to be marked as weak.
+// It can significantly speed up compilation by breaking up LLVM's SCC
+// in the .pb.cc translation units. Large translation units see a
+// reduction of more than 35% of walltime for optimized builds. Without
+// the weak attribute all the messages in the file, including all the
+// vtables and everything they use become part of the same SCC through
+// a cycle like:
+// GetMetadata -> descriptor table -> default instances ->
+//   vtables -> GetMetadata
+// By adding a weak function here we break the connection from the
+// individual vtables back into the descriptor table.
 PROTOBUF_ATTRIBUTE_WEAK const ::_pbi::DescriptorTable* descriptor_table_message_2eproto_getter() {
   return &descriptor_table_message_2eproto;
 }
-
 // Force running AddDescriptors() at dynamic initialization time.
-PROTOBUF_ATTRIBUTE_INIT_PRIORITY2 static ::_pbi::AddDescriptorsRunner dynamic_init_dummy_message_2eproto(&descriptor_table_message_2eproto);
+PROTOBUF_ATTRIBUTE_INIT_PRIORITY2
+static ::_pbi::AddDescriptorsRunner dynamic_init_dummy_message_2eproto(&descriptor_table_message_2eproto);
 namespace messages {
 namespace header {
-
 // ===================================================================
 
 class Message::_Internal {
  public:
-  static const ::PROTOBUF_NAMESPACE_ID::Any& payload(const Message* msg);
+  using HasBits = decltype(std::declval<Message>()._impl_._has_bits_);
+  static constexpr ::int32_t kHasBitsOffset =
+    8 * PROTOBUF_FIELD_OFFSET(Message, _impl_._has_bits_);
+  static const ::google::protobuf::Any& payload(const Message* msg);
+  static void set_has_payload(HasBits* has_bits) {
+    (*has_bits)[0] |= 1u;
+  }
 };
 
-const ::PROTOBUF_NAMESPACE_ID::Any&
-Message::_Internal::payload(const Message* msg) {
+const ::google::protobuf::Any& Message::_Internal::payload(const Message* msg) {
   return *msg->_impl_.payload_;
 }
 void Message::clear_payload() {
-  if (GetArenaForAllocation() == nullptr && _impl_.payload_ != nullptr) {
-    delete _impl_.payload_;
-  }
-  _impl_.payload_ = nullptr;
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  if (_impl_.payload_ != nullptr) _impl_.payload_->Clear();
+  _impl_._has_bits_[0] &= ~0x00000001u;
 }
-Message::Message(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                         bool is_message_owned)
-  : ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned) {
-  SharedCtor(arena, is_message_owned);
+Message::Message(::google::protobuf::Arena* arena)
+    : ::google::protobuf::Message(arena) {
+  SharedCtor(arena);
   // @@protoc_insertion_point(arena_constructor:messages.header.Message)
 }
-Message::Message(const Message& from)
-  : ::PROTOBUF_NAMESPACE_ID::Message() {
-  Message* const _this = this; (void)_this;
-  new (&_impl_) Impl_{
-      decltype(_impl_.senderuuid_){}
-    , decltype(_impl_.payload_){nullptr}
-    , decltype(_impl_.topic_){}
-    , decltype(_impl_.msgtype_){}
-    , /*decltype(_impl_._cached_size_)*/{}};
+inline PROTOBUF_NDEBUG_INLINE Message::Impl_::Impl_(
+    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
+    const Impl_& from)
+      : _has_bits_{from._has_bits_},
+        _cached_size_{0},
+        senderuuid_(arena, from.senderuuid_) {}
+
+Message::Message(
+    ::google::protobuf::Arena* arena,
+    const Message& from)
+    : ::google::protobuf::Message(arena) {
+  Message* const _this = this;
+  (void)_this;
+  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
+      from._internal_metadata_);
+  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
+  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
+  _impl_.payload_ = (cached_has_bits & 0x00000001u)
+                ? CreateMaybeMessage<::google::protobuf::Any>(arena, *from._impl_.payload_)
+                : nullptr;
+  ::memcpy(reinterpret_cast<char *>(&_impl_) +
+               offsetof(Impl_, topic_),
+           reinterpret_cast<const char *>(&from._impl_) +
+               offsetof(Impl_, topic_),
+           offsetof(Impl_, msgtype_) -
+               offsetof(Impl_, topic_) +
+               sizeof(Impl_::msgtype_));
 
-  _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-  _impl_.senderuuid_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.senderuuid_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (!from._internal_senderuuid().empty()) {
-    _this->_impl_.senderuuid_.Set(from._internal_senderuuid(), 
-      _this->GetArenaForAllocation());
-  }
-  if (from._internal_has_payload()) {
-    _this->_impl_.payload_ = new ::PROTOBUF_NAMESPACE_ID::Any(*from._impl_.payload_);
-  }
-  ::memcpy(&_impl_.topic_, &from._impl_.topic_,
-    static_cast<size_t>(reinterpret_cast<char*>(&_impl_.msgtype_) -
-    reinterpret_cast<char*>(&_impl_.topic_)) + sizeof(_impl_.msgtype_));
   // @@protoc_insertion_point(copy_constructor:messages.header.Message)
 }
+inline PROTOBUF_NDEBUG_INLINE Message::Impl_::Impl_(
+    ::google::protobuf::internal::InternalVisibility visibility,
+    ::google::protobuf::Arena* arena)
+      : _cached_size_{0},
+        senderuuid_(arena) {}
 
-inline void Message::SharedCtor(
-    ::_pb::Arena* arena, bool is_message_owned) {
-  (void)arena;
-  (void)is_message_owned;
-  new (&_impl_) Impl_{
-      decltype(_impl_.senderuuid_){}
-    , decltype(_impl_.payload_){nullptr}
-    , decltype(_impl_.topic_){0u}
-    , decltype(_impl_.msgtype_){0u}
-    , /*decltype(_impl_._cached_size_)*/{}
-  };
-  _impl_.senderuuid_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.senderuuid_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+inline void Message::SharedCtor(::_pb::Arena* arena) {
+  new (&_impl_) Impl_(internal_visibility(), arena);
+  ::memset(reinterpret_cast<char *>(&_impl_) +
+               offsetof(Impl_, payload_),
+           0,
+           offsetof(Impl_, msgtype_) -
+               offsetof(Impl_, payload_) +
+               sizeof(Impl_::msgtype_));
 }
-
 Message::~Message() {
   // @@protoc_insertion_point(destructor:messages.header.Message)
-  if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) {
-  (void)arena;
-    return;
-  }
+  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
   SharedDtor();
 }
-
 inline void Message::SharedDtor() {
-  GOOGLE_DCHECK(GetArenaForAllocation() == nullptr);
+  ABSL_DCHECK(GetArena() == nullptr);
   _impl_.senderuuid_.Destroy();
-  if (this != internal_default_instance()) delete _impl_.payload_;
+  delete _impl_.payload_;
+  _impl_.~Impl_();
 }
 
-void Message::SetCachedSize(int size) const {
-  _impl_._cached_size_.Set(size);
+const ::google::protobuf::MessageLite::ClassData*
+Message::GetClassData() const {
+  PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::ClassData
+      _data_ = {
+          Message::MergeImpl,
+           nullptr,  // OnDemandRegisterArenaDtor
+           &::google::protobuf::Message::kDescriptorMethods,
+              PROTOBUF_FIELD_OFFSET(Message, _impl_._cached_size_),
+      };
+  return &_data_;
 }
-
-void Message::Clear() {
+PROTOBUF_NOINLINE void Message::Clear() {
 // @@protoc_insertion_point(message_clear_start:messages.header.Message)
-  uint32_t cached_has_bits = 0;
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  ::uint32_t cached_has_bits = 0;
   // Prevent compiler warnings about cached_has_bits being unused
   (void) cached_has_bits;
 
   _impl_.senderuuid_.ClearToEmpty();
-  if (GetArenaForAllocation() == nullptr && _impl_.payload_ != nullptr) {
-    delete _impl_.payload_;
+  cached_has_bits = _impl_._has_bits_[0];
+  if (cached_has_bits & 0x00000001u) {
+    ABSL_DCHECK(_impl_.payload_ != nullptr);
+    _impl_.payload_->Clear();
   }
-  _impl_.payload_ = nullptr;
-  ::memset(&_impl_.topic_, 0, static_cast<size_t>(
+  ::memset(&_impl_.topic_, 0, static_cast<::size_t>(
       reinterpret_cast<char*>(&_impl_.msgtype_) -
       reinterpret_cast<char*>(&_impl_.topic_)) + sizeof(_impl_.msgtype_));
-  _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>();
+  _impl_._has_bits_.Clear();
+  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
 }
 
-const char* Message::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) {
-#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure
-  while (!ctx->Done(&ptr)) {
-    uint32_t tag;
-    ptr = ::_pbi::ReadTag(ptr, &tag);
-    switch (tag >> 3) {
-      // uint32 topic = 1;
-      case 1:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 8)) {
-          _impl_.topic_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr);
-          CHK_(ptr);
-        } else
-          goto handle_unusual;
-        continue;
-      // uint32 msgType = 2;
-      case 2:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 16)) {
-          _impl_.msgtype_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr);
-          CHK_(ptr);
-        } else
-          goto handle_unusual;
-        continue;
-      // string senderUUID = 3;
-      case 3:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 26)) {
-          auto str = _internal_mutable_senderuuid();
-          ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx);
-          CHK_(ptr);
-          CHK_(::_pbi::VerifyUTF8(str, "messages.header.Message.senderUUID"));
-        } else
-          goto handle_unusual;
-        continue;
-      // .google.protobuf.Any payload = 5;
-      case 5:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 42)) {
-          ptr = ctx->ParseMessage(_internal_mutable_payload(), ptr);
-          CHK_(ptr);
-        } else
-          goto handle_unusual;
-        continue;
-      default:
-        goto handle_unusual;
-    }  // switch
-  handle_unusual:
-    if ((tag == 0) || ((tag & 7) == 4)) {
-      CHK_(ptr);
-      ctx->SetLastTag(tag);
-      goto message_done;
-    }
-    ptr = UnknownFieldParse(
-        tag,
-        _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(),
-        ptr, ctx);
-    CHK_(ptr != nullptr);
-  }  // while
-message_done:
+const char* Message::_InternalParse(
+    const char* ptr, ::_pbi::ParseContext* ctx) {
+  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
   return ptr;
-failure:
-  ptr = nullptr;
-  goto message_done;
-#undef CHK_
 }
 
-uint8_t* Message::_InternalSerialize(
-    uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const {
+
+PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
+const ::_pbi::TcParseTable<3, 4, 1, 42, 2> Message::_table_ = {
+  {
+    PROTOBUF_FIELD_OFFSET(Message, _impl_._has_bits_),
+    0, // no _extensions_
+    5, 56,  // max_field_number, fast_idx_mask
+    offsetof(decltype(_table_), field_lookup_table),
+    4294967272,  // skipmap
+    offsetof(decltype(_table_), field_entries),
+    4,  // num_field_entries
+    1,  // num_aux_entries
+    offsetof(decltype(_table_), aux_entries),
+    &_Message_default_instance_._instance,
+    ::_pbi::TcParser::GenericFallback,  // fallback
+  }, {{
+    {::_pbi::TcParser::MiniParse, {}},
+    // uint32 topic = 1;
+    {::_pbi::TcParser::SingularVarintNoZag1<::uint32_t, offsetof(Message, _impl_.topic_), 63>(),
+     {8, 63, 0, PROTOBUF_FIELD_OFFSET(Message, _impl_.topic_)}},
+    // uint32 msgType = 2;
+    {::_pbi::TcParser::SingularVarintNoZag1<::uint32_t, offsetof(Message, _impl_.msgtype_), 63>(),
+     {16, 63, 0, PROTOBUF_FIELD_OFFSET(Message, _impl_.msgtype_)}},
+    // string senderUUID = 3;
+    {::_pbi::TcParser::FastUS1,
+     {26, 63, 0, PROTOBUF_FIELD_OFFSET(Message, _impl_.senderuuid_)}},
+    {::_pbi::TcParser::MiniParse, {}},
+    // .google.protobuf.Any payload = 5;
+    {::_pbi::TcParser::FastMtS1,
+     {42, 0, 0, PROTOBUF_FIELD_OFFSET(Message, _impl_.payload_)}},
+    {::_pbi::TcParser::MiniParse, {}},
+    {::_pbi::TcParser::MiniParse, {}},
+  }}, {{
+    65535, 65535
+  }}, {{
+    // uint32 topic = 1;
+    {PROTOBUF_FIELD_OFFSET(Message, _impl_.topic_), -1, 0,
+    (0 | ::_fl::kFcSingular | ::_fl::kUInt32)},
+    // uint32 msgType = 2;
+    {PROTOBUF_FIELD_OFFSET(Message, _impl_.msgtype_), -1, 0,
+    (0 | ::_fl::kFcSingular | ::_fl::kUInt32)},
+    // string senderUUID = 3;
+    {PROTOBUF_FIELD_OFFSET(Message, _impl_.senderuuid_), -1, 0,
+    (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)},
+    // .google.protobuf.Any payload = 5;
+    {PROTOBUF_FIELD_OFFSET(Message, _impl_.payload_), _Internal::kHasBitsOffset + 0, 0,
+    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
+  }}, {{
+    {::_pbi::TcParser::GetTable<::google::protobuf::Any>()},
+  }}, {{
+    "\27\0\0\12\0\0\0\0"
+    "messages.header.Message"
+    "senderUUID"
+  }},
+};
+
+::uint8_t* Message::_InternalSerialize(
+    ::uint8_t* target,
+    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
   // @@protoc_insertion_point(serialize_to_array_start:messages.header.Message)
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
+  ::uint32_t cached_has_bits = 0;
+  (void)cached_has_bits;
 
   // uint32 topic = 1;
   if (this->_internal_topic() != 0) {
     target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteUInt32ToArray(1, this->_internal_topic(), target);
+    target = ::_pbi::WireFormatLite::WriteUInt32ToArray(
+        1, this->_internal_topic(), target);
   }
 
   // uint32 msgType = 2;
   if (this->_internal_msgtype() != 0) {
     target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteUInt32ToArray(2, this->_internal_msgtype(), target);
+    target = ::_pbi::WireFormatLite::WriteUInt32ToArray(
+        2, this->_internal_msgtype(), target);
   }
 
   // string senderUUID = 3;
   if (!this->_internal_senderuuid().empty()) {
-    ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String(
-      this->_internal_senderuuid().data(), static_cast<int>(this->_internal_senderuuid().length()),
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE,
-      "messages.header.Message.senderUUID");
-    target = stream->WriteStringMaybeAliased(
-        3, this->_internal_senderuuid(), target);
+    const std::string& _s = this->_internal_senderuuid();
+    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
+        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "messages.header.Message.senderUUID");
+    target = stream->WriteStringMaybeAliased(3, _s, target);
   }
 
+  cached_has_bits = _impl_._has_bits_[0];
   // .google.protobuf.Any payload = 5;
-  if (this->_internal_has_payload()) {
-    target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
-      InternalWriteMessage(5, _Internal::payload(this),
+  if (cached_has_bits & 0x00000001u) {
+    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
+        5, _Internal::payload(this),
         _Internal::payload(this).GetCachedSize(), target, stream);
   }
 
   if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-        _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream);
+    target =
+        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
+            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
   }
   // @@protoc_insertion_point(serialize_to_array_end:messages.header.Message)
   return target;
 }
 
-size_t Message::ByteSizeLong() const {
+::size_t Message::ByteSizeLong() const {
 // @@protoc_insertion_point(message_byte_size_start:messages.header.Message)
-  size_t total_size = 0;
+  ::size_t total_size = 0;
 
-  uint32_t cached_has_bits = 0;
+  ::uint32_t cached_has_bits = 0;
   // Prevent compiler warnings about cached_has_bits being unused
   (void) cached_has_bits;
 
   // string senderUUID = 3;
   if (!this->_internal_senderuuid().empty()) {
-    total_size += 1 +
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize(
-        this->_internal_senderuuid());
+    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
+                                    this->_internal_senderuuid());
   }
 
   // .google.protobuf.Any payload = 5;
-  if (this->_internal_has_payload()) {
-    total_size += 1 +
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(
-        *_impl_.payload_);
+  cached_has_bits = _impl_._has_bits_[0];
+  if (cached_has_bits & 0x00000001u) {
+    total_size +=
+        1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.payload_);
   }
 
   // uint32 topic = 1;
   if (this->_internal_topic() != 0) {
-    total_size += ::_pbi::WireFormatLite::UInt32SizePlusOne(this->_internal_topic());
+    total_size += ::_pbi::WireFormatLite::UInt32SizePlusOne(
+        this->_internal_topic());
   }
 
   // uint32 msgType = 2;
   if (this->_internal_msgtype() != 0) {
-    total_size += ::_pbi::WireFormatLite::UInt32SizePlusOne(this->_internal_msgtype());
+    total_size += ::_pbi::WireFormatLite::UInt32SizePlusOne(
+        this->_internal_msgtype());
   }
 
   return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
 }
 
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData Message::_class_data_ = {
-    ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck,
-    Message::MergeImpl
-};
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*Message::GetClassData() const { return &_class_data_; }
 
-
-void Message::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) {
+void Message::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
   auto* const _this = static_cast<Message*>(&to_msg);
   auto& from = static_cast<const Message&>(from_msg);
   // @@protoc_insertion_point(class_specific_merge_from_start:messages.header.Message)
-  GOOGLE_DCHECK_NE(&from, _this);
-  uint32_t cached_has_bits = 0;
+  ABSL_DCHECK_NE(&from, _this);
+  ::uint32_t cached_has_bits = 0;
   (void) cached_has_bits;
 
   if (!from._internal_senderuuid().empty()) {
     _this->_internal_set_senderuuid(from._internal_senderuuid());
   }
-  if (from._internal_has_payload()) {
-    _this->_internal_mutable_payload()->::PROTOBUF_NAMESPACE_ID::Any::MergeFrom(
+  if ((from._impl_._has_bits_[0] & 0x00000001u) != 0) {
+    _this->_internal_mutable_payload()->::google::protobuf::Any::MergeFrom(
         from._internal_payload());
   }
   if (from._internal_topic() != 0) {
@@ -365,7 +412,7 @@ void Message::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOB
   if (from._internal_msgtype() != 0) {
     _this->_internal_set_msgtype(from._internal_msgtype());
   }
-  _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
+  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
 }
 
 void Message::CopyFrom(const Message& from) {
@@ -375,20 +422,18 @@ void Message::CopyFrom(const Message& from) {
   MergeFrom(from);
 }
 
-bool Message::IsInitialized() const {
+PROTOBUF_NOINLINE bool Message::IsInitialized() const {
   return true;
 }
 
-void Message::InternalSwap(Message* other) {
+void Message::InternalSwap(Message* PROTOBUF_RESTRICT other) {
   using std::swap;
-  auto* lhs_arena = GetArenaForAllocation();
-  auto* rhs_arena = other->GetArenaForAllocation();
+  auto* arena = GetArena();
+  ABSL_DCHECK_EQ(arena, other->GetArena());
   _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::InternalSwap(
-      &_impl_.senderuuid_, lhs_arena,
-      &other->_impl_.senderuuid_, rhs_arena
-  );
-  ::PROTOBUF_NAMESPACE_ID::internal::memswap<
+  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
+  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.senderuuid_, &other->_impl_.senderuuid_, arena);
+  ::google::protobuf::internal::memswap<
       PROTOBUF_FIELD_OFFSET(Message, _impl_.msgtype_)
       + sizeof(Message::_impl_.msgtype_)
       - PROTOBUF_FIELD_OFFSET(Message, _impl_.payload_)>(
@@ -396,21 +441,17 @@ void Message::InternalSwap(Message* other) {
           reinterpret_cast<char*>(&other->_impl_.payload_));
 }
 
-::PROTOBUF_NAMESPACE_ID::Metadata Message::GetMetadata() const {
+::google::protobuf::Metadata Message::GetMetadata() const {
   return ::_pbi::AssignDescriptors(
       &descriptor_table_message_2eproto_getter, &descriptor_table_message_2eproto_once,
       file_level_metadata_message_2eproto[0]);
 }
-
 // @@protoc_insertion_point(namespace_scope)
 }  // namespace header
 }  // namespace messages
-PROTOBUF_NAMESPACE_OPEN
-template<> PROTOBUF_NOINLINE ::messages::header::Message*
-Arena::CreateMaybeMessage< ::messages::header::Message >(Arena* arena) {
-  return Arena::CreateMessageInternal< ::messages::header::Message >(arena);
-}
-PROTOBUF_NAMESPACE_CLOSE
-
+namespace google {
+namespace protobuf {
+}  // namespace protobuf
+}  // namespace google
 // @@protoc_insertion_point(global_scope)
-#include <google/protobuf/port_undef.inc>
+#include "google/protobuf/port_undef.inc"
diff --git a/include/WHISPER/Messages/Protos/message.pb.h b/include/WHISPER/Messages/Protos/message.pb.h
index ff8e939..e59d181 100644
--- a/include/WHISPER/Messages/Protos/message.pb.h
+++ b/include/WHISPER/Messages/Protos/message.pb.h
@@ -1,50 +1,61 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: message.proto
+// Protobuf C++ Version: 4.24.0-main
 
-#ifndef GOOGLE_PROTOBUF_INCLUDED_message_2eproto
-#define GOOGLE_PROTOBUF_INCLUDED_message_2eproto
+#ifndef GOOGLE_PROTOBUF_INCLUDED_message_2eproto_2epb_2eh
+#define GOOGLE_PROTOBUF_INCLUDED_message_2eproto_2epb_2eh
 
 #include <limits>
 #include <string>
+#include <type_traits>
+#include <utility>
 
-#include <google/protobuf/port_def.inc>
-#if PROTOBUF_VERSION < 3021000
-#error This file was generated by a newer version of protoc which is
-#error incompatible with your Protocol Buffer headers. Please update
-#error your headers.
-#endif
-#if 3021012 < PROTOBUF_MIN_PROTOC_VERSION
-#error This file was generated by an older version of protoc which is
-#error incompatible with your Protocol Buffer headers. Please
-#error regenerate this file with a newer version of protoc.
-#endif
+#include "google/protobuf/port_def.inc"
+#if PROTOBUF_VERSION < 4025000
+#error "This file was generated by a newer version of protoc which is"
+#error "incompatible with your Protocol Buffer headers. Please update"
+#error "your headers."
+#endif  // PROTOBUF_VERSION
 
-#include <google/protobuf/port_undef.inc>
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/arena.h>
-#include <google/protobuf/arenastring.h>
-#include <google/protobuf/generated_message_util.h>
-#include <google/protobuf/metadata_lite.h>
-#include <google/protobuf/generated_message_reflection.h>
-#include <google/protobuf/message.h>
-#include <google/protobuf/repeated_field.h>  // IWYU pragma: export
-#include <google/protobuf/extension_set.h>  // IWYU pragma: export
-#include <google/protobuf/unknown_field_set.h>
-#include <google/protobuf/any.pb.h>
+#if 4025000 < PROTOBUF_MIN_PROTOC_VERSION
+#error "This file was generated by an older version of protoc which is"
+#error "incompatible with your Protocol Buffer headers. Please"
+#error "regenerate this file with a newer version of protoc."
+#endif  // PROTOBUF_MIN_PROTOC_VERSION
+#include "google/protobuf/port_undef.inc"
+#include "google/protobuf/io/coded_stream.h"
+#include "google/protobuf/arena.h"
+#include "google/protobuf/arenastring.h"
+#include "google/protobuf/generated_message_tctable_decl.h"
+#include "google/protobuf/generated_message_util.h"
+#include "google/protobuf/metadata_lite.h"
+#include "google/protobuf/generated_message_reflection.h"
+#include "google/protobuf/message.h"
+#include "google/protobuf/repeated_field.h"  // IWYU pragma: export
+#include "google/protobuf/extension_set.h"  // IWYU pragma: export
+#include "google/protobuf/unknown_field_set.h"
+#include "google/protobuf/any.pb.h"
 // @@protoc_insertion_point(includes)
-#include <google/protobuf/port_def.inc>
+
+// Must be included last.
+#include "google/protobuf/port_def.inc"
+
 #define PROTOBUF_INTERNAL_EXPORT_message_2eproto
-PROTOBUF_NAMESPACE_OPEN
+
+namespace google {
+namespace protobuf {
 namespace internal {
 class AnyMetadata;
 }  // namespace internal
-PROTOBUF_NAMESPACE_CLOSE
+}  // namespace protobuf
+}  // namespace google
 
 // Internal implementation detail -- do not use these members.
 struct TableStruct_message_2eproto {
-  static const uint32_t offsets[];
+  static const ::uint32_t offsets[];
 };
-extern const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable descriptor_table_message_2eproto;
+extern const ::google::protobuf::internal::DescriptorTable
+    descriptor_table_message_2eproto;
 namespace messages {
 namespace header {
 class Message;
@@ -52,22 +63,29 @@ struct MessageDefaultTypeInternal;
 extern MessageDefaultTypeInternal _Message_default_instance_;
 }  // namespace header
 }  // namespace messages
-PROTOBUF_NAMESPACE_OPEN
-template<> ::messages::header::Message* Arena::CreateMaybeMessage<::messages::header::Message>(Arena*);
-PROTOBUF_NAMESPACE_CLOSE
+namespace google {
+namespace protobuf {
+}  // namespace protobuf
+}  // namespace google
+
 namespace messages {
 namespace header {
 
 // ===================================================================
 
+
+// -------------------------------------------------------------------
+
 class Message final :
-    public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:messages.header.Message) */ {
+    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:messages.header.Message) */ {
  public:
   inline Message() : Message(nullptr) {}
   ~Message() override;
-  explicit PROTOBUF_CONSTEXPR Message(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
+  template<typename = void>
+  explicit PROTOBUF_CONSTEXPR Message(::google::protobuf::internal::ConstantInitialized);
 
-  Message(const Message& from);
+  inline Message(const Message& from)
+      : Message(nullptr, from) {}
   Message(Message&& from) noexcept
     : Message() {
     *this = ::std::move(from);
@@ -79,9 +97,9 @@ class Message final :
   }
   inline Message& operator=(Message&& from) noexcept {
     if (this == &from) return *this;
-    if (GetOwningArena() == from.GetOwningArena()
+    if (GetArena() == from.GetArena()
   #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetOwningArena() != nullptr
+        && GetArena() != nullptr
   #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
     ) {
       InternalSwap(&from);
@@ -91,13 +109,22 @@ class Message final :
     return *this;
   }
 
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() {
+  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
+      ABSL_ATTRIBUTE_LIFETIME_BOUND {
+    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
+  }
+  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
+      ABSL_ATTRIBUTE_LIFETIME_BOUND {
+    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
+  }
+
+  static const ::google::protobuf::Descriptor* descriptor() {
     return GetDescriptor();
   }
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() {
+  static const ::google::protobuf::Descriptor* GetDescriptor() {
     return default_instance().GetMetadata().descriptor;
   }
-  static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() {
+  static const ::google::protobuf::Reflection* GetReflection() {
     return default_instance().GetMetadata().reflection;
   }
   static const Message& default_instance() {
@@ -116,65 +143,62 @@ class Message final :
   inline void Swap(Message* other) {
     if (other == this) return;
   #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() != nullptr &&
-        GetOwningArena() == other->GetOwningArena()) {
+    if (GetArena() != nullptr &&
+        GetArena() == other->GetArena()) {
    #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() == other->GetOwningArena()) {
+    if (GetArena() == other->GetArena()) {
   #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
       InternalSwap(other);
     } else {
-      ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
+      ::google::protobuf::internal::GenericSwap(this, other);
     }
   }
   void UnsafeArenaSwap(Message* other) {
     if (other == this) return;
-    GOOGLE_DCHECK(GetOwningArena() == other->GetOwningArena());
+    ABSL_DCHECK(GetArena() == other->GetArena());
     InternalSwap(other);
   }
 
   // implements Message ----------------------------------------------
 
-  Message* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
+  Message* New(::google::protobuf::Arena* arena = nullptr) const final {
     return CreateMaybeMessage<Message>(arena);
   }
-  using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
+  using ::google::protobuf::Message::CopyFrom;
   void CopyFrom(const Message& from);
-  using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
+  using ::google::protobuf::Message::MergeFrom;
   void MergeFrom( const Message& from) {
     Message::MergeImpl(*this, from);
   }
   private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg);
+  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
   public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
+  ABSL_ATTRIBUTE_REINITIALIZES void Clear() final;
   bool IsInitialized() const final;
 
-  size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  uint8_t* _InternalSerialize(
-      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
+  ::size_t ByteSizeLong() const final;
+  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
+  ::uint8_t* _InternalSerialize(
+      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
+  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
 
   private:
-  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
+  void SharedCtor(::google::protobuf::Arena* arena);
   void SharedDtor();
-  void SetCachedSize(int size) const final;
   void InternalSwap(Message* other);
 
   private:
-  friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
-  static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
+  friend class ::google::protobuf::internal::AnyMetadata;
+  static ::absl::string_view FullMessageName() {
     return "messages.header.Message";
   }
   protected:
-  explicit Message(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                       bool is_message_owned = false);
+  explicit Message(::google::protobuf::Arena* arena);
+  Message(::google::protobuf::Arena* arena, const Message& from);
+  const ::google::protobuf::MessageLite::ClassData* GetClassData() const final;
   public:
 
-  static const ClassData _class_data_;
-  const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*GetClassData() const final;
-
-  ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final;
+  ::google::protobuf::Metadata GetMetadata() const final;
 
   // nested types ----------------------------------------------------
 
@@ -187,268 +211,308 @@ class Message final :
     kMsgTypeFieldNumber = 2,
   };
   // string senderUUID = 3;
-  void clear_senderuuid();
+  void clear_senderuuid() ;
   const std::string& senderuuid() const;
-  template <typename ArgT0 = const std::string&, typename... ArgT>
-  void set_senderuuid(ArgT0&& arg0, ArgT... args);
+  template <typename Arg_ = const std::string&, typename... Args_>
+  void set_senderuuid(Arg_&& arg, Args_... args);
   std::string* mutable_senderuuid();
   PROTOBUF_NODISCARD std::string* release_senderuuid();
-  void set_allocated_senderuuid(std::string* senderuuid);
+  void set_allocated_senderuuid(std::string* value);
+
   private:
   const std::string& _internal_senderuuid() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_senderuuid(const std::string& value);
+  inline PROTOBUF_ALWAYS_INLINE void _internal_set_senderuuid(
+      const std::string& value);
   std::string* _internal_mutable_senderuuid();
-  public:
 
+  public:
   // .google.protobuf.Any payload = 5;
   bool has_payload() const;
-  private:
-  bool _internal_has_payload() const;
-  public:
-  void clear_payload();
-  const ::PROTOBUF_NAMESPACE_ID::Any& payload() const;
-  PROTOBUF_NODISCARD ::PROTOBUF_NAMESPACE_ID::Any* release_payload();
-  ::PROTOBUF_NAMESPACE_ID::Any* mutable_payload();
-  void set_allocated_payload(::PROTOBUF_NAMESPACE_ID::Any* payload);
-  private:
-  const ::PROTOBUF_NAMESPACE_ID::Any& _internal_payload() const;
-  ::PROTOBUF_NAMESPACE_ID::Any* _internal_mutable_payload();
-  public:
-  void unsafe_arena_set_allocated_payload(
-      ::PROTOBUF_NAMESPACE_ID::Any* payload);
-  ::PROTOBUF_NAMESPACE_ID::Any* unsafe_arena_release_payload();
+  void clear_payload() ;
+  const ::google::protobuf::Any& payload() const;
+  PROTOBUF_NODISCARD ::google::protobuf::Any* release_payload();
+  ::google::protobuf::Any* mutable_payload();
+  void set_allocated_payload(::google::protobuf::Any* value);
+  void unsafe_arena_set_allocated_payload(::google::protobuf::Any* value);
+  ::google::protobuf::Any* unsafe_arena_release_payload();
 
+  private:
+  const ::google::protobuf::Any& _internal_payload() const;
+  ::google::protobuf::Any* _internal_mutable_payload();
+
+  public:
   // uint32 topic = 1;
-  void clear_topic();
-  uint32_t topic() const;
-  void set_topic(uint32_t value);
-  private:
-  uint32_t _internal_topic() const;
-  void _internal_set_topic(uint32_t value);
-  public:
+  void clear_topic() ;
+  ::uint32_t topic() const;
+  void set_topic(::uint32_t value);
 
+  private:
+  ::uint32_t _internal_topic() const;
+  void _internal_set_topic(::uint32_t value);
+
+  public:
   // uint32 msgType = 2;
-  void clear_msgtype();
-  uint32_t msgtype() const;
-  void set_msgtype(uint32_t value);
-  private:
-  uint32_t _internal_msgtype() const;
-  void _internal_set_msgtype(uint32_t value);
-  public:
+  void clear_msgtype() ;
+  ::uint32_t msgtype() const;
+  void set_msgtype(::uint32_t value);
 
+  private:
+  ::uint32_t _internal_msgtype() const;
+  void _internal_set_msgtype(::uint32_t value);
+
+  public:
   // @@protoc_insertion_point(class_scope:messages.header.Message)
  private:
   class _Internal;
 
-  template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
-  typedef void InternalArenaConstructable_;
-  typedef void DestructorSkippable_;
+  friend class ::google::protobuf::internal::TcParser;
+  static const ::google::protobuf::internal::TcParseTable<
+      3, 4, 1,
+      42, 2>
+      _table_;
+  friend class ::google::protobuf::MessageLite;
+  friend class ::google::protobuf::Arena;
+  template <typename T>
+  friend class ::google::protobuf::Arena::InternalHelper;
+  using InternalArenaConstructable_ = void;
+  using DestructorSkippable_ = void;
   struct Impl_ {
-    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr senderuuid_;
-    ::PROTOBUF_NAMESPACE_ID::Any* payload_;
-    uint32_t topic_;
-    uint32_t msgtype_;
-    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
+
+        inline explicit constexpr Impl_(
+            ::google::protobuf::internal::ConstantInitialized) noexcept;
+        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
+                              ::google::protobuf::Arena* arena);
+        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
+                              ::google::protobuf::Arena* arena, const Impl_& from);
+    ::google::protobuf::internal::HasBits<1> _has_bits_;
+    mutable ::google::protobuf::internal::CachedSize _cached_size_;
+    ::google::protobuf::internal::ArenaStringPtr senderuuid_;
+    ::google::protobuf::Any* payload_;
+    ::uint32_t topic_;
+    ::uint32_t msgtype_;
+    PROTOBUF_TSAN_DECLARE_MEMBER
   };
   union { Impl_ _impl_; };
   friend struct ::TableStruct_message_2eproto;
 };
+
 // ===================================================================
 
 
+
+
 // ===================================================================
 
+
 #ifdef __GNUC__
-  #pragma GCC diagnostic push
-  #pragma GCC diagnostic ignored "-Wstrict-aliasing"
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wstrict-aliasing"
 #endif  // __GNUC__
+// -------------------------------------------------------------------
+
 // Message
 
 // uint32 topic = 1;
 inline void Message::clear_topic() {
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_.topic_ = 0u;
 }
-inline uint32_t Message::_internal_topic() const {
-  return _impl_.topic_;
-}
-inline uint32_t Message::topic() const {
+inline ::uint32_t Message::topic() const {
   // @@protoc_insertion_point(field_get:messages.header.Message.topic)
   return _internal_topic();
 }
-inline void Message::_internal_set_topic(uint32_t value) {
-  
-  _impl_.topic_ = value;
-}
-inline void Message::set_topic(uint32_t value) {
+inline void Message::set_topic(::uint32_t value) {
   _internal_set_topic(value);
   // @@protoc_insertion_point(field_set:messages.header.Message.topic)
 }
+inline ::uint32_t Message::_internal_topic() const {
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  return _impl_.topic_;
+}
+inline void Message::_internal_set_topic(::uint32_t value) {
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  ;
+  _impl_.topic_ = value;
+}
 
 // uint32 msgType = 2;
 inline void Message::clear_msgtype() {
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_.msgtype_ = 0u;
 }
-inline uint32_t Message::_internal_msgtype() const {
-  return _impl_.msgtype_;
-}
-inline uint32_t Message::msgtype() const {
+inline ::uint32_t Message::msgtype() const {
   // @@protoc_insertion_point(field_get:messages.header.Message.msgType)
   return _internal_msgtype();
 }
-inline void Message::_internal_set_msgtype(uint32_t value) {
-  
-  _impl_.msgtype_ = value;
-}
-inline void Message::set_msgtype(uint32_t value) {
+inline void Message::set_msgtype(::uint32_t value) {
   _internal_set_msgtype(value);
   // @@protoc_insertion_point(field_set:messages.header.Message.msgType)
 }
+inline ::uint32_t Message::_internal_msgtype() const {
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  return _impl_.msgtype_;
+}
+inline void Message::_internal_set_msgtype(::uint32_t value) {
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  ;
+  _impl_.msgtype_ = value;
+}
 
 // string senderUUID = 3;
 inline void Message::clear_senderuuid() {
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_.senderuuid_.ClearToEmpty();
 }
-inline const std::string& Message::senderuuid() const {
+inline const std::string& Message::senderuuid() const
+    ABSL_ATTRIBUTE_LIFETIME_BOUND {
   // @@protoc_insertion_point(field_get:messages.header.Message.senderUUID)
   return _internal_senderuuid();
 }
-template <typename ArgT0, typename... ArgT>
-inline PROTOBUF_ALWAYS_INLINE
-void Message::set_senderuuid(ArgT0&& arg0, ArgT... args) {
- 
- _impl_.senderuuid_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+template <typename Arg_, typename... Args_>
+inline PROTOBUF_ALWAYS_INLINE void Message::set_senderuuid(Arg_&& arg,
+                                                     Args_... args) {
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  ;
+  _impl_.senderuuid_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
   // @@protoc_insertion_point(field_set:messages.header.Message.senderUUID)
 }
-inline std::string* Message::mutable_senderuuid() {
+inline std::string* Message::mutable_senderuuid() ABSL_ATTRIBUTE_LIFETIME_BOUND {
   std::string* _s = _internal_mutable_senderuuid();
   // @@protoc_insertion_point(field_mutable:messages.header.Message.senderUUID)
   return _s;
 }
 inline const std::string& Message::_internal_senderuuid() const {
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.senderuuid_.Get();
 }
 inline void Message::_internal_set_senderuuid(const std::string& value) {
-  
-  _impl_.senderuuid_.Set(value, GetArenaForAllocation());
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  ;
+  _impl_.senderuuid_.Set(value, GetArena());
 }
 inline std::string* Message::_internal_mutable_senderuuid() {
-  
-  return _impl_.senderuuid_.Mutable(GetArenaForAllocation());
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  ;
+  return _impl_.senderuuid_.Mutable( GetArena());
 }
 inline std::string* Message::release_senderuuid() {
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:messages.header.Message.senderUUID)
   return _impl_.senderuuid_.Release();
 }
-inline void Message::set_allocated_senderuuid(std::string* senderuuid) {
-  if (senderuuid != nullptr) {
-    
-  } else {
-    
-  }
-  _impl_.senderuuid_.SetAllocated(senderuuid, GetArenaForAllocation());
-#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (_impl_.senderuuid_.IsDefault()) {
-    _impl_.senderuuid_.Set("", GetArenaForAllocation());
-  }
-#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+inline void Message::set_allocated_senderuuid(std::string* value) {
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  _impl_.senderuuid_.SetAllocated(value, GetArena());
+  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+        if (_impl_.senderuuid_.IsDefault()) {
+          _impl_.senderuuid_.Set("", GetArena());
+        }
+  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:messages.header.Message.senderUUID)
 }
 
 // .google.protobuf.Any payload = 5;
-inline bool Message::_internal_has_payload() const {
-  return this != internal_default_instance() && _impl_.payload_ != nullptr;
-}
 inline bool Message::has_payload() const {
-  return _internal_has_payload();
+  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
+  PROTOBUF_ASSUME(!value || _impl_.payload_ != nullptr);
+  return value;
 }
-inline const ::PROTOBUF_NAMESPACE_ID::Any& Message::_internal_payload() const {
-  const ::PROTOBUF_NAMESPACE_ID::Any* p = _impl_.payload_;
-  return p != nullptr ? *p : reinterpret_cast<const ::PROTOBUF_NAMESPACE_ID::Any&>(
-      ::PROTOBUF_NAMESPACE_ID::_Any_default_instance_);
+inline const ::google::protobuf::Any& Message::_internal_payload() const {
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  const ::google::protobuf::Any* p = _impl_.payload_;
+  return p != nullptr ? *p : reinterpret_cast<const ::google::protobuf::Any&>(::google::protobuf::_Any_default_instance_);
 }
-inline const ::PROTOBUF_NAMESPACE_ID::Any& Message::payload() const {
+inline const ::google::protobuf::Any& Message::payload() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
   // @@protoc_insertion_point(field_get:messages.header.Message.payload)
   return _internal_payload();
 }
-inline void Message::unsafe_arena_set_allocated_payload(
-    ::PROTOBUF_NAMESPACE_ID::Any* payload) {
-  if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.payload_);
+inline void Message::unsafe_arena_set_allocated_payload(::google::protobuf::Any* value) {
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  if (GetArena() == nullptr) {
+    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.payload_);
   }
-  _impl_.payload_ = payload;
-  if (payload) {
-    
+  _impl_.payload_ = reinterpret_cast<::google::protobuf::Any*>(value);
+  if (value != nullptr) {
+    _impl_._has_bits_[0] |= 0x00000001u;
   } else {
-    
+    _impl_._has_bits_[0] &= ~0x00000001u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:messages.header.Message.payload)
 }
-inline ::PROTOBUF_NAMESPACE_ID::Any* Message::release_payload() {
-  
-  ::PROTOBUF_NAMESPACE_ID::Any* temp = _impl_.payload_;
+inline ::google::protobuf::Any* Message::release_payload() {
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+
+  _impl_._has_bits_[0] &= ~0x00000001u;
+  ::google::protobuf::Any* released = _impl_.payload_;
   _impl_.payload_ = nullptr;
 #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
-  temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
-  if (GetArenaForAllocation() == nullptr) { delete old; }
-#else  // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArenaForAllocation() != nullptr) {
-    temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
+  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
+  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
+  if (GetArena() == nullptr) {
+    delete old;
+  }
+#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
+  if (GetArena() != nullptr) {
+    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
   }
 #endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return temp;
+  return released;
 }
-inline ::PROTOBUF_NAMESPACE_ID::Any* Message::unsafe_arena_release_payload() {
+inline ::google::protobuf::Any* Message::unsafe_arena_release_payload() {
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:messages.header.Message.payload)
-  
-  ::PROTOBUF_NAMESPACE_ID::Any* temp = _impl_.payload_;
+
+  _impl_._has_bits_[0] &= ~0x00000001u;
+  ::google::protobuf::Any* temp = _impl_.payload_;
   _impl_.payload_ = nullptr;
   return temp;
 }
-inline ::PROTOBUF_NAMESPACE_ID::Any* Message::_internal_mutable_payload() {
-  
+inline ::google::protobuf::Any* Message::_internal_mutable_payload() {
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  _impl_._has_bits_[0] |= 0x00000001u;
   if (_impl_.payload_ == nullptr) {
-    auto* p = CreateMaybeMessage<::PROTOBUF_NAMESPACE_ID::Any>(GetArenaForAllocation());
-    _impl_.payload_ = p;
+    auto* p = CreateMaybeMessage<::google::protobuf::Any>(GetArena());
+    _impl_.payload_ = reinterpret_cast<::google::protobuf::Any*>(p);
   }
   return _impl_.payload_;
 }
-inline ::PROTOBUF_NAMESPACE_ID::Any* Message::mutable_payload() {
-  ::PROTOBUF_NAMESPACE_ID::Any* _msg = _internal_mutable_payload();
+inline ::google::protobuf::Any* Message::mutable_payload() ABSL_ATTRIBUTE_LIFETIME_BOUND {
+  ::google::protobuf::Any* _msg = _internal_mutable_payload();
   // @@protoc_insertion_point(field_mutable:messages.header.Message.payload)
   return _msg;
 }
-inline void Message::set_allocated_payload(::PROTOBUF_NAMESPACE_ID::Any* payload) {
-  ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
+inline void Message::set_allocated_payload(::google::protobuf::Any* value) {
+  ::google::protobuf::Arena* message_arena = GetArena();
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   if (message_arena == nullptr) {
-    delete reinterpret_cast< ::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.payload_);
+    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.payload_);
   }
-  if (payload) {
-    ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(
-                reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(payload));
+
+  if (value != nullptr) {
+    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::google::protobuf::MessageLite*>(value)->GetArena();
     if (message_arena != submessage_arena) {
-      payload = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
-          message_arena, payload, submessage_arena);
+      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
     }
-    
+    _impl_._has_bits_[0] |= 0x00000001u;
   } else {
-    
+    _impl_._has_bits_[0] &= ~0x00000001u;
   }
-  _impl_.payload_ = payload;
+
+  _impl_.payload_ = reinterpret_cast<::google::protobuf::Any*>(value);
   // @@protoc_insertion_point(field_set_allocated:messages.header.Message.payload)
 }
 
 #ifdef __GNUC__
-  #pragma GCC diagnostic pop
+#pragma GCC diagnostic pop
 #endif  // __GNUC__
 
 // @@protoc_insertion_point(namespace_scope)
-
 }  // namespace header
 }  // namespace messages
 
+
 // @@protoc_insertion_point(global_scope)
 
-#include <google/protobuf/port_undef.inc>
-#endif  // GOOGLE_PROTOBUF_INCLUDED_GOOGLE_PROTOBUF_INCLUDED_message_2eproto
+#include "google/protobuf/port_undef.inc"
+
+#endif  // GOOGLE_PROTOBUF_INCLUDED_message_2eproto_2epb_2eh
diff --git a/include/WHISPER/Messages/Protos/ping.pb.cc b/include/WHISPER/Messages/Protos/ping.pb.cc
index 0c4f38b..b12e529 100644
--- a/include/WHISPER/Messages/Protos/ping.pb.cc
+++ b/include/WHISPER/Messages/Protos/ping.pb.cc
@@ -4,235 +4,262 @@
 #include "ping.pb.h"
 
 #include <algorithm>
-
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/extension_set.h>
-#include <google/protobuf/wire_format_lite.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/generated_message_reflection.h>
-#include <google/protobuf/reflection_ops.h>
-#include <google/protobuf/wire_format.h>
+#include "google/protobuf/io/coded_stream.h"
+#include "google/protobuf/extension_set.h"
+#include "google/protobuf/wire_format_lite.h"
+#include "google/protobuf/descriptor.h"
+#include "google/protobuf/generated_message_reflection.h"
+#include "google/protobuf/reflection_ops.h"
+#include "google/protobuf/wire_format.h"
+#include "google/protobuf/generated_message_tctable_impl.h"
 // @@protoc_insertion_point(includes)
-#include <google/protobuf/port_def.inc>
 
+// Must be included last.
+#include "google/protobuf/port_def.inc"
 PROTOBUF_PRAGMA_INIT_SEG
-
-namespace _pb = ::PROTOBUF_NAMESPACE_ID;
-namespace _pbi = _pb::internal;
-
+namespace _pb = ::google::protobuf;
+namespace _pbi = ::google::protobuf::internal;
+namespace _fl = ::google::protobuf::internal::field_layout;
 namespace messages {
 namespace ping {
-PROTOBUF_CONSTEXPR Ping::Ping(
-    ::_pbi::ConstantInitialized): _impl_{
-    /*decltype(_impl_.port_)*/0u
-  , /*decltype(_impl_._cached_size_)*/{}} {}
+
+inline constexpr Ping::Impl_::Impl_(
+    ::_pbi::ConstantInitialized) noexcept
+      : port_{0u},
+        _cached_size_{0} {}
+
+template <typename>
+PROTOBUF_CONSTEXPR Ping::Ping(::_pbi::ConstantInitialized)
+    : _impl_(::_pbi::ConstantInitialized()) {}
 struct PingDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR PingDefaultTypeInternal()
-      : _instance(::_pbi::ConstantInitialized{}) {}
+  PROTOBUF_CONSTEXPR PingDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
   ~PingDefaultTypeInternal() {}
   union {
     Ping _instance;
   };
 };
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 PingDefaultTypeInternal _Ping_default_instance_;
+
+PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
+    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 PingDefaultTypeInternal _Ping_default_instance_;
 }  // namespace ping
 }  // namespace messages
 static ::_pb::Metadata file_level_metadata_ping_2eproto[1];
-static constexpr ::_pb::EnumDescriptor const** file_level_enum_descriptors_ping_2eproto = nullptr;
-static constexpr ::_pb::ServiceDescriptor const** file_level_service_descriptors_ping_2eproto = nullptr;
-
-const uint32_t TableStruct_ping_2eproto::offsets[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = {
-  ~0u,  // no _has_bits_
-  PROTOBUF_FIELD_OFFSET(::messages::ping::Ping, _internal_metadata_),
-  ~0u,  // no _extensions_
-  ~0u,  // no _oneof_case_
-  ~0u,  // no _weak_field_map_
-  ~0u,  // no _inlined_string_donated_
-  PROTOBUF_FIELD_OFFSET(::messages::ping::Ping, _impl_.port_),
+static constexpr const ::_pb::EnumDescriptor**
+    file_level_enum_descriptors_ping_2eproto = nullptr;
+static constexpr const ::_pb::ServiceDescriptor**
+    file_level_service_descriptors_ping_2eproto = nullptr;
+const ::uint32_t
+    TableStruct_ping_2eproto::offsets[] ABSL_ATTRIBUTE_SECTION_VARIABLE(
+        protodesc_cold) = {
+        ~0u,  // no _has_bits_
+        PROTOBUF_FIELD_OFFSET(::messages::ping::Ping, _internal_metadata_),
+        ~0u,  // no _extensions_
+        ~0u,  // no _oneof_case_
+        ~0u,  // no _weak_field_map_
+        ~0u,  // no _inlined_string_donated_
+        ~0u,  // no _split_
+        ~0u,  // no sizeof(Split)
+        PROTOBUF_FIELD_OFFSET(::messages::ping::Ping, _impl_.port_),
 };
-static const ::_pbi::MigrationSchema schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = {
-  { 0, -1, -1, sizeof(::messages::ping::Ping)},
+
+static const ::_pbi::MigrationSchema
+    schemas[] ABSL_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
+        {0, -1, -1, sizeof(::messages::ping::Ping)},
 };
 
 static const ::_pb::Message* const file_default_instances[] = {
-  &::messages::ping::_Ping_default_instance_._instance,
+    &::messages::ping::_Ping_default_instance_._instance,
 };
-
-const char descriptor_table_protodef_ping_2eproto[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) =
-  "\n\nping.proto\022\rmessages.ping\"\024\n\004Ping\022\014\n\004p"
-  "ort\030\002 \001(\rb\006proto3"
-  ;
-static ::_pbi::once_flag descriptor_table_ping_2eproto_once;
+const char descriptor_table_protodef_ping_2eproto[] ABSL_ATTRIBUTE_SECTION_VARIABLE(
+    protodesc_cold) = {
+    "\n\nping.proto\022\rmessages.ping\"\024\n\004Ping\022\014\n\004p"
+    "ort\030\002 \001(\rb\006proto3"
+};
+static ::absl::once_flag descriptor_table_ping_2eproto_once;
 const ::_pbi::DescriptorTable descriptor_table_ping_2eproto = {
-    false, false, 57, descriptor_table_protodef_ping_2eproto,
+    false,
+    false,
+    57,
+    descriptor_table_protodef_ping_2eproto,
     "ping.proto",
-    &descriptor_table_ping_2eproto_once, nullptr, 0, 1,
-    schemas, file_default_instances, TableStruct_ping_2eproto::offsets,
-    file_level_metadata_ping_2eproto, file_level_enum_descriptors_ping_2eproto,
+    &descriptor_table_ping_2eproto_once,
+    nullptr,
+    0,
+    1,
+    schemas,
+    file_default_instances,
+    TableStruct_ping_2eproto::offsets,
+    file_level_metadata_ping_2eproto,
+    file_level_enum_descriptors_ping_2eproto,
     file_level_service_descriptors_ping_2eproto,
 };
+
+// This function exists to be marked as weak.
+// It can significantly speed up compilation by breaking up LLVM's SCC
+// in the .pb.cc translation units. Large translation units see a
+// reduction of more than 35% of walltime for optimized builds. Without
+// the weak attribute all the messages in the file, including all the
+// vtables and everything they use become part of the same SCC through
+// a cycle like:
+// GetMetadata -> descriptor table -> default instances ->
+//   vtables -> GetMetadata
+// By adding a weak function here we break the connection from the
+// individual vtables back into the descriptor table.
 PROTOBUF_ATTRIBUTE_WEAK const ::_pbi::DescriptorTable* descriptor_table_ping_2eproto_getter() {
   return &descriptor_table_ping_2eproto;
 }
-
 // Force running AddDescriptors() at dynamic initialization time.
-PROTOBUF_ATTRIBUTE_INIT_PRIORITY2 static ::_pbi::AddDescriptorsRunner dynamic_init_dummy_ping_2eproto(&descriptor_table_ping_2eproto);
+PROTOBUF_ATTRIBUTE_INIT_PRIORITY2
+static ::_pbi::AddDescriptorsRunner dynamic_init_dummy_ping_2eproto(&descriptor_table_ping_2eproto);
 namespace messages {
 namespace ping {
-
 // ===================================================================
 
 class Ping::_Internal {
  public:
 };
 
-Ping::Ping(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                         bool is_message_owned)
-  : ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned) {
-  SharedCtor(arena, is_message_owned);
+Ping::Ping(::google::protobuf::Arena* arena)
+    : ::google::protobuf::Message(arena) {
+  SharedCtor(arena);
   // @@protoc_insertion_point(arena_constructor:messages.ping.Ping)
 }
-Ping::Ping(const Ping& from)
-  : ::PROTOBUF_NAMESPACE_ID::Message() {
-  Ping* const _this = this; (void)_this;
-  new (&_impl_) Impl_{
-      decltype(_impl_.port_){}
-    , /*decltype(_impl_._cached_size_)*/{}};
-
-  _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-  _this->_impl_.port_ = from._impl_.port_;
-  // @@protoc_insertion_point(copy_constructor:messages.ping.Ping)
+Ping::Ping(
+    ::google::protobuf::Arena* arena, const Ping& from)
+    : Ping(arena) {
+  MergeFrom(from);
 }
+inline PROTOBUF_NDEBUG_INLINE Ping::Impl_::Impl_(
+    ::google::protobuf::internal::InternalVisibility visibility,
+    ::google::protobuf::Arena* arena)
+      : _cached_size_{0} {}
 
-inline void Ping::SharedCtor(
-    ::_pb::Arena* arena, bool is_message_owned) {
-  (void)arena;
-  (void)is_message_owned;
-  new (&_impl_) Impl_{
-      decltype(_impl_.port_){0u}
-    , /*decltype(_impl_._cached_size_)*/{}
-  };
+inline void Ping::SharedCtor(::_pb::Arena* arena) {
+  new (&_impl_) Impl_(internal_visibility(), arena);
+  _impl_.port_ = {};
 }
-
 Ping::~Ping() {
   // @@protoc_insertion_point(destructor:messages.ping.Ping)
-  if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) {
-  (void)arena;
-    return;
-  }
+  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
   SharedDtor();
 }
-
 inline void Ping::SharedDtor() {
-  GOOGLE_DCHECK(GetArenaForAllocation() == nullptr);
+  ABSL_DCHECK(GetArena() == nullptr);
+  _impl_.~Impl_();
 }
 
-void Ping::SetCachedSize(int size) const {
-  _impl_._cached_size_.Set(size);
+const ::google::protobuf::MessageLite::ClassData*
+Ping::GetClassData() const {
+  PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::ClassData
+      _data_ = {
+          Ping::MergeImpl,
+           nullptr,  // OnDemandRegisterArenaDtor
+           &::google::protobuf::Message::kDescriptorMethods,
+              PROTOBUF_FIELD_OFFSET(Ping, _impl_._cached_size_),
+      };
+  return &_data_;
 }
-
-void Ping::Clear() {
+PROTOBUF_NOINLINE void Ping::Clear() {
 // @@protoc_insertion_point(message_clear_start:messages.ping.Ping)
-  uint32_t cached_has_bits = 0;
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  ::uint32_t cached_has_bits = 0;
   // Prevent compiler warnings about cached_has_bits being unused
   (void) cached_has_bits;
 
   _impl_.port_ = 0u;
-  _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>();
+  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
 }
 
-const char* Ping::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) {
-#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure
-  while (!ctx->Done(&ptr)) {
-    uint32_t tag;
-    ptr = ::_pbi::ReadTag(ptr, &tag);
-    switch (tag >> 3) {
-      // uint32 port = 2;
-      case 2:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 16)) {
-          _impl_.port_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr);
-          CHK_(ptr);
-        } else
-          goto handle_unusual;
-        continue;
-      default:
-        goto handle_unusual;
-    }  // switch
-  handle_unusual:
-    if ((tag == 0) || ((tag & 7) == 4)) {
-      CHK_(ptr);
-      ctx->SetLastTag(tag);
-      goto message_done;
-    }
-    ptr = UnknownFieldParse(
-        tag,
-        _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(),
-        ptr, ctx);
-    CHK_(ptr != nullptr);
-  }  // while
-message_done:
+const char* Ping::_InternalParse(
+    const char* ptr, ::_pbi::ParseContext* ctx) {
+  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
   return ptr;
-failure:
-  ptr = nullptr;
-  goto message_done;
-#undef CHK_
 }
 
-uint8_t* Ping::_InternalSerialize(
-    uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const {
+
+PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
+const ::_pbi::TcParseTable<0, 1, 0, 0, 2> Ping::_table_ = {
+  {
+    0,  // no _has_bits_
+    0, // no _extensions_
+    2, 0,  // max_field_number, fast_idx_mask
+    offsetof(decltype(_table_), field_lookup_table),
+    4294967293,  // skipmap
+    offsetof(decltype(_table_), field_entries),
+    1,  // num_field_entries
+    0,  // num_aux_entries
+    offsetof(decltype(_table_), field_names),  // no aux_entries
+    &_Ping_default_instance_._instance,
+    ::_pbi::TcParser::GenericFallback,  // fallback
+  }, {{
+    // uint32 port = 2;
+    {::_pbi::TcParser::SingularVarintNoZag1<::uint32_t, offsetof(Ping, _impl_.port_), 63>(),
+     {16, 63, 0, PROTOBUF_FIELD_OFFSET(Ping, _impl_.port_)}},
+  }}, {{
+    65535, 65535
+  }}, {{
+    // uint32 port = 2;
+    {PROTOBUF_FIELD_OFFSET(Ping, _impl_.port_), 0, 0,
+    (0 | ::_fl::kFcSingular | ::_fl::kUInt32)},
+  }},
+  // no aux_entries
+  {{
+  }},
+};
+
+::uint8_t* Ping::_InternalSerialize(
+    ::uint8_t* target,
+    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
   // @@protoc_insertion_point(serialize_to_array_start:messages.ping.Ping)
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
+  ::uint32_t cached_has_bits = 0;
+  (void)cached_has_bits;
 
   // uint32 port = 2;
   if (this->_internal_port() != 0) {
     target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteUInt32ToArray(2, this->_internal_port(), target);
+    target = ::_pbi::WireFormatLite::WriteUInt32ToArray(
+        2, this->_internal_port(), target);
   }
 
   if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-        _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream);
+    target =
+        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
+            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
   }
   // @@protoc_insertion_point(serialize_to_array_end:messages.ping.Ping)
   return target;
 }
 
-size_t Ping::ByteSizeLong() const {
+::size_t Ping::ByteSizeLong() const {
 // @@protoc_insertion_point(message_byte_size_start:messages.ping.Ping)
-  size_t total_size = 0;
+  ::size_t total_size = 0;
 
-  uint32_t cached_has_bits = 0;
+  ::uint32_t cached_has_bits = 0;
   // Prevent compiler warnings about cached_has_bits being unused
   (void) cached_has_bits;
 
   // uint32 port = 2;
   if (this->_internal_port() != 0) {
-    total_size += ::_pbi::WireFormatLite::UInt32SizePlusOne(this->_internal_port());
+    total_size += ::_pbi::WireFormatLite::UInt32SizePlusOne(
+        this->_internal_port());
   }
 
   return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
 }
 
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData Ping::_class_data_ = {
-    ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck,
-    Ping::MergeImpl
-};
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*Ping::GetClassData() const { return &_class_data_; }
 
-
-void Ping::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) {
+void Ping::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
   auto* const _this = static_cast<Ping*>(&to_msg);
   auto& from = static_cast<const Ping&>(from_msg);
   // @@protoc_insertion_point(class_specific_merge_from_start:messages.ping.Ping)
-  GOOGLE_DCHECK_NE(&from, _this);
-  uint32_t cached_has_bits = 0;
+  ABSL_DCHECK_NE(&from, _this);
+  ::uint32_t cached_has_bits = 0;
   (void) cached_has_bits;
 
   if (from._internal_port() != 0) {
     _this->_internal_set_port(from._internal_port());
   }
-  _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
+  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
 }
 
 void Ping::CopyFrom(const Ping& from) {
@@ -242,31 +269,27 @@ void Ping::CopyFrom(const Ping& from) {
   MergeFrom(from);
 }
 
-bool Ping::IsInitialized() const {
+PROTOBUF_NOINLINE bool Ping::IsInitialized() const {
   return true;
 }
 
-void Ping::InternalSwap(Ping* other) {
+void Ping::InternalSwap(Ping* PROTOBUF_RESTRICT other) {
   using std::swap;
   _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_.port_, other->_impl_.port_);
+        swap(_impl_.port_, other->_impl_.port_);
 }
 
-::PROTOBUF_NAMESPACE_ID::Metadata Ping::GetMetadata() const {
+::google::protobuf::Metadata Ping::GetMetadata() const {
   return ::_pbi::AssignDescriptors(
       &descriptor_table_ping_2eproto_getter, &descriptor_table_ping_2eproto_once,
       file_level_metadata_ping_2eproto[0]);
 }
-
 // @@protoc_insertion_point(namespace_scope)
 }  // namespace ping
 }  // namespace messages
-PROTOBUF_NAMESPACE_OPEN
-template<> PROTOBUF_NOINLINE ::messages::ping::Ping*
-Arena::CreateMaybeMessage< ::messages::ping::Ping >(Arena* arena) {
-  return Arena::CreateMessageInternal< ::messages::ping::Ping >(arena);
-}
-PROTOBUF_NAMESPACE_CLOSE
-
+namespace google {
+namespace protobuf {
+}  // namespace protobuf
+}  // namespace google
 // @@protoc_insertion_point(global_scope)
-#include <google/protobuf/port_undef.inc>
+#include "google/protobuf/port_undef.inc"
diff --git a/include/WHISPER/Messages/Protos/ping.pb.h b/include/WHISPER/Messages/Protos/ping.pb.h
index 839c30c..feac500 100644
--- a/include/WHISPER/Messages/Protos/ping.pb.h
+++ b/include/WHISPER/Messages/Protos/ping.pb.h
@@ -1,49 +1,60 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: ping.proto
+// Protobuf C++ Version: 4.24.0-main
 
-#ifndef GOOGLE_PROTOBUF_INCLUDED_ping_2eproto
-#define GOOGLE_PROTOBUF_INCLUDED_ping_2eproto
+#ifndef GOOGLE_PROTOBUF_INCLUDED_ping_2eproto_2epb_2eh
+#define GOOGLE_PROTOBUF_INCLUDED_ping_2eproto_2epb_2eh
 
 #include <limits>
 #include <string>
+#include <type_traits>
+#include <utility>
 
-#include <google/protobuf/port_def.inc>
-#if PROTOBUF_VERSION < 3021000
-#error This file was generated by a newer version of protoc which is
-#error incompatible with your Protocol Buffer headers. Please update
-#error your headers.
-#endif
-#if 3021012 < PROTOBUF_MIN_PROTOC_VERSION
-#error This file was generated by an older version of protoc which is
-#error incompatible with your Protocol Buffer headers. Please
-#error regenerate this file with a newer version of protoc.
-#endif
+#include "google/protobuf/port_def.inc"
+#if PROTOBUF_VERSION < 4025000
+#error "This file was generated by a newer version of protoc which is"
+#error "incompatible with your Protocol Buffer headers. Please update"
+#error "your headers."
+#endif  // PROTOBUF_VERSION
 
-#include <google/protobuf/port_undef.inc>
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/arena.h>
-#include <google/protobuf/arenastring.h>
-#include <google/protobuf/generated_message_util.h>
-#include <google/protobuf/metadata_lite.h>
-#include <google/protobuf/generated_message_reflection.h>
-#include <google/protobuf/message.h>
-#include <google/protobuf/repeated_field.h>  // IWYU pragma: export
-#include <google/protobuf/extension_set.h>  // IWYU pragma: export
-#include <google/protobuf/unknown_field_set.h>
+#if 4025000 < PROTOBUF_MIN_PROTOC_VERSION
+#error "This file was generated by an older version of protoc which is"
+#error "incompatible with your Protocol Buffer headers. Please"
+#error "regenerate this file with a newer version of protoc."
+#endif  // PROTOBUF_MIN_PROTOC_VERSION
+#include "google/protobuf/port_undef.inc"
+#include "google/protobuf/io/coded_stream.h"
+#include "google/protobuf/arena.h"
+#include "google/protobuf/arenastring.h"
+#include "google/protobuf/generated_message_tctable_decl.h"
+#include "google/protobuf/generated_message_util.h"
+#include "google/protobuf/metadata_lite.h"
+#include "google/protobuf/generated_message_reflection.h"
+#include "google/protobuf/message.h"
+#include "google/protobuf/repeated_field.h"  // IWYU pragma: export
+#include "google/protobuf/extension_set.h"  // IWYU pragma: export
+#include "google/protobuf/unknown_field_set.h"
 // @@protoc_insertion_point(includes)
-#include <google/protobuf/port_def.inc>
+
+// Must be included last.
+#include "google/protobuf/port_def.inc"
+
 #define PROTOBUF_INTERNAL_EXPORT_ping_2eproto
-PROTOBUF_NAMESPACE_OPEN
+
+namespace google {
+namespace protobuf {
 namespace internal {
 class AnyMetadata;
 }  // namespace internal
-PROTOBUF_NAMESPACE_CLOSE
+}  // namespace protobuf
+}  // namespace google
 
 // Internal implementation detail -- do not use these members.
 struct TableStruct_ping_2eproto {
-  static const uint32_t offsets[];
+  static const ::uint32_t offsets[];
 };
-extern const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable descriptor_table_ping_2eproto;
+extern const ::google::protobuf::internal::DescriptorTable
+    descriptor_table_ping_2eproto;
 namespace messages {
 namespace ping {
 class Ping;
@@ -51,22 +62,29 @@ struct PingDefaultTypeInternal;
 extern PingDefaultTypeInternal _Ping_default_instance_;
 }  // namespace ping
 }  // namespace messages
-PROTOBUF_NAMESPACE_OPEN
-template<> ::messages::ping::Ping* Arena::CreateMaybeMessage<::messages::ping::Ping>(Arena*);
-PROTOBUF_NAMESPACE_CLOSE
+namespace google {
+namespace protobuf {
+}  // namespace protobuf
+}  // namespace google
+
 namespace messages {
 namespace ping {
 
 // ===================================================================
 
+
+// -------------------------------------------------------------------
+
 class Ping final :
-    public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:messages.ping.Ping) */ {
+    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:messages.ping.Ping) */ {
  public:
   inline Ping() : Ping(nullptr) {}
   ~Ping() override;
-  explicit PROTOBUF_CONSTEXPR Ping(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
+  template<typename = void>
+  explicit PROTOBUF_CONSTEXPR Ping(::google::protobuf::internal::ConstantInitialized);
 
-  Ping(const Ping& from);
+  inline Ping(const Ping& from)
+      : Ping(nullptr, from) {}
   Ping(Ping&& from) noexcept
     : Ping() {
     *this = ::std::move(from);
@@ -78,9 +96,9 @@ class Ping final :
   }
   inline Ping& operator=(Ping&& from) noexcept {
     if (this == &from) return *this;
-    if (GetOwningArena() == from.GetOwningArena()
+    if (GetArena() == from.GetArena()
   #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetOwningArena() != nullptr
+        && GetArena() != nullptr
   #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
     ) {
       InternalSwap(&from);
@@ -90,13 +108,22 @@ class Ping final :
     return *this;
   }
 
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() {
+  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
+      ABSL_ATTRIBUTE_LIFETIME_BOUND {
+    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
+  }
+  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
+      ABSL_ATTRIBUTE_LIFETIME_BOUND {
+    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
+  }
+
+  static const ::google::protobuf::Descriptor* descriptor() {
     return GetDescriptor();
   }
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() {
+  static const ::google::protobuf::Descriptor* GetDescriptor() {
     return default_instance().GetMetadata().descriptor;
   }
-  static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() {
+  static const ::google::protobuf::Reflection* GetReflection() {
     return default_instance().GetMetadata().reflection;
   }
   static const Ping& default_instance() {
@@ -115,65 +142,62 @@ class Ping final :
   inline void Swap(Ping* other) {
     if (other == this) return;
   #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() != nullptr &&
-        GetOwningArena() == other->GetOwningArena()) {
+    if (GetArena() != nullptr &&
+        GetArena() == other->GetArena()) {
    #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() == other->GetOwningArena()) {
+    if (GetArena() == other->GetArena()) {
   #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
       InternalSwap(other);
     } else {
-      ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
+      ::google::protobuf::internal::GenericSwap(this, other);
     }
   }
   void UnsafeArenaSwap(Ping* other) {
     if (other == this) return;
-    GOOGLE_DCHECK(GetOwningArena() == other->GetOwningArena());
+    ABSL_DCHECK(GetArena() == other->GetArena());
     InternalSwap(other);
   }
 
   // implements Message ----------------------------------------------
 
-  Ping* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
+  Ping* New(::google::protobuf::Arena* arena = nullptr) const final {
     return CreateMaybeMessage<Ping>(arena);
   }
-  using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
+  using ::google::protobuf::Message::CopyFrom;
   void CopyFrom(const Ping& from);
-  using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
+  using ::google::protobuf::Message::MergeFrom;
   void MergeFrom( const Ping& from) {
     Ping::MergeImpl(*this, from);
   }
   private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg);
+  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
   public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
+  ABSL_ATTRIBUTE_REINITIALIZES void Clear() final;
   bool IsInitialized() const final;
 
-  size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  uint8_t* _InternalSerialize(
-      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
+  ::size_t ByteSizeLong() const final;
+  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
+  ::uint8_t* _InternalSerialize(
+      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
+  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
 
   private:
-  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
+  void SharedCtor(::google::protobuf::Arena* arena);
   void SharedDtor();
-  void SetCachedSize(int size) const final;
   void InternalSwap(Ping* other);
 
   private:
-  friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
-  static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
+  friend class ::google::protobuf::internal::AnyMetadata;
+  static ::absl::string_view FullMessageName() {
     return "messages.ping.Ping";
   }
   protected:
-  explicit Ping(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                       bool is_message_owned = false);
+  explicit Ping(::google::protobuf::Arena* arena);
+  Ping(::google::protobuf::Arena* arena, const Ping& from);
+  const ::google::protobuf::MessageLite::ClassData* GetClassData() const final;
   public:
 
-  static const ClassData _class_data_;
-  const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*GetClassData() const final;
-
-  ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final;
+  ::google::protobuf::Metadata GetMetadata() const final;
 
   // nested types ----------------------------------------------------
 
@@ -183,69 +207,96 @@ class Ping final :
     kPortFieldNumber = 2,
   };
   // uint32 port = 2;
-  void clear_port();
-  uint32_t port() const;
-  void set_port(uint32_t value);
-  private:
-  uint32_t _internal_port() const;
-  void _internal_set_port(uint32_t value);
-  public:
+  void clear_port() ;
+  ::uint32_t port() const;
+  void set_port(::uint32_t value);
 
+  private:
+  ::uint32_t _internal_port() const;
+  void _internal_set_port(::uint32_t value);
+
+  public:
   // @@protoc_insertion_point(class_scope:messages.ping.Ping)
  private:
   class _Internal;
 
-  template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
-  typedef void InternalArenaConstructable_;
-  typedef void DestructorSkippable_;
+  friend class ::google::protobuf::internal::TcParser;
+  static const ::google::protobuf::internal::TcParseTable<
+      0, 1, 0,
+      0, 2>
+      _table_;
+  friend class ::google::protobuf::MessageLite;
+  friend class ::google::protobuf::Arena;
+  template <typename T>
+  friend class ::google::protobuf::Arena::InternalHelper;
+  using InternalArenaConstructable_ = void;
+  using DestructorSkippable_ = void;
   struct Impl_ {
-    uint32_t port_;
-    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
+
+        inline explicit constexpr Impl_(
+            ::google::protobuf::internal::ConstantInitialized) noexcept;
+        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
+                              ::google::protobuf::Arena* arena);
+        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
+                              ::google::protobuf::Arena* arena, const Impl_& from);
+    ::uint32_t port_;
+    mutable ::google::protobuf::internal::CachedSize _cached_size_;
+    PROTOBUF_TSAN_DECLARE_MEMBER
   };
   union { Impl_ _impl_; };
   friend struct ::TableStruct_ping_2eproto;
 };
+
 // ===================================================================
 
 
+
+
 // ===================================================================
 
+
 #ifdef __GNUC__
-  #pragma GCC diagnostic push
-  #pragma GCC diagnostic ignored "-Wstrict-aliasing"
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wstrict-aliasing"
 #endif  // __GNUC__
+// -------------------------------------------------------------------
+
 // Ping
 
 // uint32 port = 2;
 inline void Ping::clear_port() {
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_.port_ = 0u;
 }
-inline uint32_t Ping::_internal_port() const {
-  return _impl_.port_;
-}
-inline uint32_t Ping::port() const {
+inline ::uint32_t Ping::port() const {
   // @@protoc_insertion_point(field_get:messages.ping.Ping.port)
   return _internal_port();
 }
-inline void Ping::_internal_set_port(uint32_t value) {
-  
-  _impl_.port_ = value;
-}
-inline void Ping::set_port(uint32_t value) {
+inline void Ping::set_port(::uint32_t value) {
   _internal_set_port(value);
   // @@protoc_insertion_point(field_set:messages.ping.Ping.port)
 }
+inline ::uint32_t Ping::_internal_port() const {
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  return _impl_.port_;
+}
+inline void Ping::_internal_set_port(::uint32_t value) {
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  ;
+  _impl_.port_ = value;
+}
 
 #ifdef __GNUC__
-  #pragma GCC diagnostic pop
+#pragma GCC diagnostic pop
 #endif  // __GNUC__
 
 // @@protoc_insertion_point(namespace_scope)
-
 }  // namespace ping
 }  // namespace messages
 
+
 // @@protoc_insertion_point(global_scope)
 
-#include <google/protobuf/port_undef.inc>
-#endif  // GOOGLE_PROTOBUF_INCLUDED_GOOGLE_PROTOBUF_INCLUDED_ping_2eproto
+#include "google/protobuf/port_undef.inc"
+
+#endif  // GOOGLE_PROTOBUF_INCLUDED_ping_2eproto_2epb_2eh
diff --git a/include/WHISPER/Messages/Protos/pong.pb.cc b/include/WHISPER/Messages/Protos/pong.pb.cc
index 3186398..3310e9c 100644
--- a/include/WHISPER/Messages/Protos/pong.pb.cc
+++ b/include/WHISPER/Messages/Protos/pong.pb.cc
@@ -4,235 +4,262 @@
 #include "pong.pb.h"
 
 #include <algorithm>
-
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/extension_set.h>
-#include <google/protobuf/wire_format_lite.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/generated_message_reflection.h>
-#include <google/protobuf/reflection_ops.h>
-#include <google/protobuf/wire_format.h>
+#include "google/protobuf/io/coded_stream.h"
+#include "google/protobuf/extension_set.h"
+#include "google/protobuf/wire_format_lite.h"
+#include "google/protobuf/descriptor.h"
+#include "google/protobuf/generated_message_reflection.h"
+#include "google/protobuf/reflection_ops.h"
+#include "google/protobuf/wire_format.h"
+#include "google/protobuf/generated_message_tctable_impl.h"
 // @@protoc_insertion_point(includes)
-#include <google/protobuf/port_def.inc>
 
+// Must be included last.
+#include "google/protobuf/port_def.inc"
 PROTOBUF_PRAGMA_INIT_SEG
-
-namespace _pb = ::PROTOBUF_NAMESPACE_ID;
-namespace _pbi = _pb::internal;
-
+namespace _pb = ::google::protobuf;
+namespace _pbi = ::google::protobuf::internal;
+namespace _fl = ::google::protobuf::internal::field_layout;
 namespace messages {
 namespace pong {
-PROTOBUF_CONSTEXPR Pong::Pong(
-    ::_pbi::ConstantInitialized): _impl_{
-    /*decltype(_impl_.port_)*/0u
-  , /*decltype(_impl_._cached_size_)*/{}} {}
+
+inline constexpr Pong::Impl_::Impl_(
+    ::_pbi::ConstantInitialized) noexcept
+      : port_{0u},
+        _cached_size_{0} {}
+
+template <typename>
+PROTOBUF_CONSTEXPR Pong::Pong(::_pbi::ConstantInitialized)
+    : _impl_(::_pbi::ConstantInitialized()) {}
 struct PongDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR PongDefaultTypeInternal()
-      : _instance(::_pbi::ConstantInitialized{}) {}
+  PROTOBUF_CONSTEXPR PongDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
   ~PongDefaultTypeInternal() {}
   union {
     Pong _instance;
   };
 };
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 PongDefaultTypeInternal _Pong_default_instance_;
+
+PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
+    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 PongDefaultTypeInternal _Pong_default_instance_;
 }  // namespace pong
 }  // namespace messages
 static ::_pb::Metadata file_level_metadata_pong_2eproto[1];
-static constexpr ::_pb::EnumDescriptor const** file_level_enum_descriptors_pong_2eproto = nullptr;
-static constexpr ::_pb::ServiceDescriptor const** file_level_service_descriptors_pong_2eproto = nullptr;
-
-const uint32_t TableStruct_pong_2eproto::offsets[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = {
-  ~0u,  // no _has_bits_
-  PROTOBUF_FIELD_OFFSET(::messages::pong::Pong, _internal_metadata_),
-  ~0u,  // no _extensions_
-  ~0u,  // no _oneof_case_
-  ~0u,  // no _weak_field_map_
-  ~0u,  // no _inlined_string_donated_
-  PROTOBUF_FIELD_OFFSET(::messages::pong::Pong, _impl_.port_),
+static constexpr const ::_pb::EnumDescriptor**
+    file_level_enum_descriptors_pong_2eproto = nullptr;
+static constexpr const ::_pb::ServiceDescriptor**
+    file_level_service_descriptors_pong_2eproto = nullptr;
+const ::uint32_t
+    TableStruct_pong_2eproto::offsets[] ABSL_ATTRIBUTE_SECTION_VARIABLE(
+        protodesc_cold) = {
+        ~0u,  // no _has_bits_
+        PROTOBUF_FIELD_OFFSET(::messages::pong::Pong, _internal_metadata_),
+        ~0u,  // no _extensions_
+        ~0u,  // no _oneof_case_
+        ~0u,  // no _weak_field_map_
+        ~0u,  // no _inlined_string_donated_
+        ~0u,  // no _split_
+        ~0u,  // no sizeof(Split)
+        PROTOBUF_FIELD_OFFSET(::messages::pong::Pong, _impl_.port_),
 };
-static const ::_pbi::MigrationSchema schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = {
-  { 0, -1, -1, sizeof(::messages::pong::Pong)},
+
+static const ::_pbi::MigrationSchema
+    schemas[] ABSL_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
+        {0, -1, -1, sizeof(::messages::pong::Pong)},
 };
 
 static const ::_pb::Message* const file_default_instances[] = {
-  &::messages::pong::_Pong_default_instance_._instance,
+    &::messages::pong::_Pong_default_instance_._instance,
 };
-
-const char descriptor_table_protodef_pong_2eproto[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) =
-  "\n\npong.proto\022\rmessages.pong\"\024\n\004Pong\022\014\n\004p"
-  "ort\030\001 \001(\rb\006proto3"
-  ;
-static ::_pbi::once_flag descriptor_table_pong_2eproto_once;
+const char descriptor_table_protodef_pong_2eproto[] ABSL_ATTRIBUTE_SECTION_VARIABLE(
+    protodesc_cold) = {
+    "\n\npong.proto\022\rmessages.pong\"\024\n\004Pong\022\014\n\004p"
+    "ort\030\001 \001(\rb\006proto3"
+};
+static ::absl::once_flag descriptor_table_pong_2eproto_once;
 const ::_pbi::DescriptorTable descriptor_table_pong_2eproto = {
-    false, false, 57, descriptor_table_protodef_pong_2eproto,
+    false,
+    false,
+    57,
+    descriptor_table_protodef_pong_2eproto,
     "pong.proto",
-    &descriptor_table_pong_2eproto_once, nullptr, 0, 1,
-    schemas, file_default_instances, TableStruct_pong_2eproto::offsets,
-    file_level_metadata_pong_2eproto, file_level_enum_descriptors_pong_2eproto,
+    &descriptor_table_pong_2eproto_once,
+    nullptr,
+    0,
+    1,
+    schemas,
+    file_default_instances,
+    TableStruct_pong_2eproto::offsets,
+    file_level_metadata_pong_2eproto,
+    file_level_enum_descriptors_pong_2eproto,
     file_level_service_descriptors_pong_2eproto,
 };
+
+// This function exists to be marked as weak.
+// It can significantly speed up compilation by breaking up LLVM's SCC
+// in the .pb.cc translation units. Large translation units see a
+// reduction of more than 35% of walltime for optimized builds. Without
+// the weak attribute all the messages in the file, including all the
+// vtables and everything they use become part of the same SCC through
+// a cycle like:
+// GetMetadata -> descriptor table -> default instances ->
+//   vtables -> GetMetadata
+// By adding a weak function here we break the connection from the
+// individual vtables back into the descriptor table.
 PROTOBUF_ATTRIBUTE_WEAK const ::_pbi::DescriptorTable* descriptor_table_pong_2eproto_getter() {
   return &descriptor_table_pong_2eproto;
 }
-
 // Force running AddDescriptors() at dynamic initialization time.
-PROTOBUF_ATTRIBUTE_INIT_PRIORITY2 static ::_pbi::AddDescriptorsRunner dynamic_init_dummy_pong_2eproto(&descriptor_table_pong_2eproto);
+PROTOBUF_ATTRIBUTE_INIT_PRIORITY2
+static ::_pbi::AddDescriptorsRunner dynamic_init_dummy_pong_2eproto(&descriptor_table_pong_2eproto);
 namespace messages {
 namespace pong {
-
 // ===================================================================
 
 class Pong::_Internal {
  public:
 };
 
-Pong::Pong(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                         bool is_message_owned)
-  : ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned) {
-  SharedCtor(arena, is_message_owned);
+Pong::Pong(::google::protobuf::Arena* arena)
+    : ::google::protobuf::Message(arena) {
+  SharedCtor(arena);
   // @@protoc_insertion_point(arena_constructor:messages.pong.Pong)
 }
-Pong::Pong(const Pong& from)
-  : ::PROTOBUF_NAMESPACE_ID::Message() {
-  Pong* const _this = this; (void)_this;
-  new (&_impl_) Impl_{
-      decltype(_impl_.port_){}
-    , /*decltype(_impl_._cached_size_)*/{}};
-
-  _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-  _this->_impl_.port_ = from._impl_.port_;
-  // @@protoc_insertion_point(copy_constructor:messages.pong.Pong)
+Pong::Pong(
+    ::google::protobuf::Arena* arena, const Pong& from)
+    : Pong(arena) {
+  MergeFrom(from);
 }
+inline PROTOBUF_NDEBUG_INLINE Pong::Impl_::Impl_(
+    ::google::protobuf::internal::InternalVisibility visibility,
+    ::google::protobuf::Arena* arena)
+      : _cached_size_{0} {}
 
-inline void Pong::SharedCtor(
-    ::_pb::Arena* arena, bool is_message_owned) {
-  (void)arena;
-  (void)is_message_owned;
-  new (&_impl_) Impl_{
-      decltype(_impl_.port_){0u}
-    , /*decltype(_impl_._cached_size_)*/{}
-  };
+inline void Pong::SharedCtor(::_pb::Arena* arena) {
+  new (&_impl_) Impl_(internal_visibility(), arena);
+  _impl_.port_ = {};
 }
-
 Pong::~Pong() {
   // @@protoc_insertion_point(destructor:messages.pong.Pong)
-  if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) {
-  (void)arena;
-    return;
-  }
+  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
   SharedDtor();
 }
-
 inline void Pong::SharedDtor() {
-  GOOGLE_DCHECK(GetArenaForAllocation() == nullptr);
+  ABSL_DCHECK(GetArena() == nullptr);
+  _impl_.~Impl_();
 }
 
-void Pong::SetCachedSize(int size) const {
-  _impl_._cached_size_.Set(size);
+const ::google::protobuf::MessageLite::ClassData*
+Pong::GetClassData() const {
+  PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::ClassData
+      _data_ = {
+          Pong::MergeImpl,
+           nullptr,  // OnDemandRegisterArenaDtor
+           &::google::protobuf::Message::kDescriptorMethods,
+              PROTOBUF_FIELD_OFFSET(Pong, _impl_._cached_size_),
+      };
+  return &_data_;
 }
-
-void Pong::Clear() {
+PROTOBUF_NOINLINE void Pong::Clear() {
 // @@protoc_insertion_point(message_clear_start:messages.pong.Pong)
-  uint32_t cached_has_bits = 0;
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  ::uint32_t cached_has_bits = 0;
   // Prevent compiler warnings about cached_has_bits being unused
   (void) cached_has_bits;
 
   _impl_.port_ = 0u;
-  _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>();
+  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
 }
 
-const char* Pong::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) {
-#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure
-  while (!ctx->Done(&ptr)) {
-    uint32_t tag;
-    ptr = ::_pbi::ReadTag(ptr, &tag);
-    switch (tag >> 3) {
-      // uint32 port = 1;
-      case 1:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 8)) {
-          _impl_.port_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr);
-          CHK_(ptr);
-        } else
-          goto handle_unusual;
-        continue;
-      default:
-        goto handle_unusual;
-    }  // switch
-  handle_unusual:
-    if ((tag == 0) || ((tag & 7) == 4)) {
-      CHK_(ptr);
-      ctx->SetLastTag(tag);
-      goto message_done;
-    }
-    ptr = UnknownFieldParse(
-        tag,
-        _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(),
-        ptr, ctx);
-    CHK_(ptr != nullptr);
-  }  // while
-message_done:
+const char* Pong::_InternalParse(
+    const char* ptr, ::_pbi::ParseContext* ctx) {
+  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
   return ptr;
-failure:
-  ptr = nullptr;
-  goto message_done;
-#undef CHK_
 }
 
-uint8_t* Pong::_InternalSerialize(
-    uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const {
+
+PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
+const ::_pbi::TcParseTable<0, 1, 0, 0, 2> Pong::_table_ = {
+  {
+    0,  // no _has_bits_
+    0, // no _extensions_
+    1, 0,  // max_field_number, fast_idx_mask
+    offsetof(decltype(_table_), field_lookup_table),
+    4294967294,  // skipmap
+    offsetof(decltype(_table_), field_entries),
+    1,  // num_field_entries
+    0,  // num_aux_entries
+    offsetof(decltype(_table_), field_names),  // no aux_entries
+    &_Pong_default_instance_._instance,
+    ::_pbi::TcParser::GenericFallback,  // fallback
+  }, {{
+    // uint32 port = 1;
+    {::_pbi::TcParser::SingularVarintNoZag1<::uint32_t, offsetof(Pong, _impl_.port_), 63>(),
+     {8, 63, 0, PROTOBUF_FIELD_OFFSET(Pong, _impl_.port_)}},
+  }}, {{
+    65535, 65535
+  }}, {{
+    // uint32 port = 1;
+    {PROTOBUF_FIELD_OFFSET(Pong, _impl_.port_), 0, 0,
+    (0 | ::_fl::kFcSingular | ::_fl::kUInt32)},
+  }},
+  // no aux_entries
+  {{
+  }},
+};
+
+::uint8_t* Pong::_InternalSerialize(
+    ::uint8_t* target,
+    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
   // @@protoc_insertion_point(serialize_to_array_start:messages.pong.Pong)
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
+  ::uint32_t cached_has_bits = 0;
+  (void)cached_has_bits;
 
   // uint32 port = 1;
   if (this->_internal_port() != 0) {
     target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteUInt32ToArray(1, this->_internal_port(), target);
+    target = ::_pbi::WireFormatLite::WriteUInt32ToArray(
+        1, this->_internal_port(), target);
   }
 
   if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-        _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream);
+    target =
+        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
+            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
   }
   // @@protoc_insertion_point(serialize_to_array_end:messages.pong.Pong)
   return target;
 }
 
-size_t Pong::ByteSizeLong() const {
+::size_t Pong::ByteSizeLong() const {
 // @@protoc_insertion_point(message_byte_size_start:messages.pong.Pong)
-  size_t total_size = 0;
+  ::size_t total_size = 0;
 
-  uint32_t cached_has_bits = 0;
+  ::uint32_t cached_has_bits = 0;
   // Prevent compiler warnings about cached_has_bits being unused
   (void) cached_has_bits;
 
   // uint32 port = 1;
   if (this->_internal_port() != 0) {
-    total_size += ::_pbi::WireFormatLite::UInt32SizePlusOne(this->_internal_port());
+    total_size += ::_pbi::WireFormatLite::UInt32SizePlusOne(
+        this->_internal_port());
   }
 
   return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
 }
 
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData Pong::_class_data_ = {
-    ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck,
-    Pong::MergeImpl
-};
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*Pong::GetClassData() const { return &_class_data_; }
 
-
-void Pong::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) {
+void Pong::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
   auto* const _this = static_cast<Pong*>(&to_msg);
   auto& from = static_cast<const Pong&>(from_msg);
   // @@protoc_insertion_point(class_specific_merge_from_start:messages.pong.Pong)
-  GOOGLE_DCHECK_NE(&from, _this);
-  uint32_t cached_has_bits = 0;
+  ABSL_DCHECK_NE(&from, _this);
+  ::uint32_t cached_has_bits = 0;
   (void) cached_has_bits;
 
   if (from._internal_port() != 0) {
     _this->_internal_set_port(from._internal_port());
   }
-  _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
+  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
 }
 
 void Pong::CopyFrom(const Pong& from) {
@@ -242,31 +269,27 @@ void Pong::CopyFrom(const Pong& from) {
   MergeFrom(from);
 }
 
-bool Pong::IsInitialized() const {
+PROTOBUF_NOINLINE bool Pong::IsInitialized() const {
   return true;
 }
 
-void Pong::InternalSwap(Pong* other) {
+void Pong::InternalSwap(Pong* PROTOBUF_RESTRICT other) {
   using std::swap;
   _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_.port_, other->_impl_.port_);
+        swap(_impl_.port_, other->_impl_.port_);
 }
 
-::PROTOBUF_NAMESPACE_ID::Metadata Pong::GetMetadata() const {
+::google::protobuf::Metadata Pong::GetMetadata() const {
   return ::_pbi::AssignDescriptors(
       &descriptor_table_pong_2eproto_getter, &descriptor_table_pong_2eproto_once,
       file_level_metadata_pong_2eproto[0]);
 }
-
 // @@protoc_insertion_point(namespace_scope)
 }  // namespace pong
 }  // namespace messages
-PROTOBUF_NAMESPACE_OPEN
-template<> PROTOBUF_NOINLINE ::messages::pong::Pong*
-Arena::CreateMaybeMessage< ::messages::pong::Pong >(Arena* arena) {
-  return Arena::CreateMessageInternal< ::messages::pong::Pong >(arena);
-}
-PROTOBUF_NAMESPACE_CLOSE
-
+namespace google {
+namespace protobuf {
+}  // namespace protobuf
+}  // namespace google
 // @@protoc_insertion_point(global_scope)
-#include <google/protobuf/port_undef.inc>
+#include "google/protobuf/port_undef.inc"
diff --git a/include/WHISPER/Messages/Protos/pong.pb.h b/include/WHISPER/Messages/Protos/pong.pb.h
index 7978ec4..1f29fea 100644
--- a/include/WHISPER/Messages/Protos/pong.pb.h
+++ b/include/WHISPER/Messages/Protos/pong.pb.h
@@ -1,49 +1,60 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: pong.proto
+// Protobuf C++ Version: 4.24.0-main
 
-#ifndef GOOGLE_PROTOBUF_INCLUDED_pong_2eproto
-#define GOOGLE_PROTOBUF_INCLUDED_pong_2eproto
+#ifndef GOOGLE_PROTOBUF_INCLUDED_pong_2eproto_2epb_2eh
+#define GOOGLE_PROTOBUF_INCLUDED_pong_2eproto_2epb_2eh
 
 #include <limits>
 #include <string>
+#include <type_traits>
+#include <utility>
 
-#include <google/protobuf/port_def.inc>
-#if PROTOBUF_VERSION < 3021000
-#error This file was generated by a newer version of protoc which is
-#error incompatible with your Protocol Buffer headers. Please update
-#error your headers.
-#endif
-#if 3021012 < PROTOBUF_MIN_PROTOC_VERSION
-#error This file was generated by an older version of protoc which is
-#error incompatible with your Protocol Buffer headers. Please
-#error regenerate this file with a newer version of protoc.
-#endif
+#include "google/protobuf/port_def.inc"
+#if PROTOBUF_VERSION < 4025000
+#error "This file was generated by a newer version of protoc which is"
+#error "incompatible with your Protocol Buffer headers. Please update"
+#error "your headers."
+#endif  // PROTOBUF_VERSION
 
-#include <google/protobuf/port_undef.inc>
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/arena.h>
-#include <google/protobuf/arenastring.h>
-#include <google/protobuf/generated_message_util.h>
-#include <google/protobuf/metadata_lite.h>
-#include <google/protobuf/generated_message_reflection.h>
-#include <google/protobuf/message.h>
-#include <google/protobuf/repeated_field.h>  // IWYU pragma: export
-#include <google/protobuf/extension_set.h>  // IWYU pragma: export
-#include <google/protobuf/unknown_field_set.h>
+#if 4025000 < PROTOBUF_MIN_PROTOC_VERSION
+#error "This file was generated by an older version of protoc which is"
+#error "incompatible with your Protocol Buffer headers. Please"
+#error "regenerate this file with a newer version of protoc."
+#endif  // PROTOBUF_MIN_PROTOC_VERSION
+#include "google/protobuf/port_undef.inc"
+#include "google/protobuf/io/coded_stream.h"
+#include "google/protobuf/arena.h"
+#include "google/protobuf/arenastring.h"
+#include "google/protobuf/generated_message_tctable_decl.h"
+#include "google/protobuf/generated_message_util.h"
+#include "google/protobuf/metadata_lite.h"
+#include "google/protobuf/generated_message_reflection.h"
+#include "google/protobuf/message.h"
+#include "google/protobuf/repeated_field.h"  // IWYU pragma: export
+#include "google/protobuf/extension_set.h"  // IWYU pragma: export
+#include "google/protobuf/unknown_field_set.h"
 // @@protoc_insertion_point(includes)
-#include <google/protobuf/port_def.inc>
+
+// Must be included last.
+#include "google/protobuf/port_def.inc"
+
 #define PROTOBUF_INTERNAL_EXPORT_pong_2eproto
-PROTOBUF_NAMESPACE_OPEN
+
+namespace google {
+namespace protobuf {
 namespace internal {
 class AnyMetadata;
 }  // namespace internal
-PROTOBUF_NAMESPACE_CLOSE
+}  // namespace protobuf
+}  // namespace google
 
 // Internal implementation detail -- do not use these members.
 struct TableStruct_pong_2eproto {
-  static const uint32_t offsets[];
+  static const ::uint32_t offsets[];
 };
-extern const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable descriptor_table_pong_2eproto;
+extern const ::google::protobuf::internal::DescriptorTable
+    descriptor_table_pong_2eproto;
 namespace messages {
 namespace pong {
 class Pong;
@@ -51,22 +62,29 @@ struct PongDefaultTypeInternal;
 extern PongDefaultTypeInternal _Pong_default_instance_;
 }  // namespace pong
 }  // namespace messages
-PROTOBUF_NAMESPACE_OPEN
-template<> ::messages::pong::Pong* Arena::CreateMaybeMessage<::messages::pong::Pong>(Arena*);
-PROTOBUF_NAMESPACE_CLOSE
+namespace google {
+namespace protobuf {
+}  // namespace protobuf
+}  // namespace google
+
 namespace messages {
 namespace pong {
 
 // ===================================================================
 
+
+// -------------------------------------------------------------------
+
 class Pong final :
-    public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:messages.pong.Pong) */ {
+    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:messages.pong.Pong) */ {
  public:
   inline Pong() : Pong(nullptr) {}
   ~Pong() override;
-  explicit PROTOBUF_CONSTEXPR Pong(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
+  template<typename = void>
+  explicit PROTOBUF_CONSTEXPR Pong(::google::protobuf::internal::ConstantInitialized);
 
-  Pong(const Pong& from);
+  inline Pong(const Pong& from)
+      : Pong(nullptr, from) {}
   Pong(Pong&& from) noexcept
     : Pong() {
     *this = ::std::move(from);
@@ -78,9 +96,9 @@ class Pong final :
   }
   inline Pong& operator=(Pong&& from) noexcept {
     if (this == &from) return *this;
-    if (GetOwningArena() == from.GetOwningArena()
+    if (GetArena() == from.GetArena()
   #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetOwningArena() != nullptr
+        && GetArena() != nullptr
   #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
     ) {
       InternalSwap(&from);
@@ -90,13 +108,22 @@ class Pong final :
     return *this;
   }
 
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() {
+  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
+      ABSL_ATTRIBUTE_LIFETIME_BOUND {
+    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
+  }
+  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
+      ABSL_ATTRIBUTE_LIFETIME_BOUND {
+    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
+  }
+
+  static const ::google::protobuf::Descriptor* descriptor() {
     return GetDescriptor();
   }
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() {
+  static const ::google::protobuf::Descriptor* GetDescriptor() {
     return default_instance().GetMetadata().descriptor;
   }
-  static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() {
+  static const ::google::protobuf::Reflection* GetReflection() {
     return default_instance().GetMetadata().reflection;
   }
   static const Pong& default_instance() {
@@ -115,65 +142,62 @@ class Pong final :
   inline void Swap(Pong* other) {
     if (other == this) return;
   #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() != nullptr &&
-        GetOwningArena() == other->GetOwningArena()) {
+    if (GetArena() != nullptr &&
+        GetArena() == other->GetArena()) {
    #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() == other->GetOwningArena()) {
+    if (GetArena() == other->GetArena()) {
   #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
       InternalSwap(other);
     } else {
-      ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
+      ::google::protobuf::internal::GenericSwap(this, other);
     }
   }
   void UnsafeArenaSwap(Pong* other) {
     if (other == this) return;
-    GOOGLE_DCHECK(GetOwningArena() == other->GetOwningArena());
+    ABSL_DCHECK(GetArena() == other->GetArena());
     InternalSwap(other);
   }
 
   // implements Message ----------------------------------------------
 
-  Pong* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
+  Pong* New(::google::protobuf::Arena* arena = nullptr) const final {
     return CreateMaybeMessage<Pong>(arena);
   }
-  using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
+  using ::google::protobuf::Message::CopyFrom;
   void CopyFrom(const Pong& from);
-  using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
+  using ::google::protobuf::Message::MergeFrom;
   void MergeFrom( const Pong& from) {
     Pong::MergeImpl(*this, from);
   }
   private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg);
+  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
   public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
+  ABSL_ATTRIBUTE_REINITIALIZES void Clear() final;
   bool IsInitialized() const final;
 
-  size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  uint8_t* _InternalSerialize(
-      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
+  ::size_t ByteSizeLong() const final;
+  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
+  ::uint8_t* _InternalSerialize(
+      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
+  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
 
   private:
-  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
+  void SharedCtor(::google::protobuf::Arena* arena);
   void SharedDtor();
-  void SetCachedSize(int size) const final;
   void InternalSwap(Pong* other);
 
   private:
-  friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
-  static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
+  friend class ::google::protobuf::internal::AnyMetadata;
+  static ::absl::string_view FullMessageName() {
     return "messages.pong.Pong";
   }
   protected:
-  explicit Pong(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                       bool is_message_owned = false);
+  explicit Pong(::google::protobuf::Arena* arena);
+  Pong(::google::protobuf::Arena* arena, const Pong& from);
+  const ::google::protobuf::MessageLite::ClassData* GetClassData() const final;
   public:
 
-  static const ClassData _class_data_;
-  const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*GetClassData() const final;
-
-  ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final;
+  ::google::protobuf::Metadata GetMetadata() const final;
 
   // nested types ----------------------------------------------------
 
@@ -183,69 +207,96 @@ class Pong final :
     kPortFieldNumber = 1,
   };
   // uint32 port = 1;
-  void clear_port();
-  uint32_t port() const;
-  void set_port(uint32_t value);
-  private:
-  uint32_t _internal_port() const;
-  void _internal_set_port(uint32_t value);
-  public:
+  void clear_port() ;
+  ::uint32_t port() const;
+  void set_port(::uint32_t value);
 
+  private:
+  ::uint32_t _internal_port() const;
+  void _internal_set_port(::uint32_t value);
+
+  public:
   // @@protoc_insertion_point(class_scope:messages.pong.Pong)
  private:
   class _Internal;
 
-  template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
-  typedef void InternalArenaConstructable_;
-  typedef void DestructorSkippable_;
+  friend class ::google::protobuf::internal::TcParser;
+  static const ::google::protobuf::internal::TcParseTable<
+      0, 1, 0,
+      0, 2>
+      _table_;
+  friend class ::google::protobuf::MessageLite;
+  friend class ::google::protobuf::Arena;
+  template <typename T>
+  friend class ::google::protobuf::Arena::InternalHelper;
+  using InternalArenaConstructable_ = void;
+  using DestructorSkippable_ = void;
   struct Impl_ {
-    uint32_t port_;
-    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
+
+        inline explicit constexpr Impl_(
+            ::google::protobuf::internal::ConstantInitialized) noexcept;
+        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
+                              ::google::protobuf::Arena* arena);
+        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
+                              ::google::protobuf::Arena* arena, const Impl_& from);
+    ::uint32_t port_;
+    mutable ::google::protobuf::internal::CachedSize _cached_size_;
+    PROTOBUF_TSAN_DECLARE_MEMBER
   };
   union { Impl_ _impl_; };
   friend struct ::TableStruct_pong_2eproto;
 };
+
 // ===================================================================
 
 
+
+
 // ===================================================================
 
+
 #ifdef __GNUC__
-  #pragma GCC diagnostic push
-  #pragma GCC diagnostic ignored "-Wstrict-aliasing"
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wstrict-aliasing"
 #endif  // __GNUC__
+// -------------------------------------------------------------------
+
 // Pong
 
 // uint32 port = 1;
 inline void Pong::clear_port() {
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_.port_ = 0u;
 }
-inline uint32_t Pong::_internal_port() const {
-  return _impl_.port_;
-}
-inline uint32_t Pong::port() const {
+inline ::uint32_t Pong::port() const {
   // @@protoc_insertion_point(field_get:messages.pong.Pong.port)
   return _internal_port();
 }
-inline void Pong::_internal_set_port(uint32_t value) {
-  
-  _impl_.port_ = value;
-}
-inline void Pong::set_port(uint32_t value) {
+inline void Pong::set_port(::uint32_t value) {
   _internal_set_port(value);
   // @@protoc_insertion_point(field_set:messages.pong.Pong.port)
 }
+inline ::uint32_t Pong::_internal_port() const {
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
+  return _impl_.port_;
+}
+inline void Pong::_internal_set_port(::uint32_t value) {
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  ;
+  _impl_.port_ = value;
+}
 
 #ifdef __GNUC__
-  #pragma GCC diagnostic pop
+#pragma GCC diagnostic pop
 #endif  // __GNUC__
 
 // @@protoc_insertion_point(namespace_scope)
-
 }  // namespace pong
 }  // namespace messages
 
+
 // @@protoc_insertion_point(global_scope)
 
-#include <google/protobuf/port_undef.inc>
-#endif  // GOOGLE_PROTOBUF_INCLUDED_GOOGLE_PROTOBUF_INCLUDED_pong_2eproto
+#include "google/protobuf/port_undef.inc"
+
+#endif  // GOOGLE_PROTOBUF_INCLUDED_pong_2eproto_2epb_2eh
diff --git a/include/WHISPER/Messages/Protos/stringData.pb.cc b/include/WHISPER/Messages/Protos/stringData.pb.cc
index ee72686..bbfbf0a 100644
--- a/include/WHISPER/Messages/Protos/stringData.pb.cc
+++ b/include/WHISPER/Messages/Protos/stringData.pb.cc
@@ -4,255 +4,282 @@
 #include "stringData.pb.h"
 
 #include <algorithm>
-
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/extension_set.h>
-#include <google/protobuf/wire_format_lite.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/generated_message_reflection.h>
-#include <google/protobuf/reflection_ops.h>
-#include <google/protobuf/wire_format.h>
+#include "google/protobuf/io/coded_stream.h"
+#include "google/protobuf/extension_set.h"
+#include "google/protobuf/wire_format_lite.h"
+#include "google/protobuf/descriptor.h"
+#include "google/protobuf/generated_message_reflection.h"
+#include "google/protobuf/reflection_ops.h"
+#include "google/protobuf/wire_format.h"
+#include "google/protobuf/generated_message_tctable_impl.h"
 // @@protoc_insertion_point(includes)
-#include <google/protobuf/port_def.inc>
 
+// Must be included last.
+#include "google/protobuf/port_def.inc"
 PROTOBUF_PRAGMA_INIT_SEG
-
-namespace _pb = ::PROTOBUF_NAMESPACE_ID;
-namespace _pbi = _pb::internal;
-
+namespace _pb = ::google::protobuf;
+namespace _pbi = ::google::protobuf::internal;
+namespace _fl = ::google::protobuf::internal::field_layout;
 namespace messages {
 namespace stringData {
-PROTOBUF_CONSTEXPR StringData::StringData(
-    ::_pbi::ConstantInitialized): _impl_{
-    /*decltype(_impl_.data_)*/{&::_pbi::fixed_address_empty_string, ::_pbi::ConstantInitialized{}}
-  , /*decltype(_impl_._cached_size_)*/{}} {}
+
+inline constexpr StringData::Impl_::Impl_(
+    ::_pbi::ConstantInitialized) noexcept
+      : data_(
+            &::google::protobuf::internal::fixed_address_empty_string,
+            ::_pbi::ConstantInitialized()),
+        _cached_size_{0} {}
+
+template <typename>
+PROTOBUF_CONSTEXPR StringData::StringData(::_pbi::ConstantInitialized)
+    : _impl_(::_pbi::ConstantInitialized()) {}
 struct StringDataDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR StringDataDefaultTypeInternal()
-      : _instance(::_pbi::ConstantInitialized{}) {}
+  PROTOBUF_CONSTEXPR StringDataDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
   ~StringDataDefaultTypeInternal() {}
   union {
     StringData _instance;
   };
 };
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 StringDataDefaultTypeInternal _StringData_default_instance_;
+
+PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
+    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 StringDataDefaultTypeInternal _StringData_default_instance_;
 }  // namespace stringData
 }  // namespace messages
 static ::_pb::Metadata file_level_metadata_stringData_2eproto[1];
-static constexpr ::_pb::EnumDescriptor const** file_level_enum_descriptors_stringData_2eproto = nullptr;
-static constexpr ::_pb::ServiceDescriptor const** file_level_service_descriptors_stringData_2eproto = nullptr;
-
-const uint32_t TableStruct_stringData_2eproto::offsets[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = {
-  ~0u,  // no _has_bits_
-  PROTOBUF_FIELD_OFFSET(::messages::stringData::StringData, _internal_metadata_),
-  ~0u,  // no _extensions_
-  ~0u,  // no _oneof_case_
-  ~0u,  // no _weak_field_map_
-  ~0u,  // no _inlined_string_donated_
-  PROTOBUF_FIELD_OFFSET(::messages::stringData::StringData, _impl_.data_),
+static constexpr const ::_pb::EnumDescriptor**
+    file_level_enum_descriptors_stringData_2eproto = nullptr;
+static constexpr const ::_pb::ServiceDescriptor**
+    file_level_service_descriptors_stringData_2eproto = nullptr;
+const ::uint32_t
+    TableStruct_stringData_2eproto::offsets[] ABSL_ATTRIBUTE_SECTION_VARIABLE(
+        protodesc_cold) = {
+        ~0u,  // no _has_bits_
+        PROTOBUF_FIELD_OFFSET(::messages::stringData::StringData, _internal_metadata_),
+        ~0u,  // no _extensions_
+        ~0u,  // no _oneof_case_
+        ~0u,  // no _weak_field_map_
+        ~0u,  // no _inlined_string_donated_
+        ~0u,  // no _split_
+        ~0u,  // no sizeof(Split)
+        PROTOBUF_FIELD_OFFSET(::messages::stringData::StringData, _impl_.data_),
 };
-static const ::_pbi::MigrationSchema schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = {
-  { 0, -1, -1, sizeof(::messages::stringData::StringData)},
+
+static const ::_pbi::MigrationSchema
+    schemas[] ABSL_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
+        {0, -1, -1, sizeof(::messages::stringData::StringData)},
 };
 
 static const ::_pb::Message* const file_default_instances[] = {
-  &::messages::stringData::_StringData_default_instance_._instance,
+    &::messages::stringData::_StringData_default_instance_._instance,
 };
-
-const char descriptor_table_protodef_stringData_2eproto[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) =
-  "\n\020stringData.proto\022\023messages.stringData\""
-  "\032\n\nStringData\022\014\n\004data\030\001 \001(\tb\006proto3"
-  ;
-static ::_pbi::once_flag descriptor_table_stringData_2eproto_once;
+const char descriptor_table_protodef_stringData_2eproto[] ABSL_ATTRIBUTE_SECTION_VARIABLE(
+    protodesc_cold) = {
+    "\n\020stringData.proto\022\023messages.stringData\""
+    "\032\n\nStringData\022\014\n\004data\030\001 \001(\tb\006proto3"
+};
+static ::absl::once_flag descriptor_table_stringData_2eproto_once;
 const ::_pbi::DescriptorTable descriptor_table_stringData_2eproto = {
-    false, false, 75, descriptor_table_protodef_stringData_2eproto,
+    false,
+    false,
+    75,
+    descriptor_table_protodef_stringData_2eproto,
     "stringData.proto",
-    &descriptor_table_stringData_2eproto_once, nullptr, 0, 1,
-    schemas, file_default_instances, TableStruct_stringData_2eproto::offsets,
-    file_level_metadata_stringData_2eproto, file_level_enum_descriptors_stringData_2eproto,
+    &descriptor_table_stringData_2eproto_once,
+    nullptr,
+    0,
+    1,
+    schemas,
+    file_default_instances,
+    TableStruct_stringData_2eproto::offsets,
+    file_level_metadata_stringData_2eproto,
+    file_level_enum_descriptors_stringData_2eproto,
     file_level_service_descriptors_stringData_2eproto,
 };
+
+// This function exists to be marked as weak.
+// It can significantly speed up compilation by breaking up LLVM's SCC
+// in the .pb.cc translation units. Large translation units see a
+// reduction of more than 35% of walltime for optimized builds. Without
+// the weak attribute all the messages in the file, including all the
+// vtables and everything they use become part of the same SCC through
+// a cycle like:
+// GetMetadata -> descriptor table -> default instances ->
+//   vtables -> GetMetadata
+// By adding a weak function here we break the connection from the
+// individual vtables back into the descriptor table.
 PROTOBUF_ATTRIBUTE_WEAK const ::_pbi::DescriptorTable* descriptor_table_stringData_2eproto_getter() {
   return &descriptor_table_stringData_2eproto;
 }
-
 // Force running AddDescriptors() at dynamic initialization time.
-PROTOBUF_ATTRIBUTE_INIT_PRIORITY2 static ::_pbi::AddDescriptorsRunner dynamic_init_dummy_stringData_2eproto(&descriptor_table_stringData_2eproto);
+PROTOBUF_ATTRIBUTE_INIT_PRIORITY2
+static ::_pbi::AddDescriptorsRunner dynamic_init_dummy_stringData_2eproto(&descriptor_table_stringData_2eproto);
 namespace messages {
 namespace stringData {
-
 // ===================================================================
 
 class StringData::_Internal {
  public:
 };
 
-StringData::StringData(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                         bool is_message_owned)
-  : ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned) {
-  SharedCtor(arena, is_message_owned);
+StringData::StringData(::google::protobuf::Arena* arena)
+    : ::google::protobuf::Message(arena) {
+  SharedCtor(arena);
   // @@protoc_insertion_point(arena_constructor:messages.stringData.StringData)
 }
-StringData::StringData(const StringData& from)
-  : ::PROTOBUF_NAMESPACE_ID::Message() {
-  StringData* const _this = this; (void)_this;
-  new (&_impl_) Impl_{
-      decltype(_impl_.data_){}
-    , /*decltype(_impl_._cached_size_)*/{}};
+inline PROTOBUF_NDEBUG_INLINE StringData::Impl_::Impl_(
+    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
+    const Impl_& from)
+      : data_(arena, from.data_),
+        _cached_size_{0} {}
+
+StringData::StringData(
+    ::google::protobuf::Arena* arena,
+    const StringData& from)
+    : ::google::protobuf::Message(arena) {
+  StringData* const _this = this;
+  (void)_this;
+  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
+      from._internal_metadata_);
+  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
 
-  _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-  _impl_.data_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.data_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (!from._internal_data().empty()) {
-    _this->_impl_.data_.Set(from._internal_data(), 
-      _this->GetArenaForAllocation());
-  }
   // @@protoc_insertion_point(copy_constructor:messages.stringData.StringData)
 }
+inline PROTOBUF_NDEBUG_INLINE StringData::Impl_::Impl_(
+    ::google::protobuf::internal::InternalVisibility visibility,
+    ::google::protobuf::Arena* arena)
+      : data_(arena),
+        _cached_size_{0} {}
 
-inline void StringData::SharedCtor(
-    ::_pb::Arena* arena, bool is_message_owned) {
-  (void)arena;
-  (void)is_message_owned;
-  new (&_impl_) Impl_{
-      decltype(_impl_.data_){}
-    , /*decltype(_impl_._cached_size_)*/{}
-  };
-  _impl_.data_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.data_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+inline void StringData::SharedCtor(::_pb::Arena* arena) {
+  new (&_impl_) Impl_(internal_visibility(), arena);
 }
-
 StringData::~StringData() {
   // @@protoc_insertion_point(destructor:messages.stringData.StringData)
-  if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) {
-  (void)arena;
-    return;
-  }
+  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
   SharedDtor();
 }
-
 inline void StringData::SharedDtor() {
-  GOOGLE_DCHECK(GetArenaForAllocation() == nullptr);
+  ABSL_DCHECK(GetArena() == nullptr);
   _impl_.data_.Destroy();
+  _impl_.~Impl_();
 }
 
-void StringData::SetCachedSize(int size) const {
-  _impl_._cached_size_.Set(size);
+const ::google::protobuf::MessageLite::ClassData*
+StringData::GetClassData() const {
+  PROTOBUF_CONSTINIT static const ::google::protobuf::MessageLite::ClassData
+      _data_ = {
+          StringData::MergeImpl,
+           nullptr,  // OnDemandRegisterArenaDtor
+           &::google::protobuf::Message::kDescriptorMethods,
+              PROTOBUF_FIELD_OFFSET(StringData, _impl_._cached_size_),
+      };
+  return &_data_;
 }
-
-void StringData::Clear() {
+PROTOBUF_NOINLINE void StringData::Clear() {
 // @@protoc_insertion_point(message_clear_start:messages.stringData.StringData)
-  uint32_t cached_has_bits = 0;
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  ::uint32_t cached_has_bits = 0;
   // Prevent compiler warnings about cached_has_bits being unused
   (void) cached_has_bits;
 
   _impl_.data_.ClearToEmpty();
-  _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>();
+  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
 }
 
-const char* StringData::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) {
-#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure
-  while (!ctx->Done(&ptr)) {
-    uint32_t tag;
-    ptr = ::_pbi::ReadTag(ptr, &tag);
-    switch (tag >> 3) {
-      // string data = 1;
-      case 1:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 10)) {
-          auto str = _internal_mutable_data();
-          ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx);
-          CHK_(ptr);
-          CHK_(::_pbi::VerifyUTF8(str, "messages.stringData.StringData.data"));
-        } else
-          goto handle_unusual;
-        continue;
-      default:
-        goto handle_unusual;
-    }  // switch
-  handle_unusual:
-    if ((tag == 0) || ((tag & 7) == 4)) {
-      CHK_(ptr);
-      ctx->SetLastTag(tag);
-      goto message_done;
-    }
-    ptr = UnknownFieldParse(
-        tag,
-        _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(),
-        ptr, ctx);
-    CHK_(ptr != nullptr);
-  }  // while
-message_done:
+const char* StringData::_InternalParse(
+    const char* ptr, ::_pbi::ParseContext* ctx) {
+  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
   return ptr;
-failure:
-  ptr = nullptr;
-  goto message_done;
-#undef CHK_
 }
 
-uint8_t* StringData::_InternalSerialize(
-    uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const {
+
+PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
+const ::_pbi::TcParseTable<0, 1, 0, 43, 2> StringData::_table_ = {
+  {
+    0,  // no _has_bits_
+    0, // no _extensions_
+    1, 0,  // max_field_number, fast_idx_mask
+    offsetof(decltype(_table_), field_lookup_table),
+    4294967294,  // skipmap
+    offsetof(decltype(_table_), field_entries),
+    1,  // num_field_entries
+    0,  // num_aux_entries
+    offsetof(decltype(_table_), field_names),  // no aux_entries
+    &_StringData_default_instance_._instance,
+    ::_pbi::TcParser::GenericFallback,  // fallback
+  }, {{
+    // string data = 1;
+    {::_pbi::TcParser::FastUS1,
+     {10, 63, 0, PROTOBUF_FIELD_OFFSET(StringData, _impl_.data_)}},
+  }}, {{
+    65535, 65535
+  }}, {{
+    // string data = 1;
+    {PROTOBUF_FIELD_OFFSET(StringData, _impl_.data_), 0, 0,
+    (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)},
+  }},
+  // no aux_entries
+  {{
+    "\36\4\0\0\0\0\0\0"
+    "messages.stringData.StringData"
+    "data"
+  }},
+};
+
+::uint8_t* StringData::_InternalSerialize(
+    ::uint8_t* target,
+    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
   // @@protoc_insertion_point(serialize_to_array_start:messages.stringData.StringData)
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
+  ::uint32_t cached_has_bits = 0;
+  (void)cached_has_bits;
 
   // string data = 1;
   if (!this->_internal_data().empty()) {
-    ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String(
-      this->_internal_data().data(), static_cast<int>(this->_internal_data().length()),
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE,
-      "messages.stringData.StringData.data");
-    target = stream->WriteStringMaybeAliased(
-        1, this->_internal_data(), target);
+    const std::string& _s = this->_internal_data();
+    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
+        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "messages.stringData.StringData.data");
+    target = stream->WriteStringMaybeAliased(1, _s, target);
   }
 
   if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-        _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream);
+    target =
+        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
+            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
   }
   // @@protoc_insertion_point(serialize_to_array_end:messages.stringData.StringData)
   return target;
 }
 
-size_t StringData::ByteSizeLong() const {
+::size_t StringData::ByteSizeLong() const {
 // @@protoc_insertion_point(message_byte_size_start:messages.stringData.StringData)
-  size_t total_size = 0;
+  ::size_t total_size = 0;
 
-  uint32_t cached_has_bits = 0;
+  ::uint32_t cached_has_bits = 0;
   // Prevent compiler warnings about cached_has_bits being unused
   (void) cached_has_bits;
 
   // string data = 1;
   if (!this->_internal_data().empty()) {
-    total_size += 1 +
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize(
-        this->_internal_data());
+    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
+                                    this->_internal_data());
   }
 
   return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
 }
 
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData StringData::_class_data_ = {
-    ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck,
-    StringData::MergeImpl
-};
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*StringData::GetClassData() const { return &_class_data_; }
 
-
-void StringData::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) {
+void StringData::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
   auto* const _this = static_cast<StringData*>(&to_msg);
   auto& from = static_cast<const StringData&>(from_msg);
   // @@protoc_insertion_point(class_specific_merge_from_start:messages.stringData.StringData)
-  GOOGLE_DCHECK_NE(&from, _this);
-  uint32_t cached_has_bits = 0;
+  ABSL_DCHECK_NE(&from, _this);
+  ::uint32_t cached_has_bits = 0;
   (void) cached_has_bits;
 
   if (!from._internal_data().empty()) {
     _this->_internal_set_data(from._internal_data());
   }
-  _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
+  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
 }
 
 void StringData::CopyFrom(const StringData& from) {
@@ -262,36 +289,29 @@ void StringData::CopyFrom(const StringData& from) {
   MergeFrom(from);
 }
 
-bool StringData::IsInitialized() const {
+PROTOBUF_NOINLINE bool StringData::IsInitialized() const {
   return true;
 }
 
-void StringData::InternalSwap(StringData* other) {
+void StringData::InternalSwap(StringData* PROTOBUF_RESTRICT other) {
   using std::swap;
-  auto* lhs_arena = GetArenaForAllocation();
-  auto* rhs_arena = other->GetArenaForAllocation();
+  auto* arena = GetArena();
+  ABSL_DCHECK_EQ(arena, other->GetArena());
   _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::InternalSwap(
-      &_impl_.data_, lhs_arena,
-      &other->_impl_.data_, rhs_arena
-  );
+  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.data_, &other->_impl_.data_, arena);
 }
 
-::PROTOBUF_NAMESPACE_ID::Metadata StringData::GetMetadata() const {
+::google::protobuf::Metadata StringData::GetMetadata() const {
   return ::_pbi::AssignDescriptors(
       &descriptor_table_stringData_2eproto_getter, &descriptor_table_stringData_2eproto_once,
       file_level_metadata_stringData_2eproto[0]);
 }
-
 // @@protoc_insertion_point(namespace_scope)
 }  // namespace stringData
 }  // namespace messages
-PROTOBUF_NAMESPACE_OPEN
-template<> PROTOBUF_NOINLINE ::messages::stringData::StringData*
-Arena::CreateMaybeMessage< ::messages::stringData::StringData >(Arena* arena) {
-  return Arena::CreateMessageInternal< ::messages::stringData::StringData >(arena);
-}
-PROTOBUF_NAMESPACE_CLOSE
-
+namespace google {
+namespace protobuf {
+}  // namespace protobuf
+}  // namespace google
 // @@protoc_insertion_point(global_scope)
-#include <google/protobuf/port_undef.inc>
+#include "google/protobuf/port_undef.inc"
diff --git a/include/WHISPER/Messages/Protos/stringData.pb.h b/include/WHISPER/Messages/Protos/stringData.pb.h
index a1c9b01..8049a00 100644
--- a/include/WHISPER/Messages/Protos/stringData.pb.h
+++ b/include/WHISPER/Messages/Protos/stringData.pb.h
@@ -1,49 +1,60 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: stringData.proto
+// Protobuf C++ Version: 4.24.0-main
 
-#ifndef GOOGLE_PROTOBUF_INCLUDED_stringData_2eproto
-#define GOOGLE_PROTOBUF_INCLUDED_stringData_2eproto
+#ifndef GOOGLE_PROTOBUF_INCLUDED_stringData_2eproto_2epb_2eh
+#define GOOGLE_PROTOBUF_INCLUDED_stringData_2eproto_2epb_2eh
 
 #include <limits>
 #include <string>
+#include <type_traits>
+#include <utility>
 
-#include <google/protobuf/port_def.inc>
-#if PROTOBUF_VERSION < 3021000
-#error This file was generated by a newer version of protoc which is
-#error incompatible with your Protocol Buffer headers. Please update
-#error your headers.
-#endif
-#if 3021012 < PROTOBUF_MIN_PROTOC_VERSION
-#error This file was generated by an older version of protoc which is
-#error incompatible with your Protocol Buffer headers. Please
-#error regenerate this file with a newer version of protoc.
-#endif
+#include "google/protobuf/port_def.inc"
+#if PROTOBUF_VERSION < 4025000
+#error "This file was generated by a newer version of protoc which is"
+#error "incompatible with your Protocol Buffer headers. Please update"
+#error "your headers."
+#endif  // PROTOBUF_VERSION
 
-#include <google/protobuf/port_undef.inc>
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/arena.h>
-#include <google/protobuf/arenastring.h>
-#include <google/protobuf/generated_message_util.h>
-#include <google/protobuf/metadata_lite.h>
-#include <google/protobuf/generated_message_reflection.h>
-#include <google/protobuf/message.h>
-#include <google/protobuf/repeated_field.h>  // IWYU pragma: export
-#include <google/protobuf/extension_set.h>  // IWYU pragma: export
-#include <google/protobuf/unknown_field_set.h>
+#if 4025000 < PROTOBUF_MIN_PROTOC_VERSION
+#error "This file was generated by an older version of protoc which is"
+#error "incompatible with your Protocol Buffer headers. Please"
+#error "regenerate this file with a newer version of protoc."
+#endif  // PROTOBUF_MIN_PROTOC_VERSION
+#include "google/protobuf/port_undef.inc"
+#include "google/protobuf/io/coded_stream.h"
+#include "google/protobuf/arena.h"
+#include "google/protobuf/arenastring.h"
+#include "google/protobuf/generated_message_tctable_decl.h"
+#include "google/protobuf/generated_message_util.h"
+#include "google/protobuf/metadata_lite.h"
+#include "google/protobuf/generated_message_reflection.h"
+#include "google/protobuf/message.h"
+#include "google/protobuf/repeated_field.h"  // IWYU pragma: export
+#include "google/protobuf/extension_set.h"  // IWYU pragma: export
+#include "google/protobuf/unknown_field_set.h"
 // @@protoc_insertion_point(includes)
-#include <google/protobuf/port_def.inc>
+
+// Must be included last.
+#include "google/protobuf/port_def.inc"
+
 #define PROTOBUF_INTERNAL_EXPORT_stringData_2eproto
-PROTOBUF_NAMESPACE_OPEN
+
+namespace google {
+namespace protobuf {
 namespace internal {
 class AnyMetadata;
 }  // namespace internal
-PROTOBUF_NAMESPACE_CLOSE
+}  // namespace protobuf
+}  // namespace google
 
 // Internal implementation detail -- do not use these members.
 struct TableStruct_stringData_2eproto {
-  static const uint32_t offsets[];
+  static const ::uint32_t offsets[];
 };
-extern const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable descriptor_table_stringData_2eproto;
+extern const ::google::protobuf::internal::DescriptorTable
+    descriptor_table_stringData_2eproto;
 namespace messages {
 namespace stringData {
 class StringData;
@@ -51,22 +62,29 @@ struct StringDataDefaultTypeInternal;
 extern StringDataDefaultTypeInternal _StringData_default_instance_;
 }  // namespace stringData
 }  // namespace messages
-PROTOBUF_NAMESPACE_OPEN
-template<> ::messages::stringData::StringData* Arena::CreateMaybeMessage<::messages::stringData::StringData>(Arena*);
-PROTOBUF_NAMESPACE_CLOSE
+namespace google {
+namespace protobuf {
+}  // namespace protobuf
+}  // namespace google
+
 namespace messages {
 namespace stringData {
 
 // ===================================================================
 
+
+// -------------------------------------------------------------------
+
 class StringData final :
-    public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:messages.stringData.StringData) */ {
+    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:messages.stringData.StringData) */ {
  public:
   inline StringData() : StringData(nullptr) {}
   ~StringData() override;
-  explicit PROTOBUF_CONSTEXPR StringData(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
+  template<typename = void>
+  explicit PROTOBUF_CONSTEXPR StringData(::google::protobuf::internal::ConstantInitialized);
 
-  StringData(const StringData& from);
+  inline StringData(const StringData& from)
+      : StringData(nullptr, from) {}
   StringData(StringData&& from) noexcept
     : StringData() {
     *this = ::std::move(from);
@@ -78,9 +96,9 @@ class StringData final :
   }
   inline StringData& operator=(StringData&& from) noexcept {
     if (this == &from) return *this;
-    if (GetOwningArena() == from.GetOwningArena()
+    if (GetArena() == from.GetArena()
   #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetOwningArena() != nullptr
+        && GetArena() != nullptr
   #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
     ) {
       InternalSwap(&from);
@@ -90,13 +108,22 @@ class StringData final :
     return *this;
   }
 
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() {
+  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
+      ABSL_ATTRIBUTE_LIFETIME_BOUND {
+    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
+  }
+  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
+      ABSL_ATTRIBUTE_LIFETIME_BOUND {
+    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
+  }
+
+  static const ::google::protobuf::Descriptor* descriptor() {
     return GetDescriptor();
   }
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() {
+  static const ::google::protobuf::Descriptor* GetDescriptor() {
     return default_instance().GetMetadata().descriptor;
   }
-  static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() {
+  static const ::google::protobuf::Reflection* GetReflection() {
     return default_instance().GetMetadata().reflection;
   }
   static const StringData& default_instance() {
@@ -115,65 +142,62 @@ class StringData final :
   inline void Swap(StringData* other) {
     if (other == this) return;
   #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() != nullptr &&
-        GetOwningArena() == other->GetOwningArena()) {
+    if (GetArena() != nullptr &&
+        GetArena() == other->GetArena()) {
    #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() == other->GetOwningArena()) {
+    if (GetArena() == other->GetArena()) {
   #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
       InternalSwap(other);
     } else {
-      ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
+      ::google::protobuf::internal::GenericSwap(this, other);
     }
   }
   void UnsafeArenaSwap(StringData* other) {
     if (other == this) return;
-    GOOGLE_DCHECK(GetOwningArena() == other->GetOwningArena());
+    ABSL_DCHECK(GetArena() == other->GetArena());
     InternalSwap(other);
   }
 
   // implements Message ----------------------------------------------
 
-  StringData* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
+  StringData* New(::google::protobuf::Arena* arena = nullptr) const final {
     return CreateMaybeMessage<StringData>(arena);
   }
-  using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
+  using ::google::protobuf::Message::CopyFrom;
   void CopyFrom(const StringData& from);
-  using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
+  using ::google::protobuf::Message::MergeFrom;
   void MergeFrom( const StringData& from) {
     StringData::MergeImpl(*this, from);
   }
   private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg);
+  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
   public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
+  ABSL_ATTRIBUTE_REINITIALIZES void Clear() final;
   bool IsInitialized() const final;
 
-  size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  uint8_t* _InternalSerialize(
-      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
+  ::size_t ByteSizeLong() const final;
+  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
+  ::uint8_t* _InternalSerialize(
+      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
+  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
 
   private:
-  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
+  void SharedCtor(::google::protobuf::Arena* arena);
   void SharedDtor();
-  void SetCachedSize(int size) const final;
   void InternalSwap(StringData* other);
 
   private:
-  friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
-  static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
+  friend class ::google::protobuf::internal::AnyMetadata;
+  static ::absl::string_view FullMessageName() {
     return "messages.stringData.StringData";
   }
   protected:
-  explicit StringData(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                       bool is_message_owned = false);
+  explicit StringData(::google::protobuf::Arena* arena);
+  StringData(::google::protobuf::Arena* arena, const StringData& from);
+  const ::google::protobuf::MessageLite::ClassData* GetClassData() const final;
   public:
 
-  static const ClassData _class_data_;
-  const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*GetClassData() const final;
-
-  ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final;
+  ::google::protobuf::Metadata GetMetadata() const final;
 
   // nested types ----------------------------------------------------
 
@@ -183,104 +207,132 @@ class StringData final :
     kDataFieldNumber = 1,
   };
   // string data = 1;
-  void clear_data();
+  void clear_data() ;
   const std::string& data() const;
-  template <typename ArgT0 = const std::string&, typename... ArgT>
-  void set_data(ArgT0&& arg0, ArgT... args);
+  template <typename Arg_ = const std::string&, typename... Args_>
+  void set_data(Arg_&& arg, Args_... args);
   std::string* mutable_data();
   PROTOBUF_NODISCARD std::string* release_data();
-  void set_allocated_data(std::string* data);
+  void set_allocated_data(std::string* value);
+
   private:
   const std::string& _internal_data() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_data(const std::string& value);
+  inline PROTOBUF_ALWAYS_INLINE void _internal_set_data(
+      const std::string& value);
   std::string* _internal_mutable_data();
-  public:
 
+  public:
   // @@protoc_insertion_point(class_scope:messages.stringData.StringData)
  private:
   class _Internal;
 
-  template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
-  typedef void InternalArenaConstructable_;
-  typedef void DestructorSkippable_;
+  friend class ::google::protobuf::internal::TcParser;
+  static const ::google::protobuf::internal::TcParseTable<
+      0, 1, 0,
+      43, 2>
+      _table_;
+  friend class ::google::protobuf::MessageLite;
+  friend class ::google::protobuf::Arena;
+  template <typename T>
+  friend class ::google::protobuf::Arena::InternalHelper;
+  using InternalArenaConstructable_ = void;
+  using DestructorSkippable_ = void;
   struct Impl_ {
-    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr data_;
-    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
+
+        inline explicit constexpr Impl_(
+            ::google::protobuf::internal::ConstantInitialized) noexcept;
+        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
+                              ::google::protobuf::Arena* arena);
+        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
+                              ::google::protobuf::Arena* arena, const Impl_& from);
+    ::google::protobuf::internal::ArenaStringPtr data_;
+    mutable ::google::protobuf::internal::CachedSize _cached_size_;
+    PROTOBUF_TSAN_DECLARE_MEMBER
   };
   union { Impl_ _impl_; };
   friend struct ::TableStruct_stringData_2eproto;
 };
+
 // ===================================================================
 
 
+
+
 // ===================================================================
 
+
 #ifdef __GNUC__
-  #pragma GCC diagnostic push
-  #pragma GCC diagnostic ignored "-Wstrict-aliasing"
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wstrict-aliasing"
 #endif  // __GNUC__
+// -------------------------------------------------------------------
+
 // StringData
 
 // string data = 1;
 inline void StringData::clear_data() {
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   _impl_.data_.ClearToEmpty();
 }
-inline const std::string& StringData::data() const {
+inline const std::string& StringData::data() const
+    ABSL_ATTRIBUTE_LIFETIME_BOUND {
   // @@protoc_insertion_point(field_get:messages.stringData.StringData.data)
   return _internal_data();
 }
-template <typename ArgT0, typename... ArgT>
-inline PROTOBUF_ALWAYS_INLINE
-void StringData::set_data(ArgT0&& arg0, ArgT... args) {
- 
- _impl_.data_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+template <typename Arg_, typename... Args_>
+inline PROTOBUF_ALWAYS_INLINE void StringData::set_data(Arg_&& arg,
+                                                     Args_... args) {
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  ;
+  _impl_.data_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
   // @@protoc_insertion_point(field_set:messages.stringData.StringData.data)
 }
-inline std::string* StringData::mutable_data() {
+inline std::string* StringData::mutable_data() ABSL_ATTRIBUTE_LIFETIME_BOUND {
   std::string* _s = _internal_mutable_data();
   // @@protoc_insertion_point(field_mutable:messages.stringData.StringData.data)
   return _s;
 }
 inline const std::string& StringData::_internal_data() const {
+  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
   return _impl_.data_.Get();
 }
 inline void StringData::_internal_set_data(const std::string& value) {
-  
-  _impl_.data_.Set(value, GetArenaForAllocation());
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  ;
+  _impl_.data_.Set(value, GetArena());
 }
 inline std::string* StringData::_internal_mutable_data() {
-  
-  return _impl_.data_.Mutable(GetArenaForAllocation());
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  ;
+  return _impl_.data_.Mutable( GetArena());
 }
 inline std::string* StringData::release_data() {
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
   // @@protoc_insertion_point(field_release:messages.stringData.StringData.data)
   return _impl_.data_.Release();
 }
-inline void StringData::set_allocated_data(std::string* data) {
-  if (data != nullptr) {
-    
-  } else {
-    
-  }
-  _impl_.data_.SetAllocated(data, GetArenaForAllocation());
-#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (_impl_.data_.IsDefault()) {
-    _impl_.data_.Set("", GetArenaForAllocation());
-  }
-#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+inline void StringData::set_allocated_data(std::string* value) {
+  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
+  _impl_.data_.SetAllocated(value, GetArena());
+  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+        if (_impl_.data_.IsDefault()) {
+          _impl_.data_.Set("", GetArena());
+        }
+  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:messages.stringData.StringData.data)
 }
 
 #ifdef __GNUC__
-  #pragma GCC diagnostic pop
+#pragma GCC diagnostic pop
 #endif  // __GNUC__
 
 // @@protoc_insertion_point(namespace_scope)
-
 }  // namespace stringData
 }  // namespace messages
 
+
 // @@protoc_insertion_point(global_scope)
 
-#include <google/protobuf/port_undef.inc>
-#endif  // GOOGLE_PROTOBUF_INCLUDED_GOOGLE_PROTOBUF_INCLUDED_stringData_2eproto
+#include "google/protobuf/port_undef.inc"
+
+#endif  // GOOGLE_PROTOBUF_INCLUDED_stringData_2eproto_2epb_2eh
diff --git a/libs/cppzmq b/libs/cppzmq
new file mode 160000
index 0000000..6164cf7
--- /dev/null
+++ b/libs/cppzmq
@@ -0,0 +1 @@
+Subproject commit 6164cf7dbc1df6d1bd8e4c6c5f8e52d7dea63aa7
diff --git a/libs/cppzmq/.clang-format b/libs/cppzmq/.clang-format
deleted file mode 100644
index 28f3353..0000000
--- a/libs/cppzmq/.clang-format
+++ /dev/null
@@ -1,53 +0,0 @@
-BasedOnStyle: LLVM
-IndentWidth: 4
-UseTab: Never
-BreakBeforeBraces: Custom
-BraceWrapping:
-    AfterClass: true
-    AfterControlStatement: false
-    AfterEnum: true
-    AfterFunction: true
-    AfterNamespace: true
-    AfterObjCDeclaration: true
-    AfterStruct: true
-    AfterUnion: true
-    BeforeCatch: true
-    BeforeElse: false
-    IndentBraces: false
-
-AlignConsecutiveAssignments: false
-AlignConsecutiveDeclarations: false
-AllowShortIfStatementsOnASingleLine: false
-IndentCaseLabels: true
-BinPackArguments: true
-BinPackParameters: false
-AlignTrailingComments: true
-AllowShortBlocksOnASingleLine: false
-AllowAllParametersOfDeclarationOnNextLine: true
-AllowShortFunctionsOnASingleLine: InlineOnly
-AlwaysBreakTemplateDeclarations: false
-ColumnLimit: 85
-MaxEmptyLinesToKeep: 2
-KeepEmptyLinesAtTheStartOfBlocks: false
-ContinuationIndentWidth: 2
-PointerAlignment: Right
-ReflowComments: false
-SpaceBeforeAssignmentOperators: true
-SpaceBeforeParens: ControlStatements
-SpaceInEmptyParentheses: false
-SpacesInAngles: false
-SpacesInParentheses: false
-SpacesInSquareBrackets: false
-Standard: Cpp11
-
-SortIncludes: false
-
-FixNamespaceComments: false
-BreakBeforeBinaryOperators: NonAssignment
-SpaceAfterTemplateKeyword: false
-AlignAfterOpenBracket: Align
-AlignOperands: true
-BreakConstructorInitializers: AfterColon
-ConstructorInitializerAllOnOneLineOrOnePerLine: true
-SpaceAfterCStyleCast: true
-BreakBeforeTernaryOperators: true
diff --git a/libs/cppzmq/.github/workflows/ci.yml b/libs/cppzmq/.github/workflows/ci.yml
deleted file mode 100644
index ccceb96..0000000
--- a/libs/cppzmq/.github/workflows/ci.yml
+++ /dev/null
@@ -1,195 +0,0 @@
-name: CI
-
-on: [push, pull_request]
-
-defaults:
-  run:
-    shell: bash
-
-jobs:
-  tests:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: ["ubuntu-latest"]
-        cppstd: ["98", "11", "20"]
-        cc: ["gcc-10"]
-        cxx: ["g++-10"]
-        drafts: ["ON"]
-        libzmq: ["4.3.4"]
-        libzmqbuild: ["cmake"]
-        include:
-          # older libzmq and gcc without draft
-          - os: "ubuntu-18.04"
-            cppstd: "11"
-            cc: "gcc-7"
-            cxx: "g++-7"
-            drafts: "OFF"
-            libzmq: "4.2.0"
-            libzmqbuild: "pkgconfig"
-          # gcc 4.8
-          - os: "ubuntu-18.04"
-            cppstd: "11"
-            cc: "gcc-4.8"
-            cxx: "g++-4.8"
-            drafts: "ON"
-            libzmq: "4.3.4"
-            libzmqbuild: "cmake"
-            aptinstall: "gcc-4.8 g++-4.8"
-          # gcc 5
-          - os: "ubuntu-18.04"
-            cppstd: "11"
-            cc: "gcc-5"
-            cxx: "g++-5"
-            drafts: "ON"
-            libzmq: "4.3.4"
-            libzmqbuild: "cmake"
-            aptinstall: "gcc-5 g++-5"
-          # without draft
-          - os: "ubuntu-latest"
-            cppstd: "20"
-            cc: "gcc-10"
-            cxx: "g++-10"
-            drafts: "OFF"
-            libzmq: "4.3.4"
-            libzmqbuild: "cmake"
-          # coverage (gcc version should match gcov version)
-          - os: "ubuntu-latest"
-            cppstd: "17"
-            cc: "gcc-9"
-            cxx: "g++-9"
-            drafts: "ON"
-            libzmq: "4.3.4"
-            libzmqbuild: "cmake"
-            coverage: "-DCOVERAGE=ON"
-            aptinstall: "lcov"
-          # clang
-          - os: "ubuntu-latest"
-            cppstd: "17"
-            cc: "clang-12"
-            cxx: "clang++-12"
-            drafts: "ON"
-            libzmq: "4.3.4"
-            libzmqbuild: "cmake"
-          # macos
-          - os: "macos-latest"
-            cppstd: "17"
-            cc: "clang"
-            cxx: "clang++"
-            drafts: "OFF"
-            libzmq: "4.3.4"
-            libzmqbuild: false
-            brewinstall: "zeromq"
-          # windows
-          - os: "windows-2019"
-            cppstd: "14"
-            cc: "msbuild"
-            cxx: "msbuild"
-            drafts: "ON"
-            libzmq: "4.3.4"
-            libzmqbuild: "cmake"
-            platform: "-Ax64"
-          - os: "windows-latest"
-            cppstd: "20"
-            cc: "msbuild"
-            cxx: "msbuild"
-            drafts: "ON"
-            libzmq: "4.3.4"
-            libzmqbuild: "cmake"
-            platform: "-Ax64"
-
-    env:
-      CC: ${{ matrix.cc }}
-      CXX: ${{ matrix.cxx }}
-      VERBOSE: 1
-      THREADS: 2
-      BUILDTYPE: "Debug"
-
-    steps:
-    - uses: actions/checkout@v2
-
-    - name: install_deps
-      run: |
-        if [ ! -z "${{ matrix.aptinstall }}" ]; then
-          sudo apt install -y ${{ matrix.aptinstall }}
-        fi
-        if [ ! -z "${{ matrix.brewinstall }}" ]; then
-          brew install ${{ matrix.brewinstall }}
-        fi
-
-    - name: get_libzmq
-      run: |
-        curl -L https://github.com/zeromq/libzmq/archive/v${{ matrix.libzmq }}.tar.gz \
-          >zeromq.tar.gz
-        tar -xvzf zeromq.tar.gz
-
-    - name: build_libzmq_cmake
-      if: ${{ matrix.libzmqbuild == 'cmake' }}
-      run: |
-        cmake -Hlibzmq-${{ matrix.libzmq }} -Blibzmq-build ${{ matrix.platform}} \
-          -DWITH_PERF_TOOL=OFF \
-          -DZMQ_BUILD_TESTS=OFF \
-          -DCMAKE_BUILD_TYPE=Release \
-          -DENABLE_DRAFTS=${{ matrix.drafts }}
-        cmake --build libzmq-build --config ${BUILDTYPE} -j ${THREADS}
-        echo "LIBZMQ=${PWD}/libzmq-build" >> ${GITHUB_ENV}
-
-    - name: build_libzmq_pkgconfig
-      if: ${{ matrix.libzmqbuild == 'pkgconfig' }}
-      working-directory: libzmq-${{ matrix.libzmq }}
-      run: |
-        ./autogen.sh &&
-        ./configure --prefix=${PWD}/libzmq-build &&
-        make -j ${THREADS}
-        make install
-        echo "LIBZMQ=${PWD}/libzmq-build" >> ${GITHUB_ENV}
-
-    - name: build
-      env:
-        CMAKE_PREFIX_PATH: ${{ env.LIBZMQ }}
-      run: |
-        cmake -H. -Bbuild ${{ matrix.platform}} ${{ matrix.coverage }} \
-          -DCMAKE_BUILD_TYPE=${BUILDTYPE} \
-          -DENABLE_DRAFTS=${{ matrix.drafts }} \
-          -DCMAKE_CXX_STANDARD=${{ matrix.cppstd }}
-        cmake --build build --config ${BUILDTYPE} -j ${THREADS}
-        echo "CPPZMQ=${PWD}/build" >> ${GITHUB_ENV}
-
-    - name: test
-      # for unknown reason no tests are found and run on windows
-      # could be something to do with catch_discover_tests not working?
-      run: |
-        cd ${{ env.CPPZMQ }}
-        ctest -V -C ${BUILDTYPE}
-
-    - name: demo
-      # probably need to install libzmq and cppzmq for this to work on windows
-      if: ${{ matrix.os == 'ubuntu*' }}
-      env:
-        CMAKE_PREFIX_PATH: ${{ env.LIBZMQ }}:${{ env.CPPZMQ }}
-      run: |
-        cd demo
-        cmake -H. -Bbuild ${{ matrix.platform}} \
-          -DCMAKE_BUILD_TYPE=${BUILDTYPE} \
-          -DCMAKE_CXX_STANDARD=${{ matrix.cppstd }}
-        cmake --build build --config ${BUILDTYPE}
-        cd build
-        ctest -V -C ${BUILDTYPE}
-
-    - name: lcov
-      if: ${{ matrix.coverage && success() }}
-      run: |
-        lcov --capture --directory . --output-file coverage.info
-        lcov --remove coverage.info -o coverage_filtered.info \
-          '/usr/include/*' \
-          '/usr/local/include/*' \
-          ${PWD}'/tests/*' \
-          ${PWD}'/build/*'
-      # to generate local html: genhtml coverage_filtered.info --output-directory .
-
-    - name: coveralls_upload
-      if: ${{ matrix.coverage && success() }}
-      uses: coverallsapp/github-action@master
-      with:
-        github-token: ${{ secrets.GITHUB_TOKEN }}
-        path-to-lcov: ./coverage_filtered.info
diff --git a/libs/cppzmq/.gitignore b/libs/cppzmq/.gitignore
deleted file mode 100644
index cb4c751..0000000
--- a/libs/cppzmq/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-# Vim tmp files
-*.swp
-
-# Build directory
-*build/
diff --git a/libs/cppzmq/CMakeLists.txt b/libs/cppzmq/CMakeLists.txt
deleted file mode 100644
index 05001ad..0000000
--- a/libs/cppzmq/CMakeLists.txt
+++ /dev/null
@@ -1,112 +0,0 @@
-cmake_minimum_required(VERSION 3.11)
-
-list (APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
-
-include (DetectCPPZMQVersion)
-
-project(cppzmq VERSION ${DETECTED_CPPZMQ_VERSION})
-
-if (NOT TARGET libzmq AND NOT TARGET libzmq-static)
-  find_package(ZeroMQ QUIET)
-
-  # libzmq autotools install: fallback to pkg-config
-  if(NOT ZeroMQ_FOUND)
-    message(STATUS "CMake libzmq package not found, trying again with pkg-config (normal install of zeromq)")
-    list (APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/libzmq-pkg-config)
-    find_package(ZeroMQ REQUIRED)
-  endif()
-
-  # TODO "REQUIRED" above should already cause a fatal failure if not found, but this doesn't seem to work
-  if(NOT ZeroMQ_FOUND)
-    message(FATAL_ERROR "ZeroMQ was not found, neither as a CMake package nor via pkg-config")
-  endif()
-
-  if (ZeroMQ_FOUND AND NOT (TARGET libzmq OR TARGET libzmq-static))
-    message(FATAL_ERROR "ZeroMQ version not supported!")
-  endif()
-endif()
-
-if (EXISTS "${CMAKE_SOURCE_DIR}/.git")
-    OPTION (ENABLE_DRAFTS "Build and install draft classes and methods" ON)
-else ()
-    OPTION (ENABLE_DRAFTS "Build and install draft classes and methods" OFF)
-endif ()
-if (ENABLE_DRAFTS)
-    ADD_DEFINITIONS (-DZMQ_BUILD_DRAFT_API)
-    set (pkg_config_defines "-DZMQ_BUILD_DRAFT_API=1")
-else (ENABLE_DRAFTS)
-    set (pkg_config_defines "")
-endif (ENABLE_DRAFTS)
-
-message(STATUS "cppzmq v${cppzmq_VERSION}")
-
-set(CPPZMQ_HEADERS
-    zmq.hpp
-    zmq_addon.hpp
-)
-
-foreach (target cppzmq cppzmq-static)
-  add_library(${target} INTERFACE)
-  target_include_directories(${target} INTERFACE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
-                                                 $<INSTALL_INTERFACE:include>)
-endforeach()
-
-target_link_libraries(cppzmq INTERFACE libzmq)
-target_link_libraries(cppzmq-static INTERFACE libzmq-static)
-
-include(GNUInstallDirs)
-include(CMakePackageConfigHelpers)
-
-install(TARGETS cppzmq cppzmq-static
-        EXPORT ${PROJECT_NAME}-targets)
-
-install(FILES ${CPPZMQ_HEADERS}
-        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
-
-# GNUInstallDirs "DATADIR" wrong here; CMake search path wants "share".
-set(CPPZMQ_CMAKECONFIG_INSTALL_DIR "share/cmake/${PROJECT_NAME}" CACHE STRING "install path for cppzmqConfig.cmake")
-
-configure_file(libzmq-pkg-config/FindZeroMQ.cmake
-               libzmq-pkg-config/FindZeroMQ.cmake
-               COPYONLY)
-
-export(EXPORT ${PROJECT_NAME}-targets
-     FILE "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Targets.cmake")
-configure_package_config_file(${PROJECT_NAME}Config.cmake.in
-                              "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake"
-                              INSTALL_DESTINATION ${CPPZMQ_CMAKECONFIG_INSTALL_DIR})
-# Workaround until ARCH_INDEPENDENT flag can be used with cmake 3.14.
-# The ConigVersion.cmake file contains checks for the architecture is was
-# generated on, which can cause problems for header only libraries
-# used with e.g. the Conan package manager. Since it is header only we
-# can/should omit those checks.
-set(CPPZMQ_SIZEOF_VOID_P ${CMAKE_SIZEOF_VOID_P})
-set(CMAKE_SIZEOF_VOID_P "") # a simple unset is not sufficient
-write_basic_package_version_file(${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
-                                 VERSION ${CPPZMQ_VERSION}
-                                 COMPATIBILITY AnyNewerVersion)
-set(CMAKE_SIZEOF_VOID_P ${CPPZMQ_SIZEOF_VOID_P})
-
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cppzmq.pc.in
-               ${CMAKE_CURRENT_BINARY_DIR}/cppzmq.pc @ONLY)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/cppzmq.pc
-              DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
-
-install(EXPORT ${PROJECT_NAME}-targets
-        FILE ${PROJECT_NAME}Targets.cmake
-        DESTINATION ${CPPZMQ_CMAKECONFIG_INSTALL_DIR})
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
-              ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
-              DESTINATION ${CPPZMQ_CMAKECONFIG_INSTALL_DIR})
-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/libzmq-pkg-config/FindZeroMQ.cmake
-              DESTINATION ${CPPZMQ_CMAKECONFIG_INSTALL_DIR}/libzmq-pkg-config)
-
-option(CPPZMQ_BUILD_TESTS "Whether or not to build the tests" ON)
-
-if (CPPZMQ_BUILD_TESTS)
-    enable_testing()
-    add_subdirectory(tests)
-    if (CMAKE_CXX_STANDARD AND NOT CMAKE_CXX_STANDARD EQUAL 98 AND CMAKE_CXX_STANDARD GREATER_EQUAL 11)
-        add_subdirectory(examples)
-    endif()
-endif()
diff --git a/libs/cppzmq/LICENSE b/libs/cppzmq/LICENSE
deleted file mode 100644
index ae98bd8..0000000
--- a/libs/cppzmq/LICENSE
+++ /dev/null
@@ -1,17 +0,0 @@
-    Permission is hereby granted, free of charge, to any person obtaining a copy
-    of this software and associated documentation files (the "Software"), to
-    deal in the Software without restriction, including without limitation the
-    rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-    sell copies of the Software, and to permit persons to whom the Software is
-    furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be included in
-    all copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-    IN THE SOFTWARE.
diff --git a/libs/cppzmq/README.md b/libs/cppzmq/README.md
deleted file mode 100644
index e2bea0b..0000000
--- a/libs/cppzmq/README.md
+++ /dev/null
@@ -1,196 +0,0 @@
-[![CI](https://github.com/zeromq/cppzmq/actions/workflows/ci.yml/badge.svg)](https://github.com/zeromq/cppzmq/actions)
-[![Coverage Status](https://coveralls.io/repos/github/zeromq/cppzmq/badge.svg?branch=master)](https://coveralls.io/github/zeromq/cppzmq?branch=master)
-[![License](https://img.shields.io/github/license/zeromq/cppzmq.svg)](https://github.com/zeromq/cppzmq/blob/master/LICENSE)
-
-Introduction & Design Goals
-===========================
-
-cppzmq is a C++ binding for libzmq. It has the following design goals:
- - cppzmq maps the libzmq C API to C++ concepts. In particular:
-   - it is type-safe (the libzmq C API exposes various class-like concepts as void*)
-   - it provides exception-based error handling (the libzmq C API provides errno-based error handling)
-   - it provides RAII-style classes that automate resource management (the libzmq C API requires the user to take care to free resources explicitly)
- - cppzmq is a light-weight, header-only binding. You only need to include the header file zmq.hpp (and maybe zmq_addon.hpp) to use it.
- - zmq.hpp is meant to contain direct mappings of the abstractions provided by the libzmq C API, while zmq_addon.hpp provides additional higher-level abstractions.
-
-There are other C++ bindings for ZeroMQ with different design goals. In particular, none of the following bindings are header-only:
- - [zmqpp](https://github.com/zeromq/zmqpp) is a high-level binding to libzmq.
- - [czmqpp](https://github.com/zeromq/czmqpp) is a binding based on the high-level czmq API.
- - [fbzmq](https://github.com/facebook/fbzmq) is a binding that integrates with Apache Thrift and provides higher-level abstractions in addition. It requires C++14.
-
-Supported platforms
-===================
-
- - Only a subset of the platforms that are supported by libzmq itself are supported. Some features already require a compiler supporting C++11. In the future, probably all features will require C++11. To build and run the tests, CMake and Catch are required.
- - Any libzmq 4.x version is expected to work. DRAFT features may only work for the most recent tested version. Currently explicitly tested libzmq versions are
-   - 4.2.0 (without DRAFT API)
-   - 4.3.4 (with and without DRAFT API)
- - Platforms with full support (i.e. CI executing build and tests)
-   - Ubuntu 18.04 x64 (with gcc 4.8.5, 5.5.0, 7.5.0)
-   - Ubuntu 20.04 x64 (with gcc 9.3.0, 10.3.0 and clang 12)
-   - Visual Studio 2017 x64
-   - Visual Studio 2019 x64
-   - macOS 10.15 (with clang 12, without DRAFT API)
- - Additional platforms that are known to work:
-   - We have no current reports on additional platforms that are known to work yet. Please add your platform here. If CI can be provided for them with a cloud-based CI service working with GitHub, you are invited to add CI, and make it possible to be included in the list above.
- - Additional platforms that probably work:
-   - Any platform supported by libzmq that provides a sufficiently recent gcc (4.8.1 or newer) or clang (3.4.1 or newer)
-   - Visual Studio 2012+ x86/x64
-
-Examples
-========
-These examples require at least C++11.
-```c++
-#include <zmq.hpp>
-
-int main()
-{
-    zmq::context_t ctx;
-    zmq::socket_t sock(ctx, zmq::socket_type::push);
-    sock.bind("inproc://test");
-    sock.send(zmq::str_buffer("Hello, world"), zmq::send_flags::dontwait);
-}
-```
-This a more complex example where we send and receive multi-part messages over TCP with a wildcard port.
-```c++
-#include <iostream>
-#include <zmq_addon.hpp>
-
-int main()
-{
-    zmq::context_t ctx;
-    zmq::socket_t sock1(ctx, zmq::socket_type::push);
-    zmq::socket_t sock2(ctx, zmq::socket_type::pull);
-    sock1.bind("tcp://127.0.0.1:*");
-    const std::string last_endpoint =
-        sock1.get(zmq::sockopt::last_endpoint);
-    std::cout << "Connecting to "
-              << last_endpoint << std::endl;
-    sock2.connect(last_endpoint);
-
-    std::array<zmq::const_buffer, 2> send_msgs = {
-        zmq::str_buffer("foo"),
-        zmq::str_buffer("bar!")
-    };
-    if (!zmq::send_multipart(sock1, send_msgs))
-        return 1;
-
-    std::vector<zmq::message_t> recv_msgs;
-    const auto ret = zmq::recv_multipart(
-        sock2, std::back_inserter(recv_msgs));
-    if (!ret)
-        return 1;
-    std::cout << "Got " << *ret
-              << " messages" << std::endl;
-    return 0;
-}
-```
-
-See the `examples` directory for more examples. When the project is compiled with tests enabled, each example gets compiled to an executable.
-
-
-API Overview
-============
-
-For an extensive overview of the `zmq.hpp` API in use, see this [Tour of CPPZMQ by @brettviren](https://brettviren.github.io/cppzmq-tour/index.html).
-
-Bindings for libzmq in `zmq.hpp`:
-
-Types:
-* class `zmq::context_t`
-* enum `zmq::ctxopt`
-* class `zmq::socket_t`
-* class `zmq::socket_ref`
-* enum `zmq::socket_type`
-* enum `zmq::sockopt`
-* enum `zmq::send_flags`
-* enum `zmq::recv_flags`
-* class `zmq::message_t`
-* class `zmq::const_buffer`
-* class `zmq::mutable_buffer`
-* struct `zmq::recv_buffer_size`
-* alias `zmq::send_result_t`
-* alias `zmq::recv_result_t`
-* alias `zmq::recv_buffer_result_t`
-* class `zmq::error_t`
-* class `zmq::monitor_t`
-* struct `zmq_event_t`,
-* alias `zmq::free_fn`,
-* alias `zmq::pollitem_t`,
-* alias `zmq::fd_t`
-* class `zmq::poller_t` DRAFT
-* enum `zmq::event_flags` DRAFT
-* enum `zmq::poller_event` DRAFT
-
-Functions:
-* `zmq::version`
-* `zmq::poll`
-* `zmq::proxy`
-* `zmq::proxy_steerable`
-* `zmq::buffer`
-* `zmq::str_buffer`
-
-Extra high-level types and functions `zmq_addon.hpp`:
-
-Types:
-* class `zmq::multipart_t`
-* class `zmq::active_poller_t` DRAFT
-
-Functions:
-* `zmq::recv_multipart`
-* `zmq::send_multipart`
-* `zmq::send_multipart_n`
-* `zmq::encode`
-* `zmq::decode`
-
-Compatibility Guidelines
-========================
-
-The users of cppzmq are expected to follow the guidelines below to ensure not to break when upgrading cppzmq to newer versions (non-exhaustive list):
-
-* Do not depend on any macros defined in cppzmq unless explicitly declared public here.
-
-The following macros may be used by consumers of cppzmq: `CPPZMQ_VERSION`, `CPPZMQ_VERSION_MAJOR`, `CPPZMQ_VERSION_MINOR`, `CPPZMQ_VERSION_PATCH`.
-
-Contribution policy
-===================
-
-The contribution policy is at: http://rfc.zeromq.org/spec:22
-
-Build instructions
-==================
-
-Build steps:
-
-1. Build [libzmq](https://github.com/zeromq/libzmq) via cmake. This does an out of source build and installs the build files
-   - download and unzip the lib, cd to directory
-   - mkdir build
-   - cd build
-   - cmake ..
-   - sudo make -j4 install
-
-2. Build cppzmq via cmake. This does an out of source build and installs the build files
-   - download and unzip the lib, cd to directory
-   - mkdir build
-   - cd build
-   - cmake ..
-   - sudo make -j4 install
-
-3. Build cppzmq via [vcpkg](https://github.com/Microsoft/vcpkg/). This does an out of source build and installs the build files
-   - git clone https://github.com/Microsoft/vcpkg.git
-   - cd vcpkg
-   - ./bootstrap-vcpkg.sh # bootstrap-vcpkg.bat for Powershell
-   - ./vcpkg integrate install
-   - ./vcpkg install cppzmq
-
-Using this:
-
-A cmake find package scripts is provided for you to easily include this library.
-Add these lines in your CMakeLists.txt to include the headers and library files of
-cpp zmq (which will also include libzmq for you).
-
-```
-#find cppzmq wrapper, installed by make of cppzmq
-find_package(cppzmq)
-target_link_libraries(*Your Project Name* cppzmq)
-```
diff --git a/libs/cppzmq/cmake/DetectCPPZMQVersion.cmake b/libs/cppzmq/cmake/DetectCPPZMQVersion.cmake
deleted file mode 100644
index 99ed9bf..0000000
--- a/libs/cppzmq/cmake/DetectCPPZMQVersion.cmake
+++ /dev/null
@@ -1,8 +0,0 @@
-
-file(READ "${CMAKE_CURRENT_SOURCE_DIR}/zmq.hpp" _CPPZMQ_H_CONTENTS)
-string(REGEX REPLACE ".*#define CPPZMQ_VERSION_MAJOR ([0-9]+).*" "\\1" DETECTED_CPPZMQ_VERSION_MAJOR "${_CPPZMQ_H_CONTENTS}")
-string(REGEX REPLACE ".*#define CPPZMQ_VERSION_MINOR ([0-9]+).*" "\\1" DETECTED_CPPZMQ_VERSION_MINOR "${_CPPZMQ_H_CONTENTS}")
-string(REGEX REPLACE ".*#define CPPZMQ_VERSION_PATCH ([0-9]+).*" "\\1" DETECTED_CPPZMQ_VERSION_PATCH "${_CPPZMQ_H_CONTENTS}")
-set(DETECTED_CPPZMQ_VERSION "${DETECTED_CPPZMQ_VERSION_MAJOR}.${DETECTED_CPPZMQ_VERSION_MINOR}.${DETECTED_CPPZMQ_VERSION_PATCH}")
-
-message(STATUS "Detected CPPZMQ Version - ${DETECTED_CPPZMQ_VERSION}")
diff --git a/libs/cppzmq/cppzmq.pc.in b/libs/cppzmq/cppzmq.pc.in
deleted file mode 100644
index 3dc945d..0000000
--- a/libs/cppzmq/cppzmq.pc.in
+++ /dev/null
@@ -1,9 +0,0 @@
-prefix="@CMAKE_INSTALL_PREFIX@"
-includedir="@CMAKE_INSTALL_FULL_INCLUDEDIR@"
-
-Name: @PROJECT_NAME@
-Description: C++ binding for libzmq
-URL: https://github.com/zeromq/cppzmq
-Version: @PROJECT_VERSION@
-Requires: libzmq
-Cflags: -I"${includedir}" @pkg_config_defines@
diff --git a/libs/cppzmq/cppzmqConfig.cmake.in b/libs/cppzmq/cppzmqConfig.cmake.in
deleted file mode 100644
index f596517..0000000
--- a/libs/cppzmq/cppzmqConfig.cmake.in
+++ /dev/null
@@ -1,36 +0,0 @@
-# cppzmq cmake module
-#
-# The following import targets are created
-#
-# ::
-#
-#   cppzmq-static
-#   cppzmq
-#
-# This module sets the following variables in your project::
-#
-# cppzmq_FOUND - true if cppzmq found on the system
-# cppzmq_INCLUDE_DIR - the directory containing cppzmq headers
-# cppzmq_LIBRARY - the ZeroMQ library for dynamic linking
-# cppzmq_STATIC_LIBRARY - the ZeroMQ library for static linking
-
-@PACKAGE_INIT@
-
-include(CMakeFindDependencyMacro)
-find_package(ZeroMQ QUIET)
-
-# libzmq autotools install: fallback to pkg-config
-if(NOT ZeroMQ_FOUND)
-    list (APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/libzmq-pkg-config)
-    find_package(ZeroMQ REQUIRED)
-endif()
-
-if(NOT ZeroMQ_FOUND)
-    message(FATAL_ERROR "ZeroMQ was NOT found!")
-endif()
-
-if(NOT TARGET @PROJECT_NAME@)
-    include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake")
-    get_target_property(@PROJECT_NAME@_INCLUDE_DIR cppzmq INTERFACE_INCLUDE_DIRECTORIES)
-endif()
-
diff --git a/libs/cppzmq/demo/CMakeLists.txt b/libs/cppzmq/demo/CMakeLists.txt
deleted file mode 100644
index 1c90825..0000000
--- a/libs/cppzmq/demo/CMakeLists.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-cmake_minimum_required(VERSION 3.0 FATAL_ERROR)
-
-project(cppzmq-demo CXX)
-
-find_package(cppzmq)
-
-enable_testing()
-add_executable(
-    demo
-    main.cpp
-    )
-
-target_link_libraries(
-    demo
-    cppzmq
-    )
-
-add_test(
-  NAME
-    demo
-  COMMAND
-    ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_BINDIR}/demo
-  )
diff --git a/libs/cppzmq/demo/main.cpp b/libs/cppzmq/demo/main.cpp
deleted file mode 100644
index 077fc98..0000000
--- a/libs/cppzmq/demo/main.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <zmq.hpp>
-
-int main(int argc, char **argv)
-{
-    zmq::context_t context;
-    return 0;
-}
diff --git a/libs/cppzmq/examples/CMakeLists.txt b/libs/cppzmq/examples/CMakeLists.txt
deleted file mode 100644
index 1b47e03..0000000
--- a/libs/cppzmq/examples/CMakeLists.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-cmake_minimum_required(VERSION 3.0 FATAL_ERROR)
-
-project(cppzmq-examples CXX)
-
-# place binaries and libraries according to GNU standards
-
-include(GNUInstallDirs)
-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR})
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR})
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_BINDIR})
-
-find_package(Threads)
-find_package(cppzmq)
-
-add_executable(
-    pubsub_multithread_inproc
-    pubsub_multithread_inproc.cpp
-)
-target_link_libraries(
-    pubsub_multithread_inproc
-    PRIVATE cppzmq ${CMAKE_THREAD_LIBS_INIT}
-)
-
-add_executable(
-    hello_world
-    hello_world.cpp
-)
-target_link_libraries(
-    hello_world
-    PRIVATE cppzmq ${CMAKE_THREAD_LIBS_INIT}
-)
-
-add_executable(
-    multipart_messages
-    multipart_messages.cpp
-)
-target_link_libraries(
-    multipart_messages
-    PRIVATE cppzmq ${CMAKE_THREAD_LIBS_INIT}
-)
diff --git a/libs/cppzmq/examples/hello_world.cpp b/libs/cppzmq/examples/hello_world.cpp
deleted file mode 100644
index 8719448..0000000
--- a/libs/cppzmq/examples/hello_world.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-#include <zmq.hpp>
-
-int main()
-{
-    zmq::context_t ctx;
-    zmq::socket_t sock(ctx, zmq::socket_type::push);
-    sock.bind("inproc://test");
-    sock.send(zmq::str_buffer("Hello, world"), zmq::send_flags::dontwait);
-}
diff --git a/libs/cppzmq/examples/multipart_messages.cpp b/libs/cppzmq/examples/multipart_messages.cpp
deleted file mode 100644
index 1af8f8f..0000000
--- a/libs/cppzmq/examples/multipart_messages.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-#include <iostream>
-#include <zmq_addon.hpp>
-
-int main()
-{
-    zmq::context_t ctx;
-    zmq::socket_t sock1(ctx, zmq::socket_type::push);
-    zmq::socket_t sock2(ctx, zmq::socket_type::pull);
-    sock1.bind("tcp://127.0.0.1:*");
-    const std::string last_endpoint =
-        sock1.get(zmq::sockopt::last_endpoint);
-    std::cout << "Connecting to "
-              << last_endpoint << std::endl;
-    sock2.connect(last_endpoint);
-
-    std::array<zmq::const_buffer, 2> send_msgs = {
-        zmq::str_buffer("foo"),
-        zmq::str_buffer("bar!")
-    };
-    if (!zmq::send_multipart(sock1, send_msgs))
-        return 1;
-
-    std::vector<zmq::message_t> recv_msgs;
-    const auto ret = zmq::recv_multipart(
-        sock2, std::back_inserter(recv_msgs));
-    if (!ret)
-        return 1;
-    std::cout << "Got " << *ret
-              << " messages" << std::endl;
-    return 0;
-}
diff --git a/libs/cppzmq/examples/pubsub_multithread_inproc.cpp b/libs/cppzmq/examples/pubsub_multithread_inproc.cpp
deleted file mode 100644
index 2727f7b..0000000
--- a/libs/cppzmq/examples/pubsub_multithread_inproc.cpp
+++ /dev/null
@@ -1,102 +0,0 @@
-#include <future>
-#include <iostream>
-#include <string>
-#include <thread>
-
-#include "zmq.hpp"
-#include "zmq_addon.hpp"
-
-void PublisherThread(zmq::context_t *ctx) {
-    //  Prepare publisher
-    zmq::socket_t publisher(*ctx, zmq::socket_type::pub);
-    publisher.bind("inproc://#1");
-
-    // Give the subscribers a chance to connect, so they don't lose any messages
-    std::this_thread::sleep_for(std::chrono::milliseconds(20));
-
-    while (true) {
-        //  Write three messages, each with an envelope and content
-        publisher.send(zmq::str_buffer("A"), zmq::send_flags::sndmore);
-        publisher.send(zmq::str_buffer("Message in A envelope"));
-        publisher.send(zmq::str_buffer("B"), zmq::send_flags::sndmore);
-        publisher.send(zmq::str_buffer("Message in B envelope"));
-        publisher.send(zmq::str_buffer("C"), zmq::send_flags::sndmore);
-        publisher.send(zmq::str_buffer("Message in C envelope"));
-        std::this_thread::sleep_for(std::chrono::milliseconds(100));
-    }
-}
-
-void SubscriberThread1(zmq::context_t *ctx) {
-    //  Prepare subscriber
-    zmq::socket_t subscriber(*ctx, zmq::socket_type::sub);
-    subscriber.connect("inproc://#1");
-
-    //  Thread2 opens "A" and "B" envelopes
-    subscriber.set(zmq::sockopt::subscribe, "A");
-    subscriber.set(zmq::sockopt::subscribe, "B");
-
-    while (1) {
-        // Receive all parts of the message
-        std::vector<zmq::message_t> recv_msgs;
-        zmq::recv_result_t result =
-          zmq::recv_multipart(subscriber, std::back_inserter(recv_msgs));
-        assert(result && "recv failed");
-        assert(*result == 2);
-
-        std::cout << "Thread2: [" << recv_msgs[0].to_string() << "] "
-                  << recv_msgs[1].to_string() << std::endl;
-    }
-}
-
-void SubscriberThread2(zmq::context_t *ctx) {
-    //  Prepare our context and subscriber
-    zmq::socket_t subscriber(*ctx, zmq::socket_type::sub);
-    subscriber.connect("inproc://#1");
-
-    //  Thread3 opens ALL envelopes
-    subscriber.set(zmq::sockopt::subscribe, "");
-
-    while (1) {
-        // Receive all parts of the message
-        std::vector<zmq::message_t> recv_msgs;
-        zmq::recv_result_t result =
-          zmq::recv_multipart(subscriber, std::back_inserter(recv_msgs));
-        assert(result && "recv failed");
-        assert(*result == 2);
-
-        std::cout << "Thread3: [" << recv_msgs[0].to_string() << "] "
-                  << recv_msgs[1].to_string() << std::endl;
-    }
-}
-
-int main() {
-    /*
-     * No I/O threads are involved in passing messages using the inproc transport.
-     * Therefore, if you are using a ØMQ context for in-process messaging only you
-     * can initialise the context with zero I/O threads.
-     *
-     * Source: http://api.zeromq.org/4-3:zmq-inproc
-     */
-    zmq::context_t ctx(0);
-
-    auto thread1 = std::async(std::launch::async, PublisherThread, &ctx);
-
-    // Give the publisher a chance to bind, since inproc requires it
-    std::this_thread::sleep_for(std::chrono::milliseconds(10));
-
-    auto thread2 = std::async(std::launch::async, SubscriberThread1, &ctx);
-    auto thread3 = std::async(std::launch::async, SubscriberThread2, &ctx);
-    thread1.wait();
-    thread2.wait();
-    thread3.wait();
-
-    /*
-     * Output:
-     *   An infinite loop of a mix of:
-     *     Thread2: [A] Message in A envelope
-     *     Thread2: [B] Message in B envelope
-     *     Thread3: [A] Message in A envelope
-     *     Thread3: [B] Message in B envelope
-     *     Thread3: [C] Message in C envelope
-     */
-}
diff --git a/libs/cppzmq/libzmq-pkg-config/FindZeroMQ.cmake b/libs/cppzmq/libzmq-pkg-config/FindZeroMQ.cmake
deleted file mode 100644
index c07c0f6..0000000
--- a/libs/cppzmq/libzmq-pkg-config/FindZeroMQ.cmake
+++ /dev/null
@@ -1,34 +0,0 @@
-set(PKG_CONFIG_USE_CMAKE_PREFIX_PATH ON)
-find_package(PkgConfig)
-pkg_check_modules(PC_LIBZMQ QUIET libzmq)
-
-set(ZeroMQ_VERSION ${PC_LIBZMQ_VERSION})
-
-find_path(ZeroMQ_INCLUDE_DIR zmq.h
-        PATHS ${ZeroMQ_DIR}/include
-        ${PC_LIBZMQ_INCLUDE_DIRS})
-
-find_library(ZeroMQ_LIBRARY
-        NAMES zmq
-        PATHS ${ZeroMQ_DIR}/lib
-        ${PC_LIBZMQ_LIBDIR}
-        ${PC_LIBZMQ_LIBRARY_DIRS})
-
-if(ZeroMQ_LIBRARY)
-    set(ZeroMQ_FOUND ON)
-endif()
-
-set ( ZeroMQ_LIBRARIES ${ZeroMQ_LIBRARY} )
-set ( ZeroMQ_INCLUDE_DIRS ${ZeroMQ_INCLUDE_DIR} )
-
-if(NOT TARGET libzmq)
-    add_library(libzmq UNKNOWN IMPORTED)
-    set_target_properties(libzmq PROPERTIES
-            IMPORTED_LOCATION ${ZeroMQ_LIBRARIES}
-            INTERFACE_INCLUDE_DIRECTORIES ${ZeroMQ_INCLUDE_DIRS})
-endif()
-
-include ( FindPackageHandleStandardArgs )
-# handle the QUIETLY and REQUIRED arguments and set ZMQ_FOUND to TRUE
-# if all listed variables are TRUE
-find_package_handle_standard_args ( ZeroMQ DEFAULT_MSG ZeroMQ_LIBRARIES ZeroMQ_INCLUDE_DIRS )
\ No newline at end of file
diff --git a/libs/cppzmq/tests/CMakeLists.txt b/libs/cppzmq/tests/CMakeLists.txt
deleted file mode 100644
index 6075df8..0000000
--- a/libs/cppzmq/tests/CMakeLists.txt
+++ /dev/null
@@ -1,53 +0,0 @@
-find_package(Threads)
-
-find_package(Catch2 QUIET)
-
-if (NOT Catch2_FOUND)
-  include(FetchContent)
-
-  FetchContent_Declare(
-    Catch2
-    GIT_REPOSITORY https://github.com/catchorg/Catch2.git
-    GIT_TAG        v2.13.9)
-
-  FetchContent_MakeAvailable(Catch2)
-
-  list(APPEND CMAKE_MODULE_PATH ${catch2_SOURCE_DIR}/contrib)
-endif()
-
-add_executable(
-    unit_tests
-    buffer.cpp
-    message.cpp
-    context.cpp
-    socket.cpp
-    socket_ref.cpp
-    poller.cpp
-    active_poller.cpp
-    multipart.cpp
-    recv_multipart.cpp
-    send_multipart.cpp
-    codec_multipart.cpp
-    monitor.cpp
-    utilities.cpp
-)
-
-target_include_directories(unit_tests PUBLIC ${CATCH_MODULE_PATH})
-target_link_libraries(
-    unit_tests
-    PRIVATE Catch2::Catch2
-    PRIVATE cppzmq
-    PRIVATE ${CMAKE_THREAD_LIBS_INIT}
-)
-
-OPTION (COVERAGE "Enable gcda file generation needed by lcov" OFF)
-
-if (COVERAGE)
-    target_compile_options(unit_tests PRIVATE --coverage)
-    target_link_options(unit_tests PRIVATE --coverage)
-    message(STATUS "Coverage enabled")
-endif()
-
-include(CTest)
-include(Catch)
-catch_discover_tests(unit_tests)
diff --git a/libs/cppzmq/tests/active_poller.cpp b/libs/cppzmq/tests/active_poller.cpp
deleted file mode 100644
index 224b371..0000000
--- a/libs/cppzmq/tests/active_poller.cpp
+++ /dev/null
@@ -1,446 +0,0 @@
-#include <zmq_addon.hpp>
-
-#include "testutil.hpp"
-
-#if defined(ZMQ_CPP11) && !defined(ZMQ_CPP11_PARTIAL) && defined(ZMQ_BUILD_DRAFT_API)
-
-#include <array>
-#include <memory>
-
-TEST_CASE("create destroy", "[active_poller]")
-{
-    zmq::active_poller_t active_poller;
-    CHECK(active_poller.empty());
-}
-
-static_assert(!std::is_copy_constructible<zmq::active_poller_t>::value,
-              "active_poller_t should not be copy-constructible");
-static_assert(!std::is_copy_assignable<zmq::active_poller_t>::value,
-              "active_poller_t should not be copy-assignable");
-
-static const zmq::active_poller_t::handler_type no_op_handler =
-  [](zmq::event_flags) {};
-
-TEST_CASE("move construct empty", "[active_poller]")
-{
-    zmq::active_poller_t a;
-    CHECK(a.empty());
-    zmq::active_poller_t b = std::move(a);
-    CHECK(b.empty());
-    CHECK(0u == a.size());
-    CHECK(0u == b.size());
-}
-
-TEST_CASE("move assign empty", "[active_poller]")
-{
-    zmq::active_poller_t a;
-    CHECK(a.empty());
-    zmq::active_poller_t b;
-    CHECK(b.empty());
-    b = std::move(a);
-    CHECK(0u == a.size());
-    CHECK(0u == b.size());
-    CHECK(a.empty());
-    CHECK(b.empty());
-}
-
-TEST_CASE("move construct non empty", "[active_poller]")
-{
-    zmq::context_t context;
-    zmq::socket_t socket{context, zmq::socket_type::router};
-
-    zmq::active_poller_t a;
-    a.add(socket, zmq::event_flags::pollin, [](zmq::event_flags) {});
-    CHECK_FALSE(a.empty());
-    CHECK(1u == a.size());
-    zmq::active_poller_t b = std::move(a);
-    CHECK(a.empty());
-    CHECK(0u == a.size());
-    CHECK_FALSE(b.empty());
-    CHECK(1u == b.size());
-}
-
-TEST_CASE("move assign non empty", "[active_poller]")
-{
-    zmq::context_t context;
-    zmq::socket_t socket{context, zmq::socket_type::router};
-
-    zmq::active_poller_t a;
-    a.add(socket, zmq::event_flags::pollin, no_op_handler);
-    CHECK_FALSE(a.empty());
-    CHECK(1u == a.size());
-    zmq::active_poller_t b;
-    b = std::move(a);
-    CHECK(a.empty());
-    CHECK(0u == a.size());
-    CHECK_FALSE(b.empty());
-    CHECK(1u == b.size());
-}
-
-TEST_CASE("add handler", "[active_poller]")
-{
-    zmq::context_t context;
-    zmq::socket_t socket{context, zmq::socket_type::router};
-    zmq::active_poller_t active_poller;
-    CHECK_NOTHROW(
-      active_poller.add(socket, zmq::event_flags::pollin, no_op_handler));
-}
-
-TEST_CASE("add null handler fails", "[active_poller]")
-{
-    zmq::context_t context;
-    zmq::socket_t socket{context, zmq::socket_type::router};
-    zmq::active_poller_t active_poller;
-    zmq::active_poller_t::handler_type handler;
-    CHECK_THROWS_AS(active_poller.add(socket, zmq::event_flags::pollin, handler),
-                    std::invalid_argument);
-}
-
-#if ZMQ_VERSION >= ZMQ_MAKE_VERSION(4, 3, 0)
-// this behaviour was added by https://github.com/zeromq/libzmq/pull/3100
-TEST_CASE("add handler invalid events type", "[active_poller]")
-{
-    zmq::context_t context;
-    zmq::socket_t socket{context, zmq::socket_type::router};
-    zmq::active_poller_t active_poller;
-    short invalid_events_type = 2 << 10;
-    CHECK_THROWS_AS(
-      active_poller.add(socket, static_cast<zmq::event_flags>(invalid_events_type),
-                        no_op_handler),
-      zmq::error_t);
-    CHECK(active_poller.empty());
-    CHECK(0u == active_poller.size());
-}
-#endif
-
-TEST_CASE("add handler twice throws", "[active_poller]")
-{
-    common_server_client_setup s;
-
-    CHECK(s.client.send(zmq::message_t{}, zmq::send_flags::none));
-
-    zmq::active_poller_t active_poller;
-    bool message_received = false;
-    active_poller.add(
-      s.server, zmq::event_flags::pollin,
-      [&message_received](zmq::event_flags) { message_received = true; });
-    CHECK_THROWS_ZMQ_ERROR(
-      EINVAL, active_poller.add(s.server, zmq::event_flags::pollin, no_op_handler));
-    CHECK(1 == active_poller.wait(std::chrono::milliseconds{-1}));
-    CHECK(message_received); // handler unmodified
-}
-
-TEST_CASE("wait with no handlers throws", "[active_poller]")
-{
-    zmq::active_poller_t active_poller;
-    CHECK_THROWS_ZMQ_ERROR(EFAULT,
-                           active_poller.wait(std::chrono::milliseconds{10}));
-}
-
-TEST_CASE("remove unregistered throws", "[active_poller]")
-{
-    zmq::context_t context;
-    zmq::socket_t socket{context, zmq::socket_type::router};
-    zmq::active_poller_t active_poller;
-    CHECK_THROWS_ZMQ_ERROR(EINVAL, active_poller.remove(socket));
-}
-
-TEST_CASE("remove registered empty", "[active_poller]")
-{
-    zmq::context_t context;
-    zmq::socket_t socket{context, zmq::socket_type::router};
-    zmq::active_poller_t active_poller;
-    active_poller.add(socket, zmq::event_flags::pollin, no_op_handler);
-    CHECK_NOTHROW(active_poller.remove(socket));
-}
-
-TEST_CASE("remove registered non empty", "[active_poller]")
-{
-    zmq::context_t context;
-    zmq::socket_t socket{context, zmq::socket_type::router};
-    zmq::active_poller_t active_poller;
-    active_poller.add(socket, zmq::event_flags::pollin, no_op_handler);
-    CHECK_NOTHROW(active_poller.remove(socket));
-}
-
-namespace
-{
-struct server_client_setup : common_server_client_setup
-{
-    zmq::active_poller_t::handler_type handler = [&](zmq::event_flags e) {
-        events = e;
-    };
-
-    zmq::event_flags events = zmq::event_flags::none;
-};
-
-const std::string hi_str = "Hi";
-
-}
-
-TEST_CASE("poll basic", "[active_poller]")
-{
-    server_client_setup s;
-
-    CHECK_NOTHROW(s.client.send(zmq::message_t{hi_str}, zmq::send_flags::none));
-
-    zmq::active_poller_t active_poller;
-    bool message_received = false;
-    zmq::active_poller_t::handler_type handler =
-      [&message_received](zmq::event_flags events) {
-          CHECK(zmq::event_flags::none != (events & zmq::event_flags::pollin));
-          message_received = true;
-      };
-    CHECK_NOTHROW(active_poller.add(s.server, zmq::event_flags::pollin, handler));
-    CHECK(1 == active_poller.wait(std::chrono::milliseconds{-1}));
-    CHECK(message_received);
-}
-
-/// \todo this contains multiple test cases that should be split up
-TEST_CASE("client server", "[active_poller]")
-{
-    const std::string send_msg = hi_str;
-
-    // Setup server and client
-    server_client_setup s;
-
-    // Setup active_poller
-    zmq::active_poller_t active_poller;
-    zmq::event_flags events;
-    zmq::active_poller_t::handler_type handler = [&](zmq::event_flags e) {
-        if (zmq::event_flags::none != (e & zmq::event_flags::pollin)) {
-            zmq::message_t zmq_msg;
-            CHECK_NOTHROW(s.server.recv(zmq_msg)); // get message
-            std::string recv_msg(zmq_msg.data<char>(), zmq_msg.size());
-            CHECK(send_msg == recv_msg);
-        } else if (zmq::event_flags::none != (e & ~zmq::event_flags::pollout)) {
-            INFO("Unexpected event type " << static_cast<short>(events));
-            REQUIRE(false);
-        }
-        events = e;
-    };
-
-    CHECK_NOTHROW(active_poller.add(s.server, zmq::event_flags::pollin, handler));
-
-    // client sends message
-    CHECK_NOTHROW(s.client.send(zmq::message_t{send_msg}, zmq::send_flags::none));
-
-    CHECK(1 == active_poller.wait(std::chrono::milliseconds{-1}));
-    CHECK(events == zmq::event_flags::pollin);
-
-    // Re-add server socket with pollout flag
-    CHECK_NOTHROW(active_poller.remove(s.server));
-    CHECK_NOTHROW(active_poller.add(
-      s.server, zmq::event_flags::pollin | zmq::event_flags::pollout, handler));
-    CHECK(1 == active_poller.wait(std::chrono::milliseconds{-1}));
-    CHECK(events == zmq::event_flags::pollout);
-}
-
-TEST_CASE("add invalid socket throws", "[active_poller]")
-{
-    zmq::context_t context;
-    zmq::active_poller_t active_poller;
-    zmq::socket_t a{context, zmq::socket_type::router};
-    zmq::socket_t b{std::move(a)};
-    CHECK_THROWS_AS(active_poller.add(a, zmq::event_flags::pollin, no_op_handler),
-                    zmq::error_t);
-}
-
-TEST_CASE("remove invalid socket throws", "[active_poller]")
-{
-    zmq::context_t context;
-    zmq::socket_t socket{context, zmq::socket_type::router};
-    zmq::active_poller_t active_poller;
-    CHECK_NOTHROW(
-      active_poller.add(socket, zmq::event_flags::pollin, no_op_handler));
-    CHECK(1u == active_poller.size());
-    std::vector<zmq::socket_t> sockets;
-    sockets.emplace_back(std::move(socket));
-    CHECK_THROWS_AS(active_poller.remove(socket), zmq::error_t);
-    CHECK(1u == active_poller.size());
-}
-
-TEST_CASE("wait on added empty handler", "[active_poller]")
-{
-    server_client_setup s;
-    CHECK_NOTHROW(s.client.send(zmq::message_t{hi_str}, zmq::send_flags::none));
-    zmq::active_poller_t active_poller;
-    CHECK_NOTHROW(
-      active_poller.add(s.server, zmq::event_flags::pollin, no_op_handler));
-    CHECK_NOTHROW(active_poller.wait(std::chrono::milliseconds{-1}));
-}
-
-TEST_CASE("modify empty throws", "[active_poller]")
-{
-    zmq::context_t context;
-    zmq::socket_t socket{context, zmq::socket_type::push};
-    zmq::active_poller_t active_poller;
-    CHECK_THROWS_AS(active_poller.modify(socket, zmq::event_flags::pollin),
-                    zmq::error_t);
-}
-
-TEST_CASE("modify invalid socket throws", "[active_poller]")
-{
-    zmq::context_t context;
-    zmq::socket_t a{context, zmq::socket_type::push};
-    zmq::socket_t b{std::move(a)};
-    zmq::active_poller_t active_poller;
-    CHECK_THROWS_AS(active_poller.modify(a, zmq::event_flags::pollin),
-                    zmq::error_t);
-}
-
-TEST_CASE("modify not added throws", "[active_poller]")
-{
-    zmq::context_t context;
-    zmq::socket_t a{context, zmq::socket_type::push};
-    zmq::socket_t b{context, zmq::socket_type::push};
-    zmq::active_poller_t active_poller;
-    CHECK_NOTHROW(active_poller.add(a, zmq::event_flags::pollin, no_op_handler));
-    CHECK_THROWS_AS(active_poller.modify(b, zmq::event_flags::pollin),
-                    zmq::error_t);
-}
-
-TEST_CASE("modify simple", "[active_poller]")
-{
-    zmq::context_t context;
-    zmq::socket_t a{context, zmq::socket_type::push};
-    zmq::active_poller_t active_poller;
-    CHECK_NOTHROW(active_poller.add(a, zmq::event_flags::pollin, no_op_handler));
-    CHECK_NOTHROW(
-      active_poller.modify(a, zmq::event_flags::pollin | zmq::event_flags::pollout));
-}
-
-TEST_CASE("poll client server", "[active_poller]")
-{
-    // Setup server and client
-    server_client_setup s;
-
-    // Setup active_poller
-    zmq::active_poller_t active_poller;
-    CHECK_NOTHROW(active_poller.add(s.server, zmq::event_flags::pollin, s.handler));
-
-    // client sends message
-    CHECK_NOTHROW(s.client.send(zmq::message_t{hi_str}, zmq::send_flags::none));
-
-    // wait for message and verify events
-    CHECK_NOTHROW(active_poller.wait(std::chrono::milliseconds{500}));
-    CHECK(s.events == zmq::event_flags::pollin);
-
-    // Modify server socket with pollout flag
-    CHECK_NOTHROW(active_poller.modify(s.server, zmq::event_flags::pollin
-                                                   | zmq::event_flags::pollout));
-    CHECK(1 == active_poller.wait(std::chrono::milliseconds{500}));
-    CHECK(s.events == (zmq::event_flags::pollin | zmq::event_flags::pollout));
-}
-
-TEST_CASE("wait one return", "[active_poller]")
-{
-    // Setup server and client
-    server_client_setup s;
-
-    int count = 0;
-
-    // Setup active_poller
-    zmq::active_poller_t active_poller;
-    CHECK_NOTHROW(active_poller.add(s.server, zmq::event_flags::pollin,
-                                    [&count](zmq::event_flags) { ++count; }));
-
-    // client sends message
-    CHECK_NOTHROW(s.client.send(zmq::message_t{hi_str}, zmq::send_flags::none));
-
-    // wait for message and verify events
-    CHECK(1 == active_poller.wait(std::chrono::milliseconds{500}));
-    CHECK(1u == count);
-}
-
-TEST_CASE("wait on move constructed active_poller", "[active_poller]")
-{
-    server_client_setup s;
-    CHECK_NOTHROW(s.client.send(zmq::message_t{hi_str}, zmq::send_flags::none));
-    zmq::active_poller_t a;
-    CHECK_NOTHROW(a.add(s.server, zmq::event_flags::pollin, no_op_handler));
-    zmq::active_poller_t b{std::move(a)};
-    CHECK(1u == b.size());
-    CHECK(0u == a.size());
-    CHECK_THROWS_ZMQ_ERROR(EFAULT, a.wait(std::chrono::milliseconds{10}));
-    CHECK(b.wait(std::chrono::milliseconds{-1}));
-}
-
-TEST_CASE("wait on move assigned active_poller", "[active_poller]")
-{
-    server_client_setup s;
-    CHECK_NOTHROW(s.client.send(zmq::message_t{hi_str}, zmq::send_flags::none));
-    zmq::active_poller_t a;
-    CHECK_NOTHROW(a.add(s.server, zmq::event_flags::pollin, no_op_handler));
-    zmq::active_poller_t b;
-    b = {std::move(a)};
-    CHECK(1u == b.size());
-    CHECK(0u == a.size());
-    CHECK_THROWS_ZMQ_ERROR(EFAULT, a.wait(std::chrono::milliseconds{10}));
-    CHECK(b.wait(std::chrono::milliseconds{-1}));
-}
-
-TEST_CASE("received on move constructed active_poller", "[active_poller]")
-{
-    // Setup server and client
-    server_client_setup s;
-    int count = 0;
-    // Setup active_poller a
-    zmq::active_poller_t a;
-    CHECK_NOTHROW(a.add(s.server, zmq::event_flags::pollin,
-                        [&count](zmq::event_flags) { ++count; }));
-    // client sends message
-    CHECK_NOTHROW(s.client.send(zmq::message_t{hi_str}, zmq::send_flags::none));
-    // wait for message and verify it is received
-    CHECK(1 == a.wait(std::chrono::milliseconds{500}));
-    CHECK(1u == count);
-    // Move construct active_poller b
-    zmq::active_poller_t b{std::move(a)};
-    // client sends message again
-    CHECK_NOTHROW(s.client.send(zmq::message_t{hi_str}, zmq::send_flags::none));
-    // wait for message and verify it is received
-    CHECK(1 == b.wait(std::chrono::milliseconds{500}));
-    CHECK(2u == count);
-}
-
-
-TEST_CASE("remove from handler", "[active_poller]")
-{
-    constexpr size_t ITER_NO = 10;
-
-    // Setup servers and clients
-    std::vector<server_client_setup> setup_list;
-    for (size_t i = 0; i < ITER_NO; ++i)
-        setup_list.emplace_back(server_client_setup{});
-
-    // Setup active_poller
-    zmq::active_poller_t active_poller;
-    int count = 0;
-    for (size_t i = 0; i < ITER_NO; ++i) {
-        CHECK_NOTHROW(active_poller.add(
-          setup_list[i].server, zmq::event_flags::pollin,
-          [&, i](zmq::event_flags events) {
-              CHECK(events == zmq::event_flags::pollin);
-              active_poller.remove(setup_list[ITER_NO - i - 1].server);
-              CHECK((ITER_NO - i - 1) == active_poller.size());
-          }));
-        ++count;
-    }
-    CHECK(ITER_NO == active_poller.size());
-    // Clients send messages
-    for (auto &s : setup_list) {
-        CHECK_NOTHROW(s.client.send(zmq::message_t{hi_str}, zmq::send_flags::none));
-    }
-
-    // Wait for all servers to receive a message
-    for (auto &s : setup_list) {
-        zmq::pollitem_t items[] = {{s.server, 0, ZMQ_POLLIN, 0}};
-        zmq::poll(&items[0], 1);
-    }
-
-    // Fire all handlers in one wait
-    CHECK(ITER_NO == active_poller.wait(std::chrono::milliseconds{-1}));
-    CHECK(ITER_NO == count);
-}
-
-#endif
diff --git a/libs/cppzmq/tests/buffer.cpp b/libs/cppzmq/tests/buffer.cpp
deleted file mode 100644
index da8a514..0000000
--- a/libs/cppzmq/tests/buffer.cpp
+++ /dev/null
@@ -1,306 +0,0 @@
-#include <catch2/catch.hpp>
-#include <zmq.hpp>
-
-#ifdef ZMQ_CPP17
-static_assert(std::is_nothrow_swappable_v<zmq::const_buffer>);
-static_assert(std::is_nothrow_swappable_v<zmq::mutable_buffer>);
-static_assert(std::is_trivially_copyable_v<zmq::const_buffer>);
-static_assert(std::is_trivially_copyable_v<zmq::mutable_buffer>);
-#endif
-
-#ifdef ZMQ_CPP11
-
-using BT = int16_t;
-
-TEST_CASE("buffer default ctor", "[buffer]")
-{
-    constexpr zmq::mutable_buffer mb;
-    constexpr zmq::const_buffer cb;
-    CHECK(mb.size() == 0);
-    CHECK(mb.data() == nullptr);
-    CHECK(cb.size() == 0);
-    CHECK(cb.data() == nullptr);
-}
-
-TEST_CASE("buffer data ctor", "[buffer]")
-{
-    std::vector<BT> v(10);
-    zmq::const_buffer cb(v.data(), v.size() * sizeof(BT));
-    CHECK(cb.size() == v.size() * sizeof(BT));
-    CHECK(cb.data() == v.data());
-    zmq::mutable_buffer mb(v.data(), v.size() * sizeof(BT));
-    CHECK(mb.size() == v.size() * sizeof(BT));
-    CHECK(mb.data() == v.data());
-    zmq::const_buffer from_mut = mb;
-    CHECK(mb.size() == from_mut.size());
-    CHECK(mb.data() == from_mut.data());
-    const auto cmb = mb;
-    static_assert(std::is_same<decltype(cmb.data()), void *>::value, "");
-
-    constexpr const void *cp = nullptr;
-    constexpr void *p = nullptr;
-    constexpr zmq::const_buffer cecb = zmq::buffer(p, 0);
-    constexpr zmq::mutable_buffer cemb = zmq::buffer(p, 0);
-    CHECK(cecb.data() == nullptr);
-    CHECK(cemb.data() == nullptr);
-}
-
-TEST_CASE("const_buffer operator+", "[buffer]")
-{
-    std::vector<BT> v(10);
-    zmq::const_buffer cb(v.data(), v.size() * sizeof(BT));
-    const size_t shift = 4;
-    auto shifted = cb + shift;
-    CHECK(shifted.size() == v.size() * sizeof(BT) - shift);
-    CHECK(shifted.data() == v.data() + shift / sizeof(BT));
-    auto shifted2 = shift + cb;
-    CHECK(shifted.size() == shifted2.size());
-    CHECK(shifted.data() == shifted2.data());
-    auto cbinp = cb;
-    cbinp += shift;
-    CHECK(shifted.size() == cbinp.size());
-    CHECK(shifted.data() == cbinp.data());
-}
-
-TEST_CASE("mutable_buffer operator+", "[buffer]")
-{
-    std::vector<BT> v(10);
-    zmq::mutable_buffer mb(v.data(), v.size() * sizeof(BT));
-    const size_t shift = 4;
-    auto shifted = mb + shift;
-    CHECK(shifted.size() == v.size() * sizeof(BT) - shift);
-    CHECK(shifted.data() == v.data() + shift / sizeof(BT));
-    auto shifted2 = shift + mb;
-    CHECK(shifted.size() == shifted2.size());
-    CHECK(shifted.data() == shifted2.data());
-    auto mbinp = mb;
-    mbinp += shift;
-    CHECK(shifted.size() == mbinp.size());
-    CHECK(shifted.data() == mbinp.data());
-}
-
-TEST_CASE("mutable_buffer creation basic", "[buffer]")
-{
-    std::vector<BT> v(10);
-    zmq::mutable_buffer mb(v.data(), v.size() * sizeof(BT));
-    zmq::mutable_buffer mb2 = zmq::buffer(v.data(), v.size() * sizeof(BT));
-    CHECK(mb.data() == mb2.data());
-    CHECK(mb.size() == mb2.size());
-    zmq::mutable_buffer mb3 = zmq::buffer(mb);
-    CHECK(mb.data() == mb3.data());
-    CHECK(mb.size() == mb3.size());
-    zmq::mutable_buffer mb4 = zmq::buffer(mb, 10 * v.size() * sizeof(BT));
-    CHECK(mb.data() == mb4.data());
-    CHECK(mb.size() == mb4.size());
-    zmq::mutable_buffer mb5 = zmq::buffer(mb, 4);
-    CHECK(mb.data() == mb5.data());
-    CHECK(4 == mb5.size());
-}
-
-TEST_CASE("const_buffer creation basic", "[buffer]")
-{
-    const std::vector<BT> v(10);
-    zmq::const_buffer cb(v.data(), v.size() * sizeof(BT));
-    zmq::const_buffer cb2 = zmq::buffer(v.data(), v.size() * sizeof(BT));
-    CHECK(cb.data() == cb2.data());
-    CHECK(cb.size() == cb2.size());
-    zmq::const_buffer cb3 = zmq::buffer(cb);
-    CHECK(cb.data() == cb3.data());
-    CHECK(cb.size() == cb3.size());
-    zmq::const_buffer cb4 = zmq::buffer(cb, 10 * v.size() * sizeof(BT));
-    CHECK(cb.data() == cb4.data());
-    CHECK(cb.size() == cb4.size());
-    zmq::const_buffer cb5 = zmq::buffer(cb, 4);
-    CHECK(cb.data() == cb5.data());
-    CHECK(4 == cb5.size());
-}
-
-TEST_CASE("mutable_buffer creation C array", "[buffer]")
-{
-    BT d[10] = {};
-    zmq::mutable_buffer b = zmq::buffer(d);
-    CHECK(b.size() == 10 * sizeof(BT));
-    CHECK(b.data() == static_cast<BT*>(d));
-    zmq::const_buffer b2 = zmq::buffer(d, 4);
-    CHECK(b2.size() == 4);
-    CHECK(b2.data() == static_cast<BT*>(d));
-}
-
-TEST_CASE("const_buffer creation C array", "[buffer]")
-{
-    const BT d[10] = {};
-    zmq::const_buffer b = zmq::buffer(d);
-    CHECK(b.size() == 10 * sizeof(BT));
-    CHECK(b.data() == static_cast<const BT*>(d));
-    zmq::const_buffer b2 = zmq::buffer(d, 4);
-    CHECK(b2.size() == 4);
-    CHECK(b2.data() == static_cast<const BT*>(d));
-}
-
-TEST_CASE("mutable_buffer creation array", "[buffer]")
-{
-    std::array<BT, 10> d = {};
-    zmq::mutable_buffer b = zmq::buffer(d);
-    CHECK(b.size() == d.size() * sizeof(BT));
-    CHECK(b.data() == d.data());
-    zmq::mutable_buffer b2 = zmq::buffer(d, 4);
-    CHECK(b2.size() == 4);
-    CHECK(b2.data() == d.data());
-}
-
-TEST_CASE("const_buffer creation array", "[buffer]")
-{
-    const std::array<BT, 10> d = {};
-    zmq::const_buffer b = zmq::buffer(d);
-    CHECK(b.size() == d.size() * sizeof(BT));
-    CHECK(b.data() == d.data());
-    zmq::const_buffer b2 = zmq::buffer(d, 4);
-    CHECK(b2.size() == 4);
-    CHECK(b2.data() == d.data());
-}
-
-TEST_CASE("const_buffer creation array 2", "[buffer]")
-{
-    std::array<const BT, 10> d = {{}};
-    zmq::const_buffer b = zmq::buffer(d);
-    CHECK(b.size() == d.size() * sizeof(BT));
-    CHECK(b.data() == d.data());
-    zmq::const_buffer b2 = zmq::buffer(d, 4);
-    CHECK(b2.size() == 4);
-    CHECK(b2.data() == d.data());
-}
-
-TEST_CASE("mutable_buffer creation vector", "[buffer]")
-{
-    std::vector<BT> d(10);
-    zmq::mutable_buffer b = zmq::buffer(d);
-    CHECK(b.size() == d.size() * sizeof(BT));
-    CHECK(b.data() == d.data());
-    zmq::mutable_buffer b2 = zmq::buffer(d, 4);
-    CHECK(b2.size() == 4);
-    CHECK(b2.data() == d.data());
-    d.clear();
-    b = zmq::buffer(d);
-    CHECK(b.size() == 0);
-    CHECK(b.data() == nullptr);
-}
-
-TEST_CASE("const_buffer creation vector", "[buffer]")
-{
-    std::vector<BT> d(10);
-    zmq::const_buffer b = zmq::buffer(static_cast<const std::vector<BT> &>(d));
-    CHECK(b.size() == d.size() * sizeof(BT));
-    CHECK(b.data() == d.data());
-    zmq::const_buffer b2 = zmq::buffer(static_cast<const std::vector<BT> &>(d), 4);
-    CHECK(b2.size() == 4);
-    CHECK(b2.data() == d.data());
-    d.clear();
-    b = zmq::buffer(static_cast<const std::vector<BT> &>(d));
-    CHECK(b.size() == 0);
-    CHECK(b.data() == nullptr);
-}
-
-TEST_CASE("const_buffer creation string", "[buffer]")
-{
-    const std::wstring d(10, L'a');
-    zmq::const_buffer b = zmq::buffer(d);
-    CHECK(b.size() == d.size() * sizeof(wchar_t));
-    CHECK(b.data() == d.data());
-    zmq::const_buffer b2 = zmq::buffer(d, 4);
-    CHECK(b2.size() == 4);
-    CHECK(b2.data() == d.data());
-}
-
-TEST_CASE("mutable_buffer creation string", "[buffer]")
-{
-    std::wstring d(10, L'a');
-    zmq::mutable_buffer b = zmq::buffer(d);
-    CHECK(b.size() == d.size() * sizeof(wchar_t));
-    CHECK(b.data() == d.data());
-    zmq::mutable_buffer b2 = zmq::buffer(d, 4);
-    CHECK(b2.size() == 4);
-    CHECK(b2.data() == d.data());
-}
-
-#if CPPZMQ_HAS_STRING_VIEW
-TEST_CASE("const_buffer creation string_view", "[buffer]")
-{
-    std::wstring dstr(10, L'a');
-    std::wstring_view d = dstr;
-    zmq::const_buffer b = zmq::buffer(d);
-    CHECK(b.size() == d.size() * sizeof(wchar_t));
-    CHECK(b.data() == d.data());
-    zmq::const_buffer b2 = zmq::buffer(d, 4);
-    CHECK(b2.size() == 4);
-    CHECK(b2.data() == d.data());
-}
-#endif
-
-TEST_CASE("const_buffer creation with str_buffer", "[buffer]")
-{
-    const wchar_t wd[10] = {};
-    zmq::const_buffer b = zmq::str_buffer(wd);
-    CHECK(b.size() == 9 * sizeof(wchar_t));
-    CHECK(b.data() == static_cast<const wchar_t*>(wd));
-
-    zmq::const_buffer b2_null = zmq::buffer("hello");
-    constexpr zmq::const_buffer b2 = zmq::str_buffer("hello");
-    CHECK(b2_null.size() == 6);
-    CHECK(b2.size() == 5);
-    CHECK(std::string(static_cast<const char*>(b2.data()), b2.size()) == "hello");
-}
-
-TEST_CASE("const_buffer creation with zbuf string literal char", "[buffer]")
-{
-    using namespace zmq::literals;
-    constexpr zmq::const_buffer b = "hello"_zbuf;
-    CHECK(b.size() == 5);
-    CHECK(std::memcmp(b.data(), "hello", b.size()) == 0);
-}
-
-TEST_CASE("const_buffer creation with zbuf string literal wchar_t", "[buffer]")
-{
-    using namespace zmq::literals;
-    constexpr zmq::const_buffer b = L"hello"_zbuf;
-    CHECK(b.size() == 5 * sizeof(wchar_t));
-    CHECK(std::memcmp(b.data(), L"hello", b.size()) == 0);
-}
-
-TEST_CASE("const_buffer creation with zbuf string literal char16_t", "[buffer]")
-{
-    using namespace zmq::literals;
-    constexpr zmq::const_buffer b = u"hello"_zbuf;
-    CHECK(b.size() == 5 * sizeof(char16_t));
-    CHECK(std::memcmp(b.data(), u"hello", b.size()) == 0);
-}
-
-TEST_CASE("const_buffer creation with zbuf string literal char32_t", "[buffer]")
-{
-    using namespace zmq::literals;
-    constexpr zmq::const_buffer b = U"hello"_zbuf;
-    CHECK(b.size() == 5 * sizeof(char32_t));
-    CHECK(std::memcmp(b.data(), U"hello", b.size()) == 0);
-}
-
-TEST_CASE("buffer of structs", "[buffer]")
-{
-    struct some_pod
-    {
-        int64_t val;
-        char arr[8];
-    };
-    struct some_non_pod
-    {
-        int64_t val;
-        char arr[8];
-        std::vector<int> s; // not trivially copyable
-    };
-    static_assert(zmq::detail::is_pod_like<some_pod>::value, "");
-    static_assert(!zmq::detail::is_pod_like<some_non_pod>::value, "");
-    std::array<some_pod, 1> d;
-    zmq::mutable_buffer b = zmq::buffer(d);
-    CHECK(b.size() == d.size() * sizeof(some_pod));
-    CHECK(b.data() == d.data());
-}
-
-#endif
diff --git a/libs/cppzmq/tests/codec_multipart.cpp b/libs/cppzmq/tests/codec_multipart.cpp
deleted file mode 100644
index a5cb1e8..0000000
--- a/libs/cppzmq/tests/codec_multipart.cpp
+++ /dev/null
@@ -1,210 +0,0 @@
-#include <catch2/catch.hpp>
-#include <zmq_addon.hpp>
-
-#ifdef ZMQ_CPP11
-
-TEST_CASE("multipart codec empty", "[codec_multipart]")
-{
-    using namespace zmq;
-
-    multipart_t mmsg;
-    message_t msg = mmsg.encode();
-    CHECK(msg.size() == 0);
-    
-    multipart_t mmsg2;
-    mmsg2.decode_append(msg);
-    CHECK(mmsg2.size() == 0);
-
-}
-
-TEST_CASE("multipart codec small", "[codec_multipart]")
-{
-    using namespace zmq;
-
-    multipart_t mmsg;
-    mmsg.addstr("Hello World");
-    message_t msg = mmsg.encode();
-    CHECK(msg.size() == 1 + 11); // small size packing
-
-    mmsg.addstr("Second frame");
-    msg = mmsg.encode();
-    CHECK(msg.size() == 1 + 11 + 1 + 12);
-
-    multipart_t mmsg2;
-    mmsg2.decode_append(msg);
-    CHECK(mmsg2.size() == 2);
-    std::string part0 = mmsg2[0].to_string();
-    CHECK(part0 == "Hello World");
-    CHECK(mmsg2[1].to_string() == "Second frame");
-}
-
-TEST_CASE("multipart codec big", "[codec_multipart]")
-{
-    using namespace zmq;
-
-    message_t big(495);         // large size packing
-    big.data<char>()[0] = 'X';
-
-    multipart_t mmsg;
-    mmsg.pushmem(big.data(), big.size());
-    message_t msg = mmsg.encode();
-    CHECK(msg.size() == 5 + 495);
-    CHECK(msg.data<unsigned char>()[0] == std::numeric_limits<uint8_t>::max());
-    CHECK(msg.data<unsigned char>()[5] == 'X');
-
-    CHECK(mmsg.size() == 1);
-    mmsg.decode_append(msg);
-    CHECK(mmsg.size() == 2);
-    CHECK(mmsg[0].data<char>()[0] == 'X');
-}
-
-TEST_CASE("multipart codec decode bad data overflow", "[codec_multipart]")
-{
-    using namespace zmq;
-
-    char bad_data[3] = {5, 'h', 'i'};
-    message_t wrong_size(bad_data, 3);
-    CHECK(wrong_size.size() == 3);
-    CHECK(wrong_size.data<char>()[0] == 5);
-    
-    CHECK_THROWS_AS(
-        multipart_t::decode(wrong_size),
-        std::out_of_range);
-}
-
-TEST_CASE("multipart codec decode bad data extra data", "[codec_multipart]")
-{
-    using namespace zmq;
-
-    char bad_data[3] = {1, 'h', 'i'};
-    message_t wrong_size(bad_data, 3);
-    CHECK(wrong_size.size() == 3);
-    CHECK(wrong_size.data<char>()[0] == 1);
-    
-    CHECK_THROWS_AS(
-        multipart_t::decode(wrong_size),
-        std::out_of_range);
-}
-
-
-// After exercising it, this test is disabled over concern of running
-// on hosts which lack enough free memory to allow the absurdly large
-// message part to be allocated.
-#if 0
-TEST_CASE("multipart codec encode too big", "[codec_multipart]")
-{
-    using namespace zmq;
-
-    const size_t too_big_size = 1L + std::numeric_limits<uint32_t>::max();
-    CHECK(too_big_size > std::numeric_limits<uint32_t>::max());
-    char* too_big_data = new char[too_big_size];
-    multipart_t mmsg(too_big_data, too_big_size);
-    delete [] too_big_data;
-
-    CHECK(mmsg.size() == 1);
-    CHECK(mmsg[0].size() > std::numeric_limits<uint32_t>::max());
-
-    CHECK_THROWS_AS(
-        mmsg.encode(),
-        std::range_error);
-}
-#endif
-
-TEST_CASE("multipart codec free function with vector of message_t", "[codec_multipart]")
-{
-    using namespace zmq;
-    std::vector<message_t> parts;
-    parts.emplace_back("Hello", 5);
-    parts.emplace_back("World",5);
-    auto msg = encode(parts);
-    CHECK(msg.size() == 1 + 5 + 1 + 5 );
-    CHECK(msg.data<unsigned char>()[0] == 5);
-    CHECK(msg.data<unsigned char>()[1] == 'H');
-    CHECK(msg.data<unsigned char>()[6] == 5);
-    CHECK(msg.data<unsigned char>()[7] == 'W');
-
-    std::vector<message_t> parts2;
-    decode(msg, std::back_inserter(parts2));
-    CHECK(parts.size() == 2);
-    CHECK(parts[0].size() == 5);
-    CHECK(parts[1].size() == 5);
-}
-
-TEST_CASE("multipart codec free function with vector of const_buffer", "[codec_multipart]")
-{
-    using namespace zmq;
-    std::vector<const_buffer> parts;
-    parts.emplace_back("Hello", 5);
-    parts.emplace_back("World",5);
-    auto msg = encode(parts);
-    CHECK(msg.size() == 1 + 5 + 1 + 5 );
-    CHECK(msg.data<unsigned char>()[0] == 5);
-    CHECK(msg.data<unsigned char>()[1] == 'H');
-    CHECK(msg.data<unsigned char>()[6] == 5);
-    CHECK(msg.data<unsigned char>()[7] == 'W');
-
-    std::vector<message_t> parts2;
-    decode(msg, std::back_inserter(parts2));
-    CHECK(parts.size() == 2);
-    CHECK(parts[0].size() == 5);
-    CHECK(parts[1].size() == 5);
-}
-
-TEST_CASE("multipart codec free function with vector of mutable_buffer", "[codec_multipart]")
-{
-    using namespace zmq;
-    std::vector<mutable_buffer> parts;
-    char hello[6] = "Hello";
-    parts.emplace_back(hello, 5);
-    char world[6] = "World";
-    parts.emplace_back(world,5);
-    auto msg = encode(parts);
-    CHECK(msg.size() == 1 + 5 + 1 + 5 );
-    CHECK(msg.data<unsigned char>()[0] == 5);
-    CHECK(msg.data<unsigned char>()[1] == 'H');
-    CHECK(msg.data<unsigned char>()[6] == 5);
-    CHECK(msg.data<unsigned char>()[7] == 'W');
-
-    std::vector<message_t> parts2;
-    decode(msg, std::back_inserter(parts2));
-    CHECK(parts.size() == 2);
-    CHECK(parts[0].size() == 5);
-    CHECK(parts[1].size() == 5);
-}
-
-TEST_CASE("multipart codec free function with multipart_t", "[codec_multipart]")
-{
-    using namespace zmq;
-    multipart_t mmsg;
-    mmsg.addstr("Hello");
-    mmsg.addstr("World");
-    auto msg = encode(mmsg);
-    CHECK(msg.size() == 1 + 5 + 1 + 5);
-    CHECK(msg.data<unsigned char>()[0] == 5);
-    CHECK(msg.data<unsigned char>()[1] == 'H');
-    CHECK(msg.data<unsigned char>()[6] == 5);
-    CHECK(msg.data<unsigned char>()[7] == 'W');
-
-    multipart_t mmsg2;
-    decode(msg, std::back_inserter(mmsg2));
-    CHECK(mmsg2.size() == 2);
-    CHECK(mmsg2[0].size() == 5);
-    CHECK(mmsg2[1].size() == 5);
-}
-
-TEST_CASE("multipart codec static method decode to multipart_t", "[codec_multipart]")
-{
-    using namespace zmq;
-    multipart_t mmsg;
-    mmsg.addstr("Hello");
-    mmsg.addstr("World");
-    auto msg = encode(mmsg);
-
-    auto mmsg2 = multipart_t::decode(msg);
-    CHECK(mmsg2.size() == 2);
-    CHECK(mmsg2[0].size() == 5);
-    CHECK(mmsg2[1].size() == 5);
-}
-
-
-#endif
diff --git a/libs/cppzmq/tests/context.cpp b/libs/cppzmq/tests/context.cpp
deleted file mode 100644
index ade5ade..0000000
--- a/libs/cppzmq/tests/context.cpp
+++ /dev/null
@@ -1,84 +0,0 @@
-#include <catch2/catch.hpp>
-#include <zmq.hpp>
-
-#if (__cplusplus >= 201703L)
-static_assert(std::is_nothrow_swappable<zmq::context_t>::value,
-              "context_t should be nothrow swappable");
-#endif
-
-TEST_CASE("context construct default and destroy", "[context]")
-{
-    zmq::context_t context;
-}
-
-TEST_CASE("context create, close and destroy", "[context]")
-{
-    zmq::context_t context;
-    context.close();
-    CHECK(NULL == context.handle());
-}
-
-TEST_CASE("context shutdown", "[context]")
-{
-    zmq::context_t context;
-    context.shutdown();
-    CHECK(NULL != context.handle());
-    context.close();
-    CHECK(NULL == context.handle());
-}
-
-TEST_CASE("context shutdown again", "[context]")
-{
-    zmq::context_t context;
-    context.shutdown();
-    context.shutdown();
-    CHECK(NULL != context.handle());
-    context.close();
-    CHECK(NULL == context.handle());
-}
-
-#ifdef ZMQ_CPP11
-TEST_CASE("context swap", "[context]")
-{
-    zmq::context_t context1;
-    zmq::context_t context2;
-    using std::swap;
-    swap(context1, context2);
-}
-
-TEST_CASE("context - use socket after shutdown", "[context]")
-{
-    zmq::context_t context;
-    zmq::socket_t sock(context, zmq::socket_type::rep);
-    context.shutdown();
-    try
-    {
-        sock.connect("inproc://test");
-        zmq::message_t msg;
-        (void)sock.recv(msg, zmq::recv_flags::dontwait);
-        REQUIRE(false);
-    }
-    catch (const zmq::error_t& e)
-    {
-        REQUIRE(e.num() == ETERM);
-    }
-}
-
-TEST_CASE("context set/get options", "[context]")
-{
-    zmq::context_t context;
-#if defined(ZMQ_BLOCKY) && defined(ZMQ_IO_THREADS)
-    context.set(zmq::ctxopt::blocky, false);
-    context.set(zmq::ctxopt::io_threads, 5);
-    CHECK(context.get(zmq::ctxopt::io_threads) == 5);
-#endif
-
-    CHECK_THROWS_AS(
-        context.set(static_cast<zmq::ctxopt>(-42), 5),
-        zmq::error_t);
-
-    CHECK_THROWS_AS(
-        context.get(static_cast<zmq::ctxopt>(-42)),
-        zmq::error_t);
-}
-#endif
diff --git a/libs/cppzmq/tests/message.cpp b/libs/cppzmq/tests/message.cpp
deleted file mode 100644
index a841413..0000000
--- a/libs/cppzmq/tests/message.cpp
+++ /dev/null
@@ -1,246 +0,0 @@
-#define CATCH_CONFIG_MAIN
-#include <catch2/catch.hpp>
-#include <zmq.hpp>
-
-#if defined(ZMQ_CPP11)
-static_assert(!std::is_copy_constructible<zmq::message_t>::value,
-    "message_t should not be copy-constructible");
-static_assert(!std::is_copy_assignable<zmq::message_t>::value,
-    "message_t should not be copy-assignable");
-#endif
-#if (__cplusplus >= 201703L)
-static_assert(std::is_nothrow_swappable<zmq::message_t>::value,
-              "message_t should be nothrow swappable");
-#endif
-
-TEST_CASE("message default constructed", "[message]")
-{
-    const zmq::message_t message;
-    CHECK(0u == message.size());
-    CHECK(message.empty());
-}
-
-#ifdef ZMQ_CPP11
-TEST_CASE("message swap", "[message]")
-{
-    const std::string data = "foo";
-    zmq::message_t message1;
-    zmq::message_t message2(data.data(), data.size());
-    using std::swap;
-    swap(message1, message2);
-    CHECK(message1.size() == data.size());
-    CHECK(message2.size() == 0);
-    swap(message1, message2);
-    CHECK(message1.size() == 0);
-    CHECK(message2.size() == data.size());
-}
-#endif
-
-namespace
-{
-const char *const data = "Hi";
-}
-
-TEST_CASE("message constructor with iterators", "[message]")
-{
-    const std::string hi(data);
-    const zmq::message_t hi_msg(hi.begin(), hi.end());
-    CHECK(2u == hi_msg.size());
-    CHECK(0 == memcmp(data, hi_msg.data(), 2));
-}
-
-TEST_CASE("message constructor with size", "[message]")
-{
-    const zmq::message_t msg(5);
-    CHECK(msg.size() == 5);
-}
-
-TEST_CASE("message constructor with buffer and size", "[message]")
-{
-    const std::string hi(data);
-    const zmq::message_t hi_msg(hi.data(), hi.size());
-    CHECK(2u == hi_msg.size());
-    CHECK(0 == memcmp(data, hi_msg.data(), 2));
-}
-
-TEST_CASE("message constructor with char array", "[message]")
-{
-    const zmq::message_t hi_msg(data, strlen(data));
-    CHECK(2u == hi_msg.size());
-    CHECK(0 == memcmp(data, hi_msg.data(), 2));
-}
-
-#if defined(ZMQ_CPP11) && !defined(ZMQ_CPP11_PARTIAL)
-TEST_CASE("message constructor with container - deprecated", "[message]")
-{
-    zmq::message_t hi_msg("Hi"); // deprecated
-    REQUIRE(3u == hi_msg.size());
-    CHECK(0 == memcmp(data, hi_msg.data(), 3));
-}
-
-TEST_CASE("message constructor with container of trivial data", "[message]")
-{
-    int buf[3] = {1, 2, 3};
-    zmq::message_t msg(buf);
-    REQUIRE(sizeof(buf) == msg.size());
-    CHECK(0 == memcmp(buf, msg.data(), msg.size()));
-}
-
-TEST_CASE("message constructor with strings", "[message]")
-{
-    SECTION("string")
-    {
-        const std::string hi(data);
-        zmq::message_t hi_msg(hi);
-        CHECK(2u == hi_msg.size());
-        CHECK(0 == memcmp(data, hi_msg.data(), 2));
-    }
-#if CPPZMQ_HAS_STRING_VIEW
-    SECTION("string_view")
-    {
-        const std::string_view hi(data);
-        zmq::message_t hi_msg(hi);
-        CHECK(2u == hi_msg.size());
-        CHECK(0 == memcmp(data, hi_msg.data(), 2));
-    }
-#endif
-}
-#endif
-
-#ifdef ZMQ_HAS_RVALUE_REFS
-TEST_CASE("message move constructor", "[message]")
-{
-    zmq::message_t hi_msg(zmq::message_t(data, strlen(data)));
-}
-
-TEST_CASE("message assign move empty before", "[message]")
-{
-    zmq::message_t hi_msg;
-    hi_msg = zmq::message_t(data, strlen(data));
-    CHECK(2u == hi_msg.size());
-    CHECK(0 == memcmp(data, hi_msg.data(), 2));
-}
-
-TEST_CASE("message assign move empty after", "[message]")
-{
-    zmq::message_t hi_msg(data, strlen(data));
-    CHECK(!hi_msg.empty());
-    hi_msg = zmq::message_t();
-    CHECK(0u == hi_msg.size());
-    CHECK(hi_msg.empty());
-}
-
-TEST_CASE("message assign move empty before and after", "[message]")
-{
-    zmq::message_t hi_msg;
-    hi_msg = zmq::message_t();
-    CHECK(0u == hi_msg.size());
-}
-#endif
-
-TEST_CASE("message equality self", "[message]")
-{
-    const zmq::message_t hi_msg(data, strlen(data));
-    CHECK(hi_msg == hi_msg);
-}
-
-TEST_CASE("message equality equal", "[message]")
-{
-    const zmq::message_t hi_msg_a(data, strlen(data));
-    const zmq::message_t hi_msg_b(data, strlen(data));
-    CHECK(hi_msg_a == hi_msg_b);
-}
-
-TEST_CASE("message equality equal empty", "[message]")
-{
-    const zmq::message_t msg_a;
-    const zmq::message_t msg_b;
-    CHECK(msg_a == msg_b);
-}
-
-TEST_CASE("message equality non equal", "[message]")
-{
-    const zmq::message_t msg_a("Hi", 2);
-    const zmq::message_t msg_b("Hello", 5);
-    CHECK(msg_a != msg_b);
-}
-
-TEST_CASE("message equality non equal rhs empty", "[message]")
-{
-    const zmq::message_t msg_a("Hi", 2);
-    const zmq::message_t msg_b;
-    CHECK(msg_a != msg_b);
-}
-
-TEST_CASE("message equality non equal lhs empty", "[message]")
-{
-    const zmq::message_t msg_a;
-    const zmq::message_t msg_b("Hi", 2);
-    CHECK(msg_a != msg_b);
-}
-
-TEST_CASE("message to string", "[message]")
-{
-    const zmq::message_t a;
-    const zmq::message_t b("Foo", 3);
-    CHECK(a.to_string() == "");
-    CHECK(b.to_string() == "Foo");
-#if CPPZMQ_HAS_STRING_VIEW
-    CHECK(a.to_string_view() == "");
-    CHECK(b.to_string_view() == "Foo");
-#endif
-
-#if defined(ZMQ_CPP11) && !defined(ZMQ_CPP11_PARTIAL)
-    const zmq::message_t depr("Foo"); // deprecated
-    CHECK(depr.to_string() != "Foo");
-    CHECK(depr.to_string() == std::string("Foo", 4));
-#endif
-}
-
-#if defined(ZMQ_BUILD_DRAFT_API) && ZMQ_VERSION >= ZMQ_MAKE_VERSION(4, 2, 0)
-TEST_CASE("message routing id persists", "[message]")
-{
-    zmq::message_t msg;
-    msg.set_routing_id(123);
-    CHECK(123u == msg.routing_id());
-}
-
-TEST_CASE("message group persists", "[message]")
-{
-    zmq::message_t msg;
-    msg.set_group("mygroup");
-    CHECK(std::string(msg.group()) == "mygroup");
-}
-#endif
-
-#if ZMQ_VERSION >= ZMQ_MAKE_VERSION(3, 2, 0)
-TEST_CASE("message is not shared", "[message]")
-{
-    zmq::message_t msg;
-    CHECK(msg.get(ZMQ_SHARED) == 0);
-}
-
-TEST_CASE("message is shared", "[message]")
-{
-    size_t msg_sz = 1024; // large enough to be a type_lmsg
-    zmq::message_t msg1(msg_sz);
-    zmq::message_t msg2;
-    msg2.copy(msg1);
-    CHECK(msg1.get(ZMQ_SHARED) == 1);
-    CHECK(msg2.get(ZMQ_SHARED) == 1);
-    CHECK(msg1.size() == msg_sz);
-    CHECK(msg2.size() == msg_sz);
-}
-
-TEST_CASE("message move is not shared", "[message]")
-{
-    size_t msg_sz = 1024; // large enough to be a type_lmsg
-    zmq::message_t msg1(msg_sz);
-    zmq::message_t msg2;
-    msg2.move(msg1);
-    CHECK(msg1.get(ZMQ_SHARED) == 0);
-    CHECK(msg2.get(ZMQ_SHARED) == 0);
-    CHECK(msg2.size() == msg_sz);
-    CHECK(msg1.size() == 0);
-}
-#endif
diff --git a/libs/cppzmq/tests/monitor.cpp b/libs/cppzmq/tests/monitor.cpp
deleted file mode 100644
index 09d5381..0000000
--- a/libs/cppzmq/tests/monitor.cpp
+++ /dev/null
@@ -1,152 +0,0 @@
-#include "testutil.hpp"
-
-#ifdef ZMQ_CPP11
-#include <thread>
-#include <mutex>
-#include <condition_variable>
-#include <functional>
-
-class mock_monitor_t : public zmq::monitor_t
-{
-public:
-
-    void on_event_connected(const zmq_event_t &, const char *) ZMQ_OVERRIDE
-    {
-        ++connected;
-        ++total;
-    }
-
-    int total{0};
-    int connected{0};
-};
-
-#endif
-
-TEST_CASE("monitor create destroy", "[monitor]")
-{
-    zmq::monitor_t monitor;
-}
-
-#if defined(ZMQ_CPP11)
-TEST_CASE("monitor move construct", "[monitor]")
-{
-    zmq::context_t ctx;
-    zmq::socket_t sock(ctx, ZMQ_DEALER);
-    SECTION("move ctor empty") {
-        zmq::monitor_t monitor1;
-        zmq::monitor_t monitor2 = std::move(monitor1);
-    }
-    SECTION("move ctor init") {
-        zmq::monitor_t monitor1;
-        monitor1.init(sock, "inproc://monitor-client");
-        zmq::monitor_t monitor2 = std::move(monitor1);
-    }
-}
-
-TEST_CASE("monitor move assign", "[monitor]")
-{
-    zmq::context_t ctx;
-    zmq::socket_t sock(ctx, ZMQ_DEALER);
-    SECTION("move assign empty") {
-        zmq::monitor_t monitor1;
-        zmq::monitor_t monitor2;
-        monitor1 = std::move(monitor2);
-    }
-    SECTION("move assign init") {
-        zmq::monitor_t monitor1;
-        monitor1.init(sock, "inproc://monitor-client");
-        zmq::monitor_t monitor2;
-        monitor2 = std::move(monitor1);
-    }
-    SECTION("move assign init both") {
-        zmq::monitor_t monitor1;
-        monitor1.init(sock, "inproc://monitor-client");
-        zmq::monitor_t monitor2;
-        zmq::socket_t sock2(ctx, ZMQ_DEALER);
-        monitor2.init(sock2, "inproc://monitor-client2");
-        monitor2 = std::move(monitor1);
-    }
-}
-
-TEST_CASE("monitor init event count", "[monitor]")
-{
-    common_server_client_setup s{false};
-    mock_monitor_t monitor;
-
-    const int expected_event_count = 1;
-    monitor.init(s.client, "inproc://foo");
-
-    CHECK_FALSE(monitor.check_event(0));
-    s.init();
-
-    while (monitor.check_event(1000) && monitor.total < expected_event_count) {
-    }
-    CHECK(monitor.connected == 1);
-    CHECK(monitor.total == expected_event_count);
-}
-
-TEST_CASE("monitor init abort", "[monitor]")
-{
-    class mock_monitor : public mock_monitor_t
-    {
-    public:
-        mock_monitor(std::function<void(void)> handle_connected) :
-            handle_connected{std::move(handle_connected)}
-        {
-        }
-
-        void on_event_connected(const zmq_event_t &e, const char *m) ZMQ_OVERRIDE
-        {
-            mock_monitor_t::on_event_connected(e, m);
-            handle_connected();
-        }
-
-        std::function<void(void)> handle_connected;
-    };
-
-    common_server_client_setup s(false);
-
-    std::mutex mutex;
-    std::condition_variable cond_var;
-    bool done{false};
-
-    mock_monitor monitor([&]()
-    {
-        std::lock_guard<std::mutex> lock(mutex);
-        done = true;
-        cond_var.notify_one();
-    });
-    monitor.init(s.client, "inproc://foo");
-
-    auto thread = std::thread([&monitor]
-    {
-        while (monitor.check_event(-1)) {
-        }
-    });
-
-    s.init();
-    {
-        std::unique_lock<std::mutex> lock(mutex);
-        CHECK(cond_var.wait_for(lock, std::chrono::seconds(1),
-            [&done] { return done; }));
-    }
-    CHECK(monitor.connected == 1);
-    monitor.abort();
-    thread.join();
-}
-
-
-TEST_CASE("monitor from move assigned socket", "[monitor]")
-{
-    zmq::context_t ctx;
-    zmq::socket_t sock;
-    sock = std::move([&ctx] {
-        zmq::socket_t sock(ctx, ZMQ_DEALER);
-        return sock;
-    }());
-    zmq::monitor_t monitor1;
-    monitor1.init(sock, "inproc://monitor-client");
-    // On failure, this test might hang indefinitely instead of immediately
-    // failing
-}
-#endif
diff --git a/libs/cppzmq/tests/multipart.cpp b/libs/cppzmq/tests/multipart.cpp
deleted file mode 100644
index 7d92b97..0000000
--- a/libs/cppzmq/tests/multipart.cpp
+++ /dev/null
@@ -1,212 +0,0 @@
-#include <catch2/catch.hpp>
-#include <zmq_addon.hpp>
-
-#ifdef ZMQ_HAS_RVALUE_REFS
-
-#ifdef ZMQ_CPP17
-static_assert(std::is_invocable<decltype(&zmq::multipart_t::send),
-                                zmq::multipart_t *,
-                                zmq::socket_ref,
-                                int>::value,
-              "Can't multipart_t::send with socket_ref");
-static_assert(std::is_invocable<decltype(&zmq::multipart_t::recv),
-                                zmq::multipart_t *,
-                                zmq::socket_ref,
-                                int>::value,
-              "Can't multipart_t::recv with socket_ref");
-#endif
-static_assert(std::is_constructible<zmq::multipart_t, zmq::socket_ref>::value,
-              "Can't construct with socket_ref");
-
-/// \todo split this up into separate test cases
-///
-TEST_CASE("multipart legacy test", "[multipart]")
-{
-    using namespace zmq;
-
-    bool ok = true;
-    (void) ok;
-    float num = 0;
-    (void) num;
-    std::string str = "";
-    message_t msg;
-
-    // Create two PAIR sockets and connect over inproc
-    context_t context(1);
-    socket_t output(context, ZMQ_PAIR);
-    socket_t input(context, ZMQ_PAIR);
-    output.bind("inproc://multipart.test");
-    input.connect("inproc://multipart.test");
-
-    // Test send and receive of single-frame message
-    multipart_t multipart;
-    assert(multipart.empty());
-
-    multipart.push(message_t("Hello", 5));
-    assert(multipart.size() == 1);
-
-    ok = multipart.send(output);
-    assert(multipart.empty());
-    assert(ok);
-
-    ok = multipart.recv(input);
-    assert(multipart.size() == 1);
-    assert(ok);
-
-    msg = multipart.pop();
-    assert(multipart.empty());
-    assert(std::string(msg.data<char>(), msg.size()) == "Hello");
-
-    // Test send and receive of multi-frame message
-    multipart.addstr("A");
-    multipart.addstr("BB");
-    multipart.addstr("CCC");
-    assert(multipart.size() == 3);
-
-    multipart_t copy = multipart.clone();
-    assert(copy.size() == 3);
-
-    ok = copy.send(output);
-    assert(copy.empty());
-    assert(ok);
-
-    ok = copy.recv(input);
-    assert(copy.size() == 3);
-    assert(ok);
-    assert(copy.equal(&multipart));
-
-    // Test equality operators
-    assert(copy == multipart);
-    assert(multipart == copy);
-
-    multipart.pop();
-
-    assert(copy != multipart);
-    assert(multipart != copy);
-
-    multipart_t emptyMessage1 {};
-    multipart_t emptyMessage2 {};
-
-    assert(emptyMessage1 == emptyMessage2);
-    assert(emptyMessage2 == emptyMessage1);
-
-    multipart.clear();
-    assert(multipart.empty());
-
-    // Test message frame manipulation
-    multipart.add(message_t("Frame5", 6));
-    multipart.addstr("Frame6");
-    multipart.addstr("Frame7");
-    multipart.addtyp(8.0f);
-    multipart.addmem("Frame9", 6);
-    multipart.push(message_t("Frame4", 6));
-    multipart.pushstr("Frame3");
-    multipart.pushstr("Frame2");
-    multipart.pushtyp(1.0f);
-    multipart.pushmem("Frame0", 6);
-    assert(multipart.size() == 10);
-
-    const message_t &front_msg = multipart.front();
-    assert(multipart.size() == 10);
-    assert(std::string(front_msg.data<char>(), front_msg.size()) == "Frame0");
-
-    const message_t &back_msg = multipart.back();
-    assert(multipart.size() == 10);
-    assert(std::string(back_msg.data<char>(), back_msg.size()) == "Frame9");
-
-    msg = multipart.remove();
-    assert(multipart.size() == 9);
-    assert(std::string(msg.data<char>(), msg.size()) == "Frame9");
-
-    msg = multipart.pop();
-    assert(multipart.size() == 8);
-    assert(std::string(msg.data<char>(), msg.size()) == "Frame0");
-
-    num = multipart.poptyp<float>();
-    assert(multipart.size() == 7);
-    assert(num == 1.0f);
-
-    str = multipart.popstr();
-    assert(multipart.size() == 6);
-    assert(str == "Frame2");
-
-    str = multipart.popstr();
-    assert(multipart.size() == 5);
-    assert(str == "Frame3");
-
-    str = multipart.popstr();
-    assert(multipart.size() == 4);
-    assert(str == "Frame4");
-
-    str = multipart.popstr();
-    assert(multipart.size() == 3);
-    assert(str == "Frame5");
-
-    str = multipart.popstr();
-    assert(multipart.size() == 2);
-    assert(str == "Frame6");
-
-    str = multipart.popstr();
-    assert(multipart.size() == 1);
-    assert(str == "Frame7");
-
-    num = multipart.poptyp<float>();
-    assert(multipart.empty());
-    assert(num == 8.0f);
-
-    // Test message constructors and concatenation
-    multipart_t head("One", 3);
-    head.addstr("Two");
-    assert(head.size() == 2);
-
-    multipart_t tail(std::string("One-hundred"));
-    tail.pushstr("Ninety-nine");
-    assert(tail.size() == 2);
-
-    multipart_t tmp(message_t("Fifty", 5));
-    assert(tmp.size() == 1);
-
-    multipart_t mid = multipart_t::create(49.0f);
-    mid.append(std::move(tmp));
-    assert(mid.size() == 2);
-    assert(tmp.empty());
-
-    multipart_t merged(std::move(mid));
-    merged.prepend(std::move(head));
-    merged.append(std::move(tail));
-    assert(merged.size() == 6);
-    assert(head.empty());
-    assert(tail.empty());
-
-    ok = merged.send(output);
-    assert(merged.empty());
-    assert(ok);
-
-    multipart_t received(input);
-    assert(received.size() == 6);
-
-    str = received.popstr();
-    assert(received.size() == 5);
-    assert(str == "One");
-
-    str = received.popstr();
-    assert(received.size() == 4);
-    assert(str == "Two");
-
-    num = received.poptyp<float>();
-    assert(received.size() == 3);
-    assert(num == 49.0f);
-
-    str = received.popstr();
-    assert(received.size() == 2);
-    assert(str == "Fifty");
-
-    str = received.popstr();
-    assert(received.size() == 1);
-    assert(str == "Ninety-nine");
-
-    str = received.popstr();
-    assert(received.empty());
-    assert(str == "One-hundred");
-}
-#endif
diff --git a/libs/cppzmq/tests/poller.cpp b/libs/cppzmq/tests/poller.cpp
deleted file mode 100644
index 81c42e6..0000000
--- a/libs/cppzmq/tests/poller.cpp
+++ /dev/null
@@ -1,356 +0,0 @@
-#include "testutil.hpp"
-
-#if defined(ZMQ_BUILD_DRAFT_API) && defined(ZMQ_CPP11) && !defined(ZMQ_CPP11_PARTIAL) && defined(ZMQ_HAVE_POLLER)
-
-#include <array>
-#include <memory>
-
-#ifdef ZMQ_CPP17
-static_assert(std::is_nothrow_swappable_v<zmq::poller_t<>>);
-#endif
-static_assert(sizeof(zmq_poller_event_t) == sizeof(zmq::poller_event<>), "");
-static_assert(sizeof(zmq_poller_event_t) == sizeof(zmq::poller_event<zmq::
-                  no_user_data>), "");
-static_assert(sizeof(zmq_poller_event_t) == sizeof(zmq::poller_event<int>), "");
-static_assert(alignof(zmq_poller_event_t) == alignof(zmq::poller_event<>), "");
-static_assert(alignof(zmq_poller_event_t) == alignof(zmq::poller_event<int>), "");
-
-static_assert(!std::is_copy_constructible<zmq::poller_t<>>::value,
-    "poller_t should not be copy-constructible");
-static_assert(!std::is_copy_assignable<zmq::poller_t<>>::value,
-    "poller_t should not be copy-assignable");
-
-TEST_CASE("event flags", "[poller]")
-{
-    CHECK((zmq::event_flags::pollin | zmq::event_flags::pollout)
-        == static_cast<zmq::event_flags>(ZMQ_POLLIN | ZMQ_POLLOUT));
-    CHECK((zmq::event_flags::pollin & zmq::event_flags::pollout)
-        == static_cast<zmq::event_flags>(ZMQ_POLLIN & ZMQ_POLLOUT));
-    CHECK((zmq::event_flags::pollin ^ zmq::event_flags::pollout)
-        == static_cast<zmq::event_flags>(ZMQ_POLLIN ^ ZMQ_POLLOUT));
-    CHECK(~zmq::event_flags::pollin == static_cast<zmq::event_flags>(~ZMQ_POLLIN));
-}
-
-TEST_CASE("poller create destroy", "[poller]")
-{
-    zmq::poller_t<> a;
-#ifdef ZMQ_CPP17 // CTAD
-    zmq::poller_t b;
-    zmq::poller_event e;
-#endif
-}
-
-TEST_CASE("poller move construct empty", "[poller]")
-{
-    zmq::poller_t<> a;
-    zmq::poller_t<> b = std::move(a);
-}
-
-TEST_CASE("poller move assign empty", "[poller]")
-{
-    zmq::poller_t<> a;
-    zmq::poller_t<> b;
-    b = std::move(a);
-}
-
-TEST_CASE("poller swap", "[poller]")
-{
-    zmq::poller_t<> a;
-    zmq::poller_t<> b;
-    using std::swap;
-    swap(a, b);
-}
-
-TEST_CASE("poller move construct non empty", "[poller]")
-{
-    zmq::context_t context;
-    zmq::socket_t socket{context, zmq::socket_type::router};
-
-    zmq::poller_t<> a;
-    a.add(socket, zmq::event_flags::pollin);
-    zmq::poller_t<> b = std::move(a);
-}
-
-TEST_CASE("poller move assign non empty", "[poller]")
-{
-    zmq::context_t context;
-    zmq::socket_t socket{context, zmq::socket_type::router};
-
-    zmq::poller_t<> a;
-    a.add(socket, zmq::event_flags::pollin);
-    zmq::poller_t<> b;
-    b = std::move(a);
-}
-
-TEST_CASE("poller add nullptr", "[poller]")
-{
-    zmq::context_t context;
-    zmq::socket_t socket{context, zmq::socket_type::router};
-    zmq::poller_t<void> poller;
-    CHECK_NOTHROW(poller.add(socket, zmq::event_flags::pollin, nullptr));
-}
-
-TEST_CASE("poller add non nullptr", "[poller]")
-{
-    zmq::context_t context;
-    zmq::socket_t socket{context, zmq::socket_type::router};
-    zmq::poller_t<int> poller;
-    int i;
-    CHECK_NOTHROW(poller.add(socket, zmq::event_flags::pollin, &i));
-}
-
-#if ZMQ_VERSION >= ZMQ_MAKE_VERSION(4, 3, 0)
-// this behaviour was added by https://github.com/zeromq/libzmq/pull/3100
-TEST_CASE("poller add handler invalid events type", "[poller]")
-{
-    zmq::context_t context;
-    zmq::socket_t socket{context, zmq::socket_type::router};
-    zmq::poller_t<> poller;
-    short invalid_events_type = 2 << 10;
-    CHECK_THROWS_AS(
-        poller.add(socket, static_cast<zmq::event_flags>(invalid_events_type)),
-        zmq::error_t);
-}
-#endif
-
-TEST_CASE("poller add handler twice throws", "[poller]")
-{
-    zmq::context_t context;
-    zmq::socket_t socket{context, zmq::socket_type::router};
-    zmq::poller_t<> poller;
-    poller.add(socket, zmq::event_flags::pollin);
-    /// \todo the actual error code should be checked
-    CHECK_THROWS_AS(poller.add(socket, zmq::event_flags::pollin),
-                    zmq::error_t);
-}
-
-TEST_CASE("poller wait with no handlers throws", "[poller]")
-{
-    zmq::poller_t<> poller;
-    std::vector<zmq::poller_event<>> events;
-    /// \todo the actual error code should be checked
-    CHECK_THROWS_AS(poller.wait_all(events, std::chrono::milliseconds{10}),
-                    zmq::error_t);
-}
-
-#if ZMQ_VERSION >= ZMQ_MAKE_VERSION(4, 3, 3)
-TEST_CASE("poller add/remove size checks", "[poller]")
-{
-    zmq::context_t context;
-    zmq::socket_t socket{context, zmq::socket_type::router};
-    zmq::poller_t<> poller;
-    CHECK(poller.size() == 0);
-    poller.add(socket, zmq::event_flags::pollin);
-    CHECK(poller.size() == 1);
-    CHECK_NOTHROW(poller.remove(socket));
-    CHECK(poller.size() == 0);
-}
-#endif
-
-TEST_CASE("poller remove unregistered throws", "[poller]")
-{
-    zmq::context_t context;
-    zmq::socket_t socket{context, zmq::socket_type::router};
-    zmq::poller_t<> poller;
-    /// \todo the actual error code should be checked
-    CHECK_THROWS_AS(poller.remove(socket), zmq::error_t);
-}
-
-TEST_CASE("poller remove registered empty", "[poller]")
-{
-    zmq::context_t context;
-    zmq::socket_t socket{context, zmq::socket_type::router};
-    zmq::poller_t<> poller;
-    poller.add(socket, zmq::event_flags::pollin);
-    CHECK_NOTHROW(poller.remove(socket));
-}
-
-TEST_CASE("poller remove registered non empty", "[poller]")
-{
-    zmq::context_t context;
-    zmq::socket_t socket{context, zmq::socket_type::router};
-    zmq::poller_t<int> poller;
-    int empty{};
-    poller.add(socket, zmq::event_flags::pollin, &empty);
-    CHECK_NOTHROW(poller.remove(socket));
-}
-
-const std::string hi_str = "Hi";
-
-TEST_CASE("poller poll basic", "[poller]")
-{
-    common_server_client_setup s;
-
-    CHECK_NOTHROW(s.client.send(zmq::message_t{hi_str}, zmq::send_flags::none));
-
-    zmq::poller_t<int> poller;
-    std::vector<zmq::poller_event<int>> events{1};
-    int i = 0;
-    CHECK_NOTHROW(poller.add(s.server, zmq::event_flags::pollin, &i));
-    CHECK(1 == poller.wait_all(events, std::chrono::milliseconds{-1}));
-    CHECK(s.server == events[0].socket);
-    CHECK(&i == events[0].user_data);
-}
-
-TEST_CASE("poller add invalid socket throws", "[poller]")
-{
-    zmq::context_t context;
-    zmq::poller_t<> poller;
-    zmq::socket_t a{context, zmq::socket_type::router};
-    zmq::socket_t b{std::move(a)};
-    CHECK_THROWS_AS(poller.add(a, zmq::event_flags::pollin), zmq::error_t);
-}
-
-TEST_CASE("poller remove invalid socket throws", "[poller]")
-{
-    zmq::context_t context;
-    zmq::socket_t socket{context, zmq::socket_type::router};
-    zmq::poller_t<> poller;
-    CHECK_NOTHROW(poller.add(socket, zmq::event_flags::pollin));
-    std::vector<zmq::socket_t> sockets;
-    sockets.emplace_back(std::move(socket));
-    CHECK_THROWS_AS(poller.remove(socket), zmq::error_t);
-    CHECK_NOTHROW(poller.remove(sockets[0]));
-}
-
-TEST_CASE("poller modify empty throws", "[poller]")
-{
-    zmq::context_t context;
-    zmq::socket_t socket{context, zmq::socket_type::push};
-    zmq::poller_t<> poller;
-    CHECK_THROWS_AS(poller.modify(socket, zmq::event_flags::pollin),
-                    zmq::error_t);
-}
-
-TEST_CASE("poller modify invalid socket throws", "[poller]")
-{
-    zmq::context_t context;
-    zmq::socket_t a{context, zmq::socket_type::push};
-    zmq::socket_t b{std::move(a)};
-    zmq::poller_t<> poller;
-    CHECK_THROWS_AS(poller.modify(a, zmq::event_flags::pollin), zmq::error_t);
-}
-
-TEST_CASE("poller modify not added throws", "[poller]")
-{
-    zmq::context_t context;
-    zmq::socket_t a{context, zmq::socket_type::push};
-    zmq::socket_t b{context, zmq::socket_type::push};
-    zmq::poller_t<> poller;
-    CHECK_NOTHROW(poller.add(a, zmq::event_flags::pollin));
-    CHECK_THROWS_AS(poller.modify(b, zmq::event_flags::pollin), zmq::error_t);
-}
-
-TEST_CASE("poller modify simple", "[poller]")
-{
-    zmq::context_t context;
-    zmq::socket_t a{context, zmq::socket_type::push};
-    zmq::poller_t<> poller;
-    CHECK_NOTHROW(poller.add(a, zmq::event_flags::pollin));
-    CHECK_NOTHROW(
-        poller.modify(a, zmq::event_flags::pollin | zmq::event_flags::pollout));
-}
-
-TEST_CASE("poller poll client server", "[poller]")
-{
-    // Setup server and client
-    common_server_client_setup s;
-
-    // Setup poller
-    zmq::poller_t<zmq::socket_t> poller;
-    CHECK_NOTHROW(poller.add(s.server, zmq::event_flags::pollin, &s.server));
-
-    // client sends message
-    CHECK_NOTHROW(s.client.send(zmq::message_t{hi_str}, zmq::send_flags::none));
-
-    // wait for message and verify events
-    std::vector<zmq::poller_event<zmq::socket_t>> events(1);
-    CHECK(1 == poller.wait_all(events, std::chrono::milliseconds{500}));
-    CHECK(zmq::event_flags::pollin == events[0].events);
-
-    // Modify server socket with pollout flag
-    CHECK_NOTHROW(
-        poller.modify(s.server, zmq::event_flags::pollin | zmq::event_flags::pollout
-        ));
-    CHECK(1 == poller.wait_all(events, std::chrono::milliseconds{500}));
-    CHECK((zmq::event_flags::pollin | zmq::event_flags::pollout) == events[0].events)
-    ;
-}
-
-TEST_CASE("poller wait one return", "[poller]")
-{
-    // Setup server and client
-    common_server_client_setup s;
-
-    // Setup poller
-    zmq::poller_t<> poller;
-    CHECK_NOTHROW(poller.add(s.server, zmq::event_flags::pollin));
-
-    // client sends message
-    CHECK_NOTHROW(s.client.send(zmq::message_t{hi_str}, zmq::send_flags::none));
-
-    // wait for message and verify events
-    std::vector<zmq::poller_event<>> events(1);
-    CHECK(1 == poller.wait_all(events, std::chrono::milliseconds{500}));
-}
-
-TEST_CASE("poller wait on move constructed", "[poller]")
-{
-    common_server_client_setup s;
-    CHECK_NOTHROW(s.client.send(zmq::message_t{hi_str}, zmq::send_flags::none));
-    zmq::poller_t<> a;
-    CHECK_NOTHROW(a.add(s.server, zmq::event_flags::pollin));
-    zmq::poller_t<> b{std::move(a)};
-    std::vector<zmq::poller_event<>> events(1);
-    /// \todo the actual error code should be checked
-    CHECK_THROWS_AS(a.wait_all(events, std::chrono::milliseconds{10}),
-                    zmq::error_t);
-    CHECK(1 == b.wait_all(events, std::chrono::milliseconds{-1}));
-}
-
-TEST_CASE("poller wait on move assigned", "[poller]")
-{
-    common_server_client_setup s;
-    CHECK_NOTHROW(s.client.send(zmq::message_t{hi_str}, zmq::send_flags::none));
-    zmq::poller_t<> a;
-    CHECK_NOTHROW(a.add(s.server, zmq::event_flags::pollin));
-    zmq::poller_t<> b;
-    b = {std::move(a)};
-    /// \todo the TEST_CASE error code should be checked
-    std::vector<zmq::poller_event<>> events(1);
-    CHECK_THROWS_AS(a.wait_all(events, std::chrono::milliseconds{10}),
-                    zmq::error_t);
-    CHECK(1 == b.wait_all(events, std::chrono::milliseconds{-1}));
-}
-
-TEST_CASE("poller remove from handler", "[poller]")
-{
-    constexpr size_t ITER_NO = 10;
-
-    // Setup servers and clients
-    std::vector<common_server_client_setup> setup_list;
-    for (size_t i = 0; i < ITER_NO; ++i)
-        setup_list.emplace_back(common_server_client_setup{});
-
-    // Setup poller
-    zmq::poller_t<> poller;
-    for (size_t i = 0; i < ITER_NO; ++i) {
-        CHECK_NOTHROW(poller.add(setup_list[i].server, zmq::event_flags::pollin));
-    }
-    // Clients send messages
-    for (auto &s : setup_list) {
-        CHECK_NOTHROW(s.client.send(zmq::message_t{hi_str}, zmq::send_flags::none));
-    }
-
-    // Wait for all servers to receive a message
-    for (auto &s : setup_list) {
-        zmq::pollitem_t items[] = {{s.server, 0, ZMQ_POLLIN, 0}};
-        zmq::poll(&items[0], 1);
-    }
-
-    // Fire all handlers in one wait
-    std::vector<zmq::poller_event<>> events(ITER_NO);
-    CHECK(ITER_NO == poller.wait_all(events, std::chrono::milliseconds{-1}));
-}
-
-#endif
diff --git a/libs/cppzmq/tests/recv_multipart.cpp b/libs/cppzmq/tests/recv_multipart.cpp
deleted file mode 100644
index cf99855..0000000
--- a/libs/cppzmq/tests/recv_multipart.cpp
+++ /dev/null
@@ -1,139 +0,0 @@
-#include <catch2/catch.hpp>
-#include <zmq_addon.hpp>
-#ifdef ZMQ_CPP11
-
-TEST_CASE("recv_multipart test", "[recv_multipart]")
-{
-    zmq::context_t context(1);
-    zmq::socket_t output(context, ZMQ_PAIR);
-    zmq::socket_t input(context, ZMQ_PAIR);
-    output.bind("inproc://multipart.test");
-    input.connect("inproc://multipart.test");
-
-    SECTION("send 1 message") {
-        input.send(zmq::str_buffer("hello"));
-
-        std::vector<zmq::message_t> msgs;
-        auto ret = zmq::recv_multipart(output, std::back_inserter(msgs));
-        REQUIRE(ret);
-        CHECK(*ret == 1);
-        REQUIRE(msgs.size() == 1);
-        CHECK(msgs[0].size() == 5);
-    }
-    SECTION("send 2 messages") {
-        input.send(zmq::str_buffer("hello"), zmq::send_flags::sndmore);
-        input.send(zmq::str_buffer("world!"));
-
-        std::vector<zmq::message_t> msgs;
-        auto ret = zmq::recv_multipart(output, std::back_inserter(msgs));
-        REQUIRE(ret);
-        CHECK(*ret == 2);
-        REQUIRE(msgs.size() == 2);
-        CHECK(msgs[0].size() == 5);
-        CHECK(msgs[1].size() == 6);
-    }
-    SECTION("send no messages, dontwait") {
-        std::vector<zmq::message_t> msgs;
-        auto ret = zmq::recv_multipart(output, std::back_inserter(msgs),
-                                       zmq::recv_flags::dontwait);
-        CHECK_FALSE(ret);
-        REQUIRE(msgs.size() == 0);
-    }
-    SECTION("send 1 partial message, dontwait") {
-        input.send(zmq::str_buffer("hello"), zmq::send_flags::sndmore);
-
-        std::vector<zmq::message_t> msgs;
-        auto ret = zmq::recv_multipart(output, std::back_inserter(msgs),
-                                       zmq::recv_flags::dontwait);
-        CHECK_FALSE(ret);
-        REQUIRE(msgs.size() == 0);
-    }
-    SECTION("recv with invalid socket") {
-        std::vector<zmq::message_t> msgs;
-        CHECK_THROWS_AS(
-            zmq::recv_multipart(zmq::socket_ref(), std::back_inserter(msgs)),
-            zmq::error_t);
-    }
-}
-
-TEST_CASE("recv_multipart_n test", "[recv_multipart]")
-{
-    zmq::context_t context(1);
-    zmq::socket_t output(context, ZMQ_PAIR);
-    zmq::socket_t input(context, ZMQ_PAIR);
-    output.bind("inproc://multipart.test");
-    input.connect("inproc://multipart.test");
-
-    SECTION("send 1 message") {
-        input.send(zmq::str_buffer("hello"));
-
-        std::array<zmq::message_t, 1> msgs;
-        auto ret = zmq::recv_multipart_n(output, msgs.data(), msgs.size());
-        REQUIRE(ret);
-        CHECK(*ret == 1);
-        CHECK(msgs[0].size() == 5);
-    }
-    SECTION("send 1 message 2") {
-        input.send(zmq::str_buffer("hello"));
-
-        std::array<zmq::message_t, 2> msgs;
-        auto ret = zmq::recv_multipart_n(output, msgs.data(), msgs.size());
-        REQUIRE(ret);
-        CHECK(*ret == 1);
-        CHECK(msgs[0].size() == 5);
-        CHECK(msgs[1].size() == 0);
-    }
-    SECTION("send 2 messages, recv 1") {
-        input.send(zmq::str_buffer("hello"), zmq::send_flags::sndmore);
-        input.send(zmq::str_buffer("world!"));
-
-        std::array<zmq::message_t, 1> msgs;
-        CHECK_THROWS_AS(
-            zmq::recv_multipart_n(output, msgs.data(), msgs.size()),
-            std::runtime_error);
-    }
-    SECTION("recv 0") {
-        input.send(zmq::str_buffer("hello"), zmq::send_flags::sndmore);
-        input.send(zmq::str_buffer("world!"));
-
-        std::array<zmq::message_t, 1> msgs;
-        CHECK_THROWS_AS(
-            zmq::recv_multipart_n(output, msgs.data(), 0),
-            std::runtime_error);
-    }
-    SECTION("send 2 messages") {
-        input.send(zmq::str_buffer("hello"), zmq::send_flags::sndmore);
-        input.send(zmq::str_buffer("world!"));
-
-        std::array<zmq::message_t, 2> msgs;
-        auto ret = zmq::recv_multipart_n(output, msgs.data(), msgs.size());
-        REQUIRE(ret);
-        CHECK(*ret == 2);
-        CHECK(msgs[0].size() == 5);
-        CHECK(msgs[1].size() == 6);
-    }
-    SECTION("send no messages, dontwait") {
-        std::array<zmq::message_t, 1> msgs;
-        auto ret = zmq::recv_multipart_n(output, msgs.data(), msgs.size(),
-                                         zmq::recv_flags::dontwait);
-        CHECK_FALSE(ret);
-        REQUIRE(msgs[0].size() == 0);
-    }
-    SECTION("send 1 partial message, dontwait") {
-        input.send(zmq::str_buffer("hello"), zmq::send_flags::sndmore);
-
-        std::array<zmq::message_t, 1> msgs;
-        auto ret = zmq::recv_multipart_n(output, msgs.data(), msgs.size(),
-                                         zmq::recv_flags::dontwait);
-        CHECK_FALSE(ret);
-        REQUIRE(msgs[0].size() == 0);
-    }
-    SECTION("recv with invalid socket") {
-        std::array<zmq::message_t, 1> msgs;
-        CHECK_THROWS_AS(
-            zmq::recv_multipart_n(zmq::socket_ref(), msgs.data(), msgs.size()),
-            zmq::error_t);
-    }
-}
-
-#endif
diff --git a/libs/cppzmq/tests/send_multipart.cpp b/libs/cppzmq/tests/send_multipart.cpp
deleted file mode 100644
index 1f23823..0000000
--- a/libs/cppzmq/tests/send_multipart.cpp
+++ /dev/null
@@ -1,121 +0,0 @@
-#include <catch2/catch.hpp>
-#include <zmq_addon.hpp>
-#ifdef ZMQ_CPP11
-
-#include <forward_list>
-
-TEST_CASE("send_multipart test", "[send_multipart]")
-{
-    zmq::context_t context(1);
-    zmq::socket_t output(context, ZMQ_PAIR);
-    zmq::socket_t input(context, ZMQ_PAIR);
-    output.bind("inproc://multipart.test");
-    input.connect("inproc://multipart.test");
-
-    SECTION("send 0 messages") {
-        std::vector<zmq::message_t> imsgs;
-        auto iret = zmq::send_multipart(input, imsgs);
-        REQUIRE(iret);
-        CHECK(*iret == 0);
-    }
-    SECTION("send 1 message") {
-        std::array<zmq::message_t, 1> imsgs = {zmq::message_t(3)};
-        auto iret = zmq::send_multipart(input, imsgs);
-        REQUIRE(iret);
-        CHECK(*iret == 1);
-
-        std::vector<zmq::message_t> omsgs;
-        auto oret = zmq::recv_multipart(output, std::back_inserter(omsgs));
-        REQUIRE(oret);
-        CHECK(*oret == 1);
-        REQUIRE(omsgs.size() == 1);
-        CHECK(omsgs[0].size() == 3);
-    }
-    SECTION("send 2 messages") {
-        std::array<zmq::message_t, 2> imsgs = {zmq::message_t(3), zmq::message_t(4)};
-        auto iret = zmq::send_multipart(input, imsgs);
-        REQUIRE(iret);
-        CHECK(*iret == 2);
-
-        std::vector<zmq::message_t> omsgs;
-        auto oret = zmq::recv_multipart(output, std::back_inserter(omsgs));
-        REQUIRE(oret);
-        CHECK(*oret == 2);
-        REQUIRE(omsgs.size() == 2);
-        CHECK(omsgs[0].size() == 3);
-        CHECK(omsgs[1].size() == 4);
-    }
-    SECTION("send 2 messages, const_buffer") {
-        std::array<zmq::const_buffer, 2> imsgs = {zmq::str_buffer("foo"),
-                                                  zmq::str_buffer("bar!")};
-        auto iret = zmq::send_multipart(input, imsgs);
-        REQUIRE(iret);
-        CHECK(*iret == 2);
-
-        std::vector<zmq::message_t> omsgs;
-        auto oret = zmq::recv_multipart(output, std::back_inserter(omsgs));
-        REQUIRE(oret);
-        CHECK(*oret == 2);
-        REQUIRE(omsgs.size() == 2);
-        CHECK(omsgs[0].size() == 3);
-        CHECK(omsgs[1].size() == 4);
-    }
-    SECTION("send 2 messages, mutable_buffer") {
-        char buf[4] = {};
-        std::array<zmq::mutable_buffer, 2> imsgs = {
-            zmq::buffer(buf, 3), zmq::buffer(buf)};
-        auto iret = zmq::send_multipart(input, imsgs);
-        REQUIRE(iret);
-        CHECK(*iret == 2);
-
-        std::vector<zmq::message_t> omsgs;
-        auto oret = zmq::recv_multipart(output, std::back_inserter(omsgs));
-        REQUIRE(oret);
-        CHECK(*oret == 2);
-        REQUIRE(omsgs.size() == 2);
-        CHECK(omsgs[0].size() == 3);
-        CHECK(omsgs[1].size() == 4);
-    }
-    SECTION("send 2 messages, dontwait") {
-        zmq::socket_t push(context, ZMQ_PUSH);
-        push.bind("inproc://multipart.test.push");
-
-        std::array<zmq::message_t, 2> imsgs = {zmq::message_t(3), zmq::message_t(4)};
-        auto iret = zmq::send_multipart(push, imsgs, zmq::send_flags::dontwait);
-        REQUIRE_FALSE(iret);
-    }
-    SECTION("send, misc. containers") {
-        std::vector<zmq::message_t> msgs_vec;
-        msgs_vec.emplace_back(3);
-        msgs_vec.emplace_back(4);
-        auto iret = zmq::send_multipart(input, msgs_vec);
-        REQUIRE(iret);
-        CHECK(*iret == 2);
-
-        std::forward_list<zmq::message_t> msgs_list;
-        msgs_list.emplace_front(4);
-        msgs_list.emplace_front(3);
-        iret = zmq::send_multipart(input, msgs_list);
-        REQUIRE(iret);
-        CHECK(*iret == 2);
-
-        // init. list
-        const auto msgs_il = {zmq::str_buffer("foo"), zmq::str_buffer("bar!")};
-        iret = zmq::send_multipart(input, msgs_il);
-        REQUIRE(iret);
-        CHECK(*iret == 2);
-        // rvalue
-        iret = zmq::send_multipart(input,
-                                   std::initializer_list<zmq::const_buffer>{
-                                       zmq::str_buffer("foo"),
-                                       zmq::str_buffer("bar!")});
-        REQUIRE(iret);
-        CHECK(*iret == 2);
-    }
-    SECTION("send with invalid socket") {
-        std::vector<zmq::message_t> msgs(1);
-        CHECK_THROWS_AS(zmq::send_multipart(zmq::socket_ref(), msgs),
-                        zmq::error_t);
-    }
-}
-#endif
diff --git a/libs/cppzmq/tests/socket.cpp b/libs/cppzmq/tests/socket.cpp
deleted file mode 100644
index cebee4b..0000000
--- a/libs/cppzmq/tests/socket.cpp
+++ /dev/null
@@ -1,700 +0,0 @@
-#include <catch2/catch.hpp>
-#include <zmq.hpp>
-#ifdef ZMQ_CPP11
-#include <future>
-#endif
-
-#if (__cplusplus >= 201703L)
-static_assert(std::is_nothrow_swappable<zmq::socket_t>::value,
-              "socket_t should be nothrow swappable");
-#endif
-
-TEST_CASE("socket default ctor", "[socket]")
-{
-    zmq::socket_t socket;
-}
-
-TEST_CASE("socket create destroy", "[socket]")
-{
-    zmq::context_t context;
-    zmq::socket_t socket(context, ZMQ_ROUTER);
-}
-
-#ifdef ZMQ_CPP11
-TEST_CASE("socket create assign", "[socket]")
-{
-    zmq::context_t context;
-    zmq::socket_t socket(context, ZMQ_ROUTER);
-    CHECK(static_cast<bool>(socket));
-    CHECK(socket.handle() != nullptr);
-    socket = {};
-    CHECK(!static_cast<bool>(socket));
-    CHECK(socket.handle() == nullptr);
-}
-
-TEST_CASE("socket create by enum and destroy", "[socket]")
-{
-    zmq::context_t context;
-    zmq::socket_t socket(context, zmq::socket_type::router);
-}
-
-TEST_CASE("socket swap", "[socket]")
-{
-    zmq::context_t context;
-    zmq::socket_t socket1(context, zmq::socket_type::router);
-    zmq::socket_t socket2(context, zmq::socket_type::dealer);
-    using std::swap;
-    swap(socket1, socket2);
-}
-
-#ifdef ZMQ_CPP11
-TEST_CASE("socket options", "[socket]")
-{
-    zmq::context_t context;
-    zmq::socket_t socket(context, zmq::socket_type::router);
-
-#ifdef ZMQ_IMMEDIATE
-    socket.set(zmq::sockopt::immediate, 0);
-    socket.set(zmq::sockopt::immediate, false);
-    CHECK(socket.get(zmq::sockopt::immediate) == false);
-    // unit out of range
-    CHECK_THROWS_AS(socket.set(zmq::sockopt::immediate, 80), zmq::error_t);
-#endif
-#ifdef ZMQ_LINGER
-    socket.set(zmq::sockopt::linger, 55);
-    CHECK(socket.get(zmq::sockopt::linger) == 55);
-#endif
-#ifdef ZMQ_ROUTING_ID
-    const std::string id = "foobar";
-    socket.set(zmq::sockopt::routing_id, "foobar");
-    socket.set(zmq::sockopt::routing_id, zmq::buffer(id));
-    socket.set(zmq::sockopt::routing_id, id);
-#if CPPZMQ_HAS_STRING_VIEW
-    socket.set(zmq::sockopt::routing_id, std::string_view{id});
-#endif
-
-    std::string id_ret(10, ' ');
-    auto size = socket.get(zmq::sockopt::routing_id, zmq::buffer(id_ret));
-    id_ret.resize(size);
-    CHECK(id == id_ret);
-    auto stropt = socket.get(zmq::sockopt::routing_id);
-    CHECK(id == stropt);
-
-    std::string id_ret_small(3, ' ');
-    // truncated
-    CHECK_THROWS_AS(socket.get(zmq::sockopt::routing_id, zmq::buffer(id_ret_small)),
-                    zmq::error_t);
-#endif
-}
-
-template<class T>
-void check_array_opt(T opt,
-                     zmq::socket_t &sock,
-                     std::string info,
-                     bool set_only = false)
-{
-    const std::string val = "foobar";
-    INFO("setting " + info);
-    sock.set(opt, val);
-    if (set_only)
-        return;
-
-    INFO("getting " + info);
-    auto s = sock.get(opt);
-    CHECK(s == val);
-}
-
-template<class T>
-void check_array_opt_get(T opt, zmq::socket_t &sock, std::string info)
-{
-    INFO("getting " + info);
-    (void) sock.get(opt);
-}
-
-#if ZMQ_VERSION >= ZMQ_MAKE_VERSION(4, 0, 0)
-template<class T> void check_bin_z85(T opt, zmq::socket_t &sock, std::string str_val)
-{
-    std::vector<uint8_t> bin_val(32);
-    const auto dret = zmq_z85_decode(bin_val.data(), str_val.c_str());
-    CHECK(dret != nullptr);
-
-    sock.set(opt, str_val);
-    sock.set(opt, zmq::buffer(bin_val));
-    auto sv = sock.get(opt);
-    CHECK(sv == str_val);
-
-    auto bv = sock.get(opt, 32);
-    REQUIRE(bv.size() == bin_val.size());
-    CHECK(std::memcmp(bv.data(), bin_val.data(), bin_val.size()) == 0);
-}
-#endif
-
-TEST_CASE("socket check array options", "[socket]")
-{
-    zmq::context_t context;
-    zmq::socket_t router(context, zmq::socket_type::router);
-    zmq::socket_t xpub(context, zmq::socket_type::xpub);
-    zmq::socket_t sub(context, zmq::socket_type::sub);
-
-#ifdef ZMQ_BINDTODEVICE
-// requires setting CAP_NET_RAW
-//check_array_opt(zmq::sockopt::bindtodevice, router, "bindtodevice");
-#endif
-#ifdef ZMQ_CONNECT_ROUTING_ID
-    check_array_opt(zmq::sockopt::connect_routing_id, router, "connect_routing_id",
-                    true);
-#endif
-#ifdef ZMQ_LAST_ENDPOINT
-    check_array_opt_get(zmq::sockopt::last_endpoint, router, "last_endpoint");
-#endif
-#ifdef ZMQ_METADATA
-    router.set(zmq::sockopt::metadata, zmq::str_buffer("X-foo:bar"));
-#endif
-#ifdef ZMQ_PLAIN_PASSWORD
-    check_array_opt(zmq::sockopt::plain_password, router, "plain_password");
-#endif
-#ifdef ZMQ_PLAIN_USERNAME
-    check_array_opt(zmq::sockopt::plain_username, router, "plain_username");
-#endif
-#ifdef ZMQ_ROUTING_ID
-    check_array_opt(zmq::sockopt::routing_id, router, "routing_id");
-#endif
-#ifdef ZMQ_SOCKS_PROXY
-    check_array_opt(zmq::sockopt::socks_proxy, router, "socks_proxy");
-#endif
-#ifdef ZMQ_SUBSCRIBE
-    check_array_opt(zmq::sockopt::subscribe, sub, "subscribe", true);
-#endif
-#ifdef ZMQ_UNSUBSCRIBE
-    check_array_opt(zmq::sockopt::unsubscribe, sub, "unsubscribe", true);
-#endif
-#ifdef ZMQ_XPUB_WELCOME_MSG
-    check_array_opt(zmq::sockopt::xpub_welcome_msg, xpub, "xpub_welcome_msg", true);
-#endif
-#ifdef ZMQ_ZAP_DOMAIN
-    check_array_opt(zmq::sockopt::zap_domain, router, "zap_domain");
-#endif
-
-// curve
-#if ZMQ_VERSION >= ZMQ_MAKE_VERSION(4, 0, 0) && defined(ZMQ_HAS_CAPABILITIES)
-    if (zmq_has("curve") == 1) {
-        const std::string spk = "rq:rM>}U?@Lns47E1%kR.o@n%FcmmsL/@{H8]yf7";
-        const std::string ssk = "JTKVSB%%)wK0E.X)V>+}o?pNmC{O&4W4b!Ni{Lh6";
-        const std::string cpk = "Yne@$w-vo<fVvi]a<NY6T1ed:M$fCG*[IaLV{hID";
-        const std::string csk = "D:)Q[IlAW!ahhC2ac:9*A}h:p?([4%wOTJ%JR%cs";
-
-        zmq::socket_t curve_server(context, zmq::socket_type::router);
-        curve_server.set(zmq::sockopt::curve_server, true);
-        CHECK(curve_server.get(zmq::sockopt::curve_server));
-        check_bin_z85(zmq::sockopt::curve_secretkey, curve_server, ssk);
-
-        zmq::socket_t curve_client(context, zmq::socket_type::router);
-        curve_client.set(zmq::sockopt::curve_server, false);
-        CHECK_FALSE(curve_client.get(zmq::sockopt::curve_server));
-        check_bin_z85(zmq::sockopt::curve_serverkey, curve_client, spk);
-        check_bin_z85(zmq::sockopt::curve_publickey, curve_client, cpk);
-        check_bin_z85(zmq::sockopt::curve_secretkey, curve_client, csk);
-    }
-#endif
-
-// gssapi
-#if ZMQ_VERSION >= ZMQ_MAKE_VERSION(4, 1, 0) && defined(ZMQ_HAS_CAPABILITIES)
-    if (zmq_has("gssapi") == 1 && false) // TODO enable
-    {
-        zmq::socket_t gss_server(context, zmq::socket_type::router);
-        gss_server.set(zmq::sockopt::gssapi_server, true);
-        CHECK(gss_server.get(zmq::sockopt::gssapi_server) == 1);
-        gss_server.set(zmq::sockopt::gssapi_plaintext, false);
-        CHECK(gss_server.get(zmq::sockopt::gssapi_plaintext) == 0);
-        check_array_opt(zmq::sockopt::gssapi_principal, gss_server,
-                        "gssapi_principal");
-
-        zmq::socket_t gss_client(context, zmq::socket_type::router);
-        CHECK(gss_client.get(zmq::sockopt::gssapi_server) == 0);
-        check_array_opt(zmq::sockopt::gssapi_principal, gss_client,
-                        "gssapi_principal");
-        check_array_opt(zmq::sockopt::gssapi_service_principal, gss_client,
-                        "gssapi_service_principal");
-    }
-#endif
-}
-
-template<class T, class Opt>
-void check_integral_opt(Opt opt,
-                        zmq::socket_t &sock,
-                        std::string info,
-                        bool set_only = false)
-{
-    const T val = 1;
-    INFO("setting " + info);
-    sock.set(opt, val);
-    if (set_only)
-        return;
-
-    INFO("getting " + info);
-    auto s = sock.get(opt);
-    CHECK(s == val);
-}
-
-template<class T, class Opt>
-void check_integral_opt_get(Opt opt, zmq::socket_t &sock, std::string info)
-{
-    INFO("getting " + info);
-    (void) sock.get(opt);
-}
-
-TEST_CASE("socket check integral options", "[socket]")
-{
-    zmq::context_t context;
-    zmq::socket_t router(context, zmq::socket_type::router);
-    zmq::socket_t xpub(context, zmq::socket_type::xpub);
-    zmq::socket_t req(context, zmq::socket_type::req);
-#ifdef ZMQ_STREAM_NOTIFY
-    zmq::socket_t stream(context, zmq::socket_type::stream);
-#endif
-
-#ifdef ZMQ_AFFINITY
-    check_integral_opt<uint64_t>(zmq::sockopt::affinity, router, "affinity");
-#endif
-#ifdef ZMQ_BACKLOG
-    check_integral_opt<int>(zmq::sockopt::backlog, router, "backlog");
-#endif
-#ifdef ZMQ_CONFLATE
-    check_integral_opt<int>(zmq::sockopt::conflate, router, "conflate");
-#endif
-#ifdef ZMQ_CONNECT_TIMEOUT
-    check_integral_opt<int>(zmq::sockopt::connect_timeout, router,
-                            "connect_timeout");
-#endif
-#ifdef ZMQ_EVENTS
-    check_integral_opt_get<int>(zmq::sockopt::events, router, "events");
-#endif
-#ifdef ZMQ_FD
-    check_integral_opt_get<zmq::fd_t>(zmq::sockopt::fd, router, "fd");
-#endif
-#ifdef ZMQ_HANDSHAKE_IVL
-    check_integral_opt<int>(zmq::sockopt::handshake_ivl, router, "handshake_ivl");
-#endif
-#ifdef ZMQ_HEARTBEAT_IVL
-    check_integral_opt<int>(zmq::sockopt::heartbeat_ivl, router, "heartbeat_ivl");
-#endif
-#ifdef ZMQ_HEARTBEAT_TIMEOUT
-    check_integral_opt<int>(zmq::sockopt::heartbeat_timeout, router,
-                            "heartbeat_timeout");
-#endif
-#ifdef ZMQ_HEARTBEAT_TTL
-    router.set(zmq::sockopt::heartbeat_ttl, 100);
-    CHECK(router.get(zmq::sockopt::heartbeat_ttl) == 100);
-#endif
-#ifdef ZMQ_IMMEDIATE
-    check_integral_opt<int>(zmq::sockopt::immediate, router, "immediate");
-#endif
-#ifdef ZMQ_INVERT_MATCHING
-    check_integral_opt<int>(zmq::sockopt::invert_matching, router,
-                            "invert_matching");
-#endif
-#ifdef ZMQ_IPV6
-    check_integral_opt<int>(zmq::sockopt::ipv6, router, "ipv6");
-#endif
-#ifdef ZMQ_LINGER
-    check_integral_opt<int>(zmq::sockopt::linger, router, "linger");
-#endif
-#ifdef ZMQ_MAXMSGSIZE
-    check_integral_opt<int64_t>(zmq::sockopt::maxmsgsize, router, "maxmsgsize");
-#endif
-#ifdef ZMQ_MECHANISM
-    check_integral_opt_get<int>(zmq::sockopt::mechanism, router, "mechanism");
-#endif
-#ifdef ZMQ_MULTICAST_HOPS
-    check_integral_opt<int>(zmq::sockopt::multicast_hops, router, "multicast_hops");
-#endif
-#ifdef ZMQ_MULTICAST_LOOP
-    check_integral_opt<int>(zmq::sockopt::multicast_loop, router, "multicast_loop");
-#endif
-#ifdef ZMQ_MULTICAST_MAXTPDU
-    check_integral_opt<int>(zmq::sockopt::multicast_maxtpdu, router,
-                            "multicast_maxtpdu");
-#endif
-#ifdef ZMQ_PLAIN_SERVER
-    check_integral_opt<int>(zmq::sockopt::plain_server, router, "plain_server");
-#endif
-#ifdef ZMQ_USE_FD
-    check_integral_opt<int>(zmq::sockopt::use_fd, router, "use_fd");
-#endif
-#ifdef ZMQ_PROBE_ROUTER
-    check_integral_opt<int>(zmq::sockopt::probe_router, router, "probe_router",
-                            true);
-#endif
-#ifdef ZMQ_RATE
-    check_integral_opt<int>(zmq::sockopt::rate, router, "rate");
-#endif
-#ifdef ZMQ_RCVBUF
-    check_integral_opt<int>(zmq::sockopt::rcvbuf, router, "rcvbuf");
-#endif
-#ifdef ZMQ_RCVHWM
-    check_integral_opt<int>(zmq::sockopt::rcvhwm, router, "rcvhwm");
-#endif
-#ifdef ZMQ_RCVMORE
-    check_integral_opt_get<int>(zmq::sockopt::rcvmore, router, "rcvmore");
-#endif
-#ifdef ZMQ_RCVTIMEO
-    check_integral_opt<int>(zmq::sockopt::rcvtimeo, router, "rcvtimeo");
-#endif
-#ifdef ZMQ_RECONNECT_IVL
-    check_integral_opt<int>(zmq::sockopt::reconnect_ivl, router, "reconnect_ivl");
-#endif
-#ifdef ZMQ_RECONNECT_IVL_MAX
-    check_integral_opt<int>(zmq::sockopt::reconnect_ivl_max, router,
-                            "reconnect_ivl_max");
-#endif
-#ifdef ZMQ_RECOVERY_IVL
-    check_integral_opt<int>(zmq::sockopt::recovery_ivl, router, "recovery_ivl");
-#endif
-#ifdef ZMQ_REQ_CORRELATE
-    check_integral_opt<int>(zmq::sockopt::req_correlate, req, "req_correlate", true);
-#endif
-#ifdef ZMQ_REQ_RELAXED
-    check_integral_opt<int>(zmq::sockopt::req_relaxed, req, "req_relaxed", true);
-#endif
-#ifdef ZMQ_ROUTER_HANDOVER
-    check_integral_opt<int>(zmq::sockopt::router_handover, router, "router_handover",
-                            true);
-#endif
-#ifdef ZMQ_ROUTER_MANDATORY
-    check_integral_opt<int>(zmq::sockopt::router_mandatory, router,
-                            "router_mandatory", true);
-#endif
-#ifdef ZMQ_ROUTER_NOTIFY
-    check_integral_opt<int>(zmq::sockopt::router_notify, router, "router_notify");
-#endif
-#ifdef ZMQ_SNDBUF
-    check_integral_opt<int>(zmq::sockopt::sndbuf, router, "sndbuf");
-#endif
-#ifdef ZMQ_SNDHWM
-    check_integral_opt<int>(zmq::sockopt::sndhwm, router, "sndhwm");
-#endif
-#ifdef ZMQ_SNDTIMEO
-    check_integral_opt<int>(zmq::sockopt::sndtimeo, router, "sndtimeo");
-#endif
-#ifdef ZMQ_STREAM_NOTIFY
-    check_integral_opt<int>(zmq::sockopt::stream_notify, stream, "stream_notify",
-                            true);
-#endif
-#ifdef ZMQ_TCP_KEEPALIVE
-    check_integral_opt<int>(zmq::sockopt::tcp_keepalive, router, "tcp_keepalive");
-#endif
-#ifdef ZMQ_TCP_KEEPALIVE_CNT
-    check_integral_opt<int>(zmq::sockopt::tcp_keepalive_cnt, router,
-                            "tcp_keepalive_cnt");
-#endif
-#ifdef ZMQ_TCP_KEEPALIVE_IDLE
-    check_integral_opt<int>(zmq::sockopt::tcp_keepalive_idle, router,
-                            "tcp_keepalive_idle");
-#endif
-#ifdef ZMQ_TCP_KEEPALIVE_INTVL
-    check_integral_opt<int>(zmq::sockopt::tcp_keepalive_intvl, router,
-                            "tcp_keepalive_intvl");
-#endif
-#ifdef ZMQ_TCP_MAXRT
-    check_integral_opt<int>(zmq::sockopt::tcp_maxrt, router, "tcp_maxrt");
-#endif
-#ifdef ZMQ_THREAD_SAFE
-    check_integral_opt_get<bool>(zmq::sockopt::thread_safe, router, "thread_safe");
-#endif
-#ifdef ZMQ_TOS
-    check_integral_opt<int>(zmq::sockopt::tos, router, "tos");
-#endif
-#ifdef ZMQ_TYPE
-    check_integral_opt_get<int>(zmq::sockopt::type, router, "type");
-#ifdef ZMQ_CPP11
-    check_integral_opt_get<zmq::socket_type>(zmq::sockopt::socket_type, router, "socket_type");
-#endif // ZMQ_CPP11
-#endif // ZMQ_TYPE
-
-#ifdef ZMQ_HAVE_VMCI
-#ifdef ZMQ_VMCI_BUFFER_SIZE
-    check_integral_opt<uint64_t>(zmq::sockopt::vmci_buffer_size, router,
-                                 "vmci_buffer_size");
-#endif
-#ifdef ZMQ_VMCI_BUFFER_MIN_SIZE
-    check_integral_opt<uint64_t>(zmq::sockopt::vmci_buffer_min_size, router,
-                                 "vmci_buffer_min_size");
-#endif
-#ifdef ZMQ_VMCI_BUFFER_MAX_SIZE
-    check_integral_opt<uint64_t>(zmq::sockopt::vmci_buffer_max_size, router,
-                                 "vmci_buffer_max_size");
-#endif
-#ifdef ZMQ_VMCI_CONNECT_TIMEOUT
-    check_integral_opt<int>(zmq::sockopt::vmci_connect_timeout, router,
-                            "vmci_connect_timeout");
-#endif
-#endif
-
-#ifdef ZMQ_XPUB_VERBOSE
-    check_integral_opt<int>(zmq::sockopt::xpub_verbose, xpub, "xpub_verbose", true);
-#endif
-#ifdef ZMQ_XPUB_VERBOSER
-    check_integral_opt<int>(zmq::sockopt::xpub_verboser, xpub, "xpub_verboser",
-                            true);
-#endif
-#ifdef ZMQ_XPUB_MANUAL
-    check_integral_opt<int>(zmq::sockopt::xpub_manual, xpub, "xpub_manual", true);
-#endif
-#ifdef ZMQ_XPUB_NODROP
-    check_integral_opt<int>(zmq::sockopt::xpub_nodrop, xpub, "xpub_nodrop", true);
-#endif
-#ifdef ZMQ_ZAP_ENFORCE_DOMAIN
-    check_integral_opt<int>(zmq::sockopt::zap_enforce_domain, router,
-                            "zap_enforce_domain");
-#endif
-}
-
-#endif
-
-TEST_CASE("socket flags", "[socket]")
-{
-    CHECK((zmq::recv_flags::dontwait | zmq::recv_flags::none)
-          == static_cast<zmq::recv_flags>(ZMQ_DONTWAIT | 0));
-    CHECK((zmq::recv_flags::dontwait & zmq::recv_flags::none)
-          == static_cast<zmq::recv_flags>(ZMQ_DONTWAIT & 0));
-    CHECK((zmq::recv_flags::dontwait ^ zmq::recv_flags::none)
-          == static_cast<zmq::recv_flags>(ZMQ_DONTWAIT ^ 0));
-    CHECK(~zmq::recv_flags::dontwait == static_cast<zmq::recv_flags>(~ZMQ_DONTWAIT));
-
-    CHECK((zmq::send_flags::dontwait | zmq::send_flags::sndmore)
-          == static_cast<zmq::send_flags>(ZMQ_DONTWAIT | ZMQ_SNDMORE));
-    CHECK((zmq::send_flags::dontwait & zmq::send_flags::sndmore)
-          == static_cast<zmq::send_flags>(ZMQ_DONTWAIT & ZMQ_SNDMORE));
-    CHECK((zmq::send_flags::dontwait ^ zmq::send_flags::sndmore)
-          == static_cast<zmq::send_flags>(ZMQ_DONTWAIT ^ ZMQ_SNDMORE));
-    CHECK(~zmq::send_flags::dontwait == static_cast<zmq::send_flags>(~ZMQ_DONTWAIT));
-}
-
-TEST_CASE("socket readme example", "[socket]")
-{
-    zmq::context_t ctx;
-    zmq::socket_t sock(ctx, zmq::socket_type::push);
-    sock.bind("inproc://test");
-    sock.send(zmq::str_buffer("Hello, world"), zmq::send_flags::dontwait);
-}
-#endif
-
-TEST_CASE("socket sends and receives const buffer", "[socket]")
-{
-    zmq::context_t context;
-    zmq::socket_t sender(context, ZMQ_PAIR);
-    zmq::socket_t receiver(context, ZMQ_PAIR);
-    receiver.bind("inproc://test");
-    sender.connect("inproc://test");
-    const char *str = "Hi";
-
-#ifdef ZMQ_CPP11
-    CHECK(2 == *sender.send(zmq::buffer(str, 2)));
-    char buf[2];
-    const auto res = receiver.recv(zmq::buffer(buf));
-    CHECK(res);
-    CHECK(!res->truncated());
-    CHECK(2 == res->size);
-#else
-    CHECK(2 == sender.send(str, 2));
-    char buf[2];
-    CHECK(2 == receiver.recv(buf, 2));
-#endif
-    CHECK(0 == memcmp(buf, str, 2));
-}
-
-#ifdef ZMQ_CPP11
-
-TEST_CASE("socket send none sndmore", "[socket]")
-{
-    zmq::context_t context;
-    zmq::socket_t s(context, zmq::socket_type::router);
-    s.bind("inproc://test");
-
-    std::vector<char> buf(4);
-    auto res = s.send(zmq::buffer(buf), zmq::send_flags::sndmore);
-    CHECK(res);
-    CHECK(*res == buf.size());
-    res = s.send(zmq::buffer(buf));
-    CHECK(res);
-    CHECK(*res == buf.size());
-}
-
-TEST_CASE("socket send dontwait", "[socket]")
-{
-    zmq::context_t context;
-    zmq::socket_t s(context, zmq::socket_type::push);
-    s.bind("inproc://test");
-
-    std::vector<char> buf(4);
-    auto res = s.send(zmq::buffer(buf), zmq::send_flags::dontwait);
-    CHECK(!res);
-    res =
-      s.send(zmq::buffer(buf), zmq::send_flags::dontwait | zmq::send_flags::sndmore);
-    CHECK(!res);
-
-    zmq::message_t msg;
-    auto resm = s.send(msg, zmq::send_flags::dontwait);
-    CHECK(!resm);
-    CHECK(msg.size() == 0);
-}
-
-TEST_CASE("socket send exception", "[socket]")
-{
-    zmq::context_t context;
-    zmq::socket_t s(context, zmq::socket_type::pull);
-    s.bind("inproc://test");
-
-    std::vector<char> buf(4);
-    CHECK_THROWS_AS(s.send(zmq::buffer(buf)), zmq::error_t);
-}
-
-TEST_CASE("socket recv none", "[socket]")
-{
-    zmq::context_t context;
-    zmq::socket_t s(context, zmq::socket_type::pair);
-    zmq::socket_t s2(context, zmq::socket_type::pair);
-    s2.bind("inproc://test");
-    s.connect("inproc://test");
-
-    std::vector<char> sbuf(4);
-    const auto res_send = s2.send(zmq::buffer(sbuf));
-    CHECK(res_send);
-    CHECK(res_send.has_value());
-
-    std::vector<char> buf(2);
-    const auto res = s.recv(zmq::buffer(buf));
-    CHECK(res.has_value());
-    CHECK(res->truncated());
-    CHECK(res->untruncated_size == sbuf.size());
-    CHECK(res->size == buf.size());
-
-    const auto res_send2 = s2.send(zmq::buffer(sbuf));
-    CHECK(res_send2.has_value());
-    std::vector<char> buf2(10);
-    const auto res2 = s.recv(zmq::buffer(buf2));
-    CHECK(res2.has_value());
-    CHECK(!res2->truncated());
-    CHECK(res2->untruncated_size == sbuf.size());
-    CHECK(res2->size == sbuf.size());
-}
-
-TEST_CASE("socket send recv message_t", "[socket]")
-{
-    zmq::context_t context;
-    zmq::socket_t s(context, zmq::socket_type::pair);
-    zmq::socket_t s2(context, zmq::socket_type::pair);
-    s2.bind("inproc://test");
-    s.connect("inproc://test");
-
-    zmq::message_t smsg(10);
-    const auto res_send = s2.send(smsg, zmq::send_flags::none);
-    CHECK(res_send);
-    CHECK(*res_send == 10);
-    CHECK(smsg.size() == 0);
-
-    zmq::message_t rmsg;
-    const auto res = s.recv(rmsg);
-    CHECK(res);
-    CHECK(*res == 10);
-    CHECK(res.value() == 10);
-    CHECK(rmsg.size() == *res);
-}
-
-TEST_CASE("socket send recv message_t by pointer", "[socket]")
-{
-    zmq::context_t context;
-    zmq::socket_t s(context, zmq::socket_type::pair);
-    zmq::socket_t s2(context, zmq::socket_type::pair);
-    s2.bind("inproc://test");
-    s.connect("inproc://test");
-
-    zmq::message_t smsg(size_t{10});
-    const auto res_send = s2.send(smsg, zmq::send_flags::none);
-    CHECK(res_send);
-    CHECK(*res_send == 10);
-    CHECK(smsg.size() == 0);
-
-    zmq::message_t rmsg;
-    const bool res = s.recv(&rmsg);
-    CHECK(res);
-}
-
-TEST_CASE("socket recv dontwait", "[socket]")
-{
-    zmq::context_t context;
-    zmq::socket_t s(context, zmq::socket_type::pull);
-    s.bind("inproc://test");
-
-    std::vector<char> buf(4);
-    constexpr auto flags = zmq::recv_flags::none | zmq::recv_flags::dontwait;
-    auto res = s.recv(zmq::buffer(buf), flags);
-    CHECK(!res);
-
-    zmq::message_t msg;
-    auto resm = s.recv(msg, flags);
-    CHECK(!resm);
-    CHECK_THROWS_AS(resm.value(), std::exception);
-    CHECK(msg.size() == 0);
-}
-
-TEST_CASE("socket recv exception", "[socket]")
-{
-    zmq::context_t context;
-    zmq::socket_t s(context, zmq::socket_type::push);
-    s.bind("inproc://test");
-
-    std::vector<char> buf(4);
-    CHECK_THROWS_AS(s.recv(zmq::buffer(buf)), zmq::error_t);
-}
-
-TEST_CASE("socket proxy", "[socket]")
-{
-    zmq::context_t context;
-    zmq::socket_t front(context, ZMQ_ROUTER);
-    zmq::socket_t back(context, ZMQ_ROUTER);
-    zmq::socket_t capture(context, ZMQ_DEALER);
-    front.bind("inproc://test1");
-    back.bind("inproc://test2");
-    capture.bind("inproc://test3");
-    auto f = std::async(std::launch::async, [&]() {
-        auto s1 = std::move(front);
-        auto s2 = std::move(back);
-        auto s3 = std::move(capture);
-        try {
-            zmq::proxy(s1, s2, zmq::socket_ref(s3));
-        }
-        catch (const zmq::error_t &e) {
-            return e.num() == ETERM;
-        }
-        return false;
-    });
-    context.close();
-    CHECK(f.get());
-}
-
-TEST_CASE("socket proxy steerable", "[socket]")
-{
-    zmq::context_t context;
-    zmq::socket_t front(context, ZMQ_ROUTER);
-    zmq::socket_t back(context, ZMQ_ROUTER);
-    zmq::socket_t control(context, ZMQ_SUB);
-    front.bind("inproc://test1");
-    back.bind("inproc://test2");
-    control.connect("inproc://test3");
-    auto f = std::async(std::launch::async, [&]() {
-        auto s1 = std::move(front);
-        auto s2 = std::move(back);
-        auto s3 = std::move(control);
-        try {
-            zmq::proxy_steerable(s1, s2, zmq::socket_ref(), s3);
-        }
-        catch (const zmq::error_t &e) {
-            return e.num() == ETERM;
-        }
-        return false;
-    });
-    context.close();
-    CHECK(f.get());
-}
-#endif
diff --git a/libs/cppzmq/tests/socket_ref.cpp b/libs/cppzmq/tests/socket_ref.cpp
deleted file mode 100644
index 7658658..0000000
--- a/libs/cppzmq/tests/socket_ref.cpp
+++ /dev/null
@@ -1,118 +0,0 @@
-#include <catch2/catch.hpp>
-#include <zmq.hpp>
-#ifdef ZMQ_CPP11
-
-#ifdef ZMQ_CPP17
-static_assert(std::is_nothrow_swappable_v<zmq::socket_ref>);
-#endif
-static_assert(sizeof(zmq::socket_ref) == sizeof(void *), "size mismatch");
-static_assert(alignof(zmq::socket_ref) == alignof(void *), "alignment mismatch");
-static_assert(ZMQ_IS_TRIVIALLY_COPYABLE(zmq::socket_ref),
-    "needs to be trivially copyable");
-
-TEST_CASE("socket_ref default init", "[socket_ref]")
-{
-    zmq::socket_ref sr;
-    CHECK(!sr);
-    CHECK(sr == nullptr);
-    CHECK(nullptr == sr);
-    CHECK(sr.handle() == nullptr);
-}
-
-TEST_CASE("socket_ref create from nullptr", "[socket_ref]")
-{
-    zmq::socket_ref sr = nullptr;
-    CHECK(sr == nullptr);
-    CHECK(sr.handle() == nullptr);
-}
-
-TEST_CASE("socket_ref create from handle", "[socket_ref]")
-{
-    void *np = nullptr;
-    zmq::socket_ref sr{zmq::from_handle, np};
-    CHECK(sr == nullptr);
-    CHECK(sr.handle() == nullptr);
-}
-
-TEST_CASE("socket_ref compare", "[socket_ref]")
-{
-    zmq::socket_ref sr1;
-    zmq::socket_ref sr2;
-    CHECK(sr1 == sr2);
-    CHECK(!(sr1 != sr2));
-}
-
-TEST_CASE("socket_ref compare from socket_t", "[socket_ref]")
-{
-    zmq::context_t context;
-    zmq::socket_t s1(context, zmq::socket_type::router);
-    zmq::socket_t s2(context, zmq::socket_type::dealer);
-    zmq::socket_ref sr1 = s1;
-    zmq::socket_ref sr2 = s2;
-    CHECK(sr1);
-    CHECK(sr2);
-    CHECK(sr1 == s1);
-    CHECK(sr2 == s2);
-    CHECK(sr1.handle() == s1.handle());
-    CHECK(sr1 != sr2);
-    CHECK(sr1.handle() != sr2.handle());
-    CHECK(sr1 != nullptr);
-    CHECK(nullptr != sr1);
-    CHECK(sr2 != nullptr);
-    const bool comp1 = (sr1 < sr2) != (sr1 >= sr2);
-    CHECK(comp1);
-    const bool comp2 = (sr1 > sr2) != (sr1 <= sr2);
-    CHECK(comp2);
-    std::hash<zmq::socket_ref> hash;
-    CHECK(hash(sr1) != hash(sr2));
-    CHECK(hash(sr1) == hash(s1));
-}
-
-TEST_CASE("socket_ref assignment", "[socket_ref]")
-{
-    zmq::context_t context;
-    zmq::socket_t s1(context, zmq::socket_type::router);
-    zmq::socket_t s2(context, zmq::socket_type::dealer);
-    zmq::socket_ref sr1 = s1;
-    zmq::socket_ref sr2 = s2;
-    sr1 = s2;
-    CHECK(sr1 == sr2);
-    CHECK(sr1.handle() == sr2.handle());
-    sr1 = std::move(sr2);
-    CHECK(sr1 == sr2);
-    CHECK(sr1.handle() == sr2.handle());
-    sr2 = nullptr;
-    CHECK(sr1 != sr2);
-    sr1 = nullptr;
-    CHECK(sr1 == sr2);
-}
-
-TEST_CASE("socket_ref swap", "[socket_ref]")
-{
-    zmq::socket_ref sr1;
-    zmq::socket_ref sr2;
-    using std::swap;
-    swap(sr1, sr2);
-}
-
-TEST_CASE("socket_ref type punning", "[socket_ref]")
-{
-    struct SVP
-    {
-        void *p;
-    } svp;
-    struct SSR
-    {
-        zmq::socket_ref sr;
-    } ssr;
-
-    zmq::context_t context;
-    zmq::socket_t socket(context, zmq::socket_type::router);
-    CHECK(socket.handle() != nullptr);
-    svp.p = socket.handle();
-    // static_cast to silence incorrect warning
-    std::memcpy(static_cast<void *>(&ssr), &svp, sizeof(ssr));
-    CHECK(ssr.sr == socket);
-}
-
-#endif
diff --git a/libs/cppzmq/tests/testutil.hpp b/libs/cppzmq/tests/testutil.hpp
deleted file mode 100644
index 6c371de..0000000
--- a/libs/cppzmq/tests/testutil.hpp
+++ /dev/null
@@ -1,54 +0,0 @@
-#pragma once
-
-#include <catch2/catch.hpp>
-#include <zmq.hpp>
-
-#if defined(ZMQ_CPP11)
-
-inline std::string bind_ip4_loopback(zmq::socket_t &socket)
-{
-    socket.bind("tcp://127.0.0.1:*");
-    std::string endpoint(100, ' ');
-    endpoint.resize(socket.get(zmq::sockopt::last_endpoint, zmq::buffer(endpoint)));
-    return endpoint;
-}
-
-struct common_server_client_setup
-{
-    common_server_client_setup(bool initialize = true)
-    {
-        if (initialize)
-            init();
-    }
-
-    void init()
-    {
-        endpoint = bind_ip4_loopback(server);
-        REQUIRE_NOTHROW(client.connect(endpoint));
-    }
-
-    zmq::context_t context;
-    zmq::socket_t server{context, zmq::socket_type::pair};
-    zmq::socket_t client{context, zmq::socket_type::pair};
-    std::string endpoint;
-};
-#endif
-
-#define CHECK_THROWS_ZMQ_ERROR(ecode, expr)                                         \
-    do {                                                                            \
-        try {                                                                       \
-            expr;                                                                   \
-            CHECK(false);                                                           \
-        }                                                                           \
-        catch (const zmq::error_t &ze) {                                            \
-            INFO(std::string("Unexpected error code: ") + ze.what());               \
-            CHECK(ze.num() == ecode);                                               \
-        }                                                                           \
-        catch (const std::exception &ex) {                                          \
-            INFO(std::string("Unexpected exception: ") + ex.what());                \
-            CHECK(false);                                                           \
-        }                                                                           \
-        catch (...) {                                                               \
-            CHECK(false);                                                           \
-        }                                                                           \
-    } while (false)
diff --git a/libs/cppzmq/tests/utilities.cpp b/libs/cppzmq/tests/utilities.cpp
deleted file mode 100644
index 30238a6..0000000
--- a/libs/cppzmq/tests/utilities.cpp
+++ /dev/null
@@ -1,110 +0,0 @@
-#include <catch2/catch.hpp>
-#include <zmq.hpp>
-
-#if defined(ZMQ_CPP11) && !defined(ZMQ_CPP11_PARTIAL)
-
-namespace test_ns
-{
-struct T_nr
-{
-};
-
-struct T_mr
-{
-    void *begin() const noexcept { return nullptr; }
-    void *end() const noexcept { return nullptr; }
-};
-
-struct T_fr
-{
-};
-
-inline void *begin(const T_fr &) noexcept
-{
-    return nullptr;
-}
-
-inline void *end(const T_fr &) noexcept
-{
-    return nullptr;
-}
-
-struct T_mfr
-{
-    void *begin() const noexcept { return nullptr; }
-    void *end() const noexcept { return nullptr; }
-};
-
-inline void *begin(const T_mfr &) noexcept
-{
-    return nullptr;
-}
-
-inline void *end(const T_mfr &) noexcept
-{
-    return nullptr;
-}
-
-// types with associated namespace std
-struct T_assoc_ns_nr : std::exception
-{
-};
-
-struct T_assoc_ns_mr : std::exception
-{
-    void *begin() const noexcept { return nullptr; }
-    void *end() const noexcept { return nullptr; }
-};
-
-struct T_assoc_ns_fr : std::exception
-{
-};
-
-inline void *begin(const T_assoc_ns_fr &) noexcept
-{
-    return nullptr;
-}
-
-inline void *end(const T_assoc_ns_fr &) noexcept
-{
-    return nullptr;
-}
-
-struct T_assoc_ns_mfr : std::exception
-{
-    void *begin() const noexcept { return nullptr; }
-    void *end() const noexcept { return nullptr; }
-};
-
-inline void *begin(const T_assoc_ns_mfr &) noexcept
-{
-    return nullptr;
-}
-
-inline void *end(const T_assoc_ns_mfr &) noexcept
-{
-    return nullptr;
-}
-} // namespace test_ns
-
-TEST_CASE("range SFINAE", "[utilities]")
-{
-    CHECK(!zmq::detail::is_range<int>::value);
-    CHECK(zmq::detail::is_range<std::string>::value);
-    CHECK(zmq::detail::is_range<std::string &>::value);
-    CHECK(zmq::detail::is_range<const std::string &>::value);
-    CHECK(zmq::detail::is_range<decltype("hello")>::value);
-    CHECK(zmq::detail::is_range<std::initializer_list<int>>::value);
-
-    CHECK(!zmq::detail::is_range<test_ns::T_nr>::value);
-    CHECK(zmq::detail::is_range<test_ns::T_mr>::value);
-    CHECK(zmq::detail::is_range<test_ns::T_fr>::value);
-    CHECK(zmq::detail::is_range<test_ns::T_mfr>::value);
-
-    CHECK(!zmq::detail::is_range<test_ns::T_assoc_ns_nr>::value);
-    CHECK(zmq::detail::is_range<test_ns::T_assoc_ns_mr>::value);
-    CHECK(zmq::detail::is_range<test_ns::T_assoc_ns_fr>::value);
-    CHECK(zmq::detail::is_range<test_ns::T_assoc_ns_mfr>::value);
-}
-
-#endif
diff --git a/libs/cppzmq/version.sh b/libs/cppzmq/version.sh
deleted file mode 100755
index f7d9eb6..0000000
--- a/libs/cppzmq/version.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-#
-# This script extracts the 0MQ version from zmq.hpp, which is the master
-# location for this information.
-#
-if [ ! -f zmq.hpp ]; then
-    echo "version.sh: error: zmq.hpp does not exist" 1>&2
-    exit 1
-fi
-MAJOR=$(grep '^#define CPPZMQ_VERSION_MAJOR \+[0-9]\+' zmq.hpp)
-MINOR=$(grep '^#define CPPZMQ_VERSION_MINOR \+[0-9]\+' zmq.hpp)
-PATCH=$(grep '^#define CPPZMQ_VERSION_PATCH \+[0-9]\+' zmq.hpp)
-if [ -z "$MAJOR" -o -z "$MINOR" -o -z "$PATCH" ]; then
-    echo "version.sh: error: could not extract version from zmq.hpp" 1>&2
-    exit 1
-fi
-MAJOR=$(echo $MAJOR | awk '{ print $3 }')
-MINOR=$(echo $MINOR | awk '{ print $3 }')
-PATCH=$(echo $PATCH | awk '{ print $3 }')
-echo $MAJOR.$MINOR.$PATCH | tr -d '\n\r'
-
diff --git a/libs/cppzmq/zmq.hpp b/libs/cppzmq/zmq.hpp
deleted file mode 100644
index 775c6f6..0000000
--- a/libs/cppzmq/zmq.hpp
+++ /dev/null
@@ -1,2721 +0,0 @@
-/*
-    Copyright (c) 2016-2017 ZeroMQ community
-    Copyright (c) 2009-2011 250bpm s.r.o.
-    Copyright (c) 2011 Botond Ballo
-    Copyright (c) 2007-2009 iMatix Corporation
-
-    Permission is hereby granted, free of charge, to any person obtaining a copy
-    of this software and associated documentation files (the "Software"), to
-    deal in the Software without restriction, including without limitation the
-    rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-    sell copies of the Software, and to permit persons to whom the Software is
-    furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be included in
-    all copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-    IN THE SOFTWARE.
-*/
-
-#ifndef __ZMQ_HPP_INCLUDED__
-#define __ZMQ_HPP_INCLUDED__
-
-#ifdef _WIN32
-#ifndef NOMINMAX
-#define NOMINMAX
-#endif
-#endif
-
-// included here for _HAS_CXX* macros
-#include <zmq.h>
-
-#if defined(_MSVC_LANG)
-#define CPPZMQ_LANG _MSVC_LANG
-#else
-#define CPPZMQ_LANG __cplusplus
-#endif
-// overwrite if specific language macros indicate higher version
-#if defined(_HAS_CXX14) && _HAS_CXX14 && CPPZMQ_LANG < 201402L
-#undef CPPZMQ_LANG
-#define CPPZMQ_LANG 201402L
-#endif
-#if defined(_HAS_CXX17) && _HAS_CXX17 && CPPZMQ_LANG < 201703L
-#undef CPPZMQ_LANG
-#define CPPZMQ_LANG 201703L
-#endif
-
-// macros defined if has a specific standard or greater
-#if CPPZMQ_LANG >= 201103L || (defined(_MSC_VER) && _MSC_VER >= 1900)
-#define ZMQ_CPP11
-#endif
-#if CPPZMQ_LANG >= 201402L
-#define ZMQ_CPP14
-#endif
-#if CPPZMQ_LANG >= 201703L
-#define ZMQ_CPP17
-#endif
-
-#if defined(ZMQ_CPP14) && !defined(_MSC_VER)
-#define ZMQ_DEPRECATED(msg) [[deprecated(msg)]]
-#elif defined(_MSC_VER)
-#define ZMQ_DEPRECATED(msg) __declspec(deprecated(msg))
-#elif defined(__GNUC__)
-#define ZMQ_DEPRECATED(msg) __attribute__((deprecated(msg)))
-#else
-#define ZMQ_DEPRECATED(msg)
-#endif
-
-#if defined(ZMQ_CPP17)
-#define ZMQ_NODISCARD [[nodiscard]]
-#else
-#define ZMQ_NODISCARD
-#endif
-
-#if defined(ZMQ_CPP11)
-#define ZMQ_NOTHROW noexcept
-#define ZMQ_EXPLICIT explicit
-#define ZMQ_OVERRIDE override
-#define ZMQ_NULLPTR nullptr
-#define ZMQ_CONSTEXPR_FN constexpr
-#define ZMQ_CONSTEXPR_VAR constexpr
-#define ZMQ_CPP11_DEPRECATED(msg) ZMQ_DEPRECATED(msg)
-#else
-#define ZMQ_NOTHROW throw()
-#define ZMQ_EXPLICIT
-#define ZMQ_OVERRIDE
-#define ZMQ_NULLPTR 0
-#define ZMQ_CONSTEXPR_FN
-#define ZMQ_CONSTEXPR_VAR const
-#define ZMQ_CPP11_DEPRECATED(msg)
-#endif
-#if defined(ZMQ_CPP14) && (!defined(_MSC_VER) || _MSC_VER > 1900) && (!defined(__GNUC__) || __GNUC__ > 5 || (__GNUC__ == 5 && __GNUC_MINOR__ > 3))
-#define ZMQ_EXTENDED_CONSTEXPR
-#endif
-#if defined(ZMQ_CPP17)
-#define ZMQ_INLINE_VAR inline
-#define ZMQ_CONSTEXPR_IF constexpr
-#else
-#define ZMQ_INLINE_VAR
-#define ZMQ_CONSTEXPR_IF
-#endif
-
-#include <cassert>
-#include <cstring>
-
-#include <algorithm>
-#include <exception>
-#include <iomanip>
-#include <sstream>
-#include <string>
-#include <vector>
-#ifdef ZMQ_CPP11
-#include <array>
-#include <chrono>
-#include <tuple>
-#include <memory>
-#endif
-
-#if defined(__has_include) && defined(ZMQ_CPP17)
-#define CPPZMQ_HAS_INCLUDE_CPP17(X) __has_include(X)
-#else
-#define CPPZMQ_HAS_INCLUDE_CPP17(X) 0
-#endif
-
-#if CPPZMQ_HAS_INCLUDE_CPP17(<optional>) && !defined(CPPZMQ_HAS_OPTIONAL)
-#define CPPZMQ_HAS_OPTIONAL 1
-#endif
-#ifndef CPPZMQ_HAS_OPTIONAL
-#define CPPZMQ_HAS_OPTIONAL 0
-#elif CPPZMQ_HAS_OPTIONAL
-#include <optional>
-#endif
-
-#if CPPZMQ_HAS_INCLUDE_CPP17(<string_view>) && !defined(CPPZMQ_HAS_STRING_VIEW)
-#define CPPZMQ_HAS_STRING_VIEW 1
-#endif
-#ifndef CPPZMQ_HAS_STRING_VIEW
-#define CPPZMQ_HAS_STRING_VIEW 0
-#elif CPPZMQ_HAS_STRING_VIEW
-#include <string_view>
-#endif
-
-/*  Version macros for compile-time API version detection                     */
-#define CPPZMQ_VERSION_MAJOR 4
-#define CPPZMQ_VERSION_MINOR 9
-#define CPPZMQ_VERSION_PATCH 0
-
-#define CPPZMQ_VERSION                                                              \
-    ZMQ_MAKE_VERSION(CPPZMQ_VERSION_MAJOR, CPPZMQ_VERSION_MINOR,                    \
-                     CPPZMQ_VERSION_PATCH)
-
-//  Detect whether the compiler supports C++11 rvalue references.
-#if (defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 2))   \
-     && defined(__GXX_EXPERIMENTAL_CXX0X__))
-#define ZMQ_HAS_RVALUE_REFS
-#define ZMQ_DELETED_FUNCTION = delete
-#elif defined(__clang__)
-#if __has_feature(cxx_rvalue_references)
-#define ZMQ_HAS_RVALUE_REFS
-#endif
-
-#if __has_feature(cxx_deleted_functions)
-#define ZMQ_DELETED_FUNCTION = delete
-#else
-#define ZMQ_DELETED_FUNCTION
-#endif
-#elif defined(_MSC_VER) && (_MSC_VER >= 1900)
-#define ZMQ_HAS_RVALUE_REFS
-#define ZMQ_DELETED_FUNCTION = delete
-#elif defined(_MSC_VER) && (_MSC_VER >= 1600)
-#define ZMQ_HAS_RVALUE_REFS
-#define ZMQ_DELETED_FUNCTION
-#else
-#define ZMQ_DELETED_FUNCTION
-#endif
-
-#if defined(ZMQ_CPP11) && !defined(__llvm__) && !defined(__INTEL_COMPILER)          \
-  && defined(__GNUC__) && __GNUC__ < 5
-#define ZMQ_CPP11_PARTIAL
-#elif defined(__GLIBCXX__) && __GLIBCXX__ < 20160805
-//the date here is the last date of gcc 4.9.4, which
-// effectively means libstdc++ from gcc 5.5 and higher won't trigger this branch
-#define ZMQ_CPP11_PARTIAL
-#endif
-
-#ifdef ZMQ_CPP11
-#ifdef ZMQ_CPP11_PARTIAL
-#define ZMQ_IS_TRIVIALLY_COPYABLE(T) __has_trivial_copy(T)
-#else
-#include <type_traits>
-#define ZMQ_IS_TRIVIALLY_COPYABLE(T) std::is_trivially_copyable<T>::value
-#endif
-#endif
-
-#if ZMQ_VERSION >= ZMQ_MAKE_VERSION(3, 3, 0)
-#define ZMQ_NEW_MONITOR_EVENT_LAYOUT
-#endif
-
-#if ZMQ_VERSION >= ZMQ_MAKE_VERSION(4, 1, 0)
-#define ZMQ_HAS_PROXY_STEERABLE
-/*  Socket event data  */
-typedef struct
-{
-    uint16_t event; // id of the event as bitfield
-    int32_t value;  // value is either error code, fd or reconnect interval
-} zmq_event_t;
-#endif
-
-// Avoid using deprecated message receive function when possible
-#if ZMQ_VERSION < ZMQ_MAKE_VERSION(3, 2, 0)
-#define zmq_msg_recv(msg, socket, flags) zmq_recvmsg(socket, msg, flags)
-#endif
-
-
-// In order to prevent unused variable warnings when building in non-debug
-// mode use this macro to make assertions.
-#ifndef NDEBUG
-#define ZMQ_ASSERT(expression) assert(expression)
-#else
-#define ZMQ_ASSERT(expression) (void) (expression)
-#endif
-
-namespace zmq
-{
-#ifdef ZMQ_CPP11
-namespace detail
-{
-namespace ranges
-{
-using std::begin;
-using std::end;
-template<class T> auto begin(T &&r) -> decltype(begin(std::forward<T>(r)))
-{
-    return begin(std::forward<T>(r));
-}
-template<class T> auto end(T &&r) -> decltype(end(std::forward<T>(r)))
-{
-    return end(std::forward<T>(r));
-}
-} // namespace ranges
-
-template<class T> using void_t = void;
-
-template<class Iter>
-using iter_value_t = typename std::iterator_traits<Iter>::value_type;
-
-template<class Range>
-using range_iter_t = decltype(
-  ranges::begin(std::declval<typename std::remove_reference<Range>::type &>()));
-
-template<class Range> using range_value_t = iter_value_t<range_iter_t<Range>>;
-
-template<class T, class = void> struct is_range : std::false_type
-{
-};
-
-template<class T>
-struct is_range<
-  T,
-  void_t<decltype(
-    ranges::begin(std::declval<typename std::remove_reference<T>::type &>())
-    == ranges::end(std::declval<typename std::remove_reference<T>::type &>()))>>
-    : std::true_type
-{
-};
-
-} // namespace detail
-#endif
-
-typedef zmq_free_fn free_fn;
-typedef zmq_pollitem_t pollitem_t;
-
-// duplicate definition from libzmq 4.3.3
-#if defined _WIN32
-#if defined _WIN64
-typedef unsigned __int64 fd_t;
-#else
-typedef unsigned int fd_t;
-#endif
-#else
-typedef int fd_t;
-#endif
-
-class error_t : public std::exception
-{
-  public:
-    error_t() ZMQ_NOTHROW : errnum(zmq_errno()) {}
-    explicit error_t(int err) ZMQ_NOTHROW : errnum(err) {}
-    virtual const char *what() const ZMQ_NOTHROW ZMQ_OVERRIDE
-    {
-        return zmq_strerror(errnum);
-    }
-    int num() const ZMQ_NOTHROW { return errnum; }
-
-  private:
-    int errnum;
-};
-
-namespace detail {
-inline int poll(zmq_pollitem_t *items_, size_t nitems_, long timeout_)
-{
-    int rc = zmq_poll(items_, static_cast<int>(nitems_), timeout_);
-    if (rc < 0)
-        throw error_t();
-    return rc;
-}
-}
-
-#ifdef ZMQ_CPP11
-ZMQ_DEPRECATED("from 4.8.0, use poll taking std::chrono::duration instead of long")
-inline int poll(zmq_pollitem_t *items_, size_t nitems_, long timeout_)
-#else
-inline int poll(zmq_pollitem_t *items_, size_t nitems_, long timeout_ = -1)
-#endif
-{
-    return detail::poll(items_, nitems_, timeout_);
-}
-
-ZMQ_DEPRECATED("from 4.3.1, use poll taking non-const items")
-inline int poll(zmq_pollitem_t const *items_, size_t nitems_, long timeout_ = -1)
-{
-    return detail::poll(const_cast<zmq_pollitem_t *>(items_), nitems_, timeout_);
-}
-
-#ifdef ZMQ_CPP11
-ZMQ_DEPRECATED("from 4.3.1, use poll taking non-const items")
-inline int
-poll(zmq_pollitem_t const *items, size_t nitems, std::chrono::milliseconds timeout)
-{
-    return detail::poll(const_cast<zmq_pollitem_t *>(items), nitems,
-                static_cast<long>(timeout.count()));
-}
-
-ZMQ_DEPRECATED("from 4.3.1, use poll taking non-const items")
-inline int poll(std::vector<zmq_pollitem_t> const &items,
-                std::chrono::milliseconds timeout)
-{
-    return detail::poll(const_cast<zmq_pollitem_t *>(items.data()), items.size(),
-                static_cast<long>(timeout.count()));
-}
-
-ZMQ_DEPRECATED("from 4.3.1, use poll taking non-const items")
-inline int poll(std::vector<zmq_pollitem_t> const &items, long timeout_ = -1)
-{
-    return detail::poll(const_cast<zmq_pollitem_t *>(items.data()), items.size(), timeout_);
-}
-
-inline int
-poll(zmq_pollitem_t *items, size_t nitems, std::chrono::milliseconds timeout = std::chrono::milliseconds{-1})
-{
-    return detail::poll(items, nitems, static_cast<long>(timeout.count()));
-}
-
-inline int poll(std::vector<zmq_pollitem_t> &items,
-                std::chrono::milliseconds timeout = std::chrono::milliseconds{-1})
-{
-    return detail::poll(items.data(), items.size(), static_cast<long>(timeout.count()));
-}
-
-ZMQ_DEPRECATED("from 4.3.1, use poll taking std::chrono::duration instead of long")
-inline int poll(std::vector<zmq_pollitem_t> &items, long timeout_)
-{
-    return detail::poll(items.data(), items.size(), timeout_);
-}
-
-template<std::size_t SIZE>
-inline int poll(std::array<zmq_pollitem_t, SIZE> &items,
-                std::chrono::milliseconds timeout = std::chrono::milliseconds{-1})
-{
-    return detail::poll(items.data(), items.size(), static_cast<long>(timeout.count()));
-}
-#endif
-
-
-inline void version(int *major_, int *minor_, int *patch_)
-{
-    zmq_version(major_, minor_, patch_);
-}
-
-#ifdef ZMQ_CPP11
-inline std::tuple<int, int, int> version()
-{
-    std::tuple<int, int, int> v;
-    zmq_version(&std::get<0>(v), &std::get<1>(v), &std::get<2>(v));
-    return v;
-}
-
-#if !defined(ZMQ_CPP11_PARTIAL)
-namespace detail
-{
-template<class T> struct is_char_type
-{
-    // true if character type for string literals in C++11
-    static constexpr bool value =
-      std::is_same<T, char>::value || std::is_same<T, wchar_t>::value
-      || std::is_same<T, char16_t>::value || std::is_same<T, char32_t>::value;
-};
-}
-#endif
-
-#endif
-
-class message_t
-{
-  public:
-    message_t() ZMQ_NOTHROW
-    {
-        int rc = zmq_msg_init(&msg);
-        ZMQ_ASSERT(rc == 0);
-    }
-
-    explicit message_t(size_t size_)
-    {
-        int rc = zmq_msg_init_size(&msg, size_);
-        if (rc != 0)
-            throw error_t();
-    }
-
-    template<class ForwardIter> message_t(ForwardIter first, ForwardIter last)
-    {
-        typedef typename std::iterator_traits<ForwardIter>::value_type value_t;
-
-        assert(std::distance(first, last) >= 0);
-        size_t const size_ =
-          static_cast<size_t>(std::distance(first, last)) * sizeof(value_t);
-        int const rc = zmq_msg_init_size(&msg, size_);
-        if (rc != 0)
-            throw error_t();
-        std::copy(first, last, data<value_t>());
-    }
-
-    message_t(const void *data_, size_t size_)
-    {
-        int rc = zmq_msg_init_size(&msg, size_);
-        if (rc != 0)
-            throw error_t();
-        if (size_) {
-            // this constructor allows (nullptr, 0),
-            // memcpy with a null pointer is UB
-            memcpy(data(), data_, size_);
-        }
-    }
-
-    message_t(void *data_, size_t size_, free_fn *ffn_, void *hint_ = ZMQ_NULLPTR)
-    {
-        int rc = zmq_msg_init_data(&msg, data_, size_, ffn_, hint_);
-        if (rc != 0)
-            throw error_t();
-    }
-
-    // overload set of string-like types and generic containers
-#if defined(ZMQ_CPP11) && !defined(ZMQ_CPP11_PARTIAL)
-    // NOTE this constructor will include the null terminator
-    // when called with a string literal.
-    // An overload taking const char* can not be added because
-    // it would be preferred over this function and break compatiblity.
-    template<
-      class Char,
-      size_t N,
-      typename = typename std::enable_if<detail::is_char_type<Char>::value>::type>
-    ZMQ_DEPRECATED("from 4.7.0, use constructors taking iterators, (pointer, size) "
-                   "or strings instead")
-    explicit message_t(const Char (&data)[N]) :
-        message_t(detail::ranges::begin(data), detail::ranges::end(data))
-    {
-    }
-
-    template<class Range,
-             typename = typename std::enable_if<
-               detail::is_range<Range>::value
-               && ZMQ_IS_TRIVIALLY_COPYABLE(detail::range_value_t<Range>)
-               && !detail::is_char_type<detail::range_value_t<Range>>::value
-               && !std::is_same<Range, message_t>::value>::type>
-    explicit message_t(const Range &rng) :
-        message_t(detail::ranges::begin(rng), detail::ranges::end(rng))
-    {
-    }
-
-    explicit message_t(const std::string &str) : message_t(str.data(), str.size()) {}
-
-#if CPPZMQ_HAS_STRING_VIEW
-    explicit message_t(std::string_view str) : message_t(str.data(), str.size()) {}
-#endif
-
-#endif
-
-#ifdef ZMQ_HAS_RVALUE_REFS
-    message_t(message_t &&rhs) ZMQ_NOTHROW : msg(rhs.msg)
-    {
-        int rc = zmq_msg_init(&rhs.msg);
-        ZMQ_ASSERT(rc == 0);
-    }
-
-    message_t &operator=(message_t &&rhs) ZMQ_NOTHROW
-    {
-        std::swap(msg, rhs.msg);
-        return *this;
-    }
-#endif
-
-    ~message_t() ZMQ_NOTHROW
-    {
-        int rc = zmq_msg_close(&msg);
-        ZMQ_ASSERT(rc == 0);
-    }
-
-    void rebuild()
-    {
-        int rc = zmq_msg_close(&msg);
-        if (rc != 0)
-            throw error_t();
-        rc = zmq_msg_init(&msg);
-        ZMQ_ASSERT(rc == 0);
-    }
-
-    void rebuild(size_t size_)
-    {
-        int rc = zmq_msg_close(&msg);
-        if (rc != 0)
-            throw error_t();
-        rc = zmq_msg_init_size(&msg, size_);
-        if (rc != 0)
-            throw error_t();
-    }
-
-    void rebuild(const void *data_, size_t size_)
-    {
-        int rc = zmq_msg_close(&msg);
-        if (rc != 0)
-            throw error_t();
-        rc = zmq_msg_init_size(&msg, size_);
-        if (rc != 0)
-            throw error_t();
-        memcpy(data(), data_, size_);
-    }
-    
-    void rebuild(const std::string &str)
-    {
-        rebuild(str.data(), str.size());
-    }
-
-    void rebuild(void *data_, size_t size_, free_fn *ffn_, void *hint_ = ZMQ_NULLPTR)
-    {
-        int rc = zmq_msg_close(&msg);
-        if (rc != 0)
-            throw error_t();
-        rc = zmq_msg_init_data(&msg, data_, size_, ffn_, hint_);
-        if (rc != 0)
-            throw error_t();
-    }
-
-    ZMQ_DEPRECATED("from 4.3.1, use move taking non-const reference instead")
-    void move(message_t const *msg_)
-    {
-        int rc = zmq_msg_move(&msg, const_cast<zmq_msg_t *>(msg_->handle()));
-        if (rc != 0)
-            throw error_t();
-    }
-
-    void move(message_t &msg_)
-    {
-        int rc = zmq_msg_move(&msg, msg_.handle());
-        if (rc != 0)
-            throw error_t();
-    }
-
-    ZMQ_DEPRECATED("from 4.3.1, use copy taking non-const reference instead")
-    void copy(message_t const *msg_)
-    {
-        int rc = zmq_msg_copy(&msg, const_cast<zmq_msg_t *>(msg_->handle()));
-        if (rc != 0)
-            throw error_t();
-    }
-
-    void copy(message_t &msg_)
-    {
-        int rc = zmq_msg_copy(&msg, msg_.handle());
-        if (rc != 0)
-            throw error_t();
-    }
-
-    bool more() const ZMQ_NOTHROW
-    {
-        int rc = zmq_msg_more(const_cast<zmq_msg_t *>(&msg));
-        return rc != 0;
-    }
-
-    void *data() ZMQ_NOTHROW { return zmq_msg_data(&msg); }
-
-    const void *data() const ZMQ_NOTHROW
-    {
-        return zmq_msg_data(const_cast<zmq_msg_t *>(&msg));
-    }
-
-    size_t size() const ZMQ_NOTHROW
-    {
-        return zmq_msg_size(const_cast<zmq_msg_t *>(&msg));
-    }
-
-    ZMQ_NODISCARD bool empty() const ZMQ_NOTHROW { return size() == 0u; }
-
-    template<typename T> T *data() ZMQ_NOTHROW { return static_cast<T *>(data()); }
-
-    template<typename T> T const *data() const ZMQ_NOTHROW
-    {
-        return static_cast<T const *>(data());
-    }
-
-    ZMQ_DEPRECATED("from 4.3.0, use operator== instead")
-    bool equal(const message_t *other) const ZMQ_NOTHROW { return *this == *other; }
-
-    bool operator==(const message_t &other) const ZMQ_NOTHROW
-    {
-        const size_t my_size = size();
-        return my_size == other.size() && 0 == memcmp(data(), other.data(), my_size);
-    }
-
-    bool operator!=(const message_t &other) const ZMQ_NOTHROW
-    {
-        return !(*this == other);
-    }
-
-#if ZMQ_VERSION >= ZMQ_MAKE_VERSION(3, 2, 0)
-    int get(int property_)
-    {
-        int value = zmq_msg_get(&msg, property_);
-        if (value == -1)
-            throw error_t();
-        return value;
-    }
-#endif
-
-#if ZMQ_VERSION >= ZMQ_MAKE_VERSION(4, 1, 0)
-    const char *gets(const char *property_)
-    {
-        const char *value = zmq_msg_gets(&msg, property_);
-        if (value == ZMQ_NULLPTR)
-            throw error_t();
-        return value;
-    }
-#endif
-
-#if defined(ZMQ_BUILD_DRAFT_API) && ZMQ_VERSION >= ZMQ_MAKE_VERSION(4, 2, 0)
-    uint32_t routing_id() const
-    {
-        return zmq_msg_routing_id(const_cast<zmq_msg_t *>(&msg));
-    }
-
-    void set_routing_id(uint32_t routing_id)
-    {
-        int rc = zmq_msg_set_routing_id(&msg, routing_id);
-        if (rc != 0)
-            throw error_t();
-    }
-
-    const char *group() const
-    {
-        return zmq_msg_group(const_cast<zmq_msg_t *>(&msg));
-    }
-
-    void set_group(const char *group)
-    {
-        int rc = zmq_msg_set_group(&msg, group);
-        if (rc != 0)
-            throw error_t();
-    }
-#endif
-
-    // interpret message content as a string
-    std::string to_string() const
-    {
-        return std::string(static_cast<const char *>(data()), size());
-    }
-#if CPPZMQ_HAS_STRING_VIEW
-    // interpret message content as a string
-    std::string_view to_string_view() const noexcept
-    {
-        return std::string_view(static_cast<const char *>(data()), size());
-    }
-#endif
-
-    /** Dump content to string for debugging.
-    *   Ascii chars are readable, the rest is printed as hex.
-    *   Probably ridiculously slow.
-    *   Use to_string() or to_string_view() for
-    *   interpreting the message as a string.
-    */
-    std::string str() const
-    {
-        // Partly mutuated from the same method in zmq::multipart_t
-        std::stringstream os;
-
-        const unsigned char *msg_data = this->data<unsigned char>();
-        unsigned char byte;
-        size_t size = this->size();
-        int is_ascii[2] = {0, 0};
-
-        os << "zmq::message_t [size " << std::dec << std::setw(3)
-           << std::setfill('0') << size << "] (";
-        // Totally arbitrary
-        if (size >= 1000) {
-            os << "... too big to print)";
-        } else {
-            while (size--) {
-                byte = *msg_data++;
-
-                is_ascii[1] = (byte >= 32 && byte < 127);
-                if (is_ascii[1] != is_ascii[0])
-                    os << " "; // Separate text/non text
-
-                if (is_ascii[1]) {
-                    os << byte;
-                } else {
-                    os << std::hex << std::uppercase << std::setw(2)
-                       << std::setfill('0') << static_cast<short>(byte);
-                }
-                is_ascii[0] = is_ascii[1];
-            }
-            os << ")";
-        }
-        return os.str();
-    }
-
-    void swap(message_t &other) ZMQ_NOTHROW
-    {
-        // this assumes zmq::msg_t from libzmq is trivially relocatable
-        std::swap(msg, other.msg);
-    }
-
-    ZMQ_NODISCARD zmq_msg_t *handle() ZMQ_NOTHROW { return &msg; }
-    ZMQ_NODISCARD const zmq_msg_t *handle() const ZMQ_NOTHROW { return &msg; }
-
-  private:
-    //  The underlying message
-    zmq_msg_t msg;
-
-    //  Disable implicit message copying, so that users won't use shared
-    //  messages (less efficient) without being aware of the fact.
-    message_t(const message_t &) ZMQ_DELETED_FUNCTION;
-    void operator=(const message_t &) ZMQ_DELETED_FUNCTION;
-};
-
-inline void swap(message_t &a, message_t &b) ZMQ_NOTHROW
-{
-    a.swap(b);
-}
-
-#ifdef ZMQ_CPP11
-enum class ctxopt
-{
-#ifdef ZMQ_BLOCKY
-    blocky = ZMQ_BLOCKY,
-#endif
-#ifdef ZMQ_IO_THREADS
-    io_threads = ZMQ_IO_THREADS,
-#endif
-#ifdef ZMQ_THREAD_SCHED_POLICY
-    thread_sched_policy = ZMQ_THREAD_SCHED_POLICY,
-#endif
-#ifdef ZMQ_THREAD_PRIORITY
-    thread_priority = ZMQ_THREAD_PRIORITY,
-#endif
-#ifdef ZMQ_THREAD_AFFINITY_CPU_ADD
-    thread_affinity_cpu_add = ZMQ_THREAD_AFFINITY_CPU_ADD,
-#endif
-#ifdef ZMQ_THREAD_AFFINITY_CPU_REMOVE
-    thread_affinity_cpu_remove = ZMQ_THREAD_AFFINITY_CPU_REMOVE,
-#endif
-#ifdef ZMQ_THREAD_NAME_PREFIX
-    thread_name_prefix = ZMQ_THREAD_NAME_PREFIX,
-#endif
-#ifdef ZMQ_MAX_MSGSZ
-    max_msgsz = ZMQ_MAX_MSGSZ,
-#endif
-#ifdef ZMQ_ZERO_COPY_RECV
-    zero_copy_recv = ZMQ_ZERO_COPY_RECV,
-#endif
-#ifdef ZMQ_MAX_SOCKETS
-    max_sockets = ZMQ_MAX_SOCKETS,
-#endif
-#ifdef ZMQ_SOCKET_LIMIT
-    socket_limit = ZMQ_SOCKET_LIMIT,
-#endif
-#ifdef ZMQ_IPV6
-    ipv6 = ZMQ_IPV6,
-#endif
-#ifdef ZMQ_MSG_T_SIZE
-    msg_t_size = ZMQ_MSG_T_SIZE
-#endif
-};
-#endif
-
-class context_t
-{
-  public:
-    context_t()
-    {
-        ptr = zmq_ctx_new();
-        if (ptr == ZMQ_NULLPTR)
-            throw error_t();
-    }
-
-
-    explicit context_t(int io_threads_, int max_sockets_ = ZMQ_MAX_SOCKETS_DFLT)
-    {
-        ptr = zmq_ctx_new();
-        if (ptr == ZMQ_NULLPTR)
-            throw error_t();
-
-        int rc = zmq_ctx_set(ptr, ZMQ_IO_THREADS, io_threads_);
-        ZMQ_ASSERT(rc == 0);
-
-        rc = zmq_ctx_set(ptr, ZMQ_MAX_SOCKETS, max_sockets_);
-        ZMQ_ASSERT(rc == 0);
-    }
-
-#ifdef ZMQ_HAS_RVALUE_REFS
-    context_t(context_t &&rhs) ZMQ_NOTHROW : ptr(rhs.ptr) { rhs.ptr = ZMQ_NULLPTR; }
-    context_t &operator=(context_t &&rhs) ZMQ_NOTHROW
-    {
-        close();
-        std::swap(ptr, rhs.ptr);
-        return *this;
-    }
-#endif
-
-    ~context_t() ZMQ_NOTHROW { close(); }
-
-    ZMQ_CPP11_DEPRECATED("from 4.7.0, use set taking zmq::ctxopt instead")
-    int setctxopt(int option_, int optval_)
-    {
-        int rc = zmq_ctx_set(ptr, option_, optval_);
-        ZMQ_ASSERT(rc == 0);
-        return rc;
-    }
-
-    ZMQ_CPP11_DEPRECATED("from 4.7.0, use get taking zmq::ctxopt instead")
-    int getctxopt(int option_) { return zmq_ctx_get(ptr, option_); }
-
-#ifdef ZMQ_CPP11
-    void set(ctxopt option, int optval)
-    {
-        int rc = zmq_ctx_set(ptr, static_cast<int>(option), optval);
-        if (rc == -1)
-            throw error_t();
-    }
-
-    ZMQ_NODISCARD int get(ctxopt option)
-    {
-        int rc = zmq_ctx_get(ptr, static_cast<int>(option));
-        // some options have a default value of -1
-        // which is unfortunate, and may result in errors
-        // that don't make sense
-        if (rc == -1)
-            throw error_t();
-        return rc;
-    }
-#endif
-
-    // Terminates context (see also shutdown()).
-    void close() ZMQ_NOTHROW
-    {
-        if (ptr == ZMQ_NULLPTR)
-            return;
-
-        int rc;
-        do {
-            rc = zmq_ctx_term(ptr);
-        } while (rc == -1 && errno == EINTR);
-
-        ZMQ_ASSERT(rc == 0);
-        ptr = ZMQ_NULLPTR;
-    }
-
-    // Shutdown context in preparation for termination (close()).
-    // Causes all blocking socket operations and any further
-    // socket operations to return with ETERM.
-    void shutdown() ZMQ_NOTHROW
-    {
-        if (ptr == ZMQ_NULLPTR)
-            return;
-        int rc = zmq_ctx_shutdown(ptr);
-        ZMQ_ASSERT(rc == 0);
-    }
-
-    //  Be careful with this, it's probably only useful for
-    //  using the C api together with an existing C++ api.
-    //  Normally you should never need to use this.
-    ZMQ_EXPLICIT operator void *() ZMQ_NOTHROW { return ptr; }
-
-    ZMQ_EXPLICIT operator void const *() const ZMQ_NOTHROW { return ptr; }
-
-    ZMQ_NODISCARD void *handle() ZMQ_NOTHROW { return ptr; }
-
-    ZMQ_DEPRECATED("from 4.7.0, use handle() != nullptr instead")
-    operator bool() const ZMQ_NOTHROW { return ptr != ZMQ_NULLPTR; }
-
-    void swap(context_t &other) ZMQ_NOTHROW { std::swap(ptr, other.ptr); }
-
-  private:
-    void *ptr;
-
-    context_t(const context_t &) ZMQ_DELETED_FUNCTION;
-    void operator=(const context_t &) ZMQ_DELETED_FUNCTION;
-};
-
-inline void swap(context_t &a, context_t &b) ZMQ_NOTHROW
-{
-    a.swap(b);
-}
-
-#ifdef ZMQ_CPP11
-
-struct recv_buffer_size
-{
-    size_t size;             // number of bytes written to buffer
-    size_t untruncated_size; // untruncated message size in bytes
-
-    ZMQ_NODISCARD bool truncated() const noexcept
-    {
-        return size != untruncated_size;
-    }
-};
-
-#if CPPZMQ_HAS_OPTIONAL
-
-using send_result_t = std::optional<size_t>;
-using recv_result_t = std::optional<size_t>;
-using recv_buffer_result_t = std::optional<recv_buffer_size>;
-
-#else
-
-namespace detail
-{
-// A C++11 type emulating the most basic
-// operations of std::optional for trivial types
-template<class T> class trivial_optional
-{
-  public:
-    static_assert(std::is_trivial<T>::value, "T must be trivial");
-    using value_type = T;
-
-    trivial_optional() = default;
-    trivial_optional(T value) noexcept : _value(value), _has_value(true) {}
-
-    const T *operator->() const noexcept
-    {
-        assert(_has_value);
-        return &_value;
-    }
-    T *operator->() noexcept
-    {
-        assert(_has_value);
-        return &_value;
-    }
-
-    const T &operator*() const noexcept
-    {
-        assert(_has_value);
-        return _value;
-    }
-    T &operator*() noexcept
-    {
-        assert(_has_value);
-        return _value;
-    }
-
-    T &value()
-    {
-        if (!_has_value)
-            throw std::exception();
-        return _value;
-    }
-    const T &value() const
-    {
-        if (!_has_value)
-            throw std::exception();
-        return _value;
-    }
-
-    explicit operator bool() const noexcept { return _has_value; }
-    bool has_value() const noexcept { return _has_value; }
-
-  private:
-    T _value{};
-    bool _has_value{false};
-};
-} // namespace detail
-
-using send_result_t = detail::trivial_optional<size_t>;
-using recv_result_t = detail::trivial_optional<size_t>;
-using recv_buffer_result_t = detail::trivial_optional<recv_buffer_size>;
-
-#endif
-
-namespace detail
-{
-template<class T> constexpr T enum_bit_or(T a, T b) noexcept
-{
-    static_assert(std::is_enum<T>::value, "must be enum");
-    using U = typename std::underlying_type<T>::type;
-    return static_cast<T>(static_cast<U>(a) | static_cast<U>(b));
-}
-template<class T> constexpr T enum_bit_and(T a, T b) noexcept
-{
-    static_assert(std::is_enum<T>::value, "must be enum");
-    using U = typename std::underlying_type<T>::type;
-    return static_cast<T>(static_cast<U>(a) & static_cast<U>(b));
-}
-template<class T> constexpr T enum_bit_xor(T a, T b) noexcept
-{
-    static_assert(std::is_enum<T>::value, "must be enum");
-    using U = typename std::underlying_type<T>::type;
-    return static_cast<T>(static_cast<U>(a) ^ static_cast<U>(b));
-}
-template<class T> constexpr T enum_bit_not(T a) noexcept
-{
-    static_assert(std::is_enum<T>::value, "must be enum");
-    using U = typename std::underlying_type<T>::type;
-    return static_cast<T>(~static_cast<U>(a));
-}
-} // namespace detail
-
-// partially satisfies named requirement BitmaskType
-enum class send_flags : int
-{
-    none = 0,
-    dontwait = ZMQ_DONTWAIT,
-    sndmore = ZMQ_SNDMORE
-};
-
-constexpr send_flags operator|(send_flags a, send_flags b) noexcept
-{
-    return detail::enum_bit_or(a, b);
-}
-constexpr send_flags operator&(send_flags a, send_flags b) noexcept
-{
-    return detail::enum_bit_and(a, b);
-}
-constexpr send_flags operator^(send_flags a, send_flags b) noexcept
-{
-    return detail::enum_bit_xor(a, b);
-}
-constexpr send_flags operator~(send_flags a) noexcept
-{
-    return detail::enum_bit_not(a);
-}
-
-// partially satisfies named requirement BitmaskType
-enum class recv_flags : int
-{
-    none = 0,
-    dontwait = ZMQ_DONTWAIT
-};
-
-constexpr recv_flags operator|(recv_flags a, recv_flags b) noexcept
-{
-    return detail::enum_bit_or(a, b);
-}
-constexpr recv_flags operator&(recv_flags a, recv_flags b) noexcept
-{
-    return detail::enum_bit_and(a, b);
-}
-constexpr recv_flags operator^(recv_flags a, recv_flags b) noexcept
-{
-    return detail::enum_bit_xor(a, b);
-}
-constexpr recv_flags operator~(recv_flags a) noexcept
-{
-    return detail::enum_bit_not(a);
-}
-
-
-// mutable_buffer, const_buffer and buffer are based on
-// the Networking TS specification, draft:
-// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2018/n4771.pdf
-
-class mutable_buffer
-{
-  public:
-    constexpr mutable_buffer() noexcept : _data(nullptr), _size(0) {}
-    constexpr mutable_buffer(void *p, size_t n) noexcept : _data(p), _size(n)
-    {
-#ifdef ZMQ_EXTENDED_CONSTEXPR
-        assert(p != nullptr || n == 0);
-#endif
-    }
-
-    constexpr void *data() const noexcept { return _data; }
-    constexpr size_t size() const noexcept { return _size; }
-    mutable_buffer &operator+=(size_t n) noexcept
-    {
-        // (std::min) is a workaround for when a min macro is defined
-        const auto shift = (std::min)(n, _size);
-        _data = static_cast<char *>(_data) + shift;
-        _size -= shift;
-        return *this;
-    }
-
-  private:
-    void *_data;
-    size_t _size;
-};
-
-inline mutable_buffer operator+(const mutable_buffer &mb, size_t n) noexcept
-{
-    return mutable_buffer(static_cast<char *>(mb.data()) + (std::min)(n, mb.size()),
-                          mb.size() - (std::min)(n, mb.size()));
-}
-inline mutable_buffer operator+(size_t n, const mutable_buffer &mb) noexcept
-{
-    return mb + n;
-}
-
-class const_buffer
-{
-  public:
-    constexpr const_buffer() noexcept : _data(nullptr), _size(0) {}
-    constexpr const_buffer(const void *p, size_t n) noexcept : _data(p), _size(n)
-    {
-#ifdef ZMQ_EXTENDED_CONSTEXPR
-        assert(p != nullptr || n == 0);
-#endif
-    }
-    constexpr const_buffer(const mutable_buffer &mb) noexcept :
-        _data(mb.data()), _size(mb.size())
-    {
-    }
-
-    constexpr const void *data() const noexcept { return _data; }
-    constexpr size_t size() const noexcept { return _size; }
-    const_buffer &operator+=(size_t n) noexcept
-    {
-        const auto shift = (std::min)(n, _size);
-        _data = static_cast<const char *>(_data) + shift;
-        _size -= shift;
-        return *this;
-    }
-
-  private:
-    const void *_data;
-    size_t _size;
-};
-
-inline const_buffer operator+(const const_buffer &cb, size_t n) noexcept
-{
-    return const_buffer(static_cast<const char *>(cb.data())
-                          + (std::min)(n, cb.size()),
-                        cb.size() - (std::min)(n, cb.size()));
-}
-inline const_buffer operator+(size_t n, const const_buffer &cb) noexcept
-{
-    return cb + n;
-}
-
-// buffer creation
-
-constexpr mutable_buffer buffer(void *p, size_t n) noexcept
-{
-    return mutable_buffer(p, n);
-}
-constexpr const_buffer buffer(const void *p, size_t n) noexcept
-{
-    return const_buffer(p, n);
-}
-constexpr mutable_buffer buffer(const mutable_buffer &mb) noexcept
-{
-    return mb;
-}
-inline mutable_buffer buffer(const mutable_buffer &mb, size_t n) noexcept
-{
-    return mutable_buffer(mb.data(), (std::min)(mb.size(), n));
-}
-constexpr const_buffer buffer(const const_buffer &cb) noexcept
-{
-    return cb;
-}
-inline const_buffer buffer(const const_buffer &cb, size_t n) noexcept
-{
-    return const_buffer(cb.data(), (std::min)(cb.size(), n));
-}
-
-namespace detail
-{
-template<class T> struct is_buffer
-{
-    static constexpr bool value =
-      std::is_same<T, const_buffer>::value || std::is_same<T, mutable_buffer>::value;
-};
-
-template<class T> struct is_pod_like
-{
-    // NOTE: The networking draft N4771 section 16.11 requires
-    // T in the buffer functions below to be
-    // trivially copyable OR standard layout.
-    // Here we decide to be conservative and require both.
-    static constexpr bool value =
-      ZMQ_IS_TRIVIALLY_COPYABLE(T) && std::is_standard_layout<T>::value;
-};
-
-template<class C> constexpr auto seq_size(const C &c) noexcept -> decltype(c.size())
-{
-    return c.size();
-}
-template<class T, size_t N>
-constexpr size_t seq_size(const T (&/*array*/)[N]) noexcept
-{
-    return N;
-}
-
-template<class Seq>
-auto buffer_contiguous_sequence(Seq &&seq) noexcept
-  -> decltype(buffer(std::addressof(*std::begin(seq)), size_t{}))
-{
-    using T = typename std::remove_cv<
-      typename std::remove_reference<decltype(*std::begin(seq))>::type>::type;
-    static_assert(detail::is_pod_like<T>::value, "T must be POD");
-
-    const auto size = seq_size(seq);
-    return buffer(size != 0u ? std::addressof(*std::begin(seq)) : nullptr,
-                  size * sizeof(T));
-}
-template<class Seq>
-auto buffer_contiguous_sequence(Seq &&seq, size_t n_bytes) noexcept
-  -> decltype(buffer_contiguous_sequence(seq))
-{
-    using T = typename std::remove_cv<
-      typename std::remove_reference<decltype(*std::begin(seq))>::type>::type;
-    static_assert(detail::is_pod_like<T>::value, "T must be POD");
-
-    const auto size = seq_size(seq);
-    return buffer(size != 0u ? std::addressof(*std::begin(seq)) : nullptr,
-                  (std::min)(size * sizeof(T), n_bytes));
-}
-
-} // namespace detail
-
-// C array
-template<class T, size_t N> mutable_buffer buffer(T (&data)[N]) noexcept
-{
-    return detail::buffer_contiguous_sequence(data);
-}
-template<class T, size_t N>
-mutable_buffer buffer(T (&data)[N], size_t n_bytes) noexcept
-{
-    return detail::buffer_contiguous_sequence(data, n_bytes);
-}
-template<class T, size_t N> const_buffer buffer(const T (&data)[N]) noexcept
-{
-    return detail::buffer_contiguous_sequence(data);
-}
-template<class T, size_t N>
-const_buffer buffer(const T (&data)[N], size_t n_bytes) noexcept
-{
-    return detail::buffer_contiguous_sequence(data, n_bytes);
-}
-// std::array
-template<class T, size_t N> mutable_buffer buffer(std::array<T, N> &data) noexcept
-{
-    return detail::buffer_contiguous_sequence(data);
-}
-template<class T, size_t N>
-mutable_buffer buffer(std::array<T, N> &data, size_t n_bytes) noexcept
-{
-    return detail::buffer_contiguous_sequence(data, n_bytes);
-}
-template<class T, size_t N>
-const_buffer buffer(std::array<const T, N> &data) noexcept
-{
-    return detail::buffer_contiguous_sequence(data);
-}
-template<class T, size_t N>
-const_buffer buffer(std::array<const T, N> &data, size_t n_bytes) noexcept
-{
-    return detail::buffer_contiguous_sequence(data, n_bytes);
-}
-template<class T, size_t N>
-const_buffer buffer(const std::array<T, N> &data) noexcept
-{
-    return detail::buffer_contiguous_sequence(data);
-}
-template<class T, size_t N>
-const_buffer buffer(const std::array<T, N> &data, size_t n_bytes) noexcept
-{
-    return detail::buffer_contiguous_sequence(data, n_bytes);
-}
-// std::vector
-template<class T, class Allocator>
-mutable_buffer buffer(std::vector<T, Allocator> &data) noexcept
-{
-    return detail::buffer_contiguous_sequence(data);
-}
-template<class T, class Allocator>
-mutable_buffer buffer(std::vector<T, Allocator> &data, size_t n_bytes) noexcept
-{
-    return detail::buffer_contiguous_sequence(data, n_bytes);
-}
-template<class T, class Allocator>
-const_buffer buffer(const std::vector<T, Allocator> &data) noexcept
-{
-    return detail::buffer_contiguous_sequence(data);
-}
-template<class T, class Allocator>
-const_buffer buffer(const std::vector<T, Allocator> &data, size_t n_bytes) noexcept
-{
-    return detail::buffer_contiguous_sequence(data, n_bytes);
-}
-// std::basic_string
-template<class T, class Traits, class Allocator>
-mutable_buffer buffer(std::basic_string<T, Traits, Allocator> &data) noexcept
-{
-    return detail::buffer_contiguous_sequence(data);
-}
-template<class T, class Traits, class Allocator>
-mutable_buffer buffer(std::basic_string<T, Traits, Allocator> &data,
-                      size_t n_bytes) noexcept
-{
-    return detail::buffer_contiguous_sequence(data, n_bytes);
-}
-template<class T, class Traits, class Allocator>
-const_buffer buffer(const std::basic_string<T, Traits, Allocator> &data) noexcept
-{
-    return detail::buffer_contiguous_sequence(data);
-}
-template<class T, class Traits, class Allocator>
-const_buffer buffer(const std::basic_string<T, Traits, Allocator> &data,
-                    size_t n_bytes) noexcept
-{
-    return detail::buffer_contiguous_sequence(data, n_bytes);
-}
-
-#if CPPZMQ_HAS_STRING_VIEW
-// std::basic_string_view
-template<class T, class Traits>
-const_buffer buffer(std::basic_string_view<T, Traits> data) noexcept
-{
-    return detail::buffer_contiguous_sequence(data);
-}
-template<class T, class Traits>
-const_buffer buffer(std::basic_string_view<T, Traits> data, size_t n_bytes) noexcept
-{
-    return detail::buffer_contiguous_sequence(data, n_bytes);
-}
-#endif
-
-// Buffer for a string literal (null terminated)
-// where the buffer size excludes the terminating character.
-// Equivalent to zmq::buffer(std::string_view("...")).
-template<class Char, size_t N>
-constexpr const_buffer str_buffer(const Char (&data)[N]) noexcept
-{
-    static_assert(detail::is_pod_like<Char>::value, "Char must be POD");
-#ifdef ZMQ_EXTENDED_CONSTEXPR
-    assert(data[N - 1] == Char{0});
-#endif
-    return const_buffer(static_cast<const Char *>(data), (N - 1) * sizeof(Char));
-}
-
-namespace literals
-{
-constexpr const_buffer operator"" _zbuf(const char *str, size_t len) noexcept
-{
-    return const_buffer(str, len * sizeof(char));
-}
-constexpr const_buffer operator"" _zbuf(const wchar_t *str, size_t len) noexcept
-{
-    return const_buffer(str, len * sizeof(wchar_t));
-}
-constexpr const_buffer operator"" _zbuf(const char16_t *str, size_t len) noexcept
-{
-    return const_buffer(str, len * sizeof(char16_t));
-}
-constexpr const_buffer operator"" _zbuf(const char32_t *str, size_t len) noexcept
-{
-    return const_buffer(str, len * sizeof(char32_t));
-}
-}
-
-#ifdef ZMQ_CPP11
-enum class socket_type : int
-{
-    req = ZMQ_REQ,
-    rep = ZMQ_REP,
-    dealer = ZMQ_DEALER,
-    router = ZMQ_ROUTER,
-    pub = ZMQ_PUB,
-    sub = ZMQ_SUB,
-    xpub = ZMQ_XPUB,
-    xsub = ZMQ_XSUB,
-    push = ZMQ_PUSH,
-    pull = ZMQ_PULL,
-#if defined(ZMQ_BUILD_DRAFT_API) && ZMQ_VERSION >= ZMQ_MAKE_VERSION(4, 2, 0)
-    server = ZMQ_SERVER,
-    client = ZMQ_CLIENT,
-    radio = ZMQ_RADIO,
-    dish = ZMQ_DISH,
-    gather = ZMQ_GATHER,
-    scatter = ZMQ_SCATTER,
-    dgram = ZMQ_DGRAM,
-#endif
-#if defined(ZMQ_BUILD_DRAFT_API) && ZMQ_VERSION >= ZMQ_MAKE_VERSION(4, 3, 3)
-    peer = ZMQ_PEER,
-    channel = ZMQ_CHANNEL,
-#endif
-#if ZMQ_VERSION_MAJOR >= 4
-    stream = ZMQ_STREAM,
-#endif
-    pair = ZMQ_PAIR
-};
-#endif
-
-namespace sockopt
-{
-// There are two types of options,
-// integral type with known compiler time size (int, bool, int64_t, uint64_t)
-// and arrays with dynamic size (strings, binary data).
-
-// BoolUnit: if true accepts values of type bool (but passed as T into libzmq)
-template<int Opt, class T, bool BoolUnit = false> struct integral_option
-{
-};
-
-// NullTerm:
-// 0: binary data
-// 1: null-terminated string (`getsockopt` size includes null)
-// 2: binary (size 32) or Z85 encoder string of size 41 (null included)
-template<int Opt, int NullTerm = 1> struct array_option
-{
-};
-
-#define ZMQ_DEFINE_INTEGRAL_OPT(OPT, NAME, TYPE)                                    \
-    using NAME##_t = integral_option<OPT, TYPE, false>;                             \
-    ZMQ_INLINE_VAR ZMQ_CONSTEXPR_VAR NAME##_t NAME {}
-#define ZMQ_DEFINE_INTEGRAL_BOOL_UNIT_OPT(OPT, NAME, TYPE)                          \
-    using NAME##_t = integral_option<OPT, TYPE, true>;                              \
-    ZMQ_INLINE_VAR ZMQ_CONSTEXPR_VAR NAME##_t NAME {}
-#define ZMQ_DEFINE_ARRAY_OPT(OPT, NAME)                                             \
-    using NAME##_t = array_option<OPT>;                                             \
-    ZMQ_INLINE_VAR ZMQ_CONSTEXPR_VAR NAME##_t NAME {}
-#define ZMQ_DEFINE_ARRAY_OPT_BINARY(OPT, NAME)                                      \
-    using NAME##_t = array_option<OPT, 0>;                                          \
-    ZMQ_INLINE_VAR ZMQ_CONSTEXPR_VAR NAME##_t NAME {}
-#define ZMQ_DEFINE_ARRAY_OPT_BIN_OR_Z85(OPT, NAME)                                  \
-    using NAME##_t = array_option<OPT, 2>;                                          \
-    ZMQ_INLINE_VAR ZMQ_CONSTEXPR_VAR NAME##_t NAME {}
-
-// deprecated, use zmq::fd_t
-using cppzmq_fd_t = ::zmq::fd_t;
-
-#ifdef ZMQ_AFFINITY
-ZMQ_DEFINE_INTEGRAL_OPT(ZMQ_AFFINITY, affinity, uint64_t);
-#endif
-#ifdef ZMQ_BACKLOG
-ZMQ_DEFINE_INTEGRAL_OPT(ZMQ_BACKLOG, backlog, int);
-#endif
-#ifdef ZMQ_BINDTODEVICE
-ZMQ_DEFINE_ARRAY_OPT_BINARY(ZMQ_BINDTODEVICE, bindtodevice);
-#endif
-#ifdef ZMQ_CONFLATE
-ZMQ_DEFINE_INTEGRAL_BOOL_UNIT_OPT(ZMQ_CONFLATE, conflate, int);
-#endif
-#ifdef ZMQ_CONNECT_ROUTING_ID
-ZMQ_DEFINE_ARRAY_OPT(ZMQ_CONNECT_ROUTING_ID, connect_routing_id);
-#endif
-#ifdef ZMQ_CONNECT_TIMEOUT
-ZMQ_DEFINE_INTEGRAL_OPT(ZMQ_CONNECT_TIMEOUT, connect_timeout, int);
-#endif
-#ifdef ZMQ_CURVE_PUBLICKEY
-ZMQ_DEFINE_ARRAY_OPT_BIN_OR_Z85(ZMQ_CURVE_PUBLICKEY, curve_publickey);
-#endif
-#ifdef ZMQ_CURVE_SECRETKEY
-ZMQ_DEFINE_ARRAY_OPT_BIN_OR_Z85(ZMQ_CURVE_SECRETKEY, curve_secretkey);
-#endif
-#ifdef ZMQ_CURVE_SERVER
-ZMQ_DEFINE_INTEGRAL_BOOL_UNIT_OPT(ZMQ_CURVE_SERVER, curve_server, int);
-#endif
-#ifdef ZMQ_CURVE_SERVERKEY
-ZMQ_DEFINE_ARRAY_OPT_BIN_OR_Z85(ZMQ_CURVE_SERVERKEY, curve_serverkey);
-#endif
-#ifdef ZMQ_EVENTS
-ZMQ_DEFINE_INTEGRAL_OPT(ZMQ_EVENTS, events, int);
-#endif
-#ifdef ZMQ_FD
-ZMQ_DEFINE_INTEGRAL_OPT(ZMQ_FD, fd, ::zmq::fd_t);
-#endif
-#ifdef ZMQ_GSSAPI_PLAINTEXT
-ZMQ_DEFINE_INTEGRAL_BOOL_UNIT_OPT(ZMQ_GSSAPI_PLAINTEXT, gssapi_plaintext, int);
-#endif
-#ifdef ZMQ_GSSAPI_SERVER
-ZMQ_DEFINE_INTEGRAL_BOOL_UNIT_OPT(ZMQ_GSSAPI_SERVER, gssapi_server, int);
-#endif
-#ifdef ZMQ_GSSAPI_SERVICE_PRINCIPAL
-ZMQ_DEFINE_ARRAY_OPT(ZMQ_GSSAPI_SERVICE_PRINCIPAL, gssapi_service_principal);
-#endif
-#ifdef ZMQ_GSSAPI_SERVICE_PRINCIPAL_NAMETYPE
-ZMQ_DEFINE_INTEGRAL_OPT(ZMQ_GSSAPI_SERVICE_PRINCIPAL_NAMETYPE,
-                        gssapi_service_principal_nametype,
-                        int);
-#endif
-#ifdef ZMQ_GSSAPI_PRINCIPAL
-ZMQ_DEFINE_ARRAY_OPT(ZMQ_GSSAPI_PRINCIPAL, gssapi_principal);
-#endif
-#ifdef ZMQ_GSSAPI_PRINCIPAL_NAMETYPE
-ZMQ_DEFINE_INTEGRAL_OPT(ZMQ_GSSAPI_PRINCIPAL_NAMETYPE,
-                        gssapi_principal_nametype,
-                        int);
-#endif
-#ifdef ZMQ_HANDSHAKE_IVL
-ZMQ_DEFINE_INTEGRAL_OPT(ZMQ_HANDSHAKE_IVL, handshake_ivl, int);
-#endif
-#ifdef ZMQ_HEARTBEAT_IVL
-ZMQ_DEFINE_INTEGRAL_OPT(ZMQ_HEARTBEAT_IVL, heartbeat_ivl, int);
-#endif
-#ifdef ZMQ_HEARTBEAT_TIMEOUT
-ZMQ_DEFINE_INTEGRAL_OPT(ZMQ_HEARTBEAT_TIMEOUT, heartbeat_timeout, int);
-#endif
-#ifdef ZMQ_HEARTBEAT_TTL
-ZMQ_DEFINE_INTEGRAL_OPT(ZMQ_HEARTBEAT_TTL, heartbeat_ttl, int);
-#endif
-#ifdef ZMQ_IMMEDIATE
-ZMQ_DEFINE_INTEGRAL_BOOL_UNIT_OPT(ZMQ_IMMEDIATE, immediate, int);
-#endif
-#ifdef ZMQ_INVERT_MATCHING
-ZMQ_DEFINE_INTEGRAL_BOOL_UNIT_OPT(ZMQ_INVERT_MATCHING, invert_matching, int);
-#endif
-#ifdef ZMQ_IPV6
-ZMQ_DEFINE_INTEGRAL_BOOL_UNIT_OPT(ZMQ_IPV6, ipv6, int);
-#endif
-#ifdef ZMQ_LAST_ENDPOINT
-ZMQ_DEFINE_ARRAY_OPT(ZMQ_LAST_ENDPOINT, last_endpoint);
-#endif
-#ifdef ZMQ_LINGER
-ZMQ_DEFINE_INTEGRAL_OPT(ZMQ_LINGER, linger, int);
-#endif
-#ifdef ZMQ_MAXMSGSIZE
-ZMQ_DEFINE_INTEGRAL_OPT(ZMQ_MAXMSGSIZE, maxmsgsize, int64_t);
-#endif
-#ifdef ZMQ_MECHANISM
-ZMQ_DEFINE_INTEGRAL_OPT(ZMQ_MECHANISM, mechanism, int);
-#endif
-#ifdef ZMQ_METADATA
-ZMQ_DEFINE_ARRAY_OPT(ZMQ_METADATA, metadata);
-#endif
-#ifdef ZMQ_MULTICAST_HOPS
-ZMQ_DEFINE_INTEGRAL_OPT(ZMQ_MULTICAST_HOPS, multicast_hops, int);
-#endif
-#ifdef ZMQ_MULTICAST_LOOP
-ZMQ_DEFINE_INTEGRAL_BOOL_UNIT_OPT(ZMQ_MULTICAST_LOOP, multicast_loop, int);
-#endif
-#ifdef ZMQ_MULTICAST_MAXTPDU
-ZMQ_DEFINE_INTEGRAL_OPT(ZMQ_MULTICAST_MAXTPDU, multicast_maxtpdu, int);
-#endif
-#ifdef ZMQ_ONLY_FIRST_SUBSCRIBE
-ZMQ_DEFINE_INTEGRAL_BOOL_UNIT_OPT(ZMQ_ONLY_FIRST_SUBSCRIBE, only_first_subscribe, int);
-#endif
-#ifdef ZMQ_PLAIN_SERVER
-ZMQ_DEFINE_INTEGRAL_BOOL_UNIT_OPT(ZMQ_PLAIN_SERVER, plain_server, int);
-#endif
-#ifdef ZMQ_PLAIN_PASSWORD
-ZMQ_DEFINE_ARRAY_OPT(ZMQ_PLAIN_PASSWORD, plain_password);
-#endif
-#ifdef ZMQ_PLAIN_USERNAME
-ZMQ_DEFINE_ARRAY_OPT(ZMQ_PLAIN_USERNAME, plain_username);
-#endif
-#ifdef ZMQ_USE_FD
-ZMQ_DEFINE_INTEGRAL_OPT(ZMQ_USE_FD, use_fd, int);
-#endif
-#ifdef ZMQ_PROBE_ROUTER
-ZMQ_DEFINE_INTEGRAL_BOOL_UNIT_OPT(ZMQ_PROBE_ROUTER, probe_router, int);
-#endif
-#ifdef ZMQ_RATE
-ZMQ_DEFINE_INTEGRAL_OPT(ZMQ_RATE, rate, int);
-#endif
-#ifdef ZMQ_RCVBUF
-ZMQ_DEFINE_INTEGRAL_OPT(ZMQ_RCVBUF, rcvbuf, int);
-#endif
-#ifdef ZMQ_RCVHWM
-ZMQ_DEFINE_INTEGRAL_OPT(ZMQ_RCVHWM, rcvhwm, int);
-#endif
-#ifdef ZMQ_RCVMORE
-ZMQ_DEFINE_INTEGRAL_BOOL_UNIT_OPT(ZMQ_RCVMORE, rcvmore, int);
-#endif
-#ifdef ZMQ_RCVTIMEO
-ZMQ_DEFINE_INTEGRAL_OPT(ZMQ_RCVTIMEO, rcvtimeo, int);
-#endif
-#ifdef ZMQ_RECONNECT_IVL
-ZMQ_DEFINE_INTEGRAL_OPT(ZMQ_RECONNECT_IVL, reconnect_ivl, int);
-#endif
-#ifdef ZMQ_RECONNECT_IVL_MAX
-ZMQ_DEFINE_INTEGRAL_OPT(ZMQ_RECONNECT_IVL_MAX, reconnect_ivl_max, int);
-#endif
-#ifdef ZMQ_RECOVERY_IVL
-ZMQ_DEFINE_INTEGRAL_OPT(ZMQ_RECOVERY_IVL, recovery_ivl, int);
-#endif
-#ifdef ZMQ_REQ_CORRELATE
-ZMQ_DEFINE_INTEGRAL_BOOL_UNIT_OPT(ZMQ_REQ_CORRELATE, req_correlate, int);
-#endif
-#ifdef ZMQ_REQ_RELAXED
-ZMQ_DEFINE_INTEGRAL_BOOL_UNIT_OPT(ZMQ_REQ_RELAXED, req_relaxed, int);
-#endif
-#ifdef ZMQ_ROUTER_HANDOVER
-ZMQ_DEFINE_INTEGRAL_BOOL_UNIT_OPT(ZMQ_ROUTER_HANDOVER, router_handover, int);
-#endif
-#ifdef ZMQ_ROUTER_MANDATORY
-ZMQ_DEFINE_INTEGRAL_BOOL_UNIT_OPT(ZMQ_ROUTER_MANDATORY, router_mandatory, int);
-#endif
-#ifdef ZMQ_ROUTER_NOTIFY
-ZMQ_DEFINE_INTEGRAL_OPT(ZMQ_ROUTER_NOTIFY, router_notify, int);
-#endif
-#ifdef ZMQ_ROUTING_ID
-ZMQ_DEFINE_ARRAY_OPT_BINARY(ZMQ_ROUTING_ID, routing_id);
-#endif
-#ifdef ZMQ_SNDBUF
-ZMQ_DEFINE_INTEGRAL_OPT(ZMQ_SNDBUF, sndbuf, int);
-#endif
-#ifdef ZMQ_SNDHWM
-ZMQ_DEFINE_INTEGRAL_OPT(ZMQ_SNDHWM, sndhwm, int);
-#endif
-#ifdef ZMQ_SNDTIMEO
-ZMQ_DEFINE_INTEGRAL_OPT(ZMQ_SNDTIMEO, sndtimeo, int);
-#endif
-#ifdef ZMQ_SOCKS_PROXY
-ZMQ_DEFINE_ARRAY_OPT(ZMQ_SOCKS_PROXY, socks_proxy);
-#endif
-#ifdef ZMQ_STREAM_NOTIFY
-ZMQ_DEFINE_INTEGRAL_BOOL_UNIT_OPT(ZMQ_STREAM_NOTIFY, stream_notify, int);
-#endif
-#ifdef ZMQ_SUBSCRIBE
-ZMQ_DEFINE_ARRAY_OPT(ZMQ_SUBSCRIBE, subscribe);
-#endif
-#ifdef ZMQ_TCP_KEEPALIVE
-ZMQ_DEFINE_INTEGRAL_OPT(ZMQ_TCP_KEEPALIVE, tcp_keepalive, int);
-#endif
-#ifdef ZMQ_TCP_KEEPALIVE_CNT
-ZMQ_DEFINE_INTEGRAL_OPT(ZMQ_TCP_KEEPALIVE_CNT, tcp_keepalive_cnt, int);
-#endif
-#ifdef ZMQ_TCP_KEEPALIVE_IDLE
-ZMQ_DEFINE_INTEGRAL_OPT(ZMQ_TCP_KEEPALIVE_IDLE, tcp_keepalive_idle, int);
-#endif
-#ifdef ZMQ_TCP_KEEPALIVE_INTVL
-ZMQ_DEFINE_INTEGRAL_OPT(ZMQ_TCP_KEEPALIVE_INTVL, tcp_keepalive_intvl, int);
-#endif
-#ifdef ZMQ_TCP_MAXRT
-ZMQ_DEFINE_INTEGRAL_OPT(ZMQ_TCP_MAXRT, tcp_maxrt, int);
-#endif
-#ifdef ZMQ_THREAD_SAFE
-ZMQ_DEFINE_INTEGRAL_BOOL_UNIT_OPT(ZMQ_THREAD_SAFE, thread_safe, int);
-#endif
-#ifdef ZMQ_TOS
-ZMQ_DEFINE_INTEGRAL_OPT(ZMQ_TOS, tos, int);
-#endif
-#ifdef ZMQ_TYPE
-ZMQ_DEFINE_INTEGRAL_OPT(ZMQ_TYPE, type, int);
-#ifdef ZMQ_CPP11
-ZMQ_DEFINE_INTEGRAL_OPT(ZMQ_TYPE, socket_type, socket_type);
-#endif // ZMQ_CPP11
-#endif // ZMQ_TYPE
-#ifdef ZMQ_UNSUBSCRIBE
-ZMQ_DEFINE_ARRAY_OPT(ZMQ_UNSUBSCRIBE, unsubscribe);
-#endif
-#ifdef ZMQ_VMCI_BUFFER_SIZE
-ZMQ_DEFINE_INTEGRAL_OPT(ZMQ_VMCI_BUFFER_SIZE, vmci_buffer_size, uint64_t);
-#endif
-#ifdef ZMQ_VMCI_BUFFER_MIN_SIZE
-ZMQ_DEFINE_INTEGRAL_OPT(ZMQ_VMCI_BUFFER_MIN_SIZE, vmci_buffer_min_size, uint64_t);
-#endif
-#ifdef ZMQ_VMCI_BUFFER_MAX_SIZE
-ZMQ_DEFINE_INTEGRAL_OPT(ZMQ_VMCI_BUFFER_MAX_SIZE, vmci_buffer_max_size, uint64_t);
-#endif
-#ifdef ZMQ_VMCI_CONNECT_TIMEOUT
-ZMQ_DEFINE_INTEGRAL_OPT(ZMQ_VMCI_CONNECT_TIMEOUT, vmci_connect_timeout, int);
-#endif
-#ifdef ZMQ_XPUB_VERBOSE
-ZMQ_DEFINE_INTEGRAL_BOOL_UNIT_OPT(ZMQ_XPUB_VERBOSE, xpub_verbose, int);
-#endif
-#ifdef ZMQ_XPUB_VERBOSER
-ZMQ_DEFINE_INTEGRAL_BOOL_UNIT_OPT(ZMQ_XPUB_VERBOSER, xpub_verboser, int);
-#endif
-#ifdef ZMQ_XPUB_MANUAL
-ZMQ_DEFINE_INTEGRAL_BOOL_UNIT_OPT(ZMQ_XPUB_MANUAL, xpub_manual, int);
-#endif
-#ifdef ZMQ_XPUB_NODROP
-ZMQ_DEFINE_INTEGRAL_BOOL_UNIT_OPT(ZMQ_XPUB_NODROP, xpub_nodrop, int);
-#endif
-#ifdef ZMQ_XPUB_WELCOME_MSG
-ZMQ_DEFINE_ARRAY_OPT(ZMQ_XPUB_WELCOME_MSG, xpub_welcome_msg);
-#endif
-#ifdef ZMQ_ZAP_ENFORCE_DOMAIN
-ZMQ_DEFINE_INTEGRAL_BOOL_UNIT_OPT(ZMQ_ZAP_ENFORCE_DOMAIN, zap_enforce_domain, int);
-#endif
-#ifdef ZMQ_ZAP_DOMAIN
-ZMQ_DEFINE_ARRAY_OPT(ZMQ_ZAP_DOMAIN, zap_domain);
-#endif
-
-} // namespace sockopt
-#endif // ZMQ_CPP11
-
-
-namespace detail
-{
-class socket_base
-{
-  public:
-    socket_base() ZMQ_NOTHROW : _handle(ZMQ_NULLPTR) {}
-    ZMQ_EXPLICIT socket_base(void *handle) ZMQ_NOTHROW : _handle(handle) {}
-
-    template<typename T>
-    ZMQ_CPP11_DEPRECATED("from 4.7.0, use `set` taking option from zmq::sockopt")
-    void setsockopt(int option_, T const &optval)
-    {
-        setsockopt(option_, &optval, sizeof(T));
-    }
-
-    ZMQ_CPP11_DEPRECATED("from 4.7.0, use `set` taking option from zmq::sockopt")
-    void setsockopt(int option_, const void *optval_, size_t optvallen_)
-    {
-        int rc = zmq_setsockopt(_handle, option_, optval_, optvallen_);
-        if (rc != 0)
-            throw error_t();
-    }
-
-    ZMQ_CPP11_DEPRECATED("from 4.7.0, use `get` taking option from zmq::sockopt")
-    void getsockopt(int option_, void *optval_, size_t *optvallen_) const
-    {
-        int rc = zmq_getsockopt(_handle, option_, optval_, optvallen_);
-        if (rc != 0)
-            throw error_t();
-    }
-
-    template<typename T>
-    ZMQ_CPP11_DEPRECATED("from 4.7.0, use `get` taking option from zmq::sockopt")
-    T getsockopt(int option_) const
-    {
-        T optval;
-        size_t optlen = sizeof(T);
-        getsockopt(option_, &optval, &optlen);
-        return optval;
-    }
-
-#ifdef ZMQ_CPP11
-    // Set integral socket option, e.g.
-    // `socket.set(zmq::sockopt::linger, 0)`
-    template<int Opt, class T, bool BoolUnit>
-    void set(sockopt::integral_option<Opt, T, BoolUnit>, const T &val)
-    {
-        static_assert(std::is_integral<T>::value, "T must be integral");
-        set_option(Opt, &val, sizeof val);
-    }
-
-    // Set integral socket option from boolean, e.g.
-    // `socket.set(zmq::sockopt::immediate, false)`
-    template<int Opt, class T>
-    void set(sockopt::integral_option<Opt, T, true>, bool val)
-    {
-        static_assert(std::is_integral<T>::value, "T must be integral");
-        T rep_val = val;
-        set_option(Opt, &rep_val, sizeof rep_val);
-    }
-
-    // Set array socket option, e.g.
-    // `socket.set(zmq::sockopt::plain_username, "foo123")`
-    template<int Opt, int NullTerm>
-    void set(sockopt::array_option<Opt, NullTerm>, const char *buf)
-    {
-        set_option(Opt, buf, std::strlen(buf));
-    }
-
-    // Set array socket option, e.g.
-    // `socket.set(zmq::sockopt::routing_id, zmq::buffer(id))`
-    template<int Opt, int NullTerm>
-    void set(sockopt::array_option<Opt, NullTerm>, const_buffer buf)
-    {
-        set_option(Opt, buf.data(), buf.size());
-    }
-
-    // Set array socket option, e.g.
-    // `socket.set(zmq::sockopt::routing_id, id_str)`
-    template<int Opt, int NullTerm>
-    void set(sockopt::array_option<Opt, NullTerm>, const std::string &buf)
-    {
-        set_option(Opt, buf.data(), buf.size());
-    }
-
-#if CPPZMQ_HAS_STRING_VIEW
-    // Set array socket option, e.g.
-    // `socket.set(zmq::sockopt::routing_id, id_str)`
-    template<int Opt, int NullTerm>
-    void set(sockopt::array_option<Opt, NullTerm>, std::string_view buf)
-    {
-        set_option(Opt, buf.data(), buf.size());
-    }
-#endif
-
-    // Get scalar socket option, e.g.
-    // `auto opt = socket.get(zmq::sockopt::linger)`
-    template<int Opt, class T, bool BoolUnit>
-    ZMQ_NODISCARD T get(sockopt::integral_option<Opt, T, BoolUnit>) const
-    {
-        static_assert(std::is_scalar<T>::value, "T must be scalar");
-        T val;
-        size_t size = sizeof val;
-        get_option(Opt, &val, &size);
-        assert(size == sizeof val);
-        return val;
-    }
-
-    // Get array socket option, writes to buf, returns option size in bytes, e.g.
-    // `size_t optsize = socket.get(zmq::sockopt::routing_id, zmq::buffer(id))`
-    template<int Opt, int NullTerm>
-    ZMQ_NODISCARD size_t get(sockopt::array_option<Opt, NullTerm>,
-                             mutable_buffer buf) const
-    {
-        size_t size = buf.size();
-        get_option(Opt, buf.data(), &size);
-        return size;
-    }
-
-    // Get array socket option as string (initializes the string buffer size to init_size) e.g.
-    // `auto s = socket.get(zmq::sockopt::routing_id)`
-    // Note: removes the null character from null-terminated string options,
-    // i.e. the string size excludes the null character.
-    template<int Opt, int NullTerm>
-    ZMQ_NODISCARD std::string get(sockopt::array_option<Opt, NullTerm>,
-                                  size_t init_size = 1024) const
-    {
-        if ZMQ_CONSTEXPR_IF (NullTerm == 2) {
-            if (init_size == 1024) {
-                init_size = 41; // get as Z85 string
-            }
-        }
-        std::string str(init_size, '\0');
-        size_t size = get(sockopt::array_option<Opt>{}, buffer(str));
-        if ZMQ_CONSTEXPR_IF (NullTerm == 1) {
-            if (size > 0) {
-                assert(str[size - 1] == '\0');
-                --size;
-            }
-        } else if ZMQ_CONSTEXPR_IF (NullTerm == 2) {
-            assert(size == 32 || size == 41);
-            if (size == 41) {
-                assert(str[size - 1] == '\0');
-                --size;
-            }
-        }
-        str.resize(size);
-        return str;
-    }
-#endif
-
-    void bind(std::string const &addr) { bind(addr.c_str()); }
-
-    void bind(const char *addr_)
-    {
-        int rc = zmq_bind(_handle, addr_);
-        if (rc != 0)
-            throw error_t();
-    }
-
-    void unbind(std::string const &addr) { unbind(addr.c_str()); }
-
-    void unbind(const char *addr_)
-    {
-        int rc = zmq_unbind(_handle, addr_);
-        if (rc != 0)
-            throw error_t();
-    }
-
-    void connect(std::string const &addr) { connect(addr.c_str()); }
-
-    void connect(const char *addr_)
-    {
-        int rc = zmq_connect(_handle, addr_);
-        if (rc != 0)
-            throw error_t();
-    }
-
-    void disconnect(std::string const &addr) { disconnect(addr.c_str()); }
-
-    void disconnect(const char *addr_)
-    {
-        int rc = zmq_disconnect(_handle, addr_);
-        if (rc != 0)
-            throw error_t();
-    }
-
-    ZMQ_DEPRECATED("from 4.7.1, use handle() != nullptr or operator bool")
-    bool connected() const ZMQ_NOTHROW { return (_handle != ZMQ_NULLPTR); }
-
-    ZMQ_CPP11_DEPRECATED("from 4.3.1, use send taking a const_buffer and send_flags")
-    size_t send(const void *buf_, size_t len_, int flags_ = 0)
-    {
-        int nbytes = zmq_send(_handle, buf_, len_, flags_);
-        if (nbytes >= 0)
-            return static_cast<size_t>(nbytes);
-        if (zmq_errno() == EAGAIN)
-            return 0;
-        throw error_t();
-    }
-
-    ZMQ_CPP11_DEPRECATED("from 4.3.1, use send taking message_t and send_flags")
-    bool send(message_t &msg_,
-              int flags_ = 0) // default until removed
-    {
-        int nbytes = zmq_msg_send(msg_.handle(), _handle, flags_);
-        if (nbytes >= 0)
-            return true;
-        if (zmq_errno() == EAGAIN)
-            return false;
-        throw error_t();
-    }
-
-    template<typename T>
-    ZMQ_CPP11_DEPRECATED(
-      "from 4.4.1, use send taking message_t or buffer (for contiguous "
-      "ranges), and send_flags")
-    bool send(T first, T last, int flags_ = 0)
-    {
-        zmq::message_t msg(first, last);
-        int nbytes = zmq_msg_send(msg.handle(), _handle, flags_);
-        if (nbytes >= 0)
-            return true;
-        if (zmq_errno() == EAGAIN)
-            return false;
-        throw error_t();
-    }
-
-#ifdef ZMQ_HAS_RVALUE_REFS
-    ZMQ_CPP11_DEPRECATED("from 4.3.1, use send taking message_t and send_flags")
-    bool send(message_t &&msg_,
-              int flags_ = 0) // default until removed
-    {
-#ifdef ZMQ_CPP11
-        return send(msg_, static_cast<send_flags>(flags_)).has_value();
-#else
-        return send(msg_, flags_);
-#endif
-    }
-#endif
-
-#ifdef ZMQ_CPP11
-    send_result_t send(const_buffer buf, send_flags flags = send_flags::none)
-    {
-        const int nbytes =
-          zmq_send(_handle, buf.data(), buf.size(), static_cast<int>(flags));
-        if (nbytes >= 0)
-            return static_cast<size_t>(nbytes);
-        if (zmq_errno() == EAGAIN)
-            return {};
-        throw error_t();
-    }
-
-    send_result_t send(message_t &msg, send_flags flags)
-    {
-        int nbytes = zmq_msg_send(msg.handle(), _handle, static_cast<int>(flags));
-        if (nbytes >= 0)
-            return static_cast<size_t>(nbytes);
-        if (zmq_errno() == EAGAIN)
-            return {};
-        throw error_t();
-    }
-
-    send_result_t send(message_t &&msg, send_flags flags)
-    {
-        return send(msg, flags);
-    }
-#endif
-
-    ZMQ_CPP11_DEPRECATED(
-      "from 4.3.1, use recv taking a mutable_buffer and recv_flags")
-    size_t recv(void *buf_, size_t len_, int flags_ = 0)
-    {
-        int nbytes = zmq_recv(_handle, buf_, len_, flags_);
-        if (nbytes >= 0)
-            return static_cast<size_t>(nbytes);
-        if (zmq_errno() == EAGAIN)
-            return 0;
-        throw error_t();
-    }
-
-    ZMQ_CPP11_DEPRECATED(
-      "from 4.3.1, use recv taking a reference to message_t and recv_flags")
-    bool recv(message_t *msg_, int flags_ = 0)
-    {
-        int nbytes = zmq_msg_recv(msg_->handle(), _handle, flags_);
-        if (nbytes >= 0)
-            return true;
-        if (zmq_errno() == EAGAIN)
-            return false;
-        throw error_t();
-    }
-
-#ifdef ZMQ_CPP11
-    ZMQ_NODISCARD
-    recv_buffer_result_t recv(mutable_buffer buf,
-                              recv_flags flags = recv_flags::none)
-    {
-        const int nbytes =
-          zmq_recv(_handle, buf.data(), buf.size(), static_cast<int>(flags));
-        if (nbytes >= 0) {
-            return recv_buffer_size{
-              (std::min)(static_cast<size_t>(nbytes), buf.size()),
-              static_cast<size_t>(nbytes)};
-        }
-        if (zmq_errno() == EAGAIN)
-            return {};
-        throw error_t();
-    }
-
-    ZMQ_NODISCARD
-    recv_result_t recv(message_t &msg, recv_flags flags = recv_flags::none)
-    {
-        const int nbytes =
-          zmq_msg_recv(msg.handle(), _handle, static_cast<int>(flags));
-        if (nbytes >= 0) {
-            assert(msg.size() == static_cast<size_t>(nbytes));
-            return static_cast<size_t>(nbytes);
-        }
-        if (zmq_errno() == EAGAIN)
-            return {};
-        throw error_t();
-    }
-#endif
-
-#if defined(ZMQ_BUILD_DRAFT_API) && ZMQ_VERSION >= ZMQ_MAKE_VERSION(4, 2, 0)
-    void join(const char *group)
-    {
-        int rc = zmq_join(_handle, group);
-        if (rc != 0)
-            throw error_t();
-    }
-
-    void leave(const char *group)
-    {
-        int rc = zmq_leave(_handle, group);
-        if (rc != 0)
-            throw error_t();
-    }
-#endif
-
-    ZMQ_NODISCARD void *handle() ZMQ_NOTHROW { return _handle; }
-    ZMQ_NODISCARD const void *handle() const ZMQ_NOTHROW { return _handle; }
-
-    ZMQ_EXPLICIT operator bool() const ZMQ_NOTHROW { return _handle != ZMQ_NULLPTR; }
-    // note: non-const operator bool can be removed once
-    // operator void* is removed from socket_t
-    ZMQ_EXPLICIT operator bool() ZMQ_NOTHROW { return _handle != ZMQ_NULLPTR; }
-
-  protected:
-    void *_handle;
-
-  private:
-    void set_option(int option_, const void *optval_, size_t optvallen_)
-    {
-        int rc = zmq_setsockopt(_handle, option_, optval_, optvallen_);
-        if (rc != 0)
-            throw error_t();
-    }
-
-    void get_option(int option_, void *optval_, size_t *optvallen_) const
-    {
-        int rc = zmq_getsockopt(_handle, option_, optval_, optvallen_);
-        if (rc != 0)
-            throw error_t();
-    }
-};
-} // namespace detail
-
-struct from_handle_t
-{
-    struct _private
-    {
-    }; // disabling use other than with from_handle
-    ZMQ_CONSTEXPR_FN ZMQ_EXPLICIT from_handle_t(_private /*p*/) ZMQ_NOTHROW {}
-};
-
-ZMQ_CONSTEXPR_VAR from_handle_t from_handle =
-  from_handle_t(from_handle_t::_private());
-
-// A non-owning nullable reference to a socket.
-// The reference is invalidated on socket close or destruction.
-class socket_ref : public detail::socket_base
-{
-  public:
-    socket_ref() ZMQ_NOTHROW : detail::socket_base() {}
-#ifdef ZMQ_CPP11
-    socket_ref(std::nullptr_t) ZMQ_NOTHROW : detail::socket_base() {}
-#endif
-    socket_ref(from_handle_t /*fh*/, void *handle) ZMQ_NOTHROW
-        : detail::socket_base(handle)
-    {
-    }
-};
-
-#ifdef ZMQ_CPP11
-inline bool operator==(socket_ref sr, std::nullptr_t /*p*/) ZMQ_NOTHROW
-{
-    return sr.handle() == nullptr;
-}
-inline bool operator==(std::nullptr_t /*p*/, socket_ref sr) ZMQ_NOTHROW
-{
-    return sr.handle() == nullptr;
-}
-inline bool operator!=(socket_ref sr, std::nullptr_t /*p*/) ZMQ_NOTHROW
-{
-    return !(sr == nullptr);
-}
-inline bool operator!=(std::nullptr_t /*p*/, socket_ref sr) ZMQ_NOTHROW
-{
-    return !(sr == nullptr);
-}
-#endif
-
-inline bool operator==(const detail::socket_base& a, const detail::socket_base& b) ZMQ_NOTHROW
-{
-    return std::equal_to<const void *>()(a.handle(), b.handle());
-}
-inline bool operator!=(const detail::socket_base& a, const detail::socket_base& b) ZMQ_NOTHROW
-{
-    return !(a == b);
-}
-inline bool operator<(const detail::socket_base& a, const detail::socket_base& b) ZMQ_NOTHROW
-{
-    return std::less<const void *>()(a.handle(), b.handle());
-}
-inline bool operator>(const detail::socket_base& a, const detail::socket_base& b) ZMQ_NOTHROW
-{
-    return b < a;
-}
-inline bool operator<=(const detail::socket_base& a, const detail::socket_base& b) ZMQ_NOTHROW
-{
-    return !(a > b);
-}
-inline bool operator>=(const detail::socket_base& a, const detail::socket_base& b) ZMQ_NOTHROW
-{
-    return !(a < b);
-}
-
-} // namespace zmq
-
-#ifdef ZMQ_CPP11
-namespace std
-{
-template<> struct hash<zmq::socket_ref>
-{
-    size_t operator()(zmq::socket_ref sr) const ZMQ_NOTHROW
-    {
-        return hash<void *>()(sr.handle());
-    }
-};
-} // namespace std
-#endif
-
-namespace zmq
-{
-class socket_t : public detail::socket_base
-{
-    friend class monitor_t;
-
-  public:
-    socket_t() ZMQ_NOTHROW : detail::socket_base(ZMQ_NULLPTR), ctxptr(ZMQ_NULLPTR) {}
-
-    socket_t(context_t &context_, int type_) :
-        detail::socket_base(zmq_socket(context_.handle(), type_)),
-        ctxptr(context_.handle())
-    {
-        if (_handle == ZMQ_NULLPTR)
-            throw error_t();
-    }
-
-#ifdef ZMQ_CPP11
-    socket_t(context_t &context_, socket_type type_) :
-        socket_t(context_, static_cast<int>(type_))
-    {
-    }
-#endif
-
-#ifdef ZMQ_HAS_RVALUE_REFS
-    socket_t(socket_t &&rhs) ZMQ_NOTHROW : detail::socket_base(rhs._handle),
-                                           ctxptr(rhs.ctxptr)
-    {
-        rhs._handle = ZMQ_NULLPTR;
-        rhs.ctxptr = ZMQ_NULLPTR;
-    }
-    socket_t &operator=(socket_t &&rhs) ZMQ_NOTHROW
-    {
-        close();
-        std::swap(_handle, rhs._handle);
-        std::swap(ctxptr, rhs.ctxptr);
-        return *this;
-    }
-#endif
-
-    ~socket_t() ZMQ_NOTHROW { close(); }
-
-    operator void *() ZMQ_NOTHROW { return _handle; }
-
-    operator void const *() const ZMQ_NOTHROW { return _handle; }
-
-    void close() ZMQ_NOTHROW
-    {
-        if (_handle == ZMQ_NULLPTR)
-            // already closed
-            return;
-        int rc = zmq_close(_handle);
-        ZMQ_ASSERT(rc == 0);
-        _handle = ZMQ_NULLPTR;
-        ctxptr = ZMQ_NULLPTR;
-    }
-
-    void swap(socket_t &other) ZMQ_NOTHROW
-    {
-        std::swap(_handle, other._handle);
-        std::swap(ctxptr, other.ctxptr);
-    }
-
-    operator socket_ref() ZMQ_NOTHROW { return socket_ref(from_handle, _handle); }
-
-  private:
-    void *ctxptr;
-
-    socket_t(const socket_t &) ZMQ_DELETED_FUNCTION;
-    void operator=(const socket_t &) ZMQ_DELETED_FUNCTION;
-
-    // used by monitor_t
-    socket_t(void *context_, int type_) :
-        detail::socket_base(zmq_socket(context_, type_)), ctxptr(context_)
-    {
-        if (_handle == ZMQ_NULLPTR)
-            throw error_t();
-        if (ctxptr == ZMQ_NULLPTR)
-            throw error_t();
-    }
-};
-
-inline void swap(socket_t &a, socket_t &b) ZMQ_NOTHROW
-{
-    a.swap(b);
-}
-
-ZMQ_DEPRECATED("from 4.3.1, use proxy taking socket_t objects")
-inline void proxy(void *frontend, void *backend, void *capture)
-{
-    int rc = zmq_proxy(frontend, backend, capture);
-    if (rc != 0)
-        throw error_t();
-}
-
-inline void
-proxy(socket_ref frontend, socket_ref backend, socket_ref capture = socket_ref())
-{
-    int rc = zmq_proxy(frontend.handle(), backend.handle(), capture.handle());
-    if (rc != 0)
-        throw error_t();
-}
-
-#ifdef ZMQ_HAS_PROXY_STEERABLE
-ZMQ_DEPRECATED("from 4.3.1, use proxy_steerable taking socket_t objects")
-inline void
-proxy_steerable(void *frontend, void *backend, void *capture, void *control)
-{
-    int rc = zmq_proxy_steerable(frontend, backend, capture, control);
-    if (rc != 0)
-        throw error_t();
-}
-
-inline void proxy_steerable(socket_ref frontend,
-                            socket_ref backend,
-                            socket_ref capture,
-                            socket_ref control)
-{
-    int rc = zmq_proxy_steerable(frontend.handle(), backend.handle(),
-                                 capture.handle(), control.handle());
-    if (rc != 0)
-        throw error_t();
-}
-#endif
-
-class monitor_t
-{
-  public:
-    monitor_t() : _socket(), _monitor_socket() {}
-
-    virtual ~monitor_t() { close(); }
-
-#ifdef ZMQ_HAS_RVALUE_REFS
-    monitor_t(monitor_t &&rhs) ZMQ_NOTHROW : _socket(), _monitor_socket()
-    {
-        std::swap(_socket, rhs._socket);
-        std::swap(_monitor_socket, rhs._monitor_socket);
-    }
-
-    monitor_t &operator=(monitor_t &&rhs) ZMQ_NOTHROW
-    {
-        close();
-        _socket = socket_ref();
-        std::swap(_socket, rhs._socket);
-        std::swap(_monitor_socket, rhs._monitor_socket);
-        return *this;
-    }
-#endif
-
-
-    void
-    monitor(socket_t &socket, std::string const &addr, int events = ZMQ_EVENT_ALL)
-    {
-        monitor(socket, addr.c_str(), events);
-    }
-
-    void monitor(socket_t &socket, const char *addr_, int events = ZMQ_EVENT_ALL)
-    {
-        init(socket, addr_, events);
-        while (true) {
-            check_event(-1);
-        }
-    }
-
-    void init(socket_t &socket, std::string const &addr, int events = ZMQ_EVENT_ALL)
-    {
-        init(socket, addr.c_str(), events);
-    }
-
-    void init(socket_t &socket, const char *addr_, int events = ZMQ_EVENT_ALL)
-    {
-        int rc = zmq_socket_monitor(socket.handle(), addr_, events);
-        if (rc != 0)
-            throw error_t();
-
-        _socket = socket;
-        _monitor_socket = socket_t(socket.ctxptr, ZMQ_PAIR);
-        _monitor_socket.connect(addr_);
-
-        on_monitor_started();
-    }
-
-    bool check_event(int timeout = 0)
-    {
-        assert(_monitor_socket);
-
-        zmq::message_t eventMsg;
-
-        zmq::pollitem_t items[] = {
-          {_monitor_socket.handle(), 0, ZMQ_POLLIN, 0},
-        };
-
-        #ifdef ZMQ_CPP11
-        zmq::poll(&items[0], 1, std::chrono::milliseconds(timeout));
-        #else
-        zmq::poll(&items[0], 1, timeout);
-        #endif
-
-        if (items[0].revents & ZMQ_POLLIN) {
-            int rc = zmq_msg_recv(eventMsg.handle(), _monitor_socket.handle(), 0);
-            if (rc == -1 && zmq_errno() == ETERM)
-                return false;
-            assert(rc != -1);
-
-        } else {
-            return false;
-        }
-
-#if ZMQ_VERSION_MAJOR >= 4
-        const char *data = static_cast<const char *>(eventMsg.data());
-        zmq_event_t msgEvent;
-        memcpy(&msgEvent.event, data, sizeof(uint16_t));
-        data += sizeof(uint16_t);
-        memcpy(&msgEvent.value, data, sizeof(int32_t));
-        zmq_event_t *event = &msgEvent;
-#else
-        zmq_event_t *event = static_cast<zmq_event_t *>(eventMsg.data());
-#endif
-
-#ifdef ZMQ_NEW_MONITOR_EVENT_LAYOUT
-        zmq::message_t addrMsg;
-        int rc = zmq_msg_recv(addrMsg.handle(), _monitor_socket.handle(), 0);
-        if (rc == -1 && zmq_errno() == ETERM) {
-            return false;
-        }
-
-        assert(rc != -1);
-        std::string address = addrMsg.to_string();
-#else
-        // Bit of a hack, but all events in the zmq_event_t union have the same layout so this will work for all event types.
-        std::string address = event->data.connected.addr;
-#endif
-
-#ifdef ZMQ_EVENT_MONITOR_STOPPED
-        if (event->event == ZMQ_EVENT_MONITOR_STOPPED) {
-            return false;
-        }
-
-#endif
-
-        switch (event->event) {
-            case ZMQ_EVENT_CONNECTED:
-                on_event_connected(*event, address.c_str());
-                break;
-            case ZMQ_EVENT_CONNECT_DELAYED:
-                on_event_connect_delayed(*event, address.c_str());
-                break;
-            case ZMQ_EVENT_CONNECT_RETRIED:
-                on_event_connect_retried(*event, address.c_str());
-                break;
-            case ZMQ_EVENT_LISTENING:
-                on_event_listening(*event, address.c_str());
-                break;
-            case ZMQ_EVENT_BIND_FAILED:
-                on_event_bind_failed(*event, address.c_str());
-                break;
-            case ZMQ_EVENT_ACCEPTED:
-                on_event_accepted(*event, address.c_str());
-                break;
-            case ZMQ_EVENT_ACCEPT_FAILED:
-                on_event_accept_failed(*event, address.c_str());
-                break;
-            case ZMQ_EVENT_CLOSED:
-                on_event_closed(*event, address.c_str());
-                break;
-            case ZMQ_EVENT_CLOSE_FAILED:
-                on_event_close_failed(*event, address.c_str());
-                break;
-            case ZMQ_EVENT_DISCONNECTED:
-                on_event_disconnected(*event, address.c_str());
-                break;
-#if ZMQ_VERSION >= ZMQ_MAKE_VERSION(4, 3, 0) || (defined(ZMQ_BUILD_DRAFT_API) && ZMQ_VERSION >= ZMQ_MAKE_VERSION(4, 2, 3))
-            case ZMQ_EVENT_HANDSHAKE_FAILED_NO_DETAIL:
-                on_event_handshake_failed_no_detail(*event, address.c_str());
-                break;
-            case ZMQ_EVENT_HANDSHAKE_FAILED_PROTOCOL:
-                on_event_handshake_failed_protocol(*event, address.c_str());
-                break;
-            case ZMQ_EVENT_HANDSHAKE_FAILED_AUTH:
-                on_event_handshake_failed_auth(*event, address.c_str());
-                break;
-            case ZMQ_EVENT_HANDSHAKE_SUCCEEDED:
-                on_event_handshake_succeeded(*event, address.c_str());
-                break;
-#elif defined(ZMQ_BUILD_DRAFT_API) && ZMQ_VERSION >= ZMQ_MAKE_VERSION(4, 2, 1)
-            case ZMQ_EVENT_HANDSHAKE_FAILED:
-                on_event_handshake_failed(*event, address.c_str());
-                break;
-            case ZMQ_EVENT_HANDSHAKE_SUCCEED:
-                on_event_handshake_succeed(*event, address.c_str());
-                break;
-#endif
-            default:
-                on_event_unknown(*event, address.c_str());
-                break;
-        }
-
-        return true;
-    }
-
-#ifdef ZMQ_EVENT_MONITOR_STOPPED
-    void abort()
-    {
-        if (_socket)
-            zmq_socket_monitor(_socket.handle(), ZMQ_NULLPTR, 0);
-
-        _socket = socket_ref();
-    }
-#endif
-    virtual void on_monitor_started() {}
-    virtual void on_event_connected(const zmq_event_t &event_, const char *addr_)
-    {
-        (void) event_;
-        (void) addr_;
-    }
-    virtual void on_event_connect_delayed(const zmq_event_t &event_,
-                                          const char *addr_)
-    {
-        (void) event_;
-        (void) addr_;
-    }
-    virtual void on_event_connect_retried(const zmq_event_t &event_,
-                                          const char *addr_)
-    {
-        (void) event_;
-        (void) addr_;
-    }
-    virtual void on_event_listening(const zmq_event_t &event_, const char *addr_)
-    {
-        (void) event_;
-        (void) addr_;
-    }
-    virtual void on_event_bind_failed(const zmq_event_t &event_, const char *addr_)
-    {
-        (void) event_;
-        (void) addr_;
-    }
-    virtual void on_event_accepted(const zmq_event_t &event_, const char *addr_)
-    {
-        (void) event_;
-        (void) addr_;
-    }
-    virtual void on_event_accept_failed(const zmq_event_t &event_, const char *addr_)
-    {
-        (void) event_;
-        (void) addr_;
-    }
-    virtual void on_event_closed(const zmq_event_t &event_, const char *addr_)
-    {
-        (void) event_;
-        (void) addr_;
-    }
-    virtual void on_event_close_failed(const zmq_event_t &event_, const char *addr_)
-    {
-        (void) event_;
-        (void) addr_;
-    }
-    virtual void on_event_disconnected(const zmq_event_t &event_, const char *addr_)
-    {
-        (void) event_;
-        (void) addr_;
-    }
-#if ZMQ_VERSION >= ZMQ_MAKE_VERSION(4, 2, 3)
-    virtual void on_event_handshake_failed_no_detail(const zmq_event_t &event_,
-                                                     const char *addr_)
-    {
-        (void) event_;
-        (void) addr_;
-    }
-    virtual void on_event_handshake_failed_protocol(const zmq_event_t &event_,
-                                                    const char *addr_)
-    {
-        (void) event_;
-        (void) addr_;
-    }
-    virtual void on_event_handshake_failed_auth(const zmq_event_t &event_,
-                                                const char *addr_)
-    {
-        (void) event_;
-        (void) addr_;
-    }
-    virtual void on_event_handshake_succeeded(const zmq_event_t &event_,
-                                              const char *addr_)
-    {
-        (void) event_;
-        (void) addr_;
-    }
-#elif ZMQ_VERSION >= ZMQ_MAKE_VERSION(4, 2, 1)
-    virtual void on_event_handshake_failed(const zmq_event_t &event_,
-                                           const char *addr_)
-    {
-        (void) event_;
-        (void) addr_;
-    }
-    virtual void on_event_handshake_succeed(const zmq_event_t &event_,
-                                            const char *addr_)
-    {
-        (void) event_;
-        (void) addr_;
-    }
-#endif
-    virtual void on_event_unknown(const zmq_event_t &event_, const char *addr_)
-    {
-        (void) event_;
-        (void) addr_;
-    }
-
-  private:
-    monitor_t(const monitor_t &) ZMQ_DELETED_FUNCTION;
-    void operator=(const monitor_t &) ZMQ_DELETED_FUNCTION;
-
-    socket_ref _socket;
-    socket_t _monitor_socket;
-
-    void close() ZMQ_NOTHROW
-    {
-        if (_socket)
-            zmq_socket_monitor(_socket.handle(), ZMQ_NULLPTR, 0);
-        _monitor_socket.close();
-    }
-};
-
-#if defined(ZMQ_BUILD_DRAFT_API) && defined(ZMQ_CPP11) && defined(ZMQ_HAVE_POLLER)
-
-// polling events
-enum class event_flags : short
-{
-    none = 0,
-    pollin = ZMQ_POLLIN,
-    pollout = ZMQ_POLLOUT,
-    pollerr = ZMQ_POLLERR,
-    pollpri = ZMQ_POLLPRI
-};
-
-constexpr event_flags operator|(event_flags a, event_flags b) noexcept
-{
-    return detail::enum_bit_or(a, b);
-}
-constexpr event_flags operator&(event_flags a, event_flags b) noexcept
-{
-    return detail::enum_bit_and(a, b);
-}
-constexpr event_flags operator^(event_flags a, event_flags b) noexcept
-{
-    return detail::enum_bit_xor(a, b);
-}
-constexpr event_flags operator~(event_flags a) noexcept
-{
-    return detail::enum_bit_not(a);
-}
-
-struct no_user_data;
-
-// layout compatible with zmq_poller_event_t
-template<class T = no_user_data> struct poller_event
-{
-    socket_ref socket;
-    ::zmq::fd_t fd;
-    T *user_data;
-    event_flags events;
-};
-
-template<typename T = no_user_data> class poller_t
-{
-  public:
-    using event_type = poller_event<T>;
-
-    poller_t() : poller_ptr(zmq_poller_new())
-    {
-        if (!poller_ptr)
-            throw error_t();
-    }
-
-    template<
-      typename Dummy = void,
-      typename =
-        typename std::enable_if<!std::is_same<T, no_user_data>::value, Dummy>::type>
-    void add(zmq::socket_ref socket, event_flags events, T *user_data)
-    {
-        add_impl(socket, events, user_data);
-    }
-
-    void add(zmq::socket_ref socket, event_flags events)
-    {
-        add_impl(socket, events, nullptr);
-    }
-
-    void remove(zmq::socket_ref socket)
-    {
-        if (0 != zmq_poller_remove(poller_ptr.get(), socket.handle())) {
-            throw error_t();
-        }
-    }
-
-    void modify(zmq::socket_ref socket, event_flags events)
-    {
-        if (0
-            != zmq_poller_modify(poller_ptr.get(), socket.handle(),
-                                 static_cast<short>(events))) {
-            throw error_t();
-        }
-    }
-
-    size_t wait_all(std::vector<event_type> &poller_events,
-                    const std::chrono::milliseconds timeout)
-    {
-        int rc = zmq_poller_wait_all(
-          poller_ptr.get(),
-          reinterpret_cast<zmq_poller_event_t *>(poller_events.data()),
-          static_cast<int>(poller_events.size()),
-          static_cast<long>(timeout.count()));
-        if (rc > 0)
-            return static_cast<size_t>(rc);
-
-#if ZMQ_VERSION >= ZMQ_MAKE_VERSION(4, 2, 3)
-        if (zmq_errno() == EAGAIN)
-#else
-        if (zmq_errno() == ETIMEDOUT)
-#endif
-            return 0;
-
-        throw error_t();
-    }
-
-#if ZMQ_VERSION >= ZMQ_MAKE_VERSION(4, 3, 3)
-    size_t size() const noexcept
-    {
-        int rc = zmq_poller_size(const_cast<void *>(poller_ptr.get()));
-        ZMQ_ASSERT(rc >= 0);
-        return static_cast<size_t>(std::max(rc, 0));
-    }
-#endif
-
-  private:
-    struct destroy_poller_t
-    {
-        void operator()(void *ptr) noexcept
-        {
-            int rc = zmq_poller_destroy(&ptr);
-            ZMQ_ASSERT(rc == 0);
-        }
-    };
-
-    std::unique_ptr<void, destroy_poller_t> poller_ptr;
-
-    void add_impl(zmq::socket_ref socket, event_flags events, T *user_data)
-    {
-        if (0
-            != zmq_poller_add(poller_ptr.get(), socket.handle(), user_data,
-                              static_cast<short>(events))) {
-            throw error_t();
-        }
-    }
-};
-#endif //  defined(ZMQ_BUILD_DRAFT_API) && defined(ZMQ_CPP11) && defined(ZMQ_HAVE_POLLER)
-
-inline std::ostream &operator<<(std::ostream &os, const message_t &msg)
-{
-    return os << msg.str();
-}
-
-} // namespace zmq
-
-#endif // __ZMQ_HPP_INCLUDED__
diff --git a/libs/cppzmq/zmq_addon.hpp b/libs/cppzmq/zmq_addon.hpp
deleted file mode 100644
index 958eec5..0000000
--- a/libs/cppzmq/zmq_addon.hpp
+++ /dev/null
@@ -1,753 +0,0 @@
-/*
-    Copyright (c) 2016-2017 ZeroMQ community
-    Copyright (c) 2016 VOCA AS / Harald Nøkland
-
-    Permission is hereby granted, free of charge, to any person obtaining a copy
-    of this software and associated documentation files (the "Software"), to
-    deal in the Software without restriction, including without limitation the
-    rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-    sell copies of the Software, and to permit persons to whom the Software is
-    furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be included in
-    all copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-    IN THE SOFTWARE.
-*/
-
-#ifndef __ZMQ_ADDON_HPP_INCLUDED__
-#define __ZMQ_ADDON_HPP_INCLUDED__
-
-#include "zmq.hpp"
-
-#include <deque>
-#include <iomanip>
-#include <sstream>
-#include <stdexcept>
-#ifdef ZMQ_CPP11
-#include <limits>
-#include <functional>
-#include <unordered_map>
-#endif
-
-namespace zmq
-{
-#ifdef ZMQ_CPP11
-
-namespace detail
-{
-template<bool CheckN, class OutputIt>
-recv_result_t
-recv_multipart_n(socket_ref s, OutputIt out, size_t n, recv_flags flags)
-{
-    size_t msg_count = 0;
-    message_t msg;
-    while (true) {
-        if ZMQ_CONSTEXPR_IF (CheckN) {
-            if (msg_count >= n)
-                throw std::runtime_error(
-                  "Too many message parts in recv_multipart_n");
-        }
-        if (!s.recv(msg, flags)) {
-            // zmq ensures atomic delivery of messages
-            assert(msg_count == 0);
-            return {};
-        }
-        ++msg_count;
-        const bool more = msg.more();
-        *out++ = std::move(msg);
-        if (!more)
-            break;
-    }
-    return msg_count;
-}
-
-inline bool is_little_endian()
-{
-    const uint16_t i = 0x01;
-    return *reinterpret_cast<const uint8_t *>(&i) == 0x01;
-}
-
-inline void write_network_order(unsigned char *buf, const uint32_t value)
-{
-    if (is_little_endian()) {
-        ZMQ_CONSTEXPR_VAR uint32_t mask = (std::numeric_limits<std::uint8_t>::max)();
-        *buf++ = static_cast<unsigned char>((value >> 24) & mask);
-        *buf++ = static_cast<unsigned char>((value >> 16) & mask);
-        *buf++ = static_cast<unsigned char>((value >> 8) & mask);
-        *buf++ = static_cast<unsigned char>(value & mask);
-    } else {
-        std::memcpy(buf, &value, sizeof(value));
-    }
-}
-
-inline uint32_t read_u32_network_order(const unsigned char *buf)
-{
-    if (is_little_endian()) {
-        return (static_cast<uint32_t>(buf[0]) << 24)
-               + (static_cast<uint32_t>(buf[1]) << 16)
-               + (static_cast<uint32_t>(buf[2]) << 8)
-               + static_cast<uint32_t>(buf[3]);
-    } else {
-        uint32_t value;
-        std::memcpy(&value, buf, sizeof(value));
-        return value;
-    }
-}
-} // namespace detail
-
-/*  Receive a multipart message.
-    
-    Writes the zmq::message_t objects to OutputIterator out.
-    The out iterator must handle an unspecified number of writes,
-    e.g. by using std::back_inserter.
-    
-    Returns: the number of messages received or nullopt (on EAGAIN).
-    Throws: if recv throws. Any exceptions thrown
-    by the out iterator will be propagated and the message
-    may have been only partially received with pending
-    message parts. It is adviced to close this socket in that event.
-*/
-template<class OutputIt>
-ZMQ_NODISCARD recv_result_t recv_multipart(socket_ref s,
-                                           OutputIt out,
-                                           recv_flags flags = recv_flags::none)
-{
-    return detail::recv_multipart_n<false>(s, std::move(out), 0, flags);
-}
-
-/*  Receive a multipart message.
-    
-    Writes at most n zmq::message_t objects to OutputIterator out.
-    If the number of message parts of the incoming message exceeds n
-    then an exception will be thrown.
-    
-    Returns: the number of messages received or nullopt (on EAGAIN).
-    Throws: if recv throws. Throws std::runtime_error if the number
-    of message parts exceeds n (exactly n messages will have been written
-    to out). Any exceptions thrown
-    by the out iterator will be propagated and the message
-    may have been only partially received with pending
-    message parts. It is adviced to close this socket in that event.
-*/
-template<class OutputIt>
-ZMQ_NODISCARD recv_result_t recv_multipart_n(socket_ref s,
-                                             OutputIt out,
-                                             size_t n,
-                                             recv_flags flags = recv_flags::none)
-{
-    return detail::recv_multipart_n<true>(s, std::move(out), n, flags);
-}
-
-/*  Send a multipart message.
-    
-    The range must be a ForwardRange of zmq::message_t,
-    zmq::const_buffer or zmq::mutable_buffer.
-    The flags may be zmq::send_flags::sndmore if there are 
-    more message parts to be sent after the call to this function.
-    
-    Returns: the number of messages sent (exactly msgs.size()) or nullopt (on EAGAIN).
-    Throws: if send throws. Any exceptions thrown
-    by the msgs range will be propagated and the message
-    may have been only partially sent. It is adviced to close this socket in that event.
-*/
-template<class Range
-#ifndef ZMQ_CPP11_PARTIAL
-         ,
-         typename = typename std::enable_if<
-           detail::is_range<Range>::value
-           && (std::is_same<detail::range_value_t<Range>, message_t>::value
-               || detail::is_buffer<detail::range_value_t<Range>>::value)>::type
-#endif
-         >
-send_result_t
-send_multipart(socket_ref s, Range &&msgs, send_flags flags = send_flags::none)
-{
-    using std::begin;
-    using std::end;
-    auto it = begin(msgs);
-    const auto end_it = end(msgs);
-    size_t msg_count = 0;
-    while (it != end_it) {
-        const auto next = std::next(it);
-        const auto msg_flags =
-          flags | (next == end_it ? send_flags::none : send_flags::sndmore);
-        if (!s.send(*it, msg_flags)) {
-            // zmq ensures atomic delivery of messages
-            assert(it == begin(msgs));
-            return {};
-        }
-        ++msg_count;
-        it = next;
-    }
-    return msg_count;
-}
-
-/* Encode a multipart message.
-
-   The range must be a ForwardRange of zmq::message_t.  A
-   zmq::multipart_t or STL container may be passed for encoding.
-
-   Returns: a zmq::message_t holding the encoded multipart data.
-
-   Throws: std::range_error is thrown if the size of any single part
-   can not fit in an unsigned 32 bit integer.
-
-   The encoding is compatible with that used by the CZMQ function
-   zmsg_encode(), see https://rfc.zeromq.org/spec/50/.
-   Each part consists of a size followed by the data.
-   These are placed contiguously into the output message.  A part of
-   size less than 255 bytes will have a single byte size value.
-   Larger parts will have a five byte size value with the first byte
-   set to 0xFF and the remaining four bytes holding the size of the
-   part's data.
-*/
-template<class Range
-#ifndef ZMQ_CPP11_PARTIAL
-         ,
-         typename = typename std::enable_if<
-           detail::is_range<Range>::value
-           && (std::is_same<detail::range_value_t<Range>, message_t>::value
-               || detail::is_buffer<detail::range_value_t<Range>>::value)>::type
-#endif
-         >
-message_t encode(const Range &parts)
-{
-    size_t mmsg_size = 0;
-
-    // First pass check sizes
-    for (const auto &part : parts) {
-        const size_t part_size = part.size();
-        if (part_size > (std::numeric_limits<std::uint32_t>::max)()) {
-            // Size value must fit into uint32_t.
-            throw std::range_error("Invalid size, message part too large");
-        }
-        const size_t count_size =
-          part_size < (std::numeric_limits<std::uint8_t>::max)() ? 1 : 5;
-        mmsg_size += part_size + count_size;
-    }
-
-    message_t encoded(mmsg_size);
-    unsigned char *buf = encoded.data<unsigned char>();
-    for (const auto &part : parts) {
-        const uint32_t part_size = static_cast<uint32_t>(part.size());
-        const unsigned char *part_data =
-          static_cast<const unsigned char *>(part.data());
-
-        if (part_size < (std::numeric_limits<std::uint8_t>::max)()) {
-            // small part
-            *buf++ = (unsigned char) part_size;
-        } else {
-            // big part
-            *buf++ = (std::numeric_limits<uint8_t>::max)();
-            detail::write_network_order(buf, part_size);
-            buf += sizeof(part_size);
-        }
-        std::memcpy(buf, part_data, part_size);
-        buf += part_size;
-    }
-
-    assert(static_cast<size_t>(buf - encoded.data<unsigned char>()) == mmsg_size);
-    return encoded;
-}
-
-/*  Decode an encoded message to multiple parts.
-
-    The given output iterator must be a ForwardIterator to a container
-    holding zmq::message_t such as a zmq::multipart_t or various STL
-    containers.
-
-    Returns the ForwardIterator advanced once past the last decoded
-    part.
-
-    Throws: a std::out_of_range is thrown if the encoded part sizes
-    lead to exceeding the message data bounds.
-
-    The decoding assumes the message is encoded in the manner
-    performed by zmq::encode(), see https://rfc.zeromq.org/spec/50/.
- */
-template<class OutputIt> OutputIt decode(const message_t &encoded, OutputIt out)
-{
-    const unsigned char *source = encoded.data<unsigned char>();
-    const unsigned char *const limit = source + encoded.size();
-
-    while (source < limit) {
-        size_t part_size = *source++;
-        if (part_size == (std::numeric_limits<std::uint8_t>::max)()) {
-            if (static_cast<size_t>(limit - source) < sizeof(uint32_t)) {
-                throw std::out_of_range(
-                  "Malformed encoding, overflow in reading size");
-            }
-            part_size = detail::read_u32_network_order(source);
-            // the part size is allowed to be less than 0xFF
-            source += sizeof(uint32_t);
-        }
-
-        if (static_cast<size_t>(limit - source) < part_size) {
-            throw std::out_of_range("Malformed encoding, overflow in reading part");
-        }
-        *out = message_t(source, part_size);
-        ++out;
-        source += part_size;
-    }
-
-    assert(source == limit);
-    return out;
-}
-
-#endif
-
-
-#ifdef ZMQ_HAS_RVALUE_REFS
-
-/*
-    This class handles multipart messaging. It is the C++ equivalent of zmsg.h,
-    which is part of CZMQ (the high-level C binding). Furthermore, it is a major
-    improvement compared to zmsg.hpp, which is part of the examples in the ØMQ
-    Guide. Unnecessary copying is avoided by using move semantics to efficiently
-    add/remove parts.
-*/
-class multipart_t
-{
-  private:
-    std::deque<message_t> m_parts;
-
-  public:
-    typedef std::deque<message_t>::value_type value_type;
-
-    typedef std::deque<message_t>::iterator iterator;
-    typedef std::deque<message_t>::const_iterator const_iterator;
-
-    typedef std::deque<message_t>::reverse_iterator reverse_iterator;
-    typedef std::deque<message_t>::const_reverse_iterator const_reverse_iterator;
-
-    // Default constructor
-    multipart_t() {}
-
-    // Construct from socket receive
-    multipart_t(socket_ref socket) { recv(socket); }
-
-    // Construct from memory block
-    multipart_t(const void *src, size_t size) { addmem(src, size); }
-
-    // Construct from string
-    multipart_t(const std::string &string) { addstr(string); }
-
-    // Construct from message part
-    multipart_t(message_t &&message) { add(std::move(message)); }
-
-    // Move constructor
-    multipart_t(multipart_t &&other) ZMQ_NOTHROW { m_parts = std::move(other.m_parts); }
-
-    // Move assignment operator
-    multipart_t &operator=(multipart_t &&other) ZMQ_NOTHROW
-    {
-        m_parts = std::move(other.m_parts);
-        return *this;
-    }
-
-    // Destructor
-    virtual ~multipart_t() { clear(); }
-
-    message_t &operator[](size_t n) { return m_parts[n]; }
-
-    const message_t &operator[](size_t n) const { return m_parts[n]; }
-
-    message_t &at(size_t n) { return m_parts.at(n); }
-
-    const message_t &at(size_t n) const { return m_parts.at(n); }
-
-    iterator begin() { return m_parts.begin(); }
-
-    const_iterator begin() const { return m_parts.begin(); }
-
-    const_iterator cbegin() const { return m_parts.cbegin(); }
-
-    reverse_iterator rbegin() { return m_parts.rbegin(); }
-
-    const_reverse_iterator rbegin() const { return m_parts.rbegin(); }
-
-    iterator end() { return m_parts.end(); }
-
-    const_iterator end() const { return m_parts.end(); }
-
-    const_iterator cend() const { return m_parts.cend(); }
-
-    reverse_iterator rend() { return m_parts.rend(); }
-
-    const_reverse_iterator rend() const { return m_parts.rend(); }
-
-    // Delete all parts
-    void clear() { m_parts.clear(); }
-
-    // Get number of parts
-    size_t size() const { return m_parts.size(); }
-
-    // Check if number of parts is zero
-    bool empty() const { return m_parts.empty(); }
-
-    // Receive multipart message from socket
-    bool recv(socket_ref socket, int flags = 0)
-    {
-        clear();
-        bool more = true;
-        while (more) {
-            message_t message;
-#ifdef ZMQ_CPP11
-            if (!socket.recv(message, static_cast<recv_flags>(flags)))
-                return false;
-#else
-            if (!socket.recv(&message, flags))
-                return false;
-#endif
-            more = message.more();
-            add(std::move(message));
-        }
-        return true;
-    }
-
-    // Send multipart message to socket
-    bool send(socket_ref socket, int flags = 0)
-    {
-        flags &= ~(ZMQ_SNDMORE);
-        bool more = size() > 0;
-        while (more) {
-            message_t message = pop();
-            more = size() > 0;
-#ifdef ZMQ_CPP11
-            if (!socket.send(message, static_cast<send_flags>(
-                                        (more ? ZMQ_SNDMORE : 0) | flags)))
-                return false;
-#else
-            if (!socket.send(message, (more ? ZMQ_SNDMORE : 0) | flags))
-                return false;
-#endif
-        }
-        clear();
-        return true;
-    }
-
-    // Concatenate other multipart to front
-    void prepend(multipart_t &&other)
-    {
-        while (!other.empty())
-            push(other.remove());
-    }
-
-    // Concatenate other multipart to back
-    void append(multipart_t &&other)
-    {
-        while (!other.empty())
-            add(other.pop());
-    }
-
-    // Push memory block to front
-    void pushmem(const void *src, size_t size)
-    {
-        m_parts.push_front(message_t(src, size));
-    }
-
-    // Push memory block to back
-    void addmem(const void *src, size_t size)
-    {
-        m_parts.push_back(message_t(src, size));
-    }
-
-    // Push string to front
-    void pushstr(const std::string &string)
-    {
-        m_parts.push_front(message_t(string.data(), string.size()));
-    }
-
-    // Push string to back
-    void addstr(const std::string &string)
-    {
-        m_parts.push_back(message_t(string.data(), string.size()));
-    }
-
-    // Push type (fixed-size) to front
-    template<typename T> void pushtyp(const T &type)
-    {
-        static_assert(!std::is_same<T, std::string>::value,
-                      "Use pushstr() instead of pushtyp<std::string>()");
-        m_parts.push_front(message_t(&type, sizeof(type)));
-    }
-
-    // Push type (fixed-size) to back
-    template<typename T> void addtyp(const T &type)
-    {
-        static_assert(!std::is_same<T, std::string>::value,
-                      "Use addstr() instead of addtyp<std::string>()");
-        m_parts.push_back(message_t(&type, sizeof(type)));
-    }
-
-    // Push message part to front
-    void push(message_t &&message) { m_parts.push_front(std::move(message)); }
-
-    // Push message part to back
-    void add(message_t &&message) { m_parts.push_back(std::move(message)); }
-
-    // Alias to allow std::back_inserter()
-    void push_back(message_t &&message) { m_parts.push_back(std::move(message)); }
-
-    // Pop string from front
-    std::string popstr()
-    {
-        std::string string(m_parts.front().data<char>(), m_parts.front().size());
-        m_parts.pop_front();
-        return string;
-    }
-
-    // Pop type (fixed-size) from front
-    template<typename T> T poptyp()
-    {
-        static_assert(!std::is_same<T, std::string>::value,
-                      "Use popstr() instead of poptyp<std::string>()");
-        if (sizeof(T) != m_parts.front().size())
-            throw std::runtime_error(
-              "Invalid type, size does not match the message size");
-        T type = *m_parts.front().data<T>();
-        m_parts.pop_front();
-        return type;
-    }
-
-    // Pop message part from front
-    message_t pop()
-    {
-        message_t message = std::move(m_parts.front());
-        m_parts.pop_front();
-        return message;
-    }
-
-    // Pop message part from back
-    message_t remove()
-    {
-        message_t message = std::move(m_parts.back());
-        m_parts.pop_back();
-        return message;
-    }
-
-    // get message part from front
-    const message_t &front() { return m_parts.front(); }
-
-    // get message part from back
-    const message_t &back() { return m_parts.back(); }
-
-    // Get pointer to a specific message part
-    const message_t *peek(size_t index) const { return &m_parts[index]; }
-
-    // Get a string copy of a specific message part
-    std::string peekstr(size_t index) const
-    {
-        std::string string(m_parts[index].data<char>(), m_parts[index].size());
-        return string;
-    }
-
-    // Peek type (fixed-size) from front
-    template<typename T> T peektyp(size_t index) const
-    {
-        static_assert(!std::is_same<T, std::string>::value,
-                      "Use peekstr() instead of peektyp<std::string>()");
-        if (sizeof(T) != m_parts[index].size())
-            throw std::runtime_error(
-              "Invalid type, size does not match the message size");
-        T type = *m_parts[index].data<T>();
-        return type;
-    }
-
-    // Create multipart from type (fixed-size)
-    template<typename T> static multipart_t create(const T &type)
-    {
-        multipart_t multipart;
-        multipart.addtyp(type);
-        return multipart;
-    }
-
-    // Copy multipart
-    multipart_t clone() const
-    {
-        multipart_t multipart;
-        for (size_t i = 0; i < size(); i++)
-            multipart.addmem(m_parts[i].data(), m_parts[i].size());
-        return multipart;
-    }
-
-    // Dump content to string
-    std::string str() const
-    {
-        std::stringstream ss;
-        for (size_t i = 0; i < m_parts.size(); i++) {
-            const unsigned char *data = m_parts[i].data<unsigned char>();
-            size_t size = m_parts[i].size();
-
-            // Dump the message as text or binary
-            bool isText = true;
-            for (size_t j = 0; j < size; j++) {
-                if (data[j] < 32 || data[j] > 127) {
-                    isText = false;
-                    break;
-                }
-            }
-            ss << "\n[" << std::dec << std::setw(3) << std::setfill('0') << size
-               << "] ";
-            if (size >= 1000) {
-                ss << "... (too big to print)";
-                continue;
-            }
-            for (size_t j = 0; j < size; j++) {
-                if (isText)
-                    ss << static_cast<char>(data[j]);
-                else
-                    ss << std::hex << std::setw(2) << std::setfill('0')
-                       << static_cast<short>(data[j]);
-            }
-        }
-        return ss.str();
-    }
-
-    // Check if equal to other multipart
-    bool equal(const multipart_t *other) const ZMQ_NOTHROW
-    {
-        return *this == *other;
-    }
-
-    bool operator==(const multipart_t &other) const ZMQ_NOTHROW
-    {
-        if (size() != other.size())
-            return false;
-        for (size_t i = 0; i < size(); i++)
-            if (at(i) != other.at(i))
-                return false;
-        return true;
-    }
-
-    bool operator!=(const multipart_t &other) const ZMQ_NOTHROW
-    {
-        return !(*this == other);
-    }
-
-#ifdef ZMQ_CPP11
-
-    // Return single part message_t encoded from this multipart_t.
-    message_t encode() const { return zmq::encode(*this); }
-
-    // Decode encoded message into multiple parts and append to self.
-    void decode_append(const message_t &encoded)
-    {
-        zmq::decode(encoded, std::back_inserter(*this));
-    }
-
-    // Return a new multipart_t containing the decoded message_t.
-    static multipart_t decode(const message_t &encoded)
-    {
-        multipart_t tmp;
-        zmq::decode(encoded, std::back_inserter(tmp));
-        return tmp;
-    }
-
-#endif
-
-  private:
-    // Disable implicit copying (moving is more efficient)
-    multipart_t(const multipart_t &other) ZMQ_DELETED_FUNCTION;
-    void operator=(const multipart_t &other) ZMQ_DELETED_FUNCTION;
-}; // class multipart_t
-
-inline std::ostream &operator<<(std::ostream &os, const multipart_t &msg)
-{
-    return os << msg.str();
-}
-
-#endif // ZMQ_HAS_RVALUE_REFS
-
-#if defined(ZMQ_BUILD_DRAFT_API) && defined(ZMQ_CPP11) && defined(ZMQ_HAVE_POLLER)
-class active_poller_t
-{
-  public:
-    active_poller_t() = default;
-    ~active_poller_t() = default;
-
-    active_poller_t(const active_poller_t &) = delete;
-    active_poller_t &operator=(const active_poller_t &) = delete;
-
-    active_poller_t(active_poller_t &&src) = default;
-    active_poller_t &operator=(active_poller_t &&src) = default;
-
-    using handler_type = std::function<void(event_flags)>;
-
-    void add(zmq::socket_ref socket, event_flags events, handler_type handler)
-    {
-        if (!handler)
-            throw std::invalid_argument("null handler in active_poller_t::add");
-        auto ret = handlers.emplace(
-          socket, std::make_shared<handler_type>(std::move(handler)));
-        if (!ret.second)
-            throw error_t(EINVAL); // already added
-        try {
-            base_poller.add(socket, events, ret.first->second.get());
-            need_rebuild = true;
-        }
-        catch (...) {
-            // rollback
-            handlers.erase(socket);
-            throw;
-        }
-    }
-
-    void remove(zmq::socket_ref socket)
-    {
-        base_poller.remove(socket);
-        handlers.erase(socket);
-        need_rebuild = true;
-    }
-
-    void modify(zmq::socket_ref socket, event_flags events)
-    {
-        base_poller.modify(socket, events);
-    }
-
-    size_t wait(std::chrono::milliseconds timeout)
-    {
-        if (need_rebuild) {
-            poller_events.resize(handlers.size());
-            poller_handlers.clear();
-            poller_handlers.reserve(handlers.size());
-            for (const auto &handler : handlers) {
-                poller_handlers.push_back(handler.second);
-            }
-            need_rebuild = false;
-        }
-        const auto count = base_poller.wait_all(poller_events, timeout);
-        std::for_each(poller_events.begin(),
-                      poller_events.begin() + static_cast<ptrdiff_t>(count),
-                      [](decltype(base_poller)::event_type &event) {
-                          assert(event.user_data != nullptr);
-                          (*event.user_data)(event.events);
-                      });
-        return count;
-    }
-
-    ZMQ_NODISCARD bool empty() const noexcept { return handlers.empty(); }
-
-    size_t size() const noexcept { return handlers.size(); }
-
-  private:
-    bool need_rebuild{false};
-
-    poller_t<handler_type> base_poller{};
-    std::unordered_map<socket_ref, std::shared_ptr<handler_type>> handlers{};
-    std::vector<decltype(base_poller)::event_type> poller_events{};
-    std::vector<std::shared_ptr<handler_type>> poller_handlers{};
-};     // class active_poller_t
-#endif //  defined(ZMQ_BUILD_DRAFT_API) && defined(ZMQ_CPP11) && defined(ZMQ_HAVE_POLLER)
-
-
-} // namespace zmq
-
-#endif // __ZMQ_ADDON_HPP_INCLUDED__
diff --git a/libs/libzmq b/libs/libzmq
new file mode 160000
index 0000000..3e08ecc
--- /dev/null
+++ b/libs/libzmq
@@ -0,0 +1 @@
+Subproject commit 3e08ecc0124a130220f4c8c046e5ba7f919b32df
diff --git a/libs/libzmq/.clang-format b/libs/libzmq/.clang-format
deleted file mode 100644
index 0fc6f89..0000000
--- a/libs/libzmq/.clang-format
+++ /dev/null
@@ -1,53 +0,0 @@
-BasedOnStyle: LLVM
-IndentWidth: 4
-UseTab: Never
-BreakBeforeBraces: Custom
-BraceWrapping: 
-    AfterClass: true
-    AfterControlStatement: false
-    AfterEnum: true 
-    AfterFunction: true 
-    AfterNamespace: true
-    AfterObjCDeclaration: true 
-    AfterStruct: true 
-    AfterUnion: true 
-    BeforeCatch: true 
-    BeforeElse: false 
-    IndentBraces: false
-
-AlignConsecutiveAssignments: false
-AlignConsecutiveDeclarations: false
-AllowShortIfStatementsOnASingleLine: false
-IndentCaseLabels: true
-BinPackArguments: true
-BinPackParameters: false
-AlignTrailingComments: true
-AllowShortBlocksOnASingleLine: false
-AllowAllParametersOfDeclarationOnNextLine: true
-AllowShortFunctionsOnASingleLine: InlineOnly
-AlwaysBreakTemplateDeclarations: false
-ColumnLimit: 80
-MaxEmptyLinesToKeep: 2
-KeepEmptyLinesAtTheStartOfBlocks: false
-ContinuationIndentWidth: 2
-PointerAlignment: Right
-ReflowComments: false
-SpaceBeforeAssignmentOperators: true
-SpaceBeforeParens: Always
-SpaceInEmptyParentheses: false
-SpacesInAngles: false
-SpacesInParentheses: false
-SpacesInSquareBrackets: false
-Standard: Cpp03
-
-SortIncludes: false
-
-FixNamespaceComments: false
-BreakBeforeBinaryOperators: NonAssignment
-SpaceAfterTemplateKeyword: true
-AlignAfterOpenBracket: Align
-AlignOperands: true
-BreakConstructorInitializers: AfterColon
-ConstructorInitializerAllOnOneLineOrOnePerLine: true
-SpaceAfterCStyleCast: true
-BreakBeforeTernaryOperators: true
diff --git a/libs/libzmq/.clang-tidy b/libs/libzmq/.clang-tidy
deleted file mode 100755
index 32c6ca4..0000000
--- a/libs/libzmq/.clang-tidy
+++ /dev/null
@@ -1,429 +0,0 @@
-Checks:        "*,\
-# not currently a coding convention, but conceivable,\
--llvm-include-order,\
-# currently the coding convention deliberately produces violations of these,\
-# rules, but it may make sense to reconsider,\
--readability-implicit-bool-conversion,\
--readability-braces-around-statements,\
--readability-named-parameter,\
--fuchsia-default-arguments,\
--google-readability-todo,\
--google-runtime-int,\
--cppcoreguidelines-avoid-goto,\
--hicpp-avoid-goto, \
--cppcoreguidelines-pro-type-member-init,\
--cppcoreguidelines-pro-type-static-cast-downcast,\
--readability-identifier-naming,\
-# not applicable,\
--fuchsia-default-arguments-calls,\
--fuchsia-overloaded-operator,\
--fuchsia-statically-constructed-objects,\
-# not currently a coding convention, C++11-specific, but conceivable,\
--modernize-use-nullptr,\
--modernize-use-equals-default,\
--modernize-deprecated-headers,\
-# not currently a coding convention, C++11-specific and hard to implement,\
--hicpp-no-malloc,\
--hicpp-avoid-c-arrays,\
--modernize-avoid-c-arrays,\
--modernize-pass-by-value,\
--modernize-loop-convert,\
--modernize-use-auto,\
--modernize-use-trailing-return-type,\
--modernize-use-using,\
--modernize-return-braced-init-list,\
--cppcoreguidelines-avoid-c-arrays,\
--cppcoreguidelines-no-malloc,\
--cppcoreguidelines-owning-memory,\
--cppcoreguidelines-pro-type-union-access,\
--cppcoreguidelines-pro-bounds-array-to-pointer-decay,\
--cppcoreguidelines-pro-bounds-constant-array-index,\
--cppcoreguidelines-pro-bounds-pointer-arithmetic,\
-# not easily possible to implement (maybe replace by specific exclusions),\
--cppcoreguidelines-pro-type-vararg,\
--cppcoreguidelines-pro-type-reinterpret-cast,\
--hicpp-signed-bitwise,\
-# duplicates,\
--google-readability-braces-around-statements,\
--cppcoreguidelines-pro-type-cstyle-cast,\
--cppcoreguidelines-avoid-magic-numbers,\
--readability-magic-numbers,\
--hicpp-braces-around-statements,\
--hicpp-use-equals-default,\
--hicpp-deprecated-headers,\
--hicpp-no-assembler,\
--hicpp-vararg,\
--hicpp-use-auto,\
--hicpp-use-nullptr,\
--hicpp-no-array-decay,\
--hicpp-member-init"
-WarningsAsErrors: ''
-HeaderFilterRegex: ''
-# AnalyzeTemporaryDtors: false
-CheckOptions:
-  # - key:             cert-dcl59-cpp.HeaderFileExtensions
-    # value:           h,hh,hpp,hxx
-  # - key:             cert-err61-cpp.CheckThrowTemporaries
-    # value:           '1'
-  # - key:             cert-oop11-cpp.IncludeStyle
-    # value:           llvm
-  # - key:             cert-oop11-cpp.UseCERTSemantics
-    # value:           '1'
-  # - key:             cppcoreguidelines-pro-bounds-constant-array-index.GslHeader
-    # value:           ''
-  # - key:             cppcoreguidelines-pro-bounds-constant-array-index.IncludeStyle
-    # value:           '0'
-  # - key:             cppcoreguidelines-pro-type-member-init.IgnoreArrays
-    # value:           '0'
-  # - key:             google-build-namespaces.HeaderFileExtensions
-    # value:           h,hh,hpp,hxx
-  # - key:             google-global-names-in-headers.HeaderFileExtensions
-    # value:           h
-  # - key:             google-readability-braces-around-statements.ShortStatementLines
-    # value:           '1'
-  # - key:             google-readability-function-size.BranchThreshold
-    # value:           '4294967295'
-  # - key:             google-readability-function-size.LineThreshold
-    # value:           '4294967295'
-  # - key:             google-readability-function-size.StatementThreshold
-    # value:           '800'
-  # - key:             google-readability-namespace-comments.ShortNamespaceLines
-    # value:           '10'
-  # - key:             google-readability-namespace-comments.SpacesBeforeComments
-    # value:           '2'
-  # - key:             google-runtime-int.SignedTypePrefix
-    # value:           int
-  # - key:             google-runtime-int.TypeSuffix
-    # value:           ''
-  # - key:             google-runtime-int.UnsignedTypePrefix
-    # value:           uint
-  # - key:             llvm-namespace-comment.ShortNamespaceLines
-    # value:           '1'
-  # - key:             llvm-namespace-comment.SpacesBeforeComments
-    # value:           '1'
-  # - key:             misc-assert-side-effect.AssertMacros
-    # value:           assert
-  # - key:             misc-assert-side-effect.CheckFunctionCalls
-    # value:           '0'
-  # - key:             misc-dangling-handle.HandleClasses
-    # value:           'std::basic_string_view;std::experimental::basic_string_view'
-  # - key:             misc-definitions-in-headers.HeaderFileExtensions
-    # value:           ',h,hh,hpp,hxx'
-  # - key:             misc-definitions-in-headers.UseHeaderFileExtension
-    # value:           '1'
-  # - key:             misc-misplaced-widening-cast.CheckImplicitCasts
-    # value:           '1'
-  # - key:             misc-move-constructor-init.IncludeStyle
-    # value:           llvm
-  # - key:             misc-move-constructor-init.UseCERTSemantics
-    # value:           '0'
-  # - key:             misc-sizeof-expression.WarnOnSizeOfCompareToConstant
-    # value:           '1'
-  # - key:             misc-sizeof-expression.WarnOnSizeOfConstant
-    # value:           '1'
-  # - key:             misc-sizeof-expression.WarnOnSizeOfThis
-    # value:           '1'
-  # - key:             misc-string-constructor.LargeLengthThreshold
-    # value:           '8388608'
-  # - key:             misc-string-constructor.WarnOnLargeLength
-    # value:           '1'
-  # - key:             misc-suspicious-missing-comma.MaxConcatenatedTokens
-    # value:           '5'
-  # - key:             misc-suspicious-missing-comma.RatioThreshold
-    # value:           '0.200000'
-  # - key:             misc-suspicious-missing-comma.SizeThreshold
-    # value:           '5'
-  # - key:             misc-suspicious-string-compare.StringCompareLikeFunctions
-    # value:           ''
-  # - key:             misc-suspicious-string-compare.WarnOnImplicitComparison
-    # value:           '1'
-  # - key:             misc-suspicious-string-compare.WarnOnLogicalNotComparison
-    # value:           '0'
-  # - key:             misc-throw-by-value-catch-by-reference.CheckThrowTemporaries
-    # value:           '1'
-  # - key:             modernize-loop-convert.MaxCopySize
-    # value:           '16'
-  # - key:             modernize-loop-convert.MinConfidence
-    # value:           reasonable
-  # - key:             modernize-loop-convert.NamingStyle
-    # value:           CamelCase
-  # - key:             modernize-pass-by-value.IncludeStyle
-    # value:           llvm
-  # - key:             modernize-replace-auto-ptr.IncludeStyle
-    # value:           llvm
-  # - key:             modernize-use-nullptr.NullMacros
-    # value:           'NULL'
-  # - key:             performance-faster-string-find.StringLikeClasses
-    # value:           'std::basic_string'
-  # - key:             performance-for-range-copy.WarnOnAllAutoCopies
-    # value:           '0'
-  # - key:             readability-braces-around-statements.ShortStatementLines
-    # value:           '1'
-  # - key:             readability-function-size.BranchThreshold
-    # value:           '4294967295'
-  # - key:             readability-function-size.LineThreshold
-    # value:           '4294967295'
-  # - key:             readability-function-size.StatementThreshold
-    # value:           '800'
-  # - key:             readability-identifier-naming.AbstractClassCase
-    # value:           aNy_CasE
-  # - key:             readability-identifier-naming.AbstractClassPrefix
-    # value:           ''
-  # - key:             readability-identifier-naming.AbstractClassSuffix
-    # value:           ''
-  # - key:             readability-identifier-naming.ClassCase
-    # value:           aNy_CasE
-  # - key:             readability-identifier-naming.ClassConstantCase
-    # value:           aNy_CasE
-  # - key:             readability-identifier-naming.ClassConstantPrefix
-    # value:           ''
-  # - key:             readability-identifier-naming.ClassConstantSuffix
-    # value:           ''
-  # - key:             readability-identifier-naming.ClassMemberCase
-    # value:           aNy_CasE
-  # - key:             readability-identifier-naming.ClassMemberPrefix
-    # value:           ''
-  # - key:             readability-identifier-naming.ClassMemberSuffix
-    # value:           ''
-  # - key:             readability-identifier-naming.ClassMethodCase
-    # value:           aNy_CasE
-  # - key:             readability-identifier-naming.ClassMethodPrefix
-    # value:           ''
-  # - key:             readability-identifier-naming.ClassMethodSuffix
-    # value:           ''
-  # - key:             readability-identifier-naming.ClassPrefix
-    # value:           ''
-  # - key:             readability-identifier-naming.ClassSuffix
-    # value:           ''
-  # - key:             readability-identifier-naming.ConstantCase
-    # value:           aNy_CasE
-  # - key:             readability-identifier-naming.ConstantMemberCase
-    # value:           aNy_CasE
-  # - key:             readability-identifier-naming.ConstantMemberPrefix
-    # value:           ''
-  # - key:             readability-identifier-naming.ConstantMemberSuffix
-    # value:           ''
-  # - key:             readability-identifier-naming.ConstantParameterCase
-    # value:           aNy_CasE
-  # - key:             readability-identifier-naming.ConstantParameterPrefix
-    # value:           ''
-  # - key:             readability-identifier-naming.ConstantParameterSuffix
-    # value:           ''
-  # - key:             readability-identifier-naming.ConstantPrefix
-    # value:           ''
-  # - key:             readability-identifier-naming.ConstantSuffix
-    # value:           ''
-  # - key:             readability-identifier-naming.ConstexprFunctionCase
-    # value:           aNy_CasE
-  # - key:             readability-identifier-naming.ConstexprFunctionPrefix
-    # value:           ''
-  # - key:             readability-identifier-naming.ConstexprFunctionSuffix
-    # value:           ''
-  # - key:             readability-identifier-naming.ConstexprMethodCase
-    # value:           aNy_CasE
-  # - key:             readability-identifier-naming.ConstexprMethodPrefix
-    # value:           ''
-  # - key:             readability-identifier-naming.ConstexprMethodSuffix
-    # value:           ''
-  # - key:             readability-identifier-naming.ConstexprVariableCase
-    # value:           aNy_CasE
-  # - key:             readability-identifier-naming.ConstexprVariablePrefix
-    # value:           ''
-  # - key:             readability-identifier-naming.ConstexprVariableSuffix
-    # value:           ''
-  # - key:             readability-identifier-naming.EnumCase
-    # value:           aNy_CasE
-  # - key:             readability-identifier-naming.EnumConstantCase
-    # value:           aNy_CasE
-  # - key:             readability-identifier-naming.EnumConstantPrefix
-    # value:           ''
-  # - key:             readability-identifier-naming.EnumConstantSuffix
-    # value:           ''
-  # - key:             readability-identifier-naming.EnumPrefix
-    # value:           ''
-  # - key:             readability-identifier-naming.EnumSuffix
-    # value:           ''
-  # - key:             readability-identifier-naming.FunctionCase
-    # value:           aNy_CasE
-  # - key:             readability-identifier-naming.FunctionPrefix
-    # value:           ''
-  # - key:             readability-identifier-naming.FunctionSuffix
-    # value:           ''
-  # - key:             readability-identifier-naming.GlobalConstantCase
-    # value:           aNy_CasE
-  # - key:             readability-identifier-naming.GlobalConstantPrefix
-    # value:           ''
-  # - key:             readability-identifier-naming.GlobalConstantSuffix
-    # value:           ''
-  # - key:             readability-identifier-naming.GlobalFunctionCase
-    # value:           aNy_CasE
-  # - key:             readability-identifier-naming.GlobalFunctionPrefix
-    # value:           ''
-  # - key:             readability-identifier-naming.GlobalFunctionSuffix
-    # value:           ''
-  # - key:             readability-identifier-naming.GlobalVariableCase
-    # value:           aNy_CasE
-  # - key:             readability-identifier-naming.GlobalVariablePrefix
-    # value:           ''
-  # - key:             readability-identifier-naming.GlobalVariableSuffix
-    # value:           ''
-  # - key:             readability-identifier-naming.IgnoreFailedSplit
-    # value:           '0'
-  # - key:             readability-identifier-naming.InlineNamespaceCase
-    # value:           aNy_CasE
-  # - key:             readability-identifier-naming.InlineNamespacePrefix
-    # value:           ''
-  # - key:             readability-identifier-naming.InlineNamespaceSuffix
-    # value:           ''
-   - key:             readability-identifier-naming.LocalConstantCase
-     value:           lower_case
-   - key:             readability-identifier-naming.LocalConstantPrefix
-     value:           ''
-   - key:             readability-identifier-naming.LocalConstantSuffix
-     value:           ''
-   - key:             readability-identifier-naming.LocalVariableCase
-     value:           lower_case
-   - key:             readability-identifier-naming.LocalVariablePrefix
-     value:           ''
-   - key:             readability-identifier-naming.LocalVariableSuffix
-     value:           ''
-  # - key:             readability-identifier-naming.MemberCase
-    # value:           lower_case
-  # - key:             readability-identifier-naming.MemberPrefix
-    # value:           '_'
-  # - key:             readability-identifier-naming.MemberSuffix
-    # value:           ''
-  # - key:             readability-identifier-naming.MethodCase
-    # value:           aNy_CasE
-  # - key:             readability-identifier-naming.MethodPrefix
-    # value:           ''
-  # - key:             readability-identifier-naming.MethodSuffix
-    # value:           ''
-  # - key:             readability-identifier-naming.NamespaceCase
-    # value:           aNy_CasE
-  # - key:             readability-identifier-naming.NamespacePrefix
-    # value:           ''
-  # - key:             readability-identifier-naming.NamespaceSuffix
-    # value:           ''
-   - key:             readability-identifier-naming.ParameterCase
-     value:           lower_case
-  # - key:             readability-identifier-naming.ParameterPackCase
-    # value:           aNy_CasE
-  # - key:             readability-identifier-naming.ParameterPackPrefix
-    # value:           ''
-  # - key:             readability-identifier-naming.ParameterPackSuffix
-    # value:           ''
-  # - key:             readability-identifier-naming.ParameterPrefix
-    # value:           ''
-   - key:             readability-identifier-naming.ParameterSuffix
-     value:           '_'
-   - key:             readability-identifier-naming.PrivateMemberCase
-     value:           lower_case
-   - key:             readability-identifier-naming.PrivateMemberPrefix
-     value:           '_'
-   - key:             readability-identifier-naming.PrivateMemberSuffix
-     value:           ''
-  # - key:             readability-identifier-naming.PrivateMethodCase
-    # value:           aNy_CasE
-  # - key:             readability-identifier-naming.PrivateMethodPrefix
-    # value:           ''
-  # - key:             readability-identifier-naming.PrivateMethodSuffix
-    # value:           ''
-  # - key:             readability-identifier-naming.ProtectedMemberCase
-    # value:           aNy_CasE
-  # - key:             readability-identifier-naming.ProtectedMemberPrefix
-    # value:           ''
-  # - key:             readability-identifier-naming.ProtectedMemberSuffix
-    # value:           ''
-  # - key:             readability-identifier-naming.ProtectedMethodCase
-    # value:           aNy_CasE
-  # - key:             readability-identifier-naming.ProtectedMethodPrefix
-    # value:           ''
-  # - key:             readability-identifier-naming.ProtectedMethodSuffix
-    # value:           ''
-  # - key:             readability-identifier-naming.PublicMemberCase
-    # value:           aNy_CasE
-  # - key:             readability-identifier-naming.PublicMemberPrefix
-    # value:           ''
-  # - key:             readability-identifier-naming.PublicMemberSuffix
-    # value:           ''
-  # - key:             readability-identifier-naming.PublicMethodCase
-    # value:           aNy_CasE
-  # - key:             readability-identifier-naming.PublicMethodPrefix
-    # value:           ''
-  # - key:             readability-identifier-naming.PublicMethodSuffix
-    # value:           ''
-  # - key:             readability-identifier-naming.StaticConstantCase
-    # value:           aNy_CasE
-  # - key:             readability-identifier-naming.StaticConstantPrefix
-    # value:           ''
-  # - key:             readability-identifier-naming.StaticConstantSuffix
-    # value:           ''
-  # - key:             readability-identifier-naming.StaticVariableCase
-    # value:           aNy_CasE
-  # - key:             readability-identifier-naming.StaticVariablePrefix
-    # value:           ''
-  # - key:             readability-identifier-naming.StaticVariableSuffix
-    # value:           ''
-  # - key:             readability-identifier-naming.StructCase
-    # value:           aNy_CasE
-  # - key:             readability-identifier-naming.StructPrefix
-    # value:           ''
-  # - key:             readability-identifier-naming.StructSuffix
-    # value:           ''
-  # - key:             readability-identifier-naming.TemplateParameterCase
-    # value:           aNy_CasE
-  # - key:             readability-identifier-naming.TemplateParameterPrefix
-    # value:           ''
-  # - key:             readability-identifier-naming.TemplateParameterSuffix
-    # value:           ''
-  # - key:             readability-identifier-naming.TemplateTemplateParameterCase
-    # value:           aNy_CasE
-  # - key:             readability-identifier-naming.TemplateTemplateParameterPrefix
-    # value:           ''
-  # - key:             readability-identifier-naming.TemplateTemplateParameterSuffix
-    # value:           ''
-  # - key:             readability-identifier-naming.TypeTemplateParameterCase
-    # value:           aNy_CasE
-  # - key:             readability-identifier-naming.TypeTemplateParameterPrefix
-    # value:           ''
-  # - key:             readability-identifier-naming.TypeTemplateParameterSuffix
-    # value:           ''
-  # - key:             readability-identifier-naming.TypedefCase
-    # value:           aNy_CasE
-  # - key:             readability-identifier-naming.TypedefPrefix
-    # value:           ''
-  # - key:             readability-identifier-naming.TypedefSuffix
-    # value:           ''
-  # - key:             readability-identifier-naming.UnionCase
-    # value:           aNy_CasE
-  # - key:             readability-identifier-naming.UnionPrefix
-    # value:           ''
-  # - key:             readability-identifier-naming.UnionSuffix
-    # value:           ''
-  # - key:             readability-identifier-naming.ValueTemplateParameterCase
-    # value:           aNy_CasE
-  # - key:             readability-identifier-naming.ValueTemplateParameterPrefix
-    # value:           ''
-  # - key:             readability-identifier-naming.ValueTemplateParameterSuffix
-    # value:           ''
-  # - key:             readability-identifier-naming.VariableCase
-    # value:           aNy_CasE
-  # - key:             readability-identifier-naming.VariablePrefix
-    # value:           ''
-  # - key:             readability-identifier-naming.VariableSuffix
-    # value:           ''
-  # - key:             readability-identifier-naming.VirtualMethodCase
-    # value:           aNy_CasE
-  # - key:             readability-identifier-naming.VirtualMethodPrefix
-    # value:           ''
-  # - key:             readability-identifier-naming.VirtualMethodSuffix
-    # value:           ''
-  # - key:             readability-simplify-boolean-expr.ChainedConditionalAssignment
-    # value:           '0'
-  # - key:             readability-simplify-boolean-expr.ChainedConditionalReturn
-    # value:           '0'
-   - key:             modernize-use-override.OverrideSpelling
-     value:           'ZMQ_OVERRIDE'
-   - key:             modernize-use-override.FinalSpelling
-     value:           'ZMQ_FINAL'
diff --git a/libs/libzmq/.git-blame-ignore-revs b/libs/libzmq/.git-blame-ignore-revs
deleted file mode 100644
index 985588c..0000000
--- a/libs/libzmq/.git-blame-ignore-revs
+++ /dev/null
@@ -1,2 +0,0 @@
-# tree-wide clang format
-41f459e1dc6f7cdedd1268298153c970e290b2ce
diff --git a/libs/libzmq/.github/CONTRIBUTING.md b/libs/libzmq/.github/CONTRIBUTING.md
deleted file mode 100644
index 10bb5ab..0000000
--- a/libs/libzmq/.github/CONTRIBUTING.md
+++ /dev/null
@@ -1,48 +0,0 @@
-# Pull Request Notice
-
-Before sending a pull request make sure each commit solves one clear, minimal,
-plausible problem. Further each commit should have the following format:
-
-```
-Problem: X is broken
-
-Solution: do Y and Z to fix X
-```
-
-Please try to have the code changes conform to our coding style. For your
-convenience, you can install clang-format (at least version 5.0) and then
-run ```make clang-format-check```. Don't fix existing issues, if any - just
-make sure your changes are compliant. ```make clang-format-diff``` will
-automatically apply the required changes.
-To set a specific clang-format binary with autotools, you can for example
-run: ```./configure CLANG_FORMAT=clang-format-5.0```
-
-Please avoid sending a pull request with recursive merge nodes, as they
-are impossible to fix once merged. Please rebase your branch on
-zeromq/libzmq master instead of merging it.
-
-```
-git remote add upstream git@github.com:zeromq/libzmq.git
-git fetch upstream
-git rebase upstream/master
-git push -f
-```
-
-In case you already merged instead of rebasing you can drop the merge commit.
-
-```
-git rebase -i HEAD~10
-```
-
-Now, find your merge commit and mark it as drop and save. Finally rebase!
-
-If you are a new contributor please have a look at our contributing guidelines:
-[CONTRIBUTING](http://zeromq.org/docs:contributing)
-
-# FIRST TIME CONTRIBUTORS PLEASE NOTE
-
-Please add an additional commit with a relicensing grant.
-
-[Example](https://github.com/zeromq/libzmq/commit/fecbd42dbe45455fff3b6456350ceca047b82050)
-
-[More information on RELICENSING effort](https://github.com/zeromq/libzmq/tree/master/RELICENSE/README.md)
diff --git a/libs/libzmq/.github/issue_template.md b/libs/libzmq/.github/issue_template.md
deleted file mode 100644
index 21b837a..0000000
--- a/libs/libzmq/.github/issue_template.md
+++ /dev/null
@@ -1,22 +0,0 @@
-*Please use this template for reporting suspected bugs or requests for help.*
-
-# Issue description
-
-
-
-# Environment
-
-* libzmq version (commit hash if unreleased): 
-* OS: 
-
-# Minimal test code / Steps to reproduce the issue
-
-1.  
-
-
-# What's the actual result? (include assertion message & call stack if applicable)
-
-
-
-# What's the expected result?
-
diff --git a/libs/libzmq/.github/stale.yml b/libs/libzmq/.github/stale.yml
deleted file mode 100644
index a06b57d..0000000
--- a/libs/libzmq/.github/stale.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-# Number of days of inactivity before an issue becomes stale
-daysUntilStale: 365
-# Number of days of inactivity before a stale issue is closed
-daysUntilClose: 56
-# Issues with these labels will never be considered stale
-exemptLabels:
-  - "Help Request"
-  - "Feature Request"
-  - "Problem reproduced"
-  - Critical
-# Label to use when marking an issue as stale
-staleLabel: stale
-# Comment to post when marking an issue as stale. Set to `false` to disable
-markComment: >
-  This issue has been automatically marked as stale because it has not had
-  activity for 365 days. It will be closed if no further activity occurs within
-  56 days. Thank you for your contributions.
-# Comment to post when closing a stale issue. Set to `false` to disable
-closeComment: false
diff --git a/libs/libzmq/.github/workflows/CI.yaml b/libs/libzmq/.github/workflows/CI.yaml
deleted file mode 100644
index 1256c03..0000000
--- a/libs/libzmq/.github/workflows/CI.yaml
+++ /dev/null
@@ -1,243 +0,0 @@
-name: CI
-on:
-  push:
-  pull_request:
-  schedule:
-    - cron: "0 9 * * 5"
-
-jobs:
-  build:
-    if: github.event_name == 'pull_request' || github.event_name == 'push'
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - platform: x64
-            configuration: release
-            os: windows-2019
-            WITH_LIBSODIUM: ON
-            ENABLE_CURVE: ON
-            CMAKE_GENERATOR: Visual Studio 16 2019
-            MSVCVERSION: v142
-            MSVCYEAR: vs2019
-            ARTIFACT_NAME: v142-x64
-            ENABLE_DRAFTS: ON
-          - platform: x64
-            configuration: Release
-            os: windows-2016
-            WITH_LIBSODIUM: ON
-            ENABLE_CURVE: ON
-            CMAKE_GENERATOR: "Visual Studio 15 2017 Win64"
-            MSVCVERSION: "v141"
-            MSVCYEAR: "vs2017"
-            ARTIFACT_NAME: v141-x64
-            ENABLE_DRAFTS: ON
-          - os: ubuntu-latest
-            BUILD_TYPE: default
-            PACKAGES: asciidoc xmlto
-            CURVE: tweetnacl
-            DRAFT: disabled
-            POLLER: select
-          - os: ubuntu-latest
-            BUILD_TYPE: default
-            CURVE: tweetnacl
-            DRAFT: disabled
-            POLLER: poll
-          - os: ubuntu-latest
-            BUILD_TYPE: android
-            CURVE: tweetnacl
-            DRAFT: disabled
-          - os: ubuntu-latest
-            BUILD_TYPE: coverage
-            PACKAGES: libkrb5-dev libnorm-dev libpgm-dev libgnutls28-dev lcov
-            CURVE: tweetnacl
-            DRAFT: enabled
-            GSSAPI: enabled
-            PGM: enabled
-            NORM: enabled
-            TIPC: enabled
-            TLS: enabled
-            VMCI: enabled
-          - os: ubuntu-latest
-            BUILD_TYPE: valgrind
-            PACKAGES: valgrind libgnutls28-dev
-            CURVE: tweetnacl
-            DRAFT: enabled
-          - os: ubuntu-latest
-            BUILD_TYPE: cmake
-            CURVE: libsodium
-            DRAFT: enabled
-            PACKAGES: cmake libsodium-dev
-            TLS: enabled
-          - os: ubuntu-latest
-            BUILD_TYPE: cmake
-            DRAFT: enabled
-            PACKAGES: cmake clang-format-11
-            DO_CLANG_FORMAT_CHECK: 1
-          - os: ubuntu-latest
-            BUILD_TYPE: default
-            PACKAGES: libkrb5-dev libnorm-dev libpgm-dev libgnutls28-dev libsodium-dev libnss3-dev libbsd-dev
-            CURVE: libsodium
-            ADDRESS_SANITIZER: enabled
-            DRAFT: enabled
-          - os: ubuntu-latest
-            BUILD_TYPE: default
-            PACKAGES: libkrb5-dev libnorm-dev libpgm-dev libgnutls28-dev libsodium-dev libnss3-dev libbsd-dev
-            CURVE: libsodium
-            GSSAPI: enabled
-            PGM: enabled
-            NORM: enabled
-            TIPC: enabled
-            IPv6: ON
-            TLS: enabled
-            USE_NSS: yes
-            VMCI: enabled
-            DRAFT: enabled
-          - os: ubuntu-latest
-            BUILD_TYPE: default
-            PACKAGES: libkrb5-dev libnorm-dev libpgm-dev libgnutls28-dev libsodium-dev libnss3-dev
-            CURVE: libsodium
-            GSSAPI: enabled
-            PGM: enabled
-            NORM: enabled
-            TIPC: enabled
-            IPv6: ON
-            TLS: enabled
-            USE_NSS: yes
-            VMCI: enabled
-            DRAFT: enabled
-            FORCE_98: enabled
-            CXX: clang++
-          - os: ubuntu-latest
-            BUILD_TYPE: abi-compliance-checker
-            PACKAGES: abi-dumper abi-compliance-checker
-            CURVE: tweetnacl
-            DRAFT: disabled
-          - os: ubuntu-latest
-            BUILD_TYPE: cmake
-            PACKAGES: clang-tidy clang-tools
-            CURVE: tweetnacl
-            DRAFT: enabled
-            CXX: clang++
-          - os: macos-latest
-            BUILD_TYPE: default
-            PACKAGES: automake autoconf
-            CURVE: tweetnacl
-            DRAFT: enabled
-          - os: macos-latest
-            BUILD_TYPE: default
-            PACKAGES: automake autoconf libsodium
-            CURVE: libsodium
-            DRAFT: disabled
-    env:
-      platform: ${{ matrix.platform }}
-      configuration: ${{ matrix.configuration }}
-      WITH_LIBSODIUM: ${{ matrix.WITH_LIBSODIUM }}
-      ENABLE_CURVE: ${{ matrix.ENABLE_CURVE }}
-      CMAKE_GENERATOR: ${{ matrix.CMAKE_GENERATOR }}
-      MSVCVERSION: ${{ matrix.MSVCVERSION }}
-      MSVCYEAR: ${{ matrix.MSVCYEAR }}
-      ARTIFACT_NAME: ${{ matrix.ARTIFACT_NAME }}
-      ENABLE_DRAFTS: ${{ matrix.ENABLE_DRAFTS }}
-      SODIUM_INCLUDE_DIR: ${{ github.workspace }}\libsodium\src\libsodium\include"
-      SODIUM_LIBRARY_DIR: ${{ github.workspace }}\libsodium\bin\${{ matrix.platform }}\${{ matrix.configuration }}\${{ matrix.MSVCVERSION }}\dynamic"
-      LIBZMQ_SRCDIR: ${{ github.workspace }}\libzmq
-      BUILD_TYPE: ${{ matrix.BUILD_TYPE }}
-      CURVE: ${{ matrix.CURVE }}
-      DRAFT: ${{ matrix.DRAFT }}
-      ADDRESS_SANITIZER: ${{ matrix.ADDRESS_SANITIZER }}
-      DO_CLANG_FORMAT_CHECK: ${{ matrix.DO_CLANG_FORMAT_CHECK }}
-      FORCE_98: ${{ matrix.FORCE_98 }}
-      CXX: ${{ matrix.CXX }}
-      GSSAPI: ${{ matrix.GSSAPI }}
-      PGM: ${{ matrix.PGM }}
-      NORM: ${{ matrix.NORM }}
-      TIPC: ${{ matrix.TIPC }}
-      IPv6: ${{ matrix.IPv6 }}
-      TLS: ${{ matrix.TLS }}
-      USE_NSS: ${{ matrix.USE_NSS }}
-      VMCI: ${{ matrix.VMCI }}
-      POLLER: ${{ matrix.POLLER }}
-    steps:    
-    - name: Add msbuild to PATH
-      uses: microsoft/setup-msbuild@v1.0.2
-      if: matrix.os == 'windows-2019'
-    - name: Add msbuild to PATH 2016
-      uses: microsoft/setup-msbuild@v1.0.2
-      with:
-        vs-version: '[15.0,16.0)'
-      if: matrix.os == 'windows-2016'    
-    - uses: actions/checkout@v2
-      if: matrix.WITH_LIBSODIUM == 'ON'
-      with:
-        repository: jedisct1/libsodium
-        ref: stable
-        path: libsodium
-    - name: Compile libsodium
-      if: matrix.WITH_LIBSODIUM == 'ON' && (matrix.os == 'windows-2019' || matrix.os == 'windows-2016')
-      shell: cmd
-      working-directory: libsodium
-      run: msbuild /v:minimal /p:Configuration=%Configuration%DLL builds\msvc\%MSVCYEAR%\libsodium\libsodium.vcxproj
-    - name: Copy libsodium
-      if: matrix.WITH_LIBSODIUM == 'ON' && (matrix.os == 'windows-2019' || matrix.os == 'windows-2016')
-      shell: powershell
-      working-directory: libsodium
-      run: Copy-Item "bin\${env:Platform}\${env:Configuration}\${env:MSVCVERSION}\dynamic\libsodium.lib" -Destination "bin\${env:Platform}\${env:Configuration}\${env:MSVCVERSION}\dynamic\sodium.lib"
-    - uses: actions/checkout@v2    
-      with:    
-        path: libzmq
-    - run: md build_libzmq
-      shell: cmd
-      if: matrix.os == 'windows-2019' || matrix.os == 'windows-2016'
-    - name: build-win
-      if: matrix.os == 'windows-2019' || matrix.os == 'windows-2016'
-      shell: cmd
-      working-directory: build_libzmq
-      run: |        
-        cmake -D CMAKE_INCLUDE_PATH="%SODIUM_INCLUDE_DIR%" -D CMAKE_LIBRARY_PATH="%SODIUM_LIBRARY_DIR%" -D WITH_LIBSODIUM="%WITH_LIBSODIUM%" -D ENABLE_DRAFTS="%ENABLE_DRAFTS%" -D ENABLE_ANALYSIS="%ENABLE_ANALYSIS%" -D ENABLE_CURVE="%ENABLE_CURVE%" -D API_POLLER="%API_POLLER%" -D POLLER="%POLLER%" %EXTRA_FLAGS% -D WITH_LIBSODIUM="%WITH_LIBSODIUM%" -D LIBZMQ_WERROR="%LIBZMQ_WERROR%" -G "%CMAKE_GENERATOR%" "%LIBZMQ_SRCDIR%"
-        cmake --build . --config %configuration% --target install -- -verbosity:Minimal -maxcpucount           
-    - name: test
-      if: matrix.os == 'windows-2019' || matrix.os == 'windows-2016'
-      shell: cmd
-      working-directory: build_libzmq
-      run: ctest -C "%Configuration%"
-    - name: Add debian packages
-      if: matrix.os == 'ubuntu-latest' && (matrix.BUILD_TYPE != 'coverage' || github.repository == 'zeromq/libzmq')
-      uses: myci-actions/add-deb-repo@10
-      with:
-        repo-name: obs
-        repo: deb http://download.opensuse.org/repositories/network:/messaging:/zeromq:/git-stable/xUbuntu_20.04/ ./
-        keys-asc: https://download.opensuse.org/repositories/network:/messaging:/zeromq:/git-stable/xUbuntu_20.04/Release.key
-        install: ${{ matrix.PACKAGES }}
-    - name: Add brew packages
-      if: matrix.os == 'macos-latest'
-      shell: bash
-      run: brew install ${{ matrix.PACKAGES }}
-    - name: build
-      if: (matrix.os == 'ubuntu-latest' || matrix.os == 'macos-latest') && (matrix.BUILD_TYPE != 'coverage' || github.repository == 'zeromq/libzmq')
-      shell: bash
-      working-directory: libzmq
-      run: ./ci_build.sh
-    - name: coveralls
-      if: matrix.BUILD_TYPE == 'coverage' && github.repository == 'zeromq/libzmq'
-      uses: coverallsapp/github-action@master
-      with:
-        github-token: ${{ secrets.GITHUB_TOKEN }}
-        path-to-lcov: /home/runner/work/libzmq/libzmq/libzmq/lcov.info
-  cron:
-    runs-on: ubuntu-latest
-    if: github.event_name == 'schedule'
-    strategy:
-      fail-fast: false
-    env:
-      BUILD_TYPE: cmake
-      CXX: clang++
-      CLANG_TIDY: clang-tidy
-    steps:
-    - name: Add debian packages
-      run: apt-get install --yes clang-tidy clang-tools
-    - name: build
-      shell: bash
-      working-directory: libzmq
-      run: ./ci_build.sh
diff --git a/libs/libzmq/.github/workflows/Fuzzers.yaml b/libs/libzmq/.github/workflows/Fuzzers.yaml
deleted file mode 100644
index e8ae6b5..0000000
--- a/libs/libzmq/.github/workflows/Fuzzers.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
-name: Fuzzers
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-    paths:
-      - '.github/workflows/Fuzzers.yaml'
-      - 'src/*'
-      - 'tests/*fuzzer.cpp'
-jobs:
-  Fuzzing:
-    runs-on: ubuntu-latest
-    if: github.repository == 'zeromq/libzmq'
-    strategy:
-      matrix:
-        san: [address, memory, undefined]
-    steps:
-    - name: Build Fuzzers (${{ matrix.san }})
-      id: build
-      uses: google/oss-fuzz/infra/cifuzz/actions/build_fuzzers@master
-      with:
-        sanitizer: ${{ matrix.san }}
-        oss-fuzz-project-name: 'libzmq'
-        allowed-broken-targets-percentage: 0
-        dry-run: false
-    - name: Run Fuzzers (${{ matrix.san }})
-      id: run
-      uses: google/oss-fuzz/infra/cifuzz/actions/run_fuzzers@master
-      with:
-        sanitizer: ${{ matrix.san }}
-        oss-fuzz-project-name: 'libzmq'
-        allowed-broken-targets-percentage: 0
-        dry-run: false
-        fuzz-seconds: 300
diff --git a/libs/libzmq/.gitignore b/libs/libzmq/.gitignore
deleted file mode 100644
index 6170b15..0000000
--- a/libs/libzmq/.gitignore
+++ /dev/null
@@ -1,127 +0,0 @@
-syntax: glob # for hg-git users
-
-# Generated build scripts and IDE generating files
-## autotools
-/Makefile
-builds/Makefile
-builds/deprecated-msvc/Makefile
-doc/Makefile
-libtool
-### automake
-Makefile.in
-.deps/
-.dirstamp
-### autoconf
-autom4te.cache
-aclocal.m4
-config
-config.status
-config.log
-configure
-stamp-h1
-## CMake
-cmake-build-debug/
-build/
-## Android
-builds/android/prefix
-## IntelliJ
-.idea/
-## Visual Code
-.vscode/
-## other results-like folders
-bin/
-lib/
-obj/
-## Doxygen
-doxygen/
-## Packaging 
-packaging/nuget/*.nupkg
-
-# Test related build files
-libtestutil.a
-libunity.a
-
-# Some build outputs and temporal files
-*.o
-*.gcno
-*.gcda
-*.gcov
-*.ncb
-*.lo
-*.loT
-*.la
-*.exe
-*.html
-*.pdf
-*.ps
-*~
-.*~
-.libs
-
-# /src
-## Ignore generated files in configuration process
-src/platform.hpp*
-src/libzmq.pc
-
-# /tools
-## Executable binaries are ignored
-tools/curve_keygen
-## Executable source files must be tracked
-!tools/*.[ch]
-!tools/*.[ch]pp
-
-# /tests
-## Test binaries and logs are ignored
-tests/test*
-tests/test*.log
-tests/test*.trs
-## Test source files must be tracked
-!tests/test*.[ch]
-!tests/test*.[ch]pp
-## Build script and documentations must be tracked
-!tests/CMakeLists.txt
-!tests/README.md
-
-# /unittests
-## Unit test binaries and logs are ignored
-unittests/unittest_*
-unittests/unittest*.log
-unittests/unittest*.trs
-## Unit test source files must be tracked
-!unittests/unittest*.[ch]
-!unittests/unittest*.[ch]pp
-## Build script and documentations must be tracked
-!unittests/CMakeLists.txt
-!unittests/README.md
-
-# check test log files
-test-suite*.log
-
-# /perf
-## Benchmarking binaries and result files are ignored
-perf/*_lat
-perf/*_thr
-perf/benchmark_*
-perf/results
-## Benchmarking source files must be tracked
-!perf/*.[ch]
-!perf/*.[ch]pp
-## Benchmarking tool scripts must be tracked
-!perf/*.py
-!perf/*.sh
-
-# /doc
-## Generated document files 
-doc/*.[137]
-doc/*.html
-doc/*.xml
-
-# external libraries and release archive files
-foreign/openpgm/*
-!foreign/openpgm/*.tar.bz2
-!foreign/openpgm/*.tar.gz
-!foreign/openpgm/Makefile.am
-zeromq-*.tar.gz
-zeromq-*.zip
-core
-
diff --git a/libs/libzmq/.hgeol b/libs/libzmq/.hgeol
deleted file mode 100644
index a484af6..0000000
--- a/libs/libzmq/.hgeol
+++ /dev/null
@@ -1,2 +0,0 @@
-[patterns]
-** = native
diff --git a/libs/libzmq/.mailmap b/libs/libzmq/.mailmap
deleted file mode 100644
index 77e75fa..0000000
--- a/libs/libzmq/.mailmap
+++ /dev/null
@@ -1,81 +0,0 @@
-Ahmet Kakici <ahmet.kakici@pro-line.com.tr> ahmet <ahmet.kakici@pro-line.com.tr>
-Andrey Sibiryov <me@kobology.ru> Kobolog <me@kobology.ru>
-Brian Knox <taotetek@gmail.com> taotetek <taotetek@users.noreply.github.com>
-Chernyshev Vyacheslav <astellar@ro.ru> Astellar <astellar@ro.ru>
-Chris Laws <clawsicus@gmail.com> Chris Laws <claws@localhost>
-Chris Staite <chris@yourdreamnet.co.uk> Chris <chris@yourdreamnet.co.uk>
-Christoph Zach <czach@rst-automation.com> czach <czach@rst-automation.com>
-Chuck Remes <git@chuckremes.com> Chuck Remes <cremes@mac.com>
-Chuck Remes <git@chuckremes.com> Chuck Remes <cremes.devlist@mac.com>
-Constantin Rack <constantin.rack@gmail.com> Constantin Rack <constantin@rack.li>
-Constantin Rack <constantin.rack@gmail.com> Constantin Rack <c-rack@users.noreply.github.com>
-Daniel Krikun <krikun.daniel@gmail.com> danielkr <krikun.daniel@gmail.com>
-Daiyu Hurst <daiyu.hurst@gmail.com> DaiyuHurst <daiyu.hurst@gmail.com>
-Diego Rodriguez-Losada <diego.rlosada@gmail.com> Diego <diego.rlosada@gmail.com>
-Dongmin Yu <miniway@gmail.com> Min(Dongmin Yu) <miniway@gmail.com>
-Doron Somech <somdoron@gmail.com> somdoron <somdoron@gmail.com>
-Elliot Saba <staticfloat@gmail.com> staticfloat <staticfloat@gmail.com>
-Eric Voskuil <eric@voskuil.org> evoskuil <eric@voskuil.org>
-Eric Voskuil <eric@voskuil.org> anonymous <eric@voskuil.org>
-Felipe Farinon <felipe.farinon@powersyslab.com> psl-felipefarinon <felipe.farinon@powersyslab.com>
-Frank Hartmann <soundart@gmx.net> Frank <soundart@gmx.net>
-Gian Lorenzo Meocci <glmeocci@gmail.com> meox <glmeocci@gmail.com>
-Hardeep Singh <hshardeesi@gmail.com> Hardeep <hshardeesi@gmail.com>
-Henrik Feldt <henrik@haf.se> Henrik <henrik@haf.se>
-Huang Xin <chrox.huang@gmail.com> chrox <chrox.huang@gmail.com>
-Ian Barber <ian.barber@gmail.com> Ian Barber <ianbarber@google.com>
-Jens Auer <jens.auer@cgi.com> Jens Auer <jens-auer@users.noreply.github.com>
-Jens Auer <jens.auer@cgi.com> Jens Auer <jens.auer@betaversion.net>
-Joe Eli McIlvain <joe.eli.mac@gmail.com> Joe McIlvain <joe.eli.mac@gmail.com>
-Jos Decoster <jos.decoster@gmail.com> jdc8 <jos.decoster@gmail.com>
-Jos Decoster <jos.decoster@gmail.com> Jos Decoster <jos.decoster@retarget.com>
-Joshua Gao <jmg116@gmail.com> Josh Gao <jgao@mobileiron.com>
-Jörg Kreuzberger <joerg@kreuzberger.eu> kreuzberger <joerg@kreuzberger.eu>
-Arnaud Kapp <kapp.arno@gmail.com> Kapp Arnaud <kapp.arno@gmail.com>
-Arnaud Kapp <kapp.arno@gmail.com> KAPP Arnaud <kapp.arno@gmail.com>
-Arnaud Kapp <kapp.arno@gmail.com> KAPP Arnaud <xaqq@users.noreply.github.com>
-Kenneth Wilke <kenneth.wilke@rackspace.com> KennethWilke <kenneth.wilke@rackspace.com>
-Kevin Sapper <mail@kevinsapper.de> sappo <mail@kevinsapper.de>
-Kevin Sapper <mail@kevinsapper.de> Kevin Sapper <sappo@users.noreply.github.com>
-Leonard Michelet <leonard.michelet@openwide.fr> leonarf <leonard.michelet@openwide.fr>
-Martijn Jasperse <m.jasperse@gmail.com> mjasperse <m.jasperse@gmail.com>
-Martin Hurton <hurtonm@gmail.com> Martin Hurtoň <hurtonm@gmail.com>
-Martin Lucina <martin@lucina.net> Martin Lucina <mato@kotelna.sk>
-Martin Sustrik <sustrik@250bpm.com> Martin Sustrik <sustrik@fastmq.commkdir>
-Martin Sustrik <sustrik@250bpm.com> Martin Sustrik <sustrik@fastmq.com>
-Martin Sustrik <sustrik@250bpm.com> sustrik <sustrik@250bpm.com>
-Martin Sustrik <sustrik@250bpm.com> Martin Sustrik <sustrik@jozsi.(none)>
-Martin Sustrik <sustrik@250bpm.com> unknown <sustrik@.(none)>
-Martin Sustrik <sustrik@250bpm.com> Martin Sustrik <sustrik@turist.(none)>
-Maurice Barnum <msb@yahoo-inc.com> maurice barnum <msb@yahoo-inc.com>
-Maurizio Melato <maurizio.melato@nice-software.com> unknown <mauri@okinawa.(none)>
-Max Skaller <Max.Skaller@gmail.com> skaller <Max.Skaller@gmail.com>
-Michael Fox <415fox@gmail.com> m <415fox@gmail.com>
-Michael Hand <mipa@matrix.by> Mipa <mipa@matrix.by>
-Michel Zou <xantares10@hotmail.com> xantares <xantares09@hotmail.com>
-Mikael Helbo Kjaer <mhk@designtech.dk> Mikael Helbo Kjær <mhk@designtech.dk>
-Mike Gatny <mgatny@gmail.com> Mike Gatny <mgatny@connamara.com>
-Mikko Koppanen <mikko.koppanen@gmail.com> Mikko Koppanen <mkoppanen@php.net>
-Mikko Koppanen <mikko.koppanen@gmail.com> Mikko Koppanen <mikko@kuut.io>
-Mikko Koppanen <mikko.koppanen@gmail.com> Mikko Koppanen <mkoppanen@gameboy.config>
-Min RK <benjaminrk@gmail.com> MinRK <benjaminrk@gmail.com>
-Min RK <benjaminrk@gmail.com> Min Ragan-Kelley <benjaminrk@gmail.com>
-Montoya Edu <montoya.edu@gmail.com> montoyaedu <montoya.edu@gmail.com>
-Nikita Kozlov <nikita@elyzion.net> nikita kozlov <nikita@elyzion.net>
-Pavol Malosek <malosek@fastmq.com> malosek <malosek@fastmq.com>
-Pieter Hintjens <ph@imatix.com> Pieter Hintjens <ph@itmatix.com>
-Reza Ebrahimi <reza.ebrahimi.dev@gmail.com> reza.ebrahimi <reza.ebrahimi.dev@gmail.com>
-Ricardo Catalinas Jiménez <r@untroubled.be> Ricardo Catalinas Jiménez <jimenezrick@gmail.com>
-Rohan Bedarkar <rohanb@cs.uchicago.edu> rohanbedarkar <rohanb@cs.uchicago.edu>
-Rohan Bedarkar <rohanb@cs.uchicago.edu> Rohan <rbe@ws5-34-chi.rtsgroup.net>
-Sergey KHripchenko <shripchenko@intermedia.net> root <root@ast-pbx-mt-3.intermedia.net>
-Sergey KHripchenko <shripchenko@intermedia.net> shripchenko <shripchenko@intermedia.net>
-Sergey M. <dstftw@gmail.com> Sergey M․ <dstftw@gmail.com>
-Steven McCoy <steven.mccoy@miru.hk> Steve-o <fnjordy@gmail.com>
-Tamara Kustarova <kustarova@fastmq.com> tamara <tamara@jozsi.(none)>
-Timothee Besset <ttimo@ttimo.net> Timothee "TTimo" Besset <ttimo@ttimo.net>
-Timothy Mossbarger <tim@ent.net> Tim M <tim@ent.net>
-Trevor Bernard <trevor.bernard@gmail.com> Trevor Bernard <tbernard@liveops.com>
-Trevor Bernard <trevor.bernard@gmail.com> Trevor Bernard <trevor.bernard@userevents.com>
-Volodymyr Korniichuk <VolodymyrKorn@gmail.com> Volodymyr Korniichuk <9173519@gmail.com>
-lysyloren <lysy_loren@gmail.com> lysyloren <lysy.loren@gmail.com>
diff --git a/libs/libzmq/.obs/workflows.yml b/libs/libzmq/.obs/workflows.yml
deleted file mode 100644
index fd3c13b..0000000
--- a/libs/libzmq/.obs/workflows.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-workflow:
-  steps:
-    - branch_package:
-        source_project: network:messaging:zeromq:git-draft
-        source_package: libzmq
-        target_project: network:messaging:zeromq:ci
-release:
-  steps:
-    - trigger_services:
-        project: network:messaging:zeromq:release-stable
-        package: libzmq
-    - trigger_services:
-        project: network:messaging:zeromq:release-draft
-        package: libzmq
-  filters:
-    event: tag_push
diff --git a/libs/libzmq/.travis.yml b/libs/libzmq/.travis.yml
deleted file mode 100644
index e4cb1dd..0000000
--- a/libs/libzmq/.travis.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-# Travis CI script
-
-language: c
-
-os:
-- linux
-
-dist: bionic
-
-cache: ccache
-
-env:
-  matrix:
-    - BUILD_TYPE=default
-  # tokens to deploy releases on OBS and create/delete temporary branch on Github.
-  # 1) Create a token on https://github.com/settings/tokens/new with "public_repo"
-  #    capability and encrypt it with travis encrypt --org -r zeromq/libzmq GH_TOKEN="<token>"
-  # 2) Create 2 OBS tokens with osc token --create network:messaging:zeromq:release-<stable|draft> libzmq
-  #    encrypt them with travis encrypt --org -r zeromq/libzmq OBS_<STABLE|DRAFT>_TOKEN="<token>"
-  global:
-    - secure: aaIs9Y44FYp9VFCqa6LLD4illBH4aUfbS0zzzbAQ5xJvD6NfBsMiKEIhf/kRNCHAtP+1VfQVOejTD6/i08ALsVr3cZD9oB/t7874tz2/jeZUIhRNo+1KwyaVqNg0yUSV6ASIoq4aOfuGnjBlezNQ8LQ2bjQB2m4Enl5wxoYcYdA=
-    - secure: YFrcedBIKe0NR1WC6qQi9phZgtnzOiBIXm40TirvCtstV4eVnSouKgtQfLLArZ4o2tjflq4grQQNo1rJatvyi5YPOXsMcndsni18S+4Ffu8qbECdtPrK52vBweuf7q9oV9Ydax0Fm4bEqEMOZ2/mRBy3nK+mgsE3upeMwyWR0Zw=
-    - secure: lbZSzmqN39QdJwewKOZgq/1ijPKuyx9MFrGzMqXj2+eOSlaZS/tNavHMdKJOev+qJGK9wxmwzxOxS10AiH+AvN7WBacXX4ZtudjScz2HKJRDWTKyzMbzyScq51afniItzrsm+Vo8NHkenNFkux0sSbh0aHlpkLwrGQu+WZWcDN4=
-    - secure: "ZFL7hLJlGwYix8fF835OnQYakBt/o5iS7IfSW7el44ejEvGAOM9O5/ufxCcqSqn8Np7nOaM3RriAVTqWPZD6S7tMeflGTSGYHPYwWUc83z4rUPyG2FWVKXdB8ufpebAwu3hCgLiSmVeoQG47dl6xNk1oKCd+3UIjgz33u1Ecfps="
-
-# Build and check this project according to the BUILD_TYPE
-script: ./ci_build.sh
-
-# Deploy tags
-before_deploy:
-- . ./ci_deploy.sh
-deploy:
-  provider: releases
-  api_key:
-    secure: vGB5E+A8wxm2J1GJZzmIgT9PrjEzvd9gE8iui8FyxSbxAsW9vFZFGZC/21sTtpVcmRarwQCHH1UEbtg+nJwN2iD9YzMRnSVks8xqP+b709YW+VXaMuhZgTzWa74IorQku7NuvLibvQk72/OSgdwPGaNJ6f5AX9pnWVWbEoW1svE=
-  file_glob: true
-  file: ${LIBZMQ_DEPLOYMENT}
-  skip_cleanup: true
-  on:
-    repo: zeromq/libzmq
-    branch: master
-    tags: true
-    condition: "$TRAVIS_OS_NAME =~ (linux) && $BUILD_TYPE =~ (default) && $CURVE =~ (libsodium) && -z $DRAFT"
diff --git a/libs/libzmq/AUTHORS b/libs/libzmq/AUTHORS
deleted file mode 100644
index 42b865f..0000000
--- a/libs/libzmq/AUTHORS
+++ /dev/null
@@ -1,152 +0,0 @@
-Corporate Contributors
-======================
-
-Copyright (c) 2007-2014 iMatix Corporation
-Copyright (c) 2009-2011 250bpm s.r.o.
-Copyright (c) 2010-2011 Miru Limited
-Copyright (c) 2011 VMware, Inc.
-Copyright (c) 2012 Spotify AB
-Copyright (c) 2013 Ericsson AB
-Copyright (c) 2014 AppDynamics Inc.
-Copyright (c) 2015 Google, Inc.
-Copyright (c) 2015-2016 Brocade Communications Systems Inc.
-
-Individual Contributors
-=======================
-
-AJ Lewis
-Alexej Lotz
-Andrew Thompson
-André Caron
-Asko Kauppi
-Attila Mark
-Barak Amar
-Ben Gray
-Bernd Melchers
-Bernd Prager
-Bob Beaty
-Brandon Carpenter
-Brett Cameron
-Brian Buchanan
-Burak Arslan
-Carl Clemens
-Chia-liang Kao
-Chris Busbey
-Chris Rempel
-Chris Wong
-Christian Gudrian
-Christian Kamm
-Chuck Remes
-Conrad D. Steenberg
-Constantin Rack
-Daniel J. Bernstein
-Dhammika Pathirana
-Dhruva Krishnamurthy
-Dirk O. Kaar
-Doron Somech
-Douglas Creager
-Drew Crawford
-Erich Heine
-Erik Hugne
-Erik Rigtorp
-Fabien Ninoles
-Frank Denis
-George Neill
-Gerard Toonstra
-Ghislain Putois
-Gonzalo Diethelm
-Guido Goldstein
-Harald Achitz
-Hardeep Singh
-Hiten Pandya
-Ian Barber
-Ilja Golshtein
-Ilya Kulakov
-Ivo Danihelka
-Jacob Rideout
-Joe Thornber
-Jon Dyte
-Kamil Shakirov
-Ken Steele
-Kouhei Sutou
-Laurent Alebarde
-Leonardo J. Consoni
-Lionel Flandrin
-Lourens Naudé
-Luca Boccassi
-Marc Rossi
-Mark Barbisan
-Martin Hurton
-Martin Lucina
-Martin Pales
-Martin Sustrik
-Matus Hamorsky
-Max Wolf
-McClain Looney
-Michael Compton
-Mika Fischer
-Mikael Helbo Kjaer
-Mike Gatny
-Mikko Koppanen
-Min Ragan-Kelley
-Neale Ferguson
-Nir Soffer
-Osiris Pedroso
-Paul Betts
-Paul Colomiets
-Pavel Gushcha
-Pavol Malosek
-Perry Kundert
-Peter Bourgon
-Philip Kovacs
-Pieter Hintjens
-Piotr Trojanek
-Reza Ebrahimi
-Richard Newton
-Rik van der Heijden
-Robert G. Jakabosky
-Sebastian Otaegui
-Stefan Radomski
-Steven McCoy
-Stuart Webster
-Tamara Kustarova
-Taras Shpot
-Tero Marttila
-Terry Wilson
-Thijs Terlouw
-Thomas Rodgers
-Tim Mossbarger
-Toralf Wittner
-Tore Halvorsen
-Trevor Bernard
-Vitaly Mayatskikh
-
-Credits
-=======
-
-Aamir Mohammad
-Adrian von Bidder
-Aleksey Yeschenko
-Alessio Spadaro
-Alexander Majorov
-Anh Vu
-Bernd Schumacher
-Brian Granger
-Carsten Dinkelmann
-David Bahi
-Dirk Eddelbuettel
-Evgueny Khartchenko
-Frank Vanden Berghen
-Ian Barber
-John Apps
-Markus Fischer
-Matt Muggeridge
-Michael Santy
-Oleg Sevostyanov
-Paulo Henrique Silva
-Peter Busser
-Peter Lemenkov
-Robert Zhang
-Toralf Wittner
-Zed Shaw
-
diff --git a/libs/libzmq/CMakeLists.txt b/libs/libzmq/CMakeLists.txt
deleted file mode 100644
index 23c5c1d..0000000
--- a/libs/libzmq/CMakeLists.txt
+++ /dev/null
@@ -1,1864 +0,0 @@
-# CMake build script for ZeroMQ
-project(ZeroMQ)
-
-if(${CMAKE_SYSTEM_NAME} STREQUAL Darwin)
-  cmake_minimum_required(VERSION 3.0.2)
-else()
-  cmake_minimum_required(VERSION 2.8.12)
-endif()
-
-include(CheckIncludeFiles)
-include(CheckCCompilerFlag)
-include(CheckCXXCompilerFlag)
-include(CheckLibraryExists)
-include(CheckCSourceCompiles)
-include(CheckCSourceRuns)
-include(CMakeDependentOption)
-include(CheckCXXSymbolExists)
-include(CheckStructHasMember)
-include(CheckTypeSize)
-include(FindThreads)
-include(GNUInstallDirs)
-include(CheckTypeSize)
-include(CMakePackageConfigHelpers)
-
-list(INSERT CMAKE_MODULE_PATH 0 "${CMAKE_CURRENT_SOURCE_DIR}")
-set(ZMQ_CMAKE_MODULES_DIR ${CMAKE_CURRENT_SOURCE_DIR}/builds/cmake/Modules)
-list(APPEND CMAKE_MODULE_PATH ${ZMQ_CMAKE_MODULES_DIR})
-
-include(TestZMQVersion)
-include(ZMQSourceRunChecks)
-include(ZMQSupportMacros)
-
-find_package(PkgConfig)
-
-# Set lists to empty beforehand as to not accidentally take values from parent
-set(sources)
-set(cxx-sources)
-set(html-docs)
-set(target_outputs)
-
-option(ENABLE_ASAN "Build with address sanitizer" OFF)
-if(ENABLE_ASAN)
-  message(STATUS "Instrumenting with Address Sanitizer")
-  set(CMAKE_BUILD_TYPE "RelWithDebInfo")
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=address -fsanitize-address-use-after-scope -fno-omit-frame-pointer")
-  set(CMAKE_CXX_FLAGS
-      "${CMAKE_CXX_FLAGS} -fsanitize=address -fsanitize-address-use-after-scope -fno-omit-frame-pointer")
-  set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -fsanitize=address -fsanitize-address-use-after-scope")
-  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=address -fsanitize-address-use-after-scope")
-endif()
-
-# NOTE: Running libzmq under TSAN doesn't make much sense -- synchronization in libzmq is to some extent
-# handled by the code "knowing" what threads are allowed to do, rather than by enforcing those
-# restrictions, so TSAN generates a lot of (presumably) false positives from libzmq.
-# The settings below are intended to enable libzmq to be built with minimal support for TSAN
-# such that it can be used along with other code that is also built with TSAN.
-option(ENABLE_TSAN "Build with thread sanitizer" OFF)
-if(ENABLE_TSAN)
-  message(STATUS "Instrumenting with Thread Sanitizer")
-  set(CMAKE_BUILD_TYPE "RelWithDebInfo")
-  set(TSAN_FLAGS "-fno-omit-frame-pointer -fsanitize=thread")
-  set(TSAN_CCFLAGS "${TSAN_CCFLAGS} -mllvm -tsan-instrument-memory-accesses=0")
-  set(TSAN_CCFLAGS "${TSAN_CCFLAGS} -mllvm -tsan-instrument-atomics=0")
-  set(TSAN_CCFLAGS "${TSAN_CCFLAGS} -mllvm -tsan-instrument-func-entry-exit=1")
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${TSAN_FLAGS} ${TSAN_CCFLAGS} -fPIE")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TSAN_FLAGS} ${TSAN_CCFLAGS} -fPIE")
-  set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${TSAN_FLAGS} -pie -Qunused-arguments")
-  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${TSAN_FLAGS} -pie -Qunused-arguments")
-endif()
-
-option(ENABLE_UBSAN "Build with undefined behavior sanitizer" OFF)
-if(ENABLE_UBSAN)
-  message(STATUS "Instrumenting with Undefined Behavior Sanitizer")
-  set(CMAKE_BUILD_TYPE "Debug")
-  set(UBSAN_FLAGS "${UBSAN_FLAGS} -fno-omit-frame-pointer")
-  set(UBSAN_FLAGS "${UBSAN_FLAGS} -fsanitize=undefined")
-  set(UBSAN_FLAGS "${UBSAN_FLAGS} -fsanitize=implicit-conversion")
-  set(UBSAN_FLAGS "${UBSAN_FLAGS} -fsanitize=implicit-integer-truncation")
-  set(UBSAN_FLAGS "${UBSAN_FLAGS} -fsanitize=integer")
-  set(UBSAN_FLAGS "${UBSAN_FLAGS} -fsanitize=nullability")
-  set(UBSAN_FLAGS "${UBSAN_FLAGS} -fsanitize=vptr")
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${UBSAN_FLAGS}")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${UBSAN_FLAGS}")
-  set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${UBSAN_FLAGS}")
-  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${UBSAN_FLAGS}")
-endif()
-
-option(ENABLE_INTRINSICS "Build using compiler intrinsics for atomic ops" OFF)
-if(ENABLE_INTRINSICS)
-  message(STATUS "Using compiler intrinsics for atomic ops")
-  add_definitions(-DZMQ_HAVE_ATOMIC_INTRINSICS)
-endif()
-
-set(ZMQ_OUTPUT_BASENAME
-    "zmq"
-    CACHE STRING "Output zmq library base name")
-
-if(${CMAKE_SYSTEM_NAME} STREQUAL Darwin)
-  # Find more information: https://cmake.org/Wiki/CMake_RPATH_handling
-
-  # Apply CMP0042: MACOSX_RPATH is enabled by default
-  cmake_policy(SET CMP0042 NEW)
-
-  # Add an install rpath if it is not a system directory
-  list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}" isSystemDir)
-  if("${isSystemDir}" STREQUAL "-1")
-    set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
-  endif()
-
-  # Add linker search paths pointing to external dependencies
-  set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
-endif()
-
-if (NOT MSVC)
-  if(NOT CMAKE_CXX_FLAGS MATCHES "-std=" AND NOT CXX_STANDARD AND NOT CMAKE_CXX_STANDARD)
-    # use C++11 by default if supported
-    check_cxx_compiler_flag("-std=c++11" COMPILER_SUPPORTS_CXX11)
-    if(COMPILER_SUPPORTS_CXX11)
-      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-    endif()
-  endif()
-  if(NOT CMAKE_C_FLAGS MATCHES "-std=" AND NOT C_STANDARD AND NOT CMAKE_C_STANDARD)
-    check_c_compiler_flag("-std=c11" COMPILER_SUPPORTS_C11)
-    if(COMPILER_SUPPORTS_C11)
-      set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11")
-    else()
-      set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99")
-    endif()
-  endif()
-
-  # clang 6 has a warning that does not make sense on multi-platform code
-  check_cxx_compiler_flag("-Wno-tautological-constant-compare" CXX_HAS_TAUT_WARNING)
-  if(CXX_HAS_TAUT_WARNING)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-tautological-constant-compare")
-  endif()
-  check_c_compiler_flag("-Wno-tautological-constant-compare" CC_HAS_TAUT_WARNING)
-  if(CC_HAS_TAUT_WARNING)
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-tautological-constant-compare")
-  endif()
-endif()
-
-# Will be used to add flags to pkg-config useful when apps want to statically link
-set(pkg_config_libs_private "")
-set(pkg_config_names_private "")
-
-option(WITH_OPENPGM "Build with support for OpenPGM" OFF)
-option(WITH_NORM "Build with support for NORM" OFF)
-option(WITH_VMCI "Build with support for VMware VMCI socket" OFF)
-
-if(APPLE)
-  option(ZMQ_BUILD_FRAMEWORK "Build as OS X framework" OFF)
-endif()
-
-if(EXISTS "${CMAKE_SOURCE_DIR}/.git")
-  option(ENABLE_DRAFTS "Build and install draft classes and methods" ON)
-else()
-  option(ENABLE_DRAFTS "Build and install draft classes and methods" OFF)
-endif()
-
-# Enable WebSocket transport and RadixTree
-if(ENABLE_DRAFTS)
-  message(STATUS "Building draft classes and methods")
-  option(ENABLE_WS "Enable WebSocket transport" ON)
-  option(ENABLE_RADIX_TREE "Use radix tree implementation to manage subscriptions" ON)
-else()
-  message(STATUS "Not building draft classes and methods")
-  option(ENABLE_WS "Enable WebSocket transport" OFF)
-  option(ENABLE_RADIX_TREE "Use radix tree implementation to manage subscriptions" OFF)
-endif()
-
-if(ENABLE_RADIX_TREE)
-  message(STATUS "Using radix tree implementation to manage subscriptions")
-  set(ZMQ_USE_RADIX_TREE 1)
-endif()
-
-if(ENABLE_WS)
-  list(
-    APPEND
-    sources
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/ws_address.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/ws_connecter.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/ws_decoder.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/ws_encoder.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/ws_engine.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/ws_listener.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/ws_address.hpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/ws_connecter.hpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/ws_decoder.hpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/ws_encoder.hpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/ws_engine.hpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/ws_listener.hpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/src/ws_protocol.hpp)
-  set(ZMQ_HAVE_WS 1)
-
-  message(STATUS "Enable WebSocket transport")
-
-  option(WITH_TLS "Use TLS for WSS support" ON)
-  option(WITH_NSS "Use NSS instead of builtin sha1" OFF)
-
-  if(WITH_TLS)
-    find_package("GnuTLS" 3.6.7)
-    if(GNUTLS_FOUND)
-      set(pkg_config_names_private "${pkg_config_names_private} gnutls")
-      list(APPEND sources ${CMAKE_CURRENT_SOURCE_DIR}/src/wss_address.hpp
-           ${CMAKE_CURRENT_SOURCE_DIR}/src/wss_address.cpp ${CMAKE_CURRENT_SOURCE_DIR}/src/wss_engine.hpp
-           ${CMAKE_CURRENT_SOURCE_DIR}/src/wss_engine.cpp)
-
-      message(STATUS "Enable WSS transport")
-      set(ZMQ_USE_GNUTLS 1)
-      set(ZMQ_HAVE_WSS 1)
-    else()
-      message(WARNING "No WSS support, you may want to install GnuTLS and run cmake again")
-    endif()
-  endif()
-endif()
-
-if(NOT ZMQ_USE_GNUTLS)
-  if(WITH_NSS)
-    pkg_check_modules(NSS3 "nss")
-    if(NSS3_FOUND)
-      set(pkg_config_names_private "${pkg_config_names_private} nss")
-      message(STATUS "Using NSS")
-      set(ZMQ_USE_NSS 1)
-    else()
-      find_package("NSS3")
-      if(NSS3_FOUND)
-        set(pkg_config_libs_private "${pkg_config_libs_private} -lnss3")
-        message(STATUS "Using NSS")
-        set(ZMQ_USE_NSS 1)
-      else()
-        message(WARNING "No nss installed, if you don't want builtin SHA1, install NSS or GnuTLS")
-      endif()
-    endif()
-  endif()
-  if(NOT ZMQ_USE_NSS)
-    list(APPEND sources ${CMAKE_CURRENT_SOURCE_DIR}/external/sha1/sha1.c
-         ${CMAKE_CURRENT_SOURCE_DIR}/external/sha1/sha1.h)
-    message(STATUS "Using builtin sha1")
-    set(ZMQ_USE_BUILTIN_SHA1 1)
-  endif()
-endif()
-
-if(NOT MSVC)
-  option(WITH_LIBBSD "Use libbsd instead of builtin strlcpy" ON)
-  if(WITH_LIBBSD)
-    pkg_check_modules(LIBBSD "libbsd")
-    if(LIBBSD_FOUND)
-      message(STATUS "Using libbsd")
-      set(pkg_config_names_private "${pkg_config_names_private} libbsd")
-      set(ZMQ_HAVE_LIBBSD 1)
-    endif()
-  endif()
-  check_cxx_symbol_exists(strlcpy string.h ZMQ_HAVE_STRLCPY)
-endif()
-
-# Select curve encryption library, defaults to tweetnacl To use libsodium instead, use --with-libsodium(must be
-# installed) To disable curve, use --disable-curve
-
-option(WITH_LIBSODIUM "Use libsodium instead of built-in tweetnacl" ON)
-option(WITH_LIBSODIUM_STATIC "Use static libsodium library" OFF)
-option(ENABLE_LIBSODIUM_RANDOMBYTES_CLOSE "Automatically close libsodium randombytes. Not threadsafe without getrandom()" ON)
-option(ENABLE_CURVE "Enable CURVE security" ON)
-
-if(ENABLE_CURVE)
-  if(WITH_LIBSODIUM)
-    find_package("Sodium")
-    if(SODIUM_FOUND)
-      message(STATUS "Using libsodium for CURVE security")
-      include_directories(${SODIUM_INCLUDE_DIRS})
-      if(WITH_LIBSODIUM_STATIC)
-        add_compile_definitions(SODIUM_STATIC)
-      endif()
-      set(ZMQ_USE_LIBSODIUM 1)
-      set(ZMQ_HAVE_CURVE 1)
-      if (ENABLE_LIBSODIUM_RANDOMBYTES_CLOSE)
-        set(ZMQ_LIBSODIUM_RANDOMBYTES_CLOSE 1)
-      endif()
-    else()
-      message(
-        WARNING
-          "libsodium not installed, instead using builtin tweetnacl, you may want to install libsodium and run cmake again"
-      )
-    endif()
-  endif()
-  if(NOT ZMQ_HAVE_CURVE)
-    message(STATUS "Using tweetnacl for CURVE security")
-    list(APPEND sources ${CMAKE_CURRENT_SOURCE_DIR}/src/tweetnacl.c)
-    set(ZMQ_USE_TWEETNACL 1)
-    set(ZMQ_HAVE_CURVE 1)
-  endif()
-else()
-  message(STATUS "CURVE security is disabled")
-endif()
-
-set(SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
-
-option(WITH_MILITANT "Enable militant assertions" OFF)
-if(WITH_MILITANT)
-  add_definitions(-DZMQ_ACT_MILITANT)
-endif()
-
-set(API_POLLER
-    ""
-    CACHE STRING "Choose polling system for zmq_poll(er)_*. valid values are
-  poll or select [default=poll unless POLLER=select]")
-
-set(POLLER
-    ""
-    CACHE STRING "Choose polling system for I/O threads. valid values are
-  kqueue, epoll, devpoll, pollset, poll or select [default=autodetect]")
-
-if(WIN32)
-  if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" AND CMAKE_SYSTEM_VERSION MATCHES "^10.0")
-    set(ZMQ_HAVE_WINDOWS_UWP ON)
-    set(ZMQ_HAVE_IPC OFF)
-    # to remove compile warninging "D9002 ignoring unknown option"
-    string(REPLACE "/Zi" "" CMAKE_CXX_FLAGS_DEBUG ${CMAKE_CXX_FLAGS_DEBUG})
-    set(CMAKE_CXX_FLAGS_DEBUG
-        ${CMAKE_CXX_FLAGS_DEBUG}
-        CACHE STRING "" FORCE)
-    string(REPLACE "/Zi" "" CMAKE_CXX_FLAGS_RELWITHDEBINFO ${CMAKE_CXX_FLAGS_RELWITHDEBINFO})
-    set(CMAKE_CXX_FLAGS_RELWITHDEBINFO
-        ${CMAKE_CXX_FLAGS_RELWITHDEBINFO}
-        CACHE STRING "" FORCE)
-    string(REPLACE "/Zi" "" CMAKE_CXX_FLAGS_DEBUG ${CMAKE_CXX_FLAGS_DEBUG})
-  endif()
-  # from https://stackoverflow.com/a/40217291/2019765
-  macro(get_WIN32_WINNT version)
-    if(CMAKE_SYSTEM_VERSION)
-      set(ver ${CMAKE_SYSTEM_VERSION})
-      string(REGEX MATCH "^([0-9]+).([0-9])" ver ${ver})
-      string(REGEX MATCH "^([0-9]+)" verMajor ${ver})
-      # Check for Windows 10, b/c we'll need to convert to hex 'A'.
-      if("${verMajor}" MATCHES "10")
-        set(verMajor "A")
-        string(REGEX REPLACE "^([0-9]+)" ${verMajor} ver ${ver})
-      endif("${verMajor}" MATCHES "10")
-      # Remove all remaining '.' characters.
-      string(REPLACE "." "" ver ${ver})
-      # Prepend each digit with a zero.
-      string(REGEX REPLACE "([0-9A-Z])" "0\\1" ver ${ver})
-      set(${version} "0x${ver}")
-    endif(CMAKE_SYSTEM_VERSION)
-  endmacro(get_WIN32_WINNT)
-
-  get_win32_winnt(ZMQ_WIN32_WINNT_DEFAULT)
-  message(STATUS "Detected _WIN32_WINNT from CMAKE_SYSTEM_VERSION: ${ZMQ_WIN32_WINNT_DEFAULT}")
-
-  # TODO limit _WIN32_WINNT to the actual Windows SDK version, which might be different from the default version
-  # installed with Visual Studio
-  if(MSVC_VERSION STREQUAL "1500" AND CMAKE_SYSTEM_VERSION VERSION_GREATER "6.0")
-    set(ZMQ_WIN32_WINNT_LIMIT "0x0600")
-  elseif(MSVC_VERSION STREQUAL "1600" AND CMAKE_SYSTEM_VERSION VERSION_GREATER "6.1")
-    set(ZMQ_WIN32_WINNT_LIMIT "0x0601")
-  elseif(MSVC_VERSION STREQUAL "1700" AND CMAKE_SYSTEM_VERSION VERSION_GREATER "6.1")
-    set(ZMQ_WIN32_WINNT_LIMIT "0x0601")
-  elseif(MSVC_VERSION STREQUAL "1800" AND CMAKE_SYSTEM_VERSION VERSION_GREATER "6.2")
-    set(ZMQ_WIN32_WINNT_LIMIT "0x0602")
-  endif()
-  if(ZMQ_WIN32_WINNT_LIMIT)
-    message(
-      STATUS
-        "Mismatch of Visual Studio Version (${MSVC_VERSION}) and CMAKE_SYSTEM_VERSION (${CMAKE_SYSTEM_VERSION}), limiting _WIN32_WINNT to ${ZMQ_WIN32_WINNT_LIMIT}, you may override this by setting ZMQ_WIN32_WINNT"
-    )
-    set(ZMQ_WIN32_WINNT_DEFAULT "${ZMQ_WIN32_WINNT_LIMIT}")
-  endif()
-
-  set(ZMQ_WIN32_WINNT
-      "${ZMQ_WIN32_WINNT_DEFAULT}"
-      CACHE STRING "Value to set _WIN32_WINNT to for building [default=autodetect from build environment]")
-
-  # On Windows Vista or greater, with MSVC 2013 or greater, default to epoll (which is required on Win 10 for ipc
-  # support)
-  if(ZMQ_WIN32_WINNT GREATER "0x05FF"
-     AND MSVC_VERSION GREATER 1799
-     AND POLLER STREQUAL ""
-     AND NOT ZMQ_HAVE_WINDOWS_UWP)
-    set(POLLER "epoll")
-  endif()
-
-  add_definitions(-D_WIN32_WINNT=${ZMQ_WIN32_WINNT})
-endif(WIN32)
-
-if(NOT MSVC)
-  if(POLLER STREQUAL "")
-    check_cxx_symbol_exists(kqueue sys/event.h HAVE_KQUEUE)
-    if(HAVE_KQUEUE)
-      set(POLLER "kqueue")
-    endif()
-  endif()
-
-  if(POLLER STREQUAL "")
-    check_cxx_symbol_exists(epoll_create sys/epoll.h HAVE_EPOLL)
-    if(HAVE_EPOLL)
-      set(POLLER "epoll")
-      check_cxx_symbol_exists(epoll_create1 sys/epoll.h HAVE_EPOLL_CLOEXEC)
-      if(HAVE_EPOLL_CLOEXEC)
-        set(ZMQ_IOTHREAD_POLLER_USE_EPOLL_CLOEXEC 1)
-      endif()
-    endif()
-  endif()
-
-  if(POLLER STREQUAL "")
-    set(CMAKE_EXTRA_INCLUDE_FILES sys/devpoll.h)
-    check_type_size("struct pollfd" DEVPOLL)
-    set(CMAKE_EXTRA_INCLUDE_FILES)
-    if(HAVE_DEVPOLL)
-      set(POLLER "devpoll")
-    endif()
-  endif()
-
-  if(POLLER STREQUAL "")
-    check_cxx_symbol_exists(pollset_create sys/pollset.h HAVE_POLLSET)
-    if(HAVE_POLLSET)
-      set(POLLER "pollset")
-    endif()
-  endif()
-
-  if(POLLER STREQUAL "")
-    check_cxx_symbol_exists(poll poll.h HAVE_POLL)
-    if(HAVE_POLL)
-      set(POLLER "poll")
-    endif()
-  endif()
-endif()
-
-if(POLLER STREQUAL "")
-  if(WIN32)
-    set(HAVE_SELECT 1)
-  else()
-    check_cxx_symbol_exists(select sys/select.h HAVE_SELECT)
-  endif()
-  if(HAVE_SELECT)
-    set(POLLER "select")
-  else()
-    message(FATAL_ERROR "Could not autodetect polling method")
-  endif()
-endif()
-
-if(POLLER STREQUAL "kqueue"
-   OR POLLER STREQUAL "epoll"
-   OR POLLER STREQUAL "devpoll"
-   OR POLLER STREQUAL "pollset"
-   OR POLLER STREQUAL "poll"
-   OR POLLER STREQUAL "select")
-  message(STATUS "Using polling method in I/O threads: ${POLLER}")
-  string(TOUPPER ${POLLER} UPPER_POLLER)
-  set(ZMQ_IOTHREAD_POLLER_USE_${UPPER_POLLER} 1)
-else()
-  message(FATAL_ERROR "Invalid polling method")
-endif()
-
-if(POLLER STREQUAL "epoll" AND WIN32)
-  message(STATUS "Including wepoll")
-  list(APPEND sources ${CMAKE_CURRENT_SOURCE_DIR}/external/wepoll/wepoll.c
-       ${CMAKE_CURRENT_SOURCE_DIR}/external/wepoll/wepoll.h)
-endif()
-
-if(API_POLLER STREQUAL "")
-  if(POLLER STREQUAL "select")
-    set(API_POLLER "select")
-  else()
-    set(API_POLLER "poll")
-  endif()
-endif()
-
-message(STATUS "Using polling method in zmq_poll(er)_* API: ${API_POLLER}")
-string(TOUPPER ${API_POLLER} UPPER_API_POLLER)
-set(ZMQ_POLL_BASED_ON_${UPPER_API_POLLER} 1)
-
-check_cxx_symbol_exists(pselect sys/select.h HAVE_PSELECT)
-if (NOT WIN32 AND HAVE_PSELECT)
-  set(ZMQ_HAVE_PPOLL 1)
-endif()
-
-# special alignment settings
-execute_process(
-  COMMAND getconf LEVEL1_DCACHE_LINESIZE
-  OUTPUT_VARIABLE CACHELINE_SIZE
-  ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
-if(CACHELINE_SIZE STREQUAL ""
-   OR CACHELINE_SIZE EQUAL 0
-   OR CACHELINE_SIZE EQUAL -1)
-  set(ZMQ_CACHELINE_SIZE 64)
-else()
-  set(ZMQ_CACHELINE_SIZE ${CACHELINE_SIZE})
-endif()
-message(STATUS "Using ${ZMQ_CACHELINE_SIZE} bytes alignment for lock-free data structures")
-check_cxx_symbol_exists(posix_memalign stdlib.h HAVE_POSIX_MEMALIGN)
-
-if(NOT CYGWIN)
-  # TODO cannot we simply do 'if(WIN32) set(ZMQ_HAVE_WINDOWS ON)' or similar?
-  check_include_files(windows.h ZMQ_HAVE_WINDOWS)
-endif()
-
-if(NOT WIN32)
-  set(ZMQ_HAVE_IPC 1)
-  set(ZMQ_HAVE_STRUCT_SOCKADDR_UN 1)
-else()
-  check_include_files("winsock2.h;afunix.h" ZMQ_HAVE_IPC)
-  if(ZMQ_HAVE_IPC)
-    check_struct_has_member("struct sockaddr_un" sun_path "winsock2.h;afunix.h" ZMQ_HAVE_STRUCT_SOCKADDR_UN)
-  endif()
-endif()
-
-# ##################### BEGIN condition_variable_t selection
-if(NOT ZMQ_CV_IMPL)
-  # prefer C++11 STL std::condition_variable implementation, if available
-  check_include_files(condition_variable ZMQ_HAVE_STL_CONDITION_VARIABLE LANGUAGE CXX)
-
-  if(ZMQ_HAVE_STL_CONDITION_VARIABLE)
-    set(ZMQ_CV_IMPL_DEFAULT "stl11")
-  else()
-    if(WIN32 AND NOT CMAKE_SYSTEM_VERSION VERSION_LESS "6.0")
-      # Win32API CONDITION_VARIABLE is supported from Windows Vista only
-      set(ZMQ_CV_IMPL_DEFAULT "win32api")
-    elseif(CMAKE_USE_PTHREADS_INIT)
-      set(ZMQ_CV_IMPL_DEFAULT "pthreads")
-    else()
-      set(ZMQ_CV_IMPL_DEFAULT "none")
-    endif()
-  endif()
-
-  # TODO a vxworks implementation also exists, but vxworks is not currently supported with cmake at all
-  set(ZMQ_CV_IMPL
-      "${ZMQ_CV_IMPL_DEFAULT}"
-      CACHE STRING "Choose condition_variable_t implementation. Valid values are
-       stl11, win32api, pthreads, none [default=autodetect]")
-endif()
-
-message(STATUS "Using condition_variable_t implementation: ${ZMQ_CV_IMPL}")
-if(ZMQ_CV_IMPL STREQUAL "stl11")
-  set(ZMQ_USE_CV_IMPL_STL11 1)
-elseif(ZMQ_CV_IMPL STREQUAL "win32api")
-  set(ZMQ_USE_CV_IMPL_WIN32API 1)
-elseif(ZMQ_CV_IMPL STREQUAL "pthreads")
-  set(ZMQ_USE_CV_IMPL_PTHREADS 1)
-elseif(ZMQ_CV_IMPL STREQUAL "none")
-  set(ZMQ_USE_CV_IMPL_NONE 1)
-else()
-  message(ERROR "Unknown value for ZMQ_CV_IMPL: ${ZMQ_CV_IMPL}")
-endif()
-# ##################### END condition_variable_t selection
-
-if(NOT MSVC)
-  check_include_files(ifaddrs.h ZMQ_HAVE_IFADDRS)
-  check_include_files(sys/uio.h ZMQ_HAVE_UIO)
-  check_include_files(sys/eventfd.h ZMQ_HAVE_EVENTFD)
-  if(ZMQ_HAVE_EVENTFD AND NOT CMAKE_CROSSCOMPILING)
-    zmq_check_efd_cloexec()
-  endif()
-endif()
-
-if(ZMQ_HAVE_WINDOWS)
-  # Cannot use check_library_exists because the symbol is always declared as char(*)(void)
-  set(CMAKE_REQUIRED_LIBRARIES "ws2_32.lib")
-  check_cxx_symbol_exists(WSAStartup "winsock2.h" HAVE_WS2_32)
-
-  set(CMAKE_REQUIRED_LIBRARIES "rpcrt4.lib")
-  check_cxx_symbol_exists(UuidCreateSequential "rpc.h" HAVE_RPCRT4)
-
-  set(CMAKE_REQUIRED_LIBRARIES "iphlpapi.lib")
-  check_cxx_symbol_exists(GetAdaptersAddresses "winsock2.h;iphlpapi.h" HAVE_IPHLAPI)
-  check_cxx_symbol_exists(if_nametoindex "iphlpapi.h" HAVE_IF_NAMETOINDEX)
-
-  set(CMAKE_REQUIRED_LIBRARIES "")
-  # TODO: This not the symbol we're looking for. What is the symbol?
-  check_library_exists(ws2 fopen "" HAVE_WS2)
-else()
-  check_cxx_symbol_exists(if_nametoindex net/if.h HAVE_IF_NAMETOINDEX)
-  check_cxx_symbol_exists(SO_PEERCRED sys/socket.h ZMQ_HAVE_SO_PEERCRED)
-  check_cxx_symbol_exists(LOCAL_PEERCRED sys/socket.h ZMQ_HAVE_LOCAL_PEERCRED)
-  check_cxx_symbol_exists(SO_BUSY_POLL sys/socket.h ZMQ_HAVE_BUSY_POLL)
-endif()
-
-if(NOT MINGW)
-  find_library(RT_LIBRARY rt)
-  if(RT_LIBRARY)
-    set(pkg_config_libs_private "${pkg_config_libs_private} -lrt")
-  endif()
-endif()
-
-find_package(Threads)
-
-if(WIN32 AND NOT CYGWIN)
-  if(NOT HAVE_WS2_32 AND NOT HAVE_WS2)
-    message(FATAL_ERROR "Cannot link to ws2_32 or ws2")
-  endif()
-
-  if(NOT HAVE_RPCRT4)
-    message(FATAL_ERROR "Cannot link to rpcrt4")
-  endif()
-
-  if(NOT HAVE_IPHLAPI)
-    message(FATAL_ERROR "Cannot link to iphlapi")
-  endif()
-endif()
-
-if(NOT MSVC)
-  set(CMAKE_REQUIRED_LIBRARIES rt)
-  check_cxx_symbol_exists(clock_gettime time.h HAVE_CLOCK_GETTIME)
-  set(CMAKE_REQUIRED_LIBRARIES)
-
-  check_cxx_symbol_exists(fork unistd.h HAVE_FORK)
-  check_cxx_symbol_exists(gethrtime sys/time.h HAVE_GETHRTIME)
-  check_cxx_symbol_exists(mkdtemp stdlib.h HAVE_MKDTEMP)
-  check_cxx_symbol_exists(accept4 sys/socket.h HAVE_ACCEPT4)
-  check_cxx_symbol_exists(strnlen string.h HAVE_STRNLEN)
-else()
-  set(HAVE_STRNLEN 1)
-endif()
-
-add_definitions(-D_REENTRANT -D_THREAD_SAFE)
-add_definitions(-DZMQ_CUSTOM_PLATFORM_HPP)
-
-option(ENABLE_EVENTFD "Enable/disable eventfd" ZMQ_HAVE_EVENTFD)
-
-macro(zmq_check_cxx_flag_prepend flag)
-  check_cxx_compiler_flag("${flag}" HAVE_FLAG_${flag})
-
-  if(HAVE_FLAG_${flag})
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}")
-  endif()
-endmacro()
-
-option(ENABLE_ANALYSIS "Build with static analysis(make take very long)" OFF)
-
-if(MSVC)
-  if(ENABLE_ANALYSIS)
-    zmq_check_cxx_flag_prepend("/W4")
-
-    zmq_check_cxx_flag_prepend("/analyze")
-
-    # C++11/14/17-specific, but maybe possible via conditional defines
-    zmq_check_cxx_flag_prepend("/wd26440") # Function '...' can be declared 'noexcept'
-    zmq_check_cxx_flag_prepend("/wd26432") # If you define or delete any default operation in the type '...', define or
-                                           # delete them all
-    zmq_check_cxx_flag_prepend("/wd26439") # This kind of function may not throw. Declare it 'noexcept'
-    zmq_check_cxx_flag_prepend("/wd26447") # The function is declared 'noexcept' but calls function '...' which may
-                                           # throw exceptions
-    zmq_check_cxx_flag_prepend("/wd26433") # Function '...' should be marked with 'override'
-    zmq_check_cxx_flag_prepend("/wd26409") # Avoid calling new and delete explicitly, use std::make_unique<T> instead
-    # Requires GSL
-    zmq_check_cxx_flag_prepend("/wd26429") # Symbol '...' is never tested for nullness, it can be marked as not_null
-    zmq_check_cxx_flag_prepend("/wd26446") # Prefer to use gsl::at()
-    zmq_check_cxx_flag_prepend("/wd26481") # Don't use pointer arithmetic. Use span instead
-    zmq_check_cxx_flag_prepend("/wd26472") # Don't use a static_cast for arithmetic conversions. Use brace
-                                           # initialization, gsl::narrow_cast or gsl::narow
-    zmq_check_cxx_flag_prepend("/wd26448") # Consider using gsl::finally if final action is intended
-    zmq_check_cxx_flag_prepend("/wd26400") # Do not assign the result of an allocation or a function call with an
-                                           # owner<T> return value to a raw pointer, use owner<T> instead
-    zmq_check_cxx_flag_prepend("/wd26485") # Expression '...': No array to pointer decay(bounds.3)
-  else()
-    zmq_check_cxx_flag_prepend("/W3")
-  endif()
-
-  if(MSVC_IDE)
-    set(MSVC_TOOLSET "-${CMAKE_VS_PLATFORM_TOOLSET}")
-  else()
-    set(MSVC_TOOLSET "")
-  endif()
-else()
-  zmq_check_cxx_flag_prepend("-Wall")
-endif()
-
-if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-  zmq_check_cxx_flag_prepend("-Wextra")
-endif()
-
-option(LIBZMQ_PEDANTIC "" ON)
-option(LIBZMQ_WERROR "" OFF)
-
-# TODO: why is -Wno-long-long defined differently than in configure.ac?
-if(NOT MSVC)
-  zmq_check_cxx_flag_prepend("-Wno-long-long")
-  zmq_check_cxx_flag_prepend("-Wno-uninitialized")
-
-  if(LIBZMQ_PEDANTIC)
-    zmq_check_cxx_flag_prepend("-pedantic")
-
-    if(${CMAKE_CXX_COMPILER_ID} MATCHES "Intel")
-      zmq_check_cxx_flag_prepend("-strict-ansi")
-    endif()
-
-    if(${CMAKE_CXX_COMPILER_ID} MATCHES "SunPro")
-      zmq_check_cxx_flag_prepend("-compat=5")
-    endif()
-  endif()
-endif()
-
-if(LIBZMQ_WERROR)
-  if(MSVC)
-    zmq_check_cxx_flag_prepend("/WX")
-  else()
-    zmq_check_cxx_flag_prepend("-Werror")
-    if(NOT "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
-      zmq_check_cxx_flag_prepend("-errwarn=%all")
-    endif()
-  endif()
-endif()
-
-if(CMAKE_SYSTEM_PROCESSOR MATCHES "^sparc")
-  zmq_check_cxx_flag_prepend("-mcpu=v9")
-endif()
-
-if(${CMAKE_CXX_COMPILER_ID} MATCHES "SunPro")
-  zmq_check_cxx_flag_prepend("-features=zla")
-endif()
-
-if(CMAKE_SYSTEM_NAME MATCHES "SunOS"
-   OR CMAKE_SYSTEM_NAME MATCHES "NetBSD"
-   OR CMAKE_SYSTEM_NAME MATCHES "QNX")
-  message(STATUS "Checking whether atomic operations can be used")
-  check_c_source_compiles(
-    "\
-  #include <atomic.h> \
-  \
-  int main() \
-  { \
-    uint32_t value; \
-    atomic_cas_32(&value, 0, 0); \
-    return 0; \
-  } \
-  "
-    HAVE_ATOMIC_H)
-
-  if(NOT HAVE_ATOMIC_H)
-    set(ZMQ_FORCE_MUTEXES 1)
-  endif()
-endif()
-
-if(NOT ANDROID)
-  zmq_check_noexcept()
-endif()
-
-# -----------------------------------------------------------------------------
-if(NOT CMAKE_CROSSCOMPILING AND NOT MSVC)
-  zmq_check_sock_cloexec()
-  zmq_check_o_cloexec()
-  zmq_check_so_bindtodevice()
-  zmq_check_so_keepalive()
-  zmq_check_so_priority()
-  zmq_check_tcp_keepcnt()
-  zmq_check_tcp_keepidle()
-  zmq_check_tcp_keepintvl()
-  zmq_check_tcp_keepalive()
-  zmq_check_tcp_tipc()
-  zmq_check_pthread_setname()
-  zmq_check_pthread_setaffinity()
-  zmq_check_getrandom()
-endif()
-
-if(CMAKE_SYSTEM_NAME MATCHES "Linux"
-   OR CMAKE_SYSTEM_NAME MATCHES "GNU/kFreeBSD"
-   OR CMAKE_SYSTEM_NAME MATCHES "GNU/Hurd"
-   OR CYGWIN)
-  add_definitions(-D_GNU_SOURCE)
-elseif(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
-  add_definitions(-D__BSD_VISIBLE)
-elseif(CMAKE_SYSTEM_NAME MATCHES "NetBSD")
-  add_definitions(-D_NETBSD_SOURCE)
-elseif(CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
-  add_definitions(-D_OPENBSD_SOURCE)
-elseif(CMAKE_SYSTEM_NAME MATCHES "SunOS")
-  add_definitions(-D_PTHREADS)
-elseif(CMAKE_SYSTEM_NAME MATCHES "HP-UX")
-  add_definitions(-D_POSIX_C_SOURCE=200112L)
-  zmq_check_cxx_flag_prepend(-Ae)
-elseif(CMAKE_SYSTEM_NAME MATCHES "Darwin")
-  add_definitions(-D_DARWIN_C_SOURCE)
-endif()
-
-find_package(AsciiDoc)
-
-cmake_dependent_option(WITH_DOC "Build Reference Guide documentation(requires DocBook)" ON "ASCIIDOC_FOUND;NOT WIN32"
-                       OFF) # Do not build docs on Windows due to issues with symlinks
-
-if(MSVC)
-  if(WITH_OPENPGM)
-    # set(OPENPGM_ROOT "" CACHE PATH "Location of OpenPGM")
-    set(OPENPGM_VERSION_MAJOR 5)
-    set(OPENPGM_VERSION_MINOR 2)
-    set(OPENPGM_VERSION_MICRO 122)
-    if(CMAKE_CL_64)
-      find_path(
-        OPENPGM_ROOT include/pgm/pgm.h
-        PATHS
-          "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Miru\\OpenPGM ${OPENPGM_VERSION_MAJOR}.${OPENPGM_VERSION_MINOR}.${OPENPGM_VERSION_MICRO}]"
-        NO_DEFAULT_PATH)
-      message(STATUS "OpenPGM x64 detected - ${OPENPGM_ROOT}")
-    else()
-      find_path(
-        OPENPGM_ROOT include/pgm/pgm.h
-        PATHS
-          "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\Miru\\OpenPGM ${OPENPGM_VERSION_MAJOR}.${OPENPGM_VERSION_MINOR}.${OPENPGM_VERSION_MICRO}]"
-          "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Miru\\OpenPGM ${OPENPGM_VERSION_MAJOR}.${OPENPGM_VERSION_MINOR}.${OPENPGM_VERSION_MICRO}]"
-          NO_DEFAULT_PATH)
-      message(STATUS "OpenPGM x86 detected - ${OPENPGM_ROOT}")
-    endif()
-    set(OPENPGM_INCLUDE_DIRS ${OPENPGM_ROOT}/include)
-    set(OPENPGM_LIBRARY_DIRS ${OPENPGM_ROOT}/lib)
-    set(OPENPGM_LIBRARIES
-        optimized
-        libpgm${MSVC_TOOLSET}-mt-${OPENPGM_VERSION_MAJOR}_${OPENPGM_VERSION_MINOR}_${OPENPGM_VERSION_MICRO}.lib debug
-        libpgm${MSVC_TOOLSET}-mt-gd-${OPENPGM_VERSION_MAJOR}_${OPENPGM_VERSION_MINOR}_${OPENPGM_VERSION_MICRO}.lib)
-  endif()
-else()
-  if(WITH_OPENPGM)
-    # message(FATAL_ERROR "WITH_OPENPGM not implemented")
-
-    if(NOT OPENPGM_PKGCONFIG_NAME)
-      set(OPENPGM_PKGCONFIG_NAME "openpgm-5.2")
-    endif()
-
-    set(OPENPGM_PKGCONFIG_NAME
-        ${OPENPGM_PKGCONFIG_NAME}
-        CACHE STRING "Name pkg-config shall use to find openpgm libraries and include paths" FORCE)
-
-    pkg_check_modules(OPENPGM ${OPENPGM_PKGCONFIG_NAME})
-
-    if(OPENPGM_FOUND)
-      message(STATUS ${OPENPGM_PKGCONFIG_NAME}" found")
-      set(pkg_config_names_private "${pkg_config_names_private} ${OPENPGM_PKGCONFIG_NAME}")
-    else()
-      message(
-        FATAL_ERROR
-          ${OPENPGM_PKGCONFIG_NAME}"  not found. openpgm is searchd via `pkg-config ${OPENPGM_PKGCONFIG_NAME}`. Consider providing a valid OPENPGM_PKGCONFIG_NAME"
-      )
-    endif()
-
-    # DSO symbol visibility for openpgm
-    if(HAVE_FLAG_VISIBILITY_HIDDEN)
-
-    elseif(HAVE_FLAG_LDSCOPE_HIDDEN)
-
-    endif()
-  endif()
-endif()
-
-# -----------------------------------------------------------------------------
-# force off-tree build
-
-if(${CMAKE_CURRENT_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_BINARY_DIR})
-  message(
-    FATAL_ERROR
-      "CMake generation is not allowed within the source directory! \
-    Remove the CMakeCache.txt file and try again from another folder, e.g.: \
-    \
-      rm CMakeCache.txt \
-      mkdir cmake-make \
-      cd cmake-make \
-      cmake ..")
-endif()
-
-# -----------------------------------------------------------------------------
-# default to Release build
-
-if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
-  # CMAKE_BUILD_TYPE is not used for multi-configuration generators like Visual Studio/XCode which instead use
-  # CMAKE_CONFIGURATION_TYPES
-  set(CMAKE_BUILD_TYPE
-      Release
-      CACHE STRING "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel." FORCE)
-endif()
-
-# -----------------------------------------------------------------------------
-# output directories
-
-zmq_set_with_default(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${ZeroMQ_BINARY_DIR}/bin")
-if(UNIX)
-  set(zmq_library_directory "lib")
-else()
-  set(zmq_library_directory "bin")
-endif()
-zmq_set_with_default(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${ZeroMQ_BINARY_DIR}/${zmq_library_directory}")
-zmq_set_with_default(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${ZeroMQ_BINARY_DIR}/lib")
-
-# -----------------------------------------------------------------------------
-# platform specifics
-
-if(WIN32)
-  # Socket limit is 16K(can be raised arbitrarily)
-  add_definitions(-DFD_SETSIZE=16384)
-  add_definitions(-D_CRT_SECURE_NO_WARNINGS)
-  add_definitions(-D_WINSOCK_DEPRECATED_NO_WARNINGS)
-endif()
-
-if(MSVC)
-  # Parallel make.
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /MP")
-
-  # Compile the static lib with debug information included note: we assume here that the default flags contain some /Z
-  # flag
-  string(REGEX REPLACE "/Z.[^:]" "/Z7 " CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")
-  string(REGEX REPLACE "/Z.[^:]" "/Z7 " CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
-
-endif()
-
-# -----------------------------------------------------------------------------
-# source files
-
-set(cxx-sources
-    precompiled.cpp
-    address.cpp
-    channel.cpp
-    client.cpp
-    clock.cpp
-    ctx.cpp
-    curve_mechanism_base.cpp
-    curve_client.cpp
-    curve_server.cpp
-    dealer.cpp
-    devpoll.cpp
-    dgram.cpp
-    dist.cpp
-    endpoint.cpp
-    epoll.cpp
-    err.cpp
-    fq.cpp
-    io_object.cpp
-    io_thread.cpp
-    ip.cpp
-    ipc_address.cpp
-    ipc_connecter.cpp
-    ipc_listener.cpp
-    kqueue.cpp
-    lb.cpp
-    mailbox.cpp
-    mailbox_safe.cpp
-    mechanism.cpp
-    mechanism_base.cpp
-    metadata.cpp
-    msg.cpp
-    mtrie.cpp
-    norm_engine.cpp
-    object.cpp
-    options.cpp
-    own.cpp
-    null_mechanism.cpp
-    pair.cpp
-    peer.cpp
-    pgm_receiver.cpp
-    pgm_sender.cpp
-    pgm_socket.cpp
-    pipe.cpp
-    plain_client.cpp
-    plain_server.cpp
-    poll.cpp
-    poller_base.cpp
-    polling_util.cpp
-    pollset.cpp
-    proxy.cpp
-    pub.cpp
-    pull.cpp
-    push.cpp
-    random.cpp
-    raw_encoder.cpp
-    raw_decoder.cpp
-    raw_engine.cpp
-    reaper.cpp
-    rep.cpp
-    req.cpp
-    router.cpp
-    select.cpp
-    server.cpp
-    session_base.cpp
-    signaler.cpp
-    socket_base.cpp
-    socks.cpp
-    socks_connecter.cpp
-    stream.cpp
-    stream_engine_base.cpp
-    sub.cpp
-    tcp.cpp
-    tcp_address.cpp
-    tcp_connecter.cpp
-    tcp_listener.cpp
-    thread.cpp
-    trie.cpp
-    radix_tree.cpp
-    v1_decoder.cpp
-    v1_encoder.cpp
-    v2_decoder.cpp
-    v2_encoder.cpp
-    v3_1_encoder.cpp
-    xpub.cpp
-    xsub.cpp
-    zmq.cpp
-    zmq_utils.cpp
-    decoder_allocators.cpp
-    socket_poller.cpp
-    timers.cpp
-    config.hpp
-    radio.cpp
-    dish.cpp
-    udp_engine.cpp
-    udp_address.cpp
-    scatter.cpp
-    gather.cpp
-    ip_resolver.cpp
-    zap_client.cpp
-    zmtp_engine.cpp
-    # at least for VS, the header files must also be listed
-    address.hpp
-    array.hpp
-    atomic_counter.hpp
-    atomic_ptr.hpp
-    blob.hpp
-    channel.hpp
-    client.hpp
-    clock.hpp
-    command.hpp
-    compat.hpp
-    condition_variable.hpp
-    config.hpp
-    ctx.hpp
-    curve_client.hpp
-    curve_client_tools.hpp
-    curve_mechanism_base.hpp
-    curve_server.hpp
-    dbuffer.hpp
-    dealer.hpp
-    decoder.hpp
-    decoder_allocators.hpp
-    devpoll.hpp
-    dgram.hpp
-    dish.hpp
-    dist.hpp
-    encoder.hpp
-    endpoint.hpp
-    epoll.hpp
-    err.hpp
-    fd.hpp
-    fq.hpp
-    gather.hpp
-    generic_mtrie.hpp
-    generic_mtrie_impl.hpp
-    gssapi_client.hpp
-    gssapi_mechanism_base.hpp
-    gssapi_server.hpp
-    i_decoder.hpp
-    i_encoder.hpp
-    i_engine.hpp
-    i_mailbox.hpp
-    i_poll_events.hpp
-    io_object.hpp
-    io_thread.hpp
-    ip.hpp
-    ipc_address.hpp
-    ipc_connecter.hpp
-    ipc_listener.hpp
-    kqueue.hpp
-    lb.hpp
-    likely.hpp
-    macros.hpp
-    mailbox.hpp
-    mailbox_safe.hpp
-    mechanism.hpp
-    mechanism_base.hpp
-    metadata.hpp
-    msg.hpp
-    mtrie.hpp
-    mutex.hpp
-    norm_engine.hpp
-    null_mechanism.hpp
-    object.hpp
-    options.hpp
-    own.hpp
-    pair.hpp
-    peer.hpp
-    pgm_receiver.hpp
-    pgm_sender.hpp
-    pgm_socket.hpp
-    pipe.hpp
-    plain_client.hpp
-    plain_common.hpp
-    plain_server.hpp
-    poll.hpp
-    poller.hpp
-    poller_base.hpp
-    polling_util.hpp
-    pollset.hpp
-    precompiled.hpp
-    proxy.hpp
-    pub.hpp
-    pull.hpp
-    push.hpp
-    radio.hpp
-    random.hpp
-    raw_decoder.hpp
-    raw_encoder.hpp
-    raw_engine.hpp
-    reaper.hpp
-    rep.hpp
-    req.hpp
-    router.hpp
-    scatter.hpp
-    secure_allocator.hpp
-    select.hpp
-    server.hpp
-    session_base.hpp
-    signaler.hpp
-    socket_base.hpp
-    socket_poller.hpp
-    socks.hpp
-    socks_connecter.hpp
-    stdint.hpp
-    stream.hpp
-    stream_engine_base.hpp
-    stream_connecter_base.hpp
-    stream_connecter_base.cpp
-    stream_listener_base.hpp
-    stream_listener_base.cpp
-    sub.hpp
-    tcp.hpp
-    tcp_address.hpp
-    tcp_connecter.hpp
-    tcp_listener.hpp
-    thread.hpp
-    timers.hpp
-    tipc_address.hpp
-    tipc_connecter.hpp
-    tipc_listener.hpp
-    trie.hpp
-    udp_address.hpp
-    udp_engine.hpp
-    v1_decoder.hpp
-    v1_encoder.hpp
-    v2_decoder.hpp
-    v2_encoder.hpp
-    v3_1_encoder.hpp
-    v2_protocol.hpp
-    vmci.hpp
-    vmci_address.hpp
-    vmci_connecter.hpp
-    vmci_listener.hpp
-    windows.hpp
-    wire.hpp
-    xpub.hpp
-    xsub.hpp
-    ypipe.hpp
-    ypipe_base.hpp
-    ypipe_conflate.hpp
-    yqueue.hpp
-    zap_client.hpp
-    zmtp_engine.hpp)
-
-if(MINGW)
-  # Generate the right type when using -m32 or -m64
-  macro(set_rc_arch rc_target)
-    set(CMAKE_RC_COMPILER_INIT windres)
-    enable_language(RC)
-    set(CMAKE_RC_COMPILE_OBJECT
-        "<CMAKE_RC_COMPILER> <FLAGS> -O coff --target=${rc_target} <DEFINES> -i <SOURCE> -o <OBJECT>")
-  endmacro()
-
-  if(NOT CMAKE_SYSTEM_PROCESSOR)
-    set(CMAKE_SYSTEM_PROCESSOR ${CMAKE_HOST_SYSTEM_PROCESSOR})
-  endif()
-
-  # Also happens on x86_64 systems...what a worthless variable
-  if(CMAKE_SYSTEM_PROCESSOR MATCHES "i386"
-     OR CMAKE_SYSTEM_PROCESSOR MATCHES "i486"
-     OR CMAKE_SYSTEM_PROCESSOR MATCHES "i586"
-     OR CMAKE_SYSTEM_PROCESSOR MATCHES "i686"
-     OR CMAKE_SYSTEM_PROCESSOR MATCHES "x86"
-     OR CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64"
-     OR CMAKE_SYSTEM_PROCESSOR MATCHES "amd64")
-
-    if(CMAKE_SIZEOF_VOID_P EQUAL 8)
-      set_rc_arch("pe-x86-64")
-    else()
-      set_rc_arch("pe-i386")
-    endif()
-  endif()
-endif()
-
-set(public_headers include/zmq.h include/zmq_utils.h)
-
-set(readme-docs AUTHORS COPYING COPYING.LESSER NEWS)
-
-# -----------------------------------------------------------------------------
-# optional modules
-
-if(WITH_OPENPGM)
-  add_definitions(-DZMQ_HAVE_OPENPGM)
-  include_directories(${OPENPGM_INCLUDE_DIRS})
-  link_directories(${OPENPGM_LIBRARY_DIRS})
-  set(OPTIONAL_LIBRARIES ${OPENPGM_LIBRARIES})
-endif()
-
-if(WITH_NORM)
-  find_package(norm)
-    if(norm_FOUND)
-      message(STATUS "Building with NORM")
-      set(ZMQ_HAVE_NORM 1)
-    else()
-      message(FATAL_ERROR "NORM not found")
-    endif()
-endif()
-
-if(WITH_VMCI)
-  add_definitions(-DZMQ_HAVE_VMCI)
-  include_directories(${VMCI_INCLUDE_DIRS})
-  list(APPEND cxx-sources vmci_address.cpp vmci_connecter.cpp vmci_listener.cpp vmci.cpp)
-endif()
-
-if(ZMQ_HAVE_TIPC)
-  list(APPEND cxx-sources tipc_address.cpp tipc_connecter.cpp tipc_listener.cpp)
-endif()
-
-# -----------------------------------------------------------------------------
-# source generators
-
-foreach(source ${cxx-sources})
-  list(APPEND sources ${CMAKE_CURRENT_SOURCE_DIR}/src/${source})
-endforeach()
-
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/version.rc.in ${CMAKE_CURRENT_BINARY_DIR}/version.rc)
-
-# Delete any src/platform.hpp left by configure
-file(REMOVE ${CMAKE_CURRENT_SOURCE_DIR}/src/platform.hpp)
-
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/builds/cmake/platform.hpp.in ${CMAKE_CURRENT_BINARY_DIR}/platform.hpp)
-list(APPEND sources ${CMAKE_CURRENT_BINARY_DIR}/platform.hpp)
-
-set(prefix ${CMAKE_INSTALL_PREFIX})
-set(exec_prefix ${prefix})
-set(libdir ${prefix}/${CMAKE_INSTALL_LIBDIR})
-set(includedir ${prefix}/${CMAKE_INSTALL_INCLUDEDIR})
-set(VERSION ${ZMQ_VERSION_MAJOR}.${ZMQ_VERSION_MINOR}.${ZMQ_VERSION_PATCH})
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/libzmq.pc.in ${CMAKE_CURRENT_BINARY_DIR}/libzmq.pc @ONLY)
-set(zmq-pkgconfig ${CMAKE_CURRENT_BINARY_DIR}/libzmq.pc)
-
-if(NOT ZMQ_BUILD_FRAMEWORK)
-  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libzmq.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
-endif()
-
-if(MSVC)
-  if(CMAKE_CL_64)
-    set(nsis-template ${CMAKE_CURRENT_SOURCE_DIR}/builds/cmake/NSIS.template64.in)
-  else()
-    set(nsis-template ${CMAKE_CURRENT_SOURCE_DIR}/builds/cmake/NSIS.template32.in)
-  endif()
-
-  add_custom_command(
-    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/NSIS.template.in
-    COMMAND ${CMAKE_COMMAND} ARGS -E copy ${nsis-template} ${CMAKE_CURRENT_BINARY_DIR}/NSIS.template.in
-    DEPENDS ${nsis-template})
-endif()
-
-option(WITH_DOCS "Build html docs" ON)
-if(WITH_DOCS)
-  file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc)
-  file(
-    GLOB docs
-    RELATIVE ${CMAKE_CURRENT_BINARY_DIR}/
-    "${CMAKE_CURRENT_SOURCE_DIR}/doc/*.txt")
-  set(html-docs)
-  foreach(txt ${docs})
-    string(REGEX REPLACE ".*/(.*)\\.txt" "\\1.html" html ${txt})
-    set(src ${txt})
-    set(dst doc/${html})
-    if(WITH_DOC)
-      add_custom_command(
-        OUTPUT ${dst}
-        COMMAND ${ASCIIDOC_EXECUTABLE} -d manpage -b xhtml11 -f ${CMAKE_CURRENT_SOURCE_DIR}/doc/asciidoc.conf
-                -azmq_version=${ZMQ_VERSION} -o ${dst} ${src}
-        DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${src}
-        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-        COMMENT "Generating ${html}")
-      list(APPEND html-docs ${CMAKE_CURRENT_BINARY_DIR}/${dst})
-    endif()
-  endforeach()
-endif()
-
-if(ZMQ_BUILD_FRAMEWORK)
-  add_custom_command(
-    TARGET libzmq
-    POST_BUILD
-    COMMAND ${CMAKE_COMMAND} ARGS -E make_directory
-            "${CMAKE_LIBRARY_OUTPUT_PATH}/ZeroMQ.framework/Versions/${ZMQ_VERSION}/MacOS"
-    COMMENT "Perf tools")
-endif()
-
-option(ENABLE_PRECOMPILED "Enable precompiled headers, if possible" ON)
-if(MSVC AND ENABLE_PRECOMPILED)
-  # default for all sources is to use precompiled headers
-  foreach(source ${sources})
-    # C and C++ can not use the same precompiled header
-    if(${source} MATCHES ".cpp$" AND NOT ${source} STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}/src/precompiled.cpp")
-      set_source_files_properties(${source} PROPERTIES COMPILE_FLAGS "/Yuprecompiled.hpp" OBJECT_DEPENDS
-                                                                                          precompiled.hpp)
-    endif()
-  endforeach()
-  # create precompiled header
-  set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/src/precompiled.cpp
-                              PROPERTIES COMPILE_FLAGS "/Ycprecompiled.hpp" OBJECT_OUTPUTS precompiled.hpp)
-endif()
-
-# -----------------------------------------------------------------------------
-# output
-option(BUILD_SHARED "Whether or not to build the shared object" ON)
-option(BUILD_STATIC "Whether or not to build the static archive" ON)
-
-if(MSVC)
-  # Suppress linker warnings caused by #ifdef omission of file content.
-  set(CMAKE_STATIC_LINKER_FLAGS "${CMAKE_STATIC_LINKER_FLAGS} /ignore:4221")
-  set(PDB_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/bin")
-  set(PDB_NAME
-      "lib${ZMQ_OUTPUT_BASENAME}${MSVC_TOOLSET}-mt-gd-${ZMQ_VERSION_MAJOR}_${ZMQ_VERSION_MINOR}_${ZMQ_VERSION_PATCH}")
-  function(enable_vs_guideline_checker target)
-    set_target_properties(
-      ${target} PROPERTIES VS_GLOBAL_EnableCppCoreCheck true VS_GLOBAL_CodeAnalysisRuleSet CppCoreCheckRules.ruleset
-                           VS_GLOBAL_RunCodeAnalysis true)
-  endfunction()
-  if(BUILD_SHARED)
-    # Whole Program Optimization flags. http://msdn.microsoft.com/en-us/magazine/cc301698.aspx
-    #
-    # "Finally, there's the subject of libraries. It's possible to create .LIB 
-    # files with code in its IL form. The linker will happily work with these 
-    # .LIB files. Be aware that these libraries will be tied to a specific 
-    # version of the compiler and linker. If you distribute these libraries, 
-    # you'll need to update them if Microsoft changes the format of IL in a 
-    # future release."
-    # 
-    # /GL and /LTCG can cause problems when libraries built with different 
-    # versions of compiler are later linked into an executable while /LTCG is active. 
-    # https://social.msdn.microsoft.com/Forums/vstudio/en-US/5c102025-c254-4f02-9a51-c775c6cc9f4b/problem-with-ltcg-when-building-a-static-library-in-vs2005?forum=vcgeneral
-    #
-    # For this reason, enable only when building a "Release" (e.g. non-DEBUG) DLL.
-    if(NOT ${CMAKE_BUILD_TYPE} MATCHES "Debug")
-      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /GL")
-      set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /LTCG")
-      set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /LTCG")
-      set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} /LTCG")
-    endif()
-
-    add_library(libzmq SHARED ${sources} ${public_headers} ${html-docs} ${readme-docs}
-                              ${CMAKE_CURRENT_BINARY_DIR}/NSIS.template.in ${CMAKE_CURRENT_BINARY_DIR}/version.rc)
-    if(ENABLE_ANALYSIS)
-      enable_vs_guideline_checker(libzmq)
-    endif()
-    set_target_properties(
-      libzmq
-      PROPERTIES PUBLIC_HEADER "${public_headers}"
-                 RELEASE_POSTFIX "${MSVC_TOOLSET}-mt-${ZMQ_VERSION_MAJOR}_${ZMQ_VERSION_MINOR}_${ZMQ_VERSION_PATCH}"
-                 RELWITHDEBINFO_POSTFIX
-                 "${MSVC_TOOLSET}-mt-${ZMQ_VERSION_MAJOR}_${ZMQ_VERSION_MINOR}_${ZMQ_VERSION_PATCH}"
-                 MINSIZEREL_POSTFIX "${MSVC_TOOLSET}-mt-${ZMQ_VERSION_MAJOR}_${ZMQ_VERSION_MINOR}_${ZMQ_VERSION_PATCH}"
-                 DEBUG_POSTFIX "${MSVC_TOOLSET}-mt-gd-${ZMQ_VERSION_MAJOR}_${ZMQ_VERSION_MINOR}_${ZMQ_VERSION_PATCH}"
-                 RUNTIME_OUTPUT_DIRECTORY "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}"
-                 COMPILE_DEFINITIONS "DLL_EXPORT"
-                 OUTPUT_NAME "lib${ZMQ_OUTPUT_BASENAME}")
-    if(ZMQ_HAVE_WINDOWS_UWP)
-      set_target_properties(libzmq PROPERTIES LINK_FLAGS_DEBUG "/OPT:NOICF /OPT:NOREF")
-    endif()
-  endif()
-
-  if(BUILD_STATIC)
-    add_library(libzmq-static STATIC ${sources} ${CMAKE_CURRENT_BINARY_DIR}/version.rc)
-    set_target_properties(
-      libzmq-static
-      PROPERTIES PUBLIC_HEADER "${public_headers}"
-                 RELEASE_POSTFIX "${MSVC_TOOLSET}-mt-s-${ZMQ_VERSION_MAJOR}_${ZMQ_VERSION_MINOR}_${ZMQ_VERSION_PATCH}"
-                 RELWITHDEBINFO_POSTFIX
-                 "${MSVC_TOOLSET}-mt-s-${ZMQ_VERSION_MAJOR}_${ZMQ_VERSION_MINOR}_${ZMQ_VERSION_PATCH}"
-                 MINSIZEREL_POSTFIX
-                 "${MSVC_TOOLSET}-mt-s-${ZMQ_VERSION_MAJOR}_${ZMQ_VERSION_MINOR}_${ZMQ_VERSION_PATCH}"
-                 DEBUG_POSTFIX "${MSVC_TOOLSET}-mt-sgd-${ZMQ_VERSION_MAJOR}_${ZMQ_VERSION_MINOR}_${ZMQ_VERSION_PATCH}"
-                 COMPILE_FLAGS "/DZMQ_STATIC"
-                 OUTPUT_NAME "lib${ZMQ_OUTPUT_BASENAME}")
-  endif()
-else()
-  # avoid building everything twice for shared + static only on *nix, as Windows needs different preprocessor defines in
-  # static builds
-  if(NOT MINGW)
-    add_library(objects OBJECT ${sources})
-    set_property(TARGET objects PROPERTY POSITION_INDEPENDENT_CODE ON)
-  endif()
-
-  if(BUILD_SHARED)
-    if(MINGW)
-      add_library(libzmq SHARED ${sources} ${public_headers} ${html-docs} ${readme-docs} ${zmq-pkgconfig}
-                                ${CMAKE_CURRENT_BINARY_DIR}/version.rc)
-    else()
-        if (CMAKE_GENERATOR STREQUAL "Xcode")
-           add_library(libzmq SHARED ${sources} ${public_headers} ${html-docs} ${readme-docs}
-                                     ${zmq-pkgconfig} ${CMAKE_CURRENT_BINARY_DIR}/version.rc)
-        else()
-           add_library(libzmq SHARED $<TARGET_OBJECTS:objects> ${public_headers} ${html-docs} ${readme-docs}
-                                     ${zmq-pkgconfig} ${CMAKE_CURRENT_BINARY_DIR}/version.rc)
-        endif()
-
-    endif()
-    # NOTE: the SOVERSION and VERSION MUST be the same as the one generated by libtool! It is NOT the same as the
-    # version of the package.
-    set_target_properties(
-      libzmq PROPERTIES COMPILE_DEFINITIONS "DLL_EXPORT" PUBLIC_HEADER "${public_headers}" VERSION "5.2.5"
-                        SOVERSION "5" OUTPUT_NAME "${ZMQ_OUTPUT_BASENAME}" PREFIX "lib")
-    if(ZMQ_BUILD_FRAMEWORK)
-      set_target_properties(
-        libzmq
-        PROPERTIES FRAMEWORK TRUE MACOSX_FRAMEWORK_IDENTIFIER "org.zeromq.libzmq" MACOSX_FRAMEWORK_SHORT_VERSION_STRING
-                                                                                  ${ZMQ_VERSION}
-                   MACOSX_FRAMEWORK_BUNDLE_VERSION ${ZMQ_VERSION})
-      set_source_files_properties(${html-docs} PROPERTIES MACOSX_PACKAGE_LOCATION doc)
-      set_source_files_properties(${readme-docs} PROPERTIES MACOSX_PACKAGE_LOCATION etc)
-      set_source_files_properties(${zmq-pkgconfig} PROPERTIES MACOSX_PACKAGE_LOCATION lib/pkgconfig)
-    endif()
-  endif()
-
-  if(BUILD_STATIC)
-    if(MINGW)
-      add_library(libzmq-static STATIC ${sources} ${public_headers} ${html-docs} ${readme-docs} ${zmq-pkgconfig}
-                                       ${CMAKE_CURRENT_BINARY_DIR}/version.rc)
-    else()
-      if (CMAKE_GENERATOR STREQUAL "Xcode")
-        add_library(libzmq-static STATIC ${sources} ${public_headers} ${html-docs} ${readme-docs}
-                                         ${zmq-pkgconfig} ${CMAKE_CURRENT_BINARY_DIR}/version.rc)
-      else()
-        add_library(libzmq-static STATIC $<TARGET_OBJECTS:objects> ${public_headers} ${html-docs} ${readme-docs}
-                                         ${zmq-pkgconfig} ${CMAKE_CURRENT_BINARY_DIR}/version.rc)
-      endif()
-    endif()
-    if(CMAKE_SYSTEM_NAME MATCHES "QNX")
-      target_link_libraries(libzmq-static m)
-    endif()
-    set_target_properties(
-      libzmq-static PROPERTIES PUBLIC_HEADER "${public_headers}" OUTPUT_NAME "${ZMQ_OUTPUT_BASENAME}" PREFIX "lib")
-  endif()
-endif()
-
-if(BUILD_STATIC)
-  target_compile_definitions(libzmq-static PUBLIC ZMQ_STATIC)
-endif()
-
-list(APPEND target_outputs "")
-
-if(BUILD_SHARED)
-  list(APPEND target_outputs "libzmq")
-endif()
-
-if(BUILD_STATIC)
-  list(APPEND target_outputs "libzmq-static")
-endif()
-
-set(build_targets ${target_outputs})
-if(TARGET objects)
-  list(APPEND build_targets "objects")
-endif()
-
-foreach(target ${build_targets})
-  target_include_directories(
-    ${target} PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-                     $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}> $<INSTALL_INTERFACE:include>)
-
-  if(ENABLE_DRAFTS)
-    target_compile_definitions(${target} PUBLIC ZMQ_BUILD_DRAFT_API)
-  endif()
-endforeach()
-
-if(BUILD_SHARED)
-  target_link_libraries(libzmq ${CMAKE_THREAD_LIBS_INIT})
-  if(GNUTLS_FOUND)
-    target_link_libraries(libzmq ${GNUTLS_LIBRARIES})
-  endif()
-
-  if(NSS3_FOUND)
-    target_link_libraries(libzmq ${NSS3_LIBRARIES})
-  endif()
-
-  if(LIBBSD_FOUND)
-    target_link_libraries(libzmq ${LIBBSD_LIBRARIES})
-  endif()
-
-  if(SODIUM_FOUND)
-    target_link_libraries(libzmq ${SODIUM_LIBRARIES})
-    # On Solaris, libsodium depends on libssp
-    if(${CMAKE_SYSTEM_NAME} MATCHES "SunOS")
-      target_link_libraries(libzmq ssp)
-    endif()
-  endif()
-
-  if(HAVE_WS2_32)
-    target_link_libraries(libzmq ws2_32)
-  elseif(HAVE_WS2)
-    target_link_libraries(libzmq ws2)
-  endif()
-
-  if(HAVE_RPCRT4)
-    target_link_libraries(libzmq rpcrt4)
-  endif()
-
-  if(HAVE_IPHLAPI)
-    target_link_libraries(libzmq iphlpapi)
-  endif()
-
-  if(RT_LIBRARY)
-    target_link_libraries(libzmq -lrt)
-  endif()
-
-  if(norm_FOUND)
-      target_link_libraries(libzmq norm::norm)
-  endif()
-endif()
-
-if(BUILD_STATIC)
-  target_link_libraries(libzmq-static ${CMAKE_THREAD_LIBS_INIT})
-  if(GNUTLS_FOUND)
-    target_link_libraries(libzmq-static ${GNUTLS_LIBRARIES})
-  endif()
-
-  if(LIBBSD_FOUND)
-    target_link_libraries(libzmq-static ${LIBBSD_LIBRARIES})
-  endif()
-
-  if(NSS3_FOUND)
-    target_link_libraries(libzmq-static ${NSS3_LIBRARIES})
-  endif()
-
-  if(SODIUM_FOUND)
-    target_link_libraries(libzmq-static ${SODIUM_LIBRARIES})
-    # On Solaris, libsodium depends on libssp
-    if(${CMAKE_SYSTEM_NAME} MATCHES "SunOS")
-      target_link_libraries(libzmq-static ssp)
-    endif()
-  endif()
-
-  if(HAVE_WS2_32)
-    target_link_libraries(libzmq-static ws2_32)
-  elseif(HAVE_WS2)
-    target_link_libraries(libzmq-static ws2)
-  endif()
-
-  if(HAVE_RPCRT4)
-    target_link_libraries(libzmq-static rpcrt4)
-  endif()
-
-  if(HAVE_IPHLAPI)
-    target_link_libraries(libzmq-static iphlpapi)
-  endif()
-
-  if(RT_LIBRARY)
-    target_link_libraries(libzmq-static -lrt)
-  endif()
-
-  if(CMAKE_SYSTEM_NAME MATCHES "QNX")
-    add_definitions(-DUNITY_EXCLUDE_MATH_H)
-  endif()
-
-  if(norm_FOUND)
-      target_link_libraries(libzmq-static norm::norm)
-  endif()
-endif()
-
-if(BUILD_SHARED)
-  set(perf-tools
-      local_lat
-      remote_lat
-      local_thr
-      remote_thr
-      inproc_lat
-      inproc_thr
-      proxy_thr)
-
-  if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug") # Why?
-    option(WITH_PERF_TOOL "Build with perf-tools" ON)
-  else()
-    option(WITH_PERF_TOOL "Build with perf-tools" OFF)
-  endif()
-
-  if(WITH_PERF_TOOL)
-    foreach(perf-tool ${perf-tools})
-      add_executable(${perf-tool} perf/${perf-tool}.cpp)
-      target_link_libraries(${perf-tool} libzmq)
-
-      if(GNUTLS_FOUND)
-        target_link_libraries(${perf-tool} ${GNUTLS_LIBRARIES})
-      endif()
-
-      if(LIBBSD_FOUND)
-        target_link_libraries(${perf-tool} ${LIBBSD_LIBRARIES})
-      endif()
-
-      if(NSS3_FOUND)
-        target_link_libraries(${perf-tool} ${NSS3_LIBRARIES})
-      endif()
-
-      if(SODIUM_FOUND)
-        target_link_libraries(${perf-tool} ${SODIUM_LIBRARIES})
-      endif()
-
-      if(ZMQ_BUILD_FRAMEWORK)
-        # Copy perf-tools binaries into Framework
-        add_custom_command(
-          TARGET libzmq
-          ${perf-tool} POST_BUILD
-          COMMAND ${CMAKE_COMMAND} ARGS -E copy "$<TARGET_FILE:${perf-tool}>"
-                  "${LIBRARY_OUTPUT_PATH}/ZeroMQ.framework/Versions/${ZMQ_VERSION_STRING}/MacOS/${perf-tool}"
-          VERBATIM
-          COMMENT "Perf tools")
-      else()
-        install(TARGETS ${perf-tool} RUNTIME DESTINATION bin COMPONENT PerfTools)
-      endif()
-      if(ZMQ_HAVE_WINDOWS_UWP)
-        set_target_properties(${perf-tool} PROPERTIES LINK_FLAGS_DEBUG "/OPT:NOICF /OPT:NOREF")
-      endif()
-    endforeach()
-
-    if(BUILD_STATIC)
-      add_executable(benchmark_radix_tree perf/benchmark_radix_tree.cpp)
-      target_link_libraries(benchmark_radix_tree libzmq-static)
-      target_include_directories(benchmark_radix_tree PUBLIC "${CMAKE_CURRENT_LIST_DIR}/src")
-      if(ZMQ_HAVE_WINDOWS_UWP)
-        set_target_properties(benchmark_radix_tree PROPERTIES LINK_FLAGS_DEBUG "/OPT:NOICF /OPT:NOREF")
-      endif()
-    endif()
-  elseif(WITH_PERF_TOOL)
-    message(FATAL_ERROR "Shared library disabled - perf-tools unavailable.")
-  endif()
-endif()
-
-# -----------------------------------------------------------------------------
-# tests
-
-if(${CMAKE_VERSION} VERSION_LESS 3.12.3)
-  option(BUILD_TESTS "Whether or not to build the tests" OFF)
-else()
-  option(BUILD_TESTS "Whether or not to build the tests" ON)
-endif()
-
-set(ZMQ_BUILD_TESTS
-    ${BUILD_TESTS}
-    CACHE BOOL "Build the tests for ZeroMQ")
-
-if(ZMQ_BUILD_TESTS)
-  enable_testing() # Enable testing only works in root scope
-  add_subdirectory(tests)
-  if(BUILD_STATIC)
-    add_subdirectory(unittests)
-  else()
-    message(WARNING "Not building unit tests, since BUILD_STATIC is not enabled")
-  endif()
-endif()
-
-# -----------------------------------------------------------------------------
-# installer
-
-if(MSVC AND (BUILD_SHARED OR BUILD_STATIC))
-  install(
-    TARGETS ${target_outputs}
-    EXPORT ${PROJECT_NAME}-targets
-    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-    PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} COMPONENT SDK)
-  if(MSVC_IDE)
-    install(
-      FILES ${PDB_OUTPUT_DIRECTORY}/\${CMAKE_INSTALL_CONFIG_NAME}/${PDB_NAME}.pdb
-      DESTINATION ${CMAKE_INSTALL_BINDIR}
-      COMPONENT SDK
-      OPTIONAL)
-  else()
-    install(
-      FILES ${PDB_OUTPUT_DIRECTORY}/${PDB_NAME}.pdb
-      DESTINATION ${CMAKE_INSTALL_BINDIR}
-      COMPONENT SDK
-      OPTIONAL)
-  endif()
-  if(BUILD_SHARED)
-    install(
-      TARGETS libzmq
-      RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-      PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} COMPONENT Runtime)
-  endif()
-elseif(BUILD_SHARED OR BUILD_STATIC)
-  install(
-    TARGETS ${target_outputs}
-    EXPORT ${PROJECT_NAME}-targets
-    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-    FRAMEWORK DESTINATION "Library/Frameworks"
-    PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
-endif()
-
-foreach(readme ${readme-docs})
-  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${readme} ${CMAKE_CURRENT_BINARY_DIR}/${readme}.txt)
-
-  if(NOT ZMQ_BUILD_FRAMEWORK)
-    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${readme}.txt DESTINATION share/zmq)
-  endif()
-endforeach()
-
-if(WITH_DOC)
-  if(NOT ZMQ_BUILD_FRAMEWORK)
-    install(
-      FILES ${html-docs}
-      DESTINATION doc/zmq
-      COMPONENT RefGuide)
-  endif()
-endif()
-
-if(WIN32)
-  set(ZEROMQ_CMAKECONFIG_INSTALL_DIR
-      "CMake"
-      CACHE STRING "install path for ZeroMQConfig.cmake")
-else()
-  # CMake search path wants either "share" (AKA GNUInstallDirs DATAROOTDIR) for arch-independent, or LIBDIR for arch-
-  # dependent, plus "cmake" as prefix
-  set(ZEROMQ_CMAKECONFIG_INSTALL_DIR
-      "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}"
-      CACHE STRING "install path for ZeroMQConfig.cmake")
-endif()
-
-if((NOT CMAKE_VERSION VERSION_LESS 3.0) AND (BUILD_SHARED OR BUILD_STATIC))
-  export(EXPORT ${PROJECT_NAME}-targets FILE "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Targets.cmake")
-endif()
-configure_package_config_file(
-  builds/cmake/${PROJECT_NAME}Config.cmake.in "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake"
-  INSTALL_DESTINATION ${ZEROMQ_CMAKECONFIG_INSTALL_DIR})
-write_basic_package_version_file(
-  ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
-  VERSION ${ZMQ_VERSION_MAJOR}.${ZMQ_VERSION_MINOR}.${ZMQ_VERSION_PATCH}
-  COMPATIBILITY AnyNewerVersion)
-if(BUILD_SHARED OR BUILD_STATIC)
-  install(
-    EXPORT ${PROJECT_NAME}-targets
-    FILE ${PROJECT_NAME}Targets.cmake
-    DESTINATION ${ZEROMQ_CMAKECONFIG_INSTALL_DIR})
-  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
-                ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
-          DESTINATION ${ZEROMQ_CMAKECONFIG_INSTALL_DIR})
-endif()
-
-option(ENABLE_CPACK "Enables cpack rules" ON)
-if(MSVC AND ENABLE_CPACK)
-  if(${CMAKE_BUILD_TYPE} MATCHES "Debug")
-    set(CMAKE_INSTALL_DEBUG_LIBRARIES_ONLY TRUE)
-    set(CMAKE_INSTALL_DEBUG_LIBRARIES TRUE)
-    set(CMAKE_INSTALL_UCRT_LIBRARIES TRUE)
-  endif()
-  include(InstallRequiredSystemLibraries)
-
-  if(CMAKE_CL_64)
-    set(arch_name "x64")
-  else()
-    set(arch_name "x86")
-  endif()
-
-  set(CPACK_NSIS_DISPLAY_NAME "ZeroMQ ${ZMQ_VERSION_MAJOR}.${ZMQ_VERSION_MINOR}.${ZMQ_VERSION_PATCH}(${arch_name})")
-  set(CPACK_PACKAGE_FILE_NAME "ZeroMQ-${ZMQ_VERSION_MAJOR}.${ZMQ_VERSION_MINOR}.${ZMQ_VERSION_PATCH}-${arch_name}")
-
-  # TODO: I think this part was intended to be used when running cpack separately from cmake but I don't know how that
-  # works.
-  #
-  # macro(add_crt_version version) set(rel_dir
-  # "${CMAKE_CURRENT_BINARY_DIR}/build/${arch_name}/${version};ZeroMQ;ALL;/")
-  # set(debug_dir
-  # "${CMAKE_CURRENT_BINARY_DIR}/debug/${arch_name}/${version};ZeroMQ;ALL;/")
-  # if(EXISTS ${rel_dir}) list(APPEND CPACK_INSTALL_CMAKE_PROJECTS ${rel_dir}) endif()
-
-  # if(EXISTS ${debug_dir}) list(APPEND CPACK_INSTALL_CMAKE_PROJECTS ${rel_dir}) endmacro() endmacro()
-
-  # add_crt_version(v110) add_crt_version(v100) add_crt_version(v90)
-
-  list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_BINARY_DIR})
-  set(CPACK_GENERATOR "NSIS")
-  set(CPACK_PACKAGE_NAME "ZeroMQ")
-  set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "ZeroMQ lightweight messaging kernel")
-  set(CPACK_PACKAGE_VENDOR "Miru")
-  set(CPACK_NSIS_CONTACT "Steven McCoy <Steven.McCoy@miru.hk>")
-  set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_BINARY_DIR}\\\\COPYING.txt")
-  # set(CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_BINARY_DIR}\\\\README.txt") set(CPACK_RESOURCE_FILE_WELCOME
-  # "${CMAKE_CURRENT_BINARY_DIR}\\\\WELCOME.txt") There is a bug in NSI that does not handle full unix paths properly.
-  # Make sure there is at least one set of four(4) backslashes.
-  set(CPACK_NSIS_MUI_ICON "${CMAKE_CURRENT_SOURCE_DIR}\\\\installer.ico")
-  set(CPACK_NSIS_MUI_UNIICON "${CMAKE_CURRENT_SOURCE_DIR}\\\\installer.ico")
-
-  set(CPACK_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}\\\\branding.bmp")
-  set(CPACK_NSIS_COMPRESSOR "/SOLID lzma")
-  set(CPACK_PACKAGE_VERSION ${ZMQ_VERSION})
-  set(CPACK_PACKAGE_VERSION_MAJOR ${ZMQ_VERSION_MAJOR})
-  set(CPACK_PACKAGE_VERSION_MINOR ${ZMQ_VERSION_MINOR})
-  set(CPACK_PACKAGE_VERSION_PATCH ${ZMQ_VERSION_PATCH})
-  # set(CPACK_PACKAGE_INSTALL_DIRECTORY "ZMQ Install Directory") set(CPACK_TEMPORARY_DIRECTORY "ZMQ Temporary CPack
-  # Directory")
-
-  include(CPack)
-
-  cpack_add_component_group(Development DISPLAY_NAME "ZeroMQ software development kit" EXPANDED)
-  cpack_add_component(PerfTools DISPLAY_NAME "ZeroMQ performance tools" INSTALL_TYPES FullInstall DevInstall)
-  cpack_add_component(SourceCode DISPLAY_NAME "ZeroMQ source code" DISABLED INSTALL_TYPES FullInstall)
-  cpack_add_component(
-    SDK
-    DISPLAY_NAME
-    "ZeroMQ headers and libraries"
-    INSTALL_TYPES
-    FullInstall
-    DevInstall
-    GROUP
-    Development)
-  if(WITH_DOC)
-    cpack_add_component(
-      RefGuide
-      DISPLAY_NAME
-      "ZeroMQ reference guide"
-      INSTALL_TYPES
-      FullInstall
-      DevInstall
-      GROUP
-      Development)
-  endif()
-  cpack_add_component(
-    Runtime
-    DISPLAY_NAME
-    "ZeroMQ runtime files"
-    REQUIRED
-    INSTALL_TYPES
-    FullInstall
-    DevInstall
-    MinInstall)
-  cpack_add_install_type(FullInstall DISPLAY_NAME "Full install, including source code")
-  cpack_add_install_type(DevInstall DISPLAY_NAME "Developer install, headers and libraries")
-  cpack_add_install_type(MinInstall DISPLAY_NAME "Minimal install, runtime only")
-endif()
-
-# Export this for library to help build this as a sub-project
-set(ZEROMQ_LIBRARY
-    libzmq
-    CACHE STRING "ZeroMQ library")
-
-# Workaround for MSVS10 to avoid the Dialog Hell FIXME: This could be removed with future version of CMake.
-if(MSVC_VERSION EQUAL 1600)
-  set(ZMQ_SLN_FILENAME "${CMAKE_CURRENT_BINARY_DIR}/ZeroMQ.sln")
-  if(EXISTS "${ZMQ_SLN_FILENAME}")
-    file(APPEND "${ZMQ_SLN_FILENAME}" "\n# This should be regenerated!\n")
-  endif()
-endif()
-
-# this cannot be moved, as it does not only contain function/macro definitions
-option(ENABLE_CLANG "Include Clang" ON)
-if (ENABLE_CLANG)
-  include(ClangFormat)
-endif()
-
-# fixes https://github.com/zeromq/libzmq/issues/3776 The problem is, both libzmq-static libzmq try to use/generate
-# precompiled.pch at the same time Add a dependency, so they run in order and so they dont get in each others way TODO
-# still generates warning "build\x64-Debug\ninja : warning : multiple rules generate precompiled.hpp. builds involving
-# this target will not be correct; continuing anyway [-w dupbuild=warn]"
-if(MSVC
-   AND ENABLE_PRECOMPILED
-   AND BUILD_SHARED
-   AND BUILD_STATIC)
-  add_dependencies(libzmq-static libzmq)
-endif()
-
-option(ENABLE_NO_EXPORT "Build with empty ZMQ_EXPORT macro, bypassing platform-based automated detection" OFF)
-if(ENABLE_NO_EXPORT)
-  message(STATUS "Building with empty ZMQ_EXPORT macro")
-  add_definitions(-DZMQ_NO_EXPORT)
-endif()
diff --git a/libs/libzmq/COPYING b/libs/libzmq/COPYING
deleted file mode 100644
index b6f3fd5..0000000
--- a/libs/libzmq/COPYING
+++ /dev/null
@@ -1,674 +0,0 @@
-                      GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/libs/libzmq/COPYING.LESSER b/libs/libzmq/COPYING.LESSER
deleted file mode 100644
index 02e943c..0000000
--- a/libs/libzmq/COPYING.LESSER
+++ /dev/null
@@ -1,181 +0,0 @@
-		         GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-
-  This version of the GNU Lesser General Public License incorporates
-the terms and conditions of version 3 of the GNU General Public
-License, supplemented by the additional permissions listed below.
-
-  0. Additional Definitions. 
-
-  As used herein, "this License" refers to version 3 of the GNU Lesser
-General Public License, and the "GNU GPL" refers to version 3 of the GNU
-General Public License.
-
-  "The Library" refers to a covered work governed by this License,
-other than an Application or a Combined Work as defined below.
-
-  An "Application" is any work that makes use of an interface provided
-by the Library, but which is not otherwise based on the Library.
-Defining a subclass of a class defined by the Library is deemed a mode
-of using an interface provided by the Library.
-
-  A "Combined Work" is a work produced by combining or linking an
-Application with the Library.  The particular version of the Library
-with which the Combined Work was made is also called the "Linked
-Version".
-
-  The "Minimal Corresponding Source" for a Combined Work means the
-Corresponding Source for the Combined Work, excluding any source code
-for portions of the Combined Work that, considered in isolation, are
-based on the Application, and not on the Linked Version.
-
-  The "Corresponding Application Code" for a Combined Work means the
-object code and/or source code for the Application, including any data
-and utility programs needed for reproducing the Combined Work from the
-Application, but excluding the System Libraries of the Combined Work.
-
-  1. Exception to Section 3 of the GNU GPL.
-
-  You may convey a covered work under sections 3 and 4 of this License
-without being bound by section 3 of the GNU GPL.
-
-  2. Conveying Modified Versions.
-
-  If you modify a copy of the Library, and, in your modifications, a
-facility refers to a function or data to be supplied by an Application
-that uses the facility (other than as an argument passed when the
-facility is invoked), then you may convey a copy of the modified
-version:
-
-   a) under this License, provided that you make a good faith effort to
-   ensure that, in the event an Application does not supply the
-   function or data, the facility still operates, and performs
-   whatever part of its purpose remains meaningful, or
-
-   b) under the GNU GPL, with none of the additional permissions of
-   this License applicable to that copy.
-
-  3. Object Code Incorporating Material from Library Header Files.
-
-  The object code form of an Application may incorporate material from
-a header file that is part of the Library.  You may convey such object
-code under terms of your choice, provided that, if the incorporated
-material is not limited to numerical parameters, data structure
-layouts and accessors, or small macros, inline functions and templates
-(ten or fewer lines in length), you do both of the following:
-
-   a) Give prominent notice with each copy of the object code that the
-   Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the object code with a copy of the GNU GPL and this license
-   document.
-
-  4. Combined Works.
-
-  You may convey a Combined Work under terms of your choice that,
-taken together, effectively do not restrict modification of the
-portions of the Library contained in the Combined Work and reverse
-engineering for debugging such modifications, if you also do each of
-the following:
-
-   a) Give prominent notice with each copy of the Combined Work that
-   the Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the Combined Work with a copy of the GNU GPL and this license
-   document.
-
-   c) For a Combined Work that displays copyright notices during
-   execution, include the copyright notice for the Library among
-   these notices, as well as a reference directing the user to the
-   copies of the GNU GPL and this license document.
-
-   d) Do one of the following:
-
-       0) Convey the Minimal Corresponding Source under the terms of this
-       License, and the Corresponding Application Code in a form
-       suitable for, and under terms that permit, the user to
-       recombine or relink the Application with a modified version of
-       the Linked Version to produce a modified Combined Work, in the
-       manner specified by section 6 of the GNU GPL for conveying
-       Corresponding Source.
-
-       1) Use a suitable shared library mechanism for linking with the
-       Library.  A suitable mechanism is one that (a) uses at run time
-       a copy of the Library already present on the user's computer
-       system, and (b) will operate properly with a modified version
-       of the Library that is interface-compatible with the Linked
-       Version. 
-
-   e) Provide Installation Information, but only if you would otherwise
-   be required to provide such information under section 6 of the
-   GNU GPL, and only to the extent that such information is
-   necessary to install and execute a modified version of the
-   Combined Work produced by recombining or relinking the
-   Application with a modified version of the Linked Version. (If
-   you use option 4d0, the Installation Information must accompany
-   the Minimal Corresponding Source and Corresponding Application
-   Code. If you use option 4d1, you must provide the Installation
-   Information in the manner specified by section 6 of the GNU GPL
-   for conveying Corresponding Source.)
-
-  5. Combined Libraries.
-
-  You may place library facilities that are a work based on the
-Library side by side in a single library together with other library
-facilities that are not Applications and are not covered by this
-License, and convey such a combined library under terms of your
-choice, if you do both of the following:
-
-   a) Accompany the combined library with a copy of the same work based
-   on the Library, uncombined with any other library facilities,
-   conveyed under the terms of this License.
-
-   b) Give prominent notice with the combined library that part of it
-   is a work based on the Library, and explaining where to find the
-   accompanying uncombined form of the same work.
-
-  6. Revised Versions of the GNU Lesser General Public License.
-
-  The Free Software Foundation may publish revised and/or new versions
-of the GNU Lesser General Public License from time to time. Such new
-versions will be similar in spirit to the present version, but may
-differ in detail to address new problems or concerns.
-
-  Each version is given a distinguishing version number. If the
-Library as you received it specifies that a certain numbered version
-of the GNU Lesser General Public License "or any later version"
-applies to it, you have the option of following the terms and
-conditions either of that published version or of any later version
-published by the Free Software Foundation. If the Library as you
-received it does not specify a version number of the GNU Lesser
-General Public License, you may choose any version of the GNU Lesser
-General Public License ever published by the Free Software Foundation.
-
-  If the Library as you received it specifies that a proxy can decide
-whether future versions of the GNU Lesser General Public License shall
-apply, that proxy's public statement of acceptance of any version is
-permanent authorization for you to choose that version for the
-Library.
-
---------------------------------------------------------------------------------
-
-           SPECIAL EXCEPTION GRANTED BY COPYRIGHT HOLDERS
-
-As a special exception, copyright holders give you permission to link this
-library with independent modules to produce an executable, regardless of
-the license terms of these independent modules, and to copy and distribute
-the resulting executable under terms of your choice, provided that you also
-meet, for each linked independent module, the terms and conditions of
-the license of that module. An independent module is a module which is not
-derived from or based on this library. If you modify this library, you must
-extend this exception to your version of the library.
-
-Note: this exception relieves you of any obligations under sections 4 and 5
-of this license, and section 6 of the GNU General Public License.
diff --git a/libs/libzmq/Dockerfile b/libs/libzmq/Dockerfile
deleted file mode 100644
index 6b8c0c6..0000000
--- a/libs/libzmq/Dockerfile
+++ /dev/null
@@ -1,32 +0,0 @@
-FROM debian:buster-slim AS builder
-LABEL maintainer="ZeroMQ Project <zeromq@imatix.com>"
-ARG DEBIAN_FRONTEND=noninteractive
-RUN apt-get update -qq \
-    && apt-get install -qq --yes --no-install-recommends \
-        autoconf \
-        automake \
-        build-essential \
-        git \
-        libkrb5-dev \
-        libsodium-dev \
-        libtool \
-        pkg-config \
-    && rm -rf /var/lib/apt/lists/*
-WORKDIR /opt/libzmq
-COPY . .
-RUN ./autogen.sh \
-    && ./configure --prefix=/usr/local --with-libsodium --with-libgssapi_krb5 \
-    && make \
-    && make check \
-    && make install
-
-FROM debian:buster-slim
-LABEL maintainer="ZeroMQ Project <zeromq@imatix.com>"
-ARG DEBIAN_FRONTEND=noninteractive
-RUN apt-get update -qq \
-    && apt-get install -qq --yes --no-install-recommends \
-        libkrb5-dev \
-        libsodium23 \
-    && rm -rf /var/lib/apt/lists/*
-COPY --from=builder /usr/local /usr/local
-RUN ldconfig && ldconfig -p | grep libzmq
diff --git a/libs/libzmq/Doxygen.cfg b/libs/libzmq/Doxygen.cfg
deleted file mode 100644
index 370f19b..0000000
--- a/libs/libzmq/Doxygen.cfg
+++ /dev/null
@@ -1,2320 +0,0 @@
-# Doxyfile 1.8.11
-
-# This file describes the settings to be used by the documentation system
-# doxygen (www.doxygen.org) for a project.
-#
-# All text after a double hash (##) is considered a comment and is placed in
-# front of the TAG it is preceding.
-#
-# All text after a single hash (#) is considered a comment and will be ignored.
-# The format is:
-# TAG = value [value, ...]
-# For lists, items can also be appended using:
-# TAG += value [value, ...]
-# Values that contain spaces should be placed between quotes (\" \").
-
-#---------------------------------------------------------------------------
-# Project related configuration options
-#---------------------------------------------------------------------------
-
-# This tag specifies the encoding used for all characters in the config file
-# that follow. The default is UTF-8 which is also the encoding used for all text
-# before the first occurrence of this tag. Doxygen uses libiconv (or the iconv
-# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv
-# for the list of possible encodings.
-# The default value is: UTF-8.
-
-DOXYFILE_ENCODING      = UTF-8
-
-# The PROJECT_NAME tag is a single word (or a sequence of words surrounded by
-# double-quotes, unless you are using Doxywizard) that should identify the
-# project for which the documentation is generated. This name is used in the
-# title of most generated pages and in a few other places.
-# The default value is: My Project.
-
-PROJECT_NAME           = libzmq
-
-# The PROJECT_NUMBER tag can be used to enter a project or revision number. This
-# could be handy for archiving the generated documentation or if some version
-# control system is used.
-
-PROJECT_NUMBER         = master
-
-# Using the PROJECT_BRIEF tag one can provide an optional one line description
-# for a project that appears at the top of each page and should give viewer a
-# quick idea about the purpose of the project. Keep the description short.
-
-PROJECT_BRIEF          = "ZeroMQ C++ Core Engine (LIBZMQ)"
-
-PROJECT_LOGO           = branding.bmp
-
-# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
-# into which the generated documentation will be written. If a relative path is
-# entered, it will be relative to the location where doxygen was started. If
-# left blank the current directory will be used.
-
-OUTPUT_DIRECTORY       = doxygen
-
-# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub-
-# directories (in 2 levels) under the output directory of each output format and
-# will distribute the generated files over these directories. Enabling this
-# option can be useful when feeding doxygen a huge amount of source files, where
-# putting all generated files in the same directory would otherwise causes
-# performance problems for the file system.
-# The default value is: NO.
-
-CREATE_SUBDIRS         = YES
-
-# If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII
-# characters to appear in the names of generated files. If set to NO, non-ASCII
-# characters will be escaped, for example _xE3_x81_x84 will be used for Unicode
-# U+3044.
-# The default value is: NO.
-
-ALLOW_UNICODE_NAMES    = NO
-
-# The OUTPUT_LANGUAGE tag is used to specify the language in which all
-# documentation generated by doxygen is written. Doxygen will use this
-# information to generate all constant output in the proper language.
-# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese,
-# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States),
-# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian,
-# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages),
-# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian,
-# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian,
-# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish,
-# Ukrainian and Vietnamese.
-# The default value is: English.
-
-OUTPUT_LANGUAGE        = English
-
-# If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member
-# descriptions after the members that are listed in the file and class
-# documentation (similar to Javadoc). Set to NO to disable this.
-# The default value is: YES.
-
-BRIEF_MEMBER_DESC      = YES
-
-# If the REPEAT_BRIEF tag is set to YES, doxygen will prepend the brief
-# description of a member or function before the detailed description
-#
-# Note: If both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
-# brief descriptions will be completely suppressed.
-# The default value is: YES.
-
-REPEAT_BRIEF           = YES
-
-# This tag implements a quasi-intelligent brief description abbreviator that is
-# used to form the text in various listings. Each string in this list, if found
-# as the leading text of the brief description, will be stripped from the text
-# and the result, after processing the whole list, is used as the annotated
-# text. Otherwise, the brief description is used as-is. If left blank, the
-# following values are used ($name is automatically replaced with the name of
-# the entity):The $name class, The $name widget, The $name file, is, provides,
-# specifies, contains, represents, a, an and the.
-
-ABBREVIATE_BRIEF       =
-
-# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
-# doxygen will generate a detailed section even if there is only a brief
-# description.
-# The default value is: NO.
-
-ALWAYS_DETAILED_SEC    = NO
-
-# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
-# inherited members of a class in the documentation of that class as if those
-# members were ordinary class members. Constructors, destructors and assignment
-# operators of the base classes will not be shown.
-# The default value is: NO.
-
-INLINE_INHERITED_MEMB  = NO
-
-# If the FULL_PATH_NAMES tag is set to YES, doxygen will prepend the full path
-# before files name in the file list and in the header files. If set to NO the
-# shortest path that makes the file name unique will be used
-# The default value is: YES.
-
-FULL_PATH_NAMES        = NO
-
-# The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path.
-# Stripping is only done if one of the specified strings matches the left-hand
-# part of the path. The tag can be used to show relative paths in the file list.
-# If left blank the directory from which doxygen is run is used as the path to
-# strip.
-#
-# Note that you can specify absolute paths here, but also relative paths, which
-# will be relative from the directory where doxygen is started.
-# This tag requires that the tag FULL_PATH_NAMES is set to YES.
-
-STRIP_FROM_PATH        = ../..
-
-# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the
-# path mentioned in the documentation of a class, which tells the reader which
-# header file to include in order to use a class. If left blank only the name of
-# the header file containing the class definition is used. Otherwise one should
-# specify the list of include paths that are normally passed to the compiler
-# using the -I flag.
-
-STRIP_FROM_INC_PATH    =
-
-# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but
-# less readable) file names. This can be useful is your file systems doesn't
-# support long names like on DOS, Mac, or CD-ROM.
-# The default value is: NO.
-
-SHORT_NAMES            = NO
-JAVADOC_AUTOBRIEF      = NO
-QT_AUTOBRIEF           = NO
-
-# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make doxygen treat a
-# multi-line C++ special comment block (i.e. a block of //! or /// comments) as
-# a brief description. This used to be the default behavior. The new default is
-# to treat a multi-line C++ comment block as a detailed description. Set this
-# tag to YES if you prefer the old behavior instead.
-#
-# Note that setting this tag to YES also means that rational rose comments are
-# not recognized any more.
-# The default value is: NO.
-
-MULTILINE_CPP_IS_BRIEF = NO
-
-# If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
-# documentation from any documented member that it re-implements.
-# The default value is: YES.
-
-INHERIT_DOCS           = YES
-
-# If the SEPARATE_MEMBER_PAGES tag is set to YES then doxygen will produce a new
-# page for each member. If set to NO, the documentation of a member will be part
-# of the file/class/namespace that contains it.
-# The default value is: NO.
-
-SEPARATE_MEMBER_PAGES  = NO
-
-# The TAB_SIZE tag can be used to set the number of spaces in a tab. Doxygen
-# uses this value to replace tabs by spaces in code fragments.
-# Minimum value: 1, maximum value: 16, default value: 4.
-
-TAB_SIZE               = 4
-
-# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
-# only. Doxygen will then generate output that is more tailored for C. For
-# instance, some of the names that are used will be different. The list of all
-# members will be omitted, etc.
-# The default value is: NO.
-
-OPTIMIZE_OUTPUT_FOR_C  = NO
-
-OPTIMIZE_OUTPUT_JAVA   = NO
-
-OPTIMIZE_FOR_FORTRAN   = NO
-
-OPTIMIZE_OUTPUT_VHDL   = NO
-
-# If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments
-# according to the Markdown format, which allows for more readable
-# documentation. See http://daringfireball.net/projects/markdown/ for details.
-# The output of markdown processing is further processed by doxygen, so you can
-# mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in
-# case of backward compatibilities issues.
-# The default value is: YES.
-
-MARKDOWN_SUPPORT       = YES
-
-# When enabled doxygen tries to link words that correspond to documented
-# classes, or namespaces to their corresponding documentation. Such a link can
-# be prevented in individual cases by putting a % sign in front of the word or
-# globally by setting AUTOLINK_SUPPORT to NO.
-# The default value is: YES.
-
-AUTOLINK_SUPPORT       = YES
-
-# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
-# to include (a tag file for) the STL sources as input, then you should set this
-# tag to YES in order to let doxygen match functions declarations and
-# definitions whose arguments contain STL classes (e.g. func(std::string);
-# versus func(std::string) {}). This also make the inheritance and collaboration
-# diagrams that involve STL classes more complete and accurate.
-# The default value is: NO.
-
-BUILTIN_STL_SUPPORT    = YES
-
-# If you use Microsoft's C++/CLI language, you should set this option to YES to
-# enable parsing support.
-# The default value is: NO.
-
-CPP_CLI_SUPPORT        = NO
-
-# For Microsoft's IDL there are propget and propput attributes to indicate
-# getter and setter methods for a property. Setting this option to YES will make
-# doxygen to replace the get and set methods by a property in the documentation.
-# This will only work if the methods are indeed getting or setting a simple
-# type. If this is not the case, or you want to show the methods anyway, you
-# should set this option to NO.
-# The default value is: YES.
-
-IDL_PROPERTY_SUPPORT   = YES
-
-# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
-# tag is set to YES then doxygen will reuse the documentation of the first
-# member in the group (if any) for the other members of the group. By default
-# all members of a group must be documented explicitly.
-# The default value is: NO.
-
-DISTRIBUTE_GROUP_DOC   = NO
-
-# If one adds a struct or class to a group and this option is enabled, then also
-# any nested class or struct is added to the same group. By default this option
-# is disabled and one has to add nested compounds explicitly via \ingroup.
-# The default value is: NO.
-
-GROUP_NESTED_COMPOUNDS = NO
-
-# Set the SUBGROUPING tag to YES to allow class member groups of the same type
-# (for instance a group of public functions) to be put as a subgroup of that
-# type (e.g. under the Public Functions section). Set it to NO to prevent
-# subgrouping. Alternatively, this can be done per class using the
-# \nosubgrouping command.
-# The default value is: YES.
-
-SUBGROUPING            = YES
-
-# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and unions
-# are shown inside the group in which they are included (e.g. using \ingroup)
-# instead of on a separate page (for HTML and Man pages) or section (for LaTeX
-# and RTF).
-#
-# Note that this feature does not work in combination with
-# SEPARATE_MEMBER_PAGES.
-# The default value is: NO.
-
-INLINE_GROUPED_CLASSES = NO
-
-# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and unions
-# with only public data fields or simple typedef fields will be shown inline in
-# the documentation of the scope in which they are defined (i.e. file,
-# namespace, or group documentation), provided this scope is documented. If set
-# to NO, structs, classes, and unions are shown on a separate page (for HTML and
-# Man pages) or section (for LaTeX and RTF).
-# The default value is: NO.
-
-INLINE_SIMPLE_STRUCTS  = NO
-
-# When TYPEDEF_HIDES_STRUCT tag is enabled, a typedef of a struct, union, or
-# enum is documented as struct, union, or enum with the name of the typedef. So
-# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
-# with name TypeT. When disabled the typedef will appear as a member of a file,
-# namespace, or class. And the struct will be named TypeS. This can typically be
-# useful for C code in case the coding convention dictates that all compound
-# types are typedef'ed and only the typedef is referenced, never the tag name.
-# The default value is: NO.
-
-TYPEDEF_HIDES_STRUCT   = NO
-
-# The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This
-# cache is used to resolve symbols given their name and scope. Since this can be
-# an expensive process and often the same symbol appears multiple times in the
-# code, doxygen keeps a cache of pre-resolved symbols. If the cache is too small
-# doxygen will become slower. If the cache is too large, memory is wasted. The
-# cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range
-# is 0..9, the default is 0, corresponding to a cache size of 2^16=65536
-# symbols. At the end of a run doxygen will report the cache usage and suggest
-# the optimal cache size from a speed point of view.
-# Minimum value: 0, maximum value: 9, default value: 0.
-
-LOOKUP_CACHE_SIZE      = 0
-
-#---------------------------------------------------------------------------
-# Build related configuration options
-#---------------------------------------------------------------------------
-
-# If the EXTRACT_ALL tag is set to YES, doxygen will assume all entities in
-# documentation are documented, even if no documentation was available. Private
-# class members and static file members will be hidden unless the
-# EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES.
-# Note: This will also disable the warnings about undocumented members that are
-# normally produced when WARNINGS is set to YES.
-# The default value is: NO.
-
-EXTRACT_ALL            = YES
-
-# If the EXTRACT_PRIVATE tag is set to YES, all private members of a class will
-# be included in the documentation.
-# The default value is: NO.
-
-EXTRACT_PRIVATE        = YES
-
-# If the EXTRACT_PACKAGE tag is set to YES, all members with package or internal
-# scope will be included in the documentation.
-# The default value is: NO.
-
-EXTRACT_PACKAGE        = NO
-
-# If the EXTRACT_STATIC tag is set to YES, all static members of a file will be
-# included in the documentation.
-# The default value is: NO.
-
-EXTRACT_STATIC         = YES
-
-# If the EXTRACT_LOCAL_CLASSES tag is set to YES, classes (and structs) defined
-# locally in source files will be included in the documentation. If set to NO,
-# only classes defined in header files are included. Does not have any effect
-# for Java sources.
-# The default value is: YES.
-
-EXTRACT_LOCAL_CLASSES  = YES
-
-# If this flag is set to YES, the members of anonymous namespaces will be
-# extracted and appear in the documentation as a namespace called
-# 'anonymous_namespace{file}', where file will be replaced with the base name of
-# the file that contains the anonymous namespace. By default anonymous namespace
-# are hidden.
-# The default value is: NO.
-
-EXTRACT_ANON_NSPACES   = YES
-
-# If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all
-# undocumented members inside documented classes or files. If set to NO these
-# members will be included in the various overviews, but no documentation
-# section is generated. This option has no effect if EXTRACT_ALL is enabled.
-# The default value is: NO.
-
-HIDE_UNDOC_MEMBERS     = NO
-
-# If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all
-# undocumented classes that are normally visible in the class hierarchy. If set
-# to NO, these classes will be included in the various overviews. This option
-# has no effect if EXTRACT_ALL is enabled.
-# The default value is: NO.
-
-HIDE_UNDOC_CLASSES     = NO
-
-# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
-# (class|struct|union) declarations. If set to NO, these declarations will be
-# included in the documentation.
-# The default value is: NO.
-
-HIDE_FRIEND_COMPOUNDS  = NO
-
-# If the HIDE_IN_BODY_DOCS tag is set to YES, doxygen will hide any
-# documentation blocks found inside the body of a function. If set to NO, these
-# blocks will be appended to the function's detailed documentation block.
-# The default value is: NO.
-
-HIDE_IN_BODY_DOCS      = NO
-
-# The INTERNAL_DOCS tag determines if documentation that is typed after a
-# \internal command is included. If the tag is set to NO then the documentation
-# will be excluded. Set it to YES to include the internal documentation.
-# The default value is: NO.
-
-INTERNAL_DOCS          = NO
-
-# If the CASE_SENSE_NAMES tag is set to NO then doxygen will only generate file
-# names in lower-case letters. If set to YES, upper-case letters are also
-# allowed. This is useful if you have classes or files whose names only differ
-# in case and if your file system supports case sensitive file names. Windows
-# and Mac users are advised to set this option to NO.
-# The default value is: system dependent.
-
-CASE_SENSE_NAMES       = YES
-
-# If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with
-# their full class and namespace scopes in the documentation. If set to YES, the
-# scope will be hidden.
-# The default value is: NO.
-
-HIDE_SCOPE_NAMES       = NO
-
-# If the HIDE_COMPOUND_REFERENCE tag is set to NO (default) then doxygen will
-# append additional text to a page's title, such as Class Reference. If set to
-# YES the compound reference will be hidden.
-# The default value is: NO.
-
-HIDE_COMPOUND_REFERENCE= NO
-
-# If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
-# the files that are included by a file in the documentation of that file.
-# The default value is: YES.
-
-SHOW_INCLUDE_FILES     = YES
-
-# If the SHOW_GROUPED_MEMB_INC tag is set to YES then Doxygen will add for each
-# grouped member an include statement to the documentation, telling the reader
-# which file to include in order to use the member.
-# The default value is: NO.
-
-SHOW_GROUPED_MEMB_INC  = NO
-
-# If the FORCE_LOCAL_INCLUDES tag is set to YES then doxygen will list include
-# files with double quotes in the documentation rather than with sharp brackets.
-# The default value is: NO.
-
-FORCE_LOCAL_INCLUDES   = NO
-
-# If the INLINE_INFO tag is set to YES then a tag [inline] is inserted in the
-# documentation for inline members.
-# The default value is: YES.
-
-INLINE_INFO            = YES
-
-# If the SORT_MEMBER_DOCS tag is set to YES then doxygen will sort the
-# (detailed) documentation of file and class members alphabetically by member
-# name. If set to NO, the members will appear in declaration order.
-# The default value is: YES.
-
-SORT_MEMBER_DOCS       = YES
-
-# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief
-# descriptions of file, namespace and class members alphabetically by member
-# name. If set to NO, the members will appear in declaration order. Note that
-# this will also influence the order of the classes in the class list.
-# The default value is: NO.
-
-SORT_BRIEF_DOCS        = YES
-
-# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the
-# (brief and detailed) documentation of class members so that constructors and
-# destructors are listed first. If set to NO the constructors will appear in the
-# respective orders defined by SORT_BRIEF_DOCS and SORT_MEMBER_DOCS.
-# Note: If SORT_BRIEF_DOCS is set to NO this option is ignored for sorting brief
-# member documentation.
-# Note: If SORT_MEMBER_DOCS is set to NO this option is ignored for sorting
-# detailed member documentation.
-# The default value is: NO.
-
-SORT_MEMBERS_CTORS_1ST = YES
-
-# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the hierarchy
-# of group names into alphabetical order. If set to NO the group names will
-# appear in their defined order.
-# The default value is: NO.
-
-SORT_GROUP_NAMES       = NO
-
-# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be sorted by
-# fully-qualified names, including namespaces. If set to NO, the class list will
-# be sorted only by class name, not including the namespace part.
-# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
-# Note: This option applies only to the class list, not to the alphabetical
-# list.
-# The default value is: NO.
-
-SORT_BY_SCOPE_NAME     = NO
-
-# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper
-# type resolution of all parameters of a function it will reject a match between
-# the prototype and the implementation of a member function even if there is
-# only one candidate or it is obvious which candidate to choose by doing a
-# simple string match. By disabling STRICT_PROTO_MATCHING doxygen will still
-# accept a match between prototype and implementation in such cases.
-# The default value is: NO.
-
-STRICT_PROTO_MATCHING  = NO
-
-# The GENERATE_TODOLIST tag can be used to enable (YES) or disable (NO) the todo
-# list. This list is created by putting \todo commands in the documentation.
-# The default value is: YES.
-
-GENERATE_TODOLIST      = YES
-
-# The GENERATE_TESTLIST tag can be used to enable (YES) or disable (NO) the test
-# list. This list is created by putting \test commands in the documentation.
-# The default value is: YES.
-
-GENERATE_TESTLIST      = YES
-
-# The GENERATE_BUGLIST tag can be used to enable (YES) or disable (NO) the bug
-# list. This list is created by putting \bug commands in the documentation.
-# The default value is: YES.
-
-GENERATE_BUGLIST       = YES
-
-# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or disable (NO)
-# the deprecated list. This list is created by putting \deprecated commands in
-# the documentation.
-# The default value is: YES.
-
-GENERATE_DEPRECATEDLIST= YES
-
-# The MAX_INITIALIZER_LINES tag determines the maximum number of lines that the
-# initial value of a variable or macro / define can have for it to appear in the
-# documentation. If the initializer consists of more lines than specified here
-# it will be hidden. Use a value of 0 to hide initializers completely. The
-# appearance of the value of individual variables and macros / defines can be
-# controlled using \showinitializer or \hideinitializer command in the
-# documentation regardless of this setting.
-# Minimum value: 0, maximum value: 10000, default value: 30.
-
-MAX_INITIALIZER_LINES  = 30
-
-# Set the SHOW_USED_FILES tag to NO to disable the list of files generated at
-# the bottom of the documentation of classes and structs. If set to YES, the
-# list will mention the files that were used to generate the documentation.
-# The default value is: YES.
-
-SHOW_USED_FILES        = NO
-
-# Set the SHOW_FILES tag to NO to disable the generation of the Files page. This
-# will remove the Files entry from the Quick Index and from the Folder Tree View
-# (if specified).
-# The default value is: YES.
-
-SHOW_FILES             = YES
-
-# Set the SHOW_NAMESPACES tag to NO to disable the generation of the Namespaces
-# page. This will remove the Namespaces entry from the Quick Index and from the
-# Folder Tree View (if specified).
-# The default value is: YES.
-
-SHOW_NAMESPACES        = NO
-
-# The FILE_VERSION_FILTER tag can be used to specify a program or script that
-# doxygen should invoke to get the current version for each file (typically from
-# the version control system). Doxygen will invoke the program by executing (via
-# popen()) the command command input-file, where command is the value of the
-# FILE_VERSION_FILTER tag, and input-file is the name of an input file provided
-# by doxygen. Whatever the program writes to standard output is used as the file
-# version. For an example see the documentation.
-
-FILE_VERSION_FILTER    =
-
-# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
-# by doxygen. The layout file controls the global structure of the generated
-# output files in an output format independent way. To create the layout file
-# that represents doxygen's defaults, run doxygen with the -l option. You can
-# optionally specify a file name after the option, if omitted DoxygenLayout.xml
-# will be used as the name of the layout file.
-#
-# Note that if you run doxygen from a directory containing a file called
-# DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
-# tag is left empty.
-
-LAYOUT_FILE            =
-
-# The CITE_BIB_FILES tag can be used to specify one or more bib files containing
-# the reference definitions. This must be a list of .bib files. The .bib
-# extension is automatically appended if omitted. This requires the bibtex tool
-# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info.
-# For LaTeX the style of the bibliography can be controlled using
-# LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the
-# search path. See also \cite for info how to create references.
-
-CITE_BIB_FILES         =
-
-#---------------------------------------------------------------------------
-# Configuration options related to warning and progress messages
-#---------------------------------------------------------------------------
-
-# The QUIET tag can be used to turn on/off the messages that are generated to
-# standard output by doxygen. If QUIET is set to YES this implies that the
-# messages are off.
-# The default value is: NO.
-
-QUIET                  = NO
-
-# The WARNINGS tag can be used to turn on/off the warning messages that are
-# generated to standard error (stderr) by doxygen. If WARNINGS is set to YES
-# this implies that the warnings are on.
-#
-# Tip: Turn warnings on while writing the documentation.
-# The default value is: YES.
-
-WARNINGS               = YES
-
-# If the WARN_IF_UNDOCUMENTED tag is set to YES then doxygen will generate
-# warnings for undocumented members. If EXTRACT_ALL is set to YES then this flag
-# will automatically be disabled.
-# The default value is: YES.
-
-WARN_IF_UNDOCUMENTED   = NO
-
-# If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
-# potential errors in the documentation, such as not documenting some parameters
-# in a documented function, or documenting parameters that don't exist or using
-# markup commands wrongly.
-# The default value is: YES.
-
-WARN_IF_DOC_ERROR      = YES
-
-# This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
-# are documented, but have no documentation for their parameters or return
-# value. If set to NO, doxygen will only warn about wrong or incomplete
-# parameter documentation, but not about the absence of documentation.
-# The default value is: NO.
-
-WARN_NO_PARAMDOC       = NO
-
-# If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when
-# a warning is encountered.
-# The default value is: NO.
-
-WARN_AS_ERROR          = NO
-
-# The WARN_FORMAT tag determines the format of the warning messages that doxygen
-# can produce. The string should contain the $file, $line, and $text tags, which
-# will be replaced by the file and line number from which the warning originated
-# and the warning text. Optionally the format may contain $version, which will
-# be replaced by the version of the file (if it could be obtained via
-# FILE_VERSION_FILTER)
-# The default value is: $file:$line: $text.
-
-WARN_FORMAT            =
-
-# The WARN_LOGFILE tag can be used to specify a file to which warning and error
-# messages should be written. If left blank the output is written to standard
-# error (stderr).
-
-WARN_LOGFILE           =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the input files
-#---------------------------------------------------------------------------
-
-# The INPUT tag is used to specify the files and/or directories that contain
-# documented source files. You may enter file names like myfile.cpp or
-# directories like /usr/src/myproject. Separate the files or directories with
-# spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
-# Note: If this tag is empty the current directory is searched.
-
-INPUT                  = include \
-                         src \
-                         tests \
-                         perf \
-                         README.doxygen.md
-
-# This tag can be used to specify the character encoding of the source files
-# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
-# libiconv (or the iconv built into libc) for the transcoding. See the libiconv
-# documentation (see: http://www.gnu.org/software/libiconv) for the list of
-# possible encodings.
-# The default value is: UTF-8.
-
-INPUT_ENCODING         = UTF-8
-
-# If the value of the INPUT tag contains directories, you can use the
-# FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and
-# *.h) to filter out the source-files in the directories.
-#
-# Note that for custom extensions or not directly supported extensions you also
-# need to set EXTENSION_MAPPING for the extension otherwise the files are not
-# read by doxygen.
-#
-# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
-# *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
-# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
-# *.m, *.markdown, *.md, *.mm, *.dox, *.py, *.pyw, *.f90, *.f, *.for, *.tcl,
-# *.vhd, *.vhdl, *.ucf, *.qsf, *.as and *.js.
-
-FILE_PATTERNS          = *.c \
-                         *.cpp \
-                         *.h \
-                         *.hpp
-
-# The RECURSIVE tag can be used to specify whether or not subdirectories should
-# be searched for input files as well.
-# The default value is: NO.
-
-RECURSIVE              = YES
-
-# The EXCLUDE tag can be used to specify files and/or directories that should be
-# excluded from the INPUT source files. This way you can easily exclude a
-# subdirectory from a directory tree whose root is specified with the INPUT tag.
-#
-# Note that relative paths are relative to the directory from which doxygen is
-# run.
-
-EXCLUDE                =
-
-# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
-# directories that are symbolic links (a Unix file system feature) are excluded
-# from the input.
-# The default value is: NO.
-
-EXCLUDE_SYMLINKS       = NO
-
-# If the value of the INPUT tag contains directories, you can use the
-# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
-# certain files from those directories.
-#
-# Note that the wildcards are matched against the file with absolute path, so to
-# exclude all test directories for example use the pattern */test/*
-
-EXCLUDE_PATTERNS       =
-
-# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
-# (namespaces, classes, functions, etc.) that should be excluded from the
-# output. The symbol name can be a fully qualified name, a word, or if the
-# wildcard * is used, a substring. Examples: ANamespace, AClass,
-# AClass::ANamespace, ANamespace::*Test
-#
-# Note that the wildcards are matched against the file with absolute path, so to
-# exclude all test directories use the pattern */test/*
-
-EXCLUDE_SYMBOLS        =
-
-# The EXAMPLE_PATH tag can be used to specify one or more files or directories
-# that contain example code fragments that are included (see the \include
-# command).
-
-EXAMPLE_PATH           = tests perf
-
-# If the value of the EXAMPLE_PATH tag contains directories, you can use the
-# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and
-# *.h) to filter out the source-files in the directories. If left blank all
-# files are included.
-
-EXAMPLE_PATTERNS       =
-
-# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
-# searched for input files to be used with the \include or \dontinclude commands
-# irrespective of the value of the RECURSIVE tag.
-# The default value is: NO.
-
-EXAMPLE_RECURSIVE      = YES
-
-# The IMAGE_PATH tag can be used to specify one or more files or directories
-# that contain images that are to be included in the documentation (see the
-# \image command).
-
-IMAGE_PATH             =
-
-# The INPUT_FILTER tag can be used to specify a program that doxygen should
-# invoke to filter for each input file. Doxygen will invoke the filter program
-# by executing (via popen()) the command:
-#
-# <filter> <input-file>
-#
-# where <filter> is the value of the INPUT_FILTER tag, and <input-file> is the
-# name of an input file. Doxygen will then use the output that the filter
-# program writes to standard output. If FILTER_PATTERNS is specified, this tag
-# will be ignored.
-#
-# Note that the filter must not add or remove lines; it is applied before the
-# code is scanned, but not when the output code is generated. If lines are added
-# or removed, the anchors will not be placed correctly.
-#
-# Note that for custom extensions or not directly supported extensions you also
-# need to set EXTENSION_MAPPING for the extension otherwise the files are not
-# properly processed by doxygen.
-
-INPUT_FILTER           =
-
-# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
-# basis. Doxygen will compare the file name with each pattern and apply the
-# filter if there is a match. The filters are a list of the form: pattern=filter
-# (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how
-# filters are used. If the FILTER_PATTERNS tag is empty or if none of the
-# patterns match the file name, INPUT_FILTER is applied.
-#
-# Note that for custom extensions or not directly supported extensions you also
-# need to set EXTENSION_MAPPING for the extension otherwise the files are not
-# properly processed by doxygen.
-
-FILTER_PATTERNS        =
-
-# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
-# INPUT_FILTER) will also be used to filter the input files that are used for
-# producing the source files to browse (i.e. when SOURCE_BROWSER is set to YES).
-# The default value is: NO.
-
-FILTER_SOURCE_FILES    = NO
-
-# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file
-# pattern. A pattern will override the setting for FILTER_PATTERN (if any) and
-# it is also possible to disable source filtering for a specific pattern using
-# *.ext= (so without naming a filter).
-# This tag requires that the tag FILTER_SOURCE_FILES is set to YES.
-
-FILTER_SOURCE_PATTERNS =
-
-# If the USE_MDFILE_AS_MAINPAGE tag refers to the name of a markdown file that
-# is part of the input, its contents will be placed on the main page
-# (index.html). This can be useful if you have a project on for instance GitHub
-# and want to reuse the introduction page also for the doxygen output.
-
-USE_MDFILE_AS_MAINPAGE = README.doxygen.md
-
-#---------------------------------------------------------------------------
-# Configuration options related to source browsing
-#---------------------------------------------------------------------------
-
-# If the SOURCE_BROWSER tag is set to YES then a list of source files will be
-# generated. Documented entities will be cross-referenced with these sources.
-#
-# Note: To get rid of all source code in the generated output, make sure that
-# also VERBATIM_HEADERS is set to NO.
-# The default value is: NO.
-
-SOURCE_BROWSER         = YES
-
-# Setting the INLINE_SOURCES tag to YES will include the body of functions,
-# classes and enums directly into the documentation.
-# The default value is: NO.
-
-INLINE_SOURCES         = NO
-
-# Setting the STRIP_CODE_COMMENTS tag to YES will instruct doxygen to hide any
-# special comment blocks from generated source code fragments. Normal C, C++ and
-# Fortran comments will always remain visible.
-# The default value is: YES.
-
-STRIP_CODE_COMMENTS    = NO
-
-# If the REFERENCED_BY_RELATION tag is set to YES then for each documented
-# function all documented functions referencing it will be listed.
-# The default value is: NO.
-
-REFERENCED_BY_RELATION = YES
-
-# If the REFERENCES_RELATION tag is set to YES then for each documented function
-# all documented entities called/used by that function will be listed.
-# The default value is: NO.
-
-REFERENCES_RELATION    = YES
-
-# If the REFERENCES_LINK_SOURCE tag is set to YES and SOURCE_BROWSER tag is set
-# to YES then the hyperlinks from functions in REFERENCES_RELATION and
-# REFERENCED_BY_RELATION lists will link to the source code. Otherwise they will
-# link to the documentation.
-# The default value is: YES.
-
-REFERENCES_LINK_SOURCE = YES
-
-# If SOURCE_TOOLTIPS is enabled (the default) then hovering a hyperlink in the
-# source code will show a tooltip with additional information such as prototype,
-# brief description and links to the definition and documentation. Since this
-# will make the HTML file larger and loading of large files a bit slower, you
-# can opt to disable this feature.
-# The default value is: YES.
-# This tag requires that the tag SOURCE_BROWSER is set to YES.
-
-SOURCE_TOOLTIPS        = YES
-
-# If the USE_HTAGS tag is set to YES then the references to source code will
-# point to the HTML generated by the htags(1) tool instead of doxygen built-in
-# source browser. The htags tool is part of GNU's global source tagging system
-# (see http://www.gnu.org/software/global/global.html). You will need version
-# 4.8.6 or higher.
-#
-# To use it do the following:
-# - Install the latest version of global
-# - Enable SOURCE_BROWSER and USE_HTAGS in the config file
-# - Make sure the INPUT points to the root of the source tree
-# - Run doxygen as normal
-#
-# Doxygen will invoke htags (and that will in turn invoke gtags), so these
-# tools must be available from the command line (i.e. in the search path).
-#
-# The result: instead of the source browser generated by doxygen, the links to
-# source code will now point to the output of htags.
-# The default value is: NO.
-# This tag requires that the tag SOURCE_BROWSER is set to YES.
-
-USE_HTAGS              = NO
-
-# If the VERBATIM_HEADERS tag is set the YES then doxygen will generate a
-# verbatim copy of the header file for each class for which an include is
-# specified. Set to NO to disable this.
-# See also: Section \class.
-# The default value is: YES.
-
-VERBATIM_HEADERS       = YES
-
-#---------------------------------------------------------------------------
-# Configuration options related to the alphabetical class index
-#---------------------------------------------------------------------------
-
-# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index of all
-# compounds will be generated. Enable this if the project contains a lot of
-# classes, structs, unions or interfaces.
-# The default value is: YES.
-
-ALPHABETICAL_INDEX     = YES
-
-# The COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns in
-# which the alphabetical index list will be split.
-# Minimum value: 1, maximum value: 20, default value: 5.
-# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
-
-COLS_IN_ALPHA_INDEX    = 4
-
-# In case all classes in a project start with a common prefix, all classes will
-# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag
-# can be used to specify a prefix (or a list of prefixes) that should be ignored
-# while generating the index headers.
-# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
-
-IGNORE_PREFIX          =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the HTML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_HTML tag is set to YES, doxygen will generate HTML output
-# The default value is: YES.
-
-GENERATE_HTML          = YES
-
-# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it.
-# The default directory is: html.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_OUTPUT            = html
-
-# The HTML_FILE_EXTENSION tag can be used to specify the file extension for each
-# generated HTML page (for example: .htm, .php, .asp).
-# The default value is: .html.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_FILE_EXTENSION    = .html
-
-# The HTML_HEADER tag can be used to specify a user-defined HTML header file for
-# each generated HTML page. If the tag is left blank doxygen will generate a
-# standard header.
-#
-# To get valid HTML the header file that includes any scripts and style sheets
-# that doxygen needs, which is dependent on the configuration options used (e.g.
-# the setting GENERATE_TREEVIEW). It is highly recommended to start with a
-# default header using
-# doxygen -w html new_header.html new_footer.html new_stylesheet.css
-# YourConfigFile
-# and then modify the file new_header.html. See also section "Doxygen usage"
-# for information on how to generate the default header that doxygen normally
-# uses.
-# Note: The header is subject to change so you typically have to regenerate the
-# default header when upgrading to a newer version of doxygen. For a description
-# of the possible markers and block names see the documentation.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-# HTML_HEADER            = doxygen.header
-
-# The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each
-# generated HTML page. If the tag is left blank doxygen will generate a standard
-# footer. See HTML_HEADER for more information on how to generate a default
-# footer and what special commands can be used inside the footer. See also
-# section "Doxygen usage" for information on how to generate the default footer
-# that doxygen normally uses.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-# HTML_FOOTER            = doxygen.footer
-
-# The HTML_STYLESHEET tag can be used to specify a user-defined cascading style
-# sheet that is used by each HTML page. It can be used to fine-tune the look of
-# the HTML output. If left blank doxygen will generate a default style sheet.
-# See also section "Doxygen usage" for information on how to generate the style
-# sheet that doxygen normally uses.
-# Note: It is recommended to use HTML_EXTRA_STYLESHEET instead of this tag, as
-# it is more robust and this tag (HTML_STYLESHEET) will in the future become
-# obsolete.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-# HTML_STYLESHEET        = doxygen.css
-
-# The HTML_EXTRA_STYLESHEET tag can be used to specify additional user-defined
-# cascading style sheets that are included after the standard style sheets
-# created by doxygen. Using this option one can overrule certain style aspects.
-# This is preferred over using HTML_STYLESHEET since it does not replace the
-# standard style sheet and is therefore more robust against future updates.
-# Doxygen will copy the style sheet files to the output directory.
-# Note: The order of the extra style sheet files is of importance (e.g. the last
-# style sheet in the list overrules the setting of the previous ones in the
-# list). For an example see the documentation.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_EXTRA_STYLESHEET  =
-
-# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
-# other source files which should be copied to the HTML output directory. Note
-# that these files will be copied to the base HTML output directory. Use the
-# $relpath^ marker in the HTML_HEADER and/or HTML_FOOTER files to load these
-# files. In the HTML_STYLESHEET file, use the file name only. Also note that the
-# files will be copied as-is; there are no commands or markers available.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_EXTRA_FILES       =
-
-# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
-# will adjust the colors in the style sheet and background images according to
-# this color. Hue is specified as an angle on a colorwheel, see
-# http://en.wikipedia.org/wiki/Hue for more information. For instance the value
-# 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
-# purple, and 360 is red again.
-# Minimum value: 0, maximum value: 359, default value: 220.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-# HTML_COLORSTYLE_HUE    = 240
-
-# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
-# in the HTML output. For a value of 0 the output will use grayscales only. A
-# value of 255 will produce the most vivid colors.
-# Minimum value: 0, maximum value: 255, default value: 100.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-#HTML_COLORSTYLE_SAT    = 100
-
-# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to the
-# luminance component of the colors in the HTML output. Values below 100
-# gradually make the output lighter, whereas values above 100 make the output
-# darker. The value divided by 100 is the actual gamma applied, so 80 represents
-# a gamma of 0.8, The value 220 represents a gamma of 2.2, and 100 does not
-# change the gamma.
-# Minimum value: 40, maximum value: 240, default value: 80.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-#HTML_COLORSTYLE_GAMMA  = 80
-
-# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
-# page will contain the date and time when the page was generated. Setting this
-# to YES can help to show when doxygen was last run and thus if the
-# documentation is up to date.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_TIMESTAMP         = NO
-
-# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
-# documentation will contain sections that can be hidden and shown after the
-# page has loaded.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_DYNAMIC_SECTIONS  = NO
-
-# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of entries
-# shown in the various tree structured indices initially; the user can expand
-# and collapse entries dynamically later on. Doxygen will expand the tree to
-# such a level that at most the specified number of entries are visible (unless
-# a fully collapsed tree already exceeds this amount). So setting the number of
-# entries 1 will produce a full collapsed tree by default. 0 is a special value
-# representing an infinite number of entries and will result in a full expanded
-# tree by default.
-# Minimum value: 0, maximum value: 9999, default value: 100.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_INDEX_NUM_ENTRIES = 100
-
-# If the GENERATE_DOCSET tag is set to YES, additional index files will be
-# generated that can be used as input for Apple's Xcode 3 integrated development
-# environment (see: http://developer.apple.com/tools/xcode/), introduced with
-# OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a
-# Makefile in the HTML output directory. Running make will produce the docset in
-# that directory and running make install will install the docset in
-# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at
-# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html
-# for more information.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_DOCSET        = NO
-
-# This tag determines the name of the docset feed. A documentation feed provides
-# an umbrella under which multiple documentation sets from a single provider
-# (such as a company or product suite) can be grouped.
-# The default value is: Doxygen generated docs.
-# This tag requires that the tag GENERATE_DOCSET is set to YES.
-
-DOCSET_FEEDNAME        = "Doxygen generated docs"
-
-# This tag specifies a string that should uniquely identify the documentation
-# set bundle. This should be a reverse domain-name style string, e.g.
-# com.mycompany.MyDocSet. Doxygen will append .docset to the name.
-# The default value is: org.doxygen.Project.
-# This tag requires that the tag GENERATE_DOCSET is set to YES.
-
-DOCSET_BUNDLE_ID       = org.doxygen.Project
-
-# The DOCSET_PUBLISHER_ID tag specifies a string that should uniquely identify
-# the documentation publisher. This should be a reverse domain-name style
-# string, e.g. com.mycompany.MyDocSet.documentation.
-# The default value is: org.doxygen.Publisher.
-# This tag requires that the tag GENERATE_DOCSET is set to YES.
-
-DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
-
-# The DOCSET_PUBLISHER_NAME tag identifies the documentation publisher.
-# The default value is: Publisher.
-# This tag requires that the tag GENERATE_DOCSET is set to YES.
-
-DOCSET_PUBLISHER_NAME  = Publisher
-
-# If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
-# additional HTML index files: index.hhp, index.hhc, and index.hhk. The
-# index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
-# (see: http://www.microsoft.com/en-us/download/details.aspx?id=21138) on
-# Windows.
-#
-# The HTML Help Workshop contains a compiler that can convert all HTML output
-# generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
-# files are now used as the Windows 98 help format, and will replace the old
-# Windows help format (.hlp) on all Windows platforms in the future. Compressed
-# HTML files also contain an index, a table of contents, and you can search for
-# words in the documentation. The HTML workshop also contains a viewer for
-# compressed HTML files.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_HTMLHELP      = NO
-
-# The CHM_FILE tag can be used to specify the file name of the resulting .chm
-# file. You can add a path in front of the file if the result should not be
-# written to the html output directory.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-CHM_FILE               =
-
-# The HHC_LOCATION tag can be used to specify the location (absolute path
-# including file name) of the HTML help compiler (hhc.exe). If non-empty,
-# doxygen will try to run the HTML help compiler on the generated index.hhp.
-# The file has to be specified with full path.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-HHC_LOCATION           =
-
-# The GENERATE_CHI flag controls if a separate .chi index file is generated
-# (YES) or that it should be included in the master .chm file (NO).
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-GENERATE_CHI           = NO
-
-# The CHM_INDEX_ENCODING is used to encode HtmlHelp index (hhk), content (hhc)
-# and project file content.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-CHM_INDEX_ENCODING     =
-
-# The BINARY_TOC flag controls whether a binary table of contents is generated
-# (YES) or a normal table of contents (NO) in the .chm file. Furthermore it
-# enables the Previous and Next buttons.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-BINARY_TOC             = NO
-
-# The TOC_EXPAND flag can be set to YES to add extra items for group members to
-# the table of contents of the HTML help documentation and to the tree view.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
-
-TOC_EXPAND             = NO
-
-# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
-# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated that
-# can be used as input for Qt's qhelpgenerator to generate a Qt Compressed Help
-# (.qch) of the generated HTML documentation.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_QHP           = NO
-
-# If the QHG_LOCATION tag is specified, the QCH_FILE tag can be used to specify
-# the file name of the resulting .qch file. The path specified is relative to
-# the HTML output folder.
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QCH_FILE               =
-
-# The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help
-# Project output. For more information please see Qt Help Project / Namespace
-# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace).
-# The default value is: org.doxygen.Project.
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_NAMESPACE          = org.doxygen.Project
-
-# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt
-# Help Project output. For more information please see Qt Help Project / Virtual
-# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual-
-# folders).
-# The default value is: doc.
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_VIRTUAL_FOLDER     = doc
-
-# If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom
-# filter to add. For more information please see Qt Help Project / Custom
-# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
-# filters).
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_CUST_FILTER_NAME   =
-
-# The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the
-# custom filter to add. For more information please see Qt Help Project / Custom
-# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
-# filters).
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_CUST_FILTER_ATTRS  =
-
-# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
-# project's filter section matches. Qt Help Project / Filter Attributes (see:
-# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes).
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHP_SECT_FILTER_ATTRS  =
-
-# The QHG_LOCATION tag can be used to specify the location of Qt's
-# qhelpgenerator. If non-empty doxygen will try to run qhelpgenerator on the
-# generated .qhp file.
-# This tag requires that the tag GENERATE_QHP is set to YES.
-
-QHG_LOCATION           =
-
-# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files will be
-# generated, together with the HTML files, they form an Eclipse help plugin. To
-# install this plugin and make it available under the help contents menu in
-# Eclipse, the contents of the directory containing the HTML and XML files needs
-# to be copied into the plugins directory of eclipse. The name of the directory
-# within the plugins directory should be the same as the ECLIPSE_DOC_ID value.
-# After copying Eclipse needs to be restarted before the help appears.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_ECLIPSEHELP   = NO
-
-# A unique identifier for the Eclipse help plugin. When installing the plugin
-# the directory name containing the HTML and XML files should also have this
-# name. Each documentation set should have its own identifier.
-# The default value is: org.doxygen.Project.
-# This tag requires that the tag GENERATE_ECLIPSEHELP is set to YES.
-
-ECLIPSE_DOC_ID         = org.doxygen.Project
-
-# If you want full control over the layout of the generated HTML pages it might
-# be necessary to disable the index and replace it with your own. The
-# DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs) at top
-# of each HTML page. A value of NO enables the index and the value YES disables
-# it. Since the tabs in the index contain the same information as the navigation
-# tree, you can set this option to YES if you also set GENERATE_TREEVIEW to YES.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-DISABLE_INDEX          = NO
-
-# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
-# structure should be generated to display hierarchical information. If the tag
-# value is set to YES, a side panel will be generated containing a tree-like
-# index structure (just like the one that is generated for HTML Help). For this
-# to work a browser that supports JavaScript, DHTML, CSS and frames is required
-# (i.e. any modern browser). Windows users are probably better off using the
-# HTML help feature. Via custom style sheets (see HTML_EXTRA_STYLESHEET) one can
-# further fine-tune the look of the index. As an example, the default style
-# sheet generated by doxygen has an example that shows how to put an image at
-# the root of the tree instead of the PROJECT_NAME. Since the tree basically has
-# the same information as the tab index, you could consider setting
-# DISABLE_INDEX to YES when enabling this option.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-GENERATE_TREEVIEW      = YES
-
-# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
-# doxygen will group on one line in the generated HTML documentation.
-#
-# Note that a value of 0 will completely suppress the enum values from appearing
-# in the overview section.
-# Minimum value: 0, maximum value: 20, default value: 4.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-ENUM_VALUES_PER_LINE   = 4
-
-# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be used
-# to set the initial width (in pixels) of the frame in which the tree is shown.
-# Minimum value: 0, maximum value: 1500, default value: 250.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-TREEVIEW_WIDTH         = 200
-
-# If the EXT_LINKS_IN_WINDOW option is set to YES, doxygen will open links to
-# external symbols imported via tag files in a separate window.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-EXT_LINKS_IN_WINDOW    = NO
-
-# Use this tag to change the font size of LaTeX formulas included as images in
-# the HTML documentation. When you change the font size after a successful
-# doxygen run you need to manually remove any form_*.png images from the HTML
-# output directory to force them to be regenerated.
-# Minimum value: 8, maximum value: 50, default value: 10.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-FORMULA_FONTSIZE       = 10
-
-# Use the FORMULA_TRANPARENT tag to determine whether or not the images
-# generated for formulas are transparent PNGs. Transparent PNGs are not
-# supported properly for IE 6.0, but are supported on all modern browsers.
-#
-# Note that when changing this option you need to delete any form_*.png files in
-# the HTML output directory before the changes have effect.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-FORMULA_TRANSPARENT    = YES
-
-# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
-# http://www.mathjax.org) which uses client side Javascript for the rendering
-# instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
-# installed or if you want to formulas look prettier in the HTML output. When
-# enabled you may also need to install MathJax separately and configure the path
-# to it using the MATHJAX_RELPATH option.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-USE_MATHJAX            = NO
-
-# When MathJax is enabled you can set the default output format to be used for
-# the MathJax output. See the MathJax site (see:
-# http://docs.mathjax.org/en/latest/output.html) for more details.
-# Possible values are: HTML-CSS (which is slower, but has the best
-# compatibility), NativeMML (i.e. MathML) and SVG.
-# The default value is: HTML-CSS.
-# This tag requires that the tag USE_MATHJAX is set to YES.
-
-MATHJAX_FORMAT         = HTML-CSS
-
-# When MathJax is enabled you need to specify the location relative to the HTML
-# output directory using the MATHJAX_RELPATH option. The destination directory
-# should contain the MathJax.js script. For instance, if the mathjax directory
-# is located at the same level as the HTML output directory, then
-# MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
-# Content Delivery Network so you can quickly see the result without installing
-# MathJax. However, it is strongly recommended to install a local copy of
-# MathJax from http://www.mathjax.org before deployment.
-# The default value is: http://cdn.mathjax.org/mathjax/latest.
-# This tag requires that the tag USE_MATHJAX is set to YES.
-
-MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
-
-# The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
-# extension names that should be enabled during MathJax rendering. For example
-# MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
-# This tag requires that the tag USE_MATHJAX is set to YES.
-
-MATHJAX_EXTENSIONS     =
-
-# The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces
-# of code that will be used on startup of the MathJax code. See the MathJax site
-# (see: http://docs.mathjax.org/en/latest/output.html) for more details. For an
-# example see the documentation.
-# This tag requires that the tag USE_MATHJAX is set to YES.
-
-MATHJAX_CODEFILE       =
-
-# When the SEARCHENGINE tag is enabled doxygen will generate a search box for
-# the HTML output. The underlying search engine uses javascript and DHTML and
-# should work on any modern browser. Note that when using HTML help
-# (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET)
-# there is already a search function so this one should typically be disabled.
-# For large projects the javascript based search engine can be slow, then
-# enabling SERVER_BASED_SEARCH may provide a better solution. It is possible to
-# search using the keyboard; to jump to the search box use <access key> + S
-# (what the <access key> is depends on the OS and browser, but it is typically
-# <CTRL>, <ALT>/<option>, or both). Inside the search box use the <cursor down
-# key> to jump into the search results window, the results can be navigated
-# using the <cursor keys>. Press <Enter> to select an item or <escape> to cancel
-# the search. The filter options can be selected when the cursor is inside the
-# search box by pressing <Shift>+<cursor down>. Also here use the <cursor keys>
-# to select a filter and <Enter> or <escape> to activate or cancel the filter
-# option.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-SEARCHENGINE           = NO
-
-# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a web server instead of a web client using Javascript. There
-# are two flavors of web server based searching depending on the EXTERNAL_SEARCH
-# setting. When disabled, doxygen will generate a PHP script for searching and
-# an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
-# and searching needs to be provided by external tools. See the section
-# "External Indexing and Searching" for details.
-# The default value is: NO.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-SERVER_BASED_SEARCH    = NO
-
-# When EXTERNAL_SEARCH tag is enabled doxygen will no longer generate the PHP
-# script for searching. Instead the search results are written to an XML file
-# which needs to be processed by an external indexer. Doxygen will invoke an
-# external search engine pointed to by the SEARCHENGINE_URL option to obtain the
-# search results.
-#
-# Doxygen ships with an example indexer (doxyindexer) and search engine
-# (doxysearch.cgi) which are based on the open source search engine library
-# Xapian (see: http://xapian.org/).
-#
-# See the section "External Indexing and Searching" for details.
-# The default value is: NO.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-EXTERNAL_SEARCH        = NO
-
-# The SEARCHENGINE_URL should point to a search engine hosted by a web server
-# which will return the search results when EXTERNAL_SEARCH is enabled.
-#
-# Doxygen ships with an example indexer (doxyindexer) and search engine
-# (doxysearch.cgi) which are based on the open source search engine library
-# Xapian (see: http://xapian.org/). See the section "External Indexing and
-# Searching" for details.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-#SEARCHENGINE_URL       = @searchengine_url@
-
-# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the unindexed
-# search data is written to a file for indexing by an external tool. With the
-# SEARCHDATA_FILE tag the name of this file can be specified.
-# The default file is: searchdata.xml.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-#SEARCHDATA_FILE        = searchdata.xml
-
-# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the
-# EXTERNAL_SEARCH_ID tag can be used as an identifier for the project. This is
-# useful in combination with EXTRA_SEARCH_MAPPINGS to search through multiple
-# projects and redirect the results back to the right project.
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-#EXTERNAL_SEARCH_ID     = libzmq
-
-# The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through doxygen
-# projects other than the one defined by this configuration file, but that are
-# all added to the same external search index. Each project needs to have a
-# unique id set via EXTERNAL_SEARCH_ID. The search mapping then maps the id of
-# to a relative location where the documentation can be found. The format is:
-# EXTRA_SEARCH_MAPPINGS = tagname1=loc1 tagname2=loc2 ...
-# This tag requires that the tag SEARCHENGINE is set to YES.
-
-#EXTRA_SEARCH_MAPPINGS  = @extra_search_mappings@
-
-#---------------------------------------------------------------------------
-# Configuration options related to the LaTeX output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_LATEX tag is set to YES, doxygen will generate LaTeX output.
-# The default value is: YES.
-
-GENERATE_LATEX         = NO
-
-# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it.
-# The default directory is: latex.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_OUTPUT           =
-
-# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
-# invoked.
-#
-# Note that when enabling USE_PDFLATEX this option is only used for generating
-# bitmaps for formulas in the HTML output, but not in the Makefile that is
-# written to the output directory.
-# The default file is: latex.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_CMD_NAME         = latex
-
-# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to generate
-# index for LaTeX.
-# The default file is: makeindex.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-MAKEINDEX_CMD_NAME     = makeindex
-
-# If the COMPACT_LATEX tag is set to YES, doxygen generates more compact LaTeX
-# documents. This may be useful for small projects and may help to save some
-# trees in general.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-COMPACT_LATEX          = NO
-
-# The PAPER_TYPE tag can be used to set the paper type that is used by the
-# printer.
-# Possible values are: a4 (210 x 297 mm), letter (8.5 x 11 inches), legal (8.5 x
-# 14 inches) and executive (7.25 x 10.5 inches).
-# The default value is: a4.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-PAPER_TYPE             = a4
-
-# The EXTRA_PACKAGES tag can be used to specify one or more LaTeX package names
-# that should be included in the LaTeX output. The package can be specified just
-# by its name or with the correct syntax as to be used with the LaTeX
-# \usepackage command. To get the times font for instance you can specify :
-# EXTRA_PACKAGES=times or EXTRA_PACKAGES={times}
-# To use the option intlimits with the amsmath package you can specify:
-# EXTRA_PACKAGES=[intlimits]{amsmath}
-# If left blank no extra packages will be included.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-EXTRA_PACKAGES         =
-
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for the
-# generated LaTeX document. The header should contain everything until the first
-# chapter. If it is left blank doxygen will generate a standard header. See
-# section "Doxygen usage" for information on how to let doxygen write the
-# default header to a separate file.
-#
-# Note: Only use a user-defined header if you know what you are doing! The
-# following commands have a special meaning inside the header: $title,
-# $datetime, $date, $doxygenversion, $projectname, $projectnumber,
-# $projectbrief, $projectlogo. Doxygen will replace $title with the empty
-# string, for the replacement values of the other commands the user is referred
-# to HTML_HEADER.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_HEADER           =
-
-# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the
-# generated LaTeX document. The footer should contain everything after the last
-# chapter. If it is left blank doxygen will generate a standard footer. See
-# LATEX_HEADER for more information on how to generate a default footer and what
-# special commands can be used inside the footer.
-#
-# Note: Only use a user-defined footer if you know what you are doing!
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_FOOTER           =
-
-# The LATEX_EXTRA_STYLESHEET tag can be used to specify additional user-defined
-# LaTeX style sheets that are included after the standard style sheets created
-# by doxygen. Using this option one can overrule certain style aspects. Doxygen
-# will copy the style sheet files to the output directory.
-# Note: The order of the extra style sheet files is of importance (e.g. the last
-# style sheet in the list overrules the setting of the previous ones in the
-# list).
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_EXTRA_STYLESHEET =
-
-# The LATEX_EXTRA_FILES tag can be used to specify one or more extra images or
-# other source files which should be copied to the LATEX_OUTPUT output
-# directory. Note that the files will be copied as-is; there are no commands or
-# markers available.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_EXTRA_FILES      =
-
-# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated is
-# prepared for conversion to PDF (using ps2pdf or pdflatex). The PDF file will
-# contain links (just like the HTML output) instead of page references. This
-# makes the output suitable for online browsing using a PDF viewer.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-PDF_HYPERLINKS         = NO
-
-# If the USE_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
-# the PDF file directly from the LaTeX files. Set this option to YES, to get a
-# higher quality PDF documentation.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-USE_PDFLATEX           = NO
-
-# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode
-# command to the generated LaTeX files. This will instruct LaTeX to keep running
-# if errors occur, instead of asking the user for help. This option is also used
-# when generating formulas in HTML.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_BATCHMODE        = NO
-
-# If the LATEX_HIDE_INDICES tag is set to YES then doxygen will not include the
-# index chapters (such as File Index, Compound Index, etc.) in the output.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_HIDE_INDICES     = NO
-
-# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source
-# code with syntax highlighting in the LaTeX output.
-#
-# Note that which sources are shown also depends on other settings such as
-# SOURCE_BROWSER.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_SOURCE_CODE      = NO
-
-# The LATEX_BIB_STYLE tag can be used to specify the style to use for the
-# bibliography, e.g. plainnat, or ieeetr. See
-# http://en.wikipedia.org/wiki/BibTeX and \cite for more info.
-# The default value is: plain.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_BIB_STYLE        = plain
-
-# If the LATEX_TIMESTAMP tag is set to YES then the footer of each generated
-# page will contain the date and time when the page was generated. Setting this
-# to NO can help when comparing the output of multiple runs.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_TIMESTAMP        = NO
-
-#---------------------------------------------------------------------------
-# Configuration options related to the RTF output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_RTF tag is set to YES, doxygen will generate RTF output. The
-# RTF output is optimized for Word 97 and may not look too pretty with other RTF
-# readers/editors.
-# The default value is: NO.
-
-GENERATE_RTF           = NO
-
-# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it.
-# The default directory is: rtf.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_OUTPUT             =
-
-# If the COMPACT_RTF tag is set to YES, doxygen generates more compact RTF
-# documents. This may be useful for small projects and may help to save some
-# trees in general.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-COMPACT_RTF            = NO
-
-# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated will
-# contain hyperlink fields. The RTF file will contain links (just like the HTML
-# output) instead of page references. This makes the output suitable for online
-# browsing using Word or some other Word compatible readers that support those
-# fields.
-#
-# Note: WordPad (write) and others do not support links.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_HYPERLINKS         = NO
-
-# Load stylesheet definitions from file. Syntax is similar to doxygen's config
-# file, i.e. a series of assignments. You only have to provide replacements,
-# missing definitions are set to their default value.
-#
-# See also section "Doxygen usage" for information on how to generate the
-# default style sheet that doxygen normally uses.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_STYLESHEET_FILE    =
-
-# Set optional variables used in the generation of an RTF document. Syntax is
-# similar to doxygen's config file. A template extensions file can be generated
-# using doxygen -e rtf extensionFile.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_EXTENSIONS_FILE    =
-
-# If the RTF_SOURCE_CODE tag is set to YES then doxygen will include source code
-# with syntax highlighting in the RTF output.
-#
-# Note that which sources are shown also depends on other settings such as
-# SOURCE_BROWSER.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_RTF is set to YES.
-
-RTF_SOURCE_CODE        = NO
-
-#---------------------------------------------------------------------------
-# Configuration options related to the man page output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_MAN tag is set to YES, doxygen will generate man pages for
-# classes and files.
-# The default value is: NO.
-
-GENERATE_MAN           = NO
-
-# The MAN_OUTPUT tag is used to specify where the man pages will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it. A directory man3 will be created inside the directory specified by
-# MAN_OUTPUT.
-# The default directory is: man.
-# This tag requires that the tag GENERATE_MAN is set to YES.
-
-MAN_OUTPUT             =
-
-# The MAN_EXTENSION tag determines the extension that is added to the generated
-# man pages. In case the manual section does not start with a number, the number
-# 3 is prepended. The dot (.) at the beginning of the MAN_EXTENSION tag is
-# optional.
-# The default value is: .3.
-# This tag requires that the tag GENERATE_MAN is set to YES.
-
-MAN_EXTENSION          =
-
-# The MAN_SUBDIR tag determines the name of the directory created within
-# MAN_OUTPUT in which the man pages are placed. If defaults to man followed by
-# MAN_EXTENSION with the initial . removed.
-# This tag requires that the tag GENERATE_MAN is set to YES.
-
-MAN_SUBDIR             =
-
-# If the MAN_LINKS tag is set to YES and doxygen generates man output, then it
-# will generate one additional man file for each entity documented in the real
-# man page(s). These additional files only source the real man page, but without
-# them the man command would be unable to find the correct page.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_MAN is set to YES.
-
-MAN_LINKS              = NO
-
-#---------------------------------------------------------------------------
-# Configuration options related to the XML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_XML tag is set to YES, doxygen will generate an XML file that
-# captures the structure of the code including all documentation.
-# The default value is: NO.
-
-GENERATE_XML           = NO
-
-# The XML_OUTPUT tag is used to specify where the XML pages will be put. If a
-# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
-# it.
-# The default directory is: xml.
-# This tag requires that the tag GENERATE_XML is set to YES.
-
-XML_OUTPUT             = xml
-
-# If the XML_PROGRAMLISTING tag is set to YES, doxygen will dump the program
-# listings (including syntax highlighting and cross-referencing information) to
-# the XML output. Note that enabling this will significantly increase the size
-# of the XML output.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_XML is set to YES.
-
-XML_PROGRAMLISTING     = YES
-
-#---------------------------------------------------------------------------
-# Configuration options related to the DOCBOOK output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_DOCBOOK tag is set to YES, doxygen will generate Docbook files
-# that can be used to generate PDF.
-# The default value is: NO.
-
-GENERATE_DOCBOOK       = NO
-
-# The DOCBOOK_OUTPUT tag is used to specify where the Docbook pages will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be put in
-# front of it.
-# The default directory is: docbook.
-# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
-
-DOCBOOK_OUTPUT         = docbook
-
-# If the DOCBOOK_PROGRAMLISTING tag is set to YES, doxygen will include the
-# program listings (including syntax highlighting and cross-referencing
-# information) to the DOCBOOK output. Note that enabling this will significantly
-# increase the size of the DOCBOOK output.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
-
-DOCBOOK_PROGRAMLISTING = NO
-
-#---------------------------------------------------------------------------
-# Configuration options for the AutoGen Definitions output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_AUTOGEN_DEF tag is set to YES, doxygen will generate an
-# AutoGen Definitions (see http://autogen.sf.net) file that captures the
-# structure of the code including all documentation. Note that this feature is
-# still experimental and incomplete at the moment.
-# The default value is: NO.
-
-GENERATE_AUTOGEN_DEF   = NO
-
-#---------------------------------------------------------------------------
-# Configuration options related to the Perl module output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_PERLMOD tag is set to YES, doxygen will generate a Perl module
-# file that captures the structure of the code including all documentation.
-#
-# Note that this feature is still experimental and incomplete at the moment.
-# The default value is: NO.
-
-GENERATE_PERLMOD       = NO
-
-# If the PERLMOD_LATEX tag is set to YES, doxygen will generate the necessary
-# Makefile rules, Perl scripts and LaTeX code to be able to generate PDF and DVI
-# output from the Perl module output.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_PERLMOD is set to YES.
-
-PERLMOD_LATEX          = NO
-
-# If the PERLMOD_PRETTY tag is set to YES, the Perl module output will be nicely
-# formatted so it can be parsed by a human reader. This is useful if you want to
-# understand what is going on. On the other hand, if this tag is set to NO, the
-# size of the Perl module output will be much smaller and Perl will parse it
-# just the same.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_PERLMOD is set to YES.
-
-PERLMOD_PRETTY         = YES
-
-# The names of the make variables in the generated doxyrules.make file are
-# prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. This is useful
-# so different doxyrules.make files included by the same Makefile don't
-# overwrite each other's variables.
-# This tag requires that the tag GENERATE_PERLMOD is set to YES.
-
-PERLMOD_MAKEVAR_PREFIX =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor
-#---------------------------------------------------------------------------
-
-# If the ENABLE_PREPROCESSING tag is set to YES, doxygen will evaluate all
-# C-preprocessor directives found in the sources and include files.
-# The default value is: YES.
-
-ENABLE_PREPROCESSING   = YES
-
-# If the MACRO_EXPANSION tag is set to YES, doxygen will expand all macro names
-# in the source code. If set to NO, only conditional compilation will be
-# performed. Macro expansion can be done in a controlled way by setting
-# EXPAND_ONLY_PREDEF to YES.
-# The default value is: NO.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-MACRO_EXPANSION        = NO
-
-# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES then
-# the macro expansion is limited to the macros specified with the PREDEFINED and
-# EXPAND_AS_DEFINED tags.
-# The default value is: NO.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-EXPAND_ONLY_PREDEF     = NO
-
-# If the SEARCH_INCLUDES tag is set to YES, the include files in the
-# INCLUDE_PATH will be searched if a #include is found.
-# The default value is: YES.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-SEARCH_INCLUDES        = YES
-
-# The INCLUDE_PATH tag can be used to specify one or more directories that
-# contain include files that are not input files but should be processed by the
-# preprocessor.
-# This tag requires that the tag SEARCH_INCLUDES is set to YES.
-
-INCLUDE_PATH           = include
-
-# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
-# patterns (like *.h and *.hpp) to filter out the header-files in the
-# directories. If left blank, the patterns specified with FILE_PATTERNS will be
-# used.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-INCLUDE_FILE_PATTERNS  =
-
-# The PREDEFINED tag can be used to specify one or more macro names that are
-# defined before the preprocessor is started (similar to the -D option of e.g.
-# gcc). The argument of the tag is a list of macros of the form: name or
-# name=definition (no spaces). If the definition and the "=" are omitted, "=1"
-# is assumed. To prevent a macro definition from being undefined via #undef or
-# recursively expanded use the := operator instead of the = operator.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-PREDEFINED             =
-
-# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
-# tag can be used to specify a list of macro names that should be expanded. The
-# macro definition that is found in the sources will be used. Use the PREDEFINED
-# tag if you want to use a different macro definition that overrules the
-# definition found in the source code.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-EXPAND_AS_DEFINED      =
-
-# If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will
-# remove all references to function-like macros that are alone on a line, have
-# an all uppercase name, and do not end with a semicolon. Such function macros
-# are typically used for boiler-plate code, and will confuse the parser if not
-# removed.
-# The default value is: YES.
-# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
-
-SKIP_FUNCTION_MACROS   = YES
-
-#---------------------------------------------------------------------------
-# Configuration options related to external references
-#---------------------------------------------------------------------------
-
-# The TAGFILES tag can be used to specify one or more tag files. For each tag
-# file the location of the external documentation should be added. The format of
-# a tag file without this location is as follows:
-# TAGFILES = file1 file2 ...
-# Adding location for the tag files is done as follows:
-# TAGFILES = file1=loc1 "file2 = loc2" ...
-# where loc1 and loc2 can be relative or absolute paths or URLs. See the
-# section "Linking to external documentation" for more information about the use
-# of tag files.
-# Note: Each tag file must have a unique name (where the name does NOT include
-# the path). If a tag file is not located in the directory in which doxygen is
-# run, you must also specify the path to the tagfile here.
-
-TAGFILES               =
-
-# When a file name is specified after GENERATE_TAGFILE, doxygen will create a
-# tag file that is based on the input files it reads. See section "Linking to
-# external documentation" for more information about the usage of tag files.
-
-GENERATE_TAGFILE       =
-
-# If the ALLEXTERNALS tag is set to YES, all external class will be listed in
-# the class index. If set to NO, only the inherited external classes will be
-# listed.
-# The default value is: NO.
-
-ALLEXTERNALS           = YES
-
-# If the EXTERNAL_GROUPS tag is set to YES, all external groups will be listed
-# in the modules index. If set to NO, only the current project's groups will be
-# listed.
-# The default value is: YES.
-
-EXTERNAL_GROUPS        = YES
-
-# If the EXTERNAL_PAGES tag is set to YES, all external pages will be listed in
-# the related pages index. If set to NO, only the current project's pages will
-# be listed.
-# The default value is: YES.
-
-EXTERNAL_PAGES         = YES
-
-# The PERL_PATH should be the absolute path and name of the perl script
-# interpreter (i.e. the result of 'which perl').
-# The default file (with absolute path) is: /usr/bin/perl.
-
-PERL_PATH              =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the dot tool
-#---------------------------------------------------------------------------
-
-# If the CLASS_DIAGRAMS tag is set to YES, doxygen will generate a class diagram
-# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to
-# NO turns the diagrams off. Note that this option also works with HAVE_DOT
-# disabled, but it is recommended to install and use dot, since it yields more
-# powerful graphs.
-# The default value is: YES.
-
-CLASS_DIAGRAMS         = YES
-
-# You can define message sequence charts within doxygen comments using the \msc
-# command. Doxygen will then run the mscgen tool (see:
-# http://www.mcternan.me.uk/mscgen/)) to produce the chart and insert it in the
-# documentation. The MSCGEN_PATH tag allows you to specify the directory where
-# the mscgen tool resides. If left empty the tool is assumed to be found in the
-# default search path.
-
-MSCGEN_PATH            =
-
-# You can include diagrams made with dia in doxygen documentation. Doxygen will
-# then run dia to produce the diagram and insert it in the documentation. The
-# DIA_PATH tag allows you to specify the directory where the dia binary resides.
-# If left empty dia is assumed to be found in the default search path.
-
-DIA_PATH               =
-
-# If set to YES the inheritance and collaboration graphs will hide inheritance
-# and usage relations if the target is undocumented or is not a class.
-# The default value is: YES.
-
-HIDE_UNDOC_RELATIONS   = NO
-
-# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
-# available from the path. This tool is part of Graphviz (see:
-# http://www.graphviz.org/), a graph visualization toolkit from AT&T and Lucent
-# Bell Labs. The other options in this section have no effect if this option is
-# set to NO
-# The default value is: NO.
-
-HAVE_DOT               = YES
-
-# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is allowed
-# to run in parallel. When set to 0 doxygen will base this on the number of
-# processors available in the system. You can set it explicitly to a value
-# larger than 0 to get control over the balance between CPU load and processing
-# speed.
-# Minimum value: 0, maximum value: 32, default value: 0.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_NUM_THREADS        = 0
-
-# When you want a differently looking font in the dot files that doxygen
-# generates you can specify the font name using DOT_FONTNAME. You need to make
-# sure dot is able to find the font, which can be done by putting it in a
-# standard location or by setting the DOTFONTPATH environment variable or by
-# setting DOT_FONTPATH to the directory containing the font.
-# The default value is: Helvetica.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_FONTNAME           = Helvetica
-
-# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of
-# dot graphs.
-# Minimum value: 4, maximum value: 24, default value: 10.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_FONTSIZE           = 10
-
-# By default doxygen will tell dot to use the default font as specified with
-# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set
-# the path where dot can find it using this tag.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_FONTPATH           =
-
-# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for
-# each documented class showing the direct and indirect inheritance relations.
-# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-CLASS_GRAPH            = YES
-
-# If the COLLABORATION_GRAPH tag is set to YES then doxygen will generate a
-# graph for each documented class showing the direct and indirect implementation
-# dependencies (inheritance, containment, and class references variables) of the
-# class with other documented classes.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-COLLABORATION_GRAPH    = YES
-
-# If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for
-# groups, showing the direct groups dependencies.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-GROUP_GRAPHS           = YES
-
-# If the UML_LOOK tag is set to YES, doxygen will generate inheritance and
-# collaboration diagrams in a style similar to the OMG's Unified Modeling
-# Language.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-UML_LOOK               = NO
-
-# If the UML_LOOK tag is enabled, the fields and methods are shown inside the
-# class node. If there are many fields or methods and many nodes the graph may
-# become too big to be useful. The UML_LIMIT_NUM_FIELDS threshold limits the
-# number of items for each type to make the size more manageable. Set this to 0
-# for no limit. Note that the threshold may be exceeded by 50% before the limit
-# is enforced. So when you set the threshold to 10, up to 15 fields may appear,
-# but if the number exceeds 15, the total amount of fields shown is limited to
-# 10.
-# Minimum value: 0, maximum value: 100, default value: 10.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-UML_LIMIT_NUM_FIELDS   = 10
-
-# If the TEMPLATE_RELATIONS tag is set to YES then the inheritance and
-# collaboration graphs will show the relations between templates and their
-# instances.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-TEMPLATE_RELATIONS     = YES
-
-# If the INCLUDE_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are set to
-# YES then doxygen will generate a graph for each documented file showing the
-# direct and indirect include dependencies of the file with other documented
-# files.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-INCLUDE_GRAPH          = YES
-
-# If the INCLUDED_BY_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are
-# set to YES then doxygen will generate a graph for each documented file showing
-# the direct and indirect include dependencies of the file with other documented
-# files.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-INCLUDED_BY_GRAPH      = NO
-
-# If the CALL_GRAPH tag is set to YES then doxygen will generate a call
-# dependency graph for every global function or class method.
-#
-# Note that enabling this option will significantly increase the time of a run.
-# So in most cases it will be better to enable call graphs for selected
-# functions only using the \callgraph command. Disabling a call graph can be
-# accomplished by means of the command \hidecallgraph.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-CALL_GRAPH             = YES
-
-# If the CALLER_GRAPH tag is set to YES then doxygen will generate a caller
-# dependency graph for every global function or class method.
-#
-# Note that enabling this option will significantly increase the time of a run.
-# So in most cases it will be better to enable caller graphs for selected
-# functions only using the \callergraph command. Disabling a caller graph can be
-# accomplished by means of the command \hidecallergraph.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-CALLER_GRAPH           = NO
-
-# If the GRAPHICAL_HIERARCHY tag is set to YES then doxygen will graphical
-# hierarchy of all classes instead of a textual one.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-GRAPHICAL_HIERARCHY    = YES
-
-# If the DIRECTORY_GRAPH tag is set to YES then doxygen will show the
-# dependencies a directory has on other directories in a graphical way. The
-# dependency relations are determined by the #include relations between the
-# files in the directories.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DIRECTORY_GRAPH        = YES
-
-# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
-# generated by dot. For an explanation of the image formats see the section
-# output formats in the documentation of the dot tool (Graphviz (see:
-# http://www.graphviz.org/)).
-# Note: If you choose svg you need to set HTML_FILE_EXTENSION to xhtml in order
-# to make the SVG files visible in IE 9+ (other browsers do not have this
-# requirement).
-# Possible values are: png, jpg, gif, svg, png:gd, png:gd:gd, png:cairo,
-# png:cairo:gd, png:cairo:cairo, png:cairo:gdiplus, png:gdiplus and
-# png:gdiplus:gdiplus.
-# The default value is: png.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_IMAGE_FORMAT       = png
-
-# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
-# enable generation of interactive SVG images that allow zooming and panning.
-#
-# Note that this requires a modern browser other than Internet Explorer. Tested
-# and working are Firefox, Chrome, Safari, and Opera.
-# Note: For IE 9+ you need to set HTML_FILE_EXTENSION to xhtml in order to make
-# the SVG files visible. Older versions of IE do not have SVG support.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-INTERACTIVE_SVG        = NO
-
-# The DOT_PATH tag can be used to specify the path where the dot tool can be
-# found. If left blank, it is assumed the dot tool can be found in the path.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_PATH               =
-
-# The DOTFILE_DIRS tag can be used to specify one or more directories that
-# contain dot files that are included in the documentation (see the \dotfile
-# command).
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOTFILE_DIRS           =
-
-# The MSCFILE_DIRS tag can be used to specify one or more directories that
-# contain msc files that are included in the documentation (see the \mscfile
-# command).
-
-MSCFILE_DIRS           =
-
-# The DIAFILE_DIRS tag can be used to specify one or more directories that
-# contain dia files that are included in the documentation (see the \diafile
-# command).
-
-DIAFILE_DIRS           =
-
-# When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the
-# path where java can find the plantuml.jar file. If left blank, it is assumed
-# PlantUML is not used or called during a preprocessing step. Doxygen will
-# generate a warning when it encounters a \startuml command in this case and
-# will not generate output for the diagram.
-
-PLANTUML_JAR_PATH      =
-
-# When using plantuml, the specified paths are searched for files specified by
-# the !include statement in a plantuml block.
-
-PLANTUML_INCLUDE_PATH  =
-
-# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of nodes
-# that will be shown in the graph. If the number of nodes in a graph becomes
-# larger than this value, doxygen will truncate the graph, which is visualized
-# by representing a node as a red box. Note that doxygen if the number of direct
-# children of the root node in a graph is already larger than
-# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note that
-# the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
-# Minimum value: 0, maximum value: 10000, default value: 50.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_GRAPH_MAX_NODES    = 100
-
-# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the graphs
-# generated by dot. A depth value of 3 means that only nodes reachable from the
-# root by following a path via at most 3 edges will be shown. Nodes that lay
-# further from the root node will be omitted. Note that setting this option to 1
-# or 2 may greatly reduce the computation time needed for large code bases. Also
-# note that the size of a graph can be further restricted by
-# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
-# Minimum value: 0, maximum value: 1000, default value: 0.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-MAX_DOT_GRAPH_DEPTH    = 5
-
-# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
-# background. This is disabled by default, because dot on Windows does not seem
-# to support this out of the box.
-#
-# Warning: Depending on the platform used, enabling this option may lead to
-# badly anti-aliased labels on the edges of a graph (i.e. they become hard to
-# read).
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_TRANSPARENT        = NO
-
-# Set the DOT_MULTI_TARGETS tag to YES to allow dot to generate multiple output
-# files in one run (i.e. multiple -o and -T options on the command line). This
-# makes dot run faster, but since only newer versions of dot (>1.8.10) support
-# this, this feature is disabled by default.
-# The default value is: NO.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_MULTI_TARGETS      = NO
-
-# If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page
-# explaining the meaning of the various boxes and arrows in the dot generated
-# graphs.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-GENERATE_LEGEND        = YES
-
-# If the DOT_CLEANUP tag is set to YES, doxygen will remove the intermediate dot
-# files that are used to generate the various graphs.
-# The default value is: YES.
-# This tag requires that the tag HAVE_DOT is set to YES.
-
-DOT_CLEANUP            = YES
diff --git a/libs/libzmq/INSTALL b/libs/libzmq/INSTALL
deleted file mode 100644
index e7f1b0e..0000000
--- a/libs/libzmq/INSTALL
+++ /dev/null
@@ -1,315 +0,0 @@
-Installation Instructions
-*************************
-
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006, 2007 Free Software Foundation, Inc.
-
-This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
-
-From GitHub
-===========
-
-If you clone the Git repository then you should start by running the
-command `./autogen.sh`. This is not necessary if you get the source
-packages.
-
-CMake installation
-==================
-
-The following options are available for cmake invocation:
-
-- `WITH_PERF_TOOL'
-    Enables the build of performance tools. Default value is ON.
-- `ZMQ_BUILD_TESTS'
-    Builds ZeroMQ tests. Default value is ON.
-- `ENABLE_CPACK'
-    Enables CPack build rules. This option has effect on Windows
-    platform only. Default value is ON. Turn it to OFF if you
-    don't want the runtime libraries to be installed (typically
-    if your installation destination already contains them).
-    
-
-Example: installing ZeroMQ on Windows with no tests, no performance
-tools, and no runtime library copy:
-
-cmake -G "NMake Makefiles" -D WITH_PERF_TOOL=OFF -D ZMQ_BUILD_TESTS=OFF
--D ENABLE_CPACK=OFF -D CMAKE_BUILD_TYPE=Release
-
-Windows Builds
-==============
-
-On Windows, use CMake for building, or for generating a Visual Studio solution file.
-
-The library can also be built for the Windows 10 UWP platform through CMake :
-cmake -H. -B<build dir> -G"Visual Studio 14 2015 Win64" \
-   -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=10.0 \
-   -DENABLE_CURVE=OFF -DZMQ_BUILD_TESTS=OFF
-
-In VS 2012 it is mandatory to increase the default stack size of 1 MB to
-at least 2 MB due to implementation of std::map intermittently requiring
-substantial amount of stack and causing stack overflow. 
-
-Windows Builds - Static
-=======================
-
-When linking statically with libzmq your CFLAGS and/or CPPFLAGS need to include
-`-DZMQ_STATIC` otherwise `__dclspec(dllimport)` will be set for all functions
-and the build will fail.
-
-This is a workaround for issue:
-https://github.com/zeromq/libzmq/issues/2788
-
-Windows Builds - Wine
-=====================
-
-To use Windows binaries on *nix via Wine, it is necessary to ensure that the
-kernel TCP buffers are large enough. On some systems, like OS X, they are too
-small by default.
-They need to be set to at least one MB as a workaround for issue:
-https://github.com/zeromq/libzmq/issues/1608
-
-sudo sysctl -w net.inet.tcp.sendspace=1300000
-
-Basic Installation
-==================
-
-Briefly, the shell commands `./configure; make; make install' should
-configure, build, and install this package.  The following
-more-detailed instructions are generic; see the `README' file for
-instructions specific to this package.
-
-   The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation.  It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions.  Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, and a
-file `config.log' containing compiler output (useful mainly for
-debugging `configure').
-
-   It can also use an optional file (typically called `config.cache'
-and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring.  Caching is
-disabled by default to prevent problems with accidental use of stale
-cache files.
-
-   If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
-be considered for the next release.  If you are using the cache, and at
-some point `config.cache' contains results you don't want to keep, you
-may remove or edit it.
-
-   The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'.  You need `configure.ac' if
-you want to change it or regenerate `configure' using a newer version
-of `autoconf'.  If you are building a development version from the
-Github source, for example, use `./autogen.sh' to generate `configure'
-and other necessary installation scripts.
-
-The simplest way to compile this package is:
-
-  1. `cd' to the directory containing the package's source code and type
-     `./configure' to configure the package for your system.
-
-     Running `configure' might take a while.  While running, it prints
-     some messages telling which features it is checking for.
-
-  2. Type `make' to compile the package.
-
-  3. Optionally, type `make check' to run any self-tests that come with
-     the package. Note that `make -j check' is not supported as some
-     tests share infrastructure and cannot be run in parallel.
-
-  4. Type `make install' to install the programs and any data files and
-     documentation.
-
-  5. You can remove the program binaries and object files from the
-     source code directory by typing `make clean'.  To also remove the
-     files that `configure' created (so you can compile the package for
-     a different kind of computer), type `make distclean'.  There is
-     also a `make maintainer-clean' target, but that is intended mainly
-     for the package's developers.  If you use it, you may have to get
-     all sorts of other programs in order to regenerate files that came
-     with the distribution.
-
-  6. Often, you can also type `make uninstall' to remove the installed
-     files again.
-
-OS X Builds - Documentation
-===========================
-
-Basic installation on OS X may fail in `Making all in doc' step. This
-error can be resolved by adding environment variable for shell.
-
-export XML_CATALOG_FILES=/usr/local/etc/xml/catalog 
-
-Write command above in shell for instant resolve, or append command into
-shell profile file and reload for permanent resolve.
-
-Compilers and Options
-=====================
-
-Some systems require unusual options for compilation or linking that the
-`configure' script does not know about.  Run `./configure --help' for
-details on some of the pertinent environment variables.
-
-   You can give `configure' initial values for configuration parameters
-by setting variables in the command line or in the environment.  Here
-is an example:
-
-     ./configure CC=c99 CFLAGS=-g LIBS=-lposix
-
-   *Note Defining Variables::, for more details.
-
-Compiling For Multiple Architectures
-====================================
-
-You can compile the package for more than one kind of computer at the
-same time, by placing the object files for each architecture in their
-own directory.  To do this, you can use GNU `make'.  `cd' to the
-directory where you want the object files and executables to go and run
-the `configure' script.  `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
-
-   With a non-GNU `make', it is safer to compile the package for one
-architecture at a time in the source code directory.  After you have
-installed the package for one architecture, use `make distclean' before
-reconfiguring for another architecture.
-
-Installation Names
-==================
-
-By default, `make install' installs the package's commands under
-`/usr/local/bin', include files under `/usr/local/include', etc.  You
-can specify an installation prefix other than `/usr/local' by giving
-`configure' the option `--prefix=PREFIX'.
-
-   You can specify separate installation prefixes for
-architecture-specific files and architecture-independent files.  If you
-pass the option `--exec-prefix=PREFIX' to `configure', the package uses
-PREFIX as the prefix for installing programs and libraries.
-Documentation and other data files still use the regular prefix.
-
-   In addition, if you use an unusual directory layout you can give
-options like `--bindir=DIR' to specify different values for particular
-kinds of files.  Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
-
-   If the package supports it, you can cause programs to be installed
-with an extra prefix or suffix on their names by giving `configure' the
-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
-Optional Features
-=================
-
-Some packages pay attention to `--enable-FEATURE' options to
-`configure', where FEATURE indicates an optional part of the package.
-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-is something like `gnu-as' or `x' (for the X Window System).  The
-`README' should mention any `--enable-' and `--with-' options that the
-package recognizes.
-
-   For packages that use the X Window System, `configure' can usually
-find the X include and library files automatically, but if it doesn't,
-you can use the `configure' options `--x-includes=DIR' and
-`--x-libraries=DIR' to specify their locations.
-
-Specifying the System Type
-==========================
-
-There may be some features `configure' cannot figure out automatically,
-but needs to determine by the type of machine the package will run on.
-Usually, assuming the package is built to be run on the _same_
-architectures, `configure' can figure that out, but if it prints a
-message saying it cannot guess the machine type, give it the
-`--build=TYPE' option.  TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name which has the form:
-
-     CPU-COMPANY-SYSTEM
-
-where SYSTEM can have one of these forms:
-
-     OS KERNEL-OS
-
-   See the file `config.sub' for the possible values of each field.  If
-`config.sub' isn't included in this package, then this package doesn't
-need to know the machine type.
-
-   If you are _building_ compiler tools for cross-compiling, you should
-use the option `--target=TYPE' to select the type of system they will
-produce code for.
-
-   If you want to _use_ a cross compiler, that generates code for a
-platform different from the build platform, you should specify the
-"host" platform (i.e., that on which the generated programs will
-eventually be run) with `--host=TYPE'.
-
-Sharing Defaults
-================
-
-If you want to set default values for `configure' scripts to share, you
-can create a site shell script called `config.site' that gives default
-values for variables like `CC', `cache_file', and `prefix'.
-`configure' looks for `PREFIX/share/config.site' if it exists, then
-`PREFIX/etc/config.site' if it exists.  Or, you can set the
-`CONFIG_SITE' environment variable to the location of the site script.
-A warning: not all `configure' scripts look for a site script.
-
-Defining Variables
-==================
-
-Variables not defined in a site shell script can be set in the
-environment passed to `configure'.  However, some packages may run
-configure again during the build, and the customized values of these
-variables may be lost.  In order to avoid this problem, you should set
-them in the `configure' command line, using `VAR=value'.  For example:
-
-     ./configure CC=/usr/local2/bin/gcc
-
-causes the specified `gcc' to be used as the C compiler (unless it is
-overridden in the site shell script).
-
-Unfortunately, this technique does not work for `CONFIG_SHELL' due to
-an Autoconf bug.  Until the bug is fixed you can use this workaround:
-
-     CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
-
-`configure' Invocation
-======================
-
-`configure' recognizes the following options to control how it operates.
-
-`--help'
-`-h'
-     Print a summary of the options to `configure', and exit.
-
-`--version'
-`-V'
-     Print the version of Autoconf used to generate the `configure'
-     script, and exit.
-
-`--cache-file=FILE'
-     Enable the cache: use and save the results of the tests in FILE,
-     traditionally `config.cache'.  FILE defaults to `/dev/null' to
-     disable caching.
-
-`--config-cache'
-`-C'
-     Alias for `--cache-file=config.cache'.
-
-`--quiet'
-`--silent'
-`-q'
-     Do not print messages saying which checks are being made.  To
-     suppress all normal output, redirect it to `/dev/null' (any error
-     messages will still be shown).
-
-`--srcdir=DIR'
-     Look for the package's source code in directory DIR.  Usually
-     `configure' can determine that directory automatically.
-
-`configure' also accepts some other, not widely useful, options.  Run
-`configure --help' for more details.
-
diff --git a/libs/libzmq/Jenkinsfile b/libs/libzmq/Jenkinsfile
deleted file mode 100644
index 3593665..0000000
--- a/libs/libzmq/Jenkinsfile
+++ /dev/null
@@ -1,485 +0,0 @@
-pipeline {
-    agent { label "linux || macosx || bsd || solaris || posix || windows" }
-    parameters {
-        // Use DEFAULT_DEPLOY_BRANCH_PATTERN and DEFAULT_DEPLOY_JOB_NAME if
-        // defined in this jenkins setup -- in Jenkins Management Web-GUI
-        // see Configure System / Global properties / Environment variables
-        // Default (if unset) is empty => no deployment attempt after good test
-        // See zproject Jenkinsfile-deploy.example for an example deploy job.
-        // TODO: Try to marry MultiBranchPipeline support with pre-set defaults
-        // directly in MultiBranchPipeline plugin, or mechanism like Credentials,
-        // or a config file uploaded to master for all jobs or this job, see
-        // https://jenkins.io/doc/pipeline/examples/#configfile-provider-plugin
-        string (
-            defaultValue: '${DEFAULT_DEPLOY_BRANCH_PATTERN}',
-            description: 'Regular expression of branch names for which a deploy action would be attempted after a successful build and test; leave empty to not deploy. Reasonable value is ^(master|release/.*|feature/*)$',
-            name : 'DEPLOY_BRANCH_PATTERN')
-        string (
-            defaultValue: '${DEFAULT_DEPLOY_JOB_NAME}',
-            description: 'Name of your job that handles deployments and should accept arguments: DEPLOY_GIT_URL DEPLOY_GIT_BRANCH DEPLOY_GIT_COMMIT -- and it is up to that job what to do with this knowledge (e.g. git archive + push to packaging); leave empty to not deploy',
-            name : 'DEPLOY_JOB_NAME')
-        booleanParam (
-            defaultValue: true,
-            description: 'If the deployment is done, should THIS job wait for it to complete and include its success or failure as the build result (true), or should it schedule the job and exit quickly to free up the executor (false)',
-            name: 'DEPLOY_REPORT_RESULT')
-        booleanParam (
-            defaultValue: true,
-            description: 'Attempt stable build without DRAFT API in this run?',
-            name: 'DO_BUILD_WITHOUT_DRAFT_API')
-        booleanParam (
-            defaultValue: true,
-            description: 'Attempt build with DRAFT API in this run?',
-            name: 'DO_BUILD_WITH_DRAFT_API')
-        booleanParam (
-            defaultValue: true,
-            description: 'Attempt a build with docs in this run? (Note: corresponding tools are required in the build environment)',
-            name: 'DO_BUILD_DOCS')
-        booleanParam (
-            defaultValue: false,
-            description: 'Publish as an archive a "dist" tarball from a build with docs in this run? (Note: corresponding tools are required in the build environment; enabling this enforces DO_BUILD_DOCS too)',
-            name: 'DO_DIST_DOCS')
-        booleanParam (
-            defaultValue: true,
-            description: 'Attempt "make check" in this run?',
-            name: 'DO_TEST_CHECK')
-        booleanParam (
-            defaultValue: false,
-            description: 'Attempt "make memcheck" in this run?',
-            name: 'DO_TEST_MEMCHECK')
-        booleanParam (
-            defaultValue: true,
-            description: 'Attempt "make distcheck" in this run?',
-            name: 'DO_TEST_DISTCHECK')
-        booleanParam (
-            defaultValue: true,
-            description: 'Attempt a "make install" check in this run?',
-            name: 'DO_TEST_INSTALL')
-        string (
-            defaultValue: "`pwd`/tmp/_inst",
-            description: 'If attempting a "make install" check in this run, what DESTDIR to specify? (absolute path, defaults to "BUILD_DIR/tmp/_inst")',
-            name: 'USE_TEST_INSTALL_DESTDIR')
-        booleanParam (
-            defaultValue: true,
-            description: 'Attempt "cppcheck" analysis before this run? (Note: corresponding tools are required in the build environment)',
-            name: 'DO_CPPCHECK')
-        booleanParam (
-            defaultValue: true,
-            description: 'Require that there are no files not discovered changed/untracked via .gitignore after builds and tests?',
-            name: 'REQUIRE_GOOD_GITIGNORE')
-        string (
-            defaultValue: "30",
-            description: 'When running tests, use this timeout (in minutes; be sure to leave enough for double-job of a distcheck too)',
-            name: 'USE_TEST_TIMEOUT')
-        booleanParam (
-            defaultValue: true,
-            description: 'When using temporary subdirs in build/test workspaces, wipe them after successful builds?',
-            name: 'DO_CLEANUP_AFTER_BUILD')
-    }
-    triggers {
-        pollSCM 'H/2 * * * *'
-    }
-// Note: your Jenkins setup may benefit from similar setup on side of agents:
-//        PATH="/usr/lib64/ccache:/usr/lib/ccache:/usr/bin:/bin:${PATH}"
-    stages {
-        stage ('prepare') {
-                    steps {
-                        dir("tmp") {
-                            sh 'if [ -s Makefile ]; then make -k distclean || true ; fi'
-                            sh 'chmod -R u+w .'
-                            deleteDir()
-                        }
-                        sh './autogen.sh'
-                        stash (name: 'prepped', includes: '**/*', excludes: '**/cppcheck.xml')
-                    }
-        }
-        stage ('compile') {
-            parallel {
-                stage ('build with DRAFT') {
-                    when { expression { return ( params.DO_BUILD_WITH_DRAFT_API ) } }
-                    steps {
-                      dir("tmp/build-withDRAFT") {
-                        deleteDir()
-                        unstash 'prepped'
-                        sh 'CCACHE_BASEDIR="`pwd`" ; export CCACHE_BASEDIR; ./configure --enable-drafts=yes --with-docs=no'
-                        sh 'CCACHE_BASEDIR="`pwd`" ; export CCACHE_BASEDIR; make -k -j4 || make'
-                        sh 'echo "Are GitIgnores good after make with drafts? (should have no output below)"; git status -s || if [ "${params.REQUIRE_GOOD_GITIGNORE}" = false ]; then echo "WARNING GitIgnore tests found newly changed or untracked files" >&2 ; exit 0 ; else echo "FAILED GitIgnore tests" >&2 ; exit 1; fi'
-                        stash (name: 'built-draft', includes: '**/*', excludes: '**/cppcheck.xml')
-                        script {
-                            if ( params.DO_CLEANUP_AFTER_BUILD ) {
-                                deleteDir()
-                            }
-                        }
-                      }
-                    }
-                }
-                stage ('build without DRAFT') {
-                    when { expression { return ( params.DO_BUILD_WITHOUT_DRAFT_API ) } }
-                    steps {
-                      dir("tmp/build-withoutDRAFT") {
-                        deleteDir()
-                        unstash 'prepped'
-                        sh 'CCACHE_BASEDIR="`pwd`" ; export CCACHE_BASEDIR; ./configure --enable-drafts=no --with-docs=no'
-                        sh 'CCACHE_BASEDIR="`pwd`" ; export CCACHE_BASEDIR; make -k -j4 || make'
-                        sh 'echo "Are GitIgnores good after make without drafts? (should have no output below)"; git status -s || if [ "${params.REQUIRE_GOOD_GITIGNORE}" = false ]; then echo "WARNING GitIgnore tests found newly changed or untracked files" >&2 ; exit 0 ; else echo "FAILED GitIgnore tests" >&2 ; exit 1; fi'
-                        stash (name: 'built-nondraft', includes: '**/*', excludes: '**/cppcheck.xml')
-                        script {
-                            if ( params.DO_CLEANUP_AFTER_BUILD ) {
-                                deleteDir()
-                            }
-                        }
-                      }
-                    }
-                }
-                stage ('build with DOCS') {
-                    when { expression { return ( params.DO_BUILD_DOCS || params.DO_DIST_DOCS ) } }
-                    steps {
-                      dir("tmp/build-DOCS") {
-                        deleteDir()
-                        unstash 'prepped'
-                        sh 'CCACHE_BASEDIR="`pwd`" ; export CCACHE_BASEDIR; ./configure --enable-drafts=yes --with-docs=yes'
-                        script {
-                            if ( params.DO_DIST_DOCS ) {
-                                sh 'CCACHE_BASEDIR="`pwd`" ; export CCACHE_BASEDIR; make dist-gzip || exit ; DISTFILE="`ls -1tc *.tar.gz | head -1`" && [ -n "$DISTFILE" ] && [ -s "$DISTFILE" ] || exit ; mv -f "$DISTFILE" __dist.tar.gz'
-                                archiveArtifacts artifacts: '__dist.tar.gz'
-                                sh "rm -f __dist.tar.gz"
-                            }
-                        }
-                        sh 'CCACHE_BASEDIR="`pwd`" ; export CCACHE_BASEDIR; make -k -j4 || make'
-                        sh 'echo "Are GitIgnores good after make with docs? (should have no output below)"; git status -s || if [ "${params.REQUIRE_GOOD_GITIGNORE}" = false ]; then echo "WARNING GitIgnore tests found newly changed or untracked files" >&2 ; exit 0 ; else echo "FAILED GitIgnore tests" >&2 ; exit 1; fi'
-                        stash (name: 'built-docs', includes: '**/*', excludes: '**/cppcheck.xml')
-                        script {
-                            if ( params.DO_CLEANUP_AFTER_BUILD ) {
-                                deleteDir()
-                            }
-                        }
-                      }
-                    }
-                }
-            }
-        }
-        stage ('check') {
-            parallel {
-                stage ('cppcheck') {
-                    when { expression { return ( params.DO_CPPCHECK ) } }
-                    steps {
-                        dir("tmp/test-cppcheck") {
-                            deleteDir()
-                            unstash 'prepped'
-                            sh 'cppcheck --std=c++11 --enable=all --inconclusive --xml --xml-version=2 . 2>cppcheck.xml'
-                            archiveArtifacts artifacts: '**/cppcheck.xml'
-                            sh 'rm -f cppcheck.xml'
-                            script {
-                                if ( params.DO_CLEANUP_AFTER_BUILD ) {
-                                    deleteDir()
-                                }
-                            }
-                        }
-                    }
-                }
-                stage ('check with DRAFT') {
-                    when { expression { return ( params.DO_BUILD_WITH_DRAFT_API && params.DO_TEST_CHECK ) } }
-                    steps {
-                      dir("tmp/test-check-withDRAFT") {
-                        deleteDir()
-                        unstash 'built-draft'
-                        script {
-                         def RETRY_NUMBER = 0
-                         retry(3) {
-                          RETRY_NUMBER++
-                          timeout (time: "${params.USE_TEST_TIMEOUT}".toInteger(), unit: 'MINUTES') {
-                           try {
-                            sh 'CCACHE_BASEDIR="`pwd`" ; export CCACHE_BASEDIR; LD_LIBRARY_PATH="`pwd`/src/.libs:$LD_LIBRARY_PATH"; export LD_LIBRARY_PATH; make LD_LIBRARY_PATH="$LD_LIBRARY_PATH" check'
-                           }
-                           catch (Exception e) {
-                            currentBuild.result = 'UNSTABLE' // Jenkins should not let the verdict "improve"
-                            sh """D="`pwd`"; B="`basename "\$D"`" ; [ "${RETRY_NUMBER}" -gt 0 ] && T="_try-${RETRY_NUMBER}" || T="" ; tar czf "test-suite_${BUILD_TAG}_\${B}\${T}.tar.gz" `find . -name '*.trs'` `find . -name '*.log'`"""
-                            archiveArtifacts artifacts: "**/test-suite*.tar.gz", allowEmpty: true
-                            throw e
-                           }
-                          }
-                         }
-                        }
-                        sh 'echo "Are GitIgnores good after make check with drafts? (should have no output below)"; git status -s || if [ "${params.REQUIRE_GOOD_GITIGNORE}" = false ]; then echo "WARNING GitIgnore tests found newly changed or untracked files" >&2 ; exit 0 ; else echo "FAILED GitIgnore tests" >&2 ; exit 1; fi'
-                        script {
-                            if ( params.DO_CLEANUP_AFTER_BUILD ) {
-                                deleteDir()
-                            }
-                        }
-                      }
-                    }
-                }
-                stage ('check without DRAFT') {
-                    when { expression { return ( params.DO_BUILD_WITHOUT_DRAFT_API && params.DO_TEST_CHECK ) } }
-                    steps {
-                      dir("tmp/test-check-withoutDRAFT") {
-                        deleteDir()
-                        unstash 'built-nondraft'
-                        script {
-                         def RETRY_NUMBER = 0
-                         retry(3) {
-                          RETRY_NUMBER++
-                          timeout (time: "${params.USE_TEST_TIMEOUT}".toInteger(), unit: 'MINUTES') {
-                           try {
-                            sh 'CCACHE_BASEDIR="`pwd`" ; export CCACHE_BASEDIR; LD_LIBRARY_PATH="`pwd`/src/.libs:$LD_LIBRARY_PATH"; export LD_LIBRARY_PATH; make LD_LIBRARY_PATH="$LD_LIBRARY_PATH" check'
-                           }
-                           catch (Exception e) {
-                            currentBuild.result = 'UNSTABLE' // Jenkins should not let the verdict "improve"
-                            sh """D="`pwd`"; B="`basename "\$D"`" ; [ "${RETRY_NUMBER}" -gt 0 ] && T="_try-${RETRY_NUMBER}" || T="" ; tar czf "test-suite_${BUILD_TAG}_\${B}\${T}.tar.gz" `find . -name '*.trs'` `find . -name '*.log'`"""
-                            archiveArtifacts artifacts: "**/test-suite*.tar.gz", allowEmpty: true
-                            throw e
-                           }
-                          }
-                         }
-                        }
-                        sh 'echo "Are GitIgnores good after make check without drafts? (should have no output below)"; git status -s || if [ "${params.REQUIRE_GOOD_GITIGNORE}" = false ]; then echo "WARNING GitIgnore tests found newly changed or untracked files" >&2 ; exit 0 ; else echo "FAILED GitIgnore tests" >&2 ; exit 1; fi'
-                        script {
-                            if ( params.DO_CLEANUP_AFTER_BUILD ) {
-                                deleteDir()
-                            }
-                        }
-                      }
-                    }
-                }
-                stage ('memcheck with DRAFT') {
-                    when { expression { return ( params.DO_BUILD_WITH_DRAFT_API && params.DO_TEST_MEMCHECK ) } }
-                    steps {
-                      dir("tmp/test-memcheck-withDRAFT") {
-                        deleteDir()
-                        unstash 'built-draft'
-                        script {
-                         def RETRY_NUMBER = 0
-                         retry(3) {
-                          RETRY_NUMBER++
-                          timeout (time: "${params.USE_TEST_TIMEOUT}".toInteger(), unit: 'MINUTES') {
-                           try {
-                            sh 'CCACHE_BASEDIR="`pwd`" ; export CCACHE_BASEDIR; LD_LIBRARY_PATH="`pwd`/src/.libs:$LD_LIBRARY_PATH"; export LD_LIBRARY_PATH; make LD_LIBRARY_PATH="$LD_LIBRARY_PATH" memcheck && exit 0 ; echo "Re-running failed ($?) memcheck with greater verbosity" >&2 ; make LD_LIBRARY_PATH="$LD_LIBRARY_PATH" VERBOSE=1 memcheck-verbose'
-                           }
-                           catch (Exception e) {
-                            currentBuild.result = 'UNSTABLE' // Jenkins should not let the verdict "improve"
-                            sh """D="`pwd`"; B="`basename "\$D"`" ; [ "${RETRY_NUMBER}" -gt 0 ] && T="_try-${RETRY_NUMBER}" || T="" ; tar czf "test-suite_${BUILD_TAG}_\${B}\${T}.tar.gz" `find . -name '*.trs'` `find . -name '*.log'`"""
-                            archiveArtifacts artifacts: "**/test-suite*.tar.gz", allowEmpty: true
-                            throw e
-                           }
-                          }
-                         }
-                        }
-                        sh 'echo "Are GitIgnores good after make memcheck with drafts? (should have no output below)"; git status -s || if [ "${params.REQUIRE_GOOD_GITIGNORE}" = false ]; then echo "WARNING GitIgnore tests found newly changed or untracked files" >&2 ; exit 0 ; else echo "FAILED GitIgnore tests" >&2 ; exit 1; fi'
-                        script {
-                            if ( params.DO_CLEANUP_AFTER_BUILD ) {
-                                deleteDir()
-                            }
-                        }
-                      }
-                    }
-                }
-                stage ('memcheck without DRAFT') {
-                    when { expression { return ( params.DO_BUILD_WITHOUT_DRAFT_API && params.DO_TEST_MEMCHECK ) } }
-                    steps {
-                      dir("tmp/test-memcheck-withoutDRAFT") {
-                        deleteDir()
-                        unstash 'built-nondraft'
-                        script {
-                         def RETRY_NUMBER = 0
-                         retry(3) {
-                          RETRY_NUMBER++
-                          timeout (time: "${params.USE_TEST_TIMEOUT}".toInteger(), unit: 'MINUTES') {
-                           try {
-                            sh 'CCACHE_BASEDIR="`pwd`" ; export CCACHE_BASEDIR; LD_LIBRARY_PATH="`pwd`/src/.libs:$LD_LIBRARY_PATH"; export LD_LIBRARY_PATH; make LD_LIBRARY_PATH="$LD_LIBRARY_PATH" memcheck && exit 0 ; echo "Re-running failed ($?) memcheck with greater verbosity" >&2 ; make LD_LIBRARY_PATH="$LD_LIBRARY_PATH" VERBOSE=1 memcheck-verbose'
-                           }
-                           catch (Exception e) {
-                            currentBuild.result = 'UNSTABLE' // Jenkins should not let the verdict "improve"
-                            sh """D="`pwd`"; B="`basename "\$D"`" ; [ "${RETRY_NUMBER}" -gt 0 ] && T="_try-${RETRY_NUMBER}" || T="" ; tar czf "test-suite_${BUILD_TAG}_\${B}\${T}.tar.gz" `find . -name '*.trs'` `find . -name '*.log'`"""
-                            archiveArtifacts artifacts: "**/test-suite*.tar.gz", allowEmpty: true
-                            throw e
-                           }
-                          }
-                         }
-                        }
-                        sh 'echo "Are GitIgnores good after make memcheck without drafts? (should have no output below)"; git status -s || if [ "${params.REQUIRE_GOOD_GITIGNORE}" = false ]; then echo "WARNING GitIgnore tests found newly changed or untracked files" >&2 ; exit 0 ; else echo "FAILED GitIgnore tests" >&2 ; exit 1; fi'
-                        script {
-                            if ( params.DO_CLEANUP_AFTER_BUILD ) {
-                                deleteDir()
-                            }
-                        }
-                      }
-                    }
-                }
-                stage ('distcheck with DRAFT') {
-                    when { expression { return ( params.DO_BUILD_WITH_DRAFT_API && params.DO_TEST_DISTCHECK ) } }
-                    steps {
-                      dir("tmp/test-distcheck-withDRAFT") {
-                        deleteDir()
-                        unstash 'built-draft'
-                        script {
-                         def RETRY_NUMBER = 0
-                         retry(3) {
-                          RETRY_NUMBER++
-                          timeout (time: "${params.USE_TEST_TIMEOUT}".toInteger(), unit: 'MINUTES') {
-                           try {
-                            sh 'CCACHE_BASEDIR="`pwd`" ; export CCACHE_BASEDIR; LD_LIBRARY_PATH="`pwd`/src/.libs:$LD_LIBRARY_PATH"; export LD_LIBRARY_PATH; DISTCHECK_CONFIGURE_FLAGS="--enable-drafts=yes --with-docs=no" ; export DISTCHECK_CONFIGURE_FLAGS; make DISTCHECK_CONFIGURE_FLAGS="$DISTCHECK_CONFIGURE_FLAGS" LD_LIBRARY_PATH="$LD_LIBRARY_PATH" distcheck'
-                           }
-                           catch (Exception e) {
-                            currentBuild.result = 'UNSTABLE' // Jenkins should not let the verdict "improve"
-                            sh """D="`pwd`"; B="`basename "\$D"`" ; [ "${RETRY_NUMBER}" -gt 0 ] && T="_try-${RETRY_NUMBER}" || T="" ; tar czf "test-suite_${BUILD_TAG}_\${B}\${T}.tar.gz" `find . -name '*.trs'` `find . -name '*.log'`"""
-                            archiveArtifacts artifacts: "**/test-suite*.tar.gz", allowEmpty: true
-                            throw e
-                           }
-                          }
-                         }
-                        }
-                        sh 'echo "Are GitIgnores good after make distcheck with drafts? (should have no output below)"; git status -s || if [ "${params.REQUIRE_GOOD_GITIGNORE}" = false ]; then echo "WARNING GitIgnore tests found newly changed or untracked files" >&2 ; exit 0 ; else echo "FAILED GitIgnore tests" >&2 ; exit 1; fi'
-                        script {
-                            if ( params.DO_CLEANUP_AFTER_BUILD ) {
-                                deleteDir()
-                            }
-                        }
-                      }
-                    }
-                }
-                stage ('distcheck without DRAFT') {
-                    when { expression { return ( params.DO_BUILD_WITHOUT_DRAFT_API && params.DO_TEST_DISTCHECK ) } }
-                    steps {
-                      dir("tmp/test-distcheck-withoutDRAFT") {
-                        deleteDir()
-                        unstash 'built-nondraft'
-                        script {
-                         def RETRY_NUMBER = 0
-                         retry(3) {
-                          RETRY_NUMBER++
-                          timeout (time: "${params.USE_TEST_TIMEOUT}".toInteger(), unit: 'MINUTES') {
-                           try {
-                            sh 'CCACHE_BASEDIR="`pwd`" ; export CCACHE_BASEDIR; LD_LIBRARY_PATH="`pwd`/src/.libs:$LD_LIBRARY_PATH"; export LD_LIBRARY_PATH; DISTCHECK_CONFIGURE_FLAGS="--enable-drafts=no --with-docs=no" ; export DISTCHECK_CONFIGURE_FLAGS; make DISTCHECK_CONFIGURE_FLAGS="$DISTCHECK_CONFIGURE_FLAGS" LD_LIBRARY_PATH="$LD_LIBRARY_PATH" distcheck'
-                           }
-                           catch (Exception e) {
-                            currentBuild.result = 'UNSTABLE' // Jenkins should not let the verdict "improve"
-                            sh """D="`pwd`"; B="`basename "\$D"`" ; [ "${RETRY_NUMBER}" -gt 0 ] && T="_try-${RETRY_NUMBER}" || T="" ; tar czf "test-suite_${BUILD_TAG}_\${B}\${T}.tar.gz" `find . -name '*.trs'` `find . -name '*.log'`"""
-                            archiveArtifacts artifacts: "**/test-suite*.tar.gz", allowEmpty: true
-                            throw e
-                           }
-                          }
-                         }
-                        }
-                        sh 'echo "Are GitIgnores good after make distcheck without drafts? (should have no output below)"; git status -s || if [ "${params.REQUIRE_GOOD_GITIGNORE}" = false ]; then echo "WARNING GitIgnore tests found newly changed or untracked files" >&2 ; exit 0 ; else echo "FAILED GitIgnore tests" >&2 ; exit 1; fi'
-                        script {
-                            if ( params.DO_CLEANUP_AFTER_BUILD ) {
-                                deleteDir()
-                            }
-                        }
-                      }
-                    }
-                }
-                stage ('install with DRAFT') {
-                    when { expression { return ( params.DO_BUILD_WITH_DRAFT_API && params.DO_TEST_INSTALL ) } }
-                    steps {
-                      dir("tmp/test-install-withDRAFT") {
-                        deleteDir()
-                        unstash 'built-draft'
-                        retry(3) {
-                        timeout (time: "${params.USE_TEST_TIMEOUT}".toInteger(), unit: 'MINUTES') {
-                            sh """CCACHE_BASEDIR="`pwd`" ; export CCACHE_BASEDIR; LD_LIBRARY_PATH="`pwd`/src/.libs:\${LD_LIBRARY_PATH}"; export LD_LIBRARY_PATH; make LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}" DESTDIR="${params.USE_TEST_INSTALL_DESTDIR}/withDRAFT" install"""
-                        }
-                        }
-                        sh """cd "${params.USE_TEST_INSTALL_DESTDIR}/withDRAFT" && find . -ls"""
-                        sh 'echo "Are GitIgnores good after make install with drafts? (should have no output below)"; git status -s || if [ "${params.REQUIRE_GOOD_GITIGNORE}" = false ]; then echo "WARNING GitIgnore tests found newly changed or untracked files" >&2 ; exit 0 ; else echo "FAILED GitIgnore tests" >&2 ; exit 1; fi'
-                        script {
-                            if ( params.DO_CLEANUP_AFTER_BUILD ) {
-                                deleteDir()
-                            }
-                        }
-                      }
-                    }
-                }
-                stage ('install without DRAFT') {
-                    when { expression { return ( params.DO_BUILD_WITHOUT_DRAFT_API && params.DO_TEST_INSTALL ) } }
-                    steps {
-                      dir("tmp/test-install-withoutDRAFT") {
-                        deleteDir()
-                        unstash 'built-nondraft'
-                        retry(3) {
-                        timeout (time: "${params.USE_TEST_TIMEOUT}".toInteger(), unit: 'MINUTES') {
-                            sh """CCACHE_BASEDIR="`pwd`" ; export CCACHE_BASEDIR; LD_LIBRARY_PATH="`pwd`/src/.libs:\${LD_LIBRARY_PATH}"; export LD_LIBRARY_PATH; make LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}" DESTDIR="${params.USE_TEST_INSTALL_DESTDIR}/withoutDRAFT" install"""
-                        }
-                        }
-                        sh """cd "${params.USE_TEST_INSTALL_DESTDIR}/withoutDRAFT" && find . -ls"""
-                        sh 'echo "Are GitIgnores good after make install without drafts? (should have no output below)"; git status -s || if [ "${params.REQUIRE_GOOD_GITIGNORE}" = false ]; then echo "WARNING GitIgnore tests found newly changed or untracked files" >&2 ; exit 0 ; else echo "FAILED GitIgnore tests" >&2 ; exit 1; fi'
-                        script {
-                            if ( params.DO_CLEANUP_AFTER_BUILD ) {
-                                deleteDir()
-                            }
-                        }
-                      }
-                    }
-                }
-                stage ('install with DOCS') {
-                    when { expression { return ( params.DO_BUILD_DOCS && params.DO_TEST_INSTALL ) } }
-                    steps {
-                      dir("tmp/test-install-withDOCS") {
-                        deleteDir()
-                        unstash 'built-docs'
-                        retry(3) {
-                        timeout (time: "${params.USE_TEST_TIMEOUT}".toInteger(), unit: 'MINUTES') {
-                            sh """CCACHE_BASEDIR="`pwd`" ; export CCACHE_BASEDIR; LD_LIBRARY_PATH="`pwd`/src/.libs:\${LD_LIBRARY_PATH}"; export LD_LIBRARY_PATH; make LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}" DESTDIR="${params.USE_TEST_INSTALL_DESTDIR}/withDOCS" install"""
-                        }
-                        }
-                        sh """cd "${params.USE_TEST_INSTALL_DESTDIR}/withDOCS" && find . -ls"""
-                        sh 'echo "Are GitIgnores good after make install with Docs? (should have no output below)"; git status -s || if [ "${params.REQUIRE_GOOD_GITIGNORE}" = false ]; then echo "WARNING GitIgnore tests found newly changed or untracked files" >&2 ; exit 0 ; else echo "FAILED GitIgnore tests" >&2 ; exit 1; fi'
-                        script {
-                            if ( params.DO_CLEANUP_AFTER_BUILD ) {
-                                deleteDir()
-                            }
-                        }
-                      }
-                    }
-                }
-            }
-        }
-        stage ('deploy if appropriate') {
-            steps {
-                script {
-                    def myDEPLOY_JOB_NAME = sh(returnStdout: true, script: """echo "${params["DEPLOY_JOB_NAME"]}" """).trim();
-                    def myDEPLOY_BRANCH_PATTERN = sh(returnStdout: true, script: """echo "${params["DEPLOY_BRANCH_PATTERN"]}" """).trim();
-                    def myDEPLOY_REPORT_RESULT = sh(returnStdout: true, script: """echo "${params["DEPLOY_REPORT_RESULT"]}" """).trim().toBoolean();
-                    echo "Original: DEPLOY_JOB_NAME : ${params["DEPLOY_JOB_NAME"]} DEPLOY_BRANCH_PATTERN : ${params["DEPLOY_BRANCH_PATTERN"]} DEPLOY_REPORT_RESULT : ${params["DEPLOY_REPORT_RESULT"]}"
-                    echo "Used:     myDEPLOY_JOB_NAME:${myDEPLOY_JOB_NAME} myDEPLOY_BRANCH_PATTERN:${myDEPLOY_BRANCH_PATTERN} myDEPLOY_REPORT_RESULT:${myDEPLOY_REPORT_RESULT}"
-                    if ( (myDEPLOY_JOB_NAME != "") && (myDEPLOY_BRANCH_PATTERN != "") ) {
-                        if ( env.BRANCH_NAME =~ myDEPLOY_BRANCH_PATTERN ) {
-                            def GIT_URL = sh(returnStdout: true, script: """git remote -v | egrep '^origin' | awk '{print \$2}' | head -1""").trim()
-                            def GIT_COMMIT = sh(returnStdout: true, script: 'git rev-parse --verify HEAD').trim()
-                            def DIST_ARCHIVE = ""
-                            if ( params.DO_DIST_DOCS ) { DIST_ARCHIVE = env.BUILD_URL + "artifact/__dist.tar.gz" }
-                            build job: "${myDEPLOY_JOB_NAME}", parameters: [
-                                string(name: 'DEPLOY_GIT_URL', value: "${GIT_URL}"),
-                                string(name: 'DEPLOY_GIT_BRANCH', value: env.BRANCH_NAME),
-                                string(name: 'DEPLOY_GIT_COMMIT', value: "${GIT_COMMIT}"),
-                                string(name: 'DEPLOY_DIST_ARCHIVE', value: "${DIST_ARCHIVE}")
-                                ], quietPeriod: 0, wait: myDEPLOY_REPORT_RESULT, propagate: myDEPLOY_REPORT_RESULT
-                        } else {
-                            echo "Not deploying because branch '${env.BRANCH_NAME}' did not match filter '${myDEPLOY_BRANCH_PATTERN}'"
-                        }
-                    } else {
-                        echo "Not deploying because deploy-job parameters are not set"
-                    }
-                }
-            }
-        }
-    }
-    post {
-        success {
-            script {
-                if (currentBuild.getPreviousBuild()?.result != 'SUCCESS') {
-                    // Uncomment desired notification
-
-                    //slackSend (color: "#008800", message: "Build ${env.JOB_NAME} is back to normal.")
-                    //emailext (to: "qa@example.com", subject: "Build ${env.JOB_NAME} is back to normal.", body: "Build ${env.JOB_NAME} is back to normal.")
-                }
-            }
-        }
-        failure {
-            // Uncomment desired notification
-            // Section must not be empty, you can delete the sleep once you set notification
-            sleep 1
-            //slackSend (color: "#AA0000", message: "Build ${env.BUILD_NUMBER} of ${env.JOB_NAME} ${currentBuild.result} (<${env.BUILD_URL}|Open>)")
-            //emailext (to: "qa@example.com", subject: "Build ${env.JOB_NAME} failed!", body: "Build ${env.BUILD_NUMBER} of ${env.JOB_NAME} ${currentBuild.result}\nSee ${env.BUILD_URL}")
-        }
-    }
-}
diff --git a/libs/libzmq/Makefile.am b/libs/libzmq/Makefile.am
deleted file mode 100755
index 5008f7e..0000000
--- a/libs/libzmq/Makefile.am
+++ /dev/null
@@ -1,1534 +0,0 @@
-ACLOCAL_AMFLAGS = -I config
-
-SUBDIRS = doc
-
-DIST_SUBDIRS = doc builds builds/deprecated-msvc
-
-pkgconfig_DATA = src/libzmq.pc
-
-AM_CPPFLAGS = \
-	-I$(top_builddir)/include \
-	-I$(top_srcdir)/include
-
-#
-# libraries/binaries
-#
-lib_LTLIBRARIES = src/libzmq.la
-
-include_HEADERS = \
-	include/zmq.h \
-	include/zmq_utils.h
-
-src_libzmq_la_SOURCES = \
-	src/address.cpp \
-	src/address.hpp \
-	src/array.hpp \
-	src/atomic_counter.hpp \
-	src/atomic_ptr.hpp \
-	src/blob.hpp \
-	src/channel.cpp \
-	src/channel.hpp \
-	src/client.cpp \
-	src/client.hpp \
-	src/clock.cpp \
-	src/clock.hpp \
-	src/command.hpp \
-	src/compat.hpp \
-	src/condition_variable.hpp \
-	src/config.hpp \
-	src/ctx.cpp \
-	src/ctx.hpp \
-	src/curve_client.cpp \
-	src/curve_client.hpp \
-	src/curve_client_tools.hpp \
-	src/curve_mechanism_base.cpp \
-	src/curve_mechanism_base.hpp \
-	src/curve_server.cpp \
-	src/curve_server.hpp \
-	src/dbuffer.hpp \
-	src/dealer.cpp \
-	src/dealer.hpp \
-	src/decoder.hpp \
-	src/devpoll.cpp \
-	src/devpoll.hpp \
-	src/dgram.cpp \
-	src/dgram.hpp \
-	src/dish.cpp \
-	src/dish.hpp \
-	src/dist.cpp \
-	src/dist.hpp \
-	src/encoder.hpp \
-	src/endpoint.hpp \
-	src/endpoint.cpp \
-	src/epoll.cpp \
-	src/epoll.hpp \
-	src/err.cpp \
-	src/err.hpp \
-	src/fd.hpp \
-	src/fq.cpp \
-	src/fq.hpp \
-	src/gather.cpp \
-	src/gather.hpp \
-	src/generic_mtrie.hpp \
-	src/generic_mtrie_impl.hpp \
-	src/gssapi_mechanism_base.cpp \
-	src/gssapi_mechanism_base.hpp \
-	src/gssapi_client.cpp \
-	src/gssapi_client.hpp \
-	src/gssapi_server.cpp \
-	src/gssapi_server.hpp \
-	src/i_encoder.hpp \
-	src/i_engine.hpp \
-	src/i_decoder.hpp \
-	src/i_mailbox.hpp \
-	src/i_poll_events.hpp \
-	src/io_object.cpp \
-	src/io_object.hpp \
-	src/io_thread.cpp \
-	src/io_thread.hpp \
-	src/ip.cpp \
-	src/ip.hpp \
-	src/ip_resolver.cpp \
-	src/ip_resolver.hpp \
-	src/ipc_address.cpp \
-	src/ipc_address.hpp \
-	src/ipc_connecter.cpp \
-	src/ipc_connecter.hpp \
-	src/ipc_listener.cpp \
-	src/ipc_listener.hpp \
-	src/kqueue.cpp \
-	src/kqueue.hpp \
-	src/lb.cpp \
-	src/lb.hpp \
-	src/likely.hpp \
-	src/macros.hpp \
-	src/mailbox.cpp \
-	src/mailbox.hpp \
-	src/mailbox_safe.cpp \
-	src/mailbox_safe.hpp \
-	src/mechanism.cpp \
-	src/mechanism.hpp  \
-	src/mechanism_base.cpp \
-	src/mechanism_base.hpp  \
-	src/metadata.cpp \
-	src/metadata.hpp \
-	src/msg.cpp \
-	src/msg.hpp \
-	src/mtrie.cpp \
-	src/mtrie.hpp \
-	src/mutex.hpp \
-	src/norm_engine.cpp \
-	src/norm_engine.hpp \
-	src/null_mechanism.cpp \
-	src/null_mechanism.hpp \
-	src/object.cpp \
-	src/object.hpp \
-	src/options.cpp \
-	src/options.hpp \
-	src/own.cpp \
-	src/own.hpp \
-	src/pair.cpp \
-	src/pair.hpp \
-	src/peer.cpp \
-	src/peer.hpp \
-	src/pgm_receiver.cpp \
-	src/pgm_receiver.hpp \
-	src/pgm_sender.cpp \
-	src/pgm_sender.hpp \
-	src/pgm_socket.cpp \
-	src/pgm_socket.hpp \
-	src/pipe.cpp \
-	src/pipe.hpp \
-	src/plain_client.cpp \
-	src/plain_client.hpp \
-	src/plain_common.hpp \
-	src/plain_server.cpp \
-	src/plain_server.hpp \
-	src/platform.hpp \
-	src/poll.cpp \
-	src/poll.hpp \
-	src/poller.hpp \
-	src/poller_base.cpp \
-	src/poller_base.hpp \
-	src/polling_util.cpp \
-	src/polling_util.hpp \
-	src/pollset.cpp \
-	src/pollset.hpp \
-	src/precompiled.cpp \
-	src/precompiled.hpp \
-	src/proxy.cpp \
-	src/proxy.hpp \
-	src/pub.cpp \
-	src/pub.hpp \
-	src/pull.cpp \
-	src/pull.hpp \
-	src/push.cpp \
-	src/push.hpp \
-	src/radio.cpp \
-	src/radio.hpp \
-	src/radix_tree.cpp \
-	src/radix_tree.hpp \
-	src/random.cpp \
-	src/random.hpp \
-	src/raw_decoder.cpp \
-	src/raw_decoder.hpp \
-	src/raw_encoder.cpp \
-	src/raw_encoder.hpp \
-	src/raw_engine.cpp \
-	src/raw_engine.hpp \
-	src/reaper.cpp \
-	src/reaper.hpp \
-	src/rep.cpp \
-	src/rep.hpp \
-	src/req.cpp \
-	src/req.hpp \
-	src/router.cpp \
-	src/router.hpp \
-	src/scatter.cpp \
-	src/scatter.hpp \
-	src/secure_allocator.hpp \
-	src/select.cpp \
-	src/select.hpp \
-	src/server.cpp \
-	src/server.hpp \
-	src/session_base.cpp \
-	src/session_base.hpp \
-	src/signaler.cpp \
-	src/signaler.hpp \
-	src/socket_base.cpp \
-	src/socket_base.hpp \
-	src/socks.cpp \
-	src/socks.hpp \
-	src/socks_connecter.cpp \
-	src/socks_connecter.hpp \
-	src/stdint.hpp \
-	src/stream.cpp \
-	src/stream.hpp \
-	src/stream_connecter_base.cpp \
-	src/stream_connecter_base.hpp \
-	src/stream_listener_base.cpp \
-	src/stream_listener_base.hpp \
-	src/stream_engine_base.cpp \
-	src/stream_engine_base.hpp \
-	src/sub.cpp \
-	src/sub.hpp \
-	src/tcp.cpp \
-	src/tcp.hpp \
-	src/tcp_address.cpp \
-	src/tcp_address.hpp \
-	src/tcp_connecter.cpp \
-	src/tcp_connecter.hpp \
-	src/tcp_listener.cpp \
-	src/tcp_listener.hpp \
-	src/thread.cpp \
-	src/thread.hpp \
-	src/timers.cpp \
-	src/timers.hpp \
-	src/tipc_address.cpp \
-	src/tipc_address.hpp \
-	src/tipc_connecter.cpp \
-	src/tipc_connecter.hpp \
-	src/tipc_listener.cpp \
-	src/tipc_listener.hpp \
-	src/trie.cpp \
-	src/trie.hpp \
-	src/udp_address.cpp \
-	src/udp_address.hpp \
-	src/udp_engine.cpp \
-	src/udp_engine.hpp \
-	src/v1_decoder.cpp \
-	src/v1_decoder.hpp \
-	src/v2_decoder.cpp \
-	src/v2_decoder.hpp \
-	src/v1_encoder.cpp \
-	src/v1_encoder.hpp \
-	src/v2_encoder.cpp \
-	src/v2_encoder.hpp \
-	src/v3_1_encoder.cpp \
-	src/v3_1_encoder.hpp \
-	src/v2_protocol.hpp \
-	src/vmci.cpp \
-	src/vmci.hpp \
-	src/vmci_address.cpp \
-	src/vmci_address.hpp \
-	src/vmci_connecter.cpp \
-	src/vmci_connecter.hpp \
-	src/vmci_listener.cpp \
-	src/vmci_listener.hpp \
-	src/windows.hpp \
-	src/wire.hpp \
-	src/xpub.cpp \
-	src/xpub.hpp \
-	src/xsub.cpp \
-	src/xsub.hpp \
-	src/ypipe.hpp \
-	src/ypipe_base.hpp \
-	src/ypipe_conflate.hpp \
-	src/yqueue.hpp \
-	src/zmq.cpp \
-	src/zmq_utils.cpp \
-	src/decoder_allocators.cpp \
-	src/decoder_allocators.hpp \
-	src/socket_poller.cpp \
-	src/socket_poller.hpp \
-	src/zap_client.cpp \
-	src/zap_client.hpp \
-	src/zmtp_engine.cpp \
-	src/zmtp_engine.hpp \
-	src/zmq_draft.h
-
-if USE_WEPOLL
-src_libzmq_la_SOURCES += \
-	external/wepoll/wepoll.c \
-	external/wepoll/wepoll.h
-endif
-
-if USE_TWEETNACL
-src_libzmq_la_SOURCES += \
-	src/tweetnacl.c \
-	src/tweetnacl.h
-endif
-
-if HAVE_WS
-src_libzmq_la_SOURCES += \
-	src/ws_address.cpp \
-	src/ws_address.hpp \
-	src/wss_address.cpp \
-	src/wss_address.hpp \
-	src/ws_connecter.cpp \
-	src/ws_connecter.hpp \
-	src/ws_decoder.cpp \
-	src/ws_decoder.hpp \
-	src/ws_encoder.cpp \
-	src/ws_encoder.hpp \
-	src/ws_engine.cpp \
-	src/ws_engine.hpp \
-	src/ws_listener.cpp \
-	src/ws_listener.hpp \
-	src/ws_protocol.hpp
-endif
-
-if USE_BUILTIN_SHA1
-src_libzmq_la_SOURCES += \
-	external/sha1/sha1.c \
-	external/sha1/sha1.h
-endif
-
-if HAVE_WSS
-src_libzmq_la_SOURCES += \
-	src/wss_engine.cpp \
-	src/wss_engine.hpp
-endif
-
-if ON_MINGW
-src_libzmq_la_LDFLAGS = \
-	-no-undefined \
-	-avoid-version \
-	-version-info @LTVER@ \
-	@LIBZMQ_EXTRA_LDFLAGS@
-else
-if ON_CYGWIN
-src_libzmq_la_LDFLAGS = \
-	-no-undefined \
-	-avoid-version \
-	-version-info @LTVER@ \
-	@LIBZMQ_EXTRA_LDFLAGS@
-else
-if ON_ANDROID
-src_libzmq_la_LDFLAGS = \
-	-avoid-version \
-	-version-info @LTVER@ \
-	@LIBZMQ_EXTRA_LDFLAGS@
-else
-src_libzmq_la_LDFLAGS = \
-	-version-info @LTVER@ \
-	@LIBZMQ_EXTRA_LDFLAGS@
-endif
-endif
-endif
-
-if HAVE_VSCRIPT_COMPLEX
-src_libzmq_la_LDFLAGS += $(VSCRIPT_LDFLAGS),$(srcdir)/src/libzmq.vers
-endif
-
-src_libzmq_la_CPPFLAGS = $(CODE_COVERAGE_CPPFLAGS) $(LIBUNWIND_CFLAGS) $(LIBBSD_CFLAGS)
-src_libzmq_la_CFLAGS = $(CODE_COVERAGE_CFLAGS) $(LIBUNWIND_CFLAGS) $(LIBBSD_CFLAGS)
-src_libzmq_la_CXXFLAGS = @LIBZMQ_EXTRA_CXXFLAGS@ $(CODE_COVERAGE_CXXFLAGS) \
-	$(LIBUNWIND_CFLAGS) $(LIBBSD_CFLAGS)
-src_libzmq_la_LIBADD = $(CODE_COVERAGE_LDFLAGS) $(LIBUNWIND_LIBS) $(LIBBSD_LIBS)
-
-if USE_NSS
-src_libzmq_la_CPPFLAGS += ${NSS3_CFLAGS}
-src_libzmq_la_LIBADD += ${NSS3_LIBS}
-endif
-
-if USE_GNUTLS
-src_libzmq_la_CPPFLAGS += ${GNUTLS_CFLAGS}
-src_libzmq_la_LIBADD += ${GNUTLS_LIBS}
-endif
-
-if USE_LIBSODIUM
-src_libzmq_la_CPPFLAGS += ${sodium_CFLAGS}
-src_libzmq_la_LIBADD += ${sodium_LIBS}
-endif
-
-if HAVE_PGM
-src_libzmq_la_CPPFLAGS += ${pgm_CFLAGS}
-src_libzmq_la_LIBADD += ${pgm_LIBS}
-endif
-
-if HAVE_NORM
-src_libzmq_la_CPPFLAGS += ${norm_CFLAGS}
-src_libzmq_la_LIBADD += ${norm_LIBS}
-endif
-
-if BUILD_GSSAPI
-src_libzmq_la_CPPFLAGS += ${gssapi_krb5_CFLAGS}
-src_libzmq_la_LIBADD += ${gssapi_krb5_LIBS}
-endif
-
-if ENABLE_PERF
-noinst_PROGRAMS = \
-	perf/local_lat \
-	perf/remote_lat \
-	perf/local_thr \
-	perf/remote_thr \
-	perf/inproc_lat \
-	perf/inproc_thr \
-	perf/proxy_thr
-
-perf_local_lat_LDADD = src/libzmq.la
-perf_local_lat_SOURCES = perf/local_lat.cpp
-
-perf_remote_lat_LDADD = src/libzmq.la
-perf_remote_lat_SOURCES = perf/remote_lat.cpp
-
-perf_local_thr_LDADD = src/libzmq.la
-perf_local_thr_SOURCES = perf/local_thr.cpp
-
-perf_remote_thr_LDADD = src/libzmq.la
-perf_remote_thr_SOURCES = perf/remote_thr.cpp
-
-perf_inproc_lat_LDADD = src/libzmq.la
-perf_inproc_lat_SOURCES = perf/inproc_lat.cpp
-
-perf_inproc_thr_LDADD = src/libzmq.la
-perf_inproc_thr_SOURCES = perf/inproc_thr.cpp
-
-perf_proxy_thr_LDADD = src/libzmq.la
-perf_proxy_thr_SOURCES = perf/proxy_thr.cpp
-
-if ENABLE_STATIC
-noinst_PROGRAMS += \
-	perf/benchmark_radix_tree
-
-perf_benchmark_radix_tree_DEPENDENCIES = src/libzmq.la
-perf_benchmark_radix_tree_CPPFLAGS = -I$(top_srcdir)/src
-perf_benchmark_radix_tree_LDADD = $(top_builddir)/src/.libs/libzmq.a \
-	${src_libzmq_la_LIBADD}
-perf_benchmark_radix_tree_SOURCES = perf/benchmark_radix_tree.cpp
-endif
-endif
-
-if ENABLE_CURVE_KEYGEN
-bin_PROGRAMS = tools/curve_keygen
-
-tools_curve_keygen_LDADD = src/libzmq.la
-tools_curve_keygen_SOURCES = tools/curve_keygen.cpp
-endif
-
-#
-# tests
-#
-test_apps = \
-	tests/test_ancillaries \
-	tests/test_system \
-	tests/test_pair_inproc \
-	tests/test_pair_tcp \
-	tests/test_reqrep_inproc \
-	tests/test_reqrep_tcp \
-	tests/test_hwm \
-	tests/test_hwm_pubsub \
-	tests/test_reqrep_device \
-	tests/test_sub_forward \
-	tests/test_invalid_rep \
-	tests/test_msg_flags \
-	tests/test_msg_ffn \
-	tests/test_connect_resolve \
-	tests/test_immediate \
-	tests/test_last_endpoint \
-	tests/test_term_endpoint \
-	tests/test_srcfd \
-	tests/test_monitor \
-	tests/test_router_mandatory \
-	tests/test_router_mandatory_hwm \
-	tests/test_router_handover \
-	tests/test_probe_router \
-	tests/test_stream \
-	tests/test_stream_empty \
-	tests/test_stream_disconnect \
-	tests/test_stream_timeout \
-	tests/test_disconnect_inproc \
-	tests/test_unbind_wildcard \
-	tests/test_ctx_options \
-	tests/test_ctx_destroy \
-        tests/test_security_no_zap_handler \
-        tests/test_security_null \
-	tests/test_security_plain \
-	tests/test_security_zap \
-	tests/test_iov \
-	tests/test_spec_req \
-	tests/test_spec_rep \
-	tests/test_spec_dealer \
-	tests/test_spec_router \
-	tests/test_spec_pushpull \
-	tests/test_req_correlate \
-	tests/test_req_relaxed \
-	tests/test_conflate \
-	tests/test_inproc_connect \
-	tests/test_issue_566 \
-	tests/test_proxy_hwm \
-	tests/test_proxy_single_socket \
-	tests/test_proxy_terminate \
-	tests/test_getsockopt_memset \
-	tests/test_setsockopt \
-	tests/test_diffserv \
-	tests/test_connect_rid \
-	tests/test_bind_src_address \
-	tests/test_metadata \
-	tests/test_capabilities \
-	tests/test_xpub_nodrop \
-	tests/test_xpub_manual \
-	tests/test_xpub_welcome_msg \
-	tests/test_xpub_verbose \
-	tests/test_atomics \
-	tests/test_sockopt_hwm \
-	tests/test_heartbeats \
-	tests/test_stream_exceeds_buffer \
-	tests/test_pub_invert_matching \
-	tests/test_base85 \
-	tests/test_bind_after_connect_tcp \
-	tests/test_sodium \
-	tests/test_reconnect_ivl \
-	tests/test_mock_pub_sub \
-	tests/test_socket_null \
-	tests/test_tcp_accept_filter
-
-UNITY_CPPFLAGS = -I$(top_srcdir)/external/unity -DUNITY_USE_COMMAND_LINE_ARGS -DUNITY_EXCLUDE_FLOAT
-UNITY_LIBS = $(top_builddir)/external/unity/libunity.a
-external_unity_libunity_a_SOURCES = external/unity/unity.c \
-	external/unity/unity.h \
-	external/unity/unity_internals.h
-
-TESTUTIL_CPPFLAGS = ${UNITY_CPPFLAGS}
-TESTUTIL_LIBS = $(top_builddir)/tests/libtestutil.a ${UNITY_LIBS}
-tests_libtestutil_a_SOURCES = \
-        tests/testutil.cpp \
-        tests/testutil.hpp \
-        tests/testutil_monitoring.cpp \
-        tests/testutil_monitoring.hpp \
-        tests/testutil_security.cpp \
-        tests/testutil_security.hpp \
-        tests/testutil_unity.cpp \
-        tests/testutil_unity.hpp
-tests_libtestutil_a_CPPFLAGS = ${UNITY_CPPFLAGS}
-
-noinst_LIBRARIES = external/unity/libunity.a tests/libtestutil.a
-
-tests_test_ancillaries_SOURCES = tests/test_ancillaries.cpp
-tests_test_ancillaries_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_ancillaries_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_system_SOURCES = tests/test_system.cpp
-tests_test_system_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_system_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_pair_inproc_SOURCES = tests/test_pair_inproc.cpp
-tests_test_pair_inproc_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_pair_inproc_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_pair_tcp_SOURCES = tests/test_pair_tcp.cpp
-tests_test_pair_tcp_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_pair_tcp_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_reqrep_inproc_SOURCES = tests/test_reqrep_inproc.cpp
-tests_test_reqrep_inproc_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_reqrep_inproc_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_reqrep_tcp_SOURCES = tests/test_reqrep_tcp.cpp
-tests_test_reqrep_tcp_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_reqrep_tcp_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_hwm_SOURCES = tests/test_hwm.cpp
-tests_test_hwm_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_hwm_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_hwm_pubsub_SOURCES = tests/test_hwm_pubsub.cpp
-tests_test_hwm_pubsub_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_hwm_pubsub_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_reqrep_device_SOURCES = tests/test_reqrep_device.cpp
-tests_test_reqrep_device_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_reqrep_device_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_sub_forward_SOURCES = tests/test_sub_forward.cpp
-tests_test_sub_forward_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_sub_forward_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_invalid_rep_SOURCES = tests/test_invalid_rep.cpp
-tests_test_invalid_rep_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_invalid_rep_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_msg_flags_SOURCES = tests/test_msg_flags.cpp
-tests_test_msg_flags_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_msg_flags_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_msg_ffn_SOURCES = tests/test_msg_ffn.cpp
-tests_test_msg_ffn_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_msg_ffn_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_connect_resolve_SOURCES = tests/test_connect_resolve.cpp
-tests_test_connect_resolve_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_connect_resolve_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_immediate_SOURCES = tests/test_immediate.cpp
-tests_test_immediate_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_immediate_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_last_endpoint_SOURCES = tests/test_last_endpoint.cpp
-tests_test_last_endpoint_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_last_endpoint_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_term_endpoint_SOURCES = tests/test_term_endpoint.cpp
-tests_test_term_endpoint_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_term_endpoint_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_srcfd_SOURCES = tests/test_srcfd.cpp
-tests_test_srcfd_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_srcfd_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_monitor_SOURCES = tests/test_monitor.cpp
-tests_test_monitor_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_monitor_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_router_mandatory_SOURCES = tests/test_router_mandatory.cpp
-tests_test_router_mandatory_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_router_mandatory_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_router_mandatory_hwm_SOURCES = tests/test_router_mandatory_hwm.cpp
-tests_test_router_mandatory_hwm_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_router_mandatory_hwm_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_router_handover_SOURCES = tests/test_router_handover.cpp
-tests_test_router_handover_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_router_handover_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_probe_router_SOURCES = tests/test_probe_router.cpp
-tests_test_probe_router_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_probe_router_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_stream_SOURCES = tests/test_stream.cpp
-tests_test_stream_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_stream_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_stream_empty_SOURCES = tests/test_stream_empty.cpp
-tests_test_stream_empty_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_stream_empty_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_stream_timeout_SOURCES = tests/test_stream_timeout.cpp
-tests_test_stream_timeout_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_stream_timeout_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_stream_disconnect_SOURCES = tests/test_stream_disconnect.cpp
-tests_test_stream_disconnect_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_stream_disconnect_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_disconnect_inproc_SOURCES = tests/test_disconnect_inproc.cpp
-tests_test_disconnect_inproc_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_disconnect_inproc_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_unbind_wildcard_SOURCES = tests/test_unbind_wildcard.cpp
-tests_test_unbind_wildcard_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_unbind_wildcard_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_ctx_options_SOURCES = tests/test_ctx_options.cpp
-tests_test_ctx_options_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_ctx_options_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_iov_SOURCES = tests/test_iov.cpp
-tests_test_iov_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_iov_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_ctx_destroy_SOURCES = tests/test_ctx_destroy.cpp
-tests_test_ctx_destroy_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_ctx_destroy_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_security_no_zap_handler_SOURCES = tests/test_security_no_zap_handler.cpp
-tests_test_security_no_zap_handler_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_security_no_zap_handler_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_security_null_SOURCES = tests/test_security_null.cpp
-tests_test_security_null_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_security_null_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_security_plain_SOURCES = tests/test_security_plain.cpp
-tests_test_security_plain_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_security_plain_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_security_zap_SOURCES = tests/test_security_zap.cpp
-tests_test_security_zap_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_security_zap_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_spec_req_SOURCES = tests/test_spec_req.cpp
-tests_test_spec_req_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_spec_req_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_spec_rep_SOURCES = tests/test_spec_rep.cpp
-tests_test_spec_rep_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_spec_rep_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_spec_dealer_SOURCES = tests/test_spec_dealer.cpp
-tests_test_spec_dealer_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_spec_dealer_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_spec_router_SOURCES = tests/test_spec_router.cpp
-tests_test_spec_router_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_spec_router_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_spec_pushpull_SOURCES = tests/test_spec_pushpull.cpp
-tests_test_spec_pushpull_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_spec_pushpull_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_req_correlate_SOURCES = tests/test_req_correlate.cpp
-tests_test_req_correlate_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_req_correlate_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_req_relaxed_SOURCES = tests/test_req_relaxed.cpp
-tests_test_req_relaxed_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_req_relaxed_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_conflate_SOURCES = tests/test_conflate.cpp
-tests_test_conflate_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_conflate_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_inproc_connect_SOURCES = tests/test_inproc_connect.cpp
-tests_test_inproc_connect_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_inproc_connect_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_issue_566_SOURCES = tests/test_issue_566.cpp
-tests_test_issue_566_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_issue_566_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-# TODO: gets stuck even with long timeout running under Github Actions
-if !VALGRIND_ENABLED
-test_apps += tests/test_proxy
-
-tests_test_proxy_SOURCES = tests/test_proxy.cpp
-tests_test_proxy_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_proxy_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-endif
-
-tests_test_proxy_hwm_SOURCES = tests/test_proxy_hwm.cpp
-tests_test_proxy_hwm_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_proxy_hwm_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_proxy_single_socket_SOURCES = tests/test_proxy_single_socket.cpp
-tests_test_proxy_single_socket_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_proxy_single_socket_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_proxy_terminate_SOURCES = tests/test_proxy_terminate.cpp
-tests_test_proxy_terminate_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_proxy_terminate_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_getsockopt_memset_SOURCES = tests/test_getsockopt_memset.cpp
-tests_test_getsockopt_memset_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_getsockopt_memset_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_diffserv_SOURCES = tests/test_diffserv.cpp
-tests_test_diffserv_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_diffserv_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_connect_rid_SOURCES = tests/test_connect_rid.cpp
-tests_test_connect_rid_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_connect_rid_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_bind_src_address_SOURCES = tests/test_bind_src_address.cpp
-tests_test_bind_src_address_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_bind_src_address_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_metadata_SOURCES = tests/test_metadata.cpp
-tests_test_metadata_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_metadata_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_capabilities_SOURCES = tests/test_capabilities.cpp
-tests_test_capabilities_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_capabilities_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_xpub_nodrop_SOURCES = tests/test_xpub_nodrop.cpp
-tests_test_xpub_nodrop_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_xpub_nodrop_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_xpub_manual_SOURCES = tests/test_xpub_manual.cpp
-tests_test_xpub_manual_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_xpub_manual_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_xpub_welcome_msg_SOURCES = tests/test_xpub_welcome_msg.cpp
-tests_test_xpub_welcome_msg_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_xpub_welcome_msg_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_xpub_verbose_SOURCES = tests/test_xpub_verbose.cpp
-tests_test_xpub_verbose_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_xpub_verbose_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_atomics_SOURCES = tests/test_atomics.cpp
-tests_test_atomics_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_atomics_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_sockopt_hwm_SOURCES = tests/test_sockopt_hwm.cpp
-tests_test_sockopt_hwm_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_sockopt_hwm_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_setsockopt_SOURCES = tests/test_setsockopt.cpp
-tests_test_setsockopt_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_setsockopt_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_heartbeats_SOURCES = tests/test_heartbeats.cpp
-tests_test_heartbeats_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_heartbeats_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_stream_exceeds_buffer_SOURCES = tests/test_stream_exceeds_buffer.cpp
-tests_test_stream_exceeds_buffer_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_stream_exceeds_buffer_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_pub_invert_matching_SOURCES = tests/test_pub_invert_matching.cpp
-tests_test_pub_invert_matching_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_pub_invert_matching_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_bind_after_connect_tcp_SOURCES = tests/test_bind_after_connect_tcp.cpp
-tests_test_bind_after_connect_tcp_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_bind_after_connect_tcp_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_base85_SOURCES = tests/test_base85.cpp
-tests_test_base85_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_base85_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_sodium_SOURCES = tests/test_sodium.cpp
-tests_test_sodium_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_sodium_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_socket_null_SOURCES = tests/test_socket_null.cpp
-tests_test_socket_null_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_socket_null_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_reconnect_ivl_SOURCES = tests/test_reconnect_ivl.cpp
-tests_test_reconnect_ivl_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_reconnect_ivl_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_mock_pub_sub_SOURCES = tests/test_mock_pub_sub.cpp
-tests_test_mock_pub_sub_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_mock_pub_sub_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_tcp_accept_filter_SOURCES = tests/test_tcp_accept_filter.cpp
-tests_test_tcp_accept_filter_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_tcp_accept_filter_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-if HAVE_CURVE
-
-test_apps += \
-	tests/test_security_curve
-
-tests_test_security_curve_SOURCES = \
-	tests/test_security_curve.cpp \
-        src/curve_client_tools.hpp \
-	src/clock.hpp \
-	src/clock.cpp \
-	src/random.hpp \
-	src/random.cpp \
-	src/err.hpp \
-	src/err.cpp
-
-if USE_TWEETNACL
-tests_test_security_curve_SOURCES += \
-	src/tweetnacl.c
-endif
-
-tests_test_security_curve_LDADD = \
-        ${TESTUTIL_LIBS} src/libzmq.la $(LIBUNWIND_LIBS) $(LIBBSD_LIBS)
-tests_test_security_curve_CPPFLAGS = \
-        ${TESTUTIL_CPPFLAGS} \
-	${LIBUNWIND_CFLAGS}  ${LIBBSD_CFLAGS}
-
-if USE_LIBSODIUM
-tests_test_security_curve_CPPFLAGS += \
-	${sodium_CFLAGS}
-tests_test_security_curve_LDADD += \
-	${sodium_LIBS}
-endif
-
-endif
-
-if HAVE_WS
-test_apps += \
-	tests/test_ws_transport
-tests_test_ws_transport_SOURCES = tests/test_ws_transport.cpp
-tests_test_ws_transport_LDADD = ${TESTUTIL_LIBS} src/libzmq.la ${NSS3_LIBS}
-tests_test_ws_transport_CPPFLAGS = ${TESTUTIL_CPPFLAGS} ${NSS3_CFLAGS}
-endif
-
-if HAVE_WSS
-test_apps += \
-	tests/test_wss_transport
-tests_test_wss_transport_SOURCES = tests/test_wss_transport.cpp
-tests_test_wss_transport_LDADD = ${TESTUTIL_LIBS} src/libzmq.la ${GNUTLS_LIBS}
-tests_test_wss_transport_CPPFLAGS = ${TESTUTIL_CPPFLAGS} ${GNUTLS_CFLAGS}
-endif
-
-if !ON_MINGW
-if !ON_CYGWIN
-test_apps += \
-	tests/test_shutdown_stress \
-	tests/test_ipc_wildcard \
-	tests/test_pair_ipc \
-	tests/test_rebind_ipc \
-	tests/test_reqrep_ipc \
-	tests/test_use_fd \
-	tests/test_zmq_poll_fd \
-	tests/test_timeo \
-	tests/test_filter_ipc
-
-tests_test_shutdown_stress_SOURCES = tests/test_shutdown_stress.cpp
-tests_test_shutdown_stress_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_shutdown_stress_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_ipc_wildcard_SOURCES = tests/test_ipc_wildcard.cpp
-tests_test_ipc_wildcard_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_ipc_wildcard_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_pair_ipc_SOURCES = tests/test_pair_ipc.cpp
-tests_test_pair_ipc_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_pair_ipc_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_rebind_ipc_SOURCES = tests/test_rebind_ipc.cpp
-tests_test_rebind_ipc_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_rebind_ipc_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_reqrep_ipc_SOURCES = tests/test_reqrep_ipc.cpp
-tests_test_reqrep_ipc_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_reqrep_ipc_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_timeo_SOURCES = tests/test_timeo.cpp
-tests_test_timeo_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_timeo_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_filter_ipc_SOURCES = tests/test_filter_ipc.cpp
-tests_test_filter_ipc_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_filter_ipc_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_use_fd_SOURCES = tests/test_use_fd.cpp
-tests_test_use_fd_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_use_fd_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_zmq_poll_fd_SOURCES = tests/test_zmq_poll_fd.cpp
-tests_test_zmq_poll_fd_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_zmq_poll_fd_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-if HAVE_FORK
-if !VALGRIND_ENABLED
-test_apps += tests/test_fork
-
-tests_test_fork_SOURCES = tests/test_fork.cpp
-tests_test_fork_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_fork_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-endif
-endif
-endif
-endif
-
-if BUILD_TIPC
-test_apps += \
-	tests/test_connect_delay_tipc \
-	tests/test_pair_tipc \
-	tests/test_reqrep_device_tipc \
-	tests/test_reqrep_tipc \
-	tests/test_router_mandatory_tipc \
-	tests/test_shutdown_stress_tipc \
-	tests/test_sub_forward_tipc \
-	tests/test_term_endpoint_tipc \
-	tests/test_address_tipc
-
-tests_test_connect_delay_tipc_SOURCES = tests/test_connect_delay_tipc.cpp
-tests_test_connect_delay_tipc_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_connect_delay_tipc_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_pair_tipc_SOURCES = tests/test_pair_tipc.cpp
-tests_test_pair_tipc_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_pair_tipc_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_reqrep_device_tipc_SOURCES = tests/test_reqrep_device_tipc.cpp
-tests_test_reqrep_device_tipc_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_reqrep_device_tipc_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_reqrep_tipc_SOURCES = tests/test_reqrep_tipc.cpp
-tests_test_reqrep_tipc_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_reqrep_tipc_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_router_mandatory_tipc_SOURCES = tests/test_router_mandatory_tipc.cpp
-tests_test_router_mandatory_tipc_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_router_mandatory_tipc_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_shutdown_stress_tipc_SOURCES = tests/test_shutdown_stress_tipc.cpp
-tests_test_shutdown_stress_tipc_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_shutdown_stress_tipc_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_sub_forward_tipc_SOURCES = tests/test_sub_forward_tipc.cpp
-tests_test_sub_forward_tipc_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_sub_forward_tipc_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_term_endpoint_tipc_SOURCES = tests/test_term_endpoint_tipc.cpp
-tests_test_term_endpoint_tipc_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_term_endpoint_tipc_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_address_tipc_SOURCES = tests/test_address_tipc.cpp
-tests_test_address_tipc_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_address_tipc_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-endif
-
-if BUILD_GSSAPI
-test_apps += tests/test_security_gssapi
-
-tests_test_security_gssapi_SOURCES = tests/test_security_gssapi.cpp
-tests_test_security_gssapi_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_security_gssapi_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-endif
-
-if ON_LINUX
-test_apps += tests/test_abstract_ipc
-
-tests_test_abstract_ipc_SOURCES = tests/test_abstract_ipc.cpp
-tests_test_abstract_ipc_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_abstract_ipc_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-# TODO: gets stuck even with long timeout running under Github Actions
-if !VALGRIND_ENABLED
-test_apps += tests/test_socks
-
-tests_test_socks_SOURCES = tests/test_socks.cpp
-tests_test_socks_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_socks_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-endif
-
-# TODO: enable when https://github.com/zeromq/libzmq/issues/3898 is fixed
-if !ENABLE_ASAN
-test_apps += tests/test_many_sockets
-
-tests_test_many_sockets_SOURCES = tests/test_many_sockets.cpp
-tests_test_many_sockets_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_many_sockets_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-endif
-
-endif
-
-if HAVE_VMCI
-test_apps += tests/test_pair_vmci tests/test_reqrep_vmci
-
-tests_test_pair_vmci_SOURCES = tests/test_pair_vmci.cpp
-tests_test_pair_vmci_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_pair_vmci_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-tests_test_pair_vmci_LDFLAGS = @LIBZMQ_VMCI_LDFLAGS@
-tests_test_pair_vmci_CXXFLAGS = @LIBZMQ_VMCI_CXXFLAGS@
-
-tests_test_reqrep_vmci_SOURCES = tests/test_reqrep_vmci.cpp
-tests_test_reqrep_vmci_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_reqrep_vmci_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-tests_test_reqrep_vmci_LDFLAGS = @LIBZMQ_VMCI_LDFLAGS@
-tests_test_reqrep_vmci_CXXFLAGS = @LIBZMQ_VMCI_CXXFLAGS@
-
-endif
-
-if ENABLE_DRAFTS
-test_apps += tests/test_poller \
-	tests/test_client_server \
-	tests/test_thread_safe \
-	tests/test_timers \
-	tests/test_radio_dish \
-	tests/test_scatter_gather \
-	tests/test_dgram \
-	tests/test_app_meta \
-	tests/test_xpub_manual_last_value \
-	tests/test_router_notify \
-	tests/test_peer \
-	tests/test_reconnect_options \
-	tests/test_msg_init \
-	tests/test_hello_msg \
-	tests/test_disconnect_msg \
-	tests/test_channel \
-	tests/test_hiccup_msg \
-	tests/test_zmq_ppoll_fd \
-	tests/test_xsub_verbose
-
-tests_test_poller_SOURCES = tests/test_poller.cpp
-tests_test_poller_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_poller_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_client_server_SOURCES = tests/test_client_server.cpp
-tests_test_client_server_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_client_server_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_thread_safe_SOURCES = tests/test_thread_safe.cpp
-tests_test_thread_safe_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_thread_safe_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_timers_SOURCES = tests/test_timers.cpp
-tests_test_timers_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_timers_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_radio_dish_SOURCES = tests/test_radio_dish.cpp
-tests_test_radio_dish_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_radio_dish_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_scatter_gather_SOURCES = tests/test_scatter_gather.cpp
-tests_test_scatter_gather_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_scatter_gather_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_dgram_SOURCES = tests/test_dgram.cpp
-tests_test_dgram_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_dgram_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_xpub_manual_last_value_SOURCES = tests/test_xpub_manual_last_value.cpp
-tests_test_xpub_manual_last_value_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_xpub_manual_last_value_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_app_meta_SOURCES = tests/test_app_meta.cpp
-tests_test_app_meta_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_app_meta_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_router_notify_SOURCES = tests/test_router_notify.cpp
-tests_test_router_notify_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_router_notify_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_peer_SOURCES = tests/test_peer.cpp
-tests_test_peer_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_peer_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_reconnect_options_SOURCES = tests/test_reconnect_options.cpp
-tests_test_reconnect_options_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_reconnect_options_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_msg_init_SOURCES = tests/test_msg_init.cpp
-tests_test_msg_init_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_msg_init_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_hello_msg_SOURCES = tests/test_hello_msg.cpp
-tests_test_hello_msg_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_hello_msg_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_disconnect_msg_SOURCES = tests/test_disconnect_msg.cpp
-tests_test_disconnect_msg_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_disconnect_msg_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_channel_SOURCES = tests/test_channel.cpp
-tests_test_channel_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_channel_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_hiccup_msg_SOURCES = tests/test_hiccup_msg.cpp
-tests_test_hiccup_msg_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_hiccup_msg_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_zmq_ppoll_fd_SOURCES = tests/test_zmq_ppoll_fd.cpp
-tests_test_zmq_ppoll_fd_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_zmq_ppoll_fd_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_xsub_verbose_SOURCES = tests/test_xsub_verbose.cpp
-tests_test_xsub_verbose_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_xsub_verbose_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-if HAVE_FORK
-test_apps += tests/test_zmq_ppoll_signals
-
-tests_test_zmq_ppoll_signals_SOURCES = tests/test_zmq_ppoll_signals.cpp
-tests_test_zmq_ppoll_signals_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_zmq_ppoll_signals_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-endif
-endif
-
-if FUZZING_ENGINE_LIB
-fuzzer_apps = tests/test_bind_null_fuzzer \
-	tests/test_connect_null_fuzzer \
-	tests/test_bind_fuzzer \
-	tests/test_connect_fuzzer \
-	tests/test_bind_stream_fuzzer \
-	tests/test_connect_stream_fuzzer \
-	tests/test_socket_options_fuzzer
-
-tests_test_bind_null_fuzzer_DEPENDENCIES = src/libzmq.la
-tests_test_bind_null_fuzzer_SOURCES = tests/test_bind_null_fuzzer.cpp
-tests_test_bind_null_fuzzer_LDADD = ${TESTUTIL_LIBS} ${FUZZING_ENGINE_LIB} \
-		$(top_builddir)/src/.libs/libzmq.a \
-		${src_libzmq_la_LIBADD}
-tests_test_bind_null_fuzzer_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-tests_test_bind_null_fuzzer_CXXFLAGS = -std=c++11
-
-tests_test_connect_null_fuzzer_DEPENDENCIES = src/libzmq.la
-tests_test_connect_null_fuzzer_SOURCES = tests/test_connect_null_fuzzer.cpp
-tests_test_connect_null_fuzzer_LDADD = ${TESTUTIL_LIBS} ${FUZZING_ENGINE_LIB} \
-		$(top_builddir)/src/.libs/libzmq.a \
-		${src_libzmq_la_LIBADD}
-tests_test_connect_null_fuzzer_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-tests_test_connect_null_fuzzer_CXXFLAGS = -std=c++11
-
-tests_test_bind_fuzzer_DEPENDENCIES = src/libzmq.la
-tests_test_bind_fuzzer_SOURCES = tests/test_bind_fuzzer.cpp
-tests_test_bind_fuzzer_LDADD = ${TESTUTIL_LIBS} ${FUZZING_ENGINE_LIB} \
-		$(top_builddir)/src/.libs/libzmq.a \
-		${src_libzmq_la_LIBADD}
-tests_test_bind_fuzzer_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-tests_test_bind_fuzzer_CXXFLAGS = -std=c++11
-
-tests_test_connect_fuzzer_DEPENDENCIES = src/libzmq.la
-tests_test_connect_fuzzer_SOURCES = tests/test_connect_fuzzer.cpp
-tests_test_connect_fuzzer_LDADD = ${TESTUTIL_LIBS} ${FUZZING_ENGINE_LIB} \
-		$(top_builddir)/src/.libs/libzmq.a \
-		${src_libzmq_la_LIBADD}
-tests_test_connect_fuzzer_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-tests_test_connect_fuzzer_CXXFLAGS = -std=c++11
-
-tests_test_socket_options_fuzzer_DEPENDENCIES = src/libzmq.la
-tests_test_socket_options_fuzzer_SOURCES = tests/test_socket_options_fuzzer.cpp
-tests_test_socket_options_fuzzer_LDADD = ${TESTUTIL_LIBS} ${FUZZING_ENGINE_LIB} \
-		$(top_builddir)/src/.libs/libzmq.a \
-		${src_libzmq_la_LIBADD}
-tests_test_socket_options_fuzzer_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-tests_test_socket_options_fuzzer_CXXFLAGS = -std=c++11
-
-tests_test_bind_stream_fuzzer_DEPENDENCIES = src/libzmq.la
-tests_test_bind_stream_fuzzer_SOURCES = tests/test_bind_stream_fuzzer.cpp
-tests_test_bind_stream_fuzzer_LDADD = ${TESTUTIL_LIBS} ${FUZZING_ENGINE_LIB} \
-		$(top_builddir)/src/.libs/libzmq.a \
-		${src_libzmq_la_LIBADD}
-tests_test_bind_stream_fuzzer_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-tests_test_bind_stream_fuzzer_CXXFLAGS = -std=c++11
-
-tests_test_connect_stream_fuzzer_DEPENDENCIES = src/libzmq.la
-tests_test_connect_stream_fuzzer_SOURCES = tests/test_connect_stream_fuzzer.cpp
-tests_test_connect_stream_fuzzer_LDADD = ${TESTUTIL_LIBS} ${FUZZING_ENGINE_LIB} \
-		$(top_builddir)/src/.libs/libzmq.a \
-		${src_libzmq_la_LIBADD}
-tests_test_connect_stream_fuzzer_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-tests_test_connect_stream_fuzzer_CXXFLAGS = -std=c++11
-
-if HAVE_CURVE
-fuzzer_apps += tests/test_bind_curve_fuzzer \
-	tests/test_connect_curve_fuzzer \
-	tests/test_z85_decode_fuzzer
-
-tests_test_bind_curve_fuzzer_DEPENDENCIES = src/libzmq.la
-tests_test_bind_curve_fuzzer_SOURCES = tests/test_bind_curve_fuzzer.cpp
-tests_test_bind_curve_fuzzer_LDADD = ${TESTUTIL_LIBS} ${FUZZING_ENGINE_LIB} \
-		$(top_builddir)/src/.libs/libzmq.a \
-		${src_libzmq_la_LIBADD}
-tests_test_bind_curve_fuzzer_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-tests_test_bind_curve_fuzzer_CXXFLAGS = -std=c++11
-
-tests_test_connect_curve_fuzzer_DEPENDENCIES = src/libzmq.la
-tests_test_connect_curve_fuzzer_SOURCES = tests/test_connect_curve_fuzzer.cpp
-tests_test_connect_curve_fuzzer_LDADD = ${TESTUTIL_LIBS} ${FUZZING_ENGINE_LIB} \
-		$(top_builddir)/src/.libs/libzmq.a \
-		${src_libzmq_la_LIBADD}
-tests_test_connect_curve_fuzzer_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-tests_test_connect_curve_fuzzer_CXXFLAGS = -std=c++11
-
-tests_test_z85_decode_fuzzer_DEPENDENCIES = src/libzmq.la
-tests_test_z85_decode_fuzzer_SOURCES = tests/test_z85_decode_fuzzer.cpp
-tests_test_z85_decode_fuzzer_LDADD = ${TESTUTIL_LIBS} ${FUZZING_ENGINE_LIB} \
-		$(top_builddir)/src/.libs/libzmq.a \
-		${src_libzmq_la_LIBADD}
-tests_test_z85_decode_fuzzer_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-tests_test_z85_decode_fuzzer_CXXFLAGS = -std=c++11
-endif
-
-if HAVE_WS
-fuzzer_apps += tests/test_connect_ws_fuzzer \
-	tests/test_bind_ws_fuzzer
-
-tests_test_connect_ws_fuzzer_DEPENDENCIES = src/libzmq.la
-tests_test_connect_ws_fuzzer_SOURCES = tests/test_connect_ws_fuzzer.cpp
-tests_test_connect_ws_fuzzer_LDADD = ${TESTUTIL_LIBS} ${FUZZING_ENGINE_LIB} \
-		$(top_builddir)/src/.libs/libzmq.a \
-		${src_libzmq_la_LIBADD}
-tests_test_connect_ws_fuzzer_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-tests_test_connect_ws_fuzzer_CXXFLAGS = -std=c++11
-
-tests_test_bind_ws_fuzzer_DEPENDENCIES = src/libzmq.la
-tests_test_bind_ws_fuzzer_SOURCES = tests/test_bind_ws_fuzzer.cpp
-tests_test_bind_ws_fuzzer_LDADD = ${TESTUTIL_LIBS} ${FUZZING_ENGINE_LIB} \
-		$(top_builddir)/src/.libs/libzmq.a \
-		${src_libzmq_la_LIBADD}
-tests_test_bind_ws_fuzzer_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-tests_test_bind_ws_fuzzer_CXXFLAGS = -std=c++11
-endif
-
-FUZZINGdir = ${prefix}/${FUZZING_INSTALLDIR}
-FUZZING_PROGRAMS = ${fuzzer_apps}
-else
-test_apps += tests/test_bind_null_fuzzer \
-	tests/test_connect_null_fuzzer \
-	tests/test_bind_fuzzer \
-	tests/test_connect_fuzzer \
-	tests/test_bind_stream_fuzzer \
-	tests/test_connect_stream_fuzzer \
-	tests/test_socket_options_fuzzer
-
-tests_test_bind_null_fuzzer_SOURCES = tests/test_bind_null_fuzzer.cpp
-tests_test_bind_null_fuzzer_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_bind_null_fuzzer_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_connect_null_fuzzer_SOURCES = tests/test_connect_null_fuzzer.cpp
-tests_test_connect_null_fuzzer_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_connect_null_fuzzer_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_bind_fuzzer_SOURCES = tests/test_bind_fuzzer.cpp
-tests_test_bind_fuzzer_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_bind_fuzzer_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_connect_fuzzer_SOURCES = tests/test_connect_fuzzer.cpp
-tests_test_connect_fuzzer_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_connect_fuzzer_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_socket_options_fuzzer_SOURCES = tests/test_socket_options_fuzzer.cpp
-tests_test_socket_options_fuzzer_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_socket_options_fuzzer_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_bind_stream_fuzzer_SOURCES = tests/test_bind_stream_fuzzer.cpp
-tests_test_bind_stream_fuzzer_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_bind_stream_fuzzer_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_connect_stream_fuzzer_SOURCES = tests/test_connect_stream_fuzzer.cpp
-tests_test_connect_stream_fuzzer_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_connect_stream_fuzzer_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-if HAVE_CURVE
-test_apps += tests/test_bind_curve_fuzzer \
-	tests/test_connect_curve_fuzzer \
-	tests/test_z85_decode_fuzzer
-
-tests_test_bind_curve_fuzzer_SOURCES = tests/test_bind_curve_fuzzer.cpp
-tests_test_bind_curve_fuzzer_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_bind_curve_fuzzer_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_connect_curve_fuzzer_SOURCES = tests/test_connect_curve_fuzzer.cpp
-tests_test_connect_curve_fuzzer_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_connect_curve_fuzzer_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_z85_decode_fuzzer_SOURCES = tests/test_z85_decode_fuzzer.cpp
-tests_test_z85_decode_fuzzer_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_z85_decode_fuzzer_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-endif
-
-if HAVE_WS
-test_apps += tests/test_connect_ws_fuzzer \
-	tests/test_bind_ws_fuzzer
-
-tests_test_connect_ws_fuzzer_SOURCES = tests/test_connect_ws_fuzzer.cpp
-tests_test_connect_ws_fuzzer_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_connect_ws_fuzzer_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-
-tests_test_bind_ws_fuzzer_SOURCES = tests/test_bind_ws_fuzzer.cpp
-tests_test_bind_ws_fuzzer_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
-tests_test_bind_ws_fuzzer_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
-endif
-endif
-
-if ENABLE_STATIC
-# unit tests - these include individual source files and test the internal functions
-test_apps += \
-	unittests/unittest_poller \
-	unittests/unittest_ypipe \
-	unittests/unittest_mtrie \
-	unittests/unittest_ip_resolver \
-	unittests/unittest_udp_address \
-	unittests/unittest_radix_tree \
-	unittests/unittest_curve_encoding
-
-unittests_unittest_poller_SOURCES = unittests/unittest_poller.cpp
-unittests_unittest_poller_CPPFLAGS = -I$(top_srcdir)/src ${TESTUTIL_CPPFLAGS} $(CODE_COVERAGE_CPPFLAGS)
-unittests_unittest_poller_CXXFLAGS = $(CODE_COVERAGE_CXXFLAGS)
-unittests_unittest_poller_LDADD = \
-        ${TESTUTIL_LIBS} \
-        $(top_builddir)/src/.libs/libzmq.a \
-        ${src_libzmq_la_LIBADD} \
-        $(CODE_COVERAGE_LDFLAGS)
-
-unittests_unittest_ypipe_SOURCES = unittests/unittest_ypipe.cpp
-unittests_unittest_ypipe_CPPFLAGS = -I$(top_srcdir)/src ${TESTUTIL_CPPFLAGS} $(CODE_COVERAGE_CPPFLAGS)
-unittests_unittest_ypipe_CXXFLAGS = $(CODE_COVERAGE_CXXFLAGS)
-unittests_unittest_ypipe_LDADD = \
-        ${TESTUTIL_LIBS} \
-        $(top_builddir)/src/.libs/libzmq.a \
-        ${src_libzmq_la_LIBADD} \
-        $(CODE_COVERAGE_LDFLAGS)
-
-unittests_unittest_mtrie_SOURCES = unittests/unittest_mtrie.cpp
-unittests_unittest_mtrie_CPPFLAGS = -I$(top_srcdir)/src ${TESTUTIL_CPPFLAGS} $(CODE_COVERAGE_CPPFLAGS)
-unittests_unittest_mtrie_CXXFLAGS = $(CODE_COVERAGE_CXXFLAGS)
-unittests_unittest_mtrie_LDADD = \
-        ${TESTUTIL_LIBS} \
-        $(top_builddir)/src/.libs/libzmq.a \
-        ${src_libzmq_la_LIBADD} \
-        $(CODE_COVERAGE_LDFLAGS)
-
-unittests_unittest_ip_resolver_SOURCES = unittests/unittest_ip_resolver.cpp unittests/unittest_resolver_common.hpp
-unittests_unittest_ip_resolver_CPPFLAGS = -I$(top_srcdir)/src ${TESTUTIL_CPPFLAGS} $(CODE_COVERAGE_CPPFLAGS)
-unittests_unittest_ip_resolver_CXXFLAGS = $(CODE_COVERAGE_CXXFLAGS)
-unittests_unittest_ip_resolver_LDADD = \
-        ${TESTUTIL_LIBS} \
-        $(top_builddir)/src/.libs/libzmq.a \
-        ${src_libzmq_la_LIBADD} \
-        $(CODE_COVERAGE_LDFLAGS)
-
-unittests_unittest_udp_address_SOURCES = unittests/unittest_udp_address.cpp unittests/unittest_resolver_common.hpp
-unittests_unittest_udp_address_CPPFLAGS = -I$(top_srcdir)/src ${TESTUTIL_CPPFLAGS} $(CODE_COVERAGE_CPPFLAGS)
-unittests_unittest_udp_address_CXXFLAGS = $(CODE_COVERAGE_CXXFLAGS)
-unittests_unittest_udp_address_LDADD = \
-        ${TESTUTIL_LIBS} \
-        $(top_builddir)/src/.libs/libzmq.a \
-        ${src_libzmq_la_LIBADD} \
-        $(CODE_COVERAGE_LDFLAGS)
-
-unittests_unittest_radix_tree_SOURCES = unittests/unittest_radix_tree.cpp
-unittests_unittest_radix_tree_CPPFLAGS = -I$(top_srcdir)/src ${TESTUTIL_CPPFLAGS} $(CODE_COVERAGE_CPPFLAGS)
-unittests_unittest_radix_tree_CXXFLAGS = $(CODE_COVERAGE_CXXFLAGS)
-unittests_unittest_radix_tree_LDADD =  \
-        ${TESTUTIL_LIBS} \
-        $(top_builddir)/src/.libs/libzmq.a \
-        ${src_libzmq_la_LIBADD} \
-        $(CODE_COVERAGE_LDFLAGS)
-
-unittests_unittest_curve_encoding_SOURCES = unittests/unittest_curve_encoding.cpp
-unittests_unittest_curve_encoding_CPPFLAGS = -I$(top_srcdir)/src ${TESTUTIL_CPPFLAGS} $(CODE_COVERAGE_CPPFLAGS)
-unittests_unittest_curve_encoding_CXXFLAGS = $(CODE_COVERAGE_CXXFLAGS)
-unittests_unittest_curve_encoding_LDADD =  \
-        ${TESTUTIL_LIBS} \
-        $(top_builddir)/src/.libs/libzmq.a \
-        ${src_libzmq_la_LIBADD} \
-        $(CODE_COVERAGE_LDFLAGS)
-endif
-
-check_PROGRAMS = ${test_apps}
-
-#  Run the test cases
-TESTS = $(test_apps)
-XFAIL_TESTS =
-
-if !ON_LINUX
-XFAIL_TESTS += tests/test_abstract_ipc
-endif
-
-#  GNU/Hurd does not support getsockname on IPC, so ZMQ_LAST_ENDPOINT cannot be
-#  used with IPC, so the following tests will fail
-if ON_GNU
-XFAIL_TESTS += tests/test_ipc_wildcard \
-		tests/test_reqrep_ipc \
-		tests/test_pair_ipc \
-		tests/test_term_endpoint
-endif
-
-EXTRA_DIST = \
-	external/unity/license.txt \
-	external/unity/version.txt \
-	external/wepoll/license.txt \
-	external/wepoll/version.txt \
-	external/wepoll/README.md \
-	CMakeLists.txt \
-	autogen.sh	\
-	version.sh	\
-	ci_build.sh \
-	src/libzmq.vers \
-	src/version.rc.in \
-	tests/CMakeLists.txt \
-        tests/test_pair_tcp_cap_net_admin.cpp \
-	unittests/CMakeLists.txt \
-        tools/curve_keygen.cpp
-
-MAINTAINERCLEANFILES = \
-	$(srcdir)/aclocal.m4 \
-	$(srcdir)/autom4te.cache \
-	$(srcdir)/configure \
-	`find "$(srcdir)" -type f -name Makefile.in -print`
-
-if WITH_CLANG_FORMAT
-ALL_SOURCE_FILES = $(wildcard \
-	$(top_srcdir)/src/*.c \
-	$(top_srcdir)/src/*.cc \
-	$(top_srcdir)/src/*.cpp \
-	$(top_srcdir)/src/*.h \
-	$(top_srcdir)/src/*.hpp \
-	$(top_srcdir)/tests/*.c \
-	$(top_srcdir)/tests/*.cc \
-	$(top_srcdir)/tests/*.cpp \
-	$(top_srcdir)/tests/*.h \
-	$(top_srcdir)/tests/*.hpp \
-	$(top_srcdir)/perf/*.c \
-	$(top_srcdir)/perf/*.cc \
-	$(top_srcdir)/perf/*.cpp \
-	$(top_srcdir)/perf/*.h \
-	$(top_srcdir)/perf/*.hpp \
-	$(top_srcdir)/tools/*.c \
-	$(top_srcdir)/tools/*.cc \
-	$(top_srcdir)/tools/*.cpp \
-	$(top_srcdir)/tools/*.h \
-	$(top_srcdir)/tools/*.hpp \
-	$(top_srcdir)/include/*.h \
- )
-
-# Check if any sources need to be fixed, report the filenames and an error code
-clang-format-check: $(ALL_SOURCE_FILES)
-	@FAILED=0 ; IFS=";" ; IDS="`printf '\n\b'`" ; export IFS IDS; \
-	 for FILE in $(ALL_SOURCE_FILES) ; do \
-		test -s $$FILE || continue ; \
-		$(CLANG_FORMAT) -style=file -output-replacements-xml "$$FILE" | grep "<replacement " >/dev/null && \
-		{ echo "$$FILE is not correctly formatted" >&2 ; FAILED=1; } ; \
-	 done; \
-	 if test "$$FAILED" != 0 ; then \
-		exit 1 ; \
-	 fi
-
-# Change source formatting
-clang-format: $(ALL_SOURCE_FILES)
-	$(CLANG_FORMAT) -style=file -i $(ALL_SOURCE_FILES)
-
-# Change source formatting AND report the diff
-clang-format-diff: clang-format
-	git diff $(ALL_SOURCE_FILES)
-
-else
-clang-format clang-format-check clang-format-diff:
-	@echo "Install the clang-format program, reconfigure and re-run this request"
-	@exit 1
-endif
-
-@CODE_COVERAGE_RULES@
-
-dist-hook:
-	-rm $(distdir)/src/platform.hpp
-	@if test -d "$(srcdir)/.git"; \
-	then \
-		echo Creating ChangeLog && \
-		( cd "$(top_srcdir)" && \
-		  echo '# Generated by Makefile. Do not edit.'; echo; \
-		  $(top_srcdir)/config/missing --run git log --stat ) > ChangeLog.tmp \
-		  && mv -f ChangeLog.tmp $(top_distdir)/ChangeLog \
-		  || ( rm -f ChangeLog.tmp ; \
-		       echo Failed to generate ChangeLog >&2 ); \
-	else \
-		echo A git clone is required to generate a ChangeLog >&2; \
-	fi
-
-maintainer-clean-local:
-	-rm -rf $(top_srcdir)/config
-
-@VALGRIND_CHECK_RULES@
-
-VALGRIND_SUPPRESSIONS_FILES = builds/valgrind/valgrind.supp
diff --git a/libs/libzmq/NEWS b/libs/libzmq/NEWS
deleted file mode 100644
index ab4f766..0000000
--- a/libs/libzmq/NEWS
+++ /dev/null
@@ -1,2208 +0,0 @@
-0MQ version 4.3.4 stable, released on 2021/01/17
-================================================
-
-* New DRAFT (see NEWS for 4.2.0) socket option:
-  - ZMQ_PRIORITY will set the SO_PRIORITY socket option on the underlying
-    sockets. Only supported on Linux.
-  See doc/zmq_setsockopt.txt and doc/zmq_getsockopt.txt for details.
-
-* Fixed #4113 - compilation errors on kFreeBSD and GNU/Hurd
-
-* Fixed #4086 - excessive amount of socket files left behind in Windows TMP
-                directory
-
-* Fixed #4108 - regression that breaks using IPv6 link-local addresses on Linux
-
-* Fixed #4078 - compilation errors on Android
-
-* Fixed #4074 - compilation error with ulibc and libbsd
-
-* Fixed #4060 - stack overflow on Windows x64
-
-* Fixed #4051 - various compilation errors on Windows ARM 32bit
-
-* Fixed #4043 - various compilation warnings with XCode
-
-* Fixed #4038 - return value of zmq_ctx_get changed unintentionally
-
-
-0MQ version 4.3.3 stable, released on 2020/09/07
-================================================
-
-* Security advisories:
-  * CVE-2020-15166: Denial-of-Service on CURVE/ZAP-protected servers by
-    unauthenticated clients.
-    If a raw TCP socket is opened and connected to an endpoint that is fully
-    configured with CURVE/ZAP, legitimate clients will not be able to exchange
-    any message. Handshakes complete successfully, and messages are delivered to
-    the library, but the server application never receives them.
-    For more information see the security advisory:
-    https://github.com/zeromq/libzmq/security/advisories/GHSA-25wp-cf8g-938m
-  * Stack overflow on server running PUB/XPUB socket (CURVE disabled).
-    The PUB/XPUB subscription store (mtrie) is traversed using recursive
-    function calls. In the remove (unsubscription) case, the recursive calls are
-    NOT tail calls, so even with optimizations the stack grows linearly with the
-    length of a subscription topic. Topics are under the control of remote
-    clients - they can send a subscription to arbitrary length topics. An
-    attacker can thus cause a server to create an mtrie sufficiently large such
-    that, when unsubscribing, traversal will cause a stack overflow.
-    For more information see the security advisory:
-    https://github.com/zeromq/libzmq/security/advisories/GHSA-qq65-x72m-9wr8
-  * Memory leak in PUB server induced by malicious client(s) without CURVE/ZAP.
-    Messages with metadata are never processed by PUB sockets, but the metadata
-    is kept referenced in the PUB object and never freed.
-    For more information see the security advisory:
-    https://github.com/zeromq/libzmq/security/advisories/GHSA-4p5v-h92w-6wxw
-  * Memory leak in client induced by malicious server(s) without CURVE/ZAP.
-    When a pipe processes a delimiter and is already not in active state but
-    still has an unfinished message, the message is leaked.
-    For more information see the security advisory:
-    https://github.com/zeromq/libzmq/security/advisories/GHSA-wfr2-29gj-5w87
-  * Heap overflow when receiving malformed ZMTP v1 packets (CURVE disabled).
-    By crafting a packet which is not valid ZMTP v2/v3, and which has two
-    messages larger than 8192 bytes, the decoder can be tricked into changing
-    the recorded size of the 8192 bytes static buffer, which then gets overflown
-    by the next message. The content that gets written in the overflown memory
-    is entirely decided by the sender.
-    For more information see the security advisory:
-    https://github.com/zeromq/libzmq/security/advisories/GHSA-fc3w-qxf5-7hp6
-
-* Note for packagers: an external, self-contained sha1 library is now
-  included in the source tree under external/sha1/ - it is licensed
-  under BSD-3-Clause and thus it is fully compatible with libzmq's
-  license.
-  It is only used if WebSockets support is enabled, and if neither GnuTLS nor
-  NSS are available.
-
-* Note for packagers: an internal reimplementation of strlcpy is now included,
-  for wider platform compatibility.
-  libbsd can be used and is enabled by default if available instead of the
-  internal implementation, for better security maintenance in distros.
-
-* Note for packagers: ZeroMQConfig.cmake is now installed in the arch-dependent
-  subdirectory - eg: /usr/lib/x86_64-linux-gnu/cmake/
-
-* New DRAFT (see NEWS for 4.2.0) socket type:
-  - ZMQ_CHANNEL is a thread-safe alternative to ZMQ_PAIR.
-  See doc/zmq_socket.txt for details.
-
-* New DRAFT (see NEWS for 4.2.0) socket option:
-  - ZMQ_ONLY_FIRST_SUBSCRIBE will cause only the first part of a multipart
-    message to be processed as a subscribe/unsubscribe message, and the rest
-    will be forwarded as user data to the application.
-  - ZMQ_RECONNECT_STOP will cause a connecting socket to stop trying to
-    reconnect in specific circumstances. See the manpage for details.
-  - ZMQ_HELLO_MSG to set a message that will be automatically sent to a new
-    connection.
-  - ZMQ_DISCONNECT_MSG to set a message that will be automatically received when
-    a peer disconnects.
-  See doc/zmq_setsockopt.txt and doc/zmq_getsockopt.txt for details.
-
-* New DRAFT (see NEWS for 4.2.0) zmq_ctx_get_ext/zmq_ctx_set_ext APIs were added
-  to allow enhancing the context options with variable data inputs.
-  See doc/zmq_ctx_get_ext.txt and doc/zmq_ctx_set_ext.txt for details.
-
-* New DRAFT (see NEWS for 4.2.0) transport options WS and WSS added for support
-  of WebSockets (and secure WebSockets via TLS) via the ZWS 2.0 protocol.
-  WSS requires the GnuTLS library for TLS support. ZMQ_WSS_ specific socket
-  options were added to support TLS.
-  WebSockets support is disabled by default if DRAFT APIs are disabled.
-
-* New DRAFT (see NEWS for 4.2.0) socket type, PEER, which is thread safe and a
-  related zmq_connect_peer function which atomically and thread-safely connects
-  and returns a routing-id.
-
-* New DRAFT (see NEWS for 4.2.0) zmq_msg_init_buffer API was added to allow
-  the construction of a message by copying from an existing buffer.
-
-* New DRAFT (see NEWS for 4.2.0) zmq_poller_size API was added to allow querying
-  the number of sockets/fds registered in a zmq_poller.
-
-* ZMTP 3.1 peers will receive subscribe/cancel on PUB/SUB via commands rather
-  than using the first byte of the payload.
-
-* zmq_z85_decode now checks that the input string's length is at least 5 characters
-  and always a multiple of 5 as per API specification.
-
-* Fixed #3566 - malformed CURVE message can cause memory leak
-
-* Fixed #3567 - missing ZeroMQ_INCLUDE_DIR in ZeroMQConfig.cmake when only
-                static lib is built
-
-* Fixed #3576 - CURVE plaintext secrets now stored in libsodium's secure memory
-
-* Fixed #3588 - install debug libraries for debug msvc builds with CMake
-
-* Fixed #3591 - incorrect ZMQ_MAX_SOCKETS default value in doc
-
-* Fixed #3594 - fixed stream_engine use after free due to concurrent heartbeats
-
-* Fixed #3586 - error when compiling with MinGW due to usage of MS-specific
-                __except keyword
-
-* Fixed #3603 - fixed CMake build on SL6.9
-
-* Fixed #3607 - added scripts to ease performance graph generation
-
-* Fixed #3608 - fix for IPv4 mapping not supported in DragonFlyBSD
-
-* Fixed #3636 - added ENABLE_PRECOMPILED CMake option to fix build with Ninja
-
-* Fixed #2862 - UDP engine aborts on networking-related errors from socket
-                syscalls
-
-* Fixed #3656 - segfault on sending data from XSUB to XPUB
-
-* Fixed #3646 - static-only test run fails
-
-* Fixed #3668 - fixed CMAKE_CXX_FLAGS_* regexes on MSVC
-
-* Fixed #110  - do not include winsock2.h in public zmq.h header
-
-* Fixed #3683 - allow "configure --disable-maintainer-mode"
-
-* Fixed #3686 - fix documentation about sockets blocking on send operations
-
-* Fixed #3323 - fix behavior of ZMQ_CONFLATE on PUB sockets
-
-* Fixed #3698 - fix build on IBM i/PASE/os400
-
-* Fixed #3705 - zero-sized messages cause assertion when glibc assertion are on
-
-* Fixed #3713 - remove dependency on math library by avoiding std::ceil
-
-* Fixed #3694 - build targeting Windows XP is broken
-
-* Fixed #3691 - added support for IPC on Windows 10 via AF_UNIX
-
-* Fixed #3725 - disable by default test that requires sudo on CMake
-
-* Fixed #3727 - fix zmq_poller documentation example
-
-* Fixed #3729 - do not check for FD_OOB when using WSAEventSelect on Windows
-
-* Fixed #3738 - allow renaming the library in CMake
-
-* Fixed #1808 - use AF_UNIX instead of TCP for the internal socket on Windows 10
-
-* Fixed #3758 - fix pthread_set_affinity detection in CMake
-
-* Fixed #3769 - fix undefined behaviour in array.hpp
-
-* Fixed #3772 - fix compiling under msys2-mingw
-
-* Fixed #3775 - add -latomic to the private libs flag in pkg-config if needed
-
-* Fixed #3778 - fix documentation of zmq_poller's thread safety
-
-* Fixed #3792 - do not allow creation of new sockets after zmq_ctx_shutdown
-
-* Fixed #3805 - improve performance of CURVE by reducing copies
-
-* Fixed #3814 - send subscribe/cancel as commands to ZMTP 3.1 peers
-
-* Fixed #3847 - fix building without PGM and NORM
-
-* Fixed #3849 - install .cmake file in arch-dependent subdirectory
-
-* Fixed #4005 - allow building on Windows ARM/ARM64
-
-0MQ version 4.3.2 stable, released on 2019/07/08
-================================================
-
-* CVE-2019-13132: a remote, unauthenticated client connecting to a
-  libzmq application, running with a socket listening with CURVE
-  encryption/authentication enabled, may cause a stack overflow and
-  overwrite the stack with arbitrary data, due to a buffer overflow in
-  the library. Users running public servers with the above configuration
-  are highly encouraged to upgrade as soon as possible, as there are no
-  known mitigations. All versions from 4.0.0 and upwards are affected.
-  Thank you Fang-Pen Lin for finding the issue and reporting it!
-
-* New DRAFT (see NEWS for 4.2.0) zmq_socket_monitor_versioned API that supports
-  a versioned monitoring events protocol as a parameter. Passing 1 results in
-  the same behaviour as zmq_socket_monitor.
-  Version 2 of the events protocol allows new events, new metadata, different
-  socket types for the monitors and more. It is described in details in
-  doc/zmq_socket_monitor_versioned.txt
-
-* New DRAFT (see NEWS for 4.2.0) zmq_socket_monitor_pipes_stats that triggers
-  a new ZMQ_EVENT_PIPES_STATS to be delivered via zmq_socket_monitor_versioned
-  v2 API, which contains the current status of all the queues owned by the
-  monitored socket. See doc/zmq_socket_monitor_versioned.txt for details.
-
-* New DRAFT (see NEWS for 4.2.0) zmq_poller_fd that returns the FD of a thread
-  safe socket. See doc/zmq_poller.txt for details.
-
-* New DRAFT (see NEWS for 4.2.0) socket options:
-  - ZMQ_XPUB_MANUAL_LAST_VALUE is similar to ZMQ_XPUB_MANUAL but allows to avoid
-    duplicates when using last value caching.
-  - ZMQ_SOCKS_USERNAME and ZMQ_SOCKS_PASSWORD that implement SOCKS5 proxy
-    authentication.
-  See doc/zmq_setsockopt.txt and doc/zmq_getsockopt.txt for details.
-
-* Implemented background thread names for Windows, when the Visual Studio
-  debugger is being used.
-
-* Fixed #3358 - test_security_zap failing due to SIGBUS on SPARC64, hard-coded
-                IPC socket binds in tests cause race conditions
-
-* Fixed #3361 - enabling GSSAPI support (when using autools) does not work due
-                to regression introduced in 4.2.3
-
-* Fixed #3362 - remove documentation for ZMQ_THREAD_PRIORITY context option
-                getter, it's not implemented
-
-* Fixed #3363 - tests fail to build due to stricter compiler printf validation
-                in new versions of GCC
-
-* Fixed #3367 - try to infer cacheline size at build time, first with
-                getconf LEVEL1_DCACHE_LINESIZE, and then by reading
-                /sys/devices/system/cpu/cpu0/cache/index0/coherency_line_size
-                (autoconf only), and only then falling back to the previous
-                default of 64 bytes. Avoids false sharing on POWER and s390x.
-                Import ax_func_posix_memalign.m4 as a more reliable check for
-                posix_memalign presence on some unix platforms.
-                Prefer c++11 atomic primitives to compiler intrinsics, when
-                both are available, as the former is more reliable.
-                Set test_pair_ipc and test_rebind_ipc to XFAIL on GNU/Hurd due
-                to non-functioning getsockname on AF_UNIX.
-
-* Fixed #3370 - Make queue length and HWM state observable
-
-* Fixed #3373 - performance regression in zmq_poll on CentOS 6/7
-
-* Fixed #3375 - assign names to all pthreads created by the library to ease
-                debugging
-
-* Fixed #3376 - assigned random TIPC port is not returned by ZMQ_LAST_ENDPOINT
-
-* Fixed #3385 - TCP port in ZMQ_LAST_ENDPOINT depends on global locale
-
-* Fixed #3404 - use std::condition_variable_any when possible
-
-* Fixed #3436 - reconnect interval exponential backoff and may lead to integer
-                overflows
-
-* Fixed #3440 - improve zmq_proxy performance by batching of up to 1000
-                consecutive messages (if any) and add perf/proxy_thr tool
-
-* Fixed #3451 - fix support of /dev/poll on Solaris
-
-* Fixed #3452 - strnlen may not be available
-
-* Fixed #1462 - test failure in test_filter_ipc due to invalid system groups
-
-* Fixed #3269 - Boost.ASIO integration stopped working with v4.3.0
-
-* Fixed #3479 - ZeroMQ does not build for QNX 6.6 with CMake
-
-* Fixed #3481 - add <ios> include to fix uClibc++ compilation
-
-* Fixed #3491 - build broken on Fedora 30
-
-* Fixed #3494 - ZeroMQConfig.cmake fails if shared libraries are not built
-
-* Fixed #3498 - syntax error on Windows related to socket descriptor type
-
-* Fixed #3500 - PLAIN HELLO message incorrectly uses WELCOME literal, regression
-                introduced in 4.3.0
-
-* Fixed #3517 - configure errors because of syntax errors in the use of test
-                shell command
-
-* Fixed #3521 - document how to achieve high performance with the PGM transport
-
-* Fixed #3526 - failure case behavior unclear in zmq_msg_send documentation
-
-* Fixed #3537 - fix build on z/OS by using pthread_equal instead of comparing
-                variables directly
-
-* Fixed #3546 - CMake links with librt on MinGW which is not available
-
-* Many coding style, duplication, testing and static analysis improvements.
-
-
-0MQ version 4.3.1 stable, released on 2019/01/12
-================================================
-
-* CVE-2019-6250: A vulnerability has been found that would allow attackers to
-  direct a peer to jump to and execute from an address indicated by the
-  attacker.
-  This issue has been present since v4.2.0. Older releases are not affected.
-  NOTE: The attacker needs to know in advance valid addresses in the peer's
-  memory to jump to, so measures like ASLR are effective mitigations.
-  NOTE: this attack can only take place after authentication, so peers behind
-  CURVE/GSSAPI are not vulnerable to unauthenticated attackers.
-  See https://github.com/zeromq/libzmq/issues/3351 for more details.
-  Thanks to Guido Vranken for uncovering the issue and providing the fix!
-
-* Note for packagers: as pkg-config's Requires.private is now used to properly
-  propagate dependencies for static builds, the libzmq*-dev or zeromq-devel or
-  equivalent package should now depend on the libfoo-dev or foo-devel packages
-  of all the libraries that zmq is linked against, or pkg-config --libs libzmq
-  will fail due to missing dependencies on end users machines.
-
-* Fixed #3351 - remote code execution vulnerability.
-
-* Fixed #3343 - race condition in ZMQ_PUSH when quickly disconnecting and
-                reconnecting causes last part of multi-part message to get
-                "stuck" and resent by mistake to the new socket.
-
-* Fixed #3336 - set Requires.private in generate pkg-config file.
-
-* Fixed #3334 - set TCP_NODELAY after connect() on Windows for the I/O socket.
-
-* Fixed #3326 - assert on Android when opening a socket and disabling WiFi.
-
-* Fixed #3320 - build failure on OpenBSD with GCC.
-
-0MQ version 4.3.0 stable, released on 2018/11/28
-================================================
-
-* The following DRAFT APIs have been marked as STABLE and will not change
-  anymore:
-  - ZMQ_MSG_T_SIZE context option (see doc/zmq_ctx_get.txt)
-  - ZMQ_THREAD_AFFINITY_CPU_ADD and ZMQ_THREAD_AFFINITY_CPU_REMOVE (Posix only)
-    context options, to add/remove CPUs to the affinity set of the I/O threads.
-    See doc/zmq_ctx_set.txt and doc/zmq_ctx_get.txt for details.
-  - ZMQ_THREAD_NAME_PREFIX (Posix only) context option, to add a specific
-    integer prefix to the background threads names, to easily identify them.
-    See doc/zmq_ctx_set.txt and doc/zmq_ctx_get.txt for details.
-  - ZMQ_GSSAPI_PRINCIPAL_NAMETYPE and ZMQ_GSSAPI_SERVICE_PRINCIPAL_NAMETYPE
-    socket options, for the corresponding GSSAPI features. Additional
-    definitions for principal name types:
-    - ZMQ_GSSAPI_NT_HOSTBASED
-    - ZMQ_GSSAPI_NT_USER_NAME
-    - ZMQ_GSSAPI_NT_KRB5_PRINCIPAL
-    See doc/zmq_gssapi.txt for details.
-  - ZMQ_BINDTODEVICE socket option (Linux only), which will bind the
-    socket(s) to the specified interface. Allows to use Linux VRF, see:
-    https://www.kernel.org/doc/Documentation/networking/vrf.txt
-    NOTE: requires the program to be ran as root OR with CAP_NET_RAW
-  - zmq_timers_* APIs. These functions can be used for cross-platforms timed
-    callbacks. See doc/zmq_timers.txt for details.
-  - The following socket monitor events:
-    - ZMQ_EVENT_HANDSHAKE_FAILED_NO_DETAIL: unknown errors during handshake.
-    - ZMQ_EVENT_HANDSHAKE_SUCCEEDED: Handshake completed with authentication.
-    - ZMQ_EVENT_HANDSHAKE_FAILED_PROTOCOL: Protocol errors with peers or ZAP.
-    - ZMQ_EVENT_HANDSHAKE_FAILED_AUTH: Failed authentication requests.
-    See doc/zmq_socket_monitor.txt for more details and error codes.
-  - zmq_stopwatch_intermediate which returns the time elapsed without stopping
-    the stopwatch.
-  - zmq_proxy_steerable command 'STATISTICS' to retrieve stats about the amount
-    of messages and bytes sent and received by the proxy.
-    See doc/zmq_proxy_steerable.txt for more information.
-
-* The build-time configuration option to select the poller has been split, and
-  new API_POLLER (CMake) and --with-api-poller (autoconf) options will now
-  determine what system call is used to implement the zmq_poll/zmq_poller APIs.
-  The previous POLLER and --with-poller options now only affects the
-  internal I/O thread. In case API_POLLER is not specified, the behaviour keeps
-  backward compatibility intact and will be the same as with previous releases.
-
-* The non-default "poll" poller for the internal I/O thread (note: NOT for the
-  zmq_poll/zmq_poller user APIs!) has been disabled on Windows as WSAPoll does
-  not report connection failures. For more information see:
-  - https://daniel.haxx.se/blog/2012/10/10/wsapoll-is-broken/
-  - https://curl.haxx.se/mail/lib-2012-10/0038.html
-  - https://bugs.python.org/issue16507
-
-* New epoll implementation for Windows, using the following implementation:
-  https://github.com/piscisaureus/wepoll/tree/v1.5.4
-  To use this, select "epoll" as the poller option in the build system.
-  Note for distributors: the wepoll source code is embedded and distributed.
-  It is licensed under the BSD-2-Clause and thus it is compatible with LGPL-3.0.
-  Note that, if selected at build time, the license text must be distributed
-  with the binary in accordance to the license terms. A copy can be found at:
-  external/wepoll/license.txt
-
-* The pre-made Visual Studio solutions file are deprecated, and users are
-  encouraged to use the CMake solution generation feature instead.
-
-* New DRAFT (see NEWS for 4.2.0) socket options:
-  - ZMQ_ROUTER_NOTIFY to deliver a notification when a peer connects and/or
-    disconnects in the form of a routing id plus a zero-length frame.
-  - ZMQ_MULTICAST_LOOP to control whether the data sent should be looped back
-    on local listening sockets for UDP multicast sockets (ZMQ_RADIO).
-  See doc/zmq_setsockopt.txt and doc/zmq_getsockopt.txt for details.
-
-* New perf tool, perf/benchmark_radix_tree, to measure the performance of the
-  different internal implementations of the trie algorithm used to track
-  subscriptions. Requires a compiler that supports C++11.
-
-* New autoconf flag "--enable-force-CXX98-compat" which will force -std=gnu++98
-  and, if the compiler supports them (clang++ at the moment), it will also add
-  -Wc++98-compat -Wc++98-compat-pedantic so that compatibility with C++98 can
-  be tested.
-
-* Many, many coding style, duplication and static analysis improvements.
-
-* Many, many improvements to the CMake build system, especially on Windows.
-
-* Many, many improvements to unit tests.
-
-* Fixed #3036 - Compilation error when -pedantic is used.
-
-* Fixed #3028 - Failure when zmq_poller_destroy is called after zmq_ctx_term.
-
-* Fixed #2989 - CMake: Linker PDB install rule does not work when Visual Studio
-                generators are used.
-
-* Fixed #3045 - configure.ac: search for dladdr only when using libunwind.
-
-* Fixed #3060 - REQ sockets terminate TCP connection after first heartbeat if
-                ZMQ_HEARTBEAT_IVL is set.
-
-* Fixed #2212 - UDP: need ability to specify bind address separately from
-                multicast address for multi-homed hosts.
-
-* Fixed #2891 - UDP: address name resolution is limited to dotted IPv4 rather
-                than being capable of IPv4, IPv6, and hostname lookup.
-
-* Fixed #3085 - autoconf/CMake getrandom test does not check if it's working but
-                only for its presence.
-
-* Fixed #3090 - compilation broken with Solaris Studio.
-
-* Fixed #3094 - UDP: pass interface via IP[V6]_MULTICAST_IF if provided.
-
-* Fixed #3061 - implement ZMTP 3.1 ping/pong context sending/receiving.
-
-* Fixed #2188 - Added documentation for new zmq_poller API.
-
-* Fixed #3088 - zmq_poller_add/zmq_poller_modify should reject invalid events
-                arguments.
-
-* Fixed #3042 - Fixed compilation on ARM with ZMQ_ATOMIC_PTR_MUTEX.
-
-* Fixed #3107 - test_immediate_3/test_reconnect_inproc do not terminate with
-                POLL as the I/O thread poller under Windows.
-
-* Fixed #3046 - Aborts when iOS abuses EBADF to report a socket has been
-                reclaimed.
-
-* Fixed #3136 - Cannot set ZMQ_HEARTBEAT_TTL to more than 655.3 seconds.
-
-* Fixed #3083 - link with -latomic when needed.
-
-* Fixed #3162 - build failure with MUSL libc.
-
-* Fixed #3158 - -1 value of ZMQ_RECONNECT_IVL was not correctly handled on some
-                platforms.
-
-* Fixed #3170 - improved documentation for ZMQ_PAIR.
-
-* Fixed #3168 - correctly use symbols map on Debian/kFreeBSD and Debian/HURD
-                to avoid exporting standard library symbols.
-
-* Fixed #3168 - correctly process ZMTP 3.1 cancel/subscribe commands.
-
-* Fixed #3171 - improve documentation for ZMQ_CONFLATE.
-
-* Fixed #2876 - stack overflow on Windows 64.
-
-* Fixed #3191 - race condition with received message causes
-                ZMQ_CONNECT_ROUTING_ID to be assigned to wrong socket.
-
-* Fixed #3005 - added documentation for new zmq_timers_* API.
-
-* Fixed #3222 - use /Z7 debug on Release builds too on Windows (CMake).
-
-* Fixed #3226 - possible PGM receiver crash.
-
-* Fixed #3236 - UDP dish socket can't bind to a multicast port already in use.
-
-* Fixed #3242 - improve HWM documentation.
-
-* Fixed #2488 - improve zmq_msg_send doc return value documentation.
-
-* Fixed #3268 - HWM in ZMQ_DGRAM socket does not respect multipart message.
-
-* Fixed #3284 - added support for ZMQ_MULTICAST_HOPS with UDP sockets.
-
-* Fixed #3245 - use-after-free reported in zmq::pipe_t::terminate.
-
-* Fixed #1400 - use patricia trie for subscription to improve performances and
-                memory usage. Note: only active in DRAFT builds for now.
-
-* Fixed #3263 - fix abort on Windows when a large TCP read is requested and
-                fails.
-
-* Fixed #3312 - fix build on Android Things 1.06 with Termux.
-
-
-0MQ version 4.2.5 stable, released on 2018/03/23
-================================================
-
-* Fixed #3018 - fix backward-incompatible change in the NULL auth
-                mechanism that slipped in 4.2.3 and made connections
-                with a ZAP domain set on a socket but without a working
-                ZAP handler fail. See ZMQ_ZAP_ENFORCE_DOMAIN and RFC27.
-
-* Fixed #3016 - clarify in zmq_close manpage that the operation will
-                complete asynchronously.
-
-* Fixed #3012 - fix CMake build problem when using LIBZMQ_WERROR and a
-                compiler other than GCC.
-
-
-0MQ version 4.2.4 stable, released on 2018/03/21
-================================================
-
-* New DRAFT (see NEWS for 4.2.0) socket options:
-  - ZMQ_LOOPBACK_FASTPATH to enable faster TCP loopback on Windows
-  - ZMQ_METADATA to set application-specific metadata on a socket
-  See doc/zmq_setsockopt.txt and doc/zmq_getsockopt.txt for details.
-
-* New DRAFT (see NEWS for 4.2.0) context options:
-  - ZMQ_ZERO_COPY_RECV to disable zero-copy receive to save memory
-    at the expense of slower performance
-  See doc/zmq_ctx_set.txt and doc/zmq_ctx_get.txt for details.
-
-* New DRAFT API zmq_stopwatch_intermediate which returns the time
-  elapsed without stopping the stopwatch.
-
-* TIPC: support addressing TIPC Port Identity addresses.
-
-* Added CMake option to disable tests: BUILD_TESTS
-
-* Added CMake and autotools make targets to support clang-formatter:
-  make clang-format, clang-format-check and clang-format-diff to
-  help developers make sure their code conforms to the style guidelines
-
-* For distributors: a new test framework has been added, which
-  includes a copy of the Unity source code. This source code library is
-  distributed under the MIT license and thus is compatible with
-  libzmq's LGPL3.
-
-* Fixed #2867 - add ZeroMQConfig.cmake.in to distributable tarball
-
-* Fixed #2868 - fix OpenBSD build
-
-* Fixed #2870 - fix VC++ 11.0 (VS2012) build
-
-* Fixed #2879 - prevent duplicate connections on PUB sockets
-
-* Fixed #2872 - fix CMake tests on Windows
-
-* Fixed #2895 - fix assert on Windows with POLL
-
-* Fixed #2920 - fix Windows build with Intel compiler
-
-* Fixed #2930 - use std::atomic when available with VC++ and VS2015
-
-* Fixed #2910 - fix race condition with ZMQ_LINGER socket option
-
-* Fixed #2927 - add support for ZMQ_XPUB_NODROP on ZMQ_RADIO
-
-* Fixed #2820 - further clarify ZMQ_XPUB_VERBOSE(R) documentation.
-
-* Fixed #2911 - ZMQ_DISH over UDP triggers errno_assert() after hitting
-                watermark
-
-* Fixed #2942 - ZMQ_PUB crash when due to high volume of subscribe and
-                unsubscribe messages, an unmatched unsubscribe message is
-                received in certain conditions
-
-* Fixed #2946 - fix Windows CMake build when BUILD_SHARED is off
-
-* Fixed #2960 - fix build with GCC 8
-
-* Fixed #2967 - fix race condition on thread safe sockets due to pthread
-                condvar timeouts on OSX
-
-* Fixed #2977 - fix TIPC build-time availability check to be more relaxed
-
-* Fixed #2966 - add support for WindRiver VxWorks 6.x
-
-* Fixed #2963 - fix some PVS Studio static analysis warnings
-
-* Fixed #2983 - fix MinGW cross-compilation
-
-* Fixed #2991 - fix mutex assert at shutdown when the zmq context is part
-                of a class declared as a global static
-
-
-0MQ version 4.2.3 stable, released on 2017/12/13
-================================================
-
-* API change: previously ZMQ_POLLOUT on a ZMQ_ROUTER socket returned always
-  true due to how the type works. When ZMQ_ROUTER_MANDATORY is set, sending
-  fails when the peer is not available, but ZMQ_POLLOUT always returns true
-  anyway, which does not make sense. Now when ZMQ_ROUTER_MANDATORY is set,
-  ZMQ_POLLOUT on a ZMQ_ROUTER will return true only if at least one peer is
-  available.
-  Given ZMQ_POLLOUT with ZMQ_ROUTER was not usable at all previously, we do
-  not consider this a breakage warranting a major or minor version increase.
-
-* ZMQ_IDENTITY has been renamed to ZMQ_ROUTING_ID and ZMQ_CONNECT_RID has been
-  renamed to ZMQ_CONNTECT_ROUTING_ID to disambiguate. ZMQ_IDENTITY and
-  ZMQ_CONNECT_RID are still available to keep backward compatibility, and will
-  be removed in a future release after further advance notice.
-
-* DRAFT API change: zmq_poller_wait, zmq_poller_wait_all and zmq_poller_poll
-  have been changed to be inline with other existing APIs that have a timeout
-  to return EAGAIN instead of ETIMEDOUT as the errno value.
-  See #2713 for details.
-
-* Existing non-DRAFT socket types ZMQ_REP/REQ, ZMQ_ROUTER/DEALER and
-  ZMQPUB/SUB, that were previously declared deprecated, have been reinstated
-  as stable and supported. See #2699 for details.
-
-* Tweetnacl: add support for, and use preferably if available, getrandom() as
-  a simpler and less error-prone alternative to /dev/urandom on OSes where it
-  is available (eg: Linux 3.18 with glibc 2.25).
-
-* Curve: all remaining traces of debug output to console are now removed, and
-  new DRAFT events are available to properly debug CURVE, PLAIN, GSSAPI and
-  ZAP events and failures. See below for details on the new events.
-
-* New DRAFT (see NEWS for 4.2.0) socket options:
-  - ZMQ_GSSAPI_PRINCIPAL_NAMETYPE and ZMQ_GSSAPI_SERVICE_PRINCIPAL_NAMETYPE, for
-    the corresponding GSSAPI features. Additional definitions for principal
-    name types:
-    - ZMQ_GSSAPI_NT_HOSTBASED
-    - ZMQ_GSSAPI_NT_USER_NAME
-    - ZMQ_GSSAPI_NT_KRB5_PRINCIPAL
-    See doc/zmq_gssapi.txt for details.
-  - ZMQ_BINDTODEVICE (Linux only), which will bind the socket(s) to the
-    specified interface. Allows to use Linux VRF, see:
-    https://www.kernel.org/doc/Documentation/networking/vrf.txt
-    NOTE: requires the program to be ran as root OR with CAP_NET_RAW
-  - ZMQ_ZAP_ENFORCE_DOMAIN, enables strict RFC 27 compatibility mode and makes
-    the ZAP Domain mandatory when using security. See:
-    https://rfc.zeromq.org/spec:27/ZAP
-  See doc/zmq_setsockopt.txt and doc/zmq_getsockopt.txt for details.
-
-* New DRAFT (see NEWS for 4.2.0) context options:
-  - ZMQ_THREAD_AFFINITY_CPU_ADD and ZMQ_THREAD_AFFINITY_CPU_REMOVE (Posix only),
-    to add and remove CPUs to the affinity set of the I/O threads. Useful to pin
-    the background threads to specific CPUs.
-  - ZMQ_THREAD_NAME_PREFIX (Posix only), to add a specific integer prefix to the
-    background threads names, to easily identify them for debugging purposes.
-  See doc/zmq_ctx_set.txt and doc/zmq_ctx_get.txt for details.
-
-* New DRAFT (see NEWS for 4.2.0) message property name definitions to facilitate
-  the use of zmq_msg_gets:
-  - ZMQ_MSG_PROPERTY_ROUTING_ID
-  - ZMQ_MSG_PROPERTY_SOCKET_TYPE
-  - ZMQ_MSG_PROPERTY_USER_ID
-  - ZMQ_MSG_PROPERTY_PEER_ADDRESS
-  See doc/zmq_msg_gets.txt for details.
-
-* New DRAFT (see NEWS for 4.2.0) API zmq_socket_get_peer_state, to be used to
-  query the state of a specific peer (via routing-id) of a ZMQ_ROUTER socket.
-
-* New DRAFT (see NEWS for 4.2.0) Socket Monitor events:
-  - ZMQ_EVENT_HANDSHAKE_FAILED_NO_DETAIL, unknown system error and returns errno
-  - ZMQ_EVENT_HANDSHAKE_SUCCEEDED, handshake was successful
-  - ZMQ_EVENT_HANDSHAKE_FAILED_PROTOCOL, protocol errors between peers or server
-    and ZAP handler. Returns one of ZMQ_PROTOCOL_ERROR_* - see manpage for list
-  - ZMQ_EVENT_HANDSHAKE_FAILED_AUTH, failed authentication, returns ZAP status
-  These events trigger when the ZMTP security mechanism handshake is
-  completed or failed. See doc/zmq_socket_monitor.txt for more information.
-
-* New DRAFT (see NEWS for 4.2.0) zmq_proxy_steerable command 'STATISTICS' to
-  retrieve stats about the amount of messages and bytes sent and received by
-  the proxy. See doc/zmq_proxy_steerable.txt for more information.
-
-* Add new autoconf --disable-libunwind option to stop building with libunwind
-  even if it is available.
-
-* Add new autoconf --disable-Werror option to avoid building with the Werror
-  flag.
-
-* Use pkg-config as the first method for finding and building with external
-  optional dependencies such as libnorm, libpgm and gssapi.
-
-* On Posix platform where the feature is available, name the ZMQ background
-  threads to simplify debugging: "ZMQbg/<num_thread>"
-
-* Improve performance of zmq_poller_* (and zmq_poll and zmq_proxy when building
-  with DRAFT APIs enabled).
-
-* The TCP unit tests have been refactored to bind and connect to random ports
-  rather than hard-coded ones, to allow running tests in parallel.
-  There are 6 exceptions where it is necessary to use an hard-coded port to
-  test specific code paths that would not be exercised when binding to a
-  wildcard port. These are listed in tests/testutil.hpp so that distributions
-  can easily patch them if they wish to and so that they can be unique across
-  all the tests, allowing parallel runs.
-  The IPC unit tests have been changed as well to use unique socket file names
-  per test, where before there were some clashes.
-
-* Fixed #2349 - fix building with libsodium when using CMake
-
-* Fixed #2334 - do not assert when tuning socket options fails due to network
-  errors, but simply retry again when connecting or send a socket monitor
-  ZMQ_EVENT_ACCEPT_FAILED event when binding
-
-* Fixed #2341 - fix source files path in VS2015 solution
-
-* Fixed #2344 - Note that on Windows with VS2012 it is mandatory to increase
-  the default stack size to at least 2MB
-
-* Fixed #2348 - ZMQ_ROUTER send with ZMQ_ROUTER_MANDATORY can be stuck in case of
-  network problem
-
-* Fixed #2358 - occasional abort on zmq_connect on Windows
-
-* Fixed #2370 - zmq_curve_keypair should return an error on failure rather
-  than ignoring them and always returning 0
-
-* Fixed #2452 - __STDC_LIMIT_MACROS before precompiled headers causes VC++
-  warning
-
-* Fixed #2457 - fix building with libsodium in Visual Studio solutions
-
-* Fixed #2466 - add const qualifier to internal and public API that does not
-  modify parameters
-
-* Fixed #2471 - do more checks for OOM conditions when dynamic allocations is
-  used
-
-* Fixed #2476 - assertion causes abort after ZAP stop at shutdown
-
-* Fixed #2479 - improve zmq_poller performance on Windows
-
-* Fixed #2481 - potential memory leaks due to ZMTP handshake failures
-
-* Fixed #2531 - ZMQ_GSSAPI_PRINCIPAL sockopt has no effect on client side
-
-* Fixed #2535 - add BUILD_SHARED and BUILD_STATIC options to CMake, both on by
-  default, to toggle shared and static library builds
-
-* Fixed #2537 - use SYSTEM_CLOCK on OSX and CLOCK_MONOTONIC elsewhere for
-  internal timers to avoid races
-
-* Fixed #2540 - new zmq_poller used by zmq_poll without DRAFTs
-
-* Fixed #2552 - Fix WITH_DOC CMake build to avoid checking for asciidoc if the
-  option is disabled
-
-* Fixed #2567 - Memory leak in REP socket handling
-
-* Fixed #2579 - Compilation issue on Windows with CMake + ninja
-
-* Fixed #2588 - SIGBUS under 64-bit SunOS Sparc
-
-* Fixed #2590 - crash when using ZMQ_IMMEDIATE and ZMQ_LINGER to non-zero
-
-* Fixed #2601 - XPUB_MANUAL subscriptions not removed on peer term
-
-* Fixed #2602 - intermittent memory leak for ZMQ_REQ/REP send/recv
-
-* Fixed #2608 - CURVE server (connect) fails when client rebinds
-
-* Fixed #2610 - print backtraces in mutual exclusion to avoid mixing
-  different traces
-
-* Fixed #2621 - add missing CMake files to distributable tarball
-
-* Fixed #2630 - improve compatibility with OpenBSD w.r.t. IPV6_V6ONLY
-
-* Fixed #2638 - note in INSTALL that when using Windows builds on Linux with
-  Wine it is necessary to increase the minimum TCP buffers
-
-* Fixed #2632 - Fix file descriptor leak when using Tweetnacl (internal NACL
-  implementation) instead of Libsodium, and fix race condition when using
-  multiple ZMQ contexts with Tweetnacl
-
-* Fixed #2681 - Possible buffer overflow in CURVE mechanism handshake.
-  NOTE: this was protected by an assert previously, so there is no security
-  risk.
-
-* Fixed #2704 - test_sockopt_hwm fails occasionally on Windows
-
-* Fixed #2701 - pgm build via cmake doesn't link libzmq with libpgm
-
-* Fixed #2711 - ZAP handler communication errors should be handled consistently
-
-* Fixed #2723 - assertion in src\select.cpp:111 or hang on zmq_ctx_destroy on
-  Windows
-
-* Fixed #2728 - fix support O_CLOEXEC when building with CMake
-
-* Fixed #2761 - improve compatibility with TrueOS (FreeBSD 12)
-
-* Fixed #2764 - do not unlink IPC socket files when closing a socket to avoid
-  race conditions
-
-* Fixed #2770 - support lcov 1.13 and newer
-
-* Fixed #2787 - add libiphlpapi to PKGCFG_LIBS_PRIVATE for static mingw builds
-
-* Fixed #2788 - document that adding -DZMQ_STATIC is required for Windows
-  static builds with Mingw
-
-* Fixed #2789 - description of zmq_atomic_counter_value return value is cloned
-  from zmq_atomic_counter_new
-
-* Fixed #2791 - fix building with DRAFT APIs on CentOS 6
-
-* Fixed #2794 - router_t methods should not allocate memory for lookup in
-  outpipes
-
-* Fixed #2809 - optimize select() usage on Windows
-
-* Fixed #2816 - add CMake and autoconf check for accept4, as it is not
-  available on old Linux releases, and fallback to accept + FD_CLOEXEC
-
-* Fixed #2824 - ZMQ_REQ socket does not report ZMQ_POLLOUT when ZMQ_REQ_RELAXED
-  is set
-
-* Fixed #2827 - add support for Haiku
-
-* Fixed #2840 - fix building with VS2008
-
-* Fixed #2845 - correct the ZMQ_LINGER documentation to accurately reflect that
-  the default value is -1 (infinite). It never was 30 second in any released
-  version, it was only changed briefly and then changed back, but the manpage
-  was not reverted.
-
-* Fixed #2861 - CMake/MSVC: export ZMQ_STATIC when needed.
-
-0MQ version 4.2.2 stable, released on 2017/02/18
-=============================================
-
-* Improve compatibility with GNU Hurd
-
-* Fixed #2286 - improve CMake on Windows documentation
-
-* Fixed #1235 - improved compatibility with mingw64
-
-* Improve zmq_proxy documentation to state it can return ETERM as well
-
-* Fixed #1442 - SO_NOSIGPIPE and connection closing by peer race condition
-
-* Improve CMake functionality on Windows: ZeroMQConfig.cmake generation CPack
-  option, correct static library filename, ship FindSodium.cmake in tarball
-
-* Fixed #2228 - setting HWM after connect on inproc transport leads to infinite
-  HWM
-
-* Add support for Visual Studio 2017
-
-* New DRAFT (see NEWS for 4.2.0) zmq_has option "draft" option that returns
-  true if the library was built with DRAFT enabled. Useful for FFI bindings.
-  See doc/zmq_has.txt for more information
-
-* Fixed #2321 - zmq_z85_decode does not validate its input. The function has
-  been fixed to correctly follow RFC32 and return NULL if the input is invalid
-
-* Fixed #2323 - clock_t related crash on Apple iOS 9.3.2 and 9.3.5
-
-* Fixed #1801 - OSX: Cmake installs libzmq in a weird PATH
-
-* Fixed potential divide by zero in zmq::lb_t::sendpipe
-
-* Improve compatibility with OpenIndiana by skipping epoll and using poll/select
-
-* Fix IPv4-in-IPv6 mapped addresses parsing error
-
-
-0MQ version 4.2.1 stable, released on 2016/12/31
-=============================================
-
-* New DRAFT (see NEWS for 4.2.0) Socket Monitor events:
-  - ZMQ_EVENT_HANDSHAKE_SUCCEED
-  - ZMQ_EVENT_HANDSHAKE_FAILED
-  These events trigger when the ZMTP security mechanism handshake is
-  completed. See doc/zmq_socket_monitor.txt for more information.
-
-* New DRAFT (see NEWS for 4.2.0) Context options:
-  - ZMQ_MSG_T_SIZE
-  See doc/zmq_ctx_get.txt for more information.
-
-* Fixed #2268 - improved compatibility with mingw32
-
-* Fixed #2254 - ZMQ_PUB compatibility with libzmq 2.x broken
-
-* Fixed #2245 - added support for VS2017, Windows SDK 10.0.14393.0, toolset v141
-
-* Fixed #2242 - file descriptors leaks on fork+exec
-
-* Fixed #2239 - retired poller item crash from reaper thread
-
-* Fixed #2234 - improved compatibility with AIX 7.1
-
-* Fixed #2225 - cannot pick select for poller
-
-* Fixed #2217 - CMake build uses library version as the ABI version
-
-* Fixed #2208 - added support for ZMQ_TOS on IPv6
-
-* Fixed #2200 - no documentation for ZMQ_SOCKS_PROXY
-
-* Fixed #2199 - no documentation for zmq_curve_public
-
-* Fixed #2196 - fixed build and runtime errors on kFreeBSD
-
-
-0MQ version 4.2.0 stable, released on 2016/11/04
-=============================================
-
-* For Pieter. Thanks for making all of this possible.
-
-  "Tell them I was a writer.
-   A maker of software.
-   A humanist. A father.
-   And many things.
-   But above all, a writer.
-   Thank You. :)"
-   - Pieter Hintjens
-
-* This release introduces new APIs, but it is ABI compatible with
-  libzmq 4.1.2 and up.
-
-* Note for ARM and SPARC users: an alignment problem in zmq_msg_t that could in
-  some cases and on some CPUs cause a SIGBUS error was solved, but it requires
-  a rebuild of your application against the 4.2.0 version of include/zmq.h.
-  To clarify, this change does not affect the internals of the library but only
-  the public definition of zmq_msg_t, so there is no ABI incompatibility.
-
-* Security with Curve is now available by default thanks to Tweetnacl sources:
-  https://tweetnacl.cr.yp.to/index.html
-  Libsodium is still fully supported but has to be enabled with the build flag
-  --with-libsodium. Distribution and package maintainers are encouraged to use
-  libsodium so that the security implementation can be audited and maintained
-  separately.
-
-* New Context options:
-  - ZMQ_MAX_MSGSZ
-  - ZMQ_BLOCKY
-  See doc/zmq_ctx_set.txt and doc/zmq_ctx_get.txt for details.
-
-* New Socket options:
-  - ZMQ_HANDSHAKE_IVL
-  - ZMQ_SOCKS_PROXY
-  - ZMQ_XPUB_NODROP
-  - ZMQ_XPUB_MANUAL
-  - ZMQ_XPUB_WELCOME_MSG
-  - ZMQ_STREAM_NOTIFY
-  - ZMQ_INVERT_MATCHING
-  - ZMQ_HEARTBEAT_IVL
-  - ZMQ_HEARTBEAT_TTL
-  - ZMQ_HEARTBEAT_TIMEOUT
-  - ZMQ_XPUB_VERBOSER
-  - ZMQ_CONNECT_TIMEOUT
-  - ZMQ_TCP_MAXRT
-  - ZMQ_THREAD_SAFE
-  - ZMQ_MULTICAST_MAXTPDU
-  - ZMQ_VMCI_BUFFER_SIZE
-  - ZMQ_VMCI_BUFFER_MIN_SIZE
-  - ZMQ_VMCI_BUFFER_MAX_SIZE
-  - ZMQ_VMCI_CONNECT_TIMEOUT
-  - ZMQ_USE_FD
-  See doc/zmq_setsockopt.txt and doc/zmq_getsockopt.txt for details.
-
-* New CURVE helper function to derive z85 public key from secret key:
-    zmq_curve_public
-
-* New cross-platform atomic counter helper functions:
-    zmq_atomic_counter_new, zmq_atomic_counter_set, zmq_atomic_counter_inc,
-    zmq_atomic_counter_dec, zmq_atomic_counter_value, zmq_atomic_counter_destroy
-  See doc/zmq_atomic_*.txt for details.
-
-* New DRAFT APIs early-release mechanism. New APIs will be introduced early
-  in public releases, and until they are stabilized and guaranteed not to
-  change anymore they will be unavailable unless the new build flag
-  --enable-drafts is used. This will allow developers and early adopters to
-  test new APIs before they are finalized.
-  NOTE: as the name implies, NO GUARANTEE is made on the stability of these APIs.
-  They might change or disappear entirely. Distributions are recommended NOT to
-  build with them.
-
-  New socket types have been introduced in DRAFT state:
-    ZMQ_SERVER, ZMQ_CLIENT, ZMQ_RADIO, ZMQ_DISH, ZMQ_GATHER, ZMQ_SCATTER,
-    ZMQ_DGRAM
-  All these sockets are THREAD SAFE, unlike the existing socket types. They do
-  NOT support multipart messages (ZMQ_SNDMORE/ZMQ_RCVMORE).
-  ZMQ_RADIO, ZMQ_DISH and ZMQ_DGRAM also support UDP as transport,
-  both unicast and multicast. See doc/zmq_udp.txt for more details.
-  New methods to support the new socket types functionality:
-    zmq_join, zmq_leave, zmq_msg_set_routing_id, zmq_msg_routing_id,
-    zmq_msg_set_group, zmq_msg_group
-  See doc/zmq_socket.txt for more details.
-
-  New poller mechanism and APIs have been introduced in DRAFT state:
-    zmq_poller_new, zmq_poller_destroy, zmq_poller_add, zmq_poller_modify,
-    zmq_poller_remove, zmq_poller_wait, zmq_poller_wait_all, zmq_poller_add_fd
-    zmq_poller_modify_fd, zmq_poller_remove_fd
-  and a new supporting struct typedef: zmq_poller_event_t
-  They support existing socket type, new thread-safe socket types and file
-  descriptors (cross-platform).
-  Documentation will be made available in the future before these APIs are declared
-  stable.
-
-  New cross-platform timers helper functions have been introduced in DRAFT state:
-    zmq_timers_new, zmq_timers_destroy, zmq_timers_add, zmq_timers_cancel,
-    zmq_timers_set_interval, zmq_timers_reset, zmq_timers_timeout,
-    zmq_timers_execute
-  and a new supporting callback typedef: zmq_timer_fn
-
-* Many, many bug fixes. The most important fixes are backported and captured in the
-  4.1.x and 4.0.x changelogs.
-
-
-0MQ version 4.2.0 rc1, released on 2016/11/01
-=============================================
-
-* Many changes, see ChangeLog.
-
-
-0MQ version 4.1.6 stable, released on 2016/11/01
-================================================
-
-* Fixed #2051 - getifaddrs can fail with ECONNREFUSED
-
-* Fixed #2091 - testutil.hpp fails to build on Windows XP
-
-* Fixed #2096 - add tests/CMakeLists.in and version.rc.in to dist tar
-
-* Fixed #2107 - zmq_connect with IPv6 "source:port;dest:port" broken
-
-* Fixed #2117 - ctx_term assert with inproc zmq_router connect-before-bind
-
-* Fixed #2158 - Socket monitor uses internal Pair from multiple threads
-
-* Fixed #2161 - messages dropped due to HWM race
-
-* Fixed #1325 - alignment issue with zmq_msg_t causes SIGBUS on SPARC and ARM
-
-
-0MQ version 4.1.5 stable, released on 2016/06/17
-================================================
-
-* Fixed #1673 - CMake on Windows put PDB in wrong directory.
-
-* Fixed #1723 - Family is not set when resolving NIC on Android.
-
-* Fixed #1608 - Windows 7 TCP slow start issue.
-
-* Fixed #1806 - uninitialised read in curve getsockopt.
-
-* Fixed #1807 - build broken with GCC 6.
-
-* Fixed #1831 - potential assertion failure with latest libsodium.
-
-* Fixed #1850 - detection issues with tweetnacl/libsodium.
-
-* Fixed #1877 - Avoid terminating connections prematurely
-
-* Fixed #1887 - zmq_bind IPv4 fallback still tries IPv6
-
-* Fixed #1866 - fails to build on SunOS 5.10 / Solaris 10
-
-* Fixed #919 - ZMQ_LINGER (related to #1877)
-
-* Fixed #114 - cannot unbind with same endpoint with IPv6 enabled.
-
-* Fixed #1952 - CMake scripts not part of release tarballs
-
-* Fixed #1542 - Fix a crash on Windows when port 5905 is in use.
-
-* Fixed #2021 - Fix building on sparc32.
-
-
-0MQ version 4.1.4 stable, released on 2015/12/18
-================================================
-
-* Fixed #1315 - socket monitor hangs if bind/setsockopt failed.
-
-* Fixed #1399 - assertion failure in tcp.cpp after network reconnect.
-
-* Fixed #1632 - build failure using latest libsodium.
-
-* Fixed #1644 - assertion failure in msg.cpp:390 on STREAM sockets.
-
-* Fixed #1661 - does not handle IPv6 link local addresses.
-
-
-0MQ version 4.1.3 stable, released on 2015/08/17
-================================================
-
-* Fixed #1532 - getsockopt ZMQ_RCVMORE now resets all bits instead of only 32
-
-* Fixed #1445 - zmq::socket_base_t::connect fails on tcp ipv6 address
-
-
-0MQ version 4.1.2 stable, released on 2015/06/15
-================================================
-
-* Added explicit reference to static link exception in every source file.
-
-* Bumped ABI version to 5:0:0 since 4.1.x changed the ABI.
-
-* Fixed STDINT event interface macros to work with CZMQ 3.0.
-
-* Fixed installation of man pages when BUILD_DOC is not set.
-
-* Fixed #1428 - regression on single-socket proxies.
-
-
-0MQ version 4.1.1 stable, released on 2015/06/02
-================================================
-
-* Fixed #1208 - fix recursion in automake packaging.
-
-* Fixed #1224 - crash when processing empty unsubscribe message.
-
-* Fixed #1213 - properties files were missing from source packages.
-
-* Fixed #1273 - V3 protocol handler vulnerable to downgrade attacks.
-
-* Fixed #1347 - lack way to get peer address.
-
-* Fixed #1362 - SUB socket sometimes fails to resubscribe properly.
-
-* Fixed #1377, #1144 - failed with WSANOTINITIALISED in some cases.
-
-* Fixed #1389 - PUB, PUSH sockets had slow memory leak.
-
-* Fixed #1382 - zmq_proxy did not terminate if there were no readers.
-
-
-0MQ version 4.1.0 rc1, released on 2014/10/14
-=============================================
-
-* All issues that were fixed in 4.0.x
-
-* Improved client reconnection strategy on errors
-
-* GSSAPI security mechanism
-
-* SOCKS5 support (ZMQ_SOCKS_PROXY)
-
-* ZMQ_ROUTER_HANDOVER
-
-* ZMQ_TOS
-
-* ZMQ_CONNECT_RID
-
-* ZMQ_HANDSHAKE_IVL
-
-* ZMQ_IDENTITY_FD
-
-* ZMQ_XPUB_NODROP
-
-* ZMQ_SRCFD and ZMQ_SHARED message options
-
-* Message metadata -- zmq_msg_gets ()
-
-* Probe library configuration -- zmq_has ()
-
-
-0MQ version 4.0.8 stable, released on 2016/06/17
-================================================
-
-* Fixed LIBZMQ-949 - zmq_unbind fails for inproc and wildcard endpoints
-
-* Fixed #1806 - uninitialised read in curve getsockopt.
-
-* Fixed #1807 - build broken with GCC 6.
-
-* Fixed #1877 - Avoid terminating connections prematurely
-
-* Fixed #1887 - zmq_bind IPv4 fallback still tries IPv6
-
-* Fixed #98 - don't require libssp without libsodium on Solaris
-
-* Fixed #919 - ZMQ_LINGER (related to #1877)
-
-* Fixed #139 - "tempnam" is deprecated.
-
-
-0MQ version 4.0.7 stable, released on 2015/06/15
-================================================
-
-* Fixed #1428 - regression on single-socket proxies.
-
-
-0MQ version 4.0.6 stable, released on 2015/06/02
-================================================
-
-* Fixed #1273 - V3 protocol handler vulnerable to downgrade attacks.
-
-* Fixed #1362 - SUB socket sometimes fails to resubscribe properly.
-
-* Fixed #1377, #1144 - failed with WSANOTINITIALISED in some cases.
-
-* Fixed #1389 - PUB, PUSH sockets had slow memory leak.
-
-* Fixed #1382 - zmq_proxy did not terminate if there were no readers.
-
-
-0MQ version 4.0.5 stable, released on 2014/10/14
-================================================
-
-* Fixed #1191; CURVE mechanism does not verify short term nonces.
-
-* Fixed #1190; stream_engine is vulnerable to downgrade attacks.
-
-* Fixed #1088; assertion failure for WSAENOTSOCK on Windows.
-
-* Fixed #1015; race condition while connecting inproc sockets.
-
-* Fixed #994; bump so library number to 4.0.0
-
-* Fixed #939, assertion failed: !more (fq.cpp:99) after many ZAP requests.
-
-* Fixed #872; lost first part of message over inproc://.
-
-* Fixed #797, keep-alive on Windows.
-
-
-0MQ version 4.0.4 stable, released on 2014/03/10
-================================================
-
-Bug Fixes
----------
-
-* Fixed #909; out of tree build issue on Linux.
-
-* Fixed #888; hangs on terminate when inproc connected but never bound.
-
-* Fixed #868; assertion failure at ip.cpp:137 when using port scanner.
-
-* Fixed #818; fix timestamp counter on s390/s390x.
-
-* Fixed #817; only export zmq_* symbols.
-
-* Fixed #797; fixed setting TCP keepalive on Windows.
-
-* Fixed #775; compile error on Windows.
-
-* Fixed #763; when talking to a ZMTP v1 peer (libzmq 2.2), a socket would
-  send an extra identity frame at the start of the connection.
-
-* Fixed LIBZMQ-576 - Crash closing a socket after zmq_msg_send returns
-  EAGAIN (reverts LIBZMQ-497)
-
-* Fixed LIBZMQ-584; subscription filters getting lost on reconnection.
-
-
-0MQ version 4.0.3 stable, released on 2013/11/24
-================================================
-
-Bug Fixes
----------
-
-* Fixed test_many_sockets case, which failed when process socket limit
-  was 1024.
-
-
-0MQ version 4.0.2 stable, released on 2013/11/24
-================================================
-
-Bug Fixes
----------
-
-* Fixed LIBZMQ-583 - improved low-res timer for Windows
-* Fixed LIBZMQ-578 - z85_decode was extremely slow
-* Fixed LIBZMQ-577 - fault in man pages.
-* Fixed LIBZMQ-574 - assertion failure when ran out of system file handles
-* Fixed LIBZMQ-571 - test_stream failing in some cases
-* Fixed LIBZMQ-569 - Socket server crashes with random client data and when
-  talking to 2.2 versions
-* Fixed LIBZMQ-39 - Bad file descriptor during shutdown
-* Pulled expected failing test_linger.cpp from release
-* Reduced pause time in tests to allow "make check" to run faster
-
-
-0MQ version 4.0.1 stable, released on 2013/10/08
-================================================
-
-Changes
--------
-
-* Updated CURVE mechanism to track revised RFC 27 (INITIATE vouch).
-
-  The INITIATE command vouch box is Box[C',S](C->S') instead of
-  Box[C'](C->S), to reduce the risk of client impersonation, as per
-  https://codesinchaos.wordpress.com/2012/09/09/curvecp-1/.
-
-* Fixed LIBZMQ-567, adding abstract namespaces for IPC sockets on Linux.
-
-  Converts an initial strudel or "at sign" (@) in the Unix socket path to
-  a NULL character ('\0') indicating that the socket uses the abstract
-  namespace instead of the filesystem namespace.  For instance, binding a
-  socket to 'ipc://@/tmp/tester' will not create a file associated with
-  the socket whereas binding to 'ipc:///tmp/tester' will create the file
-  /tmp/tester. See issue 567 for more information.
-
-* Added zmq_z85_encode and zmq_z85_decode to core libzmq API.
-
-* Added zmq_curve_keypair to core libzmq API.
-
-* Bumped library ABI version to 4:0:1.
-
-Bug fixes
----------
-
-* Fixed some build/test errors on OS/X + Clang++.
-
-* Fixed LIBZMQ-565, typo in code.
-
-* Fixed LIBZMQ-566, dealer-to-router connections sometimes failing.
-
-* Fixed builds for AIX, MSVC 2008, OS/X with clang++, Solaris.
-
-* Improved CURVE handshake error handling.
-
-
-0MQ version 4.0.0 (RC1), released on 2013/09/20
-===============================================
-
-Major changes
--------------
-
-* New wire level protocol, ZMTP/3.0, see http://rfc.zeromq.org/spec:23.
-  Does not yet implement the SUBSCRIBE, CANCEL, PING, and PONG commands.
-  
-* New security framework, from plain user+password to strong encryption, 
-  see section below. See http://hintjens.com/blog:49 for a tutorial.
-  
-* New ZMQ_STREAM socket type for working as a TCP client or server. See: 
-  tests/test_stream.cpp.
-  
-Improvements
-------------
-
-* You can now connect to an inproc:// endpoint that does not already
-  exist. This means inproc:// no longer needs careful set-up, but it may
-  break code that relied on the old behaviour. See: 
-  tests/test_inproc_connect.cpp.
- 
-* Libzmq now checks socket types at connection time, so that trying to 
-  connect a 'wrong' socket type will fail.
-  
-* New zmq_ctx_shutdown API method will shutdown a context and send ETERM
-  to blocking calls, without blocking. Use zmq_ctx_term to finalise the
-  process.
-  
-* The regression test suite has been significantly extended and improved.
-  
-* Contexts can now be terminated in forked child processes. See: 
-  tests/test_fork.cpp.
-  
-* zmq_disconnect now respects the linger setting on sockets.
-
-* New zmq_send_const API method to send constant data (without copying).
-  See: tests/test_inproc_connect.cpp.
-  
-* Added CMake support for static libraries.
-
-* Added test cases for socket semantics as defined in RFCs 28, 29, 30, 31.
-  See: tests/test_spec_*.cpp.
-
-* New socket option, ZMQ_PROBE_ROUTER triggers an empty message on connect.
-  See: tests/test_probe_router.cpp.
-  
-* New socket option, ZMQ_REQ_CORRELATE allows for correlation of replies 
-  from a REP socket. See: tests/test_req_correlate.cpp.
-  
-* New socket option, ZMQ_REQ_RELAXED, lets you disable the state machine 
-  on a REQ socket, so you can send multiple requests without waiting for 
-  replies, and without getting an EFSM error. See: 
-  tests/test_req_relaxed.cpp.
-  
-* New socket option, ZMQ_CONFLATE restricts the outgoing and incoming 
-  socket buffers to a single message. See: tests/test_conflate.cpp.
-
-Deprecated Options
-------------------
-
-* ZMQ_IPV4ONLY deprecated and renamed to ZMQ_IPV6 so that options are
-  consistently "off" by default. 
-
-* ZMQ_DELAY_ATTACH_ON_CONNECT deprecated, and renamed to ZMQ_IMMEDIATE.
-  See: tests/test_immediate.cpp.
-
-Security Framework
-------------------
-
-Based on new ZMTP wire level protocol that negotiates a security 
-"mechanism" between client and server before exchanging any other data.
-
-Security mechanisms are extensible. ZMTP defines three by default:
-
-* NULL - classic ZeroMQ, with no authentication. See 
-  http://rfc.zeromq.org/spec:23.
-  
-* PLAIN - plain-text username + password authentication. See
-  http://rfc.zeromq.org/spec:24.
-
-* CURVE - secure authentication and encryption based on elliptic curve 
-  cryptography, using the Curve25519 algorithm from Daniel Bernstein and 
-  based on CurveCP's security handshake. See http://rfc.zeromq.org/spec:25, 
-  http://rfc.zeromq.org/spec:26, and http://curvecp.org.
-  
-Authentication is done by pluggable "authenticators" that connect to libzmq
-over an inproc endpoint, see http://rfc.zeromq.org/spec:27.
-
-Socket options to configure PLAIN security on client or server:
-
-* ZMQ_PLAIN_SERVER, ZMQ_PLAIN_USERNAME, ZMQ_PLAIN_PASSWORD. See 
-  tests/test_security_plain.
-  
-Socket options to configure CURVE security on client or server:
-
-* ZMQ_CURVE_SERVER, ZMQ_CURVE_PUBLICKEY, ZMQ_CURVE_SECRETKEY, 
-  ZMQ_CURVE_SERVERKEY. See tests/test_security_curve.cpp.
-  
-Socket options to configure "domain" for ZAP handler:
- 
-* ZMQ_ZAP_DOMAIN, see tests/test_security_null.cpp.
-
-Support for encoding/decoding CURVE binary keys to ASCII:
-
-* zmq_z85_encode, zmq_z85_decode.
-
-Other issues addressed in this release
---------------------------------------
-
-* LIBZMQ-525 Multipart upstreaming from XSUB to XPUB
-
-
-0MQ version 3.2.4 stable, released on 2013/09/20
-================================================
-
-* LIBZMQ-84  (Windows) Assertion failed: Address already in use at signaler.cpp:80
-* LIBZMQ-456 ZMQ_XPUB_VERBOSE does not propagate in a tree of XPUB/XSUB devices
-* LIBZMQ-532 (Windows) critical section not released on error
-* LIBZMQ-569 Detect OpenPGM 5.2 system library
-* LIBZMQ-563 Subscribers sometimes stopped receiving messages (aka LIBZMQ-541)
-* LIBZMQ-XXX Added support for Travis Continuous Integration
-* LIBZMQ-XXX Several improvements to MSVC support
-
-
-0MQ version 3.2.3 stable, released on 2013/05/02
-================================================
-
-Issues addressed in this release
---------------------------------
-
-* LIBZMQ-526 Assertion failure "Invalid argument (tcp_connecter.cpp:285)"
-* LIBZMQ-446 Setting the DSCP bits by default causes CAP_NET_ADMIN error
-* LIBZMQ-496 Crash on heavy socket opening/closing: Device or resource busy (mutex.hpp:90)
-* LIBZMQ-462 test_connect_delay fails at test_connect_delay.cpp:80
-* LIBZMQ-497 Messages getting dropped
-* LIBZMQ-488 signaler.cpp leaks the win32 Event Handle
-* LIBZMQ-476 zmq_disconnect has no effect for inproc sockets
-* LIBZMQ-475 zmq_disconnect does not sent unsubscribe messages
-
-
-0MQ version 3.2.2 stable, released on 2012/11/23
-================================================
-
-Issues addressed in this release
---------------------------------
-
-* LIBZMQ-384 No meta data for ZMQ_EVENT_DISCONNECTED monitor event
-* LIBZMQ-414 Error in ARM/Thumb2 assembly (atomic_ptr.hpp)
-* LIBZMQ-417 zmq_assert (!incomplete_in) in session_base.cpp 228
-* LIBZMQ-447 socket_base_t::recv() packet loss and memory leak at high receiving rate
-* LIBZMQ-448 Builds fail on older versions of GCC
-* LIBZMQ-449 Builds fail on AIX
-* LIBZMQ-450 lt-test_monitor: fails with assertion at test_monitor.cpp:81
-* LIBZMQ-451 ZMQ_ROUTER_MANDATORY blocks forever
-* LIBZMQ-452 test_connect_delay.cpp:175:12: error: 'sleep' was not declared in this scope
-* LIBZMQ-458 lt-test_router_mandatory fails with assertion at test_router_mandatory.cpp:53
-* LIBZMQ-459 Assertion failed: encoder (stream_engine.cpp:266
-* LIBZMQ-464 PUB socket with HWM set leaks memory
-* LIBZMQ-465 PUB/SUB results in 80-90% of CPU load
-* LIBZMQ-468 ZMQ_XPUB_VERBOSE & unsubscribe
-* LIBZMQ-472 Segfault in zmq_poll in REQ to ROUTER dialog
-
-
-0MQ version 3.2.1 (RC2), released on 2012/10/15
-===============================================
-
-Issues addressed in this release
---------------------------------
-
-* Fixed issue xxx - handle insufficient resources on accept() properly.
-* Fixed issue 443 - added ZMQ_XPUB_VERBOSE setsocket option.
-* Fixed issue 433 - ZeroMQ died on receiving EPIPE
-* Fixed issue 423 - test_pair_tcp hangs
-* Fixed issue 416 - socket_base: fix 'va_list' has not been declared error
-* Fixed issue 409 - Pub-sub interoperability between 2.x and 3.x.
-* Fixed issue 404 - zmq_term can not safely be re-entered with pgm transport
-* Fixed issue 399 - zmq_ctx_set_monitor callback is not works properly
-* Fixed issue 393 - libzmq does not build on Android (socklen_t signed comparison)
-* Fixed issue 392 - Interaction with pyzmq on Android
-* Fixed issue 389 - Assertion failure in mtrie.cpp:317
-* Fixed issue 388 - tests/test_monitor.cpp has no newline at EOF (causes compile error)
-* Fixed issue 387 - "sa_family_t sa_family;" in pgm_socket.cpp is unused variable
-* Fixed issue 385 - Rework ZMQ_FAIL_UNROUTABLE socket option to actually work
-* Fixed issue 382 - Current libzmq doesn't compile on Android NDK
-* Fixed issue 377 - ZeroMQ will not build on Windows with OpenPGM
-* Fixed issue 375 - error: unused variable 'sa_family'
-* Fixed issue 373 - Unable to build libzmq/zeromq3.x on AIX7
-* Fixed issue 372 - Unable to build libzmq/zeromq3.x on HPUX 11iv3
-* Fixed issue 371 - Unable to build libzmq/zeromq3.x on RHEL5/SLES10
-* Fixed issue 329 - wsa_error_to_errno() calls abort() on WSAEACCES
-* Fixed issue 309 - Assertion failed: options.recv_identity (socket_base.cpp:864)
-* Fixed issue 211 - Assertion failed: msg_->flags & ZMQ_MSG_MORE (rep.cpp:81)
-
-API changes
------------
-
-* zmq_device () deprecated and replaced by zmq_proxy ().
-* zmq_ctx_set_monitor () replaced by zmq_socket_monitor ().
-* ZMQ_ROUTER_BEHAVIOR/ZMQ_FAIL_UNROUTABLE renamed experimentally to
-  ZMQ_ROUTER_MANDATORY.
-
-
-0MQ version 3.2.0 (RC1), released on 2012/06/05
-===============================================
-
-Bug fixes
----------
-
-* Fixed issue 264 - Potential bug with linger, messages dropped during
-  socket close.
-
-* Fixed issue 293 - libzmq doesn't follow the ZMTP/1.0 spec (did not
-  set reserved bits to 0).
-
-* Fixed issue 303 - Assertion failure in pgm_sender.cpp:102.
-
-* Fixed issue 320 - Assertion failure in connect_session.cpp:96 when
-  connecting epgm to an invalid endpoint.
-
-* Fixed issue 325 - Assertion failure in xrep.cpp:93, when two sockets
-  connect using the same identity.
-
-* Fixed issue 327 - Assertion failure in mtrie.cpp:246, when
-  unsubscribing from channel.
-
-* Fixed issue 346 - Assertion failure in signaler.cpp:155, when using a
-  closed socket.
-
-* Fixed issue 328 - unsubscribe wrongly clears multiple subscriptions.
-
-* Fixed issue 330 - IPC listener does not remove unix domain stream file
-  when terminated.
-
-* Fixed issue 334 - Memory leak in session_base.cpp:59.
-
-* Fixed issue 369 - ROUTER cannot close/reopen while DEALER connected.
-
-Operating systems
------------------
-
-* Fixed issue 301 - HPUX 11iv2 - build fails, CLOCK_MONOTONIC
-  undefined.
-
-* Fixed issue 324 - OS/X - build fails, ECANTROUTE undefined.
-
-* Fixed issue 368 - Solaris / Sun C++ - build fails, no insert method
-  in multimap classes.
-
-* Fixed issue 366 - Windows - ports not freed after crash.
-
-* Fixed issue 355 - Windows - build fails, MSVC solution file is out of
-  date.
-
-* Fixed issue 331 - FreeBSD 8 and 9 - getaddrinfo fails with
-  EAI_BADFLAGS on AI_V4MAPPED flag.
-
-* Fixed issue xxx - Added support for WinCE.
-
-Performance
------------
-
-* Fixed issue xxx - Implemented atomic operations for ARMv7a (runs 15-20% faster).
-
-API changes
------------
-
-* Fixed issue 337 - Cleaned-up context API:
-
-    zmq_ctx_new() - create new context (will deprecate zmq_init)
-    zmq_ctx_destroy() - destroy context (will deprecate zmq_term)
-    zmq_ctx_set() - set context property
-    zmq_ctx_get() - get context property
-
-* Fixed issue xxx - Cleaned-up message API:
-
-    zmq_msg_send() - send a message (will deprecate zmq_sendmsg)
-    zmq_msg_recv() - receive a message (will deprecate zmq_recvmsg)
-    zmq_msg_more() - indicate whether this is final part of message
-    zmq_msg_get() - get message property
-    zmq_msg_set() - set message property
-
-* Fixed issue xxx - Added context monitoring API:
-
-    zmq_ctx_set_monitor() - configure monitor callback.
-
-* Fixed issue xxx - Added unbind/disconnect API:
-
-    zmq_unbind() - unbind socket.
-    zmq_disconnect() - disconnect socket.
-
-* Fixed issue xxx - Added ZMQ_TCP_ACCEPT_FILTER setsockopt() for listening TCP sockets.
-
-* Fixed issue 336 - Removed sys: transport.
-
-* Fixed issue 333 - Added zmq_device function back to API (was removed
-  in 3.0).
-
-* Fixed issue 340 - Add support for MAX_SOCKETS to new context API.
-
-
-OMQ version 3.1.0 (beta), released on 2011/12/18
-================================================
-
-General information
--------------------
-
-Based on community consensus, the 0MQ 3.1.x release reverts a number of
-features introduced in version 3.0. The major reason for these changes is
-improving backward compatibility with 0MQ 2.1.x.
-
-Development of the 0MQ 3.0.x series will be discontinued, and users are
-encouraged to upgrade to 3.1.
-
-The 0MQ 3.1.x releases use ABI version 3.
-
-Reverted functionality
-----------------------
-
-The following functionality present in 0MQ 3.0 has been reverted:
-
-* Wire format changes. The 0MQ 3.1 wire format is identical to that of 0MQ
-  2.1.
-
-* LABELs and COMMANDs have been removed.
-
-* Explicit identies are re-introduced, however they can be used only for
-  explicit routing, not for durable sockets.
-
-* The ZMQ_ROUTER and ZMQ_DEALER socket types are once again aliases for
-  ZMQ_XREQ and ZMQ_XREP.
-
-New functionality
------------------
-
-* The zmq_getmsgopt() function has been introduced.
-
-* Experimental IPv6 support has been introduced. This is disabled by
-  default, see the zmq_setsockopt() documentation for enabling it.
-
-Other changes
--------------
-
-* The default HWM for all socket types has been set to 1000.
-
-* Many bug fixes.
-
-Building
---------
-
-* The dependency on libuuid has been removed.
-
-* Support for building on Android, and with MSVC 10 has been added.
-
-0MQ version 3.0.0 (alpha), released on 2011/07/12
-=================================================
-
-New functionality
------------------
-
-* A zmq_ctx_set_monitor() API to register a callback / event sink for changes
-  in socket state.
-
-* POSIX-compliant zmq_send and zmq_recv introduced (uses raw buffer
-  instead of message object).
-
-* ZMQ_MULTICAST_HOPS socket option added. Sets the appropriate field in
-  IP headers of PGM packets.
-
-* Subscription forwarding. Instead of filtering on consumer, the
-  subscription is moved as far as possible towards the publisher and
-  filtering is done there.
-
-* ZMQ_XPUB, ZMQ_XSUB introduced. Allow to create subscription-
-  forwarding-friendly intermediate devices.
-
-* Add sockopt ZMQ_RCVTIMEO/ZMQ_SNDTIMEO. Allow to set timeout for
-  blocking send/recv calls.
-
-* A new LABEL flag was added to the wire format. The flag distinguishes
-  message parts used by 0MQ (labels) from user payload message parts.
-
-* There is a new wire format for the REQ/REP pattern. First, the empty
-  bottom-of-the-stack message part is not needed any more, the LABEL
-  flag is used instead. Secondly, peer IDs are 32-bit integers rather
-  than 17-byte UUIDs.
-
-* The REQ socket now drops duplicate replies.
-
-* Outstanding requests & replies associated with a client are dropped
-  when the clients dies. This is a performance optimisation.
-
-* Introduced ZMQ_ROUTER and ZMQ_DEALER sockets. These mimic the
-  functionality of ZMQ_ROUTER and ZMQ_DEALER in 0MQ/2.1.x. Guarantees
-  backward compatibility for exsiting code.
-
-* Removed dependency on OS socketpair buffer size. No more asserts in
-  mailbox.cpp because of low system limit of sockepair buffer size.
-
-API improvements
-----------------
-
-* Obsolete constants ZMQ_UPSTREAM and ZMQ_DOWNSTREAM removed. Use
-  ZMQ_PUSH and ZMQ_PULL instead.
-
-* Timeout in zmq_poll is in milliseconds instead of microseconds. This
-  makes zmq_poll() compliant with POSIX poll()
-
-* ZMQ_MCAST_LOOP removed. There's no support for multicast over
-  loopback any more. Use IPC or TCP isntead.
-
-* zmq_send/zmq_recv was renamed zmq_sendmsg/zmq_recvmsg.
-
-* ZMQ_RECOVERY_IVL and ZMQ_RECOVERY_IVL_MSEC reconciled. The new option
-  is named ZMQ_RECOVERY_IVL and the unit is milliseconds.
-
-* Option types changed. Most of the numeric types are now represented
-  as 'int'.
-
-* ZMQ_HWM split into ZMQ_SNDHWM and ZMQ_RCVHWM. This makes it possible
-  to control message flow separately for each direction.
-
-* ZMQ_NOBLOCK renamed ZMQ_DONTWAIT. That makes it POSIX-compliant.
-
-Less is More
-------------
-
-* Pre-built devices and zmq_device() removed. Should be made available
-  as a separate project(s).
-
-* ZMQ_SWAP removed. Writing data to disk should be done on top of 0MQ,
-  on inside it.
-
-* C++ binding removed from the core. Now it's a separate project, same
-  as any other binding.
-
-Bug fixes
----------
-
-* Many.
-
-Building
---------
-
-* Make pkg-config dependency conditional.
-
-Distribution
-------------
-
-* Removed Debian packaging, which is now available at packages.debian.org
-  or via apt-get.
-
-
-0MQ version 2.2.0 (Stable), released on 2012/04/04
-==================================================
-
-Changes
--------
-
-* Fixed issue 349, add send/recv timeout socket options.
-
-Bug fixes
----------
-
-* Fixed issue 301, fix builds on HP-UX 11iv3 when using either gcc or aCC.
-
-* Fixed issue 305, memory leakage when using dynamic subscriptions.
-
-* Fixed issue 332, libzmq doesn't compile on Android NDK.
-
-* Fixed issue 293, libzmq doesn't follow ZMTP/1.0 spec.
-
-* Fixed issue 342, cannot build against zmq.hpp under C++11.
-
-
-0MQ version 2.1.11 (Stable), released on 2011/12/18
-===================================================
-
-Bug fixes
----------
-
-* Fixed issue 290, zmq_poll was using system time instead of monotonic
-  clock (Mika Fischer).
-
-* Fixed issue 281, crash on heavy socket creation - assertion failure in
-  mutex.hpp:91. (Mika Fischer).
-
-* Fixed issue 273, O_CLOEXEC flag used in ip.cpp:192 is supported only
-  on Linux kernels 2.6.27+
-
-* Fixed issue 261, assertion failure in kqueue.cpp:76.
-
-* Fixed issue 269, faulty diagnostic code in 2.1.10.
-
-* Fixed issue 254, assertion failure at tcp_socket.cpp:229 on ENOTCONN.
-
-Changes
--------
-
-* Now builds properly on AIX 6.1 (AJ Lewis).
-
-* Builds using libdcekt on HP-UX (AJ Lewis).
-
-* New upstream OpenPGM maintenance release 5.1.118.
-
-* Enabled debugging on assertion failure on Windows (Paul Betts).
-
-
-0MQ version 2.1.10 (Stable), released on 2011/10/03
-===================================================
-
-Bug fixes
----------
-
-* Fixed issue 140, SWAP failed with assertion failure in pipe.cpp:187
-  if the current directory was not writeable. Behavior now is to return
-  -1 at zmq_setsockopt in this situation.
-
-* Fixed issue 207, assertion failure in zmq_connecter.cpp:48, when an
-  invalid zmq_connect() string was used, or the hostname could not be
-  resolved. The zmq_connect() call now returns -1 in both those cases.
-
-* Fixed issue 218, sockets not opened with SOCK_CLOEXEC, causing fork/exec
-  to sit on sockets unnecessarily.
-
-* Fixed issue 250, build errors on Windows (Mikko Koppanen).
-
-* Fixed issue 252, assertion failure in req.cpp:87 and req.cpp:88 (Mikko
-  Koppanen).
-
-
-0MQ version 2.1.9 (Stable), released on 2011/08/29
-==================================================
-
-Bug fixes
----------
-
-* Fixed issue 240, assertion failure in pgm_socket.cpp:437.
-
-* Fixed issue 238, assertion failure in zmq.cpp:655, when zmq_poll is
-  used on an empty set, on Windows.
-
-* Fixed issue 239, assertion failure in zmq.cpp:223, when ZMQ_SWAP was
-  used with explicit identities and multiple SUB sockets.
-
-* Fixed issue 236, zmq_send() and zmq_recv() did not always return
-  error conditions such as EFSM properly. This bug was introduced in
-  version 2.1.8 by the backport of changes for issue 231.
-
-Building
---------
-
-* 0MQ support for Android added (Bill Roberts, Mikko Koppanen).
-
-
-0MQ version 2.1.8 (RC), released on 2011/07/28
-==============================================
-
-Bug fixes
----------
-
-* Fixed issue 223, assertion failure in tcp_connecter.cpp:300 when
-  connecting to a server that is on an unreachable network (errno is
-  equal to ENETUNREACH).
-
-* Fixed issue 228, assertion failure at rep.cpp:88 when HWM was reached.
-
-* Fixed issue 231, assertion failure at mailbox.cpp:183 when too many
-  pending socketpair operations were queued (major backport from 3.0).
-
-* Fixed issue 234, assertion failure at mailbox.cpp:77 when Ctrl-C was
-  used (only affected git master following backport for 231).
-
-* Fixed issue 230, SIGPIPE killing servers when client disconnected, hit
-  OS/X only.
-
-Note: this release was renamed "release candidate" due to issue 236,
-fixed in 2.1.9.
-
-
-0MQ version 2.1.7 (Stable), released on 2011/05/12
-==================================================
-
-Bug fixes
----------
-
-* Fixed issue 188, assert when closing socket that had unread multipart
-  data still on it (affected PULL, SUB, ROUTER, and DEALER sockets).
-
-* Fixed issue 191, message atomicity issue with PUB sockets (an old issue).
-
-* Fixed issue 199 (affected ROUTER/XREP sockets, an old issue).
-
-* Fixed issue 206, assertion failure in zmq.cpp:223, affected all sockets
-  (bug was introduced in 2.1.6 as part of message validity checking).
-
-* Fixed issue 211, REP socket asserted if sent malformed envelope (old issue
-  due to abuse of assertions for error checking).
-
-* Fixed issue 212, reconnect failing after resume from sleep on Windows
-  (due to not handling WSAENETDOWN).
-
-* Properly handle WSAENETUNREACH on Windows (e.g. if client connects
-  before server binds).
-
-* Fixed memory leak with threads on Windows.
-
-Changes
--------
-
-* Checks zmq_msg_t validity at each operation.
-
-* Inproc performance tests now work on Windows.
-
-* PGM wire format specification improved in zmq_pgm(7)
-
-* Added thread latency/throughput performance examples.
-
-* Added "--with-system-pgm" configure option to use already installed
-  OpenPGM.
-
-* Runtime checking of socket and context validity, to catch e.g. using a
-  socket after closing it, or passing an invalid pointer to context/socket
-  methods.
-
-* Test cases moved off port 5555, which conflicts with other services.
-
-* Clarified zmq_poll man page that the resolution of the timeout is 1msec.
-
-
-0MQ version 2.1.6 (Broken), released on 2011/04/26
-==================================================
-
-Note that this version contained a malformed patch and is not usable.
-It is not available for download, but is available in the git via the
-2.1.6 tag.
-
-0MQ version 2.1.5 (Broken), released on 2011/04/20
-==================================================
-
-Note that this version contained a malformed patch and is not usable.
-It is not available for download, but is available in the git via the
-2.1.5 tag.
-
-
-0MQ version 2.1.4 (Stable), released on 2011/03/30
-==================================================
-
-Bug fixes
----------
-
-* Fix to OpenPGM which was asserting on small messages (Steven McCoy).
-
-Changes
--------
-
-* Upgraded OpenPGM to version 5.1.115 (Pieter Hintjens).
-
-* OpenPGM build changed to not install OpenPGM artifacts.
-
-
-0MQ version 2.1.3 (Stable), released on 2011/03/21
-==================================================
-
-Bug fixes
----------
-
-* Fix to PUSH sockets, which would sometimes deliver tail frames of a
-  multipart message to new subscribers (Martin Sustrik).
-
-* Fix to PUB sockets, which would sometimes deliver tail frames of a
-  multipart message to new subscribers (Martin Sustrik).
-
-* Windows build was broken due to EPROTONOSUPPORT not being defined. This
-  has now been fixed (Martin Sustrik).
-
-* Various fixes to make OpenVMS port work (Brett Cameron).
-
-* Corrected Reference Manual to note that ZMQ_LINGER socket option may be
-  set at any time, not just before connecting/binding (Pieter Hintjens).
-
-* Fix to C++ binding to properly close sockets (Guido Goldstein).
-
-* Removed obsolete assert from pgm_socket.cpp (Martin Sustrik).
-
-Changes
--------
-
-* Removed stand-alone devices (/devices subdirectory) from distribution.
-  These undocumented programs remain available in older packages (Pieter
-  Hintjens).
-
-* OpenPGM default rate raised to 40mbps by default (Steven McCoy).
-
-* ZMQ_DEALER and ZMQ_ROUTER macros provided to ease upgrade to 0MQ/3.0.
-  These are scheduled to replace ZMQ_XREQ and ZMQ_XREP (Pieter Hintjens).
-
-* Added man page for zmq_device(3) which was hereto undocumented (Pieter
-  Hintjens).
-
-* Removed zmq_queue(3), zmq_forwarder(3), zmq_streamer(3) man pages
-  (Pieter Hintjens).
-
-OpenPGM Integration
--------------------
-
-* Upgraded OpenPGM to version 5.1.114 (Steven McCoy, Mikko Koppanen).
-
-* Build system now calls OpenPGM build process directly, allowing easier
-  future upgrades of OpenPGM (Mikko Koppanen).
-
-* Build system allows configuration with arbitrary versions of OpenPGM
-  (./configure --with-pgm=libpgm-x.y.z) (Mikko Koppanen).
-
-* OpenPGM uses new PGM_ODATA_MAX_RTE controlling original data instead of
-  PGM_TXW_MAX_RTE covering entire channel (Steven McCoy).
-
-Building
---------
-
-* 0MQ builds properly on FreeBSD (Mikko Koppanen).
-
-
-0MQ version 2.1.2 (rc2), released on 2011/03/06
-===============================================
-
-Bug fixes
----------
-
-* 0MQ now correctly handles durable inproc sockets; previously it ignored
-  explicit identities on inproc sockets.
-
-* Various memory leaks were fixed.
-
-* OpenPGM sender/receiver creation fixed.
-
-
-0MQ version 2.1.1 (rc1), released on 2011/02/23
-===============================================
-
-New functionality
------------------
-
-* New socket option ZMQ_RECONNECT_IVL_MAX added, allows for exponential
-  back-off strategy when reconnecting.
-
-* New socket option ZMQ_RECOVERY_IVL_MSEC added, as a fine-grained
-  counterpart to ZMQ_RECOVERY_IVL (for multicast transports).
-
-* If memory is exhausted, 0MQ warns with an explicit message before
-  aborting the process.
-
-* Size of inproc HWM and SWAP is sum of peers' HWMs and SWAPs (Douglas
-  Greager, Martin Sustrik).
-
-Bug fixes
----------
-
-* 0MQ no longer asserts in mailbox.cpp when multiple peers connect with
-  the same identity.
-
-* 0MQ no longer asserts when rejecting an oversized message.
-
-* 0MQ no longer asserts in pipe.cpp when the swap fills up.
-
-* zmq_poll now works correctly with an empty poll set.
-
-* Many more.
-
-Building
---------
-
-* 0MQ now builds correctly on CentOS, Debian 6, and SunOS/gcc3.
-
-* Added WithOpenPGM configuration into MSVC builds.
-
-Known issues
-------------
-
-* OpenPGM integration is still not fully stable.
-
-
-0MQ version 2.1.0 (Beta), released on 2010/12/01
-================================================
-
-New functionality
------------------
-
-* New semantics for zmq_close () and zmq_term () ensure that all messages
-  are sent before the application terminates. This behaviour may be
-  modified using the new ZMQ_LINGER socket option; for further details
-  refer to the reference manual.
-
-* The new socket options ZMQ_FD and ZMQ_EVENTS provide a way to integrate
-  0MQ sockets into existing poll/event loops.
-
-* Sockets may now be migrated between OS threads, as long as the
-  application ensures that a full memory barrier is issued.
-
-* The 0MQ ABI exported by libzmq.so has been formalised; DSO symbol
-  visibility is used on supported platforms to ensure that only public ABI
-  symbols are exported. The library ABI version has been set to 1.0.0 for
-  this release.
-
-* OpenPGM has been updated to version 5.0.92. This version no longer
-  depends on GLIB, and integration with 0MQ should be much improved.
-
-* zmq_poll() now honors timeouts precisely, and no longer returns if no
-  events are signaled.
-
-* Blocking calls now return EINTR if interrupted by the delivery of a
-  signal; this also means that language bindings which previously had
-  problems with handling SIGINT/^C should now work correctly.
-
-* The ZMQ_TYPE socket option was added; this allows retrieval of the socket
-  type after creation.
-
-* Added a ZMQ_VERSION macro to zmq.h for compile-time API version
-  detection.
-
-* The ZMQ_RECONNECT_IVL and ZMQ_BACKLOG socket options have been added.
-
-Bug fixes
----------
-
-* Forwarder and streamer devices now handle multi-part messages correctly.
-
-* 0MQ no longer asserts when malformed data is received on the wire.
-
-* 0MQ internal timers now work correctly if the TSC jumps backwards.
-
-* The internal signalling functionality (mailbox) has been improved
-  to automatically resize socket buffers on POSIX systems.
-
-* Many more.
-
-Building
---------
-
-* 0MQ now builds correctly with many more non-GCC compilers (Sun Studio,
-  Intel ICC, CLang).
-
-* AIX and HP-UX builds should work now.
-
-* FD_SETSIZE has been set to 1024 by default for MSVC builds.
-
-* Windows builds using GCC (MinGW) now work out of the box.
-
-Distribution
-------------
-
-* A simple framework for regression tests has been added, along with a few
-  basic self-tests. The tests can be run using "make check".
diff --git a/libs/libzmq/README.cygwin.md b/libs/libzmq/README.cygwin.md
deleted file mode 100755
index 64324ac..0000000
--- a/libs/libzmq/README.cygwin.md
+++ /dev/null
@@ -1,15 +0,0 @@
-libzmq-cygwin
-=============
-
-Definitive build fixes for cygwin  (See https://github.com/zeromq/pyzmq/issues/113 for partial solution)
-
-What's changed:
-  ./Makefile.am                       Add cygwin-specific target mostly the same as mingw
-  ./configure.ac                      Add cygwin-specific target mostly the same as mingw
-  ./tests/testutil.hpp                Lengthen socket timeout to 121 seconds
-  
-What's new:
-  ./README.cygwin.md                  This file
-  ./builds/cygwin                     Folder for cygwin-specific build files
-  ./builds/cygwin/Makefile.cygwin     Makefile for cygwin targets
-  
diff --git a/libs/libzmq/README.doxygen.md b/libs/libzmq/README.doxygen.md
deleted file mode 100644
index b3ca719..0000000
--- a/libs/libzmq/README.doxygen.md
+++ /dev/null
@@ -1,48 +0,0 @@
-## Overview
-
-The ZeroMQ lightweight messaging kernel is a library which extends the
-standard socket interfaces with features traditionally provided by
-specialised messaging middleware products. ZeroMQ sockets provide an
-abstraction of asynchronous message queues, multiple messaging patterns,
-message filtering (subscriptions), seamless access to multiple transport
-protocols and more.
-
-This documentation describes the internal software that makes up the
-ZeroMQ C++ core engine, and not how to use its API, however it may help
-you understand certain aspects better, such as the callgraph of an API method.
-There are no instructions on using ZeroMQ within this documentation, only
-the API internals that make up the software.
-
-**Note:** this documentation is generated directly from the source code with
-Doxygen. Since this project is constantly under active development, what you
-are about to read may be out of date! If you notice any errors in the
-documentation, or the code comments, then please send a pull request.
-
-Please refer to the README file for anything else.
-## Resources
-
-Extensive documentation is provided with the distribution. Refer to
-doc/zmq.html, or "man zmq" after you have installed libzmq on your system.
-
-* Website: http://www.zeromq.org/
-* Official API documentation: http://api.zeromq.org/
-
-Development mailing list: zeromq-dev@lists.zeromq.org
-
-Announcements mailing list: zeromq-announce@lists.zeromq.org
-
-Git repository: http://github.com/zeromq/libzmq
-
-ZeroMQ developers can also be found on the IRC channel \#zeromq, on the
-Freenode network (irc.freenode.net).
-
-## Copyright
-Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file.  
-The project license is specified in COPYING and COPYING.LESSER.
-
-The names "ØMQ", "ZeroMQ", "0MQ", and the ØMQ logo are registered trademarks
-of iMatix Corporation ("iMatix") and refers to either (a) the original libzmq
-C++ library, or (b) the community of projects hosted in the
-https://github.com/zeromq organization.
-
-This Doxygen configuration is adapted by Hiten Pandya, for the ZeroMQ project.
diff --git a/libs/libzmq/README.md b/libs/libzmq/README.md
deleted file mode 100644
index 8f56722..0000000
--- a/libs/libzmq/README.md
+++ /dev/null
@@ -1,218 +0,0 @@
-# ZeroMQ
-
-[![Build Status](https://github.com/zeromq/libzmq/actions/workflows/CI.yaml/badge.svg)](https://github.com/zeromq/libzmq/actions/workflows/CI.yaml)
-[![Build status](https://ci.appveyor.com/api/projects/status/e2ks424yrs1un3wt?svg=true)](https://ci.appveyor.com/project/zeromq/libzmq)
-[![Coverage Status](https://coveralls.io/repos/github/zeromq/libzmq/badge.svg?branch=master)](https://coveralls.io/github/zeromq/libzmq?branch=master)
-
-## Welcome
-
-The ZeroMQ lightweight messaging kernel is a library which extends the
-standard socket interfaces with features traditionally provided by
-specialised messaging middleware products. ZeroMQ sockets provide an
-abstraction of asynchronous message queues, multiple messaging patterns,
-message filtering (subscriptions), seamless access to multiple transport
-protocols and more.
-
-## Supported platforms <a name="#platforms"/>
-
-Libzmq is mainly written in C++98 with some optional C++11-fragments. For
-configuration either autotools or CMake is employed. See below for some lists
-of platforms, where libzmq has been successfully compiled on.
-
-### Supported platforms with primary CI
-
-| OS and version                         | Architecture            | Compiler and version          | Build system | Remarks                                                                                                                               |
-|----------------------------------------|-------------------------|-------------------------------|--------------|---------------------------------------------------------------------------------------------------------------------------------------|
-| Android NDK r24                        | arm, arm64, x86, x86_64 | llvm (see NDK)                | autotools    | DRAFT                                                                                                                                       |
-| Ubuntu 14.04.5 LTS (trusty)            | amd64                   | clang 5.0.0                   | autotools    | STABLE, extras: GSSAPI, PGM, NORM, C++98 mode only                                                                                    |
-| Ubuntu 14.04.5 LTS (trusty)            | amd64                   | gcc 4.8.4                     | autotools    | STABLE, DRAFT, extras: GSSAPI, PGM, NORM, TIPC, IPV6, also POLLER=poll, POLLER=select, also valgrind and address sanitizer executions |
-| Ubuntu 14.04.5 LTS (trusty)            | amd64                   | gcc 4.8.4                     | CMake 3.12.2 | STABLE                                                                                                                                |
-| Windows Server 2012 R2                 | x86                     | Visual Studio 2008            | CMake 3.12.2 | DRAFT                                                                                                                                 |
-| Windows Server 2012 R2                 | x86                     | Visual Studio 2010 SP1        | CMake 3.12.2 | DRAFT                                                                                                                                 |
-| Windows Server 2012 R2                 | x86                     | Visual Studio 2012 Update 5   | CMake 3.12.2 | DRAFT                                                                                                                                 |
-| Windows Server 2012 R2                 | x86, amd64              | Visual Studio 2013 Update 5   | CMake 3.12.2 | DRAFT, STABLE (x86 Release only), also POLLER=epoll                                                                                   |
-| Windows Server 2012 R2                 | x86                     | Visual Studio 2015 Update 3   | CMake 3.12.2 | DRAFT                                                                                                                                 |
-| Windows Server 2016                    | x86                     | Visual Studio 2017 15.9.6     | CMake 3.13.3 | DRAFT                                                                                                                                 |
-| cygwin 3.0.0 on Windows Server 2012 R2 | amd64                   | gcc 7.4.0                     | CMake 3.6.2  | DRAFT                                                                                                                                 |
-| MSYS2 ? on Windows Server 2012 R2      | amd64                   | gcc 6.4.0                     | CMake ?      | DRAFT                                                                                                                                 |
-| Mac OS X 10.13                         | amd64                   | Xcode 9.4.1, Apple LLVM 9.1.0 | autotools    | STABLE, DRAFT                                                                                                                         |
-| Mac OS X 10.13                         | amd64                   | Xcode 9.4.1, Apple LLVM 9.1.0 | CMake 3.11.4 | DRAFT                                                                                                                                 |
-
-Note: the platforms are regularly updated by the service providers, so this information might get out of date
-without any changes on the side of libzmq. For Appveyor, refer to https://www.appveyor.com/updates/ regarding
-platform updates. For travis-ci, refer to https://changelog.travis-ci.com/ regarding platform updates.
-
-### Supported platforms with secondary CI
-
-| OS and version               | Architecture               | Compiler and version | Build system | Remarks |
-|------------------------------|----------------------------|----------------------|--------------|---------|
-| CentOS 6                     | x86, amd64                 | ?                    | autotools    |         |
-| CentOS 7                     | amd64                      | ?                    | autotools    |         |
-| Debian 8.0                   | x86, amd64                 | ?                    | autotools    |         |
-| Debian 9.0                   | ARM64, x86, amd64          | ?                    | autotools    |         |
-| Fedora 28                    | ARM64, ARM32, amd64        | ?                    | autotools    |         |
-| Fedora 29                    | ARM64, ARM32, amd64        | ?                    | autotools    |         |
-| Fedora Rawhide               | ARM64, ARM32, amd64        | ?                    | autotools    |         |
-| RedHat Enterprise Linux 7    | amd64, ppc64               | ?                    | autotools    |         |
-| SuSE Linux Enterprise 12 SP4 | ARM64, amd64, ppc64, s390x | ?                    | autotools    |         |
-| SuSE Linux Enterprise 15     | amd64                      | ?                    | autotools    |         |
-| xUbuntu 12.04                | x86, amd64                 | ?                    | autotools    |         |
-| xUbuntu 14.04                | x86, amd64                 | ?                    | autotools    |         |
-| xUbuntu 16.04                | x86, amd64                 | ?                    | autotools    |         |
-| xUbuntu 18.04                | x86, amd64                 | ?                    | autotools    |         |
-| xUbuntu 18.10                | x86, amd64                 | ?                    | autotools    |         |
-
-### Supported platforms with known active users
-
-At the time of writing, no explicit reports have been available. Please report your experiences by opening a PR
-adding an entry or moving an entry from the section below.
-
-Under "last report", please name either the SHA1 in case of an unreleased version, or the version number in
-case of a released version.
-
-| OS and version | Architecture      | Compiler and version | Build system | Last report             | Remarks |
-|----------------|-------------------|----------------------|--------------|-------------------------|---------|
-| Solaris 10     | x86, amd64, sparc | GCC 8.1.0            | CMake        | 2019/03/18              |         |
-| DragonFly BSD  | amd64             | gcc 8.3              | autotools    | 2018/08/07 git-72854e63 |         |
-| IBM i          | ppc64             | gcc 6.3              | autotools    | 2019/10/02 git-25320a3  |         |
-| QNX 7.0        | x86_64            | gcc 5.4.0            | CMake        | 4.3.2                   |         |
-| Windows 10     | ARM64             | Visual Studio 2019   | CMake        | 2021/11/15 git-2375ca8b |         |
-| Windows 10     | ARM64             | clang                | CMake        | 2021/11/15 git-2375ca8b |         |
-
-### Supported platforms without known active users
-
-Note: this list is incomplete and inaccurate and still needs some work.
-
-| OS and version         | Architecture | Compiler and version     | Build system     | Remarks |
-|------------------------|--------------|--------------------------|------------------|---------|
-| Any Linux distribution | x86, amd64   | gcc ?+, clang ?+, icc ?+ | autotools, CMake |         |
-| SunOS, Solaris         | x86, amd64   | SunPro                   | autotools, CMake |         |
-| GNU/kFreeBSD           | ?            | ?                        | autotools, CMake |         |
-| FreeBSD                | ?            | ?                        | autotools, CMake |         |
-| NetBSD                 | ?            | ?                        | autotools, CMake |         |
-| OpenBSD                | ?            | ?                        | autotools, CMake |         |
-| DragonFly BSD          | amd64        | gcc 8.3                  | autotools, CMake |         |
-| HP-UX                  | ?            | ?                        | autotools, CMake |         |
-| GNU/Hurd               | ?            | ?                        | autotools        |         |
-| VxWorks 6.8            | ?            | ?                        | ?                |         |
-| Windows CE             | ?            | ?                        | ?                |         |
-| Windows UWP            | ?            | ?                        | ?                |         |
-| OpenVMS                | ?            | ?                        | ?                |         |
-
-### Unsupported platforms
-
-| OS and version | Architecture | Compiler and version | Remarks                                                                 |
-|----------------|--------------|----------------------|-------------------------------------------------------------------------|
-| QNX 6.3        | ?            | gcc 3.3.5            | see #3371, support was added by a user, but not contributed to upstream |
-
-For more details, see [here](SupportedPlatforms.md).
-
-For some platforms (Linux, Mac OS X), [prebuilt binary packages are supplied by the ZeroMQ organization](#installation).
-For other platforms, you need to [build your own binaries](#build).
-
-## Installation of binary packages <a name="installation"/>
-
-### Linux
-
-For Linux users, pre-built binary packages are available for most distributions.
-Note that DRAFT APIs can change at any time without warning, pick a STABLE build to
-avoid having them enabled.
-
-#### Latest releases
-
-##### DEB
-
-[![OBS release stable](https://img.shields.io/badge/OBS%20master-stable-yellow.svg)](http://software.opensuse.org/download.html?project=network%3Amessaging%3Azeromq%3Arelease-stable&package=libzmq3-dev)
-[![OBS release draft](https://img.shields.io/badge/OBS%20master-draft-yellow.svg)](http://software.opensuse.org/download.html?project=network%3Amessaging%3Azeromq%3Arelease-draft&package=libzmq3-dev)
-
-##### RPM
-
-[![OBS release stable](https://img.shields.io/badge/OBS%20master-stable-yellow.svg)](http://software.opensuse.org/download.html?project=network%3Amessaging%3Azeromq%3Arelease-stable&package=zeromq-devel)
-[![OBS release draft](https://img.shields.io/badge/OBS%20master-draft-yellow.svg)](http://software.opensuse.org/download.html?project=network%3Amessaging%3Azeromq%3Arelease-draft&package=zeromq-devel)
-
-#### Bleeding edge packages
-
-##### DEB
-
-[![OBS release stable](https://img.shields.io/badge/OBS%20master-stable-yellow.svg)](http://software.opensuse.org/download.html?project=network%3Amessaging%3Azeromq%3Agit-stable&package=libzmq3-dev)
-[![OBS release draft](https://img.shields.io/badge/OBS%20master-draft-yellow.svg)](http://software.opensuse.org/download.html?project=network%3Amessaging%3Azeromq%3Agit-draft&package=libzmq3-dev)
-
-##### RPM
-
-[![OBS release stable](https://img.shields.io/badge/OBS%20master-stable-yellow.svg)](http://software.opensuse.org/download.html?project=network%3Amessaging%3Azeromq%3Agit-stable&package=zeromq-devel)
-[![OBS release draft](https://img.shields.io/badge/OBS%20master-draft-yellow.svg)](http://software.opensuse.org/download.html?project=network%3Amessaging%3Azeromq%3Agit-draft&package=zeromq-devel)
-
-#### Example: Debian 9 latest release, no DRAFT apis
-
-    echo "deb http://download.opensuse.org/repositories/network:/messaging:/zeromq:/release-stable/Debian_9.0/ ./" >> /etc/apt/sources.list
-    wget https://download.opensuse.org/repositories/network:/messaging:/zeromq:/release-stable/Debian_9.0/Release.key -O- | sudo apt-key add
-    apt-get install libzmq3-dev
-
-### OSX
-
-For OSX users, packages are available via brew.
-
-    brew install zeromq
-
-## Installation of package manager <a name="package manager"/>
-
-### vcpkg
-
-vcpkg is a full platform package manager, you can easily install libzmq via vcpkg.
-
-    git clone https://github.com/microsoft/vcpkg.git
-    ./bootstrap-vcpkg.bat # For powershell
-    ./bootstrap-vcpkg.sh # For bash
-    ./vcpkg install zeromq
-
-## Build from sources <a name="build"/>
-
-To build from sources, see the INSTALL file included with the distribution.
-
-### Android
-
-To build from source, see [README](./builds/android/README.md) file in the
-android build directory.
-
-## Resources
-
-Extensive documentation is provided with the distribution. Refer to
-doc/zmq.html, or "man zmq" after you have installed libzmq on your system.
-
-Website: http://www.zeromq.org/
-
-Development mailing list: zeromq-dev@lists.zeromq.org
-Announcements mailing list: zeromq-announce@lists.zeromq.org
-
-Git repository: http://github.com/zeromq/libzmq
-
-ZeroMQ developers can also be found on the IRC channel #zeromq, on the
-Libera Chat network (irc.libera.chat).
-
-## License
-
-The project license is specified in COPYING and COPYING.LESSER.
-
-libzmq is free software; you can redistribute it and/or modify it under
-the terms of the GNU Lesser General Public License (LGPL) as published
-by the Free Software Foundation; either version 3 of the License, or
-(at your option) any later version.
-
-As a special exception, the Contributors give you permission to link
-this library with independent modules to produce an executable,
-regardless of the license terms of these independent modules, and to
-copy and distribute the resulting executable under terms of your choice,
-provided that you also meet, for each linked independent module, the
-terms and conditions of the license of that module. An independent
-module is a module which is not derived from or based on this library.
-If you modify this library, you must extend this exception to your
-version of the library.
-
-libzmq is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-License for more details.
-
-## Contributing
-
-This project uses [C4(Collective Code Construction Contract)](https://rfc.zeromq.org/spec:42/C4/) process for contributions.
diff --git a/libs/libzmq/RELICENSE/AnCaPepe.md b/libs/libzmq/RELICENSE/AnCaPepe.md
deleted file mode 100644
index 15ec545..0000000
--- a/libs/libzmq/RELICENSE/AnCaPepe.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Leonardo J. Consoni
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "AnCaPepe", with
-commit author "Leonardo José Consoni <consoni_2519@hotmail.com>", are copyright of Leonardo J. Consoni.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Leonardo José Consoni 
-2017/03/19
diff --git a/libs/libzmq/RELICENSE/AndreLouisCaron.md b/libs/libzmq/RELICENSE/AndreLouisCaron.md
deleted file mode 100644
index 4acd6b8..0000000
--- a/libs/libzmq/RELICENSE/AndreLouisCaron.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Andre Caron
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "AndreLouisCaron", with
-commit author "Andre Caron <andre.l.caron@gmail.com>", are copyright of Andre Caron.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Andre Caron
-2017/03/19
diff --git a/libs/libzmq/RELICENSE/Asmod4n.md b/libs/libzmq/RELICENSE/Asmod4n.md
deleted file mode 100644
index ad47282..0000000
--- a/libs/libzmq/RELICENSE/Asmod4n.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Hendrik Beskow
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "Asmod4n", with
-commit author "Asmod4n Asmod4n@users.noreply.github.com", are copyright of Hendrik Beskow.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Hendrik Beskow
-2017/04/21
diff --git a/libs/libzmq/RELICENSE/AxelNennker.md b/libs/libzmq/RELICENSE/AxelNennker.md
deleted file mode 100644
index 9bd6bec..0000000
--- a/libs/libzmq/RELICENSE/AxelNennker.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Axel Nennker that grants permission to
-relicense its copyrights in the libzmq C++ library (ZeroMQ) under the
-Mozilla Public License v2 (MPLv2) or any other Open Source Initiative
-approved license chosen by the current ZeroMQ BDFL (Benevolent
-Dictator for Life).
-
-A portion of the commits made by the Github handle "AxelNennker", with
-commit author "Axel Nennker <axel@nennker.de>", are
-copyright of Axel Nennker.  This document hereby grants the libzmq
-project team to relicense libzmq, including all past, present and
-future contributions of the author listed above.
-
-Axel Nennker
-2019/08/11
diff --git a/libs/libzmq/RELICENSE/Bklyn.md b/libs/libzmq/RELICENSE/Bklyn.md
deleted file mode 100644
index 905db56..0000000
--- a/libs/libzmq/RELICENSE/Bklyn.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Caleb Epstein
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "Bklyn", with
-commit author "Caleb Epstein <cae@bklyn.org>", are copyright of Caleb Epstein.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Caleb Epstein
-2017/03/21
diff --git a/libs/libzmq/RELICENSE/Botje.md b/libs/libzmq/RELICENSE/Botje.md
deleted file mode 100644
index 7fc9617..0000000
--- a/libs/libzmq/RELICENSE/Botje.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Dries Harnie
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "Botje", with
-commit author "Dries Harnie <dries@harnie.be>", are copyright of Dries Harnie.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Dries Harnie
-2019/10/31
diff --git a/libs/libzmq/RELICENSE/C-Sir.md b/libs/libzmq/RELICENSE/C-Sir.md
deleted file mode 100644
index 9c41edd..0000000
--- a/libs/libzmq/RELICENSE/C-Sir.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by C-Sir
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "C-Sir", with
-commit author "C-Sir <942510829@qq.com>", are copyright of C-Sir.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-C-Sir
-2020/09/28
diff --git a/libs/libzmq/RELICENSE/CommanderBubble.md b/libs/libzmq/RELICENSE/CommanderBubble.md
deleted file mode 100644
index cb36a60..0000000
--- a/libs/libzmq/RELICENSE/CommanderBubble.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Michael Lloyd
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "CommanderBubble", with
-commit author "Michael Lloyd <commander.bubble@gmail.com>", are copyright of Michael Lloyd.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Michael Lloyd
-2019/02/23
diff --git a/libs/libzmq/RELICENSE/Cziken.md b/libs/libzmq/RELICENSE/Cziken.md
deleted file mode 100644
index 85a02be..0000000
--- a/libs/libzmq/RELICENSE/Cziken.md
+++ /dev/null
@@ -1,7 +0,0 @@
-Permission to Relicense under MPLv2
-
-This is a statement by Wojciech Kula that grants permission to relicense its copyrights in the libzmq C++ library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "Cziken", with commit author "Cziken wojciech_kula@o2.pl", are copyright of Wojciech Kula. This document hereby grants the libzmq project team to relicense libzmq, including all past, present and future contributions of the author listed above.
-
-Wojciech Kula 2021/01/13
diff --git a/libs/libzmq/RELICENSE/DaiyuHurst.md b/libs/libzmq/RELICENSE/DaiyuHurst.md
deleted file mode 100644
index 812aea7..0000000
--- a/libs/libzmq/RELICENSE/DaiyuHurst.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Daiyu Hurst that grants permission to
-relicense its copyrights in the libzmq C++ library (ZeroMQ) under the
-Mozilla Public License v2 (MPLv2) or any other Open Source Initiative
-approved license chosen by the current ZeroMQ BDFL (Benevolent
-Dictator for Life).
-
-A portion of the commits made by the Github handle "daiyuhurst", with
-commit author "Daiyu Hurst <daiyu.hurst@gmail.com>", are
-copyright of Daiyu Hurst.  This document hereby grants the libzmq
-project team to relicense libzmq, including all past, present and
-future contributions of the author listed above.
-
-Daiyu Hurst
-2019/08/31
diff --git a/libs/libzmq/RELICENSE/Eelis.md b/libs/libzmq/RELICENSE/Eelis.md
deleted file mode 100644
index f5b9670..0000000
--- a/libs/libzmq/RELICENSE/Eelis.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Eelis van der Weegen that grants permission to
-relicense its copyrights in the libzmq C++ library (ZeroMQ) under the
-Mozilla Public License v2 (MPLv2) or any other Open Source Initiative
-approved license chosen by the current ZeroMQ BDFL (Benevolent
-Dictator for Life).
-
-A portion of the commits made by the Github handle "Eelis", with
-commit author "Eelis van der Weegen <eelis@eelis.net>", are
-copyright of Eelis van der Weegen.  This document hereby grants the libzmq
-project team to relicense libzmq, including all past, present and
-future contributions of the author listed above.
-
-Eelis van der Weegen
-2019/02/22
diff --git a/libs/libzmq/RELICENSE/FrancoFichtner.md b/libs/libzmq/RELICENSE/FrancoFichtner.md
deleted file mode 100644
index 41f9d25..0000000
--- a/libs/libzmq/RELICENSE/FrancoFichtner.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Franco Fichtner that grants permission to relicense
-its copyrights in the libzmq C++ library (ZeroMQ) under the Mozilla Public
-License v2 (MPLv2) or any other Open Source Initiative approved license
-chosen by the current ZeroMQ BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "fichtner", with
-commit author "Franco Fichtner <franco@lastsummer.de>", are copyright
-of Franco Fichtner.  This document hereby grants the libzmq project
-team to relicense libzmq, including all past, present and future
-contributions of the author listed above.
-
-Franco Fichtner
-2017/03/21
diff --git a/libs/libzmq/RELICENSE/FredTreg.md b/libs/libzmq/RELICENSE/FredTreg.md
deleted file mode 100644
index 5c1bf87..0000000
--- a/libs/libzmq/RELICENSE/FredTreg.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Frédéric Trégon
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "FredTreg", with
-commit author "Frederic Tregon <frederic.tregon@gmail.com>", are copyright of Frédéric Trégon.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Frédéric Trégon
-2020/02/03
diff --git a/libs/libzmq/RELICENSE/Hugne.md b/libs/libzmq/RELICENSE/Hugne.md
deleted file mode 100644
index 6a1288d..0000000
--- a/libs/libzmq/RELICENSE/Hugne.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Erik Hugne
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other
-Open Source Initiative approved license chosen by the current ZeroMQ
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "Hugne", with
-commit author "erik.hugne@gmail.com", are copyright of Erik Hugne.
-Commits made by author "erik.hugne@ericsson.com" are NOT covered by this
-statement.
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed above.
-
-Erik Hugne
-2017/03/22
diff --git a/libs/libzmq/RELICENSE/Jasper-Bekkers.md b/libs/libzmq/RELICENSE/Jasper-Bekkers.md
deleted file mode 100644
index 1688ec6..0000000
--- a/libs/libzmq/RELICENSE/Jasper-Bekkers.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by the Netherlands eScience Center
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "Jasper-Bekkers", with
-commit author "Jasper Bekkers bekkers@gmail.com", are copyright of Traverse Research BV.
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed above.
-
-Jasper Bekkers <bekkers@gmail.com
-2022/02/08
diff --git a/libs/libzmq/RELICENSE/JohanMabille.md b/libs/libzmq/RELICENSE/JohanMabille.md
deleted file mode 100644
index bbcc277..0000000
--- a/libs/libzmq/RELICENSE/JohanMabille.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Johan Mabille
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "JohanMabille", with
-commit author "Johan Mabille johan.mabille@gmail.com", are copyright of Johan Mabille.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Johan Mabille  
-2017/03/20
-
diff --git a/libs/libzmq/RELICENSE/JonDyte.md b/libs/libzmq/RELICENSE/JonDyte.md
deleted file mode 100644
index 9b9b50b..0000000
--- a/libs/libzmq/RELICENSE/JonDyte.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Jon Dyte
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "JonDyte", with
-commit author "Jon Dyte <jon@totient.co.uk>", are copyright of Jon Dyte.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Jon Dyte
-2019/10/03
diff --git a/libs/libzmq/RELICENSE/KLNikita.md b/libs/libzmq/RELICENSE/KLNikita.md
deleted file mode 100644
index edaecf6..0000000
--- a/libs/libzmq/RELICENSE/KLNikita.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Nikita Kozlov
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "KLNikita", with
-commit author "nikita kozlov <nikita@elyzion.net>", are copyright of Nikita Kozlov .
-This document hereby grants the libzmq project team to relicense
-libzmq,
-including all past, present and future contributions of the author
-listed above.
-
-Nikita Kozlov
-6 February 2020
diff --git a/libs/libzmq/RELICENSE/MartinGrigorov.md b/libs/libzmq/RELICENSE/MartinGrigorov.md
deleted file mode 100644
index d65195f..0000000
--- a/libs/libzmq/RELICENSE/MartinGrigorov.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Martin Grigorov
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "martin-g", with
-commit author "Martin Grigorov", are copyright of Martin Grigorov.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Martin Grigorov
-2021/01/11
\ No newline at end of file
diff --git a/libs/libzmq/RELICENSE/NLeScienceCenter.md b/libs/libzmq/RELICENSE/NLeScienceCenter.md
deleted file mode 100644
index 7623c1c..0000000
--- a/libs/libzmq/RELICENSE/NLeScienceCenter.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by the Netherlands eScience Center
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "egpbos", with
-commit author "E. G. Patrick Bos p.bos@esciencecenter.nl", are copyright of the Netherlands eScience Center.
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed above.
-
-Rob van Nieuwpoort <R.vanNieuwpoort@esciencecenter.nl>
-2021/06/15
diff --git a/libs/libzmq/RELICENSE/Neopallium.md b/libs/libzmq/RELICENSE/Neopallium.md
deleted file mode 100644
index 628a64f..0000000
--- a/libs/libzmq/RELICENSE/Neopallium.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Robert G. Jakabosky
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "Neopallium", with
-commit author "Robert G. Jakabosky <bobby@sharedrealm.com>", are copyright of Robert G. Jakabosky.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Robert Gabriel Jakabosky
-2019/08/17
diff --git a/libs/libzmq/RELICENSE/PaulThiele.md b/libs/libzmq/RELICENSE/PaulThiele.md
deleted file mode 100644
index 1042c58..0000000
--- a/libs/libzmq/RELICENSE/PaulThiele.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Paul Thiele that grants permission to
-relicense its copyrights in the libzmq C++ library (ZeroMQ) under the
-Mozilla Public License v2 (MPLv2) or any other Open Source Initiative
-approved license chosen by the current ZeroMQ BDFL (Benevolent
-Dictator for Life).
-
-A portion of the commits made by the Github handle "thielepaul", with
-commit author "Paul Thiele <thielepaul@gmail.com>", are
-copyright of Paul Thiele.  This document hereby grants the libzmq
-project team to relicense libzmq, including all past, present and
-future contributions of the author listed above.
-
-Paul Thiele
-2021/11/04
diff --git a/libs/libzmq/RELICENSE/Quuxplusone.md b/libs/libzmq/RELICENSE/Quuxplusone.md
deleted file mode 100644
index 0420a61..0000000
--- a/libs/libzmq/RELICENSE/Quuxplusone.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Arthur O'Dwyer
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "Quuxplusone", with
-commit author "Arthur O'Dwyer <arthur@push.am>", are copyright of Arthur O'Dwyer.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Arthur O'Dwyer  
-2019/02/17
diff --git a/libs/libzmq/RELICENSE/README.md b/libs/libzmq/RELICENSE/README.md
deleted file mode 100644
index bdb32c3..0000000
--- a/libs/libzmq/RELICENSE/README.md
+++ /dev/null
@@ -1,23 +0,0 @@
-# Permission to Relicense under MPLV2
-
-This directory collects grants from individuals and firms that hold
-copyrights in ZeroMQ to permit licensing the ZeroMQ code under
-the [Mozilla Public License, version
-2](https://www.mozilla.org/en-US/MPL/2.0/).  See [GitHub Pull
-Request #1917](https://github.com/zeromq/libzmq/pull/1917),
-the [0MQ Licensing Page](http://zeromq.org/area:licensing) and
-[original iMatix zeromq-dev license
-grant](http://lists.zeromq.org/pipermail/zeromq-dev/2016-April/030288.html)
-for some background information.
-
-Please create a separate file in this directory for each individual
-or firm holding copyright in ZeroMQ, named after the individual or
-firm holding the copyright.
-
-Each patch must be made with a GitHub handle that is clearly
-associated with the copyright owner, to guarantee the identity of
-the signatory.  Please avoid changing the files created by other
-individuals or firms granting a copyright license over their
-copyrights (if rewording is required contact them and ask them to
-submit an updated version).  This makes it easier to verify that
-the license grant was made by an authorized GitHub account.
diff --git a/libs/libzmq/RELICENSE/RPGillespie6.md b/libs/libzmq/RELICENSE/RPGillespie6.md
deleted file mode 100644
index 596c544..0000000
--- a/libs/libzmq/RELICENSE/RPGillespie6.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Bryan Gillespie (RPGillespie6)
-that grants permission to relicense his copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other
-Open Source Initiative approved license chosen by the current ZeroMQ
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "RPGillespie6", with
-commit author "Bryan Gillespie <rpgillespie6@gmail.com>", are copyright of Bryan Gillespie.
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed
-above.
-
-Bryan Gillespie
-2019/09/06
diff --git a/libs/libzmq/RELICENSE/Ricardicus.md b/libs/libzmq/RELICENSE/Ricardicus.md
deleted file mode 100644
index c052a87..0000000
--- a/libs/libzmq/RELICENSE/Ricardicus.md
+++ /dev/null
@@ -1,6 +0,0 @@
-Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-This is a statement by Rickard Hallerbäck that grants permission to relicense its copyrights in the libzmq C++ library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other Open Source Initiative approved license chosen by the current ZeroMQ BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "Ricardicus", with commit author "Rickard Hallerbäck", are copyright of Rickard Hallerbäck. This document hereby grants the libzmq project team to relicense libzmq, including all past, present and future contributions of the author listed above.
-
-Rickard Hallerbäck 2020/02/28
\ No newline at end of file
diff --git a/libs/libzmq/RELICENSE/SRombauts.md b/libs/libzmq/RELICENSE/SRombauts.md
deleted file mode 100644
index 381e43b..0000000
--- a/libs/libzmq/RELICENSE/SRombauts.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Sébastien Rombauts
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other
-Open Source Initiative approved license chosen by the current ZeroMQ
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "SRombauts", with
-commit author "Sébastien Rombauts", are copyright of Sébastien Rombauts.
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed above.
-
-Sébastien Rombauts
-2017/03/21
\ No newline at end of file
diff --git a/libs/libzmq/RELICENSE/SergheiNovac.md b/libs/libzmq/RELICENSE/SergheiNovac.md
deleted file mode 100644
index 14bd759..0000000
--- a/libs/libzmq/RELICENSE/SergheiNovac.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Serghei Novac
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "carbofos", with
-commit author "Serghei Novac <serghei.novac@epydoc.com>", are copyright of Serghei Novac.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Serghei Novac
-2019/03/05
diff --git a/libs/libzmq/RELICENSE/StephaneVales.md b/libs/libzmq/RELICENSE/StephaneVales.md
deleted file mode 100644
index 3ebcc78..0000000
--- a/libs/libzmq/RELICENSE/StephaneVales.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Stephane Vales
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "StephaneVales", with
-commit author "Stephane Vales <7755128+stvales@users.noreply.github.com>", are copyright of Stephane Vales.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Stephane Vales
-2020/08/06
diff --git a/libs/libzmq/RELICENSE/SylvainCorlay.md b/libs/libzmq/RELICENSE/SylvainCorlay.md
deleted file mode 100644
index af2bb44..0000000
--- a/libs/libzmq/RELICENSE/SylvainCorlay.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Sylvain Corlay
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "SylvainCorlay", with
-commit author "Sylvain Corlay sylvain.corlay@gmail.com", are copyright of Sylvain Corlay .
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Sylvain Corlay
-2017/03/20
-
diff --git a/libs/libzmq/RELICENSE/TTimo.md b/libs/libzmq/RELICENSE/TTimo.md
deleted file mode 100644
index 8c2b03f..0000000
--- a/libs/libzmq/RELICENSE/TTimo.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Timothee Besset
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "TTimo", with
-commit author "Timothee Besset <ttimo@ttimo.net>", are copyright of Timothee Besset.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Timothee Besset
-2017/03/19
diff --git a/libs/libzmq/RELICENSE/ThePrez.md b/libs/libzmq/RELICENSE/ThePrez.md
deleted file mode 100644
index ae4b9eb..0000000
--- a/libs/libzmq/RELICENSE/ThePrez.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Jesse Gorzinski
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "ThePrez", with
-commit author "ThePrez &lt;jgorzinski@gmail.com&gt;", are copyright of Jesse Gorzinski.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Jesse Gorzinski
-2019/10/02
diff --git a/libs/libzmq/RELICENSE/TobiSchluter.md b/libs/libzmq/RELICENSE/TobiSchluter.md
deleted file mode 100644
index 9b90192..0000000
--- a/libs/libzmq/RELICENSE/TobiSchluter.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Tobias Schlüter
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "TobiSchluter", with
-commit author "TobiSchluter", are copyright of Tobias Schlüter .
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Tobias Schlüter
-2019/09/13
diff --git a/libs/libzmq/RELICENSE/WenbinHou.md b/libs/libzmq/RELICENSE/WenbinHou.md
deleted file mode 100644
index 0b6c967..0000000
--- a/libs/libzmq/RELICENSE/WenbinHou.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Wenbin Hou
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "WenbinHou", with
-commit author "Wenbin Hou <houwenbin@pku.edu.cn>", are copyright of Wenbin Hou.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Wenbin Hou
-2018/05/16
diff --git a/libs/libzmq/RELICENSE/a4z.md b/libs/libzmq/RELICENSE/a4z.md
deleted file mode 100644
index 248415b..0000000
--- a/libs/libzmq/RELICENSE/a4z.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Harald Achitz
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "a4z", with
-commit author "Harald Achitz <harald.achitz@gmail.com>" or 
-"Harald Achitz <harald.achitz@tritech.se>" or 
-"Harald Achitz <harald.achitz@getinge.com>", are copyright of Harald Achitz.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Harald Achitz
-2017/03/21
diff --git a/libs/libzmq/RELICENSE/abaelhe b/libs/libzmq/RELICENSE/abaelhe
deleted file mode 100644
index 452a50d..0000000
--- a/libs/libzmq/RELICENSE/abaelhe
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Yijun He
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "abaelhe", with
-commit author "Yijun He <abaelhe@icloud.com>", are copyright of Yijun He.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Yijun He
-2022/07/17
diff --git a/libs/libzmq/RELICENSE/abbradar.md b/libs/libzmq/RELICENSE/abbradar.md
deleted file mode 100644
index 9ae3273..0000000
--- a/libs/libzmq/RELICENSE/abbradar.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Nikolay Amiantov that grants permission to relicense his
-copyrights in the libzmq C++ library (ZeroMQ) under the Mozilla Public License
-v2 (MPLv2) or any other Open Source Initiative approved license chosen by the
-current ZeroMQ BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "abbradar", with commit
-author "Nikolay Amiantov <ab@fmap.me>", are copyright of Nikolay Amiantov.
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed
-above.
-
-Nikolay Amiantov
-2017/03/24
diff --git a/libs/libzmq/RELICENSE/ackalker.md b/libs/libzmq/RELICENSE/ackalker.md
deleted file mode 100644
index ee88446..0000000
--- a/libs/libzmq/RELICENSE/ackalker.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Alain Kalker
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "ackalker", with
-commit author "Alain Kalker <a.c.kalker@gmail.com>", are copyright of Alain Kalker.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Alain Kalker
-2019/05/23
diff --git a/libs/libzmq/RELICENSE/acsearle.md b/libs/libzmq/RELICENSE/acsearle.md
deleted file mode 100644
index 1b6be68..0000000
--- a/libs/libzmq/RELICENSE/acsearle.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Liquid Instruments
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "acsearle", with
-commit author "Antony Searle", are copyright of Liquid Instruments .
-This document hereby grants the libzmq project team to relicense
-libzmq, including all past, present and future contributions of the author
-listed above.
-
-Antony Searle
-2020/02/03
diff --git a/libs/libzmq/RELICENSE/agronholm.md b/libs/libzmq/RELICENSE/agronholm.md
deleted file mode 100644
index 00e8ab7..0000000
--- a/libs/libzmq/RELICENSE/agronholm.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Alex Grönholm
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "agronholm", with
-commit author "Alex Grönholm <alex.gronholm+git@nextday.fi>", are copyright of Alex Grönholm.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Alex Grönholm
-2017/03/19
diff --git a/libs/libzmq/RELICENSE/aixxe.md b/libs/libzmq/RELICENSE/aixxe.md
deleted file mode 100644
index 0a9bfe0..0000000
--- a/libs/libzmq/RELICENSE/aixxe.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by aixxe (aixxe)
-that grants permission to relicense his copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other
-Open Source Initiative approved license chosen by the current ZeroMQ
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "aixxe", with commit author
-"aixxe <me@aixxe.net>" are copyright of aixxe.
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed above.
-
-aixxe
-2019/07/25
\ No newline at end of file
diff --git a/libs/libzmq/RELICENSE/ambitslix.md b/libs/libzmq/RELICENSE/ambitslix.md
deleted file mode 100644
index eae6fa7..0000000
--- a/libs/libzmq/RELICENSE/ambitslix.md
+++ /dev/null
@@ -1,7 +0,0 @@
-Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Attila Mark Sz that grants permission to relicense its copyrights in the libzmq C++ library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other Open Source Initiative approved license chosen by the current ZeroMQ BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "ambitslix", with commit author "gougolith@gmail.com", are copyright of Attila Mark. This document hereby grants the libzmq project team to relicense libzmq, including all past, present and future contributions of the author listed above.
-
-Attila Mark Sz 2020/11/10
diff --git a/libs/libzmq/RELICENSE/amuraru.md b/libs/libzmq/RELICENSE/amuraru.md
deleted file mode 100644
index 3a92e0e..0000000
--- a/libs/libzmq/RELICENSE/amuraru.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Adrian Muraru
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "amuraru", with
-commit author "Adrian Muraru <adi.muraru@gmail.com>", are copyright of Adrian Muraru.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Adrian Muraru
-2017/03/20
diff --git a/libs/libzmq/RELICENSE/analogist.md b/libs/libzmq/RELICENSE/analogist.md
deleted file mode 100644
index 28d5a7d..0000000
--- a/libs/libzmq/RELICENSE/analogist.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by James Wu
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "analogist", with
-commit author "James Wu <james@analogist.net>", are copyright of James Wu.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-James Wu
-2020/09/24
diff --git a/libs/libzmq/RELICENSE/answeroo.md b/libs/libzmq/RELICENSE/answeroo.md
deleted file mode 100644
index c79c0a4..0000000
--- a/libs/libzmq/RELICENSE/answeroo.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Ming Ji
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "answeroo", with
-commit author "answeroo <jiming@yafco.com>", are copyright of Ming Ji.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Ming Ji
-2018/08/20
diff --git a/libs/libzmq/RELICENSE/antonrd.md b/libs/libzmq/RELICENSE/antonrd.md
deleted file mode 100644
index b6e3821..0000000
--- a/libs/libzmq/RELICENSE/antonrd.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Anton Dimitrov that grants permission to
-relicense its copyrights in the libzmq C++ library (ZeroMQ) under the
-Mozilla Public License v2 (MPLv2) or any other Open Source Initiative
-approved license chosen by the current ZeroMQ BDFL (Benevolent
-Dictator for Life).
-
-A portion of the commits made by the Github handle "antonrd", with
-commit author "Anton Dimitrov <dimitrov.anton@gmail.com>", are
-copyright of Anton Dimitrov.  This document hereby grants the libzmq
-project team to relicense libzmq, including all past, present and
-future contributions of the author listed above.
-
-Anton Dimitrov
-
-2018/10/01
\ No newline at end of file
diff --git a/libs/libzmq/RELICENSE/ardrabczyk.md b/libs/libzmq/RELICENSE/ardrabczyk.md
deleted file mode 100644
index 5e1b058..0000000
--- a/libs/libzmq/RELICENSE/ardrabczyk.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Arkadiusz Drabczyk (ardrabczyk) that grants
-permission to relicense his copyrights in the libzmq C++ library
-(ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other Open
-Source Initiative approved license chosen by the current ZeroMQ BDFL
-(Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "ardrabczyk", with
-commit author "Arkadiusz Drabczyk <arkadiusz@drabczyk.org>", are
-copyright of Arkadiusz Drabczyk. This document hereby grants the
-libzmq project team to relicense libzmq, including all past, present
-and future contributions of the author listed above.
-
-Arkadiusz Drabczyk
-2020/11/10
diff --git a/libs/libzmq/RELICENSE/arsenm.md b/libs/libzmq/RELICENSE/arsenm.md
deleted file mode 100644
index 00b3115..0000000
--- a/libs/libzmq/RELICENSE/arsenm.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Matthew Arsenault
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "arsenm", with
-commit author "Matt Arsenault <arsenm2@gmail.com>", are copyright of Matthew Arsenault.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Matthew Arsenault
-2017/10/12
\ No newline at end of file
diff --git a/libs/libzmq/RELICENSE/asafkahlon.md b/libs/libzmq/RELICENSE/asafkahlon.md
deleted file mode 100644
index e38175f..0000000
--- a/libs/libzmq/RELICENSE/asafkahlon.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Asaf Kahlon
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "asafkahlon", with
-commit author "Asaf Kahlon asafka7@gmail.com", are copyright of Asaf Kahlon.
-This document hereby grants the libzmq project team to relicense
-libzmq,
-including all past, present and future contributions of the author
-listed above.
-
-Asaf Kahlon
-2020/02/05
diff --git a/libs/libzmq/RELICENSE/aseering.md b/libs/libzmq/RELICENSE/aseering.md
deleted file mode 100644
index 0100f48..0000000
--- a/libs/libzmq/RELICENSE/aseering.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Adam Seering
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commit made by the Github handle "aseering", with
-commit author "Adam Seering <aseering@gmail.com>", are copyright of Adam Seering.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Adam Seering
-2017/03/20
diff --git a/libs/libzmq/RELICENSE/atomashpolskiy.md b/libs/libzmq/RELICENSE/atomashpolskiy.md
deleted file mode 100644
index 75a8223..0000000
--- a/libs/libzmq/RELICENSE/atomashpolskiy.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Andrei Tomashpolskiy
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "atomashpolskiy", with
-commit author "Andrei Tomashpolskiy <nordmann89@gmail.com>", are copyright of Andrei Tomashpolskiy .
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Andrei Tomashpolskiy  
-2019/08/22
diff --git a/libs/libzmq/RELICENSE/banburybill.md b/libs/libzmq/RELICENSE/banburybill.md
deleted file mode 100644
index 7df74dc..0000000
--- a/libs/libzmq/RELICENSE/banburybill.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Jim Hague that grants permission to relicense
-its copyrights in the libzmq C++ library (ZeroMQ) under the Mozilla
-Public License v2 (MPLv2) or any other Open Source Initiative approved
-license chosen by the current ZeroMQ BDFL (Benevolent Dictator for
-Life).
-
-A portion of the commits made by the Github handle "banburybill", with
-commit author "Jim Hague <jim.hague@acm.org>", are copyright of Jim
-Hague.  This document hereby grants the libzmq project team to
-relicense libzmq, including all past, present and future contributions
-of the author listed above.
-
-Jim Hague
-2017/03/20
diff --git a/libs/libzmq/RELICENSE/bbdb68.md b/libs/libzmq/RELICENSE/bbdb68.md
deleted file mode 100644
index e468465..0000000
--- a/libs/libzmq/RELICENSE/bbdb68.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Bruno Bodin
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "bbdb68", with
-commit author "Bruno Bodin <brunobodin@gmail.com>", are copyright of Bruno Bodin .
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Bruno Bodin
-2017/04/04
diff --git a/libs/libzmq/RELICENSE/bebopagogo.md b/libs/libzmq/RELICENSE/bebopagogo.md
deleted file mode 100644
index 9ad78e8..0000000
--- a/libs/libzmq/RELICENSE/bebopagogo.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Brian Adamson that grants permission to relicense its
-copyrights in the libzmq C++ library (ZeroMQ) under the Mozilla Public License v2
-(MPLv2).
-
-A portion of the commits made by the Github handle "bebopagogo", with commit
-author "bebopagogo <bebopagogo@users.noreply.github.com>" and "Brian Adamson
-<badamson@gmail.com>", are copyright of Brian Adamson. This document hereby grants
-the libzmq project team to relicense libzmq, including all past, present and
-future contributions of the author listed above.
-
-Brian Adamson 2019/08/11 s
diff --git a/libs/libzmq/RELICENSE/benjdero.md b/libs/libzmq/RELICENSE/benjdero.md
deleted file mode 100644
index eb9813b..0000000
--- a/libs/libzmq/RELICENSE/benjdero.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Benjamin Deroche
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "benjdero", with
-commit author "Benjamin Deroche", are copyright of Benjamin Deroche.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Benjamin Deroche
-2019/10/26
\ No newline at end of file
diff --git a/libs/libzmq/RELICENSE/bjoto.md b/libs/libzmq/RELICENSE/bjoto.md
deleted file mode 100644
index 1c772a0..0000000
--- a/libs/libzmq/RELICENSE/bjoto.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Björn Töpel that grants permission to relicense
-its copyrights in the libzmq C++ library (ZeroMQ) under the Mozilla
-Public License v2 (MPLv2) or any other Open Source Initiative approved
-license chosen by the current ZeroMQ BDFL (Benevolent Dictator for
-Life).
-
-A portion of the commits made by the Github handle "bjoto", with
-commit author "Bjorn Topel <bjorn.topel@gmail.com>", are copyright of
-Björn Töpel.  This document hereby grants the libzmq project team to
-relicense libzmq, including all past, present and future contributions
-of the author listed above.
-
-Björn Töpel
-2017/03/26
diff --git a/libs/libzmq/RELICENSE/bjovke.md b/libs/libzmq/RELICENSE/bjovke.md
deleted file mode 100644
index 8b2221d..0000000
--- a/libs/libzmq/RELICENSE/bjovke.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Jovan Bunjevacki that grants permission to
-relicense its copyrights in the libzmq C++ library (ZeroMQ) under the
-Mozilla Public License v2 (MPLv2) or any other Open Source Initiative
-approved license chosen by the current ZeroMQ BDFL (Benevolent
-Dictator for Life).
-
-A portion of the commits made by the Github handle "bjovke", with
-commit author "Jovan Bunjevacki <bjovan@gmail.com>", are
-copyright of Jovan Bunjevacki.  This document hereby grants the libzmq
-project team to relicense libzmq, including all past, present and
-future contributions of the author listed above.
-
-Jovan Bunjevacki
-2017/04/04
diff --git a/libs/libzmq/RELICENSE/bl0x.md b/libs/libzmq/RELICENSE/bl0x.md
deleted file mode 100644
index bb40014..0000000
--- a/libs/libzmq/RELICENSE/bl0x.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Bastian Löher that grants permission to
-relicense its copyrights in the libzmq C++ library (ZeroMQ) under the
-Mozilla Public License v2 (MPLv2) or any other Open Source Initiative
-approved license chosen by the current ZeroMQ BDFL (Benevolent
-Dictator for Life).
-
-A portion of the commits made by the Github handle "bl0x", with
-commit author "Bastian Löher <me@l-dot.de>", are
-copyright of Bastian Löher.  This document hereby grants the libzmq
-project team to relicense libzmq, including all past, present and
-future contributions of the author listed above.
-
-Bastian Löher
-2019/08/01
diff --git a/libs/libzmq/RELICENSE/bluca.md b/libs/libzmq/RELICENSE/bluca.md
deleted file mode 100644
index cae4541..0000000
--- a/libs/libzmq/RELICENSE/bluca.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Luca Boccassi (bluca)
-that grants permission to relicense his copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other
-Open Source Initiative approved license chosen by the current ZeroMQ
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "bluca", with
-commit author "Luca Boccassi <luca.boccassi@gmail.com>" or
-"Luca Boccassi <bluca@debian.org>", are copyright of Luca Boccassi.
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed
-above.
-
-Luca Boccassi
-2019/02/16
diff --git a/libs/libzmq/RELICENSE/boscosiu.md b/libs/libzmq/RELICENSE/boscosiu.md
deleted file mode 100644
index 8d19628..0000000
--- a/libs/libzmq/RELICENSE/boscosiu.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by boscosiu
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other
-Open Source Initiative approved license chosen by the current ZeroMQ
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "boscosiu", with
-commit author "boscosiu", are copyright of boscosiu.
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed above.
-
-boscosiu
-2021/12/28
diff --git a/libs/libzmq/RELICENSE/boxkey.md b/libs/libzmq/RELICENSE/boxkey.md
deleted file mode 100644
index 00d09bc..0000000
--- a/libs/libzmq/RELICENSE/boxkey.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by boxkey that grants permission to relicense its copyrights in the libzmq C++ library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other Open Source Initiative approved license chosen by the current ZeroMQ BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "boxkey", with commit author "boxkey [289844900@qq.com](289844900@qq.com)", are copyright of boxkey. This document hereby grants the libzmq project team to relicense libzmq, including all past, present and future contributions of the author listed above.
-
-boxkey 2020/11/30
\ No newline at end of file
diff --git a/libs/libzmq/RELICENSE/bprager.md b/libs/libzmq/RELICENSE/bprager.md
deleted file mode 100644
index e0db6d0..0000000
--- a/libs/libzmq/RELICENSE/bprager.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Bernd Prager
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "bprager", with
-commit author "Bernd Prager <bernd@prager.ws>", are copyright of Bernd Prager.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Bernd Prager
-2017/03/22
diff --git a/libs/libzmq/RELICENSE/brett-cameron.md b/libs/libzmq/RELICENSE/brett-cameron.md
deleted file mode 100644
index b842cd0..0000000
--- a/libs/libzmq/RELICENSE/brett-cameron.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Brett Cameron
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "brc859844", with
-commit author "Brett Cameron <brett.r.cameron@gmail.com>" or
-"Brett Cameron <brett.cameron@vmssoftware.com>", are copyright of Brett Cameron.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Brett Russell Cameron
-2019/02/25
-
diff --git a/libs/libzmq/RELICENSE/brian-peloton.md b/libs/libzmq/RELICENSE/brian-peloton.md
deleted file mode 100644
index 92a8c26..0000000
--- a/libs/libzmq/RELICENSE/brian-peloton.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Brian Silverman
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "brian-peloton", with
-commit author "brian@peloton-tech.com", are copyright of Brian Silverman .
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Brian Silverman
-2019/08/14
\ No newline at end of file
diff --git a/libs/libzmq/RELICENSE/brocade_communications_systems.md b/libs/libzmq/RELICENSE/brocade_communications_systems.md
deleted file mode 100644
index 25805c1..0000000
--- a/libs/libzmq/RELICENSE/brocade_communications_systems.md
+++ /dev/null
@@ -1,15 +0,0 @@
-## Brocade Communications Systems Inc.
-
-This is a statement by Brocade Communications Systems Inc. (Brocade)
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "bluca", with
-commit author "Luca Boccassi <luca.boccassi@gmail.com>" or
-"Luca Boccassi <lboccass@brocade.com>", are copyright of Brocade.
-This permission to relicense includes all past, present and future
-contributions of Brocade employees.
-
-Luca Boccassi
-Software Engineer, Brocade Communications Systems Inc.
-2016-05-16
diff --git a/libs/libzmq/RELICENSE/brubakerjeff.md b/libs/libzmq/RELICENSE/brubakerjeff.md
deleted file mode 100644
index fbd4ef2..0000000
--- a/libs/libzmq/RELICENSE/brubakerjeff.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Jeff Brubaker that grants permission to
-relicense its copyrights in the libzmq C++ library (ZeroMQ) under the
-Mozilla Public License v2 (MPLv2) or any other Open Source Initiative
-approved license chosen by the current ZeroMQ BDFL (Benevolent
-Dictator for Life).
-
-A portion of the commits made by the Github handle "brubakerjeff", with
-commit author "Jeff Brubaker <brubaker.jeff@gmail.com>", are
-copyright of Jeff Brubaker.  This document hereby grants the libzmq
-project team to relicense libzmq, including all past, present and
-future contributions of the author listed above.
-
-Jeff Brubaker
-2018/11/18
diff --git a/libs/libzmq/RELICENSE/bwbuchanan.md b/libs/libzmq/RELICENSE/bwbuchanan.md
deleted file mode 100644
index e241bc8..0000000
--- a/libs/libzmq/RELICENSE/bwbuchanan.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Brian Buchanan
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "bwbuchanan", with
-commit author "Brian Buchanan &lt;bwb@holo.org&gt;" or "Brian Buchanan &lt;brian@tiogalake.com&gt;", are copyright of Brian Buchanan.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Brian Buchanan
-2017/03/23
diff --git a/libs/libzmq/RELICENSE/c-rack.md b/libs/libzmq/RELICENSE/c-rack.md
deleted file mode 100644
index c427fd0..0000000
--- a/libs/libzmq/RELICENSE/c-rack.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Constantin Rack
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other
-Open Source Initiative approved license chosen by the current ZeroMQ
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "c-rack", with
-commit author "Constantin Rack <constantin.rack@gmail.com>", are copyright of Constantin Rack.
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed above.
-
-Constantin Rack
-2017/03/20
diff --git a/libs/libzmq/RELICENSE/c-zhao-3g.md b/libs/libzmq/RELICENSE/c-zhao-3g.md
deleted file mode 100644
index 8c31429..0000000
--- a/libs/libzmq/RELICENSE/c-zhao-3g.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Lingqiao Zhao
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "s-zhao-3g", with
-commit author "s-zhao-3g <forever.3g@hotmail.com>", are copyright of Lingqiao Zhao.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Lingqiao Zhao
-2021/01/26
\ No newline at end of file
diff --git a/libs/libzmq/RELICENSE/calid.md b/libs/libzmq/RELICENSE/calid.md
deleted file mode 100644
index 30b6d56..0000000
--- a/libs/libzmq/RELICENSE/calid.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Dylan Cali
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "calid", with
-commit author "Dylan Cali <calid1984@gmail.com>", are copyright of Dylan Cali.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Dylan Cali
-
-2019/02/17
diff --git a/libs/libzmq/RELICENSE/camachat.md b/libs/libzmq/RELICENSE/camachat.md
deleted file mode 100644
index 6cd2494..0000000
--- a/libs/libzmq/RELICENSE/camachat.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Eric Camachat
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other
-Open Source Initiative approved license chosen by the current ZeroMQ
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "camachat", with
-commit author "Eric Camachat <eric@camachat.org>", are copyright of Eric Camachat.
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed above.
-
-Eric L. Camachat
-March 20, 2017
diff --git a/libs/libzmq/RELICENSE/cbusbey.md b/libs/libzmq/RELICENSE/cbusbey.md
deleted file mode 100644
index 200dff0..0000000
--- a/libs/libzmq/RELICENSE/cbusbey.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Connamara Systems llc
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "cbusbey", with
-commit author "chris busbey", are copyright of Connamara Systems, llc.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Chris Busbey  
-2019/09/03
diff --git a/libs/libzmq/RELICENSE/cdolan.md b/libs/libzmq/RELICENSE/cdolan.md
deleted file mode 100644
index 50accf5..0000000
--- a/libs/libzmq/RELICENSE/cdolan.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Christopher Dolan
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "cdolan", with
-commit author "Christopher Dolan <chris@codingstream.org>", are copyright of Christopher Dolan.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Christopher Dolan
-2017/03/19
diff --git a/libs/libzmq/RELICENSE/chickenkiller.md b/libs/libzmq/RELICENSE/chickenkiller.md
deleted file mode 100644
index 3b5f38f..0000000
--- a/libs/libzmq/RELICENSE/chickenkiller.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Lionel Orry
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "chickenkiller", with
-commit author "Lionel Orry <lionel.orry@gmail.com>", are copyright of Lionel Orry.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Lionel Orry
-2017/03/23
diff --git a/libs/libzmq/RELICENSE/chrisstaite.md b/libs/libzmq/RELICENSE/chrisstaite.md
deleted file mode 100644
index 650f4ba..0000000
--- a/libs/libzmq/RELICENSE/chrisstaite.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Chris Staite that grants permission to relicense its
-copyrights in the libzmq C++ library (ZeroMQ) under the Mozilla Public License
-v2 (MPLv2).
-
-A portion of the commits made by the Github handle "chrisstaite", with commit
-author "Chris <chris@yourdreamnet.co.uk>", are copyright of Chris Staite.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed
-above.
-
-Chris Staite
-2017/03/28
diff --git a/libs/libzmq/RELICENSE/christhrasher.md b/libs/libzmq/RELICENSE/christhrasher.md
deleted file mode 100644
index a74a9b2..0000000
--- a/libs/libzmq/RELICENSE/christhrasher.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Chris Thrasher that grants permission to relicense
-its copyrights in the libzmq C++ library (ZeroMQ) under the Mozilla Public
-License v2 (MPLv2) or any other Open Source Initiative approved license chosen
-by the current ZeroMQ BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "ChrisThrasher", with
-commit author "Chris Thrasher <chris.j.thrasher@gmail.com>", are copyright of
-Chris Thrasher. This document hereby grants the libzmq project team to
-relicense libzmq, including all past, present and future contributions of the
-author listed above.
-
-Chris Thrasher 
-2021/07/01
diff --git a/libs/libzmq/RELICENSE/chuckremes.md b/libs/libzmq/RELICENSE/chuckremes.md
deleted file mode 100644
index c13387e..0000000
--- a/libs/libzmq/RELICENSE/chuckremes.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Chuck Remes
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "chuckremes", with
-commit author "Chuck Remes", are copyright of Chuck Remes.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Chuck Remes
-2017/03/21
diff --git a/libs/libzmq/RELICENSE/chuggafan.md b/libs/libzmq/RELICENSE/chuggafan.md
deleted file mode 100644
index c15c945..0000000
--- a/libs/libzmq/RELICENSE/chuggafan.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by  "chugga\_fan"
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "chuggafan", with
-commit author "chugga\_fan chuggafans@gmail.com", are copyright of "chugga\_fan" .
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-"chugga\_fan"
-2017/03/19
diff --git a/libs/libzmq/RELICENSE/chymanfx.md b/libs/libzmq/RELICENSE/chymanfx.md
deleted file mode 100644
index 238ec1e..0000000
--- a/libs/libzmq/RELICENSE/chymanfx.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-I happily grant permission to
-relicense its copyrights in the libzmq C++ library (ZeroMQ) under the
-Mozilla Public License v2 (MPLv2) or any other Open Source Initiative
-approved license chosen by the current ZeroMQ BDFL (Benevolent
-Dictator for Life).
-
-The portion of the commits made by the Github handle "chymanfx", are
-not copyrighted in any way.
-Chyman
-2019/08/12
diff --git a/libs/libzmq/RELICENSE/cjuniet.md b/libs/libzmq/RELICENSE/cjuniet.md
deleted file mode 100644
index 37d9403..0000000
--- a/libs/libzmq/RELICENSE/cjuniet.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Christophe Juniet
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other
-Open Source Initiative approved license chosen by the current ZeroMQ
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "cjuniet", with
-commit author "Christophe Juniet <c.juniet@gmail.com>", are copyright of Christophe Juniet.
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed above.
-
-Christophe Juniet
-2017/03/20
diff --git a/libs/libzmq/RELICENSE/ckamm.md b/libs/libzmq/RELICENSE/ckamm.md
deleted file mode 100644
index 1b36cb6..0000000
--- a/libs/libzmq/RELICENSE/ckamm.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Christian Kamm
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other
-Open Source Initiative approved license chosen by the current ZeroMQ
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "ckamm", with
-commit author "Christian Kamm kamm@incasoftware.de", are copyright of Christian Kamm.
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed above.
-
-Christian Kamm
-2017/03/20
diff --git a/libs/libzmq/RELICENSE/claws.md b/libs/libzmq/RELICENSE/claws.md
deleted file mode 100644
index 747e564..0000000
--- a/libs/libzmq/RELICENSE/claws.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Christopher Laws
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "claws", with
-commit author "Chris Laws <clawsicus@gmail.com>", are copyright of Christopher Laws.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Christopher Laws  
-2019/08/11
diff --git a/libs/libzmq/RELICENSE/clkao.md b/libs/libzmq/RELICENSE/clkao.md
deleted file mode 100644
index 819b082..0000000
--- a/libs/libzmq/RELICENSE/clkao.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other share-alike OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Chia-liang Kao
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-share-alike Open Source Initiative approved license chosen by the current 
-ZeroMQ BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "clkao", with
-commit author "Chia-liang Kao clkao@clkao.org", are copyright of Chia-liang Kao.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Chia-liang Kao
-2017/03/20
diff --git a/libs/libzmq/RELICENSE/colletted.md b/libs/libzmq/RELICENSE/colletted.md
deleted file mode 100644
index 37a6796..0000000
--- a/libs/libzmq/RELICENSE/colletted.md
+++ /dev/null
@@ -1,7 +0,0 @@
-Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Denis Collette that grants permission to relicense its copyrights in the libzmq C++ library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other Open Source Initiative approved license chosen by the current ZeroMQ BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "colletted", with commit author "Denis Collette denisncollette@gmail.com", are copyright of Denis Collette. This document hereby grants the libzmq project team to relicense libzmq, including all past, present and future contributions of the author listed above.
-
-Denis Collette 2020/01/22
diff --git a/libs/libzmq/RELICENSE/cowo78.md b/libs/libzmq/RELICENSE/cowo78.md
deleted file mode 100644
index 82e3d49..0000000
--- a/libs/libzmq/RELICENSE/cowo78.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Giuseppe Corbelli
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "cowo78" with
-commit author "Giuseppe Corbelli <cowo78@gmail.com>", are copyright of Giuseppe Corbelli.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Giuseppe Corbelli
-2017/03/21
diff --git a/libs/libzmq/RELICENSE/crocket.md b/libs/libzmq/RELICENSE/crocket.md
deleted file mode 100644
index 7bb92e2..0000000
--- a/libs/libzmq/RELICENSE/crocket.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by crocket
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "crocket", with
-commit author "crocket <748856+crocket@users.noreply.github.com>", are copyright of crocket.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-crocket
-2018/11/10
diff --git a/libs/libzmq/RELICENSE/cwsmith.md b/libs/libzmq/RELICENSE/cwsmith.md
deleted file mode 100644
index 2292f33..0000000
--- a/libs/libzmq/RELICENSE/cwsmith.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Cameron Smith
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "cwsmith", with
-commit author "Cameron Smith <smithc11@rpi.edu>", are copyright of Cameron Smith.
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed above.
-
-Cameron Smith
-2020/02/05
diff --git a/libs/libzmq/RELICENSE/danielhtshih.md b/libs/libzmq/RELICENSE/danielhtshih.md
deleted file mode 100644
index fc02122..0000000
--- a/libs/libzmq/RELICENSE/danielhtshih.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Daniel Shih
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "danielhtshih", with
-commit author "Daniel Shih <hotingwow@gmail.com>", are copyright of Daniel Shih.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Daniel Shih
-2017/03/20
diff --git a/libs/libzmq/RELICENSE/danriegsecker.md b/libs/libzmq/RELICENSE/danriegsecker.md
deleted file mode 100644
index 772ece8..0000000
--- a/libs/libzmq/RELICENSE/danriegsecker.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Dan Riegsecker
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "danriegsecker", with
-commit author "Dan Riegsecker 1baldgeek@gmail.com", are copyright of
-Dan Riegsecker. This document hereby grants the libzmq project team to
-relicense libzmq, including all past, present and future contributions of
-the author listed above.
-
-Dan Riegsecker
-2017/03/20
diff --git a/libs/libzmq/RELICENSE/darkdragon-001.md b/libs/libzmq/RELICENSE/darkdragon-001.md
deleted file mode 100644
index c4b4d7b..0000000
--- a/libs/libzmq/RELICENSE/darkdragon-001.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Darkdragon-001
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "darkdragon-001", with
-commit author "Darkdragon-001", are copyright of Darkdragon-001.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Darkdragon-001
-2022/03/15
diff --git a/libs/libzmq/RELICENSE/demozon.md b/libs/libzmq/RELICENSE/demozon.md
deleted file mode 100644
index b33947a..0000000
--- a/libs/libzmq/RELICENSE/demozon.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Tore Halvorsen
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "demozon", with
-commit author "Tore Halvorsen <tore.halvorsen@gmail.com>", are copyright of Tore Halvorsen.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Tore Halvorsen
-2017/03/20
diff --git a/libs/libzmq/RELICENSE/dennisklein.md b/libs/libzmq/RELICENSE/dennisklein.md
deleted file mode 100644
index 0cbc748..0000000
--- a/libs/libzmq/RELICENSE/dennisklein.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Dennis Klein
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other
-Open Source Initiative approved license chosen by the current ZeroMQ
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "dennisklein", with
-commit author "Dennis Klein <d.klein@gsi.de>", are copyright of Dennis Klein.
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed above.
-
-Dennis Klein
-2019/08/11
diff --git a/libs/libzmq/RELICENSE/dfons.md b/libs/libzmq/RELICENSE/dfons.md
deleted file mode 100644
index 586d573..0000000
--- a/libs/libzmq/RELICENSE/dfons.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Diego Fons
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "dfons", with
-commit author "Diego Fons <diego.fons@gmail.com>" or "Diego Fons <diego.fons@intraway.com>", are copyright of Diego Fons.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Diego Fons
-
-2017/03/20
diff --git a/libs/libzmq/RELICENSE/dhammika.md b/libs/libzmq/RELICENSE/dhammika.md
deleted file mode 100644
index c59b292..0000000
--- a/libs/libzmq/RELICENSE/dhammika.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Dhammika Pathirana
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "dhammika", with
-commit author "Dhammika Pathirana <dhammika@gmail.com>", are copyright of Dhammika Pathirana .
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Dhammika Pathirana
-2019/08/12
diff --git a/libs/libzmq/RELICENSE/dimpase.md b/libs/libzmq/RELICENSE/dimpase.md
deleted file mode 100644
index c4b86d9..0000000
--- a/libs/libzmq/RELICENSE/dimpase.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Dmitrii (Dima) Pasechnik
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "dimpase", with
-commit author "Dima Pasechnik dimpase@gmail.com", are copyright of Dmitrii Pasechnik.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Dmitrii Pasechnik  2019/09/18
diff --git a/libs/libzmq/RELICENSE/diorcety.md b/libs/libzmq/RELICENSE/diorcety.md
deleted file mode 100644
index 460512a..0000000
--- a/libs/libzmq/RELICENSE/diorcety.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Diorcet Yann
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "diorcety", with
-commit author "yann.diorcet@xenocs.com", are copyright of Diorcet Yann.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Diorcet Yann
-2019/09/04
diff --git a/libs/libzmq/RELICENSE/djelenc.md b/libs/libzmq/RELICENSE/djelenc.md
deleted file mode 100644
index 01f9fc9..0000000
--- a/libs/libzmq/RELICENSE/djelenc.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by David Jelenc
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other
-Open Source Initiative approved license chosen by the current ZeroMQ
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "djelenc", with
-commit author "David Jelenc <david.jelenc@fri.uni-lj.si>", are copyright of David Jelenc.
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed above.
-
-David Jelenc
-2017/03/20
diff --git a/libs/libzmq/RELICENSE/dkrikun.md b/libs/libzmq/RELICENSE/dkrikun.md
deleted file mode 100644
index bd1ffd2..0000000
--- a/libs/libzmq/RELICENSE/dkrikun.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Daniel Krikun
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "dkrikun", with
-commit author "Daniel Krikun", are copyright of Daniel Krikun .
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed above.
-
-Daniel Krikun
-2019/08/17
diff --git a/libs/libzmq/RELICENSE/dmeehan1968.md b/libs/libzmq/RELICENSE/dmeehan1968.md
deleted file mode 100644
index 13abffb..0000000
--- a/libs/libzmq/RELICENSE/dmeehan1968.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Dave Meehan
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "dmeehan1968", with
-commit author "Dave Meehan dave_meehan@replicated.co.uk", are copyright of Dave Meehan.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Dave Meehan
-2019/08/31
diff --git a/libs/libzmq/RELICENSE/drbobbeaty.md b/libs/libzmq/RELICENSE/drbobbeaty.md
deleted file mode 100644
index d919d6c..0000000
--- a/libs/libzmq/RELICENSE/drbobbeaty.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Robert Beaty
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "drbobbeaty", with
-commit author "Bob Beaty <drbob@themanfromspud.com>", are copyright of Robert Beaty .
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Robert Beaty
-2019/08/10
diff --git a/libs/libzmq/RELICENSE/drodri.md b/libs/libzmq/RELICENSE/drodri.md
deleted file mode 100644
index e156df6..0000000
--- a/libs/libzmq/RELICENSE/drodri.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Diego R.Losada
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "drodri", with
-commit author "drodri <diego.rlosada@gmail.com>", are copyright of Diego Rodriguez-Losada.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Diego Rodriguez-Losada
-2017/03/20
diff --git a/libs/libzmq/RELICENSE/drolevar.md b/libs/libzmq/RELICENSE/drolevar.md
deleted file mode 100644
index 4774186..0000000
--- a/libs/libzmq/RELICENSE/drolevar.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Andrij Abyzov
-that grants permission to relicense his copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other
-Open Source Initiative approved license chosen by the current ZeroMQ
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "drolevar", with
-commit author "Andrij Abyzov <drolevar@gmail.com>", are copyright of Andrij Abyzov.
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed
-above.
-
-Andrij Abyzov
-2019/11/19
diff --git a/libs/libzmq/RELICENSE/eburkitt.md b/libs/libzmq/RELICENSE/eburkitt.md
deleted file mode 100644
index ea425d7..0000000
--- a/libs/libzmq/RELICENSE/eburkitt.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by G. Evan Burkitt
-that grants permission to relicense his copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "eburkitt", with
-commit author "Evan Burkitt <evanb@edulinksys.com>", are copyright of G. Evan Burkitt.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-G. Evan Burkitt
-2017/04/06
\ No newline at end of file
diff --git a/libs/libzmq/RELICENSE/egomotion.md b/libs/libzmq/RELICENSE/egomotion.md
deleted file mode 100644
index 9c47a94..0000000
--- a/libs/libzmq/RELICENSE/egomotion.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Egomotion Limited
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "robertcastle", with
-commit author "Robert Castle <robert@egomotion.co.uk>", are copyright of Egomotion Limited.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Robert Castle, 
-Director, Egomotion Limited
-2017/03/21
\ No newline at end of file
diff --git a/libs/libzmq/RELICENSE/eldruin.md b/libs/libzmq/RELICENSE/eldruin.md
deleted file mode 100644
index 3346958..0000000
--- a/libs/libzmq/RELICENSE/eldruin.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Diego Barrios Romero
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "eldruin", with
-commit author "Diego Barrios Romero <eldruin@gmail.com>", are copyright of Diego Barrios Romero.
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed above.
-
-Diego Barrios Romero
-2019/11/13
\ No newline at end of file
diff --git a/libs/libzmq/RELICENSE/emtr.md b/libs/libzmq/RELICENSE/emtr.md
deleted file mode 100644
index 602f3de..0000000
--- a/libs/libzmq/RELICENSE/emtr.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Claudio Biagi that grants permission to relicense
-its copyrights in the libzmq C++ library (ZeroMQ) under the Mozilla Public
-License v2 (MPLv2) or any other Open Source Initiative approved license
-chosen by the current ZeroMQ BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "emtr", with
-commit author "Claudio Biagi <retmt@gmx.com>", are copyright
-of Claudio Biagi.  This document hereby grants the libzmq project
-team to relicense libzmq, including all past, present and future
-contributions of the author listed above.
-
-Claudio Biagi
-2019/03/07
diff --git a/libs/libzmq/RELICENSE/eponsko.md b/libs/libzmq/RELICENSE/eponsko.md
deleted file mode 100644
index 05cddd5..0000000
--- a/libs/libzmq/RELICENSE/eponsko.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Pontus Sköldström
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "eponsko", with
-commit author "Pontus Sköldström <pontus.skoldstrom@ri.se>", are copyright of Pontus Sköldström.
-This document hereby grants the libzmq project team to relicense
-libzmq,
-including all past, present and future contributions of the author
-listed above.
-
-Pontus Sköldström
-2021/1/28
diff --git a/libs/libzmq/RELICENSE/ericsson.md b/libs/libzmq/RELICENSE/ericsson.md
deleted file mode 100644
index ec7dcf1..0000000
--- a/libs/libzmq/RELICENSE/ericsson.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Ericsson
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "hugne", with
-commit author "Erik Hugne erik.hugne@ericsson.com", are copyright of Ericsson.
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed above.
-
-Jon Maloy <jon.maloy@ericsson.com>
-2019/03/27
diff --git a/libs/libzmq/RELICENSE/evoskuil.md b/libs/libzmq/RELICENSE/evoskuil.md
deleted file mode 100644
index dccd83a..0000000
--- a/libs/libzmq/RELICENSE/evoskuil.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Eric Voskuil
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "evoskuil", with
-commit author "Eric Voskuil <eric@voskuil.org>", are copyright of Eric Voskuil.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Eric Voskuil
-2017/03/19
\ No newline at end of file
diff --git a/libs/libzmq/RELICENSE/ezhikus.md b/libs/libzmq/RELICENSE/ezhikus.md
deleted file mode 100644
index c952aee..0000000
--- a/libs/libzmq/RELICENSE/ezhikus.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Volodymyr Korniichuk
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "ezhikus", with
-commit author "VolodymyrKorn@gmail.com", are copyright of Volodymyr Korniichuk.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Volodymyr Korniichuk  
-2017/03/21
\ No newline at end of file
diff --git a/libs/libzmq/RELICENSE/f18m.md b/libs/libzmq/RELICENSE/f18m.md
deleted file mode 100644
index 8003cc8..0000000
--- a/libs/libzmq/RELICENSE/f18m.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Francesco Montorsi that grants permission to relicense
-its copyrights in the libzmq C++ library (ZeroMQ) under the Mozilla Public
-License v2 (MPLv2) or any other Open Source Initiative approved license
-chosen by the current ZeroMQ BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "f18m", with
-commit author "Francesco Montorsi <francesco.montorsi@gmail.com>", are copyright
-of Francesco Montorsi.  This document hereby grants the libzmq project
-team to relicense libzmq, including all past, present and future
-contributions of the author listed above.
-
-Francesco Montorsi
-2018/09/14
diff --git a/libs/libzmq/RELICENSE/fanquake.md b/libs/libzmq/RELICENSE/fanquake.md
deleted file mode 100644
index e4d9b5d..0000000
--- a/libs/libzmq/RELICENSE/fanquake.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Michael Ford that grants permission to
-relicense its copyrights in the libzmq C++ library (ZeroMQ) under the
-Mozilla Public License v2 (MPLv2) or any other Open Source Initiative
-approved license chosen by the current ZeroMQ BDFL (Benevolent
-Dictator for Life).
-
-A portion of the commits made by the Github handle "fanquake", with
-commit author "Michael Ford <fanquake@gmail.com>", are
-copyright of Michael Ford.  This document hereby grants the libzmq
-project team to relicense libzmq, including all past, present and
-future contributions of the author listed above.
-
-Michael Ford
-2019/08/10
-
diff --git a/libs/libzmq/RELICENSE/febeling.md b/libs/libzmq/RELICENSE/febeling.md
deleted file mode 100644
index 06bab1f..0000000
--- a/libs/libzmq/RELICENSE/febeling.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Florian Ebeling that grants permission to
-relicense its copyrights in the libzmq C++ library (ZeroMQ) under the
-Mozilla Public License v2 (MPLv2) or any other Open Source Initiative
-approved license chosen by the current ZeroMQ BDFL (Benevolent
-Dictator for Life).
-
-A portion of the commits made by the Github handle "febeling", with
-commit author "Florian Ebeling <florian.ebeling@gmail.com>", are
-copyright of Florian Ebeling.  This document hereby grants the libzmq
-project team to relicense libzmq, including all past, present and
-future contributions of the author listed above.
-
-Florian Ebeling
-2017/03/20
diff --git a/libs/libzmq/RELICENSE/ferdnyc.md b/libs/libzmq/RELICENSE/ferdnyc.md
deleted file mode 100644
index 283030a..0000000
--- a/libs/libzmq/RELICENSE/ferdnyc.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Frank R. Dana Jr.
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "ferdnyc", with
-commit author "FeRD (Frank Dana)", are copyright of Frank R. Dana, Jr.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Frank Richard Dana, Jr.
-2020-03-16
diff --git a/libs/libzmq/RELICENSE/ffontaine.md b/libs/libzmq/RELICENSE/ffontaine.md
deleted file mode 100644
index a64c630..0000000
--- a/libs/libzmq/RELICENSE/ffontaine.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Fabrice Fontaine
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other
-Open Source Initiative approved license chosen by the current ZeroMQ
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "ffontaine", with
-commit author "Fabrice Fontaine <fontaine.fabrice@gmail.com>", are copyright of Fabrice Fontaine.
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed above.
-
-Fabrice Fontaine
-2018-09-13
diff --git a/libs/libzmq/RELICENSE/fidlej.md b/libs/libzmq/RELICENSE/fidlej.md
deleted file mode 100644
index bc64f5a..0000000
--- a/libs/libzmq/RELICENSE/fidlej.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Ivo Danihelka
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "fidlej", with
-commit author "Ivo Danihelka <ivo@danihelka.net>", are copyright of Ivo Danihelka.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Ivo Danihelka  
-2017/03/21
diff --git a/libs/libzmq/RELICENSE/flub.md b/libs/libzmq/RELICENSE/flub.md
deleted file mode 100644
index b942de6..0000000
--- a/libs/libzmq/RELICENSE/flub.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Floris Bruynooghe
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "flub", with
-commit author "Floris Bruynooghe <flub@devork.be>", are copyright of
-Floris Bruynooghe .
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed above.
-
-Floris Bruynooghe
-2017/05/03
diff --git a/libs/libzmq/RELICENSE/gabm.md b/libs/libzmq/RELICENSE/gabm.md
deleted file mode 100644
index b4ec8dc..0000000
--- a/libs/libzmq/RELICENSE/gabm.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Matthias Gabriel 
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "gabm", with
-commit author "Matthias Gabriel <matthias.gabriel@etit.tu-chemnitz.de>", are copyright of Matthias Gabriel.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Matthias Gabriel
-2018/10/8
diff --git a/libs/libzmq/RELICENSE/garlick.md b/libs/libzmq/RELICENSE/garlick.md
deleted file mode 100644
index 764065f..0000000
--- a/libs/libzmq/RELICENSE/garlick.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Jim Garlick (garlick)
-that grants permission to relicense his copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other
-Open Source Initiative approved license chosen by the current ZeroMQ
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "garlick", with
-commit author "Jim Garlick <garlick.jim@gmail.com>", are copyright of
-Jim Garlick.  This document hereby grants the libzmq project team to
-relicense libzmq, including all past, present and future contributions
-of the author listed above.
-
-Jim Garlick
-2019/08/10
diff --git a/libs/libzmq/RELICENSE/gavinmcniff.md b/libs/libzmq/RELICENSE/gavinmcniff.md
deleted file mode 100644
index 98d20b4..0000000
--- a/libs/libzmq/RELICENSE/gavinmcniff.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Gavin McNiff
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other
-Open Source Initiative approved license chosen by the current ZeroMQ
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "gavinmcniff", with
-commit author "Gavin McNiff <gavin@mcniff.ie>", are copyright of Gavin McNiff .
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed above.
-
-Gavin McNiff
-2017/03/20
diff --git a/libs/libzmq/RELICENSE/gcsideal.md b/libs/libzmq/RELICENSE/gcsideal.md
deleted file mode 100644
index aa85b5e..0000000
--- a/libs/libzmq/RELICENSE/gcsideal.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Laszlo Boszormenyi (GCS) that grants permission to
-relicense its copyrights in the libzmq C++ library (ZeroMQ) under the
-Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "gcsideal", with
-commit author "Laszlo Boszormenyi (GCS) <gcs@debian.org>", are copyright of
-Laszlo Boszormenyi (GCS) .
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author
-listed above.
-
-Laszlo Boszormenyi (GCS)
-2020/02/13
diff --git a/libs/libzmq/RELICENSE/gena-moscow.md b/libs/libzmq/RELICENSE/gena-moscow.md
deleted file mode 100644
index e1ba0be..0000000
--- a/libs/libzmq/RELICENSE/gena-moscow.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Gennady Makovetski
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "gena-moscow", with
-commit author "Gennady Makovetski <makovetski@gmail.com>", are copyright of Gennady Makovetski.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Gennady Makovetski
-2017/03/21
\ No newline at end of file
diff --git a/libs/libzmq/RELICENSE/ghpu.md b/libs/libzmq/RELICENSE/ghpu.md
deleted file mode 100644
index 27ae64a..0000000
--- a/libs/libzmq/RELICENSE/ghpu.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Ghislain PUTOIS
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "ghpu", with
-commit author "Ghislain PUTOIS", are copyright of Ghislain PUTOIS.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Ghislain PUTOIS 
-2017/03/20
diff --git a/libs/libzmq/RELICENSE/gitfoxi.md b/libs/libzmq/RELICENSE/gitfoxi.md
deleted file mode 100644
index 5b02733..0000000
--- a/libs/libzmq/RELICENSE/gitfoxi.md
+++ /dev/null
@@ -1,16 +0,0 @@
-
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Michael Fox
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "gitfoxi", with
-commit author "gitfoxi", are copyright of Michael Fox.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Michael Fox
-2017/03/20
diff --git a/libs/libzmq/RELICENSE/glemercier.md b/libs/libzmq/RELICENSE/glemercier.md
deleted file mode 100644
index 97428c7..0000000
--- a/libs/libzmq/RELICENSE/glemercier.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Anton Dimitrov that grants permission to
-relicense its copyrights in the libzmq C++ library (ZeroMQ) under the
-Mozilla Public License v2 (MPLv2) or any other Open Source Initiative
-approved license chosen by the current ZeroMQ BDFL (Benevolent
-Dictator for Life).
-
-A portion of the commits made by the Github handle "glemercier", with
-commit author "Gregory Lemercier <greglemercier@free.fr>", are
-copyright of Gregory Lmercier.  This document hereby grants the libzmq
-project team to relicense libzmq, including all past, present and
-future contributions of the author listed above.
-
-Gregory Lemercier
-
-2018/10/07
diff --git a/libs/libzmq/RELICENSE/gonzus.md b/libs/libzmq/RELICENSE/gonzus.md
deleted file mode 100644
index b844a11..0000000
--- a/libs/libzmq/RELICENSE/gonzus.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Gonzalo Diethelm
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other
-Open Source Initiative approved license chosen by the current ZeroMQ
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "gonzus", with
-commit author "Gonzalo Diethelm <gonzalo.diethelm@diethelm.org>" or "Gonzalo Diethelm <gdiethelm@dcv.cl>", are copyright of Gonzalo Diethelm .
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed above.
-
-Gonzalo Diethelm  
-2017/03/20
diff --git a/libs/libzmq/RELICENSE/goodfella.md b/libs/libzmq/RELICENSE/goodfella.md
deleted file mode 100644
index f3b68d2..0000000
--- a/libs/libzmq/RELICENSE/goodfella.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Permission to Relicense under MPLV2 or any Open Source Initiative (OSI) approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Nick Guiffrida that grants permission to
-relicense its copyrights in the libzmq C++ library (ZeroMQ) under the
-Mozilla Public License v2 (MPLv2) or any other Open Source Initiative
-approved license chosen by the current ZeroMQ BDFL (Benevolent
-Dictator for Life).
-
-The commits made by the Github handle "goodfella", with commit author
-"Nick Guiffrida goodfella005@gmail.com" are copyright of Nick
-Guiffrida. This document hereby grants the libzmq project team to
-relicense libzmq, including all past, present and future contributions
-of the author listed above.
diff --git a/libs/libzmq/RELICENSE/google.md b/libs/libzmq/RELICENSE/google.md
deleted file mode 100644
index 65d587b..0000000
--- a/libs/libzmq/RELICENSE/google.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Google, Inc.
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "tkoeppe", with
-commit author "Thomas Köppe", are copyright of Google, Inc.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Thomas Köppe
-2017/09/13
diff --git a/libs/libzmq/RELICENSE/grmt.md b/libs/libzmq/RELICENSE/grmt.md
deleted file mode 100644
index 7992f4c..0000000
--- a/libs/libzmq/RELICENSE/grmt.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by grmt.
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "grmt", with
-commit author "grmt", are copyright of grmt.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-grmt (garmt.noname@gmail.com)
-2020/05/04
diff --git a/libs/libzmq/RELICENSE/guidovranken.md b/libs/libzmq/RELICENSE/guidovranken.md
deleted file mode 100644
index f7e9b62..0000000
--- a/libs/libzmq/RELICENSE/guidovranken.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Guido Vranken that grants permission to
-relicense its copyrights in the libzmq C++ library (ZeroMQ) under the
-Mozilla Public License v2 (MPLv2) or any other Open Source Initiative
-approved license chosen by the current ZeroMQ BDFL (Benevolent
-Dictator for Life).
-
-A portion of the commits made by the Github handle "guidovranken", with
-commit author "Guido Vranken <guidovranken@gmail.com>", are
-copyright of Guido Vranken.  This document hereby grants the libzmq
-project team to relicense libzmq, including all past, present and
-future contributions of the author listed above.
-
-Guido Vranken
-2019/01/08
-
diff --git a/libs/libzmq/RELICENSE/guillon.md b/libs/libzmq/RELICENSE/guillon.md
deleted file mode 100644
index 0620ab0..0000000
--- a/libs/libzmq/RELICENSE/guillon.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Christophe Guillon
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "guillon", with
-commit author "Christophe Guillon <christophe.guillon.perso@gmail.com>", are copyright of Christophe Guillon .
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Christophe Guillon
-2019/06/10
diff --git a/libs/libzmq/RELICENSE/gummif.md b/libs/libzmq/RELICENSE/gummif.md
deleted file mode 100644
index abe512b..0000000
--- a/libs/libzmq/RELICENSE/gummif.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Gudmundur Adalsteinsson that grants permission to
-relicense its copyrights in the libzmq C++ library (ZeroMQ) under the
-Mozilla Public License v2 (MPLv2) or any other Open Source Initiative
-approved license chosen by the current ZeroMQ BDFL (Benevolent
-Dictator for Life).
-
-A portion of the commits made by the Github handle "gummif", with
-commit author "Gudmundur Adalsteinsson <ofpgummi@yahoo.com>", are
-copyright of Gudmundur Adalsteinsson.  This document hereby grants the libzmq
-project team to relicense libzmq, including all past, present and
-future contributions of the author listed above.
-
-Gudmundur Adalsteinsson
-2020/02/04
-
diff --git a/libs/libzmq/RELICENSE/herbrechtsmeier.md b/libs/libzmq/RELICENSE/herbrechtsmeier.md
deleted file mode 100644
index de42b8e..0000000
--- a/libs/libzmq/RELICENSE/herbrechtsmeier.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Weidmueller Interface GmbH & Co KG
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other
-Open Source Initiative approved license chosen by the current ZeroMQ
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "herbrechtsmeier", with
-commit author "Stefan Herbrechtsmeier", are copyright of Weidmueller Interface GmbH & Co KG.
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed above.
-
-Stefan Herbrechtsmeier
-2019/09/09
diff --git a/libs/libzmq/RELICENSE/hewlett_packard_enterprise.md b/libs/libzmq/RELICENSE/hewlett_packard_enterprise.md
deleted file mode 100644
index 067ce39..0000000
--- a/libs/libzmq/RELICENSE/hewlett_packard_enterprise.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Hewlett Packard Enterprise
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "brc859844", with
-commit author "Brett Cameron <Brett.Cameron@hp.com>", and the commits made
-by the Github handle "dgloe-hpe", with commit author
-"David Gloe <david.gloe@hpe.com>", are copyright of Hewlett Packard Enterprise.
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the authors listed above.
-
-Hewlett Packard Enterprise
-2019/03/12
diff --git a/libs/libzmq/RELICENSE/hgourvest.md b/libs/libzmq/RELICENSE/hgourvest.md
deleted file mode 100644
index b6c77b9..0000000
--- a/libs/libzmq/RELICENSE/hgourvest.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Henri Gourvest that grants permission to
-relicense its copyrights in the libzmq C++ library (ZeroMQ) under the
-Mozilla Public License v2 (MPLv2) or any other Open Source Initiative
-approved license chosen by the current ZeroMQ BDFL (Benevolent
-Dictator for Life).
-
-A portion of the commits made by the Github handle "hgourvest", with
-commit author "Henri Gourvest <hgourvest@progdigy.com>", are
-copyright of Henri Gourvest.  This document hereby grants the libzmq
-project team to relicense libzmq, including all past, present and
-future contributions of the author listed above.
-
-Henri Gourvest
-2018/12/8
diff --git a/libs/libzmq/RELICENSE/hitstergtd.md b/libs/libzmq/RELICENSE/hitstergtd.md
deleted file mode 100644
index ad7c453..0000000
--- a/libs/libzmq/RELICENSE/hitstergtd.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Hitster GTD
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "hitstergtd", with
-commit author "Hitster GTD <hitstergtd@gmail.com>", are copyright of Hitster GTD.
-This document hereby grants the libzmq project team to relicense
-libzmq,
-including all past, present and future contributions of the author
-listed above.
-
-Hitster GTD
-2022/01/08
diff --git a/libs/libzmq/RELICENSE/hnwyllmm.md b/libs/libzmq/RELICENSE/hnwyllmm.md
deleted file mode 100644
index c34eaf6..0000000
--- a/libs/libzmq/RELICENSE/hnwyllmm.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Wang Yunlai
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "hnwyllmm", with
-commit author "hnwyllmm hnwyllmm@126.com", are copyright of Wang Yunlai .
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Wang Yunlai 
-2019/08/13
diff --git a/libs/libzmq/RELICENSE/hoditohod.md b/libs/libzmq/RELICENSE/hoditohod.md
deleted file mode 100644
index d3867c6..0000000
--- a/libs/libzmq/RELICENSE/hoditohod.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Szekely Gyorgy
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "hoditohod", with
-commit author "Szekely Gyorgy <hoditohod@gmail.com>", are copyright of Szekely Gyorgy.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Szekely Gyorgy  
-2018/08/15
\ No newline at end of file
diff --git a/libs/libzmq/RELICENSE/hpsaturn.md b/libs/libzmq/RELICENSE/hpsaturn.md
deleted file mode 100644
index 9ec1605..0000000
--- a/libs/libzmq/RELICENSE/hpsaturn.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Antonio Vanegas that grants permission to relicense its copyrights in the libzmq C++ library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "hpsaturn", with commit author "Antonio Vanegas", are copyright of Antonio Vanegas.
-This document hereby grants the libzmq project team to relicense libzmq, including all past, present and future contributions of the author listed above.
-
-Antonio Vanegas
-2018/10/27
diff --git a/libs/libzmq/RELICENSE/hsw.md b/libs/libzmq/RELICENSE/hsw.md
deleted file mode 100644
index 3701385..0000000
--- a/libs/libzmq/RELICENSE/hsw.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Christopher Hall that grants permission to
-relicense its copyrights in the libzmq C++ library (ZeroMQ) under the
-Mozilla Public License v2 (MPLv2) or any other Open Source Initiative
-approved license chosen by the current ZeroMQ BDFL (Benevolent
-Dictator for Life).
-
-A portion of the commits made by the Github handle "hxw", with commit
-author "Christopher Hall <hsw@ms2.hinet.net>", are copyright of
-Christopher Hall.  This document hereby grants the libzmq project team
-to relicense libzmq, including all past, present and future
-contributions of the author listed above.
-
-Christopher Hall
-2019/08/07
diff --git a/libs/libzmq/RELICENSE/ianbarber.md b/libs/libzmq/RELICENSE/ianbarber.md
deleted file mode 100644
index ae4321f..0000000
--- a/libs/libzmq/RELICENSE/ianbarber.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Ian Barber
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commit made by the Github handle "ianbarber", with
-commit author "Ian Barber <ianbarber@gmail.com>", are copyright of Ian Barber.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Ian Barber
-2017/03/27
diff --git a/libs/libzmq/RELICENSE/imatix.md b/libs/libzmq/RELICENSE/imatix.md
deleted file mode 100644
index 8423601..0000000
--- a/libs/libzmq/RELICENSE/imatix.md
+++ /dev/null
@@ -1,23 +0,0 @@
-# Permission to Relicense under MPLV2
-
-This document collects grants from firms that hold copyrights in ZeroMQ. Please add new firms at the start. Each patch must be made with a GitHub handle that guarantees identity of the signatory.
-
-## iMatix Corporation
-
-This is a statement by iMatix Corporation sprl (iMatix) that grants permission to relicense its copyrights in the libzmq C++ library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-1. The original ZeroMQ codebase was developed from 2007-2009 by FastMQ Inc. (FastMQ) in Slovakia, which held all copyrights in code written by its staff.
-
-2. On 2009-11-01, iMatix exercised an option to acquire FastMQ and its assets,
-including ZeroMQ. On or before 2010-01-05 the FastMQ copyrights in ZeroMQ were
-transferred to iMatix ([commit](https://github.com/zeromq/libzmq/commit/4f6baf4dde627656b63cc4e2acdb78a8577ba640)). The FastMQ legal entity was subsequently liquidated.
-
-3. Between 2009 and 2016, iMatix has continued to add contributions to ZeroMQ under the GitHub handle 'hintjens'.
-
-4. This grant therefore covers what remains of the original FastMQ codebase plus all later contributions.
-
-5. iMatix hereby grants an irrevocable, global, and fully paid-up license on all its copyrights that exist in ZeroMQ, under the MPLv2.
-
--Pieter Hintjens
-CEO, iMatix Corporation sprl
-23 April 2016
diff --git a/libs/libzmq/RELICENSE/imkcy9.md b/libs/libzmq/RELICENSE/imkcy9.md
deleted file mode 100644
index 66235c2..0000000
--- a/libs/libzmq/RELICENSE/imkcy9.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Chengye Ke
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other
-Open Source Initiative approved license chosen by the current ZeroMQ
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "imkcy9", with
-commit author "Chengye Ke <imkcy9@icloud.com>" or
-"Chengye Ke <imkcy9@gmail.com>", are copyright of Chengye Ke.
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed above.
-
-Chengye Ke
-2019/05/18
\ No newline at end of file
diff --git a/libs/libzmq/RELICENSE/inuik.md b/libs/libzmq/RELICENSE/inuik.md
deleted file mode 100644
index 98f939b..0000000
--- a/libs/libzmq/RELICENSE/inuik.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Rishi Theivendan (inuik)
-that grants permission to relicense his copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other
-Open Source Initiative approved license chosen by the current ZeroMQ
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "inuik", with
-commit author "Rishi Theivendran <29522253+inuik@users.noreply.github.com>" or
-"Rishi Theivendran <rishi.theivendran@rohde-schwarz.com>", are copyright of Rishi Theivendran.
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed
-above.
-
-Rishi Theivendran
-2019/07/18
diff --git a/libs/libzmq/RELICENSE/ipa.md b/libs/libzmq/RELICENSE/ipa.md
deleted file mode 100644
index 2e803c6..0000000
--- a/libs/libzmq/RELICENSE/ipa.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Iwan Paolucci that grants permission to
-relicense its copyrights in the libzmq C++ library (ZeroMQ) under the
-Mozilla Public License v2 (MPLv2) or any other Open Source Initiative
-approved license chosen by the current ZeroMQ BDFL (Benevolent
-Dictator for Life).
-
-A portion of the commits made by the Github handle "ipa", with
-commit author "Iwan Paolucci <iwan.paolucci@gmail.com>", are
-copyright oIwan Paoluccii.  This document hereby grants the libzmq
-project team to relicense libzmq, including all past, present and
-future contributions of the author listed above.
-
-Iwan Paolucci
-2019/04/18
-
diff --git a/libs/libzmq/RELICENSE/ipechorin.md b/libs/libzmq/RELICENSE/ipechorin.md
deleted file mode 100644
index 40ddffe..0000000
--- a/libs/libzmq/RELICENSE/ipechorin.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Ivan Pechorin that grants permission to
-relicense its copyrights in the libzmq C++ library (ZeroMQ) under the
-Mozilla Public License v2 (MPLv2) or any other Open Source Initiative
-approved license chosen by the current ZeroMQ BDFL (Benevolent
-Dictator for Life).
-
-A portion of the commits made by the Github handle "ipechorin", with
-commit author "Ivan Pechorin <ivan.pechorin@gmail.com>", are
-copyright of Ivan Pechorin.  This document hereby grants the libzmq
-project team to relicense libzmq, including all past, present and
-future contributions of the author listed above.
-
-Ivan Pechorin
-2019/09/25
-
diff --git a/libs/libzmq/RELICENSE/jackpimbert.md b/libs/libzmq/RELICENSE/jackpimbert.md
deleted file mode 100644
index e1917f9..0000000
--- a/libs/libzmq/RELICENSE/jackpimbert.md
+++ /dev/null
@@ -1,18 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Jack Pimbert that grants permission to
-relicense its copyrights in the libzmq C++ library (ZeroMQ) under the
-Mozilla Public License v2 (MPLv2) or any other Open Source Initiative
-approved license chosen by the current ZeroMQ BDFL (Benevolent
-Dictator for Life).
-
-A portion of the commits made by the Github handle "jackpimbert",
-with commit author "jackpimbert <jack.pimbert@gmail.com>", are
-copyright of Jack Pimbert.  This document hereby grants the libzmq
-project team to relicense libzmq, including all past, present and
-future contributions of the author listed above.
-
-Jack Pimbert
-2019/05/24
-
-
diff --git a/libs/libzmq/RELICENSE/jacquesg.md b/libs/libzmq/RELICENSE/jacquesg.md
deleted file mode 100644
index 119f112..0000000
--- a/libs/libzmq/RELICENSE/jacquesg.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Jacques Germishuys that grants permission to
-relicense its copyrights in the libzmq C++ library (ZeroMQ) under the
-Mozilla Public License v2 (MPLv2) or any other Open Source Initiative
-approved license chosen by the current ZeroMQ BDFL (Benevolent
-Dictator for Life).
-
-A portion of the commits made by the Github handle "jacquesg", with
-commit author "Jacques Germishuys <jacquesg@striata.com>", are
-copyright of Jacques Germishuys.  This document hereby grants the libzmq
-project team to relicense libzmq, including all past, present and
-future contributions of the author listed above.
-
-Jacques Germishuys
-2018/12/14
-
diff --git a/libs/libzmq/RELICENSE/jakecobb.md b/libs/libzmq/RELICENSE/jakecobb.md
deleted file mode 100644
index 3e3be48..0000000
--- a/libs/libzmq/RELICENSE/jakecobb.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Jake Cobb
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "jakecobb", with
-commit author "Jake Cobb &lt;jake.cobb@gmail.com&gt;", are copyright of Jake Cobb.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Jake Cobb
-2017/04/04
diff --git a/libs/libzmq/RELICENSE/jbreams.md b/libs/libzmq/RELICENSE/jbreams.md
deleted file mode 100644
index b1c3051..0000000
--- a/libs/libzmq/RELICENSE/jbreams.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Jonathan Reams
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other
-Open Source Initiative approved license chosen by the current ZeroMQ
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "jbreams", with
-commit author "Jonathan Reams <jbreams@gmail.com>", are copyright of
-Jonathan Reams.
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed
-above.
-
-Jonathan Reams
-2019/08/31
diff --git a/libs/libzmq/RELICENSE/jcfr.md b/libs/libzmq/RELICENSE/jcfr.md
deleted file mode 100644
index 4576920..0000000
--- a/libs/libzmq/RELICENSE/jcfr.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Jean-Christophe Fillion-Robin
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "jcfr", with
-commit author "Jean-Christophe Fillion-Robin <jchris.fillionr@kitware.com>", are copyright of Kitware Inc.
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed above.
-
-Jean-Christophe Fillion-Robin
-2019/09/03
diff --git a/libs/libzmq/RELICENSE/jcourreges.md b/libs/libzmq/RELICENSE/jcourreges.md
deleted file mode 100644
index b20bec8..0000000
--- a/libs/libzmq/RELICENSE/jcourreges.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Jérémie Courrèges-Anglas
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "jcourreges", with
-commit author "Jérémie Courrèges-Anglas", are copyright of Jérémie Courrèges-Anglas.
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed above.
-
-Jérémie Courrèges-Anglas
-2018/12/07
diff --git a/libs/libzmq/RELICENSE/jean-airoldie.md b/libs/libzmq/RELICENSE/jean-airoldie.md
deleted file mode 100644
index 27deff7..0000000
--- a/libs/libzmq/RELICENSE/jean-airoldie.md
+++ /dev/null
@@ -1,7 +0,0 @@
-Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Jean Airoldie that grants permission to relicense its copyrights in the libzmq C++ library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other Open Source Initiative approved license chosen by the current ZeroMQ BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "jean-airoldie", with commit author "jean-airoldie <25088801+jean-airoldie@users.noreply.github.com>", are copyright of Jean Airoldie. This document hereby grants the libzmq project team to relicense libzmq, including all past, present and future contributions of the author listed above.
-
-Jean Airoldie 2019/04/27
diff --git a/libs/libzmq/RELICENSE/jemc.md b/libs/libzmq/RELICENSE/jemc.md
deleted file mode 100644
index b7ab5ab..0000000
--- a/libs/libzmq/RELICENSE/jemc.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Joe Eli McIlvain
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "jemc", with
-commit author "Joe Eli McIlvain", are copyright of Joe Eli McIlvain.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Joe Eli McIlvain
-2017/03/28
diff --git a/libs/libzmq/RELICENSE/jens.auer.md b/libs/libzmq/RELICENSE/jens.auer.md
deleted file mode 100644
index bdc20e9..0000000
--- a/libs/libzmq/RELICENSE/jens.auer.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Jens Auer
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "jens.auer", with
-commit author "Jens Auer", are copyright of Jens Auer.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Jens Auer
-2019/11/08
diff --git a/libs/libzmq/RELICENSE/jimenezrick.md b/libs/libzmq/RELICENSE/jimenezrick.md
deleted file mode 100644
index 743ca89..0000000
--- a/libs/libzmq/RELICENSE/jimenezrick.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Ricardo Catalinas Jimenez
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "jimenezrick", with
-commit author "Ricardo Catalinas Jimenez", are copyright of Ricardo
-Catalinas Jimenez.
-This document hereby grants the libzmq project team to relicense
-libzmq,
-including all past, present and future contributions of the author
-listed above.
-
-Ricardo Catalinas Jimenez
-2020/02/03
diff --git a/libs/libzmq/RELICENSE/jimklimov.md b/libs/libzmq/RELICENSE/jimklimov.md
deleted file mode 100644
index 91bf335..0000000
--- a/libs/libzmq/RELICENSE/jimklimov.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Evgeny (Jim) Klimov
-that grants permission to relicense his copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other
-Open Source Initiative approved license chosen by the current ZeroMQ
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "jimklimov",
-with commit author "Jim Klimov <jim@jimklimov.com>" or
-"Jim Klimov <jimklimov@gmail.com>", are copyright of Evgeny (Jim) Klimov.
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed
-above.
-
-Evgeny (Jim) Klimov  
-2017/03/21
diff --git a/libs/libzmq/RELICENSE/jkryl.md b/libs/libzmq/RELICENSE/jkryl.md
deleted file mode 100644
index ecd681e..0000000
--- a/libs/libzmq/RELICENSE/jkryl.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Jan Kryl
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "jkryl", with
-commit author "Jan Kryl jan.kryl@nexenta.com", are copyright of Jan Kryl.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Jan Kryl
-2017/03/19
diff --git a/libs/libzmq/RELICENSE/jlauenercern.md b/libs/libzmq/RELICENSE/jlauenercern.md
deleted file mode 100644
index b21790a..0000000
--- a/libs/libzmq/RELICENSE/jlauenercern.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other share-alike OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Joel Lauener
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-share-alike Open Source Initiative approved license chosen by the current 
-ZeroMQ BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "jlauenercern", with
-commit author "Joel Lauener <Joel.Lauener@cern.ch>", are copyright of Joel Lauener .
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Joel Lauener 
-2019/08/12
\ No newline at end of file
diff --git a/libs/libzmq/RELICENSE/jlsantiago0.md b/libs/libzmq/RELICENSE/jlsantiago0.md
deleted file mode 100644
index 2e740da..0000000
--- a/libs/libzmq/RELICENSE/jlsantiago0.md
+++ /dev/null
@@ -1,13 +0,0 @@
- Permission to Relicense under MPLv2
-
-This is a statement by Jose L. Santiago
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "jlsantiago0", with
-commit author "Jose L. Santiago", are copyright of Jose L. Santiago.
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed above.
-
-Jose L. Santiago
-2021/02/18
diff --git a/libs/libzmq/RELICENSE/johntconklin.md b/libs/libzmq/RELICENSE/johntconklin.md
deleted file mode 100644
index decf333..0000000
--- a/libs/libzmq/RELICENSE/johntconklin.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by John T. Conklin
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "johntconklin", with
-commit author "J.T. Conklin <jtc@acorntoolworks.com>", are copyright of John T. Conklin.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-John T. Conklin
-2017-03-19
diff --git a/libs/libzmq/RELICENSE/jruffin.md b/libs/libzmq/RELICENSE/jruffin.md
deleted file mode 100644
index 947e0f7..0000000
--- a/libs/libzmq/RELICENSE/jruffin.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by IVU Traffic Technologies AG
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "jruffin", with
-commit author "Julien Ruffin <jur@ivu.de>", are copyright of IVU Traffic Technologies AG.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Henrik Benner
-Head of Department Ticketing Development, IVU Traffic Technologies AG
-2017/05/10
diff --git a/libs/libzmq/RELICENSE/jsyoo5b.md b/libs/libzmq/RELICENSE/jsyoo5b.md
deleted file mode 100644
index 655b38e..0000000
--- a/libs/libzmq/RELICENSE/jsyoo5b.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by JaeSang Yoo
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "JSYoo5B", with
-commit author "JaeSang Yoo <jsyoo5b@gmail.com>", are copyright of JaeSang Yoo.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-JaeSang Yoo  
-2020.02.29
diff --git a/libs/libzmq/RELICENSE/kaczmarj.md b/libs/libzmq/RELICENSE/kaczmarj.md
deleted file mode 100644
index 232df01..0000000
--- a/libs/libzmq/RELICENSE/kaczmarj.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Jakub Kaczmarzyk
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other
-Open Source Initiative approved license chosen by the current ZeroMQ
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "kaczmarj", with
-commit author "Jakub Kaczmarzyk jakub.kaczmarzyk@gmail.com", are copyright of Jakub Kaczmarzyk.
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed above.
-
-Jakub Kaczmarzyk
-2020/07/29
diff --git a/libs/libzmq/RELICENSE/kalantar.md b/libs/libzmq/RELICENSE/kalantar.md
deleted file mode 100644
index 6eb0292..0000000
--- a/libs/libzmq/RELICENSE/kalantar.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Davit Kalantaryan
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made with commit author 
-"Davit Kalantaryan <davit.kalantaryan@desy.de>", are copyright of Davit Kalantaryan.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Davit Kalantaryan
-2020/08/06
diff --git a/libs/libzmq/RELICENSE/kanonet.md b/libs/libzmq/RELICENSE/kanonet.md
deleted file mode 100644
index fecb277..0000000
--- a/libs/libzmq/RELICENSE/kanonet.md
+++ /dev/null
@@ -1,8 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Christoph Kahl that grants permission to relicense its copyrights in the libzmq C++ library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other Open Source Initiative approved license chosen by the current ZeroMQ BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "kanonet", with commit author "Christoph Kahl", are copyright of Christoph Kahl. This document hereby grants the libzmq project team to relicense libzmq, including all past, present and future contributions of the author listed above.
-
-Christoph Kahl  
-2020/01/09
\ No newline at end of file
diff --git a/libs/libzmq/RELICENSE/kentzo.md b/libs/libzmq/RELICENSE/kentzo.md
deleted file mode 100644
index cd94213..0000000
--- a/libs/libzmq/RELICENSE/kentzo.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Ilya Kulakov
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "kentzo", with
-commit author "Ilya Kulakov <kulakov.ilya@gmail.com>", are copyright of Ilya Kulakov.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Ilya Kulakov  
-2017/05/23
diff --git a/libs/libzmq/RELICENSE/kfish.md b/libs/libzmq/RELICENSE/kfish.md
deleted file mode 100644
index 832cb96..0000000
--- a/libs/libzmq/RELICENSE/kfish.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Conrad Parker that grants permission to
-relicense its copyrights in the libzmq C++ library (ZeroMQ) under the
-Mozilla Public License v2 (MPLv2) or any other Open Source Initiative
-approved license chosen by the current ZeroMQ BDFL (Benevolent
-Dictator for Life).
-
-A portion of the commits made by the Github handle "kfish", with
-commit author "Conrad Parker <conrad@metadecks.org>", are
-copyright of Conrad Parker.  This document hereby grants the libzmq
-project team to relicense libzmq, including all past, present and
-future contributions of the author listed above.
-
-Conrad Parker
-2018/10/30
-
diff --git a/libs/libzmq/RELICENSE/kobolog.md b/libs/libzmq/RELICENSE/kobolog.md
deleted file mode 100644
index bd3a1dd..0000000
--- a/libs/libzmq/RELICENSE/kobolog.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Andrey Sibiryov that grants permission to relicense its copyrights in the
-libzmq C++ library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other Open Source
-Initiative approved license chosen by the current ZeroMQ BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "kobolog", with commit author "Andrey Sibiryov <me@kobology.ru>",
-are copyright of Andrey Sibiryov. This document hereby grants the libzmq project team to
-relicense libzmq, including all past, present and future contributions of the author listed above.
-
-Andrey Sibiryov
-2017/04/04
diff --git a/libs/libzmq/RELICENSE/kreuzberger.md b/libs/libzmq/RELICENSE/kreuzberger.md
deleted file mode 100644
index 638234d..0000000
--- a/libs/libzmq/RELICENSE/kreuzberger.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Joerg Kreuzberger
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "kreuzberger", with
-commit author "Joerg Kreuzberger", are copyright of Joerg Kreuzberger .
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed above.
-
-Joerg Kreuzberger
-2019/09/02
diff --git a/libs/libzmq/RELICENSE/kurdybacha.md b/libs/libzmq/RELICENSE/kurdybacha.md
deleted file mode 100644
index 2345d58..0000000
--- a/libs/libzmq/RELICENSE/kurdybacha.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Pawel Kurdybacha 
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "kurdybacha", with
-commit author "Pawel Kurdybacha pawel.kurdybacha@gmail.com", are copyright of Pawel Kurdybacha .
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Pawel Kurdybacha
-2017/04/13
diff --git a/libs/libzmq/RELICENSE/laplaceyang.md b/libs/libzmq/RELICENSE/laplaceyang.md
deleted file mode 100644
index f593104..0000000
--- a/libs/libzmq/RELICENSE/laplaceyang.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Xujing Yang (laplaceyang)
-that grants permission to relicense his copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other
-Open Source Initiative approved license chosen by the current ZeroMQ
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "laplaceyang", with
-commit author "laplaceyang <laplace2013@outlook.com>", are copyright of Xujing Yang.
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed
-above.
-
-Xujing Yang
-2020/04/22
diff --git a/libs/libzmq/RELICENSE/latchmoor-services-carcich.md b/libs/libzmq/RELICENSE/latchmoor-services-carcich.md
deleted file mode 100644
index 5fda258..0000000
--- a/libs/libzmq/RELICENSE/latchmoor-services-carcich.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Latchmoor Services, LLC
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "drbitboy", with
-commit author "Brian Carcich <drbitboy@gmail.com>", are copyright of Latchmoor
-Services, LLC.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Latchmoor Services, LLC
-2019/07/26
diff --git a/libs/libzmq/RELICENSE/leonarf.md b/libs/libzmq/RELICENSE/leonarf.md
deleted file mode 100644
index 91e81e6..0000000
--- a/libs/libzmq/RELICENSE/leonarf.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Léonard Michelet
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other
-Open Source Initiative approved license chosen by the current
-ZeroMQ BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "leonarf", with
-commit author "Léonard Michelet <leonard.michelet@openwide.fr>", are copyright of Léonard Michelet.
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed above.
-
-Michelet Léonard 2017/03/29
diff --git a/libs/libzmq/RELICENSE/liedtkeInTUM.md b/libs/libzmq/RELICENSE/liedtkeInTUM.md
deleted file mode 100644
index 7348494..0000000
--- a/libs/libzmq/RELICENSE/liedtkeInTUM.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Sven Liedtke
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "liedtkeInTUM", with
-commit author "Sven Liedtke", are copyright of Sven Liedtke.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Sven Liedtke  
-2019/11/27
\ No newline at end of file
diff --git a/libs/libzmq/RELICENSE/linville.md b/libs/libzmq/RELICENSE/linville.md
deleted file mode 100644
index 3e5ec8b..0000000
--- a/libs/libzmq/RELICENSE/linville.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Aaron Linville
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "linville", with
-commit author "Aaron Linville <aaron@linville.org>", are copyright of Aaron Linville.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Aaron Linville
-2017/03/27
\ No newline at end of file
diff --git a/libs/libzmq/RELICENSE/loachfish.md b/libs/libzmq/RELICENSE/loachfish.md
deleted file mode 100644
index c6fa5bc..0000000
--- a/libs/libzmq/RELICENSE/loachfish.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Justin.Hung
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other
-Open Source Initiative approved license chosen by the current ZeroMQ
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "loachfish", with
-commit author "Justin.Hung fronront@qq.com", are copyright of Justin.Hung .
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed above.
-
-Justin.Hung
-2017/03/20
\ No newline at end of file
diff --git a/libs/libzmq/RELICENSE/lodagro.md b/libs/libzmq/RELICENSE/lodagro.md
deleted file mode 100644
index 04b1b9a..0000000
--- a/libs/libzmq/RELICENSE/lodagro.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Wouter Overmeire that grants permission to relicense its
-copyrights in the libzmq C++ library (ZeroMQ) under the Mozilla Public License
-v2 (MPLv2) or any other Open Source Initiative approved license chosen by the
-current ZeroMQ BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "lodagro", with commit
-author "lodagro <lodagro@gmail.com>", are copyright of Wouter Overmeire.  This
-document hereby grants the libzmq project team to relicense libzmq, including
-all past, present and future contributions of the author listed above.
-
-Wouter Overmeire
-2017/04/01
diff --git a/libs/libzmq/RELICENSE/lourens.md b/libs/libzmq/RELICENSE/lourens.md
deleted file mode 100644
index 000c074..0000000
--- a/libs/libzmq/RELICENSE/lourens.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other share-alike OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Lourens Naudé
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-share-alike Open Source Initiative approved license chosen by the current 
-ZeroMQ BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "methodmissing", with
-commit author "Lourens Naudé <lourens@methodmissing.com>", are copyright of Lourens Naudé.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Lourens Naudé  
-2019/07/01
diff --git a/libs/libzmq/RELICENSE/lstacul.md b/libs/libzmq/RELICENSE/lstacul.md
deleted file mode 100644
index b95c149..0000000
--- a/libs/libzmq/RELICENSE/lstacul.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Laurent Stacul
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "stac47", with
-commit author "Laurent Stacul <laurent.stacul@gmail.com>", are copyright of
-Laurent Stacul .
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Laurent Stacul
-2020/02/21
diff --git a/libs/libzmq/RELICENSE/madebr.md b/libs/libzmq/RELICENSE/madebr.md
deleted file mode 100644
index d4f142a..0000000
--- a/libs/libzmq/RELICENSE/madebr.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Anonymous Maarten
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other
-Open Source Initiative approved license chosen by the current ZeroMQ
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "madebr", with
-commit author "Anonymous Maarten <anonymous.maarten@gmail.com>", are copyright of Anonymous Maarten.
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed above.
-
-Anonymous Maarten
-2017/03/27
diff --git a/libs/libzmq/RELICENSE/malexzx.md b/libs/libzmq/RELICENSE/malexzx.md
deleted file mode 100644
index 1538871..0000000
--- a/libs/libzmq/RELICENSE/malexzx.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Aleksander Melnikov
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "malexzx", with
-commit author "Aleksander Melnikov", are copyright of Aleksander Melnikov.
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed above.
-
-Aleksander Melnikov
-2019/08/11
diff --git a/libs/libzmq/RELICENSE/mancasg.md b/libs/libzmq/RELICENSE/mancasg.md
deleted file mode 100644
index 233fb0f..0000000
--- a/libs/libzmq/RELICENSE/mancasg.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by MancaÈ™ George
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "mancasg", with
-commit author "MancaÈ™ George <mancas.f.george@gmail.com>", are copyright of MancaÈ™ George .
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-MancaÈ™ George
-2019/07/24
diff --git a/libs/libzmq/RELICENSE/martin-ksti.md b/libs/libzmq/RELICENSE/martin-ksti.md
deleted file mode 100644
index a825847..0000000
--- a/libs/libzmq/RELICENSE/martin-ksti.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Martin Labsch on behalf of KST innovations GmbH that grants permission to
-relicense its copyrights in the libzmq C++ library (ZeroMQ) under the
-Mozilla Public License v2 (MPLv2) or any other Open Source Initiative
-approved license chosen by the current ZeroMQ BDFL (Benevolent
-Dictator for Life).
-
-A portion of the commits made by the Github handle "martin-ksti", with
-commit author "Martin Labsch <martin.labsch@ksti.de>", are
-copyright of Martin Labsch on behalf of KST innovations GmbH. This document hereby grants the libzmq
-project team to relicense libzmq, including all past, present and
-future contributions of the author listed above.
-
-Martin Labsch
-2020/10/09
diff --git a/libs/libzmq/RELICENSE/mattconnolly.md b/libs/libzmq/RELICENSE/mattconnolly.md
deleted file mode 100644
index ecb1f0c..0000000
--- a/libs/libzmq/RELICENSE/mattconnolly.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Matthew Connolly
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other
-Open Source Initiative approved license chosen by the current ZeroMQ
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "mattconnolly", with
-commit author "Matt Connolly <matt.connolly@me.com>", are copyright of Matthew Connolly.
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed above.
-
-Matthew Connolly
-2017/06/28
\ No newline at end of file
diff --git a/libs/libzmq/RELICENSE/mauri-melato.md b/libs/libzmq/RELICENSE/mauri-melato.md
deleted file mode 100644
index 4bfddee..0000000
--- a/libs/libzmq/RELICENSE/mauri-melato.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Maurizio Melato 
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "mauri-melato", with
-commit author "Maurizio Melato", are copyright of Maurizio Melato.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Maurizio Melato
-2017-04-04
diff --git a/libs/libzmq/RELICENSE/mbarbisan.md b/libs/libzmq/RELICENSE/mbarbisan.md
deleted file mode 100644
index 5260615..0000000
--- a/libs/libzmq/RELICENSE/mbarbisan.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Mark Barbisan
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "mbarbisan", with
-commit author "Mark Barbisan <mark@barbisan.ca>", are copyright of Mark Barbisan.
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed above.
-
-Mark Barbisan
-2019/08/31
-
diff --git a/libs/libzmq/RELICENSE/mdionisio.md b/libs/libzmq/RELICENSE/mdionisio.md
deleted file mode 100644
index b455376..0000000
--- a/libs/libzmq/RELICENSE/mdionisio.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Thomas M. DuBuisson
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "mdionisio", with
-commit author "Michele Dionisio", are copyright of Michele Dionisio.
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed above.
-
-Michele Dionisio
-2019/07/09
diff --git a/libs/libzmq/RELICENSE/mditzel.md b/libs/libzmq/RELICENSE/mditzel.md
deleted file mode 100644
index 88f7c2e..0000000
--- a/libs/libzmq/RELICENSE/mditzel.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Maarten Ditzel
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "mditzel", with
-commit author "Maarten Ditzel <maarten.ditzel@gmail.com>", are copyright of Maarten Ditzel.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Maarten Ditzel
-2017/03/24  
diff --git a/libs/libzmq/RELICENSE/meox.md b/libs/libzmq/RELICENSE/meox.md
deleted file mode 100644
index a963d34..0000000
--- a/libs/libzmq/RELICENSE/meox.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Gian Lorenzo Meocci
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "meox", with
-commit author "Gian Lorenzo Meocci <glmeocci@gmail.com>", are copyright of Gian Lorenzo Meocci.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Gian Lorenzo Meocci  
-2017/04/09
\ No newline at end of file
diff --git a/libs/libzmq/RELICENSE/mesegura.md b/libs/libzmq/RELICENSE/mesegura.md
deleted file mode 100644
index 5d50124..0000000
--- a/libs/libzmq/RELICENSE/mesegura.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Manuel Segura
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "mesegura", with
-commit author "Manuel Segura", are copyright of Manuel Segura .
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed above.
-
-Manuel Eduardo Segura
-2019/08/10
diff --git a/libs/libzmq/RELICENSE/mgatny.md b/libs/libzmq/RELICENSE/mgatny.md
deleted file mode 100644
index 28ed837..0000000
--- a/libs/libzmq/RELICENSE/mgatny.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Mike Gatny (mgatny) that grants permission to relicense
-his copyrights in the libzmq C++ library (ZeroMQ) under the Mozilla Public
-License v2 (MPLv2) or any other Open Source Initiative approved license chosen
-by the current ZeroMQ BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "mgatny", with commit author
-"Mike Gatny <mgatny@gmail.com>" or "Mike Gatny <mgatny@connamara.com>", are
-copyright of Mike Gatny.  This document hereby grants the libzmq project team
-to relicense libzmq, including all past, present and future contributions of
-the author listed above.
-
-Mike Gatny
-2019/02/19
diff --git a/libs/libzmq/RELICENSE/michicc.md b/libs/libzmq/RELICENSE/michicc.md
deleted file mode 100644
index a0f8f12..0000000
--- a/libs/libzmq/RELICENSE/michicc.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Michael Lutz
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "michicc", with
-commit author "Michael Lutz <michi@icosahedron.de>", are copyright of Michael Lutz.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Michael Lutz
-2017/05/01
diff --git a/libs/libzmq/RELICENSE/micromass-ricnewton.md b/libs/libzmq/RELICENSE/micromass-ricnewton.md
deleted file mode 100644
index 6aedb60..0000000
--- a/libs/libzmq/RELICENSE/micromass-ricnewton.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Micromass UK Limited 
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "ricnewton", with
-commit author "Richard Newton" are copyright of Micromass UK Limited.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Steve Smith 
-Director Micromass UK Limited
-2017/04/26
diff --git a/libs/libzmq/RELICENSE/mileschet.md b/libs/libzmq/RELICENSE/mileschet.md
deleted file mode 100644
index facf4f6..0000000
--- a/libs/libzmq/RELICENSE/mileschet.md
+++ /dev/null
@@ -1,6 +0,0 @@
-Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-This is a statement by Roberto Santacroce Martins that grants permission to relicense its copyrights in the libzmq C++ library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other Open Source Initiative approved license chosen by the current ZeroMQ BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "mileschet", with commit author "Roberto Santacroce Martins miles.chet@gmail.com", are copyright of Roberto Santacroce Martins. This document hereby grants the libzmq project team to relicense libzmq, including all past, present and future contributions of the author listed above.
-
-Roberto Santacroce Martins 2020/07/06
diff --git a/libs/libzmq/RELICENSE/miniway.md b/libs/libzmq/RELICENSE/miniway.md
deleted file mode 100644
index 171e87c..0000000
--- a/libs/libzmq/RELICENSE/miniway.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Dongmin Yu
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other
-Open Source Initiative approved license chosen by the current ZeroMQ
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "miniway", with
-commit author "Dongmin Yu <miniway@gmail.com>", are copyright of Dongmin Yu.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Dongmin Yu
-2019/08/12
diff --git a/libs/libzmq/RELICENSE/minrk.md b/libs/libzmq/RELICENSE/minrk.md
deleted file mode 100644
index 3aaea55..0000000
--- a/libs/libzmq/RELICENSE/minrk.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Min Ragan-Kelley
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the GitHub handle "minrk", with
-commit author "Min RK benjaminrk@gmail.com", are copyright of Min Ragan-Kelley.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Min Ragan-Kelley 
-2017/07/17
diff --git a/libs/libzmq/RELICENSE/mipaaa.md b/libs/libzmq/RELICENSE/mipaaa.md
deleted file mode 100644
index c8b7f1a..0000000
--- a/libs/libzmq/RELICENSE/mipaaa.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Michael Hand
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "mipaaa", with
-commit author "Michael Hand <mipaaa@gmail.com>", are copyright of Michael Hand.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Michael Hand
-2017/03/21
diff --git a/libs/libzmq/RELICENSE/mjvk.md b/libs/libzmq/RELICENSE/mjvk.md
deleted file mode 100644
index 3620aa5..0000000
--- a/libs/libzmq/RELICENSE/mjvk.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Mark Jan van Kampen that grants permission to
-relicense its copyrights in the libzmq C++ library (ZeroMQ) under the
-Mozilla Public License v2 (MPLv2) or any other Open Source Initiative
-approved license chosen by the current ZeroMQ BDFL (Benevolent
-Dictator for Life).
-
-A portion of the commits made by the Github handle "mjvk" and "mjvankampen", with
-commit author "Mark Jan van Kampen <markjanvankampen@gmail.com>", are
-copyright of Mark Jan van Kampen.  This document hereby grants the libzmq
-project team to relicense libzmq, including all past, present and
-future contributions of the author listed above.
-
-Mark Jan van Kampen
-2020/02/24
\ No newline at end of file
diff --git a/libs/libzmq/RELICENSE/mkluwe.md b/libs/libzmq/RELICENSE/mkluwe.md
deleted file mode 100644
index 3ffe98d..0000000
--- a/libs/libzmq/RELICENSE/mkluwe.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Matthias Kluwe
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "mkluwe", with
-commit author "Matthias Kluwe <mkluwe@gmail.com>", are copyright of Matthias Kluwe.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Matthias Kluwe
-2017/03/24
diff --git a/libs/libzmq/RELICENSE/mkoppanen.md b/libs/libzmq/RELICENSE/mkoppanen.md
deleted file mode 100644
index 061732d..0000000
--- a/libs/libzmq/RELICENSE/mkoppanen.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Mikko Koppanen that grants permission to relicense his
-copyrights in the libzmq C++ library (ZeroMQ) under the Mozilla Public License
-v2 (MPLv2) or any other Open Source Initiative approved license chosen by the
-current ZeroMQ BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "mkoppanen", with commit
-author "Mikko Koppanen <mikko@kuut.io>", are copyright of Mikko Koppanen.
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed
-above.
-
-Mikko Koppanen
-2018/02/17
diff --git a/libs/libzmq/RELICENSE/mloy.md b/libs/libzmq/RELICENSE/mloy.md
deleted file mode 100644
index ae90445..0000000
--- a/libs/libzmq/RELICENSE/mloy.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Matthias Loy
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "mloy", with
-commit author "Matthias Loy", are copyright of Matthias Loy.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Matthias Loy
-2020/01/18
-
diff --git a/libs/libzmq/RELICENSE/mongodb.md b/libs/libzmq/RELICENSE/mongodb.md
deleted file mode 100644
index 774a345..0000000
--- a/libs/libzmq/RELICENSE/mongodb.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Jonathan Reams (of MongoDB, Inc.)
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other
-Open Source Initiative approved license chosen by the current ZeroMQ
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "jbreams", with
-commit author "Jonathan Reams jbreams@mongodb.com" (specifically the commits merged in pull requests #1451, #1449, #1448, and #1174), are copyright of
-MongoDB, Inc.
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed
-above.
-
-Jonathan Reams
-2019/10/1
diff --git a/libs/libzmq/RELICENSE/montoyaedu.md b/libs/libzmq/RELICENSE/montoyaedu.md
deleted file mode 100644
index 62df225..0000000
--- a/libs/libzmq/RELICENSE/montoyaedu.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by H. Eduardo Montoya Sánchez
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "montoyaedu", with
-commit author "Montoya Edu <montoya.edu@gmail.com>", are copyright of H. Eduardo Montoya Sánchez.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-H. Eduardo Montoya Sánchez
-2017/03/20
diff --git a/libs/libzmq/RELICENSE/moretromain.md b/libs/libzmq/RELICENSE/moretromain.md
deleted file mode 100644
index 88d6fb2..0000000
--- a/libs/libzmq/RELICENSE/moretromain.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Romain Moret that grants permission to
-relicense its copyrights in the libzmq C++ library (ZeroMQ) under the
-Mozilla Public License v2 (MPLv2) or any other Open Source Initiative
-approved license chosen by the current ZeroMQ BDFL (Benevolent
-Dictator for Life).
-
-A portion of the commits made by the Github handle "moretromain", with
-commit author "Romain Moret <moretromain@gmail.com>", are
-copyright of Romain Moret.  This document hereby grants the libzmq
-project team to relicense libzmq, including all past, present and
-future contributions of the author listed above.
-
-Romain Moret
-2019/05/06
\ No newline at end of file
diff --git a/libs/libzmq/RELICENSE/mrvn.md b/libs/libzmq/RELICENSE/mrvn.md
deleted file mode 100644
index d8ad4a9..0000000
--- a/libs/libzmq/RELICENSE/mrvn.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Goswin von Brederlow
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "mrvn", with
-commit author "Goswin von Brederlow <goswin-v-b@web.de>" or "Goswin von Brederlow <brederlo@q-leap.de>", are copyright of Goswin von Brederlow.
-This document hereby grants the libzmq project team to relicense
-libzmq,
-including all past, present and future contributions of the author
-listed above.
-
-Goswin von Brederlow
-2020/12/20
diff --git a/libs/libzmq/RELICENSE/msune.md b/libs/libzmq/RELICENSE/msune.md
deleted file mode 100644
index 9f73c46..0000000
--- a/libs/libzmq/RELICENSE/msune.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Marc Suñé Clos (msune)
-that grants permission to relicense his copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other
-Open Source Initiative approved license chosen by the current ZeroMQ
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "msune", with
-commit author "Marc Sune <marcdevel@gmail.com>" or
-"Marc Sune <marc@voltanet.io>", are copyright of Marc Suñé.
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed
-above.
-
-Marc Suñé Clos
-2019/08/31
diff --git a/libs/libzmq/RELICENSE/murphybytes.md b/libs/libzmq/RELICENSE/murphybytes.md
deleted file mode 100644
index 7930e43..0000000
--- a/libs/libzmq/RELICENSE/murphybytes.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by John Murphy    
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "murphybytes", with
-commit author "John Murphy <murphybytes@gmail.com>", are copyright of John Murphy .
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-John Murphy
-2019/08/12
diff --git a/libs/libzmq/RELICENSE/mvilim.md b/libs/libzmq/RELICENSE/mvilim.md
deleted file mode 100644
index 5c4d70c..0000000
--- a/libs/libzmq/RELICENSE/mvilim.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Michael Vilim that grants permission to
-relicense its copyrights in the libzmq C++ library (ZeroMQ) under the
-Mozilla Public License v2 (MPLv2) or any other Open Source Initiative
-approved license chosen by the current ZeroMQ BDFL (Benevolent
-Dictator for Life).
-
-A portion of the commits made by the Github handle "mvilim", with
-commit author "Michael Vilim <697a9b924bfa6f06a81e82975ddca4785b90a7b40d91044ce76f68d3bd65a9b8@697a9b924bfa6f06a81e82975ddca4785b90a7b40d91044ce76f68d3bd65a9b8.com>", are
-copyright of Michael Vilim.  This document hereby grants the libzmq
-project team to relicense libzmq, including all past, present and
-future contributions of the author listed above.
-
-Michael Vilim
-2019/08/31
diff --git a/libs/libzmq/RELICENSE/mystfit.md b/libs/libzmq/RELICENSE/mystfit.md
deleted file mode 100644
index b8c607f..0000000
--- a/libs/libzmq/RELICENSE/mystfit.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Byron Mallett
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "mystfit", with
-commit author "Byron Mallett <byronated@gmail.com>", are copyright of Byron Mallett .
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Byron Mallett 
-2018/9/1
diff --git a/libs/libzmq/RELICENSE/naos_ltd.md b/libs/libzmq/RELICENSE/naos_ltd.md
deleted file mode 100644
index 1140739..0000000
--- a/libs/libzmq/RELICENSE/naos_ltd.md
+++ /dev/null
@@ -1,19 +0,0 @@
-## Naos Ltd (a New Zealand company)
-
-This is a statement by Naos Ltd (Naos) that grants permission to
-relicense its copyrights in the libzmq C++ library (ZeroMQ) under
-the Mozilla Public License v2 (MPLv2).
-
-The port of libzmq to run on the z/OS Mainframe ([GitHub Pull
-request #1136](https://github.com/zeromq/libzmq/pull/1136), [GitHub Pull
-request #1138](https://github.com/zeromq/libzmq/pull/1138), and
-[GitHub Pull request #1139](https://github.com/zeromq/libzmq/pull/1139))
-was performed as work for hire under contract to iMatix Corporation
-sprl, itself under contract to a client.  Thus copyright in that
-portability work does not belong to Naos Ltd, and Naos Ltd hereby
-releases any claim to the copyright in the z/OS Mainframe portability
-work identified by the above three GitHub pull requests.
-
-Ewen McNeill  
-Managing Director, Naos Ltd  
-2016-04-25
diff --git a/libs/libzmq/RELICENSE/natano.md b/libs/libzmq/RELICENSE/natano.md
deleted file mode 100644
index fd127de..0000000
--- a/libs/libzmq/RELICENSE/natano.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Martin Natano
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "natano", with
-commit author "Martin Natano", are copyright of Martin Natano.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Martin Natano
-2017/03/21
diff --git a/libs/libzmq/RELICENSE/neheb.md b/libs/libzmq/RELICENSE/neheb.md
deleted file mode 100644
index d616230..0000000
--- a/libs/libzmq/RELICENSE/neheb.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Rosen Penev
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "flub", with
-commit author "Rosen Penev <rosenp@gmail.com>", are copyright of
-Rosen Penev .
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed above.
-
-Rosen Penev
-2019/04/19
diff --git a/libs/libzmq/RELICENSE/nevalsar.md b/libs/libzmq/RELICENSE/nevalsar.md
deleted file mode 100644
index 18e17e6..0000000
--- a/libs/libzmq/RELICENSE/nevalsar.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other share-alike OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Nevin Valsaraj that grants permission to relicense its 
-copyrights in the libzmq C++ library (ZeroMQ) under the Mozilla Public License 
-v2 (MPLv2) or any other share-alike Open Source Initiative approved license 
-chosen by the current ZeroMQ BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "nevalsar", with
-commit author "Nevin Valsaraj <nevin.valsaraj32@gmail.com>", are copyright of 
-Nevin Valsaraj. This document hereby grants the libzmq project team to relicense
-libzmq, including all past, present and future contributions of the author 
-listed above.
-
-Nevin Valsaraj
-2022/08/03
diff --git a/libs/libzmq/RELICENSE/ninoles.md b/libs/libzmq/RELICENSE/ninoles.md
deleted file mode 100644
index 508b6e8..0000000
--- a/libs/libzmq/RELICENSE/ninoles.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Fabien Ninoles that grants permission to relicense
-its copyrights in the libzmq C++ library (ZeroMQ) under the Mozilla
-Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "ninoles",
-with commit author "Fabien Ninoles", are copyright of Fabien Ninoles.
-
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author
-listed above.
-
-Fabien Ninoles
-
-2020/02/11
diff --git a/libs/libzmq/RELICENSE/nixman.md b/libs/libzmq/RELICENSE/nixman.md
deleted file mode 100644
index 4b2499c..0000000
--- a/libs/libzmq/RELICENSE/nixman.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by niXman (github.nixman@pm.me)
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "niXman", with
-commit author "niXman", are copyright of nixMan .
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-niXman (github.nixman@pm.me)
-2019/10/03
diff --git a/libs/libzmq/RELICENSE/niyassait.md b/libs/libzmq/RELICENSE/niyassait.md
deleted file mode 100644
index 64d8ccd..0000000
--- a/libs/libzmq/RELICENSE/niyassait.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Niyas SAIT
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other
-Open Source Initiative approved license chosen by the current ZeroMQ
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "nsait-linaro", with
-commit author "Niyas SAIT", are copyright of Niyas SAIT .
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed above.
-
-Niyas SAIT (nsait-linaro)
-Done in Cambridge, UK on the 2021/11/15
diff --git a/libs/libzmq/RELICENSE/nokia.md b/libs/libzmq/RELICENSE/nokia.md
deleted file mode 100644
index 49e2f45..0000000
--- a/libs/libzmq/RELICENSE/nokia.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Nokia
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "aheroff1", with
-commit author "Andy Heroff", are copyright of Nokia.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Andy Heroff
-2021/01/05
diff --git a/libs/libzmq/RELICENSE/normano.md b/libs/libzmq/RELICENSE/normano.md
deleted file mode 100644
index 0d82f5f..0000000
--- a/libs/libzmq/RELICENSE/normano.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Norman Ovenseri
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other
-Open Source Initiative approved license chosen by the current ZeroMQ
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "normano", with
-commit author "normano", are copyright of Norman Ovenseri.
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed above.
-
-This is a statement by Norman Ovenseri
-2019/05/01
diff --git a/libs/libzmq/RELICENSE/ojura.md b/libs/libzmq/RELICENSE/ojura.md
deleted file mode 100644
index 8ebf883..0000000
--- a/libs/libzmq/RELICENSE/ojura.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Juraj Oršulić that grants permission to relicense its copyrights in the libzmq C++ library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "ojura", with commit author "Juraj Oršulić", are copyright of Juraj Oršulić.
-This document hereby grants the libzmq project team to relicense libzmq, including all past, present and future contributions of the author listed above.
-
-Juraj Oršulić
-2018/10/26
diff --git a/libs/libzmq/RELICENSE/olafmandel.md b/libs/libzmq/RELICENSE/olafmandel.md
deleted file mode 100644
index 9372bb4..0000000
--- a/libs/libzmq/RELICENSE/olafmandel.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Olaf Mandel
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "olafmandel", with
-commit author "Olaf Mandel <o.mandel@menlosystems.com>", are copyright of Olaf Mandel.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Olaf Mandel
-2017/03/21
diff --git a/libs/libzmq/RELICENSE/omegastick.md b/libs/libzmq/RELICENSE/omegastick.md
deleted file mode 100644
index 47d46ed..0000000
--- a/libs/libzmq/RELICENSE/omegastick.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Isaac Poulton
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "Omegastick", with
-commit author "Omegastick", are copyright of Isaac Poulton.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Isaac Poulton
-2019/04/14
diff --git a/libs/libzmq/RELICENSE/opedroso.md b/libs/libzmq/RELICENSE/opedroso.md
deleted file mode 100644
index 772e8b3..0000000
--- a/libs/libzmq/RELICENSE/opedroso.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by "Osiris Pedroso"
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "opedroso", with
-commit author "Osiris Pedroso <opedroso@gmail.com>", are copyright of "Osiris Pedroso".
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Osiris Pedroso
-2017/03/21
diff --git a/libs/libzmq/RELICENSE/opensource-kymetacorp.md b/libs/libzmq/RELICENSE/opensource-kymetacorp.md
deleted file mode 100644
index 1723d2a..0000000
--- a/libs/libzmq/RELICENSE/opensource-kymetacorp.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Kymeta Corporation
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other
-Open Source Initiative approved license chosen by the current ZeroMQ
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "opensource-kymetacorp", with
-commit author "opensource-kymetacorp", are copyright of Kymeta Corporation.
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed above.
-
-Kymeta Corporation
-2018/11/21
diff --git a/libs/libzmq/RELICENSE/paddor.md b/libs/libzmq/RELICENSE/paddor.md
deleted file mode 100644
index add5103..0000000
--- a/libs/libzmq/RELICENSE/paddor.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Patrik Wenger
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "paddor", with
-commit author "Patrik Wenger", are copyright of Patrik Wenger .
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed above.
-
-Patrik Wenger
-2019/08/31
diff --git a/libs/libzmq/RELICENSE/panlinux.md b/libs/libzmq/RELICENSE/panlinux.md
deleted file mode 100644
index b43a404..0000000
--- a/libs/libzmq/RELICENSE/panlinux.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Andreas Hasenack that grants permission to
-relicense its copyrights in the libzmq C++ library (ZeroMQ) under the
-Mozilla Public License v2 (MPLv2) or any other Open Source Initiative
-approved license chosen by the current ZeroMQ BDFL (Benevolent
-Dictator for Life).
-
-A portion of the commits made by the Github handle "panlinux", with
-commit author "Andreas Hasenack <andreas@canonical.com>", are
-copyright of Andreas Hasenack.  This document hereby grants the libzmq
-project team to relicense libzmq, including all past, present and
-future contributions of the author listed above.
-
-Andreas Hasenack
-2019/03/18
-
diff --git a/libs/libzmq/RELICENSE/patrickvolante.md b/libs/libzmq/RELICENSE/patrickvolante.md
deleted file mode 100644
index 1f84827..0000000
--- a/libs/libzmq/RELICENSE/patrickvolante.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other share-alike OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Patrick Volante
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-share-alike Open Source Initiative approved license chosen by the current 
-ZeroMQ BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "patrick-volante", with
-commit author "patrick-volante <patrick.volante@thalesgroup.com>", are copyright of patrick volante.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Patrick Volante  
-03/12/2021
diff --git a/libs/libzmq/RELICENSE/pavel-pimenov.md b/libs/libzmq/RELICENSE/pavel-pimenov.md
deleted file mode 100644
index d62b599..0000000
--- a/libs/libzmq/RELICENSE/pavel-pimenov.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Pavel Pimenov
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle pavel-pimenov, with
-commit author Pavel Pimenov pavel.pimenov@gmail.com, are copyright of Pavel Pimenov .
-This document hereby grants the libzmq project team to relicense
-libzmq, 
-including all past, present and future contributions of the author
-listed above.
-
-Pavel Pimenov
-2020/02/04
diff --git a/libs/libzmq/RELICENSE/philippeleite.md b/libs/libzmq/RELICENSE/philippeleite.md
deleted file mode 100644
index c7aa321..0000000
--- a/libs/libzmq/RELICENSE/philippeleite.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Philippe Leite that grants permission to
-relicense its copyrights in the libzmq C++ library (ZeroMQ) under the
-Mozilla Public License v2 (MPLv2) or any other Open Source Initiative
-approved license chosen by the current ZeroMQ BDFL (Benevolent
-Dictator for Life).
-
-A portion of the commits made by the Github handle "philippeleite", with
-commit author "Philippe Leite <philippe.leite@gmail.com>", are
-copyright of Philippe Leite.  This document hereby grants the libzmq
-project team to relicense libzmq, including all past, present and
-future contributions of the author listed above.
-
-Philippe Leite
-2019/06/10
diff --git a/libs/libzmq/RELICENSE/phreed.md b/libs/libzmq/RELICENSE/phreed.md
deleted file mode 100644
index d14b992..0000000
--- a/libs/libzmq/RELICENSE/phreed.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Fredrick Paul Eisele
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle phreed, with
-commit author "Fred Eisele", are copyright of Fred Eisele .
-This document hereby grants the libzmq project team to relicense
-libzmq,
-including all past, present and future contributions of the author
-listed above.
-
-Fredrick Paul Eisele
-2020/01/03
diff --git a/libs/libzmq/RELICENSE/pijyoi.md b/libs/libzmq/RELICENSE/pijyoi.md
deleted file mode 100644
index ffd890b..0000000
--- a/libs/libzmq/RELICENSE/pijyoi.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by KIU Shueng Chuan
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "pijyoi", with
-commit author "KIU Shueng Chuan <nixchuan@gmail.com>", are copyright of KIU Shueng Chuan.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-KIU Shueng Chuan
-2017/03/23
diff --git a/libs/libzmq/RELICENSE/pmienk.md b/libs/libzmq/RELICENSE/pmienk.md
deleted file mode 100644
index 513b0b7..0000000
--- a/libs/libzmq/RELICENSE/pmienk.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Phillip Mienk
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "pmienk", with
-commit author "Phillip Mienk <mienkphi@gmail.com>", are copyright of Phillip Mienk.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Phillip Mienk
-2019/02/18
diff --git a/libs/libzmq/RELICENSE/pnnl.md b/libs/libzmq/RELICENSE/pnnl.md
deleted file mode 100644
index d3a05c9..0000000
--- a/libs/libzmq/RELICENSE/pnnl.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Pacific Northwest National Laboratory (Battelle Memorial Institute, Pacific Northwest Division)
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other
-Open Source Initiative approved license (at least as permissive as the MPLv2) chosen by the current ZeroMQ
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "hashstat", with
-commit author "Brandon Carpenter <brandon.carpenter@pnnl.gov>", are copyright of Pacific Northwest National Laboratory (Battelle Memorial Institute, Pacific Northwest Division).
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed above.
-
-Jereme Haack on behalf of Brandon Carpenter
-2019/02/18
diff --git a/libs/libzmq/RELICENSE/prarrot.md b/libs/libzmq/RELICENSE/prarrot.md
deleted file mode 100644
index d98cb05..0000000
--- a/libs/libzmq/RELICENSE/prarrot.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Timothy Mossbarger
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other
-Open Source Initiative approved license chosen by the current ZeroMQ
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "Prarrot", with
-commit author "Prarrot", are copyright of Timothy Mossbarger .
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed above.
-
-Timothy Mossbarger
-18 Feb 2019
diff --git a/libs/libzmq/RELICENSE/psl-felipefarinon.md b/libs/libzmq/RELICENSE/psl-felipefarinon.md
deleted file mode 100644
index 80e7c31..0000000
--- a/libs/libzmq/RELICENSE/psl-felipefarinon.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Felipe Goron Farinon (psl-felipefarinon)
-that grants permission to relicense his copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other
-Open Source Initiative approved license chosen by the current ZeroMQ
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "psl-felipefarinon", with
-commit author "Felipe Goron Farinon", are copyright of Felipe Goron Farinon.
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed
-above.
-
-Felipe Goron Farinon
-2019/09/02
diff --git a/libs/libzmq/RELICENSE/ptroja.md b/libs/libzmq/RELICENSE/ptroja.md
deleted file mode 100644
index 6a9b1e8..0000000
--- a/libs/libzmq/RELICENSE/ptroja.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Piotr Trojanek that grants permission to relicense its
-copyrights in the libzmq C++ library (ZeroMQ) under the Mozilla Public License
-v2 (MPLv2) or any other Open Source Initiative approved license chosen by the
-current ZeroMQ BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "ptroja", with
-commit author "Piotr Trojanek <piotr.trojanek@gmail.com>", are copyright of Piotr Trojanek.
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed above.
-
-Piotr Trojanek
-2017/03/19
diff --git a/libs/libzmq/RELICENSE/qzkLicense b/libs/libzmq/RELICENSE/qzkLicense
deleted file mode 100644
index ef317da..0000000
--- a/libs/libzmq/RELICENSE/qzkLicense
+++ /dev/null
@@ -1,6 +0,0 @@
-Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-This is a statement by Qqzk that grants permission to relicense its copyrights in the libzmq C++ library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other Open Source Initiative approved license chosen by the current ZeroMQ BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "qzkLicense", with commit author "Qzk quzhongkui1@163.com", are copyright of Qqzk. This document hereby grants the libzmq project team to relicense libzmq, including all past, present and future contributions of the author listed above.
-
-Qqzk 2021/11/03
diff --git a/libs/libzmq/RELICENSE/rcxdude.md b/libs/libzmq/RELICENSE/rcxdude.md
deleted file mode 100644
index 24514e5..0000000
--- a/libs/libzmq/RELICENSE/rcxdude.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Douglas Young
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "rcxdude", with
-commit author "Douglas Young <rcxdude@gmail.com>", are copyright of Douglas Young .
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Douglas Young 
-2019/08/31
diff --git a/libs/libzmq/RELICENSE/reunanen.md b/libs/libzmq/RELICENSE/reunanen.md
deleted file mode 100644
index 4892385..0000000
--- a/libs/libzmq/RELICENSE/reunanen.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Juha Reunanen, Tomaattinen Ltd, and Outotec (Finland) Oy
-that grants permission to relicense their copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the GitHub handle "reunanen", with
-commit author "Juha Reunanen <juha.reunanen@tomaattinen.com>", are copyright of Juha Reunanen.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Juha Reunanen
-2017/04/01
diff --git a/libs/libzmq/RELICENSE/rex4539.md b/libs/libzmq/RELICENSE/rex4539.md
deleted file mode 100644
index df73d4a..0000000
--- a/libs/libzmq/RELICENSE/rex4539.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other share-alike OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Patrick Volante
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-share-alike Open Source Initiative approved license chosen by the current 
-ZeroMQ BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "rex4539", with
-commit author "Dimitris Apostolou <dimitris.apostolou@icloud.com>", are copyright of Dimitris Apostolou.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Dimitris Apostolou  
-11/02/2022
\ No newline at end of file
diff --git a/libs/libzmq/RELICENSE/reza-ebrahimi.md b/libs/libzmq/RELICENSE/reza-ebrahimi.md
deleted file mode 100644
index e393ec9..0000000
--- a/libs/libzmq/RELICENSE/reza-ebrahimi.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Reza Ebrahimi
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "reza-ebrahimi", with
-commit author "Reza Ebrahimi <reza.ebrahimi.dev@gmail.com>", are copyright of Reza Ebrahimi.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Reza Ebrahimi
-2017/03/22
\ No newline at end of file
diff --git a/libs/libzmq/RELICENSE/rgagnon24.md b/libs/libzmq/RELICENSE/rgagnon24.md
deleted file mode 100644
index 007f0af..0000000
--- a/libs/libzmq/RELICENSE/rgagnon24.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Robert Gagnon that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other Open Source Initiative approved
-license chosen by the current ZeroMQ BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "rgagnon24", with commit author
-"Robert Gagnon rgagnon24+zmq@gmail.com", are copyright of Robert Gagnon.  This document hereby grants the
-libzmq project team to relicense libzmq, including all past, present and future contributions of the
-author listed above.
-
-Robert Gagnon  
-2017/03/19
diff --git a/libs/libzmq/RELICENSE/rikvdh.md b/libs/libzmq/RELICENSE/rikvdh.md
deleted file mode 100644
index 2fdcbbe..0000000
--- a/libs/libzmq/RELICENSE/rikvdh.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Rik van der Heijden
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "rikvdh", with
-commit author "Rik van der Heijden <mail@rikvanderheijden.com>" and "Rik van der Heijden <rik.vanderheijden@dualinventive.com>", are copyright of Rik van der Heijden.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Rik van der Heijden
-2017/04/23
diff --git a/libs/libzmq/RELICENSE/rlenferink.md b/libs/libzmq/RELICENSE/rlenferink.md
deleted file mode 100644
index f7b3365..0000000
--- a/libs/libzmq/RELICENSE/rlenferink.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Roy Lenferink
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "rlenferink", with
-commit author "Roy Lenferink <lenferinkroy@gmail.com>" or "Roy Lenferink <rlenferink@apache.org>", are copyright of Roy Lenferink.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Roy Lenferink  
-2017/03/17
\ No newline at end of file
diff --git a/libs/libzmq/RELICENSE/roalz.md b/libs/libzmq/RELICENSE/roalz.md
deleted file mode 100644
index b3f0680..0000000
--- a/libs/libzmq/RELICENSE/roalz.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Roal Zanazzi that grants permission to relicense its
-copyrights in the libzmq C++ library (ZeroMQ) under the Mozilla Public License
-v2 (MPLv2).
-
-A portion of the commits made by the Github handle "roalz", with commit author 
-"roalz <roal.zanazzi@gmail.com>", are copyright of Roal Zanazzi.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Roal Zanazzi  
-2017/03/21
diff --git a/libs/libzmq/RELICENSE/rodgert.md b/libs/libzmq/RELICENSE/rodgert.md
deleted file mode 100644
index 51e0069..0000000
--- a/libs/libzmq/RELICENSE/rodgert.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Thomas Rodgers 
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "rodgert", with
-commit author "Thomas Rodgers <rodgert@twrodgers.com>", are copyright
-of Thomas Rodgers.
-
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Thomas W Rodgers
-2017/04/08
diff --git a/libs/libzmq/RELICENSE/rotty.md b/libs/libzmq/RELICENSE/rotty.md
deleted file mode 100644
index 0823450..0000000
--- a/libs/libzmq/RELICENSE/rotty.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Permission to Relicense under MPLv2 or any other share-alike OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Andreas Rottmann that grants permission to
-relicense its copyrights in the libzmq C++ library (ZeroMQ) under the
-Mozilla Public License v2 (MPLv2) or any other share-alike Open Source
-Initiative approved license chosen by the current ZeroMQ BDFL
-(Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "rotty", with
-commit author "Andreas Rottmann <a.rottmann@gmx.at>", are copyright of
-Andreas Rottmann.  This document hereby grants the libzmq project team
-to relicense libzmq, including all past, present and future
-contributions of the author listed above.
-
-Andreas Rottmann
-2017/05/07
diff --git a/libs/libzmq/RELICENSE/sab24.md b/libs/libzmq/RELICENSE/sab24.md
deleted file mode 100644
index 4d4acfc..0000000
--- a/libs/libzmq/RELICENSE/sab24.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Bart Smink
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other
-Open Source Initiative approved license chosen by the current
-ZeroMQ BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "sab24", with
-commit author "sab24 <sab24@github.com>", are copyright of Bart Smink.
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed above.
-
-Bart Smink 2021/01/30
diff --git a/libs/libzmq/RELICENSE/sabotagebeats.md b/libs/libzmq/RELICENSE/sabotagebeats.md
deleted file mode 100644
index e62df11..0000000
--- a/libs/libzmq/RELICENSE/sabotagebeats.md
+++ /dev/null
@@ -1,16 +0,0 @@
-  
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by sabotagebeats
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "sabotagebeats", with
-commit author "sabotagebeats", are copyright of sabotagebeats .
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-sabotagebeats
-2021/7/24
\ No newline at end of file
diff --git a/libs/libzmq/RELICENSE/sappo.md b/libs/libzmq/RELICENSE/sappo.md
deleted file mode 100644
index 88c9195..0000000
--- a/libs/libzmq/RELICENSE/sappo.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Kevin Sapper that grants permission to relicense its
-copyrights in the libzmq C++ library (ZeroMQ) under the Mozilla Public License
-v2 (MPLv2).
-
-A portion of the commits made by the Github handle "sappo", with commit author
-"Kevin Sapper <mail@kevinsapper.de>", are copyright of Kevin Sapper. This document hereby grants the
-libzmq project team to relicense libzmq, including all past, present and future
-contributions of the author listed above.
-
-Kevin Sapper
-2017/03/20
diff --git a/libs/libzmq/RELICENSE/saschavv.md b/libs/libzmq/RELICENSE/saschavv.md
deleted file mode 100644
index 2328140..0000000
--- a/libs/libzmq/RELICENSE/saschavv.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Sascha van Vliet 
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "saschavv", with
-commit author "Sascha van Vliet <saschavv@gmail.com>", are copyright of Sascha van Vliet.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Sascha van Vliet
-2021/07/30
diff --git a/libs/libzmq/RELICENSE/scemama.md b/libs/libzmq/RELICENSE/scemama.md
deleted file mode 100644
index d90ef8d..0000000
--- a/libs/libzmq/RELICENSE/scemama.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Anthony Scemama
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "scemama", with
-commit author "Anthony Scemama <scemama@irsamc.ups-tlse.fr>", are copyright of Anthony Scemama.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Anthony Scemama
-2017/03/21
diff --git a/libs/libzmq/RELICENSE/schulzch.md b/libs/libzmq/RELICENSE/schulzch.md
deleted file mode 100644
index 2ed2939..0000000
--- a/libs/libzmq/RELICENSE/schulzch.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Christoph Schulz
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "schulzch", with
-commit author "Christoph Schulz <schulzcbs@gmail.com>", are copyright of Christoph Schulz.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Christoph Schulz
-2018/09/10
diff --git a/libs/libzmq/RELICENSE/sdrsdr.md b/libs/libzmq/RELICENSE/sdrsdr.md
deleted file mode 100644
index 4d7563c..0000000
--- a/libs/libzmq/RELICENSE/sdrsdr.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Stoian Ivanov that grants permission to relicense
-its copyrights in the libzmq C++ library (ZeroMQ) under the Mozilla Public 
-License v2 (MPLv2) or any other Open Source Initiative approved license 
-chosen by the current ZeroMQ BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "sdrsdr", with commit 
-author "Stoian Ivanov sdr@mail.bg", are copyright of Stoian Ivanov. This 
-document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Stoian Ivanov
-2017-03-23
diff --git a/libs/libzmq/RELICENSE/serg06.md b/libs/libzmq/RELICENSE/serg06.md
deleted file mode 100644
index 59174a5..0000000
--- a/libs/libzmq/RELICENSE/serg06.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by serg06 (serg06)
-that grants permission to relicense his copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other
-Open Source Initiative approved license chosen by the current ZeroMQ
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "serg06", with commit author
-"serg06 <serkhas@hotmail.com>" are copyright of serg06.
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed above.
-
-serg06
-2020/05/25
diff --git a/libs/libzmq/RELICENSE/shancat.md b/libs/libzmq/RELICENSE/shancat.md
deleted file mode 100644
index 5e3aeb2..0000000
--- a/libs/libzmq/RELICENSE/shancat.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Shannen Saez
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "shancat", with
-commit author "Shannen Saez <shannenlaptop@gmail.com>", are copyright of Shannen Saez.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Shannen Saez
-2017/03/21
diff --git a/libs/libzmq/RELICENSE/sheremetyev.md b/libs/libzmq/RELICENSE/sheremetyev.md
deleted file mode 100644
index a341233..0000000
--- a/libs/libzmq/RELICENSE/sheremetyev.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Fedor Sheremetyev
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "sheremetyev", with
-commit author "Fedor Sheremetyev <sheremetyev@gmail.com>", are copyright of Fedor Sheremetyev.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Fedor Sheremetyev  
-2017/03/20
diff --git a/libs/libzmq/RELICENSE/shripchenko.md b/libs/libzmq/RELICENSE/shripchenko.md
deleted file mode 100644
index 932f9f4..0000000
--- a/libs/libzmq/RELICENSE/shripchenko.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Sergey KHripchenko
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "shripchenko", with
-commit author "Sergey KHripchenko <shripchenko@intermedia.net>", are copyright of Sergey KHripchenko.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Sergey KHripchenko  
-2017/03/20
\ No newline at end of file
diff --git a/libs/libzmq/RELICENSE/sigiesec.md b/libs/libzmq/RELICENSE/sigiesec.md
deleted file mode 100644
index c7eaf3b..0000000
--- a/libs/libzmq/RELICENSE/sigiesec.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Simon Giesecke that grants permission to
-relicense its copyrights in the libzmq C++ library (ZeroMQ) under the
-Mozilla Public License v2 (MPLv2) or any other Open Source Initiative
-approved license chosen by the current ZeroMQ BDFL (Benevolent
-Dictator for Life).
-
-A portion of the commits made by the Github handle "sigiesec", with
-commit author "Simon Giesecke <simon.giesecke@btc-ag.com>", are
-copyright of Simon Giesecke.  This document hereby grants the libzmq
-project team to relicense libzmq, including all past, present and
-future contributions of the author listed above.
-
-Simon Giesecke
-2017/08/17
-
diff --git a/libs/libzmq/RELICENSE/simias.md b/libs/libzmq/RELICENSE/simias.md
deleted file mode 100644
index 1a8d89d..0000000
--- a/libs/libzmq/RELICENSE/simias.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Lionel Flandrin
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other
-Open Source Initiative approved license chosen by the current ZeroMQ
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "simias", with
-commit author "Lionel Flandrin lflandrin@ereca.fr", are copyright of Lionel Flandrin.
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed above.
-
-Lionel Flandrin
-2018/05/02
diff --git a/libs/libzmq/RELICENSE/skaes.md b/libs/libzmq/RELICENSE/skaes.md
deleted file mode 100644
index acdc4b5..0000000
--- a/libs/libzmq/RELICENSE/skaes.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Dr. Stefan Kaes that grants permission to relicense its
-copyrights in the libzmq C++ library (ZeroMQ) under the Mozilla Public License
-v2 (MPLv2).
-
-A portion of the commits made by the Github handle "skaes", with commit author
-"Stefan Kaes <stefan.kaes@xing.com>", are copyright of New Work SE.  This
-document hereby grants the libzmq project team to relicense libzmq, including
-all past, present and future contributions of the author listed above.
-
-Dr. Stefan Kaes
-2021/01/04
diff --git a/libs/libzmq/RELICENSE/skaller.md b/libs/libzmq/RELICENSE/skaller.md
deleted file mode 100644
index 7aa59a7..0000000
--- a/libs/libzmq/RELICENSE/skaller.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by John Skallwe
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any
-other Open Source Initiative approved license chosen by the current ZeroMQ
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle “skaller", with
-commit author “skaller", are copyright of John Skaller .
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed above.
-
-John Skaller
-2019/09/01
diff --git a/libs/libzmq/RELICENSE/skicc.md b/libs/libzmq/RELICENSE/skicc.md
deleted file mode 100644
index 127d7db..0000000
--- a/libs/libzmq/RELICENSE/skicc.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by skicc
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "skicc", with
-commit author "skicc <skicc@fastmail.com>", are copyright of skicc.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-skicc
-2019/06/15
diff --git a/libs/libzmq/RELICENSE/somdoron.md b/libs/libzmq/RELICENSE/somdoron.md
deleted file mode 100644
index 6446333..0000000
--- a/libs/libzmq/RELICENSE/somdoron.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Doron Somech (somdoron)
-that grants permission to relicense his copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other
-Open Source Initiative approved license chosen by the current ZeroMQ
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "somdoron", with
-commit author "Doron Somech <somdoron@gmail.com>", are copyright of Doron Somech.
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed
-above.
-
-Doron Somech
-2019/02/18
diff --git a/libs/libzmq/RELICENSE/sonoware.md b/libs/libzmq/RELICENSE/sonoware.md
deleted file mode 100644
index 255027e..0000000
--- a/libs/libzmq/RELICENSE/sonoware.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by sonoware GmbH that grants permission to relicense its
-copyrights in the libzmq C++ library (ZeroMQ) under the Mozilla Public License
-v2 (MPLv2).
-
-A portion of the commits made by the Github handle "sonoware", with commit author
-"Stephan Senkbeil" are copyright of sonoware GmbH. 
-This document hereby grants the libzmq project team to relicense libzmq, including
-all past, present and future contributions of the authors listed above.
-
-Stephan Senkbeil <stephan.senkbeil@sonoware.de>
-2019/12/13
diff --git a/libs/libzmq/RELICENSE/soulik.md b/libs/libzmq/RELICENSE/soulik.md
deleted file mode 100644
index 3263d00..0000000
--- a/libs/libzmq/RELICENSE/soulik.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Mário Kašuba
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "soulik", with
-commit author "Mário Kašuba mario.kasuba@it-academy.sk", are copyright of Mário Kašuba.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Mário Kašuba  
-2017/03/20
\ No newline at end of file
diff --git a/libs/libzmq/RELICENSE/spotify.md b/libs/libzmq/RELICENSE/spotify.md
deleted file mode 100644
index cfda4a7..0000000
--- a/libs/libzmq/RELICENSE/spotify.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Spotify AB that grants permission to relicense its
-copyrights in the libzmq C++ library (ZeroMQ) under the Mozilla Public License
-v2 (MPLv2).
-
-A portion of the commits made by the Github handle "gimaker", with commit author
-"Staffan Gimåker", the commits made by the Github handle "danielnorberg", with
-commit author "Daniel Norberg", and the commits made by the Github handle
-"caipre", with commit author "Nick Platt", are copyright of Spotify AB. This
-document hereby grants the libzmq project team to relicense libzmq, including
-all past, present and future contributions of the authors listed above.
-
-Nick Platt <nickplatt@spotify.com>
-2019/08/21
diff --git a/libs/libzmq/RELICENSE/sradomski.md b/libs/libzmq/RELICENSE/sradomski.md
deleted file mode 100644
index 1c14788..0000000
--- a/libs/libzmq/RELICENSE/sradomski.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Stefan Radomski
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other
-Open Source Initiative approved license chosen by the current ZeroMQ
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "sradomski", with
-commit author "Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de>", are copyright of Stefan Radomski .
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed above.
-
-Stefan Radomski
-2020/12/20
diff --git a/libs/libzmq/RELICENSE/ssbl.md b/libs/libzmq/RELICENSE/ssbl.md
deleted file mode 100644
index 4529bd8..0000000
--- a/libs/libzmq/RELICENSE/ssbl.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Shubham Lagwankar that grants permission to
-relicense its copyrights in the libzmq C++ library (ZeroMQ) under the
-Mozilla Public License v2 (MPLv2) or any other Open Source Initiative
-approved license chosen by the current ZeroMQ BDFL (Benevolent
-Dictator for Life).
-
-A portion of the commits made by the Github handle "ssbl", with
-commit author "Shubham Lagwankar <shubhu105@gmail.com>", are
-copyright of Shubham Lagwankar.  This document hereby grants the libzmq
-project team to relicense libzmq, including all past, present and
-future contributions of the author listed above.
-
-Shubham Lagwankar
-2018/10/30
-
diff --git a/libs/libzmq/RELICENSE/stanpl.md b/libs/libzmq/RELICENSE/stanpl.md
deleted file mode 100644
index e74801a..0000000
--- a/libs/libzmq/RELICENSE/stanpl.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Stanisław Maciaś
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "stanpl", with
-commit author "Stanisław Maciaś", are copyright of Stanisław Maciaś.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Stanisław Maciaś
-2020/12/23
diff --git a/libs/libzmq/RELICENSE/staticfloat.md b/libs/libzmq/RELICENSE/staticfloat.md
deleted file mode 100644
index 6b1dad1..0000000
--- a/libs/libzmq/RELICENSE/staticfloat.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Elliot Saba
-that grants permission to relicense his copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "staticfloat", with
-commit author "Elliot Saba <staticfloat@gmail.com>", are copyright of Elliot Saba.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Elliot Saba
-2017/03/19
diff --git a/libs/libzmq/RELICENSE/std-any-emplace.md b/libs/libzmq/RELICENSE/std-any-emplace.md
deleted file mode 100644
index 09892ac..0000000
--- a/libs/libzmq/RELICENSE/std-any-emplace.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other share-alike OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by the Github user "std-any-emplace"
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-share-alike Open Source Initiative approved license chosen by the current 
-ZeroMQ BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "std-any-emplace", with
-commit author "std-any-emplace", are copyright of the Github user "std-any-emplace".
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-"std-any-emplace"
-2020/01/19
\ No newline at end of file
diff --git a/libs/libzmq/RELICENSE/stephan57160.md b/libs/libzmq/RELICENSE/stephan57160.md
deleted file mode 100644
index fca8dc9..0000000
--- a/libs/libzmq/RELICENSE/stephan57160.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Stephan Guilloux
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "stephan57160", with
-commit author "Stephan Guilloux <stephan.guilloux@crisalid.com>" or 
-are copyright of Stephan Guilloux.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Stephan Guilloux
-2022/10/13
diff --git a/libs/libzmq/RELICENSE/steve-o.md b/libs/libzmq/RELICENSE/steve-o.md
deleted file mode 100644
index 7ea393e..0000000
--- a/libs/libzmq/RELICENSE/steve-o.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Steven McCoy
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "steve-o", with
-commit author "Steven McCoy <steven.mccoy@miru.hk>" and "Steve-o 
-<fnjordy@gmail.com>", are copyright of Steven McCoy.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Steven McCoy
-2019/02/24
diff --git a/libs/libzmq/RELICENSE/straubar.md b/libs/libzmq/RELICENSE/straubar.md
deleted file mode 100644
index 975f9ae..0000000
--- a/libs/libzmq/RELICENSE/straubar.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Alexander Straub
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "straubar", with
-commit author "Alexander Straub <alexander.straub@visus.uni-stuttgart.de>", are copyright of Alexander Straub.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Alexander Straub
-2019/09/04
diff --git a/libs/libzmq/RELICENSE/suudy.md b/libs/libzmq/RELICENSE/suudy.md
deleted file mode 100644
index d2dd9f1..0000000
--- a/libs/libzmq/RELICENSE/suudy.md
+++ /dev/null
@@ -1,12 +0,0 @@
-This is a statement by Peter LaDow that grants permission to relicense its
-copyrights in the libzmq C++ library (ZeroMQ) under the Mozilla Public
-License v2 (MPLv2) or any other Open Source Initiative approved license
-chosen by the current ZeroMQ BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "Suudy", with commit
-author "Suudy <pladow@gmail.com>", are copyright of Peter LaDow.  This
-document hereby grants the libzmq project team to relicense libzmq, including
-all past, present and future contributions of the author listed above.
-
-Peter LaDow
-14 August 2019
diff --git a/libs/libzmq/RELICENSE/swansontec.md b/libs/libzmq/RELICENSE/swansontec.md
deleted file mode 100644
index c7127cf..0000000
--- a/libs/libzmq/RELICENSE/swansontec.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by William Swanson
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other
-Open Source Initiative approved license chosen by the current ZeroMQ
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "swansontec", with
-commit author " William Swanson <swansontec@gmail.com>", are copyright of William Swanson.
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed above.
-
-William Swanson
-2017/04/10
diff --git a/libs/libzmq/RELICENSE/t-b.md b/libs/libzmq/RELICENSE/t-b.md
deleted file mode 100644
index 5b17e14..0000000
--- a/libs/libzmq/RELICENSE/t-b.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Thomas Braun
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other
-Open Source Initiative approved license chosen by the current ZeroMQ
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "t-b", with
-commit author "thomas.braun@virtuell-zuhause.de" and "thomas.braun@byte-physics.de", are copyright of Thomas Braun.
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed above.
-
-Thomas Braun
-2017/03/27
diff --git a/libs/libzmq/RELICENSE/tSed.md b/libs/libzmq/RELICENSE/tSed.md
deleted file mode 100644
index 806896a..0000000
--- a/libs/libzmq/RELICENSE/tSed.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Samuel Martin
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other
-Open Source Initiative approved license chosen by the current ZeroMQ
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "tSed", with
-commit author "Samuel Martin <s.martin49@gmail.com>", are copyright of Samuel Martin.
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed above.
-
-Samuel Martin
-2017/03/25
diff --git a/libs/libzmq/RELICENSE/tabe.md b/libs/libzmq/RELICENSE/tabe.md
deleted file mode 100644
index 44f5e45..0000000
--- a/libs/libzmq/RELICENSE/tabe.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Takeshi Abe
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "tabe", with
-commit author "Takeshi Abe <tabe@fixedpoint.jp>", are copyright of Takeshi Abe.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Takeshi Abe
-2017/03/22
diff --git a/libs/libzmq/RELICENSE/tailhook.md b/libs/libzmq/RELICENSE/tailhook.md
deleted file mode 100644
index 63088b7..0000000
--- a/libs/libzmq/RELICENSE/tailhook.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Paul Colomiets
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other
-Open Source Initiative approved license chosen by the current ZeroMQ
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "tailhook", with
-commit author "Paul Colomiets <paul@colomiets.name>" or "Paul Colomiets
-<pc@gafol.net>", are copyright of Paul Colomiets.  This document hereby grants
-the libzmq project team to relicense libzmq, including all past, present and
-future contributions of the author listed above.
-
-Paul Colomiets
-2017/03/19
diff --git a/libs/libzmq/RELICENSE/taotetek.md b/libs/libzmq/RELICENSE/taotetek.md
deleted file mode 100644
index 9776921..0000000
--- a/libs/libzmq/RELICENSE/taotetek.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Brian Knox
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "taotetek", with
-commit author "Brian Knox", are copyright of Brian Knox.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Brian Knox
-2017/03/19  
diff --git a/libs/libzmq/RELICENSE/tarmo.md b/libs/libzmq/RELICENSE/tarmo.md
deleted file mode 100644
index 67c6c7a..0000000
--- a/libs/libzmq/RELICENSE/tarmo.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Tarmo Tänav that grants permission to
-relicense its copyrights in the libzmq C++ library (ZeroMQ) under the
-Mozilla Public License v2 (MPLv2) or any other Open Source Initiative
-approved license chosen by the current ZeroMQ BDFL (Benevolent
-Dictator for Life).
-
-A portion of the commits made by the Github handle "tarmo", with
-commit author "Tarmo Tänav <tarmo@itech.ee>", are copyright of Tarmo Tänav.
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed above.
-
-Tarmo Tänav
-2020/08/29
diff --git a/libs/libzmq/RELICENSE/tberkey.md b/libs/libzmq/RELICENSE/tberkey.md
deleted file mode 100644
index 7fe868c..0000000
--- a/libs/libzmq/RELICENSE/tberkey.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Telford Berkey
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "tberkey", with
-commit author "Telford Berkey <tberkey@gmail.com>", are copyright of Telford Berkey.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Telford Berkey
-
-03 Feb 2020
diff --git a/libs/libzmq/RELICENSE/templates/relicense-template-mplv2-any-osi.txt b/libs/libzmq/RELICENSE/templates/relicense-template-mplv2-any-osi.txt
deleted file mode 100644
index 4af359f..0000000
--- a/libs/libzmq/RELICENSE/templates/relicense-template-mplv2-any-osi.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by {{ name of company / name of individual }}
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "{{github username}}", with
-commit author "{{github commit author}}", are copyright of {{ name }} .
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-{{ Full Name }}  
-{{ creation date of document (format: yyyy/mm/dd) }}
\ No newline at end of file
diff --git a/libs/libzmq/RELICENSE/templates/relicense-template-mplv2-share-alike-osi.txt b/libs/libzmq/RELICENSE/templates/relicense-template-mplv2-share-alike-osi.txt
deleted file mode 100644
index f530a93..0000000
--- a/libs/libzmq/RELICENSE/templates/relicense-template-mplv2-share-alike-osi.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other share-alike OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by {{ name of company / name of individual }}
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-share-alike Open Source Initiative approved license chosen by the current 
-ZeroMQ BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "{{github username}}", with
-commit author "{{github commit author}}", are copyright of {{ name }} .
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-{{ Full Name }}  
-{{ creation date of document (format: yyyy/mm/dd) }}
\ No newline at end of file
diff --git a/libs/libzmq/RELICENSE/templates/relicense-template-mplv2.txt b/libs/libzmq/RELICENSE/templates/relicense-template-mplv2.txt
deleted file mode 100644
index 1cdd3ca..0000000
--- a/libs/libzmq/RELICENSE/templates/relicense-template-mplv2.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by {{ name of company / name of individual }}
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "{{github username}}", with
-commit author "{{github commit author}}", are copyright of {{ name }} .
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-{{ Full Name }}  
-{{ creation date of document (format: yyyy/mm/dd) }}
\ No newline at end of file
diff --git a/libs/libzmq/RELICENSE/thompsa.md b/libs/libzmq/RELICENSE/thompsa.md
deleted file mode 100644
index d62d38d..0000000
--- a/libs/libzmq/RELICENSE/thompsa.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Andrew Thompson
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "thompsa", with
-commit author "Andew Thompson <andy@fud.org.nz>", are copyright of Andrew Thompson.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Andrew Thompson
-2017/03/20
diff --git a/libs/libzmq/RELICENSE/thxkiwi.md b/libs/libzmq/RELICENSE/thxkiwi.md
deleted file mode 100644
index c4cd271..0000000
--- a/libs/libzmq/RELICENSE/thxkiwi.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other share-alike OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by MICHAEL NGARIMU
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-share-alike Open Source Initiative approved license chosen by the current 
-ZeroMQ BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "thxkiwi", with
-commit author "Michael Ngarimu <michael@thx.com>", are copyright of Michael Ngarimu.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Michael Ngarimu
-2021/10/28
\ No newline at end of file
diff --git a/libs/libzmq/RELICENSE/timblechmann.md b/libs/libzmq/RELICENSE/timblechmann.md
deleted file mode 100644
index df13dbd..0000000
--- a/libs/libzmq/RELICENSE/timblechmann.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Tim Blechmann that grants permission to
-relicense its copyrights in the libzmq C++ library (ZeroMQ) under the
-Mozilla Public License v2 (MPLv2) or any other Open Source Initiative
-approved license chosen by the current ZeroMQ BDFL (Benevolent
-Dictator for Life).
-
-A portion of the commits made by the Github handle "timblechmann", with
-commit author "Tim Blechmann <tim@klingt.org>", are
-copyright of Tim Blechmann.  This document hereby grants the libzmq
-project team to relicense libzmq, including all past, present and
-future contributions of the author listed above.
-
-Tim Blechmann
-2021/09/21
diff --git a/libs/libzmq/RELICENSE/tommd.md b/libs/libzmq/RELICENSE/tommd.md
deleted file mode 100644
index c75af8f..0000000
--- a/libs/libzmq/RELICENSE/tommd.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Thomas M. DuBuisson
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "tommd", with
-commit author "Thomas M. DuBuisson", are copyright of Thomas M. DuBuisson.
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed above.
-
-Thomas M. DuBuisson
-2019/04/11
diff --git a/libs/libzmq/RELICENSE/tomzbench.md b/libs/libzmq/RELICENSE/tomzbench.md
deleted file mode 100644
index 1cbcc4f..0000000
--- a/libs/libzmq/RELICENSE/tomzbench.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Thomas Chiantia
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "tomzbench", with
-commit author "Thomas<Thomas@Altronix.com>", are copyright of
-Thomas Chiantia.
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed above.
-
-Thomas Chiantia
-2019/08/10
diff --git a/libs/libzmq/RELICENSE/tongsong-cai.md b/libs/libzmq/RELICENSE/tongsong-cai.md
deleted file mode 100644
index d6f0cc9..0000000
--- a/libs/libzmq/RELICENSE/tongsong-cai.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Tongsong CAI
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other
-Open Source Initiative approved license chosen by the current ZeroMQ
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "caicaiking", with
-commit author "caicaiking" and "caicaiking@gmail.com", are copyright of Tongsong CAI.
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed above.
-
-Tongsong CAI
-2022/08/11
diff --git a/libs/libzmq/RELICENSE/toonetown.md b/libs/libzmq/RELICENSE/toonetown.md
deleted file mode 100644
index 62c2e8c..0000000
--- a/libs/libzmq/RELICENSE/toonetown.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Nathan Toone that grants permission to
-relicense its copyrights in the libzmq C++ library (ZeroMQ) under the
-Mozilla Public License v2 (MPLv2) or any other Open Source Initiative
-approved license chosen by the current ZeroMQ BDFL (Benevolent
-Dictator for Life).
-
-A portion of the commits made by the Github handle "toonetown", with
-commit author "Nathan Toone <nathan@toonetown.com>", are
-copyright of Nathan Toone.  This document hereby grants the libzmq
-project team to relicense libzmq, including all past, present and
-future contributions of the author listed above.
-
-Nathan Toone
-2018/11/05
-
diff --git a/libs/libzmq/RELICENSE/tranthamp.md b/libs/libzmq/RELICENSE/tranthamp.md
deleted file mode 100644
index ec81c62..0000000
--- a/libs/libzmq/RELICENSE/tranthamp.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Patrick Trantham
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "tranthamp", with
-commit author "Patrick Trantham", are copyright of Patrick Trantham
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Patrick Trantham
-2022/01/07
diff --git a/libs/libzmq/RELICENSE/trevorbernard.md b/libs/libzmq/RELICENSE/trevorbernard.md
deleted file mode 100644
index 6477d30..0000000
--- a/libs/libzmq/RELICENSE/trevorbernard.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Trevor Bernard (trevorbernard) that grants
-permission to relicense his copyrights in the libzmq C++ library
-(ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other Open
-Source Initiative approved license chosen by the current ZeroMQ BDFL
-(Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "trevorbernard",
-with commit author "Trevor Bernard <trevor.bernard@gmail.com>", are
-copyright of Trevor Bernard. This document hereby grants the libzmq
-project team to relicense libzmq, including all past, present and
-future contributions of the author listed above.
-
-Trevor Bernard
-2019/02/25
diff --git a/libs/libzmq/RELICENSE/trya.md b/libs/libzmq/RELICENSE/trya.md
deleted file mode 100644
index 8e303fe..0000000
--- a/libs/libzmq/RELICENSE/trya.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by trya.
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "trya", with
-commit author "trya", are copyright of trya.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-trya
-2019/09/23
diff --git a/libs/libzmq/RELICENSE/twhittock.md b/libs/libzmq/RELICENSE/twhittock.md
deleted file mode 100644
index 8498ed0..0000000
--- a/libs/libzmq/RELICENSE/twhittock.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Tom Whittock
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "twhittock", with
-commit author "Tom Whittock", are copyright of Tom Whittock.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Tom Whittock
-2017/04/10
diff --git a/libs/libzmq/RELICENSE/ulikoehler.md b/libs/libzmq/RELICENSE/ulikoehler.md
deleted file mode 100644
index 20f1219..0000000
--- a/libs/libzmq/RELICENSE/ulikoehler.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Uli Köhler.
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-All commits made by the Github handle "ulikoehler", with
-commit author "Uli Köhler", are copyright of Uli Köhler.
-
-This document hereby grants the libzmq project team to relicense libzmq and / or CZMQ, 
-including all past, present and future contributions of the author listed above.
-
-Uli Köhler
-2017/03/25
\ No newline at end of file
diff --git a/libs/libzmq/RELICENSE/viciious.md b/libs/libzmq/RELICENSE/viciious.md
deleted file mode 100644
index 2d77b24..0000000
--- a/libs/libzmq/RELICENSE/viciious.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Victor Luchits
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "viciious", with
-commit author "Victor Luchits", are copyright of Victor Luchits.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Victor Luchits
-2019/11/12
diff --git a/libs/libzmq/RELICENSE/vortechs2000.md b/libs/libzmq/RELICENSE/vortechs2000.md
deleted file mode 100644
index 5f63ff4..0000000
--- a/libs/libzmq/RELICENSE/vortechs2000.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Quantum Corporation
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "vortechs2000", with
-commit author "AJ Lewis aj.lewis@quantum.com", are copyright of Quantum Corporation.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-AJ Lewis
-2019/02/21
diff --git a/libs/libzmq/RELICENSE/vtellier.md b/libs/libzmq/RELICENSE/vtellier.md
deleted file mode 100644
index 3d57001..0000000
--- a/libs/libzmq/RELICENSE/vtellier.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Vincent Tellier
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "vtellier", with
-commit author "Vincent Tellier", are copyright of Vincent Tellier .
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Vincent Louis Théophile Tellier  
-2017/03/20
\ No newline at end of file
diff --git a/libs/libzmq/RELICENSE/vyskocilm.md b/libs/libzmq/RELICENSE/vyskocilm.md
deleted file mode 100644
index ddf27f1..0000000
--- a/libs/libzmq/RELICENSE/vyskocilm.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by "Michal Vyskocil" that grants permission to relicense its copyrights in the libzmq C++ library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other Open Source Initiative approved license chosen by the current ZeroMQ BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "vyskocilm", with commit author "Michal Vyskocil michal.vyskocil@gmail.com", are copyright of "Michal Vyskocil". This document hereby grants the libzmq project team to relicense libzmq, including all past, present and future contributions of the author listed above.
-
-Michal Vyskocil 2017/03/24
diff --git a/libs/libzmq/RELICENSE/wallstprog.md b/libs/libzmq/RELICENSE/wallstprog.md
deleted file mode 100644
index b32a11a..0000000
--- a/libs/libzmq/RELICENSE/wallstprog.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Bill Torpey that grants permission to
-relicense its copyrights in the libzmq C++ library (ZeroMQ) under the
-Mozilla Public License v2 (MPLv2) or any other Open Source Initiative
-approved license chosen by the current ZeroMQ BDFL (Benevolent
-Dictator for Life).
-
-A portion of the commits made by the Github handle "wallstprog", with
-commit author "Bill Torpey <wallstprog@gmail.com>", are
-copyright of Bill Torpey.  This document hereby grants the libzmq
-project team to relicense libzmq, including all past, present and
-future contributions of the author listed above.
-
-Bill Torpey
-2018/11/02
diff --git a/libs/libzmq/RELICENSE/willstrang.md b/libs/libzmq/RELICENSE/willstrang.md
deleted file mode 100644
index 9484c59..0000000
--- a/libs/libzmq/RELICENSE/willstrang.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by William P Strang
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "willstrang", with
-commit author "Will Strang <william.p.strang@gmail.com", are copyright of William P Strang.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-William P Strang  
-2017/03/23
diff --git a/libs/libzmq/RELICENSE/xantares.md b/libs/libzmq/RELICENSE/xantares.md
deleted file mode 100644
index 8da5ba0..0000000
--- a/libs/libzmq/RELICENSE/xantares.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Ricardo Catalinas Jimenez
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "xantares", with
-commit author "Michel Zou <xantares09@hotmail.com>", are copyright of Michel Zou.
-This document hereby grants the libzmq project team to relicense
-libzmq,
-including all past, present and future contributions of the author
-listed above.
-
-Michel Zou
-2020/02/03
diff --git a/libs/libzmq/RELICENSE/xaqq.md b/libs/libzmq/RELICENSE/xaqq.md
deleted file mode 100644
index dc5cb84..0000000
--- a/libs/libzmq/RELICENSE/xaqq.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Kapp Arnaud
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "xaqq", with
-commit author "Kapp Arnaud", are copyright of Kapp Arnaud.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Kapp Arnaud
-2017/03/30
diff --git a/libs/libzmq/RELICENSE/xqcool.mq b/libs/libzmq/RELICENSE/xqcool.mq
deleted file mode 100644
index eb7786d..0000000
--- a/libs/libzmq/RELICENSE/xqcool.mq
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other share-alike OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by xqcool
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-share-alike Open Source Initiative approved license chosen by the current 
-ZeroMQ BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "xqcool", with
-commit author "xqcool <xuquan316@live.com>", are copyright of xqcool .
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-xqcool  
-2020/01/01
diff --git a/libs/libzmq/RELICENSE/yan12125.md b/libs/libzmq/RELICENSE/yan12125.md
deleted file mode 100644
index 6983283..0000000
--- a/libs/libzmq/RELICENSE/yan12125.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Chih-Hsuan Yen
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "yan12125", with
-commit author "Chih-Hsuan Yen <yan12125@gmail.com>", are copyright of Chih-Hsuan Yen.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Chih-Hsuan Yen
-2019/10/12
diff --git a/libs/libzmq/RELICENSE/yitzchak.md b/libs/libzmq/RELICENSE/yitzchak.md
deleted file mode 100644
index 5498c79..0000000
--- a/libs/libzmq/RELICENSE/yitzchak.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Tarn W. Burton
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "yitzchak", with
-commit author "Tarn W. Burton", are copyright of Tarn W. Burton.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Tarn W. Burton
-2021/05/16
diff --git a/libs/libzmq/RELICENSE/yunye-pu.md b/libs/libzmq/RELICENSE/yunye-pu.md
deleted file mode 100644
index 774131c..0000000
--- a/libs/libzmq/RELICENSE/yunye-pu.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other share-alike OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Yunye Pu
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other
-share-alike Open Source Initiative approved license chosen by the current
-ZeroMQ BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "Yunye-Pu", with
-commit author "Yunye Pu <yunye.pu.4743@gmail.com>", are copyright of Yunye Pu.
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed above.
-
-Yunye Pu
-2021/08/31
\ No newline at end of file
diff --git a/libs/libzmq/RELICENSE/yuvallanger.md b/libs/libzmq/RELICENSE/yuvallanger.md
deleted file mode 100644
index c5a7ea4..0000000
--- a/libs/libzmq/RELICENSE/yuvallanger.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Yuval Langer
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other 
-Open Source Initiative approved license chosen by the current ZeroMQ 
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "yuvallanger", with
-commit author "Yuval Langer <yuval.langer@gmail.com>", are copyright of Yuval Langer.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Yuval Langer  
-2017-03-19
diff --git a/libs/libzmq/RELICENSE/zedalaye.md b/libs/libzmq/RELICENSE/zedalaye.md
deleted file mode 100644
index 8fed57d..0000000
--- a/libs/libzmq/RELICENSE/zedalaye.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# Permission to Relicense under MPLv2
-
-This is a statement by Pierre Yager
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
-
-A portion of the commits made by the Github handle "zedalaye", with
-commit author "Pierre Yager <pierre.y@gmail.com>" or 
-"Pierre Yager <pierre.yager@crisalid.com", are copyright of Pierre Yager.
-This document hereby grants the libzmq project team to relicense libzmq, 
-including all past, present and future contributions of the author listed above.
-
-Pierre Yager 
-2021/01/04
\ No newline at end of file
diff --git a/libs/libzmq/RELICENSE/zoedberg.md b/libs/libzmq/RELICENSE/zoedberg.md
deleted file mode 100644
index 48e527d..0000000
--- a/libs/libzmq/RELICENSE/zoedberg.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Zoe Faltibà
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other
-Open Source Initiative approved license chosen by the current ZeroMQ
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "zoedberg", with
-commit author "Zoe Faltibà zoefaltiba@gmail.com", are copyright of Zoe Faltibà.
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed above.
-
-Zoe Faltibà
-2020/11/10
diff --git a/libs/libzmq/RELICENSE/zoobab.md b/libs/libzmq/RELICENSE/zoobab.md
deleted file mode 100644
index 216ce97..0000000
--- a/libs/libzmq/RELICENSE/zoobab.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
-
-This is a statement by Benjamin HENRION
-that grants permission to relicense its copyrights in the libzmq C++
-library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other
-Open Source Initiative approved license chosen by the current ZeroMQ
-BDFL (Benevolent Dictator for Life).
-
-A portion of the commits made by the Github handle "zoobab", with
-commit author "Benjamin HENRION", are copyright of Benjamin HENRION .
-This document hereby grants the libzmq project team to relicense libzmq,
-including all past, present and future contributions of the author listed above.
-
-Benjamin HENRION (zoobab)
-Done in Brussels on the 2020/02/03
diff --git a/libs/libzmq/SECURITY.md b/libs/libzmq/SECURITY.md
deleted file mode 100644
index 561a395..0000000
--- a/libs/libzmq/SECURITY.md
+++ /dev/null
@@ -1,319 +0,0 @@
-# Security Policy
-
-## Supported Versions
-
-4.x versions are supported with critical and security bug fixes.
-
-| Version | Supported          |
-| ------- | ------------------ |
-| 4.3.x   | :white_check_mark: |
-| 4.2.x   | :white_check_mark: |
-| 4.1.x   | :white_check_mark: |
-| 4.0.x   | :white_check_mark: |
-| < 4.0   | :x:                |
-
-## Reporting a Vulnerability
-
-If you believe a bug you found could have security implications,
-please send a GPG encrypted email with the details to the maintainers:
-
-| Maintainer | Email address   | GPG fingerprint |
-| ---------- | --------------- | --------------- |
-| Doron Somech | somdoron@gmail.com | E0B0 E3D1 55DD 6ED6 71FB  2B79 D0B9 CC44 867D 8F3D |
-| Luca Boccassi | luca.boccassi@gmail.com | A9EA 9081 724F FAE0 484C 35A1 A81C EA22 BC8C 7E2E |
-
-## Internal severity classification
-
-We will attempt to follow this general policy when assigning a severity to
-security issues. These are guidelines more than rules, and as such end
-results might vary.
-
-
-| Severity | Definition |
-| -------- | ---------- |
-| CRITICAL | endpoints using STRONG authentication are SILENTLY affected |
-| HIGH | endpoints using STRONG authentication are VISIBLY affected |
-| MODERATE | endpoints NOT using STRONG authentication are SILENTLY affected |
-| LOW | endpoints NOT using STRONG authentication are VISIBLY affected |
-
-STRONG authentication means transports that use cryptography, for example CURVE
-and TLS.
-
-VISIBLY affected means that platform owners are likely to immediately notice
-misbehaviours, like crashes or loss of connectivity for legitimate peers.
-
-SILENTLY affected means that without close inspection, platform owners are
-unlikely to notice misbehaviours, like remote code executions or data exfiltration.
-
-### Public keys
-<details>
-<summary>Doron Somech</summary>
-
-```
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQINBF0YXO8BEAD8Be6QQa+ALzIWszeDPtVK9DCGN7ZM1C4Ygq6w7llauhg4wreg
-kQy7YwOFKsFTi9cmIRfkw/lX9tIn+PkNe+kV7tOLDCdAmNCqdERvM/C46uPM/Mx4
-IdaoUXOPVIwbLcCLysiYxickq/M6ymPH7pAT5deCxH9B1DV38T2Mlq+uXXyZ1aFE
-74oCouQ7Vau31NBeOA4DkpPjpdA/WXMVEqoB3PKALUGYs1Ce5CguE0WjdueZFt2k
-DvdYtbUFb+vNLMPCejf1sBWDnUygPfsPPakyimfxBSIRsQLvw/5t6bkiWgtGU4LD
-o37skSzum7h0rw1378ryoMUYdaNu/oNlWCwbQzBjD6G+WYbmu5AB5aGSaDjUzg9K
-AIcaNbRFln7OwvHrQdvDuWypZw7JvWYbehaywBagbjSTjIwb+Umki8cF/zxi5sxI
-eFRMARDVQa5PAeErDd+4RtMcB55M2a90xWcTcfBdE/VYmwBXsMMWju4ceBtAqBCB
-DTVxxaT54tKjkOKa1Yk75zL4Xu7Sekg2BIaHh/qVMn5aTEX+X6ImeFhWRjhgsk+Q
-XoXo74nJq2aCJ2sSjLRdvnePtc3WM+WfdmdnC12JpBiBn4TFYxMBJlvqfKBxZELU
-eZBkB6eTcBO/n5U3jSdFM47SeiBgUlPRiV+0ArZJ4i2Giv9vduWO6XeMVwARAQAB
-tCFEb3JvbiBTb21lY2ggPHNvbWRvcm9uQGdtYWlsLmNvbT6JAjgEEwECACIFAl0Y
-XO8CGwMGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJENC5zESGfY89i0wP/i5k
-sYQkdaPeos9JnfUd3cV588lQzBN2bVhzCtbrjR6wXn9hRhZP9ftCNKoVp8cpC07G
-Vq87sKqeB7odaK67jS+XoF4msIUEYS0lN2lPORf523VK3Juy9FW39aEPfx+6P5+h
-h49VveR1t9I7MgdjnKVwmaELcFDKKGQaPlcWlKctSkOLRw/vYFIvajFJ30bkK9+z
-sjgtUvXbSgt4HHHOQ/M6oCNhDsY0YE1zNxDgc8EqRlRxf76+pwldMe47/sIP2U7m
-qI6d/LfsWnK6iJ0ehlp6oPP2GcUM8bH3lh2ugHH7sPSwpvh/rHqQTTxv+KiFeQOC
-yuxvWdjathnDDHRNPVahBR747iKlcebJeaK5X8wObcIDaGBecwnNIjws4hrYAFH0
-eNiROIbDkxDjwFhBYLDMfVCPW3xpBDa67EBJ6qTrabxmXOGvUDR2kB0P5lmtU/jL
-jdVeFLj9tgwuuL8PW5k/gCdeB4WSBF4VWAHBZ2vDXUPut78dHQQg+dgvHmbnRYZB
-Em6nrYUeoQ4nSOHf7VmdHf05HGwam+ZTWLN2sIEerNJlRCx6mEn20O2S7DE4RMi5
-VjBFHy8/YSR3hRtdOSYfE61AeProeDPTGiei6xxlN00MQ7K/kFhQHIjKz1Ao51LU
-o6+KGTtka2+g368boLcQALIchlfp7cfUAEp+dB7UuQINBF0YXO8BEADBXhwad2VN
-XFhD69CPwWR39KmoW019EvT8tNWzCPzx8hQeTJz+fY0bTiXYxMROZwF0SD4kqYet
-nejfH+boUFV64coxmfCmriqOQ0SGZTCfWzrjDrWjj51Xe1NWsGnFNO6vCcL1NNPB
-0ZcE/wskEaKPi6Ui0SwvlDJQFK5UnrnFehmEIxEqi8BFez2Ft7/3I/XRrhlDzMtT
-hDgMb+Ro9BydddH3TRKAdJBzIsozCrv0nn1DIXM+Pocqiuvk72E6iUxS2meeA4F6
-DTG6MIWEcf6WPRVqXdD2bCBzDJ1NYixK9TFdZjo/6jTLwwX711+/NTIblAbpc/KE
-io+0cuRG99gP8Cr+1VVZ2fcK9FpjI/u4YERmj8arMkcFz+QQDaJnXIjmNDpD0zBQ
-Dh2v6pKysoEgmOE2xDzBsJbZomluKOytLN9/KcqucB1qkjzHD5JeZe+/S1vxdZUn
-+81Us+SeepiDOfrT84xFYcqJentL+ylFj7zBdeqF4WTnZAT9/xbVuUSYnRm1Sm0z
-vr99Sum0MXUTzgNhY5x3PkFQyg91lllJUFGoXiLivG+3M8JFC7V2K7wXhHFqffVX
-Qq6UOm6+kCTjUCgzpQswMpDremB7A2fBQObKOC/3pE0Gbh3uKvylqQkMPTn4lOao
-J3VSd1hBqHAdb5uxnmxN8w3wIpnaSypBawARAQABiQIfBBgBAgAJBQJdGFzvAhsM
-AAoJENC5zESGfY895WkQAJYvJg/IYBKh0SblT8lGj9O+mLXO6K1q+HfZ6mERm9Ew
-+fgW/cwGzuUrn+DC6vfsXlqtshUwiaxaa6NJccPBfC5IGHAegK5giwnQ/sbrA70A
-7md2u+NK2tNDGK4Gxy8ZWMY1++TmwdVLzNivM5IA/NGotyYgQStDI+/Muvh+0wQ9
-xZjo/InxVXeQcnqQXVKhoouPo2GlXslHev04SRl/ZJYN5sEHCE0Qx6L++esVvrwE
-/N5NT5Rk41l4mXAN2SM0H5AB+Wf1qIiVB6pMLBzXM/7qnCnJS0FZZjf2WRiB0yXj
-xTl+/JUK9MYckkrNcAfnb6yvnvO5W3KDabZhl/Cqw08vVSvcqyYRFXIa4vduiGJP
-L6C8o3USbjVfZhBSHXpuo7JPzR0S4l52QB2ZnTCRIjSBe5vphVum6r3vR5rKAU1n
-Htytqm099TlDapj+4wixSv8TvwlJr9no0uEJloyRAMFMYms4KgLEEZfc2tqpe/sA
-nO6TM9h/hCbrImplSiesHqTxprnKAipudSYkc750zuFTiBQ5WwYbWjkCB2PSEh+l
-8ZCRM5Ropfk4ATMhXH/w2Dxa5mdaHuKWKUc14+YfSBJI8yohbVIzYVsvAclctCQY
-kAh/Z/Fl8W+ftDsZF0/1k3fxyKwExFej+AIsabcQDG0bAHscfH/44atKZRPn72FI
-=Qu19
------END PGP PUBLIC KEY BLOCK-----
-```
-
-</details>
-
-<details>
-<summary>Luca Boccassi</summary>
-
-```
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQINBFTKss4BEAC6LdgaSpaSBbMZK8erDulfXpCszvssCvEAI5lshfNNLHqOGy4r
-g+A3xyaGe+ITjoahT56Ly+dylduRvuZaJwbKWZqOKLnZHG0/Y/4K1MSk73TtcFbS
-Vn0q1dZmr14ysTKB8E1UJ8XQZO+PO79VANjvj9oEqsYX4xJ5BenWdfqJOGa+8jn8
-ou75vYcTFkIlvSnaHT4MkCqPGnuGgqiunEScjpBRFOX6ZIdRZvXcjP4HymdQAIMA
-BDDcV/qT+3VIOwKCn2e1jtxGbgMUwyosfz7nmlNHAdLrnficbSSsjRBIKxLgKN/N
-2fk/jk87mbs7Qz5L2bSxU68emGHZ1BEkBJ4vhiO6VBx8XHolK2RpI/3v0qzdGynZ
-YKTF2yBFqBlDI12gbfxabCQ7FgxwLBmYw/C068NVtXLM0AAMFrJmXRoexE698DJi
-wL/4qxWy2Py/wBHSFInmyUSSVi2CjRkLh2zA/EJ/268HooItcnL7kGnyWo9IJZEz
-Ma7QO1FF/513xsW2QyPr/QNvuJ4GT/SyIgz+6Ln/z8wHCJQw8CM7vFRgOCuy2U3R
-srO926muRbl97pqRmCXbb+OJQMcYaA841FPKHq52kUTeGqkiJW4RocckcEGqhxhh
-zj8KjIb2wBgkYviFQWKLIpZBVxKSAjVXTl/Bzk9m2ZPETjMZKtz09xtloQARAQAB
-tCBMdWNhIEJvY2Nhc3NpIDxibHVjYUBkZWJpYW4ub3JnPokCNwQTAQoAIQUCWab4
-pwIbAwULCQgHAwUVCgkICwUWAgMBAAIeAQIXgAAKCRCoHOoivIx+Lmx3D/0f5Nxi
-LYPDpxPOJDnEGUNqLiHlnyHwlHidV1xROfh8F6WkDrEAO5YfkASJjqBYJY93ZiZU
-/ROUdpcct9sN0K1Vw4yTAHFYpYO2G9oc3ax+3ly0rON4L7t1Xj9cvR1/b2fIIltE
-Yied0XP3ukUfjECOkwQZJbmOHjsea61i5da/JEbDFkr32witorIMMIOAsZkZ+tcL
-xo2kRhk5PT7t6yo5cRLd0rLGKvKMBkMrNcPNk/T1V1YKB6yy0gAfo+dhZyI/khNC
-VuYZB59oYX5FS5FkGn/CCmuPN3YkGBqe0vZJjYLe8PK0vPS1obg9gRuYuJXdxIQn
-P8hD/y6Cu1axoy5EPt1uNc1bUSkvWUoJ2pWkeUAEKa/E8I0xKwQfHHo93rA1Xfdc
-c3rivihyj25/CkHo3zP6Xa0fqQLjpvusdf5nxuKL5cQYCAkNV9/sITTCxxYiKhp5
-lto9jhxs5j3/D4WV0+EGaQ/jfwg0i1h5eApzJQWMG+dEiT28s9+zPgFqfYq5oqVk
-cF+3tv39Mk/k06XqEwD+TmhV3Yv/wy1BDrGxvQgMP5GtIPS6p6+PBWFE+HUYYPdZ
-/vFN5DugzvVznjxLETUvj1G7mCQyHFXIkezF3mfr3uk0WiYWYoEqQ1Jdg8nsiTq3
-iRTwW3XNsNhB28OoXH461215t/LakjGMVOmUSrQkTHVjYSBCb2NjYXNzaSA8bGJv
-Y2Nhc3NAYnJvY2FkZS5jb20+iQIzBDABCgAdBQJZozczFh0gcHJldmlvdXMgam9i
-J3MgZW1haWwACgkQqBzqIryMfi67IhAAq7Gj+p4Xt5Zc5OhMt7xaz6lGVdgXljGE
-mVmKgmyHWwMnNRpLrsXUWK8iZuvpg9Ges1o0Ckf7f+631XTOle0r3MwsVI+FgWVM
-BzAg7ft9GlIMqgY6suWlV7Rwar+rmzgf4A6tDjDWq4Lr2QTbhzjKoZeVL52Z2tpd
-nq0Iq1RKuXPQ8AEkPcfhYc3Z8ZL0MQ1cL98c42qVRYmoa1JmABen7rSUmIQL3t9v
-aZXLqnTNOEtpbJ0QLuhasBTPwUW7FOwvSFr8PSoSKtOJ9VLEGDgJD6wewc/MYJsu
-fMECdfVYipOP/mlX1hrmxyucEm0a6CjFDvrP46sUJ4JoVcmr1Te898VQYKvBRFZK
-7UxJIbp6nZdyW6jI0HdstgUNyh0IzTgOUfgdkn5m8Xw3AaJdzGIy6cu4+g0Qmief
-rbZrReVcWYPswITpnDtEAmghq7C7QJ5OB7PA2G1xWqOeLMQnE2tTGpJfWkuv6FEI
-lG+5utAKSwDz9sZ93wbYGil5/rBSLOS2XoZfS67yROQH8+f1vc2tMpdfD6Z8rtkH
-HfotVwDkx3xIKWCENdmL0ewHbzjKXglSi1VkFGdrxoXyQvpSeAgO2GE0spM3lRIR
-cfNsXrzx4J21TUDrjK9mg/+KVEGA2I7E95d/ByyjDz4w0yx6xv4nyHtptgAc72aP
-41NMSpr0qje0J0x1Y2EgQm9jY2Fzc2kgPGx1Y2EuYm9jY2Fzc2lAZ21haWwuY29t
-PokCOgQTAQgAJAIbAwULCQgHAwUVCgkICwUWAgMBAAIeAQIXgAUCVMq0wgIZAQAK
-CRCoHOoivIx+LtL+D/4+JIaILWcbIymShr7cOhlWKu7/AqAHrT+y/0s99O3Tu6TD
-7bk5LUMUL5TBZtyVbUQh0KPjVYH+QZyDGICwn9snbkftIACvwD8LgtUv+5PbAQ1D
-of1ZtNjbl5S+VeKoD5Ev01t5QusRfThyiHzFSZOvePiLuRyRe1ixn1fzXl/NxuW2
-d7eJyxNRmyZ6N63SVDnBvOFwbNSJ4awXZa2S23edswfNcfEeYVVrEmEfBsi4U3ZY
-rjHWV+SvHoa63vEfyooynRofXgwPZLeOcsa6f2Q3jTI7WaCVnxL7K0GlxW3pd+MO
-E8HKFj/8MnK29ykQgvfOjvBtKIQmZoPHB1+FT6YIxr0fkLIK2FHGZ0azh0T7sWEh
-0WPQeieGFdDOq0z9Jf6fiWwIeetpwdeEoAzzXQZkHfRNpwzkXx7RlfITUqko3UiW
-l/w5S7t4x2HFyFHVb5osqF+NhCxGaqZGGkkegE/9RRcvFzN8pbUHNMxnwV/KQW8V
-1DZ9P7Kr+a/KV+dmEs/7vAj0vyFzCJbc8qecqOWVOLjY9tzOBjEWa1zvt6PVxZGJ
-I3i+lvdLcpvIWyAI68Gi7kOsTuu8A8iXDxEfzJ8kGlBnflq14sio3VKP6nVIPwbF
-5CwturkRM0vPkKSIliBCvS2MvnC3S+0AkKjhKRl9InBh0mCx1cRylJ8ZltHj9rQr
-THVjYSBCb2NjYXNzaSA8bHVjYS5ib2NjYXNzaUBtaWNyb3NvZnQuY29tPokCTgQT
-AQoAOBYhBKnqkIFyT/rgSEw1oagc6iK8jH4uBQJccpvuAhsDBQsJCAcDBRUKCQgL
-BRYCAwEAAh4BAheAAAoJEKgc6iK8jH4uA7kP/RbwUH1C8RfWJWvtaDsvoJ5jnoB1
-lJDxUBEd+6j+AWTUD+fAAxLE/bcqxXzsPz4dscwpnoKmqVIpAdhTN+EvRZRLA1r/
-kbKlnDFnEm89MYYS1e8dGtXqa1zAPl+IxL46Da5/l8GsepOr9HftrPBjN56R/HIf
-tOwc9Vir1NLaC+S0CsAKwyAjpq8srjvrxFWr9a82+7GiBz2Wrc60vWIfaZuDKpVE
-4RpvEaiYoGEJEUp4wNhaVdQrhe8m6C0uczwq2t5aSjxuuso+rsN3PK/jvNrmxfbS
-a0NMzwhZ92w+J7CFyg85c0OQ6hmZRTf6G2v8pFpWlbcb7sePlvYcEIeZik4Nx73T
-EkqwmX5WC0NPzj+wdBWG/G+fFIcUUaMZzcGjgy9MXD+RVVyGs6W2/Q7iPBzDxny6
-KJLjUK8xMGRLo3rvdAUqug3Gpe6dth/8XBp0cY1gk4n3OUluBWOXSEwW7zm3s77r
-K4s5JC/rBOgCeCNV+qXLydazn4qjQXixqb0ezyGGxO9w/+q9T7MBwQy5/Q25w4qL
-bcCxTLAhRpye2C1nCHt4GvH4SUjdh6wtHdkXjtyYMTRmMU40GN/PL5QFyyMS7nEC
-YiycLB99knGwsh1FX31Q4aU7qUWO6Ejhk9W43IZjQpaITXoyCwKnMaE+X6Uqk745
-io6PFV1+6ix1l8MhuQENBFieLi0BCAC8doYzfmC8HWjtP0Q0s6fpRwjwGTTOaxk8
-qOMW+vgVY5eAIWYOGX8kNdzUE1nnRgrGhqcOe+g0NvXNkE83KIeAZFL5k96/o+K9
-IJTSlrNzjWR3NsQPfjrQ4/pDcuwtxWBIaZNAF7GJNnjGeQ4dvVHwTzi1b3xrELxK
-YO3iiYkku5O2rrHxI2Pv8mBWZ/v6Zr81hutk6TtpsGGWRBEq2sAdS+qV+Bk+C8LJ
-sdOLeZLU9aVILtMPQkL0z3GTcb7IVknLPZ+aeraFRBLXO1k29J2JnTwECEkfOQep
-mBkGJ4FGHQ+eG7ejLd1i8BLFEeLk9ia2wLl6xiij1I2lplcuaLq7ABEBAAGJA1sE
-GAEKACYCGwIWIQSp6pCBck/64EhMNaGoHOoivIx+LgUCXFwb5AUJCWGINgEpwF0g
-BBkBCgAGBQJYni4tAAoJEEspZoBQeFFiy5EIAI2YXvth4tRojymdZ3oYiZRz3Xtx
-OJiiEsjZkP036k4pKdmtn1zxAPzd5W5kprk8AkWjjKyBSNS47i3lvjRFQXpKpUbG
-J0CdjDCE2CaonMb1oh/pVbQ0VvMoPRyj1Jjz/gFCeXLFq8AcXrRYjh/aW6RNPj0Q
-nqL70ta6qFSavxrLPVkm02mFWEKlWNLtb7uzLM2KfCLI/ZZdsKSkTwZhWDQybp2o
-XO1fZdI7aSoLYQFY6pIjdIuTnQrqIrRKtk+ummBMMKBS18eyiJ1FR7cIp54Vektl
-VcaFOGI+MHDrDO4+hGfE+w59szW5ma60S92keJSWgOJQD4Nu/sPor9M+ZlcJEKgc
-6iK8jH4u21wP/RtYbohWfpBDSReU+ynG5QGLcELpSMHlCRz2ZxaV8bqGblGftjiW
-eyvEZePOJpb5Sev20TnUBzzilZc1nLwOxP5tDZpEvo1j2bIY1YamZc7g7XE+xRbl
-djiwGtj9PA3z2DME0iuxM/xN0Ghaea/vHeMim1miRJ8sbOheHwmwALPQzvTUV1Cq
-Ngn8J1eUP/tC6wv/BnBwTkaHugqqmBglE9V8GptIVE5Tam/TfwVQXx72ZW2YHa4A
-bwHf+oUtH2/jOTjOj/kWT7docgSDj7kColJ7mwuZZ0NSwYhA5dKN1CWX7c65ENzN
-h4pIiM9Ula0tInRal2qK9YXy/GV0gFXwV/aFh22G/xtPRs0qqhBxr2lxGOg5XsAk
-SEu+nlCThjEZDQVXxmptdVVvHwh/+Lrconk3o/sUTFgZ9mroQYceJa1z9cIn1A1Z
-Pb2SffXWU18lOuuC2Cw7XGx8QN1rWbmVVA0mvNQ6MpUYCOICy7bVIfUYcX6xuoWh
-Tfu5lE0qUw8PhBGUaW+pqGvEDcM/PWhopx+mSqq/Ip4LfZ0Cn33KLV4SzJjnhC1Q
-RVQoUYpzBDREgOUo6eqwNSCM1ZxkOIoueOZ6TRoYrUaJUGAJOZvXVl6NfpizQ1bp
-Tu1l6dz7U3JqYG/V/kr+IKxWJf/JhYjZ73Da9mx+2SuNOKj1SFohLNL3uQENBFie
-Lj4BCADUpbwnWqJsjL6la8HdROHY/LePMvWiCJAK1tZX6HadW07FxCMlQPOhX6jj
-YI85BmYM1AZpEDRLqdkAUf6+lSY9VywXy6G8DsQTSiO+Fn6DWEJ9yYelLIQW0xMJ
-cWd55D9+tDlJFFfiE2OLjrSoxPRGjhB7iajsdNlD6JTjuJq60zAcxF7J2o6Keesw
-HVYooz460MLuVq3BeyNxH/d9B/y5n3ibSVgJc8PYkDRN2Y+ILuAXd/ia0GTphTM5
-j9R+mCJDuRRVZAgNfa9AJMPJ0QbIFnRdnwRTEGt6LYA/AIoBgwjiveTfr8N2LArD
-ARNP6rV+Ugf3rW2bZPEoCv82bsx3ABEBAAGJAjwEGAEKACYCGwwWIQSp6pCBck/6
-4EhMNaGoHOoivIx+LgUCXFwb5AUJCWGIJQAKCRCoHOoivIx+LoL6EACYK7c/yOQH
-ZtSfzkrfNpd/MiY1j6rpUr0mrbKBVKamJ1N5Ae48E2ETlRfM3B6fk+dqovKbD0gQ
-oDHcCo201770pyoFwxyHZleiSWfQjNp4JCoXvGAh+AK6xfiPZIEzfLDrm3nrd38m
-rLEsUPRPdoyemAb2kKBoMmfkPt0e6WnqKxlFBngyF35jOFXnp//yGNCWvr4gibXD
-zIlMnQUXlYzKqZPnIwdEGyQT4KWLAHLCu5lzk6JmvMJPqTPU/uKbgKcHHy8cY0Xm
-xPOAPbnSbSYsuMcJpZMiIKBRozZk26fWdDJorWBPZ91OEmfSCx2X1P99UQId67SJ
-9V4EUbZjGDrsEJcosmg1JN2bFIKzI6VTrYvxA2ghPuowXgKZ3k/BuFXMA41hnP/P
-pn8DjsYu/9yzV5TRYvQEVSGrN7c3tJGlyZrbZ3YxyDyniWZhrFmgVqdo3jZfhhgT
-xTnuSfUyhtA6jk5ECVuF+oxmWyjRzJW2XoPPpmYe9CQ2efHZ4RFqCO50keBAH0KH
-UCl3eg2E4HeALu++Aq9v07JyAyA6MYbTvHjrdMmHHDb3kHG3O/rPoH2120wYXHAW
-SBvoOOJZyT/4rF3BNcrLiPxDCi+mOe5vkX5jymHe4fho1kvh0mLLzeC9fKiJjExL
-yF2yrNrTFESt66057r3CIb8BcJXPGhxpXrkBDQRYni5MAQgAnBzmeIfxaXebmSJj
-wbH1ScEHIATXoDs1FtVumWTmfGS851lqoMBoemWPZleBoMTOza5cnv6EzPIGYRYL
-Sd+GTDOAzNdnuHxULm8gUqEdoQ8+GwcTXCSjOsvuZJvIWjJ3Siz3JRnTsM8hrYoz
-tZZhDQqsmqmCyrmw5IsxInDfTd6XrdJ834TOS87pJTwFzrt3B4UuhMMGX8IWjPsG
-Z0ZRBbUMhAxt07+JV2lW9o7AA0H733NHjhZ4/mjn62WpDVFzHIkvdVaNbb5hGXrJ
-HbRIqQUj4tX32uYEkpd0Uy7KEtqh/HI+tW1nL47Ba6EEY+3IvFO+XJiy5Zhoe0ku
-NiLebwARAQABiQI8BBgBCgAmAhsgFiEEqeqQgXJP+uBITDWhqBzqIryMfi4FAlxc
-G+QFCQlhiBcACgkQqBzqIryMfi5icA//f5d9VR2F/p/iBRbKudu5HHp3YxAxKLe/
-T5FobOd9LBM4z8G9x6puaVP5bFjN5IMB67piUTVgSTDFwvS5sj538xRddTLg6gdo
-cE8qU6gb0Caj3eDm6aaPH6sz8Dkq0lV0AibiFZAlysgH3Jb0mavTLbES92LVTC+y
-jgm6rKxazD7Xf7eKKAtU6Yv5hy8/RtkxqXUjiW5JuvM6GHrplFaoqLQqTTs84jmU
-JdAn5ocTHSZkWnrXD2ymNcSQ1Rb34JYOzhEZmqk7qID0HvTT2g7D52gP2Jw4AzNM
-kmf/tbB/ugWIBsEClwVkk6yUxjSTjjOq5p3Jg/9vqiEEml7xnSNwqY5w/FCIdwV/
-bcrDAvRYAY2whDUtjIBJrD5AzRq3A4FU9ErdkKNGToL1sAUZdyH+qsCuJl0eY/Ry
-lMdgYrKc4HWNOh+viG7ap/RxUULll3wXuwtcDapRe/lg4YABmORzgDPgXcGPODhS
-WdKeQid9kKucWUrjOXogxa28hO9P/6OhngUor9FECHqxa3dTEm9GAxRKJhJhWm8m
-wu2rTGBSOEDk918ffR+HyPJ5CoEUCj03vY1OJwcwhtCaKb83swuiXwDeZ7eXVRL7
-2nRMieLWYxNV8seKDFCm/7fXbNWpYe6HRtZfGiPVICJZbVHS73n4Kglxg03LKSXT
-ZEG+OhK+ULy5Ag0EVMqyzgEQAN1wRSjfQMyZRcelT38yhZUiSti6KqljizjkWzVY
-khFab3IXeW4m5uUv/N8J23h2tUhc4R3di1W5L3dvOMzY9cHeR4KucU3QA7TC/cUS
-Qo+tdxj0HgXLMoTHUUeo2w7mX0NTeH7Evq3zEwWOJksAXgb4+8V5t/afBl1IC0gf
-Nol/1iHkX6/49kSJ+0HoYEj7cPF8Il7IN55Xe/ZmsuucgjM6Wt3/ndJKmHyssDxA
-pUnlK5Uj++039Q7SNRDtLoc8Y1LoL544bSADOMrRAXEKj4ACYNUs8I1pf80w8CTn
-Hg7SEILesOqBMfYotz2pQ2x0KqfCOfetSe9YcZIu/Qdjx8qBm3a69Y6wSn40uIws
-W8lfEL+V2ltRsyCtmA1hNmreNc4tXtlXtWF6aZxT2wm97Gn8YjiQTEe7sfvNNcTH
-wP29KUofmIFtXCX2eMeqRWBhtqFE5uaDdI5UQyfjY9Au+Mc/d2WHMS1PGK/Z8NKy
-7huM24/yK7GxFbbPm3pZiWlV5kbl5f4bEPrBoqzdzoK0/N12UsfuWFV5m2YUIwW4
-BXaI26dzUM9Fc9ecbcoJXd7FzgmdKUi0/Gw7NYrbsL09zrAB+AQer602LHW1Aiqr
-93QkkB2ViWupYiGli2sC54qrAR4iEUATAk2AJIyXnjaI3DftExz/c4y8NuMwFXKc
-LxWHABEBAAGJAjwEGAEKACYCGwwWIQSp6pCBck/64EhMNaGoHOoivIx+LgUCXFwb
-4wUJDTUDlQAKCRCoHOoivIx+Lgf8D/0ZoaK2TUxsdcINtHxeKP8zIjnk1HJQxVDs
-LewL90rP/sqHplYdDItBHW3aQT+S82xmb2DaWcy1DJ+kDAPqKIEgYcIVCho+8dD/
-XwY3/vQQnRYt3thxj/REtLid97ldtWn0pw4f4sxwMbs0qXq/R9fnnoNXBBH6ctxA
-6dy4/QkBMY4LyaTnSYzvaB6JSwIC95MGl2/yn1WFCzdRPjxU1SLsSImCkBaG1uhK
-rX/rECSuQCktfG0hy+F2QqMxHofPonBUZTrfLchWHgqIzCx2JXXC0KsXjg7r+s4+
-m2krnB4jKOnyAaNmwhnOY+qqVcy/IvJsvOeOP1J6j2e7oTNtcrHb/tHxOhUVKiOo
-vzSoLB47PtnTv6cVtiBIOFKyfl1dS8Q+vPtRqvjWAW7vcAfygxXwvJUslGUMU46J
-vJwcFFE4RQk4Ixm69AabTCCwLUWV0Pnx3rTNJHMxl+qzpvVwVuogVydxH2oqvBTt
-BpCsfgrhH5gcYRozCBvLGDetFa9YaAV4ZvwGq3lhkFnI/h3EpIDGCeDTsJP4+C+n
-mI2wM/rXt3m1CpgeVKH87E2+vSOoliyqW/DnceBE8JHEwg3nWX50GI+iW0Vm8t2Z
-1Dx2TJsrJdXy2vHYZDFOCfnz4SO6IafJZOGMVHPGNHp2AWH5mY9ZYE2N52QMoyjk
-42IBCOLqCrkCDQRVFuFCARAA+tTCfBs+pRBg7lPr6DtI3SY4M+T5Ip2EQGuWS7t7
-riNP0rbtShc3x1GBokVNEOTOe6n28DTI0TA8D7Wa6WefKnBbDQPVe7AgWCC11gYX
-XIqcRIPlnvW7X8hZn6Fw/b+ep9Fnw6piihRk5fnYyspDBTRE/1DBBzHqOPfepHgI
-zh7qVe8MCfTdpRYsHXZEa9o0WYLoRXeg+yFvKmjj8+Bm4OyLQ5vN7uDqDT3ph8av
-M7RQvvqLZrXhycWuq4btT6Ba9oMZ10UzUF/HXaLgakscDX6FzBwgv2/lVauh3ie4
-J+Au0lA4hYHCVhNZGgLsGG6aoMEDA2Ab6vLqVIeOj7dbOXLq5wLMJlywAZwtnoSn
-zxyPPKQarCl30lYDaXFakFGZpI10nRrRSy2acRcpuS5662cnU8kZzVl9mbxyrEpI
-zkc54ND+UzHvW6FVKqJLB/y2rQ6ZRE6cLahwO74LZoDc48JpVkdXCkz+F2yI4ust
-Wcv0vdUQ+mLHbjUof6zGLcTVRMpteFpIozB6giF1ohayoNAgwywk69tMThNa5O4J
-405dDPDO4lNyl7nGLlxyL0oua16ibpz2WfYUsPsJmRJnB+8KZ5SzIGW7D/aprhYp
-orYdpz6qynPtDmkD7zl5RHQCb8PqgrkkHPVVrdjHC7UdP/CcXjq1KIuKEG446xJI
-TXcAEQEAAYkCPAQYAQoAJgIbIBYhBKnqkIFyT/rgSEw1oagc6iK8jH4uBQJcXBvk
-BQkM6NUhAAoJEKgc6iK8jH4uEfoQALPHThbHLBEZ1ueHAnyamgz3kKC7KW4HkwgG
-pTvJ/r3cqdt8SBcdPamWORK95HKq1VahEW6yqWSVrsbYxqdXl/mI2mNIJxRBiM/h
-wOuZVLSNpK4Ou/XRz3NMFllZBJtJS6JGGpRtnhGQKrvkw04UtITpDahDlweVdart
-E0FaB89TagWZy7oH32M5wzHqUHSNnOfQR5VpttRBVkuqnN4xRePjJvjJae31LsAq
-jOrJcME08Y8zG10p3Pm6x0lOvrM9nf/MMYGEaMhGQFp4XhvQ6hi736nFyyQD6uHU
-vw140+Y51kHMbceKjaoju9qHNzddmhFAL+YMZL0dtNk9F4kDpTCfMNgft4Y0IUQT
-lYAkMDxdYK1l+jYTFrsDZhw5GV1kYQo2s3j66rT+SHlXY8SbyE33Hm544WxAbCGE
-dB/H7ADaQhbFobXalTb+/QfWE2FkAYTvgiRhEhfhdr0ed2zHoolIF+zDWu58D61T
-Qj0xx1/+PbaVq4NQAWigimRfhYEJjo0dJCYUFOI9mces4Fh0aUGpB0lyvBub6zWc
-QkHM/2NSsGLWIxCOjxR1qjMdM3cfTQe6BX1ZoE4hjQf1tolhDT3rUx032x4QH1wt
-5CdP4/Wz2Mn8oGCPvRwCNzYLjT/h2V3BFqIcbwNpfiLFMGtEYf0VD6Po5y2uxHNB
-V4vxw1Q7uQINBFUXAM0BEADWd0Gq5bkX2WVMfwI8EQTnuJBRgJLmaLb8INg/Iykr
-ztnx0t/D5bxZ7SMmycRpvKEEwST2NMzutPt4bxrbNx5FAAslzy93bd1mHH0r2xQh
-M/NKSNHsYOtpoeyf7vcRPaBkCqu6UzeWCrYcFzbrEDmMqKoeAekSWFyij/1Sm0hP
-YWK9qHYG7dhqS+t5rq0IGuX2LhcSbDubHysCZLvJxWzZspudrFgGkCX68oS94uy3
-ERgrUUt9QFweWueC6XJxj+FIlK/1j3ZgKUnJZ13iRXrz2vOr84C82MLpAw/HPmcU
-73qZM5V0+RFCKRP4ISKeGhrLFSMVOLVkyNHYYBq+0os21VIGBA/L2kWv1Gy/MnPD
-yI4p05zzwXUu6f3iAwPqwwRqA+/gj2J5YooZa1mPGUutkz3KmKWymTBlbdr1MR/l
-dnuUAwdgXdOEj/YPskb8VsVzyEjyNpaPTQW1KmsWDJPztuQ/6cAPXCeaECL/110M
-TFY1esS4SM7zd75Rgg1w68hFm0D1TotmuPVW59DN2TzjVUCamOVgMSEfUBERGo00
-PHuGYqDlVt+gLeyOM/WOLJizTEAJEUVpR9tRspFHf9nXIOJdSaoL4opXtLog5nVB
-2sqT9qt9qPtBPbQiHJXimv5rBpjaPeBZA+RxolTMpPkFsSXVkNcvhx3P/uKvD9um
-0QARAQABiQRbBBgBCgAmAhsCFiEEqeqQgXJP+uBITDWhqBzqIryMfi4FAlxcG+QF
-CQzotZYCKcFdIAQZAQgABgUCVRcAzQAKCRAoa/fvzXckHteED/9mP07v96WdQwx/
-oNJ2gCAmee43Xll5kLVa4TCuYLI+iPtLt1gKrtViw+M+oYhst5KT2jlfaj6T0GpD
-bbpqBGCzJ2Eas0dsnJRtN6zuvXX+tYWe28/PCEuB9QSOHqkVPG84aabqAsletGhW
-TKHWTQf7Aa1xlXgdBJ8NkZBUkwWQ5MGkKS0BP7xvaK6z5nOZSPskpodhKl51d4IR
-gWwK+j0tKdgsDqSjeSOfw2eM7/z4kSzDTsdxoBWvskaSQtMnw9qibfUrI5zgi/Yc
-kh2ModEoxdIAQWEtKR0dEHwVhOId76lq19sS6I4MKTfHZ7xGnXTozbeqjcTX0edA
-031aFC4XGpDTDlyA/XXABu97582NOvXLkPMcj/N8/P0MWJgtwJHMNwDqBHCsZmSy
-K7ZKHLC71yh5mUCSnLiu0cz/7rLB+VHI+SwPXBO8iPCZAupmf+cyICkINFCwgFyu
-LKYYARhSr6LqbOzo/ekQvz8b9q73ODqvhEN0T945AJdAt2BPtzb0LYOBaAxdEZsu
-2BcnWE+xERVK7mSeGHmfnh6smEZSx6uRawMYm6Y/YLtzQp6iBTqtNwYryl+PbRJ1
-v28e5ispmylCrRyb0CSgNqKbQufhKO71+peBBytb0Nj9VUYXGYe7vHCeZxgvTUnP
-bHoVjUXZSu+Tiu1Gky1EOFtEW/Se8QkQqBzqIryMfi7vyQ//Ttd4ZNBdaZkMYQh+
-CP3WsuXD4Vip8Gh+tcg/+zJMDWqkgoW9OOkWh1MjxJBSBjSLqm8e23GrgJrHdRBm
-fR6WbMCXST5ZmRzEN2MZ9DPFGKuzOe1BeWx3hFc6crCB7h5/I3yiiMhagF/kCiZz
-zQu4Ebcc8gzRH65BbBHbathVWF4EmP4ZUy2hPOspwMClCmGsqVY1zt4KPp1BeB/Y
-gZ5eL1kdLuvCRQkFglPNELDgziKREJYO89g8f6V6teJDy+l6DtuzwnkO3BT1PntQ
-17I8etv3lgGfL42q1QUjhXn0ER6cfWOEeD36MThkZ6WTdtZ+45ROZsvCSl9BlE05
-hT13mBluscvxu0bo1ReAFYG2aHG05mZ/2qyoVY1eJa+Eq/rDhdJP5E8IhDfr/kCm
-Ahcpb/916Jc0BTSpinIcuWMQaeWtpwz332Pa87M3SLLm0p390p9R7P+OI2FYVMYU
-/6dEqz9vrsTWaBLZV8bnItjn6r2MOXn7bGD6HW6euE78Bt+/Q9N/D53cgw3HGaDE
-0JqFt4gzT9d7D+jCYy3K5uAWBnKjua3mwMcBnO4GmQwVLauWex8BARlYpBoqqL/V
-5CorLVbhjFLWAiy1GsX4RM9RksG9TN8CMvNp1ZTpnqouwEuTmrWKwdQek1rPBRj0
-XNBso9Rw94Z5NVIXEcH3O44UsWI=
-=AXgM
------END PGP PUBLIC KEY BLOCK-----
-```
-
-</details>
diff --git a/libs/libzmq/SupportedPlatforms.md b/libs/libzmq/SupportedPlatforms.md
deleted file mode 100644
index 118fe43..0000000
--- a/libs/libzmq/SupportedPlatforms.md
+++ /dev/null
@@ -1,32 +0,0 @@
-libzmq supports a large variety of platforms. The list of platforms can be found in the [README](README.md#platforms).
-The degree to which this support is tested varies.
-
-Platforms are currently assigned to one of the following categories:
-- supported platforms with primary CI (travis-ci.org, appveyor.com): https://travis-ci.org/zeromq/libzmq, https://ci.appveyor.com/project/zeromq/libzmq
-- supported platforms with secondary CI (openSUSE Build Service): https://build.opensuse.org/project/subprojects/network:messaging:zeromq
-- supported platforms with known active users
-- supported platforms without known active users
-- unsupported platforms
-
-Supported platforms with primary CI
-- have builds and tests run for the master branch
-- have builds and tests run for every pull request
-- it is a precondition for merging a pull request that no builds or tests of these platforms are broken
-- contributors can easily enable these builds and tests for their branches in their fork
-
-Supported platforms with secondary CI
-- have builds and tests run for the master branch
-- these are monitored periodically by the project maintainers, and efforts are made to fix any broken builds or tests in a timely manner
-- it is a precondition for a release that no builds or tests of these platforms are broken
-
-Supported platforms with known active users
-- have recently been reported to the maintainers (e.g. via pull requests modifying this document) as having working builds and possibly tests
-
-Supported platforms without known active users
-- have some platform-specific code within libzmq, but it is not known if it is still working
-- have been reported to the maintainers as having working builds and possibly tests only significant time/changes ago 
-- or are assumed to work due to similarity to the above platforms
-
-Unsupported platforms
-- are either reported to be non-working for some reason that is not trivial to fix or are explicitly missing some required platform-specific code
-
diff --git a/libs/libzmq/acinclude.m4 b/libs/libzmq/acinclude.m4
deleted file mode 100644
index ac55776..0000000
--- a/libs/libzmq/acinclude.m4
+++ /dev/null
@@ -1,1311 +0,0 @@
-dnl ##############################################################################
-dnl # LIBZMQ_CONFIG_LIBTOOL                                                      #
-dnl # Configure libtool. Requires AC_CANONICAL_HOST                              #
-dnl ##############################################################################
-AC_DEFUN([LIBZMQ_CONFIG_LIBTOOL],  [{
-    AC_REQUIRE([AC_CANONICAL_HOST])
-
-    # Libtool configuration for different targets
-    case "${host_os}" in
-        *mingw*|*cygwin*|*msys*)
-            # Disable static build by default
-            AC_DISABLE_STATIC
-        ;;
-        *)
-            # Everything else with static enabled
-            AC_ENABLE_STATIC
-        ;;
-    esac
-}])
-
-dnl ##############################################################################
-dnl # LIBZMQ_CHECK_LANG_ICC([action-if-found], [action-if-not-found])            #
-dnl # Check if the current language is compiled using ICC                        #
-dnl # Adapted from http://software.intel.com/en-us/forums/showthread.php?t=67984 #
-dnl ##############################################################################
-AC_DEFUN([LIBZMQ_CHECK_LANG_ICC],
-          [AC_CACHE_CHECK([whether we are using Intel _AC_LANG compiler],
-          [libzmq_cv_[]_AC_LANG_ABBREV[]_intel_compiler],
-          [_AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],
-[[#ifndef __INTEL_COMPILER
-       error if not ICC
-#endif
-]])],
-          [libzmq_cv_[]_AC_LANG_ABBREV[]_intel_compiler="yes" ; $1],
-          [libzmq_cv_[]_AC_LANG_ABBREV[]_intel_compiler="no" ; $2])
-])])
-
-dnl ##############################################################################
-dnl # LIBZMQ_CHECK_LANG_SUN_STUDIO([action-if-found], [action-if-not-found])     #
-dnl # Check if the current language is compiled using Sun Studio                 #
-dnl ##############################################################################
-AC_DEFUN([LIBZMQ_CHECK_LANG_SUN_STUDIO],
-          [AC_CACHE_CHECK([whether we are using Sun Studio _AC_LANG compiler],
-          [libzmq_cv_[]_AC_LANG_ABBREV[]_sun_studio_compiler],
-          [_AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],
-[[#if !defined(__SUNPRO_CC) && !defined(__SUNPRO_C)
-       error if not sun studio
-#endif
-]])],
-          [libzmq_cv_[]_AC_LANG_ABBREV[]_sun_studio_compiler="yes" ; $1],
-          [libzmq_cv_[]_AC_LANG_ABBREV[]_sun_studio_compiler="no" ; $2])
-])])
-
-dnl ##############################################################################
-dnl # LIBZMQ_CHECK_LANG_CLANG([action-if-found], [action-if-not-found])          #
-dnl # Check if the current language is compiled using clang                      #
-dnl ##############################################################################
-AC_DEFUN([LIBZMQ_CHECK_LANG_CLANG],
-          [AC_CACHE_CHECK([whether we are using clang _AC_LANG compiler],
-          [libzmq_cv_[]_AC_LANG_ABBREV[]_clang_compiler],
-          [_AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],
-[[#ifndef __clang__
-       error if not clang
-#endif
-]])],
-          [libzmq_cv_[]_AC_LANG_ABBREV[]_clang_compiler="yes" ; $1],
-          [libzmq_cv_[]_AC_LANG_ABBREV[]_clang_compiler="no" ; $2])
-])])
-
-dnl ##############################################################################
-dnl # LIBZMQ_CHECK_LANG_GCC4([action-if-found], [action-if-not-found])           #
-dnl # Check if the current language is compiled using clang                      #
-dnl ##############################################################################
-AC_DEFUN([LIBZMQ_CHECK_LANG_GCC4],
-          [AC_CACHE_CHECK([whether we are using gcc >= 4 _AC_LANG compiler],
-          [libzmq_cv_[]_AC_LANG_ABBREV[]_gcc4_compiler],
-          [_AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],
-[[#if (!defined __GNUC__ || __GNUC__ < 4)
-       error if not gcc4 or higher
-#endif
-]])],
-          [libzmq_cv_[]_AC_LANG_ABBREV[]_gcc4_compiler="yes" ; $1],
-          [libzmq_cv_[]_AC_LANG_ABBREV[]_gcc4_compiler="no" ; $2])
-])])
-
-dnl ##############################################################################
-dnl # LIBZMQ_CHECK_DOC_BUILD                                                     #
-dnl # Check whether to build documentation and install man-pages                 #
-dnl ##############################################################################
-AC_DEFUN([LIBZMQ_CHECK_DOC_BUILD], [{
-
-    # Man pages are built/installed if asciidoc and xmlto are present
-    #   --with-docs=no overrides this
-    AC_ARG_WITH([docs],
-        AS_HELP_STRING([--without-docs],
-            [Don't build and install man pages [default=build]]),
-        [with_docs=$withval])
-    AC_ARG_WITH([documentation], [AS_HELP_STRING([--without-documentation],
-        [Don't build and install man pages [default=build] DEPRECATED: use --without-docs])])
-
-    if test "x$with_documentation" = "xno"; then
-        AC_MSG_WARN([--without-documentation is DEPRECATED and will be removed in the next release, use --without-docs])
-    fi
-    if test "x$with_docs" = "xno" || test "x$with_documentation" = "xno"; then
-        libzmq_build_doc="no"
-        libzmq_install_man="no"
-    else
-        # Determine whether or not documentation should be built and installed.
-        libzmq_build_doc="yes"
-        libzmq_install_man="yes"
-        # Check for asciidoc and xmlto and don't build the docs if these are not installed.
-        AC_CHECK_PROG(libzmq_have_asciidoc, asciidoc, yes, no)
-        AC_CHECK_PROG(libzmq_have_xmlto, xmlto, yes, no)
-        if test "x$libzmq_have_asciidoc" = "xno" -o "x$libzmq_have_xmlto" = "xno"; then
-            libzmq_build_doc="no"
-            # Tarballs built with 'make dist' ship with prebuilt documentation.
-            if ! test -f doc/zmq.7; then
-                libzmq_install_man="no"
-                AC_MSG_WARN([You are building an unreleased version of 0MQ and asciidoc or xmlto are not installed.])
-                AC_MSG_WARN([Documentation will not be built and manual pages will not be installed.])
-            fi
-        fi
-
-        # Do not install man pages if on mingw
-        if test "x$libzmq_on_mingw" = "xyes"; then
-            libzmq_install_man="no"
-        fi
-    fi
-
-    AC_MSG_CHECKING([whether to build documentation])
-    AC_MSG_RESULT([$libzmq_build_doc])
-
-    AC_MSG_CHECKING([whether to install manpages])
-    AC_MSG_RESULT([$libzmq_install_man])
-
-    AM_CONDITIONAL(BUILD_DOC, test "x$libzmq_build_doc" = "xyes")
-    AM_CONDITIONAL(INSTALL_MAN, test "x$libzmq_install_man" = "xyes")
-}])
-
-dnl ##############################################################################
-dnl # LIBZMQ_CHECK_LANG_COMPILER([action-if-found], [action-if-not-found])       #
-dnl # Check that compiler for the current language actually works                #
-dnl ##############################################################################
-AC_DEFUN([LIBZMQ_CHECK_LANG_COMPILER], [{
-    # Test that compiler for the current language actually works
-    AC_CACHE_CHECK([whether the _AC_LANG compiler works],
-                   [libzmq_cv_[]_AC_LANG_ABBREV[]_compiler_works],
-                   [AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])],
-                   [libzmq_cv_[]_AC_LANG_ABBREV[]_compiler_works="yes" ; $1],
-                   [libzmq_cv_[]_AC_LANG_ABBREV[]_compiler_works="no" ; $2])
-                   ])
-
-    if test "x$libzmq_cv_[]_AC_LANG_ABBREV[]_compiler_works" != "xyes"; then
-        AC_MSG_ERROR([Unable to find a working _AC_LANG compiler])
-    fi
-}])
-
-dnl ##############################################################################
-dnl # LIBZMQ_CHECK_COMPILERS                                                     #
-dnl # Check compiler characteristics. This is so that we can AC_REQUIRE checks   #
-dnl ##############################################################################
-AC_DEFUN([LIBZMQ_CHECK_COMPILERS], [{
-    # For that the compiler works and try to come up with the type
-    AC_LANG_PUSH([C])
-    LIBZMQ_CHECK_LANG_COMPILER
-
-    LIBZMQ_CHECK_LANG_ICC
-    LIBZMQ_CHECK_LANG_SUN_STUDIO
-    LIBZMQ_CHECK_LANG_CLANG
-    LIBZMQ_CHECK_LANG_GCC4
-    AC_LANG_POP([C])
-
-    AC_LANG_PUSH(C++)
-    LIBZMQ_CHECK_LANG_COMPILER
-
-    LIBZMQ_CHECK_LANG_ICC
-    LIBZMQ_CHECK_LANG_SUN_STUDIO
-    LIBZMQ_CHECK_LANG_CLANG
-    LIBZMQ_CHECK_LANG_GCC4
-    AC_LANG_POP([C++])
-
-    # Set GCC and GXX variables correctly
-    if test "x$GCC" = "xyes"; then
-        if test "xyes" = "x$libzmq_cv_c_intel_compiler"; then
-            GCC="no"
-        fi
-    fi
-
-    if test "x$GXX" = "xyes"; then
-        if test "xyes" = "x$libzmq_cv_cxx_intel_compiler"; then
-            GXX="no"
-        fi
-    fi
-}])
-
-dnl ############################################################################
-dnl # LIBZMQ_CHECK_LANG_FLAG([flag], [action-if-found], [action-if-not-found]) #
-dnl # Check if the compiler supports given flag. Works for C and C++           #
-dnl # Sets libzmq_cv_[]_AC_LANG_ABBREV[]_supports_flag_[FLAG]=yes/no           #
-dnl ############################################################################
-AC_DEFUN([LIBZMQ_CHECK_LANG_FLAG], [{
-
-    AC_REQUIRE([AC_PROG_GREP])
-
-    AC_MSG_CHECKING([whether _AC_LANG compiler supports $1])
-
-    libzmq_cv_[]_AC_LANG_ABBREV[]_werror_flag_save=$ac_[]_AC_LANG_ABBREV[]_werror_flag
-    ac_[]_AC_LANG_ABBREV[]_werror_flag="yes"
-
-    case "x[]_AC_LANG_ABBREV" in
-        xc)
-            libzmq_cv_check_lang_flag_save_CFLAGS="$CFLAGS"
-            CFLAGS="$CFLAGS $1"
-        ;;
-        xcxx)
-            libzmq_cv_check_lang_flag_save_CPPFLAGS="$CPPFLAGS"
-            CPPFLAGS="$CPPFLAGS $1"
-        ;;
-        *)
-            AC_MSG_WARN([testing compiler characteristic on an unknown language])
-        ;;
-    esac
-
-    AC_COMPILE_IFELSE([AC_LANG_PROGRAM()],
-                      # This hack exist for ICC, which outputs unknown options as remarks
-                      # Remarks are not turned into errors even with -Werror on
-                      [if ($GREP 'ignoring unknown' conftest.err ||
-                           $GREP 'not supported' conftest.err) >/dev/null 2>&1; then
-                           eval AS_TR_SH(libzmq_cv_[]_AC_LANG_ABBREV[]_supports_flag_$1)="no"
-                       else
-                           eval AS_TR_SH(libzmq_cv_[]_AC_LANG_ABBREV[]_supports_flag_$1)="yes"
-                       fi],
-                      [eval AS_TR_SH(libzmq_cv_[]_AC_LANG_ABBREV[]_supports_flag_$1)="no"])
-
-    case "x[]_AC_LANG_ABBREV" in
-        xc)
-            CFLAGS="$libzmq_cv_check_lang_flag_save_CFLAGS"
-        ;;
-        xcxx)
-            CPPFLAGS="$libzmq_cv_check_lang_flag_save_CPPFLAGS"
-        ;;
-        *)
-            # nothing to restore
-        ;;
-    esac
-
-    # Restore the werror flag
-    ac_[]_AC_LANG_ABBREV[]_werror_flag=$libzmq_cv_[]_AC_LANG_ABBREV[]_werror_flag_save
-
-    # Call the action as the flags are restored
-    AS_IF([eval test x$]AS_TR_SH(libzmq_cv_[]_AC_LANG_ABBREV[]_supports_flag_$1)[ = "xyes"],
-          [AC_MSG_RESULT(yes) ; $2], [AC_MSG_RESULT(no) ; $3])
-
-}])
-
-dnl ####################################################################################
-dnl # LIBZMQ_CHECK_LANG_FLAG_PREPEND([flag], [action-if-found], [action-if-not-found]) #
-dnl # Check if the compiler supports given flag. Works for C and C++                   #
-dnl # This macro prepends the flag to CFLAGS or CPPFLAGS accordingly                   #
-dnl # Sets libzmq_cv_[]_AC_LANG_ABBREV[]_supports_flag_[FLAG]=yes/no                   #
-dnl ####################################################################################
-AC_DEFUN([LIBZMQ_CHECK_LANG_FLAG_PREPEND], [{
-    LIBZMQ_CHECK_LANG_FLAG([$1])
-    case "x[]_AC_LANG_ABBREV" in
-       xc)
-            AS_IF([eval test x$]AS_TR_SH(libzmq_cv_[]_AC_LANG_ABBREV[]_supports_flag_$1)[ = "xyes"],
-                  [CFLAGS="$1 $CFLAGS"; $2], $3)
-       ;;
-       xcxx)
-            AS_IF([eval test x$]AS_TR_SH(libzmq_cv_[]_AC_LANG_ABBREV[]_supports_flag_$1)[ = "xyes"],
-                  [CPPFLAGS="$1 $CPPFLAGS"; $2], $3)
-       ;;
-    esac
-}])
-
-dnl ##############################################################################
-dnl # LIBZMQ_CHECK_ENABLE_DEBUG([action-if-found], [action-if-not-found])        #
-dnl # Check whether to enable debug build and set compiler flags accordingly     #
-dnl ##############################################################################
-AC_DEFUN([LIBZMQ_CHECK_ENABLE_DEBUG], [{
-
-    # Require compiler specifics
-    AC_REQUIRE([LIBZMQ_CHECK_COMPILERS])
-
-    # This flag is checked also in
-    AC_ARG_ENABLE([debug], [AS_HELP_STRING([--enable-debug],
-        [enable debugging information [default=disabled]])])
-
-    AC_MSG_CHECKING(whether to enable debugging information)
-
-    if test "x$enable_debug" = "xyes"; then
-
-        # GCC, clang and ICC
-        if test "x$GCC" = "xyes" -o \
-                "x$libzmq_cv_c_intel_compiler" = "xyes" -o \
-                "x$libzmq_cv_c_clang_compiler" = "xyes"; then
-            CFLAGS="-g -O0 "
-        elif test "x$libzmq_cv_c_sun_studio_compiler" = "xyes"; then
-            CFLAGS="-g0 "
-        fi
-
-        # GCC, clang and ICC
-        if test "x$GXX" = "xyes" -o \
-                "x$libzmq_cv_cxx_intel_compiler" = "xyes" -o \
-                "x$libzmq_cv_cxx_clang_compiler" = "xyes"; then
-            CPPFLAGS="-g -O0 "
-            CXXFLAGS="-g -O0 "
-        # Sun studio
-        elif test "x$libzmq_cv_cxx_sun_studio_compiler" = "xyes"; then
-            CPPFLAGS="-g0 "
-            CXXFLAGS="-g0 "
-        fi
-
-        if test "x$ZMQ_ORIG_CFLAGS" != "xnone"; then
-            CFLAGS="${CFLAGS} ${ZMQ_ORIG_CFLAGS}"
-        fi
-        if test "x$ZMQ_ORIG_CPPFLAGS" != "xnone"; then
-            CPPFLAGS="${CPPFLAGS} ${ZMQ_ORIG_CPPFLAGS}"
-        fi
-        if test "x$ZMQ_ORIG_CXXFLAGS" != "xnone"; then
-            CXXFLAGS="${CXXFLAGS} ${ZMQ_ORIG_CXXFLAGS}"
-        fi
-        AC_MSG_RESULT(yes)
-    else
-        AC_MSG_RESULT(no)
-    fi
-}])
-
-dnl ##############################################################################
-dnl # LIBZMQ_WITH_GCOV([action-if-found], [action-if-not-found])                 #
-dnl # Check whether to build with code coverage                                  #
-dnl ##############################################################################
-AC_DEFUN([LIBZMQ_WITH_GCOV], [{
-    # Require compiler specifics
-    AC_REQUIRE([LIBZMQ_CHECK_COMPILERS])
-
-    AC_ARG_WITH(gcov, [AS_HELP_STRING([--with-gcov=yes/no],
-                      [with GCC Code Coverage reporting.])],
-                      [ZMQ_GCOV="$withval"])
-
-    AC_MSG_CHECKING(whether to enable code coverage)
-
-    if test "x$ZMQ_GCOV" = "xyes"; then
-
-        if test "x$GXX" != "xyes"; then
-            AC_MSG_ERROR([--with-gcov=yes works only with GCC])
-        fi
-
-        CFLAGS="-g -O0 -fprofile-arcs -ftest-coverage"
-        if test "x${ZMQ_ORIG_CPPFLAGS}" != "xnone"; then
-            CFLAGS="${CFLAGS} ${ZMQ_ORIG_CFLAGS}"
-        fi
-
-        CPPFLAGS="-g -O0 -fprofile-arcs -ftest-coverage"
-        if test "x${ZMQ_ORIG_CPPFLAGS}" != "xnone"; then
-            CPPFLAGS="${CPPFLAGS} ${ZMQ_ORIG_CPPFLAGS}"
-        fi
-
-        CXXFLAGS="-fprofile-arcs"
-        if test "x${ZMQ_ORIG_CXXFLAGS}" != "xnone"; then
-            CXXFLAGS="${CXXFLAGS} ${ZMQ_ORIG_CXXFLAGS}"
-        fi
-
-        LIBS="-lgcov ${LIBS}"
-    fi
-
-    AS_IF([test "x$ZMQ_GCOV" = "xyes"],
-          [AC_MSG_RESULT(yes) ; $1], [AC_MSG_RESULT(no) ; $2])
-}])
-
-dnl ##############################################################################
-dnl # LIBZMQ_CHECK_WITH_FLAG([flags], [macro])                                   #
-dnl # Runs a normal autoconf check with compiler flags                           #
-dnl ##############################################################################
-AC_DEFUN([LIBZMQ_CHECK_WITH_FLAG], [{
-    libzmq_check_with_flag_save_CFLAGS="$CFLAGS"
-    libzmq_check_with_flag_save_CPPFLAGS="$CPPFLAGS"
-
-    CFLAGS="$CFLAGS $1"
-    CPPFLAGS="$CPPFLAGS $1"
-
-    # Execute the macro
-    $2
-
-    CFLAGS="$libzmq_check_with_flag_save_CFLAGS"
-    CPPFLAGS="$libzmq_check_with_flag_save_CPPFLAGS"
-}])
-
-dnl ##############################################################################
-dnl # LIBZMQ_LANG_WALL([action-if-found], [action-if-not-found])                 #
-dnl # How to define -Wall for the current compiler                               #
-dnl # Sets libzmq_cv_[]_AC_LANG_ABBREV[]__wall_flag variable to found style      #
-dnl ##############################################################################
-AC_DEFUN([LIBZMQ_LANG_WALL], [{
-
-    AC_MSG_CHECKING([how to enable additional warnings for _AC_LANG compiler])
-
-    libzmq_cv_[]_AC_LANG_ABBREV[]_wall_flag=""
-
-    # C compilers
-    case "x[]_AC_LANG_ABBREV" in
-       xc)
-            # GCC, clang and ICC
-            if test "x$GCC" = "xyes" -o \
-                    "x$libzmq_cv_[]_AC_LANG_ABBREV[]_intel_compiler" = "xyes" -o \
-                    "x$libzmq_cv_[]_AC_LANG_ABBREV[]_clang_compiler" = "xyes"; then
-                libzmq_cv_[]_AC_LANG_ABBREV[]_wall_flag="-Wall"
-            # Sun studio
-            elif test "x$libzmq_cv_[]_AC_LANG_ABBREV[]_sun_studio_compiler" = "xyes"; then
-                libzmq_cv_[]_AC_LANG_ABBREV[]_wall_flag="-v"
-            fi
-       ;;
-       xcxx)
-            # GCC, clang and ICC
-            if test "x$GXX" = "xyes" -o \
-                    "x$libzmq_cv_[]_AC_LANG_ABBREV[]_intel_compiler" = "xyes" -o \
-                    "x$libzmq_cv_[]_AC_LANG_ABBREV[]_clang_compiler" = "xyes"; then
-                libzmq_cv_[]_AC_LANG_ABBREV[]_wall_flag="-Wall"
-            # Sun studio
-            elif test "x$libzmq_cv_[]_AC_LANG_ABBREV[]_sun_studio_compiler" = "xyes"; then
-                libzmq_cv_[]_AC_LANG_ABBREV[]_wall_flag="+w"
-            fi
-       ;;
-       *)
-       ;;
-    esac
-
-    # Call the action
-    if test "x$libzmq_cv_[]_AC_LANG_ABBREV[]_wall_flag" != "x"; then
-        AC_MSG_RESULT([$libzmq_cv_[]_AC_LANG_ABBREV[]_wall_flag])
-        $1
-    else
-        AC_MSG_RESULT([not found])
-        $2
-    fi
-}])
-
-dnl ####################################################################
-dnl # LIBZMQ_LANG_STRICT([action-if-found], [action-if-not-found])     #
-dnl # Check how to turn on strict standards compliance                 #
-dnl ####################################################################
-AC_DEFUN([LIBZMQ_LANG_STRICT], [{
-    AC_MSG_CHECKING([how to enable strict standards compliance in _AC_LANG compiler])
-
-    libzmq_cv_[]_AC_LANG_ABBREV[]_strict_flag=""
-
-    # C compilers
-    case "x[]_AC_LANG_ABBREV" in
-       xc)
-            # GCC, clang and ICC
-            if test "x$GCC" = "xyes" -o "x$libzmq_cv_[]_AC_LANG_ABBREV[]_clang_compiler" = "xyes"; then
-                libzmq_cv_[]_AC_LANG_ABBREV[]_strict_flag="-pedantic"
-            elif test "x$libzmq_cv_[]_AC_LANG_ABBREV[]_intel_compiler" = "xyes"; then
-                libzmq_cv_[]_AC_LANG_ABBREV[]_strict_flag="-strict-ansi"
-            # Sun studio
-            elif test "x$libzmq_cv_[]_AC_LANG_ABBREV[]_sun_studio_compiler" = "xyes"; then
-                libzmq_cv_[]_AC_LANG_ABBREV[]_strict_flag="-Xc"
-            fi
-       ;;
-       xcxx)
-            # GCC, clang and ICC
-            if test "x$GXX" = "xyes" -o "x$libzmq_cv_[]_AC_LANG_ABBREV[]_clang_compiler" = "xyes"; then
-                libzmq_cv_[]_AC_LANG_ABBREV[]_strict_flag="-pedantic"
-            elif test "x$libzmq_cv_[]_AC_LANG_ABBREV[]_intel_compiler" = "xyes"; then
-                libzmq_cv_[]_AC_LANG_ABBREV[]_strict_flag="-strict-ansi"
-            # Sun studio
-            elif test "x$libzmq_cv_[]_AC_LANG_ABBREV[]_sun_studio_compiler" = "xyes"; then
-                libzmq_cv_[]_AC_LANG_ABBREV[]_strict_flag="-compat=5"
-            fi
-       ;;
-       *)
-       ;;
-    esac
-
-    # Call the action
-    if test "x$libzmq_cv_[]_AC_LANG_ABBREV[]_strict_flag" != "x"; then
-        AC_MSG_RESULT([$libzmq_cv_[]_AC_LANG_ABBREV[]_strict_flag])
-        $1
-    else
-        AC_MSG_RESULT([not found])
-        $2
-    fi
-}])
-
-dnl ########################################################################
-dnl # LIBZMQ_LANG_WERROR([action-if-found], [action-if-not-found])         #
-dnl # Check how to turn warnings to errors                                 #
-dnl ########################################################################
-AC_DEFUN([LIBZMQ_LANG_WERROR], [{
-    AC_MSG_CHECKING([how to turn warnings to errors in _AC_LANG compiler])
-
-    libzmq_cv_[]_AC_LANG_ABBREV[]_werror_flag=""
-
-    # C compilers
-    case "x[]_AC_LANG_ABBREV" in
-       xc)
-            # GCC, clang and ICC
-            if test "x$GCC" = "xyes" -o "x$libzmq_cv_[]_AC_LANG_ABBREV[]_intel_compiler" = "xyes"; then
-                libzmq_cv_[]_AC_LANG_ABBREV[]_werror_flag="-Werror"
-            # Sun studio
-            elif test "x$libzmq_cv_[]_AC_LANG_ABBREV[]_sun_studio_compiler" = "xyes"; then
-                libzmq_cv_[]_AC_LANG_ABBREV[]_werror_flag="-errwarn=%all"
-            fi
-       ;;
-       xcxx)
-            # GCC, clang and ICC
-            if test "x$GXX" = "xyes" -o "x$libzmq_cv_[]_AC_LANG_ABBREV[]_intel_compiler" = "xyes"; then
-                libzmq_cv_[]_AC_LANG_ABBREV[]_werror_flag="-Werror"
-            # Sun studio
-            elif test "x$libzmq_cv_[]_AC_LANG_ABBREV[]_sun_studio_compiler" = "xyes"; then
-                libzmq_cv_[]_AC_LANG_ABBREV[]_werror_flag="-errwarn=%all"
-            fi
-       ;;
-       *)
-       ;;
-    esac
-
-    # Call the action
-    if test "x$libzmq_cv_[]_AC_LANG_ABBREV[]_werror_flag" != "x"; then
-        AC_MSG_RESULT([$libzmq_cv_[]_AC_LANG_ABBREV[]_werror_flag])
-        $1
-    else
-        AC_MSG_RESULT([not found])
-        $2
-    fi
-}])
-
-dnl ################################################################################
-dnl # LIBZMQ_CHECK_LANG_PRAGMA([pragma], [action-if-found], [action-if-not-found]) #
-dnl # Check if the compiler supports given pragma                                  #
-dnl ################################################################################
-AC_DEFUN([LIBZMQ_CHECK_LANG_PRAGMA], [{
-    # Need to know how to enable all warnings
-    LIBZMQ_LANG_WALL
-
-    AC_MSG_CHECKING([whether _AC_LANG compiler supports pragma $1])
-
-    # Save flags
-    libzmq_cv_[]_AC_LANG_ABBREV[]_werror_flag_save=$ac_[]_AC_LANG_ABBREV[]_werror_flag
-    ac_[]_AC_LANG_ABBREV[]_werror_flag="yes"
-
-    if test "x[]_AC_LANG_ABBREV" = "xc"; then
-        libzmq_cv_check_lang_pragma_save_CFLAGS="$CFLAGS"
-        CFLAGS="$CFLAGS $libzmq_cv_[]_AC_LANG_ABBREV[]_wall_flag"
-    elif test "x[]_AC_LANG_ABBREV" = "xcxx"; then
-        libzmq_cv_check_lang_pragma_save_CPPFLAGS="$CPPFLAGS"
-        CPPFLAGS="$CPPFLAGS $libzmq_cv_[]_AC_LANG_ABBREV[]_wall_flag"
-    else
-        AC_MSG_WARN([testing compiler characteristic on an unknown language])
-    fi
-
-    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [[#pragma $1]])],
-                      [eval AS_TR_SH(libzmq_cv_[]_AC_LANG_ABBREV[]_supports_pragma_$1)="yes" ; AC_MSG_RESULT(yes)],
-                      [eval AS_TR_SH(libzmq_cv_[]_AC_LANG_ABBREV[]_supports_pragma_$1)="no" ; AC_MSG_RESULT(no)])
-
-    if test "x[]_AC_LANG_ABBREV" = "xc"; then
-        CFLAGS="$libzmq_cv_check_lang_pragma_save_CFLAGS"
-    elif test "x[]_AC_LANG_ABBREV" = "xcxx"; then
-        CPPFLAGS="$libzmq_cv_check_lang_pragma_save_CPPFLAGS"
-    fi
-
-    ac_[]_AC_LANG_ABBREV[]_werror_flag=$libzmq_cv_[]_AC_LANG_ABBREV[]_werror_flag_save
-
-    # Call the action as the flags are restored
-    AS_IF([eval test x$]AS_TR_SH(libzmq_cv_[]_AC_LANG_ABBREV[]_supports_pragma_$1)[ = "xyes"],
-          [$2], [$3])
-}])
-
-dnl ################################################################################
-dnl # LIBZMQ_CHECK_LANG_VISIBILITY([action-if-found], [action-if-not-found])       #
-dnl # Check if the compiler supports dso visibility                                #
-dnl ################################################################################
-AC_DEFUN([LIBZMQ_CHECK_LANG_VISIBILITY], [{
-
-    libzmq_cv_[]_AC_LANG_ABBREV[]_visibility_flag=""
-
-    if test "x$libzmq_cv_[]_AC_LANG_ABBREV[]_intel_compiler" = "xyes" -o \
-            "x$libzmq_cv_[]_AC_LANG_ABBREV[]_clang_compiler" = "xyes" -o \
-            "x$libzmq_cv_[]_AC_LANG_ABBREV[]_gcc4_compiler" = "xyes"; then
-        LIBZMQ_CHECK_LANG_FLAG([-fvisibility=hidden],
-                               [libzmq_cv_[]_AC_LANG_ABBREV[]_visibility_flag="-fvisibility=hidden"])
-    elif test "x$libzmq_cv_[]_AC_LANG_ABBREV[]_sun_studio_compiler" = "xyes"; then
-        LIBZMQ_CHECK_LANG_FLAG([-xldscope=hidden],
-                               [libzmq_cv_[]_AC_LANG_ABBREV[]_visibility_flag="-xldscope=hidden"])
-    fi
-
-    AC_MSG_CHECKING(whether _AC_LANG compiler supports dso visibility)
-
-    AS_IF([test "x$libzmq_cv_[]_AC_LANG_ABBREV[]_visibility_flag" != "x"],
-          [AC_MSG_RESULT(yes) ; $1], [AC_MSG_RESULT(no) ; $2])
-}])
-
-dnl ################################################################################
-dnl # LIBZMQ_CHECK_SOCK_CLOEXEC([action-if-found], [action-if-not-found])          #
-dnl # Check if SOCK_CLOEXEC is supported                                           #
-dnl ################################################################################
-AC_DEFUN([LIBZMQ_CHECK_SOCK_CLOEXEC], [{
-    AC_CACHE_CHECK([whether SOCK_CLOEXEC is supported], [libzmq_cv_sock_cloexec],
-        [AC_TRY_RUN([/* SOCK_CLOEXEC test */
-#include <sys/types.h>
-#include <sys/socket.h>
-
-int main (int argc, char *argv [])
-{
-    int s = socket (PF_INET, SOCK_STREAM | SOCK_CLOEXEC, 0);
-    return (s == -1);
-}
-        ],
-        [libzmq_cv_sock_cloexec="yes"],
-        [libzmq_cv_sock_cloexec="no"],
-        [libzmq_cv_sock_cloexec="not during cross-compile"]
-        )]
-    )
-    AS_IF([test "x$libzmq_cv_sock_cloexec" = "xyes"], [$1], [$2])
-}])
-
-dnl ################################################################################
-dnl # LIBZMQ_CHECK_O_CLOEXEC([action-if-found], [action-if-not-found])          #
-dnl # Check if O_CLOEXEC is supported                                           #
-dnl ################################################################################
-AC_DEFUN([LIBZMQ_CHECK_O_CLOEXEC], [{
-    AC_CACHE_CHECK([whether O_CLOEXEC is supported], [libzmq_cv_o_cloexec],
-        [AC_TRY_RUN([/* O_CLOEXEC test */
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-
-int main (int argc, char *argv [])
-{
-    int s = open ("/dev/null", O_CLOEXEC | O_RDONLY);
-    return (s == -1);
-}
-        ],
-        [libzmq_cv_o_cloexec="yes"],
-        [libzmq_cv_o_cloexec="no"],
-        [libzmq_cv_o_cloexec="not during cross-compile"]
-        )]
-    )
-    AS_IF([test "x$libzmq_cv_o_cloexec" = "xyes"], [$1], [$2])
-}])
-
-dnl ################################################################################
-dnl # LIBZMQ_CHECK_EVENTFD_CLOEXEC([action-if-found], [action-if-not-found])          #
-dnl # Check if EFD_CLOEXEC is supported                                           #
-dnl ################################################################################
-AC_DEFUN([LIBZMQ_CHECK_EVENTFD_CLOEXEC], [{
-    AC_CACHE_CHECK([whether EFD_CLOEXEC is supported], [libzmq_cv_efd_cloexec],
-        [AC_TRY_RUN([/* EFD_CLOEXEC test */
-#include <sys/eventfd.h>
-
-int main (int argc, char *argv [])
-{
-    int s = eventfd (0, EFD_CLOEXEC);
-    return (s == -1);
-}
-        ],
-        [libzmq_cv_efd_cloexec="yes"],
-        [libzmq_cv_efd_cloexec="no"],
-        [libzmq_cv_efd_cloexec="not during cross-compile"]
-        )]
-    )
-    AS_IF([test "x$libzmq_cv_efd_cloexec" = "xyes"], [$1], [$2])
-}])
-
-dnl ################################################################################
-dnl # LIBZMQ_CHECK_ATOMIC_INSTRINSICS([action-if-found], [action-if-not-found])    #
-dnl # Check if compiler supoorts __atomic_Xxx intrinsics                           #
-dnl ################################################################################
-AC_DEFUN([LIBZMQ_CHECK_ATOMIC_INTRINSICS], [{
-    AC_MSG_CHECKING(whether compiler supports __atomic_Xxx intrinsics)
-    AC_LINK_IFELSE([AC_LANG_SOURCE([
-/* atomic intrinsics test */
-int v = 0;
-int main (int, char **)
-{
-    int t = __atomic_add_fetch (&v, 1, __ATOMIC_ACQ_REL);
-    return t;
-}
-    ])],
-    [AC_MSG_RESULT(yes) ; GCC_ATOMIC_BUILTINS_SUPPORTED=1 libzmq_cv_has_atomic_instrisics="yes" ; $1])
-
-    if test "x$GCC_ATOMIC_BUILTINS_SUPPORTED" != x1; then
-        save_LIBS=$LIBS
-        LIBS="$LIBS -latomic"
-        AC_LINK_IFELSE([AC_LANG_SOURCE([
-        /* atomic intrinsics test */
-        int v = 0;
-        int main (int, char **)
-        {
-            int t = __atomic_add_fetch (&v, 1, __ATOMIC_ACQ_REL);
-            return t;
-        }
-        ])],
-        [AC_MSG_RESULT(yes) ; libzmq_cv_has_atomic_instrisics="yes" PKGCFG_LIBS_PRIVATE="$PKGCFG_LIBS_PRIVATE -latomic" ; $1],
-        [AC_MSG_RESULT(no) ; libzmq_cv_has_atomic_instrisics="no" LIBS=$save_LIBS ; $2])
-    fi
-}])
-
-dnl ################################################################################
-dnl # LIBZMQ_CHECK_SO_BINDTODEVICE([action-if-found], [action-if-not-found])          #
-dnl # Check if SO_BINDTODEVICE is supported                                           #
-dnl ################################################################################
-AC_DEFUN([LIBZMQ_CHECK_SO_BINDTODEVICE], [{
-    AC_CACHE_CHECK([whether SO_BINDTODEVICE is supported], [libzmq_cv_so_bindtodevice],
-        [AC_TRY_RUN([/* SO_BINDTODEVICE test */
-#include <sys/socket.h>
-
-int main (int argc, char *argv [])
-{
-/* Actually making the setsockopt() call requires CAP_NET_RAW */
-#ifndef SO_BINDTODEVICE
-    return 1;
-#else
-    return 0;
-#endif
-}
-        ],
-        [libzmq_cv_so_bindtodevice="yes"],
-        [libzmq_cv_so_bindtodevice="no"],
-        [libzmq_cv_so_bindtodevice="not during cross-compile"]
-        )]
-    )
-    AS_IF([test "x$libzmq_cv_so_bindtodevice" = "xyes"], [$1], [$2])
-}])
-
-dnl ################################################################################
-dnl # LIBZMQ_CHECK_SO_KEEPALIVE([action-if-found], [action-if-not-found])          #
-dnl # Check if SO_KEEPALIVE is supported                                           #
-dnl ################################################################################
-AC_DEFUN([LIBZMQ_CHECK_SO_KEEPALIVE], [{
-    AC_CACHE_CHECK([whether SO_KEEPALIVE is supported], [libzmq_cv_so_keepalive],
-        [AC_TRY_RUN([/* SO_KEEPALIVE test */
-#include <sys/types.h>
-#include <sys/socket.h>
-
-int main (int argc, char *argv [])
-{
-    int s, rc, opt = 1;
-    return (
-        ((s = socket (PF_INET, SOCK_STREAM, 0)) == -1) ||
-        ((rc = setsockopt (s, SOL_SOCKET, SO_KEEPALIVE, (char*) &opt, sizeof (int))) == -1)
-    );
-}
-        ],
-        [libzmq_cv_so_keepalive="yes"],
-        [libzmq_cv_so_keepalive="no"],
-        [libzmq_cv_so_keepalive="not during cross-compile"]
-        )]
-    )
-    AS_IF([test "x$libzmq_cv_so_keepalive" = "xyes"], [$1], [$2])
-}])
-
-dnl ################################################################################
-dnl # LIBZMQ_CHECK_TCP_KEEPCNT([action-if-found], [action-if-not-found])           #
-dnl # Check if TCP_KEEPCNT is supported                                            #
-dnl ################################################################################
-AC_DEFUN([LIBZMQ_CHECK_TCP_KEEPCNT], [{
-    AC_CACHE_CHECK([whether TCP_KEEPCNT is supported], [libzmq_cv_tcp_keepcnt],
-        [AC_TRY_RUN([/* TCP_KEEPCNT test */
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netinet/tcp.h>
-
-int main (int argc, char *argv [])
-{
-    int s, rc, opt = 1;
-    return (
-        ((s = socket (PF_INET, SOCK_STREAM, 0)) == -1) ||
-        ((rc = setsockopt (s, SOL_SOCKET, SO_KEEPALIVE, (char*) &opt, sizeof (int))) == -1) ||
-        ((rc = setsockopt (s, IPPROTO_TCP, TCP_KEEPCNT, (char*) &opt, sizeof (int))) == -1)
-    );
-}
-        ],
-        [libzmq_cv_tcp_keepcnt="yes"],
-        [libzmq_cv_tcp_keepcnt="no"],
-        [libzmq_cv_tcp_keepcnt="not during cross-compile"]
-        )]
-    )
-    AS_IF([test "x$libzmq_cv_tcp_keepcnt" = "xyes"], [$1], [$2])
-}])
-
-dnl ################################################################################
-dnl # LIBZMQ_CHECK_TCP_KEEPIDLE([action-if-found], [action-if-not-found])          #
-dnl # Check if TCP_KEEPIDLE is supported                                           #
-dnl ################################################################################
-AC_DEFUN([LIBZMQ_CHECK_TCP_KEEPIDLE], [{
-    AC_CACHE_CHECK([whether TCP_KEEPIDLE is supported], [libzmq_cv_tcp_keepidle],
-        [AC_TRY_RUN([/* TCP_KEEPIDLE test */
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netinet/tcp.h>
-
-int main (int argc, char *argv [])
-{
-    int s, rc, opt = 1;
-    return (
-        ((s = socket (PF_INET, SOCK_STREAM, 0)) == -1) ||
-        ((rc = setsockopt (s, SOL_SOCKET, SO_KEEPALIVE, (char*) &opt, sizeof (int))) == -1) ||
-        ((rc = setsockopt (s, IPPROTO_TCP, TCP_KEEPIDLE, (char*) &opt, sizeof (int))) == -1)
-    );
-}
-        ],
-        [libzmq_cv_tcp_keepidle="yes"],
-        [libzmq_cv_tcp_keepidle="no"],
-        [libzmq_cv_tcp_keepidle="not during cross-compile"]
-        )]
-    )
-    AS_IF([test "x$libzmq_cv_tcp_keepidle" = "xyes"], [$1], [$2])
-}])
-
-dnl ################################################################################
-dnl # LIBZMQ_CHECK_TCP_KEEPINTVL([action-if-found], [action-if-not-found])          #
-dnl # Check if TCP_KEEPINTVL is supported                                           #
-dnl ################################################################################
-AC_DEFUN([LIBZMQ_CHECK_TCP_KEEPINTVL], [{
-    AC_CACHE_CHECK([whether TCP_KEEPINTVL is supported], [libzmq_cv_tcp_keepintvl],
-        [AC_TRY_RUN([/* TCP_KEEPINTVL test */
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netinet/tcp.h>
-
-int main (int argc, char *argv [])
-{
-    int s, rc, opt = 1;
-    return (
-        ((s = socket (PF_INET, SOCK_STREAM, 0)) == -1) ||
-        ((rc = setsockopt (s, SOL_SOCKET, SO_KEEPALIVE, (char*) &opt, sizeof (int))) == -1) ||
-        ((rc = setsockopt (s, IPPROTO_TCP, TCP_KEEPINTVL, (char*) &opt, sizeof (int))) == -1)
-    );
-}
-        ],
-        [libzmq_cv_tcp_keepintvl="yes"],
-        [libzmq_cv_tcp_keepintvl="no"],
-        [libzmq_cv_tcp_keepintvl="not during cross-compile"]
-        )]
-    )
-    AS_IF([test "x$libzmq_cv_tcp_keepintvl" = "xyes"], [$1], [$2])
-}])
-
-dnl ################################################################################
-dnl # LIBZMQ_CHECK_TCP_KEEPALIVE([action-if-found], [action-if-not-found])         #
-dnl # Check if TCP_KEEPALIVE is supported                                          #
-dnl ################################################################################
-AC_DEFUN([LIBZMQ_CHECK_TCP_KEEPALIVE], [{
-    AC_CACHE_CHECK([whether TCP_KEEPALIVE is supported], [libzmq_cv_tcp_keepalive],
-        [AC_TRY_RUN([/* TCP_KEEPALIVE test */
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netinet/tcp.h>
-
-int main (int argc, char *argv [])
-{
-    int s, rc, opt = 1;
-    return (
-        ((s = socket (PF_INET, SOCK_STREAM, 0)) == -1) ||
-        ((rc = setsockopt (s, SOL_SOCKET, SO_KEEPALIVE, (char*) &opt, sizeof (int))) == -1) ||
-        ((rc = setsockopt (s, IPPROTO_TCP, TCP_KEEPALIVE, (char*) &opt, sizeof (int))) == -1)
-    );
-}
-        ],
-        [libzmq_cv_tcp_keepalive="yes"],
-        [libzmq_cv_tcp_keepalive="no"],
-        [libzmq_cv_tcp_keepalive="not during cross-compile"]
-        )]
-    )
-    AS_IF([test "x$libzmq_cv_tcp_keepalive" = "xyes"], [$1], [$2])
-}])
-
-dnl ################################################################################
-dnl # LIBZMQ_CHECK_SO_PRIORITY([action-if-found], [action-if-not-found])           #
-dnl # Check if SO_PRIORITY is supported                                            #
-dnl ################################################################################
-AC_DEFUN([LIBZMQ_CHECK_SO_PRIORITY], [{
-    AC_CACHE_CHECK([whether SO_PRIORITY is supported], [libzmq_cv_so_priority],
-        [AC_TRY_RUN([/* SO_PRIORITY test */
-#include <sys/types.h>
-#include <sys/socket.h>
-
-int main (int argc, char *argv [])
-{
-    int s, rc, opt = 1;
-    return (
-        ((s = socket (PF_INET, SOCK_STREAM, 0)) == -1) ||
-        ((rc = setsockopt (s, SOL_SOCKET, SO_PRIORITY, (char*) &opt, sizeof (int))) == -1)
-    );
-}
-        ],
-        [libzmq_cv_so_priority="yes"],
-        [libzmq_cv_so_priority="no"],
-        [libzmq_cv_so_priority="not during cross-compile"]
-        )]
-    )
-    AS_IF([test "x$libzmq_cv_so_priority" = "xyes"], [$1], [$2])
-}])
-
-dnl ################################################################################
-dnl # LIBZMQ_CHECK_GETRANDOM([action-if-found], [action-if-not-found])  #
-dnl # Checks if getrandom is supported                                  #
-dnl ################################################################################
-AC_DEFUN([LIBZMQ_CHECK_GETRANDOM], [{
-    AC_CACHE_CHECK([whether getrandom is supported], [libzmq_cv_getrandom],
-        [AC_TRY_RUN([/* thread-local storage test */
-#include <sys/random.h>
-
-int main (int argc, char *argv [])
-{
-    char buf[4];
-    int rc = getrandom(buf, 4, 0);
-    return rc == -1 ? 1 : 0;
-}
-        ],
-        [libzmq_cv_getrandom="yes"],
-        [libzmq_cv_getrandom="no"],
-        [libzmq_cv_getrandom="not during cross-compile"]
-        )]
-    )
-    AS_IF([test "x$libzmq_cv_getrandom" = "xyes"], [$1], [$2])
-}])
-
-dnl ################################################################################
-dnl # LIBZMQ_CHECK_POLLER_KQUEUE([action-if-found], [action-if-not-found])         #
-dnl # Checks kqueue polling system                                                 #
-dnl ################################################################################
-AC_DEFUN([LIBZMQ_CHECK_POLLER_KQUEUE], [{
-    AC_LINK_IFELSE([
-        AC_LANG_PROGRAM([
-#include <sys/types.h>
-#include <sys/event.h>
-#include <sys/time.h>
-        ],[[
-struct kevent t_kev;
-kqueue();
-        ]])],
-        [$1], [$2]
-    )
-}])
-
-dnl ################################################################################
-dnl # LIBZMQ_CHECK_POLLER_EPOLL_RUN([action-if-found], [action-if-not-found])      #
-dnl # LIBZMQ_CHECK_POLLER_EPOLL_CLOEXEC([action-if-found], [action-if-not-found])  #
-dnl # Checks epoll polling system can actually run #
-dnl # For cross-compile, only requires that epoll can link #
-dnl ################################################################################
-AC_DEFUN([LIBZMQ_CHECK_POLLER_EPOLL], [{
-    AC_RUN_IFELSE([
-        AC_LANG_PROGRAM([
-#include <sys/epoll.h>
-        ],[[
-struct epoll_event t_ev;
-int r;
-r = epoll_create(10);
-return(r < 0);
-        ]])],
-        [$1],[$2],[
-            AC_LINK_IFELSE([
-                AC_LANG_PROGRAM([
-#include <sys/epoll.h>
-                ],[[
-struct epoll_event t_ev;
-epoll_create(10);
-                ]])],
-                [$1], [$2]
-            )
-        ]
-    )
-}])
-
-AC_DEFUN([LIBZMQ_CHECK_POLLER_EPOLL_CLOEXEC], [{
-    AC_RUN_IFELSE([
-        AC_LANG_PROGRAM([
-#include <sys/epoll.h>
-        ],[[
-struct epoll_event t_ev;
-int r;
-r = epoll_create1(EPOLL_CLOEXEC);
-return(r < 0);
-        ]])],
-        [$1],[$2],[
-            AC_LINK_IFELSE([
-                AC_LANG_PROGRAM([
-#include <sys/epoll.h>
-                ],[[
-struct epoll_event t_ev;
-epoll_create1(EPOLL_CLOEXEC);
-                ]])],
-                [$1], [$2]
-            )
-        ]
-    )
-}])
-
-dnl ################################################################################
-dnl # LIBZMQ_CHECK_POLLER_DEVPOLL([action-if-found], [action-if-not-found])        #
-dnl # Checks devpoll polling system                                                #
-dnl ################################################################################
-AC_DEFUN([LIBZMQ_CHECK_POLLER_DEVPOLL], [{
-    AC_LINK_IFELSE([
-        AC_LANG_PROGRAM([
-#include <sys/devpoll.h>
-        ],[[
-struct pollfd t_devpoll;
-int fd = open("/dev/poll", O_RDWR);
-        ]])],
-        [$1], [$2]
-    )
-}])
-
-dnl ################################################################################
-dnl # LIBZMQ_CHECK_POLLER_POLLSET([action-if-found], [action-if-not-found])        #
-dnl # Checks pollset polling system                                                #
-dnl ################################################################################
-AC_DEFUN([LIBZMQ_CHECK_POLLER_POLLSET], [{
-    AC_LINK_IFELSE([
-        AC_LANG_PROGRAM([
-#include <sys/poll.h>
-#include <sys/pollset.h>
-        ],[[
-pollset_t ps = pollset_create(-1);
-        ]])],
-        [$1], [$2]
-    )
-}])
-
-dnl ################################################################################
-dnl # LIBZMQ_CHECK_POLLER_POLL([action-if-found], [action-if-not-found])           #
-dnl # Checks poll polling system                                                   #
-dnl ################################################################################
-AC_DEFUN([LIBZMQ_CHECK_POLLER_POLL], [{
-    AC_LINK_IFELSE([
-        AC_LANG_PROGRAM([
-#include <poll.h>
-        ],[[
-struct pollfd t_poll;
-poll(&t_poll, 1, 1);
-        ]])],
-        [$1], [$2]
-    )
-}])
-
-dnl ################################################################################
-dnl # LIBZMQ_CHECK_POLLER_SELECT([action-if-found], [action-if-not-found])         #
-dnl # Checks select polling system                                                 #
-dnl ################################################################################
-AC_DEFUN([LIBZMQ_CHECK_POLLER_SELECT], [{
-    AC_LINK_IFELSE([
-        AC_LANG_PROGRAM([
-#ifdef ZMQ_HAVE_WINDOWS
-#include "winsock2.h"
-#elif defined ZMQ_HAVE_OPENVMS
-#include <sys/types.h>
-#include <sys/time.h>
-#else
-#include <sys/select.h>
-#endif
-        ],[[
-fd_set t_rfds;
-struct timeval tv;
-FD_ZERO(&t_rfds);
-FD_SET(0, &t_rfds);
-tv.tv_sec = 5;
-tv.tv_usec = 0;
-select(1, &t_rfds, 0, 0, &tv);
-        ]])],
-        [$1],[$2]
-    )
-}])
-
-dnl ################################################################################
-dnl # LIBZMQ_CHECK_PSELECT([action-if-found], [action-if-not-found])               #
-dnl # Checks pselect polling system                                                #
-dnl ################################################################################
-AC_DEFUN([LIBZMQ_CHECK_PSELECT], [{
-    AC_LINK_IFELSE([
-        AC_LANG_PROGRAM([
-#include <sys/select.h>
-#include <signal.h>
-        ],[[
-fd_set t_rfds;
-struct timespec ts;
-FD_ZERO(&t_rfds);
-FD_SET(0, &t_rfds);
-ts.tv_sec = 5;
-ts.tv_nsec = 0;
-sigset_t sigmask, sigmask_without_sigterm;
-sigemptyset(&sigmask);
-sigprocmask(SIG_BLOCK, &sigmask, &sigmask_without_sigterm);
-
-pselect(1, &t_rfds, 0, 0, &ts, &sigmask);
-        ]])],
-        [$1],[$2]
-    )
-}])
-
-dnl ################################################################################
-dnl # LIBZMQ_CHECK_POLLER([action-if-found], [action-if-not-found])                #
-dnl # Choose polling system                                                        #
-dnl ################################################################################
-
-AC_DEFUN([LIBZMQ_CHECK_POLLER], [{
-    # Allow user to override poller autodetection
-    AC_ARG_WITH([poller],
-        [AS_HELP_STRING([--with-poller],
-        [choose I/O thread polling system manually. Valid values are 'kqueue', 'epoll', 'devpoll', 'pollset', 'poll', 'select', 'wepoll', or 'auto'. [default=auto]])])
-
-    # Allow user to override poller autodetection
-    AC_ARG_WITH([api_poller],
-        [AS_HELP_STRING([--with-api-poller],
-        [choose zmq_poll(er)_* API polling system manually. Valid values are 'poll', 'select', or 'auto'. [default=auto]])])
-
-    if test "x$with_poller" = "x"; then
-        pollers=auto
-    else
-        pollers=$with_poller
-    fi
-    if test "$pollers" = "auto"; then
-        # We search for pollers in this order
-        pollers="kqueue epoll devpoll pollset poll select"
-    fi
-
-    # try to find suitable polling system. the order of testing is:
-    AC_MSG_NOTICE([Choosing I/O thread polling system from '$pollers'...])
-    poller_found=0
-    for poller in $pollers; do
-        case "$poller" in
-            kqueue)
-                LIBZMQ_CHECK_POLLER_KQUEUE([
-                    AC_MSG_NOTICE([Using 'kqueue' I/O thread polling system])
-                    AC_DEFINE(ZMQ_IOTHREAD_POLLER_USE_KQUEUE, 1, [Use 'kqueue' I/O thread polling system])
-                    poller_found=1
-                ])
-            ;;
-            epoll)
-                case "$host_os" in
-                    solaris*|sunos*)
-                        # Recent illumos and Solaris systems did add epoll()
-                        # syntax, but it does not fully satisfy expectations
-                        # that ZMQ has from Linux systems. Unless you undertake
-                        # to fix the integration, do not disable this exception
-                        # and use select() or poll() on Solarish OSes for now.
-                        AC_MSG_NOTICE([NOT using 'epoll' I/O thread polling system on '$host_os']) ;;
-                    *)
-                        LIBZMQ_CHECK_POLLER_EPOLL_CLOEXEC([
-                            AC_MSG_NOTICE([Using 'epoll' I/O thread polling system with CLOEXEC])
-                            AC_DEFINE(ZMQ_IOTHREAD_POLLER_USE_EPOLL, 1, [Use 'epoll' I/O thread polling system])
-                            AC_DEFINE(ZMQ_IOTHREAD_POLLER_USE_EPOLL_CLOEXEC, 1, [Use 'epoll' I/O thread polling system with CLOEXEC])
-                            poller_found=1
-                            ],[
-                            LIBZMQ_CHECK_POLLER_EPOLL([
-                                AC_MSG_NOTICE([Using 'epoll' I/O thread polling system with CLOEXEC])
-                                AC_DEFINE(ZMQ_IOTHREAD_POLLER_USE_EPOLL, 1, [Use 'epoll' I/O thread polling system])
-                                poller_found=1
-                            ])
-                        ])
-                        ;;
-                esac
-            ;;
-            devpoll)
-                LIBZMQ_CHECK_POLLER_DEVPOLL([
-                    AC_MSG_NOTICE([Using 'devpoll' I/O thread polling system])
-                    AC_DEFINE(ZMQ_IOTHREAD_POLLER_USE_DEVPOLL, 1, [Use 'devpoll' I/O thread polling system])
-                    poller_found=1
-                ])
-            ;;
-            pollset)
-                LIBZMQ_CHECK_POLLER_POLLSET([
-                    AC_MSG_NOTICE([Using 'pollset' I/O thread polling system])
-                    AC_DEFINE(ZMQ_IOTHREAD_POLLER_USE_POLLSET, 1, [Use 'pollset' I/O thread polling system])
-                    poller_found=1
-                ])
-            ;;
-            poll)
-                LIBZMQ_CHECK_POLLER_POLL([
-                    AC_MSG_NOTICE([Using 'poll' I/O thread polling system])
-                    AC_DEFINE(ZMQ_IOTHREAD_POLLER_USE_POLL, 1, [Use 'poll' I/O thread polling system])
-                    poller_found=1
-                ])
-            ;;
-            select)
-                LIBZMQ_CHECK_POLLER_SELECT([
-                    AC_MSG_NOTICE([Using 'select' I/O thread polling system])
-                    AC_DEFINE(ZMQ_IOTHREAD_POLLER_USE_SELECT, 1, [Use 'select' I/O thread polling system])
-                    poller_found=1
-                ])
-            ;;
-            wepoll)
-                # wepoll can only be manually selected
-                AC_MSG_NOTICE([Using 'wepoll' I/O thread polling system])
-                AC_DEFINE(ZMQ_IOTHREAD_POLLER_USE_EPOLL, 1, [Use 'epoll' I/O thread polling system])
-                poller_found=1
-            ;;
-        esac
-        test $poller_found -eq 1 && break
-    done
-    if test $poller_found -eq 0; then
-        AC_MSG_ERROR([None of '$pollers' are valid pollers on this platform])
-    fi
-    if test "x$with_api_poller" = "x"; then
-        with_api_poller=auto
-    fi
-	if test "x$with_api_poller" = "xauto"; then
-		if test $poller = "select"; then
-			api_poller=select
-		elif test $poller = "wepoll"; then
-			api_poller=select
-		else		
-			api_poller=poll
-		fi
-	else
-		api_poller=$with_api_poller
-	fi
-	if test "$api_poller" = "select"; then
-		AC_MSG_NOTICE([Using 'select' zmq_poll(er)_* API polling system])
-		AC_DEFINE(ZMQ_POLL_BASED_ON_SELECT, 1, [Use 'select' zmq_poll(er)_* API polling system])
-	elif test "$api_poller" = "poll"; then
-		AC_MSG_NOTICE([Using 'poll' zmq_poll(er)_* API polling system])
-		AC_DEFINE(ZMQ_POLL_BASED_ON_POLL, 1, [Use 'poll' zmq_poll(er)_* API polling system])
-	else
-        AC_MSG_ERROR([Invalid API poller '$api_poller' specified])
-	fi
-}])
-
-dnl ################################################################################
-dnl # LIBZMQ_CHECK_PPOLL([action-if-found], [action-if-not-found])                 #
-dnl # Check whether zmq_ppoll can be activated, and do so if it can                #
-dnl ################################################################################
-
-AC_DEFUN([LIBZMQ_CHECK_PPOLL], [{
-    AC_REQUIRE([AC_CANONICAL_HOST])
-
-    case "${host_os}" in
-        *mingw*|*cygwin*|*msys*)
-            # Disable ppoll by default on Windows
-            AC_MSG_NOTICE([NOT building active zmq_ppoll on '$host_os']) ;;
-        *)
-            LIBZMQ_CHECK_PSELECT([
-                AC_MSG_NOTICE([Building with zmq_ppoll])
-                AC_DEFINE(ZMQ_HAVE_PPOLL, 1, [Build with zmq_ppoll])
-            ])
-        ;;
-    esac
-}])
-
-dnl ##############################################################################
-dnl # LIBZMQ_CHECK_CACHELINE                                                     #
-dnl # Check cacheline size for alignment purposes                                #
-dnl ##############################################################################
-AC_DEFUN([LIBZMQ_CHECK_CACHELINE], [{
-
-    zmq_cacheline_size=64
-    AC_CHECK_TOOL(libzmq_getconf, getconf)
-    if ! test "x$libzmq_getconf" = "x"; then
-        zmq_cacheline_size=$($libzmq_getconf LEVEL1_DCACHE_LINESIZE 2>/dev/null || echo 64)
-        if test "x$zmq_cacheline_size" = "x0" -o  "x$zmq_cacheline_size" = "x-1"; then
-            # getconf on some architectures does not know the size, try to fallback to
-            # the value the kernel knows on Linux
-            zmq_cacheline_size=$(cat /sys/devices/system/cpu/cpu0/cache/index0/coherency_line_size 2>/dev/null || echo 64)
-        fi
-    fi
-    if test "x$zmq_cacheline_size" = "xundefined"; then
-        # On some platforms e.g. Fedora33 s390x the cacheline size reported
-        # by getconf as 'undefined'.
-        zmq_cacheline_size=64
-    fi
-	AC_MSG_NOTICE([Using "$zmq_cacheline_size" bytes alignment for lock-free data structures])
-	AC_DEFINE_UNQUOTED(ZMQ_CACHELINE_SIZE, $zmq_cacheline_size, [Using "$zmq_cacheline_size" bytes alignment for lock-free data structures])
-}])
-
-dnl ################################################################################
-dnl # LIBZMQ_CHECK_CV_IMPL([action-if-found], [action-if-not-found])               #
-dnl # Choose condition variable implementation                                     #
-dnl ################################################################################
-
-AC_DEFUN([LIBZMQ_CHECK_CV_IMPL], [{
-    # Allow user to override condition variable autodetection
-    AC_ARG_WITH([cv-impl],
-        [AS_HELP_STRING([--with-cv-impl],
-        [choose condition variable implementation manually. Valid values are 'stl11', 'pthread', 'none', or 'auto'. [default=auto]])])
-
-    if test "x$with_cv_impl" = "x"; then
-        cv_impl=auto
-    else
-        cv_impl=$with_cv_impl
-    fi
-    case $host_os in
-      vxworks*)
-        cv_impl="vxworks"
-        AC_DEFINE(ZMQ_USE_CV_IMPL_VXWORKS, 1, [Use vxworks condition variable implementation.])
-      ;;
-    esac
-    if test "$cv_impl" = "auto" || test "$cv_impl" = "stl11"; then
-        AC_LANG_PUSH([C++])
-        AC_CHECK_HEADERS(condition_variable, [stl11="yes"
-            AC_DEFINE(ZMQ_USE_CV_IMPL_STL11, 1, [Use stl11 condition variable implementation.])],
-            [stl11="no"])
-        AC_LANG_POP([C++])
-        if test "$cv_impl" = "stl11" && test "x$stl11" = "xno"; then
-            AC_MSG_ERROR([--with-cv-impl set to stl11 but cannot find condition_variable])
-        fi
-    fi
-    if test "$cv_impl" = "pthread" || test "x$stl11" = "xno"; then
-        AC_DEFINE(ZMQ_USE_CV_IMPL_PTHREADS, 1, [Use pthread condition variable implementation.])
-    fi
-    if test "$cv_impl" = "none"; then
-        AC_DEFINE(ZMQ_USE_CV_IMPL_NONE, 1, [Use no condition variable implementation.])
-    fi
-       AC_MSG_NOTICE([Using "$cv_impl" condition variable implementation.])
-}])
diff --git a/libs/libzmq/appveyor.yml b/libs/libzmq/appveyor.yml
deleted file mode 100644
index 446015a..0000000
--- a/libs/libzmq/appveyor.yml
+++ /dev/null
@@ -1,341 +0,0 @@
-version: build-{build}
-
-shallow_clone: true
-
-os: Visual Studio 2013
-
-environment:
-  CMAKE_GENERATOR: "Visual Studio 12 2013"
-  MSVCVERSION: "v120"
-  MSVCYEAR: "vs2013"
-  ENABLE_DRAFTS: ON
-  matrix:
-    - platform: x64
-      configuration: Release
-      WITH_LIBSODIUM: ON
-      ENABLE_CURVE: ON
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
-      CMAKE_GENERATOR: "Visual Studio 16 2019"
-      MSVCVERSION: "v142"
-      MSVCYEAR: "vs2019"
-      ARTIFACT_NAME: v142-x64
-    - platform: Win32
-      configuration: Release
-      WITH_LIBSODIUM: OFF # unavailable build files for VS2008
-      ENABLE_CURVE: ON
-      CMAKE_GENERATOR: "Visual Studio 9 2008"
-      MSVCVERSION: "v90"
-      MSVCYEAR: "vs2008"
-      ARTIFACT_NAME: v90
-    - platform: Win32
-      configuration: Release
-      WITH_LIBSODIUM: ON
-      ENABLE_CURVE: ON
-      CMAKE_GENERATOR: "Visual Studio 10 2010"
-      MSVCVERSION: "v100"
-      MSVCYEAR: "vs2010"
-      ARTIFACT_NAME: v100
-    - platform: Win32
-      configuration: Release
-      WITH_LIBSODIUM: ON
-      ENABLE_CURVE: ON
-      ARTIFACT_NAME: v120
-    - platform: x64
-      configuration: Release
-      WITH_LIBSODIUM: ON
-      ENABLE_CURVE: ON
-      ARTIFACT_NAME: v120-x64
-    - platform: Win32
-      configuration: Release
-      POLLER: epoll
-      API_POLLER: poll
-      WITH_LIBSODIUM: ON
-      ENABLE_CURVE: ON
-      TEST_OPTIONS: '-E "(test_many_sockets)"'
-      ARTIFACT_NAME: v120-epoll
-    - platform: Win32
-      configuration: Debug
-      WITH_LIBSODIUM: ON
-      ENABLE_CURVE: ON
-      TEST_OPTIONS: '-E "(test_many_sockets)"'
-      ARTIFACT_NAME: v120-gd
-    - platform: x64
-      configuration: Debug
-      WITH_LIBSODIUM: ON
-      ENABLE_CURVE: ON
-      TEST_OPTIONS: '-E "(test_many_sockets)"'
-      ARTIFACT_NAME: v120-gd-x64
-    - platform: Win32
-      configuration: Release
-      WITH_LIBSODIUM: OFF
-      ENABLE_CURVE: OFF
-      ENABLE_DRAFTS: OFF
-      ARTIFACT_NAME: v120-nocurve
-    - platform: Win32
-      configuration: Release
-      WITH_LIBSODIUM: ON
-      ENABLE_CURVE: ON
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-      CMAKE_GENERATOR: "Visual Studio 14 2015"
-      MSVCVERSION: "v140"
-      MSVCYEAR: "vs2015"
-      ARTIFACT_NAME: v140
-    - platform: x64
-      configuration: Release
-      WITH_LIBSODIUM: ON
-      ENABLE_CURVE: ON
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-      CMAKE_GENERATOR: "Visual Studio 14 2015"
-      MSVCVERSION: "v140"
-      MSVCYEAR: "vs2015"
-      ARTIFACT_NAME: v140-x64
-    - platform: Win32
-      configuration: Release
-      WITH_LIBSODIUM: ON
-      ENABLE_CURVE: ON
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-      CMAKE_GENERATOR: "Visual Studio 15 2017"
-      MSVCVERSION: "v141"
-      MSVCYEAR: "vs2017"
-      TEST_OPTIONS: '-E "(test_many_sockets)"'
-      ARTIFACT_NAME: v141
-    - platform: x64
-      configuration: Release
-      WITH_LIBSODIUM: ON
-      ENABLE_CURVE: ON
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-      CMAKE_GENERATOR: "Visual Studio 15 2017"
-      MSVCVERSION: "v141"
-      MSVCYEAR: "vs2017"
-      TEST_OPTIONS: '-E "(test_many_sockets)"'
-      ARTIFACT_NAME: v141-x64
-    - platform: cygwin64
-      WITH_LIBSODIUM: OFF
-      ENABLE_CURVE: ON
-      CMAKE_GENERATOR: "Unix Makefiles"
-      ARTIFACT_NAME: cygwin64
-    - platform: mingw64
-      WITH_LIBSODIUM: OFF
-      ENABLE_CURVE: ON
-      CMAKE_GENERATOR: "MSYS Makefiles"
-      ARTIFACT_NAME: mingw64
-    - platform: Win32-uwp
-      configuration: Debug
-      WITH_LIBSODIUM: OFF
-      ENABLE_CURVE: OFF
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-      CMAKE_GENERATOR: "Visual Studio 15 2017"
-      MSVCVERSION: "v141"
-      MSVCYEAR: "vs2017"
-      ARTIFACT_NAME: v141-gd-uwp
-      CMAKE_SYSTEM_NAME: WindowsStore
-      CMAKE_SYSTEM_VERSION: 10.0.18362
-      EXTRA_FLAGS: -DCMAKE_SYSTEM_NAME=%CMAKE_SYSTEM_NAME% -DCMAKE_SYSTEM_VERSION=%CMAKE_SYSTEM_VERSION% -DBUILD_TESTS=OFF
-    - platform: Win32-uwp
-      configuration: Release
-      WITH_LIBSODIUM: OFF
-      ENABLE_CURVE: OFF
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-      CMAKE_GENERATOR: "Visual Studio 15 2017"
-      MSVCVERSION: "v141"
-      MSVCYEAR: "vs2017"
-      ARTIFACT_NAME: v141-uwp
-      CMAKE_SYSTEM_NAME: WindowsStore
-      CMAKE_SYSTEM_VERSION: 10.0.18362
-      EXTRA_FLAGS: -DCMAKE_SYSTEM_NAME=%CMAKE_SYSTEM_NAME% -DCMAKE_SYSTEM_VERSION=%CMAKE_SYSTEM_VERSION% -DBUILD_TESTS=OFF
-
-matrix:
-  fast_finish: false
-  allow_failures:
-    - platform: cygwin64 # TODO allow failures until tests are fixed
-    - platform: mingw64  # TODO allow failures until tests are fixed
-
-init:
-  - cmd: if "%NO_PR%"=="TRUE" (
-            if "%APPVEYOR_PULL_REQUEST_NUMBER%" NEQ "" (
-                echo "Build is disabled for PRs, aborting" &&
-                appveyor exit
-            )
-         )
-  #- ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
-  - cmake --version
-  - msbuild /version
-  - cmd: reg add "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Terminal Server\WinStations\RDP-Tcp" /v UserAuthentication /t REG_DWORD /d 0 /f
-
-cache:
-    - C:\projects\libsodium
-    - C:\cygwin64\var\cache\setup
-
-install:
-  - cmd: if "%Platform%"=="cygwin64" C:\cygwin64\setup-x86_64.exe --quiet-mode --no-shortcuts --upgrade-also --packages cmake,cygwin-devel,gcc-g++,libncurses-devel,make,pkg-config
-  - cmd: if "%Platform%"=="cygwin64" set PATH=C:\cygwin64\bin;%PATH%
-  - cmd: if "%Platform%"=="mingw64" C:\msys64\usr\bin\bash -lc "pacman -Qg"
-  - cmd: if "%Platform%"=="mingw64" set PATH=C:\msys64\usr\bin;%PATH%
-  - cmd: if "%Platform%"=="x64" (if not "%MSVCVERSION%"=="v142" set "CMAKE_GENERATOR=%CMAKE_GENERATOR% Win64")
-  - cmd: echo "Generator='%CMAKE_GENERATOR%'"
-  - cmd: echo "Platform='%Platform%'"
-  - cmd: if "%WITH_LIBSODIUM%"=="ON" set LIBSODIUMDIR=C:\projects\libsodium
-  - cmd: if "%WITH_LIBSODIUM%"=="ON" (
-                git config --global user.email "test@appveyor.com" &&
-                git config --global user.name "appveyor"
-         )
-  - cmd: if "%WITH_LIBSODIUM%"=="ON" (
-            if not exist "%LIBSODIUMDIR%" (
-                git clone --branch stable --depth 1 --quiet "https://github.com/jedisct1/libsodium.git" %LIBSODIUMDIR%
-            ) else (
-                git -C "%LIBSODIUMDIR%" fetch --all && git -C "%LIBSODIUMDIR%" reset --hard origin/stable
-            )
-         )
-  - cmd: if "%WITH_LIBSODIUM%"=="ON" msbuild /v:minimal /maxcpucount:%NUMBER_OF_PROCESSORS% /p:Configuration=%Configuration%DLL %LIBSODIUMDIR%\builds\msvc\%MSVCYEAR%\libsodium\libsodium.vcxproj
-  - cmd: if "%WITH_LIBSODIUM%"=="ON" set SODIUM_LIBRARY_DIR="%LIBSODIUMDIR%\bin\%Platform%\%Configuration%\%MSVCVERSION%\dynamic"
-  - cmd: if "%WITH_LIBSODIUM%"=="ON" set SODIUM_INCLUDE_DIR="%LIBSODIUMDIR%\src\libsodium\include"
-  - ps: if (${env:WITH_LIBSODIUM} -eq "ON") { Copy-Item "C:\projects\libsodium\bin\${env:Platform}\${env:Configuration}\${env:MSVCVERSION}\dynamic\libsodium.lib" -Destination "C:\projects\libsodium\bin\${env:Platform}\${env:Configuration}\${env:MSVCVERSION}\dynamic\sodium.lib" }
-
-clone_folder: C:\projects\libzmq
-
-before_build:
-  - cmd: set LIBZMQ_SRCDIR=%cd%
-  - cmd: set LIBZMQ_BUILDDIR=C:\projects\build_libzmq
-  # TODO this does not work with sonarcloud.io, as it misses the sonar-cxx plugin
-  # - cmd: curl -L https://sonarsource.bintray.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-3.1.0.1141-windows.zip -o sonar-scanner-cli-3.1.0.1141-windows.zip
-  # - cmd: unzip sonar-scanner-cli-3.1.0.1141-windows.zip
-  # - cmd: set BUILDLOG="%LIBZMQ_SRCDIR%\build.log"
-  - cmd: md "%LIBZMQ_BUILDDIR%"
-  - cd "%LIBZMQ_BUILDDIR%"
-  - cmd: if "%PLATFORM%" == "cygwin64" set APPVEYOR_BUILD_FOLDER=/cygdrive/C/projects/libzmq
-  - cmd: if "%ENABLE_ANALYSIS%"=="ON" ( set LIBZMQ_WERROR="OFF" ) else ( set LIBZMQ_WERROR="ON" )
-  - cmd: cmake -D CMAKE_INCLUDE_PATH="%SODIUM_INCLUDE_DIR%" -D CMAKE_LIBRARY_PATH="%SODIUM_LIBRARY_DIR%" -D WITH_LIBSODIUM="%WITH_LIBSODIUM%" -D ENABLE_DRAFTS="%ENABLE_DRAFTS%" -D ENABLE_ANALYSIS="%ENABLE_ANALYSIS%" -D ENABLE_CURVE="%ENABLE_CURVE%" -D API_POLLER="%API_POLLER%" -D POLLER="%POLLER%" %EXTRA_FLAGS% -D WITH_LIBSODIUM="%WITH_LIBSODIUM%" -D LIBZMQ_WERROR="%LIBZMQ_WERROR%" -G "%CMAKE_GENERATOR%" "%APPVEYOR_BUILD_FOLDER%"
-  - cmd: cd "%LIBZMQ_SRCDIR%"
-  - ps: $env:ZMQ_VERSION_MAJOR = (Select-String -Path .\include\zmq.h -Pattern ".*#define ZMQ_VERSION_MAJOR ([0-9]+).*").Matches.Groups[1].Value
-  - ps: $env:ZMQ_VERSION_MINOR = (Select-String -Path .\include\zmq.h -Pattern ".*#define ZMQ_VERSION_MINOR ([0-9]+).*").Matches.Groups[1].Value
-  - ps: $env:ZMQ_VERSION_PATCH = (Select-String -Path .\include\zmq.h -Pattern ".*#define ZMQ_VERSION_PATCH ([0-9]+).*").Matches.Groups[1].Value
-  - ps: $env:ZMQ_VERSION = "${env:ZMQ_VERSION_MAJOR}.${env:ZMQ_VERSION_MINOR}.${env:ZMQ_VERSION_PATCH}"
-  - cmd: echo "ZMQ_VERSION is %ZMQ_VERSION%"
-
-build_script:
-  - cmd: set verbosity=Minimal
-  - cmd: if "%MSVCYEAR%"=="vs2008" set verbosity=Normal
-  - cmd: if "%MSVCYEAR%"=="vs2008" set path=C:\Windows\Microsoft.NET\Framework\v3.5;%path% 
-  - cmd: cd "%LIBZMQ_BUILDDIR%"
-  - cmd: if "%PLATFORM:~0,5%" == "Win32" (
-            if "%MSVCYEAR%"=="vs2008" (
-                cmake --build %LIBZMQ_BUILDDIR% --config %configuration% --target install
-            ) else (
-                cmake --build %LIBZMQ_BUILDDIR% --config %configuration% --target install -- -verbosity:Minimal -maxcpucount -logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
-            )
-         )
-  - cmd: if "%PLATFORM%" == "x64" (
-            cmake --build %LIBZMQ_BUILDDIR% --config %configuration% --target install -- -verbosity:Minimal -maxcpucount -logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
-         )
-  - cmd: if "%PLATFORM%" == "cygwin64" (
-            cmake --build . -- -j5
-         )
-  - cmd: if "%PLATFORM%" == "mingw64" (
-            cmake --build . -- -j5
-         )
-
-# TODO this does not work with sonarcloud.io, as it misses the sonar-cxx plugin
-# build_script:
-  # - cmd: msbuild %LIBZMQ_BUILDDIR%\ZeroMQ.sln /verbosity:detailed >%BUILDLOG%
-
-after_build:
-  # TODO this does not work with sonarcloud.io, as it misses the sonar-cxx plugin
-  # - cmd: cd "%LIBZMQ_SRCDIR%"
-  # - cmd: dir
-  # - cmd: sonar-scanner-3.1.0.1141-windows\bin\sonar-scanner 
-            # -Dsonar.scm.provider=git 
-            # -Dsonar.projectKey=libzmq-msvc 
-            # -Dsonar.organization=sigiesec-github 
-            # -Dsonar.sources=include,src,tests,unittests 
-            # -Dsonar.host.url=https://sonarcloud.io 
-            # -Dsonar.login=%SONARQUBE_TOKEN% 
-            # -Dsonar.cxx.compiler.parser="Visual C++" 
-            # -Dsonar.cxx.compiler.reportPath=build.log 
-            # -Dsonar.cxx.compiler.charset=UTF-8 
-            # -Dsonar.cxx.compiler.regex=^(?<filename>.*)\\((?<line>[0-9]+)\\):\\x20warning\\x20(?<id>C\\d\\d\\d\\d):(?<message>.*)$
-# TODO this should be done differently, using the INSTALL cmake target, the current handling depends on the details of the CMakeLists.txt
-  - cmd: cd %LIBZMQ_BUILDDIR%\bin\%Configuration%"
-  - cmd: if "%WITH_LIBSODIUM%"=="ON" copy "%SODIUM_LIBRARY_DIR%\libsodium.dll" .
-  - cmd: copy "%LIBZMQ_SRCDIR%\include\zmq.h" .
-  - cmd: copy ..\..\lib\%Configuration%\libzmq*.lib . & exit 0
-  - cmd: 7z a -y -bd -mx=9 libzmq.zip *.exe *.dll *.pdb *.h *.lib
-  - ps: Push-AppveyorArtifact "libzmq.zip" -Filename "libzmq-${env:ARTIFACT_NAME}-${env:ZMQ_VERSION_MAJOR}_${env:ZMQ_VERSION_MINOR}_${env:ZMQ_VERSION_PATCH}.zip"
-
-test_script:
-  - cmd: cd "%LIBZMQ_BUILDDIR%"
-# TODO run tests in parallel only on selected platforms, since they fail on others, see https://github.com/zeromq/libzmq/issues/3123
-  - cmd: if "%CMAKE_GENERATOR%"=="Visual Studio 12 2013" set PARALLELIZE=ON
-  - cmd: if "%CMAKE_GENERATOR%"=="Visual Studio 14 2015" set PARALLELIZE=ON
-  - cmd: if "%CMAKE_GENERATOR%"=="Visual Studio 12 2013 Win64" set PARALLELIZE=ON
-  - cmd: if "%CMAKE_GENERATOR%"=="Visual Studio 14 2015 Win64" set PARALLELIZE=ON
-  - cmd: if not defined TEST_OPTIONS set "TEST_OPTIONS= "
-  - cmd: if "%PARALLELIZE%"=="ON" (
-            echo "Running tests in parallel" &&
-            set TEST_OPTIONS=%TEST_OPTIONS% -j5
-         )
-  - cmd: if "%APPVEYOR_REPO_TAG%"=="false" (ctest -C "%Configuration%" -V %TEST_OPTIONS%)
-
-deploy:
-  - provider: GitHub
-    tag: $(APPVEYOR_REPO_TAG_NAME)
-    release: libzmq $(APPVEYOR_REPO_TAG_NAME)
-    description: |
-        Windows binaries for libzmq $(APPVEYOR_REPO_TAG_NAME), uploaded from appveyor.
-        Edit after appveyor is done uploading.
-    auth_token:
-      secure: vmAeVtN2qiQgFBCB2I5FDDRtADQ7GUdR9NwAJJyakbiV5OHzLHExDcC/D9Oh5r67
-    draft: true
-    prerelease: false
-    force_update: true # adds files, clobbers release name and description
-
-
-# the analysis build is repeated; apparently appveyor only uses the first section that matches some branch
-for:
--
-    branches:
-        only:
-            - master
-    environment:
-        matrix:
-            - platform: Win32
-              configuration: Release
-              API_POLLER: poll
-              WITH_LIBSODIUM: ON
-              ENABLE_CURVE: ON
-              NO_PR: TRUE
-            - platform: x64
-              configuration: Release
-              WITH_LIBSODIUM: ON
-              ENABLE_CURVE: ON
-              NO_PR: TRUE
-            - platform: Win32
-              configuration: Release
-              WITH_LIBSODIUM: ON
-              ENABLE_CURVE: ON
-              NO_PR: TRUE
-            - platform: Win32
-              configuration: Release
-              WITH_LIBSODIUM: ON
-              ENABLE_CURVE: ON
-              ENABLE_ANALYSIS: ON
-              APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-              CMAKE_GENERATOR: "Visual Studio 15 2017"
-              MSVCVERSION: "v141"
-              MSVCYEAR: "vs2017"
-              NO_PR: TRUE
--
-    branches:
-        only:
-            - /.*analyze$/
-    environment:
-        matrix:
-            - platform: Win32
-              configuration: Release
-              WITH_LIBSODIUM: ON
-              ENABLE_CURVE: ON
-              ENABLE_ANALYSIS: ON
-              APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-              CMAKE_GENERATOR: "Visual Studio 15 2017"
-              MSVCVERSION: "v141"
-              MSVCYEAR: "vs2017"
-              NO_PR: TRUE
diff --git a/libs/libzmq/autogen.sh b/libs/libzmq/autogen.sh
deleted file mode 100755
index 5da53be..0000000
--- a/libs/libzmq/autogen.sh
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/sh
-
-#    Copyright (c) 2007-2009 iMatix Corporation
-#    Copyright (c) 2007-2011 Other contributors as noted in the AUTHORS file
-#
-#   This file is part of 0MQ.
-#
-#   0MQ is free software; you can redistribute it and/or modify it under
-#   the terms of the GNU Lesser General Public License as published by
-#   the Free Software Foundation; either version 3 of the License, or
-#   (at your option) any later version.
-#
-#   0MQ is distributed in the hope that it will be useful,
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#   GNU Lesser General Public License for more details.
-#
-#   You should have received a copy of the GNU Lesser General Public License
-#   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Script to generate all required files from fresh git checkout.
-
-# Debian and Ubuntu do not ship libtool anymore, but OSX does not ship libtoolize.
-command -v libtoolize >/dev/null 2>&1
-if  [ $? -ne 0 ]; then
-    command -v libtool >/dev/null 2>&1
-    if  [ $? -ne 0 ]; then
-        echo "autogen.sh: error: could not find libtool.  libtool is required to run autogen.sh." 1>&2
-        exit 1
-    fi
-fi
-
-command -v autoreconf >/dev/null 2>&1
-if [ $? -ne 0 ]; then
-    echo "autogen.sh: error: could not find autoreconf.  autoconf and automake are required to run autogen.sh." 1>&2
-    exit 1
-fi
-
-mkdir -p ./config
-if [ $? -ne 0 ]; then
-    echo "autogen.sh: error: could not create directory: ./config." 1>&2
-    exit 1
-fi
-
-autoreconf --install --force --verbose -I config
-res=$?
-if [ "$res" -ne 0 ]; then
-    echo "autogen.sh: error: autoreconf exited with status $res" 1>&2
-    exit 1
-fi
diff --git a/libs/libzmq/branding.bmp b/libs/libzmq/branding.bmp
deleted file mode 100755
index cf0ee28..0000000
Binary files a/libs/libzmq/branding.bmp and /dev/null differ
diff --git a/libs/libzmq/builds/Makefile.am b/libs/libzmq/builds/Makefile.am
deleted file mode 100644
index e7fe5e0..0000000
--- a/libs/libzmq/builds/Makefile.am
+++ /dev/null
@@ -1,34 +0,0 @@
-#  Specify all build files that have to go into source packages.
-#  msvc directory does its own stuff.
-
-EXTRA_DIST = \
- 	cygwin/Makefile.cygwin \
-	zos/makelibzmq \
-	zos/cxxall \
-	zos/README.md \
-	zos/makeclean \
-	zos/platform.hpp \
-	zos/zc++ \
-	zos/test_fork.cpp \
-	zos/maketests \
-	zos/runtests \
-	cygwin/Makefile.cygwin \
-	mingw32/Makefile.mingw32 \
-	mingw32/platform.hpp \
-	cmake/ci_build.sh \
-	cmake/Modules \
-	cmake/NSIS.template32.in \
-	cmake/NSIS.template64.in \
-	cmake/ZeroMQConfig.cmake.in \
-	cmake/clang-format-check.sh.in \
-	cmake/platform.hpp.in \
-	valgrind/ci_build.sh \
-	valgrind/valgrind.supp \
-	valgrind/vg \
-	nuget/readme.nuget \
-	nuget/libzmq.autopkg \
-	android/Dockerfile \
-	android/README.md \
-	android/android_build_helper.sh \
-	android/ci_build.sh \
-	android/build.sh
diff --git a/libs/libzmq/builds/README b/libs/libzmq/builds/README
deleted file mode 100644
index 0cbe32e..0000000
--- a/libs/libzmq/builds/README
+++ /dev/null
@@ -1,14 +0,0 @@
-This directory holds build tools, i.e. tools we use to build the current
-code tree. Packaging tools (which take released tarballs or github code
-repos) should go into /packaging.
-
-Note: 'deprecated-msvc' contains deprecated prepared Visual Studio Solution 
-files for various Visual Studio versions. These are no longer maintained, 
-and may or may not work. Please use cmake instead to build with Visual
-Studio. Rationale: The solution and project files are hard to maintain,
-since there are different variants for each Visual Studio version.
-The tests have never been included there for this reason, so they were
-never usable for actual development of libzmq. If you encounter that 
-something that worked before does not work with CMake, please open as 
-issue at https://github.com/zeromq/libzmq/issues.
-
diff --git a/libs/libzmq/builds/abi-compliance-checker/ci_build.sh b/libs/libzmq/builds/abi-compliance-checker/ci_build.sh
deleted file mode 100755
index f969f46..0000000
--- a/libs/libzmq/builds/abi-compliance-checker/ci_build.sh
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/usr/bin/env bash
-
-set -x
-set -e
-
-cd ../../
-
-mkdir tmp
-BUILD_PREFIX=$PWD/tmp
-
-CONFIG_OPTS=()
-CONFIG_OPTS+=("CFLAGS=-I${BUILD_PREFIX}/include -g -Og")
-CONFIG_OPTS+=("CPPFLAGS=-I${BUILD_PREFIX}/include")
-CONFIG_OPTS+=("CXXFLAGS=-I${BUILD_PREFIX}/include -g -Og")
-CONFIG_OPTS+=("LDFLAGS=-L${BUILD_PREFIX}/lib")
-CONFIG_OPTS+=("PKG_CONFIG_PATH=${BUILD_PREFIX}/lib/pkgconfig")
-CONFIG_OPTS+=("--prefix=${BUILD_PREFIX}")
-CONFIG_OPTS+=("--enable-drafts=no")
-
-function print_abi_api_breakages() {
-   echo "ABI breakages detected:"
-   cat compat_reports/libzmq/${LATEST_VERSION}_to_HEAD/abi_affected.txt | c++filt
-   echo "API breakages detected:"
-   cat compat_reports/libzmq/${LATEST_VERSION}_to_HEAD/src_affected.txt | c++filt
-   exit 1
-}
-
-git fetch --unshallow
-git fetch --all --tags
-LATEST_VERSION=$(git describe --abbrev=0 --tags)
-
-./autogen.sh
-./configure "${CONFIG_OPTS[@]}"
-make VERBOSE=1 -j5
-abi-dumper src/.libs/libzmq.so -o ${BUILD_PREFIX}/libzmq.head.dump -lver HEAD
-
-git clone --depth 1 -b ${LATEST_VERSION} https://github.com/zeromq/libzmq.git latest_release
-cd latest_release
-./autogen.sh
-./configure "${CONFIG_OPTS[@]}"
-make VERBOSe=1 -j5
-abi-dumper src/.libs/libzmq.so -o ${BUILD_PREFIX}/libzmq.latest.dump -lver ${LATEST_VERSION}
-
-abi-compliance-checker -l libzmq -d1 ${BUILD_PREFIX}/libzmq.latest.dump -d2 ${BUILD_PREFIX}/libzmq.head.dump -list-affected || print_abi_api_breakages
diff --git a/libs/libzmq/builds/android/Dockerfile b/libs/libzmq/builds/android/Dockerfile
deleted file mode 100644
index 336bbca..0000000
--- a/libs/libzmq/builds/android/Dockerfile
+++ /dev/null
@@ -1,22 +0,0 @@
-FROM ubuntu:14.04
-MAINTAINER Benjamin Henrion <zoobab@gmail.com>
- 
-RUN DEBIAN_FRONTEND=noninteractive apt-get update -y -q
-RUN DEBIAN_FRONTEND=noninteractive apt-get install -y -q --force-yes tar git curl nano wget dialog net-tools build-essential vim emacs apt-utils file uuid-dev cmake asciidoc python autoconf automake libtool pkg-config xmlto sudo gettext apt-utils
-
-RUN useradd -d /home/zmq -m -s /bin/bash zmq
-RUN echo "zmq ALL=(ALL) NOPASSWD:ALL" > /etc/sudoers.d/zmq
-RUN chmod 0440 /etc/sudoers.d/zmq
-
-USER zmq
-# install android-ndk
-RUN cd ~ && wget -q http://dl.google.com/android/ndk/android-ndk-r10e-linux-x86_64.bin -O android-ndk-r10e-linux-x86_64.bin && chmod +x android-ndk-r10e-linux-x86_64.bin
-RUN cd ~ && ./android-ndk-r10e-linux-x86_64.bin
-ENV ANDROID_NDK_ROOT /home/zmq/android-ndk-r10e
-ENV TOOLCHAIN_NAME arm-linux-androideabi-4.9
-ENV TOOLCHAIN_HOST arm-linux-androideabi
-ENV TOOLCHAIN_PATH ${ANDROID_NDK_ROOT}/toolchains/${TOOLCHAIN_NAME}/prebuilt/linux-x86_64/bin
-ENV TOOLCHAIN_ARCH arm
-# build libzmq for android
-RUN cd ~ && git clone --depth 1 https://github.com/zeromq/libzmq.git
-RUN cd ~/libzmq/builds/android && ./build.sh
diff --git a/libs/libzmq/builds/android/README.md b/libs/libzmq/builds/android/README.md
deleted file mode 100644
index 0acf228..0000000
--- a/libs/libzmq/builds/android/README.md
+++ /dev/null
@@ -1,33 +0,0 @@
-# Android Build
-
-## Prerequisites
-
-You need the Android Native Development Kit (NDK) installed. See
-[here](https://developer.android.com/ndk) to download it.
-
-This project is tested against Android NDK version r25.
-
-If you installed version r25 all you have to do is to expose the NDK root
-directory as environment variable, e.g:
-
-    export ANDROID_NDK_ROOT=$HOME/android-ndk-r25
-
-If you installed another version you have to expose the NDK root directory as
-well as the NDK version, e.g:
-
-    export ANDROID_NDK_ROOT=$HOME/android-ndk-r17c
-    export NDK_VERSION=android-ndk-r17c
-
-To specify the minimum sdk version set the environment variable below:
-
-    export MIN_SDK_VERSION=21   # Default value if unset
-
-To specify the prefix directory set the environment variable below:
-
-    export ANDROID_BUILD_DIR=./builds/android/prefix/<android_arch> # Default value if unset
-
-## Build
-
-In the android directory, run:
-
-    ./build.sh [ arm | arm64 | x86 | x86_64 ]
diff --git a/libs/libzmq/builds/android/android_build_helper.sh b/libs/libzmq/builds/android/android_build_helper.sh
deleted file mode 100644
index 64446ff..0000000
--- a/libs/libzmq/builds/android/android_build_helper.sh
+++ /dev/null
@@ -1,468 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2014, Joe Eli McIlvain
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice,
-#    this list of conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright notice,
-#    this list of conditions and the following disclaimer in the documentation
-#    and/or other materials provided with the distribution.
-#
-# 3. Neither the name of the copyright holder nor the names of its
-#    contributors may be used to endorse or promote products derived from
-#    this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-# THE POSSIBILITY OF SUCH DAMAGE.
-#
-###
-#
-# https://github.com/jemc/android_build_helper
-#   android_build_helper.sh
-#
-# The following is a helper script for setting up android builds for
-# "native" libraries maintained with an autotools build system.
-# It merely helps to create the proper cross-compile environment.
-# It makes no attempt to wrap the library or make it accessible to Java code;
-# the intention is to make the bare library available to other "native" code.
-#
-# To get the latest version of this script, please download from:
-#   https://github.com/jemc/android_build_helper
-#
-# You are free to modify this script, but if you add improvements,
-# please consider submitting a pull request to the aforementioned upstream
-# repository for the benefit of other users.
-#
-
-########################################################################
-# Initialization
-########################################################################
-# Get directory of current script (if not already set)
-# This directory is also the basis for the build directories the get created.
-if [ -z "$ANDROID_BUILD_DIR" ]; then
-    ANDROID_BUILD_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-fi
-
-# Set up a variable to hold the global failure reasons, separated by newlines
-# (Empty string indicates no failure)
-ANDROID_BUILD_FAIL=()
-
-
-########################################################################
-# Sanity checks
-########################################################################
-if [ -z "${NDK_VERSION}" ] ; then
-    echo "NDK_VERSION not set !"
-    exit 1
-fi
-case "${NDK_VERSION}" in
-    "android-ndk-r"[0-9][0-9] ) : ;;
-    "android-ndk-r"[0-9][0-9][a-z] ) : ;;
-    * ) echo "Invalid format for NDK_VERSION ('${NDK_VERSION}')" ; exit 1 ;;
-esac
-
-if [ -z "${ANDROID_NDK_ROOT}" ] ; then
-    echo "ANDROID_NDK_ROOT not set !"
-    exit 1
-fi
-
-########################################################################
-# Compute NDK version into a numeric form:
-#   android-ndk-r21e -> 2105
-#   android-ndk-r25  -> 2500
-########################################################################    
-export NDK_NUMBER="$(( $(echo "${NDK_VERSION}"|sed -e 's|android-ndk-r||g' -e 's|[a-z]||g') * 100 ))"
-NDK_VERSION_LETTER="$(echo "${NDK_VERSION}"|sed -e 's|android-ndk-r[0-9][0-9]||g'|tr '[:lower:]' '[:upper:]')"
-if [ -n "${NDK_VERSION_LETTER}" ] ; then
-    NDK_NUMBER=$(( $(( NDK_NUMBER + $(printf '%d' \'"${NDK_VERSION_LETTER}") )) - 64 ))
-fi
-echo "LIBZMQ - Configured NDK_VERSION: ${NDK_VERSION} ($NDK_NUMBER)."
-
-function android_build_check_fail {
-    if [ ! ${#ANDROID_BUILD_FAIL[@]} -eq 0 ]; then
-        echo "Android (${TOOLCHAIN_ARCH}) build failed for the following reasons:"
-        for reason in "${ANDROID_BUILD_FAIL[@]}"; do
-            local formatted_reason="  ${reason}"
-            echo "${formatted_reason}"
-        done
-        exit 1
-    fi
-}
-
-function android_download_ndk {
-    if [ -d "${ANDROID_NDK_ROOT}" ] ; then
-        # NDK folder detected, let's assume it's valid ...
-        echo "LIBZMQ (${BUILD_ARCH}) - Using existing NDK folder '${ANDROID_NDK_ROOT}'."
-        return
-    fi
-    if [ ! -d  "$(dirname "${ANDROID_NDK_ROOT}")" ] ; then
-        ANDROID_BUILD_FAIL+=("Cannot download NDK in a non existing folder")
-        ANDROID_BUILD_FAIL+=("  $(dirname "${ANDROID_NDK_ROOT}/")")
-    fi
-
-    if [ -z "${ANDROID_NDK_FILENAME}" ] ; then
-        ANDROID_BUILD_FAIL+=("Please set the ANDROID_NDK_FILENAME environment variable")
-    fi
-
-    android_build_check_fail
-
-    echo "LIBZMQ (${BUILD_ARCH}) - Downloading NDK '${NDK_VERSION}'..."
-    (
-        cd "$(dirname "${ANDROID_NDK_ROOT}")" \
-        && rm -f "${ANDROID_NDK_FILENAME}" \
-        && wget -q "http://dl.google.com/android/repository/${ANDROID_NDK_FILENAME}" -O "${ANDROID_NDK_FILENAME}" \
-        && echo "LIBZMQ (${BUILD_ARCH}) - Extracting NDK '${ANDROID_NDK_FILENAME}'..." \
-        && unzip -q "${ANDROID_NDK_FILENAME}" \
-        && echo "LIBZMQ (${BUILD_ARCH}) - NDK extracted under '${ANDROID_NDK_ROOT}'."
-    ) || {
-        ANDROID_BUILD_FAIL+=("Failed to install NDK ('${NDK_VERSION}')")
-        ANDROID_BUILD_FAIL+=("  ${ANDROID_NDK_FILENAME}")
-    }
-
-    android_build_check_fail
-}
-
-function android_build_set_env {
-    BUILD_ARCH=$1
-
-    platform="$(uname | tr '[:upper:]' '[:lower:]')"
-    case "${platform}" in
-        linux*)
-            if [ $NDK_NUMBER -ge 2300 ] ; then
-                # Since NDK 23, NDK archives are renamed.
-                export ANDROID_NDK_FILENAME=${NDK_VERSION}-linux.zip
-            else
-                export ANDROID_NDK_FILENAME=${NDK_VERSION}-linux-x86_64.zip
-            fi
-            export ANDROID_BUILD_PLATFORM=linux-x86_64
-            ;;
-        darwin*)
-            if [ $NDK_NUMBER -ge 2300 ] ; then
-                # Since NDK 23, NDK archives are renamed.
-                export ANDROID_NDK_FILENAME=${NDK_VERSION}-darwin.zip
-            else
-                export ANDROID_NDK_FILENAME=${NDK_VERSION}-darwin-x86_64.zip
-            fi
-            export ANDROID_BUILD_PLATFORM=darwin-x86_64
-            ;;
-        *)    echo "LIBZMQ (${BUILD_ARCH}) - Unsupported platform ('${platform}')" ; exit 1 ;;
-    esac
-
-    export TOOLCHAIN_PATH="${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${ANDROID_BUILD_PLATFORM}/bin"
-
-    # Set variables for each architecture
-    if [ "${BUILD_ARCH}" == "arm" ]; then
-        export TOOLCHAIN_HOST="arm-linux-androideabi"
-        export TOOLCHAIN_COMP="armv7a-linux-androideabi${MIN_SDK_VERSION}"
-        export TOOLCHAIN_ABI="armeabi-v7a"
-        export TOOLCHAIN_ARCH="arm"
-    elif [ "${BUILD_ARCH}" == "x86" ]; then
-        export TOOLCHAIN_HOST="i686-linux-android"
-        export TOOLCHAIN_COMP="i686-linux-android${MIN_SDK_VERSION}"
-        export TOOLCHAIN_ABI="x86"
-        export TOOLCHAIN_ARCH="x86"
-    elif [ "${BUILD_ARCH}" == "arm64" ]; then
-        export TOOLCHAIN_HOST="aarch64-linux-android"
-        export TOOLCHAIN_COMP="aarch64-linux-android${MIN_SDK_VERSION}"
-        export TOOLCHAIN_ABI="arm64-v8a"
-        export TOOLCHAIN_ARCH="arm64"
-    elif [ "${BUILD_ARCH}" == "x86_64" ]; then
-        export TOOLCHAIN_HOST="x86_64-linux-android"
-        export TOOLCHAIN_COMP="x86_64-linux-android${MIN_SDK_VERSION}"
-        export TOOLCHAIN_ABI="x86_64"
-        export TOOLCHAIN_ARCH="x86_64"
-    fi
-
-    # Since NDK r22 the "platforms" dir got removed
-    if [ -d "${ANDROID_NDK_ROOT}/platforms" ]; then
-       export ANDROID_BUILD_SYSROOT="${ANDROID_NDK_ROOT}/platforms/android-${MIN_SDK_VERSION}/arch-${TOOLCHAIN_ARCH}"
-    else
-       export ANDROID_BUILD_SYSROOT="${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${ANDROID_BUILD_PLATFORM}/sysroot"
-    fi
-    export ANDROID_BUILD_PREFIX="${ANDROID_BUILD_DIR}/prefix/${TOOLCHAIN_ARCH}"
-
-    # Since NDK r25, libc++_shared.so is no more in 'sources/cxx-stl/...'
-    export ANDROID_STL="libc++_shared.so"
-    if [ -x "${ANDROID_NDK_ROOT}/sources/cxx-stl/llvm-libc++/libs/${TOOLCHAIN_ABI}/${ANDROID_STL}" ] ; then
-        export ANDROID_STL_ROOT="${ANDROID_NDK_ROOT}/sources/cxx-stl/llvm-libc++/libs/${TOOLCHAIN_ABI}"
-    else 
-        export ANDROID_STL_ROOT="${ANDROID_BUILD_SYSROOT}/usr/lib/${TOOLCHAIN_HOST}"
-
-        # NDK 25 requires -L<path-to-libc.so> ... 
-        # I don't understand why, but without it, ./configure fails to build a valid 'conftest'.
-        export ANDROID_LIBC_ROOT="${ANDROID_BUILD_SYSROOT}/usr/lib/${TOOLCHAIN_HOST}/${MIN_SDK_VERSION}"
-    fi
-}
-
-function android_build_env {
-    ##
-    # Check that necessary environment variables are set
-
-    if [ -z "$ANDROID_NDK_ROOT" ]; then
-        ANDROID_BUILD_FAIL+=("Please set the ANDROID_NDK_ROOT environment variable")
-        ANDROID_BUILD_FAIL+=("  (eg. \"/home/user/android/android-ndk-r25\")")
-    fi
-
-    if [ -z "$TOOLCHAIN_PATH" ]; then
-        ANDROID_BUILD_FAIL+=("Please set the TOOLCHAIN_PATH environment variable")
-        ANDROID_BUILD_FAIL+=("  (eg. \"/home/user/android/android-ndk-r25/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/bin\")")
-    fi
-
-    if [ -z "$TOOLCHAIN_HOST" ]; then
-        ANDROID_BUILD_FAIL+=("Please set the TOOLCHAIN_HOST environment variable")
-        ANDROID_BUILD_FAIL+=("  (eg. \"arm-linux-androideabi\")")
-    fi
-
-    if [ -z "$TOOLCHAIN_COMP" ]; then
-        ANDROID_BUILD_FAIL+=("Please set the TOOLCHAIN_COMP environment variable")
-        ANDROID_BUILD_FAIL+=("  (eg. \"armv7a-linux-androideabi\")")
-    fi
-
-    if [ -z "$TOOLCHAIN_ABI" ]; then
-        ANDROID_BUILD_FAIL+=("Please set the TOOLCHAIN_ABI environment variable")
-        ANDROID_BUILD_FAIL+=("  (eg. \"armeabi-v7a\")")
-    fi
-
-    if [ -z "$TOOLCHAIN_ARCH" ]; then
-        ANDROID_BUILD_FAIL+=("Please set the TOOLCHAIN_ARCH environment variable")
-        ANDROID_BUILD_FAIL+=("  (eg. \"arm\")")
-    fi
-
-    android_build_check_fail
-
-    ##
-    # Check that directories given by environment variables exist
-
-    if [ ! -d "$ANDROID_NDK_ROOT" ]; then
-        ANDROID_BUILD_FAIL+=("The ANDROID_NDK_ROOT directory does not exist")
-        ANDROID_BUILD_FAIL+=("  ${ANDROID_NDK_ROOT}")
-    fi
-
-    if [ ! -d "$ANDROID_STL_ROOT" ]; then
-        ANDROID_BUILD_FAIL+=("The ANDROID_STL_ROOT directory does not exist")
-        ANDROID_BUILD_FAIL+=("  ${ANDROID_STL_ROOT}")
-    fi
-
-    if [ -n "${ANDROID_LIBC_ROOT}" ] && [ ! -d "${ANDROID_LIBC_ROOT}" ]; then
-        ANDROID_BUILD_FAIL+=("The ANDROID_LIBC_ROOT directory does not exist")
-        ANDROID_BUILD_FAIL+=("  ${ANDROID_LIBC_ROOT}")
-    fi
-
-    if [ ! -d "$TOOLCHAIN_PATH" ]; then
-        ANDROID_BUILD_FAIL+=("The TOOLCHAIN_PATH directory does not exist")
-        ANDROID_BUILD_FAIL+=("  ${TOOLCHAIN_PATH}")
-    fi
-
-    ##
-    # Set up some local variables and check them
-
-    if [ ! -d "$ANDROID_BUILD_SYSROOT" ]; then
-        ANDROID_BUILD_FAIL+=("The ANDROID_BUILD_SYSROOT directory does not exist")
-        ANDROID_BUILD_FAIL+=("  ${ANDROID_BUILD_SYSROOT}")
-    fi
-
-    mkdir -p "$ANDROID_BUILD_PREFIX" || {
-        ANDROID_BUILD_FAIL+=("Failed to make ANDROID_BUILD_PREFIX directory")
-        ANDROID_BUILD_FAIL+=("  ${ANDROID_BUILD_PREFIX}")
-    }
-
-    android_build_check_fail
-}
-
-function _android_build_opts_process_binaries {
-    local TOOLCHAIN="${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/${ANDROID_BUILD_PLATFORM}"
-    local CC="${TOOLCHAIN_PATH}/${TOOLCHAIN_COMP}-clang"
-    local CXX="${TOOLCHAIN_PATH}/${TOOLCHAIN_COMP}-clang++"
-    # Since NDK r22 the "platforms" dir got removed and the default linker is LLD
-    if [ -d "${ANDROID_NDK_ROOT}/platforms" ]; then
-       local LD="${TOOLCHAIN_PATH}/${TOOLCHAIN_HOST}-ld"
-    else
-       local LD="${TOOLCHAIN_PATH}/ld"
-    fi
-    # Since NDK r24 this binary was removed due to LLVM being now the default
-    if [ ! -x "${TOOLCHAIN_PATH}/${TOOLCHAIN_HOST}-as" ]; then
-        local AS="${TOOLCHAIN_PATH}/llvm-as"
-    else
-        local AS="${TOOLCHAIN_PATH}/${TOOLCHAIN_HOST}-as"
-    fi
-    # Since NDK r23 those binaries were removed due to LLVM being now the default
-    if [ ! -x "${TOOLCHAIN_PATH}/${TOOLCHAIN_HOST}-ar" ]; then
-        local AR="${TOOLCHAIN_PATH}/llvm-ar"
-        local RANLIB="${TOOLCHAIN_PATH}/llvm-ranlib"
-        local STRIP="${TOOLCHAIN_PATH}/llvm-strip"
-    else
-        local AR="${TOOLCHAIN_PATH}/${TOOLCHAIN_HOST}-ar"
-        local RANLIB="${TOOLCHAIN_PATH}/${TOOLCHAIN_HOST}-ranlib"
-        local STRIP="${TOOLCHAIN_PATH}/${TOOLCHAIN_HOST}-strip"
-    fi
-
-    if [ ! -x "${CC}" ]; then
-        ANDROID_BUILD_FAIL+=("The CC binary does not exist or is not executable")
-        ANDROID_BUILD_FAIL+=("  ${CC}")
-    fi
-
-    if [ ! -x "${CXX}" ]; then
-        ANDROID_BUILD_FAIL+=("The CXX binary does not exist or is not executable")
-        ANDROID_BUILD_FAIL+=("  ${CXX}")
-    fi
-
-    if [ ! -x "${LD}" ]; then
-        ANDROID_BUILD_FAIL+=("The LD binary does not exist or is not executable")
-        ANDROID_BUILD_FAIL+=("  ${LD}")
-    fi
-
-    if [ ! -x "${AS}" ]; then
-        ANDROID_BUILD_FAIL+=("The AS binary does not exist or is not executable")
-        ANDROID_BUILD_FAIL+=("  ${AS}")
-    fi
-
-    if [ ! -x "${AR}" ]; then
-        ANDROID_BUILD_FAIL+=("The AR binary does not exist or is not executable")
-        ANDROID_BUILD_FAIL+=("  ${AR}")
-    fi
-
-    if [ ! -x "${RANLIB}" ]; then
-        ANDROID_BUILD_FAIL+=("The RANLIB binary does not exist or is not executable")
-        ANDROID_BUILD_FAIL+=("  ${RANLIB}")
-    fi
-
-    if [ ! -x "${STRIP}" ]; then
-        ANDROID_BUILD_FAIL+=("The STRIP binary does not exist or is not executable")
-        ANDROID_BUILD_FAIL+=("  ${STRIP}")
-    fi
-
-    ANDROID_BUILD_OPTS+=("TOOLCHAIN=${TOOLCHAIN}")
-    ANDROID_BUILD_OPTS+=("CC=${CC}")
-    ANDROID_BUILD_OPTS+=("CXX=${CXX}")
-    ANDROID_BUILD_OPTS+=("LD=${LD}")
-    ANDROID_BUILD_OPTS+=("AS=${AS}")
-    ANDROID_BUILD_OPTS+=("AR=${AR}")
-    ANDROID_BUILD_OPTS+=("RANLIB=${RANLIB}")
-    ANDROID_BUILD_OPTS+=("STRIP=${STRIP}")
-
-    android_build_check_fail
-}
-
-# Set the ANDROID_BUILD_OPTS variable to a bash array of configure options
-function android_build_opts {
-    ANDROID_BUILD_OPTS=()
-
-    _android_build_opts_process_binaries
-
-    # Since NDK r23 we don't need -lgcc due to LLVM being now the default
-    if [ ! -x "${TOOLCHAIN_PATH}/${TOOLCHAIN_HOST}-ar" ]; then
-        local LIBS="-lc -ldl -lm -llog -lc++_shared"
-    else
-        local LIBS="-lc -lgcc -ldl -lm -llog -lc++_shared"
-    fi
-    local LDFLAGS="-L${ANDROID_BUILD_PREFIX}/lib"
-    if [ -n "${ANDROID_LIBC_ROOT}" ] ; then
-        LDFLAGS+=" -L${ANDROID_LIBC_ROOT}"
-    fi
-    LDFLAGS+=" -L${ANDROID_STL_ROOT}"
-    CFLAGS+=" -D_GNU_SOURCE -D_REENTRANT -D_THREAD_SAFE"
-    CPPFLAGS+=" -I${ANDROID_BUILD_PREFIX}/include"
-
-    if [ ${NDK_NUMBER} -ge 2400 ] ; then
-        if [ "${BUILD_ARCH}" = "arm64" ] ; then
-            CXXFLAGS+=" -mno-outline-atomics"
-        fi
-    fi
-
-
-    ANDROID_BUILD_OPTS+=("CFLAGS=${CFLAGS} ${ANDROID_BUILD_EXTRA_CFLAGS}")
-    ANDROID_BUILD_OPTS+=("CPPFLAGS=${CPPFLAGS} ${ANDROID_BUILD_EXTRA_CPPFLAGS}")
-    ANDROID_BUILD_OPTS+=("CXXFLAGS=${CXXFLAGS} ${ANDROID_BUILD_EXTRA_CXXFLAGS}")
-    ANDROID_BUILD_OPTS+=("LDFLAGS=${LDFLAGS} ${ANDROID_BUILD_EXTRA_LDFLAGS}")
-    ANDROID_BUILD_OPTS+=("LIBS=${LIBS} ${ANDROID_BUILD_EXTRA_LIBS}")
-
-    ANDROID_BUILD_OPTS+=("PKG_CONFIG_LIBDIR=${ANDROID_NDK_ROOT}/prebuilt/${ANDROID_BUILD_PLATFORM}/lib/pkgconfig")
-    ANDROID_BUILD_OPTS+=("PKG_CONFIG_PATH=${ANDROID_BUILD_PREFIX}/lib/pkgconfig")
-    ANDROID_BUILD_OPTS+=("PKG_CONFIG_SYSROOT_DIR=${ANDROID_BUILD_SYSROOT}")
-    ANDROID_BUILD_OPTS+=("PKG_CONFIG_DIR=")
-    ANDROID_BUILD_OPTS+=("--with-sysroot=${ANDROID_BUILD_SYSROOT}")
-    ANDROID_BUILD_OPTS+=("--host=${TOOLCHAIN_HOST}")
-    ANDROID_BUILD_OPTS+=("--prefix=${ANDROID_BUILD_PREFIX}")
-
-    android_build_check_fail
-}
-
-# Parse readelf output to verify the correct linking of libraries.
-#   The first argument should be the soname of the newly built library.
-#   The rest of the arguments should be the sonames of dependencies.
-#   All sonames should be unversioned for android (no trailing numbers).
-function android_build_verify_so {
-    local soname="$1"
-    shift # Get rid of first argument - the rest represent dependencies
-
-    local sofile="${ANDROID_BUILD_PREFIX}/lib/${soname}"
-    if [ ! -f "${sofile}" ]; then
-        ANDROID_BUILD_FAIL+=("Found no library named ${soname}")
-        ANDROID_BUILD_FAIL+=("  ${sofile}")
-    fi
-    android_build_check_fail
-
-    local READELF="${TOOLCHAIN_PATH}/${TOOLCHAIN_HOST}-readelf"
-    if command -v "${READELF}" >/dev/null 2>&1 ; then
-        local readelf_bin="${READELF}"
-    elif command -v readelf >/dev/null 2>&1 ; then
-        local readelf_bin="readelf"
-    elif command -v greadelf >/dev/null 2>&1 ; then
-        local readelf_bin="greadelf"
-    else
-        ANDROID_BUILD_FAIL+=("Could not find any of readelf, greadelf, or ${READELF}")
-    fi
-    android_build_check_fail
-
-    local elfoutput
-    elfoutput=$(LC_ALL=C $readelf_bin -d "${sofile}")
-
-    local soname_regexp='soname: \[([[:alnum:]\.]+)\]'
-    if [[ $elfoutput =~ $soname_regexp ]]; then
-        local parsed_soname="${BASH_REMATCH[1]}"
-        if [ "${parsed_soname}" != "${soname}" ]; then
-            ANDROID_BUILD_FAIL+=("Actual soname of library ${soname} is incorrect (or versioned):")
-            ANDROID_BUILD_FAIL+=("  ${parsed_soname}")
-        fi
-    else
-        ANDROID_BUILD_FAIL+=("Failed to meaningfully parse readelf output for library ${soname}:")
-        ANDROID_BUILD_FAIL+=("  ${elfoutput}")
-    fi
-
-    for dep_soname in "$@" ; do
-        local dep_sofile="${ANDROID_BUILD_PREFIX}/lib/${dep_soname}"
-        if [ ! -f "${dep_sofile}" ]; then
-            ANDROID_BUILD_FAIL+=("Found no library named ${dep_soname}")
-            ANDROID_BUILD_FAIL+=("  ${dep_sofile}")
-        elif [[ $elfoutput != *"library: [${dep_soname}]"* ]]; then
-            ANDROID_BUILD_FAIL+=("Library ${soname} was expected to be linked to library with soname:")
-            ANDROID_BUILD_FAIL+=("  ${dep_soname}")
-        fi
-    done
-
-    android_build_check_fail
-}
-
-function android_show_configure_opts {
-    local tag=$1
-    shift
-    echo "LIBZMQ (${BUILD_ARCH}) - ./configure options to build '${tag}':"
-    for opt in "$@"; do
-        echo "  > ${opt}"
-    done
-    echo ""
-}
diff --git a/libs/libzmq/builds/android/build.sh b/libs/libzmq/builds/android/build.sh
deleted file mode 100755
index 4aae478..0000000
--- a/libs/libzmq/builds/android/build.sh
+++ /dev/null
@@ -1,157 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-# Use directory of current script as the working directory
-cd "$( dirname "${BASH_SOURCE[0]}" )"
-
-########################################################################
-# Configuration & tuning options.
-########################################################################
-# Set default values used in ci builds
-export NDK_VERSION="${NDK_VERSION:-android-ndk-r25}"
-
-# Set default path to find Android NDK.
-# Must be of the form <path>/${NDK_VERSION} !!
-export ANDROID_NDK_ROOT="${ANDROID_NDK_ROOT:-/tmp/${NDK_VERSION}}"
-
-# With NDK r22b, the minimum SDK version range is [16, 31].
-# Since NDK r24, the minimum SDK version range is [19, 31].
-# SDK version 21 is the minimum version for 64-bit builds.
-export MIN_SDK_VERSION=${MIN_SDK_VERSION:-21}
-
-# Use directory of current script as the build directory
-# ${ANDROID_BUILD_DIR}/prefix/<build_arch>/lib will contain produced libraries
-export ANDROID_BUILD_DIR="${ANDROID_BUILD_DIR:-${PWD}}"
-
-# Clean before processing
-export ANDROID_BUILD_CLEAN="${ANDROID_BUILD_CLEAN:-}"
-
-# Select CURVE implementation:
-# - ""               # Do not use any CURVE implementation.
-# - "libsodium"      # Use LIBSODIUM implementation.
-# - "tweetnacl"      # Use internal TWEETNACL implementation.
-export CURVE="${CURVE:-}"
-
-########################################################################
-# Utilities
-########################################################################
-function usage {
-    echo "LIBZMQ - Usage:"
-    echo "  export XXX=yyy"
-    echo "  ./build.sh [ arm | arm64 | x86 | x86_64 ]"
-    echo ""
-    echo "See this file (configuration & tuning options) for details"
-    echo "on variables XXX and their values xxx"
-    exit 1
-}
-
-########################################################################
-# Sanity checks
-########################################################################
-BUILD_ARCH="$1"
-[ -z "${BUILD_ARCH}" ] && usage
-
-########################################################################
-# Compilation
-########################################################################
-# Get access to android_build functions and variables
-# Perform some sanity checks and calculate some variables.
-source ./android_build_helper.sh
-
-# Choose a C++ standard library implementation from the ndk
-export ANDROID_BUILD_CXXSTL="gnustl_shared_49"
-
-# Additional flags for LIBTOOL, for LIBZMQ and other dependencies.
-export LIBTOOL_EXTRA_LDFLAGS='-avoid-version'
-
-# Set up android build environment and set ANDROID_BUILD_OPTS array
-android_build_set_env "${BUILD_ARCH}"
-android_download_ndk
-android_build_env
-android_build_opts
-
-# Use a temporary build directory
-cache="/tmp/android_build/${TOOLCHAIN_ARCH}"
-rm -rf "${cache}"
-mkdir -p "${cache}"
-
-# Check for environment variable to clear the prefix and do a clean build
-if [[ $ANDROID_BUILD_CLEAN ]]; then
-    echo "LIBZMQ (${BUILD_ARCH}) - Doing a clean build (removing previous build and dependencies)..."
-    rm -rf "${ANDROID_BUILD_PREFIX:-android-build-prefix-not-set}"/*
-
-    # Called shells MUST not clean after ourselves !
-    export ANDROID_BUILD_CLEAN=""
-fi
-
-VERIFY=("libzmq.so")
-if [ -z "${CURVE}" ]; then
-    CURVE="--disable-curve"
-elif [ "${CURVE}" == "libsodium" ]; then
-    CURVE="--with-libsodium=yes"
-    VERIFY+=("libsodium.so")
-    ##
-    # Build LIBSODIUM from latest STABLE branch
-
-    (android_build_verify_so "libsodium.so" &> /dev/null) || {
-        rm -rf "${cache}/libsodium"
-        (
-            echo "LIBZMQ (${BUILD_ARCH}) - Cloning 'https://github.com/jedisct1/libsodium.git' (branch 'stable') under '${cache}/libsodium}'." \
-            && cd "${cache}" \
-            && git clone --quiet -b stable --depth 1 https://github.com/jedisct1/libsodium.git \
-            && cd "${cache}/libsodium" \
-            && git log --oneline -n 1
-        ) || exit 1
-        (
-            CONFIG_OPTS=()
-            CONFIG_OPTS+=("--quiet")
-            CONFIG_OPTS+=("${ANDROID_BUILD_OPTS[@]}")
-            CONFIG_OPTS+=("--disable-soname-versions")
-
-            cd "${cache}/libsodium" \
-            && ./autogen.sh \
-            && android_show_configure_opts "LIBSODIUM" "${CONFIG_OPTS[@]}" \
-            && ./configure "${CONFIG_OPTS[@]}" \
-            && make -j 4 \
-            && make install
-        ) || exit 1
-    }
-elif [ $CURVE == "tweetnacl" ]; then
-    # Default
-    CURVE=""
-fi
-
-##
-# Build libzmq from local source
-
-(android_build_verify_so "${VERIFY[@]}" &> /dev/null) || {
-    rm -rf "${cache}/libzmq"
-    (cp -r ../.. "${cache}/libzmq" && cd "${cache}/libzmq" && ( make clean || : ))
-
-    (
-        CONFIG_OPTS=()
-        CONFIG_OPTS+=("--quiet")
-        CONFIG_OPTS+=("${ANDROID_BUILD_OPTS[@]}")
-        CONFIG_OPTS+=("${CURVE}")
-        CONFIG_OPTS+=("--without-docs")
-
-        cd "${cache}/libzmq" \
-        && ./autogen.sh \
-        && android_show_configure_opts "LIBZMQ" "${CONFIG_OPTS[@]}" \
-        && ./configure "${CONFIG_OPTS[@]}" \
-        && make -j 4 \
-        && make install
-    ) || exit 1
-}
-
-##
-# Fetch the STL as well.
-
-cp "${ANDROID_STL_ROOT}/${ANDROID_STL}" "${ANDROID_BUILD_PREFIX}/lib/."
-
-##
-# Verify shared libraries in prefix
-
-android_build_verify_so "${VERIFY[@]}" "${ANDROID_STL}"
-echo "LIBZMQ (${BUILD_ARCH}) - Android build successful"
diff --git a/libs/libzmq/builds/android/ci_build.sh b/libs/libzmq/builds/android/ci_build.sh
deleted file mode 100755
index d6b2aca..0000000
--- a/libs/libzmq/builds/android/ci_build.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env bash
-#
-#   Exit if any step fails
-set -e
-
-# Use directory of current script as the working directory
-cd "$( dirname "${BASH_SOURCE[0]}" )"
-
-# Configuration
-export NDK_VERSION="${NDK_VERSION:-android-ndk-r25}"
-export ANDROID_NDK_ROOT="${ANDROID_NDK_ROOT:-/tmp/${NDK_VERSION}}"
-export MIN_SDK_VERSION=${MIN_SDK_VERSION:-21}
-export ANDROID_BUILD_DIR="${ANDROID_BUILD_DIR:-${PWD}}"
-
-# Cleanup.
-rm -rf /tmp/android_build/
-rm -rf "${PWD}/prefix"
-rm -rf /tmp/tmp-deps
-mkdir -p /tmp/tmp-deps
-
-./build.sh "arm"
-./build.sh "arm64"
-./build.sh "x86"
-./build.sh "x86_64"
diff --git a/libs/libzmq/builds/cmake/Modules/ClangFormat.cmake b/libs/libzmq/builds/cmake/Modules/ClangFormat.cmake
deleted file mode 100644
index f36ea06..0000000
--- a/libs/libzmq/builds/cmake/Modules/ClangFormat.cmake
+++ /dev/null
@@ -1,41 +0,0 @@
-# additional target to perform clang-format run, requires clang-format
-
-# get all project files
-file(GLOB_RECURSE ALL_SOURCE_FILES 
-     RELATIVE ${CMAKE_CURRENT_BINARY_DIR} 
-     ${CMAKE_SOURCE_DIR}/src/*.cpp ${CMAKE_SOURCE_DIR}/src/*.h ${CMAKE_SOURCE_DIR}/src/*.hpp 
-     ${CMAKE_SOURCE_DIR}/tests/*.cpp ${CMAKE_SOURCE_DIR}/tests/*.h ${CMAKE_SOURCE_DIR}/tests/*.hpp 
-     ${CMAKE_SOURCE_DIR}/perf/*.cpp ${CMAKE_SOURCE_DIR}/perf/*.h ${CMAKE_SOURCE_DIR}/perf/*.hpp 
-     ${CMAKE_SOURCE_DIR}/tools/*.cpp ${CMAKE_SOURCE_DIR}/tools/*.h ${CMAKE_SOURCE_DIR}/tools/*.hpp 
-     ${CMAKE_SOURCE_DIR}/include/*.h
-    )
-
-if("${CLANG_FORMAT}" STREQUAL "")
-  set(CLANG_FORMAT "clang-format")
-endif()
-
-add_custom_target(
-        clang-format
-        COMMAND ${CLANG_FORMAT} -style=file -i ${ALL_SOURCE_FILES}
-)
-
-function(JOIN VALUES GLUE OUTPUT)
-  string (REPLACE ";" "${GLUE}" _TMP_STR "${VALUES}")
-  set (${OUTPUT} "${_TMP_STR}" PARENT_SCOPE)
-endfunction()
-
-configure_file(builds/cmake/clang-format-check.sh.in clang-format-check.sh @ONLY)
-
-add_custom_target(
-        clang-format-check
-        COMMAND chmod +x clang-format-check.sh
-        COMMAND ./clang-format-check.sh
-        COMMENT "Checking correct formatting according to .clang-format file using ${CLANG_FORMAT}"
-)
-
-add_custom_target(
-        clang-format-diff
-        COMMAND ${CLANG_FORMAT} -style=file -i ${ALL_SOURCE_FILES}
-        COMMAND git diff ${ALL_SOURCE_FILES}
-        COMMENT "Formatting with clang-format (using ${CLANG_FORMAT}) and showing differences with latest commit"
-)
diff --git a/libs/libzmq/builds/cmake/Modules/FindAsciiDoc.cmake b/libs/libzmq/builds/cmake/Modules/FindAsciiDoc.cmake
deleted file mode 100644
index 049ac00..0000000
--- a/libs/libzmq/builds/cmake/Modules/FindAsciiDoc.cmake
+++ /dev/null
@@ -1,26 +0,0 @@
-# - Find Asciidoc
-# this module looks for asciidoc and a2x
-#
-# ASCIIDOC_EXECUTABLE - the full path to asciidoc
-# ASCIIDOC_FOUND - If false, don't attempt to use asciidoc.
-# A2X_EXECUTABLE - the full path to a2x
-# A2X_FOUND - If false, don't attempt to use a2x.
-
-set (PROGRAMFILESX86 "PROGRAMFILES(X86)")
-
-find_program(ASCIIDOC_EXECUTABLE asciidoc asciidoc.py
-             PATHS "$ENV{ASCIIDOC_ROOT}"
-                   "$ENV{PROGRAMW6432}/asciidoc"
-                   "$ENV{PROGRAMFILES}/asciidoc"
-                   "$ENV{${PROGRAMFILESX86}}/asciidoc")
-
-find_program(A2X_EXECUTABLE a2x
-             PATHS "$ENV{ASCIIDOC_ROOT}"
-                   "$ENV{PROGRAMW6432}/asciidoc"
-                   "$ENV{PROGRAMFILES}/asciidoc"
-                   "$ENV{${PROGRAMFILESX86}}/asciidoc")
-
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_ARGS(AsciiDoc REQUIRED_VARS ASCIIDOC_EXECUTABLE)
-mark_as_advanced(ASCIIDOC_EXECUTABLE A2X_EXECUTABLE)
diff --git a/libs/libzmq/builds/cmake/Modules/FindNSS3.cmake b/libs/libzmq/builds/cmake/Modules/FindNSS3.cmake
deleted file mode 100644
index 9adb4db..0000000
--- a/libs/libzmq/builds/cmake/Modules/FindNSS3.cmake
+++ /dev/null
@@ -1,8 +0,0 @@
-include(FindPackageHandleStandardArgs)
-
-if (NOT MSVC)
-    find_package(PkgConfig REQUIRED)
-    pkg_check_modules(NSS3 "nss>=3.19")
-    find_package_handle_standard_args(NSS3 DEFAULT_MSG NSS3_LIBRARIES NSS3_CFLAGS)
-endif()
-
diff --git a/libs/libzmq/builds/cmake/Modules/FindSodium.cmake b/libs/libzmq/builds/cmake/Modules/FindSodium.cmake
deleted file mode 100644
index 9ec36d1..0000000
--- a/libs/libzmq/builds/cmake/Modules/FindSodium.cmake
+++ /dev/null
@@ -1,48 +0,0 @@
-################################################################################
-#  THIS FILE IS 100% GENERATED BY ZPROJECT; DO NOT EDIT EXCEPT EXPERIMENTALLY  #
-#  Please refer to the README for information about making permanent changes.  #
-################################################################################
-
-if (NOT MSVC)
-find_package(PkgConfig REQUIRED) 
-pkg_check_modules(PC_SODIUM "libsodium")
-if (PC_SODIUM_FOUND)
-  set(pkg_config_names_private "${pkg_config_names_private} libsodium")
-endif()
-if (NOT PC_SODIUM_FOUND)
-    pkg_check_modules(PC_SODIUM "sodium")
-    if (PC_SODIUM_FOUND)
-      set(pkg_config_names_private "${pkg_config_names_private} sodium")
-    endif()
-endif (NOT PC_SODIUM_FOUND)
-if (PC_SODIUM_FOUND)
-  set(SODIUM_INCLUDE_HINTS ${PC_SODIUM_INCLUDE_DIRS} ${PC_SODIUM_INCLUDE_DIRS}/*)
-  set(SODIUM_LIBRARY_HINTS ${PC_SODIUM_LIBRARY_DIRS} ${PC_SODIUM_LIBRARY_DIRS}/*)
-else()
-  set(pkg_config_libs_private "${pkg_config_libs_private} -lsodium")
-endif()
-endif (NOT MSVC)
-
-# some libraries install the headers is a subdirectory of the include dir
-# returned by pkg-config, so use a wildcard match to improve chances of finding
-# headers and libraries.
-find_path(
-    SODIUM_INCLUDE_DIRS
-    NAMES sodium.h
-    HINTS ${SODIUM_INCLUDE_HINTS}
-)
-
-find_library(
-    SODIUM_LIBRARIES
-    NAMES libsodium sodium
-    HINTS ${SODIUM_LIBRARY_HINTS}
-)
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(sodium DEFAULT_MSG SODIUM_LIBRARIES SODIUM_INCLUDE_DIRS)
-mark_as_advanced(SODIUM_FOUND SODIUM_LIBRARIES SODIUM_INCLUDE_DIRS)
-
-################################################################################
-#  THIS FILE IS 100% GENERATED BY ZPROJECT; DO NOT EDIT EXCEPT EXPERIMENTALLY  #
-#  Please refer to the README for information about making permanent changes.  #
-################################################################################
diff --git a/libs/libzmq/builds/cmake/Modules/TestZMQVersion.cmake b/libs/libzmq/builds/cmake/Modules/TestZMQVersion.cmake
deleted file mode 100644
index 49a3f30..0000000
--- a/libs/libzmq/builds/cmake/Modules/TestZMQVersion.cmake
+++ /dev/null
@@ -1,8 +0,0 @@
-
-file(READ "${PROJECT_SOURCE_DIR}/include/zmq.h" _ZMQ_H_CONTENTS)
-string(REGEX REPLACE ".*#define ZMQ_VERSION_MAJOR ([0-9]+).*" "\\1" ZMQ_VERSION_MAJOR "${_ZMQ_H_CONTENTS}")
-string(REGEX REPLACE ".*#define ZMQ_VERSION_MINOR ([0-9]+).*" "\\1" ZMQ_VERSION_MINOR "${_ZMQ_H_CONTENTS}")
-string(REGEX REPLACE ".*#define ZMQ_VERSION_PATCH ([0-9]+).*" "\\1" ZMQ_VERSION_PATCH "${_ZMQ_H_CONTENTS}")
-set(ZMQ_VERSION "${ZMQ_VERSION_MAJOR}.${ZMQ_VERSION_MINOR}.${ZMQ_VERSION_PATCH}")
-
-message(STATUS "Detected ZMQ Version - ${ZMQ_VERSION}")
diff --git a/libs/libzmq/builds/cmake/Modules/ZMQSourceRunChecks.cmake b/libs/libzmq/builds/cmake/Modules/ZMQSourceRunChecks.cmake
deleted file mode 100644
index 6f99f0a..0000000
--- a/libs/libzmq/builds/cmake/Modules/ZMQSourceRunChecks.cmake
+++ /dev/null
@@ -1,332 +0,0 @@
-
-
-macro(zmq_check_sock_cloexec)
-  message(STATUS "Checking whether SOCK_CLOEXEC is supported")
-  check_c_source_runs(
-    "
-#include <sys/types.h>
-#include <sys/socket.h>
-
-int main(int argc, char *argv [])
-{
-    int s = socket(PF_INET, SOCK_STREAM | SOCK_CLOEXEC, 0);
-    return(s == -1);
-}
-"
-    ZMQ_HAVE_SOCK_CLOEXEC)
-endmacro()
-
-macro(zmq_check_efd_cloexec)
-  message(STATUS "Checking whether EFD_CLOEXEC is supported")
-  check_c_source_runs(
-    "
-#include <sys/eventfd.h>
-
-int main(int argc, char *argv [])
-{
-    int s = eventfd (0, EFD_CLOEXEC);
-    return(s == -1);
-}
-"
-    ZMQ_HAVE_EVENTFD_CLOEXEC)
-endmacro()
-
-macro(zmq_check_o_cloexec)
-  message(STATUS "Checking whether O_CLOEXEC is supported")
-  check_c_source_runs(
-    "
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-
-int main(int argc, char *argv [])
-{
-    int s = open (\"/dev/null\", O_CLOEXEC | O_RDONLY);
-    return s == -1;
-}
-"
-    ZMQ_HAVE_O_CLOEXEC)
-endmacro()
-
-macro(zmq_check_so_bindtodevice)
-  message(STATUS "Checking whether SO_BINDTODEVICE is supported")
-  check_c_source_runs(
-"
-#include <sys/socket.h>
-
-int main(int argc, char *argv [])
-{
-/* Actually making the setsockopt() call requires CAP_NET_RAW */
-#ifndef SO_BINDTODEVICE
-    return 1;
-#else
-    return 0;
-#endif
-}
-"
-    ZMQ_HAVE_SO_BINDTODEVICE)
-endmacro()
-
-# TCP keep-alives Checks.
-
-macro(zmq_check_so_keepalive)
-  message(STATUS "Checking whether SO_KEEPALIVE is supported")
-  check_c_source_runs(
-"
-#include <sys/types.h>
-#include <sys/socket.h>
-
-int main(int argc, char *argv [])
-{
-    int s, rc, opt = 1;
-    return(
-       ((s = socket(PF_INET, SOCK_STREAM, 0)) == -1) ||
-       ((rc = setsockopt(s, SOL_SOCKET, SO_KEEPALIVE,(char*) &opt, sizeof(int))) == -1)
-    );
-}
-"
-    ZMQ_HAVE_SO_KEEPALIVE)
-endmacro()
-
-macro(zmq_check_tcp_keepcnt)
-  message(STATUS "Checking whether TCP_KEEPCNT is supported")
-  check_c_source_runs(
-    "
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netinet/tcp.h>
-
-int main(int argc, char *argv [])
-{
-    int s, rc, opt = 1;
-    return(
-       ((s = socket(PF_INET, SOCK_STREAM, 0)) == -1) ||
-       ((rc = setsockopt(s, SOL_SOCKET, SO_KEEPALIVE,(char*) &opt, sizeof(int))) == -1) ||
-       ((rc = setsockopt(s, IPPROTO_TCP, TCP_KEEPCNT,(char*) &opt, sizeof(int))) == -1)
-    );
-}
-"
-    ZMQ_HAVE_TCP_KEEPCNT)
-endmacro()
-
-macro(zmq_check_tcp_keepidle)
-  message(STATUS "Checking whether TCP_KEEPIDLE is supported")
-  check_c_source_runs(
-    "
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netinet/tcp.h>
-
-int main(int argc, char *argv [])
-{
-    int s, rc, opt = 1;
-    return(
-       ((s = socket(PF_INET, SOCK_STREAM, 0)) == -1) ||
-       ((rc = setsockopt(s, SOL_SOCKET, SO_KEEPALIVE,(char*) &opt, sizeof(int))) == -1) ||
-       ((rc = setsockopt(s, IPPROTO_TCP, TCP_KEEPIDLE,(char*) &opt, sizeof(int))) == -1)
-    );
-}
-"
-    ZMQ_HAVE_TCP_KEEPIDLE)
-endmacro()
-
-
-macro(zmq_check_tcp_keepintvl)
-  message(STATUS "Checking whether TCP_KEEPINTVL is supported")
-  check_c_source_runs(
-    "
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netinet/tcp.h>
-
-int main(int argc, char *argv [])
-{
-    int s, rc, opt = 1;
-    return(
-       ((s = socket(PF_INET, SOCK_STREAM, 0)) == -1) ||
-       ((rc = setsockopt(s, SOL_SOCKET, SO_KEEPALIVE,(char*) &opt, sizeof(int))) == -1) ||
-       ((rc = setsockopt(s, IPPROTO_TCP, TCP_KEEPINTVL,(char*) &opt, sizeof(int))) == -1)
-    );
-}
-
-"
-    ZMQ_HAVE_TCP_KEEPINTVL)
-endmacro()
-
-
-macro(zmq_check_tcp_keepalive)
-  message(STATUS "Checking whether TCP_KEEPALIVE is supported")
-  check_c_source_runs(
-    "
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netinet/tcp.h>
-
-int main(int argc, char *argv [])
-{
-    int s, rc, opt = 1;
-    return(
-       ((s = socket(PF_INET, SOCK_STREAM, 0)) == -1) ||
-       ((rc = setsockopt(s, SOL_SOCKET, SO_KEEPALIVE,(char*) &opt, sizeof(int))) == -1) ||
-       ((rc = setsockopt(s, IPPROTO_TCP, TCP_KEEPALIVE,(char*) &opt, sizeof(int))) == -1)
-    );
-}
-"
-    ZMQ_HAVE_TCP_KEEPALIVE)
-endmacro()
-
-
-macro(zmq_check_tcp_tipc)
-  message(STATUS "Checking whether TIPC is supported")
-  check_c_source_runs(
-    "
-#include <stdlib.h>
-#include <string.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <sys/socket.h>
-#include <linux/tipc.h>
-
-int main(int argc, char *argv [])
-{
-    struct sockaddr_tipc topsrv;
-    int sd = socket(AF_TIPC, SOCK_SEQPACKET, 0);
-    memset(&topsrv, 0, sizeof(topsrv));
-    topsrv.family = AF_TIPC;
-    topsrv.addrtype = TIPC_ADDR_NAME;
-    topsrv.addr.name.name.type = TIPC_TOP_SRV;
-    topsrv.addr.name.name.instance = TIPC_TOP_SRV;
-    fcntl(sd, F_SETFL, O_NONBLOCK);
-}
-"
-    ZMQ_HAVE_TIPC)
-endmacro()
-
-
-macro(zmq_check_pthread_setname)
-  message(STATUS "Checking pthread_setname signature")
-  set(SAVE_CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS})
-  set(CMAKE_REQUIRED_FLAGS "-D_GNU_SOURCE -Werror -pthread")
-  check_c_source_runs(
-    "
-#include <pthread.h>
-
-int main(int argc, char *argv [])
-{
-    pthread_setname_np (\"foo\");
-    return 0;
-}
-"
-    ZMQ_HAVE_PTHREAD_SETNAME_1)
-  check_c_source_runs(
-    "
-#include <pthread.h>
-
-int main(int argc, char *argv [])
-{
-    pthread_setname_np (pthread_self(), \"foo\");
-    return 0;
-}
-"
-    ZMQ_HAVE_PTHREAD_SETNAME_2)
-  check_c_source_runs(
-    "
-#include <pthread.h>
-
-int main(int argc, char *argv [])
-{
-    pthread_setname_np (pthread_self(), \"foo\", (void *)0);
-    return 0;
-}
-"
-    ZMQ_HAVE_PTHREAD_SETNAME_3)
-  check_c_source_runs(
-    "
-#include <pthread.h>
-
-int main(int argc, char *argv [])
-{
-    pthread_set_name_np (pthread_self(), \"foo\");
-    return 0;
-}
-"
-    ZMQ_HAVE_PTHREAD_SET_NAME)
-  set(CMAKE_REQUIRED_FLAGS ${SAVE_CMAKE_REQUIRED_FLAGS})
-endmacro()
-
-macro(zmq_check_pthread_setaffinity)
-  message(STATUS "Checking pthread_setaffinity signature")
-  set(SAVE_CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS})
-  set(CMAKE_REQUIRED_FLAGS "-D_GNU_SOURCE -Werror -pthread")
-  check_c_source_runs(
-    "
-#include <pthread.h>
-
-int main(int argc, char *argv [])
-{
-    cpu_set_t test; 
-    pthread_setaffinity_np (pthread_self(), sizeof(cpu_set_t), &test);
-    return 0;
-}
-"
-    ZMQ_HAVE_PTHREAD_SET_AFFINITY)
-  set(CMAKE_REQUIRED_FLAGS ${SAVE_CMAKE_REQUIRED_FLAGS})
-endmacro()
-
-
-macro(zmq_check_getrandom)
-  message(STATUS "Checking whether getrandom is supported")
-  check_c_source_runs(
-    "
-#include <sys/random.h>
-
-int main (int argc, char *argv [])
-{
-    char buf[4];
-    int rc = getrandom(buf, 4, 0);
-    return rc == -1 ? 1 : 0;
-}
-"
-    ZMQ_HAVE_GETRANDOM)
-endmacro()
-
-macro(zmq_check_noexcept)
-  message(STATUS "Checking whether noexcept is supported")
-  check_cxx_source_compiles(
-"
-struct X 
-{
-    X(int i) noexcept {}
-};
-
-int main(int argc, char *argv [])
-{
-    X x(5);
-    return 0;
-}
-"
-    ZMQ_HAVE_NOEXCEPT)
-endmacro()
-
-macro(zmq_check_so_priority)
-  message(STATUS "Checking whether SO_PRIORITY is supported")
-  check_c_source_runs(
-    "
-#include <sys/types.h>
-#include <sys/socket.h>
-
-int main (int argc, char *argv [])
-{
-    int s, rc, opt = 1;
-    return (
-        ((s = socket (PF_INET, SOCK_STREAM, 0)) == -1) ||
-        ((rc = setsockopt (s, SOL_SOCKET, SO_PRIORITY, (char*) &opt, sizeof (int))) == -1)
-    );
-}
-"
-    ZMQ_HAVE_SO_PRIORITY)
-endmacro()
diff --git a/libs/libzmq/builds/cmake/Modules/ZMQSupportMacros.cmake b/libs/libzmq/builds/cmake/Modules/ZMQSupportMacros.cmake
deleted file mode 100644
index 5139015..0000000
--- a/libs/libzmq/builds/cmake/Modules/ZMQSupportMacros.cmake
+++ /dev/null
@@ -1,5 +0,0 @@
-macro (zmq_set_with_default var value)
-  if (NOT ${var})
-    set(${var} "${value}")
-  endif ()
-endmacro ()
diff --git a/libs/libzmq/builds/cmake/NSIS.template32.in b/libs/libzmq/builds/cmake/NSIS.template32.in
deleted file mode 100644
index 0b7d245..0000000
--- a/libs/libzmq/builds/cmake/NSIS.template32.in
+++ /dev/null
@@ -1,952 +0,0 @@
-; CPack install script designed for a nmake build
-
-;--------------------------------
-; You must define these values
-
-  !define VERSION "@CPACK_PACKAGE_VERSION@"
-  !define PATCH  "@CPACK_PACKAGE_VERSION_PATCH@"
-  !define INST_DIR "@CPACK_TEMPORARY_DIRECTORY@"
-
-;--------------------------------
-;Variables
-
-  Var MUI_TEMP
-  Var STARTMENU_FOLDER
-  Var SV_ALLUSERS
-  Var START_MENU
-  Var DO_NOT_ADD_TO_PATH
-  Var ADD_TO_PATH_ALL_USERS
-  Var ADD_TO_PATH_CURRENT_USER
-  Var INSTALL_DESKTOP
-  Var IS_DEFAULT_INSTALLDIR
-;--------------------------------
-;Include Modern UI
-
-  !include "MUI.nsh"
-
-  ;Default installation folder
-  InstallDir "$PROGRAMFILES\@CPACK_PACKAGE_INSTALL_DIRECTORY@"
-  ;InstallDir "$PROGRAMFILES64\@CPACK_PACKAGE_INSTALL_DIRECTORY@"
-
-;--------------------------------
-;General
-
-  ;Name and file
-  Name "@CPACK_NSIS_PACKAGE_NAME@"
-  OutFile "@CPACK_TOPLEVEL_DIRECTORY@/@CPACK_OUTPUT_FILE_NAME@"
-
-  ;Set compression
-  SetCompressor @CPACK_NSIS_COMPRESSOR@
-
-@CPACK_NSIS_DEFINES@   
-
-  !include Sections.nsh
-
-;--- Component support macros: ---
-; The code for the add/remove functionality is from:
-;   http://nsis.sourceforge.net/Add/Remove_Functionality
-; It has been modified slightly and extended to provide
-; inter-component dependencies.
-Var AR_SecFlags
-Var AR_RegFlags
-@CPACK_NSIS_SECTION_SELECTED_VARS@
-
-; Loads the "selected" flag for the section named SecName into the
-; variable VarName.
-!macro LoadSectionSelectedIntoVar SecName VarName
- SectionGetFlags ${${SecName}} $${VarName}
- IntOp $${VarName} $${VarName} & ${SF_SELECTED}  ;Turn off all other bits
-!macroend
-
-; Loads the value of a variable... can we get around this?
-!macro LoadVar VarName
-  IntOp $R0 0 + $${VarName}
-!macroend
-
-; Sets the value of a variable
-!macro StoreVar VarName IntValue
-  IntOp $${VarName} 0 + ${IntValue}
-!macroend
-
-!macro InitSection SecName
-  ;  This macro reads component installed flag from the registry and
-  ;changes checked state of the section on the components page.
-  ;Input: section index constant name specified in Section command.
-   
-  ClearErrors
-  ;Reading component status from registry
-  ReadRegDWORD $AR_RegFlags HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_NAME@\Components\${SecName}" "Installed"
-  IfErrors "default_${SecName}"
-    ;Status will stay default if registry value not found
-    ;(component was never installed)
-  IntOp $AR_RegFlags $AR_RegFlags & ${SF_SELECTED} ;Turn off all other bits
-  SectionGetFlags ${${SecName}} $AR_SecFlags  ;Reading default section flags
-  IntOp $AR_SecFlags $AR_SecFlags & 0xFFFE  ;Turn lowest (enabled) bit off
-  IntOp $AR_SecFlags $AR_RegFlags | $AR_SecFlags      ;Change lowest bit
-
-  ; Note whether this component was installed before
-  !insertmacro StoreVar ${SecName}_was_installed $AR_RegFlags
-  IntOp $R0 $AR_RegFlags & $AR_RegFlags
-  
-  ;Writing modified flags
-  SectionSetFlags ${${SecName}} $AR_SecFlags
-  
- "default_${SecName}:"
- !insertmacro LoadSectionSelectedIntoVar ${SecName} ${SecName}_selected
-!macroend
- 
-!macro FinishSection SecName
-  ;  This macro reads section flag set by user and removes the section
-  ;if it is not selected.
-  ;Then it writes component installed flag to registry
-  ;Input: section index constant name specified in Section command.
- 
-  SectionGetFlags ${${SecName}} $AR_SecFlags  ;Reading section flags
-  ;Checking lowest bit:
-  IntOp $AR_SecFlags $AR_SecFlags & ${SF_SELECTED}
-  IntCmp $AR_SecFlags 1 "leave_${SecName}"
-    ;Section is not selected:
-    ;Calling Section uninstall macro and writing zero installed flag
-    !insertmacro "Remove_${${SecName}}"
-    WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_NAME@\Components\${SecName}" \
-  "Installed" 0
-    Goto "exit_${SecName}"
- 
- "leave_${SecName}:"
-    ;Section is selected:
-    WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_NAME@\Components\${SecName}" \
-  "Installed" 1
- 
- "exit_${SecName}:"
-!macroend
- 
-!macro RemoveSection SecName
-  ;  This macro is used to call section's Remove_... macro
-  ;from the uninstaller.
-  ;Input: section index constant name specified in Section command.
- 
-  !insertmacro "Remove_${${SecName}}"
-!macroend
-
-; Determine whether the selection of SecName changed
-!macro MaybeSelectionChanged SecName
-  !insertmacro LoadVar ${SecName}_selected
-  SectionGetFlags ${${SecName}} $R1
-  IntOp $R1 $R1 & ${SF_SELECTED} ;Turn off all other bits
-  
-  ; See if the status has changed:
-  IntCmp $R0 $R1 "${SecName}_unchanged"
-  !insertmacro LoadSectionSelectedIntoVar ${SecName} ${SecName}_selected
-  
-  IntCmp $R1 ${SF_SELECTED} "${SecName}_was_selected"
-  !insertmacro "Deselect_required_by_${SecName}"
-  goto "${SecName}_unchanged"
-  
-  "${SecName}_was_selected:"
-  !insertmacro "Select_${SecName}_depends"
-  
-  "${SecName}_unchanged:"
-!macroend
-;--- End of Add/Remove macros ---
-
-;--------------------------------
-;Interface Settings
-
-  !define MUI_HEADERIMAGE
-  !define MUI_ABORTWARNING
-    
-;--------------------------------
-; path functions
-
-!verbose 3
-!include "WinMessages.NSH"
-!verbose 4
-
-;----------------------------------------
-; based upon a script of "Written by KiCHiK 2003-01-18 05:57:02"
-;----------------------------------------
-!verbose 3
-!include "WinMessages.NSH"
-!verbose 4
-;====================================================
-; get_NT_environment 
-;     Returns: the selected environment
-;     Output : head of the stack
-;====================================================
-!macro select_NT_profile UN
-Function ${UN}select_NT_profile
-   StrCmp $ADD_TO_PATH_ALL_USERS "1" 0 environment_single
-      DetailPrint "Selected environment for all users"
-      Push "all"
-      Return
-   environment_single:
-      DetailPrint "Selected environment for current user only."
-      Push "current"
-      Return
-FunctionEnd
-!macroend
-!insertmacro select_NT_profile ""
-!insertmacro select_NT_profile "un."
-;----------------------------------------------------
-!define NT_current_env 'HKCU "Environment"'
-!define NT_all_env     'HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"'
-
-!ifndef WriteEnvStr_RegKey
-  !ifdef ALL_USERS
-    !define WriteEnvStr_RegKey \
-       'HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"'
-  !else
-    !define WriteEnvStr_RegKey 'HKCU "Environment"'
-  !endif
-!endif
- 
-; AddToPath - Adds the given dir to the search path.
-;        Input - head of the stack
-;        Note - Win9x systems requires reboot
- 
-Function AddToPath
-  Exch $0
-  Push $1
-  Push $2
-  Push $3
- 
-  # don't add if the path doesn't exist
-  IfFileExists "$0\*.*" "" AddToPath_done
- 
-  ReadEnvStr $1 PATH
-  ; if the path is too long for a NSIS variable NSIS will return a 0 
-  ; length string.  If we find that, then warn and skip any path
-  ; modification as it will trash the existing path.
-  StrLen $2 $1
-  IntCmp $2 0 CheckPathLength_ShowPathWarning CheckPathLength_Done CheckPathLength_Done
-    CheckPathLength_ShowPathWarning:
-    Messagebox MB_OK|MB_ICONEXCLAMATION "Warning! PATH too long installer unable to modify PATH!"
-    Goto AddToPath_done
-  CheckPathLength_Done:
-  Push "$1;"
-  Push "$0;"
-  Call StrStr
-  Pop $2
-  StrCmp $2 "" "" AddToPath_done
-  Push "$1;"
-  Push "$0\;"
-  Call StrStr
-  Pop $2
-  StrCmp $2 "" "" AddToPath_done
-  GetFullPathName /SHORT $3 $0
-  Push "$1;"
-  Push "$3;"
-  Call StrStr
-  Pop $2
-  StrCmp $2 "" "" AddToPath_done
-  Push "$1;"
-  Push "$3\;"
-  Call StrStr
-  Pop $2
-  StrCmp $2 "" "" AddToPath_done
- 
-  Call IsNT
-  Pop $1
-  StrCmp $1 1 AddToPath_NT
-    ; Not on NT
-    StrCpy $1 $WINDIR 2
-    FileOpen $1 "$1\autoexec.bat" a
-    FileSeek $1 -1 END
-    FileReadByte $1 $2
-    IntCmp $2 26 0 +2 +2 # DOS EOF
-      FileSeek $1 -1 END # write over EOF
-    FileWrite $1 "$\r$\nSET PATH=%PATH%;$3$\r$\n"
-    FileClose $1
-    SetRebootFlag true
-    Goto AddToPath_done
- 
-  AddToPath_NT:
-    StrCmp $ADD_TO_PATH_ALL_USERS "1" ReadAllKey
-      ReadRegStr $1 ${NT_current_env} "PATH"
-      Goto DoTrim
-    ReadAllKey:
-      ReadRegStr $1 ${NT_all_env} "PATH"
-    DoTrim:
-    StrCmp $1 "" AddToPath_NTdoIt
-      Push $1
-      Call Trim
-      Pop $1
-      StrCpy $0 "$1;$0"
-    AddToPath_NTdoIt:
-      StrCmp $ADD_TO_PATH_ALL_USERS "1" WriteAllKey
-        WriteRegExpandStr ${NT_current_env} "PATH" $0
-        Goto DoSend
-      WriteAllKey:
-        WriteRegExpandStr ${NT_all_env} "PATH" $0
-      DoSend:
-      SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} 0 "STR:Environment" /TIMEOUT=5000
- 
-  AddToPath_done:
-    Pop $3
-    Pop $2
-    Pop $1
-    Pop $0
-FunctionEnd
-
- 
-; RemoveFromPath - Remove a given dir from the path
-;     Input: head of the stack
- 
-Function un.RemoveFromPath
-  Exch $0
-  Push $1
-  Push $2
-  Push $3
-  Push $4
-  Push $5
-  Push $6
- 
-  IntFmt $6 "%c" 26 # DOS EOF
- 
-  Call un.IsNT
-  Pop $1
-  StrCmp $1 1 unRemoveFromPath_NT
-    ; Not on NT
-    StrCpy $1 $WINDIR 2
-    FileOpen $1 "$1\autoexec.bat" r
-    GetTempFileName $4
-    FileOpen $2 $4 w
-    GetFullPathName /SHORT $0 $0
-    StrCpy $0 "SET PATH=%PATH%;$0"
-    Goto unRemoveFromPath_dosLoop
- 
-    unRemoveFromPath_dosLoop:
-      FileRead $1 $3
-      StrCpy $5 $3 1 -1 # read last char
-      StrCmp $5 $6 0 +2 # if DOS EOF
-        StrCpy $3 $3 -1 # remove DOS EOF so we can compare
-      StrCmp $3 "$0$\r$\n" unRemoveFromPath_dosLoopRemoveLine
-      StrCmp $3 "$0$\n" unRemoveFromPath_dosLoopRemoveLine
-      StrCmp $3 "$0" unRemoveFromPath_dosLoopRemoveLine
-      StrCmp $3 "" unRemoveFromPath_dosLoopEnd
-      FileWrite $2 $3
-      Goto unRemoveFromPath_dosLoop
-      unRemoveFromPath_dosLoopRemoveLine:
-        SetRebootFlag true
-        Goto unRemoveFromPath_dosLoop
- 
-    unRemoveFromPath_dosLoopEnd:
-      FileClose $2
-      FileClose $1
-      StrCpy $1 $WINDIR 2
-      Delete "$1\autoexec.bat"
-      CopyFiles /SILENT $4 "$1\autoexec.bat"
-      Delete $4
-      Goto unRemoveFromPath_done
- 
-  unRemoveFromPath_NT:
-    StrCmp $ADD_TO_PATH_ALL_USERS "1" unReadAllKey
-      ReadRegStr $1 ${NT_current_env} "PATH"
-      Goto unDoTrim
-    unReadAllKey:
-      ReadRegStr $1 ${NT_all_env} "PATH"
-    unDoTrim:
-    StrCpy $5 $1 1 -1 # copy last char
-    StrCmp $5 ";" +2 # if last char != ;
-      StrCpy $1 "$1;" # append ;
-    Push $1
-    Push "$0;"
-    Call un.StrStr ; Find `$0;` in $1
-    Pop $2 ; pos of our dir
-    StrCmp $2 "" unRemoveFromPath_done
-      ; else, it is in path
-      # $0 - path to add
-      # $1 - path var
-      StrLen $3 "$0;"
-      StrLen $4 $2
-      StrCpy $5 $1 -$4 # $5 is now the part before the path to remove
-      StrCpy $6 $2 "" $3 # $6 is now the part after the path to remove
-      StrCpy $3 $5$6
- 
-      StrCpy $5 $3 1 -1 # copy last char
-      StrCmp $5 ";" 0 +2 # if last char == ;
-        StrCpy $3 $3 -1 # remove last char
- 
-      StrCmp $ADD_TO_PATH_ALL_USERS "1" unWriteAllKey
-        WriteRegExpandStr ${NT_current_env} "PATH" $3
-        Goto unDoSend
-      unWriteAllKey:
-        WriteRegExpandStr ${NT_all_env} "PATH" $3
-      unDoSend:
-      SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} 0 "STR:Environment" /TIMEOUT=5000
- 
-  unRemoveFromPath_done:
-    Pop $6
-    Pop $5
-    Pop $4
-    Pop $3
-    Pop $2
-    Pop $1
-    Pop $0
-FunctionEnd
- 
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; Uninstall sutff
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-###########################################
-#            Utility Functions            #
-###########################################
- 
-;====================================================
-; IsNT - Returns 1 if the current system is NT, 0
-;        otherwise.
-;     Output: head of the stack
-;====================================================
-; IsNT
-; no input
-; output, top of the stack = 1 if NT or 0 if not
-;
-; Usage:
-;   Call IsNT
-;   Pop $R0
-;  ($R0 at this point is 1 or 0)
- 
-!macro IsNT un
-Function ${un}IsNT
-  Push $0
-  ReadRegStr $0 HKLM "SOFTWARE\Microsoft\Windows NT\CurrentVersion" CurrentVersion
-  StrCmp $0 "" 0 IsNT_yes
-  ; we are not NT.
-  Pop $0
-  Push 0
-  Return
- 
-  IsNT_yes:
-    ; NT!!!
-    Pop $0
-    Push 1
-FunctionEnd
-!macroend
-!insertmacro IsNT ""
-!insertmacro IsNT "un."
- 
-; StrStr
-; input, top of stack = string to search for
-;        top of stack-1 = string to search in
-; output, top of stack (replaces with the portion of the string remaining)
-; modifies no other variables.
-;
-; Usage:
-;   Push "this is a long ass string"
-;   Push "ass"
-;   Call StrStr
-;   Pop $R0
-;  ($R0 at this point is "ass string")
- 
-!macro StrStr un
-Function ${un}StrStr
-Exch $R1 ; st=haystack,old$R1, $R1=needle
-  Exch    ; st=old$R1,haystack
-  Exch $R2 ; st=old$R1,old$R2, $R2=haystack
-  Push $R3
-  Push $R4
-  Push $R5
-  StrLen $R3 $R1
-  StrCpy $R4 0
-  ; $R1=needle
-  ; $R2=haystack
-  ; $R3=len(needle)
-  ; $R4=cnt
-  ; $R5=tmp
-  loop:
-    StrCpy $R5 $R2 $R3 $R4
-    StrCmp $R5 $R1 done
-    StrCmp $R5 "" done
-    IntOp $R4 $R4 + 1
-    Goto loop
-done:
-  StrCpy $R1 $R2 "" $R4
-  Pop $R5
-  Pop $R4
-  Pop $R3
-  Pop $R2
-  Exch $R1
-FunctionEnd
-!macroend
-!insertmacro StrStr ""
-!insertmacro StrStr "un."
-
-Function Trim ; Added by Pelaca
-	Exch $R1
-	Push $R2
-Loop:
-	StrCpy $R2 "$R1" 1 -1
-	StrCmp "$R2" " " RTrim
-	StrCmp "$R2" "$\n" RTrim
-	StrCmp "$R2" "$\r" RTrim
-	StrCmp "$R2" ";" RTrim
-	GoTo Done
-RTrim:	
-	StrCpy $R1 "$R1" -1
-	Goto Loop
-Done:
-	Pop $R2
-	Exch $R1
-FunctionEnd
-
-Function ConditionalAddToRegisty
-  Pop $0
-  Pop $1
-  StrCmp "$0" "" ConditionalAddToRegisty_EmptyString
-    WriteRegStr SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_NAME@" \
-    "$1" "$0"
-    ;MessageBox MB_OK "Set Registry: '$1' to '$0'"
-    DetailPrint "Set install registry entry: '$1' to '$0'"
-  ConditionalAddToRegisty_EmptyString:
-FunctionEnd
-
-;--------------------------------
-
-!ifdef CPACK_USES_DOWNLOAD
-Function DownloadFile
-    IfFileExists $INSTDIR\* +2
-    CreateDirectory $INSTDIR
-    Pop $0
-
-    ; Skip if already downloaded
-    IfFileExists $INSTDIR\$0 0 +2
-    Return
-
-    StrCpy $1 "@CPACK_DOWNLOAD_SITE@"
-
-  try_again:
-    NSISdl::download "$1/$0" "$INSTDIR\$0"
-    
-    Pop $1
-    StrCmp $1 "success" success
-    StrCmp $1 "Cancelled" cancel
-    MessageBox MB_OK "Download failed: $1"
-  cancel:
-    Return
-  success:
-FunctionEnd
-!endif
-
-;--------------------------------
-; Installation types
-@CPACK_NSIS_INSTALLATION_TYPES@
-
-;--------------------------------
-; Component sections
-@CPACK_NSIS_COMPONENT_SECTIONS@
-
-;--------------------------------
-; Define some macro setting for the gui
-@CPACK_NSIS_INSTALLER_MUI_ICON_CODE@
-@CPACK_NSIS_INSTALLER_ICON_CODE@
-@CPACK_NSIS_INSTALLER_MUI_COMPONENTS_DESC@
-
-;--------------------------------
-;Pages
-  !insertmacro MUI_PAGE_WELCOME
-
-  !insertmacro MUI_PAGE_LICENSE "@CPACK_RESOURCE_FILE_LICENSE@"
-  Page custom InstallOptionsPage
-  !insertmacro MUI_PAGE_DIRECTORY
-  
-  ;Start Menu Folder Page Configuration
-  !define MUI_STARTMENUPAGE_REGISTRY_ROOT "SHCTX" 
-  !define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\@CPACK_PACKAGE_VENDOR@\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@" 
-  !define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder"
-  !insertmacro MUI_PAGE_STARTMENU Application $STARTMENU_FOLDER
-
-  !define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\NEWS.txt"
-
-  @CPACK_NSIS_PAGE_COMPONENTS@
-
-  !insertmacro MUI_PAGE_INSTFILES
-  !insertmacro MUI_PAGE_FINISH
-
-  !insertmacro MUI_UNPAGE_CONFIRM
-  !insertmacro MUI_UNPAGE_INSTFILES
-  !insertmacro MUI_UNPAGE_FINISH
-
-;--------------------------------
-;Languages
-
-  !insertmacro MUI_LANGUAGE "English" ;first language is the default language
-  !insertmacro MUI_LANGUAGE "Albanian"
-  !insertmacro MUI_LANGUAGE "Arabic"
-  !insertmacro MUI_LANGUAGE "Basque"
-  !insertmacro MUI_LANGUAGE "Belarusian"
-  !insertmacro MUI_LANGUAGE "Bosnian"
-  !insertmacro MUI_LANGUAGE "Breton"
-  !insertmacro MUI_LANGUAGE "Bulgarian"
-  !insertmacro MUI_LANGUAGE "Croatian"
-  !insertmacro MUI_LANGUAGE "Czech"
-  !insertmacro MUI_LANGUAGE "Danish"
-  !insertmacro MUI_LANGUAGE "Dutch"
-  !insertmacro MUI_LANGUAGE "Estonian"
-  !insertmacro MUI_LANGUAGE "Farsi"
-  !insertmacro MUI_LANGUAGE "Finnish"
-  !insertmacro MUI_LANGUAGE "French"
-  !insertmacro MUI_LANGUAGE "German"
-  !insertmacro MUI_LANGUAGE "Greek"
-  !insertmacro MUI_LANGUAGE "Hebrew"
-  !insertmacro MUI_LANGUAGE "Hungarian"
-  !insertmacro MUI_LANGUAGE "Icelandic"
-  !insertmacro MUI_LANGUAGE "Indonesian"
-  !insertmacro MUI_LANGUAGE "Irish"
-  !insertmacro MUI_LANGUAGE "Italian"
-  !insertmacro MUI_LANGUAGE "Japanese"
-  !insertmacro MUI_LANGUAGE "Korean"
-  !insertmacro MUI_LANGUAGE "Kurdish"
-  !insertmacro MUI_LANGUAGE "Latvian"
-  !insertmacro MUI_LANGUAGE "Lithuanian"
-  !insertmacro MUI_LANGUAGE "Luxembourgish"
-  !insertmacro MUI_LANGUAGE "Macedonian"
-  !insertmacro MUI_LANGUAGE "Malay"
-  !insertmacro MUI_LANGUAGE "Mongolian"
-  !insertmacro MUI_LANGUAGE "Norwegian"
-  !insertmacro MUI_LANGUAGE "Polish"
-  !insertmacro MUI_LANGUAGE "Portuguese"
-  !insertmacro MUI_LANGUAGE "PortugueseBR"
-  !insertmacro MUI_LANGUAGE "Romanian"
-  !insertmacro MUI_LANGUAGE "Russian"
-  !insertmacro MUI_LANGUAGE "Serbian"
-  !insertmacro MUI_LANGUAGE "SerbianLatin"
-  !insertmacro MUI_LANGUAGE "SimpChinese"
-  !insertmacro MUI_LANGUAGE "Slovak"
-  !insertmacro MUI_LANGUAGE "Slovenian"
-  !insertmacro MUI_LANGUAGE "Spanish"
-  !insertmacro MUI_LANGUAGE "Swedish"
-  !insertmacro MUI_LANGUAGE "Thai"
-  !insertmacro MUI_LANGUAGE "TradChinese"
-  !insertmacro MUI_LANGUAGE "Turkish"
-  !insertmacro MUI_LANGUAGE "Ukrainian"
-  !insertmacro MUI_LANGUAGE "Welsh"
-
-
-;--------------------------------
-;Reserve Files
-
-  ;These files should be inserted before other files in the data block
-  ;Keep these lines before any File command
-  ;Only for solid compression (by default, solid compression is enabled for BZIP2 and LZMA)
-
-  ReserveFile "NSIS.InstallOptions.ini"
-  !insertmacro MUI_RESERVEFILE_INSTALLOPTIONS
-
-;--------------------------------
-;Installer Sections
-
-Section "-Core installation"
-  ;Use the entire tree produced by the INSTALL target.  Keep the
-  ;list of directories here in sync with the RMDir commands below.
-  SetOutPath "$INSTDIR"
-  @CPACK_NSIS_FULL_INSTALL@
-  
-  ;Store installation folder
-  WriteRegStr SHCTX "Software\@CPACK_PACKAGE_VENDOR@\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@" "" $INSTDIR
-  
-  ;Create uninstaller
-  WriteUninstaller "$INSTDIR\Uninstall.exe"
-  Push "DisplayName"
-  Push "@CPACK_NSIS_DISPLAY_NAME@"
-  Call ConditionalAddToRegisty
-  Push "DisplayVersion"
-  Push "@CPACK_PACKAGE_VERSION@"
-  Call ConditionalAddToRegisty
-  Push "Publisher"
-  Push "@CPACK_PACKAGE_VENDOR@"
-  Call ConditionalAddToRegisty
-  Push "UninstallString"
-  Push "$INSTDIR\Uninstall.exe"
-  Call ConditionalAddToRegisty
-  Push "NoRepair"
-  Push "1"
-  Call ConditionalAddToRegisty
-  
-  !ifdef CPACK_NSIS_ADD_REMOVE
-  ;Create add/remove functionality
-  Push "ModifyPath"
-  Push "$INSTDIR\AddRemove.exe"
-  Call ConditionalAddToRegisty
-  !else
-  Push "NoModify"
-  Push "1"
-  Call ConditionalAddToRegisty
-  !endif
-  
-  ; Optional registration
-  Push "DisplayIcon"
-  Push "$INSTDIR\@CPACK_NSIS_INSTALLED_ICON_NAME@"
-  Call ConditionalAddToRegisty
-  Push "HelpLink"
-  Push "@CPACK_NSIS_HELP_LINK@"
-  Call ConditionalAddToRegisty
-  Push "URLInfoAbout"
-  Push "@CPACK_NSIS_URL_INFO_ABOUT@"
-  Call ConditionalAddToRegisty
-  Push "Contact"
-  Push "@CPACK_NSIS_CONTACT@"
-  Call ConditionalAddToRegisty
-  !insertmacro MUI_INSTALLOPTIONS_READ $INSTALL_DESKTOP "NSIS.InstallOptions.ini" "Field 5" "State"
-  !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
-  
-  ;Create shortcuts
-  CreateDirectory "$SMPROGRAMS\$STARTMENU_FOLDER"
-@CPACK_NSIS_CREATE_ICONS@
-@CPACK_NSIS_CREATE_ICONS_EXTRA@
-  CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Uninstall.lnk" "$INSTDIR\Uninstall.exe"
-
-  ;Read a value from an InstallOptions INI file
-  !insertmacro MUI_INSTALLOPTIONS_READ $DO_NOT_ADD_TO_PATH "NSIS.InstallOptions.ini" "Field 2" "State"
-  !insertmacro MUI_INSTALLOPTIONS_READ $ADD_TO_PATH_ALL_USERS "NSIS.InstallOptions.ini" "Field 3" "State"
-  !insertmacro MUI_INSTALLOPTIONS_READ $ADD_TO_PATH_CURRENT_USER "NSIS.InstallOptions.ini" "Field 4" "State"
-
-  ; Write special uninstall registry entries
-  Push "StartMenu"
-  Push "$STARTMENU_FOLDER"
-  Call ConditionalAddToRegisty
-  Push "DoNotAddToPath"
-  Push "$DO_NOT_ADD_TO_PATH"
-  Call ConditionalAddToRegisty
-  Push "AddToPathAllUsers"
-  Push "$ADD_TO_PATH_ALL_USERS"
-  Call ConditionalAddToRegisty
-  Push "AddToPathCurrentUser"
-  Push "$ADD_TO_PATH_CURRENT_USER"
-  Call ConditionalAddToRegisty
-  Push "InstallToDesktop"
-  Push "$INSTALL_DESKTOP"
-  Call ConditionalAddToRegisty
-
-  !insertmacro MUI_STARTMENU_WRITE_END
-
-@CPACK_NSIS_EXTRA_INSTALL_COMMANDS@
-
-SectionEnd
-
-Section "-Add to path"
-  Push $INSTDIR\bin
-  StrCmp "@CPACK_NSIS_MODIFY_PATH@" "ON" 0 doNotAddToPath
-  StrCmp $DO_NOT_ADD_TO_PATH "1" doNotAddToPath 0  
-    Call AddToPath
-  doNotAddToPath:
-SectionEnd
-
-;--------------------------------
-; Create custom pages
-Function InstallOptionsPage
-  !insertmacro MUI_HEADER_TEXT "Install Options" "Choose options for installing @CPACK_NSIS_PACKAGE_NAME@"
-  !insertmacro MUI_INSTALLOPTIONS_DISPLAY "NSIS.InstallOptions.ini"
-
-FunctionEnd
-
-;--------------------------------
-; determine admin versus local install
-Function un.onInit
-
-  ClearErrors
-  UserInfo::GetName
-  IfErrors noLM
-  Pop $0
-  UserInfo::GetAccountType
-  Pop $1
-  StrCmp $1 "Admin" 0 +3
-    SetShellVarContext all
-    ;MessageBox MB_OK 'User "$0" is in the Admin group'
-    Goto done
-  StrCmp $1 "Power" 0 +3
-    SetShellVarContext all
-    ;MessageBox MB_OK 'User "$0" is in the Power Users group'
-    Goto done
-    
-  noLM:
-    ;Get installation folder from registry if available
-
-  done:
-    
-FunctionEnd
-
-;--- Add/Remove callback functions: ---
-!macro SectionList MacroName
-  ;This macro used to perform operation on multiple sections.
-  ;List all of your components in following manner here.
-@CPACK_NSIS_COMPONENT_SECTION_LIST@
-!macroend
- 
-Section -FinishComponents
-  ;Removes unselected components and writes component status to registry
-  !insertmacro SectionList "FinishSection"
-  
-!ifdef CPACK_NSIS_ADD_REMOVE  
-  ; Get the name of the installer executable
-  System::Call 'kernel32::GetModuleFileNameA(i 0, t .R0, i 1024) i r1'
-  StrCpy $R3 $R0
-  
-  ; Strip off the last 13 characters, to see if we have AddRemove.exe
-  StrLen $R1 $R0
-  IntOp $R1 $R0 - 13
-  StrCpy $R2 $R0 13 $R1
-  StrCmp $R2 "AddRemove.exe" addremove_installed
-  
-  ; We're not running AddRemove.exe, so install it
-  CopyFiles $R3 $INSTDIR\AddRemove.exe
-  
-  addremove_installed:
-!endif
-SectionEnd
-;--- End of Add/Remove callback functions ---
-
-;--------------------------------
-; Component dependencies
-Function .onSelChange
-  !insertmacro SectionList MaybeSelectionChanged
-FunctionEnd
-
-;--------------------------------
-;Uninstaller Section
-
-Section "Uninstall"
-  ReadRegStr $START_MENU SHCTX \
-   "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_NAME@" "StartMenu"
-  ;MessageBox MB_OK "Start menu is in: $START_MENU"
-  ReadRegStr $DO_NOT_ADD_TO_PATH SHCTX \
-    "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_NAME@" "DoNotAddToPath"
-  ReadRegStr $ADD_TO_PATH_ALL_USERS SHCTX \
-    "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_NAME@" "AddToPathAllUsers"
-  ReadRegStr $ADD_TO_PATH_CURRENT_USER SHCTX \
-    "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_NAME@" "AddToPathCurrentUser"
-  ;MessageBox MB_OK "Add to path: $DO_NOT_ADD_TO_PATH all users: $ADD_TO_PATH_ALL_USERS"
-  ReadRegStr $INSTALL_DESKTOP SHCTX \
-    "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_NAME@" "InstallToDesktop"
-  ;MessageBox MB_OK "Install to desktop: $INSTALL_DESKTOP "
-
-@CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS@
-
-  ;Remove files we installed.
-  ;Keep the list of directories here in sync with the File commands above.
-@CPACK_NSIS_DELETE_FILES@
-@CPACK_NSIS_DELETE_DIRECTORIES@
-
-!ifdef CPACK_NSIS_ADD_REMOVE  
-  ;Remove the add/remove program
-  Delete "$INSTDIR\AddRemove.exe"
-!endif
-
-  ;Remove the uninstaller itself.
-  Delete "$INSTDIR\Uninstall.exe"
-  DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_NAME@"
-
-  ;Remove the installation directory if it is empty.
-  RMDir "$INSTDIR"
-
-  ; Remove the registry entries.
-  DeleteRegKey SHCTX "Software\@CPACK_PACKAGE_VENDOR@\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@"
-
-  ; Removes all optional components
-  !insertmacro SectionList "RemoveSection"
-  
-  !insertmacro MUI_STARTMENU_GETFOLDER Application $MUI_TEMP
-    
-  Delete "$SMPROGRAMS\$MUI_TEMP\Uninstall.lnk"
-@CPACK_NSIS_DELETE_ICONS@
-@CPACK_NSIS_DELETE_ICONS_EXTRA@
-  
-  ;Delete empty start menu parent directories
-  StrCpy $MUI_TEMP "$SMPROGRAMS\$MUI_TEMP"
- 
-  startMenuDeleteLoop:
-    ClearErrors
-    RMDir $MUI_TEMP
-    GetFullPathName $MUI_TEMP "$MUI_TEMP\.."
-    
-    IfErrors startMenuDeleteLoopDone
-  
-    StrCmp "$MUI_TEMP" "$SMPROGRAMS" startMenuDeleteLoopDone startMenuDeleteLoop
-  startMenuDeleteLoopDone:
-
-  ; If the user changed the shortcut, then untinstall may not work. This should
-  ; try to fix it.
-  StrCpy $MUI_TEMP "$START_MENU"
-  Delete "$SMPROGRAMS\$MUI_TEMP\Uninstall.lnk"
-@CPACK_NSIS_DELETE_ICONS_EXTRA@
-  
-  ;Delete empty start menu parent directories
-  StrCpy $MUI_TEMP "$SMPROGRAMS\$MUI_TEMP"
- 
-  secondStartMenuDeleteLoop:
-    ClearErrors
-    RMDir $MUI_TEMP
-    GetFullPathName $MUI_TEMP "$MUI_TEMP\.."
-    
-    IfErrors secondStartMenuDeleteLoopDone
-  
-    StrCmp "$MUI_TEMP" "$SMPROGRAMS" secondStartMenuDeleteLoopDone secondStartMenuDeleteLoop
-  secondStartMenuDeleteLoopDone:
-
-  DeleteRegKey /ifempty SHCTX "Software\@CPACK_PACKAGE_VENDOR@\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@"
-
-  Push $INSTDIR\bin
-  StrCmp $DO_NOT_ADD_TO_PATH_ "1" doNotRemoveFromPath 0
-    Call un.RemoveFromPath
-  doNotRemoveFromPath:
-SectionEnd
-
-;--------------------------------
-; determine admin versus local install
-; Is install for "AllUsers" or "JustMe"?
-; Default to "JustMe" - set to "AllUsers" if admin or on Win9x
-; This function is used for the very first "custom page" of the installer.
-; This custom page does not show up visibly, but it executes prior to the
-; first visible page and sets up $INSTDIR properly...
-; Choose different default installation folder based on SV_ALLUSERS...
-; "Program Files" for AllUsers, "My Documents" for JustMe...
-
-Function .onInit
-  ; Reads components status for registry
-  !insertmacro SectionList "InitSection"
-
-  ; check to see if /D has been used to change 
-  ; the install directory by comparing it to the 
-  ; install directory that is expected to be the
-  ; default
-  StrCpy $IS_DEFAULT_INSTALLDIR 0
-  StrCmp "$INSTDIR" "$PROGRAMFILES\@CPACK_PACKAGE_INSTALL_DIRECTORY@" 0 +2
-    StrCpy $IS_DEFAULT_INSTALLDIR 1
-  
-  StrCpy $SV_ALLUSERS "JustMe"
-  ; if default install dir then change the default
-  ; if it is installed for JustMe
-  StrCmp "$IS_DEFAULT_INSTALLDIR" "1" 0 +2
-    StrCpy $INSTDIR "$DOCUMENTS\@CPACK_PACKAGE_INSTALL_DIRECTORY@"
-
-  ClearErrors
-  UserInfo::GetName
-  IfErrors noLM
-  Pop $0
-  UserInfo::GetAccountType
-  Pop $1
-  StrCmp $1 "Admin" 0 +3
-    SetShellVarContext all
-    ;MessageBox MB_OK 'User "$0" is in the Admin group'
-    StrCpy $SV_ALLUSERS "AllUsers"
-    Goto done
-  StrCmp $1 "Power" 0 +3
-    SetShellVarContext all
-    ;MessageBox MB_OK 'User "$0" is in the Power Users group'
-    StrCpy $SV_ALLUSERS "AllUsers"
-    Goto done
-    
-  noLM:
-    StrCpy $SV_ALLUSERS "AllUsers"
-    ;Get installation folder from registry if available
-
-  done:
-  StrCmp $SV_ALLUSERS "AllUsers" 0 +3
-    StrCmp "$IS_DEFAULT_INSTALLDIR" "1" 0 +2
-      StrCpy $INSTDIR "$PROGRAMFILES\@CPACK_PACKAGE_INSTALL_DIRECTORY@"
-
-  StrCmp "@CPACK_NSIS_MODIFY_PATH@" "ON" 0 noOptionsPage
-    !insertmacro MUI_INSTALLOPTIONS_EXTRACT "NSIS.InstallOptions.ini"
-
-  noOptionsPage:
-FunctionEnd
diff --git a/libs/libzmq/builds/cmake/NSIS.template64.in b/libs/libzmq/builds/cmake/NSIS.template64.in
deleted file mode 100644
index cb6beae..0000000
--- a/libs/libzmq/builds/cmake/NSIS.template64.in
+++ /dev/null
@@ -1,960 +0,0 @@
-; CPack install script designed for a nmake build
-
-;--------------------------------
-; You must define these values
-
-  !define VERSION "@CPACK_PACKAGE_VERSION@"
-  !define PATCH  "@CPACK_PACKAGE_VERSION_PATCH@"
-  !define INST_DIR "@CPACK_TEMPORARY_DIRECTORY@"
-
-;--------------------------------
-;Variables
-
-  Var MUI_TEMP
-  Var STARTMENU_FOLDER
-  Var SV_ALLUSERS
-  Var START_MENU
-  Var DO_NOT_ADD_TO_PATH
-  Var ADD_TO_PATH_ALL_USERS
-  Var ADD_TO_PATH_CURRENT_USER
-  Var INSTALL_DESKTOP
-  Var IS_DEFAULT_INSTALLDIR
-;--------------------------------
-;Include Modern UI
-
-  !include "MUI.nsh"
-
-  ;Default installation folder
-  ;InstallDir "$PROGRAMFILES\@CPACK_PACKAGE_INSTALL_DIRECTORY@"
-  InstallDir "$PROGRAMFILES64\@CPACK_PACKAGE_INSTALL_DIRECTORY@"
-
-;--------------------------------
-;General
-
-  ;Name and file
-  Name "@CPACK_NSIS_PACKAGE_NAME@"
-  OutFile "@CPACK_TOPLEVEL_DIRECTORY@/@CPACK_OUTPUT_FILE_NAME@"
-
-  ;Set compression
-  SetCompressor @CPACK_NSIS_COMPRESSOR@
-
-@CPACK_NSIS_DEFINES@   
-
-  !include Sections.nsh
-
-;--- Component support macros: ---
-; The code for the add/remove functionality is from:
-;   http://nsis.sourceforge.net/Add/Remove_Functionality
-; It has been modified slightly and extended to provide
-; inter-component dependencies.
-Var AR_SecFlags
-Var AR_RegFlags
-@CPACK_NSIS_SECTION_SELECTED_VARS@
-
-; Loads the "selected" flag for the section named SecName into the
-; variable VarName.
-!macro LoadSectionSelectedIntoVar SecName VarName
- SectionGetFlags ${${SecName}} $${VarName}
- IntOp $${VarName} $${VarName} & ${SF_SELECTED}  ;Turn off all other bits
-!macroend
-
-; Loads the value of a variable... can we get around this?
-!macro LoadVar VarName
-  IntOp $R0 0 + $${VarName}
-!macroend
-
-; Sets the value of a variable
-!macro StoreVar VarName IntValue
-  IntOp $${VarName} 0 + ${IntValue}
-!macroend
-
-!macro InitSection SecName
-  ;  This macro reads component installed flag from the registry and
-  ;changes checked state of the section on the components page.
-  ;Input: section index constant name specified in Section command.
-   
-  ClearErrors
-  ;Reading component status from registry
-  ReadRegDWORD $AR_RegFlags HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_NAME@ (x64)\Components\${SecName}" "Installed"
-  IfErrors "default_${SecName}"
-    ;Status will stay default if registry value not found
-    ;(component was never installed)
-  IntOp $AR_RegFlags $AR_RegFlags & ${SF_SELECTED} ;Turn off all other bits
-  SectionGetFlags ${${SecName}} $AR_SecFlags  ;Reading default section flags
-  IntOp $AR_SecFlags $AR_SecFlags & 0xFFFE  ;Turn lowest (enabled) bit off
-  IntOp $AR_SecFlags $AR_RegFlags | $AR_SecFlags      ;Change lowest bit
-
-  ; Note whether this component was installed before
-  !insertmacro StoreVar ${SecName}_was_installed $AR_RegFlags
-  IntOp $R0 $AR_RegFlags & $AR_RegFlags
-  
-  ;Writing modified flags
-  SectionSetFlags ${${SecName}} $AR_SecFlags
-  
- "default_${SecName}:"
- !insertmacro LoadSectionSelectedIntoVar ${SecName} ${SecName}_selected
-!macroend
- 
-!macro FinishSection SecName
-  ;  This macro reads section flag set by user and removes the section
-  ;if it is not selected.
-  ;Then it writes component installed flag to registry
-  ;Input: section index constant name specified in Section command.
- 
-  SectionGetFlags ${${SecName}} $AR_SecFlags  ;Reading section flags
-  ;Checking lowest bit:
-  IntOp $AR_SecFlags $AR_SecFlags & ${SF_SELECTED}
-  IntCmp $AR_SecFlags 1 "leave_${SecName}"
-    ;Section is not selected:
-    ;Calling Section uninstall macro and writing zero installed flag
-    !insertmacro "Remove_${${SecName}}"
-    WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_NAME@ (x64)\Components\${SecName}" \
-  "Installed" 0
-    Goto "exit_${SecName}"
- 
- "leave_${SecName}:"
-    ;Section is selected:
-    WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_NAME@ (x64)\Components\${SecName}" \
-  "Installed" 1
- 
- "exit_${SecName}:"
-!macroend
- 
-!macro RemoveSection SecName
-  ;  This macro is used to call section's Remove_... macro
-  ;from the uninstaller.
-  ;Input: section index constant name specified in Section command.
- 
-  !insertmacro "Remove_${${SecName}}"
-!macroend
-
-; Determine whether the selection of SecName changed
-!macro MaybeSelectionChanged SecName
-  !insertmacro LoadVar ${SecName}_selected
-  SectionGetFlags ${${SecName}} $R1
-  IntOp $R1 $R1 & ${SF_SELECTED} ;Turn off all other bits
-  
-  ; See if the status has changed:
-  IntCmp $R0 $R1 "${SecName}_unchanged"
-  !insertmacro LoadSectionSelectedIntoVar ${SecName} ${SecName}_selected
-  
-  IntCmp $R1 ${SF_SELECTED} "${SecName}_was_selected"
-  !insertmacro "Deselect_required_by_${SecName}"
-  goto "${SecName}_unchanged"
-  
-  "${SecName}_was_selected:"
-  !insertmacro "Select_${SecName}_depends"
-  
-  "${SecName}_unchanged:"
-!macroend
-;--- End of Add/Remove macros ---
-
-;--------------------------------
-;Interface Settings
-
-  !define MUI_HEADERIMAGE
-  !define MUI_ABORTWARNING
-    
-;--------------------------------
-; path functions
-
-!verbose 3
-!include "WinMessages.NSH"
-!verbose 4
-
-;----------------------------------------
-; based upon a script of "Written by KiCHiK 2003-01-18 05:57:02"
-;----------------------------------------
-!verbose 3
-!include "WinMessages.NSH"
-!verbose 4
-;====================================================
-; get_NT_environment 
-;     Returns: the selected environment
-;     Output : head of the stack
-;====================================================
-!macro select_NT_profile UN
-Function ${UN}select_NT_profile
-   StrCmp $ADD_TO_PATH_ALL_USERS "1" 0 environment_single
-      DetailPrint "Selected environment for all users"
-      Push "all"
-      Return
-   environment_single:
-      DetailPrint "Selected environment for current user only."
-      Push "current"
-      Return
-FunctionEnd
-!macroend
-!insertmacro select_NT_profile ""
-!insertmacro select_NT_profile "un."
-;----------------------------------------------------
-!define NT_current_env 'HKCU "Environment"'
-!define NT_all_env     'HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"'
-
-!ifndef WriteEnvStr_RegKey
-  !ifdef ALL_USERS
-    !define WriteEnvStr_RegKey \
-       'HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"'
-  !else
-    !define WriteEnvStr_RegKey 'HKCU "Environment"'
-  !endif
-!endif
- 
-; AddToPath - Adds the given dir to the search path.
-;        Input - head of the stack
-;        Note - Win9x systems requires reboot
- 
-Function AddToPath
-  Exch $0
-  Push $1
-  Push $2
-  Push $3
- 
-  # don't add if the path doesn't exist
-  IfFileExists "$0\*.*" "" AddToPath_done
- 
-  ReadEnvStr $1 PATH
-  ; if the path is too long for a NSIS variable NSIS will return a 0 
-  ; length string.  If we find that, then warn and skip any path
-  ; modification as it will trash the existing path.
-  StrLen $2 $1
-  IntCmp $2 0 CheckPathLength_ShowPathWarning CheckPathLength_Done CheckPathLength_Done
-    CheckPathLength_ShowPathWarning:
-    Messagebox MB_OK|MB_ICONEXCLAMATION "Warning! PATH too long installer unable to modify PATH!"
-    Goto AddToPath_done
-  CheckPathLength_Done:
-  Push "$1;"
-  Push "$0;"
-  Call StrStr
-  Pop $2
-  StrCmp $2 "" "" AddToPath_done
-  Push "$1;"
-  Push "$0\;"
-  Call StrStr
-  Pop $2
-  StrCmp $2 "" "" AddToPath_done
-  GetFullPathName /SHORT $3 $0
-  Push "$1;"
-  Push "$3;"
-  Call StrStr
-  Pop $2
-  StrCmp $2 "" "" AddToPath_done
-  Push "$1;"
-  Push "$3\;"
-  Call StrStr
-  Pop $2
-  StrCmp $2 "" "" AddToPath_done
- 
-  Call IsNT
-  Pop $1
-  StrCmp $1 1 AddToPath_NT
-    ; Not on NT
-    StrCpy $1 $WINDIR 2
-    FileOpen $1 "$1\autoexec.bat" a
-    FileSeek $1 -1 END
-    FileReadByte $1 $2
-    IntCmp $2 26 0 +2 +2 # DOS EOF
-      FileSeek $1 -1 END # write over EOF
-    FileWrite $1 "$\r$\nSET PATH=%PATH%;$3$\r$\n"
-    FileClose $1
-    SetRebootFlag true
-    Goto AddToPath_done
- 
-  AddToPath_NT:
-    StrCmp $ADD_TO_PATH_ALL_USERS "1" ReadAllKey
-      ReadRegStr $1 ${NT_current_env} "PATH"
-      Goto DoTrim
-    ReadAllKey:
-      ReadRegStr $1 ${NT_all_env} "PATH"
-    DoTrim:
-    StrCmp $1 "" AddToPath_NTdoIt
-      Push $1
-      Call Trim
-      Pop $1
-      StrCpy $0 "$1;$0"
-    AddToPath_NTdoIt:
-      StrCmp $ADD_TO_PATH_ALL_USERS "1" WriteAllKey
-        WriteRegExpandStr ${NT_current_env} "PATH" $0
-        Goto DoSend
-      WriteAllKey:
-        WriteRegExpandStr ${NT_all_env} "PATH" $0
-      DoSend:
-      SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} 0 "STR:Environment" /TIMEOUT=5000
- 
-  AddToPath_done:
-    Pop $3
-    Pop $2
-    Pop $1
-    Pop $0
-FunctionEnd
-
- 
-; RemoveFromPath - Remove a given dir from the path
-;     Input: head of the stack
- 
-Function un.RemoveFromPath
-  Exch $0
-  Push $1
-  Push $2
-  Push $3
-  Push $4
-  Push $5
-  Push $6
- 
-  IntFmt $6 "%c" 26 # DOS EOF
- 
-  Call un.IsNT
-  Pop $1
-  StrCmp $1 1 unRemoveFromPath_NT
-    ; Not on NT
-    StrCpy $1 $WINDIR 2
-    FileOpen $1 "$1\autoexec.bat" r
-    GetTempFileName $4
-    FileOpen $2 $4 w
-    GetFullPathName /SHORT $0 $0
-    StrCpy $0 "SET PATH=%PATH%;$0"
-    Goto unRemoveFromPath_dosLoop
- 
-    unRemoveFromPath_dosLoop:
-      FileRead $1 $3
-      StrCpy $5 $3 1 -1 # read last char
-      StrCmp $5 $6 0 +2 # if DOS EOF
-        StrCpy $3 $3 -1 # remove DOS EOF so we can compare
-      StrCmp $3 "$0$\r$\n" unRemoveFromPath_dosLoopRemoveLine
-      StrCmp $3 "$0$\n" unRemoveFromPath_dosLoopRemoveLine
-      StrCmp $3 "$0" unRemoveFromPath_dosLoopRemoveLine
-      StrCmp $3 "" unRemoveFromPath_dosLoopEnd
-      FileWrite $2 $3
-      Goto unRemoveFromPath_dosLoop
-      unRemoveFromPath_dosLoopRemoveLine:
-        SetRebootFlag true
-        Goto unRemoveFromPath_dosLoop
- 
-    unRemoveFromPath_dosLoopEnd:
-      FileClose $2
-      FileClose $1
-      StrCpy $1 $WINDIR 2
-      Delete "$1\autoexec.bat"
-      CopyFiles /SILENT $4 "$1\autoexec.bat"
-      Delete $4
-      Goto unRemoveFromPath_done
- 
-  unRemoveFromPath_NT:
-    StrCmp $ADD_TO_PATH_ALL_USERS "1" unReadAllKey
-      ReadRegStr $1 ${NT_current_env} "PATH"
-      Goto unDoTrim
-    unReadAllKey:
-      ReadRegStr $1 ${NT_all_env} "PATH"
-    unDoTrim:
-    StrCpy $5 $1 1 -1 # copy last char
-    StrCmp $5 ";" +2 # if last char != ;
-      StrCpy $1 "$1;" # append ;
-    Push $1
-    Push "$0;"
-    Call un.StrStr ; Find `$0;` in $1
-    Pop $2 ; pos of our dir
-    StrCmp $2 "" unRemoveFromPath_done
-      ; else, it is in path
-      # $0 - path to add
-      # $1 - path var
-      StrLen $3 "$0;"
-      StrLen $4 $2
-      StrCpy $5 $1 -$4 # $5 is now the part before the path to remove
-      StrCpy $6 $2 "" $3 # $6 is now the part after the path to remove
-      StrCpy $3 $5$6
- 
-      StrCpy $5 $3 1 -1 # copy last char
-      StrCmp $5 ";" 0 +2 # if last char == ;
-        StrCpy $3 $3 -1 # remove last char
- 
-      StrCmp $ADD_TO_PATH_ALL_USERS "1" unWriteAllKey
-        WriteRegExpandStr ${NT_current_env} "PATH" $3
-        Goto unDoSend
-      unWriteAllKey:
-        WriteRegExpandStr ${NT_all_env} "PATH" $3
-      unDoSend:
-      SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} 0 "STR:Environment" /TIMEOUT=5000
- 
-  unRemoveFromPath_done:
-    Pop $6
-    Pop $5
-    Pop $4
-    Pop $3
-    Pop $2
-    Pop $1
-    Pop $0
-FunctionEnd
- 
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; Uninstall sutff
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-###########################################
-#            Utility Functions            #
-###########################################
- 
-;====================================================
-; IsNT - Returns 1 if the current system is NT, 0
-;        otherwise.
-;     Output: head of the stack
-;====================================================
-; IsNT
-; no input
-; output, top of the stack = 1 if NT or 0 if not
-;
-; Usage:
-;   Call IsNT
-;   Pop $R0
-;  ($R0 at this point is 1 or 0)
- 
-!macro IsNT un
-Function ${un}IsNT
-  Push $0
-  ReadRegStr $0 HKLM "SOFTWARE\Microsoft\Windows NT\CurrentVersion" CurrentVersion
-  StrCmp $0 "" 0 IsNT_yes
-  ; we are not NT.
-  Pop $0
-  Push 0
-  Return
- 
-  IsNT_yes:
-    ; NT!!!
-    Pop $0
-    Push 1
-FunctionEnd
-!macroend
-!insertmacro IsNT ""
-!insertmacro IsNT "un."
- 
-; StrStr
-; input, top of stack = string to search for
-;        top of stack-1 = string to search in
-; output, top of stack (replaces with the portion of the string remaining)
-; modifies no other variables.
-;
-; Usage:
-;   Push "this is a long ass string"
-;   Push "ass"
-;   Call StrStr
-;   Pop $R0
-;  ($R0 at this point is "ass string")
- 
-!macro StrStr un
-Function ${un}StrStr
-Exch $R1 ; st=haystack,old$R1, $R1=needle
-  Exch    ; st=old$R1,haystack
-  Exch $R2 ; st=old$R1,old$R2, $R2=haystack
-  Push $R3
-  Push $R4
-  Push $R5
-  StrLen $R3 $R1
-  StrCpy $R4 0
-  ; $R1=needle
-  ; $R2=haystack
-  ; $R3=len(needle)
-  ; $R4=cnt
-  ; $R5=tmp
-  loop:
-    StrCpy $R5 $R2 $R3 $R4
-    StrCmp $R5 $R1 done
-    StrCmp $R5 "" done
-    IntOp $R4 $R4 + 1
-    Goto loop
-done:
-  StrCpy $R1 $R2 "" $R4
-  Pop $R5
-  Pop $R4
-  Pop $R3
-  Pop $R2
-  Exch $R1
-FunctionEnd
-!macroend
-!insertmacro StrStr ""
-!insertmacro StrStr "un."
-
-Function Trim ; Added by Pelaca
-	Exch $R1
-	Push $R2
-Loop:
-	StrCpy $R2 "$R1" 1 -1
-	StrCmp "$R2" " " RTrim
-	StrCmp "$R2" "$\n" RTrim
-	StrCmp "$R2" "$\r" RTrim
-	StrCmp "$R2" ";" RTrim
-	GoTo Done
-RTrim:	
-	StrCpy $R1 "$R1" -1
-	Goto Loop
-Done:
-	Pop $R2
-	Exch $R1
-FunctionEnd
-
-Function ConditionalAddToRegisty
-  Pop $0
-  Pop $1
-  StrCmp "$0" "" ConditionalAddToRegisty_EmptyString
-    WriteRegStr SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_NAME@ (x64)" \
-    "$1" "$0"
-    ;MessageBox MB_OK "Set Registry: '$1' to '$0'"
-    DetailPrint "Set install registry entry: '$1' to '$0'"
-  ConditionalAddToRegisty_EmptyString:
-FunctionEnd
-
-;--------------------------------
-
-!ifdef CPACK_USES_DOWNLOAD
-Function DownloadFile
-    IfFileExists $INSTDIR\* +2
-    CreateDirectory $INSTDIR
-    Pop $0
-
-    ; Skip if already downloaded
-    IfFileExists $INSTDIR\$0 0 +2
-    Return
-
-    StrCpy $1 "@CPACK_DOWNLOAD_SITE@"
-
-  try_again:
-    NSISdl::download "$1/$0" "$INSTDIR\$0"
-    
-    Pop $1
-    StrCmp $1 "success" success
-    StrCmp $1 "Cancelled" cancel
-    MessageBox MB_OK "Download failed: $1"
-  cancel:
-    Return
-  success:
-FunctionEnd
-!endif
-
-;--------------------------------
-; Installation types
-@CPACK_NSIS_INSTALLATION_TYPES@
-
-;--------------------------------
-; Component sections
-@CPACK_NSIS_COMPONENT_SECTIONS@
-
-;--------------------------------
-; Define some macro setting for the gui
-@CPACK_NSIS_INSTALLER_MUI_ICON_CODE@
-@CPACK_NSIS_INSTALLER_ICON_CODE@
-@CPACK_NSIS_INSTALLER_MUI_COMPONENTS_DESC@
-
-;--------------------------------
-;Pages
-  !insertmacro MUI_PAGE_WELCOME
-
-  !insertmacro MUI_PAGE_LICENSE "@CPACK_RESOURCE_FILE_LICENSE@"
-  Page custom InstallOptionsPage
-  !insertmacro MUI_PAGE_DIRECTORY
-  
-  ;Start Menu Folder Page Configuration
-  !define MUI_STARTMENUPAGE_REGISTRY_ROOT "SHCTX" 
-  !define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\@CPACK_PACKAGE_VENDOR@\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@" 
-  !define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder"
-  !insertmacro MUI_PAGE_STARTMENU Application $STARTMENU_FOLDER
-
-  !define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\NEWS.txt"
-
-  @CPACK_NSIS_PAGE_COMPONENTS@
-
-  !insertmacro MUI_PAGE_INSTFILES
-  !insertmacro MUI_PAGE_FINISH
-
-  !insertmacro MUI_UNPAGE_CONFIRM
-  !insertmacro MUI_UNPAGE_INSTFILES
-  !insertmacro MUI_UNPAGE_FINISH
-
-;--------------------------------
-;Languages
-
-  !insertmacro MUI_LANGUAGE "English" ;first language is the default language
-  !insertmacro MUI_LANGUAGE "Albanian"
-  !insertmacro MUI_LANGUAGE "Arabic"
-  !insertmacro MUI_LANGUAGE "Basque"
-  !insertmacro MUI_LANGUAGE "Belarusian"
-  !insertmacro MUI_LANGUAGE "Bosnian"
-  !insertmacro MUI_LANGUAGE "Breton"
-  !insertmacro MUI_LANGUAGE "Bulgarian"
-  !insertmacro MUI_LANGUAGE "Croatian"
-  !insertmacro MUI_LANGUAGE "Czech"
-  !insertmacro MUI_LANGUAGE "Danish"
-  !insertmacro MUI_LANGUAGE "Dutch"
-  !insertmacro MUI_LANGUAGE "Estonian"
-  !insertmacro MUI_LANGUAGE "Farsi"
-  !insertmacro MUI_LANGUAGE "Finnish"
-  !insertmacro MUI_LANGUAGE "French"
-  !insertmacro MUI_LANGUAGE "German"
-  !insertmacro MUI_LANGUAGE "Greek"
-  !insertmacro MUI_LANGUAGE "Hebrew"
-  !insertmacro MUI_LANGUAGE "Hungarian"
-  !insertmacro MUI_LANGUAGE "Icelandic"
-  !insertmacro MUI_LANGUAGE "Indonesian"
-  !insertmacro MUI_LANGUAGE "Irish"
-  !insertmacro MUI_LANGUAGE "Italian"
-  !insertmacro MUI_LANGUAGE "Japanese"
-  !insertmacro MUI_LANGUAGE "Korean"
-  !insertmacro MUI_LANGUAGE "Kurdish"
-  !insertmacro MUI_LANGUAGE "Latvian"
-  !insertmacro MUI_LANGUAGE "Lithuanian"
-  !insertmacro MUI_LANGUAGE "Luxembourgish"
-  !insertmacro MUI_LANGUAGE "Macedonian"
-  !insertmacro MUI_LANGUAGE "Malay"
-  !insertmacro MUI_LANGUAGE "Mongolian"
-  !insertmacro MUI_LANGUAGE "Norwegian"
-  !insertmacro MUI_LANGUAGE "Polish"
-  !insertmacro MUI_LANGUAGE "Portuguese"
-  !insertmacro MUI_LANGUAGE "PortugueseBR"
-  !insertmacro MUI_LANGUAGE "Romanian"
-  !insertmacro MUI_LANGUAGE "Russian"
-  !insertmacro MUI_LANGUAGE "Serbian"
-  !insertmacro MUI_LANGUAGE "SerbianLatin"
-  !insertmacro MUI_LANGUAGE "SimpChinese"
-  !insertmacro MUI_LANGUAGE "Slovak"
-  !insertmacro MUI_LANGUAGE "Slovenian"
-  !insertmacro MUI_LANGUAGE "Spanish"
-  !insertmacro MUI_LANGUAGE "Swedish"
-  !insertmacro MUI_LANGUAGE "Thai"
-  !insertmacro MUI_LANGUAGE "TradChinese"
-  !insertmacro MUI_LANGUAGE "Turkish"
-  !insertmacro MUI_LANGUAGE "Ukrainian"
-  !insertmacro MUI_LANGUAGE "Welsh"
-
-
-;--------------------------------
-;Reserve Files
-
-  ;These files should be inserted before other files in the data block
-  ;Keep these lines before any File command
-  ;Only for solid compression (by default, solid compression is enabled for BZIP2 and LZMA)
-
-  ReserveFile "NSIS.InstallOptions.ini"
-  !insertmacro MUI_RESERVEFILE_INSTALLOPTIONS
-
-;--------------------------------
-;Installer Sections
-
-Section "-Core installation"
-  ;Use the entire tree produced by the INSTALL target.  Keep the
-  ;list of directories here in sync with the RMDir commands below.
-  SetOutPath "$INSTDIR"
-  @CPACK_NSIS_FULL_INSTALL@
-  
-  ;Store installation folder
-  WriteRegStr SHCTX "Software\@CPACK_PACKAGE_VENDOR@\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@" "" $INSTDIR
-  
-  ;Create uninstaller
-  WriteUninstaller "$INSTDIR\Uninstall.exe"
-  Push "DisplayName"
-  Push "@CPACK_NSIS_DISPLAY_NAME@"
-  Call ConditionalAddToRegisty
-  Push "DisplayVersion"
-  Push "@CPACK_PACKAGE_VERSION@"
-  Call ConditionalAddToRegisty
-  Push "Publisher"
-  Push "@CPACK_PACKAGE_VENDOR@"
-  Call ConditionalAddToRegisty
-  Push "UninstallString"
-  Push "$INSTDIR\Uninstall.exe"
-  Call ConditionalAddToRegisty
-  Push "NoRepair"
-  Push "1"
-  Call ConditionalAddToRegisty
-  
-  !ifdef CPACK_NSIS_ADD_REMOVE
-  ;Create add/remove functionality
-  Push "ModifyPath"
-  Push "$INSTDIR\AddRemove.exe"
-  Call ConditionalAddToRegisty
-  !else
-  Push "NoModify"
-  Push "1"
-  Call ConditionalAddToRegisty
-  !endif
-  
-  ; Optional registration
-  Push "DisplayIcon"
-  Push "$INSTDIR\@CPACK_NSIS_INSTALLED_ICON_NAME@"
-  Call ConditionalAddToRegisty
-  Push "HelpLink"
-  Push "@CPACK_NSIS_HELP_LINK@"
-  Call ConditionalAddToRegisty
-  Push "URLInfoAbout"
-  Push "@CPACK_NSIS_URL_INFO_ABOUT@"
-  Call ConditionalAddToRegisty
-  Push "Contact"
-  Push "@CPACK_NSIS_CONTACT@"
-  Call ConditionalAddToRegisty
-  !insertmacro MUI_INSTALLOPTIONS_READ $INSTALL_DESKTOP "NSIS.InstallOptions.ini" "Field 5" "State"
-  !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
-  
-  ;Create shortcuts
-  CreateDirectory "$SMPROGRAMS\$STARTMENU_FOLDER"
-@CPACK_NSIS_CREATE_ICONS@
-@CPACK_NSIS_CREATE_ICONS_EXTRA@
-  CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Uninstall.lnk" "$INSTDIR\Uninstall.exe"
-
-  ;Read a value from an InstallOptions INI file
-  !insertmacro MUI_INSTALLOPTIONS_READ $DO_NOT_ADD_TO_PATH "NSIS.InstallOptions.ini" "Field 2" "State"
-  !insertmacro MUI_INSTALLOPTIONS_READ $ADD_TO_PATH_ALL_USERS "NSIS.InstallOptions.ini" "Field 3" "State"
-  !insertmacro MUI_INSTALLOPTIONS_READ $ADD_TO_PATH_CURRENT_USER "NSIS.InstallOptions.ini" "Field 4" "State"
-
-  ; Write special uninstall registry entries
-  Push "StartMenu"
-  Push "$STARTMENU_FOLDER"
-  Call ConditionalAddToRegisty
-  Push "DoNotAddToPath"
-  Push "$DO_NOT_ADD_TO_PATH"
-  Call ConditionalAddToRegisty
-  Push "AddToPathAllUsers"
-  Push "$ADD_TO_PATH_ALL_USERS"
-  Call ConditionalAddToRegisty
-  Push "AddToPathCurrentUser"
-  Push "$ADD_TO_PATH_CURRENT_USER"
-  Call ConditionalAddToRegisty
-  Push "InstallToDesktop"
-  Push "$INSTALL_DESKTOP"
-  Call ConditionalAddToRegisty
-
-  !insertmacro MUI_STARTMENU_WRITE_END
-
-@CPACK_NSIS_EXTRA_INSTALL_COMMANDS@
-
-SectionEnd
-
-Section "-Add to path"
-  Push $INSTDIR\bin
-  StrCmp "@CPACK_NSIS_MODIFY_PATH@" "ON" 0 doNotAddToPath
-  StrCmp $DO_NOT_ADD_TO_PATH "1" doNotAddToPath 0  
-    Call AddToPath
-  doNotAddToPath:
-SectionEnd
-
-;--------------------------------
-; Create custom pages
-Function InstallOptionsPage
-  !insertmacro MUI_HEADER_TEXT "Install Options" "Choose options for installing @CPACK_NSIS_PACKAGE_NAME@"
-  !insertmacro MUI_INSTALLOPTIONS_DISPLAY "NSIS.InstallOptions.ini"
-
-FunctionEnd
-
-;--------------------------------
-; determine admin versus local install
-Function un.onInit
-
-  ClearErrors
-  UserInfo::GetName
-  IfErrors noLM
-  Pop $0
-  UserInfo::GetAccountType
-  Pop $1
-  StrCmp $1 "Admin" 0 +3
-    SetShellVarContext all
-    ;MessageBox MB_OK 'User "$0" is in the Admin group'
-    Goto done
-  StrCmp $1 "Power" 0 +3
-    SetShellVarContext all
-    ;MessageBox MB_OK 'User "$0" is in the Power Users group'
-    Goto done
-    
-  noLM:
-    ;Get installation folder from registry if available
-
-  done:
-
-  ;Disable WoW64 redirection
-  SetRegView 64
-    
-FunctionEnd
-
-;--- Add/Remove callback functions: ---
-!macro SectionList MacroName
-  ;This macro used to perform operation on multiple sections.
-  ;List all of your components in following manner here.
-@CPACK_NSIS_COMPONENT_SECTION_LIST@
-!macroend
- 
-Section -FinishComponents
-  ;Removes unselected components and writes component status to registry
-  !insertmacro SectionList "FinishSection"
-  
-!ifdef CPACK_NSIS_ADD_REMOVE  
-  ; Get the name of the installer executable
-  System::Call 'kernel32::GetModuleFileNameA(i 0, t .R0, i 1024) i r1'
-  StrCpy $R3 $R0
-  
-  ; Strip off the last 13 characters, to see if we have AddRemove.exe
-  StrLen $R1 $R0
-  IntOp $R1 $R0 - 13
-  StrCpy $R2 $R0 13 $R1
-  StrCmp $R2 "AddRemove.exe" addremove_installed
-  
-  ; We're not running AddRemove.exe, so install it
-  CopyFiles $R3 $INSTDIR\AddRemove.exe
-  
-  addremove_installed:
-!endif
-SectionEnd
-;--- End of Add/Remove callback functions ---
-
-;--------------------------------
-; Component dependencies
-Function .onSelChange
-  !insertmacro SectionList MaybeSelectionChanged
-FunctionEnd
-
-;--------------------------------
-;Uninstaller Section
-
-Section "Uninstall"
-  ReadRegStr $START_MENU SHCTX \
-   "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_NAME@ (x64)" "StartMenu"
-  ;MessageBox MB_OK "Start menu is in: $START_MENU"
-  ReadRegStr $DO_NOT_ADD_TO_PATH SHCTX \
-    "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_NAME@ (x64)" "DoNotAddToPath"
-  ReadRegStr $ADD_TO_PATH_ALL_USERS SHCTX \
-    "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_NAME@ (x64)" "AddToPathAllUsers"
-  ReadRegStr $ADD_TO_PATH_CURRENT_USER SHCTX \
-    "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_NAME@ (x64)" "AddToPathCurrentUser"
-  ;MessageBox MB_OK "Add to path: $DO_NOT_ADD_TO_PATH all users: $ADD_TO_PATH_ALL_USERS"
-  ReadRegStr $INSTALL_DESKTOP SHCTX \
-    "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_NAME@ (x64)" "InstallToDesktop"
-  ;MessageBox MB_OK "Install to desktop: $INSTALL_DESKTOP "
-
-@CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS@
-
-  ;Remove files we installed.
-  ;Keep the list of directories here in sync with the File commands above.
-@CPACK_NSIS_DELETE_FILES@
-@CPACK_NSIS_DELETE_DIRECTORIES@
-
-!ifdef CPACK_NSIS_ADD_REMOVE  
-  ;Remove the add/remove program
-  Delete "$INSTDIR\AddRemove.exe"
-!endif
-
-  ;Remove the uninstaller itself.
-  Delete "$INSTDIR\Uninstall.exe"
-  DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_NAME@ (x64)"
-
-  ;Remove the installation directory if it is empty.
-  RMDir "$INSTDIR"
-
-  ; Remove the registry entries.
-  DeleteRegKey SHCTX "Software\@CPACK_PACKAGE_VENDOR@\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@"
-
-  ; Removes all optional components
-  !insertmacro SectionList "RemoveSection"
-  
-  !insertmacro MUI_STARTMENU_GETFOLDER Application $MUI_TEMP
-    
-  Delete "$SMPROGRAMS\$MUI_TEMP\Uninstall.lnk"
-@CPACK_NSIS_DELETE_ICONS@
-@CPACK_NSIS_DELETE_ICONS_EXTRA@
-  
-  ;Delete empty start menu parent directories
-  StrCpy $MUI_TEMP "$SMPROGRAMS\$MUI_TEMP"
- 
-  startMenuDeleteLoop:
-    ClearErrors
-    RMDir $MUI_TEMP
-    GetFullPathName $MUI_TEMP "$MUI_TEMP\.."
-    
-    IfErrors startMenuDeleteLoopDone
-  
-    StrCmp "$MUI_TEMP" "$SMPROGRAMS" startMenuDeleteLoopDone startMenuDeleteLoop
-  startMenuDeleteLoopDone:
-
-  ; If the user changed the shortcut, then untinstall may not work. This should
-  ; try to fix it.
-  StrCpy $MUI_TEMP "$START_MENU"
-  Delete "$SMPROGRAMS\$MUI_TEMP\Uninstall.lnk"
-@CPACK_NSIS_DELETE_ICONS_EXTRA@
-  
-  ;Delete empty start menu parent directories
-  StrCpy $MUI_TEMP "$SMPROGRAMS\$MUI_TEMP"
- 
-  secondStartMenuDeleteLoop:
-    ClearErrors
-    RMDir $MUI_TEMP
-    GetFullPathName $MUI_TEMP "$MUI_TEMP\.."
-    
-    IfErrors secondStartMenuDeleteLoopDone
-  
-    StrCmp "$MUI_TEMP" "$SMPROGRAMS" secondStartMenuDeleteLoopDone secondStartMenuDeleteLoop
-  secondStartMenuDeleteLoopDone:
-
-  DeleteRegKey /ifempty SHCTX "Software\@CPACK_PACKAGE_VENDOR@\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@"
-
-  Push $INSTDIR\bin
-  StrCmp $DO_NOT_ADD_TO_PATH_ "1" doNotRemoveFromPath 0
-    Call un.RemoveFromPath
-  doNotRemoveFromPath:
-SectionEnd
-
-;--------------------------------
-; determine admin versus local install
-; Is install for "AllUsers" or "JustMe"?
-; Default to "JustMe" - set to "AllUsers" if admin or on Win9x
-; This function is used for the very first "custom page" of the installer.
-; This custom page does not show up visibly, but it executes prior to the
-; first visible page and sets up $INSTDIR properly...
-; Choose different default installation folder based on SV_ALLUSERS...
-; "Program Files" for AllUsers, "My Documents" for JustMe...
-
-Function .onInit
-  ; Reads components status for registry
-  !insertmacro SectionList "InitSection"
-
-  ; check to see if /D has been used to change 
-  ; the install directory by comparing it to the 
-  ; install directory that is expected to be the
-  ; default
-  StrCpy $IS_DEFAULT_INSTALLDIR 0
-  ;StrCmp "$INSTDIR" "$PROGRAMFILES\@CPACK_PACKAGE_INSTALL_DIRECTORY@" 0 +2
-  StrCmp "$INSTDIR" "$PROGRAMFILES64\@CPACK_PACKAGE_INSTALL_DIRECTORY@" 0 +2
-    StrCpy $IS_DEFAULT_INSTALLDIR 1
-  
-  StrCpy $SV_ALLUSERS "JustMe"
-  ; if default install dir then change the default
-  ; if it is installed for JustMe
-  StrCmp "$IS_DEFAULT_INSTALLDIR" "1" 0 +2
-    StrCpy $INSTDIR "$DOCUMENTS\@CPACK_PACKAGE_INSTALL_DIRECTORY@"
-
-  ;Disable WoW64 redirection
-  SetRegView 64
-
-  ClearErrors
-  UserInfo::GetName
-  IfErrors noLM
-  Pop $0
-  UserInfo::GetAccountType
-  Pop $1
-  StrCmp $1 "Admin" 0 +3
-    SetShellVarContext all
-    ;MessageBox MB_OK 'User "$0" is in the Admin group'
-    StrCpy $SV_ALLUSERS "AllUsers"
-    Goto done
-  StrCmp $1 "Power" 0 +3
-    SetShellVarContext all
-    ;MessageBox MB_OK 'User "$0" is in the Power Users group'
-    StrCpy $SV_ALLUSERS "AllUsers"
-    Goto done
-    
-  noLM:
-    StrCpy $SV_ALLUSERS "AllUsers"
-    ;Get installation folder from registry if available
-
-  done:
-  StrCmp $SV_ALLUSERS "AllUsers" 0 +3
-    StrCmp "$IS_DEFAULT_INSTALLDIR" "1" 0 +2
-      ;StrCpy $INSTDIR "$PROGRAMFILES\@CPACK_PACKAGE_INSTALL_DIRECTORY@"
-      StrCpy $INSTDIR "$PROGRAMFILES64\@CPACK_PACKAGE_INSTALL_DIRECTORY@"
-
-  StrCmp "@CPACK_NSIS_MODIFY_PATH@" "ON" 0 noOptionsPage
-    !insertmacro MUI_INSTALLOPTIONS_EXTRACT "NSIS.InstallOptions.ini"
-
-  noOptionsPage:
-FunctionEnd
diff --git a/libs/libzmq/builds/cmake/ZeroMQConfig.cmake.in b/libs/libzmq/builds/cmake/ZeroMQConfig.cmake.in
deleted file mode 100644
index 3f16e59..0000000
--- a/libs/libzmq/builds/cmake/ZeroMQConfig.cmake.in
+++ /dev/null
@@ -1,34 +0,0 @@
-# ZeroMQ cmake module
-#
-# The following import targets are created
-#
-# ::
-#
-#   libzmq-static
-#   libzmq
-#
-# This module sets the following variables in your project::
-#
-#   ZeroMQ_FOUND - true if ZeroMQ found on the system
-#   ZeroMQ_INCLUDE_DIR - the directory containing ZeroMQ headers
-#   ZeroMQ_LIBRARY - 
-#   ZeroMQ_STATIC_LIBRARY
-
-@PACKAGE_INIT@
-
-if(NOT TARGET libzmq AND NOT TARGET libzmq-static)
-  include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake")
-
-  if (TARGET libzmq)
-    get_target_property(@PROJECT_NAME@_INCLUDE_DIR libzmq INTERFACE_INCLUDE_DIRECTORIES)
-  else ()
-    get_target_property(@PROJECT_NAME@_INCLUDE_DIR libzmq-static INTERFACE_INCLUDE_DIRECTORIES)
-  endif()
-
-  if (TARGET libzmq)
-    get_target_property(@PROJECT_NAME@_LIBRARY libzmq LOCATION)
-  endif()
-  if (TARGET libzmq-static)
-    get_target_property(@PROJECT_NAME@_STATIC_LIBRARY libzmq-static LOCATION)
-  endif()
-endif()
diff --git a/libs/libzmq/builds/cmake/ci_build.sh b/libs/libzmq/builds/cmake/ci_build.sh
deleted file mode 100755
index 9a0ceb6..0000000
--- a/libs/libzmq/builds/cmake/ci_build.sh
+++ /dev/null
@@ -1,121 +0,0 @@
-#!/usr/bin/env bash
-
-set -x -e
-
-cd ../..
-
-# always install custom builds from dist
-# to make sure that `make dist` doesn't omit any files required to build & test
-if [ -z "$DO_CLANG_FORMAT_CHECK" -a -z "$CLANG_TIDY" ]; then
-    ./autogen.sh
-    ./configure
-    make -j5 dist-gzip
-    V=$(./version.sh)
-    tar -xzf zeromq-$V.tar.gz
-    cd zeromq-$V
-fi
-
-mkdir tmp || true
-BUILD_PREFIX=$PWD/tmp
-
-CONFIG_OPTS=()
-CONFIG_OPTS+=("CFLAGS=-I${BUILD_PREFIX}/include")
-CONFIG_OPTS+=("CPPFLAGS=-I${BUILD_PREFIX}/include")
-CONFIG_OPTS+=("CXXFLAGS=-I${BUILD_PREFIX}/include")
-CONFIG_OPTS+=("LDFLAGS=-L${BUILD_PREFIX}/lib")
-CONFIG_OPTS+=("PKG_CONFIG_PATH=${BUILD_PREFIX}/lib/pkgconfig")
-
-CMAKE_OPTS=()
-CMAKE_OPTS+=("-DCMAKE_INSTALL_PREFIX:PATH=${BUILD_PREFIX}")
-CMAKE_OPTS+=("-DCMAKE_PREFIX_PATH:PATH=${BUILD_PREFIX}")
-CMAKE_OPTS+=("-DCMAKE_LIBRARY_PATH:PATH=${BUILD_PREFIX}/lib")
-CMAKE_OPTS+=("-DCMAKE_INCLUDE_PATH:PATH=${BUILD_PREFIX}/include")
-CMAKE_OPTS+=("-DENABLE_CAPSH=ON")
-CMAKE_OPTS+=("-DBUILD_TESTS=ON")
-
-if [ "$CLANG_FORMAT" != "" ] ; then
-    CMAKE_OPTS+=("-DCLANG_FORMAT=${CLANG_FORMAT}")
-fi
-
-if [ -z $CURVE ]; then
-    CMAKE_OPTS+=("-DENABLE_CURVE=OFF")
-elif [ $CURVE == "libsodium" ]; then
-    CMAKE_OPTS+=("-DWITH_LIBSODIUM=ON")
-
-    if ! ((command -v dpkg-query >/dev/null 2>&1 && dpkg-query --list libsodium-dev >/dev/null 2>&1) || \
-            (command -v brew >/dev/null 2>&1 && brew ls --versions libsodium >/dev/null 2>&1)); then
-        git clone --depth 1 -b stable https://github.com/jedisct1/libsodium.git
-        ( cd libsodium; ./autogen.sh; ./configure --prefix=$BUILD_PREFIX; make install)
-    fi
-fi
-
-CMAKE_PREFIXES=()
-MAKE_PREFIXES=()
-PARALLEL_MAKE_OPT="-j5"
-if [ -n "$CLANG_TIDY" ] ; then
-    # To allow sonar to process history information, unshallow clone first.
-    git fetch --unshallow
-    curl -L https://sonarcloud.io/static/cpp/build-wrapper-linux-x86.zip -o build-wrapper-linux-x86.zip
-    unzip build-wrapper-linux-x86.zip
-    export SONARCLOUD_BUILD_WRAPPER_PATH="${PWD}/build-wrapper-linux-x86/"
-    curl -L https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-4.2.0.1873-linux.zip -o sonar-scanner-cli.zip
-    unzip sonar-scanner-cli.zip
-    export SONAR_SCANNER_CLI_PATH="${PWD}/sonar-scanner-4.2.0.1873-linux/bin/"
-
-    CMAKE_OPTS+=("-DCMAKE_BUILD_TYPE=Debug") # do a debug build to avoid unused variable warnings with assertions, and to speed up build
-    CMAKE_OPTS+=("-DCMAKE_CXX_CLANG_TIDY:STRING=${CLANG_TIDY}")
-    if [ -n ${SONARCLOUD_BUILD_WRAPPER_PATH} ] ; then
-        MAKE_PREFIXES+=("${SONARCLOUD_BUILD_WRAPPER_PATH}build-wrapper-linux-x86-64")
-        MAKE_PREFIXES+=("--out-dir")
-        MAKE_PREFIXES+=("${TRAVIS_BUILD_DIR}/bw-output")
-        
-    fi
-    CMAKE_PREFIXES+=("scan-build-10")
-    MAKE_PREFIXES+=("scan-build-10")
-    MAKE_PREFIXES+=("-plist-html")
-    SCAN_BUILD_OUTPUT="$(pwd)/scan-build-report"
-    MAKE_PREFIXES+=("-o ${SCAN_BUILD_OUTPUT}")
-    # TODO this does not work with sonarcloud.io as it misses the sonar-cxx plugin
-    #MAKE_PREFIXES+=("-plist")
-    IFS="/" read -ra GITHUB_USER <<< "${TRAVIS_REPO_SLUG}"
-    PARALLEL_MAKE_OPT=""
-fi
-
-# Build, check, and install from local source
-mkdir build_cmake
-cd build_cmake
-if [ "$DO_CLANG_FORMAT_CHECK" = "1" ] ; then
-    if ! ( PKG_CONFIG_PATH=${BUILD_PREFIX}/lib/pkgconfig cmake "${CMAKE_OPTS[@]}" .. && make clang-format-check) ; then
-        make clang-format-diff
-        exit 1
-    fi
-else
-    if [ -n "$CLANG_TIDY" ] ; then
-        ${CLANG_TIDY} -explain-config
-    fi
-
-    export CTEST_OUTPUT_ON_FAILURE=1
-    PKG_CONFIG_PATH=${BUILD_PREFIX}/lib/pkgconfig ${CMAKE_PREFIXES[@]} cmake "${CMAKE_OPTS[@]}" ..
-    ${MAKE_PREFIXES[@]} make ${PARALLEL_MAKE_OPT} all VERBOSE=1 | tee clang-tidy-report
-    
-    if [ -n "${SONAR_SCANNER_CLI_PATH}" ] ; then
-        find ${SCAN_BUILD_OUTPUT} || echo "WARNING: ${SCAN_BUILD_OUTPUT} does not exist"
-    
-        ${SONAR_SCANNER_CLI_PATH}sonar-scanner \
-            -Dsonar.projectKey=${GITHUB_USER}-libzmq \
-            -Dsonar.organization=${GITHUB_USER}-github \
-            -Dsonar.projectBaseDir=.. \
-            -Dsonar.sources=${TRAVIS_BUILD_DIR}/include,${TRAVIS_BUILD_DIR}/src,${TRAVIS_BUILD_DIR}/tests,${TRAVIS_BUILD_DIR}/unittests \
-            -Dsonar.cfamily.build-wrapper-output=${TRAVIS_BUILD_DIR}/bw-output \
-            -Dsonar.host.url=https://sonarcloud.io \
-            -Dsonar.login=${SONARQUBE_TOKEN}
-
-            # TODO this does not work with sonarcloud.io as it misses the sonar-cxx plugin
-            # -Dsonar.cxx.clangtidy.reportPath=clang-tidy-report \
-            # -Dsonar.cxx.clangsa.reportPath=*.plist \
-            
-    fi
-
-    make install
-    make ${PARALLEL_MAKE_OPT} test ARGS="-V"
-fi
diff --git a/libs/libzmq/builds/cmake/clang-format-check.sh.in b/libs/libzmq/builds/cmake/clang-format-check.sh.in
deleted file mode 100644
index 7ff4019..0000000
--- a/libs/libzmq/builds/cmake/clang-format-check.sh.in
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-FAILED=0
-IFS=";"
-FILES="@ALL_SOURCE_FILES@"
-IDS=$(echo -en "\n\b")
-for FILE in $FILES
-do
-	@CLANG_FORMAT@ -style=file -output-replacements-xml "$FILE" | grep "<replacement " >/dev/null &&
-    {
-      echo "$FILE is not correctly formatted"
-	  FAILED=1
-	}
-done
-if [ "$FAILED" -eq "1" ] ; then exit 1 ; fi
diff --git a/libs/libzmq/builds/cmake/platform.hpp.in b/libs/libzmq/builds/cmake/platform.hpp.in
deleted file mode 100644
index f2edff8..0000000
--- a/libs/libzmq/builds/cmake/platform.hpp.in
+++ /dev/null
@@ -1,144 +0,0 @@
-#ifndef __ZMQ_PLATFORM_HPP_INCLUDED__
-#define __ZMQ_PLATFORM_HPP_INCLUDED__
-
-#cmakedefine ZMQ_USE_CV_IMPL_STL11
-#cmakedefine ZMQ_USE_CV_IMPL_WIN32API
-#cmakedefine ZMQ_USE_CV_IMPL_PTHREADS
-#cmakedefine ZMQ_USE_CV_IMPL_NONE
-
-#cmakedefine ZMQ_IOTHREAD_POLLER_USE_KQUEUE
-#cmakedefine ZMQ_IOTHREAD_POLLER_USE_EPOLL
-#cmakedefine ZMQ_IOTHREAD_POLLER_USE_EPOLL_CLOEXEC
-#cmakedefine ZMQ_IOTHREAD_POLLER_USE_DEVPOLL
-#cmakedefine ZMQ_IOTHREAD_POLLER_USE_POLL
-#cmakedefine ZMQ_IOTHREAD_POLLER_USE_SELECT
-#cmakedefine ZMQ_HAVE_PPOLL
-
-#cmakedefine ZMQ_POLL_BASED_ON_SELECT
-#cmakedefine ZMQ_POLL_BASED_ON_POLL
-
-#cmakedefine HAVE_POSIX_MEMALIGN @HAVE_POSIX_MEMALIGN@
-#cmakedefine ZMQ_CACHELINE_SIZE @ZMQ_CACHELINE_SIZE@
-
-#cmakedefine ZMQ_FORCE_MUTEXES
-
-#cmakedefine HAVE_FORK
-#cmakedefine HAVE_CLOCK_GETTIME
-#cmakedefine HAVE_GETHRTIME
-#cmakedefine HAVE_MKDTEMP
-#cmakedefine ZMQ_HAVE_UIO
-
-#cmakedefine ZMQ_HAVE_NOEXCEPT
-
-#cmakedefine ZMQ_HAVE_EVENTFD
-#cmakedefine ZMQ_HAVE_EVENTFD_CLOEXEC
-#cmakedefine ZMQ_HAVE_IFADDRS
-#cmakedefine ZMQ_HAVE_SO_BINDTODEVICE
-
-#cmakedefine ZMQ_HAVE_SO_PEERCRED
-#cmakedefine ZMQ_HAVE_LOCAL_PEERCRED
-#cmakedefine ZMQ_HAVE_BUSY_POLL
-
-#cmakedefine ZMQ_HAVE_O_CLOEXEC
-
-#cmakedefine ZMQ_HAVE_SOCK_CLOEXEC
-#cmakedefine ZMQ_HAVE_SO_KEEPALIVE
-#cmakedefine ZMQ_HAVE_SO_PRIORITY
-#cmakedefine ZMQ_HAVE_TCP_KEEPCNT
-#cmakedefine ZMQ_HAVE_TCP_KEEPIDLE
-#cmakedefine ZMQ_HAVE_TCP_KEEPINTVL
-#cmakedefine ZMQ_HAVE_TCP_KEEPALIVE
-#cmakedefine ZMQ_HAVE_PTHREAD_SETNAME_1
-#cmakedefine ZMQ_HAVE_PTHREAD_SETNAME_2
-#cmakedefine ZMQ_HAVE_PTHREAD_SETNAME_3
-#cmakedefine ZMQ_HAVE_PTHREAD_SET_NAME
-#cmakedefine ZMQ_HAVE_PTHREAD_SET_AFFINITY
-#cmakedefine HAVE_ACCEPT4
-#cmakedefine HAVE_STRNLEN
-#cmakedefine ZMQ_HAVE_STRLCPY
-#cmakedefine ZMQ_HAVE_LIBBSD
-
-#cmakedefine ZMQ_HAVE_IPC
-#cmakedefine ZMQ_HAVE_STRUCT_SOCKADDR_UN
-
-#cmakedefine ZMQ_USE_BUILTIN_SHA1
-#cmakedefine ZMQ_USE_NSS
-#cmakedefine ZMQ_HAVE_WS
-#cmakedefine ZMQ_HAVE_WSS
-#cmakedefine ZMQ_HAVE_TIPC
-
-#cmakedefine ZMQ_HAVE_OPENPGM
-#cmakedefine ZMQ_HAVE_NORM
-#cmakedefine ZMQ_MAKE_VALGRIND_HAPPY
-
-#cmakedefine ZMQ_HAVE_CURVE
-#cmakedefine ZMQ_USE_TWEETNACL
-#cmakedefine ZMQ_USE_LIBSODIUM
-#cmakedefine SODIUM_STATIC
-#cmakedefine ZMQ_USE_GNUTLS
-#cmakedefine ZMQ_USE_RADIX_TREE
-#cmakedefine HAVE_IF_NAMETOINDEX
-
-#ifdef _AIX
-  #define ZMQ_HAVE_AIX
-#endif
-
-#if defined __ANDROID__
-  #define ZMQ_HAVE_ANDROID
-#endif
-
-#if defined __CYGWIN__
-  #define ZMQ_HAVE_CYGWIN
-#endif
-
-#if defined __MINGW32__
-  #define ZMQ_HAVE_MINGW32
-#endif
-
-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-  #define ZMQ_HAVE_FREEBSD
-#endif
-
-#if defined(__DragonFly__)
-  #define ZMQ_HAVE_FREEBSD
-  #define ZMQ_HAVE_DRAGONFLY
-#endif
-
-#if defined __hpux
-  #define ZMQ_HAVE_HPUX
-#endif
-
-#if defined __linux__
-  #define ZMQ_HAVE_LINUX
-#endif
-
-#if defined __NetBSD__
-  #define ZMQ_HAVE_NETBSD
-#endif
-
-#if defined __OpenBSD__
-  #define ZMQ_HAVE_OPENBSD
-#endif
-
-// TODO better move OS-specific defines to the automake files, and check for availability of IPC with an explicit test there
-#if defined __VMS
-  #define ZMQ_HAVE_OPENVMS
-  #undef ZMQ_HAVE_IPC
-#endif
-
-#if defined __APPLE__
-  #define ZMQ_HAVE_OSX
-#endif
-
-#if defined __QNXNTO__
-  #define ZMQ_HAVE_QNXNTO
-#endif
-
-#if defined(sun) || defined(__sun)
-  #define ZMQ_HAVE_SOLARIS
-#endif
-
-#cmakedefine ZMQ_HAVE_WINDOWS
-#cmakedefine ZMQ_HAVE_WINDOWS_UWP
-
-#endif
diff --git a/libs/libzmq/builds/coverage/ci_build.sh b/libs/libzmq/builds/coverage/ci_build.sh
deleted file mode 100755
index 39a0457..0000000
--- a/libs/libzmq/builds/coverage/ci_build.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env bash
-
-set -x
-
-mkdir tmp
-BUILD_PREFIX=$PWD/tmp
-
-source ../../config.sh
-set_config_opts
-
-CONFIG_OPTS+=("--enable-code-coverage")
-
-# Build, check, and install from local source
-( cd ../..; ./autogen.sh && ./configure "${CONFIG_OPTS[@]}" && make VERBOSE=1 -j5 check-code-coverage CODE_COVERAGE_OUTPUT_FILE=lcov.info CODE_COVERAGE_OUTPUT_DIRECTORY=coverage) || exit 1
diff --git a/libs/libzmq/builds/cygwin/Makefile.cygwin b/libs/libzmq/builds/cygwin/Makefile.cygwin
deleted file mode 100755
index 11830ce..0000000
--- a/libs/libzmq/builds/cygwin/Makefile.cygwin
+++ /dev/null
@@ -1,48 +0,0 @@
-CC=gcc
-CFLAGS=-Wall -Os -g -DDLL_EXPORT -DFD_SETSIZE=16384 -DZMQ_USE_SELECT -I.
-LIBS=-lws2_32
-
-OBJS = ctx.o reaper.o dist.o err.o \
-	clock.o metadata.o random.o \
-	object.o own.o \
-	io_object.o io_thread.o \
-	lb.o fq.o \
-	address.o tcp_address.o ipc_address.o \
-	ipc_connecter.o ipc_listener.o \
-	tcp_connecter.o tcp_listener.o \
-	mailbox.o msg.o mtrie.o \
-	pipe.o precompiled.o proxy.o \
-	signaler.o stream_engine.o \
-	thread.o trie.o \
-	ip.o tcp.o \
-	pgm_socket.o pgm_receiver.o pgm_sender.o \
-	raw_decoder.o raw_encoder.o \
-	v1_decoder.o v1_encoder.o v2_decoder.o v2_encoder.o \
-        udp_address.o upd_engine.o radio.o dish.o \
-	socket_base.o session_base.o options.o \
-	req.o rep.o push.o pull.o pub.o sub.o pair.o \
-	dealer.o router.o xpub.o xsub.o stream.o \
-	poller_base.o select.o poll.o epoll.o kqueue.o devpoll.o \
-	curve_client.o curve_server.o \
-	mechanism.o null_mechanism.o plain_client.o plain_server.o \
-	zmq.o zmq_utils.o
-
-%.o: ../../src/%.cpp
-	$(CC) -c -o $@ $< $(CFLAGS)
-
-%.o: ../../perf/%.cpp
-	$(CC) -c -o $@ $< $(CFLAGS)
-
-all: libzmq.dll
-
-perf: inproc_lat.exe inproc_thr.exe local_lat.exe local_thr.exe remote_lat.exe remote_thr.exe
-
-libzmq.dll: $(OBJS)
-	g++ -shared -o $@ $^ -Wl,--out-implib,-Wl,--export-all-symbols -Wl,--enable-auto-import -Wl,--whole-archive $@.a -Wl,--no-whole-archive $(LIBS)
-
-%.exe: %.o libzmq.dll
-	g++ -o $@ $^
-
-clean:
-	del *.o *.a *.dll *.exe
-	
diff --git a/libs/libzmq/builds/deprecated-msvc/.gitignore b/libs/libzmq/builds/deprecated-msvc/.gitignore
deleted file mode 100644
index 8070544..0000000
--- a/libs/libzmq/builds/deprecated-msvc/.gitignore
+++ /dev/null
@@ -1,256 +0,0 @@
-## Visual Studio 2015 experimental Visual C/C++ Intellisense database
-*.VC.db
-
-
-## From https://github.com/github/gitignore
-##
-## Ignore Visual Studio temporary files, build results, and
-## files generated by popular Visual Studio add-ons.
-
-# User-specific files
-*.suo
-*.user
-*.userosscache
-*.sln.docstates
-
-# User-specific files (MonoDevelop/Xamarin Studio)
-*.userprefs
-
-# Build results
-[Dd]ebug/
-[Dd]ebugPublic/
-[Rr]elease/
-[Rr]eleases/
-x64/
-x86/
-bld/
-[Bb]in/
-[Oo]bj/
-[Ll]og/
-
-# Visual Studio 2015 cache/options directory
-.vs/
-# Uncomment if you have tasks that create the project's static files in wwwroot
-#wwwroot/
-
-# MSTest test Results
-[Tt]est[Rr]esult*/
-[Bb]uild[Ll]og.*
-
-# NUNIT
-*.VisualState.xml
-TestResult.xml
-
-# Build Results of an ATL Project
-[Dd]ebugPS/
-[Rr]eleasePS/
-dlldata.c
-
-# DNX
-project.lock.json
-artifacts/
-
-*_i.c
-*_p.c
-*_i.h
-*.ilk
-*.meta
-*.obj
-*.pch
-*.pdb
-*.pgc
-*.pgd
-*.rsp
-*.sbr
-*.tlb
-*.tli
-*.tlh
-*.tmp
-*.tmp_proj
-*.log
-*.vspscc
-*.vssscc
-.builds
-*.pidb
-*.svclog
-*.scc
-
-# Chutzpah Test files
-_Chutzpah*
-
-# Visual C++ cache files
-ipch/
-*.aps
-*.ncb
-*.opendb
-*.opensdf
-*.sdf
-*.cachefile
-
-# Visual Studio profiler
-*.psess
-*.vsp
-*.vspx
-*.sap
-
-# TFS 2012 Local Workspace
-$tf/
-
-# Guidance Automation Toolkit
-*.gpState
-
-# ReSharper is a .NET coding add-in
-_ReSharper*/
-*.[Rr]e[Ss]harper
-*.DotSettings.user
-
-# JustCode is a .NET coding add-in
-.JustCode
-
-# TeamCity is a build add-in
-_TeamCity*
-
-# DotCover is a Code Coverage Tool
-*.dotCover
-
-# NCrunch
-_NCrunch_*
-.*crunch*.local.xml
-nCrunchTemp_*
-
-# MightyMoose
-*.mm.*
-AutoTest.Net/
-
-# Web workbench (sass)
-.sass-cache/
-
-# Installshield output folder
-[Ee]xpress/
-
-# DocProject is a documentation generator add-in
-DocProject/buildhelp/
-DocProject/Help/*.HxT
-DocProject/Help/*.HxC
-DocProject/Help/*.hhc
-DocProject/Help/*.hhk
-DocProject/Help/*.hhp
-DocProject/Help/Html2
-DocProject/Help/html
-
-# Click-Once directory
-publish/
-
-# Publish Web Output
-*.[Pp]ublish.xml
-*.azurePubxml
-# TODO: Comment the next line if you want to checkin your web deploy settings
-# but database connection strings (with potential passwords) will be unencrypted
-*.pubxml
-*.publishproj
-
-# Microsoft Azure Web App publish settings. Comment the next line if you want to
-# checkin your Azure Web App publish settings, but sensitive information contained
-# in these scripts will be unencrypted
-PublishScripts/
-
-# NuGet Packages
-*.nupkg
-# The packages folder can be ignored because of Package Restore
-**/packages/*
-# except build/, which is used as an MSBuild target.
-!**/packages/build/
-# Uncomment if necessary however generally it will be regenerated when needed
-#!**/packages/repositories.config
-# NuGet v3's project.json files produces more ignoreable files
-*.nuget.props
-*.nuget.targets
-
-# Microsoft Azure Build Output
-csx/
-*.build.csdef
-
-# Microsoft Azure Emulator
-ecf/
-rcf/
-
-# Windows Store app package directories and files
-AppPackages/
-BundleArtifacts/
-Package.StoreAssociation.xml
-_pkginfo.txt
-
-# Visual Studio cache files
-# files ending in .cache can be ignored
-*.[Cc]ache
-# but keep track of directories ending in .cache
-!*.[Cc]ache/
-
-# Others
-ClientBin/
-~$*
-*~
-*.dbmdl
-*.dbproj.schemaview
-*.pfx
-*.publishsettings
-node_modules/
-orleans.codegen.cs
-
-# Since there are multiple workflows, uncomment next line to ignore bower_components
-# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
-#bower_components/
-
-# RIA/Silverlight projects
-Generated_Code/
-
-# Backup & report files from converting an old project file
-# to a newer Visual Studio version. Backup files are not needed,
-# because we have git ;-)
-_UpgradeReport_Files/
-Backup*/
-UpgradeLog*.XML
-UpgradeLog*.htm
-
-# SQL Server files
-*.mdf
-*.ldf
-
-# Business Intelligence projects
-*.rdl.data
-*.bim.layout
-*.bim_*.settings
-
-# Microsoft Fakes
-FakesAssemblies/
-
-# GhostDoc plugin setting file
-*.GhostDoc.xml
-
-# Node.js Tools for Visual Studio
-.ntvs_analysis.dat
-
-# Visual Studio 6 build log
-*.plg
-
-# Visual Studio 6 workspace options file
-*.opt
-
-# Visual Studio LightSwitch build output
-**/*.HTMLClient/GeneratedArtifacts
-**/*.DesktopClient/GeneratedArtifacts
-**/*.DesktopClient/ModelManifest.xml
-**/*.Server/GeneratedArtifacts
-**/*.Server/ModelManifest.xml
-_Pvt_Extensions
-
-# Paket dependency manager
-.paket/paket.exe
-paket-files/
-
-# FAKE - F# Make
-.fake/
-
-# JetBrains Rider
-.idea/
-*.sln.iml
diff --git a/libs/libzmq/builds/deprecated-msvc/Makefile.am b/libs/libzmq/builds/deprecated-msvc/Makefile.am
deleted file mode 100644
index d360104..0000000
--- a/libs/libzmq/builds/deprecated-msvc/Makefile.am
+++ /dev/null
@@ -1,94 +0,0 @@
-LIBZMQ_DIST = vs2008/libzmq.sln \
-              vs2008/libzmq/libzmq.vcproj \
-              vs2010/libzmq.sln \
-              vs2010/libzmq/libzmq.vcxproj \
-              vs2010/libzmq/libzmq.vcxproj.filters \
-              vs2012/libzmq.sln \
-              vs2012/libzmq/libzmq.vcxproj \
-              vs2012/libzmq/libzmq.vcxproj.filters \
-              vs2013/libzmq.sln \
-              vs2013/libzmq/libzmq.vcxproj \
-              vs2013/libzmq/libzmq.vcxproj.filters \
-              vs2015/libzmq.sln \
-              vs2015/libzmq/libzmq.vcxproj \
-              vs2015/libzmq/libzmq.vcxproj.filters \
-              vs2015/libzmq/libzmq.props \
-              vs2015/libzmq/libzmq.xml \
-              vs2015/libzmq.import.props \
-              vs2015/libzmq.import.xml \
-              errno.cpp \
-              errno.hpp \
-              platform.hpp \
-              resource.h \
-              resource.rc
-
-PERF_DIST = vs2008/local_lat/local_lat.vcproj \
-            vs2008/local_thr/local_thr.vcproj \
-            vs2008/remote_lat/remote_lat.vcproj \
-            vs2008/remote_thr/remote_thr.vcproj \
-            vs2008/inproc_lat/inproc_lat.vcproj \
-            vs2008/inproc_thr/inproc_thr.vcproj \
-            vs2010/local_lat/local_lat.vcxproj \
-            vs2010/local_thr/local_thr.vcxproj \
-            vs2010/remote_lat/remote_lat.vcxproj \
-            vs2010/remote_thr/remote_thr.vcxproj \
-            vs2010/inproc_lat/inproc_lat.vcxproj \
-            vs2010/inproc_thr/inproc_thr.vcxproj \
-            vs2012/local_lat/local_lat.vcxproj \
-            vs2012/local_thr/local_thr.vcxproj \
-            vs2012/remote_lat/remote_lat.vcxproj \
-            vs2012/remote_thr/remote_thr.vcxproj \
-            vs2012/inproc_lat/inproc_lat.vcxproj \
-            vs2012/inproc_thr/inproc_thr.vcxproj \
-            vs2013/local_lat/local_lat.vcxproj \
-            vs2013/local_thr/local_thr.vcxproj \
-            vs2013/remote_lat/remote_lat.vcxproj \
-            vs2013/remote_thr/remote_thr.vcxproj \
-            vs2013/inproc_lat/inproc_lat.vcxproj \
-            vs2013/inproc_thr/inproc_thr.vcxproj \
-            vs2015/local_lat/local_lat.vcxproj \
-            vs2015/local_lat/local_lat.props \
-            vs2015/local_thr/local_thr.vcxproj \
-            vs2015/local_thr/local_thr.props \
-            vs2015/remote_lat/remote_lat.vcxproj \
-            vs2015/remote_lat/remote_lat.props \
-            vs2015/remote_thr/remote_thr.vcxproj \
-            vs2015/remote_thr/remote_thr.props \
-            vs2015/inproc_lat/inproc_lat.vcxproj \
-            vs2015/inproc_lat/inproc_lat.props \
-            vs2015/inproc_thr/inproc_thr.vcxproj \
-            vs2015/inproc_thr/inproc_thr.props
-
-PROPERTIES_DIST = properties/Common.props \
-                  properties/Debug.props \
-                  properties/DebugDEXE.props \
-                  properties/DebugDLL.props \
-                  properties/DebugLEXE.props \
-                  properties/DebugLIB.props \
-                  properties/DebugLTCG.props \
-                  properties/DebugSEXE.props \
-                  properties/DLL.props \
-                  properties/EXE.props \
-                  properties/LIB.props \
-                  properties/Link.props \
-                  properties/LTCG.props \
-                  properties/Messages.props \
-                  properties/Output.props \
-                  properties/Release.props \
-                  properties/ReleaseDEXE.props \
-                  properties/ReleaseDLL.props \
-                  properties/ReleaseLEXE.props \
-                  properties/ReleaseLIB.props \
-                  properties/ReleaseLTCG.props \
-                  properties/ReleaseSEXE.props \
-                  properties/Win32.props \
-                  properties/x64.props
-
-PRECOMPILED_DIST = ../../src/precompiled.hpp \
-                   ../../src/precompiled.cpp
-
-BUILD_DIST = build/build.bat \
-             build/buildall.bat \
-             build/buildbase.bat
-
-EXTRA_DIST = $(LIBZMQ_DIST) $(PERF_DIST) $(PROPERTIES_DIST) $(PRECOMPILED_DIST) $(BUILD_DIST)
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/build/build.bat b/libs/libzmq/builds/deprecated-msvc/build/build.bat
deleted file mode 100644
index cdb268b..0000000
--- a/libs/libzmq/builds/deprecated-msvc/build/build.bat
+++ /dev/null
@@ -1,33 +0,0 @@
-@ECHO OFF
-:: Usage: build.bat [Clean]
-@setlocal
-
-:: validate environment
-if "%VSINSTALLDIR%" == "" @echo Error: Attempt to build without proper DevStudio environment.&@goto :done
-
-:: record starting time
-set STARTTIME=%DATE% %TIME%
-@echo Start Time: %STARTTIME%
-
-
-:: validate optional argument (and make sure it is spelled "Clean")
-set MAKECLEAN=%%1
-if NOT "%%1" == "" if /I "%%1" == "clean" set MAKECLEAN=Clean
-
-
-::
-:: uses the environment from the DevStudio CMD window to figure out which version to build
-::
-
-set VSVER=%VSINSTALLDIR:~-5,2%
-set DIRVER=%VSVER%
-if %VSVER% gtr 10 set /a DIRVER = DIRVER + 1
-
-CALL buildbase.bat ..\vs20%DIRVER%\libzmq.sln %VSVER% %MAKECLEAN%
-
-set STOPTIME=%DATE% %TIME%
-@echo Stop  Time: %STOPTIME%
-@echo Start Time: %STARTTIME%
-
-:done
-@endlocal
diff --git a/libs/libzmq/builds/deprecated-msvc/build/buildall.bat b/libs/libzmq/builds/deprecated-msvc/build/buildall.bat
deleted file mode 100644
index 3ec7fa8..0000000
--- a/libs/libzmq/builds/deprecated-msvc/build/buildall.bat
+++ /dev/null
@@ -1,16 +0,0 @@
-@ECHO OFF
-:: Usage: buildall.bat
-
-:: Build all configurations for all solutions.
-call buildbase.bat ..\vs2017\libzmq.sln 15
-ECHO.
-CALL buildbase.bat ..\vs2015\libzmq.sln 14
-ECHO.
-CALL buildbase.bat ..\vs2013\libzmq.sln 12
-ECHO.
-CALL buildbase.bat ..\vs2012\libzmq.sln 11
-ECHO.
-CALL buildbase.bat ..\vs2010\libzmq.sln 10
-ECHO.
-
-PAUSE
diff --git a/libs/libzmq/builds/deprecated-msvc/build/buildbase.bat b/libs/libzmq/builds/deprecated-msvc/build/buildbase.bat
deleted file mode 100644
index adca71e..0000000
--- a/libs/libzmq/builds/deprecated-msvc/build/buildbase.bat
+++ /dev/null
@@ -1,73 +0,0 @@
-@ECHO OFF
-@setlocal
-REM Usage: [buildbase.bat ..\vs2013\mysolution.sln 12 [Clean]]
-
-SET solution=%1
-SET version=%2
-
-:: supports passing in Clean as third argument if "make clean" behavior is desired
-SET target=%3
-SET ACTION=Building
-if NOT "%target%" == "" set target=/t:%target%&set ACTION=Cleaning
-
-SET log=build_%version%.log
-SET tools=Microsoft Visual Studio %version%.0\VC\vcvarsall.bat
-if "%version%" == "15" SET tools=Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat
-SET environment="%programfiles(x86)%\%tools%"
-IF NOT EXIST %environment% SET environment="%programfiles%\%tools%"
-IF NOT EXIST %environment% GOTO no_tools
-
-@ECHO %ACTION% %solution%
-
-SET __CURRENT_DIR__=%CD%
-CALL %environment% x86 >%SystemDrive%\nul 2>&1
-ECHO Platform=x86 2> %log%
-CD /D %__CURRENT_DIR__%
-SET __CURRENT_DIR__=
-
-
-ECHO Configuration=DynDebug
-msbuild /m /v:n /p:Configuration=DynDebug /p:Platform=Win32 %solution% %target%>> %log% || GOTO error
-ECHO Configuration=DynRelease
-msbuild /m /v:n /p:Configuration=DynRelease /p:Platform=Win32 %solution% %target%>> %log% || GOTO error
-ECHO Configuration=LtcgDebug
-msbuild /m /v:n /p:Configuration=LtcgDebug /p:Platform=Win32 %solution% %target%>> %log% || GOTO error
-ECHO Configuration=LtcgRelease
-msbuild /m /v:n /p:Configuration=LtcgRelease /p:Platform=Win32 %solution% %target%>> %log% || GOTO error
-ECHO Configuration=StaticDebug
-msbuild /m /v:n /p:Configuration=StaticDebug /p:Platform=Win32 %solution% %target%>> %log% || GOTO error
-ECHO Configuration=StaticRelease
-msbuild /m /v:n /p:Configuration=StaticRelease /p:Platform=Win32 %solution% %target%>> %log% || GOTO error
-
-SET __CURRENT_DIR__=%CD%
-CALL %environment% x86_amd64 >%SystemDrive%\nul 2>&1
-ECHO Platform=x64
-CD /D %__CURRENT_DIR__%
-SET __CURRENT_DIR__=
-
-
-ECHO Configuration=DynDebug
-msbuild /m /v:n /p:Configuration=DynDebug /p:Platform=x64 %solution% %target%>> %log% || GOTO error
-ECHO Configuration=DynRelease
-msbuild /m /v:n /p:Configuration=DynRelease /p:Platform=x64 %solution% %target%>> %log% || GOTO error
-ECHO Configuration=LtcgDebug
-msbuild /m /v:n /p:Configuration=LtcgDebug /p:Platform=x64 %solution% %target%>> %log% || GOTO error
-ECHO Configuration=LtcgRelease
-msbuild /m /v:n /p:Configuration=LtcgRelease /p:Platform=x64 %solution% %target%>> %log% || GOTO error
-ECHO Configuration=StaticDebug
-msbuild /m /v:n /p:Configuration=StaticDebug /p:Platform=x64 %solution% %target%>> %log% || GOTO error
-ECHO Configuration=StaticRelease
-msbuild /m /v:n /p:Configuration=StaticRelease /p:Platform=x64 %solution% %target%>> %log% || GOTO error
-
-ECHO %ACTION% complete: %solution%
-GOTO end
-
-:error
-ECHO *** ERROR, build terminated early, see: %log%
-GOTO end
-
-:no_tools
-ECHO *** ERROR, build tools not found: %tools%
-
-:end
-@endlocal
diff --git a/libs/libzmq/builds/deprecated-msvc/errno.cpp b/libs/libzmq/builds/deprecated-msvc/errno.cpp
deleted file mode 100644
index 81f2c71..0000000
--- a/libs/libzmq/builds/deprecated-msvc/errno.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-#if defined _WIN32_WCE
-
-//#include "..\..\include\zmq.h"
-#include "..\..\src\err.hpp"
-
-int errno;
-int _doserrno;
-int _sys_nerr;
-
-char* error_desc_buff = NULL;
-
-char* strerror(int errno)
-{
-    if (NULL != error_desc_buff)
-    {
-        LocalFree(error_desc_buff);
-        error_desc_buff = NULL;
-    }
-
-    FormatMessage(
-        FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS | FORMAT_MESSAGE_ALLOCATE_BUFFER,
-        NULL,
-        errno,
-        0,
-        (LPTSTR)&error_desc_buff,
-        1024,
-        NULL
-        );
-    return error_desc_buff;
-}
-
-#endif
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/errno.hpp b/libs/libzmq/builds/deprecated-msvc/errno.hpp
deleted file mode 100644
index 1530f27..0000000
--- a/libs/libzmq/builds/deprecated-msvc/errno.hpp
+++ /dev/null
@@ -1,56 +0,0 @@
-#ifndef ERRNO_H
-#define ERRNO_H 1
-
-//#define EPERM           1
-//#define ENOENT          2
-//#define ESRCH           3
-#define EINTR           4
-//#define EIO             5
-//#define ENXIO           6
-//#define E2BIG           7
-//#define ENOEXEC         8
-#define EBADF           9
-//#define ECHILD          10
-#define EAGAIN          11
-//#define ENOMEM          12
-#define EACCES          13
-#define EFAULT          14
-//#define EOSERR          15 // rk
-//#define EBUSY           16
-//#define EEXIST          17
-//#define EXDEV           18
-//#define ENODEV          19
-//#define ENOTDIR         20
-//#define EISDIR          21
-#define EINVAL          22
-//#define ENFILE          23
-#define EMFILE          24
-//#define ENOTTY          25
-//#define EFBIG           27
-//#define ENOSPC          28
-//#define ESPIPE          29
-//#define EROFS           30
-//#define EMLINK          31
-//#define EPIPE           32
-//#define EDOM            33
-//#define ERANGE          34
-//#define EDEADLK         36
-//#define ENOSYS          37
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-extern int errno;
-extern int _doserrno;
-extern int _sys_nerr;
-
-char* strerror(int errno);
-
-#define sys_nerr _sys_nerr
-
-#ifdef __cplusplus
-};
-#endif
-
-#endif
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/platform.hpp b/libs/libzmq/builds/deprecated-msvc/platform.hpp
deleted file mode 100644
index 964ee90..0000000
--- a/libs/libzmq/builds/deprecated-msvc/platform.hpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef __PLATFORM_HPP_INCLUDED__
-#define __PLATFORM_HPP_INCLUDED__
-
-#define ZMQ_HAVE_WINDOWS
-
-// MSVC build configuration is controlled via options exposed in the Visual
-// Studio user interface. The option to use libsodium is not exposed in the
-// user interface unless a sibling `libsodium` directory to that of this
-// repository exists and contains the following files:
-//
-// \builds\msvc\vs2015\libsodium.import.props
-// \builds\msvc\vs2015\libsodium.import.xml
-
-#endif
diff --git a/libs/libzmq/builds/deprecated-msvc/properties/Common.props b/libs/libzmq/builds/deprecated-msvc/properties/Common.props
deleted file mode 100644
index 72588d6..0000000
--- a/libs/libzmq/builds/deprecated-msvc/properties/Common.props
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  
-  <PropertyGroup>
-    <_PropertySheetDisplayName>Common Settings</_PropertySheetDisplayName>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(Platform).props" />
-  </ImportGroup>  
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <PreprocessorDefinitions>UNICODE;_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <WarningLevel>Level3</WarningLevel>
-    </ClCompile>
-  </ItemDefinitionGroup>
-
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/properties/DLL.props b/libs/libzmq/builds/deprecated-msvc/properties/DLL.props
deleted file mode 100644
index b5aa1f0..0000000
--- a/libs/libzmq/builds/deprecated-msvc/properties/DLL.props
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-    
-  <PropertyGroup>
-    <_PropertySheetDisplayName>Dynamic Library</_PropertySheetDisplayName>
-    <DefaultLinkage>dynamic</DefaultLinkage>
-    <TargetExt>.dll</TargetExt>
-  </PropertyGroup>
-  
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <PreprocessorDefinitions>_DLL;_WINDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemDefinitionGroup>
-
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/properties/Debug.props b/libs/libzmq/builds/deprecated-msvc/properties/Debug.props
deleted file mode 100644
index 6fa7419..0000000
--- a/libs/libzmq/builds/deprecated-msvc/properties/Debug.props
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  
-  <ImportGroup Label="PropertySheets">
-    <Import Project="Common.props" />
-  </ImportGroup>
-  
-  <PropertyGroup>
-    <_PropertySheetDisplayName>Debug Settings</_PropertySheetDisplayName>
-    <DebugOrRelease>Debug</DebugOrRelease>
-  </PropertyGroup>
-  
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ResourceCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>    
-  </ItemDefinitionGroup>
-  
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/properties/DebugDEXE.props b/libs/libzmq/builds/deprecated-msvc/properties/DebugDEXE.props
deleted file mode 100644
index fe8b577..0000000
--- a/libs/libzmq/builds/deprecated-msvc/properties/DebugDEXE.props
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>Console Debug Dynamic</_PropertySheetDisplayName>
-    <DefaultLinkage>dynamic</DefaultLinkage>
-  </PropertyGroup>
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="Debug.props" />
-    <Import Project="EXE.props" />
-  </ImportGroup>
-  
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <LinkIncremental>true</LinkIncremental>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/properties/DebugDLL.props b/libs/libzmq/builds/deprecated-msvc/properties/DebugDLL.props
deleted file mode 100644
index a451d0b..0000000
--- a/libs/libzmq/builds/deprecated-msvc/properties/DebugDLL.props
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>Dynamic Debug Library</_PropertySheetDisplayName>
-  </PropertyGroup>
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="Debug.props" />
-    <Import Project="DLL.props" />
-  </ImportGroup>
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <LinkIncremental>true</LinkIncremental>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/properties/DebugLEXE.props b/libs/libzmq/builds/deprecated-msvc/properties/DebugLEXE.props
deleted file mode 100644
index 7fa92c0..0000000
--- a/libs/libzmq/builds/deprecated-msvc/properties/DebugLEXE.props
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>Console Debug Link Time Code Generation</_PropertySheetDisplayName>
-  </PropertyGroup>
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="Debug.props" />
-    <Import Project="Link.props" />
-    <Import Project="EXE.props" />
-  </ImportGroup>
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-    </ClCompile>
-  </ItemDefinitionGroup>
-
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/properties/DebugLIB.props b/libs/libzmq/builds/deprecated-msvc/properties/DebugLIB.props
deleted file mode 100644
index c5f1012..0000000
--- a/libs/libzmq/builds/deprecated-msvc/properties/DebugLIB.props
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  
-  <PropertyGroup>
-    <_PropertySheetDisplayName>Static Debug Library</_PropertySheetDisplayName>
-  </PropertyGroup>
-  
-  <ImportGroup Label="PropertySheets">
-    <Import Project="Debug.props" />
-    <Import Project="LIB.props" />
-  </ImportGroup>
-  
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <DebugInformationFormat>OldStyle</DebugInformationFormat>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <LinkIncremental>true</LinkIncremental>
-    </ClCompile>
-  </ItemDefinitionGroup>
-
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/properties/DebugLTCG.props b/libs/libzmq/builds/deprecated-msvc/properties/DebugLTCG.props
deleted file mode 100644
index 42b22ff..0000000
--- a/libs/libzmq/builds/deprecated-msvc/properties/DebugLTCG.props
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  
-  <PropertyGroup>
-    <_PropertySheetDisplayName>Static Debug Link Time Code Generation Library</_PropertySheetDisplayName>
-  </PropertyGroup>
-  
-  <ImportGroup Label="PropertySheets">
-    <Import Project="Debug.props" />
-    <Import Project="LTCG.props" />
-  </ImportGroup>
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <DebugInformationFormat>OldStyle</DebugInformationFormat>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-    </ClCompile>
-  </ItemDefinitionGroup>
-
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/properties/DebugSEXE.props b/libs/libzmq/builds/deprecated-msvc/properties/DebugSEXE.props
deleted file mode 100644
index 2615ffc..0000000
--- a/libs/libzmq/builds/deprecated-msvc/properties/DebugSEXE.props
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>Console Debug Static</_PropertySheetDisplayName>
-    <DefaultLinkage>static</DefaultLinkage>
-  </PropertyGroup>
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="Debug.props" />
-    <Import Project="EXE.props" />
-  </ImportGroup>
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <LinkIncremental>true</LinkIncremental>
-    </ClCompile>
-  </ItemDefinitionGroup>
-
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/properties/EXE.props b/libs/libzmq/builds/deprecated-msvc/properties/EXE.props
deleted file mode 100644
index 3549064..0000000
--- a/libs/libzmq/builds/deprecated-msvc/properties/EXE.props
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-    
-  <PropertyGroup>
-    <_PropertySheetDisplayName>Console Application</_PropertySheetDisplayName>
-    <IsExe>true</IsExe>    
-  </PropertyGroup>
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/properties/LIB.props b/libs/libzmq/builds/deprecated-msvc/properties/LIB.props
deleted file mode 100644
index 3835777..0000000
--- a/libs/libzmq/builds/deprecated-msvc/properties/LIB.props
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  
-  <PropertyGroup>
-    <_PropertySheetDisplayName>Static Library</_PropertySheetDisplayName>
-    <DefaultLinkage>static</DefaultLinkage>
-    <TargetExt>.lib</TargetExt>
-  </PropertyGroup>
-  
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemDefinitionGroup>
-
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/properties/LTCG.props b/libs/libzmq/builds/deprecated-msvc/properties/LTCG.props
deleted file mode 100644
index 0229293..0000000
--- a/libs/libzmq/builds/deprecated-msvc/properties/LTCG.props
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>Link Time Code Generation Library</_PropertySheetDisplayName>
-  </PropertyGroup>
-  
-  <ImportGroup Label="PropertySheets">
-    <Import Project="LIB.props" />
-    <Import Project="Link.props" />
-  </ImportGroup>
-
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/properties/Link.props b/libs/libzmq/builds/deprecated-msvc/properties/Link.props
deleted file mode 100644
index db15fbb..0000000
--- a/libs/libzmq/builds/deprecated-msvc/properties/Link.props
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-   
-  <PropertyGroup>
-    <_PropertySheetDisplayName>Link Time Code Generation Settings</_PropertySheetDisplayName>
-    <DefaultLinkage>ltcg</DefaultLinkage>
-  </PropertyGroup>
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <WholeProgramOptimization>true</WholeProgramOptimization>
-    </ClCompile>
-    <Link>
-      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
-    </Link>
-    <Lib>
-      <LinkTimeCodeGeneration>true</LinkTimeCodeGeneration>
-    </Lib>
-  </ItemDefinitionGroup>
-
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/properties/Messages.props b/libs/libzmq/builds/deprecated-msvc/properties/Messages.props
deleted file mode 100644
index 06a1ab0..0000000
--- a/libs/libzmq/builds/deprecated-msvc/properties/Messages.props
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>Build Messages</_PropertySheetDisplayName>
-  </PropertyGroup>
-
-  <Target Name="ConfigInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="ConfigurationType : $(ConfigurationType)" Importance="high"/>
-    <Message Text="Configuration     : $(Configuration)" Importance="high"/>
-    <Message Text="PlatformToolset   : $(PlatformToolset)" Importance="high"/>
-    <Message Text="TargetPath        : $(TargetPath)" Importance="high"/>
-  </Target>
-
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/properties/Output.props b/libs/libzmq/builds/deprecated-msvc/properties/Output.props
deleted file mode 100644
index 492876c..0000000
--- a/libs/libzmq/builds/deprecated-msvc/properties/Output.props
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- 
-  <PropertyGroup>
-    <_PropertySheetDisplayName>Output Settings</_PropertySheetDisplayName>
-    <!-- BuildRoot, RepoRoot, SourceRoot, DebugOrRelease and DefaultLinkage are custom props and should therefore not be referenced from *.import.props or nuget target files. -->
-    <BuildRoot>$(ProjectDir)..\..\</BuildRoot>
-    <RepoRoot>$(ProjectDir)..\..\..\..\</RepoRoot>
-    <SourceRoot>$(ProjectDir)..\..\..\..\..\</SourceRoot>    
-    <OutDir>$(ProjectDir)..\..\..\..\bin\$(PlatformName)\$(DebugOrRelease)\$(PlatformToolset)\$(DefaultLinkage)\</OutDir>
-    <IntDir>$(ProjectDir)..\..\..\..\obj\$(TargetName)\$(PlatformName)\$(DebugOrRelease)\$(PlatformToolset)\$(DefaultLinkage)\</IntDir>
-    <TargetDir>$(OutDir)</TargetDir>
-    <TargetName>$(TargetName)</TargetName>
-    <TargetPath>$(TargetDir)$(TargetName)$(TargetExt)</TargetPath>
-  </PropertyGroup>
-  
-  <ItemDefinitionGroup>
-    <Link>
-      <ImportLibrary>$(OutDir)$(TargetName).lib</ImportLibrary>
-    </Link>
-    <BuildLog>
-      <Path>$(OutDir)$(TargetName).log</Path>
-    </BuildLog> 
-  </ItemDefinitionGroup>
-  
-  <ImportGroup Label="PropertySheets">
-    <Import Project="Messages.props" />
-  </ImportGroup>    
-  
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/properties/Release.props b/libs/libzmq/builds/deprecated-msvc/properties/Release.props
deleted file mode 100644
index 1c5415b..0000000
--- a/libs/libzmq/builds/deprecated-msvc/properties/Release.props
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="Common.props" />
-  </ImportGroup>
-  
-  <PropertyGroup>
-    <_PropertySheetDisplayName>Release Settings</_PropertySheetDisplayName>
-    <DebugOrRelease>Release</DebugOrRelease>
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalOptions>/Oy- %(AdditionalOptions)</AdditionalOptions>
-      <!--<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>-->
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <MinimalRebuild>false</MinimalRebuild>
-      <Optimization>MaxSpeed</Optimization>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ResourceCompile>
-    <Link>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <!--<GenerateDebugInformation>true</GenerateDebugInformation>-->
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link> 
-  </ItemDefinitionGroup>
-
-  <ItemDefinitionGroup Condition="'$(Processor)' == 'x86'">
-    <ClCompile>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
-    </ClCompile>
-  </ItemDefinitionGroup>
-
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/properties/ReleaseDEXE.props b/libs/libzmq/builds/deprecated-msvc/properties/ReleaseDEXE.props
deleted file mode 100644
index 73deeae..0000000
--- a/libs/libzmq/builds/deprecated-msvc/properties/ReleaseDEXE.props
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>Console Release Dynamic</_PropertySheetDisplayName>
-    <DefaultLinkage>dynamic</DefaultLinkage>
-  </PropertyGroup>
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="Release.props" />
-    <Import Project="EXE.props" />
-  </ImportGroup>
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-    </ClCompile>
-  </ItemDefinitionGroup>
-
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/properties/ReleaseDLL.props b/libs/libzmq/builds/deprecated-msvc/properties/ReleaseDLL.props
deleted file mode 100644
index 2071b33..0000000
--- a/libs/libzmq/builds/deprecated-msvc/properties/ReleaseDLL.props
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  
-  <PropertyGroup>
-    <_PropertySheetDisplayName>Dynamic Release Library</_PropertySheetDisplayName>
-  </PropertyGroup>
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="Release.props" />
-    <Import Project="DLL.props" />
-  </ImportGroup>
-  
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-    </ClCompile>
-  </ItemDefinitionGroup>
-
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/properties/ReleaseLEXE.props b/libs/libzmq/builds/deprecated-msvc/properties/ReleaseLEXE.props
deleted file mode 100644
index beb73ef..0000000
--- a/libs/libzmq/builds/deprecated-msvc/properties/ReleaseLEXE.props
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>Console Release Link Time Code Generation</_PropertySheetDisplayName>
-  </PropertyGroup>
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="Release.props" />
-    <Import Project="Link.props" />
-    <Import Project="EXE.props" />
-  </ImportGroup>
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-    </ClCompile>
-  </ItemDefinitionGroup>
-
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/properties/ReleaseLIB.props b/libs/libzmq/builds/deprecated-msvc/properties/ReleaseLIB.props
deleted file mode 100644
index 2b250d5..0000000
--- a/libs/libzmq/builds/deprecated-msvc/properties/ReleaseLIB.props
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>Static Release Library</_PropertySheetDisplayName>
-  </PropertyGroup>
-  
-  <ImportGroup Label="PropertySheets">
-    <Import Project="Release.props" />
-    <Import Project="LIB.props" />
-  </ImportGroup>
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-    </ClCompile>
-  </ItemDefinitionGroup>
-
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/properties/ReleaseLTCG.props b/libs/libzmq/builds/deprecated-msvc/properties/ReleaseLTCG.props
deleted file mode 100644
index 1814c6f..0000000
--- a/libs/libzmq/builds/deprecated-msvc/properties/ReleaseLTCG.props
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>Static Release Link Time Code Generation Library</_PropertySheetDisplayName>
-  </PropertyGroup>
-  
-  <ImportGroup Label="PropertySheets">
-    <Import Project="Release.props" />
-    <Import Project="LTCG.props" />
-  </ImportGroup>
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-    </ClCompile>
-  </ItemDefinitionGroup>
-
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/properties/ReleaseSEXE.props b/libs/libzmq/builds/deprecated-msvc/properties/ReleaseSEXE.props
deleted file mode 100644
index 2f5600a..0000000
--- a/libs/libzmq/builds/deprecated-msvc/properties/ReleaseSEXE.props
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>Console Release Static</_PropertySheetDisplayName>
-    <DefaultLinkage>static</DefaultLinkage>
-  </PropertyGroup>
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="Release.props" />
-    <Import Project="EXE.props" />
-  </ImportGroup>
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-    </ClCompile>
-  </ItemDefinitionGroup>
-
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/properties/Win32.props b/libs/libzmq/builds/deprecated-msvc/properties/Win32.props
deleted file mode 100644
index f7b1df6..0000000
--- a/libs/libzmq/builds/deprecated-msvc/properties/Win32.props
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  
-  <PropertyGroup>
-    <_PropertySheetDisplayName>x86 Settings</_PropertySheetDisplayName>
-  </PropertyGroup>
-  
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <PreprocessorDefinitions>WIN32;_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Lib>
-      <AdditionalOptions>/MACHINE:X86 %(AdditionalOptions)</AdditionalOptions>
-    </Lib>
-  </ItemDefinitionGroup>
-
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/properties/x64.props b/libs/libzmq/builds/deprecated-msvc/properties/x64.props
deleted file mode 100644
index 0831f69..0000000
--- a/libs/libzmq/builds/deprecated-msvc/properties/x64.props
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  
-  <PropertyGroup>
-    <_PropertySheetDisplayName>x64 Settings</_PropertySheetDisplayName>
-  </PropertyGroup>
-    
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <!-- Note that Win64 defines may cause WIN32 to become defined when using windows headers, 
-      but _WIN32 implies Windows 32 bit or above. If the standard headers are not included 
-      these are sometimes required even for 64 bit builds and should never cause harm there.-->
-      <PreprocessorDefinitions>WIN32;_WIN32;WIN64;_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-    <Lib>
-      <AdditionalOptions>/MACHINE:X64 %(AdditionalOptions)</AdditionalOptions>
-    </Lib>
-  </ItemDefinitionGroup>
-
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/readme.txt b/libs/libzmq/builds/deprecated-msvc/readme.txt
deleted file mode 100644
index 19720cd..0000000
--- a/libs/libzmq/builds/deprecated-msvc/readme.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-For building on Windows, use:
-
-     cd build
-     ./build.bat
-
-This requires that the CMD.EXE be created using the DevStudio Tools link to create a CMD.EXE window. Also, make sure that the name of the project folder is libzmq (not e.g. libzmq-master) as this is required for correct linking.
-
-Visual Studio product and C++ compiler Versions:
-
-Visual C++ 2008 => Visual C++ 9
-Visual C++ 2010 => Visual C++ 10
-Visual C++ 2012 => Visual C++ 11
-Visual C++ 2013 => Visual C++ 12
-Visual C++ 2015 => Visual C++ 14
-Visual C++ 2017 => Visual C++ 15
-
-Note that solution file icons reflect the compiler version ([9], [10], [11], [12], [14], [15]), not the product version.
-
-The vs2017/vs2015/vs2013/vs2012/vs2010 solution and project files differ only in versioning.
-
-More info here:
-
-http://en.wikipedia.org/wiki/Visual_C%2B%2B
-
-If multiple DevStudio versions are installed, you can run build.bat in separate windows each created by the desired DevStudio target.
-
-To build for all versions of Visual Studio (excluding vs2008), you can run buildall.bat. This is generally a maintainer task.
diff --git a/libs/libzmq/builds/deprecated-msvc/resource.h b/libs/libzmq/builds/deprecated-msvc/resource.h
deleted file mode 100644
index 27e2900..0000000
--- a/libs/libzmq/builds/deprecated-msvc/resource.h
+++ /dev/null
@@ -1,14 +0,0 @@
-//{{NO_DEPENDENCIES}}
-// Microsoft Visual C++ generated include file.
-// Used by resource.rc
-
-// Next default values for new objects
-// 
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        101
-#define _APS_NEXT_COMMAND_VALUE         40001
-#define _APS_NEXT_CONTROL_VALUE         1001
-#define _APS_NEXT_SYMED_VALUE           101
-#endif
-#endif
diff --git a/libs/libzmq/builds/deprecated-msvc/resource.rc b/libs/libzmq/builds/deprecated-msvc/resource.rc
deleted file mode 100644
index e2c3120..0000000
Binary files a/libs/libzmq/builds/deprecated-msvc/resource.rc and /dev/null differ
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2008/inproc_lat/inproc_lat.vcproj b/libs/libzmq/builds/deprecated-msvc/vs2008/inproc_lat/inproc_lat.vcproj
deleted file mode 100644
index f046316..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2008/inproc_lat/inproc_lat.vcproj
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VisualStudioProject ProjectType="Visual C++" Version="9,00" Name="inproc_lat" ProjectGUID="{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}" RootNamespace="inproc_lat" TargetFrameworkVersion="196613">
-  <Platforms>
-    <Platform Name="Win32" />
-  </Platforms>
-  <ToolFiles />
-  <Configurations>
-    <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
-      <Tool Name="VCPreBuildEventTool" CommandLine="copy ..\..\platform.hpp ..\..\..\..\src" />
-      <Tool Name="VCCustomBuildTool" />
-      <Tool Name="VCXMLDataGeneratorTool" />
-      <Tool Name="VCMIDLTool" />
-      <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" WarningLevel="3" DebugInformationFormat="4" />
-      <Tool Name="VCManagedResourceCompilerTool" />
-      <Tool Name="VCResourceCompilerTool" />
-      <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLinkerTool" OutputFile="../../../../bin/inproc_lat.exe" GenerateDebugInformation="true" TargetMachine="1" />
-      <Tool Name="VCALinkTool" />
-      <Tool Name="VCManifestTool" />
-      <Tool Name="VCXDCMakeTool" />
-      <Tool Name="VCBscMakeTool" />
-      <Tool Name="VCFxCopTool" />
-      <Tool Name="VCAppVerifierTool" />
-      <Tool Name="VCPostBuildEventTool" />
-    </Configuration>
-    <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="1" CharacterSet="2" WholeProgramOptimization="1">
-      <Tool Name="VCPreBuildEventTool" CommandLine="copy ..\..\platform.hpp ..\..\..\..\src" />
-      <Tool Name="VCCustomBuildTool" />
-      <Tool Name="VCXMLDataGeneratorTool" />
-      <Tool Name="VCMIDLTool" />
-      <Tool Name="VCCLCompilerTool" Optimization="2" EnableIntrinsicFunctions="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" WarningLevel="3" DebugInformationFormat="3" />
-      <Tool Name="VCManagedResourceCompilerTool" />
-      <Tool Name="VCResourceCompilerTool" />
-      <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLinkerTool" OutputFile="../../../../bin/inproc_lat.exe" GenerateDebugInformation="true" OptimizeReferences="2" EnableCOMDATFolding="2" TargetMachine="1" />
-      <Tool Name="VCALinkTool" />
-      <Tool Name="VCManifestTool" />
-      <Tool Name="VCXDCMakeTool" />
-      <Tool Name="VCBscMakeTool" />
-      <Tool Name="VCFxCopTool" />
-      <Tool Name="VCAppVerifierTool" />
-      <Tool Name="VCPostBuildEventTool" />
-    </Configuration>
-  </Configurations>
-  <References />
-  <Files>
-    <Filter Name="Source Files" Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
-      <File RelativePath="..\..\..\..\perf\inproc_lat.cpp" />
-    </Filter>
-  </Files>
-  <Globals />
-</VisualStudioProject>
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2008/inproc_thr/inproc_thr.vcproj b/libs/libzmq/builds/deprecated-msvc/vs2008/inproc_thr/inproc_thr.vcproj
deleted file mode 100644
index 74eab65..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2008/inproc_thr/inproc_thr.vcproj
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VisualStudioProject ProjectType="Visual C++" Version="9,00" Name="inproc_thr" ProjectGUID="{1077E977-95DD-4E73-A692-74647DD0CC1E}" RootNamespace="inproc_thr" TargetFrameworkVersion="196613">
-  <Platforms>
-    <Platform Name="Win32" />
-  </Platforms>
-  <ToolFiles />
-  <Configurations>
-    <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
-      <Tool Name="VCPreBuildEventTool" CommandLine="copy ..\..\platform.hpp ..\..\..\..\src" />
-      <Tool Name="VCCustomBuildTool" />
-      <Tool Name="VCXMLDataGeneratorTool" />
-      <Tool Name="VCMIDLTool" />
-      <Tool Name="VCCLCompilerTool" Optimization="0" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" WarningLevel="3" DebugInformationFormat="4" />
-      <Tool Name="VCManagedResourceCompilerTool" />
-      <Tool Name="VCResourceCompilerTool" />
-      <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLinkerTool" OutputFile="../../../../bin/inproc_thr.exe" GenerateDebugInformation="true" TargetMachine="1" />
-      <Tool Name="VCALinkTool" />
-      <Tool Name="VCManifestTool" />
-      <Tool Name="VCXDCMakeTool" />
-      <Tool Name="VCBscMakeTool" />
-      <Tool Name="VCFxCopTool" />
-      <Tool Name="VCAppVerifierTool" />
-      <Tool Name="VCPostBuildEventTool" />
-    </Configuration>
-    <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="1" CharacterSet="2" WholeProgramOptimization="1">
-      <Tool Name="VCPreBuildEventTool" CommandLine="copy ..\..\platform.hpp ..\..\..\..\src" />
-      <Tool Name="VCCustomBuildTool" />
-      <Tool Name="VCXMLDataGeneratorTool" />
-      <Tool Name="VCMIDLTool" />
-      <Tool Name="VCCLCompilerTool" Optimization="2" EnableIntrinsicFunctions="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" WarningLevel="3" DebugInformationFormat="3" />
-      <Tool Name="VCManagedResourceCompilerTool" />
-      <Tool Name="VCResourceCompilerTool" />
-      <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLinkerTool" OutputFile="../../../../bin/inproc_thr.exe" GenerateDebugInformation="true" OptimizeReferences="2" EnableCOMDATFolding="2" TargetMachine="1" />
-      <Tool Name="VCALinkTool" />
-      <Tool Name="VCManifestTool" />
-      <Tool Name="VCXDCMakeTool" />
-      <Tool Name="VCBscMakeTool" />
-      <Tool Name="VCFxCopTool" />
-      <Tool Name="VCAppVerifierTool" />
-      <Tool Name="VCPostBuildEventTool" />
-    </Configuration>
-  </Configurations>
-  <References />
-  <Files>
-    <Filter Name="Source Files" Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
-      <File RelativePath="..\..\..\..\perf\inproc_thr.cpp" />
-    </Filter>
-  </Files>
-  <Globals />
-</VisualStudioProject>
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2008/libzmq.sln b/libs/libzmq/builds/deprecated-msvc/vs2008/libzmq.sln
deleted file mode 100644
index 4541240..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2008/libzmq.sln
+++ /dev/null
@@ -1,95 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libzmq", "libzmq\libzmq.vcproj", "{641C5F36-32EE-4323-B740-992B651CF9D6}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "local_lat", "local_lat\local_lat.vcproj", "{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}"
-	ProjectSection(ProjectDependencies) = postProject
-		{641C5F36-32EE-4323-B740-992B651CF9D6} = {641C5F36-32EE-4323-B740-992B651CF9D6}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "remote_lat", "remote_lat\remote_lat.vcproj", "{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}"
-	ProjectSection(ProjectDependencies) = postProject
-		{641C5F36-32EE-4323-B740-992B651CF9D6} = {641C5F36-32EE-4323-B740-992B651CF9D6}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "local_thr", "local_thr\local_thr.vcproj", "{8EF2DF6B-6646-460F-8032-913B70FE0E94}"
-	ProjectSection(ProjectDependencies) = postProject
-		{641C5F36-32EE-4323-B740-992B651CF9D6} = {641C5F36-32EE-4323-B740-992B651CF9D6}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "remote_thr", "remote_thr\remote_thr.vcproj", "{B15E059C-0CBB-4A82-8C42-6567FB650802}"
-	ProjectSection(ProjectDependencies) = postProject
-		{641C5F36-32EE-4323-B740-992B651CF9D6} = {641C5F36-32EE-4323-B740-992B651CF9D6}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "inproc_lat", "inproc_lat\inproc_lat.vcproj", "{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}"
-	ProjectSection(ProjectDependencies) = postProject
-		{641C5F36-32EE-4323-B740-992B651CF9D6} = {641C5F36-32EE-4323-B740-992B651CF9D6}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "inproc_thr", "inproc_thr\inproc_thr.vcproj", "{1077E977-95DD-4E73-A692-74647DD0CC1E}"
-	ProjectSection(ProjectDependencies) = postProject
-		{641C5F36-32EE-4323-B740-992B651CF9D6} = {641C5F36-32EE-4323-B740-992B651CF9D6}
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-		StaticDebug|Win32 = StaticDebug|Win32
-		StaticRelease|Win32 = StaticRelease|Win32
-		WithOpenPGM|Win32 = WithOpenPGM|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.Debug|Win32.ActiveCfg = Debug|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.Debug|Win32.Build.0 = Debug|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.Release|Win32.ActiveCfg = Release|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.Release|Win32.Build.0 = Release|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.StaticDebug|Win32.ActiveCfg = StaticDebug|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.StaticDebug|Win32.Build.0 = StaticDebug|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.StaticRelease|Win32.ActiveCfg = StaticRelease|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.StaticRelease|Win32.Build.0 = StaticRelease|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.WithOpenPGM|Win32.ActiveCfg = WithOpenPGM|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.WithOpenPGM|Win32.Build.0 = WithOpenPGM|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.Debug|Win32.ActiveCfg = Debug|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.Debug|Win32.Build.0 = Debug|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.Release|Win32.ActiveCfg = Release|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.Release|Win32.Build.0 = Release|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.WithOpenPGM|Win32.ActiveCfg = Release|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.WithOpenPGM|Win32.Build.0 = Release|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.Debug|Win32.ActiveCfg = Debug|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.Debug|Win32.Build.0 = Debug|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.Release|Win32.ActiveCfg = Release|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.Release|Win32.Build.0 = Release|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.WithOpenPGM|Win32.ActiveCfg = Release|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.WithOpenPGM|Win32.Build.0 = Release|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.Debug|Win32.Build.0 = Debug|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.Release|Win32.ActiveCfg = Release|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.Release|Win32.Build.0 = Release|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.WithOpenPGM|Win32.ActiveCfg = Release|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.WithOpenPGM|Win32.Build.0 = Release|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.Debug|Win32.ActiveCfg = Debug|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.Debug|Win32.Build.0 = Debug|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.Release|Win32.ActiveCfg = Release|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.Release|Win32.Build.0 = Release|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.WithOpenPGM|Win32.ActiveCfg = Release|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.WithOpenPGM|Win32.Build.0 = Release|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.Debug|Win32.ActiveCfg = Debug|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.Debug|Win32.Build.0 = Debug|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.Release|Win32.ActiveCfg = Release|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.Release|Win32.Build.0 = Release|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.WithOpenPGM|Win32.ActiveCfg = Release|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.WithOpenPGM|Win32.Build.0 = Release|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.Debug|Win32.Build.0 = Debug|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.Release|Win32.ActiveCfg = Release|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.Release|Win32.Build.0 = Release|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.WithOpenPGM|Win32.ActiveCfg = Release|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.WithOpenPGM|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2008/libzmq/libzmq.vcproj b/libs/libzmq/builds/deprecated-msvc/vs2008/libzmq/libzmq.vcproj
deleted file mode 100644
index 6280298..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2008/libzmq/libzmq.vcproj
+++ /dev/null
@@ -1,338 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VisualStudioProject ProjectType="Visual C++" Version="9,00" Name="libzmq" ProjectGUID="{641C5F36-32EE-4323-B740-992B651CF9D6}" RootNamespace="libzmq" TargetFrameworkVersion="196613">
-  <Platforms>
-    <Platform Name="Win32" />
-  </Platforms>
-  <ToolFiles />
-  <Configurations>
-    <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" CharacterSet="2">
-      <Tool Name="VCPreBuildEventTool" CommandLine="copy ..\..\platform.hpp ..\..\..\..\src" />
-      <Tool Name="VCCustomBuildTool" />
-      <Tool Name="VCXMLDataGeneratorTool" />
-      <Tool Name="VCWebServiceProxyGeneratorTool" />
-      <Tool Name="VCMIDLTool" />
-      <Tool Name="VCCLCompilerTool" AdditionalOptions="-DDLL_EXPORT -DFD_SETSIZE=16384 -DZMQ_USE_SELECT -D_CRT_SECURE_NO_WARNINGS" Optimization="0" PreprocessorDefinitions="NOMINMAX" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" WarningLevel="3" DebugInformationFormat="4" />
-      <Tool Name="VCManagedResourceCompilerTool" />
-      <Tool Name="VCResourceCompilerTool" />
-      <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLinkerTool" AdditionalDependencies="Ws2_32.lib Rpcrt4.lib Advapi32.lib Iphlpapi.lib" OutputFile="../../../../lib/libzmq.dll" LinkDLL="true" GenerateDebugInformation="true" TargetMachine="1" />
-      <Tool Name="VCALinkTool" />
-      <Tool Name="VCManifestTool" />
-      <Tool Name="VCXDCMakeTool" />
-      <Tool Name="VCBscMakeTool" />
-      <Tool Name="VCFxCopTool" />
-      <Tool Name="VCAppVerifierTool" />
-      <Tool Name="VCPostBuildEventTool" />
-    </Configuration>
-    <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" CharacterSet="2" WholeProgramOptimization="1">
-      <Tool Name="VCPreBuildEventTool" CommandLine="copy ..\..\platform.hpp ..\..\..\..\src" />
-      <Tool Name="VCCustomBuildTool" />
-      <Tool Name="VCXMLDataGeneratorTool" />
-      <Tool Name="VCWebServiceProxyGeneratorTool" />
-      <Tool Name="VCMIDLTool" />
-      <Tool Name="VCCLCompilerTool" AdditionalOptions="-DDLL_EXPORT -DFD_SETSIZE=16384 -DZMQ_USE_SELECT -D_CRT_SECURE_NO_WARNINGS" Optimization="2" EnableIntrinsicFunctions="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" WarningLevel="3" DebugInformationFormat="3" />
-      <Tool Name="VCManagedResourceCompilerTool" />
-      <Tool Name="VCResourceCompilerTool" />
-      <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLinkerTool" AdditionalDependencies="Ws2_32.lib Rpcrt4.lib Advapi32.lib Iphlpapi.lib" OutputFile="../../../../lib/libzmq.dll" LinkDLL="true" GenerateDebugInformation="true" OptimizeReferences="2" EnableCOMDATFolding="2" TargetMachine="1" />
-      <Tool Name="VCALinkTool" />
-      <Tool Name="VCManifestTool" />
-      <Tool Name="VCXDCMakeTool" />
-      <Tool Name="VCBscMakeTool" />
-      <Tool Name="VCFxCopTool" />
-      <Tool Name="VCAppVerifierTool" />
-      <Tool Name="VCPostBuildEventTool" />
-    </Configuration>
-    <Configuration Name="StaticDebug|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="4" CharacterSet="2">
-      <Tool Name="VCPreBuildEventTool" CommandLine="copy ..\..\platform.hpp ..\..\..\..\src" />
-      <Tool Name="VCCustomBuildTool" />
-      <Tool Name="VCXMLDataGeneratorTool" />
-      <Tool Name="VCWebServiceProxyGeneratorTool" />
-      <Tool Name="VCMIDLTool" />
-      <Tool Name="VCCLCompilerTool" AdditionalOptions="-DZMQ_STATIC -DFD_SETSIZE=16384 -DZMQ_USE_SELECT -D_CRT_SECURE_NO_WARNINGS" Optimization="0" PreprocessorDefinitions="NOMINMAX" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" WarningLevel="3" DebugInformationFormat="4" />
-      <Tool Name="VCManagedResourceCompilerTool" />
-      <Tool Name="VCResourceCompilerTool" />
-      <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" AdditionalOptions="/ignore:4006" AdditionalDependencies="Ws2_32.lib Rpcrt4.lib Advapi32.lib Iphlpapi.lib" OutputFile="../../../../lib/libzmq_d.lib" />
-      <Tool Name="VCALinkTool" />
-      <Tool Name="VCXDCMakeTool" />
-      <Tool Name="VCBscMakeTool" />
-      <Tool Name="VCFxCopTool" />
-      <Tool Name="VCPostBuildEventTool" />
-    </Configuration>
-    <Configuration Name="StaticRelease|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="4" CharacterSet="2" WholeProgramOptimization="1">
-      <Tool Name="VCPreBuildEventTool" CommandLine="copy ..\..\platform.hpp ..\..\..\..\src" />
-      <Tool Name="VCCustomBuildTool" />
-      <Tool Name="VCXMLDataGeneratorTool" />
-      <Tool Name="VCWebServiceProxyGeneratorTool" />
-      <Tool Name="VCMIDLTool" />
-      <Tool Name="VCCLCompilerTool" AdditionalOptions="-DZMQ_STATIC -DFD_SETSIZE=16384 -DZMQ_USE_SELECT -D_CRT_SECURE_NO_WARNINGS" Optimization="2" EnableIntrinsicFunctions="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" WarningLevel="3" DebugInformationFormat="3" />
-      <Tool Name="VCManagedResourceCompilerTool" />
-      <Tool Name="VCResourceCompilerTool" />
-      <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLibrarianTool" AdditionalOptions="/ignore:4006" AdditionalDependencies="Ws2_32.lib Rpcrt4.lib Advapi32.lib Iphlpapi.lib" OutputFile="../../../../lib/libzmq.lib" />
-      <Tool Name="VCALinkTool" />
-      <Tool Name="VCXDCMakeTool" />
-      <Tool Name="VCBscMakeTool" />
-      <Tool Name="VCFxCopTool" />
-      <Tool Name="VCPostBuildEventTool" />
-    </Configuration>
-    <Configuration Name="WithOpenPGM|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="2" CharacterSet="2" WholeProgramOptimization="1">
-      <Tool Name="VCPreBuildEventTool" CommandLine="copy ..\..\platform.hpp ..\..\..\..\src" />
-      <Tool Name="VCCustomBuildTool" />
-      <Tool Name="VCXMLDataGeneratorTool" />
-      <Tool Name="VCWebServiceProxyGeneratorTool" />
-      <Tool Name="VCMIDLTool" />
-      <Tool Name="VCCLCompilerTool" AdditionalOptions="-DDLL_EXPORT -DFD_SETSIZE=16384 -DZMQ_USE_SELECT -D_CRT_SECURE_NO_WARNINGS" Optimization="2" EnableIntrinsicFunctions="true" AdditionalIncludeDirectories="../../../../OpenPGM/include" PreprocessorDefinitions="ZMQ_HAVE_OPENPGM" RuntimeLibrary="2" EnableFunctionLevelLinking="true" WarningLevel="3" DebugInformationFormat="3" />
-      <Tool Name="VCManagedResourceCompilerTool" />
-      <Tool Name="VCResourceCompilerTool" />
-      <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLinkerTool" AdditionalDependencies="Ws2_32.lib Rpcrt4.lib Advapi32.lib Iphlpapi.lib libpgm.lib" OutputFile="../../../../lib/libzmq.dll" AdditionalLibraryDirectories="../../../../../OpenPGM/lib" LinkDLL="true" GenerateDebugInformation="true" OptimizeReferences="2" EnableCOMDATFolding="2" TargetMachine="1" />
-      <Tool Name="VCALinkTool" />
-      <Tool Name="VCManifestTool" />
-      <Tool Name="VCXDCMakeTool" />
-      <Tool Name="VCBscMakeTool" />
-      <Tool Name="VCFxCopTool" />
-      <Tool Name="VCAppVerifierTool" />
-      <Tool Name="VCPostBuildEventTool" />
-    </Configuration>
-  </Configurations>
-  <References />
-  <Files>
-    <Filter Name="Source Files" Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
-      <File RelativePath="..\..\errno.cpp" />
-      <File RelativePath="..\..\..\..\src\address.cpp" />
-      <File RelativePath="..\..\..\..\src\client.cpp" />
-      <File RelativePath="..\..\..\..\src\clock.cpp" />
-      <File RelativePath="..\..\..\..\src\ctx.cpp" />
-      <File RelativePath="..\..\..\..\src\curve_client.cpp" />
-      <File RelativePath="..\..\..\..\src\curve_mechanism_base.cpp" />
-      <File RelativePath="..\..\..\..\src\curve_server.cpp" />
-      <File RelativePath="..\..\..\..\src\dealer.cpp" />
-      <File RelativePath="..\..\..\..\src\decoder_allocators.cpp" />
-      <File RelativePath="..\..\..\..\src\devpoll.cpp" />
-      <File RelativePath="..\..\..\..\src\dgram.cpp" />
-      <File RelativePath="..\..\..\..\src\dish.cpp" />
-      <File RelativePath="..\..\..\..\src\dist.cpp" />
-      <File RelativePath="..\..\..\..\src\epoll.cpp" />
-      <File RelativePath="..\..\..\..\src\err.cpp" />
-      <File RelativePath="..\..\..\..\src\fq.cpp" />
-      <File RelativePath="..\..\..\..\src\gather.cpp" />
-      <File RelativePath="..\..\..\..\src\gssapi_client.cpp" />
-      <File RelativePath="..\..\..\..\src\gssapi_mechanism_base.cpp" />
-      <File RelativePath="..\..\..\..\src\gssapi_server.cpp" />
-      <File RelativePath="..\..\..\..\src\io_object.cpp" />
-      <File RelativePath="..\..\..\..\src\io_thread.cpp" />
-      <File RelativePath="..\..\..\..\src\ipc_address.cpp" />
-      <File RelativePath="..\..\..\..\src\ipc_connecter.cpp" />
-      <File RelativePath="..\..\..\..\src\ipc_listener.cpp" />
-      <File RelativePath="..\..\..\..\src\ip.cpp" />
-      <File RelativePath="..\..\..\..\src\kqueue.cpp" />
-      <File RelativePath="..\..\..\..\src\lb.cpp" />
-      <File RelativePath="..\..\..\..\src\mailbox.cpp" />
-      <File RelativePath="..\..\..\..\src\mailbox_safe.cpp" />
-      <File RelativePath="..\..\..\..\src\mechanism_base.cpp" />
-      <File RelativePath="..\..\..\..\src\mechanism.cpp" />
-      <File RelativePath="..\..\..\..\src\metadata.cpp" />
-      <File RelativePath="..\..\..\..\src\msg.cpp" />
-      <File RelativePath="..\..\..\..\src\mtrie.cpp" />
-      <File RelativePath="..\..\..\..\src\norm_engine.cpp" />
-      <File RelativePath="..\..\..\..\src\null_mechanism.cpp" />
-      <File RelativePath="..\..\..\..\src\object.cpp" />
-      <File RelativePath="..\..\..\..\src\options.cpp" />
-      <File RelativePath="..\..\..\..\src\own.cpp" />
-      <File RelativePath="..\..\..\..\src\pair.cpp" />
-      <File RelativePath="..\..\..\..\src\pgm_receiver.cpp" />
-      <File RelativePath="..\..\..\..\src\pgm_sender.cpp" />
-      <File RelativePath="..\..\..\..\src\pgm_socket.cpp" />
-      <File RelativePath="..\..\..\..\src\pipe.cpp" />
-      <File RelativePath="..\..\..\..\src\plain_client.cpp" />
-      <File RelativePath="..\..\..\..\src\plain_server.cpp" />
-      <File RelativePath="..\..\..\..\src\poll.cpp" />
-      <File RelativePath="..\..\..\..\src\poller_base.cpp" />
-      <File RelativePath="..\..\..\..\src\pollset.cpp" />
-      <File RelativePath="..\..\..\..\src\precompiled.cpp" />
-      <File RelativePath="..\..\..\..\src\proxy.cpp" />
-      <File RelativePath="..\..\..\..\src\pub.cpp" />
-      <File RelativePath="..\..\..\..\src\pull.cpp" />
-      <File RelativePath="..\..\..\..\src\push.cpp" />
-      <File RelativePath="..\..\..\..\src\radio.cpp" />
-      <File RelativePath="..\..\..\..\src\random.cpp" />
-      <File RelativePath="..\..\..\..\src\raw_decoder.cpp" />
-      <File RelativePath="..\..\..\..\src\raw_encoder.cpp" />
-      <File RelativePath="..\..\..\..\src\reaper.cpp" />
-      <File RelativePath="..\..\..\..\src\rep.cpp" />
-      <File RelativePath="..\..\..\..\src\req.cpp" />
-      <File RelativePath="..\..\..\..\src\router.cpp" />
-      <File RelativePath="..\..\..\..\src\scatter.cpp" />
-      <File RelativePath="..\..\..\..\src\select.cpp" />
-      <File RelativePath="..\..\..\..\src\server.cpp" />
-      <File RelativePath="..\..\..\..\src\session_base.cpp" />
-      <File RelativePath="..\..\..\..\src\signaler.cpp" />
-      <File RelativePath="..\..\..\..\src\socket_base.cpp" />
-      <File RelativePath="..\..\..\..\src\socket_poller.cpp" />
-      <File RelativePath="..\..\..\..\src\socks_connecter.cpp" />
-      <File RelativePath="..\..\..\..\src\socks.cpp" />
-      <File RelativePath="..\..\..\..\src\stream.cpp" />
-      <File RelativePath="..\..\..\..\src\stream_engine.cpp" />
-      <File RelativePath="..\..\..\..\src\sub.cpp" />
-      <File RelativePath="..\..\..\..\src\tcp_address.cpp" />
-      <File RelativePath="..\..\..\..\src\tcp_connecter.cpp" />
-      <File RelativePath="..\..\..\..\src\tcp.cpp" />
-      <File RelativePath="..\..\..\..\src\tcp_listener.cpp" />
-      <File RelativePath="..\..\..\..\src\thread.cpp" />
-      <File RelativePath="..\..\..\..\src\timers.cpp" />
-      <File RelativePath="..\..\..\..\src\tipc_address.cpp" />
-      <File RelativePath="..\..\..\..\src\tipc_connecter.cpp" />
-      <File RelativePath="..\..\..\..\src\tipc_listener.cpp" />
-      <File RelativePath="..\..\..\..\src\trie.cpp" />
-      <File RelativePath="..\..\..\..\src\udp_address.cpp" />
-      <File RelativePath="..\..\..\..\src\udp_engine.cpp" />
-      <File RelativePath="..\..\..\..\src\v1_decoder.cpp" />
-      <File RelativePath="..\..\..\..\src\v1_encoder.cpp" />
-      <File RelativePath="..\..\..\..\src\v2_decoder.cpp" />
-      <File RelativePath="..\..\..\..\src\v2_encoder.cpp" />
-      <File RelativePath="..\..\..\..\src\vmci_address.cpp" />
-      <File RelativePath="..\..\..\..\src\vmci_connecter.cpp" />
-      <File RelativePath="..\..\..\..\src\vmci.cpp" />
-      <File RelativePath="..\..\..\..\src\vmci_listener.cpp" />
-      <File RelativePath="..\..\..\..\src\xpub.cpp" />
-      <File RelativePath="..\..\..\..\src\xsub.cpp" />
-      <File RelativePath="..\..\..\..\src\zap_client.cpp" />
-      <File RelativePath="..\..\..\..\src\zmq.cpp" />
-      <File RelativePath="..\..\..\..\src\zmq_utils.cpp" />
-    </Filter>
-    <Filter Name="Header Files" Filter="h;hpp;hxx;hm;inl;inc;xsd" UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
-      <File RelativePath="..\..\errno.hpp" />
-      <File RelativePath="..\..\..\..\src\address.hpp" />
-      <File RelativePath="..\..\..\..\src\array.hpp" />
-      <File RelativePath="..\..\..\..\src\atomic_counter.hpp" />
-      <File RelativePath="..\..\..\..\src\atomic_ptr.hpp" />
-      <File RelativePath="..\..\..\..\src\blob.hpp" />
-      <File RelativePath="..\..\..\..\src\client.hpp" />
-      <File RelativePath="..\..\..\..\src\clock.hpp" />
-      <File RelativePath="..\..\..\..\src\command.hpp" />
-      <File RelativePath="..\..\..\..\src\condition_variable.hpp" />
-      <File RelativePath="..\..\..\..\src\config.hpp" />
-      <File RelativePath="..\..\..\..\src\ctx.hpp" />
-      <File RelativePath="..\..\..\..\src\curve_client.hpp" />
-      <File RelativePath="..\..\..\..\src\curve_client_tools.hpp" />
-      <File RelativePath="..\..\..\..\src\curve_mechanism_base.hpp" />
-      <File RelativePath="..\..\..\..\src\curve_server.hpp" />
-      <File RelativePath="..\..\..\..\src\dbuffer.hpp" />
-      <File RelativePath="..\..\..\..\src\dealer.hpp" />
-      <File RelativePath="..\..\..\..\src\decoder_allocators.hpp" />
-      <File RelativePath="..\..\..\..\src\decoder.hpp" />
-      <File RelativePath="..\..\..\..\src\devpoll.hpp" />
-      <File RelativePath="..\..\..\..\src\dgram.hpp" />
-      <File RelativePath="..\..\..\..\src\dish.hpp" />
-      <File RelativePath="..\..\..\..\src\dist.hpp" />
-      <File RelativePath="..\..\..\..\src\encoder.hpp" />
-      <File RelativePath="..\..\..\..\src\epoll.hpp" />
-      <File RelativePath="..\..\..\..\src\err.hpp" />
-      <File RelativePath="..\..\..\..\src\fd.hpp" />
-      <File RelativePath="..\..\..\..\src\fq.hpp" />
-      <File RelativePath="..\..\..\..\src\gather.hpp" />
-      <File RelativePath="..\..\..\..\src\gssapi_client.hpp" />
-      <File RelativePath="..\..\..\..\src\gssapi_mechanism_base.hpp" />
-      <File RelativePath="..\..\..\..\src\gssapi_server.hpp" />
-      <File RelativePath="..\..\..\..\src\i_decoder.hpp" />
-      <File RelativePath="..\..\..\..\src\i_encoder.hpp" />
-      <File RelativePath="..\..\..\..\src\i_engine.hpp" />
-      <File RelativePath="..\..\..\..\src\i_mailbox.hpp" />
-      <File RelativePath="..\..\..\..\src\io_object.hpp" />
-      <File RelativePath="..\..\..\..\src\io_thread.hpp" />
-      <File RelativePath="..\..\..\..\src\ipc_address.hpp" />
-      <File RelativePath="..\..\..\..\src\ipc_connecter.hpp" />
-      <File RelativePath="..\..\..\..\src\ipc_listener.hpp" />
-      <File RelativePath="..\..\..\..\src\ip.hpp" />
-      <File RelativePath="..\..\..\..\src\i_poll_events.hpp" />
-      <File RelativePath="..\..\..\..\src\kqueue.hpp" />
-      <File RelativePath="..\..\..\..\src\lb.hpp" />
-      <File RelativePath="..\..\..\..\src\likely.hpp" />
-      <File RelativePath="..\..\..\..\src\macros.hpp" />
-      <File RelativePath="..\..\..\..\src\mailbox.hpp" />
-      <File RelativePath="..\..\..\..\src\mailbox_safe.hpp" />
-      <File RelativePath="..\..\..\..\src\mechanism_base.hpp" />
-      <File RelativePath="..\..\..\..\src\mechanism.hpp" />
-      <File RelativePath="..\..\..\..\src\metadata.hpp" />
-      <File RelativePath="..\..\..\..\src\msg.hpp" />
-      <File RelativePath="..\..\..\..\src\mtrie.hpp" />
-      <File RelativePath="..\..\..\..\src\mutex.hpp" />
-      <File RelativePath="..\..\..\..\src\norm_engine.hpp" />
-      <File RelativePath="..\..\..\..\src\null_mechanism.hpp" />
-      <File RelativePath="..\..\..\..\src\object.hpp" />
-      <File RelativePath="..\..\..\..\src\options.hpp" />
-      <File RelativePath="..\..\..\..\src\own.hpp" />
-      <File RelativePath="..\..\..\..\src\pair.hpp" />
-      <File RelativePath="..\..\..\..\src\pgm_receiver.hpp" />
-      <File RelativePath="..\..\..\..\src\pgm_sender.hpp" />
-      <File RelativePath="..\..\..\..\src\pgm_socket.hpp" />
-      <File RelativePath="..\..\..\..\src\pipe.hpp" />
-      <File RelativePath="..\..\..\..\src\plain_client.hpp" />
-      <File RelativePath="..\..\..\..\src\plain_server.hpp" />
-      <File RelativePath="..\..\..\..\src\platform.hpp" />
-      <File RelativePath="..\..\..\..\src\poller_base.hpp" />
-      <File RelativePath="..\..\..\..\src\poller.hpp" />
-      <File RelativePath="..\..\..\..\src\poll.hpp" />
-      <File RelativePath="..\..\..\..\src\pollset.hpp" />
-      <File RelativePath="..\..\..\..\src\precompiled.hpp" />
-      <File RelativePath="..\..\..\..\src\proxy.hpp" />
-      <File RelativePath="..\..\..\..\src\pub.hpp" />
-      <File RelativePath="..\..\..\..\src\pull.hpp" />
-      <File RelativePath="..\..\..\..\src\push.hpp" />
-      <File RelativePath="..\..\..\..\src\radio.hpp" />
-      <File RelativePath="..\..\..\..\src\random.hpp" />
-      <File RelativePath="..\..\..\..\src\raw_decoder.hpp" />
-      <File RelativePath="..\..\..\..\src\raw_encoder.hpp" />
-      <File RelativePath="..\..\..\..\src\reaper.hpp" />
-      <File RelativePath="..\..\..\..\src\rep.hpp" />
-      <File RelativePath="..\..\..\..\src\req.hpp" />
-      <File RelativePath="..\..\..\..\src\router.hpp" />
-      <File RelativePath="..\..\..\..\src\scatter.hpp" />
-      <File RelativePath="..\..\..\..\src\select.hpp" />
-      <File RelativePath="..\..\..\..\src\server.hpp" />
-      <File RelativePath="..\..\..\..\src\session_base.hpp" />
-      <File RelativePath="..\..\..\..\src\signaler.hpp" />
-      <File RelativePath="..\..\..\..\src\socket_base.hpp" />
-      <File RelativePath="..\..\..\..\src\socket_poller.hpp" />
-      <File RelativePath="..\..\..\..\src\socks_connecter.hpp" />
-      <File RelativePath="..\..\..\..\src\socks.hpp" />
-      <File RelativePath="..\..\..\..\src\stdint.hpp" />
-      <File RelativePath="..\..\..\..\src\stream_engine.hpp" />
-      <File RelativePath="..\..\..\..\src\stream.hpp" />
-      <File RelativePath="..\..\..\..\src\sub.hpp" />
-      <File RelativePath="..\..\..\..\src\tcp_address.hpp" />
-      <File RelativePath="..\..\..\..\src\tcp_connecter.hpp" />
-      <File RelativePath="..\..\..\..\src\tcp.hpp" />
-      <File RelativePath="..\..\..\..\src\tcp_listener.hpp" />
-      <File RelativePath="..\..\..\..\src\thread.hpp" />
-      <File RelativePath="..\..\..\..\src\timers.hpp" />
-      <File RelativePath="..\..\..\..\src\tipc_address.hpp" />
-      <File RelativePath="..\..\..\..\src\tipc_connecter.hpp" />
-      <File RelativePath="..\..\..\..\src\tipc_listener.hpp" />
-      <File RelativePath="..\..\..\..\src\trie.hpp" />
-      <File RelativePath="..\..\..\..\src\udp_address.hpp" />
-      <File RelativePath="..\..\..\..\src\udp_engine.hpp" />
-      <File RelativePath="..\..\..\..\src\v1_decoder.hpp" />
-      <File RelativePath="..\..\..\..\src\v1_encoder.hpp" />
-      <File RelativePath="..\..\..\..\src\v2_decoder.hpp" />
-      <File RelativePath="..\..\..\..\src\v2_encoder.hpp" />
-      <File RelativePath="..\..\..\..\src\v2_protocol.hpp" />
-      <File RelativePath="..\..\..\..\src\vmci_address.hpp" />
-      <File RelativePath="..\..\..\..\src\vmci_connecter.hpp" />
-      <File RelativePath="..\..\..\..\src\vmci.hpp" />
-      <File RelativePath="..\..\..\..\src\vmci_listener.hpp" />
-      <File RelativePath="..\..\..\..\src\windows.hpp" />
-      <File RelativePath="..\..\..\..\src\wire.hpp" />
-      <File RelativePath="..\..\..\..\src\xpub.hpp" />
-      <File RelativePath="..\..\..\..\src\xsub.hpp" />
-      <File RelativePath="..\..\..\..\src\ypipe_base.hpp" />
-      <File RelativePath="..\..\..\..\src\ypipe_conflate.hpp" />
-      <File RelativePath="..\..\..\..\src\ypipe.hpp" />
-      <File RelativePath="..\..\..\..\src\yqueue.hpp" />
-      <File RelativePath="..\..\..\..\src\zap_client.hpp" />
-    </Filter>
-  </Files>
-  <Globals />
-</VisualStudioProject>
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2008/local_lat/local_lat.vcproj b/libs/libzmq/builds/deprecated-msvc/vs2008/local_lat/local_lat.vcproj
deleted file mode 100644
index 7a0bc3f..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2008/local_lat/local_lat.vcproj
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VisualStudioProject ProjectType="Visual C++" Version="9.00" Name="local_lat" ProjectGUID="{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}" RootNamespace="local_lat" TargetFrameworkVersion="196613">
-  <Platforms>
-    <Platform Name="Win32" />
-  </Platforms>
-  <ToolFiles />
-  <Configurations>
-    <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
-      <Tool Name="VCPreBuildEventTool" />
-      <Tool Name="VCCustomBuildTool" />
-      <Tool Name="VCXMLDataGeneratorTool" />
-      <Tool Name="VCMIDLTool" />
-      <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="../../../../bindings/c" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" WarningLevel="3" DebugInformationFormat="4" />
-      <Tool Name="VCManagedResourceCompilerTool" />
-      <Tool Name="VCResourceCompilerTool" />
-      <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLinkerTool" OutputFile="../../../../bin/local_lat.exe" GenerateDebugInformation="true" TargetMachine="1" />
-      <Tool Name="VCALinkTool" />
-      <Tool Name="VCManifestTool" />
-      <Tool Name="VCXDCMakeTool" />
-      <Tool Name="VCBscMakeTool" />
-      <Tool Name="VCFxCopTool" />
-      <Tool Name="VCAppVerifierTool" />
-      <Tool Name="VCPostBuildEventTool" />
-    </Configuration>
-    <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="1" CharacterSet="2" WholeProgramOptimization="1">
-      <Tool Name="VCPreBuildEventTool" />
-      <Tool Name="VCCustomBuildTool" />
-      <Tool Name="VCXMLDataGeneratorTool" />
-      <Tool Name="VCMIDLTool" />
-      <Tool Name="VCCLCompilerTool" Optimization="2" EnableIntrinsicFunctions="true" AdditionalIncludeDirectories="../../../../bindings/c" RuntimeLibrary="2" EnableFunctionLevelLinking="true" WarningLevel="3" DebugInformationFormat="3" />
-      <Tool Name="VCManagedResourceCompilerTool" />
-      <Tool Name="VCResourceCompilerTool" />
-      <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLinkerTool" OutputFile="../../../../bin/local_lat.exe" GenerateDebugInformation="true" OptimizeReferences="2" EnableCOMDATFolding="2" TargetMachine="1" />
-      <Tool Name="VCALinkTool" />
-      <Tool Name="VCManifestTool" />
-      <Tool Name="VCXDCMakeTool" />
-      <Tool Name="VCBscMakeTool" />
-      <Tool Name="VCFxCopTool" />
-      <Tool Name="VCAppVerifierTool" />
-      <Tool Name="VCPostBuildEventTool" />
-    </Configuration>
-  </Configurations>
-  <References />
-  <Files>
-    <Filter Name="Source Files" Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
-      <File RelativePath="..\..\..\..\perf\local_lat.cpp" />
-    </Filter>
-  </Files>
-  <Globals />
-</VisualStudioProject>
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2008/local_thr/local_thr.vcproj b/libs/libzmq/builds/deprecated-msvc/vs2008/local_thr/local_thr.vcproj
deleted file mode 100644
index b0e2b04..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2008/local_thr/local_thr.vcproj
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VisualStudioProject ProjectType="Visual C++" Version="9.00" Name="local_thr" ProjectGUID="{8EF2DF6B-6646-460F-8032-913B70FE0E94}" RootNamespace="local_thr" TargetFrameworkVersion="196613">
-  <Platforms>
-    <Platform Name="Win32" />
-  </Platforms>
-  <ToolFiles />
-  <Configurations>
-    <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
-      <Tool Name="VCPreBuildEventTool" CommandLine="copy ..\..\platform.hpp ..\..\..\..\src" />
-      <Tool Name="VCCustomBuildTool" />
-      <Tool Name="VCXMLDataGeneratorTool" />
-      <Tool Name="VCMIDLTool" />
-      <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="../../../../bindings/c" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" WarningLevel="3" DebugInformationFormat="4" />
-      <Tool Name="VCManagedResourceCompilerTool" />
-      <Tool Name="VCResourceCompilerTool" />
-      <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLinkerTool" OutputFile="../../../../bin/local_thr.exe" GenerateDebugInformation="true" TargetMachine="1" />
-      <Tool Name="VCALinkTool" />
-      <Tool Name="VCManifestTool" />
-      <Tool Name="VCXDCMakeTool" />
-      <Tool Name="VCBscMakeTool" />
-      <Tool Name="VCFxCopTool" />
-      <Tool Name="VCAppVerifierTool" />
-      <Tool Name="VCPostBuildEventTool" />
-    </Configuration>
-    <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="1" CharacterSet="2" WholeProgramOptimization="1">
-      <Tool Name="VCPreBuildEventTool" CommandLine="copy ..\..\platform.hpp ..\..\..\..\src" />
-      <Tool Name="VCCustomBuildTool" />
-      <Tool Name="VCXMLDataGeneratorTool" />
-      <Tool Name="VCMIDLTool" />
-      <Tool Name="VCCLCompilerTool" Optimization="2" EnableIntrinsicFunctions="true" AdditionalIncludeDirectories="../../../../bindings/c" RuntimeLibrary="2" EnableFunctionLevelLinking="true" WarningLevel="3" DebugInformationFormat="3" />
-      <Tool Name="VCManagedResourceCompilerTool" />
-      <Tool Name="VCResourceCompilerTool" />
-      <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLinkerTool" OutputFile="../../../../bin/local_thr.exe" GenerateDebugInformation="true" OptimizeReferences="2" EnableCOMDATFolding="2" TargetMachine="1" />
-      <Tool Name="VCALinkTool" />
-      <Tool Name="VCManifestTool" />
-      <Tool Name="VCXDCMakeTool" />
-      <Tool Name="VCBscMakeTool" />
-      <Tool Name="VCFxCopTool" />
-      <Tool Name="VCAppVerifierTool" />
-      <Tool Name="VCPostBuildEventTool" />
-    </Configuration>
-  </Configurations>
-  <References />
-  <Files>
-    <Filter Name="Source Files" Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
-      <File RelativePath="..\..\..\..\perf\local_thr.cpp" />
-    </Filter>
-  </Files>
-  <Globals />
-</VisualStudioProject>
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2008/remote_lat/remote_lat.vcproj b/libs/libzmq/builds/deprecated-msvc/vs2008/remote_lat/remote_lat.vcproj
deleted file mode 100644
index c902e78..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2008/remote_lat/remote_lat.vcproj
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VisualStudioProject ProjectType="Visual C++" Version="9.00" Name="remote_lat" ProjectGUID="{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}" RootNamespace="remote_lat" TargetFrameworkVersion="196613">
-  <Platforms>
-    <Platform Name="Win32" />
-  </Platforms>
-  <ToolFiles />
-  <Configurations>
-    <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
-      <Tool Name="VCPreBuildEventTool" />
-      <Tool Name="VCCustomBuildTool" />
-      <Tool Name="VCXMLDataGeneratorTool" />
-      <Tool Name="VCMIDLTool" />
-      <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="../../../../bindings/c" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" WarningLevel="3" DebugInformationFormat="4" />
-      <Tool Name="VCManagedResourceCompilerTool" />
-      <Tool Name="VCResourceCompilerTool" />
-      <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLinkerTool" OutputFile="../../../../bin/remote_lat.exe" GenerateDebugInformation="true" TargetMachine="1" />
-      <Tool Name="VCALinkTool" />
-      <Tool Name="VCManifestTool" />
-      <Tool Name="VCXDCMakeTool" />
-      <Tool Name="VCBscMakeTool" />
-      <Tool Name="VCFxCopTool" />
-      <Tool Name="VCAppVerifierTool" />
-      <Tool Name="VCPostBuildEventTool" />
-    </Configuration>
-    <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="1" CharacterSet="2" WholeProgramOptimization="1">
-      <Tool Name="VCPreBuildEventTool" />
-      <Tool Name="VCCustomBuildTool" />
-      <Tool Name="VCXMLDataGeneratorTool" />
-      <Tool Name="VCMIDLTool" />
-      <Tool Name="VCCLCompilerTool" Optimization="2" EnableIntrinsicFunctions="true" AdditionalIncludeDirectories="../../../../bindings/c" RuntimeLibrary="2" EnableFunctionLevelLinking="true" WarningLevel="3" DebugInformationFormat="3" />
-      <Tool Name="VCManagedResourceCompilerTool" />
-      <Tool Name="VCResourceCompilerTool" />
-      <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLinkerTool" OutputFile="../../../../bin/remote_lat.exe" GenerateDebugInformation="true" OptimizeReferences="2" EnableCOMDATFolding="2" TargetMachine="1" />
-      <Tool Name="VCALinkTool" />
-      <Tool Name="VCManifestTool" />
-      <Tool Name="VCXDCMakeTool" />
-      <Tool Name="VCBscMakeTool" />
-      <Tool Name="VCFxCopTool" />
-      <Tool Name="VCAppVerifierTool" />
-      <Tool Name="VCPostBuildEventTool" />
-    </Configuration>
-  </Configurations>
-  <References />
-  <Files>
-    <Filter Name="Source Files" Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
-      <File RelativePath="..\..\..\..\perf\remote_lat.cpp" />
-    </Filter>
-  </Files>
-  <Globals />
-</VisualStudioProject>
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2008/remote_thr/remote_thr.vcproj b/libs/libzmq/builds/deprecated-msvc/vs2008/remote_thr/remote_thr.vcproj
deleted file mode 100644
index f51fcfa..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2008/remote_thr/remote_thr.vcproj
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VisualStudioProject ProjectType="Visual C++" Version="9.00" Name="remote_thr" ProjectGUID="{B15E059C-0CBB-4A82-8C42-6567FB650802}" RootNamespace="remote_thr" TargetFrameworkVersion="196613">
-  <Platforms>
-    <Platform Name="Win32" />
-  </Platforms>
-  <ToolFiles />
-  <Configurations>
-    <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="1" CharacterSet="2">
-      <Tool Name="VCPreBuildEventTool" CommandLine="copy ..\..\platform.hpp ..\..\..\..\src" />
-      <Tool Name="VCCustomBuildTool" />
-      <Tool Name="VCXMLDataGeneratorTool" />
-      <Tool Name="VCMIDLTool" />
-      <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="../../../../bindings/c" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" WarningLevel="3" DebugInformationFormat="4" />
-      <Tool Name="VCManagedResourceCompilerTool" />
-      <Tool Name="VCResourceCompilerTool" />
-      <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLinkerTool" OutputFile="../../../../bin/remote_thr.exe" GenerateDebugInformation="true" TargetMachine="1" />
-      <Tool Name="VCALinkTool" />
-      <Tool Name="VCManifestTool" />
-      <Tool Name="VCXDCMakeTool" />
-      <Tool Name="VCBscMakeTool" />
-      <Tool Name="VCFxCopTool" />
-      <Tool Name="VCAppVerifierTool" />
-      <Tool Name="VCPostBuildEventTool" />
-    </Configuration>
-    <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" ConfigurationType="1" CharacterSet="2" WholeProgramOptimization="1">
-      <Tool Name="VCPreBuildEventTool" CommandLine="copy ..\..\platform.hpp ..\..\..\..\src" />
-      <Tool Name="VCCustomBuildTool" />
-      <Tool Name="VCXMLDataGeneratorTool" />
-      <Tool Name="VCMIDLTool" />
-      <Tool Name="VCCLCompilerTool" Optimization="2" EnableIntrinsicFunctions="true" AdditionalIncludeDirectories="../../../../bindings/c" RuntimeLibrary="2" EnableFunctionLevelLinking="true" WarningLevel="3" DebugInformationFormat="3" />
-      <Tool Name="VCManagedResourceCompilerTool" />
-      <Tool Name="VCResourceCompilerTool" />
-      <Tool Name="VCPreLinkEventTool" />
-      <Tool Name="VCLinkerTool" OutputFile="../../../../bin/remote_thr.exe" GenerateDebugInformation="true" OptimizeReferences="2" EnableCOMDATFolding="2" TargetMachine="1" />
-      <Tool Name="VCALinkTool" />
-      <Tool Name="VCManifestTool" />
-      <Tool Name="VCXDCMakeTool" />
-      <Tool Name="VCBscMakeTool" />
-      <Tool Name="VCFxCopTool" />
-      <Tool Name="VCAppVerifierTool" />
-      <Tool Name="VCPostBuildEventTool" />
-    </Configuration>
-  </Configurations>
-  <References />
-  <Files>
-    <Filter Name="Source Files" Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
-      <File RelativePath="..\..\..\..\perf\remote_thr.cpp" />
-    </Filter>
-  </Files>
-  <Globals />
-</VisualStudioProject>
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2010/inproc_lat/inproc_lat.props b/libs/libzmq/builds/deprecated-msvc/vs2010/inproc_lat/inproc_lat.props
deleted file mode 100644
index fc03c8b..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2010/inproc_lat/inproc_lat.props
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>ZeroMQ inproc_lat Common Settings</_PropertySheetDisplayName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-  </PropertyGroup>
-
-  <!-- Configuration -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <!-- Dependencies -->
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="..\libzmq.import.props" />
-    <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props"
-            Condition="Exists('$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props')" /> 
-  </ImportGroup>
-
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
-    <Linkage-libzmq>dynamic</Linkage-libzmq>
-    <!--<Linkage-libsodium>dynamic</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
-    <Linkage-libzmq>ltcg</Linkage-libzmq>
-    <!--<Linkage-libsodium>ltcg</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
-    <Linkage-libzmq>static</Linkage-libzmq>
-    <!--<Linkage-libsodium>static</Linkage-libsodium>-->
-  </PropertyGroup>
-
-  <!-- Messages -->
-
-  <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Linkage-libzmq    : $(Linkage-libzmq)" Importance="high"/>
-    <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high"  Condition="'$(HAVE_LIBSODIUM)'=='1'"/>
-  </Target>
-
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2010/inproc_lat/inproc_lat.vcxproj b/libs/libzmq/builds/deprecated-msvc/vs2010/inproc_lat/inproc_lat.vcxproj
deleted file mode 100644
index 8fbb870..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2010/inproc_lat/inproc_lat.vcxproj
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}</ProjectGuid>
-    <ProjectName>inproc_lat</ProjectName>
-    <PlatformToolset>v100</PlatformToolset>
-    <ConfigurationType>Application</ConfigurationType>
-  </PropertyGroup>
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DebugDEXE|Win32">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|Win32">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugDEXE|x64">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|x64">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|Win32">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|Win32">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|x64">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|x64">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|Win32">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|Win32">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|x64">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|x64">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
-    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-  </ImportGroup>
-  <PropertyGroup>
-    <Option-tweet>true</Option-tweet>
-  </PropertyGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\platform.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\..\perf\inproc_lat.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ItemGroup>
-    <ProjectReference Include="..\libzmq\libzmq.vcxproj">
-      <Project>{641c5f36-32ee-4323-b740-992b651cf9d6}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2010/inproc_thr/inproc_thr.props b/libs/libzmq/builds/deprecated-msvc/vs2010/inproc_thr/inproc_thr.props
deleted file mode 100644
index aba5058..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2010/inproc_thr/inproc_thr.props
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>ZeroMQ inproc_thr Common Settings</_PropertySheetDisplayName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-  </PropertyGroup>
-
-  <!-- Configuration -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <!-- Dependencies -->
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="..\libzmq.import.props" />
-    <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props"
-            Condition="Exists('$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props')" /> 
-  </ImportGroup>
-
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
-    <Linkage-libzmq>dynamic</Linkage-libzmq>
-    <!--<Linkage-libsodium>dynamic</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
-    <Linkage-libzmq>ltcg</Linkage-libzmq>
-    <!--<Linkage-libsodium>ltcg</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
-    <Linkage-libzmq>static</Linkage-libzmq>
-    <!--<Linkage-libsodium>static</Linkage-libsodium>-->
-  </PropertyGroup>
-
-  <!-- Messages -->
-
-  <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Linkage-libzmq    : $(Linkage-libzmq)" Importance="high"/>
-    <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high" Condition="'$(HAVE_LIBSODIUM)'=='1'"/>
-  </Target>
-
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2010/inproc_thr/inproc_thr.vcxproj b/libs/libzmq/builds/deprecated-msvc/vs2010/inproc_thr/inproc_thr.vcxproj
deleted file mode 100644
index 5d32fb8..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2010/inproc_thr/inproc_thr.vcxproj
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{1077E977-95DD-4E73-A692-74647DD0CC1E}</ProjectGuid>
-    <ProjectName>inproc_thr</ProjectName>
-    <PlatformToolset>v100</PlatformToolset>
-    <ConfigurationType>Application</ConfigurationType>
-  </PropertyGroup>
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DebugDEXE|Win32">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|Win32">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugDEXE|x64">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|x64">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|Win32">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|Win32">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|x64">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|x64">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|Win32">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|Win32">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|x64">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|x64">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
-    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-  </ImportGroup>
-  <PropertyGroup>
-    <Option-tweet>true</Option-tweet>
-  </PropertyGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\platform.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\..\perf\inproc_thr.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ItemGroup>
-    <ProjectReference Include="..\libzmq\libzmq.vcxproj">
-      <Project>{641c5f36-32ee-4323-b740-992b651cf9d6}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2010/libsodium.import.props b/libs/libzmq/builds/deprecated-msvc/vs2010/libsodium.import.props
deleted file mode 100644
index b3d7e4f..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2010/libsodium.import.props
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup Label="Globals">
-    <_PropertySheetDisplayName>Libsodium Import Settings</_PropertySheetDisplayName>
-  </PropertyGroup>
-
-  <!-- User Interface -->
-
-  <ItemGroup Label="BuildOptionsExtension">
-    <PropertyPageSchema Include="$(MSBuildThisFileDirectory)libsodium.import.xml" />
-  </ItemGroup>
-
-  <!-- Linkage -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\..\libsodium\src\libsodium\include;$(ProjectDir)..\..\..\..\..\libsodium\src\libsodium\include\sodium\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Linkage-libsodium)' == 'static' Or '$(Linkage-libsodium)' == 'ltcg'">SODIUM_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies Condition="'$(Linkage-libsodium)' != ''">advapi32.lib;libsodium.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Debug')) != -1">$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\$(PlatformToolset)\$(Linkage-libsodium)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Release')) != -1">$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Release\$(PlatformToolset)\$(Linkage-libsodium)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <!-- Copy -->
-
-  <Target Name="Linkage-libsodium-dynamic" AfterTargets="AfterBuild" Condition="'$(Linkage-libsodium)' == 'dynamic'">
-    <Copy Condition="$(Configuration.IndexOf('Debug')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\$(PlatformToolset)\dynamic\libsodium.dll"
-          DestinationFiles="$(TargetDir)libsodium.dll"
-          SkipUnchangedFiles="true" />
-    <Copy Condition="$(Configuration.IndexOf('Debug')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\$(PlatformToolset)\dynamic\libsodium.pdb"
-          DestinationFiles="$(TargetDir)libsodium.pdb"
-          SkipUnchangedFiles="true" />
-    <Copy Condition="$(Configuration.IndexOf('Release')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Release\$(PlatformToolset)\dynamic\libsodium.dll"
-          DestinationFiles="$(TargetDir)libsodium.dll"
-          SkipUnchangedFiles="true" />
-  </Target>
-
-  <!-- Messages -->
-
-  <Target Name="libsodium-info" BeforeTargets="AfterBuild" Condition="'$(Linkage-libsodium)' == 'dynamic'">
-    <Message Text="Copying libsodium.dll -&gt; $(TargetDir)libsodium.dll" Importance="high"/>
-    <Message Text="Copying libsodium.pdb -&gt; $(TargetDir)libsodium.pdb" Importance="high" Condition="$(Configuration.IndexOf('Debug')) != -1" />
-  </Target>
-
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2010/libsodium.import.xml b/libs/libzmq/builds/deprecated-msvc/vs2010/libsodium.import.xml
deleted file mode 100644
index dbcf4e5..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2010/libsodium.import.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ProjectSchemaDefinitions xmlns="clr-namespace:Microsoft.Build.Framework.XamlTypes;assembly=Microsoft.Build.Framework">
-  <Rule Name="libsodium-linkage-uiextension" PageTemplate="tool" DisplayName="Local Dependencies" SwitchPrefix="/" Order="1">
-    <Rule.Categories>
-      <Category Name="libsodium" DisplayName="libsodium" />
-    </Rule.Categories>
-    <Rule.DataSource>
-      <DataSource Persistence="ProjectFile" ItemType="" />
-    </Rule.DataSource>
-    <EnumProperty Name="Linkage-libsodium" DisplayName="Linkage" Description="How libsodium will be linked into the output of this project" Category="libsodium">
-      <EnumValue Name="" DisplayName="Not linked" />
-      <EnumValue Name="dynamic" DisplayName="Dynamic (DLL)" />
-      <EnumValue Name="static" DisplayName="Static (LIB)" />
-      <EnumValue Name="ltcg" DisplayName="Static using link time compile generation (LTCG)" />
-    </EnumProperty>
-  </Rule>
-</ProjectSchemaDefinitions>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2010/libzmq.import.props b/libs/libzmq/builds/deprecated-msvc/vs2010/libzmq.import.props
deleted file mode 100644
index 2f71ff8..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2010/libzmq.import.props
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup Label="Globals">
-    <_PropertySheetDisplayName>ZMQ Import Settings</_PropertySheetDisplayName>
-  </PropertyGroup>
-
-  <!-- User Interface -->
-
-  <ItemGroup Label="BuildOptionsExtension">
-    <PropertyPageSchema Include="$(MSBuildThisFileDirectory)libzmq.import.xml" />
-  </ItemGroup>
-
-  <!-- Configuration -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <PreprocessorDefinitions Condition="'$(Option-tweet)' == 'true'">ZMQ_USE_TWEETNACL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-sodium)' == 'true'">ZMQ_USE_LIBSODIUM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-openpgm)' == 'true'">ZMQ_HAVE_OPENPGM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-gssapi)' == 'true'">HAVE_LIBGSSAPI_KRB5;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-draftapi)' == 'true'">ZMQ_BUILD_DRAFT_API;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemDefinitionGroup>
-
-  <!-- Linkage -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\..\libzmq\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Linkage-libzmq)' == 'static' Or '$(Linkage-libzmq)' == 'ltcg'">ZMQ_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies Condition="'$(Linkage-libzmq)' != ''">libzmq.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Debug')) != -1">$(ProjectDir)..\..\..\..\..\libzmq\bin\$(PlatformName)\Debug\$(PlatformToolset)\$(Linkage-libzmq)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Release')) != -1">$(ProjectDir)..\..\..\..\..\libzmq\bin\$(PlatformName)\Release\$(PlatformToolset)\$(Linkage-libzmq)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <!-- Copy -->
-
-  <Target Name="Linkage-libzmq-dynamic" AfterTargets="AfterBuild" Condition="'$(Linkage-libzmq)' == 'dynamic'">
-    <Copy Condition="$(Configuration.IndexOf('Debug')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libzmq\bin\$(PlatformName)\Debug\$(PlatformToolset)\dynamic\libzmq.dll"
-          DestinationFiles="$(TargetDir)libzmq.dll"
-          SkipUnchangedFiles="true" />
-    <Copy Condition="$(Configuration.IndexOf('Debug')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libzmq\bin\$(PlatformName)\Debug\$(PlatformToolset)\dynamic\libzmq.pdb"
-          DestinationFiles="$(TargetDir)libzmq.pdb"
-          SkipUnchangedFiles="true" />
-    <Copy Condition="$(Configuration.IndexOf('Release')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libzmq\bin\$(PlatformName)\Release\$(PlatformToolset)\dynamic\libzmq.dll"
-          DestinationFiles="$(TargetDir)libzmq.dll"
-          SkipUnchangedFiles="true" />
-  </Target>
-
-  <!-- Messages -->
-
-  <Target Name="libzmq-info" BeforeTargets="AfterBuild" Condition="'$(Linkage-libzmq)' == 'dynamic'">
-    <Message Text="Copying libzmq.dll -&gt; $(TargetDir)libzmq.dll" Importance="high"/>
-    <Message Text="Copying libzmq.pdb -&gt; $(TargetDir)libzmq.pdb" Importance="high" Condition="$(Configuration.IndexOf('Debug')) != -1" />
-  </Target>
-
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2010/libzmq.import.xml b/libs/libzmq/builds/deprecated-msvc/vs2010/libzmq.import.xml
deleted file mode 100644
index a25a1ba..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2010/libzmq.import.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ProjectSchemaDefinitions xmlns="clr-namespace:Microsoft.Build.Framework.XamlTypes;assembly=Microsoft.Build.Framework">
-  <Rule Name="libzmq-options-uiextension" PageTemplate="tool" DisplayName="ZMQ Options" SwitchPrefix="/" Order="1">
-    <Rule.Categories>
-      <Category Name="tweet" DisplayName="tweet" />
-      <Category Name="sodium" DisplayName="sodium" />
-      <Category Name="openpgm" DisplayName="openpgm" />
-      <Category Name="gssapi" DisplayName="gssapi" />
-      <Category Name="draftapi" DisplayName="draftapi" />
-    </Rule.Categories>
-    <Rule.DataSource>
-      <DataSource Persistence="ProjectFile" ItemType="" />
-    </Rule.DataSource>
-    <EnumProperty Name="Option-tweet" DisplayName="Enable Tweet NaCl" Description="Enable the Tweet NaCl build option" Category="tweet">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-    <EnumProperty Name="Option-sodium" DisplayName="Enable Sodium" Description="Enable the Sodium build option" Category="sodium">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-    <EnumProperty Name="Option-openpgm" DisplayName="Enable OpenPGM" Description="Enable the OpenPGM build option" Category="openpgm">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-    <EnumProperty Name="Option-gssapi" DisplayName="Enable GSS API" Description="Enable the GSS API build option" Category="gssapi">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-    <EnumProperty Name="Option-draftapi" DisplayName="Enable Draft API" Description="Enable Draft API build option" Category="draftapi">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-  </Rule>
-  <Rule Name="libzmq-linkage-uiextension" PageTemplate="tool" DisplayName="Local Dependencies" SwitchPrefix="/" Order="1">
-    <Rule.Categories>
-      <Category Name="libzmq" DisplayName="libzmq" />
-    </Rule.Categories>
-    <Rule.DataSource>
-      <DataSource Persistence="ProjectFile" ItemType="" />
-    </Rule.DataSource>
-    <EnumProperty Name="Linkage-libzmq" DisplayName="Linkage" Description="How libzmq will be linked into the output of this project" Category="libzmq">
-      <EnumValue Name="" DisplayName="Not linked" />
-      <EnumValue Name="dynamic" DisplayName="Dynamic (DLL)" />
-      <EnumValue Name="static" DisplayName="Static (LIB)" />
-      <EnumValue Name="ltcg" DisplayName="Static using link time compile generation (LTCG)" />
-    </EnumProperty>
-  </Rule>
-</ProjectSchemaDefinitions>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2010/libzmq.sln b/libs/libzmq/builds/deprecated-msvc/vs2010/libzmq.sln
deleted file mode 100644
index 45a13cb..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2010/libzmq.sln
+++ /dev/null
@@ -1,206 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libzmq", "libzmq\libzmq.vcxproj", "{641C5F36-32EE-4323-B740-992B651CF9D6}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "inproc_thr", "inproc_thr\inproc_thr.vcxproj", "{1077E977-95DD-4E73-A692-74647DD0CC1E}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "inproc_lat", "inproc_lat\inproc_lat.vcxproj", "{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "remote_thr", "remote_thr\remote_thr.vcxproj", "{B15E059C-0CBB-4A82-8C42-6567FB650802}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "remote_lat", "remote_lat\remote_lat.vcxproj", "{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "local_thr", "local_thr\local_thr.vcxproj", "{8EF2DF6B-6646-460F-8032-913B70FE0E94}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "local_lat", "local_lat\local_lat.vcxproj", "{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		DynDebug|Win32 = DynDebug|Win32
-		DynDebug|x64 = DynDebug|x64
-		DynRelease|Win32 = DynRelease|Win32
-		DynRelease|x64 = DynRelease|x64
-		LtcgDebug|Win32 = LtcgDebug|Win32
-		LtcgDebug|x64 = LtcgDebug|x64
-		LtcgRelease|Win32 = LtcgRelease|Win32
-		LtcgRelease|x64 = LtcgRelease|x64
-		StaticDebug|Win32 = StaticDebug|Win32
-		StaticDebug|x64 = StaticDebug|x64
-		StaticRelease|Win32 = StaticRelease|Win32
-		StaticRelease|x64 = StaticRelease|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.DynDebug|Win32.ActiveCfg = DebugDLL|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.DynDebug|Win32.Build.0 = DebugDLL|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.DynDebug|x64.ActiveCfg = DebugDLL|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.DynDebug|x64.Build.0 = DebugDLL|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.DynRelease|Win32.ActiveCfg = ReleaseDLL|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.DynRelease|Win32.Build.0 = ReleaseDLL|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.DynRelease|x64.ActiveCfg = ReleaseDLL|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.DynRelease|x64.Build.0 = ReleaseDLL|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.LtcgDebug|Win32.ActiveCfg = DebugLTCG|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.LtcgDebug|Win32.Build.0 = DebugLTCG|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.LtcgDebug|x64.ActiveCfg = DebugLTCG|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.LtcgDebug|x64.Build.0 = DebugLTCG|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.LtcgRelease|Win32.ActiveCfg = ReleaseLTCG|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.LtcgRelease|Win32.Build.0 = ReleaseLTCG|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.LtcgRelease|x64.ActiveCfg = ReleaseLTCG|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.LtcgRelease|x64.Build.0 = ReleaseLTCG|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.StaticDebug|Win32.ActiveCfg = DebugLIB|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.StaticDebug|Win32.Build.0 = DebugLIB|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.StaticDebug|x64.ActiveCfg = DebugLIB|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.StaticDebug|x64.Build.0 = DebugLIB|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.StaticRelease|Win32.ActiveCfg = ReleaseLIB|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.StaticRelease|Win32.Build.0 = ReleaseLIB|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.StaticRelease|x64.ActiveCfg = ReleaseLIB|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.StaticRelease|x64.Build.0 = ReleaseLIB|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.DynDebug|Win32.ActiveCfg = DebugDEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.DynDebug|Win32.Build.0 = DebugDEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.DynDebug|x64.ActiveCfg = DebugDEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.DynDebug|x64.Build.0 = DebugDEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.DynRelease|Win32.ActiveCfg = ReleaseDEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.DynRelease|Win32.Build.0 = ReleaseDEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.DynRelease|x64.ActiveCfg = ReleaseDEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.DynRelease|x64.Build.0 = ReleaseDEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.LtcgDebug|Win32.ActiveCfg = DebugLEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.LtcgDebug|Win32.Build.0 = DebugLEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.LtcgDebug|x64.ActiveCfg = DebugLEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.LtcgDebug|x64.Build.0 = DebugLEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.LtcgRelease|Win32.ActiveCfg = ReleaseLEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.LtcgRelease|Win32.Build.0 = ReleaseLEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.LtcgRelease|x64.ActiveCfg = ReleaseLEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.LtcgRelease|x64.Build.0 = ReleaseLEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.StaticDebug|Win32.ActiveCfg = DebugSEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.StaticDebug|Win32.Build.0 = DebugSEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.StaticDebug|x64.ActiveCfg = DebugSEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.StaticDebug|x64.Build.0 = DebugSEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.StaticRelease|Win32.ActiveCfg = ReleaseSEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.StaticRelease|Win32.Build.0 = ReleaseSEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.StaticRelease|x64.ActiveCfg = ReleaseSEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.StaticRelease|x64.Build.0 = ReleaseSEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.DynDebug|Win32.ActiveCfg = DebugDEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.DynDebug|Win32.Build.0 = DebugDEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.DynDebug|x64.ActiveCfg = DebugDEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.DynDebug|x64.Build.0 = DebugDEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.DynRelease|Win32.ActiveCfg = ReleaseDEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.DynRelease|Win32.Build.0 = ReleaseDEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.DynRelease|x64.ActiveCfg = ReleaseDEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.DynRelease|x64.Build.0 = ReleaseDEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.LtcgDebug|Win32.ActiveCfg = DebugLEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.LtcgDebug|Win32.Build.0 = DebugLEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.LtcgDebug|x64.ActiveCfg = DebugLEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.LtcgDebug|x64.Build.0 = DebugLEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.LtcgRelease|Win32.ActiveCfg = ReleaseLEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.LtcgRelease|Win32.Build.0 = ReleaseLEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.LtcgRelease|x64.ActiveCfg = ReleaseLEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.LtcgRelease|x64.Build.0 = ReleaseLEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.StaticDebug|Win32.ActiveCfg = DebugSEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.StaticDebug|Win32.Build.0 = DebugSEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.StaticDebug|x64.ActiveCfg = DebugSEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.StaticDebug|x64.Build.0 = DebugSEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.StaticRelease|Win32.ActiveCfg = ReleaseSEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.StaticRelease|Win32.Build.0 = ReleaseSEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.StaticRelease|x64.ActiveCfg = ReleaseSEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.StaticRelease|x64.Build.0 = ReleaseSEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.DynDebug|Win32.ActiveCfg = DebugDEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.DynDebug|Win32.Build.0 = DebugDEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.DynDebug|x64.ActiveCfg = DebugDEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.DynDebug|x64.Build.0 = DebugDEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.DynRelease|Win32.ActiveCfg = ReleaseDEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.DynRelease|Win32.Build.0 = ReleaseDEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.DynRelease|x64.ActiveCfg = ReleaseDEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.DynRelease|x64.Build.0 = ReleaseDEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.LtcgDebug|Win32.ActiveCfg = DebugLEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.LtcgDebug|Win32.Build.0 = DebugLEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.LtcgDebug|x64.ActiveCfg = DebugLEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.LtcgDebug|x64.Build.0 = DebugLEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.LtcgRelease|Win32.ActiveCfg = ReleaseLEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.LtcgRelease|Win32.Build.0 = ReleaseLEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.LtcgRelease|x64.ActiveCfg = ReleaseLEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.LtcgRelease|x64.Build.0 = ReleaseLEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.StaticDebug|Win32.ActiveCfg = DebugSEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.StaticDebug|Win32.Build.0 = DebugSEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.StaticDebug|x64.ActiveCfg = DebugSEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.StaticDebug|x64.Build.0 = DebugSEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.StaticRelease|Win32.ActiveCfg = ReleaseSEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.StaticRelease|Win32.Build.0 = ReleaseSEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.StaticRelease|x64.ActiveCfg = ReleaseSEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.StaticRelease|x64.Build.0 = ReleaseSEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.DynDebug|Win32.ActiveCfg = DebugDEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.DynDebug|Win32.Build.0 = DebugDEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.DynDebug|x64.ActiveCfg = DebugDEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.DynDebug|x64.Build.0 = DebugDEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.DynRelease|Win32.ActiveCfg = ReleaseDEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.DynRelease|Win32.Build.0 = ReleaseDEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.DynRelease|x64.ActiveCfg = ReleaseDEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.DynRelease|x64.Build.0 = ReleaseDEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.LtcgDebug|Win32.ActiveCfg = DebugLEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.LtcgDebug|Win32.Build.0 = DebugLEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.LtcgDebug|x64.ActiveCfg = DebugLEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.LtcgDebug|x64.Build.0 = DebugLEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.LtcgRelease|Win32.ActiveCfg = ReleaseLEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.LtcgRelease|Win32.Build.0 = ReleaseLEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.LtcgRelease|x64.ActiveCfg = ReleaseLEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.LtcgRelease|x64.Build.0 = ReleaseLEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.StaticDebug|Win32.ActiveCfg = DebugSEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.StaticDebug|Win32.Build.0 = DebugSEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.StaticDebug|x64.ActiveCfg = DebugSEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.StaticDebug|x64.Build.0 = DebugSEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.StaticRelease|Win32.ActiveCfg = ReleaseSEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.StaticRelease|Win32.Build.0 = ReleaseSEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.StaticRelease|x64.ActiveCfg = ReleaseSEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.StaticRelease|x64.Build.0 = ReleaseSEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.DynDebug|Win32.ActiveCfg = DebugDEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.DynDebug|Win32.Build.0 = DebugDEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.DynDebug|x64.ActiveCfg = DebugDEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.DynDebug|x64.Build.0 = DebugDEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.DynRelease|Win32.ActiveCfg = ReleaseDEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.DynRelease|Win32.Build.0 = ReleaseDEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.DynRelease|x64.ActiveCfg = ReleaseDEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.DynRelease|x64.Build.0 = ReleaseDEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.LtcgDebug|Win32.ActiveCfg = DebugLEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.LtcgDebug|Win32.Build.0 = DebugLEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.LtcgDebug|x64.ActiveCfg = DebugLEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.LtcgDebug|x64.Build.0 = DebugLEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.LtcgRelease|Win32.ActiveCfg = ReleaseLEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.LtcgRelease|Win32.Build.0 = ReleaseLEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.LtcgRelease|x64.ActiveCfg = ReleaseLEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.LtcgRelease|x64.Build.0 = ReleaseLEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.StaticDebug|Win32.ActiveCfg = DebugSEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.StaticDebug|Win32.Build.0 = DebugSEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.StaticDebug|x64.ActiveCfg = DebugSEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.StaticDebug|x64.Build.0 = DebugSEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.StaticRelease|Win32.ActiveCfg = ReleaseSEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.StaticRelease|Win32.Build.0 = ReleaseSEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.StaticRelease|x64.ActiveCfg = ReleaseSEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.StaticRelease|x64.Build.0 = ReleaseSEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.DynDebug|Win32.ActiveCfg = DebugDEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.DynDebug|Win32.Build.0 = DebugDEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.DynDebug|x64.ActiveCfg = DebugDEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.DynDebug|x64.Build.0 = DebugDEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.DynRelease|Win32.ActiveCfg = ReleaseDEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.DynRelease|Win32.Build.0 = ReleaseDEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.DynRelease|x64.ActiveCfg = ReleaseDEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.DynRelease|x64.Build.0 = ReleaseDEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.LtcgDebug|Win32.ActiveCfg = DebugLEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.LtcgDebug|Win32.Build.0 = DebugLEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.LtcgDebug|x64.ActiveCfg = DebugLEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.LtcgDebug|x64.Build.0 = DebugLEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.LtcgRelease|Win32.ActiveCfg = ReleaseLEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.LtcgRelease|Win32.Build.0 = ReleaseLEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.LtcgRelease|x64.ActiveCfg = ReleaseLEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.LtcgRelease|x64.Build.0 = ReleaseLEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.StaticDebug|Win32.ActiveCfg = DebugSEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.StaticDebug|Win32.Build.0 = DebugSEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.StaticDebug|x64.ActiveCfg = DebugSEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.StaticDebug|x64.Build.0 = DebugSEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.StaticRelease|Win32.ActiveCfg = ReleaseSEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.StaticRelease|Win32.Build.0 = ReleaseSEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.StaticRelease|x64.ActiveCfg = ReleaseSEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.StaticRelease|x64.Build.0 = ReleaseSEXE|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2010/libzmq/libzmq.props b/libs/libzmq/builds/deprecated-msvc/vs2010/libzmq/libzmq.props
deleted file mode 100644
index 22da05a..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2010/libzmq/libzmq.props
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>ZeroMQ Library Common Settings</_PropertySheetDisplayName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-  </PropertyGroup>
-
-  <!-- User Interface -->
-
-  <ItemGroup Label="BuildOptionsExtension">
-    <PropertyPageSchema Include="$(MSBuildThisFileDirectory)$(ProjectName).xml" />
-  </ItemGroup>
-
-  <!-- Configuration -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\;$(ProjectDir)..\..\..\..\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <EnablePREfast>false</EnablePREfast>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>precompiled.hpp</PrecompiledHeaderFile>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;FD_SETSIZE=16384;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-tweet)' == 'true'">ZMQ_USE_TWEETNACL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-sodium)' == 'true'">ZMQ_USE_LIBSODIUM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-tweet)' == 'true' Or '$(Option-sodium)' == 'true'">ZMQ_HAVE_CURVE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-openpgm)' == 'true'">ZMQ_HAVE_OPENPGM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-gssapi)' == 'true'">HAVE_LIBGSSAPI_KRB5;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-draftapi)' == 'true'">ZMQ_BUILD_DRAFT_API;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-usepoll)' == 'true'">ZMQ_USE_POLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-usepoll)' != 'true'">ZMQ_USE_SELECT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(ConfigurationType)' == 'StaticLibrary'">ZMQ_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(ConfigurationType)' == 'DynamicLibrary'">DLL_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>Advapi32.lib;Ws2_32.lib;Rpcrt4.lib;Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <Lib Condition="'$(ConfigurationType)'=='StaticLibrary'">
-      <AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions>
-    </Lib>
-  </ItemDefinitionGroup>
-
-  <!-- Dependencies -->
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props"
-            Condition="Exists('$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props')" /> 
-  </ImportGroup>
-
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
-    <!--<Linkage-libsodium>dynamic</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
-    <!--<Linkage-libsodium>ltcg</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
-    <!--<Linkage-libsodium>static</Linkage-libsodium>-->
-  </PropertyGroup>
-
-  <!-- Messages -->
-
-  <Target Name="OptionInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Option-tweet      : $(Option-tweet)" Importance="high"/>
-    <Message Text="Option-sodium     : $(Option-sodium)" Importance="high"/>
-    <Message Text="Option-openpgm    : $(Option-openpgm)" Importance="high"/>
-    <Message Text="Option-gssapi     : $(Option-gssapi)" Importance="high"/>
-    <Message Text="Option-draftapi   : $(Option-draftapi)" Importance="high"/>
-    <Message Text="Option-usepoll    : $(Option-usepoll)" Importance="high"/>
-  </Target>
-
-  <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high" Condition="'$(Option-sodium)' == 'true'"/>
-  </Target>
-
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2010/libzmq/libzmq.vcxproj b/libs/libzmq/builds/deprecated-msvc/vs2010/libzmq/libzmq.vcxproj
deleted file mode 100644
index bc07be2..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2010/libzmq/libzmq.vcxproj
+++ /dev/null
@@ -1,289 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{641C5F36-32EE-4323-B740-992B651CF9D6}</ProjectGuid>
-    <ProjectName>libzmq</ProjectName>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DebugDLL|Win32">
-      <Configuration>DebugDLL</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDLL|Win32">
-      <Configuration>ReleaseDLL</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugDLL|x64">
-      <Configuration>DebugDLL</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDLL|x64">
-      <Configuration>ReleaseDLL</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLTCG|Win32">
-      <Configuration>DebugLTCG</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLTCG|Win32">
-      <Configuration>ReleaseLTCG</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLTCG|x64">
-      <Configuration>DebugLTCG</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLTCG|x64">
-      <Configuration>ReleaseLTCG</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLIB|Win32">
-      <Configuration>DebugLIB</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLIB|Win32">
-      <Configuration>ReleaseLIB</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLIB|x64">
-      <Configuration>DebugLIB</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLIB|x64">
-      <Configuration>ReleaseLIB</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Configuration">
-    <ConfigurationType Condition="$(Configuration.IndexOf('DLL')) == -1">StaticLibrary</ConfigurationType>
-    <ConfigurationType Condition="$(Configuration.IndexOf('DLL')) != -1">DynamicLibrary</ConfigurationType>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
-    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-  </ImportGroup>
-  <PropertyGroup>
-    <Option-tweet>true</Option-tweet>
-  </PropertyGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\platform.hpp" />
-    <ClInclude Include="..\..\resource.h" />
-    <ClInclude Include="..\..\..\..\include\zmq.h" />
-    <ClInclude Include="..\..\..\..\src\zmq_draft.h" />
-    <ClInclude Include="..\..\..\..\src\address.hpp" />
-    <ClInclude Include="..\..\..\..\src\array.hpp" />
-    <ClInclude Include="..\..\..\..\src\atomic_counter.hpp" />
-    <ClInclude Include="..\..\..\..\src\atomic_ptr.hpp" />
-    <ClInclude Include="..\..\..\..\src\blob.hpp" />
-    <ClInclude Include="..\..\..\..\src\client.hpp" />
-    <ClInclude Include="..\..\..\..\src\clock.hpp" />
-    <ClInclude Include="..\..\..\..\src\command.hpp" />
-    <ClInclude Include="..\..\..\..\src\condition_variable.hpp" />
-    <ClInclude Include="..\..\..\..\src\config.hpp" />
-    <ClInclude Include="..\..\..\..\src\ctx.hpp" />
-    <ClInclude Include="..\..\..\..\src\curve_client.hpp" />
-    <ClInclude Include="..\..\..\..\src\curve_server.hpp" />
-    <ClInclude Include="..\..\..\..\src\decoder.hpp" />
-    <ClInclude Include="..\..\..\..\src\decoder_allocators.hpp" />
-    <ClInclude Include="..\..\..\..\src\devpoll.hpp" />
-    <ClInclude Include="..\..\..\..\src\dgram.hpp" />
-    <ClInclude Include="..\..\..\..\src\dish.hpp" />
-    <ClInclude Include="..\..\..\..\src\dist.hpp" />
-    <ClInclude Include="..\..\..\..\src\encoder.hpp" />
-    <ClInclude Include="..\..\..\..\src\epoll.hpp" />
-    <ClInclude Include="..\..\..\..\src\err.hpp" />
-    <ClInclude Include="..\..\..\..\src\fd.hpp" />
-    <ClInclude Include="..\..\..\..\src\fq.hpp" />
-    <ClInclude Include="..\..\..\..\src\gather.hpp" />
-    <ClInclude Include="..\..\..\..\src\gssapi_client.hpp" />
-    <ClInclude Include="..\..\..\..\src\gssapi_mechanism_base.hpp" />
-    <ClInclude Include="..\..\..\..\src\gssapi_server.hpp" />
-    <ClInclude Include="..\..\..\..\src\i_engine.hpp" />
-    <ClInclude Include="..\..\..\..\src\i_poll_events.hpp" />
-    <ClInclude Include="..\..\..\..\src\io_object.hpp" />
-    <ClInclude Include="..\..\..\..\src\io_thread.hpp" />
-    <ClInclude Include="..\..\..\..\src\ip.hpp" />
-    <ClInclude Include="..\..\..\..\src\ipc_address.hpp" />
-    <ClInclude Include="..\..\..\..\src\ipc_connecter.hpp" />
-    <ClInclude Include="..\..\..\..\src\ipc_listener.hpp" />
-    <ClInclude Include="..\..\..\..\src\kqueue.hpp" />
-    <ClInclude Include="..\..\..\..\src\lb.hpp" />
-    <ClInclude Include="..\..\..\..\src\likely.hpp" />
-    <ClInclude Include="..\..\..\..\src\mailbox.hpp" />
-    <ClInclude Include="..\..\..\..\src\mailbox_safe.hpp" />
-    <ClInclude Include="..\..\..\..\src\msg.hpp" />
-    <ClInclude Include="..\..\..\..\src\mtrie.hpp" />
-    <ClInclude Include="..\..\..\..\src\mutex.hpp" />
-    <ClInclude Include="..\..\..\..\src\object.hpp" />
-    <ClInclude Include="..\..\..\..\src\options.hpp" />
-    <ClInclude Include="..\..\..\..\src\own.hpp" />
-    <ClInclude Include="..\..\..\..\src\pair.hpp" />
-    <ClInclude Include="..\..\..\..\src\pgm_receiver.hpp" />
-    <ClInclude Include="..\..\..\..\src\pgm_sender.hpp" />
-    <ClInclude Include="..\..\..\..\src\pgm_socket.hpp" />
-    <ClInclude Include="..\..\..\..\src\pipe.hpp" />
-    <ClInclude Include="..\..\..\..\src\server.hpp" />
-    <ClInclude Include="..\..\..\..\src\socks.hpp" />
-    <ClInclude Include="..\..\..\..\src\socks_connecter.hpp" />
-    <ClInclude Include="..\..\..\..\src\poll.hpp" />
-    <ClInclude Include="..\..\..\..\src\poller.hpp" />
-    <ClInclude Include="..\..\..\..\src\poller_base.hpp" />
-    <ClInclude Include="..\..\..\..\src\precompiled.hpp" />
-    <ClInclude Include="..\..\..\..\src\proxy.hpp" />
-    <ClInclude Include="..\..\..\..\src\pub.hpp" />
-    <ClInclude Include="..\..\..\..\src\pull.hpp" />
-    <ClInclude Include="..\..\..\..\src\push.hpp" />
-    <ClInclude Include="..\..\..\..\src\radio.hpp" />
-    <ClInclude Include="..\..\..\..\src\random.hpp" />
-    <ClInclude Include="..\..\..\..\src\raw_decoder.hpp" />
-    <ClInclude Include="..\..\..\..\src\raw_encoder.hpp" />
-    <ClInclude Include="..\..\..\..\src\reaper.hpp" />
-    <ClInclude Include="..\..\..\..\src\rep.hpp" />
-    <ClInclude Include="..\..\..\..\src\req.hpp" />
-    <ClInclude Include="..\..\..\..\src\scatter.hpp" />
-    <ClInclude Include="..\..\..\..\src\select.hpp" />
-    <ClInclude Include="..\..\..\..\src\session_base.hpp" />
-    <ClInclude Include="..\..\..\..\src\signaler.hpp" />
-    <ClInclude Include="..\..\..\..\src\socket_base.hpp" />
-    <ClInclude Include="..\..\..\..\src\stdint.hpp" />
-    <ClInclude Include="..\..\..\..\src\stream_engine.hpp" />
-    <ClInclude Include="..\..\..\..\src\sub.hpp" />
-    <ClInclude Include="..\..\..\..\src\tcp.hpp" />
-    <ClInclude Include="..\..\..\..\src\tcp_address.hpp" />
-    <ClInclude Include="..\..\..\..\src\tcp_connecter.hpp" />
-    <ClInclude Include="..\..\..\..\src\tcp_listener.hpp" />
-    <ClInclude Include="..\..\..\..\src\timers.hpp" />
-    <ClInclude Include="..\..\..\..\src\thread.hpp" />
-    <ClInclude Include="..\..\..\..\src\trie.hpp" />
-    <ClInclude Include="..\..\..\..\src\tweetnacl.h" />
-    <ClInclude Include="..\..\..\..\src\udp_address.hpp" />
-    <ClInclude Include="..\..\..\..\src\udp_engine.hpp" />
-    <ClInclude Include="..\..\..\..\src\v1_decoder.hpp" />
-    <ClInclude Include="..\..\..\..\src\v1_encoder.hpp" />
-    <ClInclude Include="..\..\..\..\src\v1_protocol.hpp" />
-    <ClInclude Include="..\..\..\..\src\windows.hpp" />
-    <ClInclude Include="..\..\..\..\src\wire.hpp" />
-    <ClInclude Include="..\..\..\..\src\xpub.hpp" />
-    <ClInclude Include="..\..\..\..\src\xrep.hpp" />
-    <ClInclude Include="..\..\..\..\src\xreq.hpp" />
-    <ClInclude Include="..\..\..\..\src\xsub.hpp" />
-    <ClInclude Include="..\..\..\..\src\ypipe.hpp" />
-    <ClInclude Include="..\..\..\..\src\yqueue.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\..\src\address.cpp" />
-    <ClCompile Include="..\..\..\..\src\client.cpp" />
-    <ClCompile Include="..\..\..\..\src\clock.cpp" />
-    <ClCompile Include="..\..\..\..\src\ctx.cpp" />
-    <ClCompile Include="..\..\..\..\src\curve_client.cpp" />
-    <ClCompile Include="..\..\..\..\src\curve_mechanism_base.cpp" />
-    <ClCompile Include="..\..\..\..\src\curve_server.cpp" />
-    <ClCompile Include="..\..\..\..\src\dealer.cpp" />
-    <ClCompile Include="..\..\..\..\src\decoder_allocators.cpp" />
-    <ClCompile Include="..\..\..\..\src\devpoll.cpp" />
-    <ClCompile Include="..\..\..\..\src\dgram.cpp" />
-    <ClCompile Include="..\..\..\..\src\dish.cpp" />
-    <ClCompile Include="..\..\..\..\src\dist.cpp" />
-    <ClCompile Include="..\..\..\..\src\epoll.cpp" />
-    <ClCompile Include="..\..\..\..\src\err.cpp" />
-    <ClCompile Include="..\..\..\..\src\fq.cpp" />
-    <ClCompile Include="..\..\..\..\src\gather.cpp" />
-    <ClCompile Include="..\..\..\..\src\gssapi_client.cpp" />
-    <ClCompile Include="..\..\..\..\src\gssapi_mechanism_base.cpp" />
-    <ClCompile Include="..\..\..\..\src\gssapi_server.cpp" />
-    <ClCompile Include="..\..\..\..\src\io_object.cpp" />
-    <ClCompile Include="..\..\..\..\src\io_thread.cpp" />
-    <ClCompile Include="..\..\..\..\src\ip.cpp" />
-    <ClCompile Include="..\..\..\..\src\ipc_address.cpp" />
-    <ClCompile Include="..\..\..\..\src\ipc_connecter.cpp" />
-    <ClCompile Include="..\..\..\..\src\ipc_listener.cpp" />
-    <ClCompile Include="..\..\..\..\src\kqueue.cpp" />
-    <ClCompile Include="..\..\..\..\src\lb.cpp" />
-    <ClCompile Include="..\..\..\..\src\mailbox.cpp" />
-    <ClCompile Include="..\..\..\..\src\mailbox_safe.cpp" />
-    <ClCompile Include="..\..\..\..\src\mechanism.cpp" />
-    <ClCompile Include="..\..\..\..\src\mechanism_base.cpp" />
-    <ClCompile Include="..\..\..\..\src\metadata.cpp" />
-    <ClCompile Include="..\..\..\..\src\msg.cpp" />
-    <ClCompile Include="..\..\..\..\src\mtrie.cpp" />
-    <ClCompile Include="..\..\..\..\src\null_mechanism.cpp" />
-    <ClCompile Include="..\..\..\..\src\object.cpp" />
-    <ClCompile Include="..\..\..\..\src\options.cpp" />
-    <ClCompile Include="..\..\..\..\src\own.cpp" />
-    <ClCompile Include="..\..\..\..\src\pair.cpp" />
-    <ClCompile Include="..\..\..\..\src\pgm_receiver.cpp" />
-    <ClCompile Include="..\..\..\..\src\pgm_sender.cpp" />
-    <ClCompile Include="..\..\..\..\src\pgm_socket.cpp" />
-    <ClCompile Include="..\..\..\..\src\pipe.cpp" />
-    <ClCompile Include="..\..\..\..\src\plain_client.cpp" />
-    <ClCompile Include="..\..\..\..\src\plain_server.cpp" />
-    <ClCompile Include="..\..\..\..\src\poll.cpp" />
-    <ClCompile Include="..\..\..\..\src\poller_base.cpp" />
-    <ClCompile Include="..\..\..\..\src\precompiled.cpp">
-      <PrecompiledHeader>Create</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\proxy.cpp" />
-    <ClCompile Include="..\..\..\..\src\pub.cpp" />
-    <ClCompile Include="..\..\..\..\src\pull.cpp" />
-    <ClCompile Include="..\..\..\..\src\push.cpp" />
-    <ClCompile Include="..\..\..\..\src\radio.cpp" />
-    <ClCompile Include="..\..\..\..\src\random.cpp" />
-    <ClCompile Include="..\..\..\..\src\raw_decoder.cpp" />
-    <ClCompile Include="..\..\..\..\src\raw_encoder.cpp" />
-    <ClCompile Include="..\..\..\..\src\reaper.cpp" />
-    <ClCompile Include="..\..\..\..\src\rep.cpp" />
-    <ClCompile Include="..\..\..\..\src\req.cpp" />
-    <ClCompile Include="..\..\..\..\src\router.cpp" />
-    <ClCompile Include="..\..\..\..\src\scatter.cpp" />
-    <ClCompile Include="..\..\..\..\src\select.cpp" />
-    <ClCompile Include="..\..\..\..\src\server.cpp" />
-    <ClCompile Include="..\..\..\..\src\session_base.cpp" />
-    <ClCompile Include="..\..\..\..\src\signaler.cpp" />
-    <ClCompile Include="..\..\..\..\src\socket_base.cpp" />
-    <ClCompile Include="..\..\..\..\src\socket_poller.cpp" />
-    <ClCompile Include="..\..\..\..\src\socks.cpp" />
-    <ClCompile Include="..\..\..\..\src\socks_connecter.cpp" />
-    <ClCompile Include="..\..\..\..\src\stream.cpp" />
-    <ClCompile Include="..\..\..\..\src\stream_engine.cpp" />
-    <ClCompile Include="..\..\..\..\src\sub.cpp" />
-    <ClCompile Include="..\..\..\..\src\tcp.cpp" />
-    <ClCompile Include="..\..\..\..\src\tcp_address.cpp" />
-    <ClCompile Include="..\..\..\..\src\tcp_connecter.cpp" />
-    <ClCompile Include="..\..\..\..\src\tcp_listener.cpp" />
-    <ClCompile Include="..\..\..\..\src\thread.cpp" />
-    <ClCompile Include="..\..\..\..\src\timers.cpp" />
-    <ClCompile Include="..\..\..\..\src\trie.cpp" />
-    <ClCompile Include="..\..\..\..\src\tweetnacl.c">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\udp_address.cpp" />
-    <ClCompile Include="..\..\..\..\src\udp_engine.cpp" />
-    <ClCompile Include="..\..\..\..\src\v1_decoder.cpp" />
-    <ClCompile Include="..\..\..\..\src\v1_encoder.cpp" />
-    <ClCompile Include="..\..\..\..\src\v2_decoder.cpp" />
-    <ClCompile Include="..\..\..\..\src\v2_encoder.cpp" />
-    <ClCompile Include="..\..\..\..\src\xpub.cpp" />
-    <ClCompile Include="..\..\..\..\src\xsub.cpp" />
-    <ClCompile Include="..\..\..\..\src\zap_client.cpp" />
-    <ClCompile Include="..\..\..\..\src\zmq.cpp" />
-    <ClCompile Include="..\..\..\..\src\zmq_utils.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\..\..\..\packaging\nuget\package.bat" />
-    <None Include="..\..\..\..\packaging\nuget\package.config" />
-    <None Include="..\..\..\..\packaging\nuget\package.gsl" />
-    <None Include="..\..\..\..\packaging\nuget\package.nuspec" />
-    <None Include="..\..\..\..\packaging\nuget\package.targets" />
-  </ItemGroup>
-  <ItemGroup>
-    <Xml Include="..\..\..\..\packaging\nuget\package.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\..\resource.rc" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2010/libzmq/libzmq.vcxproj.filters b/libs/libzmq/builds/deprecated-msvc/vs2010/libzmq/libzmq.vcxproj.filters
deleted file mode 100644
index 930b009..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2010/libzmq/libzmq.vcxproj.filters
+++ /dev/null
@@ -1,627 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClCompile Include="..\..\..\..\src\address.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\clock.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\ctx.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\dealer.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\devpoll.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\dgram.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\dist.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\epoll.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\err.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\fq.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\io_object.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\io_thread.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\ip.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\ipc_address.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\ipc_connecter.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\ipc_listener.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\kqueue.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\lb.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mailbox.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mechanism.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\metadata.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\msg.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mtrie.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\null_mechanism.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\object.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\options.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\own.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\pair.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\pgm_receiver.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\pgm_sender.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\pgm_socket.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\pipe.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\plain_client.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\plain_server.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\poll.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\poller_base.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\proxy.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\pub.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\pull.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\push.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\random.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\raw_decoder.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\raw_encoder.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\reaper.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\rep.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\req.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\router.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\scatter.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\select.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\session_base.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\signaler.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\socket_base.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\stream.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\stream_engine.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\sub.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\tcp.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\tcp_address.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\tcp_connecter.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\tcp_listener.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\thread.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\trie.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\v1_decoder.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\v1_encoder.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\v2_decoder.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\v2_encoder.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\xpub.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\xsub.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\zmq.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\zmq_utils.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\precompiled.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\curve_client.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\curve_server.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\gather.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\gssapi_mechanism_base.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\gssapi_server.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\gssapi_client.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\socks.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\socks_connecter.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\server.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\client.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mailbox_safe.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\decoder_allocators.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\socket_poller.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\udp_address.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\udp_engine.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\dish.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\radio.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\timers.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\tweetnacl.c">
-      <Filter>src</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\..\include\zmq.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\address.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\array.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\atomic_counter.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\atomic_ptr.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\blob.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\clock.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\command.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\config.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\ctx.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\devpoll.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\dgram.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\dist.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\encoder.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\epoll.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\err.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\fd.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\fq.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\i_engine.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\i_poll_events.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\io_object.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\io_thread.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\ip.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\ipc_address.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\ipc_connecter.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\ipc_listener.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\kqueue.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\lb.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\decoder.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\likely.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mailbox.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\msg.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mtrie.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mutex.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\object.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\options.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\own.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\pair.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\pgm_receiver.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\yqueue.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\ypipe.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\xsub.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\xreq.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\xrep.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\xpub.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\wire.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\windows.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\v1_encoder.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\v1_protocol.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\v1_decoder.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\trie.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\thread.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\tcp_listener.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\tcp_connecter.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\tcp_address.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\tcp.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\sub.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\stream_engine.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\stdint.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\socket_base.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\signaler.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\session_base.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\scatter.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\select.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\req.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\rep.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\reaper.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\raw_encoder.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\raw_decoder.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\random.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\push.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\pull.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\pub.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\proxy.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\precompiled.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\poller_base.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\poller.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\poll.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\platform.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\pipe.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\pgm_socket.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\pgm_sender.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\resource.h">
-      <Filter>resource</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\curve_client.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\curve_server.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\gather.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\gssapi_mechanism_base.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\gssapi_server.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\gssapi_client.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\socks.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\socks_connecter.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\server.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\client.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mailbox_safe.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\condition_variable.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\decoder_allocators.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\udp_address.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\udp_engine.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\dish.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\radio.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\timers.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\tweetnacl.h">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\zmq_draft.h">
-      <Filter>src\include</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="include">
-      <UniqueIdentifier>{f7e88c6c-e408-4631-959c-fe3568656d70}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="src">
-      <UniqueIdentifier>{35f0c644-e1d8-4a46-bb33-06bb8b645fff}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="src\include">
-      <UniqueIdentifier>{90853975-3420-4f06-8be4-4ab3d9792160}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="packaging">
-      <UniqueIdentifier>{f5e26e9d-c33d-45c1-95e4-0732acd28b59}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="resource">
-      <UniqueIdentifier>{e66010e4-a9ea-4e2e-8bc6-12fec14bb009}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\..\..\..\packaging\nuget\package.bat">
-      <Filter>packaging</Filter>
-    </None>
-    <None Include="..\..\..\..\packaging\nuget\package.config">
-      <Filter>packaging</Filter>
-    </None>
-    <None Include="..\..\..\..\packaging\nuget\package.gsl">
-      <Filter>packaging</Filter>
-    </None>
-    <None Include="..\..\..\..\packaging\nuget\package.targets">
-      <Filter>packaging</Filter>
-    </None>
-    <None Include="..\..\..\..\packaging\nuget\package.nuspec">
-      <Filter>packaging</Filter>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <Xml Include="..\..\..\..\packaging\nuget\package.xml">
-      <Filter>packaging</Filter>
-    </Xml>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\..\resource.rc">
-      <Filter>resource</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2010/libzmq/libzmq.xml b/libs/libzmq/builds/deprecated-msvc/vs2010/libzmq/libzmq.xml
deleted file mode 100644
index db7dfe0..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2010/libzmq/libzmq.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ProjectSchemaDefinitions xmlns="clr-namespace:Microsoft.Build.Framework.XamlTypes;assembly=Microsoft.Build.Framework">
-  <Rule Name="libzmq-uiextension" PageTemplate="tool" DisplayName="ZMQ Options" SwitchPrefix="/" Order="1">
-    <Rule.Categories>
-      <Category Name="tweet" DisplayName="tweet" />
-      <Category Name="sodium" DisplayName="sodium" />
-      <Category Name="openpgm" DisplayName="openpgm" />
-      <Category Name="gssapi" DisplayName="gssapi" />
-      <Category Name="draftapi" DisplayName="draftapi" />
-      <Category Name="usepoll" DisplayName="usepoll" />
-    </Rule.Categories>
-    <Rule.DataSource>
-      <DataSource Persistence="ProjectFile" ItemType="" />
-    </Rule.DataSource>
-    <EnumProperty Name="Option-tweet" DisplayName="Enable Tweet NaCl" Description="Enable Tweet NaCl build option (overrides Sodium)" Category="tweet">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-    <EnumProperty Name="Option-sodium" DisplayName="Enable Sodium" Description="Enable Sodium build option" Category="sodium">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-    <EnumProperty Name="Option-openpgm" DisplayName="Enable OpenPGM" Description="Enable OpenPGM build option" Category="openpgm">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-    <EnumProperty Name="Option-gssapi" DisplayName="Enable GSS API" Description="Enable GSS API build option" Category="gssapi">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-    <EnumProperty Name="Option-draftapi" DisplayName="Enable Draft API" Description="Enable Draft API build option" Category="draftapi">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-    <EnumProperty Name="Option-usepoll" DisplayName="Enable poll() usage (Vista+ only)" Description="Use poll() instead of select() for waiting on incoming data. Increases performance, but the binary will only run on Windows Vista or later." Category="usepoll">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-  </Rule>
-</ProjectSchemaDefinitions>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2010/local_lat/local_lat.props b/libs/libzmq/builds/deprecated-msvc/vs2010/local_lat/local_lat.props
deleted file mode 100644
index ea5e3e5..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2010/local_lat/local_lat.props
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>ZeroMQ local_lat Common Settings</_PropertySheetDisplayName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-  </PropertyGroup>
-
-  <!-- Configuration -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <!-- Dependencies -->
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="..\libzmq.import.props" />
-    <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props"
-            Condition="Exists('$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props')" /> 
-  </ImportGroup>
-
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
-    <Linkage-libzmq>dynamic</Linkage-libzmq>
-    <!--<Linkage-libsodium>dynamic</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
-    <Linkage-libzmq>ltcg</Linkage-libzmq>
-    <!--<Linkage-libsodium>ltcg</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
-    <Linkage-libzmq>static</Linkage-libzmq>
-    <!--<Linkage-libsodium>static</Linkage-libsodium>-->
-  </PropertyGroup>
-
-  <!-- Messages -->
-
-  <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Linkage-libzmq    : $(Linkage-libzmq)" Importance="high"/>
-    <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high" Condition="'$(HAVE_LIBSODIUM)'=='1'"/>
-  </Target>
-
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2010/local_lat/local_lat.vcxproj b/libs/libzmq/builds/deprecated-msvc/vs2010/local_lat/local_lat.vcxproj
deleted file mode 100644
index 76bfb4f..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2010/local_lat/local_lat.vcxproj
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}</ProjectGuid>
-    <ProjectName>local_lat</ProjectName>
-    <PlatformToolset>v100</PlatformToolset>
-    <ConfigurationType>Application</ConfigurationType>
-  </PropertyGroup>
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DebugDEXE|Win32">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|Win32">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugDEXE|x64">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|x64">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|Win32">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|Win32">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|x64">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|x64">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|Win32">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|Win32">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|x64">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|x64">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
-    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-  </ImportGroup>
-  <PropertyGroup>
-    <Option-tweet>true</Option-tweet>
-  </PropertyGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\platform.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\..\perf\local_lat.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ItemGroup>
-    <ProjectReference Include="..\libzmq\libzmq.vcxproj">
-      <Project>{641c5f36-32ee-4323-b740-992b651cf9d6}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2010/local_thr/local_thr.props b/libs/libzmq/builds/deprecated-msvc/vs2010/local_thr/local_thr.props
deleted file mode 100644
index 1d017d4..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2010/local_thr/local_thr.props
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>ZeroMQ local_thr Common Settings</_PropertySheetDisplayName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-  </PropertyGroup>
-
-  <!-- Configuration -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <!-- Dependencies -->
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="..\libzmq.import.props" />
-    <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props"
-            Condition="Exists('$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props')" /> 
-  </ImportGroup>
-
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
-    <Linkage-libzmq>dynamic</Linkage-libzmq>
-    <!--<Linkage-libsodium>dynamic</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
-    <Linkage-libzmq>ltcg</Linkage-libzmq>
-    <!--<Linkage-libsodium>ltcg</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
-    <Linkage-libzmq>static</Linkage-libzmq>
-    <!--<Linkage-libsodium>static</Linkage-libsodium>-->
-  </PropertyGroup>
-
-  <!-- Messages -->
-
-  <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Linkage-libzmq    : $(Linkage-libzmq)" Importance="high"/>
-    <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high" Condition="'$(HAVE_LIBSODIUM)'=='1'"/>
-  </Target>
-
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2010/local_thr/local_thr.vcxproj b/libs/libzmq/builds/deprecated-msvc/vs2010/local_thr/local_thr.vcxproj
deleted file mode 100644
index a493408..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2010/local_thr/local_thr.vcxproj
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{8EF2DF6B-6646-460F-8032-913B70FE0E94}</ProjectGuid>
-    <ProjectName>local_thr</ProjectName>
-    <PlatformToolset>v100</PlatformToolset>
-    <ConfigurationType>Application</ConfigurationType>
-  </PropertyGroup>
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DebugDEXE|Win32">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|Win32">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugDEXE|x64">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|x64">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|Win32">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|Win32">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|x64">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|x64">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|Win32">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|Win32">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|x64">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|x64">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
-    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-  </ImportGroup>
-  <PropertyGroup>
-    <Option-tweet>true</Option-tweet>
-  </PropertyGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\platform.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\..\perf\local_thr.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ItemGroup>
-    <ProjectReference Include="..\libzmq\libzmq.vcxproj">
-      <Project>{641c5f36-32ee-4323-b740-992b651cf9d6}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2010/remote_lat/remote_lat.props b/libs/libzmq/builds/deprecated-msvc/vs2010/remote_lat/remote_lat.props
deleted file mode 100644
index 307eaf5..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2010/remote_lat/remote_lat.props
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>ZeroMQ remote_lat Common Settings</_PropertySheetDisplayName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-  </PropertyGroup>
-
-  <!-- Configuration -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <!-- Dependencies -->
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="..\libzmq.import.props" />
-    <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props"
-            Condition="Exists('$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props')" /> 
-  </ImportGroup>
-
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
-    <Linkage-libzmq>dynamic</Linkage-libzmq>
-    <!--<Linkage-libsodium>dynamic</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
-    <Linkage-libzmq>ltcg</Linkage-libzmq>
-    <!--<Linkage-libsodium>ltcg</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
-    <Linkage-libzmq>static</Linkage-libzmq>
-    <!--<Linkage-libsodium>static</Linkage-libsodium>-->
-  </PropertyGroup>
-
-  <!-- Messages -->
-
-  <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Linkage-libzmq    : $(Linkage-libzmq)" Importance="high"/>
-    <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high" Condition="'$(HAVE_LIBSODIUM)'=='1'"/>
-  </Target>
-
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2010/remote_lat/remote_lat.vcxproj b/libs/libzmq/builds/deprecated-msvc/vs2010/remote_lat/remote_lat.vcxproj
deleted file mode 100644
index a58083f..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2010/remote_lat/remote_lat.vcxproj
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}</ProjectGuid>
-    <ProjectName>remote_lat</ProjectName>
-    <PlatformToolset>v100</PlatformToolset>
-    <ConfigurationType>Application</ConfigurationType>
-  </PropertyGroup>
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DebugDEXE|Win32">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|Win32">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugDEXE|x64">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|x64">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|Win32">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|Win32">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|x64">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|x64">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|Win32">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|Win32">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|x64">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|x64">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
-    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-  </ImportGroup>
-  <PropertyGroup>
-    <Option-tweet>true</Option-tweet>
-  </PropertyGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\platform.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\..\perf\remote_lat.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ItemGroup>
-    <ProjectReference Include="..\libzmq\libzmq.vcxproj">
-      <Project>{641c5f36-32ee-4323-b740-992b651cf9d6}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2010/remote_thr/remote_thr.props b/libs/libzmq/builds/deprecated-msvc/vs2010/remote_thr/remote_thr.props
deleted file mode 100644
index 001e481..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2010/remote_thr/remote_thr.props
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>ZeroMQ remote_thr Common Settings</_PropertySheetDisplayName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-  </PropertyGroup>
-
-  <!-- Configuration -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <!-- Dependencies -->
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="..\libzmq.import.props" />
-    <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props"
-            Condition="Exists('$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props')" /> 
-  </ImportGroup>
-  
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
-    <Linkage-libzmq>dynamic</Linkage-libzmq>
-    <!--<Linkage-libsodium>dynamic</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
-    <Linkage-libzmq>ltcg</Linkage-libzmq>
-    <!--<Linkage-libsodium>ltcg</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
-    <Linkage-libzmq>static</Linkage-libzmq>
-    <!--<Linkage-libsodium>static</Linkage-libsodium>-->
-  </PropertyGroup>
-
-  <!-- Messages -->
-
-  <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Linkage-libzmq    : $(Linkage-libzmq)" Importance="high"/>
-    <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high" Condition="'$(HAVE_LIBSODIUM)'=='1'"/>
-  </Target>
-
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2010/remote_thr/remote_thr.vcxproj b/libs/libzmq/builds/deprecated-msvc/vs2010/remote_thr/remote_thr.vcxproj
deleted file mode 100644
index 6724a5b..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2010/remote_thr/remote_thr.vcxproj
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{B15E059C-0CBB-4A82-8C42-6567FB650802}</ProjectGuid>
-    <ProjectName>remote_thr</ProjectName>
-    <PlatformToolset>v100</PlatformToolset>
-    <ConfigurationType>Application</ConfigurationType>
-  </PropertyGroup>
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DebugDEXE|Win32">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|Win32">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugDEXE|x64">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|x64">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|Win32">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|Win32">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|x64">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|x64">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|Win32">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|Win32">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|x64">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|x64">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
-    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-  </ImportGroup>
-  <PropertyGroup>
-    <Option-tweet>true</Option-tweet>
-  </PropertyGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\platform.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\..\perf\remote_thr.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ItemGroup>
-    <ProjectReference Include="..\libzmq\libzmq.vcxproj">
-      <Project>{641c5f36-32ee-4323-b740-992b651cf9d6}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2012/inproc_lat/inproc_lat.props b/libs/libzmq/builds/deprecated-msvc/vs2012/inproc_lat/inproc_lat.props
deleted file mode 100644
index fc03c8b..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2012/inproc_lat/inproc_lat.props
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>ZeroMQ inproc_lat Common Settings</_PropertySheetDisplayName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-  </PropertyGroup>
-
-  <!-- Configuration -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <!-- Dependencies -->
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="..\libzmq.import.props" />
-    <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props"
-            Condition="Exists('$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props')" /> 
-  </ImportGroup>
-
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
-    <Linkage-libzmq>dynamic</Linkage-libzmq>
-    <!--<Linkage-libsodium>dynamic</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
-    <Linkage-libzmq>ltcg</Linkage-libzmq>
-    <!--<Linkage-libsodium>ltcg</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
-    <Linkage-libzmq>static</Linkage-libzmq>
-    <!--<Linkage-libsodium>static</Linkage-libsodium>-->
-  </PropertyGroup>
-
-  <!-- Messages -->
-
-  <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Linkage-libzmq    : $(Linkage-libzmq)" Importance="high"/>
-    <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high"  Condition="'$(HAVE_LIBSODIUM)'=='1'"/>
-  </Target>
-
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2012/inproc_lat/inproc_lat.vcxproj b/libs/libzmq/builds/deprecated-msvc/vs2012/inproc_lat/inproc_lat.vcxproj
deleted file mode 100644
index 0b5a8a1..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2012/inproc_lat/inproc_lat.vcxproj
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}</ProjectGuid>
-    <ProjectName>inproc_lat</ProjectName>
-    <PlatformToolset>v110</PlatformToolset>
-    <ConfigurationType>Application</ConfigurationType>
-  </PropertyGroup>
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DebugDEXE|Win32">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|Win32">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugDEXE|x64">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|x64">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|Win32">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|Win32">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|x64">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|x64">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|Win32">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|Win32">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|x64">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|x64">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
-    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-  </ImportGroup>
-  <PropertyGroup>
-    <Option-tweet>true</Option-tweet>
-  </PropertyGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\platform.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\..\perf\inproc_lat.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ItemGroup>
-    <ProjectReference Include="..\libzmq\libzmq.vcxproj">
-      <Project>{641c5f36-32ee-4323-b740-992b651cf9d6}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2012/inproc_thr/inproc_thr.props b/libs/libzmq/builds/deprecated-msvc/vs2012/inproc_thr/inproc_thr.props
deleted file mode 100644
index aba5058..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2012/inproc_thr/inproc_thr.props
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>ZeroMQ inproc_thr Common Settings</_PropertySheetDisplayName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-  </PropertyGroup>
-
-  <!-- Configuration -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <!-- Dependencies -->
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="..\libzmq.import.props" />
-    <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props"
-            Condition="Exists('$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props')" /> 
-  </ImportGroup>
-
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
-    <Linkage-libzmq>dynamic</Linkage-libzmq>
-    <!--<Linkage-libsodium>dynamic</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
-    <Linkage-libzmq>ltcg</Linkage-libzmq>
-    <!--<Linkage-libsodium>ltcg</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
-    <Linkage-libzmq>static</Linkage-libzmq>
-    <!--<Linkage-libsodium>static</Linkage-libsodium>-->
-  </PropertyGroup>
-
-  <!-- Messages -->
-
-  <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Linkage-libzmq    : $(Linkage-libzmq)" Importance="high"/>
-    <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high" Condition="'$(HAVE_LIBSODIUM)'=='1'"/>
-  </Target>
-
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2012/inproc_thr/inproc_thr.vcxproj b/libs/libzmq/builds/deprecated-msvc/vs2012/inproc_thr/inproc_thr.vcxproj
deleted file mode 100644
index 6a44c5c..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2012/inproc_thr/inproc_thr.vcxproj
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{1077E977-95DD-4E73-A692-74647DD0CC1E}</ProjectGuid>
-    <ProjectName>inproc_thr</ProjectName>
-    <PlatformToolset>v110</PlatformToolset>
-    <ConfigurationType>Application</ConfigurationType>
-  </PropertyGroup>
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DebugDEXE|Win32">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|Win32">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugDEXE|x64">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|x64">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|Win32">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|Win32">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|x64">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|x64">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|Win32">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|Win32">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|x64">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|x64">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
-    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-  </ImportGroup>
-  <PropertyGroup>
-    <Option-tweet>true</Option-tweet>
-  </PropertyGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\platform.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\..\perf\inproc_thr.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ItemGroup>
-    <ProjectReference Include="..\libzmq\libzmq.vcxproj">
-      <Project>{641c5f36-32ee-4323-b740-992b651cf9d6}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2012/libsodium.import.props b/libs/libzmq/builds/deprecated-msvc/vs2012/libsodium.import.props
deleted file mode 100644
index b3d7e4f..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2012/libsodium.import.props
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup Label="Globals">
-    <_PropertySheetDisplayName>Libsodium Import Settings</_PropertySheetDisplayName>
-  </PropertyGroup>
-
-  <!-- User Interface -->
-
-  <ItemGroup Label="BuildOptionsExtension">
-    <PropertyPageSchema Include="$(MSBuildThisFileDirectory)libsodium.import.xml" />
-  </ItemGroup>
-
-  <!-- Linkage -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\..\libsodium\src\libsodium\include;$(ProjectDir)..\..\..\..\..\libsodium\src\libsodium\include\sodium\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Linkage-libsodium)' == 'static' Or '$(Linkage-libsodium)' == 'ltcg'">SODIUM_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies Condition="'$(Linkage-libsodium)' != ''">advapi32.lib;libsodium.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Debug')) != -1">$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\$(PlatformToolset)\$(Linkage-libsodium)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Release')) != -1">$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Release\$(PlatformToolset)\$(Linkage-libsodium)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <!-- Copy -->
-
-  <Target Name="Linkage-libsodium-dynamic" AfterTargets="AfterBuild" Condition="'$(Linkage-libsodium)' == 'dynamic'">
-    <Copy Condition="$(Configuration.IndexOf('Debug')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\$(PlatformToolset)\dynamic\libsodium.dll"
-          DestinationFiles="$(TargetDir)libsodium.dll"
-          SkipUnchangedFiles="true" />
-    <Copy Condition="$(Configuration.IndexOf('Debug')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\$(PlatformToolset)\dynamic\libsodium.pdb"
-          DestinationFiles="$(TargetDir)libsodium.pdb"
-          SkipUnchangedFiles="true" />
-    <Copy Condition="$(Configuration.IndexOf('Release')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Release\$(PlatformToolset)\dynamic\libsodium.dll"
-          DestinationFiles="$(TargetDir)libsodium.dll"
-          SkipUnchangedFiles="true" />
-  </Target>
-
-  <!-- Messages -->
-
-  <Target Name="libsodium-info" BeforeTargets="AfterBuild" Condition="'$(Linkage-libsodium)' == 'dynamic'">
-    <Message Text="Copying libsodium.dll -&gt; $(TargetDir)libsodium.dll" Importance="high"/>
-    <Message Text="Copying libsodium.pdb -&gt; $(TargetDir)libsodium.pdb" Importance="high" Condition="$(Configuration.IndexOf('Debug')) != -1" />
-  </Target>
-
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2012/libsodium.import.xml b/libs/libzmq/builds/deprecated-msvc/vs2012/libsodium.import.xml
deleted file mode 100644
index dbcf4e5..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2012/libsodium.import.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ProjectSchemaDefinitions xmlns="clr-namespace:Microsoft.Build.Framework.XamlTypes;assembly=Microsoft.Build.Framework">
-  <Rule Name="libsodium-linkage-uiextension" PageTemplate="tool" DisplayName="Local Dependencies" SwitchPrefix="/" Order="1">
-    <Rule.Categories>
-      <Category Name="libsodium" DisplayName="libsodium" />
-    </Rule.Categories>
-    <Rule.DataSource>
-      <DataSource Persistence="ProjectFile" ItemType="" />
-    </Rule.DataSource>
-    <EnumProperty Name="Linkage-libsodium" DisplayName="Linkage" Description="How libsodium will be linked into the output of this project" Category="libsodium">
-      <EnumValue Name="" DisplayName="Not linked" />
-      <EnumValue Name="dynamic" DisplayName="Dynamic (DLL)" />
-      <EnumValue Name="static" DisplayName="Static (LIB)" />
-      <EnumValue Name="ltcg" DisplayName="Static using link time compile generation (LTCG)" />
-    </EnumProperty>
-  </Rule>
-</ProjectSchemaDefinitions>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2012/libzmq.import.props b/libs/libzmq/builds/deprecated-msvc/vs2012/libzmq.import.props
deleted file mode 100644
index 2f71ff8..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2012/libzmq.import.props
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup Label="Globals">
-    <_PropertySheetDisplayName>ZMQ Import Settings</_PropertySheetDisplayName>
-  </PropertyGroup>
-
-  <!-- User Interface -->
-
-  <ItemGroup Label="BuildOptionsExtension">
-    <PropertyPageSchema Include="$(MSBuildThisFileDirectory)libzmq.import.xml" />
-  </ItemGroup>
-
-  <!-- Configuration -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <PreprocessorDefinitions Condition="'$(Option-tweet)' == 'true'">ZMQ_USE_TWEETNACL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-sodium)' == 'true'">ZMQ_USE_LIBSODIUM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-openpgm)' == 'true'">ZMQ_HAVE_OPENPGM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-gssapi)' == 'true'">HAVE_LIBGSSAPI_KRB5;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-draftapi)' == 'true'">ZMQ_BUILD_DRAFT_API;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemDefinitionGroup>
-
-  <!-- Linkage -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\..\libzmq\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Linkage-libzmq)' == 'static' Or '$(Linkage-libzmq)' == 'ltcg'">ZMQ_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies Condition="'$(Linkage-libzmq)' != ''">libzmq.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Debug')) != -1">$(ProjectDir)..\..\..\..\..\libzmq\bin\$(PlatformName)\Debug\$(PlatformToolset)\$(Linkage-libzmq)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Release')) != -1">$(ProjectDir)..\..\..\..\..\libzmq\bin\$(PlatformName)\Release\$(PlatformToolset)\$(Linkage-libzmq)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <!-- Copy -->
-
-  <Target Name="Linkage-libzmq-dynamic" AfterTargets="AfterBuild" Condition="'$(Linkage-libzmq)' == 'dynamic'">
-    <Copy Condition="$(Configuration.IndexOf('Debug')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libzmq\bin\$(PlatformName)\Debug\$(PlatformToolset)\dynamic\libzmq.dll"
-          DestinationFiles="$(TargetDir)libzmq.dll"
-          SkipUnchangedFiles="true" />
-    <Copy Condition="$(Configuration.IndexOf('Debug')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libzmq\bin\$(PlatformName)\Debug\$(PlatformToolset)\dynamic\libzmq.pdb"
-          DestinationFiles="$(TargetDir)libzmq.pdb"
-          SkipUnchangedFiles="true" />
-    <Copy Condition="$(Configuration.IndexOf('Release')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libzmq\bin\$(PlatformName)\Release\$(PlatformToolset)\dynamic\libzmq.dll"
-          DestinationFiles="$(TargetDir)libzmq.dll"
-          SkipUnchangedFiles="true" />
-  </Target>
-
-  <!-- Messages -->
-
-  <Target Name="libzmq-info" BeforeTargets="AfterBuild" Condition="'$(Linkage-libzmq)' == 'dynamic'">
-    <Message Text="Copying libzmq.dll -&gt; $(TargetDir)libzmq.dll" Importance="high"/>
-    <Message Text="Copying libzmq.pdb -&gt; $(TargetDir)libzmq.pdb" Importance="high" Condition="$(Configuration.IndexOf('Debug')) != -1" />
-  </Target>
-
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2012/libzmq.import.xml b/libs/libzmq/builds/deprecated-msvc/vs2012/libzmq.import.xml
deleted file mode 100644
index a25a1ba..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2012/libzmq.import.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ProjectSchemaDefinitions xmlns="clr-namespace:Microsoft.Build.Framework.XamlTypes;assembly=Microsoft.Build.Framework">
-  <Rule Name="libzmq-options-uiextension" PageTemplate="tool" DisplayName="ZMQ Options" SwitchPrefix="/" Order="1">
-    <Rule.Categories>
-      <Category Name="tweet" DisplayName="tweet" />
-      <Category Name="sodium" DisplayName="sodium" />
-      <Category Name="openpgm" DisplayName="openpgm" />
-      <Category Name="gssapi" DisplayName="gssapi" />
-      <Category Name="draftapi" DisplayName="draftapi" />
-    </Rule.Categories>
-    <Rule.DataSource>
-      <DataSource Persistence="ProjectFile" ItemType="" />
-    </Rule.DataSource>
-    <EnumProperty Name="Option-tweet" DisplayName="Enable Tweet NaCl" Description="Enable the Tweet NaCl build option" Category="tweet">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-    <EnumProperty Name="Option-sodium" DisplayName="Enable Sodium" Description="Enable the Sodium build option" Category="sodium">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-    <EnumProperty Name="Option-openpgm" DisplayName="Enable OpenPGM" Description="Enable the OpenPGM build option" Category="openpgm">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-    <EnumProperty Name="Option-gssapi" DisplayName="Enable GSS API" Description="Enable the GSS API build option" Category="gssapi">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-    <EnumProperty Name="Option-draftapi" DisplayName="Enable Draft API" Description="Enable Draft API build option" Category="draftapi">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-  </Rule>
-  <Rule Name="libzmq-linkage-uiextension" PageTemplate="tool" DisplayName="Local Dependencies" SwitchPrefix="/" Order="1">
-    <Rule.Categories>
-      <Category Name="libzmq" DisplayName="libzmq" />
-    </Rule.Categories>
-    <Rule.DataSource>
-      <DataSource Persistence="ProjectFile" ItemType="" />
-    </Rule.DataSource>
-    <EnumProperty Name="Linkage-libzmq" DisplayName="Linkage" Description="How libzmq will be linked into the output of this project" Category="libzmq">
-      <EnumValue Name="" DisplayName="Not linked" />
-      <EnumValue Name="dynamic" DisplayName="Dynamic (DLL)" />
-      <EnumValue Name="static" DisplayName="Static (LIB)" />
-      <EnumValue Name="ltcg" DisplayName="Static using link time compile generation (LTCG)" />
-    </EnumProperty>
-  </Rule>
-</ProjectSchemaDefinitions>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2012/libzmq.sln b/libs/libzmq/builds/deprecated-msvc/vs2012/libzmq.sln
deleted file mode 100644
index 15f41ac..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2012/libzmq.sln
+++ /dev/null
@@ -1,206 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2012
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libzmq", "libzmq\libzmq.vcxproj", "{641C5F36-32EE-4323-B740-992B651CF9D6}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "inproc_thr", "inproc_thr\inproc_thr.vcxproj", "{1077E977-95DD-4E73-A692-74647DD0CC1E}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "inproc_lat", "inproc_lat\inproc_lat.vcxproj", "{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "remote_thr", "remote_thr\remote_thr.vcxproj", "{B15E059C-0CBB-4A82-8C42-6567FB650802}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "remote_lat", "remote_lat\remote_lat.vcxproj", "{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "local_thr", "local_thr\local_thr.vcxproj", "{8EF2DF6B-6646-460F-8032-913B70FE0E94}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "local_lat", "local_lat\local_lat.vcxproj", "{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		DynDebug|Win32 = DynDebug|Win32
-		DynDebug|x64 = DynDebug|x64
-		DynRelease|Win32 = DynRelease|Win32
-		DynRelease|x64 = DynRelease|x64
-		LtcgDebug|Win32 = LtcgDebug|Win32
-		LtcgDebug|x64 = LtcgDebug|x64
-		LtcgRelease|Win32 = LtcgRelease|Win32
-		LtcgRelease|x64 = LtcgRelease|x64
-		StaticDebug|Win32 = StaticDebug|Win32
-		StaticDebug|x64 = StaticDebug|x64
-		StaticRelease|Win32 = StaticRelease|Win32
-		StaticRelease|x64 = StaticRelease|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.DynDebug|Win32.ActiveCfg = DebugDLL|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.DynDebug|Win32.Build.0 = DebugDLL|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.DynDebug|x64.ActiveCfg = DebugDLL|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.DynDebug|x64.Build.0 = DebugDLL|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.DynRelease|Win32.ActiveCfg = ReleaseDLL|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.DynRelease|Win32.Build.0 = ReleaseDLL|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.DynRelease|x64.ActiveCfg = ReleaseDLL|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.DynRelease|x64.Build.0 = ReleaseDLL|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.LtcgDebug|Win32.ActiveCfg = DebugLTCG|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.LtcgDebug|Win32.Build.0 = DebugLTCG|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.LtcgDebug|x64.ActiveCfg = DebugLTCG|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.LtcgDebug|x64.Build.0 = DebugLTCG|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.LtcgRelease|Win32.ActiveCfg = ReleaseLTCG|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.LtcgRelease|Win32.Build.0 = ReleaseLTCG|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.LtcgRelease|x64.ActiveCfg = ReleaseLTCG|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.LtcgRelease|x64.Build.0 = ReleaseLTCG|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.StaticDebug|Win32.ActiveCfg = DebugLIB|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.StaticDebug|Win32.Build.0 = DebugLIB|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.StaticDebug|x64.ActiveCfg = DebugLIB|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.StaticDebug|x64.Build.0 = DebugLIB|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.StaticRelease|Win32.ActiveCfg = ReleaseLIB|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.StaticRelease|Win32.Build.0 = ReleaseLIB|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.StaticRelease|x64.ActiveCfg = ReleaseLIB|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.StaticRelease|x64.Build.0 = ReleaseLIB|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.DynDebug|Win32.ActiveCfg = DebugDEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.DynDebug|Win32.Build.0 = DebugDEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.DynDebug|x64.ActiveCfg = DebugDEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.DynDebug|x64.Build.0 = DebugDEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.DynRelease|Win32.ActiveCfg = ReleaseDEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.DynRelease|Win32.Build.0 = ReleaseDEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.DynRelease|x64.ActiveCfg = ReleaseDEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.DynRelease|x64.Build.0 = ReleaseDEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.LtcgDebug|Win32.ActiveCfg = DebugLEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.LtcgDebug|Win32.Build.0 = DebugLEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.LtcgDebug|x64.ActiveCfg = DebugLEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.LtcgDebug|x64.Build.0 = DebugLEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.LtcgRelease|Win32.ActiveCfg = ReleaseLEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.LtcgRelease|Win32.Build.0 = ReleaseLEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.LtcgRelease|x64.ActiveCfg = ReleaseLEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.LtcgRelease|x64.Build.0 = ReleaseLEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.StaticDebug|Win32.ActiveCfg = DebugSEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.StaticDebug|Win32.Build.0 = DebugSEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.StaticDebug|x64.ActiveCfg = DebugSEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.StaticDebug|x64.Build.0 = DebugSEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.StaticRelease|Win32.ActiveCfg = ReleaseSEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.StaticRelease|Win32.Build.0 = ReleaseSEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.StaticRelease|x64.ActiveCfg = ReleaseSEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.StaticRelease|x64.Build.0 = ReleaseSEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.DynDebug|Win32.ActiveCfg = DebugDEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.DynDebug|Win32.Build.0 = DebugDEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.DynDebug|x64.ActiveCfg = DebugDEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.DynDebug|x64.Build.0 = DebugDEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.DynRelease|Win32.ActiveCfg = ReleaseDEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.DynRelease|Win32.Build.0 = ReleaseDEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.DynRelease|x64.ActiveCfg = ReleaseDEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.DynRelease|x64.Build.0 = ReleaseDEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.LtcgDebug|Win32.ActiveCfg = DebugLEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.LtcgDebug|Win32.Build.0 = DebugLEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.LtcgDebug|x64.ActiveCfg = DebugLEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.LtcgDebug|x64.Build.0 = DebugLEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.LtcgRelease|Win32.ActiveCfg = ReleaseLEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.LtcgRelease|Win32.Build.0 = ReleaseLEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.LtcgRelease|x64.ActiveCfg = ReleaseLEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.LtcgRelease|x64.Build.0 = ReleaseLEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.StaticDebug|Win32.ActiveCfg = DebugSEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.StaticDebug|Win32.Build.0 = DebugSEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.StaticDebug|x64.ActiveCfg = DebugSEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.StaticDebug|x64.Build.0 = DebugSEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.StaticRelease|Win32.ActiveCfg = ReleaseSEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.StaticRelease|Win32.Build.0 = ReleaseSEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.StaticRelease|x64.ActiveCfg = ReleaseSEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.StaticRelease|x64.Build.0 = ReleaseSEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.DynDebug|Win32.ActiveCfg = DebugDEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.DynDebug|Win32.Build.0 = DebugDEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.DynDebug|x64.ActiveCfg = DebugDEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.DynDebug|x64.Build.0 = DebugDEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.DynRelease|Win32.ActiveCfg = ReleaseDEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.DynRelease|Win32.Build.0 = ReleaseDEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.DynRelease|x64.ActiveCfg = ReleaseDEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.DynRelease|x64.Build.0 = ReleaseDEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.LtcgDebug|Win32.ActiveCfg = DebugLEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.LtcgDebug|Win32.Build.0 = DebugLEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.LtcgDebug|x64.ActiveCfg = DebugLEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.LtcgDebug|x64.Build.0 = DebugLEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.LtcgRelease|Win32.ActiveCfg = ReleaseLEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.LtcgRelease|Win32.Build.0 = ReleaseLEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.LtcgRelease|x64.ActiveCfg = ReleaseLEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.LtcgRelease|x64.Build.0 = ReleaseLEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.StaticDebug|Win32.ActiveCfg = DebugSEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.StaticDebug|Win32.Build.0 = DebugSEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.StaticDebug|x64.ActiveCfg = DebugSEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.StaticDebug|x64.Build.0 = DebugSEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.StaticRelease|Win32.ActiveCfg = ReleaseSEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.StaticRelease|Win32.Build.0 = ReleaseSEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.StaticRelease|x64.ActiveCfg = ReleaseSEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.StaticRelease|x64.Build.0 = ReleaseSEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.DynDebug|Win32.ActiveCfg = DebugDEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.DynDebug|Win32.Build.0 = DebugDEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.DynDebug|x64.ActiveCfg = DebugDEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.DynDebug|x64.Build.0 = DebugDEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.DynRelease|Win32.ActiveCfg = ReleaseDEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.DynRelease|Win32.Build.0 = ReleaseDEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.DynRelease|x64.ActiveCfg = ReleaseDEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.DynRelease|x64.Build.0 = ReleaseDEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.LtcgDebug|Win32.ActiveCfg = DebugLEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.LtcgDebug|Win32.Build.0 = DebugLEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.LtcgDebug|x64.ActiveCfg = DebugLEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.LtcgDebug|x64.Build.0 = DebugLEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.LtcgRelease|Win32.ActiveCfg = ReleaseLEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.LtcgRelease|Win32.Build.0 = ReleaseLEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.LtcgRelease|x64.ActiveCfg = ReleaseLEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.LtcgRelease|x64.Build.0 = ReleaseLEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.StaticDebug|Win32.ActiveCfg = DebugSEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.StaticDebug|Win32.Build.0 = DebugSEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.StaticDebug|x64.ActiveCfg = DebugSEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.StaticDebug|x64.Build.0 = DebugSEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.StaticRelease|Win32.ActiveCfg = ReleaseSEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.StaticRelease|Win32.Build.0 = ReleaseSEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.StaticRelease|x64.ActiveCfg = ReleaseSEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.StaticRelease|x64.Build.0 = ReleaseSEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.DynDebug|Win32.ActiveCfg = DebugDEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.DynDebug|Win32.Build.0 = DebugDEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.DynDebug|x64.ActiveCfg = DebugDEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.DynDebug|x64.Build.0 = DebugDEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.DynRelease|Win32.ActiveCfg = ReleaseDEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.DynRelease|Win32.Build.0 = ReleaseDEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.DynRelease|x64.ActiveCfg = ReleaseDEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.DynRelease|x64.Build.0 = ReleaseDEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.LtcgDebug|Win32.ActiveCfg = DebugLEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.LtcgDebug|Win32.Build.0 = DebugLEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.LtcgDebug|x64.ActiveCfg = DebugLEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.LtcgDebug|x64.Build.0 = DebugLEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.LtcgRelease|Win32.ActiveCfg = ReleaseLEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.LtcgRelease|Win32.Build.0 = ReleaseLEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.LtcgRelease|x64.ActiveCfg = ReleaseLEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.LtcgRelease|x64.Build.0 = ReleaseLEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.StaticDebug|Win32.ActiveCfg = DebugSEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.StaticDebug|Win32.Build.0 = DebugSEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.StaticDebug|x64.ActiveCfg = DebugSEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.StaticDebug|x64.Build.0 = DebugSEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.StaticRelease|Win32.ActiveCfg = ReleaseSEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.StaticRelease|Win32.Build.0 = ReleaseSEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.StaticRelease|x64.ActiveCfg = ReleaseSEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.StaticRelease|x64.Build.0 = ReleaseSEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.DynDebug|Win32.ActiveCfg = DebugDEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.DynDebug|Win32.Build.0 = DebugDEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.DynDebug|x64.ActiveCfg = DebugDEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.DynDebug|x64.Build.0 = DebugDEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.DynRelease|Win32.ActiveCfg = ReleaseDEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.DynRelease|Win32.Build.0 = ReleaseDEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.DynRelease|x64.ActiveCfg = ReleaseDEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.DynRelease|x64.Build.0 = ReleaseDEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.LtcgDebug|Win32.ActiveCfg = DebugLEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.LtcgDebug|Win32.Build.0 = DebugLEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.LtcgDebug|x64.ActiveCfg = DebugLEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.LtcgDebug|x64.Build.0 = DebugLEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.LtcgRelease|Win32.ActiveCfg = ReleaseLEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.LtcgRelease|Win32.Build.0 = ReleaseLEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.LtcgRelease|x64.ActiveCfg = ReleaseLEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.LtcgRelease|x64.Build.0 = ReleaseLEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.StaticDebug|Win32.ActiveCfg = DebugSEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.StaticDebug|Win32.Build.0 = DebugSEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.StaticDebug|x64.ActiveCfg = DebugSEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.StaticDebug|x64.Build.0 = DebugSEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.StaticRelease|Win32.ActiveCfg = ReleaseSEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.StaticRelease|Win32.Build.0 = ReleaseSEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.StaticRelease|x64.ActiveCfg = ReleaseSEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.StaticRelease|x64.Build.0 = ReleaseSEXE|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2012/libzmq/libzmq.props b/libs/libzmq/builds/deprecated-msvc/vs2012/libzmq/libzmq.props
deleted file mode 100644
index 22da05a..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2012/libzmq/libzmq.props
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>ZeroMQ Library Common Settings</_PropertySheetDisplayName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-  </PropertyGroup>
-
-  <!-- User Interface -->
-
-  <ItemGroup Label="BuildOptionsExtension">
-    <PropertyPageSchema Include="$(MSBuildThisFileDirectory)$(ProjectName).xml" />
-  </ItemGroup>
-
-  <!-- Configuration -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\;$(ProjectDir)..\..\..\..\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <EnablePREfast>false</EnablePREfast>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>precompiled.hpp</PrecompiledHeaderFile>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;FD_SETSIZE=16384;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-tweet)' == 'true'">ZMQ_USE_TWEETNACL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-sodium)' == 'true'">ZMQ_USE_LIBSODIUM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-tweet)' == 'true' Or '$(Option-sodium)' == 'true'">ZMQ_HAVE_CURVE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-openpgm)' == 'true'">ZMQ_HAVE_OPENPGM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-gssapi)' == 'true'">HAVE_LIBGSSAPI_KRB5;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-draftapi)' == 'true'">ZMQ_BUILD_DRAFT_API;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-usepoll)' == 'true'">ZMQ_USE_POLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-usepoll)' != 'true'">ZMQ_USE_SELECT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(ConfigurationType)' == 'StaticLibrary'">ZMQ_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(ConfigurationType)' == 'DynamicLibrary'">DLL_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>Advapi32.lib;Ws2_32.lib;Rpcrt4.lib;Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <Lib Condition="'$(ConfigurationType)'=='StaticLibrary'">
-      <AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions>
-    </Lib>
-  </ItemDefinitionGroup>
-
-  <!-- Dependencies -->
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props"
-            Condition="Exists('$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props')" /> 
-  </ImportGroup>
-
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
-    <!--<Linkage-libsodium>dynamic</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
-    <!--<Linkage-libsodium>ltcg</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
-    <!--<Linkage-libsodium>static</Linkage-libsodium>-->
-  </PropertyGroup>
-
-  <!-- Messages -->
-
-  <Target Name="OptionInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Option-tweet      : $(Option-tweet)" Importance="high"/>
-    <Message Text="Option-sodium     : $(Option-sodium)" Importance="high"/>
-    <Message Text="Option-openpgm    : $(Option-openpgm)" Importance="high"/>
-    <Message Text="Option-gssapi     : $(Option-gssapi)" Importance="high"/>
-    <Message Text="Option-draftapi   : $(Option-draftapi)" Importance="high"/>
-    <Message Text="Option-usepoll    : $(Option-usepoll)" Importance="high"/>
-  </Target>
-
-  <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high" Condition="'$(Option-sodium)' == 'true'"/>
-  </Target>
-
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2012/libzmq/libzmq.vcxproj b/libs/libzmq/builds/deprecated-msvc/vs2012/libzmq/libzmq.vcxproj
deleted file mode 100644
index cc0d84f..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2012/libzmq/libzmq.vcxproj
+++ /dev/null
@@ -1,289 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{641C5F36-32EE-4323-B740-992B651CF9D6}</ProjectGuid>
-    <ProjectName>libzmq</ProjectName>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DebugDLL|Win32">
-      <Configuration>DebugDLL</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDLL|Win32">
-      <Configuration>ReleaseDLL</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugDLL|x64">
-      <Configuration>DebugDLL</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDLL|x64">
-      <Configuration>ReleaseDLL</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLTCG|Win32">
-      <Configuration>DebugLTCG</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLTCG|Win32">
-      <Configuration>ReleaseLTCG</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLTCG|x64">
-      <Configuration>DebugLTCG</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLTCG|x64">
-      <Configuration>ReleaseLTCG</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLIB|Win32">
-      <Configuration>DebugLIB</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLIB|Win32">
-      <Configuration>ReleaseLIB</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLIB|x64">
-      <Configuration>DebugLIB</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLIB|x64">
-      <Configuration>ReleaseLIB</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Configuration">
-    <ConfigurationType Condition="$(Configuration.IndexOf('DLL')) == -1">StaticLibrary</ConfigurationType>
-    <ConfigurationType Condition="$(Configuration.IndexOf('DLL')) != -1">DynamicLibrary</ConfigurationType>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
-    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-  </ImportGroup>
-  <PropertyGroup>
-    <Option-tweet>true</Option-tweet>
-  </PropertyGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\platform.hpp" />
-    <ClInclude Include="..\..\resource.h" />
-    <ClInclude Include="..\..\..\..\include\zmq.h" />
-    <ClInclude Include="..\..\..\..\src\zmq_draft.h" />
-    <ClInclude Include="..\..\..\..\src\address.hpp" />
-    <ClInclude Include="..\..\..\..\src\array.hpp" />
-    <ClInclude Include="..\..\..\..\src\atomic_counter.hpp" />
-    <ClInclude Include="..\..\..\..\src\atomic_ptr.hpp" />
-    <ClInclude Include="..\..\..\..\src\blob.hpp" />
-    <ClInclude Include="..\..\..\..\src\client.hpp" />
-    <ClInclude Include="..\..\..\..\src\clock.hpp" />
-    <ClInclude Include="..\..\..\..\src\command.hpp" />
-    <ClInclude Include="..\..\..\..\src\condition_variable.hpp" />
-    <ClInclude Include="..\..\..\..\src\config.hpp" />
-    <ClInclude Include="..\..\..\..\src\ctx.hpp" />
-    <ClInclude Include="..\..\..\..\src\curve_client.hpp" />
-    <ClInclude Include="..\..\..\..\src\curve_server.hpp" />
-    <ClInclude Include="..\..\..\..\src\decoder.hpp" />
-    <ClInclude Include="..\..\..\..\src\decoder_allocators.hpp" />
-    <ClInclude Include="..\..\..\..\src\devpoll.hpp" />
-    <ClInclude Include="..\..\..\..\src\dgram.hpp" />
-    <ClInclude Include="..\..\..\..\src\dish.hpp" />
-    <ClInclude Include="..\..\..\..\src\dist.hpp" />
-    <ClInclude Include="..\..\..\..\src\encoder.hpp" />
-    <ClInclude Include="..\..\..\..\src\epoll.hpp" />
-    <ClInclude Include="..\..\..\..\src\err.hpp" />
-    <ClInclude Include="..\..\..\..\src\fd.hpp" />
-    <ClInclude Include="..\..\..\..\src\fq.hpp" />
-    <ClInclude Include="..\..\..\..\src\gather.hpp" />
-    <ClInclude Include="..\..\..\..\src\gssapi_client.hpp" />
-    <ClInclude Include="..\..\..\..\src\gssapi_mechanism_base.hpp" />
-    <ClInclude Include="..\..\..\..\src\gssapi_server.hpp" />
-    <ClInclude Include="..\..\..\..\src\i_engine.hpp" />
-    <ClInclude Include="..\..\..\..\src\i_poll_events.hpp" />
-    <ClInclude Include="..\..\..\..\src\io_object.hpp" />
-    <ClInclude Include="..\..\..\..\src\io_thread.hpp" />
-    <ClInclude Include="..\..\..\..\src\ip.hpp" />
-    <ClInclude Include="..\..\..\..\src\ipc_address.hpp" />
-    <ClInclude Include="..\..\..\..\src\ipc_connecter.hpp" />
-    <ClInclude Include="..\..\..\..\src\ipc_listener.hpp" />
-    <ClInclude Include="..\..\..\..\src\kqueue.hpp" />
-    <ClInclude Include="..\..\..\..\src\lb.hpp" />
-    <ClInclude Include="..\..\..\..\src\likely.hpp" />
-    <ClInclude Include="..\..\..\..\src\mailbox.hpp" />
-    <ClInclude Include="..\..\..\..\src\mailbox_safe.hpp" />
-    <ClInclude Include="..\..\..\..\src\msg.hpp" />
-    <ClInclude Include="..\..\..\..\src\mtrie.hpp" />
-    <ClInclude Include="..\..\..\..\src\mutex.hpp" />
-    <ClInclude Include="..\..\..\..\src\object.hpp" />
-    <ClInclude Include="..\..\..\..\src\options.hpp" />
-    <ClInclude Include="..\..\..\..\src\own.hpp" />
-    <ClInclude Include="..\..\..\..\src\pair.hpp" />
-    <ClInclude Include="..\..\..\..\src\pgm_receiver.hpp" />
-    <ClInclude Include="..\..\..\..\src\pgm_sender.hpp" />
-    <ClInclude Include="..\..\..\..\src\pgm_socket.hpp" />
-    <ClInclude Include="..\..\..\..\src\pipe.hpp" />
-    <ClInclude Include="..\..\..\..\src\server.hpp" />
-    <ClInclude Include="..\..\..\..\src\socks.hpp" />
-    <ClInclude Include="..\..\..\..\src\socks_connecter.hpp" />
-    <ClInclude Include="..\..\..\..\src\poll.hpp" />
-    <ClInclude Include="..\..\..\..\src\poller.hpp" />
-    <ClInclude Include="..\..\..\..\src\poller_base.hpp" />
-    <ClInclude Include="..\..\..\..\src\precompiled.hpp" />
-    <ClInclude Include="..\..\..\..\src\proxy.hpp" />
-    <ClInclude Include="..\..\..\..\src\pub.hpp" />
-    <ClInclude Include="..\..\..\..\src\pull.hpp" />
-    <ClInclude Include="..\..\..\..\src\push.hpp" />
-    <ClInclude Include="..\..\..\..\src\radio.hpp" />
-    <ClInclude Include="..\..\..\..\src\random.hpp" />
-    <ClInclude Include="..\..\..\..\src\raw_decoder.hpp" />
-    <ClInclude Include="..\..\..\..\src\raw_encoder.hpp" />
-    <ClInclude Include="..\..\..\..\src\reaper.hpp" />
-    <ClInclude Include="..\..\..\..\src\rep.hpp" />
-    <ClInclude Include="..\..\..\..\src\req.hpp" />
-    <ClInclude Include="..\..\..\..\src\scatter.hpp" />
-    <ClInclude Include="..\..\..\..\src\select.hpp" />
-    <ClInclude Include="..\..\..\..\src\session_base.hpp" />
-    <ClInclude Include="..\..\..\..\src\signaler.hpp" />
-    <ClInclude Include="..\..\..\..\src\socket_base.hpp" />
-    <ClInclude Include="..\..\..\..\src\stdint.hpp" />
-    <ClInclude Include="..\..\..\..\src\stream_engine.hpp" />
-    <ClInclude Include="..\..\..\..\src\sub.hpp" />
-    <ClInclude Include="..\..\..\..\src\tcp.hpp" />
-    <ClInclude Include="..\..\..\..\src\tcp_address.hpp" />
-    <ClInclude Include="..\..\..\..\src\tcp_connecter.hpp" />
-    <ClInclude Include="..\..\..\..\src\tcp_listener.hpp" />
-    <ClInclude Include="..\..\..\..\src\timers.hpp" />
-    <ClInclude Include="..\..\..\..\src\thread.hpp" />
-    <ClInclude Include="..\..\..\..\src\trie.hpp" />
-    <ClInclude Include="..\..\..\..\src\tweetnacl.h" />
-    <ClInclude Include="..\..\..\..\src\udp_address.hpp" />
-    <ClInclude Include="..\..\..\..\src\udp_engine.hpp" />
-    <ClInclude Include="..\..\..\..\src\v1_decoder.hpp" />
-    <ClInclude Include="..\..\..\..\src\v1_encoder.hpp" />
-    <ClInclude Include="..\..\..\..\src\v1_protocol.hpp" />
-    <ClInclude Include="..\..\..\..\src\windows.hpp" />
-    <ClInclude Include="..\..\..\..\src\wire.hpp" />
-    <ClInclude Include="..\..\..\..\src\xpub.hpp" />
-    <ClInclude Include="..\..\..\..\src\xrep.hpp" />
-    <ClInclude Include="..\..\..\..\src\xreq.hpp" />
-    <ClInclude Include="..\..\..\..\src\xsub.hpp" />
-    <ClInclude Include="..\..\..\..\src\ypipe.hpp" />
-    <ClInclude Include="..\..\..\..\src\yqueue.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\..\src\address.cpp" />
-    <ClCompile Include="..\..\..\..\src\client.cpp" />
-    <ClCompile Include="..\..\..\..\src\clock.cpp" />
-    <ClCompile Include="..\..\..\..\src\ctx.cpp" />
-    <ClCompile Include="..\..\..\..\src\curve_client.cpp" />
-    <ClCompile Include="..\..\..\..\src\curve_mechanism_base.cpp" />
-    <ClCompile Include="..\..\..\..\src\curve_server.cpp" />
-    <ClCompile Include="..\..\..\..\src\dealer.cpp" />
-    <ClCompile Include="..\..\..\..\src\decoder_allocators.cpp" />
-    <ClCompile Include="..\..\..\..\src\devpoll.cpp" />
-    <ClCompile Include="..\..\..\..\src\dgram.cpp" />
-    <ClCompile Include="..\..\..\..\src\dish.cpp" />
-    <ClCompile Include="..\..\..\..\src\dist.cpp" />
-    <ClCompile Include="..\..\..\..\src\epoll.cpp" />
-    <ClCompile Include="..\..\..\..\src\err.cpp" />
-    <ClCompile Include="..\..\..\..\src\fq.cpp" />
-    <ClCompile Include="..\..\..\..\src\gather.cpp" />
-    <ClCompile Include="..\..\..\..\src\gssapi_client.cpp" />
-    <ClCompile Include="..\..\..\..\src\gssapi_mechanism_base.cpp" />
-    <ClCompile Include="..\..\..\..\src\gssapi_server.cpp" />
-    <ClCompile Include="..\..\..\..\src\io_object.cpp" />
-    <ClCompile Include="..\..\..\..\src\io_thread.cpp" />
-    <ClCompile Include="..\..\..\..\src\ip.cpp" />
-    <ClCompile Include="..\..\..\..\src\ipc_address.cpp" />
-    <ClCompile Include="..\..\..\..\src\ipc_connecter.cpp" />
-    <ClCompile Include="..\..\..\..\src\ipc_listener.cpp" />
-    <ClCompile Include="..\..\..\..\src\kqueue.cpp" />
-    <ClCompile Include="..\..\..\..\src\lb.cpp" />
-    <ClCompile Include="..\..\..\..\src\mailbox.cpp" />
-    <ClCompile Include="..\..\..\..\src\mailbox_safe.cpp" />
-    <ClCompile Include="..\..\..\..\src\mechanism.cpp" />
-    <ClCompile Include="..\..\..\..\src\mechanism_base.cpp" />
-    <ClCompile Include="..\..\..\..\src\metadata.cpp" />
-    <ClCompile Include="..\..\..\..\src\msg.cpp" />
-    <ClCompile Include="..\..\..\..\src\mtrie.cpp" />
-    <ClCompile Include="..\..\..\..\src\null_mechanism.cpp" />
-    <ClCompile Include="..\..\..\..\src\object.cpp" />
-    <ClCompile Include="..\..\..\..\src\options.cpp" />
-    <ClCompile Include="..\..\..\..\src\own.cpp" />
-    <ClCompile Include="..\..\..\..\src\pair.cpp" />
-    <ClCompile Include="..\..\..\..\src\pgm_receiver.cpp" />
-    <ClCompile Include="..\..\..\..\src\pgm_sender.cpp" />
-    <ClCompile Include="..\..\..\..\src\pgm_socket.cpp" />
-    <ClCompile Include="..\..\..\..\src\pipe.cpp" />
-    <ClCompile Include="..\..\..\..\src\plain_client.cpp" />
-    <ClCompile Include="..\..\..\..\src\plain_server.cpp" />
-    <ClCompile Include="..\..\..\..\src\poll.cpp" />
-    <ClCompile Include="..\..\..\..\src\poller_base.cpp" />
-    <ClCompile Include="..\..\..\..\src\precompiled.cpp">
-      <PrecompiledHeader>Create</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\proxy.cpp" />
-    <ClCompile Include="..\..\..\..\src\pub.cpp" />
-    <ClCompile Include="..\..\..\..\src\pull.cpp" />
-    <ClCompile Include="..\..\..\..\src\push.cpp" />
-    <ClCompile Include="..\..\..\..\src\radio.cpp" />
-    <ClCompile Include="..\..\..\..\src\random.cpp" />
-    <ClCompile Include="..\..\..\..\src\raw_decoder.cpp" />
-    <ClCompile Include="..\..\..\..\src\raw_encoder.cpp" />
-    <ClCompile Include="..\..\..\..\src\reaper.cpp" />
-    <ClCompile Include="..\..\..\..\src\rep.cpp" />
-    <ClCompile Include="..\..\..\..\src\req.cpp" />
-    <ClCompile Include="..\..\..\..\src\router.cpp" />
-    <ClCompile Include="..\..\..\..\src\scatter.cpp" />
-    <ClCompile Include="..\..\..\..\src\select.cpp" />
-    <ClCompile Include="..\..\..\..\src\server.cpp" />
-    <ClCompile Include="..\..\..\..\src\session_base.cpp" />
-    <ClCompile Include="..\..\..\..\src\signaler.cpp" />
-    <ClCompile Include="..\..\..\..\src\socket_base.cpp" />
-    <ClCompile Include="..\..\..\..\src\socket_poller.cpp" />
-    <ClCompile Include="..\..\..\..\src\socks.cpp" />
-    <ClCompile Include="..\..\..\..\src\socks_connecter.cpp" />
-    <ClCompile Include="..\..\..\..\src\stream.cpp" />
-    <ClCompile Include="..\..\..\..\src\stream_engine.cpp" />
-    <ClCompile Include="..\..\..\..\src\sub.cpp" />
-    <ClCompile Include="..\..\..\..\src\tcp.cpp" />
-    <ClCompile Include="..\..\..\..\src\tcp_address.cpp" />
-    <ClCompile Include="..\..\..\..\src\tcp_connecter.cpp" />
-    <ClCompile Include="..\..\..\..\src\tcp_listener.cpp" />
-    <ClCompile Include="..\..\..\..\src\thread.cpp" />
-    <ClCompile Include="..\..\..\..\src\timers.cpp" />
-    <ClCompile Include="..\..\..\..\src\trie.cpp" />
-    <ClCompile Include="..\..\..\..\src\tweetnacl.c">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\udp_address.cpp" />
-    <ClCompile Include="..\..\..\..\src\udp_engine.cpp" />
-    <ClCompile Include="..\..\..\..\src\v1_decoder.cpp" />
-    <ClCompile Include="..\..\..\..\src\v1_encoder.cpp" />
-    <ClCompile Include="..\..\..\..\src\v2_decoder.cpp" />
-    <ClCompile Include="..\..\..\..\src\v2_encoder.cpp" />
-    <ClCompile Include="..\..\..\..\src\xpub.cpp" />
-    <ClCompile Include="..\..\..\..\src\xsub.cpp" />
-    <ClCompile Include="..\..\..\..\src\zap_client.cpp" />
-    <ClCompile Include="..\..\..\..\src\zmq.cpp" />
-    <ClCompile Include="..\..\..\..\src\zmq_utils.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\..\..\..\packaging\nuget\package.bat" />
-    <None Include="..\..\..\..\packaging\nuget\package.config" />
-    <None Include="..\..\..\..\packaging\nuget\package.gsl" />
-    <None Include="..\..\..\..\packaging\nuget\package.nuspec" />
-    <None Include="..\..\..\..\packaging\nuget\package.targets" />
-  </ItemGroup>
-  <ItemGroup>
-    <Xml Include="..\..\..\..\packaging\nuget\package.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\..\resource.rc" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2012/libzmq/libzmq.vcxproj.filters b/libs/libzmq/builds/deprecated-msvc/vs2012/libzmq/libzmq.vcxproj.filters
deleted file mode 100644
index 930b009..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2012/libzmq/libzmq.vcxproj.filters
+++ /dev/null
@@ -1,627 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClCompile Include="..\..\..\..\src\address.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\clock.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\ctx.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\dealer.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\devpoll.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\dgram.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\dist.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\epoll.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\err.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\fq.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\io_object.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\io_thread.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\ip.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\ipc_address.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\ipc_connecter.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\ipc_listener.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\kqueue.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\lb.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mailbox.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mechanism.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\metadata.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\msg.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mtrie.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\null_mechanism.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\object.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\options.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\own.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\pair.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\pgm_receiver.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\pgm_sender.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\pgm_socket.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\pipe.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\plain_client.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\plain_server.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\poll.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\poller_base.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\proxy.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\pub.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\pull.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\push.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\random.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\raw_decoder.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\raw_encoder.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\reaper.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\rep.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\req.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\router.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\scatter.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\select.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\session_base.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\signaler.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\socket_base.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\stream.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\stream_engine.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\sub.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\tcp.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\tcp_address.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\tcp_connecter.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\tcp_listener.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\thread.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\trie.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\v1_decoder.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\v1_encoder.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\v2_decoder.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\v2_encoder.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\xpub.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\xsub.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\zmq.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\zmq_utils.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\precompiled.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\curve_client.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\curve_server.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\gather.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\gssapi_mechanism_base.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\gssapi_server.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\gssapi_client.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\socks.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\socks_connecter.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\server.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\client.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mailbox_safe.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\decoder_allocators.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\socket_poller.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\udp_address.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\udp_engine.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\dish.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\radio.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\timers.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\tweetnacl.c">
-      <Filter>src</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\..\include\zmq.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\address.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\array.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\atomic_counter.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\atomic_ptr.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\blob.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\clock.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\command.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\config.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\ctx.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\devpoll.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\dgram.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\dist.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\encoder.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\epoll.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\err.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\fd.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\fq.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\i_engine.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\i_poll_events.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\io_object.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\io_thread.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\ip.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\ipc_address.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\ipc_connecter.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\ipc_listener.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\kqueue.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\lb.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\decoder.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\likely.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mailbox.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\msg.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mtrie.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mutex.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\object.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\options.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\own.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\pair.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\pgm_receiver.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\yqueue.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\ypipe.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\xsub.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\xreq.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\xrep.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\xpub.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\wire.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\windows.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\v1_encoder.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\v1_protocol.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\v1_decoder.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\trie.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\thread.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\tcp_listener.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\tcp_connecter.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\tcp_address.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\tcp.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\sub.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\stream_engine.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\stdint.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\socket_base.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\signaler.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\session_base.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\scatter.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\select.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\req.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\rep.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\reaper.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\raw_encoder.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\raw_decoder.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\random.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\push.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\pull.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\pub.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\proxy.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\precompiled.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\poller_base.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\poller.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\poll.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\platform.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\pipe.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\pgm_socket.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\pgm_sender.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\resource.h">
-      <Filter>resource</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\curve_client.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\curve_server.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\gather.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\gssapi_mechanism_base.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\gssapi_server.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\gssapi_client.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\socks.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\socks_connecter.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\server.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\client.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mailbox_safe.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\condition_variable.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\decoder_allocators.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\udp_address.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\udp_engine.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\dish.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\radio.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\timers.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\tweetnacl.h">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\zmq_draft.h">
-      <Filter>src\include</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="include">
-      <UniqueIdentifier>{f7e88c6c-e408-4631-959c-fe3568656d70}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="src">
-      <UniqueIdentifier>{35f0c644-e1d8-4a46-bb33-06bb8b645fff}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="src\include">
-      <UniqueIdentifier>{90853975-3420-4f06-8be4-4ab3d9792160}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="packaging">
-      <UniqueIdentifier>{f5e26e9d-c33d-45c1-95e4-0732acd28b59}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="resource">
-      <UniqueIdentifier>{e66010e4-a9ea-4e2e-8bc6-12fec14bb009}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\..\..\..\packaging\nuget\package.bat">
-      <Filter>packaging</Filter>
-    </None>
-    <None Include="..\..\..\..\packaging\nuget\package.config">
-      <Filter>packaging</Filter>
-    </None>
-    <None Include="..\..\..\..\packaging\nuget\package.gsl">
-      <Filter>packaging</Filter>
-    </None>
-    <None Include="..\..\..\..\packaging\nuget\package.targets">
-      <Filter>packaging</Filter>
-    </None>
-    <None Include="..\..\..\..\packaging\nuget\package.nuspec">
-      <Filter>packaging</Filter>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <Xml Include="..\..\..\..\packaging\nuget\package.xml">
-      <Filter>packaging</Filter>
-    </Xml>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\..\resource.rc">
-      <Filter>resource</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2012/libzmq/libzmq.xml b/libs/libzmq/builds/deprecated-msvc/vs2012/libzmq/libzmq.xml
deleted file mode 100644
index db7dfe0..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2012/libzmq/libzmq.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ProjectSchemaDefinitions xmlns="clr-namespace:Microsoft.Build.Framework.XamlTypes;assembly=Microsoft.Build.Framework">
-  <Rule Name="libzmq-uiextension" PageTemplate="tool" DisplayName="ZMQ Options" SwitchPrefix="/" Order="1">
-    <Rule.Categories>
-      <Category Name="tweet" DisplayName="tweet" />
-      <Category Name="sodium" DisplayName="sodium" />
-      <Category Name="openpgm" DisplayName="openpgm" />
-      <Category Name="gssapi" DisplayName="gssapi" />
-      <Category Name="draftapi" DisplayName="draftapi" />
-      <Category Name="usepoll" DisplayName="usepoll" />
-    </Rule.Categories>
-    <Rule.DataSource>
-      <DataSource Persistence="ProjectFile" ItemType="" />
-    </Rule.DataSource>
-    <EnumProperty Name="Option-tweet" DisplayName="Enable Tweet NaCl" Description="Enable Tweet NaCl build option (overrides Sodium)" Category="tweet">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-    <EnumProperty Name="Option-sodium" DisplayName="Enable Sodium" Description="Enable Sodium build option" Category="sodium">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-    <EnumProperty Name="Option-openpgm" DisplayName="Enable OpenPGM" Description="Enable OpenPGM build option" Category="openpgm">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-    <EnumProperty Name="Option-gssapi" DisplayName="Enable GSS API" Description="Enable GSS API build option" Category="gssapi">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-    <EnumProperty Name="Option-draftapi" DisplayName="Enable Draft API" Description="Enable Draft API build option" Category="draftapi">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-    <EnumProperty Name="Option-usepoll" DisplayName="Enable poll() usage (Vista+ only)" Description="Use poll() instead of select() for waiting on incoming data. Increases performance, but the binary will only run on Windows Vista or later." Category="usepoll">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-  </Rule>
-</ProjectSchemaDefinitions>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2012/local_lat/local_lat.props b/libs/libzmq/builds/deprecated-msvc/vs2012/local_lat/local_lat.props
deleted file mode 100644
index ea5e3e5..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2012/local_lat/local_lat.props
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>ZeroMQ local_lat Common Settings</_PropertySheetDisplayName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-  </PropertyGroup>
-
-  <!-- Configuration -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <!-- Dependencies -->
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="..\libzmq.import.props" />
-    <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props"
-            Condition="Exists('$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props')" /> 
-  </ImportGroup>
-
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
-    <Linkage-libzmq>dynamic</Linkage-libzmq>
-    <!--<Linkage-libsodium>dynamic</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
-    <Linkage-libzmq>ltcg</Linkage-libzmq>
-    <!--<Linkage-libsodium>ltcg</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
-    <Linkage-libzmq>static</Linkage-libzmq>
-    <!--<Linkage-libsodium>static</Linkage-libsodium>-->
-  </PropertyGroup>
-
-  <!-- Messages -->
-
-  <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Linkage-libzmq    : $(Linkage-libzmq)" Importance="high"/>
-    <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high" Condition="'$(HAVE_LIBSODIUM)'=='1'"/>
-  </Target>
-
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2012/local_lat/local_lat.vcxproj b/libs/libzmq/builds/deprecated-msvc/vs2012/local_lat/local_lat.vcxproj
deleted file mode 100644
index 03aab15..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2012/local_lat/local_lat.vcxproj
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}</ProjectGuid>
-    <ProjectName>local_lat</ProjectName>
-    <PlatformToolset>v110</PlatformToolset>
-    <ConfigurationType>Application</ConfigurationType>
-  </PropertyGroup>
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DebugDEXE|Win32">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|Win32">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugDEXE|x64">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|x64">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|Win32">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|Win32">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|x64">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|x64">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|Win32">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|Win32">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|x64">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|x64">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
-    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-  </ImportGroup>
-  <PropertyGroup>
-    <Option-tweet>true</Option-tweet>
-  </PropertyGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\platform.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\..\perf\local_lat.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ItemGroup>
-    <ProjectReference Include="..\libzmq\libzmq.vcxproj">
-      <Project>{641c5f36-32ee-4323-b740-992b651cf9d6}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2012/local_thr/local_thr.props b/libs/libzmq/builds/deprecated-msvc/vs2012/local_thr/local_thr.props
deleted file mode 100644
index 1d017d4..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2012/local_thr/local_thr.props
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>ZeroMQ local_thr Common Settings</_PropertySheetDisplayName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-  </PropertyGroup>
-
-  <!-- Configuration -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <!-- Dependencies -->
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="..\libzmq.import.props" />
-    <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props"
-            Condition="Exists('$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props')" /> 
-  </ImportGroup>
-
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
-    <Linkage-libzmq>dynamic</Linkage-libzmq>
-    <!--<Linkage-libsodium>dynamic</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
-    <Linkage-libzmq>ltcg</Linkage-libzmq>
-    <!--<Linkage-libsodium>ltcg</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
-    <Linkage-libzmq>static</Linkage-libzmq>
-    <!--<Linkage-libsodium>static</Linkage-libsodium>-->
-  </PropertyGroup>
-
-  <!-- Messages -->
-
-  <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Linkage-libzmq    : $(Linkage-libzmq)" Importance="high"/>
-    <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high" Condition="'$(HAVE_LIBSODIUM)'=='1'"/>
-  </Target>
-
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2012/local_thr/local_thr.vcxproj b/libs/libzmq/builds/deprecated-msvc/vs2012/local_thr/local_thr.vcxproj
deleted file mode 100644
index 98b1db8..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2012/local_thr/local_thr.vcxproj
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{8EF2DF6B-6646-460F-8032-913B70FE0E94}</ProjectGuid>
-    <ProjectName>local_thr</ProjectName>
-    <PlatformToolset>v110</PlatformToolset>
-    <ConfigurationType>Application</ConfigurationType>
-  </PropertyGroup>
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DebugDEXE|Win32">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|Win32">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugDEXE|x64">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|x64">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|Win32">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|Win32">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|x64">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|x64">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|Win32">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|Win32">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|x64">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|x64">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
-    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-  </ImportGroup>
-  <PropertyGroup>
-    <Option-tweet>true</Option-tweet>
-  </PropertyGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\platform.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\..\perf\local_thr.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ItemGroup>
-    <ProjectReference Include="..\libzmq\libzmq.vcxproj">
-      <Project>{641c5f36-32ee-4323-b740-992b651cf9d6}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2012/remote_lat/remote_lat.props b/libs/libzmq/builds/deprecated-msvc/vs2012/remote_lat/remote_lat.props
deleted file mode 100644
index 307eaf5..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2012/remote_lat/remote_lat.props
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>ZeroMQ remote_lat Common Settings</_PropertySheetDisplayName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-  </PropertyGroup>
-
-  <!-- Configuration -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <!-- Dependencies -->
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="..\libzmq.import.props" />
-    <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props"
-            Condition="Exists('$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props')" /> 
-  </ImportGroup>
-
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
-    <Linkage-libzmq>dynamic</Linkage-libzmq>
-    <!--<Linkage-libsodium>dynamic</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
-    <Linkage-libzmq>ltcg</Linkage-libzmq>
-    <!--<Linkage-libsodium>ltcg</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
-    <Linkage-libzmq>static</Linkage-libzmq>
-    <!--<Linkage-libsodium>static</Linkage-libsodium>-->
-  </PropertyGroup>
-
-  <!-- Messages -->
-
-  <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Linkage-libzmq    : $(Linkage-libzmq)" Importance="high"/>
-    <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high" Condition="'$(HAVE_LIBSODIUM)'=='1'"/>
-  </Target>
-
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2012/remote_lat/remote_lat.vcxproj b/libs/libzmq/builds/deprecated-msvc/vs2012/remote_lat/remote_lat.vcxproj
deleted file mode 100644
index ce24b70..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2012/remote_lat/remote_lat.vcxproj
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}</ProjectGuid>
-    <ProjectName>remote_lat</ProjectName>
-    <PlatformToolset>v110</PlatformToolset>
-    <ConfigurationType>Application</ConfigurationType>
-  </PropertyGroup>
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DebugDEXE|Win32">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|Win32">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugDEXE|x64">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|x64">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|Win32">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|Win32">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|x64">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|x64">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|Win32">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|Win32">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|x64">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|x64">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
-    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-  </ImportGroup>
-  <PropertyGroup>
-    <Option-tweet>true</Option-tweet>
-  </PropertyGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\platform.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\..\perf\remote_lat.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ItemGroup>
-    <ProjectReference Include="..\libzmq\libzmq.vcxproj">
-      <Project>{641c5f36-32ee-4323-b740-992b651cf9d6}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2012/remote_thr/remote_thr.props b/libs/libzmq/builds/deprecated-msvc/vs2012/remote_thr/remote_thr.props
deleted file mode 100644
index 001e481..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2012/remote_thr/remote_thr.props
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>ZeroMQ remote_thr Common Settings</_PropertySheetDisplayName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-  </PropertyGroup>
-
-  <!-- Configuration -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <!-- Dependencies -->
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="..\libzmq.import.props" />
-    <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props"
-            Condition="Exists('$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props')" /> 
-  </ImportGroup>
-  
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
-    <Linkage-libzmq>dynamic</Linkage-libzmq>
-    <!--<Linkage-libsodium>dynamic</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
-    <Linkage-libzmq>ltcg</Linkage-libzmq>
-    <!--<Linkage-libsodium>ltcg</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
-    <Linkage-libzmq>static</Linkage-libzmq>
-    <!--<Linkage-libsodium>static</Linkage-libsodium>-->
-  </PropertyGroup>
-
-  <!-- Messages -->
-
-  <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Linkage-libzmq    : $(Linkage-libzmq)" Importance="high"/>
-    <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high" Condition="'$(HAVE_LIBSODIUM)'=='1'"/>
-  </Target>
-
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2012/remote_thr/remote_thr.vcxproj b/libs/libzmq/builds/deprecated-msvc/vs2012/remote_thr/remote_thr.vcxproj
deleted file mode 100644
index 942e2d3..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2012/remote_thr/remote_thr.vcxproj
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{B15E059C-0CBB-4A82-8C42-6567FB650802}</ProjectGuid>
-    <ProjectName>remote_thr</ProjectName>
-    <PlatformToolset>v110</PlatformToolset>
-    <ConfigurationType>Application</ConfigurationType>
-  </PropertyGroup>
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DebugDEXE|Win32">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|Win32">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugDEXE|x64">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|x64">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|Win32">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|Win32">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|x64">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|x64">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|Win32">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|Win32">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|x64">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|x64">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
-    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-  </ImportGroup>
-  <PropertyGroup>
-    <Option-tweet>true</Option-tweet>
-  </PropertyGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\platform.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\..\perf\remote_thr.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ItemGroup>
-    <ProjectReference Include="..\libzmq\libzmq.vcxproj">
-      <Project>{641c5f36-32ee-4323-b740-992b651cf9d6}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2013/inproc_lat/inproc_lat.props b/libs/libzmq/builds/deprecated-msvc/vs2013/inproc_lat/inproc_lat.props
deleted file mode 100644
index fc03c8b..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2013/inproc_lat/inproc_lat.props
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>ZeroMQ inproc_lat Common Settings</_PropertySheetDisplayName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-  </PropertyGroup>
-
-  <!-- Configuration -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <!-- Dependencies -->
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="..\libzmq.import.props" />
-    <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props"
-            Condition="Exists('$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props')" /> 
-  </ImportGroup>
-
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
-    <Linkage-libzmq>dynamic</Linkage-libzmq>
-    <!--<Linkage-libsodium>dynamic</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
-    <Linkage-libzmq>ltcg</Linkage-libzmq>
-    <!--<Linkage-libsodium>ltcg</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
-    <Linkage-libzmq>static</Linkage-libzmq>
-    <!--<Linkage-libsodium>static</Linkage-libsodium>-->
-  </PropertyGroup>
-
-  <!-- Messages -->
-
-  <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Linkage-libzmq    : $(Linkage-libzmq)" Importance="high"/>
-    <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high"  Condition="'$(HAVE_LIBSODIUM)'=='1'"/>
-  </Target>
-
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2013/inproc_lat/inproc_lat.vcxproj b/libs/libzmq/builds/deprecated-msvc/vs2013/inproc_lat/inproc_lat.vcxproj
deleted file mode 100644
index f280953..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2013/inproc_lat/inproc_lat.vcxproj
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}</ProjectGuid>
-    <ProjectName>inproc_lat</ProjectName>
-    <PlatformToolset>v120</PlatformToolset>
-    <ConfigurationType>Application</ConfigurationType>
-  </PropertyGroup>
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DebugDEXE|Win32">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|Win32">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugDEXE|x64">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|x64">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|Win32">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|Win32">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|x64">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|x64">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|Win32">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|Win32">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|x64">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|x64">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
-    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-  </ImportGroup>
-  <PropertyGroup>
-    <Option-tweet>true</Option-tweet>
-  </PropertyGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\platform.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\..\perf\inproc_lat.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ItemGroup>
-    <ProjectReference Include="..\libzmq\libzmq.vcxproj">
-      <Project>{641c5f36-32ee-4323-b740-992b651cf9d6}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2013/inproc_thr/inproc_thr.props b/libs/libzmq/builds/deprecated-msvc/vs2013/inproc_thr/inproc_thr.props
deleted file mode 100644
index aba5058..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2013/inproc_thr/inproc_thr.props
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>ZeroMQ inproc_thr Common Settings</_PropertySheetDisplayName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-  </PropertyGroup>
-
-  <!-- Configuration -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <!-- Dependencies -->
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="..\libzmq.import.props" />
-    <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props"
-            Condition="Exists('$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props')" /> 
-  </ImportGroup>
-
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
-    <Linkage-libzmq>dynamic</Linkage-libzmq>
-    <!--<Linkage-libsodium>dynamic</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
-    <Linkage-libzmq>ltcg</Linkage-libzmq>
-    <!--<Linkage-libsodium>ltcg</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
-    <Linkage-libzmq>static</Linkage-libzmq>
-    <!--<Linkage-libsodium>static</Linkage-libsodium>-->
-  </PropertyGroup>
-
-  <!-- Messages -->
-
-  <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Linkage-libzmq    : $(Linkage-libzmq)" Importance="high"/>
-    <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high" Condition="'$(HAVE_LIBSODIUM)'=='1'"/>
-  </Target>
-
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2013/inproc_thr/inproc_thr.vcxproj b/libs/libzmq/builds/deprecated-msvc/vs2013/inproc_thr/inproc_thr.vcxproj
deleted file mode 100644
index c587b65..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2013/inproc_thr/inproc_thr.vcxproj
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{1077E977-95DD-4E73-A692-74647DD0CC1E}</ProjectGuid>
-    <ProjectName>inproc_thr</ProjectName>
-    <PlatformToolset>v120</PlatformToolset>
-    <ConfigurationType>Application</ConfigurationType>
-  </PropertyGroup>
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DebugDEXE|Win32">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|Win32">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugDEXE|x64">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|x64">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|Win32">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|Win32">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|x64">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|x64">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|Win32">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|Win32">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|x64">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|x64">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
-    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-  </ImportGroup>
-  <PropertyGroup>
-    <Option-tweet>true</Option-tweet>
-  </PropertyGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\platform.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\..\perf\inproc_thr.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ItemGroup>
-    <ProjectReference Include="..\libzmq\libzmq.vcxproj">
-      <Project>{641c5f36-32ee-4323-b740-992b651cf9d6}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2013/libsodium.import.props b/libs/libzmq/builds/deprecated-msvc/vs2013/libsodium.import.props
deleted file mode 100644
index b3d7e4f..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2013/libsodium.import.props
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup Label="Globals">
-    <_PropertySheetDisplayName>Libsodium Import Settings</_PropertySheetDisplayName>
-  </PropertyGroup>
-
-  <!-- User Interface -->
-
-  <ItemGroup Label="BuildOptionsExtension">
-    <PropertyPageSchema Include="$(MSBuildThisFileDirectory)libsodium.import.xml" />
-  </ItemGroup>
-
-  <!-- Linkage -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\..\libsodium\src\libsodium\include;$(ProjectDir)..\..\..\..\..\libsodium\src\libsodium\include\sodium\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Linkage-libsodium)' == 'static' Or '$(Linkage-libsodium)' == 'ltcg'">SODIUM_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies Condition="'$(Linkage-libsodium)' != ''">advapi32.lib;libsodium.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Debug')) != -1">$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\$(PlatformToolset)\$(Linkage-libsodium)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Release')) != -1">$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Release\$(PlatformToolset)\$(Linkage-libsodium)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <!-- Copy -->
-
-  <Target Name="Linkage-libsodium-dynamic" AfterTargets="AfterBuild" Condition="'$(Linkage-libsodium)' == 'dynamic'">
-    <Copy Condition="$(Configuration.IndexOf('Debug')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\$(PlatformToolset)\dynamic\libsodium.dll"
-          DestinationFiles="$(TargetDir)libsodium.dll"
-          SkipUnchangedFiles="true" />
-    <Copy Condition="$(Configuration.IndexOf('Debug')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\$(PlatformToolset)\dynamic\libsodium.pdb"
-          DestinationFiles="$(TargetDir)libsodium.pdb"
-          SkipUnchangedFiles="true" />
-    <Copy Condition="$(Configuration.IndexOf('Release')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Release\$(PlatformToolset)\dynamic\libsodium.dll"
-          DestinationFiles="$(TargetDir)libsodium.dll"
-          SkipUnchangedFiles="true" />
-  </Target>
-
-  <!-- Messages -->
-
-  <Target Name="libsodium-info" BeforeTargets="AfterBuild" Condition="'$(Linkage-libsodium)' == 'dynamic'">
-    <Message Text="Copying libsodium.dll -&gt; $(TargetDir)libsodium.dll" Importance="high"/>
-    <Message Text="Copying libsodium.pdb -&gt; $(TargetDir)libsodium.pdb" Importance="high" Condition="$(Configuration.IndexOf('Debug')) != -1" />
-  </Target>
-
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2013/libsodium.import.xml b/libs/libzmq/builds/deprecated-msvc/vs2013/libsodium.import.xml
deleted file mode 100644
index dbcf4e5..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2013/libsodium.import.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ProjectSchemaDefinitions xmlns="clr-namespace:Microsoft.Build.Framework.XamlTypes;assembly=Microsoft.Build.Framework">
-  <Rule Name="libsodium-linkage-uiextension" PageTemplate="tool" DisplayName="Local Dependencies" SwitchPrefix="/" Order="1">
-    <Rule.Categories>
-      <Category Name="libsodium" DisplayName="libsodium" />
-    </Rule.Categories>
-    <Rule.DataSource>
-      <DataSource Persistence="ProjectFile" ItemType="" />
-    </Rule.DataSource>
-    <EnumProperty Name="Linkage-libsodium" DisplayName="Linkage" Description="How libsodium will be linked into the output of this project" Category="libsodium">
-      <EnumValue Name="" DisplayName="Not linked" />
-      <EnumValue Name="dynamic" DisplayName="Dynamic (DLL)" />
-      <EnumValue Name="static" DisplayName="Static (LIB)" />
-      <EnumValue Name="ltcg" DisplayName="Static using link time compile generation (LTCG)" />
-    </EnumProperty>
-  </Rule>
-</ProjectSchemaDefinitions>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2013/libzmq.import.props b/libs/libzmq/builds/deprecated-msvc/vs2013/libzmq.import.props
deleted file mode 100644
index 2f71ff8..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2013/libzmq.import.props
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup Label="Globals">
-    <_PropertySheetDisplayName>ZMQ Import Settings</_PropertySheetDisplayName>
-  </PropertyGroup>
-
-  <!-- User Interface -->
-
-  <ItemGroup Label="BuildOptionsExtension">
-    <PropertyPageSchema Include="$(MSBuildThisFileDirectory)libzmq.import.xml" />
-  </ItemGroup>
-
-  <!-- Configuration -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <PreprocessorDefinitions Condition="'$(Option-tweet)' == 'true'">ZMQ_USE_TWEETNACL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-sodium)' == 'true'">ZMQ_USE_LIBSODIUM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-openpgm)' == 'true'">ZMQ_HAVE_OPENPGM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-gssapi)' == 'true'">HAVE_LIBGSSAPI_KRB5;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-draftapi)' == 'true'">ZMQ_BUILD_DRAFT_API;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemDefinitionGroup>
-
-  <!-- Linkage -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\..\libzmq\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Linkage-libzmq)' == 'static' Or '$(Linkage-libzmq)' == 'ltcg'">ZMQ_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies Condition="'$(Linkage-libzmq)' != ''">libzmq.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Debug')) != -1">$(ProjectDir)..\..\..\..\..\libzmq\bin\$(PlatformName)\Debug\$(PlatformToolset)\$(Linkage-libzmq)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Release')) != -1">$(ProjectDir)..\..\..\..\..\libzmq\bin\$(PlatformName)\Release\$(PlatformToolset)\$(Linkage-libzmq)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <!-- Copy -->
-
-  <Target Name="Linkage-libzmq-dynamic" AfterTargets="AfterBuild" Condition="'$(Linkage-libzmq)' == 'dynamic'">
-    <Copy Condition="$(Configuration.IndexOf('Debug')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libzmq\bin\$(PlatformName)\Debug\$(PlatformToolset)\dynamic\libzmq.dll"
-          DestinationFiles="$(TargetDir)libzmq.dll"
-          SkipUnchangedFiles="true" />
-    <Copy Condition="$(Configuration.IndexOf('Debug')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libzmq\bin\$(PlatformName)\Debug\$(PlatformToolset)\dynamic\libzmq.pdb"
-          DestinationFiles="$(TargetDir)libzmq.pdb"
-          SkipUnchangedFiles="true" />
-    <Copy Condition="$(Configuration.IndexOf('Release')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libzmq\bin\$(PlatformName)\Release\$(PlatformToolset)\dynamic\libzmq.dll"
-          DestinationFiles="$(TargetDir)libzmq.dll"
-          SkipUnchangedFiles="true" />
-  </Target>
-
-  <!-- Messages -->
-
-  <Target Name="libzmq-info" BeforeTargets="AfterBuild" Condition="'$(Linkage-libzmq)' == 'dynamic'">
-    <Message Text="Copying libzmq.dll -&gt; $(TargetDir)libzmq.dll" Importance="high"/>
-    <Message Text="Copying libzmq.pdb -&gt; $(TargetDir)libzmq.pdb" Importance="high" Condition="$(Configuration.IndexOf('Debug')) != -1" />
-  </Target>
-
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2013/libzmq.import.xml b/libs/libzmq/builds/deprecated-msvc/vs2013/libzmq.import.xml
deleted file mode 100644
index a25a1ba..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2013/libzmq.import.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ProjectSchemaDefinitions xmlns="clr-namespace:Microsoft.Build.Framework.XamlTypes;assembly=Microsoft.Build.Framework">
-  <Rule Name="libzmq-options-uiextension" PageTemplate="tool" DisplayName="ZMQ Options" SwitchPrefix="/" Order="1">
-    <Rule.Categories>
-      <Category Name="tweet" DisplayName="tweet" />
-      <Category Name="sodium" DisplayName="sodium" />
-      <Category Name="openpgm" DisplayName="openpgm" />
-      <Category Name="gssapi" DisplayName="gssapi" />
-      <Category Name="draftapi" DisplayName="draftapi" />
-    </Rule.Categories>
-    <Rule.DataSource>
-      <DataSource Persistence="ProjectFile" ItemType="" />
-    </Rule.DataSource>
-    <EnumProperty Name="Option-tweet" DisplayName="Enable Tweet NaCl" Description="Enable the Tweet NaCl build option" Category="tweet">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-    <EnumProperty Name="Option-sodium" DisplayName="Enable Sodium" Description="Enable the Sodium build option" Category="sodium">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-    <EnumProperty Name="Option-openpgm" DisplayName="Enable OpenPGM" Description="Enable the OpenPGM build option" Category="openpgm">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-    <EnumProperty Name="Option-gssapi" DisplayName="Enable GSS API" Description="Enable the GSS API build option" Category="gssapi">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-    <EnumProperty Name="Option-draftapi" DisplayName="Enable Draft API" Description="Enable Draft API build option" Category="draftapi">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-  </Rule>
-  <Rule Name="libzmq-linkage-uiextension" PageTemplate="tool" DisplayName="Local Dependencies" SwitchPrefix="/" Order="1">
-    <Rule.Categories>
-      <Category Name="libzmq" DisplayName="libzmq" />
-    </Rule.Categories>
-    <Rule.DataSource>
-      <DataSource Persistence="ProjectFile" ItemType="" />
-    </Rule.DataSource>
-    <EnumProperty Name="Linkage-libzmq" DisplayName="Linkage" Description="How libzmq will be linked into the output of this project" Category="libzmq">
-      <EnumValue Name="" DisplayName="Not linked" />
-      <EnumValue Name="dynamic" DisplayName="Dynamic (DLL)" />
-      <EnumValue Name="static" DisplayName="Static (LIB)" />
-      <EnumValue Name="ltcg" DisplayName="Static using link time compile generation (LTCG)" />
-    </EnumProperty>
-  </Rule>
-</ProjectSchemaDefinitions>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2013/libzmq.sln b/libs/libzmq/builds/deprecated-msvc/vs2013/libzmq.sln
deleted file mode 100644
index e390e7f..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2013/libzmq.sln
+++ /dev/null
@@ -1,208 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.30110.0
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libzmq", "libzmq\libzmq.vcxproj", "{641C5F36-32EE-4323-B740-992B651CF9D6}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "inproc_thr", "inproc_thr\inproc_thr.vcxproj", "{1077E977-95DD-4E73-A692-74647DD0CC1E}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "inproc_lat", "inproc_lat\inproc_lat.vcxproj", "{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "remote_thr", "remote_thr\remote_thr.vcxproj", "{B15E059C-0CBB-4A82-8C42-6567FB650802}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "remote_lat", "remote_lat\remote_lat.vcxproj", "{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "local_thr", "local_thr\local_thr.vcxproj", "{8EF2DF6B-6646-460F-8032-913B70FE0E94}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "local_lat", "local_lat\local_lat.vcxproj", "{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		DynDebug|Win32 = DynDebug|Win32
-		DynDebug|x64 = DynDebug|x64
-		DynRelease|Win32 = DynRelease|Win32
-		DynRelease|x64 = DynRelease|x64
-		LtcgDebug|Win32 = LtcgDebug|Win32
-		LtcgDebug|x64 = LtcgDebug|x64
-		LtcgRelease|Win32 = LtcgRelease|Win32
-		LtcgRelease|x64 = LtcgRelease|x64
-		StaticDebug|Win32 = StaticDebug|Win32
-		StaticDebug|x64 = StaticDebug|x64
-		StaticRelease|Win32 = StaticRelease|Win32
-		StaticRelease|x64 = StaticRelease|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.DynDebug|Win32.ActiveCfg = DebugDLL|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.DynDebug|Win32.Build.0 = DebugDLL|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.DynDebug|x64.ActiveCfg = DebugDLL|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.DynDebug|x64.Build.0 = DebugDLL|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.DynRelease|Win32.ActiveCfg = ReleaseDLL|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.DynRelease|Win32.Build.0 = ReleaseDLL|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.DynRelease|x64.ActiveCfg = ReleaseDLL|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.DynRelease|x64.Build.0 = ReleaseDLL|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.LtcgDebug|Win32.ActiveCfg = DebugLTCG|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.LtcgDebug|Win32.Build.0 = DebugLTCG|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.LtcgDebug|x64.ActiveCfg = DebugLTCG|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.LtcgDebug|x64.Build.0 = DebugLTCG|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.LtcgRelease|Win32.ActiveCfg = ReleaseLTCG|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.LtcgRelease|Win32.Build.0 = ReleaseLTCG|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.LtcgRelease|x64.ActiveCfg = ReleaseLTCG|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.LtcgRelease|x64.Build.0 = ReleaseLTCG|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.StaticDebug|Win32.ActiveCfg = DebugLIB|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.StaticDebug|Win32.Build.0 = DebugLIB|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.StaticDebug|x64.ActiveCfg = DebugLIB|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.StaticDebug|x64.Build.0 = DebugLIB|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.StaticRelease|Win32.ActiveCfg = ReleaseLIB|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.StaticRelease|Win32.Build.0 = ReleaseLIB|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.StaticRelease|x64.ActiveCfg = ReleaseLIB|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.StaticRelease|x64.Build.0 = ReleaseLIB|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.DynDebug|Win32.ActiveCfg = DebugDEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.DynDebug|Win32.Build.0 = DebugDEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.DynDebug|x64.ActiveCfg = DebugDEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.DynDebug|x64.Build.0 = DebugDEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.DynRelease|Win32.ActiveCfg = ReleaseDEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.DynRelease|Win32.Build.0 = ReleaseDEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.DynRelease|x64.ActiveCfg = ReleaseDEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.DynRelease|x64.Build.0 = ReleaseDEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.LtcgDebug|Win32.ActiveCfg = DebugLEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.LtcgDebug|Win32.Build.0 = DebugLEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.LtcgDebug|x64.ActiveCfg = DebugLEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.LtcgDebug|x64.Build.0 = DebugLEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.LtcgRelease|Win32.ActiveCfg = ReleaseLEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.LtcgRelease|Win32.Build.0 = ReleaseLEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.LtcgRelease|x64.ActiveCfg = ReleaseLEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.LtcgRelease|x64.Build.0 = ReleaseLEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.StaticDebug|Win32.ActiveCfg = DebugSEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.StaticDebug|Win32.Build.0 = DebugSEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.StaticDebug|x64.ActiveCfg = DebugSEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.StaticDebug|x64.Build.0 = DebugSEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.StaticRelease|Win32.ActiveCfg = ReleaseSEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.StaticRelease|Win32.Build.0 = ReleaseSEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.StaticRelease|x64.ActiveCfg = ReleaseSEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.StaticRelease|x64.Build.0 = ReleaseSEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.DynDebug|Win32.ActiveCfg = DebugDEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.DynDebug|Win32.Build.0 = DebugDEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.DynDebug|x64.ActiveCfg = DebugDEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.DynDebug|x64.Build.0 = DebugDEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.DynRelease|Win32.ActiveCfg = ReleaseDEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.DynRelease|Win32.Build.0 = ReleaseDEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.DynRelease|x64.ActiveCfg = ReleaseDEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.DynRelease|x64.Build.0 = ReleaseDEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.LtcgDebug|Win32.ActiveCfg = DebugLEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.LtcgDebug|Win32.Build.0 = DebugLEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.LtcgDebug|x64.ActiveCfg = DebugLEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.LtcgDebug|x64.Build.0 = DebugLEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.LtcgRelease|Win32.ActiveCfg = ReleaseLEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.LtcgRelease|Win32.Build.0 = ReleaseLEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.LtcgRelease|x64.ActiveCfg = ReleaseLEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.LtcgRelease|x64.Build.0 = ReleaseLEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.StaticDebug|Win32.ActiveCfg = DebugSEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.StaticDebug|Win32.Build.0 = DebugSEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.StaticDebug|x64.ActiveCfg = DebugSEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.StaticDebug|x64.Build.0 = DebugSEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.StaticRelease|Win32.ActiveCfg = ReleaseSEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.StaticRelease|Win32.Build.0 = ReleaseSEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.StaticRelease|x64.ActiveCfg = ReleaseSEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.StaticRelease|x64.Build.0 = ReleaseSEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.DynDebug|Win32.ActiveCfg = DebugDEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.DynDebug|Win32.Build.0 = DebugDEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.DynDebug|x64.ActiveCfg = DebugDEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.DynDebug|x64.Build.0 = DebugDEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.DynRelease|Win32.ActiveCfg = ReleaseDEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.DynRelease|Win32.Build.0 = ReleaseDEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.DynRelease|x64.ActiveCfg = ReleaseDEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.DynRelease|x64.Build.0 = ReleaseDEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.LtcgDebug|Win32.ActiveCfg = DebugLEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.LtcgDebug|Win32.Build.0 = DebugLEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.LtcgDebug|x64.ActiveCfg = DebugLEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.LtcgDebug|x64.Build.0 = DebugLEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.LtcgRelease|Win32.ActiveCfg = ReleaseLEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.LtcgRelease|Win32.Build.0 = ReleaseLEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.LtcgRelease|x64.ActiveCfg = ReleaseLEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.LtcgRelease|x64.Build.0 = ReleaseLEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.StaticDebug|Win32.ActiveCfg = DebugSEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.StaticDebug|Win32.Build.0 = DebugSEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.StaticDebug|x64.ActiveCfg = DebugSEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.StaticDebug|x64.Build.0 = DebugSEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.StaticRelease|Win32.ActiveCfg = ReleaseSEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.StaticRelease|Win32.Build.0 = ReleaseSEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.StaticRelease|x64.ActiveCfg = ReleaseSEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.StaticRelease|x64.Build.0 = ReleaseSEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.DynDebug|Win32.ActiveCfg = DebugDEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.DynDebug|Win32.Build.0 = DebugDEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.DynDebug|x64.ActiveCfg = DebugDEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.DynDebug|x64.Build.0 = DebugDEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.DynRelease|Win32.ActiveCfg = ReleaseDEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.DynRelease|Win32.Build.0 = ReleaseDEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.DynRelease|x64.ActiveCfg = ReleaseDEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.DynRelease|x64.Build.0 = ReleaseDEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.LtcgDebug|Win32.ActiveCfg = DebugLEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.LtcgDebug|Win32.Build.0 = DebugLEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.LtcgDebug|x64.ActiveCfg = DebugLEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.LtcgDebug|x64.Build.0 = DebugLEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.LtcgRelease|Win32.ActiveCfg = ReleaseLEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.LtcgRelease|Win32.Build.0 = ReleaseLEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.LtcgRelease|x64.ActiveCfg = ReleaseLEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.LtcgRelease|x64.Build.0 = ReleaseLEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.StaticDebug|Win32.ActiveCfg = DebugSEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.StaticDebug|Win32.Build.0 = DebugSEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.StaticDebug|x64.ActiveCfg = DebugSEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.StaticDebug|x64.Build.0 = DebugSEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.StaticRelease|Win32.ActiveCfg = ReleaseSEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.StaticRelease|Win32.Build.0 = ReleaseSEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.StaticRelease|x64.ActiveCfg = ReleaseSEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.StaticRelease|x64.Build.0 = ReleaseSEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.DynDebug|Win32.ActiveCfg = DebugDEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.DynDebug|Win32.Build.0 = DebugDEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.DynDebug|x64.ActiveCfg = DebugDEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.DynDebug|x64.Build.0 = DebugDEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.DynRelease|Win32.ActiveCfg = ReleaseDEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.DynRelease|Win32.Build.0 = ReleaseDEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.DynRelease|x64.ActiveCfg = ReleaseDEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.DynRelease|x64.Build.0 = ReleaseDEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.LtcgDebug|Win32.ActiveCfg = DebugLEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.LtcgDebug|Win32.Build.0 = DebugLEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.LtcgDebug|x64.ActiveCfg = DebugLEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.LtcgDebug|x64.Build.0 = DebugLEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.LtcgRelease|Win32.ActiveCfg = ReleaseLEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.LtcgRelease|Win32.Build.0 = ReleaseLEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.LtcgRelease|x64.ActiveCfg = ReleaseLEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.LtcgRelease|x64.Build.0 = ReleaseLEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.StaticDebug|Win32.ActiveCfg = DebugSEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.StaticDebug|Win32.Build.0 = DebugSEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.StaticDebug|x64.ActiveCfg = DebugSEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.StaticDebug|x64.Build.0 = DebugSEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.StaticRelease|Win32.ActiveCfg = ReleaseSEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.StaticRelease|Win32.Build.0 = ReleaseSEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.StaticRelease|x64.ActiveCfg = ReleaseSEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.StaticRelease|x64.Build.0 = ReleaseSEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.DynDebug|Win32.ActiveCfg = DebugDEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.DynDebug|Win32.Build.0 = DebugDEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.DynDebug|x64.ActiveCfg = DebugDEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.DynDebug|x64.Build.0 = DebugDEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.DynRelease|Win32.ActiveCfg = ReleaseDEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.DynRelease|Win32.Build.0 = ReleaseDEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.DynRelease|x64.ActiveCfg = ReleaseDEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.DynRelease|x64.Build.0 = ReleaseDEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.LtcgDebug|Win32.ActiveCfg = DebugLEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.LtcgDebug|Win32.Build.0 = DebugLEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.LtcgDebug|x64.ActiveCfg = DebugLEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.LtcgDebug|x64.Build.0 = DebugLEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.LtcgRelease|Win32.ActiveCfg = ReleaseLEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.LtcgRelease|Win32.Build.0 = ReleaseLEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.LtcgRelease|x64.ActiveCfg = ReleaseLEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.LtcgRelease|x64.Build.0 = ReleaseLEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.StaticDebug|Win32.ActiveCfg = DebugSEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.StaticDebug|Win32.Build.0 = DebugSEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.StaticDebug|x64.ActiveCfg = DebugSEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.StaticDebug|x64.Build.0 = DebugSEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.StaticRelease|Win32.ActiveCfg = ReleaseSEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.StaticRelease|Win32.Build.0 = ReleaseSEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.StaticRelease|x64.ActiveCfg = ReleaseSEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.StaticRelease|x64.Build.0 = ReleaseSEXE|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2013/libzmq/libzmq.props b/libs/libzmq/builds/deprecated-msvc/vs2013/libzmq/libzmq.props
deleted file mode 100644
index 22da05a..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2013/libzmq/libzmq.props
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>ZeroMQ Library Common Settings</_PropertySheetDisplayName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-  </PropertyGroup>
-
-  <!-- User Interface -->
-
-  <ItemGroup Label="BuildOptionsExtension">
-    <PropertyPageSchema Include="$(MSBuildThisFileDirectory)$(ProjectName).xml" />
-  </ItemGroup>
-
-  <!-- Configuration -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\;$(ProjectDir)..\..\..\..\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <EnablePREfast>false</EnablePREfast>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>precompiled.hpp</PrecompiledHeaderFile>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;FD_SETSIZE=16384;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-tweet)' == 'true'">ZMQ_USE_TWEETNACL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-sodium)' == 'true'">ZMQ_USE_LIBSODIUM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-tweet)' == 'true' Or '$(Option-sodium)' == 'true'">ZMQ_HAVE_CURVE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-openpgm)' == 'true'">ZMQ_HAVE_OPENPGM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-gssapi)' == 'true'">HAVE_LIBGSSAPI_KRB5;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-draftapi)' == 'true'">ZMQ_BUILD_DRAFT_API;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-usepoll)' == 'true'">ZMQ_USE_POLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-usepoll)' != 'true'">ZMQ_USE_SELECT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(ConfigurationType)' == 'StaticLibrary'">ZMQ_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(ConfigurationType)' == 'DynamicLibrary'">DLL_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>Advapi32.lib;Ws2_32.lib;Rpcrt4.lib;Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <Lib Condition="'$(ConfigurationType)'=='StaticLibrary'">
-      <AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions>
-    </Lib>
-  </ItemDefinitionGroup>
-
-  <!-- Dependencies -->
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props"
-            Condition="Exists('$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props')" /> 
-  </ImportGroup>
-
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
-    <!--<Linkage-libsodium>dynamic</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
-    <!--<Linkage-libsodium>ltcg</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
-    <!--<Linkage-libsodium>static</Linkage-libsodium>-->
-  </PropertyGroup>
-
-  <!-- Messages -->
-
-  <Target Name="OptionInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Option-tweet      : $(Option-tweet)" Importance="high"/>
-    <Message Text="Option-sodium     : $(Option-sodium)" Importance="high"/>
-    <Message Text="Option-openpgm    : $(Option-openpgm)" Importance="high"/>
-    <Message Text="Option-gssapi     : $(Option-gssapi)" Importance="high"/>
-    <Message Text="Option-draftapi   : $(Option-draftapi)" Importance="high"/>
-    <Message Text="Option-usepoll    : $(Option-usepoll)" Importance="high"/>
-  </Target>
-
-  <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high" Condition="'$(Option-sodium)' == 'true'"/>
-  </Target>
-
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2013/libzmq/libzmq.vcxproj b/libs/libzmq/builds/deprecated-msvc/vs2013/libzmq/libzmq.vcxproj
deleted file mode 100644
index 3d42eaa..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2013/libzmq/libzmq.vcxproj
+++ /dev/null
@@ -1,289 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{641C5F36-32EE-4323-B740-992B651CF9D6}</ProjectGuid>
-    <ProjectName>libzmq</ProjectName>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DebugDLL|Win32">
-      <Configuration>DebugDLL</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDLL|Win32">
-      <Configuration>ReleaseDLL</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugDLL|x64">
-      <Configuration>DebugDLL</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDLL|x64">
-      <Configuration>ReleaseDLL</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLTCG|Win32">
-      <Configuration>DebugLTCG</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLTCG|Win32">
-      <Configuration>ReleaseLTCG</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLTCG|x64">
-      <Configuration>DebugLTCG</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLTCG|x64">
-      <Configuration>ReleaseLTCG</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLIB|Win32">
-      <Configuration>DebugLIB</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLIB|Win32">
-      <Configuration>ReleaseLIB</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLIB|x64">
-      <Configuration>DebugLIB</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLIB|x64">
-      <Configuration>ReleaseLIB</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Configuration">
-    <ConfigurationType Condition="$(Configuration.IndexOf('DLL')) == -1">StaticLibrary</ConfigurationType>
-    <ConfigurationType Condition="$(Configuration.IndexOf('DLL')) != -1">DynamicLibrary</ConfigurationType>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
-    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-  </ImportGroup>
-  <PropertyGroup>
-    <Option-tweet>true</Option-tweet>
-  </PropertyGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\platform.hpp" />
-    <ClInclude Include="..\..\resource.h" />
-    <ClInclude Include="..\..\..\..\include\zmq.h" />
-    <ClInclude Include="..\..\..\..\src\zmq_draft.h" />
-    <ClInclude Include="..\..\..\..\src\address.hpp" />
-    <ClInclude Include="..\..\..\..\src\array.hpp" />
-    <ClInclude Include="..\..\..\..\src\atomic_counter.hpp" />
-    <ClInclude Include="..\..\..\..\src\atomic_ptr.hpp" />
-    <ClInclude Include="..\..\..\..\src\blob.hpp" />
-    <ClInclude Include="..\..\..\..\src\client.hpp" />
-    <ClInclude Include="..\..\..\..\src\clock.hpp" />
-    <ClInclude Include="..\..\..\..\src\command.hpp" />
-    <ClInclude Include="..\..\..\..\src\condition_variable.hpp" />
-    <ClInclude Include="..\..\..\..\src\config.hpp" />
-    <ClInclude Include="..\..\..\..\src\ctx.hpp" />
-    <ClInclude Include="..\..\..\..\src\curve_client.hpp" />
-    <ClInclude Include="..\..\..\..\src\curve_server.hpp" />
-    <ClInclude Include="..\..\..\..\src\decoder.hpp" />
-    <ClInclude Include="..\..\..\..\src\decoder_allocators.hpp" />
-    <ClInclude Include="..\..\..\..\src\devpoll.hpp" />
-    <ClInclude Include="..\..\..\..\src\dgram.hpp" />
-    <ClInclude Include="..\..\..\..\src\dish.hpp" />
-    <ClInclude Include="..\..\..\..\src\dist.hpp" />
-    <ClInclude Include="..\..\..\..\src\encoder.hpp" />
-    <ClInclude Include="..\..\..\..\src\epoll.hpp" />
-    <ClInclude Include="..\..\..\..\src\err.hpp" />
-    <ClInclude Include="..\..\..\..\src\fd.hpp" />
-    <ClInclude Include="..\..\..\..\src\fq.hpp" />
-    <ClInclude Include="..\..\..\..\src\gather.hpp" />
-    <ClInclude Include="..\..\..\..\src\gssapi_client.hpp" />
-    <ClInclude Include="..\..\..\..\src\gssapi_mechanism_base.hpp" />
-    <ClInclude Include="..\..\..\..\src\gssapi_server.hpp" />
-    <ClInclude Include="..\..\..\..\src\i_engine.hpp" />
-    <ClInclude Include="..\..\..\..\src\i_poll_events.hpp" />
-    <ClInclude Include="..\..\..\..\src\io_object.hpp" />
-    <ClInclude Include="..\..\..\..\src\io_thread.hpp" />
-    <ClInclude Include="..\..\..\..\src\ip.hpp" />
-    <ClInclude Include="..\..\..\..\src\ipc_address.hpp" />
-    <ClInclude Include="..\..\..\..\src\ipc_connecter.hpp" />
-    <ClInclude Include="..\..\..\..\src\ipc_listener.hpp" />
-    <ClInclude Include="..\..\..\..\src\kqueue.hpp" />
-    <ClInclude Include="..\..\..\..\src\lb.hpp" />
-    <ClInclude Include="..\..\..\..\src\likely.hpp" />
-    <ClInclude Include="..\..\..\..\src\mailbox.hpp" />
-    <ClInclude Include="..\..\..\..\src\mailbox_safe.hpp" />
-    <ClInclude Include="..\..\..\..\src\msg.hpp" />
-    <ClInclude Include="..\..\..\..\src\mtrie.hpp" />
-    <ClInclude Include="..\..\..\..\src\mutex.hpp" />
-    <ClInclude Include="..\..\..\..\src\object.hpp" />
-    <ClInclude Include="..\..\..\..\src\options.hpp" />
-    <ClInclude Include="..\..\..\..\src\own.hpp" />
-    <ClInclude Include="..\..\..\..\src\pair.hpp" />
-    <ClInclude Include="..\..\..\..\src\pgm_receiver.hpp" />
-    <ClInclude Include="..\..\..\..\src\pgm_sender.hpp" />
-    <ClInclude Include="..\..\..\..\src\pgm_socket.hpp" />
-    <ClInclude Include="..\..\..\..\src\pipe.hpp" />
-    <ClInclude Include="..\..\..\..\src\server.hpp" />
-    <ClInclude Include="..\..\..\..\src\socks.hpp" />
-    <ClInclude Include="..\..\..\..\src\socks_connecter.hpp" />
-    <ClInclude Include="..\..\..\..\src\poll.hpp" />
-    <ClInclude Include="..\..\..\..\src\poller.hpp" />
-    <ClInclude Include="..\..\..\..\src\poller_base.hpp" />
-    <ClInclude Include="..\..\..\..\src\precompiled.hpp" />
-    <ClInclude Include="..\..\..\..\src\proxy.hpp" />
-    <ClInclude Include="..\..\..\..\src\pub.hpp" />
-    <ClInclude Include="..\..\..\..\src\pull.hpp" />
-    <ClInclude Include="..\..\..\..\src\push.hpp" />
-    <ClInclude Include="..\..\..\..\src\radio.hpp" />
-    <ClInclude Include="..\..\..\..\src\random.hpp" />
-    <ClInclude Include="..\..\..\..\src\raw_decoder.hpp" />
-    <ClInclude Include="..\..\..\..\src\raw_encoder.hpp" />
-    <ClInclude Include="..\..\..\..\src\reaper.hpp" />
-    <ClInclude Include="..\..\..\..\src\rep.hpp" />
-    <ClInclude Include="..\..\..\..\src\req.hpp" />
-    <ClInclude Include="..\..\..\..\src\scatter.hpp" />
-    <ClInclude Include="..\..\..\..\src\select.hpp" />
-    <ClInclude Include="..\..\..\..\src\session_base.hpp" />
-    <ClInclude Include="..\..\..\..\src\signaler.hpp" />
-    <ClInclude Include="..\..\..\..\src\socket_base.hpp" />
-    <ClInclude Include="..\..\..\..\src\stdint.hpp" />
-    <ClInclude Include="..\..\..\..\src\stream_engine.hpp" />
-    <ClInclude Include="..\..\..\..\src\sub.hpp" />
-    <ClInclude Include="..\..\..\..\src\tcp.hpp" />
-    <ClInclude Include="..\..\..\..\src\tcp_address.hpp" />
-    <ClInclude Include="..\..\..\..\src\tcp_connecter.hpp" />
-    <ClInclude Include="..\..\..\..\src\tcp_listener.hpp" />
-    <ClInclude Include="..\..\..\..\src\timers.hpp" />
-    <ClInclude Include="..\..\..\..\src\thread.hpp" />
-    <ClInclude Include="..\..\..\..\src\trie.hpp" />
-    <ClInclude Include="..\..\..\..\src\tweetnacl.h" />
-    <ClInclude Include="..\..\..\..\src\udp_address.hpp" />
-    <ClInclude Include="..\..\..\..\src\udp_engine.hpp" />
-    <ClInclude Include="..\..\..\..\src\v1_decoder.hpp" />
-    <ClInclude Include="..\..\..\..\src\v1_encoder.hpp" />
-    <ClInclude Include="..\..\..\..\src\v1_protocol.hpp" />
-    <ClInclude Include="..\..\..\..\src\windows.hpp" />
-    <ClInclude Include="..\..\..\..\src\wire.hpp" />
-    <ClInclude Include="..\..\..\..\src\xpub.hpp" />
-    <ClInclude Include="..\..\..\..\src\xrep.hpp" />
-    <ClInclude Include="..\..\..\..\src\xreq.hpp" />
-    <ClInclude Include="..\..\..\..\src\xsub.hpp" />
-    <ClInclude Include="..\..\..\..\src\ypipe.hpp" />
-    <ClInclude Include="..\..\..\..\src\yqueue.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\..\src\address.cpp" />
-    <ClCompile Include="..\..\..\..\src\client.cpp" />
-    <ClCompile Include="..\..\..\..\src\clock.cpp" />
-    <ClCompile Include="..\..\..\..\src\ctx.cpp" />
-    <ClCompile Include="..\..\..\..\src\curve_client.cpp" />
-    <ClCompile Include="..\..\..\..\src\curve_mechanism_base.cpp" />
-    <ClCompile Include="..\..\..\..\src\curve_server.cpp" />
-    <ClCompile Include="..\..\..\..\src\dealer.cpp" />
-    <ClCompile Include="..\..\..\..\src\decoder_allocators.cpp" />
-    <ClCompile Include="..\..\..\..\src\devpoll.cpp" />
-    <ClCompile Include="..\..\..\..\src\dgram.cpp" />
-    <ClCompile Include="..\..\..\..\src\dish.cpp" />
-    <ClCompile Include="..\..\..\..\src\dist.cpp" />
-    <ClCompile Include="..\..\..\..\src\epoll.cpp" />
-    <ClCompile Include="..\..\..\..\src\err.cpp" />
-    <ClCompile Include="..\..\..\..\src\fq.cpp" />
-    <ClCompile Include="..\..\..\..\src\gather.cpp" />
-    <ClCompile Include="..\..\..\..\src\gssapi_client.cpp" />
-    <ClCompile Include="..\..\..\..\src\gssapi_mechanism_base.cpp" />
-    <ClCompile Include="..\..\..\..\src\gssapi_server.cpp" />
-    <ClCompile Include="..\..\..\..\src\io_object.cpp" />
-    <ClCompile Include="..\..\..\..\src\io_thread.cpp" />
-    <ClCompile Include="..\..\..\..\src\ip.cpp" />
-    <ClCompile Include="..\..\..\..\src\ipc_address.cpp" />
-    <ClCompile Include="..\..\..\..\src\ipc_connecter.cpp" />
-    <ClCompile Include="..\..\..\..\src\ipc_listener.cpp" />
-    <ClCompile Include="..\..\..\..\src\kqueue.cpp" />
-    <ClCompile Include="..\..\..\..\src\lb.cpp" />
-    <ClCompile Include="..\..\..\..\src\mailbox.cpp" />
-    <ClCompile Include="..\..\..\..\src\mailbox_safe.cpp" />
-    <ClCompile Include="..\..\..\..\src\mechanism.cpp" />
-    <ClCompile Include="..\..\..\..\src\mechanism_base.cpp" />
-    <ClCompile Include="..\..\..\..\src\metadata.cpp" />
-    <ClCompile Include="..\..\..\..\src\msg.cpp" />
-    <ClCompile Include="..\..\..\..\src\mtrie.cpp" />
-    <ClCompile Include="..\..\..\..\src\null_mechanism.cpp" />
-    <ClCompile Include="..\..\..\..\src\object.cpp" />
-    <ClCompile Include="..\..\..\..\src\options.cpp" />
-    <ClCompile Include="..\..\..\..\src\own.cpp" />
-    <ClCompile Include="..\..\..\..\src\pair.cpp" />
-    <ClCompile Include="..\..\..\..\src\pgm_receiver.cpp" />
-    <ClCompile Include="..\..\..\..\src\pgm_sender.cpp" />
-    <ClCompile Include="..\..\..\..\src\pgm_socket.cpp" />
-    <ClCompile Include="..\..\..\..\src\pipe.cpp" />
-    <ClCompile Include="..\..\..\..\src\plain_client.cpp" />
-    <ClCompile Include="..\..\..\..\src\plain_server.cpp" />
-    <ClCompile Include="..\..\..\..\src\poll.cpp" />
-    <ClCompile Include="..\..\..\..\src\poller_base.cpp" />
-    <ClCompile Include="..\..\..\..\src\precompiled.cpp">
-      <PrecompiledHeader>Create</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\proxy.cpp" />
-    <ClCompile Include="..\..\..\..\src\pub.cpp" />
-    <ClCompile Include="..\..\..\..\src\pull.cpp" />
-    <ClCompile Include="..\..\..\..\src\push.cpp" />
-    <ClCompile Include="..\..\..\..\src\radio.cpp" />
-    <ClCompile Include="..\..\..\..\src\random.cpp" />
-    <ClCompile Include="..\..\..\..\src\raw_decoder.cpp" />
-    <ClCompile Include="..\..\..\..\src\raw_encoder.cpp" />
-    <ClCompile Include="..\..\..\..\src\reaper.cpp" />
-    <ClCompile Include="..\..\..\..\src\rep.cpp" />
-    <ClCompile Include="..\..\..\..\src\req.cpp" />
-    <ClCompile Include="..\..\..\..\src\router.cpp" />
-    <ClCompile Include="..\..\..\..\src\scatter.cpp" />
-    <ClCompile Include="..\..\..\..\src\select.cpp" />
-    <ClCompile Include="..\..\..\..\src\server.cpp" />
-    <ClCompile Include="..\..\..\..\src\session_base.cpp" />
-    <ClCompile Include="..\..\..\..\src\signaler.cpp" />
-    <ClCompile Include="..\..\..\..\src\socket_base.cpp" />
-    <ClCompile Include="..\..\..\..\src\socket_poller.cpp" />
-    <ClCompile Include="..\..\..\..\src\socks.cpp" />
-    <ClCompile Include="..\..\..\..\src\socks_connecter.cpp" />
-    <ClCompile Include="..\..\..\..\src\stream.cpp" />
-    <ClCompile Include="..\..\..\..\src\stream_engine.cpp" />
-    <ClCompile Include="..\..\..\..\src\sub.cpp" />
-    <ClCompile Include="..\..\..\..\src\tcp.cpp" />
-    <ClCompile Include="..\..\..\..\src\tcp_address.cpp" />
-    <ClCompile Include="..\..\..\..\src\tcp_connecter.cpp" />
-    <ClCompile Include="..\..\..\..\src\tcp_listener.cpp" />
-    <ClCompile Include="..\..\..\..\src\thread.cpp" />
-    <ClCompile Include="..\..\..\..\src\timers.cpp" />
-    <ClCompile Include="..\..\..\..\src\trie.cpp" />
-    <ClCompile Include="..\..\..\..\src\tweetnacl.c">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\udp_address.cpp" />
-    <ClCompile Include="..\..\..\..\src\udp_engine.cpp" />
-    <ClCompile Include="..\..\..\..\src\v1_decoder.cpp" />
-    <ClCompile Include="..\..\..\..\src\v1_encoder.cpp" />
-    <ClCompile Include="..\..\..\..\src\v2_decoder.cpp" />
-    <ClCompile Include="..\..\..\..\src\v2_encoder.cpp" />
-    <ClCompile Include="..\..\..\..\src\xpub.cpp" />
-    <ClCompile Include="..\..\..\..\src\xsub.cpp" />
-    <ClCompile Include="..\..\..\..\src\zap_client.cpp" />
-    <ClCompile Include="..\..\..\..\src\zmq.cpp" />
-    <ClCompile Include="..\..\..\..\src\zmq_utils.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\..\..\..\packaging\nuget\package.bat" />
-    <None Include="..\..\..\..\packaging\nuget\package.config" />
-    <None Include="..\..\..\..\packaging\nuget\package.gsl" />
-    <None Include="..\..\..\..\packaging\nuget\package.nuspec" />
-    <None Include="..\..\..\..\packaging\nuget\package.targets" />
-  </ItemGroup>
-  <ItemGroup>
-    <Xml Include="..\..\..\..\packaging\nuget\package.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\..\resource.rc" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2013/libzmq/libzmq.vcxproj.filters b/libs/libzmq/builds/deprecated-msvc/vs2013/libzmq/libzmq.vcxproj.filters
deleted file mode 100644
index 930b009..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2013/libzmq/libzmq.vcxproj.filters
+++ /dev/null
@@ -1,627 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClCompile Include="..\..\..\..\src\address.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\clock.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\ctx.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\dealer.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\devpoll.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\dgram.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\dist.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\epoll.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\err.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\fq.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\io_object.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\io_thread.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\ip.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\ipc_address.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\ipc_connecter.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\ipc_listener.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\kqueue.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\lb.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mailbox.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mechanism.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\metadata.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\msg.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mtrie.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\null_mechanism.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\object.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\options.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\own.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\pair.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\pgm_receiver.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\pgm_sender.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\pgm_socket.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\pipe.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\plain_client.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\plain_server.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\poll.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\poller_base.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\proxy.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\pub.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\pull.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\push.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\random.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\raw_decoder.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\raw_encoder.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\reaper.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\rep.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\req.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\router.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\scatter.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\select.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\session_base.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\signaler.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\socket_base.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\stream.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\stream_engine.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\sub.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\tcp.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\tcp_address.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\tcp_connecter.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\tcp_listener.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\thread.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\trie.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\v1_decoder.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\v1_encoder.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\v2_decoder.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\v2_encoder.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\xpub.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\xsub.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\zmq.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\zmq_utils.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\precompiled.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\curve_client.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\curve_server.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\gather.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\gssapi_mechanism_base.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\gssapi_server.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\gssapi_client.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\socks.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\socks_connecter.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\server.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\client.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mailbox_safe.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\decoder_allocators.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\socket_poller.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\udp_address.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\udp_engine.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\dish.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\radio.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\timers.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\tweetnacl.c">
-      <Filter>src</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\..\include\zmq.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\address.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\array.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\atomic_counter.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\atomic_ptr.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\blob.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\clock.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\command.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\config.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\ctx.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\devpoll.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\dgram.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\dist.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\encoder.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\epoll.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\err.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\fd.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\fq.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\i_engine.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\i_poll_events.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\io_object.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\io_thread.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\ip.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\ipc_address.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\ipc_connecter.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\ipc_listener.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\kqueue.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\lb.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\decoder.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\likely.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mailbox.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\msg.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mtrie.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mutex.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\object.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\options.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\own.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\pair.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\pgm_receiver.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\yqueue.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\ypipe.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\xsub.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\xreq.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\xrep.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\xpub.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\wire.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\windows.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\v1_encoder.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\v1_protocol.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\v1_decoder.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\trie.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\thread.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\tcp_listener.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\tcp_connecter.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\tcp_address.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\tcp.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\sub.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\stream_engine.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\stdint.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\socket_base.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\signaler.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\session_base.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\scatter.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\select.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\req.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\rep.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\reaper.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\raw_encoder.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\raw_decoder.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\random.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\push.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\pull.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\pub.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\proxy.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\precompiled.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\poller_base.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\poller.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\poll.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\platform.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\pipe.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\pgm_socket.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\pgm_sender.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\resource.h">
-      <Filter>resource</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\curve_client.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\curve_server.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\gather.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\gssapi_mechanism_base.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\gssapi_server.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\gssapi_client.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\socks.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\socks_connecter.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\server.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\client.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mailbox_safe.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\condition_variable.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\decoder_allocators.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\udp_address.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\udp_engine.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\dish.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\radio.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\timers.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\tweetnacl.h">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\zmq_draft.h">
-      <Filter>src\include</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="include">
-      <UniqueIdentifier>{f7e88c6c-e408-4631-959c-fe3568656d70}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="src">
-      <UniqueIdentifier>{35f0c644-e1d8-4a46-bb33-06bb8b645fff}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="src\include">
-      <UniqueIdentifier>{90853975-3420-4f06-8be4-4ab3d9792160}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="packaging">
-      <UniqueIdentifier>{f5e26e9d-c33d-45c1-95e4-0732acd28b59}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="resource">
-      <UniqueIdentifier>{e66010e4-a9ea-4e2e-8bc6-12fec14bb009}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\..\..\..\packaging\nuget\package.bat">
-      <Filter>packaging</Filter>
-    </None>
-    <None Include="..\..\..\..\packaging\nuget\package.config">
-      <Filter>packaging</Filter>
-    </None>
-    <None Include="..\..\..\..\packaging\nuget\package.gsl">
-      <Filter>packaging</Filter>
-    </None>
-    <None Include="..\..\..\..\packaging\nuget\package.targets">
-      <Filter>packaging</Filter>
-    </None>
-    <None Include="..\..\..\..\packaging\nuget\package.nuspec">
-      <Filter>packaging</Filter>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <Xml Include="..\..\..\..\packaging\nuget\package.xml">
-      <Filter>packaging</Filter>
-    </Xml>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\..\resource.rc">
-      <Filter>resource</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2013/libzmq/libzmq.xml b/libs/libzmq/builds/deprecated-msvc/vs2013/libzmq/libzmq.xml
deleted file mode 100644
index db7dfe0..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2013/libzmq/libzmq.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ProjectSchemaDefinitions xmlns="clr-namespace:Microsoft.Build.Framework.XamlTypes;assembly=Microsoft.Build.Framework">
-  <Rule Name="libzmq-uiextension" PageTemplate="tool" DisplayName="ZMQ Options" SwitchPrefix="/" Order="1">
-    <Rule.Categories>
-      <Category Name="tweet" DisplayName="tweet" />
-      <Category Name="sodium" DisplayName="sodium" />
-      <Category Name="openpgm" DisplayName="openpgm" />
-      <Category Name="gssapi" DisplayName="gssapi" />
-      <Category Name="draftapi" DisplayName="draftapi" />
-      <Category Name="usepoll" DisplayName="usepoll" />
-    </Rule.Categories>
-    <Rule.DataSource>
-      <DataSource Persistence="ProjectFile" ItemType="" />
-    </Rule.DataSource>
-    <EnumProperty Name="Option-tweet" DisplayName="Enable Tweet NaCl" Description="Enable Tweet NaCl build option (overrides Sodium)" Category="tweet">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-    <EnumProperty Name="Option-sodium" DisplayName="Enable Sodium" Description="Enable Sodium build option" Category="sodium">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-    <EnumProperty Name="Option-openpgm" DisplayName="Enable OpenPGM" Description="Enable OpenPGM build option" Category="openpgm">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-    <EnumProperty Name="Option-gssapi" DisplayName="Enable GSS API" Description="Enable GSS API build option" Category="gssapi">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-    <EnumProperty Name="Option-draftapi" DisplayName="Enable Draft API" Description="Enable Draft API build option" Category="draftapi">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-    <EnumProperty Name="Option-usepoll" DisplayName="Enable poll() usage (Vista+ only)" Description="Use poll() instead of select() for waiting on incoming data. Increases performance, but the binary will only run on Windows Vista or later." Category="usepoll">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-  </Rule>
-</ProjectSchemaDefinitions>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2013/local_lat/local_lat.props b/libs/libzmq/builds/deprecated-msvc/vs2013/local_lat/local_lat.props
deleted file mode 100644
index ea5e3e5..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2013/local_lat/local_lat.props
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>ZeroMQ local_lat Common Settings</_PropertySheetDisplayName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-  </PropertyGroup>
-
-  <!-- Configuration -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <!-- Dependencies -->
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="..\libzmq.import.props" />
-    <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props"
-            Condition="Exists('$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props')" /> 
-  </ImportGroup>
-
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
-    <Linkage-libzmq>dynamic</Linkage-libzmq>
-    <!--<Linkage-libsodium>dynamic</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
-    <Linkage-libzmq>ltcg</Linkage-libzmq>
-    <!--<Linkage-libsodium>ltcg</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
-    <Linkage-libzmq>static</Linkage-libzmq>
-    <!--<Linkage-libsodium>static</Linkage-libsodium>-->
-  </PropertyGroup>
-
-  <!-- Messages -->
-
-  <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Linkage-libzmq    : $(Linkage-libzmq)" Importance="high"/>
-    <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high" Condition="'$(HAVE_LIBSODIUM)'=='1'"/>
-  </Target>
-
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2013/local_lat/local_lat.vcxproj b/libs/libzmq/builds/deprecated-msvc/vs2013/local_lat/local_lat.vcxproj
deleted file mode 100644
index 97386bc..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2013/local_lat/local_lat.vcxproj
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}</ProjectGuid>
-    <ProjectName>local_lat</ProjectName>
-    <PlatformToolset>v120</PlatformToolset>
-    <ConfigurationType>Application</ConfigurationType>
-  </PropertyGroup>
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DebugDEXE|Win32">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|Win32">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugDEXE|x64">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|x64">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|Win32">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|Win32">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|x64">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|x64">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|Win32">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|Win32">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|x64">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|x64">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
-    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-  </ImportGroup>
-  <PropertyGroup>
-    <Option-tweet>true</Option-tweet>
-  </PropertyGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\platform.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\..\perf\local_lat.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ItemGroup>
-    <ProjectReference Include="..\libzmq\libzmq.vcxproj">
-      <Project>{641c5f36-32ee-4323-b740-992b651cf9d6}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2013/local_thr/local_thr.props b/libs/libzmq/builds/deprecated-msvc/vs2013/local_thr/local_thr.props
deleted file mode 100644
index 1d017d4..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2013/local_thr/local_thr.props
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>ZeroMQ local_thr Common Settings</_PropertySheetDisplayName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-  </PropertyGroup>
-
-  <!-- Configuration -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <!-- Dependencies -->
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="..\libzmq.import.props" />
-    <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props"
-            Condition="Exists('$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props')" /> 
-  </ImportGroup>
-
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
-    <Linkage-libzmq>dynamic</Linkage-libzmq>
-    <!--<Linkage-libsodium>dynamic</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
-    <Linkage-libzmq>ltcg</Linkage-libzmq>
-    <!--<Linkage-libsodium>ltcg</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
-    <Linkage-libzmq>static</Linkage-libzmq>
-    <!--<Linkage-libsodium>static</Linkage-libsodium>-->
-  </PropertyGroup>
-
-  <!-- Messages -->
-
-  <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Linkage-libzmq    : $(Linkage-libzmq)" Importance="high"/>
-    <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high" Condition="'$(HAVE_LIBSODIUM)'=='1'"/>
-  </Target>
-
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2013/local_thr/local_thr.vcxproj b/libs/libzmq/builds/deprecated-msvc/vs2013/local_thr/local_thr.vcxproj
deleted file mode 100644
index ee15fa5..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2013/local_thr/local_thr.vcxproj
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{8EF2DF6B-6646-460F-8032-913B70FE0E94}</ProjectGuid>
-    <ProjectName>local_thr</ProjectName>
-    <PlatformToolset>v120</PlatformToolset>
-    <ConfigurationType>Application</ConfigurationType>
-  </PropertyGroup>
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DebugDEXE|Win32">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|Win32">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugDEXE|x64">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|x64">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|Win32">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|Win32">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|x64">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|x64">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|Win32">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|Win32">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|x64">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|x64">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
-    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-  </ImportGroup>
-  <PropertyGroup>
-    <Option-tweet>true</Option-tweet>
-  </PropertyGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\platform.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\..\perf\local_thr.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ItemGroup>
-    <ProjectReference Include="..\libzmq\libzmq.vcxproj">
-      <Project>{641c5f36-32ee-4323-b740-992b651cf9d6}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2013/remote_lat/remote_lat.props b/libs/libzmq/builds/deprecated-msvc/vs2013/remote_lat/remote_lat.props
deleted file mode 100644
index 307eaf5..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2013/remote_lat/remote_lat.props
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>ZeroMQ remote_lat Common Settings</_PropertySheetDisplayName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-  </PropertyGroup>
-
-  <!-- Configuration -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <!-- Dependencies -->
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="..\libzmq.import.props" />
-    <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props"
-            Condition="Exists('$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props')" /> 
-  </ImportGroup>
-
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
-    <Linkage-libzmq>dynamic</Linkage-libzmq>
-    <!--<Linkage-libsodium>dynamic</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
-    <Linkage-libzmq>ltcg</Linkage-libzmq>
-    <!--<Linkage-libsodium>ltcg</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
-    <Linkage-libzmq>static</Linkage-libzmq>
-    <!--<Linkage-libsodium>static</Linkage-libsodium>-->
-  </PropertyGroup>
-
-  <!-- Messages -->
-
-  <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Linkage-libzmq    : $(Linkage-libzmq)" Importance="high"/>
-    <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high" Condition="'$(HAVE_LIBSODIUM)'=='1'"/>
-  </Target>
-
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2013/remote_lat/remote_lat.vcxproj b/libs/libzmq/builds/deprecated-msvc/vs2013/remote_lat/remote_lat.vcxproj
deleted file mode 100644
index a6f0bd6..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2013/remote_lat/remote_lat.vcxproj
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}</ProjectGuid>
-    <ProjectName>remote_lat</ProjectName>
-    <PlatformToolset>v120</PlatformToolset>
-    <ConfigurationType>Application</ConfigurationType>
-  </PropertyGroup>
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DebugDEXE|Win32">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|Win32">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugDEXE|x64">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|x64">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|Win32">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|Win32">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|x64">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|x64">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|Win32">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|Win32">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|x64">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|x64">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
-    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-  </ImportGroup>
-  <PropertyGroup>
-    <Option-tweet>true</Option-tweet>
-  </PropertyGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\platform.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\..\perf\remote_lat.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ItemGroup>
-    <ProjectReference Include="..\libzmq\libzmq.vcxproj">
-      <Project>{641c5f36-32ee-4323-b740-992b651cf9d6}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2013/remote_thr/remote_thr.props b/libs/libzmq/builds/deprecated-msvc/vs2013/remote_thr/remote_thr.props
deleted file mode 100644
index 001e481..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2013/remote_thr/remote_thr.props
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>ZeroMQ remote_thr Common Settings</_PropertySheetDisplayName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-  </PropertyGroup>
-
-  <!-- Configuration -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <!-- Dependencies -->
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="..\libzmq.import.props" />
-    <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props"
-            Condition="Exists('$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props')" /> 
-  </ImportGroup>
-  
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
-    <Linkage-libzmq>dynamic</Linkage-libzmq>
-    <!--<Linkage-libsodium>dynamic</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
-    <Linkage-libzmq>ltcg</Linkage-libzmq>
-    <!--<Linkage-libsodium>ltcg</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
-    <Linkage-libzmq>static</Linkage-libzmq>
-    <!--<Linkage-libsodium>static</Linkage-libsodium>-->
-  </PropertyGroup>
-
-  <!-- Messages -->
-
-  <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Linkage-libzmq    : $(Linkage-libzmq)" Importance="high"/>
-    <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high" Condition="'$(HAVE_LIBSODIUM)'=='1'"/>
-  </Target>
-
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2013/remote_thr/remote_thr.vcxproj b/libs/libzmq/builds/deprecated-msvc/vs2013/remote_thr/remote_thr.vcxproj
deleted file mode 100644
index 0a53c12..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2013/remote_thr/remote_thr.vcxproj
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{B15E059C-0CBB-4A82-8C42-6567FB650802}</ProjectGuid>
-    <ProjectName>remote_thr</ProjectName>
-    <PlatformToolset>v120</PlatformToolset>
-    <ConfigurationType>Application</ConfigurationType>
-  </PropertyGroup>
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DebugDEXE|Win32">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|Win32">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugDEXE|x64">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|x64">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|Win32">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|Win32">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|x64">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|x64">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|Win32">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|Win32">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|x64">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|x64">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
-    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-  </ImportGroup>
-  <PropertyGroup>
-    <Option-tweet>true</Option-tweet>
-  </PropertyGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\platform.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\..\perf\remote_thr.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ItemGroup>
-    <ProjectReference Include="..\libzmq\libzmq.vcxproj">
-      <Project>{641c5f36-32ee-4323-b740-992b651cf9d6}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2015/inproc_lat/inproc_lat.props b/libs/libzmq/builds/deprecated-msvc/vs2015/inproc_lat/inproc_lat.props
deleted file mode 100644
index fc03c8b..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2015/inproc_lat/inproc_lat.props
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>ZeroMQ inproc_lat Common Settings</_PropertySheetDisplayName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-  </PropertyGroup>
-
-  <!-- Configuration -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <!-- Dependencies -->
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="..\libzmq.import.props" />
-    <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props"
-            Condition="Exists('$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props')" /> 
-  </ImportGroup>
-
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
-    <Linkage-libzmq>dynamic</Linkage-libzmq>
-    <!--<Linkage-libsodium>dynamic</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
-    <Linkage-libzmq>ltcg</Linkage-libzmq>
-    <!--<Linkage-libsodium>ltcg</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
-    <Linkage-libzmq>static</Linkage-libzmq>
-    <!--<Linkage-libsodium>static</Linkage-libsodium>-->
-  </PropertyGroup>
-
-  <!-- Messages -->
-
-  <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Linkage-libzmq    : $(Linkage-libzmq)" Importance="high"/>
-    <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high"  Condition="'$(HAVE_LIBSODIUM)'=='1'"/>
-  </Target>
-
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2015/inproc_lat/inproc_lat.vcxproj b/libs/libzmq/builds/deprecated-msvc/vs2015/inproc_lat/inproc_lat.vcxproj
deleted file mode 100644
index d5ce197..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2015/inproc_lat/inproc_lat.vcxproj
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}</ProjectGuid>
-    <ProjectName>inproc_lat</ProjectName>
-    <PlatformToolset>v140</PlatformToolset>
-    <ConfigurationType>Application</ConfigurationType>
-  </PropertyGroup>
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DebugDEXE|Win32">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|Win32">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugDEXE|x64">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|x64">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|Win32">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|Win32">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|x64">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|x64">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|Win32">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|Win32">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|x64">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|x64">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
-    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-  </ImportGroup>
-  <PropertyGroup>
-    <Option-tweet>true</Option-tweet>
-  </PropertyGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\platform.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\..\perf\inproc_lat.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ItemGroup>
-    <ProjectReference Include="..\libzmq\libzmq.vcxproj">
-      <Project>{641c5f36-32ee-4323-b740-992b651cf9d6}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2015/inproc_thr/inproc_thr.props b/libs/libzmq/builds/deprecated-msvc/vs2015/inproc_thr/inproc_thr.props
deleted file mode 100644
index aba5058..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2015/inproc_thr/inproc_thr.props
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>ZeroMQ inproc_thr Common Settings</_PropertySheetDisplayName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-  </PropertyGroup>
-
-  <!-- Configuration -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <!-- Dependencies -->
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="..\libzmq.import.props" />
-    <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props"
-            Condition="Exists('$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props')" /> 
-  </ImportGroup>
-
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
-    <Linkage-libzmq>dynamic</Linkage-libzmq>
-    <!--<Linkage-libsodium>dynamic</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
-    <Linkage-libzmq>ltcg</Linkage-libzmq>
-    <!--<Linkage-libsodium>ltcg</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
-    <Linkage-libzmq>static</Linkage-libzmq>
-    <!--<Linkage-libsodium>static</Linkage-libsodium>-->
-  </PropertyGroup>
-
-  <!-- Messages -->
-
-  <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Linkage-libzmq    : $(Linkage-libzmq)" Importance="high"/>
-    <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high" Condition="'$(HAVE_LIBSODIUM)'=='1'"/>
-  </Target>
-
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2015/inproc_thr/inproc_thr.vcxproj b/libs/libzmq/builds/deprecated-msvc/vs2015/inproc_thr/inproc_thr.vcxproj
deleted file mode 100644
index fa3127f..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2015/inproc_thr/inproc_thr.vcxproj
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{1077E977-95DD-4E73-A692-74647DD0CC1E}</ProjectGuid>
-    <ProjectName>inproc_thr</ProjectName>
-    <PlatformToolset>v140</PlatformToolset>
-    <ConfigurationType>Application</ConfigurationType>
-  </PropertyGroup>
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DebugDEXE|Win32">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|Win32">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugDEXE|x64">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|x64">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|Win32">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|Win32">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|x64">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|x64">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|Win32">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|Win32">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|x64">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|x64">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
-    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-  </ImportGroup>
-  <PropertyGroup>
-    <Option-tweet>true</Option-tweet>
-  </PropertyGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\platform.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\..\perf\inproc_thr.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ItemGroup>
-    <ProjectReference Include="..\libzmq\libzmq.vcxproj">
-      <Project>{641c5f36-32ee-4323-b740-992b651cf9d6}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2015/libsodium.import.props b/libs/libzmq/builds/deprecated-msvc/vs2015/libsodium.import.props
deleted file mode 100644
index b3d7e4f..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2015/libsodium.import.props
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup Label="Globals">
-    <_PropertySheetDisplayName>Libsodium Import Settings</_PropertySheetDisplayName>
-  </PropertyGroup>
-
-  <!-- User Interface -->
-
-  <ItemGroup Label="BuildOptionsExtension">
-    <PropertyPageSchema Include="$(MSBuildThisFileDirectory)libsodium.import.xml" />
-  </ItemGroup>
-
-  <!-- Linkage -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\..\libsodium\src\libsodium\include;$(ProjectDir)..\..\..\..\..\libsodium\src\libsodium\include\sodium\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Linkage-libsodium)' == 'static' Or '$(Linkage-libsodium)' == 'ltcg'">SODIUM_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies Condition="'$(Linkage-libsodium)' != ''">advapi32.lib;libsodium.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Debug')) != -1">$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\$(PlatformToolset)\$(Linkage-libsodium)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Release')) != -1">$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Release\$(PlatformToolset)\$(Linkage-libsodium)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <!-- Copy -->
-
-  <Target Name="Linkage-libsodium-dynamic" AfterTargets="AfterBuild" Condition="'$(Linkage-libsodium)' == 'dynamic'">
-    <Copy Condition="$(Configuration.IndexOf('Debug')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\$(PlatformToolset)\dynamic\libsodium.dll"
-          DestinationFiles="$(TargetDir)libsodium.dll"
-          SkipUnchangedFiles="true" />
-    <Copy Condition="$(Configuration.IndexOf('Debug')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\$(PlatformToolset)\dynamic\libsodium.pdb"
-          DestinationFiles="$(TargetDir)libsodium.pdb"
-          SkipUnchangedFiles="true" />
-    <Copy Condition="$(Configuration.IndexOf('Release')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Release\$(PlatformToolset)\dynamic\libsodium.dll"
-          DestinationFiles="$(TargetDir)libsodium.dll"
-          SkipUnchangedFiles="true" />
-  </Target>
-
-  <!-- Messages -->
-
-  <Target Name="libsodium-info" BeforeTargets="AfterBuild" Condition="'$(Linkage-libsodium)' == 'dynamic'">
-    <Message Text="Copying libsodium.dll -&gt; $(TargetDir)libsodium.dll" Importance="high"/>
-    <Message Text="Copying libsodium.pdb -&gt; $(TargetDir)libsodium.pdb" Importance="high" Condition="$(Configuration.IndexOf('Debug')) != -1" />
-  </Target>
-
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2015/libsodium.import.xml b/libs/libzmq/builds/deprecated-msvc/vs2015/libsodium.import.xml
deleted file mode 100644
index dbcf4e5..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2015/libsodium.import.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ProjectSchemaDefinitions xmlns="clr-namespace:Microsoft.Build.Framework.XamlTypes;assembly=Microsoft.Build.Framework">
-  <Rule Name="libsodium-linkage-uiextension" PageTemplate="tool" DisplayName="Local Dependencies" SwitchPrefix="/" Order="1">
-    <Rule.Categories>
-      <Category Name="libsodium" DisplayName="libsodium" />
-    </Rule.Categories>
-    <Rule.DataSource>
-      <DataSource Persistence="ProjectFile" ItemType="" />
-    </Rule.DataSource>
-    <EnumProperty Name="Linkage-libsodium" DisplayName="Linkage" Description="How libsodium will be linked into the output of this project" Category="libsodium">
-      <EnumValue Name="" DisplayName="Not linked" />
-      <EnumValue Name="dynamic" DisplayName="Dynamic (DLL)" />
-      <EnumValue Name="static" DisplayName="Static (LIB)" />
-      <EnumValue Name="ltcg" DisplayName="Static using link time compile generation (LTCG)" />
-    </EnumProperty>
-  </Rule>
-</ProjectSchemaDefinitions>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2015/libzmq.import.props b/libs/libzmq/builds/deprecated-msvc/vs2015/libzmq.import.props
deleted file mode 100644
index 2f71ff8..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2015/libzmq.import.props
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup Label="Globals">
-    <_PropertySheetDisplayName>ZMQ Import Settings</_PropertySheetDisplayName>
-  </PropertyGroup>
-
-  <!-- User Interface -->
-
-  <ItemGroup Label="BuildOptionsExtension">
-    <PropertyPageSchema Include="$(MSBuildThisFileDirectory)libzmq.import.xml" />
-  </ItemGroup>
-
-  <!-- Configuration -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <PreprocessorDefinitions Condition="'$(Option-tweet)' == 'true'">ZMQ_USE_TWEETNACL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-sodium)' == 'true'">ZMQ_USE_LIBSODIUM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-openpgm)' == 'true'">ZMQ_HAVE_OPENPGM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-gssapi)' == 'true'">HAVE_LIBGSSAPI_KRB5;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-draftapi)' == 'true'">ZMQ_BUILD_DRAFT_API;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemDefinitionGroup>
-
-  <!-- Linkage -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\..\libzmq\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Linkage-libzmq)' == 'static' Or '$(Linkage-libzmq)' == 'ltcg'">ZMQ_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies Condition="'$(Linkage-libzmq)' != ''">libzmq.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Debug')) != -1">$(ProjectDir)..\..\..\..\..\libzmq\bin\$(PlatformName)\Debug\$(PlatformToolset)\$(Linkage-libzmq)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Release')) != -1">$(ProjectDir)..\..\..\..\..\libzmq\bin\$(PlatformName)\Release\$(PlatformToolset)\$(Linkage-libzmq)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <!-- Copy -->
-
-  <Target Name="Linkage-libzmq-dynamic" AfterTargets="AfterBuild" Condition="'$(Linkage-libzmq)' == 'dynamic'">
-    <Copy Condition="$(Configuration.IndexOf('Debug')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libzmq\bin\$(PlatformName)\Debug\$(PlatformToolset)\dynamic\libzmq.dll"
-          DestinationFiles="$(TargetDir)libzmq.dll"
-          SkipUnchangedFiles="true" />
-    <Copy Condition="$(Configuration.IndexOf('Debug')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libzmq\bin\$(PlatformName)\Debug\$(PlatformToolset)\dynamic\libzmq.pdb"
-          DestinationFiles="$(TargetDir)libzmq.pdb"
-          SkipUnchangedFiles="true" />
-    <Copy Condition="$(Configuration.IndexOf('Release')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libzmq\bin\$(PlatformName)\Release\$(PlatformToolset)\dynamic\libzmq.dll"
-          DestinationFiles="$(TargetDir)libzmq.dll"
-          SkipUnchangedFiles="true" />
-  </Target>
-
-  <!-- Messages -->
-
-  <Target Name="libzmq-info" BeforeTargets="AfterBuild" Condition="'$(Linkage-libzmq)' == 'dynamic'">
-    <Message Text="Copying libzmq.dll -&gt; $(TargetDir)libzmq.dll" Importance="high"/>
-    <Message Text="Copying libzmq.pdb -&gt; $(TargetDir)libzmq.pdb" Importance="high" Condition="$(Configuration.IndexOf('Debug')) != -1" />
-  </Target>
-
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2015/libzmq.import.xml b/libs/libzmq/builds/deprecated-msvc/vs2015/libzmq.import.xml
deleted file mode 100644
index a25a1ba..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2015/libzmq.import.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ProjectSchemaDefinitions xmlns="clr-namespace:Microsoft.Build.Framework.XamlTypes;assembly=Microsoft.Build.Framework">
-  <Rule Name="libzmq-options-uiextension" PageTemplate="tool" DisplayName="ZMQ Options" SwitchPrefix="/" Order="1">
-    <Rule.Categories>
-      <Category Name="tweet" DisplayName="tweet" />
-      <Category Name="sodium" DisplayName="sodium" />
-      <Category Name="openpgm" DisplayName="openpgm" />
-      <Category Name="gssapi" DisplayName="gssapi" />
-      <Category Name="draftapi" DisplayName="draftapi" />
-    </Rule.Categories>
-    <Rule.DataSource>
-      <DataSource Persistence="ProjectFile" ItemType="" />
-    </Rule.DataSource>
-    <EnumProperty Name="Option-tweet" DisplayName="Enable Tweet NaCl" Description="Enable the Tweet NaCl build option" Category="tweet">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-    <EnumProperty Name="Option-sodium" DisplayName="Enable Sodium" Description="Enable the Sodium build option" Category="sodium">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-    <EnumProperty Name="Option-openpgm" DisplayName="Enable OpenPGM" Description="Enable the OpenPGM build option" Category="openpgm">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-    <EnumProperty Name="Option-gssapi" DisplayName="Enable GSS API" Description="Enable the GSS API build option" Category="gssapi">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-    <EnumProperty Name="Option-draftapi" DisplayName="Enable Draft API" Description="Enable Draft API build option" Category="draftapi">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-  </Rule>
-  <Rule Name="libzmq-linkage-uiextension" PageTemplate="tool" DisplayName="Local Dependencies" SwitchPrefix="/" Order="1">
-    <Rule.Categories>
-      <Category Name="libzmq" DisplayName="libzmq" />
-    </Rule.Categories>
-    <Rule.DataSource>
-      <DataSource Persistence="ProjectFile" ItemType="" />
-    </Rule.DataSource>
-    <EnumProperty Name="Linkage-libzmq" DisplayName="Linkage" Description="How libzmq will be linked into the output of this project" Category="libzmq">
-      <EnumValue Name="" DisplayName="Not linked" />
-      <EnumValue Name="dynamic" DisplayName="Dynamic (DLL)" />
-      <EnumValue Name="static" DisplayName="Static (LIB)" />
-      <EnumValue Name="ltcg" DisplayName="Static using link time compile generation (LTCG)" />
-    </EnumProperty>
-  </Rule>
-</ProjectSchemaDefinitions>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2015/libzmq.sln b/libs/libzmq/builds/deprecated-msvc/vs2015/libzmq.sln
deleted file mode 100644
index 34be09f..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2015/libzmq.sln
+++ /dev/null
@@ -1,208 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.23107.0
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libzmq", "libzmq\libzmq.vcxproj", "{641C5F36-32EE-4323-B740-992B651CF9D6}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "inproc_thr", "inproc_thr\inproc_thr.vcxproj", "{1077E977-95DD-4E73-A692-74647DD0CC1E}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "inproc_lat", "inproc_lat\inproc_lat.vcxproj", "{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "remote_thr", "remote_thr\remote_thr.vcxproj", "{B15E059C-0CBB-4A82-8C42-6567FB650802}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "remote_lat", "remote_lat\remote_lat.vcxproj", "{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "local_thr", "local_thr\local_thr.vcxproj", "{8EF2DF6B-6646-460F-8032-913B70FE0E94}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "local_lat", "local_lat\local_lat.vcxproj", "{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		DynDebug|Win32 = DynDebug|Win32
-		DynDebug|x64 = DynDebug|x64
-		DynRelease|Win32 = DynRelease|Win32
-		DynRelease|x64 = DynRelease|x64
-		LtcgDebug|Win32 = LtcgDebug|Win32
-		LtcgDebug|x64 = LtcgDebug|x64
-		LtcgRelease|Win32 = LtcgRelease|Win32
-		LtcgRelease|x64 = LtcgRelease|x64
-		StaticDebug|Win32 = StaticDebug|Win32
-		StaticDebug|x64 = StaticDebug|x64
-		StaticRelease|Win32 = StaticRelease|Win32
-		StaticRelease|x64 = StaticRelease|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.DynDebug|Win32.ActiveCfg = DebugDLL|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.DynDebug|Win32.Build.0 = DebugDLL|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.DynDebug|x64.ActiveCfg = DebugDLL|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.DynDebug|x64.Build.0 = DebugDLL|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.DynRelease|Win32.ActiveCfg = ReleaseDLL|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.DynRelease|Win32.Build.0 = ReleaseDLL|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.DynRelease|x64.ActiveCfg = ReleaseDLL|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.DynRelease|x64.Build.0 = ReleaseDLL|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.LtcgDebug|Win32.ActiveCfg = DebugLTCG|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.LtcgDebug|Win32.Build.0 = DebugLTCG|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.LtcgDebug|x64.ActiveCfg = DebugLTCG|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.LtcgDebug|x64.Build.0 = DebugLTCG|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.LtcgRelease|Win32.ActiveCfg = ReleaseLTCG|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.LtcgRelease|Win32.Build.0 = ReleaseLTCG|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.LtcgRelease|x64.ActiveCfg = ReleaseLTCG|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.LtcgRelease|x64.Build.0 = ReleaseLTCG|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.StaticDebug|Win32.ActiveCfg = DebugLIB|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.StaticDebug|Win32.Build.0 = DebugLIB|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.StaticDebug|x64.ActiveCfg = DebugLIB|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.StaticDebug|x64.Build.0 = DebugLIB|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.StaticRelease|Win32.ActiveCfg = ReleaseLIB|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.StaticRelease|Win32.Build.0 = ReleaseLIB|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.StaticRelease|x64.ActiveCfg = ReleaseLIB|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.StaticRelease|x64.Build.0 = ReleaseLIB|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.DynDebug|Win32.ActiveCfg = DebugDEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.DynDebug|Win32.Build.0 = DebugDEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.DynDebug|x64.ActiveCfg = DebugDEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.DynDebug|x64.Build.0 = DebugDEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.DynRelease|Win32.ActiveCfg = ReleaseDEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.DynRelease|Win32.Build.0 = ReleaseDEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.DynRelease|x64.ActiveCfg = ReleaseDEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.DynRelease|x64.Build.0 = ReleaseDEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.LtcgDebug|Win32.ActiveCfg = DebugLEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.LtcgDebug|Win32.Build.0 = DebugLEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.LtcgDebug|x64.ActiveCfg = DebugLEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.LtcgDebug|x64.Build.0 = DebugLEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.LtcgRelease|Win32.ActiveCfg = ReleaseLEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.LtcgRelease|Win32.Build.0 = ReleaseLEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.LtcgRelease|x64.ActiveCfg = ReleaseLEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.LtcgRelease|x64.Build.0 = ReleaseLEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.StaticDebug|Win32.ActiveCfg = DebugSEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.StaticDebug|Win32.Build.0 = DebugSEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.StaticDebug|x64.ActiveCfg = DebugSEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.StaticDebug|x64.Build.0 = DebugSEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.StaticRelease|Win32.ActiveCfg = ReleaseSEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.StaticRelease|Win32.Build.0 = ReleaseSEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.StaticRelease|x64.ActiveCfg = ReleaseSEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.StaticRelease|x64.Build.0 = ReleaseSEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.DynDebug|Win32.ActiveCfg = DebugDEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.DynDebug|Win32.Build.0 = DebugDEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.DynDebug|x64.ActiveCfg = DebugDEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.DynDebug|x64.Build.0 = DebugDEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.DynRelease|Win32.ActiveCfg = ReleaseDEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.DynRelease|Win32.Build.0 = ReleaseDEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.DynRelease|x64.ActiveCfg = ReleaseDEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.DynRelease|x64.Build.0 = ReleaseDEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.LtcgDebug|Win32.ActiveCfg = DebugLEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.LtcgDebug|Win32.Build.0 = DebugLEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.LtcgDebug|x64.ActiveCfg = DebugLEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.LtcgDebug|x64.Build.0 = DebugLEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.LtcgRelease|Win32.ActiveCfg = ReleaseLEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.LtcgRelease|Win32.Build.0 = ReleaseLEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.LtcgRelease|x64.ActiveCfg = ReleaseLEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.LtcgRelease|x64.Build.0 = ReleaseLEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.StaticDebug|Win32.ActiveCfg = DebugSEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.StaticDebug|Win32.Build.0 = DebugSEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.StaticDebug|x64.ActiveCfg = DebugSEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.StaticDebug|x64.Build.0 = DebugSEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.StaticRelease|Win32.ActiveCfg = ReleaseSEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.StaticRelease|Win32.Build.0 = ReleaseSEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.StaticRelease|x64.ActiveCfg = ReleaseSEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.StaticRelease|x64.Build.0 = ReleaseSEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.DynDebug|Win32.ActiveCfg = DebugDEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.DynDebug|Win32.Build.0 = DebugDEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.DynDebug|x64.ActiveCfg = DebugDEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.DynDebug|x64.Build.0 = DebugDEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.DynRelease|Win32.ActiveCfg = ReleaseDEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.DynRelease|Win32.Build.0 = ReleaseDEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.DynRelease|x64.ActiveCfg = ReleaseDEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.DynRelease|x64.Build.0 = ReleaseDEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.LtcgDebug|Win32.ActiveCfg = DebugLEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.LtcgDebug|Win32.Build.0 = DebugLEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.LtcgDebug|x64.ActiveCfg = DebugLEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.LtcgDebug|x64.Build.0 = DebugLEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.LtcgRelease|Win32.ActiveCfg = ReleaseLEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.LtcgRelease|Win32.Build.0 = ReleaseLEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.LtcgRelease|x64.ActiveCfg = ReleaseLEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.LtcgRelease|x64.Build.0 = ReleaseLEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.StaticDebug|Win32.ActiveCfg = DebugSEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.StaticDebug|Win32.Build.0 = DebugSEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.StaticDebug|x64.ActiveCfg = DebugSEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.StaticDebug|x64.Build.0 = DebugSEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.StaticRelease|Win32.ActiveCfg = ReleaseSEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.StaticRelease|Win32.Build.0 = ReleaseSEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.StaticRelease|x64.ActiveCfg = ReleaseSEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.StaticRelease|x64.Build.0 = ReleaseSEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.DynDebug|Win32.ActiveCfg = DebugDEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.DynDebug|Win32.Build.0 = DebugDEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.DynDebug|x64.ActiveCfg = DebugDEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.DynDebug|x64.Build.0 = DebugDEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.DynRelease|Win32.ActiveCfg = ReleaseDEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.DynRelease|Win32.Build.0 = ReleaseDEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.DynRelease|x64.ActiveCfg = ReleaseDEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.DynRelease|x64.Build.0 = ReleaseDEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.LtcgDebug|Win32.ActiveCfg = DebugLEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.LtcgDebug|Win32.Build.0 = DebugLEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.LtcgDebug|x64.ActiveCfg = DebugLEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.LtcgDebug|x64.Build.0 = DebugLEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.LtcgRelease|Win32.ActiveCfg = ReleaseLEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.LtcgRelease|Win32.Build.0 = ReleaseLEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.LtcgRelease|x64.ActiveCfg = ReleaseLEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.LtcgRelease|x64.Build.0 = ReleaseLEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.StaticDebug|Win32.ActiveCfg = DebugSEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.StaticDebug|Win32.Build.0 = DebugSEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.StaticDebug|x64.ActiveCfg = DebugSEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.StaticDebug|x64.Build.0 = DebugSEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.StaticRelease|Win32.ActiveCfg = ReleaseSEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.StaticRelease|Win32.Build.0 = ReleaseSEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.StaticRelease|x64.ActiveCfg = ReleaseSEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.StaticRelease|x64.Build.0 = ReleaseSEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.DynDebug|Win32.ActiveCfg = DebugDEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.DynDebug|Win32.Build.0 = DebugDEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.DynDebug|x64.ActiveCfg = DebugDEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.DynDebug|x64.Build.0 = DebugDEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.DynRelease|Win32.ActiveCfg = ReleaseDEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.DynRelease|Win32.Build.0 = ReleaseDEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.DynRelease|x64.ActiveCfg = ReleaseDEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.DynRelease|x64.Build.0 = ReleaseDEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.LtcgDebug|Win32.ActiveCfg = DebugLEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.LtcgDebug|Win32.Build.0 = DebugLEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.LtcgDebug|x64.ActiveCfg = DebugLEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.LtcgDebug|x64.Build.0 = DebugLEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.LtcgRelease|Win32.ActiveCfg = ReleaseLEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.LtcgRelease|Win32.Build.0 = ReleaseLEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.LtcgRelease|x64.ActiveCfg = ReleaseLEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.LtcgRelease|x64.Build.0 = ReleaseLEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.StaticDebug|Win32.ActiveCfg = DebugSEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.StaticDebug|Win32.Build.0 = DebugSEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.StaticDebug|x64.ActiveCfg = DebugSEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.StaticDebug|x64.Build.0 = DebugSEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.StaticRelease|Win32.ActiveCfg = ReleaseSEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.StaticRelease|Win32.Build.0 = ReleaseSEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.StaticRelease|x64.ActiveCfg = ReleaseSEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.StaticRelease|x64.Build.0 = ReleaseSEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.DynDebug|Win32.ActiveCfg = DebugDEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.DynDebug|Win32.Build.0 = DebugDEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.DynDebug|x64.ActiveCfg = DebugDEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.DynDebug|x64.Build.0 = DebugDEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.DynRelease|Win32.ActiveCfg = ReleaseDEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.DynRelease|Win32.Build.0 = ReleaseDEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.DynRelease|x64.ActiveCfg = ReleaseDEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.DynRelease|x64.Build.0 = ReleaseDEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.LtcgDebug|Win32.ActiveCfg = DebugLEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.LtcgDebug|Win32.Build.0 = DebugLEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.LtcgDebug|x64.ActiveCfg = DebugLEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.LtcgDebug|x64.Build.0 = DebugLEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.LtcgRelease|Win32.ActiveCfg = ReleaseLEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.LtcgRelease|Win32.Build.0 = ReleaseLEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.LtcgRelease|x64.ActiveCfg = ReleaseLEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.LtcgRelease|x64.Build.0 = ReleaseLEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.StaticDebug|Win32.ActiveCfg = DebugSEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.StaticDebug|Win32.Build.0 = DebugSEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.StaticDebug|x64.ActiveCfg = DebugSEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.StaticDebug|x64.Build.0 = DebugSEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.StaticRelease|Win32.ActiveCfg = ReleaseSEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.StaticRelease|Win32.Build.0 = ReleaseSEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.StaticRelease|x64.ActiveCfg = ReleaseSEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.StaticRelease|x64.Build.0 = ReleaseSEXE|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2015/libzmq/libzmq.props b/libs/libzmq/builds/deprecated-msvc/vs2015/libzmq/libzmq.props
deleted file mode 100644
index 22da05a..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2015/libzmq/libzmq.props
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>ZeroMQ Library Common Settings</_PropertySheetDisplayName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-  </PropertyGroup>
-
-  <!-- User Interface -->
-
-  <ItemGroup Label="BuildOptionsExtension">
-    <PropertyPageSchema Include="$(MSBuildThisFileDirectory)$(ProjectName).xml" />
-  </ItemGroup>
-
-  <!-- Configuration -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\;$(ProjectDir)..\..\..\..\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <EnablePREfast>false</EnablePREfast>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>precompiled.hpp</PrecompiledHeaderFile>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;FD_SETSIZE=16384;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-tweet)' == 'true'">ZMQ_USE_TWEETNACL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-sodium)' == 'true'">ZMQ_USE_LIBSODIUM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-tweet)' == 'true' Or '$(Option-sodium)' == 'true'">ZMQ_HAVE_CURVE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-openpgm)' == 'true'">ZMQ_HAVE_OPENPGM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-gssapi)' == 'true'">HAVE_LIBGSSAPI_KRB5;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-draftapi)' == 'true'">ZMQ_BUILD_DRAFT_API;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-usepoll)' == 'true'">ZMQ_USE_POLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-usepoll)' != 'true'">ZMQ_USE_SELECT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(ConfigurationType)' == 'StaticLibrary'">ZMQ_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(ConfigurationType)' == 'DynamicLibrary'">DLL_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>Advapi32.lib;Ws2_32.lib;Rpcrt4.lib;Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <Lib Condition="'$(ConfigurationType)'=='StaticLibrary'">
-      <AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions>
-    </Lib>
-  </ItemDefinitionGroup>
-
-  <!-- Dependencies -->
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props"
-            Condition="Exists('$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props')" /> 
-  </ImportGroup>
-
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
-    <!--<Linkage-libsodium>dynamic</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
-    <!--<Linkage-libsodium>ltcg</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
-    <!--<Linkage-libsodium>static</Linkage-libsodium>-->
-  </PropertyGroup>
-
-  <!-- Messages -->
-
-  <Target Name="OptionInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Option-tweet      : $(Option-tweet)" Importance="high"/>
-    <Message Text="Option-sodium     : $(Option-sodium)" Importance="high"/>
-    <Message Text="Option-openpgm    : $(Option-openpgm)" Importance="high"/>
-    <Message Text="Option-gssapi     : $(Option-gssapi)" Importance="high"/>
-    <Message Text="Option-draftapi   : $(Option-draftapi)" Importance="high"/>
-    <Message Text="Option-usepoll    : $(Option-usepoll)" Importance="high"/>
-  </Target>
-
-  <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high" Condition="'$(Option-sodium)' == 'true'"/>
-  </Target>
-
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2015/libzmq/libzmq.vcxproj b/libs/libzmq/builds/deprecated-msvc/vs2015/libzmq/libzmq.vcxproj
deleted file mode 100644
index 3211e8a..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2015/libzmq/libzmq.vcxproj
+++ /dev/null
@@ -1,291 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{641C5F36-32EE-4323-B740-992B651CF9D6}</ProjectGuid>
-    <ProjectName>libzmq</ProjectName>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DebugDLL|Win32">
-      <Configuration>DebugDLL</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDLL|Win32">
-      <Configuration>ReleaseDLL</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugDLL|x64">
-      <Configuration>DebugDLL</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDLL|x64">
-      <Configuration>ReleaseDLL</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLTCG|Win32">
-      <Configuration>DebugLTCG</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLTCG|Win32">
-      <Configuration>ReleaseLTCG</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLTCG|x64">
-      <Configuration>DebugLTCG</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLTCG|x64">
-      <Configuration>ReleaseLTCG</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLIB|Win32">
-      <Configuration>DebugLIB</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLIB|Win32">
-      <Configuration>ReleaseLIB</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLIB|x64">
-      <Configuration>DebugLIB</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLIB|x64">
-      <Configuration>ReleaseLIB</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Configuration">
-    <ConfigurationType Condition="$(Configuration.IndexOf('DLL')) == -1">StaticLibrary</ConfigurationType>
-    <ConfigurationType Condition="$(Configuration.IndexOf('DLL')) != -1">DynamicLibrary</ConfigurationType>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
-    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-  </ImportGroup>
-  <PropertyGroup>
-    <Option-tweet>true</Option-tweet>
-  </PropertyGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\platform.hpp" />
-    <ClInclude Include="..\..\resource.h" />
-    <ClInclude Include="..\..\..\..\include\zmq.h" />
-    <ClInclude Include="..\..\..\..\src\zmq_draft.h" />
-    <ClInclude Include="..\..\..\..\src\address.hpp" />
-    <ClInclude Include="..\..\..\..\src\array.hpp" />
-    <ClInclude Include="..\..\..\..\src\atomic_counter.hpp" />
-    <ClInclude Include="..\..\..\..\src\atomic_ptr.hpp" />
-    <ClInclude Include="..\..\..\..\src\blob.hpp" />
-    <ClInclude Include="..\..\..\..\src\client.hpp" />
-    <ClInclude Include="..\..\..\..\src\clock.hpp" />
-    <ClInclude Include="..\..\..\..\src\command.hpp" />
-    <ClInclude Include="..\..\..\..\src\condition_variable.hpp" />
-    <ClInclude Include="..\..\..\..\src\config.hpp" />
-    <ClInclude Include="..\..\..\..\src\ctx.hpp" />
-    <ClInclude Include="..\..\..\..\src\curve_client.hpp" />
-    <ClInclude Include="..\..\..\..\src\curve_server.hpp" />
-    <ClInclude Include="..\..\..\..\src\decoder.hpp" />
-    <ClInclude Include="..\..\..\..\src\decoder_allocators.hpp" />
-    <ClInclude Include="..\..\..\..\src\devpoll.hpp" />
-    <ClInclude Include="..\..\..\..\src\dgram.hpp" />
-    <ClInclude Include="..\..\..\..\src\dish.hpp" />
-    <ClInclude Include="..\..\..\..\src\dist.hpp" />
-    <ClInclude Include="..\..\..\..\src\encoder.hpp" />
-    <ClInclude Include="..\..\..\..\src\epoll.hpp" />
-    <ClInclude Include="..\..\..\..\src\err.hpp" />
-    <ClInclude Include="..\..\..\..\src\fd.hpp" />
-    <ClInclude Include="..\..\..\..\src\fq.hpp" />
-    <ClInclude Include="..\..\..\..\src\gather.hpp" />
-    <ClInclude Include="..\..\..\..\src\gssapi_client.hpp" />
-    <ClInclude Include="..\..\..\..\src\gssapi_mechanism_base.hpp" />
-    <ClInclude Include="..\..\..\..\src\gssapi_server.hpp" />
-    <ClInclude Include="..\..\..\..\src\i_engine.hpp" />
-    <ClInclude Include="..\..\..\..\src\i_poll_events.hpp" />
-    <ClInclude Include="..\..\..\..\src\io_object.hpp" />
-    <ClInclude Include="..\..\..\..\src\io_thread.hpp" />
-    <ClInclude Include="..\..\..\..\src\ip.hpp" />
-    <ClInclude Include="..\..\..\..\src\ip_resolver.hpp" />
-    <ClInclude Include="..\..\..\..\src\ipc_address.hpp" />
-    <ClInclude Include="..\..\..\..\src\ipc_connecter.hpp" />
-    <ClInclude Include="..\..\..\..\src\ipc_listener.hpp" />
-    <ClInclude Include="..\..\..\..\src\kqueue.hpp" />
-    <ClInclude Include="..\..\..\..\src\lb.hpp" />
-    <ClInclude Include="..\..\..\..\src\likely.hpp" />
-    <ClInclude Include="..\..\..\..\src\mailbox.hpp" />
-    <ClInclude Include="..\..\..\..\src\mailbox_safe.hpp" />
-    <ClInclude Include="..\..\..\..\src\msg.hpp" />
-    <ClInclude Include="..\..\..\..\src\mtrie.hpp" />
-    <ClInclude Include="..\..\..\..\src\mutex.hpp" />
-    <ClInclude Include="..\..\..\..\src\object.hpp" />
-    <ClInclude Include="..\..\..\..\src\options.hpp" />
-    <ClInclude Include="..\..\..\..\src\own.hpp" />
-    <ClInclude Include="..\..\..\..\src\pair.hpp" />
-    <ClInclude Include="..\..\..\..\src\pgm_receiver.hpp" />
-    <ClInclude Include="..\..\..\..\src\pgm_sender.hpp" />
-    <ClInclude Include="..\..\..\..\src\pgm_socket.hpp" />
-    <ClInclude Include="..\..\..\..\src\pipe.hpp" />
-    <ClInclude Include="..\..\..\..\src\server.hpp" />
-    <ClInclude Include="..\..\..\..\src\socks.hpp" />
-    <ClInclude Include="..\..\..\..\src\socks_connecter.hpp" />
-    <ClInclude Include="..\..\..\..\src\poll.hpp" />
-    <ClInclude Include="..\..\..\..\src\poller.hpp" />
-    <ClInclude Include="..\..\..\..\src\poller_base.hpp" />
-    <ClInclude Include="..\..\..\..\src\precompiled.hpp" />
-    <ClInclude Include="..\..\..\..\src\proxy.hpp" />
-    <ClInclude Include="..\..\..\..\src\pub.hpp" />
-    <ClInclude Include="..\..\..\..\src\pull.hpp" />
-    <ClInclude Include="..\..\..\..\src\push.hpp" />
-    <ClInclude Include="..\..\..\..\src\radio.hpp" />
-    <ClInclude Include="..\..\..\..\src\random.hpp" />
-    <ClInclude Include="..\..\..\..\src\raw_decoder.hpp" />
-    <ClInclude Include="..\..\..\..\src\raw_encoder.hpp" />
-    <ClInclude Include="..\..\..\..\src\reaper.hpp" />
-    <ClInclude Include="..\..\..\..\src\rep.hpp" />
-    <ClInclude Include="..\..\..\..\src\req.hpp" />
-    <ClInclude Include="..\..\..\..\src\scatter.hpp" />
-    <ClInclude Include="..\..\..\..\src\select.hpp" />
-    <ClInclude Include="..\..\..\..\src\session_base.hpp" />
-    <ClInclude Include="..\..\..\..\src\signaler.hpp" />
-    <ClInclude Include="..\..\..\..\src\socket_base.hpp" />
-    <ClInclude Include="..\..\..\..\src\stdint.hpp" />
-    <ClInclude Include="..\..\..\..\src\stream_engine.hpp" />
-    <ClInclude Include="..\..\..\..\src\sub.hpp" />
-    <ClInclude Include="..\..\..\..\src\tcp.hpp" />
-    <ClInclude Include="..\..\..\..\src\tcp_address.hpp" />
-    <ClInclude Include="..\..\..\..\src\tcp_connecter.hpp" />
-    <ClInclude Include="..\..\..\..\src\tcp_listener.hpp" />
-    <ClInclude Include="..\..\..\..\src\timers.hpp" />
-    <ClInclude Include="..\..\..\..\src\thread.hpp" />
-    <ClInclude Include="..\..\..\..\src\trie.hpp" />
-    <ClInclude Include="..\..\..\..\src\tweetnacl.h" />
-    <ClInclude Include="..\..\..\..\src\udp_address.hpp" />
-    <ClInclude Include="..\..\..\..\src\udp_engine.hpp" />
-    <ClInclude Include="..\..\..\..\src\v1_decoder.hpp" />
-    <ClInclude Include="..\..\..\..\src\v1_encoder.hpp" />
-    <ClInclude Include="..\..\..\..\src\v1_protocol.hpp" />
-    <ClInclude Include="..\..\..\..\src\windows.hpp" />
-    <ClInclude Include="..\..\..\..\src\wire.hpp" />
-    <ClInclude Include="..\..\..\..\src\xpub.hpp" />
-    <ClInclude Include="..\..\..\..\src\xrep.hpp" />
-    <ClInclude Include="..\..\..\..\src\xreq.hpp" />
-    <ClInclude Include="..\..\..\..\src\xsub.hpp" />
-    <ClInclude Include="..\..\..\..\src\ypipe.hpp" />
-    <ClInclude Include="..\..\..\..\src\yqueue.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\..\src\address.cpp" />
-    <ClCompile Include="..\..\..\..\src\client.cpp" />
-    <ClCompile Include="..\..\..\..\src\clock.cpp" />
-    <ClCompile Include="..\..\..\..\src\ctx.cpp" />
-    <ClCompile Include="..\..\..\..\src\curve_client.cpp" />
-    <ClCompile Include="..\..\..\..\src\curve_mechanism_base.cpp" />
-    <ClCompile Include="..\..\..\..\src\curve_server.cpp" />
-    <ClCompile Include="..\..\..\..\src\dealer.cpp" />
-    <ClCompile Include="..\..\..\..\src\decoder_allocators.cpp" />
-    <ClCompile Include="..\..\..\..\src\devpoll.cpp" />
-    <ClCompile Include="..\..\..\..\src\dgram.cpp" />
-    <ClCompile Include="..\..\..\..\src\dish.cpp" />
-    <ClCompile Include="..\..\..\..\src\dist.cpp" />
-    <ClCompile Include="..\..\..\..\src\epoll.cpp" />
-    <ClCompile Include="..\..\..\..\src\err.cpp" />
-    <ClCompile Include="..\..\..\..\src\fq.cpp" />
-    <ClCompile Include="..\..\..\..\src\gather.cpp" />
-    <ClCompile Include="..\..\..\..\src\gssapi_client.cpp" />
-    <ClCompile Include="..\..\..\..\src\gssapi_mechanism_base.cpp" />
-    <ClCompile Include="..\..\..\..\src\gssapi_server.cpp" />
-    <ClCompile Include="..\..\..\..\src\io_object.cpp" />
-    <ClCompile Include="..\..\..\..\src\io_thread.cpp" />
-    <ClCompile Include="..\..\..\..\src\ip.cpp" />
-    <ClCompile Include="..\..\..\..\src\ip_resolver.cpp" />
-    <ClCompile Include="..\..\..\..\src\ipc_address.cpp" />
-    <ClCompile Include="..\..\..\..\src\ipc_connecter.cpp" />
-    <ClCompile Include="..\..\..\..\src\ipc_listener.cpp" />
-    <ClCompile Include="..\..\..\..\src\kqueue.cpp" />
-    <ClCompile Include="..\..\..\..\src\lb.cpp" />
-    <ClCompile Include="..\..\..\..\src\mailbox.cpp" />
-    <ClCompile Include="..\..\..\..\src\mailbox_safe.cpp" />
-    <ClCompile Include="..\..\..\..\src\mechanism.cpp" />
-    <ClCompile Include="..\..\..\..\src\mechanism_base.cpp" />
-    <ClCompile Include="..\..\..\..\src\metadata.cpp" />
-    <ClCompile Include="..\..\..\..\src\msg.cpp" />
-    <ClCompile Include="..\..\..\..\src\mtrie.cpp" />
-    <ClCompile Include="..\..\..\..\src\null_mechanism.cpp" />
-    <ClCompile Include="..\..\..\..\src\object.cpp" />
-    <ClCompile Include="..\..\..\..\src\options.cpp" />
-    <ClCompile Include="..\..\..\..\src\own.cpp" />
-    <ClCompile Include="..\..\..\..\src\pair.cpp" />
-    <ClCompile Include="..\..\..\..\src\pgm_receiver.cpp" />
-    <ClCompile Include="..\..\..\..\src\pgm_sender.cpp" />
-    <ClCompile Include="..\..\..\..\src\pgm_socket.cpp" />
-    <ClCompile Include="..\..\..\..\src\pipe.cpp" />
-    <ClCompile Include="..\..\..\..\src\plain_client.cpp" />
-    <ClCompile Include="..\..\..\..\src\plain_server.cpp" />
-    <ClCompile Include="..\..\..\..\src\poll.cpp" />
-    <ClCompile Include="..\..\..\..\src\poller_base.cpp" />
-    <ClCompile Include="..\..\..\..\src\precompiled.cpp">
-      <PrecompiledHeader>Create</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\proxy.cpp" />
-    <ClCompile Include="..\..\..\..\src\pub.cpp" />
-    <ClCompile Include="..\..\..\..\src\pull.cpp" />
-    <ClCompile Include="..\..\..\..\src\push.cpp" />
-    <ClCompile Include="..\..\..\..\src\radio.cpp" />
-    <ClCompile Include="..\..\..\..\src\random.cpp" />
-    <ClCompile Include="..\..\..\..\src\raw_decoder.cpp" />
-    <ClCompile Include="..\..\..\..\src\raw_encoder.cpp" />
-    <ClCompile Include="..\..\..\..\src\reaper.cpp" />
-    <ClCompile Include="..\..\..\..\src\rep.cpp" />
-    <ClCompile Include="..\..\..\..\src\req.cpp" />
-    <ClCompile Include="..\..\..\..\src\router.cpp" />
-    <ClCompile Include="..\..\..\..\src\scatter.cpp" />
-    <ClCompile Include="..\..\..\..\src\select.cpp" />
-    <ClCompile Include="..\..\..\..\src\server.cpp" />
-    <ClCompile Include="..\..\..\..\src\session_base.cpp" />
-    <ClCompile Include="..\..\..\..\src\signaler.cpp" />
-    <ClCompile Include="..\..\..\..\src\socket_base.cpp" />
-    <ClCompile Include="..\..\..\..\src\socket_poller.cpp" />
-    <ClCompile Include="..\..\..\..\src\socks.cpp" />
-    <ClCompile Include="..\..\..\..\src\socks_connecter.cpp" />
-    <ClCompile Include="..\..\..\..\src\stream.cpp" />
-    <ClCompile Include="..\..\..\..\src\stream_engine.cpp" />
-    <ClCompile Include="..\..\..\..\src\sub.cpp" />
-    <ClCompile Include="..\..\..\..\src\tcp.cpp" />
-    <ClCompile Include="..\..\..\..\src\tcp_address.cpp" />
-    <ClCompile Include="..\..\..\..\src\tcp_connecter.cpp" />
-    <ClCompile Include="..\..\..\..\src\tcp_listener.cpp" />
-    <ClCompile Include="..\..\..\..\src\thread.cpp" />
-    <ClCompile Include="..\..\..\..\src\timers.cpp" />
-    <ClCompile Include="..\..\..\..\src\trie.cpp" />
-    <ClCompile Include="..\..\..\..\src\tweetnacl.c">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\udp_address.cpp" />
-    <ClCompile Include="..\..\..\..\src\udp_engine.cpp" />
-    <ClCompile Include="..\..\..\..\src\v1_decoder.cpp" />
-    <ClCompile Include="..\..\..\..\src\v1_encoder.cpp" />
-    <ClCompile Include="..\..\..\..\src\v2_decoder.cpp" />
-    <ClCompile Include="..\..\..\..\src\v2_encoder.cpp" />
-    <ClCompile Include="..\..\..\..\src\xpub.cpp" />
-    <ClCompile Include="..\..\..\..\src\xsub.cpp" />
-    <ClCompile Include="..\..\..\..\src\zap_client.cpp" />
-    <ClCompile Include="..\..\..\..\src\zmq.cpp" />
-    <ClCompile Include="..\..\..\..\src\zmq_utils.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\..\..\..\packaging\nuget\package.bat" />
-    <None Include="..\..\..\..\packaging\nuget\package.config" />
-    <None Include="..\..\..\..\packaging\nuget\package.gsl" />
-    <None Include="..\..\..\..\packaging\nuget\package.nuspec" />
-    <None Include="..\..\..\..\packaging\nuget\package.targets" />
-  </ItemGroup>
-  <ItemGroup>
-    <Xml Include="..\..\..\..\packaging\nuget\package.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\..\resource.rc" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2015/libzmq/libzmq.vcxproj.filters b/libs/libzmq/builds/deprecated-msvc/vs2015/libzmq/libzmq.vcxproj.filters
deleted file mode 100644
index 930b009..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2015/libzmq/libzmq.vcxproj.filters
+++ /dev/null
@@ -1,627 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClCompile Include="..\..\..\..\src\address.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\clock.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\ctx.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\dealer.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\devpoll.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\dgram.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\dist.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\epoll.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\err.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\fq.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\io_object.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\io_thread.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\ip.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\ipc_address.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\ipc_connecter.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\ipc_listener.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\kqueue.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\lb.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mailbox.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mechanism.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\metadata.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\msg.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mtrie.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\null_mechanism.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\object.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\options.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\own.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\pair.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\pgm_receiver.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\pgm_sender.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\pgm_socket.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\pipe.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\plain_client.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\plain_server.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\poll.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\poller_base.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\proxy.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\pub.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\pull.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\push.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\random.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\raw_decoder.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\raw_encoder.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\reaper.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\rep.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\req.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\router.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\scatter.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\select.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\session_base.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\signaler.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\socket_base.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\stream.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\stream_engine.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\sub.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\tcp.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\tcp_address.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\tcp_connecter.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\tcp_listener.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\thread.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\trie.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\v1_decoder.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\v1_encoder.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\v2_decoder.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\v2_encoder.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\xpub.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\xsub.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\zmq.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\zmq_utils.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\precompiled.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\curve_client.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\curve_server.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\gather.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\gssapi_mechanism_base.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\gssapi_server.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\gssapi_client.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\socks.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\socks_connecter.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\server.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\client.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mailbox_safe.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\decoder_allocators.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\socket_poller.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\udp_address.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\udp_engine.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\dish.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\radio.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\timers.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\tweetnacl.c">
-      <Filter>src</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\..\include\zmq.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\address.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\array.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\atomic_counter.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\atomic_ptr.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\blob.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\clock.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\command.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\config.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\ctx.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\devpoll.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\dgram.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\dist.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\encoder.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\epoll.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\err.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\fd.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\fq.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\i_engine.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\i_poll_events.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\io_object.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\io_thread.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\ip.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\ipc_address.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\ipc_connecter.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\ipc_listener.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\kqueue.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\lb.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\decoder.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\likely.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mailbox.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\msg.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mtrie.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mutex.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\object.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\options.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\own.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\pair.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\pgm_receiver.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\yqueue.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\ypipe.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\xsub.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\xreq.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\xrep.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\xpub.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\wire.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\windows.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\v1_encoder.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\v1_protocol.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\v1_decoder.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\trie.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\thread.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\tcp_listener.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\tcp_connecter.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\tcp_address.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\tcp.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\sub.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\stream_engine.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\stdint.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\socket_base.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\signaler.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\session_base.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\scatter.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\select.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\req.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\rep.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\reaper.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\raw_encoder.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\raw_decoder.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\random.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\push.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\pull.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\pub.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\proxy.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\precompiled.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\poller_base.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\poller.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\poll.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\platform.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\pipe.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\pgm_socket.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\pgm_sender.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\resource.h">
-      <Filter>resource</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\curve_client.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\curve_server.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\gather.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\gssapi_mechanism_base.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\gssapi_server.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\gssapi_client.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\socks.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\socks_connecter.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\server.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\client.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mailbox_safe.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\condition_variable.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\decoder_allocators.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\udp_address.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\udp_engine.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\dish.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\radio.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\timers.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\tweetnacl.h">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\zmq_draft.h">
-      <Filter>src\include</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="include">
-      <UniqueIdentifier>{f7e88c6c-e408-4631-959c-fe3568656d70}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="src">
-      <UniqueIdentifier>{35f0c644-e1d8-4a46-bb33-06bb8b645fff}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="src\include">
-      <UniqueIdentifier>{90853975-3420-4f06-8be4-4ab3d9792160}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="packaging">
-      <UniqueIdentifier>{f5e26e9d-c33d-45c1-95e4-0732acd28b59}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="resource">
-      <UniqueIdentifier>{e66010e4-a9ea-4e2e-8bc6-12fec14bb009}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\..\..\..\packaging\nuget\package.bat">
-      <Filter>packaging</Filter>
-    </None>
-    <None Include="..\..\..\..\packaging\nuget\package.config">
-      <Filter>packaging</Filter>
-    </None>
-    <None Include="..\..\..\..\packaging\nuget\package.gsl">
-      <Filter>packaging</Filter>
-    </None>
-    <None Include="..\..\..\..\packaging\nuget\package.targets">
-      <Filter>packaging</Filter>
-    </None>
-    <None Include="..\..\..\..\packaging\nuget\package.nuspec">
-      <Filter>packaging</Filter>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <Xml Include="..\..\..\..\packaging\nuget\package.xml">
-      <Filter>packaging</Filter>
-    </Xml>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\..\resource.rc">
-      <Filter>resource</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2015/libzmq/libzmq.xml b/libs/libzmq/builds/deprecated-msvc/vs2015/libzmq/libzmq.xml
deleted file mode 100644
index db7dfe0..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2015/libzmq/libzmq.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ProjectSchemaDefinitions xmlns="clr-namespace:Microsoft.Build.Framework.XamlTypes;assembly=Microsoft.Build.Framework">
-  <Rule Name="libzmq-uiextension" PageTemplate="tool" DisplayName="ZMQ Options" SwitchPrefix="/" Order="1">
-    <Rule.Categories>
-      <Category Name="tweet" DisplayName="tweet" />
-      <Category Name="sodium" DisplayName="sodium" />
-      <Category Name="openpgm" DisplayName="openpgm" />
-      <Category Name="gssapi" DisplayName="gssapi" />
-      <Category Name="draftapi" DisplayName="draftapi" />
-      <Category Name="usepoll" DisplayName="usepoll" />
-    </Rule.Categories>
-    <Rule.DataSource>
-      <DataSource Persistence="ProjectFile" ItemType="" />
-    </Rule.DataSource>
-    <EnumProperty Name="Option-tweet" DisplayName="Enable Tweet NaCl" Description="Enable Tweet NaCl build option (overrides Sodium)" Category="tweet">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-    <EnumProperty Name="Option-sodium" DisplayName="Enable Sodium" Description="Enable Sodium build option" Category="sodium">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-    <EnumProperty Name="Option-openpgm" DisplayName="Enable OpenPGM" Description="Enable OpenPGM build option" Category="openpgm">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-    <EnumProperty Name="Option-gssapi" DisplayName="Enable GSS API" Description="Enable GSS API build option" Category="gssapi">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-    <EnumProperty Name="Option-draftapi" DisplayName="Enable Draft API" Description="Enable Draft API build option" Category="draftapi">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-    <EnumProperty Name="Option-usepoll" DisplayName="Enable poll() usage (Vista+ only)" Description="Use poll() instead of select() for waiting on incoming data. Increases performance, but the binary will only run on Windows Vista or later." Category="usepoll">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-  </Rule>
-</ProjectSchemaDefinitions>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2015/local_lat/local_lat.props b/libs/libzmq/builds/deprecated-msvc/vs2015/local_lat/local_lat.props
deleted file mode 100644
index ea5e3e5..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2015/local_lat/local_lat.props
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>ZeroMQ local_lat Common Settings</_PropertySheetDisplayName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-  </PropertyGroup>
-
-  <!-- Configuration -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <!-- Dependencies -->
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="..\libzmq.import.props" />
-    <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props"
-            Condition="Exists('$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props')" /> 
-  </ImportGroup>
-
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
-    <Linkage-libzmq>dynamic</Linkage-libzmq>
-    <!--<Linkage-libsodium>dynamic</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
-    <Linkage-libzmq>ltcg</Linkage-libzmq>
-    <!--<Linkage-libsodium>ltcg</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
-    <Linkage-libzmq>static</Linkage-libzmq>
-    <!--<Linkage-libsodium>static</Linkage-libsodium>-->
-  </PropertyGroup>
-
-  <!-- Messages -->
-
-  <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Linkage-libzmq    : $(Linkage-libzmq)" Importance="high"/>
-    <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high" Condition="'$(HAVE_LIBSODIUM)'=='1'"/>
-  </Target>
-
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2015/local_lat/local_lat.vcxproj b/libs/libzmq/builds/deprecated-msvc/vs2015/local_lat/local_lat.vcxproj
deleted file mode 100644
index 4f905e6..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2015/local_lat/local_lat.vcxproj
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}</ProjectGuid>
-    <ProjectName>local_lat</ProjectName>
-    <PlatformToolset>v140</PlatformToolset>
-    <ConfigurationType>Application</ConfigurationType>
-  </PropertyGroup>
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DebugDEXE|Win32">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|Win32">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugDEXE|x64">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|x64">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|Win32">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|Win32">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|x64">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|x64">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|Win32">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|Win32">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|x64">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|x64">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
-    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-  </ImportGroup>
-  <PropertyGroup>
-    <Option-tweet>true</Option-tweet>
-  </PropertyGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\platform.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\..\perf\local_lat.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ItemGroup>
-    <ProjectReference Include="..\libzmq\libzmq.vcxproj">
-      <Project>{641c5f36-32ee-4323-b740-992b651cf9d6}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2015/local_thr/local_thr.props b/libs/libzmq/builds/deprecated-msvc/vs2015/local_thr/local_thr.props
deleted file mode 100644
index 1d017d4..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2015/local_thr/local_thr.props
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>ZeroMQ local_thr Common Settings</_PropertySheetDisplayName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-  </PropertyGroup>
-
-  <!-- Configuration -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <!-- Dependencies -->
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="..\libzmq.import.props" />
-    <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props"
-            Condition="Exists('$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props')" /> 
-  </ImportGroup>
-
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
-    <Linkage-libzmq>dynamic</Linkage-libzmq>
-    <!--<Linkage-libsodium>dynamic</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
-    <Linkage-libzmq>ltcg</Linkage-libzmq>
-    <!--<Linkage-libsodium>ltcg</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
-    <Linkage-libzmq>static</Linkage-libzmq>
-    <!--<Linkage-libsodium>static</Linkage-libsodium>-->
-  </PropertyGroup>
-
-  <!-- Messages -->
-
-  <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Linkage-libzmq    : $(Linkage-libzmq)" Importance="high"/>
-    <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high" Condition="'$(HAVE_LIBSODIUM)'=='1'"/>
-  </Target>
-
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2015/local_thr/local_thr.vcxproj b/libs/libzmq/builds/deprecated-msvc/vs2015/local_thr/local_thr.vcxproj
deleted file mode 100644
index 79be83b..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2015/local_thr/local_thr.vcxproj
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{8EF2DF6B-6646-460F-8032-913B70FE0E94}</ProjectGuid>
-    <ProjectName>local_thr</ProjectName>
-    <PlatformToolset>v140</PlatformToolset>
-    <ConfigurationType>Application</ConfigurationType>
-  </PropertyGroup>
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DebugDEXE|Win32">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|Win32">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugDEXE|x64">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|x64">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|Win32">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|Win32">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|x64">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|x64">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|Win32">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|Win32">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|x64">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|x64">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
-    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-  </ImportGroup>
-  <PropertyGroup>
-    <Option-tweet>true</Option-tweet>
-  </PropertyGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\platform.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\..\perf\local_thr.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ItemGroup>
-    <ProjectReference Include="..\libzmq\libzmq.vcxproj">
-      <Project>{641c5f36-32ee-4323-b740-992b651cf9d6}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2015/remote_lat/remote_lat.props b/libs/libzmq/builds/deprecated-msvc/vs2015/remote_lat/remote_lat.props
deleted file mode 100644
index 307eaf5..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2015/remote_lat/remote_lat.props
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>ZeroMQ remote_lat Common Settings</_PropertySheetDisplayName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-  </PropertyGroup>
-
-  <!-- Configuration -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <!-- Dependencies -->
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="..\libzmq.import.props" />
-    <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props"
-            Condition="Exists('$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props')" /> 
-  </ImportGroup>
-
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
-    <Linkage-libzmq>dynamic</Linkage-libzmq>
-    <!--<Linkage-libsodium>dynamic</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
-    <Linkage-libzmq>ltcg</Linkage-libzmq>
-    <!--<Linkage-libsodium>ltcg</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
-    <Linkage-libzmq>static</Linkage-libzmq>
-    <!--<Linkage-libsodium>static</Linkage-libsodium>-->
-  </PropertyGroup>
-
-  <!-- Messages -->
-
-  <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Linkage-libzmq    : $(Linkage-libzmq)" Importance="high"/>
-    <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high" Condition="'$(HAVE_LIBSODIUM)'=='1'"/>
-  </Target>
-
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2015/remote_lat/remote_lat.vcxproj b/libs/libzmq/builds/deprecated-msvc/vs2015/remote_lat/remote_lat.vcxproj
deleted file mode 100644
index 98faec5..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2015/remote_lat/remote_lat.vcxproj
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}</ProjectGuid>
-    <ProjectName>remote_lat</ProjectName>
-    <PlatformToolset>v140</PlatformToolset>
-    <ConfigurationType>Application</ConfigurationType>
-  </PropertyGroup>
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DebugDEXE|Win32">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|Win32">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugDEXE|x64">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|x64">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|Win32">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|Win32">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|x64">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|x64">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|Win32">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|Win32">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|x64">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|x64">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
-    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-  </ImportGroup>
-  <PropertyGroup>
-    <Option-tweet>true</Option-tweet>
-  </PropertyGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\platform.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\..\perf\remote_lat.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ItemGroup>
-    <ProjectReference Include="..\libzmq\libzmq.vcxproj">
-      <Project>{641c5f36-32ee-4323-b740-992b651cf9d6}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2015/remote_thr/remote_thr.props b/libs/libzmq/builds/deprecated-msvc/vs2015/remote_thr/remote_thr.props
deleted file mode 100644
index 001e481..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2015/remote_thr/remote_thr.props
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>ZeroMQ remote_thr Common Settings</_PropertySheetDisplayName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-  </PropertyGroup>
-
-  <!-- Configuration -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <!-- Dependencies -->
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="..\libzmq.import.props" />
-    <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props"
-            Condition="Exists('$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props')" /> 
-  </ImportGroup>
-  
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
-    <Linkage-libzmq>dynamic</Linkage-libzmq>
-    <!--<Linkage-libsodium>dynamic</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
-    <Linkage-libzmq>ltcg</Linkage-libzmq>
-    <!--<Linkage-libsodium>ltcg</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
-    <Linkage-libzmq>static</Linkage-libzmq>
-    <!--<Linkage-libsodium>static</Linkage-libsodium>-->
-  </PropertyGroup>
-
-  <!-- Messages -->
-
-  <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Linkage-libzmq    : $(Linkage-libzmq)" Importance="high"/>
-    <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high" Condition="'$(HAVE_LIBSODIUM)'=='1'"/>
-  </Target>
-
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2015/remote_thr/remote_thr.vcxproj b/libs/libzmq/builds/deprecated-msvc/vs2015/remote_thr/remote_thr.vcxproj
deleted file mode 100644
index d803d15..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2015/remote_thr/remote_thr.vcxproj
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{B15E059C-0CBB-4A82-8C42-6567FB650802}</ProjectGuid>
-    <ProjectName>remote_thr</ProjectName>
-    <PlatformToolset>v140</PlatformToolset>
-    <ConfigurationType>Application</ConfigurationType>
-  </PropertyGroup>
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DebugDEXE|Win32">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|Win32">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugDEXE|x64">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|x64">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|Win32">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|Win32">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|x64">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|x64">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|Win32">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|Win32">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|x64">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|x64">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
-    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-  </ImportGroup>
-  <PropertyGroup>
-    <Option-tweet>true</Option-tweet>
-  </PropertyGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\platform.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\..\perf\remote_thr.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ItemGroup>
-    <ProjectReference Include="..\libzmq\libzmq.vcxproj">
-      <Project>{641c5f36-32ee-4323-b740-992b651cf9d6}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2015_xp/libzmq.vcxproj b/libs/libzmq/builds/deprecated-msvc/vs2015_xp/libzmq.vcxproj
deleted file mode 100644
index 69623b5..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2015_xp/libzmq.vcxproj
+++ /dev/null
@@ -1,258 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{217AD6A0-8CEA-428D-908F-C34B23CECAAF}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>libzmq</RootNamespace>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140_xp</PlatformToolset>
-    <CharacterSet>NotSet</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140_xp</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>NotSet</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-    <OutDir>$(ProjectDir)..\..\..\bin\$(PlatformName)\$(Configuration)\$(PlatformToolset)\$(DefaultLinkage)\</OutDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <OutDir>$(ProjectDir)..\..\..\bin\$(PlatformName)\$(Configuration)\$(PlatformToolset)\$(DefaultLinkage)\</OutDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;DLL_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(SolutionDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;LIBZMQ_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;DLL_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <AdditionalIncludeDirectories>$(SolutionDir)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;LIBZMQ_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\src\address.cpp" />
-    <ClCompile Include="..\..\..\src\client.cpp" />
-    <ClCompile Include="..\..\..\src\clock.cpp" />
-    <ClCompile Include="..\..\..\src\ctx.cpp" />
-    <ClCompile Include="..\..\..\src\curve_client.cpp" />
-    <ClCompile Include="..\..\..\src\curve_mechanism_base.cpp" />
-    <ClCompile Include="..\..\..\src\curve_server.cpp" />
-    <ClCompile Include="..\..\..\src\dealer.cpp" />
-    <ClCompile Include="..\..\..\src\decoder_allocators.cpp" />
-    <ClCompile Include="..\..\..\src\devpoll.cpp" />
-    <ClCompile Include="..\..\..\src\dgram.cpp" />
-    <ClCompile Include="..\..\..\src\dish.cpp" />
-    <ClCompile Include="..\..\..\src\dist.cpp" />
-    <ClCompile Include="..\..\..\src\epoll.cpp" />
-    <ClCompile Include="..\..\..\src\err.cpp" />
-    <ClCompile Include="..\..\..\src\fq.cpp" />
-    <ClCompile Include="..\..\..\src\gather.cpp" />
-    <ClCompile Include="..\..\..\src\gssapi_client.cpp" />
-    <ClCompile Include="..\..\..\src\gssapi_mechanism_base.cpp" />
-    <ClCompile Include="..\..\..\src\gssapi_server.cpp" />
-    <ClCompile Include="..\..\..\src\io_object.cpp" />
-    <ClCompile Include="..\..\..\src\io_thread.cpp" />
-    <ClCompile Include="..\..\..\src\ip.cpp" />
-    <ClCompile Include="..\..\..\src\ipc_address.cpp" />
-    <ClCompile Include="..\..\..\src\ipc_connecter.cpp" />
-    <ClCompile Include="..\..\..\src\ipc_listener.cpp" />
-    <ClCompile Include="..\..\..\src\kqueue.cpp" />
-    <ClCompile Include="..\..\..\src\lb.cpp" />
-    <ClCompile Include="..\..\..\src\mailbox.cpp" />
-    <ClCompile Include="..\..\..\src\mailbox_safe.cpp" />
-    <ClCompile Include="..\..\..\src\mechanism.cpp" />
-    <ClCompile Include="..\..\..\src\mechanism_base.cpp" />
-    <ClCompile Include="..\..\..\src\metadata.cpp" />
-    <ClCompile Include="..\..\..\src\msg.cpp" />
-    <ClCompile Include="..\..\..\src\mtrie.cpp" />
-    <ClCompile Include="..\..\..\src\norm_engine.cpp" />
-    <ClCompile Include="..\..\..\src\null_mechanism.cpp" />
-    <ClCompile Include="..\..\..\src\object.cpp" />
-    <ClCompile Include="..\..\..\src\options.cpp" />
-    <ClCompile Include="..\..\..\src\own.cpp" />
-    <ClCompile Include="..\..\..\src\pair.cpp" />
-    <ClCompile Include="..\..\..\src\pgm_receiver.cpp" />
-    <ClCompile Include="..\..\..\src\pgm_sender.cpp" />
-    <ClCompile Include="..\..\..\src\pgm_socket.cpp" />
-    <ClCompile Include="..\..\..\src\pipe.cpp" />
-    <ClCompile Include="..\..\..\src\plain_client.cpp" />
-    <ClCompile Include="..\..\..\src\plain_server.cpp" />
-    <ClCompile Include="..\..\..\src\poll.cpp" />
-    <ClCompile Include="..\..\..\src\poller_base.cpp" />
-    <ClCompile Include="..\..\..\src\pollset.cpp" />
-    <ClCompile Include="..\..\..\src\precompiled.cpp" />
-    <ClCompile Include="..\..\..\src\proxy.cpp" />
-    <ClCompile Include="..\..\..\src\pub.cpp" />
-    <ClCompile Include="..\..\..\src\pull.cpp" />
-    <ClCompile Include="..\..\..\src\push.cpp" />
-    <ClCompile Include="..\..\..\src\radio.cpp" />
-    <ClCompile Include="..\..\..\src\random.cpp" />
-    <ClCompile Include="..\..\..\src\raw_decoder.cpp" />
-    <ClCompile Include="..\..\..\src\raw_encoder.cpp" />
-    <ClCompile Include="..\..\..\src\reaper.cpp" />
-    <ClCompile Include="..\..\..\src\rep.cpp" />
-    <ClCompile Include="..\..\..\src\req.cpp" />
-    <ClCompile Include="..\..\..\src\router.cpp" />
-    <ClCompile Include="..\..\..\src\scatter.cpp" />
-    <ClCompile Include="..\..\..\src\select.cpp" />
-    <ClCompile Include="..\..\..\src\server.cpp" />
-    <ClCompile Include="..\..\..\src\session_base.cpp" />
-    <ClCompile Include="..\..\..\src\signaler.cpp" />
-    <ClCompile Include="..\..\..\src\socket_base.cpp" />
-    <ClCompile Include="..\..\..\src\socket_poller.cpp" />
-    <ClCompile Include="..\..\..\src\socks.cpp" />
-    <ClCompile Include="..\..\..\src\socks_connecter.cpp" />
-    <ClCompile Include="..\..\..\src\stream.cpp" />
-    <ClCompile Include="..\..\..\src\stream_engine.cpp" />
-    <ClCompile Include="..\..\..\src\sub.cpp" />
-    <ClCompile Include="..\..\..\src\tcp.cpp" />
-    <ClCompile Include="..\..\..\src\tcp_address.cpp" />
-    <ClCompile Include="..\..\..\src\tcp_connecter.cpp" />
-    <ClCompile Include="..\..\..\src\tcp_listener.cpp" />
-    <ClCompile Include="..\..\..\src\thread.cpp" />
-    <ClCompile Include="..\..\..\src\timers.cpp" />
-    <ClCompile Include="..\..\..\src\tipc_address.cpp" />
-    <ClCompile Include="..\..\..\src\tipc_connecter.cpp" />
-    <ClCompile Include="..\..\..\src\tipc_listener.cpp" />
-    <ClCompile Include="..\..\..\src\trie.cpp" />
-    <ClCompile Include="..\..\..\src\udp_address.cpp" />
-    <ClCompile Include="..\..\..\src\udp_engine.cpp" />
-    <ClCompile Include="..\..\..\src\v1_decoder.cpp" />
-    <ClCompile Include="..\..\..\src\v1_encoder.cpp" />
-    <ClCompile Include="..\..\..\src\v2_decoder.cpp" />
-    <ClCompile Include="..\..\..\src\v2_encoder.cpp" />
-    <ClCompile Include="..\..\..\src\vmci.cpp" />
-    <ClCompile Include="..\..\..\src\vmci_address.cpp" />
-    <ClCompile Include="..\..\..\src\vmci_connecter.cpp" />
-    <ClCompile Include="..\..\..\src\vmci_listener.cpp" />
-    <ClCompile Include="..\..\..\src\xpub.cpp" />
-    <ClCompile Include="..\..\..\src\xsub.cpp" />
-    <ClCompile Include="..\..\..\src\zap_client.cpp" />
-    <ClCompile Include="..\..\..\src\zmq.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\src\condition_variable.hpp" />
-    <ClInclude Include="..\..\..\src\mutex.hpp" />
-    <ClInclude Include="platform.hpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2015_xp/platform.hpp b/libs/libzmq/builds/deprecated-msvc/vs2015_xp/platform.hpp
deleted file mode 100644
index 1694bc1..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2015_xp/platform.hpp
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef __PLATFORM_HPP_INCLUDED__
-#define __PLATFORM_HPP_INCLUDED__
-
-#define ZMQ_HAVE_WINDOWS
-#define ZMQ_HAVE_WINDOWS_TARGET_XP
-
-#define ZMQ_BUILD_DRAFT_API
-
-#define ZMQ_USE_SELECT
-#define FD_SETSIZE 1024
-
-#pragma comment(lib,"ws2_32.lib")
-#pragma comment(lib,"Iphlpapi.lib")
-
-#endif
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2015_xp/test_zmq/test_multithread.cpp b/libs/libzmq/builds/deprecated-msvc/vs2015_xp/test_zmq/test_multithread.cpp
deleted file mode 100644
index d71f36c..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2015_xp/test_zmq/test_multithread.cpp
+++ /dev/null
@@ -1,229 +0,0 @@
-/*
-Server thread listen ZMQ_SERVER socket and transfer incoming message 
-to worker threads by ZMQ_PUSH-ZMQ_PULL
-Worker thread receive message and send back to ZMQ_SERVER socket
-
-Each client thread open CLIENT_CONNECTION ZMQ_CLIENT sockets, 
-send random size message to each socket and check server answer
-*/
-
-#define ZMQ_BUILD_DRAFT_API
-#include "../../../../include/zmq.h"
-
-#pragma comment(lib,"libzmq.lib")
-
-#include <assert.h>
-#include <stdlib.h>
-#include <thread>
-#include <atomic>
-
-#define SERVER_ADDR "tcp://127.0.0.1:12345"
-#define SERVER_WORKER_COUNT 3	// worker threads count
-
-#define CLIENT_COUNT 5			// client threads count
-#define CLIENT_CONNECTION 100	// ZMQ_CLIENT sockets at each client
-#define CLIENT_RECONNECT 1000	// reconnect one socket after messages
-
-#define MESSAGE_MAX_SIZE 1024
-
-//*******************************************************************
-//****** MESSAGE ****************************************************
-//*******************************************************************
-
-void message_fill(zmq_msg_t* msg, int val) {
-	assert(val > 0);
-	int size = sizeof(int) * 2 + val;
-	int rc = zmq_msg_init_size(msg, size); assert(rc == 0);
-	uint8_t* data = (uint8_t*)zmq_msg_data(msg);
-	memcpy(data, &val, sizeof(int));
-	data += sizeof(int);
-	memset(data, val & 0xFF, val);
-	int check_sum = val + (val & 0xFF) * val;
-	data += val;
-	memcpy(data, &check_sum, sizeof(int));
-}
-
-int message_check(zmq_msg_t* msg) {
-	uint8_t* data = (uint8_t*)zmq_msg_data(msg);
-	int size = zmq_msg_size(msg);
-	assert(size > sizeof(int) * 2);
-	// check size
-	int val;
-	memcpy(&val, data, sizeof(int));
-	if(size != sizeof(int) * 2 + val) { 
-		fprintf(stderr, "wrong message: val = %d size = %d\n", val, size);
-		return -1;
-	}
-	// check sum
-	data += sizeof(int);
-	int cs = val;
-	for(int i = 0; i < val; i++) {
-		cs += data[i];
-	}
-	data += val;
-	int check_sum;
-	memcpy(&check_sum, data, sizeof(int));
-	if(check_sum != cs) {
-		fprintf(stderr, "wrong message: cs = %d check_sum = %d\n", cs, check_sum);
-		return -1;
-	}
-	return val;
-}
-
-//*******************************************************************
-//****** SERVER *****************************************************
-//*******************************************************************
-
-void *server_ctx = NULL;
-void *server_sock = NULL;
-
-std::atomic<int> worker_cnt[SERVER_WORKER_COUNT] = {0}; // statistic
-
-// worker thread
-void worker(int num) {
-	printf("worker %d start\n", num);
-	void* queue = zmq_socket(server_ctx, ZMQ_PULL); assert(queue);
-	int rc = zmq_connect(queue, "inproc://queue"); assert(rc == 0);
-
-	while (1) {
-		// receive messages from the queue
-		zmq_msg_t msg;
-		rc = zmq_msg_init(&msg); assert(rc == 0);
-		rc = zmq_msg_recv(&msg, queue, 0); assert(rc > 0);
-		// check message
-		//printf("worker %d recv %d bytes at %X from %X\n", num, zmq_msg_size(&msg), zmq_msg_data(&msg), zmq_msg_routing_id(&msg));
-		// send to client
-		rc = zmq_msg_send(&msg, server_sock, 0); assert(rc != -1);
-		worker_cnt[num]++;
-	}
-	zmq_close(queue);
-}
-
-// server thread
-void server() {
-	server_ctx = zmq_ctx_new(); assert(server_ctx);
-	// create queue
-	void* queue = zmq_socket(server_ctx, ZMQ_PUSH);	assert(queue);
-	int rc = zmq_bind(queue, "inproc://queue"); assert(rc == 0);
-	// start workers
-	std::thread w[SERVER_WORKER_COUNT];
-	for (int i = 0; i < SERVER_WORKER_COUNT; i++) w[i] = std::thread(worker, i);
-	// ZMQ_SERVER for client messages
-	server_sock = zmq_socket(server_ctx, ZMQ_SERVER); assert(server_sock);
-	rc = zmq_bind(server_sock, SERVER_ADDR); assert(rc == 0);
-
-	while (1) {
-		// wait client message
-		zmq_msg_t msg;
-		rc = zmq_msg_init(&msg); assert(rc == 0); 
-		rc = zmq_msg_recv(&msg, server_sock, 0); assert(rc > 0);
-		//printf("recv %d bytes at %X from %X\n", zmq_msg_size(&msg), zmq_msg_data(&msg), zmq_msg_routing_id(&msg));
-		// send message to queue
-		rc = zmq_msg_send(&msg, queue, 0); assert(rc > 0);
-	}
-}
-
-//*******************************************************************
-//****** CLIENT *****************************************************
-//*******************************************************************
-
-std::atomic<int> client_cnt[CLIENT_COUNT] = { 0 }; // statistic
-std::atomic<int> client_ready = 0; 
-
-// client thread
-void client(int num)
-{
-	//printf("client %d start. Open %d connections\n", num, CLIENT_CONNECTION);
-
-	void *ctx = zmq_ctx_new(); assert(ctx);
-
-	void *sock[CLIENT_CONNECTION];
-	int rc;
-	// open ZMQ_CLIENT connections
-	for (int i = 0; i < CLIENT_CONNECTION; i++) {
-		sock[i] = zmq_socket(ctx, ZMQ_CLIENT); assert(sock[i]);
-		rc = zmq_connect(sock[i], SERVER_ADDR); assert(rc == 0);
-		// test connection
-		zmq_msg_t msg;
-		int v = rand() % 256 + 1;
-		message_fill(&msg, v);
-		rc = zmq_msg_send(&msg, sock[i], 0); assert(rc > 0);
-		rc = zmq_msg_init(&msg); assert(rc == 0);
-		rc = zmq_msg_recv(&msg, sock[i], 0); assert(rc > 0);
-		rc = message_check(&msg); assert(rc == v);
-		zmq_msg_close(&msg);
-	}
-	printf("client %d open %d connections\n", num, CLIENT_CONNECTION);
-	client_ready++;
-	while (client_ready < CLIENT_COUNT) Sleep(10); // wait while all clients open sockets
-
-	int reconnect = 0;
-	while(1) {
-		int val[CLIENT_CONNECTION];
-		zmq_msg_t msg;
-		// send messages
-		for(int i = 0; i < CLIENT_CONNECTION; i++) {
-			val[i] = rand() % MESSAGE_MAX_SIZE + 1;
-			message_fill(&msg, val[i]);
-			rc = zmq_msg_send(&msg, sock[i], 0); assert(rc > 0);
-		}
-		// recv and check
-		for (int i = 0; i < CLIENT_CONNECTION; i++) {
-			rc = zmq_msg_init(&msg); assert(rc == 0);
-			rc = zmq_msg_recv(&msg, sock[i], 0); assert(rc > 0);
-			rc = message_check(&msg);
-			if(rc != val[i] && rc > 0) {
-				fprintf(stderr, "wrong message: send %d recv %d     \n", val[i], rc);
-			}
-			zmq_msg_close(&msg);
-			client_cnt[num]++;
-		}
-		// reconnect one
-		reconnect++;
-		if(reconnect == CLIENT_RECONNECT) {
-			int n = rand() % CLIENT_CONNECTION;
-			zmq_close(sock[n]);
-			sock[n] = zmq_socket(ctx, ZMQ_CLIENT); assert(sock[n]);
-			int rc = zmq_connect(sock[n], SERVER_ADDR); assert(rc == 0);
-		}
-	}
-}
-
-//*******************************************************************
-int main (void) {
-	int v1, v2, v3; zmq_version(&v1, &v2, &v3);
-	printf("ZMQ version %d.%d.%d. Compile %s %s\n", v1, v2, v3, __DATE__, __TIME__);
-
-	std::thread ct[CLIENT_COUNT];
-	for (int i = 0; i < CLIENT_COUNT; i++) ct[i] = std::thread(client, i);
-
-	std::thread st(server);
-
-	int w[SERVER_WORKER_COUNT] = { 0 };
-	int c[CLIENT_COUNT] = { 0 };
-	int total = 0;
-
-	while(1) {
-		Sleep(1000);
-		if (client_ready < CLIENT_COUNT) continue;
-		// check workers
-		for(int i = 0; i < SERVER_WORKER_COUNT; i++) {
-			if(w[i] == worker_cnt[i]) {
-				fprintf(stderr, "worker %d not work        \n", i);
-			}
-			w[i] = worker_cnt[i];
-		}
-		// check clients
-		int t = 0;
-		for (int i = 0; i < CLIENT_COUNT; i++) {
-			if (c[i] == client_cnt[i]) {
-				fprintf(stderr, "client %d not work        \n", i);
-			}
-			c[i] = client_cnt[i];
-			t += c[i];
-		}
-		printf("\rTotal %d messages. Speed %d per second  ", t, t - total);
-		total = t;
-	}
-	return 0;
-}
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2015_xp/test_zmq/test_zmq.vcxproj b/libs/libzmq/builds/deprecated-msvc/vs2015_xp/test_zmq/test_zmq.vcxproj
deleted file mode 100644
index 32a4599..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2015_xp/test_zmq/test_zmq.vcxproj
+++ /dev/null
@@ -1,155 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{101324AB-CF3E-4D99-8B69-2000CEA487B6}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>test_zmq</RootNamespace>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140_xp</PlatformToolset>
-    <CharacterSet>NotSet</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140_xp</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>NotSet</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-    <OutDir>$(ProjectDir)..\..\..\..\bin\$(PlatformName)\$(Configuration)\$(PlatformToolset)\$(DefaultLinkage)\</OutDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <OutDir>$(ProjectDir)..\..\..\..\bin\$(PlatformName)\$(Configuration)\$(PlatformToolset)\$(DefaultLinkage)\</OutDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalLibraryDirectories>$(ProjectDir)..\..\..\..\bin\$(PlatformName)\$(Configuration)\$(PlatformToolset)\$(DefaultLinkage)\</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalLibraryDirectories>$(ProjectDir)..\..\..\..\bin\$(PlatformName)\$(Configuration)\$(PlatformToolset)\$(DefaultLinkage)\</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="test_multithread.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2017/inproc_lat/inproc_lat.props b/libs/libzmq/builds/deprecated-msvc/vs2017/inproc_lat/inproc_lat.props
deleted file mode 100644
index fc03c8b..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2017/inproc_lat/inproc_lat.props
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>ZeroMQ inproc_lat Common Settings</_PropertySheetDisplayName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-  </PropertyGroup>
-
-  <!-- Configuration -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <!-- Dependencies -->
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="..\libzmq.import.props" />
-    <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props"
-            Condition="Exists('$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props')" /> 
-  </ImportGroup>
-
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
-    <Linkage-libzmq>dynamic</Linkage-libzmq>
-    <!--<Linkage-libsodium>dynamic</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
-    <Linkage-libzmq>ltcg</Linkage-libzmq>
-    <!--<Linkage-libsodium>ltcg</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
-    <Linkage-libzmq>static</Linkage-libzmq>
-    <!--<Linkage-libsodium>static</Linkage-libsodium>-->
-  </PropertyGroup>
-
-  <!-- Messages -->
-
-  <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Linkage-libzmq    : $(Linkage-libzmq)" Importance="high"/>
-    <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high"  Condition="'$(HAVE_LIBSODIUM)'=='1'"/>
-  </Target>
-
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2017/inproc_lat/inproc_lat.vcxproj b/libs/libzmq/builds/deprecated-msvc/vs2017/inproc_lat/inproc_lat.vcxproj
deleted file mode 100644
index fd01a39..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2017/inproc_lat/inproc_lat.vcxproj
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}</ProjectGuid>
-    <ProjectName>inproc_lat</ProjectName>
-    <PlatformToolset>v141</PlatformToolset>
-    <ConfigurationType>Application</ConfigurationType>
-  </PropertyGroup>
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DebugDEXE|Win32">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|Win32">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugDEXE|x64">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|x64">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|Win32">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|Win32">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|x64">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|x64">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|Win32">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|Win32">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|x64">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|x64">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
-    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-  </ImportGroup>
-  <PropertyGroup>
-    <Option-tweet>true</Option-tweet>
-  </PropertyGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\platform.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\..\perf\inproc_lat.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ItemGroup>
-    <ProjectReference Include="..\libzmq\libzmq.vcxproj">
-      <Project>{641c5f36-32ee-4323-b740-992b651cf9d6}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2017/inproc_thr/inproc_thr.props b/libs/libzmq/builds/deprecated-msvc/vs2017/inproc_thr/inproc_thr.props
deleted file mode 100644
index aba5058..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2017/inproc_thr/inproc_thr.props
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>ZeroMQ inproc_thr Common Settings</_PropertySheetDisplayName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-  </PropertyGroup>
-
-  <!-- Configuration -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <!-- Dependencies -->
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="..\libzmq.import.props" />
-    <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props"
-            Condition="Exists('$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props')" /> 
-  </ImportGroup>
-
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
-    <Linkage-libzmq>dynamic</Linkage-libzmq>
-    <!--<Linkage-libsodium>dynamic</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
-    <Linkage-libzmq>ltcg</Linkage-libzmq>
-    <!--<Linkage-libsodium>ltcg</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
-    <Linkage-libzmq>static</Linkage-libzmq>
-    <!--<Linkage-libsodium>static</Linkage-libsodium>-->
-  </PropertyGroup>
-
-  <!-- Messages -->
-
-  <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Linkage-libzmq    : $(Linkage-libzmq)" Importance="high"/>
-    <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high" Condition="'$(HAVE_LIBSODIUM)'=='1'"/>
-  </Target>
-
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2017/inproc_thr/inproc_thr.vcxproj b/libs/libzmq/builds/deprecated-msvc/vs2017/inproc_thr/inproc_thr.vcxproj
deleted file mode 100644
index 5aedaf6..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2017/inproc_thr/inproc_thr.vcxproj
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{1077E977-95DD-4E73-A692-74647DD0CC1E}</ProjectGuid>
-    <ProjectName>inproc_thr</ProjectName>
-    <PlatformToolset>v141</PlatformToolset>
-    <ConfigurationType>Application</ConfigurationType>
-  </PropertyGroup>
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DebugDEXE|Win32">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|Win32">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugDEXE|x64">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|x64">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|Win32">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|Win32">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|x64">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|x64">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|Win32">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|Win32">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|x64">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|x64">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
-    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-  </ImportGroup>
-  <PropertyGroup>
-    <Option-tweet>true</Option-tweet>
-  </PropertyGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\platform.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\..\perf\inproc_thr.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ItemGroup>
-    <ProjectReference Include="..\libzmq\libzmq.vcxproj">
-      <Project>{641c5f36-32ee-4323-b740-992b651cf9d6}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2017/libsodium.import.props b/libs/libzmq/builds/deprecated-msvc/vs2017/libsodium.import.props
deleted file mode 100644
index b3d7e4f..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2017/libsodium.import.props
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup Label="Globals">
-    <_PropertySheetDisplayName>Libsodium Import Settings</_PropertySheetDisplayName>
-  </PropertyGroup>
-
-  <!-- User Interface -->
-
-  <ItemGroup Label="BuildOptionsExtension">
-    <PropertyPageSchema Include="$(MSBuildThisFileDirectory)libsodium.import.xml" />
-  </ItemGroup>
-
-  <!-- Linkage -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\..\libsodium\src\libsodium\include;$(ProjectDir)..\..\..\..\..\libsodium\src\libsodium\include\sodium\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Linkage-libsodium)' == 'static' Or '$(Linkage-libsodium)' == 'ltcg'">SODIUM_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies Condition="'$(Linkage-libsodium)' != ''">advapi32.lib;libsodium.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Debug')) != -1">$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\$(PlatformToolset)\$(Linkage-libsodium)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Release')) != -1">$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Release\$(PlatformToolset)\$(Linkage-libsodium)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <!-- Copy -->
-
-  <Target Name="Linkage-libsodium-dynamic" AfterTargets="AfterBuild" Condition="'$(Linkage-libsodium)' == 'dynamic'">
-    <Copy Condition="$(Configuration.IndexOf('Debug')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\$(PlatformToolset)\dynamic\libsodium.dll"
-          DestinationFiles="$(TargetDir)libsodium.dll"
-          SkipUnchangedFiles="true" />
-    <Copy Condition="$(Configuration.IndexOf('Debug')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\$(PlatformToolset)\dynamic\libsodium.pdb"
-          DestinationFiles="$(TargetDir)libsodium.pdb"
-          SkipUnchangedFiles="true" />
-    <Copy Condition="$(Configuration.IndexOf('Release')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Release\$(PlatformToolset)\dynamic\libsodium.dll"
-          DestinationFiles="$(TargetDir)libsodium.dll"
-          SkipUnchangedFiles="true" />
-  </Target>
-
-  <!-- Messages -->
-
-  <Target Name="libsodium-info" BeforeTargets="AfterBuild" Condition="'$(Linkage-libsodium)' == 'dynamic'">
-    <Message Text="Copying libsodium.dll -&gt; $(TargetDir)libsodium.dll" Importance="high"/>
-    <Message Text="Copying libsodium.pdb -&gt; $(TargetDir)libsodium.pdb" Importance="high" Condition="$(Configuration.IndexOf('Debug')) != -1" />
-  </Target>
-
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2017/libsodium.import.xml b/libs/libzmq/builds/deprecated-msvc/vs2017/libsodium.import.xml
deleted file mode 100644
index dbcf4e5..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2017/libsodium.import.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ProjectSchemaDefinitions xmlns="clr-namespace:Microsoft.Build.Framework.XamlTypes;assembly=Microsoft.Build.Framework">
-  <Rule Name="libsodium-linkage-uiextension" PageTemplate="tool" DisplayName="Local Dependencies" SwitchPrefix="/" Order="1">
-    <Rule.Categories>
-      <Category Name="libsodium" DisplayName="libsodium" />
-    </Rule.Categories>
-    <Rule.DataSource>
-      <DataSource Persistence="ProjectFile" ItemType="" />
-    </Rule.DataSource>
-    <EnumProperty Name="Linkage-libsodium" DisplayName="Linkage" Description="How libsodium will be linked into the output of this project" Category="libsodium">
-      <EnumValue Name="" DisplayName="Not linked" />
-      <EnumValue Name="dynamic" DisplayName="Dynamic (DLL)" />
-      <EnumValue Name="static" DisplayName="Static (LIB)" />
-      <EnumValue Name="ltcg" DisplayName="Static using link time compile generation (LTCG)" />
-    </EnumProperty>
-  </Rule>
-</ProjectSchemaDefinitions>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2017/libzmq.import.props b/libs/libzmq/builds/deprecated-msvc/vs2017/libzmq.import.props
deleted file mode 100644
index 2f71ff8..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2017/libzmq.import.props
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup Label="Globals">
-    <_PropertySheetDisplayName>ZMQ Import Settings</_PropertySheetDisplayName>
-  </PropertyGroup>
-
-  <!-- User Interface -->
-
-  <ItemGroup Label="BuildOptionsExtension">
-    <PropertyPageSchema Include="$(MSBuildThisFileDirectory)libzmq.import.xml" />
-  </ItemGroup>
-
-  <!-- Configuration -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <PreprocessorDefinitions Condition="'$(Option-tweet)' == 'true'">ZMQ_USE_TWEETNACL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-sodium)' == 'true'">ZMQ_USE_LIBSODIUM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-openpgm)' == 'true'">ZMQ_HAVE_OPENPGM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-gssapi)' == 'true'">HAVE_LIBGSSAPI_KRB5;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-draftapi)' == 'true'">ZMQ_BUILD_DRAFT_API;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemDefinitionGroup>
-
-  <!-- Linkage -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\..\libzmq\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Linkage-libzmq)' == 'static' Or '$(Linkage-libzmq)' == 'ltcg'">ZMQ_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies Condition="'$(Linkage-libzmq)' != ''">libzmq.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Debug')) != -1">$(ProjectDir)..\..\..\..\..\libzmq\bin\$(PlatformName)\Debug\$(PlatformToolset)\$(Linkage-libzmq)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Release')) != -1">$(ProjectDir)..\..\..\..\..\libzmq\bin\$(PlatformName)\Release\$(PlatformToolset)\$(Linkage-libzmq)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <!-- Copy -->
-
-  <Target Name="Linkage-libzmq-dynamic" AfterTargets="AfterBuild" Condition="'$(Linkage-libzmq)' == 'dynamic'">
-    <Copy Condition="$(Configuration.IndexOf('Debug')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libzmq\bin\$(PlatformName)\Debug\$(PlatformToolset)\dynamic\libzmq.dll"
-          DestinationFiles="$(TargetDir)libzmq.dll"
-          SkipUnchangedFiles="true" />
-    <Copy Condition="$(Configuration.IndexOf('Debug')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libzmq\bin\$(PlatformName)\Debug\$(PlatformToolset)\dynamic\libzmq.pdb"
-          DestinationFiles="$(TargetDir)libzmq.pdb"
-          SkipUnchangedFiles="true" />
-    <Copy Condition="$(Configuration.IndexOf('Release')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libzmq\bin\$(PlatformName)\Release\$(PlatformToolset)\dynamic\libzmq.dll"
-          DestinationFiles="$(TargetDir)libzmq.dll"
-          SkipUnchangedFiles="true" />
-  </Target>
-
-  <!-- Messages -->
-
-  <Target Name="libzmq-info" BeforeTargets="AfterBuild" Condition="'$(Linkage-libzmq)' == 'dynamic'">
-    <Message Text="Copying libzmq.dll -&gt; $(TargetDir)libzmq.dll" Importance="high"/>
-    <Message Text="Copying libzmq.pdb -&gt; $(TargetDir)libzmq.pdb" Importance="high" Condition="$(Configuration.IndexOf('Debug')) != -1" />
-  </Target>
-
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2017/libzmq.import.xml b/libs/libzmq/builds/deprecated-msvc/vs2017/libzmq.import.xml
deleted file mode 100644
index a25a1ba..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2017/libzmq.import.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ProjectSchemaDefinitions xmlns="clr-namespace:Microsoft.Build.Framework.XamlTypes;assembly=Microsoft.Build.Framework">
-  <Rule Name="libzmq-options-uiextension" PageTemplate="tool" DisplayName="ZMQ Options" SwitchPrefix="/" Order="1">
-    <Rule.Categories>
-      <Category Name="tweet" DisplayName="tweet" />
-      <Category Name="sodium" DisplayName="sodium" />
-      <Category Name="openpgm" DisplayName="openpgm" />
-      <Category Name="gssapi" DisplayName="gssapi" />
-      <Category Name="draftapi" DisplayName="draftapi" />
-    </Rule.Categories>
-    <Rule.DataSource>
-      <DataSource Persistence="ProjectFile" ItemType="" />
-    </Rule.DataSource>
-    <EnumProperty Name="Option-tweet" DisplayName="Enable Tweet NaCl" Description="Enable the Tweet NaCl build option" Category="tweet">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-    <EnumProperty Name="Option-sodium" DisplayName="Enable Sodium" Description="Enable the Sodium build option" Category="sodium">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-    <EnumProperty Name="Option-openpgm" DisplayName="Enable OpenPGM" Description="Enable the OpenPGM build option" Category="openpgm">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-    <EnumProperty Name="Option-gssapi" DisplayName="Enable GSS API" Description="Enable the GSS API build option" Category="gssapi">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-    <EnumProperty Name="Option-draftapi" DisplayName="Enable Draft API" Description="Enable Draft API build option" Category="draftapi">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-  </Rule>
-  <Rule Name="libzmq-linkage-uiextension" PageTemplate="tool" DisplayName="Local Dependencies" SwitchPrefix="/" Order="1">
-    <Rule.Categories>
-      <Category Name="libzmq" DisplayName="libzmq" />
-    </Rule.Categories>
-    <Rule.DataSource>
-      <DataSource Persistence="ProjectFile" ItemType="" />
-    </Rule.DataSource>
-    <EnumProperty Name="Linkage-libzmq" DisplayName="Linkage" Description="How libzmq will be linked into the output of this project" Category="libzmq">
-      <EnumValue Name="" DisplayName="Not linked" />
-      <EnumValue Name="dynamic" DisplayName="Dynamic (DLL)" />
-      <EnumValue Name="static" DisplayName="Static (LIB)" />
-      <EnumValue Name="ltcg" DisplayName="Static using link time compile generation (LTCG)" />
-    </EnumProperty>
-  </Rule>
-</ProjectSchemaDefinitions>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2017/libzmq.sln b/libs/libzmq/builds/deprecated-msvc/vs2017/libzmq.sln
deleted file mode 100644
index 17f13de..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2017/libzmq.sln
+++ /dev/null
@@ -1,208 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.23107.0
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libzmq", "libzmq\libzmq.vcxproj", "{641C5F36-32EE-4323-B740-992B651CF9D6}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "inproc_thr", "inproc_thr\inproc_thr.vcxproj", "{1077E977-95DD-4E73-A692-74647DD0CC1E}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "inproc_lat", "inproc_lat\inproc_lat.vcxproj", "{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "remote_thr", "remote_thr\remote_thr.vcxproj", "{B15E059C-0CBB-4A82-8C42-6567FB650802}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "remote_lat", "remote_lat\remote_lat.vcxproj", "{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "local_thr", "local_thr\local_thr.vcxproj", "{8EF2DF6B-6646-460F-8032-913B70FE0E94}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "local_lat", "local_lat\local_lat.vcxproj", "{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		DynDebug|Win32 = DynDebug|Win32
-		DynDebug|x64 = DynDebug|x64
-		DynRelease|Win32 = DynRelease|Win32
-		DynRelease|x64 = DynRelease|x64
-		LtcgDebug|Win32 = LtcgDebug|Win32
-		LtcgDebug|x64 = LtcgDebug|x64
-		LtcgRelease|Win32 = LtcgRelease|Win32
-		LtcgRelease|x64 = LtcgRelease|x64
-		StaticDebug|Win32 = StaticDebug|Win32
-		StaticDebug|x64 = StaticDebug|x64
-		StaticRelease|Win32 = StaticRelease|Win32
-		StaticRelease|x64 = StaticRelease|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.DynDebug|Win32.ActiveCfg = DebugDLL|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.DynDebug|Win32.Build.0 = DebugDLL|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.DynDebug|x64.ActiveCfg = DebugDLL|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.DynDebug|x64.Build.0 = DebugDLL|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.DynRelease|Win32.ActiveCfg = ReleaseDLL|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.DynRelease|Win32.Build.0 = ReleaseDLL|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.DynRelease|x64.ActiveCfg = ReleaseDLL|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.DynRelease|x64.Build.0 = ReleaseDLL|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.LtcgDebug|Win32.ActiveCfg = DebugLTCG|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.LtcgDebug|Win32.Build.0 = DebugLTCG|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.LtcgDebug|x64.ActiveCfg = DebugLTCG|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.LtcgDebug|x64.Build.0 = DebugLTCG|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.LtcgRelease|Win32.ActiveCfg = ReleaseLTCG|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.LtcgRelease|Win32.Build.0 = ReleaseLTCG|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.LtcgRelease|x64.ActiveCfg = ReleaseLTCG|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.LtcgRelease|x64.Build.0 = ReleaseLTCG|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.StaticDebug|Win32.ActiveCfg = DebugLIB|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.StaticDebug|Win32.Build.0 = DebugLIB|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.StaticDebug|x64.ActiveCfg = DebugLIB|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.StaticDebug|x64.Build.0 = DebugLIB|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.StaticRelease|Win32.ActiveCfg = ReleaseLIB|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.StaticRelease|Win32.Build.0 = ReleaseLIB|Win32
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.StaticRelease|x64.ActiveCfg = ReleaseLIB|x64
-		{641C5F36-32EE-4323-B740-992B651CF9D6}.StaticRelease|x64.Build.0 = ReleaseLIB|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.DynDebug|Win32.ActiveCfg = DebugDEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.DynDebug|Win32.Build.0 = DebugDEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.DynDebug|x64.ActiveCfg = DebugDEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.DynDebug|x64.Build.0 = DebugDEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.DynRelease|Win32.ActiveCfg = ReleaseDEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.DynRelease|Win32.Build.0 = ReleaseDEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.DynRelease|x64.ActiveCfg = ReleaseDEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.DynRelease|x64.Build.0 = ReleaseDEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.LtcgDebug|Win32.ActiveCfg = DebugLEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.LtcgDebug|Win32.Build.0 = DebugLEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.LtcgDebug|x64.ActiveCfg = DebugLEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.LtcgDebug|x64.Build.0 = DebugLEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.LtcgRelease|Win32.ActiveCfg = ReleaseLEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.LtcgRelease|Win32.Build.0 = ReleaseLEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.LtcgRelease|x64.ActiveCfg = ReleaseLEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.LtcgRelease|x64.Build.0 = ReleaseLEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.StaticDebug|Win32.ActiveCfg = DebugSEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.StaticDebug|Win32.Build.0 = DebugSEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.StaticDebug|x64.ActiveCfg = DebugSEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.StaticDebug|x64.Build.0 = DebugSEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.StaticRelease|Win32.ActiveCfg = ReleaseSEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.StaticRelease|Win32.Build.0 = ReleaseSEXE|Win32
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.StaticRelease|x64.ActiveCfg = ReleaseSEXE|x64
-		{1077E977-95DD-4E73-A692-74647DD0CC1E}.StaticRelease|x64.Build.0 = ReleaseSEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.DynDebug|Win32.ActiveCfg = DebugDEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.DynDebug|Win32.Build.0 = DebugDEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.DynDebug|x64.ActiveCfg = DebugDEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.DynDebug|x64.Build.0 = DebugDEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.DynRelease|Win32.ActiveCfg = ReleaseDEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.DynRelease|Win32.Build.0 = ReleaseDEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.DynRelease|x64.ActiveCfg = ReleaseDEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.DynRelease|x64.Build.0 = ReleaseDEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.LtcgDebug|Win32.ActiveCfg = DebugLEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.LtcgDebug|Win32.Build.0 = DebugLEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.LtcgDebug|x64.ActiveCfg = DebugLEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.LtcgDebug|x64.Build.0 = DebugLEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.LtcgRelease|Win32.ActiveCfg = ReleaseLEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.LtcgRelease|Win32.Build.0 = ReleaseLEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.LtcgRelease|x64.ActiveCfg = ReleaseLEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.LtcgRelease|x64.Build.0 = ReleaseLEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.StaticDebug|Win32.ActiveCfg = DebugSEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.StaticDebug|Win32.Build.0 = DebugSEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.StaticDebug|x64.ActiveCfg = DebugSEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.StaticDebug|x64.Build.0 = DebugSEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.StaticRelease|Win32.ActiveCfg = ReleaseSEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.StaticRelease|Win32.Build.0 = ReleaseSEXE|Win32
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.StaticRelease|x64.ActiveCfg = ReleaseSEXE|x64
-		{6FF7436F-B3F6-4AE9-A3AC-CFDE8A3872A0}.StaticRelease|x64.Build.0 = ReleaseSEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.DynDebug|Win32.ActiveCfg = DebugDEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.DynDebug|Win32.Build.0 = DebugDEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.DynDebug|x64.ActiveCfg = DebugDEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.DynDebug|x64.Build.0 = DebugDEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.DynRelease|Win32.ActiveCfg = ReleaseDEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.DynRelease|Win32.Build.0 = ReleaseDEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.DynRelease|x64.ActiveCfg = ReleaseDEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.DynRelease|x64.Build.0 = ReleaseDEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.LtcgDebug|Win32.ActiveCfg = DebugLEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.LtcgDebug|Win32.Build.0 = DebugLEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.LtcgDebug|x64.ActiveCfg = DebugLEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.LtcgDebug|x64.Build.0 = DebugLEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.LtcgRelease|Win32.ActiveCfg = ReleaseLEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.LtcgRelease|Win32.Build.0 = ReleaseLEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.LtcgRelease|x64.ActiveCfg = ReleaseLEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.LtcgRelease|x64.Build.0 = ReleaseLEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.StaticDebug|Win32.ActiveCfg = DebugSEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.StaticDebug|Win32.Build.0 = DebugSEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.StaticDebug|x64.ActiveCfg = DebugSEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.StaticDebug|x64.Build.0 = DebugSEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.StaticRelease|Win32.ActiveCfg = ReleaseSEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.StaticRelease|Win32.Build.0 = ReleaseSEXE|Win32
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.StaticRelease|x64.ActiveCfg = ReleaseSEXE|x64
-		{B15E059C-0CBB-4A82-8C42-6567FB650802}.StaticRelease|x64.Build.0 = ReleaseSEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.DynDebug|Win32.ActiveCfg = DebugDEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.DynDebug|Win32.Build.0 = DebugDEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.DynDebug|x64.ActiveCfg = DebugDEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.DynDebug|x64.Build.0 = DebugDEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.DynRelease|Win32.ActiveCfg = ReleaseDEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.DynRelease|Win32.Build.0 = ReleaseDEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.DynRelease|x64.ActiveCfg = ReleaseDEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.DynRelease|x64.Build.0 = ReleaseDEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.LtcgDebug|Win32.ActiveCfg = DebugLEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.LtcgDebug|Win32.Build.0 = DebugLEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.LtcgDebug|x64.ActiveCfg = DebugLEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.LtcgDebug|x64.Build.0 = DebugLEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.LtcgRelease|Win32.ActiveCfg = ReleaseLEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.LtcgRelease|Win32.Build.0 = ReleaseLEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.LtcgRelease|x64.ActiveCfg = ReleaseLEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.LtcgRelease|x64.Build.0 = ReleaseLEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.StaticDebug|Win32.ActiveCfg = DebugSEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.StaticDebug|Win32.Build.0 = DebugSEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.StaticDebug|x64.ActiveCfg = DebugSEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.StaticDebug|x64.Build.0 = DebugSEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.StaticRelease|Win32.ActiveCfg = ReleaseSEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.StaticRelease|Win32.Build.0 = ReleaseSEXE|Win32
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.StaticRelease|x64.ActiveCfg = ReleaseSEXE|x64
-		{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}.StaticRelease|x64.Build.0 = ReleaseSEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.DynDebug|Win32.ActiveCfg = DebugDEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.DynDebug|Win32.Build.0 = DebugDEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.DynDebug|x64.ActiveCfg = DebugDEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.DynDebug|x64.Build.0 = DebugDEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.DynRelease|Win32.ActiveCfg = ReleaseDEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.DynRelease|Win32.Build.0 = ReleaseDEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.DynRelease|x64.ActiveCfg = ReleaseDEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.DynRelease|x64.Build.0 = ReleaseDEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.LtcgDebug|Win32.ActiveCfg = DebugLEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.LtcgDebug|Win32.Build.0 = DebugLEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.LtcgDebug|x64.ActiveCfg = DebugLEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.LtcgDebug|x64.Build.0 = DebugLEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.LtcgRelease|Win32.ActiveCfg = ReleaseLEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.LtcgRelease|Win32.Build.0 = ReleaseLEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.LtcgRelease|x64.ActiveCfg = ReleaseLEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.LtcgRelease|x64.Build.0 = ReleaseLEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.StaticDebug|Win32.ActiveCfg = DebugSEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.StaticDebug|Win32.Build.0 = DebugSEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.StaticDebug|x64.ActiveCfg = DebugSEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.StaticDebug|x64.Build.0 = DebugSEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.StaticRelease|Win32.ActiveCfg = ReleaseSEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.StaticRelease|Win32.Build.0 = ReleaseSEXE|Win32
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.StaticRelease|x64.ActiveCfg = ReleaseSEXE|x64
-		{8EF2DF6B-6646-460F-8032-913B70FE0E94}.StaticRelease|x64.Build.0 = ReleaseSEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.DynDebug|Win32.ActiveCfg = DebugDEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.DynDebug|Win32.Build.0 = DebugDEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.DynDebug|x64.ActiveCfg = DebugDEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.DynDebug|x64.Build.0 = DebugDEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.DynRelease|Win32.ActiveCfg = ReleaseDEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.DynRelease|Win32.Build.0 = ReleaseDEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.DynRelease|x64.ActiveCfg = ReleaseDEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.DynRelease|x64.Build.0 = ReleaseDEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.LtcgDebug|Win32.ActiveCfg = DebugLEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.LtcgDebug|Win32.Build.0 = DebugLEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.LtcgDebug|x64.ActiveCfg = DebugLEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.LtcgDebug|x64.Build.0 = DebugLEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.LtcgRelease|Win32.ActiveCfg = ReleaseLEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.LtcgRelease|Win32.Build.0 = ReleaseLEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.LtcgRelease|x64.ActiveCfg = ReleaseLEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.LtcgRelease|x64.Build.0 = ReleaseLEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.StaticDebug|Win32.ActiveCfg = DebugSEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.StaticDebug|Win32.Build.0 = DebugSEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.StaticDebug|x64.ActiveCfg = DebugSEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.StaticDebug|x64.Build.0 = DebugSEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.StaticRelease|Win32.ActiveCfg = ReleaseSEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.StaticRelease|Win32.Build.0 = ReleaseSEXE|Win32
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.StaticRelease|x64.ActiveCfg = ReleaseSEXE|x64
-		{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}.StaticRelease|x64.Build.0 = ReleaseSEXE|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2017/libzmq/libzmq.props b/libs/libzmq/builds/deprecated-msvc/vs2017/libzmq/libzmq.props
deleted file mode 100644
index 22da05a..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2017/libzmq/libzmq.props
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>ZeroMQ Library Common Settings</_PropertySheetDisplayName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-  </PropertyGroup>
-
-  <!-- User Interface -->
-
-  <ItemGroup Label="BuildOptionsExtension">
-    <PropertyPageSchema Include="$(MSBuildThisFileDirectory)$(ProjectName).xml" />
-  </ItemGroup>
-
-  <!-- Configuration -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\;$(ProjectDir)..\..\..\..\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <EnablePREfast>false</EnablePREfast>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>precompiled.hpp</PrecompiledHeaderFile>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;FD_SETSIZE=16384;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-tweet)' == 'true'">ZMQ_USE_TWEETNACL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-sodium)' == 'true'">ZMQ_USE_LIBSODIUM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-tweet)' == 'true' Or '$(Option-sodium)' == 'true'">ZMQ_HAVE_CURVE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-openpgm)' == 'true'">ZMQ_HAVE_OPENPGM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-gssapi)' == 'true'">HAVE_LIBGSSAPI_KRB5;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-draftapi)' == 'true'">ZMQ_BUILD_DRAFT_API;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-usepoll)' == 'true'">ZMQ_USE_POLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Option-usepoll)' != 'true'">ZMQ_USE_SELECT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(ConfigurationType)' == 'StaticLibrary'">ZMQ_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(ConfigurationType)' == 'DynamicLibrary'">DLL_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>Advapi32.lib;Ws2_32.lib;Rpcrt4.lib;Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <Lib Condition="'$(ConfigurationType)'=='StaticLibrary'">
-      <AdditionalOptions>/ignore:4221 %(AdditionalOptions)</AdditionalOptions>
-    </Lib>
-  </ItemDefinitionGroup>
-
-  <!-- Dependencies -->
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props"
-            Condition="Exists('$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props')" /> 
-  </ImportGroup>
-
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
-    <!--<Linkage-libsodium>dynamic</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
-    <!--<Linkage-libsodium>ltcg</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
-    <!--<Linkage-libsodium>static</Linkage-libsodium>-->
-  </PropertyGroup>
-
-  <!-- Messages -->
-
-  <Target Name="OptionInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Option-tweet      : $(Option-tweet)" Importance="high"/>
-    <Message Text="Option-sodium     : $(Option-sodium)" Importance="high"/>
-    <Message Text="Option-openpgm    : $(Option-openpgm)" Importance="high"/>
-    <Message Text="Option-gssapi     : $(Option-gssapi)" Importance="high"/>
-    <Message Text="Option-draftapi   : $(Option-draftapi)" Importance="high"/>
-    <Message Text="Option-usepoll    : $(Option-usepoll)" Importance="high"/>
-  </Target>
-
-  <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high" Condition="'$(Option-sodium)' == 'true'"/>
-  </Target>
-
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2017/libzmq/libzmq.vcxproj b/libs/libzmq/builds/deprecated-msvc/vs2017/libzmq/libzmq.vcxproj
deleted file mode 100644
index 8f3eee8..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2017/libzmq/libzmq.vcxproj
+++ /dev/null
@@ -1,289 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{641C5F36-32EE-4323-B740-992B651CF9D6}</ProjectGuid>
-    <ProjectName>libzmq</ProjectName>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DebugDLL|Win32">
-      <Configuration>DebugDLL</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDLL|Win32">
-      <Configuration>ReleaseDLL</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugDLL|x64">
-      <Configuration>DebugDLL</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDLL|x64">
-      <Configuration>ReleaseDLL</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLTCG|Win32">
-      <Configuration>DebugLTCG</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLTCG|Win32">
-      <Configuration>ReleaseLTCG</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLTCG|x64">
-      <Configuration>DebugLTCG</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLTCG|x64">
-      <Configuration>ReleaseLTCG</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLIB|Win32">
-      <Configuration>DebugLIB</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLIB|Win32">
-      <Configuration>ReleaseLIB</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLIB|x64">
-      <Configuration>DebugLIB</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLIB|x64">
-      <Configuration>ReleaseLIB</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Configuration">
-    <ConfigurationType Condition="$(Configuration.IndexOf('DLL')) == -1">StaticLibrary</ConfigurationType>
-    <ConfigurationType Condition="$(Configuration.IndexOf('DLL')) != -1">DynamicLibrary</ConfigurationType>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
-    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-  </ImportGroup>
-  <PropertyGroup>
-    <Option-tweet>true</Option-tweet>
-  </PropertyGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\platform.hpp" />
-    <ClInclude Include="..\..\resource.h" />
-    <ClInclude Include="..\..\..\..\include\zmq.h" />
-    <ClInclude Include="..\..\..\..\src\zmq_draft.h" />
-    <ClInclude Include="..\..\..\..\src\address.hpp" />
-    <ClInclude Include="..\..\..\..\src\array.hpp" />
-    <ClInclude Include="..\..\..\..\src\atomic_counter.hpp" />
-    <ClInclude Include="..\..\..\..\src\atomic_ptr.hpp" />
-    <ClInclude Include="..\..\..\..\src\blob.hpp" />
-    <ClInclude Include="..\..\..\..\src\client.hpp" />
-    <ClInclude Include="..\..\..\..\src\clock.hpp" />
-    <ClInclude Include="..\..\..\..\src\command.hpp" />
-    <ClInclude Include="..\..\..\..\src\condition_variable.hpp" />
-    <ClInclude Include="..\..\..\..\src\config.hpp" />
-    <ClInclude Include="..\..\..\..\src\ctx.hpp" />
-    <ClInclude Include="..\..\..\..\src\curve_client.hpp" />
-    <ClInclude Include="..\..\..\..\src\curve_server.hpp" />
-    <ClInclude Include="..\..\..\..\src\decoder.hpp" />
-    <ClInclude Include="..\..\..\..\src\decoder_allocators.hpp" />
-    <ClInclude Include="..\..\..\..\src\devpoll.hpp" />
-    <ClInclude Include="..\..\..\..\src\dgram.hpp" />
-    <ClInclude Include="..\..\..\..\src\dish.hpp" />
-    <ClInclude Include="..\..\..\..\src\dist.hpp" />
-    <ClInclude Include="..\..\..\..\src\encoder.hpp" />
-    <ClInclude Include="..\..\..\..\src\epoll.hpp" />
-    <ClInclude Include="..\..\..\..\src\err.hpp" />
-    <ClInclude Include="..\..\..\..\src\fd.hpp" />
-    <ClInclude Include="..\..\..\..\src\fq.hpp" />
-    <ClInclude Include="..\..\..\..\src\gather.hpp" />
-    <ClInclude Include="..\..\..\..\src\gssapi_client.hpp" />
-    <ClInclude Include="..\..\..\..\src\gssapi_mechanism_base.hpp" />
-    <ClInclude Include="..\..\..\..\src\gssapi_server.hpp" />
-    <ClInclude Include="..\..\..\..\src\i_engine.hpp" />
-    <ClInclude Include="..\..\..\..\src\i_poll_events.hpp" />
-    <ClInclude Include="..\..\..\..\src\io_object.hpp" />
-    <ClInclude Include="..\..\..\..\src\io_thread.hpp" />
-    <ClInclude Include="..\..\..\..\src\ip.hpp" />
-    <ClInclude Include="..\..\..\..\src\ipc_address.hpp" />
-    <ClInclude Include="..\..\..\..\src\ipc_connecter.hpp" />
-    <ClInclude Include="..\..\..\..\src\ipc_listener.hpp" />
-    <ClInclude Include="..\..\..\..\src\kqueue.hpp" />
-    <ClInclude Include="..\..\..\..\src\lb.hpp" />
-    <ClInclude Include="..\..\..\..\src\likely.hpp" />
-    <ClInclude Include="..\..\..\..\src\mailbox.hpp" />
-    <ClInclude Include="..\..\..\..\src\mailbox_safe.hpp" />
-    <ClInclude Include="..\..\..\..\src\msg.hpp" />
-    <ClInclude Include="..\..\..\..\src\mtrie.hpp" />
-    <ClInclude Include="..\..\..\..\src\mutex.hpp" />
-    <ClInclude Include="..\..\..\..\src\object.hpp" />
-    <ClInclude Include="..\..\..\..\src\options.hpp" />
-    <ClInclude Include="..\..\..\..\src\own.hpp" />
-    <ClInclude Include="..\..\..\..\src\pair.hpp" />
-    <ClInclude Include="..\..\..\..\src\pgm_receiver.hpp" />
-    <ClInclude Include="..\..\..\..\src\pgm_sender.hpp" />
-    <ClInclude Include="..\..\..\..\src\pgm_socket.hpp" />
-    <ClInclude Include="..\..\..\..\src\pipe.hpp" />
-    <ClInclude Include="..\..\..\..\src\server.hpp" />
-    <ClInclude Include="..\..\..\..\src\socks.hpp" />
-    <ClInclude Include="..\..\..\..\src\socks_connecter.hpp" />
-    <ClInclude Include="..\..\..\..\src\poll.hpp" />
-    <ClInclude Include="..\..\..\..\src\poller.hpp" />
-    <ClInclude Include="..\..\..\..\src\poller_base.hpp" />
-    <ClInclude Include="..\..\..\..\src\precompiled.hpp" />
-    <ClInclude Include="..\..\..\..\src\proxy.hpp" />
-    <ClInclude Include="..\..\..\..\src\pub.hpp" />
-    <ClInclude Include="..\..\..\..\src\pull.hpp" />
-    <ClInclude Include="..\..\..\..\src\push.hpp" />
-    <ClInclude Include="..\..\..\..\src\radio.hpp" />
-    <ClInclude Include="..\..\..\..\src\random.hpp" />
-    <ClInclude Include="..\..\..\..\src\raw_decoder.hpp" />
-    <ClInclude Include="..\..\..\..\src\raw_encoder.hpp" />
-    <ClInclude Include="..\..\..\..\src\reaper.hpp" />
-    <ClInclude Include="..\..\..\..\src\rep.hpp" />
-    <ClInclude Include="..\..\..\..\src\req.hpp" />
-    <ClInclude Include="..\..\..\..\src\scatter.hpp" />
-    <ClInclude Include="..\..\..\..\src\select.hpp" />
-    <ClInclude Include="..\..\..\..\src\session_base.hpp" />
-    <ClInclude Include="..\..\..\..\src\signaler.hpp" />
-    <ClInclude Include="..\..\..\..\src\socket_base.hpp" />
-    <ClInclude Include="..\..\..\..\src\stdint.hpp" />
-    <ClInclude Include="..\..\..\..\src\stream_engine.hpp" />
-    <ClInclude Include="..\..\..\..\src\sub.hpp" />
-    <ClInclude Include="..\..\..\..\src\tcp.hpp" />
-    <ClInclude Include="..\..\..\..\src\tcp_address.hpp" />
-    <ClInclude Include="..\..\..\..\src\tcp_connecter.hpp" />
-    <ClInclude Include="..\..\..\..\src\tcp_listener.hpp" />
-    <ClInclude Include="..\..\..\..\src\timers.hpp" />
-    <ClInclude Include="..\..\..\..\src\thread.hpp" />
-    <ClInclude Include="..\..\..\..\src\trie.hpp" />
-    <ClInclude Include="..\..\..\..\src\tweetnacl.h" />
-    <ClInclude Include="..\..\..\..\src\udp_address.hpp" />
-    <ClInclude Include="..\..\..\..\src\udp_engine.hpp" />
-    <ClInclude Include="..\..\..\..\src\v1_decoder.hpp" />
-    <ClInclude Include="..\..\..\..\src\v1_encoder.hpp" />
-    <ClInclude Include="..\..\..\..\src\v1_protocol.hpp" />
-    <ClInclude Include="..\..\..\..\src\windows.hpp" />
-    <ClInclude Include="..\..\..\..\src\wire.hpp" />
-    <ClInclude Include="..\..\..\..\src\xpub.hpp" />
-    <ClInclude Include="..\..\..\..\src\xrep.hpp" />
-    <ClInclude Include="..\..\..\..\src\xreq.hpp" />
-    <ClInclude Include="..\..\..\..\src\xsub.hpp" />
-    <ClInclude Include="..\..\..\..\src\ypipe.hpp" />
-    <ClInclude Include="..\..\..\..\src\yqueue.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\..\src\address.cpp" />
-    <ClCompile Include="..\..\..\..\src\client.cpp" />
-    <ClCompile Include="..\..\..\..\src\clock.cpp" />
-    <ClCompile Include="..\..\..\..\src\ctx.cpp" />
-    <ClCompile Include="..\..\..\..\src\curve_client.cpp" />
-    <ClCompile Include="..\..\..\..\src\curve_mechanism_base.cpp" />
-    <ClCompile Include="..\..\..\..\src\curve_server.cpp" />
-    <ClCompile Include="..\..\..\..\src\dealer.cpp" />
-    <ClCompile Include="..\..\..\..\src\decoder_allocators.cpp" />
-    <ClCompile Include="..\..\..\..\src\devpoll.cpp" />
-    <ClCompile Include="..\..\..\..\src\dgram.cpp" />
-    <ClCompile Include="..\..\..\..\src\dish.cpp" />
-    <ClCompile Include="..\..\..\..\src\dist.cpp" />
-    <ClCompile Include="..\..\..\..\src\epoll.cpp" />
-    <ClCompile Include="..\..\..\..\src\err.cpp" />
-    <ClCompile Include="..\..\..\..\src\fq.cpp" />
-    <ClCompile Include="..\..\..\..\src\gather.cpp" />
-    <ClCompile Include="..\..\..\..\src\gssapi_client.cpp" />
-    <ClCompile Include="..\..\..\..\src\gssapi_mechanism_base.cpp" />
-    <ClCompile Include="..\..\..\..\src\gssapi_server.cpp" />
-    <ClCompile Include="..\..\..\..\src\io_object.cpp" />
-    <ClCompile Include="..\..\..\..\src\io_thread.cpp" />
-    <ClCompile Include="..\..\..\..\src\ip.cpp" />
-    <ClCompile Include="..\..\..\..\src\ipc_address.cpp" />
-    <ClCompile Include="..\..\..\..\src\ipc_connecter.cpp" />
-    <ClCompile Include="..\..\..\..\src\ipc_listener.cpp" />
-    <ClCompile Include="..\..\..\..\src\kqueue.cpp" />
-    <ClCompile Include="..\..\..\..\src\lb.cpp" />
-    <ClCompile Include="..\..\..\..\src\mailbox.cpp" />
-    <ClCompile Include="..\..\..\..\src\mailbox_safe.cpp" />
-    <ClCompile Include="..\..\..\..\src\mechanism.cpp" />
-    <ClCompile Include="..\..\..\..\src\mechanism_base.cpp" />
-    <ClCompile Include="..\..\..\..\src\metadata.cpp" />
-    <ClCompile Include="..\..\..\..\src\msg.cpp" />
-    <ClCompile Include="..\..\..\..\src\mtrie.cpp" />
-    <ClCompile Include="..\..\..\..\src\null_mechanism.cpp" />
-    <ClCompile Include="..\..\..\..\src\object.cpp" />
-    <ClCompile Include="..\..\..\..\src\options.cpp" />
-    <ClCompile Include="..\..\..\..\src\own.cpp" />
-    <ClCompile Include="..\..\..\..\src\pair.cpp" />
-    <ClCompile Include="..\..\..\..\src\pgm_receiver.cpp" />
-    <ClCompile Include="..\..\..\..\src\pgm_sender.cpp" />
-    <ClCompile Include="..\..\..\..\src\pgm_socket.cpp" />
-    <ClCompile Include="..\..\..\..\src\pipe.cpp" />
-    <ClCompile Include="..\..\..\..\src\plain_client.cpp" />
-    <ClCompile Include="..\..\..\..\src\plain_server.cpp" />
-    <ClCompile Include="..\..\..\..\src\poll.cpp" />
-    <ClCompile Include="..\..\..\..\src\poller_base.cpp" />
-    <ClCompile Include="..\..\..\..\src\precompiled.cpp">
-      <PrecompiledHeader>Create</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\proxy.cpp" />
-    <ClCompile Include="..\..\..\..\src\pub.cpp" />
-    <ClCompile Include="..\..\..\..\src\pull.cpp" />
-    <ClCompile Include="..\..\..\..\src\push.cpp" />
-    <ClCompile Include="..\..\..\..\src\radio.cpp" />
-    <ClCompile Include="..\..\..\..\src\random.cpp" />
-    <ClCompile Include="..\..\..\..\src\raw_decoder.cpp" />
-    <ClCompile Include="..\..\..\..\src\raw_encoder.cpp" />
-    <ClCompile Include="..\..\..\..\src\reaper.cpp" />
-    <ClCompile Include="..\..\..\..\src\rep.cpp" />
-    <ClCompile Include="..\..\..\..\src\req.cpp" />
-    <ClCompile Include="..\..\..\..\src\router.cpp" />
-    <ClCompile Include="..\..\..\..\src\scatter.cpp" />
-    <ClCompile Include="..\..\..\..\src\select.cpp" />
-    <ClCompile Include="..\..\..\..\src\server.cpp" />
-    <ClCompile Include="..\..\..\..\src\session_base.cpp" />
-    <ClCompile Include="..\..\..\..\src\signaler.cpp" />
-    <ClCompile Include="..\..\..\..\src\socket_base.cpp" />
-    <ClCompile Include="..\..\..\..\src\socket_poller.cpp" />
-    <ClCompile Include="..\..\..\..\src\socks.cpp" />
-    <ClCompile Include="..\..\..\..\src\socks_connecter.cpp" />
-    <ClCompile Include="..\..\..\..\src\stream.cpp" />
-    <ClCompile Include="..\..\..\..\src\stream_engine.cpp" />
-    <ClCompile Include="..\..\..\..\src\sub.cpp" />
-    <ClCompile Include="..\..\..\..\src\tcp.cpp" />
-    <ClCompile Include="..\..\..\..\src\tcp_address.cpp" />
-    <ClCompile Include="..\..\..\..\src\tcp_connecter.cpp" />
-    <ClCompile Include="..\..\..\..\src\tcp_listener.cpp" />
-    <ClCompile Include="..\..\..\..\src\thread.cpp" />
-    <ClCompile Include="..\..\..\..\src\timers.cpp" />
-    <ClCompile Include="..\..\..\..\src\trie.cpp" />
-    <ClCompile Include="..\..\..\..\src\tweetnacl.c">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\udp_address.cpp" />
-    <ClCompile Include="..\..\..\..\src\udp_engine.cpp" />
-    <ClCompile Include="..\..\..\..\src\v1_decoder.cpp" />
-    <ClCompile Include="..\..\..\..\src\v1_encoder.cpp" />
-    <ClCompile Include="..\..\..\..\src\v2_decoder.cpp" />
-    <ClCompile Include="..\..\..\..\src\v2_encoder.cpp" />
-    <ClCompile Include="..\..\..\..\src\xpub.cpp" />
-    <ClCompile Include="..\..\..\..\src\xsub.cpp" />
-    <ClCompile Include="..\..\..\..\src\zap_client.cpp" />
-    <ClCompile Include="..\..\..\..\src\zmq.cpp" />
-    <ClCompile Include="..\..\..\..\src\zmq_utils.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\..\..\..\packaging\nuget\package.bat" />
-    <None Include="..\..\..\..\packaging\nuget\package.config" />
-    <None Include="..\..\..\..\packaging\nuget\package.gsl" />
-    <None Include="..\..\..\..\packaging\nuget\package.nuspec" />
-    <None Include="..\..\..\..\packaging\nuget\package.targets" />
-  </ItemGroup>
-  <ItemGroup>
-    <Xml Include="..\..\..\..\packaging\nuget\package.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\..\resource.rc" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2017/libzmq/libzmq.vcxproj.filters b/libs/libzmq/builds/deprecated-msvc/vs2017/libzmq/libzmq.vcxproj.filters
deleted file mode 100644
index 930b009..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2017/libzmq/libzmq.vcxproj.filters
+++ /dev/null
@@ -1,627 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClCompile Include="..\..\..\..\src\address.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\clock.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\ctx.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\dealer.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\devpoll.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\dgram.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\dist.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\epoll.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\err.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\fq.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\io_object.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\io_thread.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\ip.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\ipc_address.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\ipc_connecter.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\ipc_listener.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\kqueue.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\lb.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mailbox.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mechanism.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\metadata.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\msg.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mtrie.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\null_mechanism.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\object.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\options.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\own.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\pair.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\pgm_receiver.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\pgm_sender.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\pgm_socket.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\pipe.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\plain_client.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\plain_server.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\poll.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\poller_base.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\proxy.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\pub.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\pull.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\push.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\random.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\raw_decoder.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\raw_encoder.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\reaper.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\rep.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\req.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\router.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\scatter.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\select.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\session_base.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\signaler.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\socket_base.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\stream.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\stream_engine.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\sub.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\tcp.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\tcp_address.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\tcp_connecter.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\tcp_listener.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\thread.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\trie.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\v1_decoder.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\v1_encoder.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\v2_decoder.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\v2_encoder.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\xpub.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\xsub.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\zmq.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\zmq_utils.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\precompiled.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\curve_client.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\curve_server.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\gather.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\gssapi_mechanism_base.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\gssapi_server.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\gssapi_client.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\socks.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\socks_connecter.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\server.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\client.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\mailbox_safe.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\decoder_allocators.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\socket_poller.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\udp_address.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\udp_engine.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\dish.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\radio.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\timers.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\tweetnacl.c">
-      <Filter>src</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\..\include\zmq.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\address.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\array.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\atomic_counter.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\atomic_ptr.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\blob.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\clock.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\command.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\config.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\ctx.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\devpoll.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\dgram.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\dist.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\encoder.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\epoll.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\err.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\fd.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\fq.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\i_engine.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\i_poll_events.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\io_object.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\io_thread.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\ip.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\ipc_address.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\ipc_connecter.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\ipc_listener.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\kqueue.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\lb.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\decoder.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\likely.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mailbox.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\msg.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mtrie.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mutex.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\object.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\options.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\own.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\pair.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\pgm_receiver.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\yqueue.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\ypipe.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\xsub.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\xreq.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\xrep.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\xpub.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\wire.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\windows.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\v1_encoder.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\v1_protocol.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\v1_decoder.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\trie.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\thread.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\tcp_listener.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\tcp_connecter.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\tcp_address.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\tcp.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\sub.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\stream_engine.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\stdint.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\socket_base.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\signaler.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\session_base.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\scatter.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\select.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\req.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\rep.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\reaper.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\raw_encoder.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\raw_decoder.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\random.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\push.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\pull.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\pub.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\proxy.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\precompiled.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\poller_base.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\poller.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\poll.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\platform.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\pipe.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\pgm_socket.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\pgm_sender.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\resource.h">
-      <Filter>resource</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\curve_client.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\curve_server.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\gather.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\gssapi_mechanism_base.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\gssapi_server.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\gssapi_client.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\socks.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\socks_connecter.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\server.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\client.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\mailbox_safe.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\condition_variable.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\decoder_allocators.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\udp_address.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\udp_engine.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\dish.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\radio.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\timers.hpp">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\tweetnacl.h">
-      <Filter>src\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\..\src\zmq_draft.h">
-      <Filter>src\include</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="include">
-      <UniqueIdentifier>{f7e88c6c-e408-4631-959c-fe3568656d70}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="src">
-      <UniqueIdentifier>{35f0c644-e1d8-4a46-bb33-06bb8b645fff}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="src\include">
-      <UniqueIdentifier>{90853975-3420-4f06-8be4-4ab3d9792160}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="packaging">
-      <UniqueIdentifier>{f5e26e9d-c33d-45c1-95e4-0732acd28b59}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="resource">
-      <UniqueIdentifier>{e66010e4-a9ea-4e2e-8bc6-12fec14bb009}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\..\..\..\packaging\nuget\package.bat">
-      <Filter>packaging</Filter>
-    </None>
-    <None Include="..\..\..\..\packaging\nuget\package.config">
-      <Filter>packaging</Filter>
-    </None>
-    <None Include="..\..\..\..\packaging\nuget\package.gsl">
-      <Filter>packaging</Filter>
-    </None>
-    <None Include="..\..\..\..\packaging\nuget\package.targets">
-      <Filter>packaging</Filter>
-    </None>
-    <None Include="..\..\..\..\packaging\nuget\package.nuspec">
-      <Filter>packaging</Filter>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <Xml Include="..\..\..\..\packaging\nuget\package.xml">
-      <Filter>packaging</Filter>
-    </Xml>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\..\resource.rc">
-      <Filter>resource</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2017/libzmq/libzmq.xml b/libs/libzmq/builds/deprecated-msvc/vs2017/libzmq/libzmq.xml
deleted file mode 100644
index db7dfe0..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2017/libzmq/libzmq.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ProjectSchemaDefinitions xmlns="clr-namespace:Microsoft.Build.Framework.XamlTypes;assembly=Microsoft.Build.Framework">
-  <Rule Name="libzmq-uiextension" PageTemplate="tool" DisplayName="ZMQ Options" SwitchPrefix="/" Order="1">
-    <Rule.Categories>
-      <Category Name="tweet" DisplayName="tweet" />
-      <Category Name="sodium" DisplayName="sodium" />
-      <Category Name="openpgm" DisplayName="openpgm" />
-      <Category Name="gssapi" DisplayName="gssapi" />
-      <Category Name="draftapi" DisplayName="draftapi" />
-      <Category Name="usepoll" DisplayName="usepoll" />
-    </Rule.Categories>
-    <Rule.DataSource>
-      <DataSource Persistence="ProjectFile" ItemType="" />
-    </Rule.DataSource>
-    <EnumProperty Name="Option-tweet" DisplayName="Enable Tweet NaCl" Description="Enable Tweet NaCl build option (overrides Sodium)" Category="tweet">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-    <EnumProperty Name="Option-sodium" DisplayName="Enable Sodium" Description="Enable Sodium build option" Category="sodium">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-    <EnumProperty Name="Option-openpgm" DisplayName="Enable OpenPGM" Description="Enable OpenPGM build option" Category="openpgm">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-    <EnumProperty Name="Option-gssapi" DisplayName="Enable GSS API" Description="Enable GSS API build option" Category="gssapi">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-    <EnumProperty Name="Option-draftapi" DisplayName="Enable Draft API" Description="Enable Draft API build option" Category="draftapi">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-    <EnumProperty Name="Option-usepoll" DisplayName="Enable poll() usage (Vista+ only)" Description="Use poll() instead of select() for waiting on incoming data. Increases performance, but the binary will only run on Windows Vista or later." Category="usepoll">
-      <EnumValue Name="" DisplayName="No" />
-      <EnumValue Name="true" DisplayName="Yes" />
-    </EnumProperty>
-  </Rule>
-</ProjectSchemaDefinitions>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2017/local_lat/local_lat.props b/libs/libzmq/builds/deprecated-msvc/vs2017/local_lat/local_lat.props
deleted file mode 100644
index ea5e3e5..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2017/local_lat/local_lat.props
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>ZeroMQ local_lat Common Settings</_PropertySheetDisplayName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-  </PropertyGroup>
-
-  <!-- Configuration -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <!-- Dependencies -->
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="..\libzmq.import.props" />
-    <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props"
-            Condition="Exists('$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props')" /> 
-  </ImportGroup>
-
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
-    <Linkage-libzmq>dynamic</Linkage-libzmq>
-    <!--<Linkage-libsodium>dynamic</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
-    <Linkage-libzmq>ltcg</Linkage-libzmq>
-    <!--<Linkage-libsodium>ltcg</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
-    <Linkage-libzmq>static</Linkage-libzmq>
-    <!--<Linkage-libsodium>static</Linkage-libsodium>-->
-  </PropertyGroup>
-
-  <!-- Messages -->
-
-  <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Linkage-libzmq    : $(Linkage-libzmq)" Importance="high"/>
-    <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high" Condition="'$(HAVE_LIBSODIUM)'=='1'"/>
-  </Target>
-
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2017/local_lat/local_lat.vcxproj b/libs/libzmq/builds/deprecated-msvc/vs2017/local_lat/local_lat.vcxproj
deleted file mode 100644
index 4e54ed1..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2017/local_lat/local_lat.vcxproj
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{4FDB8C73-9D4A-4D87-A4A9-A7FC06DFEA57}</ProjectGuid>
-    <ProjectName>local_lat</ProjectName>
-    <PlatformToolset>v141</PlatformToolset>
-    <ConfigurationType>Application</ConfigurationType>
-  </PropertyGroup>
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DebugDEXE|Win32">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|Win32">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugDEXE|x64">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|x64">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|Win32">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|Win32">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|x64">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|x64">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|Win32">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|Win32">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|x64">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|x64">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
-    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-  </ImportGroup>
-  <PropertyGroup>
-    <Option-tweet>true</Option-tweet>
-  </PropertyGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\platform.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\..\perf\local_lat.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ItemGroup>
-    <ProjectReference Include="..\libzmq\libzmq.vcxproj">
-      <Project>{641c5f36-32ee-4323-b740-992b651cf9d6}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2017/local_thr/local_thr.props b/libs/libzmq/builds/deprecated-msvc/vs2017/local_thr/local_thr.props
deleted file mode 100644
index 1d017d4..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2017/local_thr/local_thr.props
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>ZeroMQ local_thr Common Settings</_PropertySheetDisplayName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-  </PropertyGroup>
-
-  <!-- Configuration -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <!-- Dependencies -->
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="..\libzmq.import.props" />
-    <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props"
-            Condition="Exists('$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props')" /> 
-  </ImportGroup>
-
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
-    <Linkage-libzmq>dynamic</Linkage-libzmq>
-    <!--<Linkage-libsodium>dynamic</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
-    <Linkage-libzmq>ltcg</Linkage-libzmq>
-    <!--<Linkage-libsodium>ltcg</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
-    <Linkage-libzmq>static</Linkage-libzmq>
-    <!--<Linkage-libsodium>static</Linkage-libsodium>-->
-  </PropertyGroup>
-
-  <!-- Messages -->
-
-  <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Linkage-libzmq    : $(Linkage-libzmq)" Importance="high"/>
-    <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high" Condition="'$(HAVE_LIBSODIUM)'=='1'"/>
-  </Target>
-
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2017/local_thr/local_thr.vcxproj b/libs/libzmq/builds/deprecated-msvc/vs2017/local_thr/local_thr.vcxproj
deleted file mode 100644
index 2b3d6de..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2017/local_thr/local_thr.vcxproj
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{8EF2DF6B-6646-460F-8032-913B70FE0E94}</ProjectGuid>
-    <ProjectName>local_thr</ProjectName>
-    <PlatformToolset>v141</PlatformToolset>
-    <ConfigurationType>Application</ConfigurationType>
-  </PropertyGroup>
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DebugDEXE|Win32">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|Win32">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugDEXE|x64">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|x64">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|Win32">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|Win32">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|x64">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|x64">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|Win32">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|Win32">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|x64">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|x64">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
-    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-  </ImportGroup>
-  <PropertyGroup>
-    <Option-tweet>true</Option-tweet>
-  </PropertyGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\platform.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\..\perf\local_thr.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ItemGroup>
-    <ProjectReference Include="..\libzmq\libzmq.vcxproj">
-      <Project>{641c5f36-32ee-4323-b740-992b651cf9d6}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2017/remote_lat/remote_lat.props b/libs/libzmq/builds/deprecated-msvc/vs2017/remote_lat/remote_lat.props
deleted file mode 100644
index 307eaf5..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2017/remote_lat/remote_lat.props
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>ZeroMQ remote_lat Common Settings</_PropertySheetDisplayName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-  </PropertyGroup>
-
-  <!-- Configuration -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <!-- Dependencies -->
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="..\libzmq.import.props" />
-    <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props"
-            Condition="Exists('$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props')" /> 
-  </ImportGroup>
-
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
-    <Linkage-libzmq>dynamic</Linkage-libzmq>
-    <!--<Linkage-libsodium>dynamic</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
-    <Linkage-libzmq>ltcg</Linkage-libzmq>
-    <!--<Linkage-libsodium>ltcg</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
-    <Linkage-libzmq>static</Linkage-libzmq>
-    <!--<Linkage-libsodium>static</Linkage-libsodium>-->
-  </PropertyGroup>
-
-  <!-- Messages -->
-
-  <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Linkage-libzmq    : $(Linkage-libzmq)" Importance="high"/>
-    <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high" Condition="'$(HAVE_LIBSODIUM)'=='1'"/>
-  </Target>
-
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2017/remote_lat/remote_lat.vcxproj b/libs/libzmq/builds/deprecated-msvc/vs2017/remote_lat/remote_lat.vcxproj
deleted file mode 100644
index 668410c..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2017/remote_lat/remote_lat.vcxproj
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{9C20A37C-5D9F-4C4C-A2D9-E6EE91A077D1}</ProjectGuid>
-    <ProjectName>remote_lat</ProjectName>
-    <PlatformToolset>v141</PlatformToolset>
-    <ConfigurationType>Application</ConfigurationType>
-  </PropertyGroup>
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DebugDEXE|Win32">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|Win32">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugDEXE|x64">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|x64">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|Win32">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|Win32">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|x64">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|x64">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|Win32">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|Win32">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|x64">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|x64">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
-    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-  </ImportGroup>
-  <PropertyGroup>
-    <Option-tweet>true</Option-tweet>
-  </PropertyGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\platform.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\..\perf\remote_lat.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ItemGroup>
-    <ProjectReference Include="..\libzmq\libzmq.vcxproj">
-      <Project>{641c5f36-32ee-4323-b740-992b651cf9d6}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2017/remote_thr/remote_thr.props b/libs/libzmq/builds/deprecated-msvc/vs2017/remote_thr/remote_thr.props
deleted file mode 100644
index 001e481..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2017/remote_thr/remote_thr.props
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-    <_PropertySheetDisplayName>ZeroMQ remote_thr Common Settings</_PropertySheetDisplayName>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-  </PropertyGroup>
-
-  <!-- Configuration -->
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <!-- Dependencies -->
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="..\libzmq.import.props" />
-    <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props"
-            Condition="Exists('$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props')" /> 
-  </ImportGroup>
-  
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
-    <Linkage-libzmq>dynamic</Linkage-libzmq>
-    <!--<Linkage-libsodium>dynamic</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
-    <Linkage-libzmq>ltcg</Linkage-libzmq>
-    <!--<Linkage-libsodium>ltcg</Linkage-libsodium>-->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
-    <Linkage-libzmq>static</Linkage-libzmq>
-    <!--<Linkage-libsodium>static</Linkage-libsodium>-->
-  </PropertyGroup>
-
-  <!-- Messages -->
-
-  <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Linkage-libzmq    : $(Linkage-libzmq)" Importance="high"/>
-    <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high" Condition="'$(HAVE_LIBSODIUM)'=='1'"/>
-  </Target>
-
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/deprecated-msvc/vs2017/remote_thr/remote_thr.vcxproj b/libs/libzmq/builds/deprecated-msvc/vs2017/remote_thr/remote_thr.vcxproj
deleted file mode 100644
index 2e7d072..0000000
--- a/libs/libzmq/builds/deprecated-msvc/vs2017/remote_thr/remote_thr.vcxproj
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{B15E059C-0CBB-4A82-8C42-6567FB650802}</ProjectGuid>
-    <ProjectName>remote_thr</ProjectName>
-    <PlatformToolset>v141</PlatformToolset>
-    <ConfigurationType>Application</ConfigurationType>
-  </PropertyGroup>
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DebugDEXE|Win32">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|Win32">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugDEXE|x64">
-      <Configuration>DebugDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseDEXE|x64">
-      <Configuration>ReleaseDEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|Win32">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|Win32">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugLEXE|x64">
-      <Configuration>DebugLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseLEXE|x64">
-      <Configuration>ReleaseLEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|Win32">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|Win32">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugSEXE|x64">
-      <Configuration>DebugSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseSEXE|x64">
-      <Configuration>ReleaseSEXE</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
-    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-  </ImportGroup>
-  <PropertyGroup>
-    <Option-tweet>true</Option-tweet>
-  </PropertyGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\platform.hpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\..\perf\remote_thr.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ItemGroup>
-    <ProjectReference Include="..\libzmq\libzmq.vcxproj">
-      <Project>{641c5f36-32ee-4323-b740-992b651cf9d6}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/libs/libzmq/builds/fuzz/ci_build.sh b/libs/libzmq/builds/fuzz/ci_build.sh
deleted file mode 100755
index 7813c0c..0000000
--- a/libs/libzmq/builds/fuzz/ci_build.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-# used by oss-fuzz https://github.com/google/oss-fuzz/tree/master/projects/libzmq
-
-set -e
-set -x
-
-cd "${SRC}/libsodium"
-DO_NOT_UPDATE_CONFIG_SCRIPTS=1 ./autogen.sh
-./configure --disable-shared --prefix=/install_prefix --disable-asm
-make -j$(nproc) V=1 install DESTDIR=/tmp/zmq_install_dir
-
-cd "${SRC}/libzmq"
-./autogen.sh
-export LDFLAGS+=" $(PKG_CONFIG_PATH=/tmp/zmq_install_dir/install_prefix/lib/pkgconfig pkg-config --static --libs --define-prefix libsodium)"
-export CXXFLAGS+=" $(PKG_CONFIG_PATH=/tmp/zmq_install_dir/install_prefix/lib/pkgconfig pkg-config --static --cflags --define-prefix libsodium)"
-./configure --disable-shared --prefix=/install_prefix --disable-perf --disable-curve-keygen PKG_CONFIG_PATH=/tmp/zmq_install_dir/install_prefix/lib/pkgconfig --with-libsodium=yes --with-fuzzing-installdir=fuzzers --with-fuzzing-engine=$LIB_FUZZING_ENGINE
-make -j$(nproc) V=1 install DESTDIR=/tmp/zmq_install_dir
-
-cd "${SRC}/libzmq-fuzz-corpora"
-cp dictionaries/* /tmp/zmq_install_dir/install_prefix/fuzzers/
-for t in test_*_seed_corpus; do
-  zip -j --quiet /tmp/zmq_install_dir/install_prefix/fuzzers/${t}.zip ${t}/*
-done
-
-cp /tmp/zmq_install_dir/install_prefix/fuzzers/* "${OUT}"
diff --git a/libs/libzmq/builds/gyp/.gitignore b/libs/libzmq/builds/gyp/.gitignore
deleted file mode 100644
index 9cd5148..0000000
--- a/libs/libzmq/builds/gyp/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-project.Makefile
-*.mk
-out/
-Makefile
-
diff --git a/libs/libzmq/builds/gyp/build.bat b/libs/libzmq/builds/gyp/build.bat
deleted file mode 100644
index 693de9e..0000000
--- a/libs/libzmq/builds/gyp/build.bat
+++ /dev/null
@@ -1,4 +0,0 @@
-@echo off
-:-  Needs Visual Studio 2015
-"\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin\vcvars32.bat"
-msbuild /m /v:m project.sln
diff --git a/libs/libzmq/builds/gyp/platform.hpp b/libs/libzmq/builds/gyp/platform.hpp
deleted file mode 100644
index c463ca1..0000000
--- a/libs/libzmq/builds/gyp/platform.hpp
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_PLATFORM_HPP_INCLUDED__
-#define __ZMQ_PLATFORM_HPP_INCLUDED__
-
-//  This file provides the configuration for Linux, Windows, and OS/X
-//  as determined by ZMQ_HAVE_XXX macros passed from project.gyp
-
-//  Check that we're being called from our gyp makefile
-#ifndef ZMQ_GYP_BUILD
-#   error "foreign platform.hpp detected, please re-configure"
-#endif
-
-//  Set for all platforms
-#define ZMQ_HAVE_CURVE 1
-#define ZMQ_USE_TWEETNACL 1
-
-#if defined ZMQ_HAVE_WINDOWS
-#   define ZMQ_USE_SELECT 1
-
-#elif defined ZMQ_HAVE_OSX
-#   define ZMQ_USE_KQUEUE 1
-#   define HAVE_POSIX_MEMALIGN 1
-#   define ZMQ_HAVE_IFADDRS 1
-#   define ZMQ_HAVE_SO_KEEPALIVE 1
-#   define ZMQ_HAVE_TCP_KEEPALIVE 1
-#   define ZMQ_HAVE_TCP_KEEPCNT 1
-#   define ZMQ_HAVE_TCP_KEEPINTVL 1
-#   define ZMQ_HAVE_UIO 1
-#   define HAVE_FORK 1
-
-#elif defined ZMQ_HAVE_LINUX
-#   define ZMQ_USE_EPOLL 1
-#   define HAVE_POSIX_MEMALIGN 1
-#   define ZMQ_HAVE_EVENTFD 1
-#   define ZMQ_HAVE_IFADDRS 1
-#   define ZMQ_HAVE_SOCK_CLOEXEC 1
-#   define ZMQ_HAVE_SO_BINDTODEVICE 1
-#   define ZMQ_HAVE_SO_KEEPALIVE 1
-#   define ZMQ_HAVE_SO_PEERCRED 1
-#   define ZMQ_HAVE_TCP_KEEPCNT 1
-#   define ZMQ_HAVE_TCP_KEEPIDLE 1
-#   define ZMQ_HAVE_TCP_KEEPINTVL 1
-#   define ZMQ_HAVE_UIO 1
-#   define HAVE_CLOCK_GETTIME 1
-#   define HAVE_FORK 1
-#   define HAVE_ACCEPT4 1
-
-#else
-#   error "No platform defined, abandoning"
-#endif
-
-#endif
diff --git a/libs/libzmq/builds/gyp/project-tests.gsl b/libs/libzmq/builds/gyp/project-tests.gsl
deleted file mode 100644
index 2d0da0d..0000000
--- a/libs/libzmq/builds/gyp/project-tests.gsl
+++ /dev/null
@@ -1,19 +0,0 @@
-.echo "Generating project-tests.gypi..."
-.output "project-tests.gypi"
-{
-  'targets': [
-.for test
-    {
-      'target_name': '$(name)',
-      'type': 'executable',
-      'sources': [
-        '../../tests/$(name).cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    }$(last ()?? ""? ",")
-.endfor
-  ]
-}
diff --git a/libs/libzmq/builds/gyp/project-tests.gypi b/libs/libzmq/builds/gyp/project-tests.gypi
deleted file mode 100644
index cd7f93e..0000000
--- a/libs/libzmq/builds/gyp/project-tests.gypi
+++ /dev/null
@@ -1,917 +0,0 @@
-{
-  'targets': [
-    {
-      'target_name': 'test_system',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_system.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_pair_inproc',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_pair_inproc.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_pair_tcp',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_pair_tcp.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_reqrep_inproc',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_reqrep_inproc.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_reqrep_tcp',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_reqrep_tcp.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_hwm',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_hwm.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_hwm_pubsub',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_hwm_pubsub.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_reqrep_device',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_reqrep_device.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_sub_forward',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_sub_forward.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_invalid_rep',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_invalid_rep.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_msg_flags',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_msg_flags.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_msg_ffn',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_msg_ffn.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_msg_init',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_msg_init.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_connect_resolve',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_connect_resolve.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_immediate',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_immediate.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_last_endpoint',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_last_endpoint.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_term_endpoint',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_term_endpoint.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_srcfd',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_srcfd.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_monitor',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_monitor.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_router_mandatory',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_router_mandatory.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_router_mandatory_hwm',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_router_mandatory_hwm.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_router_handover',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_router_handover.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_probe_router',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_probe_router.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_stream',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_stream.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_stream_empty',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_stream_empty.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_stream_disconnect',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_stream_disconnect.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_stream_timeout',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_stream_timeout.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_disconnect_inproc',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_disconnect_inproc.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_unbind_inproc',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_unbind_inproc.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_unbind_wildcard',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_unbind_wildcard.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_ctx_options',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_ctx_options.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_ctx_destroy',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_ctx_destroy.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_security_null',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_security_null.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_security_plain',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_security_plain.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_security_curve',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_security_curve.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_security_zap',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_security_zap.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_iov',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_iov.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_spec_req',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_spec_req.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_spec_rep',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_spec_rep.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_spec_dealer',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_spec_dealer.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_spec_router',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_spec_router.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_spec_pushpull',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_spec_pushpull.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_req_correlate',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_req_correlate.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_req_relaxed',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_req_relaxed.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_conflate',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_conflate.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_inproc_connect',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_inproc_connect.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_issue_566',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_issue_566.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_proxy',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_proxy.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_proxy_single_socket',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_proxy_single_socket.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_proxy_terminate',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_proxy_terminate.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_getsockopt_memset',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_getsockopt_memset.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_setsockopt',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_setsockopt.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_many_sockets',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_many_sockets.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_ipc_wildcard',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_ipc_wildcard.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_diffserv',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_diffserv.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_connect_rid',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_connect_rid.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_bind_src_address',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_bind_src_address.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_metadata',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_metadata.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_capabilities',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_capabilities.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_xpub_nodrop',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_xpub_nodrop.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_xpub_manual',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_xpub_manual.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_xpub_welcome_msg',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_xpub_welcome_msg.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_atomics',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_atomics.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_client_server',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_client_server.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_thread_safe',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_thread_safe.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_sockopt_hwm',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_sockopt_hwm.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_heartbeats',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_heartbeats.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_stream_exceeds_buffer',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_stream_exceeds_buffer.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_poller',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_poller.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_timers',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_timers.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_radio_dish',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_radio_dish.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_udp',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_udp.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_shutdown_stress',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_shutdown_stress.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_pair_ipc',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_pair_ipc.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_rebind_ipc',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_rebind_ipc.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_reqrep_ipc',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_reqrep_ipc.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_use_fd_ipc',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_use_fd_ipc.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_use_fd_tcp',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_use_fd_tcp.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_timeo',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_timeo.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_filter_ipc',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_filter_ipc.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_fork',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_fork.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_abstract_ipc',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_abstract_ipc.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    },
-    {
-      'target_name': 'test_pubsub',
-      'type': 'executable',
-      'sources': [
-        '../../tests/test_pubsub.cpp',
-        '../../tests/testutil.hpp'
-      ],
-      'dependencies': [
-        'libzmq'
-      ],
-    }
-  ]
-}
diff --git a/libs/libzmq/builds/gyp/project-tests.xml b/libs/libzmq/builds/gyp/project-tests.xml
deleted file mode 100644
index 9a86391..0000000
--- a/libs/libzmq/builds/gyp/project-tests.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<tests script = "project-tests">
-    <test name = "test_system" />
-    <test name = "test_pair_inproc" />
-    <test name = "test_pair_tcp" />
-    <test name = "test_reqrep_inproc" />
-    <test name = "test_reqrep_tcp" />
-    <test name = "test_hwm" />
-    <test name = "test_hwm_pubsub" />
-    <test name = "test_reqrep_device" />
-    <test name = "test_sub_forward" />
-    <test name = "test_invalid_rep" />
-    <test name = "test_msg_flags" />
-    <test name = "test_msg_ffn" />
-    <test name = "test_msg_init" />
-    <test name = "test_connect_resolve" />
-    <test name = "test_immediate" />
-    <test name = "test_last_endpoint" />
-    <test name = "test_term_endpoint" />
-    <test name = "test_srcfd" />
-    <test name = "test_monitor" />
-    <test name = "test_router_mandatory" />
-    <test name = "test_router_mandatory_hwm" />
-    <test name = "test_router_handover" />
-    <test name = "test_probe_router" />
-    <test name = "test_stream" />
-    <test name = "test_stream_empty" />
-    <test name = "test_stream_disconnect" />
-    <test name = "test_stream_timeout" />
-    <test name = "test_disconnect_inproc" />
-    <test name = "test_unbind_inproc" />
-    <test name = "test_unbind_wildcard" />
-    <test name = "test_ctx_options" />
-    <test name = "test_ctx_destroy" />
-    <test name = "test_security_null" />
-    <test name = "test_security_plain" />
-    <test name = "test_security_curve" />
-    <test name = "test_security_zap" />
-    <test name = "test_iov" />
-    <test name = "test_spec_req" />
-    <test name = "test_spec_rep" />
-    <test name = "test_spec_dealer" />
-    <test name = "test_spec_router" />
-    <test name = "test_spec_pushpull" />
-    <test name = "test_req_correlate" />
-    <test name = "test_req_relaxed" />
-    <test name = "test_conflate" />
-    <test name = "test_inproc_connect" />
-    <test name = "test_issue_566" />
-    <test name = "test_proxy" />
-    <test name = "test_proxy_single_socket" />
-    <test name = "test_proxy_terminate" />
-    <test name = "test_getsockopt_memset" />
-    <test name = "test_setsockopt" />
-    <test name = "test_many_sockets" />
-    <test name = "test_ipc_wildcard" />
-    <test name = "test_diffserv" />
-    <test name = "test_connect_rid" />
-    <test name = "test_bind_src_address" />
-    <test name = "test_metadata" />
-    <test name = "test_capabilities" />
-    <test name = "test_xpub_nodrop" />
-    <test name = "test_xpub_manual" />
-    <test name = "test_xpub_welcome_msg" />
-    <test name = "test_atomics" />
-    <test name = "test_client_server" />
-    <test name = "test_thread_safe" />
-    <test name = "test_sockopt_hwm" />
-    <test name = "test_heartbeats" />
-    <test name = "test_stream_exceeds_buffer" />
-    <test name = "test_poller" />
-    <test name = "test_timers" />
-    <test name = "test_radio_dish" />
-    <test name = "test_udp" />
-    <test name = "test_shutdown_stress" />
-    <test name = "test_pair_ipc" />
-    <test name = "test_rebind_ipc" />
-    <test name = "test_reqrep_ipc" />
-    <test name = "test_use_fd_ipc" />
-    <test name = "test_use_fd_tcp" />
-    <test name = "test_timeo" />
-    <test name = "test_filter_ipc" />
-    <test name = "test_fork" />
-    <test name = "test_abstract_ipc" />
-    <test name = "test_pubsub" />
-</tests>
diff --git a/libs/libzmq/builds/gyp/project.gyp b/libs/libzmq/builds/gyp/project.gyp
deleted file mode 100644
index f06100e..0000000
--- a/libs/libzmq/builds/gyp/project.gyp
+++ /dev/null
@@ -1,296 +0,0 @@
-#
-#   This is the gyp script for libzmq
-#
-#   Run in builds/gyp, as follows:
-#
-#       gyp --depth=. --format=make
-#       make
-{
-  'includes': [
-    'project-tests.gypi',
-  ],
-  'target_defaults': {
-    'include_dirs': [
-      '../../include',
-      '.'
-    ],
-    'defines': [
-      '_REENTRANT',
-      '_THREAD_SAFE',
-      'ZMQ_CUSTOM_PLATFORM_HPP',
-      'ZMQ_GYP_BUILD'
-    ],
-    'conditions': [
-      [ 'OS=="win"', {
-        'defines': [
-          'ZMQ_HAVE_WINDOWS',
-          'ZMQ_STATIC',
-          'FD_SETSIZE=16384',
-          '_CRT_SECURE_NO_WARNINGS',
-          '_WINSOCK_DEPRECATED_NO_WARNINGS'
-        ],
-        'libraries': [
-          'ws2_32',
-          'advapi32',
-          'iphlpapi'
-        ]
-      }],
-      [ 'OS=="mac"', {
-        'defines': [
-          'ZMQ_HAVE_OSX'
-        ],
-        'xcode_settings': {
-          'GCC_ENABLE_CPP_RTTI': 'YES'
-        }
-      }],
-      [ 'OS=="linux"', {
-        'defines': [
-          'ZMQ_HAVE_LINUX'
-        ],
-        'cflags_cc!': [
-          '-fno-rtti'
-        ],
-        'libraries': [
-          '-lpthread'
-        ]
-      }]
-    ]
-  },
-  'targets': [
-    {
-      'target_name': 'libzmq',
-      'type': 'static_library',
-      'sources': [
-        'platform.hpp',
-        '../../include/zmq.h',
-        '../../src/address.cpp',
-        '../../src/address.hpp',
-        '../../src/array.hpp',
-        '../../src/atomic_counter.hpp',
-        '../../src/atomic_ptr.hpp',
-        '../../src/blob.hpp',
-        '../../src/client.cpp',
-        '../../src/client.hpp',
-        '../../src/clock.cpp',
-        '../../src/clock.hpp',
-        '../../src/command.hpp',
-        '../../src/compat.hpp',
-        '../../src/condition_variable.hpp',
-        '../../src/config.hpp',
-        '../../src/ctx.cpp',
-        '../../src/ctx.hpp',
-        '../../src/curve_client.cpp',
-        '../../src/curve_client.hpp',
-        '../../src/curve_client_tools.hpp',
-        '../../src/curve_mechanism_base.cpp',
-        '../../src/curve_mechanism_base.hpp',
-        '../../src/curve_server.cpp',
-        '../../src/curve_server.hpp',
-        '../../src/dbuffer.hpp',
-        '../../src/dealer.cpp',
-        '../../src/dealer.hpp',
-        '../../src/decoder.hpp',
-        '../../src/decoder_allocators.cpp',
-        '../../src/decoder_allocators.hpp',
-        '../../src/devpoll.cpp',
-        '../../src/devpoll.hpp',
-        '../../src/dish.cpp',
-        '../../src/dish.hpp',
-        '../../src/dist.cpp',
-        '../../src/dist.hpp',
-        '../../src/encoder.hpp',
-        '../../src/epoll.cpp',
-        '../../src/epoll.hpp',
-        '../../src/err.cpp',
-        '../../src/err.hpp',
-        '../../src/fd.hpp',
-        '../../src/fq.cpp',
-        '../../src/fq.hpp',
-        '../../src/gssapi_client.cpp',
-        '../../src/gssapi_client.hpp',
-        '../../src/gssapi_mechanism_base.cpp',
-        '../../src/gssapi_mechanism_base.hpp',
-        '../../src/gssapi_server.cpp',
-        '../../src/gssapi_server.hpp',
-        '../../src/i_decoder.hpp',
-        '../../src/i_encoder.hpp',
-        '../../src/i_engine.hpp',
-        '../../src/i_mailbox.hpp',
-        '../../src/i_poll_events.hpp',
-        '../../src/io_object.cpp',
-        '../../src/io_object.hpp',
-        '../../src/io_thread.cpp',
-        '../../src/io_thread.hpp',
-        '../../src/ip.cpp',
-        '../../src/ip.hpp',
-        '../../src/ipc_address.cpp',
-        '../../src/ipc_address.hpp',
-        '../../src/ipc_connecter.cpp',
-        '../../src/ipc_connecter.hpp',
-        '../../src/ipc_listener.cpp',
-        '../../src/ipc_listener.hpp',
-        '../../src/kqueue.cpp',
-        '../../src/kqueue.hpp',
-        '../../src/lb.cpp',
-        '../../src/lb.hpp',
-        '../../src/likely.hpp',
-        '../../src/mailbox.cpp',
-        '../../src/mailbox.hpp',
-        '../../src/mailbox_safe.cpp',
-        '../../src/mailbox_safe.hpp',
-        '../../src/mechanism.cpp',
-        '../../src/mechanism.hpp ',
-        '../../src/mechanism_base.cpp',
-        '../../src/mechanism_base.hpp ',
-        '../../src/metadata.cpp',
-        '../../src/metadata.hpp',
-        '../../src/msg.cpp',
-        '../../src/msg.hpp',
-        '../../src/mtrie.cpp',
-        '../../src/mtrie.hpp',
-        '../../src/mutex.hpp',
-        '../../src/norm_engine.cpp',
-        '../../src/norm_engine.hpp',
-        '../../src/null_mechanism.cpp',
-        '../../src/null_mechanism.hpp',
-        '../../src/object.cpp',
-        '../../src/object.hpp',
-        '../../src/options.cpp',
-        '../../src/options.hpp',
-        '../../src/own.cpp',
-        '../../src/own.hpp',
-        '../../src/pair.cpp',
-        '../../src/pair.hpp',
-        '../../src/pgm_receiver.cpp',
-        '../../src/pgm_receiver.hpp',
-        '../../src/pgm_sender.cpp',
-        '../../src/pgm_sender.hpp',
-        '../../src/pgm_socket.cpp',
-        '../../src/pgm_socket.hpp',
-        '../../src/pipe.cpp',
-        '../../src/pipe.hpp',
-        '../../src/plain_client.cpp',
-        '../../src/plain_client.hpp',
-        '../../src/plain_server.cpp',
-        '../../src/plain_server.hpp',
-        '../../src/poll.cpp',
-        '../../src/poll.hpp',
-        '../../src/poller.hpp',
-        '../../src/poller_base.cpp',
-        '../../src/poller_base.hpp',
-        '../../src/proxy.cpp',
-        '../../src/proxy.hpp',
-        '../../src/pub.cpp',
-        '../../src/pub.hpp',
-        '../../src/pull.cpp',
-        '../../src/pull.hpp',
-        '../../src/push.cpp',
-        '../../src/push.hpp',
-        '../../src/radio.cpp',
-        '../../src/radio.hpp',
-        '../../src/random.cpp',
-        '../../src/random.hpp',
-        '../../src/raw_decoder.cpp',
-        '../../src/raw_decoder.hpp',
-        '../../src/raw_encoder.cpp',
-        '../../src/raw_encoder.hpp',
-        '../../src/reaper.cpp',
-        '../../src/reaper.hpp',
-        '../../src/rep.cpp',
-        '../../src/rep.hpp',
-        '../../src/req.cpp',
-        '../../src/req.hpp',
-        '../../src/router.cpp',
-        '../../src/router.hpp',
-        '../../src/select.cpp',
-        '../../src/select.hpp',
-        '../../src/server.cpp',
-        '../../src/server.hpp',
-        '../../src/session_base.cpp',
-        '../../src/session_base.hpp',
-        '../../src/signaler.cpp',
-        '../../src/signaler.hpp',
-        '../../src/socket_base.cpp',
-        '../../src/socket_base.hpp',
-        '../../src/socket_poller.cpp',
-        '../../src/socket_poller.hpp',
-        '../../src/socks.cpp',
-        '../../src/socks.hpp',
-        '../../src/socks_connecter.cpp',
-        '../../src/socks_connecter.hpp',
-        '../../src/stdint.hpp',
-        '../../src/stream.cpp',
-        '../../src/stream.hpp',
-        '../../src/stream_engine.cpp',
-        '../../src/stream_engine.hpp',
-        '../../src/sub.cpp',
-        '../../src/sub.hpp',
-        '../../src/tcp.cpp',
-        '../../src/tcp.hpp',
-        '../../src/tcp_address.cpp',
-        '../../src/tcp_address.hpp',
-        '../../src/tcp_connecter.cpp',
-        '../../src/tcp_connecter.hpp',
-        '../../src/tcp_listener.cpp',
-        '../../src/tcp_listener.hpp',
-        '../../src/thread.cpp',
-        '../../src/thread.hpp',
-        '../../src/timers.cpp',
-        '../../src/timers.hpp',
-        '../../src/tipc_address.cpp',
-        '../../src/tipc_address.hpp',
-        '../../src/tipc_connecter.cpp',
-        '../../src/tipc_connecter.hpp',
-        '../../src/tipc_listener.cpp',
-        '../../src/tipc_listener.hpp',
-        '../../src/trie.cpp',
-        '../../src/trie.hpp',
-        '../../src/tweetnacl.c',
-        '../../src/tweetnacl.h',
-        '../../src/udp_address.cpp',
-        '../../src/udp_address.hpp',
-        '../../src/udp_engine.cpp',
-        '../../src/udp_engine.hpp',
-        '../../src/v1_decoder.cpp',
-        '../../src/v1_decoder.hpp',
-        '../../src/v1_encoder.cpp',
-        '../../src/v1_encoder.hpp',
-        '../../src/v2_decoder.cpp',
-        '../../src/v2_decoder.hpp',
-        '../../src/v2_encoder.cpp',
-        '../../src/v2_encoder.hpp',
-        '../../src/v2_protocol.hpp',
-        '../../src/vmci.cpp',
-        '../../src/vmci.hpp',
-        '../../src/vmci_address.cpp',
-        '../../src/vmci_address.hpp',
-        '../../src/vmci_connecter.cpp',
-        '../../src/vmci_connecter.hpp',
-        '../../src/vmci_listener.cpp',
-        '../../src/vmci_listener.hpp',
-        '../../src/windows.hpp',
-        '../../src/wire.hpp',
-        '../../src/xpub.cpp',
-        '../../src/xpub.hpp',
-        '../../src/xsub.cpp',
-        '../../src/xsub.hpp',
-        '../../src/ypipe.hpp',
-        '../../src/ypipe_base.hpp',
-        '../../src/ypipe_conflate.hpp',
-        '../../src/yqueue.hpp',
-        '../../src/zap_client.cpp',
-        '../../src/zap_client.hpp',
-        '../../src/zmq.cpp',
-        '../../src/zmq_utils.cpp'
-      ],
-      'copies': [
-        {
-          'destination': '../../src',
-          'files': [
-              'platform.hpp'
-          ]
-        }
-      ]
-    }
-  ]
-}
diff --git a/libs/libzmq/builds/ios/build_ios.sh b/libs/libzmq/builds/ios/build_ios.sh
deleted file mode 100755
index d45b302..0000000
--- a/libs/libzmq/builds/ios/build_ios.sh
+++ /dev/null
@@ -1,112 +0,0 @@
-#!/bin/sh
-# This is a first attempt to create a script to libzmq for iOS >= 13.5, including arm64
-# inspired on https://raw.githubusercontent.com/drewcrawford/libzmq-ios/master/libzmq.sh
-
-set -e
-LIBNAME="libzmq.a"
-ARCHS=${ARCHS:-"armv7 armv7s arm64 x86_64"}
-DEVELOPER=$(xcode-select -print-path)
-LIPO=$(xcrun -sdk iphoneos -find lipo)
-SCRIPTDIR=$( (cd -P $(dirname $0) && pwd) )
-DISTLIBDIR="${SCRIPTDIR}/lib"
-DSTDIR=${SCRIPTDIR}
-BUILDDIR="${DSTDIR}/libzmq_build"
-DISTDIR="${DSTDIR}/libzmq_dist"
-LIBDIR=$(dirname $(dirname ${SCRIPTDIR}))
-SDK=$(xcodebuild -showsdks \
-    | grep iphoneos | sort | tail -n 1 | awk '{print substr($NF, 9)}'
-    )
-IOS_VERSION_MIN=8.0
-OTHER_LDFLAGS=""
-OTHER_CFLAGS="-Os -Qunused-arguments"
-# Enable Bitcode
-OTHER_CPPFLAGS="-Os -fembed-bitcode"
-OTHER_CXXFLAGS="-Os"
-
-${LIBDIR}/autogen.sh
-for ARCH in $ARCHS
-do
-    BUILDARCHDIR="$BUILDDIR/$ARCH"
-    mkdir -p ${BUILDARCHDIR}
-
-    case ${ARCH} in
-        armv7)
-	    PLATFORM="iPhoneOS"
-	    HOST="${ARCH}-apple-darwin"
-	    export BASEDIR="${DEVELOPER}/Platforms/${PLATFORM}.platform/Developer"
-	    export ISDKROOT="${BASEDIR}/SDKs/${PLATFORM}${SDK}.sdk"
-	    export CXXFLAGS="${OTHER_CXXFLAGS}"
-	    export CPPFLAGS="-arch ${ARCH} -isysroot ${ISDKROOT} -mios-version-min=${IOS_VERSION_MIN} ${OTHER_CPPFLAGS}"
-	    export LDFLAGS="-arch ${ARCH} -isysroot ${ISDKROOT} ${OTHER_LDFLAGS}"
-            ;;
-
-        armv7s)
-	    PLATFORM="iPhoneOS"
-	    HOST="${ARCH}-apple-darwin"
-	    export BASEDIR="${DEVELOPER}/Platforms/${PLATFORM}.platform/Developer"
-	    export ISDKROOT="${BASEDIR}/SDKs/${PLATFORM}${SDK}.sdk"
-	    export CXXFLAGS="${OTHER_CXXFLAGS}"
-	    export CPPFLAGS="-arch ${ARCH} -isysroot ${ISDKROOT} -mios-version-min=${IOS_VERSION_MIN} ${OTHER_CPPFLAGS}"
-	    export LDFLAGS="-arch ${ARCH} -isysroot ${ISDKROOT} ${OTHER_LDFLAGS}"
-            ;;
-
-        arm64)
-	    PLATFORM="iPhoneOS"
-	    HOST="arm-apple-darwin"
-	    export BASEDIR="${DEVELOPER}/Platforms/${PLATFORM}.platform/Developer"
-	    export ISDKROOT="${BASEDIR}/SDKs/${PLATFORM}${SDK}.sdk"
-	    export CXXFLAGS="${OTHER_CXXFLAGS}"
-	    export CPPFLAGS="-arch ${ARCH} -isysroot ${ISDKROOT} -mios-version-min=${IOS_VERSION_MIN} ${OTHER_CPPFLAGS}"
-	    export LDFLAGS="-arch ${ARCH} -isysroot ${ISDKROOT} ${OTHER_LDFLAGS}"
-            ;;
-
-        x86_64)
-	    PLATFORM="iPhoneSimulator"
-	    HOST="${ARCH}-apple-darwin"
-	    export BASEDIR="${DEVELOPER}/Platforms/${PLATFORM}.platform/Developer"
-	    export ISDKROOT="${BASEDIR}/SDKs/${PLATFORM}${SDK}.sdk"
-	    export CXXFLAGS="${OTHER_CXXFLAGS}"
-	    export CPPFLAGS="-arch ${ARCH} -isysroot ${ISDKROOT} -mios-version-min=${IOS_VERSION_MIN} ${OTHER_CPPFLAGS}"
-	    export LDFLAGS="-arch ${ARCH} ${OTHER_LDFLAGS}"
-	    echo "LDFLAGS $LDFLAGS"
-            ;;
-        *)
-	    echo "Unsupported architecture ${ARCH}"
-	    exit 1
-            ;;
-    esac
-
-    echo "Configuring for ${ARCH}..."
-    set +e
-    cd ${LIBDIR} 
-    set -e
-    ${LIBDIR}/configure \
-	--prefix=${BUILDARCHDIR} \
-	--disable-shared \
-	--enable-static \
-	--host=${HOST} \
-	--disable-perf \
-	--disable-curve-keygen
-
-    echo "Building ${LIBNAME} for ${ARCH}..."
-    cd ${LIBDIR}
-    
-    make -j8 
-    make install
-	make clean
-
-done
-
-mkdir -p ${DISTLIBDIR}
-for ARCH in $ARCHS
-do
-	LIBPATH="$BUILDDIR/$ARCH/lib/${LIBNAME}"
-	LIBLIST+=" -arch ${ARCH} ${LIBPATH}"
-done
-
-set +e
-
-${LIPO} -create ${LIBLIST} -output ${DISTLIBDIR}/${LIBNAME}
-
-echo "Done !"
-
diff --git a/libs/libzmq/builds/mingw32/Makefile.mingw32 b/libs/libzmq/builds/mingw32/Makefile.mingw32
deleted file mode 100644
index 3d9177f..0000000
--- a/libs/libzmq/builds/mingw32/Makefile.mingw32
+++ /dev/null
@@ -1,49 +0,0 @@
-CC=gcc
-CFLAGS=-Wall -Os -g -DDLL_EXPORT -DFD_SETSIZE=16384 -DZMQ_USE_SELECT -I.
-LIBS=-lws2_32 -lIphlpapi -lsodium
-
-OBJS = ctx.o reaper.o dist.o err.o \
-	clock.o metadata.o random.o \
-	object.o own.o \
-	io_object.o io_thread.o \
-	lb.o fq.o \
-	address.o tcp_address.o ipc_address.o \
-	ipc_connecter.o ipc_listener.o \
-	tcp_connecter.o tcp_listener.o \
-	mailbox.o msg.o mtrie.o \
-	pipe.o precompiled.o proxy.o \
-	signaler.o stream_engine.o \
-	thread.o trie.o \
-	ip.o tcp.o \
-	pgm_socket.o pgm_receiver.o pgm_sender.o \
-	raw_decoder.o raw_encoder.o \
-	v1_decoder.o v1_encoder.o v2_decoder.o v2_encoder.o \
-        udp_address.o udp_engine.o radio.o dish.o \
-	socket_base.o session_base.o options.o \
-	req.o rep.o push.o pull.o pub.o sub.o pair.o \
-	dealer.o router.o xpub.o xsub.o stream.o \
-	poller_base.o select.o poll.o epoll.o kqueue.o devpoll.o \
-	curve_client.o curve_server.o \
-	mechanism.o null_mechanism.o plain_client.o plain_server.o \
-	socks.o server.o decoder_allocators.o socks_connecter.o \
-	socket_poller.o mailbox_safe.o plain_server.o client.o timers.o \
-	zmq.o zmq_utils.o gather.o scatter.o dgram.o
-
-%.o: ../../src/%.cpp
-	$(CC) -c -o $@ $< $(CFLAGS)
-
-%.o: ../../perf/%.cpp
-	$(CC) -c -o $@ $< $(CFLAGS)
-
-all: libzmq.dll
-
-perf: inproc_lat.exe inproc_thr.exe local_lat.exe local_thr.exe remote_lat.exe remote_thr.exe
-
-libzmq.dll: $(OBJS)
-	g++ -shared -static -O2 -s -o $@ $^ -Wl,--out-implib,$@.a $(LIBS)
-
-%.exe: %.o libzmq.dll
-	g++ -o -O2 $@ $^
-
-clean:
-	del *.o *.a *.dll *.exe
diff --git a/libs/libzmq/builds/mingw32/platform.hpp b/libs/libzmq/builds/mingw32/platform.hpp
deleted file mode 100644
index 988d717..0000000
--- a/libs/libzmq/builds/mingw32/platform.hpp
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_PLATFORM_HPP_INCLUDED__
-#define __ZMQ_PLATFORM_HPP_INCLUDED__
-
-//  This is the platform definition for the MSVC platform.
-//  As a first step of the build process it is copied to
-//  zmq directory to take place of platform.hpp generated from
-//  platform.hpp.in on platforms supported by GNU autotools.
-//  Place any MSVC-specific definitions here.
-
-#define ZMQ_HAVE_WINDOWS
-
-#define ZMQ_USE_LIBSODIUM
-
-#endif
diff --git a/libs/libzmq/builds/nuget/libzmq.autopkg b/libs/libzmq/builds/nuget/libzmq.autopkg
deleted file mode 100644
index 8b8b365..0000000
--- a/libs/libzmq/builds/nuget/libzmq.autopkg
+++ /dev/null
@@ -1,52 +0,0 @@
-nuget{
-  nuspec{
-    id = libzmq;
-    version : 4.1.0-alpha;
-    title: ZMQ - Code Connected;
-    authors: { zeromq };
-    owners: { phreed, jgoz };
-    licenseUrl: "https://www.gnu.org/licenses/lgpl.html";
-    projectUrl: "http://www.zeromq.org/";
-    iconUrl: "http://www.zeromq.org/local--files/admin:css/logo.gif";
-    requireLicenseAcceptance: false;
-    summary: Code Connected;
-    description: @" 
-ZeroMQ \zeromq\:
-- Connect your code in any language, on any platform.
-- Carries messages across inproc, IPC, TCP, TPIC, multicast.
-- Smart patterns like pub-sub, push-pull, and router-dealer.
-- High-speed asynchronous I/O engines, in a tiny library.
-- Backed by a large and active open source community.
-- Supports every modern language and platform.
-- Build any architecture: centralized, distributed, small, or large.
-- Free software with full commercial support.";
-    releaseNotes: "Made a NuGet package.";
-    copyright: Copyright 2012 iMatix Corporation and Contributors;
-    tags: {0mq, zeromq, nuget, native; }
-  }
-
-  files{
-    #defines {
-       SDK_ROOT = ..\..\;
-       SDK_2010 = ..\msvc\;
-    }  
-    include: { "${SDK_ROOT}include\*" };
-    docs: { "${SDK_ROOT}doc\*.txt" };
-
-    [x64,v100,debug] {
-       lib: ${SDK_2010}Debug\libzmq.lib;     
-       symbols: ${SDK_2010}Debug\libzmq.pdb;     
-    }    
-
-    [x64,v100,release] {
-       lib: ${SDK_2010}Release\libzmq.lib;     
-       bin: ${SDK_2010}..\..\lib\libzmq.dll; 
-    }    
-
-    targets{
-       Defines += HAS_CPP_ZMQ_SDK;
-    }
-  }
-}
-
-
diff --git a/libs/libzmq/builds/nuget/readme.nuget b/libs/libzmq/builds/nuget/readme.nuget
deleted file mode 100644
index aa6fec8..0000000
--- a/libs/libzmq/builds/nuget/readme.nuget
+++ /dev/null
@@ -1,20 +0,0 @@
-
-NuGet is a package management system for MS-Windows.
-It is similar in spirit to tools like Maven or Gradle.
-
-It was originally for .Net only packages but it has 
-recently been augmented to working with native packages.
-http://docs.nuget.org/docs/reference/support-for-native-projects
-
-The instructions for building a NuGet package can be found here:
-http://coapp.org/pages/tutorials.html
-
-
-The basic procedure is to first build all 
-the artifacts and then run ...
- Write-NuGetPackage .\libzmq.autopkg 
-
-The *.nuget files thus produced can then be installed
-in a local repository or uploaded to one of the nuget servers.
-
-
diff --git a/libs/libzmq/builds/openwrt/Makefile b/libs/libzmq/builds/openwrt/Makefile
deleted file mode 100644
index 1884a9b..0000000
--- a/libs/libzmq/builds/openwrt/Makefile
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright (C) [2011-2012] [TheClashingRocks.org]
-#
-# Author: Jiva Nath Bagale <jnbagale@gmail.com>
-# author: Victor Perron <victor@iso3103.net>
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-# 
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=zeromq
-PKG_VERSION:=master
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/zeromq/libzmq.git
-PKG_SOURCE:=$(PKG_NAME).tar.gz
-PKG_SOURCE_VERSION:=HEAD
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
-
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/zeromq
-    MAINTAINER:=victor@iso3103.net
-    TITLE:=zeromq
-    SECTION:=libs
-    DEPENDS:=+libstdcpp +libpthread +librt +libsodium
-    CATEGORY:=Libraries
-    URL:=http://www.zeromq.org/
-endef
-
-define Package/zeromq/description
-    The library provides light weight messaging services using an intelligent transport layer. 
-    It can carry messages across inproc, IPC, TCP and multicast and is faster than TCP for 
-    clustered products and supercomputing.
-endef
-
-define Build/Configure
-	( cd $(PKG_BUILD_DIR); ./autogen.sh );
-	$(call Build/Configure/Default)
-endef
-
-TARGET_CPPFLAGS:=$(filter-out -Werror, $(TARGET_CFLAGS))
-
-define Build/InstallDev
-	$(INSTALL_DIR) \
-		$(1)/usr/lib 	\
-		$(1)/usr/include \
-		$(1)/usr/lib/pkgconfig
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/* \
-		$(1)/usr/lib/
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/include/* \
-		$(1)/usr/include/
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/pkgconfig \
-		$(1)/usr/lib/
-
-endef
-
-define Package/zeromq/install
-	$(INSTALL_DIR) $(1)/usr/lib 
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,zeromq))
diff --git a/libs/libzmq/builds/qnx/ToolchainQNX6.6_x86.cmake b/libs/libzmq/builds/qnx/ToolchainQNX6.6_x86.cmake
deleted file mode 100644
index 9d5645c..0000000
--- a/libs/libzmq/builds/qnx/ToolchainQNX6.6_x86.cmake
+++ /dev/null
@@ -1,20 +0,0 @@
-set(CMAKE_SYSTEM_NAME QNX)
-
-set(arch gcc_ntox86)
-set(ntoarch x86)
-set(QNX_PROCESSOR x86)
-
-set(CMAKE_C_COMPILER qcc )
-set(CMAKE_C_COMPILER_TARGET ${arch})
-
-set(CMAKE_CXX_COMPILER QCC -lang-c++ -g)
-set(CMAKE_CXX_COMPILER_TARGET ${arch})
-
-set(CMAKE_ASM_COMPILER qcc -V${arch})
-set(CMAKE_ASM_DEFINE_FLAG "-Wa,--defsym,")
-
-set(CMAKE_RANLIB $ENV{QNX_HOST}/usr/bin/nto${ntoarch}-ranlib
-	    CACHE PATH "QNX ranlib Program" FORCE)
-    set(CMAKE_AR $ENV{QNX_HOST}/usr/bin/nto${ntoarch}-ar
-	        CACHE PATH "QNX ar Program" FORCE)
-
diff --git a/libs/libzmq/builds/valgrind/ci_build.sh b/libs/libzmq/builds/valgrind/ci_build.sh
deleted file mode 100755
index 5d4ea4d..0000000
--- a/libs/libzmq/builds/valgrind/ci_build.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/usr/bin/env bash
-
-set -x
-
-mkdir tmp
-BUILD_PREFIX=$PWD/tmp
-
-CONFIG_OPTS=()
-CONFIG_OPTS+=("CFLAGS=-g")
-CONFIG_OPTS+=("CPPFLAGS=-I${BUILD_PREFIX}/include")
-CONFIG_OPTS+=("CXXFLAGS=-g")
-CONFIG_OPTS+=("LDFLAGS=-L${BUILD_PREFIX}/lib")
-CONFIG_OPTS+=("PKG_CONFIG_PATH=${BUILD_PREFIX}/lib/pkgconfig")
-CONFIG_OPTS+=("--prefix=${BUILD_PREFIX}")
-CONFIG_OPTS+=("--enable-valgrind")
-
-if [ -n "$TLS" ] && [ "$TLS" == "enabled" ]; then
-    CONFIG_OPTS+=("--with-tls=yes")
-fi
-
-if [ -z $CURVE ]; then
-    CONFIG_OPTS+=("--disable-curve")
-elif [ $CURVE == "libsodium" ]; then
-    CONFIG_OPTS+=("--with-libsodium=yes")
-
-    if ! ((command -v dpkg-query >/dev/null 2>&1 && dpkg-query --list libsodium-dev >/dev/null 2>&1) || \
-            (command -v brew >/dev/null 2>&1 && brew ls --versions libsodium >/dev/null 2>&1)); then
-        git clone --depth 1 -b stable https://github.com/jedisct1/libsodium.git
-        ( cd libsodium; ./autogen.sh; ./configure --prefix=$BUILD_PREFIX; make install)
-    fi
-fi
-
-# Build, check, and install from local source
-( cd ../..; ./autogen.sh && ./configure "${CONFIG_OPTS[@]}" && make -j5 && make VERBOSE=1 check-valgrind-memcheck) || exit 1
diff --git a/libs/libzmq/builds/valgrind/valgrind.supp b/libs/libzmq/builds/valgrind/valgrind.supp
deleted file mode 100644
index b8a6bc7..0000000
--- a/libs/libzmq/builds/valgrind/valgrind.supp
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-   <socketcall_sendto>
-   Memcheck:Param
-   socketcall.sendto(msg)
-   fun:send
-   ...
-}
-{
-   <socketcall_sendto>
-   Memcheck:Param
-   socketcall.send(msg)
-   fun:send
-   ...
-}
-{
-   <glibc_freeres>
-   Memcheck:Free
-   fun:free
-   ...
-   fun:__libc_freeres
-   ...
-}
diff --git a/libs/libzmq/builds/valgrind/vg b/libs/libzmq/builds/valgrind/vg
deleted file mode 100755
index 9dfbfb5..0000000
--- a/libs/libzmq/builds/valgrind/vg
+++ /dev/null
@@ -1 +0,0 @@
-valgrind --tool=memcheck --leak-check=full --suppressions=valgrind.supp $*
diff --git a/libs/libzmq/builds/vxworks/platform.hpp b/libs/libzmq/builds/vxworks/platform.hpp
deleted file mode 100644
index df18f13..0000000
--- a/libs/libzmq/builds/vxworks/platform.hpp
+++ /dev/null
@@ -1,306 +0,0 @@
-/* src/platform.hpp.  Generated from platform.hpp.in by configure.  */
-/* src/platform.hpp.in.  Generated from configure.ac by autoheader.  */
-
-/* Define to 1 if you have the <alloca.h> header file. */
-/* #undef HAVE_ALLOCA_H */
-
-/* Define to 1 if you have the <arpa/inet.h> header file. */
-#define HAVE_ARPA_INET_H 1
-
-/* Define to 1 if you have the `clock_gettime' function. */
-#define HAVE_CLOCK_GETTIME 1
-
-/* Define to 1 if you have the declaration of `LOCAL_PEERCRED', and to 0 if
-   you don't. */
-#define HAVE_DECL_LOCAL_PEERCRED 0
-
-/* Define to 1 if you have the declaration of `SO_PEERCRED', and to 0 if you
-   don't. */
-#define HAVE_DECL_SO_PEERCRED 0
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#define HAVE_DLFCN_H 1
-
-/* Define to 1 if you have the <errno.h> header file. */
-#define HAVE_ERRNO_H 1
-
-/* Define to 1 if you have the `fork' function. */
-#define HAVE_FORK 1
-
-/* Define to 1 if you have the `freeifaddrs' function. */
-#define HAVE_FREEIFADDRS 1
-
-/* Define to 1 if you have the `gethrtime' function. */
-/* #undef HAVE_GETHRTIME */
-
-/* Define to 1 if you have the `getifaddrs' function. */
-#define HAVE_GETIFADDRS 1
-
-/* Define to 1 if you have the `gettimeofday' function. */
-#define HAVE_GETTIMEOFDAY 1
-
-/* Define to 1 if you have the <ifaddrs.h> header file. */
-//#define HAVE_IFADDRS_H 1
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#define HAVE_INTTYPES_H 1
-
-/* Define to 1 if you have the `gssapi_krb5' library (-lgssapi_krb5). */
-/* #undef HAVE_LIBGSSAPI_KRB5 */
-
-/* Define to 1 if you have the `iphlpapi' library (-liphlpapi). */
-/* #undef HAVE_LIBIPHLPAPI */
-
-/* Define to 1 if you have the `nsl' library (-lnsl). */
-/* #undef HAVE_LIBNSL */
-
-/* Define to 1 if you have the `pthread' library (-lpthread). */
-/* #undef HAVE_LIBPTHREAD */
-
-/* Define to 1 if you have the `rpcrt4' library (-lrpcrt4). */
-/* #undef HAVE_LIBRPCRT4 */
-
-/* Define to 1 if you have the `rt' library (-lrt). */
-/* #undef HAVE_LIBRT */
-
-/* Define to 1 if you have the `socket' library (-lsocket). */
-/* #undef HAVE_LIBSOCKET */
-
-/* Define to 1 if you have the `sodium' library (-lsodium). */
-/* #undef HAVE_LIBSODIUM */
-
-/* Define to 1 if you have the `ws2_32' library (-lws2_32). */
-/* #undef HAVE_LIBWS2_32 */
-
-/* Define to 1 if you have the <limits.h> header file. */
-#define HAVE_LIMITS_H 1
-
-/* Define to 1 if you have the <memory.h> header file. */
-#define HAVE_MEMORY_H 1
-
-/* Define to 1 if you have the `memset' function. */
-#define HAVE_MEMSET 1
-
-/* Define to 1 if you have the <netinet/in.h> header file. */
-#define HAVE_NETINET_IN_H 1
-
-/* Define to 1 if you have the <netinet/tcp.h> header file. */
-#define HAVE_NETINET_TCP_H 1
-
-/* Define to 1 if you have the `perror' function. */
-#define HAVE_PERROR 1
-
-/* Define to 1 if you have the `socket' function. */
-#define HAVE_SOCKET 1
-
-/* Define to 1 if stdbool.h conforms to C99. */
-#define HAVE_STDBOOL_H 1
-
-/* Define to 1 if you have the <stddef.h> header file. */
-#define HAVE_STDDEF_H 1
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#define HAVE_STDINT_H 1
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#define HAVE_STDLIB_H 1
-
-/* Define to 1 if you have the <strings.h> header file. */
-#define HAVE_STRINGS_H 1
-
-/* Define to 1 if you have the <string.h> header file. */
-#define HAVE_STRING_H 1
-
-/* Define to 1 if you have the <sys/eventfd.h> header file. */
-/* #undef HAVE_SYS_EVENTFD_H */
-
-/* Define to 1 if you have the <sys/socket.h> header file. */
-#define HAVE_SYS_SOCKET_H 1
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#define HAVE_SYS_STAT_H 1
-
-/* Define to 1 if you have the <sys/time.h> header file. */
-#define HAVE_SYS_TIME_H 1
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#define HAVE_SYS_TYPES_H 1
-
-/* Define to 1 if you have the <sys/uio.h> header file. */
-#define HAVE_SYS_UIO_H 1
-
-/* Define to 1 if you have the <time.h> header file. */
-#define HAVE_TIME_H 1
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#define HAVE_UNISTD_H 1
-
-/* Define to 1 if you have the <windows.h> header file. */
-/* #undef HAVE_WINDOWS_H */
-
-/* Define to 1 if the system has the type `_Bool'. */
-/* #undef HAVE__BOOL */
-
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
-   */
-#define LT_OBJDIR ".libs/"
-
-/* Name of package */
-#define PACKAGE "zeromq"
-
-/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT "zeromq-dev@lists.zeromq.org"
-
-/* Define to the full name of this package. */
-#define PACKAGE_NAME "zeromq"
-
-/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "zeromq 4.1.0"
-
-/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME "zeromq"
-
-/* Define to the home page for this package. */
-#define PACKAGE_URL ""
-
-/* Define to the version of this package. */
-#define PACKAGE_VERSION "4.1.0"
-
-/* Define as the return type of signal handlers (`int' or `void'). */
-#define RETSIGTYPE void
-
-/* Define to 1 if you have the ANSI C header files. */
-#define STDC_HEADERS 1
-
-/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
-#define TIME_WITH_SYS_TIME 1
-
-/* Version number of package */
-#define VERSION "4.1.0"
-
-/* Enable militant API assertions */
-/* #undef ZMQ_ACT_MILITANT */
-
-/* Force to use mutexes */
-/* #undef ZMQ_FORCE_MUTEXES */
-
-/* Have VxWorks OS */
-#define ZMQ_HAVE_VXWORKS 1
-
-/* Have AIX OS */
-/* #undef ZMQ_HAVE_AIX */
-
-/* Have Android OS */
-/* #undef ZMQ_HAVE_ANDROID */
-
-/* Have Cygwin */
-/* #undef ZMQ_HAVE_CYGWIN */
-
-/* Have eventfd extension. */
-/* #undef ZMQ_HAVE_EVENTFD */
-
-/* Have FreeBSD OS */
-/* #undef ZMQ_HAVE_FREEBSD */
-
-/* Have HPUX OS */
-/* #undef ZMQ_HAVE_HPUX */
-
-/* Have ifaddrs.h header. */
-//#define ZMQ_HAVE_IFADDRS 1
-
-/* Have Linux OS */
-/* #undef ZMQ_HAVE_LINUX */
-
-/* Have LOCAL_PEERCRED socket option */
-/* #undef ZMQ_HAVE_LOCAL_PEERCRED */
-
-/* Have MinGW32 */
-/* #undef ZMQ_HAVE_MINGW32 */
-
-/* Have NetBSD OS */
-/* #undef ZMQ_HAVE_NETBSD */
-
-/* Have NORM protocol extension */
-/* #undef ZMQ_HAVE_NORM */
-
-/* Have OpenBSD OS */
-/* #undef ZMQ_HAVE_OPENBSD */
-
-/* Have OpenPGM extension */
-/* #undef ZMQ_HAVE_OPENPGM */
-
-/* Have DarwinOSX OS */
-/* #undef ZMQ_HAVE_OSX */
-
-/* Have QNX Neutrino OS */
-/* #undef ZMQ_HAVE_QNXNTO */
-
-/* Whether SOCK_CLOEXEC is defined and functioning. */
-/* #undef ZMQ_HAVE_SOCK_CLOEXEC */
-
-/* Have Solaris OS */
-/* #undef ZMQ_HAVE_SOLARIS */
-
-/* Whether SO_KEEPALIVE is supported. */
-#define ZMQ_HAVE_SO_KEEPALIVE 1
-
-/* Have SO_PEERCRED socket option */
-/* #undef ZMQ_HAVE_SO_PEERCRED */
-
-/* Whether TCP_KEEPALIVE is supported. */
-/* #undef ZMQ_HAVE_TCP_KEEPALIVE */
-
-/* Whether TCP_KEEPCNT is supported. */
-/* #undef ZMQ_HAVE_TCP_KEEPCNT */
-
-/* Whether TCP_KEEPIDLE is supported. */
-/* #undef ZMQ_HAVE_TCP_KEEPIDLE */
-
-/* Whether TCP_KEEPINTVL is supported. */
-/* #undef ZMQ_HAVE_TCP_KEEPINTVL */
-
-/* Have TIPC support */
-#define ZMQ_HAVE_TIPC 1
-
-/* Have uio.h header. */
-//#define ZMQ_HAVE_UIO 1
-
-#define ZMQ_USE_SELECT 1
-
-/* Have Windows OS */
-/* #undef ZMQ_HAVE_WINDOWS */
-
-/* Define for Solaris 2.5.1 so the uint32_t typedef from <sys/synch.h>,
-   <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
-   #define below would cause a syntax error. */
-/* #undef _UINT32_T */
-
-/* Define to empty if `const' does not conform to ANSI C. */
-/* #undef const */
-
-/* Define to `__inline__' or `__inline' if that's what the C compiler
-   calls it, or to nothing if 'inline' is not supported under any name.  */
-#ifndef __cplusplus
-/* #undef inline */
-#endif
-
-/* Define to `unsigned int' if <sys/types.h> does not define. */
-/* #undef size_t */
-
-/* Define to `int' if <sys/types.h> does not define. */
-/* #undef ssize_t */
-
-/* Define to the type of an unsigned integer type of width exactly 32 bits if
-   such a type exists and the standard includes do not define it. */
-/* #undef uint32_t */
-
-/* Define to empty if the keyword `volatile' does not work. Warning: valid
-   code using `volatile' can become incorrect without. Disable with care. */
-/* #undef volatile */
-
-/* ---- Special case for z/OS Unix Services: openedition ---- */
-#include <vxWorks.h>
-
-#ifndef   NI_MAXHOST
-#define   NI_MAXHOST 1025
-#endif
diff --git a/libs/libzmq/builds/zos/README.md b/libs/libzmq/builds/zos/README.md
deleted file mode 100644
index f63e391..0000000
--- a/libs/libzmq/builds/zos/README.md
+++ /dev/null
@@ -1,463 +0,0 @@
-# ZeroMQ on z/OS UNIX System Services
-
-ZeroMQ has been successfully built on z/OS, using [z/OS UNIX System
-Services](http://www-03.ibm.com/systems/z/os/zos/features/unix/),
-a certified UNIX environment for the [IBM
-z-series](http://www-03.ibm.com/systems/z/).  The build is possible
-with the shell scripts in this directory, as described below.
-
-Tested build combinations:
-
-* ZeroMQ 4.0.4, using IBM XL C/C++ compiler, as XPLINK in ILP32 mode
-
-* ZeroMQ 4.0.4, using IBM XL C/C++ compiler, as XPLINK in LP64 mode
-
-* ZeroMQ 4.1-git, using IBM XL C/C++ compiler, as XPLINK in ILP32 mode
-
-Other combinations are likely to work, possibly with minor changes,
-but have not been tested.  Both static library and DLL modes have been
-tested.
-
-There are some minor limitations (detailed below), but all core
-functionality tests run successfully.
-
-
-## Quickstart: building ZeroMQ on z/OS UNIX System Services
-
-Assuming [z/OS UNIX System
-Services](http://www-03.ibm.com/systems/z/os/zos/features/unix/) is
-installed, and the [z/OS XL C/C++
-compiler suite](http://www-03.ibm.com/software/products/en/czos) is 
-installed, ZeroMQ can be built as follows:
-
-*   Download and extract ZeroMQ tar file
-
-*   Ensure contents of this directory are present at `builds/zos`
-    within that extracted directory (eg, `zeromq-VERSION/builds/zos/`; 
-    copy these files in, if not already present, and make sure the
-    shell scripts are executable)
-
-*   (Optional) set ZCXXFLAGS for additional compile flags (see below)
-
-*   Build `libzmq.a` static library and `libzmq.so` dynamic
-    library, with:
-
-        cd zeromq-VERSION
-        builds/zos/makelibzmq
-
-    or to skip the `libzmq.so` dynamic library (only building `libzmq.a`):
-
-        cd zeromq-VERSION
-        BUILD_DLL=false
-        export BUILD_DLL
-        builds/zos/makelibzmq
-
-*   (Optional, but recommended) build and run the core tests with:
-
-        cd zeromq-VERSION
-        builds/zos/maketests
-        builds/zos/runtests
-
-*   To remove built files, to start again (eg, rebuild with different
-    compile/link flags):
-
-        cd zeromq-VERSION
-        builds/zos/makeclean
-
-There are details on specifying alternative compilation flags below.
-
-
-## Quickstart: using ZeroMQ on z/OS UNIX System Services
-
-### Static linking
-
-Install `include/*.h` somewhere on your compiler include path.
-
-Install `src/libzmq.a` somewhere on your library search path.
-
-Compile and link application with:
-
-    c++ -Wc,xplink -Wl,xplink ... -+ -o myprog myprog.cpp -lzmq
-
-Run with:
-
-    ./myprog
-
-
-### Dynamic linking
-
-Install `include/*.h` somewhere on your compiler include path.
-
-Install `src/libzmq.so` somewhere on your LIBPATH.
-
-Install `src/libzmq.x` somewhere you can reference for import linking.
-
-Compile and link application:
-
-    c++ -Wc,xplink -Wc,dll ... -+ -c -o myprog.o myprog.cpp
-    c++ -Wl,xplink -o myprog myprog.o /PATH/TO/libzmq.x
-
-Run with:
-
-    LIBPATH=/DIR/OF/LIBZMQ.SO:/lib:/usr/lib:...    # if not in default path
-    export LIBPATH
-    ./myprog
-
-
-## ZeroMQ on z/OS UNIX System Services: Application considerations
-
-z/0S UNIX System Services does not provide a way to block the
-[`SIGPIPE` signal being generated when a thread writes to a closed socket](http://pic.dhe.ibm.com/infocenter/zvm/v6r2/index.jsp?topic=%2Fcom.ibm.zos.r12.cbcpx01%2Fcbcpg1b0287.htm)
-(compare with other platforms that support the `SO_NOSIGPIPE` socket
-option, and/or the `MSG_NOSIGNAL` flag on `send()`; z/OS UNIX System
-Services supports neither).
-
-As a result, applications using ZeroMQ on z/OS UNIX System Services
-have to expect to encounter `SIGPIPE` at various times during the use
-of the library, if sockets are unexpectedly disconnected.  Normally
-`SIGPIPE` will terminate the application.
-
-A simple solution, if `SIGPIPE` is not required for normal operation
-of the application (eg, it is not part of a unix pipeline, the
-traditional use of `SIGPIPE`), is to set `SIGPIPE` to be ignored
-with code like:
-
-    #include <signal.h>
-    ...
-    signal(SIGPIPE, SIG_IGN);
-
-near the start of the application (eg, before initialising the ZeroMQ
-library).
-
-If `SIGPIPE` is required for normal operation it is recommended that
-the application install a signal handler that flags the signal was
-received, and allows the application main loop to determine if it
-was received for one of its own file descriptors -- and ignores it if it
-none of the applications own file descriptors seems to have changed.
-
-Linking to the `libzmq.a` static library will pull in substantially
-all of the library code, which will add about 4MB to the application
-size (per executable statically linked with ZeroMQ).  If this is a
-significant consideration, use of the DLL version is recommended.
-
-See also ZeroMQ test status on z/OS UNIX System Services below
-for other caveats.
-
-
-## Setting other compilation flags
-
-### Optimisation
-
-To build with optimisation:
-
-*   set `ZCXXFLAGS` to "`-O2`" before starting build process above
-
-
-### Full debugging symbols
-
-To build with debugging symbols:
-
-*   set `ZCXXFLAGS` to "`-g`" before starting build process above
-
-### 64-bit mode (LP64/amode=64)
-
-To build in 64-bit mode:
-
-The default build is
-[ILP32](http://publib.boulder.ibm.com/infocenter/zvm/v6r1/index.jsp?topic=/com.ibm.zos.r9.cbcux01/lp64cop.htm),
-the default for the IBM XL C/C++ compiler.  To build in LP64 mode
-(64-bit):
-
-*    set  `ZCXXFLAGS` to "`-Wc,lp64 -Wl,lp64`" before starting build
-
-(64-bit mode can be combined with optimisation or debug symbols.)
-
-### Combining compilation flags
-
-Other build flags can be used in `ZXCCFLAGS` if desired.  Beware that
-they are passed through (Bourne) shell expansion, and passed to both
-the compile and link stages; some experimentation of argument quoting
-may be required (and arguments requiring parenthesis are particularly
-complicated).
-
-
-## ZeroMQ test status on z/OS UNIX System Services
-
-As of 2014-07-22, 41 of the 43 tests in the core ZeroMQ test suite
-pass. There are two tests that are expected to fail:
-
-0.  `test_abstract_ipc`: tests Linux-specific IPC functions, and is
-    expected to fail on non-Linux platforms.
-
-0.  `test_fork`: tests ability to use ZeroMQ both before *and* after
-    fork (and before exec()); this relies on the ability to use 
-    pthreads both before *and* after fork.  On z/OS (and some other
-    UNIX compliant platforms) functions like `pthreads_create` (used
-    by ZeroMQ) cannot be used after fork and before exec; on z/OS the
-    call after fork fails with `ELEMULTITHREADFORK` (errno=257) if
-    ZeroMQ was also used before fork.  (On z/OS it appears possible
-    to use z/OS *after* fork, *providing* it has not been used before
-    fork -- the problem is the two separate initialisations of the
-    threading library, before and after fork, attempting to mix
-    together.)  In practice this is unlikely to affect many real-world
-    programs -- most programs use threads or fork without exec, but
-    not both.
-
-0.  `test_diffserv`: tests ability to set IP_TOS ([IP Type of
-    Service](http://en.wikipedia.org/wiki/Type_of_service), or
-    [DiffServ](http://en.wikipedia.org/wiki/Differentiated_Services_Code_Point))
-    values on sockets.  While z/OS UNIX System Services has the
-    preprocessor defines required, it appears not to support the
-    required functionality (call fails with "EDC8109I Protocol not
-    available.")
-
-These three "expected to fail" tests are listed as XFAIL_TESTS, and
-`runtests` will still consider the test run successful when they fail
-as expected.  (`builds/zos/runtests` will automatically skip these
-"expected to fail" tests if running "all" tests.)
-
-In addition `test_security_curve` does not do any meaningful testing,
-as a result of the CURVE support not being compiled in; it requires
-[`libsodium`](http://doc.libsodium.org/), which has not been
-ported to z/OS UNIX System Services yet.
-
-Multicast (via `libpgm`) is also not ported or compiled in.
-
-[TIPC](http://hintjens.com/blog:70), a cluster IPC protocol,
-is only supported on Linux, so it is not compiled into the z/OS
-UNIX System Services port -- and the tests are automatically skipped
-if running "all" tests.  (However they are not listed in XFAIL_TESTS
-because without the TIPC support there is no point in even running
-them, and it would be non-trivial to track them by hand.)
-
-
-## ZeroMQ on z/OS UNIX System Services: Library portability notes
-
-### *.cpp
-
-The source code in ZeroMQ is a combination of a C++ core library
-(in `*.cpp` and `*.hpp` files), and a C wrapper (also in `*.cpp`
-files).  It is all compiled with the C++ compiler.  The IBM XL C/C++
-compiler (at least the version used for initial porting) insists
-that C++ source be in `*.C` files (note capital C).  To work around
-this issue the compile flag `-+` is used (specified in the `zc++`
-compiler wrapper), which tells the compiler the file should be
-considered C++ despite the file extension.
-
-### XPLINK
-
-The library (and tests) are built in
-[XPLINK](http://www.redbooks.ibm.com/abstracts/sg245991.html) mode
-with the flags `-Wc,xplink -Wl,xplink` (specified in  the `zc++`
-compiler wrapper).  This is [recommended by IBM for C++
-code](http://publib.boulder.ibm.com/infocenter/zvm/v5r4/index.jsp?topic=/com.ibm.zos.r9.ceea200/xplrunt.htm)
-due to the small functions.  (Amongst other things, using XPLINK
-enables function calls with some arguments passed in registers.)
-
-### long long
-
-ZeroMQ makes use of `uint64_t` (which is `unsigned long long` in ILP32
-mode).  To enable this the compile flag `-Wc,lang(longlong)` is passed
-to enable `long long`.  This is passed from the `zc++` compiler wrapper
-in order to be able to specifically quote the argument to protect the 
-parentheses from shell expansion.
-
-### BSD-style sockets, with IPv6 support
-
-ZeroMQ uses BSD-style socket handling, with extensions to support IPv6.
-BSD-style sockets were merged into SysV-derived UNIX at least a decade
-ago, and are required as part of the X/Open Portability Guide at least
-as of XPG 4.2.  To access this functionality two feature macros are 
-defined:
-
-    _XOPEN_SOURCE_EXTENDED=1
-
-    _OPEN_SYS_SOCK_IPV6
-
-The first enables the XPG 4.2 features (including functionality like
-`getsockname()`), and the latter exposes IPv6 specific functionality
-like `sa_family_t`.  These flags are defined in the `cxxall` script.
-
-(The traditional BSD-sockets API, exposed with `_OE_SOCKETS` cannot
-be used because it does not support functions like `getsockname()`,
-nor does it support IPv6 -- and the API definitions prevent compiling
-in LP64 mode due to assumptions about long being 32 bits.  Using
-`_XOPEN_SOURCE_EXTENDED=1` avoids all these problems.)
-
-### pthreads
-
-ZeroMQ uses the pthreads library to create additional threads to handle
-background communication without blocking the main application.  This
-functionaity is enabled on z/OS UNIX System Services by defining:
-
-    _OPEN_THREADS=3
-
-which is done in the `cxxall` script.  (The "3" value exposes later
-pthreads functionality like `pthread_atfork`, although ZeroMQ does not
-currently use all these features.)
-
-If compiling on a *recent* version of z/OS UNIX System Services it
-may be worth compiling with:
-
-    _UNIX03_THREADS=1
-
-which enables a later version of the threading support, potentially
-including `pthread_getschedparam` and pthread_setschedparam`; at
-present in the z/OS UNIX System Services port these functions are
-hidden and never called.  (See [IBM z/OS pthread.h
-documentation](http://pic.dhe.ibm.com/infocenter/zos/v1r11/index.jsp?topic=/com.ibm.zos.r11.bpxbd00/pthrdh.htm)
-for details on the differences.)
-
-
-## `platform.hpp` on z/OS UNIX System Services
-
-The build (described above) on z/OS UNIX System Services uses a static
-pre-built `platform.hpp` file.  (By default `src/platform.hpp` is 
-dynamically generated as a result of running the `./configure` script.)
-The master version of this is in `builds/zos/platform.hpp`.
-
-Beware that this file contains the version number for libzmq (usually
-included during the configure phase).  If taking the `platform.hpp` from
-an older version to use on a newer libzmq be sure to update the version
-information near the top of the file.
-
-The pre-built file is used because z/OS does not have the GNU auto tools
-(`automake`, `autoconf`, `libtool`, etc) installed, and particularly the
-libtool replacement does not work properly with the IBM XL C/C++
-compiler.
-
-The `./configure` script (only supplied in the tarballs); built with
-`automake` and `autoconf` on another platform), with one small edit,
-was used to generate the z/OS `platform.hpp` and then two small changes
-(described below) were made by hand to the generated `platform.hpp`.
-
-To be able to run the ./configure script to completion (in tcsh 
-syntax):
-
-*   Edit `./configure` and add:
-
-        openedition)
-              ;;
-
-    immediately before the line:
-
-        as_fn_error $? "unsupported system: ${host_os}." "$LINENO" 5
-
-    (somewhere around 17637).  This avoids the configure script giving
-    up early because `openedition` is not recognised.
-
-*   set `CXX` to point that the full  path to the `builds/zos/zc++` wrapper, eg
-
-        setenv CXX "/u/0mq/zeromq-4.0.4/builds/zos/zc++"
-
-*   set `CPPFLAGS` to for the feature macros required, eg:
-
-        setenv CPPFLAGS "-D_XOPEN_SOURCE_EXTENDED=1 -D_OPEN_THREADS=3 -D_OPEN_SYS_SOCK_IPV6 -DZMQ_HAVE_ZOS"
-
-*   set `CXXFLAGS` to enable XPLINK:
-
-        setenv CXXFLAGS "-Wc,xplink -Wl,xplink -+"
-
-*   run configure script with `--disable-eventfd` (`sys/eventfd.h` does
-    not exist, but the test for its existence has a false positive on
-    z/OS UNIX System Services, apparently due to the way the `c++`
-    compiler wrapper passes errors back from the IBM XL C/C++ compiler),
-    and with `--with-poller=poll` because `poll` is the most advanced
-    of the file descriptor status tests available on z/OS.  That is:
-
-        ./configure --disable-eventfd --with-poller=poll
-
-All going well several Makefiles, and `src/platform.hpp` should be
-produced.  Two additional changes are required to `src/platform.hpp`
-which can be appended to the end:
-
-    /* ---- Special case for z/OS Unix Services: openedition ---- */
-    #include <pthread.h>
-    #ifndef   NI_MAXHOST
-    #define   NI_MAXHOST 1025
-    #endif
-
-(many includes require pthreads-related methods or data structures to
-be defined, but not all of them include `pthread.h`, and the value
-`NI_MAXHOST` is not defined on z/OS UNIX System Services -- the 1025
-value is the conventional value on other platforms).
-
-Having done this the Makefiles can be used to compile individual files
-if desired, eg:
-
-    cd src
-    make zmq.o
-
-but note:
-
-*   IBM Make will warn of duplicate prerequisites on *every* run of
-    `make`, and both the generated `src/Makefile` and `tests/Makefile`
-    have several duplicates.  (For `src/Makefile` edit
-    `libzmq_la_SOURCES` to remove the duplicates.)
-
-*   IBM Make does not understand the `@` prefix (eg, `@echo`) as a way
-    to avoid echoing the command, resulting in an error and the command
-    being echoed anyway.
-
-*   Many of the make targets result in GNU auto tools (`aclocal`, etc)
-    being invoked, which are likely to fail, and most of the
-    library-related targets will invoke `libtool` which will cause
-    compile failures (due to differences in expected arguments).
-
-However running `./configure` to regenerate `src/platform.hpp` may 
-be useful for later versions of ZeroMQ which add more feature tests.
-
-
-## Transferring from GitHub to z/OS UNIX System Services
-
-The process of transferring files from GitHub to z/OS UNIX System
-Services is somewhat convoluted because:
-
-*   There is not a port of git for z/OS UNIX System Services; and
-
-*   z/OS uses the EBCDIC (IBM-1047) character set rather than the
-    ASCII/ISO-8859-1 character set used by the ZeroMQ source code
-    on GitHub
-
-A workable transfer process is:
-
-*   On an ASCII/ISO-8859-1/UTF-8 system with `git` (eg, a Linux system):
-
-        git clone https://github.com/zeromq/libzmq.git
-        git archive --prefix=libzmq-git/ -o /var/tmp/libzmq-git.tar master
-
-*   On a ASCII/ISO-8859-1/UTF-8 system with `tar`, and `pax`, and
-    optionally the GNU auto tools (eg, the same Linux system):
-
-        mkdir /var/tmp/zos
-        cd /var/tmp/zos
-        tar -xpf /var/tmp/libzmq-git.tar
-        cd libzmq-git
-        ./autogen.sh             # Optional: to be able to run ./configure
-        cd ..
-        pax -wf /var/tmp/libzmq-git.pax libzmq-git
-        compress libzmq-git.pax  # If available, reduce transfer size
-
-*   Transfer the resulting file (`libzmq-git.pax` or `libzmq-git.pax.Z`)
-    to the z/OS UNIX System Services system.  If using FTP be sure to
-    transfer the file in `bin` (binary/Image) mode to avoid corruption.
-
-*   On the z/OS UNIX System Services system, unpack the `pax` file and
-    convert all the files to EBCDIC with:
-
-        pax -o from=iso8859-1 -pp -rvf  libzmq-git-2014-07-23.pax
-
-    or if the file was compressed:
-
-        pax -o from=iso8859-1 -pp -rvzf libzmq-git-2014-07-23.pax.Z
-
-The result should be a `libzmq-git` directory with the source in
-EBCDIC format, on the z/OS UNIX System Services system ready to start
-building.
-
-See also the [`pax` man
-page](http://pic.dhe.ibm.com/infocenter/zos/v1r13/index.jsp?topic=%2Fcom.ibm.zos.r13.bpxa500%2Fr4paxsh.htm),
-some [`pax` conversion
-examples](http://pic.dhe.ibm.com/infocenter/zos/v1r13/index.jsp?topic=%2Fcom.ibm.zos.r13.bpxa400%2Fbpxza4c0291.htm),
-and [IBM's advice on ASCII to EBCDIC conversion
-options](http://www-03.ibm.com/systems/z/os/zos/features/unix/bpxa1p03.html)
diff --git a/libs/libzmq/builds/zos/cxxall b/libs/libzmq/builds/zos/cxxall
deleted file mode 100755
index 87867d6..0000000
--- a/libs/libzmq/builds/zos/cxxall
+++ /dev/null
@@ -1,62 +0,0 @@
-#! /bin/sh
-# Attempt to compile all *.cpp files in the current directory, that are
-# not already compiled.  Uses zc++ wrapper around C++ compiler, to add
-# additional compile arguments.
-#
-# Written by Ewen McNeill <ewen@imatix.com>, 2014-07-19
-# Updated by Ewen McNeill <ewen@imatix.com>, 2014-07-24
-#---------------------------------------------------------------------------
-
-VERBOSE="${VERBOSE:-}"    # Set to non-empty for already done status
-export VERBOSE
-
-# Locate compiler wrapper
-BIN_DIR=$(dirname $0)
-if [ -z "${BIN_DIR}" ]; then BIN_DIR="."; fi
-case "${BIN_DIR}" in
-  .)  BIN_DIR="$(pwd)";            ;;
-  /*)                              ;; 
-  *)  BIN_DIR="$(pwd)/${BIN_DIR}"; ;;
-esac
-ZCXX="${BIN_DIR}/zc++"
-
-# Determine compile flags
-CPPFLAGS="-D_XOPEN_SOURCE_EXTENDED=1 -D_OPEN_THREADS=3 -D_OPEN_SYS_SOCK_IPV6"
-CXXFLAGS="-DZMQ_HAVE_ZOS -DHAVE_CONFIG_H -D_REENTRANT -D_THREAD_SAFE -DZMQ_USE_POLL"
-case $(pwd) in
-  *src)   CXXFLAGS="${CXXFLAGS} -I."
-          ;;
-  *tests) CXXFLAGS="${CXXFLAGS} -I. -I../src -I../include"
-          ;;
-  *)      echo "Currently only builds in src/ and tests/" >&2
-          exit 1
-          ;;
-esac
-
-skip() {
-  SRC="$1"
-  OBJ="$2"
-  if [ -n "${VERBOSE}" ]; then
-    echo "    ${SRC} compiled already"
-  fi
-}
-
-compile() {
-  SRC="$1"
-  OBJ="$2"
-  echo "CXX ${SRC}"
-  "${ZCXX}" ${CXXFLAGS} ${CPPFLAGS} -+ -c -o "${OBJ}" "${SRC}"
-}
-
-for SRC in *.cpp; do 
-  OBJ=$(echo $SRC | sed 's/\.cpp/.o/;')
-  if [ -f "${OBJ}" ]; then 
-    if [ "${OBJ}" -nt "${SRC}" ]; then
-      skip "${SRC}" "${OBJ}"
-    else
-      compile "${SRC}" "${OBJ}"
-    fi
-  else
-    compile "${SRC}" "${OBJ}"
-  fi
-done
diff --git a/libs/libzmq/builds/zos/makeclean b/libs/libzmq/builds/zos/makeclean
deleted file mode 100755
index 4b46b72..0000000
--- a/libs/libzmq/builds/zos/makeclean
+++ /dev/null
@@ -1,36 +0,0 @@
-#! /bin/sh
-# Remove built object files and test executables
-#
-# Written by Ewen McNeill <ewen@imatix.com>, 2014-07-22
-# Updated by Ewen McNeill <ewen@imatix.com>, 2014-07-24
-#---------------------------------------------------------------------------
-
-set -e    # Stop on errors
-
-# Figure out where we are
-BIN_DIR=$(dirname $0)
-if [ -z "${BIN_DIR}" ]; then BIN_DIR="."; fi
-case "${BIN_DIR}" in
-  .)  BIN_DIR="$(pwd)";            ;;
-  /*)                              ;; 
-  *)  BIN_DIR="$(pwd)/${BIN_DIR}"; ;;
-esac
-
-# Locate top of source tree, assuming we're in builds/zos
-TOP="${BIN_DIR}/../.."
-SRC="${TOP}/src"
-TESTS="${TOP}/tests"
-
-# Remove object/library files
-echo "Removing libzmq built files"
-(cd "${SRC}" && rm -f *.o *.a *.dbg *.x *.so libzmq)
-
-# Remove test object files
-echo "Removing libzmq tests"
-(cd "${TESTS}" && rm -f *.o *.dbg)
-(cd "${TESTS}"; 
- EXES=$(ls test_* | grep -v "\.")
- if [ -n "${EXES}" ]; then
-   rm ${EXES}
- fi
-)
diff --git a/libs/libzmq/builds/zos/makelibzmq b/libs/libzmq/builds/zos/makelibzmq
deleted file mode 100755
index eaed58f..0000000
--- a/libs/libzmq/builds/zos/makelibzmq
+++ /dev/null
@@ -1,54 +0,0 @@
-#! /bin/sh
-# Build libzmq.a static library and libzmq.so dynamic library
-#
-# Usage: makelibzmq
-#        BUILD_DLL=false makelibzmq     # Skip building DLL
-#
-# NOTE: We do a single compile run for both static and dynamic libraries
-# which results in the static library having -Wc,exportall compiled objects;
-# in practice this doesn't seem to cause a problem beyond using some extra
-# space (around 10%).
-#
-# Written by Ewen McNeill <ewen@imatix.com>, 2014-07-21
-# Updated by Ewen McNeill <ewen@imatix.com>, 2014-07-22
-#---------------------------------------------------------------------------
-
-set -e    # Stop on errors
-
-BUILD_DLL="${BUILD_DLL:-true}"     # Build DLL by default
-
-# Figure out where we are
-BIN_DIR=$(dirname $0)
-if [ -z "${BIN_DIR}" ]; then BIN_DIR="."; fi
-case "${BIN_DIR}" in
-  .)  BIN_DIR="$(pwd)";            ;;
-  /*)                              ;; 
-  *)  BIN_DIR="$(pwd)/${BIN_DIR}"; ;;
-esac
-ZCXX="${BIN_DIR}/zc++"
-
-# Locate top of source tree, assuming we're in builds/zos
-TOP="${BIN_DIR}/../.."
-SRC="${TOP}/src"
-
-# Install pre-generated platform.hpp
-cp -p "${BIN_DIR}/platform.hpp" "${SRC}/platform.hpp"
-
-# Compile all the source (optionally ready for a DLL)
-if [ "${BUILD_DLL}" = "true" ]; then
-  ZCXXFLAGS="${ZCXXFLAGS} -Wc,exportall"
-  export ZCXXFLAGS
-  #echo "Building DLL with ${ZCXXFLAGS}"
-fi
-
-cd "${SRC}"
-"${BIN_DIR}/cxxall"
-
-# Make static library
-ar r libzmq.a *.o
-
-# Optionally Make dynamic library
-if [ "${BUILD_DLL}" = "true" ]; then
-  #echo "Building libzmq.so DLL"
-  "${ZCXX}" -Wl,DLL -o libzmq.so *.o
-fi
diff --git a/libs/libzmq/builds/zos/maketests b/libs/libzmq/builds/zos/maketests
deleted file mode 100755
index 5b8a4b9..0000000
--- a/libs/libzmq/builds/zos/maketests
+++ /dev/null
@@ -1,102 +0,0 @@
-#! /bin/sh
-# Build tests/* executables; assumes that libzmq.a or libzmq.so/libzmq.x
-# is already built
-#
-# If libzmq.so and libzmq.x exist, then dynamic linking is used, otherwise
-# static linking is used.
-#
-# Written by Ewen McNeill <ewen@imatix.com>, 2014-07-21
-# Updated by Ewen McNeill <ewen@imatix.com>, 2014-07-22
-#---------------------------------------------------------------------------
-
-set -e    # Stop on errors
-
-VERBOSE="${VERBOSE:-}"    # Set to non-empty for already done status
-export VERBOSE
-
-# Figure out where we are
-BIN_DIR=$(dirname $0)
-if [ -z "${BIN_DIR}" ]; then BIN_DIR="."; fi
-case "${BIN_DIR}" in
-  .)  BIN_DIR="$(pwd)";            ;;
-  /*)                              ;; 
-  *)  BIN_DIR="$(pwd)/${BIN_DIR}"; ;;
-esac
-
-# Locate compiler wrapper
-ZCXX="${BIN_DIR}/zc++"
-
-# Locate top of source tree, assuming we're in builds/zos
-TOP="${BIN_DIR}/../.."
-SRC="${TOP}/src"
-TESTS="${TOP}/tests"
-
-# Figure out how we are going to link to ZMQ
-LINK_TYPE=unknown
-
-if [ -f "${SRC}/platform.hpp" -a -f "${SRC}/libzmq.so" -a -f "${SRC}/libzmq.x" ]; then
-  LINK_TYPE=dynamic
-elif [ -f "${SRC}/platform.hpp" -a -f "${SRC}/libzmq.a" ]; then
-  LINK_TYPE=static
-else
-  echo "Error: run makezmqlib to build libzmq.a and/or libzmq.so/libzmq.x first" >&2
-  exit 1
-fi
-
-# Copy in replacement test with timeout, if main version is not already
-# up to date
-#
-if [ -f "${TESTS}/test_fork.cpp" ] && 
-     grep "TIMEOUT" "${TESTS}/test_fork.cpp" >/dev/null 2>&1; then
-  :  # Already copied in
-else
-  echo "Updating test_fork.cpp to version with master timeout"
-  cp -p "${BIN_DIR}/test_fork.cpp" "${TESTS}/test_fork.cpp"
-fi
-
-# Compile all the source
-if [ "${LINK_TYPE}" = "dynamic" ]; then
-  ZCXXFLAGS="${ZCXXFLAGS} -Wc,DLL"
-  export ZXCCFLAGS
-  echo "Building tests to use DLL: ${ZCXXFLAGS}"
-fi
-
-cd "${TESTS}"
-"${BIN_DIR}/cxxall"
-
-# Link all the executables that are not already linked
-skip() {
-  OBJ="$1"
-  EXE="$2"
-  if [ -n "${VERBOSE}" ]; then
-    echo "${OBJ} linked to ${EXE}"
-  fi    
-}
-
-link() {
-  OBJ="$1"
-  EXE="$2"
-  echo " LD ${EXE}"
-  case "${LINK_TYPE}" in
-    static)  "${ZCXX}" -L ../src -o "${EXE}" "${OBJ}" -lzmq
-             ;;
-    dynamic) "${ZCXX}" -o "${EXE}" "${OBJ}" ../src/libzmq.x
-             ;;
-    *)       echo "Do not know how to do ${LINK_TYPE} linking!" 2>&1
-             exit 1
-             ;;
-  esac
-}
-
-for OBJ in *.o; do 
-  EXE=$(echo "${OBJ}" | sed 's/\.o//;')
-  if [ -f "${EXE}" ]; then 
-    if [ "${EXE}" -nt	"${OBJ}" ]; then
-      skip "${OBJ}" "${EXE}"
-    else
-      link "${OBJ}" "${EXE}"
-    fi
-  else
-    link "${OBJ}" "${EXE}"
-  fi
-done
diff --git a/libs/libzmq/builds/zos/platform.hpp b/libs/libzmq/builds/zos/platform.hpp
deleted file mode 100644
index b4442b5..0000000
--- a/libs/libzmq/builds/zos/platform.hpp
+++ /dev/null
@@ -1,300 +0,0 @@
-/* src/platform.hpp.  Generated from platform.hpp.in by configure.  */
-/* src/platform.hpp.in.  Generated from configure.ac by autoheader.  */
-
-/* Define to 1 if you have the <alloca.h> header file. */
-/* #undef HAVE_ALLOCA_H */
-
-/* Define to 1 if you have the <arpa/inet.h> header file. */
-#define HAVE_ARPA_INET_H 1
-
-/* Define to 1 if you have the `clock_gettime' function. */
-/* #undef HAVE_CLOCK_GETTIME */
-
-/* Define to 1 if you have the declaration of `LOCAL_PEERCRED', and to 0 if
-   you don't. */
-#define HAVE_DECL_LOCAL_PEERCRED 0
-
-/* Define to 1 if you have the declaration of `SO_PEERCRED', and to 0 if you
-   don't. */
-#define HAVE_DECL_SO_PEERCRED 0
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#define HAVE_DLFCN_H 1
-
-/* Define to 1 if you have the <errno.h> header file. */
-#define HAVE_ERRNO_H 1
-
-/* Define to 1 if you have the `fork' function. */
-#define HAVE_FORK 1
-
-/* Define to 1 if you have the `freeifaddrs' function. */
-#define HAVE_FREEIFADDRS 1
-
-/* Define to 1 if you have the `gethrtime' function. */
-/* #undef HAVE_GETHRTIME */
-
-/* Define to 1 if you have the `getifaddrs' function. */
-#define HAVE_GETIFADDRS 1
-
-/* Define to 1 if you have the `gettimeofday' function. */
-#define HAVE_GETTIMEOFDAY 1
-
-/* Define to 1 if you have the <ifaddrs.h> header file. */
-#define HAVE_IFADDRS_H 1
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#define HAVE_INTTYPES_H 1
-
-/* Define to 1 if you have the `gssapi_krb5' library (-lgssapi_krb5). */
-/* #undef HAVE_LIBGSSAPI_KRB5 */
-
-/* Define to 1 if you have the `iphlpapi' library (-liphlpapi). */
-/* #undef HAVE_LIBIPHLPAPI */
-
-/* Define to 1 if you have the `nsl' library (-lnsl). */
-/* #undef HAVE_LIBNSL */
-
-/* Define to 1 if you have the `pthread' library (-lpthread). */
-/* #undef HAVE_LIBPTHREAD */
-
-/* Define to 1 if you have the `rpcrt4' library (-lrpcrt4). */
-/* #undef HAVE_LIBRPCRT4 */
-
-/* Define to 1 if you have the `rt' library (-lrt). */
-/* #undef HAVE_LIBRT */
-
-/* Define to 1 if you have the `socket' library (-lsocket). */
-/* #undef HAVE_LIBSOCKET */
-
-/* Define to 1 if you have the `sodium' library (-lsodium). */
-/* #undef HAVE_LIBSODIUM */
-
-/* Define to 1 if you have the `ws2_32' library (-lws2_32). */
-/* #undef HAVE_LIBWS2_32 */
-
-/* Define to 1 if you have the <limits.h> header file. */
-#define HAVE_LIMITS_H 1
-
-/* Define to 1 if you have the <memory.h> header file. */
-#define HAVE_MEMORY_H 1
-
-/* Define to 1 if you have the `memset' function. */
-#define HAVE_MEMSET 1
-
-/* Define to 1 if you have the <netinet/in.h> header file. */
-#define HAVE_NETINET_IN_H 1
-
-/* Define to 1 if you have the <netinet/tcp.h> header file. */
-#define HAVE_NETINET_TCP_H 1
-
-/* Define to 1 if you have the `perror' function. */
-#define HAVE_PERROR 1
-
-/* Define to 1 if you have the `socket' function. */
-#define HAVE_SOCKET 1
-
-/* Define to 1 if stdbool.h conforms to C99. */
-/* #undef HAVE_STDBOOL_H */
-
-/* Define to 1 if you have the <stddef.h> header file. */
-#define HAVE_STDDEF_H 1
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#define HAVE_STDINT_H 1
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#define HAVE_STDLIB_H 1
-
-/* Define to 1 if you have the <strings.h> header file. */
-#define HAVE_STRINGS_H 1
-
-/* Define to 1 if you have the <string.h> header file. */
-#define HAVE_STRING_H 1
-
-/* Define to 1 if you have the <sys/eventfd.h> header file. */
-/* #undef HAVE_SYS_EVENTFD_H */
-
-/* Define to 1 if you have the <sys/socket.h> header file. */
-#define HAVE_SYS_SOCKET_H 1
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#define HAVE_SYS_STAT_H 1
-
-/* Define to 1 if you have the <sys/time.h> header file. */
-#define HAVE_SYS_TIME_H 1
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#define HAVE_SYS_TYPES_H 1
-
-/* Define to 1 if you have the <sys/uio.h> header file. */
-#define HAVE_SYS_UIO_H 1
-
-/* Define to 1 if you have the <time.h> header file. */
-#define HAVE_TIME_H 1
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#define HAVE_UNISTD_H 1
-
-/* Define to 1 if you have the <windows.h> header file. */
-/* #undef HAVE_WINDOWS_H */
-
-/* Define to 1 if the system has the type `_Bool'. */
-/* #undef HAVE__BOOL */
-
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
-   */
-#define LT_OBJDIR ".libs/"
-
-/* Name of package */
-#define PACKAGE "zeromq"
-
-/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT "zeromq-dev@lists.zeromq.org"
-
-/* Define to the full name of this package. */
-#define PACKAGE_NAME "zeromq"
-
-/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "zeromq 4.1.0"
-
-/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME "zeromq"
-
-/* Define to the home page for this package. */
-#define PACKAGE_URL ""
-
-/* Define to the version of this package. */
-#define PACKAGE_VERSION "4.1.0"
-
-/* Define as the return type of signal handlers (`int' or `void'). */
-#define RETSIGTYPE void
-
-/* Define to 1 if you have the ANSI C header files. */
-#define STDC_HEADERS 1
-
-/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
-#define TIME_WITH_SYS_TIME 1
-
-/* Version number of package */
-#define VERSION "4.1.0"
-
-/* Enable militant API assertions */
-/* #undef ZMQ_ACT_MILITANT */
-
-/* Force to use mutexes */
-/* #undef ZMQ_FORCE_MUTEXES */
-
-/* Have AIX OS */
-/* #undef ZMQ_HAVE_AIX */
-
-/* Have Android OS */
-/* #undef ZMQ_HAVE_ANDROID */
-
-/* Have Cygwin */
-/* #undef ZMQ_HAVE_CYGWIN */
-
-/* Have eventfd extension. */
-/* #undef ZMQ_HAVE_EVENTFD */
-
-/* Have FreeBSD OS */
-/* #undef ZMQ_HAVE_FREEBSD */
-
-/* Have HPUX OS */
-/* #undef ZMQ_HAVE_HPUX */
-
-/* Have ifaddrs.h header. */
-#define ZMQ_HAVE_IFADDRS 1
-
-/* Have Linux OS */
-/* #undef ZMQ_HAVE_LINUX */
-
-/* Have LOCAL_PEERCRED socket option */
-/* #undef ZMQ_HAVE_LOCAL_PEERCRED */
-
-/* Have MinGW32 */
-/* #undef ZMQ_HAVE_MINGW32 */
-
-/* Have NetBSD OS */
-/* #undef ZMQ_HAVE_NETBSD */
-
-/* Have NORM protocol extension */
-/* #undef ZMQ_HAVE_NORM */
-
-/* Have OpenBSD OS */
-/* #undef ZMQ_HAVE_OPENBSD */
-
-/* Have OpenPGM extension */
-/* #undef ZMQ_HAVE_OPENPGM */
-
-/* Have DarwinOSX OS */
-/* #undef ZMQ_HAVE_OSX */
-
-/* Have QNX Neutrino OS */
-/* #undef ZMQ_HAVE_QNXNTO */
-
-/* Whether SOCK_CLOEXEC is defined and functioning. */
-/* #undef ZMQ_HAVE_SOCK_CLOEXEC */
-
-/* Have Solaris OS */
-/* #undef ZMQ_HAVE_SOLARIS */
-
-/* Whether SO_KEEPALIVE is supported. */
-#define ZMQ_HAVE_SO_KEEPALIVE 1
-
-/* Have SO_PEERCRED socket option */
-/* #undef ZMQ_HAVE_SO_PEERCRED */
-
-/* Whether TCP_KEEPALIVE is supported. */
-/* #undef ZMQ_HAVE_TCP_KEEPALIVE */
-
-/* Whether TCP_KEEPCNT is supported. */
-/* #undef ZMQ_HAVE_TCP_KEEPCNT */
-
-/* Whether TCP_KEEPIDLE is supported. */
-/* #undef ZMQ_HAVE_TCP_KEEPIDLE */
-
-/* Whether TCP_KEEPINTVL is supported. */
-/* #undef ZMQ_HAVE_TCP_KEEPINTVL */
-
-/* Have TIPC support */
-/* #undef ZMQ_HAVE_TIPC */
-
-/* Have uio.h header. */
-#define ZMQ_HAVE_UIO 1
-
-/* Have Windows OS */
-/* #undef ZMQ_HAVE_WINDOWS */
-
-/* Define for Solaris 2.5.1 so the uint32_t typedef from <sys/synch.h>,
-   <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
-   #define below would cause a syntax error. */
-/* #undef _UINT32_T */
-
-/* Define to empty if `const' does not conform to ANSI C. */
-/* #undef const */
-
-/* Define to `__inline__' or `__inline' if that's what the C compiler
-   calls it, or to nothing if 'inline' is not supported under any name.  */
-#ifndef __cplusplus
-/* #undef inline */
-#endif
-
-/* Define to `unsigned int' if <sys/types.h> does not define. */
-/* #undef size_t */
-
-/* Define to `int' if <sys/types.h> does not define. */
-/* #undef ssize_t */
-
-/* Define to the type of an unsigned integer type of width exactly 32 bits if
-   such a type exists and the standard includes do not define it. */
-/* #undef uint32_t */
-
-/* Define to empty if the keyword `volatile' does not work. Warning: valid
-   code using `volatile' can become incorrect without. Disable with care. */
-/* #undef volatile */
-
-/* ---- Special case for z/OS Unix Services: openedition ---- */
-#include <pthread.h>
-#ifndef   NI_MAXHOST
-#define   NI_MAXHOST 1025
-#endif
diff --git a/libs/libzmq/builds/zos/runtests b/libs/libzmq/builds/zos/runtests
deleted file mode 100755
index 2351f2c..0000000
--- a/libs/libzmq/builds/zos/runtests
+++ /dev/null
@@ -1,188 +0,0 @@
-#! /bin/sh
-# Run ZeroMQ tests, in order.  This is extracted from the tests/Makefile
-# which won't run as-is because it relies on libtool building things, and 
-# thus creating various libtool files, which don't work well on z/OS
-#
-# noinst_PROGRAMS needs to be kept in sync with tests/Makefile.am, as it
-# defines the order in which tests are run.
-#
-# Written by Ewen McNeill <ewen@imatix.com>, 2014-07-19
-# Updated by Ewen McNeill <ewen@imatix.com>, 2014-07-24
-#---------------------------------------------------------------------------
-
-set -e    # Stop if a test fails
-
-#---------------------------------------------------------------------------
-# Change to tests directory if necessary
-
-# Figure out where we are
-BIN_DIR=$(dirname $0)
-if [ -z "${BIN_DIR}" ]; then BIN_DIR="."; fi
-case "${BIN_DIR}" in
-  .)  BIN_DIR="$(pwd)";            ;;
-  /*)                              ;; 
-  *)  BIN_DIR="$(pwd)/${BIN_DIR}"; ;;
-esac
-
-# Locate top of source tree, assuming we're in builds/zos
-TOP="${BIN_DIR}/../.."
-SRCDIR="${TOP}/src"
-TESTDIR="${TOP}/tests"
-
-case "$(pwd)" in
-  *tests) ;;
-  *)      echo "Changing to ${TESTDIR}"
-          cd "${TESTDIR}"
-          ;;
-esac
-
-if [ -x "test_system" ]; then
-  :
-else
-  echo "Run makelibzmq and maketests before runtests" >&2
-  exit 1
-fi
-
-#---------------------------------------------------------------------------
-# Explanation of tests expected to fail:
-# test_abstract_ipc: Relies on Linux-specific IPC functionality
-# test_fork:         Relies on using pthreads _after_ fork, _before_ exec
-# test_diffserv:     Needs IP_PROTO, IP_TOS setsockopt(); the headers
-#                    are present on z/OS UNIX System Services, but
-#                    fails with:
-#                    EDC8109I Protocol not available. (./ip.cpp:164)
-#    NOTE: not listed as a valid IP setsockopt() option at:
-#       http://pic.dhe.ibm.com/infocenter/zos/v2r1/index.jsp?topic=%2Fcom.ibm.zos.v2r1.bpxbd00%2Fsetopt.htm
-#
-XFAIL_TESTS="test_abstract_ipc|test_fork|test_diffserv"
-
-# BUILD_TIPC is not defined, so we skip all these tests
-SKIP_TESTS="test_.*_tipc"
-
-# Extract list of all test programs from tests/Makefile.am
-#
-# Excluding tests we know will fail because of missing functionality
-#
-noinst_PROGRAMS=$(grep "test_" Makefile.am | egrep -v "_SOURCES|XFAIL" |
-                  sed 's/noinst_PROGRAMS.* test/test/; s/^ *//; s/ *\\ *$//;' |
-                  grep -v "${SKIP_TESTS}" | egrep -v "${XFAIL_TESTS}")
-#echo "Found tetsts: ${noinst_PROGRAMS}"
-
-# Run tests on command line, or all tests we found
-if [ -n "${1}" ]; then
-  TESTS="$*"     # Run tests on command line
-else
-  TESTS="${noinst_PROGRAMS}"
-fi
-
-verbose() {
-   echo "Starting: $@" >&2
-   "$@"
-}
-
-# Uncomment TESTS_ENVIRONMENT=verbose to see "Starting: TEST" messages
-#TESTS_ENVIRONMENT=verbose
-TESTS_ENVIRONMENT=
-
-#---------------------------------------------------------------------------
-# Explicitly add SRCDIR into library search path, to make sure we
-# use our just-built version
-LIBPATH="${SRCDIR}:/lib:/usr/lib"
-export LIBPATH
-
-#---------------------------------------------------------------------------
-# check-TESTS: target from tests/Makefile, converted from Make syntax to
-# shell syntax
-
-failed=0; all=0; xfail=0; xpass=0; skip=0; 
-srcdir=.; export srcdir; 
-list="${TESTS}";
-red=""; grn=""; lgn=""; blu=""; std="";
-if test -n "$list"; then 
-  for tst in $list; do 
-    if test -f ./$tst; then dir=./; 
-    elif test -f $tst; then dir=; 
-    else dir="${srcdir}/"; fi; 
-    if ${TESTS_ENVIRONMENT} ${dir}$tst; then 
-      all=`expr $all + 1`; 
-      case " ${XFAIL_TESTS} " in 
-      *"$tst"*) 
-        xpass=`expr $xpass + 1`; 
-        failed=`expr $failed + 1`; 
-        col=$red; res=XPASS; 
-      ;; 
-      *) 
-        col=$grn; res=PASS; 
-      ;; 
-      esac; 
-    elif test $? -ne 77; then 
-      all=`expr $all + 1`; 
-      case " ${XFAIL_TESTS} " in 
-       *"$tst"*) 
-        xfail=`expr $xfail + 1`; 
-        col=$lgn; res=XFAIL; 
-      ;; 
-      *) 
-        failed=`expr $failed + 1`; 
-        col=$red; res=FAIL; 
-      ;; 
-      esac; 
-    else 
-      skip=`expr $skip + 1`; 
-      col=$blu; res=SKIP; 
-    fi; 
-    echo "${col}$res${std}: $tst"; 
-  done; 
-  if test "$all" -eq 1; then 
-    tests="test"; 
-    All=""; 
-  else 
-    tests="tests"; 
-    All="All "; 
-  fi; 
-  if test "$failed" -eq 0; then 
-    if test "$xfail" -eq 0; then 
-      banner="$All$all $tests passed"; 
-    else 
-      if test "$xfail" -eq 1; then failures=failure; else failures=failures; fi;
-      banner="$All$all $tests behaved as expected ($xfail expected $failures)"; 
-    fi; 
-  else 
-    if test "$xpass" -eq 0; then 
-      banner="$failed of $all $tests failed"; 
-    else 
-      if test "$xpass" -eq 1; then passes=pass; else passes=passes; fi;
-      
-      banner="$failed of $all $tests did not behave as expected ($xpass unexpected $passes)"; 
-    fi; 
-  fi; 
-  dashes="$banner"; 
-  skipped=""; 
-  if test "$skip" -ne 0; then 
-    if test "$skip" -eq 1; then 
-      skipped="($skip test was not run)"; 
-    else 
-      skipped="($skip tests were not run)"; 
-    fi; 
-    test `echo "$skipped" | wc -c` -le `echo "$banner" | wc -c` || 
-       dashes="$skipped"; \        
-  fi; 
-  report=""; 
-  if test "$failed" -ne 0 && test -n "${PACKAGE_BUGREPORT}"; then 
-    report="Please report to ${PACKAGE_BUGREPORT}"; 
-    test `echo "$report" | wc -c` -le `echo "$banner" | wc -c` || 
-      dashes="$report"; 
-  fi; 
-  dashes=`echo "$dashes" | sed s/./=/g`; 
-  if test "$failed" -eq 0; then 
-    col="$grn"; 
-  else 
-    col="$red"; 
-  fi; 
-  echo "${col}$dashes${std}"; 
-  echo "${col}$banner${std}"; 
-  test -z "$skipped" || echo "${col}$skipped${std}"; 
-  test -z "$report" || echo "${col}$report${std}"; 
-  echo "${col}$dashes${std}"; 
-  test "$failed" -eq 0; 
-else :; fi
diff --git a/libs/libzmq/builds/zos/test_fork.cpp b/libs/libzmq/builds/zos/test_fork.cpp
deleted file mode 100644
index 54bba09..0000000
--- a/libs/libzmq/builds/zos/test_fork.cpp
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include <unistd.h>           // For alarm()
-
-const char *address = "tcp://127.0.0.1:6571";
-
-#define NUM_MESSAGES 5
-#define TIMEOUT_SECS 5        // Global timeout
-
-int main (void)
-{
-    setup_test_environment ();
-    void *ctx = zmq_ctx_new ();
-    assert (ctx);
-
-    //  Create and bind pull socket to receive messages
-    void *pull = zmq_socket (ctx, ZMQ_PULL);
-    assert (pull);
-    int rc = zmq_bind (pull, address);
-    assert (rc == 0);
-
-    int pid = fork ();
-    if (pid == 0) {
-        //  Child process
-        //  Immediately close parent sockets and context
-        zmq_close (pull);
-        zmq_ctx_term (ctx);
-
-        //  Create new context, socket, connect and send some messages
-        void *child_ctx = zmq_ctx_new ();
-        assert (child_ctx);
-        void *push = zmq_socket (child_ctx, ZMQ_PUSH);
-        assert (push);
-        rc = zmq_connect (push, address);
-        assert (rc == 0);
-        int count;
-        for (count = 0; count < NUM_MESSAGES; count++)
-            zmq_send (push, "Hello", 5, 0);
-
-        zmq_close (push);
-        zmq_ctx_destroy (child_ctx);
-        exit (0);
-    }
-    else {
-        //  Parent process
-        alarm(TIMEOUT_SECS);   // Set upper limit on runtime
-
-        int count;
-        for (count = 0; count < NUM_MESSAGES; count++) {
-            char buffer [5];
-            int num_bytes = zmq_recv (pull, buffer, 5, 0);
-            assert (num_bytes == 5);
-        }
-        int child_status;
-        while (true) {
-            rc = waitpid (pid, &child_status, 0);
-            if (rc == -1 && errno == EINTR)
-                continue;
-            assert (rc > 0);
-            //  Verify the status code of the child was zero
-            assert (WEXITSTATUS (child_status) == 0);
-            break;
-        }
-        exit (0);
-    }
-    return 0;
-}
diff --git a/libs/libzmq/builds/zos/zc++ b/libs/libzmq/builds/zos/zc++
deleted file mode 100755
index 7cd2247..0000000
--- a/libs/libzmq/builds/zos/zc++
+++ /dev/null
@@ -1,42 +0,0 @@
-#! /bin/sh
-# Wrapper around IBM C++ compiler to add "-+" to preprocessor calls
-# and thus work with C++ in files other than *.C.  Also add -Wc,lang(longlong)
-# with appropriate quoting to avoid shell confusion -- this is difficult 
-# to get through both ./configure arguments _and_ Makefile/shell expansion
-# safely so more easily added in this wrapper.
-#
-# Finally, by default will enable xplink for C++ compatibility and performance
-# (c++ standard library requires xplink enabled).
-#
-# Additional compile/link flags can be passed in as ZCXXFLAGS, eg:
-#
-# For debug:  ZXCCFLAGS=-g ...
-#
-# Written by Ewen McNeill <ewen@imatix.com>, 2014-07-18
-# Updated by Ewen McNeill <ewen@imatix.com>, 2014-07-21
-#---------------------------------------------------------------------------
-
-CPPFLAGS="-+"
-LONGLONG="-Wc,lang(longlong)"
-XPLINK="${XPLINK:--Wc,xplink -Wl,xplink}"
-CXX="/bin/c++"
-ZCXXFLAGS="${ZCXXFLAGS:-}"   # Extra compile/link arguments, eg "-g"
-
-# For debugging calling conventions issues
-#echo "Called with: $0 $@" >>/tmp/zc++.log 2>&1
-#exec >>/tmp/zc++.log 2>&1
-#set -x
-
-case "$1" in 
-  -E) exec "${CXX}"                            "${CPPFLAGS}"           "$@"
-      ;;
-  -o) exec "${CXX}" ${ZCXXFLAGS} "${LONGLONG}" "${CPPFLAGS}" ${XPLINK} "$@"
-      ;;
-  -c) exec "${CXX}" ${ZCXXFLAGS} "${LONGLONG}" "${CPPFLAGS}" ${XPLINK} "$@"
-      ;;
-  -L) # Special case for linking via C++, called from linkall
-      exec "${CXX}" ${ZCXXFLAGS}                             ${XPLINK} "$@"
-      ;;
-  *)  exec "${CXX}" ${ZCXXFLAGS} "${LONGLONG}"               ${XPLINK} "$@"
-      ;;
-esac
diff --git a/libs/libzmq/ci_build.sh b/libs/libzmq/ci_build.sh
deleted file mode 100755
index f920944..0000000
--- a/libs/libzmq/ci_build.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/env bash
-
-set -x
-set -e
-
-if [ $BUILD_TYPE = "default" ]; then
-    mkdir tmp
-    BUILD_PREFIX=$PWD/tmp
-
-    source config.sh
-    set_config_opts
-
-    # Build and check this project
-    (
-        ./autogen.sh &&
-        ./configure "${CONFIG_OPTS[@]}" &&
-        export DISTCHECK_CONFIGURE_FLAGS="${CONFIG_OPTS[@]}" &&
-        make VERBOSE=1 -j5 ${CHECK}
-    ) || exit 1
-else
-    cd ./builds/${BUILD_TYPE} && ./ci_build.sh
-fi
diff --git a/libs/libzmq/ci_deploy.sh b/libs/libzmq/ci_deploy.sh
deleted file mode 100644
index fac6d4e..0000000
--- a/libs/libzmq/ci_deploy.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env bash
-
-# do NOT set -x or it will log the secret tokens!
-set -e
-
-if [[ $BUILD_TYPE == "default" && $CURVE == "libsodium" && -z $DRAFT ]]; then
-    # Tell travis to deploy all files in dist
-    mkdir dist
-    export LIBZMQ_DEPLOYMENT=dist/*
-    # Move archives to dist
-    mv *.tar.gz dist
-    mv *.zip dist
-    # Generate hash sums
-    cd dist
-    md5sum *.zip *.tar.gz > MD5SUMS
-    sha1sum *.zip *.tar.gz > SHA1SUMS
-    cd -
-else
-    export LIBZMQ_DEPLOYMENT=""
-fi
diff --git a/libs/libzmq/config.sh b/libs/libzmq/config.sh
deleted file mode 100644
index d8ffe46..0000000
--- a/libs/libzmq/config.sh
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/usr/bin/env bash
-
-function set_config_opts() {
-    CONFIG_OPTS=()
-    CONFIG_OPTS+=("CFLAGS=-g")
-    CONFIG_OPTS+=("CPPFLAGS=-I${BUILD_PREFIX}/include")
-    CONFIG_OPTS+=("CXXFLAGS=-g")
-    CONFIG_OPTS+=("LDFLAGS=-L${BUILD_PREFIX}/lib")
-    CONFIG_OPTS+=("PKG_CONFIG_PATH=${BUILD_PREFIX}/lib/pkgconfig")
-    CONFIG_OPTS+=("--prefix=${BUILD_PREFIX}")
-    CHECK="distcheck"
-
-    if [ -n "$ADDRESS_SANITIZER" ] && [ "$ADDRESS_SANITIZER" = "enabled" ]; then
-        CONFIG_OPTS+=("--enable-address-sanitizer=yes")
-        # distcheck does an out-of-tree build, and the fuzzer tests use a hard-coded relative path for simplicity
-        CHECK="check"
-        git clone --depth 1 https://github.com/zeromq/libzmq-fuzz-corpora.git tests/libzmq-fuzz-corpora
-    fi
-
-    if [ "$USE_NSS" = "yes" ]; then
-        CONFIG_OPTS+=("--with-nss")
-    fi
-
-    if [ -z "$CURVE" ]; then
-        CONFIG_OPTS+=("--disable-curve")
-    elif [ "$CURVE" = "libsodium" ]; then
-        CONFIG_OPTS+=("--with-libsodium=yes")
-
-        if ! ((command -v dpkg-query >/dev/null 2>&1 && dpkg-query --list libsodium-dev >/dev/null 2>&1) || \
-                (command -v brew >/dev/null 2>&1 && brew ls --versions libsodium >/dev/null 2>&1)); then
-            git clone --depth 1 -b stable https://github.com/jedisct1/libsodium.git
-            ( cd libsodium; ./autogen.sh; ./configure --prefix=$BUILD_PREFIX; make install)
-        fi
-    fi
-
-    if [ -n "$GSSAPI" ] && [ "$GSSAPI" = "enabled" ]; then
-        CONFIG_OPTS+=("--with-libgssapi_krb5=yes")
-    fi
-
-    if [ -n "$PGM" ] && [ "$PGM" = "enabled" ]; then
-        CONFIG_OPTS+=("--with-pgm=yes")
-    fi
-
-    if [ -n "$NORM" ] && [ "$NORM" = "enabled" ]; then
-        CONFIG_OPTS+=("--with-norm=yes")
-    fi
-
-    if [ -n "$TIPC" ] && [ "$TIPC" = "enabled" ]; then
-        sudo modprobe tipc
-    fi
-
-    if [ -n "$POLLER" ]; then
-        CONFIG_OPTS+=("--with-poller=${POLLER}")
-    fi
-
-    if [ -n "$TLS" ] && [ "$TLS" = "enabled" ]; then
-        CONFIG_OPTS+=("--with-tls=yes")
-    fi
-
-    if [ -z "$DRAFT" ] || [ "$DRAFT" = "disabled" ]; then
-        CONFIG_OPTS+=("--enable-drafts=no")
-    elif [ "$DRAFT" = "enabled" ]; then
-        CONFIG_OPTS+=("--enable-drafts=yes")
-    fi
-
-    if [ -n "$FORCE_98" ] && [ "$FORCE_98" = "enabled" ]; then
-        CONFIG_OPTS+=("--enable-force-CXX98-compat=yes")
-    fi
-
-    if [ -n "$VMCI" ] && [ "$VMCI" = "enabled" ]; then
-        CONFIG_OPTS+=("--with-vmci=$PWD/vmci")
-        # VMWare headeers are not ISO C++ compliant
-        CONFIG_OPTS+=("--disable-pedantic")
-        git clone --depth 1 https://github.com/vmware/open-vm-tools.git
-        mkdir -p vmci
-        # Linux headers are redefined, so we can't just add -I to the whole dir
-        cp open-vm-tools/open-vm-tools/lib/include/vmci_* vmci/
-    fi
-}
diff --git a/libs/libzmq/configure.ac b/libs/libzmq/configure.ac
deleted file mode 100644
index ed6bf44..0000000
--- a/libs/libzmq/configure.ac
+++ /dev/null
@@ -1,1199 +0,0 @@
-#                                               -*- Autoconf -*-
-# Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.61)
-#
-# The 0MQ version number is extracted from include/zmq.h using
-# the version.sh script. Hence, it should be updated there.
-# The version in git should reflect the *next* version planned.
-#
-AC_INIT([zeromq],[m4_esyscmd([./version.sh])],[zeromq-dev@lists.zeromq.org])
-
-AC_CONFIG_AUX_DIR(config)
-AC_CONFIG_MACRO_DIR(config)
-AC_CONFIG_HEADERS([src/platform.hpp])
-AM_INIT_AUTOMAKE(foreign subdir-objects tar-ustar dist-zip)
-# Allow "configure --disable-maintainer-mode" to disable timestamp checking 
-AM_MAINTAINER_MODE([enable])
-
-m4_pattern_allow([AC_PROG_CC_C99])
-m4_include([m4/ax_check_compile_flag.m4])
-m4_include([m4/ax_cxx_compile_stdcxx_11.m4])
-m4_include([m4/ax_code_coverage.m4])
-m4_include([m4/ax_valgrind_check.m4])
-m4_include([m4/ax_check_vscript.m4])
-m4_include([m4/ax_func_posix_memalign.m4])
-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
-
-# This lets us use PACKAGE_VERSION in Makefiles
-AC_SUBST(PACKAGE_VERSION)
-
-# Libtool -version-info (ABI version)
-#
-# Don't change this unless you know exactly what you're doing and have read and
-# understand:
-# http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
-#
-# Changes:
-#
-# ZeroMQ versions prior to 2.1.0 use 0:0:0 (undefined)
-# ZeroMQ versions 2.1.x: 1:0:0 (ABI version 1)
-# ZeroMQ version 3.0: 2:0:0 (ABI version 2)
-# ZeroMQ version 3.1: 3:0:0 (ABI version 3)
-# ZeroMQ version 4.0: 4:0:0 (ABI version 4)
-# ZeroMQ version 4.1: 5:0:0 (ABI version 5)
-# ZeroMQ version 4.2.0: 6:0:1 (ABI version 5)
-# ZeroMQ version 4.2.1: 6:1:1 (ABI version 5)
-# ZeroMQ version 4.2.2: 6:2:1 (ABI version 5)
-# ZeroMQ version 4.2.3: 6:3:1 (ABI version 5)
-# ZeroMQ version 4.2.4: 6:4:1 (ABI version 5)
-# ZeroMQ version 4.2.5: 6:5:1 (ABI version 5)
-# ZeroMQ version 4.3.0: 7:0:2 (ABI version 5)
-# ZeroMQ version 4.3.1: 7:1:2 (ABI version 5)
-# ZeroMQ version 4.3.2: 7:2:2 (ABI version 5)
-# ZeroMQ version 4.3.3: 7:3:2 (ABI version 5)
-# ZeroMQ version 4.3.4: 7:4:2 (ABI version 5)
-# ZeroMQ version 4.3.5: 7:5:2 (ABI version 5)
-#
-# libzmq -version-info current:revision:age
-LTVER="7:5:2"
-AC_SUBST(LTVER)
-
-# Take a copy of original flags
-ZMQ_ORIG_CFLAGS="${CFLAGS:-none}"
-ZMQ_ORIG_CPPFLAGS="${CPPFLAGS:-none}"
-ZMQ_ORIG_CXXFLAGS="${CXXFLAGS:-none}"
-
-# Checks for programs.
-AC_PROG_CC
-AX_CHECK_COMPILE_FLAG([-std=c11], [CFLAGS+=" -std=c11"], [AC_PROG_CC_C99])
-AC_PROG_CXX
-AX_CODE_COVERAGE
-AM_PROG_CC_C_O
-AC_PROG_SED
-AC_PROG_AWK
-PKG_PROG_PKG_CONFIG
-m4_pattern_forbid([^PKG_[A-Z_]+$], [missing some pkg-config macros (pkg-config package)])
-
-# Libtool configuration for different targets. See acinclude.m4
-AC_ARG_VAR([XMLTO], [path to xmlto command])
-AC_PATH_PROG([XMLTO], [xmlto])
-AC_ARG_VAR([ASCIIDOC], [path to asciidoc command])
-AC_PATH_PROG([ASCIIDOC], [asciidoc])
-LIBZMQ_CONFIG_LIBTOOL
-AC_LIBTOOL_WIN32_DLL
-AC_PROG_LIBTOOL
-AX_VALGRIND_CHECK
-AX_CHECK_VSCRIPT
-AX_FUNC_POSIX_MEMALIGN
-
-AC_ARG_ENABLE([force-CXX98-compat],
-    [AS_HELP_STRING([--enable-force-CXX98-compat], [force C++98 build [default=disabled]])])
-if test "x$enable_force_CXX98_compat" = "xyes"; then
-    AC_LANG_PUSH([C++])
-    AX_CHECK_COMPILE_FLAG([-std=gnu++98], [CXXFLAGS+=" -std=gnu++98"], [])
-    AX_CHECK_COMPILE_FLAG([-Wc++98-compat -Wc++98-compat-pedantic], [CXXFLAGS+=" -Wc++98-compat"], [])
-    AC_LANG_POP([C++])
-else
-    AX_CXX_COMPILE_STDCXX_11([ext], [optional])
-fi
-
-# Check whether to build a with debug symbols
-LIBZMQ_CHECK_ENABLE_DEBUG
-
-# Check whether to enable code coverage
-LIBZMQ_WITH_GCOV
-
-AC_MSG_CHECKING([if TIPC is available and supports nonblocking connect])
-
-AC_RUN_IFELSE(
-    [AC_LANG_PROGRAM([[
-            #include <stdlib.h>
-            #include <string.h>
-            #include <fcntl.h>
-            #include <errno.h>
-            #include <sys/socket.h>
-            #include <linux/tipc.h>
-        ]],[[
-            struct sockaddr_tipc topsrv;
-            int sd = socket(AF_TIPC, SOCK_SEQPACKET, 0);
-            memset(&topsrv, 0, sizeof(topsrv));
-            topsrv.family = AF_TIPC;
-            topsrv.addrtype = TIPC_ADDR_NAME;
-            topsrv.addr.name.domain = tipc_addr (10, 10, 10);
-            topsrv.addr.name.name.type = TIPC_TOP_SRV;
-            topsrv.addr.name.name.instance = TIPC_TOP_SRV;
-            fcntl(sd, F_SETFL, O_NONBLOCK);
-        ]])
-    ],
-    [libzmq_tipc_support=yes],
-    [libzmq_tipc_support=no],
-    [libzmq_tipc_support=no])
-
-AC_MSG_RESULT([$libzmq_tipc_support])
-
-AC_ARG_ENABLE([pedantic],
-    [AS_HELP_STRING([--disable-pedantic], [disable pedantic compiler checks [default=enabled]])],
-    [libzmq_pedantic=$enableval], [libzmq_pedantic=yes])
-
-AC_ARG_WITH([militant],
-    [AS_HELP_STRING([--with-militant],
-        [enable militant API assertions])],
-    [zmq_militant="yes"],
-    [])
-
-if test "x$zmq_militant" = "xyes"; then
-    AC_DEFINE(ZMQ_ACT_MILITANT, 1, [Enable militant API assertions])
-fi
-
-# Disable IPC on unsupported platforms.
-case "${host_os}" in
-    *vxworks*|*openvms*|*mingw*)
-        ;;
-    *)
-        AC_DEFINE(ZMQ_HAVE_IPC, 1, [Have AF_UNIX sockets for ipc transport])
-        ;;
-esac
-
-# Data race/deadlock detection
-# NOTE: Running libzmq under TSAN doesn't make much sense -- synchronization in libzmq is to some extent
-# handled by the code "knowing" what threads are allowed to do, rather than by enforcing those
-# restrictions, so TSAN generates a lot of (presumably) false positives from libzmq.
-# The settings below are intended to enable libzmq to be built with minimal support for TSAN
-# such that it can be used along with other code that is also built with TSAN.
-AC_MSG_CHECKING([whether to enable TSan])
-AC_ARG_ENABLE(thread-sanitizer, [AS_HELP_STRING([--enable-thread-sanitizer=yes/no],
-                  [Build with clang Thread Sanitizer instrumentation])],
-                  [ZMQ_TSAN="$enableval"])
-
-if test "x${ZMQ_TSAN}" = "xyes"; then
-    TSAN_FLAGS="-fno-omit-frame-pointer -fsanitize=thread"
-    TSAN_CCFLAGS="${TSAN_CCFLAGS} -mllvm -tsan-instrument-memory-accesses=0"
-    TSAN_CCFLAGS="${TSAN_CCFLAGS} -mllvm -tsan-instrument-atomics=0"
-    TSAN_CCFLAGS="${TSAN_CCFLAGS} -mllvm -tsan-instrument-func-entry-exit=1"
-    CFLAGS="${CFLAGS} ${TSAN_FLAGS} ${TSAN_CCFLAGS}"
-    CXXFLAGS="${CXXFLAGS} ${TSAN_FLAGS} ${TSAN_CCFLAGS}"
-    LDFLAGS="${LDFLAGS} ${TSAN_FLAGS} -pie"
-
-    AM_CONDITIONAL(ENABLE_TSAN, true)
-    AC_MSG_RESULT([yes])
-else
-    AM_CONDITIONAL(ENABLE_TSAN, false)
-    AC_MSG_RESULT([no])
-fi
-
-# Memory mis-use detection
-AC_MSG_CHECKING([whether to enable ASan])
-AC_ARG_ENABLE(address-sanitizer, [AS_HELP_STRING([--enable-address-sanitizer=yes/no],
-                  [Build with GCC Address Sanitizer instrumentation])],
-                  [ZMQ_ASAN="$enableval"])
-
-if test "x${ZMQ_ASAN}" = "xyes"; then
-    CFLAGS="${CFLAGS} -fsanitize=address -fsanitize=undefined -fsanitize=leak -fno-sanitize-recover=all"
-    CXXFLAGS="${CXXFLAGS} -fsanitize=address -fsanitize=undefined -fsanitize=leak -fno-sanitize-recover=all"
-
-    AM_CONDITIONAL(ENABLE_ASAN, true)
-    AC_MSG_RESULT([yes])
-else
-    AM_CONDITIONAL(ENABLE_ASAN, false)
-    AC_MSG_RESULT([no])
-fi
-
-# By default compiling with -Werror except on OSX and Solaris when building
-# with libsodium.
-AC_ARG_ENABLE([Werror],
-    [AS_HELP_STRING([--disable-Werror], [disable Werror compiler flag [default=enabled]])],
-    [libzmq_werror=$enableval], [libzmq_werror=yes])
-
-# By default use DSO visibility
-libzmq_dso_visibility="yes"
-
-# Platform specific checks
-libzmq_on_mingw="no"
-libzmq_on_cygwin="no"
-libzmq_on_android="no"
-libzmq_on_linux="no"
-libzmq_on_gnu="no"
-
-# Set some default features required by ZeroMQ code
-CPPFLAGS="-D_REENTRANT -D_THREAD_SAFE $CPPFLAGS"
-CXXFLAGS="-Wno-long-long $CXXFLAGS"
-
-# Will be used to add flags to pkg-config useful when apps want to statically link
-PKGCFG_LIBS_PRIVATE=""
-PKGCFG_NAMES_PRIVATE=""
-
-# For host type checks
-AC_CANONICAL_HOST
-
-# OS-specific tests
-case "${host_os}" in
-    *linux*)
-        # Define on Linux to enable all library features. Define if using a gnu compiler
-        if test "x$GXX" = "xyes"; then
-            CPPFLAGS="-D_GNU_SOURCE $CPPFLAGS"
-        fi
-        AC_DEFINE(ZMQ_HAVE_LINUX, 1, [Have Linux OS])
-        libzmq_on_linux="yes"
-
-        if test "x$libzmq_tipc_support" = "xyes"; then
-            AC_DEFINE(ZMQ_HAVE_TIPC, 1, [Have TIPC support])
-        fi
-        case "${host_os}" in
-            *android*)
-                AC_DEFINE(ZMQ_HAVE_ANDROID, 1, [Have Android OS])
-                libzmq_on_android="yes"
-            ;;
-        esac
-        ;;
-    *solaris*)
-        # Define on Solaris to enable all library features
-        CPPFLAGS="-D_PTHREADS $CPPFLAGS"
-        CXXFLAGS="-Wno-sign-compare $CXXFLAGS"
-        AC_DEFINE(ZMQ_HAVE_SOLARIS, 1, [Have Solaris OS])
-        AC_CHECK_LIB(socket, socket)
-        AC_CHECK_LIB(nsl, gethostbyname)
-        AC_MSG_CHECKING([whether atomic operations can be used])
-        AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
-            [[#include <atomic.h>]],
-            [[uint32_t value;
-              atomic_cas_32 (&value, 0, 0);
-              return 0;]])],
-            [solaris_has_atomic=yes],
-            [solaris_has_atomic=no])
-        AC_MSG_RESULT([$solaris_has_atomic])
-        # Solaris 8 does not have atomic operations exported to user space.
-        if test "x$solaris_has_atomic" = "xno"; then
-            AC_DEFINE(ZMQ_FORCE_MUTEXES, 1, [Force to use mutexes])
-        fi
-        ;;
-    *freebsd*)
-        # Define on FreeBSD to enable all library features
-        CPPFLAGS="-D__BSD_VISIBLE $CPPFLAGS"
-        AC_DEFINE(ZMQ_HAVE_FREEBSD, 1, [Have FreeBSD OS])
-        ;;
-    *dragonfly*)
-        CPPFLAGS="-D__BSD_VISIBLE $CPPFLAGS"
-        AC_DEFINE(ZMQ_HAVE_FREEBSD, 1, [Have DragonFly OS])
-        AC_DEFINE(ZMQ_HAVE_DRAGONFLY, 1, [Have DragonFly OS])
-        ;;
-    *darwin*)
-        # Define on Darwin to enable all library features
-        CPPFLAGS="-D_DARWIN_C_SOURCE $CPPFLAGS"
-        libzmq_pedantic="no"
-        AC_DEFINE(ZMQ_HAVE_OSX, 1, [Have DarwinOSX OS])
-        ;;
-    *haiku*)
-        AC_DEFINE(ZMQ_HAVE_HAIKU, 1, [Have Haiku OS])
-        AC_CHECK_LIB(network, socket)
-        ;;
-    *netbsd*)
-        # Define on NetBSD to enable all library features
-        CPPFLAGS="-D_NETBSD_SOURCE $CPPFLAGS"
-        AC_DEFINE(ZMQ_HAVE_NETBSD, 1, [Have NetBSD OS])
-        # NetBSD 5.0 and newer provides atomic operations but we can
-        # only use these on systems where PR #42842 has been fixed so
-        # we must try and link a test program using C++.
-        libzmq_netbsd_has_atomic=no
-        AC_MSG_CHECKING([whether atomic operations can be used])
-        AC_LANG_PUSH([C++])
-        AC_LINK_IFELSE([AC_LANG_PROGRAM(
-            [[#include <atomic.h>]],
-            [[uint32_t value;
-              atomic_cas_32 (&value, 0, 0);
-              return 0;]])],
-            [libzmq_netbsd_has_atomic=yes],
-            [libzmq_netbsd_has_atomic=no])
-        AC_LANG_POP([C++])
-        AC_MSG_RESULT([$libzmq_netbsd_has_atomic])
-        if test "x$libzmq_netbsd_has_atomic" = "xno"; then
-            AC_DEFINE(ZMQ_FORCE_MUTEXES, 1, [Force to use mutexes])
-        fi
-        # NetBSD Current (to become 10) has changed the type of udata in it's
-        # kevent struct from intptr_t to void * to align with darwin and other
-        # BSDs, see upstream commit:
-        # https://github.com/NetBSD/src/commit/e5ead823eb916b56589d2c6c560dbcfe4a2d0afc
-        AC_MSG_CHECKING([whether kevent udata type is intptr_t])
-        AC_LANG_PUSH([C++])
-        AC_LINK_IFELSE([AC_LANG_PROGRAM(
-            [[#include <sys/types.h>
-              #include <sys/event.h>
-              #include <sys/time.h>]],
-            [[struct kevent ev;
-              intptr_t udata;
-              EV_SET(&ev, 0, 0, EV_ADD, 0, 0, udata);
-              return 0;]])],
-            [libzmq_netbsd_kevent_udata_intptr_t=yes],
-            [libzmq_netbsd_kevent_udata_intptr_t=no])
-        AC_LANG_POP([C++])
-        AC_MSG_RESULT([$libzmq_netbsd_kevent_udata_intptr_t])
-        if test "x$libzmq_netbsd_kevent_udata_intptr_t" = "xyes"; then
-            AC_DEFINE(ZMQ_NETBSD_KEVENT_UDATA_INTPTR_T, 1, [kevent udata type is intptr_t])
-        fi
-        ;;
-    *openbsd*|*bitrig*)
-        # Define on OpenBSD to enable all library features
-        CPPFLAGS="-D_BSD_SOURCE $CPPFLAGS"
-        AC_DEFINE(ZMQ_HAVE_OPENBSD, 1, [Have OpenBSD OS])
-        ;;
-    *nto-qnx*)
-        libzmq_pedantic="no"
-        AC_DEFINE(ZMQ_HAVE_QNXNTO, 1, [Have QNX Neutrino OS])
-        AC_CHECK_LIB(socket, socket)
-        ;;
-    *aix*|*os400*)
-        AC_DEFINE(ZMQ_HAVE_AIX, 1, [Have AIX OS])
-        ;;
-    *hpux*)
-        # Define on HP-UX to enable all library features
-        CPPFLAGS="-D_POSIX_C_SOURCE=200112L $CPPFLAGS"
-        AC_DEFINE(ZMQ_HAVE_HPUX, 1, [Have HPUX OS])
-        LIBZMQ_CHECK_LANG_FLAG_PREPEND([-Ae])
-        AC_CHECK_FUNCS(gethrtime)
-        ;;
-    *mingw*|*msys*)
-        AC_DEFINE(ZMQ_HAVE_WINDOWS, 1, [Have Windows OS])
-        AC_DEFINE(ZMQ_HAVE_MINGW, 1, [Have MinGW])
-        AC_CHECK_HEADERS(windows.h)
-        AC_CHECK_LIB(ws2_32, main, ,
-            [AC_MSG_ERROR([cannot link with ws2_32.dll.])])
-        AC_CHECK_LIB(rpcrt4, main, ,
-            [AC_MSG_ERROR([cannot link with rpcrt4.dll.])])
-        AC_CHECK_LIB(iphlpapi, main, ,
-            [AC_MSG_ERROR([cannot link with iphlpapi.dll.])])
-        libzmq_on_mingw="yes"
-        libzmq_dso_visibility="no"
-
-        if test "x$enable_static" = "xyes"; then
-            CPPFLAGS="-DZMQ_STATIC $CPPFLAGS"
-            PKGCFG_LIBS_PRIVATE="$PKGCFG_LIBS_PRIVATE -liphlpapi"
-        fi
-	# Set FD_SETSIZE to 16384
-	CPPFLAGS=" -DFD_SETSIZE=16384 $CPPFLAGS"
-        ;;
-    *cygwin*)
-        # Define on Cygwin to enable all library features
-        CPPFLAGS="-D_GNU_SOURCE $CPPFLAGS"
-        AC_DEFINE(ZMQ_HAVE_CYGWIN, 1, [Have Cygwin])
-        libzmq_on_cygwin="yes"
-        libzmq_dso_visibility="no"
-        if test "x$enable_static" = "xyes"; then
-            AC_MSG_ERROR([Building static libraries is not supported under Cygwin])
-        fi
-        ;;
-    gnu*)
-        # Define on GNU/Hurd to enable all library features. Define if using a gnu compiler
-        if test "x$GXX" = "xyes"; then
-            CPPFLAGS="-D_GNU_SOURCE $CPPFLAGS"
-        fi
-        AC_DEFINE(ZMQ_HAVE_GNU, 1, [Have GNU/Hurd OS])
-        libzmq_on_gnu="yes"
-	AC_CHECK_LIB(rt, sem_init)
-        ;;
-    *)
-        AC_MSG_ERROR([unsupported system: ${host_os}.])
-        ;;
-esac
-
-# Sun Studio does not like anonymous structures in unions and does not have weak attribute
-if test "x$libzmq_cv_[]_AC_LANG_ABBREV[]_sun_studio_compiler" = "xyes"; then
-    CXXFLAGS="${CXXFLAGS} -features=extensions"
-    CFLAGS="${CFLAGS} -features=extensions"
-    CPPFLAGS="${CPPFLAGS} -DUNITY_WEAK_PRAGMA"
-fi
-
-# Checks for libraries
-AC_CHECK_LIB([pthread], [pthread_create])
-if test "x$ac_cv_lib_pthread_pthread_create" = "xyes"; then
-    PKGCFG_LIBS_PRIVATE="$PKGCFG_LIBS_PRIVATE -lpthread"
-fi
-AC_CHECK_LIB([rt], [clock_gettime])
-if test "x$ac_cv_lib_rt_clock_gettime" = "xyes"; then
-    PKGCFG_LIBS_PRIVATE="$PKGCFG_LIBS_PRIVATE -lrt"
-fi
-
-#
-# Check if the compiler supports -fvisibility=hidden flag. MinGW uses __declspec
-#
-if test "x$libzmq_dso_visibility" = "xyes"; then
-    AC_LANG_PUSH([C++])
-    LIBZMQ_CHECK_LANG_VISIBILITY([LIBZMQ_EXTRA_CXXFLAGS="$libzmq_cv_[]_AC_LANG_ABBREV[]_visibility_flag ${LIBZMQ_EXTRA_CXXFLAGS}"])
-    AC_LANG_POP([C++])
-fi
-
-# CPU-specific optimizations
-case "${host_cpu}" in
-    *sparc64*)
-        AC_LANG_PUSH([C++])
-        LIBZMQ_CHECK_LANG_FLAG_PREPEND([-mcpu=v9])
-        AC_LANG_POP([C++])
-    ;;
-    *)
-    ;;
-esac
-
-# Check whether to build docs / install man pages
-LIBZMQ_CHECK_DOC_BUILD
-
-# Check polling system, set appropriate macro in src/platform.hpp
-LIBZMQ_CHECK_POLLER
-
-# Check for pselect to activate ppoll, set appropriate macro in src/platform.hpp
-LIBZMQ_CHECK_PPOLL
-
-# Check cacheline size, set appropriate macro in src/platform.hpp
-LIBZMQ_CHECK_CACHELINE
-
-# Check condition variable implementation, set appropriate macro in src/platform.hpp
-LIBZMQ_CHECK_CV_IMPL
-
-# Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS(\
-    errno.h \
-    time.h \
-    unistd.h \
-    limits.h \
-    stddef.h \
-    stdlib.h \
-    string.h \
-    arpa/inet.h \
-    netinet/tcp.h \
-    netinet/in.h \
-    sys/socket.h \
-    sys/time.h)
-
-# Check if we have ifaddrs.h header file.
-AC_CHECK_HEADERS(ifaddrs.h, [AC_DEFINE(ZMQ_HAVE_IFADDRS, 1, [Have ifaddrs.h header.])])
-
-# Check if we have sys/uio.h header file.
-AC_CHECK_HEADERS(sys/uio.h, [AC_DEFINE(ZMQ_HAVE_UIO, 1, [Have uio.h header.])])
-
-# Force not to use eventfd
-AC_ARG_ENABLE([eventfd],
-    [AS_HELP_STRING([--disable-eventfd], [disable eventfd [default=enabled]])],
-    [zmq_enable_eventfd=$enableval],
-    [zmq_enable_eventfd=yes])
-
-if test "x$zmq_enable_eventfd" = "xyes"; then
-    # Check if we have eventfd.h header file.
-    AC_CHECK_HEADERS(sys/eventfd.h, [
-        AC_DEFINE(ZMQ_HAVE_EVENTFD, 1, [Have eventfd extension])
-        LIBZMQ_CHECK_EVENTFD_CLOEXEC([
-            AC_DEFINE([ZMQ_HAVE_EVENTFD_CLOEXEC],
-               [1],
-               [Whether EFD_CLOEXEC is defined and functioning.])
-            ])
-    ])
-fi
-
-# Conditionally build performance measurement tools
-AC_ARG_ENABLE([perf],
-    [AS_HELP_STRING([--disable-perf], [don't build performance measurement tools [default=build]])],
-    [zmq_enable_perf=$enableval],
-    [zmq_enable_perf=yes])
-
-AM_CONDITIONAL(ENABLE_PERF, test "x$zmq_enable_perf" = "xyes")
-
-# Conditionally build curve key generation tool
-AC_ARG_ENABLE([curve-keygen],
-    [AS_HELP_STRING([--disable-curve-keygen], [don't build curve-keygen tool [default=build]])],
-    [zmq_enable_curve_keygen=$enableval],
-    [zmq_enable_curve_keygen=yes])
-
-# Use c++ in subsequent tests
-AC_LANG_PUSH(C++)
-
-AC_CHECK_DECLS([SO_PEERCRED],
-    [AC_DEFINE(ZMQ_HAVE_SO_PEERCRED, 1, [Have SO_PEERCRED socket option])],
-    [],
-    [#include <sys/socket.h>])
-
-AC_CHECK_DECLS([LOCAL_PEERCRED],
-    [AC_DEFINE(ZMQ_HAVE_LOCAL_PEERCRED, 1, [Have LOCAL_PEERCRED socket option])],
-    [],
-    [#include <sys/socket.h>])
-
-AM_CONDITIONAL(HAVE_IPC_PEERCRED, test "x$ac_cv_have_decl_SO_PEERCRED" = "xyes" || test "x$ac_cv_have_decl_LOCAL_PEERCRED" = "xyes")
-
-AC_HEADER_STDBOOL
-AC_C_CONST
-AC_C_INLINE
-
-# Checks for typedefs, structures, and compiler characteristics.
-if test "x$libzmq_cv_[]_AC_LANG_ABBREV[]_intel_compiler" = "xyes"; then
-    dnl 279: controlling expression is constant
-    dnl Fixes build with ICC 12.x
-    LIBZMQ_CHECK_WITH_FLAG([-wd279], [AC_TYPE_SIZE_T])
-    LIBZMQ_CHECK_WITH_FLAG([-wd279], [AC_TYPE_SSIZE_T])
-else
-    AC_TYPE_SIZE_T
-    AC_TYPE_SSIZE_T
-fi
-
-AC_HEADER_TIME
-AC_TYPE_UINT32_T
-AC_C_VOLATILE
-
-# build using libgssapi_krb5
-AC_ARG_WITH([libgssapi_krb5], [AS_HELP_STRING([--with-libgssapi_krb5],
-    [require libzmq build with libgssapi_krb5 [default=no]])],
-    [require_libgssapi_krb5_ext=$withval],
-    [require_libgssapi_krb5_ext=no])
-
-# conditionally require libgssapi_krb5
-if test "x$require_libgssapi_krb5_ext" != "xno"; then
-    PKG_CHECK_MODULES([gssapi_krb5], [krb5-gssapi], [
-        have_gssapi_library="yes"
-        PKGCFG_NAMES_PRIVATE="$PKGCFG_NAMES_PRIVATE krb5-gssapi"
-    ], [
-        AC_CHECK_HEADERS(gssapi/gssapi_generic.h)
-        AC_SEARCH_LIBS([gss_init_sec_context], [gssapi_krb5 gssapi],
-            have_gssapi_library="yes",
-            AC_MSG_ERROR(libgssapi_krb5 is needed for GSSAPI security))
-        PKGCFG_LIBS_PRIVATE="$PKGCFG_LIBS_PRIVATE -lgssapi_krb5"
-    ])
-fi
-if test "x$have_gssapi_library" = "xyes"; then
-    AC_DEFINE(HAVE_LIBGSSAPI_KRB5, [1], [Enabled GSSAPI security])
-fi
-AM_CONDITIONAL(BUILD_GSSAPI, test "x$have_gssapi_library" = "xyes")
-
-# Select curve encryption library, defaults to tweetnacl
-# To use libsodium instead, use --with-libsodium (must be installed)
-# To disable curve, use --disable-curve
-
-AC_ARG_WITH([libsodium],
-    [AS_HELP_STRING([--with-libsodium], [use libsodium instead of built-in tweetnacl [default=no]])])
-
-AS_IF([test "x$with_libsodium" = "xyes"], [
-    PKG_CHECK_MODULES([sodium], [libsodium], [libsodium_found=yes], [
-        AC_MSG_ERROR(libsodium is not installed. Install it, then run configure again)
-    ])
-])
-
-AC_ARG_ENABLE([curve],
-    [AS_HELP_STRING([--disable-curve], [disable CURVE security [default=no]])])
-
-AC_ARG_ENABLE(
-    [libsodium_randombytes_close],
-    [AS_HELP_STRING(
-        [--disable-libsodium_randombytes_close],
-        [Do not call libsodium randombytes_close() when terminating contexts.
-        If disabled, may leave one FD open on /dev/urandom
-        until randombytes_close() is called explicitly,
-        but fixes a crash when multiple contexts are used with CURVE.
-        Has no effect when getrandom() is available. [default=enabled]]
-    )],
-    [],
-    [enable_libsodium_randombytes_close=yes]
-)
-
-if test "x$enable_curve" = "xno"; then
-    curve_library=""
-    AC_MSG_NOTICE([CURVE security is disabled])
-
-elif test "x$with_libsodium" = "xyes"; then
-    AC_MSG_NOTICE([Using libsodium for CURVE security])
-    AC_DEFINE(ZMQ_HAVE_CURVE, [1], [Using curve encryption])
-    AC_DEFINE(ZMQ_USE_LIBSODIUM, [1], [Using libsodium for curve encryption])
-    if test "x$enable_libsodium_randombytes_close" = "xyes"; then
-        AC_DEFINE(ZMQ_LIBSODIUM_RANDOMBYTES_CLOSE, [1], [Automatically close libsodium randombytes. Not threadsafe without getrandom()])
-    else
-        AC_MSG_NOTICE([Disabling libsodium randombytes_close(). randombytes_close() may need to be called in application code.])
-    fi
-
-    curve_library="libsodium"
-    enable_curve="yes"
-
-    case "${host_os}" in
-        *solaris*)
-            dnl On Solaris, libsodium depends on libssp
-            LDFLAGS="-lssp $LDFLAGS"
-            libzmq_pedantic="no"
-            libzmq_werror="no"
-        ;;
-        *darwin*)
-            dnl On Darwin, building with libsodium causes
-            dnl macro redefinition warnings
-            libzmq_werror="no"
-        ;;
-    esac
-
-    PKGCFG_NAMES_PRIVATE="$PKGCFG_NAMES_PRIVATE libsodium"
-else
-    AC_MSG_NOTICE([Using tweetnacl for CURVE security])
-    AC_DEFINE(ZMQ_HAVE_CURVE, [1], [Using curve encryption])
-    AC_DEFINE(ZMQ_USE_TWEETNACL, [1], [Using tweetnacl for curve encryption])
-    curve_library="tweetnacl"
-    enable_curve="yes"
-fi
-
-AM_CONDITIONAL(ENABLE_CURVE_KEYGEN, test "x$enable_curve" = "xyes" -a "x$zmq_enable_curve_keygen" = "xyes")
-
-AM_CONDITIONAL(USE_LIBSODIUM, test "$curve_library" = "libsodium")
-AM_CONDITIONAL(USE_TWEETNACL, test "$curve_library" = "tweetnacl")
-AM_CONDITIONAL(HAVE_CURVE, test "x$curve_library" != "x")
-AM_CONDITIONAL(USE_WEPOLL, test "$poller" = "wepoll")
-
-# Check requiring packages for WebSocket
-ws_crypto_library=""
-
-AC_ARG_ENABLE([ws],
-    [AS_HELP_STRING([--enable-ws], [Enable WebSocket transport [default=state of DRAFT]])],
-    [enable_ws=$enableval],
-    [enable_ws=$enable_drafts])
-
-AC_ARG_WITH([nss],
-    [AS_HELP_STRING([--with-nss], [use nss instead of built-in sha1 [default=no]])])
-
-AC_ARG_WITH([tls],
-    [AS_HELP_STRING([--with-tls], [Enable TLS (WSS transport) [default=no]])])
-
-if test "x$enable_ws" != "xno"; then
-    if test "x$with_tls" = "xyes"; then
-        PKG_CHECK_MODULES([GNUTLS], [gnutls >= 3.1.4], [
-            PKGCFG_NAMES_PRIVATE="$PKGCFG_NAMES_PRIVATE gnutls >= 3.1.4"
-            ws_crypto_library="gnutls"
-            AC_DEFINE(ZMQ_USE_GNUTLS, [1], [Use GNUTLS for TLS])
-            AC_DEFINE(ZMQ_HAVE_WS, [1], [Using websocket])
-            AC_DEFINE(ZMQ_HAVE_WSS, [1], [WSS enabled])
-            AC_MSG_NOTICE(Using gnutls)
-        ],[
-          AC_MSG_ERROR([GnuTLS is not installed. Install it, then run configure again])
-        ])
-    elif test "x$with_nss" = "xyes"; then
-        PKG_CHECK_MODULES([NSS3], [nss], [
-            PKGCFG_NAMES_PRIVATE="$PKGCFG_NAMES_PRIVATE nss"
-            AC_DEFINE(ZMQ_USE_NSS, [1], [Using NSS])
-            AC_DEFINE(ZMQ_HAVE_WS, [1], [Using websocket])
-            ws_crypto_library="nss"
-            AC_MSG_NOTICE(Using NSS)
-        ], [
-            AC_MSG_ERROR([nss is not installed. Install it, then run configure again])
-        ])
-    else
-        AC_DEFINE(ZMQ_HAVE_WS, [1], [Using websocket])
-        AC_DEFINE(ZMQ_USE_BUILTIN_SHA1, [1], [Using built-in sha1])
-        AC_MSG_NOTICE(Using built-in SHA1)
-        ws_crypto_library="builtin"
-    fi
-fi
-
-AM_CONDITIONAL(HAVE_WS, test "x$ws_crypto_library" != "x")
-AM_CONDITIONAL(USE_NSS, test "x$ws_crypto_library" = "xnss")
-AM_CONDITIONAL(USE_BUILTIN_SHA1, test "x$ws_crypto_library" = "xbuiltin")
-AM_CONDITIONAL(USE_GNUTLS, test "x$ws_crypto_library" = "xgnutls")
-AM_CONDITIONAL(HAVE_WSS, test "x$ws_crypto_library" = "xgnutls")
-
-# build using pgm
-have_pgm_library="no"
-
-AC_ARG_WITH([pgm], [AS_HELP_STRING([--with-pgm],
-    [build libzmq with PGM extension. Requires pkg-config [default=no]])],
-    [with_pgm_ext=$withval],
-    [with_pgm_ext=no])
-
-# conditionally require pgm package
-if test "x$with_pgm_ext" != "xno"; then
-    PKG_CHECK_MODULES([pgm], [openpgm-5.3 >= 5.3], [
-        have_pgm_library="yes"
-        PKGCFG_NAMES_PRIVATE="$PKGCFG_NAMES_PRIVATE openpgm-5.3 >= 5.3"
-    ], [
-        PKG_CHECK_MODULES([pgm], [openpgm-5.2 >= 5.2], [
-            have_pgm_library="yes"
-            PKGCFG_NAMES_PRIVATE="$PKGCFG_NAMES_PRIVATE openpgm-5.2 >= 5.2"
-        ], [
-            PKG_CHECK_MODULES([pgm], [openpgm-5.1 >= 5.1], [
-                have_pgm_library="yes"
-                PKGCFG_NAMES_PRIVATE="$PKGCFG_NAMES_PRIVATE openpgm-5.1 >= 5.1"
-            ])
-        ])
-    ])
-fi
-
-if test "x$have_pgm_library" = "xyes"; then
-    AC_DEFINE(ZMQ_HAVE_OPENPGM, [1], [Have OpenPGM extension])
-fi
-
-AM_CONDITIONAL(HAVE_PGM, test "x$have_pgm_library" = "xyes")
-
-
-# This uses "--with-norm" to point to the "norm" directory
-# for "norm/include" and "norm/lib"
-#(if "--with-norm=yes" is given, then assume installed on system)
-AC_ARG_WITH([norm],
-    [AS_HELP_STRING([--with-norm],
-        [build libzmq with NORM protocol extension, optionally specifying norm path [default=no]])],
-    [with_norm_ext=$withval],
-    [with_norm_ext=no])
-
-AC_MSG_CHECKING("with_norm_ext = ${with_norm_ext}")
-
-if test "x$with_norm_ext" != "xno"; then
-    PKG_CHECK_MODULES([norm], [norm], [
-        have_norm_library="yes"
-        PKGCFG_NAMES_PRIVATE="$PKGCFG_NAMES_PRIVATE norm"
-    ], [
-        AC_MSG_RESULT([yes])
-
-        norm_LIBS=""
-        norm_CFLAGS=""
-        if test "x$with_norm_ext" != "xyes"; then
-            norm_path="${with_norm_ext}"
-            norm_CFLAGS="${norm_CFLAGS} -I${norm_path}/include"
-            norm_LIBS="${norm_LIBS} -L${norm_path}/lib"
-        fi
-        norm_LIBS="${norm_LIBS} -lnorm"
-        have_norm_library="yes"
-        PKGCFG_LIBS_PRIVATE="$PKGCFG_LIBS_PRIVATE $norm_LIBS"
-        AC_SUBST(norm_LIBS)
-        AC_SUBST(norm_CFLAGS)
-    ])
-else
-    AC_MSG_RESULT([no])
-fi
-if test "x$have_norm_library" = "xyes"; then
-    AC_DEFINE(ZMQ_HAVE_NORM, [1], [Have NORM protocol extension])
-fi
-AM_CONDITIONAL(HAVE_NORM, test "x$have_norm_library" = "xyes")
-
-# build using vmci
-have_vmci_library="no"
-
-AC_ARG_WITH([vmci], [AS_HELP_STRING([--with-vmci],
-    [build libzmq with VMCI transport [default=no]])],
-    [have_vmci_ext=$withval],
-    [have_vmci_ext=no])
-
-if test "x$have_vmci_ext" != "xno"; then
-    AC_DEFINE(ZMQ_HAVE_VMCI, 1, [Have VMCI transport])
-
-    if test "x$have_vmci_ext" != "xyes"; then
-        vmci_path="${have_vmci_ext}"
-        LIBZMQ_VMCI_CXXFLAGS="-I${vmci_path}"
-        LIBZMQ_VMCI_LDFLAGS="-I${vmci_path}"
-        LIBZMQ_EXTRA_CXXFLAGS="${LIBZMQ_VMCI_CXXFLAGS} ${LIBZMQ_EXTRA_CXXFLAGS}"
-        LIBZMQ_EXTRA_LDFLAGS="${LIBZMQ_VMCI_LDFLAGS} ${LIBZMQ_EXTRA_LDFLAGS}"
-    fi
-fi
-
-AM_CONDITIONAL(HAVE_VMCI, test "x$have_vmci_ext" != "xno")
-
-# Set -Wall, -Werror and -pedantic
-AC_LANG_PUSH([C++])
-
-# Check how to enable -Wall
-LIBZMQ_LANG_WALL([CXXFLAGS="$libzmq_cv_[]_AC_LANG_ABBREV[]_wall_flag $CXXFLAGS"])
-
-if test "x$libzmq_werror" = "xyes" -a "x$libzmq_cv_[]_AC_LANG_ABBREV[]_sun_studio_compiler" != "xyes"; then
-    LIBZMQ_LANG_WERROR([CXXFLAGS="$libzmq_cv_[]_AC_LANG_ABBREV[]_werror_flag $CXXFLAGS"])
-fi
-
-if test "x$libzmq_pedantic" = "xyes"; then
-    LIBZMQ_LANG_STRICT([CXXFLAGS="$libzmq_cv_[]_AC_LANG_ABBREV[]_strict_flag $CXXFLAGS"])
-fi
-AC_LANG_POP([C++])
-
-AM_CONDITIONAL(BUILD_TIPC, test "x$libzmq_tipc_support" = "xyes")
-AM_CONDITIONAL(ON_MINGW, test "x$libzmq_on_mingw" = "xyes")
-AM_CONDITIONAL(ON_CYGWIN, test "x$libzmq_on_cygwin" = "xyes")
-AM_CONDITIONAL(ON_ANDROID, test "x$libzmq_on_android" = "xyes")
-AM_CONDITIONAL(ON_LINUX, test "x$libzmq_on_linux" = "xyes")
-AM_CONDITIONAL(ON_GNU, test "x$libzmq_on_gnu" = "xyes")
-
-# Check for __atomic_Xxx compiler intrinsics
-AC_LANG_PUSH([C++])
-AX_CHECK_COMPILE_FLAG([-Watomic-alignment],
-    [CXXFLAGS+=" -Wno-atomic-alignment"],
-    [],
-    [-Werror])
-LIBZMQ_CHECK_ATOMIC_INTRINSICS([
-    AC_DEFINE([ZMQ_HAVE_ATOMIC_INTRINSICS],
-              [1],
-              [Whether compiler has __atomic_Xxx intrinsics.])
-    ])
-AC_LANG_POP([C++])
-
-# Checks for library functions.
-AC_TYPE_SIGNAL
-AC_CHECK_FUNCS(perror gettimeofday clock_gettime memset socket getifaddrs freeifaddrs mkdtemp accept4)
-AC_CHECK_HEADERS([alloca.h])
-
-# AC_CHECK_FUNCS(fork) fails on gcc 7
-AC_MSG_CHECKING([whether fork is available])
-AC_COMPILE_IFELSE(
-	[AC_LANG_PROGRAM(
-		[[#include <unistd.h>]],
-		[[return fork();]])
-	],[
-		AC_MSG_RESULT([yes])
-		AC_DEFINE(HAVE_FORK, [1], [fork is available])
-		AM_CONDITIONAL(HAVE_FORK, true)
-	],[
-		AC_MSG_RESULT([no])
-		AM_CONDITIONAL(HAVE_FORK, false)
-])
-
-# string.h doesn't seem to be included by default in Fedora 30
-AC_MSG_CHECKING([whether strnlen is available])
-AC_COMPILE_IFELSE(
-	[AC_LANG_PROGRAM(
-		[[#include <string.h>]],
-		[[size_t bar = strnlen ("foo", 1); (void)bar; return 0;]])
-	],[
-		AC_MSG_RESULT([yes])
-		AC_DEFINE(HAVE_STRNLEN, [1],
-		    [strnlen is available])
-	],[
-		AC_MSG_RESULT([no])
-])
-
-AC_MSG_CHECKING([whether if_nametoindex is available])
-AC_COMPILE_IFELSE(
-    [AC_LANG_PROGRAM([[
-        #ifdef _WIN32
-        #include <iphlpapi.h>
-        #else
-        #include <sys/types.h>
-        #include <sys/socket.h>
-        #include <net/if.h>
-        #endif]], [[
-        if_nametoindex("");
-    ]])],[
-        AC_MSG_RESULT([yes])
-        AC_DEFINE(HAVE_IF_NAMETOINDEX, [1],
-        [if_nametoindex is available])
-    ],[
-        AC_MSG_RESULT([no])
-])
-
-AC_ARG_ENABLE([libbsd],
-    [AS_HELP_STRING([--enable-libbsd],
-        [enable libbsd [default=auto]])],
-    [enable_libbsd=$enableval],
-    [enable_libbsd="auto"])
-
-if test "x$enable_libbsd" != "xno"; then
-    PKG_CHECK_MODULES(LIBBSD, [libbsd],
-        [
-            AC_DEFINE(ZMQ_HAVE_LIBBSD, 1, [The libbsd library is to be used])
-            AC_SUBST([LIBBSD_CFLAGS])
-            AC_SUBST([LIBBSD_LIBS])
-            PKGCFG_NAMES_PRIVATE="$PKGCFG_NAMES_PRIVATE libbsd"
-            found_libbsd="yes"
-        ],
-        [
-            found_libbsd="no"
-            if test "x$enable_libbsd" = "xyes"; then
-                AC_MSG_ERROR([Cannot find libbsd])
-            else
-                AC_MSG_WARN([Cannot find libbsd])
-            fi
-        ])
-fi
-AC_MSG_CHECKING([whether strlcpy is available])
-AC_COMPILE_IFELSE(
-    [AC_LANG_PROGRAM(
-        [[#include <string.h>]],
-        [[char buf [100]; size_t bar = strlcpy (buf, "foo", 100); (void)bar; return 0;]])
-    ],[
-        AC_MSG_RESULT([yes])
-        AC_DEFINE(ZMQ_HAVE_STRLCPY, [1],
-            [strlcpy is available])
-    ],[
-        AC_MSG_RESULT([no])
-])
-
-# pthread_setname is non-posix, and there are at least 4 different implementations
-AC_MSG_CHECKING([whether signature of pthread_setname_np() has 1 argument])
-AC_COMPILE_IFELSE(
-	[AC_LANG_PROGRAM(
-		[[#include <pthread.h>]],
-		[[pthread_setname_np ("foo"); return 0;]])
-	],[
-		AC_MSG_RESULT([yes])
-		AC_DEFINE(ZMQ_HAVE_PTHREAD_SETNAME_1, [1],
-		    [Whether pthread_setname_np() has 1 argument])
-	],[
-		AC_MSG_RESULT([no])
-])
-AC_MSG_CHECKING([whether signature of pthread_setname_np() has 2 arguments])
-AC_COMPILE_IFELSE(
-	[AC_LANG_PROGRAM(
-		[[#include <pthread.h>]],
-		[[pthread_setname_np (pthread_self (), "foo"); return 0;]])
-	],[
-		AC_MSG_RESULT([yes])
-		AC_DEFINE(ZMQ_HAVE_PTHREAD_SETNAME_2, [1],
-		    [Whether pthread_setname_np() has 2 arguments])
-	],[
-		AC_MSG_RESULT([no])
-])
-AC_MSG_CHECKING([whether signature of pthread_setname_np() has 3 arguments])
-AC_COMPILE_IFELSE(
-	[AC_LANG_PROGRAM(
-		[[#include <pthread.h>]],
-		[[pthread_setname_np (pthread_self(), "foo", (void *)0); return 0;]])
-	],[
-		AC_MSG_RESULT([yes])
-		AC_DEFINE(ZMQ_HAVE_PTHREAD_SETNAME_3, [1],
-		    [Whether pthread_setname_np() has 3 arguments])
-	],[
-		AC_MSG_RESULT([no])
-])
-AC_MSG_CHECKING([whether pthread_set_name_np() exists])
-AC_COMPILE_IFELSE(
-	[AC_LANG_PROGRAM(
-		[[#include <pthread.h>]],
-		[[pthread_set_name_np (pthread_self(), "foo"); return 0;]])
-	],[
-		AC_MSG_RESULT([yes])
-		AC_DEFINE(ZMQ_HAVE_PTHREAD_SET_NAME, [1],
-		    [Whether pthread_set_name_np() exists])
-	],[
-		AC_MSG_RESULT([no])
-])
-
-
-# pthread_setaffinity_np is non-posix:
-AC_MSG_CHECKING([whether pthread_setaffinity_np() exists])
-AC_COMPILE_IFELSE(
-	[AC_LANG_PROGRAM(
-		[[#include <pthread.h>]],
-		[[cpu_set_t test; pthread_setaffinity_np (pthread_self(), sizeof(cpu_set_t), &test); return 0;]])
-	],[
-		AC_MSG_RESULT([yes])
-		AC_DEFINE(ZMQ_HAVE_PTHREAD_SET_AFFINITY, [1],
-		    [Whether pthread_setaffinity_np() exists])
-	],[
-		AC_MSG_RESULT([no])
-])
-
-
-LIBZMQ_CHECK_SOCK_CLOEXEC([
-    AC_DEFINE([ZMQ_HAVE_SOCK_CLOEXEC],
-        [1],
-        [Whether SOCK_CLOEXEC is defined and functioning.])
-    ])
-
-LIBZMQ_CHECK_O_CLOEXEC([
-    AC_DEFINE([ZMQ_HAVE_O_CLOEXEC],
-        [1],
-        [Whether O_CLOEXEC is defined and functioning.])
-    ])
-
-LIBZMQ_CHECK_SO_BINDTODEVICE([
-    AC_DEFINE([ZMQ_HAVE_SO_BINDTODEVICE],
-        [1],
-        [Whether SO_BINDTODEVICE is supported.])
-    ])
-
-# TCP keep-alives Checks.
-LIBZMQ_CHECK_SO_KEEPALIVE([
-    AC_DEFINE([ZMQ_HAVE_SO_KEEPALIVE],
-        [1],
-        [Whether SO_KEEPALIVE is supported.])
-    ])
-
-LIBZMQ_CHECK_TCP_KEEPCNT([
-    AC_DEFINE([ZMQ_HAVE_TCP_KEEPCNT],
-        [1],
-        [Whether TCP_KEEPCNT is supported.])
-    ])
-
-LIBZMQ_CHECK_TCP_KEEPIDLE([
-    AC_DEFINE([ZMQ_HAVE_TCP_KEEPIDLE],
-        [1],
-        [Whether TCP_KEEPIDLE is supported.])
-    ])
-
-LIBZMQ_CHECK_TCP_KEEPINTVL([
-    AC_DEFINE([ZMQ_HAVE_TCP_KEEPINTVL],
-        [1],
-        [Whether TCP_KEEPINTVL is supported.])
-    ])
-
-LIBZMQ_CHECK_TCP_KEEPALIVE([
-    AC_DEFINE([ZMQ_HAVE_TCP_KEEPALIVE],
-        [1],
-        [Whether TCP_KEEPALIVE is supported.])
-    ])
-
-LIBZMQ_CHECK_SO_PRIORITY([
-    AC_DEFINE([ZMQ_HAVE_SO_PRIORITY],
-        [1],
-        [Whether SO_PRIORITY is supported.])
-    ])
-
-LIBZMQ_CHECK_GETRANDOM([
-    AC_DEFINE([ZMQ_HAVE_GETRANDOM],
-        [1],
-        [Whether getrandom is supported.])
-    ])
-
-if test "x$cross_compiling" = "xyes"; then
-    #   Enable draft by default when cross-compiling
-    defaultval=yes
-else
-    # enable draft API by default if we're in a git repository
-    # else disable it by default; then allow --enable-drafts=yes/no override
-    AC_CHECK_FILE($srcdir/.git, [defaultval=yes], [defaultval=no])
-fi
-
-AC_ARG_ENABLE([drafts],
-    AS_HELP_STRING([--enable-drafts],
-        [Build and install draft classes and methods [default=yes]]),
-    [enable_drafts=$enableval],
-    [enable_drafts=$defaultval])
-
-AM_CONDITIONAL([ENABLE_DRAFTS], [test x$enable_drafts != xno])
-
-if test "x$enable_drafts" = "xyes"; then
-    AC_MSG_NOTICE([Building stable and legacy API + draft API])
-    AC_DEFINE(ZMQ_BUILD_DRAFT_API, 1, [Provide draft classes and methods])
-    AC_SUBST(pkg_config_defines, "-DZMQ_BUILD_DRAFT_API=1")
-else
-    AC_MSG_NOTICE([Building stable and legacy API (no draft API)])
-    AC_SUBST(pkg_config_defines, "")
-fi
-
-AC_ARG_ENABLE([libunwind],
-    [AS_HELP_STRING([--enable-libunwind],
-        [enable libunwind [default=auto]])],
-    [enable_libunwind=$enableval],
-    [enable_libunwind="auto"])
-
-if test "x$enable_libunwind" != "xno"; then
-    PKG_CHECK_MODULES(LIBUNWIND, [libunwind],
-        [
-            AC_DEFINE(HAVE_LIBUNWIND, 1, [The libunwind library is to be used])
-            AC_SUBST([LIBUNWIND_CFLAGS])
-            AC_SUBST([LIBUNWIND_LIBS])
-            AC_CHECK_LIB([dl], [dladdr], [
-                PKGCFG_LIBS_PRIVATE="$PKGCFG_LIBS_PRIVATE -ldl"
-                LIBS="-ldl $LIBS"
-            ], [
-                AC_CHECK_LIB([dld], [dladdr], [
-                    PKGCFG_LIBS_PRIVATE="$PKGCFG_LIBS_PRIVATE -ldld"
-                    LIBS="-ldld $LIBS"
-                ])
-            ])
-            PKGCFG_NAMES_PRIVATE="$PKGCFG_NAMES_PRIVATE libunwind"
-        ],
-        [
-            if test "x$enable_libunwind" = "xyes"; then
-                AC_MSG_ERROR([Cannot find libunwind])
-            else
-                AC_MSG_WARN([Cannot find libunwind])
-            fi
-        ])
-fi
-
-AC_ARG_ENABLE([radix-tree],
-    AS_HELP_STRING([--enable-radix-tree],
-        [Use radix tree implementation to manage subscriptions [default=DRAFT]]),
-    [radix_tree=$enableval],
-    [radix_tree=$enable_drafts])
-
-AM_CONDITIONAL([ENABLE_RADIX_TREE], [test x$radix_tree != xno])
-
-if test "x$radix_tree" = "xyes"; then
-    AC_MSG_NOTICE([Using radix tree implementation to manage subscriptions])
-    AC_DEFINE(ZMQ_USE_RADIX_TREE, 1, [Use radix tree implementation to manage subscriptions])
-else
-    AC_MSG_NOTICE([Using mtree implementation to manage subscriptions])
-fi
-
-# See if clang-format is in PATH; the result unblocks the relevant recipes
-WITH_CLANG_FORMAT=""
-AS_IF([test x"$CLANG_FORMAT" = x],
-    [AC_PATH_PROG([CLANG_FORMAT], [clang-format], [])],
-    [AC_CHECK_PROG([WITH_CLANG_FORMAT], [$CLANG_FORMAT], [true], [fail])])
-AS_IF([test x"$CLANG_FORMAT" != x && test x"$WITH_CLANG_FORMAT" = x],
-    [AS_IF([test -x "$CLANG_FORMAT"],
-        [WITH_CLANG_FORMAT=true],
-        [AC_CHECK_PROG([WITH_CLANG_FORMAT], [$CLANG_FORMAT], [true], [false])])])
-AS_IF([test "$WITH_CLANG_FORMAT" = fail],
-    [AC_MSG_ERROR([Caller explicitly referenced CLANG_FORMAT=$CLANG_FORMAT which was not found])])
-AM_CONDITIONAL([WITH_CLANG_FORMAT], [$WITH_CLANG_FORMAT])
-
-# unittests will not build without the static libzmq.a
-AM_CONDITIONAL(ENABLE_STATIC, test "x$enable_static" = "xyes")
-
-# build using a fuzzing engine - fuzzers will be built separately and statically
-AC_ARG_WITH([fuzzing-engine], [AS_HELP_STRING([--with-fuzzing-engine],
-    [build libzmq with an exernal fuzzing engine [default=no]])],
-    [have_fuzzing_engine_ext=$withval],
-    [have_fuzzing_engine_ext=no])
-AC_ARG_WITH([fuzzing-installdir],
-    AS_HELP_STRING([--with-fuzzing-installdir=PATH],
-        [Path where to install fuzzer binaries]),
-    [fuzzing_installdir="$withval"])
-
-if test "x$have_fuzzing_engine_ext" != "xno" && test "x$fuzzing_installdir" != "x" && test "x$enable_static" = "xyes"; then
-    FUZZING_ENGINE_LIB="${have_fuzzing_engine_ext}"
-    FUZZING_INSTALLDIR="${fuzzing_installdir}"
-    AC_SUBST(FUZZING_ENGINE_LIB)
-    AC_SUBST(FUZZING_INSTALLDIR)
-    AC_DEFINE(ZMQ_USE_FUZZING_ENGINE, 1, [fuzz tests will be built with fuzzing engine])
-fi
-AM_CONDITIONAL(FUZZING_ENGINE_LIB, test "x$FUZZING_ENGINE_LIB" != "x")
-
-# clang 6 has a warning that does not make sense on multi-platform code
-AC_LANG_PUSH([C])
-AX_CHECK_COMPILE_FLAG([-Wtautological-constant-compare],
-    [CFLAGS+=" -Wno-tautological-constant-compare"],
-    [],
-    [-Werror])
-AC_LANG_POP([C])
-AX_CHECK_COMPILE_FLAG([-Wtautological-constant-compare],
-    [CXXFLAGS+=" -Wno-tautological-constant-compare"],
-    [],
-    [-Werror])
-
-# LTO is enabled by default on SUSE Tumbleweed and RPM lint generates an error if
-# the flag is not used to compile archives:
-# E: lto-no-text-in-archive
-AC_LANG_PUSH([C])
-AX_CHECK_COMPILE_FLAG([-ffat-lto-objects],
-    [CFLAGS+=" -ffat-lto-objects"],
-    [],
-    [-Werror])
-AC_LANG_POP([C])
-AX_CHECK_COMPILE_FLAG([-ffat-lto-objects],
-    [CXXFLAGS+=" -ffat-lto-objects"],
-    [],
-    [-Werror])
-
-# Subst LIBZMQ_EXTRA_CFLAGS & CXXFLAGS & LDFLAGS
-AC_SUBST(LIBZMQ_EXTRA_CFLAGS)
-AC_SUBST(LIBZMQ_EXTRA_CXXFLAGS)
-AC_SUBST(LIBZMQ_EXTRA_LDFLAGS)
-
-AC_SUBST(LIBZMQ_VMCI_CXXFLAGS)
-AC_SUBST(LIBZMQ_VMCI_LDFLAGS)
-
-AC_SUBST(pkg_config_libs_private, $PKGCFG_LIBS_PRIVATE)
-AC_SUBST(pkg_config_names_private, $PKGCFG_NAMES_PRIVATE)
-
-# set pkgconfigdir, allow override
-AC_ARG_WITH([pkgconfigdir],
-    AS_HELP_STRING([--with-pkgconfigdir=PATH],
-        [Path to the pkgconfig directory [[LIBDIR/pkgconfig]]]),
-    [pkgconfigdir="$withval"],
-    [pkgconfigdir='${libdir}/pkgconfig'])
-AC_SUBST([pkgconfigdir])
-
-AC_ARG_ENABLE([no-export],
-    [AS_HELP_STRING([--enable-no-export],
-        [Build libzmq with empty ZMQ_EXPORT macro, bypassing platform-based automated detection [default=no]])],
-    [CPPFLAGS="-DZMQ_NO_EXPORT $CPPFLAGS"])
-
-AC_CONFIG_FILES([ \
-    Makefile \
-    src/libzmq.pc \
-    doc/Makefile \
-    builds/Makefile \
-    builds/deprecated-msvc/Makefile])
-
-AC_OUTPUT
diff --git a/libs/libzmq/doc/Makefile.am b/libs/libzmq/doc/Makefile.am
deleted file mode 100644
index 67eb55e..0000000
--- a/libs/libzmq/doc/Makefile.am
+++ /dev/null
@@ -1,66 +0,0 @@
-#
-# documentation
-#
-MAN3 = zmq_bind.3 zmq_unbind.3 zmq_connect.3 zmq_connect_peer.3 zmq_disconnect.3 zmq_close.3 \
-    zmq_ctx_new.3 zmq_ctx_term.3 zmq_ctx_get.3 zmq_ctx_set.3 zmq_ctx_shutdown.3 \
-    zmq_msg_init.3 zmq_msg_init_data.3 zmq_msg_init_size.3 zmq_msg_init_buffer.3 \
-    zmq_msg_move.3 zmq_msg_copy.3 zmq_msg_size.3 zmq_msg_data.3 zmq_msg_close.3 \
-    zmq_msg_send.3 zmq_msg_recv.3 \
-    zmq_msg_routing_id.3 zmq_msg_set_routing_id.3 \
-    zmq_send.3 zmq_recv.3 zmq_send_const.3 \
-    zmq_msg_get.3 zmq_msg_set.3 zmq_msg_more.3 zmq_msg_gets.3 \
-    zmq_getsockopt.3 zmq_setsockopt.3 \
-    zmq_socket.3 zmq_socket_monitor.3 zmq_poll.3 zmq_ppoll.3 \
-    zmq_socket_monitor_versioned.3 \
-    zmq_errno.3 zmq_strerror.3 zmq_version.3 \
-    zmq_sendmsg.3 zmq_recvmsg.3 \
-    zmq_proxy.3 zmq_proxy_steerable.3 \
-    zmq_z85_encode.3 zmq_z85_decode.3 zmq_curve_keypair.3 zmq_curve_public.3 \
-    zmq_has.3 \
-    zmq_timers.3 zmq_poller.3 \
-    zmq_atomic_counter_new.3 zmq_atomic_counter_set.3 \
-    zmq_atomic_counter_inc.3 zmq_atomic_counter_dec.3 \
-    zmq_atomic_counter_value.3 zmq_atomic_counter_destroy.3
-
-MAN7 = zmq.7 zmq_tcp.7 zmq_pgm.7 zmq_inproc.7 zmq_ipc.7 \
-    zmq_null.7 zmq_plain.7 zmq_curve.7 zmq_tipc.7 zmq_vmci.7 zmq_udp.7 \
-    zmq_gssapi.7
-
-MAN_DOC =
-
-MAN_TXT = $(MAN3:%.3=%.txt)
-MAN_TXT += $(MAN7:%.7=%.txt)
-MAN_HTML =
-
-MAINTAINERCLEANFILES =
-
-EXTRA_DIST = asciidoc.conf $(MAN_TXT)
-
-if INSTALL_MAN
-MAN_DOC += $(MAN1) $(MAN3) $(MAN7)
-dist_man_MANS = $(MAN_DOC)
-MAINTAINERCLEANFILES += $(MAN_DOC)
-endif
-
-if BUILD_DOC
-MAN_HTML += $(MAN_TXT:%.txt=%.html)
-EXTRA_DIST += $(MAN_HTML)
-MAINTAINERCLEANFILES += $(MAN_HTML)
-
-SUFFIXES=.html .txt .xml .3 .7
-
-.txt.html:
-	asciidoc -d manpage -b xhtml11 -f $(srcdir)/asciidoc.conf \
-		-azmq_version=@PACKAGE_VERSION@ -o$@ $<
-.txt.xml:
-	asciidoc -d manpage -b docbook -f $(srcdir)/asciidoc.conf \
-		-azmq_version=@PACKAGE_VERSION@ -o$@ $<
-.xml.1:
-	xmlto man $<
-.xml.3:
-	xmlto man $<
-.xml.7:
-	xmlto man $<
-endif
-
-dist-hook : $(MAN_DOC) $(MAN_HTML)
diff --git a/libs/libzmq/doc/asciidoc.conf b/libs/libzmq/doc/asciidoc.conf
deleted file mode 100644
index d73d711..0000000
--- a/libs/libzmq/doc/asciidoc.conf
+++ /dev/null
@@ -1,56 +0,0 @@
-[paradef-default]
-literal-style=template="literalparagraph"
-
-[macros]
-(?su)[\\]?(?P<name>linkzmq):(?P<target>\S*?)\[(?P<attrlist>.*?)\]=
-
-ifdef::backend-docbook[]
-[linkzmq-inlinemacro]
-{0%{target}}
-{0#<citerefentry>}
-{0#<refentrytitle>{target}</refentrytitle><manvolnum>{0}</manvolnum>}
-{0#</citerefentry>}
-endif::backend-docbook[]
-
-ifdef::backend-xhtml11[]
-[linkzmq-inlinemacro]
-<a href="{target}.html">{target}{0?({0})}</a>
-endif::backend-xhtml11[]
-
-ifdef::doctype-manpage[]
-ifdef::backend-docbook[]
-[header]
-template::[header-declarations]
-<refentry>
-<refmeta>
-<refentrytitle>{mantitle}</refentrytitle>
-<manvolnum>{manvolnum}</manvolnum>
-<refmiscinfo class="source">0MQ</refmiscinfo>
-<refmiscinfo class="version">{zmq_version}</refmiscinfo>
-<refmiscinfo class="manual">0MQ Manual</refmiscinfo>
-</refmeta>
-<refnamediv>
-  <refname>{manname}</refname>
-  <refpurpose>{manpurpose}</refpurpose>
-</refnamediv>
-endif::backend-docbook[]
-endif::doctype-manpage[]
-
-ifdef::backend-xhtml11[]
-[footer]
-</div>
-{disable-javascript%<div id="footnotes"><hr /></div>}
-<div id="footer">
-<div id="footer-text">
-ØMQ {zmq_version}<br />
-Last updated {docdate} {doctime}
-</div>
-</div>
-</body>
-</html>
-endif::backend-xhtml11[]
-
-[replacements]
-ifdef::backend-xhtml11[]
-0MQ=ØMQ
-endif::backend-xhtml11[]
diff --git a/libs/libzmq/doc/zmq.txt b/libs/libzmq/doc/zmq.txt
deleted file mode 100644
index 07f5fcb..0000000
--- a/libs/libzmq/doc/zmq.txt
+++ /dev/null
@@ -1,280 +0,0 @@
-zmq(7)
-======
-
-
-NAME
-----
-zmq - 0MQ lightweight messaging kernel
-
-
-SYNOPSIS
---------
-*#include <zmq.h>*
-
-*cc* ['flags'] 'files' *-lzmq* ['libraries']
-
-
-DESCRIPTION
------------
-The 0MQ lightweight messaging kernel is a library which extends the standard
-socket interfaces with features traditionally provided by specialised
-_messaging middleware_ products. 0MQ sockets provide an abstraction of
-asynchronous _message queues_, multiple _messaging patterns_, message
-filtering (_subscriptions_), seamless access to multiple _transport protocols_
-and more.
-
-This documentation presents an overview of 0MQ concepts, describes how 0MQ
-abstracts standard sockets and provides a reference manual for the functions
-provided by the 0MQ library.
-
-
-Context
-~~~~~~~
-The 0MQ 'context' keeps the list of sockets and manages the async I/O thread
-and internal queries.
-
-Before using any 0MQ library functions you must create a 0MQ 'context'. When
-you exit your application you must destroy the 'context'. These functions let
-you work with 'contexts':
-
-Create a new 0MQ context::
-    linkzmq:zmq_ctx_new[3]
-
-Work with context properties::
-    linkzmq:zmq_ctx_set[3]
-    linkzmq:zmq_ctx_get[3]
-
-Destroy a 0MQ context::
-    linkzmq:zmq_ctx_shutdown[3]
-    linkzmq:zmq_ctx_term[3]
-
-Thread safety
-^^^^^^^^^^^^^
-A 0MQ 'context' is thread safe and may be shared among as many application
-threads as necessary, without any additional locking required on the part of
-the caller.
-
-Individual 0MQ 'sockets' are _not_ thread safe except in the case where full
-memory barriers are issued when migrating a socket from one thread to another.
-In practice this means applications can create a socket in one thread with
-_zmq_socket()_ and then pass it to a _newly created_ thread as part of thread
-initialisation, for example via a structure passed as an argument to
-_pthread_create()_.
-
-
-Multiple contexts
-^^^^^^^^^^^^^^^^^
-Multiple 'contexts' may coexist within a single application. Thus, an
-application can use 0MQ directly and at the same time make use of any number of
-additional libraries or components which themselves make use of 0MQ as long as
-the above guidelines regarding thread safety are adhered to.
-
-
-Messages
-~~~~~~~~
-A 0MQ message is a discrete unit of data passed between applications or
-components of the same application. 0MQ messages have no internal structure and
-from the point of view of 0MQ itself they are considered to be opaque binary
-data.
-
-The following functions are provided to work with messages:
-
-Initialise a message::
-    linkzmq:zmq_msg_init[3]
-    linkzmq:zmq_msg_init_size[3]
-    linkzmq:zmq_msg_init_buffer[3]
-    linkzmq:zmq_msg_init_data[3]
-
-Sending and receiving a message::
-    linkzmq:zmq_msg_send[3]
-    linkzmq:zmq_msg_recv[3]
-
-Release a message::
-    linkzmq:zmq_msg_close[3]
-
-Access message content::
-    linkzmq:zmq_msg_data[3]
-    linkzmq:zmq_msg_size[3]
-    linkzmq:zmq_msg_more[3]
-
-Work with message properties::
-    linkzmq:zmq_msg_gets[3]
-    linkzmq:zmq_msg_get[3]
-    linkzmq:zmq_msg_set[3]
-
-Message manipulation::
-    linkzmq:zmq_msg_copy[3]
-    linkzmq:zmq_msg_move[3]
-
-
-Sockets
-~~~~~~~
-0MQ sockets present an abstraction of an asynchronous _message queue_, with the
-exact queueing semantics depending on the socket type in use. See
-linkzmq:zmq_socket[3] for the socket types provided.
-
-The following functions are provided to work with sockets:
-
-Creating a socket::
-    linkzmq:zmq_socket[3]
-
-Closing a socket::
-    linkzmq:zmq_close[3]
-
-Manipulating socket options::
-    linkzmq:zmq_getsockopt[3]
-    linkzmq:zmq_setsockopt[3]
-
-Establishing a message flow::
-    linkzmq:zmq_bind[3]
-    linkzmq:zmq_connect[3]
-
-Sending and receiving messages::
-    linkzmq:zmq_msg_send[3]
-    linkzmq:zmq_msg_recv[3]
-    linkzmq:zmq_send[3]
-    linkzmq:zmq_recv[3]
-    linkzmq:zmq_send_const[3]
-
-Monitoring socket events::
-    linkzmq:zmq_socket_monitor[3]
-
-.Input/output multiplexing
-0MQ provides a mechanism for applications to multiplex input/output events over
-a set containing both 0MQ sockets and standard sockets. This mechanism mirrors
-the standard _poll()_ system call, and is described in detail in
-linkzmq:zmq_poll[3]. This API is deprecated, however.
-
-There is a new DRAFT API with multiple zmq_poller_* function, which is described
-in linkzmq:zmq_poller[3].
-
-
-Transports
-~~~~~~~~~~
-A 0MQ socket can use multiple different underlying transport mechanisms.
-Each transport mechanism is suited to a particular purpose and has its own
-advantages and drawbacks.
-
-The following transport mechanisms are provided:
-
-Unicast transport using TCP::
-    linkzmq:zmq_tcp[7]
-
-Reliable multicast transport using PGM::
-    linkzmq:zmq_pgm[7]
-
-Local inter-process communication transport::
-    linkzmq:zmq_ipc[7]
-
-Local in-process (inter-thread) communication transport::
-    linkzmq:zmq_inproc[7]
-
-Virtual Machine Communications Interface (VMC) transport::
-    linkzmq:zmq_vmci[7]
-
-Unreliable unicast and multicast using UDP::
-    linkzmq:zmq_udp[7]
-
-
-Proxies
-~~~~~~~
-0MQ provides 'proxies' to create fanout and fan-in topologies. A proxy connects
-a 'frontend' socket to a 'backend' socket and switches all messages between the
-two sockets, opaquely. A proxy may optionally capture all traffic to a third
-socket. To start a proxy in an application thread, use linkzmq:zmq_proxy[3].
-
-
-Security
-~~~~~~~~
-A 0MQ socket can select a security mechanism. Both peers must use the same
-security mechanism.
-
-The following security mechanisms are provided for IPC and TCP connections:
-
-Null security::
-    linkzmq:zmq_null[7]
-
-Plain-text authentication using username and password::
-    linkzmq:zmq_plain[7]
-
-Elliptic curve authentication and encryption::
-    linkzmq:zmq_curve[7]
-
-Generate a CURVE keypair in armored text format::
-    linkzmq:zmq_curve_keypair[3]
-
-Derive a CURVE public key from a secret key:
-    linkzmq:zmq_curve_public[3]
-
-Converting keys to/from armoured text strings::
-    linkzmq:zmq_z85_decode[3]
-    linkzmq:zmq_z85_encode[3]
-
-
-ERROR HANDLING
---------------
-The 0MQ library functions handle errors using the standard conventions found on
-POSIX systems. Generally, this means that upon failure a 0MQ library function
-shall return either a NULL value (if returning a pointer) or a negative value
-(if returning an integer), and the actual error code shall be stored in the
-'errno' variable.
-
-On non-POSIX systems some users may experience issues with retrieving the
-correct value of the 'errno' variable. The _zmq_errno()_ function is provided
-to assist in these cases; for details refer to linkzmq:zmq_errno[3].
-
-The _zmq_strerror()_ function is provided to translate 0MQ-specific error codes
-into error message strings; for details refer to linkzmq:zmq_strerror[3].
-
-
-UTILITY
--------
-The following utility functions are provided:
-
-Working with atomic counters::
-    linkzmq:zmq_atomic_counter_new[3]
-    linkzmq:zmq_atomic_counter_set[3]
-    linkzmq:zmq_atomic_counter_inc[3]
-    linkzmq:zmq_atomic_counter_dec[3]
-    linkzmq:zmq_atomic_counter_value[3]
-    linkzmq:zmq_atomic_counter_destroy[3]
-
-
-MISCELLANEOUS
--------------
-The following miscellaneous functions are provided:
-
-Report 0MQ library version::
-    linkzmq:zmq_version[3]
-
-
-LANGUAGE BINDINGS
------------------
-The 0MQ library provides interfaces suitable for calling from programs in any
-language; this documentation documents those interfaces as they would be used
-by C programmers. The intent is that programmers using 0MQ from other languages
-shall refer to this documentation alongside any documentation provided by the
-vendor of their language binding.
-
-Language bindings ($$C++$$, Python, PHP, Ruby, Java and more) are provided by
-members of the 0MQ community and pointers can be found on the 0MQ website.
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
-
-
-RESOURCES
----------
-Main web site: <http://www.zeromq.org/>
-
-Report bugs to the 0MQ development mailing list: <zeromq-dev@lists.zeromq.org>
-
-
-COPYING
--------
-Free use of this software is granted under the terms of the GNU Lesser General
-Public License (LGPL). For details see the files `COPYING` and `COPYING.LESSER`
-included with the 0MQ distribution.
diff --git a/libs/libzmq/doc/zmq_atomic_counter_dec.txt b/libs/libzmq/doc/zmq_atomic_counter_dec.txt
deleted file mode 100644
index 53a088c..0000000
--- a/libs/libzmq/doc/zmq_atomic_counter_dec.txt
+++ /dev/null
@@ -1,62 +0,0 @@
-zmq_atomic_counter_dec(3)
-=========================
-
-
-NAME
-----
-zmq_atomic_counter_dec - decrement an atomic counter
-
-
-SYNOPSIS
---------
-*int zmq_atomic_counter_dec (void *counter);*
-
-
-DESCRIPTION
------------
-The _zmq_atomic_counter_dec_ function decrements an atomic counter in
-a threadsafe fashion. This function uses platform specific atomic
-operations.
-
-
-RETURN VALUE
-------------
-The _zmq_atomic_counter_dec()_ function returns 1 if the counter is
-greater than zero after decrementing, or zero if the counter reached
-zero.
-
-
-EXAMPLE
--------
-.Test code for atomic counters
-----
-void *counter = zmq_atomic_counter_new ();
-assert (zmq_atomic_counter_value (counter) == 0);
-assert (zmq_atomic_counter_inc (counter) == 0);
-assert (zmq_atomic_counter_inc (counter) == 1);
-assert (zmq_atomic_counter_inc (counter) == 2);
-assert (zmq_atomic_counter_value (counter) == 3);
-assert (zmq_atomic_counter_dec (counter) == 1);
-assert (zmq_atomic_counter_dec (counter) == 1);
-assert (zmq_atomic_counter_dec (counter) == 0);
-zmq_atomic_counter_set (counter, 2);
-assert (zmq_atomic_counter_dec (counter) == 1);
-assert (zmq_atomic_counter_dec (counter) == 0);
-zmq_atomic_counter_destroy (&counter);
-return 0;
-----
-
-
-SEE ALSO
---------
-linkzmq:zmq_atomic_counter_new[3]
-linkzmq:zmq_atomic_counter_set[3]
-linkzmq:zmq_atomic_counter_inc[3]
-linkzmq:zmq_atomic_counter_value[3]
-linkzmq:zmq_atomic_counter_destroy[3]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/libs/libzmq/doc/zmq_atomic_counter_destroy.txt b/libs/libzmq/doc/zmq_atomic_counter_destroy.txt
deleted file mode 100644
index ee7c863..0000000
--- a/libs/libzmq/doc/zmq_atomic_counter_destroy.txt
+++ /dev/null
@@ -1,62 +0,0 @@
-zmq_atomic_counter_destroy(3)
-=============================
-
-
-NAME
-----
-zmq_atomic_counter_destroy - destroy an atomic counter
-
-
-SYNOPSIS
---------
-*void zmq_atomic_counter_destroy (void **counter_p);*
-
-
-DESCRIPTION
------------
-The _zmq_atomic_counter_destroy_ function destroys an atomic counter and
-nullifies its reference. Pass the address of an atomic counter (void **)
-rather than the counter itself. You must destroy all counters that you
-create, to avoid memory leakage. This function uses platform specific
-atomic operations.
-
-
-RETURN VALUE
-------------
-The _zmq_atomic_counter_destroy()_ function has no return value.
-
-
-EXAMPLE
--------
-.Test code for atomic counters
-----
-void *counter = zmq_atomic_counter_new ();
-assert (zmq_atomic_counter_value (counter) == 0);
-assert (zmq_atomic_counter_inc (counter) == 0);
-assert (zmq_atomic_counter_inc (counter) == 1);
-assert (zmq_atomic_counter_inc (counter) == 2);
-assert (zmq_atomic_counter_value (counter) == 3);
-assert (zmq_atomic_counter_dec (counter) == 1);
-assert (zmq_atomic_counter_dec (counter) == 1);
-assert (zmq_atomic_counter_dec (counter) == 0);
-zmq_atomic_counter_set (counter, 2);
-assert (zmq_atomic_counter_dec (counter) == 1);
-assert (zmq_atomic_counter_dec (counter) == 0);
-zmq_atomic_counter_destroy (&counter);
-return 0;
-----
-
-
-SEE ALSO
---------
-linkzmq:zmq_atomic_counter_new[3]
-linkzmq:zmq_atomic_counter_set[3]
-linkzmq:zmq_atomic_counter_inc[3]
-linkzmq:zmq_atomic_counter_dec[3]
-linkzmq:zmq_atomic_counter_value[3]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/libs/libzmq/doc/zmq_atomic_counter_inc.txt b/libs/libzmq/doc/zmq_atomic_counter_inc.txt
deleted file mode 100644
index 6346ea1..0000000
--- a/libs/libzmq/doc/zmq_atomic_counter_inc.txt
+++ /dev/null
@@ -1,61 +0,0 @@
-zmq_atomic_counter_inc(3)
-=========================
-
-
-NAME
-----
-zmq_atomic_counter_inc - increment an atomic counter
-
-
-SYNOPSIS
---------
-*int zmq_atomic_counter_inc (void *counter);*
-
-
-DESCRIPTION
------------
-The _zmq_atomic_counter_inc_ function increments an atomic counter in a
-threadsafe fashion. This function uses platform specific atomic
-operations.
-
-
-RETURN VALUE
-------------
-The _zmq_atomic_counter_inc()_ function returns the old value of the
-counter, before incrementing.
-
-
-EXAMPLE
--------
-.Test code for atomic counters
-----
-void *counter = zmq_atomic_counter_new ();
-assert (zmq_atomic_counter_value (counter) == 0);
-assert (zmq_atomic_counter_inc (counter) == 0);
-assert (zmq_atomic_counter_inc (counter) == 1);
-assert (zmq_atomic_counter_inc (counter) == 2);
-assert (zmq_atomic_counter_value (counter) == 3);
-assert (zmq_atomic_counter_dec (counter) == 1);
-assert (zmq_atomic_counter_dec (counter) == 1);
-assert (zmq_atomic_counter_dec (counter) == 0);
-zmq_atomic_counter_set (counter, 2);
-assert (zmq_atomic_counter_dec (counter) == 1);
-assert (zmq_atomic_counter_dec (counter) == 0);
-zmq_atomic_counter_destroy (&counter);
-return 0;
-----
-
-
-SEE ALSO
---------
-linkzmq:zmq_atomic_counter_new[3]
-linkzmq:zmq_atomic_counter_set[3]
-linkzmq:zmq_atomic_counter_dec[3]
-linkzmq:zmq_atomic_counter_value[3]
-linkzmq:zmq_atomic_counter_destroy[3]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/libs/libzmq/doc/zmq_atomic_counter_new.txt b/libs/libzmq/doc/zmq_atomic_counter_new.txt
deleted file mode 100644
index 7278f2b..0000000
--- a/libs/libzmq/doc/zmq_atomic_counter_new.txt
+++ /dev/null
@@ -1,62 +0,0 @@
-zmq_atomic_counter_new(3)
-=========================
-
-
-NAME
-----
-zmq_atomic_counter_new - create a new atomic counter
-
-
-SYNOPSIS
---------
-*void *zmq_atomic_counter_new (void);*
-
-
-DESCRIPTION
------------
-The _zmq_atomic_counter_new_ function creates a new atomic counter. You
-can use this in multithreaded applications to do, for example, reference
-counting of shared objects. The atomic counter is at least 32 bits large.
-This function uses platform specific atomic operations.
-
-
-RETURN VALUE
-------------
-The _zmq_atomic_counter_new()_ function returns the new atomic counter
-if successful. Otherwise it returns NULL.
-
-
-EXAMPLE
--------
-.Test code for atomic counters
-----
-void *counter = zmq_atomic_counter_new ();
-assert (zmq_atomic_counter_value (counter) == 0);
-assert (zmq_atomic_counter_inc (counter) == 0);
-assert (zmq_atomic_counter_inc (counter) == 1);
-assert (zmq_atomic_counter_inc (counter) == 2);
-assert (zmq_atomic_counter_value (counter) == 3);
-assert (zmq_atomic_counter_dec (counter) == 1);
-assert (zmq_atomic_counter_dec (counter) == 1);
-assert (zmq_atomic_counter_dec (counter) == 0);
-zmq_atomic_counter_set (counter, 2);
-assert (zmq_atomic_counter_dec (counter) == 1);
-assert (zmq_atomic_counter_dec (counter) == 0);
-zmq_atomic_counter_destroy (&counter);
-return 0;
-----
-
-
-SEE ALSO
---------
-linkzmq:zmq_atomic_counter_set[3]
-linkzmq:zmq_atomic_counter_inc[3]
-linkzmq:zmq_atomic_counter_dec[3]
-linkzmq:zmq_atomic_counter_value[3]
-linkzmq:zmq_atomic_counter_destroy[3]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/libs/libzmq/doc/zmq_atomic_counter_set.txt b/libs/libzmq/doc/zmq_atomic_counter_set.txt
deleted file mode 100644
index 3b0812f..0000000
--- a/libs/libzmq/doc/zmq_atomic_counter_set.txt
+++ /dev/null
@@ -1,61 +0,0 @@
-zmq_atomic_counter_set(3)
-=========================
-
-
-NAME
-----
-zmq_atomic_counter_set - set atomic counter to new value
-
-
-SYNOPSIS
---------
-*void zmq_atomic_counter_set (void *counter, int value);*
-
-
-DESCRIPTION
------------
-The _zmq_atomic_counter_set_ function sets the counter to a new value,
-in a threadsafe fashion. The largest value that is guaranteed to work
-across all platforms is 2^31-1. This function uses platform specific
-atomic operations.
-
-
-RETURN VALUE
-------------
-The _zmq_atomic_counter_set()_ function has no return value.
-
-
-EXAMPLE
--------
-.Test code for atomic counters
-----
-void *counter = zmq_atomic_counter_new ();
-assert (zmq_atomic_counter_value (counter) == 0);
-assert (zmq_atomic_counter_inc (counter) == 0);
-assert (zmq_atomic_counter_inc (counter) == 1);
-assert (zmq_atomic_counter_inc (counter) == 2);
-assert (zmq_atomic_counter_value (counter) == 3);
-assert (zmq_atomic_counter_dec (counter) == 1);
-assert (zmq_atomic_counter_dec (counter) == 1);
-assert (zmq_atomic_counter_dec (counter) == 0);
-zmq_atomic_counter_set (counter, 2);
-assert (zmq_atomic_counter_dec (counter) == 1);
-assert (zmq_atomic_counter_dec (counter) == 0);
-zmq_atomic_counter_destroy (&counter);
-return 0;
-----
-
-
-SEE ALSO
---------
-linkzmq:zmq_atomic_counter_new[3]
-linkzmq:zmq_atomic_counter_inc[3]
-linkzmq:zmq_atomic_counter_dec[3]
-linkzmq:zmq_atomic_counter_value[3]
-linkzmq:zmq_atomic_counter_destroy[3]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/libs/libzmq/doc/zmq_atomic_counter_value.txt b/libs/libzmq/doc/zmq_atomic_counter_value.txt
deleted file mode 100644
index f2e3447..0000000
--- a/libs/libzmq/doc/zmq_atomic_counter_value.txt
+++ /dev/null
@@ -1,62 +0,0 @@
-zmq_atomic_counter_value(3)
-===========================
-
-
-NAME
-----
-zmq_atomic_counter_value - return value of atomic counter
-
-
-SYNOPSIS
---------
-*int zmq_atomic_counter_value (void *counter);*
-
-
-DESCRIPTION
------------
-The _zmq_atomic_counter_value_ function returns the value of an atomic
-counter created by _zmq_atomic_counter_new()_. This function uses platform 
-specific atomic operations.
-
-
-RETURN VALUE
-------------
-The _zmq_atomic_counter_value()_ function returns the value of the 
-atomic counter. If _counter_ does not point to an atomic counter created by
-_zmq_atomic_counter_new()_, the behaviour is undefined.
-
-
-EXAMPLE
--------
-.Test code for atomic counters
-----
-void *counter = zmq_atomic_counter_new ();
-assert (zmq_atomic_counter_value (counter) == 0);
-assert (zmq_atomic_counter_inc (counter) == 0);
-assert (zmq_atomic_counter_inc (counter) == 1);
-assert (zmq_atomic_counter_inc (counter) == 2);
-assert (zmq_atomic_counter_value (counter) == 3);
-assert (zmq_atomic_counter_dec (counter) == 1);
-assert (zmq_atomic_counter_dec (counter) == 1);
-assert (zmq_atomic_counter_dec (counter) == 0);
-zmq_atomic_counter_set (counter, 2);
-assert (zmq_atomic_counter_dec (counter) == 1);
-assert (zmq_atomic_counter_dec (counter) == 0);
-zmq_atomic_counter_destroy (&counter);
-return 0;
-----
-
-
-SEE ALSO
---------
-linkzmq:zmq_atomic_counter_new[3]
-linkzmq:zmq_atomic_counter_set[3]
-linkzmq:zmq_atomic_counter_inc[3]
-linkzmq:zmq_atomic_counter_dec[3]
-linkzmq:zmq_atomic_counter_destroy[3]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/libs/libzmq/doc/zmq_bind.txt b/libs/libzmq/doc/zmq_bind.txt
deleted file mode 100644
index 6305cfc..0000000
--- a/libs/libzmq/doc/zmq_bind.txt
+++ /dev/null
@@ -1,105 +0,0 @@
-zmq_bind(3)
-===========
-
-
-NAME
-----
-zmq_bind - accept incoming connections on a socket
-
-
-SYNOPSIS
---------
-*int zmq_bind (void '*socket', const char '*endpoint');*
-
-
-DESCRIPTION
------------
-The _zmq_bind()_ function binds the 'socket' to a local 'endpoint' and then
-accepts incoming connections on that endpoint.
-
-The 'endpoint' is a string consisting of a 'transport'`://` followed by an
-'address'. The 'transport' specifies the underlying protocol to use. The
-'address' specifies the transport-specific address to bind to.
-
-0MQ provides the the following transports:
-
-'tcp':: unicast transport using TCP, see linkzmq:zmq_tcp[7]
-'ipc':: local inter-process communication transport, see linkzmq:zmq_ipc[7]
-'inproc':: local in-process (inter-thread) communication transport, see linkzmq:zmq_inproc[7]
-'pgm', 'epgm':: reliable multicast transport using PGM, see linkzmq:zmq_pgm[7]
-'vmci':: virtual machine communications interface (VMCI), see linkzmq:zmq_vmci[7]
-'udp':: unreliable unicast and multicast using UDP, see linkzmq:zmq_udp[7]
-
-Every 0MQ socket type except 'ZMQ_PAIR' and 'ZMQ_CHANNEL' supports one-to-many and many-to-one
-semantics. The precise semantics depend on the socket type and are defined in
-linkzmq:zmq_socket[3].
-
-The 'ipc', 'tcp', 'vmci' and 'udp' transports accept wildcard addresses: see
-linkzmq:zmq_ipc[7], linkzmq:zmq_tcp[7], linkzmq:zmq_vmci[7] and
-linkzmq:zmq_udp[7] for details.
-
-NOTE: the address syntax may be different for _zmq_bind()_ and _zmq_connect()_
-especially for the 'tcp', 'pgm' and 'epgm' transports.
-
-NOTE: following a _zmq_bind()_, the socket enters a 'mute' state unless or
-until at least one incoming or outgoing connection is made, at which point
-the socket enters a 'ready' state. In the mute state, the socket blocks or
-drops messages according to the socket type, as defined in linkzmq:zmq_socket[3].
-By contrast, following a libzmq:zmq_connect[3], the socket enters the 'ready' state.
-
-
-RETURN VALUE
-------------
-The _zmq_bind()_ function returns zero if successful. Otherwise it returns
-`-1` and sets 'errno' to one of the values defined below.
-
-
-ERRORS
-------
-*EINVAL*::
-The endpoint supplied is invalid.
-*EPROTONOSUPPORT*::
-The requested 'transport' protocol is not supported.
-*ENOCOMPATPROTO*::
-The requested 'transport' protocol is not compatible with the socket type.
-*EADDRINUSE*::
-The requested 'address' is already in use.
-*EADDRNOTAVAIL*::
-The requested 'address' was not local.
-*ENODEV*::
-The requested 'address' specifies a nonexistent interface.
-*ETERM*::
-The 0MQ 'context' associated with the specified 'socket' was terminated.
-*ENOTSOCK*::
-The provided 'socket' was invalid.
-*EMTHREAD*::
-No I/O thread is available to accomplish the task.
-
-
-EXAMPLE
--------
-.Binding a publisher socket to an in-process and a TCP transport
-----
-/* Create a ZMQ_PUB socket */
-void *socket = zmq_socket (context, ZMQ_PUB);
-assert (socket);
-/* Bind it to a in-process transport with the address 'my_publisher' */
-int rc = zmq_bind (socket, "inproc://my_publisher");
-assert (rc == 0);
-/* Bind it to a TCP transport on port 5555 of the 'eth0' interface */
-rc = zmq_bind (socket, "tcp://eth0:5555");
-assert (rc == 0);
-----
-
-
-SEE ALSO
---------
-linkzmq:zmq_connect[3]
-linkzmq:zmq_socket[3]
-linkzmq:zmq[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/libs/libzmq/doc/zmq_close.txt b/libs/libzmq/doc/zmq_close.txt
deleted file mode 100644
index 961d7b9..0000000
--- a/libs/libzmq/doc/zmq_close.txt
+++ /dev/null
@@ -1,59 +0,0 @@
-zmq_close(3)
-============
-
-
-NAME
-----
-zmq_close - close 0MQ socket
-
-
-SYNOPSIS
---------
-*int zmq_close (void '*socket');*
-
-
-DESCRIPTION
------------
-The _zmq_close()_ function shall destroy the socket referenced by the 'socket'
-argument. Any outstanding messages physically received from the network but not
-yet received by the application with _zmq_recv()_ shall be discarded. The
-behaviour for discarding messages sent by the application with _zmq_send()_ but
-not yet physically transferred to the network depends on the value of the
-_ZMQ_LINGER_ socket option for the specified 'socket'.
-
-_zmq_close()_ must be called exactly once for each socket. If it is never called,
-_zmq_ctx_term()_ will block forever. If it is called multiple times for the same 
-socket or if 'socket' does not point to a socket, the behaviour is undefined.
-
-NOTE: The default setting of _ZMQ_LINGER_ does not discard unsent messages;
-this behaviour may cause the application to block when calling _zmq_ctx_term()_.
-For details refer to linkzmq:zmq_setsockopt[3] and linkzmq:zmq_ctx_term[3].
-
-NOTE: This API will complete asynchronously, so not everything will be deallocated
-after it returns. See above for details about linger.
-
-
-RETURN VALUE
-------------
-The _zmq_close()_ function shall return zero if successful. Otherwise it shall
-return `-1` and set 'errno' to one of the values defined below.
-
-
-ERRORS
-------
-*ENOTSOCK*::
-The provided 'socket' was NULL.
-
-
-SEE ALSO
---------
-linkzmq:zmq_socket[3]
-linkzmq:zmq_ctx_term[3]
-linkzmq:zmq_setsockopt[3]
-linkzmq:zmq[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/libs/libzmq/doc/zmq_connect.txt b/libs/libzmq/doc/zmq_connect.txt
deleted file mode 100644
index b06e826..0000000
--- a/libs/libzmq/doc/zmq_connect.txt
+++ /dev/null
@@ -1,109 +0,0 @@
-zmq_connect(3)
-==============
-
-
-NAME
-----
-zmq_connect - create outgoing connection from socket
-
-
-SYNOPSIS
---------
-*int zmq_connect (void '*socket', const char '*endpoint');*
-
-
-DESCRIPTION
------------
-The _zmq_connect()_ function connects the 'socket' to an 'endpoint' and then
-accepts incoming connections on that endpoint.
-
-The 'endpoint' is a string consisting of a 'transport'`://` followed by an
-'address'. The 'transport' specifies the underlying protocol to use. The
-'address' specifies the transport-specific address to connect to.
-
-0MQ provides the the following transports:
-
-'tcp':: unicast transport using TCP, see linkzmq:zmq_tcp[7]
-'ipc':: local inter-process communication transport, see linkzmq:zmq_ipc[7]
-'inproc':: local in-process (inter-thread) communication transport, see linkzmq:zmq_inproc[7]
-'pgm', 'epgm':: reliable multicast transport using PGM, see linkzmq:zmq_pgm[7]
-'vmci':: virtual machine communications interface (VMCI), see linkzmq:zmq_vmci[7]
-'udp':: unreliable unicast and multicast using UDP, see linkzmq:zmq_udp[7]
-
-Every 0MQ socket type except 'ZMQ_PAIR' and 'ZMQ_CHANNEL' supports one-to-many and many-to-one
-semantics. The precise semantics depend on the socket type and are defined in
-linkzmq:zmq_socket[3].
-
-NOTE: for most transports and socket types the connection is not performed
-immediately but as needed by 0MQ. Thus a successful call to _zmq_connect()_
-does not mean that the connection was or could actually be established.
-Because of this, for most transports and socket types the order in which
-a 'server' socket is bound and a 'client' socket is connected to it does not
-matter. The _ZMQ_PAIR_ and _ZMQ_CHANNEL_ sockets are an exception, as they do not automatically
-reconnect to endpoints.
-
-NOTE: following a _zmq_connect()_, for socket types except for ZMQ_ROUTER,
-the socket enters its normal 'ready' state. By contrast, following a
-_zmq_bind()_ alone, the socket enters a 'mute' state in which the socket
-blocks or drops messages according to the socket type, as defined in
-linkzmq:zmq_socket[3]. A ZMQ_ROUTER socket enters its normal 'ready' state
-for a specific peer only when handshaking is complete for that peer, which
-may take an arbitrary time.
-
-NOTE: for some socket types, multiple connections to the same endpoint
-don't really make sense
-(see https://github.com/zeromq/libzmq/issues/788).
-For those socket types, any attempt to connect to an already connected endpoint
-is silently ignored (i.e., returns zero).  This behavior applies to ZMQ_DEALER,
-ZMQ_SUB, ZMQ_PUB, and ZMQ_REQ socket types.
-
-
-RETURN VALUE
-------------
-The _zmq_connect()_ function returns zero if successful. Otherwise it returns
-`-1` and sets 'errno' to one of the values defined below.
-
-
-ERRORS
-------
-*EINVAL*::
-The endpoint supplied is invalid.
-*EPROTONOSUPPORT*::
-The requested 'transport' protocol is not supported.
-*ENOCOMPATPROTO*::
-The requested 'transport' protocol is not compatible with the socket type.
-*ETERM*::
-The 0MQ 'context' associated with the specified 'socket' was terminated.
-*ENOTSOCK*::
-The provided 'socket' was invalid.
-*EMTHREAD*::
-No I/O thread is available to accomplish the task.
-
-
-EXAMPLE
--------
-.Connecting a subscriber socket to an in-process and a TCP transport
-----
-/* Create a ZMQ_SUB socket */
-void *socket = zmq_socket (context, ZMQ_SUB);
-assert (socket);
-/* Connect it to an in-process transport with the address 'my_publisher' */
-int rc = zmq_connect (socket, "inproc://my_publisher");
-assert (rc == 0);
-/* Connect it to the host server001, port 5555 using a TCP transport */
-rc = zmq_connect (socket, "tcp://server001:5555");
-assert (rc == 0);
-----
-
-
-SEE ALSO
---------
-linkzmq:zmq_bind[3]
-linkzmq:zmq_socket[3]
-linkzmq:zmq[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/libs/libzmq/doc/zmq_connect_peer.txt b/libs/libzmq/doc/zmq_connect_peer.txt
deleted file mode 100644
index 5375d1b..0000000
--- a/libs/libzmq/doc/zmq_connect_peer.txt
+++ /dev/null
@@ -1,92 +0,0 @@
-zmq_connect_peer(3)
-===================
-
-
-NAME
-----
-zmq_connect_peer - create outgoing connection from socket and return the connection routing id in thread-safe and atomic way.
-
-
-SYNOPSIS
---------
-*uint32_t zmq_connect_peer (void '*socket', const char '*endpoint');*
-
-
-DESCRIPTION
------------
-The _zmq_connect_peer()_ function connects a 'ZMQ_PEER' socket to an 'endpoint' and then returns the endpoint 'routing_id'.
-
-The 'endpoint' is a string consisting of a 'transport'`://` followed by an
-'address'. The 'transport' specifies the underlying protocol to use. The
-'address' specifies the transport-specific address to connect to.
-
-The function is supported only on the 'ZMQ_PEER' socket type and would return `0` with 'errno' set to 'ENOTSUP' otherwise.
-
-The _zmq_connect_peer()_ support the following transports:
-
-'tcp':: unicast transport using TCP, see linkzmq:zmq_tcp[7]
-'ipc':: local inter-process communication transport, see linkzmq:zmq_ipc[7]
-'inproc':: local in-process (inter-thread) communication transport, see linkzmq:zmq_inproc[7]
-'ws':: unicast transport using WebSockets, see linkzmq:zmq_ws[7]
-'wss':: unicast transport using WebSockets over TLS, see linkzmq:zmq_wss[7]
-
-RETURN VALUE
-------------
-The _zmq_connect_peer()_ function returns the peer 'routing_id' if successful. Otherwise it returns
-`0` and sets 'errno' to one of the values defined below.
-
-
-ERRORS
-------
-*EINVAL*::
-The endpoint supplied is invalid.
-*EPROTONOSUPPORT*::
-The requested 'transport' protocol is not supported with 'ZMQ_PEER'.
-*ENOCOMPATPROTO*::
-The requested 'transport' protocol is not compatible with the socket type.
-*ETERM*::
-The 0MQ 'context' associated with the specified 'socket' was terminated.
-*ENOTSOCK*::
-The provided 'socket' was invalid.
-*EMTHREAD*::
-No I/O thread is available to accomplish the task.
-*ENOTSUP*::
-The socket is not of type 'ZMQ_PEER'.
-*EFAULT*::
-The 'ZMQ_IMMEDIATE' option is set on the socket.
-
-EXAMPLE
--------
-.Connecting a peer socket to a TCP transport and sending a message
-----
-/* Create a ZMQ_SUB socket */
-void *socket = zmq_socket (context, ZMQ_PEER);
-assert (socket);
-/* Connect it to the host server001, port 5555 using a TCP transport */
-uint32_t routing_id = zmq_connect (socket, "tcp://server001:5555");
-assert (routing_id == 0);
-/* Sending a message to the peer  */
-zmq_msg_t msg;
-int rc = zmq_msg_init_data (&msg, "HELLO", 5, NULL, NULL);
-assert (rc == 0);
-rc = zmq_msg_set_routing_id (&msg, routing_id);
-assert (rc == 0);
-rc = zmq_msg_send (&msg, socket, 0);
-assert (rc == 5);
-rc = zmq_msg_close (&msg);
-assert (rc == 0);
-----
-
-
-SEE ALSO
---------
-linkzmq:zmq_connect[3]
-linkzmq:zmq_bind[3]
-linkzmq:zmq_socket[3]
-linkzmq:zmq[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/libs/libzmq/doc/zmq_ctx_destroy.txt b/libs/libzmq/doc/zmq_ctx_destroy.txt
deleted file mode 100644
index c11f86d..0000000
--- a/libs/libzmq/doc/zmq_ctx_destroy.txt
+++ /dev/null
@@ -1,67 +0,0 @@
-zmq_ctx_destroy(3)
-==================
-
-
-NAME
-----
-zmq_ctx_destroy - terminate a 0MQ context
-
-
-SYNOPSIS
---------
-*int zmq_ctx_destroy (void '*context');*
-
-
-DESCRIPTION
------------
-The _zmq_ctx_destroy()_ function shall destroy the 0MQ context 'context'.
-
-Context termination is performed in the following steps:
-
-1. Any blocking operations currently in progress on sockets open within
-   'context' shall return immediately with an error code of ETERM.  With the
-   exception of _zmq_close()_, any further operations on sockets open within
-   'context' shall fail with an error code of ETERM.
-
-2. After interrupting all blocking calls, _zmq_ctx_destroy()_ shall _block_ until the
-   following conditions are satisfied:
-
-   * All sockets open within 'context' have been closed with _zmq_close()_.
-
-   * For each socket within 'context', all messages sent by the application
-     with _zmq_send()_ have either been physically transferred to a network
-     peer, or the socket's linger period set with the _ZMQ_LINGER_ socket
-     option has expired.
-
-For further details regarding socket linger behaviour refer to the _ZMQ_LINGER_
-option in linkzmq:zmq_setsockopt[3].
-
-This function is deprecated by linkzmq:zmq_ctx_term[3].
-
-
-RETURN VALUE
-------------
-The _zmq_ctx_destroy()_ function shall return zero if successful. Otherwise
-it shall return `-1` and set 'errno' to one of the values defined below.
-
-
-ERRORS
-------
-*EFAULT*::
-The provided 'context' was invalid.
-*EINTR*::
-Termination was interrupted by a signal. It can be restarted if needed.
-
-
-SEE ALSO
---------
-linkzmq:zmq[7]
-linkzmq:zmq_init[3]
-linkzmq:zmq_close[3]
-linkzmq:zmq_setsockopt[3]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/libs/libzmq/doc/zmq_ctx_get.txt b/libs/libzmq/doc/zmq_ctx_get.txt
deleted file mode 100644
index 84a0afd..0000000
--- a/libs/libzmq/doc/zmq_ctx_get.txt
+++ /dev/null
@@ -1,125 +0,0 @@
-zmq_ctx_get(3)
-==============
-
-
-NAME
-----
-
-zmq_ctx_get - get context options
-
-
-SYNOPSIS
---------
-*int zmq_ctx_get (void '*context', int 'option_name');*
-
-
-DESCRIPTION
------------
-The _zmq_ctx_get()_ function shall return the option specified by the
-'option_name' argument.
-
-The _zmq_ctx_get()_ function accepts the following option names:
-
-
-ZMQ_IO_THREADS: Get number of I/O threads
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_IO_THREADS' argument returns the size of the 0MQ thread pool
-for this context.
-
-
-ZMQ_MAX_SOCKETS: Get maximum number of sockets
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_MAX_SOCKETS' argument returns the maximum number of sockets
-allowed for this context.
-
-
-ZMQ_MAX_MSGSZ: Get maximum message size
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_MAX_MSGSZ' argument returns the maximum size of a message
-allowed for this context. Default value is INT_MAX.
-
-
-ZMQ_ZERO_COPY_RECV: Get message decoding strategy
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_ZERO_COPY_RECV' argument return whether message decoder uses a zero copy
-strategy when receiving messages. Default value is 1.
-NOTE: in DRAFT state, not yet available in stable releases.
-
-
-ZMQ_SOCKET_LIMIT: Get largest configurable number of sockets
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_SOCKET_LIMIT' argument returns the largest number of sockets that
-linkzmq:zmq_ctx_set[3] will accept.
-
-
-ZMQ_IPV6: Set IPv6 option
-~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_IPV6' argument returns the IPv6 option for the context.
-
-
-ZMQ_BLOCKY: Get blocky setting
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_BLOCKY' argument returns 1 if the context will block on terminate,
-zero if the "block forever on context termination" gambit was disabled by
-setting ZMQ_BLOCKY to false on all new contexts.
-
-
-ZMQ_THREAD_SCHED_POLICY: Get scheduling policy for I/O threads
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_THREAD_SCHED_POLICY' argument returns the scheduling policy for
-internal context's thread pool.
-
-
-ZMQ_THREAD_NAME_PREFIX: Get name prefix for I/O threads
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_THREAD_NAME_PREFIX' argument gets the numeric prefix of each thread
-created for the internal context's thread pool.
-
-
-ZMQ_MSG_T_SIZE: Get the zmq_msg_t size at runtime
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_MSG_T_SIZE' argument returns the size of the zmq_msg_t structure at
-runtime, as defined in the include/zmq.h public header.
-This is useful for example for FFI bindings that can't simply do a sizeof().
-
-
-RETURN VALUE
-------------
-The _zmq_ctx_get()_ function returns a value of 0 or greater if successful.
-Otherwise it returns `-1` and sets 'errno' to one of the values defined
-below.
-
-
-ERRORS
-------
-*EINVAL*::
-The requested option _option_name_ is unknown.
-*EFAULT*::
-The provided 'context' is invalid.
-
-
-EXAMPLE
--------
-.Setting a limit on the number of sockets
-----
-void *context = zmq_ctx_new ();
-zmq_ctx_set (context, ZMQ_MAX_SOCKETS, 256);
-int max_sockets = zmq_ctx_get (context, ZMQ_MAX_SOCKETS);
-assert (max_sockets == 256);
-----
-.Switching off the context deadlock gambit
-----
-zmq_ctx_set (ctx, ZMQ_BLOCKY, false);
-----
-
-
-SEE ALSO
---------
-linkzmq:zmq_ctx_set[3]
-linkzmq:zmq[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/libs/libzmq/doc/zmq_ctx_get_ext.txt b/libs/libzmq/doc/zmq_ctx_get_ext.txt
deleted file mode 100644
index 4848055..0000000
--- a/libs/libzmq/doc/zmq_ctx_get_ext.txt
+++ /dev/null
@@ -1,84 +0,0 @@
-zmq_ctx_get_ext(3)
-==================
-
-
-NAME
-----
-
-zmq_ctx_get_ext - get extended context options
-
-
-SYNOPSIS
---------
-*int zmq_ctx_get_ext (void '*context', int 'option_name', void '*option_value', size_t '*option_len');*
-
-
-DESCRIPTION
------------
-The _zmq_ctx_get()_ function shall retrieve the value for the option
-specified by the 'option_name' argument and store it in the buffer pointed to
-by the 'option_value' argument. 
-The 'option_len' argument is the size in bytes of the buffer pointed
-to by 'option_value'; upon successful completion _zmq_ctx_get_ext()_ shall
-modify the 'option_len' argument to indicate the actual size of the option
-value stored in the buffer.
-
-The _zmq_ctx_get_ext()_ function accepts all the option names accepted by
-_zmq_ctx_get()_.
-Options that make most sense to retrieve using _zmq_ctx_get_ext()_ instead of
-_zmq_ctx_get()_ are:
-
-ZMQ_THREAD_NAME_PREFIX: Get name prefix for I/O threads
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_THREAD_NAME_PREFIX' argument gets the string prefix of each thread
-created for the internal context's thread pool.
-
-[horizontal]
-Option value type:: character string
-Option value unit:: N/A
-Default value:: empty string
-
-
-RETURN VALUE
-------------
-The _zmq_ctx_get_ext()_ function returns a value of 0 or greater if successful.
-Otherwise it returns `-1` and sets 'errno' to one of the values defined
-below.
-
-
-ERRORS
-------
-*EINVAL*::
-The requested option _option_name_ is unknown.
-*EFAULT*::
-The provided 'context' is invalid.
-
-
-EXAMPLE
--------
-.Setting a prefix on internal ZMQ thread names:
-----
-void *context = zmq_ctx_new ();
-const char prefix[] = "MyApp";
-size_t prefixLen = sizeof(prefix);
-zmq_ctx_set (context, ZMQ_THREAD_NAME_PREFIX, &prefix, &prefixLen);
-
-char buff[256];
-size_t buffLen = sizeof(buff);
-int rc = zmq_ctx_get (context, ZMQ_THREAD_NAME_PREFIX, &buff, &buffLen);
-assert (rc == 0);
-assert (buffLen == prefixLen);
-
-----
-
-
-SEE ALSO
---------
-linkzmq:zmq_ctx_get[3]
-linkzmq:zmq[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/libs/libzmq/doc/zmq_ctx_new.txt b/libs/libzmq/doc/zmq_ctx_new.txt
deleted file mode 100644
index 24dea18..0000000
--- a/libs/libzmq/doc/zmq_ctx_new.txt
+++ /dev/null
@@ -1,55 +0,0 @@
-zmq_ctx_new(3)
-==============
-
-
-NAME
-----
-zmq_ctx_new - create new 0MQ context
-
-
-SYNOPSIS
---------
-*void *zmq_ctx_new ();*
-
-
-DESCRIPTION
------------
-The _zmq_ctx_new()_ function creates a new 0MQ 'context'.
-
-This function replaces the deprecated function linkzmq:zmq_init[3].
-
-.Thread safety
-A 0MQ 'context' is thread safe and may be shared among as many application
-threads as necessary, without any additional locking required on the part of
-the caller.
-
-
-RETURN VALUE
-------------
-The _zmq_ctx_new()_ function shall return an opaque handle to the newly created
-'context' if successful. Otherwise it shall return NULL and set 'errno' to one
-of the values defined below.
-
-
-ERRORS
-------
-*EMFILE*::
-The limit on the total number of open files has been reached and it
-wasn't possible to create a new context.
-*EMFILE*::
-The limit on the total number of open files in system has been reached
-and it wasn't possible to create a new context.
-
-
-SEE ALSO
---------
-linkzmq:zmq[7]
-linkzmq:zmq_ctx_set[3]
-linkzmq:zmq_ctx_get[3]
-linkzmq:zmq_ctx_term[3]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/libs/libzmq/doc/zmq_ctx_set.txt b/libs/libzmq/doc/zmq_ctx_set.txt
deleted file mode 100644
index 11feb15..0000000
--- a/libs/libzmq/doc/zmq_ctx_set.txt
+++ /dev/null
@@ -1,197 +0,0 @@
-zmq_ctx_set(3)
-==============
-
-
-NAME
-----
-
-zmq_ctx_set - set context options
-
-
-SYNOPSIS
---------
-*int zmq_ctx_set (void '*context', int 'option_name', int 'option_value');*
-
-
-DESCRIPTION
------------
-The _zmq_ctx_set()_ function shall set the option specified by the
-'option_name' argument to the value of the 'option_value' argument.
-
-The _zmq_ctx_set()_ function accepts the following options:
-
-
-ZMQ_BLOCKY: Fix blocky behavior
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-By default the context will block, forever, on a zmq_ctx_term call. The
-assumption behind this behavior is that abrupt termination will cause
-message loss. Most real applications use some form of handshaking to ensure
-applications receive termination messages, and then terminate the context
-with 'ZMQ_LINGER' set to zero on all sockets. This setting is an easier way
-to get the same result. When 'ZMQ_BLOCKY' is set to false, all new sockets
-are given a linger timeout of zero. You must still close all sockets before
-calling zmq_ctx_term.
-
-[horizontal]
-Default value:: true (old behavior)
-
-
-ZMQ_IO_THREADS: Set number of I/O threads
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_IO_THREADS' argument specifies the size of the 0MQ thread pool to
-handle I/O operations. If your application is using only the 'inproc'
-transport for messaging you may set this to zero, otherwise set it to at
-least one. This option only applies before creating any sockets on the
-context.
-
-[horizontal]
-Default value:: 1
-
-
-ZMQ_THREAD_SCHED_POLICY: Set scheduling policy for I/O threads
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_THREAD_SCHED_POLICY' argument sets the scheduling policy for
-internal context's thread pool. This option is not available on windows.
-Supported values for this option can be found in sched.h file,
-or at http://man7.org/linux/man-pages/man2/sched_setscheduler.2.html.
-This option only applies before creating any sockets on the context.
-
-[horizontal]
-Default value:: -1
-
-
-ZMQ_THREAD_PRIORITY: Set scheduling priority for I/O threads
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_THREAD_PRIORITY' argument sets scheduling priority for
-internal context's thread pool. This option is not available on windows.
-Supported values for this option depend on chosen scheduling policy.
-On Linux, when the scheduler policy is SCHED_OTHER, SCHED_IDLE or SCHED_BATCH, the OS scheduler
-will not use the thread priority but rather the thread "nice value"; in such cases
-the system call "nice" will be used to set the nice value to -20 (max priority) instead of
-adjusting the thread priority (which must be zero for those scheduling policies).
-Details can be found in sched.h file, or at http://man7.org/linux/man-pages/man2/sched_setscheduler.2.html.
-This option only applies before creating any sockets on the context.
-
-[horizontal]
-Default value:: -1
-
-
-ZMQ_THREAD_AFFINITY_CPU_ADD: Add a CPU to list of affinity for I/O threads
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_THREAD_AFFINITY_CPU_ADD' argument adds a specific CPU to the affinity list for the internal
-context's thread pool. This option is only supported on Linux.
-This option only applies before creating any sockets on the context.
-The default affinity list is empty and means that no explicit CPU-affinity will be set on
-internal context's threads.
-
-[horizontal]
-Default value:: -1
-
-
-ZMQ_THREAD_AFFINITY_CPU_REMOVE: Remove a CPU to list of affinity for I/O threads
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_THREAD_AFFINITY_CPU_REMOVE' argument removes a specific CPU to the affinity list for the internal
-context's thread pool. This option is only supported on Linux.
-This option only applies before creating any sockets on the context.
-The default affinity list is empty and means that no explicit CPU-affinity will be set on
-internal context's threads.
-
-[horizontal]
-Default value:: -1
-
-
-ZMQ_THREAD_NAME_PREFIX: Set name prefix for I/O threads
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_THREAD_NAME_PREFIX' argument sets a numeric prefix to each thread
-created for the internal context's thread pool. This option is only supported on Linux.
-This option is useful to help  debugging done via "top -H" or "gdb"; in case
-multiple processes on the system are using ZeroMQ it is useful to provide through
-this context option an application-specific prefix to distinguish ZeroMQ background
-threads that belong to different processes.
-This option only applies before creating any sockets on the context.
-
-[horizontal]
-Default value:: -1
-
-
-
-ZMQ_MAX_MSGSZ: Set maximum message size
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_MAX_MSGSZ' argument sets the maximum allowed size
-of a message sent in the context. You can query the maximal
-allowed value with linkzmq:zmq_ctx_get[3] using the
-'ZMQ_MAX_MSGSZ' option.
-
-[horizontal]
-Default value:: INT_MAX
-Maximum value:: INT_MAX
-
-
-ZMQ_ZERO_COPY_RECV: Specify message decoding strategy
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_ZERO_COPY_RECV' argument specifies whether the message decoder should
-use a zero copy strategy when receiving messages. The zero copy strategy can
-lead to increased memory usage in some cases. This option allows you to use the
-older copying strategy. You can query the value of this option with
-linkzmq:zmq_ctx_get[3] using the 'ZMQ_ZERO_COPY_RECV' option.
-NOTE: in DRAFT state, not yet available in stable releases.
-
-[horizontal]
-Default value:: 1
-
-
-ZMQ_MAX_SOCKETS: Set maximum number of sockets
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_MAX_SOCKETS' argument sets the maximum number of sockets allowed
-on the context. You can query the maximal allowed value with
-linkzmq:zmq_ctx_get[3] using the 'ZMQ_SOCKET_LIMIT' option.
-
-[horizontal]
-Default value:: 1023
-
-
-ZMQ_IPV6: Set IPv6 option
-~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_IPV6' argument sets the IPv6 value for all sockets created in
-the context from this point onwards. A value of `1` means IPv6 is
-enabled, while `0` means the socket will use only IPv4. When IPv6 is
-enabled, a socket will connect to, or accept connections from, both
-IPv4 and IPv6 hosts.
-
-[horizontal]
-Default value:: 0
-
-
-RETURN VALUE
-------------
-The _zmq_ctx_set()_ function returns zero if successful. Otherwise it
-returns `-1` and sets 'errno' to one of the values defined below.
-
-
-ERRORS
-------
-*EINVAL*::
-The requested option _option_name_ is unknown.
-
-
-EXAMPLE
--------
-.Setting a limit on the number of sockets
-----
-void *context = zmq_ctx_new ();
-zmq_ctx_set (context, ZMQ_MAX_SOCKETS, 256);
-int max_sockets = zmq_ctx_get (context, ZMQ_MAX_SOCKETS);
-assert (max_sockets == 256);
-----
-
-
-SEE ALSO
---------
-linkzmq:zmq_ctx_get[3]
-linkzmq:zmq[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/libs/libzmq/doc/zmq_ctx_set_ext.txt b/libs/libzmq/doc/zmq_ctx_set_ext.txt
deleted file mode 100644
index 5438487..0000000
--- a/libs/libzmq/doc/zmq_ctx_set_ext.txt
+++ /dev/null
@@ -1,88 +0,0 @@
-zmq_ctx_set_ext(3)
-==================
-
-
-NAME
-----
-
-zmq_ctx_set_ext - set extended context options
-
-
-SYNOPSIS
---------
-*int zmq_ctx_set_ext (void '*context', int 'option_name', const void '*option_value', size_t 'option_len');*
-
-
-DESCRIPTION
------------
-
-The _zmq_ctx_set_ext()_ function shall set the option specified by the
-'option_name' argument to the value pointed to by the 'option_value' argument
-for the 0MQ context pointed to by the 'context' argument. The 'option_len'
-argument is the size of the option value in bytes. For options taking a value of
-type "character string", the provided byte data should either contain no zero
-bytes, or end in a single zero byte (terminating ASCII NUL character).
-
-The _zmq_ctx_set_ext()_ function accepts all the option names accepted by
-_zmq_ctx_set()_.
-Options that make most sense to set using _zmq_ctx_set_ext()_ instead of
-_zmq_ctx_set()_ are the following options:
-
-ZMQ_THREAD_NAME_PREFIX: Set name prefix for I/O threads
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_THREAD_NAME_PREFIX' argument sets a string prefix to each thread
-created for the internal context's thread pool. This option is only supported on Linux.
-This option is useful to help  debugging done via "top -H" or "gdb"; in case
-multiple processes on the system are using ZeroMQ it is useful to provide through
-this context option an application-specific prefix to distinguish ZeroMQ background
-threads that belong to different processes.
-This option only applies before creating any sockets on the context.
-
-[horizontal]
-Option value type:: character string
-Option value unit:: N/A
-Default value:: empty string
-
-
-RETURN VALUE
-------------
-The _zmq_ctx_set_ext()_ function returns zero if successful. Otherwise it
-returns `-1` and sets 'errno' to one of the values defined below.
-
-
-ERRORS
-------
-*EINVAL*::
-The requested option _option_name_ is unknown.
-*EFAULT*::
-The provided 'context' is invalid.
-
-
-EXAMPLE
--------
-.Setting a prefix on internal ZMQ thread names:
-----
-void *context = zmq_ctx_new ();
-const char prefix[] = "MyApp";
-size_t prefixLen = sizeof(prefix);
-zmq_ctx_set (context, ZMQ_THREAD_NAME_PREFIX, &prefix, &prefixLen);
-
-char buff[256];
-size_t buffLen = sizeof(buff);
-int rc = zmq_ctx_get (context, ZMQ_THREAD_NAME_PREFIX, &buff, &buffLen);
-assert (rc == 0);
-assert (buffLen == prefixLen);
-
-----
-
-
-SEE ALSO
---------
-linkzmq:zmq_ctx_set[3]
-linkzmq:zmq[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/libs/libzmq/doc/zmq_ctx_shutdown.txt b/libs/libzmq/doc/zmq_ctx_shutdown.txt
deleted file mode 100644
index 8194dc0..0000000
--- a/libs/libzmq/doc/zmq_ctx_shutdown.txt
+++ /dev/null
@@ -1,54 +0,0 @@
-zmq_ctx_shutdown(3)
-==================
-
-
-NAME
-----
-zmq_ctx_shutdown - shutdown a 0MQ context
-
-
-SYNOPSIS
---------
-*int zmq_ctx_shutdown (void '*context');*
-
-
-DESCRIPTION
------------
-The _zmq_ctx_shutdown()_ function shall shutdown the 0MQ context 'context'.
-
-Context shutdown will cause any blocking operations currently in progress on 
-sockets open within 'context' to return immediately with an error code of ETERM.
-With the exception of _zmq_close()_, any further operations on sockets open within
-'context' shall fail with an error code of ETERM. No further sockets can be created
-using _zmq_socket()_ on a context for which _zmq_ctx_shutdown()_ has been called,
-it will return and set errno to ETERM.
-
-This function is optional, client code is still required to call the linkzmq:zmq_ctx_term[3]
-function to free all resources allocated by zeromq.
-
-
-RETURN VALUE
-------------
-The _zmq_ctx_shutdown()_ function shall return zero if successful. Otherwise
-it shall return `-1` and set 'errno' to one of the values defined below.
-
-
-ERRORS
-------
-*EFAULT*::
-The provided 'context' was invalid.
-
-
-SEE ALSO
---------
-linkzmq:zmq[7]
-linkzmq:zmq_init[3]
-linkzmq:zmq_ctx_term[3]
-linkzmq:zmq_close[3]
-linkzmq:zmq_setsockopt[3]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/libs/libzmq/doc/zmq_ctx_term.txt b/libs/libzmq/doc/zmq_ctx_term.txt
deleted file mode 100644
index 79aad1c..0000000
--- a/libs/libzmq/doc/zmq_ctx_term.txt
+++ /dev/null
@@ -1,68 +0,0 @@
-zmq_ctx_term(3)
-===============
-
-
-NAME
-----
-zmq_ctx_term - terminate a 0MQ context
-
-
-SYNOPSIS
---------
-*int zmq_ctx_term (void '*context');*
-
-
-DESCRIPTION
------------
-The _zmq_ctx_term()_ function shall destroy the 0MQ context 'context'.
-
-Context termination is performed in the following steps:
-
-1. Any blocking operations currently in progress on sockets open within
-   'context' shall return immediately with an error code of ETERM.  With the
-   exception of _zmq_close()_, any further operations on sockets open within
-   'context' shall fail with an error code of ETERM.
-
-2. After interrupting all blocking calls, _zmq_ctx_term()_ shall _block_ until
-   the following conditions are satisfied:
-
-   * All sockets open within 'context' have been closed with _zmq_close()_.
-
-   * For each socket within 'context', all messages sent by the application
-     with _zmq_send()_ have either been physically transferred to a network
-     peer, or the socket's linger period set with the _ZMQ_LINGER_ socket
-     option has expired.
-
-For further details regarding socket linger behaviour refer to the _ZMQ_LINGER_
-option in linkzmq:zmq_setsockopt[3].
-
-This function replaces the deprecated functions linkzmq:zmq_term[3] and
-linkzmq:zmq_ctx_destroy[3].
-
-
-RETURN VALUE
-------------
-The _zmq_ctx_term()_ function shall return zero if successful. Otherwise
-it shall return `-1` and set 'errno' to one of the values defined below.
-
-
-ERRORS
-------
-*EFAULT*::
-The provided 'context' was invalid.
-*EINTR*::
-Termination was interrupted by a signal. It can be restarted if needed.
-
-
-SEE ALSO
---------
-linkzmq:zmq[7]
-linkzmq:zmq_init[3]
-linkzmq:zmq_close[3]
-linkzmq:zmq_setsockopt[3]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/libs/libzmq/doc/zmq_curve.txt b/libs/libzmq/doc/zmq_curve.txt
deleted file mode 100644
index e1fe697..0000000
--- a/libs/libzmq/doc/zmq_curve.txt
+++ /dev/null
@@ -1,92 +0,0 @@
-zmq_curve(7)
-============
-
-
-NAME
-----
-zmq_curve - secure authentication and confidentiality
-
-
-SYNOPSIS
---------
-The CURVE mechanism defines a mechanism for secure authentication and 
-confidentiality for communications between a client and a server. CURVE 
-is intended for use on public networks. The CURVE mechanism is defined 
-by this document: <http://rfc.zeromq.org/spec:25>.
-
-
-CLIENT AND SERVER ROLES
------------------------
-A socket using CURVE can be either client or server, at any moment, but 
-not both. The role is independent of bind/connect direction.
-
-A socket can change roles at any point by setting new options. The role
-affects all zmq_connect and zmq_bind calls that follow it.
-
-To become a CURVE server, the application sets the ZMQ_CURVE_SERVER option
-on the socket, and then sets the ZMQ_CURVE_SECRETKEY option to provide the
-socket with its long-term secret key. The application does not provide the
-socket with its long-term public key, which is used only by clients.
-
-To become a CURVE client, the application sets the ZMQ_CURVE_SERVERKEY 
-option with the long-term public key of the server it intends to connect
-to, or accept connections from, next. The application then sets the 
-ZMQ_CURVE_PUBLICKEY and ZMQ_CURVE_SECRETKEY options with its client 
-long-term key pair.
-
-If the server does authentication it will be based on the client's long
-term public key.
-
-KEY ENCODING
-------------
-The standard representation for keys in source code is either 32 bytes of
-base 256 (binary) data, or 40 characters of base 85 data encoded using the
-Z85 algorithm defined by http://rfc.zeromq.org/spec:32.
-
-The Z85 algorithm is designed to produce printable key strings for use in
-configuration files, the command line, and code. There is a reference
-implementation in C at https://github.com/zeromq/rfc/tree/master/src.
-
-    
-TEST KEY VALUES
----------------
-For test cases, the client shall use this long-term key pair (specified
-as hexadecimal and in Z85):
-
-----
-public: 
-    BB88471D65E2659B30C55A5321CEBB5AAB2B70A398645C26DCA2B2FCB43FC518
-    Yne@$w-vo<fVvi]a<NY6T1ed:M$fCG*[IaLV{hID
-
-secret: 
-    7BB864B489AFA3671FBE69101F94B38972F24816DFB01B51656B3FEC8DFD0888
-    D:)Q[IlAW!ahhC2ac:9*A}h:p?([4%wOTJ%JR%cs
-----
-
-And the server shall use this long-term key pair (specified as hexadecimal 
-and in Z85):
-
-----
-public: 
-    54FCBA24E93249969316FB617C872BB0C1D1FF14800427C594CBFACF1BC2D652
-    rq:rM>}U?@Lns47E1%kR.o@n%FcmmsL/@{H8]yf7
-
-secret: 
-    8E0BDD697628B91D8F245587EE95C5B04D48963F79259877B49CD9063AEAD3B7
-    JTKVSB%%)wK0E.X)V>+}o?pNmC{O&4W4b!Ni{Lh6
-----
-
-SEE ALSO
---------
-linkzmq:zmq_z85_encode[3]
-linkzmq:zmq_z85_decode[3]
-linkzmq:zmq_setsockopt[3]
-linkzmq:zmq_null[7]
-linkzmq:zmq_plain[7]
-linkzmq:zmq[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/libs/libzmq/doc/zmq_curve_keypair.txt b/libs/libzmq/doc/zmq_curve_keypair.txt
deleted file mode 100644
index 82c13d6..0000000
--- a/libs/libzmq/doc/zmq_curve_keypair.txt
+++ /dev/null
@@ -1,56 +0,0 @@
-zmq_curve_keypair(3)
-====================
-
-
-NAME
-----
-zmq_curve_keypair - generate a new CURVE keypair
-
-
-SYNOPSIS
---------
-*int zmq_curve_keypair (char *z85_public_key, char *z85_secret_key);*
-
-
-DESCRIPTION
------------
-The _zmq_curve_keypair()_ function shall return a newly generated random
-keypair consisting of a public key and a secret key. The caller provides
-two buffers, each at least 41 octets large, in which this method will
-store the keys. The keys are encoded using linkzmq:zmq_z85_encode[3].
-
-
-RETURN VALUE
-------------
-The _zmq_curve_keypair()_ function shall return 0 if successful, else it
-shall return `-1` and set 'errno' to one of the values defined below.
-
-
-ERRORS
-------
-*ENOTSUP*::
-The libzmq library was not built with cryptographic support (libsodium).
-
-
-EXAMPLE
--------
-.Generating a new CURVE keypair
-----
-char public_key [41];
-char secret_key [41];
-int rc = zmq_curve_keypair (public_key, secret_key);
-assert (rc == 0);
-----
-
-
-SEE ALSO
---------
-linkzmq:zmq_z85_decode[3]
-linkzmq:zmq_z85_encode[3]
-linkzmq:zmq_curve[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/libs/libzmq/doc/zmq_curve_public.txt b/libs/libzmq/doc/zmq_curve_public.txt
deleted file mode 100644
index fd8adf1..0000000
--- a/libs/libzmq/doc/zmq_curve_public.txt
+++ /dev/null
@@ -1,62 +0,0 @@
-zmq_curve_public(3)
-===================
-
-
-NAME
-----
-zmq_curve_public - derive the public key from a private key
-
-
-SYNOPSIS
---------
-*int zmq_curve_public (char *z85_public_key, char *z85_secret_key);*
-
-
-DESCRIPTION
------------
-The _zmq_curve_public()_ function shall derive the public key from a
-private key. The caller provides two buffers, each at least 41 octets
-large. In z85_secret_key the caller shall provide the private key, and
-the function will store the public key in z85_public_key. The keys are
-encoded using linkzmq:zmq_z85_encode[3].
-
-
-RETURN VALUE
-------------
-The _zmq_curve_public()_ function shall return 0 if successful, else it
-shall return `-1` and set 'errno' to one of the values defined below.
-
-
-ERRORS
-------
-*ENOTSUP*::
-The libzmq library was not built with cryptographic support (libsodium).
-
-
-EXAMPLE
--------
-.Deriving the public key from a CURVE private key
-----
-char public_key [41];
-char secret_key [41];
-int rc = zmq_curve_keypair (public_key, secret_key);
-assert (rc == 0);
-char derived_public[41];
-rc = zmq_curve_public (derived_public, secret_key);
-assert (rc == 0);
-assert (!strcmp (derived_public, public_key));
-----
-
-
-SEE ALSO
---------
-linkzmq:zmq_z85_decode[3]
-linkzmq:zmq_z85_encode[3]
-linkzmq:zmq_curve_keypair[3]
-linkzmq:zmq_curve[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/libs/libzmq/doc/zmq_disconnect.txt b/libs/libzmq/doc/zmq_disconnect.txt
deleted file mode 100644
index 0b2783d..0000000
--- a/libs/libzmq/doc/zmq_disconnect.txt
+++ /dev/null
@@ -1,76 +0,0 @@
-zmq_disconnect(3)
-=================
-
-
-NAME
-----
-zmq_disconnect - Disconnect a socket from an endpoint
-
-
-SYNOPSIS
---------
-*int zmq_disconnect (void '*socket', const char '*endpoint');*
-
-
-DESCRIPTION
------------
-The _zmq_disconnect()_ function shall disconnect a socket specified
-by the 'socket' argument from the endpoint specified by the 'endpoint'
-argument. Note the actual disconnect system call might occur at a later time.
-
-Upon disconnection the will also stop receiving messages originating from
-this endpoint. Moreover, the socket will no longer be able
-to queue outgoing messages to this endpoint. The outgoing message queue
-associated with the endpoint will be discarded. However, if the socket's linger
-period is non-zero, libzmq will still attempt to transmit these discarded messages,
-until the linger period expires.
-
-The 'endpoint' argument is as described in linkzmq:zmq_connect[3]
-
-NOTE: The default setting of _ZMQ_LINGER_ does not discard unsent messages;
-this behaviour may cause the application to block when calling _zmq_ctx_term()_.
-For details refer to linkzmq:zmq_setsockopt[3] and linkzmq:zmq_ctx_term[3].
-
-RETURN VALUE
-------------
-The _zmq_disconnect()_ function shall return zero if successful. Otherwise it
-shall return `-1` and set 'errno' to one of the values defined below.
-
-ERRORS
-------
-*EINVAL*::
-The endpoint supplied is invalid.
-*ETERM*::
-The 0MQ 'context' associated with the specified 'socket' was terminated.
-*ENOTSOCK*::
-The provided 'socket' was invalid.
-*ENOENT*::
-The provided endpoint is not in use by the socket.
-
-
-EXAMPLE
--------
-.Connecting a subscriber socket to an in-process and a TCP transport
-----
-/* Create a ZMQ_SUB socket */
-void *socket = zmq_socket (context, ZMQ_SUB);
-assert (socket);
-/* Connect it to the host server001, port 5555 using a TCP transport */
-rc = zmq_connect (socket, "tcp://server001:5555");
-assert (rc == 0);
-/* Disconnect from the previously connected endpoint */
-rc = zmq_disconnect (socket, "tcp://server001:5555");
-assert (rc == 0);
-----
-
-SEE ALSO
---------
-linkzmq:zmq_connect[3]
-linkzmq:zmq_socket[3]
-linkzmq:zmq[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/libs/libzmq/doc/zmq_errno.txt b/libs/libzmq/doc/zmq_errno.txt
deleted file mode 100644
index 3a0e0b2..0000000
--- a/libs/libzmq/doc/zmq_errno.txt
+++ /dev/null
@@ -1,50 +0,0 @@
-zmq_errno(3)
-============
-
-
-NAME
-----
-zmq_errno - retrieve value of errno for the calling thread
-
-
-SYNOPSIS
---------
-*int zmq_errno (void);*
-
-
-DESCRIPTION
------------
-The _zmq_errno()_ function shall retrieve the value of the 'errno' variable for
-the calling thread.
-
-The _zmq_errno()_ function is provided to assist users on non-POSIX systems who
-are experiencing issues with retrieving the correct value of 'errno' directly.
-Specifically, users on Win32 systems whose application is using a different C
-run-time library from the C run-time library in use by 0MQ will need to use
-_zmq_errno()_ for correct operation.
-
-IMPORTANT: Users not experiencing issues with retrieving the correct value of
-'errno' should not use this function and should instead access the 'errno'
-variable directly.
-
-
-RETURN VALUE
-------------
-The _zmq_errno()_ function shall return the value of the 'errno' variable for
-the calling thread.
-
-
-ERRORS
-------
-No errors are defined.
-
-
-SEE ALSO
---------
-linkzmq:zmq[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/libs/libzmq/doc/zmq_getsockopt.txt b/libs/libzmq/doc/zmq_getsockopt.txt
deleted file mode 100644
index 67eb618..0000000
--- a/libs/libzmq/doc/zmq_getsockopt.txt
+++ /dev/null
@@ -1,1030 +0,0 @@
-zmq_getsockopt(3)
-=================
-
-
-NAME
-----
-
-zmq_getsockopt - get 0MQ socket options
-
-
-SYNOPSIS
---------
-*int zmq_getsockopt (void '*socket', int 'option_name', void '*option_value', size_t '*option_len');*
-
-
-DESCRIPTION
------------
-The _zmq_getsockopt()_ function shall retrieve the value for the option
-specified by the 'option_name' argument for the 0MQ socket pointed to by the
-'socket' argument, and store it in the buffer pointed to by the 'option_value'
-argument. The 'option_len' argument is the size in bytes of the buffer pointed
-to by 'option_value'; upon successful completion _zmq_getsockopt()_ shall
-modify the 'option_len' argument to indicate the actual size of the option
-value stored in the buffer.
-
-The following options can be retrieved with the _zmq_getsockopt()_ function:
-
-
-ZMQ_AFFINITY: Retrieve I/O thread affinity
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_AFFINITY' option shall retrieve the I/O thread affinity for newly
-created connections on the specified 'socket'.
-
-Affinity determines which threads from the 0MQ I/O thread pool associated with
-the socket's _context_ shall handle newly created connections.  A value of zero
-specifies no affinity, meaning that work shall be distributed fairly among all
-0MQ I/O threads in the thread pool. For non-zero values, the lowest bit
-corresponds to thread 1, second lowest bit to thread 2 and so on.  For example,
-a value of 3 specifies that subsequent connections on 'socket' shall be handled
-exclusively by I/O threads 1 and 2.
-
-See also linkzmq:zmq_init[3] for details on allocating the number of I/O
-threads for a specific _context_.
-
-[horizontal]
-Option value type:: uint64_t
-Option value unit:: N/A (bitmap)
-Default value:: 0
-Applicable socket types:: N/A
-
-
-ZMQ_BACKLOG: Retrieve maximum length of the queue of outstanding connections
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_BACKLOG' option shall retrieve the maximum length of the queue of
-outstanding peer connections for the specified 'socket'; this only applies to
-connection-oriented transports. For details refer to your operating system
-documentation for the 'listen' function.
-
-[horizontal]
-Option value type:: int
-Option value unit:: connections
-Default value:: 100
-Applicable socket types:: all, only for connection-oriented transports
-
-
-ZMQ_BINDTODEVICE: Retrieve name of device the socket is bound to
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_BINDTODEVICE' option retrieves the name of the device this socket is
-bound to, eg. an interface or VRF. If a socket is bound to an interface, only
-packets received from that interface are processed by the socket. If device
-is a VRF device, then subsequent binds/connects to that socket use addresses
-in the VRF routing table.
-
-[horizontal]
-Option value type:: character string
-Option value unit:: N/A
-Default value:: not set
-Applicable socket types:: all, when using TCP or UDP transports.
-
-
-ZMQ_CONNECT_TIMEOUT: Retrieve connect() timeout
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Retrieves how long to wait before timing-out a connect() system call.
-The connect() system call normally takes a long time before it returns a
-time out error. Setting this option allows the library to time out the call
-at an earlier interval.
-
-[horizontal]
-Option value type:: int
-Option value unit:: milliseconds
-Default value:: 0 (disabled)
-Applicable socket types:: all, when using TCP transports.
-
-
-ZMQ_CURVE_PUBLICKEY: Retrieve current CURVE public key
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Retrieves the current long term public key for the socket. You can
-provide either a 32 byte buffer, to retrieve the binary key value, or
-a 41 byte buffer, to retrieve the key in a printable Z85 format.
-NOTE: to fetch a printable key, the buffer must be 41 bytes large
-to hold the 40-char key value and one null byte.
-
-[horizontal]
-Option value type:: binary data or Z85 text string
-Option value size:: 32 or 41
-Default value:: null
-Applicable socket types:: all, when using TCP transport
-
-
-ZMQ_CURVE_SECRETKEY: Retrieve current CURVE secret key
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Retrieves the current long term secret key for the socket. You can
-provide either a 32 byte buffer, to retrieve the binary key value, or
-a 41 byte buffer, to retrieve the key in a printable Z85 format.
-NOTE: to fetch a printable key, the buffer must be 41 bytes large
-to hold the 40-char key value and one null byte.
-
-[horizontal]
-Option value type:: binary data or Z85 text string
-Option value size:: 32 or 41
-Default value:: null
-Applicable socket types:: all, when using TCP transport
-
-
-ZMQ_CURVE_SERVERKEY: Retrieve current CURVE server key
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Retrieves the current server key for the client socket. You can
-provide either a 32 byte buffer, to retrieve the binary key value, or
-a 41-byte buffer, to retrieve the key in a printable Z85 format.
-NOTE: to fetch a printable key, the buffer must be 41 bytes large
-to hold the 40-char key value and one null byte.
-
-[horizontal]
-Option value type:: binary data or Z85 text string
-Option value size:: 32 or 41
-Default value:: null
-Applicable socket types:: all, when using TCP transport
-
-
-ZMQ_EVENTS: Retrieve socket event state
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_EVENTS' option shall retrieve the event state for the specified
-'socket'.  The returned value is a bit mask constructed by OR'ing a combination
-of the following event flags:
-
-*ZMQ_POLLIN*::
-Indicates that at least one message may be received from the specified socket
-without blocking.
-
-*ZMQ_POLLOUT*::
-Indicates that at least one message may be sent to the specified socket without
-blocking.
-
-The combination of a file descriptor returned by the 'ZMQ_FD' option being
-ready for reading but no actual events returned by a subsequent retrieval of
-the 'ZMQ_EVENTS' option is valid; applications should simply ignore this case
-and restart their polling operation/event loop.
-
-[horizontal]
-Option value type:: int
-Option value unit:: N/A (flags)
-Default value:: N/A
-Applicable socket types:: all
-
-
-ZMQ_FD: Retrieve file descriptor associated with the socket
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_FD' option shall retrieve the file descriptor associated with the
-specified 'socket'. The returned file descriptor can be used to integrate the
-socket into an existing event loop; the 0MQ library shall signal any pending
-events on the socket in an _edge-triggered_ fashion by making the file
-descriptor become ready for reading.
-
-NOTE: The ability to read from the returned file descriptor does not
-necessarily indicate that messages are available to be read from, or can be
-written to, the underlying socket; applications must retrieve the actual event
-state with a subsequent retrieval of the 'ZMQ_EVENTS' option.
-
-NOTE: The returned file descriptor is also used internally by the 'zmq_send'
-and 'zmq_recv' functions. As the descriptor is edge triggered, applications
-must update the state of 'ZMQ_EVENTS' after each invocation of 'zmq_send'
-or 'zmq_recv'.To be more explicit: after calling 'zmq_send' the socket may
-become readable (and vice versa) without triggering a read event on the
-file descriptor.
-
-CAUTION: The returned file descriptor is intended for use with a 'poll' or
-similar system call only. Applications must never attempt to read or write data
-to it directly, neither should they try to close it.
-
-[horizontal]
-Option value type:: int on POSIX systems, SOCKET on Windows
-Option value unit:: N/A
-Default value:: N/A
-Applicable socket types:: all
-
-
-ZMQ_GSSAPI_PLAINTEXT: Retrieve GSSAPI plaintext or encrypted status
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Returns the 'ZMQ_GSSAPI_PLAINTEXT' option, if any, previously set on the
-socket.  A value of '1' means  that communications will be plaintext.  A value
-of '0' means communications will be encrypted.
-
-[horizontal]
-Option value type:: int
-Option value unit:: 0, 1
-Default value:: 0 (false)
-Applicable socket types:: all, when using TCP or IPC transports
-
-
-ZMQ_GSSAPI_PRINCIPAL: Retrieve the name of the GSSAPI principal
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_GSSAPI_PRINCIPAL' option shall retrieve the principal name set for the
-GSSAPI security mechanism. The returned value shall be a NULL-terminated string
-and MAY be empty. The returned size SHALL include the terminating null byte.
-
-[horizontal]
-Option value type:: NULL-terminated character string
-Option value unit:: N/A
-Default value:: null string
-Applicable socket types:: all, when using TCP or IPC transports
-
-
-ZMQ_GSSAPI_SERVER: Retrieve current GSSAPI server role
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Returns the 'ZMQ_GSSAPI_SERVER' option, if any, previously set on the socket.
-
-[horizontal]
-Option value type:: int
-Option value unit:: 0, 1
-Default value:: 0 (false)
-Applicable socket types:: all, when using TCP or IPC transports
-
-
-ZMQ_GSSAPI_SERVICE_PRINCIPAL: Retrieve the name of the GSSAPI service principal
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_GSSAPI_SERVICE_PRINCIPAL' option shall retrieve the principal name of
-the GSSAPI server to which a GSSAPI client socket intends to connect.  The
-returned value shall be a NULL-terminated string and MAY be empty. The returned
-size SHALL include the terminating null byte.
-
-[horizontal]
-Option value type:: NULL-terminated character string
-Option value unit:: N/A
-Default value:: null string
-Applicable socket types:: all, when using TCP or IPC transports
-
-ZMQ_GSSAPI_SERVICE_PRINCIPAL_NAMETYPE: Retrieve nametype for service principal
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Returns the 'ZMQ_GSSAPI_SERVICE_PRINCIPAL_NAMETYPE' option, if any, previously
-set on the socket.  A value of 'ZMQ_GSSAPI_NT_HOSTBASED' (0) means the name
-specified with 'ZMQ_GSSAPI_SERVICE_PRINCIPAL' is interpreted as a host based
-name.  A value of 'ZMQ_GSSAPI_NT_USER_NAME' (1) means it is interpreted as
-a local user name.  A value of 'ZMQ_GSSAPI_NT_KRB5_PRINCIPAL' (2) means it
-is interpreted as an unparsed principal name string (valid only with the
-krb5 GSSAPI mechanism).
-
-[horizontal]
-Option value type:: int
-Option value unit:: 0, 1, 2
-Default value:: 0 (ZMQ_GSSAPI_NT_HOSTBASED)
-Applicable socket types:: all, when using TCP or IPC transports
-
-ZMQ_GSSAPI_PRINCIPAL_NAMETYPE: Retrieve nametype for service principal
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Returns the 'ZMQ_GSSAPI_PRINCIPAL_NAMETYPE' option, if any, previously
-set on the socket.  A value of 'ZMQ_GSSAPI_NT_HOSTBASED' (0) means the name
-specified with 'ZMQ_GSSAPI_PRINCIPAL' is interpreted as a host based
-name.  A value of 'ZMQ_GSSAPI_NT_USER_NAME' (1) means it is interpreted as
-a local user name.  A value of 'ZMQ_GSSAPI_NT_KRB5_PRINCIPAL' (2) means it
-is interpreted as an unparsed principal name string (valid only with the
-krb5 GSSAPI mechanism).
-
-[horizontal]
-Option value type:: int
-Option value unit:: 0, 1, 2
-Default value:: 0 (ZMQ_GSSAPI_NT_HOSTBASED)
-Applicable socket types:: all, when using TCP or IPC transports
-
-ZMQ_HANDSHAKE_IVL: Retrieve maximum handshake interval
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_HANDSHAKE_IVL' option shall retrieve the maximum handshake interval
-for the specified 'socket'. Handshaking is the exchange of socket configuration
-information (socket type, routing id, security) that occurs when a connection
-is first opened, only for connection-oriented transports. If handshaking does
-not complete within the configured time, the connection shall be closed.
-The value 0 means no handshake time limit.
-
-[horizontal]
-Option value type:: int
-Option value unit:: milliseconds
-Default value:: 30000
-Applicable socket types:: all but ZMQ_STREAM, only for connection-oriented transports
-
-
-ZMQ_IDENTITY: Retrieve socket identity
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-This option name is now deprecated. Use ZMQ_ROUTING_ID instead.
-ZMQ_IDENTITY remains as an alias for now.
-
-
-ZMQ_IMMEDIATE: Retrieve attach-on-connect value
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Retrieve the state of the attach on connect value. If set to `1`, will delay the
-attachment of a pipe on connect until the underlying connection has completed.
-This will cause the socket to block if there are no other connections, but will
-prevent queues from filling on pipes awaiting connection.
-
-[horizontal]
-Option value type:: int
-Option value unit:: boolean
-Default value:: 0 (false)
-Applicable socket types:: all, primarily when using TCP/IPC transports.
-
-
-ZMQ_INVERT_MATCHING: Retrieve inverted filtering status
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Returns the value of the 'ZMQ_INVERT_MATCHING' option. A value of `1`
-means the socket uses inverted prefix matching.
-
-On 'PUB' and 'XPUB' sockets, this causes messages to be sent to all
-connected sockets 'except' those subscribed to a prefix that matches
-the message. On 'SUB' sockets, this causes only incoming messages that
-do 'not' match any of the socket's subscriptions to be received by the user.
-
-Whenever 'ZMQ_INVERT_MATCHING' is set to 1 on a 'PUB' socket, all 'SUB'
-sockets connecting to it must also have the option set to 1. Failure to
-do so will have the 'SUB' sockets reject everything the 'PUB' socket sends
-them. 'XSUB' sockets do not need to do this because they do not filter
-incoming messages.
-
-[horizontal]
-Option value type:: int
-Option value unit:: 0,1
-Default value:: 0
-Applicable socket types:: ZMQ_PUB, ZMQ_XPUB, ZMQ_SUB
-
-
-ZMQ_IPV4ONLY: Retrieve IPv4-only socket override status
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Retrieve the IPv4-only option for the socket. This option is deprecated.
-Please use the ZMQ_IPV6 option.
-
-[horizontal]
-Option value type:: int
-Option value unit:: boolean
-Default value:: 1 (true)
-Applicable socket types:: all, when using TCP transports.
-
-
-ZMQ_IPV6: Retrieve IPv6 socket status
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Retrieve the IPv6 option for the socket. A value of `1` means IPv6 is
-enabled on the socket, while `0` means the socket will use only IPv4.
-When IPv6 is enabled the socket will connect to, or accept connections
-from, both IPv4 and IPv6 hosts.
-
-[horizontal]
-Option value type:: int
-Option value unit:: boolean
-Default value:: 0 (false)
-Applicable socket types:: all, when using TCP transports.
-
-
-ZMQ_LAST_ENDPOINT: Retrieve the last endpoint set
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_LAST_ENDPOINT' option shall retrieve the last endpoint bound for
-TCP and IPC transports. The returned value will be a string in the form of
-a ZMQ DSN. Note that if the TCP host is INADDR_ANY, indicated by a *, then
-the returned address will be 0.0.0.0 (for IPv4).
-Note: not supported on GNU/Hurd with IPC due to non-working getsockname().
-
-[horizontal]
-Option value type:: NULL-terminated character string
-Option value unit:: N/A
-Default value:: NULL
-Applicable socket types:: all, when binding TCP or IPC transports
-
-
-ZMQ_LINGER: Retrieve linger period for socket shutdown
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_LINGER' option shall retrieve the linger period for the specified
-'socket'.  The linger period determines how long pending messages which have
-yet to be sent to a peer shall linger in memory after a socket is closed with
-linkzmq:zmq_close[3], and further affects the termination of the socket's
-context with linkzmq:zmq_ctx_term[3]. The following outlines the different
-behaviours:
-
-* The default value of '-1' specifies an infinite linger period. Pending
-  messages shall not be discarded after a call to _zmq_close()_; attempting to
-  terminate the socket's context with _zmq_ctx_term()_ shall block until all
-  pending messages have been sent to a peer.
-
-* The value of '0' specifies no linger period. Pending messages shall be
-  discarded immediately when the socket is closed with _zmq_close()_.
-
-* Positive values specify an upper bound for the linger period in milliseconds.
-  Pending messages shall not be discarded after a call to _zmq_close()_;
-  attempting to terminate the socket's context with _zmq_ctx_term()_ shall block
-  until either all pending messages have been sent to a peer, or the linger
-  period expires, after which any pending messages shall be discarded.
-
-[horizontal]
-Option value type:: int
-Option value unit:: milliseconds
-Default value:: -1 (infinite)
-Applicable socket types:: all
-
-
-ZMQ_MAXMSGSIZE: Maximum acceptable inbound message size
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The option shall retrieve limit for the inbound messages. If a peer sends
-a message larger than ZMQ_MAXMSGSIZE it is disconnected. Value of -1 means
-'no limit'.
-
-[horizontal]
-Option value type:: int64_t
-Option value unit:: bytes
-Default value:: -1
-Applicable socket types:: all
-
-
-ZMQ_MECHANISM: Retrieve current security mechanism
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_MECHANISM' option shall retrieve the current security mechanism
-for the socket.
-
-[horizontal]
-Option value type:: int
-Option value unit:: ZMQ_NULL, ZMQ_PLAIN, ZMQ_CURVE, or ZMQ_GSSAPI
-Default value:: ZMQ_NULL
-Applicable socket types:: all, when using TCP or IPC transports
-
-
-ZMQ_MULTICAST_HOPS: Maximum network hops for multicast packets
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The option shall retrieve time-to-live used for outbound multicast packets.
-The default of 1 means that the multicast packets don't leave the local network.
-
-[horizontal]
-Option value type:: int
-Option value unit:: network hops
-Default value:: 1
-Applicable socket types:: all, when using multicast transports
-
-
-ZMQ_MULTICAST_MAXTPDU: Maximum transport data unit size for multicast packets
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_MULTICAST_MAXTPDU' option shall retrieve the maximum transport
-data unit size used for outbound multicast packets.
-
-This must be set at or below the minimum Maximum Transmission Unit (MTU) for
-all network paths over which multicast reception is required.
-
-[horizontal]
-Option value type:: int
-Option value unit:: bytes
-Default value:: 1500
-Applicable socket types:: all, when using multicast transports
-
-
-ZMQ_PLAIN_PASSWORD: Retrieve current password
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_PLAIN_PASSWORD' option shall retrieve the last password set for
-the PLAIN security mechanism. The returned value shall be a NULL-terminated
-string and MAY be empty. The returned size SHALL include the terminating
-null byte.
-
-[horizontal]
-Option value type:: NULL-terminated character string
-Option value unit:: N/A
-Default value:: null string
-Applicable socket types:: all, when using TCP or IPC transports
-
-
-ZMQ_PLAIN_SERVER: Retrieve current PLAIN server role
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Returns the 'ZMQ_PLAIN_SERVER' option, if any, previously set on the socket.
-
-[horizontal]
-Option value type:: int
-Option value unit:: 0, 1
-Default value:: int
-Applicable socket types:: all, when using TCP or IPC transports
-
-
-ZMQ_PLAIN_USERNAME: Retrieve current PLAIN username
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_PLAIN_USERNAME' option shall retrieve the last username set for
-the PLAIN security mechanism. The returned value shall be a NULL-terminated
-string and MAY be empty. The returned size SHALL include the terminating
-null byte.
-
-[horizontal]
-Option value type:: NULL-terminated character string
-Option value unit:: N/A
-Default value:: null string
-Applicable socket types:: all, when using TCP or IPC transports
-
-
-ZMQ_USE_FD: Retrieve the pre-allocated socket file descriptor
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_USE_FD' option shall retrieve the pre-allocated file
-descriptor that has been assigned to a ZMQ socket, if any. -1 shall be
-returned if a pre-allocated file descriptor was not set for the socket.
-
-[horizontal]
-Option value type:: int
-Option value unit:: file descriptor
-Default value:: -1
-Applicable socket types:: all bound sockets, when using IPC or TCP transport
-
-
-ZMQ_PRIORITY: Retrieve the Priority on socket
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Gets the protocol-defined priority for all packets to be sent on this
-socket, where supported by the OS.
-
-[horizontal]
-Option value type:: int
-Option value unit:: >0
-Default value:: 0
-Applicable socket types:: all, only for connection-oriented transports
-
-
-ZMQ_RATE: Retrieve multicast data rate
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_RATE' option shall retrieve the maximum send or receive data rate for
-multicast transports using the specified 'socket'.
-
-[horizontal]
-Option value type:: int
-Option value unit:: kilobits per second
-Default value:: 100
-Applicable socket types:: all, when using multicast transports
-
-
-ZMQ_RCVBUF: Retrieve kernel receive buffer size
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_RCVBUF' option shall retrieve the underlying kernel receive buffer
-size for the specified 'socket'. For details refer to your operating system
-documentation for the 'SO_RCVBUF' socket option.
-
-[horizontal]
-Option value type:: int
-Option value unit:: bytes
-Default value:: 8192
-Applicable socket types:: all
-
-
-ZMQ_RCVHWM: Retrieve high water mark for inbound messages
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_RCVHWM' option shall return the high water mark for inbound messages on
-the specified 'socket'. The high water mark is a hard limit on the maximum
-number of outstanding messages 0MQ shall queue in memory for any single peer
-that the specified 'socket' is communicating with. A value of zero means no
-limit.
-
-If this limit has been reached the socket shall enter an exceptional state and
-depending on the socket type, 0MQ shall take appropriate action such as
-blocking or dropping sent messages. Refer to the individual socket descriptions
-in linkzmq:zmq_socket[3] for details on the exact action taken for each socket
-type.
-
-[horizontal]
-Option value type:: int
-Option value unit:: messages
-Default value:: 1000
-Applicable socket types:: all
-
-
-ZMQ_RCVMORE: More message data parts to follow
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_RCVMORE' option shall return True (1) if the message part last
-received from the 'socket' was a data part with more parts to follow. If there
-are no data parts to follow, this option shall return False (0).
-
-Refer to linkzmq:zmq_send[3] and linkzmq:zmq_recv[3] for a detailed description
-of multi-part messages.
-
-[horizontal]
-Option value type:: int
-Option value unit:: boolean
-Default value:: N/A
-Applicable socket types:: all
-
-
-ZMQ_RCVTIMEO: Maximum time before a socket operation returns with EAGAIN
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Retrieve the timeout for recv operation on the socket.  If the value is `0`,
-_zmq_recv(3)_ will return immediately, with a EAGAIN error if there is no
-message to receive. If the value is `-1`, it will block until a message is
-available. For all other values, it will wait for a message for that amount
-of time before returning with an EAGAIN error.
-
-[horizontal]
-Option value type:: int
-Option value unit:: milliseconds
-Default value:: -1 (infinite)
-Applicable socket types:: all
-
-
-ZMQ_RECONNECT_IVL: Retrieve reconnection interval
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_RECONNECT_IVL' option shall retrieve the initial reconnection interval
-for the specified 'socket'.  The reconnection interval is the period 0MQ shall
-wait between attempts to reconnect disconnected peers when using
-connection-oriented transports. The value -1 means no reconnection.
-
-NOTE: The reconnection interval may be randomized by 0MQ to prevent
-reconnection storms in topologies with a large number of peers per socket.
-
-[horizontal]
-Option value type:: int
-Option value unit:: milliseconds
-Default value:: 100
-Applicable socket types:: all, only for connection-oriented transports
-
-
-ZMQ_RECONNECT_IVL_MAX: Retrieve maximum reconnection interval
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_RECONNECT_IVL_MAX' option shall retrieve the maximum reconnection
-interval for the specified 'socket'.  This is the maximum period 0MQ shall wait
-between attempts to reconnect. On each reconnect attempt, the previous interval
-shall be doubled until ZMQ_RECONNECT_IVL_MAX is reached. This allows for
-exponential backoff strategy. Default value means no exponential backoff is
-performed and reconnect interval calculations are only based on
-ZMQ_RECONNECT_IVL.
-
-NOTE:  Values less than ZMQ_RECONNECT_IVL will be ignored.
-
-[horizontal]
-Option value type:: int
-Option value unit:: milliseconds
-Default value:: 0 (only use ZMQ_RECONNECT_IVL)
-Applicable socket types:: all, only for connection-oriented transport
-
-
-ZMQ_RECONNECT_STOP: Retrieve condition where reconnection will stop
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_RECONNECT_STOP' option shall retrieve the conditions under which
-automatic reconnection will stop.
-
-The 'ZMQ_RECONNECT_STOP_CONN_REFUSED' option will stop reconnection when 0MQ
-receives the ECONNREFUSED return code from the connect.  This indicates that
-there is no code bound to the specified endpoint.
-
-[horizontal]
-Option value type:: int
-Option value unit:: 'ZMQ_RECONNECT_STOP_CONN_REFUSED'
-Default value:: 0
-Applicable socket types:: all, only for connection-oriented transports
-
-
-ZMQ_RECOVERY_IVL: Get multicast recovery interval
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_RECOVERY_IVL' option shall retrieve the recovery interval for
-multicast transports using the specified 'socket'.  The recovery interval
-determines the maximum time in milliseconds that a receiver can be absent from a
-multicast group before unrecoverable data loss will occur.
-
-[horizontal]
-Option value type:: int
-Option value unit:: milliseconds
-Default value:: 10000
-Applicable socket types:: all, when using multicast transports
-
-
-ZMQ_ROUTING_ID: Retrieve socket routing id
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_ROUTING_ID' option shall retrieve the routing id of the specified 'socket'.
-Routing ids are used only by the request/reply pattern. Specifically, it can be used
-in tandem with ROUTER socket to route messages to the peer with a specific
-routing id.
-
-A routing id must be at least one byte and at most 255 bytes long. Identities
-starting with a zero byte are reserved for use by the 0MQ infrastructure.
-
-[horizontal]
-Option value type:: binary data
-Option value unit:: N/A
-Default value:: NULL
-Applicable socket types:: ZMQ_REP, ZMQ_REQ, ZMQ_ROUTER, ZMQ_DEALER.
-
-
-ZMQ_SNDBUF: Retrieve kernel transmit buffer size
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_SNDBUF' option shall retrieve the underlying kernel transmit buffer
-size for the specified 'socket'. For details refer to your operating system
-documentation for the 'SO_SNDBUF' socket option.
-
-[horizontal]
-Option value type:: int
-Option value unit:: bytes
-Default value:: 8192
-Applicable socket types:: all
-
-
-ZMQ_SNDHWM: Retrieves high water mark for outbound messages
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_SNDHWM' option shall return the high water mark for outbound messages
-on the specified 'socket'. The high water mark is a hard limit on the maximum
-number of outstanding messages 0MQ shall queue in memory for any single peer
-that the specified 'socket' is communicating with. A value of zero means no
-limit.
-
-If this limit has been reached the socket shall enter an exceptional state and
-depending on the socket type, 0MQ shall take appropriate action such as
-blocking or dropping sent messages. Refer to the individual socket descriptions
-in linkzmq:zmq_socket[3] for details on the exact action taken for each socket
-type.
-
-[horizontal]
-Option value type:: int
-Option value unit:: messages
-Default value:: 1000
-Applicable socket types:: all
-
-
-ZMQ_SNDTIMEO: Maximum time before a socket operation returns with EAGAIN
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Retrieve the timeout for send operation on the socket. If the value is `0`,
-_zmq_send(3)_ will return immediately, with a EAGAIN error if the message
-cannot be sent. If the value is `-1`, it will block until the message is sent.
-For all other values, it will try to send the message for that amount of time
-before returning with an EAGAIN error.
-
-[horizontal]
-Option value type:: int
-Option value unit:: milliseconds
-Default value:: -1 (infinite)
-Applicable socket types:: all
-
-
-ZMQ_SOCKS_PROXY: Retrieve SOCKS5 proxy address
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_SOCKS_PROXY' option shall retrieve the SOCKS5 proxy address in string
-format. The returned value shall be a NULL-terminated string and MAY be empty.
-The returned size SHALL include the terminating null byte.
-
-[horizontal]
-Option value type:: NULL-terminated character string
-Option value unit:: N/A
-Default value:: null string
-Applicable socket types:: all, when using TCP transports
-
-
-ZMQ_TCP_KEEPALIVE: Override SO_KEEPALIVE socket option
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Override 'SO_KEEPALIVE' socket option(where supported by OS).
-The default value of `-1` means to skip any overrides and leave it to OS default.
-
-[horizontal]
-Option value type:: int
-Option value unit:: -1,0,1
-Default value:: -1 (leave to OS default)
-Applicable socket types:: all, when using TCP transports.
-
-
-ZMQ_TCP_KEEPALIVE_CNT: Override TCP_KEEPCNT socket option
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Override 'TCP_KEEPCNT' socket option(where supported by OS).
-The default value of `-1` means to skip any overrides and leave it to OS default.
-
-[horizontal]
-Option value type:: int
-Option value unit:: -1,>0
-Default value:: -1 (leave to OS default)
-Applicable socket types:: all, when using TCP transports.
-
-
-ZMQ_TCP_KEEPALIVE_IDLE: Override TCP_KEEPIDLE (or TCP_KEEPALIVE on some OS)
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Override 'TCP_KEEPIDLE'(or 'TCP_KEEPALIVE' on some OS) socket option (where
-supported by OS). The default value of `-1` means to skip any overrides and
-leave it to OS default.
-
-[horizontal]
-Option value type:: int
-Option value unit:: -1,>0
-Default value:: -1 (leave to OS default)
-Applicable socket types:: all, when using TCP transports.
-
-
-ZMQ_TCP_KEEPALIVE_INTVL: Override TCP_KEEPINTVL socket option
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Override 'TCP_KEEPINTVL' socket option(where supported by OS).
-The default value of `-1` means to skip any overrides and leave it to OS default.
-
-[horizontal]
-Option value type:: int
-Option value unit:: -1,>0
-Default value:: -1 (leave to OS default)
-Applicable socket types:: all, when using TCP transports.
-
-
-ZMQ_TCP_MAXRT: Retrieve Max TCP Retransmit Timeout
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-On OSes where it is supported, retrieves how long before an unacknowledged TCP
-retransmit times out. The system normally attempts many TCP retransmits
-following an exponential backoff strategy. This means that after a network
-outage, it may take a long time before the session can be re-established.
-Setting this option allows the timeout to happen at a shorter interval.
-
-[horizontal]
-Option value type:: int
-Option value unit:: milliseconds
-Default value:: 0 (leave to OS default)
-Applicable socket types:: all, when using TCP transports.
-
-
-ZMQ_THREAD_SAFE: Retrieve socket thread safety
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_THREAD_SAFE' option shall retrieve a boolean value indicating whether
-or not the socket is threadsafe. See linkzmq:zmq_socket[3] for which sockets are
-thread-safe.
-
-[horizontal]
-Option value type:: int
-Option value unit:: boolean
-Applicable socket types:: all
-
-
-ZMQ_TOS: Retrieve the Type-of-Service socket override status
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Retrieve the IP_TOS option for the socket.
-
-[horizontal]
-Option value type:: int
-Option value unit:: >0
-Default value:: 0
-Applicable socket types:: all, only for connection-oriented transports
-
-
-ZMQ_TYPE: Retrieve socket type
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_TYPE' option shall retrieve the socket type for the specified
-'socket'.  The socket type is specified at socket creation time and
-cannot be modified afterwards.
-
-[horizontal]
-Option value type:: int
-Option value unit:: N/A
-Default value:: N/A
-Applicable socket types:: all
-
-
-ZMQ_ZAP_DOMAIN: Retrieve RFC 27 authentication domain
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-The 'ZMQ_ZAP_DOMAIN' option shall retrieve the last ZAP domain set for
-the socket. The returned value shall be a NULL-terminated string and MAY
-be empty. An empty string means that ZAP authentication is disabled.
-The returned size SHALL include the terminating null byte.
-
-[horizontal]
-Option value type:: character string
-Option value unit:: N/A
-Default value:: not set
-Applicable socket types:: all, when using TCP transport
-
-
-ZMQ_ZAP_ENFORCE_DOMAIN: Retrieve ZAP domain handling mode
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_ZAP_ENFORCE_DOMAIN' option shall retrieve the flag that determines
-whether a ZAP domain is strictly required or not.
-
-[horizontal]
-Option value type:: int
-Option value unit:: 0, 1
-Default value:: 0
-Applicable socket types:: all, when using ZAP
-
-
-ZMQ_VMCI_BUFFER_SIZE: Retrieve buffer size of the VMCI socket
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The `ZMQ_VMCI_BUFFER_SIZE` option shall retrieve the size of the underlying
-buffer for the socket. Used during negotiation before the connection is established.
-
-[horizontal]
-Option value type:: uint64_t
-Option value unit:: bytes
-Default value:: 65546
-Applicable socket types:: all, when using VMCI transport
-
-
-ZMQ_VMCI_BUFFER_MIN_SIZE: Retrieve min buffer size of the VMCI socket
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The `ZMQ_VMCI_BUFFER_MIN_SIZE` option shall retrieve the min size of the underlying
-buffer for the socket. Used during negotiation before the connection is established.
-
-[horizontal]
-Option value type:: uint64_t
-Option value unit:: bytes
-Default value:: 128
-Applicable socket types:: all, when using VMCI transport
-
-
-ZMQ_VMCI_BUFFER_MAX_SIZE: Retrieve max buffer size of the VMCI socket
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The `ZMQ_VMCI_BUFFER_MAX_SIZE` option shall retrieve the max size of the underlying
-buffer for the socket. Used during negotiation before the connection is established.
-
-[horizontal]
-Option value type:: uint64_t
-Option value unit:: bytes
-Default value:: 262144
-Applicable socket types:: all, when using VMCI transport
-
-
-ZMQ_VMCI_CONNECT_TIMEOUT: Retrieve connection timeout of the VMCI socket
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The `ZMQ_VMCI_CONNECT_TIMEOUT` option shall retrieve connection timeout
-for the socket.
-
-[horizontal]
-Option value type:: int
-Option value unit:: milliseconds
-Default value:: -1
-Applicable socket types:: all, when using VMCI transport
-
-
-ZMQ_MULTICAST_LOOP: Retrieve multicast local loopback configuration
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Retrieve the current multicast loopback configuration. A value of `1`
-means that the multicast packets sent on this socket will be looped
-back to local listening interface.
-
-[horizontal]
-Option value type:: int
-Option value unit:: 0, 1
-Default value:: 1
-Applicable socket types:: ZMQ_RADIO, when using UDP multicast transport
-
-
-ZMQ_ROUTER_NOTIFY: Retrieve router socket notification settings
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Retrieve the current notification settings of a router socket. The returned
-value is a bitmask composed of ZMQ_NOTIFY_CONNECT and ZMQ_NOTIFY_DISCONNECT
-flags, meaning connect and disconnect notifications are enabled, respectively.
-A value of '0' means the notifications are off.
-
-NOTE: in DRAFT state, not yet available in stable releases.
-
-[horizontal]
-Option value type:: int
-Option value unit:: 0, ZMQ_NOTIFY_CONNECT, ZMQ_NOTIFY_DISCONNECT, ZMQ_NOTIFY_CONNECT | ZMQ_NOTIFY_DISCONNECT
-Default value:: 0
-Applicable socket types:: ZMQ_ROUTER
-
-
-ZMQ_IN_BATCH_SIZE: Maximal receive batch size
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Gets the maximal amount of messages that can be received in a single
-'recv' system call.
-
-Cannot be zero.
-
-NOTE: in DRAFT state, not yet available in stable releases.
-
-[horizontal]
-Option value type:: int
-Option value unit:: messages
-Default value:: 8192
-Applicable socket types:: All, when using TCP, IPC, PGM or NORM transport.
-
-
-ZMQ_OUT_BATCH_SIZE: Maximal send batch size
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Gets the maximal amount of messages that can be sent in a single
-'send' system call.
-
-Cannot be zero.
-
-NOTE: in DRAFT state, not yet available in stable releases.
-
-[horizontal]
-Option value type:: int
-Option value unit:: messages
-Default value:: 8192
-Applicable socket types:: All, when using TCP, IPC, PGM or NORM transport.
-
-
-
-RETURN VALUE
-------------
-The _zmq_getsockopt()_ function shall return zero if successful. Otherwise it
-shall return `-1` and set 'errno' to one of the values defined below.
-
-
-ERRORS
-------
-*EINVAL*::
-The requested option _option_name_ is unknown, or the requested _option_len_ or
-_option_value_ is invalid, or the size of the buffer pointed to by
-_option_value_, as specified by _option_len_, is insufficient for storing the
-option value.
-*ETERM*::
-The 0MQ 'context' associated with the specified 'socket' was terminated.
-*ENOTSOCK*::
-The provided 'socket' was invalid.
-*EINTR*::
-The operation was interrupted by delivery of a signal.
-
-
-EXAMPLE
--------
-.Retrieving the high water mark for outgoing messages
-----
-/* Retrieve high water mark into sndhwm */
-int sndhwm;
-size_t sndhwm_size = sizeof (sndhwm);
-rc = zmq_getsockopt (socket, ZMQ_SNDHWM, &sndhwm, &sndhwm_size);
-assert (rc == 0);
-----
-
-
-SEE ALSO
---------
-linkzmq:zmq_setsockopt[3]
-linkzmq:zmq_socket[3]
-linkzmq:zmq[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/libs/libzmq/doc/zmq_gssapi.txt b/libs/libzmq/doc/zmq_gssapi.txt
deleted file mode 100644
index 6834599..0000000
--- a/libs/libzmq/doc/zmq_gssapi.txt
+++ /dev/null
@@ -1,78 +0,0 @@
-zmq_gssapi(7)
-============
-
-
-NAME
-----
-zmq_gssapi - secure authentication and confidentiality
-
-
-SYNOPSIS
---------
-
-The GSSAPI mechanism defines a mechanism for secure authentication and
-confidentiality for communications between a client and a server using the
-Generic Security Service Application Program Interface (GSSAPI).  The GSSAPI
-mechanism can be used on both public and private networks.  GSSAPI itself is
-defined in IETF RFC-2743: <http://tools.ietf.org/html/rfc2743>. The ZeroMQ
-GSSAPI mechanism is defined by this document: <http://rfc.zeromq.org/spec:38>.
-
-
-CLIENT AND SERVER ROLES
------------------------
-A socket using GSSAPI can be either client or server, but not both.
-
-To become a GSSAPI server, the application sets the ZMQ_GSSAPI_SERVER
-option on the socket.
-
-To become a GSSAPI client, the application sets the ZMQ_GSSAPI_SERVICE_PRINCIPAL
-option to the name of the principal on the server to which it intends to
-connect.
-
-On client or server, the application may additionally set the
-ZMQ_GSSAPI_PRINCIPAL option to provide the socket with the name of the
-principal for whom GSSAPI credentials should be acquired.  If this option
-is not set, default credentials are used.
-
-
-OPTIONAL ENCRYPTION
--------------------
-By default, the GSSAPI mechanism will encrypt all communications between client
-and server.  If encryption is not desired (e.g. on private networks), the
-client and server applications can disable it by setting the
-ZMQ_GSSAPI_PLAINTEXT option.  Both the client and server must set this option
-to the same value.
-
-
-PRINCIPAL NAMES
----------------
-Principal names specified with the ZMQ_GSSAPI_SERVICE_PRINCIPAL or
-ZMQ_GSSAPI_PRINCIPAL options are interpreted as "host based" name types
-by default.  The ZMQ_GSSAPI_PRINCIPAL_NAMETYPE and
-ZMQ_GSSAPI_SERVICE_PRINCIPAL_NAMETYPE options may be used to change the
-name type to one of:
-
-*ZMQ_GSSAPI_NT_HOSTBASED*::
-The name should be of the form "service" or "service@hostname",
-which will parse into a principal of "service/hostname"
-in the local realm.  This is the default name type.
-*ZMQ_GSSAPI_NT_USER_NAME*::
-The name should be a local username, which will parse into a single-component
-principal in the local realm.
-*ZMQ_GSSAPI_NT_KRB5_PRINCIPAL*::
-The name is a principal name string.  This name type only works with
-the krb5 GSSAPI mechanism.
-
-
-SEE ALSO
---------
-linkzmq:zmq_setsockopt[3]
-linkzmq:zmq_null[7]
-linkzmq:zmq_curve[7]
-linkzmq:zmq[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/libs/libzmq/doc/zmq_has.txt b/libs/libzmq/doc/zmq_has.txt
deleted file mode 100644
index 847711b..0000000
--- a/libs/libzmq/doc/zmq_has.txt
+++ /dev/null
@@ -1,44 +0,0 @@
-zmq_has(3)
-==========
-
-
-NAME
-----
-zmq_has - check a ZMQ capability
-
-
-SYNOPSIS
---------
-*int zmq_has (const char *capability);*
-
-
-DESCRIPTION
------------
-The _zmq_has()_ function shall report whether a specified capability is
-available in the library. This allows bindings and applications to probe
-a library directly, for transport and security options.
-
-Capabilities shall be lowercase strings. The following capabilities are
-defined:
-
-* ipc - the library supports the ipc:// protocol
-* pgm - the library supports the pgm:// protocol
-* tipc - the library supports the tipc:// protocol
-* norm - the library supports the norm:// protocol
-* curve - the library supports the CURVE security mechanism
-* gssapi - the library supports the GSSAPI security mechanism
-* draft - the library is built with the draft api
-
-When this method is provided, the zmq.h header file will define
-ZMQ_HAS_CAPABILITIES.
-
-RETURN VALUE
-------------
-The _zmq_has()_ function shall return 1 if the specified capability is
-provided. Otherwise it shall return 0.
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/libs/libzmq/doc/zmq_init.txt b/libs/libzmq/doc/zmq_init.txt
deleted file mode 100644
index aab86ab..0000000
--- a/libs/libzmq/doc/zmq_init.txt
+++ /dev/null
@@ -1,52 +0,0 @@
-zmq_init(3)
-===========
-
-
-NAME
-----
-zmq_init - initialise 0MQ context
-
-
-SYNOPSIS
---------
-*void *zmq_init (int 'io_threads');*
-
-
-DESCRIPTION
------------
-The _zmq_init()_ function initialises a 0MQ 'context'.
-
-The 'io_threads' argument specifies the size of the 0MQ thread pool to handle
-I/O operations. If your application is using only the 'inproc' transport for
-messaging you may set this to zero, otherwise set it to at least one.
-
-.Thread safety
-A 0MQ 'context' is thread safe and may be shared among as many application
-threads as necessary, without any additional locking required on the part of
-the caller.
-
-This function is deprecated by linkzmq:zmq_ctx_new[3].
-
-RETURN VALUE
-------------
-The _zmq_init()_ function shall return an opaque handle to the initialised
-'context' if successful. Otherwise it shall return NULL and set 'errno' to one
-of the values defined below.
-
-
-ERRORS
-------
-*EINVAL*::
-An invalid number of 'io_threads' was requested.
-
-
-SEE ALSO
---------
-linkzmq:zmq[7]
-linkzmq:zmq_ctx_term[3]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/libs/libzmq/doc/zmq_inproc.txt b/libs/libzmq/doc/zmq_inproc.txt
deleted file mode 100644
index 9462101..0000000
--- a/libs/libzmq/doc/zmq_inproc.txt
+++ /dev/null
@@ -1,88 +0,0 @@
-zmq_inproc(7)
-=============
-
-
-NAME
-----
-zmq_inproc - 0MQ local in-process (inter-thread) communication transport
-
-
-SYNOPSIS
---------
-The in-process transport passes messages via memory directly between threads
-sharing a single 0MQ 'context'.
-
-NOTE: No I/O threads are involved in passing messages using the 'inproc'
-transport. Therefore, if you are using a 0MQ 'context' for in-process messaging
-only you can initialise the 'context' with zero I/O threads. See
-linkzmq:zmq_init[3] for details.
-
-
-ADDRESSING
-----------
-A 0MQ endpoint is a string consisting of a 'transport'`://` followed by an
-'address'. The 'transport' specifies the underlying protocol to use. The
-'address' specifies the transport-specific address to connect to.
-
-For the in-process transport, the transport is `inproc`, and the meaning of
-the 'address' part is defined below.
-
-
-Assigning a local address to a socket
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-When assigning a local address to a 'socket' using _zmq_bind()_ with the
-'inproc' transport, the 'endpoint' shall be interpreted as an arbitrary string
-identifying the 'name' to create. The 'name' must be unique within the 0MQ
-'context' associated with the 'socket' and may be up to 256 characters in
-length.  No other restrictions are placed on the format of the 'name'.
-
-
-Connecting a socket
-~~~~~~~~~~~~~~~~~~~
-When connecting a 'socket' to a peer address using _zmq_connect()_ with the
-'inproc' transport, the 'endpoint' shall be interpreted as an arbitrary string
-identifying the 'name' to connect to.  Before version 4.0 he 'name' must have
-been previously created by assigning it to at least one 'socket' within the
-same 0MQ 'context' as the 'socket' being connected.  Since version 4.0 the
-order of _zmq_bind()_ and _zmq_connect()_ does not matter just like for the tcp
-transport type.
-
-
-EXAMPLES
---------
-.Assigning a local address to a socket
-----
-//  Assign the in-process name "#1"
-rc = zmq_bind(socket, "inproc://#1");
-assert (rc == 0);
-//  Assign the in-process name "my-endpoint"
-rc = zmq_bind(socket, "inproc://my-endpoint");
-assert (rc == 0);
-----
-
-.Connecting a socket
-----
-//  Connect to the in-process name "#1"
-rc = zmq_connect(socket, "inproc://#1");
-assert (rc == 0);
-//  Connect to the in-process name "my-endpoint"
-rc = zmq_connect(socket, "inproc://my-endpoint");
-assert (rc == 0);
-----
-
-
-SEE ALSO
---------
-linkzmq:zmq_bind[3]
-linkzmq:zmq_connect[3]
-linkzmq:zmq_ipc[7]
-linkzmq:zmq_tcp[7]
-linkzmq:zmq_pgm[7]
-linkzmq:zmq_vmci[7]
-linkzmq:zmq[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/libs/libzmq/doc/zmq_ipc.txt b/libs/libzmq/doc/zmq_ipc.txt
deleted file mode 100644
index 9ec6e69..0000000
--- a/libs/libzmq/doc/zmq_ipc.txt
+++ /dev/null
@@ -1,106 +0,0 @@
-zmq_ipc(7)
-==========
-
-
-NAME
-----
-zmq_ipc - 0MQ local inter-process communication transport
-
-
-SYNOPSIS
---------
-The inter-process transport passes messages between local processes using a
-system-dependent IPC mechanism.
-
-NOTE: The inter-process transport is currently only implemented on operating
-systems that provide UNIX domain sockets.
-
-
-ADDRESSING
-----------
-A 0MQ endpoint is a string consisting of a 'transport'`://` followed by an
-'address'. The 'transport' specifies the underlying protocol to use. The
-'address' specifies the transport-specific address to connect to.
-
-For the inter-process transport, the transport is `ipc`, and the meaning of
-the 'address' part is defined below.
-
-
-Binding a socket
-~~~~~~~~~~~~~~~~
-When binding a 'socket' to a local address using _zmq_bind()_ with the 'ipc'
-transport, the 'endpoint' shall be interpreted as an arbitrary string
-identifying the 'pathname' to create. The 'pathname' must be unique within the
-operating system namespace used by the 'ipc' implementation, and must fulfill
-any restrictions placed by the operating system on the format and length of a
-'pathname'.
-
-When the address is wild-card `*`, _zmq_bind()_ shall generate a unique temporary
-pathname. The caller should retrieve this pathname using the ZMQ_LAST_ENDPOINT
-socket option. See linkzmq:zmq_getsockopt[3] for details.
-
-NOTE: any existing binding to the same endpoint shall be overridden. That is,
-if a second process binds to an endpoint already bound by a process, this
-will succeed and the first process will lose its binding. In this behaviour,
-the 'ipc' transport is not consistent with the 'tcp' or 'inproc' transports.
-
-NOTE: the endpoint pathname must be writable by the process. When the endpoint
-starts with '/', e.g., `ipc:///pathname`, this will be an _absolute_ pathname.
-If the endpoint specifies a directory that does not exist, the bind shall fail.
-
-NOTE: on Linux only, when the endpoint pathname starts with `@`, the abstract
-namespace shall be used.  The abstract namespace is independent of the
-filesystem and if a process attempts to bind an endpoint already bound by a
-process, it will fail.  See unix(7) for details.
-
-NOTE: IPC pathnames have a maximum size that depends on the operating system.
-On Linux, the maximum is 113 characters including the "ipc://" prefix (107
-characters for the real path name).
-
-Unbinding wild-card address from a socket
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-When wild-card `*` 'endpoint' was used in _zmq_bind()_, the caller should use
-real 'endpoint' obtained from the ZMQ_LAST_ENDPOINT socket option to unbind
-this 'endpoint' from a socket using _zmq_unbind()_.
-
-Connecting a socket
-~~~~~~~~~~~~~~~~~~~
-When connecting a 'socket' to a peer address using _zmq_connect()_ with the
-'ipc' transport, the 'endpoint' shall be interpreted as an arbitrary string
-identifying the 'pathname' to connect to.  The 'pathname' must have been
-previously created within the operating system namespace by assigning it to a
-'socket' with _zmq_bind()_.
-
-
-EXAMPLES
---------
-.Assigning a local address to a socket
-----
-//  Assign the pathname "/tmp/feeds/0"
-rc = zmq_bind(socket, "ipc:///tmp/feeds/0");
-assert (rc == 0);
-----
-
-.Connecting a socket
-----
-//  Connect to the pathname "/tmp/feeds/0"
-rc = zmq_connect(socket, "ipc:///tmp/feeds/0");
-assert (rc == 0);
-----
-
-SEE ALSO
---------
-linkzmq:zmq_bind[3]
-linkzmq:zmq_connect[3]
-linkzmq:zmq_inproc[7]
-linkzmq:zmq_tcp[7]
-linkzmq:zmq_pgm[7]
-linkzmq:zmq_vmci[7]
-linkzmq:zmq_getsockopt[3]
-linkzmq:zmq[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/libs/libzmq/doc/zmq_msg_close.txt b/libs/libzmq/doc/zmq_msg_close.txt
deleted file mode 100644
index 649c70e..0000000
--- a/libs/libzmq/doc/zmq_msg_close.txt
+++ /dev/null
@@ -1,57 +0,0 @@
-zmq_msg_close(3)
-================
-
-
-NAME
-----
-zmq_msg_close - release 0MQ message
-
-
-SYNOPSIS
---------
-*int zmq_msg_close (zmq_msg_t '*msg');*
-
-
-DESCRIPTION
------------
-The _zmq_msg_close()_ function shall inform the 0MQ infrastructure that any
-resources associated with the message object referenced by 'msg' are no longer
-required and may be released. Actual release of resources associated with the
-message object shall be postponed by 0MQ until all users of the message or
-underlying data buffer have indicated it is no longer required.
-
-Applications should ensure that _zmq_msg_close()_ is called once a message is
-no longer required, otherwise memory leaks may occur. Note that this is NOT
-necessary after a successful _zmq_msg_send()_.
-
-CAUTION: Never access 'zmq_msg_t' members directly, instead always use the
-_zmq_msg_ family of functions.
-
-
-RETURN VALUE
-------------
-The _zmq_msg_close()_ function shall return zero if successful. Otherwise
-it shall return `-1` and set 'errno' to one of the values defined below.
-
-
-ERRORS
-------
-*EFAULT*::
-Invalid message.
-
-
-SEE ALSO
---------
-linkzmq:zmq_msg_init[3]
-linkzmq:zmq_msg_init_size[3]
-linkzmq:zmq_msg_init_buffer[3]
-linkzmq:zmq_msg_init_data[3]
-linkzmq:zmq_msg_data[3]
-linkzmq:zmq_msg_size[3]
-linkzmq:zmq[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/libs/libzmq/doc/zmq_msg_copy.txt b/libs/libzmq/doc/zmq_msg_copy.txt
deleted file mode 100644
index 2cc0a3d..0000000
--- a/libs/libzmq/doc/zmq_msg_copy.txt
+++ /dev/null
@@ -1,72 +0,0 @@
-zmq_msg_copy(3)
-===============
-
-
-NAME
-----
-zmq_msg_copy - copy content of a message to another message
-
-
-SYNOPSIS
---------
-*int zmq_msg_copy (zmq_msg_t '*dest', zmq_msg_t '*src');*
-
-
-DESCRIPTION
------------
-The _zmq_msg_copy()_ function shall copy the message object referenced by 'src'
-to the message object referenced by 'dest'. The original content of 'dest', if
-any, shall be released. You must initialise 'dest' before copying to it.
-
-CAUTION: The implementation may choose not to physically copy the message
-content, rather to share the underlying buffer between 'src' and 'dest'. Avoid
-modifying message content after a message has been copied with
-_zmq_msg_copy()_, doing so can result in undefined behaviour. If what you need
-is an actual hard copy, initialize a new message using _zmq_msg_init_buffer()_
-with the message content.
-
-CAUTION: Never access 'zmq_msg_t' members directly, instead always use the
-_zmq_msg_ family of functions.
-
-
-RETURN VALUE
-------------
-The _zmq_msg_copy()_ function shall return zero if successful. Otherwise it
-shall return `-1` and set 'errno' to one of the values defined below.
-
-
-ERRORS
-------
-*EFAULT*::
-Invalid message.
-
-
-EXAMPLE
--------
-.Copying a message
-----
-zmq_msg_t msg;
-zmq_msg_init_buffer (&msg, "Hello, World", 12);
-zmq_msg_t copy;
-zmq_msg_init (&copy);
-zmq_msg_copy (&copy, &msg);
-...
-zmq_msg_close (&copy);
-zmq_msg_close (&msg);
-----
-
-SEE ALSO
---------
-linkzmq:zmq_msg_move[3]
-linkzmq:zmq_msg_init[3]
-linkzmq:zmq_msg_init_size[3]
-linkzmq:zmq_msg_init_buffer[3]
-linkzmq:zmq_msg_init_data[3]
-linkzmq:zmq_msg_close[3]
-linkzmq:zmq[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/libs/libzmq/doc/zmq_msg_data.txt b/libs/libzmq/doc/zmq_msg_data.txt
deleted file mode 100644
index b692982..0000000
--- a/libs/libzmq/doc/zmq_msg_data.txt
+++ /dev/null
@@ -1,49 +0,0 @@
-zmq_msg_data(3)
-===============
-
-
-NAME
-----
-zmq_msg_data - retrieve pointer to message content
-
-
-SYNOPSIS
---------
-*void *zmq_msg_data (zmq_msg_t '*msg');*
-
-
-DESCRIPTION
------------
-The _zmq_msg_data()_ function shall return a pointer to the message content of
-the message object referenced by 'msg'.
-
-CAUTION: Never access 'zmq_msg_t' members directly, instead always use the
-_zmq_msg_ family of functions.
-
-
-RETURN VALUE
-------------
-Upon successful completion, _zmq_msg_data()_ shall return a pointer to the
-message content.
-
-
-ERRORS
-------
-No errors are defined.
-
-
-SEE ALSO
---------
-linkzmq:zmq_msg_size[3]
-linkzmq:zmq_msg_init[3]
-linkzmq:zmq_msg_init_size[3]
-linkzmq:zmq_msg_init_buffer[3]
-linkzmq:zmq_msg_init_data[3]
-linkzmq:zmq_msg_close[3]
-linkzmq:zmq[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/libs/libzmq/doc/zmq_msg_get.txt b/libs/libzmq/doc/zmq_msg_get.txt
deleted file mode 100644
index 11c934e..0000000
--- a/libs/libzmq/doc/zmq_msg_get.txt
+++ /dev/null
@@ -1,83 +0,0 @@
-zmq_msg_get(3)
-==============
-
-
-NAME
-----
-zmq_msg_get - get message property
-
-
-SYNOPSIS
---------
-*int zmq_msg_get (zmq_msg_t '*message', int 'property');*
-
-
-DESCRIPTION
------------
-The _zmq_msg_get()_ function shall return the value for the property
-specified by the 'property' argument for the message pointed to by the
-'message' argument.
-
-The following properties can be retrieved with the _zmq_msg_get()_ function:
-
-*ZMQ_MORE*::
-Indicates that there are more message frames to follow after the 'message'.
-
-*ZMQ_SRCFD*::
-Returns the file descriptor of the socket the 'message' was read from. This
-allows application to retrieve the remote endpoint via 'getpeername(2)'. Be
-aware that the respective socket might be closed already, reused even.
-Currently only implemented for TCP sockets.
-
-*ZMQ_SHARED*::
-Indicates that a message MAY share underlying storage with another copy of
-this message.
-
-RETURN VALUE
-------------
-The _zmq_msg_get()_ function shall return the value for the property if
-successful. Otherwise it shall return `-1` and set 'errno' to one of the
-values defined below.
-
-
-ERRORS
-------
-*EINVAL*::
-The requested _property_ is unknown.
-
-
-EXAMPLE
--------
-.Receiving a multi-frame message
-----
-zmq_msg_t frame;
-while (true) {
-    //  Create an empty 0MQ message to hold the message frame
-    int rc = zmq_msg_init (&frame);
-    assert (rc == 0);
-    //  Block until a message is available to be received from socket
-    rc = zmq_msg_recv (socket, &frame, 0);
-    assert (rc != -1);
-    if (zmq_msg_get (&frame, ZMQ_MORE))
-        fprintf (stderr, "more\n");
-    else {
-        fprintf (stderr, "end\n");
-        break;
-    }
-    zmq_msg_close (&frame);
-}
-----
-
-
-SEE ALSO
---------
-linkzmq:zmq_msg_set[3]
-linkzmq:zmq_msg_init[3]
-linkzmq:zmq_msg_close[3]
-linkzmq:zmq[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/libs/libzmq/doc/zmq_msg_gets.txt b/libs/libzmq/doc/zmq_msg_gets.txt
deleted file mode 100644
index f887b40..0000000
--- a/libs/libzmq/doc/zmq_msg_gets.txt
+++ /dev/null
@@ -1,83 +0,0 @@
-zmq_msg_gets(3)
-===============
-
-
-NAME
-----
-zmq_msg_gets - get message metadata property
-
-
-SYNOPSIS
---------
-*const char *zmq_msg_gets (zmq_msg_t '*message', const char *'property');*
-
-
-DESCRIPTION
------------
-The _zmq_msg_gets()_ function shall return the string value for the metadata
-property specified by the 'property' argument for the message pointed to by
-the 'message' argument. Both the 'property' argument and the 'value'
-shall be NULL-terminated UTF8-encoded strings.
-
-Metadata is defined on a per-connection basis during the ZeroMQ connection
-handshake as specified in <rfc.zeromq.org/spec:37>. Applications can set
-metadata properties using linkzmq:zmq_setsockopt[3] option ZMQ_METADATA.
-Application metadata properties must be prefixed with 'X-'.
-
-In addition to application metadata, the following ZMTP properties can be
-retrieved with the _zmq_msg_gets()_ function:
-
-    Socket-Type
-    Routing-Id
-
-Note: 'Identity' is a deprecated alias for 'Routing-Id'.
-
-Additionally, when available for the underlying transport, the *Peer-Address*
-property will return the IP address of the remote endpoint as returned by
-getnameinfo(2).
-
-The names of these properties are also defined in _zmq.h_ as
-_ZMQ_MSG_PROPERTY_SOCKET_TYPE_ _ZMQ_MSG_PROPERTY_ROUTING_ID_, and 
-_ZMQ_MSG_PROPERTY_PEER_ADDRESS_.
-Currently, these definitions are only available as a DRAFT API.
-
-Other properties may be defined based on the underlying security mechanism,
-see ZAP authenticated connection sample below.
-
-RETURN VALUE
-------------
-The _zmq_msg_gets()_ function shall return the string value for the property
-if successful. Otherwise it shall return NULL and set 'errno' to one of the
-values defined below. The caller shall not modify or free the returned value,
-which shall be owned by the message. The encoding of the property and value
-shall be UTF8.
-
-
-ERRORS
-------
-*EINVAL*::
-The requested _property_ is unknown.
-
-
-EXAMPLE
--------
-.Getting the ZAP authenticated user id for a message:
-----
-zmq_msg_t msg;
-zmq_msg_init (&msg);
-rc = zmq_msg_recv (&msg, dealer, 0);
-assert (rc != -1);
-const char *user_id = zmq_msg_gets (&msg, ZMQ_MSG_PROPERTY_USER_ID);
-zmq_msg_close (&msg);
-----
-
-
-SEE ALSO
---------
-linkzmq:zmq[7]
-linkzmq:zmq_setsockopt[3]
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/libs/libzmq/doc/zmq_msg_init.txt b/libs/libzmq/doc/zmq_msg_init.txt
deleted file mode 100644
index b329bf7..0000000
--- a/libs/libzmq/doc/zmq_msg_init.txt
+++ /dev/null
@@ -1,65 +0,0 @@
-zmq_msg_init(3)
-===============
-
-
-NAME
-----
-zmq_msg_init - initialise empty 0MQ message
-
-
-SYNOPSIS
---------
-*int zmq_msg_init (zmq_msg_t '*msg');*
-
-
-DESCRIPTION
------------
-The _zmq_msg_init()_ function shall initialise the message object referenced by
-'msg' to represent an empty message.  This function is most useful when called
-before receiving a message with _zmq_msg_recv()_.
-
-CAUTION: Never access 'zmq_msg_t' members directly, instead always use the
-_zmq_msg_ family of functions.
-
-CAUTION: The functions _zmq_msg_init()_, _zmq_msg_init_data()_,
-_zmq_msg_init_size()_ and _zmq_msg_init_buffer()_ are mutually exclusive.
-Never initialise the same 'zmq_msg_t' twice.
-
-
-RETURN VALUE
-------------
-The _zmq_msg_init()_ function always returns zero.
-
-
-ERRORS
-------
-No errors are defined.
-
-
-EXAMPLE
--------
-.Receiving a message from a socket
-----
-zmq_msg_t msg;
-rc = zmq_msg_init (&msg);
-assert (rc == 0);
-int nbytes = zmq_msg_recv (socket, &msg, 0);
-assert (nbytes != -1);
-----
-
-
-SEE ALSO
---------
-linkzmq:zmq_msg_init_size[3]
-linkzmq:zmq_msg_init_buffer[3]
-linkzmq:zmq_msg_init_data[3]
-linkzmq:zmq_msg_close[3]
-linkzmq:zmq_msg_data[3]
-linkzmq:zmq_msg_size[3]
-linkzmq:zmq[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/libs/libzmq/doc/zmq_msg_init_buffer.txt b/libs/libzmq/doc/zmq_msg_init_buffer.txt
deleted file mode 100644
index 23bf83f..0000000
--- a/libs/libzmq/doc/zmq_msg_init_buffer.txt
+++ /dev/null
@@ -1,59 +0,0 @@
-zmq_msg_init_buffer(3)
-======================
-
-
-NAME
-----
-zmq_msg_init_buffer - initialise 0MQ message with buffer copy
-
-
-SYNOPSIS
---------
-*int zmq_msg_init_buffer (zmq_msg_t '*msg', const void '*buf', size_t 'size');*
-
-
-DESCRIPTION
------------
-The _zmq_msg_init_buffer()_ function shall allocate any resources required to
-store a message 'size' bytes long and initialise the message object referenced
-by 'msg' to represent a copy of the buffer referenced by the 'buf' and
-'size' arguments.
-
-The implementation shall choose whether to store message content on the stack
-(small messages) or on the heap (large messages).
-
-CAUTION: Never access 'zmq_msg_t' members directly, instead always use the
-_zmq_msg_ family of functions.
-
-CAUTION: The functions _zmq_msg_init()_, _zmq_msg_init_data()_,
-_zmq_msg_init_buffer()_ and _zmq_msg_init_buffer()_ are mutually exclusive.
-Never initialise the same 'zmq_msg_t' twice.
-
-
-RETURN VALUE
-------------
-The _zmq_msg_init_buffer()_ function shall return zero if successful. Otherwise
-it shall return `-1` and set 'errno' to one of the values defined below.
-
-
-ERRORS
-------
-*ENOMEM*::
-Insufficient storage space is available.
-
-
-SEE ALSO
---------
-linkzmq:zmq_msg_init_data[3]
-linkzmq:zmq_msg_init_size[3]
-linkzmq:zmq_msg_init[3]
-linkzmq:zmq_msg_close[3]
-linkzmq:zmq_msg_data[3]
-linkzmq:zmq_msg_size[3]
-linkzmq:zmq[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/libs/libzmq/doc/zmq_msg_init_data.txt b/libs/libzmq/doc/zmq_msg_init_data.txt
deleted file mode 100644
index 1adcc6b..0000000
--- a/libs/libzmq/doc/zmq_msg_init_data.txt
+++ /dev/null
@@ -1,90 +0,0 @@
-zmq_msg_init_data(3)
-====================
-
-
-NAME
-----
-zmq_msg_init_data - initialise 0MQ message from a supplied buffer
-
-
-SYNOPSIS
---------
-*typedef void (zmq_free_fn) (void '*data', void '*hint');*
-
-*int zmq_msg_init_data (zmq_msg_t '*msg', void '*data', size_t 'size', zmq_free_fn '*ffn', void '*hint');*
-
-
-DESCRIPTION
------------
-The _zmq_msg_init_data()_ function shall initialise the message object
-referenced by 'msg' to represent the content referenced by the buffer located
-at address 'data', 'size' bytes long. No copy of 'data' shall be performed and
-0MQ shall take ownership of the supplied buffer.
-
-If provided, the deallocation function 'ffn' shall be called once the data
-buffer is no longer required by 0MQ, with the 'data' and 'hint' arguments
-supplied to _zmq_msg_init_data()_.
-
-CAUTION: Never access 'zmq_msg_t' members directly, instead always use the
-_zmq_msg_ family of functions.
-
-CAUTION: The deallocation function 'ffn' needs to be thread-safe, since it
-will be called from an arbitrary thread.
-
-CAUTION: If the deallocation function is not provided, the allocated memory
-will not be freed, and this may cause a memory leak.
-
-
-CAUTION: The functions _zmq_msg_init()_, _zmq_msg_init_data()_,
-_zmq_msg_init_size()_ and _zmq_msg_init_buffer()_ are mutually exclusive.
-Never initialise the same 'zmq_msg_t' twice.
-
-
-RETURN VALUE
-------------
-The _zmq_msg_init_data()_ function shall return zero if successful. Otherwise
-it shall return `-1` and set 'errno' to one of the values defined below.
-
-
-ERRORS
-------
-*ENOMEM*::
-Insufficient storage space is available.
-
-
-
-EXAMPLE
--------
-.Initialising a message from a supplied buffer
-----
-void my_free (void *data, void *hint) 
-{
-    free (data);
-}
-
-    /*  ...  */
-
-void *data = malloc (6);
-assert (data);
-memcpy (data, "ABCDEF", 6);
-zmq_msg_t msg;
-rc = zmq_msg_init_data (&msg, data, 6, my_free, NULL);
-assert (rc == 0);
-----
-
-
-SEE ALSO
---------
-linkzmq:zmq_msg_init_size[3]
-linkzmq:zmq_msg_init_buffer[3]
-linkzmq:zmq_msg_init[3]
-linkzmq:zmq_msg_close[3]
-linkzmq:zmq_msg_data[3]
-linkzmq:zmq_msg_size[3]
-linkzmq:zmq[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/libs/libzmq/doc/zmq_msg_init_size.txt b/libs/libzmq/doc/zmq_msg_init_size.txt
deleted file mode 100644
index 231d1a2..0000000
--- a/libs/libzmq/doc/zmq_msg_init_size.txt
+++ /dev/null
@@ -1,59 +0,0 @@
-zmq_msg_init_size(3)
-====================
-
-
-NAME
-----
-zmq_msg_init_size - initialise 0MQ message of a specified size
-
-
-SYNOPSIS
---------
-*int zmq_msg_init_size (zmq_msg_t '*msg', size_t 'size');*
-
-
-DESCRIPTION
------------
-The _zmq_msg_init_size()_ function shall allocate any resources required to
-store a message 'size' bytes long and initialise the message object referenced
-by 'msg' to represent the newly allocated message.
-
-The implementation shall choose whether to store message content on the stack
-(small messages) or on the heap (large messages). For performance reasons
-_zmq_msg_init_size()_ shall not clear the message data.
-
-CAUTION: Never access 'zmq_msg_t' members directly, instead always use the
-_zmq_msg_ family of functions.
-
-CAUTION: The functions _zmq_msg_init()_, _zmq_msg_init_data()_,
-_zmq_msg_init_size()_ and _zmq_msg_init_buffer()_ are mutually exclusive.
-Never initialise the same 'zmq_msg_t' twice.
-
-
-RETURN VALUE
-------------
-The _zmq_msg_init_size()_ function shall return zero if successful. Otherwise
-it shall return `-1` and set 'errno' to one of the values defined below.
-
-
-ERRORS
-------
-*ENOMEM*::
-Insufficient storage space is available.
-
-
-SEE ALSO
---------
-linkzmq:zmq_msg_init_data[3]
-linkzmq:zmq_msg_init_buffer[3]
-linkzmq:zmq_msg_init[3]
-linkzmq:zmq_msg_close[3]
-linkzmq:zmq_msg_data[3]
-linkzmq:zmq_msg_size[3]
-linkzmq:zmq[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/libs/libzmq/doc/zmq_msg_more.txt b/libs/libzmq/doc/zmq_msg_more.txt
deleted file mode 100644
index 179f4d3..0000000
--- a/libs/libzmq/doc/zmq_msg_more.txt
+++ /dev/null
@@ -1,65 +0,0 @@
-zmq_msg_more(3)
-===============
-
-
-NAME
-----
-zmq_msg_more - indicate if there are more message parts to receive
-
-
-SYNOPSIS
---------
-*int zmq_msg_more (zmq_msg_t '*message');*
-
-
-DESCRIPTION
------------
-The _zmq_msg_more()_ function indicates whether this is part of a multi-part
-message, and there are further parts to receive. This method can safely be
-called after _zmq_msg_close()_. This method is identical to _zmq_msg_get()_
-with an argument of ZMQ_MORE.
-
-
-RETURN VALUE
-------------
-The _zmq_msg_more()_ function shall return zero if this is the final part of
-a multi-part message, or the only part of a single-part message. It shall
-return 1 if there are further parts to receive.
-
-
-EXAMPLE
--------
-.Receiving a multi-part message
-----
-zmq_msg_t part;
-while (true) {
-    //  Create an empty 0MQ message to hold the message part
-    int rc = zmq_msg_init (&part);
-    assert (rc == 0);
-    //  Block until a message is available to be received from socket
-    rc = zmq_msg_recv (socket, &part, 0);
-    assert (rc != -1);
-    if (zmq_msg_more (&part))
-        fprintf (stderr, "more\n");
-    else {
-        fprintf (stderr, "end\n");
-        break;
-    }
-    zmq_msg_close (&part);
-}
-----
-
-
-SEE ALSO
---------
-linkzmq:zmq_msg_get[3]
-linkzmq:zmq_msg_set[3]
-linkzmq:zmq_msg_init[3]
-linkzmq:zmq_msg_close[3]
-linkzmq:zmq[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/libs/libzmq/doc/zmq_msg_move.txt b/libs/libzmq/doc/zmq_msg_move.txt
deleted file mode 100644
index ed28c16..0000000
--- a/libs/libzmq/doc/zmq_msg_move.txt
+++ /dev/null
@@ -1,53 +0,0 @@
-zmq_msg_move(3)
-===============
-
-
-NAME
-----
-zmq_msg_move - move content of a message to another message
-
-
-SYNOPSIS
---------
-*int zmq_msg_move (zmq_msg_t '*dest', zmq_msg_t '*src');*
-
-
-DESCRIPTION
------------
-The _zmq_msg_move()_ function shall move the content of the message object
-referenced by 'src' to the message object referenced by 'dest'. No actual
-copying of message content is performed, 'dest' is simply updated to reference
-the new content. 'src' becomes an empty message after calling _zmq_msg_move()_.
-The original content of 'dest', if any, shall be released.
-
-CAUTION: Never access 'zmq_msg_t' members directly, instead always use the
-_zmq_msg_ family of functions.
-
-
-RETURN VALUE
-------------
-The _zmq_msg_move()_ function shall return zero if successful. Otherwise it
-shall return `-1` and set 'errno' to one of the values defined below.
-
-
-ERRORS
-------
-*EFAULT*::
-Invalid message.
-
-
-SEE ALSO
---------
-linkzmq:zmq_msg_copy[3]
-linkzmq:zmq_msg_init[3]
-linkzmq:zmq_msg_init_size[3]
-linkzmq:zmq_msg_init_buffer[3]
-linkzmq:zmq_msg_init_data[3]
-linkzmq:zmq_msg_close[3]
-linkzmq:zmq[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/libs/libzmq/doc/zmq_msg_recv.txt b/libs/libzmq/doc/zmq_msg_recv.txt
deleted file mode 100644
index 436011f..0000000
--- a/libs/libzmq/doc/zmq_msg_recv.txt
+++ /dev/null
@@ -1,128 +0,0 @@
-zmq_msg_recv(3)
-===============
-
-
-NAME
-----
-zmq_msg_recv - receive a message part from a socket
-
-
-SYNOPSIS
---------
-*int zmq_msg_recv (zmq_msg_t '*msg', void '*socket', int 'flags');*
-
-
-DESCRIPTION
------------
-The _zmq_msg_recv()_ function is identical to linkzmq:zmq_recvmsg[3], which
-shall be deprecated in future versions. _zmq_msg_recv()_ is more consistent
-with other message manipulation functions.
-
-The _zmq_msg_recv()_ function shall receive a message part from the socket
-referenced by the 'socket' argument and store it in the message referenced by
-the 'msg' argument. Any content previously stored in 'msg' shall be properly
-deallocated. If there are no message parts available on the specified 'socket'
-the _zmq_msg_recv()_ function shall block until the request can be satisfied.
-The 'flags' argument is a combination of the flags defined below:
-
-*ZMQ_DONTWAIT*::
-Specifies that the operation should be performed in non-blocking mode. If there
-are no messages available on the specified 'socket', the _zmq_msg_recv()_
-function shall fail with 'errno' set to EAGAIN.
-
-
-Multi-part messages
-~~~~~~~~~~~~~~~~~~~
-A 0MQ message is composed of 1 or more message parts. Each message
-part is an independent 'zmq_msg_t' in its own right. 0MQ ensures atomic
-delivery of messages: peers shall receive either all _message parts_ of a
-message or none at all. The total number of message parts is unlimited except
-by available memory.
-
-An application that processes multi-part messages must use the _ZMQ_RCVMORE_
-linkzmq:zmq_getsockopt[3] option after calling _zmq_msg_recv()_ to determine if
-there are further parts to receive.
-
-
-RETURN VALUE
-------------
-The _zmq_msg_recv()_ function shall return number of bytes in the message
-if successful. Otherwise it shall return `-1` and set 'errno' to one of the
-values defined below.
-
-
-ERRORS
-------
-*EAGAIN*::
-Either the timeout set via the socket-option ZMQ_RCVTIMEO (see linkzmq:zmq_setsockopt[3])
-has been reached (flag ZMQ_DONTWAIT not set) without being able to read a message
-from the socket or there are no messages available at the moment (flag ZMQ_DONTWAIT set)
-and the operation would block.
-*ENOTSUP*::
-The _zmq_msg_recv()_ operation is not supported by this socket type.
-*EFSM*::
-The _zmq_msg_recv()_ operation cannot be performed on this socket at the moment
-due to the socket not being in the appropriate state.  This error may occur with
-socket types that switch between several states, such as ZMQ_REP.  See the
-_messaging patterns_ section of linkzmq:zmq_socket[3] for more information.
-*ETERM*::
-The 0MQ 'context' associated with the specified 'socket' was terminated.
-*ENOTSOCK*::
-The provided 'socket' was invalid.
-*EINTR*::
-The operation was interrupted by delivery of a signal before a message was
-available.
-*EFAULT*::
-The message passed to the function was invalid.
-
-
-EXAMPLE
--------
-.Receiving a message from a socket
-----
-/* Create an empty 0MQ message */
-zmq_msg_t msg;
-int rc = zmq_msg_init (&msg);
-assert (rc == 0);
-/* Block until a message is available to be received from socket */
-rc = zmq_msg_recv (&msg, socket, 0);
-assert (rc != -1);
-/* Release message */
-zmq_msg_close (&msg);
-----
-
-.Receiving a multi-part message
-----
-int more;
-size_t more_size = sizeof (more);
-do {
-    /* Create an empty 0MQ message to hold the message part */
-    zmq_msg_t part;
-    int rc = zmq_msg_init (&part);
-    assert (rc == 0);
-    /* Block until a message is available to be received from socket */
-    rc = zmq_msg_recv (&part, socket, 0);
-    assert (rc != -1);
-    /* Determine if more message parts are to follow */
-    rc = zmq_getsockopt (socket, ZMQ_RCVMORE, &more, &more_size);
-    assert (rc == 0);
-    zmq_msg_close (&part);
-} while (more);
-----
-
-
-SEE ALSO
---------
-linkzmq:zmq_recv[3]
-linkzmq:zmq_send[3]
-linkzmq:zmq_msg_send[3]
-linkzmq:zmq_getsockopt[3]
-linkzmq:zmq_setsockopt[3]
-linkzmq:zmq_socket[7]
-linkzmq:zmq[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/libs/libzmq/doc/zmq_msg_routing_id.txt b/libs/libzmq/doc/zmq_msg_routing_id.txt
deleted file mode 100644
index 47f05a2..0000000
--- a/libs/libzmq/doc/zmq_msg_routing_id.txt
+++ /dev/null
@@ -1,61 +0,0 @@
-zmq_msg_routing_id(3)
-=====================
-
-
-NAME
-----
-zmq_msg_routing_id - return routing ID for message, if any
-
-
-SYNOPSIS
---------
-*uint32_t zmq_msg_routing_id (zmq_msg_t '*message');*
-
-
-DESCRIPTION
------------
-The _zmq_msg_routing_id()_ function returns the routing ID for the message,
-if any. The routing ID is set on all messages received from a 'ZMQ_SERVER'
-socket. To send a message to a 'ZMQ_SERVER' socket you must set the routing
-ID of a connected 'ZMQ_CLIENT' peer. Routing IDs are transient.
-
-
-RETURN VALUE
-------------
-The _zmq_msg_routing_id()_ function shall return zero if there is no routing
-ID, otherwise it shall return an unsigned 32-bit integer greater than zero.
-
-
-EXAMPLE
--------
-.Receiving a client message and routing ID
-----
-void *ctx = zmq_ctx_new ();
-assert (ctx);
-
-void *server = zmq_socket (ctx, ZMQ_SERVER);
-assert (server);
-int rc = zmq_bind (server, "tcp://127.0.0.1:8080");
-assert (rc == 0);
-
-zmq_msg_t message;
-rc = zmq_msg_init (&message);
-assert (rc == 0);
-
-//  Receive a message from socket
-rc = zmq_msg_recv (server, &message, 0);
-assert (rc != -1);
-uint32_t routing_id = zmq_msg_routing_id (&message);
-assert (routing_id);
-----
-
-
-SEE ALSO
---------
-linkzmq:zmq_msg_set_routing_id[3]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/libs/libzmq/doc/zmq_msg_send.txt b/libs/libzmq/doc/zmq_msg_send.txt
deleted file mode 100644
index 672a168..0000000
--- a/libs/libzmq/doc/zmq_msg_send.txt
+++ /dev/null
@@ -1,132 +0,0 @@
-zmq_msg_send(3)
-===============
-
-
-NAME
-----
-zmq_msg_send - send a message part on a socket
-
-
-SYNOPSIS
---------
-*int zmq_msg_send (zmq_msg_t '*msg', void '*socket', int 'flags');*
-
-
-DESCRIPTION
------------
-The _zmq_msg_send()_ function is identical to linkzmq:zmq_sendmsg[3], which
-shall be deprecated in future versions. _zmq_msg_send()_ is more consistent
-with other message manipulation functions.
-
-The _zmq_msg_send()_ function shall queue the message referenced by the 'msg'
-argument to be sent to the socket referenced by the 'socket' argument.  The
-'flags' argument is a combination of the flags defined below:
-
-*ZMQ_DONTWAIT*::
-For socket types (DEALER, PUSH) that block (either with ZMQ_IMMEDIATE option set
-and no peer available, or all peers having full high-water mark), specifies that
-the operation should be performed in non-blocking mode. If the message cannot be
-queued on the 'socket', the _zmq_msg_send()_ function shall fail with 'errno' set
-to EAGAIN.
-
-*ZMQ_SNDMORE*::
-Specifies that the message being sent is a multi-part message, and that further
-message parts are to follow. Refer to the section regarding multi-part messages
-below for a detailed description.
-
-The _zmq_msg_t_ structure passed to _zmq_msg_send()_ is nullified on a
-successful call. If you want to send the same message to multiple sockets you
-have to copy it (e.g. using _zmq_msg_copy()_). If the call fails, the
-_zmq_msg_t_ structure stays intact, and must be consumed by another call to
-_zmq_msg_send()_ on the same or another socket, or released using
-_zmq_msg_close()_ to avoid a memory leak.
-
-NOTE: A successful invocation of _zmq_msg_send()_ does not indicate that the
-message has been transmitted to the network, only that it has been queued on
-the 'socket' and 0MQ has assumed responsibility for the message. You do not need
-to call _zmq_msg_close()_ after a successful _zmq_msg_send()_.
-
-
-Multi-part messages
-~~~~~~~~~~~~~~~~~~~
-A 0MQ message is composed of 1 or more message parts. Each message
-part is an independent 'zmq_msg_t' in its own right. 0MQ ensures atomic
-delivery of messages: peers shall receive either all _message parts_ of a
-message or none at all. The total number of message parts is unlimited except
-by available memory.
-
-An application that sends multi-part messages must use the _ZMQ_SNDMORE_ flag
-when sending each message part except the final one.
-
-RETURN VALUE
-------------
-The _zmq_msg_send()_ function shall return number of bytes in the message
-if successful (if number of bytes is higher than 'MAX_INT', the function will
-return 'MAX_INT'). Otherwise it shall return `-1` and set 'errno' to one of the
-values defined below.
-
-
-ERRORS
-------
-*EAGAIN*::
-Non-blocking mode was requested and the message cannot be sent at the moment.
-*ENOTSUP*::
-The _zmq_msg_send()_ operation is not supported by this socket type.
-*EINVAL*::
-The sender tried to send multipart data, which the socket type does not allow.
-*EFSM*::
-The _zmq_msg_send()_ operation cannot be performed on this socket at the moment
-due to the socket not being in the appropriate state.  This error may occur with
-socket types that switch between several states, such as ZMQ_REP.  See the
-_messaging patterns_ section of linkzmq:zmq_socket[3] for more information.
-*ETERM*::
-The 0MQ 'context' associated with the specified 'socket' was terminated.
-*ENOTSOCK*::
-The provided 'socket' was invalid.
-*EINTR*::
-The operation was interrupted by delivery of a signal before the message was
-sent.
-*EFAULT*::
-Invalid message.
-*EHOSTUNREACH*::
-The message cannot be routed.
-
-
-EXAMPLE
--------
-.Filling in a message and sending it to a socket
-----
-/* Create a new message, allocating 6 bytes for message content */
-zmq_msg_t msg;
-int rc = zmq_msg_init_size (&msg, 6);
-assert (rc == 0);
-/* Fill in message content with 'AAAAAA' */
-memset (zmq_msg_data (&msg), 'A', 6);
-/* Send the message to the socket */
-rc = zmq_msg_send (&msg, socket, 0);
-assert (rc == 6);
-----
-
-.Sending a multi-part message
-----
-/* Send a multi-part message consisting of three parts to socket */
-rc = zmq_msg_send (&part1, socket, ZMQ_SNDMORE);
-rc = zmq_msg_send (&part2, socket, ZMQ_SNDMORE);
-/* Final part; no more parts to follow */
-rc = zmq_msg_send (&part3, socket, 0);
-----
-
-
-SEE ALSO
---------
-linkzmq:zmq_recv[3]
-linkzmq:zmq_send[3]
-linkzmq:zmq_msg_recv[3]
-linkzmq:zmq_socket[7]
-linkzmq:zmq[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/libs/libzmq/doc/zmq_msg_set.txt b/libs/libzmq/doc/zmq_msg_set.txt
deleted file mode 100644
index 6784478..0000000
--- a/libs/libzmq/doc/zmq_msg_set.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-zmq_msg_set(3)
-==============
-
-
-NAME
-----
-
-zmq_msg_set - set message property
-
-
-SYNOPSIS
---------
-*int zmq_msg_set (zmq_msg_t '*message', int 'property', int 'value');*
-
-
-DESCRIPTION
------------
-The _zmq_msg_set()_ function shall set the property specified by the
-'property' argument to the value of the 'value' argument for the 0MQ
-message fragment pointed to by the 'message' argument.
-
-Currently the _zmq_msg_set()_ function does not support any property names.
-
-
-RETURN VALUE
-------------
-The _zmq_msg_set()_ function shall return zero if successful. Otherwise it
-shall return `-1` and set 'errno' to one of the values defined below.
-
-
-ERRORS
-------
-*EINVAL*::
-The requested property _property_ is unknown.
-
-
-SEE ALSO
---------
-linkzmq:zmq_msg_get[3]
-linkzmq:zmq[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/libs/libzmq/doc/zmq_msg_set_routing_id.txt b/libs/libzmq/doc/zmq_msg_set_routing_id.txt
deleted file mode 100644
index b0f2c3a..0000000
--- a/libs/libzmq/doc/zmq_msg_set_routing_id.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-zmq_msg_set_routing_id(3)
-=========================
-
-
-NAME
-----
-
-zmq_msg_set_routing_id - set routing ID property on message
-
-
-SYNOPSIS
---------
-*int zmq_msg_set_routing_id (zmq_msg_t '*message', uint32_t 'routing_id');*
-
-
-DESCRIPTION
------------
-The _zmq_msg_set_routing_id()_ function sets the 'routing_id' specified, on the
-the message pointed to by the 'message' argument. The 'routing_id' must be
-greater than zero. To get a valid routing ID, you must receive a message
-from a 'ZMQ_SERVER' socket, and use the libzmq:zmq_msg_routing_id method.
-Routing IDs are transient.
-
-
-RETURN VALUE
-------------
-The _zmq_msg_set_routing_id()_ function shall return zero if successful. Otherwise it
-shall return `-1` and set 'errno' to one of the values defined below.
-
-
-ERRORS
-------
-*EINVAL*::
-The provided 'routing_id' is zero.
-
-
-SEE ALSO
---------
-linkzmq:zmq_msg_routing_id[3]
-linkzmq:zmq[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/libs/libzmq/doc/zmq_msg_size.txt b/libs/libzmq/doc/zmq_msg_size.txt
deleted file mode 100644
index bcf898e..0000000
--- a/libs/libzmq/doc/zmq_msg_size.txt
+++ /dev/null
@@ -1,49 +0,0 @@
-zmq_msg_size(3)
-===============
-
-
-NAME
-----
-zmq_msg_size - retrieve message content size in bytes
-
-
-SYNOPSIS
---------
-*size_t zmq_msg_size (zmq_msg_t '*msg');*
-
-
-DESCRIPTION
------------
-The _zmq_msg_size()_ function shall return the size in bytes of the content of
-the message object referenced by 'msg'.
-
-CAUTION: Never access 'zmq_msg_t' members directly, instead always use the
-_zmq_msg_ family of functions.
-
-
-RETURN VALUE
-------------
-Upon successful completion, _zmq_msg_size()_ shall return the size of the
-message content in bytes.
-
-
-ERRORS
-------
-No errors are defined.
-
-
-SEE ALSO
---------
-linkzmq:zmq_msg_data[3]
-linkzmq:zmq_msg_init[3]
-linkzmq:zmq_msg_init_size[3]
-linkzmq:zmq_msg_init_buffer[3]
-linkzmq:zmq_msg_init_data[3]
-linkzmq:zmq_msg_close[3]
-linkzmq:zmq[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/libs/libzmq/doc/zmq_null.txt b/libs/libzmq/doc/zmq_null.txt
deleted file mode 100644
index abb9fff..0000000
--- a/libs/libzmq/doc/zmq_null.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-zmq_null(7)
-===========
-
-
-NAME
-----
-zmq_null - no security or confidentiality
-
-
-SYNOPSIS
---------
-The NULL mechanism is defined by the ZMTP 3.0 specification: 
-<http://rfc.zeromq.org/spec:23>. This is the default security mechanism
-for ZeroMQ sockets.
-
-
-SEE ALSO
---------
-linkzmq:zmq_plain[7]
-linkzmq:zmq_curve[7]
-linkzmq:zmq[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/libs/libzmq/doc/zmq_pgm.txt b/libs/libzmq/doc/zmq_pgm.txt
deleted file mode 100644
index 4233af4..0000000
--- a/libs/libzmq/doc/zmq_pgm.txt
+++ /dev/null
@@ -1,188 +0,0 @@
-zmq_pgm(7)
-==========
-
-
-NAME
-----
-zmq_pgm - 0MQ reliable multicast transport using PGM
-
-
-SYNOPSIS
---------
-PGM (Pragmatic General Multicast) is a protocol for reliable multicast
-transport of data over IP networks.
-
-
-DESCRIPTION
------------
-0MQ implements two variants of PGM, the standard protocol where PGM datagrams
-are layered directly on top of IP datagrams as defined by RFC 3208 (the 'pgm'
-transport) and "Encapsulated PGM" or EPGM where PGM datagrams are encapsulated
-inside UDP datagrams (the 'epgm' transport).
-
-The 'pgm' and 'epgm' transports can only be used with the 'ZMQ_PUB' and
-'ZMQ_SUB' socket types.
-
-Further, PGM sockets are rate limited by default. For details, refer to the
-'ZMQ_RATE', and 'ZMQ_RECOVERY_IVL' options documented in
-linkzmq:zmq_setsockopt[3].
-
-CAUTION: The 'pgm' transport implementation requires access to raw IP sockets.
-Additional privileges may be required on some operating systems for this
-operation. Applications not requiring direct interoperability with other PGM
-implementations are encouraged to use the 'epgm' transport instead which does
-not require any special privileges.
-
-
-ADDRESSING
-----------
-A 0MQ endpoint is a string consisting of a 'transport'`://` followed by an
-'address'. The 'transport' specifies the underlying protocol to use. The
-'address' specifies the transport-specific address to connect to.
-
-For the PGM transport, the transport is `pgm`, and for the EPGM protocol the
-transport is `epgm`. The meaning of the 'address' part is defined below.
-
-
-Connecting a socket
-~~~~~~~~~~~~~~~~~~~
-When connecting a socket to a peer address using _zmq_connect()_ with the 'pgm'
-or 'epgm' transport, the 'endpoint' shall be interpreted as an 'interface'
-followed by a semicolon, followed by a 'multicast address', followed by a colon
-and a port number.
-
-An 'interface' may be specified by either of the following:
-
-* The interface name as defined by the operating system.
-* The primary IPv4 address assigned to the interface, in its numeric
-  representation.
-
-NOTE: Interface names are not standardised in any way and should be assumed to
-be arbitrary and platform dependent. On Win32 platforms no short interface
-names exist, thus only the primary IPv4 address may be used to specify an
-'interface'. The 'interface' part can be omitted, in that case the default one
-will be selected.
-
-A 'multicast address' is specified by an IPv4 multicast address in its numeric
-representation.
-
-
-WIRE FORMAT
------------
-Consecutive PGM datagrams are interpreted by 0MQ as a single continuous stream
-of data where 0MQ messages are not necessarily aligned with PGM datagram
-boundaries and a single 0MQ message may span several PGM datagrams. This stream
-of data consists of 0MQ messages encapsulated in 'frames' as described in
-linkzmq:zmq_tcp[7].
-
-
-PGM datagram payload
-~~~~~~~~~~~~~~~~~~~~
-The following ABNF grammar represents the payload of a single PGM datagram as
-used by 0MQ:
-
-....
-datagram               = (offset data)
-offset                 = 2OCTET
-data                   = *OCTET
-....
-
-In order for late joining consumers to be able to identify message boundaries,
-each PGM datagram payload starts with a 16-bit unsigned integer in network byte
-order specifying either the offset of the first message 'frame' in the datagram
-or containing the value `0xFFFF` if the datagram contains solely an
-intermediate part of a larger message.
-
-Note that offset specifies where the first message begins rather than the first
-message part. Thus, if there are trailing message parts at the beginning of
-the packet the offset ignores them and points to first initial message part
-in the packet.
-
-The following diagram illustrates the layout of a single PGM datagram payload:
-
-....
-+------------------+----------------------+
-| offset (16 bits) |         data         |
-+------------------+----------------------+
-....
-
-The following diagram further illustrates how three example 0MQ frames are laid
-out in consecutive PGM datagram payloads:
-
-....
-First datagram payload
-+--------------+-------------+---------------------+
-| Frame offset |   Frame 1   |   Frame 2, part 1   |
-|    0x0000    | (Message 1) | (Message 2, part 1) |
-+--------------+-------------+---------------------+
-
-Second datagram payload
-+--------------+---------------------+
-| Frame offset |   Frame 2, part 2   |
-| 0xFFFF       | (Message 2, part 2) |
-+--------------+---------------------+
-
-Third datagram payload
-+--------------+----------------------------+-------------+
-| Frame offset |   Frame 2, final 8 bytes   |   Frame 3   |
-| 0x0008       | (Message 2, final 8 bytes) | (Message 3) |
-+--------------+----------------------------+-------------+
-....
-
-
-CONFIGURATION
--------------
-
-The PGM is protocol is capable of multicasting data at high rates (500Mbps+)
-with large messages (1MB+), however it requires setting the relevant ZMQ socket
-options that are documented in linkzmq:zmq_setsockopt[3]:
-
-* The 'ZMQ_RATE' should be set sufficiently high, e.g. 1Gbps
-* The 'ZMQ_RCVBUF' should be increased on the subscriber, e.g. 4MB
-* The 'ZMQ_SNDBUF' should be increased on the publisher, e.g. 4MB
-
-It's important to note that the 'ZMQ_RCVBUF' and 'ZMQ_SNDBUF' options are
-limited by the underlying host OS tx/rx buffer size limit. On linux, these can
-be increased for the current session with the following commands:
-
-....
-# set tx/rx buffers to 4MB (default can also be read as the initial buffer size)
-sudo sysctl -w net.core.rmem_max=4194304
-sudo sysctl -w net.core.wmem_max=4194304
-sudo sysctl -w net.core.rmem_default=4194304
-sudo sysctl -w net.core.wmem_default=4194304
-....
-
-
-EXAMPLE
--------
-.Connecting a socket
-----
-//  Connecting to the multicast address 239.192.1.1, port 5555,
-//  using the first Ethernet network interface on Linux
-//  and the Encapsulated PGM protocol
-rc = zmq_connect(socket, "epgm://eth0;239.192.1.1:5555");
-assert (rc == 0);
-//  Connecting to the multicast address 239.192.1.1, port 5555,
-//  using the network interface with the address 192.168.1.1
-//  and the standard PGM protocol
-rc = zmq_connect(socket, "pgm://192.168.1.1;239.192.1.1:5555");
-assert (rc == 0);
-----
-
-
-SEE ALSO
---------
-linkzmq:zmq_connect[3]
-linkzmq:zmq_setsockopt[3]
-linkzmq:zmq_tcp[7]
-linkzmq:zmq_ipc[7]
-linkzmq:zmq_inproc[7]
-linkzmq:zmq_vmci[7]
-linkzmq:zmq[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/libs/libzmq/doc/zmq_plain.txt b/libs/libzmq/doc/zmq_plain.txt
deleted file mode 100644
index 7dd40dc..0000000
--- a/libs/libzmq/doc/zmq_plain.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-zmq_plain(7)
-============
-
-
-NAME
-----
-zmq_plain - clear-text authentication
-
-
-SYNOPSIS
---------
-The PLAIN mechanism defines a simple username/password mechanism that 
-lets a server authenticate a client. PLAIN makes no attempt at security 
-or confidentiality. It is intended for use on internal networks where 
-security requirements are low. The PLAIN mechanism is defined by this 
-document: <http://rfc.zeromq.org/spec:24>.
-
-
-USAGE
------
-To use PLAIN, the server shall set the ZMQ_PLAIN_SERVER option, and the 
-client shall set the ZMQ_PLAIN_USERNAME and ZMQ_PLAIN_PASSWORD socket 
-options. Which peer binds, and which connects, is not relevant.
-
-
-SEE ALSO
---------
-linkzmq:zmq_setsockopt[3]
-linkzmq:zmq_null[7]
-linkzmq:zmq_curve[7]
-linkzmq:zmq[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/libs/libzmq/doc/zmq_poll.txt b/libs/libzmq/doc/zmq_poll.txt
deleted file mode 100644
index ec2e327..0000000
--- a/libs/libzmq/doc/zmq_poll.txt
+++ /dev/null
@@ -1,145 +0,0 @@
-zmq_poll(3)
-===========
-
-
-NAME
-----
-zmq_poll - input/output multiplexing
-
-
-SYNOPSIS
---------
-
-*int zmq_poll (zmq_pollitem_t '*items', int 'nitems', long 'timeout');*
-
-
-DESCRIPTION
------------
-The _zmq_poll()_ function provides a mechanism for applications to multiplex
-input/output events in a level-triggered fashion over a set of sockets. Each
-member of the array pointed to by the 'items' argument is a *zmq_pollitem_t*
-structure. The 'nitems' argument specifies the number of items in the 'items'
-array. The *zmq_pollitem_t* structure is defined as follows:
-
-["literal", subs="quotes"]
-typedef struct
-{
-    void '*socket';
-    zmq_fd_t 'fd';
-    short 'events';
-    short 'revents';
-} zmq_pollitem_t;
-
-For each *zmq_pollitem_t* item, _zmq_poll()_ shall examine either the 0MQ
-socket referenced by 'socket' *or* the standard socket specified by the file
-descriptor 'fd', for the event(s) specified in 'events'. If both 'socket' and
-'fd' are set in a single *zmq_pollitem_t*, the 0MQ socket referenced by
-'socket' shall take precedence and the value of 'fd' shall be ignored.
-
-For each *zmq_pollitem_t* item, _zmq_poll()_ shall first clear the 'revents'
-member, and then indicate any requested events that have occurred by setting the
-bit corresponding to the event condition in the 'revents' member.
-
-If none of the requested events have occurred on any *zmq_pollitem_t* item,
-_zmq_poll()_ shall wait 'timeout' milliseconds for an event to occur on
-any of the requested items. If the value of 'timeout' is `0`, _zmq_poll()_
-shall return immediately. If the value of 'timeout' is `-1`, _zmq_poll()_ shall
-block indefinitely until a requested event has occurred on at least one
-*zmq_pollitem_t*.
-
-The 'events' and 'revents' members of *zmq_pollitem_t* are bit masks constructed
-by OR'ing a combination of the following event flags:
-
-*ZMQ_POLLIN*::
-For 0MQ sockets, at least one message may be received from the 'socket' without
-blocking. For standard sockets this is equivalent to the 'POLLIN' flag of the
-_poll()_ system call and generally means that at least one byte of data may be
-read from 'fd' without blocking.
-
-*ZMQ_POLLOUT*::
-For 0MQ sockets, at least one message may be sent to the 'socket' without
-blocking. For standard sockets this is equivalent to the 'POLLOUT' flag of the
-_poll()_ system call and generally means that at least one byte of data may be
-written to 'fd' without blocking.
-
-*ZMQ_POLLERR*::
-For standard sockets, this flag is passed through _zmq_poll()_ to the
-underlying _poll()_ system call and generally means that some sort of error
-condition is present on the socket specified by 'fd'. For 0MQ sockets this flag
-has no effect if set in 'events', and shall never be returned in 'revents' by
-_zmq_poll()_.
-
-*ZMQ_POLLPRI*::
-For 0MQ sockets this flags is of no use. For standard sockets this means there
-is urgent data to read. Refer to the POLLPRI flag for more information.
-For file descriptor, refer to your use case: as an example, GPIO interrupts
-are signaled through a POLLPRI event.
-This flag has no effect on Windows.
-
-NOTE: The _zmq_poll()_ function may be implemented or emulated using operating
-system interfaces other than _poll()_, and as such may be subject to the limits
-of those interfaces in ways not defined in this documentation.
-
-THREAD SAFETY
--------------
-The *zmq_pollitem_t* array must only be used by the thread which 
-will/is calling _zmq_poll_.
-
-If a socket is contained in multiple *zmq_pollitem_t* arrays, each owned by a
-different thread, the socket itself needs to be thread-safe (Server, Client, ...).
-Otherwise, behaviour is undefined.
-
-
-RETURN VALUE
-------------
-Upon successful completion, the _zmq_poll()_ function shall return the number
-of *zmq_pollitem_t* structures with events signaled in 'revents' or `0` if no
-events have been signaled. Upon failure, _zmq_poll()_ shall return `-1` and set
-'errno' to one of the values defined below.
-
-
-ERRORS
-------
-*ETERM*::
-At least one of the members of the 'items' array refers to a 'socket' whose
-associated 0MQ 'context' was terminated.
-*EFAULT*::
-The provided 'items' was not valid (NULL).
-*EINTR*::
-The operation was interrupted by delivery of a signal before any events were
-available.
-
-
-EXAMPLE
--------
-.Polling indefinitely for input events on both a 0MQ socket and a standard socket.
-----
-zmq_pollitem_t items [2];
-/* First item refers to 0MQ socket 'socket' */
-items[0].socket = socket;
-items[0].events = ZMQ_POLLIN;
-/* Second item refers to standard socket 'fd' */
-items[1].socket = NULL;
-items[1].fd = fd;
-items[1].events = ZMQ_POLLIN;
-/* Poll for events indefinitely */
-int rc = zmq_poll (items, 2, -1);
-assert (rc >= 0);
-/* Returned events will be stored in items[].revents */
-----
-
-
-SEE ALSO
---------
-linkzmq:zmq_socket[3]
-linkzmq:zmq_send[3]
-linkzmq:zmq_recv[3]
-linkzmq:zmq[7]
-
-Your operating system documentation for the _poll()_ system call.
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/libs/libzmq/doc/zmq_poller.txt b/libs/libzmq/doc/zmq_poller.txt
deleted file mode 100644
index 89f4351..0000000
--- a/libs/libzmq/doc/zmq_poller.txt
+++ /dev/null
@@ -1,334 +0,0 @@
-zmq_poller(3)
-===========
-
-
-NAME
-----
-zmq_poller - input/output multiplexing
-
-
-SYNOPSIS
---------
-
-*void *zmq_poller_new (void);*
-
-*int zmq_poller_destroy (void '****poller_p');*
-
-*int zmq_poller_size (void '*poller');*
-
-*int zmq_poller_add (void '*poller', void '*socket', void '*user_data', short 'events');*
-
-*int zmq_poller_modify (void '*poller', void '*socket', short 'events');*
-
-*int zmq_poller_remove (void '*poller', void '*socket');*
-
-*int zmq_poller_add_fd (void '*poller', int 'fd', void '*user_data', short 'events');*
-
-*int zmq_poller_modify_fd (void '*poller', int 'fd', short 'events');*
-
-*int zmq_poller_remove_fd (void '*poller', int 'fd');*
-
-*int zmq_poller_wait (void '*poller',
-                          zmq_poller_event_t '*event',
-                          long 'timeout');*
-
-*int zmq_poller_wait_all (void '*poller',
-                          zmq_poller_event_t '*events',
-                          int 'n_events',
-                          long 'timeout');*
-
-*int zmq_poller_fd (void '*poller', zmq_fd_t '*fd');*
-
-DESCRIPTION
------------
-The _zmq_poller_*_ functions provide a mechanism for applications to multiplex
-input/output events in a level-triggered fashion over a set of sockets.
-
-_zmq_poller_new_ and _zmq_poller_destroy_ manage the lifetime of a poller
-instance. _zmq_poller_new_ creates and returns a new poller instance, while
-_zmq_poller_destroy_ destroys it. A pointer to a valid poller must be passed
-as the _poller_p_ argument of _zmq_poller_destroy_. In particular,
-_zmq_poller_destroy_ may not be called multiple times for the same poller
-instance. _zmq_poller_destroy_ sets the passed pointer to NULL in case of a
-successful execution. _zmq_poller_destroy_ implicitly unregisters all
-registered sockets and file descriptors.
-
-_zmq_poller_size_ queries the number of sockets or file descriptors registered
-with a poller. The initial size of a poller is 0, a successful add operation
-increases the size by 1 and a successful remove operation decreases the size
-by 1. The size is unaffected by the events specified.
-
-_zmq_poller_add_, _zmq_poller_modify_ and _zmq_poller_remove_ manage the 0MQ
-sockets registered with a poller.
-
-_zmq_poller_add_ registers a new _socket_ with a given _poller_. Both _poller_
-and _socket_ must point to valid 0MQ objects. The _events_ parameter specifies
-which event types the client wants to subscribe to. It is legal to specify no
-events (i.e. 0), and activate them later with _zmq_poller_modify_.
-In addition, _user_data_ may be specified, which is not used by the poller, but
-passed back to the caller when an event was signalled in a call to
-_zmq_poller_wait_ or _zmq_poller_wait_all_. _user_data_ may be NULL. If it is
-not NULL, it must be a valid pointer. Otherwise, behaviour is undefined.
-You must only add a socket to a single poller instance once (unless 
-_zmq_poller_remove_ has been called for that socket before). You may
-add a socket to multiple poller instances, if the socket itself
-is explicitly thread-safe (Server, Client, ...). If the socket is not,
-you may invoke undefined behavior.
-
-_zmq_poller_modify_ modifies the subscribed events for a socket. It is
-legal to specify no events (i.e. 0) to disable events temporarily, and
-reactivate them later with another call to _zmq_poller_modify_.
-
-_zmq_poller_remove_ removes a socket registration completely.
-_zmq_poller_remove_ must be called before a socket is closed with _zmq_close_.
-
-Note that it is not necessary to call _zmq_poller_remove_ for any socket
-before calling _zmq_poller_destroy_.
-
-Also note that calling _zmq_poller_remove_ is not equivalent to calling
-_zmq_poller_modify_ with no events. _zmq_poller_modify_ does not free resources
-associated with the socket registration, and requires that the _socket_
-remains valid.
-
-_zmq_poller_add_fd_, _zmq_poller_modify_fd_ and _zmq_poller_remove_fd_ are
-analogous to the previous functions but manage regular file descriptors
-registered with a poller. On Windows, these functions can only be used with
-WinSock sockets.
-
-In the following, 0MQ sockets added with _zmq_poller_add_ and file descriptors
-added with _zmq_poller_add_fd_ are referred to as 'registered objects'.
-
-The *zmq_poller_event_t* structure is defined as follows:
-
-["literal", subs="quotes"]
-typedef struct
-{
-    void *socket;
-    zmq_fd_t fd;
-    void *user_data;
-    short events;
-} zmq_poller_event_t;
-
-For each registered object, _zmq_poller_wait_all()_ shall examine the
-registered objects for the event(s) currently registered.
-
-If none of the registered events have occurred, _zmq_poller_wait_all_ shall 
-wait 'timeout' milliseconds for an event to occur on any of the registered 
-objects. If the value of 'timeout' is `0`, _zmq_poller_wait_all_ shall 
-return immediately. If the value of 'timeout' is `-1`, _zmq_poller_wait_all_ 
-shall block indefinitely until one event has occurred on any of the 
-registered objects.
-
-The 'events' argument _zmq_poller_wait_all_ must be a pointer to an array of
-at least 'n_events' elements. Behaviour is undefined if 'events' does not point
-to an array of at least 'n_events' elements.
-
-_zmq_poller_wait_all_ returns at most 'n_events' events. If more than
-'n_events' events were signalled, only an unspecified subset of the signalled 
-events is returned through 'events'. 
-
-A caller is advised to ensure that 'n_events' is equal to the number of 
-registered objects. Otherwise, a livelock situation may result: If more than 
-'n_events' registered objects have an active event on each call to 
-_zmq_poller_wait_all_, it might happen that the same subset of registered 
-objects is always returned, and the caller never notices the events on the 
-others. The number of objects registered can be queried with
-_zmq_poller_size_.
-
-_zmq_poller_wait_all_ returns the number of valid elements. The valid elements
-are placed in positions '0' to 'n_events - 1' in the 'events' array. All
-members of a valid element are set to valid values by _zmq_poller_wait_all_.
-For socket events 'socket' is non-null and 'fd' is an operating system
-specific value for an invalid socket (-1 or INVALID_SOCKET). For fd events
-'socket' is NULL and 'fd' is a valid file descriptor.
-The client does therefore not need to initialize the contents of the events
-array before a call to _zmq_poller_wait_all_. It is unspecified whether the
-the remaining elements of 'events' are written to by _zmq_poller_wait_all_.
-
-_zmq_poller_fd_ queries the file descriptor associated with the zmq_poller,
-and stores it in the address pointer to by 'fd'.
-The zmq_poller is only guaranteed to have a file descriptor if
-at least one thread-safe socket is currently registered.
-
-Note that closing a socket that is registered in a poller leads to undefined
-behavior. The socket must be unregistered first.
-
-EVENT TYPES
------------
-
-The 'events' parameter of _zmq_poller_add_ and _zmq_poller_modify_, and the
-'events' member of the zmq_poller_event_t structure are bit masks constructed
-by OR'ing a combination of the following event flags:
-
-*ZMQ_POLLIN*::
-For 0MQ sockets, at least one message may be received from the 'socket' without
-blocking. For standard sockets this is equivalent to the 'POLLIN' flag of the
-_poll()_ system call and generally means that at least one byte of data may be
-read from 'fd' without blocking.
-
-*ZMQ_POLLOUT*::
-For 0MQ sockets, at least one message may be sent to the 'socket' without
-blocking. For standard sockets this is equivalent to the 'POLLOUT' flag of the
-_poll()_ system call and generally means that at least one byte of data may be
-written to 'fd' without blocking.
-
-*ZMQ_POLLERR*::
-For 0MQ sockets this flag has no effect on the _zmq_poller_add_ and
-_zmq_poller_modify_ functions, and is never set in the
-'events' member of the zmq_poller_event_t structure.
-For standard sockets, this flag is passed through _zmq_poller_wait_all_ to the
-underlying _poll()_ system call and generally means that some sort of error
-condition is present on the socket specified by 'fd'.
-
-*ZMQ_POLLPRI*::
-For 0MQ sockets this flag has no effect on the _zmq_poller_add_ and
-_zmq_poller_modify_ functions, and is never set in the
-'events' member of the zmq_poller_event_t structure.
-For standard sockets this means there
-is urgent data to read. Refer to the POLLPRI flag for more information.
-For a file descriptor, refer to your OS documentation: as an example, GPIO
-interrupts are signaled through a POLLPRI event.
-This flag has no effect on Windows.
-
-NOTE: The _zmq_poller_*_ functions may be implemented or emulated using operating
-system interfaces other than _poll()_, and as such may be subject to the limits
-of those interfaces in ways not defined in this documentation.
-
-THREAD SAFETY
--------------
-Like most other 0MQ objects, a poller is not thread-safe. All operations must
-be called from the same thread. Otherwise, behaviour is undefined.
-
-In addition to that, if you want to add a socket to multiple existing poller
-instances, the socket itself needs to be thread-safe (Server, Client, ...).
-Otherwise, behaviour is undefined. 
-
-RETURN VALUE
-------------
-_zmq_poller_new_ returns a valid pointer to a poller, or NULL in case of a failure.
-
-All functions that return an int, return -1 in case of a failure. In that case,
-zmq_errno() can be used to query the type of the error as described below.
-
-_zmq_poller_wait_all_ returns the number of events signalled and returned in 
-the events array. It never returns 0.
-
-All other functions return 0 in case of a successful execution.
-
-ERRORS
-------
-On _zmq_poller_new_:
-
-*ENOMEM*::
-A new poller could not be allocated successfully.
-
-On _zmq_poller_destroy_:
-
-*EFAULT*::
-_poller_p_ did not point to a valid poller. Note that passing an invalid pointer (e.g.
-pointer to deallocated memory) may cause undefined behaviour (e.g. an access violation).
-
-On _zmq_poller_size_:
-
-*EFAULT*::
-_poller_ did not point to a valid poller. Note that passing an
-invalid pointer (e.g. pointer to deallocated memory) may cause undefined
-behaviour (e.g. an access violation).
-
-On _zmq_poller_add_, _zmq_poller_modify_ and _zmq_poller_remove_:
-
-*EFAULT*::
-_poller_ did not point to a valid poller. Note that passing an
-invalid pointer (e.g. pointer to deallocated memory) may cause undefined
-behaviour (e.g. an access violation).
-*ENOTSOCK*::
-_socket_ did not point to a valid socket. Note that passing an
-invalid pointer (e.g. pointer to deallocated memory) may cause undefined
-behaviour (e.g. an access violation).
-
-On _zmq_poller_add_:
-
-*EMFILE*::
-TODO
-
-On _zmq_poller_add_ or _zmq_poller_add_fd_:
-
-*ENOMEM*::
-Necessary resources could not be allocated.
-*EINVAL*::
-_socket_ resp. _fd_ was already registered with the poller.
-
-On _zmq_poller_modify_, _zmq_poller_modify_fd_, _zmq_poller_remove_ or
-_zmq_poller_remove_fd_:
-
-*EINVAL*::
-_socket_ resp. _fd_ was not registered with the poller.
-
-On _zmq_poller_add_fd_, _zmq_poller_modify_fd_ and _zmq_poller_remove_fd_:
-
-*EBADF*::
-The _fd_ specified was the retired fd.
-
-On _zmq_poller_wait_ and _zmq_poller_wait_all_:
-
-*ENOMEM*::
-Necessary resources could not be allocated.
-*ETERM*::
-At least one of the registered objects is a 'socket' whose associated 0MQ 
-'context' was terminated.
-*EFAULT*::
-The provided 'events' was NULL, or 'poller' did not point to a valid poller,
-or there are no registered objects or all event subscriptions are disabled
-and 'timeout' was negative.
-*EINTR*::
-The operation was interrupted by delivery of a signal before any events were
-available.
-*EAGAIN*::
-No registered event was signalled before the timeout was reached.
-
-On _zmq_poller_fd_:
-
-*EINVAL*::
-The poller has no associated file descriptor.
-*EFAULT*::
-The provided 'poller' did not point to a valid poller.
-
-EXAMPLE
--------
-.Polling indefinitely for input events on both a 0MQ socket and a standard socket.
-----
-void *poller = zmq_poller_new ();
-
-/* First item refers to 0MQ socket 'socket' */
-zmq_poller_add (poller, socket, NULL, ZMQ_POLLIN);
-/* Second item refers to standard socket 'fd' */
-zmq_poller_add_fd (poller, fd, NULL, ZMQ_POLLIN);
-
-zmq_poller_event_t events [2];
-/* Poll for events indefinitely */
-int rc = zmq_poller_wait_all (poller, events, 2, -1);
-assert (rc >= 0);
-/* Returned events will be stored in 'events' */
-for (int i = 0; i < 2; ++i) {
-    if (events[i].socket == socket && events[i].events & ZMQ_POLLIN) {
-        // ...
-    } else if (events[i].fd == fd && events[i].events & ZMQ_POLLIN)) {
-        // ...
-    }
-}
-zmq_poller_destroy (&poller);
-----
-
-
-SEE ALSO
---------
-linkzmq:zmq_socket[3]
-linkzmq:zmq_send[3]
-linkzmq:zmq_recv[3]
-linkzmq:zmq[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/libs/libzmq/doc/zmq_ppoll.txt b/libs/libzmq/doc/zmq_ppoll.txt
deleted file mode 100644
index 9f9a93f..0000000
--- a/libs/libzmq/doc/zmq_ppoll.txt
+++ /dev/null
@@ -1,140 +0,0 @@
-zmq_poll(3)
-===========
-
-
-NAME
-----
-zmq_ppoll - input/output multiplexing with signal mask
-
-
-SYNOPSIS
---------
-
-*int zmq_ppoll (zmq_pollitem_t '*items', int 'nitems', long 'timeout', const sigset_t '*sigmask');*
-
-
-DESCRIPTION
------------
-The relationship between _zmq_poll()_ and _zmq_ppoll()_ is analogous to the
-relationship between poll(2) and ppoll(2) and between select(2) and
-pselect(2): _zmq_ppoll()_ allows an application to safely wait until either a
-file descriptor becomes ready or until a signal is caught.
-
-When using _zmq_ppoll()_ with 'sigmask' set to NULL, its behavior is identical
-to that of _zmq_poll()_. See linkzmq:zmq_poll[3] for more on this.
-
-To make full use of _zmq_ppoll()_, a non-NULL pointer to a signal mask must be
-constructed and passed to 'sigmask'. See sigprocmask(2) for more details. When
-this is done, inside the actual _ppoll()_ (or _pselect()_, see note below)
-system call, an atomic operation consisting of three steps is performed:
-  1. The current signal mask is replaced by the one pointed to by 'sigmask'.
-  2. The actual _poll()_ call is done.
-  3. The original signal mask is restored.
-Because these operations are done atomically, there is no opportunity for race
-conditions in between the calls changing the signal mask and the poll/select
-system call. This means that only during this (atomic) call, we can unblock
-certain signals, so that they can be handled *at that time only*, not outside
-of the call. This means that effectively, we extend our poller into a function
-that not only watches sockets for changes, but also watches the "POSIX signal
-socket" for incoming signals. At other times, these signals will be blocked,
-and we will not have to deal with interruptions in system calls at these other
-times.
-
-NOTE: The _zmq_ppoll()_ function may be implemented or emulated using operating
-system interfaces other than _ppoll()_, and as such may be subject to the
-limits of those interfaces in ways not defined in this documentation.
-
-NOTE: There is no _ppoll_ or _pselect_ on Windows, so _zmq_ppoll()_ is not
-supported in Windows builds. It is still callable, but its 'sigmask' has void
-pointer type (because 'sigset_t' is also not available on Windows) and
-_zmq_ppoll()_ will return with an error (see error section below).
-
-THREAD SAFETY
--------------
-The *zmq_pollitem_t* array must only be used by the thread which
-will/is calling _zmq_ppoll_.
-
-If a socket is contained in multiple *zmq_pollitem_t* arrays, each owned by a
-different thread, the socket itself needs to be thead-safe (Server, Client, ...).
-Otherwise, behaviour is undefined.
-
-
-RETURN VALUE
-------------
-Upon successful completion, the _zmq_ppoll()_ function shall return the number
-of *zmq_pollitem_t* structures with events signaled in 'revents' or `0` if no
-events have been signaled. Upon failure, _zmq_ppoll()_ shall return `-1` and set
-'errno' to one of the values defined below.
-
-
-ERRORS
-------
-*ETERM*::
-At least one of the members of the 'items' array refers to a 'socket' whose
-associated 0MQ 'context' was terminated.
-*EFAULT*::
-The provided 'items' was not valid (NULL).
-*EINTR*::
-The operation was interrupted by delivery of a signal before any events were
-available.
-*EINTR*::
-The operation was interrupted by delivery of a signal before any events were
-available.
-*ENOTSUP*::
-_zmq_ppoll()_ was not activated in this build.
-
-
-EXAMPLE
--------
-.Polling indefinitely for input events on both a 0MQ socket and a standard socket.
-See the _example section_ of linkzmq:zmq_poll[3]. One only needs to replace
-the _zmq_poll_ call with _zmq_ppoll_ and add a _NULL_ argument for the 'sigmask'
-parameter.
-
-.Handle SIGTERM during _zmq_ppoll_ (and block it otherwise).
-----
-// simple global signal handler for SIGTERM
-static bool sigterm_received = false;
-void handle_sigterm (int signum) {
-    sigterm_received = true;
-}
-
-// set up signal mask and install handler for SIGTERM
-sigset_t sigmask, sigmask_without_sigterm;
-sigemptyset(&sigmask);
-sigaddset(&sigmask, SIGTERM);
-sigprocmask(SIG_BLOCK, &sigmask, &sigmask_without_sigterm);
-struct sigaction sa;
-memset(&sa, '\0', sizeof(sa));
-sa.sa_handler = handle_sigterm;
-
-// poll
-zmq_pollitem_t items [1];
-// Just one item, which refers to 0MQ socket 'socket' */
-items[0].socket = socket;
-items[0].events = ZMQ_POLLIN;
-// Poll for events indefinitely, but also exit on SIGTERM
-int rc = zmq_poll (items, 2, -1, &sigmask_without_sigterm);
-if (rc < 0 && errno == EINTR && sigterm_received) {
-  // do your SIGTERM business
-} else {
-  // do your non-SIGTERM error handling
-}
-----
-
-
-SEE ALSO
---------
-linkzmq:zmq_poll[3]
-linkzmq:zmq_socket[3]
-linkzmq:zmq_send[3]
-linkzmq:zmq_recv[3]
-linkzmq:zmq[7]
-
-Your operating system documentation for the _poll()_ system call.
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/libs/libzmq/doc/zmq_proxy.txt b/libs/libzmq/doc/zmq_proxy.txt
deleted file mode 100644
index c11977e..0000000
--- a/libs/libzmq/doc/zmq_proxy.txt
+++ /dev/null
@@ -1,99 +0,0 @@
-zmq_proxy(3)
-============
-
-NAME
-----
-zmq_proxy - start built-in 0MQ proxy
-
-
-SYNOPSIS
---------
-*int zmq_proxy (void '*frontend', void '*backend', void '*capture');*
-
-
-DESCRIPTION
------------
-The _zmq_proxy()_ function starts the built-in 0MQ proxy in the current
-application thread.
-
-The proxy connects a frontend socket to a backend socket. Conceptually, data
-flows from frontend to backend. Depending on the socket types, replies may flow
-in the opposite direction. The direction is conceptual only; the proxy is fully
-symmetric and there is no technical difference between frontend and backend.
-
-Before calling _zmq_proxy()_ you must set any socket options, and connect or
-bind both frontend and backend sockets. The two conventional proxy models are:
-
-_zmq_proxy()_ runs in the current thread and returns only if/when the current
-context is closed.
-
-If the capture socket is not NULL, the proxy shall send all messages, received
-on both frontend and backend, to the capture socket. The capture socket should
-be a 'ZMQ_PUB', 'ZMQ_DEALER', 'ZMQ_PUSH', or 'ZMQ_PAIR' socket.
-
-Refer to linkzmq:zmq_socket[3] for a description of the available socket types.
-
-EXAMPLE USAGE
--------------
-
-Shared Queue
-~~~~~~~~~~~~
-
-When the frontend is a ZMQ_ROUTER socket, and the backend is a ZMQ_DEALER
-socket, the proxy shall act as a shared queue that collects requests from a
-set of clients, and distributes these fairly among a set of services.
-Requests shall be fair-queued from frontend connections and distributed evenly
-across backend connections. Replies shall automatically return to the client
-that made the original request.
-
-Forwarder
-~~~~~~~~~
-
-When the frontend is a ZMQ_XSUB socket, and the backend is a ZMQ_XPUB socket,
-the proxy shall act as a message forwarder that collects messages from a set
-of publishers and forwards these to a set of subscribers. This may be used to
-bridge networks transports, e.g. read on tcp:// and forward on pgm://.
-
-Streamer
-~~~~~~~~
-
-When the frontend is a ZMQ_PULL socket, and the backend is a ZMQ_PUSH socket,
-the proxy shall collect tasks from a set of clients and forwards these to a set
-of workers using the pipeline pattern.
-
-RETURN VALUE
-------------
-The _zmq_proxy()_ function always returns `-1` and 'errno' set to *ETERM* or
-*EINTR* (the 0MQ 'context' associated with either of the specified sockets was
-terminated) or *EFAULT* (the provided 'frontend' or 'backend' was invalid).
-
-
-EXAMPLE
--------
-.Creating a shared queue proxy
-----
-//  Create frontend and backend sockets
-void *frontend = zmq_socket (context, ZMQ_ROUTER);
-assert (frontend);
-void *backend = zmq_socket (context, ZMQ_DEALER);
-assert (backend);
-//  Bind both sockets to TCP ports
-assert (zmq_bind (frontend, "tcp://*:5555") == 0);
-assert (zmq_bind (backend, "tcp://*:5556") == 0);
-//  Start the queue proxy, which runs until ETERM
-zmq_proxy (frontend, backend, NULL);
-----
-
-
-SEE ALSO
---------
-linkzmq:zmq_bind[3]
-linkzmq:zmq_connect[3]
-linkzmq:zmq_socket[3]
-linkzmq:zmq[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/libs/libzmq/doc/zmq_proxy_steerable.txt b/libs/libzmq/doc/zmq_proxy_steerable.txt
deleted file mode 100644
index 91bfc44..0000000
--- a/libs/libzmq/doc/zmq_proxy_steerable.txt
+++ /dev/null
@@ -1,126 +0,0 @@
-zmq_proxy_steerable(3)
-======================
-
-NAME
-----
-zmq_proxy_steerable - built-in 0MQ proxy with control flow
-
-
-SYNOPSIS
---------
-*int zmq_proxy_steerable (const void '*frontend', const void '*backend', 
-     const void '*capture', const void '*control');*
-
-
-DESCRIPTION
------------
-The _zmq_proxy_steerable()_ function starts the built-in 0MQ proxy in the 
-current application thread, as _zmq_proxy()_ do. Please, refer to this function
-for the general description and usage. We describe here only the additional 
-control flow provided by the socket passed as the fourth argument "control".
-
-If the control socket is not NULL, the proxy supports control flow. If 
-'PAUSE' is received on this socket, the proxy suspends its activities. If 
-'RESUME' is received, it goes on. If 'TERMINATE' is received, it terminates
-smoothly. If 'STATISTICS' is received, the proxy will reply on the control socket
-sending a multipart message with 8 frames, each with an unsigned integer 64-bit
-wide that provide in the following order:
- - number of messages received by the frontend socket
- - number of bytes received by the frontend socket
- - number of messages sent out the frontend socket
- - number of bytes sent out the frontend socket
- - number of messages received by the backend socket
- - number of bytes received by the backend socket
- - number of messages sent out the backend socket
- - number of bytes sent out the backend socket
-
-At start, the proxy runs normally as if zmq_proxy was used.
-
-If the control socket is NULL, the function behave exactly as if linkzmq:zmq_proxy[3]
-had been called.
-
-
-Refer to linkzmq:zmq_socket[3] for a description of the available socket types.
-Refer to linkzmq:zmq_proxy[3] for a description of the zmq_proxy.
-
-EXAMPLE USAGE
--------------
-cf zmq_proxy
-
-RETURN VALUE
-------------
-The _zmq_proxy_steerable()_ function returns 0 if TERMINATE is sent to its
-control socket. Otherwise, it returns `-1` and 'errno' set to *ETERM* or
-*EINTR* (the 0MQ 'context' associated with either of the specified sockets was
-terminated) or *EFAULT* (the provided 'frontend' or 'backend' was invalid).
-
-
-EXAMPLE
--------
-.Creating a shared queue proxy
-----
-//  Create frontend, backend and control sockets
-void *frontend = zmq_socket (context, ZMQ_ROUTER);
-assert (frontend);
-void *backend = zmq_socket (context, ZMQ_DEALER);
-assert (backend);
-void *control = zmq_socket (context, ZMQ_SUB);
-assert (control);
-
-//  Bind sockets to TCP ports
-assert (zmq_bind (frontend, "tcp://*:5555") == 0);
-assert (zmq_bind (backend, "tcp://*:5556") == 0);
-assert (zmq_connect (control, "tcp://*:5557") == 0);
-
-// Subscribe to the control socket since we have chosen SUB here
-assert (zmq_setsockopt (control, ZMQ_SUBSCRIBE, "", 0));
-
-//  Start the queue proxy, which runs until ETERM or "TERMINATE" 
-//  received on the control socket
-zmq_proxy_steerable (frontend, backend, NULL, control);
-----
-.Set up a controller in another node, process or whatever
-----
-void *control = zmq_socket (context, ZMQ_PUB);
-assert (control);
-assert (zmq_bind (control, "tcp://*:5557") == 0);
-
-// pause the proxy
-assert (zmq_send (control, "PAUSE", 5, 0) == 0);
-
-// resume the proxy
-assert (zmq_send (control, "RESUME", 6, 0) == 0);
-
-// terminate the proxy
-assert (zmq_send (control, "TERMINATE", 9, 0) == 0);
-
-// check statistics
-assert (zmq_send (control, "STATISTICS", 10, 0) == 0);
-zmq_msg_t stats_msg;
-
-while (1) {
-    assert (zmq_msg_init (&stats_msg) == 0);
-    assert (zmq_recvmsg (control, &stats_msg, 0) == sizeof (uint64_t));
-    assert (rc == sizeof (uint64_t));
-    printf ("Stat: %lu\n", *(unsigned long int *)zmq_msg_data (&stats_msg));
-    if (!zmq_msg_get (&stats_msg, ZMQ_MORE))
-        break;
-    assert (zmq_msg_close (&stats_msg) == 0);
-}
-assert (zmq_msg_close (&stats_msg) == 0);
----
-
-
-SEE ALSO
---------
-linkzmq:zmq_proxy[3]
-linkzmq:zmq_bind[3]
-linkzmq:zmq_connect[3]
-linkzmq:zmq_socket[3]
-linkzmq:zmq[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/libs/libzmq/doc/zmq_recv.txt b/libs/libzmq/doc/zmq_recv.txt
deleted file mode 100644
index 03468c1..0000000
--- a/libs/libzmq/doc/zmq_recv.txt
+++ /dev/null
@@ -1,95 +0,0 @@
-zmq_recv(3)
-===========
-
-
-NAME
-----
-zmq_recv - receive a message part from a socket
-
-
-SYNOPSIS
---------
-*int zmq_recv (void '*socket', void '*buf', size_t 'len', int 'flags');*
-
-
-DESCRIPTION
------------
-The _zmq_recv()_ function shall receive a message from the socket referenced
-by the 'socket' argument and store it in the buffer referenced by the 'buf'
-argument. Any bytes exceeding the length specified by the 'len' argument shall
-be truncated. If there are no messages available on the specified 'socket'
-the _zmq_recv()_ function shall block until the request can be satisfied.
-The 'flags' argument is a combination of the flags defined below: The 'buf'
-argument may be null if len is zero.
-
-*ZMQ_DONTWAIT*::
-Specifies that the operation should be performed in non-blocking mode. If there
-are no messages available on the specified 'socket', the _zmq_recv()_
-function shall fail with 'errno' set to EAGAIN.
-
-
-Multi-part messages
-~~~~~~~~~~~~~~~~~~~
-A 0MQ message is composed of 1 or more message parts. 0MQ ensures atomic
-delivery of messages: peers shall receive either all _message parts_ of a
-message or none at all. The total number of message parts is unlimited except
-by available memory.
-
-An application that processes multi-part messages must use the _ZMQ_RCVMORE_
-linkzmq:zmq_getsockopt[3] option after calling _zmq_recv()_ to determine if
-there are further parts to receive.
-
-RETURN VALUE
-------------
-The _zmq_recv()_ function shall return number of bytes in the message
-if successful. Note that the value can exceed the value of the 'len' parameter
-in case the message was truncated. If not successful the function shall return
-`-1` and set 'errno' to one of the values defined below.
-
-
-ERRORS
-------
-*EAGAIN*::
-Either the timeout set via the socket-option ZMQ_RCVTIMEO (see linkzmq:zmq_setsockopt[3])
-has been reached (flag ZMQ_DONTWAIT not set) without being able to read a message
-from the socket or there are no messages available at the moment (flag ZMQ_DONTWAIT set)
-and the operation would block.
-*ENOTSUP*::
-The _zmq_recv()_ operation is not supported by this socket type.
-*EFSM*::
-The _zmq_recv()_ operation cannot be performed on this socket at the moment
-due to the socket not being in the appropriate state.  This error may occur with
-socket types that switch between several states, such as ZMQ_REP.  See the
-_messaging patterns_ section of linkzmq:zmq_socket[3] for more information.
-*ETERM*::
-The 0MQ 'context' associated with the specified 'socket' was terminated.
-*ENOTSOCK*::
-The provided 'socket' was invalid.
-*EINTR*::
-The operation was interrupted by delivery of a signal before a message was
-available.
-
-
-EXAMPLE
--------
-.Receiving a message from a socket
-----
-char buf [256];
-nbytes = zmq_recv (socket, buf, 256, 0);
-assert (nbytes != -1);
-----
-
-
-SEE ALSO
---------
-linkzmq:zmq_send[3]
-linkzmq:zmq_getsockopt[3]
-linkzmq:zmq_setsockopt[3]
-linkzmq:zmq_socket[7]
-linkzmq:zmq[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/libs/libzmq/doc/zmq_recvmsg.txt b/libs/libzmq/doc/zmq_recvmsg.txt
deleted file mode 100644
index adf2d4a..0000000
--- a/libs/libzmq/doc/zmq_recvmsg.txt
+++ /dev/null
@@ -1,125 +0,0 @@
-zmq_recvmsg(3)
-==============
-
-
-NAME
-----
-zmq_recvmsg - receive a message part from a socket
-
-
-SYNOPSIS
---------
-*int zmq_recvmsg (void '*socket', zmq_msg_t '*msg', int 'flags');*
-
-
-DESCRIPTION
------------
-The _zmq_recvmsg()_ function shall receive a message part from the socket
-referenced by the 'socket' argument and store it in the message referenced by
-the 'msg' argument. Any content previously stored in 'msg' shall be properly
-deallocated. If there are no message parts available on the specified 'socket'
-the _zmq_recvmsg()_ function shall block until the request can be satisfied.
-The 'flags' argument is a combination of the flags defined below:
-
-*ZMQ_DONTWAIT*::
-Specifies that the operation should be performed in non-blocking mode. If there
-are no messages available on the specified 'socket', the _zmq_recvmsg()_
-function shall fail with 'errno' set to EAGAIN.
-
-NOTE: this API method is deprecated in favor of zmq_msg_recv(3).
-
-
-Multi-part messages
-~~~~~~~~~~~~~~~~~~~
-A 0MQ message is composed of 1 or more message parts. Each message
-part is an independent 'zmq_msg_t' in its own right. 0MQ ensures atomic
-delivery of messages: peers shall receive either all _message parts_ of a
-message or none at all. The total number of message parts is unlimited except
-by available memory.
-
-An application that processes multi-part messages must use the _ZMQ_RCVMORE_
-linkzmq:zmq_getsockopt[3] option after calling _zmq_recvmsg()_ to determine if
-there are further parts to receive.
-
-
-RETURN VALUE
-------------
-The _zmq_recvmsg()_ function shall return number of bytes in the message
-if successful. Otherwise it shall return `-1` and set 'errno' to one of the
-values defined below.
-
-
-ERRORS
-------
-*EAGAIN*::
-Either the timeout set via the socket-option ZMQ_RCVTIMEO (see linkzmq:zmq_setsockopt[3])
-has been reached (flag ZMQ_DONTWAIT not set) without being able to read a message
-from the socket or there are no messages available at the moment (flag ZMQ_DONTWAIT set)
-and the operation would block.
-*ENOTSUP*::
-The _zmq_recvmsg()_ operation is not supported by this socket type.
-*EFSM*::
-The _zmq_recvmsg()_ operation cannot be performed on this socket at the moment
-due to the socket not being in the appropriate state.  This error may occur with
-socket types that switch between several states, such as ZMQ_REP.  See the
-_messaging patterns_ section of linkzmq:zmq_socket[3] for more information.
-*ETERM*::
-The 0MQ 'context' associated with the specified 'socket' was terminated.
-*ENOTSOCK*::
-The provided 'socket' was invalid.
-*EINTR*::
-The operation was interrupted by delivery of a signal before a message was
-available.
-*EFAULT*::
-The message passed to the function was invalid.
-
-
-EXAMPLE
--------
-.Receiving a message from a socket
-----
-/* Create an empty 0MQ message */
-zmq_msg_t msg;
-int rc = zmq_msg_init (&msg);
-assert (rc == 0);
-/* Block until a message is available to be received from socket */
-rc = zmq_recvmsg (socket, &msg, 0);
-assert (rc != -1);
-/* Release message */
-zmq_msg_close (&msg);
-----
-
-.Receiving a multi-part message
-----
-int more;
-size_t more_size = sizeof (more);
-do {
-    /* Create an empty 0MQ message to hold the message part */
-    zmq_msg_t part;
-    int rc = zmq_msg_init (&part);
-    assert (rc == 0);
-    /* Block until a message is available to be received from socket */
-    rc = zmq_recvmsg (socket, &part, 0);
-    assert (rc != -1);
-    /* Determine if more message parts are to follow */
-    rc = zmq_getsockopt (socket, ZMQ_RCVMORE, &more, &more_size);
-    assert (rc == 0);
-    zmq_msg_close (&part);
-} while (more);
-----
-
-
-SEE ALSO
---------
-linkzmq:zmq_recv[3]
-linkzmq:zmq_send[3]
-linkzmq:zmq_getsockopt[3]
-linkzmq:zmq_setsockopt[3]
-linkzmq:zmq_socket[7]
-linkzmq:zmq[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/libs/libzmq/doc/zmq_send.txt b/libs/libzmq/doc/zmq_send.txt
deleted file mode 100644
index 1d84063..0000000
--- a/libs/libzmq/doc/zmq_send.txt
+++ /dev/null
@@ -1,105 +0,0 @@
-zmq_send(3)
-===========
-
-
-NAME
-----
-zmq_send - send a message part on a socket
-
-
-SYNOPSIS
---------
-*int zmq_send (void '*socket', const void '*buf', size_t 'len', int 'flags');*
-
-
-DESCRIPTION
------------
-The _zmq_send()_ function shall queue a message created from the buffer
-referenced by the 'buf' and 'len' arguments. The 'flags' argument is
-a combination of the flags defined below:
-
-*ZMQ_DONTWAIT*::
-For socket types (DEALER, PUSH) that block (either with ZMQ_IMMEDIATE option set
-and no peer available, or all peers having full high-water mark), specifies that
-the operation should be performed in non-blocking mode. If the message cannot be
-queued on the 'socket', the _zmq_send()_ function shall fail with 'errno' set
-to EAGAIN.
-
-*ZMQ_SNDMORE*::
-Specifies that the message being sent is a multi-part message, and that further
-message parts are to follow. Refer to the section regarding multi-part messages
-below for a detailed description.
-
-NOTE: A successful invocation of _zmq_send()_ does not indicate that the
-message has been transmitted to the network, only that it has been queued on
-the 'socket' and 0MQ has assumed responsibility for the message.
-
-
-Multi-part messages
-~~~~~~~~~~~~~~~~~~~
-A 0MQ message is composed of 1 or more message parts. 0MQ ensures atomic
-delivery of messages: peers shall receive either all _message parts_ of a
-message or none at all. The total number of message parts is unlimited except
-by available memory.
-
-An application that sends multi-part messages must use the _ZMQ_SNDMORE_ flag
-when sending each message part except the final one.
-
-
-RETURN VALUE
-------------
-The _zmq_send()_ function shall return number of bytes in the message
-if successful. Otherwise it shall return `-1` and set 'errno' to one of the
-values defined below.
-
-
-ERRORS
-------
-*EAGAIN*::
-Non-blocking mode was requested and the message cannot be sent at the moment.
-*ENOTSUP*::
-The _zmq_send()_ operation is not supported by this socket type.
-*EINVAL*::
-The sender tried to send multipart data, which the socket type does not allow.
-*EFSM*::
-The _zmq_send()_ operation cannot be performed on this socket at the moment
-due to the socket not being in the appropriate state.  This error may occur with
-socket types that switch between several states, such as ZMQ_REP.  See the
-_messaging patterns_ section of linkzmq:zmq_socket[3] for more information.
-*ETERM*::
-The 0MQ 'context' associated with the specified 'socket' was terminated.
-*ENOTSOCK*::
-The provided 'socket' was invalid.
-*EINTR*::
-The operation was interrupted by delivery of a signal before the message was
-sent.
-*EHOSTUNREACH*::
-The message cannot be routed.
-
-
-EXAMPLE
--------
-.Sending a multi-part message
-----
-/* Send a multi-part message consisting of three parts to socket */
-rc = zmq_send (socket, "ABC", 3, ZMQ_SNDMORE);
-assert (rc == 3);
-rc = zmq_send (socket, "DEFGH", 5, ZMQ_SNDMORE);
-assert (rc == 5);
-/* Final part; no more parts to follow */
-rc = zmq_send (socket, "JK", 2, 0);
-assert (rc == 2);
-----
-
-SEE ALSO
---------
-linkzmq:zmq_send_const[3]
-linkzmq:zmq_recv[3]
-linkzmq:zmq_socket[7]
-linkzmq:zmq[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/libs/libzmq/doc/zmq_send_const.txt b/libs/libzmq/doc/zmq_send_const.txt
deleted file mode 100644
index 2a6efa2..0000000
--- a/libs/libzmq/doc/zmq_send_const.txt
+++ /dev/null
@@ -1,104 +0,0 @@
-zmq_send_const(3)
-=================
-
-
-NAME
-----
-zmq_send_const - send a constant-memory message part on a socket
-
-
-SYNOPSIS
---------
-*int zmq_send_const (void '*socket', const void '*buf', size_t 'len', int 'flags');*
-
-
-DESCRIPTION
------------
-The _zmq_send_const()_ function shall queue a message created from the buffer
-referenced by the 'buf' and 'len' arguments. The message buffer is assumed
-to be constant-memory and will therefore not be copied or deallocated
-in any way. The 'flags' argument is a combination of the flags defined below:
-
-*ZMQ_DONTWAIT*::
-For socket types (DEALER, PUSH) that block (either with ZMQ_IMMEDIATE option set
-and no peer available, or all peers having full high-water mark), specifies that
-the operation should be performed in non-blocking mode. If the message cannot be
-queued on the 'socket', the _zmq_send_const()_ function shall fail with 'errno' set
-to EAGAIN.
-
-*ZMQ_SNDMORE*::
-Specifies that the message being sent is a multi-part message, and that further
-message parts are to follow. Refer to the section regarding multi-part messages
-below for a detailed description.
-
-NOTE: A successful invocation of _zmq_send_const()_ does not indicate that the
-message has been transmitted to the network, only that it has been queued on
-the 'socket' and 0MQ has assumed responsibility for the message.
-
-
-Multi-part messages
-~~~~~~~~~~~~~~~~~~~
-A 0MQ message is composed of 1 or more message parts. 0MQ ensures atomic
-delivery of messages: peers shall receive either all _message parts_ of a
-message or none at all. The total number of message parts is unlimited except
-by available memory.
-
-An application that sends multi-part messages must use the _ZMQ_SNDMORE_ flag
-when sending each message part except the final one.
-
-
-RETURN VALUE
-------------
-The _zmq_send_const()_ function shall return number of bytes in the message
-if successful. Otherwise it shall return `-1` and set 'errno' to one of the
-values defined below.
-
-
-ERRORS
-------
-*EAGAIN*::
-Non-blocking mode was requested and the message cannot be sent at the moment.
-*ENOTSUP*::
-The _zmq_send_const()_ operation is not supported by this socket type.
-*EFSM*::
-The _zmq_send_const()_ operation cannot be performed on this socket at the moment
-due to the socket not being in the appropriate state.  This error may occur with
-socket types that switch between several states, such as ZMQ_REP.  See the
-_messaging patterns_ section of linkzmq:zmq_socket[3] for more information.
-*ETERM*::
-The 0MQ 'context' associated with the specified 'socket' was terminated.
-*ENOTSOCK*::
-The provided 'socket' was invalid.
-*EINTR*::
-The operation was interrupted by delivery of a signal before the message was
-sent.
-*EHOSTUNREACH*::
-The message cannot be routed.
-
-
-EXAMPLE
--------
-.Sending a multi-part message
-----
-/* Send a multi-part message consisting of three parts to socket */
-rc = zmq_send_const (socket, "ABC", 3, ZMQ_SNDMORE);
-assert (rc == 3);
-rc = zmq_send_const (socket, "DEFGH", 5, ZMQ_SNDMORE);
-assert (rc == 5);
-/* Final part; no more parts to follow */
-rc = zmq_send_const (socket, "JK", 2, 0);
-assert (rc == 2);
-----
-
-SEE ALSO
---------
-linkzmq:zmq_send[3]
-linkzmq:zmq_recv[3]
-linkzmq:zmq_socket[7]
-linkzmq:zmq[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/libs/libzmq/doc/zmq_sendmsg.txt b/libs/libzmq/doc/zmq_sendmsg.txt
deleted file mode 100644
index 5265246..0000000
--- a/libs/libzmq/doc/zmq_sendmsg.txt
+++ /dev/null
@@ -1,122 +0,0 @@
-zmq_sendmsg(3)
-==============
-
-
-NAME
-----
-zmq_sendmsg - send a message part on a socket
-
-
-SYNOPSIS
---------
-*int zmq_sendmsg (void '*socket', zmq_msg_t '*msg', int 'flags');*
-
-
-DESCRIPTION
------------
-The _zmq_sendmsg()_ function shall queue the message referenced by the 'msg'
-argument to be sent to the socket referenced by the 'socket' argument.  The
-'flags' argument is a combination of the flags defined below:
-
-*ZMQ_DONTWAIT*::
-For socket types (DEALER, PUSH) that block (either with ZMQ_IMMEDIATE option set
-and no peer available, or all peers having full high-water mark), specifies that
-the operation should be performed in non-blocking mode. If the message cannot be
-queued on the 'socket', the _zmq_sendmsg()_ function shall fail with 'errno' set
-to EAGAIN.
-
-*ZMQ_SNDMORE*::
-Specifies that the message being sent is a multi-part message, and that further
-message parts are to follow. Refer to the section regarding multi-part messages
-below for a detailed description.
-
-The _zmq_msg_t_ structure passed to _zmq_sendmsg()_ is nullified during the
-call. If you want to send the same message to multiple sockets you have to copy
-it (e.g. using _zmq_msg_copy()_).
-
-NOTE: A successful invocation of _zmq_sendmsg()_ does not indicate that the
-message has been transmitted to the network, only that it has been queued on
-the 'socket' and 0MQ has assumed responsibility for the message.
-
-NOTE: this API method is deprecated in favor of zmq_msg_send(3).
-
-Multi-part messages
-~~~~~~~~~~~~~~~~~~~
-A 0MQ message is composed of 1 or more message parts. Each message
-part is an independent 'zmq_msg_t' in its own right. 0MQ ensures atomic
-delivery of messages: peers shall receive either all _message parts_ of a
-message or none at all. The total number of message parts is unlimited except
-by available memory.
-
-An application that sends multi-part messages must use the _ZMQ_SNDMORE_ flag
-when sending each message part except the final one.
-
-RETURN VALUE
-------------
-The _zmq_sendmsg()_ function shall return number of bytes in the message
-if successful. Otherwise it shall return `-1` and set 'errno' to one of the
-values defined below.
-
-
-ERRORS
-------
-*EAGAIN*::
-Non-blocking mode was requested and the message cannot be sent at the moment.
-*ENOTSUP*::
-The _zmq_sendmsg()_ operation is not supported by this socket type.
-*EINVAL*::
-The sender tried to send multipart data, which the socket type does not allow.
-*EFSM*::
-The _zmq_sendmsg()_ operation cannot be performed on this socket at the moment
-due to the socket not being in the appropriate state.  This error may occur with
-socket types that switch between several states, such as ZMQ_REP.  See the
-_messaging patterns_ section of linkzmq:zmq_socket[3] for more information.
-*ETERM*::
-The 0MQ 'context' associated with the specified 'socket' was terminated.
-*ENOTSOCK*::
-The provided 'socket' was invalid.
-*EINTR*::
-The operation was interrupted by delivery of a signal before the message was
-sent.
-*EFAULT*::
-Invalid message.
-*EHOSTUNREACH*::
-The message cannot be routed.
-
-
-EXAMPLE
--------
-.Filling in a message and sending it to a socket
-----
-/* Create a new message, allocating 6 bytes for message content */
-zmq_msg_t msg;
-int rc = zmq_msg_init_size (&msg, 6);
-assert (rc == 0);
-/* Fill in message content with 'AAAAAA' */
-memset (zmq_msg_data (&msg), 'A', 6);
-/* Send the message to the socket */
-rc = zmq_sendmsg (socket, &msg, 0);
-assert (rc == 6);
-----
-
-.Sending a multi-part message
-----
-/* Send a multi-part message consisting of three parts to socket */
-rc = zmq_sendmsg (socket, &part1, ZMQ_SNDMORE);
-rc = zmq_sendmsg (socket, &part2, ZMQ_SNDMORE);
-/* Final part; no more parts to follow */
-rc = zmq_sendmsg (socket, &part3, 0);
-----
-
-
-SEE ALSO
---------
-linkzmq:zmq_recv[3]
-linkzmq:zmq_socket[7]
-linkzmq:zmq[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/libs/libzmq/doc/zmq_setsockopt.txt b/libs/libzmq/doc/zmq_setsockopt.txt
deleted file mode 100644
index 574f88d..0000000
--- a/libs/libzmq/doc/zmq_setsockopt.txt
+++ /dev/null
@@ -1,1591 +0,0 @@
-zmq_setsockopt(3)
-=================
-
-
-NAME
-----
-
-zmq_setsockopt - set 0MQ socket options
-
-
-SYNOPSIS
---------
-*int zmq_setsockopt (void '*socket', int 'option_name', const void '*option_value', size_t 'option_len');*
-
-Caution: All options, with the exception of ZMQ_SUBSCRIBE, ZMQ_UNSUBSCRIBE,
-ZMQ_LINGER, ZMQ_ROUTER_HANDOVER, ZMQ_ROUTER_MANDATORY, ZMQ_PROBE_ROUTER,
-ZMQ_XPUB_VERBOSE, ZMQ_XPUB_VERBOSER, ZMQ_REQ_CORRELATE,
-ZMQ_REQ_RELAXED, ZMQ_SNDHWM and ZMQ_RCVHWM, only take effect for
-subsequent socket bind/connects.
-
-Specifically, security options take effect for subsequent bind/connect calls,
-and can be changed at any time to affect subsequent binds and/or connects.
-
-DESCRIPTION
------------
-The _zmq_setsockopt()_ function shall set the option specified by the
-'option_name' argument to the value pointed to by the 'option_value' argument
-for the 0MQ socket pointed to by the 'socket' argument. The 'option_len'
-argument is the size of the option value in bytes. For options taking a value of
-type "character string", the provided byte data should either contain no zero
-bytes, or end in a single zero byte (terminating ASCII NUL character).
-
-The following socket options can be set with the _zmq_setsockopt()_ function:
-
-
-ZMQ_AFFINITY: Set I/O thread affinity
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_AFFINITY' option shall set the I/O thread affinity for newly created
-connections on the specified 'socket'.
-
-Affinity determines which threads from the 0MQ I/O thread pool associated with
-the socket's _context_ shall handle newly created connections.  A value of zero
-specifies no affinity, meaning that work shall be distributed fairly among all
-0MQ I/O threads in the thread pool. For non-zero values, the lowest bit
-corresponds to thread 1, second lowest bit to thread 2 and so on.  For example,
-a value of 3 specifies that subsequent connections on 'socket' shall be handled
-exclusively by I/O threads 1 and 2.
-
-See also linkzmq:zmq_init[3] for details on allocating the number of I/O
-threads for a specific _context_.
-
-[horizontal]
-Option value type:: uint64_t
-Option value unit:: N/A (bitmap)
-Default value:: 0
-Applicable socket types:: N/A
-
-
-ZMQ_BACKLOG: Set maximum length of the queue of outstanding connections
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_BACKLOG' option shall set the maximum length of the queue of
-outstanding peer connections for the specified 'socket'; this only applies to
-connection-oriented transports. For details refer to your operating system
-documentation for the 'listen' function.
-
-[horizontal]
-Option value type:: int
-Option value unit:: connections
-Default value:: 100
-Applicable socket types:: all, only for connection-oriented transports.
-
-
-ZMQ_BINDTODEVICE: Set name of device to bind the socket to
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_BINDTODEVICE' option binds this socket to a particular device, eg.
-an interface or VRF. If a socket is bound to an interface, only packets
-received from that particular interface are processed by the socket. If device
-is a VRF device, then subsequent binds/connects to that socket use addresses
-in the VRF routing table.
-
-NOTE: requires setting CAP_NET_RAW on the compiled program.
-
-[horizontal]
-Option value type:: character string
-Option value unit:: N/A
-Default value:: not set
-Applicable socket types:: all, when using TCP or UDP transports.
-
-
-ZMQ_BUSY_POLL: This removes delays caused by the interrupt and the resultant context switch.
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Busy polling helps reduce latency in the network receive path by allowing socket layer code
-to poll the receive queue of a network device, and disabling network interrupts. This removes
-delays caused by the interrupt and the resultant context switch. However, it also increases
-CPU utilization. Busy polling also prevents the CPU from sleeping, which can incur additional
-power consumption.
-
-[horizontal]
-Option value type:: int
-Option value unit:: 0,1
-Default value:: 0
-Applicable socket types:: all
-
-
-ZMQ_CONNECT_RID: Assign the next outbound connection id
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-This option name is now deprecated. Use ZMQ_CONNECT_ROUTING_ID instead.
-ZMQ_CONNECT_RID remains as an alias for now.
-
-
-ZMQ_CONNECT_ROUTING_ID: Assign the next outbound routing id
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_CONNECT_ROUTING_ID' option sets the peer id of the peer connected
-via the next zmq_connect() call, such that that connection is immediately ready for
-data transfer with the given routing id.  This option applies only to the first
-subsequent call to zmq_connect(), zmq_connect() calls thereafter use the default
-connection behaviour.
-
-Typical use is to set this socket option ahead of each zmq_connect() call.
-Each connection MUST be assigned a unique routing id. Assigning a
-routing id that is already in use is not allowed.
-
-Useful when connecting ROUTER to ROUTER, or STREAM to STREAM, as it
-allows for immediate sending to peers. Outbound routing id framing requirements
-for ROUTER and STREAM sockets apply.
-
-The routing id must be from 1 to 255 bytes long and MAY NOT start with
-a zero byte (such routing ids are reserved for internal use by the 0MQ
-infrastructure).
-
-[horizontal]
-Option value type:: binary data
-Option value unit:: N/A
-Default value:: NULL
-Applicable socket types:: ZMQ_ROUTER, ZMQ_STREAM
-
-
-ZMQ_CONFLATE: Keep only last message
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-If set, a socket shall keep only one message in its inbound/outbound
-queue, this message being the last message received/the last message
-to be sent. Ignores 'ZMQ_RCVHWM' and 'ZMQ_SNDHWM' options. Does not
-support multi-part messages, in particular, only one part of it is kept
-in the socket internal queue.
-
-NOTE: If recv is not called on the inbound socket, the queue and memory will
-grow with each message received. Use linkzmq:zmq_getsockopt[3] with ZMQ_EVENTS
-to trigger the conflation of the messages.
-
-[horizontal]
-Option value type:: int
-Option value unit:: boolean
-Default value:: 0 (false)
-Applicable socket types:: ZMQ_PULL, ZMQ_PUSH, ZMQ_SUB, ZMQ_PUB, ZMQ_DEALER
-
-
-ZMQ_CONNECT_TIMEOUT: Set connect() timeout
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Sets how long to wait before timing-out a connect() system call.
-The connect() system call normally takes a long time before it returns a
-time out error. Setting this option allows the library to time out the call
-at an earlier interval.
-
-[horizontal]
-Option value type:: int
-Option value unit:: milliseconds
-Default value:: 0 (disabled)
-Applicable socket types:: all, when using TCP transports.
-
-
-ZMQ_CURVE_PUBLICKEY: Set CURVE public key
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Sets the socket's long term public key. You must set this on CURVE client
-sockets, see linkzmq:zmq_curve[7]. You can provide the key as 32 binary
-bytes, or as a 40-character string encoded in the Z85 encoding format and
-terminated in a null byte. The public key must always be used with the
-matching secret key. To generate a public/secret key pair, use
-linkzmq:zmq_curve_keypair[3]. To derive the public key from a secret key,
-use linkzmq:zmq_curve_public[3].
-
-NOTE: an option value size of 40 is supported for backwards compatibility,
-though is deprecated.
-
-[horizontal]
-Option value type:: binary data or Z85 text string
-Option value size:: 32 or 41
-Default value:: NULL
-Applicable socket types:: all, when using TCP transport
-
-
-ZMQ_CURVE_SECRETKEY: Set CURVE secret key
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Sets the socket's long term secret key. You must set this on both CURVE
-client and server sockets, see linkzmq:zmq_curve[7]. You can provide the
-key as 32 binary bytes, or as a 40-character string encoded in the Z85
-encoding format and terminated in a null byte. To generate a public/secret
-key pair, use linkzmq:zmq_curve_keypair[3]. To derive the public key from
-a secret key, use linkzmq:zmq_curve_public[3].
-
-NOTE: an option value size of 40 is supported for backwards compatibility,
-though is deprecated.
-
-[horizontal]
-Option value type:: binary data or Z85 text string
-Option value size:: 32 or 41
-Default value:: NULL
-Applicable socket types:: all, when using TCP transport
-
-
-ZMQ_CURVE_SERVER: Set CURVE server role
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Defines whether the socket will act as server for CURVE security, see
-linkzmq:zmq_curve[7]. A value of '1' means the socket will act as
-CURVE server. A value of '0' means the socket will not act as CURVE
-server, and its security role then depends on other option settings.
-Setting this to '0' shall reset the socket security to NULL. When you
-set this you must also set the server's secret key using the
-ZMQ_CURVE_SECRETKEY option. A server socket does not need to know
-its own public key.
-
-[horizontal]
-Option value type:: int
-Option value unit:: 0, 1
-Default value:: 0
-Applicable socket types:: all, when using TCP transport
-
-
-ZMQ_CURVE_SERVERKEY: Set CURVE server key
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Sets the socket's long term server key. You must set this on CURVE client
-sockets, see linkzmq:zmq_curve[7]. You can provide the key as 32 binary
-bytes, or as a 40-character string encoded in the Z85 encoding format and
-terminated in a null byte. This key must have been generated together with
-the server's secret key. To generate a public/secret key pair, use
-linkzmq:zmq_curve_keypair[3].
-
-NOTE: an option value size of 40 is supported for backwards compatibility,
-though is deprecated.
-
-[horizontal]
-Option value type:: binary data or Z85 text string
-Option value size:: 32 or 41
-Default value:: NULL
-Applicable socket types:: all, when using TCP transport
-
-ZMQ_DISCONNECT_MSG: set a disconnect message that the socket will generate when accepted peer disconnect
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-When set, the socket will generate a disconnect message when accepted peer has been disconnected.
-You may set this on ROUTER, SERVER and PEER sockets.
-The combination with ZMQ_HEARTBEAT_IVL is powerful and simplify protocols, when heartbeat recognize a connection drop it
-will generate a disconnect message that can match the protocol of the application.
-
-[horizontal]
-Option value type:: binary data
-Option value unit:: N/A
-Default value:: NULL
-Applicable socket types:: ZMQ_ROUTER, ZMQ_SERVER and ZMQ_PEER
-
-
-ZMQ_HICCUP_MSG: set a hiccup message that the socket will generate when connected peer temporarily disconnect
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-When set, the socket will generate a hiccup message when connect peer has been disconnected.
-You may set this on DEALER, CLIENT and PEER sockets.
-The combination with ZMQ_HEARTBEAT_IVL is powerful and simplify protocols, when heartbeat recognize a connection drop it
-will generate a hiccup message that can match the protocol of the application.
-
-[horizontal]
-Option value type:: binary data
-Option value unit:: N/A
-Default value:: NULL
-Applicable socket types:: ZMQ_DEALER, ZMQ_CLIENT and ZMQ_PEER
-
-
-ZMQ_GSSAPI_PLAINTEXT: Disable GSSAPI encryption
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Defines whether communications on the socket will be encrypted, see
-linkzmq:zmq_gssapi[7]. A value of '1' means  that communications will be
-plaintext.  A value of '0' means communications will be encrypted.
-
-[horizontal]
-Option value type:: int
-Option value unit:: 0, 1
-Default value:: 0 (false)
-Applicable socket types:: all, when using TCP transport
-
-
-ZMQ_GSSAPI_PRINCIPAL: Set name of GSSAPI principal
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Sets the name of the principal for whom GSSAPI credentials should be acquired.
-
-[horizontal]
-Option value type:: character string
-Option value unit:: N/A
-Default value:: not set
-Applicable socket types:: all, when using TCP transport
-
-
-ZMQ_GSSAPI_SERVER: Set GSSAPI server role
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Defines whether the socket will act as server for GSSAPI security, see
-linkzmq:zmq_gssapi[7]. A value of '1' means the socket will act as GSSAPI
-server. A value of '0' means the socket will act as GSSAPI client.
-
-[horizontal]
-Option value type:: int
-Option value unit:: 0, 1
-Default value:: 0 (false)
-Applicable socket types:: all, when using TCP transport
-
-
-ZMQ_GSSAPI_SERVICE_PRINCIPAL: Set name of GSSAPI service principal
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Sets the name of the principal of the GSSAPI server to which a GSSAPI client
-intends to connect.
-
-[horizontal]
-Option value type:: character string
-Option value unit:: N/A
-Default value:: not set
-Applicable socket types:: all, when using TCP transport
-
-ZMQ_GSSAPI_SERVICE_PRINCIPAL_NAMETYPE: Set name type of service principal
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Sets the name type of the GSSAPI service principal.  A value of
-'ZMQ_GSSAPI_NT_HOSTBASED' (0) means the name specified with
-'ZMQ_GSSAPI_SERVICE_PRINCIPAL' is interpreted as a host based name.  A value
-of 'ZMQ_GSSAPI_NT_USER_NAME' (1) means it is interpreted as a local user name.
-A value of 'ZMQ_GSSAPI_NT_KRB5_PRINCIPAL' (2) means it is interpreted as an
-unparsed principal name string (valid only with the krb5 GSSAPI mechanism).
-
-[horizontal]
-Option value type:: int
-Option value unit:: 0, 1, 2
-Default value:: 0 (ZMQ_GSSAPI_NT_HOSTBASED)
-Applicable socket types:: all, when using TCP or IPC transport
-
-ZMQ_GSSAPI_PRINCIPAL_NAMETYPE: Set name type of principal
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Sets the name type of the GSSAPI principal.  A value of
-'ZMQ_GSSAPI_NT_HOSTBASED' (0) means the name specified with
-'ZMQ_GSSAPI_PRINCIPAL' is interpreted as a host based name.  A value of
-'ZMQ_GSSAPI_NT_USER_NAME' (1) means it is interpreted as a local user name.
-A value of 'ZMQ_GSSAPI_NT_KRB5_PRINCIPAL' (2) means it is interpreted as an
-unparsed principal name string (valid only with the krb5 GSSAPI mechanism).
-
-[horizontal]
-Option value type:: int
-Option value unit:: 0, 1, 2
-Default value:: 0 (ZMQ_GSSAPI_NT_HOSTBASED)
-Applicable socket types:: all, when using TCP or IPC transport
-
-ZMQ_HANDSHAKE_IVL: Set maximum handshake interval
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_HANDSHAKE_IVL' option shall set the maximum handshake interval for
-the specified 'socket'. Handshaking is the exchange of socket configuration
-information (socket type, routing id, security) that occurs when a connection
-is first opened, only for connection-oriented transports. If handshaking does
-not complete within the configured time, the connection shall be closed.
-The value 0 means no handshake time limit.
-
-[horizontal]
-Option value type:: int
-Option value unit:: milliseconds
-Default value:: 30000
-Applicable socket types:: all but ZMQ_STREAM, only for connection-oriented transports
-
-ZMQ_HELLO_MSG: set an hello message that will be sent when a new peer connect
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-When set, the socket will automatically send an hello message when a new connection is made or accepted.
-You may set this on DEALER, ROUTER, CLIENT, SERVER and PEER sockets.
-The combination with ZMQ_HEARTBEAT_IVL is powerful and simplify protocols,
-as now heartbeat and sending the hello message can be left out of protocols and be handled by zeromq.
-
-[horizontal]
-Option value type:: binary data
-Option value unit:: N/A
-Default value:: NULL
-Applicable socket types:: ZMQ_ROUTER, ZMQ_DEALER, ZMQ_CLIENT, ZMQ_SERVER and ZMQ_PEER
-
-ZMQ_HEARTBEAT_IVL: Set interval between sending ZMTP heartbeats
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_HEARTBEAT_IVL' option shall set the interval between sending ZMTP heartbeats
-for the specified 'socket'. If this option is set and is greater than 0, then a 'PING'
-ZMTP command will be sent every 'ZMQ_HEARTBEAT_IVL' milliseconds.
-
-[horizontal]
-Option value type:: int
-Option value unit:: milliseconds
-Default value:: 0
-Applicable socket types:: all, when using connection-oriented transports
-
-
-ZMQ_HEARTBEAT_TIMEOUT: Set timeout for ZMTP heartbeats
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_HEARTBEAT_TIMEOUT' option shall set how long to wait before timing-out a
-connection after sending a 'PING' ZMTP command and not receiving any traffic. This
-option is only valid if 'ZMQ_HEARTBEAT_IVL' is also set, and is greater than 0. The
-connection will time out if there is no traffic received after sending the 'PING'
-command, but the received traffic does not have to be a 'PONG' command - any received
-traffic will cancel the timeout.
-
-[horizontal]
-Option value type:: int
-Option value unit:: milliseconds
-Default value:: 0 normally, ZMQ_HEARTBEAT_IVL if it is set
-Applicable socket types:: all, when using connection-oriented transports
-
-
-ZMQ_HEARTBEAT_TTL: Set the TTL value for ZMTP heartbeats
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_HEARTBEAT_TTL' option shall set the timeout on the remote peer for ZMTP
-heartbeats. If this option is greater than 0, the remote side shall time out the
-connection if it does not receive any more traffic within the TTL period. This option
-does not have any effect if 'ZMQ_HEARTBEAT_IVL' is not set or is 0. Internally, this
-value is rounded down to the nearest decisecond, any value less than 100 will have
-no effect.
-
-[horizontal]
-Option value type:: int
-Option value unit:: milliseconds
-Default value:: 0
-Maximum value:: 6553599 (which is 2^16-1 deciseconds)
-Applicable socket types:: all, when using connection-oriented transports
-
-
-ZMQ_IDENTITY: Set socket identity
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-This option name is now deprecated. Use ZMQ_ROUTING_ID instead.
-ZMQ_IDENTITY remains as an alias for now.
-
-
-ZMQ_IMMEDIATE: Queue messages only to completed connections
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-By default queues will fill on outgoing connections even if the connection has
-not completed. This can lead to "lost" messages on sockets with round-robin
-routing (REQ, PUSH, DEALER). If this option is set to `1`, messages shall be
-queued only to completed connections. This will cause the socket to block if
-there are no other connections, but will prevent queues from filling on pipes
-awaiting connection.
-
-[horizontal]
-Option value type:: int
-Option value unit:: boolean
-Default value:: 0 (false)
-Applicable socket types:: all, only for connection-oriented transports.
-
-
-ZMQ_INVERT_MATCHING: Invert message filtering
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Reverses the filtering behavior of PUB-SUB sockets, when set to 1.
-
-On 'PUB' and 'XPUB' sockets, this causes messages to be sent to all
-connected sockets 'except' those subscribed to a prefix that matches
-the message. On 'SUB' sockets, this causes only incoming messages that
-do 'not' match any of the socket's subscriptions to be received by the user.
-
-Whenever 'ZMQ_INVERT_MATCHING' is set to 1 on a 'PUB' socket, all 'SUB'
-sockets connecting to it must also have the option set to 1. Failure to
-do so will have the 'SUB' sockets reject everything the 'PUB' socket sends
-them. 'XSUB' sockets do not need to do this because they do not filter
-incoming messages.
-
-[horizontal]
-Option value type:: int
-Option value unit:: 0,1
-Default value:: 0
-Applicable socket types:: ZMQ_PUB, ZMQ_XPUB, ZMQ_SUB
-
-
-ZMQ_IPV6: Enable IPv6 on socket
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Set the IPv6 option for the socket. A value of `1` means IPv6 is
-enabled on the socket, while `0` means the socket will use only IPv4.
-When IPv6 is enabled the socket will connect to, or accept connections
-from, both IPv4 and IPv6 hosts.
-
-[horizontal]
-Option value type:: int
-Option value unit:: boolean
-Default value:: 0 (false)
-Applicable socket types:: all, when using TCP transports.
-
-
-ZMQ_LINGER: Set linger period for socket shutdown
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_LINGER' option shall set the linger period for the specified 'socket'.
-The linger period determines how long pending messages which have yet to be
-sent to a peer shall linger in memory after a socket is disconnected with
-linkzmq:zmq_disconnect[3] or closed with linkzmq:zmq_close[3], and further
-affects the termination of the socket's context with linkzmq:zmq_ctx_term[3].
-The following outlines the different behaviours:
-
-* A value of '-1' specifies an infinite linger period. Pending
-  messages shall not be discarded after a call to _zmq_disconnect()_ or
-  _zmq_close()_; attempting to terminate the socket's context with _zmq_ctx_term()_
-  shall block until all pending messages have been sent to a peer.
-
-* The value of '0' specifies no linger period. Pending messages shall be
-  discarded immediately after a call to _zmq_disconnect()_ or _zmq_close()_.
-
-* Positive values specify an upper bound for the linger period in milliseconds.
-  Pending messages shall not be discarded after a call to _zmq_disconnect()_ or
-  _zmq_close()_; attempting to terminate the socket's context with _zmq_ctx_term()_
-  shall block until either all pending messages have been sent to a peer, or the
-  linger period expires, after which any pending messages shall be discarded.
-
-[horizontal]
-Option value type:: int
-Option value unit:: milliseconds
-Default value:: -1 (infinite)
-Applicable socket types:: all
-
-
-ZMQ_MAXMSGSIZE: Maximum acceptable inbound message size
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Limits the size of the inbound message. If a peer sends a message larger than
-ZMQ_MAXMSGSIZE it is disconnected. Value of -1 means 'no limit'.
-
-[horizontal]
-Option value type:: int64_t
-Option value unit:: bytes
-Default value:: -1
-Applicable socket types:: all
-
-
-ZMQ_METADATA: Add application metadata properties to a socket
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The _ZMQ_METADATA_ option shall add application metadata to the specified _socket_,
-the metadata is exchanged with peers during connection setup. A metadata property is
-specified as a string, delimited by a colon, starting with the metadata _property_
-followed by the metadata value, for example "X-key:value".
-_Property_ names are restricted to maximum 255 characters and must be prefixed by "X-".
-Multiple application metadata properties can be added to a socket by executing zmq_setsockopt()
-multiple times. As the argument is a null-terminated string, binary data must be encoded
-before it is added e.g. using Z85 (linkzmq:zmq_z85_encode[3]).
-
-NOTE: in DRAFT state, not yet available in stable releases.
-
-[horizontal]
-Option value type:: character string
-Option value unit:: N/A
-Default value:: not set
-Applicable socket types:: all
-
-
-ZMQ_MULTICAST_HOPS: Maximum network hops for multicast packets
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Sets the time-to-live field in every multicast packet sent from this socket.
-The default is 1 which means that the multicast packets don't leave the local
-network.
-
-[horizontal]
-Option value type:: int
-Option value unit:: network hops
-Default value:: 1
-Applicable socket types:: all, when using multicast transports
-
-
-ZMQ_MULTICAST_MAXTPDU: Maximum transport data unit size for multicast packets
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Sets the maximum transport data unit size used for outbound multicast
-packets.
-
-This must be set at or below the minimum Maximum Transmission Unit (MTU) for
-all network paths over which multicast reception is required.
-
-[horizontal]
-Option value type:: int
-Option value unit:: bytes
-Default value:: 1500
-Applicable socket types:: all, when using multicast transports
-
-
-ZMQ_PLAIN_PASSWORD: Set PLAIN security password
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Sets the password for outgoing connections over TCP or IPC. If you set this
-to a non-null value, the security mechanism used for connections shall be
-PLAIN, see linkzmq:zmq_plain[7]. If you set this to a null value, the security
-mechanism used for connections shall be NULL, see linkzmq:zmq_null[3].
-
-[horizontal]
-Option value type:: character string
-Option value unit:: N/A
-Default value:: not set
-Applicable socket types:: all, when using TCP transport
-
-
-ZMQ_PLAIN_SERVER: Set PLAIN server role
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Defines whether the socket will act as server for PLAIN security, see
-linkzmq:zmq_plain[7]. A value of '1' means the socket will act as
-PLAIN server. A value of '0' means the socket will not act as PLAIN
-server, and its security role then depends on other option settings.
-Setting this to '0' shall reset the socket security to NULL.
-
-[horizontal]
-Option value type:: int
-Option value unit:: 0, 1
-Default value:: 0
-Applicable socket types:: all, when using TCP transport
-
-
-ZMQ_PLAIN_USERNAME: Set PLAIN security username
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Sets the username for outgoing connections over TCP or IPC. If you set this
-to a non-null value, the security mechanism used for connections shall be
-PLAIN, see linkzmq:zmq_plain[7]. If you set this to a null value, the security
-mechanism used for connections shall be NULL, see linkzmq:zmq_null[3].
-
-[horizontal]
-Option value type:: character string
-Option value unit:: N/A
-Default value:: not set
-Applicable socket types:: all, when using TCP transport
-
-
-ZMQ_USE_FD: Set the pre-allocated socket file descriptor
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-When set to a positive integer value before zmq_bind is called on the socket,
-the socket shall use the corresponding file descriptor for connections over
-TCP or IPC instead of allocating a new file descriptor.
-Useful for writing systemd socket activated services. If set to -1 (default),
-a new file descriptor will be allocated instead (default behaviour).
-
-NOTE: if set after calling zmq_bind, this option shall have no effect.
-NOTE: the file descriptor passed through MUST have been ran through the "bind"
-      and "listen" system calls beforehand. Also, socket option that would
-      normally be passed through zmq_setsockopt like TCP buffers length,
-      IP_TOS or SO_REUSEADDR MUST be set beforehand by the caller, as they
-      must be set before the socket is bound.
-
-[horizontal]
-Option value type:: int
-Option value unit:: file descriptor
-Default value:: -1
-Applicable socket types:: all bound sockets, when using IPC or TCP transport
-
-
-ZMQ_PRIORITY: Set the Priority on socket
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Sets the protocol-defined priority for all packets to be sent on this
-socket, where supported by the OS. In Linux, values greater than 6
-require admin capability (CAP_NET_ADMIN)
-
-[horizontal]
-Option value type:: int
-Option value unit:: >0
-Default value:: 0
-Applicable socket types:: all, only for connection-oriented transports
-
-
-ZMQ_PROBE_ROUTER: bootstrap connections to ROUTER sockets
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-When set to 1, the socket will automatically send an empty message when a
-new connection is made or accepted. You may set this on REQ, DEALER, or
-ROUTER sockets connected to a ROUTER socket. The application must filter
-such empty messages. The ZMQ_PROBE_ROUTER option in effect provides the
-ROUTER application with an event signaling the arrival of a new peer.
-
-NOTE: do not set this option on a socket that talks to any other socket
-types: the results are undefined.
-
-[horizontal]
-Option value type:: int
-Option value unit:: 0, 1
-Default value:: 0
-Applicable socket types:: ZMQ_ROUTER, ZMQ_DEALER, ZMQ_REQ
-
-
-ZMQ_RATE: Set multicast data rate
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_RATE' option shall set the maximum send or receive data rate for
-multicast transports such as linkzmq:zmq_pgm[7] using the specified 'socket'.
-
-[horizontal]
-Option value type:: int
-Option value unit:: kilobits per second
-Default value:: 100
-Applicable socket types:: all, when using multicast transports
-
-
-ZMQ_RCVBUF: Set kernel receive buffer size
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_RCVBUF' option shall set the underlying kernel receive buffer size for
-the 'socket' to the specified size in bytes.  A value of -1 means leave the
-OS default unchanged. For details refer to your operating system documentation
-for the 'SO_RCVBUF' socket option.
-
-[horizontal]
-Option value type:: int
-Option value unit:: bytes
-Default value:: -1
-Applicable socket types:: all
-
-
-ZMQ_RCVHWM: Set high water mark for inbound messages
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_RCVHWM' option shall set the high water mark for inbound messages on
-the specified 'socket'. The high water mark is a hard limit on the maximum
-number of outstanding messages 0MQ shall queue in memory for any single peer
-that the specified 'socket' is communicating with. A value of zero means no
-limit.
-
-If this limit has been reached the socket shall enter an exceptional state and
-depending on the socket type, 0MQ shall take appropriate action such as
-blocking or dropping sent messages. Refer to the individual socket descriptions
-in linkzmq:zmq_socket[3] for details on the exact action taken for each socket
-type.
-
-NOTE: 0MQ does not guarantee that the socket will be able to queue as many as ZMQ_RCVHWM
-messages, and the actual limit may be lower or higher, depending on socket transport.
-A notable example is for sockets using TCP transport; see linkzmq:zmq_tcp[7].
-
-[horizontal]
-Option value type:: int
-Option value unit:: messages
-Default value:: 1000
-Applicable socket types:: all
-
-
-ZMQ_RCVTIMEO: Maximum time before a recv operation returns with EAGAIN
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Sets the timeout for receive operation on the socket. If the value is `0`,
-_zmq_recv(3)_ will return immediately, with a EAGAIN error if there is no
-message to receive. If the value is `-1`, it will block until a message is
-available. For all other values, it will wait for a message for that amount
-of time before returning with an EAGAIN error.
-
-[horizontal]
-Option value type:: int
-Option value unit:: milliseconds
-Default value:: -1 (infinite)
-Applicable socket types:: all
-
-
-ZMQ_RECONNECT_IVL: Set reconnection interval
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_RECONNECT_IVL' option shall set the initial reconnection interval for
-the specified 'socket'.  The reconnection interval is the period 0MQ
-shall wait between attempts to reconnect disconnected peers when using
-connection-oriented transports. The value -1 means no reconnection.
-
-NOTE: The reconnection interval may be randomized by 0MQ to prevent
-reconnection storms in topologies with a large number of peers per socket.
-
-[horizontal]
-Option value type:: int
-Option value unit:: milliseconds
-Default value:: 100
-Applicable socket types:: all, only for connection-oriented transports
-
-
-ZMQ_RECONNECT_IVL_MAX: Set maximum reconnection interval
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_RECONNECT_IVL_MAX' option shall set the maximum reconnection interval
-for the specified 'socket'.  This is the maximum period 0MQ shall wait between
-attempts to reconnect. On each reconnect attempt, the previous interval shall be
-doubled until ZMQ_RECONNECT_IVL_MAX is reached. This allows for exponential
-backoff strategy. Default value means no exponential backoff is performed and
-reconnect interval calculations are only based on ZMQ_RECONNECT_IVL.
-
-NOTE:  Values less than ZMQ_RECONNECT_IVL will be ignored.
-
-[horizontal]
-Option value type:: int
-Option value unit:: milliseconds
-Default value:: 0 (only use ZMQ_RECONNECT_IVL)
-Applicable socket types:: all, only for connection-oriented transports
-
-
-ZMQ_RECONNECT_STOP: Set condition where reconnection will stop
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_RECONNECT_STOP' option shall set the conditions under which automatic
-reconnection will stop.  This can be useful when a process binds to a
-wild-card port, where the OS supplies an ephemeral port.
-
-The 'ZMQ_RECONNECT_STOP_CONN_REFUSED' option will stop reconnection when 0MQ
-receives the ECONNREFUSED return code from the connect.  This indicates that
-there is no code bound to the specified endpoint.
-
-The 'ZMQ_RECONNECT_STOP_HANDSHAKE_FAILED' option will stop reconnection if
-the 0MQ handshake fails.  This can be used to detect and/or prevent errant
-connection attempts to non-0MQ sockets.  Note that when specifying this option
-you may also want to set `ZMQ_HANDSHAKE_IVL` -- the default handshake interval
-is 30000 (30 seconds), which is typically too large.
-
-The 'ZMQ_RECONNECT_STOP_AFTER_DISCONNECT' option will stop reconnection when 
-zmq_disconnect() has been called. This can be useful when the user's request failed
-(server not ready), as the socket does not need to continue to reconnect after
-user disconnect actively.
-
-NOTE: in DRAFT state, not yet available in stable releases.
-
-[horizontal]
-Option value type:: int
-Option value unit:: 0, ZMQ_RECONNECT_STOP_CONN_REFUSED, ZMQ_RECONNECT_STOP_HANDSHAKE_FAILED, ZMQ_RECONNECT_STOP_CONN_REFUSED | ZMQ_RECONNECT_STOP_HANDSHAKE_FAILED
-Default value:: 0
-Applicable socket types:: all, only for connection-oriented transports (ZMQ_HANDSHAKE_IVL is
-not applicable for ZMQ_STREAM sockets)
-
-
-ZMQ_RECOVERY_IVL: Set multicast recovery interval
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_RECOVERY_IVL' option shall set the recovery interval for multicast
-transports using the specified 'socket'. The recovery interval determines the
-maximum time in milliseconds that a receiver can be absent from a multicast
-group before unrecoverable data loss will occur.
-
-CAUTION: Exercise care when setting large recovery intervals as the data
-needed for recovery will be held in memory. For example, a 1 minute recovery
-interval at a data rate of 1Gbps requires a 7GB in-memory buffer.
-
-[horizontal]
-Option value type:: int
-Option value unit:: milliseconds
-Default value:: 10000
-Applicable socket types:: all, when using multicast transports
-
-
-ZMQ_REQ_CORRELATE: match replies with requests
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The default behaviour of REQ sockets is to rely on the ordering of messages to
-match requests and responses and that is usually sufficient. When this option
-is set to 1, the REQ socket will prefix outgoing messages with an extra frame
-containing a request id. That means the full message is (request id, 0,
-user frames...). The REQ socket will discard all incoming messages that don't
-begin with these two frames.
-
-[horizontal]
-Option value type:: int
-Option value unit:: 0, 1
-Default value:: 0
-Applicable socket types:: ZMQ_REQ
-
-
-ZMQ_REQ_RELAXED: relax strict alternation between request and reply
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-By default, a REQ socket does not allow initiating a new request with
-_zmq_send(3)_ until the reply to the previous one has been received.
-When set to 1, sending another message is allowed and previous replies will
-be discarded if any. The request-reply state machine is reset and a new
-request is sent to the next available peer.
-
-If set to 1, also enable ZMQ_REQ_CORRELATE to ensure correct matching of
-requests and replies. Otherwise a late reply to an aborted request can be
-reported as the reply to the superseding request.
-
-[horizontal]
-Option value type:: int
-Option value unit:: 0, 1
-Default value:: 0
-Applicable socket types:: ZMQ_REQ
-
-
-ZMQ_ROUTER_HANDOVER: handle duplicate client routing ids on ROUTER sockets
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-If two clients use the same routing id when connecting to a ROUTER, the
-results shall depend on the ZMQ_ROUTER_HANDOVER option setting. If that
-is not set (or set to the default of zero), the ROUTER socket shall reject
-clients trying to connect with an already-used routing id. If that option
-is set to 1, the ROUTER socket shall hand-over the connection to the new
-client and disconnect the existing one.
-
-[horizontal]
-Option value type:: int
-Option value unit:: 0, 1
-Default value:: 0
-Applicable socket types:: ZMQ_ROUTER
-
-
-ZMQ_ROUTER_MANDATORY: accept only routable messages on ROUTER sockets
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Sets the ROUTER socket behaviour when an unroutable message is encountered. A
-value of `0` is the default and discards the message silently when it cannot be
-routed or the peers SNDHWM is reached.  A value of `1` returns an
-'EHOSTUNREACH' error code if the message cannot be routed or 'EAGAIN' error
-code if the SNDHWM is reached and ZMQ_DONTWAIT was used. Without ZMQ_DONTWAIT
-it will block until the SNDTIMEO is reached or a spot in the send queue opens
-up.
-
-When ZMQ_ROUTER_MANDATORY is set to `1`, 'ZMQ_POLLOUT' events will be generated
-if one or more messages can be sent to at least one of the peers. If
-ZMQ_ROUTER_MANDATORY is set to `0`, the socket will generate a 'ZMQ_POLLOUT'
-event on every call to 'zmq_poll' resp. 'zmq_poller_wait_all'.
-
-[horizontal]
-Option value type:: int
-Option value unit:: 0, 1
-Default value:: 0
-Applicable socket types:: ZMQ_ROUTER
-
-
-ZMQ_ROUTER_RAW: switch ROUTER socket to raw mode
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Sets the raw mode on the ROUTER, when set to 1. When the ROUTER socket is in
-raw mode, and when using the tcp:// transport, it will read and write TCP data
-without 0MQ framing. This lets 0MQ applications talk to non-0MQ applications.
-When using raw mode, you cannot set explicit identities, and the ZMQ_SNDMORE
-flag is ignored when sending data messages. In raw mode you can close a specific
-connection by sending it a zero-length message (following the routing id frame).
-
-NOTE: This option is deprecated, please use ZMQ_STREAM sockets instead.
-
-[horizontal]
-Option value type:: int
-Option value unit:: 0, 1
-Default value:: 0
-Applicable socket types:: ZMQ_ROUTER
-
-
-ZMQ_ROUTING_ID: Set socket routing id
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_ROUTING_ID' option shall set the routing id of the specified 'socket'
-when connecting to a ROUTER socket.
-
-A routing id must be at least one byte and at most 255 bytes long. Identities
-starting with a zero byte are reserved for use by the 0MQ infrastructure.
-
-If two clients use the same routing id when connecting to a ROUTER, the
-results shall depend on the ZMQ_ROUTER_HANDOVER option setting. If that
-is not set (or set to the default of zero), the ROUTER socket shall reject
-clients trying to connect with an already-used routing id. If that option
-is set to 1, the ROUTER socket shall hand-over the connection to the new
-client and disconnect the existing one.
-
-[horizontal]
-Option value type:: binary data
-Option value unit:: N/A
-Default value:: NULL
-Applicable socket types:: ZMQ_REQ, ZMQ_REP, ZMQ_ROUTER, ZMQ_DEALER.
-
-
-ZMQ_SNDBUF: Set kernel transmit buffer size
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_SNDBUF' option shall set the underlying kernel transmit buffer size
-for the 'socket' to the specified size in bytes.  A value of -1 means leave
-the OS default unchanged. For details please refer to your operating system
-documentation for the 'SO_SNDBUF' socket option.
-
-[horizontal]
-Option value type:: int
-Option value unit:: bytes
-Default value:: -1
-Applicable socket types:: all
-
-
-ZMQ_SNDHWM: Set high water mark for outbound messages
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_SNDHWM' option shall set the high water mark for outbound messages on
-the specified 'socket'. The high water mark is a hard limit on the maximum
-number of outstanding messages 0MQ shall queue in memory for any single peer
-that the specified 'socket' is communicating with. A value of zero means no
-limit.
-
-If this limit has been reached the socket shall enter an exceptional state and
-depending on the socket type, 0MQ shall take appropriate action such as
-blocking or dropping sent messages. Refer to the individual socket descriptions
-in linkzmq:zmq_socket[3] for details on the exact action taken for each socket
-type.
-
-NOTE: 0MQ does not guarantee that the socket will accept as many as ZMQ_SNDHWM
-messages, and the actual limit may be as much as 90% lower depending on the
-flow of messages on the socket. The socket may even be able to accept more messages
-than the ZMQ_SNDHWM threshold; a notable example is for sockets using TCP transport;
-see linkzmq:zmq_tcp[7].
-
-[horizontal]
-Option value type:: int
-Option value unit:: messages
-Default value:: 1000
-Applicable socket types:: all
-
-
-ZMQ_SNDTIMEO: Maximum time before a send operation returns with EAGAIN
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Sets the timeout for send operation on the socket. If the value is `0`,
-_zmq_send(3)_ will return immediately, with a EAGAIN error if the message
-cannot be sent. If the value is `-1`, it will block until the message is sent.
-For all other values, it will try to send the message for that amount of time
-before returning with an EAGAIN error.
-
-[horizontal]
-Option value type:: int
-Option value unit:: milliseconds
-Default value:: -1 (infinite)
-Applicable socket types:: all
-
-
-ZMQ_SOCKS_PROXY: Set SOCKS5 proxy address
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Sets the SOCKS5 proxy address that shall be used by the socket for the TCP
-connection(s). Supported authentication methods are: no authentication
-or basic authentication when setup with ZMQ_SOCKS_USERNAME. If the endpoints
-are domain names instead of addresses they shall not be resolved and they
-shall be forwarded unchanged to the SOCKS proxy service in the client
-connection request message (address type 0x03 domain name).
-
-[horizontal]
-Option value type:: character string
-Option value unit:: N/A
-Default value:: not set
-Applicable socket types:: all, when using TCP transport
-
-
-ZMQ_SOCKS_USERNAME: Set SOCKS username and select basic authentication
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Sets the username for authenticated connection to the SOCKS5 proxy.
-If you set this to a non-null and non-empty value, the authentication
-method used for the SOCKS5 connection shall be basic authentication.
-In this case, use ZMQ_SOCKS_PASSWORD option in order to set the password.
-If you set this to a null value or empty value, the authentication method
-shall be no authentication, the default.
-
-[horizontal]
-Option value type:: character string
-Option value unit:: N/A
-Default value:: not set
-Applicable socket types:: all, when using TCP transport
-
-
-ZMQ_SOCKS_PASSWORD: Set SOCKS basic authentication password
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Sets the password for authenticating to the SOCKS5 proxy server.
-This is used only when the SOCKS5 authentication method has been
-set to basic authentication through the ZMQ_SOCKS_USERNAME option.
-Setting this to a null value (the default) is equivalent to an
-empty password string.
-
-[horizontal]
-Option value type:: character string
-Option value unit:: N/A
-Default value:: not set
-Applicable socket types:: all, when using TCP transport
-
-
-ZMQ_STREAM_NOTIFY: send connect and disconnect notifications
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Enables connect and disconnect notifications on a STREAM socket, when set
-to 1. When notifications are enabled, the socket delivers a zero-length
-message when a peer connects or disconnects.
-
-[horizontal]
-Option value type:: int
-Option value unit:: 0, 1
-Default value:: 1
-Applicable socket types:: ZMQ_STREAM
-
-
-ZMQ_SUBSCRIBE: Establish message filter
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_SUBSCRIBE' option shall establish a new message filter on a 'ZMQ_SUB'
-socket. Newly created 'ZMQ_SUB' sockets shall filter out all incoming messages,
-therefore you should call this option to establish an initial message filter.
-
-An empty 'option_value' of length zero shall subscribe to all incoming
-messages. A non-empty 'option_value' shall subscribe to all messages beginning
-with the specified prefix. Multiple filters may be attached to a single
-'ZMQ_SUB' socket, in which case a message shall be accepted if it matches at
-least one filter.
-
-[horizontal]
-Option value type:: binary data
-Option value unit:: N/A
-Default value:: N/A
-Applicable socket types:: ZMQ_SUB
-
-
-ZMQ_TCP_KEEPALIVE: Override SO_KEEPALIVE socket option
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Override 'SO_KEEPALIVE' socket option (where supported by OS).
-The default value of `-1` means to skip any overrides and leave it to OS default.
-
-[horizontal]
-Option value type:: int
-Option value unit:: -1,0,1
-Default value:: -1 (leave to OS default)
-Applicable socket types:: all, when using TCP transports.
-
-
-ZMQ_TCP_KEEPALIVE_CNT: Override TCP_KEEPCNT socket option
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Override 'TCP_KEEPCNT' socket option (where supported by OS). The default
-value of `-1` means to skip any overrides and leave it to OS default.
-
-[horizontal]
-Option value type:: int
-Option value unit:: -1,>0
-Default value:: -1 (leave to OS default)
-Applicable socket types:: all, when using TCP transports.
-
-
-ZMQ_TCP_KEEPALIVE_IDLE: Override TCP_KEEPIDLE (or TCP_KEEPALIVE on some OS)
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Override 'TCP_KEEPIDLE' (or 'TCP_KEEPALIVE' on some OS) socket option (where
-supported by OS). The default value of `-1` means to skip any overrides and
-leave it to OS default.
-
-[horizontal]
-Option value type:: int
-Option value unit:: -1,>0
-Default value:: -1 (leave to OS default)
-Applicable socket types:: all, when using TCP transports.
-
-
-ZMQ_TCP_KEEPALIVE_INTVL: Override TCP_KEEPINTVL socket option
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Override 'TCP_KEEPINTVL' socket option(where supported by OS). The default
-value of `-1` means to skip any overrides and leave it to OS default.
-
-[horizontal]
-Option value type:: int
-Option value unit:: -1,>0
-Default value:: -1 (leave to OS default)
-Applicable socket types:: all, when using TCP transports.
-
-
-ZMQ_TCP_MAXRT: Set TCP Maximum Retransmit Timeout
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-On OSes where it is supported, sets how long before an unacknowledged TCP
-retransmit times out. The system normally attempts many TCP retransmits
-following an exponential backoff strategy. This means that after a network
-outage, it may take a long time before the session can be re-established.
-Setting this option allows the timeout to happen at a shorter interval.
-
-[horizontal]
-Option value type:: int
-Option value unit:: milliseconds
-Default value:: 0 (leave to OS default)
-Applicable socket types:: all, when using TCP transports.
-
-
-ZMQ_TOS: Set the Type-of-Service on socket
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Sets the ToS fields (Differentiated services (DS) and Explicit Congestion
-Notification (ECN) field of the IP header. The ToS field is typically used
-to specify a packets priority. The availability of this option is dependent
-on intermediate network equipment that inspect the ToS field and provide a
-path for low-delay, high-throughput, highly-reliable service, etc.
-
-[horizontal]
-Option value type:: int
-Option value unit:: >0
-Default value:: 0
-Applicable socket types:: all, only for connection-oriented transports
-
-
-ZMQ_UNSUBSCRIBE: Remove message filter
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The 'ZMQ_UNSUBSCRIBE' option shall remove an existing message filter on a
-'ZMQ_SUB' socket. The filter specified must match an existing filter previously
-established with the 'ZMQ_SUBSCRIBE' option. If the socket has several
-instances of the same filter attached the 'ZMQ_UNSUBSCRIBE' option shall remove
-only one instance, leaving the rest in place and functional.
-
-[horizontal]
-Option value type:: binary data
-Option value unit:: N/A
-Default value:: N/A
-Applicable socket types:: ZMQ_SUB
-
-
-ZMQ_XPUB_VERBOSE: pass duplicate subscribe messages on XPUB socket
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Sets the 'XPUB' socket behaviour on new duplicated subscriptions. If enabled,
-the socket passes all subscribe messages to the caller. If disabled,
-only the first subscription to each filter will be passed. The default is 0
-(disabled).
-
-[horizontal]
-Option value type:: int
-Option value unit:: 0, 1
-Default value:: 0
-Applicable socket types:: ZMQ_XPUB
-
-
-ZMQ_XPUB_VERBOSER: pass duplicate subscribe and unsubscribe messages on XPUB socket
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Sets the 'XPUB' socket behaviour on new duplicated subscriptions and
-unsubscriptions. If enabled, the socket passes all subscribe and unsubscribe
-messages to the caller. If disabled, only the first subscription to each filter and
-the last unsubscription from each filter will be passed. The default is 0
-(disabled).
-
-[horizontal]
-Option value type:: int
-Option value unit:: 0, 1
-Default value:: 0
-Applicable socket types:: ZMQ_XPUB
-
-
-ZMQ_XPUB_MANUAL: change the subscription handling to manual
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Sets the 'XPUB' socket subscription handling mode manual/automatic.
-A value of '0' is the default and subscription requests will be handled automatically.
-A value of '1' will change the subscription requests handling to manual,
-with manual mode subscription requests are not added to the subscription list.
-To add subscription the user need to call setsockopt with ZMQ_SUBSCRIBE on XPUB socket.
-
-[horizontal]
-Option value type:: int
-Option value unit:: 0, 1
-Default value:: 0
-Applicable socket types:: ZMQ_XPUB
-
-
-ZMQ_XPUB_MANUAL_LAST_VALUE: change the subscription handling to manual
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-This option is similar to ZMQ_XPUB_MANUAL.
-The difference is that ZMQ_XPUB_MANUAL_LAST_VALUE changes the 'XPUB' socket
-behaviour to send the first message to the last subscriber after the socket
-receives a subscription and call setsockopt with ZMQ_SUBSCRIBE on 'XPUB' socket.
-This prevents duplicated messages when using last value caching(LVC).
-
-NOTE: in DRAFT state, not yet available in stable releases.
-
-[horizontal]
-Option value type:: int
-Option value unit:: 0, 1
-Default value:: 0
-Applicable socket types:: ZMQ_XPUB
-
-
-ZMQ_XPUB_NODROP: do not silently drop messages if SENDHWM is reached
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Sets the 'XPUB' socket behaviour to return error EAGAIN if SENDHWM is
-reached and the message could not be send.
-
-A value of `0` is the default and drops the message silently when the peers
-SNDHWM is reached.  A value of `1` returns an 'EAGAIN' error code if the
-SNDHWM is reached and ZMQ_DONTWAIT was used.
-
-[horizontal]
-Option value type:: int
-Option value unit:: 0, 1
-Default value:: 0
-Applicable socket types:: ZMQ_XPUB, ZMQ_PUB
-
-
-ZMQ_XPUB_WELCOME_MSG: set welcome message that will be received by subscriber when connecting
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Sets a welcome message the will be received by subscriber when connecting.
-Subscriber must subscribe to the Welcome message before connecting.
-Welcome message will also be sent on reconnecting.
-For welcome message to work well user must poll on incoming subscription messages on the XPUB socket and handle them.
-
-Use NULL and length of zero to disable welcome message.
-
-[horizontal]
-Option value type:: binary data
-Option value unit:: N/A
-Default value:: NULL
-Applicable socket types:: ZMQ_XPUB
-
-
-ZMQ_XSUB_VERBOSE_UNSUBSCRIBE: pass duplicate unsubscribe messages on XSUB socket
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Sets the 'XSUB' socket behaviour on duplicated unsubscriptions. If enabled, the socket
-passes all unsubscribe messages to the caller. If disabled, only the last unsubscription
-from each filter will be passed. The default is 0 (disabled).
-
-NOTE: in DRAFT state, not yet available in stable releases.
-
-[horizontal]
-Option value type:: int
-Option value unit:: 0, 1
-Default value:: 0
-Applicable socket types:: ZMQ_XSUB
-
-
-ZMQ_ONLY_FIRST_SUBSCRIBE: Process only first subscribe/unsubscribe in a multipart message
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-If set, only the first part of the multipart message is processed as
-a subscribe/unsubscribe message. The rest are forwarded as user data
-regardless of message contents.
-
-It not set (default), subscribe/unsubscribe messages in a multipart message
-are processed as such regardless of their number and order.
-
-[horizontal]
-Option value type:: int
-Option value unit:: boolean
-Default value:: 0 (false)
-Applicable socket types:: ZMQ_XSUB, ZMQ_XPUB
-
-
-ZMQ_ZAP_DOMAIN: Set RFC 27 authentication domain
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Sets the domain for ZAP (ZMQ RFC 27) authentication. A ZAP domain must be
-specified to enable authentication. When the ZAP domain is empty, which is
-the default, ZAP authentication is disabled. This is not compatible with
-previous versions of libzmq, so it can be controlled by ZMQ_ZAP_ENFORCE_DOMAIN
-which for now is disabled by default.
-See http://rfc.zeromq.org/spec:27 for more details.
-
-[horizontal]
-Option value type:: character string
-Option value unit:: N/A
-Default value:: empty
-Applicable socket types:: all, when using TCP transport
-
-
-ZMQ_ZAP_ENFORCE_DOMAIN: Set ZAP domain handling to strictly adhere the RFC
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The ZAP (ZMQ RFC 27) authentication protocol specifies that a domain must
-always be set. Older versions of libzmq did not follow the spec and allowed
-an empty domain to be set.
-This option can be used to enabled or disable the stricter, backward
-incompatible behaviour. For now it is disabled by default, but in a future
-version it will be enabled by default.
-
-[horizontal]
-Option value type:: int
-Option value unit:: 0, 1
-Default value:: 0
-Applicable socket types:: all, when using ZAP
-
-
-ZMQ_TCP_ACCEPT_FILTER: Assign filters to allow new TCP connections
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Assign an arbitrary number of filters that will be applied for each new TCP
-transport connection on a listening socket. If no filters are applied, then
-the TCP transport allows connections from any IP address. If at least one
-filter is applied then new connection source ip should be matched. To clear
-all filters call zmq_setsockopt(socket, ZMQ_TCP_ACCEPT_FILTER, NULL, 0).
-Filter is a null-terminated string with ipv6 or ipv4 CIDR.
-
-NOTE: This option is deprecated, please use authentication via the ZAP API
-and IP address allowing / blocking.
-
-[horizontal]
-Option value type:: binary data
-Option value unit:: N/A
-Default value:: no filters (allow from all)
-Applicable socket types:: all listening sockets, when using TCP transports.
-
-
-ZMQ_IPC_FILTER_GID: Assign group ID filters to allow new IPC connections
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Assign an arbitrary number of filters that will be applied for each new IPC
-transport connection on a listening socket. If no IPC filters are applied, then
-the IPC transport allows connections from any process. If at least one UID,
-GID, or PID filter is applied then new connection credentials should be
-matched. To clear all GID filters call zmq_setsockopt(socket,
-ZMQ_IPC_FILTER_GID, NULL, 0).
-
-NOTE: GID filters are only available on platforms supporting SO_PEERCRED or
-LOCAL_PEERCRED socket options (currently only Linux and later versions of
-OS X).
-
-NOTE: This option is deprecated, please use authentication via the ZAP API
-and IPC allowing / blocking.
-
-[horizontal]
-Option value type:: gid_t
-Option value unit:: N/A
-Default value:: no filters (allow from all)
-Applicable socket types:: all listening sockets, when using IPC transports.
-
-
-ZMQ_IPC_FILTER_PID: Assign process ID filters to allow new IPC connections
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Assign an arbitrary number of filters that will be applied for each new IPC
-transport connection on a listening socket. If no IPC filters are applied, then
-the IPC transport allows connections from any process. If at least one UID,
-GID, or PID filter is applied then new connection credentials should be
-matched. To clear all PID filters call zmq_setsockopt(socket,
-ZMQ_IPC_FILTER_PID, NULL, 0).
-
-NOTE: PID filters are only available on platforms supporting the SO_PEERCRED
-socket option (currently only Linux).
-
-NOTE: This option is deprecated, please use authentication via the ZAP API
-and IPC allowing / blocking.
-
-[horizontal]
-Option value type:: pid_t
-Option value unit:: N/A
-Default value:: no filters (allow from all)
-Applicable socket types:: all listening sockets, when using IPC transports.
-
-
-ZMQ_IPC_FILTER_UID: Assign user ID filters to allow new IPC connections
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Assign an arbitrary number of filters that will be applied for each new IPC
-transport connection on a listening socket. If no IPC filters are applied, then
-the IPC transport allows connections from any process. If at least one UID,
-GID, or PID filter is applied then new connection credentials should be
-matched. To clear all UID filters call zmq_setsockopt(socket,
-ZMQ_IPC_FILTER_UID, NULL, 0).
-
-NOTE: UID filters are only available on platforms supporting SO_PEERCRED or
-LOCAL_PEERCRED socket options (currently only Linux and later versions of
-OS X).
-
-NOTE: This option is deprecated, please use authentication via the ZAP API
-and IPC allowing / blocking.
-
-[horizontal]
-Option value type:: uid_t
-Option value unit:: N/A
-Default value:: no filters (allow from all)
-Applicable socket types:: all listening sockets, when using IPC transports.
-
-
-ZMQ_IPV4ONLY: Use IPv4-only on socket
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Set the IPv4-only option for the socket. This option is deprecated.
-Please use the ZMQ_IPV6 option.
-
-[horizontal]
-Option value type:: int
-Option value unit:: boolean
-Default value:: 1 (true)
-Applicable socket types:: all, when using TCP transports.
-
-
-ZMQ_VMCI_BUFFER_SIZE: Set buffer size of the VMCI socket
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The `ZMQ_VMCI_BUFFER_SIZE` option shall set the size of the underlying
-buffer for the socket. Used during negotiation before the connection is established.
-
-[horizontal]
-Option value type:: uint64_t
-Option value unit:: bytes
-Default value:: 65546
-Applicable socket types:: all, when using VMCI transport
-
-
-ZMQ_VMCI_BUFFER_MIN_SIZE: Set min buffer size of the VMCI socket
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The `ZMQ_VMCI_BUFFER_MIN_SIZE` option shall set the min size of the underlying
-buffer for the socket. Used during negotiation before the connection is established.
-
-[horizontal]
-Option value type:: uint64_t
-Option value unit:: bytes
-Default value:: 128
-Applicable socket types:: all, when using VMCI transport
-
-
-ZMQ_VMCI_BUFFER_MAX_SIZE: Set max buffer size of the VMCI socket
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The `ZMQ_VMCI_BUFFER_MAX_SIZE` option shall set the max size of the underlying
-buffer for the socket. Used during negotiation before the connection is established.
-
-[horizontal]
-Option value type:: uint64_t
-Option value unit:: bytes
-Default value:: 262144
-Applicable socket types:: all, when using VMCI transport
-
-
-ZMQ_VMCI_CONNECT_TIMEOUT: Set connection timeout of the VMCI socket
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The `ZMQ_VMCI_CONNECT_TIMEOUT` option shall set connection timeout
-for the socket.
-
-[horizontal]
-Option value type:: int
-Option value unit:: milliseconds
-Default value:: -1
-Applicable socket types:: all, when using VMCI transport
-
-
-ZMQ_MULTICAST_LOOP: Control multicast local loopback
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-For multicast UDP sender sockets this option sets whether the data
-sent should be looped back on local listening sockets.
-
-[horizontal]
-Option value type:: int
-Option value unit:: 0, 1
-Default value:: 1
-Applicable socket types:: ZMQ_RADIO, when using UDP multicast transport
-
-
-ZMQ_ROUTER_NOTIFY: Send connect and disconnect notifications
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Enable connect and disconnect notifications on a ROUTER socket.
-When enabled, the socket delivers a zero-length message (with routing-id
-as first frame) when a peer connects or disconnects. It's possible
-to notify both events for a peer by OR-ing the flag values. This option
-only applies to stream oriented (tcp, ipc) transports.
-
-NOTE: in DRAFT state, not yet available in stable releases.
-
-[horizontal]
-Option value type:: int
-Option value unit:: 0, ZMQ_NOTIFY_CONNECT, ZMQ_NOTIFY_DISCONNECT, ZMQ_NOTIFY_CONNECT | ZMQ_NOTIFY_DISCONNECT
-Default value:: 0
-Applicable socket types:: ZMQ_ROUTER
-
-
-ZMQ_IN_BATCH_SIZE: Maximal receive batch size
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Sets the maximal amount of messages that can be received in a single
-'recv' system call. WARNING: this option should almost never be changed.
-The default has been chosen to offer the best compromise between latency and
-throughtput. In the vast majority of cases, changing this option will result in
-worst result if not outright breakages.
-
-Cannot be zero.
-
-NOTE: in DRAFT state, not yet available in stable releases.
-
-[horizontal]
-Option value type:: int
-Option value unit:: messages
-Default value:: 8192
-Applicable socket types:: All, when using TCP, IPC, PGM or NORM transport.
-
-
-ZMQ_OUT_BATCH_SIZE: Maximal send batch size
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Sets the maximal amount of messages that can be sent in a single
-'send' system call. WARNING: this option should almost never be changed.
-The default has been chosen to offer the best compromise between latency and
-throughtput. In the vast majority of cases, changing this option will result in
-worst result if not outright breakages.
-
-Cannot be zero.
-
-NOTE: in DRAFT state, not yet available in stable releases.
-
-[horizontal]
-Option value type:: int
-Option value unit:: messages
-Default value:: 8192
-Applicable socket types:: All, when using TCP, IPC, PGM or NORM transport.
-
-
-RETURN VALUE
-------------
-The _zmq_setsockopt()_ function shall return zero if successful. Otherwise it
-shall return `-1` and set 'errno' to one of the values defined below.
-
-ERRORS
-------
-*EINVAL*::
-The requested option _option_name_ is unknown, or the requested _option_len_ or
-_option_value_ is invalid.
-*ETERM*::
-The 0MQ 'context' associated with the specified 'socket' was terminated.
-*ENOTSOCK*::
-The provided 'socket' was invalid.
-*EINTR*::
-The operation was interrupted by delivery of a signal.
-
-
-EXAMPLE
--------
-.Subscribing to messages on a 'ZMQ_SUB' socket
-----
-/* Subscribe to all messages */
-rc = zmq_setsockopt (socket, ZMQ_SUBSCRIBE, "", 0);
-assert (rc == 0);
-/* Subscribe to messages prefixed with "ANIMALS.CATS" */
-rc = zmq_setsockopt (socket, ZMQ_SUBSCRIBE, "ANIMALS.CATS", 12);
-----
-
-.Setting I/O thread affinity
-----
-int64_t affinity;
-/* Incoming connections on TCP port 5555 shall be handled by I/O thread 1 */
-affinity = 1;
-rc = zmq_setsockopt (socket, ZMQ_AFFINITY, &affinity, sizeof (affinity));
-assert (rc);
-rc = zmq_bind (socket, "tcp://lo:5555");
-assert (rc);
-/* Incoming connections on TCP port 5556 shall be handled by I/O thread 2 */
-affinity = 2;
-rc = zmq_setsockopt (socket, ZMQ_AFFINITY, &affinity, sizeof (affinity));
-assert (rc);
-rc = zmq_bind (socket, "tcp://lo:5556");
-assert (rc);
-----
-
-
-SEE ALSO
---------
-linkzmq:zmq_getsockopt[3]
-linkzmq:zmq_socket[3]
-linkzmq:zmq_plain[7]
-linkzmq:zmq_curve[7]
-linkzmq:zmq[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/libs/libzmq/doc/zmq_socket.txt b/libs/libzmq/doc/zmq_socket.txt
deleted file mode 100644
index dfdbd96..0000000
--- a/libs/libzmq/doc/zmq_socket.txt
+++ /dev/null
@@ -1,758 +0,0 @@
-zmq_socket(3)
-=============
-
-
-NAME
-----
-zmq_socket - create 0MQ socket
-
-
-SYNOPSIS
---------
-*void *zmq_socket (void '*context', int 'type');*
-
-
-DESCRIPTION
------------
-The 'zmq_socket()' function shall create a 0MQ socket within the specified
-'context' and return an opaque handle to the newly created socket. The 'type'
-argument specifies the socket type, which determines the semantics of
-communication over the socket.
-
-The newly created socket is initially unbound, and not associated with any
-endpoints. In order to establish a message flow a socket must first be
-connected to at least one endpoint with linkzmq:zmq_connect[3], or at least one
-endpoint must be created for accepting incoming connections with
-linkzmq:zmq_bind[3].
-
-.Key differences to conventional sockets
-Generally speaking, conventional sockets present a _synchronous_ interface to
-either connection-oriented reliable byte streams (SOCK_STREAM), or
-connection-less unreliable datagrams (SOCK_DGRAM). In comparison, 0MQ sockets
-present an abstraction of an asynchronous _message queue_, with the exact
-queueing semantics depending on the socket type in use. Where conventional
-sockets transfer streams of bytes or discrete datagrams, 0MQ sockets transfer
-discrete _messages_.
-
-0MQ sockets being _asynchronous_ means that the timings of the physical
-connection setup and tear down, reconnect and effective delivery are transparent
-to the user and organized by 0MQ itself. Further, messages may be _queued_ in
-the event that a peer is unavailable to receive them.
-
-Conventional sockets allow only strict one-to-one (two peers), many-to-one
-(many clients, one server), or in some cases one-to-many (multicast)
-relationships. With the exception of 'ZMQ_PAIR' and 'ZMQ_CHANNEL', 0MQ sockets may be connected
-*to multiple endpoints* using _zmq_connect()_, while simultaneously accepting
-incoming connections *from multiple endpoints* bound to the socket using
-_zmq_bind()_, thus allowing many-to-many relationships.
-
-.Thread safety
-0MQ has both thread safe socket type and _not_ thread safe socket types.
-Applications MUST NOT use a _not_ thread safe socket
-from multiple threads under any circumstances. Doing so results in undefined
-behaviour.
-
-Following are the thread safe sockets:
-* ZMQ_CLIENT
-* ZMQ_SERVER
-* ZMQ_DISH
-* ZMQ_RADIO
-* ZMQ_SCATTER
-* ZMQ_GATHER
-* ZMQ_PEER
-* ZMQ_CHANNEL
-
-.Socket types
-The following sections present the socket types defined by 0MQ, grouped by the
-general _messaging pattern_ which is built from related socket types.
-
-
-Client-server pattern
-~~~~~~~~~~~~~~~~~~~~~
-
-The client-server pattern is used to allow a single 'ZMQ_SERVER' _server_ talk
-to one or more 'ZMQ_CLIENT' _clients_. The client always starts the conversation,
-after which either peer can send messages asynchronously, to the other.
-
-The client-server pattern is formally defined by http://rfc.zeromq.org/spec:41.
-
-NOTE: Server-client is still in draft phase.
-
-ZMQ_CLIENT
-^^^^^^^^^^
-A 'ZMQ_CLIENT' socket talks to a 'ZMQ_SERVER' socket. Either peer can connect,
-though the usual and recommended model is to bind the 'ZMQ_SERVER' and connect
-the 'ZMQ_CLIENT'.
-
-If the 'ZMQ_CLIENT' socket has established a connection, linkzmq:zmq_send[3]
-will accept messages, queue them, and send them as rapidly as the network
-allows. The outgoing buffer limit is defined by the high water mark for the
-socket. If the outgoing buffer is full, or, for connection-oriented transports,
-if the ZMQ_IMMEDIATE option is set and there is no connected peer,
-linkzmq:zmq_send[3] will block.
-The 'ZMQ_CLIENT' socket will not drop messages.
-
-When a 'ZMQ_CLIENT' socket is connected to multiple 'ZMQ_SERVER' sockets,
-outgoing messages are distributed between connected peers on a round-robin
-basis. Likewise, the 'ZMQ_CLIENT' socket receives messages fairly from each
-connected peer. This usage is sensible only for stateless protocols.
-
-'ZMQ_CLIENT' sockets are threadsafe and can be used from multiple threads
-at the same time. Note that replies from a 'ZMQ_SERVER' socket will go to
-the first client thread that calls linkzmq:zmq_msg_recv[3]. If you need to get
-replies back to the originating thread, use one 'ZMQ_CLIENT' socket per
-thread.
-
-NOTE: 'ZMQ_CLIENT' sockets are threadsafe. They do not accept the ZMQ_SNDMORE
-option on sends not ZMQ_RCVMORE on receives. This limits them to single part
-data. The intention is to extend the API to allow scatter/gather of multi-part
-data.
-
-[horizontal]
-.Summary of ZMQ_CLIENT characteristics
-Compatible peer sockets:: 'ZMQ_SERVER'
-Direction:: Bidirectional
-Send/receive pattern:: Unrestricted
-Outgoing routing strategy:: Round-robin
-Incoming routing strategy:: Fair-queued
-Action in mute state:: Block
-
-
-ZMQ_SERVER
-^^^^^^^^^^
-A 'ZMQ_SERVER' socket talks to a set of 'ZMQ_CLIENT' sockets. A 'ZMQ_SERVER'
-socket can only reply to an incoming message: the 'ZMQ_CLIENT' peer must
-always initiate a conversation.
-
-Each received message has a 'routing_id' that is a 32-bit unsigned integer.
-The application can fetch this with linkzmq:zmq_msg_routing_id[3]. To send
-a message to a given 'ZMQ_CLIENT' peer the application must set the peer's
-'routing_id' on the message, using linkzmq:zmq_msg_set_routing_id[3].
-
-If the 'routing_id' is not specified, or does not refer to a connected client
-peer, the send call will fail with EHOSTUNREACH. If the outgoing buffer for
-the client peer is full, the send call shall block, unless ZMQ_DONTWAIT is
-used in the send, in which case it shall fail with EAGAIN. The 'ZMQ_SERVER'
-socket shall not drop messages in any case.
-
-NOTE: 'ZMQ_SERVER' sockets are threadsafe. They do not accept the ZMQ_SNDMORE
-option on sends not ZMQ_RCVMORE on receives. This limits them to single part
-data. The intention is to extend the API to allow scatter/gather of multi-part
-data.
-
-[horizontal]
-.Summary of ZMQ_SERVER characteristics
-Compatible peer sockets:: 'ZMQ_CLIENT'
-Direction:: Bidirectional
-Send/receive pattern:: Unrestricted
-Outgoing routing strategy:: See text
-Incoming routing strategy:: Fair-queued
-Action in mute state:: Return EAGAIN
-
-
-Radio-dish pattern
-~~~~~~~~~~~~~~~~~~
-
-The radio-dish pattern is used for one-to-many distribution of data from
-a single _publisher_ to multiple _subscribers_ in a fan out fashion.
-
-Radio-dish is using groups (vs Pub-sub topics), Dish sockets can join a group
-and each message sent by Radio sockets belong to a group.
-
-Groups are null terminated strings limited to 16 chars length (including null).
-The intention is to increase the length to 40 chars (including null).
-The encoding of groups shall be UTF8.
-
-Groups are matched using exact matching (vs prefix matching of PubSub).
-
-NOTE: Radio-dish is still in draft phase.
-
-ZMQ_RADIO
-^^^^^^^
-A socket of type 'ZMQ_RADIO' is used by a _publisher_ to distribute data.
-Each message belong to a group, a group is specified with linkzmq:zmq_msg_set_group[3].
-Messages are distributed to all members of a group.
-The linkzmq:zmq_recv[3] function is not implemented for this socket type.
-
-When a 'ZMQ_RADIO' socket enters the 'mute' state due to having reached the
-high water mark for a _subscriber_, then any messages that would be sent to the
-_subscriber_ in question shall instead be dropped until the mute state
-ends. The _zmq_send()_ function shall never block for this socket type.
-
-NOTE: 'ZMQ_RADIO' sockets are threadsafe. They do not accept the ZMQ_SNDMORE
-option on sends. This limits them to single part data.
-
-[horizontal]
-.Summary of ZMQ_RADIO characteristics
-Compatible peer sockets:: 'ZMQ_DISH'
-Direction:: Unidirectional
-Send/receive pattern:: Send only
-Incoming routing strategy:: N/A
-Outgoing routing strategy:: Fan out
-Action in mute state:: Drop
-
-
-ZMQ_DISH
-^^^^^^^^
-A socket of type 'ZMQ_DISH' is used by a _subscriber_ to subscribe to groups
-distributed by a _radio_. Initially a 'ZMQ_DISH' socket is not subscribed to
-any groups, use linkzmq:zmq_join[3] to
-join a group.
-To get the group the message belong to call linkzmq:zmq_msg_group[3].
-The _zmq_send()_ function is not implemented for this socket type.
-
-NOTE: 'ZMQ_DISH' sockets are threadsafe. They do not accept ZMQ_RCVMORE on receives.
-This limits them to single part data.
-
-[horizontal]
-.Summary of ZMQ_DISH characteristics
-Compatible peer sockets:: 'ZMQ_RADIO'
-Direction:: Unidirectional
-Send/receive pattern:: Receive only
-Incoming routing strategy:: Fair-queued
-Outgoing routing strategy:: N/A
-
-
-Publish-subscribe pattern
-~~~~~~~~~~~~~~~~~~~~~~~~~
-The publish-subscribe pattern is used for one-to-many distribution of data from
-a single _publisher_ to multiple _subscribers_ in a fan out fashion.
-
-The publish-subscribe pattern is formally defined by http://rfc.zeromq.org/spec:29.
-
-ZMQ_PUB
-^^^^^^^
-A socket of type 'ZMQ_PUB' is used by a _publisher_ to distribute data.
-Messages sent are distributed in a fan out fashion to all connected peers.
-The linkzmq:zmq_recv[3] function is not implemented for this socket type.
-
-When a 'ZMQ_PUB' socket enters the 'mute' state due to having reached the
-high water mark for a _subscriber_, then any messages that would be sent to the
-_subscriber_ in question shall instead be dropped until the mute state
-ends. The _zmq_send()_ function shall never block for this socket type.
-
-[horizontal]
-.Summary of ZMQ_PUB characteristics
-Compatible peer sockets:: 'ZMQ_SUB', 'ZMQ_XSUB'
-Direction:: Unidirectional
-Send/receive pattern:: Send only
-Incoming routing strategy:: N/A
-Outgoing routing strategy:: Fan out
-Action in mute state:: Drop
-
-
-ZMQ_SUB
-^^^^^^^
-A socket of type 'ZMQ_SUB' is used by a _subscriber_ to subscribe to data
-distributed by a _publisher_. Initially a 'ZMQ_SUB' socket is not subscribed to
-any messages, use the 'ZMQ_SUBSCRIBE' option of linkzmq:zmq_setsockopt[3] to
-specify which messages to subscribe to. The _zmq_send()_ function is not
-implemented for this socket type.
-
-[horizontal]
-.Summary of ZMQ_SUB characteristics
-Compatible peer sockets:: 'ZMQ_PUB', 'ZMQ_XPUB'
-Direction:: Unidirectional
-Send/receive pattern:: Receive only
-Incoming routing strategy:: Fair-queued
-Outgoing routing strategy:: N/A
-
-
-ZMQ_XPUB
-^^^^^^^^
-Same as ZMQ_PUB except that you can receive subscriptions from the peers
-in form of incoming messages. Subscription message is a byte 1 (for
-subscriptions) or byte 0 (for unsubscriptions) followed by the subscription
-body. Messages without a sub/unsub prefix are also received, but have no
-effect on subscription status.
-
-[horizontal]
-.Summary of ZMQ_XPUB characteristics
-Compatible peer sockets:: 'ZMQ_SUB', 'ZMQ_XSUB'
-Direction:: Unidirectional
-Send/receive pattern:: Send messages, receive subscriptions
-Incoming routing strategy:: N/A
-Outgoing routing strategy:: Fan out
-Action in mute state:: Drop
-
-
-ZMQ_XSUB
-^^^^^^^^
-Same as ZMQ_SUB except that you subscribe by sending subscription messages to
-the socket. Subscription message is a byte 1 (for subscriptions) or byte 0
-(for unsubscriptions) followed by the subscription body. Messages without a
-sub/unsub prefix may also be sent, but have no effect on subscription status.
-
-[horizontal]
-.Summary of ZMQ_XSUB characteristics
-Compatible peer sockets:: 'ZMQ_PUB', 'ZMQ_XPUB'
-Direction:: Unidirectional
-Send/receive pattern:: Receive messages, send subscriptions
-Incoming routing strategy:: Fair-queued
-Outgoing routing strategy:: N/A
-Action in mute state:: Drop
-
-
-Pipeline pattern
-~~~~~~~~~~~~~~~~
-The pipeline pattern is used for distributing data to _nodes_ arranged in
-a pipeline. Data always flows down the pipeline, and each stage of the pipeline
-is connected to at least one _node_. When a pipeline stage is connected to
-multiple _nodes_ data is round-robined among all connected _nodes_.
-
-The pipeline pattern is formally defined by http://rfc.zeromq.org/spec:30.
-
-ZMQ_PUSH
-^^^^^^^^
-A socket of type 'ZMQ_PUSH' is used by a pipeline _node_ to send messages
-to downstream pipeline _nodes_. Messages are round-robined to all connected
-downstream _nodes_. The _zmq_recv()_ function is not implemented for this
-socket type.
-
-When a 'ZMQ_PUSH' socket enters the 'mute' state due to having reached the
-high water mark for all downstream _nodes_, or, for connection-oriented transports,
-if the ZMQ_IMMEDIATE option is set and there are no downstream _nodes_ at all,
-then any linkzmq:zmq_send[3] operations on the socket shall block until the mute
-state ends or at least one downstream _node_ becomes available for sending;
-messages are not discarded.
-
-[horizontal]
-.Summary of ZMQ_PUSH characteristics
-Compatible peer sockets:: 'ZMQ_PULL'
-Direction:: Unidirectional
-Send/receive pattern:: Send only
-Incoming routing strategy:: N/A
-Outgoing routing strategy:: Round-robin
-Action in mute state:: Block
-
-
-ZMQ_PULL
-^^^^^^^^
-A socket of type 'ZMQ_PULL' is used by a pipeline _node_ to receive messages
-from upstream pipeline _nodes_. Messages are fair-queued from among all
-connected upstream _nodes_. The _zmq_send()_ function is not implemented for
-this socket type.
-
-[horizontal]
-.Summary of ZMQ_PULL characteristics
-Compatible peer sockets:: 'ZMQ_PUSH'
-Direction:: Unidirectional
-Send/receive pattern:: Receive only
-Incoming routing strategy:: Fair-queued
-Outgoing routing strategy:: N/A
-Action in mute state:: Block
-
-Scatter-gather pattern
-~~~~~~~~~~~~~~~~
-The scatter-gather pattern is the thread-safe version of the pipeline pattern.
-The scatter-gather pattern is used for distributing data to _nodes_ arranged in
-a pipeline. Data always flows down the pipeline, and each stage of the pipeline
-is connected to at least one _node_. When a pipeline stage is connected to
-multiple _nodes_ data is round-robined among all connected _nodes_.
-
-ZMQ_SCATTER
-^^^^^^^^
-A socket of type 'ZMQ_SCATTER' is used by a scatter-gather _node_ to send messages
-to downstream scatter-gather _nodes_. Messages are round-robined to all connected
-downstream _nodes_. The _zmq_recv()_ function is not implemented for this
-socket type.
-
-When a 'ZMQ_SCATTER' socket enters the 'mute' state due to having reached the
-high water mark for all downstream _nodes_, or, for connection-oriented transports,
-if the ZMQ_IMMEDIATE option is set and there are no downstream _nodes_ at all,
-then any linkzmq:zmq_send[3] operations on the socket shall block until the mute
-state ends or at least one downstream _node_ becomes available for sending;
-messages are not discarded.
-
-NOTE: 'ZMQ_SCATTER' sockets are threadsafe. They do not accept ZMQ_RCVMORE on receives.
-This limits them to single part data.
-
-[horizontal]
-.Summary of ZMQ_SCATTER characteristics
-Compatible peer sockets:: 'ZMQ_SCATTER'
-Direction:: Unidirectional
-Send/receive pattern:: Send only
-Incoming routing strategy:: N/A
-Outgoing routing strategy:: Round-robin
-Action in mute state:: Block
-
-
-ZMQ_GATHER
-^^^^^^^^
-A socket of type 'ZMQ_GATHER' is used by a scatter-gather _node_ to receive messages
-from upstream scatter-gather _nodes_. Messages are fair-queued from among all
-connected upstream _nodes_. The _zmq_send()_ function is not implemented for
-this socket type.
-
-NOTE: 'ZMQ_GATHER' sockets are threadsafe. They do not accept ZMQ_RCVMORE on receives.
-This limits them to single part data.
-
-[horizontal]
-.Summary of ZMQ_GATHER characteristics
-Compatible peer sockets:: 'ZMQ_GATHER'
-Direction:: Unidirectional
-Send/receive pattern:: Receive only
-Incoming routing strategy:: Fair-queued
-Outgoing routing strategy:: N/A
-Action in mute state:: Block
-
-
-Exclusive pair pattern
-~~~~~~~~~~~~~~~~~~~~~~
-The exclusive pair pattern is used to connect a peer to precisely one other
-peer. This pattern is used for inter-thread communication across the inproc
-transport.
-
-The exclusive pair pattern is formally defined by http://rfc.zeromq.org/spec:31.
-
-ZMQ_PAIR
-^^^^^^^^
-A socket of type 'ZMQ_PAIR' can only be connected to a single peer at any one
-time.  No message routing or filtering is performed on messages sent over a
-'ZMQ_PAIR' socket.
-
-When a 'ZMQ_PAIR' socket enters the 'mute' state due to having reached the
-high water mark for the connected peer, or, for connection-oriented transports,
-if the ZMQ_IMMEDIATE option is set and there is no connected peer, then
-any linkzmq:zmq_send[3] operations on the socket shall block until the peer
-becomes available for sending; messages are not discarded.
-
-While 'ZMQ_PAIR' sockets can be used over transports other than linkzmq:zmq_inproc[7],
-their inability to auto-reconnect coupled with the fact new incoming connections will
-be terminated while any previous connections (including ones in a closing state)
-exist makes them unsuitable for TCP in most cases.
-
-NOTE: 'ZMQ_PAIR' sockets are designed for inter-thread communication across
-the linkzmq:zmq_inproc[7] transport and do not implement functionality such
-as auto-reconnection.
-
-[horizontal]
-.Summary of ZMQ_PAIR characteristics
-Compatible peer sockets:: 'ZMQ_PAIR'
-Direction:: Bidirectional
-Send/receive pattern:: Unrestricted
-Incoming routing strategy:: N/A
-Outgoing routing strategy:: N/A
-Action in mute state:: Block
-
-
-Peer-to-peer pattern
-~~~~~~~~~~~~~~~~~~~~~~
-
-The peer-to-peer pattern is used to connect a peer to multiple peers.
-Peer can both connect and bind and mix both of them with the same socket.
-The peer-to-peer pattern is useful to build peer-to-peer networks (e.g zyre, bitcoin, torrent)
-where a peer can both accept connections from other peers or connect to them.
-
-NOTE: Peer-to-peer is still in draft phase.
-
-ZMQ_PEER
-^^^^^^^^
-A 'ZMQ_PEER' socket talks to a set of 'ZMQ_PEER' sockets.
-
-To connect and fetch the 'routing_id' of the peer use linkzmq:zmq_connect_peer[3].
-
-Each received message has a 'routing_id' that is a 32-bit unsigned integer.
-The application can fetch this with linkzmq:zmq_msg_routing_id[3].
-
-To send a message to a given 'ZMQ_PEER' peer the application must set the peer's
-'routing_id' on the message, using linkzmq:zmq_msg_set_routing_id[3].
-
-If the 'routing_id' is not specified, or does not refer to a connected client
-peer, the send call will fail with EHOSTUNREACH. If the outgoing buffer for
-the peer is full, the send call shall block, unless ZMQ_DONTWAIT is
-used in the send, in which case it shall fail with EAGAIN. The 'ZMQ_PEER'
-socket shall not drop messages in any case.
-
-NOTE: 'ZMQ_PEER' sockets are threadsafe. They do not accept the ZMQ_SNDMORE
-option on sends not ZMQ_RCVMORE on receives. This limits them to single part
-data.
-
-[horizontal]
-.Summary of ZMQ_PEER characteristics
-Compatible peer sockets:: 'ZMQ_PEER'
-Direction:: Bidirectional
-Send/receive pattern:: Unrestricted
-Outgoing routing strategy:: See text
-Incoming routing strategy:: Fair-queued
-Action in mute state:: Return EAGAIN
-
-Channel pattern
-~~~~~~~~~~~~~~~~~~~~~~
-The channel pattern is the thread-safe version of the exclusive pair pattern.
-The channel pattern is used to connect a peer to precisely one other
-peer. This pattern is used for inter-thread communication across the inproc
-transport.
-
-NOTE: Channel is still in draft phase.
-
-ZMQ_CHANNEL
-^^^^^^^^
-A socket of type 'ZMQ_CHANNEL' can only be connected to a single peer at any one
-time.  No message routing or filtering is performed on messages sent over a
-'ZMQ_CHANNEL' socket.
-
-When a 'ZMQ_CHANNEL' socket enters the 'mute' state due to having reached the
-high water mark for the connected peer, or, for connection-oriented transports,
-if the ZMQ_IMMEDIATE option is set and there is no connected peer, then
-any linkzmq:zmq_send[3] operations on the socket shall block until the peer
-becomes available for sending; messages are not discarded.
-
-While 'ZMQ_CHANNEL' sockets can be used over transports other than linkzmq:zmq_inproc[7],
-their inability to auto-reconnect coupled with the fact new incoming connections will
-be terminated while any previous connections (including ones in a closing state)
-exist makes them unsuitable for TCP in most cases.
-
-NOTE: 'ZMQ_CHANNEL' sockets are designed for inter-thread communication across
-the linkzmq:zmq_inproc[7] transport and do not implement functionality such
-as auto-reconnection.
-
-NOTE: 'ZMQ_CHANNEL' sockets are threadsafe. They do not accept ZMQ_RCVMORE on receives.
-This limits them to single part data.
-
-[horizontal]
-.Summary of ZMQ_CHANNEL characteristics
-Compatible peer sockets:: 'ZMQ_CHANNEL'
-Direction:: Bidirectional
-Send/receive pattern:: Unrestricted
-Incoming routing strategy:: N/A
-Outgoing routing strategy:: N/A
-Action in mute state:: Block
-
-Native Pattern
-~~~~~~~~~~~~~~
-The native pattern is used for communicating with TCP peers and allows
-asynchronous requests and replies in either direction.
-
-
-ZMQ_STREAM
-^^^^^^^^^^
-A socket of type 'ZMQ_STREAM' is used to send and receive TCP data from a
-non-0MQ peer, when using the tcp:// transport. A 'ZMQ_STREAM' socket can
-act as client and/or server, sending and/or receiving TCP data asynchronously.
-
-When receiving TCP data, a 'ZMQ_STREAM' socket shall prepend a message part
-containing the _routing id_ of the originating peer to the message before passing
-it to the application. Messages received are fair-queued from among all
-connected peers.
-
-When sending TCP data, a 'ZMQ_STREAM' socket shall remove the first part of the
-message and use it to determine the _routing id_ of the peer the message shall be
-routed to, and unroutable messages shall cause an EHOSTUNREACH or EAGAIN error.
-
-To open a connection to a server, use the zmq_connect call, and then fetch the
-socket routing id using the zmq_getsockopt call with the ZMQ_ROUTING_ID option.
-
-To close a specific connection, send the routing id frame followed by a
-zero-length message (see EXAMPLE section).
-
-When a connection is made, a zero-length message will be received by the
-application.  Similarly, when the peer disconnects (or the connection is lost),
-a zero-length message will be received by the application.
-
-You must send one routing id frame followed by one data frame. The ZMQ_SNDMORE
-flag is required for routing id frames but is ignored on data frames.
-
-[horizontal]
-.Summary of ZMQ_STREAM characteristics
-Compatible peer sockets:: none.
-Direction:: Bidirectional
-Send/receive pattern:: Unrestricted
-Outgoing routing strategy:: See text
-Incoming routing strategy:: Fair-queued
-Action in mute state:: EAGAIN
-
-
-Request-reply pattern
-~~~~~~~~~~~~~~~~~~~~~
-The request-reply pattern is used for sending requests from a ZMQ_REQ _client_
-to one or more ZMQ_REP _services_, and receiving subsequent replies to each
-request sent.
-
-The request-reply pattern is formally defined by http://rfc.zeromq.org/spec:28.
-
-ZMQ_REQ
-^^^^^^^
-A socket of type 'ZMQ_REQ' is used by a _client_ to send requests to and
-receive replies from a _service_. This socket type allows only an alternating
-sequence of _zmq_send(request)_ and subsequent _zmq_recv(reply)_ calls. Each
-request sent is round-robined among all _services_, and each reply received is
-matched with the last issued request.
-
-For connection-oriented transports, If the ZMQ_IMMEDIATE option is set and there
-is no service available, then any send operation on the socket shall block until
-at least one _service_ becomes available. The REQ socket shall not discard messages.
-
-[horizontal]
-.Summary of ZMQ_REQ characteristics
-Compatible peer sockets:: 'ZMQ_REP', 'ZMQ_ROUTER'
-Direction:: Bidirectional
-Send/receive pattern:: Send, Receive, Send, Receive, ...
-Outgoing routing strategy:: Round-robin
-Incoming routing strategy:: Last peer
-Action in mute state:: Block
-
-
-ZMQ_REP
-^^^^^^^
-A socket of type 'ZMQ_REP' is used by a _service_ to receive requests from and
-send replies to a _client_. This socket type allows only an alternating
-sequence of _zmq_recv(request)_ and subsequent _zmq_send(reply)_ calls. Each
-request received is fair-queued from among all _clients_, and each reply sent
-is routed to the _client_ that issued the last request. If the original
-requester does not exist any more the reply is silently discarded.
-
-[horizontal]
-.Summary of ZMQ_REP characteristics
-Compatible peer sockets:: 'ZMQ_REQ', 'ZMQ_DEALER'
-Direction:: Bidirectional
-Send/receive pattern:: Receive, Send, Receive, Send, ...
-Incoming routing strategy:: Fair-queued
-Outgoing routing strategy:: Last peer
-
-
-ZMQ_DEALER
-^^^^^^^^^^
-A socket of type 'ZMQ_DEALER' is an advanced pattern used for extending
-request/reply sockets. Each message sent is round-robined among all connected
-peers, and each message received is fair-queued from all connected peers.
-
-When a 'ZMQ_DEALER' socket enters the 'mute' state due to having reached the
-high water mark for all peers, or, for connection-oriented transports, if the
-ZMQ_IMMEDIATE option is set and there are no peers at all, then any
-linkzmq:zmq_send[3] operations on the socket shall block until the mute state
-ends or at least one peer becomes available for sending; messages are not discarded.
-
-When a 'ZMQ_DEALER' socket is connected to a 'ZMQ_REP' socket each message sent
-must consist of an empty message part, the _delimiter_, followed by one or more
-_body parts_.
-
-[horizontal]
-.Summary of ZMQ_DEALER characteristics
-Compatible peer sockets:: 'ZMQ_ROUTER', 'ZMQ_REP', 'ZMQ_DEALER'
-Direction:: Bidirectional
-Send/receive pattern:: Unrestricted
-Outgoing routing strategy:: Round-robin
-Incoming routing strategy:: Fair-queued
-Action in mute state:: Block
-
-
-ZMQ_ROUTER
-^^^^^^^^^^
-A socket of type 'ZMQ_ROUTER' is an advanced socket type used for extending
-request/reply sockets. When receiving messages a 'ZMQ_ROUTER' socket shall
-prepend a message part containing the _routing id_ of the originating peer to the
-message before passing it to the application. Messages received are fair-queued
-from among all connected peers. When sending messages a 'ZMQ_ROUTER' socket shall
-remove the first part of the message and use it to determine the _routing id _ of
-the peer the message shall be routed to. If the peer does not exist anymore, or
-has never existed, the message shall be silently discarded. However, if
-'ZMQ_ROUTER_MANDATORY' socket option is set to '1', the socket shall fail
-with EHOSTUNREACH in both cases.
-
-When a 'ZMQ_ROUTER' socket enters the 'mute' state due to having reached the
-high water mark for all peers, then any messages sent to the socket shall be dropped
-until the mute state ends. Likewise, any messages routed to a peer for which
-the individual high water mark has been reached shall also be dropped. If,
-'ZMQ_ROUTER_MANDATORY' is set to '1', the socket shall block or return EAGAIN in
-both cases.
-
-When a 'ZMQ_ROUTER' socket has 'ZMQ_ROUTER_MANDATORY' flag set to '1', the
-socket shall generate 'ZMQ_POLLIN' events upon reception of messages from one
-or more peers. Likewise, the socket shall generate 'ZMQ_POLLOUT' events when
-at least one message can be sent to one or more peers.
-
-When a 'ZMQ_REQ' socket is connected to a 'ZMQ_ROUTER' socket, in addition to the
-_routing id_ of the originating peer each message received shall contain an empty
-_delimiter_ message part. Hence, the entire structure of each received message
-as seen by the application becomes: one or more _routing id_ parts, _delimiter_
-part, one or more _body parts_. When sending replies to a 'ZMQ_REQ' socket the
-application must include the _delimiter_ part.
-
-[horizontal]
-.Summary of ZMQ_ROUTER characteristics
-Compatible peer sockets:: 'ZMQ_DEALER', 'ZMQ_REQ', 'ZMQ_ROUTER'
-Direction:: Bidirectional
-Send/receive pattern:: Unrestricted
-Outgoing routing strategy:: See text
-Incoming routing strategy:: Fair-queued
-Action in mute state:: Drop (see text)
-
-
-RETURN VALUE
-------------
-The _zmq_socket()_ function shall return an opaque handle to the newly created
-socket if successful. Otherwise, it shall return NULL and set 'errno' to one of
-the values defined below.
-
-
-ERRORS
-------
-*EINVAL*::
-The requested socket 'type' is invalid.
-*EFAULT*::
-The provided 'context' is invalid.
-*EMFILE*::
-The limit on the total number of open 0MQ sockets has been reached.
-*ETERM*::
-The context specified was shutdown or terminated.
-
-EXAMPLE
--------
-.Creating a simple HTTP server using ZMQ_STREAM
-----
-void *ctx = zmq_ctx_new ();
-assert (ctx);
-/* Create ZMQ_STREAM socket */
-void *socket = zmq_socket (ctx, ZMQ_STREAM);
-assert (socket);
-int rc = zmq_bind (socket, "tcp://*:8080");
-assert (rc == 0);
-/* Data structure to hold the ZMQ_STREAM routing id */
-uint8_t routing_id [256];
-size_t routing_id_size = 256;
-/* Data structure to hold the ZMQ_STREAM received data */
-uint8_t raw [256];
-size_t raw_size = 256;
-while (1) {
-	/*  Get HTTP request; routing id frame and then request */
-	routing_id_size = zmq_recv (socket, routing_id, 256, 0);
-	assert (routing_id_size > 0);
-	do {
-		raw_size = zmq_recv (socket, raw, 256, 0);
-		assert (raw_size >= 0);
-	} while (raw_size == 256);
-	/* Prepares the response */
-	char http_response [] =
-		"HTTP/1.0 200 OK\r\n"
-		"Content-Type: text/plain\r\n"
-		"\r\n"
-		"Hello, World!";
-	/* Sends the routing id frame followed by the response */
-	zmq_send (socket, routing_id, routing_id_size, ZMQ_SNDMORE);
-	zmq_send (socket, http_response, strlen (http_response), 0);
-	/* Closes the connection by sending the routing id frame followed by a zero response */
-	zmq_send (socket, routing_id, routing_id_size, ZMQ_SNDMORE);
-	zmq_send (socket, 0, 0, 0);
-}
-zmq_close (socket);
-zmq_ctx_destroy (ctx);
-----
-
-
-SEE ALSO
---------
-linkzmq:zmq_init[3]
-linkzmq:zmq_setsockopt[3]
-linkzmq:zmq_bind[3]
-linkzmq:zmq_connect[3]
-linkzmq:zmq_send[3]
-linkzmq:zmq_recv[3]
-linkzmq:zmq_inproc[7]
-linkzmq:zmq[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/libs/libzmq/doc/zmq_socket_monitor.txt b/libs/libzmq/doc/zmq_socket_monitor.txt
deleted file mode 100644
index 46a97cc..0000000
--- a/libs/libzmq/doc/zmq_socket_monitor.txt
+++ /dev/null
@@ -1,296 +0,0 @@
-zmq_socket_monitor(3)
-=====================
-
-
-NAME
-----
-
-zmq_socket_monitor - monitor socket events
-
-
-SYNOPSIS
---------
-*int zmq_socket_monitor (void '*socket', char '*endpoint', int 'events');*
-
-
-DESCRIPTION
------------
-The _zmq_socket_monitor()_ method lets an application thread track
-socket events (like connects) on a ZeroMQ socket. Each call to this
-method creates a 'ZMQ_PAIR' socket and binds that to the specified
-inproc:// 'endpoint'. To collect the socket events, you must create
-your own 'ZMQ_PAIR' socket, and connect that to the endpoint.
-
-Note that there is also a DRAFT function linkzmq:zmq_socket_monitor_versioned[3],
-which allows to subscribe to events that provide more information.
-Calling zmq_socket_monitor is equivalent to calling 'zmq_socket_monitor_versioned'
-with the 'event_version' parameter set to 1, with the exception of error cases.
-
-The 'events' argument is a bitmask of the socket events you wish to
-monitor, see 'Supported events' below. To monitor all events, use the
-event value ZMQ_EVENT_ALL. NOTE: as new events are added, the catch-all
-value will start returning them. An application that relies on a strict
-and fixed sequence of events must not use ZMQ_EVENT_ALL in order to
-guarantee compatibility with future versions.
-
-Each event is sent as two frames. The first frame contains an event
-number (16 bits), and an event value (32 bits) that provides additional
-data according to the event number. The second frame contains a string
-that specifies the affected endpoint.
-
-----
-The _zmq_socket_monitor()_ method supports only connection-oriented
-transports, that is, TCP, IPC, and TIPC.
-----
-
-Supported events
-----------------
-
-ZMQ_EVENT_CONNECTED
-~~~~~~~~~~~~~~~~~~~
-The socket has successfully connected to a remote peer. The event value
-is the file descriptor (FD) of the underlying network socket. Warning:
-there is no guarantee that the FD is still valid by the time your code
-receives this event.
-
-ZMQ_EVENT_CONNECT_DELAYED
-~~~~~~~~~~~~~~~~~~~~~~~~~
-A connect request on the socket is pending. The event value is unspecified.
-
-ZMQ_EVENT_CONNECT_RETRIED
-~~~~~~~~~~~~~~~~~~~~~~~~~
-A connect request failed, and is now being retried. The event value is the
-reconnect interval in milliseconds. Note that the reconnect interval is
-recalculated at each retry.
-
-ZMQ_EVENT_LISTENING
-~~~~~~~~~~~~~~~~~~~
-The socket was successfully bound to a network interface. The event value
-is the FD of the underlying network socket. Warning: there is no guarantee
-that the FD is still valid by the time your code receives this event.
-
-ZMQ_EVENT_BIND_FAILED
-~~~~~~~~~~~~~~~~~~~~~
-The socket could not bind to a given interface. The event value is the
-errno generated by the system bind call.
-
-ZMQ_EVENT_ACCEPTED
-~~~~~~~~~~~~~~~~~~
-The socket has accepted a connection from a remote peer. The event value is
-the FD of the underlying network socket. Warning: there is no guarantee that
-the FD is still valid by the time your code receives this event.
-
-ZMQ_EVENT_ACCEPT_FAILED
-~~~~~~~~~~~~~~~~~~~~~~~
-The socket has rejected a connection from a remote peer. The event value is
-the errno generated by the accept call.
-
-ZMQ_EVENT_CLOSED
-~~~~~~~~~~~~~~~~
-The socket was closed. The event value is the FD of the (now closed) network
-socket.
-
-ZMQ_EVENT_CLOSE_FAILED
-~~~~~~~~~~~~~~~~~~~~~~
-The socket close failed. The event value is the errno returned by the system
-call. Note that this event occurs only on IPC transports.
-
-ZMQ_EVENT_DISCONNECTED
-~~~~~~~~~~~~~~~~~~~~~~
-The socket was disconnected unexpectedly. The event value is the FD of the
-underlying network socket. Warning: this socket will be closed.
-
-ZMQ_EVENT_MONITOR_STOPPED
-~~~~~~~~~~~~~~~~~~~~~~~~~
-Monitoring on this socket ended.
-
-ZMQ_EVENT_HANDSHAKE_FAILED_NO_DETAIL
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Unspecified error during handshake.
-The event value is an errno.
-
-ZMQ_EVENT_HANDSHAKE_SUCCEEDED
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The ZMTP security mechanism handshake succeeded.
-The event value is unspecified.
-
-ZMQ_EVENT_HANDSHAKE_FAILED_PROTOCOL
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The ZMTP security mechanism handshake failed due to some mechanism protocol
-error, either between the ZMTP mechanism peers, or between the mechanism
-server and the ZAP handler. This indicates a configuration or implementation
-error in either peer resp. the ZAP handler.
-The event value is one of the ZMQ_PROTOCOL_ERROR_* values:
-ZMQ_PROTOCOL_ERROR_ZMTP_UNSPECIFIED
-ZMQ_PROTOCOL_ERROR_ZMTP_UNEXPECTED_COMMAND
-ZMQ_PROTOCOL_ERROR_ZMTP_INVALID_SEQUENCE
-ZMQ_PROTOCOL_ERROR_ZMTP_KEY_EXCHANGE
-ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_UNSPECIFIED
-ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_MESSAGE
-ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_HELLO
-ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_INITIATE
-ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_ERROR
-ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_READY
-ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_WELCOME
-ZMQ_PROTOCOL_ERROR_ZMTP_INVALID_METADATA
-ZMQ_PROTOCOL_ERROR_ZMTP_CRYPTOGRAPHIC
-ZMQ_PROTOCOL_ERROR_ZMTP_MECHANISM_MISMATCH
-ZMQ_PROTOCOL_ERROR_ZAP_UNSPECIFIED
-ZMQ_PROTOCOL_ERROR_ZAP_MALFORMED_REPLY
-ZMQ_PROTOCOL_ERROR_ZAP_BAD_REQUEST_ID
-ZMQ_PROTOCOL_ERROR_ZAP_BAD_VERSION
-ZMQ_PROTOCOL_ERROR_ZAP_INVALID_STATUS_CODE
-ZMQ_PROTOCOL_ERROR_ZAP_INVALID_METADATA
-
-ZMQ_EVENT_HANDSHAKE_FAILED_AUTH
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The ZMTP security mechanism handshake failed due to an authentication failure.
-The event value is the status code returned by the ZAP handler (i.e. 300,
-400 or 500).
-
-
-
-RETURN VALUE
-------------
-The _zmq_socket_monitor()_ function returns a value of 0 or greater if
-successful. Otherwise it returns `-1` and sets 'errno' to one of the values
-defined below.
-
-
-ERRORS
-------
-*ETERM*::
-The 0MQ 'context' associated with the specified 'socket' was terminated.
-
-*EPROTONOSUPPORT*::
-The requested 'transport' protocol is not supported. Monitor sockets are
-required to use the inproc:// transport.
-
-*EINVAL*::
-The endpoint supplied is invalid.
-
-EXAMPLE
--------
-.Monitoring client and server sockets
-----
-//  Read one event off the monitor socket; return value and address
-//  by reference, if not null, and event number by value. Returns -1
-//  in case of error.
-
-static int
-get_monitor_event (void *monitor, int *value, char **address)
-{
-    //  First frame in message contains event number and value
-    zmq_msg_t msg;
-    zmq_msg_init (&msg);
-    if (zmq_msg_recv (&msg, monitor, 0) == -1)
-        return -1;              //  Interrupted, presumably
-    assert (zmq_msg_more (&msg));
-
-    uint8_t *data = (uint8_t *) zmq_msg_data (&msg);
-    uint16_t event = *(uint16_t *) (data);
-    if (value)
-        *value = *(uint32_t *) (data + 2);
-
-    //  Second frame in message contains event address
-    zmq_msg_init (&msg);
-    if (zmq_msg_recv (&msg, monitor, 0) == -1)
-        return -1;              //  Interrupted, presumably
-    assert (!zmq_msg_more (&msg));
-
-    if (address) {
-        uint8_t *data = (uint8_t *) zmq_msg_data (&msg);
-        size_t size = zmq_msg_size (&msg);
-        *address = (char *) malloc (size + 1);
-        memcpy (*address, data, size);
-        (*address)[size] = 0;
-    }
-    return event;
-}
-
-int main (void)
-{
-    void *ctx = zmq_ctx_new ();
-    assert (ctx);
-
-    //  We'll monitor these two sockets
-    void *client = zmq_socket (ctx, ZMQ_DEALER);
-    assert (client);
-    void *server = zmq_socket (ctx, ZMQ_DEALER);
-    assert (server);
-
-    //  Socket monitoring only works over inproc://
-    int rc = zmq_socket_monitor (client, "tcp://127.0.0.1:9999", 0);
-    assert (rc == -1);
-    assert (zmq_errno () == EPROTONOSUPPORT);
-
-    //  Monitor all events on client and server sockets
-    rc = zmq_socket_monitor (client, "inproc://monitor-client", ZMQ_EVENT_ALL);
-    assert (rc == 0);
-    rc = zmq_socket_monitor (server, "inproc://monitor-server", ZMQ_EVENT_ALL);
-    assert (rc == 0);
-
-    //  Create two sockets for collecting monitor events
-    void *client_mon = zmq_socket (ctx, ZMQ_PAIR);
-    assert (client_mon);
-    void *server_mon = zmq_socket (ctx, ZMQ_PAIR);
-    assert (server_mon);
-
-    //  Connect these to the inproc endpoints so they'll get events
-    rc = zmq_connect (client_mon, "inproc://monitor-client");
-    assert (rc == 0);
-    rc = zmq_connect (server_mon, "inproc://monitor-server");
-    assert (rc == 0);
-
-    //  Now do a basic ping test
-    rc = zmq_bind (server, "tcp://127.0.0.1:9998");
-    assert (rc == 0);
-    rc = zmq_connect (client, "tcp://127.0.0.1:9998");
-    assert (rc == 0);
-    bounce (client, server);
-
-    //  Close client and server
-    close_zero_linger (client);
-    close_zero_linger (server);
-
-    //  Now collect and check events from both sockets
-    int event = get_monitor_event (client_mon, NULL, NULL);
-    if (event == ZMQ_EVENT_CONNECT_DELAYED)
-        event = get_monitor_event (client_mon, NULL, NULL);
-    assert (event == ZMQ_EVENT_CONNECTED);
-    event = get_monitor_event (client_mon, NULL, NULL);
-    assert (event == ZMQ_EVENT_HANDSHAKE_SUCCEEDED);
-    event = get_monitor_event (client_mon, NULL, NULL);
-    assert (event == ZMQ_EVENT_MONITOR_STOPPED);
-
-    //  This is the flow of server events
-    event = get_monitor_event (server_mon, NULL, NULL);
-    assert (event == ZMQ_EVENT_LISTENING);
-    event = get_monitor_event (server_mon, NULL, NULL);
-    assert (event == ZMQ_EVENT_ACCEPTED);
-    event = get_monitor_event (server_mon, NULL, NULL);
-    assert (event == ZMQ_EVENT_HANDSHAKE_SUCCEEDED);
-    event = get_monitor_event (server_mon, NULL, NULL);
-    assert (event == ZMQ_EVENT_CLOSED);
-    event = get_monitor_event (server_mon, NULL, NULL);
-    assert (event == ZMQ_EVENT_MONITOR_STOPPED);
-
-    //  Close down the sockets
-    close_zero_linger (client_mon);
-    close_zero_linger (server_mon);
-    zmq_ctx_term (ctx);
-
-    return 0 ;
-}
-----
-
-
-SEE ALSO
---------
-linkzmq:zmq[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/libs/libzmq/doc/zmq_socket_monitor_versioned.txt b/libs/libzmq/doc/zmq_socket_monitor_versioned.txt
deleted file mode 100644
index e71dd35..0000000
--- a/libs/libzmq/doc/zmq_socket_monitor_versioned.txt
+++ /dev/null
@@ -1,401 +0,0 @@
-zmq_socket_monitor_versioned(3)
-===============================
-
-
-NAME
-----
-
-zmq_socket_monitor_versioned - monitor socket events
-
-
-SYNOPSIS
---------
-*int zmq_socket_monitor_versioned (void '*socket', char '*endpoint', uint64_t 'events', int 'event_version', int 'type');*
-
-*int zmq_socket_monitor_pipes_stats (void '*socket');*
-
-
-DESCRIPTION
------------
-The _zmq_socket_monitor_versioned()_ method lets an application thread track
-socket events (like connects) on a ZeroMQ socket. Each call to this
-method creates a 'ZMQ_PAIR' socket and binds that to the specified
-inproc:// 'endpoint'. To collect the socket events, you must create
-your own 'ZMQ_PAIR' socket, and connect that to the endpoint.
-
-The 'events' argument is a bitmask of the socket events you wish to
-monitor, see 'Supported events' below. To monitor all events for a version, use
-the event value ZMQ_EVENT_ALL_V<version>, e.g. ZMQ_EVENT_ALL_V1. For non-DRAFT event
-versions, this value will not change in the future, so new event types will only be
-added in new versions (note that this is a change over zmq_socket_monitor and the
-unversioned ZMQ_EVENT_ALL).
-
-Note that event_version 2 is currently in DRAFT mode. The protocol may be
-changed at any time for event_versions in DRAFT.
-
-ZMQ_CURRENT_EVENT_VERSION and ZMQ_CURRENT_EVENT_VERSION_DRAFT are always defined
-to the most recent stable or DRAFT event version, which are currently 1 resp. 2
-
-This page describes the protocol for 'event_version' 2 only. For the protocol
-used with 'event_version' 1, please refer to linkzmq:zmq_socket_monitor[3].
-
-Each event is sent in multiple frames. The first frame contains an event
-number (64 bits). The number and content of further frames depend on this
-event number.
-
-Unless it is specified differently, the second frame contains the number of
-value frames that will follow it as a 64 bits integer. The third frame to N-th
-frames contain an event value (64 bits) that provides additional data according
-to the event number. Each event type might have a different number of values.
-The second-to-last and last frames contain strings that specifies the affected
-connection or endpoint. The former frame contains a string denoting the local
-endpoint, while the latter frame contains a string denoting the remote endpoint.
-Either of these may be empty, depending on the event type and whether the
-connection uses a bound or connected local endpoint.
-
-Note that the format of the second and further frames, and also the number of
-frames, may be different for events added in the future.
-
-The 'type' argument is used to specify the type of the monitoring socket.
-Supported types are 'ZMQ_PAIR', 'ZMQ_PUB' and 'ZMQ_PUSH'. Note that consumers
-of the events will have to be compatible with the socket type, for instance a
-monitoring socket of type 'ZMQ_PUB' will require consumers of type 'ZMQ_SUB'.
-In the case that the monitoring socket type is of 'ZMQ_PUB', the multipart
-message topic is the event number, thus consumers should subscribe to the
-events they want to receive.
-
-The _zmq_socket_monitor_pipes_stats()_ method triggers an event of type
-ZMQ_EVENT_PIPES_STATS for each connected peer of the monitored socket.
-NOTE: _zmq_socket_monitor_pipes_stats()_ is in DRAFT state.
-
-----
-Monitoring events are only generated by some transports: At the moment these
-are SOCKS, TCP, IPC, and TIPC. Note that it is not an error to call
-'zmq_socket_monitor_versioned' on a socket that is connected or bound to some
-other transport, as this may not be known at the time
-'zmq_socket_monitor_versioned' is called. Also, a socket can be connected/bound
-to multiple endpoints using different transports.
-
-----
-
-Supported events (v1)
-----------------
-
-ZMQ_EVENT_CONNECTED
-~~~~~~~~~~~~~~~~~~~
-The socket has successfully connected to a remote peer. The event value
-is the file descriptor (FD) of the underlying network socket. Warning:
-there is no guarantee that the FD is still valid by the time your code
-receives this event.
-
-ZMQ_EVENT_CONNECT_DELAYED
-~~~~~~~~~~~~~~~~~~~~~~~~~
-A connect request on the socket is pending. The event value is unspecified.
-
-ZMQ_EVENT_CONNECT_RETRIED
-~~~~~~~~~~~~~~~~~~~~~~~~~
-A connect request failed, and is now being retried. The event value is the
-reconnect interval in milliseconds. Note that the reconnect interval is
-recalculated for each retry.
-
-ZMQ_EVENT_LISTENING
-~~~~~~~~~~~~~~~~~~~
-The socket was successfully bound to a network interface. The event value
-is the FD of the underlying network socket. Warning: there is no guarantee
-that the FD is still valid by the time your code receives this event.
-
-ZMQ_EVENT_BIND_FAILED
-~~~~~~~~~~~~~~~~~~~~~
-The socket could not bind to a given interface. The event value is the
-errno generated by the system bind call.
-
-ZMQ_EVENT_ACCEPTED
-~~~~~~~~~~~~~~~~~~
-The socket has accepted a connection from a remote peer. The event value is
-the FD of the underlying network socket. Warning: there is no guarantee that
-the FD is still valid by the time your code receives this event.
-
-ZMQ_EVENT_ACCEPT_FAILED
-~~~~~~~~~~~~~~~~~~~~~~~
-The socket has rejected a connection from a remote peer. The event value is
-the errno generated by the accept call.
-
-ZMQ_EVENT_CLOSED
-~~~~~~~~~~~~~~~~
-The socket was closed. The event value is the FD of the (now closed) network
-socket.
-
-ZMQ_EVENT_CLOSE_FAILED
-~~~~~~~~~~~~~~~~~~~~~~
-The socket close failed. The event value is the errno returned by the system
-call. Note that this event occurs only on IPC transports.
-
-ZMQ_EVENT_DISCONNECTED
-~~~~~~~~~~~~~~~~~~~~~~
-The socket was disconnected unexpectedly. The event value is the FD of the
-underlying network socket. Warning: this socket will be closed.
-
-ZMQ_EVENT_MONITOR_STOPPED
-~~~~~~~~~~~~~~~~~~~~~~~~~
-Monitoring on this socket ended.
-
-ZMQ_EVENT_HANDSHAKE_FAILED_NO_DETAIL
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Unspecified error during handshake.
-The event value is an errno.
-
-ZMQ_EVENT_HANDSHAKE_SUCCEEDED
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The ZMTP security mechanism handshake succeeded.
-The event value is unspecified.
-
-ZMQ_EVENT_HANDSHAKE_FAILED_PROTOCOL
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The ZMTP security mechanism handshake failed due to some mechanism protocol 
-error, either between the ZMTP mechanism peers, or between the mechanism 
-server and the ZAP handler. This indicates a configuration or implementation 
-error in either peer resp. the ZAP handler.
-The event value is one of the ZMQ_PROTOCOL_ERROR_* values:
-ZMQ_PROTOCOL_ERROR_ZMTP_UNSPECIFIED
-ZMQ_PROTOCOL_ERROR_ZMTP_UNEXPECTED_COMMAND
-ZMQ_PROTOCOL_ERROR_ZMTP_INVALID_SEQUENCE
-ZMQ_PROTOCOL_ERROR_ZMTP_KEY_EXCHANGE
-ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_UNSPECIFIED
-ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_MESSAGE
-ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_HELLO
-ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_INITIATE
-ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_ERROR
-ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_READY
-ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_WELCOME
-ZMQ_PROTOCOL_ERROR_ZMTP_INVALID_METADATA
-ZMQ_PROTOCOL_ERROR_ZMTP_CRYPTOGRAPHIC
-ZMQ_PROTOCOL_ERROR_ZMTP_MECHANISM_MISMATCH
-ZMQ_PROTOCOL_ERROR_ZAP_UNSPECIFIED
-ZMQ_PROTOCOL_ERROR_ZAP_MALFORMED_REPLY
-ZMQ_PROTOCOL_ERROR_ZAP_BAD_REQUEST_ID
-ZMQ_PROTOCOL_ERROR_ZAP_BAD_VERSION
-ZMQ_PROTOCOL_ERROR_ZAP_INVALID_STATUS_CODE
-ZMQ_PROTOCOL_ERROR_ZAP_INVALID_METADATA
-
-ZMQ_EVENT_HANDSHAKE_FAILED_AUTH
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The ZMTP security mechanism handshake failed due to an authentication failure.
-The event value is the status code returned by the ZAP handler (i.e. 300, 
-400 or 500).
-
-----
-
-Supported events (v2)
-----------------
-
-ZMQ_EVENT_PIPE_STATS
-~~~~~~~~~~~~~~~~~~~~
-This event provides two values, the number of messages in each of the two
-queues associated with the returned endpoint (respectively egress and ingress).
-This event only triggers after calling the function
-_zmq_socket_monitor_pipes_stats()_.
-NOTE: this measurement is asynchronous, so by the time the message is received
-the internal state might have already changed.
-NOTE: when the monitored socket and the monitor are not used in a poll, the
-event might not be delivered until an API has been called on the monitored
-socket, like zmq_getsockopt for example (the option is irrelevant).
-NOTE: in DRAFT state, not yet available in stable releases.
-
-
-
-RETURN VALUE
-------------
-The _zmq_socket_monitor()_ and _zmq_socket_monitor_pipes_stats()_ functions
-return a value of 0 or greater if successful. Otherwise they return `-1` and
-set 'errno' to one of the values defined below.
-
-
-ERRORS - _zmq_socket_monitor()_
--------------------------------
-*ETERM*::
-The 0MQ 'context' associated with the specified 'socket' was terminated.
-
-*EPROTONOSUPPORT*::
-The transport protocol of the monitor 'endpoint' is not supported. Monitor
-sockets are required to use the inproc:// transport.
-
-*EINVAL*::
-The monitor 'endpoint' supplied does not exist or the specified socket 'type'
-is not supported.
-
-
-ERRORS - _zmq_socket_monitor_pipes_stats()_
--------------------------------------------
-*ENOTSOCK*::
-The 'socket' parameter was not a valid 0MQ socket.
-
-*EINVAL*::
-The socket did not have monitoring enabled.
-
-*EAGAIN*::
-The monitored socket did not have any connections to monitor yet.
-
-EXAMPLE
--------
-.Monitoring client and server sockets
-----
-//  Read one event off the monitor socket; return values and addresses
-//  by reference, if not null, and event number by value. Returns -1
-//  in case of error.
-
-static uint64_t
-get_monitor_event (void *monitor, uint64_t **value, char **local_address, char **remote_address)
-{
-    //  First frame in message contains event number
-    zmq_msg_t msg;
-    zmq_msg_init (&msg);
-    if (zmq_msg_recv (&msg, monitor, 0) == -1)
-        return -1;              //  Interrupted, presumably
-    assert (zmq_msg_more (&msg));
-
-    uint64_t event;
-    memcpy (&event, zmq_msg_data (&msg), sizeof (event));
-    zmq_msg_close (&msg);
-
-    //  Second frame in message contains the number of values
-    zmq_msg_init (&msg);
-    if (zmq_msg_recv (&msg, monitor, 0) == -1)
-        return -1;              //  Interrupted, presumably
-    assert (zmq_msg_more (&msg));
-
-    uint64_t value_count;
-    memcpy (&value_count, zmq_msg_data (&msg), sizeof (value_count));
-    zmq_msg_close (&msg);
-
-    if (value) {
-        *value = (uint64_t *) malloc (value_count * sizeof (uint64_t));
-        assert (*value);
-    }
-
-    for (uint64_t i = 0; i < value_count; ++i) {
-        //  Subsequent frames in message contain event values
-        zmq_msg_init (&msg);
-        if (zmq_msg_recv (&msg, monitor, 0) == -1)
-            return -1;              //  Interrupted, presumably
-        assert (zmq_msg_more (&msg));
-
-        if (value && *value)
-            memcpy (&(*value)[i], zmq_msg_data (&msg), sizeof (uint64_t));
-        zmq_msg_close (&msg);
-    }
-
-    //  Second-to-last frame in message contains local address
-    zmq_msg_init (&msg);
-    if (zmq_msg_recv (&msg, monitor, 0) == -1)
-        return -1;              //  Interrupted, presumably
-    assert (zmq_msg_more (&msg));
-
-    if (local_address_) {
-        uint8_t *data = (uint8_t *) zmq_msg_data (&msg);
-        size_t size = zmq_msg_size (&msg);
-        *local_address_ = (char *) malloc (size + 1);
-        memcpy (*local_address_, data, size);
-        (*local_address_)[size] = 0;
-    }
-    zmq_msg_close (&msg);
-
-    //  Last frame in message contains remote address
-    zmq_msg_init (&msg);
-    if (zmq_msg_recv (&msg, monitor, 0) == -1)
-        return -1;              //  Interrupted, presumably
-    assert (!zmq_msg_more (&msg));
-
-    if (remote_address_) {
-        uint8_t *data = (uint8_t *) zmq_msg_data (&msg);
-        size_t size = zmq_msg_size (&msg);
-        *remote_address_ = (char *) malloc (size + 1);
-        memcpy (*remote_address_, data, size);
-        (*remote_address_)[size] = 0;
-    }
-    zmq_msg_close (&msg);
-
-    return event;
-}
-
-int main (void)
-{
-    void *ctx = zmq_ctx_new ();
-    assert (ctx);
-
-    //  We'll monitor these two sockets
-    void *client = zmq_socket (ctx, ZMQ_DEALER);
-    assert (client);
-    void *server = zmq_socket (ctx, ZMQ_DEALER);
-    assert (server);
-
-    //  Socket monitoring only works over inproc://
-    int rc = zmq_socket_monitor_versioned (client, "tcp://127.0.0.1:9999", 0, 2);
-    assert (rc == -1);
-    assert (zmq_errno () == EPROTONOSUPPORT);
-
-    //  Monitor all events on client and server sockets
-    rc = zmq_socket_monitor_versioned (client, "inproc://monitor-client", ZMQ_EVENT_ALL, 2);
-    assert (rc == 0);
-    rc = zmq_socket_monitor_versioned (server, "inproc://monitor-server", ZMQ_EVENT_ALL, 2);
-    assert (rc == 0);
-
-    //  Create two sockets for collecting monitor events
-    void *client_mon = zmq_socket (ctx, ZMQ_PAIR);
-    assert (client_mon);
-    void *server_mon = zmq_socket (ctx, ZMQ_PAIR);
-    assert (server_mon);
-
-    //  Connect these to the inproc endpoints so they'll get events
-    rc = zmq_connect (client_mon, "inproc://monitor-client");
-    assert (rc == 0);
-    rc = zmq_connect (server_mon, "inproc://monitor-server");
-    assert (rc == 0);
-
-    //  Now do a basic ping test
-    rc = zmq_bind (server, "tcp://127.0.0.1:9998");
-    assert (rc == 0);
-    rc = zmq_connect (client, "tcp://127.0.0.1:9998");
-    assert (rc == 0);
-    bounce (client, server);
-
-    //  Close client and server
-    close_zero_linger (client);
-    close_zero_linger (server);
-
-    //  Now collect and check events from both sockets
-    int event = get_monitor_event (client_mon, NULL, NULL);
-    if (event == ZMQ_EVENT_CONNECT_DELAYED)
-        event = get_monitor_event (client_mon, NULL, NULL);
-    assert (event == ZMQ_EVENT_CONNECTED);
-    event = get_monitor_event (client_mon, NULL, NULL);
-    assert (event == ZMQ_EVENT_MONITOR_STOPPED);
-
-    //  This is the flow of server events
-    event = get_monitor_event (server_mon, NULL, NULL);
-    assert (event == ZMQ_EVENT_LISTENING);
-    event = get_monitor_event (server_mon, NULL, NULL);
-    assert (event == ZMQ_EVENT_ACCEPTED);
-    event = get_monitor_event (server_mon, NULL, NULL);
-    assert (event == ZMQ_EVENT_CLOSED);
-    event = get_monitor_event (server_mon, NULL, NULL);
-    assert (event == ZMQ_EVENT_MONITOR_STOPPED);
-
-    //  Close down the sockets
-    close_zero_linger (client_mon);
-    close_zero_linger (server_mon);
-    zmq_ctx_term (ctx);
-
-    return 0 ;
-}
-----
-
-
-SEE ALSO
---------
-linkzmq:zmq[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/libs/libzmq/doc/zmq_strerror.txt b/libs/libzmq/doc/zmq_strerror.txt
deleted file mode 100644
index a038a9a..0000000
--- a/libs/libzmq/doc/zmq_strerror.txt
+++ /dev/null
@@ -1,56 +0,0 @@
-zmq_strerror(3)
-===============
-
-
-NAME
-----
-zmq_strerror - get 0MQ error message string
-
-
-SYNOPSIS
---------
-*const char *zmq_strerror (int 'errnum');*
-
-
-DESCRIPTION
------------
-The _zmq_strerror()_ function shall return a pointer to an error message string
-corresponding to the error number specified by the 'errnum' argument. As 0MQ
-defines additional error numbers over and above those defined by the operating
-system, applications should use _zmq_strerror()_ in preference to the standard
-_strerror()_ function.
-
-
-RETURN VALUE
-------------
-The _zmq_strerror()_ function shall return a pointer to an error message
-string.
-
-
-ERRORS
-------
-No errors are defined.
-
-
-EXAMPLE
--------
-.Displaying an error message when a 0MQ context cannot be initialised
-----
-void *ctx = zmq_init (1, 1, 0);
-if (!ctx) {
-    printf ("Error occurred during zmq_init(): %s\n", zmq_strerror (errno));
-    abort ();
-}
-----
-
-
-SEE ALSO
---------
-linkzmq:zmq[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
-
diff --git a/libs/libzmq/doc/zmq_tcp.txt b/libs/libzmq/doc/zmq_tcp.txt
deleted file mode 100644
index a25a95e..0000000
--- a/libs/libzmq/doc/zmq_tcp.txt
+++ /dev/null
@@ -1,142 +0,0 @@
-zmq_tcp(7)
-==========
-
-
-NAME
-----
-zmq_tcp - 0MQ unicast transport using TCP
-
-
-SYNOPSIS
---------
-TCP is an ubiquitous, reliable, unicast transport. When connecting distributed
-applications over a network with 0MQ, using the TCP transport will likely be
-your first choice.
-
-
-ADDRESSING
-----------
-A 0MQ endpoint is a string consisting of a 'transport'`://` followed by an
-'address'. The 'transport' specifies the underlying protocol to use. The
-'address' specifies the transport-specific address to connect to.
-
-For the TCP transport, the transport is `tcp`, and the meaning of the
-'address' part is defined below.
-
-
-Assigning a local address to a socket
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-When assigning a local address to a socket using _zmq_bind()_ with the 'tcp'
-transport, the 'endpoint' shall be interpreted as an 'interface' followed by a
-colon and the TCP port number to use.
-
-An 'interface' may be specified by either of the following:
-
-* The wild-card `*`, meaning all available interfaces.
-* The primary IPv4 or IPv6 address assigned to the interface, in its numeric
-  representation.
-* The non-portable interface name as defined by the operating system.
-
-The TCP port number may be specified by:
-
-* A numeric value, usually above 1024 on POSIX systems.
-* The wild-card `*`, meaning a system-assigned ephemeral port.
-
-When using ephemeral ports, the caller should retrieve the actual assigned
-port using the ZMQ_LAST_ENDPOINT socket option. See linkzmq:zmq_getsockopt[3]
-for details.
-
-Unbinding wild-card address from a socket
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-When wild-card `*` 'endpoint' was used in _zmq_bind()_, the caller should use
-real 'endpoint' obtained from the ZMQ_LAST_ENDPOINT socket option to unbind 
-this 'endpoint' from a socket using _zmq_unbind()_.
-
-Connecting a socket
-~~~~~~~~~~~~~~~~~~~
-When connecting a socket to a peer address using _zmq_connect()_ with the 'tcp'
-transport, the 'endpoint' shall be interpreted as a 'peer address' followed by
-a colon and the TCP port number to use.
-You can optionally specify a 'source_endpoint' which will be used as the source
-address for your connection; tcp://'source_endpoint';'endpoint', see the
-'interface' description above for details.
-
-A 'peer address' may be specified by either of the following:
-
-* The DNS name of the peer.
-* The IPv4 or IPv6 address of the peer, in its numeric representation.
-
-Note: A description of the ZeroMQ Message Transport Protocol (ZMTP) which is 
-used by the TCP transport can be found at <http://rfc.zeromq.org/spec:23>
-
-
-HWM
----
-
-For the TCP transport, the high water mark (HWM) mechanism works in conjunction
-with the TCP socket buffers handled at OS level.
-Depending on the OS and several other factors the size of such TCP buffers will
-be different. Moreover TCP buffers provided by the OS will accommodate a varying
-number of messages depending on the size of messages (unlike ZMQ HWM settings
-the TCP socket buffers are measured in bytes and not messages).
-
-This may result in apparently inexplicable behaviors: e.g., you may expect that
-setting ZMQ_SNDHWM to 100 on a socket using TCP transport will have the effect
-of blocking the transmission of the 101-th message if the receiver is slow.
-This is very unlikely when using TCP transport since OS TCP buffers will typically
-provide enough buffering to allow you sending much more than 100 messages.
-
-Of course if the receiver is slow, transmitting on a TCP ZMQ socket will eventually trigger
-the "mute state" of the socket; simply don't rely on the exact HWM value.
-
-Obviously the same considerations apply for the receive HWM (see ZMQ_RCVHWM).
-
-
-
-EXAMPLES
---------
-.Assigning a local address to a socket
-----
-//  TCP port 5555 on all available interfaces
-rc = zmq_bind(socket, "tcp://*:5555");
-assert (rc == 0);
-//  TCP port 5555 on the local loop-back interface on all platforms
-rc = zmq_bind(socket, "tcp://127.0.0.1:5555");
-assert (rc == 0);
-//  TCP port 5555 on the first Ethernet network interface on Linux
-rc = zmq_bind(socket, "tcp://eth0:5555");
-assert (rc == 0);
-----
-
-.Connecting a socket
-----
-//  Connecting using an IP address
-rc = zmq_connect(socket, "tcp://192.168.1.1:5555");
-assert (rc == 0);
-//  Connecting using a DNS name
-rc = zmq_connect(socket, "tcp://server1:5555");
-assert (rc == 0);
-//  Connecting using a DNS name and bind to eth1
-rc = zmq_connect(socket, "tcp://eth1:0;server1:5555");
-assert (rc == 0);
-//  Connecting using a IP address and bind to an IP address
-rc = zmq_connect(socket, "tcp://192.168.1.17:5555;192.168.1.1:5555");
-assert (rc == 0);
-----
-
-
-SEE ALSO
---------
-linkzmq:zmq_bind[3]
-linkzmq:zmq_connect[3]
-linkzmq:zmq_pgm[7]
-linkzmq:zmq_ipc[7]
-linkzmq:zmq_inproc[7]
-linkzmq:zmq_vmci[7]
-linkzmq:zmq[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/libs/libzmq/doc/zmq_term.txt b/libs/libzmq/doc/zmq_term.txt
deleted file mode 100644
index 6152732..0000000
--- a/libs/libzmq/doc/zmq_term.txt
+++ /dev/null
@@ -1,66 +0,0 @@
-zmq_term(3)
-===========
-
-
-NAME
-----
-zmq_term - terminate 0MQ context
-
-
-SYNOPSIS
---------
-*int zmq_term (void '*context');*
-
-
-DESCRIPTION
------------
-The _zmq_term()_ function shall terminate the 0MQ context 'context'.
-
-Context termination is performed in the following steps:
-
-1. Any blocking operations currently in progress on sockets open within
-   'context' shall return immediately with an error code of ETERM.  With the
-   exception of _zmq_close()_, any further operations on sockets open within
-   'context' shall fail with an error code of ETERM.
-
-2. After interrupting all blocking calls, _zmq_term()_ shall _block_ until the
-   following conditions are satisfied:
-
-   * All sockets open within 'context' have been closed with _zmq_close()_.
-
-   * For each socket within 'context', all messages sent by the application
-     with _zmq_send()_ have either been physically transferred to a network
-     peer, or the socket's linger period set with the _ZMQ_LINGER_ socket
-     option has expired.
-
-For further details regarding socket linger behaviour refer to the _ZMQ_LINGER_
-option in linkzmq:zmq_setsockopt[3].
-
-This function is deprecated by linkzmq:zmq_ctx_term[3].
-
-RETURN VALUE
-------------
-The _zmq_term()_ function shall return zero if successful. Otherwise it shall
-return `-1` and set 'errno' to one of the values defined below.
-
-
-ERRORS
-------
-*EFAULT*::
-The provided 'context' was invalid.
-*EINTR*::
-Termination was interrupted by a signal. It can be restarted if needed.
-
-
-SEE ALSO
---------
-linkzmq:zmq[7]
-linkzmq:zmq_init[3]
-linkzmq:zmq_close[3]
-linkzmq:zmq_setsockopt[3]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/libs/libzmq/doc/zmq_timers.txt b/libs/libzmq/doc/zmq_timers.txt
deleted file mode 100644
index b7541b1..0000000
--- a/libs/libzmq/doc/zmq_timers.txt
+++ /dev/null
@@ -1,162 +0,0 @@
-zmq_timers(3)
-============
-
-
-NAME
-----
-zmq_timers - helper functions for cross-platform timers callbacks
-
-
-SYNOPSIS
---------
-
-*typedef void(zmq_timer_fn) (int 'timer_id', void *'arg');*
-
-*void *zmq_timers_new (void);*
-
-*int zmq_timers_destroy (void **'timers_p');*
-
-*int zmq_timers_add (void *'timers', size_t 'interval', zmq_timer_fn 'handler', void *'arg');*
-
-*int zmq_timers_cancel (void *'timers', int 'timer_id');*
-
-*int zmq_timers_set_interval (void *'timers', int 'timer_id', size_t 'interval');*
-
-*int zmq_timers_reset (void *'timers', int 'timer_id');*
-
-*long zmq_timers_timeout (void *'timers');*
-
-*int zmq_timers_execute (void *'timers');*
-
-
-DESCRIPTION
------------
-The _zmq_timers_*_ functions provide cross-platform access to timers callbacks.
-Once a timer has been registered, it will repeat at the specified interval until
-it gets manually cancelled. To run the callbacks, _zmq_timers_execute_ must be
-ran.
-
-_zmq_timers_new_ and _zmq_timers_destroy_ manage the lifetime of a timer
-instance. _zmq_timers_new_ creates and returns a new timer instance, while
-_zmq_timers_destroy_ destroys it. A pointer to a valid timer must be passed
-as the _timers_p_ argument of _zmq_timers_destroy_. In particular,
-_zmq_timers_destroy_ may not be called multiple times for the same timer
-instance. _zmq_timers_destroy_ sets the passed pointer to NULL in case of a
-successful execution.
-
-_zmq_timers_add_ and _zmq_timers_cancel_ manage the timers registered.
-
-_zmq_timers_add_ registers a new _timer_ with a given instance. _timers_ must
-point to a valid _timers_ object. The _interval_ parameter specifies the
-expiration of the timer in milliseconds. _handler_ and _arg_ specify the callback
-that will be invoked on expiration and the optional parameter that will be passed
-through. The callback must be a valid function implementing the _zmq_timer_fn_
-prototype. An ID will be returned that can be used to modify or cancel the timer.
-
-_zmq_timers_cancel_ will cancel the timer associated with _timer_id_ from the
-instance _timers_.
-
-_zmq_timers_set_interval_ will set the expiration of the timer associated with
-_timer_id_ from the instance _timers_ to _interval_ milliseconds into the future.
-
-_zmq_timers_reset_ will restart the timer associated with _timer_id_ from the
-instance _timers_.
-
-_zmq_timers_timeout_ will return the time left in milliseconds until the next
-timer registered with _timers_ expires.
-
-_zmq_timers_execute_ will run callbacks of all expired timers from the instance
-_timers_.
-
-
-THREAD SAFETY
--------------
-Like most other 0MQ objects, timers are not thread-safe. All operations must
-be called from the same thread. Otherwise, behaviour is undefined.
-
-
-RETURN VALUE
-------------
-_zmq_timers_new_ always returns a valid pointer to a poller.
-
-All functions that return an int, return -1 in case of a failure. In that case,
-zmq_errno() can be used to query the type of the error as described below.
-
-_zmq_timers_timeout_ returns the time left in milliseconds until the next
-timer registered with _timers_ expires, or -1 if there are no timers left.
-
-All other functions return 0 in case of a successful execution.
-
-
-ERRORS
-------
-On _zmq_timers_destroy_, _zmq_poller_cancel_, _zmq_timers_set_interval_,
-_zmq_timers_reset_, zmq_timers_timeout_, and _zmq_timers_execute_:
-*EFAULT*::
-_timers_ did not point to a valid timer. Note that passing an
-invalid pointer (e.g. pointer to deallocated memory) may cause undefined
-behaviour (e.g. an access violation).
-
-On _zmq_timers_add_:
-*EFAULT*::
-_timers_ did not point to a valid timer or _handler_ did not point to a valid
-function.
-
-On _zmq_poller_cancel_, _zmq_timers_set_interval_ and zmq_timers_timeout_:
-*EINVAL*::
-_timer_id_ did not exist or was already cancelled.
-
-
-EXAMPLE
--------
-.Add one timer with a simple callback that changes a boolean.
-----
-    void handler (int timer_id_, void *arg_)
-    {
-        (void) timer_id_; //  Stop 'unused' compiler warnings
-        *((bool *) arg_) = true;
-    }
-
-    ...
-
-    void *timers = zmq_timers_new ();
-    assert (timers);
-
-    bool timer_invoked = false;
-
-    const unsigned long full_timeout = 100;
-
-    int timer_id =
-      zmq_timers_add (timers, full_timeout, handler, &timer_invoked);
-    assert (timer_id);
-
-    //  Timer should not have been invoked yet
-    int rc = zmq_timers_execute (timers);
-    assert (rc == 0);
-
-    //  Wait half the time and check again
-    long timeout = zmq_timers_timeout (timers);
-    assert (rc != -1);
-    msleep (timeout / 2);
-    rc = zmq_timers_execute (timers);
-    assert (rc == 0);
-
-    // Wait until the end
-    rc = msleep (zmq_timers_timeout (timers));
-    assert (rc == 0);
-    assert (timer_invoked);
-
-    rc = zmq_timers_destroy (&timers);
-    assert (rc == 0);
-----
-
-
-SEE ALSO
---------
-linkzmq:zmq[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/libs/libzmq/doc/zmq_tipc.txt b/libs/libzmq/doc/zmq_tipc.txt
deleted file mode 100644
index 004c95a..0000000
--- a/libs/libzmq/doc/zmq_tipc.txt
+++ /dev/null
@@ -1,83 +0,0 @@
-zmq_tipc(7)
-==========
-
-
-NAME
-----
-zmq_tipc - 0MQ unicast transport using TIPC
-
-
-SYNOPSIS
---------
-TIPC is a cluster IPC protocol with a location transparent addressing scheme.
-
-
-ADDRESSING
-----------
-A 0MQ endpoint is a string consisting of a 'transport'`://` followed by an
-'address'. The 'transport' specifies the underlying protocol to use. The
-'address' specifies the transport-specific address to connect to.
-
-For the TIPC transport, the transport is `tipc`, and the meaning of the
-'address' part is defined below.
-
-
-Assigning a port name to a socket
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-When assigning a port name to a socket using _zmq_bind()_ with the 'tipc'
-transport, the 'endpoint' is defined in the form:
-{type, lower, upper}
-
-* Type is the numerical (u32) ID of your service.
-* Lower and Upper specify a range for your service.
-
-Publishing the same service with overlapping lower/upper ID's will
-cause connection requests to be distributed over these in a round-robin
-manner.
-
-
-Connecting a socket
-~~~~~~~~~~~~~~~~~~~
-When connecting a socket to a peer address using _zmq_connect()_ with the 'tipc'
-transport, the 'endpoint' shall be interpreted as a service ID, followed by a 
-comma and the instance ID.
-
-The instance ID must be within the lower/upper range of a published port name
-for the endpoint to be valid.
-
-EXAMPLES
---------
-.Assigning a local address to a socket
-----
-//  Publish TIPC service ID 5555
-rc = zmq_bind(socket, "tipc://{5555,0,0}");
-assert (rc == 0);
-//  Publish TIPC service ID 5555 with a service range of 0-100
-rc = zmq_bind(socket, "tipc://{5555,0,100}");
-assert (rc == 0);
-----
-
-.Connecting a socket
-----
-//  Connect to service 5555 instance id 50
-rc = zmq_connect(socket, "tipc://{5555,50}");
-assert (rc == 0);
-----
-
-
-SEE ALSO
---------
-linkzmq:zmq_bind[3]
-linkzmq:zmq_connect[3]
-linkzmq:zmq_tcp[7]
-linkzmq:zmq_pgm[7]
-linkzmq:zmq_ipc[7]
-linkzmq:zmq_inproc[7]
-linkzmq:zmq_vmci[7]
-linkzmq:zmq[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/libs/libzmq/doc/zmq_udp.txt b/libs/libzmq/doc/zmq_udp.txt
deleted file mode 100644
index 8dc6803..0000000
--- a/libs/libzmq/doc/zmq_udp.txt
+++ /dev/null
@@ -1,116 +0,0 @@
-zmq_udp(7)
-==========
-
-
-NAME
-----
-zmq_udp - 0MQ UDP multicast and unicast transport
-
-
-SYNOPSIS
---------
-UDP is unreliable protocol transport of data over IP networks.
-UDP support both unicast and multicast communication.
-
-
-DESCRIPTION
------------
-UDP transport can only be used with the 'ZMQ_RADIO' and
-'ZMQ_DISH' socket types.
-
-ADDRESSING
-----------
-A 0MQ endpoint is a string consisting of a 'transport'`://` followed by an
-'address'. The 'transport' specifies the underlying protocol to use. The
-'address' specifies the transport-specific address to connect to.
-
-For the UDP transport, the transport is `udp`.
-The meaning of the 'address' part is defined below.
-
-Binding a socket
-----------------
-With 'udp' we can only bind the 'ZMQ_DISH' socket type.
-When binding a socket using _zmq_bind()_ with the 'udp'
-transport the 'endpoint' shall be interpreted as an 'interface' followed by a
-colon and the UDP port number to use.
-
-An 'interface' may be specified by either of the following:
-
-* The wild-card `*`, meaning all available interfaces.
-* The name of the network interface (i.e. eth0, lo, wlan0 etc...)
-* The primary address assigned to the interface, in its numeric representation.
-* Multicast address in its numeric representation the socket should join.
-
-The UDP port number may be specified a numeric value, usually above
-1024 on POSIX systems.
-
-Connecting a socket
--------------------
-With 'udp' we can only connect the 'ZMQ_RADIO' socket type.
-When connecting a socket to a peer address using _zmq_connect()_ with the 'udp'
-transport, the 'endpoint' shall be interpreted as a 'peer address' followed by
-a colon and the UDP port number to use.
-
-A 'peer address' may be specified by either of the following:
-
-* The IPv4 or IPv6 address of the peer, in its numeric representation
-  or using its hostname.
-* Multicast address in its numeric representation.
-
-EXAMPLES
---------
-.Binding a socket
-----
-//  Unicast - UDP port 5555 on all available interfaces
-rc = zmq_bind(dish, "udp://*:5555");
-assert (rc == 0);
-//  Unicast - UDP port 5555 on the local loop-back interface
-rc = zmq_bind(dish, "udp://127.0.0.1:5555");
-assert (rc == 0);
-//  Unicast - UDP port 5555 on interface eth1
-rc = zmq_bind(dish, "udp://eth1:5555");
-assert (rc == 0);
-//  Multicast - UDP port 5555 on a Multicast address
-rc = zmq_bind(dish, "udp://239.0.0.1:5555");
-assert (rc == 0);
-//  Same as above but joining only on interface eth0
-rc = zmq_bind(dish, "udp://eth0;239.0.0.1:5555");
-assert (rc == 0);
-//  Same as above using IPv6 multicast
-rc = zmq_bind(dish, "udp://eth0;[ff02::1]:5555");
-assert (rc == 0);
-----
-
-
-.Connecting a socket
-----
-//  Connecting using an Unicast IP address
-rc = zmq_connect(radio, "udp://192.168.1.1:5555");
-assert (rc == 0);
-//  Connecting using a Multicast address
-rc = zmq_connect(socket, "udp://239.0.0.1:5555);
-assert (rc == 0);
-//  Connecting using a Multicast address using local interface wlan0
-rc = zmq_connect(socket, "udp://wlan0;239.0.0.1:5555);
-assert (rc == 0);
-//  Connecting to IPv6 multicast
-rc = zmq_connect(socket, "udp://[ff02::1]:5555);
-assert (rc == 0);
-----
-
-
-SEE ALSO
---------
-linkzmq:zmq_connect[3]
-linkzmq:zmq_setsockopt[3]
-linkzmq:zmq_tcp[7]
-linkzmq:zmq_ipc[7]
-linkzmq:zmq_inproc[7]
-linkzmq:zmq_vmci[7]
-linkzmq:zmq[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/libs/libzmq/doc/zmq_unbind.txt b/libs/libzmq/doc/zmq_unbind.txt
deleted file mode 100644
index f2304e6..0000000
--- a/libs/libzmq/doc/zmq_unbind.txt
+++ /dev/null
@@ -1,103 +0,0 @@
-zmq_unbind(3)
-==============
-
-
-NAME
-----
-zmq_unbind - Stop accepting connections on a socket
-
-
-SYNOPSIS
---------
-int zmq_unbind (void '*socket', const char '*endpoint');
-
-
-DESCRIPTION
------------
-The _zmq_unbind()_ function shall unbind a socket specified
-by the 'socket' argument from the endpoint specified by the 'endpoint'
-argument. 
-
-Additionally the incoming message queue associated with the endpoint will be
-discarded. This means that after unbinding an endpoint it is possible to
-received messages originating from that same endpoint if they were already
-present in the incoming message queue before unbinding.
-
-The 'endpoint' argument is as described in linkzmq:zmq_bind[3]
-
-Unbinding wild-card address from a socket
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-When wild-card `*` 'endpoint' (described in linkzmq:zmq_tcp[7],
-linkzmq:zmq_ipc[7], linkzmq:zmq_udp[7] and linkzmq:zmq_vmci[7]) was used in
-_zmq_bind()_, the caller should use real 'endpoint' obtained from the 
-ZMQ_LAST_ENDPOINT socket option to unbind this 'endpoint' from a socket.
-
-RETURN VALUE
-------------
-The _zmq_unbind()_ function shall return zero if successful. Otherwise it
-shall return `-1` and set 'errno' to one of the values defined below.
-
-ERRORS
-------
-*EINVAL*::
-The endpoint supplied is invalid.
-*ETERM*::
-The 0MQ 'context' associated with the specified 'socket' was terminated.
-*ENOTSOCK*::
-The provided 'socket' was invalid.
-*ENOENT*::
-The endpoint supplied was not previously bound.
-
-
-EXAMPLES
---------
-.Unbind a subscriber socket from a TCP transport
-----
-/* Create a ZMQ_SUB socket */
-void *socket = zmq_socket (context, ZMQ_SUB);
-assert (socket);
-/* Connect it to the host server001, port 5555 using a TCP transport */
-rc = zmq_bind (socket, "tcp://127.0.0.1:5555");
-assert (rc == 0);
-/* Disconnect from the previously connected endpoint */
-rc = zmq_unbind (socket, "tcp://127.0.0.1:5555");
-assert (rc == 0);
-----
-
-.Unbind wild-card `*` binded socket
-----
-/* Create a ZMQ_SUB socket */
-void *socket = zmq_socket (context, ZMQ_SUB);
-assert (socket);
-/* Bind it to the system-assigned ephemeral port using a TCP transport */
-rc = zmq_bind (socket, "tcp://127.0.0.1:*");
-assert (rc == 0);
-/* Obtain real endpoint */
-const size_t buf_size = 32;
-char buf[buf_size];
-rc = zmq_getsockopt (socket, ZMQ_LAST_ENDPOINT, buf, (size_t *)&buf_size);
-assert (rc == 0);
-/* Unbind socket by real endpoint */
-rc = zmq_unbind (socket, buf);
-assert (rc == 0);
-----
-
-NOTE
-----
-
-Note that while the implementation is similar to _zmq_disconnect()_, the
-semantics are different and the two functions should not be used
-interchangeably. Bound sockets should be unbound, and connected sockets should
-be disconnected.
-
-SEE ALSO
---------
-linkzmq:zmq_bind[3]
-linkzmq:zmq_socket[3]
-linkzmq:zmq[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/libs/libzmq/doc/zmq_version.txt b/libs/libzmq/doc/zmq_version.txt
deleted file mode 100644
index d96a106..0000000
--- a/libs/libzmq/doc/zmq_version.txt
+++ /dev/null
@@ -1,54 +0,0 @@
-zmq_version(3)
-==============
-
-
-NAME
-----
-zmq_version - report 0MQ library version
-
-
-SYNOPSIS
---------
-*void zmq_version (int '*major', int '*minor', int '*patch');*
-
-
-DESCRIPTION
------------
-The _zmq_version()_ function shall fill in the integer variables pointed to by
-the 'major', 'minor' and 'patch' arguments with the major, minor and patch level
-components of the 0MQ library version.
-
-This functionality is intended for applications or language bindings
-dynamically linking to the 0MQ library that wish to determine the actual
-version of the 0MQ library they are using.
-
-
-RETURN VALUE
-------------
-There is no return value.
-
-
-ERRORS
-------
-No errors are defined.
-
-
-EXAMPLE
--------
-.Printing out the version of the 0MQ library
-----
-int major, minor, patch;
-zmq_version (&major, &minor, &patch);
-printf ("Current 0MQ version is %d.%d.%d\n", major, minor, patch);
-----
-
-
-SEE ALSO
---------
-linkzmq:zmq[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/libs/libzmq/doc/zmq_vmci.txt b/libs/libzmq/doc/zmq_vmci.txt
deleted file mode 100644
index 1a25a00..0000000
--- a/libs/libzmq/doc/zmq_vmci.txt
+++ /dev/null
@@ -1,97 +0,0 @@
-zmq_vmci(7)
-===========
-
-
-NAME
-----
-zmq_vmci - 0MQ transport over virtual machine communicatios interface (VMCI) sockets
-
-
-SYNOPSIS
---------
-The VMCI transport passes messages between VMware virtual machines running on the same host,
-between virtual machine and the host and within virtual machines (inter-process transport like ipc).
-
-NOTE: Communication between a virtual machine and the host is not supported on Mac OS X 10.9 and above.
-
-
-ADDRESSING
-----------
-A 0MQ endpoint is a string consisting of a 'transport'`://` followed by an
-'address'. The 'transport' specifies the underlying protocol to use. The
-'address' specifies the transport-specific address to connect to.
-
-For the VMCI transport, the transport is `vmci`, and the meaning of
-the 'address' part is defined below.
-
-
-Binding a socket
-~~~~~~~~~~~~~~~~
-When binding a 'socket' to a local address using _zmq_bind()_ with the 'vmci'
-transport, the 'endpoint' shall be interpreted as an 'interface' followed by a
-colon and the TCP port number to use.
-
-An 'interface' may be specified by either of the following:
-
-* The wild-card `*`, meaning all available interfaces.
-* An integer returned by `VMCISock_GetLocalCID` or `@` (ZeroMQ will call VMCISock_GetLocalCID internally).
-
-The port may be specified by:
-
-* A numeric value, usually above 1024 on POSIX systems.
-* The wild-card `*`, meaning a system-assigned ephemeral port.
-
-Unbinding wild-card address from a socket
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-When wild-card `*` 'endpoint' was used in _zmq_bind()_, the caller should use
-real 'endpoint' obtained from the ZMQ_LAST_ENDPOINT socket option to unbind
-this 'endpoint' from a socket using _zmq_unbind()_.
-
-Connecting a socket
-~~~~~~~~~~~~~~~~~~~
-When connecting a socket to a peer address using _zmq_connect()_ with the 'vmci'
-transport, the 'endpoint' shall be interpreted as a 'peer address' followed by
-a colon and the port number to use.
-
-A 'peer address' must be a CID of the peer.
-
-
-EXAMPLES
---------
-.Assigning a local address to a socket
-----
-//  VMCI port 5555 on all available interfaces
-rc = zmq_bind(socket, "vmci://*:5555");
-assert (rc == 0);
-//  VMCI port 5555 on the local loop-back interface on all platforms
-cid = VMCISock_GetLocalCID();
-sprintf(endpoint, "vmci://%d:5555", cid);
-rc = zmq_bind(socket, endpoint);
-assert (rc == 0);
-----
-
-.Connecting a socket
-----
-//  Connecting using a CID
-sprintf(endpoint, "vmci://%d:5555", cid);
-rc = zmq_connect(socket, endpoint);
-assert (rc == 0);
-----
-
-
-SEE ALSO
---------
-linkzmq:zmq_bind[3]
-linkzmq:zmq_connect[3]
-linkzmq:zmq_inproc[7]
-linkzmq:zmq_tcp[7]
-linkzmq:zmq_pgm[7]
-linkzmq:zmq_vmci[7]
-linkzmq:zmq_getsockopt[3]
-linkzmq:zmq[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/libs/libzmq/doc/zmq_z85_decode.txt b/libs/libzmq/doc/zmq_z85_decode.txt
deleted file mode 100644
index 2649547..0000000
--- a/libs/libzmq/doc/zmq_z85_decode.txt
+++ /dev/null
@@ -1,51 +0,0 @@
-zmq_z85_decode(3)
-=================
-
-
-NAME
-----
-zmq_z85_decode - decode a binary key from Z85 printable text
-
-
-SYNOPSIS
---------
-*uint8_t *zmq_z85_decode (uint8_t *dest, const char *string);*
-
-
-DESCRIPTION
------------
-The _zmq_z85_decode()_ function shall decode 'string' into 'dest'.
-The length of 'string' shall be divisible by 5. 'dest' must be large
-enough for the decoded value (0.8 x strlen (string)). 
-
-The encoding shall follow the ZMQ RFC 32 specification.
-
-
-RETURN VALUE
-------------
-The _zmq_z85_decode()_ function shall return 'dest' if successful, else it
-shall return NULL.
-
-
-EXAMPLE
--------
-.Decoding a CURVE key
-----
-const char decoded [] = "rq:rM>}U?@Lns47E1%kR.o@n%FcmmsL/@{H8]yf7";
-uint8_t public_key [32];
-zmq_z85_decode (public_key, decoded);
-----
-
-
-SEE ALSO
---------
-linkzmq:zmq_z85_decode[3]
-linkzmq:zmq_curve_keypair[3]
-linkzmq:zmq_curve_public[3]
-linkzmq:zmq_curve[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/libs/libzmq/doc/zmq_z85_encode.txt b/libs/libzmq/doc/zmq_z85_encode.txt
deleted file mode 100644
index f578f4d..0000000
--- a/libs/libzmq/doc/zmq_z85_encode.txt
+++ /dev/null
@@ -1,58 +0,0 @@
-zmq_z85_encode(3)
-=================
-
-
-NAME
-----
-zmq_z85_encode - encode a binary key as Z85 printable text
-
-
-SYNOPSIS
---------
-*char *zmq_z85_encode (char *dest, const uint8_t *data, size_t size);*
-
-
-DESCRIPTION
------------
-The _zmq_z85_encode()_ function shall encode the binary block specified 
-by 'data' and 'size' into a string in 'dest'. The size of the binary block
-must be divisible by 4. The 'dest' must have sufficient space for size * 1.25 
-plus 1 for a null terminator. A 32-byte CURVE key is encoded as 40 ASCII 
-characters plus a null terminator.
-
-The encoding shall follow the ZMQ RFC 32 specification.
-
-
-RETURN VALUE
-------------
-The _zmq_z85_encode()_ function shall return 'dest' if successful, else it
-shall return NULL.
-
-
-EXAMPLE
--------
-.Encoding a CURVE key
-----
-#include <sodium.h>
-uint8_t public_key [32];
-uint8_t secret_key [32];
-int rc = crypto_box_keypair (public_key, secret_key);
-assert (rc == 0);
-char encoded [41];
-zmq_z85_encode (encoded, public_key, 32);
-puts (encoded);
-----
-
-
-SEE ALSO
---------
-linkzmq:zmq_z85_decode[3]
-linkzmq:zmq_curve_keypair[3]
-linkzmq:zmq_curve_public[3]
-linkzmq:zmq_curve[7]
-
-
-AUTHORS
--------
-This page was written by the 0MQ community. To make a change please
-read the 0MQ Contribution Policy at <http://www.zeromq.org/docs:contributing>.
diff --git a/libs/libzmq/external/sha1/license.txt b/libs/libzmq/external/sha1/license.txt
deleted file mode 100644
index 3b5eb95..0000000
--- a/libs/libzmq/external/sha1/license.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-1. Redistributions of source code must retain the above copyright
-       notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-       notice, this list of conditions and the following disclaimer in the
-       documentation and/or other materials provided with the distribution.
-3. Neither the name of the project nor the names of its contributors
-       may be used to endorse or promote products derived from this software
-       without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED.      IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGE.
diff --git a/libs/libzmq/external/sha1/sha1.c b/libs/libzmq/external/sha1/sha1.c
deleted file mode 100644
index 2702c89..0000000
--- a/libs/libzmq/external/sha1/sha1.c
+++ /dev/null
@@ -1,336 +0,0 @@
-/*
- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *	  notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *	  notice, this list of conditions and the following disclaimer in the
- *	  documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the project nor the names of its contributors
- *	  may be used to endorse or promote products derived from this software
- *	  without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.	IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
- * FIPS pub 180-1: Secure Hash Algorithm (SHA-1)
- * based on: http://www.itl.nist.gov/fipspubs/fip180-1.htm
- * implemented by Jun-ichiro itojun Itoh <itojun@itojun.org>
- */
-
-#include "sha1.h"
-#include <string.h>
-
-
-/* constant table */
-static uint32_t _K[] = {0x5a827999, 0x6ed9eba1, 0x8f1bbcdc, 0xca62c1d6};
-
-#define K(t)	_K[(t) / 20]
-
-#define F0(b, c, d) (((b) & (c)) | ((~(b)) & (d)))
-#define F1(b, c, d) (((b) ^ (c)) ^ (d))
-#define F2(b, c, d) (((b) & (c)) | ((b) & (d)) | ((c) & (d)))
-#define F3(b, c, d) (((b) ^ (c)) ^ (d))
-
-#define S(n, x)		(((x) << (n)) | ((x) >> (32 - (n))))
-
-#define H(n)	(ctxt->h.b32[(n)])
-#define COUNT	(ctxt->count)
-#define BCOUNT	(ctxt->c.b64[0] / 8)
-#define W(n)	(ctxt->m.b32[(n)])
-
-#define PUTBYTE(x) \
-do { \
-	ctxt->m.b8[(COUNT % 64)] = (x);		\
-	COUNT++;				\
-	COUNT %= 64;				\
-	ctxt->c.b64[0] += 8;			\
-	if (COUNT % 64 == 0)			\
-		sha1_step(ctxt);		\
-} while (0)
-
-#define PUTPAD(x) \
-do { \
-	ctxt->m.b8[(COUNT % 64)] = (x);		\
-	COUNT++;				\
-	COUNT %= 64;				\
-	if (COUNT % 64 == 0)			\
-		sha1_step(ctxt);		\
-} while (0)
-
-static void sha1_step(struct sha1_ctxt *);
-
-static void
-sha1_step(struct sha1_ctxt * ctxt)
-{
-	uint32_t		a,
-				b,
-				c,
-				d,
-				e;
-	size_t		t,
-				s;
-	uint32_t		tmp;
-
-#ifndef WORDS_BIGENDIAN
-	struct sha1_ctxt tctxt;
-
-	memmove(&tctxt.m.b8[0], &ctxt->m.b8[0], 64);
-	ctxt->m.b8[0] = tctxt.m.b8[3];
-	ctxt->m.b8[1] = tctxt.m.b8[2];
-	ctxt->m.b8[2] = tctxt.m.b8[1];
-	ctxt->m.b8[3] = tctxt.m.b8[0];
-	ctxt->m.b8[4] = tctxt.m.b8[7];
-	ctxt->m.b8[5] = tctxt.m.b8[6];
-	ctxt->m.b8[6] = tctxt.m.b8[5];
-	ctxt->m.b8[7] = tctxt.m.b8[4];
-	ctxt->m.b8[8] = tctxt.m.b8[11];
-	ctxt->m.b8[9] = tctxt.m.b8[10];
-	ctxt->m.b8[10] = tctxt.m.b8[9];
-	ctxt->m.b8[11] = tctxt.m.b8[8];
-	ctxt->m.b8[12] = tctxt.m.b8[15];
-	ctxt->m.b8[13] = tctxt.m.b8[14];
-	ctxt->m.b8[14] = tctxt.m.b8[13];
-	ctxt->m.b8[15] = tctxt.m.b8[12];
-	ctxt->m.b8[16] = tctxt.m.b8[19];
-	ctxt->m.b8[17] = tctxt.m.b8[18];
-	ctxt->m.b8[18] = tctxt.m.b8[17];
-	ctxt->m.b8[19] = tctxt.m.b8[16];
-	ctxt->m.b8[20] = tctxt.m.b8[23];
-	ctxt->m.b8[21] = tctxt.m.b8[22];
-	ctxt->m.b8[22] = tctxt.m.b8[21];
-	ctxt->m.b8[23] = tctxt.m.b8[20];
-	ctxt->m.b8[24] = tctxt.m.b8[27];
-	ctxt->m.b8[25] = tctxt.m.b8[26];
-	ctxt->m.b8[26] = tctxt.m.b8[25];
-	ctxt->m.b8[27] = tctxt.m.b8[24];
-	ctxt->m.b8[28] = tctxt.m.b8[31];
-	ctxt->m.b8[29] = tctxt.m.b8[30];
-	ctxt->m.b8[30] = tctxt.m.b8[29];
-	ctxt->m.b8[31] = tctxt.m.b8[28];
-	ctxt->m.b8[32] = tctxt.m.b8[35];
-	ctxt->m.b8[33] = tctxt.m.b8[34];
-	ctxt->m.b8[34] = tctxt.m.b8[33];
-	ctxt->m.b8[35] = tctxt.m.b8[32];
-	ctxt->m.b8[36] = tctxt.m.b8[39];
-	ctxt->m.b8[37] = tctxt.m.b8[38];
-	ctxt->m.b8[38] = tctxt.m.b8[37];
-	ctxt->m.b8[39] = tctxt.m.b8[36];
-	ctxt->m.b8[40] = tctxt.m.b8[43];
-	ctxt->m.b8[41] = tctxt.m.b8[42];
-	ctxt->m.b8[42] = tctxt.m.b8[41];
-	ctxt->m.b8[43] = tctxt.m.b8[40];
-	ctxt->m.b8[44] = tctxt.m.b8[47];
-	ctxt->m.b8[45] = tctxt.m.b8[46];
-	ctxt->m.b8[46] = tctxt.m.b8[45];
-	ctxt->m.b8[47] = tctxt.m.b8[44];
-	ctxt->m.b8[48] = tctxt.m.b8[51];
-	ctxt->m.b8[49] = tctxt.m.b8[50];
-	ctxt->m.b8[50] = tctxt.m.b8[49];
-	ctxt->m.b8[51] = tctxt.m.b8[48];
-	ctxt->m.b8[52] = tctxt.m.b8[55];
-	ctxt->m.b8[53] = tctxt.m.b8[54];
-	ctxt->m.b8[54] = tctxt.m.b8[53];
-	ctxt->m.b8[55] = tctxt.m.b8[52];
-	ctxt->m.b8[56] = tctxt.m.b8[59];
-	ctxt->m.b8[57] = tctxt.m.b8[58];
-	ctxt->m.b8[58] = tctxt.m.b8[57];
-	ctxt->m.b8[59] = tctxt.m.b8[56];
-	ctxt->m.b8[60] = tctxt.m.b8[63];
-	ctxt->m.b8[61] = tctxt.m.b8[62];
-	ctxt->m.b8[62] = tctxt.m.b8[61];
-	ctxt->m.b8[63] = tctxt.m.b8[60];
-#endif
-
-	a = H(0);
-	b = H(1);
-	c = H(2);
-	d = H(3);
-	e = H(4);
-
-	for (t = 0; t < 20; t++)
-	{
-		s = t & 0x0f;
-		if (t >= 16)
-			W(s) = S(1, W((s + 13) & 0x0f) ^ W((s + 8) & 0x0f) ^ W((s + 2) & 0x0f) ^ W(s));
-		tmp = S(5, a) + F0(b, c, d) + e + W(s) + K(t);
-		e = d;
-		d = c;
-		c = S(30, b);
-		b = a;
-		a = tmp;
-	}
-	for (t = 20; t < 40; t++)
-	{
-		s = t & 0x0f;
-		W(s) = S(1, W((s + 13) & 0x0f) ^ W((s + 8) & 0x0f) ^ W((s + 2) & 0x0f) ^ W(s));
-		tmp = S(5, a) + F1(b, c, d) + e + W(s) + K(t);
-		e = d;
-		d = c;
-		c = S(30, b);
-		b = a;
-		a = tmp;
-	}
-	for (t = 40; t < 60; t++)
-	{
-		s = t & 0x0f;
-		W(s) = S(1, W((s + 13) & 0x0f) ^ W((s + 8) & 0x0f) ^ W((s + 2) & 0x0f) ^ W(s));
-		tmp = S(5, a) + F2(b, c, d) + e + W(s) + K(t);
-		e = d;
-		d = c;
-		c = S(30, b);
-		b = a;
-		a = tmp;
-	}
-	for (t = 60; t < 80; t++)
-	{
-		s = t & 0x0f;
-		W(s) = S(1, W((s + 13) & 0x0f) ^ W((s + 8) & 0x0f) ^ W((s + 2) & 0x0f) ^ W(s));
-		tmp = S(5, a) + F3(b, c, d) + e + W(s) + K(t);
-		e = d;
-		d = c;
-		c = S(30, b);
-		b = a;
-		a = tmp;
-	}
-
-	H(0) = H(0) + a;
-	H(1) = H(1) + b;
-	H(2) = H(2) + c;
-	H(3) = H(3) + d;
-	H(4) = H(4) + e;
-
-	memset(&ctxt->m.b8[0], 0, 64);
-}
-
-/*------------------------------------------------------------*/
-
-void
-sha1_init(struct sha1_ctxt * ctxt)
-{
-	memset(ctxt, 0, sizeof(struct sha1_ctxt));
-	H(0) = 0x67452301;
-	H(1) = 0xefcdab89;
-	H(2) = 0x98badcfe;
-	H(3) = 0x10325476;
-	H(4) = 0xc3d2e1f0;
-}
-
-void
-sha1_pad(struct sha1_ctxt * ctxt)
-{
-	size_t		padlen;			/* pad length in bytes */
-	size_t		padstart;
-
-	PUTPAD(0x80);
-
-	padstart = COUNT % 64;
-	padlen = 64 - padstart;
-	if (padlen < 8)
-	{
-		memset(&ctxt->m.b8[padstart], 0, padlen);
-		COUNT += (uint8_t) padlen;
-		COUNT %= 64;
-		sha1_step(ctxt);
-		padstart = COUNT % 64;	/* should be 0 */
-		padlen = 64 - padstart; /* should be 64 */
-	}
-	memset(&ctxt->m.b8[padstart], 0, padlen - 8);
-    COUNT += ((uint8_t) padlen - 8);
-	COUNT %= 64;
-#ifdef WORDS_BIGENDIAN
-	PUTPAD(ctxt->c.b8[0]);
-	PUTPAD(ctxt->c.b8[1]);
-	PUTPAD(ctxt->c.b8[2]);
-	PUTPAD(ctxt->c.b8[3]);
-	PUTPAD(ctxt->c.b8[4]);
-	PUTPAD(ctxt->c.b8[5]);
-	PUTPAD(ctxt->c.b8[6]);
-	PUTPAD(ctxt->c.b8[7]);
-#else
-	PUTPAD(ctxt->c.b8[7]);
-	PUTPAD(ctxt->c.b8[6]);
-	PUTPAD(ctxt->c.b8[5]);
-	PUTPAD(ctxt->c.b8[4]);
-	PUTPAD(ctxt->c.b8[3]);
-	PUTPAD(ctxt->c.b8[2]);
-	PUTPAD(ctxt->c.b8[1]);
-	PUTPAD(ctxt->c.b8[0]);
-#endif
-}
-
-void
-sha1_loop(struct sha1_ctxt * ctxt, const uint8_t *input0, size_t len)
-{
-	const uint8_t *input;
-	size_t		gaplen;
-	size_t		gapstart;
-	size_t		off;
-	size_t		copysiz;
-
-	input = (const uint8_t *) input0;
-	off = 0;
-
-	while (off < len)
-	{
-		gapstart = COUNT % 64;
-		gaplen = 64 - gapstart;
-
-		copysiz = (gaplen < len - off) ? gaplen : len - off;
-		memmove(&ctxt->m.b8[gapstart], &input[off], copysiz);
-		COUNT += (uint8_t) copysiz;
-		COUNT %= 64;
-		ctxt->c.b64[0] += copysiz * 8;
-		if (COUNT % 64 == 0)
-			sha1_step(ctxt);
-		off += copysiz;
-	}
-}
-
-void
-sha1_result(struct sha1_ctxt * ctxt, uint8_t *digest0)
-{
-	uint8_t	   *digest;
-
-	digest = (uint8_t *) digest0;
-	sha1_pad(ctxt);
-#ifdef WORDS_BIGENDIAN
-	memmove(digest, &ctxt->h.b8[0], 20);
-#else
-	digest[0] = ctxt->h.b8[3];
-	digest[1] = ctxt->h.b8[2];
-	digest[2] = ctxt->h.b8[1];
-	digest[3] = ctxt->h.b8[0];
-	digest[4] = ctxt->h.b8[7];
-	digest[5] = ctxt->h.b8[6];
-	digest[6] = ctxt->h.b8[5];
-	digest[7] = ctxt->h.b8[4];
-	digest[8] = ctxt->h.b8[11];
-	digest[9] = ctxt->h.b8[10];
-	digest[10] = ctxt->h.b8[9];
-	digest[11] = ctxt->h.b8[8];
-	digest[12] = ctxt->h.b8[15];
-	digest[13] = ctxt->h.b8[14];
-	digest[14] = ctxt->h.b8[13];
-	digest[15] = ctxt->h.b8[12];
-	digest[16] = ctxt->h.b8[19];
-	digest[17] = ctxt->h.b8[18];
-	digest[18] = ctxt->h.b8[17];
-	digest[19] = ctxt->h.b8[16];
-#endif
-}
\ No newline at end of file
diff --git a/libs/libzmq/external/sha1/sha1.h b/libs/libzmq/external/sha1/sha1.h
deleted file mode 100644
index 7354d13..0000000
--- a/libs/libzmq/external/sha1/sha1.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/*	contrib/pgcrypto/sha1.h */
-/*	   $KAME: sha1.h,v 1.4 2000/02/22 14:01:18 itojun Exp $    */
-
-/*
- * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *	  notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *	  notice, this list of conditions and the following disclaimer in the
- *	  documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the project nor the names of its contributors
- *	  may be used to endorse or promote products derived from this software
- *	  without specific prior written permission.
- *
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.	IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-/*
- * FIPS pub 180-1: Secure Hash Algorithm (SHA-1)
- * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * based on: http://www.itl.nist.gov/fipspubs/fip180-1.htm
- * implemented by Jun-ichiro itojun Itoh <itojun@itojun.org>
- */
-
-#ifndef _NETINET6_SHA1_H_
-#define _NETINET6_SHA1_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <stdlib.h>
-#include "../../src/stdint.hpp"
-
-struct sha1_ctxt
-{
-	union
-	{
-		uint8_t	b8[20];
-		uint32_t b32[5];
-	} h;
-	union
-	{
-		uint8_t b8[8];
-		uint64_t b64[1];
-	} c;
-	union
-	{
-		uint8_t b8[64];
-		uint32_t b32[16];
-	} m;
-	uint8_t count;
-};
-
-void sha1_init(struct sha1_ctxt *);
-void sha1_pad(struct sha1_ctxt *);
-void sha1_loop(struct sha1_ctxt *, const uint8_t *, size_t);
-void sha1_result(struct sha1_ctxt *, uint8_t *);
-
-//  Compatibility with OpenSSL API
-#define SHA_DIGEST_LENGTH 20
-typedef struct sha1_ctxt SHA_CTX;
-
-#define SHA1_Init(x)            sha1_init((x))
-#define SHA1_Update(x, y, z)    sha1_loop((x), (y), (z))
-#define SHA1_Final(x, y)        sha1_result((y), (x))
-
-#define SHA1_RESULTLEN	(160/8)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif   /* _NETINET6_SHA1_H_ */
diff --git a/libs/libzmq/external/unity/license.txt b/libs/libzmq/external/unity/license.txt
deleted file mode 100644
index d66fba5..0000000
--- a/libs/libzmq/external/unity/license.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) <year> 2007-14 Mike Karlesky, Mark VanderVoord, Greg Williams
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
diff --git a/libs/libzmq/external/unity/unity.c b/libs/libzmq/external/unity/unity.c
deleted file mode 100644
index 03dcc02..0000000
--- a/libs/libzmq/external/unity/unity.c
+++ /dev/null
@@ -1,1570 +0,0 @@
-/* =========================================================================
-    Unity Project - A Test Framework for C
-    Copyright (c) 2007-14 Mike Karlesky, Mark VanderVoord, Greg Williams
-    [Released under MIT License. Please refer to license.txt for details]
-============================================================================ */
-
-#define UNITY_INCLUDE_SETUP_STUBS
-#include "unity.h"
-#include <stddef.h>
-
-/* If omitted from header, declare overrideable prototypes here so they're ready for use */
-#ifdef UNITY_OMIT_OUTPUT_CHAR_HEADER_DECLARATION
-void UNITY_OUTPUT_CHAR(int);
-#endif
-
-/* Helpful macros for us to use here in Assert functions */
-#define UNITY_FAIL_AND_BAIL   { Unity.CurrentTestFailed  = 1; TEST_ABORT(); }
-#define UNITY_IGNORE_AND_BAIL { Unity.CurrentTestIgnored = 1; TEST_ABORT(); }
-#define RETURN_IF_FAIL_OR_IGNORE if (Unity.CurrentTestFailed || Unity.CurrentTestIgnored) return
-
-struct UNITY_STORAGE_T Unity;
-
-#ifdef UNITY_OUTPUT_COLOR
-static const char UnityStrOk[]                     = "\033[42mOK\033[00m";
-static const char UnityStrPass[]                   = "\033[42mPASS\033[00m";
-static const char UnityStrFail[]                   = "\033[41mFAIL\033[00m";
-static const char UnityStrIgnore[]                 = "\033[43mIGNORE\033[00m";
-#else
-static const char UnityStrOk[]                     = "OK";
-static const char UnityStrPass[]                   = "PASS";
-static const char UnityStrFail[]                   = "FAIL";
-static const char UnityStrIgnore[]                 = "IGNORE";
-#endif
-static const char UnityStrNull[]                   = "NULL";
-static const char UnityStrSpacer[]                 = ". ";
-static const char UnityStrExpected[]               = " Expected ";
-static const char UnityStrWas[]                    = " Was ";
-static const char UnityStrGt[]                     = " to be greater than ";
-static const char UnityStrLt[]                     = " to be less than ";
-static const char UnityStrOrEqual[]                = "or equal to ";
-static const char UnityStrElement[]                = " Element ";
-static const char UnityStrByte[]                   = " Byte ";
-static const char UnityStrMemory[]                 = " Memory Mismatch.";
-static const char UnityStrDelta[]                  = " Values Not Within Delta ";
-static const char UnityStrPointless[]              = " You Asked Me To Compare Nothing, Which Was Pointless.";
-static const char UnityStrNullPointerForExpected[] = " Expected pointer to be NULL";
-static const char UnityStrNullPointerForActual[]   = " Actual pointer was NULL";
-#ifndef UNITY_EXCLUDE_FLOAT
-static const char UnityStrNot[]                    = "Not ";
-static const char UnityStrInf[]                    = "Infinity";
-static const char UnityStrNegInf[]                 = "Negative Infinity";
-static const char UnityStrNaN[]                    = "NaN";
-static const char UnityStrDet[]                    = "Determinate";
-static const char UnityStrInvalidFloatTrait[]      = "Invalid Float Trait";
-#endif
-const char UnityStrErrFloat[]                      = "Unity Floating Point Disabled";
-const char UnityStrErrDouble[]                     = "Unity Double Precision Disabled";
-const char UnityStrErr64[]                         = "Unity 64-bit Support Disabled";
-static const char UnityStrBreaker[]                = "-----------------------";
-static const char UnityStrResultsTests[]           = " Tests ";
-static const char UnityStrResultsFailures[]        = " Failures ";
-static const char UnityStrResultsIgnored[]         = " Ignored ";
-static const char UnityStrDetail1Name[]            = UNITY_DETAIL1_NAME " ";
-static const char UnityStrDetail2Name[]            = " " UNITY_DETAIL2_NAME " ";
-
-/*-----------------------------------------------
- * Pretty Printers & Test Result Output Handlers
- *-----------------------------------------------*/
-
-void UnityPrint(const char* string)
-{
-    const char* pch = string;
-
-    if (pch != NULL)
-    {
-        while (*pch)
-        {
-            /* printable characters plus CR & LF are printed */
-            if ((*pch <= 126) && (*pch >= 32))
-            {
-                UNITY_OUTPUT_CHAR(*pch);
-            }
-            /* write escaped carriage returns */
-            else if (*pch == 13)
-            {
-                UNITY_OUTPUT_CHAR('\\');
-                UNITY_OUTPUT_CHAR('r');
-            }
-            /* write escaped line feeds */
-            else if (*pch == 10)
-            {
-                UNITY_OUTPUT_CHAR('\\');
-                UNITY_OUTPUT_CHAR('n');
-            }
-#ifdef UNITY_OUTPUT_COLOR
-            /* print ANSI escape code */
-            else if (*pch == 27 && *(pch + 1) == '[')
-            {
-                while (*pch && *pch != 'm')
-                {
-                    UNITY_OUTPUT_CHAR(*pch);
-                    pch++;
-                }
-                UNITY_OUTPUT_CHAR('m');
-            }
-#endif
-            /* unprintable characters are shown as codes */
-            else
-            {
-                UNITY_OUTPUT_CHAR('\\');
-                UNITY_OUTPUT_CHAR('x');
-                UnityPrintNumberHex((UNITY_UINT)*pch, 2);
-            }
-            pch++;
-        }
-    }
-}
-
-void UnityPrintLen(const char* string, const UNITY_UINT32 length)
-{
-    const char* pch = string;
-
-    if (pch != NULL)
-    {
-        while (*pch && (UNITY_UINT32)(pch - string) < length)
-        {
-            /* printable characters plus CR & LF are printed */
-            if ((*pch <= 126) && (*pch >= 32))
-            {
-                UNITY_OUTPUT_CHAR(*pch);
-            }
-            /* write escaped carriage returns */
-            else if (*pch == 13)
-            {
-                UNITY_OUTPUT_CHAR('\\');
-                UNITY_OUTPUT_CHAR('r');
-            }
-            /* write escaped line feeds */
-            else if (*pch == 10)
-            {
-                UNITY_OUTPUT_CHAR('\\');
-                UNITY_OUTPUT_CHAR('n');
-            }
-            /* unprintable characters are shown as codes */
-            else
-            {
-                UNITY_OUTPUT_CHAR('\\');
-                UNITY_OUTPUT_CHAR('x');
-                UnityPrintNumberHex((UNITY_UINT)*pch, 2);
-            }
-            pch++;
-        }
-    }
-}
-
-/*-----------------------------------------------*/
-void UnityPrintNumberByStyle(const UNITY_INT number, const UNITY_DISPLAY_STYLE_T style)
-{
-    if ((style & UNITY_DISPLAY_RANGE_INT) == UNITY_DISPLAY_RANGE_INT)
-    {
-        UnityPrintNumber(number);
-    }
-    else if ((style & UNITY_DISPLAY_RANGE_UINT) == UNITY_DISPLAY_RANGE_UINT)
-    {
-        UnityPrintNumberUnsigned((UNITY_UINT)number);
-    }
-    else
-    {
-        UNITY_OUTPUT_CHAR('0');
-        UNITY_OUTPUT_CHAR('x');
-        UnityPrintNumberHex((UNITY_UINT)number, (char)((style & 0xF) * 2));
-    }
-}
-
-/*-----------------------------------------------*/
-void UnityPrintNumber(const UNITY_INT number_to_print)
-{
-    UNITY_UINT number = (UNITY_UINT)number_to_print;
-
-    if (number_to_print < 0)
-    {
-        /* A negative number, including MIN negative */
-        UNITY_OUTPUT_CHAR('-');
-        number = (UNITY_UINT)(-number_to_print);
-    }
-    UnityPrintNumberUnsigned(number);
-}
-
-/*-----------------------------------------------
- * basically do an itoa using as little ram as possible */
-void UnityPrintNumberUnsigned(const UNITY_UINT number)
-{
-    UNITY_UINT divisor = 1;
-
-    /* figure out initial divisor */
-    while (number / divisor > 9)
-    {
-        divisor *= 10;
-    }
-
-    /* now mod and print, then divide divisor */
-    do
-    {
-        UNITY_OUTPUT_CHAR((char)('0' + (number / divisor % 10)));
-        divisor /= 10;
-    } while (divisor > 0);
-}
-
-/*-----------------------------------------------*/
-void UnityPrintNumberHex(const UNITY_UINT number, const char nibbles_to_print)
-{
-    int nibble;
-    char nibbles = nibbles_to_print;
-    if ((unsigned)nibbles > (2 * sizeof(number)))
-        nibbles = 2 * sizeof(number);
-
-    while (nibbles > 0)
-    {
-        nibbles--;
-        nibble = (int)(number >> (nibbles * 4)) & 0x0F;
-        if (nibble <= 9)
-        {
-            UNITY_OUTPUT_CHAR((char)('0' + nibble));
-        }
-        else
-        {
-            UNITY_OUTPUT_CHAR((char)('A' - 10 + nibble));
-        }
-    }
-}
-
-/*-----------------------------------------------*/
-void UnityPrintMask(const UNITY_UINT mask, const UNITY_UINT number)
-{
-    UNITY_UINT current_bit = (UNITY_UINT)1 << (UNITY_INT_WIDTH - 1);
-    UNITY_INT32 i;
-
-    for (i = 0; i < UNITY_INT_WIDTH; i++)
-    {
-        if (current_bit & mask)
-        {
-            if (current_bit & number)
-            {
-                UNITY_OUTPUT_CHAR('1');
-            }
-            else
-            {
-                UNITY_OUTPUT_CHAR('0');
-            }
-        }
-        else
-        {
-            UNITY_OUTPUT_CHAR('X');
-        }
-        current_bit = current_bit >> 1;
-    }
-}
-
-/*-----------------------------------------------*/
-#ifndef UNITY_EXCLUDE_FLOAT_PRINT
-/* This function prints a floating-point value in a format similar to
- * printf("%.6g").  It can work with either single- or double-precision,
- * but for simplicity, it prints only 6 significant digits in either case.
- * Printing more than 6 digits accurately is hard (at least in the single-
- * precision case) and isn't attempted here. */
-void UnityPrintFloat(const UNITY_DOUBLE input_number)
-{
-    UNITY_DOUBLE number = input_number;
-
-    /* print minus sign (including for negative zero) */
-    if (number < 0.0f || (number == 0.0f && 1.0f / number < 0.0f))
-    {
-        UNITY_OUTPUT_CHAR('-');
-        number = -number;
-    }
-
-    /* handle zero, NaN, and +/- infinity */
-    if (number == 0.0f) UnityPrint("0");
-    else if (isnan(number)) UnityPrint("nan");
-    else if (isinf(number)) UnityPrint("inf");
-    else
-    {
-        int exponent = 0;
-        int decimals, digits;
-        UNITY_INT32 n;
-        char buf[16];
-
-        /* scale up or down by powers of 10 */
-        while (number < 100000.0f / 1e6f)  { number *= 1e6f; exponent -= 6; }
-        while (number < 100000.0f)         { number *= 10.0f; exponent--; }
-        while (number > 1000000.0f * 1e6f) { number /= 1e6f; exponent += 6; }
-        while (number > 1000000.0f)        { number /= 10.0f; exponent++; }
-
-        /* round to nearest integer */
-        n = ((UNITY_INT32)(number + number) + 1) / 2;
-        if (n > 999999)
-        {
-            n = 100000;
-            exponent++;
-        }
-
-        /* determine where to place decimal point */
-        decimals = (exponent <= 0 && exponent >= -9) ? -exponent : 5;
-        exponent += decimals;
-
-        /* truncate trailing zeroes after decimal point */
-        while (decimals > 0 && n % 10 == 0)
-        {
-            n /= 10;
-            decimals--;
-        }
-
-        /* build up buffer in reverse order */
-        digits = 0;
-        while (n != 0 || digits < decimals + 1)
-        {
-            buf[digits++] = (char)('0' + n % 10);
-            n /= 10;
-        }
-        while (digits > 0)
-        {
-            if(digits == decimals) UNITY_OUTPUT_CHAR('.');
-            UNITY_OUTPUT_CHAR(buf[--digits]);
-        }
-
-        /* print exponent if needed */
-        if (exponent != 0)
-        {
-            UNITY_OUTPUT_CHAR('e');
-
-            if(exponent < 0)
-            {
-                UNITY_OUTPUT_CHAR('-');
-                exponent = -exponent;
-            }
-            else
-            {
-                UNITY_OUTPUT_CHAR('+');
-            }
-
-            digits = 0;
-            while (exponent != 0 || digits < 2)
-            {
-                buf[digits++] = (char)('0' + exponent % 10);
-                exponent /= 10;
-            }
-            while (digits > 0)
-            {
-                UNITY_OUTPUT_CHAR(buf[--digits]);
-            }
-        }
-    }
-}
-#endif /* ! UNITY_EXCLUDE_FLOAT_PRINT */
-
-/*-----------------------------------------------*/
-static void UnityTestResultsBegin(const char* file, const UNITY_LINE_TYPE line)
-{
-    UnityPrint(file);
-    UNITY_OUTPUT_CHAR(':');
-    UnityPrintNumber((UNITY_INT)line);
-    UNITY_OUTPUT_CHAR(':');
-    UnityPrint(Unity.CurrentTestName);
-    UNITY_OUTPUT_CHAR(':');
-}
-
-/*-----------------------------------------------*/
-static void UnityTestResultsFailBegin(const UNITY_LINE_TYPE line)
-{
-    UnityTestResultsBegin(Unity.TestFile, line);
-    UnityPrint(UnityStrFail);
-    UNITY_OUTPUT_CHAR(':');
-}
-
-/*-----------------------------------------------*/
-void UnityConcludeTest(void)
-{
-    if (Unity.CurrentTestIgnored)
-    {
-        Unity.TestIgnores++;
-    }
-    else if (!Unity.CurrentTestFailed)
-    {
-        UnityTestResultsBegin(Unity.TestFile, Unity.CurrentTestLineNumber);
-        UnityPrint(UnityStrPass);
-    }
-    else
-    {
-        Unity.TestFailures++;
-    }
-
-    Unity.CurrentTestFailed = 0;
-    Unity.CurrentTestIgnored = 0;
-    UNITY_PRINT_EOL();
-    UNITY_FLUSH_CALL();
-}
-
-/*-----------------------------------------------*/
-static void UnityAddMsgIfSpecified(const char* msg)
-{
-    if (msg)
-    {
-        UnityPrint(UnityStrSpacer);
-#ifndef UNITY_EXCLUDE_DETAILS
-        if (Unity.CurrentDetail1)
-        {
-            UnityPrint(UnityStrDetail1Name);
-            UnityPrint(Unity.CurrentDetail1);
-            if (Unity.CurrentDetail2)
-            {
-                UnityPrint(UnityStrDetail2Name);
-                UnityPrint(Unity.CurrentDetail2);
-            }
-            UnityPrint(UnityStrSpacer);
-        }
-#endif
-        UnityPrint(msg);
-    }
-}
-
-/*-----------------------------------------------*/
-static void UnityPrintExpectedAndActualStrings(const char* expected, const char* actual)
-{
-    UnityPrint(UnityStrExpected);
-    if (expected != NULL)
-    {
-        UNITY_OUTPUT_CHAR('\'');
-        UnityPrint(expected);
-        UNITY_OUTPUT_CHAR('\'');
-    }
-    else
-    {
-        UnityPrint(UnityStrNull);
-    }
-    UnityPrint(UnityStrWas);
-    if (actual != NULL)
-    {
-        UNITY_OUTPUT_CHAR('\'');
-        UnityPrint(actual);
-        UNITY_OUTPUT_CHAR('\'');
-    }
-    else
-    {
-        UnityPrint(UnityStrNull);
-    }
-}
-
-/*-----------------------------------------------*/
-static void UnityPrintExpectedAndActualStringsLen(const char* expected,
-                                                  const char* actual,
-                                                  const UNITY_UINT32 length)
-{
-    UnityPrint(UnityStrExpected);
-    if (expected != NULL)
-    {
-        UNITY_OUTPUT_CHAR('\'');
-        UnityPrintLen(expected, length);
-        UNITY_OUTPUT_CHAR('\'');
-    }
-    else
-    {
-        UnityPrint(UnityStrNull);
-    }
-    UnityPrint(UnityStrWas);
-    if (actual != NULL)
-    {
-        UNITY_OUTPUT_CHAR('\'');
-        UnityPrintLen(actual, length);
-        UNITY_OUTPUT_CHAR('\'');
-    }
-    else
-    {
-        UnityPrint(UnityStrNull);
-    }
-}
-
-/*-----------------------------------------------
- * Assertion & Control Helpers
- *-----------------------------------------------*/
-
-static int UnityIsOneArrayNull(UNITY_INTERNAL_PTR expected,
-                               UNITY_INTERNAL_PTR actual,
-                               const UNITY_LINE_TYPE lineNumber,
-                               const char* msg)
-{
-    if (expected == actual) return 0; /* Both are NULL or same pointer */
-
-    /* print and return true if just expected is NULL */
-    if (expected == NULL)
-    {
-        UnityTestResultsFailBegin(lineNumber);
-        UnityPrint(UnityStrNullPointerForExpected);
-        UnityAddMsgIfSpecified(msg);
-        return 1;
-    }
-
-    /* print and return true if just actual is NULL */
-    if (actual == NULL)
-    {
-        UnityTestResultsFailBegin(lineNumber);
-        UnityPrint(UnityStrNullPointerForActual);
-        UnityAddMsgIfSpecified(msg);
-        return 1;
-    }
-
-    return 0; /* return false if neither is NULL */
-}
-
-/*-----------------------------------------------
- * Assertion Functions
- *-----------------------------------------------*/
-
-void UnityAssertBits(const UNITY_INT mask,
-                     const UNITY_INT expected,
-                     const UNITY_INT actual,
-                     const char* msg,
-                     const UNITY_LINE_TYPE lineNumber)
-{
-    RETURN_IF_FAIL_OR_IGNORE;
-
-    if ((mask & expected) != (mask & actual))
-    {
-        UnityTestResultsFailBegin(lineNumber);
-        UnityPrint(UnityStrExpected);
-        UnityPrintMask((UNITY_UINT)mask, (UNITY_UINT)expected);
-        UnityPrint(UnityStrWas);
-        UnityPrintMask((UNITY_UINT)mask, (UNITY_UINT)actual);
-        UnityAddMsgIfSpecified(msg);
-        UNITY_FAIL_AND_BAIL;
-    }
-}
-
-/*-----------------------------------------------*/
-void UnityAssertEqualNumber(const UNITY_INT expected,
-                            const UNITY_INT actual,
-                            const char* msg,
-                            const UNITY_LINE_TYPE lineNumber,
-                            const UNITY_DISPLAY_STYLE_T style)
-{
-    RETURN_IF_FAIL_OR_IGNORE;
-
-    if (expected != actual)
-    {
-        UnityTestResultsFailBegin(lineNumber);
-        UnityPrint(UnityStrExpected);
-        UnityPrintNumberByStyle(expected, style);
-        UnityPrint(UnityStrWas);
-        UnityPrintNumberByStyle(actual, style);
-        UnityAddMsgIfSpecified(msg);
-        UNITY_FAIL_AND_BAIL;
-    }
-}
-
-/*-----------------------------------------------*/
-void UnityAssertGreaterOrLessOrEqualNumber(const UNITY_INT threshold,
-                                           const UNITY_INT actual,
-                                           const UNITY_COMPARISON_T compare,
-                                           const char *msg,
-                                           const UNITY_LINE_TYPE lineNumber,
-                                           const UNITY_DISPLAY_STYLE_T style)
-{
-    int failed = 0;
-    RETURN_IF_FAIL_OR_IGNORE;
-
-    if (threshold == actual && compare & UNITY_EQUAL_TO) return;
-    if (threshold == actual) failed = 1;
-
-    if ((style & UNITY_DISPLAY_RANGE_INT) == UNITY_DISPLAY_RANGE_INT)
-    {
-        if (actual > threshold && compare & UNITY_SMALLER_THAN) failed = 1;
-        if (actual < threshold && compare & UNITY_GREATER_THAN) failed = 1;
-    }
-    else /* UINT or HEX */
-    {
-        if ((UNITY_UINT)actual > (UNITY_UINT)threshold && compare & UNITY_SMALLER_THAN) failed = 1;
-        if ((UNITY_UINT)actual < (UNITY_UINT)threshold && compare & UNITY_GREATER_THAN) failed = 1;
-    }
-
-    if (failed)
-    {
-        UnityTestResultsFailBegin(lineNumber);
-        UnityPrint(UnityStrExpected);
-        UnityPrintNumberByStyle(actual, style);
-        if (compare & UNITY_GREATER_THAN) UnityPrint(UnityStrGt);
-        if (compare & UNITY_SMALLER_THAN) UnityPrint(UnityStrLt);
-        if (compare & UNITY_EQUAL_TO)     UnityPrint(UnityStrOrEqual);
-        UnityPrintNumberByStyle(threshold, style);
-        UnityAddMsgIfSpecified(msg);
-        UNITY_FAIL_AND_BAIL;
-    }
-}
-
-#define UnityPrintPointlessAndBail()       \
-{                                          \
-    UnityTestResultsFailBegin(lineNumber); \
-    UnityPrint(UnityStrPointless);         \
-    UnityAddMsgIfSpecified(msg);           \
-    UNITY_FAIL_AND_BAIL; }
-
-/*-----------------------------------------------*/
-void UnityAssertEqualIntArray(UNITY_INTERNAL_PTR expected,
-                              UNITY_INTERNAL_PTR actual,
-                              const UNITY_UINT32 num_elements,
-                              const char* msg,
-                              const UNITY_LINE_TYPE lineNumber,
-                              const UNITY_DISPLAY_STYLE_T style,
-                              const UNITY_FLAGS_T flags)
-{
-    UNITY_UINT32 elements = num_elements;
-    unsigned int length   = style & 0xF;
-
-    RETURN_IF_FAIL_OR_IGNORE;
-
-    if (num_elements == 0)
-    {
-        UnityPrintPointlessAndBail();
-    }
-
-    if (expected == actual) return; /* Both are NULL or same pointer */
-    if (UnityIsOneArrayNull(expected, actual, lineNumber, msg))
-        UNITY_FAIL_AND_BAIL;
-
-    while ((elements > 0) && elements--)
-    {
-        UNITY_INT expect_val;
-        UNITY_INT actual_val;
-        switch (length)
-        {
-            case 1:
-                expect_val = *(UNITY_PTR_ATTRIBUTE const UNITY_INT8*)expected;
-                actual_val = *(UNITY_PTR_ATTRIBUTE const UNITY_INT8*)actual;
-                break;
-            case 2:
-                expect_val = *(UNITY_PTR_ATTRIBUTE const UNITY_INT16*)expected;
-                actual_val = *(UNITY_PTR_ATTRIBUTE const UNITY_INT16*)actual;
-                break;
-#ifdef UNITY_SUPPORT_64
-            case 8:
-                expect_val = *(UNITY_PTR_ATTRIBUTE const UNITY_INT64*)expected;
-                actual_val = *(UNITY_PTR_ATTRIBUTE const UNITY_INT64*)actual;
-                break;
-#endif
-            default: /* length 4 bytes */
-                expect_val = *(UNITY_PTR_ATTRIBUTE const UNITY_INT32*)expected;
-                actual_val = *(UNITY_PTR_ATTRIBUTE const UNITY_INT32*)actual;
-                length = 4;
-                break;
-        }
-
-        if (expect_val != actual_val)
-        {
-            if (style & UNITY_DISPLAY_RANGE_UINT && length < sizeof(expect_val))
-            {   /* For UINT, remove sign extension (padding 1's) from signed type casts above */
-                UNITY_INT mask = 1;
-                mask = (mask << 8 * length) - 1;
-                expect_val &= mask;
-                actual_val &= mask;
-            }
-            UnityTestResultsFailBegin(lineNumber);
-            UnityPrint(UnityStrElement);
-            UnityPrintNumberUnsigned(num_elements - elements - 1);
-            UnityPrint(UnityStrExpected);
-            UnityPrintNumberByStyle(expect_val, style);
-            UnityPrint(UnityStrWas);
-            UnityPrintNumberByStyle(actual_val, style);
-            UnityAddMsgIfSpecified(msg);
-            UNITY_FAIL_AND_BAIL;
-        }
-        if (flags == UNITY_ARRAY_TO_ARRAY)
-        {
-            expected = (UNITY_INTERNAL_PTR)(length + (const char*)expected);
-        }
-        actual   = (UNITY_INTERNAL_PTR)(length + (const char*)actual);
-    }
-}
-
-/*-----------------------------------------------*/
-#ifndef UNITY_EXCLUDE_FLOAT
-/* Wrap this define in a function with variable types as float or double */
-#define UNITY_FLOAT_OR_DOUBLE_WITHIN(delta, expected, actual, diff)                       \
-    if (isinf(expected) && isinf(actual) && ((expected < 0) == (actual < 0))) return 1;   \
-    if (UNITY_NAN_CHECK) return 1;                                                        \
-    diff = actual - expected;                                                             \
-    if (diff < 0) diff = -diff;                                                           \
-    if (delta < 0) delta = -delta;                                                        \
-    return !(isnan(diff) || isinf(diff) || (diff > delta))
-    /* This first part of this condition will catch any NaN or Infinite values */
-#ifndef UNITY_NAN_NOT_EQUAL_NAN
-  #define UNITY_NAN_CHECK isnan(expected) && isnan(actual)
-#else
-  #define UNITY_NAN_CHECK 0
-#endif
-
-#ifndef UNITY_EXCLUDE_FLOAT_PRINT
-  #define UNITY_PRINT_EXPECTED_AND_ACTUAL_FLOAT(expected, actual) \
-  {                                                               \
-    UnityPrint(UnityStrExpected);                                 \
-    UnityPrintFloat(expected);                                    \
-    UnityPrint(UnityStrWas);                                      \
-    UnityPrintFloat(actual); }
-#else
-  #define UNITY_PRINT_EXPECTED_AND_ACTUAL_FLOAT(expected, actual) \
-    UnityPrint(UnityStrDelta)
-#endif /* UNITY_EXCLUDE_FLOAT_PRINT */
-
-static int UnityFloatsWithin(UNITY_FLOAT delta, UNITY_FLOAT expected, UNITY_FLOAT actual)
-{
-    UNITY_FLOAT diff;
-    UNITY_FLOAT_OR_DOUBLE_WITHIN(delta, expected, actual, diff);
-}
-
-void UnityAssertEqualFloatArray(UNITY_PTR_ATTRIBUTE const UNITY_FLOAT* expected,
-                                UNITY_PTR_ATTRIBUTE const UNITY_FLOAT* actual,
-                                const UNITY_UINT32 num_elements,
-                                const char* msg,
-                                const UNITY_LINE_TYPE lineNumber,
-                                const UNITY_FLAGS_T flags)
-{
-    UNITY_UINT32 elements = num_elements;
-    UNITY_PTR_ATTRIBUTE const UNITY_FLOAT* ptr_expected = expected;
-    UNITY_PTR_ATTRIBUTE const UNITY_FLOAT* ptr_actual = actual;
-
-    RETURN_IF_FAIL_OR_IGNORE;
-
-    if (elements == 0)
-    {
-        UnityPrintPointlessAndBail();
-    }
-
-    if (expected == actual) return; /* Both are NULL or same pointer */
-    if (UnityIsOneArrayNull((UNITY_INTERNAL_PTR)expected, (UNITY_INTERNAL_PTR)actual, lineNumber, msg))
-        UNITY_FAIL_AND_BAIL;
-
-    while (elements--)
-    {
-        if (!UnityFloatsWithin(*ptr_expected * UNITY_FLOAT_PRECISION, *ptr_expected, *ptr_actual))
-        {
-            UnityTestResultsFailBegin(lineNumber);
-            UnityPrint(UnityStrElement);
-            UnityPrintNumberUnsigned(num_elements - elements - 1);
-            UNITY_PRINT_EXPECTED_AND_ACTUAL_FLOAT((UNITY_DOUBLE)*ptr_expected, (UNITY_DOUBLE)*ptr_actual);
-            UnityAddMsgIfSpecified(msg);
-            UNITY_FAIL_AND_BAIL;
-        }
-        if (flags == UNITY_ARRAY_TO_ARRAY)
-        {
-            ptr_expected++;
-        }
-        ptr_actual++;
-    }
-}
-
-/*-----------------------------------------------*/
-void UnityAssertFloatsWithin(const UNITY_FLOAT delta,
-                             const UNITY_FLOAT expected,
-                             const UNITY_FLOAT actual,
-                             const char* msg,
-                             const UNITY_LINE_TYPE lineNumber)
-{
-    RETURN_IF_FAIL_OR_IGNORE;
-
-
-    if (!UnityFloatsWithin(delta, expected, actual))
-    {
-        UnityTestResultsFailBegin(lineNumber);
-        UNITY_PRINT_EXPECTED_AND_ACTUAL_FLOAT((UNITY_DOUBLE)expected, (UNITY_DOUBLE)actual);
-        UnityAddMsgIfSpecified(msg);
-        UNITY_FAIL_AND_BAIL;
-    }
-}
-
-/*-----------------------------------------------*/
-void UnityAssertFloatSpecial(const UNITY_FLOAT actual,
-                             const char* msg,
-                             const UNITY_LINE_TYPE lineNumber,
-                             const UNITY_FLOAT_TRAIT_T style)
-{
-    const char* trait_names[] = {UnityStrInf, UnityStrNegInf, UnityStrNaN, UnityStrDet};
-    UNITY_INT should_be_trait = ((UNITY_INT)style & 1);
-    UNITY_INT is_trait        = !should_be_trait;
-    UNITY_INT trait_index     = (UNITY_INT)(style >> 1);
-
-    RETURN_IF_FAIL_OR_IGNORE;
-
-    switch (style)
-    {
-        case UNITY_FLOAT_IS_INF:
-        case UNITY_FLOAT_IS_NOT_INF:
-            is_trait = isinf(actual) && (actual > 0);
-            break;
-        case UNITY_FLOAT_IS_NEG_INF:
-        case UNITY_FLOAT_IS_NOT_NEG_INF:
-            is_trait = isinf(actual) && (actual < 0);
-            break;
-
-        case UNITY_FLOAT_IS_NAN:
-        case UNITY_FLOAT_IS_NOT_NAN:
-            is_trait = isnan(actual) ? 1 : 0;
-            break;
-
-        case UNITY_FLOAT_IS_DET: /* A determinate number is non infinite and not NaN. */
-        case UNITY_FLOAT_IS_NOT_DET:
-            is_trait = !isinf(actual) && !isnan(actual);
-            break;
-
-        default:
-            trait_index = 0;
-            trait_names[0] = UnityStrInvalidFloatTrait;
-            break;
-    }
-
-    if (is_trait != should_be_trait)
-    {
-        UnityTestResultsFailBegin(lineNumber);
-        UnityPrint(UnityStrExpected);
-        if (!should_be_trait)
-            UnityPrint(UnityStrNot);
-        UnityPrint(trait_names[trait_index]);
-        UnityPrint(UnityStrWas);
-#ifndef UNITY_EXCLUDE_FLOAT_PRINT
-        UnityPrintFloat((UNITY_DOUBLE)actual);
-#else
-        if (should_be_trait)
-            UnityPrint(UnityStrNot);
-        UnityPrint(trait_names[trait_index]);
-#endif
-        UnityAddMsgIfSpecified(msg);
-        UNITY_FAIL_AND_BAIL;
-    }
-}
-
-#endif /* not UNITY_EXCLUDE_FLOAT */
-
-/*-----------------------------------------------*/
-#ifndef UNITY_EXCLUDE_DOUBLE
-static int UnityDoublesWithin(UNITY_DOUBLE delta, UNITY_DOUBLE expected, UNITY_DOUBLE actual)
-{
-    UNITY_DOUBLE diff;
-    UNITY_FLOAT_OR_DOUBLE_WITHIN(delta, expected, actual, diff);
-}
-
-void UnityAssertEqualDoubleArray(UNITY_PTR_ATTRIBUTE const UNITY_DOUBLE* expected,
-                                 UNITY_PTR_ATTRIBUTE const UNITY_DOUBLE* actual,
-                                 const UNITY_UINT32 num_elements,
-                                 const char* msg,
-                                 const UNITY_LINE_TYPE lineNumber,
-                                 const UNITY_FLAGS_T flags)
-{
-    UNITY_UINT32 elements = num_elements;
-    UNITY_PTR_ATTRIBUTE const UNITY_DOUBLE* ptr_expected = expected;
-    UNITY_PTR_ATTRIBUTE const UNITY_DOUBLE* ptr_actual = actual;
-
-    RETURN_IF_FAIL_OR_IGNORE;
-
-    if (elements == 0)
-    {
-        UnityPrintPointlessAndBail();
-    }
-
-    if (expected == actual) return; /* Both are NULL or same pointer */
-    if (UnityIsOneArrayNull((UNITY_INTERNAL_PTR)expected, (UNITY_INTERNAL_PTR)actual, lineNumber, msg))
-        UNITY_FAIL_AND_BAIL;
-
-    while (elements--)
-    {
-        if (!UnityDoublesWithin(*ptr_expected * UNITY_DOUBLE_PRECISION, *ptr_expected, *ptr_actual))
-        {
-            UnityTestResultsFailBegin(lineNumber);
-            UnityPrint(UnityStrElement);
-            UnityPrintNumberUnsigned(num_elements - elements - 1);
-            UNITY_PRINT_EXPECTED_AND_ACTUAL_FLOAT(*ptr_expected, *ptr_actual);
-            UnityAddMsgIfSpecified(msg);
-            UNITY_FAIL_AND_BAIL;
-        }
-        if (flags == UNITY_ARRAY_TO_ARRAY)
-        {
-            ptr_expected++;
-        }
-        ptr_actual++;
-    }
-}
-
-/*-----------------------------------------------*/
-void UnityAssertDoublesWithin(const UNITY_DOUBLE delta,
-                              const UNITY_DOUBLE expected,
-                              const UNITY_DOUBLE actual,
-                              const char* msg,
-                              const UNITY_LINE_TYPE lineNumber)
-{
-    RETURN_IF_FAIL_OR_IGNORE;
-
-    if (!UnityDoublesWithin(delta, expected, actual))
-    {
-        UnityTestResultsFailBegin(lineNumber);
-        UNITY_PRINT_EXPECTED_AND_ACTUAL_FLOAT(expected, actual);
-        UnityAddMsgIfSpecified(msg);
-        UNITY_FAIL_AND_BAIL;
-    }
-}
-
-/*-----------------------------------------------*/
-
-void UnityAssertDoubleSpecial(const UNITY_DOUBLE actual,
-                              const char* msg,
-                              const UNITY_LINE_TYPE lineNumber,
-                              const UNITY_FLOAT_TRAIT_T style)
-{
-    const char* trait_names[] = {UnityStrInf, UnityStrNegInf, UnityStrNaN, UnityStrDet};
-    UNITY_INT should_be_trait = ((UNITY_INT)style & 1);
-    UNITY_INT is_trait        = !should_be_trait;
-    UNITY_INT trait_index     = (UNITY_INT)(style >> 1);
-
-    RETURN_IF_FAIL_OR_IGNORE;
-
-    switch (style)
-    {
-        case UNITY_FLOAT_IS_INF:
-        case UNITY_FLOAT_IS_NOT_INF:
-            is_trait = isinf(actual) && (actual > 0);
-            break;
-        case UNITY_FLOAT_IS_NEG_INF:
-        case UNITY_FLOAT_IS_NOT_NEG_INF:
-            is_trait = isinf(actual) && (actual < 0);
-            break;
-
-        case UNITY_FLOAT_IS_NAN:
-        case UNITY_FLOAT_IS_NOT_NAN:
-            is_trait = isnan(actual) ? 1 : 0;
-            break;
-
-        case UNITY_FLOAT_IS_DET: /* A determinate number is non infinite and not NaN. */
-        case UNITY_FLOAT_IS_NOT_DET:
-            is_trait = !isinf(actual) && !isnan(actual);
-            break;
-
-        default:
-            trait_index = 0;
-            trait_names[0] = UnityStrInvalidFloatTrait;
-            break;
-    }
-
-    if (is_trait != should_be_trait)
-    {
-        UnityTestResultsFailBegin(lineNumber);
-        UnityPrint(UnityStrExpected);
-        if (!should_be_trait)
-            UnityPrint(UnityStrNot);
-        UnityPrint(trait_names[trait_index]);
-        UnityPrint(UnityStrWas);
-#ifndef UNITY_EXCLUDE_FLOAT_PRINT
-        UnityPrintFloat(actual);
-#else
-        if (should_be_trait)
-            UnityPrint(UnityStrNot);
-        UnityPrint(trait_names[trait_index]);
-#endif
-        UnityAddMsgIfSpecified(msg);
-        UNITY_FAIL_AND_BAIL;
-    }
-}
-
-#endif /* not UNITY_EXCLUDE_DOUBLE */
-
-/*-----------------------------------------------*/
-void UnityAssertNumbersWithin(const UNITY_UINT delta,
-                              const UNITY_INT expected,
-                              const UNITY_INT actual,
-                              const char* msg,
-                              const UNITY_LINE_TYPE lineNumber,
-                              const UNITY_DISPLAY_STYLE_T style)
-{
-    RETURN_IF_FAIL_OR_IGNORE;
-
-    if ((style & UNITY_DISPLAY_RANGE_INT) == UNITY_DISPLAY_RANGE_INT)
-    {
-        if (actual > expected)
-          Unity.CurrentTestFailed = (UNITY_UINT)((UNITY_UINT)(actual - expected) > delta);
-        else
-            Unity.CurrentTestFailed = (UNITY_UINT)((UNITY_UINT)(expected - actual) > delta);
-    }
-    else
-    {
-        if ((UNITY_UINT)actual > (UNITY_UINT)expected)
-            Unity.CurrentTestFailed = (UNITY_UINT)((UNITY_UINT)(actual - expected) > delta);
-        else
-            Unity.CurrentTestFailed = (UNITY_UINT)((UNITY_UINT)(expected - actual) > delta);
-    }
-
-    if (Unity.CurrentTestFailed)
-    {
-        UnityTestResultsFailBegin(lineNumber);
-        UnityPrint(UnityStrDelta);
-        UnityPrintNumberByStyle((UNITY_INT)delta, style);
-        UnityPrint(UnityStrExpected);
-        UnityPrintNumberByStyle(expected, style);
-        UnityPrint(UnityStrWas);
-        UnityPrintNumberByStyle(actual, style);
-        UnityAddMsgIfSpecified(msg);
-        UNITY_FAIL_AND_BAIL;
-    }
-}
-
-/*-----------------------------------------------*/
-void UnityAssertEqualString(const char* expected,
-                            const char* actual,
-                            const char* msg,
-                            const UNITY_LINE_TYPE lineNumber)
-{
-    UNITY_UINT32 i;
-
-    RETURN_IF_FAIL_OR_IGNORE;
-
-    /* if both pointers not null compare the strings */
-    if (expected && actual)
-    {
-        for (i = 0; expected[i] || actual[i]; i++)
-        {
-            if (expected[i] != actual[i])
-            {
-                Unity.CurrentTestFailed = 1;
-                break;
-            }
-        }
-    }
-    else
-    { /* handle case of one pointers being null (if both null, test should pass) */
-        if (expected != actual)
-        {
-            Unity.CurrentTestFailed = 1;
-        }
-    }
-
-    if (Unity.CurrentTestFailed)
-    {
-        UnityTestResultsFailBegin(lineNumber);
-        UnityPrintExpectedAndActualStrings(expected, actual);
-        UnityAddMsgIfSpecified(msg);
-        UNITY_FAIL_AND_BAIL;
-    }
-}
-
-/*-----------------------------------------------*/
-void UnityAssertEqualStringLen(const char* expected,
-                               const char* actual,
-                               const UNITY_UINT32 length,
-                               const char* msg,
-                               const UNITY_LINE_TYPE lineNumber)
-{
-    UNITY_UINT32 i;
-
-    RETURN_IF_FAIL_OR_IGNORE;
-
-    /* if both pointers not null compare the strings */
-    if (expected && actual)
-    {
-        for (i = 0; (i < length) && (expected[i] || actual[i]); i++)
-        {
-            if (expected[i] != actual[i])
-            {
-                Unity.CurrentTestFailed = 1;
-                break;
-            }
-        }
-    }
-    else
-    { /* handle case of one pointers being null (if both null, test should pass) */
-        if (expected != actual)
-        {
-            Unity.CurrentTestFailed = 1;
-        }
-    }
-
-    if (Unity.CurrentTestFailed)
-    {
-        UnityTestResultsFailBegin(lineNumber);
-        UnityPrintExpectedAndActualStringsLen(expected, actual, length);
-        UnityAddMsgIfSpecified(msg);
-        UNITY_FAIL_AND_BAIL;
-    }
-}
-
-/*-----------------------------------------------*/
-void UnityAssertEqualStringArray(UNITY_INTERNAL_PTR expected,
-                                 const char** actual,
-                                 const UNITY_UINT32 num_elements,
-                                 const char* msg,
-                                 const UNITY_LINE_TYPE lineNumber,
-                                 const UNITY_FLAGS_T flags)
-{
-    UNITY_UINT32 i = 0;
-    UNITY_UINT32 j = 0;
-    const char* expd = NULL;
-    const char* act = NULL;
-
-    RETURN_IF_FAIL_OR_IGNORE;
-
-    /* if no elements, it's an error */
-    if (num_elements == 0)
-    {
-        UnityPrintPointlessAndBail();
-    }
-
-    if ((const void*)expected == (const void*)actual)
-    {
-        return; /* Both are NULL or same pointer */
-    }
-
-    if (UnityIsOneArrayNull((UNITY_INTERNAL_PTR)expected, (UNITY_INTERNAL_PTR)actual, lineNumber, msg))
-    {
-        UNITY_FAIL_AND_BAIL;
-    }
-
-    if (flags != UNITY_ARRAY_TO_ARRAY)
-    {
-        expd = (const char*)expected;
-    }
-
-    do
-    {
-        act = actual[j];
-        if (flags == UNITY_ARRAY_TO_ARRAY)
-        {
-            expd = ((const char* const*)expected)[j];
-        }
-
-        /* if both pointers not null compare the strings */
-        if (expd && act)
-        {
-            for (i = 0; expd[i] || act[i]; i++)
-            {
-                if (expd[i] != act[i])
-                {
-                    Unity.CurrentTestFailed = 1;
-                    break;
-                }
-            }
-        }
-        else
-        { /* handle case of one pointers being null (if both null, test should pass) */
-            if (expd != act)
-            {
-                Unity.CurrentTestFailed = 1;
-            }
-        }
-
-        if (Unity.CurrentTestFailed)
-        {
-            UnityTestResultsFailBegin(lineNumber);
-            if (num_elements > 1)
-            {
-                UnityPrint(UnityStrElement);
-                UnityPrintNumberUnsigned(j);
-            }
-            UnityPrintExpectedAndActualStrings(expd, act);
-            UnityAddMsgIfSpecified(msg);
-            UNITY_FAIL_AND_BAIL;
-        }
-    } while (++j < num_elements);
-}
-
-/*-----------------------------------------------*/
-void UnityAssertEqualMemory(UNITY_INTERNAL_PTR expected,
-                            UNITY_INTERNAL_PTR actual,
-                            const UNITY_UINT32 length,
-                            const UNITY_UINT32 num_elements,
-                            const char* msg,
-                            const UNITY_LINE_TYPE lineNumber,
-                            const UNITY_FLAGS_T flags)
-{
-    UNITY_PTR_ATTRIBUTE const unsigned char* ptr_exp = (UNITY_PTR_ATTRIBUTE const unsigned char*)expected;
-    UNITY_PTR_ATTRIBUTE const unsigned char* ptr_act = (UNITY_PTR_ATTRIBUTE const unsigned char*)actual;
-    UNITY_UINT32 elements = num_elements;
-    UNITY_UINT32 bytes;
-
-    RETURN_IF_FAIL_OR_IGNORE;
-
-    if ((elements == 0) || (length == 0))
-    {
-        UnityPrintPointlessAndBail();
-    }
-
-    if (expected == actual) return; /* Both are NULL or same pointer */
-    if (UnityIsOneArrayNull(expected, actual, lineNumber, msg))
-        UNITY_FAIL_AND_BAIL;
-
-    while (elements--)
-    {
-        bytes = length;
-        while (bytes--)
-        {
-            if (*ptr_exp != *ptr_act)
-            {
-                UnityTestResultsFailBegin(lineNumber);
-                UnityPrint(UnityStrMemory);
-                if (num_elements > 1)
-                {
-                    UnityPrint(UnityStrElement);
-                    UnityPrintNumberUnsigned(num_elements - elements - 1);
-                }
-                UnityPrint(UnityStrByte);
-                UnityPrintNumberUnsigned(length - bytes - 1);
-                UnityPrint(UnityStrExpected);
-                UnityPrintNumberByStyle(*ptr_exp, UNITY_DISPLAY_STYLE_HEX8);
-                UnityPrint(UnityStrWas);
-                UnityPrintNumberByStyle(*ptr_act, UNITY_DISPLAY_STYLE_HEX8);
-                UnityAddMsgIfSpecified(msg);
-                UNITY_FAIL_AND_BAIL;
-            }
-            ptr_exp++;
-            ptr_act++;
-        }
-        if (flags == UNITY_ARRAY_TO_VAL)
-        {
-            ptr_exp = (UNITY_PTR_ATTRIBUTE const unsigned char*)expected;
-        }
-    }
-}
-
-/*-----------------------------------------------*/
-
-static union
-{
-    UNITY_INT8 i8;
-    UNITY_INT16 i16;
-    UNITY_INT32 i32;
-#ifdef UNITY_SUPPORT_64
-    UNITY_INT64 i64;
-#endif
-#ifndef UNITY_EXCLUDE_FLOAT
-    float f;
-#endif
-#ifndef UNITY_EXCLUDE_DOUBLE
-    double d;
-#endif
-} UnityQuickCompare;
-
-UNITY_INTERNAL_PTR UnityNumToPtr(const UNITY_INT num, const UNITY_UINT8 size)
-{
-    switch(size)
-    {
-        case 1:
-          UnityQuickCompare.i8 = (UNITY_INT8)num;
-          return (UNITY_INTERNAL_PTR)(&UnityQuickCompare.i8);
-
-        case 2:
-          UnityQuickCompare.i16 = (UNITY_INT16)num;
-          return (UNITY_INTERNAL_PTR)(&UnityQuickCompare.i16);
-
-#ifdef UNITY_SUPPORT_64
-        case 8:
-          UnityQuickCompare.i64 = (UNITY_INT64)num;
-          return (UNITY_INTERNAL_PTR)(&UnityQuickCompare.i64);
-#endif
-        default: /* 4 bytes */
-          UnityQuickCompare.i32 = (UNITY_INT32)num;
-          return (UNITY_INTERNAL_PTR)(&UnityQuickCompare.i32);
-    }
-}
-
-#ifndef UNITY_EXCLUDE_FLOAT
-UNITY_INTERNAL_PTR UnityFloatToPtr(const float num)
-{
-    UnityQuickCompare.f = num;
-    return (UNITY_INTERNAL_PTR)(&UnityQuickCompare.f);
-}
-#endif
-
-#ifndef UNITY_EXCLUDE_DOUBLE
-UNITY_INTERNAL_PTR UnityDoubleToPtr(const double num)
-{
-    UnityQuickCompare.d = num;
-    return (UNITY_INTERNAL_PTR)(&UnityQuickCompare.d);
-}
-#endif
-
-/*-----------------------------------------------
- * Control Functions
- *-----------------------------------------------*/
-
-void UnityFail(const char* msg, const UNITY_LINE_TYPE line)
-{
-    RETURN_IF_FAIL_OR_IGNORE;
-
-    UnityTestResultsBegin(Unity.TestFile, line);
-    UnityPrint(UnityStrFail);
-    if (msg != NULL)
-    {
-        UNITY_OUTPUT_CHAR(':');
-
-#ifndef UNITY_EXCLUDE_DETAILS
-        if (Unity.CurrentDetail1)
-        {
-            UnityPrint(UnityStrDetail1Name);
-            UnityPrint(Unity.CurrentDetail1);
-            if (Unity.CurrentDetail2)
-            {
-                UnityPrint(UnityStrDetail2Name);
-                UnityPrint(Unity.CurrentDetail2);
-            }
-            UnityPrint(UnityStrSpacer);
-        }
-#endif
-        if (msg[0] != ' ')
-        {
-            UNITY_OUTPUT_CHAR(' ');
-        }
-        UnityPrint(msg);
-    }
-
-    UNITY_FAIL_AND_BAIL;
-}
-
-/*-----------------------------------------------*/
-void UnityIgnore(const char* msg, const UNITY_LINE_TYPE line)
-{
-    RETURN_IF_FAIL_OR_IGNORE;
-
-    UnityTestResultsBegin(Unity.TestFile, line);
-    UnityPrint(UnityStrIgnore);
-    if (msg != NULL)
-    {
-        UNITY_OUTPUT_CHAR(':');
-        UNITY_OUTPUT_CHAR(' ');
-        UnityPrint(msg);
-    }
-    UNITY_IGNORE_AND_BAIL;
-}
-
-/*-----------------------------------------------*/
-void UnityDefaultTestRun(UnityTestFunction Func, const char* FuncName, const int FuncLineNum)
-{
-    Unity.CurrentTestName = FuncName;
-    Unity.CurrentTestLineNumber = (UNITY_LINE_TYPE)FuncLineNum;
-    Unity.NumberOfTests++;
-    UNITY_CLR_DETAILS();
-    if (TEST_PROTECT())
-    {
-        setUp();
-        Func();
-    }
-    if (TEST_PROTECT())
-    {
-        tearDown();
-    }
-    UnityConcludeTest();
-}
-
-/*-----------------------------------------------*/
-void UnityBegin(const char* filename)
-{
-    Unity.TestFile = filename;
-    Unity.CurrentTestName = NULL;
-    Unity.CurrentTestLineNumber = 0;
-    Unity.NumberOfTests = 0;
-    Unity.TestFailures = 0;
-    Unity.TestIgnores = 0;
-    Unity.CurrentTestFailed = 0;
-    Unity.CurrentTestIgnored = 0;
-
-    UNITY_CLR_DETAILS();
-    UNITY_OUTPUT_START();
-}
-
-/*-----------------------------------------------*/
-int UnityEnd(void)
-{
-    UNITY_PRINT_EOL();
-    UnityPrint(UnityStrBreaker);
-    UNITY_PRINT_EOL();
-    UnityPrintNumber((UNITY_INT)(Unity.NumberOfTests));
-    UnityPrint(UnityStrResultsTests);
-    UnityPrintNumber((UNITY_INT)(Unity.TestFailures));
-    UnityPrint(UnityStrResultsFailures);
-    UnityPrintNumber((UNITY_INT)(Unity.TestIgnores));
-    UnityPrint(UnityStrResultsIgnored);
-    UNITY_PRINT_EOL();
-    if (Unity.TestFailures == 0U)
-    {
-        UnityPrint(UnityStrOk);
-    }
-    else
-    {
-        UnityPrint(UnityStrFail);
-#ifdef UNITY_DIFFERENTIATE_FINAL_FAIL
-        UNITY_OUTPUT_CHAR('E'); UNITY_OUTPUT_CHAR('D');
-#endif
-    }
-    UNITY_PRINT_EOL();
-    UNITY_FLUSH_CALL();
-    UNITY_OUTPUT_COMPLETE();
-    return (int)(Unity.TestFailures);
-}
-
-/*-----------------------------------------------
- * Command Line Argument Support
- *-----------------------------------------------*/
-#ifdef UNITY_USE_COMMAND_LINE_ARGS
-
-char* UnityOptionIncludeNamed = NULL;
-char* UnityOptionExcludeNamed = NULL;
-int UnityVerbosity            = 1;
-
-int UnityParseOptions(int argc, char** argv)
-{
-    UnityOptionIncludeNamed = NULL;
-    UnityOptionExcludeNamed = NULL;
-
-    for (int i = 1; i < argc; i++)
-    {
-        if (argv[i][0] == '-')
-        {
-            switch (argv[i][1])
-            {
-                case 'l': /* list tests */
-                    return -1;
-                case 'n': /* include tests with name including this string */
-                case 'f': /* an alias for -n */
-                    if (argv[i][2] == '=')
-                        UnityOptionIncludeNamed = &argv[i][3];
-                    else if (++i < argc)
-                        UnityOptionIncludeNamed = argv[i];
-                    else
-                    {
-                        UnityPrint("ERROR: No Test String to Include Matches For");
-                        UNITY_PRINT_EOL();
-                        return 1;
-                    }
-                    break;
-                case 'q': /* quiet */
-                    UnityVerbosity = 0;
-                    break;
-                case 'v': /* verbose */
-                    UnityVerbosity = 2;
-                    break;
-                case 'x': /* exclude tests with name including this string */
-                    if (argv[i][2] == '=')
-                        UnityOptionExcludeNamed = &argv[i][3];
-                    else if (++i < argc)
-                        UnityOptionExcludeNamed = argv[i];
-                    else
-                    {
-                        UnityPrint("ERROR: No Test String to Exclude Matches For");
-                        UNITY_PRINT_EOL();
-                        return 1;
-                    }
-                    break;
-                default:
-                    UnityPrint("ERROR: Unknown Option ");
-                    UNITY_OUTPUT_CHAR(argv[i][1]);
-                    UNITY_PRINT_EOL();
-                    return 1;
-            }
-        }
-    }
-
-    return 0;
-}
-
-int IsStringInBiggerString(const char* longstring, const char* shortstring)
-{
-    const char* lptr = longstring;
-    const char* sptr = shortstring;
-    const char* lnext = lptr;
-
-    if (*sptr == '*')
-        return 1;
-
-    while (*lptr)
-    {
-        lnext = lptr + 1;
-
-        /* If they current bytes match, go on to the next bytes */
-        while (*lptr && *sptr && (*lptr == *sptr))
-        {
-            lptr++;
-            sptr++;
-
-            /* We're done if we match the entire string or up to a wildcard */
-            if (*sptr == '*')
-                return 1;
-            if (*sptr == ',')
-                return 1;
-            if (*sptr == '"')
-                return 1;
-            if (*sptr == '\'')
-                return 1;
-            if (*sptr == ':')
-                return 2;
-            if (*sptr == 0)
-                return 1;
-        }
-
-        /* Otherwise we start in the long pointer 1 character further and try again */
-        lptr = lnext;
-        sptr = shortstring;
-    }
-    return 0;
-}
-
-int UnityStringArgumentMatches(const char* str)
-{
-    int retval;
-    const char* ptr1;
-    const char* ptr2;
-    const char* ptrf;
-
-    /* Go through the options and get the substrings for matching one at a time */
-    ptr1 = str;
-    while (ptr1[0] != 0)
-    {
-        if ((ptr1[0] == '"') || (ptr1[0] == '\''))
-            ptr1++;
-
-        /* look for the start of the next partial */
-        ptr2 = ptr1;
-        ptrf = 0;
-        do
-        {
-            ptr2++;
-            if ((ptr2[0] == ':') && (ptr2[1] != 0) && (ptr2[0] != '\'') && (ptr2[0] != '"') && (ptr2[0] != ','))
-                ptrf = &ptr2[1];
-        } while ((ptr2[0] != 0) && (ptr2[0] != '\'') && (ptr2[0] != '"') && (ptr2[0] != ','));
-        while ((ptr2[0] != 0) && ((ptr2[0] == ':') || (ptr2[0] == '\'') || (ptr2[0] == '"') || (ptr2[0] == ',')))
-            ptr2++;
-
-        /* done if complete filename match */
-        retval = IsStringInBiggerString(Unity.TestFile, ptr1);
-        if (retval == 1)
-            return retval;
-
-        /* done if testname match after filename partial match */
-        if ((retval == 2) && (ptrf != 0))
-        {
-            if (IsStringInBiggerString(Unity.CurrentTestName, ptrf))
-                return 1;
-        }
-
-        /* done if complete testname match */
-        if (IsStringInBiggerString(Unity.CurrentTestName, ptr1) == 1)
-            return 1;
-
-        ptr1 = ptr2;
-    }
-
-    /* we couldn't find a match for any substrings */
-    return 0;
-}
-
-int UnityTestMatches(void)
-{
-    /* Check if this test name matches the included test pattern */
-    int retval;
-    if (UnityOptionIncludeNamed)
-    {
-        retval = UnityStringArgumentMatches(UnityOptionIncludeNamed);
-    }
-    else
-        retval = 1;
-
-    /* Check if this test name matches the excluded test pattern */
-    if (UnityOptionExcludeNamed)
-    {
-        if (UnityStringArgumentMatches(UnityOptionExcludeNamed))
-            retval = 0;
-    }
-    return retval;
-}
-
-#endif /* UNITY_USE_COMMAND_LINE_ARGS */
-/*-----------------------------------------------*/
diff --git a/libs/libzmq/external/unity/unity.h b/libs/libzmq/external/unity/unity.h
deleted file mode 100644
index 32ff0e6..0000000
--- a/libs/libzmq/external/unity/unity.h
+++ /dev/null
@@ -1,503 +0,0 @@
-/* ==========================================
-    Unity Project - A Test Framework for C
-    Copyright (c) 2007-14 Mike Karlesky, Mark VanderVoord, Greg Williams
-    [Released under MIT License. Please refer to license.txt for details]
-========================================== */
-
-#ifndef UNITY_FRAMEWORK_H
-#define UNITY_FRAMEWORK_H
-#define UNITY
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-#include "unity_internals.h"
-
-/*-------------------------------------------------------
- * Test Setup / Teardown
- *-------------------------------------------------------*/
-
-/* These functions are intended to be called before and after each test. */
-void setUp(void);
-void tearDown(void);
-
-/* These functions are intended to be called at the beginning and end of an
- * entire test suite.  suiteTearDown() is passed the number of tests that
- * failed, and its return value becomes the exit code of main(). */
-void suiteSetUp(void);
-int suiteTearDown(int num_failures);
-
-/* If the compiler supports it, the following block provides stub
- * implementations of the above functions as weak symbols.  Note that on
- * some platforms (MinGW for example), weak function implementations need
- * to be in the same translation unit they are called from.  This can be
- * achieved by defining UNITY_INCLUDE_SETUP_STUBS before including unity.h. */
-#ifdef UNITY_INCLUDE_SETUP_STUBS
-  #ifdef UNITY_WEAK_ATTRIBUTE
-    UNITY_WEAK_ATTRIBUTE void setUp(void) { }
-    UNITY_WEAK_ATTRIBUTE void tearDown(void) { }
-    UNITY_WEAK_ATTRIBUTE void suiteSetUp(void) { }
-    UNITY_WEAK_ATTRIBUTE int suiteTearDown(int num_failures) { return num_failures; }
-  #elif defined(UNITY_WEAK_PRAGMA)
-    #pragma weak setUp
-    void setUp(void) { }
-    #pragma weak tearDown
-    void tearDown(void) { }
-    #pragma weak suiteSetUp
-    void suiteSetUp(void) { }
-    #pragma weak suiteTearDown
-    int suiteTearDown(int num_failures) { return num_failures; }
-  #endif
-#endif
-
-/*-------------------------------------------------------
- * Configuration Options
- *-------------------------------------------------------
- * All options described below should be passed as a compiler flag to all files using Unity. If you must add #defines, place them BEFORE the #include above.
-
- * Integers/longs/pointers
- *     - Unity attempts to automatically discover your integer sizes
- *       - define UNITY_EXCLUDE_STDINT_H to stop attempting to look in <stdint.h>
- *       - define UNITY_EXCLUDE_LIMITS_H to stop attempting to look in <limits.h>
- *     - If you cannot use the automatic methods above, you can force Unity by using these options:
- *       - define UNITY_SUPPORT_64
- *       - set UNITY_INT_WIDTH
- *       - set UNITY_LONG_WIDTH
- *       - set UNITY_POINTER_WIDTH
-
- * Floats
- *     - define UNITY_EXCLUDE_FLOAT to disallow floating point comparisons
- *     - define UNITY_FLOAT_PRECISION to specify the precision to use when doing TEST_ASSERT_EQUAL_FLOAT
- *     - define UNITY_FLOAT_TYPE to specify doubles instead of single precision floats
- *     - define UNITY_INCLUDE_DOUBLE to allow double floating point comparisons
- *     - define UNITY_EXCLUDE_DOUBLE to disallow double floating point comparisons (default)
- *     - define UNITY_DOUBLE_PRECISION to specify the precision to use when doing TEST_ASSERT_EQUAL_DOUBLE
- *     - define UNITY_DOUBLE_TYPE to specify something other than double
- *     - define UNITY_EXCLUDE_FLOAT_PRINT to trim binary size, won't print floating point values in errors
-
- * Output
- *     - by default, Unity prints to standard out with putchar.  define UNITY_OUTPUT_CHAR(a) with a different function if desired
- *     - define UNITY_DIFFERENTIATE_FINAL_FAIL to print FAILED (vs. FAIL) at test end summary - for automated search for failure
-
- * Optimization
- *     - by default, line numbers are stored in unsigned shorts.  Define UNITY_LINE_TYPE with a different type if your files are huge
- *     - by default, test and failure counters are unsigned shorts.  Define UNITY_COUNTER_TYPE with a different type if you want to save space or have more than 65535 Tests.
-
- * Test Cases
- *     - define UNITY_SUPPORT_TEST_CASES to include the TEST_CASE macro, though really it's mostly about the runner generator script
-
- * Parameterized Tests
- *     - you'll want to create a define of TEST_CASE(...) which basically evaluates to nothing
-
- * Tests with Arguments
- *     - you'll want to define UNITY_USE_COMMAND_LINE_ARGS if you have the test runner passing arguments to Unity
-
- *-------------------------------------------------------
- * Basic Fail and Ignore
- *-------------------------------------------------------*/
-
-#define TEST_FAIL_MESSAGE(message)                                                                 UNITY_TEST_FAIL(__LINE__, (message))
-#define TEST_FAIL()                                                                                UNITY_TEST_FAIL(__LINE__, NULL)
-#define TEST_IGNORE_MESSAGE(message)                                                               UNITY_TEST_IGNORE(__LINE__, (message))
-#define TEST_IGNORE()                                                                              UNITY_TEST_IGNORE(__LINE__, NULL)
-#define TEST_ONLY()
-
-/* It is not necessary for you to call PASS. A PASS condition is assumed if nothing fails.
- * This method allows you to abort a test immediately with a PASS state, ignoring the remainder of the test. */
-#define TEST_PASS()                                                                                TEST_ABORT()
-
-/* This macro does nothing, but it is useful for build tools (like Ceedling) to make use of this to figure out
- * which files should be linked to in order to perform a test. Use it like TEST_FILE("sandwiches.c") */
-#define TEST_FILE(a)
-
-/*-------------------------------------------------------
- * Test Asserts (simple)
- *-------------------------------------------------------*/
-
-/* Boolean */
-#define TEST_ASSERT(condition)                                                                     UNITY_TEST_ASSERT(       (condition), __LINE__, " Expression Evaluated To FALSE")
-#define TEST_ASSERT_TRUE(condition)                                                                UNITY_TEST_ASSERT(       (condition), __LINE__, " Expected TRUE Was FALSE")
-#define TEST_ASSERT_UNLESS(condition)                                                              UNITY_TEST_ASSERT(      !(condition), __LINE__, " Expression Evaluated To TRUE")
-#define TEST_ASSERT_FALSE(condition)                                                               UNITY_TEST_ASSERT(      !(condition), __LINE__, " Expected FALSE Was TRUE")
-#define TEST_ASSERT_NULL(pointer)                                                                  UNITY_TEST_ASSERT_NULL(    (pointer), __LINE__, " Expected NULL")
-#define TEST_ASSERT_NOT_NULL(pointer)                                                              UNITY_TEST_ASSERT_NOT_NULL((pointer), __LINE__, " Expected Non-NULL")
-
-/* Integers (of all sizes) */
-#define TEST_ASSERT_EQUAL_INT(expected, actual)                                                    UNITY_TEST_ASSERT_EQUAL_INT((expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_INT8(expected, actual)                                                   UNITY_TEST_ASSERT_EQUAL_INT8((expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_INT16(expected, actual)                                                  UNITY_TEST_ASSERT_EQUAL_INT16((expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_INT32(expected, actual)                                                  UNITY_TEST_ASSERT_EQUAL_INT32((expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_INT64(expected, actual)                                                  UNITY_TEST_ASSERT_EQUAL_INT64((expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL(expected, actual)                                                        UNITY_TEST_ASSERT_EQUAL_INT((expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_NOT_EQUAL(expected, actual)                                                    UNITY_TEST_ASSERT(((expected) !=  (actual)), __LINE__, " Expected Not-Equal")
-#define TEST_ASSERT_EQUAL_UINT(expected, actual)                                                   UNITY_TEST_ASSERT_EQUAL_UINT( (expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_UINT8(expected, actual)                                                  UNITY_TEST_ASSERT_EQUAL_UINT8( (expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_UINT16(expected, actual)                                                 UNITY_TEST_ASSERT_EQUAL_UINT16( (expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_UINT32(expected, actual)                                                 UNITY_TEST_ASSERT_EQUAL_UINT32( (expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_UINT64(expected, actual)                                                 UNITY_TEST_ASSERT_EQUAL_UINT64( (expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_HEX(expected, actual)                                                    UNITY_TEST_ASSERT_EQUAL_HEX32((expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_HEX8(expected, actual)                                                   UNITY_TEST_ASSERT_EQUAL_HEX8( (expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_HEX16(expected, actual)                                                  UNITY_TEST_ASSERT_EQUAL_HEX16((expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_HEX32(expected, actual)                                                  UNITY_TEST_ASSERT_EQUAL_HEX32((expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_HEX64(expected, actual)                                                  UNITY_TEST_ASSERT_EQUAL_HEX64((expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_BITS(mask, expected, actual)                                                   UNITY_TEST_ASSERT_BITS((mask), (expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_BITS_HIGH(mask, actual)                                                        UNITY_TEST_ASSERT_BITS((mask), (UNITY_UINT32)(-1), (actual), __LINE__, NULL)
-#define TEST_ASSERT_BITS_LOW(mask, actual)                                                         UNITY_TEST_ASSERT_BITS((mask), (UNITY_UINT32)(0), (actual), __LINE__, NULL)
-#define TEST_ASSERT_BIT_HIGH(bit, actual)                                                          UNITY_TEST_ASSERT_BITS(((UNITY_UINT32)1 << (bit)), (UNITY_UINT32)(-1), (actual), __LINE__, NULL)
-#define TEST_ASSERT_BIT_LOW(bit, actual)                                                           UNITY_TEST_ASSERT_BITS(((UNITY_UINT32)1 << (bit)), (UNITY_UINT32)(0), (actual), __LINE__, NULL)
-
-/* Integer Greater Than/ Less Than (of all sizes) */
-#define TEST_ASSERT_GREATER_THAN(threshold, actual)                                                UNITY_TEST_ASSERT_GREATER_THAN_INT((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_GREATER_THAN_INT(threshold, actual)                                            UNITY_TEST_ASSERT_GREATER_THAN_INT((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_GREATER_THAN_INT8(threshold, actual)                                           UNITY_TEST_ASSERT_GREATER_THAN_INT8((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_GREATER_THAN_INT16(threshold, actual)                                          UNITY_TEST_ASSERT_GREATER_THAN_INT16((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_GREATER_THAN_INT32(threshold, actual)                                          UNITY_TEST_ASSERT_GREATER_THAN_INT32((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_GREATER_THAN_INT64(threshold, actual)                                          UNITY_TEST_ASSERT_GREATER_THAN_INT64((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_GREATER_THAN_UINT(threshold, actual)                                           UNITY_TEST_ASSERT_GREATER_THAN_UINT((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_GREATER_THAN_UINT8(threshold, actual)                                          UNITY_TEST_ASSERT_GREATER_THAN_UINT8((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_GREATER_THAN_UINT16(threshold, actual)                                         UNITY_TEST_ASSERT_GREATER_THAN_UINT16((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_GREATER_THAN_UINT32(threshold, actual)                                         UNITY_TEST_ASSERT_GREATER_THAN_UINT32((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_GREATER_THAN_UINT64(threshold, actual)                                         UNITY_TEST_ASSERT_GREATER_THAN_UINT64((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_GREATER_THAN_HEX8(threshold, actual)                                           UNITY_TEST_ASSERT_GREATER_THAN_HEX8((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_GREATER_THAN_HEX16(threshold, actual)                                          UNITY_TEST_ASSERT_GREATER_THAN_HEX16((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_GREATER_THAN_HEX32(threshold, actual)                                          UNITY_TEST_ASSERT_GREATER_THAN_HEX32((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_GREATER_THAN_HEX64(threshold, actual)                                          UNITY_TEST_ASSERT_GREATER_THAN_HEX64((threshold), (actual), __LINE__, NULL)
-
-#define TEST_ASSERT_LESS_THAN(threshold, actual)                                                   UNITY_TEST_ASSERT_SMALLER_THAN_INT((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_LESS_THAN_INT(threshold, actual)                                               UNITY_TEST_ASSERT_SMALLER_THAN_INT((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_LESS_THAN_INT8(threshold, actual)                                              UNITY_TEST_ASSERT_SMALLER_THAN_INT8((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_LESS_THAN_INT16(threshold, actual)                                             UNITY_TEST_ASSERT_SMALLER_THAN_INT16((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_LESS_THAN_INT32(threshold, actual)                                             UNITY_TEST_ASSERT_SMALLER_THAN_INT32((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_LESS_THAN_INT64(threshold, actual)                                             UNITY_TEST_ASSERT_SMALLER_THAN_INT64((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_LESS_THAN_UINT(threshold, actual)                                              UNITY_TEST_ASSERT_SMALLER_THAN_UINT((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_LESS_THAN_UINT8(threshold, actual)                                             UNITY_TEST_ASSERT_SMALLER_THAN_UINT8((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_LESS_THAN_UINT16(threshold, actual)                                            UNITY_TEST_ASSERT_SMALLER_THAN_UINT16((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_LESS_THAN_UINT32(threshold, actual)                                            UNITY_TEST_ASSERT_SMALLER_THAN_UINT32((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_LESS_THAN_UINT64(threshold, actual)                                            UNITY_TEST_ASSERT_SMALLER_THAN_UINT64((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_LESS_THAN_HEX8(threshold, actual)                                              UNITY_TEST_ASSERT_SMALLER_THAN_HEX8((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_LESS_THAN_HEX16(threshold, actual)                                             UNITY_TEST_ASSERT_SMALLER_THAN_HEX16((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_LESS_THAN_HEX32(threshold, actual)                                             UNITY_TEST_ASSERT_SMALLER_THAN_HEX32((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_LESS_THAN_HEX64(threshold, actual)                                             UNITY_TEST_ASSERT_SMALLER_THAN_HEX64((threshold), (actual), __LINE__, NULL)
-
-#define TEST_ASSERT_GREATER_OR_EQUAL(threshold, actual)                                            UNITY_TEST_ASSERT_GREATER_OR_EQUAL_INT((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_GREATER_OR_EQUAL_INT(threshold, actual)                                        UNITY_TEST_ASSERT_GREATER_OR_EQUAL_INT((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_GREATER_OR_EQUAL_INT8(threshold, actual)                                       UNITY_TEST_ASSERT_GREATER_OR_EQUAL_INT8((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_GREATER_OR_EQUAL_INT16(threshold, actual)                                      UNITY_TEST_ASSERT_GREATER_OR_EQUAL_INT16((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_GREATER_OR_EQUAL_INT32(threshold, actual)                                      UNITY_TEST_ASSERT_GREATER_OR_EQUAL_INT32((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_GREATER_OR_EQUAL_INT64(threshold, actual)                                      UNITY_TEST_ASSERT_GREATER_OR_EQUAL_INT64((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_GREATER_OR_EQUAL_UINT(threshold, actual)                                       UNITY_TEST_ASSERT_GREATER_OR_EQUAL_UINT((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_GREATER_OR_EQUAL_UINT8(threshold, actual)                                      UNITY_TEST_ASSERT_GREATER_OR_EQUAL_UINT8((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_GREATER_OR_EQUAL_UINT16(threshold, actual)                                     UNITY_TEST_ASSERT_GREATER_OR_EQUAL_UINT16((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_GREATER_OR_EQUAL_UINT32(threshold, actual)                                     UNITY_TEST_ASSERT_GREATER_OR_EQUAL_UINT32((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_GREATER_OR_EQUAL_UINT64(threshold, actual)                                     UNITY_TEST_ASSERT_GREATER_OR_EQUAL_UINT64((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_GREATER_OR_EQUAL_HEX8(threshold, actual)                                       UNITY_TEST_ASSERT_GREATER_OR_EQUAL_HEX8((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_GREATER_OR_EQUAL_HEX16(threshold, actual)                                      UNITY_TEST_ASSERT_GREATER_OR_EQUAL_HEX16((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_GREATER_OR_EQUAL_HEX32(threshold, actual)                                      UNITY_TEST_ASSERT_GREATER_OR_EQUAL_HEX32((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_GREATER_OR_EQUAL_HEX64(threshold, actual)                                      UNITY_TEST_ASSERT_GREATER_OR_EQUAL_HEX64((threshold), (actual), __LINE__, NULL)
-
-#define TEST_ASSERT_LESS_OR_EQUAL(threshold, actual)                                               UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_INT((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_LESS_OR_EQUAL_INT(threshold, actual)                                           UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_INT((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_LESS_OR_EQUAL_INT8(threshold, actual)                                          UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_INT8((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_LESS_OR_EQUAL_INT16(threshold, actual)                                         UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_INT16((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_LESS_OR_EQUAL_INT32(threshold, actual)                                         UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_INT32((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_LESS_OR_EQUAL_INT64(threshold, actual)                                         UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_INT64((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_LESS_OR_EQUAL_UINT(threshold, actual)                                          UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_UINT((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_LESS_OR_EQUAL_UINT8(threshold, actual)                                         UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_UINT8((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_LESS_OR_EQUAL_UINT16(threshold, actual)                                        UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_UINT16((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_LESS_OR_EQUAL_UINT32(threshold, actual)                                        UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_UINT32((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_LESS_OR_EQUAL_UINT64(threshold, actual)                                        UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_UINT64((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_LESS_OR_EQUAL_HEX8(threshold, actual)                                          UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_HEX8((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_LESS_OR_EQUAL_HEX16(threshold, actual)                                         UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_HEX16((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_LESS_OR_EQUAL_HEX32(threshold, actual)                                         UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_HEX32((threshold), (actual), __LINE__, NULL)
-#define TEST_ASSERT_LESS_OR_EQUAL_HEX64(threshold, actual)                                         UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_HEX64((threshold), (actual), __LINE__, NULL)
-
-/* Integer Ranges (of all sizes) */
-#define TEST_ASSERT_INT_WITHIN(delta, expected, actual)                                            UNITY_TEST_ASSERT_INT_WITHIN((delta), (expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_INT8_WITHIN(delta, expected, actual)                                           UNITY_TEST_ASSERT_INT8_WITHIN((delta), (expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_INT16_WITHIN(delta, expected, actual)                                          UNITY_TEST_ASSERT_INT16_WITHIN((delta), (expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_INT32_WITHIN(delta, expected, actual)                                          UNITY_TEST_ASSERT_INT32_WITHIN((delta), (expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_INT64_WITHIN(delta, expected, actual)                                          UNITY_TEST_ASSERT_INT64_WITHIN((delta), (expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_UINT_WITHIN(delta, expected, actual)                                           UNITY_TEST_ASSERT_UINT_WITHIN((delta), (expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_UINT8_WITHIN(delta, expected, actual)                                          UNITY_TEST_ASSERT_UINT8_WITHIN((delta), (expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_UINT16_WITHIN(delta, expected, actual)                                         UNITY_TEST_ASSERT_UINT16_WITHIN((delta), (expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_UINT32_WITHIN(delta, expected, actual)                                         UNITY_TEST_ASSERT_UINT32_WITHIN((delta), (expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_UINT64_WITHIN(delta, expected, actual)                                         UNITY_TEST_ASSERT_UINT64_WITHIN((delta), (expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_HEX_WITHIN(delta, expected, actual)                                            UNITY_TEST_ASSERT_HEX32_WITHIN((delta), (expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_HEX8_WITHIN(delta, expected, actual)                                           UNITY_TEST_ASSERT_HEX8_WITHIN((delta), (expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_HEX16_WITHIN(delta, expected, actual)                                          UNITY_TEST_ASSERT_HEX16_WITHIN((delta), (expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_HEX32_WITHIN(delta, expected, actual)                                          UNITY_TEST_ASSERT_HEX32_WITHIN((delta), (expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_HEX64_WITHIN(delta, expected, actual)                                          UNITY_TEST_ASSERT_HEX64_WITHIN((delta), (expected), (actual), __LINE__, NULL)
-
-/* Structs and Strings */
-#define TEST_ASSERT_EQUAL_PTR(expected, actual)                                                    UNITY_TEST_ASSERT_EQUAL_PTR((expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_STRING(expected, actual)                                                 UNITY_TEST_ASSERT_EQUAL_STRING((expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_STRING_LEN(expected, actual, len)                                        UNITY_TEST_ASSERT_EQUAL_STRING_LEN((expected), (actual), (len), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_MEMORY(expected, actual, len)                                            UNITY_TEST_ASSERT_EQUAL_MEMORY((expected), (actual), (len), __LINE__, NULL)
-
-/* Arrays */
-#define TEST_ASSERT_EQUAL_INT_ARRAY(expected, actual, num_elements)                                UNITY_TEST_ASSERT_EQUAL_INT_ARRAY((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_INT8_ARRAY(expected, actual, num_elements)                               UNITY_TEST_ASSERT_EQUAL_INT8_ARRAY((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_INT16_ARRAY(expected, actual, num_elements)                              UNITY_TEST_ASSERT_EQUAL_INT16_ARRAY((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_INT32_ARRAY(expected, actual, num_elements)                              UNITY_TEST_ASSERT_EQUAL_INT32_ARRAY((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_INT64_ARRAY(expected, actual, num_elements)                              UNITY_TEST_ASSERT_EQUAL_INT64_ARRAY((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_UINT_ARRAY(expected, actual, num_elements)                               UNITY_TEST_ASSERT_EQUAL_UINT_ARRAY((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_UINT8_ARRAY(expected, actual, num_elements)                              UNITY_TEST_ASSERT_EQUAL_UINT8_ARRAY((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_UINT16_ARRAY(expected, actual, num_elements)                             UNITY_TEST_ASSERT_EQUAL_UINT16_ARRAY((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_UINT32_ARRAY(expected, actual, num_elements)                             UNITY_TEST_ASSERT_EQUAL_UINT32_ARRAY((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_UINT64_ARRAY(expected, actual, num_elements)                             UNITY_TEST_ASSERT_EQUAL_UINT64_ARRAY((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_HEX_ARRAY(expected, actual, num_elements)                                UNITY_TEST_ASSERT_EQUAL_HEX32_ARRAY((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_HEX8_ARRAY(expected, actual, num_elements)                               UNITY_TEST_ASSERT_EQUAL_HEX8_ARRAY((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_HEX16_ARRAY(expected, actual, num_elements)                              UNITY_TEST_ASSERT_EQUAL_HEX16_ARRAY((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_HEX32_ARRAY(expected, actual, num_elements)                              UNITY_TEST_ASSERT_EQUAL_HEX32_ARRAY((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_HEX64_ARRAY(expected, actual, num_elements)                              UNITY_TEST_ASSERT_EQUAL_HEX64_ARRAY((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_PTR_ARRAY(expected, actual, num_elements)                                UNITY_TEST_ASSERT_EQUAL_PTR_ARRAY((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_STRING_ARRAY(expected, actual, num_elements)                             UNITY_TEST_ASSERT_EQUAL_STRING_ARRAY((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_MEMORY_ARRAY(expected, actual, len, num_elements)                        UNITY_TEST_ASSERT_EQUAL_MEMORY_ARRAY((expected), (actual), (len), (num_elements), __LINE__, NULL)
-
-/* Arrays Compared To Single Value */
-#define TEST_ASSERT_EACH_EQUAL_INT(expected, actual, num_elements)                                 UNITY_TEST_ASSERT_EACH_EQUAL_INT((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_EACH_EQUAL_INT8(expected, actual, num_elements)                                UNITY_TEST_ASSERT_EACH_EQUAL_INT8((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_EACH_EQUAL_INT16(expected, actual, num_elements)                               UNITY_TEST_ASSERT_EACH_EQUAL_INT16((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_EACH_EQUAL_INT32(expected, actual, num_elements)                               UNITY_TEST_ASSERT_EACH_EQUAL_INT32((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_EACH_EQUAL_INT64(expected, actual, num_elements)                               UNITY_TEST_ASSERT_EACH_EQUAL_INT64((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_EACH_EQUAL_UINT(expected, actual, num_elements)                                UNITY_TEST_ASSERT_EACH_EQUAL_UINT((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_EACH_EQUAL_UINT8(expected, actual, num_elements)                               UNITY_TEST_ASSERT_EACH_EQUAL_UINT8((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_EACH_EQUAL_UINT16(expected, actual, num_elements)                              UNITY_TEST_ASSERT_EACH_EQUAL_UINT16((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_EACH_EQUAL_UINT32(expected, actual, num_elements)                              UNITY_TEST_ASSERT_EACH_EQUAL_UINT32((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_EACH_EQUAL_UINT64(expected, actual, num_elements)                              UNITY_TEST_ASSERT_EACH_EQUAL_UINT64((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_EACH_EQUAL_HEX(expected, actual, num_elements)                                 UNITY_TEST_ASSERT_EACH_EQUAL_HEX32((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_EACH_EQUAL_HEX8(expected, actual, num_elements)                                UNITY_TEST_ASSERT_EACH_EQUAL_HEX8((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_EACH_EQUAL_HEX16(expected, actual, num_elements)                               UNITY_TEST_ASSERT_EACH_EQUAL_HEX16((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_EACH_EQUAL_HEX32(expected, actual, num_elements)                               UNITY_TEST_ASSERT_EACH_EQUAL_HEX32((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_EACH_EQUAL_HEX64(expected, actual, num_elements)                               UNITY_TEST_ASSERT_EACH_EQUAL_HEX64((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_EACH_EQUAL_PTR(expected, actual, num_elements)                                 UNITY_TEST_ASSERT_EACH_EQUAL_PTR((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_EACH_EQUAL_STRING(expected, actual, num_elements)                              UNITY_TEST_ASSERT_EACH_EQUAL_STRING((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_EACH_EQUAL_MEMORY(expected, actual, len, num_elements)                         UNITY_TEST_ASSERT_EACH_EQUAL_MEMORY((expected), (actual), (len), (num_elements), __LINE__, NULL)
-
-/* Floating Point (If Enabled) */
-#define TEST_ASSERT_FLOAT_WITHIN(delta, expected, actual)                                          UNITY_TEST_ASSERT_FLOAT_WITHIN((delta), (expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_FLOAT(expected, actual)                                                  UNITY_TEST_ASSERT_EQUAL_FLOAT((expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_FLOAT_ARRAY(expected, actual, num_elements)                              UNITY_TEST_ASSERT_EQUAL_FLOAT_ARRAY((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_EACH_EQUAL_FLOAT(expected, actual, num_elements)                               UNITY_TEST_ASSERT_EACH_EQUAL_FLOAT((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_FLOAT_IS_INF(actual)                                                           UNITY_TEST_ASSERT_FLOAT_IS_INF((actual), __LINE__, NULL)
-#define TEST_ASSERT_FLOAT_IS_NEG_INF(actual)                                                       UNITY_TEST_ASSERT_FLOAT_IS_NEG_INF((actual), __LINE__, NULL)
-#define TEST_ASSERT_FLOAT_IS_NAN(actual)                                                           UNITY_TEST_ASSERT_FLOAT_IS_NAN((actual), __LINE__, NULL)
-#define TEST_ASSERT_FLOAT_IS_DETERMINATE(actual)                                                   UNITY_TEST_ASSERT_FLOAT_IS_DETERMINATE((actual), __LINE__, NULL)
-#define TEST_ASSERT_FLOAT_IS_NOT_INF(actual)                                                       UNITY_TEST_ASSERT_FLOAT_IS_NOT_INF((actual), __LINE__, NULL)
-#define TEST_ASSERT_FLOAT_IS_NOT_NEG_INF(actual)                                                   UNITY_TEST_ASSERT_FLOAT_IS_NOT_NEG_INF((actual), __LINE__, NULL)
-#define TEST_ASSERT_FLOAT_IS_NOT_NAN(actual)                                                       UNITY_TEST_ASSERT_FLOAT_IS_NOT_NAN((actual), __LINE__, NULL)
-#define TEST_ASSERT_FLOAT_IS_NOT_DETERMINATE(actual)                                               UNITY_TEST_ASSERT_FLOAT_IS_NOT_DETERMINATE((actual), __LINE__, NULL)
-
-/* Double (If Enabled) */
-#define TEST_ASSERT_DOUBLE_WITHIN(delta, expected, actual)                                         UNITY_TEST_ASSERT_DOUBLE_WITHIN((delta), (expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_DOUBLE(expected, actual)                                                 UNITY_TEST_ASSERT_EQUAL_DOUBLE((expected), (actual), __LINE__, NULL)
-#define TEST_ASSERT_EQUAL_DOUBLE_ARRAY(expected, actual, num_elements)                             UNITY_TEST_ASSERT_EQUAL_DOUBLE_ARRAY((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_EACH_EQUAL_DOUBLE(expected, actual, num_elements)                              UNITY_TEST_ASSERT_EACH_EQUAL_DOUBLE((expected), (actual), (num_elements), __LINE__, NULL)
-#define TEST_ASSERT_DOUBLE_IS_INF(actual)                                                          UNITY_TEST_ASSERT_DOUBLE_IS_INF((actual), __LINE__, NULL)
-#define TEST_ASSERT_DOUBLE_IS_NEG_INF(actual)                                                      UNITY_TEST_ASSERT_DOUBLE_IS_NEG_INF((actual), __LINE__, NULL)
-#define TEST_ASSERT_DOUBLE_IS_NAN(actual)                                                          UNITY_TEST_ASSERT_DOUBLE_IS_NAN((actual), __LINE__, NULL)
-#define TEST_ASSERT_DOUBLE_IS_DETERMINATE(actual)                                                  UNITY_TEST_ASSERT_DOUBLE_IS_DETERMINATE((actual), __LINE__, NULL)
-#define TEST_ASSERT_DOUBLE_IS_NOT_INF(actual)                                                      UNITY_TEST_ASSERT_DOUBLE_IS_NOT_INF((actual), __LINE__, NULL)
-#define TEST_ASSERT_DOUBLE_IS_NOT_NEG_INF(actual)                                                  UNITY_TEST_ASSERT_DOUBLE_IS_NOT_NEG_INF((actual), __LINE__, NULL)
-#define TEST_ASSERT_DOUBLE_IS_NOT_NAN(actual)                                                      UNITY_TEST_ASSERT_DOUBLE_IS_NOT_NAN((actual), __LINE__, NULL)
-#define TEST_ASSERT_DOUBLE_IS_NOT_DETERMINATE(actual)                                              UNITY_TEST_ASSERT_DOUBLE_IS_NOT_DETERMINATE((actual), __LINE__, NULL)
-
-/*-------------------------------------------------------
- * Test Asserts (with additional messages)
- *-------------------------------------------------------*/
-
-/* Boolean */
-#define TEST_ASSERT_MESSAGE(condition, message)                                                    UNITY_TEST_ASSERT(       (condition), __LINE__, (message))
-#define TEST_ASSERT_TRUE_MESSAGE(condition, message)                                               UNITY_TEST_ASSERT(       (condition), __LINE__, (message))
-#define TEST_ASSERT_UNLESS_MESSAGE(condition, message)                                             UNITY_TEST_ASSERT(      !(condition), __LINE__, (message))
-#define TEST_ASSERT_FALSE_MESSAGE(condition, message)                                              UNITY_TEST_ASSERT(      !(condition), __LINE__, (message))
-#define TEST_ASSERT_NULL_MESSAGE(pointer, message)                                                 UNITY_TEST_ASSERT_NULL(    (pointer), __LINE__, (message))
-#define TEST_ASSERT_NOT_NULL_MESSAGE(pointer, message)                                             UNITY_TEST_ASSERT_NOT_NULL((pointer), __LINE__, (message))
-
-/* Integers (of all sizes) */
-#define TEST_ASSERT_EQUAL_INT_MESSAGE(expected, actual, message)                                   UNITY_TEST_ASSERT_EQUAL_INT((expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_INT8_MESSAGE(expected, actual, message)                                  UNITY_TEST_ASSERT_EQUAL_INT8((expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_INT16_MESSAGE(expected, actual, message)                                 UNITY_TEST_ASSERT_EQUAL_INT16((expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_INT32_MESSAGE(expected, actual, message)                                 UNITY_TEST_ASSERT_EQUAL_INT32((expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_INT64_MESSAGE(expected, actual, message)                                 UNITY_TEST_ASSERT_EQUAL_INT64((expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_MESSAGE(expected, actual, message)                                       UNITY_TEST_ASSERT_EQUAL_INT((expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_NOT_EQUAL_MESSAGE(expected, actual, message)                                   UNITY_TEST_ASSERT(((expected) !=  (actual)), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_UINT_MESSAGE(expected, actual, message)                                  UNITY_TEST_ASSERT_EQUAL_UINT( (expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_UINT8_MESSAGE(expected, actual, message)                                 UNITY_TEST_ASSERT_EQUAL_UINT8( (expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_UINT16_MESSAGE(expected, actual, message)                                UNITY_TEST_ASSERT_EQUAL_UINT16( (expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_UINT32_MESSAGE(expected, actual, message)                                UNITY_TEST_ASSERT_EQUAL_UINT32( (expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_UINT64_MESSAGE(expected, actual, message)                                UNITY_TEST_ASSERT_EQUAL_UINT64( (expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_HEX_MESSAGE(expected, actual, message)                                   UNITY_TEST_ASSERT_EQUAL_HEX32((expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_HEX8_MESSAGE(expected, actual, message)                                  UNITY_TEST_ASSERT_EQUAL_HEX8( (expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_HEX16_MESSAGE(expected, actual, message)                                 UNITY_TEST_ASSERT_EQUAL_HEX16((expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_HEX32_MESSAGE(expected, actual, message)                                 UNITY_TEST_ASSERT_EQUAL_HEX32((expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_HEX64_MESSAGE(expected, actual, message)                                 UNITY_TEST_ASSERT_EQUAL_HEX64((expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_BITS_MESSAGE(mask, expected, actual, message)                                  UNITY_TEST_ASSERT_BITS((mask), (expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_BITS_HIGH_MESSAGE(mask, actual, message)                                       UNITY_TEST_ASSERT_BITS((mask), (UNITY_UINT32)(-1), (actual), __LINE__, (message))
-#define TEST_ASSERT_BITS_LOW_MESSAGE(mask, actual, message)                                        UNITY_TEST_ASSERT_BITS((mask), (UNITY_UINT32)(0), (actual), __LINE__, (message))
-#define TEST_ASSERT_BIT_HIGH_MESSAGE(bit, actual, message)                                         UNITY_TEST_ASSERT_BITS(((UNITY_UINT32)1 << (bit)), (UNITY_UINT32)(-1), (actual), __LINE__, (message))
-#define TEST_ASSERT_BIT_LOW_MESSAGE(bit, actual, message)                                          UNITY_TEST_ASSERT_BITS(((UNITY_UINT32)1 << (bit)), (UNITY_UINT32)(0), (actual), __LINE__, (message))
-
-/* Integer Greater Than/ Less Than (of all sizes) */
-#define TEST_ASSERT_GREATER_THAN_MESSAGE(threshold, actual, message)                               UNITY_TEST_ASSERT_GREATER_THAN_INT((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_GREATER_THAN_INT_MESSAGE(threshold, actual, message)                           UNITY_TEST_ASSERT_GREATER_THAN_INT((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_GREATER_THAN_INT8_MESSAGE(threshold, actual, message)                          UNITY_TEST_ASSERT_GREATER_THAN_INT8((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_GREATER_THAN_INT16_MESSAGE(threshold, actual, message)                         UNITY_TEST_ASSERT_GREATER_THAN_INT16((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_GREATER_THAN_INT32_MESSAGE(threshold, actual, message)                         UNITY_TEST_ASSERT_GREATER_THAN_INT32((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_GREATER_THAN_INT64_MESSAGE(threshold, actual, message)                         UNITY_TEST_ASSERT_GREATER_THAN_INT64((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_GREATER_THAN_UINT_MESSAGE(threshold, actual, message)                          UNITY_TEST_ASSERT_GREATER_THAN_UINT((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_GREATER_THAN_UINT8_MESSAGE(threshold, actual, message)                         UNITY_TEST_ASSERT_GREATER_THAN_UINT8((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_GREATER_THAN_UINT16_MESSAGE(threshold, actual, message)                        UNITY_TEST_ASSERT_GREATER_THAN_UINT16((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_GREATER_THAN_UINT32_MESSAGE(threshold, actual, message)                        UNITY_TEST_ASSERT_GREATER_THAN_UINT32((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_GREATER_THAN_UINT64_MESSAGE(threshold, actual, message)                        UNITY_TEST_ASSERT_GREATER_THAN_UINT64((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_GREATER_THAN_HEX8_MESSAGE(threshold, actual, message)                          UNITY_TEST_ASSERT_GREATER_THAN_HEX8((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_GREATER_THAN_HEX16_MESSAGE(threshold, actual, message)                         UNITY_TEST_ASSERT_GREATER_THAN_HEX16((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_GREATER_THAN_HEX32_MESSAGE(threshold, actual, message)                         UNITY_TEST_ASSERT_GREATER_THAN_HEX32((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_GREATER_THAN_HEX64_MESSAGE(threshold, actual, message)                         UNITY_TEST_ASSERT_GREATER_THAN_HEX64((threshold), (actual), __LINE__, (message))
-
-#define TEST_ASSERT_LESS_THAN_MESSAGE(threshold, actual, message)                                  UNITY_TEST_ASSERT_SMALLER_THAN_INT((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_LESS_THAN_INT_MESSAGE(threshold, actual, message)                              UNITY_TEST_ASSERT_SMALLER_THAN_INT((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_LESS_THAN_INT8_MESSAGE(threshold, actual, message)                             UNITY_TEST_ASSERT_SMALLER_THAN_INT8((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_LESS_THAN_INT16_MESSAGE(threshold, actual, message)                            UNITY_TEST_ASSERT_SMALLER_THAN_INT16((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_LESS_THAN_INT32_MESSAGE(threshold, actual, message)                            UNITY_TEST_ASSERT_SMALLER_THAN_INT32((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_LESS_THAN_INT64_MESSAGE(threshold, actual, message)                            UNITY_TEST_ASSERT_SMALLER_THAN_INT64((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_LESS_THAN_UINT_MESSAGE(threshold, actual, message)                             UNITY_TEST_ASSERT_SMALLER_THAN_UINT((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_LESS_THAN_UINT8_MESSAGE(threshold, actual, message)                            UNITY_TEST_ASSERT_SMALLER_THAN_UINT8((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_LESS_THAN_UINT16_MESSAGE(threshold, actual, message)                           UNITY_TEST_ASSERT_SMALLER_THAN_UINT16((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_LESS_THAN_UINT32_MESSAGE(threshold, actual, message)                           UNITY_TEST_ASSERT_SMALLER_THAN_UINT32((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_LESS_THAN_UINT64_MESSAGE(threshold, actual, message)                           UNITY_TEST_ASSERT_SMALLER_THAN_UINT64((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_LESS_THAN_HEX8_MESSAGE(threshold, actual, message)                             UNITY_TEST_ASSERT_SMALLER_THAN_HEX8((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_LESS_THAN_HEX16_MESSAGE(threshold, actual, message)                            UNITY_TEST_ASSERT_SMALLER_THAN_HEX16((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_LESS_THAN_HEX32_MESSAGE(threshold, actual, message)                            UNITY_TEST_ASSERT_SMALLER_THAN_HEX32((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_LESS_THAN_HEX64_MESSAGE(threshold, actual, message)                            UNITY_TEST_ASSERT_SMALLER_THAN_HEX64((threshold), (actual), __LINE__, (message))
-
-#define TEST_ASSERT_GREATER_OR_EQUAL_MESSAGE(threshold, actual, message)                           UNITY_TEST_ASSERT_GREATER_OR_EQUAL_INT((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_GREATER_OR_EQUAL_INT_MESSAGE(threshold, actual, message)                       UNITY_TEST_ASSERT_GREATER_OR_EQUAL_INT((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_GREATER_OR_EQUAL_INT8_MESSAGE(threshold, actual, message)                      UNITY_TEST_ASSERT_GREATER_OR_EQUAL_INT8((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_GREATER_OR_EQUAL_INT16_MESSAGE(threshold, actual, message)                     UNITY_TEST_ASSERT_GREATER_OR_EQUAL_INT16((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_GREATER_OR_EQUAL_INT32_MESSAGE(threshold, actual, message)                     UNITY_TEST_ASSERT_GREATER_OR_EQUAL_INT32((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_GREATER_OR_EQUAL_INT64_MESSAGE(threshold, actual, message)                     UNITY_TEST_ASSERT_GREATER_OR_EQUAL_INT64((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_GREATER_OR_EQUAL_UINT_MESSAGE(threshold, actual, message)                      UNITY_TEST_ASSERT_GREATER_OR_EQUAL_UINT((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_GREATER_OR_EQUAL_UINT8_MESSAGE(threshold, actual, message)                     UNITY_TEST_ASSERT_GREATER_OR_EQUAL_UINT8((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_GREATER_OR_EQUAL_UINT16_MESSAGE(threshold, actual, message)                    UNITY_TEST_ASSERT_GREATER_OR_EQUAL_UINT16((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_GREATER_OR_EQUAL_UINT32_MESSAGE(threshold, actual, message)                    UNITY_TEST_ASSERT_GREATER_OR_EQUAL_UINT32((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_GREATER_OR_EQUAL_UINT64_MESSAGE(threshold, actual, message)                    UNITY_TEST_ASSERT_GREATER_OR_EQUAL_UINT64((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_GREATER_OR_EQUAL_HEX8_MESSAGE(threshold, actual, message)                      UNITY_TEST_ASSERT_GREATER_OR_EQUAL_HEX8((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_GREATER_OR_EQUAL_HEX16_MESSAGE(threshold, actual, message)                     UNITY_TEST_ASSERT_GREATER_OR_EQUAL_HEX16((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_GREATER_OR_EQUAL_HEX32_MESSAGE(threshold, actual, message)                     UNITY_TEST_ASSERT_GREATER_OR_EQUAL_HEX32((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_GREATER_OR_EQUAL_HEX64_MESSAGE(threshold, actual, message)                     UNITY_TEST_ASSERT_GREATER_OR_EQUAL_HEX64((threshold), (actual), __LINE__, (message))
-
-#define TEST_ASSERT_LESS_OR_EQUAL_MESSAGE(threshold, actual, message)                              UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_INT((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_LESS_OR_EQUAL_INT_MESSAGE(threshold, actual, message)                          UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_INT((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_LESS_OR_EQUAL_INT8_MESSAGE(threshold, actual, message)                         UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_INT8((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_LESS_OR_EQUAL_INT16_MESSAGE(threshold, actual, message)                        UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_INT16((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_LESS_OR_EQUAL_INT32_MESSAGE(threshold, actual, message)                        UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_INT32((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_LESS_OR_EQUAL_INT64_MESSAGE(threshold, actual, message)                        UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_INT64((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_LESS_OR_EQUAL_UINT_MESSAGE(threshold, actual, message)                         UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_UINT((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_LESS_OR_EQUAL_UINT8_MESSAGE(threshold, actual, message)                        UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_UINT8((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_LESS_OR_EQUAL_UINT16_MESSAGE(threshold, actual, message)                       UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_UINT16((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_LESS_OR_EQUAL_UINT32_MESSAGE(threshold, actual, message)                       UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_UINT32((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_LESS_OR_EQUAL_UINT64_MESSAGE(threshold, actual, message)                       UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_UINT64((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_LESS_OR_EQUAL_HEX8_MESSAGE(threshold, actual, message)                         UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_HEX8((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_LESS_OR_EQUAL_HEX16_MESSAGE(threshold, actual, message)                        UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_HEX16((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_LESS_OR_EQUAL_HEX32_MESSAGE(threshold, actual, message)                        UNITY_TEST_ASSERT_SMALLER_THAN_HEX32((threshold), (actual), __LINE__, (message))
-#define TEST_ASSERT_LESS_OR_EQUAL_HEX64_MESSAGE(threshold, actual, message)                        UNITY_TEST_ASSERT_SMALLER_THAN_HEX64((threshold), (actual), __LINE__, (message))
-
-/* Integer Ranges (of all sizes) */
-#define TEST_ASSERT_INT_WITHIN_MESSAGE(delta, expected, actual, message)                           UNITY_TEST_ASSERT_INT_WITHIN((delta), (expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_INT8_WITHIN_MESSAGE(delta, expected, actual, message)                          UNITY_TEST_ASSERT_INT8_WITHIN((delta), (expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_INT16_WITHIN_MESSAGE(delta, expected, actual, message)                         UNITY_TEST_ASSERT_INT16_WITHIN((delta), (expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_INT32_WITHIN_MESSAGE(delta, expected, actual, message)                         UNITY_TEST_ASSERT_INT32_WITHIN((delta), (expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_INT64_WITHIN_MESSAGE(delta, expected, actual, message)                         UNITY_TEST_ASSERT_INT64_WITHIN((delta), (expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_UINT_WITHIN_MESSAGE(delta, expected, actual, message)                          UNITY_TEST_ASSERT_UINT_WITHIN((delta), (expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_UINT8_WITHIN_MESSAGE(delta, expected, actual, message)                         UNITY_TEST_ASSERT_UINT8_WITHIN((delta), (expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_UINT16_WITHIN_MESSAGE(delta, expected, actual, message)                        UNITY_TEST_ASSERT_UINT16_WITHIN((delta), (expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_UINT32_WITHIN_MESSAGE(delta, expected, actual, message)                        UNITY_TEST_ASSERT_UINT32_WITHIN((delta), (expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_UINT64_WITHIN_MESSAGE(delta, expected, actual, message)                        UNITY_TEST_ASSERT_UINT64_WITHIN((delta), (expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_HEX_WITHIN_MESSAGE(delta, expected, actual, message)                           UNITY_TEST_ASSERT_HEX32_WITHIN((delta), (expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_HEX8_WITHIN_MESSAGE(delta, expected, actual, message)                          UNITY_TEST_ASSERT_HEX8_WITHIN((delta), (expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_HEX16_WITHIN_MESSAGE(delta, expected, actual, message)                         UNITY_TEST_ASSERT_HEX16_WITHIN((delta), (expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_HEX32_WITHIN_MESSAGE(delta, expected, actual, message)                         UNITY_TEST_ASSERT_HEX32_WITHIN((delta), (expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_HEX64_WITHIN_MESSAGE(delta, expected, actual, message)                         UNITY_TEST_ASSERT_HEX64_WITHIN((delta), (expected), (actual), __LINE__, (message))
-
-/* Structs and Strings */
-#define TEST_ASSERT_EQUAL_PTR_MESSAGE(expected, actual, message)                                   UNITY_TEST_ASSERT_EQUAL_PTR((expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_STRING_MESSAGE(expected, actual, message)                                UNITY_TEST_ASSERT_EQUAL_STRING((expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_STRING_LEN_MESSAGE(expected, actual, len, message)                       UNITY_TEST_ASSERT_EQUAL_STRING_LEN((expected), (actual), (len), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_MEMORY_MESSAGE(expected, actual, len, message)                           UNITY_TEST_ASSERT_EQUAL_MEMORY((expected), (actual), (len), __LINE__, (message))
-
-/* Arrays */
-#define TEST_ASSERT_EQUAL_INT_ARRAY_MESSAGE(expected, actual, num_elements, message)               UNITY_TEST_ASSERT_EQUAL_INT_ARRAY((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_INT8_ARRAY_MESSAGE(expected, actual, num_elements, message)              UNITY_TEST_ASSERT_EQUAL_INT8_ARRAY((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_INT16_ARRAY_MESSAGE(expected, actual, num_elements, message)             UNITY_TEST_ASSERT_EQUAL_INT16_ARRAY((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_INT32_ARRAY_MESSAGE(expected, actual, num_elements, message)             UNITY_TEST_ASSERT_EQUAL_INT32_ARRAY((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_INT64_ARRAY_MESSAGE(expected, actual, num_elements, message)             UNITY_TEST_ASSERT_EQUAL_INT64_ARRAY((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_UINT_ARRAY_MESSAGE(expected, actual, num_elements, message)              UNITY_TEST_ASSERT_EQUAL_UINT_ARRAY((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_UINT8_ARRAY_MESSAGE(expected, actual, num_elements, message)             UNITY_TEST_ASSERT_EQUAL_UINT8_ARRAY((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_UINT16_ARRAY_MESSAGE(expected, actual, num_elements, message)            UNITY_TEST_ASSERT_EQUAL_UINT16_ARRAY((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_UINT32_ARRAY_MESSAGE(expected, actual, num_elements, message)            UNITY_TEST_ASSERT_EQUAL_UINT32_ARRAY((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_UINT64_ARRAY_MESSAGE(expected, actual, num_elements, message)            UNITY_TEST_ASSERT_EQUAL_UINT64_ARRAY((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_HEX_ARRAY_MESSAGE(expected, actual, num_elements, message)               UNITY_TEST_ASSERT_EQUAL_HEX32_ARRAY((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_HEX8_ARRAY_MESSAGE(expected, actual, num_elements, message)              UNITY_TEST_ASSERT_EQUAL_HEX8_ARRAY((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_HEX16_ARRAY_MESSAGE(expected, actual, num_elements, message)             UNITY_TEST_ASSERT_EQUAL_HEX16_ARRAY((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_HEX32_ARRAY_MESSAGE(expected, actual, num_elements, message)             UNITY_TEST_ASSERT_EQUAL_HEX32_ARRAY((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_HEX64_ARRAY_MESSAGE(expected, actual, num_elements, message)             UNITY_TEST_ASSERT_EQUAL_HEX64_ARRAY((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_PTR_ARRAY_MESSAGE(expected, actual, num_elements, message)               UNITY_TEST_ASSERT_EQUAL_PTR_ARRAY((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_STRING_ARRAY_MESSAGE(expected, actual, num_elements, message)            UNITY_TEST_ASSERT_EQUAL_STRING_ARRAY((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_MEMORY_ARRAY_MESSAGE(expected, actual, len, num_elements, message)       UNITY_TEST_ASSERT_EQUAL_MEMORY_ARRAY((expected), (actual), (len), (num_elements), __LINE__, (message))
-
-/* Arrays Compared To Single Value*/
-#define TEST_ASSERT_EACH_EQUAL_INT_MESSAGE(expected, actual, num_elements, message)                UNITY_TEST_ASSERT_EACH_EQUAL_INT((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_EACH_EQUAL_INT8_MESSAGE(expected, actual, num_elements, message)               UNITY_TEST_ASSERT_EACH_EQUAL_INT8((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_EACH_EQUAL_INT16_MESSAGE(expected, actual, num_elements, message)              UNITY_TEST_ASSERT_EACH_EQUAL_INT16((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_EACH_EQUAL_INT32_MESSAGE(expected, actual, num_elements, message)              UNITY_TEST_ASSERT_EACH_EQUAL_INT32((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_EACH_EQUAL_INT64_MESSAGE(expected, actual, num_elements, message)              UNITY_TEST_ASSERT_EACH_EQUAL_INT64((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_EACH_EQUAL_UINT_MESSAGE(expected, actual, num_elements, message)               UNITY_TEST_ASSERT_EACH_EQUAL_UINT((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_EACH_EQUAL_UINT8_MESSAGE(expected, actual, num_elements, message)              UNITY_TEST_ASSERT_EACH_EQUAL_UINT8((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_EACH_EQUAL_UINT16_MESSAGE(expected, actual, num_elements, message)             UNITY_TEST_ASSERT_EACH_EQUAL_UINT16((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_EACH_EQUAL_UINT32_MESSAGE(expected, actual, num_elements, message)             UNITY_TEST_ASSERT_EACH_EQUAL_UINT32((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_EACH_EQUAL_UINT64_MESSAGE(expected, actual, num_elements, message)             UNITY_TEST_ASSERT_EACH_EQUAL_UINT64((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_EACH_EQUAL_HEX_MESSAGE(expected, actual, num_elements, message)                UNITY_TEST_ASSERT_EACH_EQUAL_HEX32((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_EACH_EQUAL_HEX8_MESSAGE(expected, actual, num_elements, message)               UNITY_TEST_ASSERT_EACH_EQUAL_HEX8((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_EACH_EQUAL_HEX16_MESSAGE(expected, actual, num_elements, message)              UNITY_TEST_ASSERT_EACH_EQUAL_HEX16((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_EACH_EQUAL_HEX32_MESSAGE(expected, actual, num_elements, message)              UNITY_TEST_ASSERT_EACH_EQUAL_HEX32((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_EACH_EQUAL_HEX64_MESSAGE(expected, actual, num_elements, message)              UNITY_TEST_ASSERT_EACH_EQUAL_HEX64((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_EACH_EQUAL_PTR_MESSAGE(expected, actual, num_elements, message)                UNITY_TEST_ASSERT_EACH_EQUAL_PTR((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_EACH_EQUAL_STRING_MESSAGE(expected, actual, num_elements, message)             UNITY_TEST_ASSERT_EACH_EQUAL_STRING((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_EACH_EQUAL_MEMORY_MESSAGE(expected, actual, len, num_elements, message)        UNITY_TEST_ASSERT_EACH_EQUAL_MEMORY((expected), (actual), (len), (num_elements), __LINE__, (message))
-
-/* Floating Point (If Enabled) */
-#define TEST_ASSERT_FLOAT_WITHIN_MESSAGE(delta, expected, actual, message)                         UNITY_TEST_ASSERT_FLOAT_WITHIN((delta), (expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_FLOAT_MESSAGE(expected, actual, message)                                 UNITY_TEST_ASSERT_EQUAL_FLOAT((expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_FLOAT_ARRAY_MESSAGE(expected, actual, num_elements, message)             UNITY_TEST_ASSERT_EQUAL_FLOAT_ARRAY((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_EACH_EQUAL_FLOAT_MESSAGE(expected, actual, num_elements, message)              UNITY_TEST_ASSERT_EACH_EQUAL_FLOAT((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_FLOAT_IS_INF_MESSAGE(actual, message)                                          UNITY_TEST_ASSERT_FLOAT_IS_INF((actual), __LINE__, (message))
-#define TEST_ASSERT_FLOAT_IS_NEG_INF_MESSAGE(actual, message)                                      UNITY_TEST_ASSERT_FLOAT_IS_NEG_INF((actual), __LINE__, (message))
-#define TEST_ASSERT_FLOAT_IS_NAN_MESSAGE(actual, message)                                          UNITY_TEST_ASSERT_FLOAT_IS_NAN((actual), __LINE__, (message))
-#define TEST_ASSERT_FLOAT_IS_DETERMINATE_MESSAGE(actual, message)                                  UNITY_TEST_ASSERT_FLOAT_IS_DETERMINATE((actual), __LINE__, (message))
-#define TEST_ASSERT_FLOAT_IS_NOT_INF_MESSAGE(actual, message)                                      UNITY_TEST_ASSERT_FLOAT_IS_NOT_INF((actual), __LINE__, (message))
-#define TEST_ASSERT_FLOAT_IS_NOT_NEG_INF_MESSAGE(actual, message)                                  UNITY_TEST_ASSERT_FLOAT_IS_NOT_NEG_INF((actual), __LINE__, (message))
-#define TEST_ASSERT_FLOAT_IS_NOT_NAN_MESSAGE(actual, message)                                      UNITY_TEST_ASSERT_FLOAT_IS_NOT_NAN((actual), __LINE__, (message))
-#define TEST_ASSERT_FLOAT_IS_NOT_DETERMINATE_MESSAGE(actual, message)                              UNITY_TEST_ASSERT_FLOAT_IS_NOT_DETERMINATE((actual), __LINE__, (message))
-
-/* Double (If Enabled) */
-#define TEST_ASSERT_DOUBLE_WITHIN_MESSAGE(delta, expected, actual, message)                        UNITY_TEST_ASSERT_DOUBLE_WITHIN((delta), (expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_DOUBLE_MESSAGE(expected, actual, message)                                UNITY_TEST_ASSERT_EQUAL_DOUBLE((expected), (actual), __LINE__, (message))
-#define TEST_ASSERT_EQUAL_DOUBLE_ARRAY_MESSAGE(expected, actual, num_elements, message)            UNITY_TEST_ASSERT_EQUAL_DOUBLE_ARRAY((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_EACH_EQUAL_DOUBLE_MESSAGE(expected, actual, num_elements, message)             UNITY_TEST_ASSERT_EACH_EQUAL_DOUBLE((expected), (actual), (num_elements), __LINE__, (message))
-#define TEST_ASSERT_DOUBLE_IS_INF_MESSAGE(actual, message)                                         UNITY_TEST_ASSERT_DOUBLE_IS_INF((actual), __LINE__, (message))
-#define TEST_ASSERT_DOUBLE_IS_NEG_INF_MESSAGE(actual, message)                                     UNITY_TEST_ASSERT_DOUBLE_IS_NEG_INF((actual), __LINE__, (message))
-#define TEST_ASSERT_DOUBLE_IS_NAN_MESSAGE(actual, message)                                         UNITY_TEST_ASSERT_DOUBLE_IS_NAN((actual), __LINE__, (message))
-#define TEST_ASSERT_DOUBLE_IS_DETERMINATE_MESSAGE(actual, message)                                 UNITY_TEST_ASSERT_DOUBLE_IS_DETERMINATE((actual), __LINE__, (message))
-#define TEST_ASSERT_DOUBLE_IS_NOT_INF_MESSAGE(actual, message)                                     UNITY_TEST_ASSERT_DOUBLE_IS_NOT_INF((actual), __LINE__, (message))
-#define TEST_ASSERT_DOUBLE_IS_NOT_NEG_INF_MESSAGE(actual, message)                                 UNITY_TEST_ASSERT_DOUBLE_IS_NOT_NEG_INF((actual), __LINE__, (message))
-#define TEST_ASSERT_DOUBLE_IS_NOT_NAN_MESSAGE(actual, message)                                     UNITY_TEST_ASSERT_DOUBLE_IS_NOT_NAN((actual), __LINE__, (message))
-#define TEST_ASSERT_DOUBLE_IS_NOT_DETERMINATE_MESSAGE(actual, message)                             UNITY_TEST_ASSERT_DOUBLE_IS_NOT_DETERMINATE((actual), __LINE__, (message))
-
-/* end of UNITY_FRAMEWORK_H */
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/libs/libzmq/external/unity/unity_internals.h b/libs/libzmq/external/unity/unity_internals.h
deleted file mode 100644
index 67e219b..0000000
--- a/libs/libzmq/external/unity/unity_internals.h
+++ /dev/null
@@ -1,872 +0,0 @@
-/* ==========================================
-    Unity Project - A Test Framework for C
-    Copyright (c) 2007-14 Mike Karlesky, Mark VanderVoord, Greg Williams
-    [Released under MIT License. Please refer to license.txt for details]
-========================================== */
-
-#ifndef UNITY_INTERNALS_H
-#define UNITY_INTERNALS_H
-
-#ifdef UNITY_INCLUDE_CONFIG_H
-#include "unity_config.h"
-#endif
-
-#ifndef UNITY_EXCLUDE_SETJMP_H
-#include <setjmp.h>
-#endif
-
-#ifndef UNITY_EXCLUDE_MATH_H
-#include <math.h>
-#endif
-
-/* Unity Attempts to Auto-Detect Integer Types
- * Attempt 1: UINT_MAX, ULONG_MAX in <limits.h>, or default to 32 bits
- * Attempt 2: UINTPTR_MAX in <stdint.h>, or default to same size as long
- * The user may override any of these derived constants:
- * UNITY_INT_WIDTH, UNITY_LONG_WIDTH, UNITY_POINTER_WIDTH */
-#ifndef UNITY_EXCLUDE_STDINT_H
-#include <stdint.h>
-#endif
-
-#ifndef UNITY_EXCLUDE_LIMITS_H
-#include <limits.h>
-#endif
-
-/*-------------------------------------------------------
- * Guess Widths If Not Specified
- *-------------------------------------------------------*/
-
-/* Determine the size of an int, if not already specified.
- * We cannot use sizeof(int), because it is not yet defined
- * at this stage in the translation of the C program.
- * Therefore, infer it from UINT_MAX if possible. */
-#ifndef UNITY_INT_WIDTH
-  #ifdef UINT_MAX
-    #if (UINT_MAX == 0xFFFF)
-      #define UNITY_INT_WIDTH (16)
-    #elif (UINT_MAX == 0xFFFFFFFF)
-      #define UNITY_INT_WIDTH (32)
-    #elif (UINT_MAX == 0xFFFFFFFFFFFFFFFF)
-      #define UNITY_INT_WIDTH (64)
-    #endif
-  #else /* Set to default */
-    #define UNITY_INT_WIDTH (32)
-  #endif /* UINT_MAX */
-#endif
-
-/* Determine the size of a long, if not already specified. */
-#ifndef UNITY_LONG_WIDTH
-  #ifdef ULONG_MAX
-    #if (ULONG_MAX == 0xFFFF)
-      #define UNITY_LONG_WIDTH (16)
-    #elif (ULONG_MAX == 0xFFFFFFFF)
-      #define UNITY_LONG_WIDTH (32)
-    #elif (ULONG_MAX == 0xFFFFFFFFFFFFFFFF)
-      #define UNITY_LONG_WIDTH (64)
-    #endif
-  #else /* Set to default */
-    #define UNITY_LONG_WIDTH (32)
-  #endif /* ULONG_MAX */
-#endif
-
-/* Determine the size of a pointer, if not already specified. */
-#ifndef UNITY_POINTER_WIDTH
-  #ifdef UINTPTR_MAX
-    #if (UINTPTR_MAX <= 0xFFFF)
-      #define UNITY_POINTER_WIDTH (16)
-    #elif (UINTPTR_MAX <= 0xFFFFFFFF)
-      #define UNITY_POINTER_WIDTH (32)
-    #elif (UINTPTR_MAX <= 0xFFFFFFFFFFFFFFFF)
-      #define UNITY_POINTER_WIDTH (64)
-    #endif
-  #else /* Set to default */
-    #define UNITY_POINTER_WIDTH UNITY_LONG_WIDTH
-  #endif /* UINTPTR_MAX */
-#endif
-
-/*-------------------------------------------------------
- * Int Support (Define types based on detected sizes)
- *-------------------------------------------------------*/
-
-#if (UNITY_INT_WIDTH == 32)
-    typedef unsigned char   UNITY_UINT8;
-    typedef unsigned short  UNITY_UINT16;
-    typedef unsigned int    UNITY_UINT32;
-    typedef signed char     UNITY_INT8;
-    typedef signed short    UNITY_INT16;
-    typedef signed int      UNITY_INT32;
-#elif (UNITY_INT_WIDTH == 16)
-    typedef unsigned char   UNITY_UINT8;
-    typedef unsigned int    UNITY_UINT16;
-    typedef unsigned long   UNITY_UINT32;
-    typedef signed char     UNITY_INT8;
-    typedef signed int      UNITY_INT16;
-    typedef signed long     UNITY_INT32;
-#else
-    #error Invalid UNITY_INT_WIDTH specified! (16 or 32 are supported)
-#endif
-
-/*-------------------------------------------------------
- * 64-bit Support
- *-------------------------------------------------------*/
-
-#ifndef UNITY_SUPPORT_64
-  #if UNITY_LONG_WIDTH == 64 || UNITY_POINTER_WIDTH == 64
-    #define UNITY_SUPPORT_64
-  #endif
-#endif
-
-#ifndef UNITY_SUPPORT_64
-    /* No 64-bit Support */
-    typedef UNITY_UINT32 UNITY_UINT;
-    typedef UNITY_INT32 UNITY_INT;
-#else
-
-    /* 64-bit Support */
-  #if (UNITY_LONG_WIDTH == 32)
-    typedef unsigned long long UNITY_UINT64;
-    typedef signed long long   UNITY_INT64;
-  #elif (UNITY_LONG_WIDTH == 64)
-    typedef unsigned long      UNITY_UINT64;
-    typedef signed long        UNITY_INT64;
-  #else
-    #error Invalid UNITY_LONG_WIDTH specified! (32 or 64 are supported)
-  #endif
-    typedef UNITY_UINT64 UNITY_UINT;
-    typedef UNITY_INT64 UNITY_INT;
-
-#endif
-
-/*-------------------------------------------------------
- * Pointer Support
- *-------------------------------------------------------*/
-
-#if (UNITY_POINTER_WIDTH == 32)
-#define UNITY_PTR_TO_INT UNITY_INT32
-#define UNITY_DISPLAY_STYLE_POINTER UNITY_DISPLAY_STYLE_HEX32
-#elif (UNITY_POINTER_WIDTH == 64)
-#define UNITY_PTR_TO_INT UNITY_INT64
-#define UNITY_DISPLAY_STYLE_POINTER UNITY_DISPLAY_STYLE_HEX64
-#elif (UNITY_POINTER_WIDTH == 16)
-#define UNITY_PTR_TO_INT UNITY_INT16
-#define UNITY_DISPLAY_STYLE_POINTER UNITY_DISPLAY_STYLE_HEX16
-#else
-    #error Invalid UNITY_POINTER_WIDTH specified! (16, 32 or 64 are supported)
-#endif
-
-#ifndef UNITY_PTR_ATTRIBUTE
-#define UNITY_PTR_ATTRIBUTE
-#endif
-
-#ifndef UNITY_INTERNAL_PTR
-#define UNITY_INTERNAL_PTR UNITY_PTR_ATTRIBUTE const void*
-#endif
-
-/*-------------------------------------------------------
- * Float Support
- *-------------------------------------------------------*/
-
-#ifdef UNITY_EXCLUDE_FLOAT
-
-/* No Floating Point Support */
-#ifndef UNITY_EXCLUDE_DOUBLE
-#define UNITY_EXCLUDE_DOUBLE /* Remove double when excluding float support */
-#endif
-#ifndef UNITY_EXCLUDE_FLOAT_PRINT
-#define UNITY_EXCLUDE_FLOAT_PRINT
-#endif
-
-#else
-
-/* Floating Point Support */
-#ifndef UNITY_FLOAT_PRECISION
-#define UNITY_FLOAT_PRECISION (0.00001f)
-#endif
-#ifndef UNITY_FLOAT_TYPE
-#define UNITY_FLOAT_TYPE float
-#endif
-typedef UNITY_FLOAT_TYPE UNITY_FLOAT;
-
-/* isinf & isnan macros should be provided by math.h */
-#ifndef isinf
-/* The value of Inf - Inf is NaN */
-#define isinf(n) (isnan((n) - (n)) && !isnan(n))
-#endif
-
-#ifndef isnan
-/* NaN is the only floating point value that does NOT equal itself.
- * Therefore if n != n, then it is NaN. */
-#define isnan(n) ((n != n) ? 1 : 0)
-#endif
-
-#endif
-
-/*-------------------------------------------------------
- * Double Float Support
- *-------------------------------------------------------*/
-
-/* unlike float, we DON'T include by default */
-#if defined(UNITY_EXCLUDE_DOUBLE) || !defined(UNITY_INCLUDE_DOUBLE)
-
-  /* No Floating Point Support */
-  #ifndef UNITY_EXCLUDE_DOUBLE
-  #define UNITY_EXCLUDE_DOUBLE
-  #else
-    #undef UNITY_INCLUDE_DOUBLE
-  #endif
-
-  #ifndef UNITY_EXCLUDE_FLOAT
-    #ifndef UNITY_DOUBLE_TYPE
-    #define UNITY_DOUBLE_TYPE double
-    #endif
-  typedef UNITY_FLOAT UNITY_DOUBLE;
-  /* For parameter in UnityPrintFloat(UNITY_DOUBLE), which aliases to double or float */
-  #endif
-
-#else
-
-  /* Double Floating Point Support */
-  #ifndef UNITY_DOUBLE_PRECISION
-  #define UNITY_DOUBLE_PRECISION (1e-12)
-  #endif
-
-  #ifndef UNITY_DOUBLE_TYPE
-  #define UNITY_DOUBLE_TYPE double
-  #endif
-  typedef UNITY_DOUBLE_TYPE UNITY_DOUBLE;
-
-#endif
-
-/*-------------------------------------------------------
- * Output Method: stdout (DEFAULT)
- *-------------------------------------------------------*/
-#ifndef UNITY_OUTPUT_CHAR
-/* Default to using putchar, which is defined in stdio.h */
-#include <stdio.h>
-#define UNITY_OUTPUT_CHAR(a) (void)putchar(a)
-#else
-  /* If defined as something else, make sure we declare it here so it's ready for use */
-  #ifdef UNITY_OUTPUT_CHAR_HEADER_DECLARATION
-extern void UNITY_OUTPUT_CHAR_HEADER_DECLARATION;
-  #endif
-#endif
-
-#ifndef UNITY_OUTPUT_FLUSH
-#ifdef UNITY_USE_FLUSH_STDOUT
-/* We want to use the stdout flush utility */
-#include <stdio.h>
-#define UNITY_OUTPUT_FLUSH() (void)fflush(stdout)
-#else
-/* We've specified nothing, therefore flush should just be ignored */
-#define UNITY_OUTPUT_FLUSH()
-#endif
-#else
-/* We've defined flush as something else, so make sure we declare it here so it's ready for use */
-#ifdef UNITY_OUTPUT_FLUSH_HEADER_DECLARATION
-extern void UNITY_OMIT_OUTPUT_FLUSH_HEADER_DECLARATION;
-#endif
-#endif
-
-#ifndef UNITY_OUTPUT_FLUSH
-#define UNITY_FLUSH_CALL()
-#else
-#define UNITY_FLUSH_CALL() UNITY_OUTPUT_FLUSH()
-#endif
-
-#ifndef UNITY_PRINT_EOL
-#define UNITY_PRINT_EOL()    UNITY_OUTPUT_CHAR('\n')
-#endif
-
-#ifndef UNITY_OUTPUT_START
-#define UNITY_OUTPUT_START()
-#endif
-
-#ifndef UNITY_OUTPUT_COMPLETE
-#define UNITY_OUTPUT_COMPLETE()
-#endif
-
-/*-------------------------------------------------------
- * Footprint
- *-------------------------------------------------------*/
-
-#ifndef UNITY_LINE_TYPE
-#define UNITY_LINE_TYPE UNITY_UINT
-#endif
-
-#ifndef UNITY_COUNTER_TYPE
-#define UNITY_COUNTER_TYPE UNITY_UINT
-#endif
-
-/*-------------------------------------------------------
- * Language Features Available
- *-------------------------------------------------------*/
-#if !defined(UNITY_WEAK_ATTRIBUTE) && !defined(UNITY_WEAK_PRAGMA)
-#   if defined(__GNUC__) || defined(__ghs__) /* __GNUC__ includes clang */
-#       if !(defined(__WIN32__) && defined(__clang__)) && !defined(__TMS470__)
-#           define UNITY_WEAK_ATTRIBUTE __attribute__((weak))
-#       endif
-#   endif
-#endif
-
-#ifdef UNITY_NO_WEAK
-#   undef UNITY_WEAK_ATTRIBUTE
-#   undef UNITY_WEAK_PRAGMA
-#endif
-
-
-/*-------------------------------------------------------
- * Internal Structs Needed
- *-------------------------------------------------------*/
-
-typedef void (*UnityTestFunction)(void);
-
-#define UNITY_DISPLAY_RANGE_INT  (0x10)
-#define UNITY_DISPLAY_RANGE_UINT (0x20)
-#define UNITY_DISPLAY_RANGE_HEX  (0x40)
-
-typedef enum
-{
-UNITY_DISPLAY_STYLE_INT = sizeof(int)+ UNITY_DISPLAY_RANGE_INT,
-    UNITY_DISPLAY_STYLE_INT8     = 1 + UNITY_DISPLAY_RANGE_INT,
-    UNITY_DISPLAY_STYLE_INT16    = 2 + UNITY_DISPLAY_RANGE_INT,
-    UNITY_DISPLAY_STYLE_INT32    = 4 + UNITY_DISPLAY_RANGE_INT,
-#ifdef UNITY_SUPPORT_64
-    UNITY_DISPLAY_STYLE_INT64    = 8 + UNITY_DISPLAY_RANGE_INT,
-#endif
-
-UNITY_DISPLAY_STYLE_UINT = sizeof(unsigned) + UNITY_DISPLAY_RANGE_UINT,
-    UNITY_DISPLAY_STYLE_UINT8    = 1 + UNITY_DISPLAY_RANGE_UINT,
-    UNITY_DISPLAY_STYLE_UINT16   = 2 + UNITY_DISPLAY_RANGE_UINT,
-    UNITY_DISPLAY_STYLE_UINT32   = 4 + UNITY_DISPLAY_RANGE_UINT,
-#ifdef UNITY_SUPPORT_64
-    UNITY_DISPLAY_STYLE_UINT64   = 8 + UNITY_DISPLAY_RANGE_UINT,
-#endif
-
-    UNITY_DISPLAY_STYLE_HEX8     = 1 + UNITY_DISPLAY_RANGE_HEX,
-    UNITY_DISPLAY_STYLE_HEX16    = 2 + UNITY_DISPLAY_RANGE_HEX,
-    UNITY_DISPLAY_STYLE_HEX32    = 4 + UNITY_DISPLAY_RANGE_HEX,
-#ifdef UNITY_SUPPORT_64
-    UNITY_DISPLAY_STYLE_HEX64    = 8 + UNITY_DISPLAY_RANGE_HEX,
-#endif
-
-    UNITY_DISPLAY_STYLE_UNKNOWN
-} UNITY_DISPLAY_STYLE_T;
-
-typedef enum
-{
-    UNITY_EQUAL_TO         = 1,
-    UNITY_GREATER_THAN     = 2,
-    UNITY_GREATER_OR_EQUAL = 2 + UNITY_EQUAL_TO,
-    UNITY_SMALLER_THAN     = 4,
-    UNITY_SMALLER_OR_EQUAL = 4 + UNITY_EQUAL_TO
-} UNITY_COMPARISON_T;
-
-#ifndef UNITY_EXCLUDE_FLOAT
-typedef enum UNITY_FLOAT_TRAIT
-{
-    UNITY_FLOAT_IS_NOT_INF       = 0,
-    UNITY_FLOAT_IS_INF,
-    UNITY_FLOAT_IS_NOT_NEG_INF,
-    UNITY_FLOAT_IS_NEG_INF,
-    UNITY_FLOAT_IS_NOT_NAN,
-    UNITY_FLOAT_IS_NAN,
-    UNITY_FLOAT_IS_NOT_DET,
-    UNITY_FLOAT_IS_DET,
-    UNITY_FLOAT_INVALID_TRAIT
-} UNITY_FLOAT_TRAIT_T;
-#endif
-
-typedef enum
-{
-    UNITY_ARRAY_TO_VAL = 0,
-    UNITY_ARRAY_TO_ARRAY
-} UNITY_FLAGS_T;
-
-struct UNITY_STORAGE_T
-{
-    const char* TestFile;
-    const char* CurrentTestName;
-#ifndef UNITY_EXCLUDE_DETAILS
-    const char* CurrentDetail1;
-    const char* CurrentDetail2;
-#endif
-    UNITY_LINE_TYPE CurrentTestLineNumber;
-    UNITY_COUNTER_TYPE NumberOfTests;
-    UNITY_COUNTER_TYPE TestFailures;
-    UNITY_COUNTER_TYPE TestIgnores;
-    UNITY_COUNTER_TYPE CurrentTestFailed;
-    UNITY_COUNTER_TYPE CurrentTestIgnored;
-#ifndef UNITY_EXCLUDE_SETJMP_H
-    jmp_buf AbortFrame;
-#endif
-};
-
-extern struct UNITY_STORAGE_T Unity;
-
-/*-------------------------------------------------------
- * Test Suite Management
- *-------------------------------------------------------*/
-
-void UnityBegin(const char* filename);
-int  UnityEnd(void);
-void UnityConcludeTest(void);
-void UnityDefaultTestRun(UnityTestFunction Func, const char* FuncName, const int FuncLineNum);
-
-/*-------------------------------------------------------
- * Details Support
- *-------------------------------------------------------*/
-
-#ifdef UNITY_EXCLUDE_DETAILS
-#define UNITY_CLR_DETAILS()
-#define UNITY_SET_DETAIL(d1)
-#define UNITY_SET_DETAILS(d1,d2)
-#else
-#define UNITY_CLR_DETAILS()      { Unity.CurrentDetail1 = 0;   Unity.CurrentDetail2 = 0;  }
-#define UNITY_SET_DETAIL(d1)     { Unity.CurrentDetail1 = d1;  Unity.CurrentDetail2 = 0;  }
-#define UNITY_SET_DETAILS(d1,d2) { Unity.CurrentDetail1 = d1;  Unity.CurrentDetail2 = d2; }
-
-#ifndef UNITY_DETAIL1_NAME
-#define UNITY_DETAIL1_NAME "Function"
-#endif
-
-#ifndef UNITY_DETAIL2_NAME
-#define UNITY_DETAIL2_NAME "Argument"
-#endif
-#endif
-
-/*-------------------------------------------------------
- * Test Output
- *-------------------------------------------------------*/
-
-void UnityPrint(const char* string);
-void UnityPrintLen(const char* string, const UNITY_UINT32 length);
-void UnityPrintMask(const UNITY_UINT mask, const UNITY_UINT number);
-void UnityPrintNumberByStyle(const UNITY_INT number, const UNITY_DISPLAY_STYLE_T style);
-void UnityPrintNumber(const UNITY_INT number);
-void UnityPrintNumberUnsigned(const UNITY_UINT number);
-void UnityPrintNumberHex(const UNITY_UINT number, const char nibbles);
-
-#ifndef UNITY_EXCLUDE_FLOAT_PRINT
-void UnityPrintFloat(const UNITY_DOUBLE input_number);
-#endif
-
-/*-------------------------------------------------------
- * Test Assertion Functions
- *-------------------------------------------------------
- *  Use the macros below this section instead of calling
- *  these directly. The macros have a consistent naming
- *  convention and will pull in file and line information
- *  for you. */
-
-void UnityAssertEqualNumber(const UNITY_INT expected,
-                            const UNITY_INT actual,
-                            const char* msg,
-                            const UNITY_LINE_TYPE lineNumber,
-                            const UNITY_DISPLAY_STYLE_T style);
-
-void UnityAssertGreaterOrLessOrEqualNumber(const UNITY_INT threshold,
-                                           const UNITY_INT actual,
-                                           const UNITY_COMPARISON_T compare,
-                                           const char *msg,
-                                           const UNITY_LINE_TYPE lineNumber,
-                                           const UNITY_DISPLAY_STYLE_T style);
-
-void UnityAssertEqualIntArray(UNITY_INTERNAL_PTR expected,
-                              UNITY_INTERNAL_PTR actual,
-                              const UNITY_UINT32 num_elements,
-                              const char* msg,
-                              const UNITY_LINE_TYPE lineNumber,
-                              const UNITY_DISPLAY_STYLE_T style,
-                              const UNITY_FLAGS_T flags);
-
-void UnityAssertBits(const UNITY_INT mask,
-                     const UNITY_INT expected,
-                     const UNITY_INT actual,
-                     const char* msg,
-                     const UNITY_LINE_TYPE lineNumber);
-
-void UnityAssertEqualString(const char* expected,
-                            const char* actual,
-                            const char* msg,
-                            const UNITY_LINE_TYPE lineNumber);
-
-void UnityAssertEqualStringLen(const char* expected,
-                            const char* actual,
-                            const UNITY_UINT32 length,
-                            const char* msg,
-                            const UNITY_LINE_TYPE lineNumber);
-
-void UnityAssertEqualStringArray( UNITY_INTERNAL_PTR expected,
-                                  const char** actual,
-                                  const UNITY_UINT32 num_elements,
-                                  const char* msg,
-                                  const UNITY_LINE_TYPE lineNumber,
-                                  const UNITY_FLAGS_T flags);
-
-void UnityAssertEqualMemory( UNITY_INTERNAL_PTR expected,
-                             UNITY_INTERNAL_PTR actual,
-                             const UNITY_UINT32 length,
-                             const UNITY_UINT32 num_elements,
-                             const char* msg,
-                             const UNITY_LINE_TYPE lineNumber,
-                             const UNITY_FLAGS_T flags);
-
-void UnityAssertNumbersWithin(const UNITY_UINT delta,
-                              const UNITY_INT expected,
-                              const UNITY_INT actual,
-                              const char* msg,
-                              const UNITY_LINE_TYPE lineNumber,
-                              const UNITY_DISPLAY_STYLE_T style);
-
-void UnityFail(const char* message, const UNITY_LINE_TYPE line);
-
-void UnityIgnore(const char* message, const UNITY_LINE_TYPE line);
-
-#ifndef UNITY_EXCLUDE_FLOAT
-void UnityAssertFloatsWithin(const UNITY_FLOAT delta,
-                             const UNITY_FLOAT expected,
-                             const UNITY_FLOAT actual,
-                             const char* msg,
-                             const UNITY_LINE_TYPE lineNumber);
-
-void UnityAssertEqualFloatArray(UNITY_PTR_ATTRIBUTE const UNITY_FLOAT* expected,
-                                UNITY_PTR_ATTRIBUTE const UNITY_FLOAT* actual,
-                                const UNITY_UINT32 num_elements,
-                                const char* msg,
-                                const UNITY_LINE_TYPE lineNumber,
-                                const UNITY_FLAGS_T flags);
-
-void UnityAssertFloatSpecial(const UNITY_FLOAT actual,
-                             const char* msg,
-                             const UNITY_LINE_TYPE lineNumber,
-                             const UNITY_FLOAT_TRAIT_T style);
-#endif
-
-#ifndef UNITY_EXCLUDE_DOUBLE
-void UnityAssertDoublesWithin(const UNITY_DOUBLE delta,
-                              const UNITY_DOUBLE expected,
-                              const UNITY_DOUBLE actual,
-                              const char* msg,
-                              const UNITY_LINE_TYPE lineNumber);
-
-void UnityAssertEqualDoubleArray(UNITY_PTR_ATTRIBUTE const UNITY_DOUBLE* expected,
-                                 UNITY_PTR_ATTRIBUTE const UNITY_DOUBLE* actual,
-                                 const UNITY_UINT32 num_elements,
-                                 const char* msg,
-                                 const UNITY_LINE_TYPE lineNumber,
-                                 const UNITY_FLAGS_T flags);
-
-void UnityAssertDoubleSpecial(const UNITY_DOUBLE actual,
-                              const char* msg,
-                              const UNITY_LINE_TYPE lineNumber,
-                              const UNITY_FLOAT_TRAIT_T style);
-#endif
-
-/*-------------------------------------------------------
- * Helpers
- *-------------------------------------------------------*/
-
-UNITY_INTERNAL_PTR UnityNumToPtr(const UNITY_INT num, const UNITY_UINT8 size);
-#ifndef UNITY_EXCLUDE_FLOAT
-UNITY_INTERNAL_PTR UnityFloatToPtr(const float num);
-#endif
-#ifndef UNITY_EXCLUDE_DOUBLE
-UNITY_INTERNAL_PTR UnityDoubleToPtr(const double num);
-#endif
-
-/*-------------------------------------------------------
- * Error Strings We Might Need
- *-------------------------------------------------------*/
-
-extern const char UnityStrErrFloat[];
-extern const char UnityStrErrDouble[];
-extern const char UnityStrErr64[];
-
-/*-------------------------------------------------------
- * Test Running Macros
- *-------------------------------------------------------*/
-
-#ifndef UNITY_EXCLUDE_SETJMP_H
-#define TEST_PROTECT() (setjmp(Unity.AbortFrame) == 0)
-#define TEST_ABORT() longjmp(Unity.AbortFrame, 1)
-#else
-#define TEST_PROTECT() 1
-#define TEST_ABORT() return
-#endif
-
-/* This tricky series of macros gives us an optional line argument to treat it as RUN_TEST(func, num=__LINE__) */
-#ifndef RUN_TEST
-#ifdef __STDC_VERSION__
-#if __STDC_VERSION__ >= 199901L
-#define RUN_TEST(...) UnityDefaultTestRun(RUN_TEST_FIRST(__VA_ARGS__), RUN_TEST_SECOND(__VA_ARGS__))
-#define RUN_TEST_FIRST(...) RUN_TEST_FIRST_HELPER(__VA_ARGS__, throwaway)
-#define RUN_TEST_FIRST_HELPER(first, ...) (first), #first
-#define RUN_TEST_SECOND(...) RUN_TEST_SECOND_HELPER(__VA_ARGS__, __LINE__, throwaway)
-#define RUN_TEST_SECOND_HELPER(first, second, ...) (second)
-#endif
-#endif
-#endif
-
-/* If we can't do the tricky version, we'll just have to require them to always include the line number */
-#ifndef RUN_TEST
-#ifdef CMOCK
-#define RUN_TEST(func, num) UnityDefaultTestRun(func, #func, num)
-#else
-#define RUN_TEST(func) UnityDefaultTestRun(func, #func, __LINE__)
-#endif
-#endif
-
-#define TEST_LINE_NUM (Unity.CurrentTestLineNumber)
-#define TEST_IS_IGNORED (Unity.CurrentTestIgnored)
-#define UNITY_NEW_TEST(a) \
-    Unity.CurrentTestName = (a); \
-    Unity.CurrentTestLineNumber = (UNITY_LINE_TYPE)(__LINE__); \
-    Unity.NumberOfTests++;
-
-#ifndef UNITY_BEGIN
-#define UNITY_BEGIN() UnityBegin(__FILE__)
-#endif
-
-#ifndef UNITY_END
-#define UNITY_END() UnityEnd()
-#endif
-
-/*-----------------------------------------------
- * Command Line Argument Support
- *-----------------------------------------------*/
-
-#ifdef UNITY_USE_COMMAND_LINE_ARGS
-int UnityParseOptions(int argc, char** argv);
-int UnityTestMatches(void);
-#endif
-
-/*-------------------------------------------------------
- * Basic Fail and Ignore
- *-------------------------------------------------------*/
-
-#define UNITY_TEST_FAIL(line, message)   UnityFail(   (message), (UNITY_LINE_TYPE)(line))
-#define UNITY_TEST_IGNORE(line, message) UnityIgnore( (message), (UNITY_LINE_TYPE)(line))
-
-/*-------------------------------------------------------
- * Test Asserts
- *-------------------------------------------------------*/
-
-#define UNITY_TEST_ASSERT(condition, line, message)                                              if (condition) {} else {UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), (message));}
-#define UNITY_TEST_ASSERT_NULL(pointer, line, message)                                           UNITY_TEST_ASSERT(((pointer) == NULL),  (UNITY_LINE_TYPE)(line), (message))
-#define UNITY_TEST_ASSERT_NOT_NULL(pointer, line, message)                                       UNITY_TEST_ASSERT(((pointer) != NULL),  (UNITY_LINE_TYPE)(line), (message))
-
-#define UNITY_TEST_ASSERT_EQUAL_INT(expected, actual, line, message)                             UnityAssertEqualNumber((UNITY_INT)(expected), (UNITY_INT)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT)
-#define UNITY_TEST_ASSERT_EQUAL_INT8(expected, actual, line, message)                            UnityAssertEqualNumber((UNITY_INT)(UNITY_INT8 )(expected), (UNITY_INT)(UNITY_INT8 )(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT8)
-#define UNITY_TEST_ASSERT_EQUAL_INT16(expected, actual, line, message)                           UnityAssertEqualNumber((UNITY_INT)(UNITY_INT16)(expected), (UNITY_INT)(UNITY_INT16)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT16)
-#define UNITY_TEST_ASSERT_EQUAL_INT32(expected, actual, line, message)                           UnityAssertEqualNumber((UNITY_INT)(UNITY_INT32)(expected), (UNITY_INT)(UNITY_INT32)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT32)
-#define UNITY_TEST_ASSERT_EQUAL_UINT(expected, actual, line, message)                            UnityAssertEqualNumber((UNITY_INT)(expected), (UNITY_INT)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT)
-#define UNITY_TEST_ASSERT_EQUAL_UINT8(expected, actual, line, message)                           UnityAssertEqualNumber((UNITY_INT)(UNITY_UINT8 )(expected), (UNITY_INT)(UNITY_UINT8 )(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT8)
-#define UNITY_TEST_ASSERT_EQUAL_UINT16(expected, actual, line, message)                          UnityAssertEqualNumber((UNITY_INT)(UNITY_UINT16)(expected), (UNITY_INT)(UNITY_UINT16)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT16)
-#define UNITY_TEST_ASSERT_EQUAL_UINT32(expected, actual, line, message)                          UnityAssertEqualNumber((UNITY_INT)(UNITY_UINT32)(expected), (UNITY_INT)(UNITY_UINT32)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT32)
-#define UNITY_TEST_ASSERT_EQUAL_HEX8(expected, actual, line, message)                            UnityAssertEqualNumber((UNITY_INT)(UNITY_INT8 )(expected), (UNITY_INT)(UNITY_INT8 )(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX8)
-#define UNITY_TEST_ASSERT_EQUAL_HEX16(expected, actual, line, message)                           UnityAssertEqualNumber((UNITY_INT)(UNITY_INT16)(expected), (UNITY_INT)(UNITY_INT16)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX16)
-#define UNITY_TEST_ASSERT_EQUAL_HEX32(expected, actual, line, message)                           UnityAssertEqualNumber((UNITY_INT)(UNITY_INT32)(expected), (UNITY_INT)(UNITY_INT32)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX32)
-#define UNITY_TEST_ASSERT_BITS(mask, expected, actual, line, message)                            UnityAssertBits((UNITY_INT)(mask), (UNITY_INT)(expected), (UNITY_INT)(actual), (message), (UNITY_LINE_TYPE)(line))
-
-#define UNITY_TEST_ASSERT_GREATER_THAN_INT(threshold, actual, line, message)                     UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(threshold),              (UNITY_INT)(actual),              UNITY_GREATER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT)
-#define UNITY_TEST_ASSERT_GREATER_THAN_INT8(threshold, actual, line, message)                    UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_INT8 )(threshold), (UNITY_INT)(UNITY_INT8 )(actual), UNITY_GREATER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT8)
-#define UNITY_TEST_ASSERT_GREATER_THAN_INT16(threshold, actual, line, message)                   UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_INT16)(threshold), (UNITY_INT)(UNITY_INT16)(actual), UNITY_GREATER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT16)
-#define UNITY_TEST_ASSERT_GREATER_THAN_INT32(threshold, actual, line, message)                   UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_INT32)(threshold), (UNITY_INT)(UNITY_INT32)(actual), UNITY_GREATER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT32)
-#define UNITY_TEST_ASSERT_GREATER_THAN_UINT(threshold, actual, line, message)                    UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(threshold),              (UNITY_INT)(actual),              UNITY_GREATER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT)
-#define UNITY_TEST_ASSERT_GREATER_THAN_UINT8(threshold, actual, line, message)                   UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT8 )(threshold), (UNITY_INT)(UNITY_UINT8 )(actual), UNITY_GREATER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT8)
-#define UNITY_TEST_ASSERT_GREATER_THAN_UINT16(threshold, actual, line, message)                  UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT16)(threshold), (UNITY_INT)(UNITY_UINT16)(actual), UNITY_GREATER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT16)
-#define UNITY_TEST_ASSERT_GREATER_THAN_UINT32(threshold, actual, line, message)                  UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT32)(threshold), (UNITY_INT)(UNITY_UINT32)(actual), UNITY_GREATER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT32)
-#define UNITY_TEST_ASSERT_GREATER_THAN_HEX8(threshold, actual, line, message)                    UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT8 )(threshold), (UNITY_INT)(UNITY_UINT8 )(actual), UNITY_GREATER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX8)
-#define UNITY_TEST_ASSERT_GREATER_THAN_HEX16(threshold, actual, line, message)                   UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT16)(threshold), (UNITY_INT)(UNITY_UINT16)(actual), UNITY_GREATER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX16)
-#define UNITY_TEST_ASSERT_GREATER_THAN_HEX32(threshold, actual, line, message)                   UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT32)(threshold), (UNITY_INT)(UNITY_UINT32)(actual), UNITY_GREATER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX32)
-
-#define UNITY_TEST_ASSERT_SMALLER_THAN_INT(threshold, actual, line, message)                     UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(threshold),              (UNITY_INT)(actual),              UNITY_SMALLER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT)
-#define UNITY_TEST_ASSERT_SMALLER_THAN_INT8(threshold, actual, line, message)                    UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_INT8 )(threshold), (UNITY_INT)(UNITY_INT8 )(actual), UNITY_SMALLER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT8)
-#define UNITY_TEST_ASSERT_SMALLER_THAN_INT16(threshold, actual, line, message)                   UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_INT16)(threshold), (UNITY_INT)(UNITY_INT16)(actual), UNITY_SMALLER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT16)
-#define UNITY_TEST_ASSERT_SMALLER_THAN_INT32(threshold, actual, line, message)                   UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_INT32)(threshold), (UNITY_INT)(UNITY_INT32)(actual), UNITY_SMALLER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT32)
-#define UNITY_TEST_ASSERT_SMALLER_THAN_UINT(threshold, actual, line, message)                    UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(threshold),              (UNITY_INT)(actual),              UNITY_SMALLER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT)
-#define UNITY_TEST_ASSERT_SMALLER_THAN_UINT8(threshold, actual, line, message)                   UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT8 )(threshold), (UNITY_INT)(UNITY_UINT8 )(actual), UNITY_SMALLER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT8)
-#define UNITY_TEST_ASSERT_SMALLER_THAN_UINT16(threshold, actual, line, message)                  UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT16)(threshold), (UNITY_INT)(UNITY_UINT16)(actual), UNITY_SMALLER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT16)
-#define UNITY_TEST_ASSERT_SMALLER_THAN_UINT32(threshold, actual, line, message)                  UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT32)(threshold), (UNITY_INT)(UNITY_UINT32)(actual), UNITY_SMALLER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT32)
-#define UNITY_TEST_ASSERT_SMALLER_THAN_HEX8(threshold, actual, line, message)                    UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT8 )(threshold), (UNITY_INT)(UNITY_UINT8 )(actual), UNITY_SMALLER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX8)
-#define UNITY_TEST_ASSERT_SMALLER_THAN_HEX16(threshold, actual, line, message)                   UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT16)(threshold), (UNITY_INT)(UNITY_UINT16)(actual), UNITY_SMALLER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX16)
-#define UNITY_TEST_ASSERT_SMALLER_THAN_HEX32(threshold, actual, line, message)                   UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT32)(threshold), (UNITY_INT)(UNITY_UINT32)(actual), UNITY_SMALLER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX32)
-
-#define UNITY_TEST_ASSERT_GREATER_OR_EQUAL_INT(threshold, actual, line, message)                 UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(threshold),              (UNITY_INT)(actual),              UNITY_GREATER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT)
-#define UNITY_TEST_ASSERT_GREATER_OR_EQUAL_INT8(threshold, actual, line, message)                UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_INT8 )(threshold), (UNITY_INT)(UNITY_INT8 )(actual), UNITY_GREATER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT8)
-#define UNITY_TEST_ASSERT_GREATER_OR_EQUAL_INT16(threshold, actual, line, message)               UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_INT16)(threshold), (UNITY_INT)(UNITY_INT16)(actual), UNITY_GREATER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT16)
-#define UNITY_TEST_ASSERT_GREATER_OR_EQUAL_INT32(threshold, actual, line, message)               UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_INT32)(threshold), (UNITY_INT)(UNITY_INT32)(actual), UNITY_GREATER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT32)
-#define UNITY_TEST_ASSERT_GREATER_OR_EQUAL_UINT(threshold, actual, line, message)                UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(threshold),              (UNITY_INT)(actual),              UNITY_GREATER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT)
-#define UNITY_TEST_ASSERT_GREATER_OR_EQUAL_UINT8(threshold, actual, line, message)               UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT8 )(threshold), (UNITY_INT)(UNITY_UINT8 )(actual), UNITY_GREATER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT8)
-#define UNITY_TEST_ASSERT_GREATER_OR_EQUAL_UINT16(threshold, actual, line, message)              UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT16)(threshold), (UNITY_INT)(UNITY_UINT16)(actual), UNITY_GREATER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT16)
-#define UNITY_TEST_ASSERT_GREATER_OR_EQUAL_UINT32(threshold, actual, line, message)              UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT32)(threshold), (UNITY_INT)(UNITY_UINT32)(actual), UNITY_GREATER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT32)
-#define UNITY_TEST_ASSERT_GREATER_OR_EQUAL_HEX8(threshold, actual, line, message)                UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT8 )(threshold), (UNITY_INT)(UNITY_UINT8 )(actual), UNITY_GREATER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX8)
-#define UNITY_TEST_ASSERT_GREATER_OR_EQUAL_HEX16(threshold, actual, line, message)               UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT16)(threshold), (UNITY_INT)(UNITY_UINT16)(actual), UNITY_GREATER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX16)
-#define UNITY_TEST_ASSERT_GREATER_OR_EQUAL_HEX32(threshold, actual, line, message)               UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT32)(threshold), (UNITY_INT)(UNITY_UINT32)(actual), UNITY_GREATER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX32)
-
-#define UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_INT(threshold, actual, line, message)                 UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(threshold),              (UNITY_INT)(actual),              UNITY_SMALLER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT)
-#define UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_INT8(threshold, actual, line, message)                UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_INT8 )(threshold), (UNITY_INT)(UNITY_INT8 )(actual), UNITY_SMALLER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT8)
-#define UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_INT16(threshold, actual, line, message)               UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_INT16)(threshold), (UNITY_INT)(UNITY_INT16)(actual), UNITY_SMALLER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT16)
-#define UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_INT32(threshold, actual, line, message)               UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_INT32)(threshold), (UNITY_INT)(UNITY_INT32)(actual), UNITY_SMALLER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT32)
-#define UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_UINT(threshold, actual, line, message)                UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(threshold),              (UNITY_INT)(actual),              UNITY_SMALLER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT)
-#define UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_UINT8(threshold, actual, line, message)               UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT8 )(threshold), (UNITY_INT)(UNITY_UINT8 )(actual), UNITY_SMALLER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT8)
-#define UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_UINT16(threshold, actual, line, message)              UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT16)(threshold), (UNITY_INT)(UNITY_UINT16)(actual), UNITY_SMALLER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT16)
-#define UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_UINT32(threshold, actual, line, message)              UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT32)(threshold), (UNITY_INT)(UNITY_UINT32)(actual), UNITY_SMALLER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT32)
-#define UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_HEX8(threshold, actual, line, message)                UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT8 )(threshold), (UNITY_INT)(UNITY_UINT8 )(actual), UNITY_SMALLER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX8)
-#define UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_HEX16(threshold, actual, line, message)               UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT16)(threshold), (UNITY_INT)(UNITY_UINT16)(actual), UNITY_SMALLER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX16)
-#define UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_HEX32(threshold, actual, line, message)               UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT32)(threshold), (UNITY_INT)(UNITY_UINT32)(actual), UNITY_SMALLER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX32)
-
-#define UNITY_TEST_ASSERT_INT_WITHIN(delta, expected, actual, line, message)                     UnityAssertNumbersWithin((delta), (UNITY_INT)(expected), (UNITY_INT)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT)
-#define UNITY_TEST_ASSERT_INT8_WITHIN(delta, expected, actual, line, message)                    UnityAssertNumbersWithin((UNITY_UINT8 )(delta), (UNITY_INT)(UNITY_INT8 )(expected), (UNITY_INT)(UNITY_INT8 )(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT8)
-#define UNITY_TEST_ASSERT_INT16_WITHIN(delta, expected, actual, line, message)                   UnityAssertNumbersWithin((UNITY_UINT16)(delta), (UNITY_INT)(UNITY_INT16)(expected), (UNITY_INT)(UNITY_INT16)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT16)
-#define UNITY_TEST_ASSERT_INT32_WITHIN(delta, expected, actual, line, message)                   UnityAssertNumbersWithin((UNITY_UINT32)(delta), (UNITY_INT)(UNITY_INT32)(expected), (UNITY_INT)(UNITY_INT32)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT32)
-#define UNITY_TEST_ASSERT_UINT_WITHIN(delta, expected, actual, line, message)                    UnityAssertNumbersWithin((delta), (UNITY_INT)(expected), (UNITY_INT)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT)
-#define UNITY_TEST_ASSERT_UINT8_WITHIN(delta, expected, actual, line, message)                   UnityAssertNumbersWithin((UNITY_UINT8 )(delta), (UNITY_INT)(UNITY_UINT)(UNITY_UINT8 )(expected), (UNITY_INT)(UNITY_UINT)(UNITY_UINT8 )(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT8)
-#define UNITY_TEST_ASSERT_UINT16_WITHIN(delta, expected, actual, line, message)                  UnityAssertNumbersWithin((UNITY_UINT16)(delta), (UNITY_INT)(UNITY_UINT)(UNITY_UINT16)(expected), (UNITY_INT)(UNITY_UINT)(UNITY_UINT16)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT16)
-#define UNITY_TEST_ASSERT_UINT32_WITHIN(delta, expected, actual, line, message)                  UnityAssertNumbersWithin((UNITY_UINT32)(delta), (UNITY_INT)(UNITY_UINT)(UNITY_UINT32)(expected), (UNITY_INT)(UNITY_UINT)(UNITY_UINT32)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT32)
-#define UNITY_TEST_ASSERT_HEX8_WITHIN(delta, expected, actual, line, message)                    UnityAssertNumbersWithin((UNITY_UINT8 )(delta), (UNITY_INT)(UNITY_UINT)(UNITY_UINT8 )(expected), (UNITY_INT)(UNITY_UINT)(UNITY_UINT8 )(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX8)
-#define UNITY_TEST_ASSERT_HEX16_WITHIN(delta, expected, actual, line, message)                   UnityAssertNumbersWithin((UNITY_UINT16)(delta), (UNITY_INT)(UNITY_UINT)(UNITY_UINT16)(expected), (UNITY_INT)(UNITY_UINT)(UNITY_UINT16)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX16)
-#define UNITY_TEST_ASSERT_HEX32_WITHIN(delta, expected, actual, line, message)                   UnityAssertNumbersWithin((UNITY_UINT32)(delta), (UNITY_INT)(UNITY_UINT)(UNITY_UINT32)(expected), (UNITY_INT)(UNITY_UINT)(UNITY_UINT32)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX32)
-
-#define UNITY_TEST_ASSERT_EQUAL_PTR(expected, actual, line, message)                             UnityAssertEqualNumber((UNITY_PTR_TO_INT)(expected), (UNITY_PTR_TO_INT)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_POINTER)
-#define UNITY_TEST_ASSERT_EQUAL_STRING(expected, actual, line, message)                          UnityAssertEqualString((const char*)(expected), (const char*)(actual), (message), (UNITY_LINE_TYPE)(line))
-#define UNITY_TEST_ASSERT_EQUAL_STRING_LEN(expected, actual, len, line, message)                 UnityAssertEqualStringLen((const char*)(expected), (const char*)(actual), (UNITY_UINT32)(len), (message), (UNITY_LINE_TYPE)(line))
-#define UNITY_TEST_ASSERT_EQUAL_MEMORY(expected, actual, len, line, message)                     UnityAssertEqualMemory((UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(len), 1, (message), (UNITY_LINE_TYPE)(line), UNITY_ARRAY_TO_ARRAY)
-
-#define UNITY_TEST_ASSERT_EQUAL_INT_ARRAY(expected, actual, num_elements, line, message)         UnityAssertEqualIntArray((UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT,     UNITY_ARRAY_TO_ARRAY)
-#define UNITY_TEST_ASSERT_EQUAL_INT8_ARRAY(expected, actual, num_elements, line, message)        UnityAssertEqualIntArray((UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT8,    UNITY_ARRAY_TO_ARRAY)
-#define UNITY_TEST_ASSERT_EQUAL_INT16_ARRAY(expected, actual, num_elements, line, message)       UnityAssertEqualIntArray((UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT16,   UNITY_ARRAY_TO_ARRAY)
-#define UNITY_TEST_ASSERT_EQUAL_INT32_ARRAY(expected, actual, num_elements, line, message)       UnityAssertEqualIntArray((UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT32,   UNITY_ARRAY_TO_ARRAY)
-#define UNITY_TEST_ASSERT_EQUAL_UINT_ARRAY(expected, actual, num_elements, line, message)        UnityAssertEqualIntArray((UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT,    UNITY_ARRAY_TO_ARRAY)
-#define UNITY_TEST_ASSERT_EQUAL_UINT8_ARRAY(expected, actual, num_elements, line, message)       UnityAssertEqualIntArray((UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT8,   UNITY_ARRAY_TO_ARRAY)
-#define UNITY_TEST_ASSERT_EQUAL_UINT16_ARRAY(expected, actual, num_elements, line, message)      UnityAssertEqualIntArray((UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT16,  UNITY_ARRAY_TO_ARRAY)
-#define UNITY_TEST_ASSERT_EQUAL_UINT32_ARRAY(expected, actual, num_elements, line, message)      UnityAssertEqualIntArray((UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT32,  UNITY_ARRAY_TO_ARRAY)
-#define UNITY_TEST_ASSERT_EQUAL_HEX8_ARRAY(expected, actual, num_elements, line, message)        UnityAssertEqualIntArray((UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX8,    UNITY_ARRAY_TO_ARRAY)
-#define UNITY_TEST_ASSERT_EQUAL_HEX16_ARRAY(expected, actual, num_elements, line, message)       UnityAssertEqualIntArray((UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX16,   UNITY_ARRAY_TO_ARRAY)
-#define UNITY_TEST_ASSERT_EQUAL_HEX32_ARRAY(expected, actual, num_elements, line, message)       UnityAssertEqualIntArray((UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX32,   UNITY_ARRAY_TO_ARRAY)
-#define UNITY_TEST_ASSERT_EQUAL_PTR_ARRAY(expected, actual, num_elements, line, message)         UnityAssertEqualIntArray((UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_POINTER, UNITY_ARRAY_TO_ARRAY)
-#define UNITY_TEST_ASSERT_EQUAL_STRING_ARRAY(expected, actual, num_elements, line, message)      UnityAssertEqualStringArray((UNITY_INTERNAL_PTR)(expected), (const char**)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_ARRAY_TO_ARRAY)
-#define UNITY_TEST_ASSERT_EQUAL_MEMORY_ARRAY(expected, actual, len, num_elements, line, message) UnityAssertEqualMemory((UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(len), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_ARRAY_TO_ARRAY)
-
-#define UNITY_TEST_ASSERT_EACH_EQUAL_INT(expected, actual, num_elements, line, message)          UnityAssertEqualIntArray(UnityNumToPtr((UNITY_INT)              expected, sizeof(int)),  (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT,     UNITY_ARRAY_TO_VAL)
-#define UNITY_TEST_ASSERT_EACH_EQUAL_INT8(expected, actual, num_elements, line, message)         UnityAssertEqualIntArray(UnityNumToPtr((UNITY_INT)(UNITY_INT8  )expected, 1),            (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT8,    UNITY_ARRAY_TO_VAL)
-#define UNITY_TEST_ASSERT_EACH_EQUAL_INT16(expected, actual, num_elements, line, message)        UnityAssertEqualIntArray(UnityNumToPtr((UNITY_INT)(UNITY_INT16 )expected, 2),            (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT16,   UNITY_ARRAY_TO_VAL)
-#define UNITY_TEST_ASSERT_EACH_EQUAL_INT32(expected, actual, num_elements, line, message)        UnityAssertEqualIntArray(UnityNumToPtr((UNITY_INT)(UNITY_INT32 )expected, 4),            (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT32,   UNITY_ARRAY_TO_VAL)
-#define UNITY_TEST_ASSERT_EACH_EQUAL_UINT(expected, actual, num_elements, line, message)         UnityAssertEqualIntArray(UnityNumToPtr((UNITY_INT)              expected, sizeof(unsigned int)), (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT,    UNITY_ARRAY_TO_VAL)
-#define UNITY_TEST_ASSERT_EACH_EQUAL_UINT8(expected, actual, num_elements, line, message)        UnityAssertEqualIntArray(UnityNumToPtr((UNITY_INT)(UNITY_UINT8 )expected, 1),            (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT8,   UNITY_ARRAY_TO_VAL)
-#define UNITY_TEST_ASSERT_EACH_EQUAL_UINT16(expected, actual, num_elements, line, message)       UnityAssertEqualIntArray(UnityNumToPtr((UNITY_INT)(UNITY_UINT16)expected, 2),            (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT16,  UNITY_ARRAY_TO_VAL)
-#define UNITY_TEST_ASSERT_EACH_EQUAL_UINT32(expected, actual, num_elements, line, message)       UnityAssertEqualIntArray(UnityNumToPtr((UNITY_INT)(UNITY_UINT32)expected, 4),            (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT32,  UNITY_ARRAY_TO_VAL)
-#define UNITY_TEST_ASSERT_EACH_EQUAL_HEX8(expected, actual, num_elements, line, message)         UnityAssertEqualIntArray(UnityNumToPtr((UNITY_INT)(UNITY_INT8  )expected, 1),            (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX8,    UNITY_ARRAY_TO_VAL)
-#define UNITY_TEST_ASSERT_EACH_EQUAL_HEX16(expected, actual, num_elements, line, message)        UnityAssertEqualIntArray(UnityNumToPtr((UNITY_INT)(UNITY_INT16 )expected, 2),            (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX16,   UNITY_ARRAY_TO_VAL)
-#define UNITY_TEST_ASSERT_EACH_EQUAL_HEX32(expected, actual, num_elements, line, message)        UnityAssertEqualIntArray(UnityNumToPtr((UNITY_INT)(UNITY_INT32 )expected, 4),            (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX32,   UNITY_ARRAY_TO_VAL)
-#define UNITY_TEST_ASSERT_EACH_EQUAL_PTR(expected, actual, num_elements, line, message)          UnityAssertEqualIntArray(UnityNumToPtr((UNITY_PTR_TO_INT)       expected, sizeof(int*)), (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_POINTER, UNITY_ARRAY_TO_VAL)
-#define UNITY_TEST_ASSERT_EACH_EQUAL_STRING(expected, actual, num_elements, line, message)       UnityAssertEqualStringArray((UNITY_INTERNAL_PTR)(expected), (const char**)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_ARRAY_TO_VAL)
-#define UNITY_TEST_ASSERT_EACH_EQUAL_MEMORY(expected, actual, len, num_elements, line, message)  UnityAssertEqualMemory((UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(len), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_ARRAY_TO_VAL)
-
-#ifdef UNITY_SUPPORT_64
-#define UNITY_TEST_ASSERT_EQUAL_INT64(expected, actual, line, message)                           UnityAssertEqualNumber((UNITY_INT)(expected), (UNITY_INT)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT64)
-#define UNITY_TEST_ASSERT_EQUAL_UINT64(expected, actual, line, message)                          UnityAssertEqualNumber((UNITY_INT)(expected), (UNITY_INT)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT64)
-#define UNITY_TEST_ASSERT_EQUAL_HEX64(expected, actual, line, message)                           UnityAssertEqualNumber((UNITY_INT)(expected), (UNITY_INT)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX64)
-#define UNITY_TEST_ASSERT_EQUAL_INT64_ARRAY(expected, actual, num_elements, line, message)       UnityAssertEqualIntArray((UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT64,  UNITY_ARRAY_TO_ARRAY)
-#define UNITY_TEST_ASSERT_EQUAL_UINT64_ARRAY(expected, actual, num_elements, line, message)      UnityAssertEqualIntArray((UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT64, UNITY_ARRAY_TO_ARRAY)
-#define UNITY_TEST_ASSERT_EQUAL_HEX64_ARRAY(expected, actual, num_elements, line, message)       UnityAssertEqualIntArray((UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX64,  UNITY_ARRAY_TO_ARRAY)
-#define UNITY_TEST_ASSERT_EACH_EQUAL_INT64(expected, actual, num_elements, line, message)        UnityAssertEqualIntArray(UnityNumToPtr((UNITY_INT)(UNITY_INT64)expected, 8), (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT64,  UNITY_ARRAY_TO_VAL)
-#define UNITY_TEST_ASSERT_EACH_EQUAL_UINT64(expected, actual, num_elements, line, message)       UnityAssertEqualIntArray(UnityNumToPtr((UNITY_INT)(UNITY_UINT64)expected, 8), (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT64, UNITY_ARRAY_TO_VAL)
-#define UNITY_TEST_ASSERT_EACH_EQUAL_HEX64(expected, actual, num_elements, line, message)        UnityAssertEqualIntArray(UnityNumToPtr((UNITY_INT)(UNITY_INT64)expected, 8), (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX64,  UNITY_ARRAY_TO_VAL)
-#define UNITY_TEST_ASSERT_INT64_WITHIN(delta, expected, actual, line, message)                   UnityAssertNumbersWithin((delta), (UNITY_INT)(expected), (UNITY_INT)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT64)
-#define UNITY_TEST_ASSERT_UINT64_WITHIN(delta, expected, actual, line, message)                  UnityAssertNumbersWithin((delta), (UNITY_INT)(expected), (UNITY_INT)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT64)
-#define UNITY_TEST_ASSERT_HEX64_WITHIN(delta, expected, actual, line, message)                   UnityAssertNumbersWithin((delta), (UNITY_INT)(expected), (UNITY_INT)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX64)
-#define UNITY_TEST_ASSERT_GREATER_THAN_INT64(threshold, actual, line, message)                   UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(threshold), (UNITY_INT)(actual), UNITY_GREATER_THAN,     (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT64)
-#define UNITY_TEST_ASSERT_GREATER_THAN_UINT64(threshold, actual, line, message)                  UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(threshold), (UNITY_INT)(actual), UNITY_GREATER_THAN,     (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT64)
-#define UNITY_TEST_ASSERT_GREATER_THAN_HEX64(threshold, actual, line, message)                   UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(threshold), (UNITY_INT)(actual), UNITY_GREATER_THAN,     (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX64)
-#define UNITY_TEST_ASSERT_GREATER_OR_EQUAL_INT64(threshold, actual, line, message)               UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(threshold), (UNITY_INT)(actual), UNITY_GREATER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT64)
-#define UNITY_TEST_ASSERT_GREATER_OR_EQUAL_UINT64(threshold, actual, line, message)              UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(threshold), (UNITY_INT)(actual), UNITY_GREATER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT64)
-#define UNITY_TEST_ASSERT_GREATER_OR_EQUAL_HEX64(threshold, actual, line, message)               UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(threshold), (UNITY_INT)(actual), UNITY_GREATER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX64)
-#define UNITY_TEST_ASSERT_SMALLER_THAN_INT64(threshold, actual, line, message)                   UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(threshold), (UNITY_INT)(actual), UNITY_SMALLER_THAN,     (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT64)
-#define UNITY_TEST_ASSERT_SMALLER_THAN_UINT64(threshold, actual, line, message)                  UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(threshold), (UNITY_INT)(actual), UNITY_SMALLER_THAN,     (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT64)
-#define UNITY_TEST_ASSERT_SMALLER_THAN_HEX64(threshold, actual, line, message)                   UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(threshold), (UNITY_INT)(actual), UNITY_SMALLER_THAN,     (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX64)
-#define UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_INT64(threshold, actual, line, message)               UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(threshold), (UNITY_INT)(actual), UNITY_SMALLER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT64)
-#define UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_UINT64(threshold, actual, line, message)              UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(threshold), (UNITY_INT)(actual), UNITY_SMALLER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT64)
-#define UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_HEX64(threshold, actual, line, message)               UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(threshold), (UNITY_INT)(actual), UNITY_SMALLER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX64)
-#else
-#define UNITY_TEST_ASSERT_EQUAL_INT64(expected, actual, line, message)                           UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErr64)
-#define UNITY_TEST_ASSERT_EQUAL_UINT64(expected, actual, line, message)                          UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErr64)
-#define UNITY_TEST_ASSERT_EQUAL_HEX64(expected, actual, line, message)                           UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErr64)
-#define UNITY_TEST_ASSERT_EQUAL_INT64_ARRAY(expected, actual, num_elements, line, message)       UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErr64)
-#define UNITY_TEST_ASSERT_EQUAL_UINT64_ARRAY(expected, actual, num_elements, line, message)      UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErr64)
-#define UNITY_TEST_ASSERT_EQUAL_HEX64_ARRAY(expected, actual, num_elements, line, message)       UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErr64)
-#define UNITY_TEST_ASSERT_INT64_WITHIN(delta, expected, actual, line, message)                   UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErr64)
-#define UNITY_TEST_ASSERT_UINT64_WITHIN(delta, expected, actual, line, message)                  UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErr64)
-#define UNITY_TEST_ASSERT_HEX64_WITHIN(delta, expected, actual, line, message)                   UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErr64)
-#define UNITY_TEST_ASSERT_GREATER_THAN_INT64(threshold, actual, line, message)                   UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErr64)
-#define UNITY_TEST_ASSERT_GREATER_THAN_UINT64(threshold, actual, line, message)                  UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErr64)
-#define UNITY_TEST_ASSERT_GREATER_THAN_HEX64(threshold, actual, line, message)                   UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErr64)
-#define UNITY_TEST_ASSERT_GREATER_OR_EQUAL_INT64(threshold, actual, line, message)               UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErr64)
-#define UNITY_TEST_ASSERT_GREATER_OR_EQUAL_UINT64(threshold, actual, line, message)              UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErr64)
-#define UNITY_TEST_ASSERT_GREATER_OR_EQUAL_HEX64(threshold, actual, line, message)               UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErr64)
-#define UNITY_TEST_ASSERT_SMALLER_THAN_INT64(threshold, actual, line, message)                   UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErr64)
-#define UNITY_TEST_ASSERT_SMALLER_THAN_UINT64(threshold, actual, line, message)                  UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErr64)
-#define UNITY_TEST_ASSERT_SMALLER_THAN_HEX64(threshold, actual, line, message)                   UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErr64)
-#define UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_INT64(threshold, actual, line, message)               UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErr64)
-#define UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_UINT64(threshold, actual, line, message)              UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErr64)
-#define UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_HEX64(threshold, actual, line, message)               UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErr64)
-#endif
-
-#ifdef UNITY_EXCLUDE_FLOAT
-#define UNITY_TEST_ASSERT_FLOAT_WITHIN(delta, expected, actual, line, message)                   UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErrFloat)
-#define UNITY_TEST_ASSERT_EQUAL_FLOAT(expected, actual, line, message)                           UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErrFloat)
-#define UNITY_TEST_ASSERT_EQUAL_FLOAT_ARRAY(expected, actual, num_elements, line, message)       UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErrFloat)
-#define UNITY_TEST_ASSERT_EACH_EQUAL_FLOAT(expected, actual, num_elements, line, message)        UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErrFloat)
-#define UNITY_TEST_ASSERT_FLOAT_IS_INF(actual, line, message)                                    UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErrFloat)
-#define UNITY_TEST_ASSERT_FLOAT_IS_NEG_INF(actual, line, message)                                UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErrFloat)
-#define UNITY_TEST_ASSERT_FLOAT_IS_NAN(actual, line, message)                                    UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErrFloat)
-#define UNITY_TEST_ASSERT_FLOAT_IS_DETERMINATE(actual, line, message)                            UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErrFloat)
-#define UNITY_TEST_ASSERT_FLOAT_IS_NOT_INF(actual, line, message)                                UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErrFloat)
-#define UNITY_TEST_ASSERT_FLOAT_IS_NOT_NEG_INF(actual, line, message)                            UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErrFloat)
-#define UNITY_TEST_ASSERT_FLOAT_IS_NOT_NAN(actual, line, message)                                UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErrFloat)
-#define UNITY_TEST_ASSERT_FLOAT_IS_NOT_DETERMINATE(actual, line, message)                        UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErrFloat)
-#else
-#define UNITY_TEST_ASSERT_FLOAT_WITHIN(delta, expected, actual, line, message)                   UnityAssertFloatsWithin((UNITY_FLOAT)(delta), (UNITY_FLOAT)(expected), (UNITY_FLOAT)(actual), (message), (UNITY_LINE_TYPE)(line))
-#define UNITY_TEST_ASSERT_EQUAL_FLOAT(expected, actual, line, message)                           UNITY_TEST_ASSERT_FLOAT_WITHIN((UNITY_FLOAT)(expected) * (UNITY_FLOAT)UNITY_FLOAT_PRECISION, (UNITY_FLOAT)(expected), (UNITY_FLOAT)(actual), (UNITY_LINE_TYPE)(line), (message))
-#define UNITY_TEST_ASSERT_EQUAL_FLOAT_ARRAY(expected, actual, num_elements, line, message)       UnityAssertEqualFloatArray((UNITY_FLOAT*)(expected), (UNITY_FLOAT*)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_ARRAY_TO_ARRAY)
-#define UNITY_TEST_ASSERT_EACH_EQUAL_FLOAT(expected, actual, num_elements, line, message)        UnityAssertEqualFloatArray(UnityFloatToPtr(expected), (UNITY_FLOAT*)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_ARRAY_TO_VAL)
-#define UNITY_TEST_ASSERT_FLOAT_IS_INF(actual, line, message)                                    UnityAssertFloatSpecial((UNITY_FLOAT)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_FLOAT_IS_INF)
-#define UNITY_TEST_ASSERT_FLOAT_IS_NEG_INF(actual, line, message)                                UnityAssertFloatSpecial((UNITY_FLOAT)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_FLOAT_IS_NEG_INF)
-#define UNITY_TEST_ASSERT_FLOAT_IS_NAN(actual, line, message)                                    UnityAssertFloatSpecial((UNITY_FLOAT)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_FLOAT_IS_NAN)
-#define UNITY_TEST_ASSERT_FLOAT_IS_DETERMINATE(actual, line, message)                            UnityAssertFloatSpecial((UNITY_FLOAT)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_FLOAT_IS_DET)
-#define UNITY_TEST_ASSERT_FLOAT_IS_NOT_INF(actual, line, message)                                UnityAssertFloatSpecial((UNITY_FLOAT)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_FLOAT_IS_NOT_INF)
-#define UNITY_TEST_ASSERT_FLOAT_IS_NOT_NEG_INF(actual, line, message)                            UnityAssertFloatSpecial((UNITY_FLOAT)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_FLOAT_IS_NOT_NEG_INF)
-#define UNITY_TEST_ASSERT_FLOAT_IS_NOT_NAN(actual, line, message)                                UnityAssertFloatSpecial((UNITY_FLOAT)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_FLOAT_IS_NOT_NAN)
-#define UNITY_TEST_ASSERT_FLOAT_IS_NOT_DETERMINATE(actual, line, message)                        UnityAssertFloatSpecial((UNITY_FLOAT)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_FLOAT_IS_NOT_DET)
-#endif
-
-#ifdef UNITY_EXCLUDE_DOUBLE
-#define UNITY_TEST_ASSERT_DOUBLE_WITHIN(delta, expected, actual, line, message)                  UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErrDouble)
-#define UNITY_TEST_ASSERT_EQUAL_DOUBLE(expected, actual, line, message)                          UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErrDouble)
-#define UNITY_TEST_ASSERT_EQUAL_DOUBLE_ARRAY(expected, actual, num_elements, line, message)      UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErrDouble)
-#define UNITY_TEST_ASSERT_EACH_EQUAL_DOUBLE(expected, actual, num_elements, line, message)       UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErrDouble)
-#define UNITY_TEST_ASSERT_DOUBLE_IS_INF(actual, line, message)                                   UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErrDouble)
-#define UNITY_TEST_ASSERT_DOUBLE_IS_NEG_INF(actual, line, message)                               UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErrDouble)
-#define UNITY_TEST_ASSERT_DOUBLE_IS_NAN(actual, line, message)                                   UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErrDouble)
-#define UNITY_TEST_ASSERT_DOUBLE_IS_DETERMINATE(actual, line, message)                           UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErrDouble)
-#define UNITY_TEST_ASSERT_DOUBLE_IS_NOT_INF(actual, line, message)                               UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErrDouble)
-#define UNITY_TEST_ASSERT_DOUBLE_IS_NOT_NEG_INF(actual, line, message)                           UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErrDouble)
-#define UNITY_TEST_ASSERT_DOUBLE_IS_NOT_NAN(actual, line, message)                               UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErrDouble)
-#define UNITY_TEST_ASSERT_DOUBLE_IS_NOT_DETERMINATE(actual, line, message)                       UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErrDouble)
-#else
-#define UNITY_TEST_ASSERT_DOUBLE_WITHIN(delta, expected, actual, line, message)                  UnityAssertDoublesWithin((UNITY_DOUBLE)(delta), (UNITY_DOUBLE)(expected), (UNITY_DOUBLE)(actual), (message), (UNITY_LINE_TYPE)line)
-#define UNITY_TEST_ASSERT_EQUAL_DOUBLE(expected, actual, line, message)                          UNITY_TEST_ASSERT_DOUBLE_WITHIN((UNITY_DOUBLE)(expected) * (UNITY_DOUBLE)UNITY_DOUBLE_PRECISION, (UNITY_DOUBLE)expected, (UNITY_DOUBLE)actual, (UNITY_LINE_TYPE)(line), message)
-#define UNITY_TEST_ASSERT_EQUAL_DOUBLE_ARRAY(expected, actual, num_elements, line, message)      UnityAssertEqualDoubleArray((UNITY_DOUBLE*)(expected), (UNITY_DOUBLE*)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_ARRAY_TO_ARRAY)
-#define UNITY_TEST_ASSERT_EACH_EQUAL_DOUBLE(expected, actual, num_elements, line, message)       UnityAssertEqualDoubleArray(UnityDoubleToPtr(expected), (UNITY_DOUBLE*)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_ARRAY_TO_VAL)
-#define UNITY_TEST_ASSERT_DOUBLE_IS_INF(actual, line, message)                                   UnityAssertDoubleSpecial((UNITY_DOUBLE)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_FLOAT_IS_INF)
-#define UNITY_TEST_ASSERT_DOUBLE_IS_NEG_INF(actual, line, message)                               UnityAssertDoubleSpecial((UNITY_DOUBLE)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_FLOAT_IS_NEG_INF)
-#define UNITY_TEST_ASSERT_DOUBLE_IS_NAN(actual, line, message)                                   UnityAssertDoubleSpecial((UNITY_DOUBLE)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_FLOAT_IS_NAN)
-#define UNITY_TEST_ASSERT_DOUBLE_IS_DETERMINATE(actual, line, message)                           UnityAssertDoubleSpecial((UNITY_DOUBLE)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_FLOAT_IS_DET)
-#define UNITY_TEST_ASSERT_DOUBLE_IS_NOT_INF(actual, line, message)                               UnityAssertDoubleSpecial((UNITY_DOUBLE)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_FLOAT_IS_NOT_INF)
-#define UNITY_TEST_ASSERT_DOUBLE_IS_NOT_NEG_INF(actual, line, message)                           UnityAssertDoubleSpecial((UNITY_DOUBLE)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_FLOAT_IS_NOT_NEG_INF)
-#define UNITY_TEST_ASSERT_DOUBLE_IS_NOT_NAN(actual, line, message)                               UnityAssertDoubleSpecial((UNITY_DOUBLE)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_FLOAT_IS_NOT_NAN)
-#define UNITY_TEST_ASSERT_DOUBLE_IS_NOT_DETERMINATE(actual, line, message)                       UnityAssertDoubleSpecial((UNITY_DOUBLE)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_FLOAT_IS_NOT_DET)
-#endif
-
-/* End of UNITY_INTERNALS_H */
-#endif
diff --git a/libs/libzmq/external/unity/version.txt b/libs/libzmq/external/unity/version.txt
deleted file mode 100644
index f1b3f42..0000000
--- a/libs/libzmq/external/unity/version.txt
+++ /dev/null
@@ -1 +0,0 @@
-https://github.com/ThrowTheSwitch/Unity/commit/b4aca70fd9e0ddf0afbdafb1b826f5edcfc1049b
diff --git a/libs/libzmq/external/wepoll/README.md b/libs/libzmq/external/wepoll/README.md
deleted file mode 100644
index d334d08..0000000
--- a/libs/libzmq/external/wepoll/README.md
+++ /dev/null
@@ -1,202 +0,0 @@
-# wepoll - epoll for windows
-
-[![][ci status badge]][ci status link]
-
-This library implements the [epoll][man epoll] API for Windows
-applications. It is fast and scalable, and it closely resembles the API
-and behavior of Linux' epoll.
-
-## Rationale
-
-Unlike Linux, OS X, and many other operating systems, Windows doesn't
-have a good API for receiving socket state notifications. It only
-supports the `select` and `WSAPoll` APIs, but they
-[don't scale][select scale] and suffer from
-[other issues][wsapoll broken].
-
-Using I/O completion ports isn't always practical when software is
-designed to be cross-platform. Wepoll offers an alternative that is
-much closer to a drop-in replacement for software that was designed
-to run on Linux.
-
-## Features
-
-* Can poll 100000s of sockets efficiently.
-* Fully thread-safe.
-* Multiple threads can poll the same epoll port.
-* Sockets can be added to multiple epoll sets.
-* All epoll events (`EPOLLIN`, `EPOLLOUT`, `EPOLLPRI`, `EPOLLRDHUP`)
-  are supported.
-* Level-triggered and one-shot (`EPOLLONESTHOT`) modes are supported
-* Trivial to embed: you need [only two files][dist].
-
-## Limitations
-
-* Only works with sockets.
-* Edge-triggered (`EPOLLET`) mode isn't supported.
-
-## How to use
-
-The library is [distributed][dist] as a single source file
-([wepoll.c][wepoll.c]) and a single header file ([wepoll.h][wepoll.h]).<br>
-Compile the .c file as part of your project, and include the header wherever
-needed.
-
-## Compatibility
-
-* Requires Windows Vista or higher.
-* Can be compiled with recent versions of MSVC, Clang, and GCC.
-
-## API
-
-### General remarks
-
-* The epoll port is a `HANDLE`, not a file descriptor.
-* All functions set both `errno` and `GetLastError()` on failure.
-* For more extensive documentation, see the [epoll(7) man page][man epoll],
-  and the per-function man pages that are linked below.
-
-### epoll_create/epoll_create1
-
-```c
-HANDLE epoll_create(int size);
-HANDLE epoll_create1(int flags);
-```
-
-* Create a new epoll instance (port).
-* `size` is ignored but most be greater than zero.
-* `flags` must be zero as there are no supported flags.
-* Returns `NULL` on failure.
-* [Linux man page][man epoll_create]
-
-### epoll_close
-
-```c
-int epoll_close(HANDLE ephnd);
-```
-
-* Close an epoll port.
-* Do not attempt to close the epoll port with `close()`,
-  `CloseHandle()` or `closesocket()`.
-
-### epoll_ctl
-
-```c
-int epoll_ctl(HANDLE ephnd,
-              int op,
-              SOCKET sock,
-              struct epoll_event* event);
-```
-
-* Control which socket events are monitored by an epoll port.
-* `ephnd` must be a HANDLE created by
-  [`epoll_create()`](#epoll_createepoll_create1) or
-  [`epoll_create1()`](#epoll_createepoll_create1).
-* `op` must be one of `EPOLL_CTL_ADD`, `EPOLL_CTL_MOD`, `EPOLL_CTL_DEL`.
-* `sock` must be a valid socket created by [`socket()`][msdn socket],
-  [`WSASocket()`][msdn wsasocket], or [`accept()`][msdn accept].
-* `event` should be a pointer to a [`struct epoll_event`](#struct-epoll_event).<br>
-  If `op` is `EPOLL_CTL_DEL` then the `event` parameter is ignored, and it
-  may be `NULL`.
-* Returns 0 on success, -1 on failure.
-* It is recommended to always explicitly remove a socket from its epoll
-  set using `EPOLL_CTL_DEL` *before* closing it.<br>
-  As on Linux, closed sockets are automatically removed from the epoll set, but
-  wepoll may not be able to detect that a socket was closed until the next call
-  to [`epoll_wait()`](#epoll_wait).
-* [Linux man page][man epoll_ctl]
-
-### epoll_wait
-
-```c
-int epoll_wait(HANDLE ephnd,
-               struct epoll_event* events,
-               int maxevents,
-               int timeout);
-```
-
-* Receive socket events from an epoll port.
-* `events` should point to a caller-allocated array of
-  [`epoll_event`](#struct-epoll_event) structs, which will receive the
-  reported events.
-* `maxevents` is the maximum number of events that will be written to the
-  `events` array, and must be greater than zero.
-* `timeout` specifies whether to block when no events are immediately available.
-  - `<0` block indefinitely
-  - `0`  report any events that are already waiting, but don't block
-  - `≥1` block for at most N milliseconds
-* Return value:
-  - `-1` an error occurred
-  - `0`  timed out without any events to report
-  - `≥1` the number of events stored in the `events` buffer
-* [Linux man page][man epoll_wait]
-
-### struct epoll_event
-
-```c
-typedef union epoll_data {
-  void* ptr;
-  int fd;
-  uint32_t u32;
-  uint64_t u64;
-  SOCKET sock;        /* Windows specific */
-  HANDLE hnd;         /* Windows specific */
-} epoll_data_t;
-```
-
-```c
-struct epoll_event {
-  uint32_t events;    /* Epoll events and flags */
-  epoll_data_t data;  /* User data variable */
-};
-```
-
-* The `events` field is a bit mask containing the events being
-  monitored/reported, and optional flags.<br>
-  Flags are accepted by [`epoll_ctl()`](#epoll_ctl), but they are not reported
-  back by [`epoll_wait()`](#epoll_wait).
-* The `data` field can be used to associate application-specific information
-  with a socket; its value will be returned unmodified by
-  [`epoll_wait()`](#epoll_wait).
-* [Linux man page][man epoll_ctl]
-
-| Event         | Description                                                          |
-|---------------|----------------------------------------------------------------------|
-| `EPOLLIN`     | incoming data available, or incoming connection ready to be accepted |
-| `EPOLLOUT`    | ready to send data, or outgoing connection successfully established  |
-| `EPOLLRDHUP`  | remote peer initiated graceful socket shutdown                       |
-| `EPOLLPRI`    | out-of-band data available for reading                               |
-| `EPOLLERR`    | socket error<sup>1</sup>                                             |
-| `EPOLLHUP`    | socket hang-up<sup>1</sup>                                           |
-| `EPOLLRDNORM` | same as `EPOLLIN`                                                    |
-| `EPOLLRDBAND` | same as `EPOLLPRI`                                                   |
-| `EPOLLWRNORM` | same as `EPOLLOUT`                                                   |
-| `EPOLLWRBAND` | same as `EPOLLOUT`                                                   |
-| `EPOLLMSG`    | never reported                                                       |
-
-| Flag             | Description               |
-|------------------|---------------------------|
-| `EPOLLONESHOT`   | report event(s) only once |
-| `EPOLLET`        | not supported by wepoll   |
-| `EPOLLEXCLUSIVE` | not supported by wepoll   |
-| `EPOLLWAKEUP`    | not supported by wepoll   |
-
-<sup>1</sup>: the `EPOLLERR` and `EPOLLHUP` events may always be reported by
-[`epoll_wait()`](#epoll_wait), regardless of the event mask that was passed to
-[`epoll_ctl()`](#epoll_ctl).
-
-
-[ci status badge]:  https://ci.appveyor.com/api/projects/status/github/piscisaureus/wepoll?branch=master&svg=true
-[ci status link]:   https://ci.appveyor.com/project/piscisaureus/wepoll/branch/master
-[dist]:             https://github.com/piscisaureus/wepoll/tree/dist
-[man epoll]:        http://man7.org/linux/man-pages/man7/epoll.7.html
-[man epoll_create]: http://man7.org/linux/man-pages/man2/epoll_create.2.html
-[man epoll_ctl]:    http://man7.org/linux/man-pages/man2/epoll_ctl.2.html
-[man epoll_wait]:   http://man7.org/linux/man-pages/man2/epoll_wait.2.html
-[msdn accept]:      https://msdn.microsoft.com/en-us/library/windows/desktop/ms737526(v=vs.85).aspx
-[msdn socket]:      https://msdn.microsoft.com/en-us/library/windows/desktop/ms740506(v=vs.85).aspx
-[msdn wsasocket]:   https://msdn.microsoft.com/en-us/library/windows/desktop/ms742212(v=vs.85).aspx
-[select scale]:     https://daniel.haxx.se/docs/poll-vs-select.html
-[wsapoll broken]:   https://daniel.haxx.se/blog/2012/10/10/wsapoll-is-broken/
-[wepoll.c]:         https://github.com/piscisaureus/wepoll/blob/dist/wepoll.c
-[wepoll.h]:         https://github.com/piscisaureus/wepoll/blob/dist/wepoll.h
diff --git a/libs/libzmq/external/wepoll/license.txt b/libs/libzmq/external/wepoll/license.txt
deleted file mode 100644
index d7fc4b1..0000000
--- a/libs/libzmq/external/wepoll/license.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-wepoll - epoll for Windows
-https://github.com/piscisaureus/wepoll
-
-Copyright 2012-2020, Bert Belder <bertbelder@gmail.com>
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-  * Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-
-  * Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/libs/libzmq/external/wepoll/version.txt b/libs/libzmq/external/wepoll/version.txt
deleted file mode 100644
index 3b29608..0000000
--- a/libs/libzmq/external/wepoll/version.txt
+++ /dev/null
@@ -1 +0,0 @@
-https://github.com/piscisaureus/wepoll/tree/v1.5.8
diff --git a/libs/libzmq/external/wepoll/wepoll.c b/libs/libzmq/external/wepoll/wepoll.c
deleted file mode 100644
index 186d3f2..0000000
--- a/libs/libzmq/external/wepoll/wepoll.c
+++ /dev/null
@@ -1,2253 +0,0 @@
-/*
- * wepoll - epoll for Windows
- * https://github.com/piscisaureus/wepoll
- *
- * Copyright 2012-2020, Bert Belder <bertbelder@gmail.com>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef WEPOLL_EXPORT
-#define WEPOLL_EXPORT
-#endif
-
-#include <stdint.h>
-
-enum EPOLL_EVENTS {
-  EPOLLIN      = (int) (1U <<  0),
-  EPOLLPRI     = (int) (1U <<  1),
-  EPOLLOUT     = (int) (1U <<  2),
-  EPOLLERR     = (int) (1U <<  3),
-  EPOLLHUP     = (int) (1U <<  4),
-  EPOLLRDNORM  = (int) (1U <<  6),
-  EPOLLRDBAND  = (int) (1U <<  7),
-  EPOLLWRNORM  = (int) (1U <<  8),
-  EPOLLWRBAND  = (int) (1U <<  9),
-  EPOLLMSG     = (int) (1U << 10), /* Never reported. */
-  EPOLLRDHUP   = (int) (1U << 13),
-  EPOLLONESHOT = (int) (1U << 31)
-};
-
-#define EPOLLIN      (1U <<  0)
-#define EPOLLPRI     (1U <<  1)
-#define EPOLLOUT     (1U <<  2)
-#define EPOLLERR     (1U <<  3)
-#define EPOLLHUP     (1U <<  4)
-#define EPOLLRDNORM  (1U <<  6)
-#define EPOLLRDBAND  (1U <<  7)
-#define EPOLLWRNORM  (1U <<  8)
-#define EPOLLWRBAND  (1U <<  9)
-#define EPOLLMSG     (1U << 10)
-#define EPOLLRDHUP   (1U << 13)
-#define EPOLLONESHOT (1U << 31)
-
-#define EPOLL_CTL_ADD 1
-#define EPOLL_CTL_MOD 2
-#define EPOLL_CTL_DEL 3
-
-typedef void* HANDLE;
-typedef uintptr_t SOCKET;
-
-typedef union epoll_data {
-  void* ptr;
-  int fd;
-  uint32_t u32;
-  uint64_t u64;
-  SOCKET sock; /* Windows specific */
-  HANDLE hnd;  /* Windows specific */
-} epoll_data_t;
-
-struct epoll_event {
-  uint32_t events;   /* Epoll events and flags */
-  epoll_data_t data; /* User data variable */
-};
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-WEPOLL_EXPORT HANDLE epoll_create(int size);
-WEPOLL_EXPORT HANDLE epoll_create1(int flags);
-
-WEPOLL_EXPORT int epoll_close(HANDLE ephnd);
-
-WEPOLL_EXPORT int epoll_ctl(HANDLE ephnd,
-                            int op,
-                            SOCKET sock,
-                            struct epoll_event* event);
-
-WEPOLL_EXPORT int epoll_wait(HANDLE ephnd,
-                             struct epoll_event* events,
-                             int maxevents,
-                             int timeout);
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#include <assert.h>
-
-#include <stdlib.h>
-
-#define WEPOLL_INTERNAL static
-#define WEPOLL_INTERNAL_EXTERN static
-
-#if defined(__clang__)
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wnonportable-system-include-path"
-#pragma clang diagnostic ignored "-Wreserved-id-macro"
-#elif defined(_MSC_VER)
-#pragma warning(push, 1)
-#endif
-
-#undef WIN32_LEAN_AND_MEAN
-#define WIN32_LEAN_AND_MEAN
-
-#undef _WIN32_WINNT
-#define _WIN32_WINNT 0x0600
-
-#include <winsock2.h>
-#include <ws2tcpip.h>
-#include <windows.h>
-
-#if defined(__clang__)
-#pragma clang diagnostic pop
-#elif defined(_MSC_VER)
-#pragma warning(pop)
-#endif
-
-WEPOLL_INTERNAL int nt_global_init(void);
-
-typedef LONG NTSTATUS;
-typedef NTSTATUS* PNTSTATUS;
-
-#ifndef NT_SUCCESS
-#define NT_SUCCESS(status) (((NTSTATUS)(status)) >= 0)
-#endif
-
-#ifndef STATUS_SUCCESS
-#define STATUS_SUCCESS ((NTSTATUS) 0x00000000L)
-#endif
-
-#ifndef STATUS_PENDING
-#define STATUS_PENDING ((NTSTATUS) 0x00000103L)
-#endif
-
-#ifndef STATUS_CANCELLED
-#define STATUS_CANCELLED ((NTSTATUS) 0xC0000120L)
-#endif
-
-#ifndef STATUS_NOT_FOUND
-#define STATUS_NOT_FOUND ((NTSTATUS) 0xC0000225L)
-#endif
-
-typedef struct _IO_STATUS_BLOCK {
-  NTSTATUS Status;
-  ULONG_PTR Information;
-} IO_STATUS_BLOCK, *PIO_STATUS_BLOCK;
-
-typedef VOID(NTAPI* PIO_APC_ROUTINE)(PVOID ApcContext,
-                                     PIO_STATUS_BLOCK IoStatusBlock,
-                                     ULONG Reserved);
-
-typedef struct _UNICODE_STRING {
-  USHORT Length;
-  USHORT MaximumLength;
-  PWSTR Buffer;
-} UNICODE_STRING, *PUNICODE_STRING;
-
-#define RTL_CONSTANT_STRING(s) \
-  { sizeof(s) - sizeof((s)[0]), sizeof(s), s }
-
-typedef struct _OBJECT_ATTRIBUTES {
-  ULONG Length;
-  HANDLE RootDirectory;
-  PUNICODE_STRING ObjectName;
-  ULONG Attributes;
-  PVOID SecurityDescriptor;
-  PVOID SecurityQualityOfService;
-} OBJECT_ATTRIBUTES, *POBJECT_ATTRIBUTES;
-
-#define RTL_CONSTANT_OBJECT_ATTRIBUTES(ObjectName, Attributes) \
-  { sizeof(OBJECT_ATTRIBUTES), NULL, ObjectName, Attributes, NULL, NULL }
-
-#ifndef FILE_OPEN
-#define FILE_OPEN 0x00000001UL
-#endif
-
-#define KEYEDEVENT_WAIT 0x00000001UL
-#define KEYEDEVENT_WAKE 0x00000002UL
-#define KEYEDEVENT_ALL_ACCESS \
-  (STANDARD_RIGHTS_REQUIRED | KEYEDEVENT_WAIT | KEYEDEVENT_WAKE)
-
-#define NT_NTDLL_IMPORT_LIST(X)           \
-  X(NTSTATUS,                             \
-    NTAPI,                                \
-    NtCancelIoFileEx,                     \
-    (HANDLE FileHandle,                   \
-     PIO_STATUS_BLOCK IoRequestToCancel,  \
-     PIO_STATUS_BLOCK IoStatusBlock))     \
-                                          \
-  X(NTSTATUS,                             \
-    NTAPI,                                \
-    NtCreateFile,                         \
-    (PHANDLE FileHandle,                  \
-     ACCESS_MASK DesiredAccess,           \
-     POBJECT_ATTRIBUTES ObjectAttributes, \
-     PIO_STATUS_BLOCK IoStatusBlock,      \
-     PLARGE_INTEGER AllocationSize,       \
-     ULONG FileAttributes,                \
-     ULONG ShareAccess,                   \
-     ULONG CreateDisposition,             \
-     ULONG CreateOptions,                 \
-     PVOID EaBuffer,                      \
-     ULONG EaLength))                     \
-                                          \
-  X(NTSTATUS,                             \
-    NTAPI,                                \
-    NtCreateKeyedEvent,                   \
-    (PHANDLE KeyedEventHandle,            \
-     ACCESS_MASK DesiredAccess,           \
-     POBJECT_ATTRIBUTES ObjectAttributes, \
-     ULONG Flags))                        \
-                                          \
-  X(NTSTATUS,                             \
-    NTAPI,                                \
-    NtDeviceIoControlFile,                \
-    (HANDLE FileHandle,                   \
-     HANDLE Event,                        \
-     PIO_APC_ROUTINE ApcRoutine,          \
-     PVOID ApcContext,                    \
-     PIO_STATUS_BLOCK IoStatusBlock,      \
-     ULONG IoControlCode,                 \
-     PVOID InputBuffer,                   \
-     ULONG InputBufferLength,             \
-     PVOID OutputBuffer,                  \
-     ULONG OutputBufferLength))           \
-                                          \
-  X(NTSTATUS,                             \
-    NTAPI,                                \
-    NtReleaseKeyedEvent,                  \
-    (HANDLE KeyedEventHandle,             \
-     PVOID KeyValue,                      \
-     BOOLEAN Alertable,                   \
-     PLARGE_INTEGER Timeout))             \
-                                          \
-  X(NTSTATUS,                             \
-    NTAPI,                                \
-    NtWaitForKeyedEvent,                  \
-    (HANDLE KeyedEventHandle,             \
-     PVOID KeyValue,                      \
-     BOOLEAN Alertable,                   \
-     PLARGE_INTEGER Timeout))             \
-                                          \
-  X(ULONG, WINAPI, RtlNtStatusToDosError, (NTSTATUS Status))
-
-#define X(return_type, attributes, name, parameters) \
-  WEPOLL_INTERNAL_EXTERN return_type(attributes* name) parameters;
-NT_NTDLL_IMPORT_LIST(X)
-#undef X
-
-#define AFD_POLL_RECEIVE           0x0001
-#define AFD_POLL_RECEIVE_EXPEDITED 0x0002
-#define AFD_POLL_SEND              0x0004
-#define AFD_POLL_DISCONNECT        0x0008
-#define AFD_POLL_ABORT             0x0010
-#define AFD_POLL_LOCAL_CLOSE       0x0020
-#define AFD_POLL_ACCEPT            0x0080
-#define AFD_POLL_CONNECT_FAIL      0x0100
-
-typedef struct _AFD_POLL_HANDLE_INFO {
-  HANDLE Handle;
-  ULONG Events;
-  NTSTATUS Status;
-} AFD_POLL_HANDLE_INFO, *PAFD_POLL_HANDLE_INFO;
-
-typedef struct _AFD_POLL_INFO {
-  LARGE_INTEGER Timeout;
-  ULONG NumberOfHandles;
-  ULONG Exclusive;
-  AFD_POLL_HANDLE_INFO Handles[1];
-} AFD_POLL_INFO, *PAFD_POLL_INFO;
-
-WEPOLL_INTERNAL int afd_create_device_handle(HANDLE iocp_handle,
-                                             HANDLE* afd_device_handle_out);
-
-WEPOLL_INTERNAL int afd_poll(HANDLE afd_device_handle,
-                             AFD_POLL_INFO* poll_info,
-                             IO_STATUS_BLOCK* io_status_block);
-WEPOLL_INTERNAL int afd_cancel_poll(HANDLE afd_device_handle,
-                                    IO_STATUS_BLOCK* io_status_block);
-
-#define return_map_error(value) \
-  do {                          \
-    err_map_win_error();        \
-    return (value);             \
-  } while (0)
-
-#define return_set_error(value, error) \
-  do {                                 \
-    err_set_win_error(error);          \
-    return (value);                    \
-  } while (0)
-
-WEPOLL_INTERNAL void err_map_win_error(void);
-WEPOLL_INTERNAL void err_set_win_error(DWORD error);
-WEPOLL_INTERNAL int err_check_handle(HANDLE handle);
-
-#define IOCTL_AFD_POLL 0x00012024
-
-static UNICODE_STRING afd__device_name =
-    RTL_CONSTANT_STRING(L"\\Device\\Afd\\Wepoll");
-
-static OBJECT_ATTRIBUTES afd__device_attributes =
-    RTL_CONSTANT_OBJECT_ATTRIBUTES(&afd__device_name, 0);
-
-int afd_create_device_handle(HANDLE iocp_handle,
-                             HANDLE* afd_device_handle_out) {
-  HANDLE afd_device_handle;
-  IO_STATUS_BLOCK iosb;
-  NTSTATUS status;
-
-  /* By opening \Device\Afd without specifying any extended attributes, we'll
-   * get a handle that lets us talk to the AFD driver, but that doesn't have an
-   * associated endpoint (so it's not a socket). */
-  status = NtCreateFile(&afd_device_handle,
-                        SYNCHRONIZE,
-                        &afd__device_attributes,
-                        &iosb,
-                        NULL,
-                        0,
-                        FILE_SHARE_READ | FILE_SHARE_WRITE,
-                        FILE_OPEN,
-                        0,
-                        NULL,
-                        0);
-  if (status != STATUS_SUCCESS)
-    return_set_error(-1, RtlNtStatusToDosError(status));
-
-  if (CreateIoCompletionPort(afd_device_handle, iocp_handle, 0, 0) == NULL)
-    goto error;
-
-  if (!SetFileCompletionNotificationModes(afd_device_handle,
-                                          FILE_SKIP_SET_EVENT_ON_HANDLE))
-    goto error;
-
-  *afd_device_handle_out = afd_device_handle;
-  return 0;
-
-error:
-  CloseHandle(afd_device_handle);
-  return_map_error(-1);
-}
-
-int afd_poll(HANDLE afd_device_handle,
-             AFD_POLL_INFO* poll_info,
-             IO_STATUS_BLOCK* io_status_block) {
-  NTSTATUS status;
-
-  /* Blocking operation is not supported. */
-  assert(io_status_block != NULL);
-
-  io_status_block->Status = STATUS_PENDING;
-  status = NtDeviceIoControlFile(afd_device_handle,
-                                 NULL,
-                                 NULL,
-                                 io_status_block,
-                                 io_status_block,
-                                 IOCTL_AFD_POLL,
-                                 poll_info,
-                                 sizeof *poll_info,
-                                 poll_info,
-                                 sizeof *poll_info);
-
-  if (status == STATUS_SUCCESS)
-    return 0;
-  else if (status == STATUS_PENDING)
-    return_set_error(-1, ERROR_IO_PENDING);
-  else
-    return_set_error(-1, RtlNtStatusToDosError(status));
-}
-
-int afd_cancel_poll(HANDLE afd_device_handle,
-                    IO_STATUS_BLOCK* io_status_block) {
-  NTSTATUS cancel_status;
-  IO_STATUS_BLOCK cancel_iosb;
-
-  /* If the poll operation has already completed or has been cancelled earlier,
-   * there's nothing left for us to do. */
-  if (io_status_block->Status != STATUS_PENDING)
-    return 0;
-
-  cancel_status =
-      NtCancelIoFileEx(afd_device_handle, io_status_block, &cancel_iosb);
-
-  /* NtCancelIoFileEx() may return STATUS_NOT_FOUND if the operation completed
-   * just before calling NtCancelIoFileEx(). This is not an error. */
-  if (cancel_status == STATUS_SUCCESS || cancel_status == STATUS_NOT_FOUND)
-    return 0;
-  else
-    return_set_error(-1, RtlNtStatusToDosError(cancel_status));
-}
-
-WEPOLL_INTERNAL int epoll_global_init(void);
-
-WEPOLL_INTERNAL int init(void);
-
-typedef struct port_state port_state_t;
-typedef struct queue queue_t;
-typedef struct sock_state sock_state_t;
-typedef struct ts_tree_node ts_tree_node_t;
-
-WEPOLL_INTERNAL port_state_t* port_new(HANDLE* iocp_handle_out);
-WEPOLL_INTERNAL int port_close(port_state_t* port_state);
-WEPOLL_INTERNAL int port_delete(port_state_t* port_state);
-
-WEPOLL_INTERNAL int port_wait(port_state_t* port_state,
-                              struct epoll_event* events,
-                              int maxevents,
-                              int timeout);
-
-WEPOLL_INTERNAL int port_ctl(port_state_t* port_state,
-                             int op,
-                             SOCKET sock,
-                             struct epoll_event* ev);
-
-WEPOLL_INTERNAL int port_register_socket(port_state_t* port_state,
-                                         sock_state_t* sock_state,
-                                         SOCKET socket);
-WEPOLL_INTERNAL void port_unregister_socket(port_state_t* port_state,
-                                            sock_state_t* sock_state);
-WEPOLL_INTERNAL sock_state_t* port_find_socket(port_state_t* port_state,
-                                               SOCKET socket);
-
-WEPOLL_INTERNAL void port_request_socket_update(port_state_t* port_state,
-                                                sock_state_t* sock_state);
-WEPOLL_INTERNAL void port_cancel_socket_update(port_state_t* port_state,
-                                               sock_state_t* sock_state);
-
-WEPOLL_INTERNAL void port_add_deleted_socket(port_state_t* port_state,
-                                             sock_state_t* sock_state);
-WEPOLL_INTERNAL void port_remove_deleted_socket(port_state_t* port_state,
-                                                sock_state_t* sock_state);
-
-WEPOLL_INTERNAL HANDLE port_get_iocp_handle(port_state_t* port_state);
-WEPOLL_INTERNAL queue_t* port_get_poll_group_queue(port_state_t* port_state);
-
-WEPOLL_INTERNAL port_state_t* port_state_from_handle_tree_node(
-    ts_tree_node_t* tree_node);
-WEPOLL_INTERNAL ts_tree_node_t* port_state_to_handle_tree_node(
-    port_state_t* port_state);
-
-/* The reflock is a special kind of lock that normally prevents a chunk of
- * memory from being freed, but does allow the chunk of memory to eventually be
- * released in a coordinated fashion.
- *
- * Under normal operation, threads increase and decrease the reference count,
- * which are wait-free operations.
- *
- * Exactly once during the reflock's lifecycle, a thread holding a reference to
- * the lock may "destroy" the lock; this operation blocks until all other
- * threads holding a reference to the lock have dereferenced it. After
- * "destroy" returns, the calling thread may assume that no other threads have
- * a reference to the lock.
- *
- * Attemmpting to lock or destroy a lock after reflock_unref_and_destroy() has
- * been called is invalid and results in undefined behavior. Therefore the user
- * should use another lock to guarantee that this can't happen.
- */
-
-typedef struct reflock {
-  volatile long state; /* 32-bit Interlocked APIs operate on `long` values. */
-} reflock_t;
-
-WEPOLL_INTERNAL int reflock_global_init(void);
-
-WEPOLL_INTERNAL void reflock_init(reflock_t* reflock);
-WEPOLL_INTERNAL void reflock_ref(reflock_t* reflock);
-WEPOLL_INTERNAL void reflock_unref(reflock_t* reflock);
-WEPOLL_INTERNAL void reflock_unref_and_destroy(reflock_t* reflock);
-
-#include <stdbool.h>
-
-/* N.b.: the tree functions do not set errno or LastError when they fail. Each
- * of the API functions has at most one failure mode. It is up to the caller to
- * set an appropriate error code when necessary. */
-
-typedef struct tree tree_t;
-typedef struct tree_node tree_node_t;
-
-typedef struct tree {
-  tree_node_t* root;
-} tree_t;
-
-typedef struct tree_node {
-  tree_node_t* left;
-  tree_node_t* right;
-  tree_node_t* parent;
-  uintptr_t key;
-  bool red;
-} tree_node_t;
-
-WEPOLL_INTERNAL void tree_init(tree_t* tree);
-WEPOLL_INTERNAL void tree_node_init(tree_node_t* node);
-
-WEPOLL_INTERNAL int tree_add(tree_t* tree, tree_node_t* node, uintptr_t key);
-WEPOLL_INTERNAL void tree_del(tree_t* tree, tree_node_t* node);
-
-WEPOLL_INTERNAL tree_node_t* tree_find(const tree_t* tree, uintptr_t key);
-WEPOLL_INTERNAL tree_node_t* tree_root(const tree_t* tree);
-
-typedef struct ts_tree {
-  tree_t tree;
-  SRWLOCK lock;
-} ts_tree_t;
-
-typedef struct ts_tree_node {
-  tree_node_t tree_node;
-  reflock_t reflock;
-} ts_tree_node_t;
-
-WEPOLL_INTERNAL void ts_tree_init(ts_tree_t* rtl);
-WEPOLL_INTERNAL void ts_tree_node_init(ts_tree_node_t* node);
-
-WEPOLL_INTERNAL int ts_tree_add(ts_tree_t* ts_tree,
-                                ts_tree_node_t* node,
-                                uintptr_t key);
-
-WEPOLL_INTERNAL ts_tree_node_t* ts_tree_del_and_ref(ts_tree_t* ts_tree,
-                                                    uintptr_t key);
-WEPOLL_INTERNAL ts_tree_node_t* ts_tree_find_and_ref(ts_tree_t* ts_tree,
-                                                     uintptr_t key);
-
-WEPOLL_INTERNAL void ts_tree_node_unref(ts_tree_node_t* node);
-WEPOLL_INTERNAL void ts_tree_node_unref_and_destroy(ts_tree_node_t* node);
-
-static ts_tree_t epoll__handle_tree;
-
-int epoll_global_init(void) {
-  ts_tree_init(&epoll__handle_tree);
-  return 0;
-}
-
-static HANDLE epoll__create(void) {
-  port_state_t* port_state;
-  HANDLE ephnd;
-  ts_tree_node_t* tree_node;
-
-  if (init() < 0)
-    return NULL;
-
-  port_state = port_new(&ephnd);
-  if (port_state == NULL)
-    return NULL;
-
-  tree_node = port_state_to_handle_tree_node(port_state);
-  if (ts_tree_add(&epoll__handle_tree, tree_node, (uintptr_t) ephnd) < 0) {
-    /* This should never happen. */
-    port_delete(port_state);
-    return_set_error(NULL, ERROR_ALREADY_EXISTS);
-  }
-
-  return ephnd;
-}
-
-HANDLE epoll_create(int size) {
-  if (size <= 0)
-    return_set_error(NULL, ERROR_INVALID_PARAMETER);
-
-  return epoll__create();
-}
-
-HANDLE epoll_create1(int flags) {
-  if (flags != 0)
-    return_set_error(NULL, ERROR_INVALID_PARAMETER);
-
-  return epoll__create();
-}
-
-int epoll_close(HANDLE ephnd) {
-  ts_tree_node_t* tree_node;
-  port_state_t* port_state;
-
-  if (init() < 0)
-    return -1;
-
-  tree_node = ts_tree_del_and_ref(&epoll__handle_tree, (uintptr_t) ephnd);
-  if (tree_node == NULL) {
-    err_set_win_error(ERROR_INVALID_PARAMETER);
-    goto err;
-  }
-
-  port_state = port_state_from_handle_tree_node(tree_node);
-  port_close(port_state);
-
-  ts_tree_node_unref_and_destroy(tree_node);
-
-  return port_delete(port_state);
-
-err:
-  err_check_handle(ephnd);
-  return -1;
-}
-
-int epoll_ctl(HANDLE ephnd, int op, SOCKET sock, struct epoll_event* ev) {
-  ts_tree_node_t* tree_node;
-  port_state_t* port_state;
-  int r;
-
-  if (init() < 0)
-    return -1;
-
-  tree_node = ts_tree_find_and_ref(&epoll__handle_tree, (uintptr_t) ephnd);
-  if (tree_node == NULL) {
-    err_set_win_error(ERROR_INVALID_PARAMETER);
-    goto err;
-  }
-
-  port_state = port_state_from_handle_tree_node(tree_node);
-  r = port_ctl(port_state, op, sock, ev);
-
-  ts_tree_node_unref(tree_node);
-
-  if (r < 0)
-    goto err;
-
-  return 0;
-
-err:
-  /* On Linux, in the case of epoll_ctl(), EBADF takes priority over other
-   * errors. Wepoll mimics this behavior. */
-  err_check_handle(ephnd);
-  err_check_handle((HANDLE) sock);
-  return -1;
-}
-
-int epoll_wait(HANDLE ephnd,
-               struct epoll_event* events,
-               int maxevents,
-               int timeout) {
-  ts_tree_node_t* tree_node;
-  port_state_t* port_state;
-  int num_events;
-
-  if (maxevents <= 0)
-    return_set_error(-1, ERROR_INVALID_PARAMETER);
-
-  if (init() < 0)
-    return -1;
-
-  tree_node = ts_tree_find_and_ref(&epoll__handle_tree, (uintptr_t) ephnd);
-  if (tree_node == NULL) {
-    err_set_win_error(ERROR_INVALID_PARAMETER);
-    goto err;
-  }
-
-  port_state = port_state_from_handle_tree_node(tree_node);
-  num_events = port_wait(port_state, events, maxevents, timeout);
-
-  ts_tree_node_unref(tree_node);
-
-  if (num_events < 0)
-    goto err;
-
-  return num_events;
-
-err:
-  err_check_handle(ephnd);
-  return -1;
-}
-
-#include <errno.h>
-
-#define ERR__ERRNO_MAPPINGS(X)               \
-  X(ERROR_ACCESS_DENIED, EACCES)             \
-  X(ERROR_ALREADY_EXISTS, EEXIST)            \
-  X(ERROR_BAD_COMMAND, EACCES)               \
-  X(ERROR_BAD_EXE_FORMAT, ENOEXEC)           \
-  X(ERROR_BAD_LENGTH, EACCES)                \
-  X(ERROR_BAD_NETPATH, ENOENT)               \
-  X(ERROR_BAD_NET_NAME, ENOENT)              \
-  X(ERROR_BAD_NET_RESP, ENETDOWN)            \
-  X(ERROR_BAD_PATHNAME, ENOENT)              \
-  X(ERROR_BROKEN_PIPE, EPIPE)                \
-  X(ERROR_CANNOT_MAKE, EACCES)               \
-  X(ERROR_COMMITMENT_LIMIT, ENOMEM)          \
-  X(ERROR_CONNECTION_ABORTED, ECONNABORTED)  \
-  X(ERROR_CONNECTION_ACTIVE, EISCONN)        \
-  X(ERROR_CONNECTION_REFUSED, ECONNREFUSED)  \
-  X(ERROR_CRC, EACCES)                       \
-  X(ERROR_DIR_NOT_EMPTY, ENOTEMPTY)          \
-  X(ERROR_DISK_FULL, ENOSPC)                 \
-  X(ERROR_DUP_NAME, EADDRINUSE)              \
-  X(ERROR_FILENAME_EXCED_RANGE, ENOENT)      \
-  X(ERROR_FILE_NOT_FOUND, ENOENT)            \
-  X(ERROR_GEN_FAILURE, EACCES)               \
-  X(ERROR_GRACEFUL_DISCONNECT, EPIPE)        \
-  X(ERROR_HOST_DOWN, EHOSTUNREACH)           \
-  X(ERROR_HOST_UNREACHABLE, EHOSTUNREACH)    \
-  X(ERROR_INSUFFICIENT_BUFFER, EFAULT)       \
-  X(ERROR_INVALID_ADDRESS, EADDRNOTAVAIL)    \
-  X(ERROR_INVALID_FUNCTION, EINVAL)          \
-  X(ERROR_INVALID_HANDLE, EBADF)             \
-  X(ERROR_INVALID_NETNAME, EADDRNOTAVAIL)    \
-  X(ERROR_INVALID_PARAMETER, EINVAL)         \
-  X(ERROR_INVALID_USER_BUFFER, EMSGSIZE)     \
-  X(ERROR_IO_PENDING, EINPROGRESS)           \
-  X(ERROR_LOCK_VIOLATION, EACCES)            \
-  X(ERROR_MORE_DATA, EMSGSIZE)               \
-  X(ERROR_NETNAME_DELETED, ECONNABORTED)     \
-  X(ERROR_NETWORK_ACCESS_DENIED, EACCES)     \
-  X(ERROR_NETWORK_BUSY, ENETDOWN)            \
-  X(ERROR_NETWORK_UNREACHABLE, ENETUNREACH)  \
-  X(ERROR_NOACCESS, EFAULT)                  \
-  X(ERROR_NONPAGED_SYSTEM_RESOURCES, ENOMEM) \
-  X(ERROR_NOT_ENOUGH_MEMORY, ENOMEM)         \
-  X(ERROR_NOT_ENOUGH_QUOTA, ENOMEM)          \
-  X(ERROR_NOT_FOUND, ENOENT)                 \
-  X(ERROR_NOT_LOCKED, EACCES)                \
-  X(ERROR_NOT_READY, EACCES)                 \
-  X(ERROR_NOT_SAME_DEVICE, EXDEV)            \
-  X(ERROR_NOT_SUPPORTED, ENOTSUP)            \
-  X(ERROR_NO_MORE_FILES, ENOENT)             \
-  X(ERROR_NO_SYSTEM_RESOURCES, ENOMEM)       \
-  X(ERROR_OPERATION_ABORTED, EINTR)          \
-  X(ERROR_OUT_OF_PAPER, EACCES)              \
-  X(ERROR_PAGED_SYSTEM_RESOURCES, ENOMEM)    \
-  X(ERROR_PAGEFILE_QUOTA, ENOMEM)            \
-  X(ERROR_PATH_NOT_FOUND, ENOENT)            \
-  X(ERROR_PIPE_NOT_CONNECTED, EPIPE)         \
-  X(ERROR_PORT_UNREACHABLE, ECONNRESET)      \
-  X(ERROR_PROTOCOL_UNREACHABLE, ENETUNREACH) \
-  X(ERROR_REM_NOT_LIST, ECONNREFUSED)        \
-  X(ERROR_REQUEST_ABORTED, EINTR)            \
-  X(ERROR_REQ_NOT_ACCEP, EWOULDBLOCK)        \
-  X(ERROR_SECTOR_NOT_FOUND, EACCES)          \
-  X(ERROR_SEM_TIMEOUT, ETIMEDOUT)            \
-  X(ERROR_SHARING_VIOLATION, EACCES)         \
-  X(ERROR_TOO_MANY_NAMES, ENOMEM)            \
-  X(ERROR_TOO_MANY_OPEN_FILES, EMFILE)       \
-  X(ERROR_UNEXP_NET_ERR, ECONNABORTED)       \
-  X(ERROR_WAIT_NO_CHILDREN, ECHILD)          \
-  X(ERROR_WORKING_SET_QUOTA, ENOMEM)         \
-  X(ERROR_WRITE_PROTECT, EACCES)             \
-  X(ERROR_WRONG_DISK, EACCES)                \
-  X(WSAEACCES, EACCES)                       \
-  X(WSAEADDRINUSE, EADDRINUSE)               \
-  X(WSAEADDRNOTAVAIL, EADDRNOTAVAIL)         \
-  X(WSAEAFNOSUPPORT, EAFNOSUPPORT)           \
-  X(WSAECONNABORTED, ECONNABORTED)           \
-  X(WSAECONNREFUSED, ECONNREFUSED)           \
-  X(WSAECONNRESET, ECONNRESET)               \
-  X(WSAEDISCON, EPIPE)                       \
-  X(WSAEFAULT, EFAULT)                       \
-  X(WSAEHOSTDOWN, EHOSTUNREACH)              \
-  X(WSAEHOSTUNREACH, EHOSTUNREACH)           \
-  X(WSAEINPROGRESS, EBUSY)                   \
-  X(WSAEINTR, EINTR)                         \
-  X(WSAEINVAL, EINVAL)                       \
-  X(WSAEISCONN, EISCONN)                     \
-  X(WSAEMSGSIZE, EMSGSIZE)                   \
-  X(WSAENETDOWN, ENETDOWN)                   \
-  X(WSAENETRESET, EHOSTUNREACH)              \
-  X(WSAENETUNREACH, ENETUNREACH)             \
-  X(WSAENOBUFS, ENOMEM)                      \
-  X(WSAENOTCONN, ENOTCONN)                   \
-  X(WSAENOTSOCK, ENOTSOCK)                   \
-  X(WSAEOPNOTSUPP, EOPNOTSUPP)               \
-  X(WSAEPROCLIM, ENOMEM)                     \
-  X(WSAESHUTDOWN, EPIPE)                     \
-  X(WSAETIMEDOUT, ETIMEDOUT)                 \
-  X(WSAEWOULDBLOCK, EWOULDBLOCK)             \
-  X(WSANOTINITIALISED, ENETDOWN)             \
-  X(WSASYSNOTREADY, ENETDOWN)                \
-  X(WSAVERNOTSUPPORTED, ENOSYS)
-
-static errno_t err__map_win_error_to_errno(DWORD error) {
-  switch (error) {
-#define X(error_sym, errno_sym) \
-  case error_sym:               \
-    return errno_sym;
-    ERR__ERRNO_MAPPINGS(X)
-#undef X
-  }
-  return EINVAL;
-}
-
-void err_map_win_error(void) {
-  errno = err__map_win_error_to_errno(GetLastError());
-}
-
-void err_set_win_error(DWORD error) {
-  SetLastError(error);
-  errno = err__map_win_error_to_errno(error);
-}
-
-int err_check_handle(HANDLE handle) {
-  DWORD flags;
-
-  /* GetHandleInformation() succeeds when passed INVALID_HANDLE_VALUE, so check
-   * for this condition explicitly. */
-  if (handle == INVALID_HANDLE_VALUE)
-    return_set_error(-1, ERROR_INVALID_HANDLE);
-
-  if (!GetHandleInformation(handle, &flags))
-    return_map_error(-1);
-
-  return 0;
-}
-
-#include <stddef.h>
-
-#define array_count(a) (sizeof(a) / (sizeof((a)[0])))
-
-#define container_of(ptr, type, member) \
-  ((type*) ((uintptr_t) (ptr) - offsetof(type, member)))
-
-#define unused_var(v) ((void) (v))
-
-/* Polyfill `inline` for older versions of msvc (up to Visual Studio 2013) */
-#if defined(_MSC_VER) && _MSC_VER < 1900
-#define inline __inline
-#endif
-
-WEPOLL_INTERNAL int ws_global_init(void);
-WEPOLL_INTERNAL SOCKET ws_get_base_socket(SOCKET socket);
-
-static bool init__done = false;
-static INIT_ONCE init__once = INIT_ONCE_STATIC_INIT;
-
-static BOOL CALLBACK init__once_callback(INIT_ONCE* once,
-                                         void* parameter,
-                                         void** context) {
-  unused_var(once);
-  unused_var(parameter);
-  unused_var(context);
-
-  /* N.b. that initialization order matters here. */
-  if (ws_global_init() < 0 || nt_global_init() < 0 ||
-      reflock_global_init() < 0 || epoll_global_init() < 0)
-    return FALSE;
-
-  init__done = true;
-  return TRUE;
-}
-
-int init(void) {
-  if (!init__done &&
-      !InitOnceExecuteOnce(&init__once, init__once_callback, NULL, NULL))
-    /* `InitOnceExecuteOnce()` itself is infallible, and it doesn't set any
-     * error code when the once-callback returns FALSE. We return -1 here to
-     * indicate that global initialization failed; the failing init function is
-     * resposible for setting `errno` and calling `SetLastError()`. */
-    return -1;
-
-  return 0;
-}
-
-/* Set up a workaround for the following problem:
- *   FARPROC addr = GetProcAddress(...);
- *   MY_FUNC func = (MY_FUNC) addr;          <-- GCC 8 warning/error.
- *   MY_FUNC func = (MY_FUNC) (void*) addr;  <-- MSVC  warning/error.
- * To compile cleanly with either compiler, do casts with this "bridge" type:
- *   MY_FUNC func = (MY_FUNC) (nt__fn_ptr_cast_t) addr; */
-#ifdef __GNUC__
-typedef void* nt__fn_ptr_cast_t;
-#else
-typedef FARPROC nt__fn_ptr_cast_t;
-#endif
-
-#define X(return_type, attributes, name, parameters) \
-  WEPOLL_INTERNAL return_type(attributes* name) parameters = NULL;
-NT_NTDLL_IMPORT_LIST(X)
-#undef X
-
-int nt_global_init(void) {
-  HMODULE ntdll;
-  FARPROC fn_ptr;
-
-  ntdll = GetModuleHandleW(L"ntdll.dll");
-  if (ntdll == NULL)
-    return -1;
-
-#define X(return_type, attributes, name, parameters) \
-  fn_ptr = GetProcAddress(ntdll, #name);             \
-  if (fn_ptr == NULL)                                \
-    return -1;                                       \
-  name = (return_type(attributes*) parameters)(nt__fn_ptr_cast_t) fn_ptr;
-  NT_NTDLL_IMPORT_LIST(X)
-#undef X
-
-  return 0;
-}
-
-#include <string.h>
-
-typedef struct poll_group poll_group_t;
-
-typedef struct queue_node queue_node_t;
-
-WEPOLL_INTERNAL poll_group_t* poll_group_acquire(port_state_t* port);
-WEPOLL_INTERNAL void poll_group_release(poll_group_t* poll_group);
-
-WEPOLL_INTERNAL void poll_group_delete(poll_group_t* poll_group);
-
-WEPOLL_INTERNAL poll_group_t* poll_group_from_queue_node(
-    queue_node_t* queue_node);
-WEPOLL_INTERNAL HANDLE
-    poll_group_get_afd_device_handle(poll_group_t* poll_group);
-
-typedef struct queue_node {
-  queue_node_t* prev;
-  queue_node_t* next;
-} queue_node_t;
-
-typedef struct queue {
-  queue_node_t head;
-} queue_t;
-
-WEPOLL_INTERNAL void queue_init(queue_t* queue);
-WEPOLL_INTERNAL void queue_node_init(queue_node_t* node);
-
-WEPOLL_INTERNAL queue_node_t* queue_first(const queue_t* queue);
-WEPOLL_INTERNAL queue_node_t* queue_last(const queue_t* queue);
-
-WEPOLL_INTERNAL void queue_prepend(queue_t* queue, queue_node_t* node);
-WEPOLL_INTERNAL void queue_append(queue_t* queue, queue_node_t* node);
-WEPOLL_INTERNAL void queue_move_to_start(queue_t* queue, queue_node_t* node);
-WEPOLL_INTERNAL void queue_move_to_end(queue_t* queue, queue_node_t* node);
-WEPOLL_INTERNAL void queue_remove(queue_node_t* node);
-
-WEPOLL_INTERNAL bool queue_is_empty(const queue_t* queue);
-WEPOLL_INTERNAL bool queue_is_enqueued(const queue_node_t* node);
-
-#define POLL_GROUP__MAX_GROUP_SIZE 32
-
-typedef struct poll_group {
-  port_state_t* port_state;
-  queue_node_t queue_node;
-  HANDLE afd_device_handle;
-  size_t group_size;
-} poll_group_t;
-
-static poll_group_t* poll_group__new(port_state_t* port_state) {
-  HANDLE iocp_handle = port_get_iocp_handle(port_state);
-  queue_t* poll_group_queue = port_get_poll_group_queue(port_state);
-
-  poll_group_t* poll_group = malloc(sizeof *poll_group);
-  if (poll_group == NULL)
-    return_set_error(NULL, ERROR_NOT_ENOUGH_MEMORY);
-
-  memset(poll_group, 0, sizeof *poll_group);
-
-  queue_node_init(&poll_group->queue_node);
-  poll_group->port_state = port_state;
-
-  if (afd_create_device_handle(iocp_handle, &poll_group->afd_device_handle) <
-      0) {
-    free(poll_group);
-    return NULL;
-  }
-
-  queue_append(poll_group_queue, &poll_group->queue_node);
-
-  return poll_group;
-}
-
-void poll_group_delete(poll_group_t* poll_group) {
-  assert(poll_group->group_size == 0);
-  CloseHandle(poll_group->afd_device_handle);
-  queue_remove(&poll_group->queue_node);
-  free(poll_group);
-}
-
-poll_group_t* poll_group_from_queue_node(queue_node_t* queue_node) {
-  return container_of(queue_node, poll_group_t, queue_node);
-}
-
-HANDLE poll_group_get_afd_device_handle(poll_group_t* poll_group) {
-  return poll_group->afd_device_handle;
-}
-
-poll_group_t* poll_group_acquire(port_state_t* port_state) {
-  queue_t* poll_group_queue = port_get_poll_group_queue(port_state);
-  poll_group_t* poll_group =
-      !queue_is_empty(poll_group_queue)
-          ? container_of(
-                queue_last(poll_group_queue), poll_group_t, queue_node)
-          : NULL;
-
-  if (poll_group == NULL ||
-      poll_group->group_size >= POLL_GROUP__MAX_GROUP_SIZE)
-    poll_group = poll_group__new(port_state);
-  if (poll_group == NULL)
-    return NULL;
-
-  if (++poll_group->group_size == POLL_GROUP__MAX_GROUP_SIZE)
-    queue_move_to_start(poll_group_queue, &poll_group->queue_node);
-
-  return poll_group;
-}
-
-void poll_group_release(poll_group_t* poll_group) {
-  port_state_t* port_state = poll_group->port_state;
-  queue_t* poll_group_queue = port_get_poll_group_queue(port_state);
-
-  poll_group->group_size--;
-  assert(poll_group->group_size < POLL_GROUP__MAX_GROUP_SIZE);
-
-  queue_move_to_end(poll_group_queue, &poll_group->queue_node);
-
-  /* Poll groups are currently only freed when the epoll port is closed. */
-}
-
-WEPOLL_INTERNAL sock_state_t* sock_new(port_state_t* port_state,
-                                       SOCKET socket);
-WEPOLL_INTERNAL void sock_delete(port_state_t* port_state,
-                                 sock_state_t* sock_state);
-WEPOLL_INTERNAL void sock_force_delete(port_state_t* port_state,
-                                       sock_state_t* sock_state);
-
-WEPOLL_INTERNAL int sock_set_event(port_state_t* port_state,
-                                   sock_state_t* sock_state,
-                                   const struct epoll_event* ev);
-
-WEPOLL_INTERNAL int sock_update(port_state_t* port_state,
-                                sock_state_t* sock_state);
-WEPOLL_INTERNAL int sock_feed_event(port_state_t* port_state,
-                                    IO_STATUS_BLOCK* io_status_block,
-                                    struct epoll_event* ev);
-
-WEPOLL_INTERNAL sock_state_t* sock_state_from_queue_node(
-    queue_node_t* queue_node);
-WEPOLL_INTERNAL queue_node_t* sock_state_to_queue_node(
-    sock_state_t* sock_state);
-WEPOLL_INTERNAL sock_state_t* sock_state_from_tree_node(
-    tree_node_t* tree_node);
-WEPOLL_INTERNAL tree_node_t* sock_state_to_tree_node(sock_state_t* sock_state);
-
-#define PORT__MAX_ON_STACK_COMPLETIONS 256
-
-typedef struct port_state {
-  HANDLE iocp_handle;
-  tree_t sock_tree;
-  queue_t sock_update_queue;
-  queue_t sock_deleted_queue;
-  queue_t poll_group_queue;
-  ts_tree_node_t handle_tree_node;
-  CRITICAL_SECTION lock;
-  size_t active_poll_count;
-} port_state_t;
-
-static inline port_state_t* port__alloc(void) {
-  port_state_t* port_state = malloc(sizeof *port_state);
-  if (port_state == NULL)
-    return_set_error(NULL, ERROR_NOT_ENOUGH_MEMORY);
-
-  return port_state;
-}
-
-static inline void port__free(port_state_t* port) {
-  assert(port != NULL);
-  free(port);
-}
-
-static inline HANDLE port__create_iocp(void) {
-  HANDLE iocp_handle =
-      CreateIoCompletionPort(INVALID_HANDLE_VALUE, NULL, 0, 0);
-  if (iocp_handle == NULL)
-    return_map_error(NULL);
-
-  return iocp_handle;
-}
-
-port_state_t* port_new(HANDLE* iocp_handle_out) {
-  port_state_t* port_state;
-  HANDLE iocp_handle;
-
-  port_state = port__alloc();
-  if (port_state == NULL)
-    goto err1;
-
-  iocp_handle = port__create_iocp();
-  if (iocp_handle == NULL)
-    goto err2;
-
-  memset(port_state, 0, sizeof *port_state);
-
-  port_state->iocp_handle = iocp_handle;
-  tree_init(&port_state->sock_tree);
-  queue_init(&port_state->sock_update_queue);
-  queue_init(&port_state->sock_deleted_queue);
-  queue_init(&port_state->poll_group_queue);
-  ts_tree_node_init(&port_state->handle_tree_node);
-  InitializeCriticalSection(&port_state->lock);
-
-  *iocp_handle_out = iocp_handle;
-  return port_state;
-
-err2:
-  port__free(port_state);
-err1:
-  return NULL;
-}
-
-static inline int port__close_iocp(port_state_t* port_state) {
-  HANDLE iocp_handle = port_state->iocp_handle;
-  port_state->iocp_handle = NULL;
-
-  if (!CloseHandle(iocp_handle))
-    return_map_error(-1);
-
-  return 0;
-}
-
-int port_close(port_state_t* port_state) {
-  int result;
-
-  EnterCriticalSection(&port_state->lock);
-  result = port__close_iocp(port_state);
-  LeaveCriticalSection(&port_state->lock);
-
-  return result;
-}
-
-int port_delete(port_state_t* port_state) {
-  tree_node_t* tree_node;
-  queue_node_t* queue_node;
-
-  /* At this point the IOCP port should have been closed. */
-  assert(port_state->iocp_handle == NULL);
-
-  while ((tree_node = tree_root(&port_state->sock_tree)) != NULL) {
-    sock_state_t* sock_state = sock_state_from_tree_node(tree_node);
-    sock_force_delete(port_state, sock_state);
-  }
-
-  while ((queue_node = queue_first(&port_state->sock_deleted_queue)) != NULL) {
-    sock_state_t* sock_state = sock_state_from_queue_node(queue_node);
-    sock_force_delete(port_state, sock_state);
-  }
-
-  while ((queue_node = queue_first(&port_state->poll_group_queue)) != NULL) {
-    poll_group_t* poll_group = poll_group_from_queue_node(queue_node);
-    poll_group_delete(poll_group);
-  }
-
-  assert(queue_is_empty(&port_state->sock_update_queue));
-
-  DeleteCriticalSection(&port_state->lock);
-
-  port__free(port_state);
-
-  return 0;
-}
-
-static int port__update_events(port_state_t* port_state) {
-  queue_t* sock_update_queue = &port_state->sock_update_queue;
-
-  /* Walk the queue, submitting new poll requests for every socket that needs
-   * it. */
-  while (!queue_is_empty(sock_update_queue)) {
-    queue_node_t* queue_node = queue_first(sock_update_queue);
-    sock_state_t* sock_state = sock_state_from_queue_node(queue_node);
-
-    if (sock_update(port_state, sock_state) < 0)
-      return -1;
-
-    /* sock_update() removes the socket from the update queue. */
-  }
-
-  return 0;
-}
-
-static inline void port__update_events_if_polling(port_state_t* port_state) {
-  if (port_state->active_poll_count > 0)
-    port__update_events(port_state);
-}
-
-static inline int port__feed_events(port_state_t* port_state,
-                                    struct epoll_event* epoll_events,
-                                    OVERLAPPED_ENTRY* iocp_events,
-                                    DWORD iocp_event_count) {
-  int epoll_event_count = 0;
-  DWORD i;
-
-  for (i = 0; i < iocp_event_count; i++) {
-    IO_STATUS_BLOCK* io_status_block =
-        (IO_STATUS_BLOCK*) iocp_events[i].lpOverlapped;
-    struct epoll_event* ev = &epoll_events[epoll_event_count];
-
-    epoll_event_count += sock_feed_event(port_state, io_status_block, ev);
-  }
-
-  return epoll_event_count;
-}
-
-static inline int port__poll(port_state_t* port_state,
-                             struct epoll_event* epoll_events,
-                             OVERLAPPED_ENTRY* iocp_events,
-                             DWORD maxevents,
-                             DWORD timeout) {
-  DWORD completion_count;
-
-  if (port__update_events(port_state) < 0)
-    return -1;
-
-  port_state->active_poll_count++;
-
-  LeaveCriticalSection(&port_state->lock);
-
-  BOOL r = GetQueuedCompletionStatusEx(port_state->iocp_handle,
-                                       iocp_events,
-                                       maxevents,
-                                       &completion_count,
-                                       timeout,
-                                       FALSE);
-
-  EnterCriticalSection(&port_state->lock);
-
-  port_state->active_poll_count--;
-
-  if (!r)
-    return_map_error(-1);
-
-  return port__feed_events(
-      port_state, epoll_events, iocp_events, completion_count);
-}
-
-int port_wait(port_state_t* port_state,
-              struct epoll_event* events,
-              int maxevents,
-              int timeout) {
-  OVERLAPPED_ENTRY stack_iocp_events[PORT__MAX_ON_STACK_COMPLETIONS];
-  OVERLAPPED_ENTRY* iocp_events;
-  uint64_t due = 0;
-  DWORD gqcs_timeout;
-  int result;
-
-  /* Check whether `maxevents` is in range. */
-  if (maxevents <= 0)
-    return_set_error(-1, ERROR_INVALID_PARAMETER);
-
-  /* Decide whether the IOCP completion list can live on the stack, or allocate
-   * memory for it on the heap. */
-  if ((size_t) maxevents <= array_count(stack_iocp_events)) {
-    iocp_events = stack_iocp_events;
-  } else if ((iocp_events =
-                  malloc((size_t) maxevents * sizeof *iocp_events)) == NULL) {
-    iocp_events = stack_iocp_events;
-    maxevents = array_count(stack_iocp_events);
-  }
-
-  /* Compute the timeout for GetQueuedCompletionStatus, and the wait end
-   * time, if the user specified a timeout other than zero or infinite. */
-  if (timeout > 0) {
-    due = GetTickCount64() + (uint64_t) timeout;
-    gqcs_timeout = (DWORD) timeout;
-  } else if (timeout == 0) {
-    gqcs_timeout = 0;
-  } else {
-    gqcs_timeout = INFINITE;
-  }
-
-  EnterCriticalSection(&port_state->lock);
-
-  /* Dequeue completion packets until either at least one interesting event
-   * has been discovered, or the timeout is reached. */
-  for (;;) {
-    uint64_t now;
-
-    result = port__poll(
-        port_state, events, iocp_events, (DWORD) maxevents, gqcs_timeout);
-    if (result < 0 || result > 0)
-      break; /* Result, error, or time-out. */
-
-    if (timeout < 0)
-      continue; /* When timeout is negative, never time out. */
-
-    /* Update time. */
-    now = GetTickCount64();
-
-    /* Do not allow the due time to be in the past. */
-    if (now >= due) {
-      SetLastError(WAIT_TIMEOUT);
-      break;
-    }
-
-    /* Recompute time-out argument for GetQueuedCompletionStatus. */
-    gqcs_timeout = (DWORD)(due - now);
-  }
-
-  port__update_events_if_polling(port_state);
-
-  LeaveCriticalSection(&port_state->lock);
-
-  if (iocp_events != stack_iocp_events)
-    free(iocp_events);
-
-  if (result >= 0)
-    return result;
-  else if (GetLastError() == WAIT_TIMEOUT)
-    return 0;
-  else
-    return -1;
-}
-
-static inline int port__ctl_add(port_state_t* port_state,
-                                SOCKET sock,
-                                struct epoll_event* ev) {
-  sock_state_t* sock_state = sock_new(port_state, sock);
-  if (sock_state == NULL)
-    return -1;
-
-  if (sock_set_event(port_state, sock_state, ev) < 0) {
-    sock_delete(port_state, sock_state);
-    return -1;
-  }
-
-  port__update_events_if_polling(port_state);
-
-  return 0;
-}
-
-static inline int port__ctl_mod(port_state_t* port_state,
-                                SOCKET sock,
-                                struct epoll_event* ev) {
-  sock_state_t* sock_state = port_find_socket(port_state, sock);
-  if (sock_state == NULL)
-    return -1;
-
-  if (sock_set_event(port_state, sock_state, ev) < 0)
-    return -1;
-
-  port__update_events_if_polling(port_state);
-
-  return 0;
-}
-
-static inline int port__ctl_del(port_state_t* port_state, SOCKET sock) {
-  sock_state_t* sock_state = port_find_socket(port_state, sock);
-  if (sock_state == NULL)
-    return -1;
-
-  sock_delete(port_state, sock_state);
-
-  return 0;
-}
-
-static inline int port__ctl_op(port_state_t* port_state,
-                               int op,
-                               SOCKET sock,
-                               struct epoll_event* ev) {
-  switch (op) {
-    case EPOLL_CTL_ADD:
-      return port__ctl_add(port_state, sock, ev);
-    case EPOLL_CTL_MOD:
-      return port__ctl_mod(port_state, sock, ev);
-    case EPOLL_CTL_DEL:
-      return port__ctl_del(port_state, sock);
-    default:
-      return_set_error(-1, ERROR_INVALID_PARAMETER);
-  }
-}
-
-int port_ctl(port_state_t* port_state,
-             int op,
-             SOCKET sock,
-             struct epoll_event* ev) {
-  int result;
-
-  EnterCriticalSection(&port_state->lock);
-  result = port__ctl_op(port_state, op, sock, ev);
-  LeaveCriticalSection(&port_state->lock);
-
-  return result;
-}
-
-int port_register_socket(port_state_t* port_state,
-                         sock_state_t* sock_state,
-                         SOCKET socket) {
-  if (tree_add(&port_state->sock_tree,
-               sock_state_to_tree_node(sock_state),
-               socket) < 0)
-    return_set_error(-1, ERROR_ALREADY_EXISTS);
-  return 0;
-}
-
-void port_unregister_socket(port_state_t* port_state,
-                            sock_state_t* sock_state) {
-  tree_del(&port_state->sock_tree, sock_state_to_tree_node(sock_state));
-}
-
-sock_state_t* port_find_socket(port_state_t* port_state, SOCKET socket) {
-  tree_node_t* tree_node = tree_find(&port_state->sock_tree, socket);
-  if (tree_node == NULL)
-    return_set_error(NULL, ERROR_NOT_FOUND);
-  return sock_state_from_tree_node(tree_node);
-}
-
-void port_request_socket_update(port_state_t* port_state,
-                                sock_state_t* sock_state) {
-  if (queue_is_enqueued(sock_state_to_queue_node(sock_state)))
-    return;
-  queue_append(&port_state->sock_update_queue,
-               sock_state_to_queue_node(sock_state));
-}
-
-void port_cancel_socket_update(port_state_t* port_state,
-                               sock_state_t* sock_state) {
-  unused_var(port_state);
-  if (!queue_is_enqueued(sock_state_to_queue_node(sock_state)))
-    return;
-  queue_remove(sock_state_to_queue_node(sock_state));
-}
-
-void port_add_deleted_socket(port_state_t* port_state,
-                             sock_state_t* sock_state) {
-  if (queue_is_enqueued(sock_state_to_queue_node(sock_state)))
-    return;
-  queue_append(&port_state->sock_deleted_queue,
-               sock_state_to_queue_node(sock_state));
-}
-
-void port_remove_deleted_socket(port_state_t* port_state,
-                                sock_state_t* sock_state) {
-  unused_var(port_state);
-  if (!queue_is_enqueued(sock_state_to_queue_node(sock_state)))
-    return;
-  queue_remove(sock_state_to_queue_node(sock_state));
-}
-
-HANDLE port_get_iocp_handle(port_state_t* port_state) {
-  assert(port_state->iocp_handle != NULL);
-  return port_state->iocp_handle;
-}
-
-queue_t* port_get_poll_group_queue(port_state_t* port_state) {
-  return &port_state->poll_group_queue;
-}
-
-port_state_t* port_state_from_handle_tree_node(ts_tree_node_t* tree_node) {
-  return container_of(tree_node, port_state_t, handle_tree_node);
-}
-
-ts_tree_node_t* port_state_to_handle_tree_node(port_state_t* port_state) {
-  return &port_state->handle_tree_node;
-}
-
-void queue_init(queue_t* queue) {
-  queue_node_init(&queue->head);
-}
-
-void queue_node_init(queue_node_t* node) {
-  node->prev = node;
-  node->next = node;
-}
-
-static inline void queue__detach_node(queue_node_t* node) {
-  node->prev->next = node->next;
-  node->next->prev = node->prev;
-}
-
-queue_node_t* queue_first(const queue_t* queue) {
-  return !queue_is_empty(queue) ? queue->head.next : NULL;
-}
-
-queue_node_t* queue_last(const queue_t* queue) {
-  return !queue_is_empty(queue) ? queue->head.prev : NULL;
-}
-
-void queue_prepend(queue_t* queue, queue_node_t* node) {
-  node->next = queue->head.next;
-  node->prev = &queue->head;
-  node->next->prev = node;
-  queue->head.next = node;
-}
-
-void queue_append(queue_t* queue, queue_node_t* node) {
-  node->next = &queue->head;
-  node->prev = queue->head.prev;
-  node->prev->next = node;
-  queue->head.prev = node;
-}
-
-void queue_move_to_start(queue_t* queue, queue_node_t* node) {
-  queue__detach_node(node);
-  queue_prepend(queue, node);
-}
-
-void queue_move_to_end(queue_t* queue, queue_node_t* node) {
-  queue__detach_node(node);
-  queue_append(queue, node);
-}
-
-void queue_remove(queue_node_t* node) {
-  queue__detach_node(node);
-  queue_node_init(node);
-}
-
-bool queue_is_empty(const queue_t* queue) {
-  return !queue_is_enqueued(&queue->head);
-}
-
-bool queue_is_enqueued(const queue_node_t* node) {
-  return node->prev != node;
-}
-
-#define REFLOCK__REF          ((long) 0x00000001UL)
-#define REFLOCK__REF_MASK     ((long) 0x0fffffffUL)
-#define REFLOCK__DESTROY      ((long) 0x10000000UL)
-#define REFLOCK__DESTROY_MASK ((long) 0xf0000000UL)
-#define REFLOCK__POISON       ((long) 0x300dead0UL)
-
-static HANDLE reflock__keyed_event = NULL;
-
-int reflock_global_init(void) {
-  NTSTATUS status = NtCreateKeyedEvent(
-      &reflock__keyed_event, KEYEDEVENT_ALL_ACCESS, NULL, 0);
-  if (status != STATUS_SUCCESS)
-    return_set_error(-1, RtlNtStatusToDosError(status));
-  return 0;
-}
-
-void reflock_init(reflock_t* reflock) {
-  reflock->state = 0;
-}
-
-static void reflock__signal_event(void* address) {
-  NTSTATUS status =
-      NtReleaseKeyedEvent(reflock__keyed_event, address, FALSE, NULL);
-  if (status != STATUS_SUCCESS)
-    abort();
-}
-
-static void reflock__await_event(void* address) {
-  NTSTATUS status =
-      NtWaitForKeyedEvent(reflock__keyed_event, address, FALSE, NULL);
-  if (status != STATUS_SUCCESS)
-    abort();
-}
-
-void reflock_ref(reflock_t* reflock) {
-  long state = InterlockedAdd(&reflock->state, REFLOCK__REF);
-
-  /* Verify that the counter didn't overflow and the lock isn't destroyed. */
-  assert((state & REFLOCK__DESTROY_MASK) == 0);
-  unused_var(state);
-}
-
-void reflock_unref(reflock_t* reflock) {
-  long state = InterlockedAdd(&reflock->state, -REFLOCK__REF);
-
-  /* Verify that the lock was referenced and not already destroyed. */
-  assert((state & REFLOCK__DESTROY_MASK & ~REFLOCK__DESTROY) == 0);
-
-  if (state == REFLOCK__DESTROY)
-    reflock__signal_event(reflock);
-}
-
-void reflock_unref_and_destroy(reflock_t* reflock) {
-  long state =
-      InterlockedAdd(&reflock->state, REFLOCK__DESTROY - REFLOCK__REF);
-  long ref_count = state & REFLOCK__REF_MASK;
-
-  /* Verify that the lock was referenced and not already destroyed. */
-  assert((state & REFLOCK__DESTROY_MASK) == REFLOCK__DESTROY);
-
-  if (ref_count != 0)
-    reflock__await_event(reflock);
-
-  state = InterlockedExchange(&reflock->state, REFLOCK__POISON);
-  assert(state == REFLOCK__DESTROY);
-}
-
-#define SOCK__KNOWN_EPOLL_EVENTS                                       \
-  (EPOLLIN | EPOLLPRI | EPOLLOUT | EPOLLERR | EPOLLHUP | EPOLLRDNORM | \
-   EPOLLRDBAND | EPOLLWRNORM | EPOLLWRBAND | EPOLLMSG | EPOLLRDHUP)
-
-typedef enum sock__poll_status {
-  SOCK__POLL_IDLE = 0,
-  SOCK__POLL_PENDING,
-  SOCK__POLL_CANCELLED
-} sock__poll_status_t;
-
-typedef struct sock_state {
-  IO_STATUS_BLOCK io_status_block;
-  AFD_POLL_INFO poll_info;
-  queue_node_t queue_node;
-  tree_node_t tree_node;
-  poll_group_t* poll_group;
-  SOCKET base_socket;
-  epoll_data_t user_data;
-  uint32_t user_events;
-  uint32_t pending_events;
-  sock__poll_status_t poll_status;
-  bool delete_pending;
-} sock_state_t;
-
-static inline sock_state_t* sock__alloc(void) {
-  sock_state_t* sock_state = malloc(sizeof *sock_state);
-  if (sock_state == NULL)
-    return_set_error(NULL, ERROR_NOT_ENOUGH_MEMORY);
-  return sock_state;
-}
-
-static inline void sock__free(sock_state_t* sock_state) {
-  assert(sock_state != NULL);
-  free(sock_state);
-}
-
-static inline int sock__cancel_poll(sock_state_t* sock_state) {
-  assert(sock_state->poll_status == SOCK__POLL_PENDING);
-
-  if (afd_cancel_poll(poll_group_get_afd_device_handle(sock_state->poll_group),
-                      &sock_state->io_status_block) < 0)
-    return -1;
-
-  sock_state->poll_status = SOCK__POLL_CANCELLED;
-  sock_state->pending_events = 0;
-  return 0;
-}
-
-sock_state_t* sock_new(port_state_t* port_state, SOCKET socket) {
-  SOCKET base_socket;
-  poll_group_t* poll_group;
-  sock_state_t* sock_state;
-
-  if (socket == 0 || socket == INVALID_SOCKET)
-    return_set_error(NULL, ERROR_INVALID_HANDLE);
-
-  base_socket = ws_get_base_socket(socket);
-  if (base_socket == INVALID_SOCKET)
-    return NULL;
-
-  poll_group = poll_group_acquire(port_state);
-  if (poll_group == NULL)
-    return NULL;
-
-  sock_state = sock__alloc();
-  if (sock_state == NULL)
-    goto err1;
-
-  memset(sock_state, 0, sizeof *sock_state);
-
-  sock_state->base_socket = base_socket;
-  sock_state->poll_group = poll_group;
-
-  tree_node_init(&sock_state->tree_node);
-  queue_node_init(&sock_state->queue_node);
-
-  if (port_register_socket(port_state, sock_state, socket) < 0)
-    goto err2;
-
-  return sock_state;
-
-err2:
-  sock__free(sock_state);
-err1:
-  poll_group_release(poll_group);
-
-  return NULL;
-}
-
-static int sock__delete(port_state_t* port_state,
-                        sock_state_t* sock_state,
-                        bool force) {
-  if (!sock_state->delete_pending) {
-    if (sock_state->poll_status == SOCK__POLL_PENDING)
-      sock__cancel_poll(sock_state);
-
-    port_cancel_socket_update(port_state, sock_state);
-    port_unregister_socket(port_state, sock_state);
-
-    sock_state->delete_pending = true;
-  }
-
-  /* If the poll request still needs to complete, the sock_state object can't
-   * be free()d yet. `sock_feed_event()` or `port_close()` will take care
-   * of this later. */
-  if (force || sock_state->poll_status == SOCK__POLL_IDLE) {
-    /* Free the sock_state now. */
-    port_remove_deleted_socket(port_state, sock_state);
-    poll_group_release(sock_state->poll_group);
-    sock__free(sock_state);
-  } else {
-    /* Free the socket later. */
-    port_add_deleted_socket(port_state, sock_state);
-  }
-
-  return 0;
-}
-
-void sock_delete(port_state_t* port_state, sock_state_t* sock_state) {
-  sock__delete(port_state, sock_state, false);
-}
-
-void sock_force_delete(port_state_t* port_state, sock_state_t* sock_state) {
-  sock__delete(port_state, sock_state, true);
-}
-
-int sock_set_event(port_state_t* port_state,
-                   sock_state_t* sock_state,
-                   const struct epoll_event* ev) {
-  /* EPOLLERR and EPOLLHUP are always reported, even when not requested by the
-   * caller. However they are disabled after a event has been reported for a
-   * socket for which the EPOLLONESHOT flag was set. */
-  uint32_t events = ev->events | EPOLLERR | EPOLLHUP;
-
-  sock_state->user_events = events;
-  sock_state->user_data = ev->data;
-
-  if ((events & SOCK__KNOWN_EPOLL_EVENTS & ~sock_state->pending_events) != 0)
-    port_request_socket_update(port_state, sock_state);
-
-  return 0;
-}
-
-static inline DWORD sock__epoll_events_to_afd_events(uint32_t epoll_events) {
-  /* Always monitor for AFD_POLL_LOCAL_CLOSE, which is triggered when the
-   * socket is closed with closesocket() or CloseHandle(). */
-  DWORD afd_events = AFD_POLL_LOCAL_CLOSE;
-
-  if (epoll_events & (EPOLLIN | EPOLLRDNORM))
-    afd_events |= AFD_POLL_RECEIVE | AFD_POLL_ACCEPT;
-  if (epoll_events & (EPOLLPRI | EPOLLRDBAND))
-    afd_events |= AFD_POLL_RECEIVE_EXPEDITED;
-  if (epoll_events & (EPOLLOUT | EPOLLWRNORM | EPOLLWRBAND))
-    afd_events |= AFD_POLL_SEND;
-  if (epoll_events & (EPOLLIN | EPOLLRDNORM | EPOLLRDHUP))
-    afd_events |= AFD_POLL_DISCONNECT;
-  if (epoll_events & EPOLLHUP)
-    afd_events |= AFD_POLL_ABORT;
-  if (epoll_events & EPOLLERR)
-    afd_events |= AFD_POLL_CONNECT_FAIL;
-
-  return afd_events;
-}
-
-static inline uint32_t sock__afd_events_to_epoll_events(DWORD afd_events) {
-  uint32_t epoll_events = 0;
-
-  if (afd_events & (AFD_POLL_RECEIVE | AFD_POLL_ACCEPT))
-    epoll_events |= EPOLLIN | EPOLLRDNORM;
-  if (afd_events & AFD_POLL_RECEIVE_EXPEDITED)
-    epoll_events |= EPOLLPRI | EPOLLRDBAND;
-  if (afd_events & AFD_POLL_SEND)
-    epoll_events |= EPOLLOUT | EPOLLWRNORM | EPOLLWRBAND;
-  if (afd_events & AFD_POLL_DISCONNECT)
-    epoll_events |= EPOLLIN | EPOLLRDNORM | EPOLLRDHUP;
-  if (afd_events & AFD_POLL_ABORT)
-    epoll_events |= EPOLLHUP;
-  if (afd_events & AFD_POLL_CONNECT_FAIL)
-    /* Linux reports all these events after connect() has failed. */
-    epoll_events |=
-        EPOLLIN | EPOLLOUT | EPOLLERR | EPOLLRDNORM | EPOLLWRNORM | EPOLLRDHUP;
-
-  return epoll_events;
-}
-
-int sock_update(port_state_t* port_state, sock_state_t* sock_state) {
-  assert(!sock_state->delete_pending);
-
-  if ((sock_state->poll_status == SOCK__POLL_PENDING) &&
-      (sock_state->user_events & SOCK__KNOWN_EPOLL_EVENTS &
-       ~sock_state->pending_events) == 0) {
-    /* All the events the user is interested in are already being monitored by
-     * the pending poll operation. It might spuriously complete because of an
-     * event that we're no longer interested in; when that happens we'll submit
-     * a new poll operation with the updated event mask. */
-
-  } else if (sock_state->poll_status == SOCK__POLL_PENDING) {
-    /* A poll operation is already pending, but it's not monitoring for all the
-     * events that the user is interested in. Therefore, cancel the pending
-     * poll operation; when we receive it's completion package, a new poll
-     * operation will be submitted with the correct event mask. */
-    if (sock__cancel_poll(sock_state) < 0)
-      return -1;
-
-  } else if (sock_state->poll_status == SOCK__POLL_CANCELLED) {
-    /* The poll operation has already been cancelled, we're still waiting for
-     * it to return. For now, there's nothing that needs to be done. */
-
-  } else if (sock_state->poll_status == SOCK__POLL_IDLE) {
-    /* No poll operation is pending; start one. */
-    sock_state->poll_info.Exclusive = FALSE;
-    sock_state->poll_info.NumberOfHandles = 1;
-    sock_state->poll_info.Timeout.QuadPart = INT64_MAX;
-    sock_state->poll_info.Handles[0].Handle = (HANDLE) sock_state->base_socket;
-    sock_state->poll_info.Handles[0].Status = 0;
-    sock_state->poll_info.Handles[0].Events =
-        sock__epoll_events_to_afd_events(sock_state->user_events);
-
-    if (afd_poll(poll_group_get_afd_device_handle(sock_state->poll_group),
-                 &sock_state->poll_info,
-                 &sock_state->io_status_block) < 0) {
-      switch (GetLastError()) {
-        case ERROR_IO_PENDING:
-          /* Overlapped poll operation in progress; this is expected. */
-          break;
-        case ERROR_INVALID_HANDLE:
-          /* Socket closed; it'll be dropped from the epoll set. */
-          return sock__delete(port_state, sock_state, false);
-        default:
-          /* Other errors are propagated to the caller. */
-          return_map_error(-1);
-      }
-    }
-
-    /* The poll request was successfully submitted. */
-    sock_state->poll_status = SOCK__POLL_PENDING;
-    sock_state->pending_events = sock_state->user_events;
-
-  } else {
-    /* Unreachable. */
-    assert(false);
-  }
-
-  port_cancel_socket_update(port_state, sock_state);
-  return 0;
-}
-
-int sock_feed_event(port_state_t* port_state,
-                    IO_STATUS_BLOCK* io_status_block,
-                    struct epoll_event* ev) {
-  sock_state_t* sock_state =
-      container_of(io_status_block, sock_state_t, io_status_block);
-  AFD_POLL_INFO* poll_info = &sock_state->poll_info;
-  uint32_t epoll_events = 0;
-
-  sock_state->poll_status = SOCK__POLL_IDLE;
-  sock_state->pending_events = 0;
-
-  if (sock_state->delete_pending) {
-    /* Socket has been deleted earlier and can now be freed. */
-    return sock__delete(port_state, sock_state, false);
-
-  } else if (io_status_block->Status == STATUS_CANCELLED) {
-    /* The poll request was cancelled by CancelIoEx. */
-
-  } else if (!NT_SUCCESS(io_status_block->Status)) {
-    /* The overlapped request itself failed in an unexpected way. */
-    epoll_events = EPOLLERR;
-
-  } else if (poll_info->NumberOfHandles < 1) {
-    /* This poll operation succeeded but didn't report any socket events. */
-
-  } else if (poll_info->Handles[0].Events & AFD_POLL_LOCAL_CLOSE) {
-    /* The poll operation reported that the socket was closed. */
-    return sock__delete(port_state, sock_state, false);
-
-  } else {
-    /* Events related to our socket were reported. */
-    epoll_events =
-        sock__afd_events_to_epoll_events(poll_info->Handles[0].Events);
-  }
-
-  /* Requeue the socket so a new poll request will be submitted. */
-  port_request_socket_update(port_state, sock_state);
-
-  /* Filter out events that the user didn't ask for. */
-  epoll_events &= sock_state->user_events;
-
-  /* Return if there are no epoll events to report. */
-  if (epoll_events == 0)
-    return 0;
-
-  /* If the the socket has the EPOLLONESHOT flag set, unmonitor all events,
-   * even EPOLLERR and EPOLLHUP. But always keep looking for closed sockets. */
-  if (sock_state->user_events & EPOLLONESHOT)
-    sock_state->user_events = 0;
-
-  ev->data = sock_state->user_data;
-  ev->events = epoll_events;
-  return 1;
-}
-
-sock_state_t* sock_state_from_queue_node(queue_node_t* queue_node) {
-  return container_of(queue_node, sock_state_t, queue_node);
-}
-
-queue_node_t* sock_state_to_queue_node(sock_state_t* sock_state) {
-  return &sock_state->queue_node;
-}
-
-sock_state_t* sock_state_from_tree_node(tree_node_t* tree_node) {
-  return container_of(tree_node, sock_state_t, tree_node);
-}
-
-tree_node_t* sock_state_to_tree_node(sock_state_t* sock_state) {
-  return &sock_state->tree_node;
-}
-
-void ts_tree_init(ts_tree_t* ts_tree) {
-  tree_init(&ts_tree->tree);
-  InitializeSRWLock(&ts_tree->lock);
-}
-
-void ts_tree_node_init(ts_tree_node_t* node) {
-  tree_node_init(&node->tree_node);
-  reflock_init(&node->reflock);
-}
-
-int ts_tree_add(ts_tree_t* ts_tree, ts_tree_node_t* node, uintptr_t key) {
-  int r;
-
-  AcquireSRWLockExclusive(&ts_tree->lock);
-  r = tree_add(&ts_tree->tree, &node->tree_node, key);
-  ReleaseSRWLockExclusive(&ts_tree->lock);
-
-  return r;
-}
-
-static inline ts_tree_node_t* ts_tree__find_node(ts_tree_t* ts_tree,
-                                                 uintptr_t key) {
-  tree_node_t* tree_node = tree_find(&ts_tree->tree, key);
-  if (tree_node == NULL)
-    return NULL;
-
-  return container_of(tree_node, ts_tree_node_t, tree_node);
-}
-
-ts_tree_node_t* ts_tree_del_and_ref(ts_tree_t* ts_tree, uintptr_t key) {
-  ts_tree_node_t* ts_tree_node;
-
-  AcquireSRWLockExclusive(&ts_tree->lock);
-
-  ts_tree_node = ts_tree__find_node(ts_tree, key);
-  if (ts_tree_node != NULL) {
-    tree_del(&ts_tree->tree, &ts_tree_node->tree_node);
-    reflock_ref(&ts_tree_node->reflock);
-  }
-
-  ReleaseSRWLockExclusive(&ts_tree->lock);
-
-  return ts_tree_node;
-}
-
-ts_tree_node_t* ts_tree_find_and_ref(ts_tree_t* ts_tree, uintptr_t key) {
-  ts_tree_node_t* ts_tree_node;
-
-  AcquireSRWLockShared(&ts_tree->lock);
-
-  ts_tree_node = ts_tree__find_node(ts_tree, key);
-  if (ts_tree_node != NULL)
-    reflock_ref(&ts_tree_node->reflock);
-
-  ReleaseSRWLockShared(&ts_tree->lock);
-
-  return ts_tree_node;
-}
-
-void ts_tree_node_unref(ts_tree_node_t* node) {
-  reflock_unref(&node->reflock);
-}
-
-void ts_tree_node_unref_and_destroy(ts_tree_node_t* node) {
-  reflock_unref_and_destroy(&node->reflock);
-}
-
-void tree_init(tree_t* tree) {
-  memset(tree, 0, sizeof *tree);
-}
-
-void tree_node_init(tree_node_t* node) {
-  memset(node, 0, sizeof *node);
-}
-
-#define TREE__ROTATE(cis, trans)   \
-  tree_node_t* p = node;           \
-  tree_node_t* q = node->trans;    \
-  tree_node_t* parent = p->parent; \
-                                   \
-  if (parent) {                    \
-    if (parent->left == p)         \
-      parent->left = q;            \
-    else                           \
-      parent->right = q;           \
-  } else {                         \
-    tree->root = q;                \
-  }                                \
-                                   \
-  q->parent = parent;              \
-  p->parent = q;                   \
-  p->trans = q->cis;               \
-  if (p->trans)                    \
-    p->trans->parent = p;          \
-  q->cis = p;
-
-static inline void tree__rotate_left(tree_t* tree, tree_node_t* node) {
-  TREE__ROTATE(left, right)
-}
-
-static inline void tree__rotate_right(tree_t* tree, tree_node_t* node) {
-  TREE__ROTATE(right, left)
-}
-
-#define TREE__INSERT_OR_DESCEND(side) \
-  if (parent->side) {                 \
-    parent = parent->side;            \
-  } else {                            \
-    parent->side = node;              \
-    break;                            \
-  }
-
-#define TREE__REBALANCE_AFTER_INSERT(cis, trans) \
-  tree_node_t* grandparent = parent->parent;     \
-  tree_node_t* uncle = grandparent->trans;       \
-                                                 \
-  if (uncle && uncle->red) {                     \
-    parent->red = uncle->red = false;            \
-    grandparent->red = true;                     \
-    node = grandparent;                          \
-  } else {                                       \
-    if (node == parent->trans) {                 \
-      tree__rotate_##cis(tree, parent);          \
-      node = parent;                             \
-      parent = node->parent;                     \
-    }                                            \
-    parent->red = false;                         \
-    grandparent->red = true;                     \
-    tree__rotate_##trans(tree, grandparent);     \
-  }
-
-int tree_add(tree_t* tree, tree_node_t* node, uintptr_t key) {
-  tree_node_t* parent;
-
-  parent = tree->root;
-  if (parent) {
-    for (;;) {
-      if (key < parent->key) {
-        TREE__INSERT_OR_DESCEND(left)
-      } else if (key > parent->key) {
-        TREE__INSERT_OR_DESCEND(right)
-      } else {
-        return -1;
-      }
-    }
-  } else {
-    tree->root = node;
-  }
-
-  node->key = key;
-  node->left = node->right = NULL;
-  node->parent = parent;
-  node->red = true;
-
-  for (; parent && parent->red; parent = node->parent) {
-    if (parent == parent->parent->left) {
-      TREE__REBALANCE_AFTER_INSERT(left, right)
-    } else {
-      TREE__REBALANCE_AFTER_INSERT(right, left)
-    }
-  }
-  tree->root->red = false;
-
-  return 0;
-}
-
-#define TREE__REBALANCE_AFTER_REMOVE(cis, trans)   \
-  tree_node_t* sibling = parent->trans;            \
-                                                   \
-  if (sibling->red) {                              \
-    sibling->red = false;                          \
-    parent->red = true;                            \
-    tree__rotate_##cis(tree, parent);              \
-    sibling = parent->trans;                       \
-  }                                                \
-  if ((sibling->left && sibling->left->red) ||     \
-      (sibling->right && sibling->right->red)) {   \
-    if (!sibling->trans || !sibling->trans->red) { \
-      sibling->cis->red = false;                   \
-      sibling->red = true;                         \
-      tree__rotate_##trans(tree, sibling);         \
-      sibling = parent->trans;                     \
-    }                                              \
-    sibling->red = parent->red;                    \
-    parent->red = sibling->trans->red = false;     \
-    tree__rotate_##cis(tree, parent);              \
-    node = tree->root;                             \
-    break;                                         \
-  }                                                \
-  sibling->red = true;
-
-void tree_del(tree_t* tree, tree_node_t* node) {
-  tree_node_t* parent = node->parent;
-  tree_node_t* left = node->left;
-  tree_node_t* right = node->right;
-  tree_node_t* next;
-  bool red;
-
-  if (!left) {
-    next = right;
-  } else if (!right) {
-    next = left;
-  } else {
-    next = right;
-    while (next->left)
-      next = next->left;
-  }
-
-  if (parent) {
-    if (parent->left == node)
-      parent->left = next;
-    else
-      parent->right = next;
-  } else {
-    tree->root = next;
-  }
-
-  if (left && right) {
-    red = next->red;
-    next->red = node->red;
-    next->left = left;
-    left->parent = next;
-    if (next != right) {
-      parent = next->parent;
-      next->parent = node->parent;
-      node = next->right;
-      parent->left = node;
-      next->right = right;
-      right->parent = next;
-    } else {
-      next->parent = parent;
-      parent = next;
-      node = next->right;
-    }
-  } else {
-    red = node->red;
-    node = next;
-  }
-
-  if (node)
-    node->parent = parent;
-  if (red)
-    return;
-  if (node && node->red) {
-    node->red = false;
-    return;
-  }
-
-  do {
-    if (node == tree->root)
-      break;
-    if (node == parent->left) {
-      TREE__REBALANCE_AFTER_REMOVE(left, right)
-    } else {
-      TREE__REBALANCE_AFTER_REMOVE(right, left)
-    }
-    node = parent;
-    parent = parent->parent;
-  } while (!node->red);
-
-  if (node)
-    node->red = false;
-}
-
-tree_node_t* tree_find(const tree_t* tree, uintptr_t key) {
-  tree_node_t* node = tree->root;
-  while (node) {
-    if (key < node->key)
-      node = node->left;
-    else if (key > node->key)
-      node = node->right;
-    else
-      return node;
-  }
-  return NULL;
-}
-
-tree_node_t* tree_root(const tree_t* tree) {
-  return tree->root;
-}
-
-#ifndef SIO_BSP_HANDLE_POLL
-#define SIO_BSP_HANDLE_POLL 0x4800001D
-#endif
-
-#ifndef SIO_BASE_HANDLE
-#define SIO_BASE_HANDLE 0x48000022
-#endif
-
-int ws_global_init(void) {
-  int r;
-  WSADATA wsa_data;
-
-  r = WSAStartup(MAKEWORD(2, 2), &wsa_data);
-  if (r != 0)
-    return_set_error(-1, (DWORD) r);
-
-  return 0;
-}
-
-static inline SOCKET ws__ioctl_get_bsp_socket(SOCKET socket, DWORD ioctl) {
-  SOCKET bsp_socket;
-  DWORD bytes;
-
-  if (WSAIoctl(socket,
-               ioctl,
-               NULL,
-               0,
-               &bsp_socket,
-               sizeof bsp_socket,
-               &bytes,
-               NULL,
-               NULL) != SOCKET_ERROR)
-    return bsp_socket;
-  else
-    return INVALID_SOCKET;
-}
-
-SOCKET ws_get_base_socket(SOCKET socket) {
-  SOCKET base_socket;
-  DWORD error;
-
-  for (;;) {
-    base_socket = ws__ioctl_get_bsp_socket(socket, SIO_BASE_HANDLE);
-    if (base_socket != INVALID_SOCKET)
-      return base_socket;
-
-    error = GetLastError();
-    if (error == WSAENOTSOCK)
-      return_set_error(INVALID_SOCKET, error);
-
-    /* Even though Microsoft documentation clearly states that LSPs should
-     * never intercept the `SIO_BASE_HANDLE` ioctl [1], Komodia based LSPs do
-     * so anyway, breaking it, with the apparent intention of preventing LSP
-     * bypass [2]. Fortunately they don't handle `SIO_BSP_HANDLE_POLL`, which
-     * will at least let us obtain the socket associated with the next winsock
-     * protocol chain entry. If this succeeds, loop around and call
-     * `SIO_BASE_HANDLE` again with the returned BSP socket, to make sure that
-     * we unwrap all layers and retrieve the actual base socket.
-     *  [1] https://docs.microsoft.com/en-us/windows/win32/winsock/winsock-ioctls
-     *  [2] https://www.komodia.com/newwiki/index.php?title=Komodia%27s_Redirector_bug_fixes#Version_2.2.2.6
-     */
-    base_socket = ws__ioctl_get_bsp_socket(socket, SIO_BSP_HANDLE_POLL);
-    if (base_socket != INVALID_SOCKET && base_socket != socket)
-      socket = base_socket;
-    else
-      return_set_error(INVALID_SOCKET, error);
-  }
-}
diff --git a/libs/libzmq/external/wepoll/wepoll.h b/libs/libzmq/external/wepoll/wepoll.h
deleted file mode 100644
index daf6bdb..0000000
--- a/libs/libzmq/external/wepoll/wepoll.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * wepoll - epoll for Windows
- * https://github.com/piscisaureus/wepoll
- *
- * Copyright 2012-2020, Bert Belder <bertbelder@gmail.com>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef WEPOLL_H_
-#define WEPOLL_H_
-
-#ifndef WEPOLL_EXPORT
-#define WEPOLL_EXPORT
-#endif
-
-#include <stdint.h>
-
-enum EPOLL_EVENTS {
-  EPOLLIN      = (int) (1U <<  0),
-  EPOLLPRI     = (int) (1U <<  1),
-  EPOLLOUT     = (int) (1U <<  2),
-  EPOLLERR     = (int) (1U <<  3),
-  EPOLLHUP     = (int) (1U <<  4),
-  EPOLLRDNORM  = (int) (1U <<  6),
-  EPOLLRDBAND  = (int) (1U <<  7),
-  EPOLLWRNORM  = (int) (1U <<  8),
-  EPOLLWRBAND  = (int) (1U <<  9),
-  EPOLLMSG     = (int) (1U << 10), /* Never reported. */
-  EPOLLRDHUP   = (int) (1U << 13),
-  EPOLLONESHOT = (int) (1U << 31)
-};
-
-#define EPOLLIN      (1U <<  0)
-#define EPOLLPRI     (1U <<  1)
-#define EPOLLOUT     (1U <<  2)
-#define EPOLLERR     (1U <<  3)
-#define EPOLLHUP     (1U <<  4)
-#define EPOLLRDNORM  (1U <<  6)
-#define EPOLLRDBAND  (1U <<  7)
-#define EPOLLWRNORM  (1U <<  8)
-#define EPOLLWRBAND  (1U <<  9)
-#define EPOLLMSG     (1U << 10)
-#define EPOLLRDHUP   (1U << 13)
-#define EPOLLONESHOT (1U << 31)
-
-#define EPOLL_CTL_ADD 1
-#define EPOLL_CTL_MOD 2
-#define EPOLL_CTL_DEL 3
-
-typedef void* HANDLE;
-typedef uintptr_t SOCKET;
-
-typedef union epoll_data {
-  void* ptr;
-  int fd;
-  uint32_t u32;
-  uint64_t u64;
-  SOCKET sock; /* Windows specific */
-  HANDLE hnd;  /* Windows specific */
-} epoll_data_t;
-
-struct epoll_event {
-  uint32_t events;   /* Epoll events and flags */
-  epoll_data_t data; /* User data variable */
-};
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-WEPOLL_EXPORT HANDLE epoll_create(int size);
-WEPOLL_EXPORT HANDLE epoll_create1(int flags);
-
-WEPOLL_EXPORT int epoll_close(HANDLE ephnd);
-
-WEPOLL_EXPORT int epoll_ctl(HANDLE ephnd,
-                            int op,
-                            SOCKET sock,
-                            struct epoll_event* event);
-
-WEPOLL_EXPORT int epoll_wait(HANDLE ephnd,
-                             struct epoll_event* events,
-                             int maxevents,
-                             int timeout);
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#endif /* WEPOLL_H_ */
diff --git a/libs/libzmq/include/zmq.h b/libs/libzmq/include/zmq.h
deleted file mode 100644
index 4f1fb97..0000000
--- a/libs/libzmq/include/zmq.h
+++ /dev/null
@@ -1,798 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-    *************************************************************************
-    NOTE to contributors. This file comprises the principal public contract
-    for ZeroMQ API users. Any change to this file supplied in a stable
-    release SHOULD not break existing applications.
-    In practice this means that the value of constants must not change, and
-    that old values may not be reused for new constants.
-    *************************************************************************
-*/
-
-#ifndef __ZMQ_H_INCLUDED__
-#define __ZMQ_H_INCLUDED__
-
-/*  Version macros for compile-time API version detection                     */
-#define ZMQ_VERSION_MAJOR 4
-#define ZMQ_VERSION_MINOR 3
-#define ZMQ_VERSION_PATCH 5
-
-#define ZMQ_MAKE_VERSION(major, minor, patch)                                  \
-    ((major) *10000 + (minor) *100 + (patch))
-#define ZMQ_VERSION                                                            \
-    ZMQ_MAKE_VERSION (ZMQ_VERSION_MAJOR, ZMQ_VERSION_MINOR, ZMQ_VERSION_PATCH)
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if !defined _WIN32_WCE
-#include <errno.h>
-#endif
-#include <stddef.h>
-#include <stdio.h>
-
-/*  Handle DSO symbol visibility                                             */
-#if defined ZMQ_NO_EXPORT
-#define ZMQ_EXPORT
-#else
-#if defined _WIN32
-#if defined ZMQ_STATIC
-#define ZMQ_EXPORT
-#elif defined DLL_EXPORT
-#define ZMQ_EXPORT __declspec(dllexport)
-#else
-#define ZMQ_EXPORT __declspec(dllimport)
-#endif
-#else
-#if defined __SUNPRO_C || defined __SUNPRO_CC
-#define ZMQ_EXPORT __global
-#elif (defined __GNUC__ && __GNUC__ >= 4) || defined __INTEL_COMPILER
-#define ZMQ_EXPORT __attribute__ ((visibility ("default")))
-#else
-#define ZMQ_EXPORT
-#endif
-#endif
-#endif
-
-/*  Define integer types needed for event interface                          */
-#define ZMQ_DEFINED_STDINT 1
-#if defined ZMQ_HAVE_SOLARIS || defined ZMQ_HAVE_OPENVMS
-#include <inttypes.h>
-#elif defined _MSC_VER && _MSC_VER < 1600
-#ifndef uint64_t
-typedef unsigned __int64 uint64_t;
-#endif
-#ifndef int32_t
-typedef __int32 int32_t;
-#endif
-#ifndef uint32_t
-typedef unsigned __int32 uint32_t;
-#endif
-#ifndef uint16_t
-typedef unsigned __int16 uint16_t;
-#endif
-#ifndef uint8_t
-typedef unsigned __int8 uint8_t;
-#endif
-#else
-#include <stdint.h>
-#endif
-
-#if !defined _WIN32
-// needed for sigset_t definition in zmq_ppoll
-#include <signal.h>
-#endif
-
-//  32-bit AIX's pollfd struct members are called reqevents and rtnevents so it
-//  defines compatibility macros for them. Need to include that header first to
-//  stop build failures since zmq_pollset_t defines them as events and revents.
-#ifdef ZMQ_HAVE_AIX
-#include <poll.h>
-#endif
-
-
-/******************************************************************************/
-/*  0MQ errors.                                                               */
-/******************************************************************************/
-
-/*  A number random enough not to collide with different errno ranges on      */
-/*  different OSes. The assumption is that error_t is at least 32-bit type.   */
-#define ZMQ_HAUSNUMERO 156384712
-
-/*  On Windows platform some of the standard POSIX errnos are not defined.    */
-#ifndef ENOTSUP
-#define ENOTSUP (ZMQ_HAUSNUMERO + 1)
-#endif
-#ifndef EPROTONOSUPPORT
-#define EPROTONOSUPPORT (ZMQ_HAUSNUMERO + 2)
-#endif
-#ifndef ENOBUFS
-#define ENOBUFS (ZMQ_HAUSNUMERO + 3)
-#endif
-#ifndef ENETDOWN
-#define ENETDOWN (ZMQ_HAUSNUMERO + 4)
-#endif
-#ifndef EADDRINUSE
-#define EADDRINUSE (ZMQ_HAUSNUMERO + 5)
-#endif
-#ifndef EADDRNOTAVAIL
-#define EADDRNOTAVAIL (ZMQ_HAUSNUMERO + 6)
-#endif
-#ifndef ECONNREFUSED
-#define ECONNREFUSED (ZMQ_HAUSNUMERO + 7)
-#endif
-#ifndef EINPROGRESS
-#define EINPROGRESS (ZMQ_HAUSNUMERO + 8)
-#endif
-#ifndef ENOTSOCK
-#define ENOTSOCK (ZMQ_HAUSNUMERO + 9)
-#endif
-#ifndef EMSGSIZE
-#define EMSGSIZE (ZMQ_HAUSNUMERO + 10)
-#endif
-#ifndef EAFNOSUPPORT
-#define EAFNOSUPPORT (ZMQ_HAUSNUMERO + 11)
-#endif
-#ifndef ENETUNREACH
-#define ENETUNREACH (ZMQ_HAUSNUMERO + 12)
-#endif
-#ifndef ECONNABORTED
-#define ECONNABORTED (ZMQ_HAUSNUMERO + 13)
-#endif
-#ifndef ECONNRESET
-#define ECONNRESET (ZMQ_HAUSNUMERO + 14)
-#endif
-#ifndef ENOTCONN
-#define ENOTCONN (ZMQ_HAUSNUMERO + 15)
-#endif
-#ifndef ETIMEDOUT
-#define ETIMEDOUT (ZMQ_HAUSNUMERO + 16)
-#endif
-#ifndef EHOSTUNREACH
-#define EHOSTUNREACH (ZMQ_HAUSNUMERO + 17)
-#endif
-#ifndef ENETRESET
-#define ENETRESET (ZMQ_HAUSNUMERO + 18)
-#endif
-
-/*  Native 0MQ error codes.                                                   */
-#define EFSM (ZMQ_HAUSNUMERO + 51)
-#define ENOCOMPATPROTO (ZMQ_HAUSNUMERO + 52)
-#define ETERM (ZMQ_HAUSNUMERO + 53)
-#define EMTHREAD (ZMQ_HAUSNUMERO + 54)
-
-/*  This function retrieves the errno as it is known to 0MQ library. The goal */
-/*  of this function is to make the code 100% portable, including where 0MQ   */
-/*  compiled with certain CRT library (on Windows) is linked to an            */
-/*  application that uses different CRT library.                              */
-ZMQ_EXPORT int zmq_errno (void);
-
-/*  Resolves system errors and 0MQ errors to human-readable string.           */
-ZMQ_EXPORT const char *zmq_strerror (int errnum_);
-
-/*  Run-time API version detection                                            */
-ZMQ_EXPORT void zmq_version (int *major_, int *minor_, int *patch_);
-
-/******************************************************************************/
-/*  0MQ infrastructure (a.k.a. context) initialisation & termination.         */
-/******************************************************************************/
-
-/*  Context options                                                           */
-#define ZMQ_IO_THREADS 1
-#define ZMQ_MAX_SOCKETS 2
-#define ZMQ_SOCKET_LIMIT 3
-#define ZMQ_THREAD_PRIORITY 3
-#define ZMQ_THREAD_SCHED_POLICY 4
-#define ZMQ_MAX_MSGSZ 5
-#define ZMQ_MSG_T_SIZE 6
-#define ZMQ_THREAD_AFFINITY_CPU_ADD 7
-#define ZMQ_THREAD_AFFINITY_CPU_REMOVE 8
-#define ZMQ_THREAD_NAME_PREFIX 9
-
-/*  Default for new contexts                                                  */
-#define ZMQ_IO_THREADS_DFLT 1
-#define ZMQ_MAX_SOCKETS_DFLT 1023
-#define ZMQ_THREAD_PRIORITY_DFLT -1
-#define ZMQ_THREAD_SCHED_POLICY_DFLT -1
-
-ZMQ_EXPORT void *zmq_ctx_new (void);
-ZMQ_EXPORT int zmq_ctx_term (void *context_);
-ZMQ_EXPORT int zmq_ctx_shutdown (void *context_);
-ZMQ_EXPORT int zmq_ctx_set (void *context_, int option_, int optval_);
-ZMQ_EXPORT int zmq_ctx_get (void *context_, int option_);
-
-/*  Old (legacy) API                                                          */
-ZMQ_EXPORT void *zmq_init (int io_threads_);
-ZMQ_EXPORT int zmq_term (void *context_);
-ZMQ_EXPORT int zmq_ctx_destroy (void *context_);
-
-
-/******************************************************************************/
-/*  0MQ message definition.                                                   */
-/******************************************************************************/
-
-/* Some architectures, like sparc64 and some variants of aarch64, enforce pointer
- * alignment and raise sigbus on violations. Make sure applications allocate
- * zmq_msg_t on addresses aligned on a pointer-size boundary to avoid this issue.
- */
-typedef struct zmq_msg_t
-{
-#if defined(_MSC_VER) && (defined(_M_X64) || defined(_M_ARM64))
-    __declspec(align (8)) unsigned char _[64];
-#elif defined(_MSC_VER)                                                        \
-  && (defined(_M_IX86) || defined(_M_ARM_ARMV7VE) || defined(_M_ARM))
-    __declspec(align (4)) unsigned char _[64];
-#elif defined(__GNUC__) || defined(__INTEL_COMPILER)                           \
-  || (defined(__SUNPRO_C) && __SUNPRO_C >= 0x590)                              \
-  || (defined(__SUNPRO_CC) && __SUNPRO_CC >= 0x590)
-    unsigned char _[64] __attribute__ ((aligned (sizeof (void *))));
-#else
-    unsigned char _[64];
-#endif
-} zmq_msg_t;
-
-typedef void (zmq_free_fn) (void *data_, void *hint_);
-
-ZMQ_EXPORT int zmq_msg_init (zmq_msg_t *msg_);
-ZMQ_EXPORT int zmq_msg_init_size (zmq_msg_t *msg_, size_t size_);
-ZMQ_EXPORT int zmq_msg_init_data (
-  zmq_msg_t *msg_, void *data_, size_t size_, zmq_free_fn *ffn_, void *hint_);
-ZMQ_EXPORT int zmq_msg_send (zmq_msg_t *msg_, void *s_, int flags_);
-ZMQ_EXPORT int zmq_msg_recv (zmq_msg_t *msg_, void *s_, int flags_);
-ZMQ_EXPORT int zmq_msg_close (zmq_msg_t *msg_);
-ZMQ_EXPORT int zmq_msg_move (zmq_msg_t *dest_, zmq_msg_t *src_);
-ZMQ_EXPORT int zmq_msg_copy (zmq_msg_t *dest_, zmq_msg_t *src_);
-ZMQ_EXPORT void *zmq_msg_data (zmq_msg_t *msg_);
-ZMQ_EXPORT size_t zmq_msg_size (const zmq_msg_t *msg_);
-ZMQ_EXPORT int zmq_msg_more (const zmq_msg_t *msg_);
-ZMQ_EXPORT int zmq_msg_get (const zmq_msg_t *msg_, int property_);
-ZMQ_EXPORT int zmq_msg_set (zmq_msg_t *msg_, int property_, int optval_);
-ZMQ_EXPORT const char *zmq_msg_gets (const zmq_msg_t *msg_,
-                                     const char *property_);
-
-/******************************************************************************/
-/*  0MQ socket definition.                                                    */
-/******************************************************************************/
-
-/*  Socket types.                                                             */
-#define ZMQ_PAIR 0
-#define ZMQ_PUB 1
-#define ZMQ_SUB 2
-#define ZMQ_REQ 3
-#define ZMQ_REP 4
-#define ZMQ_DEALER 5
-#define ZMQ_ROUTER 6
-#define ZMQ_PULL 7
-#define ZMQ_PUSH 8
-#define ZMQ_XPUB 9
-#define ZMQ_XSUB 10
-#define ZMQ_STREAM 11
-
-/*  Deprecated aliases                                                        */
-#define ZMQ_XREQ ZMQ_DEALER
-#define ZMQ_XREP ZMQ_ROUTER
-
-/*  Socket options.                                                           */
-#define ZMQ_AFFINITY 4
-#define ZMQ_ROUTING_ID 5
-#define ZMQ_SUBSCRIBE 6
-#define ZMQ_UNSUBSCRIBE 7
-#define ZMQ_RATE 8
-#define ZMQ_RECOVERY_IVL 9
-#define ZMQ_SNDBUF 11
-#define ZMQ_RCVBUF 12
-#define ZMQ_RCVMORE 13
-#define ZMQ_FD 14
-#define ZMQ_EVENTS 15
-#define ZMQ_TYPE 16
-#define ZMQ_LINGER 17
-#define ZMQ_RECONNECT_IVL 18
-#define ZMQ_BACKLOG 19
-#define ZMQ_RECONNECT_IVL_MAX 21
-#define ZMQ_MAXMSGSIZE 22
-#define ZMQ_SNDHWM 23
-#define ZMQ_RCVHWM 24
-#define ZMQ_MULTICAST_HOPS 25
-#define ZMQ_RCVTIMEO 27
-#define ZMQ_SNDTIMEO 28
-#define ZMQ_LAST_ENDPOINT 32
-#define ZMQ_ROUTER_MANDATORY 33
-#define ZMQ_TCP_KEEPALIVE 34
-#define ZMQ_TCP_KEEPALIVE_CNT 35
-#define ZMQ_TCP_KEEPALIVE_IDLE 36
-#define ZMQ_TCP_KEEPALIVE_INTVL 37
-#define ZMQ_IMMEDIATE 39
-#define ZMQ_XPUB_VERBOSE 40
-#define ZMQ_ROUTER_RAW 41
-#define ZMQ_IPV6 42
-#define ZMQ_MECHANISM 43
-#define ZMQ_PLAIN_SERVER 44
-#define ZMQ_PLAIN_USERNAME 45
-#define ZMQ_PLAIN_PASSWORD 46
-#define ZMQ_CURVE_SERVER 47
-#define ZMQ_CURVE_PUBLICKEY 48
-#define ZMQ_CURVE_SECRETKEY 49
-#define ZMQ_CURVE_SERVERKEY 50
-#define ZMQ_PROBE_ROUTER 51
-#define ZMQ_REQ_CORRELATE 52
-#define ZMQ_REQ_RELAXED 53
-#define ZMQ_CONFLATE 54
-#define ZMQ_ZAP_DOMAIN 55
-#define ZMQ_ROUTER_HANDOVER 56
-#define ZMQ_TOS 57
-#define ZMQ_CONNECT_ROUTING_ID 61
-#define ZMQ_GSSAPI_SERVER 62
-#define ZMQ_GSSAPI_PRINCIPAL 63
-#define ZMQ_GSSAPI_SERVICE_PRINCIPAL 64
-#define ZMQ_GSSAPI_PLAINTEXT 65
-#define ZMQ_HANDSHAKE_IVL 66
-#define ZMQ_SOCKS_PROXY 68
-#define ZMQ_XPUB_NODROP 69
-#define ZMQ_BLOCKY 70
-#define ZMQ_XPUB_MANUAL 71
-#define ZMQ_XPUB_WELCOME_MSG 72
-#define ZMQ_STREAM_NOTIFY 73
-#define ZMQ_INVERT_MATCHING 74
-#define ZMQ_HEARTBEAT_IVL 75
-#define ZMQ_HEARTBEAT_TTL 76
-#define ZMQ_HEARTBEAT_TIMEOUT 77
-#define ZMQ_XPUB_VERBOSER 78
-#define ZMQ_CONNECT_TIMEOUT 79
-#define ZMQ_TCP_MAXRT 80
-#define ZMQ_THREAD_SAFE 81
-#define ZMQ_MULTICAST_MAXTPDU 84
-#define ZMQ_VMCI_BUFFER_SIZE 85
-#define ZMQ_VMCI_BUFFER_MIN_SIZE 86
-#define ZMQ_VMCI_BUFFER_MAX_SIZE 87
-#define ZMQ_VMCI_CONNECT_TIMEOUT 88
-#define ZMQ_USE_FD 89
-#define ZMQ_GSSAPI_PRINCIPAL_NAMETYPE 90
-#define ZMQ_GSSAPI_SERVICE_PRINCIPAL_NAMETYPE 91
-#define ZMQ_BINDTODEVICE 92
-
-/*  Message options                                                           */
-#define ZMQ_MORE 1
-#define ZMQ_SHARED 3
-
-/*  Send/recv options.                                                        */
-#define ZMQ_DONTWAIT 1
-#define ZMQ_SNDMORE 2
-
-/*  Security mechanisms                                                       */
-#define ZMQ_NULL 0
-#define ZMQ_PLAIN 1
-#define ZMQ_CURVE 2
-#define ZMQ_GSSAPI 3
-
-/*  RADIO-DISH protocol                                                       */
-#define ZMQ_GROUP_MAX_LENGTH 255
-
-/*  Deprecated options and aliases                                            */
-#define ZMQ_IDENTITY ZMQ_ROUTING_ID
-#define ZMQ_CONNECT_RID ZMQ_CONNECT_ROUTING_ID
-#define ZMQ_TCP_ACCEPT_FILTER 38
-#define ZMQ_IPC_FILTER_PID 58
-#define ZMQ_IPC_FILTER_UID 59
-#define ZMQ_IPC_FILTER_GID 60
-#define ZMQ_IPV4ONLY 31
-#define ZMQ_DELAY_ATTACH_ON_CONNECT ZMQ_IMMEDIATE
-#define ZMQ_NOBLOCK ZMQ_DONTWAIT
-#define ZMQ_FAIL_UNROUTABLE ZMQ_ROUTER_MANDATORY
-#define ZMQ_ROUTER_BEHAVIOR ZMQ_ROUTER_MANDATORY
-
-/*  Deprecated Message options                                                */
-#define ZMQ_SRCFD 2
-
-/******************************************************************************/
-/*  GSSAPI definitions                                                        */
-/******************************************************************************/
-
-/*  GSSAPI principal name types                                               */
-#define ZMQ_GSSAPI_NT_HOSTBASED 0
-#define ZMQ_GSSAPI_NT_USER_NAME 1
-#define ZMQ_GSSAPI_NT_KRB5_PRINCIPAL 2
-
-/******************************************************************************/
-/*  0MQ socket events and monitoring                                          */
-/******************************************************************************/
-
-/*  Socket transport events (TCP, IPC and TIPC only)                          */
-
-#define ZMQ_EVENT_CONNECTED 0x0001
-#define ZMQ_EVENT_CONNECT_DELAYED 0x0002
-#define ZMQ_EVENT_CONNECT_RETRIED 0x0004
-#define ZMQ_EVENT_LISTENING 0x0008
-#define ZMQ_EVENT_BIND_FAILED 0x0010
-#define ZMQ_EVENT_ACCEPTED 0x0020
-#define ZMQ_EVENT_ACCEPT_FAILED 0x0040
-#define ZMQ_EVENT_CLOSED 0x0080
-#define ZMQ_EVENT_CLOSE_FAILED 0x0100
-#define ZMQ_EVENT_DISCONNECTED 0x0200
-#define ZMQ_EVENT_MONITOR_STOPPED 0x0400
-#define ZMQ_EVENT_ALL 0xFFFF
-/*  Unspecified system errors during handshake. Event value is an errno.      */
-#define ZMQ_EVENT_HANDSHAKE_FAILED_NO_DETAIL 0x0800
-/*  Handshake complete successfully with successful authentication (if        *
- *  enabled). Event value is unused.                                          */
-#define ZMQ_EVENT_HANDSHAKE_SUCCEEDED 0x1000
-/*  Protocol errors between ZMTP peers or between server and ZAP handler.     *
- *  Event value is one of ZMQ_PROTOCOL_ERROR_*                                */
-#define ZMQ_EVENT_HANDSHAKE_FAILED_PROTOCOL 0x2000
-/*  Failed authentication requests. Event value is the numeric ZAP status     *
- *  code, i.e. 300, 400 or 500.                                               */
-#define ZMQ_EVENT_HANDSHAKE_FAILED_AUTH 0x4000
-#define ZMQ_PROTOCOL_ERROR_ZMTP_UNSPECIFIED 0x10000000
-#define ZMQ_PROTOCOL_ERROR_ZMTP_UNEXPECTED_COMMAND 0x10000001
-#define ZMQ_PROTOCOL_ERROR_ZMTP_INVALID_SEQUENCE 0x10000002
-#define ZMQ_PROTOCOL_ERROR_ZMTP_KEY_EXCHANGE 0x10000003
-#define ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_UNSPECIFIED 0x10000011
-#define ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_MESSAGE 0x10000012
-#define ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_HELLO 0x10000013
-#define ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_INITIATE 0x10000014
-#define ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_ERROR 0x10000015
-#define ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_READY 0x10000016
-#define ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_WELCOME 0x10000017
-#define ZMQ_PROTOCOL_ERROR_ZMTP_INVALID_METADATA 0x10000018
-// the following two may be due to erroneous configuration of a peer
-#define ZMQ_PROTOCOL_ERROR_ZMTP_CRYPTOGRAPHIC 0x11000001
-#define ZMQ_PROTOCOL_ERROR_ZMTP_MECHANISM_MISMATCH 0x11000002
-#define ZMQ_PROTOCOL_ERROR_ZAP_UNSPECIFIED 0x20000000
-#define ZMQ_PROTOCOL_ERROR_ZAP_MALFORMED_REPLY 0x20000001
-#define ZMQ_PROTOCOL_ERROR_ZAP_BAD_REQUEST_ID 0x20000002
-#define ZMQ_PROTOCOL_ERROR_ZAP_BAD_VERSION 0x20000003
-#define ZMQ_PROTOCOL_ERROR_ZAP_INVALID_STATUS_CODE 0x20000004
-#define ZMQ_PROTOCOL_ERROR_ZAP_INVALID_METADATA 0x20000005
-#define ZMQ_PROTOCOL_ERROR_WS_UNSPECIFIED 0x30000000
-
-ZMQ_EXPORT void *zmq_socket (void *, int type_);
-ZMQ_EXPORT int zmq_close (void *s_);
-ZMQ_EXPORT int
-zmq_setsockopt (void *s_, int option_, const void *optval_, size_t optvallen_);
-ZMQ_EXPORT int
-zmq_getsockopt (void *s_, int option_, void *optval_, size_t *optvallen_);
-ZMQ_EXPORT int zmq_bind (void *s_, const char *addr_);
-ZMQ_EXPORT int zmq_connect (void *s_, const char *addr_);
-ZMQ_EXPORT int zmq_unbind (void *s_, const char *addr_);
-ZMQ_EXPORT int zmq_disconnect (void *s_, const char *addr_);
-ZMQ_EXPORT int zmq_send (void *s_, const void *buf_, size_t len_, int flags_);
-ZMQ_EXPORT int
-zmq_send_const (void *s_, const void *buf_, size_t len_, int flags_);
-ZMQ_EXPORT int zmq_recv (void *s_, void *buf_, size_t len_, int flags_);
-ZMQ_EXPORT int zmq_socket_monitor (void *s_, const char *addr_, int events_);
-
-/******************************************************************************/
-/*  Hide socket fd type; this was before zmq_poller_event_t typedef below     */
-/******************************************************************************/
-
-#if defined _WIN32
-// Windows uses a pointer-sized unsigned integer to store the socket fd.
-#if defined _WIN64
-typedef unsigned __int64 zmq_fd_t;
-#else
-typedef unsigned int zmq_fd_t;
-#endif
-#else
-typedef int zmq_fd_t;
-#endif
-
-/******************************************************************************/
-/*  Deprecated I/O multiplexing. Prefer using zmq_poller API                  */
-/******************************************************************************/
-
-#define ZMQ_POLLIN 1
-#define ZMQ_POLLOUT 2
-#define ZMQ_POLLERR 4
-#define ZMQ_POLLPRI 8
-
-typedef struct zmq_pollitem_t
-{
-    void *socket;
-    zmq_fd_t fd;
-    short events;
-    short revents;
-} zmq_pollitem_t;
-
-#define ZMQ_POLLITEMS_DFLT 16
-
-ZMQ_EXPORT int zmq_poll (zmq_pollitem_t *items_, int nitems_, long timeout_);
-
-/******************************************************************************/
-/*  Message proxying                                                          */
-/******************************************************************************/
-
-ZMQ_EXPORT int zmq_proxy (void *frontend_, void *backend_, void *capture_);
-ZMQ_EXPORT int zmq_proxy_steerable (void *frontend_,
-                                    void *backend_,
-                                    void *capture_,
-                                    void *control_);
-
-/******************************************************************************/
-/*  Probe library capabilities                                                */
-/******************************************************************************/
-
-#define ZMQ_HAS_CAPABILITIES 1
-ZMQ_EXPORT int zmq_has (const char *capability_);
-
-/*  Deprecated aliases */
-#define ZMQ_STREAMER 1
-#define ZMQ_FORWARDER 2
-#define ZMQ_QUEUE 3
-
-/*  Deprecated methods */
-ZMQ_EXPORT int zmq_device (int type_, void *frontend_, void *backend_);
-ZMQ_EXPORT int zmq_sendmsg (void *s_, zmq_msg_t *msg_, int flags_);
-ZMQ_EXPORT int zmq_recvmsg (void *s_, zmq_msg_t *msg_, int flags_);
-struct iovec;
-ZMQ_EXPORT int
-zmq_sendiov (void *s_, struct iovec *iov_, size_t count_, int flags_);
-ZMQ_EXPORT int
-zmq_recviov (void *s_, struct iovec *iov_, size_t *count_, int flags_);
-
-/******************************************************************************/
-/*  Encryption functions                                                      */
-/******************************************************************************/
-
-/*  Encode data with Z85 encoding. Returns encoded data                       */
-ZMQ_EXPORT char *
-zmq_z85_encode (char *dest_, const uint8_t *data_, size_t size_);
-
-/*  Decode data with Z85 encoding. Returns decoded data                       */
-ZMQ_EXPORT uint8_t *zmq_z85_decode (uint8_t *dest_, const char *string_);
-
-/*  Generate z85-encoded public and private keypair with tweetnacl/libsodium. */
-/*  Returns 0 on success.                                                     */
-ZMQ_EXPORT int zmq_curve_keypair (char *z85_public_key_, char *z85_secret_key_);
-
-/*  Derive the z85-encoded public key from the z85-encoded secret key.        */
-/*  Returns 0 on success.                                                     */
-ZMQ_EXPORT int zmq_curve_public (char *z85_public_key_,
-                                 const char *z85_secret_key_);
-
-/******************************************************************************/
-/*  Atomic utility methods                                                    */
-/******************************************************************************/
-
-ZMQ_EXPORT void *zmq_atomic_counter_new (void);
-ZMQ_EXPORT void zmq_atomic_counter_set (void *counter_, int value_);
-ZMQ_EXPORT int zmq_atomic_counter_inc (void *counter_);
-ZMQ_EXPORT int zmq_atomic_counter_dec (void *counter_);
-ZMQ_EXPORT int zmq_atomic_counter_value (void *counter_);
-ZMQ_EXPORT void zmq_atomic_counter_destroy (void **counter_p_);
-
-/******************************************************************************/
-/*  Scheduling timers                                                         */
-/******************************************************************************/
-
-#define ZMQ_HAVE_TIMERS
-
-typedef void (zmq_timer_fn) (int timer_id, void *arg);
-
-ZMQ_EXPORT void *zmq_timers_new (void);
-ZMQ_EXPORT int zmq_timers_destroy (void **timers_p);
-ZMQ_EXPORT int
-zmq_timers_add (void *timers, size_t interval, zmq_timer_fn handler, void *arg);
-ZMQ_EXPORT int zmq_timers_cancel (void *timers, int timer_id);
-ZMQ_EXPORT int
-zmq_timers_set_interval (void *timers, int timer_id, size_t interval);
-ZMQ_EXPORT int zmq_timers_reset (void *timers, int timer_id);
-ZMQ_EXPORT long zmq_timers_timeout (void *timers);
-ZMQ_EXPORT int zmq_timers_execute (void *timers);
-
-
-/******************************************************************************/
-/*  These functions are not documented by man pages -- use at your own risk.  */
-/*  If you need these to be part of the formal ZMQ API, then (a) write a man  */
-/*  page, and (b) write a test case in tests.                                 */
-/******************************************************************************/
-
-/*  Helper functions are used by perf tests so that they don't have to care   */
-/*  about minutiae of time-related functions on different OS platforms.       */
-
-/*  Starts the stopwatch. Returns the handle to the watch.                    */
-ZMQ_EXPORT void *zmq_stopwatch_start (void);
-
-/*  Returns the number of microseconds elapsed since the stopwatch was        */
-/*  started, but does not stop or deallocate the stopwatch.                   */
-ZMQ_EXPORT unsigned long zmq_stopwatch_intermediate (void *watch_);
-
-/*  Stops the stopwatch. Returns the number of microseconds elapsed since     */
-/*  the stopwatch was started, and deallocates that watch.                    */
-ZMQ_EXPORT unsigned long zmq_stopwatch_stop (void *watch_);
-
-/*  Sleeps for specified number of seconds.                                   */
-ZMQ_EXPORT void zmq_sleep (int seconds_);
-
-typedef void (zmq_thread_fn) (void *);
-
-/* Start a thread. Returns a handle to the thread.                            */
-ZMQ_EXPORT void *zmq_threadstart (zmq_thread_fn *func_, void *arg_);
-
-/* Wait for thread to complete then free up resources.                        */
-ZMQ_EXPORT void zmq_threadclose (void *thread_);
-
-
-/******************************************************************************/
-/*  These functions are DRAFT and disabled in stable releases, and subject to */
-/*  change at ANY time until declared stable.                                 */
-/******************************************************************************/
-
-#ifdef ZMQ_BUILD_DRAFT_API
-
-/*  DRAFT Socket types.                                                       */
-#define ZMQ_SERVER 12
-#define ZMQ_CLIENT 13
-#define ZMQ_RADIO 14
-#define ZMQ_DISH 15
-#define ZMQ_GATHER 16
-#define ZMQ_SCATTER 17
-#define ZMQ_DGRAM 18
-#define ZMQ_PEER 19
-#define ZMQ_CHANNEL 20
-
-/*  DRAFT Socket options.                                                     */
-#define ZMQ_ZAP_ENFORCE_DOMAIN 93
-#define ZMQ_LOOPBACK_FASTPATH 94
-#define ZMQ_METADATA 95
-#define ZMQ_MULTICAST_LOOP 96
-#define ZMQ_ROUTER_NOTIFY 97
-#define ZMQ_XPUB_MANUAL_LAST_VALUE 98
-#define ZMQ_SOCKS_USERNAME 99
-#define ZMQ_SOCKS_PASSWORD 100
-#define ZMQ_IN_BATCH_SIZE 101
-#define ZMQ_OUT_BATCH_SIZE 102
-#define ZMQ_WSS_KEY_PEM 103
-#define ZMQ_WSS_CERT_PEM 104
-#define ZMQ_WSS_TRUST_PEM 105
-#define ZMQ_WSS_HOSTNAME 106
-#define ZMQ_WSS_TRUST_SYSTEM 107
-#define ZMQ_ONLY_FIRST_SUBSCRIBE 108
-#define ZMQ_RECONNECT_STOP 109
-#define ZMQ_HELLO_MSG 110
-#define ZMQ_DISCONNECT_MSG 111
-#define ZMQ_PRIORITY 112
-#define ZMQ_BUSY_POLL 113
-#define ZMQ_HICCUP_MSG 114
-#define ZMQ_XSUB_VERBOSE_UNSUBSCRIBE 115
-
-/*  DRAFT ZMQ_RECONNECT_STOP options                                          */
-#define ZMQ_RECONNECT_STOP_CONN_REFUSED 0x1
-#define ZMQ_RECONNECT_STOP_HANDSHAKE_FAILED 0x2
-#define ZMQ_RECONNECT_STOP_AFTER_DISCONNECT 0x4
-
-/*  DRAFT Context options                                                     */
-#define ZMQ_ZERO_COPY_RECV 10
-
-/*  DRAFT Context methods.                                                    */
-ZMQ_EXPORT int zmq_ctx_set_ext (void *context_,
-                                int option_,
-                                const void *optval_,
-                                size_t optvallen_);
-ZMQ_EXPORT int zmq_ctx_get_ext (void *context_,
-                                int option_,
-                                void *optval_,
-                                size_t *optvallen_);
-
-/*  DRAFT Socket methods.                                                     */
-ZMQ_EXPORT int zmq_join (void *s, const char *group);
-ZMQ_EXPORT int zmq_leave (void *s, const char *group);
-ZMQ_EXPORT uint32_t zmq_connect_peer (void *s_, const char *addr_);
-
-/*  DRAFT Msg methods.                                                        */
-ZMQ_EXPORT int zmq_msg_set_routing_id (zmq_msg_t *msg, uint32_t routing_id);
-ZMQ_EXPORT uint32_t zmq_msg_routing_id (zmq_msg_t *msg);
-ZMQ_EXPORT int zmq_msg_set_group (zmq_msg_t *msg, const char *group);
-ZMQ_EXPORT const char *zmq_msg_group (zmq_msg_t *msg);
-ZMQ_EXPORT int
-zmq_msg_init_buffer (zmq_msg_t *msg_, const void *buf_, size_t size_);
-
-/*  DRAFT Msg property names.                                                 */
-#define ZMQ_MSG_PROPERTY_ROUTING_ID "Routing-Id"
-#define ZMQ_MSG_PROPERTY_SOCKET_TYPE "Socket-Type"
-#define ZMQ_MSG_PROPERTY_USER_ID "User-Id"
-#define ZMQ_MSG_PROPERTY_PEER_ADDRESS "Peer-Address"
-
-/*  Router notify options                                                     */
-#define ZMQ_NOTIFY_CONNECT 1
-#define ZMQ_NOTIFY_DISCONNECT 2
-
-/******************************************************************************/
-/*  Poller polling on sockets,fd and thread-safe sockets                      */
-/******************************************************************************/
-
-#define ZMQ_HAVE_POLLER
-
-typedef struct zmq_poller_event_t
-{
-    void *socket;
-    zmq_fd_t fd;
-    void *user_data;
-    short events;
-} zmq_poller_event_t;
-
-ZMQ_EXPORT void *zmq_poller_new (void);
-ZMQ_EXPORT int zmq_poller_destroy (void **poller_p);
-ZMQ_EXPORT int zmq_poller_size (void *poller);
-ZMQ_EXPORT int
-zmq_poller_add (void *poller, void *socket, void *user_data, short events);
-ZMQ_EXPORT int zmq_poller_modify (void *poller, void *socket, short events);
-ZMQ_EXPORT int zmq_poller_remove (void *poller, void *socket);
-ZMQ_EXPORT int
-zmq_poller_wait (void *poller, zmq_poller_event_t *event, long timeout);
-ZMQ_EXPORT int zmq_poller_wait_all (void *poller,
-                                    zmq_poller_event_t *events,
-                                    int n_events,
-                                    long timeout);
-ZMQ_EXPORT int zmq_poller_fd (void *poller, zmq_fd_t *fd);
-
-ZMQ_EXPORT int
-zmq_poller_add_fd (void *poller, zmq_fd_t fd, void *user_data, short events);
-ZMQ_EXPORT int zmq_poller_modify_fd (void *poller, zmq_fd_t fd, short events);
-ZMQ_EXPORT int zmq_poller_remove_fd (void *poller, zmq_fd_t fd);
-
-ZMQ_EXPORT int zmq_socket_get_peer_state (void *socket,
-                                          const void *routing_id,
-                                          size_t routing_id_size);
-
-/*  DRAFT Socket monitoring events                                            */
-#define ZMQ_EVENT_PIPES_STATS 0x10000
-
-#define ZMQ_CURRENT_EVENT_VERSION 1
-#define ZMQ_CURRENT_EVENT_VERSION_DRAFT 2
-
-#define ZMQ_EVENT_ALL_V1 ZMQ_EVENT_ALL
-#define ZMQ_EVENT_ALL_V2 ZMQ_EVENT_ALL_V1 | ZMQ_EVENT_PIPES_STATS
-
-ZMQ_EXPORT int zmq_socket_monitor_versioned (
-  void *s_, const char *addr_, uint64_t events_, int event_version_, int type_);
-ZMQ_EXPORT int zmq_socket_monitor_pipes_stats (void *s);
-
-#if !defined _WIN32
-ZMQ_EXPORT int zmq_ppoll (zmq_pollitem_t *items_,
-                          int nitems_,
-                          long timeout_,
-                          const sigset_t *sigmask_);
-#else
-// Windows has no sigset_t
-ZMQ_EXPORT int zmq_ppoll (zmq_pollitem_t *items_,
-                          int nitems_,
-                          long timeout_,
-                          const void *sigmask_);
-#endif
-
-#endif // ZMQ_BUILD_DRAFT_API
-
-
-#undef ZMQ_EXPORT
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/libs/libzmq/include/zmq_utils.h b/libs/libzmq/include/zmq_utils.h
deleted file mode 100644
index b9398d5..0000000
--- a/libs/libzmq/include/zmq_utils.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/*  This file is deprecated, and all its functionality provided by zmq.h     */
-/*  Note that -Wpedantic compilation requires GCC to avoid using its custom
-    extensions such as #warning, hence the trick below. Also, pragmas for
-    warnings or other messages are not standard, not portable, and not all
-    compilers even have an equivalent concept.
-    So in the worst case, this include file is treated as silently empty. */
-
-#if defined(__clang__) || defined(__GNUC__) || defined(__GNUG__)               \
-  || defined(_MSC_VER)
-#if defined(__GNUC__) || defined(__GNUG__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic warning "-Wcpp"
-#pragma GCC diagnostic ignored "-Werror"
-#pragma GCC diagnostic ignored "-Wall"
-#endif
-#pragma message(                                                               \
-  "Warning: zmq_utils.h is deprecated. All its functionality is provided by zmq.h.")
-#if defined(__GNUC__) || defined(__GNUG__)
-#pragma GCC diagnostic pop
-#endif
-#endif
diff --git a/libs/libzmq/installer.ico b/libs/libzmq/installer.ico
deleted file mode 100755
index ba2709c..0000000
Binary files a/libs/libzmq/installer.ico and /dev/null differ
diff --git a/libs/libzmq/m4/ax_check_compile_flag.m4 b/libs/libzmq/m4/ax_check_compile_flag.m4
deleted file mode 100644
index ca36397..0000000
--- a/libs/libzmq/m4/ax_check_compile_flag.m4
+++ /dev/null
@@ -1,74 +0,0 @@
-# ===========================================================================
-#   http://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_CHECK_COMPILE_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS], [INPUT])
-#
-# DESCRIPTION
-#
-#   Check whether the given FLAG works with the current language's compiler
-#   or gives an error.  (Warnings, however, are ignored)
-#
-#   ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on
-#   success/failure.
-#
-#   If EXTRA-FLAGS is defined, it is added to the current language's default
-#   flags (e.g. CFLAGS) when the check is done.  The check is thus made with
-#   the flags: "CFLAGS EXTRA-FLAGS FLAG".  This can for example be used to
-#   force the compiler to issue an error when a bad flag is given.
-#
-#   INPUT gives an alternative input source to AC_COMPILE_IFELSE.
-#
-#   NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this
-#   macro in sync with AX_CHECK_{PREPROC,LINK}_FLAG.
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Guido U. Draheim <guidod@gmx.de>
-#   Copyright (c) 2011 Maarten Bosmans <mkbosmans@gmail.com>
-#
-#   This program is free software: you can redistribute it and/or modify it
-#   under the terms of the GNU General Public License as published by the
-#   Free Software Foundation, either version 3 of the License, or (at your
-#   option) any later version.
-#
-#   This program is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-#   Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License along
-#   with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-#   As a special exception, the respective Autoconf Macro's copyright owner
-#   gives unlimited permission to copy, distribute and modify the configure
-#   scripts that are the output of Autoconf when processing the Macro. You
-#   need not follow the terms of the GNU General Public License when using
-#   or distributing such scripts, even though portions of the text of the
-#   Macro appear in them. The GNU General Public License (GPL) does govern
-#   all other use of the material that constitutes the Autoconf Macro.
-#
-#   This special exception to the GPL applies to versions of the Autoconf
-#   Macro released by the Autoconf Archive. When you make and distribute a
-#   modified version of the Autoconf Macro, you may extend this special
-#   exception to the GPL to apply to your modified version as well.
-
-#serial 4
-
-AC_DEFUN([AX_CHECK_COMPILE_FLAG],
-[AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF
-AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl
-AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [
-  ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS
-  _AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $4 $1"
-  AC_COMPILE_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])],
-    [AS_VAR_SET(CACHEVAR,[yes])],
-    [AS_VAR_SET(CACHEVAR,[no])])
-  _AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags])
-AS_VAR_IF(CACHEVAR,yes,
-  [m4_default([$2], :)],
-  [m4_default([$3], :)])
-AS_VAR_POPDEF([CACHEVAR])dnl
-])dnl AX_CHECK_COMPILE_FLAGS
diff --git a/libs/libzmq/m4/ax_check_vscript.m4 b/libs/libzmq/m4/ax_check_vscript.m4
deleted file mode 100644
index 9851f32..0000000
--- a/libs/libzmq/m4/ax_check_vscript.m4
+++ /dev/null
@@ -1,142 +0,0 @@
-# ===========================================================================
-#     https://www.gnu.org/software/autoconf-archive/ax_check_vscript.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_CHECK_VSCRIPT
-#
-# DESCRIPTION
-#
-#   Check whether the linker supports version scripts.  Version scripts are
-#   used when building shared libraries to bind symbols to version nodes
-#   (helping to detect incompatibilities) or to limit the visibility of
-#   non-public symbols.
-#
-#   Output:
-#
-#   If version scripts are supported, VSCRIPT_LDFLAGS will contain the
-#   appropriate flag to pass to the linker.  On GNU systems this would
-#   typically be "-Wl,--version-script", and on Solaris it would typically
-#   be "-Wl,-M".
-#
-#   Two Automake conditionals are also set:
-#
-#    HAVE_VSCRIPT is true if the linker supports version scripts with
-#    entries that use simple wildcards, like "local: *".
-#
-#    HAVE_VSCRIPT_COMPLEX is true if the linker supports version scripts with
-#    pattern matching wildcards, like "global: Java_*".
-#
-#   On systems that do not support symbol versioning, such as Mac OS X, both
-#   conditionals will be false.  They will also be false if the user passes
-#   "--disable-symvers" on the configure command line.
-#
-#   Example:
-#
-#    configure.ac:
-#
-#     AX_CHECK_VSCRIPT
-#
-#    Makefile.am:
-#
-#     if HAVE_VSCRIPT
-#     libfoo_la_LDFLAGS += $(VSCRIPT_LDFLAGS),@srcdir@/libfoo.map
-#     endif
-#
-#     if HAVE_VSCRIPT_COMPLEX
-#     libbar_la_LDFLAGS += $(VSCRIPT_LDFLAGS),@srcdir@/libbar.map
-#     endif
-#
-# LICENSE
-#
-#   Copyright (c) 2014 Kevin Cernekee <cernekee@gmail.com>
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved. This file is offered as-is, without any
-#   warranty.
-
-#serial 2
-
-# _AX_CHECK_VSCRIPT(flag, global-sym, action-if-link-succeeds, [junk-file=no])
-AC_DEFUN([_AX_CHECK_VSCRIPT], [
-  AC_LANG_PUSH([C])
-  ax_check_vscript_save_flags="$LDFLAGS"
-  echo "V1 { global: $2; local: *; };" > conftest.map
-  AS_IF([test x$4 = xyes], [
-    echo "{" >> conftest.map
-  ])
-  LDFLAGS="$LDFLAGS -Wl,$1,conftest.map"
-  AC_LINK_IFELSE([AC_LANG_PROGRAM([[int show, hide;]], [])], [$3])
-  LDFLAGS="$ax_check_vscript_save_flags"
-  rm -f conftest.map
-  AC_LANG_POP([C])
-]) dnl _AX_CHECK_VSCRIPT
-
-AC_DEFUN([AX_CHECK_VSCRIPT], [
-
-  AC_ARG_ENABLE([symvers],
-    AS_HELP_STRING([--disable-symvers],
-                   [disable library symbol versioning [default=auto]]),
-    [want_symvers=$enableval],
-    [want_symvers=yes]
-  )
-
-  AS_IF([test x$want_symvers = xyes], [
-
-    dnl First test --version-script and -M with a simple wildcard.
-
-    AC_CACHE_CHECK([linker version script flag], ax_cv_check_vscript_flag, [
-      ax_cv_check_vscript_flag=unsupported
-      _AX_CHECK_VSCRIPT([--version-script], [show], [
-        ax_cv_check_vscript_flag=--version-script
-      ])
-      AS_IF([test x$ax_cv_check_vscript_flag = xunsupported], [
-        _AX_CHECK_VSCRIPT([-M], [show], [ax_cv_check_vscript_flag=-M])
-      ])
-
-      dnl The linker may interpret -M (no argument) as "produce a load map."
-      dnl If "-M conftest.map" doesn't fail when conftest.map contains
-      dnl obvious syntax errors, assume this is the case.
-
-      AS_IF([test x$ax_cv_check_vscript_flag != xunsupported], [
-        _AX_CHECK_VSCRIPT([$ax_cv_check_vscript_flag], [show],
-	                  [ax_cv_check_vscript_flag=unsupported], [yes])
-      ])
-    ])
-
-    dnl If the simple wildcard worked, retest with a complex wildcard.
-
-    AS_IF([test x$ax_cv_check_vscript_flag != xunsupported], [
-      ax_check_vscript_flag=$ax_cv_check_vscript_flag
-      AC_CACHE_CHECK([if version scripts can use complex wildcards],
-                     ax_cv_check_vscript_complex_wildcards, [
-        ax_cv_check_vscript_complex_wildcards=no
-        _AX_CHECK_VSCRIPT([$ax_cv_check_vscript_flag], [sh*], [
-        ax_cv_check_vscript_complex_wildcards=yes])
-      ])
-      ax_check_vscript_complex_wildcards="$ax_cv_check_vscript_complex_wildcards"
-    ], [
-      ax_check_vscript_flag=
-      ax_check_vscript_complex_wildcards=no
-    ])
-  ], [
-    AC_MSG_CHECKING([linker version script flag])
-    AC_MSG_RESULT([disabled])
-
-    ax_check_vscript_flag=
-    ax_check_vscript_complex_wildcards=no
-  ])
-
-  AS_IF([test x$ax_check_vscript_flag != x], [
-    VSCRIPT_LDFLAGS="-Wl,$ax_check_vscript_flag"
-    AC_SUBST([VSCRIPT_LDFLAGS])
-  ])
-
-  AM_CONDITIONAL([HAVE_VSCRIPT],
-    [test x$ax_check_vscript_flag != x])
-  AM_CONDITIONAL([HAVE_VSCRIPT_COMPLEX],
-    [test x$ax_check_vscript_complex_wildcards = xyes])
-
-]) dnl AX_CHECK_VSCRIPT
diff --git a/libs/libzmq/m4/ax_code_coverage.m4 b/libs/libzmq/m4/ax_code_coverage.m4
deleted file mode 100644
index 6484f03..0000000
--- a/libs/libzmq/m4/ax_code_coverage.m4
+++ /dev/null
@@ -1,264 +0,0 @@
-# ===========================================================================
-#     https://www.gnu.org/software/autoconf-archive/ax_code_coverage.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_CODE_COVERAGE()
-#
-# DESCRIPTION
-#
-#   Defines CODE_COVERAGE_CPPFLAGS, CODE_COVERAGE_CFLAGS,
-#   CODE_COVERAGE_CXXFLAGS and CODE_COVERAGE_LIBS which should be included
-#   in the CPPFLAGS, CFLAGS CXXFLAGS and LIBS/LIBADD variables of every
-#   build target (program or library) which should be built with code
-#   coverage support. Also defines CODE_COVERAGE_RULES which should be
-#   substituted in your Makefile; and $enable_code_coverage which can be
-#   used in subsequent configure output. CODE_COVERAGE_ENABLED is defined
-#   and substituted, and corresponds to the value of the
-#   --enable-code-coverage option, which defaults to being disabled.
-#
-#   Test also for gcov program and create GCOV variable that could be
-#   substituted.
-#
-#   Note that all optimization flags in CFLAGS must be disabled when code
-#   coverage is enabled.
-#
-#   Usage example:
-#
-#   configure.ac:
-#
-#     AX_CODE_COVERAGE
-#
-#   Makefile.am:
-#
-#     @CODE_COVERAGE_RULES@
-#     my_program_LIBS = ... $(CODE_COVERAGE_LIBS) ...
-#     my_program_CPPFLAGS = ... $(CODE_COVERAGE_CPPFLAGS) ...
-#     my_program_CFLAGS = ... $(CODE_COVERAGE_CFLAGS) ...
-#     my_program_CXXFLAGS = ... $(CODE_COVERAGE_CXXFLAGS) ...
-#
-#   This results in a "check-code-coverage" rule being added to any
-#   Makefile.am which includes "@CODE_COVERAGE_RULES@" (assuming the module
-#   has been configured with --enable-code-coverage). Running `make
-#   check-code-coverage` in that directory will run the module's test suite
-#   (`make check`) and build a code coverage report detailing the code which
-#   was touched, then print the URI for the report.
-#
-#   In earlier versions of this macro, CODE_COVERAGE_LDFLAGS was defined
-#   instead of CODE_COVERAGE_LIBS. They are both still defined, but use of
-#   CODE_COVERAGE_LIBS is preferred for clarity; CODE_COVERAGE_LDFLAGS is
-#   deprecated. They have the same value.
-#
-#   This code was derived from Makefile.decl in GLib, originally licenced
-#   under LGPLv2.1+.
-#
-# LICENSE
-#
-#   Copyright (c) 2012, 2016 Philip Withnall
-#   Copyright (c) 2012 Xan Lopez
-#   Copyright (c) 2012 Christian Persch
-#   Copyright (c) 2012 Paolo Borelli
-#   Copyright (c) 2012 Dan Winship
-#   Copyright (c) 2015 Bastien ROUCARIES
-#
-#   This library is free software; you can redistribute it and/or modify it
-#   under the terms of the GNU Lesser General Public License as published by
-#   the Free Software Foundation; either version 2.1 of the License, or (at
-#   your option) any later version.
-#
-#   This library is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser
-#   General Public License for more details.
-#
-#   You should have received a copy of the GNU Lesser General Public License
-#   along with this program. If not, see <https://www.gnu.org/licenses/>.
-
-#serial 25
-
-AC_DEFUN([AX_CODE_COVERAGE],[
-	dnl Check for --enable-code-coverage
-	AC_REQUIRE([AC_PROG_SED])
-
-	# allow to override gcov location
-	AC_ARG_WITH([gcov],
-	  [AS_HELP_STRING([--with-gcov[=GCOV]], [use given GCOV for coverage (GCOV=gcov).])],
-	  [_AX_CODE_COVERAGE_GCOV_PROG_WITH=$with_gcov],
-	  [_AX_CODE_COVERAGE_GCOV_PROG_WITH=gcov])
-
-	AC_MSG_CHECKING([whether to build with code coverage support])
-	AC_ARG_ENABLE([code-coverage],
-	  AS_HELP_STRING([--enable-code-coverage],
-	  [Whether to enable code coverage support]),,
-	  enable_code_coverage=no)
-
-	AM_CONDITIONAL([CODE_COVERAGE_ENABLED], [test x$enable_code_coverage = xyes])
-	AC_SUBST([CODE_COVERAGE_ENABLED], [$enable_code_coverage])
-	AC_MSG_RESULT($enable_code_coverage)
-
-	AS_IF([ test "$enable_code_coverage" = "yes" ], [
-		# check for gcov
-		AC_CHECK_TOOL([GCOV],
-		  [$_AX_CODE_COVERAGE_GCOV_PROG_WITH],
-		  [:])
-		AS_IF([test "X$GCOV" = "X:"],
-		  [AC_MSG_ERROR([gcov is needed to do coverage])])
-		AC_SUBST([GCOV])
-
-		dnl Check if gcc is being used
-		AS_IF([ test "$GCC" = "no" ], [
-			AC_MSG_ERROR([not compiling with gcc, which is required for gcov code coverage])
-		])
-
-		AC_CHECK_PROG([LCOV], [lcov], [lcov])
-		AC_CHECK_PROG([GENHTML], [genhtml], [genhtml])
-
-		AS_IF([ test -z "$LCOV" ], [
-			AC_MSG_ERROR([To enable code coverage reporting you must have lcov installed])
-		])
-
-		AS_IF([ test -z "$GENHTML" ], [
-			AC_MSG_ERROR([Could not find genhtml from the lcov package])
-		])
-
-		dnl Build the code coverage flags
-		dnl Define CODE_COVERAGE_LDFLAGS for backwards compatibility
-		CODE_COVERAGE_CPPFLAGS="-DNDEBUG"
-		CODE_COVERAGE_CFLAGS="-O0 -g -fprofile-arcs -ftest-coverage"
-		CODE_COVERAGE_CXXFLAGS="-O0 -g -fprofile-arcs -ftest-coverage"
-		CODE_COVERAGE_LIBS="-lgcov"
-		CODE_COVERAGE_LDFLAGS="$CODE_COVERAGE_LIBS"
-
-		AC_SUBST([CODE_COVERAGE_CPPFLAGS])
-		AC_SUBST([CODE_COVERAGE_CFLAGS])
-		AC_SUBST([CODE_COVERAGE_CXXFLAGS])
-		AC_SUBST([CODE_COVERAGE_LIBS])
-		AC_SUBST([CODE_COVERAGE_LDFLAGS])
-
-		[CODE_COVERAGE_RULES_CHECK='
-	-$(A''M_V_at)$(MAKE) $(AM_MAKEFLAGS) -k check
-	$(A''M_V_at)$(MAKE) $(AM_MAKEFLAGS) code-coverage-capture
-']
-		[CODE_COVERAGE_RULES_CAPTURE='
-	$(code_coverage_v_lcov_cap)$(LCOV) $(code_coverage_quiet) $(addprefix --directory ,$(CODE_COVERAGE_DIRECTORY)) --capture --output-file "$(CODE_COVERAGE_OUTPUT_FILE).tmp" --test-name "$(call code_coverage_sanitize,$(PACKAGE_NAME)-$(PACKAGE_VERSION))" --no-checksum --compat-libtool $(CODE_COVERAGE_LCOV_SHOPTS) $(CODE_COVERAGE_LCOV_OPTIONS)
-	$(code_coverage_v_lcov_ign)$(LCOV) $(code_coverage_quiet) $(addprefix --directory ,$(CODE_COVERAGE_DIRECTORY)) --remove "$(CODE_COVERAGE_OUTPUT_FILE).tmp" "/tmp/*" $(CODE_COVERAGE_IGNORE_PATTERN) --output-file "$(CODE_COVERAGE_OUTPUT_FILE)" $(CODE_COVERAGE_LCOV_SHOPTS) $(CODE_COVERAGE_LCOV_RMOPTS)
-	-@rm -f $(CODE_COVERAGE_OUTPUT_FILE).tmp
-	$(code_coverage_v_genhtml)LANG=C $(GENHTML) $(code_coverage_quiet) $(addprefix --prefix ,$(CODE_COVERAGE_DIRECTORY)) --output-directory "$(CODE_COVERAGE_OUTPUT_DIRECTORY)" --title "$(PACKAGE_NAME)-$(PACKAGE_VERSION) Code Coverage" --legend --show-details "$(CODE_COVERAGE_OUTPUT_FILE)" $(CODE_COVERAGE_GENHTML_OPTIONS)
-	@echo "file://$(abs_builddir)/$(CODE_COVERAGE_OUTPUT_DIRECTORY)/index.html"
-']
-		[CODE_COVERAGE_RULES_CLEAN='
-clean: code-coverage-clean
-distclean: code-coverage-clean
-code-coverage-clean:
-	-$(LCOV) --directory $(top_builddir) -z
-	-rm -rf $(CODE_COVERAGE_OUTPUT_FILE) $(CODE_COVERAGE_OUTPUT_FILE).tmp $(CODE_COVERAGE_OUTPUT_DIRECTORY)
-	-find . \( -name "*.gcda" -o -name "*.gcno" -o -name "*.gcov" \) -delete
-']
-	], [
-		[CODE_COVERAGE_RULES_CHECK='
-	@echo "Need to reconfigure with --enable-code-coverage"
-']
-		CODE_COVERAGE_RULES_CAPTURE="$CODE_COVERAGE_RULES_CHECK"
-		CODE_COVERAGE_RULES_CLEAN=''
-	])
-
-[CODE_COVERAGE_RULES='
-# Code coverage
-#
-# Optional:
-#  - CODE_COVERAGE_DIRECTORY: Top-level directory for code coverage reporting.
-#    Multiple directories may be specified, separated by whitespace.
-#    (Default: $(top_builddir))
-#  - CODE_COVERAGE_OUTPUT_FILE: Filename and path for the .info file generated
-#    by lcov for code coverage. (Default:
-#    $(PACKAGE_NAME)-$(PACKAGE_VERSION)-coverage.info)
-#  - CODE_COVERAGE_OUTPUT_DIRECTORY: Directory for generated code coverage
-#    reports to be created. (Default:
-#    $(PACKAGE_NAME)-$(PACKAGE_VERSION)-coverage)
-#  - CODE_COVERAGE_BRANCH_COVERAGE: Set to 1 to enforce branch coverage,
-#    set to 0 to disable it and leave empty to stay with the default.
-#    (Default: empty)
-#  - CODE_COVERAGE_LCOV_SHOPTS_DEFAULT: Extra options shared between both lcov
-#    instances. (Default: based on $CODE_COVERAGE_BRANCH_COVERAGE)
-#  - CODE_COVERAGE_LCOV_SHOPTS: Extra options to shared between both lcov
-#    instances. (Default: $CODE_COVERAGE_LCOV_SHOPTS_DEFAULT)
-#  - CODE_COVERAGE_LCOV_OPTIONS_GCOVPATH: --gcov-tool pathtogcov
-#  - CODE_COVERAGE_LCOV_OPTIONS_DEFAULT: Extra options to pass to the
-#    collecting lcov instance. (Default: $CODE_COVERAGE_LCOV_OPTIONS_GCOVPATH)
-#  - CODE_COVERAGE_LCOV_OPTIONS: Extra options to pass to the collecting lcov
-#    instance. (Default: $CODE_COVERAGE_LCOV_OPTIONS_DEFAULT)
-#  - CODE_COVERAGE_LCOV_RMOPTS_DEFAULT: Extra options to pass to the filtering
-#    lcov instance. (Default: empty)
-#  - CODE_COVERAGE_LCOV_RMOPTS: Extra options to pass to the filtering lcov
-#    instance. (Default: $CODE_COVERAGE_LCOV_RMOPTS_DEFAULT)
-#  - CODE_COVERAGE_GENHTML_OPTIONS_DEFAULT: Extra options to pass to the
-#    genhtml instance. (Default: based on $CODE_COVERAGE_BRANCH_COVERAGE)
-#  - CODE_COVERAGE_GENHTML_OPTIONS: Extra options to pass to the genhtml
-#    instance. (Default: $CODE_COVERAGE_GENHTML_OPTIONS_DEFAULT)
-#  - CODE_COVERAGE_IGNORE_PATTERN: Extra glob pattern of files to ignore
-#
-# The generated report will be titled using the $(PACKAGE_NAME) and
-# $(PACKAGE_VERSION). In order to add the current git hash to the title,
-# use the git-version-gen script, available online.
-
-# Optional variables
-CODE_COVERAGE_DIRECTORY ?= $(top_builddir)
-CODE_COVERAGE_OUTPUT_FILE ?= $(PACKAGE_NAME)-$(PACKAGE_VERSION)-coverage.info
-CODE_COVERAGE_OUTPUT_DIRECTORY ?= $(PACKAGE_NAME)-$(PACKAGE_VERSION)-coverage
-CODE_COVERAGE_BRANCH_COVERAGE ?=
-CODE_COVERAGE_LCOV_SHOPTS_DEFAULT ?= $(if $(CODE_COVERAGE_BRANCH_COVERAGE),\
---rc lcov_branch_coverage=$(CODE_COVERAGE_BRANCH_COVERAGE))
-CODE_COVERAGE_LCOV_SHOPTS ?= $(CODE_COVERAGE_LCOV_SHOPTS_DEFAULT)
-CODE_COVERAGE_LCOV_OPTIONS_GCOVPATH ?= --gcov-tool "$(GCOV)"
-CODE_COVERAGE_LCOV_OPTIONS_DEFAULT ?= $(CODE_COVERAGE_LCOV_OPTIONS_GCOVPATH)
-CODE_COVERAGE_LCOV_OPTIONS ?= $(CODE_COVERAGE_LCOV_OPTIONS_DEFAULT)
-CODE_COVERAGE_LCOV_RMOPTS_DEFAULT ?=
-CODE_COVERAGE_LCOV_RMOPTS ?= $(CODE_COVERAGE_LCOV_RMOPTS_DEFAULT)
-CODE_COVERAGE_GENHTML_OPTIONS_DEFAULT ?=\
-$(if $(CODE_COVERAGE_BRANCH_COVERAGE),\
---rc genhtml_branch_coverage=$(CODE_COVERAGE_BRANCH_COVERAGE))
-CODE_COVERAGE_GENHTML_OPTIONS ?= $(CODE_COVERAGE_GENHTML_OPTIONS_DEFAULT)
-CODE_COVERAGE_IGNORE_PATTERN ?=
-
-GITIGNOREFILES ?=
-GITIGNOREFILES += $(CODE_COVERAGE_OUTPUT_FILE) $(CODE_COVERAGE_OUTPUT_DIRECTORY)
-
-code_coverage_v_lcov_cap = $(code_coverage_v_lcov_cap_$(V))
-code_coverage_v_lcov_cap_ = $(code_coverage_v_lcov_cap_$(AM_DEFAULT_VERBOSITY))
-code_coverage_v_lcov_cap_0 = @echo "  LCOV   --capture"\
- $(CODE_COVERAGE_OUTPUT_FILE);
-code_coverage_v_lcov_ign = $(code_coverage_v_lcov_ign_$(V))
-code_coverage_v_lcov_ign_ = $(code_coverage_v_lcov_ign_$(AM_DEFAULT_VERBOSITY))
-code_coverage_v_lcov_ign_0 = @echo "  LCOV   --remove /tmp/*"\
- $(CODE_COVERAGE_IGNORE_PATTERN);
-code_coverage_v_genhtml = $(code_coverage_v_genhtml_$(V))
-code_coverage_v_genhtml_ = $(code_coverage_v_genhtml_$(AM_DEFAULT_VERBOSITY))
-code_coverage_v_genhtml_0 = @echo "  GEN   " $(CODE_COVERAGE_OUTPUT_DIRECTORY);
-code_coverage_quiet = $(code_coverage_quiet_$(V))
-code_coverage_quiet_ = $(code_coverage_quiet_$(AM_DEFAULT_VERBOSITY))
-code_coverage_quiet_0 = --quiet
-
-# sanitizes the test-name: replaces with underscores: dashes and dots
-code_coverage_sanitize = $(subst -,_,$(subst .,_,$(1)))
-
-# Use recursive makes in order to ignore errors during check
-check-code-coverage:'"$CODE_COVERAGE_RULES_CHECK"'
-
-# Capture code coverage data
-code-coverage-capture: code-coverage-capture-hook'"$CODE_COVERAGE_RULES_CAPTURE"'
-
-# Hook rule executed before code-coverage-capture, overridable by the user
-code-coverage-capture-hook:
-
-'"$CODE_COVERAGE_RULES_CLEAN"'
-
-A''M_DISTCHECK_CONFIGURE_FLAGS ?=
-A''M_DISTCHECK_CONFIGURE_FLAGS += --disable-code-coverage
-
-.PHONY: check-code-coverage code-coverage-capture code-coverage-capture-hook code-coverage-clean
-']
-
-	AC_SUBST([CODE_COVERAGE_RULES])
-	m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([CODE_COVERAGE_RULES])])
-])
diff --git a/libs/libzmq/m4/ax_cxx_compile_stdcxx.m4 b/libs/libzmq/m4/ax_cxx_compile_stdcxx.m4
deleted file mode 100644
index 2c18e49..0000000
--- a/libs/libzmq/m4/ax_cxx_compile_stdcxx.m4
+++ /dev/null
@@ -1,562 +0,0 @@
-# ===========================================================================
-#   http://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_CXX_COMPILE_STDCXX(VERSION, [ext|noext], [mandatory|optional])
-#
-# DESCRIPTION
-#
-#   Check for baseline language coverage in the compiler for the specified
-#   version of the C++ standard.  If necessary, add switches to CXX and
-#   CXXCPP to enable support.  VERSION may be '11' (for the C++11 standard)
-#   or '14' (for the C++14 standard).
-#
-#   The second argument, if specified, indicates whether you insist on an
-#   extended mode (e.g. -std=gnu++11) or a strict conformance mode (e.g.
-#   -std=c++11).  If neither is specified, you get whatever works, with
-#   preference for an extended mode.
-#
-#   The third argument, if specified 'mandatory' or if left unspecified,
-#   indicates that baseline support for the specified C++ standard is
-#   required and that the macro should error out if no mode with that
-#   support is found.  If specified 'optional', then configuration proceeds
-#   regardless, after defining HAVE_CXX${VERSION} if and only if a
-#   supporting mode is found.
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Benjamin Kosnik <bkoz@redhat.com>
-#   Copyright (c) 2012 Zack Weinberg <zackw@panix.com>
-#   Copyright (c) 2013 Roy Stogner <roystgnr@ices.utexas.edu>
-#   Copyright (c) 2014, 2015 Google Inc.; contributed by Alexey Sokolov <sokolov@google.com>
-#   Copyright (c) 2015 Paul Norman <penorman@mac.com>
-#   Copyright (c) 2015 Moritz Klammler <moritz@klammler.eu>
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved.  This file is offered as-is, without any
-#   warranty.
-
-#serial 4
-
-dnl  This macro is based on the code from the AX_CXX_COMPILE_STDCXX_11 macro
-dnl  (serial version number 13).
-
-AC_DEFUN([AX_CXX_COMPILE_STDCXX], [dnl
-  m4_if([$1], [11], [],
-        [$1], [14], [],
-        [$1], [17], [m4_fatal([support for C++17 not yet implemented in AX_CXX_COMPILE_STDCXX])],
-        [m4_fatal([invalid first argument `$1' to AX_CXX_COMPILE_STDCXX])])dnl
-  m4_if([$2], [], [],
-        [$2], [ext], [],
-        [$2], [noext], [],
-        [m4_fatal([invalid second argument `$2' to AX_CXX_COMPILE_STDCXX])])dnl
-  m4_if([$3], [], [ax_cxx_compile_cxx$1_required=true],
-        [$3], [mandatory], [ax_cxx_compile_cxx$1_required=true],
-        [$3], [optional], [ax_cxx_compile_cxx$1_required=false],
-        [m4_fatal([invalid third argument `$3' to AX_CXX_COMPILE_STDCXX])])
-  AC_LANG_PUSH([C++])dnl
-  ac_success=no
-  AC_CACHE_CHECK(whether $CXX supports C++$1 features by default,
-  ax_cv_cxx_compile_cxx$1,
-  [AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])],
-    [ax_cv_cxx_compile_cxx$1=yes],
-    [ax_cv_cxx_compile_cxx$1=no])])
-  if test x$ax_cv_cxx_compile_cxx$1 = xyes; then
-    ac_success=yes
-  fi
-
-  m4_if([$2], [noext], [], [dnl
-  if test x$ac_success = xno; then
-    for switch in -std=gnu++$1 -std=gnu++0x; do
-      cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_$switch])
-      AC_CACHE_CHECK(whether $CXX supports C++$1 features with $switch,
-                     $cachevar,
-        [ac_save_CXX="$CXX"
-         CXX="$CXX $switch"
-         AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])],
-          [eval $cachevar=yes],
-          [eval $cachevar=no])
-         CXX="$ac_save_CXX"])
-      if eval test x\$$cachevar = xyes; then
-        CXX="$CXX $switch"
-        if test -n "$CXXCPP" ; then
-          CXXCPP="$CXXCPP $switch"
-        fi
-        ac_success=yes
-        break
-      fi
-    done
-  fi])
-
-  m4_if([$2], [ext], [], [dnl
-  if test x$ac_success = xno; then
-    dnl HP's aCC needs +std=c++11 according to:
-    dnl http://h21007.www2.hp.com/portal/download/files/unprot/aCxx/PDF_Release_Notes/769149-001.pdf
-    dnl Cray's crayCC needs "-h std=c++11"
-    for switch in -std=c++$1 -std=c++0x +std=c++$1 "-h std=c++$1"; do
-      cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_$switch])
-      AC_CACHE_CHECK(whether $CXX supports C++$1 features with $switch,
-                     $cachevar,
-        [ac_save_CXX="$CXX"
-         CXX="$CXX $switch"
-         AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])],
-          [eval $cachevar=yes],
-          [eval $cachevar=no])
-         CXX="$ac_save_CXX"])
-      if eval test x\$$cachevar = xyes; then
-        CXX="$CXX $switch"
-        if test -n "$CXXCPP" ; then
-          CXXCPP="$CXXCPP $switch"
-        fi
-        ac_success=yes
-        break
-      fi
-    done
-  fi])
-  AC_LANG_POP([C++])
-  if test x$ax_cxx_compile_cxx$1_required = xtrue; then
-    if test x$ac_success = xno; then
-      AC_MSG_ERROR([*** A compiler with support for C++$1 language features is required.])
-    fi
-  fi
-  if test x$ac_success = xno; then
-    HAVE_CXX$1=0
-    AC_MSG_NOTICE([No compiler with C++$1 support was found])
-  else
-    HAVE_CXX$1=1
-    AC_DEFINE(HAVE_CXX$1,1,
-              [define if the compiler supports basic C++$1 syntax])
-  fi
-  AC_SUBST(HAVE_CXX$1)
-])
-
-
-dnl  Test body for checking C++11 support
-
-m4_define([_AX_CXX_COMPILE_STDCXX_testbody_11],
-  _AX_CXX_COMPILE_STDCXX_testbody_new_in_11
-)
-
-
-dnl  Test body for checking C++14 support
-
-m4_define([_AX_CXX_COMPILE_STDCXX_testbody_14],
-  _AX_CXX_COMPILE_STDCXX_testbody_new_in_11
-  _AX_CXX_COMPILE_STDCXX_testbody_new_in_14
-)
-
-
-dnl  Tests for new features in C++11
-
-m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_11], [[
-
-// If the compiler admits that it is not ready for C++11, why torture it?
-// Hopefully, this will speed up the test.
-
-#ifndef __cplusplus
-
-#error "This is not a C++ compiler"
-
-#elif __cplusplus < 201103L
-
-#error "This is not a C++11 compiler"
-
-#else
-
-namespace cxx11
-{
-
-  namespace test_static_assert
-  {
-
-    template <typename T>
-    struct check
-    {
-      static_assert(sizeof(int) <= sizeof(T), "not big enough");
-    };
-
-  }
-
-  namespace test_final_override
-  {
-
-    struct Base
-    {
-      virtual void f() {}
-    };
-
-    struct Derived : public Base
-    {
-      virtual void f() override {}
-    };
-
-  }
-
-  namespace test_double_right_angle_brackets
-  {
-
-    template < typename T >
-    struct check {};
-
-    typedef check<void> single_type;
-    typedef check<check<void>> double_type;
-    typedef check<check<check<void>>> triple_type;
-    typedef check<check<check<check<void>>>> quadruple_type;
-
-  }
-
-  namespace test_decltype
-  {
-
-    int
-    f()
-    {
-      int a = 1;
-      decltype(a) b = 2;
-      return a + b;
-    }
-
-  }
-
-  namespace test_type_deduction
-  {
-
-    template < typename T1, typename T2 >
-    struct is_same
-    {
-      static const bool value = false;
-    };
-
-    template < typename T >
-    struct is_same<T, T>
-    {
-      static const bool value = true;
-    };
-
-    template < typename T1, typename T2 >
-    auto
-    add(T1 a1, T2 a2) -> decltype(a1 + a2)
-    {
-      return a1 + a2;
-    }
-
-    int
-    test(const int c, volatile int v)
-    {
-      static_assert(is_same<int, decltype(0)>::value == true, "");
-      static_assert(is_same<int, decltype(c)>::value == false, "");
-      static_assert(is_same<int, decltype(v)>::value == false, "");
-      auto ac = c;
-      auto av = v;
-      auto sumi = ac + av + 'x';
-      auto sumf = ac + av + 1.0;
-      static_assert(is_same<int, decltype(ac)>::value == true, "");
-      static_assert(is_same<int, decltype(av)>::value == true, "");
-      static_assert(is_same<int, decltype(sumi)>::value == true, "");
-      static_assert(is_same<int, decltype(sumf)>::value == false, "");
-      static_assert(is_same<int, decltype(add(c, v))>::value == true, "");
-      return (sumf > 0.0) ? sumi : add(c, v);
-    }
-
-  }
-
-  namespace test_noexcept
-  {
-
-    int f() { return 0; }
-    int g() noexcept { return 0; }
-
-    static_assert(noexcept(f()) == false, "");
-    static_assert(noexcept(g()) == true, "");
-
-  }
-
-  namespace test_constexpr
-  {
-
-    template < typename CharT >
-    unsigned long constexpr
-    strlen_c_r(const CharT *const s, const unsigned long acc) noexcept
-    {
-      return *s ? strlen_c_r(s + 1, acc + 1) : acc;
-    }
-
-    template < typename CharT >
-    unsigned long constexpr
-    strlen_c(const CharT *const s) noexcept
-    {
-      return strlen_c_r(s, 0UL);
-    }
-
-    static_assert(strlen_c("") == 0UL, "");
-    static_assert(strlen_c("1") == 1UL, "");
-    static_assert(strlen_c("example") == 7UL, "");
-    static_assert(strlen_c("another\0example") == 7UL, "");
-
-  }
-
-  namespace test_rvalue_references
-  {
-
-    template < int N >
-    struct answer
-    {
-      static constexpr int value = N;
-    };
-
-    answer<1> f(int&)       { return answer<1>(); }
-    answer<2> f(const int&) { return answer<2>(); }
-    answer<3> f(int&&)      { return answer<3>(); }
-
-    void
-    test()
-    {
-      int i = 0;
-      const int c = 0;
-      static_assert(decltype(f(i))::value == 1, "");
-      static_assert(decltype(f(c))::value == 2, "");
-      static_assert(decltype(f(0))::value == 3, "");
-    }
-
-  }
-
-  namespace test_uniform_initialization
-  {
-
-    struct test
-    {
-      static const int zero {};
-      static const int one {1};
-    };
-
-    static_assert(test::zero == 0, "");
-    static_assert(test::one == 1, "");
-
-  }
-
-  namespace test_lambdas
-  {
-
-    void
-    test1()
-    {
-      auto lambda1 = [](){};
-      auto lambda2 = lambda1;
-      lambda1();
-      lambda2();
-    }
-
-    int
-    test2()
-    {
-      auto a = [](int i, int j){ return i + j; }(1, 2);
-      auto b = []() -> int { return '0'; }();
-      auto c = [=](){ return a + b; }();
-      auto d = [&](){ return c; }();
-      auto e = [a, &b](int x) mutable {
-        const auto identity = [](int y){ return y; };
-        for (auto i = 0; i < a; ++i)
-          a += b--;
-        return x + identity(a + b);
-      }(0);
-      return a + b + c + d + e;
-    }
-
-    int
-    test3()
-    {
-      const auto nullary = [](){ return 0; };
-      const auto unary = [](int x){ return x; };
-      using nullary_t = decltype(nullary);
-      using unary_t = decltype(unary);
-      const auto higher1st = [](nullary_t f){ return f(); };
-      const auto higher2nd = [unary](nullary_t f1){
-        return [unary, f1](unary_t f2){ return f2(unary(f1())); };
-      };
-      return higher1st(nullary) + higher2nd(nullary)(unary);
-    }
-
-  }
-
-  namespace test_variadic_templates
-  {
-
-    template <int...>
-    struct sum;
-
-    template <int N0, int... N1toN>
-    struct sum<N0, N1toN...>
-    {
-      static constexpr auto value = N0 + sum<N1toN...>::value;
-    };
-
-    template <>
-    struct sum<>
-    {
-      static constexpr auto value = 0;
-    };
-
-    static_assert(sum<>::value == 0, "");
-    static_assert(sum<1>::value == 1, "");
-    static_assert(sum<23>::value == 23, "");
-    static_assert(sum<1, 2>::value == 3, "");
-    static_assert(sum<5, 5, 11>::value == 21, "");
-    static_assert(sum<2, 3, 5, 7, 11, 13>::value == 41, "");
-
-  }
-
-  // http://stackoverflow.com/questions/13728184/template-aliases-and-sfinae
-  // Clang 3.1 fails with headers of libstd++ 4.8.3 when using std::function
-  // because of this.
-  namespace test_template_alias_sfinae
-  {
-
-    struct foo {};
-
-    template<typename T>
-    using member = typename T::member_type;
-
-    template<typename T>
-    void func(...) {}
-
-    template<typename T>
-    void func(member<T>*) {}
-
-    void test();
-
-    void test() { func<foo>(0); }
-
-  }
-
-}  // namespace cxx11
-
-#endif  // __cplusplus >= 201103L
-
-]])
-
-
-dnl  Tests for new features in C++14
-
-m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_14], [[
-
-// If the compiler admits that it is not ready for C++14, why torture it?
-// Hopefully, this will speed up the test.
-
-#ifndef __cplusplus
-
-#error "This is not a C++ compiler"
-
-#elif __cplusplus < 201402L
-
-#error "This is not a C++14 compiler"
-
-#else
-
-namespace cxx14
-{
-
-  namespace test_polymorphic_lambdas
-  {
-
-    int
-    test()
-    {
-      const auto lambda = [](auto&&... args){
-        const auto istiny = [](auto x){
-          return (sizeof(x) == 1UL) ? 1 : 0;
-        };
-        const int aretiny[] = { istiny(args)... };
-        return aretiny[0];
-      };
-      return lambda(1, 1L, 1.0f, '1');
-    }
-
-  }
-
-  namespace test_binary_literals
-  {
-
-    constexpr auto ivii = 0b0000000000101010;
-    static_assert(ivii == 42, "wrong value");
-
-  }
-
-  namespace test_generalized_constexpr
-  {
-
-    template < typename CharT >
-    constexpr unsigned long
-    strlen_c(const CharT *const s) noexcept
-    {
-      auto length = 0UL;
-      for (auto p = s; *p; ++p)
-        ++length;
-      return length;
-    }
-
-    static_assert(strlen_c("") == 0UL, "");
-    static_assert(strlen_c("x") == 1UL, "");
-    static_assert(strlen_c("test") == 4UL, "");
-    static_assert(strlen_c("another\0test") == 7UL, "");
-
-  }
-
-  namespace test_lambda_init_capture
-  {
-
-    int
-    test()
-    {
-      auto x = 0;
-      const auto lambda1 = [a = x](int b){ return a + b; };
-      const auto lambda2 = [a = lambda1(x)](){ return a; };
-      return lambda2();
-    }
-
-  }
-
-  namespace test_digit_seperators
-  {
-
-    constexpr auto ten_million = 100'000'000;
-    static_assert(ten_million == 100000000, "");
-
-  }
-
-  namespace test_return_type_deduction
-  {
-
-    auto f(int& x) { return x; }
-    decltype(auto) g(int& x) { return x; }
-
-    template < typename T1, typename T2 >
-    struct is_same
-    {
-      static constexpr auto value = false;
-    };
-
-    template < typename T >
-    struct is_same<T, T>
-    {
-      static constexpr auto value = true;
-    };
-
-    int
-    test()
-    {
-      auto x = 0;
-      static_assert(is_same<int, decltype(f(x))>::value, "");
-      static_assert(is_same<int&, decltype(g(x))>::value, "");
-      return x;
-    }
-
-  }
-
-}  // namespace cxx14
-
-#endif  // __cplusplus >= 201402L
-
-]])
diff --git a/libs/libzmq/m4/ax_cxx_compile_stdcxx_11.m4 b/libs/libzmq/m4/ax_cxx_compile_stdcxx_11.m4
deleted file mode 100644
index e08ce2f..0000000
--- a/libs/libzmq/m4/ax_cxx_compile_stdcxx_11.m4
+++ /dev/null
@@ -1,40 +0,0 @@
-# ============================================================================
-#  http://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx_11.html
-# ============================================================================
-#
-# SYNOPSIS
-#
-#   AX_CXX_COMPILE_STDCXX_11([ext|noext], [mandatory|optional])
-#
-# DESCRIPTION
-#
-#   Check for baseline language coverage in the compiler for the C++11
-#   standard; if necessary, add switches to CXX and CXXCPP to enable
-#   support.
-#
-#   This macro is a convenience alias for calling the AX_CXX_COMPILE_STDCXX
-#   macro with the version set to C++11.  The two optional arguments are
-#   forwarded literally as the second and third argument respectively.
-#   Please see the documentation for the AX_CXX_COMPILE_STDCXX macro for
-#   more information.  If you want to use this macro, you also need to
-#   download the ax_cxx_compile_stdcxx.m4 file.
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Benjamin Kosnik <bkoz@redhat.com>
-#   Copyright (c) 2012 Zack Weinberg <zackw@panix.com>
-#   Copyright (c) 2013 Roy Stogner <roystgnr@ices.utexas.edu>
-#   Copyright (c) 2014, 2015 Google Inc.; contributed by Alexey Sokolov <sokolov@google.com>
-#   Copyright (c) 2015 Paul Norman <penorman@mac.com>
-#   Copyright (c) 2015 Moritz Klammler <moritz@klammler.eu>
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved. This file is offered as-is, without any
-#   warranty.
-
-#serial 16
-
-m4_include([m4/ax_cxx_compile_stdcxx.m4])
-
-AC_DEFUN([AX_CXX_COMPILE_STDCXX_11], [AX_CXX_COMPILE_STDCXX([11], [$1], [$2])])
diff --git a/libs/libzmq/m4/ax_func_posix_memalign.m4 b/libs/libzmq/m4/ax_func_posix_memalign.m4
deleted file mode 100644
index 2442cec..0000000
--- a/libs/libzmq/m4/ax_func_posix_memalign.m4
+++ /dev/null
@@ -1,50 +0,0 @@
-# ===========================================================================
-#  https://www.gnu.org/software/autoconf-archive/ax_func_posix_memalign.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_FUNC_POSIX_MEMALIGN
-#
-# DESCRIPTION
-#
-#   Some versions of posix_memalign (notably glibc 2.2.5) incorrectly apply
-#   their power-of-two check to the size argument, not the alignment
-#   argument. AX_FUNC_POSIX_MEMALIGN defines HAVE_POSIX_MEMALIGN if the
-#   power-of-two check is correctly applied to the alignment argument.
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Scott Pakin <pakin@uiuc.edu>
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved. This file is offered as-is, without any
-#   warranty.
-
-#serial 9
-
-AC_DEFUN([AX_FUNC_POSIX_MEMALIGN],
-[AC_CACHE_CHECK([for working posix_memalign],
-  [ax_cv_func_posix_memalign_works],
-  [AC_RUN_IFELSE([AC_LANG_SOURCE([[
-#include <stdlib.h>
-
-int
-main ()
-{
-  void *buffer;
-
-  /* Some versions of glibc incorrectly perform the alignment check on
-   * the size word. */
-  exit (posix_memalign (&buffer, sizeof(void *), 123) != 0);
-}
-    ]])],
-    [ax_cv_func_posix_memalign_works=yes],
-    [ax_cv_func_posix_memalign_works=no],
-    [ax_cv_func_posix_memalign_works=no])])
-if test "$ax_cv_func_posix_memalign_works" = "yes" ; then
-  AC_DEFINE([HAVE_POSIX_MEMALIGN], [1],
-    [Define to 1 if `posix_memalign' works.])
-fi
-])
diff --git a/libs/libzmq/m4/ax_valgrind_check.m4 b/libs/libzmq/m4/ax_valgrind_check.m4
deleted file mode 100644
index 2dd8f71..0000000
--- a/libs/libzmq/m4/ax_valgrind_check.m4
+++ /dev/null
@@ -1,233 +0,0 @@
-# ===========================================================================
-#     http://www.gnu.org/software/autoconf-archive/ax_valgrind_check.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_VALGRIND_CHECK()
-#
-# DESCRIPTION
-#
-#   Checks whether Valgrind is present and, if so, allows running `make
-#   check` under a variety of Valgrind tools to check for memory and
-#   threading errors.
-#
-#   Defines VALGRIND_CHECK_RULES which should be substituted in your
-#   Makefile; and $enable_valgrind which can be used in subsequent configure
-#   output. VALGRIND_ENABLED is defined and substituted, and corresponds to
-#   the value of the --enable-valgrind option, which defaults to being
-#   enabled if Valgrind is installed and disabled otherwise.
-#
-#   If unit tests are written using a shell script and automake's
-#   LOG_COMPILER system, the $(VALGRIND) variable can be used within the
-#   shell scripts to enable Valgrind, as described here:
-#
-#     https://www.gnu.org/software/gnulib/manual/html_node/Running-self_002dtests-under-valgrind.html
-#
-#   Usage example:
-#
-#   configure.ac:
-#
-#     AX_VALGRIND_CHECK
-#
-#   Makefile.am:
-#
-#     @VALGRIND_CHECK_RULES@
-#     VALGRIND_SUPPRESSIONS_FILES = my-project.supp
-#     EXTRA_DIST = my-project.supp
-#
-#   This results in a "check-valgrind" rule being added to any Makefile.am
-#   which includes "@VALGRIND_CHECK_RULES@" (assuming the module has been
-#   configured with --enable-valgrind). Running `make check-valgrind` in
-#   that directory will run the module's test suite (`make check`) once for
-#   each of the available Valgrind tools (out of memcheck, helgrind, drd and
-#   sgcheck), and will output results to test-suite-$toolname.log for each.
-#   The target will succeed if there are zero errors and fail otherwise.
-#
-#   Alternatively, a "check-valgrind-$TOOL" rule will be added, for $TOOL in
-#   memcheck, helgrind, drd and sgcheck. These are useful because often only
-#   some of those tools can be ran cleanly on a codebase.
-#
-#   The macro supports running with and without libtool.
-#
-# LICENSE
-#
-#   Copyright (c) 2014, 2015, 2016 Philip Withnall <philip.withnall@collabora.co.uk>
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved.  This file is offered as-is, without any
-#   warranty.
-
-#serial 9
-
-AC_DEFUN([AX_VALGRIND_CHECK],[
-	dnl Check for --enable-valgrind
-	AC_ARG_ENABLE([valgrind],
-	              [AS_HELP_STRING([--enable-valgrind], [Whether to enable Valgrind on the unit tests])],
-	              [enable_valgrind=$enableval],[enable_valgrind=])
-
-	AS_IF([test "$enable_valgrind" != "no"],[
-		# Check for Valgrind.
-		AC_CHECK_PROG([VALGRIND],[valgrind],[valgrind])
-		AS_IF([test "$VALGRIND" = ""],[
-			AS_IF([test "$enable_valgrind" = "yes"],[
-				AC_MSG_ERROR([Could not find valgrind; either install it or reconfigure with --disable-valgrind])
-			],[
-				enable_valgrind=no
-			])
-		],[
-			enable_valgrind=yes
-		])
-	])
-
-	AM_CONDITIONAL([VALGRIND_ENABLED],[test "$enable_valgrind" = "yes"])
-	AC_SUBST([VALGRIND_ENABLED],[$enable_valgrind])
-
-	# Check for Valgrind tools we care about.
-	m4_define([valgrind_tool_list],[[memcheck], [helgrind], [drd], [exp-sgcheck]])
-
-	AS_IF([test "$VALGRIND" != ""],[
-		m4_foreach([vgtool],[valgrind_tool_list],[
-			m4_define([vgtooln],AS_TR_SH(vgtool))
-			m4_define([ax_cv_var],[ax_cv_valgrind_tool_]vgtooln)
-			AC_CACHE_CHECK([for Valgrind tool ]vgtool,ax_cv_var,[
-				ax_cv_var=
-				AS_IF([`$VALGRIND --tool=vgtool --help >/dev/null 2>&1`],[
-					ax_cv_var="vgtool"
-				])
-			])
-
-			AC_SUBST([VALGRIND_HAVE_TOOL_]vgtooln,[$ax_cv_var])
-		])
-	])
-
-[VALGRIND_CHECK_RULES='
-# Valgrind check
-#
-# Optional:
-#  - VALGRIND_SUPPRESSIONS_FILES: Space-separated list of Valgrind suppressions
-#    files to load. (Default: empty)
-#  - VALGRIND_FLAGS: General flags to pass to all Valgrind tools.
-#    (Default: --num-callers=30)
-#  - VALGRIND_$toolname_FLAGS: Flags to pass to Valgrind $toolname (one of:
-#    memcheck, helgrind, drd, sgcheck). (Default: various)
-
-# Optional variables
-VALGRIND_SUPPRESSIONS ?= $(addprefix --suppressions=,$(VALGRIND_SUPPRESSIONS_FILES))
-VALGRIND_FLAGS ?= --num-callers=30
-VALGRIND_memcheck_FLAGS ?= --leak-check=full --show-reachable=no
-VALGRIND_helgrind_FLAGS ?= --history-level=approx
-VALGRIND_drd_FLAGS ?=
-VALGRIND_sgcheck_FLAGS ?=
-
-# Internal use
-valgrind_tools = memcheck helgrind drd sgcheck
-valgrind_log_files = $(addprefix test-suite-,$(addsuffix .log,$(valgrind_tools)))
-
-valgrind_memcheck_flags = --tool=memcheck $(VALGRIND_memcheck_FLAGS)
-valgrind_helgrind_flags = --tool=helgrind $(VALGRIND_helgrind_FLAGS)
-valgrind_drd_flags = --tool=drd $(VALGRIND_drd_FLAGS)
-valgrind_sgcheck_flags = --tool=exp-sgcheck $(VALGRIND_sgcheck_FLAGS)
-
-valgrind_quiet = $(valgrind_quiet_$(V))
-valgrind_quiet_ = $(valgrind_quiet_$(AM_DEFAULT_VERBOSITY))
-valgrind_quiet_0 = --quiet
-
-# Support running with and without libtool.
-ifneq ($(LIBTOOL),)
-valgrind_lt = $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=execute
-else
-valgrind_lt =
-endif
-
-# Use recursive makes in order to ignore errors during check
-check-valgrind:
-ifeq ($(VALGRIND_ENABLED),yes)
-	-$(foreach tool,$(valgrind_tools), \
-		$(if $(VALGRIND_HAVE_TOOL_$(tool))$(VALGRIND_HAVE_TOOL_exp_$(tool)), \
-			$(MAKE) $(AM_MAKEFLAGS) -k check-valgrind-tool VALGRIND_TOOL=$(tool); \
-		) \
-	)
-else
-	@echo "Need to reconfigure with --enable-valgrind"
-endif
-
-# Valgrind running
-VALGRIND_TESTS_ENVIRONMENT = \
-	$(TESTS_ENVIRONMENT) \
-	env VALGRIND=$(VALGRIND) \
-	G_SLICE=always-malloc,debug-blocks \
-	G_DEBUG=fatal-warnings,fatal-criticals,gc-friendly
-
-VALGRIND_LOG_COMPILER = \
-	$(valgrind_lt) \
-	$(VALGRIND) $(VALGRIND_SUPPRESSIONS) --error-exitcode=1 $(VALGRIND_FLAGS)
-
-check-valgrind-tool:
-ifeq ($(VALGRIND_ENABLED),yes)
-	$(MAKE) check-TESTS \
-		TESTS_ENVIRONMENT="$(VALGRIND_TESTS_ENVIRONMENT)" \
-		LOG_COMPILER="$(VALGRIND_LOG_COMPILER)" \
-		LOG_FLAGS="$(valgrind_$(VALGRIND_TOOL)_flags)" \
-		TEST_SUITE_LOG=test-suite-$(VALGRIND_TOOL).log
-else
-	@echo "Need to reconfigure with --enable-valgrind"
-endif
-
-check-valgrind-memcheck:
-ifeq ($(VALGRIND_ENABLED),yes)
-	$(MAKE) check-TESTS \
-		TESTS_ENVIRONMENT="$(VALGRIND_TESTS_ENVIRONMENT)" \
-		LOG_COMPILER="$(VALGRIND_LOG_COMPILER)" \
-		LOG_FLAGS="$(valgrind_memcheck_flags)" \
-		TEST_SUITE_LOG=test-suite-memcheck.log
-else
-	@echo "Need to reconfigure with --enable-valgrind"
-endif
-
-check-valgrind-helgrind:
-ifeq ($(VALGRIND_ENABLED),yes)
-	$(MAKE) check-TESTS \
-		TESTS_ENVIRONMENT="$(VALGRIND_TESTS_ENVIRONMENT)" \
-		LOG_COMPILER="$(VALGRIND_LOG_COMPILER)" \
-		LOG_FLAGS="$(valgrind_helgrind_flags)" \
-		TEST_SUITE_LOG=test-suite-helgrind.log
-else
-	@echo "Need to reconfigure with --enable-valgrind"
-endif
-
-check-valgrind-drd:
-ifeq ($(VALGRIND_ENABLED),yes)
-	$(MAKE) check-TESTS \
-		TESTS_ENVIRONMENT="$(VALGRIND_TESTS_ENVIRONMENT)" \
-		LOG_COMPILER="$(VALGRIND_LOG_COMPILER)" \
-		LOG_FLAGS="$(valgrind_drd_flags)" \
-		TEST_SUITE_LOG=test-suite-drd.log
-else
-	@echo "Need to reconfigure with --enable-valgrind"
-endif
-
-check-valgrind-sgcheck:
-ifeq ($(VALGRIND_ENABLED),yes)
-	$(MAKE) check-TESTS \
-		TESTS_ENVIRONMENT="$(VALGRIND_TESTS_ENVIRONMENT)" \
-		LOG_COMPILER="$(VALGRIND_LOG_COMPILER)" \
-		LOG_FLAGS="$(valgrind_sgcheck_flags)" \
-		TEST_SUITE_LOG=test-suite-sgcheck.log
-else
-	@echo "Need to reconfigure with --enable-valgrind"
-endif
-
-A''M_DISTCHECK_CONFIGURE_FLAGS ?=
-A''M_DISTCHECK_CONFIGURE_FLAGS += --disable-valgrind
-
-MOSTLYCLEANFILES ?=
-MOSTLYCLEANFILES += $(valgrind_log_files)
-
-.PHONY: check-valgrind check-valgrind-tool
-']
-
-	AC_SUBST([VALGRIND_CHECK_RULES])
-	m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([VALGRIND_CHECK_RULES])])
-])
diff --git a/libs/libzmq/packaging/README b/libs/libzmq/packaging/README
deleted file mode 100644
index c8350fe..0000000
--- a/libs/libzmq/packaging/README
+++ /dev/null
@@ -1,4 +0,0 @@
-This directory is for packaging tools. Please do not hardcode version
-numbers into your scripts; you can get them at runtime by calling
-version.sh, or at configure time if you use autoconf.
-
diff --git a/libs/libzmq/packaging/debian/changelog b/libs/libzmq/packaging/debian/changelog
deleted file mode 100644
index 2e7a183..0000000
--- a/libs/libzmq/packaging/debian/changelog
+++ /dev/null
@@ -1,5 +0,0 @@
-zeromq (4.3.5-0.1) UNRELEASED; urgency=low
-
-  * Initial packaging.
-
- -- libzmq Developers <zeromq-dev@lists.zeromq.org>  Wed, 31 Dec 2014 00:00:00 +0000
diff --git a/libs/libzmq/packaging/debian/compat b/libs/libzmq/packaging/debian/compat
deleted file mode 100644
index ec63514..0000000
--- a/libs/libzmq/packaging/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-9
diff --git a/libs/libzmq/packaging/debian/control b/libs/libzmq/packaging/debian/control
deleted file mode 100644
index 23c86a6..0000000
--- a/libs/libzmq/packaging/debian/control
+++ /dev/null
@@ -1,75 +0,0 @@
-Source: zeromq
-Section: libs
-Priority: optional
-Maintainer: libzmq Developers <zeromq-dev@lists.zeromq.org>
-Build-Depends: debhelper (>= 9),
- dh-autoreconf,
- libkrb5-dev,
- libnorm-dev,
- libpgm-dev,
- libsodium-dev,
- libunwind-dev | libunwind8-dev | libunwind7-dev,
- libnss3-dev,
- libgnutls28-dev | libgnutls-dev,
- libbsd-dev,
- pkg-config,
- asciidoc-base | asciidoc, xmlto,
-Standards-Version: 3.9.8
-Homepage: http://www.zeromq.org/
-
-Package: libzmq5
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Pre-Depends: ${misc:Pre-Depends}
-Multi-Arch: same
-Description: lightweight messaging kernel (shared library)
- ØMQ is a library which extends the standard socket interfaces with features
- traditionally provided by specialised messaging middleware products.
- .
- ØMQ sockets provide an abstraction of asynchronous message queues, multiple
- messaging patterns, message filtering (subscriptions), seamless access to
- multiple transport protocols and more.
- .
- This package contains the libzmq shared library.
-
-Package: libzmq3-dev
-Architecture: any
-Section: libdevel
-Depends: libzmq5 (= ${binary:Version}), ${misc:Depends},
- libkrb5-dev,
- libnorm-dev,
- libpgm-dev,
- libsodium-dev,
- libunwind-dev | libunwind8-dev | libunwind7-dev,
- libnss3-dev,
- libgnutls28-dev | libgnutls-dev,
- libbsd-dev,
-Conflicts: libzmq-dev, libzmq5-dev
-Replaces: libzmq5-dev
-Provides: libzmq5-dev
-Multi-Arch: same
-Description: lightweight messaging kernel (development files)
- ØMQ is a library which extends the standard socket interfaces with features
- traditionally provided by specialised messaging middleware products.
- .
- ØMQ sockets provide an abstraction of asynchronous message queues, multiple
- messaging patterns, message filtering (subscriptions), seamless access to
- multiple transport protocols and more.
- .
- This package contains the ZeroMQ development libraries and header files.
-
-Package: libzmq5-dbg
-Architecture: any
-Priority: extra
-Section: debug
-Depends: libzmq5 (= ${binary:Version}), ${misc:Depends}
-Multi-Arch: same
-Description: lightweight messaging kernel (debugging symbols)
- ØMQ is a library which extends the standard socket interfaces with features
- traditionally provided by specialised messaging middleware products.
- .
- ØMQ sockets provide an abstraction of asynchronous message queues, multiple
- messaging patterns, message filtering (subscriptions), seamless access to
- multiple transport protocols and more.
- .
- This package contains the debugging symbols for the ZeroMQ library.
diff --git a/libs/libzmq/packaging/debian/copyright b/libs/libzmq/packaging/debian/copyright
deleted file mode 100644
index 1acc7ee..0000000
--- a/libs/libzmq/packaging/debian/copyright
+++ /dev/null
@@ -1,116 +0,0 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: ZeroMQ
-Source: http://zeromq.org
-
-Files: *
-Copyright: 2009-2011, 250bpm s.r.o
- 2007-2013, iMatix Corporation
- 2007-2011, Other contributors as noted in the AUTHORS file
-License: LGPL-3.0+
-
-Files: src/xreq.cpp
- src/xpub.cpp
- src/xsub.cpp
- tests/test_reqrep_device.cpp
- tests/test_invalid_rep.cpp
-Copyright: 2010-2011, 250bpm s.r.o
- 2011, VMware, Inc
- 2010-2011, Other contributors as noted in the AUTHORS file
-License: LGPL-3.0+
-
-Files: src/msg.hpp
- src/xrep.*
- src/options.*
- src/req.*
- src/socket_base.*
- src/pipe.*
- src/encoder.cpp
- src/lb.cpp
- src/session_base.*
- src/fq.cpp
- include/zmq.h
-Copyright: 2009-2011, 250bpm s.r.o
- 2007-2013, iMatix Corporation
- 2011, VMware, Inc
- 2007-2011, Other contributors as noted in the AUTHORS file
-License: LGPL-3.0+
-
-Files: src/pgm_receiver.*
- src/pgm_sender.*
- src/pgm_socket.*
-Copyright: 2009-2011, 250bpm s.r.o
- 2007-2013, iMatix Corporation
- 2010-2011, Miru Limited
- 2007-2011, Other contributors as noted in the AUTHORS file
-License: LGPL-3.0+
-
-Files: external/unity/*
-Copyright: 2007-2014 Mike Karlesky
-           2007-2014 Mark VanderVoord
-           2007-2014 Greg Williams
-License: MIT
- Permission is hereby granted, free of charge, to any person obtaining a copy
- of this software and associated documentation files (the "Software"), to deal
- in the Software without restriction, including without limitation the rights
- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the Software is
- furnished to do so, subject to the following conditions:
- .
- The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
- .
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- THE SOFTWARE.
-
-Files: debian/*
-Copyright: 2014-    , Laszlo Boszormenyi (GCS) <gcs@debian.org>
- 2012-2014, Alessandro Ghedini <ghedo@debian.org>
- 2010-2012, Martin Lucina <martin@lucina.net>
- 2009-2010, Adrian von Bidder <cmot@debian.org>
- 2009-2010, Peter Busser <peter@mirabilix.nl>
- 2012, Alessandro Ghedini <ghedo@debian.org>
-License: LGPL-2.0+
-
-License: LGPL-2.0+
- This package is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
- .
- This package is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- Lesser General Public License for more details.
- .
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
- .
- On Debian systems, the complete text of the GNU Lesser General
- Public License can be found in "/usr/share/common-licenses/LGPL-2".
-
-License: LGPL-3.0+
- This package is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 3 of the License, or (at your option) any later version.
- .
- This package is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- Lesser General Public License for more details.
- .
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
- .
- On Debian systems, the complete text of the GNU Lesser General
- Public License can be found in "/usr/share/common-licenses/LGPL-3".BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- IN THE SOFTWARE.
diff --git a/libs/libzmq/packaging/debian/libzmq3-dev.install b/libs/libzmq/packaging/debian/libzmq3-dev.install
deleted file mode 100644
index 4f315b7..0000000
--- a/libs/libzmq/packaging/debian/libzmq3-dev.install
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/include/*
-usr/lib/*/libzmq.a
-usr/lib/*/libzmq.so
-usr/lib/*/pkgconfig/libzmq.pc
diff --git a/libs/libzmq/packaging/debian/libzmq3-dev.manpages b/libs/libzmq/packaging/debian/libzmq3-dev.manpages
deleted file mode 100644
index fe4ecb4..0000000
--- a/libs/libzmq/packaging/debian/libzmq3-dev.manpages
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/tmp/usr/share/man/man3/*
-debian/tmp/usr/share/man/man7/*
diff --git a/libs/libzmq/packaging/debian/libzmq5.docs b/libs/libzmq/packaging/debian/libzmq5.docs
deleted file mode 100644
index 3cc350b..0000000
--- a/libs/libzmq/packaging/debian/libzmq5.docs
+++ /dev/null
@@ -1,2 +0,0 @@
-AUTHORS
-NEWS
diff --git a/libs/libzmq/packaging/debian/libzmq5.install b/libs/libzmq/packaging/debian/libzmq5.install
deleted file mode 100644
index f0d5ab5..0000000
--- a/libs/libzmq/packaging/debian/libzmq5.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/libzmq.so.*
diff --git a/libs/libzmq/packaging/debian/rules b/libs/libzmq/packaging/debian/rules
deleted file mode 100755
index b1e6abb..0000000
--- a/libs/libzmq/packaging/debian/rules
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-export DEB_BUILD_MAINT_OPTIONS=hardening=+all
-
-export TEST_VERBOSE=1
-
-ifeq ($(DEB_BUILD_ARCH_OS), kfreebsd)
-	DO_TEST = no
-endif
-
-DRAFTS=no
-
-# OBS build: add
-#   Macros:
-#   %_with_drafts 1
-# at the BOTTOM of the OBS prjconf
-OBS_BUILD_CFG=/.build/build.dist
-ifeq ("$(wildcard $(OBS_BUILD_CFG))","")
-BUILDCONFIG=$(shell ls -1 /usr/src/packages/SOURCES/_buildconfig* | head -n 1)
-endif
-ifneq ("$(wildcard $(OBS_BUILD_CFG))","")
-ifneq ("$(shell grep drafts $(OBS_BUILD_CFG))","")
-DRAFTS=yes
-endif
-endif
-
-# User build: DEB_BUILD_OPTIONS=drafts dpkg-buildpackage
-ifneq (,$(findstring drafts,$(DEB_BUILD_OPTIONS)))
-DRAFTS=yes
-endif
-
-# Workaround for automake < 1.14 bug
-$(shell dpkg --compare-versions `dpkg-query -W -f='$${Version}\n' automake` lt 1:1.14 && mkdir -p config)
-
-override_dh_clean:
-	dh_clean
-	find $(CURDIR) -type s -exec rm {} \;
-	rm -f $(CURDIR)/doc/*.xml $(CURDIR)/doc/*.3 $(CURDIR)/doc/*.7
-	rm -f config.log
-
-override_dh_auto_configure:
-	dh_auto_configure -- --with-pgm --with-libsodium --enable-drafts=$(DRAFTS) --with-libgssapi_krb5=yes --with-norm=yes --with-nss=yes --with-tls=yes
-
-override_dh_auto_test:
-ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
-ifneq ($(DO_TEST), no)
-	dh_auto_test -- VERBOSE=1
-else
-	-dh_auto_test -- VERBOSE=1
-endif
-endif
-
-override_dh_auto_install:
-	dh_auto_install
-ifneq ("$(wildcard debian/zmq.hpp)","")
-	cp $(CURDIR)/debian/zmq.hpp $(CURDIR)/debian/tmp/usr/include/
-endif
-
-override_dh_strip:
-	dh_strip --dbg-package=libzmq5-dbg
-
-%:
-	dh $@ --with=autoreconf --parallel
-
-.PHONY: override_dh_auto_configure override_dh_strip
diff --git a/libs/libzmq/packaging/debian/source/format b/libs/libzmq/packaging/debian/source/format
deleted file mode 100644
index 163aaf8..0000000
--- a/libs/libzmq/packaging/debian/source/format
+++ /dev/null
@@ -1 +0,0 @@
-3.0 (quilt)
diff --git a/libs/libzmq/packaging/debian/zeromq.dsc b/libs/libzmq/packaging/debian/zeromq.dsc
deleted file mode 100644
index 2b28971..0000000
--- a/libs/libzmq/packaging/debian/zeromq.dsc
+++ /dev/null
@@ -1,15 +0,0 @@
-Format: 3.0 (quilt)
-Source: zeromq
-Binary: libzmq5, libzmq3-dev, libzmq5-dbg
-Architecture: any
-Version: 4.3.5-0.1
-Maintainer: libzmq Developers <zeromq-dev@lists.zeromq.org>
-Homepage: http://www.zeromq.org/
-Standards-Version: 3.9.8
-Build-Depends: debhelper (>= 9), dh-autoreconf, libkrb5-dev, libpgm-dev, libnorm-dev, libsodium-dev, libunwind-dev | libunwind8-dev | libunwind7-dev, libnss3-dev, libgnutls28-dev | libgnutls-dev, libbsd-dev, pkg-config, asciidoc-base | asciidoc, xmlto
-Package-List:
- libzmq3-dev deb libdevel optional arch=any
- libzmq5 deb libs optional arch=any
- libzmq5-dbg deb debug extra arch=any
-Files:
- e7adf4b7dbae09b28cfd10d26cd67fac 794853 zeromq.orig.tar.gz
diff --git a/libs/libzmq/packaging/nuget/package.bat b/libs/libzmq/packaging/nuget/package.bat
deleted file mode 100644
index d8096e4..0000000
--- a/libs/libzmq/packaging/nuget/package.bat
+++ /dev/null
@@ -1,14 +0,0 @@
-@ECHO OFF
-ECHO Started nuget packaging build.
-ECHO.
-REM http://www.nuget.org/packages/gsl
-gsl -q -script:package.gsl package.config
-ECHO.
-REM http://nuget.codeplex.com/releases
-nuget pack package.nuspec -verbosity detailed
-ECHO.
-ECHO NOTE: Ignore warnings not applicable to native code: "Issue: Assembly outside lib folder."
-ECHO.
-ECHO Completed nuget packaging build. The package is in the following folder:
-CD
-PAUSE
\ No newline at end of file
diff --git a/libs/libzmq/packaging/nuget/package.config b/libs/libzmq/packaging/nuget/package.config
deleted file mode 100644
index 744309a..0000000
--- a/libs/libzmq/packaging/nuget/package.config
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- These values are populated into the package.gsl templates by package.bat. -->
-<!-- The target attribute controls path and file name only, id controls package naming. -->
-<package id="libzmq-vc142" target="libzmq" version = "4.2.3.0" pathversion="4_2_3_0" platformtoolset="v142">
-  <!--<dependency id="libsodium_vc120" version="1.0.12.0" />-->
-</package>
\ No newline at end of file
diff --git a/libs/libzmq/packaging/nuget/package.gsl b/libs/libzmq/packaging/nuget/package.gsl
deleted file mode 100644
index c0c3db4..0000000
--- a/libs/libzmq/packaging/nuget/package.gsl
+++ /dev/null
@@ -1,264 +0,0 @@
-.#  Generate NuGet nuspec file (for subsequent packing).
-.#
-.#  This is a code generator built using the iMatix GSL code generation
-.#  language. See https://github.com/zeromq/gsl for details. This script
-.#  is licensed under MIT/X11.
-.#
-.echo "Generating package.nuspec from template."
-.output "package.nuspec"
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-#################################################################
-#   GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY    #
-#################################################################
--->
-<package xmlns="http://schemas.microsoft.com/packaging/2013/01/nuspec.xsd">
-    <metadata minClientVersion="2.5">
-        <id>$(package.id)</id>
-        <version>$(package.version)</version>
-        <title>$(package.id)</title>
-        <authors>libzmq contributors</authors>
-        <owners>Eric Voskuil</owners>
-        <licenseUrl>https://raw.github.com/zeromq/libzmq/master/COPYING.LESSER</licenseUrl>
-        <projectUrl>https://github.com/zeromq/libzmq</projectUrl>
-        <iconUrl>https://avatars1.githubusercontent.com/u/109777?s=32</iconUrl>
-        <requireLicenseAcceptance>true</requireLicenseAcceptance>
-        <developmentDependency>false</developmentDependency>
-        <description>The 0MQ lightweight messaging kernel is a library which extends the standard socket interfaces with features traditionally provided by specialised messaging middleware products. 0MQ sockets provide an abstraction of asynchronous message queues, multiple messaging patterns, message filtering (subscriptions), seamless access to multiple transport protocols and more.</description>
-        <summary>The 0MQ lightweight messaging kernel, with tweetnacl integrated, packaged for specific Visual Studio compiler.</summary>
-        <releaseNotes>https://raw.github.com/zeromq/libzmq/master/NEWS</releaseNotes>
-        <copyright>GNU Lesser GPL v3</copyright>
-        <tags>native, libzmq, zmq, 0MQ, messaging, sockets, C++</tags>
-        <dependencies>
-.for dependency
-            <dependency id="$(id)" version="$(version)" />
-.endfor
-        </dependencies>
-    </metadata>
-    <files>
-        <!-- include -->
-        
-        <file src="..\\..\\include\\*.h" target="build\\native\\include" />
-        <file src="..\\..\\builds\\msvc\\platform.hpp" target="build\\native\\include" />
-
-        <!-- targets -->
-      
-        <file src="package.targets" target="build\\native\\$(package.id).targets" />
-        <file src="package.xml" target="build\\native\\package.xml" />
-        
-        <!-- docs -->
-        
-        <!-- Documents (.*) -->
-        <!--<file src="..\\..\\docs\\*" target="build\\native\\docs" />-->
-        
-        <!-- libraries -->
-
-        <!-- x86 Dynamic libraries (.dll) -->
-        <file src="..\\..\\bin\\Win32\\Release\\$(package.platformtoolset)\\dynamic\\$(package.target).dll" target="build\\native\\bin\\$(package.target)-x86-$(package.platformtoolset)-mt-$(package.pathversion).dll" />
-        <file src="..\\..\\bin\\Win32\\Debug\\$(package.platformtoolset)\\dynamic\\$(package.target).dll" target="build\\native\\bin\\$(package.target)-x86-$(package.platformtoolset)-mt-gd-$(package.pathversion).dll" />
-
-        <!-- x86 Debugging symbols (.pdb) -->
-        <!--<file src="..\\..\\bin\\Win32\\Release\\$(package.platformtoolset)\\dynamic\\$(package.target).pdb" target="build\\native\\bin\\$(package.target)-x86-$(package.platformtoolset)-mt-$(package.pathversion).pdb" />-->
-        <file src="..\\..\\bin\\Win32\\Debug\\$(package.platformtoolset)\\dynamic\\$(package.target).pdb" target="build\\native\\bin\\$(package.target)-x86-$(package.platformtoolset)-mt-gd-$(package.pathversion).pdb" />
-
-        <!-- x86 Import libraries (.imp.lib) -->
-        <file src="..\\..\\bin\\Win32\\Release\\$(package.platformtoolset)\\dynamic\\$(package.target).lib" target="build\\native\\bin\\$(package.target)-x86-$(package.platformtoolset)-mt-$(package.pathversion).imp.lib" />
-        <file src="..\\..\\bin\\Win32\\Debug\\$(package.platformtoolset)\\dynamic\\$(package.target).lib" target="build\\native\\bin\\$(package.target)-x86-$(package.platformtoolset)-mt-gd-$(package.pathversion).imp.lib" />
-
-        <!-- x86 Export libraries (.exp) -->
-        <file src="..\\..\\bin\\Win32\\Release\\$(package.platformtoolset)\\dynamic\\$(package.target).exp" target="build\\native\\bin\\$(package.target)-x86-$(package.platformtoolset)-mt-$(package.pathversion).exp" />
-        <file src="..\\..\\bin\\Win32\\Debug\\$(package.platformtoolset)\\dynamic\\$(package.target).exp" target="build\\native\\bin\\$(package.target)-x86-$(package.platformtoolset)-mt-gd-$(package.pathversion).exp" />
-
-        <!-- x86 Static libraries (.lib) -->
-        <file src="..\\..\\bin\\Win32\\Release\\$(package.platformtoolset)\\static\\$(package.target).lib" target="build\\native\\bin\\$(package.target)-x86-$(package.platformtoolset)-mt-s-$(package.pathversion).lib" />
-        <file src="..\\..\\bin\\Win32\\Debug\\$(package.platformtoolset)\\static\\$(package.target).lib" target="build\\native\\bin\\$(package.target)-x86-$(package.platformtoolset)-mt-sgd-$(package.pathversion).lib" />
-
-        <!-- x86 Static link time code generation libraries (.ltcg.lib) -->
-        <file src="..\\..\\bin\\Win32\\Release\\$(package.platformtoolset)\\ltcg\\$(package.target).lib" target="build\\native\\bin\\$(package.target)-x86-$(package.platformtoolset)-mt-s-$(package.pathversion).ltcg.lib" />
-        <file src="..\\..\\bin\\Win32\\Debug\\$(package.platformtoolset)\\ltcg\\$(package.target).lib" target="build\\native\\bin\\$(package.target)-x86-$(package.platformtoolset)-mt-sgd-$(package.pathversion).ltcg.lib" />
-
-        <!-- x64 Dynamic libraries (.dll) -->
-        <file src="..\\..\\bin\\x64\\Release\\$(package.platformtoolset)\\dynamic\\$(package.target).dll" target="build\\native\\bin\\$(package.target)-x64-$(package.platformtoolset)-mt-$(package.pathversion).dll" />
-        <file src="..\\..\\bin\\x64\\Debug\\$(package.platformtoolset)\\dynamic\\$(package.target).dll" target="build\\native\\bin\\$(package.target)-x64-$(package.platformtoolset)-mt-gd-$(package.pathversion).dll" />
-
-        <!-- x64 Debugging symbols (.pdb) -->
-        <!--<file src="..\\..\\bin\\x64\\Release\\$(package.platformtoolset)\\dynamic\\$(package.target).pdb" target="build\\native\\bin\\$(package.target)-x64-$(package.platformtoolset)-mt-$(package.pathversion).pdb" />-->
-        <file src="..\\..\\bin\\x64\\Debug\\$(package.platformtoolset)\\dynamic\\$(package.target).pdb" target="build\\native\\bin\\$(package.target)-x64-$(package.platformtoolset)-mt-gd-$(package.pathversion).pdb" />
-
-        <!-- x64 Import libraries (.imp.lib) -->
-        <file src="..\\..\\bin\\x64\\Release\\$(package.platformtoolset)\\dynamic\\$(package.target).lib" target="build\\native\\bin\\$(package.target)-x64-$(package.platformtoolset)-mt-$(package.pathversion).imp.lib" />
-        <file src="..\\..\\bin\\x64\\Debug\\$(package.platformtoolset)\\dynamic\\$(package.target).lib" target="build\\native\\bin\\$(package.target)-x64-$(package.platformtoolset)-mt-gd-$(package.pathversion).imp.lib" />
-
-        <!-- x64 Export libraries (.exp) -->
-        <file src="..\\..\\bin\\x64\\Release\\$(package.platformtoolset)\\dynamic\\$(package.target).exp" target="build\\native\\bin\\$(package.target)-x64-$(package.platformtoolset)-mt-$(package.pathversion).exp" />
-        <file src="..\\..\\bin\\x64\\Debug\\$(package.platformtoolset)\\dynamic\\$(package.target).exp" target="build\\native\\bin\\$(package.target)-x64-$(package.platformtoolset)-mt-gd-$(package.pathversion).exp" />
-
-        <!-- x64 Static libraries (.lib) -->
-        <file src="..\\..\\bin\\x64\\Release\\$(package.platformtoolset)\\static\\$(package.target).lib" target="build\\native\\bin\\$(package.target)-x64-$(package.platformtoolset)-mt-s-$(package.pathversion).lib" />
-        <file src="..\\..\\bin\\x64\\Debug\\$(package.platformtoolset)\\static\\$(package.target).lib" target="build\\native\\bin\\$(package.target)-x64-$(package.platformtoolset)-mt-sgd-$(package.pathversion).lib" />
-
-        <!-- x64 Static link time code generation libraries (.ltcg.lib) -->
-        <file src="..\\..\\bin\\Win32\\Release\\$(package.platformtoolset)\\ltcg\\$(package.target).lib" target="build\\native\\bin\\$(package.target)-x64-$(package.platformtoolset)-mt-s-$(package.pathversion).ltcg.lib" />
-        <file src="..\\..\\bin\\Win32\\Debug\\$(package.platformtoolset)\\ltcg\\$(package.target).lib" target="build\\native\\bin\\$(package.target)-x64-$(package.platformtoolset)-mt-sgd-$(package.pathversion).ltcg.lib" />
-    </files>
-<!--
-#################################################################
-#   GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY    #
-#################################################################
--->
-</package>
-.echo "Generating package.targets from template."
-.output "package.targets"
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-#################################################################
-#   GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY    #
-#################################################################
--->
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <!-- user interface -->
-  <ItemGroup>
-    <PropertyPageSchema Include="$\(MSBuildThisFileDirectory)package.xml" />
-  </ItemGroup>
-
-  <!-- general -->
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <!-- ZMQ_USE_TWEETNACL defined in packaged builds and must be defined for package consumer. -->
-      <PreprocessorDefinitions>ZMQ_USE_TWEETNACL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$\(MSBuildThisFileDirectory)include\\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <AdditionalLibraryDirectories>$\(MSBuildThisFileDirectory)bin\\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$\(Linkage-$(package.target))' == 'static' Or '$\(Linkage-$(package.target))' == 'ltcg'">
-    <ClCompile>
-      <PreprocessorDefinitions>ZMQ_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemDefinitionGroup>
-
-  <!-- static libraries -->
-  <ItemDefinitionGroup Condition="'$\(Platform)' == 'Win32' And ('$\(PlatformToolset)' == '$(package.platformtoolset)' Or '$\(PlatformToolset)' == 'CTP_Nov2013') And '$\(Linkage-$(package.target))' == 'static' And $\(Configuration.IndexOf('Release')) != -1">
-    <Link>
-      <AdditionalDependencies>$(package.target)-x86-$(package.platformtoolset)-mt-s-$(package.pathversion).lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$\(Platform)' == 'Win32' And ('$\(PlatformToolset)' == '$(package.platformtoolset)' Or '$\(PlatformToolset)' == 'CTP_Nov2013') And '$\(Linkage-$(package.target))' == 'static' And $\(Configuration.IndexOf('Debug')) != -1">
-    <Link>
-      <AdditionalDependencies>$(package.target)-x86-$(package.platformtoolset)-mt-sgd-$(package.pathversion).lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$\(Platform)' == 'x64' And ('$\(PlatformToolset)' == '$(package.platformtoolset)' Or '$\(PlatformToolset)' == 'CTP_Nov2013') And '$\(Linkage-$(package.target))' == 'static' And $\(Configuration.IndexOf('Release')) != -1">
-    <Link>
-      <AdditionalDependencies>$(package.target)-x64-$(package.platformtoolset)-mt-s-$(package.pathversion).lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$\(Platform)' == 'x64' And ('$\(PlatformToolset)' == '$(package.platformtoolset)' Or '$\(PlatformToolset)' == 'CTP_Nov2013') And '$\(Linkage-$(package.target))' == 'static' And $\(Configuration.IndexOf('Debug')) != -1">
-    <Link>
-      <AdditionalDependencies>$(package.target)-x64-$(package.platformtoolset)-mt-sgd-$(package.pathversion).lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <!-- static ltcg libraries -->
-  <ItemDefinitionGroup Condition="'$\(Platform)' == 'Win32' And ('$\(PlatformToolset)' == '$(package.platformtoolset)' Or '$\(PlatformToolset)' == 'CTP_Nov2013') And '$\(Linkage-$(package.target))' == 'ltcg' And $\(Configuration.IndexOf('Release')) != -1">
-    <Link>
-      <AdditionalDependencies>$(package.target)-x86-$(package.platformtoolset)-mt-s-$(package.pathversion).ltcg.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$\(Platform)' == 'Win32' And ('$\(PlatformToolset)' == '$(package.platformtoolset)' Or '$\(PlatformToolset)' == 'CTP_Nov2013') And '$\(Linkage-$(package.target))' == 'ltcg' And $\(Configuration.IndexOf('Debug')) != -1">
-    <Link>
-      <AdditionalDependencies>$(package.target)-x86-$(package.platformtoolset)-mt-sgd-$(package.pathversion).ltcg.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$\(Platform)' == 'x64' And ('$\(PlatformToolset)' == '$(package.platformtoolset)' Or '$\(PlatformToolset)' == 'CTP_Nov2013') And '$\(Linkage-$(package.target))' == 'ltcg' And $\(Configuration.IndexOf('Release')) != -1">
-    <Link>
-      <AdditionalDependencies>$(package.target)-x64-$(package.platformtoolset)-mt-s-$(package.pathversion).ltcg.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$\(Platform)' == 'x64' And ('$\(PlatformToolset)' == '$(package.platformtoolset)' Or '$\(PlatformToolset)' == 'CTP_Nov2013') And '$\(Linkage-$(package.target))' == 'ltcg' And $\(Configuration.IndexOf('Debug')) != -1">
-    <Link>
-      <AdditionalDependencies>$(package.target)-x64-$(package.platformtoolset)-mt-sgd-$(package.pathversion).ltcg.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  
-  <!-- dynamic import libraries -->
-  <ItemDefinitionGroup Condition="'$\(Platform)' == 'Win32' And ('$\(PlatformToolset)' == '$(package.platformtoolset)' Or '$\(PlatformToolset)' == 'CTP_Nov2013') And '$\(Linkage-$(package.target))' == 'dynamic' And $\(Configuration.IndexOf('Release')) != -1">
-    <Link>
-      <AdditionalDependencies>$(package.target)-x86-$(package.platformtoolset)-mt-$(package.pathversion).imp.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$\(Platform)' == 'Win32' And ('$\(PlatformToolset)' == '$(package.platformtoolset)' Or '$\(PlatformToolset)' == 'CTP_Nov2013') And '$\(Linkage-$(package.target))' == 'dynamic' And $\(Configuration.IndexOf('Debug')) != -1">
-    <Link>
-      <AdditionalDependencies>$(package.target)-x86-$(package.platformtoolset)-mt-gd-$(package.pathversion).imp.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$\(Platform)' == 'x64' And ('$\(PlatformToolset)' == '$(package.platformtoolset)' Or '$\(PlatformToolset)' == 'CTP_Nov2013') And '$\(Linkage-$(package.target))' == 'dynamic' And $\(Configuration.IndexOf('Release')) != -1">
-    <Link>
-      <AdditionalDependencies>$(package.target)-x64-$(package.platformtoolset)-mt-$(package.pathversion).imp.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$\(Platform)' == 'x64' And ('$\(PlatformToolset)' == '$(package.platformtoolset)' Or '$\(PlatformToolset)' == 'CTP_Nov2013') And '$\(Linkage-$(package.target))' == 'dynamic' And $\(Configuration.IndexOf('Debug')) != -1">
-    <Link>
-      <AdditionalDependencies>$(package.target)-x64-$(package.platformtoolset)-mt-gd-$(package.pathversion).imp.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <!-- dynamic libraries with debug symbols -->
-  <Target Name="$(package.target)_AfterBuild" AfterTargets="AfterBuild" />
-  <Target Name="$(package.target)_AfterBuild_Win32_$(package.platformtoolset)_Dynamic_Release"
-          Condition="'$\(Platform)' == 'Win32' And ('$\(PlatformToolset)' == '$(package.platformtoolset)' Or '$\(PlatformToolset)' == 'CTP_Nov2013') And '$\(Linkage-$(package.target))' == 'dynamic' And $\(Configuration.IndexOf('Release')) != -1"
-          AfterTargets="$(package.target)_AfterBuild">
-    <Copy SourceFiles="$\(MSBuildThisFileDirectory)bin\\$(package.target)-x86-$(package.platformtoolset)-mt-$(package.pathversion).dll" DestinationFiles="$\(TargetDir)$(package.target).dll" SkipUnchangedFiles="true" />
-    <!--<Copy SourceFiles="$\(MSBuildThisFileDirectory)bin\\$(package.target)-x86-$(package.platformtoolset)-mt-$(package.pathversion).pdb" DestinationFiles="$\(TargetDir)$(package.target).pdb" SkipUnchangedFiles="true" />-->
-  </Target>
-  <Target Name="$(package.target)_AfterBuild_Win32_$(package.platformtoolset)_Dynamic_Debug"
-          Condition="'$\(Platform)' == 'Win32' And ('$\(PlatformToolset)' == '$(package.platformtoolset)' Or '$\(PlatformToolset)' == 'CTP_Nov2013') And '$\(Linkage-$(package.target))' == 'dynamic' And $\(Configuration.IndexOf('Debug')) != -1"
-          AfterTargets="$(package.target)_AfterBuild">
-    <Copy SourceFiles="$\(MSBuildThisFileDirectory)bin\\$(package.target)-x86-$(package.platformtoolset)-mt-gd-$(package.pathversion).dll" DestinationFiles="$\(TargetDir)$(package.target).dll" SkipUnchangedFiles="true" />
-    <Copy SourceFiles="$\(MSBuildThisFileDirectory)bin\\$(package.target)-x86-$(package.platformtoolset)-mt-gd-$(package.pathversion).pdb" DestinationFiles="$\(TargetDir)$(package.target).pdb" SkipUnchangedFiles="true" />
-  </Target>
-  <Target Name="$(package.target)_AfterBuild_x64_$(package.platformtoolset)_Dynamic_Release"
-          Condition="'$\(Platform)' == 'x64' And ('$\(PlatformToolset)' == '$(package.platformtoolset)' Or '$\(PlatformToolset)' == 'CTP_Nov2013') And '$\(Linkage-$(package.target))' == 'dynamic' And $\(Configuration.IndexOf('Release')) != -1"
-          AfterTargets="$(package.target)_AfterBuild">
-    <Copy SourceFiles="$\(MSBuildThisFileDirectory)bin\\$(package.target)-x64-$(package.platformtoolset)-mt-$(package.pathversion).dll" DestinationFiles="$\(TargetDir)$(package.target).dll" SkipUnchangedFiles="true" />
-    <!--<Copy SourceFiles="$\(MSBuildThisFileDirectory)bin\\$(package.target)-x64-$(package.platformtoolset)-mt-$(package.pathversion).pdb" DestinationFiles="$\(TargetDir)$(package.target).pdb" SkipUnchangedFiles="true" />-->
-  </Target>
-  <Target Name="$(package.target)_AfterBuild_x64_$(package.platformtoolset)_Dynamic_Debug"
-          Condition="'$\(Platform)' == 'x64' And ('$\(PlatformToolset)' == '$(package.platformtoolset)' Or '$\(PlatformToolset)' == 'CTP_Nov2013') And '$\(Linkage-$(package.target))' == 'dynamic' And $\(Configuration.IndexOf('Debug')) != -1"
-          AfterTargets="$(package.target)_AfterBuild">
-    <Copy SourceFiles="$\(MSBuildThisFileDirectory)bin\\$(package.target)-x64-$(package.platformtoolset)-mt-gd-$(package.pathversion).dll" DestinationFiles="$\(TargetDir)$(package.target).dll" SkipUnchangedFiles="true" />
-    <Copy SourceFiles="$\(MSBuildThisFileDirectory)bin\\$(package.target)-x64-$(package.platformtoolset)-mt-gd-$(package.pathversion).pdb" DestinationFiles="$\(TargetDir)$(package.target).pdb" SkipUnchangedFiles="true" />
-  </Target>
-
-<!--
-#################################################################
-#   GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY    #
-#################################################################
--->
-</Project>
-.echo "Generating package.xml (ui extension) from template."
-.output "package.xml"
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-#################################################################
-#   GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY    #
-#################################################################
--->
-<ProjectSchemaDefinitions xmlns="clr-namespace:Microsoft.Build.Framework.XamlTypes;assembly=Microsoft.Build.Framework">
-  <Rule Name="Linkage-$(package.target)-uiextension" PageTemplate="tool" DisplayName="NuGet Dependencies" SwitchPrefix="/" Order="1">
-    <Rule.Categories>
-      <Category Name="$(package.target)" DisplayName="$(package.target)" />
-    </Rule.Categories>
-    <Rule.DataSource>
-      <DataSource Persistence="ProjectFile" ItemType="" />
-    </Rule.DataSource>
-    <EnumProperty Name="Linkage-$(package.target)" DisplayName="Linkage" Description="How NuGet $(package.target) will be linked into the output of this project" Category="$(package.target)">
-      <EnumValue Name="" DisplayName="Not linked" />
-      <EnumValue Name="dynamic" DisplayName="Dynamic (DLL)" />
-      <EnumValue Name="static" DisplayName="Static (LIB)" />
-      <EnumValue Name="ltcg" DisplayName="Static using link time compile generation (LTCG)" />
-    </EnumProperty>
-  </Rule>
-</ProjectSchemaDefinitions>
\ No newline at end of file
diff --git a/libs/libzmq/packaging/nuget/package.nuspec b/libs/libzmq/packaging/nuget/package.nuspec
deleted file mode 100644
index d1b2e28..0000000
--- a/libs/libzmq/packaging/nuget/package.nuspec
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-#################################################################
-#   GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY    #
-#################################################################
--->
-<package xmlns="http://schemas.microsoft.com/packaging/2013/01/nuspec.xsd">
-    <metadata minClientVersion="2.5">
-        <id>libzmq-vc142</id>
-        <version>4.2.3.0</version>
-        <title>libzmq-vc142</title>
-        <authors>libzmq contributors</authors>
-        <owners>Eric Voskuil</owners>
-        <licenseUrl>https://raw.github.com/zeromq/libzmq/master/COPYING.LESSER</licenseUrl>
-        <projectUrl>https://github.com/zeromq/libzmq</projectUrl>
-        <iconUrl>https://avatars1.githubusercontent.com/u/109777?s=32</iconUrl>
-        <requireLicenseAcceptance>true</requireLicenseAcceptance>
-        <developmentDependency>false</developmentDependency>
-        <description>The 0MQ lightweight messaging kernel is a library which extends the standard socket interfaces with features traditionally provided by specialised messaging middleware products. 0MQ sockets provide an abstraction of asynchronous message queues, multiple messaging patterns, message filtering (subscriptions), seamless access to multiple transport protocols and more.</description>
-        <summary>The 0MQ lightweight messaging kernel, with tweetnacl integrated, packaged for specific Visual Studio compiler.</summary>
-        <releaseNotes>https://raw.github.com/zeromq/libzmq/master/NEWS</releaseNotes>
-        <copyright>GNU Lesser GPL v3</copyright>
-        <tags>native, libzmq, zmq, 0MQ, messaging, sockets, C++</tags>
-        <dependencies>
-        </dependencies>
-    </metadata>
-    <files>
-        <!-- include -->
-
-        <file src="..\..\include\*.h" target="build\native\include" />
-        <file src="..\..\builds\msvc\platform.hpp" target="build\native\include" />
-
-        <!-- targets -->
-
-        <file src="package.targets" target="build\native\libzmq-vc142.targets" />
-        <file src="package.xml" target="build\native\package.xml" />
-
-        <!-- docs -->
-
-        <!-- Documents (.*) -->
-        <!--<file src="..\..\docs\*" target="build\native\docs" />-->
-
-        <!-- libraries -->
-
-        <!-- x86 Dynamic libraries (.dll) -->
-        <file src="..\..\bin\Win32\Release\v142\dynamic\libzmq.dll" target="build\native\bin\libzmq-x86-v142-mt-4_2_3_0.dll" />
-        <file src="..\..\bin\Win32\Debug\v142\dynamic\libzmq.dll" target="build\native\bin\libzmq-x86-v142-mt-gd-4_2_3_0.dll" />
-
-        <!-- x86 Debugging symbols (.pdb) -->
-        <!--<file src="..\..\bin\Win32\Release\v142\dynamic\libzmq.pdb" target="build\native\bin\libzmq-x86-v142-mt-4_2_3_0.pdb" />-->
-        <file src="..\..\bin\Win32\Debug\v142\dynamic\libzmq.pdb" target="build\native\bin\libzmq-x86-v142-mt-gd-4_2_3_0.pdb" />
-
-        <!-- x86 Import libraries (.imp.lib) -->
-        <file src="..\..\bin\Win32\Release\v142\dynamic\libzmq.lib" target="build\native\bin\libzmq-x86-v142-mt-4_2_3_0.imp.lib" />
-        <file src="..\..\bin\Win32\Debug\v142\dynamic\libzmq.lib" target="build\native\bin\libzmq-x86-v142-mt-gd-4_2_3_0.imp.lib" />
-
-        <!-- x86 Export libraries (.exp) -->
-        <file src="..\..\bin\Win32\Release\v142\dynamic\libzmq.exp" target="build\native\bin\libzmq-x86-v142-mt-4_2_3_0.exp" />
-        <file src="..\..\bin\Win32\Debug\v142\dynamic\libzmq.exp" target="build\native\bin\libzmq-x86-v142-mt-gd-4_2_3_0.exp" />
-
-        <!-- x86 Static libraries (.lib) -->
-        <file src="..\..\bin\Win32\Release\v142\static\libzmq.lib" target="build\native\bin\libzmq-x86-v142-mt-s-4_2_3_0.lib" />
-        <file src="..\..\bin\Win32\Debug\v142\static\libzmq.lib" target="build\native\bin\libzmq-x86-v142-mt-sgd-4_2_3_0.lib" />
-
-        <!-- x86 Static link time code generation libraries (.ltcg.lib) -->
-        <file src="..\..\bin\Win32\Release\v142\ltcg\libzmq.lib" target="build\native\bin\libzmq-x86-v142-mt-s-4_2_3_0.ltcg.lib" />
-        <file src="..\..\bin\Win32\Debug\v142\ltcg\libzmq.lib" target="build\native\bin\libzmq-x86-v142-mt-sgd-4_2_3_0.ltcg.lib" />
-
-        <!-- x64 Dynamic libraries (.dll) -->
-        <file src="..\..\bin\x64\Release\v142\dynamic\libzmq.dll" target="build\native\bin\libzmq-x64-v142-mt-4_2_3_0.dll" />
-        <file src="..\..\bin\x64\Debug\v142\dynamic\libzmq.dll" target="build\native\bin\libzmq-x64-v142-mt-gd-4_2_3_0.dll" />
-
-        <!-- x64 Debugging symbols (.pdb) -->
-        <!--<file src="..\..\bin\x64\Release\v142\dynamic\libzmq.pdb" target="build\native\bin\libzmq-x64-v142-mt-4_2_3_0.pdb" />-->
-        <file src="..\..\bin\x64\Debug\v142\dynamic\libzmq.pdb" target="build\native\bin\libzmq-x64-v142-mt-gd-4_2_3_0.pdb" />
-
-        <!-- x64 Import libraries (.imp.lib) -->
-        <file src="..\..\bin\x64\Release\v142\dynamic\libzmq.lib" target="build\native\bin\libzmq-x64-v142-mt-4_2_3_0.imp.lib" />
-        <file src="..\..\bin\x64\Debug\v142\dynamic\libzmq.lib" target="build\native\bin\libzmq-x64-v142-mt-gd-4_2_3_0.imp.lib" />
-
-        <!-- x64 Export libraries (.exp) -->
-        <file src="..\..\bin\x64\Release\v142\dynamic\libzmq.exp" target="build\native\bin\libzmq-x64-v142-mt-4_2_3_0.exp" />
-        <file src="..\..\bin\x64\Debug\v142\dynamic\libzmq.exp" target="build\native\bin\libzmq-x64-v142-mt-gd-4_2_3_0.exp" />
-
-        <!-- x64 Static libraries (.lib) -->
-        <file src="..\..\bin\x64\Release\v142\static\libzmq.lib" target="build\native\bin\libzmq-x64-v142-mt-s-4_2_3_0.lib" />
-        <file src="..\..\bin\x64\Debug\v142\static\libzmq.lib" target="build\native\bin\libzmq-x64-v142-mt-sgd-4_2_3_0.lib" />
-
-        <!-- x64 Static link time code generation libraries (.ltcg.lib) -->
-        <file src="..\..\bin\Win32\Release\v142\ltcg\libzmq.lib" target="build\native\bin\libzmq-x64-v142-mt-s-4_2_3_0.ltcg.lib" />
-        <file src="..\..\bin\Win32\Debug\v142\ltcg\libzmq.lib" target="build\native\bin\libzmq-x64-v142-mt-sgd-4_2_3_0.ltcg.lib" />
-    </files>
-<!--
-#################################################################
-#   GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY    #
-#################################################################
--->
-</package>
diff --git a/libs/libzmq/packaging/nuget/package.targets b/libs/libzmq/packaging/nuget/package.targets
deleted file mode 100644
index 57813a7..0000000
--- a/libs/libzmq/packaging/nuget/package.targets
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-#################################################################
-#   GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY    #
-#################################################################
--->
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <!-- user interface -->
-  <ItemGroup>
-    <PropertyPageSchema Include="$(MSBuildThisFileDirectory)package.xml" />
-  </ItemGroup>
-
-  <!-- general -->
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <!-- ZMQ_USE_TWEETNACL defined in packaged builds and must be defined for package consumer. -->
-      <PreprocessorDefinitions>ZMQ_USE_TWEETNACL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <AdditionalLibraryDirectories>$(MSBuildThisFileDirectory)bin\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Linkage-libzmq)' == 'static' Or '$(Linkage-libzmq)' == 'ltcg'">
-    <ClCompile>
-      <PreprocessorDefinitions>ZMQ_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemDefinitionGroup>
-
-  <!-- static libraries -->
-  <ItemDefinitionGroup Condition="'$(Platform)' == 'Win32' And ('$(PlatformToolset)' == 'v142' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libzmq)' == 'static' And $(Configuration.IndexOf('Release')) != -1">
-    <Link>
-      <AdditionalDependencies>libzmq-x86-v142-mt-s-4_2_3_0.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Platform)' == 'Win32' And ('$(PlatformToolset)' == 'v142' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libzmq)' == 'static' And $(Configuration.IndexOf('Debug')) != -1">
-    <Link>
-      <AdditionalDependencies>libzmq-x86-v142-mt-sgd-4_2_3_0.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Platform)' == 'x64' And ('$(PlatformToolset)' == 'v142' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libzmq)' == 'static' And $(Configuration.IndexOf('Release')) != -1">
-    <Link>
-      <AdditionalDependencies>libzmq-x64-v142-mt-s-4_2_3_0.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Platform)' == 'x64' And ('$(PlatformToolset)' == 'v142' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libzmq)' == 'static' And $(Configuration.IndexOf('Debug')) != -1">
-    <Link>
-      <AdditionalDependencies>libzmq-x64-v142-mt-sgd-4_2_3_0.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <!-- static ltcg libraries -->
-  <ItemDefinitionGroup Condition="'$(Platform)' == 'Win32' And ('$(PlatformToolset)' == 'v142' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libzmq)' == 'ltcg' And $(Configuration.IndexOf('Release')) != -1">
-    <Link>
-      <AdditionalDependencies>libzmq-x86-v142-mt-s-4_2_3_0.ltcg.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Platform)' == 'Win32' And ('$(PlatformToolset)' == 'v142' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libzmq)' == 'ltcg' And $(Configuration.IndexOf('Debug')) != -1">
-    <Link>
-      <AdditionalDependencies>libzmq-x86-v142-mt-sgd-4_2_3_0.ltcg.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Platform)' == 'x64' And ('$(PlatformToolset)' == 'v142' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libzmq)' == 'ltcg' And $(Configuration.IndexOf('Release')) != -1">
-    <Link>
-      <AdditionalDependencies>libzmq-x64-v142-mt-s-4_2_3_0.ltcg.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Platform)' == 'x64' And ('$(PlatformToolset)' == 'v142' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libzmq)' == 'ltcg' And $(Configuration.IndexOf('Debug')) != -1">
-    <Link>
-      <AdditionalDependencies>libzmq-x64-v142-mt-sgd-4_2_3_0.ltcg.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <!-- dynamic import libraries -->
-  <ItemDefinitionGroup Condition="'$(Platform)' == 'Win32' And ('$(PlatformToolset)' == 'v142' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libzmq)' == 'dynamic' And $(Configuration.IndexOf('Release')) != -1">
-    <Link>
-      <AdditionalDependencies>libzmq-x86-v142-mt-4_2_3_0.imp.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Platform)' == 'Win32' And ('$(PlatformToolset)' == 'v142' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libzmq)' == 'dynamic' And $(Configuration.IndexOf('Debug')) != -1">
-    <Link>
-      <AdditionalDependencies>libzmq-x86-v142-mt-gd-4_2_3_0.imp.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Platform)' == 'x64' And ('$(PlatformToolset)' == 'v142' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libzmq)' == 'dynamic' And $(Configuration.IndexOf('Release')) != -1">
-    <Link>
-      <AdditionalDependencies>libzmq-x64-v142-mt-4_2_3_0.imp.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Platform)' == 'x64' And ('$(PlatformToolset)' == 'v142' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libzmq)' == 'dynamic' And $(Configuration.IndexOf('Debug')) != -1">
-    <Link>
-      <AdditionalDependencies>libzmq-x64-v142-mt-gd-4_2_3_0.imp.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <!-- dynamic libraries with debug symbols -->
-  <Target Name="libzmq_AfterBuild" AfterTargets="AfterBuild" />
-  <Target Name="libzmq_AfterBuild_Win32_v142_Dynamic_Release"
-          Condition="'$(Platform)' == 'Win32' And ('$(PlatformToolset)' == 'v142' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libzmq)' == 'dynamic' And $(Configuration.IndexOf('Release')) != -1"
-          AfterTargets="libzmq_AfterBuild">
-    <Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libzmq-x86-v142-mt-4_2_3_0.dll" DestinationFiles="$(TargetDir)libzmq.dll" SkipUnchangedFiles="true" />
-    <!--<Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libzmq-x86-v142-mt-4_2_3_0.pdb" DestinationFiles="$(TargetDir)libzmq.pdb" SkipUnchangedFiles="true" />-->
-  </Target>
-  <Target Name="libzmq_AfterBuild_Win32_v142_Dynamic_Debug"
-          Condition="'$(Platform)' == 'Win32' And ('$(PlatformToolset)' == 'v142' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libzmq)' == 'dynamic' And $(Configuration.IndexOf('Debug')) != -1"
-          AfterTargets="libzmq_AfterBuild">
-    <Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libzmq-x86-v142-mt-gd-4_2_3_0.dll" DestinationFiles="$(TargetDir)libzmq.dll" SkipUnchangedFiles="true" />
-    <Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libzmq-x86-v142-mt-gd-4_2_3_0.pdb" DestinationFiles="$(TargetDir)libzmq.pdb" SkipUnchangedFiles="true" />
-  </Target>
-  <Target Name="libzmq_AfterBuild_x64_v142_Dynamic_Release"
-          Condition="'$(Platform)' == 'x64' And ('$(PlatformToolset)' == 'v142' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libzmq)' == 'dynamic' And $(Configuration.IndexOf('Release')) != -1"
-          AfterTargets="libzmq_AfterBuild">
-    <Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libzmq-x64-v142-mt-4_2_3_0.dll" DestinationFiles="$(TargetDir)libzmq.dll" SkipUnchangedFiles="true" />
-    <!--<Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libzmq-x64-v142-mt-4_2_3_0.pdb" DestinationFiles="$(TargetDir)libzmq.pdb" SkipUnchangedFiles="true" />-->
-  </Target>
-  <Target Name="libzmq_AfterBuild_x64_v142_Dynamic_Debug"
-          Condition="'$(Platform)' == 'x64' And ('$(PlatformToolset)' == 'v142' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libzmq)' == 'dynamic' And $(Configuration.IndexOf('Debug')) != -1"
-          AfterTargets="libzmq_AfterBuild">
-    <Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libzmq-x64-v142-mt-gd-4_2_3_0.dll" DestinationFiles="$(TargetDir)libzmq.dll" SkipUnchangedFiles="true" />
-    <Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libzmq-x64-v142-mt-gd-4_2_3_0.pdb" DestinationFiles="$(TargetDir)libzmq.pdb" SkipUnchangedFiles="true" />
-  </Target>
-
-<!--
-#################################################################
-#   GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY    #
-#################################################################
--->
-</Project>
diff --git a/libs/libzmq/packaging/nuget/package.xml b/libs/libzmq/packaging/nuget/package.xml
deleted file mode 100644
index eb8228d..0000000
--- a/libs/libzmq/packaging/nuget/package.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-#################################################################
-#   GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY    #
-#################################################################
--->
-<ProjectSchemaDefinitions xmlns="clr-namespace:Microsoft.Build.Framework.XamlTypes;assembly=Microsoft.Build.Framework">
-  <Rule Name="Linkage-libzmq-uiextension" PageTemplate="tool" DisplayName="NuGet Dependencies" SwitchPrefix="/" Order="1">
-    <Rule.Categories>
-      <Category Name="libzmq" DisplayName="libzmq" />
-    </Rule.Categories>
-    <Rule.DataSource>
-      <DataSource Persistence="ProjectFile" ItemType="" />
-    </Rule.DataSource>
-    <EnumProperty Name="Linkage-libzmq" DisplayName="Linkage" Description="How NuGet libzmq will be linked into the output of this project" Category="libzmq">
-      <EnumValue Name="" DisplayName="Not linked" />
-      <EnumValue Name="dynamic" DisplayName="Dynamic (DLL)" />
-      <EnumValue Name="static" DisplayName="Static (LIB)" />
-      <EnumValue Name="ltcg" DisplayName="Static using link time compile generation (LTCG)" />
-    </EnumProperty>
-  </Rule>
-</ProjectSchemaDefinitions>
\ No newline at end of file
diff --git a/libs/libzmq/packaging/obs/_service b/libs/libzmq/packaging/obs/_service
deleted file mode 100644
index 64f3033..0000000
--- a/libs/libzmq/packaging/obs/_service
+++ /dev/null
@@ -1,99 +0,0 @@
-<services>
-  <service name="tar_scm">
-    <param name="url">https://github.com/zeromq/libzmq</param>
-    <param name="scm">git</param>
-    <param name="revision">@PARENT_TAG@</param>
-    <param name="versionformat">@PARENT_TAG@+git%cd</param>
-    <param name="versionrewrite-pattern">v(.*)</param>
-    <param name="versionrewrite-replacement">\1</param>
-    <param name="exclude">.git</param>
-    <param name="changesgenerate">enable</param>
-    <param name="filename">zeromq</param>
-  </service>
-
-  <!-- embed zmq.hpp like Debian and Ubuntu do -->
-  <service name="download_url">
-    <param name="protocol">https</param>
-    <param name="host">github.com</param>
-    <param name="path">zeromq/cppzmq/archive/master.zip</param>
-  </service>
-  <service name="extract_file">
-    <param name="archive">*master.zip</param>
-    <param name="files">*/zmq.hpp</param>
-    <param name="outfilename">debian.zmq.hpp</param>
-  </service>
-
-  <!-- extract redhat packaging -->
-  <service name="extract_file">
-    <param name="archive">*.tar</param>
-    <param name="files">*/packaging/redhat/zeromq.spec</param>
-    <param name="outfilename">zeromq.spec</param>
-  </service>
-
-  <!-- extract debian packaging -->
-  <service name="extract_file">
-    <param name="archive">*.tar</param>
-    <param name="files">*/packaging/debian/zeromq.dsc.obs</param>
-    <param name="outfilename">zeromq.dsc</param>
-  </service>
-  <service name="extract_file">
-    <param name="archive">*.tar</param>
-    <param name="files">*/packaging/debian/changelog</param>
-    <param name="outfilename">debian.changelog</param>
-  </service>
-  <service name="extract_file">
-    <param name="archive">*.tar</param>
-    <param name="files">*/packaging/debian/compat</param>
-    <param name="outfilename">debian.compat</param>
-  </service>
-  <service name="extract_file">
-    <param name="archive">*.tar</param>
-    <param name="files">*/packaging/debian/control</param>
-    <param name="outfilename">debian.control</param>
-  </service>
-  <service name="extract_file">
-    <param name="archive">*.tar</param>
-    <param name="files">*/packaging/debian/copyright</param>
-    <param name="outfilename">debian.copyright</param>
-  </service>
-  <service name="extract_file">
-    <param name="archive">*.tar</param>
-    <param name="files">*/packaging/debian/source/format</param>
-    <param name="outfilename">debian.format</param>
-  </service>
-  <service name="extract_file">
-    <param name="archive">*.tar</param>
-    <param name="files">*/packaging/debian/rules</param>
-    <param name="outfilename">debian.rules</param>
-  </service>
-  <service name="extract_file">
-    <param name="archive">*.tar</param>
-    <param name="files">*/packaging/debian/libzmq3-dev.install</param>
-    <param name="outfilename">debian.libzmq3-dev.install</param>
-  </service>
-  <service name="extract_file">
-    <param name="archive">*.tar</param>
-    <param name="files">*/packaging/debian/libzmq3-dev.manpages</param>
-    <param name="outfilename">debian.libzmq3-dev.manpages</param>
-  </service>
-  <service name="extract_file">
-    <param name="archive">*.tar</param>
-    <param name="files">*/packaging/debian/libzmq5.docs</param>
-    <param name="outfilename">debian.libzmq5.docs</param>
-  </service>
-  <service name="extract_file">
-    <param name="archive">*.tar</param>
-    <param name="files">*/packaging/debian/libzmq5.install</param>
-    <param name="outfilename">debian.libzmq5.install</param>
-  </service>
-
-  <service name="set_version">
-    <param name="basename">zeromq</param>
-  </service>
-
-  <service name="recompress">
-    <param name="file">*.tar</param>
-    <param name="compression">gz</param>
-  </service>
-</services>
-
diff --git a/libs/libzmq/packaging/redhat/zeromq.spec b/libs/libzmq/packaging/redhat/zeromq.spec
deleted file mode 100644
index d9375ac..0000000
--- a/libs/libzmq/packaging/redhat/zeromq.spec
+++ /dev/null
@@ -1,311 +0,0 @@
-# To build with draft APIs, use "--with drafts" in rpmbuild for local builds or add
-#   Macros:
-#   %_with_drafts 1
-# at the BOTTOM of the OBS prjconf
-%bcond_with drafts
-%if %{with drafts}
-%define DRAFTS yes
-%else
-%define DRAFTS no
-%endif
-%define lib_name libzmq5
-Name:          zeromq
-Version:       4.3.5
-Release:       1%{?dist}
-Summary:       The ZeroMQ messaging library
-Group:         Development/Libraries/C and C++
-License:       LGPL-3.0-or-later
-URL:           http://www.zeromq.org/
-Source:        http://download.zeromq.org/%{name}-%{version}.tar.gz
-Prefix:        %{_prefix}
-Buildroot:     %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires:  autoconf automake libtool glib2-devel libbsd-devel
-%if ! (0%{?fedora} > 12 || 0%{?rhel} > 5)
-BuildRequires:  e2fsprogs-devel
-BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-%endif
-%bcond_with pgm
-%if %{with pgm}
-BuildRequires:  openpgm-devel
-%define PGM yes
-%else
-%define PGM no
-%endif
-%bcond_with libgssapi_krb5
-%if %{with libgssapi_krb5}
-BuildRequires:  krb5-devel
-%define GSSAPI yes
-%else
-%define GSSAPI no
-%endif
-%bcond_with libsodium
-%if %{with libsodium}
-BuildRequires:  libsodium-devel
-%define SODIUM yes
-%else
-%define SODIUM no
-%endif
-%bcond_with nss
-%if %{with nss}
-%if 0%{?suse_version}
-BuildRequires:  mozilla-nss-devel
-%else
-BuildRequires:  nss-devel
-%endif
-%define NSS yes
-%else
-%define NSS no
-%endif
-%bcond_with tls
-%if %{with tls} && ! 0%{?centos_version} < 700
-%if 0%{?suse_version}
-BuildRequires:  libgnutls-devel
-%else
-BuildRequires:  gnutls-devel
-%endif
-%define TLS yes
-%else
-%define TLS no
-%endif
-BuildRequires: gcc, make, gcc-c++, libstdc++-devel, asciidoc, xmlto
-Requires:      libstdc++
-
-#
-# Conditional build options
-# Default values are:
-#    --without-libgssapi_krb5
-#    --without-libsodium
-#    --without-pgm
-#
-
-# If neither macro exists, use the default value.
-%{!?_with_libgssapi_krb5: %{!?_without_libgssapi_krb5: %define _without_libgssapi_krb5 --without-liblibgssapi_krb5}}
-%{!?_with_libsodium: %{!?_without_libsodium: %define _without_libsodium --without-libsodium}}
-%{!?_with_pgm: %{!?_without_pgm: %define _without_pgm --without-pgm}}
-%{!?_with_nss: %{!?_without_nss: %define _without_nss --without-nss}}
-
-# It's an error if both --with and --without options are specified
-%{?_with_libgssapi_krb5: %{?_without_libgssapi_krb5: %{error: both _with_libgssapi_krb5 and _without_libgssapi_krb5}}}
-%{?_with_libsodium: %{?_without_libsodium: %{error: both _with_libsodium and _without_libsodium}}}
-%{?_with_pgm: %{?_without_pgm: %{error: both _with_pgm and _without_pgm}}}
-
-%{?_with_libgssapi_krb5:BuildRequires: krb5-devel}
-%{?_with_libgssapi_krb5:Requires: krb5-libs}
-
-%{?_with_libsodium:BuildRequires: libsodium-devel}
-%{?_with_libsodium:Requires: libsodium}
-
-%{?_with_pgm:BuildRequires: openpgm-devel}
-%{?_with_pgm:Requires: openpgm}
-
-%if 0%{?suse_version}
-%{?_with_nss:BuildRequires: mozilla-nss-devel}
-%{?_with_nss:Requires: mozilla-nss}
-%else
-%{?_with_nss:BuildRequires: nss-devel}
-%{?_with_nss:Requires: nss}
-%endif
-
-%if ! 0%{?centos_version} < 700
-%if 0%{?suse_version}
-%{?_with_tls:BuildRequires: libgnutls-devel}
-%else
-%{?_with_tls:BuildRequires: gnutls-devel}
-%endif
-%{?_with_tls:Requires: gnutls}
-%endif
-
-%ifarch pentium3 pentium4 athlon i386 i486 i586 i686 x86_64
-%{!?_with_pic: %{!?_without_pic: %define _with_pic --with-pic}}
-%{!?_with_gnu_ld: %{!?_without_gnu_ld: %define _with_gnu_ld --with-gnu_ld}}
-%endif
-
-# We do not want to ship libzmq.la
-%define _unpackaged_files_terminate_build 0
-
-%description
-The 0MQ lightweight messaging kernel is a library which extends the
-standard socket interfaces with features traditionally provided by
-specialised messaging middleware products. 0MQ sockets provide an
-abstraction of asynchronous message queues, multiple messaging
-patterns, message filtering (subscriptions), seamless access to
-multiple transport protocols and more.
-
-%package -n %{lib_name}
-Summary:   Shared Library for ZeroMQ
-Group:     Productivity/Networking/Web/Servers
-Conflicts: zeromq
-
-%description -n %{lib_name}
-The 0MQ lightweight messaging kernel is a library which extends the
-standard socket interfaces with features traditionally provided by
-specialised messaging middleware products. 0MQ sockets provide an
-abstraction of asynchronous message queues, multiple messaging
-patterns, message filtering (subscriptions), seamless access to
-multiple transport protocols and more.
-
-This package contains the ZeroMQ shared library.
-
-%package devel
-Summary:  Development files and static library for the ZeroMQ library
-Group:    Development/Libraries
-Requires: %{lib_name} = %{version}-%{release}, pkgconfig
-%bcond_with pgm
-%if %{with pgm}
-Requires:  openpgm-devel
-%endif
-%bcond_with libgssapi_krb5
-%if %{with libgssapi_krb5}
-Requires:  krb5-devel
-%endif
-%bcond_with libsodium
-%if %{with libsodium}
-Requires:  libsodium-devel
-%endif
-%bcond_with nss
-%if %{with nss}
-%if 0%{?suse_version}
-Requires:  mozilla-nss-devel
-%else
-Requires:  nss-devel
-%endif
-%endif
-%bcond_with tls
-%if %{with tls} && ! 0%{?centos_version} < 700
-%if 0%{?suse_version}
-Requires:  libgnutls-devel
-%else
-Requires:  gnutls-devel
-%endif
-%endif
-
-%description devel
-The 0MQ lightweight messaging kernel is a library which extends the
-standard socket interfaces with features traditionally provided by
-specialised messaging middleware products. 0MQ sockets provide an
-abstraction of asynchronous message queues, multiple messaging
-patterns, message filtering (subscriptions), seamless access to
-multiple transport protocols and more.
-
-This package contains ZeroMQ related development libraries and header files.
-
-%package -n libzmq-tools
-Summary:   ZeroMQ tools
-Group:     Productivity/Networking/Web/Servers
-
-%description -n libzmq-tools
-The 0MQ lightweight messaging kernel is a library which extends the
-standard socket interfaces with features traditionally provided by
-specialised messaging middleware products. 0MQ sockets provide an
-abstraction of asynchronous message queues, multiple messaging
-patterns, message filtering (subscriptions), seamless access to
-multiple transport protocols and more.
-
-This package contains tools such as curve_keygen to use with libzmq.
-
-%prep
-%setup -q
-
-# Sed version number of openpgm into configure
-%global openpgm_pc $(basename %{_libdir}/pkgconfig/openpgm*.pc .pc)
-sed -i "s/openpgm-[0-9].[0-9]/%{openpgm_pc}/g" \
-    configure*
-
-%build
-# Workaround for automake < 1.14 bug
-mkdir -p config
-autoreconf -fi
-%configure --enable-drafts=%{DRAFTS} \
-    --with-pgm=%{PGM} \
-    --with-libsodium=%{SODIUM} \
-    --with-libgssapi_krb5=%{GSSAPI} \
-    --with-nss=%{NSS} \
-    --with-tls=%{TLS} \
-    %{?_with_pic} \
-    %{?_without_pic} \
-    %{?_with_gnu_ld} \
-    %{?_without_gnu_ld}
-
-%{__make} %{?_smp_mflags}
-
-%check
-%{__make} check VERBOSE=1
-
-%install
-[ "%{buildroot}" != "/" ] && %{__rm} -rf %{buildroot}
-# Install the package to build area
-%makeinstall
-
-%post
-/sbin/ldconfig
-
-%postun
-/sbin/ldconfig
-
-%clean
-[ "%{buildroot}" != "/" ] && %{__rm} -rf %{buildroot}
-
-%files -n %{lib_name}
-%defattr(-,root,root,-)
-
-# docs in the main package
-%doc AUTHORS COPYING COPYING.LESSER NEWS
-
-# libraries
-%{_libdir}/libzmq.so.*
-
-%{_mandir}/man7/zmq.7.gz
-
-%files devel
-%defattr(-,root,root,-)
-%{_includedir}/zmq.h
-%{_includedir}/zmq_utils.h
-
-%{_libdir}/libzmq.a
-%{_libdir}/pkgconfig/libzmq.pc
-%{_libdir}/libzmq.so
-
-%{_mandir}/man3/zmq*
-# skip man7/zmq.7.gz
-%{_mandir}/man7/zmq_*
-
-%files -n libzmq-tools
-%defattr(-,root,root,-)
-%{_bindir}/curve_keygen
-
-%changelog
-* Fri Oct 4 2019 Luca Boccassi <luca.boccassi@gmail.com>
-- Add macro for optional TLS dependency
-
-* Wed Sep 11 2019 Luca Boccassi <luca.boccassi@gmail.com>
-- Add macro for optional NSS dependency
-
-* Sat Aug 19 2017 Luca Boccassi <luca.boccassi@gmail.com>
-- Fix parsing and usage of conditionals for sodium/pgm/krb5 so that they work
-  in OBS
-- Do not ship libzmq.la anymore, it's not needed and causes overlinking
-
-* Sun Nov 06 2016 Luca Boccassi <luca.boccassi@gmail.com>
-- Add libzmq-tool to package curve_keygen in /usr/bin
-
-* Sun Jul 31 2016 Luca Boccassi <luca.boccassi@gmail.com>
-- Follow RPM standards and rename zeromq to libzmq5
-
-* Sat Oct 25 2014 Phillip Mienk <mienkphi@gmail.com>
-- Add --with/--without libgssapi_krb5 support following J.T.Conklin's pattern
-
-* Sat Oct 18 2014 J.T. Conklin <jtc@acorntoolworks.com>
-- Add --with/--without pgm support
-- Add --with/--without libsodium support
-
-* Tue Jun 10 2014 Tristian Celestin <tristian.celestin@outlook.com> 4.0.4
-- Updated packaged files
-
-* Mon Nov 26 2012 Justin Cook <jhcook@gmail.com> 3.2.2
-- Update packaged files
-
-* Fri Apr 8 2011 Mikko Koppanen <mikko@kuut.io> 3.0.0-1
-- Update dependencies and packaged files
-
-* Sat Apr 10 2010 Mikko Koppanen <mkoppanen@php.net> 2.0.7-1
-- Initial packaging
diff --git a/libs/libzmq/perf/benchmark_radix_tree.cpp b/libs/libzmq/perf/benchmark_radix_tree.cpp
deleted file mode 100644
index 432d535..0000000
--- a/libs/libzmq/perf/benchmark_radix_tree.cpp
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
-    Copyright (c) 2018 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#if __cplusplus >= 201103L
-
-#include "radix_tree.hpp"
-#include "trie.hpp"
-
-#include <chrono>
-#include <cstddef>
-#include <cstdio>
-#include <random>
-#include <ratio>
-#include <vector>
-
-const std::size_t nkeys = 10000;
-const std::size_t nqueries = 1000000;
-const std::size_t warmup_runs = 10;
-const std::size_t samples = 10;
-const std::size_t key_length = 20;
-const char *chars = "abcdefghijklmnopqrstuvwxyz0123456789";
-const int chars_len = 36;
-
-template <class T>
-void benchmark_lookup (T &subscriptions_,
-                       std::vector<unsigned char *> &queries_)
-{
-    using namespace std::chrono;
-    std::vector<duration<long, std::nano> > samples_vec;
-    samples_vec.reserve (samples);
-
-    for (std::size_t run = 0; run < warmup_runs; ++run) {
-        for (auto &query : queries_)
-            subscriptions_.check (query, key_length);
-    }
-
-    for (std::size_t run = 0; run < samples; ++run) {
-        duration<long, std::nano> interval (0);
-        for (auto &query : queries_) {
-            auto start = steady_clock::now ();
-            subscriptions_.check (query, key_length);
-            auto end = steady_clock::now ();
-            interval += end - start;
-        }
-        samples_vec.push_back (interval / queries_.size ());
-    }
-
-    std::size_t sum = 0;
-    for (const auto &sample : samples_vec)
-        sum += sample.count ();
-    std::printf ("Average lookup time = %.1lf ns\n",
-                 static_cast<double> (sum) / samples);
-}
-
-int main ()
-{
-    // Generate input set.
-    std::minstd_rand rng (123456789);
-    std::vector<unsigned char *> input_set;
-    std::vector<unsigned char *> queries;
-    input_set.reserve (nkeys);
-    queries.reserve (nqueries);
-
-    for (std::size_t i = 0; i < nkeys; ++i) {
-        unsigned char *key = new unsigned char[key_length];
-        for (std::size_t j = 0; j < key_length; j++)
-            key[j] = static_cast<unsigned char> (chars[rng () % chars_len]);
-        input_set.emplace_back (key);
-    }
-    for (std::size_t i = 0; i < nqueries; ++i)
-        queries.push_back (input_set[rng () % nkeys]);
-
-    // Initialize both data structures.
-    //
-    // Keeping initialization out of the benchmarking function helps
-    // heaptrack detect peak memory consumption of the radix tree.
-    zmq::trie_t trie;
-    zmq::radix_tree_t radix_tree;
-    for (auto &key : input_set) {
-        trie.add (key, key_length);
-        radix_tree.add (key, key_length);
-    }
-
-    // Create a benchmark.
-    std::printf ("keys = %llu, queries = %llu, key size = %llu\n",
-                 static_cast<unsigned long long> (nkeys),
-                 static_cast<unsigned long long> (nqueries),
-                 static_cast<unsigned long long> (key_length));
-    std::puts ("[trie]");
-    benchmark_lookup (trie, queries);
-
-    std::puts ("[radix_tree]");
-    benchmark_lookup (radix_tree, queries);
-
-    for (auto &op : input_set)
-        delete[] op;
-}
-
-#else
-
-int main ()
-{
-}
-
-#endif
diff --git a/libs/libzmq/perf/generate_csv.sh b/libs/libzmq/perf/generate_csv.sh
deleted file mode 100755
index d307f29..0000000
--- a/libs/libzmq/perf/generate_csv.sh
+++ /dev/null
@@ -1,147 +0,0 @@
-#!/bin/bash
-
-#
-# This script assumes that 2 machines are used to generate performance results.
-# First machine is assumed to be the one where this script runs.
-# Second machine is the "REMOTE_IP_SSH" machine; we assume to have passwordless SSH access.
-#
-# Usage example:
-#    export REMOTE_IP_SSH=10.0.0.1
-#    export LOCAL_TEST_ENDPOINT="tcp://192.168.1.1:1234"
-#    export REMOTE_TEST_ENDPOINT="tcp://192.168.1.2:1234"
-#    export REMOTE_LIBZMQ_PATH="/home/fmontorsi/libzmq/perf"
-#    ./generate_csv.sh
-#
-
-set -u
-
-# configurable values (via environment variables):
-REMOTE_IP_SSH=${REMOTE_IP_SSH:-127.0.0.1}
-REMOTE_LIBZMQ_PATH=${REMOTE_LIBZMQ_PATH:-/root/libzmq/perf}
-LOCAL_TEST_ENDPOINT=${LOCAL_TEST_ENDPOINT:-tcp://192.168.1.1:1234}
-REMOTE_TEST_ENDPOINT=${REMOTE_TEST_ENDPOINT:-tcp://192.168.1.2:1234}
-
-# constant values:
-MESSAGE_SIZE_LIST="8 16 32 64 128 256 512 1024 2048 4096 8192 16384 32768 65536 131072"
-OUTPUT_DIR="results"
-OUTPUT_FILE_PREFIX="results.txt"
-OUTPUT_FILE_CSV_PREFIX="results.csv"
-
-
-# utility functions:
-
-function verify_ssh()
-{
-    ssh $REMOTE_IP_SSH "ls /" >/dev/null
-    if [ $? -ne 0 ]; then
-        echo "Cannot connect via SSH passwordless to the REMOTE_IP_SSH $REMOTE_IP_SSH. Please fix the problem and retry."
-        exit 2
-    fi
-
-    ssh $REMOTE_IP_SSH "ls $REMOTE_LIBZMQ_PATH" >/dev/null
-    if [ $? -ne 0 ]; then
-        echo "The folder $REMOTE_LIBZMQ_PATH is not valid. Please fix the problem and retry."
-        exit 2
-    fi
-
-    echo "SSH connection to the remote $REMOTE_IP_SSH is working fine."
-}
-
-function run_remote_perf_util()
-{
-    local MESSAGE_SIZE_BYTES="$1"
-    local REMOTE_PERF_UTIL="$2"
-    local NUM_MESSAGES="$3"
-
-    echo "Launching on $REMOTE_IP_SSH the utility [$REMOTE_PERF_UTIL] for messages ${MESSAGE_SIZE_BYTES}B long"
-    ssh $REMOTE_IP_SSH "$REMOTE_LIBZMQ_PATH/$REMOTE_PERF_UTIL $TEST_ENDPOINT $MESSAGE_SIZE_BYTES $NUM_MESSAGES" &
-    if [ $? -ne 0 ]; then
-        echo "Failed to launch remote perf util."
-        exit 2
-    fi
-}
-
-function generate_output_file()
-{
-    local LOCAL_PERF_UTIL="$1"     # must be the utility generating the TXT output
-    local REMOTE_PERF_UTIL="$2"
-    local OUTPUT_FILE_PREFIX="$3"
-    local NUM_MESSAGES="$4"
-    local CSV_HEADER_LINE="$5"
-
-    # derived values:
-    local OUTPUT_FILE_TXT="${OUTPUT_DIR}/${OUTPUT_FILE_PREFIX}.txt"         # useful just for human-friendly debugging
-    local OUTPUT_FILE_CSV="${OUTPUT_DIR}/${OUTPUT_FILE_PREFIX}.csv"     # actually used to later produce graphs
-    local MESSAGE_SIZE_ARRAY=($MESSAGE_SIZE_LIST)
-
-    echo "Killing still-running ZMQ performance utils, if any"
-    pkill $LOCAL_PERF_UTIL                       # in case it's running from a previous test
-    if [ ! -z "$REMOTE_PERF_UTIL" ]; then
-        ssh $REMOTE_IP_SSH "pkill $REMOTE_PERF_UTIL"     # in case it's running from a previous test
-    fi
-
-    echo "Resetting output file $OUTPUT_FILE_TXT and $OUTPUT_FILE_CSV"
-    mkdir -p ${OUTPUT_DIR}
-    > $OUTPUT_FILE_TXT
-    echo "$CSV_HEADER_LINE" > $OUTPUT_FILE_CSV
-
-    for MESSAGE_SIZE in ${MESSAGE_SIZE_ARRAY[@]}; do
-        echo "Launching locally the utility [$LOCAL_PERF_UTIL] for messages ${MESSAGE_SIZE}B long"
-        ./$LOCAL_PERF_UTIL $TEST_ENDPOINT $MESSAGE_SIZE $NUM_MESSAGES >${OUTPUT_FILE_TXT}-${MESSAGE_SIZE} &
-
-        if [ ! -z "$REMOTE_PERF_UTIL" ]; then
-            run_remote_perf_util $MESSAGE_SIZE $REMOTE_PERF_UTIL $NUM_MESSAGES
-        fi
-        wait
-
-        # produce the complete human-readable output file:
-        cat ${OUTPUT_FILE_TXT}-${MESSAGE_SIZE} >>${OUTPUT_FILE_TXT}
-
-        # produce a machine-friendly file for later plotting:
-        local DATALINE="$(cat ${OUTPUT_FILE_TXT}-${MESSAGE_SIZE} | grep -o '[0-9.]*' | tr '\n' ',')"
-        echo ${DATALINE::-1} >>$OUTPUT_FILE_CSV
-        rm -f ${OUTPUT_FILE_TXT}-${MESSAGE_SIZE}
-    done
-
-    echo "All measurements completed and saved into $OUTPUT_FILE_TXT and $OUTPUT_FILE_CSV"
-}
-
-
-
-# main:
-
-verify_ssh
-
-THROUGHPUT_CSV_HEADER_LINE="# message_size,message_count,PPS[msg/s],throughput[Mb/s]"
-
-# PUSH/PULL TCP throughput CSV file:
-TEST_ENDPOINT="$LOCAL_TEST_ENDPOINT"
-generate_output_file "local_thr" "remote_thr" \
-    "pushpull_tcp_thr_results" \
-    "1000000" \
-    "$THROUGHPUT_CSV_HEADER_LINE"
-
-# PUSH/PULL INPROC throughput CSV file:
-# NOTE: in this case there is no remote utility to run and no ENDPOINT to provide:
-TEST_ENDPOINT=""  # inproc does not require any endpoint
-generate_output_file "inproc_thr" "" \
-    "pushpull_inproc_thr_results" \
-    "10000000" \
-    "$THROUGHPUT_CSV_HEADER_LINE"
-
-# PUB/SUB proxy INPROC throughput CSV file:
-# NOTE: in this case there is no remote utility to run and no ENDPOINT to provide:
-TEST_ENDPOINT="" # inproc does	not require any	endpoint
-generate_output_file "proxy_thr" "" \
-    "pubsubproxy_inproc_thr_results" \
-    "10000000" \
-    "$THROUGHPUT_CSV_HEADER_LINE"
-
-
-# REQ/REP TCP latency CSV file:
-# NOTE: in this case it's the remote_lat utility that prints out the data, so we swap the local/remote arguments to the bash func:
-TEST_ENDPOINT="$REMOTE_TEST_ENDPOINT"
-generate_output_file "remote_lat" "local_lat" \
-    "reqrep_tcp_lat_results" \
-    "10000" \
-    "# message_size,message_count,latency[us]"
diff --git a/libs/libzmq/perf/generate_graphs.py b/libs/libzmq/perf/generate_graphs.py
deleted file mode 100755
index 20651b7..0000000
--- a/libs/libzmq/perf/generate_graphs.py
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/usr/bin/python3
-
-#
-# This script assumes that the set of CSV files produced by "generate_csv.sh" is provided as input
-# and that locally there is the "results" folder.
-#
-
-# results for TCP:
-INPUT_FILE_PUSHPULL_TCP_THROUGHPUT="results/pushpull_tcp_thr_results.csv"
-INPUT_FILE_REQREP_TCP_LATENCY="results/reqrep_tcp_lat_results.csv"
-TCP_LINK_GPBS=100
-
-# results for INPROC:
-INPUT_FILE_PUSHPULL_INPROC_THROUGHPUT="results/pushpull_inproc_thr_results.csv"
-INPUT_FILE_PUBSUBPROXY_INPROC_THROUGHPUT="results/pubsubproxy_inproc_thr_results.csv"
-
-
-# dependencies
-#
-# pip3 install matplotlib
-#
-
-import matplotlib.pyplot as plt
-import numpy as np
-
-
-# functions
-
-def plot_throughput(csv_filename, title, is_tcp=False):
-    message_size_bytes, message_count, pps, mbps = np.loadtxt(csv_filename, delimiter=',', unpack=True)
-
-    fig, ax1 = plt.subplots()
-
-    # PPS axis
-    color = 'tab:red'
-    ax1.set_xlabel('Message size [B]')
-    ax1.set_ylabel('PPS [Mmsg/s]', color=color)
-    ax1.semilogx(message_size_bytes, pps / 1e6, label='PPS [Mmsg/s]', marker='x', color=color)
-    ax1.tick_params(axis='y', labelcolor=color)
-
-    # GBPS axis
-    color = 'tab:blue'
-    ax2 = ax1.twinx()  # instantiate a second axes that shares the same x-axis
-    ax2.set_ylabel('Throughput [Gb/s]', color=color)
-    ax2.semilogx(message_size_bytes, mbps / 1e3, label='Throughput [Gb/s]', marker='o')
-    if is_tcp:
-        ax2.set_yticks(np.arange(0, TCP_LINK_GPBS + 1, TCP_LINK_GPBS/10)) 
-    ax2.tick_params(axis='y', labelcolor=color)
-    ax2.grid(True)
-    
-    plt.title(title)
-    fig.tight_layout()  # otherwise the right y-label is slightly clippe
-    plt.savefig(csv_filename.replace('.csv', '.png'))
-    plt.show()
-
-def plot_latency(csv_filename, title):
-    message_size_bytes, message_count, lat = np.loadtxt(csv_filename, delimiter=',', unpack=True)
-    plt.semilogx(message_size_bytes, lat, label='Latency [us]', marker='o')
-    
-    plt.xlabel('Message size [B]')
-    plt.ylabel('Latency [us]')
-    plt.grid(True)
-    plt.title(title)
-    plt.savefig(csv_filename.replace('.csv', '.png'))
-    plt.show()
-
-
-# main
-
-plot_throughput(INPUT_FILE_PUSHPULL_TCP_THROUGHPUT, 'ZeroMQ PUSH/PULL socket throughput, TCP transport', is_tcp=True)
-plot_throughput(INPUT_FILE_PUSHPULL_INPROC_THROUGHPUT, 'ZeroMQ PUSH/PULL socket throughput, INPROC transport')
-plot_throughput(INPUT_FILE_PUBSUBPROXY_INPROC_THROUGHPUT, 'ZeroMQ PUB/SUB PROXY socket throughput, INPROC transport')
-plot_latency(INPUT_FILE_REQREP_TCP_LATENCY, 'ZeroMQ REQ/REP socket latency, TCP transport')
diff --git a/libs/libzmq/perf/inproc_lat.cpp b/libs/libzmq/perf/inproc_lat.cpp
deleted file mode 100644
index bf89e99..0000000
--- a/libs/libzmq/perf/inproc_lat.cpp
+++ /dev/null
@@ -1,238 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "../include/zmq.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "platform.hpp"
-
-#if defined ZMQ_HAVE_WINDOWS
-#include <windows.h>
-#include <process.h>
-#else
-#include <pthread.h>
-#endif
-
-static size_t message_size;
-static int roundtrip_count;
-
-#if defined ZMQ_HAVE_WINDOWS
-static unsigned int __stdcall worker (void *ctx_)
-#else
-static void *worker (void *ctx_)
-#endif
-{
-    void *s;
-    int rc;
-    int i;
-    zmq_msg_t msg;
-
-    s = zmq_socket (ctx_, ZMQ_REP);
-    if (!s) {
-        printf ("error in zmq_socket: %s\n", zmq_strerror (errno));
-        exit (1);
-    }
-
-    rc = zmq_connect (s, "inproc://lat_test");
-    if (rc != 0) {
-        printf ("error in zmq_connect: %s\n", zmq_strerror (errno));
-        exit (1);
-    }
-
-    rc = zmq_msg_init (&msg);
-    if (rc != 0) {
-        printf ("error in zmq_msg_init: %s\n", zmq_strerror (errno));
-        exit (1);
-    }
-
-    for (i = 0; i != roundtrip_count; i++) {
-        rc = zmq_recvmsg (s, &msg, 0);
-        if (rc < 0) {
-            printf ("error in zmq_recvmsg: %s\n", zmq_strerror (errno));
-            exit (1);
-        }
-        rc = zmq_sendmsg (s, &msg, 0);
-        if (rc < 0) {
-            printf ("error in zmq_sendmsg: %s\n", zmq_strerror (errno));
-            exit (1);
-        }
-    }
-
-    rc = zmq_msg_close (&msg);
-    if (rc != 0) {
-        printf ("error in zmq_msg_close: %s\n", zmq_strerror (errno));
-        exit (1);
-    }
-
-    rc = zmq_close (s);
-    if (rc != 0) {
-        printf ("error in zmq_close: %s\n", zmq_strerror (errno));
-        exit (1);
-    }
-
-#if defined ZMQ_HAVE_WINDOWS
-    return 0;
-#else
-    return NULL;
-#endif
-}
-
-int main (int argc, char *argv[])
-{
-#if defined ZMQ_HAVE_WINDOWS
-    HANDLE local_thread;
-#else
-    pthread_t local_thread;
-#endif
-    void *ctx;
-    void *s;
-    int rc;
-    int i;
-    zmq_msg_t msg;
-    void *watch;
-    unsigned long elapsed;
-    double latency;
-
-    if (argc != 3) {
-        printf ("usage: inproc_lat <message-size> <roundtrip-count>\n");
-        return 1;
-    }
-
-    message_size = atoi (argv[1]);
-    roundtrip_count = atoi (argv[2]);
-
-    ctx = zmq_init (1);
-    if (!ctx) {
-        printf ("error in zmq_init: %s\n", zmq_strerror (errno));
-        return -1;
-    }
-
-    s = zmq_socket (ctx, ZMQ_REQ);
-    if (!s) {
-        printf ("error in zmq_socket: %s\n", zmq_strerror (errno));
-        return -1;
-    }
-
-    rc = zmq_bind (s, "inproc://lat_test");
-    if (rc != 0) {
-        printf ("error in zmq_bind: %s\n", zmq_strerror (errno));
-        return -1;
-    }
-
-#if defined ZMQ_HAVE_WINDOWS
-    local_thread = (HANDLE) _beginthreadex (NULL, 0, worker, ctx, 0, NULL);
-    if (local_thread == 0) {
-        printf ("error in _beginthreadex\n");
-        return -1;
-    }
-#else
-    rc = pthread_create (&local_thread, NULL, worker, ctx);
-    if (rc != 0) {
-        printf ("error in pthread_create: %s\n", zmq_strerror (rc));
-        return -1;
-    }
-#endif
-
-    rc = zmq_msg_init_size (&msg, message_size);
-    if (rc != 0) {
-        printf ("error in zmq_msg_init_size: %s\n", zmq_strerror (errno));
-        return -1;
-    }
-    memset (zmq_msg_data (&msg), 0, message_size);
-
-    printf ("message size: %d [B]\n", (int) message_size);
-    printf ("roundtrip count: %d\n", (int) roundtrip_count);
-
-    watch = zmq_stopwatch_start ();
-
-    for (i = 0; i != roundtrip_count; i++) {
-        rc = zmq_sendmsg (s, &msg, 0);
-        if (rc < 0) {
-            printf ("error in zmq_sendmsg: %s\n", zmq_strerror (errno));
-            return -1;
-        }
-        rc = zmq_recvmsg (s, &msg, 0);
-        if (rc < 0) {
-            printf ("error in zmq_recvmsg: %s\n", zmq_strerror (errno));
-            return -1;
-        }
-        if (zmq_msg_size (&msg) != message_size) {
-            printf ("message of incorrect size received\n");
-            return -1;
-        }
-    }
-
-    elapsed = zmq_stopwatch_stop (watch);
-
-    rc = zmq_msg_close (&msg);
-    if (rc != 0) {
-        printf ("error in zmq_msg_close: %s\n", zmq_strerror (errno));
-        return -1;
-    }
-
-    latency = (double) elapsed / (roundtrip_count * 2);
-
-#if defined ZMQ_HAVE_WINDOWS
-    DWORD rc2 = WaitForSingleObject (local_thread, INFINITE);
-    if (rc2 == WAIT_FAILED) {
-        printf ("error in WaitForSingleObject\n");
-        return -1;
-    }
-    BOOL rc3 = CloseHandle (local_thread);
-    if (rc3 == 0) {
-        printf ("error in CloseHandle\n");
-        return -1;
-    }
-#else
-    rc = pthread_join (local_thread, NULL);
-    if (rc != 0) {
-        printf ("error in pthread_join: %s\n", zmq_strerror (rc));
-        return -1;
-    }
-#endif
-
-    printf ("average latency: %.3f [us]\n", (double) latency);
-
-    rc = zmq_close (s);
-    if (rc != 0) {
-        printf ("error in zmq_close: %s\n", zmq_strerror (errno));
-        return -1;
-    }
-
-    rc = zmq_ctx_term (ctx);
-    if (rc != 0) {
-        printf ("error in zmq_ctx_term: %s\n", zmq_strerror (errno));
-        return -1;
-    }
-
-    return 0;
-}
diff --git a/libs/libzmq/perf/inproc_thr.cpp b/libs/libzmq/perf/inproc_thr.cpp
deleted file mode 100644
index 2dcf642..0000000
--- a/libs/libzmq/perf/inproc_thr.cpp
+++ /dev/null
@@ -1,247 +0,0 @@
-/*
-    Copyright (c) 2007-2012 iMatix Corporation
-    Copyright (c) 2009-2011 250bpm s.r.o.
-    Copyright (c) 2007-2011 Other contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "../include/zmq.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "platform.hpp"
-
-#if defined ZMQ_HAVE_WINDOWS
-#include <windows.h>
-#include <process.h>
-#else
-#include <pthread.h>
-#endif
-
-static int message_count;
-static size_t message_size;
-
-#if defined ZMQ_HAVE_WINDOWS
-static unsigned int __stdcall worker (void *ctx_)
-#else
-static void *worker (void *ctx_)
-#endif
-{
-    void *s;
-    int rc;
-    int i;
-    zmq_msg_t msg;
-
-    s = zmq_socket (ctx_, ZMQ_PUSH);
-    if (!s) {
-        printf ("error in zmq_socket: %s\n", zmq_strerror (errno));
-        exit (1);
-    }
-
-    rc = zmq_connect (s, "inproc://thr_test");
-    if (rc != 0) {
-        printf ("error in zmq_connect: %s\n", zmq_strerror (errno));
-        exit (1);
-    }
-
-    for (i = 0; i != message_count; i++) {
-        rc = zmq_msg_init_size (&msg, message_size);
-        if (rc != 0) {
-            printf ("error in zmq_msg_init_size: %s\n", zmq_strerror (errno));
-            exit (1);
-        }
-#if defined ZMQ_MAKE_VALGRIND_HAPPY
-        memset (zmq_msg_data (&msg), 0, message_size);
-#endif
-
-        rc = zmq_sendmsg (s, &msg, 0);
-        if (rc < 0) {
-            printf ("error in zmq_sendmsg: %s\n", zmq_strerror (errno));
-            exit (1);
-        }
-        rc = zmq_msg_close (&msg);
-        if (rc != 0) {
-            printf ("error in zmq_msg_close: %s\n", zmq_strerror (errno));
-            exit (1);
-        }
-    }
-
-    rc = zmq_close (s);
-    if (rc != 0) {
-        printf ("error in zmq_close: %s\n", zmq_strerror (errno));
-        exit (1);
-    }
-
-#if defined ZMQ_HAVE_WINDOWS
-    return 0;
-#else
-    return NULL;
-#endif
-}
-
-int main (int argc, char *argv[])
-{
-#if defined ZMQ_HAVE_WINDOWS
-    HANDLE local_thread;
-#else
-    pthread_t local_thread;
-#endif
-    void *ctx;
-    void *s;
-    int rc;
-    int i;
-    zmq_msg_t msg;
-    void *watch;
-    unsigned long elapsed;
-    unsigned long throughput;
-    double megabits;
-
-    if (argc != 3) {
-        printf ("usage: inproc_thr <message-size> <message-count>\n");
-        return 1;
-    }
-
-    message_size = atoi (argv[1]);
-    message_count = atoi (argv[2]);
-
-    ctx = zmq_init (1);
-    if (!ctx) {
-        printf ("error in zmq_init: %s\n", zmq_strerror (errno));
-        return -1;
-    }
-
-    s = zmq_socket (ctx, ZMQ_PULL);
-    if (!s) {
-        printf ("error in zmq_socket: %s\n", zmq_strerror (errno));
-        return -1;
-    }
-
-    rc = zmq_bind (s, "inproc://thr_test");
-    if (rc != 0) {
-        printf ("error in zmq_bind: %s\n", zmq_strerror (errno));
-        return -1;
-    }
-
-#if defined ZMQ_HAVE_WINDOWS
-    local_thread = (HANDLE) _beginthreadex (NULL, 0, worker, ctx, 0, NULL);
-    if (local_thread == 0) {
-        printf ("error in _beginthreadex\n");
-        return -1;
-    }
-#else
-    rc = pthread_create (&local_thread, NULL, worker, ctx);
-    if (rc != 0) {
-        printf ("error in pthread_create: %s\n", zmq_strerror (rc));
-        return -1;
-    }
-#endif
-
-    rc = zmq_msg_init (&msg);
-    if (rc != 0) {
-        printf ("error in zmq_msg_init: %s\n", zmq_strerror (errno));
-        return -1;
-    }
-
-    printf ("message size: %d [B]\n", (int) message_size);
-    printf ("message count: %d\n", (int) message_count);
-
-    rc = zmq_recvmsg (s, &msg, 0);
-    if (rc < 0) {
-        printf ("error in zmq_recvmsg: %s\n", zmq_strerror (errno));
-        return -1;
-    }
-    if (zmq_msg_size (&msg) != message_size) {
-        printf ("message of incorrect size received\n");
-        return -1;
-    }
-
-    watch = zmq_stopwatch_start ();
-
-    for (i = 0; i != message_count - 1; i++) {
-        rc = zmq_recvmsg (s, &msg, 0);
-        if (rc < 0) {
-            printf ("error in zmq_recvmsg: %s\n", zmq_strerror (errno));
-            return -1;
-        }
-        if (zmq_msg_size (&msg) != message_size) {
-            printf ("message of incorrect size received\n");
-            return -1;
-        }
-    }
-
-    elapsed = zmq_stopwatch_stop (watch);
-    if (elapsed == 0)
-        elapsed = 1;
-
-    rc = zmq_msg_close (&msg);
-    if (rc != 0) {
-        printf ("error in zmq_msg_close: %s\n", zmq_strerror (errno));
-        return -1;
-    }
-
-#if defined ZMQ_HAVE_WINDOWS
-    DWORD rc2 = WaitForSingleObject (local_thread, INFINITE);
-    if (rc2 == WAIT_FAILED) {
-        printf ("error in WaitForSingleObject\n");
-        return -1;
-    }
-    BOOL rc3 = CloseHandle (local_thread);
-    if (rc3 == 0) {
-        printf ("error in CloseHandle\n");
-        return -1;
-    }
-#else
-    rc = pthread_join (local_thread, NULL);
-    if (rc != 0) {
-        printf ("error in pthread_join: %s\n", zmq_strerror (rc));
-        return -1;
-    }
-#endif
-
-    rc = zmq_close (s);
-    if (rc != 0) {
-        printf ("error in zmq_close: %s\n", zmq_strerror (errno));
-        return -1;
-    }
-
-    rc = zmq_ctx_term (ctx);
-    if (rc != 0) {
-        printf ("error in zmq_ctx_term: %s\n", zmq_strerror (errno));
-        return -1;
-    }
-
-    throughput =
-      (unsigned long) ((double) message_count / (double) elapsed * 1000000);
-    megabits = (double) (throughput * message_size * 8) / 1000000;
-
-    printf ("mean throughput: %d [msg/s]\n", (int) throughput);
-    printf ("mean throughput: %.3f [Mb/s]\n", (double) megabits);
-
-    return 0;
-}
diff --git a/libs/libzmq/perf/local_lat.cpp b/libs/libzmq/perf/local_lat.cpp
deleted file mode 100644
index dc14cc3..0000000
--- a/libs/libzmq/perf/local_lat.cpp
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "../include/zmq.h"
-#include <stdio.h>
-#include <stdlib.h>
-
-int main (int argc, char *argv[])
-{
-    const char *bind_to;
-    int roundtrip_count;
-    size_t message_size;
-    void *ctx;
-    void *s;
-    int rc;
-    int i;
-    zmq_msg_t msg;
-
-    if (argc != 4) {
-        printf ("usage: local_lat <bind-to> <message-size> "
-                "<roundtrip-count>\n");
-        return 1;
-    }
-    bind_to = argv[1];
-    message_size = atoi (argv[2]);
-    roundtrip_count = atoi (argv[3]);
-
-    ctx = zmq_init (1);
-    if (!ctx) {
-        printf ("error in zmq_init: %s\n", zmq_strerror (errno));
-        return -1;
-    }
-
-    s = zmq_socket (ctx, ZMQ_REP);
-    if (!s) {
-        printf ("error in zmq_socket: %s\n", zmq_strerror (errno));
-        return -1;
-    }
-
-    rc = zmq_bind (s, bind_to);
-    if (rc != 0) {
-        printf ("error in zmq_bind: %s\n", zmq_strerror (errno));
-        return -1;
-    }
-
-    rc = zmq_msg_init (&msg);
-    if (rc != 0) {
-        printf ("error in zmq_msg_init: %s\n", zmq_strerror (errno));
-        return -1;
-    }
-
-    for (i = 0; i != roundtrip_count; i++) {
-        rc = zmq_recvmsg (s, &msg, 0);
-        if (rc < 0) {
-            printf ("error in zmq_recvmsg: %s\n", zmq_strerror (errno));
-            return -1;
-        }
-        if (zmq_msg_size (&msg) != message_size) {
-            printf ("message of incorrect size received\n");
-            return -1;
-        }
-        rc = zmq_sendmsg (s, &msg, 0);
-        if (rc < 0) {
-            printf ("error in zmq_sendmsg: %s\n", zmq_strerror (errno));
-            return -1;
-        }
-    }
-
-    rc = zmq_msg_close (&msg);
-    if (rc != 0) {
-        printf ("error in zmq_msg_close: %s\n", zmq_strerror (errno));
-        return -1;
-    }
-
-    zmq_sleep (1);
-
-    rc = zmq_close (s);
-    if (rc != 0) {
-        printf ("error in zmq_close: %s\n", zmq_strerror (errno));
-        return -1;
-    }
-
-    rc = zmq_ctx_term (ctx);
-    if (rc != 0) {
-        printf ("error in zmq_ctx_term: %s\n", zmq_strerror (errno));
-        return -1;
-    }
-
-    return 0;
-}
diff --git a/libs/libzmq/perf/local_thr.cpp b/libs/libzmq/perf/local_thr.cpp
deleted file mode 100644
index 07dd75b..0000000
--- a/libs/libzmq/perf/local_thr.cpp
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "../include/zmq.h"
-#include <stdio.h>
-#include <stdlib.h>
-
-// keys are arbitrary but must match remote_lat.cpp
-const char server_prvkey[] = "{X}#>t#jRGaQ}gMhv=30r(Mw+87YGs+5%kh=i@f8";
-
-int main (int argc, char *argv[])
-{
-    const char *bind_to;
-    int message_count;
-    size_t message_size;
-    void *ctx;
-    void *s;
-    int rc;
-    int i;
-    zmq_msg_t msg;
-    void *watch;
-    unsigned long elapsed;
-    double throughput;
-    double megabits;
-    int curve = 0;
-
-    if (argc != 4 && argc != 5) {
-        printf ("usage: local_thr <bind-to> <message-size> <message-count> "
-                "[<enable_curve>]\n");
-        return 1;
-    }
-    bind_to = argv[1];
-    message_size = atoi (argv[2]);
-    message_count = atoi (argv[3]);
-    if (argc >= 5 && atoi (argv[4])) {
-        curve = 1;
-    }
-
-    ctx = zmq_init (1);
-    if (!ctx) {
-        printf ("error in zmq_init: %s\n", zmq_strerror (errno));
-        return -1;
-    }
-
-    s = zmq_socket (ctx, ZMQ_PULL);
-    if (!s) {
-        printf ("error in zmq_socket: %s\n", zmq_strerror (errno));
-        return -1;
-    }
-
-    //  Add your socket options here.
-    //  For example ZMQ_RATE, ZMQ_RECOVERY_IVL and ZMQ_MCAST_LOOP for PGM.
-    if (curve) {
-        rc = zmq_setsockopt (s, ZMQ_CURVE_SECRETKEY, server_prvkey,
-                             sizeof (server_prvkey));
-        if (rc != 0) {
-            printf ("error in zmq_setsockoopt: %s\n", zmq_strerror (errno));
-            return -1;
-        }
-        int server = 1;
-        rc = zmq_setsockopt (s, ZMQ_CURVE_SERVER, &server, sizeof (int));
-        if (rc != 0) {
-            printf ("error in zmq_setsockoopt: %s\n", zmq_strerror (errno));
-            return -1;
-        }
-    }
-
-    rc = zmq_bind (s, bind_to);
-    if (rc != 0) {
-        printf ("error in zmq_bind: %s\n", zmq_strerror (errno));
-        return -1;
-    }
-
-    rc = zmq_msg_init (&msg);
-    if (rc != 0) {
-        printf ("error in zmq_msg_init: %s\n", zmq_strerror (errno));
-        return -1;
-    }
-
-    rc = zmq_recvmsg (s, &msg, 0);
-    if (rc < 0) {
-        printf ("error in zmq_recvmsg: %s\n", zmq_strerror (errno));
-        return -1;
-    }
-    if (zmq_msg_size (&msg) != message_size) {
-        printf ("message of incorrect size received\n");
-        return -1;
-    }
-
-    watch = zmq_stopwatch_start ();
-
-    for (i = 0; i != message_count - 1; i++) {
-        rc = zmq_recvmsg (s, &msg, 0);
-        if (rc < 0) {
-            printf ("error in zmq_recvmsg: %s\n", zmq_strerror (errno));
-            return -1;
-        }
-        if (zmq_msg_size (&msg) != message_size) {
-            printf ("message of incorrect size received\n");
-            return -1;
-        }
-    }
-
-    elapsed = zmq_stopwatch_stop (watch);
-    if (elapsed == 0)
-        elapsed = 1;
-
-    rc = zmq_msg_close (&msg);
-    if (rc != 0) {
-        printf ("error in zmq_msg_close: %s\n", zmq_strerror (errno));
-        return -1;
-    }
-
-    throughput = ((double) message_count / (double) elapsed * 1000000);
-    megabits = ((double) throughput * message_size * 8) / 1000000;
-
-    printf ("message size: %d [B]\n", (int) message_size);
-    printf ("message count: %d\n", (int) message_count);
-    printf ("mean throughput: %d [msg/s]\n", (int) throughput);
-    printf ("mean throughput: %.3f [Mb/s]\n", (double) megabits);
-
-    rc = zmq_close (s);
-    if (rc != 0) {
-        printf ("error in zmq_close: %s\n", zmq_strerror (errno));
-        return -1;
-    }
-
-    rc = zmq_ctx_term (ctx);
-    if (rc != 0) {
-        printf ("error in zmq_ctx_term: %s\n", zmq_strerror (errno));
-        return -1;
-    }
-
-    return 0;
-}
diff --git a/libs/libzmq/perf/proxy_thr.cpp b/libs/libzmq/perf/proxy_thr.cpp
deleted file mode 100644
index 7e9ea14..0000000
--- a/libs/libzmq/perf/proxy_thr.cpp
+++ /dev/null
@@ -1,412 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "../include/zmq.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <assert.h>
-#include <time.h>
-#include <stdarg.h>
-#include <string.h>
-#include <string>
-
-#include "platform.hpp"
-
-#if defined ZMQ_HAVE_WINDOWS
-#include <windows.h>
-#include <process.h>
-#else
-#include <pthread.h>
-#include <unistd.h>
-#endif
-
-
-/*
-   Asynchronous proxy benchmark using ZMQ_XPUB_NODROP.
-
-   Topology:
-
-     XPUB                      SUB
-      |                         |
-      +-----> XSUB -> XPUB -----/
-      |       ^^^^^^^^^^^^
-     XPUB      ZMQ proxy
-
-   All connections use "inproc" transport. The two XPUB sockets start
-   flooding the proxy. The throughput is computed using the bytes received
-   in the SUB socket.
-*/
-
-
-#define HWM 10000
-
-#ifndef ARRAY_SIZE
-#define ARRAY_SIZE(x) (sizeof (x) / sizeof (*x))
-#endif
-
-#define TEST_ASSERT_SUCCESS_ERRNO(expr)                                        \
-    test_assert_success_message_errno_helper (expr, NULL, #expr)
-
-// This macro is used to avoid-variable warning. If used with an expression,
-// the sizeof is not evaluated to avoid polluting the assembly code.
-#ifdef NDEBUG
-#define ASSERT_EXPR_SAFE(x)                                                    \
-    do {                                                                       \
-        (void) sizeof (x);                                                     \
-    } while (0)
-#else
-#define ASSERT_EXPR_SAFE(x) assert (x)
-#endif
-
-
-static uint64_t message_count = 0;
-static size_t message_size = 0;
-
-
-typedef struct
-{
-    void *context;
-    int thread_idx;
-    const char *frontend_endpoint[4];
-    const char *backend_endpoint[4];
-    const char *control_endpoint;
-} proxy_hwm_cfg_t;
-
-
-int test_assert_success_message_errno_helper (int rc_,
-                                              const char *msg_,
-                                              const char *expr_)
-{
-    if (rc_ == -1) {
-        char buffer[512];
-        buffer[sizeof (buffer) - 1] =
-          0; //  to ensure defined behavior with VC++ <= 2013
-        printf ("%s failed%s%s%s, errno = %i (%s)", expr_,
-                msg_ ? " (additional info: " : "", msg_ ? msg_ : "",
-                msg_ ? ")" : "", zmq_errno (), zmq_strerror (zmq_errno ()));
-        exit (1);
-    }
-    return rc_;
-}
-
-static void set_hwm (void *skt)
-{
-    int hwm = HWM;
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (skt, ZMQ_SNDHWM, &hwm, sizeof (hwm)));
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (skt, ZMQ_RCVHWM, &hwm, sizeof (hwm)));
-}
-
-static void publisher_thread_main (void *pvoid)
-{
-    const proxy_hwm_cfg_t *cfg = (proxy_hwm_cfg_t *) pvoid;
-    const int idx = cfg->thread_idx;
-    int optval;
-    int rc;
-
-    void *pubsocket = zmq_socket (cfg->context, ZMQ_XPUB);
-    assert (pubsocket);
-
-    set_hwm (pubsocket);
-
-    optval = 1;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (pubsocket, ZMQ_XPUB_NODROP, &optval, sizeof (optval)));
-
-    optval = 1;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (pubsocket, ZMQ_SNDTIMEO, &optval, sizeof (optval)));
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_connect (pubsocket, cfg->frontend_endpoint[idx]));
-
-    //  Wait before starting TX operations till 1 subscriber has subscribed
-    //  (in this test there's 1 subscriber only)
-    char buffer[32] = {};
-    rc = TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_recv (pubsocket, buffer, sizeof (buffer), 0));
-    if (rc != 1) {
-        printf ("invalid response length: expected 1, received %d", rc);
-        exit (1);
-    }
-    if (buffer[0] != 1) {
-        printf ("invalid response value: expected 1, received %d",
-                (int) buffer[0]);
-        exit (1);
-    }
-
-    zmq_msg_t msg_orig;
-    rc = zmq_msg_init_size (&msg_orig, message_size);
-    assert (rc == 0);
-    memset (zmq_msg_data (&msg_orig), 'A', zmq_msg_size (&msg_orig));
-
-    uint64_t send_count = 0;
-    while (send_count < message_count) {
-        zmq_msg_t msg;
-        zmq_msg_init (&msg);
-        rc = zmq_msg_copy (&msg, &msg_orig);
-        assert (rc == 0);
-
-        //  Send the message to the socket
-        rc = zmq_msg_send (&msg, pubsocket, 0);
-        if (rc != -1) {
-            send_count++;
-        } else {
-            TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&msg));
-        }
-    }
-
-    zmq_close (pubsocket);
-    //printf ("publisher thread ended\n");
-}
-
-static void subscriber_thread_main (void *pvoid)
-{
-    const proxy_hwm_cfg_t *cfg = (proxy_hwm_cfg_t *) pvoid;
-    const int idx = cfg->thread_idx;
-
-    void *subsocket = zmq_socket (cfg->context, ZMQ_SUB);
-    assert (subsocket);
-
-    set_hwm (subsocket);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (subsocket, ZMQ_SUBSCRIBE, 0, 0));
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_connect (subsocket, cfg->backend_endpoint[idx]));
-
-    //  Receive message_count messages
-    uint64_t rxsuccess = 0;
-    bool success = true;
-    while (success) {
-        zmq_msg_t msg;
-        int rc = zmq_msg_init (&msg);
-        assert (rc == 0);
-
-        rc = zmq_msg_recv (&msg, subsocket, 0);
-        if (rc != -1) {
-            TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&msg));
-            rxsuccess++;
-        }
-
-        if (rxsuccess == message_count)
-            break;
-    }
-
-    //  Cleanup
-
-    zmq_close (subsocket);
-    //printf ("subscriber thread ended\n");
-}
-
-static void proxy_thread_main (void *pvoid)
-{
-    const proxy_hwm_cfg_t *cfg = (proxy_hwm_cfg_t *) pvoid;
-    int rc;
-
-    //  FRONTEND SUB
-
-    void *frontend_xsub = zmq_socket (
-      cfg->context,
-      ZMQ_XSUB); // the frontend is the one exposed to internal threads (INPROC)
-    assert (frontend_xsub);
-
-    set_hwm (frontend_xsub);
-
-    //  Bind FRONTEND
-    for (unsigned int i = 0; i < ARRAY_SIZE (cfg->frontend_endpoint); i++) {
-        const char *ep = cfg->frontend_endpoint[i];
-        if (ep != NULL) {
-            assert (strlen (ep) > 5);
-            rc = zmq_bind (frontend_xsub, ep);
-            ASSERT_EXPR_SAFE (rc == 0);
-        }
-    }
-
-    //  BACKEND PUB
-
-    void *backend_xpub = zmq_socket (
-      cfg->context,
-      ZMQ_XPUB); //  the backend is the one exposed to the external world (TCP)
-    assert (backend_xpub);
-
-    int optval = 1;
-    rc =
-      zmq_setsockopt (backend_xpub, ZMQ_XPUB_NODROP, &optval, sizeof (optval));
-    ASSERT_EXPR_SAFE (rc == 0);
-
-    set_hwm (backend_xpub);
-
-    //  Bind BACKEND
-    for (unsigned int i = 0; i < ARRAY_SIZE (cfg->backend_endpoint); i++) {
-        const char *ep = cfg->backend_endpoint[i];
-        if (ep != NULL) {
-            assert (strlen (ep) > 5);
-            rc = zmq_bind (backend_xpub, ep);
-            ASSERT_EXPR_SAFE (rc == 0);
-        }
-    }
-
-    //  CONTROL REP
-
-    void *control_rep = zmq_socket (
-      cfg->context,
-      ZMQ_REP); //  This one is used by the proxy to receive&reply to commands
-    assert (control_rep);
-
-    //  Bind CONTROL
-    rc = zmq_bind (control_rep, cfg->control_endpoint);
-    ASSERT_EXPR_SAFE (rc == 0);
-
-    //  Start proxying!
-
-    zmq_proxy_steerable (frontend_xsub, backend_xpub, NULL, control_rep);
-
-    zmq_close (frontend_xsub);
-    zmq_close (backend_xpub);
-    zmq_close (control_rep);
-    //printf ("proxy thread ended\n");
-}
-
-void terminate_proxy (const proxy_hwm_cfg_t *cfg)
-{
-    //  CONTROL REQ
-
-    void *control_req = zmq_socket (
-      cfg->context,
-      ZMQ_REQ); //  This one can be used to send command to the proxy
-    assert (control_req);
-
-    //  Connect CONTROL-REQ: a socket to which send commands
-    int rc = zmq_connect (control_req, cfg->control_endpoint);
-    ASSERT_EXPR_SAFE (rc == 0);
-
-    //  Ask the proxy to exit: the subscriber has received all messages
-
-    rc = zmq_send (control_req, "TERMINATE", 9, 0);
-    ASSERT_EXPR_SAFE (rc == 9);
-
-    zmq_close (control_req);
-}
-
-//  The main thread simply starts some publishers, a proxy,
-//  and a subscriber. Finish when all packets are received.
-
-int main (int argc, char *argv[])
-{
-    if (argc != 3) {
-        printf ("usage: proxy_thr <message-size> <message-count>\n");
-        return 1;
-    }
-
-    message_size = atoi (argv[1]);
-    message_count = atoi (argv[2]);
-    printf ("message size: %d [B]\n", (int) message_size);
-    printf ("message count: %d\n", (int) message_count);
-
-    void *context = zmq_ctx_new ();
-    assert (context);
-
-    int rv = zmq_ctx_set (context, ZMQ_IO_THREADS, 4);
-    ASSERT_EXPR_SAFE (rv == 0);
-
-    //  START ALL SECONDARY THREADS
-
-    const char *pub1 = "inproc://perf_pub1";
-    const char *pub2 = "inproc://perf_pub2";
-    const char *sub1 = "inproc://perf_backend";
-
-    proxy_hwm_cfg_t cfg_global = {};
-    cfg_global.context = context;
-    cfg_global.frontend_endpoint[0] = pub1;
-    cfg_global.frontend_endpoint[1] = pub2;
-    cfg_global.backend_endpoint[0] = sub1;
-    cfg_global.control_endpoint = "inproc://ctrl";
-
-    //  Proxy
-    proxy_hwm_cfg_t cfg_proxy = cfg_global;
-    void *proxy = zmq_threadstart (&proxy_thread_main, (void *) &cfg_proxy);
-    assert (proxy != 0);
-
-    //  Subscriber 1
-    proxy_hwm_cfg_t cfg_sub1 = cfg_global;
-    cfg_sub1.thread_idx = 0;
-    void *subscriber =
-      zmq_threadstart (&subscriber_thread_main, (void *) &cfg_sub1);
-    assert (subscriber != 0);
-
-    //  Start measuring
-    void *watch = zmq_stopwatch_start ();
-
-    //  Publisher 1
-    proxy_hwm_cfg_t cfg_pub1 = cfg_global;
-    cfg_pub1.thread_idx = 0;
-    void *publisher1 =
-      zmq_threadstart (&publisher_thread_main, (void *) &cfg_pub1);
-    assert (publisher1 != 0);
-
-    //  Publisher 2
-    proxy_hwm_cfg_t cfg_pub2 = cfg_global;
-    cfg_pub2.thread_idx = 1;
-    void *publisher2 =
-      zmq_threadstart (&publisher_thread_main, (void *) &cfg_pub2);
-    assert (publisher2 != 0);
-
-    //  Wait for all packets to be received
-    zmq_threadclose (subscriber);
-
-    //  Stop measuring
-    unsigned long elapsed = zmq_stopwatch_stop (watch);
-    if (elapsed == 0)
-        elapsed = 1;
-
-    unsigned long throughput =
-      (unsigned long) ((double) message_count / (double) elapsed * 1000000);
-    double megabits = (double) (throughput * message_size * 8) / 1000000;
-
-    printf ("mean throughput: %d [msg/s]\n", (int) throughput);
-    printf ("mean throughput: %.3f [Mb/s]\n", (double) megabits);
-
-    //  Wait for the end of publishers...
-    zmq_threadclose (publisher1);
-    zmq_threadclose (publisher2);
-
-    //  ... then close the proxy
-    terminate_proxy (&cfg_proxy);
-    zmq_threadclose (proxy);
-
-    int rc = zmq_ctx_term (context);
-    ASSERT_EXPR_SAFE (rc == 0);
-
-    return 0;
-}
diff --git a/libs/libzmq/perf/remote_lat.cpp b/libs/libzmq/perf/remote_lat.cpp
deleted file mode 100644
index a21b0a5..0000000
--- a/libs/libzmq/perf/remote_lat.cpp
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "../include/zmq.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-int main (int argc, char *argv[])
-{
-    const char *connect_to;
-    int roundtrip_count;
-    size_t message_size;
-    void *ctx;
-    void *s;
-    int rc;
-    int i;
-    zmq_msg_t msg;
-    void *watch;
-    unsigned long elapsed;
-    double latency;
-
-    if (argc != 4) {
-        printf ("usage: remote_lat <connect-to> <message-size> "
-                "<roundtrip-count>\n");
-        return 1;
-    }
-    connect_to = argv[1];
-    message_size = atoi (argv[2]);
-    roundtrip_count = atoi (argv[3]);
-
-    ctx = zmq_init (1);
-    if (!ctx) {
-        printf ("error in zmq_init: %s\n", zmq_strerror (errno));
-        return -1;
-    }
-
-    s = zmq_socket (ctx, ZMQ_REQ);
-    if (!s) {
-        printf ("error in zmq_socket: %s\n", zmq_strerror (errno));
-        return -1;
-    }
-
-    rc = zmq_connect (s, connect_to);
-    if (rc != 0) {
-        printf ("error in zmq_connect: %s\n", zmq_strerror (errno));
-        return -1;
-    }
-
-    rc = zmq_msg_init_size (&msg, message_size);
-    if (rc != 0) {
-        printf ("error in zmq_msg_init_size: %s\n", zmq_strerror (errno));
-        return -1;
-    }
-    memset (zmq_msg_data (&msg), 0, message_size);
-
-    watch = zmq_stopwatch_start ();
-
-    for (i = 0; i != roundtrip_count; i++) {
-        rc = zmq_sendmsg (s, &msg, 0);
-        if (rc < 0) {
-            printf ("error in zmq_sendmsg: %s\n", zmq_strerror (errno));
-            return -1;
-        }
-        rc = zmq_recvmsg (s, &msg, 0);
-        if (rc < 0) {
-            printf ("error in zmq_recvmsg: %s\n", zmq_strerror (errno));
-            return -1;
-        }
-        if (zmq_msg_size (&msg) != message_size) {
-            printf ("message of incorrect size received\n");
-            return -1;
-        }
-    }
-
-    elapsed = zmq_stopwatch_stop (watch);
-
-    rc = zmq_msg_close (&msg);
-    if (rc != 0) {
-        printf ("error in zmq_msg_close: %s\n", zmq_strerror (errno));
-        return -1;
-    }
-
-    latency = (double) elapsed / (roundtrip_count * 2);
-
-    printf ("message size: %d [B]\n", (int) message_size);
-    printf ("roundtrip count: %d\n", (int) roundtrip_count);
-    printf ("average latency: %.3f [us]\n", (double) latency);
-
-    rc = zmq_close (s);
-    if (rc != 0) {
-        printf ("error in zmq_close: %s\n", zmq_strerror (errno));
-        return -1;
-    }
-
-    rc = zmq_ctx_term (ctx);
-    if (rc != 0) {
-        printf ("error in zmq_ctx_term: %s\n", zmq_strerror (errno));
-        return -1;
-    }
-
-    return 0;
-}
diff --git a/libs/libzmq/perf/remote_thr.cpp b/libs/libzmq/perf/remote_thr.cpp
deleted file mode 100644
index 8378950..0000000
--- a/libs/libzmq/perf/remote_thr.cpp
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "../include/zmq.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-// keys are arbitrary but must match local_lat.cpp
-const char server_pubkey[] = "DX4nh=yUn{-9ugra0X3Src4SU-4xTgqxcYY.+<SH";
-const char client_pubkey[] = "<n^oA}I:66W+*ds3tAmi1+KJzv-}k&fC2aA5Bj0K";
-const char client_prvkey[] = "9R9bV}[6z6DC-%$!jTVTKvWc=LEL{4i4gzUe$@Zx";
-
-int main (int argc, char *argv[])
-{
-    const char *connect_to;
-    int message_count;
-    int message_size;
-    void *ctx;
-    void *s;
-    int rc;
-    int i;
-    zmq_msg_t msg;
-    int curve = 0;
-
-    if (argc != 4 && argc != 5) {
-        printf ("usage: remote_thr <connect-to> <message-size> "
-                "<message-count> [<enable_curve>]\n");
-        return 1;
-    }
-    connect_to = argv[1];
-    message_size = atoi (argv[2]);
-    message_count = atoi (argv[3]);
-    if (argc >= 5 && atoi (argv[4])) {
-        curve = 1;
-    }
-
-    ctx = zmq_init (1);
-    if (!ctx) {
-        printf ("error in zmq_init: %s\n", zmq_strerror (errno));
-        return -1;
-    }
-
-    s = zmq_socket (ctx, ZMQ_PUSH);
-    if (!s) {
-        printf ("error in zmq_socket: %s\n", zmq_strerror (errno));
-        return -1;
-    }
-
-    //  Add your socket options here.
-    //  For example ZMQ_RATE, ZMQ_RECOVERY_IVL and ZMQ_MCAST_LOOP for PGM.
-    if (curve) {
-        rc = zmq_setsockopt (s, ZMQ_CURVE_SECRETKEY, client_prvkey,
-                             sizeof (client_prvkey));
-        if (rc != 0) {
-            printf ("error in zmq_setsockoopt: %s\n", zmq_strerror (errno));
-            return -1;
-        }
-
-        rc = zmq_setsockopt (s, ZMQ_CURVE_PUBLICKEY, client_pubkey,
-                             sizeof (client_pubkey));
-        if (rc != 0) {
-            printf ("error in zmq_setsockoopt: %s\n", zmq_strerror (errno));
-            return -1;
-        }
-
-        rc = zmq_setsockopt (s, ZMQ_CURVE_SERVERKEY, server_pubkey,
-                             sizeof (server_pubkey));
-        if (rc != 0) {
-            printf ("error in zmq_setsockoopt: %s\n", zmq_strerror (errno));
-            return -1;
-        }
-    }
-
-    rc = zmq_connect (s, connect_to);
-    if (rc != 0) {
-        printf ("error in zmq_connect: %s\n", zmq_strerror (errno));
-        return -1;
-    }
-
-    for (i = 0; i != message_count; i++) {
-        rc = zmq_msg_init_size (&msg, message_size);
-        if (rc != 0) {
-            printf ("error in zmq_msg_init_size: %s\n", zmq_strerror (errno));
-            return -1;
-        }
-        rc = zmq_sendmsg (s, &msg, 0);
-        if (rc < 0) {
-            printf ("error in zmq_sendmsg: %s\n", zmq_strerror (errno));
-            return -1;
-        }
-        rc = zmq_msg_close (&msg);
-        if (rc != 0) {
-            printf ("error in zmq_msg_close: %s\n", zmq_strerror (errno));
-            return -1;
-        }
-    }
-
-    rc = zmq_close (s);
-    if (rc != 0) {
-        printf ("error in zmq_close: %s\n", zmq_strerror (errno));
-        return -1;
-    }
-
-    rc = zmq_ctx_term (ctx);
-    if (rc != 0) {
-        printf ("error in zmq_ctx_term: %s\n", zmq_strerror (errno));
-        return -1;
-    }
-
-    return 0;
-}
diff --git a/libs/libzmq/src/address.cpp b/libs/libzmq/src/address.cpp
deleted file mode 100644
index f1e23ea..0000000
--- a/libs/libzmq/src/address.cpp
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "macros.hpp"
-#include "address.hpp"
-#include "ctx.hpp"
-#include "err.hpp"
-#include "tcp_address.hpp"
-#include "udp_address.hpp"
-#include "ipc_address.hpp"
-#include "tipc_address.hpp"
-#include "ws_address.hpp"
-
-#if defined ZMQ_HAVE_VMCI
-#include "vmci_address.hpp"
-#endif
-
-#include <string>
-#include <sstream>
-
-zmq::address_t::address_t (const std::string &protocol_,
-                           const std::string &address_,
-                           ctx_t *parent_) :
-    protocol (protocol_), address (address_), parent (parent_)
-{
-    resolved.dummy = NULL;
-}
-
-zmq::address_t::~address_t ()
-{
-    if (protocol == protocol_name::tcp) {
-        LIBZMQ_DELETE (resolved.tcp_addr);
-    } else if (protocol == protocol_name::udp) {
-        LIBZMQ_DELETE (resolved.udp_addr);
-    }
-#ifdef ZMQ_HAVE_WS
-    else if (protocol == protocol_name::ws) {
-        LIBZMQ_DELETE (resolved.ws_addr);
-    }
-#endif
-
-#ifdef ZMQ_HAVE_WSS
-    else if (protocol == protocol_name::wss) {
-        LIBZMQ_DELETE (resolved.ws_addr);
-    }
-#endif
-
-#if defined ZMQ_HAVE_IPC
-    else if (protocol == protocol_name::ipc) {
-        LIBZMQ_DELETE (resolved.ipc_addr);
-    }
-#endif
-#if defined ZMQ_HAVE_TIPC
-    else if (protocol == protocol_name::tipc) {
-        LIBZMQ_DELETE (resolved.tipc_addr);
-    }
-#endif
-#if defined ZMQ_HAVE_VMCI
-    else if (protocol == protocol_name::vmci) {
-        LIBZMQ_DELETE (resolved.vmci_addr);
-    }
-#endif
-}
-
-int zmq::address_t::to_string (std::string &addr_) const
-{
-    if (protocol == protocol_name::tcp && resolved.tcp_addr)
-        return resolved.tcp_addr->to_string (addr_);
-    if (protocol == protocol_name::udp && resolved.udp_addr)
-        return resolved.udp_addr->to_string (addr_);
-#ifdef ZMQ_HAVE_WS
-    if (protocol == protocol_name::ws && resolved.ws_addr)
-        return resolved.ws_addr->to_string (addr_);
-#endif
-#ifdef ZMQ_HAVE_WSS
-    if (protocol == protocol_name::wss && resolved.ws_addr)
-        return resolved.ws_addr->to_string (addr_);
-#endif
-#if defined ZMQ_HAVE_IPC
-    if (protocol == protocol_name::ipc && resolved.ipc_addr)
-        return resolved.ipc_addr->to_string (addr_);
-#endif
-#if defined ZMQ_HAVE_TIPC
-    if (protocol == protocol_name::tipc && resolved.tipc_addr)
-        return resolved.tipc_addr->to_string (addr_);
-#endif
-#if defined ZMQ_HAVE_VMCI
-    if (protocol == protocol_name::vmci && resolved.vmci_addr)
-        return resolved.vmci_addr->to_string (addr_);
-#endif
-
-    if (!protocol.empty () && !address.empty ()) {
-        std::stringstream s;
-        s << protocol << "://" << address;
-        addr_ = s.str ();
-        return 0;
-    }
-    addr_.clear ();
-    return -1;
-}
-
-zmq::zmq_socklen_t zmq::get_socket_address (fd_t fd_,
-                                            socket_end_t socket_end_,
-                                            sockaddr_storage *ss_)
-{
-    zmq_socklen_t sl = static_cast<zmq_socklen_t> (sizeof (*ss_));
-
-    const int rc =
-      socket_end_ == socket_end_local
-        ? getsockname (fd_, reinterpret_cast<struct sockaddr *> (ss_), &sl)
-        : getpeername (fd_, reinterpret_cast<struct sockaddr *> (ss_), &sl);
-
-    return rc != 0 ? 0 : sl;
-}
diff --git a/libs/libzmq/src/address.hpp b/libs/libzmq/src/address.hpp
deleted file mode 100644
index 3c0a51d..0000000
--- a/libs/libzmq/src/address.hpp
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_ADDRESS_HPP_INCLUDED__
-#define __ZMQ_ADDRESS_HPP_INCLUDED__
-
-#include "fd.hpp"
-
-#include <string>
-
-#ifndef ZMQ_HAVE_WINDOWS
-#include <sys/socket.h>
-#else
-#include <ws2tcpip.h>
-#endif
-
-namespace zmq
-{
-class ctx_t;
-class tcp_address_t;
-class udp_address_t;
-class ws_address_t;
-#ifdef ZMQ_HAVE_WSS
-class wss_address_t;
-#endif
-#if defined ZMQ_HAVE_IPC
-class ipc_address_t;
-#endif
-#if defined ZMQ_HAVE_LINUX || defined ZMQ_HAVE_VXWORKS
-class tipc_address_t;
-#endif
-#if defined ZMQ_HAVE_VMCI
-class vmci_address_t;
-#endif
-
-namespace protocol_name
-{
-static const char inproc[] = "inproc";
-static const char tcp[] = "tcp";
-static const char udp[] = "udp";
-#ifdef ZMQ_HAVE_OPENPGM
-static const char pgm[] = "pgm";
-static const char epgm[] = "epgm";
-#endif
-#ifdef ZMQ_HAVE_NORM
-static const char norm[] = "norm";
-#endif
-#ifdef ZMQ_HAVE_WS
-static const char ws[] = "ws";
-#endif
-#ifdef ZMQ_HAVE_WSS
-static const char wss[] = "wss";
-#endif
-#if defined ZMQ_HAVE_IPC
-static const char ipc[] = "ipc";
-#endif
-#if defined ZMQ_HAVE_TIPC
-static const char tipc[] = "tipc";
-#endif
-#if defined ZMQ_HAVE_VMCI
-static const char vmci[] = "vmci";
-#endif
-}
-
-struct address_t
-{
-    address_t (const std::string &protocol_,
-               const std::string &address_,
-               ctx_t *parent_);
-
-    ~address_t ();
-
-    const std::string protocol;
-    const std::string address;
-    ctx_t *const parent;
-
-    //  Protocol specific resolved address
-    //  All members must be pointers to allow for consistent initialization
-    union
-    {
-        void *dummy;
-        tcp_address_t *tcp_addr;
-        udp_address_t *udp_addr;
-#ifdef ZMQ_HAVE_WS
-        ws_address_t *ws_addr;
-#endif
-#ifdef ZMQ_HAVE_WSS
-        wss_address_t *wss_addr;
-#endif
-#if defined ZMQ_HAVE_IPC
-        ipc_address_t *ipc_addr;
-#endif
-#if defined ZMQ_HAVE_LINUX || defined ZMQ_HAVE_VXWORKS
-        tipc_address_t *tipc_addr;
-#endif
-#if defined ZMQ_HAVE_VMCI
-        vmci_address_t *vmci_addr;
-#endif
-    } resolved;
-
-    int to_string (std::string &addr_) const;
-};
-
-#if defined(ZMQ_HAVE_HPUX) || defined(ZMQ_HAVE_VXWORKS)                        \
-  || defined(ZMQ_HAVE_WINDOWS)
-typedef int zmq_socklen_t;
-#else
-typedef socklen_t zmq_socklen_t;
-#endif
-
-enum socket_end_t
-{
-    socket_end_local,
-    socket_end_remote
-};
-
-zmq_socklen_t
-get_socket_address (fd_t fd_, socket_end_t socket_end_, sockaddr_storage *ss_);
-
-template <typename T>
-std::string get_socket_name (fd_t fd_, socket_end_t socket_end_)
-{
-    struct sockaddr_storage ss;
-    const zmq_socklen_t sl = get_socket_address (fd_, socket_end_, &ss);
-    if (sl == 0) {
-        return std::string ();
-    }
-
-    const T addr (reinterpret_cast<struct sockaddr *> (&ss), sl);
-    std::string address_string;
-    addr.to_string (address_string);
-    return address_string;
-}
-}
-
-#endif
diff --git a/libs/libzmq/src/array.hpp b/libs/libzmq/src/array.hpp
deleted file mode 100644
index 8c81382..0000000
--- a/libs/libzmq/src/array.hpp
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_ARRAY_INCLUDED__
-#define __ZMQ_ARRAY_INCLUDED__
-
-#include <vector>
-#include <algorithm>
-
-#include "macros.hpp"
-
-namespace zmq
-{
-//  Implementation of fast arrays with O(1) access, insertion and
-//  removal. The array stores pointers rather than objects.
-//  O(1) is achieved by making items inheriting from
-//  array_item_t<ID> class which internally stores the position
-//  in the array.
-//  The ID template argument is used to differentiate among arrays
-//  and thus let an object be stored in different arrays.
-
-//  Base class for objects stored in the array. If you want to store
-//  same object in multiple arrays, each of those arrays has to have
-//  different ID. The item itself has to be derived from instantiations of
-//  array_item_t template for all relevant IDs.
-
-template <int ID = 0> class array_item_t
-{
-  public:
-    array_item_t () : _array_index (-1) {}
-
-    //  The destructor doesn't have to be virtual. It is made virtual
-    //  just to keep ICC and code checking tools from complaining.
-    virtual ~array_item_t () ZMQ_DEFAULT;
-
-    void set_array_index (int index_) { _array_index = index_; }
-
-    int get_array_index () const { return _array_index; }
-
-  private:
-    int _array_index;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (array_item_t)
-};
-
-
-template <typename T, int ID = 0> class array_t
-{
-  private:
-    typedef array_item_t<ID> item_t;
-
-  public:
-    typedef typename std::vector<T *>::size_type size_type;
-
-    array_t () ZMQ_DEFAULT;
-
-    size_type size () { return _items.size (); }
-
-    bool empty () { return _items.empty (); }
-
-    T *&operator[] (size_type index_) { return _items[index_]; }
-
-    void push_back (T *item_)
-    {
-        if (item_)
-            static_cast<item_t *> (item_)->set_array_index (
-              static_cast<int> (_items.size ()));
-        _items.push_back (item_);
-    }
-
-    void erase (T *item_)
-    {
-        erase (static_cast<item_t *> (item_)->get_array_index ());
-    }
-
-    void erase (size_type index_)
-    {
-        if (_items.empty ())
-            return;
-        static_cast<item_t *> (_items.back ())
-          ->set_array_index (static_cast<int> (index_));
-
-        _items[index_] = _items.back ();
-        _items.pop_back ();
-    }
-
-    void swap (size_type index1_, size_type index2_)
-    {
-        if (_items[index1_])
-            static_cast<item_t *> (_items[index1_])
-              ->set_array_index (static_cast<int> (index2_));
-        if (_items[index2_])
-            static_cast<item_t *> (_items[index2_])
-              ->set_array_index (static_cast<int> (index1_));
-        std::swap (_items[index1_], _items[index2_]);
-    }
-
-    void clear () { _items.clear (); }
-
-    static size_type index (T *item_)
-    {
-        return static_cast<size_type> (
-          static_cast<item_t *> (item_)->get_array_index ());
-    }
-
-  private:
-    typedef std::vector<T *> items_t;
-    items_t _items;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (array_t)
-};
-}
-
-#endif
diff --git a/libs/libzmq/src/atomic_counter.hpp b/libs/libzmq/src/atomic_counter.hpp
deleted file mode 100644
index d05837a..0000000
--- a/libs/libzmq/src/atomic_counter.hpp
+++ /dev/null
@@ -1,235 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_ATOMIC_COUNTER_HPP_INCLUDED__
-#define __ZMQ_ATOMIC_COUNTER_HPP_INCLUDED__
-
-#include "stdint.hpp"
-#include "macros.hpp"
-
-#if defined ZMQ_FORCE_MUTEXES
-#define ZMQ_ATOMIC_COUNTER_MUTEX
-#elif (defined __cplusplus && __cplusplus >= 201103L)                          \
-  || (defined _MSC_VER && _MSC_VER >= 1900)
-#define ZMQ_ATOMIC_COUNTER_CXX11
-#elif defined ZMQ_HAVE_ATOMIC_INTRINSICS
-#define ZMQ_ATOMIC_COUNTER_INTRINSIC
-#elif (defined __i386__ || defined __x86_64__) && defined __GNUC__
-#define ZMQ_ATOMIC_COUNTER_X86
-#elif defined __ARM_ARCH_7A__ && defined __GNUC__
-#define ZMQ_ATOMIC_COUNTER_ARM
-#elif defined ZMQ_HAVE_WINDOWS
-#define ZMQ_ATOMIC_COUNTER_WINDOWS
-#elif (defined ZMQ_HAVE_SOLARIS || defined ZMQ_HAVE_NETBSD                     \
-       || defined ZMQ_HAVE_GNU)
-#define ZMQ_ATOMIC_COUNTER_ATOMIC_H
-#elif defined __tile__
-#define ZMQ_ATOMIC_COUNTER_TILE
-#else
-#define ZMQ_ATOMIC_COUNTER_MUTEX
-#endif
-
-#if defined ZMQ_ATOMIC_COUNTER_MUTEX
-#include "mutex.hpp"
-#elif defined ZMQ_ATOMIC_COUNTER_CXX11
-#include <atomic>
-#elif defined ZMQ_ATOMIC_COUNTER_WINDOWS
-#include "windows.hpp"
-#elif defined ZMQ_ATOMIC_COUNTER_ATOMIC_H
-#include <atomic.h>
-#elif defined ZMQ_ATOMIC_COUNTER_TILE
-#include <arch/atomic.h>
-#endif
-
-namespace zmq
-{
-//  This class represents an integer that can be incremented/decremented
-//  in atomic fashion.
-//
-//  In zmq::shared_message_memory_allocator a buffer with an atomic_counter_t
-//  at the start is allocated. If the class does not align to pointer size,
-//  access to pointers in structures in the buffer will cause SIGBUS on
-//  architectures that do not allow mis-aligned pointers (eg: SPARC).
-//  Force the compiler to align to pointer size, which will cause the object
-//  to grow from 4 bytes to 8 bytes on 64 bit architectures (when not using
-//  mutexes).
-
-#if defined(_MSC_VER) && (defined(_M_X64) || defined(_M_ARM64))
-class __declspec(align (8)) atomic_counter_t
-#elif defined(_MSC_VER) && (defined(_M_IX86) || defined(_M_ARM_ARMV7VE))
-class __declspec(align (4)) atomic_counter_t
-#else
-class atomic_counter_t
-#endif
-{
-  public:
-    typedef uint32_t integer_t;
-
-    atomic_counter_t (integer_t value_ = 0) ZMQ_NOEXCEPT : _value (value_) {}
-
-    //  Set counter _value (not thread-safe).
-    void set (integer_t value_) ZMQ_NOEXCEPT { _value = value_; }
-
-    //  Atomic addition. Returns the old _value.
-    integer_t add (integer_t increment_) ZMQ_NOEXCEPT
-    {
-        integer_t old_value;
-
-#if defined ZMQ_ATOMIC_COUNTER_WINDOWS
-        old_value = InterlockedExchangeAdd ((LONG *) &_value, increment_);
-#elif defined ZMQ_ATOMIC_COUNTER_INTRINSIC
-        old_value = __atomic_fetch_add (&_value, increment_, __ATOMIC_ACQ_REL);
-#elif defined ZMQ_ATOMIC_COUNTER_CXX11
-        old_value = _value.fetch_add (increment_, std::memory_order_acq_rel);
-#elif defined ZMQ_ATOMIC_COUNTER_ATOMIC_H
-        integer_t new_value = atomic_add_32_nv (&_value, increment_);
-        old_value = new_value - increment_;
-#elif defined ZMQ_ATOMIC_COUNTER_TILE
-        old_value = arch_atomic_add (&_value, increment_);
-#elif defined ZMQ_ATOMIC_COUNTER_X86
-        __asm__ volatile("lock; xadd %0, %1 \n\t"
-                         : "=r"(old_value), "=m"(_value)
-                         : "0"(increment_), "m"(_value)
-                         : "cc", "memory");
-#elif defined ZMQ_ATOMIC_COUNTER_ARM
-        integer_t flag, tmp;
-        __asm__ volatile("       dmb     sy\n\t"
-                         "1:     ldrex   %0, [%5]\n\t"
-                         "       add     %2, %0, %4\n\t"
-                         "       strex   %1, %2, [%5]\n\t"
-                         "       teq     %1, #0\n\t"
-                         "       bne     1b\n\t"
-                         "       dmb     sy\n\t"
-                         : "=&r"(old_value), "=&r"(flag), "=&r"(tmp),
-                           "+Qo"(_value)
-                         : "Ir"(increment_), "r"(&_value)
-                         : "cc");
-#elif defined ZMQ_ATOMIC_COUNTER_MUTEX
-        sync.lock ();
-        old_value = _value;
-        _value += increment_;
-        sync.unlock ();
-#else
-#error atomic_counter is not implemented for this platform
-#endif
-        return old_value;
-    }
-
-    //  Atomic subtraction. Returns false if the counter drops to zero.
-    bool sub (integer_t decrement_) ZMQ_NOEXCEPT
-    {
-#if defined ZMQ_ATOMIC_COUNTER_WINDOWS
-        LONG delta = -((LONG) decrement_);
-        integer_t old = InterlockedExchangeAdd ((LONG *) &_value, delta);
-        return old - decrement_ != 0;
-#elif defined ZMQ_ATOMIC_COUNTER_INTRINSIC
-        integer_t nv =
-          __atomic_sub_fetch (&_value, decrement_, __ATOMIC_ACQ_REL);
-        return nv != 0;
-#elif defined ZMQ_ATOMIC_COUNTER_CXX11
-        const integer_t old =
-          _value.fetch_sub (decrement_, std::memory_order_acq_rel);
-        return old - decrement_ != 0;
-#elif defined ZMQ_ATOMIC_COUNTER_ATOMIC_H
-        int32_t delta = -((int32_t) decrement_);
-        integer_t nv = atomic_add_32_nv (&_value, delta);
-        return nv != 0;
-#elif defined ZMQ_ATOMIC_COUNTER_TILE
-        int32_t delta = -((int32_t) decrement_);
-        integer_t nv = arch_atomic_add (&_value, delta);
-        return nv != 0;
-#elif defined ZMQ_ATOMIC_COUNTER_X86
-        integer_t oldval = -decrement_;
-        volatile integer_t *val = &_value;
-        __asm__ volatile("lock; xaddl %0,%1"
-                         : "=r"(oldval), "=m"(*val)
-                         : "0"(oldval), "m"(*val)
-                         : "cc", "memory");
-        return oldval != decrement_;
-#elif defined ZMQ_ATOMIC_COUNTER_ARM
-        integer_t old_value, flag, tmp;
-        __asm__ volatile("       dmb     sy\n\t"
-                         "1:     ldrex   %0, [%5]\n\t"
-                         "       sub     %2, %0, %4\n\t"
-                         "       strex   %1, %2, [%5]\n\t"
-                         "       teq     %1, #0\n\t"
-                         "       bne     1b\n\t"
-                         "       dmb     sy\n\t"
-                         : "=&r"(old_value), "=&r"(flag), "=&r"(tmp),
-                           "+Qo"(_value)
-                         : "Ir"(decrement_), "r"(&_value)
-                         : "cc");
-        return old_value - decrement_ != 0;
-#elif defined ZMQ_ATOMIC_COUNTER_MUTEX
-        sync.lock ();
-        _value -= decrement_;
-        bool result = _value ? true : false;
-        sync.unlock ();
-        return result;
-#else
-#error atomic_counter is not implemented for this platform
-#endif
-    }
-
-    integer_t get () const ZMQ_NOEXCEPT { return _value; }
-
-  private:
-#if defined ZMQ_ATOMIC_COUNTER_CXX11
-    std::atomic<integer_t> _value;
-#else
-    volatile integer_t _value;
-#endif
-
-#if defined ZMQ_ATOMIC_COUNTER_MUTEX
-    mutex_t sync;
-#endif
-
-#if !defined ZMQ_ATOMIC_COUNTER_CXX11
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (atomic_counter_t)
-#endif
-#if defined(__GNUC__) || defined(__INTEL_COMPILER)                             \
-  || (defined(__SUNPRO_C) && __SUNPRO_C >= 0x590)                              \
-  || (defined(__SUNPRO_CC) && __SUNPRO_CC >= 0x590)
-} __attribute__ ((aligned (sizeof (void *))));
-#else
-};
-#endif
-}
-
-//  Remove macros local to this file.
-#undef ZMQ_ATOMIC_COUNTER_MUTEX
-#undef ZMQ_ATOMIC_COUNTER_INTRINSIC
-#undef ZMQ_ATOMIC_COUNTER_CXX11
-#undef ZMQ_ATOMIC_COUNTER_X86
-#undef ZMQ_ATOMIC_COUNTER_ARM
-#undef ZMQ_ATOMIC_COUNTER_WINDOWS
-#undef ZMQ_ATOMIC_COUNTER_ATOMIC_H
-#undef ZMQ_ATOMIC_COUNTER_TILE
-
-#endif
diff --git a/libs/libzmq/src/atomic_ptr.hpp b/libs/libzmq/src/atomic_ptr.hpp
deleted file mode 100644
index fa8bc7c..0000000
--- a/libs/libzmq/src/atomic_ptr.hpp
+++ /dev/null
@@ -1,306 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_ATOMIC_PTR_HPP_INCLUDED__
-#define __ZMQ_ATOMIC_PTR_HPP_INCLUDED__
-
-#include "macros.hpp"
-
-#if defined ZMQ_FORCE_MUTEXES
-#define ZMQ_ATOMIC_PTR_MUTEX
-#elif (defined __cplusplus && __cplusplus >= 201103L)                          \
-  || (defined _MSC_VER && _MSC_VER >= 1900)
-#define ZMQ_ATOMIC_PTR_CXX11
-#elif defined ZMQ_HAVE_ATOMIC_INTRINSICS
-#define ZMQ_ATOMIC_PTR_INTRINSIC
-#elif (defined __i386__ || defined __x86_64__) && defined __GNUC__
-#define ZMQ_ATOMIC_PTR_X86
-#elif defined __ARM_ARCH_7A__ && defined __GNUC__
-#define ZMQ_ATOMIC_PTR_ARM
-#elif defined __tile__
-#define ZMQ_ATOMIC_PTR_TILE
-#elif defined ZMQ_HAVE_WINDOWS
-#define ZMQ_ATOMIC_PTR_WINDOWS
-#elif (defined ZMQ_HAVE_SOLARIS || defined ZMQ_HAVE_NETBSD                     \
-       || defined ZMQ_HAVE_GNU)
-#define ZMQ_ATOMIC_PTR_ATOMIC_H
-#else
-#define ZMQ_ATOMIC_PTR_MUTEX
-#endif
-
-#if defined ZMQ_ATOMIC_PTR_MUTEX
-#include "mutex.hpp"
-#elif defined ZMQ_ATOMIC_PTR_CXX11
-#include <atomic>
-#elif defined ZMQ_ATOMIC_PTR_WINDOWS
-#include "windows.hpp"
-#elif defined ZMQ_ATOMIC_PTR_ATOMIC_H
-#include <atomic.h>
-#elif defined ZMQ_ATOMIC_PTR_TILE
-#include <arch/atomic.h>
-#endif
-
-namespace zmq
-{
-#if !defined ZMQ_ATOMIC_PTR_CXX11
-inline void *atomic_xchg_ptr (void **ptr_,
-                              void *const val_
-#if defined ZMQ_ATOMIC_PTR_MUTEX
-                              ,
-                              mutex_t &_sync
-#endif
-                              ) ZMQ_NOEXCEPT
-{
-#if defined ZMQ_ATOMIC_PTR_WINDOWS
-    return InterlockedExchangePointer ((PVOID *) ptr_, val_);
-#elif defined ZMQ_ATOMIC_PTR_INTRINSIC
-    return __atomic_exchange_n (ptr_, val_, __ATOMIC_ACQ_REL);
-#elif defined ZMQ_ATOMIC_PTR_ATOMIC_H
-    return atomic_swap_ptr (ptr_, val_);
-#elif defined ZMQ_ATOMIC_PTR_TILE
-    return arch_atomic_exchange (ptr_, val_);
-#elif defined ZMQ_ATOMIC_PTR_X86
-    void *old;
-    __asm__ volatile("lock; xchg %0, %2"
-                     : "=r"(old), "=m"(*ptr_)
-                     : "m"(*ptr_), "0"(val_));
-    return old;
-#elif defined ZMQ_ATOMIC_PTR_ARM
-    void *old;
-    unsigned int flag;
-    __asm__ volatile("       dmb     sy\n\t"
-                     "1:     ldrex   %1, [%3]\n\t"
-                     "       strex   %0, %4, [%3]\n\t"
-                     "       teq     %0, #0\n\t"
-                     "       bne     1b\n\t"
-                     "       dmb     sy\n\t"
-                     : "=&r"(flag), "=&r"(old), "+Qo"(*ptr_)
-                     : "r"(ptr_), "r"(val_)
-                     : "cc");
-    return old;
-#elif defined ZMQ_ATOMIC_PTR_MUTEX
-    _sync.lock ();
-    void *old = *ptr_;
-    *ptr_ = val_;
-    _sync.unlock ();
-    return old;
-#else
-#error atomic_ptr is not implemented for this platform
-#endif
-}
-
-inline void *atomic_cas (void *volatile *ptr_,
-                         void *cmp_,
-                         void *val_
-#if defined ZMQ_ATOMIC_PTR_MUTEX
-                         ,
-                         mutex_t &_sync
-#endif
-                         ) ZMQ_NOEXCEPT
-{
-#if defined ZMQ_ATOMIC_PTR_WINDOWS
-    return InterlockedCompareExchangePointer ((volatile PVOID *) ptr_, val_,
-                                              cmp_);
-#elif defined ZMQ_ATOMIC_PTR_INTRINSIC
-    void *old = cmp_;
-    __atomic_compare_exchange_n (ptr_, &old, val_, false, __ATOMIC_RELEASE,
-                                 __ATOMIC_ACQUIRE);
-    return old;
-#elif defined ZMQ_ATOMIC_PTR_ATOMIC_H
-    return atomic_cas_ptr (ptr_, cmp_, val_);
-#elif defined ZMQ_ATOMIC_PTR_TILE
-    return arch_atomic_val_compare_and_exchange (ptr_, cmp_, val_);
-#elif defined ZMQ_ATOMIC_PTR_X86
-    void *old;
-    __asm__ volatile("lock; cmpxchg %2, %3"
-                     : "=a"(old), "=m"(*ptr_)
-                     : "r"(val_), "m"(*ptr_), "0"(cmp_)
-                     : "cc");
-    return old;
-#elif defined ZMQ_ATOMIC_PTR_ARM
-    void *old;
-    unsigned int flag;
-    __asm__ volatile("       dmb     sy\n\t"
-                     "1:     ldrex   %1, [%3]\n\t"
-                     "       mov     %0, #0\n\t"
-                     "       teq     %1, %4\n\t"
-                     "       it      eq\n\t"
-                     "       strexeq %0, %5, [%3]\n\t"
-                     "       teq     %0, #0\n\t"
-                     "       bne     1b\n\t"
-                     "       dmb     sy\n\t"
-                     : "=&r"(flag), "=&r"(old), "+Qo"(*ptr_)
-                     : "r"(ptr_), "r"(cmp_), "r"(val_)
-                     : "cc");
-    return old;
-#elif defined ZMQ_ATOMIC_PTR_MUTEX
-    _sync.lock ();
-    void *old = *ptr_;
-    if (*ptr_ == cmp_)
-        *ptr_ = val_;
-    _sync.unlock ();
-    return old;
-#else
-#error atomic_ptr is not implemented for this platform
-#endif
-}
-#endif
-
-//  This class encapsulates several atomic operations on pointers.
-
-template <typename T> class atomic_ptr_t
-{
-  public:
-    //  Initialise atomic pointer
-    atomic_ptr_t () ZMQ_NOEXCEPT { _ptr = NULL; }
-
-    //  Set value of atomic pointer in a non-threadsafe way
-    //  Use this function only when you are sure that at most one
-    //  thread is accessing the pointer at the moment.
-    void set (T *ptr_) ZMQ_NOEXCEPT { _ptr = ptr_; }
-
-    //  Perform atomic 'exchange pointers' operation. Pointer is set
-    //  to the 'val_' value. Old value is returned.
-    T *xchg (T *val_) ZMQ_NOEXCEPT
-    {
-#if defined ZMQ_ATOMIC_PTR_CXX11
-        return _ptr.exchange (val_, std::memory_order_acq_rel);
-#else
-        return (T *) atomic_xchg_ptr ((void **) &_ptr, val_
-#if defined ZMQ_ATOMIC_PTR_MUTEX
-                                      ,
-                                      _sync
-#endif
-        );
-#endif
-    }
-
-    //  Perform atomic 'compare and swap' operation on the pointer.
-    //  The pointer is compared to 'cmp' argument and if they are
-    //  equal, its value is set to 'val_'. Old value of the pointer
-    //  is returned.
-    T *cas (T *cmp_, T *val_) ZMQ_NOEXCEPT
-    {
-#if defined ZMQ_ATOMIC_PTR_CXX11
-        _ptr.compare_exchange_strong (cmp_, val_, std::memory_order_acq_rel);
-        return cmp_;
-#else
-        return (T *) atomic_cas ((void **) &_ptr, cmp_, val_
-#if defined ZMQ_ATOMIC_PTR_MUTEX
-                                 ,
-                                 _sync
-#endif
-        );
-#endif
-    }
-
-  private:
-#if defined ZMQ_ATOMIC_PTR_CXX11
-    std::atomic<T *> _ptr;
-#else
-    volatile T *_ptr;
-#endif
-
-#if defined ZMQ_ATOMIC_PTR_MUTEX
-    mutex_t _sync;
-#endif
-
-#if !defined ZMQ_ATOMIC_PTR_CXX11
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (atomic_ptr_t)
-#endif
-};
-
-struct atomic_value_t
-{
-    atomic_value_t (const int value_) ZMQ_NOEXCEPT : _value (value_) {}
-
-    atomic_value_t (const atomic_value_t &src_) ZMQ_NOEXCEPT
-        : _value (src_.load ())
-    {
-    }
-
-    void store (const int value_) ZMQ_NOEXCEPT
-    {
-#if defined ZMQ_ATOMIC_PTR_CXX11
-        _value.store (value_, std::memory_order_release);
-#else
-        atomic_xchg_ptr ((void **) &_value, (void *) (ptrdiff_t) value_
-#if defined ZMQ_ATOMIC_PTR_MUTEX
-                         ,
-                         _sync
-#endif
-        );
-#endif
-    }
-
-    int load () const ZMQ_NOEXCEPT
-    {
-#if defined ZMQ_ATOMIC_PTR_CXX11
-        return _value.load (std::memory_order_acquire);
-#else
-        return (int) (ptrdiff_t) atomic_cas ((void **) &_value, 0, 0
-#if defined ZMQ_ATOMIC_PTR_MUTEX
-                                             ,
-#if defined __SUNPRO_CC
-                                             const_cast<mutex_t &> (_sync)
-#else
-                                             _sync
-#endif
-#endif
-        );
-#endif
-    }
-
-  private:
-#if defined ZMQ_ATOMIC_PTR_CXX11
-    std::atomic<int> _value;
-#else
-    volatile ptrdiff_t _value;
-#endif
-
-#if defined ZMQ_ATOMIC_PTR_MUTEX
-    mutable mutex_t _sync;
-#endif
-
-  private:
-    atomic_value_t &operator= (const atomic_value_t &src_);
-};
-}
-
-//  Remove macros local to this file.
-#undef ZMQ_ATOMIC_PTR_MUTEX
-#undef ZMQ_ATOMIC_PTR_INTRINSIC
-#undef ZMQ_ATOMIC_PTR_CXX11
-#undef ZMQ_ATOMIC_PTR_X86
-#undef ZMQ_ATOMIC_PTR_ARM
-#undef ZMQ_ATOMIC_PTR_TILE
-#undef ZMQ_ATOMIC_PTR_WINDOWS
-#undef ZMQ_ATOMIC_PTR_ATOMIC_H
-
-#endif
diff --git a/libs/libzmq/src/blob.hpp b/libs/libzmq/src/blob.hpp
deleted file mode 100644
index 54a41d5..0000000
--- a/libs/libzmq/src/blob.hpp
+++ /dev/null
@@ -1,203 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_BLOB_HPP_INCLUDED__
-#define __ZMQ_BLOB_HPP_INCLUDED__
-
-#include "macros.hpp"
-#include "err.hpp"
-
-#include <stdlib.h>
-#include <string.h>
-#include <algorithm>
-#include <ios>
-
-#if __cplusplus >= 201103L || defined(_MSC_VER) && _MSC_VER > 1700
-#define ZMQ_HAS_MOVE_SEMANTICS
-#define ZMQ_MAP_INSERT_OR_EMPLACE(k, v) emplace (k, v)
-#define ZMQ_PUSH_OR_EMPLACE_BACK emplace_back
-#define ZMQ_MOVE(x) std::move (x)
-#else
-#if defined __SUNPRO_CC
-template <typename K, typename V>
-std::pair<const K, V> make_pair_fix_const (const K &k, const V &v)
-{
-    return std::pair<const K, V> (k, v);
-}
-
-#define ZMQ_MAP_INSERT_OR_EMPLACE(k, v) insert (make_pair_fix_const (k, v))
-#else
-#define ZMQ_MAP_INSERT_OR_EMPLACE(k, v) insert (std::make_pair (k, v))
-#endif
-
-#define ZMQ_PUSH_OR_EMPLACE_BACK push_back
-#define ZMQ_MOVE(x) (x)
-#endif
-
-namespace zmq
-{
-struct reference_tag_t
-{
-};
-
-//  Object to hold dynamically allocated opaque binary data.
-//  On modern compilers, it will be movable but not copyable. Copies
-//  must be explicitly created by set_deep_copy.
-//  On older compilers, it is copyable for syntactical reasons.
-struct blob_t
-{
-    //  Creates an empty blob_t.
-    blob_t () : _data (0), _size (0), _owned (true) {}
-
-    //  Creates a blob_t of a given size, with uninitialized content.
-    explicit blob_t (const size_t size_) :
-        _data (static_cast<unsigned char *> (malloc (size_))),
-        _size (size_),
-        _owned (true)
-    {
-        alloc_assert (_data);
-    }
-
-    //  Creates a blob_t of a given size, an initializes content by copying
-    // from another buffer.
-    blob_t (const unsigned char *const data_, const size_t size_) :
-        _data (static_cast<unsigned char *> (malloc (size_))),
-        _size (size_),
-        _owned (true)
-    {
-        alloc_assert (_data);
-        memcpy (_data, data_, size_);
-    }
-
-    //  Creates a blob_t for temporary use that only references a
-    //  pre-allocated block of data.
-    //  Use with caution and ensure that the blob_t will not outlive
-    //  the referenced data.
-    blob_t (unsigned char *const data_, const size_t size_, reference_tag_t) :
-        _data (data_), _size (size_), _owned (false)
-    {
-    }
-
-    //  Returns the size of the blob_t.
-    size_t size () const { return _size; }
-
-    //  Returns a pointer to the data of the blob_t.
-    const unsigned char *data () const { return _data; }
-
-    //  Returns a pointer to the data of the blob_t.
-    unsigned char *data () { return _data; }
-
-    //  Defines an order relationship on blob_t.
-    bool operator< (blob_t const &other_) const
-    {
-        const int cmpres =
-          memcmp (_data, other_._data, std::min (_size, other_._size));
-        return cmpres < 0 || (cmpres == 0 && _size < other_._size);
-    }
-
-    //  Sets a blob_t to a deep copy of another blob_t.
-    void set_deep_copy (blob_t const &other_)
-    {
-        clear ();
-        _data = static_cast<unsigned char *> (malloc (other_._size));
-        alloc_assert (_data);
-        _size = other_._size;
-        _owned = true;
-        memcpy (_data, other_._data, _size);
-    }
-
-    //  Sets a blob_t to a copy of a given buffer.
-    void set (const unsigned char *const data_, const size_t size_)
-    {
-        clear ();
-        _data = static_cast<unsigned char *> (malloc (size_));
-        alloc_assert (_data);
-        _size = size_;
-        _owned = true;
-        memcpy (_data, data_, size_);
-    }
-
-    //  Empties a blob_t.
-    void clear ()
-    {
-        if (_owned) {
-            free (_data);
-        }
-        _data = 0;
-        _size = 0;
-    }
-
-    ~blob_t ()
-    {
-        if (_owned) {
-            free (_data);
-        }
-    }
-
-#ifdef ZMQ_HAS_MOVE_SEMANTICS
-    blob_t (const blob_t &) = delete;
-    blob_t &operator= (const blob_t &) = delete;
-
-    blob_t (blob_t &&other_) ZMQ_NOEXCEPT : _data (other_._data),
-                                            _size (other_._size),
-                                            _owned (other_._owned)
-    {
-        other_._owned = false;
-    }
-    blob_t &operator= (blob_t &&other_) ZMQ_NOEXCEPT
-    {
-        if (this != &other_) {
-            clear ();
-            _data = other_._data;
-            _size = other_._size;
-            _owned = other_._owned;
-            other_._owned = false;
-        }
-        return *this;
-    }
-#else
-    blob_t (const blob_t &other) : _owned (false) { set_deep_copy (other); }
-    blob_t &operator= (const blob_t &other)
-    {
-        if (this != &other) {
-            clear ();
-            set_deep_copy (other);
-        }
-        return *this;
-    }
-#endif
-
-  private:
-    unsigned char *_data;
-    size_t _size;
-    bool _owned;
-};
-}
-
-#endif
diff --git a/libs/libzmq/src/channel.cpp b/libs/libzmq/src/channel.cpp
deleted file mode 100644
index bae4407..0000000
--- a/libs/libzmq/src/channel.cpp
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
-    Copyright (c) 2007-2020 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "macros.hpp"
-#include "channel.hpp"
-#include "err.hpp"
-#include "pipe.hpp"
-#include "msg.hpp"
-
-zmq::channel_t::channel_t (class ctx_t *parent_, uint32_t tid_, int sid_) :
-    socket_base_t (parent_, tid_, sid_, true), _pipe (NULL)
-{
-    options.type = ZMQ_CHANNEL;
-}
-
-zmq::channel_t::~channel_t ()
-{
-    zmq_assert (!_pipe);
-}
-
-void zmq::channel_t::xattach_pipe (pipe_t *pipe_,
-                                   bool subscribe_to_all_,
-                                   bool locally_initiated_)
-{
-    LIBZMQ_UNUSED (subscribe_to_all_);
-    LIBZMQ_UNUSED (locally_initiated_);
-
-    zmq_assert (pipe_ != NULL);
-
-    //  ZMQ_PAIR socket can only be connected to a single peer.
-    //  The socket rejects any further connection requests.
-    if (_pipe == NULL)
-        _pipe = pipe_;
-    else
-        pipe_->terminate (false);
-}
-
-void zmq::channel_t::xpipe_terminated (pipe_t *pipe_)
-{
-    if (pipe_ == _pipe)
-        _pipe = NULL;
-}
-
-void zmq::channel_t::xread_activated (pipe_t *)
-{
-    //  There's just one pipe. No lists of active and inactive pipes.
-    //  There's nothing to do here.
-}
-
-void zmq::channel_t::xwrite_activated (pipe_t *)
-{
-    //  There's just one pipe. No lists of active and inactive pipes.
-    //  There's nothing to do here.
-}
-
-int zmq::channel_t::xsend (msg_t *msg_)
-{
-    //  CHANNEL sockets do not allow multipart data (ZMQ_SNDMORE)
-    if (msg_->flags () & msg_t::more) {
-        errno = EINVAL;
-        return -1;
-    }
-
-    if (!_pipe || !_pipe->write (msg_)) {
-        errno = EAGAIN;
-        return -1;
-    }
-
-    _pipe->flush ();
-
-    //  Detach the original message from the data buffer.
-    const int rc = msg_->init ();
-    errno_assert (rc == 0);
-
-    return 0;
-}
-
-int zmq::channel_t::xrecv (msg_t *msg_)
-{
-    //  Deallocate old content of the message.
-    int rc = msg_->close ();
-    errno_assert (rc == 0);
-
-    if (!_pipe) {
-        //  Initialise the output parameter to be a 0-byte message.
-        rc = msg_->init ();
-        errno_assert (rc == 0);
-
-        errno = EAGAIN;
-        return -1;
-    }
-
-    // Drop any messages with more flag
-    bool read = _pipe->read (msg_);
-    while (read && msg_->flags () & msg_t::more) {
-        // drop all frames of the current multi-frame message
-        read = _pipe->read (msg_);
-        while (read && msg_->flags () & msg_t::more)
-            read = _pipe->read (msg_);
-
-        // get the new message
-        if (read)
-            read = _pipe->read (msg_);
-    }
-
-    if (!read) {
-        //  Initialise the output parameter to be a 0-byte message.
-        rc = msg_->init ();
-        errno_assert (rc == 0);
-
-        errno = EAGAIN;
-        return -1;
-    }
-
-    return 0;
-}
-
-bool zmq::channel_t::xhas_in ()
-{
-    if (!_pipe)
-        return false;
-
-    return _pipe->check_read ();
-}
-
-bool zmq::channel_t::xhas_out ()
-{
-    if (!_pipe)
-        return false;
-
-    return _pipe->check_write ();
-}
diff --git a/libs/libzmq/src/channel.hpp b/libs/libzmq/src/channel.hpp
deleted file mode 100644
index 0eb360a..0000000
--- a/libs/libzmq/src/channel.hpp
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
-    Copyright (c) 2007-2020 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_CHANNEL_HPP_INCLUDED__
-#define __ZMQ_CHANNEL_HPP_INCLUDED__
-
-#include "blob.hpp"
-#include "socket_base.hpp"
-#include "session_base.hpp"
-
-namespace zmq
-{
-class ctx_t;
-class msg_t;
-class pipe_t;
-class io_thread_t;
-
-class channel_t ZMQ_FINAL : public socket_base_t
-{
-  public:
-    channel_t (zmq::ctx_t *parent_, uint32_t tid_, int sid_);
-    ~channel_t ();
-
-    //  Overrides of functions from socket_base_t.
-    void xattach_pipe (zmq::pipe_t *pipe_,
-                       bool subscribe_to_all_,
-                       bool locally_initiated_);
-    int xsend (zmq::msg_t *msg_);
-    int xrecv (zmq::msg_t *msg_);
-    bool xhas_in ();
-    bool xhas_out ();
-    void xread_activated (zmq::pipe_t *pipe_);
-    void xwrite_activated (zmq::pipe_t *pipe_);
-    void xpipe_terminated (zmq::pipe_t *pipe_);
-
-  private:
-    zmq::pipe_t *_pipe;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (channel_t)
-};
-}
-
-#endif
diff --git a/libs/libzmq/src/client.cpp b/libs/libzmq/src/client.cpp
deleted file mode 100644
index ef3fc1c..0000000
--- a/libs/libzmq/src/client.cpp
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "macros.hpp"
-#include "client.hpp"
-#include "err.hpp"
-#include "msg.hpp"
-
-zmq::client_t::client_t (class ctx_t *parent_, uint32_t tid_, int sid_) :
-    socket_base_t (parent_, tid_, sid_, true)
-{
-    options.type = ZMQ_CLIENT;
-    options.can_send_hello_msg = true;
-    options.can_recv_hiccup_msg = true;
-}
-
-zmq::client_t::~client_t ()
-{
-}
-
-void zmq::client_t::xattach_pipe (pipe_t *pipe_,
-                                  bool subscribe_to_all_,
-                                  bool locally_initiated_)
-{
-    LIBZMQ_UNUSED (subscribe_to_all_);
-    LIBZMQ_UNUSED (locally_initiated_);
-
-    zmq_assert (pipe_);
-
-    _fq.attach (pipe_);
-    _lb.attach (pipe_);
-}
-
-int zmq::client_t::xsend (msg_t *msg_)
-{
-    //  CLIENT sockets do not allow multipart data (ZMQ_SNDMORE)
-    if (msg_->flags () & msg_t::more) {
-        errno = EINVAL;
-        return -1;
-    }
-    return _lb.sendpipe (msg_, NULL);
-}
-
-int zmq::client_t::xrecv (msg_t *msg_)
-{
-    int rc = _fq.recvpipe (msg_, NULL);
-
-    // Drop any messages with more flag
-    while (rc == 0 && msg_->flags () & msg_t::more) {
-        // drop all frames of the current multi-frame message
-        rc = _fq.recvpipe (msg_, NULL);
-
-        while (rc == 0 && msg_->flags () & msg_t::more)
-            rc = _fq.recvpipe (msg_, NULL);
-
-        // get the new message
-        if (rc == 0)
-            rc = _fq.recvpipe (msg_, NULL);
-    }
-
-    return rc;
-}
-
-bool zmq::client_t::xhas_in ()
-{
-    return _fq.has_in ();
-}
-
-bool zmq::client_t::xhas_out ()
-{
-    return _lb.has_out ();
-}
-
-void zmq::client_t::xread_activated (pipe_t *pipe_)
-{
-    _fq.activated (pipe_);
-}
-
-void zmq::client_t::xwrite_activated (pipe_t *pipe_)
-{
-    _lb.activated (pipe_);
-}
-
-void zmq::client_t::xpipe_terminated (pipe_t *pipe_)
-{
-    _fq.pipe_terminated (pipe_);
-    _lb.pipe_terminated (pipe_);
-}
diff --git a/libs/libzmq/src/client.hpp b/libs/libzmq/src/client.hpp
deleted file mode 100644
index c166f0e..0000000
--- a/libs/libzmq/src/client.hpp
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_CLIENT_HPP_INCLUDED__
-#define __ZMQ_CLIENT_HPP_INCLUDED__
-
-#include "socket_base.hpp"
-#include "fq.hpp"
-#include "lb.hpp"
-
-namespace zmq
-{
-class ctx_t;
-class msg_t;
-class pipe_t;
-class io_thread_t;
-
-class client_t ZMQ_FINAL : public socket_base_t
-{
-  public:
-    client_t (zmq::ctx_t *parent_, uint32_t tid_, int sid_);
-    ~client_t ();
-
-  protected:
-    //  Overrides of functions from socket_base_t.
-    void xattach_pipe (zmq::pipe_t *pipe_,
-                       bool subscribe_to_all_,
-                       bool locally_initiated_);
-    int xsend (zmq::msg_t *msg_);
-    int xrecv (zmq::msg_t *msg_);
-    bool xhas_in ();
-    bool xhas_out ();
-    void xread_activated (zmq::pipe_t *pipe_);
-    void xwrite_activated (zmq::pipe_t *pipe_);
-    void xpipe_terminated (zmq::pipe_t *pipe_);
-
-  private:
-    //  Messages are fair-queued from inbound pipes. And load-balanced to
-    //  the outbound pipes.
-    fq_t _fq;
-    lb_t _lb;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (client_t)
-};
-}
-
-#endif
diff --git a/libs/libzmq/src/clock.cpp b/libs/libzmq/src/clock.cpp
deleted file mode 100644
index 1acc98d..0000000
--- a/libs/libzmq/src/clock.cpp
+++ /dev/null
@@ -1,281 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "clock.hpp"
-#include "likely.hpp"
-#include "config.hpp"
-#include "err.hpp"
-#include "mutex.hpp"
-
-#include <stddef.h>
-
-#if defined _MSC_VER
-#if defined _WIN32_WCE
-#include <cmnintrin.h>
-#else
-#include <intrin.h>
-#if defined(_M_ARM) || defined(_M_ARM64)
-#include <arm_neon.h>
-#endif
-#endif
-#endif
-
-#if !defined ZMQ_HAVE_WINDOWS
-#include <sys/time.h>
-#endif
-
-#if defined HAVE_CLOCK_GETTIME || defined HAVE_GETHRTIME
-#include <time.h>
-#endif
-
-#if defined ZMQ_HAVE_VXWORKS
-#include "timers.h"
-#endif
-
-#if defined ZMQ_HAVE_OSX
-int alt_clock_gettime (int clock_id, timespec *ts)
-{
-    clock_serv_t cclock;
-    mach_timespec_t mts;
-    host_get_clock_service (mach_host_self (), clock_id, &cclock);
-    clock_get_time (cclock, &mts);
-    mach_port_deallocate (mach_task_self (), cclock);
-    ts->tv_sec = mts.tv_sec;
-    ts->tv_nsec = mts.tv_nsec;
-    return 0;
-}
-#endif
-
-#ifdef ZMQ_HAVE_WINDOWS
-typedef ULONGLONG (*f_compatible_get_tick_count64) ();
-
-static zmq::mutex_t compatible_get_tick_count64_mutex;
-
-ULONGLONG compatible_get_tick_count64 ()
-{
-#ifdef ZMQ_HAVE_WINDOWS_UWP
-    const ULONGLONG result = ::GetTickCount64 ();
-    return result;
-#else
-    zmq::scoped_lock_t locker (compatible_get_tick_count64_mutex);
-
-    static DWORD s_wrap = 0;
-    static DWORD s_last_tick = 0;
-    const DWORD current_tick = ::GetTickCount ();
-
-    if (current_tick < s_last_tick)
-        ++s_wrap;
-
-    s_last_tick = current_tick;
-    const ULONGLONG result = (static_cast<ULONGLONG> (s_wrap) << 32)
-                             + static_cast<ULONGLONG> (current_tick);
-
-    return result;
-#endif
-}
-
-f_compatible_get_tick_count64 init_compatible_get_tick_count64 ()
-{
-    f_compatible_get_tick_count64 func = NULL;
-#if !defined ZMQ_HAVE_WINDOWS_UWP
-
-    const HMODULE module = ::LoadLibraryA ("Kernel32.dll");
-    if (module != NULL)
-        func = reinterpret_cast<f_compatible_get_tick_count64> (
-          ::GetProcAddress (module, "GetTickCount64"));
-#endif
-    if (func == NULL)
-        func = compatible_get_tick_count64;
-
-#if !defined ZMQ_HAVE_WINDOWS_UWP
-    if (module != NULL)
-        ::FreeLibrary (module);
-#endif
-
-    return func;
-}
-
-static f_compatible_get_tick_count64 my_get_tick_count64 =
-  init_compatible_get_tick_count64 ();
-#endif
-
-#ifndef ZMQ_HAVE_WINDOWS
-const uint64_t usecs_per_msec = 1000;
-const uint64_t nsecs_per_usec = 1000;
-#endif
-const uint64_t usecs_per_sec = 1000000;
-
-zmq::clock_t::clock_t () :
-    _last_tsc (rdtsc ()),
-#ifdef ZMQ_HAVE_WINDOWS
-    _last_time (static_cast<uint64_t> ((*my_get_tick_count64) ()))
-#else
-    _last_time (now_us () / usecs_per_msec)
-#endif
-{
-}
-
-uint64_t zmq::clock_t::now_us ()
-{
-#if defined ZMQ_HAVE_WINDOWS
-
-    //  Get the high resolution counter's accuracy.
-    //  While QueryPerformanceFrequency only needs to be called once, since its
-    //  value does not change during runtime, we query it here since this is a
-    //  static function. It might make sense to cache it, though.
-    LARGE_INTEGER ticks_per_second;
-    QueryPerformanceFrequency (&ticks_per_second);
-
-    //  What time is it?
-    LARGE_INTEGER tick;
-    QueryPerformanceCounter (&tick);
-
-    //  Convert the tick number into the number of seconds
-    //  since the system was started.
-    const double ticks_div =
-      static_cast<double> (ticks_per_second.QuadPart) / usecs_per_sec;
-    return static_cast<uint64_t> (tick.QuadPart / ticks_div);
-
-#elif defined HAVE_CLOCK_GETTIME                                               \
-  && (defined CLOCK_MONOTONIC || defined ZMQ_HAVE_VXWORKS)
-
-    //  Use POSIX clock_gettime function to get precise monotonic time.
-    struct timespec tv;
-
-#if defined ZMQ_HAVE_OSX                                                       \
-  && __MAC_OS_X_VERSION_MIN_REQUIRED < 101200 // less than macOS 10.12
-    int rc = alt_clock_gettime (SYSTEM_CLOCK, &tv);
-#else
-    int rc = clock_gettime (CLOCK_MONOTONIC, &tv);
-#endif
-    // Fix case where system has clock_gettime but CLOCK_MONOTONIC is not supported.
-    // This should be a configuration check, but I looked into it and writing an
-    // AC_FUNC_CLOCK_MONOTONIC seems beyond my powers.
-    if (rc != 0) {
-#ifndef ZMQ_HAVE_VXWORKS
-        //  Use POSIX gettimeofday function to get precise time.
-        struct timeval tv;
-        int rc = gettimeofday (&tv, NULL);
-        errno_assert (rc == 0);
-        return tv.tv_sec * usecs_per_sec + tv.tv_usec;
-#endif
-    }
-    return tv.tv_sec * usecs_per_sec + tv.tv_nsec / nsecs_per_usec;
-
-#elif defined HAVE_GETHRTIME
-
-    return gethrtime () / nsecs_per_usec;
-
-#else
-
-    LIBZMQ_UNUSED (nsecs_per_usec);
-    //  Use POSIX gettimeofday function to get precise time.
-    struct timeval tv;
-    int rc = gettimeofday (&tv, NULL);
-    errno_assert (rc == 0);
-    return tv.tv_sec * usecs_per_sec + tv.tv_usec;
-
-#endif
-}
-
-uint64_t zmq::clock_t::now_ms ()
-{
-    const uint64_t tsc = rdtsc ();
-
-    //  If TSC is not supported, get precise time and chop off the microseconds.
-    if (!tsc) {
-#ifdef ZMQ_HAVE_WINDOWS
-        // Under Windows, now_us is not so reliable since QueryPerformanceCounter
-        // does not guarantee that it will use a hardware that offers a monotonic timer.
-        // So, lets use GetTickCount when GetTickCount64 is not available with an workaround
-        // to its 32 bit limitation.
-        return static_cast<uint64_t> ((*my_get_tick_count64) ());
-#else
-        return now_us () / usecs_per_msec;
-#endif
-    }
-
-    //  If TSC haven't jumped back (in case of migration to a different
-    //  CPU core) and if not too much time elapsed since last measurement,
-    //  we can return cached time value.
-    if (likely (tsc - _last_tsc <= (clock_precision / 2) && tsc >= _last_tsc))
-        return _last_time;
-
-    _last_tsc = tsc;
-#ifdef ZMQ_HAVE_WINDOWS
-    _last_time = static_cast<uint64_t> ((*my_get_tick_count64) ());
-#else
-    _last_time = now_us () / usecs_per_msec;
-#endif
-    return _last_time;
-}
-
-uint64_t zmq::clock_t::rdtsc ()
-{
-#if (defined _MSC_VER && (defined _M_IX86 || defined _M_X64))
-    return __rdtsc ();
-#elif defined(_MSC_VER) && defined(_M_ARM)   // NC => added for windows ARM
-    return __rdpmccntr64 ();
-#elif defined(_MSC_VER) && defined(_M_ARM64) // NC => added for windows ARM64
-    const int64_t pmccntr_el0 = (((3 & 1) << 14) |  // op0
-                                 ((3 & 7) << 11) |  // op1
-                                 ((9 & 15) << 7) |  // crn
-                                 ((13 & 15) << 3) | // crm
-                                 ((0 & 7) << 0));   // op2
-    return _ReadStatusReg (pmccntr_el0);
-#elif (defined __GNUC__ && (defined __i386__ || defined __x86_64__))
-    uint32_t low, high;
-    __asm__ volatile("rdtsc" : "=a"(low), "=d"(high));
-    return static_cast<uint64_t> (high) << 32 | low;
-#elif (defined __SUNPRO_CC && (__SUNPRO_CC >= 0x5100)                          \
-       && (defined __i386 || defined __amd64 || defined __x86_64))
-    union
-    {
-        uint64_t u64val;
-        uint32_t u32val[2];
-    } tsc;
-    asm("rdtsc" : "=a"(tsc.u32val[0]), "=d"(tsc.u32val[1]));
-    return tsc.u64val;
-#elif defined(__s390__)
-    uint64_t tsc;
-    asm("\tstck\t%0\n" : "=Q"(tsc) : : "cc");
-    return tsc;
-#else
-    struct timespec ts;
-#if defined ZMQ_HAVE_OSX                                                       \
-  && __MAC_OS_X_VERSION_MIN_REQUIRED < 101200 // less than macOS 10.12
-    alt_clock_gettime (SYSTEM_CLOCK, &ts);
-#else
-    clock_gettime (CLOCK_MONOTONIC, &ts);
-#endif
-    return static_cast<uint64_t> (ts.tv_sec) * nsecs_per_usec * usecs_per_sec
-           + ts.tv_nsec;
-#endif
-}
diff --git a/libs/libzmq/src/clock.hpp b/libs/libzmq/src/clock.hpp
deleted file mode 100644
index 300d180..0000000
--- a/libs/libzmq/src/clock.hpp
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_CLOCK_HPP_INCLUDED__
-#define __ZMQ_CLOCK_HPP_INCLUDED__
-
-#include "macros.hpp"
-#include "stdint.hpp"
-
-#if defined ZMQ_HAVE_OSX
-// TODO this is not required in this file, but condition_variable.hpp includes
-// clock.hpp to get these definitions
-#ifndef CLOCK_REALTIME
-#define CLOCK_REALTIME 0
-#endif
-#ifndef HAVE_CLOCK_GETTIME
-#define HAVE_CLOCK_GETTIME
-#endif
-
-#include <mach/clock.h>
-#include <mach/mach.h>
-#include <time.h>
-#include <sys/time.h>
-#endif
-
-namespace zmq
-{
-class clock_t
-{
-  public:
-    clock_t ();
-
-    //  CPU's timestamp counter. Returns 0 if it's not available.
-    static uint64_t rdtsc ();
-
-    //  High precision timestamp.
-    static uint64_t now_us ();
-
-    //  Low precision timestamp. In tight loops generating it can be
-    //  10 to 100 times faster than the high precision timestamp.
-    uint64_t now_ms ();
-
-  private:
-    //  TSC timestamp of when last time measurement was made.
-    uint64_t _last_tsc;
-
-    //  Physical time corresponding to the TSC above (in milliseconds).
-    uint64_t _last_time;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (clock_t)
-};
-}
-
-#endif
diff --git a/libs/libzmq/src/command.hpp b/libs/libzmq/src/command.hpp
deleted file mode 100644
index 234c858..0000000
--- a/libs/libzmq/src/command.hpp
+++ /dev/null
@@ -1,224 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_COMMAND_HPP_INCLUDED__
-#define __ZMQ_COMMAND_HPP_INCLUDED__
-
-#include <string>
-#include "stdint.hpp"
-#include "endpoint.hpp"
-#include "platform.hpp"
-
-namespace zmq
-{
-class object_t;
-class own_t;
-struct i_engine;
-class pipe_t;
-class socket_base_t;
-
-//  This structure defines the commands that can be sent between threads.
-
-struct command_t
-{
-    //  Object to process the command.
-    zmq::object_t *destination;
-
-    enum type_t
-    {
-        stop,
-        plug,
-        own,
-        attach,
-        bind,
-        activate_read,
-        activate_write,
-        hiccup,
-        pipe_term,
-        pipe_term_ack,
-        pipe_hwm,
-        term_req,
-        term,
-        term_ack,
-        term_endpoint,
-        reap,
-        reaped,
-        inproc_connected,
-        conn_failed,
-        pipe_peer_stats,
-        pipe_stats_publish,
-        done
-    } type;
-
-    union args_t
-    {
-        //  Sent to I/O thread to let it know that it should
-        //  terminate itself.
-        struct
-        {
-        } stop;
-
-        //  Sent to I/O object to make it register with its I/O thread.
-        struct
-        {
-        } plug;
-
-        //  Sent to socket to let it know about the newly created object.
-        struct
-        {
-            zmq::own_t *object;
-        } own;
-
-        //  Attach the engine to the session. If engine is NULL, it informs
-        //  session that the connection have failed.
-        struct
-        {
-            struct i_engine *engine;
-        } attach;
-
-        //  Sent from session to socket to establish pipe(s) between them.
-        //  Caller have used inc_seqnum beforehand sending the command.
-        struct
-        {
-            zmq::pipe_t *pipe;
-        } bind;
-
-        //  Sent by pipe writer to inform dormant pipe reader that there
-        //  are messages in the pipe.
-        struct
-        {
-        } activate_read;
-
-        //  Sent by pipe reader to inform pipe writer about how many
-        //  messages it has read so far.
-        struct
-        {
-            uint64_t msgs_read;
-        } activate_write;
-
-        //  Sent by pipe reader to writer after creating a new inpipe.
-        //  The parameter is actually of type pipe_t::upipe_t, however,
-        //  its definition is private so we'll have to do with void*.
-        struct
-        {
-            void *pipe;
-        } hiccup;
-
-        //  Sent by pipe reader to pipe writer to ask it to terminate
-        //  its end of the pipe.
-        struct
-        {
-        } pipe_term;
-
-        //  Pipe writer acknowledges pipe_term command.
-        struct
-        {
-        } pipe_term_ack;
-
-        //  Sent by one of pipe to another part for modify hwm
-        struct
-        {
-            int inhwm;
-            int outhwm;
-        } pipe_hwm;
-
-        //  Sent by I/O object ot the socket to request the shutdown of
-        //  the I/O object.
-        struct
-        {
-            zmq::own_t *object;
-        } term_req;
-
-        //  Sent by socket to I/O object to start its shutdown.
-        struct
-        {
-            int linger;
-        } term;
-
-        //  Sent by I/O object to the socket to acknowledge it has
-        //  shut down.
-        struct
-        {
-        } term_ack;
-
-        //  Sent by session_base (I/O thread) to socket (application thread)
-        //  to ask to disconnect the endpoint.
-        struct
-        {
-            std::string *endpoint;
-        } term_endpoint;
-
-        //  Transfers the ownership of the closed socket
-        //  to the reaper thread.
-        struct
-        {
-            zmq::socket_base_t *socket;
-        } reap;
-
-        //  Closed socket notifies the reaper that it's already deallocated.
-        struct
-        {
-        } reaped;
-
-        //  Send application-side pipe count and ask to send monitor event
-        struct
-        {
-            uint64_t queue_count;
-            zmq::own_t *socket_base;
-            endpoint_uri_pair_t *endpoint_pair;
-        } pipe_peer_stats;
-
-        //  Collate application thread and I/O thread pipe counts and endpoints
-        //  and send as event
-        struct
-        {
-            uint64_t outbound_queue_count;
-            uint64_t inbound_queue_count;
-            endpoint_uri_pair_t *endpoint_pair;
-        } pipe_stats_publish;
-
-        //  Sent by reaper thread to the term thread when all the sockets
-        //  are successfully deallocated.
-        struct
-        {
-        } done;
-
-    } args;
-#ifdef _MSC_VER
-};
-#else
-}
-#ifdef HAVE_POSIX_MEMALIGN
-__attribute__ ((aligned (ZMQ_CACHELINE_SIZE)))
-#endif
-;
-#endif
-}
-
-#endif
diff --git a/libs/libzmq/src/compat.hpp b/libs/libzmq/src/compat.hpp
deleted file mode 100644
index 47744b9..0000000
--- a/libs/libzmq/src/compat.hpp
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
-    Copyright (c) 2020 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_COMPAT_HPP_INCLUDED__
-#define __ZMQ_COMPAT_HPP_INCLUDED__
-
-#include "precompiled.hpp"
-#include <string.h>
-
-#ifdef ZMQ_HAVE_WINDOWS
-#define strcasecmp _stricmp
-#define strtok_r strtok_s
-#else
-#ifndef ZMQ_HAVE_STRLCPY
-#ifdef ZMQ_HAVE_LIBBSD
-#include <bsd/string.h>
-#else
-static inline size_t
-strlcpy (char *dest_, const char *src_, const size_t dest_size_)
-{
-    size_t remain = dest_size_;
-    for (; remain && *src_; --remain, ++src_, ++dest_) {
-        *dest_ = *src_;
-    }
-    return dest_size_ - remain;
-}
-#endif
-#endif
-template <size_t size>
-static inline int strcpy_s (char (&dest_)[size], const char *const src_)
-{
-    const size_t res = strlcpy (dest_, src_, size);
-    return res >= size ? ERANGE : 0;
-}
-#endif
-
-#ifndef HAVE_STRNLEN
-static inline size_t strnlen (const char *s, size_t len)
-{
-    for (size_t i = 0; i < len; i++) {
-        if (s[i] == '\0')
-            return i + 1;
-    }
-
-    return len;
-}
-#endif
-
-#endif
diff --git a/libs/libzmq/src/condition_variable.hpp b/libs/libzmq/src/condition_variable.hpp
deleted file mode 100644
index 47d14e7..0000000
--- a/libs/libzmq/src/condition_variable.hpp
+++ /dev/null
@@ -1,313 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_CONDITON_VARIABLE_HPP_INCLUDED__
-#define __ZMQ_CONDITON_VARIABLE_HPP_INCLUDED__
-
-#include "err.hpp"
-#include "mutex.hpp"
-
-//  Condition variable class encapsulates OS mutex in a platform-independent way.
-
-#if defined(ZMQ_USE_CV_IMPL_NONE)
-
-namespace zmq
-{
-class condition_variable_t
-{
-  public:
-    inline condition_variable_t () { zmq_assert (false); }
-
-    inline int wait (mutex_t *mutex_, int timeout_)
-    {
-        zmq_assert (false);
-        return -1;
-    }
-
-    inline void broadcast () { zmq_assert (false); }
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (condition_variable_t)
-};
-}
-
-#elif defined(ZMQ_USE_CV_IMPL_WIN32API)
-
-#include "windows.hpp"
-
-namespace zmq
-{
-class condition_variable_t
-{
-  public:
-    inline condition_variable_t () { InitializeConditionVariable (&_cv); }
-
-    inline int wait (mutex_t *mutex_, int timeout_)
-    {
-        int rc = SleepConditionVariableCS (&_cv, mutex_->get_cs (), timeout_);
-
-        if (rc != 0)
-            return 0;
-
-        rc = GetLastError ();
-
-        if (rc != ERROR_TIMEOUT)
-            win_assert (rc);
-
-        errno = EAGAIN;
-        return -1;
-    }
-
-    inline void broadcast () { WakeAllConditionVariable (&_cv); }
-
-  private:
-    CONDITION_VARIABLE _cv;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (condition_variable_t)
-};
-}
-
-#elif defined(ZMQ_USE_CV_IMPL_STL11)
-
-#include <condition_variable>
-
-namespace zmq
-{
-class condition_variable_t
-{
-  public:
-    condition_variable_t () ZMQ_DEFAULT;
-
-    int wait (mutex_t *mutex_, int timeout_)
-    {
-        // this assumes that the mutex mutex_ has been locked by the caller
-        int res = 0;
-        if (timeout_ == -1) {
-            _cv.wait (
-              *mutex_); // unlock mtx and wait cv.notify_all(), lock mtx after cv.notify_all()
-        } else if (_cv.wait_for (*mutex_, std::chrono::milliseconds (timeout_))
-                   == std::cv_status::timeout) {
-            // time expired
-            errno = EAGAIN;
-            res = -1;
-        }
-        return res;
-    }
-
-    void broadcast ()
-    {
-        // this assumes that the mutex associated with _cv has been locked by the caller
-        _cv.notify_all ();
-    }
-
-  private:
-    std::condition_variable_any _cv;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (condition_variable_t)
-};
-}
-
-#elif defined(ZMQ_USE_CV_IMPL_VXWORKS)
-
-#include <sysLib.h>
-
-namespace zmq
-{
-class condition_variable_t
-{
-  public:
-    inline condition_variable_t () ZMQ_DEFAULT;
-
-    inline ~condition_variable_t ()
-    {
-        scoped_lock_t l (_listenersMutex);
-        for (size_t i = 0; i < _listeners.size (); i++) {
-            semDelete (_listeners[i]);
-        }
-    }
-
-    inline int wait (mutex_t *mutex_, int timeout_)
-    {
-        //Atomically releases lock, blocks the current executing thread,
-        //and adds it to the list of threads waiting on *this. The thread
-        //will be unblocked when broadcast() is executed.
-        //It may also be unblocked spuriously. When unblocked, regardless
-        //of the reason, lock is reacquired and wait exits.
-
-        SEM_ID sem = semBCreate (SEM_Q_PRIORITY, SEM_EMPTY);
-        {
-            scoped_lock_t l (_listenersMutex);
-            _listeners.push_back (sem);
-        }
-        mutex_->unlock ();
-
-        int rc;
-        if (timeout_ < 0)
-            rc = semTake (sem, WAIT_FOREVER);
-        else {
-            int ticksPerSec = sysClkRateGet ();
-            int timeoutTicks = (timeout_ * ticksPerSec) / 1000 + 1;
-            rc = semTake (sem, timeoutTicks);
-        }
-
-        {
-            scoped_lock_t l (_listenersMutex);
-            // remove sem from listeners
-            for (size_t i = 0; i < _listeners.size (); i++) {
-                if (_listeners[i] == sem) {
-                    _listeners.erase (_listeners.begin () + i);
-                    break;
-                }
-            }
-            semDelete (sem);
-        }
-        mutex_->lock ();
-
-        if (rc == 0)
-            return 0;
-
-        if (rc == S_objLib_OBJ_TIMEOUT) {
-            errno = EAGAIN;
-            return -1;
-        }
-
-        return -1;
-    }
-
-    inline void broadcast ()
-    {
-        scoped_lock_t l (_listenersMutex);
-        for (size_t i = 0; i < _listeners.size (); i++) {
-            semGive (_listeners[i]);
-        }
-    }
-
-  private:
-    mutex_t _listenersMutex;
-    std::vector<SEM_ID> _listeners;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (condition_variable_t)
-};
-}
-
-#elif defined(ZMQ_USE_CV_IMPL_PTHREADS)
-
-#include <pthread.h>
-
-#if defined(__ANDROID_API__) && __ANDROID_API__ < 21
-#define ANDROID_LEGACY
-extern "C" int pthread_cond_timedwait_monotonic_np (pthread_cond_t *,
-                                                    pthread_mutex_t *,
-                                                    const struct timespec *);
-#endif
-
-namespace zmq
-{
-class condition_variable_t
-{
-  public:
-    inline condition_variable_t ()
-    {
-        pthread_condattr_t attr;
-        pthread_condattr_init (&attr);
-#if !defined(ZMQ_HAVE_OSX) && !defined(ANDROID_LEGACY)
-        pthread_condattr_setclock (&attr, CLOCK_MONOTONIC);
-#endif
-        int rc = pthread_cond_init (&_cond, &attr);
-        posix_assert (rc);
-    }
-
-    inline ~condition_variable_t ()
-    {
-        int rc = pthread_cond_destroy (&_cond);
-        posix_assert (rc);
-    }
-
-    inline int wait (mutex_t *mutex_, int timeout_)
-    {
-        int rc;
-
-        if (timeout_ != -1) {
-            struct timespec timeout;
-
-#ifdef ZMQ_HAVE_OSX
-            timeout.tv_sec = 0;
-            timeout.tv_nsec = 0;
-#else
-            rc = clock_gettime (CLOCK_MONOTONIC, &timeout);
-            posix_assert (rc);
-#endif
-
-            timeout.tv_sec += timeout_ / 1000;
-            timeout.tv_nsec += (timeout_ % 1000) * 1000000;
-
-            if (timeout.tv_nsec >= 1000000000) {
-                timeout.tv_sec++;
-                timeout.tv_nsec -= 1000000000;
-            }
-#ifdef ZMQ_HAVE_OSX
-            rc = pthread_cond_timedwait_relative_np (
-              &_cond, mutex_->get_mutex (), &timeout);
-#elif defined(ANDROID_LEGACY)
-            rc = pthread_cond_timedwait_monotonic_np (
-              &_cond, mutex_->get_mutex (), &timeout);
-#else
-            rc =
-              pthread_cond_timedwait (&_cond, mutex_->get_mutex (), &timeout);
-#endif
-        } else
-            rc = pthread_cond_wait (&_cond, mutex_->get_mutex ());
-
-        if (rc == 0)
-            return 0;
-
-        if (rc == ETIMEDOUT) {
-            errno = EAGAIN;
-            return -1;
-        }
-
-        posix_assert (rc);
-        return -1;
-    }
-
-    inline void broadcast ()
-    {
-        int rc = pthread_cond_broadcast (&_cond);
-        posix_assert (rc);
-    }
-
-  private:
-    pthread_cond_t _cond;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (condition_variable_t)
-};
-}
-
-#endif
-
-#endif
diff --git a/libs/libzmq/src/config.hpp b/libs/libzmq/src/config.hpp
deleted file mode 100644
index c355c6d..0000000
--- a/libs/libzmq/src/config.hpp
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_CONFIG_HPP_INCLUDED__
-#define __ZMQ_CONFIG_HPP_INCLUDED__
-
-namespace zmq
-{
-//  Compile-time settings.
-
-enum
-{
-    //  Number of new messages in message pipe needed to trigger new memory
-    //  allocation. Setting this parameter to 256 decreases the impact of
-    //  memory allocation by approximately 99.6%
-    message_pipe_granularity = 256,
-
-    //  Commands in pipe per allocation event.
-    command_pipe_granularity = 16,
-
-    //  Determines how often does socket poll for new commands when it
-    //  still has unprocessed messages to handle. Thus, if it is set to 100,
-    //  socket will process 100 inbound messages before doing the poll.
-    //  If there are no unprocessed messages available, poll is done
-    //  immediately. Decreasing the value trades overall latency for more
-    //  real-time behaviour (less latency peaks).
-    inbound_poll_rate = 100,
-
-    //  Maximal delta between high and low watermark.
-    max_wm_delta = 1024,
-
-    //  Maximum number of events the I/O thread can process in one go.
-    max_io_events = 256,
-
-    //  Maximal batch size of packets forwarded by a ZMQ proxy.
-    //  Increasing this value improves throughput at the expense of
-    //  latency and fairness.
-    proxy_burst_size = 1000,
-
-    //  Maximal delay to process command in API thread (in CPU ticks).
-    //  3,000,000 ticks equals to 1 - 2 milliseconds on current CPUs.
-    //  Note that delay is only applied when there is continuous stream of
-    //  messages to process. If not so, commands are processed immediately.
-    max_command_delay = 3000000,
-
-    //  Low-precision clock precision in CPU ticks. 1ms. Value of 1000000
-    //  should be OK for CPU frequencies above 1GHz. If should work
-    //  reasonably well for CPU frequencies above 500MHz. For lower CPU
-    //  frequencies you may consider lowering this value to get best
-    //  possible latencies.
-    clock_precision = 1000000,
-
-    //  On some OSes the signaler has to be emulated using a TCP
-    //  connection. In such cases following port is used.
-    //  If 0, it lets the OS choose a free port without requiring use of a
-    //  global mutex. The original implementation of a Windows signaler
-    //  socket used port 5905 instead of letting the OS choose a free port.
-    //  https://github.com/zeromq/libzmq/issues/1542
-    signaler_port = 0
-};
-}
-
-#endif
diff --git a/libs/libzmq/src/ctx.cpp b/libs/libzmq/src/ctx.cpp
deleted file mode 100644
index 8c92fa9..0000000
--- a/libs/libzmq/src/ctx.cpp
+++ /dev/null
@@ -1,900 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "macros.hpp"
-#ifndef ZMQ_HAVE_WINDOWS
-#include <unistd.h>
-#endif
-
-#include <limits>
-#include <climits>
-#include <new>
-#include <sstream>
-#include <string.h>
-
-#include "ctx.hpp"
-#include "socket_base.hpp"
-#include "io_thread.hpp"
-#include "reaper.hpp"
-#include "pipe.hpp"
-#include "err.hpp"
-#include "msg.hpp"
-#include "random.hpp"
-
-#ifdef ZMQ_HAVE_VMCI
-#include <vmci_sockets.h>
-#endif
-
-#ifdef ZMQ_USE_NSS
-#include <nss.h>
-#endif
-
-#ifdef ZMQ_USE_GNUTLS
-#include <gnutls/gnutls.h>
-#endif
-
-#define ZMQ_CTX_TAG_VALUE_GOOD 0xabadcafe
-#define ZMQ_CTX_TAG_VALUE_BAD 0xdeadbeef
-
-static int clipped_maxsocket (int max_requested_)
-{
-    if (max_requested_ >= zmq::poller_t::max_fds ()
-        && zmq::poller_t::max_fds () != -1)
-        // -1 because we need room for the reaper mailbox.
-        max_requested_ = zmq::poller_t::max_fds () - 1;
-
-    return max_requested_;
-}
-
-zmq::ctx_t::ctx_t () :
-    _tag (ZMQ_CTX_TAG_VALUE_GOOD),
-    _starting (true),
-    _terminating (false),
-    _reaper (NULL),
-    _max_sockets (clipped_maxsocket (ZMQ_MAX_SOCKETS_DFLT)),
-    _max_msgsz (INT_MAX),
-    _io_thread_count (ZMQ_IO_THREADS_DFLT),
-    _blocky (true),
-    _ipv6 (false),
-    _zero_copy (true)
-{
-#ifdef HAVE_FORK
-    _pid = getpid ();
-#endif
-#ifdef ZMQ_HAVE_VMCI
-    _vmci_fd = -1;
-    _vmci_family = -1;
-#endif
-
-    //  Initialise crypto library, if needed.
-    zmq::random_open ();
-
-#ifdef ZMQ_USE_NSS
-    NSS_NoDB_Init (NULL);
-#endif
-
-#ifdef ZMQ_USE_GNUTLS
-    gnutls_global_init ();
-#endif
-}
-
-bool zmq::ctx_t::check_tag () const
-{
-    return _tag == ZMQ_CTX_TAG_VALUE_GOOD;
-}
-
-zmq::ctx_t::~ctx_t ()
-{
-    //  Check that there are no remaining _sockets.
-    zmq_assert (_sockets.empty ());
-
-    //  Ask I/O threads to terminate. If stop signal wasn't sent to I/O
-    //  thread subsequent invocation of destructor would hang-up.
-    const io_threads_t::size_type io_threads_size = _io_threads.size ();
-    for (io_threads_t::size_type i = 0; i != io_threads_size; i++) {
-        _io_threads[i]->stop ();
-    }
-
-    //  Wait till I/O threads actually terminate.
-    for (io_threads_t::size_type i = 0; i != io_threads_size; i++) {
-        LIBZMQ_DELETE (_io_threads[i]);
-    }
-
-    //  Deallocate the reaper thread object.
-    LIBZMQ_DELETE (_reaper);
-
-    //  The mailboxes in _slots themselves were deallocated with their
-    //  corresponding io_thread/socket objects.
-
-    //  De-initialise crypto library, if needed.
-    zmq::random_close ();
-
-#ifdef ZMQ_USE_NSS
-    NSS_Shutdown ();
-#endif
-
-#ifdef ZMQ_USE_GNUTLS
-    gnutls_global_deinit ();
-#endif
-
-    //  Remove the tag, so that the object is considered dead.
-    _tag = ZMQ_CTX_TAG_VALUE_BAD;
-}
-
-bool zmq::ctx_t::valid () const
-{
-    return _term_mailbox.valid ();
-}
-
-int zmq::ctx_t::terminate ()
-{
-    _slot_sync.lock ();
-
-    const bool save_terminating = _terminating;
-    _terminating = false;
-
-    // Connect up any pending inproc connections, otherwise we will hang
-    pending_connections_t copy = _pending_connections;
-    for (pending_connections_t::iterator p = copy.begin (), end = copy.end ();
-         p != end; ++p) {
-        zmq::socket_base_t *s = create_socket (ZMQ_PAIR);
-        // create_socket might fail eg: out of memory/sockets limit reached
-        zmq_assert (s);
-        s->bind (p->first.c_str ());
-        s->close ();
-    }
-    _terminating = save_terminating;
-
-    if (!_starting) {
-#ifdef HAVE_FORK
-        if (_pid != getpid ()) {
-            // we are a forked child process. Close all file descriptors
-            // inherited from the parent.
-            for (sockets_t::size_type i = 0, size = _sockets.size (); i != size;
-                 i++) {
-                _sockets[i]->get_mailbox ()->forked ();
-            }
-            _term_mailbox.forked ();
-        }
-#endif
-
-        //  Check whether termination was already underway, but interrupted and now
-        //  restarted.
-        const bool restarted = _terminating;
-        _terminating = true;
-
-        //  First attempt to terminate the context.
-        if (!restarted) {
-            //  First send stop command to sockets so that any blocking calls
-            //  can be interrupted. If there are no sockets we can ask reaper
-            //  thread to stop.
-            for (sockets_t::size_type i = 0, size = _sockets.size (); i != size;
-                 i++) {
-                _sockets[i]->stop ();
-            }
-            if (_sockets.empty ())
-                _reaper->stop ();
-        }
-        _slot_sync.unlock ();
-
-        //  Wait till reaper thread closes all the sockets.
-        command_t cmd;
-        const int rc = _term_mailbox.recv (&cmd, -1);
-        if (rc == -1 && errno == EINTR)
-            return -1;
-        errno_assert (rc == 0);
-        zmq_assert (cmd.type == command_t::done);
-        _slot_sync.lock ();
-        zmq_assert (_sockets.empty ());
-    }
-    _slot_sync.unlock ();
-
-#ifdef ZMQ_HAVE_VMCI
-    _vmci_sync.lock ();
-
-    VMCISock_ReleaseAFValueFd (_vmci_fd);
-    _vmci_family = -1;
-    _vmci_fd = -1;
-
-    _vmci_sync.unlock ();
-#endif
-
-    //  Deallocate the resources.
-    delete this;
-
-    return 0;
-}
-
-int zmq::ctx_t::shutdown ()
-{
-    scoped_lock_t locker (_slot_sync);
-
-    if (!_terminating) {
-        _terminating = true;
-
-        if (!_starting) {
-            //  Send stop command to sockets so that any blocking calls
-            //  can be interrupted. If there are no sockets we can ask reaper
-            //  thread to stop.
-            for (sockets_t::size_type i = 0, size = _sockets.size (); i != size;
-                 i++) {
-                _sockets[i]->stop ();
-            }
-            if (_sockets.empty ())
-                _reaper->stop ();
-        }
-    }
-
-    return 0;
-}
-
-int zmq::ctx_t::set (int option_, const void *optval_, size_t optvallen_)
-{
-    const bool is_int = (optvallen_ == sizeof (int));
-    int value = 0;
-    if (is_int)
-        memcpy (&value, optval_, sizeof (int));
-
-    switch (option_) {
-        case ZMQ_MAX_SOCKETS:
-            if (is_int && value >= 1 && value == clipped_maxsocket (value)) {
-                scoped_lock_t locker (_opt_sync);
-                _max_sockets = value;
-                return 0;
-            }
-            break;
-
-        case ZMQ_IO_THREADS:
-            if (is_int && value >= 0) {
-                scoped_lock_t locker (_opt_sync);
-                _io_thread_count = value;
-                return 0;
-            }
-            break;
-
-        case ZMQ_IPV6:
-            if (is_int && value >= 0) {
-                scoped_lock_t locker (_opt_sync);
-                _ipv6 = (value != 0);
-                return 0;
-            }
-            break;
-
-        case ZMQ_BLOCKY:
-            if (is_int && value >= 0) {
-                scoped_lock_t locker (_opt_sync);
-                _blocky = (value != 0);
-                return 0;
-            }
-            break;
-
-        case ZMQ_MAX_MSGSZ:
-            if (is_int && value >= 0) {
-                scoped_lock_t locker (_opt_sync);
-                _max_msgsz = value < INT_MAX ? value : INT_MAX;
-                return 0;
-            }
-            break;
-
-        case ZMQ_ZERO_COPY_RECV:
-            if (is_int && value >= 0) {
-                scoped_lock_t locker (_opt_sync);
-                _zero_copy = (value != 0);
-                return 0;
-            }
-            break;
-
-        default: {
-            return thread_ctx_t::set (option_, optval_, optvallen_);
-        }
-    }
-
-    errno = EINVAL;
-    return -1;
-}
-
-int zmq::ctx_t::get (int option_, void *optval_, const size_t *optvallen_)
-{
-    const bool is_int = (*optvallen_ == sizeof (int));
-    int *value = static_cast<int *> (optval_);
-
-    switch (option_) {
-        case ZMQ_MAX_SOCKETS:
-            if (is_int) {
-                scoped_lock_t locker (_opt_sync);
-                *value = _max_sockets;
-                return 0;
-            }
-            break;
-
-        case ZMQ_SOCKET_LIMIT:
-            if (is_int) {
-                *value = clipped_maxsocket (65535);
-                return 0;
-            }
-            break;
-
-        case ZMQ_IO_THREADS:
-            if (is_int) {
-                scoped_lock_t locker (_opt_sync);
-                *value = _io_thread_count;
-                return 0;
-            }
-            break;
-
-        case ZMQ_IPV6:
-            if (is_int) {
-                scoped_lock_t locker (_opt_sync);
-                *value = _ipv6;
-                return 0;
-            }
-            break;
-
-        case ZMQ_BLOCKY:
-            if (is_int) {
-                scoped_lock_t locker (_opt_sync);
-                *value = _blocky;
-                return 0;
-            }
-            break;
-
-        case ZMQ_MAX_MSGSZ:
-            if (is_int) {
-                scoped_lock_t locker (_opt_sync);
-                *value = _max_msgsz;
-                return 0;
-            }
-            break;
-
-        case ZMQ_MSG_T_SIZE:
-            if (is_int) {
-                scoped_lock_t locker (_opt_sync);
-                *value = sizeof (zmq_msg_t);
-                return 0;
-            }
-            break;
-
-        case ZMQ_ZERO_COPY_RECV:
-            if (is_int) {
-                scoped_lock_t locker (_opt_sync);
-                *value = _zero_copy;
-                return 0;
-            }
-            break;
-
-        default: {
-            return thread_ctx_t::get (option_, optval_, optvallen_);
-        }
-    }
-
-    errno = EINVAL;
-    return -1;
-}
-
-int zmq::ctx_t::get (int option_)
-{
-    int optval = 0;
-    size_t optvallen = sizeof (int);
-
-    if (get (option_, &optval, &optvallen) == 0)
-        return optval;
-
-    errno = EINVAL;
-    return -1;
-}
-
-bool zmq::ctx_t::start ()
-{
-    //  Initialise the array of mailboxes. Additional two slots are for
-    //  zmq_ctx_term thread and reaper thread.
-    _opt_sync.lock ();
-    const int term_and_reaper_threads_count = 2;
-    const int mazmq = _max_sockets;
-    const int ios = _io_thread_count;
-    _opt_sync.unlock ();
-    const int slot_count = mazmq + ios + term_and_reaper_threads_count;
-    try {
-        _slots.reserve (slot_count);
-        _empty_slots.reserve (slot_count - term_and_reaper_threads_count);
-    }
-    catch (const std::bad_alloc &) {
-        errno = ENOMEM;
-        return false;
-    }
-    _slots.resize (term_and_reaper_threads_count);
-
-    //  Initialise the infrastructure for zmq_ctx_term thread.
-    _slots[term_tid] = &_term_mailbox;
-
-    //  Create the reaper thread.
-    _reaper = new (std::nothrow) reaper_t (this, reaper_tid);
-    if (!_reaper) {
-        errno = ENOMEM;
-        goto fail_cleanup_slots;
-    }
-    if (!_reaper->get_mailbox ()->valid ())
-        goto fail_cleanup_reaper;
-    _slots[reaper_tid] = _reaper->get_mailbox ();
-    _reaper->start ();
-
-    //  Create I/O thread objects and launch them.
-    _slots.resize (slot_count, NULL);
-
-    for (int i = term_and_reaper_threads_count;
-         i != ios + term_and_reaper_threads_count; i++) {
-        io_thread_t *io_thread = new (std::nothrow) io_thread_t (this, i);
-        if (!io_thread) {
-            errno = ENOMEM;
-            goto fail_cleanup_reaper;
-        }
-        if (!io_thread->get_mailbox ()->valid ()) {
-            delete io_thread;
-            goto fail_cleanup_reaper;
-        }
-        _io_threads.push_back (io_thread);
-        _slots[i] = io_thread->get_mailbox ();
-        io_thread->start ();
-    }
-
-    //  In the unused part of the slot array, create a list of empty slots.
-    for (int32_t i = static_cast<int32_t> (_slots.size ()) - 1;
-         i >= static_cast<int32_t> (ios) + term_and_reaper_threads_count; i--) {
-        _empty_slots.push_back (i);
-    }
-
-    _starting = false;
-    return true;
-
-fail_cleanup_reaper:
-    _reaper->stop ();
-    delete _reaper;
-    _reaper = NULL;
-
-fail_cleanup_slots:
-    _slots.clear ();
-    return false;
-}
-
-zmq::socket_base_t *zmq::ctx_t::create_socket (int type_)
-{
-    scoped_lock_t locker (_slot_sync);
-
-    //  Once zmq_ctx_term() or zmq_ctx_shutdown() was called, we can't create
-    //  new sockets.
-    if (_terminating) {
-        errno = ETERM;
-        return NULL;
-    }
-
-    if (unlikely (_starting)) {
-        if (!start ())
-            return NULL;
-    }
-
-    //  If max_sockets limit was reached, return error.
-    if (_empty_slots.empty ()) {
-        errno = EMFILE;
-        return NULL;
-    }
-
-    //  Choose a slot for the socket.
-    const uint32_t slot = _empty_slots.back ();
-    _empty_slots.pop_back ();
-
-    //  Generate new unique socket ID.
-    const int sid = (static_cast<int> (max_socket_id.add (1))) + 1;
-
-    //  Create the socket and register its mailbox.
-    socket_base_t *s = socket_base_t::create (type_, this, slot, sid);
-    if (!s) {
-        _empty_slots.push_back (slot);
-        return NULL;
-    }
-    _sockets.push_back (s);
-    _slots[slot] = s->get_mailbox ();
-
-    return s;
-}
-
-void zmq::ctx_t::destroy_socket (class socket_base_t *socket_)
-{
-    scoped_lock_t locker (_slot_sync);
-
-    //  Free the associated thread slot.
-    const uint32_t tid = socket_->get_tid ();
-    _empty_slots.push_back (tid);
-    _slots[tid] = NULL;
-
-    //  Remove the socket from the list of sockets.
-    _sockets.erase (socket_);
-
-    //  If zmq_ctx_term() was already called and there are no more socket
-    //  we can ask reaper thread to terminate.
-    if (_terminating && _sockets.empty ())
-        _reaper->stop ();
-}
-
-zmq::object_t *zmq::ctx_t::get_reaper () const
-{
-    return _reaper;
-}
-
-zmq::thread_ctx_t::thread_ctx_t () :
-    _thread_priority (ZMQ_THREAD_PRIORITY_DFLT),
-    _thread_sched_policy (ZMQ_THREAD_SCHED_POLICY_DFLT)
-{
-}
-
-void zmq::thread_ctx_t::start_thread (thread_t &thread_,
-                                      thread_fn *tfn_,
-                                      void *arg_,
-                                      const char *name_) const
-{
-    thread_.setSchedulingParameters (_thread_priority, _thread_sched_policy,
-                                     _thread_affinity_cpus);
-
-    char namebuf[16] = "";
-    snprintf (namebuf, sizeof (namebuf), "%s%sZMQbg%s%s",
-              _thread_name_prefix.empty () ? "" : _thread_name_prefix.c_str (),
-              _thread_name_prefix.empty () ? "" : "/", name_ ? "/" : "",
-              name_ ? name_ : "");
-    thread_.start (tfn_, arg_, namebuf);
-}
-
-int zmq::thread_ctx_t::set (int option_, const void *optval_, size_t optvallen_)
-{
-    const bool is_int = (optvallen_ == sizeof (int));
-    int value = 0;
-    if (is_int)
-        memcpy (&value, optval_, sizeof (int));
-
-    switch (option_) {
-        case ZMQ_THREAD_SCHED_POLICY:
-            if (is_int && value >= 0) {
-                scoped_lock_t locker (_opt_sync);
-                _thread_sched_policy = value;
-                return 0;
-            }
-            break;
-
-        case ZMQ_THREAD_AFFINITY_CPU_ADD:
-            if (is_int && value >= 0) {
-                scoped_lock_t locker (_opt_sync);
-                _thread_affinity_cpus.insert (value);
-                return 0;
-            }
-            break;
-
-        case ZMQ_THREAD_AFFINITY_CPU_REMOVE:
-            if (is_int && value >= 0) {
-                scoped_lock_t locker (_opt_sync);
-                if (0 == _thread_affinity_cpus.erase (value)) {
-                    errno = EINVAL;
-                    return -1;
-                }
-                return 0;
-            }
-            break;
-
-        case ZMQ_THREAD_PRIORITY:
-            if (is_int && value >= 0) {
-                scoped_lock_t locker (_opt_sync);
-                _thread_priority = value;
-                return 0;
-            }
-            break;
-
-        case ZMQ_THREAD_NAME_PREFIX:
-            // start_thread() allows max 16 chars for thread name
-            if (is_int) {
-                std::ostringstream s;
-                s << value;
-                scoped_lock_t locker (_opt_sync);
-                _thread_name_prefix = s.str ();
-                return 0;
-            } else if (optvallen_ > 0 && optvallen_ <= 16) {
-                scoped_lock_t locker (_opt_sync);
-                _thread_name_prefix.assign (static_cast<const char *> (optval_),
-                                            optvallen_);
-                return 0;
-            }
-            break;
-    }
-
-    errno = EINVAL;
-    return -1;
-}
-
-int zmq::thread_ctx_t::get (int option_,
-                            void *optval_,
-                            const size_t *optvallen_)
-{
-    const bool is_int = (*optvallen_ == sizeof (int));
-    int *value = static_cast<int *> (optval_);
-
-    switch (option_) {
-        case ZMQ_THREAD_SCHED_POLICY:
-            if (is_int) {
-                scoped_lock_t locker (_opt_sync);
-                *value = _thread_sched_policy;
-                return 0;
-            }
-            break;
-
-        case ZMQ_THREAD_NAME_PREFIX:
-            if (is_int) {
-                scoped_lock_t locker (_opt_sync);
-                *value = atoi (_thread_name_prefix.c_str ());
-                return 0;
-            } else if (*optvallen_ >= _thread_name_prefix.size ()) {
-                scoped_lock_t locker (_opt_sync);
-                memcpy (optval_, _thread_name_prefix.data (),
-                        _thread_name_prefix.size ());
-                return 0;
-            }
-            break;
-    }
-
-    errno = EINVAL;
-    return -1;
-}
-
-void zmq::ctx_t::send_command (uint32_t tid_, const command_t &command_)
-{
-    _slots[tid_]->send (command_);
-}
-
-zmq::io_thread_t *zmq::ctx_t::choose_io_thread (uint64_t affinity_)
-{
-    if (_io_threads.empty ())
-        return NULL;
-
-    //  Find the I/O thread with minimum load.
-    int min_load = -1;
-    io_thread_t *selected_io_thread = NULL;
-    for (io_threads_t::size_type i = 0, size = _io_threads.size (); i != size;
-         i++) {
-        if (!affinity_ || (affinity_ & (uint64_t (1) << i))) {
-            const int load = _io_threads[i]->get_load ();
-            if (selected_io_thread == NULL || load < min_load) {
-                min_load = load;
-                selected_io_thread = _io_threads[i];
-            }
-        }
-    }
-    return selected_io_thread;
-}
-
-int zmq::ctx_t::register_endpoint (const char *addr_,
-                                   const endpoint_t &endpoint_)
-{
-    scoped_lock_t locker (_endpoints_sync);
-
-    const bool inserted =
-      _endpoints.ZMQ_MAP_INSERT_OR_EMPLACE (std::string (addr_), endpoint_)
-        .second;
-    if (!inserted) {
-        errno = EADDRINUSE;
-        return -1;
-    }
-    return 0;
-}
-
-int zmq::ctx_t::unregister_endpoint (const std::string &addr_,
-                                     const socket_base_t *const socket_)
-{
-    scoped_lock_t locker (_endpoints_sync);
-
-    const endpoints_t::iterator it = _endpoints.find (addr_);
-    if (it == _endpoints.end () || it->second.socket != socket_) {
-        errno = ENOENT;
-        return -1;
-    }
-
-    //  Remove endpoint.
-    _endpoints.erase (it);
-
-    return 0;
-}
-
-void zmq::ctx_t::unregister_endpoints (const socket_base_t *const socket_)
-{
-    scoped_lock_t locker (_endpoints_sync);
-
-    for (endpoints_t::iterator it = _endpoints.begin (),
-                               end = _endpoints.end ();
-         it != end;) {
-        if (it->second.socket == socket_)
-#if __cplusplus >= 201103L || (defined _MSC_VER && _MSC_VER >= 1700)
-            it = _endpoints.erase (it);
-#else
-            _endpoints.erase (it++);
-#endif
-        else
-            ++it;
-    }
-}
-
-zmq::endpoint_t zmq::ctx_t::find_endpoint (const char *addr_)
-{
-    scoped_lock_t locker (_endpoints_sync);
-
-    endpoints_t::iterator it = _endpoints.find (addr_);
-    if (it == _endpoints.end ()) {
-        errno = ECONNREFUSED;
-        endpoint_t empty = {NULL, options_t ()};
-        return empty;
-    }
-    endpoint_t endpoint = it->second;
-
-    //  Increment the command sequence number of the peer so that it won't
-    //  get deallocated until "bind" command is issued by the caller.
-    //  The subsequent 'bind' has to be called with inc_seqnum parameter
-    //  set to false, so that the seqnum isn't incremented twice.
-    endpoint.socket->inc_seqnum ();
-
-    return endpoint;
-}
-
-void zmq::ctx_t::pend_connection (const std::string &addr_,
-                                  const endpoint_t &endpoint_,
-                                  pipe_t **pipes_)
-{
-    scoped_lock_t locker (_endpoints_sync);
-
-    const pending_connection_t pending_connection = {endpoint_, pipes_[0],
-                                                     pipes_[1]};
-
-    const endpoints_t::iterator it = _endpoints.find (addr_);
-    if (it == _endpoints.end ()) {
-        //  Still no bind.
-        endpoint_.socket->inc_seqnum ();
-        _pending_connections.ZMQ_MAP_INSERT_OR_EMPLACE (addr_,
-                                                        pending_connection);
-    } else {
-        //  Bind has happened in the mean time, connect directly
-        connect_inproc_sockets (it->second.socket, it->second.options,
-                                pending_connection, connect_side);
-    }
-}
-
-void zmq::ctx_t::connect_pending (const char *addr_,
-                                  zmq::socket_base_t *bind_socket_)
-{
-    scoped_lock_t locker (_endpoints_sync);
-
-    const std::pair<pending_connections_t::iterator,
-                    pending_connections_t::iterator>
-      pending = _pending_connections.equal_range (addr_);
-    for (pending_connections_t::iterator p = pending.first; p != pending.second;
-         ++p)
-        connect_inproc_sockets (bind_socket_, _endpoints[addr_].options,
-                                p->second, bind_side);
-
-    _pending_connections.erase (pending.first, pending.second);
-}
-
-void zmq::ctx_t::connect_inproc_sockets (
-  zmq::socket_base_t *bind_socket_,
-  const options_t &bind_options_,
-  const pending_connection_t &pending_connection_,
-  side side_)
-{
-    bind_socket_->inc_seqnum ();
-    pending_connection_.bind_pipe->set_tid (bind_socket_->get_tid ());
-
-    if (!bind_options_.recv_routing_id) {
-        msg_t msg;
-        const bool ok = pending_connection_.bind_pipe->read (&msg);
-        zmq_assert (ok);
-        const int rc = msg.close ();
-        errno_assert (rc == 0);
-    }
-
-    if (!get_effective_conflate_option (pending_connection_.endpoint.options)) {
-        pending_connection_.connect_pipe->set_hwms_boost (bind_options_.sndhwm,
-                                                          bind_options_.rcvhwm);
-        pending_connection_.bind_pipe->set_hwms_boost (
-          pending_connection_.endpoint.options.sndhwm,
-          pending_connection_.endpoint.options.rcvhwm);
-
-        pending_connection_.connect_pipe->set_hwms (
-          pending_connection_.endpoint.options.rcvhwm,
-          pending_connection_.endpoint.options.sndhwm);
-        pending_connection_.bind_pipe->set_hwms (bind_options_.rcvhwm,
-                                                 bind_options_.sndhwm);
-    } else {
-        pending_connection_.connect_pipe->set_hwms (-1, -1);
-        pending_connection_.bind_pipe->set_hwms (-1, -1);
-    }
-
-#ifdef ZMQ_BUILD_DRAFT_API
-    if (bind_options_.can_recv_disconnect_msg
-        && !bind_options_.disconnect_msg.empty ())
-        pending_connection_.connect_pipe->set_disconnect_msg (
-          bind_options_.disconnect_msg);
-#endif
-
-    if (side_ == bind_side) {
-        command_t cmd;
-        cmd.type = command_t::bind;
-        cmd.args.bind.pipe = pending_connection_.bind_pipe;
-        bind_socket_->process_command (cmd);
-        bind_socket_->send_inproc_connected (
-          pending_connection_.endpoint.socket);
-    } else
-        pending_connection_.connect_pipe->send_bind (
-          bind_socket_, pending_connection_.bind_pipe, false);
-
-    // When a ctx is terminated all pending inproc connection will be
-    // connected, but the socket will already be closed and the pipe will be
-    // in waiting_for_delimiter state, which means no more writes can be done
-    // and the routing id write fails and causes an assert. Check if the socket
-    // is open before sending.
-    if (pending_connection_.endpoint.options.recv_routing_id
-        && pending_connection_.endpoint.socket->check_tag ()) {
-        send_routing_id (pending_connection_.bind_pipe, bind_options_);
-    }
-
-#ifdef ZMQ_BUILD_DRAFT_API
-    //  If set, send the hello msg of the bind socket to the pending connection.
-    if (bind_options_.can_send_hello_msg
-        && bind_options_.hello_msg.size () > 0) {
-        send_hello_msg (pending_connection_.bind_pipe, bind_options_);
-    }
-#endif
-}
-
-#ifdef ZMQ_HAVE_VMCI
-
-int zmq::ctx_t::get_vmci_socket_family ()
-{
-    zmq::scoped_lock_t locker (_vmci_sync);
-
-    if (_vmci_fd == -1) {
-        _vmci_family = VMCISock_GetAFValueFd (&_vmci_fd);
-
-        if (_vmci_fd != -1) {
-#ifdef FD_CLOEXEC
-            int rc = fcntl (_vmci_fd, F_SETFD, FD_CLOEXEC);
-            errno_assert (rc != -1);
-#endif
-        }
-    }
-
-    return _vmci_family;
-}
-
-#endif
-
-//  The last used socket ID, or 0 if no socket was used so far. Note that this
-//  is a global variable. Thus, even sockets created in different contexts have
-//  unique IDs.
-zmq::atomic_counter_t zmq::ctx_t::max_socket_id;
diff --git a/libs/libzmq/src/ctx.hpp b/libs/libzmq/src/ctx.hpp
deleted file mode 100644
index 0ccd68f..0000000
--- a/libs/libzmq/src/ctx.hpp
+++ /dev/null
@@ -1,271 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_CTX_HPP_INCLUDED__
-#define __ZMQ_CTX_HPP_INCLUDED__
-
-#include <map>
-#include <vector>
-#include <string>
-#include <stdarg.h>
-
-#include "mailbox.hpp"
-#include "array.hpp"
-#include "config.hpp"
-#include "mutex.hpp"
-#include "stdint.hpp"
-#include "options.hpp"
-#include "atomic_counter.hpp"
-#include "thread.hpp"
-
-namespace zmq
-{
-class object_t;
-class io_thread_t;
-class socket_base_t;
-class reaper_t;
-class pipe_t;
-
-//  Information associated with inproc endpoint. Note that endpoint options
-//  are registered as well so that the peer can access them without a need
-//  for synchronisation, handshaking or similar.
-struct endpoint_t
-{
-    socket_base_t *socket;
-    options_t options;
-};
-
-class thread_ctx_t
-{
-  public:
-    thread_ctx_t ();
-
-    //  Start a new thread with proper scheduling parameters.
-    void start_thread (thread_t &thread_,
-                       thread_fn *tfn_,
-                       void *arg_,
-                       const char *name_ = NULL) const;
-
-    int set (int option_, const void *optval_, size_t optvallen_);
-    int get (int option_, void *optval_, const size_t *optvallen_);
-
-  protected:
-    //  Synchronisation of access to context options.
-    mutex_t _opt_sync;
-
-  private:
-    //  Thread parameters.
-    int _thread_priority;
-    int _thread_sched_policy;
-    std::set<int> _thread_affinity_cpus;
-    std::string _thread_name_prefix;
-};
-
-//  Context object encapsulates all the global state associated with
-//  the library.
-
-class ctx_t ZMQ_FINAL : public thread_ctx_t
-{
-  public:
-    //  Create the context object.
-    ctx_t ();
-
-    //  Returns false if object is not a context.
-    bool check_tag () const;
-
-    //  This function is called when user invokes zmq_ctx_term. If there are
-    //  no more sockets open it'll cause all the infrastructure to be shut
-    //  down. If there are open sockets still, the deallocation happens
-    //  after the last one is closed.
-    int terminate ();
-
-    // This function starts the terminate process by unblocking any blocking
-    // operations currently in progress and stopping any more socket activity
-    // (except zmq_close).
-    // This function is non-blocking.
-    // terminate must still be called afterwards.
-    // This function is optional, terminate will unblock any current
-    // operations as well.
-    int shutdown ();
-
-    //  Set and get context properties.
-    int set (int option_, const void *optval_, size_t optvallen_);
-    int get (int option_, void *optval_, const size_t *optvallen_);
-    int get (int option_);
-
-    //  Create and destroy a socket.
-    zmq::socket_base_t *create_socket (int type_);
-    void destroy_socket (zmq::socket_base_t *socket_);
-
-    //  Send command to the destination thread.
-    void send_command (uint32_t tid_, const command_t &command_);
-
-    //  Returns the I/O thread that is the least busy at the moment.
-    //  Affinity specifies which I/O threads are eligible (0 = all).
-    //  Returns NULL if no I/O thread is available.
-    zmq::io_thread_t *choose_io_thread (uint64_t affinity_);
-
-    //  Returns reaper thread object.
-    zmq::object_t *get_reaper () const;
-
-    //  Management of inproc endpoints.
-    int register_endpoint (const char *addr_, const endpoint_t &endpoint_);
-    int unregister_endpoint (const std::string &addr_,
-                             const socket_base_t *socket_);
-    void unregister_endpoints (const zmq::socket_base_t *socket_);
-    endpoint_t find_endpoint (const char *addr_);
-    void pend_connection (const std::string &addr_,
-                          const endpoint_t &endpoint_,
-                          pipe_t **pipes_);
-    void connect_pending (const char *addr_, zmq::socket_base_t *bind_socket_);
-
-#ifdef ZMQ_HAVE_VMCI
-    // Return family for the VMCI socket or -1 if it's not available.
-    int get_vmci_socket_family ();
-#endif
-
-    enum
-    {
-        term_tid = 0,
-        reaper_tid = 1
-    };
-
-    ~ctx_t ();
-
-    bool valid () const;
-
-  private:
-    bool start ();
-
-    struct pending_connection_t
-    {
-        endpoint_t endpoint;
-        pipe_t *connect_pipe;
-        pipe_t *bind_pipe;
-    };
-
-    //  Used to check whether the object is a context.
-    uint32_t _tag;
-
-    //  Sockets belonging to this context. We need the list so that
-    //  we can notify the sockets when zmq_ctx_term() is called.
-    //  The sockets will return ETERM then.
-    typedef array_t<socket_base_t> sockets_t;
-    sockets_t _sockets;
-
-    //  List of unused thread slots.
-    typedef std::vector<uint32_t> empty_slots_t;
-    empty_slots_t _empty_slots;
-
-    //  If true, zmq_init has been called but no socket has been created
-    //  yet. Launching of I/O threads is delayed.
-    bool _starting;
-
-    //  If true, zmq_ctx_term was already called.
-    bool _terminating;
-
-    //  Synchronisation of accesses to global slot-related data:
-    //  sockets, empty_slots, terminating. It also synchronises
-    //  access to zombie sockets as such (as opposed to slots) and provides
-    //  a memory barrier to ensure that all CPU cores see the same data.
-    mutex_t _slot_sync;
-
-    //  The reaper thread.
-    zmq::reaper_t *_reaper;
-
-    //  I/O threads.
-    typedef std::vector<zmq::io_thread_t *> io_threads_t;
-    io_threads_t _io_threads;
-
-    //  Array of pointers to mailboxes for both application and I/O threads.
-    std::vector<i_mailbox *> _slots;
-
-    //  Mailbox for zmq_ctx_term thread.
-    mailbox_t _term_mailbox;
-
-    //  List of inproc endpoints within this context.
-    typedef std::map<std::string, endpoint_t> endpoints_t;
-    endpoints_t _endpoints;
-
-    // List of inproc connection endpoints pending a bind
-    typedef std::multimap<std::string, pending_connection_t>
-      pending_connections_t;
-    pending_connections_t _pending_connections;
-
-    //  Synchronisation of access to the list of inproc endpoints.
-    mutex_t _endpoints_sync;
-
-    //  Maximum socket ID.
-    static atomic_counter_t max_socket_id;
-
-    //  Maximum number of sockets that can be opened at the same time.
-    int _max_sockets;
-
-    //  Maximum allowed message size
-    int _max_msgsz;
-
-    //  Number of I/O threads to launch.
-    int _io_thread_count;
-
-    //  Does context wait (possibly forever) on termination?
-    bool _blocky;
-
-    //  Is IPv6 enabled on this context?
-    bool _ipv6;
-
-    // Should we use zero copy message decoding in this context?
-    bool _zero_copy;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (ctx_t)
-
-#ifdef HAVE_FORK
-    // the process that created this context. Used to detect forking.
-    pid_t _pid;
-#endif
-    enum side
-    {
-        connect_side,
-        bind_side
-    };
-
-    static void
-    connect_inproc_sockets (zmq::socket_base_t *bind_socket_,
-                            const options_t &bind_options_,
-                            const pending_connection_t &pending_connection_,
-                            side side_);
-
-#ifdef ZMQ_HAVE_VMCI
-    int _vmci_fd;
-    int _vmci_family;
-    mutex_t _vmci_sync;
-#endif
-};
-}
-
-#endif
diff --git a/libs/libzmq/src/curve_client.cpp b/libs/libzmq/src/curve_client.cpp
deleted file mode 100644
index 5d1f64e..0000000
--- a/libs/libzmq/src/curve_client.cpp
+++ /dev/null
@@ -1,287 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "macros.hpp"
-
-#ifdef ZMQ_HAVE_CURVE
-
-#include "msg.hpp"
-#include "session_base.hpp"
-#include "err.hpp"
-#include "curve_client.hpp"
-#include "wire.hpp"
-#include "curve_client_tools.hpp"
-#include "secure_allocator.hpp"
-
-zmq::curve_client_t::curve_client_t (session_base_t *session_,
-                                     const options_t &options_,
-                                     const bool downgrade_sub_) :
-    mechanism_base_t (session_, options_),
-    curve_mechanism_base_t (session_,
-                            options_,
-                            "CurveZMQMESSAGEC",
-                            "CurveZMQMESSAGES",
-                            downgrade_sub_),
-    _state (send_hello),
-    _tools (options_.curve_public_key,
-            options_.curve_secret_key,
-            options_.curve_server_key)
-{
-}
-
-zmq::curve_client_t::~curve_client_t ()
-{
-}
-
-int zmq::curve_client_t::next_handshake_command (msg_t *msg_)
-{
-    int rc = 0;
-
-    switch (_state) {
-        case send_hello:
-            rc = produce_hello (msg_);
-            if (rc == 0)
-                _state = expect_welcome;
-            break;
-        case send_initiate:
-            rc = produce_initiate (msg_);
-            if (rc == 0)
-                _state = expect_ready;
-            break;
-        default:
-            errno = EAGAIN;
-            rc = -1;
-    }
-    return rc;
-}
-
-int zmq::curve_client_t::process_handshake_command (msg_t *msg_)
-{
-    const unsigned char *msg_data =
-      static_cast<unsigned char *> (msg_->data ());
-    const size_t msg_size = msg_->size ();
-
-    int rc = 0;
-    if (curve_client_tools_t::is_handshake_command_welcome (msg_data, msg_size))
-        rc = process_welcome (msg_data, msg_size);
-    else if (curve_client_tools_t::is_handshake_command_ready (msg_data,
-                                                               msg_size))
-        rc = process_ready (msg_data, msg_size);
-    else if (curve_client_tools_t::is_handshake_command_error (msg_data,
-                                                               msg_size))
-        rc = process_error (msg_data, msg_size);
-    else {
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (), ZMQ_PROTOCOL_ERROR_ZMTP_UNEXPECTED_COMMAND);
-        errno = EPROTO;
-        rc = -1;
-    }
-
-    if (rc == 0) {
-        rc = msg_->close ();
-        errno_assert (rc == 0);
-        rc = msg_->init ();
-        errno_assert (rc == 0);
-    }
-
-    return rc;
-}
-
-int zmq::curve_client_t::encode (msg_t *msg_)
-{
-    zmq_assert (_state == connected);
-    return curve_mechanism_base_t::encode (msg_);
-}
-
-int zmq::curve_client_t::decode (msg_t *msg_)
-{
-    zmq_assert (_state == connected);
-    return curve_mechanism_base_t::decode (msg_);
-}
-
-zmq::mechanism_t::status_t zmq::curve_client_t::status () const
-{
-    if (_state == connected)
-        return mechanism_t::ready;
-    if (_state == error_received)
-        return mechanism_t::error;
-
-    return mechanism_t::handshaking;
-}
-
-int zmq::curve_client_t::produce_hello (msg_t *msg_)
-{
-    int rc = msg_->init_size (200);
-    errno_assert (rc == 0);
-
-    rc = _tools.produce_hello (msg_->data (), get_and_inc_nonce ());
-    if (rc == -1) {
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (), ZMQ_PROTOCOL_ERROR_ZMTP_CRYPTOGRAPHIC);
-
-        // TODO this is somewhat inconsistent: we call init_size, but we may
-        // not close msg_; i.e. we assume that msg_ is initialized but empty
-        // (if it were non-empty, calling init_size might cause a leak!)
-
-        // msg_->close ();
-        return -1;
-    }
-
-    return 0;
-}
-
-int zmq::curve_client_t::process_welcome (const uint8_t *msg_data_,
-                                          size_t msg_size_)
-{
-    const int rc = _tools.process_welcome (msg_data_, msg_size_,
-                                           get_writable_precom_buffer ());
-
-    if (rc == -1) {
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (), ZMQ_PROTOCOL_ERROR_ZMTP_CRYPTOGRAPHIC);
-
-        errno = EPROTO;
-        return -1;
-    }
-
-    _state = send_initiate;
-
-    return 0;
-}
-
-int zmq::curve_client_t::produce_initiate (msg_t *msg_)
-{
-    const size_t metadata_length = basic_properties_len ();
-    std::vector<unsigned char, secure_allocator_t<unsigned char> >
-      metadata_plaintext (metadata_length);
-
-    add_basic_properties (&metadata_plaintext[0], metadata_length);
-
-    const size_t msg_size =
-      113 + 128 + crypto_box_BOXZEROBYTES + metadata_length;
-    int rc = msg_->init_size (msg_size);
-    errno_assert (rc == 0);
-
-    rc = _tools.produce_initiate (msg_->data (), msg_size, get_and_inc_nonce (),
-                                  &metadata_plaintext[0], metadata_length);
-
-    if (-1 == rc) {
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (), ZMQ_PROTOCOL_ERROR_ZMTP_CRYPTOGRAPHIC);
-
-        // TODO see comment in produce_hello
-        return -1;
-    }
-
-    return 0;
-}
-
-int zmq::curve_client_t::process_ready (const uint8_t *msg_data_,
-                                        size_t msg_size_)
-{
-    if (msg_size_ < 30) {
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (),
-          ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_READY);
-        errno = EPROTO;
-        return -1;
-    }
-
-    const size_t clen = (msg_size_ - 14) + crypto_box_BOXZEROBYTES;
-
-    uint8_t ready_nonce[crypto_box_NONCEBYTES];
-    std::vector<uint8_t, secure_allocator_t<uint8_t> > ready_plaintext (
-      crypto_box_ZEROBYTES + clen);
-    std::vector<uint8_t> ready_box (crypto_box_BOXZEROBYTES + 16 + clen);
-
-    std::fill (ready_box.begin (), ready_box.begin () + crypto_box_BOXZEROBYTES,
-               0);
-    memcpy (&ready_box[crypto_box_BOXZEROBYTES], msg_data_ + 14,
-            clen - crypto_box_BOXZEROBYTES);
-
-    memcpy (ready_nonce, "CurveZMQREADY---", 16);
-    memcpy (ready_nonce + 16, msg_data_ + 6, 8);
-    set_peer_nonce (get_uint64 (msg_data_ + 6));
-
-    int rc = crypto_box_open_afternm (&ready_plaintext[0], &ready_box[0], clen,
-                                      ready_nonce, get_precom_buffer ());
-
-    if (rc != 0) {
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (), ZMQ_PROTOCOL_ERROR_ZMTP_CRYPTOGRAPHIC);
-        errno = EPROTO;
-        return -1;
-    }
-
-    rc = parse_metadata (&ready_plaintext[crypto_box_ZEROBYTES],
-                         clen - crypto_box_ZEROBYTES);
-
-    if (rc == 0)
-        _state = connected;
-    else {
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (), ZMQ_PROTOCOL_ERROR_ZMTP_INVALID_METADATA);
-        errno = EPROTO;
-    }
-
-    return rc;
-}
-
-int zmq::curve_client_t::process_error (const uint8_t *msg_data_,
-                                        size_t msg_size_)
-{
-    if (_state != expect_welcome && _state != expect_ready) {
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (), ZMQ_PROTOCOL_ERROR_ZMTP_UNEXPECTED_COMMAND);
-        errno = EPROTO;
-        return -1;
-    }
-    if (msg_size_ < 7) {
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (),
-          ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_ERROR);
-        errno = EPROTO;
-        return -1;
-    }
-    const size_t error_reason_len = static_cast<size_t> (msg_data_[6]);
-    if (error_reason_len > msg_size_ - 7) {
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (),
-          ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_ERROR);
-        errno = EPROTO;
-        return -1;
-    }
-    const char *error_reason = reinterpret_cast<const char *> (msg_data_) + 7;
-    handle_error_reason (error_reason, error_reason_len);
-    _state = error_received;
-    return 0;
-}
-
-#endif
diff --git a/libs/libzmq/src/curve_client.hpp b/libs/libzmq/src/curve_client.hpp
deleted file mode 100644
index 9d51d3a..0000000
--- a/libs/libzmq/src/curve_client.hpp
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_CURVE_CLIENT_HPP_INCLUDED__
-#define __ZMQ_CURVE_CLIENT_HPP_INCLUDED__
-
-#ifdef ZMQ_HAVE_CURVE
-
-#include "curve_mechanism_base.hpp"
-#include "options.hpp"
-#include "curve_client_tools.hpp"
-
-namespace zmq
-{
-class msg_t;
-class session_base_t;
-
-class curve_client_t ZMQ_FINAL : public curve_mechanism_base_t
-{
-  public:
-    curve_client_t (session_base_t *session_,
-                    const options_t &options_,
-                    const bool downgrade_sub_);
-    ~curve_client_t () ZMQ_FINAL;
-
-    // mechanism implementation
-    int next_handshake_command (msg_t *msg_) ZMQ_FINAL;
-    int process_handshake_command (msg_t *msg_) ZMQ_FINAL;
-    int encode (msg_t *msg_) ZMQ_FINAL;
-    int decode (msg_t *msg_) ZMQ_FINAL;
-    status_t status () const ZMQ_FINAL;
-
-  private:
-    enum state_t
-    {
-        send_hello,
-        expect_welcome,
-        send_initiate,
-        expect_ready,
-        error_received,
-        connected
-    };
-
-    //  Current FSM state
-    state_t _state;
-
-    //  CURVE protocol tools
-    curve_client_tools_t _tools;
-
-    int produce_hello (msg_t *msg_);
-    int process_welcome (const uint8_t *msg_data_, size_t msg_size_);
-    int produce_initiate (msg_t *msg_);
-    int process_ready (const uint8_t *msg_data_, size_t msg_size_);
-    int process_error (const uint8_t *msg_data_, size_t msg_size_);
-};
-}
-
-#endif
-
-#endif
diff --git a/libs/libzmq/src/curve_client_tools.hpp b/libs/libzmq/src/curve_client_tools.hpp
deleted file mode 100644
index 7e0d25b..0000000
--- a/libs/libzmq/src/curve_client_tools.hpp
+++ /dev/null
@@ -1,326 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_CURVE_CLIENT_TOOLS_HPP_INCLUDED__
-#define __ZMQ_CURVE_CLIENT_TOOLS_HPP_INCLUDED__
-
-#ifdef ZMQ_HAVE_CURVE
-
-#if defined(ZMQ_USE_TWEETNACL)
-#include "tweetnacl.h"
-#elif defined(ZMQ_USE_LIBSODIUM)
-#include "sodium.h"
-#endif
-
-#if crypto_box_NONCEBYTES != 24 || crypto_box_PUBLICKEYBYTES != 32             \
-  || crypto_box_SECRETKEYBYTES != 32 || crypto_box_ZEROBYTES != 32             \
-  || crypto_box_BOXZEROBYTES != 16
-#error "CURVE library not built properly"
-#endif
-
-#include "wire.hpp"
-#include "err.hpp"
-#include "secure_allocator.hpp"
-
-#include <vector>
-
-namespace zmq
-{
-struct curve_client_tools_t
-{
-    static int produce_hello (void *data_,
-                              const uint8_t *server_key_,
-                              const uint64_t cn_nonce_,
-                              const uint8_t *cn_public_,
-                              const uint8_t *cn_secret_)
-    {
-        uint8_t hello_nonce[crypto_box_NONCEBYTES];
-        std::vector<uint8_t, secure_allocator_t<uint8_t> > hello_plaintext (
-          crypto_box_ZEROBYTES + 64, 0);
-        uint8_t hello_box[crypto_box_BOXZEROBYTES + 80];
-
-        //  Prepare the full nonce
-        memcpy (hello_nonce, "CurveZMQHELLO---", 16);
-        put_uint64 (hello_nonce + 16, cn_nonce_);
-
-        //  Create Box [64 * %x0](C'->S)
-        const int rc =
-          crypto_box (hello_box, &hello_plaintext[0], hello_plaintext.size (),
-                      hello_nonce, server_key_, cn_secret_);
-        if (rc == -1)
-            return -1;
-
-        uint8_t *hello = static_cast<uint8_t *> (data_);
-
-        memcpy (hello, "\x05HELLO", 6);
-        //  CurveZMQ major and minor version numbers
-        memcpy (hello + 6, "\1\0", 2);
-        //  Anti-amplification padding
-        memset (hello + 8, 0, 72);
-        //  Client public connection key
-        memcpy (hello + 80, cn_public_, crypto_box_PUBLICKEYBYTES);
-        //  Short nonce, prefixed by "CurveZMQHELLO---"
-        memcpy (hello + 112, hello_nonce + 16, 8);
-        //  Signature, Box [64 * %x0](C'->S)
-        memcpy (hello + 120, hello_box + crypto_box_BOXZEROBYTES, 80);
-
-        return 0;
-    }
-
-    static int process_welcome (const uint8_t *msg_data_,
-                                size_t msg_size_,
-                                const uint8_t *server_key_,
-                                const uint8_t *cn_secret_,
-                                uint8_t *cn_server_,
-                                uint8_t *cn_cookie_,
-                                uint8_t *cn_precom_)
-    {
-        if (msg_size_ != 168) {
-            errno = EPROTO;
-            return -1;
-        }
-
-        uint8_t welcome_nonce[crypto_box_NONCEBYTES];
-        std::vector<uint8_t, secure_allocator_t<uint8_t> > welcome_plaintext (
-          crypto_box_ZEROBYTES + 128);
-        uint8_t welcome_box[crypto_box_BOXZEROBYTES + 144];
-
-        //  Open Box [S' + cookie](C'->S)
-        memset (welcome_box, 0, crypto_box_BOXZEROBYTES);
-        memcpy (welcome_box + crypto_box_BOXZEROBYTES, msg_data_ + 24, 144);
-
-        memcpy (welcome_nonce, "WELCOME-", 8);
-        memcpy (welcome_nonce + 8, msg_data_ + 8, 16);
-
-        int rc = crypto_box_open (&welcome_plaintext[0], welcome_box,
-                                  sizeof welcome_box, welcome_nonce,
-                                  server_key_, cn_secret_);
-        if (rc != 0) {
-            errno = EPROTO;
-            return -1;
-        }
-
-        memcpy (cn_server_, &welcome_plaintext[crypto_box_ZEROBYTES], 32);
-        memcpy (cn_cookie_, &welcome_plaintext[crypto_box_ZEROBYTES + 32],
-                16 + 80);
-
-        //  Message independent precomputation
-        rc = crypto_box_beforenm (cn_precom_, cn_server_, cn_secret_);
-        zmq_assert (rc == 0);
-
-        return 0;
-    }
-
-    static int produce_initiate (void *data_,
-                                 size_t size_,
-                                 const uint64_t cn_nonce_,
-                                 const uint8_t *server_key_,
-                                 const uint8_t *public_key_,
-                                 const uint8_t *secret_key_,
-                                 const uint8_t *cn_public_,
-                                 const uint8_t *cn_secret_,
-                                 const uint8_t *cn_server_,
-                                 const uint8_t *cn_cookie_,
-                                 const uint8_t *metadata_plaintext_,
-                                 const size_t metadata_length_)
-    {
-        uint8_t vouch_nonce[crypto_box_NONCEBYTES];
-        std::vector<uint8_t, secure_allocator_t<uint8_t> > vouch_plaintext (
-          crypto_box_ZEROBYTES + 64);
-        uint8_t vouch_box[crypto_box_BOXZEROBYTES + 80];
-
-        //  Create vouch = Box [C',S](C->S')
-        std::fill (vouch_plaintext.begin (),
-                   vouch_plaintext.begin () + crypto_box_ZEROBYTES, 0);
-        memcpy (&vouch_plaintext[crypto_box_ZEROBYTES], cn_public_, 32);
-        memcpy (&vouch_plaintext[crypto_box_ZEROBYTES + 32], server_key_, 32);
-
-        memset (vouch_nonce, 0, crypto_box_NONCEBYTES);
-        memcpy (vouch_nonce, "VOUCH---", 8);
-        randombytes (vouch_nonce + 8, 16);
-
-        int rc =
-          crypto_box (vouch_box, &vouch_plaintext[0], vouch_plaintext.size (),
-                      vouch_nonce, cn_server_, secret_key_);
-        if (rc == -1)
-            return -1;
-
-        uint8_t initiate_nonce[crypto_box_NONCEBYTES];
-        std::vector<uint8_t> initiate_box (crypto_box_BOXZEROBYTES + 144
-                                           + metadata_length_);
-        std::vector<uint8_t, secure_allocator_t<uint8_t> > initiate_plaintext (
-          crypto_box_ZEROBYTES + 128 + metadata_length_);
-
-        //  Create Box [C + vouch + metadata](C'->S')
-        std::fill (initiate_plaintext.begin (),
-                   initiate_plaintext.begin () + crypto_box_ZEROBYTES, 0);
-
-        //  False positives due to https://gcc.gnu.org/bugzilla/show_bug.cgi?id=99578
-#if __GNUC__ >= 11
-#pragma GCC diagnostic ignored "-Warray-bounds"
-#pragma GCC diagnostic ignored "-Wstringop-overflow="
-#endif
-        memcpy (&initiate_plaintext[crypto_box_ZEROBYTES], public_key_, 32);
-        memcpy (&initiate_plaintext[crypto_box_ZEROBYTES + 32], vouch_nonce + 8,
-                16);
-        memcpy (&initiate_plaintext[crypto_box_ZEROBYTES + 48],
-                vouch_box + crypto_box_BOXZEROBYTES, 80);
-        if (metadata_length_) {
-            memcpy (&initiate_plaintext[crypto_box_ZEROBYTES + 48 + 80],
-                    metadata_plaintext_, metadata_length_);
-        }
-#if __GNUC__ >= 11
-#pragma GCC diagnostic pop
-#pragma GCC diagnostic pop
-#endif
-
-        memcpy (initiate_nonce, "CurveZMQINITIATE", 16);
-        put_uint64 (initiate_nonce + 16, cn_nonce_);
-
-        rc = crypto_box (&initiate_box[0], &initiate_plaintext[0],
-                         crypto_box_ZEROBYTES + 128 + metadata_length_,
-                         initiate_nonce, cn_server_, cn_secret_);
-
-        if (rc == -1)
-            return -1;
-
-        uint8_t *initiate = static_cast<uint8_t *> (data_);
-
-        zmq_assert (size_
-                    == 113 + 128 + crypto_box_BOXZEROBYTES + metadata_length_);
-
-        memcpy (initiate, "\x08INITIATE", 9);
-        //  Cookie provided by the server in the WELCOME command
-        memcpy (initiate + 9, cn_cookie_, 96);
-        //  Short nonce, prefixed by "CurveZMQINITIATE"
-        memcpy (initiate + 105, initiate_nonce + 16, 8);
-        //  Box [C + vouch + metadata](C'->S')
-        memcpy (initiate + 113, &initiate_box[crypto_box_BOXZEROBYTES],
-                128 + metadata_length_ + crypto_box_BOXZEROBYTES);
-
-        return 0;
-    }
-
-    static bool is_handshake_command_welcome (const uint8_t *msg_data_,
-                                              const size_t msg_size_)
-    {
-        return is_handshake_command (msg_data_, msg_size_, "\7WELCOME");
-    }
-
-    static bool is_handshake_command_ready (const uint8_t *msg_data_,
-                                            const size_t msg_size_)
-    {
-        return is_handshake_command (msg_data_, msg_size_, "\5READY");
-    }
-
-    static bool is_handshake_command_error (const uint8_t *msg_data_,
-                                            const size_t msg_size_)
-    {
-        return is_handshake_command (msg_data_, msg_size_, "\5ERROR");
-    }
-
-    //  non-static functions
-    curve_client_tools_t (
-      const uint8_t (&curve_public_key_)[crypto_box_PUBLICKEYBYTES],
-      const uint8_t (&curve_secret_key_)[crypto_box_SECRETKEYBYTES],
-      const uint8_t (&curve_server_key_)[crypto_box_PUBLICKEYBYTES])
-    {
-        int rc;
-        memcpy (public_key, curve_public_key_, crypto_box_PUBLICKEYBYTES);
-        memcpy (secret_key, curve_secret_key_, crypto_box_SECRETKEYBYTES);
-        memcpy (server_key, curve_server_key_, crypto_box_PUBLICKEYBYTES);
-
-        //  Generate short-term key pair
-        memset (cn_secret, 0, crypto_box_SECRETKEYBYTES);
-        memset (cn_public, 0, crypto_box_PUBLICKEYBYTES);
-        rc = crypto_box_keypair (cn_public, cn_secret);
-        zmq_assert (rc == 0);
-    }
-
-    int produce_hello (void *data_, const uint64_t cn_nonce_) const
-    {
-        return produce_hello (data_, server_key, cn_nonce_, cn_public,
-                              cn_secret);
-    }
-
-    int process_welcome (const uint8_t *msg_data_,
-                         size_t msg_size_,
-                         uint8_t *cn_precom_)
-    {
-        return process_welcome (msg_data_, msg_size_, server_key, cn_secret,
-                                cn_server, cn_cookie, cn_precom_);
-    }
-
-    int produce_initiate (void *data_,
-                          size_t size_,
-                          const uint64_t cn_nonce_,
-                          const uint8_t *metadata_plaintext_,
-                          const size_t metadata_length_) const
-    {
-        return produce_initiate (data_, size_, cn_nonce_, server_key,
-                                 public_key, secret_key, cn_public, cn_secret,
-                                 cn_server, cn_cookie, metadata_plaintext_,
-                                 metadata_length_);
-    }
-
-    //  Our public key (C)
-    uint8_t public_key[crypto_box_PUBLICKEYBYTES];
-
-    //  Our secret key (c)
-    uint8_t secret_key[crypto_box_SECRETKEYBYTES];
-
-    //  Our short-term public key (C')
-    uint8_t cn_public[crypto_box_PUBLICKEYBYTES];
-
-    //  Our short-term secret key (c')
-    uint8_t cn_secret[crypto_box_SECRETKEYBYTES];
-
-    //  Server's public key (S)
-    uint8_t server_key[crypto_box_PUBLICKEYBYTES];
-
-    //  Server's short-term public key (S')
-    uint8_t cn_server[crypto_box_PUBLICKEYBYTES];
-
-    //  Cookie received from server
-    uint8_t cn_cookie[16 + 80];
-
-  private:
-    template <size_t N>
-    static bool is_handshake_command (const uint8_t *msg_data_,
-                                      const size_t msg_size_,
-                                      const char (&prefix_)[N])
-    {
-        return msg_size_ >= (N - 1) && !memcmp (msg_data_, prefix_, N - 1);
-    }
-};
-}
-
-#endif
-
-#endif
diff --git a/libs/libzmq/src/curve_mechanism_base.cpp b/libs/libzmq/src/curve_mechanism_base.cpp
deleted file mode 100644
index 6f0173e..0000000
--- a/libs/libzmq/src/curve_mechanism_base.cpp
+++ /dev/null
@@ -1,313 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-
-#include "precompiled.hpp"
-#include "curve_mechanism_base.hpp"
-#include "msg.hpp"
-#include "wire.hpp"
-#include "session_base.hpp"
-
-#ifdef ZMQ_HAVE_CURVE
-
-#ifdef ZMQ_USE_LIBSODIUM
-//  libsodium added crypto_box_easy_afternm and crypto_box_open_easy_afternm with
-//  https: //github.com/jedisct1/libsodium/commit/aaf5fbf2e53a33b18d8ea9bdf2c6f73d7acc8c3e
-#if SODIUM_LIBRARY_VERSION_MAJOR > 7                                           \
-  || (SODIUM_LIBRARY_VERSION_MAJOR == 7 && SODIUM_LIBRARY_VERSION_MINOR >= 4)
-#define ZMQ_HAVE_CRYPTO_BOX_EASY_FNS 1
-#endif
-#endif
-
-zmq::curve_mechanism_base_t::curve_mechanism_base_t (
-  session_base_t *session_,
-  const options_t &options_,
-  const char *encode_nonce_prefix_,
-  const char *decode_nonce_prefix_,
-  const bool downgrade_sub_) :
-    mechanism_base_t (session_, options_),
-    curve_encoding_t (
-      encode_nonce_prefix_, decode_nonce_prefix_, downgrade_sub_)
-{
-}
-
-int zmq::curve_mechanism_base_t::encode (msg_t *msg_)
-{
-    return curve_encoding_t::encode (msg_);
-}
-
-int zmq::curve_mechanism_base_t::decode (msg_t *msg_)
-{
-    int rc = check_basic_command_structure (msg_);
-    if (rc == -1)
-        return -1;
-
-    int error_event_code;
-    rc = curve_encoding_t::decode (msg_, &error_event_code);
-    if (-1 == rc) {
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (), error_event_code);
-    }
-
-    return rc;
-}
-
-zmq::curve_encoding_t::curve_encoding_t (const char *encode_nonce_prefix_,
-                                         const char *decode_nonce_prefix_,
-                                         const bool downgrade_sub_) :
-    _encode_nonce_prefix (encode_nonce_prefix_),
-    _decode_nonce_prefix (decode_nonce_prefix_),
-    _cn_nonce (1),
-    _cn_peer_nonce (1),
-    _downgrade_sub (downgrade_sub_)
-{
-}
-
-//  Right now, we only transport the lower two bit flags of zmq::msg_t, so they
-//  are binary identical, and we can just use a bitmask to select them. If we
-//  happened to add more flags, this might change.
-static const uint8_t flag_mask = zmq::msg_t::more | zmq::msg_t::command;
-static const size_t flags_len = 1;
-static const size_t nonce_prefix_len = 16;
-static const char message_command[] = "\x07MESSAGE";
-static const size_t message_command_len = sizeof (message_command) - 1;
-static const size_t message_header_len =
-  message_command_len + sizeof (zmq::curve_encoding_t::nonce_t);
-
-#ifndef ZMQ_USE_LIBSODIUM
-static const size_t crypto_box_MACBYTES = 16;
-#endif
-
-int zmq::curve_encoding_t::check_validity (msg_t *msg_, int *error_event_code_)
-{
-    const size_t size = msg_->size ();
-    const uint8_t *const message = static_cast<uint8_t *> (msg_->data ());
-
-    if (size < message_command_len
-        || 0 != memcmp (message, message_command, message_command_len)) {
-        *error_event_code_ = ZMQ_PROTOCOL_ERROR_ZMTP_UNEXPECTED_COMMAND;
-        errno = EPROTO;
-        return -1;
-    }
-
-    if (size < message_header_len + crypto_box_MACBYTES + flags_len) {
-        *error_event_code_ = ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_MESSAGE;
-        errno = EPROTO;
-        return -1;
-    }
-
-    {
-        const uint64_t nonce = get_uint64 (message + message_command_len);
-        if (nonce <= _cn_peer_nonce) {
-            *error_event_code_ = ZMQ_PROTOCOL_ERROR_ZMTP_INVALID_SEQUENCE;
-            errno = EPROTO;
-            return -1;
-        }
-        set_peer_nonce (nonce);
-    }
-
-    return 0;
-}
-
-int zmq::curve_encoding_t::encode (msg_t *msg_)
-{
-    size_t sub_cancel_len = 0;
-    uint8_t message_nonce[crypto_box_NONCEBYTES];
-    memcpy (message_nonce, _encode_nonce_prefix, nonce_prefix_len);
-    put_uint64 (message_nonce + nonce_prefix_len, get_and_inc_nonce ());
-
-    if (msg_->is_subscribe () || msg_->is_cancel ()) {
-        if (_downgrade_sub)
-            sub_cancel_len = 1;
-        else
-            sub_cancel_len = msg_->is_cancel ()
-                               ? zmq::msg_t::cancel_cmd_name_size
-                               : zmq::msg_t::sub_cmd_name_size;
-    }
-
-#ifdef ZMQ_HAVE_CRYPTO_BOX_EASY_FNS
-    const size_t mlen = flags_len + sub_cancel_len + msg_->size ();
-    std::vector<uint8_t> message_plaintext (mlen);
-#else
-    const size_t mlen =
-      crypto_box_ZEROBYTES + flags_len + sub_cancel_len + msg_->size ();
-    std::vector<uint8_t> message_plaintext_with_zerobytes (mlen);
-    uint8_t *const message_plaintext =
-      &message_plaintext_with_zerobytes[crypto_box_ZEROBYTES];
-
-    std::fill (message_plaintext_with_zerobytes.begin (),
-               message_plaintext_with_zerobytes.begin () + crypto_box_ZEROBYTES,
-               0);
-#endif
-
-    const uint8_t flags = msg_->flags () & flag_mask;
-    message_plaintext[0] = flags;
-
-    // For backward compatibility subscribe/cancel command messages are not stored with
-    // the message flags, and are encoded in the encoder, so that messages for < 3.0 peers
-    // can be encoded in the "old" 0/1 way rather than as commands.
-    if (sub_cancel_len == 1)
-        message_plaintext[flags_len] = msg_->is_subscribe () ? 1 : 0;
-    else if (sub_cancel_len == zmq::msg_t::sub_cmd_name_size) {
-        message_plaintext[0] |= zmq::msg_t::command;
-        memcpy (&message_plaintext[flags_len], zmq::sub_cmd_name,
-                zmq::msg_t::sub_cmd_name_size);
-    } else if (sub_cancel_len == zmq::msg_t::cancel_cmd_name_size) {
-        message_plaintext[0] |= zmq::msg_t::command;
-        memcpy (&message_plaintext[flags_len], zmq::cancel_cmd_name,
-                zmq::msg_t::cancel_cmd_name_size);
-    }
-
-    // this is copying the data from insecure memory, so there is no point in
-    // using secure_allocator_t for message_plaintext
-    if (msg_->size () > 0)
-        memcpy (&message_plaintext[flags_len + sub_cancel_len], msg_->data (),
-                msg_->size ());
-
-#ifdef ZMQ_HAVE_CRYPTO_BOX_EASY_FNS
-    msg_t msg_box;
-    int rc =
-      msg_box.init_size (message_header_len + mlen + crypto_box_MACBYTES);
-    zmq_assert (rc == 0);
-
-    rc = crypto_box_easy_afternm (
-      static_cast<uint8_t *> (msg_box.data ()) + message_header_len,
-      &message_plaintext[0], mlen, message_nonce, _cn_precom);
-    zmq_assert (rc == 0);
-
-    msg_->move (msg_box);
-
-    uint8_t *const message = static_cast<uint8_t *> (msg_->data ());
-#else
-    std::vector<uint8_t> message_box (mlen);
-
-    int rc =
-      crypto_box_afternm (&message_box[0], &message_plaintext_with_zerobytes[0],
-                          mlen, message_nonce, _cn_precom);
-    zmq_assert (rc == 0);
-
-    rc = msg_->close ();
-    zmq_assert (rc == 0);
-
-    rc = msg_->init_size (16 + mlen - crypto_box_BOXZEROBYTES);
-    zmq_assert (rc == 0);
-
-    uint8_t *const message = static_cast<uint8_t *> (msg_->data ());
-
-    memcpy (message + message_header_len, &message_box[crypto_box_BOXZEROBYTES],
-            mlen - crypto_box_BOXZEROBYTES);
-#endif
-
-    memcpy (message, message_command, message_command_len);
-    memcpy (message + message_command_len, message_nonce + nonce_prefix_len,
-            sizeof (nonce_t));
-
-    return 0;
-}
-
-int zmq::curve_encoding_t::decode (msg_t *msg_, int *error_event_code_)
-{
-    int rc = check_validity (msg_, error_event_code_);
-    if (0 != rc) {
-        return rc;
-    }
-
-    uint8_t *const message = static_cast<uint8_t *> (msg_->data ());
-
-    uint8_t message_nonce[crypto_box_NONCEBYTES];
-    memcpy (message_nonce, _decode_nonce_prefix, nonce_prefix_len);
-    memcpy (message_nonce + nonce_prefix_len, message + message_command_len,
-            sizeof (nonce_t));
-
-#ifdef ZMQ_HAVE_CRYPTO_BOX_EASY_FNS
-    const size_t clen = msg_->size () - message_header_len;
-
-    uint8_t *const message_plaintext = message + message_header_len;
-
-    rc = crypto_box_open_easy_afternm (message_plaintext,
-                                       message + message_header_len, clen,
-                                       message_nonce, _cn_precom);
-#else
-    const size_t clen =
-      crypto_box_BOXZEROBYTES + msg_->size () - message_header_len;
-
-    std::vector<uint8_t> message_plaintext_with_zerobytes (clen);
-    std::vector<uint8_t> message_box (clen);
-
-    std::fill (message_box.begin (),
-               message_box.begin () + crypto_box_BOXZEROBYTES, 0);
-    memcpy (&message_box[crypto_box_BOXZEROBYTES], message + message_header_len,
-            msg_->size () - message_header_len);
-
-    rc = crypto_box_open_afternm (&message_plaintext_with_zerobytes[0],
-                                  &message_box[0], clen, message_nonce,
-                                  _cn_precom);
-
-    const uint8_t *const message_plaintext =
-      &message_plaintext_with_zerobytes[crypto_box_ZEROBYTES];
-#endif
-
-    if (rc == 0) {
-        const uint8_t flags = message_plaintext[0];
-
-#ifdef ZMQ_HAVE_CRYPTO_BOX_EASY_FNS
-        const size_t plaintext_size = clen - flags_len - crypto_box_MACBYTES;
-
-        if (plaintext_size > 0) {
-            memmove (msg_->data (), &message_plaintext[flags_len],
-                     plaintext_size);
-        }
-
-        msg_->shrink (plaintext_size);
-#else
-        rc = msg_->close ();
-        zmq_assert (rc == 0);
-
-        rc = msg_->init_size (clen - flags_len - crypto_box_ZEROBYTES);
-        zmq_assert (rc == 0);
-
-        // this is copying the data to insecure memory, so there is no point in
-        // using secure_allocator_t for message_plaintext
-        if (msg_->size () > 0) {
-            memcpy (msg_->data (), &message_plaintext[flags_len],
-                    msg_->size ());
-        }
-#endif
-
-        msg_->set_flags (flags & flag_mask);
-    } else {
-        // CURVE I : connection key used for MESSAGE is wrong
-        *error_event_code_ = ZMQ_PROTOCOL_ERROR_ZMTP_CRYPTOGRAPHIC;
-        errno = EPROTO;
-    }
-
-    return rc;
-}
-
-#endif
diff --git a/libs/libzmq/src/curve_mechanism_base.hpp b/libs/libzmq/src/curve_mechanism_base.hpp
deleted file mode 100644
index a72965e..0000000
--- a/libs/libzmq/src/curve_mechanism_base.hpp
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_CURVE_MECHANISM_BASE_HPP_INCLUDED__
-#define __ZMQ_CURVE_MECHANISM_BASE_HPP_INCLUDED__
-
-#ifdef ZMQ_HAVE_CURVE
-
-#if defined(ZMQ_USE_TWEETNACL)
-#include "tweetnacl.h"
-#elif defined(ZMQ_USE_LIBSODIUM)
-#include "sodium.h"
-#endif
-
-#if crypto_box_NONCEBYTES != 24 || crypto_box_PUBLICKEYBYTES != 32             \
-  || crypto_box_SECRETKEYBYTES != 32 || crypto_box_ZEROBYTES != 32             \
-  || crypto_box_BOXZEROBYTES != 16 || crypto_secretbox_NONCEBYTES != 24        \
-  || crypto_secretbox_ZEROBYTES != 32 || crypto_secretbox_BOXZEROBYTES != 16
-#error "CURVE library not built properly"
-#endif
-
-#include "mechanism_base.hpp"
-#include "options.hpp"
-
-#include <memory>
-
-namespace zmq
-{
-class curve_encoding_t
-{
-  public:
-    curve_encoding_t (const char *encode_nonce_prefix_,
-                      const char *decode_nonce_prefix_,
-                      const bool downgrade_sub_);
-
-    int encode (msg_t *msg_);
-    int decode (msg_t *msg_, int *error_event_code_);
-
-    uint8_t *get_writable_precom_buffer () { return _cn_precom; }
-    const uint8_t *get_precom_buffer () const { return _cn_precom; }
-
-    typedef uint64_t nonce_t;
-
-    nonce_t get_and_inc_nonce () { return _cn_nonce++; }
-    void set_peer_nonce (nonce_t peer_nonce_) { _cn_peer_nonce = peer_nonce_; };
-
-  private:
-    int check_validity (msg_t *msg_, int *error_event_code_);
-
-    const char *_encode_nonce_prefix;
-    const char *_decode_nonce_prefix;
-
-    nonce_t _cn_nonce;
-    nonce_t _cn_peer_nonce;
-
-    //  Intermediary buffer used to speed up boxing and unboxing.
-    uint8_t _cn_precom[crypto_box_BEFORENMBYTES];
-
-    const bool _downgrade_sub;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (curve_encoding_t)
-};
-
-class curve_mechanism_base_t : public virtual mechanism_base_t,
-                               public curve_encoding_t
-{
-  public:
-    curve_mechanism_base_t (session_base_t *session_,
-                            const options_t &options_,
-                            const char *encode_nonce_prefix_,
-                            const char *decode_nonce_prefix_,
-                            const bool downgrade_sub_);
-
-    // mechanism implementation
-    int encode (msg_t *msg_) ZMQ_OVERRIDE;
-    int decode (msg_t *msg_) ZMQ_OVERRIDE;
-};
-}
-
-#endif
-
-#endif
diff --git a/libs/libzmq/src/curve_server.cpp b/libs/libzmq/src/curve_server.cpp
deleted file mode 100644
index fadfc74..0000000
--- a/libs/libzmq/src/curve_server.cpp
+++ /dev/null
@@ -1,506 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "macros.hpp"
-
-#ifdef ZMQ_HAVE_CURVE
-
-#include "msg.hpp"
-#include "session_base.hpp"
-#include "err.hpp"
-#include "curve_server.hpp"
-#include "wire.hpp"
-#include "secure_allocator.hpp"
-
-zmq::curve_server_t::curve_server_t (session_base_t *session_,
-                                     const std::string &peer_address_,
-                                     const options_t &options_,
-                                     const bool downgrade_sub_) :
-    mechanism_base_t (session_, options_),
-    zap_client_common_handshake_t (
-      session_, peer_address_, options_, sending_ready),
-    curve_mechanism_base_t (session_,
-                            options_,
-                            "CurveZMQMESSAGES",
-                            "CurveZMQMESSAGEC",
-                            downgrade_sub_)
-{
-    int rc;
-    //  Fetch our secret key from socket options
-    memcpy (_secret_key, options_.curve_secret_key, crypto_box_SECRETKEYBYTES);
-
-    //  Generate short-term key pair
-    memset (_cn_secret, 0, crypto_box_SECRETKEYBYTES);
-    memset (_cn_public, 0, crypto_box_PUBLICKEYBYTES);
-    rc = crypto_box_keypair (_cn_public, _cn_secret);
-    zmq_assert (rc == 0);
-}
-
-zmq::curve_server_t::~curve_server_t ()
-{
-}
-
-int zmq::curve_server_t::next_handshake_command (msg_t *msg_)
-{
-    int rc = 0;
-
-    switch (state) {
-        case sending_welcome:
-            rc = produce_welcome (msg_);
-            if (rc == 0)
-                state = waiting_for_initiate;
-            break;
-        case sending_ready:
-            rc = produce_ready (msg_);
-            if (rc == 0)
-                state = ready;
-            break;
-        case sending_error:
-            rc = produce_error (msg_);
-            if (rc == 0)
-                state = error_sent;
-            break;
-        default:
-            errno = EAGAIN;
-            rc = -1;
-            break;
-    }
-    return rc;
-}
-
-int zmq::curve_server_t::process_handshake_command (msg_t *msg_)
-{
-    int rc = 0;
-
-    switch (state) {
-        case waiting_for_hello:
-            rc = process_hello (msg_);
-            break;
-        case waiting_for_initiate:
-            rc = process_initiate (msg_);
-            break;
-        default:
-            // TODO I think this is not a case reachable with a misbehaving
-            // client. It is not an "invalid handshake command", but would be
-            // trying to process a handshake command in an invalid state,
-            // which is purely under control of this peer.
-            // Therefore, it should be changed to zmq_assert (false);
-
-            // CURVE I: invalid handshake command
-            session->get_socket ()->event_handshake_failed_protocol (
-              session->get_endpoint (), ZMQ_PROTOCOL_ERROR_ZMTP_UNSPECIFIED);
-            errno = EPROTO;
-            rc = -1;
-            break;
-    }
-    if (rc == 0) {
-        rc = msg_->close ();
-        errno_assert (rc == 0);
-        rc = msg_->init ();
-        errno_assert (rc == 0);
-    }
-    return rc;
-}
-
-int zmq::curve_server_t::encode (msg_t *msg_)
-{
-    zmq_assert (state == ready);
-    return curve_mechanism_base_t::encode (msg_);
-}
-
-int zmq::curve_server_t::decode (msg_t *msg_)
-{
-    zmq_assert (state == ready);
-    return curve_mechanism_base_t::decode (msg_);
-}
-
-int zmq::curve_server_t::process_hello (msg_t *msg_)
-{
-    int rc = check_basic_command_structure (msg_);
-    if (rc == -1)
-        return -1;
-
-    const size_t size = msg_->size ();
-    const uint8_t *const hello = static_cast<uint8_t *> (msg_->data ());
-
-    if (size < 6 || memcmp (hello, "\x05HELLO", 6)) {
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (), ZMQ_PROTOCOL_ERROR_ZMTP_UNEXPECTED_COMMAND);
-        errno = EPROTO;
-        return -1;
-    }
-
-    if (size != 200) {
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (),
-          ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_HELLO);
-        errno = EPROTO;
-        return -1;
-    }
-
-    const uint8_t major = hello[6];
-    const uint8_t minor = hello[7];
-
-    if (major != 1 || minor != 0) {
-        // CURVE I: client HELLO has unknown version number
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (),
-          ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_HELLO);
-        errno = EPROTO;
-        return -1;
-    }
-
-    //  Save client's short-term public key (C')
-    memcpy (_cn_client, hello + 80, 32);
-
-    uint8_t hello_nonce[crypto_box_NONCEBYTES];
-    std::vector<uint8_t, secure_allocator_t<uint8_t> > hello_plaintext (
-      crypto_box_ZEROBYTES + 64);
-    uint8_t hello_box[crypto_box_BOXZEROBYTES + 80];
-
-    memcpy (hello_nonce, "CurveZMQHELLO---", 16);
-    memcpy (hello_nonce + 16, hello + 112, 8);
-    set_peer_nonce (get_uint64 (hello + 112));
-
-    memset (hello_box, 0, crypto_box_BOXZEROBYTES);
-    memcpy (hello_box + crypto_box_BOXZEROBYTES, hello + 120, 80);
-
-    //  Open Box [64 * %x0](C'->S)
-    rc = crypto_box_open (&hello_plaintext[0], hello_box, sizeof hello_box,
-                          hello_nonce, _cn_client, _secret_key);
-    if (rc != 0) {
-        // CURVE I: cannot open client HELLO -- wrong server key?
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (), ZMQ_PROTOCOL_ERROR_ZMTP_CRYPTOGRAPHIC);
-        errno = EPROTO;
-        return -1;
-    }
-
-    state = sending_welcome;
-    return rc;
-}
-
-int zmq::curve_server_t::produce_welcome (msg_t *msg_)
-{
-    uint8_t cookie_nonce[crypto_secretbox_NONCEBYTES];
-    std::vector<uint8_t, secure_allocator_t<uint8_t> > cookie_plaintext (
-      crypto_secretbox_ZEROBYTES + 64);
-    uint8_t cookie_ciphertext[crypto_secretbox_BOXZEROBYTES + 80];
-
-    //  Create full nonce for encryption
-    //  8-byte prefix plus 16-byte random nonce
-    memset (cookie_nonce, 0, crypto_secretbox_NONCEBYTES);
-    memcpy (cookie_nonce, "COOKIE--", 8);
-    randombytes (cookie_nonce + 8, 16);
-
-    //  Generate cookie = Box [C' + s'](t)
-    std::fill (cookie_plaintext.begin (),
-               cookie_plaintext.begin () + crypto_secretbox_ZEROBYTES, 0);
-    memcpy (&cookie_plaintext[crypto_secretbox_ZEROBYTES], _cn_client, 32);
-    memcpy (&cookie_plaintext[crypto_secretbox_ZEROBYTES + 32], _cn_secret, 32);
-
-    //  Generate fresh cookie key
-    memset (_cookie_key, 0, crypto_secretbox_KEYBYTES);
-    randombytes (_cookie_key, crypto_secretbox_KEYBYTES);
-
-    //  Encrypt using symmetric cookie key
-    int rc =
-      crypto_secretbox (cookie_ciphertext, &cookie_plaintext[0],
-                        cookie_plaintext.size (), cookie_nonce, _cookie_key);
-    zmq_assert (rc == 0);
-
-    uint8_t welcome_nonce[crypto_box_NONCEBYTES];
-    std::vector<uint8_t, secure_allocator_t<uint8_t> > welcome_plaintext (
-      crypto_box_ZEROBYTES + 128);
-    uint8_t welcome_ciphertext[crypto_box_BOXZEROBYTES + 144];
-
-    //  Create full nonce for encryption
-    //  8-byte prefix plus 16-byte random nonce
-    memset (welcome_nonce, 0, crypto_box_NONCEBYTES);
-    memcpy (welcome_nonce, "WELCOME-", 8);
-    randombytes (welcome_nonce + 8, crypto_box_NONCEBYTES - 8);
-
-    //  Create 144-byte Box [S' + cookie](S->C')
-    std::fill (welcome_plaintext.begin (),
-               welcome_plaintext.begin () + crypto_box_ZEROBYTES, 0);
-    memcpy (&welcome_plaintext[crypto_box_ZEROBYTES], _cn_public, 32);
-    memcpy (&welcome_plaintext[crypto_box_ZEROBYTES + 32], cookie_nonce + 8,
-            16);
-    memcpy (&welcome_plaintext[crypto_box_ZEROBYTES + 48],
-            cookie_ciphertext + crypto_secretbox_BOXZEROBYTES, 80);
-
-    rc = crypto_box (welcome_ciphertext, &welcome_plaintext[0],
-                     welcome_plaintext.size (), welcome_nonce, _cn_client,
-                     _secret_key);
-
-    //  TODO I think we should change this back to zmq_assert (rc == 0);
-    //  as it was before https://github.com/zeromq/libzmq/pull/1832
-    //  The reason given there was that secret_key might be 0ed.
-    //  But if it were, we would never get this far, since we could
-    //  not have opened the client's hello box with a 0ed key.
-
-    if (rc == -1)
-        return -1;
-
-    rc = msg_->init_size (168);
-    errno_assert (rc == 0);
-
-    uint8_t *const welcome = static_cast<uint8_t *> (msg_->data ());
-    memcpy (welcome, "\x07WELCOME", 8);
-    memcpy (welcome + 8, welcome_nonce + 8, 16);
-    memcpy (welcome + 24, welcome_ciphertext + crypto_box_BOXZEROBYTES, 144);
-
-    return 0;
-}
-
-int zmq::curve_server_t::process_initiate (msg_t *msg_)
-{
-    int rc = check_basic_command_structure (msg_);
-    if (rc == -1)
-        return -1;
-
-    const size_t size = msg_->size ();
-    const uint8_t *initiate = static_cast<uint8_t *> (msg_->data ());
-
-    if (size < 9 || memcmp (initiate, "\x08INITIATE", 9)) {
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (), ZMQ_PROTOCOL_ERROR_ZMTP_UNEXPECTED_COMMAND);
-        errno = EPROTO;
-        return -1;
-    }
-
-    if (size < 257) {
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (),
-          ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_INITIATE);
-        errno = EPROTO;
-        return -1;
-    }
-
-    uint8_t cookie_nonce[crypto_secretbox_NONCEBYTES];
-    uint8_t cookie_plaintext[crypto_secretbox_ZEROBYTES + 64];
-    uint8_t cookie_box[crypto_secretbox_BOXZEROBYTES + 80];
-
-    //  Open Box [C' + s'](t)
-    memset (cookie_box, 0, crypto_secretbox_BOXZEROBYTES);
-    memcpy (cookie_box + crypto_secretbox_BOXZEROBYTES, initiate + 25, 80);
-
-    memcpy (cookie_nonce, "COOKIE--", 8);
-    memcpy (cookie_nonce + 8, initiate + 9, 16);
-
-    rc = crypto_secretbox_open (cookie_plaintext, cookie_box, sizeof cookie_box,
-                                cookie_nonce, _cookie_key);
-    if (rc != 0) {
-        // CURVE I: cannot open client INITIATE cookie
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (), ZMQ_PROTOCOL_ERROR_ZMTP_CRYPTOGRAPHIC);
-        errno = EPROTO;
-        return -1;
-    }
-
-    //  Check cookie plain text is as expected [C' + s']
-    if (memcmp (cookie_plaintext + crypto_secretbox_ZEROBYTES, _cn_client, 32)
-        || memcmp (cookie_plaintext + crypto_secretbox_ZEROBYTES + 32,
-                   _cn_secret, 32)) {
-        // TODO this case is very hard to test, as it would require a modified
-        //  client that knows the server's secret temporary cookie key
-
-        // CURVE I: client INITIATE cookie is not valid
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (), ZMQ_PROTOCOL_ERROR_ZMTP_CRYPTOGRAPHIC);
-        errno = EPROTO;
-        return -1;
-    }
-
-    const size_t clen = (size - 113) + crypto_box_BOXZEROBYTES;
-
-    uint8_t initiate_nonce[crypto_box_NONCEBYTES];
-    std::vector<uint8_t, secure_allocator_t<uint8_t> > initiate_plaintext (
-      crypto_box_ZEROBYTES + clen);
-    std::vector<uint8_t> initiate_box (crypto_box_BOXZEROBYTES + clen);
-
-    //  Open Box [C + vouch + metadata](C'->S')
-    std::fill (initiate_box.begin (),
-               initiate_box.begin () + crypto_box_BOXZEROBYTES, 0);
-    memcpy (&initiate_box[crypto_box_BOXZEROBYTES], initiate + 113,
-            clen - crypto_box_BOXZEROBYTES);
-
-    memcpy (initiate_nonce, "CurveZMQINITIATE", 16);
-    memcpy (initiate_nonce + 16, initiate + 105, 8);
-    set_peer_nonce (get_uint64 (initiate + 105));
-
-    const uint8_t *client_key = &initiate_plaintext[crypto_box_ZEROBYTES];
-
-    rc = crypto_box_open (&initiate_plaintext[0], &initiate_box[0], clen,
-                          initiate_nonce, _cn_client, _cn_secret);
-    if (rc != 0) {
-        // CURVE I: cannot open client INITIATE
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (), ZMQ_PROTOCOL_ERROR_ZMTP_CRYPTOGRAPHIC);
-        errno = EPROTO;
-        return -1;
-    }
-
-    uint8_t vouch_nonce[crypto_box_NONCEBYTES];
-    std::vector<uint8_t, secure_allocator_t<uint8_t> > vouch_plaintext (
-      crypto_box_ZEROBYTES + 64);
-    uint8_t vouch_box[crypto_box_BOXZEROBYTES + 80];
-
-    //  Open Box Box [C',S](C->S') and check contents
-    memset (vouch_box, 0, crypto_box_BOXZEROBYTES);
-    memcpy (vouch_box + crypto_box_BOXZEROBYTES,
-            &initiate_plaintext[crypto_box_ZEROBYTES + 48], 80);
-
-    memset (vouch_nonce, 0, crypto_box_NONCEBYTES);
-    memcpy (vouch_nonce, "VOUCH---", 8);
-    memcpy (vouch_nonce + 8, &initiate_plaintext[crypto_box_ZEROBYTES + 32],
-            16);
-
-    rc = crypto_box_open (&vouch_plaintext[0], vouch_box, sizeof vouch_box,
-                          vouch_nonce, client_key, _cn_secret);
-    if (rc != 0) {
-        // CURVE I: cannot open client INITIATE vouch
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (), ZMQ_PROTOCOL_ERROR_ZMTP_CRYPTOGRAPHIC);
-        errno = EPROTO;
-        return -1;
-    }
-
-    //  What we decrypted must be the client's short-term public key
-    if (memcmp (&vouch_plaintext[crypto_box_ZEROBYTES], _cn_client, 32)) {
-        // TODO this case is very hard to test, as it would require a modified
-        //  client that knows the server's secret short-term key
-
-        // CURVE I: invalid handshake from client (public key)
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (), ZMQ_PROTOCOL_ERROR_ZMTP_KEY_EXCHANGE);
-        errno = EPROTO;
-        return -1;
-    }
-
-    //  Precompute connection secret from client key
-    rc = crypto_box_beforenm (get_writable_precom_buffer (), _cn_client,
-                              _cn_secret);
-    zmq_assert (rc == 0);
-
-    //  Given this is a backward-incompatible change, it's behind a socket
-    //  option disabled by default.
-    if (zap_required () || !options.zap_enforce_domain) {
-        //  Use ZAP protocol (RFC 27) to authenticate the user.
-        rc = session->zap_connect ();
-        if (rc == 0) {
-            send_zap_request (client_key);
-            state = waiting_for_zap_reply;
-
-            //  TODO actually, it is quite unlikely that we can read the ZAP
-            //  reply already, but removing this has some strange side-effect
-            //  (probably because the pipe's in_active flag is true until a read
-            //  is attempted)
-            if (-1 == receive_and_process_zap_reply ())
-                return -1;
-        } else if (!options.zap_enforce_domain) {
-            //  This supports the Stonehouse pattern (encryption without
-            //  authentication) in legacy mode (domain set but no handler).
-            state = sending_ready;
-        } else {
-            session->get_socket ()->event_handshake_failed_no_detail (
-              session->get_endpoint (), EFAULT);
-            return -1;
-        }
-    } else {
-        //  This supports the Stonehouse pattern (encryption without authentication).
-        state = sending_ready;
-    }
-
-    return parse_metadata (&initiate_plaintext[crypto_box_ZEROBYTES + 128],
-                           clen - crypto_box_ZEROBYTES - 128);
-}
-
-int zmq::curve_server_t::produce_ready (msg_t *msg_)
-{
-    const size_t metadata_length = basic_properties_len ();
-    uint8_t ready_nonce[crypto_box_NONCEBYTES];
-
-    std::vector<uint8_t, secure_allocator_t<uint8_t> > ready_plaintext (
-      crypto_box_ZEROBYTES + metadata_length);
-
-    //  Create Box [metadata](S'->C')
-    std::fill (ready_plaintext.begin (),
-               ready_plaintext.begin () + crypto_box_ZEROBYTES, 0);
-    uint8_t *ptr = &ready_plaintext[crypto_box_ZEROBYTES];
-
-    ptr += add_basic_properties (ptr, metadata_length);
-    const size_t mlen = ptr - &ready_plaintext[0];
-
-    memcpy (ready_nonce, "CurveZMQREADY---", 16);
-    put_uint64 (ready_nonce + 16, get_and_inc_nonce ());
-
-    std::vector<uint8_t> ready_box (crypto_box_BOXZEROBYTES + 16
-                                    + metadata_length);
-
-    int rc = crypto_box_afternm (&ready_box[0], &ready_plaintext[0], mlen,
-                                 ready_nonce, get_precom_buffer ());
-    zmq_assert (rc == 0);
-
-    rc = msg_->init_size (14 + mlen - crypto_box_BOXZEROBYTES);
-    errno_assert (rc == 0);
-
-    uint8_t *ready = static_cast<uint8_t *> (msg_->data ());
-
-    memcpy (ready, "\x05READY", 6);
-    //  Short nonce, prefixed by "CurveZMQREADY---"
-    memcpy (ready + 6, ready_nonce + 16, 8);
-    //  Box [metadata](S'->C')
-    memcpy (ready + 14, &ready_box[crypto_box_BOXZEROBYTES],
-            mlen - crypto_box_BOXZEROBYTES);
-
-    return 0;
-}
-
-int zmq::curve_server_t::produce_error (msg_t *msg_) const
-{
-    const size_t expected_status_code_length = 3;
-    zmq_assert (status_code.length () == 3);
-    const int rc = msg_->init_size (6 + 1 + expected_status_code_length);
-    zmq_assert (rc == 0);
-    char *msg_data = static_cast<char *> (msg_->data ());
-    memcpy (msg_data, "\5ERROR", 6);
-    msg_data[6] = expected_status_code_length;
-    memcpy (msg_data + 7, status_code.c_str (), expected_status_code_length);
-    return 0;
-}
-
-void zmq::curve_server_t::send_zap_request (const uint8_t *key_)
-{
-    zap_client_t::send_zap_request ("CURVE", 5, key_,
-                                    crypto_box_PUBLICKEYBYTES);
-}
-
-#endif
diff --git a/libs/libzmq/src/curve_server.hpp b/libs/libzmq/src/curve_server.hpp
deleted file mode 100644
index 995efce..0000000
--- a/libs/libzmq/src/curve_server.hpp
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_CURVE_SERVER_HPP_INCLUDED__
-#define __ZMQ_CURVE_SERVER_HPP_INCLUDED__
-
-#ifdef ZMQ_HAVE_CURVE
-
-#include "curve_mechanism_base.hpp"
-#include "options.hpp"
-#include "zap_client.hpp"
-
-namespace zmq
-{
-#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable : 4250)
-#endif
-class curve_server_t ZMQ_FINAL : public zap_client_common_handshake_t,
-                                 public curve_mechanism_base_t
-{
-  public:
-    curve_server_t (session_base_t *session_,
-                    const std::string &peer_address_,
-                    const options_t &options_,
-                    const bool downgrade_sub_);
-    ~curve_server_t ();
-
-    // mechanism implementation
-    int next_handshake_command (msg_t *msg_);
-    int process_handshake_command (msg_t *msg_);
-    int encode (msg_t *msg_);
-    int decode (msg_t *msg_);
-
-  private:
-    //  Our secret key (s)
-    uint8_t _secret_key[crypto_box_SECRETKEYBYTES];
-
-    //  Our short-term public key (S')
-    uint8_t _cn_public[crypto_box_PUBLICKEYBYTES];
-
-    //  Our short-term secret key (s')
-    uint8_t _cn_secret[crypto_box_SECRETKEYBYTES];
-
-    //  Client's short-term public key (C')
-    uint8_t _cn_client[crypto_box_PUBLICKEYBYTES];
-
-    //  Key used to produce cookie
-    uint8_t _cookie_key[crypto_secretbox_KEYBYTES];
-
-    int process_hello (msg_t *msg_);
-    int produce_welcome (msg_t *msg_);
-    int process_initiate (msg_t *msg_);
-    int produce_ready (msg_t *msg_);
-    int produce_error (msg_t *msg_) const;
-
-    void send_zap_request (const uint8_t *key_);
-};
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
-}
-
-#endif
-
-#endif
diff --git a/libs/libzmq/src/dbuffer.hpp b/libs/libzmq/src/dbuffer.hpp
deleted file mode 100644
index 00ea66b..0000000
--- a/libs/libzmq/src/dbuffer.hpp
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_DBUFFER_HPP_INCLUDED__
-#define __ZMQ_DBUFFER_HPP_INCLUDED__
-
-#include <stdlib.h>
-#include <stddef.h>
-#include <algorithm>
-
-#include "mutex.hpp"
-#include "msg.hpp"
-
-namespace zmq
-{
-//  dbuffer is a single-producer single-consumer double-buffer
-//  implementation.
-//
-//  The producer writes to a back buffer and then tries to swap
-//  pointers between the back and front buffers. If it fails,
-//  due to the consumer reading from the front buffer, it just
-//  gives up, which is ok since writes are many and redundant.
-//
-//  The reader simply reads from the front buffer.
-//
-//  has_msg keeps track of whether there has been a not yet read
-//  value written, it is used by ypipe_conflate to mimic ypipe
-//  functionality regarding a reader being asleep
-
-template <typename T> class dbuffer_t;
-
-template <> class dbuffer_t<msg_t>
-{
-  public:
-    dbuffer_t () : _back (&_storage[0]), _front (&_storage[1]), _has_msg (false)
-    {
-        _back->init ();
-        _front->init ();
-    }
-
-    ~dbuffer_t ()
-    {
-        _back->close ();
-        _front->close ();
-    }
-
-    void write (const msg_t &value_)
-    {
-        zmq_assert (value_.check ());
-        *_back = value_;
-
-        zmq_assert (_back->check ());
-
-        if (_sync.try_lock ()) {
-            _front->move (*_back);
-            _has_msg = true;
-
-            _sync.unlock ();
-        }
-    }
-
-    bool read (msg_t *value_)
-    {
-        if (!value_)
-            return false;
-
-        {
-            scoped_lock_t lock (_sync);
-            if (!_has_msg)
-                return false;
-
-            zmq_assert (_front->check ());
-
-            *value_ = *_front;
-            _front->init (); // avoid double free
-
-            _has_msg = false;
-            return true;
-        }
-    }
-
-
-    bool check_read ()
-    {
-        scoped_lock_t lock (_sync);
-
-        return _has_msg;
-    }
-
-    bool probe (bool (*fn_) (const msg_t &))
-    {
-        scoped_lock_t lock (_sync);
-        return (*fn_) (*_front);
-    }
-
-
-  private:
-    msg_t _storage[2];
-    msg_t *_back, *_front;
-
-    mutex_t _sync;
-    bool _has_msg;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (dbuffer_t)
-};
-}
-
-#endif
diff --git a/libs/libzmq/src/dealer.cpp b/libs/libzmq/src/dealer.cpp
deleted file mode 100644
index 7045e4a..0000000
--- a/libs/libzmq/src/dealer.cpp
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "macros.hpp"
-#include "dealer.hpp"
-#include "err.hpp"
-#include "msg.hpp"
-
-zmq::dealer_t::dealer_t (class ctx_t *parent_, uint32_t tid_, int sid_) :
-    socket_base_t (parent_, tid_, sid_), _probe_router (false)
-{
-    options.type = ZMQ_DEALER;
-    options.can_send_hello_msg = true;
-    options.can_recv_hiccup_msg = true;
-}
-
-zmq::dealer_t::~dealer_t ()
-{
-}
-
-void zmq::dealer_t::xattach_pipe (pipe_t *pipe_,
-                                  bool subscribe_to_all_,
-                                  bool locally_initiated_)
-{
-    LIBZMQ_UNUSED (subscribe_to_all_);
-    LIBZMQ_UNUSED (locally_initiated_);
-
-    zmq_assert (pipe_);
-
-    if (_probe_router) {
-        msg_t probe_msg;
-        int rc = probe_msg.init ();
-        errno_assert (rc == 0);
-
-        rc = pipe_->write (&probe_msg);
-        // zmq_assert (rc) is not applicable here, since it is not a bug.
-        LIBZMQ_UNUSED (rc);
-
-        pipe_->flush ();
-
-        rc = probe_msg.close ();
-        errno_assert (rc == 0);
-    }
-
-    _fq.attach (pipe_);
-    _lb.attach (pipe_);
-}
-
-int zmq::dealer_t::xsetsockopt (int option_,
-                                const void *optval_,
-                                size_t optvallen_)
-{
-    const bool is_int = (optvallen_ == sizeof (int));
-    int value = 0;
-    if (is_int)
-        memcpy (&value, optval_, sizeof (int));
-
-    switch (option_) {
-        case ZMQ_PROBE_ROUTER:
-            if (is_int && value >= 0) {
-                _probe_router = (value != 0);
-                return 0;
-            }
-            break;
-
-        default:
-            break;
-    }
-
-    errno = EINVAL;
-    return -1;
-}
-
-int zmq::dealer_t::xsend (msg_t *msg_)
-{
-    return sendpipe (msg_, NULL);
-}
-
-int zmq::dealer_t::xrecv (msg_t *msg_)
-{
-    return recvpipe (msg_, NULL);
-}
-
-bool zmq::dealer_t::xhas_in ()
-{
-    return _fq.has_in ();
-}
-
-bool zmq::dealer_t::xhas_out ()
-{
-    return _lb.has_out ();
-}
-
-void zmq::dealer_t::xread_activated (pipe_t *pipe_)
-{
-    _fq.activated (pipe_);
-}
-
-void zmq::dealer_t::xwrite_activated (pipe_t *pipe_)
-{
-    _lb.activated (pipe_);
-}
-
-void zmq::dealer_t::xpipe_terminated (pipe_t *pipe_)
-{
-    _fq.pipe_terminated (pipe_);
-    _lb.pipe_terminated (pipe_);
-}
-
-int zmq::dealer_t::sendpipe (msg_t *msg_, pipe_t **pipe_)
-{
-    return _lb.sendpipe (msg_, pipe_);
-}
-
-int zmq::dealer_t::recvpipe (msg_t *msg_, pipe_t **pipe_)
-{
-    return _fq.recvpipe (msg_, pipe_);
-}
diff --git a/libs/libzmq/src/dealer.hpp b/libs/libzmq/src/dealer.hpp
deleted file mode 100644
index 5515fd3..0000000
--- a/libs/libzmq/src/dealer.hpp
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_DEALER_HPP_INCLUDED__
-#define __ZMQ_DEALER_HPP_INCLUDED__
-
-#include "socket_base.hpp"
-#include "session_base.hpp"
-#include "fq.hpp"
-#include "lb.hpp"
-
-namespace zmq
-{
-class ctx_t;
-class msg_t;
-class pipe_t;
-class io_thread_t;
-class socket_base_t;
-
-class dealer_t : public socket_base_t
-{
-  public:
-    dealer_t (zmq::ctx_t *parent_, uint32_t tid_, int sid_);
-    ~dealer_t () ZMQ_OVERRIDE;
-
-  protected:
-    //  Overrides of functions from socket_base_t.
-    void xattach_pipe (zmq::pipe_t *pipe_,
-                       bool subscribe_to_all_,
-                       bool locally_initiated_) ZMQ_FINAL;
-    int xsetsockopt (int option_,
-                     const void *optval_,
-                     size_t optvallen_) ZMQ_OVERRIDE;
-    int xsend (zmq::msg_t *msg_) ZMQ_OVERRIDE;
-    int xrecv (zmq::msg_t *msg_) ZMQ_OVERRIDE;
-    bool xhas_in () ZMQ_OVERRIDE;
-    bool xhas_out () ZMQ_OVERRIDE;
-    void xread_activated (zmq::pipe_t *pipe_) ZMQ_FINAL;
-    void xwrite_activated (zmq::pipe_t *pipe_) ZMQ_FINAL;
-    void xpipe_terminated (zmq::pipe_t *pipe_) ZMQ_OVERRIDE;
-
-    //  Send and recv - knowing which pipe was used.
-    int sendpipe (zmq::msg_t *msg_, zmq::pipe_t **pipe_);
-    int recvpipe (zmq::msg_t *msg_, zmq::pipe_t **pipe_);
-
-  private:
-    //  Messages are fair-queued from inbound pipes. And load-balanced to
-    //  the outbound pipes.
-    fq_t _fq;
-    lb_t _lb;
-
-    // if true, send an empty message to every connected router peer
-    bool _probe_router;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (dealer_t)
-};
-}
-
-#endif
diff --git a/libs/libzmq/src/decoder.hpp b/libs/libzmq/src/decoder.hpp
deleted file mode 100644
index f89e10d..0000000
--- a/libs/libzmq/src/decoder.hpp
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_DECODER_HPP_INCLUDED__
-#define __ZMQ_DECODER_HPP_INCLUDED__
-
-#include <algorithm>
-#include <cstddef>
-#include <cstring>
-
-#include "decoder_allocators.hpp"
-#include "err.hpp"
-#include "i_decoder.hpp"
-#include "stdint.hpp"
-
-namespace zmq
-{
-//  Helper base class for decoders that know the amount of data to read
-//  in advance at any moment. Knowing the amount in advance is a property
-//  of the protocol used. 0MQ framing protocol is based size-prefixed
-//  paradigm, which qualifies it to be parsed by this class.
-//  On the other hand, XML-based transports (like XMPP or SOAP) don't allow
-//  for knowing the size of data to read in advance and should use different
-//  decoding algorithms.
-//
-//  This class implements the state machine that parses the incoming buffer.
-//  Derived class should implement individual state machine actions.
-//
-//  Buffer management is done by an allocator policy.
-template <typename T, typename A = c_single_allocator>
-class decoder_base_t : public i_decoder
-{
-  public:
-    explicit decoder_base_t (const size_t buf_size_) :
-        _next (NULL), _read_pos (NULL), _to_read (0), _allocator (buf_size_)
-    {
-        _buf = _allocator.allocate ();
-    }
-
-    ~decoder_base_t () ZMQ_OVERRIDE { _allocator.deallocate (); }
-
-    //  Returns a buffer to be filled with binary data.
-    void get_buffer (unsigned char **data_, std::size_t *size_) ZMQ_FINAL
-    {
-        _buf = _allocator.allocate ();
-
-        //  If we are expected to read large message, we'll opt for zero-
-        //  copy, i.e. we'll ask caller to fill the data directly to the
-        //  message. Note that subsequent read(s) are non-blocking, thus
-        //  each single read reads at most SO_RCVBUF bytes at once not
-        //  depending on how large is the chunk returned from here.
-        //  As a consequence, large messages being received won't block
-        //  other engines running in the same I/O thread for excessive
-        //  amounts of time.
-        if (_to_read >= _allocator.size ()) {
-            *data_ = _read_pos;
-            *size_ = _to_read;
-            return;
-        }
-
-        *data_ = _buf;
-        *size_ = _allocator.size ();
-    }
-
-    //  Processes the data in the buffer previously allocated using
-    //  get_buffer function. size_ argument specifies number of bytes
-    //  actually filled into the buffer. Function returns 1 when the
-    //  whole message was decoded or 0 when more data is required.
-    //  On error, -1 is returned and errno set accordingly.
-    //  Number of bytes processed is returned in bytes_used_.
-    int decode (const unsigned char *data_,
-                std::size_t size_,
-                std::size_t &bytes_used_) ZMQ_FINAL
-    {
-        bytes_used_ = 0;
-
-        //  In case of zero-copy simply adjust the pointers, no copying
-        //  is required. Also, run the state machine in case all the data
-        //  were processed.
-        if (data_ == _read_pos) {
-            zmq_assert (size_ <= _to_read);
-            _read_pos += size_;
-            _to_read -= size_;
-            bytes_used_ = size_;
-
-            while (!_to_read) {
-                const int rc =
-                  (static_cast<T *> (this)->*_next) (data_ + bytes_used_);
-                if (rc != 0)
-                    return rc;
-            }
-            return 0;
-        }
-
-        while (bytes_used_ < size_) {
-            //  Copy the data from buffer to the message.
-            const size_t to_copy = std::min (_to_read, size_ - bytes_used_);
-            // Only copy when destination address is different from the
-            // current address in the buffer.
-            if (_read_pos != data_ + bytes_used_) {
-                memcpy (_read_pos, data_ + bytes_used_, to_copy);
-            }
-
-            _read_pos += to_copy;
-            _to_read -= to_copy;
-            bytes_used_ += to_copy;
-            //  Try to get more space in the message to fill in.
-            //  If none is available, return.
-            while (_to_read == 0) {
-                // pass current address in the buffer
-                const int rc =
-                  (static_cast<T *> (this)->*_next) (data_ + bytes_used_);
-                if (rc != 0)
-                    return rc;
-            }
-        }
-
-        return 0;
-    }
-
-    void resize_buffer (std::size_t new_size_) ZMQ_FINAL
-    {
-        _allocator.resize (new_size_);
-    }
-
-  protected:
-    //  Prototype of state machine action. Action should return false if
-    //  it is unable to push the data to the system.
-    typedef int (T::*step_t) (unsigned char const *);
-
-    //  This function should be called from derived class to read data
-    //  from the buffer and schedule next state machine action.
-    void next_step (void *read_pos_, std::size_t to_read_, step_t next_)
-    {
-        _read_pos = static_cast<unsigned char *> (read_pos_);
-        _to_read = to_read_;
-        _next = next_;
-    }
-
-    A &get_allocator () { return _allocator; }
-
-  private:
-    //  Next step. If set to NULL, it means that associated data stream
-    //  is dead. Note that there can be still data in the process in such
-    //  case.
-    step_t _next;
-
-    //  Where to store the read data.
-    unsigned char *_read_pos;
-
-    //  How much data to read before taking next step.
-    std::size_t _to_read;
-
-    //  The duffer for data to decode.
-    A _allocator;
-    unsigned char *_buf;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (decoder_base_t)
-};
-}
-
-#endif
diff --git a/libs/libzmq/src/decoder_allocators.cpp b/libs/libzmq/src/decoder_allocators.cpp
deleted file mode 100644
index 979b09e..0000000
--- a/libs/libzmq/src/decoder_allocators.cpp
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "decoder_allocators.hpp"
-
-#include "msg.hpp"
-
-zmq::shared_message_memory_allocator::shared_message_memory_allocator (
-  std::size_t bufsize_) :
-    _buf (NULL),
-    _buf_size (0),
-    _max_size (bufsize_),
-    _msg_content (NULL),
-    _max_counters ((_max_size + msg_t::max_vsm_size - 1) / msg_t::max_vsm_size)
-{
-}
-
-zmq::shared_message_memory_allocator::shared_message_memory_allocator (
-  std::size_t bufsize_, std::size_t max_messages_) :
-    _buf (NULL),
-    _buf_size (0),
-    _max_size (bufsize_),
-    _msg_content (NULL),
-    _max_counters (max_messages_)
-{
-}
-
-zmq::shared_message_memory_allocator::~shared_message_memory_allocator ()
-{
-    deallocate ();
-}
-
-unsigned char *zmq::shared_message_memory_allocator::allocate ()
-{
-    if (_buf) {
-        // release reference count to couple lifetime to messages
-        zmq::atomic_counter_t *c =
-          reinterpret_cast<zmq::atomic_counter_t *> (_buf);
-
-        // if refcnt drops to 0, there are no message using the buffer
-        // because either all messages have been closed or only vsm-messages
-        // were created
-        if (c->sub (1)) {
-            // buffer is still in use as message data. "Release" it and create a new one
-            // release pointer because we are going to create a new buffer
-            release ();
-        }
-    }
-
-    // if buf != NULL it is not used by any message so we can re-use it for the next run
-    if (!_buf) {
-        // allocate memory for reference counters together with reception buffer
-        std::size_t const allocationsize =
-          _max_size + sizeof (zmq::atomic_counter_t)
-          + _max_counters * sizeof (zmq::msg_t::content_t);
-
-        _buf = static_cast<unsigned char *> (std::malloc (allocationsize));
-        alloc_assert (_buf);
-
-        new (_buf) atomic_counter_t (1);
-    } else {
-        // release reference count to couple lifetime to messages
-        zmq::atomic_counter_t *c =
-          reinterpret_cast<zmq::atomic_counter_t *> (_buf);
-        c->set (1);
-    }
-
-    _buf_size = _max_size;
-    _msg_content = reinterpret_cast<zmq::msg_t::content_t *> (
-      _buf + sizeof (atomic_counter_t) + _max_size);
-    return _buf + sizeof (zmq::atomic_counter_t);
-}
-
-void zmq::shared_message_memory_allocator::deallocate ()
-{
-    zmq::atomic_counter_t *c = reinterpret_cast<zmq::atomic_counter_t *> (_buf);
-    if (_buf && !c->sub (1)) {
-        c->~atomic_counter_t ();
-        std::free (_buf);
-    }
-    clear ();
-}
-
-unsigned char *zmq::shared_message_memory_allocator::release ()
-{
-    unsigned char *b = _buf;
-    clear ();
-    return b;
-}
-
-void zmq::shared_message_memory_allocator::clear ()
-{
-    _buf = NULL;
-    _buf_size = 0;
-    _msg_content = NULL;
-}
-
-void zmq::shared_message_memory_allocator::inc_ref ()
-{
-    (reinterpret_cast<zmq::atomic_counter_t *> (_buf))->add (1);
-}
-
-void zmq::shared_message_memory_allocator::call_dec_ref (void *, void *hint_)
-{
-    zmq_assert (hint_);
-    unsigned char *buf = static_cast<unsigned char *> (hint_);
-    zmq::atomic_counter_t *c = reinterpret_cast<zmq::atomic_counter_t *> (buf);
-
-    if (!c->sub (1)) {
-        c->~atomic_counter_t ();
-        std::free (buf);
-        buf = NULL;
-    }
-}
-
-
-std::size_t zmq::shared_message_memory_allocator::size () const
-{
-    return _buf_size;
-}
-
-unsigned char *zmq::shared_message_memory_allocator::data ()
-{
-    return _buf + sizeof (zmq::atomic_counter_t);
-}
diff --git a/libs/libzmq/src/decoder_allocators.hpp b/libs/libzmq/src/decoder_allocators.hpp
deleted file mode 100644
index 2620f1b..0000000
--- a/libs/libzmq/src/decoder_allocators.hpp
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_DECODER_ALLOCATORS_HPP_INCLUDED__
-#define __ZMQ_DECODER_ALLOCATORS_HPP_INCLUDED__
-
-#include <cstddef>
-#include <cstdlib>
-
-#include "atomic_counter.hpp"
-#include "msg.hpp"
-#include "err.hpp"
-
-namespace zmq
-{
-// Static buffer policy.
-class c_single_allocator
-{
-  public:
-    explicit c_single_allocator (std::size_t bufsize_) :
-        _buf_size (bufsize_),
-        _buf (static_cast<unsigned char *> (std::malloc (_buf_size)))
-    {
-        alloc_assert (_buf);
-    }
-
-    ~c_single_allocator () { std::free (_buf); }
-
-    unsigned char *allocate () { return _buf; }
-
-    void deallocate () {}
-
-    std::size_t size () const { return _buf_size; }
-
-    //  This buffer is fixed, size must not be changed
-    void resize (std::size_t new_size_) { LIBZMQ_UNUSED (new_size_); }
-
-  private:
-    std::size_t _buf_size;
-    unsigned char *_buf;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (c_single_allocator)
-};
-
-// This allocator allocates a reference counted buffer which is used by v2_decoder_t
-// to use zero-copy msg::init_data to create messages with memory from this buffer as
-// data storage.
-//
-// The buffer is allocated with a reference count of 1 to make sure that is is alive while
-// decoding messages. Otherwise, it is possible that e.g. the first message increases the count
-// from zero to one, gets passed to the user application, processed in the user thread and deleted
-// which would then deallocate the buffer. The drawback is that the buffer may be allocated longer
-// than necessary because it is only deleted when allocate is called the next time.
-class shared_message_memory_allocator
-{
-  public:
-    explicit shared_message_memory_allocator (std::size_t bufsize_);
-
-    // Create an allocator for a maximum number of messages
-    shared_message_memory_allocator (std::size_t bufsize_,
-                                     std::size_t max_messages_);
-
-    ~shared_message_memory_allocator ();
-
-    // Allocate a new buffer
-    //
-    // This releases the current buffer to be bound to the lifetime of the messages
-    // created on this buffer.
-    unsigned char *allocate ();
-
-    // force deallocation of buffer.
-    void deallocate ();
-
-    // Give up ownership of the buffer. The buffer's lifetime is now coupled to
-    // the messages constructed on top of it.
-    unsigned char *release ();
-
-    void inc_ref ();
-
-    static void call_dec_ref (void *, void *hint_);
-
-    std::size_t size () const;
-
-    // Return pointer to the first message data byte.
-    unsigned char *data ();
-
-    // Return pointer to the first byte of the buffer.
-    unsigned char *buffer () { return _buf; }
-
-    void resize (std::size_t new_size_) { _buf_size = new_size_; }
-
-    zmq::msg_t::content_t *provide_content () { return _msg_content; }
-
-    void advance_content () { _msg_content++; }
-
-  private:
-    void clear ();
-
-    unsigned char *_buf;
-    std::size_t _buf_size;
-    const std::size_t _max_size;
-    zmq::msg_t::content_t *_msg_content;
-    std::size_t _max_counters;
-};
-}
-
-#endif
diff --git a/libs/libzmq/src/devpoll.cpp b/libs/libzmq/src/devpoll.cpp
deleted file mode 100644
index 11b38cc..0000000
--- a/libs/libzmq/src/devpoll.cpp
+++ /dev/null
@@ -1,208 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "devpoll.hpp"
-#if defined ZMQ_IOTHREAD_POLLER_USE_DEVPOLL
-
-#include <sys/devpoll.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <limits.h>
-#include <algorithm>
-
-#include "devpoll.hpp"
-#include "err.hpp"
-#include "config.hpp"
-#include "i_poll_events.hpp"
-
-zmq::devpoll_t::devpoll_t (const zmq::thread_ctx_t &ctx_) :
-    worker_poller_base_t (ctx_)
-{
-    devpoll_fd = open ("/dev/poll", O_RDWR);
-    errno_assert (devpoll_fd != -1);
-}
-
-zmq::devpoll_t::~devpoll_t ()
-{
-    //  Wait till the worker thread exits.
-    stop_worker ();
-
-    close (devpoll_fd);
-}
-
-void zmq::devpoll_t::devpoll_ctl (fd_t fd_, short events_)
-{
-    struct pollfd pfd = {fd_, events_, 0};
-    ssize_t rc = write (devpoll_fd, &pfd, sizeof pfd);
-    zmq_assert (rc == sizeof pfd);
-}
-
-zmq::devpoll_t::handle_t zmq::devpoll_t::add_fd (fd_t fd_,
-                                                 i_poll_events *reactor_)
-{
-    check_thread ();
-    //  If the file descriptor table is too small expand it.
-    fd_table_t::size_type sz = fd_table.size ();
-    if (sz <= (fd_table_t::size_type) fd_) {
-        fd_table.resize (fd_ + 1);
-        while (sz != (fd_table_t::size_type) (fd_ + 1)) {
-            fd_table[sz].valid = false;
-            ++sz;
-        }
-    }
-
-    zmq_assert (!fd_table[fd_].valid);
-
-    fd_table[fd_].events = 0;
-    fd_table[fd_].reactor = reactor_;
-    fd_table[fd_].valid = true;
-    fd_table[fd_].accepted = false;
-
-    devpoll_ctl (fd_, 0);
-    pending_list.push_back (fd_);
-
-    //  Increase the load metric of the thread.
-    adjust_load (1);
-
-    return fd_;
-}
-
-void zmq::devpoll_t::rm_fd (handle_t handle_)
-{
-    check_thread ();
-    zmq_assert (fd_table[handle_].valid);
-
-    devpoll_ctl (handle_, POLLREMOVE);
-    fd_table[handle_].valid = false;
-
-    //  Decrease the load metric of the thread.
-    adjust_load (-1);
-}
-
-void zmq::devpoll_t::set_pollin (handle_t handle_)
-{
-    check_thread ();
-    devpoll_ctl (handle_, POLLREMOVE);
-    fd_table[handle_].events |= POLLIN;
-    devpoll_ctl (handle_, fd_table[handle_].events);
-}
-
-void zmq::devpoll_t::reset_pollin (handle_t handle_)
-{
-    check_thread ();
-    devpoll_ctl (handle_, POLLREMOVE);
-    fd_table[handle_].events &= ~((short) POLLIN);
-    devpoll_ctl (handle_, fd_table[handle_].events);
-}
-
-void zmq::devpoll_t::set_pollout (handle_t handle_)
-{
-    check_thread ();
-    devpoll_ctl (handle_, POLLREMOVE);
-    fd_table[handle_].events |= POLLOUT;
-    devpoll_ctl (handle_, fd_table[handle_].events);
-}
-
-void zmq::devpoll_t::reset_pollout (handle_t handle_)
-{
-    check_thread ();
-    devpoll_ctl (handle_, POLLREMOVE);
-    fd_table[handle_].events &= ~((short) POLLOUT);
-    devpoll_ctl (handle_, fd_table[handle_].events);
-}
-
-void zmq::devpoll_t::stop ()
-{
-    check_thread ();
-}
-
-int zmq::devpoll_t::max_fds ()
-{
-    return -1;
-}
-
-void zmq::devpoll_t::loop ()
-{
-    while (true) {
-        struct pollfd ev_buf[max_io_events];
-        struct dvpoll poll_req;
-
-        for (pending_list_t::size_type i = 0; i < pending_list.size (); i++)
-            fd_table[pending_list[i]].accepted = true;
-        pending_list.clear ();
-
-        //  Execute any due timers.
-        int timeout = (int) execute_timers ();
-
-        if (get_load () == 0) {
-            if (timeout == 0)
-                break;
-
-            // TODO sleep for timeout
-            continue;
-        }
-
-        //  Wait for events.
-        //  On Solaris, we can retrieve no more then (OPEN_MAX - 1) events.
-        poll_req.dp_fds = &ev_buf[0];
-#if defined ZMQ_HAVE_SOLARIS
-        poll_req.dp_nfds = std::min ((int) max_io_events, OPEN_MAX - 1);
-#else
-        poll_req.dp_nfds = max_io_events;
-#endif
-        poll_req.dp_timeout = timeout ? timeout : -1;
-        int n = ioctl (devpoll_fd, DP_POLL, &poll_req);
-        if (n == -1 && errno == EINTR)
-            continue;
-        errno_assert (n != -1);
-
-        for (int i = 0; i < n; i++) {
-            fd_entry_t *fd_ptr = &fd_table[ev_buf[i].fd];
-            if (!fd_ptr->valid || !fd_ptr->accepted)
-                continue;
-            if (ev_buf[i].revents & (POLLERR | POLLHUP))
-                fd_ptr->reactor->in_event ();
-            if (!fd_ptr->valid || !fd_ptr->accepted)
-                continue;
-            if (ev_buf[i].revents & POLLOUT)
-                fd_ptr->reactor->out_event ();
-            if (!fd_ptr->valid || !fd_ptr->accepted)
-                continue;
-            if (ev_buf[i].revents & POLLIN)
-                fd_ptr->reactor->in_event ();
-        }
-    }
-}
-
-#endif
diff --git a/libs/libzmq/src/devpoll.hpp b/libs/libzmq/src/devpoll.hpp
deleted file mode 100644
index e57814b..0000000
--- a/libs/libzmq/src/devpoll.hpp
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_DEVPOLL_HPP_INCLUDED__
-#define __ZMQ_DEVPOLL_HPP_INCLUDED__
-
-//  poller.hpp decides which polling mechanism to use.
-#include "poller.hpp"
-#if defined ZMQ_IOTHREAD_POLLER_USE_DEVPOLL
-
-#include <vector>
-
-#include "ctx.hpp"
-#include "fd.hpp"
-#include "thread.hpp"
-#include "poller_base.hpp"
-
-namespace zmq
-{
-struct i_poll_events;
-
-//  Implements socket polling mechanism using the "/dev/poll" interface.
-
-class devpoll_t ZMQ_FINAL : public worker_poller_base_t
-{
-  public:
-    typedef fd_t handle_t;
-
-    devpoll_t (const thread_ctx_t &ctx_);
-    ~devpoll_t () ZMQ_FINAL;
-
-    //  "poller" concept.
-    handle_t add_fd (fd_t fd_, zmq::i_poll_events *events_);
-    void rm_fd (handle_t handle_);
-    void set_pollin (handle_t handle_);
-    void reset_pollin (handle_t handle_);
-    void set_pollout (handle_t handle_);
-    void reset_pollout (handle_t handle_);
-    void stop ();
-
-    static int max_fds ();
-
-  private:
-    //  Main event loop.
-    void loop () ZMQ_FINAL;
-
-    //  File descriptor referring to "/dev/poll" pseudo-device.
-    fd_t devpoll_fd;
-
-    struct fd_entry_t
-    {
-        short events;
-        zmq::i_poll_events *reactor;
-        bool valid;
-        bool accepted;
-    };
-
-    typedef std::vector<fd_entry_t> fd_table_t;
-    fd_table_t fd_table;
-
-    typedef std::vector<fd_t> pending_list_t;
-    pending_list_t pending_list;
-
-    //  Pollset manipulation function.
-    void devpoll_ctl (fd_t fd_, short events_);
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (devpoll_t)
-};
-
-typedef devpoll_t poller_t;
-}
-
-#endif
-
-#endif
diff --git a/libs/libzmq/src/dgram.cpp b/libs/libzmq/src/dgram.cpp
deleted file mode 100644
index 2cca4af..0000000
--- a/libs/libzmq/src/dgram.cpp
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
-    Copyright (c) 2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "macros.hpp"
-#include "dgram.hpp"
-#include "pipe.hpp"
-#include "wire.hpp"
-#include "random.hpp"
-#include "likely.hpp"
-#include "err.hpp"
-
-zmq::dgram_t::dgram_t (class ctx_t *parent_, uint32_t tid_, int sid_) :
-    socket_base_t (parent_, tid_, sid_), _pipe (NULL), _more_out (false)
-{
-    options.type = ZMQ_DGRAM;
-    options.raw_socket = true;
-}
-
-zmq::dgram_t::~dgram_t ()
-{
-    zmq_assert (!_pipe);
-}
-
-void zmq::dgram_t::xattach_pipe (pipe_t *pipe_,
-                                 bool subscribe_to_all_,
-                                 bool locally_initiated_)
-{
-    LIBZMQ_UNUSED (subscribe_to_all_);
-    LIBZMQ_UNUSED (locally_initiated_);
-
-    zmq_assert (pipe_);
-
-    //  ZMQ_DGRAM socket can only be connected to a single peer.
-    //  The socket rejects any further connection requests.
-    if (_pipe == NULL)
-        _pipe = pipe_;
-    else
-        pipe_->terminate (false);
-}
-
-void zmq::dgram_t::xpipe_terminated (pipe_t *pipe_)
-{
-    if (pipe_ == _pipe) {
-        _pipe = NULL;
-    }
-}
-
-void zmq::dgram_t::xread_activated (pipe_t *)
-{
-    //  There's just one pipe. No lists of active and inactive pipes.
-    //  There's nothing to do here.
-}
-
-void zmq::dgram_t::xwrite_activated (pipe_t *)
-{
-    //  There's just one pipe. No lists of active and inactive pipes.
-    //  There's nothing to do here.
-}
-
-int zmq::dgram_t::xsend (msg_t *msg_)
-{
-    // If there's no out pipe, just drop it.
-    if (!_pipe) {
-        const int rc = msg_->close ();
-        errno_assert (rc == 0);
-        return -1;
-    }
-
-    //  If this is the first part of the message it's the ID of the
-    //  peer to send the message to.
-    if (!_more_out) {
-        if (!(msg_->flags () & msg_t::more)) {
-            errno = EINVAL;
-            return -1;
-        }
-    } else {
-        //  dgram messages are two part only, reject part if more is set
-        if (msg_->flags () & msg_t::more) {
-            errno = EINVAL;
-            return -1;
-        }
-    }
-
-    // Push the message into the pipe.
-    if (!_pipe->write (msg_)) {
-        errno = EAGAIN;
-        return -1;
-    }
-
-    if (!(msg_->flags () & msg_t::more))
-        _pipe->flush ();
-
-    // flip the more flag
-    _more_out = !_more_out;
-
-    //  Detach the message from the data buffer.
-    const int rc = msg_->init ();
-    errno_assert (rc == 0);
-
-    return 0;
-}
-
-int zmq::dgram_t::xrecv (msg_t *msg_)
-{
-    //  Deallocate old content of the message.
-    int rc = msg_->close ();
-    errno_assert (rc == 0);
-
-    if (!_pipe || !_pipe->read (msg_)) {
-        //  Initialise the output parameter to be a 0-byte message.
-        rc = msg_->init ();
-        errno_assert (rc == 0);
-
-        errno = EAGAIN;
-        return -1;
-    }
-
-    return 0;
-}
-
-bool zmq::dgram_t::xhas_in ()
-{
-    if (!_pipe)
-        return false;
-
-    return _pipe->check_read ();
-}
-
-bool zmq::dgram_t::xhas_out ()
-{
-    if (!_pipe)
-        return false;
-
-    return _pipe->check_write ();
-}
diff --git a/libs/libzmq/src/dgram.hpp b/libs/libzmq/src/dgram.hpp
deleted file mode 100644
index d84dac6..0000000
--- a/libs/libzmq/src/dgram.hpp
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
-    Copyright (c) 2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_DGRAM_HPP_INCLUDED__
-#define __ZMQ_DGRAM_HPP_INCLUDED__
-
-#include "blob.hpp"
-#include "socket_base.hpp"
-#include "session_base.hpp"
-
-namespace zmq
-{
-class ctx_t;
-class msg_t;
-class pipe_t;
-class io_thread_t;
-
-class dgram_t ZMQ_FINAL : public socket_base_t
-{
-  public:
-    dgram_t (zmq::ctx_t *parent_, uint32_t tid_, int sid_);
-    ~dgram_t ();
-
-    //  Overrides of functions from socket_base_t.
-    void xattach_pipe (zmq::pipe_t *pipe_,
-                       bool subscribe_to_all_,
-                       bool locally_initiated_);
-    int xsend (zmq::msg_t *msg_);
-    int xrecv (zmq::msg_t *msg_);
-    bool xhas_in ();
-    bool xhas_out ();
-    void xread_activated (zmq::pipe_t *pipe_);
-    void xwrite_activated (zmq::pipe_t *pipe_);
-    void xpipe_terminated (zmq::pipe_t *pipe_);
-
-  private:
-    zmq::pipe_t *_pipe;
-
-    //  If true, more outgoing message parts are expected.
-    bool _more_out;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (dgram_t)
-};
-}
-
-#endif
diff --git a/libs/libzmq/src/dish.cpp b/libs/libzmq/src/dish.cpp
deleted file mode 100644
index 0e881b0..0000000
--- a/libs/libzmq/src/dish.cpp
+++ /dev/null
@@ -1,349 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include <string.h>
-
-#include "macros.hpp"
-#include "dish.hpp"
-#include "err.hpp"
-
-zmq::dish_t::dish_t (class ctx_t *parent_, uint32_t tid_, int sid_) :
-    socket_base_t (parent_, tid_, sid_, true), _has_message (false)
-{
-    options.type = ZMQ_DISH;
-
-    //  When socket is being closed down we don't want to wait till pending
-    //  subscription commands are sent to the wire.
-    options.linger.store (0);
-
-    const int rc = _message.init ();
-    errno_assert (rc == 0);
-}
-
-zmq::dish_t::~dish_t ()
-{
-    const int rc = _message.close ();
-    errno_assert (rc == 0);
-}
-
-void zmq::dish_t::xattach_pipe (pipe_t *pipe_,
-                                bool subscribe_to_all_,
-                                bool locally_initiated_)
-{
-    LIBZMQ_UNUSED (subscribe_to_all_);
-    LIBZMQ_UNUSED (locally_initiated_);
-
-    zmq_assert (pipe_);
-    _fq.attach (pipe_);
-    _dist.attach (pipe_);
-
-    //  Send all the cached subscriptions to the new upstream peer.
-    send_subscriptions (pipe_);
-}
-
-void zmq::dish_t::xread_activated (pipe_t *pipe_)
-{
-    _fq.activated (pipe_);
-}
-
-void zmq::dish_t::xwrite_activated (pipe_t *pipe_)
-{
-    _dist.activated (pipe_);
-}
-
-void zmq::dish_t::xpipe_terminated (pipe_t *pipe_)
-{
-    _fq.pipe_terminated (pipe_);
-    _dist.pipe_terminated (pipe_);
-}
-
-void zmq::dish_t::xhiccuped (pipe_t *pipe_)
-{
-    //  Send all the cached subscriptions to the hiccuped pipe.
-    send_subscriptions (pipe_);
-}
-
-int zmq::dish_t::xjoin (const char *group_)
-{
-    const std::string group = std::string (group_);
-
-    if (group.length () > ZMQ_GROUP_MAX_LENGTH) {
-        errno = EINVAL;
-        return -1;
-    }
-
-    //  User cannot join same group twice
-    if (!_subscriptions.insert (group).second) {
-        errno = EINVAL;
-        return -1;
-    }
-
-    msg_t msg;
-    int rc = msg.init_join ();
-    errno_assert (rc == 0);
-
-    rc = msg.set_group (group_);
-    errno_assert (rc == 0);
-
-    int err = 0;
-    rc = _dist.send_to_all (&msg);
-    if (rc != 0)
-        err = errno;
-    const int rc2 = msg.close ();
-    errno_assert (rc2 == 0);
-    if (rc != 0)
-        errno = err;
-    return rc;
-}
-
-int zmq::dish_t::xleave (const char *group_)
-{
-    const std::string group = std::string (group_);
-
-    if (group.length () > ZMQ_GROUP_MAX_LENGTH) {
-        errno = EINVAL;
-        return -1;
-    }
-
-    if (0 == _subscriptions.erase (group)) {
-        errno = EINVAL;
-        return -1;
-    }
-
-    msg_t msg;
-    int rc = msg.init_leave ();
-    errno_assert (rc == 0);
-
-    rc = msg.set_group (group_);
-    errno_assert (rc == 0);
-
-    int err = 0;
-    rc = _dist.send_to_all (&msg);
-    if (rc != 0)
-        err = errno;
-    const int rc2 = msg.close ();
-    errno_assert (rc2 == 0);
-    if (rc != 0)
-        errno = err;
-    return rc;
-}
-
-int zmq::dish_t::xsend (msg_t *msg_)
-{
-    LIBZMQ_UNUSED (msg_);
-    errno = ENOTSUP;
-    return -1;
-}
-
-bool zmq::dish_t::xhas_out ()
-{
-    //  Subscription can be added/removed anytime.
-    return true;
-}
-
-int zmq::dish_t::xrecv (msg_t *msg_)
-{
-    //  If there's already a message prepared by a previous call to zmq_poll,
-    //  return it straight ahead.
-    if (_has_message) {
-        const int rc = msg_->move (_message);
-        errno_assert (rc == 0);
-        _has_message = false;
-        return 0;
-    }
-
-    return xxrecv (msg_);
-}
-
-int zmq::dish_t::xxrecv (msg_t *msg_)
-{
-    do {
-        //  Get a message using fair queueing algorithm.
-        const int rc = _fq.recv (msg_);
-
-        //  If there's no message available, return immediately.
-        //  The same when error occurs.
-        if (rc != 0)
-            return -1;
-
-        //  Skip non matching messages
-    } while (0 == _subscriptions.count (std::string (msg_->group ())));
-
-    //  Found a matching message
-    return 0;
-}
-
-bool zmq::dish_t::xhas_in ()
-{
-    //  If there's already a message prepared by a previous call to zmq_poll,
-    //  return straight ahead.
-    if (_has_message)
-        return true;
-
-    const int rc = xxrecv (&_message);
-    if (rc != 0) {
-        errno_assert (errno == EAGAIN);
-        return false;
-    }
-
-    //  Matching message found
-    _has_message = true;
-    return true;
-}
-
-void zmq::dish_t::send_subscriptions (pipe_t *pipe_)
-{
-    for (subscriptions_t::iterator it = _subscriptions.begin (),
-                                   end = _subscriptions.end ();
-         it != end; ++it) {
-        msg_t msg;
-        int rc = msg.init_join ();
-        errno_assert (rc == 0);
-
-        rc = msg.set_group (it->c_str ());
-        errno_assert (rc == 0);
-
-        //  Send it to the pipe.
-        pipe_->write (&msg);
-    }
-
-    pipe_->flush ();
-}
-
-zmq::dish_session_t::dish_session_t (io_thread_t *io_thread_,
-                                     bool connect_,
-                                     socket_base_t *socket_,
-                                     const options_t &options_,
-                                     address_t *addr_) :
-    session_base_t (io_thread_, connect_, socket_, options_, addr_),
-    _state (group)
-{
-}
-
-zmq::dish_session_t::~dish_session_t ()
-{
-}
-
-int zmq::dish_session_t::push_msg (msg_t *msg_)
-{
-    if (_state == group) {
-        if ((msg_->flags () & msg_t::more) != msg_t::more) {
-            errno = EFAULT;
-            return -1;
-        }
-
-        if (msg_->size () > ZMQ_GROUP_MAX_LENGTH) {
-            errno = EFAULT;
-            return -1;
-        }
-
-        _group_msg = *msg_;
-        _state = body;
-
-        const int rc = msg_->init ();
-        errno_assert (rc == 0);
-        return 0;
-    }
-    const char *group_setting = msg_->group ();
-    int rc;
-    if (group_setting[0] != 0)
-        goto has_group;
-
-    //  Set the message group
-    rc = msg_->set_group (static_cast<char *> (_group_msg.data ()),
-                          _group_msg.size ());
-    errno_assert (rc == 0);
-
-    //  We set the group, so we don't need the group_msg anymore
-    rc = _group_msg.close ();
-    errno_assert (rc == 0);
-has_group:
-    //  Thread safe socket doesn't support multipart messages
-    if ((msg_->flags () & msg_t::more) == msg_t::more) {
-        errno = EFAULT;
-        return -1;
-    }
-
-    //  Push message to dish socket
-    rc = session_base_t::push_msg (msg_);
-
-    if (rc == 0)
-        _state = group;
-
-    return rc;
-}
-
-int zmq::dish_session_t::pull_msg (msg_t *msg_)
-{
-    int rc = session_base_t::pull_msg (msg_);
-
-    if (rc != 0)
-        return rc;
-
-    if (!msg_->is_join () && !msg_->is_leave ())
-        return rc;
-
-    const int group_length = static_cast<int> (strlen (msg_->group ()));
-
-    msg_t command;
-    int offset;
-
-    if (msg_->is_join ()) {
-        rc = command.init_size (group_length + 5);
-        errno_assert (rc == 0);
-        offset = 5;
-        memcpy (command.data (), "\4JOIN", 5);
-    } else {
-        rc = command.init_size (group_length + 6);
-        errno_assert (rc == 0);
-        offset = 6;
-        memcpy (command.data (), "\5LEAVE", 6);
-    }
-
-    command.set_flags (msg_t::command);
-    char *command_data = static_cast<char *> (command.data ());
-
-    //  Copy the group
-    memcpy (command_data + offset, msg_->group (), group_length);
-
-    //  Close the join message
-    rc = msg_->close ();
-    errno_assert (rc == 0);
-
-    *msg_ = command;
-
-    return 0;
-}
-
-void zmq::dish_session_t::reset ()
-{
-    session_base_t::reset ();
-    _state = group;
-}
diff --git a/libs/libzmq/src/dish.hpp b/libs/libzmq/src/dish.hpp
deleted file mode 100644
index c41ca92..0000000
--- a/libs/libzmq/src/dish.hpp
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_DISH_HPP_INCLUDED__
-#define __ZMQ_DISH_HPP_INCLUDED__
-
-#include <string>
-
-#include "socket_base.hpp"
-#include "session_base.hpp"
-#include "dist.hpp"
-#include "fq.hpp"
-#include "msg.hpp"
-
-namespace zmq
-{
-class ctx_t;
-class pipe_t;
-class io_thread_t;
-
-class dish_t ZMQ_FINAL : public socket_base_t
-{
-  public:
-    dish_t (zmq::ctx_t *parent_, uint32_t tid_, int sid_);
-    ~dish_t ();
-
-  protected:
-    //  Overrides of functions from socket_base_t.
-    void xattach_pipe (zmq::pipe_t *pipe_,
-                       bool subscribe_to_all_,
-                       bool locally_initiated_);
-    int xsend (zmq::msg_t *msg_);
-    bool xhas_out ();
-    int xrecv (zmq::msg_t *msg_);
-    bool xhas_in ();
-    void xread_activated (zmq::pipe_t *pipe_);
-    void xwrite_activated (zmq::pipe_t *pipe_);
-    void xhiccuped (pipe_t *pipe_);
-    void xpipe_terminated (zmq::pipe_t *pipe_);
-    int xjoin (const char *group_);
-    int xleave (const char *group_);
-
-  private:
-    int xxrecv (zmq::msg_t *msg_);
-
-    //  Send subscriptions to a pipe
-    void send_subscriptions (pipe_t *pipe_);
-
-    //  Fair queueing object for inbound pipes.
-    fq_t _fq;
-
-    //  Object for distributing the subscriptions upstream.
-    dist_t _dist;
-
-    //  The repository of subscriptions.
-    typedef std::set<std::string> subscriptions_t;
-    subscriptions_t _subscriptions;
-
-    //  If true, 'message' contains a matching message to return on the
-    //  next recv call.
-    bool _has_message;
-    msg_t _message;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (dish_t)
-};
-
-class dish_session_t ZMQ_FINAL : public session_base_t
-{
-  public:
-    dish_session_t (zmq::io_thread_t *io_thread_,
-                    bool connect_,
-                    zmq::socket_base_t *socket_,
-                    const options_t &options_,
-                    address_t *addr_);
-    ~dish_session_t ();
-
-    //  Overrides of the functions from session_base_t.
-    int push_msg (msg_t *msg_);
-    int pull_msg (msg_t *msg_);
-    void reset ();
-
-  private:
-    enum
-    {
-        group,
-        body
-    } _state;
-
-    msg_t _group_msg;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (dish_session_t)
-};
-}
-
-#endif
diff --git a/libs/libzmq/src/dist.cpp b/libs/libzmq/src/dist.cpp
deleted file mode 100644
index cb11bf8..0000000
--- a/libs/libzmq/src/dist.cpp
+++ /dev/null
@@ -1,246 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "dist.hpp"
-#include "pipe.hpp"
-#include "err.hpp"
-#include "msg.hpp"
-#include "likely.hpp"
-
-zmq::dist_t::dist_t () :
-    _matching (0), _active (0), _eligible (0), _more (false)
-{
-}
-
-zmq::dist_t::~dist_t ()
-{
-    zmq_assert (_pipes.empty ());
-}
-
-void zmq::dist_t::attach (pipe_t *pipe_)
-{
-    //  If we are in the middle of sending a message, we'll add new pipe
-    //  into the list of eligible pipes. Otherwise we add it to the list
-    //  of active pipes.
-    if (_more) {
-        _pipes.push_back (pipe_);
-        _pipes.swap (_eligible, _pipes.size () - 1);
-        _eligible++;
-    } else {
-        _pipes.push_back (pipe_);
-        _pipes.swap (_active, _pipes.size () - 1);
-        _active++;
-        _eligible++;
-    }
-}
-
-bool zmq::dist_t::has_pipe (pipe_t *pipe_)
-{
-    std::size_t claimed_index = _pipes.index (pipe_);
-
-    // If pipe claims to be outside the available index space it can't be in the distributor.
-    if (claimed_index >= _pipes.size ()) {
-        return false;
-    }
-
-    return _pipes[claimed_index] == pipe_;
-}
-
-void zmq::dist_t::match (pipe_t *pipe_)
-{
-    //  If pipe is already matching do nothing.
-    if (_pipes.index (pipe_) < _matching)
-        return;
-
-    //  If the pipe isn't eligible, ignore it.
-    if (_pipes.index (pipe_) >= _eligible)
-        return;
-
-    //  Mark the pipe as matching.
-    _pipes.swap (_pipes.index (pipe_), _matching);
-    _matching++;
-}
-
-void zmq::dist_t::reverse_match ()
-{
-    const pipes_t::size_type prev_matching = _matching;
-
-    // Reset matching to 0
-    unmatch ();
-
-    // Mark all matching pipes as not matching and vice-versa.
-    // To do this, push all pipes that are eligible but not
-    // matched - i.e. between "matching" and "eligible" -
-    // to the beginning of the queue.
-    for (pipes_t::size_type i = prev_matching; i < _eligible; ++i) {
-        _pipes.swap (i, _matching++);
-    }
-}
-
-void zmq::dist_t::unmatch ()
-{
-    _matching = 0;
-}
-
-void zmq::dist_t::pipe_terminated (pipe_t *pipe_)
-{
-    //  Remove the pipe from the list; adjust number of matching, active and/or
-    //  eligible pipes accordingly.
-    if (_pipes.index (pipe_) < _matching) {
-        _pipes.swap (_pipes.index (pipe_), _matching - 1);
-        _matching--;
-    }
-    if (_pipes.index (pipe_) < _active) {
-        _pipes.swap (_pipes.index (pipe_), _active - 1);
-        _active--;
-    }
-    if (_pipes.index (pipe_) < _eligible) {
-        _pipes.swap (_pipes.index (pipe_), _eligible - 1);
-        _eligible--;
-    }
-
-    _pipes.erase (pipe_);
-}
-
-void zmq::dist_t::activated (pipe_t *pipe_)
-{
-    //  Move the pipe from passive to eligible state.
-    if (_eligible < _pipes.size ()) {
-        _pipes.swap (_pipes.index (pipe_), _eligible);
-        _eligible++;
-    }
-
-    //  If there's no message being sent at the moment, move it to
-    //  the active state.
-    if (!_more && _active < _pipes.size ()) {
-        _pipes.swap (_eligible - 1, _active);
-        _active++;
-    }
-}
-
-int zmq::dist_t::send_to_all (msg_t *msg_)
-{
-    _matching = _active;
-    return send_to_matching (msg_);
-}
-
-int zmq::dist_t::send_to_matching (msg_t *msg_)
-{
-    //  Is this end of a multipart message?
-    const bool msg_more = (msg_->flags () & msg_t::more) != 0;
-
-    //  Push the message to matching pipes.
-    distribute (msg_);
-
-    //  If multipart message is fully sent, activate all the eligible pipes.
-    if (!msg_more)
-        _active = _eligible;
-
-    _more = msg_more;
-
-    return 0;
-}
-
-void zmq::dist_t::distribute (msg_t *msg_)
-{
-    //  If there are no matching pipes available, simply drop the message.
-    if (_matching == 0) {
-        int rc = msg_->close ();
-        errno_assert (rc == 0);
-        rc = msg_->init ();
-        errno_assert (rc == 0);
-        return;
-    }
-
-    if (msg_->is_vsm ()) {
-        for (pipes_t::size_type i = 0; i < _matching;) {
-            if (!write (_pipes[i], msg_)) {
-                //  Use same index again because entry will have been removed.
-            } else {
-                ++i;
-            }
-        }
-        int rc = msg_->init ();
-        errno_assert (rc == 0);
-        return;
-    }
-
-    //  Add matching-1 references to the message. We already hold one reference,
-    //  that's why -1.
-    msg_->add_refs (static_cast<int> (_matching) - 1);
-
-    //  Push copy of the message to each matching pipe.
-    int failed = 0;
-    for (pipes_t::size_type i = 0; i < _matching;) {
-        if (!write (_pipes[i], msg_)) {
-            ++failed;
-            //  Use same index again because entry will have been removed.
-        } else {
-            ++i;
-        }
-    }
-    if (unlikely (failed))
-        msg_->rm_refs (failed);
-
-    //  Detach the original message from the data buffer. Note that we don't
-    //  close the message. That's because we've already used all the references.
-    const int rc = msg_->init ();
-    errno_assert (rc == 0);
-}
-
-bool zmq::dist_t::has_out ()
-{
-    return true;
-}
-
-bool zmq::dist_t::write (pipe_t *pipe_, msg_t *msg_)
-{
-    if (!pipe_->write (msg_)) {
-        _pipes.swap (_pipes.index (pipe_), _matching - 1);
-        _matching--;
-        _pipes.swap (_pipes.index (pipe_), _active - 1);
-        _active--;
-        _pipes.swap (_active, _eligible - 1);
-        _eligible--;
-        return false;
-    }
-    if (!(msg_->flags () & msg_t::more))
-        pipe_->flush ();
-    return true;
-}
-
-bool zmq::dist_t::check_hwm ()
-{
-    for (pipes_t::size_type i = 0; i < _matching; ++i)
-        if (!_pipes[i]->check_hwm ())
-            return false;
-
-    return true;
-}
diff --git a/libs/libzmq/src/dist.hpp b/libs/libzmq/src/dist.hpp
deleted file mode 100644
index a5926cf..0000000
--- a/libs/libzmq/src/dist.hpp
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_DIST_HPP_INCLUDED__
-#define __ZMQ_DIST_HPP_INCLUDED__
-
-#include <vector>
-
-#include "array.hpp"
-#include "macros.hpp"
-
-namespace zmq
-{
-class pipe_t;
-class msg_t;
-
-//  Class manages a set of outbound pipes. It sends each messages to
-//  each of them.
-class dist_t
-{
-  public:
-    dist_t ();
-    ~dist_t ();
-
-    //  Adds the pipe to the distributor object.
-    void attach (zmq::pipe_t *pipe_);
-
-    //  Checks if this pipe is present in the distributor.
-    bool has_pipe (zmq::pipe_t *pipe_);
-
-    //  Activates pipe that have previously reached high watermark.
-    void activated (zmq::pipe_t *pipe_);
-
-    //  Mark the pipe as matching. Subsequent call to send_to_matching
-    //  will send message also to this pipe.
-    void match (zmq::pipe_t *pipe_);
-
-    //  Marks all pipes that are not matched as matched and vice-versa.
-    void reverse_match ();
-
-    //  Mark all pipes as non-matching.
-    void unmatch ();
-
-    //  Removes the pipe from the distributor object.
-    void pipe_terminated (zmq::pipe_t *pipe_);
-
-    //  Send the message to the matching outbound pipes.
-    int send_to_matching (zmq::msg_t *msg_);
-
-    //  Send the message to all the outbound pipes.
-    int send_to_all (zmq::msg_t *msg_);
-
-    static bool has_out ();
-
-    // check HWM of all pipes matching
-    bool check_hwm ();
-
-  private:
-    //  Write the message to the pipe. Make the pipe inactive if writing
-    //  fails. In such a case false is returned.
-    bool write (zmq::pipe_t *pipe_, zmq::msg_t *msg_);
-
-    //  Put the message to all active pipes.
-    void distribute (zmq::msg_t *msg_);
-
-    //  List of outbound pipes.
-    typedef array_t<zmq::pipe_t, 2> pipes_t;
-    pipes_t _pipes;
-
-    //  Number of all the pipes to send the next message to.
-    pipes_t::size_type _matching;
-
-    //  Number of active pipes. All the active pipes are located at the
-    //  beginning of the pipes array. These are the pipes the messages
-    //  can be sent to at the moment.
-    pipes_t::size_type _active;
-
-    //  Number of pipes eligible for sending messages to. This includes all
-    //  the active pipes plus all the pipes that we can in theory send
-    //  messages to (the HWM is not yet reached), but sending a message
-    //  to them would result in partial message being delivered, ie. message
-    //  with initial parts missing.
-    pipes_t::size_type _eligible;
-
-    //  True if last we are in the middle of a multipart message.
-    bool _more;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (dist_t)
-};
-}
-
-#endif
diff --git a/libs/libzmq/src/encoder.hpp b/libs/libzmq/src/encoder.hpp
deleted file mode 100644
index 84ffe32..0000000
--- a/libs/libzmq/src/encoder.hpp
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_ENCODER_HPP_INCLUDED__
-#define __ZMQ_ENCODER_HPP_INCLUDED__
-
-#if defined(_MSC_VER)
-#ifndef NOMINMAX
-#define NOMINMAX
-#endif
-#endif
-
-#include <stddef.h>
-#include <string.h>
-#include <stdlib.h>
-#include <algorithm>
-
-#include "err.hpp"
-#include "i_encoder.hpp"
-#include "msg.hpp"
-
-namespace zmq
-{
-//  Helper base class for encoders. It implements the state machine that
-//  fills the outgoing buffer. Derived classes should implement individual
-//  state machine actions.
-
-template <typename T> class encoder_base_t : public i_encoder
-{
-  public:
-    explicit encoder_base_t (size_t bufsize_) :
-        _write_pos (0),
-        _to_write (0),
-        _next (NULL),
-        _new_msg_flag (false),
-        _buf_size (bufsize_),
-        _buf (static_cast<unsigned char *> (malloc (bufsize_))),
-        _in_progress (NULL)
-    {
-        alloc_assert (_buf);
-    }
-
-    ~encoder_base_t () ZMQ_OVERRIDE { free (_buf); }
-
-    //  The function returns a batch of binary data. The data
-    //  are filled to a supplied buffer. If no buffer is supplied (data_
-    //  points to NULL) decoder object will provide buffer of its own.
-    size_t encode (unsigned char **data_, size_t size_) ZMQ_FINAL
-    {
-        unsigned char *buffer = !*data_ ? _buf : *data_;
-        const size_t buffersize = !*data_ ? _buf_size : size_;
-
-        if (in_progress () == NULL)
-            return 0;
-
-        size_t pos = 0;
-        while (pos < buffersize) {
-            //  If there are no more data to return, run the state machine.
-            //  If there are still no data, return what we already have
-            //  in the buffer.
-            if (!_to_write) {
-                if (_new_msg_flag) {
-                    int rc = _in_progress->close ();
-                    errno_assert (rc == 0);
-                    rc = _in_progress->init ();
-                    errno_assert (rc == 0);
-                    _in_progress = NULL;
-                    break;
-                }
-                (static_cast<T *> (this)->*_next) ();
-            }
-
-            //  If there are no data in the buffer yet and we are able to
-            //  fill whole buffer in a single go, let's use zero-copy.
-            //  There's no disadvantage to it as we cannot stuck multiple
-            //  messages into the buffer anyway. Note that subsequent
-            //  write(s) are non-blocking, thus each single write writes
-            //  at most SO_SNDBUF bytes at once not depending on how large
-            //  is the chunk returned from here.
-            //  As a consequence, large messages being sent won't block
-            //  other engines running in the same I/O thread for excessive
-            //  amounts of time.
-            if (!pos && !*data_ && _to_write >= buffersize) {
-                *data_ = _write_pos;
-                pos = _to_write;
-                _write_pos = NULL;
-                _to_write = 0;
-                return pos;
-            }
-
-            //  Copy data to the buffer. If the buffer is full, return.
-            const size_t to_copy = std::min (_to_write, buffersize - pos);
-            memcpy (buffer + pos, _write_pos, to_copy);
-            pos += to_copy;
-            _write_pos += to_copy;
-            _to_write -= to_copy;
-        }
-
-        *data_ = buffer;
-        return pos;
-    }
-
-    void load_msg (msg_t *msg_) ZMQ_FINAL
-    {
-        zmq_assert (in_progress () == NULL);
-        _in_progress = msg_;
-        (static_cast<T *> (this)->*_next) ();
-    }
-
-  protected:
-    //  Prototype of state machine action.
-    typedef void (T::*step_t) ();
-
-    //  This function should be called from derived class to write the data
-    //  to the buffer and schedule next state machine action.
-    void next_step (void *write_pos_,
-                    size_t to_write_,
-                    step_t next_,
-                    bool new_msg_flag_)
-    {
-        _write_pos = static_cast<unsigned char *> (write_pos_);
-        _to_write = to_write_;
-        _next = next_;
-        _new_msg_flag = new_msg_flag_;
-    }
-
-    msg_t *in_progress () { return _in_progress; }
-
-  private:
-    //  Where to get the data to write from.
-    unsigned char *_write_pos;
-
-    //  How much data to write before next step should be executed.
-    size_t _to_write;
-
-    //  Next step. If set to NULL, it means that associated data stream
-    //  is dead.
-    step_t _next;
-
-    bool _new_msg_flag;
-
-    //  The buffer for encoded data.
-    const size_t _buf_size;
-    unsigned char *const _buf;
-
-    msg_t *_in_progress;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (encoder_base_t)
-};
-}
-
-#endif
diff --git a/libs/libzmq/src/endpoint.cpp b/libs/libzmq/src/endpoint.cpp
deleted file mode 100644
index c9ad6d6..0000000
--- a/libs/libzmq/src/endpoint.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "endpoint.hpp"
-
-zmq::endpoint_uri_pair_t
-zmq::make_unconnected_connect_endpoint_pair (const std::string &endpoint_)
-{
-    return endpoint_uri_pair_t (std::string (), endpoint_,
-                                endpoint_type_connect);
-}
-
-zmq::endpoint_uri_pair_t
-zmq::make_unconnected_bind_endpoint_pair (const std::string &endpoint_)
-{
-    return endpoint_uri_pair_t (endpoint_, std::string (), endpoint_type_bind);
-}
diff --git a/libs/libzmq/src/endpoint.hpp b/libs/libzmq/src/endpoint.hpp
deleted file mode 100644
index e1b5fff..0000000
--- a/libs/libzmq/src/endpoint.hpp
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_ENDPOINT_HPP_INCLUDED__
-#define __ZMQ_ENDPOINT_HPP_INCLUDED__
-
-#include <string>
-
-namespace zmq
-{
-enum endpoint_type_t
-{
-    endpoint_type_none,   // a connection-less endpoint
-    endpoint_type_bind,   // a connection-oriented bind endpoint
-    endpoint_type_connect // a connection-oriented connect endpoint
-};
-
-struct endpoint_uri_pair_t
-{
-    endpoint_uri_pair_t () : local_type (endpoint_type_none) {}
-    endpoint_uri_pair_t (const std::string &local,
-                         const std::string &remote,
-                         endpoint_type_t local_type) :
-        local (local), remote (remote), local_type (local_type)
-    {
-    }
-
-    const std::string &identifier () const
-    {
-        return local_type == endpoint_type_bind ? local : remote;
-    }
-
-    std::string local, remote;
-    endpoint_type_t local_type;
-};
-
-endpoint_uri_pair_t
-make_unconnected_connect_endpoint_pair (const std::string &endpoint_);
-
-endpoint_uri_pair_t
-make_unconnected_bind_endpoint_pair (const std::string &endpoint_);
-}
-
-#endif
diff --git a/libs/libzmq/src/epoll.cpp b/libs/libzmq/src/epoll.cpp
deleted file mode 100644
index 03642cf..0000000
--- a/libs/libzmq/src/epoll.cpp
+++ /dev/null
@@ -1,222 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#if defined ZMQ_IOTHREAD_POLLER_USE_EPOLL
-#include "epoll.hpp"
-
-#if !defined ZMQ_HAVE_WINDOWS
-#include <unistd.h>
-#endif
-
-#include <stdlib.h>
-#include <string.h>
-#include <signal.h>
-#include <algorithm>
-#include <new>
-
-#include "macros.hpp"
-#include "err.hpp"
-#include "config.hpp"
-#include "i_poll_events.hpp"
-
-#ifdef ZMQ_HAVE_WINDOWS
-const zmq::epoll_t::epoll_fd_t zmq::epoll_t::epoll_retired_fd =
-  INVALID_HANDLE_VALUE;
-#endif
-
-zmq::epoll_t::epoll_t (const zmq::thread_ctx_t &ctx_) :
-    worker_poller_base_t (ctx_)
-{
-#ifdef ZMQ_IOTHREAD_POLLER_USE_EPOLL_CLOEXEC
-    //  Setting this option result in sane behaviour when exec() functions
-    //  are used. Old sockets are closed and don't block TCP ports, avoid
-    //  leaks, etc.
-    _epoll_fd = epoll_create1 (EPOLL_CLOEXEC);
-#else
-    _epoll_fd = epoll_create (1);
-#endif
-    errno_assert (_epoll_fd != epoll_retired_fd);
-}
-
-zmq::epoll_t::~epoll_t ()
-{
-    //  Wait till the worker thread exits.
-    stop_worker ();
-
-#ifdef ZMQ_HAVE_WINDOWS
-    epoll_close (_epoll_fd);
-#else
-    close (_epoll_fd);
-#endif
-    for (retired_t::iterator it = _retired.begin (), end = _retired.end ();
-         it != end; ++it) {
-        LIBZMQ_DELETE (*it);
-    }
-}
-
-zmq::epoll_t::handle_t zmq::epoll_t::add_fd (fd_t fd_, i_poll_events *events_)
-{
-    check_thread ();
-    poll_entry_t *pe = new (std::nothrow) poll_entry_t;
-    alloc_assert (pe);
-
-    //  The memset is not actually needed. It's here to prevent debugging
-    //  tools to complain about using uninitialised memory.
-    memset (pe, 0, sizeof (poll_entry_t));
-
-    pe->fd = fd_;
-    pe->ev.events = 0;
-    pe->ev.data.ptr = pe;
-    pe->events = events_;
-
-    const int rc = epoll_ctl (_epoll_fd, EPOLL_CTL_ADD, fd_, &pe->ev);
-    errno_assert (rc != -1);
-
-    //  Increase the load metric of the thread.
-    adjust_load (1);
-
-    return pe;
-}
-
-void zmq::epoll_t::rm_fd (handle_t handle_)
-{
-    check_thread ();
-    poll_entry_t *pe = static_cast<poll_entry_t *> (handle_);
-    const int rc = epoll_ctl (_epoll_fd, EPOLL_CTL_DEL, pe->fd, &pe->ev);
-    errno_assert (rc != -1);
-    pe->fd = retired_fd;
-    _retired.push_back (pe);
-
-    //  Decrease the load metric of the thread.
-    adjust_load (-1);
-}
-
-void zmq::epoll_t::set_pollin (handle_t handle_)
-{
-    check_thread ();
-    poll_entry_t *pe = static_cast<poll_entry_t *> (handle_);
-    pe->ev.events |= EPOLLIN;
-    const int rc = epoll_ctl (_epoll_fd, EPOLL_CTL_MOD, pe->fd, &pe->ev);
-    errno_assert (rc != -1);
-}
-
-void zmq::epoll_t::reset_pollin (handle_t handle_)
-{
-    check_thread ();
-    poll_entry_t *pe = static_cast<poll_entry_t *> (handle_);
-    pe->ev.events &= ~(static_cast<uint32_t> (EPOLLIN));
-    const int rc = epoll_ctl (_epoll_fd, EPOLL_CTL_MOD, pe->fd, &pe->ev);
-    errno_assert (rc != -1);
-}
-
-void zmq::epoll_t::set_pollout (handle_t handle_)
-{
-    check_thread ();
-    poll_entry_t *pe = static_cast<poll_entry_t *> (handle_);
-    pe->ev.events |= EPOLLOUT;
-    const int rc = epoll_ctl (_epoll_fd, EPOLL_CTL_MOD, pe->fd, &pe->ev);
-    errno_assert (rc != -1);
-}
-
-void zmq::epoll_t::reset_pollout (handle_t handle_)
-{
-    check_thread ();
-    poll_entry_t *pe = static_cast<poll_entry_t *> (handle_);
-    pe->ev.events &= ~(static_cast<uint32_t> (EPOLLOUT));
-    const int rc = epoll_ctl (_epoll_fd, EPOLL_CTL_MOD, pe->fd, &pe->ev);
-    errno_assert (rc != -1);
-}
-
-void zmq::epoll_t::stop ()
-{
-    check_thread ();
-}
-
-int zmq::epoll_t::max_fds ()
-{
-    return -1;
-}
-
-void zmq::epoll_t::loop ()
-{
-    epoll_event ev_buf[max_io_events];
-
-    while (true) {
-        //  Execute any due timers.
-        const int timeout = static_cast<int> (execute_timers ());
-
-        if (get_load () == 0) {
-            if (timeout == 0)
-                break;
-
-            // TODO sleep for timeout
-            continue;
-        }
-
-        //  Wait for events.
-        const int n = epoll_wait (_epoll_fd, &ev_buf[0], max_io_events,
-                                  timeout ? timeout : -1);
-        if (n == -1) {
-            errno_assert (errno == EINTR);
-            continue;
-        }
-
-        for (int i = 0; i < n; i++) {
-            const poll_entry_t *const pe =
-              static_cast<const poll_entry_t *> (ev_buf[i].data.ptr);
-
-            if (NULL == pe)
-                continue;
-            if (NULL == pe->events)
-                continue;
-            if (pe->fd == retired_fd)
-                continue;
-            if (ev_buf[i].events & (EPOLLERR | EPOLLHUP))
-                pe->events->in_event ();
-            if (pe->fd == retired_fd)
-                continue;
-            if (ev_buf[i].events & EPOLLOUT)
-                pe->events->out_event ();
-            if (pe->fd == retired_fd)
-                continue;
-            if (ev_buf[i].events & EPOLLIN)
-                pe->events->in_event ();
-        }
-
-        //  Destroy retired event sources.
-        for (retired_t::iterator it = _retired.begin (), end = _retired.end ();
-             it != end; ++it) {
-            LIBZMQ_DELETE (*it);
-        }
-        _retired.clear ();
-    }
-}
-
-#endif
diff --git a/libs/libzmq/src/epoll.hpp b/libs/libzmq/src/epoll.hpp
deleted file mode 100644
index 636b59c..0000000
--- a/libs/libzmq/src/epoll.hpp
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_EPOLL_HPP_INCLUDED__
-#define __ZMQ_EPOLL_HPP_INCLUDED__
-
-//  poller.hpp decides which polling mechanism to use.
-#include "poller.hpp"
-#if defined ZMQ_IOTHREAD_POLLER_USE_EPOLL
-
-#include <vector>
-
-#if defined ZMQ_HAVE_WINDOWS
-#include "../external/wepoll/wepoll.h"
-#else
-#include <sys/epoll.h>
-#endif
-
-#include "ctx.hpp"
-#include "fd.hpp"
-#include "thread.hpp"
-#include "poller_base.hpp"
-#include "mutex.hpp"
-
-namespace zmq
-{
-struct i_poll_events;
-
-//  This class implements socket polling mechanism using the Linux-specific
-//  epoll mechanism.
-
-class epoll_t ZMQ_FINAL : public worker_poller_base_t
-{
-  public:
-    typedef void *handle_t;
-
-    epoll_t (const thread_ctx_t &ctx_);
-    ~epoll_t () ZMQ_OVERRIDE;
-
-    //  "poller" concept.
-    handle_t add_fd (fd_t fd_, zmq::i_poll_events *events_);
-    void rm_fd (handle_t handle_);
-    void set_pollin (handle_t handle_);
-    void reset_pollin (handle_t handle_);
-    void set_pollout (handle_t handle_);
-    void reset_pollout (handle_t handle_);
-    void stop ();
-
-    static int max_fds ();
-
-  private:
-#if defined ZMQ_HAVE_WINDOWS
-    typedef HANDLE epoll_fd_t;
-    static const epoll_fd_t epoll_retired_fd;
-#else
-    typedef fd_t epoll_fd_t;
-    enum
-    {
-        epoll_retired_fd = retired_fd
-    };
-#endif
-
-    //  Main event loop.
-    void loop () ZMQ_OVERRIDE;
-
-    //  Main epoll file descriptor
-    epoll_fd_t _epoll_fd;
-
-    struct poll_entry_t
-    {
-        fd_t fd;
-        epoll_event ev;
-        zmq::i_poll_events *events;
-    };
-
-    //  List of retired event sources.
-    typedef std::vector<poll_entry_t *> retired_t;
-    retired_t _retired;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (epoll_t)
-};
-
-typedef epoll_t poller_t;
-}
-
-#endif
-
-#endif
diff --git a/libs/libzmq/src/err.cpp b/libs/libzmq/src/err.cpp
deleted file mode 100644
index ea2a9b5..0000000
--- a/libs/libzmq/src/err.cpp
+++ /dev/null
@@ -1,453 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "err.hpp"
-#include "macros.hpp"
-
-const char *zmq::errno_to_string (int errno_)
-{
-    switch (errno_) {
-#if defined ZMQ_HAVE_WINDOWS
-        case ENOTSUP:
-            return "Not supported";
-        case EPROTONOSUPPORT:
-            return "Protocol not supported";
-        case ENOBUFS:
-            return "No buffer space available";
-        case ENETDOWN:
-            return "Network is down";
-        case EADDRINUSE:
-            return "Address in use";
-        case EADDRNOTAVAIL:
-            return "Address not available";
-        case ECONNREFUSED:
-            return "Connection refused";
-        case EINPROGRESS:
-            return "Operation in progress";
-#endif
-        case EFSM:
-            return "Operation cannot be accomplished in current state";
-        case ENOCOMPATPROTO:
-            return "The protocol is not compatible with the socket type";
-        case ETERM:
-            return "Context was terminated";
-        case EMTHREAD:
-            return "No thread available";
-        case EHOSTUNREACH:
-            return "Host unreachable";
-        default:
-#if defined _MSC_VER
-#pragma warning(push)
-#pragma warning(disable : 4996)
-#endif
-            return strerror (errno_);
-#if defined _MSC_VER
-#pragma warning(pop)
-#endif
-    }
-}
-
-void zmq::zmq_abort (const char *errmsg_)
-{
-#if defined ZMQ_HAVE_WINDOWS
-
-    //  Raise STATUS_FATAL_APP_EXIT.
-    ULONG_PTR extra_info[1];
-    extra_info[0] = (ULONG_PTR) errmsg_;
-    RaiseException (0x40000015, EXCEPTION_NONCONTINUABLE, 1, extra_info);
-#else
-    LIBZMQ_UNUSED (errmsg_);
-    print_backtrace ();
-    abort ();
-#endif
-}
-
-#ifdef ZMQ_HAVE_WINDOWS
-
-const char *zmq::wsa_error ()
-{
-    return wsa_error_no (WSAGetLastError (), NULL);
-}
-
-const char *zmq::wsa_error_no (int no_, const char *wsae_wouldblock_string_)
-{
-    //  TODO:  It seems that list of Windows socket errors is longer than this.
-    //         Investigate whether there's a way to convert it into the string
-    //         automatically (wsaError->HRESULT->string?).
-    switch (no_) {
-        case WSABASEERR:
-            return "No Error";
-        case WSAEINTR:
-            return "Interrupted system call";
-        case WSAEBADF:
-            return "Bad file number";
-        case WSAEACCES:
-            return "Permission denied";
-        case WSAEFAULT:
-            return "Bad address";
-        case WSAEINVAL:
-            return "Invalid argument";
-        case WSAEMFILE:
-            return "Too many open files";
-        case WSAEWOULDBLOCK:
-            return wsae_wouldblock_string_;
-        case WSAEINPROGRESS:
-            return "Operation now in progress";
-        case WSAEALREADY:
-            return "Operation already in progress";
-        case WSAENOTSOCK:
-            return "Socket operation on non-socket";
-        case WSAEDESTADDRREQ:
-            return "Destination address required";
-        case WSAEMSGSIZE:
-            return "Message too long";
-        case WSAEPROTOTYPE:
-            return "Protocol wrong type for socket";
-        case WSAENOPROTOOPT:
-            return "Bas protocol option";
-        case WSAEPROTONOSUPPORT:
-            return "Protocol not supported";
-        case WSAESOCKTNOSUPPORT:
-            return "Socket type not supported";
-        case WSAEOPNOTSUPP:
-            return "Operation not supported on socket";
-        case WSAEPFNOSUPPORT:
-            return "Protocol family not supported";
-        case WSAEAFNOSUPPORT:
-            return "Address family not supported by protocol family";
-        case WSAEADDRINUSE:
-            return "Address already in use";
-        case WSAEADDRNOTAVAIL:
-            return "Can't assign requested address";
-        case WSAENETDOWN:
-            return "Network is down";
-        case WSAENETUNREACH:
-            return "Network is unreachable";
-        case WSAENETRESET:
-            return "Net dropped connection or reset";
-        case WSAECONNABORTED:
-            return "Software caused connection abort";
-        case WSAECONNRESET:
-            return "Connection reset by peer";
-        case WSAENOBUFS:
-            return "No buffer space available";
-        case WSAEISCONN:
-            return "Socket is already connected";
-        case WSAENOTCONN:
-            return "Socket is not connected";
-        case WSAESHUTDOWN:
-            return "Can't send after socket shutdown";
-        case WSAETOOMANYREFS:
-            return "Too many references can't splice";
-        case WSAETIMEDOUT:
-            return "Connection timed out";
-        case WSAECONNREFUSED:
-            return "Connection refused";
-        case WSAELOOP:
-            return "Too many levels of symbolic links";
-        case WSAENAMETOOLONG:
-            return "File name too long";
-        case WSAEHOSTDOWN:
-            return "Host is down";
-        case WSAEHOSTUNREACH:
-            return "No Route to Host";
-        case WSAENOTEMPTY:
-            return "Directory not empty";
-        case WSAEPROCLIM:
-            return "Too many processes";
-        case WSAEUSERS:
-            return "Too many users";
-        case WSAEDQUOT:
-            return "Disc Quota Exceeded";
-        case WSAESTALE:
-            return "Stale NFS file handle";
-        case WSAEREMOTE:
-            return "Too many levels of remote in path";
-        case WSASYSNOTREADY:
-            return "Network SubSystem is unavailable";
-        case WSAVERNOTSUPPORTED:
-            return "WINSOCK DLL Version out of range";
-        case WSANOTINITIALISED:
-            return "Successful WSASTARTUP not yet performed";
-        case WSAHOST_NOT_FOUND:
-            return "Host not found";
-        case WSATRY_AGAIN:
-            return "Non-Authoritative Host not found";
-        case WSANO_RECOVERY:
-            return "Non-Recoverable errors: FORMERR REFUSED NOTIMP";
-        case WSANO_DATA:
-            return "Valid name no data record of requested";
-        default:
-            return "error not defined";
-    }
-}
-
-void zmq::win_error (char *buffer_, size_t buffer_size_)
-{
-    const DWORD errcode = GetLastError ();
-#if defined _WIN32_WCE
-    DWORD rc = FormatMessageW (
-      FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL, errcode,
-      MAKELANGID (LANG_NEUTRAL, SUBLANG_DEFAULT), (LPWSTR) buffer_,
-      buffer_size_ / sizeof (wchar_t), NULL);
-#else
-    const DWORD rc = FormatMessageA (
-      FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL, errcode,
-      MAKELANGID (LANG_NEUTRAL, SUBLANG_DEFAULT), buffer_,
-      static_cast<DWORD> (buffer_size_), NULL);
-#endif
-    zmq_assert (rc);
-}
-
-int zmq::wsa_error_to_errno (int errcode_)
-{
-    switch (errcode_) {
-            //  10004 - Interrupted system call.
-        case WSAEINTR:
-            return EINTR;
-            //  10009 - File handle is not valid.
-        case WSAEBADF:
-            return EBADF;
-            //  10013 - Permission denied.
-        case WSAEACCES:
-            return EACCES;
-            //  10014 - Bad address.
-        case WSAEFAULT:
-            return EFAULT;
-            //  10022 - Invalid argument.
-        case WSAEINVAL:
-            return EINVAL;
-            //  10024 - Too many open files.
-        case WSAEMFILE:
-            return EMFILE;
-            //  10035 - Operation would block.
-        case WSAEWOULDBLOCK:
-            return EBUSY;
-            //  10036 - Operation now in progress.
-        case WSAEINPROGRESS:
-            return EAGAIN;
-            //  10037 - Operation already in progress.
-        case WSAEALREADY:
-            return EAGAIN;
-            //  10038 - Socket operation on non-socket.
-        case WSAENOTSOCK:
-            return ENOTSOCK;
-            //  10039 - Destination address required.
-        case WSAEDESTADDRREQ:
-            return EFAULT;
-            //  10040 - Message too long.
-        case WSAEMSGSIZE:
-            return EMSGSIZE;
-            //  10041 - Protocol wrong type for socket.
-        case WSAEPROTOTYPE:
-            return EFAULT;
-            //  10042 - Bad protocol option.
-        case WSAENOPROTOOPT:
-            return EINVAL;
-            //  10043 - Protocol not supported.
-        case WSAEPROTONOSUPPORT:
-            return EPROTONOSUPPORT;
-            //  10044 - Socket type not supported.
-        case WSAESOCKTNOSUPPORT:
-            return EFAULT;
-            //  10045 - Operation not supported on socket.
-        case WSAEOPNOTSUPP:
-            return EFAULT;
-            //  10046 - Protocol family not supported.
-        case WSAEPFNOSUPPORT:
-            return EPROTONOSUPPORT;
-            //  10047 - Address family not supported by protocol family.
-        case WSAEAFNOSUPPORT:
-            return EAFNOSUPPORT;
-            //  10048 - Address already in use.
-        case WSAEADDRINUSE:
-            return EADDRINUSE;
-            //  10049 - Cannot assign requested address.
-        case WSAEADDRNOTAVAIL:
-            return EADDRNOTAVAIL;
-            //  10050 - Network is down.
-        case WSAENETDOWN:
-            return ENETDOWN;
-            //  10051 - Network is unreachable.
-        case WSAENETUNREACH:
-            return ENETUNREACH;
-            //  10052 - Network dropped connection on reset.
-        case WSAENETRESET:
-            return ENETRESET;
-            //  10053 - Software caused connection abort.
-        case WSAECONNABORTED:
-            return ECONNABORTED;
-            //  10054 - Connection reset by peer.
-        case WSAECONNRESET:
-            return ECONNRESET;
-            //  10055 - No buffer space available.
-        case WSAENOBUFS:
-            return ENOBUFS;
-            //  10056 - Socket is already connected.
-        case WSAEISCONN:
-            return EFAULT;
-            //  10057 - Socket is not connected.
-        case WSAENOTCONN:
-            return ENOTCONN;
-            //  10058 - Can't send after socket shutdown.
-        case WSAESHUTDOWN:
-            return EFAULT;
-            //  10059 - Too many references can't splice.
-        case WSAETOOMANYREFS:
-            return EFAULT;
-            //  10060 - Connection timed out.
-        case WSAETIMEDOUT:
-            return ETIMEDOUT;
-            //  10061 - Connection refused.
-        case WSAECONNREFUSED:
-            return ECONNREFUSED;
-            //  10062 - Too many levels of symbolic links.
-        case WSAELOOP:
-            return EFAULT;
-            //  10063 - File name too long.
-        case WSAENAMETOOLONG:
-            return EFAULT;
-            //  10064 - Host is down.
-        case WSAEHOSTDOWN:
-            return EAGAIN;
-            //  10065 - No route to host.
-        case WSAEHOSTUNREACH:
-            return EHOSTUNREACH;
-            //  10066 - Directory not empty.
-        case WSAENOTEMPTY:
-            return EFAULT;
-            //  10067 - Too many processes.
-        case WSAEPROCLIM:
-            return EFAULT;
-            //  10068 - Too many users.
-        case WSAEUSERS:
-            return EFAULT;
-            //  10069 - Disc Quota Exceeded.
-        case WSAEDQUOT:
-            return EFAULT;
-            //  10070 - Stale NFS file handle.
-        case WSAESTALE:
-            return EFAULT;
-            //  10071 - Too many levels of remote in path.
-        case WSAEREMOTE:
-            return EFAULT;
-            //  10091 - Network SubSystem is unavailable.
-        case WSASYSNOTREADY:
-            return EFAULT;
-            //  10092 - WINSOCK DLL Version out of range.
-        case WSAVERNOTSUPPORTED:
-            return EFAULT;
-            //  10093 - Successful WSASTARTUP not yet performed.
-        case WSANOTINITIALISED:
-            return EFAULT;
-            //  11001 - Host not found.
-        case WSAHOST_NOT_FOUND:
-            return EFAULT;
-            //  11002 - Non-Authoritative Host not found.
-        case WSATRY_AGAIN:
-            return EFAULT;
-            //  11003 - Non-Recoverable errors: FORMERR REFUSED NOTIMP.
-        case WSANO_RECOVERY:
-            return EFAULT;
-            //  11004 - Valid name no data record of requested.
-        case WSANO_DATA:
-            return EFAULT;
-        default:
-            wsa_assert (false);
-    }
-    //  Not reachable
-    return 0;
-}
-
-#endif
-
-#if defined(HAVE_LIBUNWIND) && !defined(__SUNPRO_CC)
-
-#define UNW_LOCAL_ONLY
-#include <libunwind.h>
-#include <dlfcn.h>
-#include <cxxabi.h>
-#include "mutex.hpp"
-
-void zmq::print_backtrace (void)
-{
-    static zmq::mutex_t mtx;
-    mtx.lock ();
-    Dl_info dl_info;
-    unw_cursor_t cursor;
-    unw_context_t ctx;
-    unsigned frame_n = 0;
-
-    unw_getcontext (&ctx);
-    unw_init_local (&cursor, &ctx);
-
-    while (unw_step (&cursor) > 0) {
-        unw_word_t offset;
-        unw_proc_info_t p_info;
-        static const char unknown[] = "?";
-        const char *file_name;
-        char *demangled_name;
-        char func_name[256] = "";
-        void *addr;
-        int rc;
-
-        if (unw_get_proc_info (&cursor, &p_info))
-            break;
-
-        rc = unw_get_proc_name (&cursor, func_name, 256, &offset);
-        if (rc == -UNW_ENOINFO)
-            memcpy (func_name, unknown, sizeof unknown);
-
-        addr = (void *) (p_info.start_ip + offset);
-
-        if (dladdr (addr, &dl_info) && dl_info.dli_fname)
-            file_name = dl_info.dli_fname;
-        else
-            file_name = unknown;
-
-        demangled_name = abi::__cxa_demangle (func_name, NULL, NULL, &rc);
-
-        printf ("#%u  %p in %s (%s+0x%lx)\n", frame_n++, addr, file_name,
-                rc ? func_name : demangled_name, (unsigned long) offset);
-        free (demangled_name);
-    }
-    puts ("");
-
-    fflush (stdout);
-    mtx.unlock ();
-}
-
-#else
-
-void zmq::print_backtrace ()
-{
-}
-
-#endif
diff --git a/libs/libzmq/src/err.hpp b/libs/libzmq/src/err.hpp
deleted file mode 100644
index 3f3278f..0000000
--- a/libs/libzmq/src/err.hpp
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_ERR_HPP_INCLUDED__
-#define __ZMQ_ERR_HPP_INCLUDED__
-
-#include <assert.h>
-#if defined _WIN32_WCE
-#include "..\builds\msvc\errno.hpp"
-#else
-#include <errno.h>
-#endif
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
-
-#ifndef ZMQ_HAVE_WINDOWS
-#include <netdb.h>
-#endif
-
-#include "likely.hpp"
-
-//  0MQ-specific error codes are defined in zmq.h
-
-// EPROTO is not used by OpenBSD and maybe other platforms.
-#ifndef EPROTO
-#define EPROTO 0
-#endif
-
-namespace zmq
-{
-const char *errno_to_string (int errno_);
-#if defined __clang__
-#if __has_feature(attribute_analyzer_noreturn)
-void zmq_abort (const char *errmsg_) __attribute__ ((analyzer_noreturn));
-#else
-void zmq_abort (const char *errmsg_);
-#endif
-#elif defined __MSCVER__
-__declspec(noreturn) void zmq_abort (const char *errmsg_);
-#else
-void zmq_abort (const char *errmsg_);
-#endif
-void print_backtrace ();
-}
-
-#ifdef ZMQ_HAVE_WINDOWS
-
-namespace zmq
-{
-const char *wsa_error ();
-const char *
-wsa_error_no (int no_,
-              const char *wsae_wouldblock_string_ = "Operation would block");
-void win_error (char *buffer_, size_t buffer_size_);
-int wsa_error_to_errno (int errcode_);
-}
-
-//  Provides convenient way to check WSA-style errors on Windows.
-#define wsa_assert(x)                                                          \
-    do {                                                                       \
-        if (unlikely (!(x))) {                                                 \
-            const char *errstr = zmq::wsa_error ();                            \
-            if (errstr != NULL) {                                              \
-                fprintf (stderr, "Assertion failed: %s [%i] (%s:%d)\n",        \
-                         errstr, WSAGetLastError (), __FILE__, __LINE__);      \
-                fflush (stderr);                                               \
-                zmq::zmq_abort (errstr);                                       \
-            }                                                                  \
-        }                                                                      \
-    } while (false)
-
-//  Provides convenient way to assert on WSA-style errors on Windows.
-#define wsa_assert_no(no)                                                      \
-    do {                                                                       \
-        const char *errstr = zmq::wsa_error_no (no);                           \
-        if (errstr != NULL) {                                                  \
-            fprintf (stderr, "Assertion failed: %s (%s:%d)\n", errstr,         \
-                     __FILE__, __LINE__);                                      \
-            fflush (stderr);                                                   \
-            zmq::zmq_abort (errstr);                                           \
-        }                                                                      \
-    } while (false)
-
-// Provides convenient way to check GetLastError-style errors on Windows.
-#define win_assert(x)                                                          \
-    do {                                                                       \
-        if (unlikely (!(x))) {                                                 \
-            char errstr[256];                                                  \
-            zmq::win_error (errstr, 256);                                      \
-            fprintf (stderr, "Assertion failed: %s (%s:%d)\n", errstr,         \
-                     __FILE__, __LINE__);                                      \
-            fflush (stderr);                                                   \
-            zmq::zmq_abort (errstr);                                           \
-        }                                                                      \
-    } while (false)
-
-#endif
-
-//  This macro works in exactly the same way as the normal assert. It is used
-//  in its stead because standard assert on Win32 in broken - it prints nothing
-//  when used within the scope of JNI library.
-#define zmq_assert(x)                                                          \
-    do {                                                                       \
-        if (unlikely (!(x))) {                                                 \
-            fprintf (stderr, "Assertion failed: %s (%s:%d)\n", #x, __FILE__,   \
-                     __LINE__);                                                \
-            fflush (stderr);                                                   \
-            zmq::zmq_abort (#x);                                               \
-        }                                                                      \
-    } while (false)
-
-//  Provides convenient way to check for errno-style errors.
-#define errno_assert(x)                                                        \
-    do {                                                                       \
-        if (unlikely (!(x))) {                                                 \
-            const char *errstr = strerror (errno);                             \
-            fprintf (stderr, "%s (%s:%d)\n", errstr, __FILE__, __LINE__);      \
-            fflush (stderr);                                                   \
-            zmq::zmq_abort (errstr);                                           \
-        }                                                                      \
-    } while (false)
-
-//  Provides convenient way to check for POSIX errors.
-#define posix_assert(x)                                                        \
-    do {                                                                       \
-        if (unlikely (x)) {                                                    \
-            const char *errstr = strerror (x);                                 \
-            fprintf (stderr, "%s (%s:%d)\n", errstr, __FILE__, __LINE__);      \
-            fflush (stderr);                                                   \
-            zmq::zmq_abort (errstr);                                           \
-        }                                                                      \
-    } while (false)
-
-//  Provides convenient way to check for errors from getaddrinfo.
-#define gai_assert(x)                                                          \
-    do {                                                                       \
-        if (unlikely (x)) {                                                    \
-            const char *errstr = gai_strerror (x);                             \
-            fprintf (stderr, "%s (%s:%d)\n", errstr, __FILE__, __LINE__);      \
-            fflush (stderr);                                                   \
-            zmq::zmq_abort (errstr);                                           \
-        }                                                                      \
-    } while (false)
-
-//  Provides convenient way to check whether memory allocation have succeeded.
-#define alloc_assert(x)                                                        \
-    do {                                                                       \
-        if (unlikely (!x)) {                                                   \
-            fprintf (stderr, "FATAL ERROR: OUT OF MEMORY (%s:%d)\n", __FILE__, \
-                     __LINE__);                                                \
-            fflush (stderr);                                                   \
-            zmq::zmq_abort ("FATAL ERROR: OUT OF MEMORY");                     \
-        }                                                                      \
-    } while (false)
-
-#endif
diff --git a/libs/libzmq/src/fd.hpp b/libs/libzmq/src/fd.hpp
deleted file mode 100644
index 21925ae..0000000
--- a/libs/libzmq/src/fd.hpp
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_FD_HPP_INCLUDED__
-#define __ZMQ_FD_HPP_INCLUDED__
-
-#if defined _WIN32
-#include "windows.hpp"
-#endif
-
-namespace zmq
-{
-typedef zmq_fd_t fd_t;
-
-#ifdef ZMQ_HAVE_WINDOWS
-#if defined _MSC_VER && _MSC_VER <= 1400
-enum
-{
-    retired_fd = (fd_t) (~0)
-};
-#else
-enum
-#if _MSC_VER >= 1800
-  : fd_t
-#endif
-{
-    retired_fd = INVALID_SOCKET
-};
-#endif
-#else
-enum
-{
-    retired_fd = -1
-};
-#endif
-}
-#endif
diff --git a/libs/libzmq/src/fq.cpp b/libs/libzmq/src/fq.cpp
deleted file mode 100644
index d3dfeab..0000000
--- a/libs/libzmq/src/fq.cpp
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "fq.hpp"
-#include "pipe.hpp"
-#include "err.hpp"
-#include "msg.hpp"
-
-zmq::fq_t::fq_t () : _active (0), _current (0), _more (false)
-{
-}
-
-zmq::fq_t::~fq_t ()
-{
-    zmq_assert (_pipes.empty ());
-}
-
-void zmq::fq_t::attach (pipe_t *pipe_)
-{
-    _pipes.push_back (pipe_);
-    _pipes.swap (_active, _pipes.size () - 1);
-    _active++;
-}
-
-void zmq::fq_t::pipe_terminated (pipe_t *pipe_)
-{
-    const pipes_t::size_type index = _pipes.index (pipe_);
-
-    //  Remove the pipe from the list; adjust number of active pipes
-    //  accordingly.
-    if (index < _active) {
-        _active--;
-        _pipes.swap (index, _active);
-        if (_current == _active)
-            _current = 0;
-    }
-    _pipes.erase (pipe_);
-}
-
-void zmq::fq_t::activated (pipe_t *pipe_)
-{
-    //  Move the pipe to the list of active pipes.
-    _pipes.swap (_pipes.index (pipe_), _active);
-    _active++;
-}
-
-int zmq::fq_t::recv (msg_t *msg_)
-{
-    return recvpipe (msg_, NULL);
-}
-
-int zmq::fq_t::recvpipe (msg_t *msg_, pipe_t **pipe_)
-{
-    //  Deallocate old content of the message.
-    int rc = msg_->close ();
-    errno_assert (rc == 0);
-
-    //  Round-robin over the pipes to get the next message.
-    while (_active > 0) {
-        //  Try to fetch new message. If we've already read part of the message
-        //  subsequent part should be immediately available.
-        const bool fetched = _pipes[_current]->read (msg_);
-
-        //  Note that when message is not fetched, current pipe is deactivated
-        //  and replaced by another active pipe. Thus we don't have to increase
-        //  the 'current' pointer.
-        if (fetched) {
-            if (pipe_)
-                *pipe_ = _pipes[_current];
-            _more = (msg_->flags () & msg_t::more) != 0;
-            if (!_more) {
-                _current = (_current + 1) % _active;
-            }
-            return 0;
-        }
-
-        //  Check the atomicity of the message.
-        //  If we've already received the first part of the message
-        //  we should get the remaining parts without blocking.
-        zmq_assert (!_more);
-
-        _active--;
-        _pipes.swap (_current, _active);
-        if (_current == _active)
-            _current = 0;
-    }
-
-    //  No message is available. Initialise the output parameter
-    //  to be a 0-byte message.
-    rc = msg_->init ();
-    errno_assert (rc == 0);
-    errno = EAGAIN;
-    return -1;
-}
-
-bool zmq::fq_t::has_in ()
-{
-    //  There are subsequent parts of the partly-read message available.
-    if (_more)
-        return true;
-
-    //  Note that messing with current doesn't break the fairness of fair
-    //  queueing algorithm. If there are no messages available current will
-    //  get back to its original value. Otherwise it'll point to the first
-    //  pipe holding messages, skipping only pipes with no messages available.
-    while (_active > 0) {
-        if (_pipes[_current]->check_read ())
-            return true;
-
-        //  Deactivate the pipe.
-        _active--;
-        _pipes.swap (_current, _active);
-        if (_current == _active)
-            _current = 0;
-    }
-
-    return false;
-}
diff --git a/libs/libzmq/src/fq.hpp b/libs/libzmq/src/fq.hpp
deleted file mode 100644
index ed01912..0000000
--- a/libs/libzmq/src/fq.hpp
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_FQ_HPP_INCLUDED__
-#define __ZMQ_FQ_HPP_INCLUDED__
-
-#include "array.hpp"
-#include "blob.hpp"
-
-namespace zmq
-{
-class msg_t;
-class pipe_t;
-
-//  Class manages a set of inbound pipes. On receive it performs fair
-//  queueing so that senders gone berserk won't cause denial of
-//  service for decent senders.
-
-class fq_t
-{
-  public:
-    fq_t ();
-    ~fq_t ();
-
-    void attach (pipe_t *pipe_);
-    void activated (pipe_t *pipe_);
-    void pipe_terminated (pipe_t *pipe_);
-
-    int recv (msg_t *msg_);
-    int recvpipe (msg_t *msg_, pipe_t **pipe_);
-    bool has_in ();
-
-  private:
-    //  Inbound pipes.
-    typedef array_t<pipe_t, 1> pipes_t;
-    pipes_t _pipes;
-
-    //  Number of active pipes. All the active pipes are located at the
-    //  beginning of the pipes array.
-    pipes_t::size_type _active;
-
-    //  Index of the next bound pipe to read a message from.
-    pipes_t::size_type _current;
-
-    //  If true, part of a multipart message was already received, but
-    //  there are following parts still waiting in the current pipe.
-    bool _more;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (fq_t)
-};
-}
-
-#endif
diff --git a/libs/libzmq/src/gather.cpp b/libs/libzmq/src/gather.cpp
deleted file mode 100644
index 231e725..0000000
--- a/libs/libzmq/src/gather.cpp
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "macros.hpp"
-#include "gather.hpp"
-#include "err.hpp"
-#include "msg.hpp"
-#include "pipe.hpp"
-
-zmq::gather_t::gather_t (class ctx_t *parent_, uint32_t tid_, int sid_) :
-    socket_base_t (parent_, tid_, sid_, true)
-{
-    options.type = ZMQ_GATHER;
-}
-
-zmq::gather_t::~gather_t ()
-{
-}
-
-void zmq::gather_t::xattach_pipe (pipe_t *pipe_,
-                                  bool subscribe_to_all_,
-                                  bool locally_initiated_)
-{
-    LIBZMQ_UNUSED (subscribe_to_all_);
-    LIBZMQ_UNUSED (locally_initiated_);
-
-    zmq_assert (pipe_);
-    _fq.attach (pipe_);
-}
-
-void zmq::gather_t::xread_activated (pipe_t *pipe_)
-{
-    _fq.activated (pipe_);
-}
-
-void zmq::gather_t::xpipe_terminated (pipe_t *pipe_)
-{
-    _fq.pipe_terminated (pipe_);
-}
-
-int zmq::gather_t::xrecv (msg_t *msg_)
-{
-    int rc = _fq.recvpipe (msg_, NULL);
-
-    // Drop any messages with more flag
-    while (rc == 0 && msg_->flags () & msg_t::more) {
-        // drop all frames of the current multi-frame message
-        rc = _fq.recvpipe (msg_, NULL);
-
-        while (rc == 0 && msg_->flags () & msg_t::more)
-            rc = _fq.recvpipe (msg_, NULL);
-
-        // get the new message
-        if (rc == 0)
-            rc = _fq.recvpipe (msg_, NULL);
-    }
-
-    return rc;
-}
-
-bool zmq::gather_t::xhas_in ()
-{
-    return _fq.has_in ();
-}
diff --git a/libs/libzmq/src/gather.hpp b/libs/libzmq/src/gather.hpp
deleted file mode 100644
index f2de064..0000000
--- a/libs/libzmq/src/gather.hpp
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_GATHER_HPP_INCLUDED__
-#define __ZMQ_GATHER_HPP_INCLUDED__
-
-#include "socket_base.hpp"
-#include "fq.hpp"
-
-namespace zmq
-{
-class ctx_t;
-class pipe_t;
-class msg_t;
-
-class gather_t ZMQ_FINAL : public socket_base_t
-{
-  public:
-    gather_t (zmq::ctx_t *parent_, uint32_t tid_, int sid_);
-    ~gather_t ();
-
-  protected:
-    //  Overrides of functions from socket_base_t.
-    void xattach_pipe (zmq::pipe_t *pipe_,
-                       bool subscribe_to_all_,
-                       bool locally_initiated_);
-    int xrecv (zmq::msg_t *msg_);
-    bool xhas_in ();
-    void xread_activated (zmq::pipe_t *pipe_);
-    void xpipe_terminated (zmq::pipe_t *pipe_);
-
-  private:
-    //  Fair queueing object for inbound pipes.
-    fq_t _fq;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (gather_t)
-};
-}
-
-#endif
diff --git a/libs/libzmq/src/generic_mtrie.hpp b/libs/libzmq/src/generic_mtrie.hpp
deleted file mode 100644
index 15dfad6..0000000
--- a/libs/libzmq/src/generic_mtrie.hpp
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
-Copyright (c) 2018 Contributors as noted in the AUTHORS file
-
-This file is part of libzmq, the ZeroMQ core engine in C++.
-
-libzmq is free software; you can redistribute it and/or modify it under
-the terms of the GNU Lesser General Public License (LGPL) as published
-by the Free Software Foundation; either version 3 of the License, or
-(at your option) any later version.
-
-As a special exception, the Contributors give you permission to link
-this library with independent modules to produce an executable,
-regardless of the license terms of these independent modules, and to
-copy and distribute the resulting executable under terms of your choice,
-provided that you also meet, for each linked independent module, the
-terms and conditions of the license of that module. An independent
-module is a module which is not derived from or based on this library.
-If you modify this library, you must extend this exception to your
-version of the library.
-
-libzmq is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-License for more details.
-
-You should have received a copy of the GNU Lesser General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_GENERIC_MTRIE_HPP_INCLUDED__
-#define __ZMQ_GENERIC_MTRIE_HPP_INCLUDED__
-
-#include <stddef.h>
-#include <set>
-
-#include "macros.hpp"
-#include "stdint.hpp"
-
-namespace zmq
-{
-//  Multi-trie (prefix tree). Each node in the trie is a set of pointers.
-template <typename T> class generic_mtrie_t
-{
-  public:
-    typedef T value_t;
-    typedef const unsigned char *prefix_t;
-
-    enum rm_result
-    {
-        not_found,
-        last_value_removed,
-        values_remain
-    };
-
-    generic_mtrie_t ();
-    ~generic_mtrie_t ();
-
-    //  Add key to the trie. Returns true iff no entry with the same prefix_
-    //  and size_ existed before.
-    bool add (prefix_t prefix_, size_t size_, value_t *value_);
-
-    //  Remove all entries with a specific value from the trie.
-    //  The call_on_uniq_ flag controls if the callback is invoked
-    //  when there are no entries left on a prefix only (true)
-    //  or on every removal (false). The arg_ argument is passed
-    //  through to the callback function.
-    template <typename Arg>
-    void rm (value_t *value_,
-             void (*func_) (const unsigned char *data_, size_t size_, Arg arg_),
-             Arg arg_,
-             bool call_on_uniq_);
-
-    //  Removes a specific entry from the trie.
-    //  Returns the result of the operation.
-    rm_result rm (prefix_t prefix_, size_t size_, value_t *value_);
-
-    //  Calls a callback function for all matching entries, i.e. any node
-    //  corresponding to data_ or a prefix of it. The arg_ argument
-    //  is passed through to the callback function.
-    template <typename Arg>
-    void match (prefix_t data_,
-                size_t size_,
-                void (*func_) (value_t *value_, Arg arg_),
-                Arg arg_);
-
-  private:
-    bool is_redundant () const;
-
-    typedef std::set<value_t *> pipes_t;
-    pipes_t *_pipes;
-
-    unsigned char _min;
-    unsigned short _count;
-    unsigned short _live_nodes;
-    union _next_t
-    {
-        class generic_mtrie_t<value_t> *node;
-        class generic_mtrie_t<value_t> **table;
-    } _next;
-
-    struct iter
-    {
-        generic_mtrie_t<value_t> *node;
-        generic_mtrie_t<value_t> *next_node;
-        prefix_t prefix;
-        size_t size;
-        unsigned short current_child;
-        unsigned char new_min;
-        unsigned char new_max;
-        bool processed_for_removal;
-    };
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (generic_mtrie_t)
-};
-}
-
-#endif
diff --git a/libs/libzmq/src/generic_mtrie_impl.hpp b/libs/libzmq/src/generic_mtrie_impl.hpp
deleted file mode 100644
index 19f3694..0000000
--- a/libs/libzmq/src/generic_mtrie_impl.hpp
+++ /dev/null
@@ -1,590 +0,0 @@
-/*
-Copyright (c) 2018 Contributors as noted in the AUTHORS file
-
-This file is part of libzmq, the ZeroMQ core engine in C++.
-
-libzmq is free software; you can redistribute it and/or modify it under
-the terms of the GNU Lesser General Public License (LGPL) as published
-by the Free Software Foundation; either version 3 of the License, or
-(at your option) any later version.
-
-As a special exception, the Contributors give you permission to link
-this library with independent modules to produce an executable,
-regardless of the license terms of these independent modules, and to
-copy and distribute the resulting executable under terms of your choice,
-provided that you also meet, for each linked independent module, the
-terms and conditions of the license of that module. An independent
-module is a module which is not derived from or based on this library.
-If you modify this library, you must extend this exception to your
-version of the library.
-
-libzmq is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-License for more details.
-
-You should have received a copy of the GNU Lesser General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_GENERIC_MTRIE_IMPL_HPP_INCLUDED__
-#define __ZMQ_GENERIC_MTRIE_IMPL_HPP_INCLUDED__
-
-
-#include <stdlib.h>
-
-#include <new>
-#include <algorithm>
-#include <list>
-
-#include "err.hpp"
-#include "macros.hpp"
-#include "generic_mtrie.hpp"
-
-namespace zmq
-{
-template <typename T>
-generic_mtrie_t<T>::generic_mtrie_t () :
-    _pipes (0), _min (0), _count (0), _live_nodes (0)
-{
-}
-
-template <typename T> generic_mtrie_t<T>::~generic_mtrie_t ()
-{
-    LIBZMQ_DELETE (_pipes);
-
-    if (_count == 1) {
-        zmq_assert (_next.node);
-        LIBZMQ_DELETE (_next.node);
-    } else if (_count > 1) {
-        for (unsigned short i = 0; i != _count; ++i) {
-            LIBZMQ_DELETE (_next.table[i]);
-        }
-        free (_next.table);
-    }
-}
-
-template <typename T>
-bool generic_mtrie_t<T>::add (prefix_t prefix_, size_t size_, value_t *pipe_)
-{
-    generic_mtrie_t<value_t> *it = this;
-
-    while (size_) {
-        const unsigned char c = *prefix_;
-
-        if (c < it->_min || c >= it->_min + it->_count) {
-            //  The character is out of range of currently handled
-            //  characters. We have to extend the table.
-            if (!it->_count) {
-                it->_min = c;
-                it->_count = 1;
-                it->_next.node = NULL;
-            } else if (it->_count == 1) {
-                const unsigned char oldc = it->_min;
-                generic_mtrie_t *oldp = it->_next.node;
-                it->_count = (it->_min < c ? c - it->_min : it->_min - c) + 1;
-                it->_next.table = static_cast<generic_mtrie_t **> (
-                  malloc (sizeof (generic_mtrie_t *) * it->_count));
-                alloc_assert (it->_next.table);
-                for (unsigned short i = 0; i != it->_count; ++i)
-                    it->_next.table[i] = 0;
-                it->_min = std::min (it->_min, c);
-                it->_next.table[oldc - it->_min] = oldp;
-            } else if (it->_min < c) {
-                //  The new character is above the current character range.
-                const unsigned short old_count = it->_count;
-                it->_count = c - it->_min + 1;
-                it->_next.table = static_cast<generic_mtrie_t **> (realloc (
-                  it->_next.table, sizeof (generic_mtrie_t *) * it->_count));
-                alloc_assert (it->_next.table);
-                for (unsigned short i = old_count; i != it->_count; i++)
-                    it->_next.table[i] = NULL;
-            } else {
-                //  The new character is below the current character range.
-                const unsigned short old_count = it->_count;
-                it->_count = (it->_min + old_count) - c;
-                it->_next.table = static_cast<generic_mtrie_t **> (realloc (
-                  it->_next.table, sizeof (generic_mtrie_t *) * it->_count));
-                alloc_assert (it->_next.table);
-                memmove (it->_next.table + it->_min - c, it->_next.table,
-                         old_count * sizeof (generic_mtrie_t *));
-                for (unsigned short i = 0; i != it->_min - c; i++)
-                    it->_next.table[i] = NULL;
-                it->_min = c;
-            }
-        }
-
-        //  If next node does not exist, create one.
-        if (it->_count == 1) {
-            if (!it->_next.node) {
-                it->_next.node = new (std::nothrow) generic_mtrie_t;
-                alloc_assert (it->_next.node);
-                ++(it->_live_nodes);
-            }
-
-            ++prefix_;
-            --size_;
-            it = it->_next.node;
-        } else {
-            if (!it->_next.table[c - it->_min]) {
-                it->_next.table[c - it->_min] =
-                  new (std::nothrow) generic_mtrie_t;
-                alloc_assert (it->_next.table[c - it->_min]);
-                ++(it->_live_nodes);
-            }
-
-            ++prefix_;
-            --size_;
-            it = it->_next.table[c - it->_min];
-        }
-    }
-
-    //  We are at the node corresponding to the prefix. We are done.
-    const bool result = !it->_pipes;
-    if (!it->_pipes) {
-        it->_pipes = new (std::nothrow) pipes_t;
-        alloc_assert (it->_pipes);
-    }
-    it->_pipes->insert (pipe_);
-
-    return result;
-}
-
-template <typename T>
-template <typename Arg>
-void generic_mtrie_t<T>::rm (value_t *pipe_,
-                             void (*func_) (prefix_t data_,
-                                            size_t size_,
-                                            Arg arg_),
-                             Arg arg_,
-                             bool call_on_uniq_)
-{
-    //  This used to be implemented as a non-tail recursive traversal of the trie,
-    //  which means remote clients controlled the depth of the recursion and the
-    //  stack size.
-    //  To simulate the non-tail recursion, with post-recursion changes depending on
-    //  the result of the recursive call, a stack is used to re-visit the same node
-    //  and operate on it again after children have been visited.
-    //  A boolean is used to record whether the node had already been visited and to
-    //  determine if the pre- or post- children visit actions have to be taken.
-    //  In the case of a node with (N > 1) children, the node has to be re-visited
-    //  N times, in the correct order after each child visit.
-    std::list<struct iter> stack;
-    unsigned char *buff = NULL;
-    size_t maxbuffsize = 0;
-    struct iter it = {this, NULL, NULL, 0, 0, 0, 0, false};
-    stack.push_back (it);
-
-    while (!stack.empty ()) {
-        it = stack.back ();
-        stack.pop_back ();
-
-        if (!it.processed_for_removal) {
-            //  Remove the subscription from this node.
-            if (it.node->_pipes && it.node->_pipes->erase (pipe_)) {
-                if (!call_on_uniq_ || it.node->_pipes->empty ()) {
-                    func_ (buff, it.size, arg_);
-                }
-
-                if (it.node->_pipes->empty ()) {
-                    LIBZMQ_DELETE (it.node->_pipes);
-                }
-            }
-
-            //  Adjust the buffer.
-            if (it.size >= maxbuffsize) {
-                maxbuffsize = it.size + 256;
-                buff =
-                  static_cast<unsigned char *> (realloc (buff, maxbuffsize));
-                alloc_assert (buff);
-            }
-
-            switch (it.node->_count) {
-                case 0:
-                    //  If there are no subnodes in the trie, we are done with this node
-                    //  pre-processing.
-                    break;
-                case 1: {
-                    //  If there's one subnode (optimisation).
-
-                    buff[it.size] = it.node->_min;
-                    //  Mark this node as pre-processed and push it, so that the next
-                    //  visit after the operation on the child can do the removals.
-                    it.processed_for_removal = true;
-                    stack.push_back (it);
-                    struct iter next = {it.node->_next.node,
-                                        NULL,
-                                        NULL,
-                                        ++it.size,
-                                        0,
-                                        0,
-                                        0,
-                                        false};
-                    stack.push_back (next);
-                    break;
-                }
-                default: {
-                    //  If there are multiple subnodes.
-                    //  When first visiting this node, initialize the new_min/max parameters
-                    //  which will then be used after each child has been processed, on the
-                    //  post-children iterations.
-                    if (it.current_child == 0) {
-                        //  New min non-null character in the node table after the removal
-                        it.new_min = it.node->_min + it.node->_count - 1;
-                        //  New max non-null character in the node table after the removal
-                        it.new_max = it.node->_min;
-                    }
-
-                    //  Mark this node as pre-processed and push it, so that the next
-                    //  visit after the operation on the child can do the removals.
-                    buff[it.size] = it.node->_min + it.current_child;
-                    it.processed_for_removal = true;
-                    stack.push_back (it);
-                    if (it.node->_next.table[it.current_child]) {
-                        struct iter next = {
-                          it.node->_next.table[it.current_child],
-                          NULL,
-                          NULL,
-                          it.size + 1,
-                          0,
-                          0,
-                          0,
-                          false};
-                        stack.push_back (next);
-                    }
-                }
-            }
-        } else {
-            //  Reset back for the next time, in case this node doesn't get deleted.
-            //  This is done unconditionally, unlike when setting this variable to true.
-            it.processed_for_removal = false;
-
-            switch (it.node->_count) {
-                case 0:
-                    //  If there are no subnodes in the trie, we are done with this node
-                    //  post-processing.
-                    break;
-                case 1:
-                    //  If there's one subnode (optimisation).
-
-                    //  Prune the node if it was made redundant by the removal
-                    if (it.node->_next.node->is_redundant ()) {
-                        LIBZMQ_DELETE (it.node->_next.node);
-                        it.node->_count = 0;
-                        --it.node->_live_nodes;
-                        zmq_assert (it.node->_live_nodes == 0);
-                    }
-                    break;
-                default:
-                    //  If there are multiple subnodes.
-                    {
-                        if (it.node->_next.table[it.current_child]) {
-                            //  Prune redundant nodes from the mtrie
-                            if (it.node->_next.table[it.current_child]
-                                  ->is_redundant ()) {
-                                LIBZMQ_DELETE (
-                                  it.node->_next.table[it.current_child]);
-
-                                zmq_assert (it.node->_live_nodes > 0);
-                                --it.node->_live_nodes;
-                            } else {
-                                //  The node is not redundant, so it's a candidate for being
-                                //  the new min/max node.
-                                //
-                                //  We loop through the node array from left to right, so the
-                                //  first non-null, non-redundant node encountered is the new
-                                //  minimum index. Conversely, the last non-redundant, non-null
-                                //  node encountered is the new maximum index.
-                                if (it.current_child + it.node->_min
-                                    < it.new_min)
-                                    it.new_min =
-                                      it.current_child + it.node->_min;
-                                if (it.current_child + it.node->_min
-                                    > it.new_max)
-                                    it.new_max =
-                                      it.current_child + it.node->_min;
-                            }
-                        }
-
-                        //  If there are more children to visit, push again the current
-                        //  node, so that pre-processing can happen on the next child.
-                        //  If we are done, reset the child index so that the ::rm is
-                        //  fully idempotent.
-                        ++it.current_child;
-                        if (it.current_child >= it.node->_count)
-                            it.current_child = 0;
-                        else {
-                            stack.push_back (it);
-                            continue;
-                        }
-
-                        //  All children have been visited and removed if needed, and
-                        //  all pre- and post-visit operations have been carried.
-                        //  Resize/free the node table if needed.
-                        zmq_assert (it.node->_count > 1);
-
-                        //  Free the node table if it's no longer used.
-                        switch (it.node->_live_nodes) {
-                            case 0:
-                                free (it.node->_next.table);
-                                it.node->_next.table = NULL;
-                                it.node->_count = 0;
-                                break;
-                            case 1:
-                                //  Compact the node table if possible
-
-                                //  If there's only one live node in the table we can
-                                //  switch to using the more compact single-node
-                                //  representation
-                                zmq_assert (it.new_min == it.new_max);
-                                zmq_assert (it.new_min >= it.node->_min);
-                                zmq_assert (it.new_min
-                                            < it.node->_min + it.node->_count);
-                                {
-                                    generic_mtrie_t *node =
-                                      it.node->_next
-                                        .table[it.new_min - it.node->_min];
-                                    zmq_assert (node);
-                                    free (it.node->_next.table);
-                                    it.node->_next.node = node;
-                                }
-                                it.node->_count = 1;
-                                it.node->_min = it.new_min;
-                                break;
-                            default:
-                                if (it.new_min > it.node->_min
-                                    || it.new_max < it.node->_min
-                                                      + it.node->_count - 1) {
-                                    zmq_assert (it.new_max - it.new_min + 1
-                                                > 1);
-
-                                    generic_mtrie_t **old_table =
-                                      it.node->_next.table;
-                                    zmq_assert (it.new_min > it.node->_min
-                                                || it.new_max
-                                                     < it.node->_min
-                                                         + it.node->_count - 1);
-                                    zmq_assert (it.new_min >= it.node->_min);
-                                    zmq_assert (it.new_max
-                                                <= it.node->_min
-                                                     + it.node->_count - 1);
-                                    zmq_assert (it.new_max - it.new_min + 1
-                                                < it.node->_count);
-
-                                    it.node->_count =
-                                      it.new_max - it.new_min + 1;
-                                    it.node->_next.table =
-                                      static_cast<generic_mtrie_t **> (
-                                        malloc (sizeof (generic_mtrie_t *)
-                                                * it.node->_count));
-                                    alloc_assert (it.node->_next.table);
-
-                                    memmove (it.node->_next.table,
-                                             old_table
-                                               + (it.new_min - it.node->_min),
-                                             sizeof (generic_mtrie_t *)
-                                               * it.node->_count);
-                                    free (old_table);
-
-                                    it.node->_min = it.new_min;
-                                }
-                        }
-                    }
-            }
-        }
-    }
-
-    free (buff);
-}
-
-template <typename T>
-typename generic_mtrie_t<T>::rm_result
-generic_mtrie_t<T>::rm (prefix_t prefix_, size_t size_, value_t *pipe_)
-{
-    //  This used to be implemented as a non-tail recursive traversal of the trie,
-    //  which means remote clients controlled the depth of the recursion and the
-    //  stack size.
-    //  To simulate the non-tail recursion, with post-recursion changes depending on
-    //  the result of the recursive call, a stack is used to re-visit the same node
-    //  and operate on it again after children have been visited.
-    //  A boolean is used to record whether the node had already been visited and to
-    //  determine if the pre- or post- children visit actions have to be taken.
-    rm_result ret = not_found;
-    std::list<struct iter> stack;
-    struct iter it = {this, NULL, prefix_, size_, 0, 0, 0, false};
-    stack.push_back (it);
-
-    while (!stack.empty ()) {
-        it = stack.back ();
-        stack.pop_back ();
-
-        if (!it.processed_for_removal) {
-            if (!it.size) {
-                if (!it.node->_pipes) {
-                    ret = not_found;
-                    continue;
-                }
-
-                typename pipes_t::size_type erased =
-                  it.node->_pipes->erase (pipe_);
-                if (it.node->_pipes->empty ()) {
-                    zmq_assert (erased == 1);
-                    LIBZMQ_DELETE (it.node->_pipes);
-                    ret = last_value_removed;
-                    continue;
-                }
-
-                ret = (erased == 1) ? values_remain : not_found;
-                continue;
-            }
-
-            it.current_child = *it.prefix;
-            if (!it.node->_count || it.current_child < it.node->_min
-                || it.current_child >= it.node->_min + it.node->_count) {
-                ret = not_found;
-                continue;
-            }
-
-            it.next_node =
-              it.node->_count == 1
-                ? it.node->_next.node
-                : it.node->_next.table[it.current_child - it.node->_min];
-            if (!it.next_node) {
-                ret = not_found;
-                continue;
-            }
-
-            it.processed_for_removal = true;
-            stack.push_back (it);
-            struct iter next = {
-              it.next_node, NULL, it.prefix + 1, it.size - 1, 0, 0, 0, false};
-            stack.push_back (next);
-        } else {
-            it.processed_for_removal = false;
-
-            if (it.next_node->is_redundant ()) {
-                LIBZMQ_DELETE (it.next_node);
-                zmq_assert (it.node->_count > 0);
-
-                if (it.node->_count == 1) {
-                    it.node->_next.node = NULL;
-                    it.node->_count = 0;
-                    --it.node->_live_nodes;
-                    zmq_assert (it.node->_live_nodes == 0);
-                } else {
-                    it.node->_next.table[it.current_child - it.node->_min] = 0;
-                    zmq_assert (it.node->_live_nodes > 1);
-                    --it.node->_live_nodes;
-
-                    //  Compact the table if possible
-                    if (it.node->_live_nodes == 1) {
-                        //  If there's only one live node in the table we can
-                        //  switch to using the more compact single-node
-                        //  representation
-                        unsigned short i;
-                        for (i = 0; i < it.node->_count; ++i)
-                            if (it.node->_next.table[i])
-                                break;
-
-                        zmq_assert (i < it.node->_count);
-                        it.node->_min += i;
-                        it.node->_count = 1;
-                        generic_mtrie_t *oldp = it.node->_next.table[i];
-                        free (it.node->_next.table);
-                        it.node->_next.table = NULL;
-                        it.node->_next.node = oldp;
-                    } else if (it.current_child == it.node->_min) {
-                        //  We can compact the table "from the left"
-                        unsigned short i;
-                        for (i = 1; i < it.node->_count; ++i)
-                            if (it.node->_next.table[i])
-                                break;
-
-                        zmq_assert (i < it.node->_count);
-                        it.node->_min += i;
-                        it.node->_count -= i;
-                        generic_mtrie_t **old_table = it.node->_next.table;
-                        it.node->_next.table =
-                          static_cast<generic_mtrie_t **> (malloc (
-                            sizeof (generic_mtrie_t *) * it.node->_count));
-                        alloc_assert (it.node->_next.table);
-                        memmove (it.node->_next.table, old_table + i,
-                                 sizeof (generic_mtrie_t *) * it.node->_count);
-                        free (old_table);
-                    } else if (it.current_child
-                               == it.node->_min + it.node->_count - 1) {
-                        //  We can compact the table "from the right"
-                        unsigned short i;
-                        for (i = 1; i < it.node->_count; ++i)
-                            if (it.node->_next.table[it.node->_count - 1 - i])
-                                break;
-
-                        zmq_assert (i < it.node->_count);
-                        it.node->_count -= i;
-                        generic_mtrie_t **old_table = it.node->_next.table;
-                        it.node->_next.table =
-                          static_cast<generic_mtrie_t **> (malloc (
-                            sizeof (generic_mtrie_t *) * it.node->_count));
-                        alloc_assert (it.node->_next.table);
-                        memmove (it.node->_next.table, old_table,
-                                 sizeof (generic_mtrie_t *) * it.node->_count);
-                        free (old_table);
-                    }
-                }
-            }
-        }
-    }
-
-    return ret;
-}
-
-template <typename T>
-template <typename Arg>
-void generic_mtrie_t<T>::match (prefix_t data_,
-                                size_t size_,
-                                void (*func_) (value_t *pipe_, Arg arg_),
-                                Arg arg_)
-{
-    for (generic_mtrie_t *current = this; current; data_++, size_--) {
-        //  Signal the pipes attached to this node.
-        if (current->_pipes) {
-            for (typename pipes_t::iterator it = current->_pipes->begin (),
-                                            end = current->_pipes->end ();
-                 it != end; ++it) {
-                func_ (*it, arg_);
-            }
-        }
-
-        //  If we are at the end of the message, there's nothing more to match.
-        if (!size_)
-            break;
-
-        //  If there are no subnodes in the trie, return.
-        if (current->_count == 0)
-            break;
-
-        if (current->_count == 1) {
-            //  If there's one subnode (optimisation).
-            if (data_[0] != current->_min) {
-                break;
-            }
-            current = current->_next.node;
-        } else {
-            //  If there are multiple subnodes.
-            if (data_[0] < current->_min
-                || data_[0] >= current->_min + current->_count) {
-                break;
-            }
-            current = current->_next.table[data_[0] - current->_min];
-        }
-    }
-}
-
-template <typename T> bool generic_mtrie_t<T>::is_redundant () const
-{
-    return !_pipes && _live_nodes == 0;
-}
-}
-
-
-#endif
diff --git a/libs/libzmq/src/gssapi_client.cpp b/libs/libzmq/src/gssapi_client.cpp
deleted file mode 100644
index 291e9f0..0000000
--- a/libs/libzmq/src/gssapi_client.cpp
+++ /dev/null
@@ -1,236 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-
-#ifdef HAVE_LIBGSSAPI_KRB5
-
-#include <string.h>
-#include <string>
-
-#include "msg.hpp"
-#include "session_base.hpp"
-#include "err.hpp"
-#include "gssapi_client.hpp"
-#include "wire.hpp"
-
-zmq::gssapi_client_t::gssapi_client_t (session_base_t *session_,
-                                       const options_t &options_) :
-    mechanism_base_t (session_, options_),
-    gssapi_mechanism_base_t (session_, options_),
-    state (call_next_init),
-    token_ptr (GSS_C_NO_BUFFER),
-    mechs (),
-    security_context_established (false)
-{
-    const std::string::size_type service_size =
-      options_.gss_service_principal.size ();
-    service_name = static_cast<char *> (malloc (service_size + 1));
-    assert (service_name);
-    memcpy (service_name, options_.gss_service_principal.c_str (),
-            service_size + 1);
-
-    service_name_type = convert_nametype (options_.gss_service_principal_nt);
-    maj_stat = GSS_S_COMPLETE;
-    if (!options_.gss_principal.empty ()) {
-        const std::string::size_type principal_size =
-          options_.gss_principal.size ();
-        principal_name = static_cast<char *> (malloc (principal_size + 1));
-        assert (principal_name);
-        memcpy (principal_name, options_.gss_principal.c_str (),
-                principal_size + 1);
-
-        gss_OID name_type = convert_nametype (options_.gss_principal_nt);
-        if (acquire_credentials (principal_name, &cred, name_type) != 0)
-            maj_stat = GSS_S_FAILURE;
-    }
-
-    mechs.elements = NULL;
-    mechs.count = 0;
-}
-
-zmq::gssapi_client_t::~gssapi_client_t ()
-{
-    if (service_name)
-        free (service_name);
-    if (cred)
-        gss_release_cred (&min_stat, &cred);
-}
-
-int zmq::gssapi_client_t::next_handshake_command (msg_t *msg_)
-{
-    if (state == send_ready) {
-        int rc = produce_ready (msg_);
-        if (rc == 0)
-            state = connected;
-
-        return rc;
-    }
-
-    if (state != call_next_init) {
-        errno = EAGAIN;
-        return -1;
-    }
-
-    if (initialize_context () < 0)
-        return -1;
-
-    if (produce_next_token (msg_) < 0)
-        return -1;
-
-    if (maj_stat != GSS_S_CONTINUE_NEEDED && maj_stat != GSS_S_COMPLETE)
-        return -1;
-
-    if (maj_stat == GSS_S_COMPLETE) {
-        security_context_established = true;
-        state = recv_ready;
-    } else
-        state = recv_next_token;
-
-    return 0;
-}
-
-int zmq::gssapi_client_t::process_handshake_command (msg_t *msg_)
-{
-    if (state == recv_ready) {
-        int rc = process_ready (msg_);
-        if (rc == 0)
-            state = send_ready;
-
-        return rc;
-    }
-
-    if (state != recv_next_token) {
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (), ZMQ_PROTOCOL_ERROR_ZMTP_UNEXPECTED_COMMAND);
-        errno = EPROTO;
-        return -1;
-    }
-
-    if (process_next_token (msg_) < 0)
-        return -1;
-
-    if (maj_stat != GSS_S_COMPLETE && maj_stat != GSS_S_CONTINUE_NEEDED)
-        return -1;
-
-    state = call_next_init;
-
-    errno_assert (msg_->close () == 0);
-    errno_assert (msg_->init () == 0);
-
-    return 0;
-}
-
-int zmq::gssapi_client_t::encode (msg_t *msg_)
-{
-    zmq_assert (state == connected);
-
-    if (do_encryption)
-        return encode_message (msg_);
-
-    return 0;
-}
-
-int zmq::gssapi_client_t::decode (msg_t *msg_)
-{
-    zmq_assert (state == connected);
-
-    if (do_encryption)
-        return decode_message (msg_);
-
-    return 0;
-}
-
-zmq::mechanism_t::status_t zmq::gssapi_client_t::status () const
-{
-    return state == connected ? mechanism_t::ready : mechanism_t::handshaking;
-}
-
-int zmq::gssapi_client_t::initialize_context ()
-{
-    // principal was specified but credentials could not be acquired
-    if (principal_name != NULL && cred == NULL)
-        return -1;
-
-    // First time through, import service_name into target_name
-    if (target_name == GSS_C_NO_NAME) {
-        send_tok.value = service_name;
-        send_tok.length = strlen (service_name) + 1;
-        OM_uint32 maj = gss_import_name (&min_stat, &send_tok,
-                                         service_name_type, &target_name);
-
-        if (maj != GSS_S_COMPLETE)
-            return -1;
-    }
-
-    maj_stat = gss_init_sec_context (
-      &init_sec_min_stat, cred, &context, target_name, mechs.elements,
-      gss_flags, 0, NULL, token_ptr, NULL, &send_tok, &ret_flags, NULL);
-
-    if (token_ptr != GSS_C_NO_BUFFER)
-        free (recv_tok.value);
-
-    return 0;
-}
-
-int zmq::gssapi_client_t::produce_next_token (msg_t *msg_)
-{
-    if (send_tok.length != 0) { // Server expects another token
-        if (produce_initiate (msg_, send_tok.value, send_tok.length) < 0) {
-            gss_release_buffer (&min_stat, &send_tok);
-            gss_release_name (&min_stat, &target_name);
-            return -1;
-        }
-    }
-    gss_release_buffer (&min_stat, &send_tok);
-
-    if (maj_stat != GSS_S_COMPLETE && maj_stat != GSS_S_CONTINUE_NEEDED) {
-        gss_release_name (&min_stat, &target_name);
-        if (context != GSS_C_NO_CONTEXT)
-            gss_delete_sec_context (&min_stat, &context, GSS_C_NO_BUFFER);
-        return -1;
-    }
-
-    return 0;
-}
-
-int zmq::gssapi_client_t::process_next_token (msg_t *msg_)
-{
-    if (maj_stat == GSS_S_CONTINUE_NEEDED) {
-        if (process_initiate (msg_, &recv_tok.value, recv_tok.length) < 0) {
-            gss_release_name (&min_stat, &target_name);
-            return -1;
-        }
-        token_ptr = &recv_tok;
-    }
-
-    return 0;
-}
-
-#endif
diff --git a/libs/libzmq/src/gssapi_client.hpp b/libs/libzmq/src/gssapi_client.hpp
deleted file mode 100644
index 18d428c..0000000
--- a/libs/libzmq/src/gssapi_client.hpp
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_GSSAPI_CLIENT_HPP_INCLUDED__
-#define __ZMQ_GSSAPI_CLIENT_HPP_INCLUDED__
-
-#ifdef HAVE_LIBGSSAPI_KRB5
-
-#include "gssapi_mechanism_base.hpp"
-
-namespace zmq
-{
-class msg_t;
-class session_base_t;
-
-class gssapi_client_t ZMQ_FINAL : public gssapi_mechanism_base_t
-{
-  public:
-    gssapi_client_t (session_base_t *session_, const options_t &options_);
-    ~gssapi_client_t () ZMQ_FINAL;
-
-    // mechanism implementation
-    int next_handshake_command (msg_t *msg_) ZMQ_FINAL;
-    int process_handshake_command (msg_t *msg_) ZMQ_FINAL;
-    int encode (msg_t *msg_) ZMQ_FINAL;
-    int decode (msg_t *msg_) ZMQ_FINAL;
-    status_t status () const ZMQ_FINAL;
-
-  private:
-    enum state_t
-    {
-        call_next_init,
-        send_next_token,
-        recv_next_token,
-        send_ready,
-        recv_ready,
-        connected
-    };
-
-    //  Human-readable principal name of the service we are connecting to
-    char *service_name;
-
-    gss_OID service_name_type;
-
-    //  Current FSM state
-    state_t state;
-
-    //  Points to either send_tok or recv_tok
-    //  during context initialization
-    gss_buffer_desc *token_ptr;
-
-    //  The desired underlying mechanism
-    gss_OID_set_desc mechs;
-
-    //  True iff client considers the server authenticated
-    bool security_context_established;
-
-    int initialize_context ();
-    int produce_next_token (msg_t *msg_);
-    int process_next_token (msg_t *msg_);
-};
-}
-
-#endif
-
-#endif
diff --git a/libs/libzmq/src/gssapi_mechanism_base.cpp b/libs/libzmq/src/gssapi_mechanism_base.cpp
deleted file mode 100644
index b9ffeec..0000000
--- a/libs/libzmq/src/gssapi_mechanism_base.cpp
+++ /dev/null
@@ -1,402 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-
-#ifdef HAVE_LIBGSSAPI_KRB5
-
-#include <string.h>
-#include <string>
-
-#include "msg.hpp"
-#include "session_base.hpp"
-#include "err.hpp"
-#include "gssapi_mechanism_base.hpp"
-#include "wire.hpp"
-
-zmq::gssapi_mechanism_base_t::gssapi_mechanism_base_t (
-  session_base_t *session_, const options_t &options_) :
-    mechanism_base_t (session_, options_),
-    send_tok (),
-    recv_tok (),
-    /// FIXME remove? in_buf (),
-    target_name (GSS_C_NO_NAME),
-    principal_name (NULL),
-    maj_stat (GSS_S_COMPLETE),
-    min_stat (0),
-    init_sec_min_stat (0),
-    ret_flags (0),
-    gss_flags (GSS_C_MUTUAL_FLAG | GSS_C_REPLAY_FLAG),
-    cred (GSS_C_NO_CREDENTIAL),
-    context (GSS_C_NO_CONTEXT),
-    do_encryption (!options_.gss_plaintext)
-{
-}
-
-zmq::gssapi_mechanism_base_t::~gssapi_mechanism_base_t ()
-{
-    if (target_name)
-        gss_release_name (&min_stat, &target_name);
-    if (context)
-        gss_delete_sec_context (&min_stat, &context, GSS_C_NO_BUFFER);
-}
-
-int zmq::gssapi_mechanism_base_t::encode_message (msg_t *msg_)
-{
-    // Wrap the token value
-    int state;
-    gss_buffer_desc plaintext;
-    gss_buffer_desc wrapped;
-
-    uint8_t flags = 0;
-    if (msg_->flags () & msg_t::more)
-        flags |= 0x01;
-    if (msg_->flags () & msg_t::command)
-        flags |= 0x02;
-
-    uint8_t *plaintext_buffer =
-      static_cast<uint8_t *> (malloc (msg_->size () + 1));
-    alloc_assert (plaintext_buffer);
-
-    plaintext_buffer[0] = flags;
-    memcpy (plaintext_buffer + 1, msg_->data (), msg_->size ());
-
-    plaintext.value = plaintext_buffer;
-    plaintext.length = msg_->size () + 1;
-
-    maj_stat = gss_wrap (&min_stat, context, 1, GSS_C_QOP_DEFAULT, &plaintext,
-                         &state, &wrapped);
-
-    zmq_assert (maj_stat == GSS_S_COMPLETE);
-    zmq_assert (state);
-
-    // Re-initialize msg_ for wrapped text
-    int rc = msg_->close ();
-    zmq_assert (rc == 0);
-
-    rc = msg_->init_size (8 + 4 + wrapped.length);
-    zmq_assert (rc == 0);
-
-    uint8_t *ptr = static_cast<uint8_t *> (msg_->data ());
-
-    // Add command string
-    memcpy (ptr, "\x07MESSAGE", 8);
-    ptr += 8;
-
-    // Add token length
-    put_uint32 (ptr, static_cast<uint32_t> (wrapped.length));
-    ptr += 4;
-
-    // Add wrapped token value
-    memcpy (ptr, wrapped.value, wrapped.length);
-    ptr += wrapped.length;
-
-    gss_release_buffer (&min_stat, &wrapped);
-
-    return 0;
-}
-
-int zmq::gssapi_mechanism_base_t::decode_message (msg_t *msg_)
-{
-    const uint8_t *ptr = static_cast<uint8_t *> (msg_->data ());
-    size_t bytes_left = msg_->size ();
-
-    int rc = check_basic_command_structure (msg_);
-    if (rc == -1)
-        return rc;
-
-    // Get command string
-    if (bytes_left < 8 || memcmp (ptr, "\x07MESSAGE", 8)) {
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (), ZMQ_PROTOCOL_ERROR_ZMTP_UNEXPECTED_COMMAND);
-        errno = EPROTO;
-        return -1;
-    }
-    ptr += 8;
-    bytes_left -= 8;
-
-    // Get token length
-    if (bytes_left < 4) {
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (),
-          ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_MESSAGE);
-        errno = EPROTO;
-        return -1;
-    }
-    gss_buffer_desc wrapped;
-    wrapped.length = get_uint32 (ptr);
-    ptr += 4;
-    bytes_left -= 4;
-
-    // Get token value
-    if (bytes_left < wrapped.length) {
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (),
-          ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_MESSAGE);
-        errno = EPROTO;
-        return -1;
-    }
-    // TODO: instead of malloc/memcpy, can we just do: wrapped.value = ptr;
-    const size_t alloc_length = wrapped.length ? wrapped.length : 1;
-    wrapped.value = static_cast<char *> (malloc (alloc_length));
-    alloc_assert (wrapped.value);
-
-    if (wrapped.length) {
-        memcpy (wrapped.value, ptr, wrapped.length);
-        ptr += wrapped.length;
-        bytes_left -= wrapped.length;
-    }
-
-    // Unwrap the token value
-    int state;
-    gss_buffer_desc plaintext;
-    maj_stat = gss_unwrap (&min_stat, context, &wrapped, &plaintext, &state,
-                           (gss_qop_t *) NULL);
-
-    if (maj_stat != GSS_S_COMPLETE) {
-        gss_release_buffer (&min_stat, &plaintext);
-        free (wrapped.value);
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (), ZMQ_PROTOCOL_ERROR_ZMTP_CRYPTOGRAPHIC);
-        errno = EPROTO;
-        return -1;
-    }
-    zmq_assert (state);
-
-    // Re-initialize msg_ for plaintext
-    rc = msg_->close ();
-    zmq_assert (rc == 0);
-
-    rc = msg_->init_size (plaintext.length - 1);
-    zmq_assert (rc == 0);
-
-    const uint8_t flags = static_cast<char *> (plaintext.value)[0];
-    if (flags & 0x01)
-        msg_->set_flags (msg_t::more);
-    if (flags & 0x02)
-        msg_->set_flags (msg_t::command);
-
-    memcpy (msg_->data (), static_cast<char *> (plaintext.value) + 1,
-            plaintext.length - 1);
-
-    gss_release_buffer (&min_stat, &plaintext);
-    free (wrapped.value);
-
-    if (bytes_left > 0) {
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (),
-          ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_MESSAGE);
-        errno = EPROTO;
-        return -1;
-    }
-
-    return 0;
-}
-
-int zmq::gssapi_mechanism_base_t::produce_initiate (msg_t *msg_,
-                                                    void *token_value_,
-                                                    size_t token_length_)
-{
-    zmq_assert (token_value_);
-    zmq_assert (token_length_ <= 0xFFFFFFFFUL);
-
-    const size_t command_size = 9 + 4 + token_length_;
-
-    const int rc = msg_->init_size (command_size);
-    errno_assert (rc == 0);
-
-    uint8_t *ptr = static_cast<uint8_t *> (msg_->data ());
-
-    // Add command string
-    memcpy (ptr, "\x08INITIATE", 9);
-    ptr += 9;
-
-    // Add token length
-    put_uint32 (ptr, static_cast<uint32_t> (token_length_));
-    ptr += 4;
-
-    // Add token value
-    memcpy (ptr, token_value_, token_length_);
-    ptr += token_length_;
-
-    return 0;
-}
-
-int zmq::gssapi_mechanism_base_t::process_initiate (msg_t *msg_,
-                                                    void **token_value_,
-                                                    size_t &token_length_)
-{
-    zmq_assert (token_value_);
-
-    const uint8_t *ptr = static_cast<uint8_t *> (msg_->data ());
-    size_t bytes_left = msg_->size ();
-
-    int rc = check_basic_command_structure (msg_);
-    if (rc == -1)
-        return rc;
-
-    // Get command string
-    if (bytes_left < 9 || memcmp (ptr, "\x08INITIATE", 9)) {
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (), ZMQ_PROTOCOL_ERROR_ZMTP_UNEXPECTED_COMMAND);
-        errno = EPROTO;
-        return -1;
-    }
-    ptr += 9;
-    bytes_left -= 9;
-
-    // Get token length
-    if (bytes_left < 4) {
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (),
-          ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_INITIATE);
-        errno = EPROTO;
-        return -1;
-    }
-    token_length_ = get_uint32 (ptr);
-    ptr += 4;
-    bytes_left -= 4;
-
-    // Get token value
-    if (bytes_left < token_length_) {
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (),
-          ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_INITIATE);
-        errno = EPROTO;
-        return -1;
-    }
-
-    *token_value_ =
-      static_cast<char *> (malloc (token_length_ ? token_length_ : 1));
-    alloc_assert (*token_value_);
-
-    if (token_length_) {
-        memcpy (*token_value_, ptr, token_length_);
-        ptr += token_length_;
-        bytes_left -= token_length_;
-    }
-
-    if (bytes_left > 0) {
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (),
-          ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_INITIATE);
-        errno = EPROTO;
-        return -1;
-    }
-
-    return 0;
-}
-
-int zmq::gssapi_mechanism_base_t::produce_ready (msg_t *msg_)
-{
-    make_command_with_basic_properties (msg_, "\5READY", 6);
-
-    if (do_encryption)
-        return encode_message (msg_);
-
-    return 0;
-}
-
-int zmq::gssapi_mechanism_base_t::process_ready (msg_t *msg_)
-{
-    if (do_encryption) {
-        const int rc = decode_message (msg_);
-        if (rc != 0)
-            return rc;
-    }
-
-    const unsigned char *ptr = static_cast<unsigned char *> (msg_->data ());
-    size_t bytes_left = msg_->size ();
-
-    int rc = check_basic_command_structure (msg_);
-    if (rc == -1)
-        return rc;
-
-    if (bytes_left < 6 || memcmp (ptr, "\x05READY", 6)) {
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (), ZMQ_PROTOCOL_ERROR_ZMTP_UNEXPECTED_COMMAND);
-        errno = EPROTO;
-        return -1;
-    }
-    ptr += 6;
-    bytes_left -= 6;
-    rc = parse_metadata (ptr, bytes_left);
-    if (rc == -1)
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (), ZMQ_PROTOCOL_ERROR_ZMTP_INVALID_METADATA);
-
-    return rc;
-}
-
-const gss_OID zmq::gssapi_mechanism_base_t::convert_nametype (int zmq_nametype)
-{
-    switch (zmq_nametype) {
-        case ZMQ_GSSAPI_NT_HOSTBASED:
-            return GSS_C_NT_HOSTBASED_SERVICE;
-        case ZMQ_GSSAPI_NT_USER_NAME:
-            return GSS_C_NT_USER_NAME;
-        case ZMQ_GSSAPI_NT_KRB5_PRINCIPAL:
-#ifdef GSS_KRB5_NT_PRINCIPAL_NAME
-            return (gss_OID) GSS_KRB5_NT_PRINCIPAL_NAME;
-#else
-            return GSS_C_NT_USER_NAME;
-#endif
-    }
-    return NULL;
-}
-
-int zmq::gssapi_mechanism_base_t::acquire_credentials (char *service_name_,
-                                                       gss_cred_id_t *cred_,
-                                                       gss_OID name_type_)
-{
-    OM_uint32 maj_stat;
-    OM_uint32 min_stat;
-    gss_name_t server_name;
-
-    gss_buffer_desc name_buf;
-    name_buf.value = service_name_;
-    name_buf.length = strlen ((char *) name_buf.value) + 1;
-
-    maj_stat = gss_import_name (&min_stat, &name_buf, name_type_, &server_name);
-
-    if (maj_stat != GSS_S_COMPLETE)
-        return -1;
-
-    maj_stat = gss_acquire_cred (&min_stat, server_name, 0, GSS_C_NO_OID_SET,
-                                 GSS_C_BOTH, cred_, NULL, NULL);
-
-    if (maj_stat != GSS_S_COMPLETE)
-        return -1;
-
-    gss_release_name (&min_stat, &server_name);
-
-    return 0;
-}
-
-#endif
diff --git a/libs/libzmq/src/gssapi_mechanism_base.hpp b/libs/libzmq/src/gssapi_mechanism_base.hpp
deleted file mode 100644
index dec53d0..0000000
--- a/libs/libzmq/src/gssapi_mechanism_base.hpp
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_GSSAPI_MECHANISM_BASE_HPP_INCLUDED__
-#define __ZMQ_GSSAPI_MECHANISM_BASE_HPP_INCLUDED__
-
-#ifdef HAVE_LIBGSSAPI_KRB5
-
-#if HAVE_GSSAPI_GSSAPI_GENERIC_H
-#include <gssapi/gssapi_generic.h>
-#endif
-#include <gssapi/gssapi_krb5.h>
-
-#include "mechanism_base.hpp"
-#include "options.hpp"
-
-namespace zmq
-{
-class msg_t;
-
-/// Commonalities between clients and servers are captured here.
-/// For example, clients and servers both need to produce and
-/// process context-level GSSAPI tokens (via INITIATE commands)
-/// and per-message GSSAPI tokens (via MESSAGE commands).
-class gssapi_mechanism_base_t : public virtual mechanism_base_t
-{
-  public:
-    gssapi_mechanism_base_t (session_base_t *session_,
-                             const options_t &options_);
-    ~gssapi_mechanism_base_t () ZMQ_OVERRIDE = 0;
-
-  protected:
-    //  Produce a context-level GSSAPI token (INITIATE command)
-    //  during security context initialization.
-    int produce_initiate (msg_t *msg_, void *data_, size_t data_len_);
-
-    //  Process a context-level GSSAPI token (INITIATE command)
-    //  during security context initialization.
-    int process_initiate (msg_t *msg_, void **data_, size_t &data_len_);
-
-    // Produce a metadata ready msg (READY) to conclude handshake
-    int produce_ready (msg_t *msg_);
-
-    // Process a metadata ready msg (READY)
-    int process_ready (msg_t *msg_);
-
-    //  Encode a per-message GSSAPI token (MESSAGE command) using
-    //  the established security context.
-    int encode_message (msg_t *msg_);
-
-    //  Decode a per-message GSSAPI token (MESSAGE command) using
-    //  the  established security context.
-    int decode_message (msg_t *msg_);
-
-    //  Convert ZMQ_GSSAPI_NT values to GSSAPI name_type
-    static const gss_OID convert_nametype (int zmq_name_type_);
-
-    //  Acquire security context credentials from the
-    //  underlying mechanism.
-    static int acquire_credentials (char *principal_name_,
-                                    gss_cred_id_t *cred_,
-                                    gss_OID name_type_);
-
-  protected:
-    //  Opaque GSSAPI token for outgoing data
-    gss_buffer_desc send_tok;
-
-    //  Opaque GSSAPI token for incoming data
-    gss_buffer_desc recv_tok;
-
-    //  Opaque GSSAPI representation of principal
-    gss_name_t target_name;
-
-    //  Human-readable principal name
-    char *principal_name;
-
-    //  Status code returned by GSSAPI functions
-    OM_uint32 maj_stat;
-
-    //  Status code returned by the underlying mechanism
-    OM_uint32 min_stat;
-
-    //  Status code returned by the underlying mechanism
-    //  during context initialization
-    OM_uint32 init_sec_min_stat;
-
-    //  Flags returned by GSSAPI (ignored)
-    OM_uint32 ret_flags;
-
-    //  Flags returned by GSSAPI (ignored)
-    OM_uint32 gss_flags;
-
-    //  Credentials used to establish security context
-    gss_cred_id_t cred;
-
-    //  Opaque GSSAPI representation of the security context
-    gss_ctx_id_t context;
-
-    //  If true, use gss to encrypt messages. If false, only utilize gss for auth.
-    bool do_encryption;
-};
-}
-
-#endif
-
-#endif
diff --git a/libs/libzmq/src/gssapi_server.cpp b/libs/libzmq/src/gssapi_server.cpp
deleted file mode 100644
index 0a43349..0000000
--- a/libs/libzmq/src/gssapi_server.cpp
+++ /dev/null
@@ -1,248 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-
-#ifdef HAVE_LIBGSSAPI_KRB5
-
-#include <string.h>
-#include <string>
-
-#include "msg.hpp"
-#include "session_base.hpp"
-#include "err.hpp"
-#include "gssapi_server.hpp"
-#include "wire.hpp"
-
-#include <gssapi/gssapi.h>
-
-zmq::gssapi_server_t::gssapi_server_t (session_base_t *session_,
-                                       const std::string &peer_address_,
-                                       const options_t &options_) :
-    mechanism_base_t (session_, options_),
-    gssapi_mechanism_base_t (session_, options_),
-    zap_client_t (session_, peer_address_, options_),
-    session (session_),
-    peer_address (peer_address_),
-    state (recv_next_token),
-    security_context_established (false)
-{
-    maj_stat = GSS_S_CONTINUE_NEEDED;
-    if (!options_.gss_principal.empty ()) {
-        const std::string::size_type principal_size =
-          options_.gss_principal.size ();
-        principal_name = static_cast<char *> (malloc (principal_size + 1));
-        assert (principal_name);
-        memcpy (principal_name, options_.gss_principal.c_str (),
-                principal_size + 1);
-        gss_OID name_type = convert_nametype (options_.gss_principal_nt);
-        if (acquire_credentials (principal_name, &cred, name_type) != 0)
-            maj_stat = GSS_S_FAILURE;
-    }
-}
-
-zmq::gssapi_server_t::~gssapi_server_t ()
-{
-    if (cred)
-        gss_release_cred (&min_stat, &cred);
-
-    if (target_name)
-        gss_release_name (&min_stat, &target_name);
-}
-
-int zmq::gssapi_server_t::next_handshake_command (msg_t *msg_)
-{
-    if (state == send_ready) {
-        int rc = produce_ready (msg_);
-        if (rc == 0)
-            state = recv_ready;
-
-        return rc;
-    }
-
-    if (state != send_next_token) {
-        errno = EAGAIN;
-        return -1;
-    }
-
-    if (produce_next_token (msg_) < 0)
-        return -1;
-
-    if (maj_stat != GSS_S_CONTINUE_NEEDED && maj_stat != GSS_S_COMPLETE)
-        return -1;
-
-    if (maj_stat == GSS_S_COMPLETE) {
-        security_context_established = true;
-    }
-
-    state = recv_next_token;
-
-    return 0;
-}
-
-int zmq::gssapi_server_t::process_handshake_command (msg_t *msg_)
-{
-    if (state == recv_ready) {
-        int rc = process_ready (msg_);
-        if (rc == 0)
-            state = connected;
-
-        return rc;
-    }
-
-    if (state != recv_next_token) {
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (), ZMQ_PROTOCOL_ERROR_ZMTP_UNEXPECTED_COMMAND);
-        errno = EPROTO;
-        return -1;
-    }
-
-    if (security_context_established) {
-        //  Use ZAP protocol (RFC 27) to authenticate the user.
-        //  Note that rc will be -1 only if ZAP is not set up, but if it was
-        //  requested and it does not work properly the program will abort.
-        bool expecting_zap_reply = false;
-        int rc = session->zap_connect ();
-        if (rc == 0) {
-            send_zap_request ();
-            rc = receive_and_process_zap_reply ();
-            if (rc != 0) {
-                if (rc == -1)
-                    return -1;
-                expecting_zap_reply = true;
-            }
-        }
-        state = expecting_zap_reply ? expect_zap_reply : send_ready;
-        return 0;
-    }
-
-    if (process_next_token (msg_) < 0)
-        return -1;
-
-    accept_context ();
-    state = send_next_token;
-
-    errno_assert (msg_->close () == 0);
-    errno_assert (msg_->init () == 0);
-
-    return 0;
-}
-
-void zmq::gssapi_server_t::send_zap_request ()
-{
-    gss_buffer_desc principal;
-    gss_display_name (&min_stat, target_name, &principal, NULL);
-    zap_client_t::send_zap_request (
-      "GSSAPI", 6, reinterpret_cast<const uint8_t *> (principal.value),
-      principal.length);
-
-    gss_release_buffer (&min_stat, &principal);
-}
-
-int zmq::gssapi_server_t::encode (msg_t *msg_)
-{
-    zmq_assert (state == connected);
-
-    if (do_encryption)
-        return encode_message (msg_);
-
-    return 0;
-}
-
-int zmq::gssapi_server_t::decode (msg_t *msg_)
-{
-    zmq_assert (state == connected);
-
-    if (do_encryption)
-        return decode_message (msg_);
-
-    return 0;
-}
-
-int zmq::gssapi_server_t::zap_msg_available ()
-{
-    if (state != expect_zap_reply) {
-        errno = EFSM;
-        return -1;
-    }
-    const int rc = receive_and_process_zap_reply ();
-    if (rc == 0)
-        state = send_ready;
-    return rc == -1 ? -1 : 0;
-}
-
-zmq::mechanism_t::status_t zmq::gssapi_server_t::status () const
-{
-    return state == connected ? mechanism_t::ready : mechanism_t::handshaking;
-}
-
-int zmq::gssapi_server_t::produce_next_token (msg_t *msg_)
-{
-    if (send_tok.length != 0) { // Client expects another token
-        if (produce_initiate (msg_, send_tok.value, send_tok.length) < 0)
-            return -1;
-        gss_release_buffer (&min_stat, &send_tok);
-    }
-
-    if (maj_stat != GSS_S_COMPLETE && maj_stat != GSS_S_CONTINUE_NEEDED) {
-        gss_release_name (&min_stat, &target_name);
-        if (context != GSS_C_NO_CONTEXT)
-            gss_delete_sec_context (&min_stat, &context, GSS_C_NO_BUFFER);
-        return -1;
-    }
-
-    return 0;
-}
-
-int zmq::gssapi_server_t::process_next_token (msg_t *msg_)
-{
-    if (maj_stat == GSS_S_CONTINUE_NEEDED) {
-        if (process_initiate (msg_, &recv_tok.value, recv_tok.length) < 0) {
-            if (target_name != GSS_C_NO_NAME)
-                gss_release_name (&min_stat, &target_name);
-            return -1;
-        }
-    }
-
-    return 0;
-}
-
-void zmq::gssapi_server_t::accept_context ()
-{
-    maj_stat = gss_accept_sec_context (
-      &init_sec_min_stat, &context, cred, &recv_tok, GSS_C_NO_CHANNEL_BINDINGS,
-      &target_name, &doid, &send_tok, &ret_flags, NULL, NULL);
-
-    if (recv_tok.value) {
-        free (recv_tok.value);
-        recv_tok.value = NULL;
-    }
-}
-
-#endif
diff --git a/libs/libzmq/src/gssapi_server.hpp b/libs/libzmq/src/gssapi_server.hpp
deleted file mode 100644
index 2613011..0000000
--- a/libs/libzmq/src/gssapi_server.hpp
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_GSSAPI_SERVER_HPP_INCLUDED__
-#define __ZMQ_GSSAPI_SERVER_HPP_INCLUDED__
-
-#ifdef HAVE_LIBGSSAPI_KRB5
-
-#include "gssapi_mechanism_base.hpp"
-#include "zap_client.hpp"
-
-namespace zmq
-{
-class msg_t;
-class session_base_t;
-
-class gssapi_server_t ZMQ_FINAL : public gssapi_mechanism_base_t,
-                                  public zap_client_t
-{
-  public:
-    gssapi_server_t (session_base_t *session_,
-                     const std::string &peer_address,
-                     const options_t &options_);
-    ~gssapi_server_t () ZMQ_FINAL;
-
-    // mechanism implementation
-    int next_handshake_command (msg_t *msg_) ZMQ_FINAL;
-    int process_handshake_command (msg_t *msg_) ZMQ_FINAL;
-    int encode (msg_t *msg_) ZMQ_FINAL;
-    int decode (msg_t *msg_) ZMQ_FINAL;
-    int zap_msg_available () ZMQ_FINAL;
-    status_t status () const ZMQ_FINAL;
-
-  private:
-    enum state_t
-    {
-        send_next_token,
-        recv_next_token,
-        expect_zap_reply,
-        send_ready,
-        recv_ready,
-        connected
-    };
-
-    session_base_t *const session;
-
-    const std::string peer_address;
-
-    //  Current FSM state
-    state_t state;
-
-    //  True iff server considers the client authenticated
-    bool security_context_established;
-
-    //  The underlying mechanism type (ignored)
-    gss_OID doid;
-
-    void accept_context ();
-    int produce_next_token (msg_t *msg_);
-    int process_next_token (msg_t *msg_);
-    void send_zap_request ();
-};
-}
-
-#endif
-
-#endif
diff --git a/libs/libzmq/src/i_decoder.hpp b/libs/libzmq/src/i_decoder.hpp
deleted file mode 100644
index e0bcf07..0000000
--- a/libs/libzmq/src/i_decoder.hpp
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_I_DECODER_HPP_INCLUDED__
-#define __ZMQ_I_DECODER_HPP_INCLUDED__
-
-#include "macros.hpp"
-#include "stdint.hpp"
-
-namespace zmq
-{
-class msg_t;
-
-//  Interface to be implemented by message decoder.
-
-class i_decoder
-{
-  public:
-    virtual ~i_decoder () ZMQ_DEFAULT;
-
-    virtual void get_buffer (unsigned char **data_, size_t *size_) = 0;
-
-    virtual void resize_buffer (size_t) = 0;
-    //  Decodes data pointed to by data_.
-    //  When a message is decoded, 1 is returned.
-    //  When the decoder needs more data, 0 is returned.
-    //  On error, -1 is returned and errno is set accordingly.
-    virtual int
-    decode (const unsigned char *data_, size_t size_, size_t &processed_) = 0;
-
-    virtual msg_t *msg () = 0;
-};
-}
-
-#endif
diff --git a/libs/libzmq/src/i_encoder.hpp b/libs/libzmq/src/i_encoder.hpp
deleted file mode 100644
index 33ef9dd..0000000
--- a/libs/libzmq/src/i_encoder.hpp
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_I_ENCODER_HPP_INCLUDED__
-#define __ZMQ_I_ENCODER_HPP_INCLUDED__
-
-#include "macros.hpp"
-#include "stdint.hpp"
-
-namespace zmq
-{
-//  Forward declaration
-class msg_t;
-
-//  Interface to be implemented by message encoder.
-
-struct i_encoder
-{
-    virtual ~i_encoder () ZMQ_DEFAULT;
-
-    //  The function returns a batch of binary data. The data
-    //  are filled to a supplied buffer. If no buffer is supplied (data_
-    //  is NULL) encoder will provide buffer of its own.
-    //  Function returns 0 when a new message is required.
-    virtual size_t encode (unsigned char **data_, size_t size_) = 0;
-
-    //  Load a new message into encoder.
-    virtual void load_msg (msg_t *msg_) = 0;
-};
-}
-
-#endif
diff --git a/libs/libzmq/src/i_engine.hpp b/libs/libzmq/src/i_engine.hpp
deleted file mode 100644
index 7d05df8..0000000
--- a/libs/libzmq/src/i_engine.hpp
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_I_ENGINE_HPP_INCLUDED__
-#define __ZMQ_I_ENGINE_HPP_INCLUDED__
-
-#include "endpoint.hpp"
-#include "macros.hpp"
-
-namespace zmq
-{
-class io_thread_t;
-
-//  Abstract interface to be implemented by various engines.
-
-struct i_engine
-{
-    enum error_reason_t
-    {
-        protocol_error,
-        connection_error,
-        timeout_error
-    };
-
-    virtual ~i_engine () ZMQ_DEFAULT;
-
-    //  Indicate if the engine has an handshake stage.
-    //  If engine has handshake stage, engine must call session.engine_ready when the handshake is complete.
-    virtual bool has_handshake_stage () = 0;
-
-    //  Plug the engine to the session.
-    virtual void plug (zmq::io_thread_t *io_thread_,
-                       class session_base_t *session_) = 0;
-
-    //  Terminate and deallocate the engine. Note that 'detached'
-    //  events are not fired on termination.
-    virtual void terminate () = 0;
-
-    //  This method is called by the session to signalise that more
-    //  messages can be written to the pipe.
-    //  Returns false if the engine was deleted due to an error.
-    //  TODO it is probably better to change the design such that the engine
-    //  does not delete itself
-    virtual bool restart_input () = 0;
-
-    //  This method is called by the session to signalise that there
-    //  are messages to send available.
-    virtual void restart_output () = 0;
-
-    virtual void zap_msg_available () = 0;
-
-    virtual const endpoint_uri_pair_t &get_endpoint () const = 0;
-};
-}
-
-#endif
diff --git a/libs/libzmq/src/i_mailbox.hpp b/libs/libzmq/src/i_mailbox.hpp
deleted file mode 100644
index 7402a21..0000000
--- a/libs/libzmq/src/i_mailbox.hpp
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_I_MAILBOX_HPP_INCLUDED__
-#define __ZMQ_I_MAILBOX_HPP_INCLUDED__
-
-#include "macros.hpp"
-#include "stdint.hpp"
-
-namespace zmq
-{
-//  Interface to be implemented by mailbox.
-
-class i_mailbox
-{
-  public:
-    virtual ~i_mailbox () ZMQ_DEFAULT;
-
-    virtual void send (const command_t &cmd_) = 0;
-    virtual int recv (command_t *cmd_, int timeout_) = 0;
-
-
-#ifdef HAVE_FORK
-    // close the file descriptors in the signaller. This is used in a forked
-    // child process to close the file descriptors so that they do not interfere
-    // with the context in the parent process.
-    virtual void forked () = 0;
-#endif
-};
-}
-
-#endif
diff --git a/libs/libzmq/src/i_poll_events.hpp b/libs/libzmq/src/i_poll_events.hpp
deleted file mode 100644
index 5e70162..0000000
--- a/libs/libzmq/src/i_poll_events.hpp
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_I_POLL_EVENTS_HPP_INCLUDED__
-#define __ZMQ_I_POLL_EVENTS_HPP_INCLUDED__
-
-#include "macros.hpp"
-
-namespace zmq
-{
-// Virtual interface to be exposed by object that want to be notified
-// about events on file descriptors.
-
-struct i_poll_events
-{
-    virtual ~i_poll_events () ZMQ_DEFAULT;
-
-    // Called by I/O thread when file descriptor is ready for reading.
-    virtual void in_event () = 0;
-
-    // Called by I/O thread when file descriptor is ready for writing.
-    virtual void out_event () = 0;
-
-    // Called when timer expires.
-    virtual void timer_event (int id_) = 0;
-};
-}
-
-#endif
diff --git a/libs/libzmq/src/io_object.cpp b/libs/libzmq/src/io_object.cpp
deleted file mode 100644
index aa466c0..0000000
--- a/libs/libzmq/src/io_object.cpp
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "io_object.hpp"
-#include "io_thread.hpp"
-#include "err.hpp"
-
-zmq::io_object_t::io_object_t (io_thread_t *io_thread_) : _poller (NULL)
-{
-    if (io_thread_)
-        plug (io_thread_);
-}
-
-zmq::io_object_t::~io_object_t ()
-{
-}
-
-void zmq::io_object_t::plug (io_thread_t *io_thread_)
-{
-    zmq_assert (io_thread_);
-    zmq_assert (!_poller);
-
-    //  Retrieve the poller from the thread we are running in.
-    _poller = io_thread_->get_poller ();
-}
-
-void zmq::io_object_t::unplug ()
-{
-    zmq_assert (_poller);
-
-    //  Forget about old poller in preparation to be migrated
-    //  to a different I/O thread.
-    _poller = NULL;
-}
-
-zmq::io_object_t::handle_t zmq::io_object_t::add_fd (fd_t fd_)
-{
-    return _poller->add_fd (fd_, this);
-}
-
-void zmq::io_object_t::rm_fd (handle_t handle_)
-{
-    _poller->rm_fd (handle_);
-}
-
-void zmq::io_object_t::set_pollin (handle_t handle_)
-{
-    _poller->set_pollin (handle_);
-}
-
-void zmq::io_object_t::reset_pollin (handle_t handle_)
-{
-    _poller->reset_pollin (handle_);
-}
-
-void zmq::io_object_t::set_pollout (handle_t handle_)
-{
-    _poller->set_pollout (handle_);
-}
-
-void zmq::io_object_t::reset_pollout (handle_t handle_)
-{
-    _poller->reset_pollout (handle_);
-}
-
-void zmq::io_object_t::add_timer (int timeout_, int id_)
-{
-    _poller->add_timer (timeout_, this, id_);
-}
-
-void zmq::io_object_t::cancel_timer (int id_)
-{
-    _poller->cancel_timer (this, id_);
-}
-
-void zmq::io_object_t::in_event ()
-{
-    zmq_assert (false);
-}
-
-void zmq::io_object_t::out_event ()
-{
-    zmq_assert (false);
-}
-
-void zmq::io_object_t::timer_event (int)
-{
-    zmq_assert (false);
-}
diff --git a/libs/libzmq/src/io_object.hpp b/libs/libzmq/src/io_object.hpp
deleted file mode 100644
index 703af7e..0000000
--- a/libs/libzmq/src/io_object.hpp
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_IO_OBJECT_HPP_INCLUDED__
-#define __ZMQ_IO_OBJECT_HPP_INCLUDED__
-
-#include <stddef.h>
-
-#include "stdint.hpp"
-#include "poller.hpp"
-#include "i_poll_events.hpp"
-
-namespace zmq
-{
-class io_thread_t;
-
-//  Simple base class for objects that live in I/O threads.
-//  It makes communication with the poller object easier and
-//  makes defining unneeded event handlers unnecessary.
-
-class io_object_t : public i_poll_events
-{
-  public:
-    io_object_t (zmq::io_thread_t *io_thread_ = NULL);
-    ~io_object_t () ZMQ_OVERRIDE;
-
-    //  When migrating an object from one I/O thread to another, first
-    //  unplug it, then migrate it, then plug it to the new thread.
-    void plug (zmq::io_thread_t *io_thread_);
-    void unplug ();
-
-  protected:
-    typedef poller_t::handle_t handle_t;
-
-    //  Methods to access underlying poller object.
-    handle_t add_fd (fd_t fd_);
-    void rm_fd (handle_t handle_);
-    void set_pollin (handle_t handle_);
-    void reset_pollin (handle_t handle_);
-    void set_pollout (handle_t handle_);
-    void reset_pollout (handle_t handle_);
-    void add_timer (int timeout_, int id_);
-    void cancel_timer (int id_);
-
-    //  i_poll_events interface implementation.
-    void in_event () ZMQ_OVERRIDE;
-    void out_event () ZMQ_OVERRIDE;
-    void timer_event (int id_) ZMQ_OVERRIDE;
-
-  private:
-    poller_t *_poller;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (io_object_t)
-};
-}
-
-#endif
diff --git a/libs/libzmq/src/io_thread.cpp b/libs/libzmq/src/io_thread.cpp
deleted file mode 100644
index a2ca950..0000000
--- a/libs/libzmq/src/io_thread.cpp
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-
-#include <new>
-
-#include "macros.hpp"
-#include "io_thread.hpp"
-#include "err.hpp"
-#include "ctx.hpp"
-
-zmq::io_thread_t::io_thread_t (ctx_t *ctx_, uint32_t tid_) :
-    object_t (ctx_, tid_),
-    _mailbox_handle (static_cast<poller_t::handle_t> (NULL))
-{
-    _poller = new (std::nothrow) poller_t (*ctx_);
-    alloc_assert (_poller);
-
-    if (_mailbox.get_fd () != retired_fd) {
-        _mailbox_handle = _poller->add_fd (_mailbox.get_fd (), this);
-        _poller->set_pollin (_mailbox_handle);
-    }
-}
-
-zmq::io_thread_t::~io_thread_t ()
-{
-    LIBZMQ_DELETE (_poller);
-}
-
-void zmq::io_thread_t::start ()
-{
-    char name[16] = "";
-    snprintf (name, sizeof (name), "IO/%u",
-              get_tid () - zmq::ctx_t::reaper_tid - 1);
-    //  Start the underlying I/O thread.
-    _poller->start (name);
-}
-
-void zmq::io_thread_t::stop ()
-{
-    send_stop ();
-}
-
-zmq::mailbox_t *zmq::io_thread_t::get_mailbox ()
-{
-    return &_mailbox;
-}
-
-int zmq::io_thread_t::get_load () const
-{
-    return _poller->get_load ();
-}
-
-void zmq::io_thread_t::in_event ()
-{
-    //  TODO: Do we want to limit number of commands I/O thread can
-    //  process in a single go?
-
-    command_t cmd;
-    int rc = _mailbox.recv (&cmd, 0);
-
-    while (rc == 0 || errno == EINTR) {
-        if (rc == 0)
-            cmd.destination->process_command (cmd);
-        rc = _mailbox.recv (&cmd, 0);
-    }
-
-    errno_assert (rc != 0 && errno == EAGAIN);
-}
-
-void zmq::io_thread_t::out_event ()
-{
-    //  We are never polling for POLLOUT here. This function is never called.
-    zmq_assert (false);
-}
-
-void zmq::io_thread_t::timer_event (int)
-{
-    //  No timers here. This function is never called.
-    zmq_assert (false);
-}
-
-zmq::poller_t *zmq::io_thread_t::get_poller () const
-{
-    zmq_assert (_poller);
-    return _poller;
-}
-
-void zmq::io_thread_t::process_stop ()
-{
-    zmq_assert (_mailbox_handle);
-    _poller->rm_fd (_mailbox_handle);
-    _poller->stop ();
-}
diff --git a/libs/libzmq/src/io_thread.hpp b/libs/libzmq/src/io_thread.hpp
deleted file mode 100644
index 65e276d..0000000
--- a/libs/libzmq/src/io_thread.hpp
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_IO_THREAD_HPP_INCLUDED__
-#define __ZMQ_IO_THREAD_HPP_INCLUDED__
-
-#include "stdint.hpp"
-#include "object.hpp"
-#include "poller.hpp"
-#include "i_poll_events.hpp"
-#include "mailbox.hpp"
-
-namespace zmq
-{
-class ctx_t;
-
-//  Generic part of the I/O thread. Polling-mechanism-specific features
-//  are implemented in separate "polling objects".
-
-class io_thread_t ZMQ_FINAL : public object_t, public i_poll_events
-{
-  public:
-    io_thread_t (zmq::ctx_t *ctx_, uint32_t tid_);
-
-    //  Clean-up. If the thread was started, it's necessary to call 'stop'
-    //  before invoking destructor. Otherwise the destructor would hang up.
-    ~io_thread_t ();
-
-    //  Launch the physical thread.
-    void start ();
-
-    //  Ask underlying thread to stop.
-    void stop ();
-
-    //  Returns mailbox associated with this I/O thread.
-    mailbox_t *get_mailbox ();
-
-    //  i_poll_events implementation.
-    void in_event ();
-    void out_event ();
-    void timer_event (int id_);
-
-    //  Used by io_objects to retrieve the associated poller object.
-    poller_t *get_poller () const;
-
-    //  Command handlers.
-    void process_stop ();
-
-    //  Returns load experienced by the I/O thread.
-    int get_load () const;
-
-  private:
-    //  I/O thread accesses incoming commands via this mailbox.
-    mailbox_t _mailbox;
-
-    //  Handle associated with mailbox' file descriptor.
-    poller_t::handle_t _mailbox_handle;
-
-    //  I/O multiplexing is performed using a poller object.
-    poller_t *_poller;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (io_thread_t)
-};
-}
-
-#endif
diff --git a/libs/libzmq/src/ip.cpp b/libs/libzmq/src/ip.cpp
deleted file mode 100644
index 0a90c82..0000000
--- a/libs/libzmq/src/ip.cpp
+++ /dev/null
@@ -1,981 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "ip.hpp"
-#include "err.hpp"
-#include "macros.hpp"
-#include "config.hpp"
-#include "address.hpp"
-
-#if !defined ZMQ_HAVE_WINDOWS
-#include <fcntl.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <netdb.h>
-#include <netinet/in.h>
-#include <netinet/tcp.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-#include <vector>
-#else
-#include "tcp.hpp"
-#ifdef ZMQ_HAVE_IPC
-#include "ipc_address.hpp"
-#endif
-
-#include <direct.h>
-
-#define rmdir _rmdir
-#define unlink _unlink
-#endif
-
-#if defined ZMQ_HAVE_OPENVMS || defined ZMQ_HAVE_VXWORKS
-#include <ioctl.h>
-#endif
-
-#if defined ZMQ_HAVE_VXWORKS
-#include <unistd.h>
-#include <sockLib.h>
-#include <ioLib.h>
-#endif
-
-#if defined ZMQ_HAVE_EVENTFD
-#include <sys/eventfd.h>
-#endif
-
-#if defined ZMQ_HAVE_OPENPGM
-#ifdef ZMQ_HAVE_WINDOWS
-#define __PGM_WININT_H__
-#endif
-
-#include <pgm/pgm.h>
-#endif
-
-#ifdef __APPLE__
-#include <TargetConditionals.h>
-#endif
-
-#ifndef ZMQ_HAVE_WINDOWS
-// Acceptable temporary directory environment variables
-static const char *tmp_env_vars[] = {
-  "TMPDIR", "TEMPDIR", "TMP",
-  0 // Sentinel
-};
-#endif
-
-zmq::fd_t zmq::open_socket (int domain_, int type_, int protocol_)
-{
-    int rc;
-
-    //  Setting this option result in sane behaviour when exec() functions
-    //  are used. Old sockets are closed and don't block TCP ports etc.
-#if defined ZMQ_HAVE_SOCK_CLOEXEC
-    type_ |= SOCK_CLOEXEC;
-#endif
-
-#if defined ZMQ_HAVE_WINDOWS && defined WSA_FLAG_NO_HANDLE_INHERIT
-    // if supported, create socket with WSA_FLAG_NO_HANDLE_INHERIT, such that
-    // the race condition in making it non-inheritable later is avoided
-    const fd_t s = WSASocket (domain_, type_, protocol_, NULL, 0,
-                              WSA_FLAG_OVERLAPPED | WSA_FLAG_NO_HANDLE_INHERIT);
-#else
-    const fd_t s = socket (domain_, type_, protocol_);
-#endif
-    if (s == retired_fd) {
-#ifdef ZMQ_HAVE_WINDOWS
-        errno = wsa_error_to_errno (WSAGetLastError ());
-#endif
-        return retired_fd;
-    }
-
-    make_socket_noninheritable (s);
-
-    //  Socket is not yet connected so EINVAL is not a valid networking error
-    rc = zmq::set_nosigpipe (s);
-    errno_assert (rc == 0);
-
-    return s;
-}
-
-void zmq::unblock_socket (fd_t s_)
-{
-#if defined ZMQ_HAVE_WINDOWS
-    u_long nonblock = 1;
-    const int rc = ioctlsocket (s_, FIONBIO, &nonblock);
-    wsa_assert (rc != SOCKET_ERROR);
-#elif defined ZMQ_HAVE_OPENVMS || defined ZMQ_HAVE_VXWORKS
-    int nonblock = 1;
-    int rc = ioctl (s_, FIONBIO, &nonblock);
-    errno_assert (rc != -1);
-#else
-    int flags = fcntl (s_, F_GETFL, 0);
-    if (flags == -1)
-        flags = 0;
-    int rc = fcntl (s_, F_SETFL, flags | O_NONBLOCK);
-    errno_assert (rc != -1);
-#endif
-}
-
-void zmq::enable_ipv4_mapping (fd_t s_)
-{
-    LIBZMQ_UNUSED (s_);
-
-#if defined IPV6_V6ONLY && !defined ZMQ_HAVE_OPENBSD                           \
-  && !defined ZMQ_HAVE_DRAGONFLY
-#ifdef ZMQ_HAVE_WINDOWS
-    DWORD flag = 0;
-#else
-    int flag = 0;
-#endif
-    const int rc = setsockopt (s_, IPPROTO_IPV6, IPV6_V6ONLY,
-                               reinterpret_cast<char *> (&flag), sizeof (flag));
-#ifdef ZMQ_HAVE_WINDOWS
-    wsa_assert (rc != SOCKET_ERROR);
-#else
-    errno_assert (rc == 0);
-#endif
-#endif
-}
-
-int zmq::get_peer_ip_address (fd_t sockfd_, std::string &ip_addr_)
-{
-    struct sockaddr_storage ss;
-
-    const zmq_socklen_t addrlen =
-      get_socket_address (sockfd_, socket_end_remote, &ss);
-
-    if (addrlen == 0) {
-#ifdef ZMQ_HAVE_WINDOWS
-        const int last_error = WSAGetLastError ();
-        wsa_assert (last_error != WSANOTINITIALISED && last_error != WSAEFAULT
-                    && last_error != WSAEINPROGRESS
-                    && last_error != WSAENOTSOCK);
-#elif !defined(TARGET_OS_IPHONE) || !TARGET_OS_IPHONE
-        errno_assert (errno != EBADF && errno != EFAULT && errno != ENOTSOCK);
-#else
-        errno_assert (errno != EFAULT && errno != ENOTSOCK);
-#endif
-        return 0;
-    }
-
-    char host[NI_MAXHOST];
-    const int rc =
-      getnameinfo (reinterpret_cast<struct sockaddr *> (&ss), addrlen, host,
-                   sizeof host, NULL, 0, NI_NUMERICHOST);
-    if (rc != 0)
-        return 0;
-
-    ip_addr_ = host;
-
-    union
-    {
-        struct sockaddr sa;
-        struct sockaddr_storage sa_stor;
-    } u;
-
-    u.sa_stor = ss;
-    return static_cast<int> (u.sa.sa_family);
-}
-
-void zmq::set_ip_type_of_service (fd_t s_, int iptos_)
-{
-    int rc = setsockopt (s_, IPPROTO_IP, IP_TOS,
-                         reinterpret_cast<char *> (&iptos_), sizeof (iptos_));
-
-#ifdef ZMQ_HAVE_WINDOWS
-    wsa_assert (rc != SOCKET_ERROR);
-#else
-    errno_assert (rc == 0);
-#endif
-
-    //  Windows and Hurd do not support IPV6_TCLASS
-#if !defined(ZMQ_HAVE_WINDOWS) && defined(IPV6_TCLASS)
-    rc = setsockopt (s_, IPPROTO_IPV6, IPV6_TCLASS,
-                     reinterpret_cast<char *> (&iptos_), sizeof (iptos_));
-
-    //  If IPv6 is not enabled ENOPROTOOPT will be returned on Linux and
-    //  EINVAL on OSX
-    if (rc == -1) {
-        errno_assert (errno == ENOPROTOOPT || errno == EINVAL);
-    }
-#endif
-}
-
-void zmq::set_socket_priority (fd_t s_, int priority_)
-{
-#ifdef ZMQ_HAVE_SO_PRIORITY
-    int rc =
-      setsockopt (s_, SOL_SOCKET, SO_PRIORITY,
-                  reinterpret_cast<char *> (&priority_), sizeof (priority_));
-    errno_assert (rc == 0);
-#endif
-}
-
-int zmq::set_nosigpipe (fd_t s_)
-{
-#ifdef SO_NOSIGPIPE
-    //  Make sure that SIGPIPE signal is not generated when writing to a
-    //  connection that was already closed by the peer.
-    //  As per POSIX spec, EINVAL will be returned if the socket was valid but
-    //  the connection has been reset by the peer. Return an error so that the
-    //  socket can be closed and the connection retried if necessary.
-    int set = 1;
-    int rc = setsockopt (s_, SOL_SOCKET, SO_NOSIGPIPE, &set, sizeof (int));
-    if (rc != 0 && errno == EINVAL)
-        return -1;
-    errno_assert (rc == 0);
-#else
-    LIBZMQ_UNUSED (s_);
-#endif
-
-    return 0;
-}
-
-int zmq::bind_to_device (fd_t s_, const std::string &bound_device_)
-{
-#ifdef ZMQ_HAVE_SO_BINDTODEVICE
-    int rc = setsockopt (s_, SOL_SOCKET, SO_BINDTODEVICE,
-                         bound_device_.c_str (), bound_device_.length ());
-    if (rc != 0) {
-        assert_success_or_recoverable (s_, rc);
-        return -1;
-    }
-    return 0;
-
-#else
-    LIBZMQ_UNUSED (s_);
-    LIBZMQ_UNUSED (bound_device_);
-
-    errno = ENOTSUP;
-    return -1;
-#endif
-}
-
-bool zmq::initialize_network ()
-{
-#if defined ZMQ_HAVE_OPENPGM
-
-    //  Init PGM transport. Ensure threading and timer are enabled. Find PGM
-    //  protocol ID. Note that if you want to use gettimeofday and sleep for
-    //  openPGM timing, set environment variables PGM_TIMER to "GTOD" and
-    //  PGM_SLEEP to "USLEEP".
-    pgm_error_t *pgm_error = NULL;
-    const bool ok = pgm_init (&pgm_error);
-    if (ok != TRUE) {
-        //  Invalid parameters don't set pgm_error_t
-        zmq_assert (pgm_error != NULL);
-        if (pgm_error->domain == PGM_ERROR_DOMAIN_TIME
-            && (pgm_error->code == PGM_ERROR_FAILED)) {
-            //  Failed to access RTC or HPET device.
-            pgm_error_free (pgm_error);
-            errno = EINVAL;
-            return false;
-        }
-
-        //  PGM_ERROR_DOMAIN_ENGINE: WSAStartup errors or missing WSARecvMsg.
-        zmq_assert (false);
-    }
-#endif
-
-#ifdef ZMQ_HAVE_WINDOWS
-    //  Initialise Windows sockets. Note that WSAStartup can be called multiple
-    //  times given that WSACleanup will be called for each WSAStartup.
-
-    const WORD version_requested = MAKEWORD (2, 2);
-    WSADATA wsa_data;
-    const int rc = WSAStartup (version_requested, &wsa_data);
-    zmq_assert (rc == 0);
-    zmq_assert (LOBYTE (wsa_data.wVersion) == 2
-                && HIBYTE (wsa_data.wVersion) == 2);
-#endif
-
-    return true;
-}
-
-void zmq::shutdown_network ()
-{
-#ifdef ZMQ_HAVE_WINDOWS
-    //  On Windows, uninitialise socket layer.
-    const int rc = WSACleanup ();
-    wsa_assert (rc != SOCKET_ERROR);
-#endif
-
-#if defined ZMQ_HAVE_OPENPGM
-    //  Shut down the OpenPGM library.
-    if (pgm_shutdown () != TRUE)
-        zmq_assert (false);
-#endif
-}
-
-#if defined ZMQ_HAVE_WINDOWS
-static void tune_socket (const SOCKET socket_)
-{
-    BOOL tcp_nodelay = 1;
-    const int rc =
-      setsockopt (socket_, IPPROTO_TCP, TCP_NODELAY,
-                  reinterpret_cast<char *> (&tcp_nodelay), sizeof tcp_nodelay);
-    wsa_assert (rc != SOCKET_ERROR);
-
-    zmq::tcp_tune_loopback_fast_path (socket_);
-}
-
-static int make_fdpair_tcpip (zmq::fd_t *r_, zmq::fd_t *w_)
-{
-#if !defined _WIN32_WCE && !defined ZMQ_HAVE_WINDOWS_UWP
-    //  Windows CE does not manage security attributes
-    SECURITY_DESCRIPTOR sd;
-    SECURITY_ATTRIBUTES sa;
-    memset (&sd, 0, sizeof sd);
-    memset (&sa, 0, sizeof sa);
-
-    InitializeSecurityDescriptor (&sd, SECURITY_DESCRIPTOR_REVISION);
-    SetSecurityDescriptorDacl (&sd, TRUE, 0, FALSE);
-
-    sa.nLength = sizeof (SECURITY_ATTRIBUTES);
-    sa.lpSecurityDescriptor = &sd;
-#endif
-
-    //  This function has to be in a system-wide critical section so that
-    //  two instances of the library don't accidentally create signaler
-    //  crossing the process boundary.
-    //  We'll use named event object to implement the critical section.
-    //  Note that if the event object already exists, the CreateEvent requests
-    //  EVENT_ALL_ACCESS access right. If this fails, we try to open
-    //  the event object asking for SYNCHRONIZE access only.
-    HANDLE sync = NULL;
-
-    //  Create critical section only if using fixed signaler port
-    //  Use problematic Event implementation for compatibility if using old port 5905.
-    //  Otherwise use Mutex implementation.
-    const int event_signaler_port = 5905;
-
-    if (zmq::signaler_port == event_signaler_port) {
-#if !defined _WIN32_WCE && !defined ZMQ_HAVE_WINDOWS_UWP
-        sync =
-          CreateEventW (&sa, FALSE, TRUE, L"Global\\zmq-signaler-port-sync");
-#else
-        sync =
-          CreateEventW (NULL, FALSE, TRUE, L"Global\\zmq-signaler-port-sync");
-#endif
-        if (sync == NULL && GetLastError () == ERROR_ACCESS_DENIED)
-            sync = OpenEventW (SYNCHRONIZE | EVENT_MODIFY_STATE, FALSE,
-                               L"Global\\zmq-signaler-port-sync");
-
-        win_assert (sync != NULL);
-    } else if (zmq::signaler_port != 0) {
-        wchar_t mutex_name[MAX_PATH];
-#ifdef __MINGW32__
-        _snwprintf (mutex_name, MAX_PATH, L"Global\\zmq-signaler-port-%d",
-                    zmq::signaler_port);
-#else
-        swprintf (mutex_name, MAX_PATH, L"Global\\zmq-signaler-port-%d",
-                  zmq::signaler_port);
-#endif
-
-#if !defined _WIN32_WCE && !defined ZMQ_HAVE_WINDOWS_UWP
-        sync = CreateMutexW (&sa, FALSE, mutex_name);
-#else
-        sync = CreateMutexW (NULL, FALSE, mutex_name);
-#endif
-        if (sync == NULL && GetLastError () == ERROR_ACCESS_DENIED)
-            sync = OpenMutexW (SYNCHRONIZE, FALSE, mutex_name);
-
-        win_assert (sync != NULL);
-    }
-
-    //  Windows has no 'socketpair' function. CreatePipe is no good as pipe
-    //  handles cannot be polled on. Here we create the socketpair by hand.
-    *w_ = INVALID_SOCKET;
-    *r_ = INVALID_SOCKET;
-
-    //  Create listening socket.
-    SOCKET listener;
-    listener = zmq::open_socket (AF_INET, SOCK_STREAM, 0);
-    wsa_assert (listener != INVALID_SOCKET);
-
-    //  Set SO_REUSEADDR and TCP_NODELAY on listening socket.
-    BOOL so_reuseaddr = 1;
-    int rc = setsockopt (listener, SOL_SOCKET, SO_REUSEADDR,
-                         reinterpret_cast<char *> (&so_reuseaddr),
-                         sizeof so_reuseaddr);
-    wsa_assert (rc != SOCKET_ERROR);
-
-    tune_socket (listener);
-
-    //  Init sockaddr to signaler port.
-    struct sockaddr_in addr;
-    memset (&addr, 0, sizeof addr);
-    addr.sin_family = AF_INET;
-    addr.sin_addr.s_addr = htonl (INADDR_LOOPBACK);
-    addr.sin_port = htons (zmq::signaler_port);
-
-    //  Create the writer socket.
-    *w_ = zmq::open_socket (AF_INET, SOCK_STREAM, 0);
-    wsa_assert (*w_ != INVALID_SOCKET);
-
-    if (sync != NULL) {
-        //  Enter the critical section.
-        const DWORD dwrc = WaitForSingleObject (sync, INFINITE);
-        zmq_assert (dwrc == WAIT_OBJECT_0 || dwrc == WAIT_ABANDONED);
-    }
-
-    //  Bind listening socket to signaler port.
-    rc = bind (listener, reinterpret_cast<const struct sockaddr *> (&addr),
-               sizeof addr);
-
-    if (rc != SOCKET_ERROR && zmq::signaler_port == 0) {
-        //  Retrieve ephemeral port number
-        int addrlen = sizeof addr;
-        rc = getsockname (listener, reinterpret_cast<struct sockaddr *> (&addr),
-                          &addrlen);
-    }
-
-    //  Listen for incoming connections.
-    if (rc != SOCKET_ERROR) {
-        rc = listen (listener, 1);
-    }
-
-    //  Connect writer to the listener.
-    if (rc != SOCKET_ERROR) {
-        rc = connect (*w_, reinterpret_cast<struct sockaddr *> (&addr),
-                      sizeof addr);
-    }
-
-    //  Accept connection from writer.
-    if (rc != SOCKET_ERROR) {
-        //  Set TCP_NODELAY on writer socket.
-        tune_socket (*w_);
-
-        *r_ = accept (listener, NULL, NULL);
-    }
-
-    //  Send/receive large chunk to work around TCP slow start
-    //  This code is a workaround for #1608
-    if (*r_ != INVALID_SOCKET) {
-        const size_t dummy_size =
-          1024 * 1024; //  1M to overload default receive buffer
-        unsigned char *dummy =
-          static_cast<unsigned char *> (malloc (dummy_size));
-        wsa_assert (dummy);
-
-        int still_to_send = static_cast<int> (dummy_size);
-        int still_to_recv = static_cast<int> (dummy_size);
-        while (still_to_send || still_to_recv) {
-            int nbytes;
-            if (still_to_send > 0) {
-                nbytes = ::send (
-                  *w_,
-                  reinterpret_cast<char *> (dummy + dummy_size - still_to_send),
-                  still_to_send, 0);
-                wsa_assert (nbytes != SOCKET_ERROR);
-                still_to_send -= nbytes;
-            }
-            nbytes = ::recv (
-              *r_,
-              reinterpret_cast<char *> (dummy + dummy_size - still_to_recv),
-              still_to_recv, 0);
-            wsa_assert (nbytes != SOCKET_ERROR);
-            still_to_recv -= nbytes;
-        }
-        free (dummy);
-    }
-
-    //  Save errno if error occurred in bind/listen/connect/accept.
-    int saved_errno = 0;
-    if (*r_ == INVALID_SOCKET)
-        saved_errno = WSAGetLastError ();
-
-    //  We don't need the listening socket anymore. Close it.
-    rc = closesocket (listener);
-    wsa_assert (rc != SOCKET_ERROR);
-
-    if (sync != NULL) {
-        //  Exit the critical section.
-        BOOL brc;
-        if (zmq::signaler_port == event_signaler_port)
-            brc = SetEvent (sync);
-        else
-            brc = ReleaseMutex (sync);
-        win_assert (brc != 0);
-
-        //  Release the kernel object
-        brc = CloseHandle (sync);
-        win_assert (brc != 0);
-    }
-
-    if (*r_ != INVALID_SOCKET) {
-        zmq::make_socket_noninheritable (*r_);
-        return 0;
-    }
-    //  Cleanup writer if connection failed
-    if (*w_ != INVALID_SOCKET) {
-        rc = closesocket (*w_);
-        wsa_assert (rc != SOCKET_ERROR);
-        *w_ = INVALID_SOCKET;
-    }
-    //  Set errno from saved value
-    errno = zmq::wsa_error_to_errno (saved_errno);
-    return -1;
-}
-#endif
-
-int zmq::make_fdpair (fd_t *r_, fd_t *w_)
-{
-#if defined ZMQ_HAVE_EVENTFD
-    int flags = 0;
-#if defined ZMQ_HAVE_EVENTFD_CLOEXEC
-    //  Setting this option result in sane behaviour when exec() functions
-    //  are used. Old sockets are closed and don't block TCP ports, avoid
-    //  leaks, etc.
-    flags |= EFD_CLOEXEC;
-#endif
-    fd_t fd = eventfd (0, flags);
-    if (fd == -1) {
-        errno_assert (errno == ENFILE || errno == EMFILE);
-        *w_ = *r_ = -1;
-        return -1;
-    }
-    *w_ = *r_ = fd;
-    return 0;
-
-
-#elif defined ZMQ_HAVE_WINDOWS
-#ifdef ZMQ_HAVE_IPC
-    ipc_address_t address;
-    std::string dirname, filename;
-    sockaddr_un lcladdr;
-    socklen_t lcladdr_len = sizeof lcladdr;
-    int rc = 0;
-    int saved_errno = 0;
-
-    // It appears that a lack of runtime AF_UNIX support
-    // can fail in more than one way.
-    // At least: open_socket can fail or later in bind
-    bool ipc_fallback_on_tcpip = true;
-
-    //  Create a listening socket.
-    const SOCKET listener = open_socket (AF_UNIX, SOCK_STREAM, 0);
-    if (listener == retired_fd) {
-        //  This may happen if the library was built on a system supporting AF_UNIX, but the system running doesn't support it.
-        goto try_tcpip;
-    }
-
-    create_ipc_wildcard_address (dirname, filename);
-
-    //  Initialise the address structure.
-    rc = address.resolve (filename.c_str ());
-    if (rc != 0) {
-        goto error_closelistener;
-    }
-
-    //  Bind the socket to the file path.
-    rc = bind (listener, const_cast<sockaddr *> (address.addr ()),
-               address.addrlen ());
-    if (rc != 0) {
-        errno = wsa_error_to_errno (WSAGetLastError ());
-        goto error_closelistener;
-    }
-    // if we got here, ipc should be working,
-    // so raise any remaining errors
-    ipc_fallback_on_tcpip = false;
-
-    //  Listen for incoming connections.
-    rc = listen (listener, 1);
-    if (rc != 0) {
-        errno = wsa_error_to_errno (WSAGetLastError ());
-        goto error_closelistener;
-    }
-
-    rc = getsockname (listener, reinterpret_cast<struct sockaddr *> (&lcladdr),
-                      &lcladdr_len);
-    wsa_assert (rc != -1);
-
-    //  Create the client socket.
-    *w_ = open_socket (AF_UNIX, SOCK_STREAM, 0);
-    if (*w_ == -1) {
-        errno = wsa_error_to_errno (WSAGetLastError ());
-        goto error_closelistener;
-    }
-
-    //  Connect to the remote peer.
-    rc = ::connect (*w_, reinterpret_cast<const struct sockaddr *> (&lcladdr),
-                    lcladdr_len);
-    if (rc == -1) {
-        goto error_closeclient;
-    }
-
-    *r_ = accept (listener, NULL, NULL);
-    errno_assert (*r_ != -1);
-
-    //  Close the listener socket, we don't need it anymore.
-    rc = closesocket (listener);
-    wsa_assert (rc == 0);
-
-    //  Cleanup temporary socket file descriptor
-    if (!filename.empty ()) {
-        rc = ::unlink (filename.c_str ());
-        if ((rc == 0) && !dirname.empty ()) {
-            rc = ::rmdir (dirname.c_str ());
-            dirname.clear ();
-        }
-        filename.clear ();
-    }
-
-    return 0;
-
-error_closeclient:
-    saved_errno = errno;
-    rc = closesocket (*w_);
-    wsa_assert (rc == 0);
-    errno = saved_errno;
-
-error_closelistener:
-    saved_errno = errno;
-    rc = closesocket (listener);
-    wsa_assert (rc == 0);
-
-    //  Cleanup temporary socket file descriptor
-    if (!filename.empty ()) {
-        rc = ::unlink (filename.c_str ());
-        if ((rc == 0) && !dirname.empty ()) {
-            rc = ::rmdir (dirname.c_str ());
-            dirname.clear ();
-        }
-        filename.clear ();
-    }
-
-    // ipc failed due to lack of AF_UNIX support, fallback on tcpip
-    if (ipc_fallback_on_tcpip) {
-        goto try_tcpip;
-    }
-
-    errno = saved_errno;
-    return -1;
-
-try_tcpip:
-    // try to fallback to TCP/IP
-    // TODO: maybe remember this decision permanently?
-#endif
-
-    return make_fdpair_tcpip (r_, w_);
-#elif defined ZMQ_HAVE_OPENVMS
-
-    //  Whilst OpenVMS supports socketpair - it maps to AF_INET only.  Further,
-    //  it does not set the socket options TCP_NODELAY and TCP_NODELACK which
-    //  can lead to performance problems.
-    //
-    //  The bug will be fixed in V5.6 ECO4 and beyond.  In the meantime, we'll
-    //  create the socket pair manually.
-    struct sockaddr_in lcladdr;
-    memset (&lcladdr, 0, sizeof lcladdr);
-    lcladdr.sin_family = AF_INET;
-    lcladdr.sin_addr.s_addr = htonl (INADDR_LOOPBACK);
-    lcladdr.sin_port = 0;
-
-    int listener = open_socket (AF_INET, SOCK_STREAM, 0);
-    errno_assert (listener != -1);
-
-    int on = 1;
-    int rc = setsockopt (listener, IPPROTO_TCP, TCP_NODELAY, &on, sizeof on);
-    errno_assert (rc != -1);
-
-    rc = setsockopt (listener, IPPROTO_TCP, TCP_NODELACK, &on, sizeof on);
-    errno_assert (rc != -1);
-
-    rc = bind (listener, (struct sockaddr *) &lcladdr, sizeof lcladdr);
-    errno_assert (rc != -1);
-
-    socklen_t lcladdr_len = sizeof lcladdr;
-
-    rc = getsockname (listener, (struct sockaddr *) &lcladdr, &lcladdr_len);
-    errno_assert (rc != -1);
-
-    rc = listen (listener, 1);
-    errno_assert (rc != -1);
-
-    *w_ = open_socket (AF_INET, SOCK_STREAM, 0);
-    errno_assert (*w_ != -1);
-
-    rc = setsockopt (*w_, IPPROTO_TCP, TCP_NODELAY, &on, sizeof on);
-    errno_assert (rc != -1);
-
-    rc = setsockopt (*w_, IPPROTO_TCP, TCP_NODELACK, &on, sizeof on);
-    errno_assert (rc != -1);
-
-    rc = connect (*w_, (struct sockaddr *) &lcladdr, sizeof lcladdr);
-    errno_assert (rc != -1);
-
-    *r_ = accept (listener, NULL, NULL);
-    errno_assert (*r_ != -1);
-
-    close (listener);
-
-    return 0;
-#elif defined ZMQ_HAVE_VXWORKS
-    struct sockaddr_in lcladdr;
-    memset (&lcladdr, 0, sizeof lcladdr);
-    lcladdr.sin_family = AF_INET;
-    lcladdr.sin_addr.s_addr = htonl (INADDR_LOOPBACK);
-    lcladdr.sin_port = 0;
-
-    int listener = open_socket (AF_INET, SOCK_STREAM, 0);
-    errno_assert (listener != -1);
-
-    int on = 1;
-    int rc =
-      setsockopt (listener, IPPROTO_TCP, TCP_NODELAY, (char *) &on, sizeof on);
-    errno_assert (rc != -1);
-
-    rc = bind (listener, (struct sockaddr *) &lcladdr, sizeof lcladdr);
-    errno_assert (rc != -1);
-
-    socklen_t lcladdr_len = sizeof lcladdr;
-
-    rc = getsockname (listener, (struct sockaddr *) &lcladdr,
-                      (int *) &lcladdr_len);
-    errno_assert (rc != -1);
-
-    rc = listen (listener, 1);
-    errno_assert (rc != -1);
-
-    *w_ = open_socket (AF_INET, SOCK_STREAM, 0);
-    errno_assert (*w_ != -1);
-
-    rc = setsockopt (*w_, IPPROTO_TCP, TCP_NODELAY, (char *) &on, sizeof on);
-    errno_assert (rc != -1);
-
-    rc = connect (*w_, (struct sockaddr *) &lcladdr, sizeof lcladdr);
-    errno_assert (rc != -1);
-
-    *r_ = accept (listener, NULL, NULL);
-    errno_assert (*r_ != -1);
-
-    close (listener);
-
-    return 0;
-#else
-    // All other implementations support socketpair()
-    int sv[2];
-    int type = SOCK_STREAM;
-    //  Setting this option result in sane behaviour when exec() functions
-    //  are used. Old sockets are closed and don't block TCP ports, avoid
-    //  leaks, etc.
-#if defined ZMQ_HAVE_SOCK_CLOEXEC
-    type |= SOCK_CLOEXEC;
-#endif
-    int rc = socketpair (AF_UNIX, type, 0, sv);
-    if (rc == -1) {
-        errno_assert (errno == ENFILE || errno == EMFILE);
-        *w_ = *r_ = -1;
-        return -1;
-    } else {
-        make_socket_noninheritable (sv[0]);
-        make_socket_noninheritable (sv[1]);
-
-        *w_ = sv[0];
-        *r_ = sv[1];
-        return 0;
-    }
-#endif
-}
-
-void zmq::make_socket_noninheritable (fd_t sock_)
-{
-#if defined ZMQ_HAVE_WINDOWS && !defined _WIN32_WCE                            \
-  && !defined ZMQ_HAVE_WINDOWS_UWP
-    //  On Windows, preventing sockets to be inherited by child processes.
-    const BOOL brc = SetHandleInformation (reinterpret_cast<HANDLE> (sock_),
-                                           HANDLE_FLAG_INHERIT, 0);
-    win_assert (brc);
-#elif (!defined ZMQ_HAVE_SOCK_CLOEXEC || !defined HAVE_ACCEPT4)                \
-  && defined FD_CLOEXEC
-    //  If there 's no SOCK_CLOEXEC, let's try the second best option.
-    //  Race condition can cause socket not to be closed (if fork happens
-    //  between accept and this point).
-    const int rc = fcntl (sock_, F_SETFD, FD_CLOEXEC);
-    errno_assert (rc != -1);
-#else
-    LIBZMQ_UNUSED (sock_);
-#endif
-}
-
-void zmq::assert_success_or_recoverable (zmq::fd_t s_, int rc_)
-{
-#ifdef ZMQ_HAVE_WINDOWS
-    if (rc_ != SOCKET_ERROR) {
-        return;
-    }
-#else
-    if (rc_ != -1) {
-        return;
-    }
-#endif
-
-    //  Check whether an error occurred
-    int err = 0;
-#if defined ZMQ_HAVE_HPUX || defined ZMQ_HAVE_VXWORKS
-    int len = sizeof err;
-#else
-    socklen_t len = sizeof err;
-#endif
-
-    const int rc = getsockopt (s_, SOL_SOCKET, SO_ERROR,
-                               reinterpret_cast<char *> (&err), &len);
-
-    //  Assert if the error was caused by 0MQ bug.
-    //  Networking problems are OK. No need to assert.
-#ifdef ZMQ_HAVE_WINDOWS
-    zmq_assert (rc == 0);
-    if (err != 0) {
-        wsa_assert (err == WSAECONNREFUSED || err == WSAECONNRESET
-                    || err == WSAECONNABORTED || err == WSAEINTR
-                    || err == WSAETIMEDOUT || err == WSAEHOSTUNREACH
-                    || err == WSAENETUNREACH || err == WSAENETDOWN
-                    || err == WSAENETRESET || err == WSAEACCES
-                    || err == WSAEINVAL || err == WSAEADDRINUSE);
-    }
-#else
-    //  Following code should handle both Berkeley-derived socket
-    //  implementations and Solaris.
-    if (rc == -1)
-        err = errno;
-    if (err != 0) {
-        errno = err;
-        errno_assert (errno == ECONNREFUSED || errno == ECONNRESET
-                      || errno == ECONNABORTED || errno == EINTR
-                      || errno == ETIMEDOUT || errno == EHOSTUNREACH
-                      || errno == ENETUNREACH || errno == ENETDOWN
-                      || errno == ENETRESET || errno == EINVAL);
-    }
-#endif
-}
-
-#ifdef ZMQ_HAVE_IPC
-
-#if defined ZMQ_HAVE_WINDOWS
-char *widechar_to_utf8 (const wchar_t *widestring)
-{
-    int nch, n;
-    char *utf8 = 0;
-    nch = WideCharToMultiByte (CP_UTF8, 0, widestring, -1, 0, 0, NULL, NULL);
-    if (nch > 0) {
-        utf8 = (char *) malloc ((nch + 1) * sizeof (char));
-        n = WideCharToMultiByte (CP_UTF8, 0, widestring, -1, utf8, nch, NULL,
-                                 NULL);
-        utf8[nch] = 0;
-    }
-    return utf8;
-}
-#endif
-
-int zmq::create_ipc_wildcard_address (std::string &path_, std::string &file_)
-{
-#if defined ZMQ_HAVE_WINDOWS
-    wchar_t buffer[MAX_PATH];
-
-    {
-        const errno_t rc = _wtmpnam_s (buffer);
-        errno_assert (rc == 0);
-    }
-
-    // TODO or use CreateDirectoryA and specify permissions?
-    const int rc = _wmkdir (buffer);
-    if (rc != 0) {
-        return -1;
-    }
-
-    char *tmp = widechar_to_utf8 (buffer);
-    if (tmp == 0) {
-        return -1;
-    }
-
-    path_.assign (tmp);
-    file_ = path_ + "/socket";
-
-    free (tmp);
-#else
-    std::string tmp_path;
-
-    // If TMPDIR, TEMPDIR, or TMP are available and are directories, create
-    // the socket directory there.
-    const char **tmp_env = tmp_env_vars;
-    while (tmp_path.empty () && *tmp_env != 0) {
-        const char *const tmpdir = getenv (*tmp_env);
-        struct stat statbuf;
-
-        // Confirm it is actually a directory before trying to use
-        if (tmpdir != 0 && ::stat (tmpdir, &statbuf) == 0
-            && S_ISDIR (statbuf.st_mode)) {
-            tmp_path.assign (tmpdir);
-            if (*(tmp_path.rbegin ()) != '/') {
-                tmp_path.push_back ('/');
-            }
-        }
-
-        // Try the next environment variable
-        ++tmp_env;
-    }
-
-    // Append a directory name
-    tmp_path.append ("tmpXXXXXX");
-
-    // We need room for tmp_path + trailing NUL
-    std::vector<char> buffer (tmp_path.length () + 1);
-    memcpy (&buffer[0], tmp_path.c_str (), tmp_path.length () + 1);
-
-#if defined HAVE_MKDTEMP
-    // Create the directory.  POSIX requires that mkdtemp() creates the
-    // directory with 0700 permissions, meaning the only possible race
-    // with socket creation could be the same user.  However, since
-    // each socket is created in a directory created by mkdtemp(), and
-    // mkdtemp() guarantees a unique directory name, there will be no
-    // collision.
-    if (mkdtemp (&buffer[0]) == 0) {
-        return -1;
-    }
-
-    path_.assign (&buffer[0]);
-    file_ = path_ + "/socket";
-#else
-    LIBZMQ_UNUSED (path_);
-    int fd = mkstemp (&buffer[0]);
-    if (fd == -1)
-        return -1;
-    ::close (fd);
-
-    file_.assign (&buffer[0]);
-#endif
-#endif
-
-    return 0;
-}
-#endif
diff --git a/libs/libzmq/src/ip.hpp b/libs/libzmq/src/ip.hpp
deleted file mode 100644
index bceb831..0000000
--- a/libs/libzmq/src/ip.hpp
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_IP_HPP_INCLUDED__
-#define __ZMQ_IP_HPP_INCLUDED__
-
-#include <string>
-#include "fd.hpp"
-
-namespace zmq
-{
-//  Same as socket(2), but allows for transparent tweaking the options.
-fd_t open_socket (int domain_, int type_, int protocol_);
-
-//  Sets the socket into non-blocking mode.
-void unblock_socket (fd_t s_);
-
-//  Enable IPv4-mapping of addresses in case it is disabled by default.
-void enable_ipv4_mapping (fd_t s_);
-
-//  Returns string representation of peer's address.
-//  Socket sockfd_ must be connected. Returns true iff successful.
-int get_peer_ip_address (fd_t sockfd_, std::string &ip_addr_);
-
-// Sets the IP Type-Of-Service for the underlying socket
-void set_ip_type_of_service (fd_t s_, int iptos_);
-
-// Sets the protocol-defined priority for the underlying socket
-void set_socket_priority (fd_t s_, int priority_);
-
-// Sets the SO_NOSIGPIPE option for the underlying socket.
-// Return 0 on success, -1 if the connection has been closed by the peer
-int set_nosigpipe (fd_t s_);
-
-// Binds the underlying socket to the given device, eg. VRF or interface
-int bind_to_device (fd_t s_, const std::string &bound_device_);
-
-// Initialize network subsystem. May be called multiple times. Each call must be matched by a call to shutdown_network.
-bool initialize_network ();
-
-// Shutdown network subsystem. Must be called once for each call to initialize_network before terminating.
-void shutdown_network ();
-
-// Creates a pair of sockets (using signaler_port on OS using TCP sockets).
-// Returns -1 if we could not make the socket pair successfully
-int make_fdpair (fd_t *r_, fd_t *w_);
-
-// Makes a socket non-inheritable to child processes.
-// Asserts on any failure.
-void make_socket_noninheritable (fd_t sock_);
-
-//  Asserts that:
-//  - an internal 0MQ error did not occur,
-//  - and, if a socket error occurred, it can be recovered from.
-void assert_success_or_recoverable (fd_t s_, int rc_);
-
-#ifdef ZMQ_HAVE_IPC
-// Create an IPC wildcard path address
-int create_ipc_wildcard_address (std::string &path_, std::string &file_);
-#endif
-}
-
-#endif
diff --git a/libs/libzmq/src/ip_resolver.cpp b/libs/libzmq/src/ip_resolver.cpp
deleted file mode 100644
index 97d87b2..0000000
--- a/libs/libzmq/src/ip_resolver.cpp
+++ /dev/null
@@ -1,743 +0,0 @@
-#include "precompiled.hpp"
-#include <string>
-#include <cstring>
-
-#include "macros.hpp"
-#include "stdint.hpp"
-#include "err.hpp"
-#include "ip.hpp"
-
-#ifndef ZMQ_HAVE_WINDOWS
-#include <sys/types.h>
-#include <arpa/inet.h>
-#include <netinet/tcp.h>
-#include <net/if.h>
-#include <netdb.h>
-#include <ctype.h>
-#include <unistd.h>
-#include <stdlib.h>
-#endif
-
-#include "ip_resolver.hpp"
-
-int zmq::ip_addr_t::family () const
-{
-    return generic.sa_family;
-}
-
-bool zmq::ip_addr_t::is_multicast () const
-{
-    if (family () == AF_INET) {
-        //  IPv4 Multicast: address MSBs are 1110
-        //  Range: 224.0.0.0 - 239.255.255.255
-        return IN_MULTICAST (ntohl (ipv4.sin_addr.s_addr));
-    }
-    //  IPv6 Multicast: ff00::/8
-    return IN6_IS_ADDR_MULTICAST (&ipv6.sin6_addr) != 0;
-}
-
-uint16_t zmq::ip_addr_t::port () const
-{
-    if (family () == AF_INET6) {
-        return ntohs (ipv6.sin6_port);
-    }
-    return ntohs (ipv4.sin_port);
-}
-
-const struct sockaddr *zmq::ip_addr_t::as_sockaddr () const
-{
-    return &generic;
-}
-
-zmq::zmq_socklen_t zmq::ip_addr_t::sockaddr_len () const
-{
-    return static_cast<zmq_socklen_t> (family () == AF_INET6 ? sizeof (ipv6)
-                                                             : sizeof (ipv4));
-}
-
-void zmq::ip_addr_t::set_port (uint16_t port_)
-{
-    if (family () == AF_INET6) {
-        ipv6.sin6_port = htons (port_);
-    } else {
-        ipv4.sin_port = htons (port_);
-    }
-}
-
-//  Construct an "ANY" address for the given family
-zmq::ip_addr_t zmq::ip_addr_t::any (int family_)
-{
-    ip_addr_t addr;
-
-    if (family_ == AF_INET) {
-        sockaddr_in *ip4_addr = &addr.ipv4;
-        memset (ip4_addr, 0, sizeof (*ip4_addr));
-        ip4_addr->sin_family = AF_INET;
-        ip4_addr->sin_addr.s_addr = htonl (INADDR_ANY);
-    } else if (family_ == AF_INET6) {
-        sockaddr_in6 *ip6_addr = &addr.ipv6;
-
-        memset (ip6_addr, 0, sizeof (*ip6_addr));
-        ip6_addr->sin6_family = AF_INET6;
-#ifdef ZMQ_HAVE_VXWORKS
-        struct in6_addr newaddr = IN6ADDR_ANY_INIT;
-        memcpy (&ip6_addr->sin6_addr, &newaddr, sizeof (in6_addr));
-#else
-        memcpy (&ip6_addr->sin6_addr, &in6addr_any, sizeof (in6addr_any));
-#endif
-    } else {
-        assert (0 == "unsupported address family");
-    }
-
-    return addr;
-}
-
-zmq::ip_resolver_options_t::ip_resolver_options_t () :
-    _bindable_wanted (false),
-    _nic_name_allowed (false),
-    _ipv6_wanted (false),
-    _port_expected (false),
-    _dns_allowed (false),
-    _path_allowed (false)
-{
-}
-
-zmq::ip_resolver_options_t &
-zmq::ip_resolver_options_t::bindable (bool bindable_)
-{
-    _bindable_wanted = bindable_;
-
-    return *this;
-}
-
-zmq::ip_resolver_options_t &
-zmq::ip_resolver_options_t::allow_nic_name (bool allow_)
-{
-    _nic_name_allowed = allow_;
-
-    return *this;
-}
-
-zmq::ip_resolver_options_t &zmq::ip_resolver_options_t::ipv6 (bool ipv6_)
-{
-    _ipv6_wanted = ipv6_;
-
-    return *this;
-}
-
-//  If true we expect that the host will be followed by a colon and a port
-//  number or service name
-zmq::ip_resolver_options_t &
-zmq::ip_resolver_options_t::expect_port (bool expect_)
-{
-    _port_expected = expect_;
-
-    return *this;
-}
-
-zmq::ip_resolver_options_t &zmq::ip_resolver_options_t::allow_dns (bool allow_)
-{
-    _dns_allowed = allow_;
-
-    return *this;
-}
-
-zmq::ip_resolver_options_t &zmq::ip_resolver_options_t::allow_path (bool allow_)
-{
-    _path_allowed = allow_;
-
-    return *this;
-}
-
-bool zmq::ip_resolver_options_t::bindable ()
-{
-    return _bindable_wanted;
-}
-
-bool zmq::ip_resolver_options_t::allow_nic_name ()
-{
-    return _nic_name_allowed;
-}
-
-bool zmq::ip_resolver_options_t::ipv6 ()
-{
-    return _ipv6_wanted;
-}
-
-bool zmq::ip_resolver_options_t::expect_port ()
-{
-    return _port_expected;
-}
-
-bool zmq::ip_resolver_options_t::allow_dns ()
-{
-    return _dns_allowed;
-}
-
-bool zmq::ip_resolver_options_t::allow_path ()
-{
-    return _path_allowed;
-}
-
-zmq::ip_resolver_t::ip_resolver_t (ip_resolver_options_t opts_) :
-    _options (opts_)
-{
-}
-
-int zmq::ip_resolver_t::resolve (ip_addr_t *ip_addr_, const char *name_)
-{
-    std::string addr;
-    uint16_t port;
-
-    if (_options.expect_port ()) {
-        //  We expect 'addr:port'. It's important to use str*r*chr to only get
-        //  the latest colon since IPv6 addresses use colons as delemiters.
-        const char *delim = strrchr (name_, ':');
-
-        if (delim == NULL) {
-            errno = EINVAL;
-            return -1;
-        }
-
-        addr = std::string (name_, delim - name_);
-        const std::string port_str = std::string (delim + 1);
-
-        if (port_str == "*") {
-            if (_options.bindable ()) {
-                //  Resolve wildcard to 0 to allow autoselection of port
-                port = 0;
-            } else {
-                errno = EINVAL;
-                return -1;
-            }
-        } else if (port_str == "0") {
-            //  Using "0" for a bind address is equivalent to using "*". For a
-            //  connectable address it could be used to connect to port 0.
-            port = 0;
-        } else {
-            //  Parse the port number (0 is not a valid port).
-            port = static_cast<uint16_t> (atoi (port_str.c_str ()));
-            if (port == 0) {
-                errno = EINVAL;
-                return -1;
-            }
-        }
-    } else {
-        addr = std::string (name_);
-        port = 0;
-    }
-
-    // Check if path is allowed in ip address, if allowed it must be truncated
-    if (_options.allow_path ()) {
-        const size_t pos = addr.find ('/');
-        if (pos != std::string::npos)
-            addr = addr.substr (0, pos);
-    }
-
-    //  Trim any square brackets surrounding the address. Used for
-    //  IPv6 addresses to remove the confusion with the port
-    //  delimiter.
-    //  TODO Should we validate that the brackets are present if
-    //  'addr' contains ':' ?
-    const size_t brackets_length = 2;
-    if (addr.size () >= brackets_length && addr[0] == '['
-        && addr[addr.size () - 1] == ']') {
-        addr = addr.substr (1, addr.size () - brackets_length);
-    }
-
-    //  Look for an interface name / zone_id in the address
-    //  Reference: https://tools.ietf.org/html/rfc4007
-    const std::size_t pos = addr.rfind ('%');
-    uint32_t zone_id = 0;
-
-    if (pos != std::string::npos) {
-        std::string if_str = addr.substr (pos + 1);
-        if (if_str.empty ()) {
-            errno = EINVAL;
-            return -1;
-        }
-        addr = addr.substr (0, pos);
-
-        if (isalpha (if_str.at (0))) {
-            zone_id = do_if_nametoindex (if_str.c_str ());
-        } else {
-            zone_id = static_cast<uint32_t> (atoi (if_str.c_str ()));
-        }
-
-        if (zone_id == 0) {
-            errno = EINVAL;
-            return -1;
-        }
-    }
-
-    bool resolved = false;
-    const char *addr_str = addr.c_str ();
-
-    if (_options.bindable () && addr == "*") {
-        //  Return an ANY address
-        *ip_addr_ = ip_addr_t::any (_options.ipv6 () ? AF_INET6 : AF_INET);
-        resolved = true;
-    }
-
-    if (!resolved && _options.allow_nic_name ()) {
-        //  Try to resolve the string as a NIC name.
-        const int rc = resolve_nic_name (ip_addr_, addr_str);
-
-        if (rc == 0) {
-            resolved = true;
-        } else if (errno != ENODEV) {
-            return rc;
-        }
-    }
-
-    if (!resolved) {
-        const int rc = resolve_getaddrinfo (ip_addr_, addr_str);
-
-        if (rc != 0) {
-            return rc;
-        }
-        resolved = true;
-    }
-
-    //  Store the port into the structure. We could get 'getaddrinfo' to do it
-    //  for us but since we don't resolve service names it's a bit overkill and
-    //  we'd still have to do it manually when the address is resolved by
-    //  'resolve_nic_name'
-    ip_addr_->set_port (port);
-
-    if (ip_addr_->family () == AF_INET6) {
-        ip_addr_->ipv6.sin6_scope_id = zone_id;
-    }
-
-    assert (resolved == true);
-    return 0;
-}
-
-int zmq::ip_resolver_t::resolve_getaddrinfo (ip_addr_t *ip_addr_,
-                                             const char *addr_)
-{
-#if defined ZMQ_HAVE_OPENVMS && defined __ia64
-    __addrinfo64 *res = NULL;
-    __addrinfo64 req;
-#else
-    addrinfo *res = NULL;
-    addrinfo req;
-#endif
-
-    memset (&req, 0, sizeof (req));
-
-    //  Choose IPv4 or IPv6 protocol family. Note that IPv6 allows for
-    //  IPv4-in-IPv6 addresses.
-    req.ai_family = _options.ipv6 () ? AF_INET6 : AF_INET;
-
-    //  Arbitrary, not used in the output, but avoids duplicate results.
-    req.ai_socktype = SOCK_STREAM;
-
-    req.ai_flags = 0;
-
-    if (_options.bindable ()) {
-        req.ai_flags |= AI_PASSIVE;
-    }
-
-    if (!_options.allow_dns ()) {
-        req.ai_flags |= AI_NUMERICHOST;
-    }
-
-#if defined AI_V4MAPPED
-    //  In this API we only require IPv4-mapped addresses when
-    //  no native IPv6 interfaces are available (~AI_ALL).
-    //  This saves an additional DNS roundtrip for IPv4 addresses.
-    if (req.ai_family == AF_INET6) {
-        req.ai_flags |= AI_V4MAPPED;
-    }
-#endif
-
-    //  Resolve the literal address. Some of the error info is lost in case
-    //  of error, however, there's no way to report EAI errors via errno.
-    int rc = do_getaddrinfo (addr_, NULL, &req, &res);
-
-#if defined AI_V4MAPPED
-    // Some OS do have AI_V4MAPPED defined but it is not supported in getaddrinfo()
-    // returning EAI_BADFLAGS. Detect this and retry
-    if (rc == EAI_BADFLAGS && (req.ai_flags & AI_V4MAPPED)) {
-        req.ai_flags &= ~AI_V4MAPPED;
-        rc = do_getaddrinfo (addr_, NULL, &req, &res);
-    }
-#endif
-
-#if defined ZMQ_HAVE_WINDOWS
-    //  Resolve specific case on Windows platform when using IPv4 address
-    //  with ZMQ_IPv6 socket option.
-    if ((req.ai_family == AF_INET6) && (rc == WSAHOST_NOT_FOUND)) {
-        req.ai_family = AF_INET;
-        rc = do_getaddrinfo (addr_, NULL, &req, &res);
-    }
-#endif
-
-    if (rc) {
-        switch (rc) {
-            case EAI_MEMORY:
-                errno = ENOMEM;
-                break;
-            default:
-                if (_options.bindable ()) {
-                    errno = ENODEV;
-                } else {
-                    errno = EINVAL;
-                }
-                break;
-        }
-        return -1;
-    }
-
-    //  Use the first result.
-    zmq_assert (res != NULL);
-    zmq_assert (static_cast<size_t> (res->ai_addrlen) <= sizeof (*ip_addr_));
-    memcpy (ip_addr_, res->ai_addr, res->ai_addrlen);
-
-    //  Cleanup getaddrinfo after copying the possibly referenced result.
-    do_freeaddrinfo (res);
-
-    return 0;
-}
-
-#ifdef ZMQ_HAVE_SOLARIS
-#include <sys/sockio.h>
-
-//  On Solaris platform, network interface name can be queried by ioctl.
-int zmq::ip_resolver_t::resolve_nic_name (ip_addr_t *ip_addr_, const char *nic_)
-{
-    //  Create a socket.
-    const int fd = open_socket (AF_INET, SOCK_DGRAM, 0);
-    errno_assert (fd != -1);
-
-    //  Retrieve number of interfaces.
-    lifnum ifn;
-    ifn.lifn_family = AF_INET;
-    ifn.lifn_flags = 0;
-    int rc = ioctl (fd, SIOCGLIFNUM, (char *) &ifn);
-    errno_assert (rc != -1);
-
-    //  Allocate memory to get interface names.
-    const size_t ifr_size = sizeof (struct lifreq) * ifn.lifn_count;
-    char *ifr = (char *) malloc (ifr_size);
-    alloc_assert (ifr);
-
-    //  Retrieve interface names.
-    lifconf ifc;
-    ifc.lifc_family = AF_INET;
-    ifc.lifc_flags = 0;
-    ifc.lifc_len = ifr_size;
-    ifc.lifc_buf = ifr;
-    rc = ioctl (fd, SIOCGLIFCONF, (char *) &ifc);
-    errno_assert (rc != -1);
-
-    //  Find the interface with the specified name and AF_INET family.
-    bool found = false;
-    lifreq *ifrp = ifc.lifc_req;
-    for (int n = 0; n < (int) (ifc.lifc_len / sizeof (lifreq)); n++, ifrp++) {
-        if (!strcmp (nic_, ifrp->lifr_name)) {
-            rc = ioctl (fd, SIOCGLIFADDR, (char *) ifrp);
-            errno_assert (rc != -1);
-            if (ifrp->lifr_addr.ss_family == AF_INET) {
-                ip_addr_->ipv4 = *(sockaddr_in *) &ifrp->lifr_addr;
-                found = true;
-                break;
-            }
-        }
-    }
-
-    //  Clean-up.
-    free (ifr);
-    close (fd);
-
-    if (!found) {
-        errno = ENODEV;
-        return -1;
-    }
-    return 0;
-}
-
-#elif defined ZMQ_HAVE_AIX || defined ZMQ_HAVE_HPUX                            \
-  || defined ZMQ_HAVE_ANDROID || defined ZMQ_HAVE_VXWORKS
-#include <sys/ioctl.h>
-#ifdef ZMQ_HAVE_VXWORKS
-#include <ioLib.h>
-#endif
-
-int zmq::ip_resolver_t::resolve_nic_name (ip_addr_t *ip_addr_, const char *nic_)
-{
-#if defined ZMQ_HAVE_AIX || defined ZMQ_HAVE_HPUX
-    // IPv6 support not implemented for AIX or HP/UX.
-    if (_options.ipv6 ()) {
-        errno = ENODEV;
-        return -1;
-    }
-#endif
-
-    //  Create a socket.
-    const int sd =
-      open_socket (_options.ipv6 () ? AF_INET6 : AF_INET, SOCK_DGRAM, 0);
-    errno_assert (sd != -1);
-
-    struct ifreq ifr;
-
-    //  Copy interface name for ioctl get.
-    strncpy (ifr.ifr_name, nic_, sizeof (ifr.ifr_name));
-
-    //  Fetch interface address.
-    const int rc = ioctl (sd, SIOCGIFADDR, (caddr_t) &ifr, sizeof (ifr));
-
-    //  Clean up.
-    close (sd);
-
-    if (rc == -1) {
-        errno = ENODEV;
-        return -1;
-    }
-
-    const int family = ifr.ifr_addr.sa_family;
-    if (family == (_options.ipv6 () ? AF_INET6 : AF_INET)
-        && !strcmp (nic_, ifr.ifr_name)) {
-        memcpy (ip_addr_, &ifr.ifr_addr,
-                (family == AF_INET) ? sizeof (struct sockaddr_in)
-                                    : sizeof (struct sockaddr_in6));
-    } else {
-        errno = ENODEV;
-        return -1;
-    }
-
-    return 0;
-}
-
-#elif ((defined ZMQ_HAVE_LINUX || defined ZMQ_HAVE_FREEBSD                     \
-        || defined ZMQ_HAVE_OSX || defined ZMQ_HAVE_OPENBSD                    \
-        || defined ZMQ_HAVE_QNXNTO || defined ZMQ_HAVE_NETBSD                  \
-        || defined ZMQ_HAVE_DRAGONFLY || defined ZMQ_HAVE_GNU)                 \
-       && defined ZMQ_HAVE_IFADDRS)
-
-#include <ifaddrs.h>
-
-//  On these platforms, network interface name can be queried
-//  using getifaddrs function.
-int zmq::ip_resolver_t::resolve_nic_name (ip_addr_t *ip_addr_, const char *nic_)
-{
-    //  Get the addresses.
-    ifaddrs *ifa = NULL;
-    int rc = 0;
-    const int max_attempts = 10;
-    const int backoff_msec = 1;
-    for (int i = 0; i < max_attempts; i++) {
-        rc = getifaddrs (&ifa);
-        if (rc == 0 || (rc < 0 && errno != ECONNREFUSED))
-            break;
-        usleep ((backoff_msec << i) * 1000);
-    }
-
-    if (rc != 0 && ((errno == EINVAL) || (errno == EOPNOTSUPP))) {
-        // Windows Subsystem for Linux compatibility
-        errno = ENODEV;
-        return -1;
-    }
-    errno_assert (rc == 0);
-    zmq_assert (ifa != NULL);
-
-    //  Find the corresponding network interface.
-    bool found = false;
-    for (const ifaddrs *ifp = ifa; ifp != NULL; ifp = ifp->ifa_next) {
-        if (ifp->ifa_addr == NULL)
-            continue;
-
-        const int family = ifp->ifa_addr->sa_family;
-        if (family == (_options.ipv6 () ? AF_INET6 : AF_INET)
-            && !strcmp (nic_, ifp->ifa_name)) {
-            memcpy (ip_addr_, ifp->ifa_addr,
-                    (family == AF_INET) ? sizeof (struct sockaddr_in)
-                                        : sizeof (struct sockaddr_in6));
-            found = true;
-            break;
-        }
-    }
-
-    //  Clean-up;
-    freeifaddrs (ifa);
-
-    if (!found) {
-        errno = ENODEV;
-        return -1;
-    }
-    return 0;
-}
-
-#elif (defined ZMQ_HAVE_WINDOWS)
-
-#include <netioapi.h>
-
-int zmq::ip_resolver_t::get_interface_name (unsigned long index_,
-                                            char **dest_) const
-{
-#ifdef ZMQ_HAVE_WINDOWS_UWP
-    char *buffer = (char *) malloc (1024);
-#else
-    char *buffer = static_cast<char *> (malloc (IF_MAX_STRING_SIZE));
-#endif
-    alloc_assert (buffer);
-
-    char *if_name_result = NULL;
-
-#if _WIN32_WINNT > _WIN32_WINNT_WINXP && !defined ZMQ_HAVE_WINDOWS_UWP
-    if_name_result = if_indextoname (index_, buffer);
-#endif
-
-    if (if_name_result == NULL) {
-        free (buffer);
-        return -1;
-    }
-
-    *dest_ = buffer;
-    return 0;
-}
-
-int zmq::ip_resolver_t::wchar_to_utf8 (const WCHAR *src_, char **dest_) const
-{
-    int rc;
-    const int buffer_len =
-      WideCharToMultiByte (CP_UTF8, 0, src_, -1, NULL, 0, NULL, 0);
-
-    char *buffer = static_cast<char *> (malloc (buffer_len));
-    alloc_assert (buffer);
-
-    rc =
-      WideCharToMultiByte (CP_UTF8, 0, src_, -1, buffer, buffer_len, NULL, 0);
-
-    if (rc == 0) {
-        free (buffer);
-        return -1;
-    }
-
-    *dest_ = buffer;
-    return 0;
-}
-
-int zmq::ip_resolver_t::resolve_nic_name (ip_addr_t *ip_addr_, const char *nic_)
-{
-    int rc;
-    bool found = false;
-    const int max_attempts = 10;
-
-    int iterations = 0;
-    IP_ADAPTER_ADDRESSES *addresses;
-    unsigned long out_buf_len = sizeof (IP_ADAPTER_ADDRESSES);
-
-    do {
-        addresses = static_cast<IP_ADAPTER_ADDRESSES *> (malloc (out_buf_len));
-        alloc_assert (addresses);
-
-        rc =
-          GetAdaptersAddresses (AF_UNSPEC,
-                                GAA_FLAG_SKIP_ANYCAST | GAA_FLAG_SKIP_MULTICAST
-                                  | GAA_FLAG_SKIP_DNS_SERVER,
-                                NULL, addresses, &out_buf_len);
-        if (rc == ERROR_BUFFER_OVERFLOW) {
-            free (addresses);
-            addresses = NULL;
-        } else {
-            break;
-        }
-        iterations++;
-    } while ((rc == ERROR_BUFFER_OVERFLOW) && (iterations < max_attempts));
-
-    if (rc == 0) {
-        for (const IP_ADAPTER_ADDRESSES *current_addresses = addresses;
-             current_addresses; current_addresses = current_addresses->Next) {
-            char *if_name = NULL;
-            char *if_friendly_name = NULL;
-
-            const int str_rc1 =
-              get_interface_name (current_addresses->IfIndex, &if_name);
-            const int str_rc2 = wchar_to_utf8 (current_addresses->FriendlyName,
-                                               &if_friendly_name);
-
-            //  Find a network adapter by its "name" or "friendly name"
-            if (((str_rc1 == 0) && (!strcmp (nic_, if_name)))
-                || ((str_rc2 == 0) && (!strcmp (nic_, if_friendly_name)))) {
-                //  Iterate over all unicast addresses bound to the current network interface
-                for (const IP_ADAPTER_UNICAST_ADDRESS *current_unicast_address =
-                       current_addresses->FirstUnicastAddress;
-                     current_unicast_address;
-                     current_unicast_address = current_unicast_address->Next) {
-                    const ADDRESS_FAMILY family =
-                      current_unicast_address->Address.lpSockaddr->sa_family;
-
-                    if (family == (_options.ipv6 () ? AF_INET6 : AF_INET)) {
-                        memcpy (
-                          ip_addr_, current_unicast_address->Address.lpSockaddr,
-                          (family == AF_INET) ? sizeof (struct sockaddr_in)
-                                              : sizeof (struct sockaddr_in6));
-                        found = true;
-                        break;
-                    }
-                }
-
-                if (found)
-                    break;
-            }
-
-            if (str_rc1 == 0)
-                free (if_name);
-            if (str_rc2 == 0)
-                free (if_friendly_name);
-        }
-
-        free (addresses);
-    }
-
-    if (!found) {
-        errno = ENODEV;
-        return -1;
-    }
-    return 0;
-}
-
-#else
-
-//  On other platforms we assume there are no sane interface names.
-int zmq::ip_resolver_t::resolve_nic_name (ip_addr_t *ip_addr_, const char *nic_)
-{
-    LIBZMQ_UNUSED (ip_addr_);
-    LIBZMQ_UNUSED (nic_);
-
-    errno = ENODEV;
-    return -1;
-}
-
-#endif
-
-int zmq::ip_resolver_t::do_getaddrinfo (const char *node_,
-                                        const char *service_,
-                                        const struct addrinfo *hints_,
-                                        struct addrinfo **res_)
-{
-    return getaddrinfo (node_, service_, hints_, res_);
-}
-
-void zmq::ip_resolver_t::do_freeaddrinfo (struct addrinfo *res_)
-{
-    freeaddrinfo (res_);
-}
-
-
-unsigned int zmq::ip_resolver_t::do_if_nametoindex (const char *ifname_)
-{
-#ifdef HAVE_IF_NAMETOINDEX
-    return if_nametoindex (ifname_);
-#else
-    LIBZMQ_UNUSED (ifname_);
-    // The function 'if_nametoindex' is not supported on Windows XP.
-    // If we are targeting XP using a vxxx_xp toolset then fail.
-    // This is brutal as this code could be run on later windows clients
-    // meaning the IPv6 zone_id cannot have an interface name.
-    // This could be fixed with a runtime check.
-    return 0;
-#endif
-}
diff --git a/libs/libzmq/src/ip_resolver.hpp b/libs/libzmq/src/ip_resolver.hpp
deleted file mode 100644
index e60f635..0000000
--- a/libs/libzmq/src/ip_resolver.hpp
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
-    Copyright (c) 2007-2018 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_IP_RESOLVER_HPP_INCLUDED__
-#define __ZMQ_IP_RESOLVER_HPP_INCLUDED__
-
-#if !defined ZMQ_HAVE_WINDOWS
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#endif
-
-#include "address.hpp"
-
-namespace zmq
-{
-union ip_addr_t
-{
-    sockaddr generic;
-    sockaddr_in ipv4;
-    sockaddr_in6 ipv6;
-
-    int family () const;
-    bool is_multicast () const;
-    uint16_t port () const;
-
-    const struct sockaddr *as_sockaddr () const;
-    zmq_socklen_t sockaddr_len () const;
-
-    void set_port (uint16_t);
-
-    static ip_addr_t any (int family_);
-};
-
-class ip_resolver_options_t
-{
-  public:
-    ip_resolver_options_t ();
-
-    ip_resolver_options_t &bindable (bool bindable_);
-    ip_resolver_options_t &allow_nic_name (bool allow_);
-    ip_resolver_options_t &ipv6 (bool ipv6_);
-    ip_resolver_options_t &expect_port (bool expect_);
-    ip_resolver_options_t &allow_dns (bool allow_);
-    ip_resolver_options_t &allow_path (bool allow_);
-
-    bool bindable ();
-    bool allow_nic_name ();
-    bool ipv6 ();
-    bool expect_port ();
-    bool allow_dns ();
-    bool allow_path ();
-
-  private:
-    bool _bindable_wanted;
-    bool _nic_name_allowed;
-    bool _ipv6_wanted;
-    bool _port_expected;
-    bool _dns_allowed;
-    bool _path_allowed;
-};
-
-class ip_resolver_t
-{
-  public:
-    ip_resolver_t (ip_resolver_options_t opts_);
-    virtual ~ip_resolver_t (){};
-
-    int resolve (ip_addr_t *ip_addr_, const char *name_);
-
-  protected:
-    //  Virtual functions that are overridden in tests
-    virtual int do_getaddrinfo (const char *node_,
-                                const char *service_,
-                                const struct addrinfo *hints_,
-                                struct addrinfo **res_);
-
-    virtual void do_freeaddrinfo (struct addrinfo *res_);
-
-    virtual unsigned int do_if_nametoindex (const char *ifname_);
-
-  private:
-    ip_resolver_options_t _options;
-
-    int resolve_nic_name (ip_addr_t *ip_addr_, const char *nic_);
-    int resolve_getaddrinfo (ip_addr_t *ip_addr_, const char *addr_);
-
-#if defined ZMQ_HAVE_WINDOWS
-    int get_interface_name (unsigned long index_, char **dest_) const;
-    int wchar_to_utf8 (const WCHAR *src_, char **dest_) const;
-#endif
-};
-}
-
-#endif
diff --git a/libs/libzmq/src/ipc_address.cpp b/libs/libzmq/src/ipc_address.cpp
deleted file mode 100644
index f1f5651..0000000
--- a/libs/libzmq/src/ipc_address.cpp
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "compat.hpp"
-#include "ipc_address.hpp"
-
-#if defined ZMQ_HAVE_IPC
-
-#include "err.hpp"
-
-#include <string>
-
-zmq::ipc_address_t::ipc_address_t ()
-{
-    memset (&_address, 0, sizeof _address);
-}
-
-zmq::ipc_address_t::ipc_address_t (const sockaddr *sa_, socklen_t sa_len_) :
-    _addrlen (sa_len_)
-{
-    zmq_assert (sa_ && sa_len_ > 0);
-
-    memset (&_address, 0, sizeof _address);
-    if (sa_->sa_family == AF_UNIX)
-        memcpy (&_address, sa_, sa_len_);
-}
-
-zmq::ipc_address_t::~ipc_address_t ()
-{
-}
-
-int zmq::ipc_address_t::resolve (const char *path_)
-{
-    const size_t path_len = strlen (path_);
-    if (path_len >= sizeof _address.sun_path) {
-        errno = ENAMETOOLONG;
-        return -1;
-    }
-    if (path_[0] == '@' && !path_[1]) {
-        errno = EINVAL;
-        return -1;
-    }
-
-    _address.sun_family = AF_UNIX;
-    memcpy (_address.sun_path, path_, path_len + 1);
-    /* Abstract sockets start with '\0' */
-    if (path_[0] == '@')
-        *_address.sun_path = '\0';
-
-    _addrlen =
-      static_cast<socklen_t> (offsetof (sockaddr_un, sun_path) + path_len);
-    return 0;
-}
-
-int zmq::ipc_address_t::to_string (std::string &addr_) const
-{
-    if (_address.sun_family != AF_UNIX) {
-        addr_.clear ();
-        return -1;
-    }
-
-    const char prefix[] = "ipc://";
-    char buf[sizeof prefix + sizeof _address.sun_path];
-    char *pos = buf;
-    memcpy (pos, prefix, sizeof prefix - 1);
-    pos += sizeof prefix - 1;
-    const char *src_pos = _address.sun_path;
-    if (!_address.sun_path[0] && _address.sun_path[1]) {
-        *pos++ = '@';
-        src_pos++;
-    }
-    // according to http://man7.org/linux/man-pages/man7/unix.7.html, NOTES
-    // section, address.sun_path might not always be null-terminated; therefore,
-    // we calculate the length based of addrlen
-    const size_t src_len =
-      strnlen (src_pos, _addrlen - offsetof (sockaddr_un, sun_path)
-                          - (src_pos - _address.sun_path));
-    memcpy (pos, src_pos, src_len);
-    addr_.assign (buf, pos - buf + src_len);
-    return 0;
-}
-
-const sockaddr *zmq::ipc_address_t::addr () const
-{
-    return reinterpret_cast<const sockaddr *> (&_address);
-}
-
-socklen_t zmq::ipc_address_t::addrlen () const
-{
-    return _addrlen;
-}
-
-#endif
diff --git a/libs/libzmq/src/ipc_address.hpp b/libs/libzmq/src/ipc_address.hpp
deleted file mode 100644
index 4c2277d..0000000
--- a/libs/libzmq/src/ipc_address.hpp
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_IPC_ADDRESS_HPP_INCLUDED__
-#define __ZMQ_IPC_ADDRESS_HPP_INCLUDED__
-
-#if defined ZMQ_HAVE_IPC
-
-#include <string>
-
-#if defined _MSC_VER
-#include <afunix.h>
-#else
-#include <sys/socket.h>
-#include <sys/un.h>
-#endif
-
-#include "macros.hpp"
-
-namespace zmq
-{
-class ipc_address_t
-{
-  public:
-    ipc_address_t ();
-    ipc_address_t (const sockaddr *sa_, socklen_t sa_len_);
-    ~ipc_address_t ();
-
-    //  This function sets up the address for UNIX domain transport.
-    int resolve (const char *path_);
-
-    //  The opposite to resolve()
-    int to_string (std::string &addr_) const;
-
-    const sockaddr *addr () const;
-    socklen_t addrlen () const;
-
-  private:
-    struct sockaddr_un _address;
-    socklen_t _addrlen;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (ipc_address_t)
-};
-}
-
-#endif
-
-#endif
diff --git a/libs/libzmq/src/ipc_connecter.cpp b/libs/libzmq/src/ipc_connecter.cpp
deleted file mode 100644
index 8dd01f0..0000000
--- a/libs/libzmq/src/ipc_connecter.cpp
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "ipc_connecter.hpp"
-
-#if defined ZMQ_HAVE_IPC
-
-#include <new>
-#include <string>
-
-#include "io_thread.hpp"
-#include "random.hpp"
-#include "err.hpp"
-#include "ip.hpp"
-#include "address.hpp"
-#include "ipc_address.hpp"
-#include "session_base.hpp"
-
-#ifdef _MSC_VER
-#include <afunix.h>
-#else
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/un.h>
-#endif
-
-zmq::ipc_connecter_t::ipc_connecter_t (class io_thread_t *io_thread_,
-                                       class session_base_t *session_,
-                                       const options_t &options_,
-                                       address_t *addr_,
-                                       bool delayed_start_) :
-    stream_connecter_base_t (
-      io_thread_, session_, options_, addr_, delayed_start_)
-{
-    zmq_assert (_addr->protocol == protocol_name::ipc);
-}
-
-void zmq::ipc_connecter_t::out_event ()
-{
-    const fd_t fd = connect ();
-    rm_handle ();
-
-    //  Handle the error condition by attempt to reconnect.
-    if (fd == retired_fd) {
-        close ();
-        add_reconnect_timer ();
-        return;
-    }
-
-    create_engine (fd, get_socket_name<ipc_address_t> (fd, socket_end_local));
-}
-
-void zmq::ipc_connecter_t::start_connecting ()
-{
-    //  Open the connecting socket.
-    const int rc = open ();
-
-    //  Connect may succeed in synchronous manner.
-    if (rc == 0) {
-        _handle = add_fd (_s);
-        out_event ();
-    }
-
-    //  Connection establishment may be delayed. Poll for its completion.
-    else if (rc == -1 && errno == EINPROGRESS) {
-        _handle = add_fd (_s);
-        set_pollout (_handle);
-        _socket->event_connect_delayed (
-          make_unconnected_connect_endpoint_pair (_endpoint), zmq_errno ());
-
-        // TODO, tcp_connecter_t adds a connect timer in this case; maybe this
-        // should be done here as well (and then this could be pulled up to
-        // stream_connecter_base_t).
-    }
-    //stop connecting after called zmq_disconnect
-    else if (rc == -1
-             && (options.reconnect_stop & ZMQ_RECONNECT_STOP_AFTER_DISCONNECT)
-             && errno == ECONNREFUSED && _socket->is_disconnected ()) {
-        if (_s != retired_fd)
-            close ();
-    }
-
-    //  Handle any other error condition by eventual reconnect.
-    else {
-        if (_s != retired_fd)
-            close ();
-        add_reconnect_timer ();
-    }
-}
-
-int zmq::ipc_connecter_t::open ()
-{
-    zmq_assert (_s == retired_fd);
-
-    //  Create the socket.
-    _s = open_socket (AF_UNIX, SOCK_STREAM, 0);
-    if (_s == retired_fd)
-        return -1;
-
-    //  Set the non-blocking flag.
-    unblock_socket (_s);
-
-    //  Connect to the remote peer.
-    const int rc = ::connect (_s, _addr->resolved.ipc_addr->addr (),
-                              _addr->resolved.ipc_addr->addrlen ());
-
-    //  Connect was successful immediately.
-    if (rc == 0)
-        return 0;
-
-        //  Translate other error codes indicating asynchronous connect has been
-        //  launched to a uniform EINPROGRESS.
-#ifdef ZMQ_HAVE_WINDOWS
-    const int last_error = WSAGetLastError ();
-    if (last_error == WSAEINPROGRESS || last_error == WSAEWOULDBLOCK)
-        errno = EINPROGRESS;
-    else
-        errno = wsa_error_to_errno (last_error);
-#else
-    if (rc == -1 && errno == EINTR) {
-        errno = EINPROGRESS;
-    }
-#endif
-
-    //  Forward the error.
-    return -1;
-}
-
-zmq::fd_t zmq::ipc_connecter_t::connect ()
-{
-    //  Following code should handle both Berkeley-derived socket
-    //  implementations and Solaris.
-    int err = 0;
-    zmq_socklen_t len = static_cast<zmq_socklen_t> (sizeof (err));
-    const int rc = getsockopt (_s, SOL_SOCKET, SO_ERROR,
-                               reinterpret_cast<char *> (&err), &len);
-    if (rc == -1) {
-        if (errno == ENOPROTOOPT)
-            errno = 0;
-        err = errno;
-    }
-    if (err != 0) {
-        //  Assert if the error was caused by 0MQ bug.
-        //  Networking problems are OK. No need to assert.
-        errno = err;
-        errno_assert (errno == ECONNREFUSED || errno == ECONNRESET
-                      || errno == ETIMEDOUT || errno == EHOSTUNREACH
-                      || errno == ENETUNREACH || errno == ENETDOWN);
-
-        return retired_fd;
-    }
-
-    const fd_t result = _s;
-    _s = retired_fd;
-    return result;
-}
-
-#endif
diff --git a/libs/libzmq/src/ipc_connecter.hpp b/libs/libzmq/src/ipc_connecter.hpp
deleted file mode 100644
index 1f85c89..0000000
--- a/libs/libzmq/src/ipc_connecter.hpp
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __IPC_CONNECTER_HPP_INCLUDED__
-#define __IPC_CONNECTER_HPP_INCLUDED__
-
-#if defined ZMQ_HAVE_IPC
-
-#include "fd.hpp"
-#include "stream_connecter_base.hpp"
-
-namespace zmq
-{
-class ipc_connecter_t ZMQ_FINAL : public stream_connecter_base_t
-{
-  public:
-    //  If 'delayed_start' is true connecter first waits for a while,
-    //  then starts connection process.
-    ipc_connecter_t (zmq::io_thread_t *io_thread_,
-                     zmq::session_base_t *session_,
-                     const options_t &options_,
-                     address_t *addr_,
-                     bool delayed_start_);
-
-  private:
-    //  Handlers for I/O events.
-    void out_event ();
-
-    //  Internal function to start the actual connection establishment.
-    void start_connecting ();
-
-    //  Open IPC connecting socket. Returns -1 in case of error,
-    //  0 if connect was successful immediately. Returns -1 with
-    //  EAGAIN errno if async connect was launched.
-    int open ();
-
-    //  Get the file descriptor of newly created connection. Returns
-    //  retired_fd if the connection was unsuccessful.
-    fd_t connect ();
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (ipc_connecter_t)
-};
-}
-
-#endif
-
-#endif
diff --git a/libs/libzmq/src/ipc_listener.cpp b/libs/libzmq/src/ipc_listener.cpp
deleted file mode 100644
index d6f7ee5..0000000
--- a/libs/libzmq/src/ipc_listener.cpp
+++ /dev/null
@@ -1,356 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "ipc_listener.hpp"
-
-#if defined ZMQ_HAVE_IPC
-
-#include <new>
-
-#include <string.h>
-
-#include "ipc_address.hpp"
-#include "io_thread.hpp"
-#include "config.hpp"
-#include "err.hpp"
-#include "ip.hpp"
-#include "socket_base.hpp"
-#include "address.hpp"
-
-#ifdef _MSC_VER
-#ifdef ZMQ_IOTHREAD_POLLER_USE_SELECT
-#error On Windows, IPC does not work with POLLER=select, use POLLER=epoll instead, or disable IPC transport
-#endif
-
-#include <afunix.h>
-#include <direct.h>
-
-#define rmdir _rmdir
-#define unlink _unlink
-
-#else
-#include <unistd.h>
-#include <sys/socket.h>
-#include <fcntl.h>
-#include <sys/un.h>
-#endif
-
-#ifdef ZMQ_HAVE_LOCAL_PEERCRED
-#include <sys/types.h>
-#include <sys/ucred.h>
-#endif
-#ifdef ZMQ_HAVE_SO_PEERCRED
-#include <sys/types.h>
-#include <pwd.h>
-#include <grp.h>
-#if defined ZMQ_HAVE_OPENBSD
-#define ucred sockpeercred
-#endif
-#endif
-
-zmq::ipc_listener_t::ipc_listener_t (io_thread_t *io_thread_,
-                                     socket_base_t *socket_,
-                                     const options_t &options_) :
-    stream_listener_base_t (io_thread_, socket_, options_), _has_file (false)
-{
-}
-
-void zmq::ipc_listener_t::in_event ()
-{
-    const fd_t fd = accept ();
-
-    //  If connection was reset by the peer in the meantime, just ignore it.
-    //  TODO: Handle specific errors like ENFILE/EMFILE etc.
-    if (fd == retired_fd) {
-        _socket->event_accept_failed (
-          make_unconnected_bind_endpoint_pair (_endpoint), zmq_errno ());
-        return;
-    }
-
-    //  Create the engine object for this connection.
-    create_engine (fd);
-}
-
-std::string
-zmq::ipc_listener_t::get_socket_name (zmq::fd_t fd_,
-                                      socket_end_t socket_end_) const
-{
-    return zmq::get_socket_name<ipc_address_t> (fd_, socket_end_);
-}
-
-int zmq::ipc_listener_t::set_local_address (const char *addr_)
-{
-    //  Create addr on stack for auto-cleanup
-    std::string addr (addr_);
-
-    //  Allow wildcard file
-    if (options.use_fd == -1 && addr[0] == '*') {
-        if (create_ipc_wildcard_address (_tmp_socket_dirname, addr) < 0) {
-            return -1;
-        }
-    }
-
-    //  Get rid of the file associated with the UNIX domain socket that
-    //  may have been left behind by the previous run of the application.
-    //  MUST NOT unlink if the FD is managed by the user, or it will stop
-    //  working after the first client connects. The user will take care of
-    //  cleaning up the file after the service is stopped.
-    if (options.use_fd == -1) {
-        ::unlink (addr.c_str ());
-    }
-    _filename.clear ();
-
-    //  Initialise the address structure.
-    ipc_address_t address;
-    int rc = address.resolve (addr.c_str ());
-    if (rc != 0) {
-        if (!_tmp_socket_dirname.empty ()) {
-            // We need to preserve errno to return to the user
-            const int tmp_errno = errno;
-            ::rmdir (_tmp_socket_dirname.c_str ());
-            _tmp_socket_dirname.clear ();
-            errno = tmp_errno;
-        }
-        return -1;
-    }
-
-    address.to_string (_endpoint);
-
-    if (options.use_fd != -1) {
-        _s = options.use_fd;
-    } else {
-        //  Create a listening socket.
-        _s = open_socket (AF_UNIX, SOCK_STREAM, 0);
-        if (_s == retired_fd) {
-            if (!_tmp_socket_dirname.empty ()) {
-                // We need to preserve errno to return to the user
-                const int tmp_errno = errno;
-                ::rmdir (_tmp_socket_dirname.c_str ());
-                _tmp_socket_dirname.clear ();
-                errno = tmp_errno;
-            }
-            return -1;
-        }
-
-        //  Bind the socket to the file path.
-        rc = bind (_s, const_cast<sockaddr *> (address.addr ()),
-                   address.addrlen ());
-        if (rc != 0)
-            goto error;
-
-        //  Listen for incoming connections.
-        rc = listen (_s, options.backlog);
-        if (rc != 0)
-            goto error;
-    }
-
-    _filename = ZMQ_MOVE (addr);
-    _has_file = true;
-
-    _socket->event_listening (make_unconnected_bind_endpoint_pair (_endpoint),
-                              _s);
-    return 0;
-
-error:
-    const int err = errno;
-    close ();
-    errno = err;
-    return -1;
-}
-
-int zmq::ipc_listener_t::close ()
-{
-    zmq_assert (_s != retired_fd);
-    const fd_t fd_for_event = _s;
-#ifdef ZMQ_HAVE_WINDOWS
-    int rc = closesocket (_s);
-    wsa_assert (rc != SOCKET_ERROR);
-#else
-    int rc = ::close (_s);
-    errno_assert (rc == 0);
-#endif
-
-    _s = retired_fd;
-
-    if (_has_file && options.use_fd == -1) {
-        if (!_tmp_socket_dirname.empty ()) {
-            //  TODO review this behaviour, it is inconsistent with the use of
-            //  unlink in open since 656cdb959a7482c45db979c1d08ede585d12e315;
-            //  however, we must at least remove the file before removing the
-            //  directory, otherwise it will always fail
-            rc = ::unlink (_filename.c_str ());
-
-            if (rc == 0) {
-                rc = ::rmdir (_tmp_socket_dirname.c_str ());
-                _tmp_socket_dirname.clear ();
-            }
-        }
-
-        if (rc != 0) {
-            _socket->event_close_failed (
-              make_unconnected_bind_endpoint_pair (_endpoint), zmq_errno ());
-            return -1;
-        }
-    }
-
-    _socket->event_closed (make_unconnected_bind_endpoint_pair (_endpoint),
-                           fd_for_event);
-    return 0;
-}
-
-#if defined ZMQ_HAVE_SO_PEERCRED
-
-bool zmq::ipc_listener_t::filter (fd_t sock_)
-{
-    if (options.ipc_uid_accept_filters.empty ()
-        && options.ipc_pid_accept_filters.empty ()
-        && options.ipc_gid_accept_filters.empty ())
-        return true;
-
-    struct ucred cred;
-    socklen_t size = sizeof (cred);
-
-    if (getsockopt (sock_, SOL_SOCKET, SO_PEERCRED, &cred, &size))
-        return false;
-    if (options.ipc_uid_accept_filters.find (cred.uid)
-          != options.ipc_uid_accept_filters.end ()
-        || options.ipc_gid_accept_filters.find (cred.gid)
-             != options.ipc_gid_accept_filters.end ()
-        || options.ipc_pid_accept_filters.find (cred.pid)
-             != options.ipc_pid_accept_filters.end ())
-        return true;
-
-    const struct passwd *pw;
-    const struct group *gr;
-
-    if (!(pw = getpwuid (cred.uid)))
-        return false;
-    for (options_t::ipc_gid_accept_filters_t::const_iterator
-           it = options.ipc_gid_accept_filters.begin (),
-           end = options.ipc_gid_accept_filters.end ();
-         it != end; it++) {
-        if (!(gr = getgrgid (*it)))
-            continue;
-        for (char **mem = gr->gr_mem; *mem; mem++) {
-            if (!strcmp (*mem, pw->pw_name))
-                return true;
-        }
-    }
-    return false;
-}
-
-#elif defined ZMQ_HAVE_LOCAL_PEERCRED
-
-bool zmq::ipc_listener_t::filter (fd_t sock_)
-{
-    if (options.ipc_uid_accept_filters.empty ()
-        && options.ipc_gid_accept_filters.empty ())
-        return true;
-
-    struct xucred cred;
-    socklen_t size = sizeof (cred);
-
-    if (getsockopt (sock_, 0, LOCAL_PEERCRED, &cred, &size))
-        return false;
-    if (cred.cr_version != XUCRED_VERSION)
-        return false;
-    if (options.ipc_uid_accept_filters.find (cred.cr_uid)
-        != options.ipc_uid_accept_filters.end ())
-        return true;
-    for (int i = 0; i < cred.cr_ngroups; i++) {
-        if (options.ipc_gid_accept_filters.find (cred.cr_groups[i])
-            != options.ipc_gid_accept_filters.end ())
-            return true;
-    }
-
-    return false;
-}
-
-#endif
-
-zmq::fd_t zmq::ipc_listener_t::accept ()
-{
-    //  Accept one connection and deal with different failure modes.
-    //  The situation where connection cannot be accepted due to insufficient
-    //  resources is considered valid and treated by ignoring the connection.
-    zmq_assert (_s != retired_fd);
-#if defined ZMQ_HAVE_SOCK_CLOEXEC && defined HAVE_ACCEPT4
-    fd_t sock = ::accept4 (_s, NULL, NULL, SOCK_CLOEXEC);
-#else
-    struct sockaddr_storage ss;
-    memset (&ss, 0, sizeof (ss));
-#if defined ZMQ_HAVE_HPUX || defined ZMQ_HAVE_VXWORKS
-    int ss_len = sizeof (ss);
-#else
-    socklen_t ss_len = sizeof (ss);
-#endif
-
-    const fd_t sock =
-      ::accept (_s, reinterpret_cast<struct sockaddr *> (&ss), &ss_len);
-#endif
-    if (sock == retired_fd) {
-#if defined ZMQ_HAVE_WINDOWS
-        const int last_error = WSAGetLastError ();
-        wsa_assert (last_error == WSAEWOULDBLOCK || last_error == WSAECONNRESET
-                    || last_error == WSAEMFILE || last_error == WSAENOBUFS);
-#else
-        errno_assert (errno == EAGAIN || errno == EWOULDBLOCK || errno == EINTR
-                      || errno == ECONNABORTED || errno == EPROTO
-                      || errno == ENFILE);
-#endif
-        return retired_fd;
-    }
-
-    make_socket_noninheritable (sock);
-
-    // IPC accept() filters
-#if defined ZMQ_HAVE_SO_PEERCRED || defined ZMQ_HAVE_LOCAL_PEERCRED
-    if (!filter (sock)) {
-        int rc = ::close (sock);
-        errno_assert (rc == 0);
-        return retired_fd;
-    }
-#endif
-
-    if (zmq::set_nosigpipe (sock)) {
-#ifdef ZMQ_HAVE_WINDOWS
-        const int rc = closesocket (sock);
-        wsa_assert (rc != SOCKET_ERROR);
-#else
-        int rc = ::close (sock);
-        errno_assert (rc == 0);
-#endif
-        return retired_fd;
-    }
-
-    return sock;
-}
-
-#endif
diff --git a/libs/libzmq/src/ipc_listener.hpp b/libs/libzmq/src/ipc_listener.hpp
deleted file mode 100644
index 85c7d41..0000000
--- a/libs/libzmq/src/ipc_listener.hpp
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_IPC_LISTENER_HPP_INCLUDED__
-#define __ZMQ_IPC_LISTENER_HPP_INCLUDED__
-
-#if defined ZMQ_HAVE_IPC
-
-#include <string>
-
-#include "fd.hpp"
-#include "stream_listener_base.hpp"
-
-namespace zmq
-{
-class ipc_listener_t ZMQ_FINAL : public stream_listener_base_t
-{
-  public:
-    ipc_listener_t (zmq::io_thread_t *io_thread_,
-                    zmq::socket_base_t *socket_,
-                    const options_t &options_);
-
-    //  Set address to listen on.
-    int set_local_address (const char *addr_);
-
-  protected:
-    std::string get_socket_name (fd_t fd_, socket_end_t socket_end_) const;
-
-  private:
-    //  Handlers for I/O events.
-    void in_event ();
-
-    //  Filter new connections if the OS provides a mechanism to get
-    //  the credentials of the peer process.  Called from accept().
-#if defined ZMQ_HAVE_SO_PEERCRED || defined ZMQ_HAVE_LOCAL_PEERCRED
-    bool filter (fd_t sock_);
-#endif
-
-    int close ();
-
-    //  Accept the new connection. Returns the file descriptor of the
-    //  newly created connection. The function may return retired_fd
-    //  if the connection was dropped while waiting in the listen backlog.
-    fd_t accept ();
-
-    //  True, if the underlying file for UNIX domain socket exists.
-    bool _has_file;
-
-    //  Name of the temporary directory (if any) that has the
-    //  UNIX domain socket
-    std::string _tmp_socket_dirname;
-
-    //  Name of the file associated with the UNIX domain address.
-    std::string _filename;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (ipc_listener_t)
-};
-}
-
-#endif
-
-#endif
diff --git a/libs/libzmq/src/kqueue.cpp b/libs/libzmq/src/kqueue.cpp
deleted file mode 100644
index a6a7a7f..0000000
--- a/libs/libzmq/src/kqueue.cpp
+++ /dev/null
@@ -1,230 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "kqueue.hpp"
-#if defined ZMQ_IOTHREAD_POLLER_USE_KQUEUE
-
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/event.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <algorithm>
-#include <new>
-
-#include "macros.hpp"
-#include "kqueue.hpp"
-#include "err.hpp"
-#include "config.hpp"
-#include "i_poll_events.hpp"
-#include "likely.hpp"
-
-// NetBSD up to version 9 defines (struct kevent).udata as intptr_t,
-// everyone else as void *.
-#if defined ZMQ_HAVE_NETBSD && defined(ZMQ_NETBSD_KEVENT_UDATA_INTPTR_T)
-#define kevent_udata_t intptr_t
-#else
-#define kevent_udata_t void *
-#endif
-
-zmq::kqueue_t::kqueue_t (const zmq::thread_ctx_t &ctx_) :
-    worker_poller_base_t (ctx_)
-{
-    //  Create event queue
-    kqueue_fd = kqueue ();
-    errno_assert (kqueue_fd != -1);
-#ifdef HAVE_FORK
-    pid = getpid ();
-#endif
-}
-
-zmq::kqueue_t::~kqueue_t ()
-{
-    stop_worker ();
-    close (kqueue_fd);
-}
-
-void zmq::kqueue_t::kevent_add (fd_t fd_, short filter_, void *udata_)
-{
-    check_thread ();
-    struct kevent ev;
-
-    EV_SET (&ev, fd_, filter_, EV_ADD, 0, 0, (kevent_udata_t) udata_);
-    int rc = kevent (kqueue_fd, &ev, 1, NULL, 0, NULL);
-    errno_assert (rc != -1);
-}
-
-void zmq::kqueue_t::kevent_delete (fd_t fd_, short filter_)
-{
-    struct kevent ev;
-
-    EV_SET (&ev, fd_, filter_, EV_DELETE, 0, 0, 0);
-    int rc = kevent (kqueue_fd, &ev, 1, NULL, 0, NULL);
-    errno_assert (rc != -1);
-}
-
-zmq::kqueue_t::handle_t zmq::kqueue_t::add_fd (fd_t fd_,
-                                               i_poll_events *reactor_)
-{
-    check_thread ();
-    poll_entry_t *pe = new (std::nothrow) poll_entry_t;
-    alloc_assert (pe);
-
-    pe->fd = fd_;
-    pe->flag_pollin = 0;
-    pe->flag_pollout = 0;
-    pe->reactor = reactor_;
-
-    adjust_load (1);
-
-    return pe;
-}
-
-void zmq::kqueue_t::rm_fd (handle_t handle_)
-{
-    check_thread ();
-    poll_entry_t *pe = (poll_entry_t *) handle_;
-    if (pe->flag_pollin)
-        kevent_delete (pe->fd, EVFILT_READ);
-    if (pe->flag_pollout)
-        kevent_delete (pe->fd, EVFILT_WRITE);
-    pe->fd = retired_fd;
-    retired.push_back (pe);
-
-    adjust_load (-1);
-}
-
-void zmq::kqueue_t::set_pollin (handle_t handle_)
-{
-    check_thread ();
-    poll_entry_t *pe = (poll_entry_t *) handle_;
-    if (likely (!pe->flag_pollin)) {
-        pe->flag_pollin = true;
-        kevent_add (pe->fd, EVFILT_READ, pe);
-    }
-}
-
-void zmq::kqueue_t::reset_pollin (handle_t handle_)
-{
-    check_thread ();
-    poll_entry_t *pe = (poll_entry_t *) handle_;
-    if (likely (pe->flag_pollin)) {
-        pe->flag_pollin = false;
-        kevent_delete (pe->fd, EVFILT_READ);
-    }
-}
-
-void zmq::kqueue_t::set_pollout (handle_t handle_)
-{
-    check_thread ();
-    poll_entry_t *pe = (poll_entry_t *) handle_;
-    if (likely (!pe->flag_pollout)) {
-        pe->flag_pollout = true;
-        kevent_add (pe->fd, EVFILT_WRITE, pe);
-    }
-}
-
-void zmq::kqueue_t::reset_pollout (handle_t handle_)
-{
-    check_thread ();
-    poll_entry_t *pe = (poll_entry_t *) handle_;
-    if (likely (pe->flag_pollout)) {
-        pe->flag_pollout = false;
-        kevent_delete (pe->fd, EVFILT_WRITE);
-    }
-}
-
-void zmq::kqueue_t::stop ()
-{
-}
-
-int zmq::kqueue_t::max_fds ()
-{
-    return -1;
-}
-
-void zmq::kqueue_t::loop ()
-{
-    while (true) {
-        //  Execute any due timers.
-        int timeout = (int) execute_timers ();
-
-        if (get_load () == 0) {
-            if (timeout == 0)
-                break;
-
-            // TODO sleep for timeout
-            continue;
-        }
-
-        //  Wait for events.
-        struct kevent ev_buf[max_io_events];
-        timespec ts = {timeout / 1000, (timeout % 1000) * 1000000};
-        int n = kevent (kqueue_fd, NULL, 0, &ev_buf[0], max_io_events,
-                        timeout ? &ts : NULL);
-#ifdef HAVE_FORK
-        if (unlikely (pid != getpid ())) {
-            //printf("zmq::kqueue_t::loop aborting on forked child %d\n", (int)getpid());
-            // simply exit the loop in a forked process.
-            return;
-        }
-#endif
-        if (n == -1) {
-            errno_assert (errno == EINTR);
-            continue;
-        }
-
-        for (int i = 0; i < n; i++) {
-            poll_entry_t *pe = (poll_entry_t *) ev_buf[i].udata;
-
-            if (pe->fd == retired_fd)
-                continue;
-            if (ev_buf[i].flags & EV_EOF)
-                pe->reactor->in_event ();
-            if (pe->fd == retired_fd)
-                continue;
-            if (ev_buf[i].filter == EVFILT_WRITE)
-                pe->reactor->out_event ();
-            if (pe->fd == retired_fd)
-                continue;
-            if (ev_buf[i].filter == EVFILT_READ)
-                pe->reactor->in_event ();
-        }
-
-        //  Destroy retired event sources.
-        for (retired_t::iterator it = retired.begin (); it != retired.end ();
-             ++it) {
-            LIBZMQ_DELETE (*it);
-        }
-        retired.clear ();
-    }
-}
-
-#endif
diff --git a/libs/libzmq/src/kqueue.hpp b/libs/libzmq/src/kqueue.hpp
deleted file mode 100644
index 002fbab..0000000
--- a/libs/libzmq/src/kqueue.hpp
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_KQUEUE_HPP_INCLUDED__
-#define __ZMQ_KQUEUE_HPP_INCLUDED__
-
-//  poller.hpp decides which polling mechanism to use.
-#include "poller.hpp"
-#if defined ZMQ_IOTHREAD_POLLER_USE_KQUEUE
-
-#include <vector>
-#include <unistd.h>
-
-#include "ctx.hpp"
-#include "fd.hpp"
-#include "thread.hpp"
-#include "poller_base.hpp"
-
-namespace zmq
-{
-struct i_poll_events;
-
-//  Implements socket polling mechanism using the BSD-specific
-//  kqueue interface.
-
-class kqueue_t ZMQ_FINAL : public worker_poller_base_t
-{
-  public:
-    typedef void *handle_t;
-
-    kqueue_t (const thread_ctx_t &ctx_);
-    ~kqueue_t () ZMQ_FINAL;
-
-    //  "poller" concept.
-    handle_t add_fd (fd_t fd_, zmq::i_poll_events *events_);
-    void rm_fd (handle_t handle_);
-    void set_pollin (handle_t handle_);
-    void reset_pollin (handle_t handle_);
-    void set_pollout (handle_t handle_);
-    void reset_pollout (handle_t handle_);
-    void stop ();
-
-    static int max_fds ();
-
-  private:
-    //  Main event loop.
-    void loop () ZMQ_FINAL;
-
-    //  File descriptor referring to the kernel event queue.
-    fd_t kqueue_fd;
-
-    //  Adds the event to the kqueue.
-    void kevent_add (fd_t fd_, short filter_, void *udata_);
-
-    //  Deletes the event from the kqueue.
-    void kevent_delete (fd_t fd_, short filter_);
-
-    struct poll_entry_t
-    {
-        fd_t fd;
-        bool flag_pollin;
-        bool flag_pollout;
-        zmq::i_poll_events *reactor;
-    };
-
-    //  List of retired event sources.
-    typedef std::vector<poll_entry_t *> retired_t;
-    retired_t retired;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (kqueue_t)
-
-#ifdef HAVE_FORK
-    // the process that created this context. Used to detect forking.
-    pid_t pid;
-#endif
-};
-
-typedef kqueue_t poller_t;
-}
-
-#endif
-
-#endif
diff --git a/libs/libzmq/src/lb.cpp b/libs/libzmq/src/lb.cpp
deleted file mode 100644
index e766b4f..0000000
--- a/libs/libzmq/src/lb.cpp
+++ /dev/null
@@ -1,180 +0,0 @@
-/*
-    Copyright (c) 2007-2018 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "lb.hpp"
-#include "pipe.hpp"
-#include "err.hpp"
-#include "msg.hpp"
-
-zmq::lb_t::lb_t () : _active (0), _current (0), _more (false), _dropping (false)
-{
-}
-
-zmq::lb_t::~lb_t ()
-{
-    zmq_assert (_pipes.empty ());
-}
-
-void zmq::lb_t::attach (pipe_t *pipe_)
-{
-    _pipes.push_back (pipe_);
-    activated (pipe_);
-}
-
-void zmq::lb_t::pipe_terminated (pipe_t *pipe_)
-{
-    const pipes_t::size_type index = _pipes.index (pipe_);
-
-    //  If we are in the middle of multipart message and current pipe
-    //  have disconnected, we have to drop the remainder of the message.
-    if (index == _current && _more)
-        _dropping = true;
-
-    //  Remove the pipe from the list; adjust number of active pipes
-    //  accordingly.
-    if (index < _active) {
-        _active--;
-        _pipes.swap (index, _active);
-        if (_current == _active)
-            _current = 0;
-    }
-    _pipes.erase (pipe_);
-}
-
-void zmq::lb_t::activated (pipe_t *pipe_)
-{
-    //  Move the pipe to the list of active pipes.
-    _pipes.swap (_pipes.index (pipe_), _active);
-    _active++;
-}
-
-int zmq::lb_t::send (msg_t *msg_)
-{
-    return sendpipe (msg_, NULL);
-}
-
-int zmq::lb_t::sendpipe (msg_t *msg_, pipe_t **pipe_)
-{
-    //  Drop the message if required. If we are at the end of the message
-    //  switch back to non-dropping mode.
-    if (_dropping) {
-        _more = (msg_->flags () & msg_t::more) != 0;
-        _dropping = _more;
-
-        int rc = msg_->close ();
-        errno_assert (rc == 0);
-        rc = msg_->init ();
-        errno_assert (rc == 0);
-        return 0;
-    }
-
-    while (_active > 0) {
-        if (_pipes[_current]->write (msg_)) {
-            if (pipe_)
-                *pipe_ = _pipes[_current];
-            break;
-        }
-
-        // If send fails for multi-part msg rollback other
-        // parts sent earlier and return EAGAIN.
-        // Application should handle this as suitable
-        if (_more) {
-            _pipes[_current]->rollback ();
-            // At this point the pipe is already being deallocated
-            // and the first N frames are unreachable (_outpipe is
-            // most likely already NULL so rollback won't actually do
-            // anything and they can't be un-written to deliver later).
-            // Return EFAULT to socket_base caller to drop current message
-            // and any other subsequent frames to avoid them being
-            // "stuck" and received when a new client reconnects, which
-            // would break atomicity of multi-part messages (in blocking mode
-            // socket_base just tries again and again to send the same message)
-            // Note that given dropping mode returns 0, the user will
-            // never know that the message could not be delivered, but
-            // can't really fix it without breaking backward compatibility.
-            // -2/EAGAIN will make sure socket_base caller does not re-enter
-            // immediately or after a short sleep in blocking mode.
-            _dropping = (msg_->flags () & msg_t::more) != 0;
-            _more = false;
-            errno = EAGAIN;
-            return -2;
-        }
-
-        _active--;
-        if (_current < _active)
-            _pipes.swap (_current, _active);
-        else
-            _current = 0;
-    }
-
-    //  If there are no pipes we cannot send the message.
-    if (_active == 0) {
-        errno = EAGAIN;
-        return -1;
-    }
-
-    //  If it's final part of the message we can flush it downstream and
-    //  continue round-robining (load balance).
-    _more = (msg_->flags () & msg_t::more) != 0;
-    if (!_more) {
-        _pipes[_current]->flush ();
-
-        if (++_current >= _active)
-            _current = 0;
-    }
-
-    //  Detach the message from the data buffer.
-    const int rc = msg_->init ();
-    errno_assert (rc == 0);
-
-    return 0;
-}
-
-bool zmq::lb_t::has_out ()
-{
-    //  If one part of the message was already written we can definitely
-    //  write the rest of the message.
-    if (_more)
-        return true;
-
-    while (_active > 0) {
-        //  Check whether a pipe has room for another message.
-        if (_pipes[_current]->check_write ())
-            return true;
-
-        //  Deactivate the pipe.
-        _active--;
-        _pipes.swap (_current, _active);
-        if (_current == _active)
-            _current = 0;
-    }
-
-    return false;
-}
diff --git a/libs/libzmq/src/lb.hpp b/libs/libzmq/src/lb.hpp
deleted file mode 100644
index b206967..0000000
--- a/libs/libzmq/src/lb.hpp
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_LB_HPP_INCLUDED__
-#define __ZMQ_LB_HPP_INCLUDED__
-
-#include "array.hpp"
-
-namespace zmq
-{
-class msg_t;
-class pipe_t;
-
-//  This class manages a set of outbound pipes. On send it load balances
-//  messages fairly among the pipes.
-
-class lb_t
-{
-  public:
-    lb_t ();
-    ~lb_t ();
-
-    void attach (pipe_t *pipe_);
-    void activated (pipe_t *pipe_);
-    void pipe_terminated (pipe_t *pipe_);
-
-    int send (msg_t *msg_);
-
-    //  Sends a message and stores the pipe that was used in pipe_.
-    //  It is possible for this function to return success but keep pipe_
-    //  unset if the rest of a multipart message to a terminated pipe is
-    //  being dropped. For the first frame, this will never happen.
-    int sendpipe (msg_t *msg_, pipe_t **pipe_);
-
-    bool has_out ();
-
-  private:
-    //  List of outbound pipes.
-    typedef array_t<pipe_t, 2> pipes_t;
-    pipes_t _pipes;
-
-    //  Number of active pipes. All the active pipes are located at the
-    //  beginning of the pipes array.
-    pipes_t::size_type _active;
-
-    //  Points to the last pipe that the most recent message was sent to.
-    pipes_t::size_type _current;
-
-    //  True if last we are in the middle of a multipart message.
-    bool _more;
-
-    //  True if we are dropping current message.
-    bool _dropping;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (lb_t)
-};
-}
-
-#endif
diff --git a/libs/libzmq/src/libzmq.pc.in b/libs/libzmq/src/libzmq.pc.in
deleted file mode 100644
index 233bc3a..0000000
--- a/libs/libzmq/src/libzmq.pc.in
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: libzmq
-Description: 0MQ c++ library
-Version: @VERSION@
-Libs: -L${libdir} -lzmq
-Libs.private: -lstdc++ @pkg_config_libs_private@
-Requires.private: @pkg_config_names_private@
-Cflags: -I${includedir} @pkg_config_defines@
diff --git a/libs/libzmq/src/libzmq.vers b/libs/libzmq/src/libzmq.vers
deleted file mode 100644
index 9a2d415..0000000
--- a/libs/libzmq/src/libzmq.vers
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  global: zmq_*;
-  local: *;
-};
diff --git a/libs/libzmq/src/likely.hpp b/libs/libzmq/src/likely.hpp
deleted file mode 100644
index d6cb14d..0000000
--- a/libs/libzmq/src/likely.hpp
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_LIKELY_HPP_INCLUDED__
-#define __ZMQ_LIKELY_HPP_INCLUDED__
-
-#if defined __GNUC__
-#define likely(x) __builtin_expect ((x), 1)
-#define unlikely(x) __builtin_expect ((x), 0)
-#else
-#define likely(x) (x)
-#define unlikely(x) (x)
-#endif
-
-
-#endif
diff --git a/libs/libzmq/src/macros.hpp b/libs/libzmq/src/macros.hpp
deleted file mode 100644
index 427a9e2..0000000
--- a/libs/libzmq/src/macros.hpp
+++ /dev/null
@@ -1,63 +0,0 @@
-
-/******************************************************************************/
-/*  0MQ Internal Use                                                          */
-/******************************************************************************/
-
-#define LIBZMQ_UNUSED(object) (void) object
-#define LIBZMQ_DELETE(p_object)                                                \
-    {                                                                          \
-        delete p_object;                                                       \
-        p_object = 0;                                                          \
-    }
-
-/******************************************************************************/
-
-#if !defined ZMQ_NOEXCEPT
-#if defined ZMQ_HAVE_NOEXCEPT
-#define ZMQ_NOEXCEPT noexcept
-#else
-#define ZMQ_NOEXCEPT
-#endif
-#endif
-
-#if !defined ZMQ_OVERRIDE
-#if defined ZMQ_HAVE_NOEXCEPT
-#define ZMQ_OVERRIDE override
-#else
-#define ZMQ_OVERRIDE
-#endif
-#endif
-
-#if !defined ZMQ_FINAL
-#if defined ZMQ_HAVE_NOEXCEPT
-#define ZMQ_FINAL final
-#else
-#define ZMQ_FINAL
-#endif
-#endif
-
-#if !defined ZMQ_DEFAULT
-#if defined ZMQ_HAVE_NOEXCEPT
-#define ZMQ_DEFAULT = default;
-#else
-#define ZMQ_DEFAULT                                                            \
-    {                                                                          \
-    }
-#endif
-#endif
-
-#if !defined ZMQ_NON_COPYABLE_NOR_MOVABLE
-#if defined ZMQ_HAVE_NOEXCEPT
-#define ZMQ_NON_COPYABLE_NOR_MOVABLE(classname)                                \
-  public:                                                                      \
-    classname (const classname &) = delete;                                    \
-    classname &operator= (const classname &) = delete;                         \
-    classname (classname &&) = delete;                                         \
-    classname &operator= (classname &&) = delete;
-#else
-#define ZMQ_NON_COPYABLE_NOR_MOVABLE(classname)                                \
-  private:                                                                     \
-    classname (const classname &);                                             \
-    classname &operator= (const classname &);
-#endif
-#endif
diff --git a/libs/libzmq/src/mailbox.cpp b/libs/libzmq/src/mailbox.cpp
deleted file mode 100644
index 2fb0fe0..0000000
--- a/libs/libzmq/src/mailbox.cpp
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "mailbox.hpp"
-#include "err.hpp"
-
-zmq::mailbox_t::mailbox_t ()
-{
-    //  Get the pipe into passive state. That way, if the users starts by
-    //  polling on the associated file descriptor it will get woken up when
-    //  new command is posted.
-    const bool ok = _cpipe.check_read ();
-    zmq_assert (!ok);
-    _active = false;
-}
-
-zmq::mailbox_t::~mailbox_t ()
-{
-    //  TODO: Retrieve and deallocate commands inside the _cpipe.
-
-    // Work around problem that other threads might still be in our
-    // send() method, by waiting on the mutex before disappearing.
-    _sync.lock ();
-    _sync.unlock ();
-}
-
-zmq::fd_t zmq::mailbox_t::get_fd () const
-{
-    return _signaler.get_fd ();
-}
-
-void zmq::mailbox_t::send (const command_t &cmd_)
-{
-    _sync.lock ();
-    _cpipe.write (cmd_, false);
-    const bool ok = _cpipe.flush ();
-    _sync.unlock ();
-    if (!ok)
-        _signaler.send ();
-}
-
-int zmq::mailbox_t::recv (command_t *cmd_, int timeout_)
-{
-    //  Try to get the command straight away.
-    if (_active) {
-        if (_cpipe.read (cmd_))
-            return 0;
-
-        //  If there are no more commands available, switch into passive state.
-        _active = false;
-    }
-
-    //  Wait for signal from the command sender.
-    int rc = _signaler.wait (timeout_);
-    if (rc == -1) {
-        errno_assert (errno == EAGAIN || errno == EINTR);
-        return -1;
-    }
-
-    //  Receive the signal.
-    rc = _signaler.recv_failable ();
-    if (rc == -1) {
-        errno_assert (errno == EAGAIN);
-        return -1;
-    }
-
-    //  Switch into active state.
-    _active = true;
-
-    //  Get a command.
-    const bool ok = _cpipe.read (cmd_);
-    zmq_assert (ok);
-    return 0;
-}
-
-bool zmq::mailbox_t::valid () const
-{
-    return _signaler.valid ();
-}
diff --git a/libs/libzmq/src/mailbox.hpp b/libs/libzmq/src/mailbox.hpp
deleted file mode 100644
index 0cd92d2..0000000
--- a/libs/libzmq/src/mailbox.hpp
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_MAILBOX_HPP_INCLUDED__
-#define __ZMQ_MAILBOX_HPP_INCLUDED__
-
-#include <stddef.h>
-
-#include "signaler.hpp"
-#include "fd.hpp"
-#include "config.hpp"
-#include "command.hpp"
-#include "ypipe.hpp"
-#include "mutex.hpp"
-#include "i_mailbox.hpp"
-
-namespace zmq
-{
-class mailbox_t ZMQ_FINAL : public i_mailbox
-{
-  public:
-    mailbox_t ();
-    ~mailbox_t ();
-
-    fd_t get_fd () const;
-    void send (const command_t &cmd_);
-    int recv (command_t *cmd_, int timeout_);
-
-    bool valid () const;
-
-#ifdef HAVE_FORK
-    // close the file descriptors in the signaller. This is used in a forked
-    // child process to close the file descriptors so that they do not interfere
-    // with the context in the parent process.
-    void forked () ZMQ_FINAL { _signaler.forked (); }
-#endif
-
-  private:
-    //  The pipe to store actual commands.
-    typedef ypipe_t<command_t, command_pipe_granularity> cpipe_t;
-    cpipe_t _cpipe;
-
-    //  Signaler to pass signals from writer thread to reader thread.
-    signaler_t _signaler;
-
-    //  There's only one thread receiving from the mailbox, but there
-    //  is arbitrary number of threads sending. Given that ypipe requires
-    //  synchronised access on both of its endpoints, we have to synchronise
-    //  the sending side.
-    mutex_t _sync;
-
-    //  True if the underlying pipe is active, ie. when we are allowed to
-    //  read commands from it.
-    bool _active;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (mailbox_t)
-};
-}
-
-#endif
diff --git a/libs/libzmq/src/mailbox_safe.cpp b/libs/libzmq/src/mailbox_safe.cpp
deleted file mode 100644
index f49fa95..0000000
--- a/libs/libzmq/src/mailbox_safe.cpp
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "mailbox_safe.hpp"
-#include "clock.hpp"
-#include "err.hpp"
-
-#include <algorithm>
-
-zmq::mailbox_safe_t::mailbox_safe_t (mutex_t *sync_) : _sync (sync_)
-{
-    //  Get the pipe into passive state. That way, if the users starts by
-    //  polling on the associated file descriptor it will get woken up when
-    //  new command is posted.
-    const bool ok = _cpipe.check_read ();
-    zmq_assert (!ok);
-}
-
-zmq::mailbox_safe_t::~mailbox_safe_t ()
-{
-    //  TODO: Retrieve and deallocate commands inside the cpipe.
-
-    // Work around problem that other threads might still be in our
-    // send() method, by waiting on the mutex before disappearing.
-    _sync->lock ();
-    _sync->unlock ();
-}
-
-void zmq::mailbox_safe_t::add_signaler (signaler_t *signaler_)
-{
-    _signalers.push_back (signaler_);
-}
-
-void zmq::mailbox_safe_t::remove_signaler (signaler_t *signaler_)
-{
-    // TODO: make a copy of array and signal outside the lock
-    const std::vector<zmq::signaler_t *>::iterator end = _signalers.end ();
-    const std::vector<signaler_t *>::iterator it =
-      std::find (_signalers.begin (), end, signaler_);
-
-    if (it != end)
-        _signalers.erase (it);
-}
-
-void zmq::mailbox_safe_t::clear_signalers ()
-{
-    _signalers.clear ();
-}
-
-void zmq::mailbox_safe_t::send (const command_t &cmd_)
-{
-    _sync->lock ();
-    _cpipe.write (cmd_, false);
-    const bool ok = _cpipe.flush ();
-
-    if (!ok) {
-        _cond_var.broadcast ();
-
-        for (std::vector<signaler_t *>::iterator it = _signalers.begin (),
-                                                 end = _signalers.end ();
-             it != end; ++it) {
-            (*it)->send ();
-        }
-    }
-
-    _sync->unlock ();
-}
-
-int zmq::mailbox_safe_t::recv (command_t *cmd_, int timeout_)
-{
-    //  Try to get the command straight away.
-    if (_cpipe.read (cmd_))
-        return 0;
-
-    //  If the timeout is zero, it will be quicker to release the lock, giving other a chance to send a command
-    //  and immediately relock it.
-    if (timeout_ == 0) {
-        _sync->unlock ();
-        _sync->lock ();
-    } else {
-        //  Wait for signal from the command sender.
-        const int rc = _cond_var.wait (_sync, timeout_);
-        if (rc == -1) {
-            errno_assert (errno == EAGAIN || errno == EINTR);
-            return -1;
-        }
-    }
-
-    //  Another thread may already fetch the command
-    const bool ok = _cpipe.read (cmd_);
-
-    if (!ok) {
-        errno = EAGAIN;
-        return -1;
-    }
-
-    return 0;
-}
diff --git a/libs/libzmq/src/mailbox_safe.hpp b/libs/libzmq/src/mailbox_safe.hpp
deleted file mode 100644
index 04dbf14..0000000
--- a/libs/libzmq/src/mailbox_safe.hpp
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_MAILBOX_SAFE_HPP_INCLUDED__
-#define __ZMQ_MAILBOX_SAFE_HPP_INCLUDED__
-
-#include <vector>
-#include <stddef.h>
-
-#include "signaler.hpp"
-#include "fd.hpp"
-#include "config.hpp"
-#include "command.hpp"
-#include "ypipe.hpp"
-#include "mutex.hpp"
-#include "i_mailbox.hpp"
-#include "condition_variable.hpp"
-
-namespace zmq
-{
-class mailbox_safe_t ZMQ_FINAL : public i_mailbox
-{
-  public:
-    mailbox_safe_t (mutex_t *sync_);
-    ~mailbox_safe_t ();
-
-    void send (const command_t &cmd_);
-    int recv (command_t *cmd_, int timeout_);
-
-    // Add signaler to mailbox which will be called when a message is ready
-    void add_signaler (signaler_t *signaler_);
-    void remove_signaler (signaler_t *signaler_);
-    void clear_signalers ();
-
-#ifdef HAVE_FORK
-    // close the file descriptors in the signaller. This is used in a forked
-    // child process to close the file descriptors so that they do not interfere
-    // with the context in the parent process.
-    void forked () ZMQ_FINAL
-    {
-        // TODO: call fork on the condition variable
-    }
-#endif
-
-  private:
-    //  The pipe to store actual commands.
-    typedef ypipe_t<command_t, command_pipe_granularity> cpipe_t;
-    cpipe_t _cpipe;
-
-    //  Condition variable to pass signals from writer thread to reader thread.
-    condition_variable_t _cond_var;
-
-    //  Synchronize access to the mailbox from receivers and senders
-    mutex_t *const _sync;
-
-    std::vector<zmq::signaler_t *> _signalers;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (mailbox_safe_t)
-};
-}
-
-#endif
diff --git a/libs/libzmq/src/mechanism.cpp b/libs/libzmq/src/mechanism.cpp
deleted file mode 100644
index 0d46c11..0000000
--- a/libs/libzmq/src/mechanism.cpp
+++ /dev/null
@@ -1,370 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include <string.h>
-#include <limits.h>
-
-#include "mechanism.hpp"
-#include "options.hpp"
-#include "msg.hpp"
-#include "err.hpp"
-#include "wire.hpp"
-#include "session_base.hpp"
-
-zmq::mechanism_t::mechanism_t (const options_t &options_) : options (options_)
-{
-}
-
-zmq::mechanism_t::~mechanism_t ()
-{
-}
-
-void zmq::mechanism_t::set_peer_routing_id (const void *id_ptr_,
-                                            size_t id_size_)
-{
-    _routing_id.set (static_cast<const unsigned char *> (id_ptr_), id_size_);
-}
-
-void zmq::mechanism_t::peer_routing_id (msg_t *msg_)
-{
-    const int rc = msg_->init_size (_routing_id.size ());
-    errno_assert (rc == 0);
-    memcpy (msg_->data (), _routing_id.data (), _routing_id.size ());
-    msg_->set_flags (msg_t::routing_id);
-}
-
-void zmq::mechanism_t::set_user_id (const void *user_id_, size_t size_)
-{
-    _user_id.set (static_cast<const unsigned char *> (user_id_), size_);
-    _zap_properties.ZMQ_MAP_INSERT_OR_EMPLACE (
-      std::string (ZMQ_MSG_PROPERTY_USER_ID),
-      std::string (reinterpret_cast<const char *> (user_id_), size_));
-}
-
-const zmq::blob_t &zmq::mechanism_t::get_user_id () const
-{
-    return _user_id;
-}
-
-const char socket_type_pair[] = "PAIR";
-const char socket_type_pub[] = "PUB";
-const char socket_type_sub[] = "SUB";
-const char socket_type_req[] = "REQ";
-const char socket_type_rep[] = "REP";
-const char socket_type_dealer[] = "DEALER";
-const char socket_type_router[] = "ROUTER";
-const char socket_type_pull[] = "PULL";
-const char socket_type_push[] = "PUSH";
-const char socket_type_xpub[] = "XPUB";
-const char socket_type_xsub[] = "XSUB";
-const char socket_type_stream[] = "STREAM";
-#ifdef ZMQ_BUILD_DRAFT_API
-const char socket_type_server[] = "SERVER";
-const char socket_type_client[] = "CLIENT";
-const char socket_type_radio[] = "RADIO";
-const char socket_type_dish[] = "DISH";
-const char socket_type_gather[] = "GATHER";
-const char socket_type_scatter[] = "SCATTER";
-const char socket_type_dgram[] = "DGRAM";
-const char socket_type_peer[] = "PEER";
-const char socket_type_channel[] = "CHANNEL";
-#endif
-
-const char *zmq::mechanism_t::socket_type_string (int socket_type_)
-{
-    // TODO the order must of the names must correspond to the values resp. order of ZMQ_* socket type definitions in zmq.h!
-    static const char *names[] = {socket_type_pair,   socket_type_pub,
-                                  socket_type_sub,    socket_type_req,
-                                  socket_type_rep,    socket_type_dealer,
-                                  socket_type_router, socket_type_pull,
-                                  socket_type_push,   socket_type_xpub,
-                                  socket_type_xsub,   socket_type_stream,
-#ifdef ZMQ_BUILD_DRAFT_API
-                                  socket_type_server, socket_type_client,
-                                  socket_type_radio,  socket_type_dish,
-                                  socket_type_gather, socket_type_scatter,
-                                  socket_type_dgram,  socket_type_peer,
-                                  socket_type_channel
-#endif
-    };
-    static const size_t names_count = sizeof (names) / sizeof (names[0]);
-    zmq_assert (socket_type_ >= 0
-                && socket_type_ < static_cast<int> (names_count));
-    return names[socket_type_];
-}
-
-const size_t name_len_size = sizeof (unsigned char);
-const size_t value_len_size = sizeof (uint32_t);
-
-static size_t property_len (size_t name_len_, size_t value_len_)
-{
-    return name_len_size + name_len_ + value_len_size + value_len_;
-}
-
-static size_t name_len (const char *name_)
-{
-    const size_t name_len = strlen (name_);
-    zmq_assert (name_len <= UCHAR_MAX);
-    return name_len;
-}
-
-size_t zmq::mechanism_t::add_property (unsigned char *ptr_,
-                                       size_t ptr_capacity_,
-                                       const char *name_,
-                                       const void *value_,
-                                       size_t value_len_)
-{
-    const size_t name_len = ::name_len (name_);
-    const size_t total_len = ::property_len (name_len, value_len_);
-    zmq_assert (total_len <= ptr_capacity_);
-
-    *ptr_ = static_cast<unsigned char> (name_len);
-    ptr_ += name_len_size;
-    memcpy (ptr_, name_, name_len);
-    ptr_ += name_len;
-    zmq_assert (value_len_ <= 0x7FFFFFFF);
-    put_uint32 (ptr_, static_cast<uint32_t> (value_len_));
-    ptr_ += value_len_size;
-    memcpy (ptr_, value_, value_len_);
-
-    return total_len;
-}
-
-size_t zmq::mechanism_t::property_len (const char *name_, size_t value_len_)
-{
-    return ::property_len (name_len (name_), value_len_);
-}
-
-#define ZMTP_PROPERTY_SOCKET_TYPE "Socket-Type"
-#define ZMTP_PROPERTY_IDENTITY "Identity"
-
-size_t zmq::mechanism_t::add_basic_properties (unsigned char *ptr_,
-                                               size_t ptr_capacity_) const
-{
-    unsigned char *ptr = ptr_;
-
-    //  Add socket type property
-    const char *socket_type = socket_type_string (options.type);
-    ptr += add_property (ptr, ptr_capacity_, ZMTP_PROPERTY_SOCKET_TYPE,
-                         socket_type, strlen (socket_type));
-
-    //  Add identity (aka routing id) property
-    if (options.type == ZMQ_REQ || options.type == ZMQ_DEALER
-        || options.type == ZMQ_ROUTER) {
-        ptr += add_property (ptr, ptr_capacity_ - (ptr - ptr_),
-                             ZMTP_PROPERTY_IDENTITY, options.routing_id,
-                             options.routing_id_size);
-    }
-
-
-    for (std::map<std::string, std::string>::const_iterator
-           it = options.app_metadata.begin (),
-           end = options.app_metadata.end ();
-         it != end; ++it) {
-        ptr +=
-          add_property (ptr, ptr_capacity_ - (ptr - ptr_), it->first.c_str (),
-                        it->second.c_str (), strlen (it->second.c_str ()));
-    }
-
-    return ptr - ptr_;
-}
-
-size_t zmq::mechanism_t::basic_properties_len () const
-{
-    const char *socket_type = socket_type_string (options.type);
-    size_t meta_len = 0;
-
-    for (std::map<std::string, std::string>::const_iterator
-           it = options.app_metadata.begin (),
-           end = options.app_metadata.end ();
-         it != end; ++it) {
-        meta_len +=
-          property_len (it->first.c_str (), strlen (it->second.c_str ()));
-    }
-
-    return property_len (ZMTP_PROPERTY_SOCKET_TYPE, strlen (socket_type))
-           + meta_len
-           + ((options.type == ZMQ_REQ || options.type == ZMQ_DEALER
-               || options.type == ZMQ_ROUTER)
-                ? property_len (ZMTP_PROPERTY_IDENTITY, options.routing_id_size)
-                : 0);
-}
-
-void zmq::mechanism_t::make_command_with_basic_properties (
-  msg_t *msg_, const char *prefix_, size_t prefix_len_) const
-{
-    const size_t command_size = prefix_len_ + basic_properties_len ();
-    const int rc = msg_->init_size (command_size);
-    errno_assert (rc == 0);
-
-    unsigned char *ptr = static_cast<unsigned char *> (msg_->data ());
-
-    //  Add prefix
-    memcpy (ptr, prefix_, prefix_len_);
-    ptr += prefix_len_;
-
-    add_basic_properties (
-      ptr, command_size - (ptr - static_cast<unsigned char *> (msg_->data ())));
-}
-
-int zmq::mechanism_t::parse_metadata (const unsigned char *ptr_,
-                                      size_t length_,
-                                      bool zap_flag_)
-{
-    size_t bytes_left = length_;
-
-    while (bytes_left > 1) {
-        const size_t name_length = static_cast<size_t> (*ptr_);
-        ptr_ += name_len_size;
-        bytes_left -= name_len_size;
-        if (bytes_left < name_length)
-            break;
-
-        const std::string name =
-          std::string (reinterpret_cast<const char *> (ptr_), name_length);
-        ptr_ += name_length;
-        bytes_left -= name_length;
-        if (bytes_left < value_len_size)
-            break;
-
-        const size_t value_length = static_cast<size_t> (get_uint32 (ptr_));
-        ptr_ += value_len_size;
-        bytes_left -= value_len_size;
-        if (bytes_left < value_length)
-            break;
-
-        const uint8_t *value = ptr_;
-        ptr_ += value_length;
-        bytes_left -= value_length;
-
-        if (name == ZMTP_PROPERTY_IDENTITY && options.recv_routing_id)
-            set_peer_routing_id (value, value_length);
-        else if (name == ZMTP_PROPERTY_SOCKET_TYPE) {
-            if (!check_socket_type (reinterpret_cast<const char *> (value),
-                                    value_length)) {
-                errno = EINVAL;
-                return -1;
-            }
-        } else {
-            const int rc = property (name, value, value_length);
-            if (rc == -1)
-                return -1;
-        }
-        (zap_flag_ ? _zap_properties : _zmtp_properties)
-          .ZMQ_MAP_INSERT_OR_EMPLACE (
-            name,
-            std::string (reinterpret_cast<const char *> (value), value_length));
-    }
-    if (bytes_left > 0) {
-        errno = EPROTO;
-        return -1;
-    }
-    return 0;
-}
-
-int zmq::mechanism_t::property (const std::string & /* name_ */,
-                                const void * /* value_ */,
-                                size_t /* length_ */)
-{
-    //  Default implementation does not check
-    //  property values and returns 0 to signal success.
-    return 0;
-}
-
-template <size_t N>
-static bool strequals (const char *actual_type_,
-                       const size_t actual_len_,
-                       const char (&expected_type_)[N])
-{
-    return actual_len_ == N - 1
-           && memcmp (actual_type_, expected_type_, N - 1) == 0;
-}
-
-bool zmq::mechanism_t::check_socket_type (const char *type_,
-                                          const size_t len_) const
-{
-    switch (options.type) {
-        case ZMQ_REQ:
-            return strequals (type_, len_, socket_type_rep)
-                   || strequals (type_, len_, socket_type_router);
-        case ZMQ_REP:
-            return strequals (type_, len_, socket_type_req)
-                   || strequals (type_, len_, socket_type_dealer);
-        case ZMQ_DEALER:
-            return strequals (type_, len_, socket_type_rep)
-                   || strequals (type_, len_, socket_type_dealer)
-                   || strequals (type_, len_, socket_type_router);
-        case ZMQ_ROUTER:
-            return strequals (type_, len_, socket_type_req)
-                   || strequals (type_, len_, socket_type_dealer)
-                   || strequals (type_, len_, socket_type_router);
-        case ZMQ_PUSH:
-            return strequals (type_, len_, socket_type_pull);
-        case ZMQ_PULL:
-            return strequals (type_, len_, socket_type_push);
-        case ZMQ_PUB:
-            return strequals (type_, len_, socket_type_sub)
-                   || strequals (type_, len_, socket_type_xsub);
-        case ZMQ_SUB:
-            return strequals (type_, len_, socket_type_pub)
-                   || strequals (type_, len_, socket_type_xpub);
-        case ZMQ_XPUB:
-            return strequals (type_, len_, socket_type_sub)
-                   || strequals (type_, len_, socket_type_xsub);
-        case ZMQ_XSUB:
-            return strequals (type_, len_, socket_type_pub)
-                   || strequals (type_, len_, socket_type_xpub);
-        case ZMQ_PAIR:
-            return strequals (type_, len_, socket_type_pair);
-#ifdef ZMQ_BUILD_DRAFT_API
-        case ZMQ_SERVER:
-            return strequals (type_, len_, socket_type_client);
-        case ZMQ_CLIENT:
-            return strequals (type_, len_, socket_type_server);
-        case ZMQ_RADIO:
-            return strequals (type_, len_, socket_type_dish);
-        case ZMQ_DISH:
-            return strequals (type_, len_, socket_type_radio);
-        case ZMQ_GATHER:
-            return strequals (type_, len_, socket_type_scatter);
-        case ZMQ_SCATTER:
-            return strequals (type_, len_, socket_type_gather);
-        case ZMQ_DGRAM:
-            return strequals (type_, len_, socket_type_dgram);
-        case ZMQ_PEER:
-            return strequals (type_, len_, socket_type_peer);
-        case ZMQ_CHANNEL:
-            return strequals (type_, len_, socket_type_channel);
-#endif
-        default:
-            break;
-    }
-    return false;
-}
diff --git a/libs/libzmq/src/mechanism.hpp b/libs/libzmq/src/mechanism.hpp
deleted file mode 100644
index 13f0ffb..0000000
--- a/libs/libzmq/src/mechanism.hpp
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_MECHANISM_HPP_INCLUDED__
-#define __ZMQ_MECHANISM_HPP_INCLUDED__
-
-#include "stdint.hpp"
-#include "options.hpp"
-#include "blob.hpp"
-#include "metadata.hpp"
-
-namespace zmq
-{
-class msg_t;
-class session_base_t;
-
-//  Abstract class representing security mechanism.
-//  Different mechanism extends this class.
-
-class mechanism_t
-{
-  public:
-    enum status_t
-    {
-        handshaking,
-        ready,
-        error
-    };
-
-    mechanism_t (const options_t &options_);
-
-    virtual ~mechanism_t ();
-
-    //  Prepare next handshake command that is to be sent to the peer.
-    virtual int next_handshake_command (msg_t *msg_) = 0;
-
-    //  Process the handshake command received from the peer.
-    virtual int process_handshake_command (msg_t *msg_) = 0;
-
-    virtual int encode (msg_t *) { return 0; }
-
-    virtual int decode (msg_t *) { return 0; }
-
-    //  Notifies mechanism about availability of ZAP message.
-    virtual int zap_msg_available () { return 0; }
-
-    //  Returns the status of this mechanism.
-    virtual status_t status () const = 0;
-
-    void set_peer_routing_id (const void *id_ptr_, size_t id_size_);
-
-    void peer_routing_id (msg_t *msg_);
-
-    void set_user_id (const void *user_id_, size_t size_);
-
-    const blob_t &get_user_id () const;
-
-    const metadata_t::dict_t &get_zmtp_properties () const
-    {
-        return _zmtp_properties;
-    }
-
-    const metadata_t::dict_t &get_zap_properties () const
-    {
-        return _zap_properties;
-    }
-
-  protected:
-    //  Only used to identify the socket for the Socket-Type
-    //  property in the wire protocol.
-    static const char *socket_type_string (int socket_type_);
-
-    static size_t add_property (unsigned char *ptr_,
-                                size_t ptr_capacity_,
-                                const char *name_,
-                                const void *value_,
-                                size_t value_len_);
-    static size_t property_len (const char *name_, size_t value_len_);
-
-    size_t add_basic_properties (unsigned char *ptr_,
-                                 size_t ptr_capacity_) const;
-    size_t basic_properties_len () const;
-
-    void make_command_with_basic_properties (msg_t *msg_,
-                                             const char *prefix_,
-                                             size_t prefix_len_) const;
-
-    //  Parses a metadata.
-    //  Metadata consists of a list of properties consisting of
-    //  name and value as size-specified strings.
-    //  Returns 0 on success and -1 on error, in which case errno is set.
-    int parse_metadata (const unsigned char *ptr_,
-                        size_t length_,
-                        bool zap_flag_ = false);
-
-    //  This is called by parse_property method whenever it
-    //  parses a new property. The function should return 0
-    //  on success and -1 on error, in which case it should
-    //  set errno. Signaling error prevents parser from
-    //  parsing remaining data.
-    //  Derived classes are supposed to override this
-    //  method to handle custom processing.
-    virtual int
-    property (const std::string &name_, const void *value_, size_t length_);
-
-    const options_t options;
-
-  private:
-    //  Properties received from ZMTP peer.
-    metadata_t::dict_t _zmtp_properties;
-
-    //  Properties received from ZAP server.
-    metadata_t::dict_t _zap_properties;
-
-    blob_t _routing_id;
-
-    blob_t _user_id;
-
-    //  Returns true iff socket associated with the mechanism
-    //  is compatible with a given socket type 'type_'.
-    bool check_socket_type (const char *type_, size_t len_) const;
-};
-}
-
-#endif
diff --git a/libs/libzmq/src/mechanism_base.cpp b/libs/libzmq/src/mechanism_base.cpp
deleted file mode 100644
index ddb179e..0000000
--- a/libs/libzmq/src/mechanism_base.cpp
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-
-#include "mechanism_base.hpp"
-#include "session_base.hpp"
-
-zmq::mechanism_base_t::mechanism_base_t (session_base_t *const session_,
-                                         const options_t &options_) :
-    mechanism_t (options_), session (session_)
-{
-}
-
-int zmq::mechanism_base_t::check_basic_command_structure (msg_t *msg_) const
-{
-    if (msg_->size () <= 1
-        || msg_->size () <= (static_cast<uint8_t *> (msg_->data ()))[0]) {
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (),
-          ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_UNSPECIFIED);
-        errno = EPROTO;
-        return -1;
-    }
-    return 0;
-}
-
-void zmq::mechanism_base_t::handle_error_reason (const char *error_reason_,
-                                                 size_t error_reason_len_)
-{
-    const size_t status_code_len = 3;
-    const char zero_digit = '0';
-    const size_t significant_digit_index = 0;
-    const size_t first_zero_digit_index = 1;
-    const size_t second_zero_digit_index = 2;
-    const int factor = 100;
-    if (error_reason_len_ == status_code_len
-        && error_reason_[first_zero_digit_index] == zero_digit
-        && error_reason_[second_zero_digit_index] == zero_digit
-        && error_reason_[significant_digit_index] >= '3'
-        && error_reason_[significant_digit_index] <= '5') {
-        // it is a ZAP error status code (300, 400 or 500), so emit an authentication failure event
-        session->get_socket ()->event_handshake_failed_auth (
-          session->get_endpoint (),
-          (error_reason_[significant_digit_index] - zero_digit) * factor);
-    } else {
-        // this is a violation of the ZAP protocol
-        // TODO zmq_assert in this case?
-    }
-}
-
-bool zmq::mechanism_base_t::zap_required () const
-{
-    return !options.zap_domain.empty ();
-}
diff --git a/libs/libzmq/src/mechanism_base.hpp b/libs/libzmq/src/mechanism_base.hpp
deleted file mode 100644
index 767f180..0000000
--- a/libs/libzmq/src/mechanism_base.hpp
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_MECHANISM_BASE_HPP_INCLUDED__
-#define __ZMQ_MECHANISM_BASE_HPP_INCLUDED__
-
-#include "mechanism.hpp"
-
-namespace zmq
-{
-class msg_t;
-
-class mechanism_base_t : public mechanism_t
-{
-  protected:
-    mechanism_base_t (session_base_t *session_, const options_t &options_);
-
-    session_base_t *const session;
-
-    int check_basic_command_structure (msg_t *msg_) const;
-
-    void handle_error_reason (const char *error_reason_,
-                              size_t error_reason_len_);
-
-    bool zap_required () const;
-};
-}
-
-#endif
diff --git a/libs/libzmq/src/metadata.cpp b/libs/libzmq/src/metadata.cpp
deleted file mode 100644
index 45a16a6..0000000
--- a/libs/libzmq/src/metadata.cpp
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "metadata.hpp"
-
-zmq::metadata_t::metadata_t (const dict_t &dict_) : _ref_cnt (1), _dict (dict_)
-{
-}
-
-const char *zmq::metadata_t::get (const std::string &property_) const
-{
-    const dict_t::const_iterator it = _dict.find (property_);
-    if (it == _dict.end ()) {
-        /** \todo remove this when support for the deprecated name "Identity" is dropped */
-        if (property_ == "Identity")
-            return get (ZMQ_MSG_PROPERTY_ROUTING_ID);
-
-        return NULL;
-    }
-    return it->second.c_str ();
-}
-
-void zmq::metadata_t::add_ref ()
-{
-    _ref_cnt.add (1);
-}
-
-bool zmq::metadata_t::drop_ref ()
-{
-    return !_ref_cnt.sub (1);
-}
diff --git a/libs/libzmq/src/metadata.hpp b/libs/libzmq/src/metadata.hpp
deleted file mode 100644
index b8c1451..0000000
--- a/libs/libzmq/src/metadata.hpp
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_METADATA_HPP_INCLUDED__
-#define __ZMQ_METADATA_HPP_INCLUDED__
-
-#include <map>
-#include <string>
-
-#include "atomic_counter.hpp"
-
-namespace zmq
-{
-class metadata_t
-{
-  public:
-    typedef std::map<std::string, std::string> dict_t;
-
-    metadata_t (const dict_t &dict_);
-
-    //  Returns pointer to property value or NULL if
-    //  property is not found.
-    const char *get (const std::string &property_) const;
-
-    void add_ref ();
-
-    //  Drop reference. Returns true iff the reference
-    //  counter drops to zero.
-    bool drop_ref ();
-
-  private:
-    //  Reference counter.
-    atomic_counter_t _ref_cnt;
-
-    //  Dictionary holding metadata.
-    const dict_t _dict;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (metadata_t)
-};
-}
-
-#endif
diff --git a/libs/libzmq/src/msg.cpp b/libs/libzmq/src/msg.cpp
deleted file mode 100644
index 2116d1e..0000000
--- a/libs/libzmq/src/msg.cpp
+++ /dev/null
@@ -1,725 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "compat.hpp"
-#include "macros.hpp"
-#include "msg.hpp"
-
-#include <string.h>
-#include <stdlib.h>
-#include <new>
-
-#include "stdint.hpp"
-#include "likely.hpp"
-#include "metadata.hpp"
-#include "err.hpp"
-
-//  Check whether the sizes of public representation of the message (zmq_msg_t)
-//  and private representation of the message (zmq::msg_t) match.
-
-typedef char
-  zmq_msg_size_check[2 * ((sizeof (zmq::msg_t) == sizeof (zmq_msg_t)) != 0)
-                     - 1];
-
-bool zmq::msg_t::check () const
-{
-    return _u.base.type >= type_min && _u.base.type <= type_max;
-}
-
-int zmq::msg_t::init (void *data_,
-                      size_t size_,
-                      msg_free_fn *ffn_,
-                      void *hint_,
-                      content_t *content_)
-{
-    if (size_ < max_vsm_size) {
-        const int rc = init_size (size_);
-
-        if (rc != -1) {
-            memcpy (data (), data_, size_);
-            return 0;
-        }
-        return -1;
-    }
-    if (content_) {
-        return init_external_storage (content_, data_, size_, ffn_, hint_);
-    }
-    return init_data (data_, size_, ffn_, hint_);
-}
-
-int zmq::msg_t::init ()
-{
-    _u.vsm.metadata = NULL;
-    _u.vsm.type = type_vsm;
-    _u.vsm.flags = 0;
-    _u.vsm.size = 0;
-    _u.vsm.group.sgroup.group[0] = '\0';
-    _u.vsm.group.type = group_type_short;
-    _u.vsm.routing_id = 0;
-    return 0;
-}
-
-int zmq::msg_t::init_size (size_t size_)
-{
-    if (size_ <= max_vsm_size) {
-        _u.vsm.metadata = NULL;
-        _u.vsm.type = type_vsm;
-        _u.vsm.flags = 0;
-        _u.vsm.size = static_cast<unsigned char> (size_);
-        _u.vsm.group.sgroup.group[0] = '\0';
-        _u.vsm.group.type = group_type_short;
-        _u.vsm.routing_id = 0;
-    } else {
-        _u.lmsg.metadata = NULL;
-        _u.lmsg.type = type_lmsg;
-        _u.lmsg.flags = 0;
-        _u.lmsg.group.sgroup.group[0] = '\0';
-        _u.lmsg.group.type = group_type_short;
-        _u.lmsg.routing_id = 0;
-        _u.lmsg.content = NULL;
-        if (sizeof (content_t) + size_ > size_)
-            _u.lmsg.content =
-              static_cast<content_t *> (malloc (sizeof (content_t) + size_));
-        if (unlikely (!_u.lmsg.content)) {
-            errno = ENOMEM;
-            return -1;
-        }
-
-        _u.lmsg.content->data = _u.lmsg.content + 1;
-        _u.lmsg.content->size = size_;
-        _u.lmsg.content->ffn = NULL;
-        _u.lmsg.content->hint = NULL;
-        new (&_u.lmsg.content->refcnt) zmq::atomic_counter_t ();
-    }
-    return 0;
-}
-
-int zmq::msg_t::init_buffer (const void *buf_, size_t size_)
-{
-    const int rc = init_size (size_);
-    if (unlikely (rc < 0)) {
-        return -1;
-    }
-    if (size_) {
-        // NULL and zero size is allowed
-        assert (NULL != buf_);
-        memcpy (data (), buf_, size_);
-    }
-    return 0;
-}
-
-int zmq::msg_t::init_external_storage (content_t *content_,
-                                       void *data_,
-                                       size_t size_,
-                                       msg_free_fn *ffn_,
-                                       void *hint_)
-{
-    zmq_assert (NULL != data_);
-    zmq_assert (NULL != content_);
-
-    _u.zclmsg.metadata = NULL;
-    _u.zclmsg.type = type_zclmsg;
-    _u.zclmsg.flags = 0;
-    _u.zclmsg.group.sgroup.group[0] = '\0';
-    _u.zclmsg.group.type = group_type_short;
-    _u.zclmsg.routing_id = 0;
-
-    _u.zclmsg.content = content_;
-    _u.zclmsg.content->data = data_;
-    _u.zclmsg.content->size = size_;
-    _u.zclmsg.content->ffn = ffn_;
-    _u.zclmsg.content->hint = hint_;
-    new (&_u.zclmsg.content->refcnt) zmq::atomic_counter_t ();
-
-    return 0;
-}
-
-int zmq::msg_t::init_data (void *data_,
-                           size_t size_,
-                           msg_free_fn *ffn_,
-                           void *hint_)
-{
-    //  If data is NULL and size is not 0, a segfault
-    //  would occur once the data is accessed
-    zmq_assert (data_ != NULL || size_ == 0);
-
-    //  Initialize constant message if there's no need to deallocate
-    if (ffn_ == NULL) {
-        _u.cmsg.metadata = NULL;
-        _u.cmsg.type = type_cmsg;
-        _u.cmsg.flags = 0;
-        _u.cmsg.data = data_;
-        _u.cmsg.size = size_;
-        _u.cmsg.group.sgroup.group[0] = '\0';
-        _u.cmsg.group.type = group_type_short;
-        _u.cmsg.routing_id = 0;
-    } else {
-        _u.lmsg.metadata = NULL;
-        _u.lmsg.type = type_lmsg;
-        _u.lmsg.flags = 0;
-        _u.lmsg.group.sgroup.group[0] = '\0';
-        _u.lmsg.group.type = group_type_short;
-        _u.lmsg.routing_id = 0;
-        _u.lmsg.content =
-          static_cast<content_t *> (malloc (sizeof (content_t)));
-        if (!_u.lmsg.content) {
-            errno = ENOMEM;
-            return -1;
-        }
-
-        _u.lmsg.content->data = data_;
-        _u.lmsg.content->size = size_;
-        _u.lmsg.content->ffn = ffn_;
-        _u.lmsg.content->hint = hint_;
-        new (&_u.lmsg.content->refcnt) zmq::atomic_counter_t ();
-    }
-    return 0;
-}
-
-int zmq::msg_t::init_delimiter ()
-{
-    _u.delimiter.metadata = NULL;
-    _u.delimiter.type = type_delimiter;
-    _u.delimiter.flags = 0;
-    _u.delimiter.group.sgroup.group[0] = '\0';
-    _u.delimiter.group.type = group_type_short;
-    _u.delimiter.routing_id = 0;
-    return 0;
-}
-
-int zmq::msg_t::init_join ()
-{
-    _u.base.metadata = NULL;
-    _u.base.type = type_join;
-    _u.base.flags = 0;
-    _u.base.group.sgroup.group[0] = '\0';
-    _u.base.group.type = group_type_short;
-    _u.base.routing_id = 0;
-    return 0;
-}
-
-int zmq::msg_t::init_leave ()
-{
-    _u.base.metadata = NULL;
-    _u.base.type = type_leave;
-    _u.base.flags = 0;
-    _u.base.group.sgroup.group[0] = '\0';
-    _u.base.group.type = group_type_short;
-    _u.base.routing_id = 0;
-    return 0;
-}
-
-int zmq::msg_t::init_subscribe (const size_t size_, const unsigned char *topic_)
-{
-    int rc = init_size (size_);
-    if (rc == 0) {
-        set_flags (zmq::msg_t::subscribe);
-
-        //  We explicitly allow a NULL subscription with size zero
-        if (size_) {
-            assert (topic_);
-            memcpy (data (), topic_, size_);
-        }
-    }
-    return rc;
-}
-
-int zmq::msg_t::init_cancel (const size_t size_, const unsigned char *topic_)
-{
-    int rc = init_size (size_);
-    if (rc == 0) {
-        set_flags (zmq::msg_t::cancel);
-
-        //  We explicitly allow a NULL subscription with size zero
-        if (size_) {
-            assert (topic_);
-            memcpy (data (), topic_, size_);
-        }
-    }
-    return rc;
-}
-
-int zmq::msg_t::close ()
-{
-    //  Check the validity of the message.
-    if (unlikely (!check ())) {
-        errno = EFAULT;
-        return -1;
-    }
-
-    if (_u.base.type == type_lmsg) {
-        //  If the content is not shared, or if it is shared and the reference
-        //  count has dropped to zero, deallocate it.
-        if (!(_u.lmsg.flags & msg_t::shared)
-            || !_u.lmsg.content->refcnt.sub (1)) {
-            //  We used "placement new" operator to initialize the reference
-            //  counter so we call the destructor explicitly now.
-            _u.lmsg.content->refcnt.~atomic_counter_t ();
-
-            if (_u.lmsg.content->ffn)
-                _u.lmsg.content->ffn (_u.lmsg.content->data,
-                                      _u.lmsg.content->hint);
-            free (_u.lmsg.content);
-        }
-    }
-
-    if (is_zcmsg ()) {
-        zmq_assert (_u.zclmsg.content->ffn);
-
-        //  If the content is not shared, or if it is shared and the reference
-        //  count has dropped to zero, deallocate it.
-        if (!(_u.zclmsg.flags & msg_t::shared)
-            || !_u.zclmsg.content->refcnt.sub (1)) {
-            //  We used "placement new" operator to initialize the reference
-            //  counter so we call the destructor explicitly now.
-            _u.zclmsg.content->refcnt.~atomic_counter_t ();
-
-            _u.zclmsg.content->ffn (_u.zclmsg.content->data,
-                                    _u.zclmsg.content->hint);
-        }
-    }
-
-    if (_u.base.metadata != NULL) {
-        if (_u.base.metadata->drop_ref ()) {
-            LIBZMQ_DELETE (_u.base.metadata);
-        }
-        _u.base.metadata = NULL;
-    }
-
-    if (_u.base.group.type == group_type_long) {
-        if (!_u.base.group.lgroup.content->refcnt.sub (1)) {
-            //  We used "placement new" operator to initialize the reference
-            //  counter so we call the destructor explicitly now.
-            _u.base.group.lgroup.content->refcnt.~atomic_counter_t ();
-
-            free (_u.base.group.lgroup.content);
-        }
-    }
-
-    //  Make the message invalid.
-    _u.base.type = 0;
-
-    return 0;
-}
-
-int zmq::msg_t::move (msg_t &src_)
-{
-    //  Check the validity of the source.
-    if (unlikely (!src_.check ())) {
-        errno = EFAULT;
-        return -1;
-    }
-
-    int rc = close ();
-    if (unlikely (rc < 0))
-        return rc;
-
-    *this = src_;
-
-    rc = src_.init ();
-    if (unlikely (rc < 0))
-        return rc;
-
-    return 0;
-}
-
-int zmq::msg_t::copy (msg_t &src_)
-{
-    //  Check the validity of the source.
-    if (unlikely (!src_.check ())) {
-        errno = EFAULT;
-        return -1;
-    }
-
-    const int rc = close ();
-    if (unlikely (rc < 0))
-        return rc;
-
-    // The initial reference count, when a non-shared message is initially
-    // shared (between the original and the copy we create here).
-    const atomic_counter_t::integer_t initial_shared_refcnt = 2;
-
-    if (src_.is_lmsg () || src_.is_zcmsg ()) {
-        //  One reference is added to shared messages. Non-shared messages
-        //  are turned into shared messages.
-        if (src_.flags () & msg_t::shared)
-            src_.refcnt ()->add (1);
-        else {
-            src_.set_flags (msg_t::shared);
-            src_.refcnt ()->set (initial_shared_refcnt);
-        }
-    }
-
-    if (src_._u.base.metadata != NULL)
-        src_._u.base.metadata->add_ref ();
-
-    if (src_._u.base.group.type == group_type_long)
-        src_._u.base.group.lgroup.content->refcnt.add (1);
-
-    *this = src_;
-
-    return 0;
-}
-
-void *zmq::msg_t::data ()
-{
-    //  Check the validity of the message.
-    zmq_assert (check ());
-
-    switch (_u.base.type) {
-        case type_vsm:
-            return _u.vsm.data;
-        case type_lmsg:
-            return _u.lmsg.content->data;
-        case type_cmsg:
-            return _u.cmsg.data;
-        case type_zclmsg:
-            return _u.zclmsg.content->data;
-        default:
-            zmq_assert (false);
-            return NULL;
-    }
-}
-
-size_t zmq::msg_t::size () const
-{
-    //  Check the validity of the message.
-    zmq_assert (check ());
-
-    switch (_u.base.type) {
-        case type_vsm:
-            return _u.vsm.size;
-        case type_lmsg:
-            return _u.lmsg.content->size;
-        case type_zclmsg:
-            return _u.zclmsg.content->size;
-        case type_cmsg:
-            return _u.cmsg.size;
-        default:
-            zmq_assert (false);
-            return 0;
-    }
-}
-
-void zmq::msg_t::shrink (size_t new_size_)
-{
-    //  Check the validity of the message.
-    zmq_assert (check ());
-    zmq_assert (new_size_ <= size ());
-
-    switch (_u.base.type) {
-        case type_vsm:
-            _u.vsm.size = static_cast<unsigned char> (new_size_);
-            break;
-        case type_lmsg:
-            _u.lmsg.content->size = new_size_;
-            break;
-        case type_zclmsg:
-            _u.zclmsg.content->size = new_size_;
-            break;
-        case type_cmsg:
-            _u.cmsg.size = new_size_;
-            break;
-        default:
-            zmq_assert (false);
-    }
-}
-
-unsigned char zmq::msg_t::flags () const
-{
-    return _u.base.flags;
-}
-
-void zmq::msg_t::set_flags (unsigned char flags_)
-{
-    _u.base.flags |= flags_;
-}
-
-void zmq::msg_t::reset_flags (unsigned char flags_)
-{
-    _u.base.flags &= ~flags_;
-}
-
-zmq::metadata_t *zmq::msg_t::metadata () const
-{
-    return _u.base.metadata;
-}
-
-void zmq::msg_t::set_metadata (zmq::metadata_t *metadata_)
-{
-    assert (metadata_ != NULL);
-    assert (_u.base.metadata == NULL);
-    metadata_->add_ref ();
-    _u.base.metadata = metadata_;
-}
-
-void zmq::msg_t::reset_metadata ()
-{
-    if (_u.base.metadata) {
-        if (_u.base.metadata->drop_ref ()) {
-            LIBZMQ_DELETE (_u.base.metadata);
-        }
-        _u.base.metadata = NULL;
-    }
-}
-
-bool zmq::msg_t::is_routing_id () const
-{
-    return (_u.base.flags & routing_id) == routing_id;
-}
-
-bool zmq::msg_t::is_credential () const
-{
-    return (_u.base.flags & credential) == credential;
-}
-
-bool zmq::msg_t::is_delimiter () const
-{
-    return _u.base.type == type_delimiter;
-}
-
-bool zmq::msg_t::is_vsm () const
-{
-    return _u.base.type == type_vsm;
-}
-
-bool zmq::msg_t::is_cmsg () const
-{
-    return _u.base.type == type_cmsg;
-}
-
-bool zmq::msg_t::is_lmsg () const
-{
-    return _u.base.type == type_lmsg;
-}
-
-bool zmq::msg_t::is_zcmsg () const
-{
-    return _u.base.type == type_zclmsg;
-}
-
-bool zmq::msg_t::is_join () const
-{
-    return _u.base.type == type_join;
-}
-
-bool zmq::msg_t::is_leave () const
-{
-    return _u.base.type == type_leave;
-}
-
-bool zmq::msg_t::is_ping () const
-{
-    return (_u.base.flags & CMD_TYPE_MASK) == ping;
-}
-
-bool zmq::msg_t::is_pong () const
-{
-    return (_u.base.flags & CMD_TYPE_MASK) == pong;
-}
-
-bool zmq::msg_t::is_close_cmd () const
-{
-    return (_u.base.flags & CMD_TYPE_MASK) == close_cmd;
-}
-
-size_t zmq::msg_t::command_body_size () const
-{
-    if (this->is_ping () || this->is_pong ())
-        return this->size () - ping_cmd_name_size;
-    else if (!(this->flags () & msg_t::command)
-             && (this->is_subscribe () || this->is_cancel ()))
-        return this->size ();
-    else if (this->is_subscribe ())
-        return this->size () - sub_cmd_name_size;
-    else if (this->is_cancel ())
-        return this->size () - cancel_cmd_name_size;
-
-    return 0;
-}
-
-void *zmq::msg_t::command_body ()
-{
-    unsigned char *data = NULL;
-
-    if (this->is_ping () || this->is_pong ())
-        data =
-          static_cast<unsigned char *> (this->data ()) + ping_cmd_name_size;
-    //  With inproc, command flag is not set for sub/cancel
-    else if (!(this->flags () & msg_t::command)
-             && (this->is_subscribe () || this->is_cancel ()))
-        data = static_cast<unsigned char *> (this->data ());
-    else if (this->is_subscribe ())
-        data = static_cast<unsigned char *> (this->data ()) + sub_cmd_name_size;
-    else if (this->is_cancel ())
-        data =
-          static_cast<unsigned char *> (this->data ()) + cancel_cmd_name_size;
-
-    return data;
-}
-
-void zmq::msg_t::add_refs (int refs_)
-{
-    zmq_assert (refs_ >= 0);
-
-    //  Operation not supported for messages with metadata.
-    zmq_assert (_u.base.metadata == NULL);
-
-    //  No copies required.
-    if (!refs_)
-        return;
-
-    //  VSMs, CMSGS and delimiters can be copied straight away. The only
-    //  message type that needs special care are long messages.
-    if (_u.base.type == type_lmsg || is_zcmsg ()) {
-        if (_u.base.flags & msg_t::shared)
-            refcnt ()->add (refs_);
-        else {
-            refcnt ()->set (refs_ + 1);
-            _u.base.flags |= msg_t::shared;
-        }
-    }
-}
-
-bool zmq::msg_t::rm_refs (int refs_)
-{
-    zmq_assert (refs_ >= 0);
-
-    //  Operation not supported for messages with metadata.
-    zmq_assert (_u.base.metadata == NULL);
-
-    //  No copies required.
-    if (!refs_)
-        return true;
-
-    //  If there's only one reference close the message.
-    if ((_u.base.type != type_zclmsg && _u.base.type != type_lmsg)
-        || !(_u.base.flags & msg_t::shared)) {
-        close ();
-        return false;
-    }
-
-    //  The only message type that needs special care are long and zcopy messages.
-    if (_u.base.type == type_lmsg && !_u.lmsg.content->refcnt.sub (refs_)) {
-        //  We used "placement new" operator to initialize the reference
-        //  counter so we call the destructor explicitly now.
-        _u.lmsg.content->refcnt.~atomic_counter_t ();
-
-        if (_u.lmsg.content->ffn)
-            _u.lmsg.content->ffn (_u.lmsg.content->data, _u.lmsg.content->hint);
-        free (_u.lmsg.content);
-
-        return false;
-    }
-
-    if (is_zcmsg () && !_u.zclmsg.content->refcnt.sub (refs_)) {
-        // storage for rfcnt is provided externally
-        if (_u.zclmsg.content->ffn) {
-            _u.zclmsg.content->ffn (_u.zclmsg.content->data,
-                                    _u.zclmsg.content->hint);
-        }
-
-        return false;
-    }
-
-    return true;
-}
-
-uint32_t zmq::msg_t::get_routing_id () const
-{
-    return _u.base.routing_id;
-}
-
-int zmq::msg_t::set_routing_id (uint32_t routing_id_)
-{
-    if (routing_id_) {
-        _u.base.routing_id = routing_id_;
-        return 0;
-    }
-    errno = EINVAL;
-    return -1;
-}
-
-int zmq::msg_t::reset_routing_id ()
-{
-    _u.base.routing_id = 0;
-    return 0;
-}
-
-const char *zmq::msg_t::group () const
-{
-    if (_u.base.group.type == group_type_long)
-        return _u.base.group.lgroup.content->group;
-    return _u.base.group.sgroup.group;
-}
-
-int zmq::msg_t::set_group (const char *group_)
-{
-    size_t length = strnlen (group_, ZMQ_GROUP_MAX_LENGTH);
-
-    return set_group (group_, length);
-}
-
-int zmq::msg_t::set_group (const char *group_, size_t length_)
-{
-    if (length_ > ZMQ_GROUP_MAX_LENGTH) {
-        errno = EINVAL;
-        return -1;
-    }
-
-    if (length_ > 14) {
-        _u.base.group.lgroup.type = group_type_long;
-        _u.base.group.lgroup.content =
-          (long_group_t *) malloc (sizeof (long_group_t));
-        assert (_u.base.group.lgroup.content);
-        new (&_u.base.group.lgroup.content->refcnt) zmq::atomic_counter_t ();
-        _u.base.group.lgroup.content->refcnt.set (1);
-        strncpy (_u.base.group.lgroup.content->group, group_, length_);
-        _u.base.group.lgroup.content->group[length_] = '\0';
-    } else {
-        strncpy (_u.base.group.sgroup.group, group_, length_);
-        _u.base.group.sgroup.group[length_] = '\0';
-    }
-
-    return 0;
-}
-
-zmq::atomic_counter_t *zmq::msg_t::refcnt ()
-{
-    switch (_u.base.type) {
-        case type_lmsg:
-            return &_u.lmsg.content->refcnt;
-        case type_zclmsg:
-            return &_u.zclmsg.content->refcnt;
-        default:
-            zmq_assert (false);
-            return NULL;
-    }
-}
diff --git a/libs/libzmq/src/msg.hpp b/libs/libzmq/src/msg.hpp
deleted file mode 100644
index e2eaa09..0000000
--- a/libs/libzmq/src/msg.hpp
+++ /dev/null
@@ -1,345 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_MSG_HPP_INCLUDE__
-#define __ZMQ_MSG_HPP_INCLUDE__
-
-#include <stddef.h>
-#include <stdio.h>
-
-#include "config.hpp"
-#include "err.hpp"
-#include "fd.hpp"
-#include "atomic_counter.hpp"
-#include "metadata.hpp"
-
-//  bits 2-5
-#define CMD_TYPE_MASK 0x1c
-
-//  Signature for free function to deallocate the message content.
-//  Note that it has to be declared as "C" so that it is the same as
-//  zmq_free_fn defined in zmq.h.
-extern "C" {
-typedef void (msg_free_fn) (void *data_, void *hint_);
-}
-
-namespace zmq
-{
-//  Note that this structure needs to be explicitly constructed
-//  (init functions) and destructed (close function).
-
-static const char cancel_cmd_name[] = "\6CANCEL";
-static const char sub_cmd_name[] = "\x9SUBSCRIBE";
-
-class msg_t
-{
-  public:
-    //  Shared message buffer. Message data are either allocated in one
-    //  continuous block along with this structure - thus avoiding one
-    //  malloc/free pair or they are stored in user-supplied memory.
-    //  In the latter case, ffn member stores pointer to the function to be
-    //  used to deallocate the data. If the buffer is actually shared (there
-    //  are at least 2 references to it) refcount member contains number of
-    //  references.
-    struct content_t
-    {
-        void *data;
-        size_t size;
-        msg_free_fn *ffn;
-        void *hint;
-        zmq::atomic_counter_t refcnt;
-    };
-
-    //  Message flags.
-    enum
-    {
-        more = 1,    //  Followed by more parts
-        command = 2, //  Command frame (see ZMTP spec)
-        //  Command types, use only bits 2-5 and compare with ==, not bitwise,
-        //  a command can never be of more that one type at the same time
-        ping = 4,
-        pong = 8,
-        subscribe = 12,
-        cancel = 16,
-        close_cmd = 20,
-        credential = 32,
-        routing_id = 64,
-        shared = 128
-    };
-
-    bool check () const;
-    int init ();
-
-    int init (void *data_,
-              size_t size_,
-              msg_free_fn *ffn_,
-              void *hint_,
-              content_t *content_ = NULL);
-
-    int init_size (size_t size_);
-    int init_buffer (const void *buf_, size_t size_);
-    int init_data (void *data_, size_t size_, msg_free_fn *ffn_, void *hint_);
-    int init_external_storage (content_t *content_,
-                               void *data_,
-                               size_t size_,
-                               msg_free_fn *ffn_,
-                               void *hint_);
-    int init_delimiter ();
-    int init_join ();
-    int init_leave ();
-    int init_subscribe (const size_t size_, const unsigned char *topic);
-    int init_cancel (const size_t size_, const unsigned char *topic);
-    int close ();
-    int move (msg_t &src_);
-    int copy (msg_t &src_);
-    void *data ();
-    size_t size () const;
-    unsigned char flags () const;
-    void set_flags (unsigned char flags_);
-    void reset_flags (unsigned char flags_);
-    metadata_t *metadata () const;
-    void set_metadata (metadata_t *metadata_);
-    void reset_metadata ();
-    bool is_routing_id () const;
-    bool is_credential () const;
-    bool is_delimiter () const;
-    bool is_join () const;
-    bool is_leave () const;
-    bool is_ping () const;
-    bool is_pong () const;
-    bool is_close_cmd () const;
-
-    //  These are called on each message received by the session_base class,
-    //  so get them inlined to avoid the overhead of 2 function calls per msg
-    bool is_subscribe () const
-    {
-        return (_u.base.flags & CMD_TYPE_MASK) == subscribe;
-    }
-
-    bool is_cancel () const
-    {
-        return (_u.base.flags & CMD_TYPE_MASK) == cancel;
-    }
-
-    size_t command_body_size () const;
-    void *command_body ();
-    bool is_vsm () const;
-    bool is_cmsg () const;
-    bool is_lmsg () const;
-    bool is_zcmsg () const;
-    uint32_t get_routing_id () const;
-    int set_routing_id (uint32_t routing_id_);
-    int reset_routing_id ();
-    const char *group () const;
-    int set_group (const char *group_);
-    int set_group (const char *, size_t length_);
-
-    //  After calling this function you can copy the message in POD-style
-    //  refs_ times. No need to call copy.
-    void add_refs (int refs_);
-
-    //  Removes references previously added by add_refs. If the number of
-    //  references drops to 0, the message is closed and false is returned.
-    bool rm_refs (int refs_);
-
-    void shrink (size_t new_size_);
-
-    //  Size in bytes of the largest message that is still copied around
-    //  rather than being reference-counted.
-    enum
-    {
-        msg_t_size = 64
-    };
-    enum
-    {
-        max_vsm_size =
-          msg_t_size - (sizeof (metadata_t *) + 3 + 16 + sizeof (uint32_t))
-    };
-    enum
-    {
-        ping_cmd_name_size = 5,   // 4PING
-        cancel_cmd_name_size = 7, // 6CANCEL
-        sub_cmd_name_size = 10    // 9SUBSCRIBE
-    };
-
-  private:
-    zmq::atomic_counter_t *refcnt ();
-
-    //  Different message types.
-    enum type_t
-    {
-        type_min = 101,
-        //  VSM messages store the content in the message itself
-        type_vsm = 101,
-        //  LMSG messages store the content in malloc-ed memory
-        type_lmsg = 102,
-        //  Delimiter messages are used in envelopes
-        type_delimiter = 103,
-        //  CMSG messages point to constant data
-        type_cmsg = 104,
-
-        // zero-copy LMSG message for v2_decoder
-        type_zclmsg = 105,
-
-        //  Join message for radio_dish
-        type_join = 106,
-
-        //  Leave message for radio_dish
-        type_leave = 107,
-
-        type_max = 107
-    };
-
-    enum group_type_t
-    {
-        group_type_short,
-        group_type_long
-    };
-
-    struct long_group_t
-    {
-        char group[ZMQ_GROUP_MAX_LENGTH + 1];
-        atomic_counter_t refcnt;
-    };
-
-    union group_t
-    {
-        unsigned char type;
-        struct
-        {
-            unsigned char type;
-            char group[15];
-        } sgroup;
-        struct
-        {
-            unsigned char type;
-            long_group_t *content;
-        } lgroup;
-    };
-
-    //  Note that fields shared between different message types are not
-    //  moved to the parent class (msg_t). This way we get tighter packing
-    //  of the data. Shared fields can be accessed via 'base' member of
-    //  the union.
-    union
-    {
-        struct
-        {
-            metadata_t *metadata;
-            unsigned char unused[msg_t_size
-                                 - (sizeof (metadata_t *) + 2
-                                    + sizeof (uint32_t) + sizeof (group_t))];
-            unsigned char type;
-            unsigned char flags;
-            uint32_t routing_id;
-            group_t group;
-        } base;
-        struct
-        {
-            metadata_t *metadata;
-            unsigned char data[max_vsm_size];
-            unsigned char size;
-            unsigned char type;
-            unsigned char flags;
-            uint32_t routing_id;
-            group_t group;
-        } vsm;
-        struct
-        {
-            metadata_t *metadata;
-            content_t *content;
-            unsigned char
-              unused[msg_t_size
-                     - (sizeof (metadata_t *) + sizeof (content_t *) + 2
-                        + sizeof (uint32_t) + sizeof (group_t))];
-            unsigned char type;
-            unsigned char flags;
-            uint32_t routing_id;
-            group_t group;
-        } lmsg;
-        struct
-        {
-            metadata_t *metadata;
-            content_t *content;
-            unsigned char
-              unused[msg_t_size
-                     - (sizeof (metadata_t *) + sizeof (content_t *) + 2
-                        + sizeof (uint32_t) + sizeof (group_t))];
-            unsigned char type;
-            unsigned char flags;
-            uint32_t routing_id;
-            group_t group;
-        } zclmsg;
-        struct
-        {
-            metadata_t *metadata;
-            void *data;
-            size_t size;
-            unsigned char unused[msg_t_size
-                                 - (sizeof (metadata_t *) + sizeof (void *)
-                                    + sizeof (size_t) + 2 + sizeof (uint32_t)
-                                    + sizeof (group_t))];
-            unsigned char type;
-            unsigned char flags;
-            uint32_t routing_id;
-            group_t group;
-        } cmsg;
-        struct
-        {
-            metadata_t *metadata;
-            unsigned char unused[msg_t_size
-                                 - (sizeof (metadata_t *) + 2
-                                    + sizeof (uint32_t) + sizeof (group_t))];
-            unsigned char type;
-            unsigned char flags;
-            uint32_t routing_id;
-            group_t group;
-        } delimiter;
-    } _u;
-};
-
-inline int close_and_return (zmq::msg_t *msg_, int echo_)
-{
-    // Since we abort on close failure we preserve errno for success case.
-    const int err = errno;
-    const int rc = msg_->close ();
-    errno_assert (rc == 0);
-    errno = err;
-    return echo_;
-}
-
-inline int close_and_return (zmq::msg_t msg_[], int count_, int echo_)
-{
-    for (int i = 0; i < count_; i++)
-        close_and_return (&msg_[i], 0);
-    return echo_;
-}
-}
-
-#endif
diff --git a/libs/libzmq/src/mtrie.cpp b/libs/libzmq/src/mtrie.cpp
deleted file mode 100644
index 30a84e3..0000000
--- a/libs/libzmq/src/mtrie.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "mtrie.hpp"
-#include "generic_mtrie_impl.hpp"
-
-namespace zmq
-{
-template class generic_mtrie_t<pipe_t>;
-}
diff --git a/libs/libzmq/src/mtrie.hpp b/libs/libzmq/src/mtrie.hpp
deleted file mode 100644
index b5ca3ac..0000000
--- a/libs/libzmq/src/mtrie.hpp
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_MTRIE_HPP_INCLUDED__
-#define __ZMQ_MTRIE_HPP_INCLUDED__
-
-#include "generic_mtrie.hpp"
-
-#if __cplusplus >= 201103L || (defined(_MSC_VER) && _MSC_VER > 1600)
-#define ZMQ_HAS_EXTERN_TEMPLATE 1
-#else
-#define ZMQ_HAS_EXTERN_TEMPLATE 0
-#endif
-
-namespace zmq
-{
-class pipe_t;
-
-#if ZMQ_HAS_EXTERN_TEMPLATE
-extern template class generic_mtrie_t<pipe_t>;
-#endif
-
-typedef generic_mtrie_t<pipe_t> mtrie_t;
-}
-
-#endif
diff --git a/libs/libzmq/src/mutex.hpp b/libs/libzmq/src/mutex.hpp
deleted file mode 100644
index 25ad845..0000000
--- a/libs/libzmq/src/mutex.hpp
+++ /dev/null
@@ -1,204 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_MUTEX_HPP_INCLUDED__
-#define __ZMQ_MUTEX_HPP_INCLUDED__
-
-#include "err.hpp"
-#include "macros.hpp"
-
-//  Mutex class encapsulates OS mutex in a platform-independent way.
-
-#if defined(ZMQ_HAVE_WINDOWS) && !defined(ZMQ_USE_CV_IMPL_PTHREADS)
-
-#include "windows.hpp"
-
-namespace zmq
-{
-class mutex_t
-{
-  public:
-    mutex_t () { InitializeCriticalSection (&_cs); }
-
-    ~mutex_t () { DeleteCriticalSection (&_cs); }
-
-    void lock () { EnterCriticalSection (&_cs); }
-
-    bool try_lock () { return (TryEnterCriticalSection (&_cs)) ? true : false; }
-
-    void unlock () { LeaveCriticalSection (&_cs); }
-
-    CRITICAL_SECTION *get_cs () { return &_cs; }
-
-  private:
-    CRITICAL_SECTION _cs;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (mutex_t)
-};
-}
-
-#elif defined ZMQ_HAVE_VXWORKS
-
-#include <vxWorks.h>
-#include <semLib.h>
-
-namespace zmq
-{
-class mutex_t
-{
-  public:
-    inline mutex_t ()
-    {
-        _semId =
-          semMCreate (SEM_Q_PRIORITY | SEM_INVERSION_SAFE | SEM_DELETE_SAFE);
-    }
-
-    inline ~mutex_t () { semDelete (_semId); }
-
-    inline void lock () { semTake (_semId, WAIT_FOREVER); }
-
-    inline bool try_lock ()
-    {
-        if (semTake (_semId, NO_WAIT) == OK) {
-            return true;
-        }
-        return false;
-    }
-
-    inline void unlock () { semGive (_semId); }
-
-  private:
-    SEM_ID _semId;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (mutex_t)
-};
-}
-
-#else
-
-#include <pthread.h>
-
-namespace zmq
-{
-class mutex_t
-{
-  public:
-    inline mutex_t ()
-    {
-        int rc = pthread_mutexattr_init (&_attr);
-        posix_assert (rc);
-
-        rc = pthread_mutexattr_settype (&_attr, PTHREAD_MUTEX_RECURSIVE);
-        posix_assert (rc);
-
-        rc = pthread_mutex_init (&_mutex, &_attr);
-        posix_assert (rc);
-    }
-
-    inline ~mutex_t ()
-    {
-        int rc = pthread_mutex_destroy (&_mutex);
-        posix_assert (rc);
-
-        rc = pthread_mutexattr_destroy (&_attr);
-        posix_assert (rc);
-    }
-
-    inline void lock ()
-    {
-        int rc = pthread_mutex_lock (&_mutex);
-        posix_assert (rc);
-    }
-
-    inline bool try_lock ()
-    {
-        int rc = pthread_mutex_trylock (&_mutex);
-        if (rc == EBUSY)
-            return false;
-
-        posix_assert (rc);
-        return true;
-    }
-
-    inline void unlock ()
-    {
-        int rc = pthread_mutex_unlock (&_mutex);
-        posix_assert (rc);
-    }
-
-    inline pthread_mutex_t *get_mutex () { return &_mutex; }
-
-  private:
-    pthread_mutex_t _mutex;
-    pthread_mutexattr_t _attr;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (mutex_t)
-};
-}
-
-#endif
-
-
-namespace zmq
-{
-struct scoped_lock_t
-{
-    scoped_lock_t (mutex_t &mutex_) : _mutex (mutex_) { _mutex.lock (); }
-
-    ~scoped_lock_t () { _mutex.unlock (); }
-
-  private:
-    mutex_t &_mutex;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (scoped_lock_t)
-};
-
-
-struct scoped_optional_lock_t
-{
-    scoped_optional_lock_t (mutex_t *mutex_) : _mutex (mutex_)
-    {
-        if (_mutex != NULL)
-            _mutex->lock ();
-    }
-
-    ~scoped_optional_lock_t ()
-    {
-        if (_mutex != NULL)
-            _mutex->unlock ();
-    }
-
-  private:
-    mutex_t *_mutex;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (scoped_optional_lock_t)
-};
-}
-
-#endif
diff --git a/libs/libzmq/src/norm_engine.cpp b/libs/libzmq/src/norm_engine.cpp
deleted file mode 100644
index 786daef..0000000
--- a/libs/libzmq/src/norm_engine.cpp
+++ /dev/null
@@ -1,824 +0,0 @@
-
-#include "precompiled.hpp"
-
-#include "platform.hpp"
-
-#if defined ZMQ_HAVE_NORM
-
-#include "norm_engine.hpp"
-#ifdef ZMQ_USE_NORM_SOCKET_WRAPPER
-#include "ip.hpp"
-#endif
-
-#include "session_base.hpp"
-#include "v2_protocol.hpp"
-
-
-#ifdef ZMQ_USE_NORM_SOCKET_WRAPPER
-
-struct norm_wrapper_thread_args_t
-{
-    NormDescriptor norm_descriptor;
-    SOCKET wrapper_write_fd;
-    NormInstanceHandle norm_instance_handle;
-};
-
-DWORD WINAPI normWrapperThread (LPVOID lpParam);
-#endif
-
-zmq::norm_engine_t::norm_engine_t (io_thread_t *parent_,
-                                   const options_t &options_) :
-    io_object_t (parent_),
-    zmq_session (NULL),
-    options (options_),
-    norm_instance (NORM_INSTANCE_INVALID),
-    norm_session (NORM_SESSION_INVALID),
-    is_sender (false),
-    is_receiver (false),
-    zmq_encoder (0),
-    norm_tx_stream (NORM_OBJECT_INVALID),
-    tx_first_msg (true),
-    tx_more_bit (false),
-    zmq_output_ready (false),
-    norm_tx_ready (false),
-    tx_index (0),
-    tx_len (0),
-    zmq_input_ready (false)
-{
-    int rc = tx_msg.init ();
-    errno_assert (0 == rc);
-}
-
-zmq::norm_engine_t::~norm_engine_t ()
-{
-    shutdown (); // in case it was not already called
-}
-
-
-int zmq::norm_engine_t::init (const char *network_, bool send, bool recv)
-{
-    // Parse the "network_" address int "iface", "addr", and "port"
-    // norm endpoint format: [id,][<iface>;]<addr>:<port>
-    // First, look for optional local NormNodeId
-    // (default NORM_NODE_ANY causes NORM to use host IP addr for NormNodeId)
-    NormNodeId localId = NORM_NODE_ANY;
-    const char *ifacePtr = strchr (network_, ',');
-    if (NULL != ifacePtr) {
-        size_t idLen = ifacePtr - network_;
-        if (idLen > 31)
-            idLen = 31;
-        char idText[32];
-        strncpy (idText, network_, idLen);
-        idText[idLen] = '\0';
-        localId = (NormNodeId) atoi (idText);
-        ifacePtr++;
-    } else {
-        ifacePtr = network_;
-    }
-
-    // Second, look for optional multicast ifaceName
-    char ifaceName[256];
-    const char *addrPtr = strchr (ifacePtr, ';');
-    if (NULL != addrPtr) {
-        size_t ifaceLen = addrPtr - ifacePtr;
-        if (ifaceLen > 255)
-            ifaceLen = 255; // return error instead?
-        strncpy (ifaceName, ifacePtr, ifaceLen);
-        ifaceName[ifaceLen] = '\0';
-        ifacePtr = ifaceName;
-        addrPtr++;
-    } else {
-        addrPtr = ifacePtr;
-        ifacePtr = NULL;
-    }
-
-    // Finally, parse IP address and port number
-    const char *portPtr = strrchr (addrPtr, ':');
-    if (NULL == portPtr) {
-        errno = EINVAL;
-        return -1;
-    }
-
-    char addr[256];
-    size_t addrLen = portPtr - addrPtr;
-    if (addrLen > 255)
-        addrLen = 255;
-    strncpy (addr, addrPtr, addrLen);
-    addr[addrLen] = '\0';
-    portPtr++;
-    unsigned short portNumber = atoi (portPtr);
-
-    if (NORM_INSTANCE_INVALID == norm_instance) {
-        if (NORM_INSTANCE_INVALID == (norm_instance = NormCreateInstance ())) {
-            // errno set by whatever caused NormCreateInstance() to fail
-            return -1;
-        }
-    }
-
-    // TBD - What do we use for our local NormNodeId?
-    //       (for now we use automatic, IP addr based assignment or passed in 'id')
-    //       a) Use ZMQ Identity somehow?
-    //       b) Add function to use iface addr
-    //       c) Randomize and implement a NORM session layer
-    //          conflict detection/resolution protocol
-
-    norm_session = NormCreateSession (norm_instance, addr, portNumber, localId);
-    if (NORM_SESSION_INVALID == norm_session) {
-        int savedErrno = errno;
-        NormDestroyInstance (norm_instance);
-        norm_instance = NORM_INSTANCE_INVALID;
-        errno = savedErrno;
-        return -1;
-    }
-    // There's many other useful NORM options that could be applied here
-    if (NormIsUnicastAddress (addr)) {
-        NormSetDefaultUnicastNack (norm_session, true);
-    } else {
-        // These only apply for multicast sessions
-        //NormSetTTL(norm_session, options.multicast_hops);  // ZMQ default is 1
-        NormSetTTL (
-          norm_session,
-          255); // since the ZMQ_MULTICAST_HOPS socket option isn't well-supported
-        NormSetRxPortReuse (
-          norm_session,
-          true); // port reuse doesn't work for non-connected unicast
-        NormSetLoopback (norm_session,
-                         true); // needed when multicast users on same machine
-        if (NULL != ifacePtr) {
-            // Note a bad interface may not be caught until sender or receiver start
-            // (Since sender/receiver is not yet started, this always succeeds here)
-            NormSetMulticastInterface (norm_session, ifacePtr);
-        }
-    }
-
-    if (recv) {
-        // The alternative NORM_SYNC_CURRENT here would provide "instant"
-        // receiver sync to the sender's _current_ message transmission.
-        // NORM_SYNC_STREAM tries to get everything the sender has cached/buffered
-        NormSetDefaultSyncPolicy (norm_session, NORM_SYNC_STREAM);
-        if (!NormStartReceiver (norm_session, 2 * 1024 * 1024)) {
-            // errno set by whatever failed
-            int savedErrno = errno;
-            NormDestroyInstance (norm_instance); // session gets closed, too
-            norm_session = NORM_SESSION_INVALID;
-            norm_instance = NORM_INSTANCE_INVALID;
-            errno = savedErrno;
-            return -1;
-        }
-        is_receiver = true;
-    }
-
-    if (send) {
-        // Pick a random sender instance id (aka norm sender session id)
-        NormSessionId instanceId = NormGetRandomSessionId ();
-        // TBD - provide "options" for some NORM sender parameters
-        if (!NormStartSender (norm_session, instanceId, 2 * 1024 * 1024, 1400,
-                              16, 4)) {
-            // errno set by whatever failed
-            int savedErrno = errno;
-            NormDestroyInstance (norm_instance); // session gets closed, too
-            norm_session = NORM_SESSION_INVALID;
-            norm_instance = NORM_INSTANCE_INVALID;
-            errno = savedErrno;
-            return -1;
-        }
-        NormSetCongestionControl (norm_session, true);
-        norm_tx_ready = true;
-        is_sender = true;
-        if (NORM_OBJECT_INVALID
-            == (norm_tx_stream =
-                  NormStreamOpen (norm_session, 2 * 1024 * 1024))) {
-            // errno set by whatever failed
-            int savedErrno = errno;
-            NormDestroyInstance (norm_instance); // session gets closed, too
-            norm_session = NORM_SESSION_INVALID;
-            norm_instance = NORM_INSTANCE_INVALID;
-            errno = savedErrno;
-            return -1;
-        }
-    }
-
-    //NormSetMessageTrace(norm_session, true);
-    //NormSetDebugLevel(3);
-    //NormOpenDebugLog(norm_instance, "normLog.txt");
-
-    return 0; // no error
-} // end zmq::norm_engine_t::init()
-
-void zmq::norm_engine_t::shutdown ()
-{
-    // TBD - implement a more graceful shutdown option
-    if (is_receiver) {
-        NormStopReceiver (norm_session);
-
-        // delete any active NormRxStreamState
-        rx_pending_list.Destroy ();
-        rx_ready_list.Destroy ();
-        msg_ready_list.Destroy ();
-
-        is_receiver = false;
-    }
-    if (is_sender) {
-        NormStopSender (norm_session);
-        is_sender = false;
-    }
-    if (NORM_SESSION_INVALID != norm_session) {
-        NormDestroySession (norm_session);
-        norm_session = NORM_SESSION_INVALID;
-    }
-    if (NORM_INSTANCE_INVALID != norm_instance) {
-        NormStopInstance (norm_instance);
-        NormDestroyInstance (norm_instance);
-        norm_instance = NORM_INSTANCE_INVALID;
-    }
-} // end zmq::norm_engine_t::shutdown()
-
-void zmq::norm_engine_t::plug (io_thread_t *io_thread_,
-                               session_base_t *session_)
-{
-#ifdef ZMQ_USE_NORM_SOCKET_WRAPPER
-    norm_wrapper_thread_args_t *threadArgs = new norm_wrapper_thread_args_t;
-    int rc = make_fdpair (&wrapper_read_fd, &threadArgs->wrapper_write_fd);
-    errno_assert (rc != -1);
-
-    threadArgs->norm_descriptor = NormGetDescriptor (norm_instance);
-    threadArgs->norm_instance_handle = norm_instance;
-    norm_descriptor_handle = add_fd (wrapper_read_fd);
-#else
-    fd_t normDescriptor = NormGetDescriptor (norm_instance);
-    norm_descriptor_handle = add_fd (normDescriptor);
-#endif
-    // Set POLLIN for notification of pending NormEvents
-    set_pollin (norm_descriptor_handle);
-    // TBD - we may assign the NORM engine to an io_thread in the future???
-    zmq_session = session_;
-    if (is_sender)
-        zmq_output_ready = true;
-    if (is_receiver)
-        zmq_input_ready = true;
-
-
-    if (is_sender)
-        send_data ();
-
-#ifdef ZMQ_USE_NORM_SOCKET_WRAPPER
-    wrapper_thread_handle = CreateThread (NULL, 0, normWrapperThread,
-                                          threadArgs, 0, &wrapper_thread_id);
-#endif
-
-} // end zmq::norm_engine_t::init()
-
-void zmq::norm_engine_t::unplug ()
-{
-    rm_fd (norm_descriptor_handle);
-#ifdef ZMQ_USE_NORM_SOCKET_WRAPPER
-    PostThreadMessage (wrapper_thread_id, WM_QUIT, (WPARAM) NULL,
-                       (LPARAM) NULL);
-    WaitForSingleObject (wrapper_thread_handle, INFINITE);
-    DWORD exitCode;
-    GetExitCodeThread (wrapper_thread_handle, &exitCode);
-    zmq_assert (exitCode != -1);
-    int rc = closesocket (wrapper_read_fd);
-    errno_assert (rc != -1);
-#endif
-    zmq_session = NULL;
-} // end zmq::norm_engine_t::unplug()
-
-void zmq::norm_engine_t::terminate ()
-{
-    unplug ();
-    shutdown ();
-    delete this;
-}
-
-void zmq::norm_engine_t::restart_output ()
-{
-    // There's new message data available from the session
-    zmq_output_ready = true;
-    if (norm_tx_ready)
-        send_data ();
-
-} // end zmq::norm_engine_t::restart_output()
-
-void zmq::norm_engine_t::send_data ()
-{
-    // Here we write as much as is available or we can
-    while (zmq_output_ready && norm_tx_ready) {
-        if (0 == tx_len) {
-            // Our tx_buffer needs data to send
-            // Get more data from encoder
-            size_t space = BUFFER_SIZE;
-            unsigned char *bufPtr = (unsigned char *) tx_buffer;
-            tx_len = zmq_encoder.encode (&bufPtr, space);
-            if (0 == tx_len) {
-                if (tx_first_msg) {
-                    // We don't need to mark eom/flush until a message is sent
-                    tx_first_msg = false;
-                } else {
-                    // A prior message was completely written to stream, so
-                    // mark end-of-message and possibly flush (to force packet transmission,
-                    // even if it's not a full segment so message gets delivered quickly)
-                    // NormStreamMarkEom(norm_tx_stream);  // the flush below marks eom
-                    // Note NORM_FLUSH_ACTIVE makes NORM fairly chatty for low duty cycle messaging
-                    // but makes sure content is delivered quickly.  Positive acknowledgements
-                    // with flush override would make NORM more succinct here
-                    NormStreamFlush (norm_tx_stream, true, NORM_FLUSH_ACTIVE);
-                }
-                // Need to pull and load a new message to send
-                if (-1 == zmq_session->pull_msg (&tx_msg)) {
-                    // We need to wait for "restart_output()" to be called by ZMQ
-                    zmq_output_ready = false;
-                    break;
-                }
-                zmq_encoder.load_msg (&tx_msg);
-                // Should we write message size header for NORM to use? Or expect NORM
-                // receiver to decode ZMQ message framing format(s)?
-                // OK - we need to use a byte to denote when the ZMQ frame is the _first_
-                //      frame of a message so it can be decoded properly when a receiver
-                //      'syncs' mid-stream.  We key off the the state of the 'more_flag'
-                //      I.e.,If  more_flag _was_ false previously, this is the first
-                //      frame of a ZMQ message.
-                if (tx_more_bit)
-                    tx_buffer[0] =
-                      (char) 0xff; // this is not first frame of message
-                else
-                    tx_buffer[0] = 0x00; // this is first frame of message
-                tx_more_bit = (0 != (tx_msg.flags () & msg_t::more));
-                // Go ahead an get a first chunk of the message
-                bufPtr++;
-                space--;
-                tx_len = 1 + zmq_encoder.encode (&bufPtr, space);
-                tx_index = 0;
-            }
-        }
-        // Do we have data in our tx_buffer pending
-        if (tx_index < tx_len) {
-            // We have data in our tx_buffer to send, so write it to the stream
-            tx_index += NormStreamWrite (norm_tx_stream, tx_buffer + tx_index,
-                                         tx_len - tx_index);
-            if (tx_index < tx_len) {
-                // NORM stream buffer full, wait for NORM_TX_QUEUE_VACANCY
-                norm_tx_ready = false;
-                break;
-            }
-            tx_len = 0; // all buffered data was written
-        }
-    } // end while (zmq_output_ready && norm_tx_ready)
-} // end zmq::norm_engine_t::send_data()
-
-void zmq::norm_engine_t::in_event ()
-{
-    // This means a NormEvent is pending, so call NormGetNextEvent() and handle
-    NormEvent event;
-#ifdef ZMQ_USE_NORM_SOCKET_WRAPPER
-    int rc = recv (wrapper_read_fd, reinterpret_cast<char *> (&event),
-                   sizeof (event), 0);
-    errno_assert (rc == sizeof (event));
-#else
-    if (!NormGetNextEvent (norm_instance, &event)) {
-        // NORM has died before we unplugged?!
-        zmq_assert (false);
-        return;
-    }
-#endif
-
-    switch (event.type) {
-        case NORM_TX_QUEUE_VACANCY:
-        case NORM_TX_QUEUE_EMPTY:
-            if (!norm_tx_ready) {
-                norm_tx_ready = true;
-                send_data ();
-            }
-            break;
-
-        case NORM_RX_OBJECT_NEW:
-            //break;
-        case NORM_RX_OBJECT_UPDATED:
-            recv_data (event.object);
-            break;
-
-        case NORM_RX_OBJECT_ABORTED: {
-            NormRxStreamState *rxState =
-              (NormRxStreamState *) NormObjectGetUserData (event.object);
-            if (NULL != rxState) {
-                // Remove the state from the list it's in
-                // This is now unnecessary since deletion takes care of list removal
-                // but in the interest of being clear ...
-                NormRxStreamState::List *list = rxState->AccessList ();
-                if (NULL != list)
-                    list->Remove (*rxState);
-            }
-            delete rxState;
-            break;
-        }
-        case NORM_REMOTE_SENDER_INACTIVE:
-            // Here we free resources used for this formerly active sender.
-            // Note w/ NORM_SYNC_STREAM, if sender reactivates, we may
-            //  get some messages delivered twice.  NORM_SYNC_CURRENT would
-            // mitigate that but might miss data at startup. Always tradeoffs.
-            // Instead of immediately deleting, we could instead initiate a
-            // user configurable timeout here to wait some amount of time
-            // after this event to declare the remote sender truly dead
-            // and delete its state???
-            NormNodeDelete (event.sender);
-            break;
-
-        default:
-            // We ignore some NORM events
-            break;
-    }
-} // zmq::norm_engine_t::in_event()
-
-bool zmq::norm_engine_t::restart_input ()
-{
-    // TBD - should we check/assert that zmq_input_ready was false???
-    zmq_input_ready = true;
-    // Process any pending received messages
-    if (!msg_ready_list.IsEmpty ())
-        recv_data (NORM_OBJECT_INVALID);
-
-    return true;
-} // end zmq::norm_engine_t::restart_input()
-
-void zmq::norm_engine_t::recv_data (NormObjectHandle object)
-{
-    if (NORM_OBJECT_INVALID != object) {
-        // Call result of NORM_RX_OBJECT_UPDATED notification
-        // This is a rx_ready indication for a new or existing rx stream
-        // First, determine if this is a stream we already know
-        zmq_assert (NORM_OBJECT_STREAM == NormObjectGetType (object));
-        // Since there can be multiple senders (publishers), we keep
-        // state for each separate rx stream.
-        NormRxStreamState *rxState =
-          (NormRxStreamState *) NormObjectGetUserData (object);
-        if (NULL == rxState) {
-            // This is a new stream, so create rxState with zmq decoder, etc
-            rxState = new (std::nothrow)
-              NormRxStreamState (object, options.maxmsgsize, options.zero_copy,
-                                 options.in_batch_size);
-            errno_assert (rxState);
-
-            if (!rxState->Init ()) {
-                errno_assert (false);
-                delete rxState;
-                return;
-            }
-            NormObjectSetUserData (object, rxState);
-        } else if (!rxState->IsRxReady ()) {
-            // Existing non-ready stream, so remove from pending
-            // list to be promoted to rx_ready_list ...
-            rx_pending_list.Remove (*rxState);
-        }
-        if (!rxState->IsRxReady ()) {
-            // TBD - prepend up front for immediate service?
-            rxState->SetRxReady (true);
-            rx_ready_list.Append (*rxState);
-        }
-    }
-    // This loop repeats until we've read all data available from "rx ready" inbound streams
-    // and pushed any accumulated messages we can up to the zmq session.
-    while (!rx_ready_list.IsEmpty ()
-           || (zmq_input_ready && !msg_ready_list.IsEmpty ())) {
-        // Iterate through our rx_ready streams, reading data into the decoder
-        // (This services incoming "rx ready" streams in a round-robin fashion)
-        NormRxStreamState::List::Iterator iterator (rx_ready_list);
-        NormRxStreamState *rxState;
-        while (NULL != (rxState = iterator.GetNextItem ())) {
-            switch (rxState->Decode ()) {
-                case 1: // msg completed
-                    // Complete message decoded, move this stream to msg_ready_list
-                    // to push the message up to the session below.  Note the stream
-                    // will be returned to the "rx_ready_list" after that's done
-                    rx_ready_list.Remove (*rxState);
-                    msg_ready_list.Append (*rxState);
-                    continue;
-
-                case -1: // decoding error (shouldn't happen w/ NORM, but ...)
-                    // We need to re-sync this stream (decoder buffer was reset)
-                    rxState->SetSync (false);
-                    break;
-
-                default: // 0 - need more data
-                    break;
-            }
-            // Get more data from this stream
-            NormObjectHandle stream = rxState->GetStreamHandle ();
-            // First, make sure we're in sync ...
-            while (!rxState->InSync ()) {
-                // seek NORM message start
-                if (!NormStreamSeekMsgStart (stream)) {
-                    // Need to wait for more data
-                    break;
-                }
-                // read message 'flag' byte to see if this it's a 'final' frame
-                char syncFlag;
-                unsigned int numBytes = 1;
-                if (!NormStreamRead (stream, &syncFlag, &numBytes)) {
-                    // broken stream (shouldn't happen after seek msg start?)
-                    zmq_assert (false);
-                    continue;
-                }
-                if (0 == numBytes) {
-                    // This probably shouldn't happen either since we found msg start
-                    // Need to wait for more data
-                    break;
-                }
-                if (0 == syncFlag)
-                    rxState->SetSync (true);
-                // else keep seeking ...
-            } // end while(!rxState->InSync())
-            if (!rxState->InSync ()) {
-                // Need more data for this stream, so remove from "rx ready"
-                // list and iterate to next "rx ready" stream
-                rxState->SetRxReady (false);
-                // Move from rx_ready_list to rx_pending_list
-                rx_ready_list.Remove (*rxState);
-                rx_pending_list.Append (*rxState);
-                continue;
-            }
-            // Now we're actually ready to read data from the NORM stream to the zmq_decoder
-            // the underlying zmq_decoder->get_buffer() call sets how much is needed.
-            unsigned int numBytes = rxState->GetBytesNeeded ();
-            if (!NormStreamRead (stream, rxState->AccessBuffer (), &numBytes)) {
-                // broken NORM stream, so re-sync
-                rxState->Init (); // TBD - check result
-                // This will retry syncing, and getting data from this stream
-                // since we don't increment the "it" iterator
-                continue;
-            }
-            rxState->IncrementBufferCount (numBytes);
-            if (0 == numBytes) {
-                // All the data available has been read
-                // Need to wait for NORM_RX_OBJECT_UPDATED for this stream
-                rxState->SetRxReady (false);
-                // Move from rx_ready_list to rx_pending_list
-                rx_ready_list.Remove (*rxState);
-                rx_pending_list.Append (*rxState);
-            }
-        } // end while(NULL != (rxState = iterator.GetNextItem()))
-
-        if (zmq_input_ready) {
-            // At this point, we've made a pass through the "rx_ready" stream list
-            // Now make a pass through the "msg_pending" list (if the zmq session
-            // ready for more input).  This may possibly return streams back to
-            // the "rx ready" stream list after their pending message is handled
-            NormRxStreamState::List::Iterator iterator (msg_ready_list);
-            NormRxStreamState *rxState;
-            while (NULL != (rxState = iterator.GetNextItem ())) {
-                msg_t *msg = rxState->AccessMsg ();
-                int rc = zmq_session->push_msg (msg);
-                if (-1 == rc) {
-                    if (EAGAIN == errno) {
-                        // need to wait until session calls "restart_input()"
-                        zmq_input_ready = false;
-                        break;
-                    } else {
-                        // session rejected message?
-                        // TBD - handle this better
-                        zmq_assert (false);
-                    }
-                }
-                // else message was accepted.
-                msg_ready_list.Remove (*rxState);
-                if (
-                  rxState
-                    ->IsRxReady ()) // Move back to "rx_ready" list to read more data
-                    rx_ready_list.Append (*rxState);
-                else // Move back to "rx_pending" list until NORM_RX_OBJECT_UPDATED
-                    msg_ready_list.Append (*rxState);
-            } // end while(NULL != (rxState = iterator.GetNextItem()))
-        }     // end if (zmq_input_ready)
-    } // end while ((!rx_ready_list.empty() || (zmq_input_ready && !msg_ready_list.empty()))
-
-    // Alert zmq of the messages we have pushed up
-    zmq_session->flush ();
-
-} // end zmq::norm_engine_t::recv_data()
-
-zmq::norm_engine_t::NormRxStreamState::NormRxStreamState (
-  NormObjectHandle normStream,
-  int64_t maxMsgSize,
-  bool zeroCopy,
-  int inBatchSize) :
-    norm_stream (normStream),
-    max_msg_size (maxMsgSize),
-    zero_copy (zeroCopy),
-    in_batch_size (inBatchSize),
-    in_sync (false),
-    rx_ready (false),
-    zmq_decoder (NULL),
-    skip_norm_sync (false),
-    buffer_ptr (NULL),
-    buffer_size (0),
-    buffer_count (0),
-    prev (NULL),
-    next (NULL),
-    list (NULL)
-{
-}
-
-zmq::norm_engine_t::NormRxStreamState::~NormRxStreamState ()
-{
-    if (NULL != zmq_decoder) {
-        delete zmq_decoder;
-        zmq_decoder = NULL;
-    }
-    if (NULL != list) {
-        list->Remove (*this);
-        list = NULL;
-    }
-}
-
-bool zmq::norm_engine_t::NormRxStreamState::Init ()
-{
-    in_sync = false;
-    skip_norm_sync = false;
-    if (NULL != zmq_decoder)
-        delete zmq_decoder;
-    zmq_decoder =
-      new (std::nothrow) v2_decoder_t (in_batch_size, max_msg_size, zero_copy);
-    alloc_assert (zmq_decoder);
-    if (NULL != zmq_decoder) {
-        buffer_count = 0;
-        buffer_size = 0;
-        zmq_decoder->get_buffer (&buffer_ptr, &buffer_size);
-        return true;
-    } else {
-        return false;
-    }
-} // end zmq::norm_engine_t::NormRxStreamState::Init()
-
-// This decodes any pending data sitting in our stream decoder buffer
-// It returns 1 upon message completion, -1 on error, 1 on msg completion
-int zmq::norm_engine_t::NormRxStreamState::Decode ()
-{
-    // If we have pending bytes to decode, process those first
-    while (buffer_count > 0) {
-        // There's pending data for the decoder to decode
-        size_t processed = 0;
-
-        // This a bit of a kludgy approach used to weed
-        // out the NORM ZMQ message transport "syncFlag" byte
-        // from the ZMQ message stream being decoded (but it works!)
-        if (skip_norm_sync) {
-            buffer_ptr++;
-            buffer_count--;
-            skip_norm_sync = false;
-        }
-
-        int rc = zmq_decoder->decode (buffer_ptr, buffer_count, processed);
-        buffer_ptr += processed;
-        buffer_count -= processed;
-        switch (rc) {
-            case 1:
-                // msg completed
-                if (0 == buffer_count) {
-                    buffer_size = 0;
-                    zmq_decoder->get_buffer (&buffer_ptr, &buffer_size);
-                }
-                skip_norm_sync = true;
-                return 1;
-            case -1:
-                // decoder error (reset decoder and state variables)
-                in_sync = false;
-                skip_norm_sync = false; // will get consumed by norm sync check
-                Init ();
-                break;
-
-            case 0:
-                // need more data, keep decoding until buffer exhausted
-                break;
-        }
-    }
-    // Reset buffer pointer/count for next read
-    buffer_count = 0;
-    buffer_size = 0;
-    zmq_decoder->get_buffer (&buffer_ptr, &buffer_size);
-    return 0; //  need more data
-
-} // end zmq::norm_engine_t::NormRxStreamState::Decode()
-
-zmq::norm_engine_t::NormRxStreamState::List::List () : head (NULL), tail (NULL)
-{
-}
-
-zmq::norm_engine_t::NormRxStreamState::List::~List ()
-{
-    Destroy ();
-}
-
-void zmq::norm_engine_t::NormRxStreamState::List::Destroy ()
-{
-    NormRxStreamState *item = head;
-    while (NULL != item) {
-        Remove (*item);
-        delete item;
-        item = head;
-    }
-} // end zmq::norm_engine_t::NormRxStreamState::List::Destroy()
-
-void zmq::norm_engine_t::NormRxStreamState::List::Append (
-  NormRxStreamState &item)
-{
-    item.prev = tail;
-    if (NULL != tail)
-        tail->next = &item;
-    else
-        head = &item;
-    item.next = NULL;
-    tail = &item;
-    item.list = this;
-} // end zmq::norm_engine_t::NormRxStreamState::List::Append()
-
-void zmq::norm_engine_t::NormRxStreamState::List::Remove (
-  NormRxStreamState &item)
-{
-    if (NULL != item.prev)
-        item.prev->next = item.next;
-    else
-        head = item.next;
-    if (NULL != item.next)
-        item.next->prev = item.prev;
-    else
-        tail = item.prev;
-    item.prev = item.next = NULL;
-    item.list = NULL;
-} // end zmq::norm_engine_t::NormRxStreamState::List::Remove()
-
-zmq::norm_engine_t::NormRxStreamState::List::Iterator::Iterator (
-  const List &list) :
-    next_item (list.head)
-{
-}
-
-zmq::norm_engine_t::NormRxStreamState *
-zmq::norm_engine_t::NormRxStreamState::List::Iterator::GetNextItem ()
-{
-    NormRxStreamState *nextItem = next_item;
-    if (NULL != nextItem)
-        next_item = nextItem->next;
-    return nextItem;
-} // end zmq::norm_engine_t::NormRxStreamState::List::Iterator::GetNextItem()
-
-const zmq::endpoint_uri_pair_t &zmq::norm_engine_t::get_endpoint () const
-{
-    return _empty_endpoint;
-}
-
-
-#ifdef ZMQ_USE_NORM_SOCKET_WRAPPER
-#include <iostream>
-DWORD WINAPI normWrapperThread (LPVOID lpParam)
-{
-    norm_wrapper_thread_args_t *norm_wrapper_thread_args =
-      (norm_wrapper_thread_args_t *) lpParam;
-    NormEvent message;
-    DWORD waitRc;
-    DWORD exitCode = 0;
-    int rc;
-
-    for (;;) {
-        // wait for norm event or message
-        waitRc = MsgWaitForMultipleObjectsEx (
-          1, &norm_wrapper_thread_args->norm_descriptor, INFINITE,
-          QS_ALLPOSTMESSAGE, 0);
-
-        // Check if norm event
-        if (waitRc == WAIT_OBJECT_0) {
-            // Process norm event
-            if (!NormGetNextEvent (
-                  norm_wrapper_thread_args->norm_instance_handle, &message)) {
-                exitCode = -1;
-                break;
-            }
-            rc =
-              send (norm_wrapper_thread_args->wrapper_write_fd,
-                    reinterpret_cast<char *> (&message), sizeof (message), 0);
-            errno_assert (rc != -1);
-            // Check if message
-        } else if (waitRc == WAIT_OBJECT_0 + 1) {
-            // Exit if WM_QUIT is received otherwise do nothing
-            MSG message;
-            GetMessage (&message, 0, 0, 0);
-            if (message.message == WM_QUIT) {
-                break;
-            } else {
-                // do nothing
-            }
-            // Otherwise an error occurred
-        } else {
-            exitCode = -1;
-            break;
-        }
-    }
-    // Free resources
-    rc = closesocket (norm_wrapper_thread_args->wrapper_write_fd);
-    free (norm_wrapper_thread_args);
-    errno_assert (rc != -1);
-
-    return exitCode;
-}
-
-#endif
-
-#endif // ZMQ_HAVE_NORM
diff --git a/libs/libzmq/src/norm_engine.hpp b/libs/libzmq/src/norm_engine.hpp
deleted file mode 100644
index 049d716..0000000
--- a/libs/libzmq/src/norm_engine.hpp
+++ /dev/null
@@ -1,206 +0,0 @@
-
-#ifndef __ZMQ_NORM_ENGINE_HPP_INCLUDED__
-#define __ZMQ_NORM_ENGINE_HPP_INCLUDED__
-
-#if defined ZMQ_HAVE_NORM
-
-#if defined(ZMQ_HAVE_WINDOWS) && defined(ZMQ_IOTHREAD_POLLER_USE_EPOLL)
-#define ZMQ_USE_NORM_SOCKET_WRAPPER
-#endif
-
-
-#include "io_object.hpp"
-#include "i_engine.hpp"
-#include "options.hpp"
-#include "v2_decoder.hpp"
-#include "v2_encoder.hpp"
-
-#include <normApi.h>
-
-namespace zmq
-{
-class io_thread_t;
-class msg_t;
-class session_base_t;
-
-class norm_engine_t ZMQ_FINAL : public io_object_t, public i_engine
-{
-  public:
-    norm_engine_t (zmq::io_thread_t *parent_, const options_t &options_);
-    ~norm_engine_t () ZMQ_FINAL;
-
-    // create NORM instance, session, etc
-    int init (const char *network_, bool send, bool recv);
-    void shutdown ();
-
-    bool has_handshake_stage () ZMQ_FINAL { return false; };
-
-    //  i_engine interface implementation.
-    //  Plug the engine to the session.
-    void plug (zmq::io_thread_t *io_thread_,
-               class session_base_t *session_) ZMQ_FINAL;
-
-    //  Terminate and deallocate the engine. Note that 'detached'
-    //  events are not fired on termination.
-    void terminate () ZMQ_FINAL;
-
-    //  This method is called by the session to signalise that more
-    //  messages can be written to the pipe.
-    bool restart_input () ZMQ_FINAL;
-
-    //  This method is called by the session to signalise that there
-    //  are messages to send available.
-    void restart_output () ZMQ_FINAL;
-
-    void zap_msg_available () ZMQ_FINAL {}
-
-    const endpoint_uri_pair_t &get_endpoint () const ZMQ_FINAL;
-
-    // i_poll_events interface implementation.
-    // (we only need in_event() for NormEvent notification)
-    // (i.e., don't have any output events or timers (yet))
-    void in_event ();
-
-  private:
-    void unplug ();
-    void send_data ();
-    void recv_data (NormObjectHandle stream);
-
-
-    enum
-    {
-        BUFFER_SIZE = 2048
-    };
-
-    // Used to keep track of streams from multiple senders
-    class NormRxStreamState
-    {
-      public:
-        NormRxStreamState (NormObjectHandle normStream,
-                           int64_t maxMsgSize,
-                           bool zeroCopy,
-                           int inBatchSize);
-        ~NormRxStreamState ();
-
-        NormObjectHandle GetStreamHandle () const { return norm_stream; }
-
-        bool Init ();
-
-        void SetRxReady (bool state) { rx_ready = state; }
-        bool IsRxReady () const { return rx_ready; }
-
-        void SetSync (bool state) { in_sync = state; }
-        bool InSync () const { return in_sync; }
-
-        // These are used to feed data to decoder
-        // and its underlying "msg" buffer
-        char *AccessBuffer () { return (char *) (buffer_ptr + buffer_count); }
-        size_t GetBytesNeeded () const { return buffer_size - buffer_count; }
-        void IncrementBufferCount (size_t count) { buffer_count += count; }
-        msg_t *AccessMsg () { return zmq_decoder->msg (); }
-        // This invokes the decoder "decode" method
-        // returning 0 if more data is needed,
-        // 1 if the message is complete, If an error
-        // occurs the 'sync' is dropped and the
-        // decoder re-initialized
-        int Decode ();
-
-        class List
-        {
-          public:
-            List ();
-            ~List ();
-
-            void Append (NormRxStreamState &item);
-            void Remove (NormRxStreamState &item);
-
-            bool IsEmpty () const { return NULL == head; }
-
-            void Destroy ();
-
-            class Iterator
-            {
-              public:
-                Iterator (const List &list);
-                NormRxStreamState *GetNextItem ();
-
-              private:
-                NormRxStreamState *next_item;
-            };
-            friend class Iterator;
-
-          private:
-            NormRxStreamState *head;
-            NormRxStreamState *tail;
-
-        }; // end class zmq::norm_engine_t::NormRxStreamState::List
-
-        friend class List;
-
-        List *AccessList () { return list; }
-
-
-      private:
-        NormObjectHandle norm_stream;
-        int64_t max_msg_size;
-        bool zero_copy;
-        int in_batch_size;
-        bool in_sync;
-        bool rx_ready;
-        v2_decoder_t *zmq_decoder;
-        bool skip_norm_sync;
-        unsigned char *buffer_ptr;
-        size_t buffer_size;
-        size_t buffer_count;
-
-        NormRxStreamState *prev;
-        NormRxStreamState *next;
-        NormRxStreamState::List *list;
-
-    }; // end class zmq::norm_engine_t::NormRxStreamState
-
-    const endpoint_uri_pair_t _empty_endpoint;
-
-    session_base_t *zmq_session;
-    options_t options;
-    NormInstanceHandle norm_instance;
-    handle_t norm_descriptor_handle;
-    NormSessionHandle norm_session;
-    bool is_sender;
-    bool is_receiver;
-    // Sender state
-    msg_t tx_msg;
-    v2_encoder_t zmq_encoder; // for tx messages (we use v2 for now)
-    NormObjectHandle norm_tx_stream;
-    bool tx_first_msg;
-    bool tx_more_bit;
-    bool zmq_output_ready; // zmq has msg(s) to send
-    bool norm_tx_ready;    // norm has tx queue vacancy
-    // TBD - maybe don't need buffer if can access zmq message buffer directly?
-    char tx_buffer[BUFFER_SIZE];
-    unsigned int tx_index;
-    unsigned int tx_len;
-
-    // Receiver state
-    // Lists of norm rx streams from remote senders
-    bool zmq_input_ready; // zmq ready to receive msg(s)
-    NormRxStreamState::List
-      rx_pending_list; // rx streams waiting for data reception
-    NormRxStreamState::List
-      rx_ready_list; // rx streams ready for NormStreamRead()
-    NormRxStreamState::List
-      msg_ready_list; // rx streams w/ msg ready for push to zmq
-
-#ifdef ZMQ_USE_NORM_SOCKET_WRAPPER
-    fd_t
-      wrapper_read_fd; // filedescriptor used to read norm events through the wrapper
-    DWORD wrapper_thread_id;
-    HANDLE wrapper_thread_handle;
-#endif
-
-}; // end class norm_engine_t
-}
-
-#endif // ZMQ_HAVE_NORM
-
-#endif // !__ZMQ_NORM_ENGINE_HPP_INCLUDED__
diff --git a/libs/libzmq/src/null_mechanism.cpp b/libs/libzmq/src/null_mechanism.cpp
deleted file mode 100644
index 4c1fd2a..0000000
--- a/libs/libzmq/src/null_mechanism.cpp
+++ /dev/null
@@ -1,230 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-
-#include <stddef.h>
-#include <string.h>
-#include <stdlib.h>
-
-#include "err.hpp"
-#include "msg.hpp"
-#include "session_base.hpp"
-#include "null_mechanism.hpp"
-
-const char error_command_name[] = "\5ERROR";
-const size_t error_command_name_len = sizeof (error_command_name) - 1;
-const size_t error_reason_len_size = 1;
-
-const char ready_command_name[] = "\5READY";
-const size_t ready_command_name_len = sizeof (ready_command_name) - 1;
-
-zmq::null_mechanism_t::null_mechanism_t (session_base_t *session_,
-                                         const std::string &peer_address_,
-                                         const options_t &options_) :
-    mechanism_base_t (session_, options_),
-    zap_client_t (session_, peer_address_, options_),
-    _ready_command_sent (false),
-    _error_command_sent (false),
-    _ready_command_received (false),
-    _error_command_received (false),
-    _zap_request_sent (false),
-    _zap_reply_received (false)
-{
-}
-
-zmq::null_mechanism_t::~null_mechanism_t ()
-{
-}
-
-int zmq::null_mechanism_t::next_handshake_command (msg_t *msg_)
-{
-    if (_ready_command_sent || _error_command_sent) {
-        errno = EAGAIN;
-        return -1;
-    }
-
-    if (zap_required () && !_zap_reply_received) {
-        if (_zap_request_sent) {
-            errno = EAGAIN;
-            return -1;
-        }
-        //  Given this is a backward-incompatible change, it's behind a socket
-        //  option disabled by default.
-        int rc = session->zap_connect ();
-        if (rc == -1 && options.zap_enforce_domain) {
-            session->get_socket ()->event_handshake_failed_no_detail (
-              session->get_endpoint (), EFAULT);
-            return -1;
-        }
-        if (rc == 0) {
-            send_zap_request ();
-            _zap_request_sent = true;
-
-            //  TODO actually, it is quite unlikely that we can read the ZAP
-            //  reply already, but removing this has some strange side-effect
-            //  (probably because the pipe's in_active flag is true until a read
-            //  is attempted)
-            rc = receive_and_process_zap_reply ();
-            if (rc != 0)
-                return -1;
-
-            _zap_reply_received = true;
-        }
-    }
-
-    if (_zap_reply_received && status_code != "200") {
-        _error_command_sent = true;
-        if (status_code != "300") {
-            const size_t status_code_len = 3;
-            const int rc = msg_->init_size (
-              error_command_name_len + error_reason_len_size + status_code_len);
-            zmq_assert (rc == 0);
-            unsigned char *msg_data =
-              static_cast<unsigned char *> (msg_->data ());
-            memcpy (msg_data, error_command_name, error_command_name_len);
-            msg_data += error_command_name_len;
-            *msg_data = status_code_len;
-            msg_data += error_reason_len_size;
-            memcpy (msg_data, status_code.c_str (), status_code_len);
-            return 0;
-        }
-        errno = EAGAIN;
-        return -1;
-    }
-
-    make_command_with_basic_properties (msg_, ready_command_name,
-                                        ready_command_name_len);
-
-    _ready_command_sent = true;
-
-    return 0;
-}
-
-int zmq::null_mechanism_t::process_handshake_command (msg_t *msg_)
-{
-    if (_ready_command_received || _error_command_received) {
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (), ZMQ_PROTOCOL_ERROR_ZMTP_UNEXPECTED_COMMAND);
-        errno = EPROTO;
-        return -1;
-    }
-
-    const unsigned char *cmd_data =
-      static_cast<unsigned char *> (msg_->data ());
-    const size_t data_size = msg_->size ();
-
-    int rc = 0;
-    if (data_size >= ready_command_name_len
-        && !memcmp (cmd_data, ready_command_name, ready_command_name_len))
-        rc = process_ready_command (cmd_data, data_size);
-    else if (data_size >= error_command_name_len
-             && !memcmp (cmd_data, error_command_name, error_command_name_len))
-        rc = process_error_command (cmd_data, data_size);
-    else {
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (), ZMQ_PROTOCOL_ERROR_ZMTP_UNEXPECTED_COMMAND);
-        errno = EPROTO;
-        rc = -1;
-    }
-
-    if (rc == 0) {
-        rc = msg_->close ();
-        errno_assert (rc == 0);
-        rc = msg_->init ();
-        errno_assert (rc == 0);
-    }
-    return rc;
-}
-
-int zmq::null_mechanism_t::process_ready_command (
-  const unsigned char *cmd_data_, size_t data_size_)
-{
-    _ready_command_received = true;
-    return parse_metadata (cmd_data_ + ready_command_name_len,
-                           data_size_ - ready_command_name_len);
-}
-
-int zmq::null_mechanism_t::process_error_command (
-  const unsigned char *cmd_data_, size_t data_size_)
-{
-    const size_t fixed_prefix_size =
-      error_command_name_len + error_reason_len_size;
-    if (data_size_ < fixed_prefix_size) {
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (),
-          ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_ERROR);
-
-        errno = EPROTO;
-        return -1;
-    }
-    const size_t error_reason_len =
-      static_cast<size_t> (cmd_data_[error_command_name_len]);
-    if (error_reason_len > data_size_ - fixed_prefix_size) {
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (),
-          ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_ERROR);
-
-        errno = EPROTO;
-        return -1;
-    }
-    const char *error_reason =
-      reinterpret_cast<const char *> (cmd_data_) + fixed_prefix_size;
-    handle_error_reason (error_reason, error_reason_len);
-    _error_command_received = true;
-    return 0;
-}
-
-int zmq::null_mechanism_t::zap_msg_available ()
-{
-    if (_zap_reply_received) {
-        errno = EFSM;
-        return -1;
-    }
-    const int rc = receive_and_process_zap_reply ();
-    if (rc == 0)
-        _zap_reply_received = true;
-    return rc == -1 ? -1 : 0;
-}
-
-zmq::mechanism_t::status_t zmq::null_mechanism_t::status () const
-{
-    if (_ready_command_sent && _ready_command_received)
-        return ready;
-
-    const bool command_sent = _ready_command_sent || _error_command_sent;
-    const bool command_received =
-      _ready_command_received || _error_command_received;
-    return command_sent && command_received ? error : handshaking;
-}
-
-void zmq::null_mechanism_t::send_zap_request ()
-{
-    zap_client_t::send_zap_request ("NULL", 4, NULL, NULL, 0);
-}
diff --git a/libs/libzmq/src/null_mechanism.hpp b/libs/libzmq/src/null_mechanism.hpp
deleted file mode 100644
index 3ea3164..0000000
--- a/libs/libzmq/src/null_mechanism.hpp
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_NULL_MECHANISM_HPP_INCLUDED__
-#define __ZMQ_NULL_MECHANISM_HPP_INCLUDED__
-
-#include "mechanism.hpp"
-#include "options.hpp"
-#include "zap_client.hpp"
-
-namespace zmq
-{
-class msg_t;
-class session_base_t;
-
-class null_mechanism_t ZMQ_FINAL : public zap_client_t
-{
-  public:
-    null_mechanism_t (session_base_t *session_,
-                      const std::string &peer_address_,
-                      const options_t &options_);
-    ~null_mechanism_t ();
-
-    // mechanism implementation
-    int next_handshake_command (msg_t *msg_);
-    int process_handshake_command (msg_t *msg_);
-    int zap_msg_available ();
-    status_t status () const;
-
-  private:
-    bool _ready_command_sent;
-    bool _error_command_sent;
-    bool _ready_command_received;
-    bool _error_command_received;
-    bool _zap_request_sent;
-    bool _zap_reply_received;
-
-    int process_ready_command (const unsigned char *cmd_data_,
-                               size_t data_size_);
-    int process_error_command (const unsigned char *cmd_data_,
-                               size_t data_size_);
-
-    void send_zap_request ();
-};
-}
-
-#endif
diff --git a/libs/libzmq/src/object.cpp b/libs/libzmq/src/object.cpp
deleted file mode 100644
index 5946959..0000000
--- a/libs/libzmq/src/object.cpp
+++ /dev/null
@@ -1,550 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include <string.h>
-#include <stdarg.h>
-
-#include "object.hpp"
-#include "ctx.hpp"
-#include "err.hpp"
-#include "pipe.hpp"
-#include "io_thread.hpp"
-#include "session_base.hpp"
-#include "socket_base.hpp"
-
-zmq::object_t::object_t (ctx_t *ctx_, uint32_t tid_) : _ctx (ctx_), _tid (tid_)
-{
-}
-
-zmq::object_t::object_t (object_t *parent_) :
-    _ctx (parent_->_ctx), _tid (parent_->_tid)
-{
-}
-
-zmq::object_t::~object_t ()
-{
-}
-
-uint32_t zmq::object_t::get_tid () const
-{
-    return _tid;
-}
-
-void zmq::object_t::set_tid (uint32_t id_)
-{
-    _tid = id_;
-}
-
-zmq::ctx_t *zmq::object_t::get_ctx () const
-{
-    return _ctx;
-}
-
-void zmq::object_t::process_command (const command_t &cmd_)
-{
-    switch (cmd_.type) {
-        case command_t::activate_read:
-            process_activate_read ();
-            break;
-
-        case command_t::activate_write:
-            process_activate_write (cmd_.args.activate_write.msgs_read);
-            break;
-
-        case command_t::stop:
-            process_stop ();
-            break;
-
-        case command_t::plug:
-            process_plug ();
-            process_seqnum ();
-            break;
-
-        case command_t::own:
-            process_own (cmd_.args.own.object);
-            process_seqnum ();
-            break;
-
-        case command_t::attach:
-            process_attach (cmd_.args.attach.engine);
-            process_seqnum ();
-            break;
-
-        case command_t::bind:
-            process_bind (cmd_.args.bind.pipe);
-            process_seqnum ();
-            break;
-
-        case command_t::hiccup:
-            process_hiccup (cmd_.args.hiccup.pipe);
-            break;
-
-        case command_t::pipe_peer_stats:
-            process_pipe_peer_stats (cmd_.args.pipe_peer_stats.queue_count,
-                                     cmd_.args.pipe_peer_stats.socket_base,
-                                     cmd_.args.pipe_peer_stats.endpoint_pair);
-            break;
-
-        case command_t::pipe_stats_publish:
-            process_pipe_stats_publish (
-              cmd_.args.pipe_stats_publish.outbound_queue_count,
-              cmd_.args.pipe_stats_publish.inbound_queue_count,
-              cmd_.args.pipe_stats_publish.endpoint_pair);
-            break;
-
-        case command_t::pipe_term:
-            process_pipe_term ();
-            break;
-
-        case command_t::pipe_term_ack:
-            process_pipe_term_ack ();
-            break;
-
-        case command_t::pipe_hwm:
-            process_pipe_hwm (cmd_.args.pipe_hwm.inhwm,
-                              cmd_.args.pipe_hwm.outhwm);
-            break;
-
-        case command_t::term_req:
-            process_term_req (cmd_.args.term_req.object);
-            break;
-
-        case command_t::term:
-            process_term (cmd_.args.term.linger);
-            break;
-
-        case command_t::term_ack:
-            process_term_ack ();
-            break;
-
-        case command_t::term_endpoint:
-            process_term_endpoint (cmd_.args.term_endpoint.endpoint);
-            break;
-
-        case command_t::reap:
-            process_reap (cmd_.args.reap.socket);
-            break;
-
-        case command_t::reaped:
-            process_reaped ();
-            break;
-
-        case command_t::inproc_connected:
-            process_seqnum ();
-            break;
-
-        case command_t::conn_failed:
-            process_conn_failed ();
-            break;
-
-        case command_t::done:
-        default:
-            zmq_assert (false);
-    }
-}
-
-int zmq::object_t::register_endpoint (const char *addr_,
-                                      const endpoint_t &endpoint_)
-{
-    return _ctx->register_endpoint (addr_, endpoint_);
-}
-
-int zmq::object_t::unregister_endpoint (const std::string &addr_,
-                                        socket_base_t *socket_)
-{
-    return _ctx->unregister_endpoint (addr_, socket_);
-}
-
-void zmq::object_t::unregister_endpoints (socket_base_t *socket_)
-{
-    return _ctx->unregister_endpoints (socket_);
-}
-
-zmq::endpoint_t zmq::object_t::find_endpoint (const char *addr_) const
-{
-    return _ctx->find_endpoint (addr_);
-}
-
-void zmq::object_t::pend_connection (const std::string &addr_,
-                                     const endpoint_t &endpoint_,
-                                     pipe_t **pipes_)
-{
-    _ctx->pend_connection (addr_, endpoint_, pipes_);
-}
-
-void zmq::object_t::connect_pending (const char *addr_,
-                                     zmq::socket_base_t *bind_socket_)
-{
-    return _ctx->connect_pending (addr_, bind_socket_);
-}
-
-void zmq::object_t::destroy_socket (socket_base_t *socket_)
-{
-    _ctx->destroy_socket (socket_);
-}
-
-zmq::io_thread_t *zmq::object_t::choose_io_thread (uint64_t affinity_) const
-{
-    return _ctx->choose_io_thread (affinity_);
-}
-
-void zmq::object_t::send_stop ()
-{
-    //  'stop' command goes always from administrative thread to
-    //  the current object.
-    command_t cmd;
-    cmd.destination = this;
-    cmd.type = command_t::stop;
-    _ctx->send_command (_tid, cmd);
-}
-
-void zmq::object_t::send_plug (own_t *destination_, bool inc_seqnum_)
-{
-    if (inc_seqnum_)
-        destination_->inc_seqnum ();
-
-    command_t cmd;
-    cmd.destination = destination_;
-    cmd.type = command_t::plug;
-    send_command (cmd);
-}
-
-void zmq::object_t::send_own (own_t *destination_, own_t *object_)
-{
-    destination_->inc_seqnum ();
-    command_t cmd;
-    cmd.destination = destination_;
-    cmd.type = command_t::own;
-    cmd.args.own.object = object_;
-    send_command (cmd);
-}
-
-void zmq::object_t::send_attach (session_base_t *destination_,
-                                 i_engine *engine_,
-                                 bool inc_seqnum_)
-{
-    if (inc_seqnum_)
-        destination_->inc_seqnum ();
-
-    command_t cmd;
-    cmd.destination = destination_;
-    cmd.type = command_t::attach;
-    cmd.args.attach.engine = engine_;
-    send_command (cmd);
-}
-
-void zmq::object_t::send_conn_failed (session_base_t *destination_)
-{
-    command_t cmd;
-    cmd.destination = destination_;
-    cmd.type = command_t::conn_failed;
-    send_command (cmd);
-}
-
-void zmq::object_t::send_bind (own_t *destination_,
-                               pipe_t *pipe_,
-                               bool inc_seqnum_)
-{
-    if (inc_seqnum_)
-        destination_->inc_seqnum ();
-
-    command_t cmd;
-    cmd.destination = destination_;
-    cmd.type = command_t::bind;
-    cmd.args.bind.pipe = pipe_;
-    send_command (cmd);
-}
-
-void zmq::object_t::send_activate_read (pipe_t *destination_)
-{
-    command_t cmd;
-    cmd.destination = destination_;
-    cmd.type = command_t::activate_read;
-    send_command (cmd);
-}
-
-void zmq::object_t::send_activate_write (pipe_t *destination_,
-                                         uint64_t msgs_read_)
-{
-    command_t cmd;
-    cmd.destination = destination_;
-    cmd.type = command_t::activate_write;
-    cmd.args.activate_write.msgs_read = msgs_read_;
-    send_command (cmd);
-}
-
-void zmq::object_t::send_hiccup (pipe_t *destination_, void *pipe_)
-{
-    command_t cmd;
-    cmd.destination = destination_;
-    cmd.type = command_t::hiccup;
-    cmd.args.hiccup.pipe = pipe_;
-    send_command (cmd);
-}
-
-void zmq::object_t::send_pipe_peer_stats (pipe_t *destination_,
-                                          uint64_t queue_count_,
-                                          own_t *socket_base_,
-                                          endpoint_uri_pair_t *endpoint_pair_)
-{
-    command_t cmd;
-    cmd.destination = destination_;
-    cmd.type = command_t::pipe_peer_stats;
-    cmd.args.pipe_peer_stats.queue_count = queue_count_;
-    cmd.args.pipe_peer_stats.socket_base = socket_base_;
-    cmd.args.pipe_peer_stats.endpoint_pair = endpoint_pair_;
-    send_command (cmd);
-}
-
-void zmq::object_t::send_pipe_stats_publish (
-  own_t *destination_,
-  uint64_t outbound_queue_count_,
-  uint64_t inbound_queue_count_,
-  endpoint_uri_pair_t *endpoint_pair_)
-{
-    command_t cmd;
-    cmd.destination = destination_;
-    cmd.type = command_t::pipe_stats_publish;
-    cmd.args.pipe_stats_publish.outbound_queue_count = outbound_queue_count_;
-    cmd.args.pipe_stats_publish.inbound_queue_count = inbound_queue_count_;
-    cmd.args.pipe_stats_publish.endpoint_pair = endpoint_pair_;
-    send_command (cmd);
-}
-
-void zmq::object_t::send_pipe_term (pipe_t *destination_)
-{
-    command_t cmd;
-    cmd.destination = destination_;
-    cmd.type = command_t::pipe_term;
-    send_command (cmd);
-}
-
-void zmq::object_t::send_pipe_term_ack (pipe_t *destination_)
-{
-    command_t cmd;
-    cmd.destination = destination_;
-    cmd.type = command_t::pipe_term_ack;
-    send_command (cmd);
-}
-
-void zmq::object_t::send_pipe_hwm (pipe_t *destination_,
-                                   int inhwm_,
-                                   int outhwm_)
-{
-    command_t cmd;
-    cmd.destination = destination_;
-    cmd.type = command_t::pipe_hwm;
-    cmd.args.pipe_hwm.inhwm = inhwm_;
-    cmd.args.pipe_hwm.outhwm = outhwm_;
-    send_command (cmd);
-}
-
-void zmq::object_t::send_term_req (own_t *destination_, own_t *object_)
-{
-    command_t cmd;
-    cmd.destination = destination_;
-    cmd.type = command_t::term_req;
-    cmd.args.term_req.object = object_;
-    send_command (cmd);
-}
-
-void zmq::object_t::send_term (own_t *destination_, int linger_)
-{
-    command_t cmd;
-    cmd.destination = destination_;
-    cmd.type = command_t::term;
-    cmd.args.term.linger = linger_;
-    send_command (cmd);
-}
-
-void zmq::object_t::send_term_ack (own_t *destination_)
-{
-    command_t cmd;
-    cmd.destination = destination_;
-    cmd.type = command_t::term_ack;
-    send_command (cmd);
-}
-
-void zmq::object_t::send_term_endpoint (own_t *destination_,
-                                        std::string *endpoint_)
-{
-    command_t cmd;
-    cmd.destination = destination_;
-    cmd.type = command_t::term_endpoint;
-    cmd.args.term_endpoint.endpoint = endpoint_;
-    send_command (cmd);
-}
-
-void zmq::object_t::send_reap (class socket_base_t *socket_)
-{
-    command_t cmd;
-    cmd.destination = _ctx->get_reaper ();
-    cmd.type = command_t::reap;
-    cmd.args.reap.socket = socket_;
-    send_command (cmd);
-}
-
-void zmq::object_t::send_reaped ()
-{
-    command_t cmd;
-    cmd.destination = _ctx->get_reaper ();
-    cmd.type = command_t::reaped;
-    send_command (cmd);
-}
-
-void zmq::object_t::send_inproc_connected (zmq::socket_base_t *socket_)
-{
-    command_t cmd;
-    cmd.destination = socket_;
-    cmd.type = command_t::inproc_connected;
-    send_command (cmd);
-}
-
-void zmq::object_t::send_done ()
-{
-    command_t cmd;
-    cmd.destination = NULL;
-    cmd.type = command_t::done;
-    _ctx->send_command (ctx_t::term_tid, cmd);
-}
-
-void zmq::object_t::process_stop ()
-{
-    zmq_assert (false);
-}
-
-void zmq::object_t::process_plug ()
-{
-    zmq_assert (false);
-}
-
-void zmq::object_t::process_own (own_t *)
-{
-    zmq_assert (false);
-}
-
-void zmq::object_t::process_attach (i_engine *)
-{
-    zmq_assert (false);
-}
-
-void zmq::object_t::process_bind (pipe_t *)
-{
-    zmq_assert (false);
-}
-
-void zmq::object_t::process_activate_read ()
-{
-    zmq_assert (false);
-}
-
-void zmq::object_t::process_activate_write (uint64_t)
-{
-    zmq_assert (false);
-}
-
-void zmq::object_t::process_hiccup (void *)
-{
-    zmq_assert (false);
-}
-
-void zmq::object_t::process_pipe_peer_stats (uint64_t,
-                                             own_t *,
-                                             endpoint_uri_pair_t *)
-{
-    zmq_assert (false);
-}
-
-void zmq::object_t::process_pipe_stats_publish (uint64_t,
-                                                uint64_t,
-                                                endpoint_uri_pair_t *)
-{
-    zmq_assert (false);
-}
-
-void zmq::object_t::process_pipe_term ()
-{
-    zmq_assert (false);
-}
-
-void zmq::object_t::process_pipe_term_ack ()
-{
-    zmq_assert (false);
-}
-
-void zmq::object_t::process_pipe_hwm (int, int)
-{
-    zmq_assert (false);
-}
-
-void zmq::object_t::process_term_req (own_t *)
-{
-    zmq_assert (false);
-}
-
-void zmq::object_t::process_term (int)
-{
-    zmq_assert (false);
-}
-
-void zmq::object_t::process_term_ack ()
-{
-    zmq_assert (false);
-}
-
-void zmq::object_t::process_term_endpoint (std::string *)
-{
-    zmq_assert (false);
-}
-
-void zmq::object_t::process_reap (class socket_base_t *)
-{
-    zmq_assert (false);
-}
-
-void zmq::object_t::process_reaped ()
-{
-    zmq_assert (false);
-}
-
-void zmq::object_t::process_seqnum ()
-{
-    zmq_assert (false);
-}
-
-void zmq::object_t::process_conn_failed ()
-{
-    zmq_assert (false);
-}
-
-void zmq::object_t::send_command (const command_t &cmd_)
-{
-    _ctx->send_command (cmd_.destination->get_tid (), cmd_);
-}
diff --git a/libs/libzmq/src/object.hpp b/libs/libzmq/src/object.hpp
deleted file mode 100644
index b672b0d..0000000
--- a/libs/libzmq/src/object.hpp
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_OBJECT_HPP_INCLUDED__
-#define __ZMQ_OBJECT_HPP_INCLUDED__
-
-#include <string>
-
-#include "endpoint.hpp"
-#include "macros.hpp"
-#include "stdint.hpp"
-
-namespace zmq
-{
-struct i_engine;
-struct endpoint_t;
-struct pending_connection_t;
-struct command_t;
-class ctx_t;
-class pipe_t;
-class socket_base_t;
-class session_base_t;
-class io_thread_t;
-class own_t;
-
-//  Base class for all objects that participate in inter-thread
-//  communication.
-
-class object_t
-{
-  public:
-    object_t (zmq::ctx_t *ctx_, uint32_t tid_);
-    object_t (object_t *parent_);
-    virtual ~object_t ();
-
-    uint32_t get_tid () const;
-    void set_tid (uint32_t id_);
-    ctx_t *get_ctx () const;
-    void process_command (const zmq::command_t &cmd_);
-    void send_inproc_connected (zmq::socket_base_t *socket_);
-    void send_bind (zmq::own_t *destination_,
-                    zmq::pipe_t *pipe_,
-                    bool inc_seqnum_ = true);
-
-  protected:
-    //  Using following function, socket is able to access global
-    //  repository of inproc endpoints.
-    int register_endpoint (const char *addr_, const zmq::endpoint_t &endpoint_);
-    int unregister_endpoint (const std::string &addr_, socket_base_t *socket_);
-    void unregister_endpoints (zmq::socket_base_t *socket_);
-    zmq::endpoint_t find_endpoint (const char *addr_) const;
-    void pend_connection (const std::string &addr_,
-                          const endpoint_t &endpoint_,
-                          pipe_t **pipes_);
-    void connect_pending (const char *addr_, zmq::socket_base_t *bind_socket_);
-
-    void destroy_socket (zmq::socket_base_t *socket_);
-
-    //  Logs an message.
-    void log (const char *format_, ...);
-
-    //  Chooses least loaded I/O thread.
-    zmq::io_thread_t *choose_io_thread (uint64_t affinity_) const;
-
-    //  Derived object can use these functions to send commands
-    //  to other objects.
-    void send_stop ();
-    void send_plug (zmq::own_t *destination_, bool inc_seqnum_ = true);
-    void send_own (zmq::own_t *destination_, zmq::own_t *object_);
-    void send_attach (zmq::session_base_t *destination_,
-                      zmq::i_engine *engine_,
-                      bool inc_seqnum_ = true);
-    void send_activate_read (zmq::pipe_t *destination_);
-    void send_activate_write (zmq::pipe_t *destination_, uint64_t msgs_read_);
-    void send_hiccup (zmq::pipe_t *destination_, void *pipe_);
-    void send_pipe_peer_stats (zmq::pipe_t *destination_,
-                               uint64_t queue_count_,
-                               zmq::own_t *socket_base,
-                               endpoint_uri_pair_t *endpoint_pair_);
-    void send_pipe_stats_publish (zmq::own_t *destination_,
-                                  uint64_t outbound_queue_count_,
-                                  uint64_t inbound_queue_count_,
-                                  endpoint_uri_pair_t *endpoint_pair_);
-    void send_pipe_term (zmq::pipe_t *destination_);
-    void send_pipe_term_ack (zmq::pipe_t *destination_);
-    void send_pipe_hwm (zmq::pipe_t *destination_, int inhwm_, int outhwm_);
-    void send_term_req (zmq::own_t *destination_, zmq::own_t *object_);
-    void send_term (zmq::own_t *destination_, int linger_);
-    void send_term_ack (zmq::own_t *destination_);
-    void send_term_endpoint (own_t *destination_, std::string *endpoint_);
-    void send_reap (zmq::socket_base_t *socket_);
-    void send_reaped ();
-    void send_done ();
-    void send_conn_failed (zmq::session_base_t *destination_);
-
-
-    //  These handlers can be overridden by the derived objects. They are
-    //  called when command arrives from another thread.
-    virtual void process_stop ();
-    virtual void process_plug ();
-    virtual void process_own (zmq::own_t *object_);
-    virtual void process_attach (zmq::i_engine *engine_);
-    virtual void process_bind (zmq::pipe_t *pipe_);
-    virtual void process_activate_read ();
-    virtual void process_activate_write (uint64_t msgs_read_);
-    virtual void process_hiccup (void *pipe_);
-    virtual void process_pipe_peer_stats (uint64_t queue_count_,
-                                          zmq::own_t *socket_base_,
-                                          endpoint_uri_pair_t *endpoint_pair_);
-    virtual void
-    process_pipe_stats_publish (uint64_t outbound_queue_count_,
-                                uint64_t inbound_queue_count_,
-                                endpoint_uri_pair_t *endpoint_pair_);
-    virtual void process_pipe_term ();
-    virtual void process_pipe_term_ack ();
-    virtual void process_pipe_hwm (int inhwm_, int outhwm_);
-    virtual void process_term_req (zmq::own_t *object_);
-    virtual void process_term (int linger_);
-    virtual void process_term_ack ();
-    virtual void process_term_endpoint (std::string *endpoint_);
-    virtual void process_reap (zmq::socket_base_t *socket_);
-    virtual void process_reaped ();
-    virtual void process_conn_failed ();
-
-
-    //  Special handler called after a command that requires a seqnum
-    //  was processed. The implementation should catch up with its counter
-    //  of processed commands here.
-    virtual void process_seqnum ();
-
-  private:
-    //  Context provides access to the global state.
-    zmq::ctx_t *const _ctx;
-
-    //  Thread ID of the thread the object belongs to.
-    uint32_t _tid;
-
-    void send_command (const command_t &cmd_);
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (object_t)
-};
-}
-
-#endif
diff --git a/libs/libzmq/src/options.cpp b/libs/libzmq/src/options.cpp
deleted file mode 100644
index f0d5e7c..0000000
--- a/libs/libzmq/src/options.cpp
+++ /dev/null
@@ -1,1330 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include <string.h>
-#include <limits.h>
-#include <set>
-
-#include "options.hpp"
-#include "err.hpp"
-#include "macros.hpp"
-
-#ifndef ZMQ_HAVE_WINDOWS
-#include <net/if.h>
-#endif
-
-#if defined IFNAMSIZ
-#define BINDDEVSIZ IFNAMSIZ
-#else
-#define BINDDEVSIZ 16
-#endif
-
-static int sockopt_invalid ()
-{
-#if defined(ZMQ_ACT_MILITANT)
-    zmq_assert (false);
-#endif
-    errno = EINVAL;
-    return -1;
-}
-
-int zmq::do_getsockopt (void *const optval_,
-                        size_t *const optvallen_,
-                        const std::string &value_)
-{
-    return do_getsockopt (optval_, optvallen_, value_.c_str (),
-                          value_.size () + 1);
-}
-
-int zmq::do_getsockopt (void *const optval_,
-                        size_t *const optvallen_,
-                        const void *value_,
-                        const size_t value_len_)
-{
-    // TODO behaviour is inconsistent with options_t::getsockopt; there, an
-    // *exact* length match is required except for string-like (but not the
-    // CURVE keys!) (and therefore null-ing remaining memory is a no-op, see
-    // comment below)
-    if (*optvallen_ < value_len_) {
-        return sockopt_invalid ();
-    }
-    memcpy (optval_, value_, value_len_);
-    // TODO why is the remaining memory null-ed?
-    memset (static_cast<char *> (optval_) + value_len_, 0,
-            *optvallen_ - value_len_);
-    *optvallen_ = value_len_;
-    return 0;
-}
-
-#ifdef ZMQ_HAVE_CURVE
-static int do_getsockopt_curve_key (void *const optval_,
-                                    const size_t *const optvallen_,
-                                    const uint8_t (&curve_key_)[CURVE_KEYSIZE])
-{
-    if (*optvallen_ == CURVE_KEYSIZE) {
-        memcpy (optval_, curve_key_, CURVE_KEYSIZE);
-        return 0;
-    }
-    if (*optvallen_ == CURVE_KEYSIZE_Z85 + 1) {
-        zmq_z85_encode (static_cast<char *> (optval_), curve_key_,
-                        CURVE_KEYSIZE);
-        return 0;
-    }
-    return sockopt_invalid ();
-}
-#endif
-
-template <typename T>
-static int do_setsockopt (const void *const optval_,
-                          const size_t optvallen_,
-                          T *const out_value_)
-{
-    if (optvallen_ == sizeof (T)) {
-        memcpy (out_value_, optval_, sizeof (T));
-        return 0;
-    }
-    return sockopt_invalid ();
-}
-
-int zmq::do_setsockopt_int_as_bool_strict (const void *const optval_,
-                                           const size_t optvallen_,
-                                           bool *const out_value_)
-{
-    // TODO handling of values other than 0 or 1 is not consistent,
-    // here it is disallowed, but for other options such as
-    // ZMQ_ROUTER_RAW any positive value is accepted
-    int value = -1;
-    if (do_setsockopt (optval_, optvallen_, &value) == -1)
-        return -1;
-    if (value == 0 || value == 1) {
-        *out_value_ = (value != 0);
-        return 0;
-    }
-    return sockopt_invalid ();
-}
-
-int zmq::do_setsockopt_int_as_bool_relaxed (const void *const optval_,
-                                            const size_t optvallen_,
-                                            bool *const out_value_)
-{
-    int value = -1;
-    if (do_setsockopt (optval_, optvallen_, &value) == -1)
-        return -1;
-    *out_value_ = (value != 0);
-    return 0;
-}
-
-static int
-do_setsockopt_string_allow_empty_strict (const void *const optval_,
-                                         const size_t optvallen_,
-                                         std::string *const out_value_,
-                                         const size_t max_len_)
-{
-    // TODO why is optval_ != NULL not allowed in case of optvallen_== 0?
-    // TODO why are empty strings allowed for some socket options, but not for others?
-    if (optval_ == NULL && optvallen_ == 0) {
-        out_value_->clear ();
-        return 0;
-    }
-    if (optval_ != NULL && optvallen_ > 0 && optvallen_ <= max_len_) {
-        out_value_->assign (static_cast<const char *> (optval_), optvallen_);
-        return 0;
-    }
-    return sockopt_invalid ();
-}
-
-static int
-do_setsockopt_string_allow_empty_relaxed (const void *const optval_,
-                                          const size_t optvallen_,
-                                          std::string *const out_value_,
-                                          const size_t max_len_)
-{
-    // TODO use either do_setsockopt_string_allow_empty_relaxed or
-    // do_setsockopt_string_allow_empty_strict everywhere
-    if (optvallen_ > 0 && optvallen_ <= max_len_) {
-        out_value_->assign (static_cast<const char *> (optval_), optvallen_);
-        return 0;
-    }
-    return sockopt_invalid ();
-}
-
-template <typename T>
-static int do_setsockopt_set (const void *const optval_,
-                              const size_t optvallen_,
-                              std::set<T> *const set_)
-{
-    if (optvallen_ == 0 && optval_ == NULL) {
-        set_->clear ();
-        return 0;
-    }
-    if (optvallen_ == sizeof (T) && optval_ != NULL) {
-        set_->insert (*(static_cast<const T *> (optval_)));
-        return 0;
-    }
-    return sockopt_invalid ();
-}
-
-// TODO why is 1000 a sensible default?
-const int default_hwm = 1000;
-
-zmq::options_t::options_t () :
-    sndhwm (default_hwm),
-    rcvhwm (default_hwm),
-    affinity (0),
-    routing_id_size (0),
-    rate (100),
-    recovery_ivl (10000),
-    multicast_hops (1),
-    multicast_maxtpdu (1500),
-    sndbuf (-1),
-    rcvbuf (-1),
-    tos (0),
-    priority (0),
-    type (-1),
-    linger (-1),
-    connect_timeout (0),
-    tcp_maxrt (0),
-    reconnect_stop (0),
-    reconnect_ivl (100),
-    reconnect_ivl_max (0),
-    backlog (100),
-    maxmsgsize (-1),
-    rcvtimeo (-1),
-    sndtimeo (-1),
-    ipv6 (false),
-    immediate (0),
-    filter (false),
-    invert_matching (false),
-    recv_routing_id (false),
-    raw_socket (false),
-    raw_notify (true),
-    tcp_keepalive (-1),
-    tcp_keepalive_cnt (-1),
-    tcp_keepalive_idle (-1),
-    tcp_keepalive_intvl (-1),
-    mechanism (ZMQ_NULL),
-    as_server (0),
-    gss_principal_nt (ZMQ_GSSAPI_NT_HOSTBASED),
-    gss_service_principal_nt (ZMQ_GSSAPI_NT_HOSTBASED),
-    gss_plaintext (false),
-    socket_id (0),
-    conflate (false),
-    handshake_ivl (30000),
-    connected (false),
-    heartbeat_ttl (0),
-    heartbeat_interval (0),
-    heartbeat_timeout (-1),
-    use_fd (-1),
-    zap_enforce_domain (false),
-    loopback_fastpath (false),
-    multicast_loop (true),
-    in_batch_size (8192),
-    out_batch_size (8192),
-    zero_copy (true),
-    router_notify (0),
-    monitor_event_version (1),
-    wss_trust_system (false),
-    hello_msg (),
-    can_send_hello_msg (false),
-    disconnect_msg (),
-    can_recv_disconnect_msg (false),
-    hiccup_msg (),
-    can_recv_hiccup_msg (false),
-    busy_poll (0)
-{
-    memset (curve_public_key, 0, CURVE_KEYSIZE);
-    memset (curve_secret_key, 0, CURVE_KEYSIZE);
-    memset (curve_server_key, 0, CURVE_KEYSIZE);
-#if defined ZMQ_HAVE_VMCI
-    vmci_buffer_size = 0;
-    vmci_buffer_min_size = 0;
-    vmci_buffer_max_size = 0;
-    vmci_connect_timeout = -1;
-#endif
-}
-
-int zmq::options_t::set_curve_key (uint8_t *destination_,
-                                   const void *optval_,
-                                   size_t optvallen_)
-{
-    switch (optvallen_) {
-        case CURVE_KEYSIZE:
-            memcpy (destination_, optval_, optvallen_);
-            mechanism = ZMQ_CURVE;
-            return 0;
-
-        case CURVE_KEYSIZE_Z85 + 1: {
-            const std::string s (static_cast<const char *> (optval_),
-                                 optvallen_);
-
-            if (zmq_z85_decode (destination_, s.c_str ())) {
-                mechanism = ZMQ_CURVE;
-                return 0;
-            }
-            break;
-        }
-
-        case CURVE_KEYSIZE_Z85:
-            char z85_key[CURVE_KEYSIZE_Z85 + 1];
-            memcpy (z85_key, reinterpret_cast<const char *> (optval_),
-                    optvallen_);
-            z85_key[CURVE_KEYSIZE_Z85] = 0;
-            if (zmq_z85_decode (destination_, z85_key)) {
-                mechanism = ZMQ_CURVE;
-                return 0;
-            }
-            break;
-
-        default:
-            break;
-    }
-    return -1;
-}
-
-const int deciseconds_per_millisecond = 100;
-
-int zmq::options_t::setsockopt (int option_,
-                                const void *optval_,
-                                size_t optvallen_)
-{
-    const bool is_int = (optvallen_ == sizeof (int));
-    int value = 0;
-    if (is_int)
-        memcpy (&value, optval_, sizeof (int));
-#if defined(ZMQ_ACT_MILITANT)
-    bool malformed = true; //  Did caller pass a bad option value?
-#endif
-
-    switch (option_) {
-        case ZMQ_SNDHWM:
-            if (is_int && value >= 0) {
-                sndhwm = value;
-                return 0;
-            }
-            break;
-
-        case ZMQ_RCVHWM:
-            if (is_int && value >= 0) {
-                rcvhwm = value;
-                return 0;
-            }
-            break;
-
-        case ZMQ_AFFINITY:
-            return do_setsockopt (optval_, optvallen_, &affinity);
-
-        case ZMQ_ROUTING_ID:
-            //  Routing id is any binary string from 1 to 255 octets
-            if (optvallen_ > 0 && optvallen_ <= UCHAR_MAX) {
-                routing_id_size = static_cast<unsigned char> (optvallen_);
-                memcpy (routing_id, optval_, routing_id_size);
-                return 0;
-            }
-            break;
-
-        case ZMQ_RATE:
-            if (is_int && value > 0) {
-                rate = value;
-                return 0;
-            }
-            break;
-
-        case ZMQ_RECOVERY_IVL:
-            if (is_int && value >= 0) {
-                recovery_ivl = value;
-                return 0;
-            }
-            break;
-
-        case ZMQ_SNDBUF:
-            if (is_int && value >= -1) {
-                sndbuf = value;
-                return 0;
-            }
-            break;
-
-        case ZMQ_RCVBUF:
-            if (is_int && value >= -1) {
-                rcvbuf = value;
-                return 0;
-            }
-            break;
-
-        case ZMQ_TOS:
-            if (is_int && value >= 0) {
-                tos = value;
-                return 0;
-            }
-            break;
-
-        case ZMQ_LINGER:
-            if (is_int && value >= -1) {
-                linger.store (value);
-                return 0;
-            }
-            break;
-
-        case ZMQ_CONNECT_TIMEOUT:
-            if (is_int && value >= 0) {
-                connect_timeout = value;
-                return 0;
-            }
-            break;
-
-        case ZMQ_TCP_MAXRT:
-            if (is_int && value >= 0) {
-                tcp_maxrt = value;
-                return 0;
-            }
-            break;
-
-        case ZMQ_RECONNECT_STOP:
-            if (is_int) {
-                reconnect_stop = value;
-                return 0;
-            }
-            break;
-
-        case ZMQ_RECONNECT_IVL:
-            if (is_int && value >= -1) {
-                reconnect_ivl = value;
-                return 0;
-            }
-            break;
-
-        case ZMQ_RECONNECT_IVL_MAX:
-            if (is_int && value >= 0) {
-                reconnect_ivl_max = value;
-                return 0;
-            }
-            break;
-
-        case ZMQ_BACKLOG:
-            if (is_int && value >= 0) {
-                backlog = value;
-                return 0;
-            }
-            break;
-
-        case ZMQ_MAXMSGSIZE:
-            return do_setsockopt (optval_, optvallen_, &maxmsgsize);
-
-        case ZMQ_MULTICAST_HOPS:
-            if (is_int && value > 0) {
-                multicast_hops = value;
-                return 0;
-            }
-            break;
-
-        case ZMQ_MULTICAST_MAXTPDU:
-            if (is_int && value > 0) {
-                multicast_maxtpdu = value;
-                return 0;
-            }
-            break;
-
-        case ZMQ_RCVTIMEO:
-            if (is_int && value >= -1) {
-                rcvtimeo = value;
-                return 0;
-            }
-            break;
-
-        case ZMQ_SNDTIMEO:
-            if (is_int && value >= -1) {
-                sndtimeo = value;
-                return 0;
-            }
-            break;
-
-        /*  Deprecated in favor of ZMQ_IPV6  */
-        case ZMQ_IPV4ONLY: {
-            bool value;
-            const int rc =
-              do_setsockopt_int_as_bool_strict (optval_, optvallen_, &value);
-            if (rc == 0)
-                ipv6 = !value;
-            return rc;
-        }
-
-        /*  To replace the somewhat surprising IPV4ONLY */
-        case ZMQ_IPV6:
-            return do_setsockopt_int_as_bool_strict (optval_, optvallen_,
-                                                     &ipv6);
-
-        case ZMQ_SOCKS_PROXY:
-            return do_setsockopt_string_allow_empty_strict (
-              optval_, optvallen_, &socks_proxy_address, SIZE_MAX);
-
-        case ZMQ_SOCKS_USERNAME:
-            /* Make empty string or NULL equivalent. */
-            if (optval_ == NULL || optvallen_ == 0) {
-                socks_proxy_username.clear ();
-                return 0;
-            } else {
-                return do_setsockopt_string_allow_empty_strict (
-                  optval_, optvallen_, &socks_proxy_username, 255);
-            }
-        case ZMQ_SOCKS_PASSWORD:
-            /* Make empty string or NULL equivalent. */
-            if (optval_ == NULL || optvallen_ == 0) {
-                socks_proxy_password.clear ();
-                return 0;
-            } else {
-                return do_setsockopt_string_allow_empty_strict (
-                  optval_, optvallen_, &socks_proxy_password, 255);
-            }
-        case ZMQ_TCP_KEEPALIVE:
-            if (is_int && (value == -1 || value == 0 || value == 1)) {
-                tcp_keepalive = value;
-                return 0;
-            }
-            break;
-
-        case ZMQ_TCP_KEEPALIVE_CNT:
-            if (is_int && (value == -1 || value >= 0)) {
-                tcp_keepalive_cnt = value;
-                return 0;
-            }
-            break;
-
-        case ZMQ_TCP_KEEPALIVE_IDLE:
-            if (is_int && (value == -1 || value >= 0)) {
-                tcp_keepalive_idle = value;
-                return 0;
-            }
-            break;
-
-        case ZMQ_TCP_KEEPALIVE_INTVL:
-            if (is_int && (value == -1 || value >= 0)) {
-                tcp_keepalive_intvl = value;
-                return 0;
-            }
-            break;
-
-        case ZMQ_IMMEDIATE:
-            // TODO why is immediate not bool (and called non_immediate, as its meaning appears to be reversed)
-            if (is_int && (value == 0 || value == 1)) {
-                immediate = value;
-                return 0;
-            }
-            break;
-
-        case ZMQ_TCP_ACCEPT_FILTER: {
-            std::string filter_str;
-            int rc = do_setsockopt_string_allow_empty_strict (
-              optval_, optvallen_, &filter_str, UCHAR_MAX);
-            if (rc == 0) {
-                if (filter_str.empty ()) {
-                    tcp_accept_filters.clear ();
-                } else {
-                    tcp_address_mask_t mask;
-                    rc = mask.resolve (filter_str.c_str (), ipv6);
-                    if (rc == 0) {
-                        tcp_accept_filters.push_back (mask);
-                    }
-                }
-            }
-            return rc;
-        }
-
-#if defined ZMQ_HAVE_SO_PEERCRED || defined ZMQ_HAVE_LOCAL_PEERCRED
-        case ZMQ_IPC_FILTER_UID:
-            return do_setsockopt_set (optval_, optvallen_,
-                                      &ipc_uid_accept_filters);
-
-
-        case ZMQ_IPC_FILTER_GID:
-            return do_setsockopt_set (optval_, optvallen_,
-                                      &ipc_gid_accept_filters);
-#endif
-
-#if defined ZMQ_HAVE_SO_PEERCRED
-        case ZMQ_IPC_FILTER_PID:
-            return do_setsockopt_set (optval_, optvallen_,
-                                      &ipc_pid_accept_filters);
-#endif
-
-        case ZMQ_PLAIN_SERVER:
-            if (is_int && (value == 0 || value == 1)) {
-                as_server = value;
-                mechanism = value ? ZMQ_PLAIN : ZMQ_NULL;
-                return 0;
-            }
-            break;
-
-        case ZMQ_PLAIN_USERNAME:
-            if (optvallen_ == 0 && optval_ == NULL) {
-                mechanism = ZMQ_NULL;
-                return 0;
-            } else if (optvallen_ > 0 && optvallen_ <= UCHAR_MAX
-                       && optval_ != NULL) {
-                plain_username.assign (static_cast<const char *> (optval_),
-                                       optvallen_);
-                as_server = 0;
-                mechanism = ZMQ_PLAIN;
-                return 0;
-            }
-            break;
-
-        case ZMQ_PLAIN_PASSWORD:
-            if (optvallen_ == 0 && optval_ == NULL) {
-                mechanism = ZMQ_NULL;
-                return 0;
-            } else if (optvallen_ > 0 && optvallen_ <= UCHAR_MAX
-                       && optval_ != NULL) {
-                plain_password.assign (static_cast<const char *> (optval_),
-                                       optvallen_);
-                as_server = 0;
-                mechanism = ZMQ_PLAIN;
-                return 0;
-            }
-            break;
-
-        case ZMQ_ZAP_DOMAIN:
-            return do_setsockopt_string_allow_empty_relaxed (
-              optval_, optvallen_, &zap_domain, UCHAR_MAX);
-
-            //  If curve encryption isn't built, these options provoke EINVAL
-#ifdef ZMQ_HAVE_CURVE
-        case ZMQ_CURVE_SERVER:
-            if (is_int && (value == 0 || value == 1)) {
-                as_server = value;
-                mechanism = value ? ZMQ_CURVE : ZMQ_NULL;
-                return 0;
-            }
-            break;
-
-        case ZMQ_CURVE_PUBLICKEY:
-            if (0 == set_curve_key (curve_public_key, optval_, optvallen_)) {
-                return 0;
-            }
-            break;
-
-        case ZMQ_CURVE_SECRETKEY:
-            if (0 == set_curve_key (curve_secret_key, optval_, optvallen_)) {
-                return 0;
-            }
-            break;
-
-        case ZMQ_CURVE_SERVERKEY:
-            if (0 == set_curve_key (curve_server_key, optval_, optvallen_)) {
-                as_server = 0;
-                return 0;
-            }
-            break;
-#endif
-
-        case ZMQ_CONFLATE:
-            return do_setsockopt_int_as_bool_strict (optval_, optvallen_,
-                                                     &conflate);
-
-            //  If libgssapi isn't installed, these options provoke EINVAL
-#ifdef HAVE_LIBGSSAPI_KRB5
-        case ZMQ_GSSAPI_SERVER:
-            if (is_int && (value == 0 || value == 1)) {
-                as_server = value;
-                mechanism = ZMQ_GSSAPI;
-                return 0;
-            }
-            break;
-
-        case ZMQ_GSSAPI_PRINCIPAL:
-            if (optvallen_ > 0 && optvallen_ <= UCHAR_MAX && optval_ != NULL) {
-                gss_principal.assign ((const char *) optval_, optvallen_);
-                mechanism = ZMQ_GSSAPI;
-                return 0;
-            }
-            break;
-
-        case ZMQ_GSSAPI_SERVICE_PRINCIPAL:
-            if (optvallen_ > 0 && optvallen_ <= UCHAR_MAX && optval_ != NULL) {
-                gss_service_principal.assign ((const char *) optval_,
-                                              optvallen_);
-                mechanism = ZMQ_GSSAPI;
-                as_server = 0;
-                return 0;
-            }
-            break;
-
-        case ZMQ_GSSAPI_PLAINTEXT:
-            return do_setsockopt_int_as_bool_strict (optval_, optvallen_,
-                                                     &gss_plaintext);
-
-        case ZMQ_GSSAPI_PRINCIPAL_NAMETYPE:
-            if (is_int
-                && (value == ZMQ_GSSAPI_NT_HOSTBASED
-                    || value == ZMQ_GSSAPI_NT_USER_NAME
-                    || value == ZMQ_GSSAPI_NT_KRB5_PRINCIPAL)) {
-                gss_principal_nt = value;
-                return 0;
-            }
-            break;
-
-        case ZMQ_GSSAPI_SERVICE_PRINCIPAL_NAMETYPE:
-            if (is_int
-                && (value == ZMQ_GSSAPI_NT_HOSTBASED
-                    || value == ZMQ_GSSAPI_NT_USER_NAME
-                    || value == ZMQ_GSSAPI_NT_KRB5_PRINCIPAL)) {
-                gss_service_principal_nt = value;
-                return 0;
-            }
-            break;
-#endif
-
-        case ZMQ_HANDSHAKE_IVL:
-            if (is_int && value >= 0) {
-                handshake_ivl = value;
-                return 0;
-            }
-            break;
-
-        case ZMQ_INVERT_MATCHING:
-            return do_setsockopt_int_as_bool_relaxed (optval_, optvallen_,
-                                                      &invert_matching);
-
-        case ZMQ_HEARTBEAT_IVL:
-            if (is_int && value >= 0) {
-                heartbeat_interval = value;
-                return 0;
-            }
-            break;
-
-        case ZMQ_HEARTBEAT_TTL:
-            // Convert this to deciseconds from milliseconds
-            value = value / deciseconds_per_millisecond;
-            if (is_int && value >= 0 && value <= UINT16_MAX) {
-                heartbeat_ttl = static_cast<uint16_t> (value);
-                return 0;
-            }
-            break;
-
-        case ZMQ_HEARTBEAT_TIMEOUT:
-            if (is_int && value >= 0) {
-                heartbeat_timeout = value;
-                return 0;
-            }
-            break;
-
-#ifdef ZMQ_HAVE_VMCI
-        case ZMQ_VMCI_BUFFER_SIZE:
-            return do_setsockopt (optval_, optvallen_, &vmci_buffer_size);
-
-        case ZMQ_VMCI_BUFFER_MIN_SIZE:
-            return do_setsockopt (optval_, optvallen_, &vmci_buffer_min_size);
-
-        case ZMQ_VMCI_BUFFER_MAX_SIZE:
-            return do_setsockopt (optval_, optvallen_, &vmci_buffer_max_size);
-
-        case ZMQ_VMCI_CONNECT_TIMEOUT:
-            return do_setsockopt (optval_, optvallen_, &vmci_connect_timeout);
-#endif
-
-        case ZMQ_USE_FD:
-            if (is_int && value >= -1) {
-                use_fd = value;
-                return 0;
-            }
-            break;
-
-        case ZMQ_BINDTODEVICE:
-            return do_setsockopt_string_allow_empty_strict (
-              optval_, optvallen_, &bound_device, BINDDEVSIZ);
-
-        case ZMQ_ZAP_ENFORCE_DOMAIN:
-            return do_setsockopt_int_as_bool_relaxed (optval_, optvallen_,
-                                                      &zap_enforce_domain);
-
-        case ZMQ_LOOPBACK_FASTPATH:
-            return do_setsockopt_int_as_bool_relaxed (optval_, optvallen_,
-                                                      &loopback_fastpath);
-
-        case ZMQ_METADATA:
-            if (optvallen_ > 0 && !is_int) {
-                const std::string s (static_cast<const char *> (optval_),
-                                     optvallen_);
-                const size_t pos = s.find (':');
-                if (pos != std::string::npos && pos != 0
-                    && pos != s.length () - 1) {
-                    const std::string key = s.substr (0, pos);
-                    if (key.compare (0, 2, "X-") == 0
-                        && key.length () <= UCHAR_MAX) {
-                        std::string val = s.substr (pos + 1, s.length ());
-                        app_metadata.insert (
-                          std::pair<std::string, std::string> (key, val));
-                        return 0;
-                    }
-                }
-            }
-            errno = EINVAL;
-            return -1;
-
-        case ZMQ_MULTICAST_LOOP:
-            return do_setsockopt_int_as_bool_relaxed (optval_, optvallen_,
-                                                      &multicast_loop);
-
-#ifdef ZMQ_BUILD_DRAFT_API
-        case ZMQ_IN_BATCH_SIZE:
-            if (is_int && value > 0) {
-                in_batch_size = value;
-                return 0;
-            }
-            break;
-
-        case ZMQ_OUT_BATCH_SIZE:
-            if (is_int && value > 0) {
-                out_batch_size = value;
-                return 0;
-            }
-            break;
-
-        case ZMQ_BUSY_POLL:
-            if (is_int) {
-                busy_poll = value;
-                return 0;
-            }
-            break;
-#ifdef ZMQ_HAVE_WSS
-        case ZMQ_WSS_KEY_PEM:
-            // TODO: check if valid certificate
-            wss_key_pem = std::string ((char *) optval_, optvallen_);
-            return 0;
-        case ZMQ_WSS_CERT_PEM:
-            // TODO: check if valid certificate
-            wss_cert_pem = std::string ((char *) optval_, optvallen_);
-            return 0;
-        case ZMQ_WSS_TRUST_PEM:
-            // TODO: check if valid certificate
-            wss_trust_pem = std::string ((char *) optval_, optvallen_);
-            return 0;
-        case ZMQ_WSS_HOSTNAME:
-            wss_hostname = std::string ((char *) optval_, optvallen_);
-            return 0;
-        case ZMQ_WSS_TRUST_SYSTEM:
-            return do_setsockopt_int_as_bool_strict (optval_, optvallen_,
-                                                     &wss_trust_system);
-#endif
-
-        case ZMQ_HELLO_MSG:
-            if (optvallen_ > 0) {
-                unsigned char *bytes = (unsigned char *) optval_;
-                hello_msg =
-                  std::vector<unsigned char> (bytes, bytes + optvallen_);
-            } else {
-                hello_msg = std::vector<unsigned char> ();
-            }
-
-            return 0;
-
-        case ZMQ_DISCONNECT_MSG:
-            if (optvallen_ > 0) {
-                unsigned char *bytes = (unsigned char *) optval_;
-                disconnect_msg =
-                  std::vector<unsigned char> (bytes, bytes + optvallen_);
-            } else {
-                disconnect_msg = std::vector<unsigned char> ();
-            }
-
-            return 0;
-
-        case ZMQ_PRIORITY:
-            if (is_int && value >= 0) {
-                priority = value;
-                return 0;
-            }
-            break;
-
-        case ZMQ_HICCUP_MSG:
-            if (optvallen_ > 0) {
-                unsigned char *bytes = (unsigned char *) optval_;
-                hiccup_msg =
-                  std::vector<unsigned char> (bytes, bytes + optvallen_);
-            } else {
-                hiccup_msg = std::vector<unsigned char> ();
-            }
-
-            return 0;
-
-
-#endif
-
-        default:
-#if defined(ZMQ_ACT_MILITANT)
-            //  There are valid scenarios for probing with unknown socket option
-            //  values, e.g. to check if security is enabled or not. This will not
-            //  provoke a militant assert. However, passing bad values to a valid
-            //  socket option will, if ZMQ_ACT_MILITANT is defined.
-            malformed = false;
-#endif
-            break;
-    }
-
-        // TODO mechanism should either be set explicitly, or determined when
-        // connecting. currently, it depends on the order of setsockopt calls
-        // if there is some inconsistency, which is confusing. in addition,
-        // the assumed or set mechanism should be queryable (as a socket option)
-
-#if defined(ZMQ_ACT_MILITANT)
-    //  There is no valid use case for passing an error back to the application
-    //  when it sent malformed arguments to a socket option. Use ./configure
-    //  --with-militant to enable this checking.
-    if (malformed)
-        zmq_assert (false);
-#endif
-    errno = EINVAL;
-    return -1;
-}
-
-int zmq::options_t::getsockopt (int option_,
-                                void *optval_,
-                                size_t *optvallen_) const
-{
-    const bool is_int = (*optvallen_ == sizeof (int));
-    int *value = static_cast<int *> (optval_);
-#if defined(ZMQ_ACT_MILITANT)
-    bool malformed = true; //  Did caller pass a bad option value?
-#endif
-
-    switch (option_) {
-        case ZMQ_SNDHWM:
-            if (is_int) {
-                *value = sndhwm;
-                return 0;
-            }
-            break;
-
-        case ZMQ_RCVHWM:
-            if (is_int) {
-                *value = rcvhwm;
-                return 0;
-            }
-            break;
-
-        case ZMQ_AFFINITY:
-            if (*optvallen_ == sizeof (uint64_t)) {
-                *(static_cast<uint64_t *> (optval_)) = affinity;
-                return 0;
-            }
-            break;
-
-        case ZMQ_ROUTING_ID:
-            return do_getsockopt (optval_, optvallen_, routing_id,
-                                  routing_id_size);
-
-        case ZMQ_RATE:
-            if (is_int) {
-                *value = rate;
-                return 0;
-            }
-            break;
-
-        case ZMQ_RECOVERY_IVL:
-            if (is_int) {
-                *value = recovery_ivl;
-                return 0;
-            }
-            break;
-
-        case ZMQ_SNDBUF:
-            if (is_int) {
-                *value = sndbuf;
-                return 0;
-            }
-            break;
-
-        case ZMQ_RCVBUF:
-            if (is_int) {
-                *value = rcvbuf;
-                return 0;
-            }
-            break;
-
-        case ZMQ_TOS:
-            if (is_int) {
-                *value = tos;
-                return 0;
-            }
-            break;
-
-        case ZMQ_TYPE:
-            if (is_int) {
-                *value = type;
-                return 0;
-            }
-            break;
-
-        case ZMQ_LINGER:
-            if (is_int) {
-                *value = linger.load ();
-                return 0;
-            }
-            break;
-
-        case ZMQ_CONNECT_TIMEOUT:
-            if (is_int) {
-                *value = connect_timeout;
-                return 0;
-            }
-            break;
-
-        case ZMQ_TCP_MAXRT:
-            if (is_int) {
-                *value = tcp_maxrt;
-                return 0;
-            }
-            break;
-
-        case ZMQ_RECONNECT_STOP:
-            if (is_int) {
-                *value = reconnect_stop;
-                return 0;
-            }
-            break;
-
-        case ZMQ_RECONNECT_IVL:
-            if (is_int) {
-                *value = reconnect_ivl;
-                return 0;
-            }
-            break;
-
-        case ZMQ_RECONNECT_IVL_MAX:
-            if (is_int) {
-                *value = reconnect_ivl_max;
-                return 0;
-            }
-            break;
-
-        case ZMQ_BACKLOG:
-            if (is_int) {
-                *value = backlog;
-                return 0;
-            }
-            break;
-
-        case ZMQ_MAXMSGSIZE:
-            if (*optvallen_ == sizeof (int64_t)) {
-                *(static_cast<int64_t *> (optval_)) = maxmsgsize;
-                *optvallen_ = sizeof (int64_t);
-                return 0;
-            }
-            break;
-
-        case ZMQ_MULTICAST_HOPS:
-            if (is_int) {
-                *value = multicast_hops;
-                return 0;
-            }
-            break;
-
-        case ZMQ_MULTICAST_MAXTPDU:
-            if (is_int) {
-                *value = multicast_maxtpdu;
-                return 0;
-            }
-            break;
-
-        case ZMQ_RCVTIMEO:
-            if (is_int) {
-                *value = rcvtimeo;
-                return 0;
-            }
-            break;
-
-        case ZMQ_SNDTIMEO:
-            if (is_int) {
-                *value = sndtimeo;
-                return 0;
-            }
-            break;
-
-        case ZMQ_IPV4ONLY:
-            if (is_int) {
-                *value = 1 - ipv6;
-                return 0;
-            }
-            break;
-
-        case ZMQ_IPV6:
-            if (is_int) {
-                *value = ipv6;
-                return 0;
-            }
-            break;
-
-        case ZMQ_IMMEDIATE:
-            if (is_int) {
-                *value = immediate;
-                return 0;
-            }
-            break;
-
-        case ZMQ_SOCKS_PROXY:
-            return do_getsockopt (optval_, optvallen_, socks_proxy_address);
-
-        case ZMQ_SOCKS_USERNAME:
-            return do_getsockopt (optval_, optvallen_, socks_proxy_username);
-
-        case ZMQ_SOCKS_PASSWORD:
-            return do_getsockopt (optval_, optvallen_, socks_proxy_password);
-
-        case ZMQ_TCP_KEEPALIVE:
-            if (is_int) {
-                *value = tcp_keepalive;
-                return 0;
-            }
-            break;
-
-        case ZMQ_TCP_KEEPALIVE_CNT:
-            if (is_int) {
-                *value = tcp_keepalive_cnt;
-                return 0;
-            }
-            break;
-
-        case ZMQ_TCP_KEEPALIVE_IDLE:
-            if (is_int) {
-                *value = tcp_keepalive_idle;
-                return 0;
-            }
-            break;
-
-        case ZMQ_TCP_KEEPALIVE_INTVL:
-            if (is_int) {
-                *value = tcp_keepalive_intvl;
-                return 0;
-            }
-            break;
-
-        case ZMQ_MECHANISM:
-            if (is_int) {
-                *value = mechanism;
-                return 0;
-            }
-            break;
-
-        case ZMQ_PLAIN_SERVER:
-            if (is_int) {
-                *value = as_server && mechanism == ZMQ_PLAIN;
-                return 0;
-            }
-            break;
-
-        case ZMQ_PLAIN_USERNAME:
-            return do_getsockopt (optval_, optvallen_, plain_username);
-
-        case ZMQ_PLAIN_PASSWORD:
-            return do_getsockopt (optval_, optvallen_, plain_password);
-
-        case ZMQ_ZAP_DOMAIN:
-            return do_getsockopt (optval_, optvallen_, zap_domain);
-
-            //  If curve encryption isn't built, these options provoke EINVAL
-#ifdef ZMQ_HAVE_CURVE
-        case ZMQ_CURVE_SERVER:
-            if (is_int) {
-                *value = as_server && mechanism == ZMQ_CURVE;
-                return 0;
-            }
-            break;
-
-        case ZMQ_CURVE_PUBLICKEY:
-            return do_getsockopt_curve_key (optval_, optvallen_,
-                                            curve_public_key);
-
-        case ZMQ_CURVE_SECRETKEY:
-            return do_getsockopt_curve_key (optval_, optvallen_,
-                                            curve_secret_key);
-
-        case ZMQ_CURVE_SERVERKEY:
-            return do_getsockopt_curve_key (optval_, optvallen_,
-                                            curve_server_key);
-#endif
-
-        case ZMQ_CONFLATE:
-            if (is_int) {
-                *value = conflate;
-                return 0;
-            }
-            break;
-
-            //  If libgssapi isn't installed, these options provoke EINVAL
-#ifdef HAVE_LIBGSSAPI_KRB5
-        case ZMQ_GSSAPI_SERVER:
-            if (is_int) {
-                *value = as_server && mechanism == ZMQ_GSSAPI;
-                return 0;
-            }
-            break;
-
-        case ZMQ_GSSAPI_PRINCIPAL:
-            return do_getsockopt (optval_, optvallen_, gss_principal);
-
-        case ZMQ_GSSAPI_SERVICE_PRINCIPAL:
-            return do_getsockopt (optval_, optvallen_, gss_service_principal);
-
-        case ZMQ_GSSAPI_PLAINTEXT:
-            if (is_int) {
-                *value = gss_plaintext;
-                return 0;
-            }
-            break;
-
-        case ZMQ_GSSAPI_PRINCIPAL_NAMETYPE:
-            if (is_int) {
-                *value = gss_principal_nt;
-                return 0;
-            }
-            break;
-        case ZMQ_GSSAPI_SERVICE_PRINCIPAL_NAMETYPE:
-            if (is_int) {
-                *value = gss_service_principal_nt;
-                return 0;
-            }
-            break;
-#endif
-
-        case ZMQ_HANDSHAKE_IVL:
-            if (is_int) {
-                *value = handshake_ivl;
-                return 0;
-            }
-            break;
-
-        case ZMQ_INVERT_MATCHING:
-            if (is_int) {
-                *value = invert_matching;
-                return 0;
-            }
-            break;
-
-        case ZMQ_HEARTBEAT_IVL:
-            if (is_int) {
-                *value = heartbeat_interval;
-                return 0;
-            }
-            break;
-
-        case ZMQ_HEARTBEAT_TTL:
-            if (is_int) {
-                // Convert the internal deciseconds value to milliseconds
-                *value = heartbeat_ttl * 100;
-                return 0;
-            }
-            break;
-
-        case ZMQ_HEARTBEAT_TIMEOUT:
-            if (is_int) {
-                *value = heartbeat_timeout;
-                return 0;
-            }
-            break;
-
-        case ZMQ_USE_FD:
-            if (is_int) {
-                *value = use_fd;
-                return 0;
-            }
-            break;
-
-        case ZMQ_BINDTODEVICE:
-            return do_getsockopt (optval_, optvallen_, bound_device);
-
-        case ZMQ_ZAP_ENFORCE_DOMAIN:
-            if (is_int) {
-                *value = zap_enforce_domain;
-                return 0;
-            }
-            break;
-
-        case ZMQ_LOOPBACK_FASTPATH:
-            if (is_int) {
-                *value = loopback_fastpath;
-                return 0;
-            }
-            break;
-
-        case ZMQ_MULTICAST_LOOP:
-            if (is_int) {
-                *value = multicast_loop;
-                return 0;
-            }
-            break;
-
-#ifdef ZMQ_BUILD_DRAFT_API
-        case ZMQ_ROUTER_NOTIFY:
-            if (is_int) {
-                *value = router_notify;
-                return 0;
-            }
-            break;
-
-        case ZMQ_IN_BATCH_SIZE:
-            if (is_int) {
-                *value = in_batch_size;
-                return 0;
-            }
-            break;
-
-        case ZMQ_OUT_BATCH_SIZE:
-            if (is_int) {
-                *value = out_batch_size;
-                return 0;
-            }
-            break;
-
-        case ZMQ_PRIORITY:
-            if (is_int) {
-                *value = priority;
-                return 0;
-            }
-            break;
-
-        case ZMQ_BUSY_POLL:
-            if (is_int) {
-                *value = busy_poll;
-            }
-            break;
-#endif
-
-
-        default:
-#if defined(ZMQ_ACT_MILITANT)
-            malformed = false;
-#endif
-            break;
-    }
-#if defined(ZMQ_ACT_MILITANT)
-    if (malformed)
-        zmq_assert (false);
-#endif
-    errno = EINVAL;
-    return -1;
-}
diff --git a/libs/libzmq/src/options.hpp b/libs/libzmq/src/options.hpp
deleted file mode 100644
index f21e5b9..0000000
--- a/libs/libzmq/src/options.hpp
+++ /dev/null
@@ -1,357 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_OPTIONS_HPP_INCLUDED__
-#define __ZMQ_OPTIONS_HPP_INCLUDED__
-
-#include <string>
-#include <vector>
-#include <map>
-
-#include "atomic_ptr.hpp"
-#include "stddef.h"
-#include "stdint.hpp"
-#include "tcp_address.hpp"
-
-#if defined ZMQ_HAVE_SO_PEERCRED || defined ZMQ_HAVE_LOCAL_PEERCRED
-#include <set>
-#include <sys/types.h>
-#endif
-#ifdef ZMQ_HAVE_LOCAL_PEERCRED
-#include <sys/ucred.h>
-#endif
-
-#if __cplusplus >= 201103L || (defined _MSC_VER && _MSC_VER >= 1700)
-#include <type_traits>
-#endif
-
-//  Normal base 256 key is 32 bytes
-#define CURVE_KEYSIZE 32
-//  Key encoded using Z85 is 40 bytes
-#define CURVE_KEYSIZE_Z85 40
-
-namespace zmq
-{
-struct options_t
-{
-    options_t ();
-
-    int set_curve_key (uint8_t *destination_,
-                       const void *optval_,
-                       size_t optvallen_);
-
-    int setsockopt (int option_, const void *optval_, size_t optvallen_);
-    int getsockopt (int option_, void *optval_, size_t *optvallen_) const;
-
-    //  High-water marks for message pipes.
-    int sndhwm;
-    int rcvhwm;
-
-    //  I/O thread affinity.
-    uint64_t affinity;
-
-    //  Socket routing id.
-    unsigned char routing_id_size;
-    unsigned char routing_id[256];
-
-    //  Maximum transfer rate [kb/s]. Default 100kb/s.
-    int rate;
-
-    //  Reliability time interval [ms]. Default 10 seconds.
-    int recovery_ivl;
-
-    // Sets the time-to-live field in every multicast packet sent.
-    int multicast_hops;
-
-    // Sets the maximum transport data unit size in every multicast
-    // packet sent.
-    int multicast_maxtpdu;
-
-    // SO_SNDBUF and SO_RCVBUF to be passed to underlying transport sockets.
-    int sndbuf;
-    int rcvbuf;
-
-    // Type of service (containing DSCP and ECN socket options)
-    int tos;
-
-    // Protocol-defined priority
-    int priority;
-
-    //  Socket type.
-    int8_t type;
-
-    //  Linger time, in milliseconds.
-    atomic_value_t linger;
-
-    //  Maximum interval in milliseconds beyond which userspace will
-    //  timeout connect().
-    //  Default 0 (unused)
-    int connect_timeout;
-
-    //  Maximum interval in milliseconds beyond which TCP will timeout
-    //  retransmitted packets.
-    //  Default 0 (unused)
-    int tcp_maxrt;
-
-    //  Disable reconnect under certain conditions
-    //  Default 0
-    int reconnect_stop;
-
-    //  Minimum interval between attempts to reconnect, in milliseconds.
-    //  Default 100ms
-    int reconnect_ivl;
-
-    //  Maximum interval between attempts to reconnect, in milliseconds.
-    //  Default 0 (unused)
-    int reconnect_ivl_max;
-
-    //  Maximum backlog for pending connections.
-    int backlog;
-
-    //  Maximal size of message to handle.
-    int64_t maxmsgsize;
-
-    // The timeout for send/recv operations for this socket, in milliseconds.
-    int rcvtimeo;
-    int sndtimeo;
-
-    //  If true, IPv6 is enabled (as well as IPv4)
-    bool ipv6;
-
-    //  If 1, connecting pipes are not attached immediately, meaning a send()
-    //  on a socket with only connecting pipes would block
-    int immediate;
-
-    //  If 1, (X)SUB socket should filter the messages. If 0, it should not.
-    bool filter;
-
-    //  If true, the subscription matching on (X)PUB and (X)SUB sockets
-    //  is reversed. Messages are sent to and received by non-matching
-    //  sockets.
-    bool invert_matching;
-
-    //  If true, the routing id message is forwarded to the socket.
-    bool recv_routing_id;
-
-    // if true, router socket accepts non-zmq tcp connections
-    bool raw_socket;
-    bool raw_notify; //  Provide connect notifications
-
-    //  Address of SOCKS proxy
-    std::string socks_proxy_address;
-
-    // Credentials for SOCKS proxy.
-    // Connection method will be basic auth if username
-    // is not empty, no auth otherwise.
-    std::string socks_proxy_username;
-    std::string socks_proxy_password;
-
-    //  TCP keep-alive settings.
-    //  Defaults to -1 = do not change socket options
-    int tcp_keepalive;
-    int tcp_keepalive_cnt;
-    int tcp_keepalive_idle;
-    int tcp_keepalive_intvl;
-
-    // TCP accept() filters
-    typedef std::vector<tcp_address_mask_t> tcp_accept_filters_t;
-    tcp_accept_filters_t tcp_accept_filters;
-
-    // IPC accept() filters
-#if defined ZMQ_HAVE_SO_PEERCRED || defined ZMQ_HAVE_LOCAL_PEERCRED
-    typedef std::set<uid_t> ipc_uid_accept_filters_t;
-    ipc_uid_accept_filters_t ipc_uid_accept_filters;
-    typedef std::set<gid_t> ipc_gid_accept_filters_t;
-    ipc_gid_accept_filters_t ipc_gid_accept_filters;
-#endif
-#if defined ZMQ_HAVE_SO_PEERCRED
-    typedef std::set<pid_t> ipc_pid_accept_filters_t;
-    ipc_pid_accept_filters_t ipc_pid_accept_filters;
-#endif
-
-    //  Security mechanism for all connections on this socket
-    int mechanism;
-
-    //  If peer is acting as server for PLAIN or CURVE mechanisms
-    int as_server;
-
-    //  ZAP authentication domain
-    std::string zap_domain;
-
-    //  Security credentials for PLAIN mechanism
-    std::string plain_username;
-    std::string plain_password;
-
-    //  Security credentials for CURVE mechanism
-    uint8_t curve_public_key[CURVE_KEYSIZE];
-    uint8_t curve_secret_key[CURVE_KEYSIZE];
-    uint8_t curve_server_key[CURVE_KEYSIZE];
-
-    //  Principals for GSSAPI mechanism
-    std::string gss_principal;
-    std::string gss_service_principal;
-
-    //  Name types GSSAPI principals
-    int gss_principal_nt;
-    int gss_service_principal_nt;
-
-    //  If true, gss encryption will be disabled
-    bool gss_plaintext;
-
-    //  ID of the socket.
-    int socket_id;
-
-    //  If true, socket conflates outgoing/incoming messages.
-    //  Applicable to dealer, push/pull, pub/sub socket types.
-    //  Cannot receive multi-part messages.
-    //  Ignores hwm
-    bool conflate;
-
-    //  If connection handshake is not done after this many milliseconds,
-    //  close socket.  Default is 30 secs.  0 means no handshake timeout.
-    int handshake_ivl;
-
-    bool connected;
-    //  If remote peer receives a PING message and doesn't receive another
-    //  message within the ttl value, it should close the connection
-    //  (measured in tenths of a second)
-    uint16_t heartbeat_ttl;
-    //  Time in milliseconds between sending heartbeat PING messages.
-    int heartbeat_interval;
-    //  Time in milliseconds to wait for a PING response before disconnecting
-    int heartbeat_timeout;
-
-#if defined ZMQ_HAVE_VMCI
-    uint64_t vmci_buffer_size;
-    uint64_t vmci_buffer_min_size;
-    uint64_t vmci_buffer_max_size;
-    int vmci_connect_timeout;
-#endif
-
-    //  When creating a new ZMQ socket, if this option is set the value
-    //  will be used as the File Descriptor instead of allocating a new
-    //  one via the socket () system call.
-    int use_fd;
-
-    // Device to bind the underlying socket to, eg. VRF or interface
-    std::string bound_device;
-
-    //  Enforce a non-empty ZAP domain requirement for PLAIN auth
-    bool zap_enforce_domain;
-
-    // Use of loopback fastpath.
-    bool loopback_fastpath;
-
-    //  Loop sent multicast packets to local sockets
-    bool multicast_loop;
-
-    //  Maximal batching size for engines with receiving functionality.
-    //  So, if there are 10 messages that fit into the batch size, all of
-    //  them may be read by a single 'recv' system call, thus avoiding
-    //  unnecessary network stack traversals.
-    int in_batch_size;
-    //  Maximal batching size for engines with sending functionality.
-    //  So, if there are 10 messages that fit into the batch size, all of
-    //  them may be written by a single 'send' system call, thus avoiding
-    //  unnecessary network stack traversals.
-    int out_batch_size;
-
-    // Use zero copy strategy for storing message content when decoding.
-    bool zero_copy;
-
-    // Router socket ZMQ_NOTIFY_CONNECT/ZMQ_NOTIFY_DISCONNECT notifications
-    int router_notify;
-
-    // Application metadata
-    std::map<std::string, std::string> app_metadata;
-
-    // Version of monitor events to emit
-    int monitor_event_version;
-
-    //  WSS Keys
-    std::string wss_key_pem;
-    std::string wss_cert_pem;
-    std::string wss_trust_pem;
-    std::string wss_hostname;
-    bool wss_trust_system;
-
-    //  Hello msg
-    std::vector<unsigned char> hello_msg;
-    bool can_send_hello_msg;
-
-    //  Disconnect msg
-    std::vector<unsigned char> disconnect_msg;
-    bool can_recv_disconnect_msg;
-
-    //  Hiccup msg
-    std::vector<unsigned char> hiccup_msg;
-    bool can_recv_hiccup_msg;
-
-    //  This option removes several delays caused by scheduling, interrupts and context switching.
-    int busy_poll;
-};
-
-inline bool get_effective_conflate_option (const options_t &options)
-{
-    // conflate is only effective for some socket types
-    return options.conflate
-           && (options.type == ZMQ_DEALER || options.type == ZMQ_PULL
-               || options.type == ZMQ_PUSH || options.type == ZMQ_PUB
-               || options.type == ZMQ_SUB);
-}
-
-int do_getsockopt (void *optval_,
-                   size_t *optvallen_,
-                   const void *value_,
-                   size_t value_len_);
-
-template <typename T>
-int do_getsockopt (void *const optval_, size_t *const optvallen_, T value_)
-{
-#if __cplusplus >= 201103L && (!defined(__GNUC__) || __GNUC__ > 5)
-    static_assert (std::is_trivially_copyable<T>::value,
-                   "invalid use of do_getsockopt");
-#endif
-    return do_getsockopt (optval_, optvallen_, &value_, sizeof (T));
-}
-
-int do_getsockopt (void *optval_,
-                   size_t *optvallen_,
-                   const std::string &value_);
-
-int do_setsockopt_int_as_bool_strict (const void *optval_,
-                                      size_t optvallen_,
-                                      bool *out_value_);
-
-int do_setsockopt_int_as_bool_relaxed (const void *optval_,
-                                       size_t optvallen_,
-                                       bool *out_value_);
-}
-
-#endif
diff --git a/libs/libzmq/src/own.cpp b/libs/libzmq/src/own.cpp
deleted file mode 100644
index a7b2965..0000000
--- a/libs/libzmq/src/own.cpp
+++ /dev/null
@@ -1,212 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "own.hpp"
-#include "err.hpp"
-#include "io_thread.hpp"
-
-zmq::own_t::own_t (class ctx_t *parent_, uint32_t tid_) :
-    object_t (parent_, tid_),
-    _terminating (false),
-    _sent_seqnum (0),
-    _processed_seqnum (0),
-    _owner (NULL),
-    _term_acks (0)
-{
-}
-
-zmq::own_t::own_t (io_thread_t *io_thread_, const options_t &options_) :
-    object_t (io_thread_),
-    options (options_),
-    _terminating (false),
-    _sent_seqnum (0),
-    _processed_seqnum (0),
-    _owner (NULL),
-    _term_acks (0)
-{
-}
-
-zmq::own_t::~own_t ()
-{
-}
-
-void zmq::own_t::set_owner (own_t *owner_)
-{
-    zmq_assert (!_owner);
-    _owner = owner_;
-}
-
-void zmq::own_t::inc_seqnum ()
-{
-    //  This function may be called from a different thread!
-    _sent_seqnum.add (1);
-}
-
-void zmq::own_t::process_seqnum ()
-{
-    //  Catch up with counter of processed commands.
-    _processed_seqnum++;
-
-    //  We may have caught up and still have pending terms acks.
-    check_term_acks ();
-}
-
-void zmq::own_t::launch_child (own_t *object_)
-{
-    //  Specify the owner of the object.
-    object_->set_owner (this);
-
-    //  Plug the object into the I/O thread.
-    send_plug (object_);
-
-    //  Take ownership of the object.
-    send_own (this, object_);
-}
-
-void zmq::own_t::term_child (own_t *object_)
-{
-    process_term_req (object_);
-}
-
-void zmq::own_t::process_term_req (own_t *object_)
-{
-    //  When shutting down we can ignore termination requests from owned
-    //  objects. The termination request was already sent to the object.
-    if (_terminating)
-        return;
-
-    //  If not found, we assume that termination request was already sent to
-    //  the object so we can safely ignore the request.
-    if (0 == _owned.erase (object_))
-        return;
-
-    //  If I/O object is well and alive let's ask it to terminate.
-    register_term_acks (1);
-
-    //  Note that this object is the root of the (partial shutdown) thus, its
-    //  value of linger is used, rather than the value stored by the children.
-    send_term (object_, options.linger.load ());
-}
-
-void zmq::own_t::process_own (own_t *object_)
-{
-    //  If the object is already being shut down, new owned objects are
-    //  immediately asked to terminate. Note that linger is set to zero.
-    if (_terminating) {
-        register_term_acks (1);
-        send_term (object_, 0);
-        return;
-    }
-
-    //  Store the reference to the owned object.
-    _owned.insert (object_);
-}
-
-void zmq::own_t::terminate ()
-{
-    //  If termination is already underway, there's no point
-    //  in starting it anew.
-    if (_terminating)
-        return;
-
-    //  As for the root of the ownership tree, there's no one to terminate it,
-    //  so it has to terminate itself.
-    if (!_owner) {
-        process_term (options.linger.load ());
-        return;
-    }
-
-    //  If I am an owned object, I'll ask my owner to terminate me.
-    send_term_req (_owner, this);
-}
-
-bool zmq::own_t::is_terminating () const
-{
-    return _terminating;
-}
-
-void zmq::own_t::process_term (int linger_)
-{
-    //  Double termination should never happen.
-    zmq_assert (!_terminating);
-
-    //  Send termination request to all owned objects.
-    for (owned_t::iterator it = _owned.begin (), end = _owned.end (); it != end;
-         ++it)
-        send_term (*it, linger_);
-    register_term_acks (static_cast<int> (_owned.size ()));
-    _owned.clear ();
-
-    //  Start termination process and check whether by chance we cannot
-    //  terminate immediately.
-    _terminating = true;
-    check_term_acks ();
-}
-
-void zmq::own_t::register_term_acks (int count_)
-{
-    _term_acks += count_;
-}
-
-void zmq::own_t::unregister_term_ack ()
-{
-    zmq_assert (_term_acks > 0);
-    _term_acks--;
-
-    //  This may be a last ack we are waiting for before termination...
-    check_term_acks ();
-}
-
-void zmq::own_t::process_term_ack ()
-{
-    unregister_term_ack ();
-}
-
-void zmq::own_t::check_term_acks ()
-{
-    if (_terminating && _processed_seqnum == _sent_seqnum.get ()
-        && _term_acks == 0) {
-        //  Sanity check. There should be no active children at this point.
-        zmq_assert (_owned.empty ());
-
-        //  The root object has nobody to confirm the termination to.
-        //  Other nodes will confirm the termination to the owner.
-        if (_owner)
-            send_term_ack (_owner);
-
-        //  Deallocate the resources.
-        process_destroy ();
-    }
-}
-
-void zmq::own_t::process_destroy ()
-{
-    delete this;
-}
diff --git a/libs/libzmq/src/own.hpp b/libs/libzmq/src/own.hpp
deleted file mode 100644
index 21463fe..0000000
--- a/libs/libzmq/src/own.hpp
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_OWN_HPP_INCLUDED__
-#define __ZMQ_OWN_HPP_INCLUDED__
-
-#include <set>
-
-#include "object.hpp"
-#include "options.hpp"
-#include "atomic_counter.hpp"
-#include "stdint.hpp"
-
-namespace zmq
-{
-class ctx_t;
-class io_thread_t;
-
-//  Base class for objects forming a part of ownership hierarchy.
-//  It handles initialisation and destruction of such objects.
-
-class own_t : public object_t
-{
-  public:
-    //  Note that the owner is unspecified in the constructor.
-    //  It'll be supplied later on when the object is plugged in.
-
-    //  The object is not living within an I/O thread. It has it's own
-    //  thread outside of 0MQ infrastructure.
-    own_t (zmq::ctx_t *parent_, uint32_t tid_);
-
-    //  The object is living within I/O thread.
-    own_t (zmq::io_thread_t *io_thread_, const options_t &options_);
-
-    //  When another owned object wants to send command to this object
-    //  it calls this function to let it know it should not shut down
-    //  before the command is delivered.
-    void inc_seqnum ();
-
-    //  Use following two functions to wait for arbitrary events before
-    //  terminating. Just add number of events to wait for using
-    //  register_tem_acks functions. When event occurs, call
-    //  remove_term_ack. When number of pending acks reaches zero
-    //  object will be deallocated.
-    void register_term_acks (int count_);
-    void unregister_term_ack ();
-
-  protected:
-    //  Launch the supplied object and become its owner.
-    void launch_child (own_t *object_);
-
-    //  Terminate owned object
-    void term_child (own_t *object_);
-
-    //  Ask owner object to terminate this object. It may take a while
-    //  while actual termination is started. This function should not be
-    //  called more than once.
-    void terminate ();
-
-    //  Returns true if the object is in process of termination.
-    bool is_terminating () const;
-
-    //  Derived object destroys own_t. There's no point in allowing
-    //  others to invoke the destructor. At the same time, it has to be
-    //  virtual so that generic own_t deallocation mechanism destroys
-    //  specific type of the owned object correctly.
-    ~own_t () ZMQ_OVERRIDE;
-
-    //  Term handler is protected rather than private so that it can
-    //  be intercepted by the derived class. This is useful to add custom
-    //  steps to the beginning of the termination process.
-    void process_term (int linger_) ZMQ_OVERRIDE;
-
-    //  A place to hook in when physical destruction of the object
-    //  is to be delayed.
-    virtual void process_destroy ();
-
-    //  Socket options associated with this object.
-    options_t options;
-
-  private:
-    //  Set owner of the object
-    void set_owner (own_t *owner_);
-
-    //  Handlers for incoming commands.
-    void process_own (own_t *object_) ZMQ_OVERRIDE;
-    void process_term_req (own_t *object_) ZMQ_OVERRIDE;
-    void process_term_ack () ZMQ_OVERRIDE;
-    void process_seqnum () ZMQ_OVERRIDE;
-
-    //  Check whether all the pending term acks were delivered.
-    //  If so, deallocate this object.
-    void check_term_acks ();
-
-    //  True if termination was already initiated. If so, we can destroy
-    //  the object if there are no more child objects or pending term acks.
-    bool _terminating;
-
-    //  Sequence number of the last command sent to this object.
-    atomic_counter_t _sent_seqnum;
-
-    //  Sequence number of the last command processed by this object.
-    uint64_t _processed_seqnum;
-
-    //  Socket owning this object. It's responsible for shutting down
-    //  this object.
-    own_t *_owner;
-
-    //  List of all objects owned by this socket. We are responsible
-    //  for deallocating them before we quit.
-    typedef std::set<own_t *> owned_t;
-    owned_t _owned;
-
-    //  Number of events we have to get before we can destroy the object.
-    int _term_acks;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (own_t)
-};
-}
-
-#endif
diff --git a/libs/libzmq/src/pair.cpp b/libs/libzmq/src/pair.cpp
deleted file mode 100644
index 83551dd..0000000
--- a/libs/libzmq/src/pair.cpp
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "macros.hpp"
-#include "pair.hpp"
-#include "err.hpp"
-#include "pipe.hpp"
-#include "msg.hpp"
-
-zmq::pair_t::pair_t (class ctx_t *parent_, uint32_t tid_, int sid_) :
-    socket_base_t (parent_, tid_, sid_), _pipe (NULL)
-{
-    options.type = ZMQ_PAIR;
-}
-
-zmq::pair_t::~pair_t ()
-{
-    zmq_assert (!_pipe);
-}
-
-void zmq::pair_t::xattach_pipe (pipe_t *pipe_,
-                                bool subscribe_to_all_,
-                                bool locally_initiated_)
-{
-    LIBZMQ_UNUSED (subscribe_to_all_);
-    LIBZMQ_UNUSED (locally_initiated_);
-
-    zmq_assert (pipe_ != NULL);
-
-    //  ZMQ_PAIR socket can only be connected to a single peer.
-    //  The socket rejects any further connection requests.
-    if (_pipe == NULL)
-        _pipe = pipe_;
-    else
-        pipe_->terminate (false);
-}
-
-void zmq::pair_t::xpipe_terminated (pipe_t *pipe_)
-{
-    if (pipe_ == _pipe) {
-        _pipe = NULL;
-    }
-}
-
-void zmq::pair_t::xread_activated (pipe_t *)
-{
-    //  There's just one pipe. No lists of active and inactive pipes.
-    //  There's nothing to do here.
-}
-
-void zmq::pair_t::xwrite_activated (pipe_t *)
-{
-    //  There's just one pipe. No lists of active and inactive pipes.
-    //  There's nothing to do here.
-}
-
-int zmq::pair_t::xsend (msg_t *msg_)
-{
-    if (!_pipe || !_pipe->write (msg_)) {
-        errno = EAGAIN;
-        return -1;
-    }
-
-    if (!(msg_->flags () & msg_t::more))
-        _pipe->flush ();
-
-    //  Detach the original message from the data buffer.
-    const int rc = msg_->init ();
-    errno_assert (rc == 0);
-
-    return 0;
-}
-
-int zmq::pair_t::xrecv (msg_t *msg_)
-{
-    //  Deallocate old content of the message.
-    int rc = msg_->close ();
-    errno_assert (rc == 0);
-
-    if (!_pipe || !_pipe->read (msg_)) {
-        //  Initialise the output parameter to be a 0-byte message.
-        rc = msg_->init ();
-        errno_assert (rc == 0);
-
-        errno = EAGAIN;
-        return -1;
-    }
-    return 0;
-}
-
-bool zmq::pair_t::xhas_in ()
-{
-    if (!_pipe)
-        return false;
-
-    return _pipe->check_read ();
-}
-
-bool zmq::pair_t::xhas_out ()
-{
-    if (!_pipe)
-        return false;
-
-    return _pipe->check_write ();
-}
diff --git a/libs/libzmq/src/pair.hpp b/libs/libzmq/src/pair.hpp
deleted file mode 100644
index 74996d3..0000000
--- a/libs/libzmq/src/pair.hpp
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_PAIR_HPP_INCLUDED__
-#define __ZMQ_PAIR_HPP_INCLUDED__
-
-#include "blob.hpp"
-#include "socket_base.hpp"
-#include "session_base.hpp"
-
-namespace zmq
-{
-class ctx_t;
-class msg_t;
-class pipe_t;
-class io_thread_t;
-
-class pair_t ZMQ_FINAL : public socket_base_t
-{
-  public:
-    pair_t (zmq::ctx_t *parent_, uint32_t tid_, int sid_);
-    ~pair_t ();
-
-    //  Overrides of functions from socket_base_t.
-    void xattach_pipe (zmq::pipe_t *pipe_,
-                       bool subscribe_to_all_,
-                       bool locally_initiated_);
-    int xsend (zmq::msg_t *msg_);
-    int xrecv (zmq::msg_t *msg_);
-    bool xhas_in ();
-    bool xhas_out ();
-    void xread_activated (zmq::pipe_t *pipe_);
-    void xwrite_activated (zmq::pipe_t *pipe_);
-    void xpipe_terminated (zmq::pipe_t *pipe_);
-
-  private:
-    zmq::pipe_t *_pipe;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (pair_t)
-};
-}
-
-#endif
diff --git a/libs/libzmq/src/peer.cpp b/libs/libzmq/src/peer.cpp
deleted file mode 100644
index 3e3f27e..0000000
--- a/libs/libzmq/src/peer.cpp
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "macros.hpp"
-#include "peer.hpp"
-#include "pipe.hpp"
-#include "wire.hpp"
-#include "random.hpp"
-#include "likely.hpp"
-#include "err.hpp"
-
-zmq::peer_t::peer_t (class ctx_t *parent_, uint32_t tid_, int sid_) :
-    server_t (parent_, tid_, sid_)
-{
-    options.type = ZMQ_PEER;
-    options.can_send_hello_msg = true;
-    options.can_recv_disconnect_msg = true;
-    options.can_recv_hiccup_msg = true;
-}
-
-uint32_t zmq::peer_t::connect_peer (const char *endpoint_uri_)
-{
-    scoped_optional_lock_t sync_lock (&_sync);
-
-    // connect_peer cannot work with immediate enabled
-    if (options.immediate == 1) {
-        errno = EFAULT;
-        return 0;
-    }
-
-    int rc = socket_base_t::connect_internal (endpoint_uri_);
-    if (rc != 0)
-        return 0;
-
-    return _peer_last_routing_id;
-}
-
-void zmq::peer_t::xattach_pipe (pipe_t *pipe_,
-                                bool subscribe_to_all_,
-                                bool locally_initiated_)
-{
-    server_t::xattach_pipe (pipe_, subscribe_to_all_, locally_initiated_);
-    _peer_last_routing_id = pipe_->get_server_socket_routing_id ();
-}
diff --git a/libs/libzmq/src/peer.hpp b/libs/libzmq/src/peer.hpp
deleted file mode 100644
index 96674b2..0000000
--- a/libs/libzmq/src/peer.hpp
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_PEER_HPP_INCLUDED__
-#define __ZMQ_PEER_HPP_INCLUDED__
-
-#include <map>
-
-#include "socket_base.hpp"
-#include "server.hpp"
-#include "session_base.hpp"
-#include "stdint.hpp"
-#include "blob.hpp"
-#include "fq.hpp"
-
-namespace zmq
-{
-class ctx_t;
-class msg_t;
-class pipe_t;
-
-class peer_t ZMQ_FINAL : public server_t
-{
-  public:
-    peer_t (zmq::ctx_t *parent_, uint32_t tid_, int sid_);
-
-    //  Overrides of functions from socket_base_t.
-    void xattach_pipe (zmq::pipe_t *pipe_,
-                       bool subscribe_to_all_,
-                       bool locally_initiated_);
-
-    uint32_t connect_peer (const char *endpoint_uri_);
-
-  private:
-    uint32_t _peer_last_routing_id;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (peer_t)
-};
-}
-
-#endif
diff --git a/libs/libzmq/src/pgm_receiver.cpp b/libs/libzmq/src/pgm_receiver.cpp
deleted file mode 100644
index 227efa0..0000000
--- a/libs/libzmq/src/pgm_receiver.cpp
+++ /dev/null
@@ -1,314 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "macros.hpp"
-
-#if defined ZMQ_HAVE_OPENPGM
-
-#include <new>
-
-#include "pgm_receiver.hpp"
-#include "session_base.hpp"
-#include "v1_decoder.hpp"
-#include "stdint.hpp"
-#include "wire.hpp"
-#include "err.hpp"
-
-zmq::pgm_receiver_t::pgm_receiver_t (class io_thread_t *parent_,
-                                     const options_t &options_) :
-    io_object_t (parent_),
-    has_rx_timer (false),
-    pgm_socket (true, options_),
-    options (options_),
-    session (NULL),
-    active_tsi (NULL),
-    insize (0)
-{
-}
-
-zmq::pgm_receiver_t::~pgm_receiver_t ()
-{
-    //  Destructor should not be called before unplug.
-    zmq_assert (peers.empty ());
-}
-
-int zmq::pgm_receiver_t::init (bool udp_encapsulation_, const char *network_)
-{
-    return pgm_socket.init (udp_encapsulation_, network_);
-}
-
-void zmq::pgm_receiver_t::plug (io_thread_t *io_thread_,
-                                session_base_t *session_)
-{
-    LIBZMQ_UNUSED (io_thread_);
-    //  Retrieve PGM fds and start polling.
-    fd_t socket_fd = retired_fd;
-    fd_t waiting_pipe_fd = retired_fd;
-    pgm_socket.get_receiver_fds (&socket_fd, &waiting_pipe_fd);
-    socket_handle = add_fd (socket_fd);
-    pipe_handle = add_fd (waiting_pipe_fd);
-    set_pollin (pipe_handle);
-    set_pollin (socket_handle);
-
-    session = session_;
-
-    //  If there are any subscriptions already queued in the session, drop them.
-    drop_subscriptions ();
-}
-
-void zmq::pgm_receiver_t::unplug ()
-{
-    //  Delete decoders.
-    for (peers_t::iterator it = peers.begin (), end = peers.end (); it != end;
-         ++it) {
-        if (it->second.decoder != NULL) {
-            LIBZMQ_DELETE (it->second.decoder);
-        }
-    }
-    peers.clear ();
-    active_tsi = NULL;
-
-    if (has_rx_timer) {
-        cancel_timer (rx_timer_id);
-        has_rx_timer = false;
-    }
-
-    rm_fd (socket_handle);
-    rm_fd (pipe_handle);
-
-    session = NULL;
-}
-
-void zmq::pgm_receiver_t::terminate ()
-{
-    unplug ();
-    delete this;
-}
-
-void zmq::pgm_receiver_t::restart_output ()
-{
-    drop_subscriptions ();
-}
-
-bool zmq::pgm_receiver_t::restart_input ()
-{
-    zmq_assert (session != NULL);
-    zmq_assert (active_tsi != NULL);
-
-    const peers_t::iterator it = peers.find (*active_tsi);
-    zmq_assert (it != peers.end ());
-    zmq_assert (it->second.joined);
-
-    //  Push the pending message into the session.
-    int rc = session->push_msg (it->second.decoder->msg ());
-    errno_assert (rc == 0);
-
-    if (insize > 0) {
-        rc = process_input (it->second.decoder);
-        if (rc == -1) {
-            //  HWM reached; we will try later.
-            if (errno == EAGAIN) {
-                session->flush ();
-                return true;
-            }
-            //  Data error. Delete message decoder, mark the
-            //  peer as not joined and drop remaining data.
-            it->second.joined = false;
-            LIBZMQ_DELETE (it->second.decoder);
-            insize = 0;
-        }
-    }
-
-    //  Resume polling.
-    set_pollin (pipe_handle);
-    set_pollin (socket_handle);
-
-    active_tsi = NULL;
-    in_event ();
-
-    return true;
-}
-
-const zmq::endpoint_uri_pair_t &zmq::pgm_receiver_t::get_endpoint () const
-{
-    return _empty_endpoint;
-}
-
-void zmq::pgm_receiver_t::in_event ()
-{
-    // If active_tsi is not null, there is a pending restart_input.
-    // Keep the internal state as is so that restart_input would process the right data
-    if (active_tsi) {
-        return;
-    }
-
-    // Read data from the underlying pgm_socket.
-    const pgm_tsi_t *tsi = NULL;
-
-    if (has_rx_timer) {
-        cancel_timer (rx_timer_id);
-        has_rx_timer = false;
-    }
-
-    //  TODO: This loop can effectively block other engines in the same I/O
-    //  thread in the case of high load.
-    while (true) {
-        //  Get new batch of data.
-        //  Note the workaround made not to break strict-aliasing rules.
-        insize = 0;
-        void *tmp = NULL;
-        ssize_t received = pgm_socket.receive (&tmp, &tsi);
-
-        //  No data to process. This may happen if the packet received is
-        //  neither ODATA nor ODATA.
-        if (received == 0) {
-            if (errno == ENOMEM || errno == EBUSY) {
-                const long timeout = pgm_socket.get_rx_timeout ();
-                add_timer (timeout, rx_timer_id);
-                has_rx_timer = true;
-            }
-            break;
-        }
-
-        //  Find the peer based on its TSI.
-        peers_t::iterator it = peers.find (*tsi);
-
-        //  Data loss. Delete decoder and mark the peer as disjoint.
-        if (received == -1) {
-            if (it != peers.end ()) {
-                it->second.joined = false;
-                if (it->second.decoder != NULL) {
-                    LIBZMQ_DELETE (it->second.decoder);
-                }
-            }
-            break;
-        }
-
-        //  New peer. Add it to the list of know but unjoint peers.
-        if (it == peers.end ()) {
-            peer_info_t peer_info = {false, NULL};
-            it = peers.ZMQ_MAP_INSERT_OR_EMPLACE (*tsi, peer_info).first;
-        }
-
-        insize = static_cast<size_t> (received);
-        inpos = (unsigned char *) tmp;
-
-        //  Read the offset of the fist message in the current packet.
-        zmq_assert (insize >= sizeof (uint16_t));
-        uint16_t offset = get_uint16 (inpos);
-        inpos += sizeof (uint16_t);
-        insize -= sizeof (uint16_t);
-
-        //  Join the stream if needed.
-        if (!it->second.joined) {
-            //  There is no beginning of the message in current packet.
-            //  Ignore the data.
-            if (offset == 0xffff)
-                continue;
-
-            zmq_assert (offset <= insize);
-            zmq_assert (it->second.decoder == NULL);
-
-            //  We have to move data to the beginning of the first message.
-            inpos += offset;
-            insize -= offset;
-
-            //  Mark the stream as joined.
-            it->second.joined = true;
-
-            //  Create and connect decoder for the peer.
-            it->second.decoder =
-              new (std::nothrow) v1_decoder_t (0, options.maxmsgsize);
-            alloc_assert (it->second.decoder);
-        }
-
-        int rc = process_input (it->second.decoder);
-        if (rc == -1) {
-            if (errno == EAGAIN) {
-                active_tsi = tsi;
-
-                //  Stop polling.
-                reset_pollin (pipe_handle);
-                reset_pollin (socket_handle);
-
-                break;
-            }
-
-            it->second.joined = false;
-            LIBZMQ_DELETE (it->second.decoder);
-            insize = 0;
-        }
-    }
-
-    //  Flush any messages decoder may have produced.
-    session->flush ();
-}
-
-int zmq::pgm_receiver_t::process_input (v1_decoder_t *decoder)
-{
-    zmq_assert (session != NULL);
-
-    while (insize > 0) {
-        size_t n = 0;
-        int rc = decoder->decode (inpos, insize, n);
-        if (rc == -1)
-            return -1;
-        inpos += n;
-        insize -= n;
-        if (rc == 0)
-            break;
-        rc = session->push_msg (decoder->msg ());
-        if (rc == -1) {
-            errno_assert (errno == EAGAIN);
-            return -1;
-        }
-    }
-    return 0;
-}
-
-
-void zmq::pgm_receiver_t::timer_event (int token)
-{
-    zmq_assert (token == rx_timer_id);
-
-    //  Timer cancels on return by poller_base.
-    has_rx_timer = false;
-    in_event ();
-}
-
-void zmq::pgm_receiver_t::drop_subscriptions ()
-{
-    msg_t msg;
-    msg.init ();
-    while (session->pull_msg (&msg) == 0)
-        msg.close ();
-}
-
-#endif
diff --git a/libs/libzmq/src/pgm_receiver.hpp b/libs/libzmq/src/pgm_receiver.hpp
deleted file mode 100644
index cb03374..0000000
--- a/libs/libzmq/src/pgm_receiver.hpp
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_PGM_RECEIVER_HPP_INCLUDED__
-#define __ZMQ_PGM_RECEIVER_HPP_INCLUDED__
-
-#if defined ZMQ_HAVE_OPENPGM
-
-#include <map>
-#include <algorithm>
-
-#include "io_object.hpp"
-#include "i_engine.hpp"
-#include "options.hpp"
-#include "v1_decoder.hpp"
-#include "pgm_socket.hpp"
-
-namespace zmq
-{
-class io_thread_t;
-class session_base_t;
-
-class pgm_receiver_t ZMQ_FINAL : public io_object_t, public i_engine
-{
-  public:
-    pgm_receiver_t (zmq::io_thread_t *parent_, const options_t &options_);
-    ~pgm_receiver_t ();
-
-    int init (bool udp_encapsulation_, const char *network_);
-
-    //  i_engine interface implementation.
-    bool has_handshake_stage () { return false; };
-    void plug (zmq::io_thread_t *io_thread_, zmq::session_base_t *session_);
-    void terminate ();
-    bool restart_input ();
-    void restart_output ();
-    void zap_msg_available () {}
-    const endpoint_uri_pair_t &get_endpoint () const;
-
-    //  i_poll_events interface implementation.
-    void in_event ();
-    void timer_event (int token);
-
-  private:
-    //  Unplug the engine from the session.
-    void unplug ();
-
-    //  Decode received data (inpos, insize) and forward decoded
-    //  messages to the session.
-    int process_input (v1_decoder_t *decoder);
-
-    //  PGM is not able to move subscriptions upstream. Thus, drop all
-    //  the pending subscriptions.
-    void drop_subscriptions ();
-
-    //  RX timeout timer ID.
-    enum
-    {
-        rx_timer_id = 0xa1
-    };
-
-    const endpoint_uri_pair_t _empty_endpoint;
-
-    //  RX timer is running.
-    bool has_rx_timer;
-
-    //  If joined is true we are already getting messages from the peer.
-    //  It it's false, we are getting data but still we haven't seen
-    //  beginning of a message.
-    struct peer_info_t
-    {
-        bool joined;
-        v1_decoder_t *decoder;
-    };
-
-    struct tsi_comp
-    {
-        bool operator() (const pgm_tsi_t &ltsi, const pgm_tsi_t &rtsi) const
-        {
-            uint32_t ll[2], rl[2];
-            memcpy (ll, &ltsi, sizeof (ll));
-            memcpy (rl, &rtsi, sizeof (rl));
-            return (ll[0] < rl[0]) || (ll[0] == rl[0] && ll[1] < rl[1]);
-        }
-    };
-
-    typedef std::map<pgm_tsi_t, peer_info_t, tsi_comp> peers_t;
-    peers_t peers;
-
-    //  PGM socket.
-    pgm_socket_t pgm_socket;
-
-    //  Socket options.
-    options_t options;
-
-    //  Associated session.
-    zmq::session_base_t *session;
-
-    const pgm_tsi_t *active_tsi;
-
-    //  Number of bytes not consumed by the decoder due to pipe overflow.
-    size_t insize;
-
-    //  Pointer to data still waiting to be processed by the decoder.
-    const unsigned char *inpos;
-
-    //  Poll handle associated with PGM socket.
-    handle_t socket_handle;
-
-    //  Poll handle associated with engine PGM waiting pipe.
-    handle_t pipe_handle;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (pgm_receiver_t)
-};
-}
-
-#endif
-
-#endif
diff --git a/libs/libzmq/src/pgm_sender.cpp b/libs/libzmq/src/pgm_sender.cpp
deleted file mode 100644
index a11989b..0000000
--- a/libs/libzmq/src/pgm_sender.cpp
+++ /dev/null
@@ -1,256 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-
-#if defined ZMQ_HAVE_OPENPGM
-
-#include <stdlib.h>
-
-#include "io_thread.hpp"
-#include "pgm_sender.hpp"
-#include "session_base.hpp"
-#include "err.hpp"
-#include "wire.hpp"
-#include "stdint.hpp"
-#include "macros.hpp"
-
-zmq::pgm_sender_t::pgm_sender_t (io_thread_t *parent_,
-                                 const options_t &options_) :
-    io_object_t (parent_),
-    has_tx_timer (false),
-    has_rx_timer (false),
-    session (NULL),
-    encoder (0),
-    more_flag (false),
-    pgm_socket (false, options_),
-    options (options_),
-    handle (static_cast<handle_t> (NULL)),
-    uplink_handle (static_cast<handle_t> (NULL)),
-    rdata_notify_handle (static_cast<handle_t> (NULL)),
-    pending_notify_handle (static_cast<handle_t> (NULL)),
-    out_buffer (NULL),
-    out_buffer_size (0),
-    write_size (0)
-{
-    int rc = msg.init ();
-    errno_assert (rc == 0);
-}
-
-int zmq::pgm_sender_t::init (bool udp_encapsulation_, const char *network_)
-{
-    int rc = pgm_socket.init (udp_encapsulation_, network_);
-    if (rc != 0)
-        return rc;
-
-    out_buffer_size = pgm_socket.get_max_tsdu_size ();
-    out_buffer = (unsigned char *) malloc (out_buffer_size);
-    alloc_assert (out_buffer);
-
-    return rc;
-}
-
-void zmq::pgm_sender_t::plug (io_thread_t *io_thread_, session_base_t *session_)
-{
-    LIBZMQ_UNUSED (io_thread_);
-    //  Allocate 2 fds for PGM socket.
-    fd_t downlink_socket_fd = retired_fd;
-    fd_t uplink_socket_fd = retired_fd;
-    fd_t rdata_notify_fd = retired_fd;
-    fd_t pending_notify_fd = retired_fd;
-
-    session = session_;
-
-    //  Fill fds from PGM transport and add them to the poller.
-    pgm_socket.get_sender_fds (&downlink_socket_fd, &uplink_socket_fd,
-                               &rdata_notify_fd, &pending_notify_fd);
-
-    handle = add_fd (downlink_socket_fd);
-    uplink_handle = add_fd (uplink_socket_fd);
-    rdata_notify_handle = add_fd (rdata_notify_fd);
-    pending_notify_handle = add_fd (pending_notify_fd);
-
-    //  Set POLLIN. We will never want to stop polling for uplink = we never
-    //  want to stop processing NAKs.
-    set_pollin (uplink_handle);
-    set_pollin (rdata_notify_handle);
-    set_pollin (pending_notify_handle);
-
-    //  Set POLLOUT for downlink_socket_handle.
-    set_pollout (handle);
-}
-
-void zmq::pgm_sender_t::unplug ()
-{
-    if (has_rx_timer) {
-        cancel_timer (rx_timer_id);
-        has_rx_timer = false;
-    }
-
-    if (has_tx_timer) {
-        cancel_timer (tx_timer_id);
-        has_tx_timer = false;
-    }
-
-    rm_fd (handle);
-    rm_fd (uplink_handle);
-    rm_fd (rdata_notify_handle);
-    rm_fd (pending_notify_handle);
-    session = NULL;
-}
-
-void zmq::pgm_sender_t::terminate ()
-{
-    unplug ();
-    delete this;
-}
-
-void zmq::pgm_sender_t::restart_output ()
-{
-    set_pollout (handle);
-    out_event ();
-}
-
-bool zmq::pgm_sender_t::restart_input ()
-{
-    zmq_assert (false);
-    return true;
-}
-
-const zmq::endpoint_uri_pair_t &zmq::pgm_sender_t::get_endpoint () const
-{
-    return _empty_endpoint;
-}
-
-zmq::pgm_sender_t::~pgm_sender_t ()
-{
-    int rc = msg.close ();
-    errno_assert (rc == 0);
-
-    if (out_buffer) {
-        free (out_buffer);
-        out_buffer = NULL;
-    }
-}
-
-void zmq::pgm_sender_t::in_event ()
-{
-    if (has_rx_timer) {
-        cancel_timer (rx_timer_id);
-        has_rx_timer = false;
-    }
-
-    //  In-event on sender side means NAK or SPMR receiving from some peer.
-    pgm_socket.process_upstream ();
-    if (errno == ENOMEM || errno == EBUSY) {
-        const long timeout = pgm_socket.get_rx_timeout ();
-        add_timer (timeout, rx_timer_id);
-        has_rx_timer = true;
-    }
-}
-
-void zmq::pgm_sender_t::out_event ()
-{
-    //  POLLOUT event from send socket. If write buffer is empty,
-    //  try to read new data from the encoder.
-    if (write_size == 0) {
-        //  First two bytes (sizeof uint16_t) are used to store message
-        //  offset in following steps. Note that by passing our buffer to
-        //  the get data function we prevent it from returning its own buffer.
-        unsigned char *bf = out_buffer + sizeof (uint16_t);
-        size_t bfsz = out_buffer_size - sizeof (uint16_t);
-        uint16_t offset = 0xffff;
-
-        size_t bytes = encoder.encode (&bf, bfsz);
-        while (bytes < bfsz) {
-            if (!more_flag && offset == 0xffff)
-                offset = static_cast<uint16_t> (bytes);
-            int rc = session->pull_msg (&msg);
-            if (rc == -1)
-                break;
-            more_flag = msg.flags () & msg_t::more;
-            encoder.load_msg (&msg);
-            bf = out_buffer + sizeof (uint16_t) + bytes;
-            bytes += encoder.encode (&bf, bfsz - bytes);
-        }
-
-        //  If there are no data to write stop polling for output.
-        if (bytes == 0) {
-            reset_pollout (handle);
-            return;
-        }
-
-        write_size = sizeof (uint16_t) + bytes;
-
-        //  Put offset information in the buffer.
-        put_uint16 (out_buffer, offset);
-    }
-
-    if (has_tx_timer) {
-        cancel_timer (tx_timer_id);
-        set_pollout (handle);
-        has_tx_timer = false;
-    }
-
-    //  Send the data.
-    size_t nbytes = pgm_socket.send (out_buffer, write_size);
-
-    //  We can write either all data or 0 which means rate limit reached.
-    if (nbytes == write_size)
-        write_size = 0;
-    else {
-        zmq_assert (nbytes == 0);
-
-        if (errno == ENOMEM) {
-            // Stop polling handle and wait for tx timeout
-            const long timeout = pgm_socket.get_tx_timeout ();
-            add_timer (timeout, tx_timer_id);
-            reset_pollout (handle);
-            has_tx_timer = true;
-        } else
-            errno_assert (errno == EBUSY);
-    }
-}
-
-void zmq::pgm_sender_t::timer_event (int token)
-{
-    //  Timer cancels on return by poller_base.
-    if (token == rx_timer_id) {
-        has_rx_timer = false;
-        in_event ();
-    } else if (token == tx_timer_id) {
-        // Restart polling handle and retry sending
-        has_tx_timer = false;
-        set_pollout (handle);
-        out_event ();
-    } else
-        zmq_assert (false);
-}
-
-#endif
diff --git a/libs/libzmq/src/pgm_sender.hpp b/libs/libzmq/src/pgm_sender.hpp
deleted file mode 100644
index 1d120c9..0000000
--- a/libs/libzmq/src/pgm_sender.hpp
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_PGM_SENDER_HPP_INCLUDED__
-#define __ZMQ_PGM_SENDER_HPP_INCLUDED__
-
-#if defined ZMQ_HAVE_OPENPGM
-
-#include "stdint.hpp"
-#include "io_object.hpp"
-#include "i_engine.hpp"
-#include "options.hpp"
-#include "pgm_socket.hpp"
-#include "v1_encoder.hpp"
-#include "msg.hpp"
-
-namespace zmq
-{
-class io_thread_t;
-class session_base_t;
-
-class pgm_sender_t ZMQ_FINAL : public io_object_t, public i_engine
-{
-  public:
-    pgm_sender_t (zmq::io_thread_t *parent_, const options_t &options_);
-    ~pgm_sender_t ();
-
-    int init (bool udp_encapsulation_, const char *network_);
-
-    //  i_engine interface implementation.
-    bool has_handshake_stage () { return false; };
-    void plug (zmq::io_thread_t *io_thread_, zmq::session_base_t *session_);
-    void terminate ();
-    bool restart_input ();
-    void restart_output ();
-    void zap_msg_available () {}
-    const endpoint_uri_pair_t &get_endpoint () const;
-
-    //  i_poll_events interface implementation.
-    void in_event ();
-    void out_event ();
-    void timer_event (int token);
-
-  private:
-    //  Unplug the engine from the session.
-    void unplug ();
-
-    //  TX and RX timeout timer ID's.
-    enum
-    {
-        tx_timer_id = 0xa0,
-        rx_timer_id = 0xa1
-    };
-
-    const endpoint_uri_pair_t _empty_endpoint;
-
-    //  Timers are running.
-    bool has_tx_timer;
-    bool has_rx_timer;
-
-    session_base_t *session;
-
-    //  Message encoder.
-    v1_encoder_t encoder;
-
-    msg_t msg;
-
-    //  Keeps track of message boundaries.
-    bool more_flag;
-
-    //  PGM socket.
-    pgm_socket_t pgm_socket;
-
-    //  Socket options.
-    options_t options;
-
-    //  Poll handle associated with PGM socket.
-    handle_t handle;
-    handle_t uplink_handle;
-    handle_t rdata_notify_handle;
-    handle_t pending_notify_handle;
-
-    //  Output buffer from pgm_socket.
-    unsigned char *out_buffer;
-
-    //  Output buffer size.
-    size_t out_buffer_size;
-
-    //  Number of bytes in the buffer to be written to the socket.
-    //  If zero, there are no data to be sent.
-    size_t write_size;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (pgm_sender_t)
-};
-}
-#endif
-
-#endif
diff --git a/libs/libzmq/src/pgm_socket.cpp b/libs/libzmq/src/pgm_socket.cpp
deleted file mode 100644
index e3399db..0000000
--- a/libs/libzmq/src/pgm_socket.cpp
+++ /dev/null
@@ -1,687 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-
-#ifdef ZMQ_HAVE_OPENPGM
-
-#ifdef ZMQ_HAVE_LINUX
-#include <poll.h>
-#endif
-
-#include <stdlib.h>
-#include <string.h>
-#include <string>
-
-#include "options.hpp"
-#include "pgm_socket.hpp"
-#include "config.hpp"
-#include "err.hpp"
-#include "random.hpp"
-#include "stdint.hpp"
-
-#ifndef MSG_ERRQUEUE
-#define MSG_ERRQUEUE 0x2000
-#endif
-
-zmq::pgm_socket_t::pgm_socket_t (bool receiver_, const options_t &options_) :
-    sock (NULL),
-    options (options_),
-    receiver (receiver_),
-    pgm_msgv (NULL),
-    pgm_msgv_len (0),
-    nbytes_rec (0),
-    nbytes_processed (0),
-    pgm_msgv_processed (0)
-{
-}
-
-//  Resolve PGM socket address.
-//  network_ of the form <interface & multicast group decls>:<IP port>
-//  e.g. eth0;239.192.0.1:7500
-//       link-local;224.250.0.1,224.250.0.2;224.250.0.3:8000
-//       ;[fe80::1%en0]:7500
-int zmq::pgm_socket_t::init_address (const char *network_,
-                                     struct pgm_addrinfo_t **res,
-                                     uint16_t *port_number)
-{
-    //  Parse port number, start from end for IPv6
-    const char *port_delim = strrchr (network_, ':');
-    if (!port_delim) {
-        errno = EINVAL;
-        return -1;
-    }
-
-    *port_number = atoi (port_delim + 1);
-
-    char network[256];
-    if (port_delim - network_ >= (int) sizeof (network) - 1) {
-        errno = EINVAL;
-        return -1;
-    }
-    memset (network, '\0', sizeof (network));
-    memcpy (network, network_, port_delim - network_);
-
-    pgm_error_t *pgm_error = NULL;
-    struct pgm_addrinfo_t hints;
-
-    memset (&hints, 0, sizeof (hints));
-    hints.ai_family = AF_UNSPEC;
-    if (!pgm_getaddrinfo (network, NULL, res, &pgm_error)) {
-        //  Invalid parameters don't set pgm_error_t.
-        zmq_assert (pgm_error != NULL);
-        if (pgm_error->domain == PGM_ERROR_DOMAIN_IF &&
-
-            //  NB: cannot catch EAI_BADFLAGS.
-            (pgm_error->code != PGM_ERROR_SERVICE
-             && pgm_error->code != PGM_ERROR_SOCKTNOSUPPORT)) {
-            //  User, host, or network configuration or transient error.
-            pgm_error_free (pgm_error);
-            errno = EINVAL;
-            return -1;
-        }
-
-        //  Fatal OpenPGM internal error.
-        zmq_assert (false);
-    }
-    return 0;
-}
-
-//  Create, bind and connect PGM socket.
-int zmq::pgm_socket_t::init (bool udp_encapsulation_, const char *network_)
-{
-    //  Can not open transport before destroying old one.
-    zmq_assert (sock == NULL);
-    zmq_assert (options.rate > 0);
-
-    //  Zero counter used in msgrecv.
-    nbytes_rec = 0;
-    nbytes_processed = 0;
-    pgm_msgv_processed = 0;
-
-    uint16_t port_number;
-    struct pgm_addrinfo_t *res = NULL;
-    sa_family_t sa_family;
-
-    pgm_error_t *pgm_error = NULL;
-
-    if (init_address (network_, &res, &port_number) < 0) {
-        goto err_abort;
-    }
-
-    zmq_assert (res != NULL);
-
-    //  Pick up detected IP family.
-    sa_family = res->ai_send_addrs[0].gsr_group.ss_family;
-
-    //  Create IP/PGM or UDP/PGM socket.
-    if (udp_encapsulation_) {
-        if (!pgm_socket (&sock, sa_family, SOCK_SEQPACKET, IPPROTO_UDP,
-                         &pgm_error)) {
-            //  Invalid parameters don't set pgm_error_t.
-            zmq_assert (pgm_error != NULL);
-            if (pgm_error->domain == PGM_ERROR_DOMAIN_SOCKET
-                && (pgm_error->code != PGM_ERROR_BADF
-                    && pgm_error->code != PGM_ERROR_FAULT
-                    && pgm_error->code != PGM_ERROR_NOPROTOOPT
-                    && pgm_error->code != PGM_ERROR_FAILED))
-
-                //  User, host, or network configuration or transient error.
-                goto err_abort;
-
-            //  Fatal OpenPGM internal error.
-            zmq_assert (false);
-        }
-
-        //  All options are of data type int
-        const int encapsulation_port = port_number;
-        if (!pgm_setsockopt (sock, IPPROTO_PGM, PGM_UDP_ENCAP_UCAST_PORT,
-                             &encapsulation_port, sizeof (encapsulation_port)))
-            goto err_abort;
-        if (!pgm_setsockopt (sock, IPPROTO_PGM, PGM_UDP_ENCAP_MCAST_PORT,
-                             &encapsulation_port, sizeof (encapsulation_port)))
-            goto err_abort;
-    } else {
-        if (!pgm_socket (&sock, sa_family, SOCK_SEQPACKET, IPPROTO_PGM,
-                         &pgm_error)) {
-            //  Invalid parameters don't set pgm_error_t.
-            zmq_assert (pgm_error != NULL);
-            if (pgm_error->domain == PGM_ERROR_DOMAIN_SOCKET
-                && (pgm_error->code != PGM_ERROR_BADF
-                    && pgm_error->code != PGM_ERROR_FAULT
-                    && pgm_error->code != PGM_ERROR_NOPROTOOPT
-                    && pgm_error->code != PGM_ERROR_FAILED))
-
-                //  User, host, or network configuration or transient error.
-                goto err_abort;
-
-            //  Fatal OpenPGM internal error.
-            zmq_assert (false);
-        }
-    }
-
-    {
-        const int rcvbuf = (int) options.rcvbuf;
-        if (rcvbuf >= 0) {
-            if (!pgm_setsockopt (sock, SOL_SOCKET, SO_RCVBUF, &rcvbuf,
-                                 sizeof (rcvbuf)))
-                goto err_abort;
-        }
-
-        const int sndbuf = (int) options.sndbuf;
-        if (sndbuf >= 0) {
-            if (!pgm_setsockopt (sock, SOL_SOCKET, SO_SNDBUF, &sndbuf,
-                                 sizeof (sndbuf)))
-                goto err_abort;
-        }
-
-        const int max_tpdu = (int) options.multicast_maxtpdu;
-        if (!pgm_setsockopt (sock, IPPROTO_PGM, PGM_MTU, &max_tpdu,
-                             sizeof (max_tpdu)))
-            goto err_abort;
-    }
-
-    if (receiver) {
-        const int recv_only = 1, rxw_max_tpdu = (int) options.multicast_maxtpdu,
-                  rxw_sqns = compute_sqns (rxw_max_tpdu),
-                  peer_expiry = pgm_secs (300), spmr_expiry = pgm_msecs (25),
-                  nak_bo_ivl = pgm_msecs (50), nak_rpt_ivl = pgm_msecs (200),
-                  nak_rdata_ivl = pgm_msecs (200), nak_data_retries = 50,
-                  nak_ncf_retries = 50;
-
-        if (!pgm_setsockopt (sock, IPPROTO_PGM, PGM_RECV_ONLY, &recv_only,
-                             sizeof (recv_only))
-            || !pgm_setsockopt (sock, IPPROTO_PGM, PGM_RXW_SQNS, &rxw_sqns,
-                                sizeof (rxw_sqns))
-            || !pgm_setsockopt (sock, IPPROTO_PGM, PGM_PEER_EXPIRY,
-                                &peer_expiry, sizeof (peer_expiry))
-            || !pgm_setsockopt (sock, IPPROTO_PGM, PGM_SPMR_EXPIRY,
-                                &spmr_expiry, sizeof (spmr_expiry))
-            || !pgm_setsockopt (sock, IPPROTO_PGM, PGM_NAK_BO_IVL, &nak_bo_ivl,
-                                sizeof (nak_bo_ivl))
-            || !pgm_setsockopt (sock, IPPROTO_PGM, PGM_NAK_RPT_IVL,
-                                &nak_rpt_ivl, sizeof (nak_rpt_ivl))
-            || !pgm_setsockopt (sock, IPPROTO_PGM, PGM_NAK_RDATA_IVL,
-                                &nak_rdata_ivl, sizeof (nak_rdata_ivl))
-            || !pgm_setsockopt (sock, IPPROTO_PGM, PGM_NAK_DATA_RETRIES,
-                                &nak_data_retries, sizeof (nak_data_retries))
-            || !pgm_setsockopt (sock, IPPROTO_PGM, PGM_NAK_NCF_RETRIES,
-                                &nak_ncf_retries, sizeof (nak_ncf_retries)))
-            goto err_abort;
-    } else {
-        const int send_only = 1, max_rte = (int) ((options.rate * 1000) / 8),
-                  txw_max_tpdu = (int) options.multicast_maxtpdu,
-                  txw_sqns = compute_sqns (txw_max_tpdu),
-                  ambient_spm = pgm_secs (30),
-                  heartbeat_spm[] = {
-                    pgm_msecs (100), pgm_msecs (100),  pgm_msecs (100),
-                    pgm_msecs (100), pgm_msecs (1300), pgm_secs (7),
-                    pgm_secs (16),   pgm_secs (25),    pgm_secs (30)};
-
-        if (!pgm_setsockopt (sock, IPPROTO_PGM, PGM_SEND_ONLY, &send_only,
-                             sizeof (send_only))
-            || !pgm_setsockopt (sock, IPPROTO_PGM, PGM_ODATA_MAX_RTE, &max_rte,
-                                sizeof (max_rte))
-            || !pgm_setsockopt (sock, IPPROTO_PGM, PGM_TXW_SQNS, &txw_sqns,
-                                sizeof (txw_sqns))
-            || !pgm_setsockopt (sock, IPPROTO_PGM, PGM_AMBIENT_SPM,
-                                &ambient_spm, sizeof (ambient_spm))
-            || !pgm_setsockopt (sock, IPPROTO_PGM, PGM_HEARTBEAT_SPM,
-                                &heartbeat_spm, sizeof (heartbeat_spm)))
-            goto err_abort;
-    }
-
-    //  PGM transport GSI.
-    struct pgm_sockaddr_t addr;
-
-    memset (&addr, 0, sizeof (addr));
-    addr.sa_port = port_number;
-    addr.sa_addr.sport = DEFAULT_DATA_SOURCE_PORT;
-
-    //  Create random GSI.
-    uint32_t buf[2];
-    buf[0] = generate_random ();
-    buf[1] = generate_random ();
-    if (!pgm_gsi_create_from_data (&addr.sa_addr.gsi, (uint8_t *) buf, 8))
-        goto err_abort;
-
-
-    //  Bind a transport to the specified network devices.
-    struct pgm_interface_req_t if_req;
-    memset (&if_req, 0, sizeof (if_req));
-    if_req.ir_interface = res->ai_recv_addrs[0].gsr_interface;
-    if_req.ir_scope_id = 0;
-    if (AF_INET6 == sa_family) {
-        struct sockaddr_in6 sa6;
-        memcpy (&sa6, &res->ai_recv_addrs[0].gsr_group, sizeof (sa6));
-        if_req.ir_scope_id = sa6.sin6_scope_id;
-    }
-    if (!pgm_bind3 (sock, &addr, sizeof (addr), &if_req, sizeof (if_req),
-                    &if_req, sizeof (if_req), &pgm_error)) {
-        //  Invalid parameters don't set pgm_error_t.
-        zmq_assert (pgm_error != NULL);
-        if ((pgm_error->domain == PGM_ERROR_DOMAIN_SOCKET
-             || pgm_error->domain == PGM_ERROR_DOMAIN_IF)
-            && (pgm_error->code != PGM_ERROR_INVAL
-                && pgm_error->code != PGM_ERROR_BADF
-                && pgm_error->code != PGM_ERROR_FAULT))
-
-            //  User, host, or network configuration or transient error.
-            goto err_abort;
-
-        //  Fatal OpenPGM internal error.
-        zmq_assert (false);
-    }
-
-    //  Join IP multicast groups.
-    for (unsigned i = 0; i < res->ai_recv_addrs_len; i++) {
-        if (!pgm_setsockopt (sock, IPPROTO_PGM, PGM_JOIN_GROUP,
-                             &res->ai_recv_addrs[i], sizeof (struct group_req)))
-            goto err_abort;
-    }
-    if (!pgm_setsockopt (sock, IPPROTO_PGM, PGM_SEND_GROUP,
-                         &res->ai_send_addrs[0], sizeof (struct group_req)))
-        goto err_abort;
-
-    pgm_freeaddrinfo (res);
-    res = NULL;
-
-    //  Set IP level parameters.
-    {
-        // Multicast loopback disabled by default
-        const int multicast_loop = 0;
-        if (!pgm_setsockopt (sock, IPPROTO_PGM, PGM_MULTICAST_LOOP,
-                             &multicast_loop, sizeof (multicast_loop)))
-            goto err_abort;
-
-        const int multicast_hops = options.multicast_hops;
-        if (!pgm_setsockopt (sock, IPPROTO_PGM, PGM_MULTICAST_HOPS,
-                             &multicast_hops, sizeof (multicast_hops)))
-            goto err_abort;
-
-        //  Expedited Forwarding PHB for network elements, no ECN.
-        //  Ignore return value due to varied runtime support.
-        const int dscp = 0x2e << 2;
-        if (AF_INET6 != sa_family)
-            pgm_setsockopt (sock, IPPROTO_PGM, PGM_TOS, &dscp, sizeof (dscp));
-
-        const int nonblocking = 1;
-        if (!pgm_setsockopt (sock, IPPROTO_PGM, PGM_NOBLOCK, &nonblocking,
-                             sizeof (nonblocking)))
-            goto err_abort;
-    }
-
-    //  Connect PGM transport to start state machine.
-    if (!pgm_connect (sock, &pgm_error)) {
-        //  Invalid parameters don't set pgm_error_t.
-        zmq_assert (pgm_error != NULL);
-        goto err_abort;
-    }
-
-    //  For receiver transport preallocate pgm_msgv array.
-    if (receiver) {
-        zmq_assert (options.in_batch_size > 0);
-        size_t max_tsdu_size = get_max_tsdu_size ();
-        pgm_msgv_len = (int) options.in_batch_size / max_tsdu_size;
-        if ((int) options.in_batch_size % max_tsdu_size)
-            pgm_msgv_len++;
-        zmq_assert (pgm_msgv_len);
-
-        pgm_msgv = (pgm_msgv_t *) malloc (sizeof (pgm_msgv_t) * pgm_msgv_len);
-        alloc_assert (pgm_msgv);
-    }
-
-    return 0;
-
-err_abort:
-    if (sock != NULL) {
-        pgm_close (sock, FALSE);
-        sock = NULL;
-    }
-    if (res != NULL) {
-        pgm_freeaddrinfo (res);
-        res = NULL;
-    }
-    if (pgm_error != NULL) {
-        pgm_error_free (pgm_error);
-        pgm_error = NULL;
-    }
-    errno = EINVAL;
-    return -1;
-}
-
-zmq::pgm_socket_t::~pgm_socket_t ()
-{
-    if (pgm_msgv)
-        free (pgm_msgv);
-    if (sock)
-        pgm_close (sock, TRUE);
-}
-
-//  Get receiver fds. receive_fd_ is signaled for incoming packets,
-//  waiting_pipe_fd_ is signaled for state driven events and data.
-void zmq::pgm_socket_t::get_receiver_fds (fd_t *receive_fd_,
-                                          fd_t *waiting_pipe_fd_)
-{
-    socklen_t socklen;
-    bool rc;
-
-    zmq_assert (receive_fd_);
-    zmq_assert (waiting_pipe_fd_);
-
-    socklen = sizeof (*receive_fd_);
-    rc =
-      pgm_getsockopt (sock, IPPROTO_PGM, PGM_RECV_SOCK, receive_fd_, &socklen);
-    zmq_assert (rc);
-    zmq_assert (socklen == sizeof (*receive_fd_));
-
-    socklen = sizeof (*waiting_pipe_fd_);
-    rc = pgm_getsockopt (sock, IPPROTO_PGM, PGM_PENDING_SOCK, waiting_pipe_fd_,
-                         &socklen);
-    zmq_assert (rc);
-    zmq_assert (socklen == sizeof (*waiting_pipe_fd_));
-}
-
-//  Get fds and store them into user allocated memory.
-//  send_fd is for non-blocking send wire notifications.
-//  receive_fd_ is for incoming back-channel protocol packets.
-//  rdata_notify_fd_ is raised for waiting repair transmissions.
-//  pending_notify_fd_ is for state driven events.
-void zmq::pgm_socket_t::get_sender_fds (fd_t *send_fd_,
-                                        fd_t *receive_fd_,
-                                        fd_t *rdata_notify_fd_,
-                                        fd_t *pending_notify_fd_)
-{
-    socklen_t socklen;
-    bool rc;
-
-    zmq_assert (send_fd_);
-    zmq_assert (receive_fd_);
-    zmq_assert (rdata_notify_fd_);
-    zmq_assert (pending_notify_fd_);
-
-    socklen = sizeof (*send_fd_);
-    rc = pgm_getsockopt (sock, IPPROTO_PGM, PGM_SEND_SOCK, send_fd_, &socklen);
-    zmq_assert (rc);
-    zmq_assert (socklen == sizeof (*receive_fd_));
-
-    socklen = sizeof (*receive_fd_);
-    rc =
-      pgm_getsockopt (sock, IPPROTO_PGM, PGM_RECV_SOCK, receive_fd_, &socklen);
-    zmq_assert (rc);
-    zmq_assert (socklen == sizeof (*receive_fd_));
-
-    socklen = sizeof (*rdata_notify_fd_);
-    rc = pgm_getsockopt (sock, IPPROTO_PGM, PGM_REPAIR_SOCK, rdata_notify_fd_,
-                         &socklen);
-    zmq_assert (rc);
-    zmq_assert (socklen == sizeof (*rdata_notify_fd_));
-
-    socklen = sizeof (*pending_notify_fd_);
-    rc = pgm_getsockopt (sock, IPPROTO_PGM, PGM_PENDING_SOCK,
-                         pending_notify_fd_, &socklen);
-    zmq_assert (rc);
-    zmq_assert (socklen == sizeof (*pending_notify_fd_));
-}
-
-//  Send one APDU, transmit window owned memory.
-//  data_len_ must be less than one TPDU.
-size_t zmq::pgm_socket_t::send (unsigned char *data_, size_t data_len_)
-{
-    size_t nbytes = 0;
-
-    const int status = pgm_send (sock, data_, data_len_, &nbytes);
-
-    //  We have to write all data as one packet.
-    if (nbytes > 0) {
-        zmq_assert (status == PGM_IO_STATUS_NORMAL);
-        zmq_assert (nbytes == data_len_);
-    } else {
-        zmq_assert (status == PGM_IO_STATUS_RATE_LIMITED
-                    || status == PGM_IO_STATUS_WOULD_BLOCK);
-
-        if (status == PGM_IO_STATUS_RATE_LIMITED)
-            errno = ENOMEM;
-        else
-            errno = EBUSY;
-    }
-
-    //  Save return value.
-    last_tx_status = status;
-
-    return nbytes;
-}
-
-long zmq::pgm_socket_t::get_rx_timeout ()
-{
-    if (last_rx_status != PGM_IO_STATUS_RATE_LIMITED
-        && last_rx_status != PGM_IO_STATUS_TIMER_PENDING)
-        return -1;
-
-    struct timeval tv;
-    socklen_t optlen = sizeof (tv);
-    const bool rc = pgm_getsockopt (sock, IPPROTO_PGM,
-                                    last_rx_status == PGM_IO_STATUS_RATE_LIMITED
-                                      ? PGM_RATE_REMAIN
-                                      : PGM_TIME_REMAIN,
-                                    &tv, &optlen);
-    zmq_assert (rc);
-
-    const long timeout = (tv.tv_sec * 1000) + (tv.tv_usec / 1000);
-
-    return timeout;
-}
-
-long zmq::pgm_socket_t::get_tx_timeout ()
-{
-    if (last_tx_status != PGM_IO_STATUS_RATE_LIMITED)
-        return -1;
-
-    struct timeval tv;
-    socklen_t optlen = sizeof (tv);
-    const bool rc =
-      pgm_getsockopt (sock, IPPROTO_PGM, PGM_RATE_REMAIN, &tv, &optlen);
-    zmq_assert (rc);
-
-    const long timeout = (tv.tv_sec * 1000) + (tv.tv_usec / 1000);
-
-    return timeout;
-}
-
-//  Return max TSDU size without fragmentation from current PGM transport.
-size_t zmq::pgm_socket_t::get_max_tsdu_size ()
-{
-    int max_tsdu = 0;
-    socklen_t optlen = sizeof (max_tsdu);
-
-    bool rc = pgm_getsockopt (sock, IPPROTO_PGM, PGM_MSS, &max_tsdu, &optlen);
-    zmq_assert (rc);
-    zmq_assert (optlen == sizeof (max_tsdu));
-    return (size_t) max_tsdu;
-}
-
-//  pgm_recvmsgv is called to fill the pgm_msgv array up to  pgm_msgv_len.
-//  In subsequent calls data from pgm_msgv structure are returned.
-ssize_t zmq::pgm_socket_t::receive (void **raw_data_, const pgm_tsi_t **tsi_)
-{
-    size_t raw_data_len = 0;
-
-    //  We just sent all data from pgm_transport_recvmsgv up
-    //  and have to return 0 that another engine in this thread is scheduled.
-    if (nbytes_rec == nbytes_processed && nbytes_rec > 0) {
-        //  Reset all the counters.
-        nbytes_rec = 0;
-        nbytes_processed = 0;
-        pgm_msgv_processed = 0;
-        errno = EAGAIN;
-        return 0;
-    }
-
-    //  If we have are going first time or if we have processed all pgm_msgv_t
-    //  structure previously read from the pgm socket.
-    if (nbytes_rec == nbytes_processed) {
-        //  Check program flow.
-        zmq_assert (pgm_msgv_processed == 0);
-        zmq_assert (nbytes_processed == 0);
-        zmq_assert (nbytes_rec == 0);
-
-        //  Receive a vector of Application Protocol Domain Unit's (APDUs)
-        //  from the transport.
-        pgm_error_t *pgm_error = NULL;
-
-        const int status = pgm_recvmsgv (sock, pgm_msgv, pgm_msgv_len,
-                                         MSG_ERRQUEUE, &nbytes_rec, &pgm_error);
-
-        //  Invalid parameters.
-        zmq_assert (status != PGM_IO_STATUS_ERROR);
-
-        last_rx_status = status;
-
-        //  In a case when no ODATA/RDATA fired POLLIN event (SPM...)
-        //  pgm_recvmsg returns PGM_IO_STATUS_TIMER_PENDING.
-        if (status == PGM_IO_STATUS_TIMER_PENDING) {
-            zmq_assert (nbytes_rec == 0);
-
-            //  In case if no RDATA/ODATA caused POLLIN 0 is
-            //  returned.
-            nbytes_rec = 0;
-            errno = EBUSY;
-            return 0;
-        }
-
-        //  Send SPMR, NAK, ACK is rate limited.
-        if (status == PGM_IO_STATUS_RATE_LIMITED) {
-            zmq_assert (nbytes_rec == 0);
-
-            //  In case if no RDATA/ODATA caused POLLIN 0 is returned.
-            nbytes_rec = 0;
-            errno = ENOMEM;
-            return 0;
-        }
-
-        //  No peers and hence no incoming packets.
-        if (status == PGM_IO_STATUS_WOULD_BLOCK) {
-            zmq_assert (nbytes_rec == 0);
-
-            //  In case if no RDATA/ODATA caused POLLIN 0 is returned.
-            nbytes_rec = 0;
-            errno = EAGAIN;
-            return 0;
-        }
-
-        //  Data loss.
-        if (status == PGM_IO_STATUS_RESET) {
-            struct pgm_sk_buff_t *skb = pgm_msgv[0].msgv_skb[0];
-
-            //  Save lost data TSI.
-            *tsi_ = &skb->tsi;
-            nbytes_rec = 0;
-
-            //  In case of dala loss -1 is returned.
-            errno = EINVAL;
-            pgm_free_skb (skb);
-            return -1;
-        }
-
-        zmq_assert (status == PGM_IO_STATUS_NORMAL);
-    } else {
-        zmq_assert (pgm_msgv_processed <= pgm_msgv_len);
-    }
-
-    // Zero byte payloads are valid in PGM, but not 0MQ protocol.
-    zmq_assert (nbytes_rec > 0);
-
-    // Only one APDU per pgm_msgv_t structure is allowed.
-    zmq_assert (pgm_msgv[pgm_msgv_processed].msgv_len == 1);
-
-    struct pgm_sk_buff_t *skb = pgm_msgv[pgm_msgv_processed].msgv_skb[0];
-
-    //  Take pointers from pgm_msgv_t structure.
-    *raw_data_ = skb->data;
-    raw_data_len = skb->len;
-
-    //  Save current TSI.
-    *tsi_ = &skb->tsi;
-
-    //  Move the the next pgm_msgv_t structure.
-    pgm_msgv_processed++;
-    zmq_assert (pgm_msgv_processed <= pgm_msgv_len);
-    nbytes_processed += raw_data_len;
-
-    return raw_data_len;
-}
-
-void zmq::pgm_socket_t::process_upstream ()
-{
-    pgm_msgv_t dummy_msg;
-
-    size_t dummy_bytes = 0;
-    pgm_error_t *pgm_error = NULL;
-
-    const int status = pgm_recvmsgv (sock, &dummy_msg, 1, MSG_ERRQUEUE,
-                                     &dummy_bytes, &pgm_error);
-
-    //  Invalid parameters.
-    zmq_assert (status != PGM_IO_STATUS_ERROR);
-
-    //  No data should be returned.
-    zmq_assert (dummy_bytes == 0
-                && (status == PGM_IO_STATUS_TIMER_PENDING
-                    || status == PGM_IO_STATUS_RATE_LIMITED
-                    || status == PGM_IO_STATUS_WOULD_BLOCK));
-
-    last_rx_status = status;
-
-    if (status == PGM_IO_STATUS_TIMER_PENDING)
-        errno = EBUSY;
-    else if (status == PGM_IO_STATUS_RATE_LIMITED)
-        errno = ENOMEM;
-    else
-        errno = EAGAIN;
-}
-
-int zmq::pgm_socket_t::compute_sqns (int tpdu_)
-{
-    //  Convert rate into B/ms.
-    uint64_t rate = uint64_t (options.rate) / 8;
-
-    //  Compute the size of the buffer in bytes.
-    uint64_t size = uint64_t (options.recovery_ivl) * rate;
-
-    //  Translate the size into number of packets.
-    uint64_t sqns = size / tpdu_;
-
-    //  Buffer should be able to hold at least one packet.
-    if (sqns == 0)
-        sqns = 1;
-
-    return (int) sqns;
-}
-
-#endif
diff --git a/libs/libzmq/src/pgm_socket.hpp b/libs/libzmq/src/pgm_socket.hpp
deleted file mode 100644
index 00ec485..0000000
--- a/libs/libzmq/src/pgm_socket.hpp
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __PGM_SOCKET_HPP_INCLUDED__
-#define __PGM_SOCKET_HPP_INCLUDED__
-
-#if defined ZMQ_HAVE_OPENPGM
-
-#ifdef ZMQ_HAVE_WINDOWS
-#define __PGM_WININT_H__
-#endif
-
-#include <pgm/pgm.h>
-
-#if defined(ZMQ_HAVE_OSX) || defined(ZMQ_HAVE_NETBSD)
-#include <pgm/in.h>
-#endif
-
-#include "fd.hpp"
-#include "options.hpp"
-
-namespace zmq
-{
-//  Encapsulates PGM socket.
-class pgm_socket_t
-{
-  public:
-    //  If receiver_ is true PGM transport is not generating SPM packets.
-    pgm_socket_t (bool receiver_, const options_t &options_);
-
-    //  Closes the transport.
-    ~pgm_socket_t ();
-
-    //  Initialize PGM network structures (GSI, GSRs).
-    int init (bool udp_encapsulation_, const char *network_);
-
-    //  Resolve PGM socket address.
-    static int init_address (const char *network_,
-                             struct pgm_addrinfo_t **addr,
-                             uint16_t *port_number);
-
-    //   Get receiver fds and store them into user allocated memory.
-    void get_receiver_fds (fd_t *receive_fd_, fd_t *waiting_pipe_fd_);
-
-    //   Get sender and receiver fds and store it to user allocated
-    //   memory. Receive fd is used to process NAKs from peers.
-    void get_sender_fds (fd_t *send_fd_,
-                         fd_t *receive_fd_,
-                         fd_t *rdata_notify_fd_,
-                         fd_t *pending_notify_fd_);
-
-    //  Send data as one APDU, transmit window owned memory.
-    size_t send (unsigned char *data_, size_t data_len_);
-
-    //  Returns max tsdu size without fragmentation.
-    size_t get_max_tsdu_size ();
-
-    //  Receive data from pgm socket.
-    ssize_t receive (void **data_, const pgm_tsi_t **tsi_);
-
-    long get_rx_timeout ();
-    long get_tx_timeout ();
-
-    //  POLLIN on sender side should mean NAK or SPMR receiving.
-    //  process_upstream function is used to handle such a situation.
-    void process_upstream ();
-
-  private:
-    //  Compute size of the buffer based on rate and recovery interval.
-    int compute_sqns (int tpdu_);
-
-    //  OpenPGM transport.
-    pgm_sock_t *sock;
-
-    int last_rx_status, last_tx_status;
-
-    //  Associated socket options.
-    options_t options;
-
-    //  true when pgm_socket should create receiving side.
-    bool receiver;
-
-    //  Array of pgm_msgv_t structures to store received data
-    //  from the socket (pgm_transport_recvmsgv).
-    pgm_msgv_t *pgm_msgv;
-
-    //  Size of pgm_msgv array.
-    size_t pgm_msgv_len;
-
-    // How many bytes were read from pgm socket.
-    size_t nbytes_rec;
-
-    //  How many bytes were processed from last pgm socket read.
-    size_t nbytes_processed;
-
-    //  How many messages from pgm_msgv were already sent up.
-    size_t pgm_msgv_processed;
-};
-}
-#endif
-
-#endif
diff --git a/libs/libzmq/src/pipe.cpp b/libs/libzmq/src/pipe.cpp
deleted file mode 100644
index 31e553b..0000000
--- a/libs/libzmq/src/pipe.cpp
+++ /dev/null
@@ -1,629 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include <new>
-#include <stddef.h>
-
-#include "macros.hpp"
-#include "pipe.hpp"
-#include "err.hpp"
-
-#include "ypipe.hpp"
-#include "ypipe_conflate.hpp"
-
-int zmq::pipepair (object_t *parents_[2],
-                   pipe_t *pipes_[2],
-                   const int hwms_[2],
-                   const bool conflate_[2])
-{
-    //   Creates two pipe objects. These objects are connected by two ypipes,
-    //   each to pass messages in one direction.
-
-    typedef ypipe_t<msg_t, message_pipe_granularity> upipe_normal_t;
-    typedef ypipe_conflate_t<msg_t> upipe_conflate_t;
-
-    pipe_t::upipe_t *upipe1;
-    if (conflate_[0])
-        upipe1 = new (std::nothrow) upipe_conflate_t ();
-    else
-        upipe1 = new (std::nothrow) upipe_normal_t ();
-    alloc_assert (upipe1);
-
-    pipe_t::upipe_t *upipe2;
-    if (conflate_[1])
-        upipe2 = new (std::nothrow) upipe_conflate_t ();
-    else
-        upipe2 = new (std::nothrow) upipe_normal_t ();
-    alloc_assert (upipe2);
-
-    pipes_[0] = new (std::nothrow)
-      pipe_t (parents_[0], upipe1, upipe2, hwms_[1], hwms_[0], conflate_[0]);
-    alloc_assert (pipes_[0]);
-    pipes_[1] = new (std::nothrow)
-      pipe_t (parents_[1], upipe2, upipe1, hwms_[0], hwms_[1], conflate_[1]);
-    alloc_assert (pipes_[1]);
-
-    pipes_[0]->set_peer (pipes_[1]);
-    pipes_[1]->set_peer (pipes_[0]);
-
-    return 0;
-}
-
-void zmq::send_routing_id (pipe_t *pipe_, const options_t &options_)
-{
-    zmq::msg_t id;
-    const int rc = id.init_size (options_.routing_id_size);
-    errno_assert (rc == 0);
-    memcpy (id.data (), options_.routing_id, options_.routing_id_size);
-    id.set_flags (zmq::msg_t::routing_id);
-    const bool written = pipe_->write (&id);
-    zmq_assert (written);
-    pipe_->flush ();
-}
-
-void zmq::send_hello_msg (pipe_t *pipe_, const options_t &options_)
-{
-    zmq::msg_t hello;
-    const int rc =
-      hello.init_buffer (&options_.hello_msg[0], options_.hello_msg.size ());
-    errno_assert (rc == 0);
-    const bool written = pipe_->write (&hello);
-    zmq_assert (written);
-    pipe_->flush ();
-}
-
-zmq::pipe_t::pipe_t (object_t *parent_,
-                     upipe_t *inpipe_,
-                     upipe_t *outpipe_,
-                     int inhwm_,
-                     int outhwm_,
-                     bool conflate_) :
-    object_t (parent_),
-    _in_pipe (inpipe_),
-    _out_pipe (outpipe_),
-    _in_active (true),
-    _out_active (true),
-    _hwm (outhwm_),
-    _lwm (compute_lwm (inhwm_)),
-    _in_hwm_boost (-1),
-    _out_hwm_boost (-1),
-    _msgs_read (0),
-    _msgs_written (0),
-    _peers_msgs_read (0),
-    _peer (NULL),
-    _sink (NULL),
-    _state (active),
-    _delay (true),
-    _server_socket_routing_id (0),
-    _conflate (conflate_)
-{
-    _disconnect_msg.init ();
-}
-
-zmq::pipe_t::~pipe_t ()
-{
-    _disconnect_msg.close ();
-}
-
-void zmq::pipe_t::set_peer (pipe_t *peer_)
-{
-    //  Peer can be set once only.
-    zmq_assert (!_peer);
-    _peer = peer_;
-}
-
-void zmq::pipe_t::set_event_sink (i_pipe_events *sink_)
-{
-    // Sink can be set once only.
-    zmq_assert (!_sink);
-    _sink = sink_;
-}
-
-void zmq::pipe_t::set_server_socket_routing_id (
-  uint32_t server_socket_routing_id_)
-{
-    _server_socket_routing_id = server_socket_routing_id_;
-}
-
-uint32_t zmq::pipe_t::get_server_socket_routing_id () const
-{
-    return _server_socket_routing_id;
-}
-
-void zmq::pipe_t::set_router_socket_routing_id (
-  const blob_t &router_socket_routing_id_)
-{
-    _router_socket_routing_id.set_deep_copy (router_socket_routing_id_);
-}
-
-const zmq::blob_t &zmq::pipe_t::get_routing_id () const
-{
-    return _router_socket_routing_id;
-}
-
-bool zmq::pipe_t::check_read ()
-{
-    if (unlikely (!_in_active))
-        return false;
-    if (unlikely (_state != active && _state != waiting_for_delimiter))
-        return false;
-
-    //  Check if there's an item in the pipe.
-    if (!_in_pipe->check_read ()) {
-        _in_active = false;
-        return false;
-    }
-
-    //  If the next item in the pipe is message delimiter,
-    //  initiate termination process.
-    if (_in_pipe->probe (is_delimiter)) {
-        msg_t msg;
-        const bool ok = _in_pipe->read (&msg);
-        zmq_assert (ok);
-        process_delimiter ();
-        return false;
-    }
-
-    return true;
-}
-
-bool zmq::pipe_t::read (msg_t *msg_)
-{
-    if (unlikely (!_in_active))
-        return false;
-    if (unlikely (_state != active && _state != waiting_for_delimiter))
-        return false;
-
-    while (true) {
-        if (!_in_pipe->read (msg_)) {
-            _in_active = false;
-            return false;
-        }
-
-        //  If this is a credential, ignore it and receive next message.
-        if (unlikely (msg_->is_credential ())) {
-            const int rc = msg_->close ();
-            zmq_assert (rc == 0);
-        } else {
-            break;
-        }
-    }
-
-    //  If delimiter was read, start termination process of the pipe.
-    if (msg_->is_delimiter ()) {
-        process_delimiter ();
-        return false;
-    }
-
-    if (!(msg_->flags () & msg_t::more) && !msg_->is_routing_id ())
-        _msgs_read++;
-
-    if (_lwm > 0 && _msgs_read % _lwm == 0)
-        send_activate_write (_peer, _msgs_read);
-
-    return true;
-}
-
-bool zmq::pipe_t::check_write ()
-{
-    if (unlikely (!_out_active || _state != active))
-        return false;
-
-    const bool full = !check_hwm ();
-
-    if (unlikely (full)) {
-        _out_active = false;
-        return false;
-    }
-
-    return true;
-}
-
-bool zmq::pipe_t::write (const msg_t *msg_)
-{
-    if (unlikely (!check_write ()))
-        return false;
-
-    const bool more = (msg_->flags () & msg_t::more) != 0;
-    const bool is_routing_id = msg_->is_routing_id ();
-    _out_pipe->write (*msg_, more);
-    if (!more && !is_routing_id)
-        _msgs_written++;
-
-    return true;
-}
-
-void zmq::pipe_t::rollback () const
-{
-    //  Remove incomplete message from the outbound pipe.
-    msg_t msg;
-    if (_out_pipe) {
-        while (_out_pipe->unwrite (&msg)) {
-            zmq_assert (msg.flags () & msg_t::more);
-            const int rc = msg.close ();
-            errno_assert (rc == 0);
-        }
-    }
-}
-
-void zmq::pipe_t::flush ()
-{
-    //  The peer does not exist anymore at this point.
-    if (_state == term_ack_sent)
-        return;
-
-    if (_out_pipe && !_out_pipe->flush ())
-        send_activate_read (_peer);
-}
-
-void zmq::pipe_t::process_activate_read ()
-{
-    if (!_in_active && (_state == active || _state == waiting_for_delimiter)) {
-        _in_active = true;
-        _sink->read_activated (this);
-    }
-}
-
-void zmq::pipe_t::process_activate_write (uint64_t msgs_read_)
-{
-    //  Remember the peer's message sequence number.
-    _peers_msgs_read = msgs_read_;
-
-    if (!_out_active && _state == active) {
-        _out_active = true;
-        _sink->write_activated (this);
-    }
-}
-
-void zmq::pipe_t::process_hiccup (void *pipe_)
-{
-    //  Destroy old outpipe. Note that the read end of the pipe was already
-    //  migrated to this thread.
-    zmq_assert (_out_pipe);
-    _out_pipe->flush ();
-    msg_t msg;
-    while (_out_pipe->read (&msg)) {
-        if (!(msg.flags () & msg_t::more))
-            _msgs_written--;
-        const int rc = msg.close ();
-        errno_assert (rc == 0);
-    }
-    LIBZMQ_DELETE (_out_pipe);
-
-    //  Plug in the new outpipe.
-    zmq_assert (pipe_);
-    _out_pipe = static_cast<upipe_t *> (pipe_);
-    _out_active = true;
-
-    //  If appropriate, notify the user about the hiccup.
-    if (_state == active)
-        _sink->hiccuped (this);
-}
-
-void zmq::pipe_t::process_pipe_term ()
-{
-    zmq_assert (_state == active || _state == delimiter_received
-                || _state == term_req_sent1);
-
-    //  This is the simple case of peer-induced termination. If there are no
-    //  more pending messages to read, or if the pipe was configured to drop
-    //  pending messages, we can move directly to the term_ack_sent state.
-    //  Otherwise we'll hang up in waiting_for_delimiter state till all
-    //  pending messages are read.
-    if (_state == active) {
-        if (_delay)
-            _state = waiting_for_delimiter;
-        else {
-            _state = term_ack_sent;
-            _out_pipe = NULL;
-            send_pipe_term_ack (_peer);
-        }
-    }
-
-    //  Delimiter happened to arrive before the term command. Now we have the
-    //  term command as well, so we can move straight to term_ack_sent state.
-    else if (_state == delimiter_received) {
-        _state = term_ack_sent;
-        _out_pipe = NULL;
-        send_pipe_term_ack (_peer);
-    }
-
-    //  This is the case where both ends of the pipe are closed in parallel.
-    //  We simply reply to the request by ack and continue waiting for our
-    //  own ack.
-    else if (_state == term_req_sent1) {
-        _state = term_req_sent2;
-        _out_pipe = NULL;
-        send_pipe_term_ack (_peer);
-    }
-}
-
-void zmq::pipe_t::process_pipe_term_ack ()
-{
-    //  Notify the user that all the references to the pipe should be dropped.
-    zmq_assert (_sink);
-    _sink->pipe_terminated (this);
-
-    //  In term_ack_sent and term_req_sent2 states there's nothing to do.
-    //  Simply deallocate the pipe. In term_req_sent1 state we have to ack
-    //  the peer before deallocating this side of the pipe.
-    //  All the other states are invalid.
-    if (_state == term_req_sent1) {
-        _out_pipe = NULL;
-        send_pipe_term_ack (_peer);
-    } else
-        zmq_assert (_state == term_ack_sent || _state == term_req_sent2);
-
-    //  We'll deallocate the inbound pipe, the peer will deallocate the outbound
-    //  pipe (which is an inbound pipe from its point of view).
-    //  First, delete all the unread messages in the pipe. We have to do it by
-    //  hand because msg_t doesn't have automatic destructor. Then deallocate
-    //  the ypipe itself.
-
-    if (!_conflate) {
-        msg_t msg;
-        while (_in_pipe->read (&msg)) {
-            const int rc = msg.close ();
-            errno_assert (rc == 0);
-        }
-    }
-
-    LIBZMQ_DELETE (_in_pipe);
-
-    //  Deallocate the pipe object
-    delete this;
-}
-
-void zmq::pipe_t::process_pipe_hwm (int inhwm_, int outhwm_)
-{
-    set_hwms (inhwm_, outhwm_);
-}
-
-void zmq::pipe_t::set_nodelay ()
-{
-    this->_delay = false;
-}
-
-void zmq::pipe_t::terminate (bool delay_)
-{
-    //  Overload the value specified at pipe creation.
-    _delay = delay_;
-
-    //  If terminate was already called, we can ignore the duplicate invocation.
-    if (_state == term_req_sent1 || _state == term_req_sent2) {
-        return;
-    }
-    //  If the pipe is in the final phase of async termination, it's going to
-    //  closed anyway. No need to do anything special here.
-    if (_state == term_ack_sent) {
-        return;
-    }
-    //  The simple sync termination case. Ask the peer to terminate and wait
-    //  for the ack.
-    if (_state == active) {
-        send_pipe_term (_peer);
-        _state = term_req_sent1;
-    }
-    //  There are still pending messages available, but the user calls
-    //  'terminate'. We can act as if all the pending messages were read.
-    else if (_state == waiting_for_delimiter && !_delay) {
-        //  Drop any unfinished outbound messages.
-        rollback ();
-        _out_pipe = NULL;
-        send_pipe_term_ack (_peer);
-        _state = term_ack_sent;
-    }
-    //  If there are pending messages still available, do nothing.
-    else if (_state == waiting_for_delimiter) {
-    }
-    //  We've already got delimiter, but not term command yet. We can ignore
-    //  the delimiter and ack synchronously terminate as if we were in
-    //  active state.
-    else if (_state == delimiter_received) {
-        send_pipe_term (_peer);
-        _state = term_req_sent1;
-    }
-    //  There are no other states.
-    else {
-        zmq_assert (false);
-    }
-
-    //  Stop outbound flow of messages.
-    _out_active = false;
-
-    if (_out_pipe) {
-        //  Drop any unfinished outbound messages.
-        rollback ();
-
-        //  Write the delimiter into the pipe. Note that watermarks are not
-        //  checked; thus the delimiter can be written even when the pipe is full.
-        msg_t msg;
-        msg.init_delimiter ();
-        _out_pipe->write (msg, false);
-        flush ();
-    }
-}
-
-bool zmq::pipe_t::is_delimiter (const msg_t &msg_)
-{
-    return msg_.is_delimiter ();
-}
-
-int zmq::pipe_t::compute_lwm (int hwm_)
-{
-    //  Compute the low water mark. Following point should be taken
-    //  into consideration:
-    //
-    //  1. LWM has to be less than HWM.
-    //  2. LWM cannot be set to very low value (such as zero) as after filling
-    //     the queue it would start to refill only after all the messages are
-    //     read from it and thus unnecessarily hold the progress back.
-    //  3. LWM cannot be set to very high value (such as HWM-1) as it would
-    //     result in lock-step filling of the queue - if a single message is
-    //     read from a full queue, writer thread is resumed to write exactly one
-    //     message to the queue and go back to sleep immediately. This would
-    //     result in low performance.
-    //
-    //  Given the 3. it would be good to keep HWM and LWM as far apart as
-    //  possible to reduce the thread switching overhead to almost zero.
-    //  Let's make LWM 1/2 of HWM.
-    const int result = (hwm_ + 1) / 2;
-
-    return result;
-}
-
-void zmq::pipe_t::process_delimiter ()
-{
-    zmq_assert (_state == active || _state == waiting_for_delimiter);
-
-    if (_state == active)
-        _state = delimiter_received;
-    else {
-        rollback ();
-        _out_pipe = NULL;
-        send_pipe_term_ack (_peer);
-        _state = term_ack_sent;
-    }
-}
-
-void zmq::pipe_t::hiccup ()
-{
-    //  If termination is already under way do nothing.
-    if (_state != active)
-        return;
-
-    //  We'll drop the pointer to the inpipe. From now on, the peer is
-    //  responsible for deallocating it.
-
-    //  Create new inpipe.
-    _in_pipe =
-      _conflate
-        ? static_cast<upipe_t *> (new (std::nothrow) ypipe_conflate_t<msg_t> ())
-        : new (std::nothrow) ypipe_t<msg_t, message_pipe_granularity> ();
-
-    alloc_assert (_in_pipe);
-    _in_active = true;
-
-    //  Notify the peer about the hiccup.
-    send_hiccup (_peer, _in_pipe);
-}
-
-void zmq::pipe_t::set_hwms (int inhwm_, int outhwm_)
-{
-    int in = inhwm_ + std::max (_in_hwm_boost, 0);
-    int out = outhwm_ + std::max (_out_hwm_boost, 0);
-
-    // if either send or recv side has hwm <= 0 it means infinite so we should set hwms infinite
-    if (inhwm_ <= 0 || _in_hwm_boost == 0)
-        in = 0;
-
-    if (outhwm_ <= 0 || _out_hwm_boost == 0)
-        out = 0;
-
-    _lwm = compute_lwm (in);
-    _hwm = out;
-}
-
-void zmq::pipe_t::set_hwms_boost (int inhwmboost_, int outhwmboost_)
-{
-    _in_hwm_boost = inhwmboost_;
-    _out_hwm_boost = outhwmboost_;
-}
-
-bool zmq::pipe_t::check_hwm () const
-{
-    const bool full =
-      _hwm > 0 && _msgs_written - _peers_msgs_read >= uint64_t (_hwm);
-    return !full;
-}
-
-void zmq::pipe_t::send_hwms_to_peer (int inhwm_, int outhwm_)
-{
-    send_pipe_hwm (_peer, inhwm_, outhwm_);
-}
-
-void zmq::pipe_t::set_endpoint_pair (zmq::endpoint_uri_pair_t endpoint_pair_)
-{
-    _endpoint_pair = ZMQ_MOVE (endpoint_pair_);
-}
-
-const zmq::endpoint_uri_pair_t &zmq::pipe_t::get_endpoint_pair () const
-{
-    return _endpoint_pair;
-}
-
-void zmq::pipe_t::send_stats_to_peer (own_t *socket_base_)
-{
-    endpoint_uri_pair_t *ep =
-      new (std::nothrow) endpoint_uri_pair_t (_endpoint_pair);
-    send_pipe_peer_stats (_peer, _msgs_written - _peers_msgs_read, socket_base_,
-                          ep);
-}
-
-void zmq::pipe_t::process_pipe_peer_stats (uint64_t queue_count_,
-                                           own_t *socket_base_,
-                                           endpoint_uri_pair_t *endpoint_pair_)
-{
-    send_pipe_stats_publish (socket_base_, queue_count_,
-                             _msgs_written - _peers_msgs_read, endpoint_pair_);
-}
-
-void zmq::pipe_t::send_disconnect_msg ()
-{
-    if (_disconnect_msg.size () > 0 && _out_pipe) {
-        // Rollback any incomplete message in the pipe, and push the disconnect message.
-        rollback ();
-
-        _out_pipe->write (_disconnect_msg, false);
-        flush ();
-        _disconnect_msg.init ();
-    }
-}
-
-void zmq::pipe_t::set_disconnect_msg (
-  const std::vector<unsigned char> &disconnect_)
-{
-    _disconnect_msg.close ();
-    const int rc =
-      _disconnect_msg.init_buffer (&disconnect_[0], disconnect_.size ());
-    errno_assert (rc == 0);
-}
-
-void zmq::pipe_t::send_hiccup_msg (const std::vector<unsigned char> &hiccup_)
-{
-    if (!hiccup_.empty () && _out_pipe) {
-        msg_t msg;
-        const int rc = msg.init_buffer (&hiccup_[0], hiccup_.size ());
-        errno_assert (rc == 0);
-
-        _out_pipe->write (msg, false);
-        flush ();
-    }
-}
diff --git a/libs/libzmq/src/pipe.hpp b/libs/libzmq/src/pipe.hpp
deleted file mode 100644
index f1cbcff..0000000
--- a/libs/libzmq/src/pipe.hpp
+++ /dev/null
@@ -1,276 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_PIPE_HPP_INCLUDED__
-#define __ZMQ_PIPE_HPP_INCLUDED__
-
-#include "ypipe_base.hpp"
-#include "config.hpp"
-#include "object.hpp"
-#include "stdint.hpp"
-#include "array.hpp"
-#include "blob.hpp"
-#include "options.hpp"
-#include "endpoint.hpp"
-#include "msg.hpp"
-
-namespace zmq
-{
-class pipe_t;
-
-//  Create a pipepair for bi-directional transfer of messages.
-//  First HWM is for messages passed from first pipe to the second pipe.
-//  Second HWM is for messages passed from second pipe to the first pipe.
-//  Delay specifies how the pipe behaves when the peer terminates. If true
-//  pipe receives all the pending messages before terminating, otherwise it
-//  terminates straight away.
-//  If conflate is true, only the most recently arrived message could be
-//  read (older messages are discarded)
-int pipepair (zmq::object_t *parents_[2],
-              zmq::pipe_t *pipes_[2],
-              const int hwms_[2],
-              const bool conflate_[2]);
-
-struct i_pipe_events
-{
-    virtual ~i_pipe_events () ZMQ_DEFAULT;
-
-    virtual void read_activated (zmq::pipe_t *pipe_) = 0;
-    virtual void write_activated (zmq::pipe_t *pipe_) = 0;
-    virtual void hiccuped (zmq::pipe_t *pipe_) = 0;
-    virtual void pipe_terminated (zmq::pipe_t *pipe_) = 0;
-};
-
-//  Note that pipe can be stored in three different arrays.
-//  The array of inbound pipes (1), the array of outbound pipes (2) and
-//  the generic array of pipes to be deallocated (3).
-
-class pipe_t ZMQ_FINAL : public object_t,
-                         public array_item_t<1>,
-                         public array_item_t<2>,
-                         public array_item_t<3>
-{
-    //  This allows pipepair to create pipe objects.
-    friend int pipepair (zmq::object_t *parents_[2],
-                         zmq::pipe_t *pipes_[2],
-                         const int hwms_[2],
-                         const bool conflate_[2]);
-
-  public:
-    //  Specifies the object to send events to.
-    void set_event_sink (i_pipe_events *sink_);
-
-    //  Pipe endpoint can store an routing ID to be used by its clients.
-    void set_server_socket_routing_id (uint32_t server_socket_routing_id_);
-    uint32_t get_server_socket_routing_id () const;
-
-    //  Pipe endpoint can store an opaque ID to be used by its clients.
-    void set_router_socket_routing_id (const blob_t &router_socket_routing_id_);
-    const blob_t &get_routing_id () const;
-
-    //  Returns true if there is at least one message to read in the pipe.
-    bool check_read ();
-
-    //  Reads a message to the underlying pipe.
-    bool read (msg_t *msg_);
-
-    //  Checks whether messages can be written to the pipe. If the pipe is
-    //  closed or if writing the message would cause high watermark the
-    //  function returns false.
-    bool check_write ();
-
-    //  Writes a message to the underlying pipe. Returns false if the
-    //  message does not pass check_write. If false, the message object
-    //  retains ownership of its message buffer.
-    bool write (const msg_t *msg_);
-
-    //  Remove unfinished parts of the outbound message from the pipe.
-    void rollback () const;
-
-    //  Flush the messages downstream.
-    void flush ();
-
-    //  Temporarily disconnects the inbound message stream and drops
-    //  all the messages on the fly. Causes 'hiccuped' event to be generated
-    //  in the peer.
-    void hiccup ();
-
-    //  Ensure the pipe won't block on receiving pipe_term.
-    void set_nodelay ();
-
-    //  Ask pipe to terminate. The termination will happen asynchronously
-    //  and user will be notified about actual deallocation by 'terminated'
-    //  event. If delay is true, the pending messages will be processed
-    //  before actual shutdown.
-    void terminate (bool delay_);
-
-    //  Set the high water marks.
-    void set_hwms (int inhwm_, int outhwm_);
-
-    //  Set the boost to high water marks, used by inproc sockets so total hwm are sum of connect and bind sockets watermarks
-    void set_hwms_boost (int inhwmboost_, int outhwmboost_);
-
-    // send command to peer for notify the change of hwm
-    void send_hwms_to_peer (int inhwm_, int outhwm_);
-
-    //  Returns true if HWM is not reached
-    bool check_hwm () const;
-
-    void set_endpoint_pair (endpoint_uri_pair_t endpoint_pair_);
-    const endpoint_uri_pair_t &get_endpoint_pair () const;
-
-    void send_stats_to_peer (own_t *socket_base_);
-
-    void send_disconnect_msg ();
-    void set_disconnect_msg (const std::vector<unsigned char> &disconnect_);
-
-    void send_hiccup_msg (const std::vector<unsigned char> &hiccup_);
-
-  private:
-    //  Type of the underlying lock-free pipe.
-    typedef ypipe_base_t<msg_t> upipe_t;
-
-    //  Command handlers.
-    void process_activate_read () ZMQ_OVERRIDE;
-    void process_activate_write (uint64_t msgs_read_) ZMQ_OVERRIDE;
-    void process_hiccup (void *pipe_) ZMQ_OVERRIDE;
-    void
-    process_pipe_peer_stats (uint64_t queue_count_,
-                             own_t *socket_base_,
-                             endpoint_uri_pair_t *endpoint_pair_) ZMQ_OVERRIDE;
-    void process_pipe_term () ZMQ_OVERRIDE;
-    void process_pipe_term_ack () ZMQ_OVERRIDE;
-    void process_pipe_hwm (int inhwm_, int outhwm_) ZMQ_OVERRIDE;
-
-    //  Handler for delimiter read from the pipe.
-    void process_delimiter ();
-
-    //  Constructor is private. Pipe can only be created using
-    //  pipepair function.
-    pipe_t (object_t *parent_,
-            upipe_t *inpipe_,
-            upipe_t *outpipe_,
-            int inhwm_,
-            int outhwm_,
-            bool conflate_);
-
-    //  Pipepair uses this function to let us know about
-    //  the peer pipe object.
-    void set_peer (pipe_t *peer_);
-
-    //  Destructor is private. Pipe objects destroy themselves.
-    ~pipe_t () ZMQ_OVERRIDE;
-
-    //  Underlying pipes for both directions.
-    upipe_t *_in_pipe;
-    upipe_t *_out_pipe;
-
-    //  Can the pipe be read from / written to?
-    bool _in_active;
-    bool _out_active;
-
-    //  High watermark for the outbound pipe.
-    int _hwm;
-
-    //  Low watermark for the inbound pipe.
-    int _lwm;
-
-    // boosts for high and low watermarks, used with inproc sockets so hwm are sum of send and recv hmws on each side of pipe
-    int _in_hwm_boost;
-    int _out_hwm_boost;
-
-    //  Number of messages read and written so far.
-    uint64_t _msgs_read;
-    uint64_t _msgs_written;
-
-    //  Last received peer's msgs_read. The actual number in the peer
-    //  can be higher at the moment.
-    uint64_t _peers_msgs_read;
-
-    //  The pipe object on the other side of the pipepair.
-    pipe_t *_peer;
-
-    //  Sink to send events to.
-    i_pipe_events *_sink;
-
-    //  States of the pipe endpoint:
-    //  active: common state before any termination begins,
-    //  delimiter_received: delimiter was read from pipe before
-    //      term command was received,
-    //  waiting_for_delimiter: term command was already received
-    //      from the peer but there are still pending messages to read,
-    //  term_ack_sent: all pending messages were already read and
-    //      all we are waiting for is ack from the peer,
-    //  term_req_sent1: 'terminate' was explicitly called by the user,
-    //  term_req_sent2: user called 'terminate' and then we've got
-    //      term command from the peer as well.
-    enum
-    {
-        active,
-        delimiter_received,
-        waiting_for_delimiter,
-        term_ack_sent,
-        term_req_sent1,
-        term_req_sent2
-    } _state;
-
-    //  If true, we receive all the pending inbound messages before
-    //  terminating. If false, we terminate immediately when the peer
-    //  asks us to.
-    bool _delay;
-
-    //  Routing id of the writer. Used uniquely by the reader side.
-    blob_t _router_socket_routing_id;
-
-    //  Routing id of the writer. Used uniquely by the reader side.
-    int _server_socket_routing_id;
-
-    //  Returns true if the message is delimiter; false otherwise.
-    static bool is_delimiter (const msg_t &msg_);
-
-    //  Computes appropriate low watermark from the given high watermark.
-    static int compute_lwm (int hwm_);
-
-    const bool _conflate;
-
-    // The endpoints of this pipe.
-    endpoint_uri_pair_t _endpoint_pair;
-
-    // Disconnect msg
-    msg_t _disconnect_msg;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (pipe_t)
-};
-
-void send_routing_id (pipe_t *pipe_, const options_t &options_);
-
-void send_hello_msg (pipe_t *pipe_, const options_t &options_);
-}
-
-#endif
diff --git a/libs/libzmq/src/plain_client.cpp b/libs/libzmq/src/plain_client.cpp
deleted file mode 100644
index 6ba56a8..0000000
--- a/libs/libzmq/src/plain_client.cpp
+++ /dev/null
@@ -1,223 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "macros.hpp"
-
-#include <string>
-#include <limits.h>
-
-#include "msg.hpp"
-#include "err.hpp"
-#include "plain_client.hpp"
-#include "session_base.hpp"
-#include "plain_common.hpp"
-
-zmq::plain_client_t::plain_client_t (session_base_t *const session_,
-                                     const options_t &options_) :
-    mechanism_base_t (session_, options_), _state (sending_hello)
-{
-}
-
-zmq::plain_client_t::~plain_client_t ()
-{
-}
-
-int zmq::plain_client_t::next_handshake_command (msg_t *msg_)
-{
-    int rc = 0;
-
-    switch (_state) {
-        case sending_hello:
-            produce_hello (msg_);
-            _state = waiting_for_welcome;
-            break;
-        case sending_initiate:
-            produce_initiate (msg_);
-            _state = waiting_for_ready;
-            break;
-        default:
-            errno = EAGAIN;
-            rc = -1;
-    }
-    return rc;
-}
-
-int zmq::plain_client_t::process_handshake_command (msg_t *msg_)
-{
-    const unsigned char *cmd_data =
-      static_cast<unsigned char *> (msg_->data ());
-    const size_t data_size = msg_->size ();
-
-    int rc = 0;
-    if (data_size >= welcome_prefix_len
-        && !memcmp (cmd_data, welcome_prefix, welcome_prefix_len))
-        rc = process_welcome (cmd_data, data_size);
-    else if (data_size >= ready_prefix_len
-             && !memcmp (cmd_data, ready_prefix, ready_prefix_len))
-        rc = process_ready (cmd_data, data_size);
-    else if (data_size >= error_prefix_len
-             && !memcmp (cmd_data, error_prefix, error_prefix_len))
-        rc = process_error (cmd_data, data_size);
-    else {
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (), ZMQ_PROTOCOL_ERROR_ZMTP_UNEXPECTED_COMMAND);
-        errno = EPROTO;
-        rc = -1;
-    }
-
-    if (rc == 0) {
-        rc = msg_->close ();
-        errno_assert (rc == 0);
-        rc = msg_->init ();
-        errno_assert (rc == 0);
-    }
-
-    return rc;
-}
-
-zmq::mechanism_t::status_t zmq::plain_client_t::status () const
-{
-    switch (_state) {
-        case ready:
-            return mechanism_t::ready;
-        case error_command_received:
-            return mechanism_t::error;
-        default:
-            return mechanism_t::handshaking;
-    }
-}
-
-void zmq::plain_client_t::produce_hello (msg_t *msg_) const
-{
-    const std::string username = options.plain_username;
-    zmq_assert (username.length () <= UCHAR_MAX);
-
-    const std::string password = options.plain_password;
-    zmq_assert (password.length () <= UCHAR_MAX);
-
-    const size_t command_size = hello_prefix_len + brief_len_size
-                                + username.length () + brief_len_size
-                                + password.length ();
-
-    const int rc = msg_->init_size (command_size);
-    errno_assert (rc == 0);
-
-    unsigned char *ptr = static_cast<unsigned char *> (msg_->data ());
-    memcpy (ptr, hello_prefix, hello_prefix_len);
-    ptr += hello_prefix_len;
-
-    *ptr++ = static_cast<unsigned char> (username.length ());
-    memcpy (ptr, username.c_str (), username.length ());
-    ptr += username.length ();
-
-    *ptr++ = static_cast<unsigned char> (password.length ());
-    memcpy (ptr, password.c_str (), password.length ());
-}
-
-int zmq::plain_client_t::process_welcome (const unsigned char *cmd_data_,
-                                          size_t data_size_)
-{
-    LIBZMQ_UNUSED (cmd_data_);
-
-    if (_state != waiting_for_welcome) {
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (), ZMQ_PROTOCOL_ERROR_ZMTP_UNEXPECTED_COMMAND);
-        errno = EPROTO;
-        return -1;
-    }
-    if (data_size_ != welcome_prefix_len) {
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (),
-          ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_WELCOME);
-        errno = EPROTO;
-        return -1;
-    }
-    _state = sending_initiate;
-    return 0;
-}
-
-void zmq::plain_client_t::produce_initiate (msg_t *msg_) const
-{
-    make_command_with_basic_properties (msg_, initiate_prefix,
-                                        initiate_prefix_len);
-}
-
-int zmq::plain_client_t::process_ready (const unsigned char *cmd_data_,
-                                        size_t data_size_)
-{
-    if (_state != waiting_for_ready) {
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (), ZMQ_PROTOCOL_ERROR_ZMTP_UNEXPECTED_COMMAND);
-        errno = EPROTO;
-        return -1;
-    }
-    const int rc = parse_metadata (cmd_data_ + ready_prefix_len,
-                                   data_size_ - ready_prefix_len);
-    if (rc == 0)
-        _state = ready;
-    else
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (), ZMQ_PROTOCOL_ERROR_ZMTP_INVALID_METADATA);
-
-    return rc;
-}
-
-int zmq::plain_client_t::process_error (const unsigned char *cmd_data_,
-                                        size_t data_size_)
-{
-    if (_state != waiting_for_welcome && _state != waiting_for_ready) {
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (), ZMQ_PROTOCOL_ERROR_ZMTP_UNEXPECTED_COMMAND);
-        errno = EPROTO;
-        return -1;
-    }
-    const size_t start_of_error_reason = error_prefix_len + brief_len_size;
-    if (data_size_ < start_of_error_reason) {
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (),
-          ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_ERROR);
-        errno = EPROTO;
-        return -1;
-    }
-    const size_t error_reason_len =
-      static_cast<size_t> (cmd_data_[error_prefix_len]);
-    if (error_reason_len > data_size_ - start_of_error_reason) {
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (),
-          ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_ERROR);
-        errno = EPROTO;
-        return -1;
-    }
-    const char *error_reason =
-      reinterpret_cast<const char *> (cmd_data_) + start_of_error_reason;
-    handle_error_reason (error_reason, error_reason_len);
-    _state = error_command_received;
-    return 0;
-}
diff --git a/libs/libzmq/src/plain_client.hpp b/libs/libzmq/src/plain_client.hpp
deleted file mode 100644
index 7b49d49..0000000
--- a/libs/libzmq/src/plain_client.hpp
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_PLAIN_CLIENT_HPP_INCLUDED__
-#define __ZMQ_PLAIN_CLIENT_HPP_INCLUDED__
-
-#include "mechanism_base.hpp"
-#include "options.hpp"
-
-namespace zmq
-{
-class msg_t;
-
-class plain_client_t ZMQ_FINAL : public mechanism_base_t
-{
-  public:
-    plain_client_t (session_base_t *session_, const options_t &options_);
-    ~plain_client_t ();
-
-    // mechanism implementation
-    int next_handshake_command (msg_t *msg_);
-    int process_handshake_command (msg_t *msg_);
-    status_t status () const;
-
-  private:
-    enum state_t
-    {
-        sending_hello,
-        waiting_for_welcome,
-        sending_initiate,
-        waiting_for_ready,
-        error_command_received,
-        ready
-    };
-
-    state_t _state;
-
-    void produce_hello (msg_t *msg_) const;
-    void produce_initiate (msg_t *msg_) const;
-
-    int process_welcome (const unsigned char *cmd_data_, size_t data_size_);
-    int process_ready (const unsigned char *cmd_data_, size_t data_size_);
-    int process_error (const unsigned char *cmd_data_, size_t data_size_);
-};
-}
-
-#endif
diff --git a/libs/libzmq/src/plain_common.hpp b/libs/libzmq/src/plain_common.hpp
deleted file mode 100644
index c97e184..0000000
--- a/libs/libzmq/src/plain_common.hpp
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_PLAIN_COMMON_HPP_INCLUDED__
-#define __ZMQ_PLAIN_COMMON_HPP_INCLUDED__
-
-namespace zmq
-{
-const char hello_prefix[] = "\x05HELLO";
-const size_t hello_prefix_len = sizeof (hello_prefix) - 1;
-
-const char welcome_prefix[] = "\x07WELCOME";
-const size_t welcome_prefix_len = sizeof (welcome_prefix) - 1;
-
-const char initiate_prefix[] = "\x08INITIATE";
-const size_t initiate_prefix_len = sizeof (initiate_prefix) - 1;
-
-const char ready_prefix[] = "\x05READY";
-const size_t ready_prefix_len = sizeof (ready_prefix) - 1;
-
-const char error_prefix[] = "\x05ERROR";
-const size_t error_prefix_len = sizeof (error_prefix) - 1;
-
-const size_t brief_len_size = sizeof (char);
-}
-
-#endif
diff --git a/libs/libzmq/src/plain_server.cpp b/libs/libzmq/src/plain_server.cpp
deleted file mode 100644
index 694c925..0000000
--- a/libs/libzmq/src/plain_server.cpp
+++ /dev/null
@@ -1,253 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-
-#include <string>
-
-#include "msg.hpp"
-#include "session_base.hpp"
-#include "err.hpp"
-#include "plain_server.hpp"
-#include "wire.hpp"
-#include "plain_common.hpp"
-
-zmq::plain_server_t::plain_server_t (session_base_t *session_,
-                                     const std::string &peer_address_,
-                                     const options_t &options_) :
-    mechanism_base_t (session_, options_),
-    zap_client_common_handshake_t (
-      session_, peer_address_, options_, sending_welcome)
-{
-    //  Note that there is no point to PLAIN if ZAP is not set up to handle the
-    //  username and password, so if ZAP is not configured it is considered a
-    //  failure.
-    //  Given this is a backward-incompatible change, it's behind a socket
-    //  option disabled by default.
-    if (options.zap_enforce_domain)
-        zmq_assert (zap_required ());
-}
-
-zmq::plain_server_t::~plain_server_t ()
-{
-}
-
-int zmq::plain_server_t::next_handshake_command (msg_t *msg_)
-{
-    int rc = 0;
-
-    switch (state) {
-        case sending_welcome:
-            produce_welcome (msg_);
-            state = waiting_for_initiate;
-            break;
-        case sending_ready:
-            produce_ready (msg_);
-            state = ready;
-            break;
-        case sending_error:
-            produce_error (msg_);
-            state = error_sent;
-            break;
-        default:
-            errno = EAGAIN;
-            rc = -1;
-    }
-    return rc;
-}
-
-int zmq::plain_server_t::process_handshake_command (msg_t *msg_)
-{
-    int rc = 0;
-
-    switch (state) {
-        case waiting_for_hello:
-            rc = process_hello (msg_);
-            break;
-        case waiting_for_initiate:
-            rc = process_initiate (msg_);
-            break;
-        default:
-            //  TODO see comment in curve_server_t::process_handshake_command
-            session->get_socket ()->event_handshake_failed_protocol (
-              session->get_endpoint (), ZMQ_PROTOCOL_ERROR_ZMTP_UNSPECIFIED);
-            errno = EPROTO;
-            rc = -1;
-            break;
-    }
-    if (rc == 0) {
-        rc = msg_->close ();
-        errno_assert (rc == 0);
-        rc = msg_->init ();
-        errno_assert (rc == 0);
-    }
-    return rc;
-}
-
-int zmq::plain_server_t::process_hello (msg_t *msg_)
-{
-    int rc = check_basic_command_structure (msg_);
-    if (rc == -1)
-        return -1;
-
-    const char *ptr = static_cast<char *> (msg_->data ());
-    size_t bytes_left = msg_->size ();
-
-    if (bytes_left < hello_prefix_len
-        || memcmp (ptr, hello_prefix, hello_prefix_len) != 0) {
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (), ZMQ_PROTOCOL_ERROR_ZMTP_UNEXPECTED_COMMAND);
-        errno = EPROTO;
-        return -1;
-    }
-    ptr += hello_prefix_len;
-    bytes_left -= hello_prefix_len;
-
-    if (bytes_left < 1) {
-        //  PLAIN I: invalid PLAIN client, did not send username
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (),
-          ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_HELLO);
-        errno = EPROTO;
-        return -1;
-    }
-    const uint8_t username_length = *ptr++;
-    bytes_left -= sizeof (username_length);
-
-    if (bytes_left < username_length) {
-        //  PLAIN I: invalid PLAIN client, sent malformed username
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (),
-          ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_HELLO);
-        errno = EPROTO;
-        return -1;
-    }
-    const std::string username = std::string (ptr, username_length);
-    ptr += username_length;
-    bytes_left -= username_length;
-    if (bytes_left < 1) {
-        //  PLAIN I: invalid PLAIN client, did not send password
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (),
-          ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_HELLO);
-        errno = EPROTO;
-        return -1;
-    }
-
-    const uint8_t password_length = *ptr++;
-    bytes_left -= sizeof (password_length);
-    if (bytes_left != password_length) {
-        //  PLAIN I: invalid PLAIN client, sent malformed password or
-        //  extraneous data
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (),
-          ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_HELLO);
-        errno = EPROTO;
-        return -1;
-    }
-
-    const std::string password = std::string (ptr, password_length);
-
-    //  Use ZAP protocol (RFC 27) to authenticate the user.
-    rc = session->zap_connect ();
-    if (rc != 0) {
-        session->get_socket ()->event_handshake_failed_no_detail (
-          session->get_endpoint (), EFAULT);
-        return -1;
-    }
-
-    send_zap_request (username, password);
-    state = waiting_for_zap_reply;
-
-    //  TODO actually, it is quite unlikely that we can read the ZAP
-    //  reply already, but removing this has some strange side-effect
-    //  (probably because the pipe's in_active flag is true until a read
-    //  is attempted)
-    return receive_and_process_zap_reply () == -1 ? -1 : 0;
-}
-
-void zmq::plain_server_t::produce_welcome (msg_t *msg_)
-{
-    const int rc = msg_->init_size (welcome_prefix_len);
-    errno_assert (rc == 0);
-    memcpy (msg_->data (), welcome_prefix, welcome_prefix_len);
-}
-
-int zmq::plain_server_t::process_initiate (msg_t *msg_)
-{
-    const unsigned char *ptr = static_cast<unsigned char *> (msg_->data ());
-    const size_t bytes_left = msg_->size ();
-
-    if (bytes_left < initiate_prefix_len
-        || memcmp (ptr, initiate_prefix, initiate_prefix_len) != 0) {
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (), ZMQ_PROTOCOL_ERROR_ZMTP_UNEXPECTED_COMMAND);
-        errno = EPROTO;
-        return -1;
-    }
-    const int rc = parse_metadata (ptr + initiate_prefix_len,
-                                   bytes_left - initiate_prefix_len);
-    if (rc == 0)
-        state = sending_ready;
-    return rc;
-}
-
-void zmq::plain_server_t::produce_ready (msg_t *msg_) const
-{
-    make_command_with_basic_properties (msg_, ready_prefix, ready_prefix_len);
-}
-
-void zmq::plain_server_t::produce_error (msg_t *msg_) const
-{
-    const char expected_status_code_len = 3;
-    zmq_assert (status_code.length ()
-                == static_cast<size_t> (expected_status_code_len));
-    const size_t status_code_len_size = sizeof (expected_status_code_len);
-    const int rc = msg_->init_size (error_prefix_len + status_code_len_size
-                                    + expected_status_code_len);
-    zmq_assert (rc == 0);
-    char *msg_data = static_cast<char *> (msg_->data ());
-    memcpy (msg_data, error_prefix, error_prefix_len);
-    msg_data[error_prefix_len] = expected_status_code_len;
-    memcpy (msg_data + error_prefix_len + status_code_len_size,
-            status_code.c_str (), status_code.length ());
-}
-
-void zmq::plain_server_t::send_zap_request (const std::string &username_,
-                                            const std::string &password_)
-{
-    const uint8_t *credentials[] = {
-      reinterpret_cast<const uint8_t *> (username_.c_str ()),
-      reinterpret_cast<const uint8_t *> (password_.c_str ())};
-    size_t credentials_sizes[] = {username_.size (), password_.size ()};
-    const char plain_mechanism_name[] = "PLAIN";
-    zap_client_t::send_zap_request (
-      plain_mechanism_name, sizeof (plain_mechanism_name) - 1, credentials,
-      credentials_sizes, sizeof (credentials) / sizeof (credentials[0]));
-}
diff --git a/libs/libzmq/src/plain_server.hpp b/libs/libzmq/src/plain_server.hpp
deleted file mode 100644
index 3e6e2d3..0000000
--- a/libs/libzmq/src/plain_server.hpp
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_PLAIN_SERVER_HPP_INCLUDED__
-#define __ZMQ_PLAIN_SERVER_HPP_INCLUDED__
-
-#include "options.hpp"
-#include "zap_client.hpp"
-
-namespace zmq
-{
-class msg_t;
-class session_base_t;
-
-class plain_server_t ZMQ_FINAL : public zap_client_common_handshake_t
-{
-  public:
-    plain_server_t (session_base_t *session_,
-                    const std::string &peer_address_,
-                    const options_t &options_);
-    ~plain_server_t ();
-
-    // mechanism implementation
-    int next_handshake_command (msg_t *msg_);
-    int process_handshake_command (msg_t *msg_);
-
-  private:
-    static void produce_welcome (msg_t *msg_);
-    void produce_ready (msg_t *msg_) const;
-    void produce_error (msg_t *msg_) const;
-
-    int process_hello (msg_t *msg_);
-    int process_initiate (msg_t *msg_);
-
-    void send_zap_request (const std::string &username_,
-                           const std::string &password_);
-};
-}
-
-#endif
diff --git a/libs/libzmq/src/poll.cpp b/libs/libzmq/src/poll.cpp
deleted file mode 100644
index 0a94625..0000000
--- a/libs/libzmq/src/poll.cpp
+++ /dev/null
@@ -1,203 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "poll.hpp"
-#if defined ZMQ_IOTHREAD_POLLER_USE_POLL
-
-#include <sys/types.h>
-#include <sys/time.h>
-#include <poll.h>
-#include <algorithm>
-
-#include "poll.hpp"
-#include "err.hpp"
-#include "config.hpp"
-#include "i_poll_events.hpp"
-
-zmq::poll_t::poll_t (const zmq::thread_ctx_t &ctx_) :
-    worker_poller_base_t (ctx_), retired (false)
-{
-}
-
-zmq::poll_t::~poll_t ()
-{
-    stop_worker ();
-}
-
-zmq::poll_t::handle_t zmq::poll_t::add_fd (fd_t fd_, i_poll_events *events_)
-{
-    check_thread ();
-    zmq_assert (fd_ != retired_fd);
-
-    //  If the file descriptor table is too small expand it.
-    fd_table_t::size_type sz = fd_table.size ();
-    if (sz <= (fd_table_t::size_type) fd_) {
-        fd_table.resize (fd_ + 1);
-        while (sz != (fd_table_t::size_type) (fd_ + 1)) {
-            fd_table[sz].index = retired_fd;
-            ++sz;
-        }
-    }
-
-    pollfd pfd = {fd_, 0, 0};
-    pollset.push_back (pfd);
-    zmq_assert (fd_table[fd_].index == retired_fd);
-
-    fd_table[fd_].index = pollset.size () - 1;
-    fd_table[fd_].events = events_;
-
-    //  Increase the load metric of the thread.
-    adjust_load (1);
-
-    return fd_;
-}
-
-void zmq::poll_t::rm_fd (handle_t handle_)
-{
-    check_thread ();
-    fd_t index = fd_table[handle_].index;
-    zmq_assert (index != retired_fd);
-
-    //  Mark the fd as unused.
-    pollset[index].fd = retired_fd;
-    fd_table[handle_].index = retired_fd;
-    retired = true;
-
-    //  Decrease the load metric of the thread.
-    adjust_load (-1);
-}
-
-void zmq::poll_t::set_pollin (handle_t handle_)
-{
-    check_thread ();
-    fd_t index = fd_table[handle_].index;
-    pollset[index].events |= POLLIN;
-}
-
-void zmq::poll_t::reset_pollin (handle_t handle_)
-{
-    check_thread ();
-    fd_t index = fd_table[handle_].index;
-    pollset[index].events &= ~((short) POLLIN);
-}
-
-void zmq::poll_t::set_pollout (handle_t handle_)
-{
-    check_thread ();
-    fd_t index = fd_table[handle_].index;
-    pollset[index].events |= POLLOUT;
-}
-
-void zmq::poll_t::reset_pollout (handle_t handle_)
-{
-    check_thread ();
-    fd_t index = fd_table[handle_].index;
-    pollset[index].events &= ~((short) POLLOUT);
-}
-
-void zmq::poll_t::stop ()
-{
-    check_thread ();
-    //  no-op... thread is stopped when no more fds or timers are registered
-}
-
-int zmq::poll_t::max_fds ()
-{
-    return -1;
-}
-
-void zmq::poll_t::loop ()
-{
-    while (true) {
-        //  Execute any due timers.
-        int timeout = (int) execute_timers ();
-
-        cleanup_retired ();
-
-        if (pollset.empty ()) {
-            zmq_assert (get_load () == 0);
-
-            if (timeout == 0)
-                break;
-
-            // TODO sleep for timeout
-            continue;
-        }
-
-        //  Wait for events.
-        int rc = poll (&pollset[0], static_cast<nfds_t> (pollset.size ()),
-                       timeout ? timeout : -1);
-        if (rc == -1) {
-            errno_assert (errno == EINTR);
-            continue;
-        }
-
-        //  If there are no events (i.e. it's a timeout) there's no point
-        //  in checking the pollset.
-        if (rc == 0)
-            continue;
-
-        for (pollset_t::size_type i = 0; i != pollset.size (); i++) {
-            zmq_assert (!(pollset[i].revents & POLLNVAL));
-            if (pollset[i].fd == retired_fd)
-                continue;
-            if (pollset[i].revents & (POLLERR | POLLHUP))
-                fd_table[pollset[i].fd].events->in_event ();
-            if (pollset[i].fd == retired_fd)
-                continue;
-            if (pollset[i].revents & POLLOUT)
-                fd_table[pollset[i].fd].events->out_event ();
-            if (pollset[i].fd == retired_fd)
-                continue;
-            if (pollset[i].revents & POLLIN)
-                fd_table[pollset[i].fd].events->in_event ();
-        }
-    }
-}
-
-void zmq::poll_t::cleanup_retired ()
-{
-    //  Clean up the pollset and update the fd_table accordingly.
-    if (retired) {
-        pollset_t::size_type i = 0;
-        while (i < pollset.size ()) {
-            if (pollset[i].fd == retired_fd)
-                pollset.erase (pollset.begin () + i);
-            else {
-                fd_table[pollset[i].fd].index = i;
-                i++;
-            }
-        }
-        retired = false;
-    }
-}
-
-
-#endif
diff --git a/libs/libzmq/src/poll.hpp b/libs/libzmq/src/poll.hpp
deleted file mode 100644
index 4c27442..0000000
--- a/libs/libzmq/src/poll.hpp
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_POLL_HPP_INCLUDED__
-#define __ZMQ_POLL_HPP_INCLUDED__
-
-//  poller.hpp decides which polling mechanism to use.
-#include "poller.hpp"
-#if defined ZMQ_IOTHREAD_POLLER_USE_POLL
-
-#if defined ZMQ_HAVE_WINDOWS
-#error                                                                         \
-  "poll is broken on Windows for the purpose of the I/O thread poller, use select instead; "\
-  "see https://github.com/zeromq/libzmq/issues/3107"
-#endif
-
-#include <poll.h>
-#include <stddef.h>
-#include <vector>
-
-#include "ctx.hpp"
-#include "fd.hpp"
-#include "thread.hpp"
-#include "poller_base.hpp"
-
-namespace zmq
-{
-struct i_poll_events;
-
-//  Implements socket polling mechanism using the POSIX.1-2001
-//  poll() system call.
-
-class poll_t ZMQ_FINAL : public worker_poller_base_t
-{
-  public:
-    typedef fd_t handle_t;
-
-    poll_t (const thread_ctx_t &ctx_);
-    ~poll_t ();
-
-    //  "poller" concept.
-    //  These methods may only be called from an event callback; add_fd may also be called before start.
-    handle_t add_fd (fd_t fd_, zmq::i_poll_events *events_);
-    void rm_fd (handle_t handle_);
-    void set_pollin (handle_t handle_);
-    void reset_pollin (handle_t handle_);
-    void set_pollout (handle_t handle_);
-    void reset_pollout (handle_t handle_);
-    void stop ();
-
-    static int max_fds ();
-
-  private:
-    //  Main event loop.
-    void loop () ZMQ_FINAL;
-
-    void cleanup_retired ();
-
-    struct fd_entry_t
-    {
-        fd_t index;
-        zmq::i_poll_events *events;
-    };
-
-    //  This table stores data for registered descriptors.
-    typedef std::vector<fd_entry_t> fd_table_t;
-    fd_table_t fd_table;
-
-    //  Pollset to pass to the poll function.
-    typedef std::vector<pollfd> pollset_t;
-    pollset_t pollset;
-
-    //  If true, there's at least one retired event source.
-    bool retired;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (poll_t)
-};
-
-typedef poll_t poller_t;
-}
-
-#endif
-
-#endif
diff --git a/libs/libzmq/src/poller.hpp b/libs/libzmq/src/poller.hpp
deleted file mode 100644
index ba9fbb1..0000000
--- a/libs/libzmq/src/poller.hpp
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_POLLER_HPP_INCLUDED__
-#define __ZMQ_POLLER_HPP_INCLUDED__
-
-#if defined ZMQ_IOTHREAD_POLLER_USE_KQUEUE                                     \
-    + defined ZMQ_IOTHREAD_POLLER_USE_EPOLL                                    \
-    + defined ZMQ_IOTHREAD_POLLER_USE_DEVPOLL                                  \
-    + defined ZMQ_IOTHREAD_POLLER_USE_POLLSET                                  \
-    + defined ZMQ_IOTHREAD_POLLER_POLL                                         \
-    + defined ZMQ_IOTHREAD_POLLER_USE_SELECT                                   \
-  > 1
-#error More than one of the ZMQ_IOTHREAD_POLLER_USE_* macros defined
-#endif
-
-#if defined ZMQ_IOTHREAD_POLLER_USE_KQUEUE
-#include "kqueue.hpp"
-#elif defined ZMQ_IOTHREAD_POLLER_USE_EPOLL
-#include "epoll.hpp"
-#elif defined ZMQ_IOTHREAD_POLLER_USE_DEVPOLL
-#include "devpoll.hpp"
-#elif defined ZMQ_IOTHREAD_POLLER_USE_POLLSET
-#include "pollset.hpp"
-#elif defined ZMQ_IOTHREAD_POLLER_USE_POLL
-#include "poll.hpp"
-#elif defined ZMQ_IOTHREAD_POLLER_USE_SELECT
-#include "select.hpp"
-#elif defined ZMQ_HAVE_GNU
-#define ZMQ_IOTHREAD_POLLER_USE_POLL
-#include "poll.hpp"
-#else
-#error None of the ZMQ_IOTHREAD_POLLER_USE_* macros defined
-#endif
-
-#if (defined ZMQ_POLL_BASED_ON_SELECT + defined ZMQ_POLL_BASED_ON_POLL) > 1
-#error More than one of the ZMQ_POLL_BASED_ON_* macros defined
-#elif (defined ZMQ_POLL_BASED_ON_SELECT + defined ZMQ_POLL_BASED_ON_POLL) == 0
-#error None of the ZMQ_POLL_BASED_ON_* macros defined
-#endif
-
-#endif
diff --git a/libs/libzmq/src/poller_base.cpp b/libs/libzmq/src/poller_base.cpp
deleted file mode 100644
index 78db28f..0000000
--- a/libs/libzmq/src/poller_base.cpp
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "poller_base.hpp"
-#include "i_poll_events.hpp"
-#include "err.hpp"
-
-zmq::poller_base_t::~poller_base_t ()
-{
-    //  Make sure there is no more load on the shutdown.
-    zmq_assert (get_load () == 0);
-}
-
-int zmq::poller_base_t::get_load () const
-{
-    return _load.get ();
-}
-
-void zmq::poller_base_t::adjust_load (int amount_)
-{
-    if (amount_ > 0)
-        _load.add (amount_);
-    else if (amount_ < 0)
-        _load.sub (-amount_);
-}
-
-void zmq::poller_base_t::add_timer (int timeout_, i_poll_events *sink_, int id_)
-{
-    uint64_t expiration = _clock.now_ms () + timeout_;
-    timer_info_t info = {sink_, id_};
-    _timers.insert (timers_t::value_type (expiration, info));
-}
-
-void zmq::poller_base_t::cancel_timer (i_poll_events *sink_, int id_)
-{
-    //  Complexity of this operation is O(n). We assume it is rarely used.
-    for (timers_t::iterator it = _timers.begin (), end = _timers.end ();
-         it != end; ++it)
-        if (it->second.sink == sink_ && it->second.id == id_) {
-            _timers.erase (it);
-            return;
-        }
-
-    //  We should generally never get here. Calling 'cancel_timer ()' on
-    //  an already expired or canceled timer (or even worse - on a timer which
-    //  never existed, supplying bad sink_ and/or id_ values) does not make any
-    //  sense.
-    //  But in some edge cases this might happen. As described in issue #3645
-    //  `timer_event ()` call from `execute_timers ()` might call `cancel_timer ()`
-    //  on already canceled (deleted) timer.
-    //  As soon as that is resolved an 'assert (false)' should be put here.
-}
-
-uint64_t zmq::poller_base_t::execute_timers ()
-{
-    //  Fast track.
-    if (_timers.empty ())
-        return 0;
-
-    //  Get the current time.
-    const uint64_t current = _clock.now_ms ();
-
-    //  Execute the timers that are already due.
-    uint64_t res = 0;
-    timer_info_t timer_temp;
-    timers_t::iterator it;
-
-    do {
-        it = _timers.begin ();
-
-        //  If we have to wait to execute the item, same will be true for
-        //  all the following items because multimap is sorted. Thus we can
-        //  stop checking the subsequent timers.
-        if (it->first > current) {
-            res = it->first - current;
-            break;
-        }
-
-        //  Save and remove the timer because timer_event() call might delete
-        //  exactly this timer and then the iterator will be invalid.
-        timer_temp = it->second;
-        _timers.erase (it);
-
-        //  Trigger the timer.
-        timer_temp.sink->timer_event (timer_temp.id);
-
-    } while (!_timers.empty ());
-
-    //  Return the time to wait for the next timer (at least 1ms), or 0, if
-    //  there are no more timers.
-    return res;
-}
-
-zmq::worker_poller_base_t::worker_poller_base_t (const thread_ctx_t &ctx_) :
-    _ctx (ctx_)
-{
-}
-
-void zmq::worker_poller_base_t::stop_worker ()
-{
-    _worker.stop ();
-}
-
-void zmq::worker_poller_base_t::start (const char *name_)
-{
-    zmq_assert (get_load () > 0);
-    _ctx.start_thread (_worker, worker_routine, this, name_);
-}
-
-void zmq::worker_poller_base_t::check_thread () const
-{
-#ifndef NDEBUG
-    zmq_assert (!_worker.get_started () || _worker.is_current_thread ());
-#endif
-}
-
-void zmq::worker_poller_base_t::worker_routine (void *arg_)
-{
-    (static_cast<worker_poller_base_t *> (arg_))->loop ();
-}
diff --git a/libs/libzmq/src/poller_base.hpp b/libs/libzmq/src/poller_base.hpp
deleted file mode 100644
index b39f2a4..0000000
--- a/libs/libzmq/src/poller_base.hpp
+++ /dev/null
@@ -1,195 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_POLLER_BASE_HPP_INCLUDED__
-#define __ZMQ_POLLER_BASE_HPP_INCLUDED__
-
-#include <map>
-
-#include "clock.hpp"
-#include "atomic_counter.hpp"
-#include "ctx.hpp"
-
-namespace zmq
-{
-struct i_poll_events;
-
-// A build of libzmq must provide an implementation of the poller_t concept. By
-// convention, this is done via a typedef.
-//
-// At the time of writing, the following implementations of the poller_t
-// concept exist: zmq::devpoll_t, zmq::epoll_t, zmq::kqueue_t, zmq::poll_t,
-// zmq::pollset_t, zmq::select_t
-//
-// An implementation of the poller_t concept must provide the following public
-// methods:
-//   Returns load of the poller.
-// int get_load() const;
-//
-//   Add a timeout to expire in timeout_ milliseconds. After the
-//   expiration, timer_event on sink_ object will be called with
-//   argument set to id_.
-// void add_timer(int timeout_, zmq::i_poll_events *sink_, int id_);
-//
-//   Cancel the timer created by sink_ object with ID equal to id_.
-// void cancel_timer(zmq::i_poll_events *sink_, int id_);
-//
-//   Adds a fd to the poller. Initially, no events are activated. These must
-//   be activated by the set_* methods using the returned handle_.
-// handle_t add_fd(fd_t fd_, zmq::i_poll_events *events_);
-//
-//   Deactivates any events that may be active for the given handle_, and
-//   removes the fd associated with the given handle_.
-// void rm_fd(handle_t handle_);
-//
-//   The set_* and reset_* methods activate resp. deactivate polling for
-//   input/output readiness on the respective handle_, such that the
-//   in_event/out_event methods on the associated zmq::i_poll_events object
-//   will be called.
-//   Note: while handle_t and fd_t may be the same type, and may even have the
-//   same values for some implementation, this may not be assumed in general.
-//   The methods may only be called with the handle returned by add_fd.
-// void set_pollin(handle_t handle_);
-// void reset_pollin(handle_t handle_);
-// void set_pollout(handle_t handle_);//
-// void reset_pollout(handle_t handle_);
-//
-//   Starts operation of the poller. See below for details.
-// void start();
-//
-//   Request termination of the poller.
-//   TODO: might be removed in the future, as it has no effect.
-// void stop();
-//
-//   Returns the maximum number of fds that can be added to an instance of the
-//   poller at the same time, or -1 if there is no such fixed limit.
-// static int max_fds();
-//
-// Most of the methods may only be called from a zmq::i_poll_events callback
-// function when invoked by the poller (and, therefore, typically from the
-// poller's worker thread), with the following exceptions:
-// - get_load may be called from outside
-// - add_fd and add_timer may be called from outside before start
-// - start may be called from outside once
-//
-// After a poller is started, it waits for the registered events (input/output
-// readiness, timeout) to happen, and calls the respective functions on the
-// zmq::i_poll_events object. It terminates when no further registrations (fds
-// or timers) exist.
-//
-// Before start, add_fd must have been called at least once. Behavior may be
-// undefined otherwise.
-//
-// If the poller is implemented by a single worker thread (the
-// worker_poller_base_t base  class may be used to implement such a poller),
-// no synchronization is required for the data structures modified by
-// add_fd, rm_fd, add_timer, cancel_timer, (re)set_poll(in|out). However,
-// reentrancy must be considered, e.g. when one of the functions modifies
-// a container that is being iterated by the poller.
-
-
-// A class that can be used as abase class for implementations of the poller
-// concept.
-//
-// For documentation of the public methods, see the description of the poller_t
-// concept.
-class poller_base_t
-{
-  public:
-    poller_base_t () ZMQ_DEFAULT;
-    virtual ~poller_base_t ();
-
-    // Methods from the poller concept.
-    int get_load () const;
-    void add_timer (int timeout_, zmq::i_poll_events *sink_, int id_);
-    void cancel_timer (zmq::i_poll_events *sink_, int id_);
-
-  protected:
-    //  Called by individual poller implementations to manage the load.
-    void adjust_load (int amount_);
-
-    //  Executes any timers that are due. Returns number of milliseconds
-    //  to wait to match the next timer or 0 meaning "no timers".
-    uint64_t execute_timers ();
-
-  private:
-    //  Clock instance private to this I/O thread.
-    clock_t _clock;
-
-    //  List of active timers.
-    struct timer_info_t
-    {
-        zmq::i_poll_events *sink;
-        int id;
-    };
-    typedef std::multimap<uint64_t, timer_info_t> timers_t;
-    timers_t _timers;
-
-    //  Load of the poller. Currently the number of file descriptors
-    //  registered.
-    atomic_counter_t _load;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (poller_base_t)
-};
-
-//  Base class for a poller with a single worker thread.
-class worker_poller_base_t : public poller_base_t
-{
-  public:
-    worker_poller_base_t (const thread_ctx_t &ctx_);
-
-    // Methods from the poller concept.
-    void start (const char *name = NULL);
-
-  protected:
-    //  Checks whether the currently executing thread is the worker thread
-    //  via an assertion.
-    //  Should be called by the add_fd, removed_fd, set_*, reset_* functions
-    //  to ensure correct usage.
-    void check_thread () const;
-
-    //  Stops the worker thread. Should be called from the destructor of the
-    //  leaf class.
-    void stop_worker ();
-
-  private:
-    //  Main worker thread routine.
-    static void worker_routine (void *arg_);
-
-    virtual void loop () = 0;
-
-    // Reference to ZMQ context.
-    const thread_ctx_t &_ctx;
-
-    //  Handle of the physical thread doing the I/O work.
-    thread_t _worker;
-};
-}
-
-#endif
diff --git a/libs/libzmq/src/polling_util.cpp b/libs/libzmq/src/polling_util.cpp
deleted file mode 100644
index c8e42eb..0000000
--- a/libs/libzmq/src/polling_util.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-    Copyright (c) 2007-2018 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "polling_util.hpp"
-
-#if defined ZMQ_POLL_BASED_ON_POLL
-#include <limits.h>
-#include <algorithm>
-
-zmq::timeout_t zmq::compute_timeout (const bool first_pass_,
-                                     const long timeout_,
-                                     const uint64_t now_,
-                                     const uint64_t end_)
-{
-    if (first_pass_)
-        return 0;
-
-    if (timeout_ < 0)
-        return -1;
-
-    return static_cast<zmq::timeout_t> (
-      std::min<uint64_t> (end_ - now_, INT_MAX));
-}
-#endif
diff --git a/libs/libzmq/src/polling_util.hpp b/libs/libzmq/src/polling_util.hpp
deleted file mode 100644
index 3794ac9..0000000
--- a/libs/libzmq/src/polling_util.hpp
+++ /dev/null
@@ -1,190 +0,0 @@
-/*
-    Copyright (c) 2007-2018 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_SOCKET_POLLING_UTIL_HPP_INCLUDED__
-#define __ZMQ_SOCKET_POLLING_UTIL_HPP_INCLUDED__
-
-#include <stdlib.h>
-#include <vector>
-
-#if defined ZMQ_HAVE_WINDOWS
-#include <winsock.h>
-#else
-#include <sys/select.h>
-#endif
-
-#include "macros.hpp"
-#include "stdint.hpp"
-#include "platform.hpp"
-#include "err.hpp"
-
-namespace zmq
-{
-template <typename T, size_t S> class fast_vector_t
-{
-  public:
-    explicit fast_vector_t (const size_t nitems_)
-    {
-        if (nitems_ > S) {
-            _buf = new (std::nothrow) T[nitems_];
-            //  TODO since this function is called by a client, we could return errno == ENOMEM here
-            alloc_assert (_buf);
-        } else {
-            _buf = _static_buf;
-        }
-    }
-
-    T &operator[] (const size_t i) { return _buf[i]; }
-
-    ~fast_vector_t ()
-    {
-        if (_buf != _static_buf)
-            delete[] _buf;
-    }
-
-  private:
-    T _static_buf[S];
-    T *_buf;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (fast_vector_t)
-};
-
-template <typename T, size_t S> class resizable_fast_vector_t
-{
-  public:
-    resizable_fast_vector_t () : _dynamic_buf (NULL) {}
-
-    void resize (const size_t nitems_)
-    {
-        if (_dynamic_buf) {
-            _dynamic_buf->resize (nitems_);
-        } else if (nitems_ > S) {
-            _dynamic_buf = new (std::nothrow) std::vector<T> (nitems_);
-            //  TODO since this function is called by a client, we could return errno == ENOMEM here
-            alloc_assert (_dynamic_buf);
-            memcpy (&(*_dynamic_buf)[0], _static_buf, sizeof _static_buf);
-        }
-    }
-
-    T *get_buf ()
-    {
-        // e.g. MSVC 2008 does not have std::vector::data, so we use &...[0]
-        return _dynamic_buf ? &(*_dynamic_buf)[0] : _static_buf;
-    }
-
-    T &operator[] (const size_t i) { return get_buf ()[i]; }
-
-    ~resizable_fast_vector_t () { delete _dynamic_buf; }
-
-  private:
-    T _static_buf[S];
-    std::vector<T> *_dynamic_buf;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (resizable_fast_vector_t)
-};
-
-#if defined ZMQ_POLL_BASED_ON_POLL
-typedef int timeout_t;
-
-timeout_t
-compute_timeout (bool first_pass_, long timeout_, uint64_t now_, uint64_t end_);
-#endif
-#if (!defined ZMQ_POLL_BASED_ON_POLL && defined ZMQ_POLL_BASED_ON_SELECT)      \
-  || defined ZMQ_HAVE_PPOLL
-#if defined ZMQ_HAVE_WINDOWS
-inline size_t valid_pollset_bytes (const fd_set &pollset_)
-{
-    // On Windows we don't need to copy the whole fd_set.
-    // SOCKETS are continuous from the beginning of fd_array in fd_set.
-    // We just need to copy fd_count elements of fd_array.
-    // We gain huge memcpy() improvement if number of used SOCKETs is much lower than FD_SETSIZE.
-    return reinterpret_cast<const char *> (
-             &pollset_.fd_array[pollset_.fd_count])
-           - reinterpret_cast<const char *> (&pollset_);
-}
-#else
-inline size_t valid_pollset_bytes (const fd_set & /*pollset_*/)
-{
-    return sizeof (fd_set);
-}
-#endif
-
-
-#if defined ZMQ_HAVE_WINDOWS
-// struct fd_set {
-//  u_int   fd_count;
-//  SOCKET  fd_array[1];
-// };
-// NOTE: offsetof(fd_set, fd_array)==sizeof(SOCKET) on both x86 and x64
-//       due to alignment bytes for the latter.
-class optimized_fd_set_t
-{
-  public:
-    explicit optimized_fd_set_t (size_t nevents_) : _fd_set (1 + nevents_) {}
-
-    fd_set *get () { return reinterpret_cast<fd_set *> (&_fd_set[0]); }
-
-  private:
-    fast_vector_t<SOCKET, 1 + ZMQ_POLLITEMS_DFLT> _fd_set;
-};
-
-class resizable_optimized_fd_set_t
-{
-  public:
-    void resize (size_t nevents_) { _fd_set.resize (1 + nevents_); }
-
-    fd_set *get () { return reinterpret_cast<fd_set *> (&_fd_set[0]); }
-
-  private:
-    resizable_fast_vector_t<SOCKET, 1 + ZMQ_POLLITEMS_DFLT> _fd_set;
-};
-#else
-class optimized_fd_set_t
-{
-  public:
-    explicit optimized_fd_set_t (size_t /*nevents_*/) {}
-
-    fd_set *get () { return &_fd_set; }
-
-  private:
-    fd_set _fd_set;
-};
-
-class resizable_optimized_fd_set_t : public optimized_fd_set_t
-{
-  public:
-    resizable_optimized_fd_set_t () : optimized_fd_set_t (0) {}
-
-    void resize (size_t /*nevents_*/) {}
-};
-#endif
-#endif
-}
-
-#endif
diff --git a/libs/libzmq/src/pollset.cpp b/libs/libzmq/src/pollset.cpp
deleted file mode 100644
index 35baf83..0000000
--- a/libs/libzmq/src/pollset.cpp
+++ /dev/null
@@ -1,253 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "pollset.hpp"
-#if defined ZMQ_IOTHREAD_POLLER_USE_POLLSET
-
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <algorithm>
-#include <new>
-
-#include "macros.hpp"
-#include "err.hpp"
-#include "config.hpp"
-#include "i_poll_events.hpp"
-
-zmq::pollset_t::pollset_t (const zmq::thread_ctx_t &ctx_) :
-    ctx (ctx_), stopping (false)
-{
-    pollset_fd = pollset_create (-1);
-    errno_assert (pollset_fd != -1);
-}
-
-zmq::pollset_t::~pollset_t ()
-{
-    //  Wait till the worker thread exits.
-    worker.stop ();
-
-    pollset_destroy (pollset_fd);
-    for (retired_t::iterator it = retired.begin (); it != retired.end (); ++it)
-        LIBZMQ_DELETE (*it);
-}
-
-zmq::pollset_t::handle_t zmq::pollset_t::add_fd (fd_t fd_,
-                                                 i_poll_events *events_)
-{
-    poll_entry_t *pe = new (std::nothrow) poll_entry_t;
-    alloc_assert (pe);
-
-    pe->fd = fd_;
-    pe->flag_pollin = false;
-    pe->flag_pollout = false;
-    pe->events = events_;
-
-    struct poll_ctl pc;
-    pc.fd = fd_;
-    pc.cmd = PS_ADD;
-    pc.events = 0;
-
-    int rc = pollset_ctl (pollset_fd, &pc, 1);
-    errno_assert (rc != -1);
-
-    //  Increase the load metric of the thread.
-    adjust_load (1);
-
-    if (fd_ >= fd_table.size ()) {
-        fd_table.resize (fd_ + 1, NULL);
-    }
-    fd_table[fd_] = pe;
-    return pe;
-}
-
-void zmq::pollset_t::rm_fd (handle_t handle_)
-{
-    poll_entry_t *pe = (poll_entry_t *) handle_;
-
-    struct poll_ctl pc;
-    pc.fd = pe->fd;
-    pc.cmd = PS_DELETE;
-    pc.events = 0;
-    pollset_ctl (pollset_fd, &pc, 1);
-
-    fd_table[pe->fd] = NULL;
-
-    pe->fd = retired_fd;
-    retired.push_back (pe);
-
-    //  Decrease the load metric of the thread.
-    adjust_load (-1);
-}
-
-void zmq::pollset_t::set_pollin (handle_t handle_)
-{
-    poll_entry_t *pe = (poll_entry_t *) handle_;
-    if (likely (!pe->flag_pollin)) {
-        struct poll_ctl pc;
-        pc.fd = pe->fd;
-        pc.cmd = PS_MOD;
-        pc.events = POLLIN;
-
-        const int rc = pollset_ctl (pollset_fd, &pc, 1);
-        errno_assert (rc != -1);
-
-        pe->flag_pollin = true;
-    }
-}
-
-void zmq::pollset_t::reset_pollin (handle_t handle_)
-{
-    poll_entry_t *pe = (poll_entry_t *) handle_;
-    if (unlikely (!pe->flag_pollin)) {
-        return;
-    }
-
-    struct poll_ctl pc;
-    pc.fd = pe->fd;
-    pc.events = 0;
-
-    pc.cmd = PS_DELETE;
-    int rc = pollset_ctl (pollset_fd, &pc, 1);
-
-    if (pe->flag_pollout) {
-        pc.events = POLLOUT;
-        pc.cmd = PS_MOD;
-        rc = pollset_ctl (pollset_fd, &pc, 1);
-        errno_assert (rc != -1);
-    }
-
-    pe->flag_pollin = false;
-}
-
-void zmq::pollset_t::set_pollout (handle_t handle_)
-{
-    poll_entry_t *pe = (poll_entry_t *) handle_;
-    if (likely (!pe->flag_pollout)) {
-        struct poll_ctl pc;
-        pc.fd = pe->fd;
-        pc.cmd = PS_MOD;
-        pc.events = POLLOUT;
-
-        const int rc = pollset_ctl (pollset_fd, &pc, 1);
-        errno_assert (rc != -1);
-
-        pe->flag_pollout = true;
-    }
-}
-
-void zmq::pollset_t::reset_pollout (handle_t handle_)
-{
-    poll_entry_t *pe = (poll_entry_t *) handle_;
-    if (unlikely (!pe->flag_pollout)) {
-        return;
-    }
-
-    struct poll_ctl pc;
-    pc.fd = pe->fd;
-    pc.events = 0;
-
-    pc.cmd = PS_DELETE;
-    int rc = pollset_ctl (pollset_fd, &pc, 1);
-    errno_assert (rc != -1);
-
-    if (pe->flag_pollin) {
-        pc.cmd = PS_MOD;
-        pc.events = POLLIN;
-        rc = pollset_ctl (pollset_fd, &pc, 1);
-        errno_assert (rc != -1);
-    }
-    pe->flag_pollout = false;
-}
-
-void zmq::pollset_t::start ()
-{
-    ctx.start_thread (worker, worker_routine, this);
-}
-
-void zmq::pollset_t::stop ()
-{
-    stopping = true;
-}
-
-int zmq::pollset_t::max_fds ()
-{
-    return -1;
-}
-
-void zmq::pollset_t::loop ()
-{
-    struct pollfd polldata_array[max_io_events];
-
-    while (!stopping) {
-        //  Execute any due timers.
-        int timeout = (int) execute_timers ();
-
-        //  Wait for events.
-        int n = pollset_poll (pollset_fd, polldata_array, max_io_events,
-                              timeout ? timeout : -1);
-        if (n == -1) {
-            errno_assert (errno == EINTR);
-            continue;
-        }
-
-        for (int i = 0; i < n; i++) {
-            poll_entry_t *pe = fd_table[polldata_array[i].fd];
-            if (!pe)
-                continue;
-
-            if (pe->fd == retired_fd)
-                continue;
-            if (polldata_array[i].revents & (POLLERR | POLLHUP))
-                pe->events->in_event ();
-            if (pe->fd == retired_fd)
-                continue;
-            if (polldata_array[i].revents & POLLOUT)
-                pe->events->out_event ();
-            if (pe->fd == retired_fd)
-                continue;
-            if (polldata_array[i].revents & POLLIN)
-                pe->events->in_event ();
-        }
-
-        //  Destroy retired event sources.
-        for (retired_t::iterator it = retired.begin (); it != retired.end ();
-             ++it)
-            LIBZMQ_DELETE (*it);
-        retired.clear ();
-    }
-}
-
-void zmq::pollset_t::worker_routine (void *arg_)
-{
-    ((pollset_t *) arg_)->loop ();
-}
-
-#endif
diff --git a/libs/libzmq/src/pollset.hpp b/libs/libzmq/src/pollset.hpp
deleted file mode 100644
index 8286bed..0000000
--- a/libs/libzmq/src/pollset.hpp
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_POLLSET_HPP_INCLUDED__
-#define __ZMQ_POLLSET_HPP_INCLUDED__
-
-//  poller.hpp decides which polling mechanism to use.
-#include "poller.hpp"
-#if defined ZMQ_IOTHREAD_POLLER_USE_POLLSET
-
-#include <sys/poll.h>
-#include <sys/pollset.h>
-#include <vector>
-
-#include "ctx.hpp"
-#include "fd.hpp"
-#include "thread.hpp"
-#include "poller_base.hpp"
-
-namespace zmq
-{
-struct i_poll_events;
-
-//  This class implements socket polling mechanism using the AIX-specific
-//  pollset mechanism.
-
-class pollset_t ZMQ_FINAL : public poller_base_t
-{
-  public:
-    typedef void *handle_t;
-
-    pollset_t (const thread_ctx_t &ctx_);
-    ~pollset_t () ZMQ_FINAL;
-
-    //  "poller" concept.
-    handle_t add_fd (fd_t fd_, zmq::i_poll_events *events_);
-    void rm_fd (handle_t handle_);
-    void set_pollin (handle_t handle_);
-    void reset_pollin (handle_t handle_);
-    void set_pollout (handle_t handle_);
-    void reset_pollout (handle_t handle_);
-    void start ();
-    void stop ();
-
-    static int max_fds ();
-
-  private:
-    //  Main worker thread routine.
-    static void worker_routine (void *arg_);
-
-    //  Main event loop.
-    void loop () ZMQ_FINAL;
-
-    // Reference to ZMQ context.
-    const thread_ctx_t &ctx;
-
-    //  Main pollset file descriptor
-    ::pollset_t pollset_fd;
-
-    struct poll_entry_t
-    {
-        fd_t fd;
-        bool flag_pollin;
-        bool flag_pollout;
-        zmq::i_poll_events *events;
-    };
-
-    //  List of retired event sources.
-    typedef std::vector<poll_entry_t *> retired_t;
-    retired_t retired;
-
-    //  This table stores data for registered descriptors.
-    typedef std::vector<poll_entry_t *> fd_table_t;
-    fd_table_t fd_table;
-
-    //  If true, thread is in the process of shutting down.
-    bool stopping;
-
-    //  Handle of the physical thread doing the I/O work.
-    thread_t worker;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (pollset_t)
-};
-
-typedef pollset_t poller_t;
-}
-
-#endif
-
-#endif
diff --git a/libs/libzmq/src/precompiled.cpp b/libs/libzmq/src/precompiled.cpp
deleted file mode 100644
index acf58f7..0000000
--- a/libs/libzmq/src/precompiled.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
diff --git a/libs/libzmq/src/precompiled.hpp b/libs/libzmq/src/precompiled.hpp
deleted file mode 100644
index d9cb325..0000000
--- a/libs/libzmq/src/precompiled.hpp
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_PRECOMPILED_HPP_INCLUDED__
-#define __ZMQ_PRECOMPILED_HPP_INCLUDED__
-
-//  On AIX platform, poll.h has to be included first to get consistent
-//  definition of pollfd structure (AIX uses 'reqevents' and 'retnevents'
-//  instead of 'events' and 'revents' and defines macros to map from POSIX-y
-//  names to AIX-specific names).
-//  zmq.h must be included *after* poll.h for AIX to build properly.
-//  precompiled.hpp includes include/zmq.h
-#if defined ZMQ_POLL_BASED_ON_POLL && defined ZMQ_HAVE_AIX
-#include <poll.h>
-#endif
-
-#include "platform.hpp"
-
-#define __STDC_LIMIT_MACROS
-
-// This must be included before any windows headers are compiled.
-#if defined ZMQ_HAVE_WINDOWS
-#include "windows.hpp"
-#endif
-
-#if defined ZMQ_HAVE_OPENBSD
-#define ucred sockpeercred
-#endif
-
-// 0MQ definitions and exported functions
-#include "../include/zmq.h"
-
-// 0MQ DRAFT definitions and exported functions
-#include "zmq_draft.h"
-
-// TODO: expand pch implementation to non-windows builds.
-#ifdef _MSC_VER
-
-// standard C headers
-#include <assert.h>
-#include <ctype.h>
-#include <errno.h>
-#include <io.h>
-#include <ipexport.h>
-#include <iphlpapi.h>
-#include <limits.h>
-#include <mstcpip.h>
-#include <mswsock.h>
-#include <process.h>
-#include <rpc.h>
-#include <signal.h>
-#include <stdarg.h>
-#include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <time.h>
-#include <winsock2.h>
-#include <ws2tcpip.h>
-
-// standard C++ headers
-#include <algorithm>
-#include <climits>
-#include <cmath>
-#include <cstddef>
-#include <cstdlib>
-#include <cstring>
-#include <deque>
-#include <limits>
-#include <map>
-#include <new>
-#include <set>
-#include <sstream>
-#include <string>
-#include <vector>
-
-#if _MSC_VER >= 1800
-#include <inttypes.h>
-#endif
-
-#if _MSC_VER >= 1700
-#include <atomic>
-#endif
-
-#if defined _WIN32_WCE
-#include <cmnintrin.h>
-#else
-#include <intrin.h>
-#endif
-
-#if defined HAVE_LIBGSSAPI_KRB5
-#include "err.hpp"
-#include "msg.hpp"
-#include "mechanism.hpp"
-#include "session_base.hpp"
-#include "gssapi_server.hpp"
-#include "wire.hpp"
-#include <gssapi/gssapi.h>
-#include <gssapi/gssapi_krb5.h>
-#endif
-
-#include "options.hpp"
-
-#endif // _MSC_VER
-
-#endif //ifndef __ZMQ_PRECOMPILED_HPP_INCLUDED__
diff --git a/libs/libzmq/src/proxy.cpp b/libs/libzmq/src/proxy.cpp
deleted file mode 100644
index 8a517c7..0000000
--- a/libs/libzmq/src/proxy.cpp
+++ /dev/null
@@ -1,646 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-
-#include <stddef.h>
-#include "poller.hpp"
-#include "proxy.hpp"
-#include "likely.hpp"
-#include "msg.hpp"
-
-#if defined ZMQ_POLL_BASED_ON_POLL && !defined ZMQ_HAVE_WINDOWS                \
-  && !defined ZMQ_HAVE_AIX
-#include <poll.h>
-#endif
-
-// These headers end up pulling in zmq.h somewhere in their include
-// dependency chain
-#include "socket_base.hpp"
-#include "err.hpp"
-
-#ifdef ZMQ_HAVE_POLLER
-
-#include "socket_poller.hpp"
-
-//  Macros for repetitive code.
-
-//  PROXY_CLEANUP() must not be used before these variables are initialized.
-#define PROXY_CLEANUP()                                                        \
-    do {                                                                       \
-        delete poller_all;                                                     \
-        delete poller_in;                                                      \
-        delete poller_control;                                                 \
-        delete poller_receive_blocked;                                         \
-        delete poller_send_blocked;                                            \
-        delete poller_both_blocked;                                            \
-        delete poller_frontend_only;                                           \
-        delete poller_backend_only;                                            \
-    } while (false)
-
-
-#define CHECK_RC_EXIT_ON_FAILURE()                                             \
-    do {                                                                       \
-        if (rc < 0) {                                                          \
-            PROXY_CLEANUP ();                                                  \
-            return close_and_return (&msg, -1);                                \
-        }                                                                      \
-    } while (false)
-
-#endif //  ZMQ_HAVE_POLLER
-
-
-// Control socket messages
-
-typedef struct
-{
-    uint64_t msg_in;
-    uint64_t bytes_in;
-    uint64_t msg_out;
-    uint64_t bytes_out;
-} zmq_socket_stats_t;
-
-
-// Utility functions
-
-static int
-capture (class zmq::socket_base_t *capture_, zmq::msg_t *msg_, int more_ = 0)
-{
-    //  Copy message to capture socket if any
-    if (capture_) {
-        zmq::msg_t ctrl;
-        int rc = ctrl.init ();
-        if (unlikely (rc < 0))
-            return -1;
-        rc = ctrl.copy (*msg_);
-        if (unlikely (rc < 0))
-            return -1;
-        rc = capture_->send (&ctrl, more_ ? ZMQ_SNDMORE : 0);
-        if (unlikely (rc < 0))
-            return -1;
-    }
-    return 0;
-}
-
-static int forward (class zmq::socket_base_t *from_,
-                    zmq_socket_stats_t *from_stats_,
-                    class zmq::socket_base_t *to_,
-                    zmq_socket_stats_t *to_stats_,
-                    class zmq::socket_base_t *capture_,
-                    zmq::msg_t *msg_)
-{
-    // Forward a burst of messages
-    for (unsigned int i = 0; i < zmq::proxy_burst_size; i++) {
-        int more;
-        size_t moresz;
-        size_t complete_msg_size = 0;
-
-        // Forward all the parts of one message
-        while (true) {
-            int rc = from_->recv (msg_, ZMQ_DONTWAIT);
-            if (rc < 0) {
-                if (likely (errno == EAGAIN && i > 0))
-                    return 0; // End of burst
-
-                return -1;
-            }
-
-            complete_msg_size += msg_->size ();
-
-            moresz = sizeof more;
-            rc = from_->getsockopt (ZMQ_RCVMORE, &more, &moresz);
-            if (unlikely (rc < 0))
-                return -1;
-
-            //  Copy message to capture socket if any
-            rc = capture (capture_, msg_, more);
-            if (unlikely (rc < 0))
-                return -1;
-
-            rc = to_->send (msg_, more ? ZMQ_SNDMORE : 0);
-            if (unlikely (rc < 0))
-                return -1;
-
-            if (more == 0)
-                break;
-        }
-
-        // A multipart message counts as 1 packet:
-        from_stats_->msg_in++;
-        from_stats_->bytes_in += complete_msg_size;
-        to_stats_->msg_out++;
-        to_stats_->bytes_out += complete_msg_size;
-    }
-
-    return 0;
-}
-
-static int loop_and_send_multipart_stat (zmq::socket_base_t *control_,
-                                         uint64_t stat_,
-                                         bool first_,
-                                         bool more_)
-{
-    int rc;
-    zmq::msg_t msg;
-
-    //  VSM of 8 bytes can't fail to init
-    msg.init_size (sizeof (uint64_t));
-    memcpy (msg.data (), &stat_, sizeof (uint64_t));
-
-    //  if the first message is handed to the pipe successfully then the HWM
-    //  is not full, which means failures are due to interrupts (on Windows pipes
-    //  are TCP sockets), so keep retrying
-    do {
-        rc = control_->send (&msg, more_ ? ZMQ_SNDMORE : 0);
-    } while (!first_ && rc != 0 && errno == EAGAIN);
-
-    return rc;
-}
-
-static int reply_stats (zmq::socket_base_t *control_,
-                        const zmq_socket_stats_t *frontend_stats_,
-                        const zmq_socket_stats_t *backend_stats_)
-{
-    // first part: frontend stats - the first send might fail due to HWM
-    if (loop_and_send_multipart_stat (control_, frontend_stats_->msg_in, true,
-                                      true)
-        != 0)
-        return -1;
-
-    loop_and_send_multipart_stat (control_, frontend_stats_->bytes_in, false,
-                                  true);
-    loop_and_send_multipart_stat (control_, frontend_stats_->msg_out, false,
-                                  true);
-    loop_and_send_multipart_stat (control_, frontend_stats_->bytes_out, false,
-                                  true);
-
-    // second part: backend stats
-    loop_and_send_multipart_stat (control_, backend_stats_->msg_in, false,
-                                  true);
-    loop_and_send_multipart_stat (control_, backend_stats_->bytes_in, false,
-                                  true);
-    loop_and_send_multipart_stat (control_, backend_stats_->msg_out, false,
-                                  true);
-    loop_and_send_multipart_stat (control_, backend_stats_->bytes_out, false,
-                                  false);
-
-    return 0;
-}
-
-
-#ifdef ZMQ_HAVE_POLLER
-
-int zmq::proxy (class socket_base_t *frontend_,
-                class socket_base_t *backend_,
-                class socket_base_t *capture_,
-                class socket_base_t *control_)
-{
-    msg_t msg;
-    int rc = msg.init ();
-    if (rc != 0)
-        return -1;
-
-    //  The algorithm below assumes ratio of requests and replies processed
-    //  under full load to be 1:1.
-
-    int more;
-    size_t moresz = sizeof (more);
-
-    //  Proxy can be in these three states
-    enum
-    {
-        active,
-        paused,
-        terminated
-    } state = active;
-
-    bool frontend_equal_to_backend;
-    bool frontend_in = false;
-    bool frontend_out = false;
-    bool backend_in = false;
-    bool backend_out = false;
-    bool control_in = false;
-    zmq::socket_poller_t::event_t events[3];
-    zmq_socket_stats_t frontend_stats;
-    zmq_socket_stats_t backend_stats;
-    memset (&frontend_stats, 0, sizeof (frontend_stats));
-    memset (&backend_stats, 0, sizeof (backend_stats));
-
-    //  Don't allocate these pollers from stack because they will take more than 900 kB of stack!
-    //  On Windows this blows up default stack of 1 MB and aborts the program.
-    //  I wanted to use std::shared_ptr here as the best solution but that requires C++11...
-    zmq::socket_poller_t *poller_all =
-      new (std::nothrow) zmq::socket_poller_t; //  Poll for everything.
-    zmq::socket_poller_t *poller_in = new (std::nothrow) zmq::
-      socket_poller_t; //  Poll only 'ZMQ_POLLIN' on all sockets. Initial blocking poll in loop.
-    zmq::socket_poller_t *poller_control = new (std::nothrow) zmq::
-      socket_poller_t; //  Poll only for 'ZMQ_POLLIN' on 'control_', when proxy is paused.
-    zmq::socket_poller_t *poller_receive_blocked = new (std::nothrow)
-      zmq::socket_poller_t; //  All except 'ZMQ_POLLIN' on 'frontend_'.
-
-    //  If frontend_==backend_ 'poller_send_blocked' and 'poller_receive_blocked' are the same, 'ZMQ_POLLIN' is ignored.
-    //  In that case 'poller_send_blocked' is not used. We need only 'poller_receive_blocked'.
-    //  We also don't need 'poller_both_blocked', 'poller_backend_only' nor 'poller_frontend_only' no need to initialize it.
-    //  We save some RAM and time for initialization.
-    zmq::socket_poller_t *poller_send_blocked =
-      NULL; //  All except 'ZMQ_POLLIN' on 'backend_'.
-    zmq::socket_poller_t *poller_both_blocked =
-      NULL; //  All except 'ZMQ_POLLIN' on both 'frontend_' and 'backend_'.
-    zmq::socket_poller_t *poller_frontend_only =
-      NULL; //  Only 'ZMQ_POLLIN' and 'ZMQ_POLLOUT' on 'frontend_'.
-    zmq::socket_poller_t *poller_backend_only =
-      NULL; //  Only 'ZMQ_POLLIN' and 'ZMQ_POLLOUT' on 'backend_'.
-
-    if (frontend_ != backend_) {
-        poller_send_blocked = new (std::nothrow)
-          zmq::socket_poller_t; //  All except 'ZMQ_POLLIN' on 'backend_'.
-        poller_both_blocked = new (std::nothrow) zmq::
-          socket_poller_t; //  All except 'ZMQ_POLLIN' on both 'frontend_' and 'backend_'.
-        poller_frontend_only = new (std::nothrow) zmq::
-          socket_poller_t; //  Only 'ZMQ_POLLIN' and 'ZMQ_POLLOUT' on 'frontend_'.
-        poller_backend_only = new (std::nothrow) zmq::
-          socket_poller_t; //  Only 'ZMQ_POLLIN' and 'ZMQ_POLLOUT' on 'backend_'.
-        frontend_equal_to_backend = false;
-    } else
-        frontend_equal_to_backend = true;
-
-    if (poller_all == NULL || poller_in == NULL || poller_control == NULL
-        || poller_receive_blocked == NULL
-        || ((poller_send_blocked == NULL || poller_both_blocked == NULL)
-            && !frontend_equal_to_backend)) {
-        PROXY_CLEANUP ();
-        return close_and_return (&msg, -1);
-    }
-
-    zmq::socket_poller_t *poller_wait =
-      poller_in; //  Poller for blocking wait, initially all 'ZMQ_POLLIN'.
-
-    //  Register 'frontend_' and 'backend_' with pollers.
-    rc = poller_all->add (frontend_, NULL,
-                          ZMQ_POLLIN | ZMQ_POLLOUT); //  Everything.
-    CHECK_RC_EXIT_ON_FAILURE ();
-    rc = poller_in->add (frontend_, NULL, ZMQ_POLLIN); //  All 'ZMQ_POLLIN's.
-    CHECK_RC_EXIT_ON_FAILURE ();
-
-    if (frontend_equal_to_backend) {
-        //  If frontend_==backend_ 'poller_send_blocked' and 'poller_receive_blocked' are the same,
-        //  so we don't need 'poller_send_blocked'. We need only 'poller_receive_blocked'.
-        //  We also don't need 'poller_both_blocked', no need to initialize it.
-        rc = poller_receive_blocked->add (frontend_, NULL, ZMQ_POLLOUT);
-        CHECK_RC_EXIT_ON_FAILURE ();
-    } else {
-        rc = poller_all->add (backend_, NULL,
-                              ZMQ_POLLIN | ZMQ_POLLOUT); //  Everything.
-        CHECK_RC_EXIT_ON_FAILURE ();
-        rc = poller_in->add (backend_, NULL, ZMQ_POLLIN); //  All 'ZMQ_POLLIN's.
-        CHECK_RC_EXIT_ON_FAILURE ();
-        rc = poller_both_blocked->add (
-          frontend_, NULL, ZMQ_POLLOUT); //  Waiting only for 'ZMQ_POLLOUT'.
-        CHECK_RC_EXIT_ON_FAILURE ();
-        rc = poller_both_blocked->add (
-          backend_, NULL, ZMQ_POLLOUT); //  Waiting only for 'ZMQ_POLLOUT'.
-        CHECK_RC_EXIT_ON_FAILURE ();
-        rc = poller_send_blocked->add (
-          backend_, NULL,
-          ZMQ_POLLOUT); //  All except 'ZMQ_POLLIN' on 'backend_'.
-        CHECK_RC_EXIT_ON_FAILURE ();
-        rc = poller_send_blocked->add (
-          frontend_, NULL,
-          ZMQ_POLLIN | ZMQ_POLLOUT); //  All except 'ZMQ_POLLIN' on 'backend_'.
-        CHECK_RC_EXIT_ON_FAILURE ();
-        rc = poller_receive_blocked->add (
-          frontend_, NULL,
-          ZMQ_POLLOUT); //  All except 'ZMQ_POLLIN' on 'frontend_'.
-        CHECK_RC_EXIT_ON_FAILURE ();
-        rc = poller_receive_blocked->add (
-          backend_, NULL,
-          ZMQ_POLLIN | ZMQ_POLLOUT); //  All except 'ZMQ_POLLIN' on 'frontend_'.
-        CHECK_RC_EXIT_ON_FAILURE ();
-        rc =
-          poller_frontend_only->add (frontend_, NULL, ZMQ_POLLIN | ZMQ_POLLOUT);
-        CHECK_RC_EXIT_ON_FAILURE ();
-        rc =
-          poller_backend_only->add (backend_, NULL, ZMQ_POLLIN | ZMQ_POLLOUT);
-        CHECK_RC_EXIT_ON_FAILURE ();
-    }
-
-    //  Register 'control_' with pollers.
-    if (control_ != NULL) {
-        rc = poller_all->add (control_, NULL, ZMQ_POLLIN);
-        CHECK_RC_EXIT_ON_FAILURE ();
-        rc = poller_in->add (control_, NULL, ZMQ_POLLIN);
-        CHECK_RC_EXIT_ON_FAILURE ();
-        rc = poller_control->add (
-          control_, NULL,
-          ZMQ_POLLIN); //  When proxy is paused we wait only for ZMQ_POLLIN on 'control_' socket.
-        CHECK_RC_EXIT_ON_FAILURE ();
-        rc = poller_receive_blocked->add (control_, NULL, ZMQ_POLLIN);
-        CHECK_RC_EXIT_ON_FAILURE ();
-        if (!frontend_equal_to_backend) {
-            rc = poller_send_blocked->add (control_, NULL, ZMQ_POLLIN);
-            CHECK_RC_EXIT_ON_FAILURE ();
-            rc = poller_both_blocked->add (control_, NULL, ZMQ_POLLIN);
-            CHECK_RC_EXIT_ON_FAILURE ();
-            rc = poller_frontend_only->add (control_, NULL, ZMQ_POLLIN);
-            CHECK_RC_EXIT_ON_FAILURE ();
-            rc = poller_backend_only->add (control_, NULL, ZMQ_POLLIN);
-            CHECK_RC_EXIT_ON_FAILURE ();
-        }
-    }
-
-    bool request_processed, reply_processed;
-
-    while (state != terminated) {
-        //  Blocking wait initially only for 'ZMQ_POLLIN' - 'poller_wait' points to 'poller_in'.
-        //  If one of receiving end's queue is full ('ZMQ_POLLOUT' not available),
-        //  'poller_wait' is pointed to 'poller_receive_blocked', 'poller_send_blocked' or 'poller_both_blocked'.
-        rc = poller_wait->wait (events, 3, -1);
-        if (rc < 0 && errno == EAGAIN)
-            rc = 0;
-        CHECK_RC_EXIT_ON_FAILURE ();
-
-        //  Some of events waited for by 'poller_wait' have arrived, now poll for everything without blocking.
-        rc = poller_all->wait (events, 3, 0);
-        if (rc < 0 && errno == EAGAIN)
-            rc = 0;
-        CHECK_RC_EXIT_ON_FAILURE ();
-
-        //  Process events.
-        for (int i = 0; i < rc; i++) {
-            if (events[i].socket == frontend_) {
-                frontend_in = (events[i].events & ZMQ_POLLIN) != 0;
-                frontend_out = (events[i].events & ZMQ_POLLOUT) != 0;
-            } else
-              //  This 'if' needs to be after check for 'frontend_' in order never
-              //  to be reached in case frontend_==backend_, so we ensure backend_in=false in that case.
-              if (events[i].socket == backend_) {
-                backend_in = (events[i].events & ZMQ_POLLIN) != 0;
-                backend_out = (events[i].events & ZMQ_POLLOUT) != 0;
-            } else if (events[i].socket == control_)
-                control_in = (events[i].events & ZMQ_POLLIN) != 0;
-        }
-
-
-        //  Process a control command if any.
-        if (control_in) {
-            rc = control_->recv (&msg, 0);
-            CHECK_RC_EXIT_ON_FAILURE ();
-            rc = control_->getsockopt (ZMQ_RCVMORE, &more, &moresz);
-            if (unlikely (rc < 0) || more) {
-                PROXY_CLEANUP ();
-                return close_and_return (&msg, -1);
-            }
-
-            //  Copy message to capture socket if any.
-            rc = capture (capture_, &msg);
-            CHECK_RC_EXIT_ON_FAILURE ();
-
-            if (msg.size () == 5 && memcmp (msg.data (), "PAUSE", 5) == 0) {
-                state = paused;
-                poller_wait = poller_control;
-            } else if (msg.size () == 6
-                       && memcmp (msg.data (), "RESUME", 6) == 0) {
-                state = active;
-                poller_wait = poller_in;
-            } else {
-                if (msg.size () == 9
-                    && memcmp (msg.data (), "TERMINATE", 9) == 0)
-                    state = terminated;
-                else {
-                    if (msg.size () == 10
-                        && memcmp (msg.data (), "STATISTICS", 10) == 0) {
-                        rc = reply_stats (control_, &frontend_stats,
-                                          &backend_stats);
-                        CHECK_RC_EXIT_ON_FAILURE ();
-                    } else {
-                        //  This is an API error, we assert
-                        puts ("E: invalid command sent to proxy");
-                        zmq_assert (false);
-                    }
-                }
-            }
-            control_in = false;
-        }
-
-        if (state == active) {
-            //  Process a request, 'ZMQ_POLLIN' on 'frontend_' and 'ZMQ_POLLOUT' on 'backend_'.
-            //  In case of frontend_==backend_ there's no 'ZMQ_POLLOUT' event.
-            if (frontend_in && (backend_out || frontend_equal_to_backend)) {
-                rc = forward (frontend_, &frontend_stats, backend_,
-                              &backend_stats, capture_, &msg);
-                CHECK_RC_EXIT_ON_FAILURE ();
-                request_processed = true;
-                frontend_in = backend_out = false;
-            } else
-                request_processed = false;
-
-            //  Process a reply, 'ZMQ_POLLIN' on 'backend_' and 'ZMQ_POLLOUT' on 'frontend_'.
-            //  If 'frontend_' and 'backend_' are the same this is not needed because previous processing
-            //  covers all of the cases. 'backend_in' is always false if frontend_==backend_ due to
-            //  design in 'for' event processing loop.
-            if (backend_in && frontend_out) {
-                rc = forward (backend_, &backend_stats, frontend_,
-                              &frontend_stats, capture_, &msg);
-                CHECK_RC_EXIT_ON_FAILURE ();
-                reply_processed = true;
-                backend_in = frontend_out = false;
-            } else
-                reply_processed = false;
-
-            if (request_processed || reply_processed) {
-                //  If request/reply is processed that means we had at least one 'ZMQ_POLLOUT' event.
-                //  Enable corresponding 'ZMQ_POLLIN' for blocking wait if any was disabled.
-                if (poller_wait != poller_in) {
-                    if (request_processed) { //  'frontend_' -> 'backend_'
-                        if (poller_wait == poller_both_blocked)
-                            poller_wait = poller_send_blocked;
-                        else if (poller_wait == poller_receive_blocked
-                                 || poller_wait == poller_frontend_only)
-                            poller_wait = poller_in;
-                    }
-                    if (reply_processed) { //  'backend_' -> 'frontend_'
-                        if (poller_wait == poller_both_blocked)
-                            poller_wait = poller_receive_blocked;
-                        else if (poller_wait == poller_send_blocked
-                                 || poller_wait == poller_backend_only)
-                            poller_wait = poller_in;
-                    }
-                }
-            } else {
-                //  No requests have been processed, there were no 'ZMQ_POLLIN' with corresponding 'ZMQ_POLLOUT' events.
-                //  That means that out queue(s) is/are full or one out queue is full and second one has no messages to process.
-                //  Disable receiving 'ZMQ_POLLIN' for sockets for which there's no 'ZMQ_POLLOUT',
-                //  or wait only on both 'backend_''s or 'frontend_''s 'ZMQ_POLLIN' and 'ZMQ_POLLOUT'.
-                if (frontend_in) {
-                    if (frontend_out)
-                        // If frontend_in and frontend_out are true, obviously backend_in and backend_out are both false.
-                        // In that case we need to wait for both 'ZMQ_POLLIN' and 'ZMQ_POLLOUT' only on 'backend_'.
-                        // We'll never get here in case of frontend_==backend_ because then frontend_out will always be false.
-                        poller_wait = poller_backend_only;
-                    else {
-                        if (poller_wait == poller_send_blocked)
-                            poller_wait = poller_both_blocked;
-                        else if (poller_wait == poller_in)
-                            poller_wait = poller_receive_blocked;
-                    }
-                }
-                if (backend_in) {
-                    //  Will never be reached if frontend_==backend_, 'backend_in' will
-                    //  always be false due to design in 'for' event processing loop.
-                    if (backend_out)
-                        // If backend_in and backend_out are true, obviously frontend_in and frontend_out are both false.
-                        // In that case we need to wait for both 'ZMQ_POLLIN' and 'ZMQ_POLLOUT' only on 'frontend_'.
-                        poller_wait = poller_frontend_only;
-                    else {
-                        if (poller_wait == poller_receive_blocked)
-                            poller_wait = poller_both_blocked;
-                        else if (poller_wait == poller_in)
-                            poller_wait = poller_send_blocked;
-                    }
-                }
-            }
-        }
-    }
-    PROXY_CLEANUP ();
-    return close_and_return (&msg, 0);
-}
-
-#else //  ZMQ_HAVE_POLLER
-
-int zmq::proxy (class socket_base_t *frontend_,
-                class socket_base_t *backend_,
-                class socket_base_t *capture_,
-                class socket_base_t *control_)
-{
-    msg_t msg;
-    int rc = msg.init ();
-    if (rc != 0)
-        return -1;
-
-    //  The algorithm below assumes ratio of requests and replies processed
-    //  under full load to be 1:1.
-
-    int more;
-    size_t moresz;
-    zmq_pollitem_t items[] = {{frontend_, 0, ZMQ_POLLIN, 0},
-                              {backend_, 0, ZMQ_POLLIN, 0},
-                              {control_, 0, ZMQ_POLLIN, 0}};
-    int qt_poll_items = (control_ ? 3 : 2);
-    zmq_pollitem_t itemsout[] = {{frontend_, 0, ZMQ_POLLOUT, 0},
-                                 {backend_, 0, ZMQ_POLLOUT, 0}};
-
-    zmq_socket_stats_t frontend_stats;
-    memset (&frontend_stats, 0, sizeof (frontend_stats));
-    zmq_socket_stats_t backend_stats;
-    memset (&backend_stats, 0, sizeof (backend_stats));
-
-    //  Proxy can be in these three states
-    enum
-    {
-        active,
-        paused,
-        terminated
-    } state = active;
-
-    while (state != terminated) {
-        //  Wait while there are either requests or replies to process.
-        rc = zmq_poll (&items[0], qt_poll_items, -1);
-        if (unlikely (rc < 0))
-            return close_and_return (&msg, -1);
-
-        //  Get the pollout separately because when combining this with pollin it maxes the CPU
-        //  because pollout shall most of the time return directly.
-        //  POLLOUT is only checked when frontend and backend sockets are not the same.
-        if (frontend_ != backend_) {
-            rc = zmq_poll (&itemsout[0], 2, 0);
-            if (unlikely (rc < 0)) {
-                return close_and_return (&msg, -1);
-            }
-        }
-
-        //  Process a control command if any
-        if (control_ && items[2].revents & ZMQ_POLLIN) {
-            rc = control_->recv (&msg, 0);
-            if (unlikely (rc < 0))
-                return close_and_return (&msg, -1);
-
-            moresz = sizeof more;
-            rc = control_->getsockopt (ZMQ_RCVMORE, &more, &moresz);
-            if (unlikely (rc < 0) || more)
-                return close_and_return (&msg, -1);
-
-            //  Copy message to capture socket if any
-            rc = capture (capture_, &msg);
-            if (unlikely (rc < 0))
-                return close_and_return (&msg, -1);
-
-            if (msg.size () == 5 && memcmp (msg.data (), "PAUSE", 5) == 0)
-                state = paused;
-            else if (msg.size () == 6 && memcmp (msg.data (), "RESUME", 6) == 0)
-                state = active;
-            else if (msg.size () == 9
-                     && memcmp (msg.data (), "TERMINATE", 9) == 0)
-                state = terminated;
-            else {
-                if (msg.size () == 10
-                    && memcmp (msg.data (), "STATISTICS", 10) == 0) {
-                    rc =
-                      reply_stats (control_, &frontend_stats, &backend_stats);
-                    if (unlikely (rc < 0))
-                        return close_and_return (&msg, -1);
-                } else {
-                    //  This is an API error, we assert
-                    puts ("E: invalid command sent to proxy");
-                    zmq_assert (false);
-                }
-            }
-        }
-        //  Process a request
-        if (state == active && items[0].revents & ZMQ_POLLIN
-            && (frontend_ == backend_ || itemsout[1].revents & ZMQ_POLLOUT)) {
-            rc = forward (frontend_, &frontend_stats, backend_, &backend_stats,
-                          capture_, &msg);
-            if (unlikely (rc < 0))
-                return close_and_return (&msg, -1);
-        }
-        //  Process a reply
-        if (state == active && frontend_ != backend_
-            && items[1].revents & ZMQ_POLLIN
-            && itemsout[0].revents & ZMQ_POLLOUT) {
-            rc = forward (backend_, &backend_stats, frontend_, &frontend_stats,
-                          capture_, &msg);
-            if (unlikely (rc < 0))
-                return close_and_return (&msg, -1);
-        }
-    }
-
-    return close_and_return (&msg, 0);
-}
-
-#endif //  ZMQ_HAVE_POLLER
diff --git a/libs/libzmq/src/proxy.hpp b/libs/libzmq/src/proxy.hpp
deleted file mode 100644
index f078c6a..0000000
--- a/libs/libzmq/src/proxy.hpp
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_PROXY_HPP_INCLUDED__
-#define __ZMQ_PROXY_HPP_INCLUDED__
-
-namespace zmq
-{
-int proxy (class socket_base_t *frontend_,
-           class socket_base_t *backend_,
-           class socket_base_t *capture_,
-           class socket_base_t *control_ =
-             NULL); // backward compatibility without this argument
-}
-
-#endif
diff --git a/libs/libzmq/src/pub.cpp b/libs/libzmq/src/pub.cpp
deleted file mode 100644
index fe42982..0000000
--- a/libs/libzmq/src/pub.cpp
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "pub.hpp"
-#include "pipe.hpp"
-#include "err.hpp"
-#include "msg.hpp"
-
-zmq::pub_t::pub_t (class ctx_t *parent_, uint32_t tid_, int sid_) :
-    xpub_t (parent_, tid_, sid_)
-{
-    options.type = ZMQ_PUB;
-}
-
-zmq::pub_t::~pub_t ()
-{
-}
-
-void zmq::pub_t::xattach_pipe (pipe_t *pipe_,
-                               bool subscribe_to_all_,
-                               bool locally_initiated_)
-{
-    zmq_assert (pipe_);
-
-    //  Don't delay pipe termination as there is no one
-    //  to receive the delimiter.
-    pipe_->set_nodelay ();
-
-    xpub_t::xattach_pipe (pipe_, subscribe_to_all_, locally_initiated_);
-}
-
-int zmq::pub_t::xrecv (class msg_t *)
-{
-    //  Messages cannot be received from PUB socket.
-    errno = ENOTSUP;
-    return -1;
-}
-
-bool zmq::pub_t::xhas_in ()
-{
-    return false;
-}
diff --git a/libs/libzmq/src/pub.hpp b/libs/libzmq/src/pub.hpp
deleted file mode 100644
index b423da0..0000000
--- a/libs/libzmq/src/pub.hpp
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_PUB_HPP_INCLUDED__
-#define __ZMQ_PUB_HPP_INCLUDED__
-
-#include "xpub.hpp"
-
-namespace zmq
-{
-class ctx_t;
-class io_thread_t;
-class socket_base_t;
-class msg_t;
-
-class pub_t ZMQ_FINAL : public xpub_t
-{
-  public:
-    pub_t (zmq::ctx_t *parent_, uint32_t tid_, int sid_);
-    ~pub_t ();
-
-    //  Implementations of virtual functions from socket_base_t.
-    void xattach_pipe (zmq::pipe_t *pipe_,
-                       bool subscribe_to_all_ = false,
-                       bool locally_initiated_ = false);
-    int xrecv (zmq::msg_t *msg_);
-    bool xhas_in ();
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (pub_t)
-};
-}
-
-#endif
diff --git a/libs/libzmq/src/pull.cpp b/libs/libzmq/src/pull.cpp
deleted file mode 100644
index 9c9a843..0000000
--- a/libs/libzmq/src/pull.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "macros.hpp"
-#include "pull.hpp"
-#include "err.hpp"
-#include "msg.hpp"
-#include "pipe.hpp"
-
-zmq::pull_t::pull_t (class ctx_t *parent_, uint32_t tid_, int sid_) :
-    socket_base_t (parent_, tid_, sid_)
-{
-    options.type = ZMQ_PULL;
-}
-
-zmq::pull_t::~pull_t ()
-{
-}
-
-void zmq::pull_t::xattach_pipe (pipe_t *pipe_,
-                                bool subscribe_to_all_,
-                                bool locally_initiated_)
-{
-    LIBZMQ_UNUSED (subscribe_to_all_);
-    LIBZMQ_UNUSED (locally_initiated_);
-
-    zmq_assert (pipe_);
-    _fq.attach (pipe_);
-}
-
-void zmq::pull_t::xread_activated (pipe_t *pipe_)
-{
-    _fq.activated (pipe_);
-}
-
-void zmq::pull_t::xpipe_terminated (pipe_t *pipe_)
-{
-    _fq.pipe_terminated (pipe_);
-}
-
-int zmq::pull_t::xrecv (msg_t *msg_)
-{
-    return _fq.recv (msg_);
-}
-
-bool zmq::pull_t::xhas_in ()
-{
-    return _fq.has_in ();
-}
diff --git a/libs/libzmq/src/pull.hpp b/libs/libzmq/src/pull.hpp
deleted file mode 100644
index 4634d82..0000000
--- a/libs/libzmq/src/pull.hpp
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_PULL_HPP_INCLUDED__
-#define __ZMQ_PULL_HPP_INCLUDED__
-
-#include "socket_base.hpp"
-#include "session_base.hpp"
-#include "fq.hpp"
-
-namespace zmq
-{
-class ctx_t;
-class pipe_t;
-class msg_t;
-class io_thread_t;
-
-class pull_t ZMQ_FINAL : public socket_base_t
-{
-  public:
-    pull_t (zmq::ctx_t *parent_, uint32_t tid_, int sid_);
-    ~pull_t ();
-
-  protected:
-    //  Overrides of functions from socket_base_t.
-    void xattach_pipe (zmq::pipe_t *pipe_,
-                       bool subscribe_to_all_,
-                       bool locally_initiated_);
-    int xrecv (zmq::msg_t *msg_);
-    bool xhas_in ();
-    void xread_activated (zmq::pipe_t *pipe_);
-    void xpipe_terminated (zmq::pipe_t *pipe_);
-
-  private:
-    //  Fair queueing object for inbound pipes.
-    fq_t _fq;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (pull_t)
-};
-}
-
-#endif
diff --git a/libs/libzmq/src/push.cpp b/libs/libzmq/src/push.cpp
deleted file mode 100644
index 4218480..0000000
--- a/libs/libzmq/src/push.cpp
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "macros.hpp"
-#include "push.hpp"
-#include "pipe.hpp"
-#include "err.hpp"
-#include "msg.hpp"
-
-zmq::push_t::push_t (class ctx_t *parent_, uint32_t tid_, int sid_) :
-    socket_base_t (parent_, tid_, sid_)
-{
-    options.type = ZMQ_PUSH;
-}
-
-zmq::push_t::~push_t ()
-{
-}
-
-void zmq::push_t::xattach_pipe (pipe_t *pipe_,
-                                bool subscribe_to_all_,
-                                bool locally_initiated_)
-{
-    LIBZMQ_UNUSED (subscribe_to_all_);
-    LIBZMQ_UNUSED (locally_initiated_);
-
-    //  Don't delay pipe termination as there is no one
-    //  to receive the delimiter.
-    pipe_->set_nodelay ();
-
-    zmq_assert (pipe_);
-    _lb.attach (pipe_);
-}
-
-void zmq::push_t::xwrite_activated (pipe_t *pipe_)
-{
-    _lb.activated (pipe_);
-}
-
-void zmq::push_t::xpipe_terminated (pipe_t *pipe_)
-{
-    _lb.pipe_terminated (pipe_);
-}
-
-int zmq::push_t::xsend (msg_t *msg_)
-{
-    return _lb.send (msg_);
-}
-
-bool zmq::push_t::xhas_out ()
-{
-    return _lb.has_out ();
-}
diff --git a/libs/libzmq/src/push.hpp b/libs/libzmq/src/push.hpp
deleted file mode 100644
index 3b908c1..0000000
--- a/libs/libzmq/src/push.hpp
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_PUSH_HPP_INCLUDED__
-#define __ZMQ_PUSH_HPP_INCLUDED__
-
-#include "socket_base.hpp"
-#include "session_base.hpp"
-#include "lb.hpp"
-
-namespace zmq
-{
-class ctx_t;
-class pipe_t;
-class msg_t;
-class io_thread_t;
-
-class push_t ZMQ_FINAL : public socket_base_t
-{
-  public:
-    push_t (zmq::ctx_t *parent_, uint32_t tid_, int sid_);
-    ~push_t ();
-
-  protected:
-    //  Overrides of functions from socket_base_t.
-    void xattach_pipe (zmq::pipe_t *pipe_,
-                       bool subscribe_to_all_,
-                       bool locally_initiated_);
-    int xsend (zmq::msg_t *msg_);
-    bool xhas_out ();
-    void xwrite_activated (zmq::pipe_t *pipe_);
-    void xpipe_terminated (zmq::pipe_t *pipe_);
-
-  private:
-    //  Load balancer managing the outbound pipes.
-    lb_t _lb;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (push_t)
-};
-}
-
-#endif
diff --git a/libs/libzmq/src/radio.cpp b/libs/libzmq/src/radio.cpp
deleted file mode 100644
index 0ebb081..0000000
--- a/libs/libzmq/src/radio.cpp
+++ /dev/null
@@ -1,285 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include <string.h>
-
-#include "radio.hpp"
-#include "macros.hpp"
-#include "pipe.hpp"
-#include "err.hpp"
-#include "msg.hpp"
-
-zmq::radio_t::radio_t (class ctx_t *parent_, uint32_t tid_, int sid_) :
-    socket_base_t (parent_, tid_, sid_, true), _lossy (true)
-{
-    options.type = ZMQ_RADIO;
-}
-
-zmq::radio_t::~radio_t ()
-{
-}
-
-void zmq::radio_t::xattach_pipe (pipe_t *pipe_,
-                                 bool subscribe_to_all_,
-                                 bool locally_initiated_)
-{
-    LIBZMQ_UNUSED (subscribe_to_all_);
-    LIBZMQ_UNUSED (locally_initiated_);
-
-    zmq_assert (pipe_);
-
-    //  Don't delay pipe termination as there is no one
-    //  to receive the delimiter.
-    pipe_->set_nodelay ();
-
-    _dist.attach (pipe_);
-
-    if (subscribe_to_all_)
-        _udp_pipes.push_back (pipe_);
-    //  The pipe is active when attached. Let's read the subscriptions from
-    //  it, if any.
-    else
-        xread_activated (pipe_);
-}
-
-void zmq::radio_t::xread_activated (pipe_t *pipe_)
-{
-    //  There are some subscriptions waiting. Let's process them.
-    msg_t msg;
-    while (pipe_->read (&msg)) {
-        //  Apply the subscription to the trie
-        if (msg.is_join () || msg.is_leave ()) {
-            std::string group = std::string (msg.group ());
-
-            if (msg.is_join ())
-                _subscriptions.ZMQ_MAP_INSERT_OR_EMPLACE (ZMQ_MOVE (group),
-                                                          pipe_);
-            else {
-                std::pair<subscriptions_t::iterator, subscriptions_t::iterator>
-                  range = _subscriptions.equal_range (group);
-
-                for (subscriptions_t::iterator it = range.first;
-                     it != range.second; ++it) {
-                    if (it->second == pipe_) {
-                        _subscriptions.erase (it);
-                        break;
-                    }
-                }
-            }
-        }
-        msg.close ();
-    }
-}
-
-void zmq::radio_t::xwrite_activated (pipe_t *pipe_)
-{
-    _dist.activated (pipe_);
-}
-int zmq::radio_t::xsetsockopt (int option_,
-                               const void *optval_,
-                               size_t optvallen_)
-{
-    if (optvallen_ != sizeof (int) || *static_cast<const int *> (optval_) < 0) {
-        errno = EINVAL;
-        return -1;
-    }
-    if (option_ == ZMQ_XPUB_NODROP)
-        _lossy = (*static_cast<const int *> (optval_) == 0);
-    else {
-        errno = EINVAL;
-        return -1;
-    }
-    return 0;
-}
-
-void zmq::radio_t::xpipe_terminated (pipe_t *pipe_)
-{
-    for (subscriptions_t::iterator it = _subscriptions.begin (),
-                                   end = _subscriptions.end ();
-         it != end;) {
-        if (it->second == pipe_) {
-#if __cplusplus >= 201103L || (defined _MSC_VER && _MSC_VER >= 1700)
-            it = _subscriptions.erase (it);
-#else
-            _subscriptions.erase (it++);
-#endif
-        } else {
-            ++it;
-        }
-    }
-
-    {
-        const udp_pipes_t::iterator end = _udp_pipes.end ();
-        const udp_pipes_t::iterator it =
-          std::find (_udp_pipes.begin (), end, pipe_);
-        if (it != end)
-            _udp_pipes.erase (it);
-    }
-
-    _dist.pipe_terminated (pipe_);
-}
-
-int zmq::radio_t::xsend (msg_t *msg_)
-{
-    //  Radio sockets do not allow multipart data (ZMQ_SNDMORE)
-    if (msg_->flags () & msg_t::more) {
-        errno = EINVAL;
-        return -1;
-    }
-
-    _dist.unmatch ();
-
-    const std::pair<subscriptions_t::iterator, subscriptions_t::iterator>
-      range = _subscriptions.equal_range (std::string (msg_->group ()));
-
-    for (subscriptions_t::iterator it = range.first; it != range.second; ++it)
-        _dist.match (it->second);
-
-    for (udp_pipes_t::iterator it = _udp_pipes.begin (),
-                               end = _udp_pipes.end ();
-         it != end; ++it)
-        _dist.match (*it);
-
-    int rc = -1;
-    if (_lossy || _dist.check_hwm ()) {
-        if (_dist.send_to_matching (msg_) == 0) {
-            rc = 0; //  Yay, sent successfully
-        }
-    } else
-        errno = EAGAIN;
-
-    return rc;
-}
-
-bool zmq::radio_t::xhas_out ()
-{
-    return _dist.has_out ();
-}
-
-int zmq::radio_t::xrecv (msg_t *msg_)
-{
-    //  Messages cannot be received from PUB socket.
-    LIBZMQ_UNUSED (msg_);
-    errno = ENOTSUP;
-    return -1;
-}
-
-bool zmq::radio_t::xhas_in ()
-{
-    return false;
-}
-
-zmq::radio_session_t::radio_session_t (io_thread_t *io_thread_,
-                                       bool connect_,
-                                       socket_base_t *socket_,
-                                       const options_t &options_,
-                                       address_t *addr_) :
-    session_base_t (io_thread_, connect_, socket_, options_, addr_),
-    _state (group)
-{
-}
-
-zmq::radio_session_t::~radio_session_t ()
-{
-}
-
-int zmq::radio_session_t::push_msg (msg_t *msg_)
-{
-    if (msg_->flags () & msg_t::command) {
-        char *command_data = static_cast<char *> (msg_->data ());
-        const size_t data_size = msg_->size ();
-
-        int group_length;
-        const char *group;
-
-        msg_t join_leave_msg;
-        int rc;
-
-        //  Set the msg type to either JOIN or LEAVE
-        if (data_size >= 5 && memcmp (command_data, "\4JOIN", 5) == 0) {
-            group_length = static_cast<int> (data_size) - 5;
-            group = command_data + 5;
-            rc = join_leave_msg.init_join ();
-        } else if (data_size >= 6 && memcmp (command_data, "\5LEAVE", 6) == 0) {
-            group_length = static_cast<int> (data_size) - 6;
-            group = command_data + 6;
-            rc = join_leave_msg.init_leave ();
-        }
-        //  If it is not a JOIN or LEAVE just push the message
-        else
-            return session_base_t::push_msg (msg_);
-
-        errno_assert (rc == 0);
-
-        //  Set the group
-        rc = join_leave_msg.set_group (group, group_length);
-        errno_assert (rc == 0);
-
-        //  Close the current command
-        rc = msg_->close ();
-        errno_assert (rc == 0);
-
-        //  Push the join or leave command
-        *msg_ = join_leave_msg;
-        return session_base_t::push_msg (msg_);
-    }
-    return session_base_t::push_msg (msg_);
-}
-
-int zmq::radio_session_t::pull_msg (msg_t *msg_)
-{
-    if (_state == group) {
-        int rc = session_base_t::pull_msg (&_pending_msg);
-        if (rc != 0)
-            return rc;
-
-        const char *group = _pending_msg.group ();
-        const int length = static_cast<int> (strlen (group));
-
-        //  First frame is the group
-        rc = msg_->init_size (length);
-        errno_assert (rc == 0);
-        msg_->set_flags (msg_t::more);
-        memcpy (msg_->data (), group, length);
-
-        //  Next status is the body
-        _state = body;
-        return 0;
-    }
-    *msg_ = _pending_msg;
-    _state = group;
-    return 0;
-}
-
-void zmq::radio_session_t::reset ()
-{
-    session_base_t::reset ();
-    _state = group;
-}
diff --git a/libs/libzmq/src/radio.hpp b/libs/libzmq/src/radio.hpp
deleted file mode 100644
index 8b3bd64..0000000
--- a/libs/libzmq/src/radio.hpp
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_RADIO_HPP_INCLUDED__
-#define __ZMQ_RADIO_HPP_INCLUDED__
-
-#include <map>
-#include <string>
-#include <vector>
-
-#include "socket_base.hpp"
-#include "session_base.hpp"
-#include "dist.hpp"
-#include "msg.hpp"
-
-namespace zmq
-{
-class ctx_t;
-class pipe_t;
-class io_thread_t;
-
-class radio_t ZMQ_FINAL : public socket_base_t
-{
-  public:
-    radio_t (zmq::ctx_t *parent_, uint32_t tid_, int sid_);
-    ~radio_t ();
-
-    //  Implementations of virtual functions from socket_base_t.
-    void xattach_pipe (zmq::pipe_t *pipe_,
-                       bool subscribe_to_all_ = false,
-                       bool locally_initiated_ = false);
-    int xsend (zmq::msg_t *msg_);
-    bool xhas_out ();
-    int xrecv (zmq::msg_t *msg_);
-    bool xhas_in ();
-    void xread_activated (zmq::pipe_t *pipe_);
-    void xwrite_activated (zmq::pipe_t *pipe_);
-    int xsetsockopt (int option_, const void *optval_, size_t optvallen_);
-    void xpipe_terminated (zmq::pipe_t *pipe_);
-
-  private:
-    //  List of all subscriptions mapped to corresponding pipes.
-    typedef std::multimap<std::string, pipe_t *> subscriptions_t;
-    subscriptions_t _subscriptions;
-
-    //  List of udp pipes
-    typedef std::vector<pipe_t *> udp_pipes_t;
-    udp_pipes_t _udp_pipes;
-
-    //  Distributor of messages holding the list of outbound pipes.
-    dist_t _dist;
-
-    //  Drop messages if HWM reached, otherwise return with EAGAIN
-    bool _lossy;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (radio_t)
-};
-
-class radio_session_t ZMQ_FINAL : public session_base_t
-{
-  public:
-    radio_session_t (zmq::io_thread_t *io_thread_,
-                     bool connect_,
-                     zmq::socket_base_t *socket_,
-                     const options_t &options_,
-                     address_t *addr_);
-    ~radio_session_t ();
-
-    //  Overrides of the functions from session_base_t.
-    int push_msg (msg_t *msg_);
-    int pull_msg (msg_t *msg_);
-    void reset ();
-
-  private:
-    enum
-    {
-        group,
-        body
-    } _state;
-
-    msg_t _pending_msg;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (radio_session_t)
-};
-}
-
-#endif
diff --git a/libs/libzmq/src/radix_tree.cpp b/libs/libzmq/src/radix_tree.cpp
deleted file mode 100644
index 2a38ebf..0000000
--- a/libs/libzmq/src/radix_tree.cpp
+++ /dev/null
@@ -1,578 +0,0 @@
-/*
-    Copyright (c) 2018 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "macros.hpp"
-#include "err.hpp"
-#include "radix_tree.hpp"
-
-#include <stdlib.h>
-#include <string.h>
-#include <iterator>
-#include <vector>
-
-node_t::node_t (unsigned char *data_) : _data (data_)
-{
-}
-
-uint32_t node_t::refcount ()
-{
-    uint32_t u32;
-    memcpy (&u32, _data, sizeof (u32));
-    return u32;
-}
-
-void node_t::set_refcount (uint32_t value_)
-{
-    memcpy (_data, &value_, sizeof (value_));
-}
-
-uint32_t node_t::prefix_length ()
-{
-    uint32_t u32;
-    memcpy (&u32, _data + sizeof (uint32_t), sizeof (u32));
-    return u32;
-}
-
-void node_t::set_prefix_length (uint32_t value_)
-{
-    memcpy (_data + sizeof (value_), &value_, sizeof (value_));
-}
-
-uint32_t node_t::edgecount ()
-{
-    uint32_t u32;
-    memcpy (&u32, _data + 2 * sizeof (uint32_t), sizeof (u32));
-    return u32;
-}
-
-void node_t::set_edgecount (uint32_t value_)
-{
-    memcpy (_data + 2 * sizeof (value_), &value_, sizeof (value_));
-}
-
-unsigned char *node_t::prefix ()
-{
-    return _data + 3 * sizeof (uint32_t);
-}
-
-void node_t::set_prefix (const unsigned char *bytes_)
-{
-    memcpy (prefix (), bytes_, prefix_length ());
-}
-
-unsigned char *node_t::first_bytes ()
-{
-    return prefix () + prefix_length ();
-}
-
-void node_t::set_first_bytes (const unsigned char *bytes_)
-{
-    memcpy (first_bytes (), bytes_, edgecount ());
-}
-
-unsigned char node_t::first_byte_at (size_t index_)
-{
-    zmq_assert (index_ < edgecount ());
-    return first_bytes ()[index_];
-}
-
-void node_t::set_first_byte_at (size_t index_, unsigned char byte_)
-{
-    zmq_assert (index_ < edgecount ());
-    first_bytes ()[index_] = byte_;
-}
-
-unsigned char *node_t::node_pointers ()
-{
-    return prefix () + prefix_length () + edgecount ();
-}
-
-void node_t::set_node_pointers (const unsigned char *pointers_)
-{
-    memcpy (node_pointers (), pointers_, edgecount () * sizeof (void *));
-}
-
-node_t node_t::node_at (size_t index_)
-{
-    zmq_assert (index_ < edgecount ());
-
-    unsigned char *data;
-    memcpy (&data, node_pointers () + index_ * sizeof (void *), sizeof (data));
-    return node_t (data);
-}
-
-void node_t::set_node_at (size_t index_, node_t node_)
-{
-    zmq_assert (index_ < edgecount ());
-    memcpy (node_pointers () + index_ * sizeof (void *), &node_._data,
-            sizeof (node_._data));
-}
-
-void node_t::set_edge_at (size_t index_,
-                          unsigned char first_byte_,
-                          node_t node_)
-{
-    set_first_byte_at (index_, first_byte_);
-    set_node_at (index_, node_);
-}
-
-bool node_t::operator== (node_t other_) const
-{
-    return _data == other_._data;
-}
-
-bool node_t::operator!= (node_t other_) const
-{
-    return !(*this == other_);
-}
-
-void node_t::resize (size_t prefix_length_, size_t edgecount_)
-{
-    const size_t node_size = 3 * sizeof (uint32_t) + prefix_length_
-                             + edgecount_ * (1 + sizeof (void *));
-    unsigned char *new_data =
-      static_cast<unsigned char *> (realloc (_data, node_size));
-    zmq_assert (new_data);
-    _data = new_data;
-    set_prefix_length (static_cast<uint32_t> (prefix_length_));
-    set_edgecount (static_cast<uint32_t> (edgecount_));
-}
-
-node_t make_node (size_t refcount_, size_t prefix_length_, size_t edgecount_)
-{
-    const size_t node_size = 3 * sizeof (uint32_t) + prefix_length_
-                             + edgecount_ * (1 + sizeof (void *));
-
-    unsigned char *data = static_cast<unsigned char *> (malloc (node_size));
-    zmq_assert (data);
-
-    node_t node (data);
-    node.set_refcount (static_cast<uint32_t> (refcount_));
-    node.set_prefix_length (static_cast<uint32_t> (prefix_length_));
-    node.set_edgecount (static_cast<uint32_t> (edgecount_));
-    return node;
-}
-
-// ----------------------------------------------------------------------
-
-zmq::radix_tree_t::radix_tree_t () : _root (make_node (0, 0, 0)), _size (0)
-{
-}
-
-static void free_nodes (node_t node_)
-{
-    for (size_t i = 0, count = node_.edgecount (); i < count; ++i)
-        free_nodes (node_.node_at (i));
-    free (node_._data);
-}
-
-zmq::radix_tree_t::~radix_tree_t ()
-{
-    free_nodes (_root);
-}
-
-match_result_t::match_result_t (size_t key_bytes_matched_,
-                                size_t prefix_bytes_matched_,
-                                size_t edge_index_,
-                                size_t parent_edge_index_,
-                                node_t current_,
-                                node_t parent_,
-                                node_t grandparent_) :
-    _key_bytes_matched (key_bytes_matched_),
-    _prefix_bytes_matched (prefix_bytes_matched_),
-    _edge_index (edge_index_),
-    _parent_edge_index (parent_edge_index_),
-    _current_node (current_),
-    _parent_node (parent_),
-    _grandparent_node (grandparent_)
-{
-}
-
-match_result_t zmq::radix_tree_t::match (const unsigned char *key_,
-                                         size_t key_size_,
-                                         bool is_lookup_ = false) const
-{
-    zmq_assert (key_);
-
-    // Node we're currently at in the traversal and its predecessors.
-    node_t current_node = _root;
-    node_t parent_node = current_node;
-    node_t grandparent_node = current_node;
-    // Index of the next byte to match in the key.
-    size_t key_byte_index = 0;
-    // Index of the next byte to match in the current node's prefix.
-    size_t prefix_byte_index = 0;
-    // Index of the edge from parent to current node.
-    size_t edge_index = 0;
-    // Index of the edge from grandparent to parent.
-    size_t parent_edge_index = 0;
-
-    while (current_node.prefix_length () > 0 || current_node.edgecount () > 0) {
-        const unsigned char *const prefix = current_node.prefix ();
-        const size_t prefix_length = current_node.prefix_length ();
-
-        for (prefix_byte_index = 0;
-             prefix_byte_index < prefix_length && key_byte_index < key_size_;
-             ++prefix_byte_index, ++key_byte_index) {
-            if (prefix[prefix_byte_index] != key_[key_byte_index])
-                break;
-        }
-
-        // Even if a prefix of the key matches and we're doing a
-        // lookup, this means we've found a matching subscription.
-        if (is_lookup_ && prefix_byte_index == prefix_length
-            && current_node.refcount () > 0) {
-            key_byte_index = key_size_;
-            break;
-        }
-
-        // There was a mismatch or we've matched the whole key, so
-        // there's nothing more to do.
-        if (prefix_byte_index != prefix_length || key_byte_index == key_size_)
-            break;
-
-        // We need to match the rest of the key. Check if there's an
-        // outgoing edge from this node.
-        node_t next_node = current_node;
-        for (size_t i = 0, edgecount = current_node.edgecount (); i < edgecount;
-             ++i) {
-            if (current_node.first_byte_at (i) == key_[key_byte_index]) {
-                parent_edge_index = edge_index;
-                edge_index = i;
-                next_node = current_node.node_at (i);
-                break;
-            }
-        }
-
-        if (next_node == current_node)
-            break; // No outgoing edge.
-        grandparent_node = parent_node;
-        parent_node = current_node;
-        current_node = next_node;
-    }
-
-    return match_result_t (key_byte_index, prefix_byte_index, edge_index,
-                           parent_edge_index, current_node, parent_node,
-                           grandparent_node);
-}
-
-bool zmq::radix_tree_t::add (const unsigned char *key_, size_t key_size_)
-{
-    const match_result_t match_result = match (key_, key_size_);
-    const size_t key_bytes_matched = match_result._key_bytes_matched;
-    const size_t prefix_bytes_matched = match_result._prefix_bytes_matched;
-    const size_t edge_index = match_result._edge_index;
-    node_t current_node = match_result._current_node;
-    node_t parent_node = match_result._parent_node;
-
-    if (key_bytes_matched != key_size_) {
-        // Not all characters match, we might have to split the node.
-        if (prefix_bytes_matched == current_node.prefix_length ()) {
-            // The mismatch is at one of the outgoing edges, so we
-            // create an edge from the current node to a new leaf node
-            // that has the rest of the key as the prefix.
-            node_t key_node = make_node (1, key_size_ - key_bytes_matched, 0);
-            key_node.set_prefix (key_ + key_bytes_matched);
-
-            // Reallocate for one more edge.
-            current_node.resize (current_node.prefix_length (),
-                                 current_node.edgecount () + 1);
-
-            // Make room for the new edge. We need to shift the chunk
-            // of node pointers one byte to the right. Since resize()
-            // increments the edgecount by 1, node_pointers() tells us the
-            // destination address. The chunk of node pointers starts
-            // at one byte to the left of this destination.
-            //
-            // Since the regions can overlap, we use memmove.
-            memmove (current_node.node_pointers (),
-                     current_node.node_pointers () - 1,
-                     (current_node.edgecount () - 1) * sizeof (void *));
-
-            // Add an edge to the new node.
-            current_node.set_edge_at (current_node.edgecount () - 1,
-                                      key_[key_bytes_matched], key_node);
-
-            // We need to update all pointers to the current node
-            // after the call to resize().
-            if (current_node.prefix_length () == 0)
-                _root._data = current_node._data;
-            else
-                parent_node.set_node_at (edge_index, current_node);
-            ++_size;
-            return true;
-        }
-
-        // There was a mismatch, so we need to split this node.
-        //
-        // Create two nodes that will be reachable from the parent.
-        // One node will have the rest of the characters from the key,
-        // and the other node will have the rest of the characters
-        // from the current node's prefix.
-        node_t key_node = make_node (1, key_size_ - key_bytes_matched, 0);
-        node_t split_node =
-          make_node (current_node.refcount (),
-                     current_node.prefix_length () - prefix_bytes_matched,
-                     current_node.edgecount ());
-
-        // Copy the prefix chunks to the new nodes.
-        key_node.set_prefix (key_ + key_bytes_matched);
-        split_node.set_prefix (current_node.prefix () + prefix_bytes_matched);
-
-        // Copy the current node's edges to the new node.
-        split_node.set_first_bytes (current_node.first_bytes ());
-        split_node.set_node_pointers (current_node.node_pointers ());
-
-        // Resize the current node to accommodate a prefix comprising
-        // the matched characters and 2 outgoing edges to the above
-        // nodes. Set the refcount to 0 since this node doesn't hold a
-        // key.
-        current_node.resize (prefix_bytes_matched, 2);
-        current_node.set_refcount (0);
-
-        // Add links to the new nodes. We don't need to copy the
-        // prefix since resize() retains it in the current node.
-        current_node.set_edge_at (0, key_node.prefix ()[0], key_node);
-        current_node.set_edge_at (1, split_node.prefix ()[0], split_node);
-
-        ++_size;
-        parent_node.set_node_at (edge_index, current_node);
-        return true;
-    }
-
-    // All characters in the key match, but we still might need to split.
-    if (prefix_bytes_matched != current_node.prefix_length ()) {
-        // All characters in the key match, but not all characters
-        // from the current node's prefix match.
-
-        // Create a node that contains the rest of the characters from
-        // the current node's prefix and the outgoing edges from the
-        // current node.
-        node_t split_node =
-          make_node (current_node.refcount (),
-                     current_node.prefix_length () - prefix_bytes_matched,
-                     current_node.edgecount ());
-        split_node.set_prefix (current_node.prefix () + prefix_bytes_matched);
-        split_node.set_first_bytes (current_node.first_bytes ());
-        split_node.set_node_pointers (current_node.node_pointers ());
-
-        // Resize the current node to hold only the matched characters
-        // from its prefix and one edge to the new node.
-        current_node.resize (prefix_bytes_matched, 1);
-
-        // Add an edge to the split node and set the refcount to 1
-        // since this key wasn't inserted earlier. We don't need to
-        // set the prefix because the first `prefix_bytes_matched` bytes
-        // in the prefix are preserved by resize().
-        current_node.set_edge_at (0, split_node.prefix ()[0], split_node);
-        current_node.set_refcount (1);
-
-        ++_size;
-        parent_node.set_node_at (edge_index, current_node);
-        return true;
-    }
-
-    zmq_assert (key_bytes_matched == key_size_);
-    zmq_assert (prefix_bytes_matched == current_node.prefix_length ());
-
-    ++_size;
-    current_node.set_refcount (current_node.refcount () + 1);
-    return current_node.refcount () == 1;
-}
-
-bool zmq::radix_tree_t::rm (const unsigned char *key_, size_t key_size_)
-{
-    const match_result_t match_result = match (key_, key_size_);
-    const size_t key_bytes_matched = match_result._key_bytes_matched;
-    const size_t prefix_bytes_matched = match_result._prefix_bytes_matched;
-    const size_t edge_index = match_result._edge_index;
-    const size_t parent_edge_index = match_result._parent_edge_index;
-    node_t current_node = match_result._current_node;
-    node_t parent_node = match_result._parent_node;
-    node_t grandparent_node = match_result._grandparent_node;
-
-    if (key_bytes_matched != key_size_
-        || prefix_bytes_matched != current_node.prefix_length ()
-        || current_node.refcount () == 0)
-        return false;
-
-    current_node.set_refcount (current_node.refcount () - 1);
-    --_size;
-    if (current_node.refcount () > 0)
-        return false;
-
-    // Don't delete the root node.
-    if (current_node == _root)
-        return true;
-
-    const size_t outgoing_edges = current_node.edgecount ();
-    if (outgoing_edges > 1)
-        // This node can't be merged with any other node, so there's
-        // nothing more to do.
-        return true;
-
-    if (outgoing_edges == 1) {
-        // Merge this node with the single child node.
-        node_t child = current_node.node_at (0);
-
-        // Make room for the child node's prefix and edges. We need to
-        // keep the old prefix length since resize() will overwrite
-        // it.
-        const uint32_t old_prefix_length = current_node.prefix_length ();
-        current_node.resize (old_prefix_length + child.prefix_length (),
-                             child.edgecount ());
-
-        // Append the child node's prefix to the current node.
-        memcpy (current_node.prefix () + old_prefix_length, child.prefix (),
-                child.prefix_length ());
-
-        // Copy the rest of child node's data to the current node.
-        current_node.set_first_bytes (child.first_bytes ());
-        current_node.set_node_pointers (child.node_pointers ());
-        current_node.set_refcount (child.refcount ());
-
-        free (child._data);
-        parent_node.set_node_at (edge_index, current_node);
-        return true;
-    }
-
-    if (parent_node.edgecount () == 2 && parent_node.refcount () == 0
-        && parent_node != _root) {
-        // Removing this node leaves the parent with one child.
-        // If the parent doesn't hold a key or if it isn't the root,
-        // we can merge it with its single child node.
-        zmq_assert (edge_index < 2);
-        node_t other_child = parent_node.node_at (!edge_index);
-
-        // Make room for the child node's prefix and edges. We need to
-        // keep the old prefix length since resize() will overwrite
-        // it.
-        const uint32_t old_prefix_length = parent_node.prefix_length ();
-        parent_node.resize (old_prefix_length + other_child.prefix_length (),
-                            other_child.edgecount ());
-
-        // Append the child node's prefix to the current node.
-        memcpy (parent_node.prefix () + old_prefix_length,
-                other_child.prefix (), other_child.prefix_length ());
-
-        // Copy the rest of child node's data to the current node.
-        parent_node.set_first_bytes (other_child.first_bytes ());
-        parent_node.set_node_pointers (other_child.node_pointers ());
-        parent_node.set_refcount (other_child.refcount ());
-
-        free (current_node._data);
-        free (other_child._data);
-        grandparent_node.set_node_at (parent_edge_index, parent_node);
-        return true;
-    }
-
-    // This is a leaf node that doesn't leave its parent with one
-    // outgoing edge. Remove the outgoing edge to this node from the
-    // parent.
-    zmq_assert (outgoing_edges == 0);
-
-    // Replace the edge to the current node with the last edge. An
-    // edge consists of a byte and a pointer to the next node. First
-    // replace the byte.
-    const size_t last_index = parent_node.edgecount () - 1;
-    const unsigned char last_byte = parent_node.first_byte_at (last_index);
-    const node_t last_node = parent_node.node_at (last_index);
-    parent_node.set_edge_at (edge_index, last_byte, last_node);
-
-    // Move the chunk of pointers one byte to the left, effectively
-    // deleting the last byte in the region of first bytes by
-    // overwriting it.
-    memmove (parent_node.node_pointers () - 1, parent_node.node_pointers (),
-             parent_node.edgecount () * sizeof (void *));
-
-    // Shrink the parent node to the new size, which "deletes" the
-    // last pointer in the chunk of node pointers.
-    parent_node.resize (parent_node.prefix_length (),
-                        parent_node.edgecount () - 1);
-
-    // Nothing points to this node now, so we can reclaim it.
-    free (current_node._data);
-
-    if (parent_node.prefix_length () == 0)
-        _root._data = parent_node._data;
-    else
-        grandparent_node.set_node_at (parent_edge_index, parent_node);
-    return true;
-}
-
-bool zmq::radix_tree_t::check (const unsigned char *key_, size_t key_size_)
-{
-    if (_root.refcount () > 0)
-        return true;
-
-    match_result_t match_result = match (key_, key_size_, true);
-    return match_result._key_bytes_matched == key_size_
-           && match_result._prefix_bytes_matched
-                == match_result._current_node.prefix_length ()
-           && match_result._current_node.refcount () > 0;
-}
-
-static void
-visit_keys (node_t node_,
-            std::vector<unsigned char> &buffer_,
-            void (*func_) (unsigned char *data_, size_t size_, void *arg_),
-            void *arg_)
-{
-    const size_t prefix_length = node_.prefix_length ();
-    buffer_.reserve (buffer_.size () + prefix_length);
-    std::copy (node_.prefix (), node_.prefix () + prefix_length,
-               std::back_inserter (buffer_));
-
-    if (node_.refcount () > 0) {
-        zmq_assert (!buffer_.empty ());
-        func_ (&buffer_[0], buffer_.size (), arg_);
-    }
-
-    for (size_t i = 0, edgecount = node_.edgecount (); i < edgecount; ++i) {
-        visit_keys (node_.node_at (i), buffer_, func_, arg_);
-    }
-    buffer_.resize (static_cast<uint32_t> (buffer_.size () - prefix_length));
-}
-
-void zmq::radix_tree_t::apply (
-  void (*func_) (unsigned char *data_, size_t size_, void *arg_), void *arg_)
-{
-    if (_root.refcount () > 0)
-        func_ (NULL, 0, arg_); // Root node is always empty.
-
-    std::vector<unsigned char> buffer;
-    for (size_t i = 0; i < _root.edgecount (); ++i)
-        visit_keys (_root.node_at (i), buffer, func_, arg_);
-}
-
-size_t zmq::radix_tree_t::size () const
-{
-    return _size;
-}
diff --git a/libs/libzmq/src/radix_tree.hpp b/libs/libzmq/src/radix_tree.hpp
deleted file mode 100644
index 02e7496..0000000
--- a/libs/libzmq/src/radix_tree.hpp
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
-    Copyright (c) 2018 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef RADIX_TREE_HPP
-#define RADIX_TREE_HPP
-
-#include <stddef.h>
-
-#include "stdint.hpp"
-
-// Wrapper type for a node's data layout.
-//
-// There are 3 32-bit unsigned integers that act as a header. These
-// integers represent the following values in this order:
-//
-// (1) The reference count of the key held by the node. This is 0 if
-// the node doesn't hold a key.
-//
-// (2) The number of characters in the node's prefix. The prefix is a
-// part of one or more keys in the tree, e.g. the prefix of each node
-// in a trie consists of a single character.
-//
-// (3) The number of outgoing edges from this node.
-//
-// The rest of the layout consists of 3 chunks in this order:
-//
-// (1) The node's prefix as a sequence of one or more bytes. The root
-// node always has an empty prefix, unlike other nodes in the tree.
-//
-// (2) The first byte of the prefix of each of this node's children.
-//
-// (3) The pointer to each child node.
-//
-// The link to each child is looked up using its index, e.g. the child
-// with index 0 will have its first byte and node pointer at the start
-// of the chunk of first bytes and node pointers respectively.
-struct node_t
-{
-    explicit node_t (unsigned char *data_);
-
-    bool operator== (node_t other_) const;
-    bool operator!= (node_t other_) const;
-
-    uint32_t refcount ();
-    uint32_t prefix_length ();
-    uint32_t edgecount ();
-    unsigned char *prefix ();
-    unsigned char *first_bytes ();
-    unsigned char first_byte_at (size_t index_);
-    unsigned char *node_pointers ();
-    node_t node_at (size_t index_);
-    void set_refcount (uint32_t value_);
-    void set_prefix_length (uint32_t value_);
-    void set_edgecount (uint32_t value_);
-    void set_prefix (const unsigned char *bytes_);
-    void set_first_bytes (const unsigned char *bytes_);
-    void set_first_byte_at (size_t index_, unsigned char byte_);
-    void set_node_pointers (const unsigned char *pointers_);
-    void set_node_at (size_t index_, node_t node_);
-    void set_edge_at (size_t index_, unsigned char first_byte_, node_t node_);
-    void resize (size_t prefix_length_, size_t edgecount_);
-
-    unsigned char *_data;
-};
-
-node_t make_node (size_t refcount_, size_t prefix_length_, size_t edgecount_);
-
-struct match_result_t
-{
-    match_result_t (size_t key_bytes_matched_,
-                    size_t prefix_bytes_matched_,
-                    size_t edge_index_,
-                    size_t parent_edge_index_,
-                    node_t current_,
-                    node_t parent_,
-                    node_t grandparent);
-
-    size_t _key_bytes_matched;
-    size_t _prefix_bytes_matched;
-    size_t _edge_index;
-    size_t _parent_edge_index;
-    node_t _current_node;
-    node_t _parent_node;
-    node_t _grandparent_node;
-};
-
-namespace zmq
-{
-class radix_tree_t
-{
-  public:
-    radix_tree_t ();
-    ~radix_tree_t ();
-
-    //  Add key to the tree. Returns true if this was a new key rather
-    //  than a duplicate.
-    bool add (const unsigned char *key_, size_t key_size_);
-
-    //  Remove key from the tree. Returns true if the item is actually
-    //  removed from the tree.
-    bool rm (const unsigned char *key_, size_t key_size_);
-
-    //  Check whether particular key is in the tree.
-    bool check (const unsigned char *key_, size_t key_size_);
-
-    //  Apply the function supplied to each key in the tree.
-    void apply (void (*func_) (unsigned char *data, size_t size, void *arg),
-                void *arg_);
-
-    size_t size () const;
-
-  private:
-    match_result_t
-    match (const unsigned char *key_, size_t key_size_, bool is_lookup_) const;
-
-    node_t _root;
-    size_t _size;
-};
-}
-
-#endif
diff --git a/libs/libzmq/src/random.cpp b/libs/libzmq/src/random.cpp
deleted file mode 100644
index 4700aa5..0000000
--- a/libs/libzmq/src/random.cpp
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include <stdlib.h>
-
-#if !defined ZMQ_HAVE_WINDOWS
-#include <unistd.h>
-#endif
-
-#include "random.hpp"
-#include "stdint.hpp"
-#include "clock.hpp"
-#include "mutex.hpp"
-#include "macros.hpp"
-
-#if defined(ZMQ_USE_TWEETNACL)
-#include "tweetnacl.h"
-#elif defined(ZMQ_USE_LIBSODIUM)
-#include "sodium.h"
-#endif
-
-void zmq::seed_random ()
-{
-#if defined ZMQ_HAVE_WINDOWS
-    const int pid = static_cast<int> (GetCurrentProcessId ());
-#else
-    int pid = static_cast<int> (getpid ());
-#endif
-    srand (static_cast<unsigned int> (clock_t::now_us () + pid));
-}
-
-uint32_t zmq::generate_random ()
-{
-    //  Compensate for the fact that rand() returns signed integer.
-    const uint32_t low = static_cast<uint32_t> (rand ());
-    uint32_t high = static_cast<uint32_t> (rand ());
-    high <<= (sizeof (int) * 8 - 1);
-    return high | low;
-}
-
-//  When different threads have their own context the file descriptor
-//  variable is shared and is subject to race conditions in tweetnacl,
-//  that lead to file descriptors leaks. In long-running programs with
-//  ephemeral threads this is a problem as it accumulates.
-//  thread-local storage cannot be used to initialise the file descriptor
-//  as it is perfectly legal to share a context among many threads, each
-//  of which might call curve APIs.
-//  Also libsodium documentation specifically states that sodium_init
-//  must not be called concurrently from multiple threads, for the
-//  same reason. Inspecting the code also reveals that the close API is
-//  not thread safe.
-//  The context class cannot be used with static variables as the curve
-//  utility APIs like zmq_curve_keypair also call into the crypto
-//  library.
-//  The safest solution for all use cases therefore is to have a
-//  static lock to serialize calls into an initialiser and a finaliser,
-//  using refcounts to make sure that a thread does not close the library
-//  while another is still using it. To avoid the static initialization
-//  order fiasco, this is done using function-local statics, if the
-//  compiler implementation supports thread-safe initialization of those.
-//  Otherwise, we fall back to global statics.
-//  HOWEVER, this initialisation code imposes ordering constraints, which
-//  are not obvious to users of libzmq, and may lead to problems if atexit
-//  or similar methods are used for cleanup.
-//  In that case, a strict ordering is imposed whereas the contexts MUST
-//  be initialised BEFORE registering the cleanup with atexit. CZMQ is an
-//  example. Hence we make the choice to restrict this global transition
-//  mechanism ONLY to Tweenacl + *NIX (when using /dev/urandom) as it is
-//  the less risky option.
-
-//  TODO if there is some other user of libsodium besides libzmq, this must
-//    be synchronized by the application. This should probably also be
-//    configurable via config.h
-
-//  TODO this should probably be done via config.h
-#if __cplusplus >= 201103L                                                     \
-  || (defined(__cpp_threadsafe_static_init)                                    \
-      && __cpp_threadsafe_static_init >= 200806)                               \
-  || (defined(_MSC_VER) && _MSC_VER >= 1900)
-#define ZMQ_HAVE_THREADSAFE_STATIC_LOCAL_INIT 1
-//  TODO this might probably also be set if a sufficiently recent gcc is used
-//  without -fno-threadsafe-statics, but this cannot be determined at
-//  compile-time, so it must be set via config.h
-#else
-#define ZMQ_HAVE_THREADSAFE_STATIC_LOCAL_INIT 0
-#endif
-
-#if !ZMQ_HAVE_THREADSAFE_STATIC_LOCAL_INIT                                     \
-  && (defined(ZMQ_USE_TWEETNACL) && !defined(ZMQ_HAVE_WINDOWS)                 \
-      && !defined(ZMQ_HAVE_GETRANDOM))
-static unsigned int random_refcount = 0;
-static zmq::mutex_t random_sync;
-#endif
-
-static void manage_random (bool init_)
-{
-#if defined(ZMQ_USE_TWEETNACL) && !defined(ZMQ_HAVE_WINDOWS)                   \
-  && !defined(ZMQ_HAVE_GETRANDOM)
-
-#if ZMQ_HAVE_THREADSAFE_STATIC_LOCAL_INIT
-    static int random_refcount = 0;
-    static zmq::mutex_t random_sync;
-#endif
-
-    if (init_) {
-        zmq::scoped_lock_t locker (random_sync);
-
-        if (random_refcount == 0) {
-            int rc = sodium_init ();
-            zmq_assert (rc != -1);
-        }
-
-        ++random_refcount;
-    } else {
-        zmq::scoped_lock_t locker (random_sync);
-        --random_refcount;
-
-        if (random_refcount == 0) {
-            randombytes_close ();
-        }
-    }
-
-#elif defined(ZMQ_USE_LIBSODIUM)
-    if (init_) {
-        int rc = sodium_init ();
-        zmq_assert (rc != -1);
-#if defined(ZMQ_LIBSODIUM_RANDOMBYTES_CLOSE)
-    } else {
-        // randombytes_close either a no-op or not threadsafe
-        // doing this without refcounting can cause crashes
-        // if called while a context is active
-        randombytes_close ();
-#endif
-    }
-#else
-    LIBZMQ_UNUSED (init_);
-#endif
-}
-
-void zmq::random_open ()
-{
-    manage_random (true);
-}
-
-void zmq::random_close ()
-{
-    manage_random (false);
-}
diff --git a/libs/libzmq/src/random.hpp b/libs/libzmq/src/random.hpp
deleted file mode 100644
index 0b57adb..0000000
--- a/libs/libzmq/src/random.hpp
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_RANDOM_HPP_INCLUDED__
-#define __ZMQ_RANDOM_HPP_INCLUDED__
-
-#include "stdint.hpp"
-
-namespace zmq
-{
-//  Seeds the random number generator.
-void seed_random ();
-
-//  Generates random value.
-uint32_t generate_random ();
-
-//  [De-]Initialise crypto library, if needed.
-//  Serialised and refcounted, so that it can be called
-//  from multiple threads, each with its own context, and from
-//  the various zmq_utils curve functions safely.
-void random_open ();
-void random_close ();
-}
-
-#endif
diff --git a/libs/libzmq/src/raw_decoder.cpp b/libs/libzmq/src/raw_decoder.cpp
deleted file mode 100644
index 97ed797..0000000
--- a/libs/libzmq/src/raw_decoder.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include <stdlib.h>
-#include <string.h>
-
-#include "raw_decoder.hpp"
-#include "err.hpp"
-
-zmq::raw_decoder_t::raw_decoder_t (size_t bufsize_) : _allocator (bufsize_, 1)
-{
-    const int rc = _in_progress.init ();
-    errno_assert (rc == 0);
-}
-
-zmq::raw_decoder_t::~raw_decoder_t ()
-{
-    const int rc = _in_progress.close ();
-    errno_assert (rc == 0);
-}
-
-void zmq::raw_decoder_t::get_buffer (unsigned char **data_, size_t *size_)
-{
-    *data_ = _allocator.allocate ();
-    *size_ = _allocator.size ();
-}
-
-int zmq::raw_decoder_t::decode (const uint8_t *data_,
-                                size_t size_,
-                                size_t &bytes_used_)
-{
-    const int rc =
-      _in_progress.init (const_cast<unsigned char *> (data_), size_,
-                         shared_message_memory_allocator::call_dec_ref,
-                         _allocator.buffer (), _allocator.provide_content ());
-
-    // if the buffer serves as memory for a zero-copy message, release it
-    // and allocate a new buffer in get_buffer for the next decode
-    if (_in_progress.is_zcmsg ()) {
-        _allocator.advance_content ();
-        _allocator.release ();
-    }
-
-    errno_assert (rc != -1);
-    bytes_used_ = size_;
-    return 1;
-}
diff --git a/libs/libzmq/src/raw_decoder.hpp b/libs/libzmq/src/raw_decoder.hpp
deleted file mode 100644
index 4f6e834..0000000
--- a/libs/libzmq/src/raw_decoder.hpp
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_RAW_DECODER_HPP_INCLUDED__
-#define __ZMQ_RAW_DECODER_HPP_INCLUDED__
-
-#include "msg.hpp"
-#include "i_decoder.hpp"
-#include "stdint.hpp"
-#include "decoder_allocators.hpp"
-
-namespace zmq
-{
-//  Decoder for 0MQ v1 framing protocol. Converts data stream into messages.
-
-class raw_decoder_t ZMQ_FINAL : public i_decoder
-{
-  public:
-    raw_decoder_t (size_t bufsize_);
-    ~raw_decoder_t ();
-
-    //  i_decoder interface.
-
-    void get_buffer (unsigned char **data_, size_t *size_);
-
-    int decode (const unsigned char *data_, size_t size_, size_t &bytes_used_);
-
-    msg_t *msg () { return &_in_progress; }
-
-    void resize_buffer (size_t) {}
-
-  private:
-    msg_t _in_progress;
-
-    shared_message_memory_allocator _allocator;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (raw_decoder_t)
-};
-}
-
-#endif
diff --git a/libs/libzmq/src/raw_encoder.cpp b/libs/libzmq/src/raw_encoder.cpp
deleted file mode 100644
index 39c7633..0000000
--- a/libs/libzmq/src/raw_encoder.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "encoder.hpp"
-#include "raw_encoder.hpp"
-#include "msg.hpp"
-
-zmq::raw_encoder_t::raw_encoder_t (size_t bufsize_) :
-    encoder_base_t<raw_encoder_t> (bufsize_)
-{
-    //  Write 0 bytes to the batch and go to message_ready state.
-    next_step (NULL, 0, &raw_encoder_t::raw_message_ready, true);
-}
-
-zmq::raw_encoder_t::~raw_encoder_t ()
-{
-}
-
-void zmq::raw_encoder_t::raw_message_ready ()
-{
-    next_step (in_progress ()->data (), in_progress ()->size (),
-               &raw_encoder_t::raw_message_ready, true);
-}
diff --git a/libs/libzmq/src/raw_encoder.hpp b/libs/libzmq/src/raw_encoder.hpp
deleted file mode 100644
index 0485e64..0000000
--- a/libs/libzmq/src/raw_encoder.hpp
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_RAW_ENCODER_HPP_INCLUDED__
-#define __ZMQ_RAW_ENCODER_HPP_INCLUDED__
-
-#include <stddef.h>
-#include <string.h>
-#include <stdlib.h>
-
-#include "encoder.hpp"
-
-namespace zmq
-{
-//  Encoder for 0MQ framing protocol. Converts messages into data batches.
-
-class raw_encoder_t ZMQ_FINAL : public encoder_base_t<raw_encoder_t>
-{
-  public:
-    raw_encoder_t (size_t bufsize_);
-    ~raw_encoder_t ();
-
-  private:
-    void raw_message_ready ();
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (raw_encoder_t)
-};
-}
-
-#endif
diff --git a/libs/libzmq/src/raw_engine.cpp b/libs/libzmq/src/raw_engine.cpp
deleted file mode 100644
index 5910cd9..0000000
--- a/libs/libzmq/src/raw_engine.cpp
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
-    Copyright (c) 2007-2019 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "macros.hpp"
-
-#include <limits.h>
-#include <string.h>
-
-#ifndef ZMQ_HAVE_WINDOWS
-#include <unistd.h>
-#endif
-
-#include <new>
-#include <sstream>
-
-#include "raw_engine.hpp"
-#include "io_thread.hpp"
-#include "session_base.hpp"
-#include "v1_encoder.hpp"
-#include "v1_decoder.hpp"
-#include "v2_encoder.hpp"
-#include "v2_decoder.hpp"
-#include "null_mechanism.hpp"
-#include "plain_client.hpp"
-#include "plain_server.hpp"
-#include "gssapi_client.hpp"
-#include "gssapi_server.hpp"
-#include "curve_client.hpp"
-#include "curve_server.hpp"
-#include "raw_decoder.hpp"
-#include "raw_encoder.hpp"
-#include "config.hpp"
-#include "err.hpp"
-#include "ip.hpp"
-#include "tcp.hpp"
-#include "likely.hpp"
-#include "wire.hpp"
-
-zmq::raw_engine_t::raw_engine_t (
-  fd_t fd_,
-  const options_t &options_,
-  const endpoint_uri_pair_t &endpoint_uri_pair_) :
-    stream_engine_base_t (fd_, options_, endpoint_uri_pair_, false)
-{
-}
-
-zmq::raw_engine_t::~raw_engine_t ()
-{
-}
-
-void zmq::raw_engine_t::plug_internal ()
-{
-    // no handshaking for raw sock, instantiate raw encoder and decoders
-    _encoder = new (std::nothrow) raw_encoder_t (_options.out_batch_size);
-    alloc_assert (_encoder);
-
-    _decoder = new (std::nothrow) raw_decoder_t (_options.in_batch_size);
-    alloc_assert (_decoder);
-
-    _next_msg = &raw_engine_t::pull_msg_from_session;
-    _process_msg = static_cast<int (stream_engine_base_t::*) (msg_t *)> (
-      &raw_engine_t::push_raw_msg_to_session);
-
-    properties_t properties;
-    if (init_properties (properties)) {
-        //  Compile metadata.
-        zmq_assert (_metadata == NULL);
-        _metadata = new (std::nothrow) metadata_t (properties);
-        alloc_assert (_metadata);
-    }
-
-    if (_options.raw_notify) {
-        //  For raw sockets, send an initial 0-length message to the
-        // application so that it knows a peer has connected.
-        msg_t connector;
-        connector.init ();
-        push_raw_msg_to_session (&connector);
-        connector.close ();
-        session ()->flush ();
-    }
-
-    set_pollin ();
-    set_pollout ();
-    //  Flush all the data that may have been already received downstream.
-    in_event ();
-}
-
-bool zmq::raw_engine_t::handshake ()
-{
-    return true;
-}
-
-void zmq::raw_engine_t::error (error_reason_t reason_)
-{
-    if (_options.raw_socket && _options.raw_notify) {
-        //  For raw sockets, send a final 0-length message to the application
-        //  so that it knows the peer has been disconnected.
-        msg_t terminator;
-        terminator.init ();
-        (this->*_process_msg) (&terminator);
-        terminator.close ();
-    }
-    stream_engine_base_t::error (reason_);
-}
-
-int zmq::raw_engine_t::push_raw_msg_to_session (msg_t *msg_)
-{
-    if (_metadata && _metadata != msg_->metadata ())
-        msg_->set_metadata (_metadata);
-    return push_msg_to_session (msg_);
-}
diff --git a/libs/libzmq/src/raw_engine.hpp b/libs/libzmq/src/raw_engine.hpp
deleted file mode 100644
index cf60bb6..0000000
--- a/libs/libzmq/src/raw_engine.hpp
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
-    Copyright (c) 2007-2019 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_RAW_ENGINE_HPP_INCLUDED__
-#define __ZMQ_RAW_ENGINE_HPP_INCLUDED__
-
-#include <stddef.h>
-
-#include "fd.hpp"
-#include "i_engine.hpp"
-#include "io_object.hpp"
-#include "i_encoder.hpp"
-#include "i_decoder.hpp"
-#include "options.hpp"
-#include "socket_base.hpp"
-#include "metadata.hpp"
-#include "msg.hpp"
-#include "stream_engine_base.hpp"
-
-namespace zmq
-{
-//  Protocol revisions
-
-class io_thread_t;
-class session_base_t;
-class mechanism_t;
-
-//  This engine handles any socket with SOCK_STREAM semantics,
-//  e.g. TCP socket or an UNIX domain socket.
-
-class raw_engine_t ZMQ_FINAL : public stream_engine_base_t
-{
-  public:
-    raw_engine_t (fd_t fd_,
-                  const options_t &options_,
-                  const endpoint_uri_pair_t &endpoint_uri_pair_);
-    ~raw_engine_t ();
-
-  protected:
-    void error (error_reason_t reason_);
-    void plug_internal ();
-    bool handshake ();
-
-  private:
-    int push_raw_msg_to_session (msg_t *msg_);
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (raw_engine_t)
-};
-}
-
-#endif
diff --git a/libs/libzmq/src/reaper.cpp b/libs/libzmq/src/reaper.cpp
deleted file mode 100644
index 525bf57..0000000
--- a/libs/libzmq/src/reaper.cpp
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "macros.hpp"
-#include "reaper.hpp"
-#include "socket_base.hpp"
-#include "err.hpp"
-
-zmq::reaper_t::reaper_t (class ctx_t *ctx_, uint32_t tid_) :
-    object_t (ctx_, tid_),
-    _mailbox_handle (static_cast<poller_t::handle_t> (NULL)),
-    _poller (NULL),
-    _sockets (0),
-    _terminating (false)
-{
-    if (!_mailbox.valid ())
-        return;
-
-    _poller = new (std::nothrow) poller_t (*ctx_);
-    alloc_assert (_poller);
-
-    if (_mailbox.get_fd () != retired_fd) {
-        _mailbox_handle = _poller->add_fd (_mailbox.get_fd (), this);
-        _poller->set_pollin (_mailbox_handle);
-    }
-
-#ifdef HAVE_FORK
-    _pid = getpid ();
-#endif
-}
-
-zmq::reaper_t::~reaper_t ()
-{
-    LIBZMQ_DELETE (_poller);
-}
-
-zmq::mailbox_t *zmq::reaper_t::get_mailbox ()
-{
-    return &_mailbox;
-}
-
-void zmq::reaper_t::start ()
-{
-    zmq_assert (_mailbox.valid ());
-
-    //  Start the thread.
-    _poller->start ("Reaper");
-}
-
-void zmq::reaper_t::stop ()
-{
-    if (get_mailbox ()->valid ()) {
-        send_stop ();
-    }
-}
-
-void zmq::reaper_t::in_event ()
-{
-    while (true) {
-#ifdef HAVE_FORK
-        if (unlikely (_pid != getpid ())) {
-            //printf("zmq::reaper_t::in_event return in child process %d\n", (int)getpid());
-            return;
-        }
-#endif
-
-        //  Get the next command. If there is none, exit.
-        command_t cmd;
-        const int rc = _mailbox.recv (&cmd, 0);
-        if (rc != 0 && errno == EINTR)
-            continue;
-        if (rc != 0 && errno == EAGAIN)
-            break;
-        errno_assert (rc == 0);
-
-        //  Process the command.
-        cmd.destination->process_command (cmd);
-    }
-}
-
-void zmq::reaper_t::out_event ()
-{
-    zmq_assert (false);
-}
-
-void zmq::reaper_t::timer_event (int)
-{
-    zmq_assert (false);
-}
-
-void zmq::reaper_t::process_stop ()
-{
-    _terminating = true;
-
-    //  If there are no sockets being reaped finish immediately.
-    if (!_sockets) {
-        send_done ();
-        _poller->rm_fd (_mailbox_handle);
-        _poller->stop ();
-    }
-}
-
-void zmq::reaper_t::process_reap (socket_base_t *socket_)
-{
-    //  Add the socket to the poller.
-    socket_->start_reaping (_poller);
-
-    ++_sockets;
-}
-
-void zmq::reaper_t::process_reaped ()
-{
-    --_sockets;
-
-    //  If reaped was already asked to terminate and there are no more sockets,
-    //  finish immediately.
-    if (!_sockets && _terminating) {
-        send_done ();
-        _poller->rm_fd (_mailbox_handle);
-        _poller->stop ();
-    }
-}
diff --git a/libs/libzmq/src/reaper.hpp b/libs/libzmq/src/reaper.hpp
deleted file mode 100644
index 7b2d51c..0000000
--- a/libs/libzmq/src/reaper.hpp
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_REAPER_HPP_INCLUDED__
-#define __ZMQ_REAPER_HPP_INCLUDED__
-
-#include "object.hpp"
-#include "mailbox.hpp"
-#include "poller.hpp"
-#include "i_poll_events.hpp"
-
-namespace zmq
-{
-class ctx_t;
-class socket_base_t;
-
-class reaper_t ZMQ_FINAL : public object_t, public i_poll_events
-{
-  public:
-    reaper_t (zmq::ctx_t *ctx_, uint32_t tid_);
-    ~reaper_t ();
-
-    mailbox_t *get_mailbox ();
-
-    void start ();
-    void stop ();
-
-    //  i_poll_events implementation.
-    void in_event ();
-    void out_event ();
-    void timer_event (int id_);
-
-  private:
-    //  Command handlers.
-    void process_stop ();
-    void process_reap (zmq::socket_base_t *socket_);
-    void process_reaped ();
-
-    //  Reaper thread accesses incoming commands via this mailbox.
-    mailbox_t _mailbox;
-
-    //  Handle associated with mailbox' file descriptor.
-    poller_t::handle_t _mailbox_handle;
-
-    //  I/O multiplexing is performed using a poller object.
-    poller_t *_poller;
-
-    //  Number of sockets being reaped at the moment.
-    int _sockets;
-
-    //  If true, we were already asked to terminate.
-    bool _terminating;
-
-#ifdef HAVE_FORK
-    // the process that created this context. Used to detect forking.
-    pid_t _pid;
-#endif
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (reaper_t)
-};
-}
-
-#endif
diff --git a/libs/libzmq/src/rep.cpp b/libs/libzmq/src/rep.cpp
deleted file mode 100644
index 99707f8..0000000
--- a/libs/libzmq/src/rep.cpp
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "rep.hpp"
-#include "err.hpp"
-#include "msg.hpp"
-
-zmq::rep_t::rep_t (class ctx_t *parent_, uint32_t tid_, int sid_) :
-    router_t (parent_, tid_, sid_),
-    _sending_reply (false),
-    _request_begins (true)
-{
-    options.type = ZMQ_REP;
-}
-
-zmq::rep_t::~rep_t ()
-{
-}
-
-int zmq::rep_t::xsend (msg_t *msg_)
-{
-    //  If we are in the middle of receiving a request, we cannot send reply.
-    if (!_sending_reply) {
-        errno = EFSM;
-        return -1;
-    }
-
-    const bool more = (msg_->flags () & msg_t::more) != 0;
-
-    //  Push message to the reply pipe.
-    const int rc = router_t::xsend (msg_);
-    if (rc != 0)
-        return rc;
-
-    //  If the reply is complete flip the FSM back to request receiving state.
-    if (!more)
-        _sending_reply = false;
-
-    return 0;
-}
-
-int zmq::rep_t::xrecv (msg_t *msg_)
-{
-    //  If we are in middle of sending a reply, we cannot receive next request.
-    if (_sending_reply) {
-        errno = EFSM;
-        return -1;
-    }
-
-    //  First thing to do when receiving a request is to copy all the labels
-    //  to the reply pipe.
-    if (_request_begins) {
-        while (true) {
-            int rc = router_t::xrecv (msg_);
-            if (rc != 0)
-                return rc;
-
-            if ((msg_->flags () & msg_t::more)) {
-                //  Empty message part delimits the traceback stack.
-                const bool bottom = (msg_->size () == 0);
-
-                //  Push it to the reply pipe.
-                rc = router_t::xsend (msg_);
-                errno_assert (rc == 0);
-
-                if (bottom)
-                    break;
-            } else {
-                //  If the traceback stack is malformed, discard anything
-                //  already sent to pipe (we're at end of invalid message).
-                rc = router_t::rollback ();
-                errno_assert (rc == 0);
-            }
-        }
-        _request_begins = false;
-    }
-
-    //  Get next message part to return to the user.
-    const int rc = router_t::xrecv (msg_);
-    if (rc != 0)
-        return rc;
-
-    //  If whole request is read, flip the FSM to reply-sending state.
-    if (!(msg_->flags () & msg_t::more)) {
-        _sending_reply = true;
-        _request_begins = true;
-    }
-
-    return 0;
-}
-
-bool zmq::rep_t::xhas_in ()
-{
-    if (_sending_reply)
-        return false;
-
-    return router_t::xhas_in ();
-}
-
-bool zmq::rep_t::xhas_out ()
-{
-    if (!_sending_reply)
-        return false;
-
-    return router_t::xhas_out ();
-}
diff --git a/libs/libzmq/src/rep.hpp b/libs/libzmq/src/rep.hpp
deleted file mode 100644
index 995fe40..0000000
--- a/libs/libzmq/src/rep.hpp
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_REP_HPP_INCLUDED__
-#define __ZMQ_REP_HPP_INCLUDED__
-
-#include "router.hpp"
-
-namespace zmq
-{
-class ctx_t;
-class msg_t;
-class io_thread_t;
-class socket_base_t;
-
-class rep_t ZMQ_FINAL : public router_t
-{
-  public:
-    rep_t (zmq::ctx_t *parent_, uint32_t tid_, int sid_);
-    ~rep_t ();
-
-    //  Overrides of functions from socket_base_t.
-    int xsend (zmq::msg_t *msg_);
-    int xrecv (zmq::msg_t *msg_);
-    bool xhas_in ();
-    bool xhas_out ();
-
-  private:
-    //  If true, we are in process of sending the reply. If false we are
-    //  in process of receiving a request.
-    bool _sending_reply;
-
-    //  If true, we are starting to receive a request. The beginning
-    //  of the request is the backtrace stack.
-    bool _request_begins;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (rep_t)
-};
-}
-
-#endif
diff --git a/libs/libzmq/src/req.cpp b/libs/libzmq/src/req.cpp
deleted file mode 100644
index b120f57..0000000
--- a/libs/libzmq/src/req.cpp
+++ /dev/null
@@ -1,319 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "macros.hpp"
-#include "req.hpp"
-#include "err.hpp"
-#include "msg.hpp"
-#include "wire.hpp"
-#include "random.hpp"
-#include "likely.hpp"
-
-zmq::req_t::req_t (class ctx_t *parent_, uint32_t tid_, int sid_) :
-    dealer_t (parent_, tid_, sid_),
-    _receiving_reply (false),
-    _message_begins (true),
-    _reply_pipe (NULL),
-    _request_id_frames_enabled (false),
-    _request_id (generate_random ()),
-    _strict (true)
-{
-    options.type = ZMQ_REQ;
-}
-
-zmq::req_t::~req_t ()
-{
-}
-
-int zmq::req_t::xsend (msg_t *msg_)
-{
-    //  If we've sent a request and we still haven't got the reply,
-    //  we can't send another request unless the strict option is disabled.
-    if (_receiving_reply) {
-        if (_strict) {
-            errno = EFSM;
-            return -1;
-        }
-
-        _receiving_reply = false;
-        _message_begins = true;
-    }
-
-    //  First part of the request is the request routing id.
-    if (_message_begins) {
-        _reply_pipe = NULL;
-
-        if (_request_id_frames_enabled) {
-            _request_id++;
-
-            msg_t id;
-            int rc = id.init_size (sizeof (uint32_t));
-            memcpy (id.data (), &_request_id, sizeof (uint32_t));
-            errno_assert (rc == 0);
-            id.set_flags (msg_t::more);
-
-            rc = dealer_t::sendpipe (&id, &_reply_pipe);
-            if (rc != 0) {
-                return -1;
-            }
-        }
-
-        msg_t bottom;
-        int rc = bottom.init ();
-        errno_assert (rc == 0);
-        bottom.set_flags (msg_t::more);
-
-        rc = dealer_t::sendpipe (&bottom, &_reply_pipe);
-        if (rc != 0)
-            return -1;
-        zmq_assert (_reply_pipe);
-
-        _message_begins = false;
-
-        // Eat all currently available messages before the request is fully
-        // sent. This is done to avoid:
-        //   REQ sends request to A, A replies, B replies too.
-        //   A's reply was first and matches, that is used.
-        //   An hour later REQ sends a request to B. B's old reply is used.
-        msg_t drop;
-        while (true) {
-            rc = drop.init ();
-            errno_assert (rc == 0);
-            rc = dealer_t::xrecv (&drop);
-            if (rc != 0)
-                break;
-            drop.close ();
-        }
-    }
-
-    bool more = (msg_->flags () & msg_t::more) != 0;
-
-    int rc = dealer_t::xsend (msg_);
-    if (rc != 0)
-        return rc;
-
-    //  If the request was fully sent, flip the FSM into reply-receiving state.
-    if (!more) {
-        _receiving_reply = true;
-        _message_begins = true;
-    }
-
-    return 0;
-}
-
-int zmq::req_t::xrecv (msg_t *msg_)
-{
-    //  If request wasn't send, we can't wait for reply.
-    if (!_receiving_reply) {
-        errno = EFSM;
-        return -1;
-    }
-
-    //  Skip messages until one with the right first frames is found.
-    while (_message_begins) {
-        //  If enabled, the first frame must have the correct request_id.
-        if (_request_id_frames_enabled) {
-            int rc = recv_reply_pipe (msg_);
-            if (rc != 0)
-                return rc;
-
-            if (unlikely (!(msg_->flags () & msg_t::more)
-                          || msg_->size () != sizeof (_request_id)
-                          || *static_cast<uint32_t *> (msg_->data ())
-                               != _request_id)) {
-                //  Skip the remaining frames and try the next message
-                while (msg_->flags () & msg_t::more) {
-                    rc = recv_reply_pipe (msg_);
-                    errno_assert (rc == 0);
-                }
-                continue;
-            }
-        }
-
-        //  The next frame must be 0.
-        // TODO: Failing this check should also close the connection with the peer!
-        int rc = recv_reply_pipe (msg_);
-        if (rc != 0)
-            return rc;
-
-        if (unlikely (!(msg_->flags () & msg_t::more) || msg_->size () != 0)) {
-            //  Skip the remaining frames and try the next message
-            while (msg_->flags () & msg_t::more) {
-                rc = recv_reply_pipe (msg_);
-                errno_assert (rc == 0);
-            }
-            continue;
-        }
-
-        _message_begins = false;
-    }
-
-    const int rc = recv_reply_pipe (msg_);
-    if (rc != 0)
-        return rc;
-
-    //  If the reply is fully received, flip the FSM into request-sending state.
-    if (!(msg_->flags () & msg_t::more)) {
-        _receiving_reply = false;
-        _message_begins = true;
-    }
-
-    return 0;
-}
-
-bool zmq::req_t::xhas_in ()
-{
-    //  TODO: Duplicates should be removed here.
-
-    if (!_receiving_reply)
-        return false;
-
-    return dealer_t::xhas_in ();
-}
-
-bool zmq::req_t::xhas_out ()
-{
-    if (_receiving_reply && _strict)
-        return false;
-
-    return dealer_t::xhas_out ();
-}
-
-int zmq::req_t::xsetsockopt (int option_,
-                             const void *optval_,
-                             size_t optvallen_)
-{
-    const bool is_int = (optvallen_ == sizeof (int));
-    int value = 0;
-    if (is_int)
-        memcpy (&value, optval_, sizeof (int));
-
-    switch (option_) {
-        case ZMQ_REQ_CORRELATE:
-            if (is_int && value >= 0) {
-                _request_id_frames_enabled = (value != 0);
-                return 0;
-            }
-            break;
-
-        case ZMQ_REQ_RELAXED:
-            if (is_int && value >= 0) {
-                _strict = (value == 0);
-                return 0;
-            }
-            break;
-
-        default:
-            break;
-    }
-
-    return dealer_t::xsetsockopt (option_, optval_, optvallen_);
-}
-
-void zmq::req_t::xpipe_terminated (pipe_t *pipe_)
-{
-    if (_reply_pipe == pipe_)
-        _reply_pipe = NULL;
-    dealer_t::xpipe_terminated (pipe_);
-}
-
-int zmq::req_t::recv_reply_pipe (msg_t *msg_)
-{
-    while (true) {
-        pipe_t *pipe = NULL;
-        const int rc = dealer_t::recvpipe (msg_, &pipe);
-        if (rc != 0)
-            return rc;
-        if (!_reply_pipe || pipe == _reply_pipe)
-            return 0;
-    }
-}
-
-zmq::req_session_t::req_session_t (io_thread_t *io_thread_,
-                                   bool connect_,
-                                   socket_base_t *socket_,
-                                   const options_t &options_,
-                                   address_t *addr_) :
-    session_base_t (io_thread_, connect_, socket_, options_, addr_),
-    _state (bottom)
-{
-}
-
-zmq::req_session_t::~req_session_t ()
-{
-}
-
-int zmq::req_session_t::push_msg (msg_t *msg_)
-{
-    //  Ignore commands, they are processed by the engine and should not
-    //  affect the state machine.
-    if (unlikely (msg_->flags () & msg_t::command))
-        return 0;
-
-    switch (_state) {
-        case bottom:
-            if (msg_->flags () == msg_t::more) {
-                //  In case option ZMQ_CORRELATE is on, allow request_id to be
-                //  transferred as first frame (would be too cumbersome to check
-                //  whether the option is actually on or not).
-                if (msg_->size () == sizeof (uint32_t)) {
-                    _state = request_id;
-                    return session_base_t::push_msg (msg_);
-                }
-                if (msg_->size () == 0) {
-                    _state = body;
-                    return session_base_t::push_msg (msg_);
-                }
-            }
-            break;
-        case request_id:
-            if (msg_->flags () == msg_t::more && msg_->size () == 0) {
-                _state = body;
-                return session_base_t::push_msg (msg_);
-            }
-            break;
-        case body:
-            if (msg_->flags () == msg_t::more)
-                return session_base_t::push_msg (msg_);
-            if (msg_->flags () == 0) {
-                _state = bottom;
-                return session_base_t::push_msg (msg_);
-            }
-            break;
-    }
-    errno = EFAULT;
-    return -1;
-}
-
-void zmq::req_session_t::reset ()
-{
-    session_base_t::reset ();
-    _state = bottom;
-}
diff --git a/libs/libzmq/src/req.hpp b/libs/libzmq/src/req.hpp
deleted file mode 100644
index 0b0084c..0000000
--- a/libs/libzmq/src/req.hpp
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_REQ_HPP_INCLUDED__
-#define __ZMQ_REQ_HPP_INCLUDED__
-
-#include "dealer.hpp"
-#include "stdint.hpp"
-
-namespace zmq
-{
-class ctx_t;
-class msg_t;
-class io_thread_t;
-class socket_base_t;
-
-class req_t ZMQ_FINAL : public dealer_t
-{
-  public:
-    req_t (zmq::ctx_t *parent_, uint32_t tid_, int sid_);
-    ~req_t ();
-
-    //  Overrides of functions from socket_base_t.
-    int xsend (zmq::msg_t *msg_);
-    int xrecv (zmq::msg_t *msg_);
-    bool xhas_in ();
-    bool xhas_out ();
-    int xsetsockopt (int option_, const void *optval_, size_t optvallen_);
-    void xpipe_terminated (zmq::pipe_t *pipe_);
-
-  protected:
-    //  Receive only from the pipe the request was sent to, discarding
-    //  frames from other pipes.
-    int recv_reply_pipe (zmq::msg_t *msg_);
-
-  private:
-    //  If true, request was already sent and reply wasn't received yet or
-    //  was received partially.
-    bool _receiving_reply;
-
-    //  If true, we are starting to send/recv a message. The first part
-    //  of the message must be empty message part (backtrace stack bottom).
-    bool _message_begins;
-
-    //  The pipe the request was sent to and where the reply is expected.
-    zmq::pipe_t *_reply_pipe;
-
-    //  Whether request id frames shall be sent and expected.
-    bool _request_id_frames_enabled;
-
-    //  The current request id. It is incremented every time before a new
-    //  request is sent.
-    uint32_t _request_id;
-
-    //  If false, send() will reset its internal state and terminate the
-    //  reply_pipe's connection instead of failing if a previous request is
-    //  still pending.
-    bool _strict;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (req_t)
-};
-
-class req_session_t ZMQ_FINAL : public session_base_t
-{
-  public:
-    req_session_t (zmq::io_thread_t *io_thread_,
-                   bool connect_,
-                   zmq::socket_base_t *socket_,
-                   const options_t &options_,
-                   address_t *addr_);
-    ~req_session_t ();
-
-    //  Overrides of the functions from session_base_t.
-    int push_msg (msg_t *msg_);
-    void reset ();
-
-  private:
-    enum
-    {
-        bottom,
-        request_id,
-        body
-    } _state;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (req_session_t)
-};
-}
-
-#endif
diff --git a/libs/libzmq/src/router.cpp b/libs/libzmq/src/router.cpp
deleted file mode 100644
index c659f26..0000000
--- a/libs/libzmq/src/router.cpp
+++ /dev/null
@@ -1,528 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "macros.hpp"
-#include "router.hpp"
-#include "pipe.hpp"
-#include "wire.hpp"
-#include "random.hpp"
-#include "likely.hpp"
-#include "err.hpp"
-
-zmq::router_t::router_t (class ctx_t *parent_, uint32_t tid_, int sid_) :
-    routing_socket_base_t (parent_, tid_, sid_),
-    _prefetched (false),
-    _routing_id_sent (false),
-    _current_in (NULL),
-    _terminate_current_in (false),
-    _more_in (false),
-    _current_out (NULL),
-    _more_out (false),
-    _next_integral_routing_id (generate_random ()),
-    _mandatory (false),
-    //  raw_socket functionality in ROUTER is deprecated
-    _raw_socket (false),
-    _probe_router (false),
-    _handover (false)
-{
-    options.type = ZMQ_ROUTER;
-    options.recv_routing_id = true;
-    options.raw_socket = false;
-    options.can_send_hello_msg = true;
-    options.can_recv_disconnect_msg = true;
-
-    _prefetched_id.init ();
-    _prefetched_msg.init ();
-}
-
-zmq::router_t::~router_t ()
-{
-    zmq_assert (_anonymous_pipes.empty ());
-    _prefetched_id.close ();
-    _prefetched_msg.close ();
-}
-
-void zmq::router_t::xattach_pipe (pipe_t *pipe_,
-                                  bool subscribe_to_all_,
-                                  bool locally_initiated_)
-{
-    LIBZMQ_UNUSED (subscribe_to_all_);
-
-    zmq_assert (pipe_);
-
-    if (_probe_router) {
-        msg_t probe_msg;
-        int rc = probe_msg.init ();
-        errno_assert (rc == 0);
-
-        rc = pipe_->write (&probe_msg);
-        // zmq_assert (rc) is not applicable here, since it is not a bug.
-        LIBZMQ_UNUSED (rc);
-
-        pipe_->flush ();
-
-        rc = probe_msg.close ();
-        errno_assert (rc == 0);
-    }
-
-    const bool routing_id_ok = identify_peer (pipe_, locally_initiated_);
-    if (routing_id_ok)
-        _fq.attach (pipe_);
-    else
-        _anonymous_pipes.insert (pipe_);
-}
-
-int zmq::router_t::xsetsockopt (int option_,
-                                const void *optval_,
-                                size_t optvallen_)
-{
-    const bool is_int = (optvallen_ == sizeof (int));
-    int value = 0;
-    if (is_int)
-        memcpy (&value, optval_, sizeof (int));
-
-    switch (option_) {
-        case ZMQ_ROUTER_RAW:
-            if (is_int && value >= 0) {
-                _raw_socket = (value != 0);
-                if (_raw_socket) {
-                    options.recv_routing_id = false;
-                    options.raw_socket = true;
-                }
-                return 0;
-            }
-            break;
-
-        case ZMQ_ROUTER_MANDATORY:
-            if (is_int && value >= 0) {
-                _mandatory = (value != 0);
-                return 0;
-            }
-            break;
-
-        case ZMQ_PROBE_ROUTER:
-            if (is_int && value >= 0) {
-                _probe_router = (value != 0);
-                return 0;
-            }
-            break;
-
-        case ZMQ_ROUTER_HANDOVER:
-            if (is_int && value >= 0) {
-                _handover = (value != 0);
-                return 0;
-            }
-            break;
-
-#ifdef ZMQ_BUILD_DRAFT_API
-        case ZMQ_ROUTER_NOTIFY:
-            if (is_int && value >= 0
-                && value <= (ZMQ_NOTIFY_CONNECT | ZMQ_NOTIFY_DISCONNECT)) {
-                options.router_notify = value;
-                return 0;
-            }
-            break;
-#endif
-
-        default:
-            return routing_socket_base_t::xsetsockopt (option_, optval_,
-                                                       optvallen_);
-    }
-    errno = EINVAL;
-    return -1;
-}
-
-
-void zmq::router_t::xpipe_terminated (pipe_t *pipe_)
-{
-    if (0 == _anonymous_pipes.erase (pipe_)) {
-        erase_out_pipe (pipe_);
-        _fq.pipe_terminated (pipe_);
-        pipe_->rollback ();
-        if (pipe_ == _current_out)
-            _current_out = NULL;
-    }
-}
-
-void zmq::router_t::xread_activated (pipe_t *pipe_)
-{
-    const std::set<pipe_t *>::iterator it = _anonymous_pipes.find (pipe_);
-    if (it == _anonymous_pipes.end ())
-        _fq.activated (pipe_);
-    else {
-        const bool routing_id_ok = identify_peer (pipe_, false);
-        if (routing_id_ok) {
-            _anonymous_pipes.erase (it);
-            _fq.attach (pipe_);
-        }
-    }
-}
-
-int zmq::router_t::xsend (msg_t *msg_)
-{
-    //  If this is the first part of the message it's the ID of the
-    //  peer to send the message to.
-    if (!_more_out) {
-        zmq_assert (!_current_out);
-
-        //  If we have malformed message (prefix with no subsequent message)
-        //  then just silently ignore it.
-        //  TODO: The connections should be killed instead.
-        if (msg_->flags () & msg_t::more) {
-            _more_out = true;
-
-            //  Find the pipe associated with the routing id stored in the prefix.
-            //  If there's no such pipe just silently ignore the message, unless
-            //  router_mandatory is set.
-            out_pipe_t *out_pipe = lookup_out_pipe (
-              blob_t (static_cast<unsigned char *> (msg_->data ()),
-                      msg_->size (), zmq::reference_tag_t ()));
-
-            if (out_pipe) {
-                _current_out = out_pipe->pipe;
-
-                // Check whether pipe is closed or not
-                if (!_current_out->check_write ()) {
-                    // Check whether pipe is full or not
-                    const bool pipe_full = !_current_out->check_hwm ();
-                    out_pipe->active = false;
-                    _current_out = NULL;
-
-                    if (_mandatory) {
-                        _more_out = false;
-                        if (pipe_full)
-                            errno = EAGAIN;
-                        else
-                            errno = EHOSTUNREACH;
-                        return -1;
-                    }
-                }
-            } else if (_mandatory) {
-                _more_out = false;
-                errno = EHOSTUNREACH;
-                return -1;
-            }
-        }
-
-        int rc = msg_->close ();
-        errno_assert (rc == 0);
-        rc = msg_->init ();
-        errno_assert (rc == 0);
-        return 0;
-    }
-
-    //  Ignore the MORE flag for raw-sock or assert?
-    if (options.raw_socket)
-        msg_->reset_flags (msg_t::more);
-
-    //  Check whether this is the last part of the message.
-    _more_out = (msg_->flags () & msg_t::more) != 0;
-
-    //  Push the message into the pipe. If there's no out pipe, just drop it.
-    if (_current_out) {
-        // Close the remote connection if user has asked to do so
-        // by sending zero length message.
-        // Pending messages in the pipe will be dropped (on receiving term- ack)
-        if (_raw_socket && msg_->size () == 0) {
-            _current_out->terminate (false);
-            int rc = msg_->close ();
-            errno_assert (rc == 0);
-            rc = msg_->init ();
-            errno_assert (rc == 0);
-            _current_out = NULL;
-            return 0;
-        }
-
-        const bool ok = _current_out->write (msg_);
-        if (unlikely (!ok)) {
-            // Message failed to send - we must close it ourselves.
-            const int rc = msg_->close ();
-            errno_assert (rc == 0);
-            // HWM was checked before, so the pipe must be gone. Roll back
-            // messages that were piped, for example REP labels.
-            _current_out->rollback ();
-            _current_out = NULL;
-        } else {
-            if (!_more_out) {
-                _current_out->flush ();
-                _current_out = NULL;
-            }
-        }
-    } else {
-        const int rc = msg_->close ();
-        errno_assert (rc == 0);
-    }
-
-    //  Detach the message from the data buffer.
-    const int rc = msg_->init ();
-    errno_assert (rc == 0);
-
-    return 0;
-}
-
-int zmq::router_t::xrecv (msg_t *msg_)
-{
-    if (_prefetched) {
-        if (!_routing_id_sent) {
-            const int rc = msg_->move (_prefetched_id);
-            errno_assert (rc == 0);
-            _routing_id_sent = true;
-        } else {
-            const int rc = msg_->move (_prefetched_msg);
-            errno_assert (rc == 0);
-            _prefetched = false;
-        }
-        _more_in = (msg_->flags () & msg_t::more) != 0;
-
-        if (!_more_in) {
-            if (_terminate_current_in) {
-                _current_in->terminate (true);
-                _terminate_current_in = false;
-            }
-            _current_in = NULL;
-        }
-        return 0;
-    }
-
-    pipe_t *pipe = NULL;
-    int rc = _fq.recvpipe (msg_, &pipe);
-
-    //  It's possible that we receive peer's routing id. That happens
-    //  after reconnection. The current implementation assumes that
-    //  the peer always uses the same routing id.
-    while (rc == 0 && msg_->is_routing_id ())
-        rc = _fq.recvpipe (msg_, &pipe);
-
-    if (rc != 0)
-        return -1;
-
-    zmq_assert (pipe != NULL);
-
-    //  If we are in the middle of reading a message, just return the next part.
-    if (_more_in) {
-        _more_in = (msg_->flags () & msg_t::more) != 0;
-
-        if (!_more_in) {
-            if (_terminate_current_in) {
-                _current_in->terminate (true);
-                _terminate_current_in = false;
-            }
-            _current_in = NULL;
-        }
-    } else {
-        //  We are at the beginning of a message.
-        //  Keep the message part we have in the prefetch buffer
-        //  and return the ID of the peer instead.
-        rc = _prefetched_msg.move (*msg_);
-        errno_assert (rc == 0);
-        _prefetched = true;
-        _current_in = pipe;
-
-        const blob_t &routing_id = pipe->get_routing_id ();
-        rc = msg_->init_size (routing_id.size ());
-        errno_assert (rc == 0);
-        memcpy (msg_->data (), routing_id.data (), routing_id.size ());
-        msg_->set_flags (msg_t::more);
-        if (_prefetched_msg.metadata ())
-            msg_->set_metadata (_prefetched_msg.metadata ());
-        _routing_id_sent = true;
-    }
-
-    return 0;
-}
-
-int zmq::router_t::rollback ()
-{
-    if (_current_out) {
-        _current_out->rollback ();
-        _current_out = NULL;
-        _more_out = false;
-    }
-    return 0;
-}
-
-bool zmq::router_t::xhas_in ()
-{
-    //  If we are in the middle of reading the messages, there are
-    //  definitely more parts available.
-    if (_more_in)
-        return true;
-
-    //  We may already have a message pre-fetched.
-    if (_prefetched)
-        return true;
-
-    //  Try to read the next message.
-    //  The message, if read, is kept in the pre-fetch buffer.
-    pipe_t *pipe = NULL;
-    int rc = _fq.recvpipe (&_prefetched_msg, &pipe);
-
-    //  It's possible that we receive peer's routing id. That happens
-    //  after reconnection. The current implementation assumes that
-    //  the peer always uses the same routing id.
-    //  TODO: handle the situation when the peer changes its routing id.
-    while (rc == 0 && _prefetched_msg.is_routing_id ())
-        rc = _fq.recvpipe (&_prefetched_msg, &pipe);
-
-    if (rc != 0)
-        return false;
-
-    zmq_assert (pipe != NULL);
-
-    const blob_t &routing_id = pipe->get_routing_id ();
-    rc = _prefetched_id.init_size (routing_id.size ());
-    errno_assert (rc == 0);
-    memcpy (_prefetched_id.data (), routing_id.data (), routing_id.size ());
-    _prefetched_id.set_flags (msg_t::more);
-    if (_prefetched_msg.metadata ())
-        _prefetched_id.set_metadata (_prefetched_msg.metadata ());
-
-    _prefetched = true;
-    _routing_id_sent = false;
-    _current_in = pipe;
-
-    return true;
-}
-
-static bool check_pipe_hwm (const zmq::pipe_t &pipe_)
-{
-    return pipe_.check_hwm ();
-}
-
-bool zmq::router_t::xhas_out ()
-{
-    //  In theory, ROUTER socket is always ready for writing (except when
-    //  MANDATORY is set). Whether actual attempt to write succeeds depends
-    //  on which pipe the message is going to be routed to.
-
-    if (!_mandatory)
-        return true;
-
-    return any_of_out_pipes (check_pipe_hwm);
-}
-
-int zmq::router_t::get_peer_state (const void *routing_id_,
-                                   size_t routing_id_size_) const
-{
-    int res = 0;
-
-    // TODO remove the const_cast, see comment in lookup_out_pipe
-    const blob_t routing_id_blob (
-      static_cast<unsigned char *> (const_cast<void *> (routing_id_)),
-      routing_id_size_, reference_tag_t ());
-    const out_pipe_t *out_pipe = lookup_out_pipe (routing_id_blob);
-    if (!out_pipe) {
-        errno = EHOSTUNREACH;
-        return -1;
-    }
-
-    if (out_pipe->pipe->check_hwm ())
-        res |= ZMQ_POLLOUT;
-
-    /** \todo does it make any sense to check the inpipe as well? */
-
-    return res;
-}
-
-bool zmq::router_t::identify_peer (pipe_t *pipe_, bool locally_initiated_)
-{
-    msg_t msg;
-    blob_t routing_id;
-
-    if (locally_initiated_ && connect_routing_id_is_set ()) {
-        const std::string connect_routing_id = extract_connect_routing_id ();
-        routing_id.set (
-          reinterpret_cast<const unsigned char *> (connect_routing_id.c_str ()),
-          connect_routing_id.length ());
-        //  Not allowed to duplicate an existing rid
-        zmq_assert (!has_out_pipe (routing_id));
-    } else if (
-      options
-        .raw_socket) { //  Always assign an integral routing id for raw-socket
-        unsigned char buf[5];
-        buf[0] = 0;
-        put_uint32 (buf + 1, _next_integral_routing_id++);
-        routing_id.set (buf, sizeof buf);
-    } else if (!options.raw_socket) {
-        //  Pick up handshake cases and also case where next integral routing id is set
-        msg.init ();
-        const bool ok = pipe_->read (&msg);
-        if (!ok)
-            return false;
-
-        if (msg.size () == 0) {
-            //  Fall back on the auto-generation
-            unsigned char buf[5];
-            buf[0] = 0;
-            put_uint32 (buf + 1, _next_integral_routing_id++);
-            routing_id.set (buf, sizeof buf);
-            msg.close ();
-        } else {
-            routing_id.set (static_cast<unsigned char *> (msg.data ()),
-                            msg.size ());
-            msg.close ();
-
-            //  Try to remove an existing routing id entry to allow the new
-            //  connection to take the routing id.
-            const out_pipe_t *const existing_outpipe =
-              lookup_out_pipe (routing_id);
-
-            if (existing_outpipe) {
-                if (!_handover)
-                    //  Ignore peers with duplicate ID
-                    return false;
-
-                //  We will allow the new connection to take over this
-                //  routing id. Temporarily assign a new routing id to the
-                //  existing pipe so we can terminate it asynchronously.
-                unsigned char buf[5];
-                buf[0] = 0;
-                put_uint32 (buf + 1, _next_integral_routing_id++);
-                blob_t new_routing_id (buf, sizeof buf);
-
-                pipe_t *const old_pipe = existing_outpipe->pipe;
-
-                erase_out_pipe (old_pipe);
-                old_pipe->set_router_socket_routing_id (new_routing_id);
-                add_out_pipe (ZMQ_MOVE (new_routing_id), old_pipe);
-
-                if (old_pipe == _current_in)
-                    _terminate_current_in = true;
-                else
-                    old_pipe->terminate (true);
-            }
-        }
-    }
-
-    pipe_->set_router_socket_routing_id (routing_id);
-    add_out_pipe (ZMQ_MOVE (routing_id), pipe_);
-
-    return true;
-}
diff --git a/libs/libzmq/src/router.hpp b/libs/libzmq/src/router.hpp
deleted file mode 100644
index f020672..0000000
--- a/libs/libzmq/src/router.hpp
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_ROUTER_HPP_INCLUDED__
-#define __ZMQ_ROUTER_HPP_INCLUDED__
-
-#include <map>
-
-#include "socket_base.hpp"
-#include "session_base.hpp"
-#include "stdint.hpp"
-#include "blob.hpp"
-#include "msg.hpp"
-#include "fq.hpp"
-
-namespace zmq
-{
-class ctx_t;
-class pipe_t;
-
-//  TODO: This class uses O(n) scheduling. Rewrite it to use O(1) algorithm.
-class router_t : public routing_socket_base_t
-{
-  public:
-    router_t (zmq::ctx_t *parent_, uint32_t tid_, int sid_);
-    ~router_t () ZMQ_OVERRIDE;
-
-    //  Overrides of functions from socket_base_t.
-    void xattach_pipe (zmq::pipe_t *pipe_,
-                       bool subscribe_to_all_,
-                       bool locally_initiated_) ZMQ_FINAL;
-    int
-    xsetsockopt (int option_, const void *optval_, size_t optvallen_) ZMQ_FINAL;
-    int xsend (zmq::msg_t *msg_) ZMQ_OVERRIDE;
-    int xrecv (zmq::msg_t *msg_) ZMQ_OVERRIDE;
-    bool xhas_in () ZMQ_OVERRIDE;
-    bool xhas_out () ZMQ_OVERRIDE;
-    void xread_activated (zmq::pipe_t *pipe_) ZMQ_FINAL;
-    void xpipe_terminated (zmq::pipe_t *pipe_) ZMQ_FINAL;
-    int get_peer_state (const void *routing_id_,
-                        size_t routing_id_size_) const ZMQ_FINAL;
-
-  protected:
-    //  Rollback any message parts that were sent but not yet flushed.
-    int rollback ();
-
-  private:
-    //  Receive peer id and update lookup map
-    bool identify_peer (pipe_t *pipe_, bool locally_initiated_);
-
-    //  Fair queueing object for inbound pipes.
-    fq_t _fq;
-
-    //  True iff there is a message held in the pre-fetch buffer.
-    bool _prefetched;
-
-    //  If true, the receiver got the message part with
-    //  the peer's identity.
-    bool _routing_id_sent;
-
-    //  Holds the prefetched identity.
-    msg_t _prefetched_id;
-
-    //  Holds the prefetched message.
-    msg_t _prefetched_msg;
-
-    //  The pipe we are currently reading from
-    zmq::pipe_t *_current_in;
-
-    //  Should current_in should be terminate after all parts received?
-    bool _terminate_current_in;
-
-    //  If true, more incoming message parts are expected.
-    bool _more_in;
-
-    //  We keep a set of pipes that have not been identified yet.
-    std::set<pipe_t *> _anonymous_pipes;
-
-    //  The pipe we are currently writing to.
-    zmq::pipe_t *_current_out;
-
-    //  If true, more outgoing message parts are expected.
-    bool _more_out;
-
-    //  Routing IDs are generated. It's a simple increment and wrap-over
-    //  algorithm. This value is the next ID to use (if not used already).
-    uint32_t _next_integral_routing_id;
-
-    // If true, report EAGAIN to the caller instead of silently dropping
-    // the message targeting an unknown peer.
-    bool _mandatory;
-    bool _raw_socket;
-
-    // if true, send an empty message to every connected router peer
-    bool _probe_router;
-
-    // If true, the router will reassign an identity upon encountering a
-    // name collision. The new pipe will take the identity, the old pipe
-    // will be terminated.
-    bool _handover;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (router_t)
-};
-}
-
-#endif
diff --git a/libs/libzmq/src/scatter.cpp b/libs/libzmq/src/scatter.cpp
deleted file mode 100644
index b951b92..0000000
--- a/libs/libzmq/src/scatter.cpp
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "macros.hpp"
-#include "scatter.hpp"
-#include "pipe.hpp"
-#include "err.hpp"
-#include "msg.hpp"
-
-zmq::scatter_t::scatter_t (class ctx_t *parent_, uint32_t tid_, int sid_) :
-    socket_base_t (parent_, tid_, sid_, true)
-{
-    options.type = ZMQ_SCATTER;
-}
-
-zmq::scatter_t::~scatter_t ()
-{
-}
-
-void zmq::scatter_t::xattach_pipe (pipe_t *pipe_,
-                                   bool subscribe_to_all_,
-                                   bool locally_initiated_)
-{
-    LIBZMQ_UNUSED (subscribe_to_all_);
-    LIBZMQ_UNUSED (locally_initiated_);
-
-    //  Don't delay pipe termination as there is no one
-    //  to receive the delimiter.
-    pipe_->set_nodelay ();
-
-    zmq_assert (pipe_);
-    _lb.attach (pipe_);
-}
-
-void zmq::scatter_t::xwrite_activated (pipe_t *pipe_)
-{
-    _lb.activated (pipe_);
-}
-
-void zmq::scatter_t::xpipe_terminated (pipe_t *pipe_)
-{
-    _lb.pipe_terminated (pipe_);
-}
-
-int zmq::scatter_t::xsend (msg_t *msg_)
-{
-    //  SCATTER sockets do not allow multipart data (ZMQ_SNDMORE)
-    if (msg_->flags () & msg_t::more) {
-        errno = EINVAL;
-        return -1;
-    }
-
-    return _lb.send (msg_);
-}
-
-bool zmq::scatter_t::xhas_out ()
-{
-    return _lb.has_out ();
-}
diff --git a/libs/libzmq/src/scatter.hpp b/libs/libzmq/src/scatter.hpp
deleted file mode 100644
index 5fd36a2..0000000
--- a/libs/libzmq/src/scatter.hpp
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_SCATTER_HPP_INCLUDED__
-#define __ZMQ_SCATTER_HPP_INCLUDED__
-
-#include "socket_base.hpp"
-#include "session_base.hpp"
-#include "lb.hpp"
-
-namespace zmq
-{
-class ctx_t;
-class pipe_t;
-class msg_t;
-class io_thread_t;
-
-class scatter_t ZMQ_FINAL : public socket_base_t
-{
-  public:
-    scatter_t (zmq::ctx_t *parent_, uint32_t tid_, int sid_);
-    ~scatter_t ();
-
-  protected:
-    //  Overrides of functions from socket_base_t.
-    void xattach_pipe (zmq::pipe_t *pipe_,
-                       bool subscribe_to_all_,
-                       bool locally_initiated_);
-    int xsend (zmq::msg_t *msg_);
-    bool xhas_out ();
-    void xwrite_activated (zmq::pipe_t *pipe_);
-    void xpipe_terminated (zmq::pipe_t *pipe_);
-
-  private:
-    //  Load balancer managing the outbound pipes.
-    lb_t _lb;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (scatter_t)
-};
-}
-
-#endif
diff --git a/libs/libzmq/src/secure_allocator.hpp b/libs/libzmq/src/secure_allocator.hpp
deleted file mode 100644
index e0871dc..0000000
--- a/libs/libzmq/src/secure_allocator.hpp
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
-    Copyright (c) 2007-2019 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_SECURE_ALLOCATOR_HPP_INCLUDED__
-#define __ZMQ_SECURE_ALLOCATOR_HPP_INCLUDED__
-
-#include "platform.hpp"
-#include "macros.hpp"
-
-#ifdef ZMQ_HAVE_CURVE
-
-#if defined(ZMQ_USE_LIBSODIUM)
-#include "sodium.h"
-#endif
-
-#include <memory>
-
-namespace zmq
-{
-#if defined(ZMQ_USE_LIBSODIUM)
-template <class T> struct secure_allocator_t
-{
-    typedef T value_type;
-
-    secure_allocator_t () ZMQ_DEFAULT;
-
-    template <class U>
-    secure_allocator_t (const secure_allocator_t<U> &) ZMQ_NOEXCEPT
-    {
-    }
-    T *allocate (std::size_t n) ZMQ_NOEXCEPT
-    {
-        T *res = static_cast<T *> (sodium_allocarray (sizeof (T), n));
-        alloc_assert (res);
-        return res;
-    }
-    void deallocate (T *p, std::size_t) ZMQ_NOEXCEPT
-    {
-        if (p)
-            sodium_free (p);
-    }
-
-    // the following is only required with C++98
-    // TODO maybe make this conditionally compiled
-    typedef T *pointer;
-    typedef const T *const_pointer;
-    typedef T &reference;
-    typedef const T &const_reference;
-    typedef std::size_t size_type;
-    typedef std::ptrdiff_t difference_type;
-    template <class U> struct rebind
-    {
-        typedef secure_allocator_t<U> other;
-    };
-
-    void construct (pointer p, const_reference val)
-    {
-        new ((void *) p) value_type (val);
-    }
-    void destroy (pointer p) { p->~value_type (); }
-    size_type max_size () const { return SIZE_MAX; }
-};
-template <class T, class U>
-bool operator== (const secure_allocator_t<T> &, const secure_allocator_t<U> &)
-{
-    return true;
-}
-template <class T, class U>
-bool operator!= (const secure_allocator_t<T> &, const secure_allocator_t<U> &)
-{
-    return false;
-}
-#else
-template <typename T> struct secure_allocator_t : std::allocator<T>
-{
-};
-#endif
-}
-
-#endif
-
-#endif
diff --git a/libs/libzmq/src/select.cpp b/libs/libzmq/src/select.cpp
deleted file mode 100644
index 46852c7..0000000
--- a/libs/libzmq/src/select.cpp
+++ /dev/null
@@ -1,626 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "select.hpp"
-#if defined ZMQ_IOTHREAD_POLLER_USE_SELECT
-
-#if defined ZMQ_HAVE_WINDOWS
-#elif defined ZMQ_HAVE_HPUX
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/time.h>
-#elif defined ZMQ_HAVE_OPENVMS
-#include <sys/types.h>
-#include <sys/time.h>
-#elif defined ZMQ_HAVE_VXWORKS
-#include <sys/types.h>
-#include <sys/time.h>
-#include <strings.h>
-#else
-#include <sys/select.h>
-#endif
-
-#include "err.hpp"
-#include "config.hpp"
-#include "i_poll_events.hpp"
-
-#include <algorithm>
-#include <limits>
-#include <climits>
-
-zmq::select_t::select_t (const zmq::thread_ctx_t &ctx_) :
-    worker_poller_base_t (ctx_),
-#if defined ZMQ_HAVE_WINDOWS
-    //  Fine as long as map is not cleared.
-    _current_family_entry_it (_family_entries.end ())
-#else
-    _max_fd (retired_fd)
-#endif
-{
-#if defined ZMQ_HAVE_WINDOWS
-    for (size_t i = 0; i < fd_family_cache_size; ++i)
-        _fd_family_cache[i] = std::make_pair (retired_fd, 0);
-#endif
-}
-
-zmq::select_t::~select_t ()
-{
-    stop_worker ();
-}
-
-zmq::select_t::handle_t zmq::select_t::add_fd (fd_t fd_, i_poll_events *events_)
-{
-    check_thread ();
-    zmq_assert (fd_ != retired_fd);
-
-    fd_entry_t fd_entry;
-    fd_entry.fd = fd_;
-    fd_entry.events = events_;
-
-#if defined ZMQ_HAVE_WINDOWS
-    u_short family = get_fd_family (fd_);
-    wsa_assert (family != AF_UNSPEC);
-    family_entry_t &family_entry = _family_entries[family];
-#else
-    family_entry_t &family_entry = _family_entry;
-#endif
-    family_entry.fd_entries.push_back (fd_entry);
-    FD_SET (fd_, &family_entry.fds_set.error);
-
-#if !defined ZMQ_HAVE_WINDOWS
-    if (fd_ > _max_fd)
-        _max_fd = fd_;
-#endif
-
-    adjust_load (1);
-
-    return fd_;
-}
-
-zmq::select_t::fd_entries_t::iterator
-zmq::select_t::find_fd_entry_by_handle (fd_entries_t &fd_entries_,
-                                        handle_t handle_)
-{
-    fd_entries_t::iterator fd_entry_it;
-    for (fd_entry_it = fd_entries_.begin (); fd_entry_it != fd_entries_.end ();
-         ++fd_entry_it)
-        if (fd_entry_it->fd == handle_)
-            break;
-
-    return fd_entry_it;
-}
-
-void zmq::select_t::trigger_events (const fd_entries_t &fd_entries_,
-                                    const fds_set_t &local_fds_set_,
-                                    int event_count_)
-{
-    //  Size is cached to avoid iteration through recently added descriptors.
-    for (fd_entries_t::size_type i = 0, size = fd_entries_.size ();
-         i < size && event_count_ > 0; ++i) {
-        //  fd_entries_[i] may not be stored, since calls to
-        //  in_event/out_event may reallocate the vector
-
-        if (is_retired_fd (fd_entries_[i]))
-            continue;
-
-        if (FD_ISSET (fd_entries_[i].fd, &local_fds_set_.read)) {
-            fd_entries_[i].events->in_event ();
-            --event_count_;
-        }
-
-        //  TODO: can the is_retired_fd be true at this point? if it
-        //  was retired before, we would already have continued, and I
-        //  don't see where it might have been modified
-        //  And if rc == 0, we can break instead of continuing
-        if (is_retired_fd (fd_entries_[i]) || event_count_ == 0)
-            continue;
-
-        if (FD_ISSET (fd_entries_[i].fd, &local_fds_set_.write)) {
-            fd_entries_[i].events->out_event ();
-            --event_count_;
-        }
-
-        //  TODO: same as above
-        if (is_retired_fd (fd_entries_[i]) || event_count_ == 0)
-            continue;
-
-        if (FD_ISSET (fd_entries_[i].fd, &local_fds_set_.error)) {
-            fd_entries_[i].events->in_event ();
-            --event_count_;
-        }
-    }
-}
-
-#if defined ZMQ_HAVE_WINDOWS
-int zmq::select_t::try_retire_fd_entry (
-  family_entries_t::iterator family_entry_it_, zmq::fd_t &handle_)
-{
-    family_entry_t &family_entry = family_entry_it_->second;
-
-    fd_entries_t::iterator fd_entry_it =
-      find_fd_entry_by_handle (family_entry.fd_entries, handle_);
-
-    if (fd_entry_it == family_entry.fd_entries.end ())
-        return 0;
-
-    fd_entry_t &fd_entry = *fd_entry_it;
-    zmq_assert (fd_entry.fd != retired_fd);
-
-    if (family_entry_it_ != _current_family_entry_it) {
-        //  Family is not currently being iterated and can be safely
-        //  modified in-place. So later it can be skipped without
-        //  re-verifying its content.
-        family_entry.fd_entries.erase (fd_entry_it);
-    } else {
-        //  Otherwise mark removed entries as retired. It will be cleaned up
-        //  at the end of the iteration. See zmq::select_t::loop
-        fd_entry.fd = retired_fd;
-        family_entry.has_retired = true;
-    }
-    family_entry.fds_set.remove_fd (handle_);
-    return 1;
-}
-#endif
-
-void zmq::select_t::rm_fd (handle_t handle_)
-{
-    check_thread ();
-    int retired = 0;
-#if defined ZMQ_HAVE_WINDOWS
-    u_short family = get_fd_family (handle_);
-    if (family != AF_UNSPEC) {
-        family_entries_t::iterator family_entry_it =
-          _family_entries.find (family);
-
-        retired += try_retire_fd_entry (family_entry_it, handle_);
-    } else {
-        //  get_fd_family may fail and return AF_UNSPEC if the socket was not
-        //  successfully connected. In that case, we need to look for the
-        //  socket in all family_entries.
-        family_entries_t::iterator end = _family_entries.end ();
-        for (family_entries_t::iterator family_entry_it =
-               _family_entries.begin ();
-             family_entry_it != end; ++family_entry_it) {
-            if (retired += try_retire_fd_entry (family_entry_it, handle_)) {
-                break;
-            }
-        }
-    }
-#else
-    fd_entries_t::iterator fd_entry_it =
-      find_fd_entry_by_handle (_family_entry.fd_entries, handle_);
-    assert (fd_entry_it != _family_entry.fd_entries.end ());
-
-    zmq_assert (fd_entry_it->fd != retired_fd);
-    fd_entry_it->fd = retired_fd;
-    _family_entry.fds_set.remove_fd (handle_);
-
-    ++retired;
-
-    if (handle_ == _max_fd) {
-        _max_fd = retired_fd;
-        for (fd_entry_it = _family_entry.fd_entries.begin ();
-             fd_entry_it != _family_entry.fd_entries.end (); ++fd_entry_it)
-            if (fd_entry_it->fd > _max_fd)
-                _max_fd = fd_entry_it->fd;
-    }
-
-    _family_entry.has_retired = true;
-#endif
-    zmq_assert (retired == 1);
-    adjust_load (-1);
-}
-
-void zmq::select_t::set_pollin (handle_t handle_)
-{
-    check_thread ();
-#if defined ZMQ_HAVE_WINDOWS
-    u_short family = get_fd_family (handle_);
-    wsa_assert (family != AF_UNSPEC);
-    family_entry_t &family_entry = _family_entries[family];
-#else
-    family_entry_t &family_entry = _family_entry;
-#endif
-    FD_SET (handle_, &family_entry.fds_set.read);
-}
-
-void zmq::select_t::reset_pollin (handle_t handle_)
-{
-    check_thread ();
-#if defined ZMQ_HAVE_WINDOWS
-    u_short family = get_fd_family (handle_);
-    wsa_assert (family != AF_UNSPEC);
-    family_entry_t &family_entry = _family_entries[family];
-#else
-    family_entry_t &family_entry = _family_entry;
-#endif
-    FD_CLR (handle_, &family_entry.fds_set.read);
-}
-
-void zmq::select_t::set_pollout (handle_t handle_)
-{
-    check_thread ();
-#if defined ZMQ_HAVE_WINDOWS
-    u_short family = get_fd_family (handle_);
-    wsa_assert (family != AF_UNSPEC);
-    family_entry_t &family_entry = _family_entries[family];
-#else
-    family_entry_t &family_entry = _family_entry;
-#endif
-    FD_SET (handle_, &family_entry.fds_set.write);
-}
-
-void zmq::select_t::reset_pollout (handle_t handle_)
-{
-    check_thread ();
-#if defined ZMQ_HAVE_WINDOWS
-    u_short family = get_fd_family (handle_);
-    wsa_assert (family != AF_UNSPEC);
-    family_entry_t &family_entry = _family_entries[family];
-#else
-    family_entry_t &family_entry = _family_entry;
-#endif
-    FD_CLR (handle_, &family_entry.fds_set.write);
-}
-
-void zmq::select_t::stop ()
-{
-    check_thread ();
-    //  no-op... thread is stopped when no more fds or timers are registered
-}
-
-int zmq::select_t::max_fds ()
-{
-    return FD_SETSIZE;
-}
-
-void zmq::select_t::loop ()
-{
-    while (true) {
-        //  Execute any due timers.
-        int timeout = static_cast<int> (execute_timers ());
-
-        cleanup_retired ();
-
-#ifdef _WIN32
-        if (_family_entries.empty ()) {
-#else
-        if (_family_entry.fd_entries.empty ()) {
-#endif
-            zmq_assert (get_load () == 0);
-
-            if (timeout == 0)
-                break;
-
-            // TODO sleep for timeout
-            continue;
-        }
-
-#if defined ZMQ_HAVE_OSX
-        struct timeval tv = {(long) (timeout / 1000), timeout % 1000 * 1000};
-#else
-        struct timeval tv = {static_cast<long> (timeout / 1000),
-                             static_cast<long> (timeout % 1000 * 1000)};
-#endif
-
-#if defined ZMQ_HAVE_WINDOWS
-        /*
-            On Windows select does not allow to mix descriptors from different
-            service providers. It seems to work for AF_INET and AF_INET6,
-            but fails for AF_INET and VMCI. The workaround is to use
-            WSAEventSelect and WSAWaitForMultipleEvents to wait, then use
-            select to find out what actually changed. WSAWaitForMultipleEvents
-            cannot be used alone, because it does not support more than 64 events
-            which is not enough.
-
-            To reduce unnecessary overhead, WSA is only used when there are more
-            than one family. Moreover, AF_INET and AF_INET6 are considered the same
-            family because Windows seems to handle them properly.
-            See get_fd_family for details.
-        */
-
-        //  If there is just one family, there is no reason to use WSA events.
-        int rc = 0;
-        const bool use_wsa_events = _family_entries.size () > 1;
-        if (use_wsa_events) {
-            // TODO: I don't really understand why we are doing this. If any of
-            // the events was signaled, we will call select for each fd_family
-            // afterwards. The only benefit is if none of the events was
-            // signaled, then we continue early.
-            // IMHO, either WSAEventSelect/WSAWaitForMultipleEvents or select
-            // should be used, but not both
-
-            wsa_events_t wsa_events;
-
-            for (family_entries_t::iterator family_entry_it =
-                   _family_entries.begin ();
-                 family_entry_it != _family_entries.end (); ++family_entry_it) {
-                family_entry_t &family_entry = family_entry_it->second;
-
-                for (fd_entries_t::iterator fd_entry_it =
-                       family_entry.fd_entries.begin ();
-                     fd_entry_it != family_entry.fd_entries.end ();
-                     ++fd_entry_it) {
-                    fd_t fd = fd_entry_it->fd;
-
-                    //  http://stackoverflow.com/q/35043420/188530
-                    if (FD_ISSET (fd, &family_entry.fds_set.read)
-                        && FD_ISSET (fd, &family_entry.fds_set.write))
-                        rc = WSAEventSelect (fd, wsa_events.events[3],
-                                             FD_READ | FD_ACCEPT | FD_CLOSE
-                                               | FD_WRITE | FD_CONNECT);
-                    else if (FD_ISSET (fd, &family_entry.fds_set.read))
-                        rc = WSAEventSelect (fd, wsa_events.events[0],
-                                             FD_READ | FD_ACCEPT | FD_CLOSE);
-                    else if (FD_ISSET (fd, &family_entry.fds_set.write))
-                        rc = WSAEventSelect (fd, wsa_events.events[1],
-                                             FD_WRITE | FD_CONNECT);
-                    else
-                        rc = 0;
-
-                    wsa_assert (rc != SOCKET_ERROR);
-                }
-            }
-
-            rc = WSAWaitForMultipleEvents (4, wsa_events.events, FALSE,
-                                           timeout ? timeout : INFINITE, FALSE);
-            wsa_assert (rc != (int) WSA_WAIT_FAILED);
-            zmq_assert (rc != WSA_WAIT_IO_COMPLETION);
-
-            if (rc == WSA_WAIT_TIMEOUT)
-                continue;
-        }
-
-        for (_current_family_entry_it = _family_entries.begin ();
-             _current_family_entry_it != _family_entries.end ();
-             ++_current_family_entry_it) {
-            family_entry_t &family_entry = _current_family_entry_it->second;
-
-
-            if (use_wsa_events) {
-                //  There is no reason to wait again after WSAWaitForMultipleEvents.
-                //  Simply collect what is ready.
-                struct timeval tv_nodelay = {0, 0};
-                select_family_entry (family_entry, 0, true, tv_nodelay);
-            } else {
-                select_family_entry (family_entry, 0, timeout > 0, tv);
-            }
-        }
-#else
-        select_family_entry (_family_entry, _max_fd + 1, timeout > 0, tv);
-#endif
-    }
-}
-
-void zmq::select_t::select_family_entry (family_entry_t &family_entry_,
-                                         const int max_fd_,
-                                         const bool use_timeout_,
-                                         struct timeval &tv_)
-{
-    //  select will fail when run with empty sets.
-    fd_entries_t &fd_entries = family_entry_.fd_entries;
-    if (fd_entries.empty ())
-        return;
-
-    fds_set_t local_fds_set = family_entry_.fds_set;
-    int rc = select (max_fd_, &local_fds_set.read, &local_fds_set.write,
-                     &local_fds_set.error, use_timeout_ ? &tv_ : NULL);
-
-#if defined ZMQ_HAVE_WINDOWS
-    wsa_assert (rc != SOCKET_ERROR);
-#else
-    if (rc == -1) {
-        errno_assert (errno == EINTR);
-        return;
-    }
-#endif
-
-    trigger_events (fd_entries, local_fds_set, rc);
-
-    cleanup_retired (family_entry_);
-}
-
-zmq::select_t::fds_set_t::fds_set_t ()
-{
-    FD_ZERO (&read);
-    FD_ZERO (&write);
-    FD_ZERO (&error);
-}
-
-zmq::select_t::fds_set_t::fds_set_t (const fds_set_t &other_)
-{
-#if defined ZMQ_HAVE_WINDOWS
-    // On Windows we don't need to copy the whole fd_set.
-    // SOCKETS are continuous from the beginning of fd_array in fd_set.
-    // We just need to copy fd_count elements of fd_array.
-    // We gain huge memcpy() improvement if number of used SOCKETs is much lower than FD_SETSIZE.
-    memcpy (&read, &other_.read,
-            (char *) (other_.read.fd_array + other_.read.fd_count)
-              - (char *) &other_.read);
-    memcpy (&write, &other_.write,
-            (char *) (other_.write.fd_array + other_.write.fd_count)
-              - (char *) &other_.write);
-    memcpy (&error, &other_.error,
-            (char *) (other_.error.fd_array + other_.error.fd_count)
-              - (char *) &other_.error);
-#else
-    memcpy (&read, &other_.read, sizeof other_.read);
-    memcpy (&write, &other_.write, sizeof other_.write);
-    memcpy (&error, &other_.error, sizeof other_.error);
-#endif
-}
-
-zmq::select_t::fds_set_t &
-zmq::select_t::fds_set_t::operator= (const fds_set_t &other_)
-{
-#if defined ZMQ_HAVE_WINDOWS
-    // On Windows we don't need to copy the whole fd_set.
-    // SOCKETS are continuous from the beginning of fd_array in fd_set.
-    // We just need to copy fd_count elements of fd_array.
-    // We gain huge memcpy() improvement if number of used SOCKETs is much lower than FD_SETSIZE.
-    memcpy (&read, &other_.read,
-            (char *) (other_.read.fd_array + other_.read.fd_count)
-              - (char *) &other_.read);
-    memcpy (&write, &other_.write,
-            (char *) (other_.write.fd_array + other_.write.fd_count)
-              - (char *) &other_.write);
-    memcpy (&error, &other_.error,
-            (char *) (other_.error.fd_array + other_.error.fd_count)
-              - (char *) &other_.error);
-#else
-    memcpy (&read, &other_.read, sizeof other_.read);
-    memcpy (&write, &other_.write, sizeof other_.write);
-    memcpy (&error, &other_.error, sizeof other_.error);
-#endif
-    return *this;
-}
-
-void zmq::select_t::fds_set_t::remove_fd (const fd_t &fd_)
-{
-    FD_CLR (fd_, &read);
-    FD_CLR (fd_, &write);
-    FD_CLR (fd_, &error);
-}
-
-bool zmq::select_t::cleanup_retired (family_entry_t &family_entry_)
-{
-    if (family_entry_.has_retired) {
-        family_entry_.has_retired = false;
-        family_entry_.fd_entries.erase (
-          std::remove_if (family_entry_.fd_entries.begin (),
-                          family_entry_.fd_entries.end (), is_retired_fd),
-          family_entry_.fd_entries.end ());
-    }
-    return family_entry_.fd_entries.empty ();
-}
-
-void zmq::select_t::cleanup_retired ()
-{
-#ifdef _WIN32
-    for (family_entries_t::iterator it = _family_entries.begin ();
-         it != _family_entries.end ();) {
-        if (cleanup_retired (it->second))
-            it = _family_entries.erase (it);
-        else
-            ++it;
-    }
-#else
-    cleanup_retired (_family_entry);
-#endif
-}
-
-bool zmq::select_t::is_retired_fd (const fd_entry_t &entry_)
-{
-    return entry_.fd == retired_fd;
-}
-
-zmq::select_t::family_entry_t::family_entry_t () : has_retired (false)
-{
-}
-
-
-#if defined ZMQ_HAVE_WINDOWS
-u_short zmq::select_t::get_fd_family (fd_t fd_)
-{
-    // cache the results of determine_fd_family, as this is frequently called
-    // for the same sockets, and determine_fd_family is expensive
-    size_t i;
-    for (i = 0; i < fd_family_cache_size; ++i) {
-        const std::pair<fd_t, u_short> &entry = _fd_family_cache[i];
-        if (entry.first == fd_) {
-            return entry.second;
-        }
-        if (entry.first == retired_fd)
-            break;
-    }
-
-    std::pair<fd_t, u_short> res =
-      std::make_pair (fd_, determine_fd_family (fd_));
-    if (i < fd_family_cache_size) {
-        _fd_family_cache[i] = res;
-    } else {
-        // just overwrite a random entry
-        // could be optimized by some LRU strategy
-        _fd_family_cache[rand () % fd_family_cache_size] = res;
-    }
-
-    return res.second;
-}
-
-u_short zmq::select_t::determine_fd_family (fd_t fd_)
-{
-    //  Use sockaddr_storage instead of sockaddr to accommodate different structure sizes
-    sockaddr_storage addr = {0};
-    int addr_size = sizeof addr;
-
-    int type;
-    int type_length = sizeof (int);
-
-    int rc = getsockopt (fd_, SOL_SOCKET, SO_TYPE,
-                         reinterpret_cast<char *> (&type), &type_length);
-
-    if (rc == 0) {
-        if (type == SOCK_DGRAM)
-            return AF_INET;
-
-        rc =
-          getsockname (fd_, reinterpret_cast<sockaddr *> (&addr), &addr_size);
-
-        //  AF_INET and AF_INET6 can be mixed in select
-        //  TODO: If proven otherwise, should simply return addr.sa_family
-        if (rc != SOCKET_ERROR)
-            return addr.ss_family == AF_INET6 ? AF_INET : addr.ss_family;
-    }
-
-    return AF_UNSPEC;
-}
-
-zmq::select_t::wsa_events_t::wsa_events_t ()
-{
-    events[0] = WSACreateEvent ();
-    wsa_assert (events[0] != WSA_INVALID_EVENT);
-    events[1] = WSACreateEvent ();
-    wsa_assert (events[1] != WSA_INVALID_EVENT);
-    events[2] = WSACreateEvent ();
-    wsa_assert (events[2] != WSA_INVALID_EVENT);
-    events[3] = WSACreateEvent ();
-    wsa_assert (events[3] != WSA_INVALID_EVENT);
-}
-
-zmq::select_t::wsa_events_t::~wsa_events_t ()
-{
-    wsa_assert (WSACloseEvent (events[0]));
-    wsa_assert (WSACloseEvent (events[1]));
-    wsa_assert (WSACloseEvent (events[2]));
-    wsa_assert (WSACloseEvent (events[3]));
-}
-#endif
-
-#endif
diff --git a/libs/libzmq/src/select.hpp b/libs/libzmq/src/select.hpp
deleted file mode 100644
index 8f18a38..0000000
--- a/libs/libzmq/src/select.hpp
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_SELECT_HPP_INCLUDED__
-#define __ZMQ_SELECT_HPP_INCLUDED__
-
-//  poller.hpp decides which polling mechanism to use.
-#include "poller.hpp"
-#if defined ZMQ_IOTHREAD_POLLER_USE_SELECT
-
-#include <stddef.h>
-#include <vector>
-#include <map>
-
-#if defined ZMQ_HAVE_WINDOWS
-#elif defined ZMQ_HAVE_OPENVMS
-#include <sys/types.h>
-#include <sys/time.h>
-#else
-#include <sys/select.h>
-#endif
-
-#include "ctx.hpp"
-#include "fd.hpp"
-#include "poller_base.hpp"
-
-namespace zmq
-{
-struct i_poll_events;
-
-//  Implements socket polling mechanism using POSIX.1-2001 select()
-//  function.
-
-class select_t ZMQ_FINAL : public worker_poller_base_t
-{
-  public:
-    typedef fd_t handle_t;
-
-    select_t (const thread_ctx_t &ctx_);
-    ~select_t () ZMQ_FINAL;
-
-    //  "poller" concept.
-    handle_t add_fd (fd_t fd_, zmq::i_poll_events *events_);
-    void rm_fd (handle_t handle_);
-    void set_pollin (handle_t handle_);
-    void reset_pollin (handle_t handle_);
-    void set_pollout (handle_t handle_);
-    void reset_pollout (handle_t handle_);
-    void stop ();
-
-    static int max_fds ();
-
-  private:
-    //  Main event loop.
-    void loop () ZMQ_FINAL;
-
-    //  Internal state.
-    struct fds_set_t
-    {
-        fds_set_t ();
-        fds_set_t (const fds_set_t &other_);
-        fds_set_t &operator= (const fds_set_t &other_);
-        //  Convenience method to descriptor from all sets.
-        void remove_fd (const fd_t &fd_);
-
-        fd_set read;
-        fd_set write;
-        fd_set error;
-    };
-
-    struct fd_entry_t
-    {
-        fd_t fd;
-        zmq::i_poll_events *events;
-    };
-    typedef std::vector<fd_entry_t> fd_entries_t;
-
-    void trigger_events (const fd_entries_t &fd_entries_,
-                         const fds_set_t &local_fds_set_,
-                         int event_count_);
-
-    struct family_entry_t
-    {
-        family_entry_t ();
-
-        fd_entries_t fd_entries;
-        fds_set_t fds_set;
-        bool has_retired;
-    };
-
-    void select_family_entry (family_entry_t &family_entry_,
-                              int max_fd_,
-                              bool use_timeout_,
-                              struct timeval &tv_);
-
-#if defined ZMQ_HAVE_WINDOWS
-    typedef std::map<u_short, family_entry_t> family_entries_t;
-
-    struct wsa_events_t
-    {
-        wsa_events_t ();
-        ~wsa_events_t ();
-
-        //  read, write, error and readwrite
-        WSAEVENT events[4];
-    };
-
-    family_entries_t _family_entries;
-    // See loop for details.
-    family_entries_t::iterator _current_family_entry_it;
-
-    int try_retire_fd_entry (family_entries_t::iterator family_entry_it_,
-                             zmq::fd_t &handle_);
-
-    static const size_t fd_family_cache_size = 8;
-    std::pair<fd_t, u_short> _fd_family_cache[fd_family_cache_size];
-
-    u_short get_fd_family (fd_t fd_);
-
-    //  Socket's family or AF_UNSPEC on error.
-    static u_short determine_fd_family (fd_t fd_);
-#else
-    //  on non-Windows, we can treat all fds as one family
-    family_entry_t _family_entry;
-    fd_t _max_fd;
-#endif
-
-    void cleanup_retired ();
-    bool cleanup_retired (family_entry_t &family_entry_);
-
-    //  Checks if an fd_entry_t is retired.
-    static bool is_retired_fd (const fd_entry_t &entry_);
-
-    static fd_entries_t::iterator
-    find_fd_entry_by_handle (fd_entries_t &fd_entries_, handle_t handle_);
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (select_t)
-};
-
-typedef select_t poller_t;
-}
-
-#endif
-
-#endif
diff --git a/libs/libzmq/src/server.cpp b/libs/libzmq/src/server.cpp
deleted file mode 100644
index 6f0cf26..0000000
--- a/libs/libzmq/src/server.cpp
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "macros.hpp"
-#include "server.hpp"
-#include "pipe.hpp"
-#include "wire.hpp"
-#include "random.hpp"
-#include "likely.hpp"
-#include "err.hpp"
-
-zmq::server_t::server_t (class ctx_t *parent_, uint32_t tid_, int sid_) :
-    socket_base_t (parent_, tid_, sid_, true),
-    _next_routing_id (generate_random ())
-{
-    options.type = ZMQ_SERVER;
-    options.can_send_hello_msg = true;
-    options.can_recv_disconnect_msg = true;
-}
-
-zmq::server_t::~server_t ()
-{
-    zmq_assert (_out_pipes.empty ());
-}
-
-void zmq::server_t::xattach_pipe (pipe_t *pipe_,
-                                  bool subscribe_to_all_,
-                                  bool locally_initiated_)
-{
-    LIBZMQ_UNUSED (subscribe_to_all_);
-    LIBZMQ_UNUSED (locally_initiated_);
-
-    zmq_assert (pipe_);
-
-    uint32_t routing_id = _next_routing_id++;
-    if (!routing_id)
-        routing_id = _next_routing_id++; //  Never use Routing ID zero
-
-    pipe_->set_server_socket_routing_id (routing_id);
-    //  Add the record into output pipes lookup table
-    outpipe_t outpipe = {pipe_, true};
-    const bool ok =
-      _out_pipes.ZMQ_MAP_INSERT_OR_EMPLACE (routing_id, outpipe).second;
-    zmq_assert (ok);
-
-    _fq.attach (pipe_);
-}
-
-void zmq::server_t::xpipe_terminated (pipe_t *pipe_)
-{
-    const out_pipes_t::iterator it =
-      _out_pipes.find (pipe_->get_server_socket_routing_id ());
-    zmq_assert (it != _out_pipes.end ());
-    _out_pipes.erase (it);
-    _fq.pipe_terminated (pipe_);
-}
-
-void zmq::server_t::xread_activated (pipe_t *pipe_)
-{
-    _fq.activated (pipe_);
-}
-
-void zmq::server_t::xwrite_activated (pipe_t *pipe_)
-{
-    const out_pipes_t::iterator end = _out_pipes.end ();
-    out_pipes_t::iterator it;
-    for (it = _out_pipes.begin (); it != end; ++it)
-        if (it->second.pipe == pipe_)
-            break;
-
-    zmq_assert (it != _out_pipes.end ());
-    zmq_assert (!it->second.active);
-    it->second.active = true;
-}
-
-int zmq::server_t::xsend (msg_t *msg_)
-{
-    //  SERVER sockets do not allow multipart data (ZMQ_SNDMORE)
-    if (msg_->flags () & msg_t::more) {
-        errno = EINVAL;
-        return -1;
-    }
-    //  Find the pipe associated with the routing stored in the message.
-    const uint32_t routing_id = msg_->get_routing_id ();
-    out_pipes_t::iterator it = _out_pipes.find (routing_id);
-
-    if (it != _out_pipes.end ()) {
-        if (!it->second.pipe->check_write ()) {
-            it->second.active = false;
-            errno = EAGAIN;
-            return -1;
-        }
-    } else {
-        errno = EHOSTUNREACH;
-        return -1;
-    }
-
-    //  Message might be delivered over inproc, so we reset routing id
-    int rc = msg_->reset_routing_id ();
-    errno_assert (rc == 0);
-
-    const bool ok = it->second.pipe->write (msg_);
-    if (unlikely (!ok)) {
-        // Message failed to send - we must close it ourselves.
-        rc = msg_->close ();
-        errno_assert (rc == 0);
-    } else
-        it->second.pipe->flush ();
-
-    //  Detach the message from the data buffer.
-    rc = msg_->init ();
-    errno_assert (rc == 0);
-
-    return 0;
-}
-
-int zmq::server_t::xrecv (msg_t *msg_)
-{
-    pipe_t *pipe = NULL;
-    int rc = _fq.recvpipe (msg_, &pipe);
-
-    // Drop any messages with more flag
-    while (rc == 0 && msg_->flags () & msg_t::more) {
-        // drop all frames of the current multi-frame message
-        rc = _fq.recvpipe (msg_, NULL);
-
-        while (rc == 0 && msg_->flags () & msg_t::more)
-            rc = _fq.recvpipe (msg_, NULL);
-
-        // get the new message
-        if (rc == 0)
-            rc = _fq.recvpipe (msg_, &pipe);
-    }
-
-    if (rc != 0)
-        return rc;
-
-    zmq_assert (pipe != NULL);
-
-    const uint32_t routing_id = pipe->get_server_socket_routing_id ();
-    msg_->set_routing_id (routing_id);
-
-    return 0;
-}
-
-bool zmq::server_t::xhas_in ()
-{
-    return _fq.has_in ();
-}
-
-bool zmq::server_t::xhas_out ()
-{
-    //  In theory, SERVER socket is always ready for writing. Whether actual
-    //  attempt to write succeeds depends on which pipe the message is going
-    //  to be routed to.
-    return true;
-}
diff --git a/libs/libzmq/src/server.hpp b/libs/libzmq/src/server.hpp
deleted file mode 100644
index cef1e4d..0000000
--- a/libs/libzmq/src/server.hpp
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_SERVER_HPP_INCLUDED__
-#define __ZMQ_SERVER_HPP_INCLUDED__
-
-#include <map>
-
-#include "socket_base.hpp"
-#include "session_base.hpp"
-#include "stdint.hpp"
-#include "blob.hpp"
-#include "fq.hpp"
-
-namespace zmq
-{
-class ctx_t;
-class msg_t;
-class pipe_t;
-
-//  TODO: This class uses O(n) scheduling. Rewrite it to use O(1) algorithm.
-class server_t : public socket_base_t
-{
-  public:
-    server_t (zmq::ctx_t *parent_, uint32_t tid_, int sid_);
-    ~server_t ();
-
-    //  Overrides of functions from socket_base_t.
-    void xattach_pipe (zmq::pipe_t *pipe_,
-                       bool subscribe_to_all_,
-                       bool locally_initiated_);
-    int xsend (zmq::msg_t *msg_);
-    int xrecv (zmq::msg_t *msg_);
-    bool xhas_in ();
-    bool xhas_out ();
-    void xread_activated (zmq::pipe_t *pipe_);
-    void xwrite_activated (zmq::pipe_t *pipe_);
-    void xpipe_terminated (zmq::pipe_t *pipe_);
-
-  private:
-    //  Fair queueing object for inbound pipes.
-    fq_t _fq;
-
-    struct outpipe_t
-    {
-        zmq::pipe_t *pipe;
-        bool active;
-    };
-
-    //  Outbound pipes indexed by the peer IDs.
-    typedef std::map<uint32_t, outpipe_t> out_pipes_t;
-    out_pipes_t _out_pipes;
-
-    //  Routing IDs are generated. It's a simple increment and wrap-over
-    //  algorithm. This value is the next ID to use (if not used already).
-    uint32_t _next_routing_id;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (server_t)
-};
-}
-
-#endif
diff --git a/libs/libzmq/src/session_base.cpp b/libs/libzmq/src/session_base.cpp
deleted file mode 100644
index f645214..0000000
--- a/libs/libzmq/src/session_base.cpp
+++ /dev/null
@@ -1,815 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "macros.hpp"
-#include "session_base.hpp"
-#include "i_engine.hpp"
-#include "err.hpp"
-#include "pipe.hpp"
-#include "likely.hpp"
-#include "tcp_connecter.hpp"
-#include "ws_connecter.hpp"
-#include "ipc_connecter.hpp"
-#include "tipc_connecter.hpp"
-#include "socks_connecter.hpp"
-#include "vmci_connecter.hpp"
-#include "pgm_sender.hpp"
-#include "pgm_receiver.hpp"
-#include "address.hpp"
-#include "norm_engine.hpp"
-#include "udp_engine.hpp"
-
-#include "ctx.hpp"
-#include "req.hpp"
-#include "radio.hpp"
-#include "dish.hpp"
-
-zmq::session_base_t *zmq::session_base_t::create (class io_thread_t *io_thread_,
-                                                  bool active_,
-                                                  class socket_base_t *socket_,
-                                                  const options_t &options_,
-                                                  address_t *addr_)
-{
-    session_base_t *s = NULL;
-    switch (options_.type) {
-        case ZMQ_REQ:
-            s = new (std::nothrow)
-              req_session_t (io_thread_, active_, socket_, options_, addr_);
-            break;
-        case ZMQ_RADIO:
-            s = new (std::nothrow)
-              radio_session_t (io_thread_, active_, socket_, options_, addr_);
-            break;
-        case ZMQ_DISH:
-            s = new (std::nothrow)
-              dish_session_t (io_thread_, active_, socket_, options_, addr_);
-            break;
-        case ZMQ_DEALER:
-        case ZMQ_REP:
-        case ZMQ_ROUTER:
-        case ZMQ_PUB:
-        case ZMQ_XPUB:
-        case ZMQ_SUB:
-        case ZMQ_XSUB:
-        case ZMQ_PUSH:
-        case ZMQ_PULL:
-        case ZMQ_PAIR:
-        case ZMQ_STREAM:
-        case ZMQ_SERVER:
-        case ZMQ_CLIENT:
-        case ZMQ_GATHER:
-        case ZMQ_SCATTER:
-        case ZMQ_DGRAM:
-        case ZMQ_PEER:
-        case ZMQ_CHANNEL:
-#ifdef ZMQ_BUILD_DRAFT_API
-            if (options_.can_send_hello_msg && options_.hello_msg.size () > 0)
-                s = new (std::nothrow) hello_msg_session_t (
-                  io_thread_, active_, socket_, options_, addr_);
-            else
-                s = new (std::nothrow) session_base_t (
-                  io_thread_, active_, socket_, options_, addr_);
-
-            break;
-#else
-            s = new (std::nothrow)
-              session_base_t (io_thread_, active_, socket_, options_, addr_);
-            break;
-#endif
-
-        default:
-            errno = EINVAL;
-            return NULL;
-    }
-    alloc_assert (s);
-    return s;
-}
-
-zmq::session_base_t::session_base_t (class io_thread_t *io_thread_,
-                                     bool active_,
-                                     class socket_base_t *socket_,
-                                     const options_t &options_,
-                                     address_t *addr_) :
-    own_t (io_thread_, options_),
-    io_object_t (io_thread_),
-    _active (active_),
-    _pipe (NULL),
-    _zap_pipe (NULL),
-    _incomplete_in (false),
-    _pending (false),
-    _engine (NULL),
-    _socket (socket_),
-    _io_thread (io_thread_),
-    _has_linger_timer (false),
-    _addr (addr_)
-#ifdef ZMQ_HAVE_WSS
-    ,
-    _wss_hostname (options_.wss_hostname)
-#endif
-{
-}
-
-const zmq::endpoint_uri_pair_t &zmq::session_base_t::get_endpoint () const
-{
-    return _engine->get_endpoint ();
-}
-
-zmq::session_base_t::~session_base_t ()
-{
-    zmq_assert (!_pipe);
-    zmq_assert (!_zap_pipe);
-
-    //  If there's still a pending linger timer, remove it.
-    if (_has_linger_timer) {
-        cancel_timer (linger_timer_id);
-        _has_linger_timer = false;
-    }
-
-    //  Close the engine.
-    if (_engine)
-        _engine->terminate ();
-
-    LIBZMQ_DELETE (_addr);
-}
-
-void zmq::session_base_t::attach_pipe (pipe_t *pipe_)
-{
-    zmq_assert (!is_terminating ());
-    zmq_assert (!_pipe);
-    zmq_assert (pipe_);
-    _pipe = pipe_;
-    _pipe->set_event_sink (this);
-}
-
-int zmq::session_base_t::pull_msg (msg_t *msg_)
-{
-    if (!_pipe || !_pipe->read (msg_)) {
-        errno = EAGAIN;
-        return -1;
-    }
-
-    _incomplete_in = (msg_->flags () & msg_t::more) != 0;
-
-    return 0;
-}
-
-int zmq::session_base_t::push_msg (msg_t *msg_)
-{
-    //  pass subscribe/cancel to the sockets
-    if ((msg_->flags () & msg_t::command) && !msg_->is_subscribe ()
-        && !msg_->is_cancel ())
-        return 0;
-    if (_pipe && _pipe->write (msg_)) {
-        const int rc = msg_->init ();
-        errno_assert (rc == 0);
-        return 0;
-    }
-
-    errno = EAGAIN;
-    return -1;
-}
-
-int zmq::session_base_t::read_zap_msg (msg_t *msg_)
-{
-    if (_zap_pipe == NULL) {
-        errno = ENOTCONN;
-        return -1;
-    }
-
-    if (!_zap_pipe->read (msg_)) {
-        errno = EAGAIN;
-        return -1;
-    }
-
-    return 0;
-}
-
-int zmq::session_base_t::write_zap_msg (msg_t *msg_)
-{
-    if (_zap_pipe == NULL || !_zap_pipe->write (msg_)) {
-        errno = ENOTCONN;
-        return -1;
-    }
-
-    if ((msg_->flags () & msg_t::more) == 0)
-        _zap_pipe->flush ();
-
-    const int rc = msg_->init ();
-    errno_assert (rc == 0);
-    return 0;
-}
-
-void zmq::session_base_t::reset ()
-{
-}
-
-void zmq::session_base_t::flush ()
-{
-    if (_pipe)
-        _pipe->flush ();
-}
-
-void zmq::session_base_t::rollback ()
-{
-    if (_pipe)
-        _pipe->rollback ();
-}
-
-void zmq::session_base_t::clean_pipes ()
-{
-    zmq_assert (_pipe != NULL);
-
-    //  Get rid of half-processed messages in the out pipe. Flush any
-    //  unflushed messages upstream.
-    _pipe->rollback ();
-    _pipe->flush ();
-
-    //  Remove any half-read message from the in pipe.
-    while (_incomplete_in) {
-        msg_t msg;
-        int rc = msg.init ();
-        errno_assert (rc == 0);
-        rc = pull_msg (&msg);
-        errno_assert (rc == 0);
-        rc = msg.close ();
-        errno_assert (rc == 0);
-    }
-}
-
-void zmq::session_base_t::pipe_terminated (pipe_t *pipe_)
-{
-    // Drop the reference to the deallocated pipe if required.
-    zmq_assert (pipe_ == _pipe || pipe_ == _zap_pipe
-                || _terminating_pipes.count (pipe_) == 1);
-
-    if (pipe_ == _pipe) {
-        // If this is our current pipe, remove it
-        _pipe = NULL;
-        if (_has_linger_timer) {
-            cancel_timer (linger_timer_id);
-            _has_linger_timer = false;
-        }
-    } else if (pipe_ == _zap_pipe)
-        _zap_pipe = NULL;
-    else
-        // Remove the pipe from the detached pipes set
-        _terminating_pipes.erase (pipe_);
-
-    if (!is_terminating () && options.raw_socket) {
-        if (_engine) {
-            _engine->terminate ();
-            _engine = NULL;
-        }
-        terminate ();
-    }
-
-    //  If we are waiting for pending messages to be sent, at this point
-    //  we are sure that there will be no more messages and we can proceed
-    //  with termination safely.
-    if (_pending && !_pipe && !_zap_pipe && _terminating_pipes.empty ()) {
-        _pending = false;
-        own_t::process_term (0);
-    }
-}
-
-void zmq::session_base_t::read_activated (pipe_t *pipe_)
-{
-    // Skip activating if we're detaching this pipe
-    if (unlikely (pipe_ != _pipe && pipe_ != _zap_pipe)) {
-        zmq_assert (_terminating_pipes.count (pipe_) == 1);
-        return;
-    }
-
-    if (unlikely (_engine == NULL)) {
-        if (_pipe)
-            _pipe->check_read ();
-        return;
-    }
-
-    if (likely (pipe_ == _pipe))
-        _engine->restart_output ();
-    else {
-        // i.e. pipe_ == zap_pipe
-        _engine->zap_msg_available ();
-    }
-}
-
-void zmq::session_base_t::write_activated (pipe_t *pipe_)
-{
-    // Skip activating if we're detaching this pipe
-    if (_pipe != pipe_) {
-        zmq_assert (_terminating_pipes.count (pipe_) == 1);
-        return;
-    }
-
-    if (_engine)
-        _engine->restart_input ();
-}
-
-void zmq::session_base_t::hiccuped (pipe_t *)
-{
-    //  Hiccups are always sent from session to socket, not the other
-    //  way round.
-    zmq_assert (false);
-}
-
-zmq::socket_base_t *zmq::session_base_t::get_socket () const
-{
-    return _socket;
-}
-
-void zmq::session_base_t::process_plug ()
-{
-    if (_active)
-        start_connecting (false);
-}
-
-//  This functions can return 0 on success or -1 and errno=ECONNREFUSED if ZAP
-//  is not setup (IE: inproc://zeromq.zap.01 does not exist in the same context)
-//  or it aborts on any other error. In other words, either ZAP is not
-//  configured or if it is configured it MUST be configured correctly and it
-//  MUST work, otherwise authentication cannot be guaranteed and it would be a
-//  security flaw.
-int zmq::session_base_t::zap_connect ()
-{
-    if (_zap_pipe != NULL)
-        return 0;
-
-    endpoint_t peer = find_endpoint ("inproc://zeromq.zap.01");
-    if (peer.socket == NULL) {
-        errno = ECONNREFUSED;
-        return -1;
-    }
-    zmq_assert (peer.options.type == ZMQ_REP || peer.options.type == ZMQ_ROUTER
-                || peer.options.type == ZMQ_SERVER);
-
-    //  Create a bi-directional pipe that will connect
-    //  session with zap socket.
-    object_t *parents[2] = {this, peer.socket};
-    pipe_t *new_pipes[2] = {NULL, NULL};
-    int hwms[2] = {0, 0};
-    bool conflates[2] = {false, false};
-    int rc = pipepair (parents, new_pipes, hwms, conflates);
-    errno_assert (rc == 0);
-
-    //  Attach local end of the pipe to this socket object.
-    _zap_pipe = new_pipes[0];
-    _zap_pipe->set_nodelay ();
-    _zap_pipe->set_event_sink (this);
-
-    send_bind (peer.socket, new_pipes[1], false);
-
-    //  Send empty routing id if required by the peer.
-    if (peer.options.recv_routing_id) {
-        msg_t id;
-        rc = id.init ();
-        errno_assert (rc == 0);
-        id.set_flags (msg_t::routing_id);
-        bool ok = _zap_pipe->write (&id);
-        zmq_assert (ok);
-        _zap_pipe->flush ();
-    }
-
-    return 0;
-}
-
-bool zmq::session_base_t::zap_enabled () const
-{
-    return (options.mechanism != ZMQ_NULL || !options.zap_domain.empty ());
-}
-
-void zmq::session_base_t::process_attach (i_engine *engine_)
-{
-    zmq_assert (engine_ != NULL);
-    zmq_assert (!_engine);
-    _engine = engine_;
-
-    if (!engine_->has_handshake_stage ())
-        engine_ready ();
-
-    //  Plug in the engine.
-    _engine->plug (_io_thread, this);
-}
-
-void zmq::session_base_t::engine_ready ()
-{
-    //  Create the pipe if it does not exist yet.
-    if (!_pipe && !is_terminating ()) {
-        object_t *parents[2] = {this, _socket};
-        pipe_t *pipes[2] = {NULL, NULL};
-
-        const bool conflate = get_effective_conflate_option (options);
-
-        int hwms[2] = {conflate ? -1 : options.rcvhwm,
-                       conflate ? -1 : options.sndhwm};
-        bool conflates[2] = {conflate, conflate};
-        const int rc = pipepair (parents, pipes, hwms, conflates);
-        errno_assert (rc == 0);
-
-        //  Plug the local end of the pipe.
-        pipes[0]->set_event_sink (this);
-
-        //  Remember the local end of the pipe.
-        zmq_assert (!_pipe);
-        _pipe = pipes[0];
-
-        //  The endpoints strings are not set on bind, set them here so that
-        //  events can use them.
-        pipes[0]->set_endpoint_pair (_engine->get_endpoint ());
-        pipes[1]->set_endpoint_pair (_engine->get_endpoint ());
-
-        //  Ask socket to plug into the remote end of the pipe.
-        send_bind (_socket, pipes[1]);
-    }
-}
-
-void zmq::session_base_t::engine_error (bool handshaked_,
-                                        zmq::i_engine::error_reason_t reason_)
-{
-    //  Engine is dead. Let's forget about it.
-    _engine = NULL;
-
-    //  Remove any half-done messages from the pipes.
-    if (_pipe) {
-        clean_pipes ();
-
-        //  Only send disconnect message if socket was accepted and handshake was completed
-        if (!_active && handshaked_ && options.can_recv_disconnect_msg
-            && !options.disconnect_msg.empty ()) {
-            _pipe->set_disconnect_msg (options.disconnect_msg);
-            _pipe->send_disconnect_msg ();
-        }
-
-        //  Only send hiccup message if socket was connected and handshake was completed
-        if (_active && handshaked_ && options.can_recv_hiccup_msg
-            && !options.hiccup_msg.empty ()) {
-            _pipe->send_hiccup_msg (options.hiccup_msg);
-        }
-    }
-
-    zmq_assert (reason_ == i_engine::connection_error
-                || reason_ == i_engine::timeout_error
-                || reason_ == i_engine::protocol_error);
-
-    switch (reason_) {
-        case i_engine::timeout_error:
-            /* FALLTHROUGH */
-        case i_engine::connection_error:
-            if (_active) {
-                reconnect ();
-                break;
-            }
-
-        case i_engine::protocol_error:
-            if (_pending) {
-                if (_pipe)
-                    _pipe->terminate (false);
-                if (_zap_pipe)
-                    _zap_pipe->terminate (false);
-            } else {
-                terminate ();
-            }
-            break;
-    }
-
-    //  Just in case there's only a delimiter in the pipe.
-    if (_pipe)
-        _pipe->check_read ();
-
-    if (_zap_pipe)
-        _zap_pipe->check_read ();
-}
-
-void zmq::session_base_t::process_term (int linger_)
-{
-    zmq_assert (!_pending);
-
-    //  If the termination of the pipe happens before the term command is
-    //  delivered there's nothing much to do. We can proceed with the
-    //  standard termination immediately.
-    if (!_pipe && !_zap_pipe && _terminating_pipes.empty ()) {
-        own_t::process_term (0);
-        return;
-    }
-
-    _pending = true;
-
-    if (_pipe != NULL) {
-        //  If there's finite linger value, delay the termination.
-        //  If linger is infinite (negative) we don't even have to set
-        //  the timer.
-        if (linger_ > 0) {
-            zmq_assert (!_has_linger_timer);
-            add_timer (linger_, linger_timer_id);
-            _has_linger_timer = true;
-        }
-
-        //  Start pipe termination process. Delay the termination till all messages
-        //  are processed in case the linger time is non-zero.
-        _pipe->terminate (linger_ != 0);
-
-        //  TODO: Should this go into pipe_t::terminate ?
-        //  In case there's no engine and there's only delimiter in the
-        //  pipe it wouldn't be ever read. Thus we check for it explicitly.
-        if (!_engine)
-            _pipe->check_read ();
-    }
-
-    if (_zap_pipe != NULL)
-        _zap_pipe->terminate (false);
-}
-
-void zmq::session_base_t::timer_event (int id_)
-{
-    //  Linger period expired. We can proceed with termination even though
-    //  there are still pending messages to be sent.
-    zmq_assert (id_ == linger_timer_id);
-    _has_linger_timer = false;
-
-    //  Ask pipe to terminate even though there may be pending messages in it.
-    zmq_assert (_pipe);
-    _pipe->terminate (false);
-}
-
-void zmq::session_base_t::process_conn_failed ()
-{
-    std::string *ep = new (std::string);
-    _addr->to_string (*ep);
-    send_term_endpoint (_socket, ep);
-}
-
-void zmq::session_base_t::reconnect ()
-{
-    //  For delayed connect situations, terminate the pipe
-    //  and reestablish later on
-    if (_pipe && options.immediate == 1
-#ifdef ZMQ_HAVE_OPENPGM
-        && _addr->protocol != protocol_name::pgm
-        && _addr->protocol != protocol_name::epgm
-#endif
-#ifdef ZMQ_HAVE_NORM
-        && _addr->protocol != protocol_name::norm
-#endif
-        && _addr->protocol != protocol_name::udp) {
-        _pipe->hiccup ();
-        _pipe->terminate (false);
-        _terminating_pipes.insert (_pipe);
-        _pipe = NULL;
-
-        if (_has_linger_timer) {
-            cancel_timer (linger_timer_id);
-            _has_linger_timer = false;
-        }
-    }
-
-    reset ();
-
-    //  Reconnect.
-    if (options.reconnect_ivl > 0)
-        start_connecting (true);
-    else {
-        std::string *ep = new (std::string);
-        _addr->to_string (*ep);
-        send_term_endpoint (_socket, ep);
-    }
-
-    //  For subscriber sockets we hiccup the inbound pipe, which will cause
-    //  the socket object to resend all the subscriptions.
-    if (_pipe
-        && (options.type == ZMQ_SUB || options.type == ZMQ_XSUB
-            || options.type == ZMQ_DISH))
-        _pipe->hiccup ();
-}
-
-void zmq::session_base_t::start_connecting (bool wait_)
-{
-    zmq_assert (_active);
-
-    //  Choose I/O thread to run connecter in. Given that we are already
-    //  running in an I/O thread, there must be at least one available.
-    io_thread_t *io_thread = choose_io_thread (options.affinity);
-    zmq_assert (io_thread);
-
-    //  Create the connecter object.
-    own_t *connecter = NULL;
-    if (_addr->protocol == protocol_name::tcp) {
-        if (!options.socks_proxy_address.empty ()) {
-            address_t *proxy_address = new (std::nothrow)
-              address_t (protocol_name::tcp, options.socks_proxy_address,
-                         this->get_ctx ());
-            alloc_assert (proxy_address);
-            connecter = new (std::nothrow) socks_connecter_t (
-              io_thread, this, options, _addr, proxy_address, wait_);
-            alloc_assert (connecter);
-            if (!options.socks_proxy_username.empty ()) {
-                reinterpret_cast<socks_connecter_t *> (connecter)
-                  ->set_auth_method_basic (options.socks_proxy_username,
-                                           options.socks_proxy_password);
-            }
-        } else {
-            connecter = new (std::nothrow)
-              tcp_connecter_t (io_thread, this, options, _addr, wait_);
-        }
-    }
-#if defined ZMQ_HAVE_IPC
-    else if (_addr->protocol == protocol_name::ipc) {
-        connecter = new (std::nothrow)
-          ipc_connecter_t (io_thread, this, options, _addr, wait_);
-    }
-#endif
-#if defined ZMQ_HAVE_TIPC
-    else if (_addr->protocol == protocol_name::tipc) {
-        connecter = new (std::nothrow)
-          tipc_connecter_t (io_thread, this, options, _addr, wait_);
-    }
-#endif
-#if defined ZMQ_HAVE_VMCI
-    else if (_addr->protocol == protocol_name::vmci) {
-        connecter = new (std::nothrow)
-          vmci_connecter_t (io_thread, this, options, _addr, wait_);
-    }
-#endif
-#if defined ZMQ_HAVE_WS
-    else if (_addr->protocol == protocol_name::ws) {
-        connecter = new (std::nothrow) ws_connecter_t (
-          io_thread, this, options, _addr, wait_, false, std::string ());
-    }
-#endif
-#if defined ZMQ_HAVE_WSS
-    else if (_addr->protocol == protocol_name::wss) {
-        connecter = new (std::nothrow) ws_connecter_t (
-          io_thread, this, options, _addr, wait_, true, _wss_hostname);
-    }
-#endif
-    if (connecter != NULL) {
-        alloc_assert (connecter);
-        launch_child (connecter);
-        return;
-    }
-
-    if (_addr->protocol == protocol_name::udp) {
-        zmq_assert (options.type == ZMQ_DISH || options.type == ZMQ_RADIO
-                    || options.type == ZMQ_DGRAM);
-
-        udp_engine_t *engine = new (std::nothrow) udp_engine_t (options);
-        alloc_assert (engine);
-
-        bool recv = false;
-        bool send = false;
-
-        if (options.type == ZMQ_RADIO) {
-            send = true;
-            recv = false;
-        } else if (options.type == ZMQ_DISH) {
-            send = false;
-            recv = true;
-        } else if (options.type == ZMQ_DGRAM) {
-            send = true;
-            recv = true;
-        }
-
-        int rc = engine->init (_addr, send, recv);
-        errno_assert (rc == 0);
-
-        send_attach (this, engine);
-
-        return;
-    }
-
-#ifdef ZMQ_HAVE_OPENPGM
-
-    //  Both PGM and EPGM transports are using the same infrastructure.
-    if (_addr->protocol == "pgm" || _addr->protocol == "epgm") {
-        zmq_assert (options.type == ZMQ_PUB || options.type == ZMQ_XPUB
-                    || options.type == ZMQ_SUB || options.type == ZMQ_XSUB);
-
-        //  For EPGM transport with UDP encapsulation of PGM is used.
-        bool const udp_encapsulation = _addr->protocol == "epgm";
-
-        //  At this point we'll create message pipes to the session straight
-        //  away. There's no point in delaying it as no concept of 'connect'
-        //  exists with PGM anyway.
-        if (options.type == ZMQ_PUB || options.type == ZMQ_XPUB) {
-            //  PGM sender.
-            pgm_sender_t *pgm_sender =
-              new (std::nothrow) pgm_sender_t (io_thread, options);
-            alloc_assert (pgm_sender);
-
-            int rc =
-              pgm_sender->init (udp_encapsulation, _addr->address.c_str ());
-            errno_assert (rc == 0);
-
-            send_attach (this, pgm_sender);
-        } else {
-            //  PGM receiver.
-            pgm_receiver_t *pgm_receiver =
-              new (std::nothrow) pgm_receiver_t (io_thread, options);
-            alloc_assert (pgm_receiver);
-
-            int rc =
-              pgm_receiver->init (udp_encapsulation, _addr->address.c_str ());
-            errno_assert (rc == 0);
-
-            send_attach (this, pgm_receiver);
-        }
-
-        return;
-    }
-#endif
-
-#ifdef ZMQ_HAVE_NORM
-    if (_addr->protocol == "norm") {
-        //  At this point we'll create message pipes to the session straight
-        //  away. There's no point in delaying it as no concept of 'connect'
-        //  exists with NORM anyway.
-        if (options.type == ZMQ_PUB || options.type == ZMQ_XPUB) {
-            //  NORM sender.
-            norm_engine_t *norm_sender =
-              new (std::nothrow) norm_engine_t (io_thread, options);
-            alloc_assert (norm_sender);
-
-            int rc = norm_sender->init (_addr->address.c_str (), true, false);
-            errno_assert (rc == 0);
-
-            send_attach (this, norm_sender);
-        } else { // ZMQ_SUB or ZMQ_XSUB
-
-            //  NORM receiver.
-            norm_engine_t *norm_receiver =
-              new (std::nothrow) norm_engine_t (io_thread, options);
-            alloc_assert (norm_receiver);
-
-            int rc = norm_receiver->init (_addr->address.c_str (), false, true);
-            errno_assert (rc == 0);
-
-            send_attach (this, norm_receiver);
-        }
-        return;
-    }
-#endif // ZMQ_HAVE_NORM
-
-    zmq_assert (false);
-}
-
-zmq::hello_msg_session_t::hello_msg_session_t (io_thread_t *io_thread_,
-                                               bool connect_,
-                                               socket_base_t *socket_,
-                                               const options_t &options_,
-                                               address_t *addr_) :
-    session_base_t (io_thread_, connect_, socket_, options_, addr_),
-    _new_pipe (true)
-{
-}
-
-zmq::hello_msg_session_t::~hello_msg_session_t ()
-{
-}
-
-
-int zmq::hello_msg_session_t::pull_msg (msg_t *msg_)
-{
-    if (_new_pipe) {
-        _new_pipe = false;
-
-        const int rc =
-          msg_->init_buffer (&options.hello_msg[0], options.hello_msg.size ());
-        errno_assert (rc == 0);
-
-        return 0;
-    }
-
-    return session_base_t::pull_msg (msg_);
-}
-
-void zmq::hello_msg_session_t::reset ()
-{
-    session_base_t::reset ();
-    _new_pipe = true;
-}
diff --git a/libs/libzmq/src/session_base.hpp b/libs/libzmq/src/session_base.hpp
deleted file mode 100644
index e96e053..0000000
--- a/libs/libzmq/src/session_base.hpp
+++ /dev/null
@@ -1,198 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_SESSION_BASE_HPP_INCLUDED__
-#define __ZMQ_SESSION_BASE_HPP_INCLUDED__
-
-#include <stdarg.h>
-
-#include "own.hpp"
-#include "io_object.hpp"
-#include "pipe.hpp"
-#include "socket_base.hpp"
-#include "i_engine.hpp"
-#include "msg.hpp"
-
-namespace zmq
-{
-class io_thread_t;
-struct i_engine;
-struct address_t;
-
-class session_base_t : public own_t, public io_object_t, public i_pipe_events
-{
-  public:
-    //  Create a session of the particular type.
-    static session_base_t *create (zmq::io_thread_t *io_thread_,
-                                   bool active_,
-                                   zmq::socket_base_t *socket_,
-                                   const options_t &options_,
-                                   address_t *addr_);
-
-    //  To be used once only, when creating the session.
-    void attach_pipe (zmq::pipe_t *pipe_);
-
-    //  Following functions are the interface exposed towards the engine.
-    virtual void reset ();
-    void flush ();
-    void rollback ();
-    void engine_error (bool handshaked_, zmq::i_engine::error_reason_t reason_);
-    void engine_ready ();
-
-    //  i_pipe_events interface implementation.
-    void read_activated (zmq::pipe_t *pipe_) ZMQ_FINAL;
-    void write_activated (zmq::pipe_t *pipe_) ZMQ_FINAL;
-    void hiccuped (zmq::pipe_t *pipe_) ZMQ_FINAL;
-    void pipe_terminated (zmq::pipe_t *pipe_) ZMQ_FINAL;
-
-    //  Delivers a message. Returns 0 if successful; -1 otherwise.
-    //  The function takes ownership of the message.
-    virtual int push_msg (msg_t *msg_);
-
-    int zap_connect ();
-    bool zap_enabled () const;
-
-    //  Fetches a message. Returns 0 if successful; -1 otherwise.
-    //  The caller is responsible for freeing the message when no
-    //  longer used.
-    virtual int pull_msg (msg_t *msg_);
-
-    //  Receives message from ZAP socket.
-    //  Returns 0 on success; -1 otherwise.
-    //  The caller is responsible for freeing the message.
-    int read_zap_msg (msg_t *msg_);
-
-    //  Sends message to ZAP socket.
-    //  Returns 0 on success; -1 otherwise.
-    //  The function takes ownership of the message.
-    int write_zap_msg (msg_t *msg_);
-
-    socket_base_t *get_socket () const;
-    const endpoint_uri_pair_t &get_endpoint () const;
-
-  protected:
-    session_base_t (zmq::io_thread_t *io_thread_,
-                    bool active_,
-                    zmq::socket_base_t *socket_,
-                    const options_t &options_,
-                    address_t *addr_);
-    ~session_base_t () ZMQ_OVERRIDE;
-
-  private:
-    void start_connecting (bool wait_);
-
-    void reconnect ();
-
-    //  Handlers for incoming commands.
-    void process_plug () ZMQ_FINAL;
-    void process_attach (zmq::i_engine *engine_) ZMQ_FINAL;
-    void process_term (int linger_) ZMQ_FINAL;
-    void process_conn_failed () ZMQ_OVERRIDE;
-
-    //  i_poll_events handlers.
-    void timer_event (int id_) ZMQ_FINAL;
-
-    //  Remove any half processed messages. Flush unflushed messages.
-    //  Call this function when engine disconnect to get rid of leftovers.
-    void clean_pipes ();
-
-    //  If true, this session (re)connects to the peer. Otherwise, it's
-    //  a transient session created by the listener.
-    const bool _active;
-
-    //  Pipe connecting the session to its socket.
-    zmq::pipe_t *_pipe;
-
-    //  Pipe used to exchange messages with ZAP socket.
-    zmq::pipe_t *_zap_pipe;
-
-    //  This set is added to with pipes we are disconnecting, but haven't yet completed
-    std::set<pipe_t *> _terminating_pipes;
-
-    //  This flag is true if the remainder of the message being processed
-    //  is still in the in pipe.
-    bool _incomplete_in;
-
-    //  True if termination have been suspended to push the pending
-    //  messages to the network.
-    bool _pending;
-
-    //  The protocol I/O engine connected to the session.
-    zmq::i_engine *_engine;
-
-    //  The socket the session belongs to.
-    zmq::socket_base_t *_socket;
-
-    //  I/O thread the session is living in. It will be used to plug in
-    //  the engines into the same thread.
-    zmq::io_thread_t *_io_thread;
-
-    //  ID of the linger timer
-    enum
-    {
-        linger_timer_id = 0x20
-    };
-
-    //  True is linger timer is running.
-    bool _has_linger_timer;
-
-    //  Protocol and address to use when connecting.
-    address_t *_addr;
-
-#ifdef ZMQ_HAVE_WSS
-    //  TLS handshake, we need to take a copy when the session is created,
-    //  in order to maintain the value at the creation time
-    const std::string _wss_hostname;
-#endif
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (session_base_t)
-};
-
-class hello_msg_session_t ZMQ_FINAL : public session_base_t
-{
-  public:
-    hello_msg_session_t (zmq::io_thread_t *io_thread_,
-                         bool connect_,
-                         zmq::socket_base_t *socket_,
-                         const options_t &options_,
-                         address_t *addr_);
-    ~hello_msg_session_t ();
-
-    //  Overrides of the functions from session_base_t.
-    int pull_msg (msg_t *msg_);
-    void reset ();
-
-  private:
-    bool _new_pipe;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (hello_msg_session_t)
-};
-}
-
-#endif
diff --git a/libs/libzmq/src/signaler.cpp b/libs/libzmq/src/signaler.cpp
deleted file mode 100644
index 93fb248..0000000
--- a/libs/libzmq/src/signaler.cpp
+++ /dev/null
@@ -1,414 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "poller.hpp"
-#include "polling_util.hpp"
-
-#if defined ZMQ_POLL_BASED_ON_POLL
-#if !defined ZMQ_HAVE_WINDOWS && !defined ZMQ_HAVE_AIX
-#include <poll.h>
-#endif
-#elif defined ZMQ_POLL_BASED_ON_SELECT
-#if defined ZMQ_HAVE_WINDOWS
-#elif defined ZMQ_HAVE_HPUX
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/time.h>
-#elif defined ZMQ_HAVE_OPENVMS
-#include <sys/types.h>
-#include <sys/time.h>
-#elif defined ZMQ_HAVE_VXWORKS
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sockLib.h>
-#include <strings.h>
-#else
-#include <sys/select.h>
-#endif
-#endif
-
-#include "signaler.hpp"
-#include "likely.hpp"
-#include "stdint.hpp"
-#include "config.hpp"
-#include "err.hpp"
-#include "fd.hpp"
-#include "ip.hpp"
-#include "tcp.hpp"
-
-#if !defined ZMQ_HAVE_WINDOWS
-#include <unistd.h>
-#include <netinet/tcp.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#endif
-
-#if !defined(ZMQ_HAVE_WINDOWS)
-// Helper to sleep for specific number of milliseconds (or until signal)
-//
-static int sleep_ms (unsigned int ms_)
-{
-    if (ms_ == 0)
-        return 0;
-#if defined ZMQ_HAVE_ANDROID
-    usleep (ms_ * 1000);
-    return 0;
-#elif defined ZMQ_HAVE_VXWORKS
-    struct timespec ns_;
-    ns_.tv_sec = ms_ / 1000;
-    ns_.tv_nsec = ms_ % 1000 * 1000000;
-    return nanosleep (&ns_, 0);
-#else
-    return usleep (ms_ * 1000);
-#endif
-}
-
-// Helper to wait on close(), for non-blocking sockets, until it completes
-// If EAGAIN is received, will sleep briefly (1-100ms) then try again, until
-// the overall timeout is reached.
-//
-static int close_wait_ms (int fd_, unsigned int max_ms_ = 2000)
-{
-    unsigned int ms_so_far = 0;
-    const unsigned int min_step_ms = 1;
-    const unsigned int max_step_ms = 100;
-    const unsigned int step_ms =
-      std::min (std::max (min_step_ms, max_ms_ / 10), max_step_ms);
-
-    int rc = 0; // do not sleep on first attempt
-    do {
-        if (rc == -1 && errno == EAGAIN) {
-            sleep_ms (step_ms);
-            ms_so_far += step_ms;
-        }
-        rc = close (fd_);
-    } while (ms_so_far < max_ms_ && rc == -1 && errno == EAGAIN);
-
-    return rc;
-}
-#endif
-
-zmq::signaler_t::signaler_t ()
-{
-    //  Create the socketpair for signaling.
-    if (make_fdpair (&_r, &_w) == 0) {
-        unblock_socket (_w);
-        unblock_socket (_r);
-    }
-#ifdef HAVE_FORK
-    pid = getpid ();
-#endif
-}
-
-// This might get run after some part of construction failed, leaving one or
-// both of _r and _w retired_fd.
-zmq::signaler_t::~signaler_t ()
-{
-#if defined ZMQ_HAVE_EVENTFD
-    if (_r == retired_fd)
-        return;
-    int rc = close_wait_ms (_r);
-    errno_assert (rc == 0);
-#elif defined ZMQ_HAVE_WINDOWS
-    if (_w != retired_fd) {
-        const struct linger so_linger = {1, 0};
-        int rc = setsockopt (_w, SOL_SOCKET, SO_LINGER,
-                             reinterpret_cast<const char *> (&so_linger),
-                             sizeof so_linger);
-        //  Only check shutdown if WSASTARTUP was previously done
-        if (rc == 0 || WSAGetLastError () != WSANOTINITIALISED) {
-            wsa_assert (rc != SOCKET_ERROR);
-            rc = closesocket (_w);
-            wsa_assert (rc != SOCKET_ERROR);
-            if (_r == retired_fd)
-                return;
-            rc = closesocket (_r);
-            wsa_assert (rc != SOCKET_ERROR);
-        }
-    }
-#else
-    if (_w != retired_fd) {
-        int rc = close_wait_ms (_w);
-        errno_assert (rc == 0);
-    }
-    if (_r != retired_fd) {
-        int rc = close_wait_ms (_r);
-        errno_assert (rc == 0);
-    }
-#endif
-}
-
-zmq::fd_t zmq::signaler_t::get_fd () const
-{
-    return _r;
-}
-
-void zmq::signaler_t::send ()
-{
-#if defined HAVE_FORK
-    if (unlikely (pid != getpid ())) {
-        //printf("Child process %d signaler_t::send returning without sending #1\n", getpid());
-        return; // do not send anything in forked child context
-    }
-#endif
-#if defined ZMQ_HAVE_EVENTFD
-    const uint64_t inc = 1;
-    ssize_t sz = write (_w, &inc, sizeof (inc));
-    errno_assert (sz == sizeof (inc));
-#elif defined ZMQ_HAVE_WINDOWS
-    const char dummy = 0;
-    int nbytes;
-    do {
-        nbytes = ::send (_w, &dummy, sizeof (dummy), 0);
-        wsa_assert (nbytes != SOCKET_ERROR);
-        // wsa_assert does not abort on WSAEWOULDBLOCK. If we get this, we retry.
-    } while (nbytes == SOCKET_ERROR);
-    // Given the small size of dummy (should be 1) expect that send was able to send everything.
-    zmq_assert (nbytes == sizeof (dummy));
-#elif defined ZMQ_HAVE_VXWORKS
-    unsigned char dummy = 0;
-    while (true) {
-        ssize_t nbytes = ::send (_w, (char *) &dummy, sizeof (dummy), 0);
-        if (unlikely (nbytes == -1 && errno == EINTR))
-            continue;
-#if defined(HAVE_FORK)
-        if (unlikely (pid != getpid ())) {
-            //printf("Child process %d signaler_t::send returning without sending #2\n", getpid());
-            errno = EINTR;
-            break;
-        }
-#endif
-        zmq_assert (nbytes == sizeof dummy);
-        break;
-    }
-#else
-    unsigned char dummy = 0;
-    while (true) {
-        ssize_t nbytes = ::send (_w, &dummy, sizeof (dummy), 0);
-        if (unlikely (nbytes == -1 && errno == EINTR))
-            continue;
-#if defined(HAVE_FORK)
-        if (unlikely (pid != getpid ())) {
-            //printf("Child process %d signaler_t::send returning without sending #2\n", getpid());
-            errno = EINTR;
-            break;
-        }
-#endif
-        zmq_assert (nbytes == sizeof dummy);
-        break;
-    }
-#endif
-}
-
-int zmq::signaler_t::wait (int timeout_) const
-{
-#ifdef HAVE_FORK
-    if (unlikely (pid != getpid ())) {
-        // we have forked and the file descriptor is closed. Emulate an interrupt
-        // response.
-        //printf("Child process %d signaler_t::wait returning simulating interrupt #1\n", getpid());
-        errno = EINTR;
-        return -1;
-    }
-#endif
-
-#ifdef ZMQ_POLL_BASED_ON_POLL
-    struct pollfd pfd;
-    pfd.fd = _r;
-    pfd.events = POLLIN;
-    const int rc = poll (&pfd, 1, timeout_);
-    if (unlikely (rc < 0)) {
-        errno_assert (errno == EINTR);
-        return -1;
-    }
-    if (unlikely (rc == 0)) {
-        errno = EAGAIN;
-        return -1;
-    }
-#ifdef HAVE_FORK
-    if (unlikely (pid != getpid ())) {
-        // we have forked and the file descriptor is closed. Emulate an interrupt
-        // response.
-        //printf("Child process %d signaler_t::wait returning simulating interrupt #2\n", getpid());
-        errno = EINTR;
-        return -1;
-    }
-#endif
-    zmq_assert (rc == 1);
-    zmq_assert (pfd.revents & POLLIN);
-    return 0;
-
-#elif defined ZMQ_POLL_BASED_ON_SELECT
-
-    optimized_fd_set_t fds (1);
-    FD_ZERO (fds.get ());
-    FD_SET (_r, fds.get ());
-    struct timeval timeout;
-    if (timeout_ >= 0) {
-        timeout.tv_sec = timeout_ / 1000;
-        timeout.tv_usec = timeout_ % 1000 * 1000;
-    }
-#ifdef ZMQ_HAVE_WINDOWS
-    int rc =
-      select (0, fds.get (), NULL, NULL, timeout_ >= 0 ? &timeout : NULL);
-    wsa_assert (rc != SOCKET_ERROR);
-#else
-    int rc =
-      select (_r + 1, fds.get (), NULL, NULL, timeout_ >= 0 ? &timeout : NULL);
-    if (unlikely (rc < 0)) {
-        errno_assert (errno == EINTR);
-        return -1;
-    }
-#endif
-    if (unlikely (rc == 0)) {
-        errno = EAGAIN;
-        return -1;
-    }
-    zmq_assert (rc == 1);
-    return 0;
-
-#else
-#error
-#endif
-}
-
-void zmq::signaler_t::recv ()
-{
-//  Attempt to read a signal.
-#if defined ZMQ_HAVE_EVENTFD
-    uint64_t dummy;
-    ssize_t sz = read (_r, &dummy, sizeof (dummy));
-    errno_assert (sz == sizeof (dummy));
-
-    //  If we accidentally grabbed the next signal(s) along with the current
-    //  one, return it back to the eventfd object.
-    if (unlikely (dummy > 1)) {
-        const uint64_t inc = dummy - 1;
-        ssize_t sz2 = write (_w, &inc, sizeof (inc));
-        errno_assert (sz2 == sizeof (inc));
-        return;
-    }
-
-    zmq_assert (dummy == 1);
-#else
-    unsigned char dummy;
-#if defined ZMQ_HAVE_WINDOWS
-    const int nbytes =
-      ::recv (_r, reinterpret_cast<char *> (&dummy), sizeof (dummy), 0);
-    wsa_assert (nbytes != SOCKET_ERROR);
-#elif defined ZMQ_HAVE_VXWORKS
-    ssize_t nbytes = ::recv (_r, (char *) &dummy, sizeof (dummy), 0);
-    errno_assert (nbytes >= 0);
-#else
-    ssize_t nbytes = ::recv (_r, &dummy, sizeof (dummy), 0);
-    errno_assert (nbytes >= 0);
-#endif
-    zmq_assert (nbytes == sizeof (dummy));
-    zmq_assert (dummy == 0);
-#endif
-}
-
-int zmq::signaler_t::recv_failable ()
-{
-//  Attempt to read a signal.
-#if defined ZMQ_HAVE_EVENTFD
-    uint64_t dummy;
-    ssize_t sz = read (_r, &dummy, sizeof (dummy));
-    if (sz == -1) {
-        errno_assert (errno == EAGAIN);
-        return -1;
-    }
-    errno_assert (sz == sizeof (dummy));
-
-    //  If we accidentally grabbed the next signal(s) along with the current
-    //  one, return it back to the eventfd object.
-    if (unlikely (dummy > 1)) {
-        const uint64_t inc = dummy - 1;
-        ssize_t sz2 = write (_w, &inc, sizeof (inc));
-        errno_assert (sz2 == sizeof (inc));
-        return 0;
-    }
-
-    zmq_assert (dummy == 1);
-
-#else
-    unsigned char dummy;
-#if defined ZMQ_HAVE_WINDOWS
-    const int nbytes =
-      ::recv (_r, reinterpret_cast<char *> (&dummy), sizeof (dummy), 0);
-    if (nbytes == SOCKET_ERROR) {
-        const int last_error = WSAGetLastError ();
-        if (last_error == WSAEWOULDBLOCK) {
-            errno = EAGAIN;
-            return -1;
-        }
-        wsa_assert (last_error == WSAEWOULDBLOCK);
-    }
-#elif defined ZMQ_HAVE_VXWORKS
-    ssize_t nbytes = ::recv (_r, (char *) &dummy, sizeof (dummy), 0);
-    if (nbytes == -1) {
-        if (errno == EAGAIN || errno == EWOULDBLOCK || errno == EINTR) {
-            errno = EAGAIN;
-            return -1;
-        }
-        errno_assert (errno == EAGAIN || errno == EWOULDBLOCK
-                      || errno == EINTR);
-    }
-#else
-    ssize_t nbytes = ::recv (_r, &dummy, sizeof (dummy), 0);
-    if (nbytes == -1) {
-        if (errno == EAGAIN || errno == EWOULDBLOCK || errno == EINTR) {
-            errno = EAGAIN;
-            return -1;
-        }
-        errno_assert (errno == EAGAIN || errno == EWOULDBLOCK
-                      || errno == EINTR);
-    }
-#endif
-    zmq_assert (nbytes == sizeof (dummy));
-    zmq_assert (dummy == 0);
-#endif
-    return 0;
-}
-
-bool zmq::signaler_t::valid () const
-{
-    return _w != retired_fd;
-}
-
-#ifdef HAVE_FORK
-void zmq::signaler_t::forked ()
-{
-    //  Close file descriptors created in the parent and create new pair
-    close (_r);
-    close (_w);
-    make_fdpair (&_r, &_w);
-}
-#endif
diff --git a/libs/libzmq/src/signaler.hpp b/libs/libzmq/src/signaler.hpp
deleted file mode 100644
index 49fac1b..0000000
--- a/libs/libzmq/src/signaler.hpp
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_SIGNALER_HPP_INCLUDED__
-#define __ZMQ_SIGNALER_HPP_INCLUDED__
-
-#ifdef HAVE_FORK
-#include <unistd.h>
-#endif
-
-#include "fd.hpp"
-#include "macros.hpp"
-
-namespace zmq
-{
-//  This is a cross-platform equivalent to signal_fd. However, as opposed
-//  to signal_fd there can be at most one signal in the signaler at any
-//  given moment. Attempt to send a signal before receiving the previous
-//  one will result in undefined behaviour.
-
-class signaler_t
-{
-  public:
-    signaler_t ();
-    ~signaler_t ();
-
-    // Returns the socket/file descriptor
-    // May return retired_fd if the signaler could not be initialized.
-    fd_t get_fd () const;
-    void send ();
-    int wait (int timeout_) const;
-    void recv ();
-    int recv_failable ();
-
-    bool valid () const;
-
-#ifdef HAVE_FORK
-    // close the file descriptors in a forked child process so that they
-    // do not interfere with the context in the parent process.
-    void forked ();
-#endif
-
-  private:
-    //  Underlying write & read file descriptor
-    //  Will be -1 if an error occurred during initialization, e.g. we
-    //  exceeded the number of available handles
-    fd_t _w;
-    fd_t _r;
-
-#ifdef HAVE_FORK
-    // the process that created this context. Used to detect forking.
-    pid_t pid;
-    // idempotent close of file descriptors that is safe to use by destructor
-    // and forked().
-    void close_internal ();
-#endif
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (signaler_t)
-};
-}
-
-#endif
diff --git a/libs/libzmq/src/socket_base.cpp b/libs/libzmq/src/socket_base.cpp
deleted file mode 100644
index ee78d8b..0000000
--- a/libs/libzmq/src/socket_base.cpp
+++ /dev/null
@@ -1,2166 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include <new>
-#include <string>
-#include <algorithm>
-#include <limits>
-
-#include "macros.hpp"
-
-#if defined ZMQ_HAVE_WINDOWS
-#if defined _MSC_VER
-#if defined _WIN32_WCE
-#include <cmnintrin.h>
-#else
-#include <intrin.h>
-#endif
-#endif
-#else
-#include <unistd.h>
-#include <ctype.h>
-#endif
-
-#include "socket_base.hpp"
-#include "tcp_listener.hpp"
-#include "ws_listener.hpp"
-#include "ipc_listener.hpp"
-#include "tipc_listener.hpp"
-#include "tcp_connecter.hpp"
-#ifdef ZMQ_HAVE_WS
-#include "ws_address.hpp"
-#endif
-#include "io_thread.hpp"
-#include "session_base.hpp"
-#include "config.hpp"
-#include "pipe.hpp"
-#include "err.hpp"
-#include "ctx.hpp"
-#include "likely.hpp"
-#include "msg.hpp"
-#include "address.hpp"
-#include "ipc_address.hpp"
-#include "tcp_address.hpp"
-#include "udp_address.hpp"
-#include "tipc_address.hpp"
-#include "mailbox.hpp"
-#include "mailbox_safe.hpp"
-
-#ifdef ZMQ_HAVE_WSS
-#include "wss_address.hpp"
-#endif
-#if defined ZMQ_HAVE_VMCI
-#include "vmci_address.hpp"
-#include "vmci_listener.hpp"
-#endif
-
-#ifdef ZMQ_HAVE_OPENPGM
-#include "pgm_socket.hpp"
-#endif
-
-#include "pair.hpp"
-#include "pub.hpp"
-#include "sub.hpp"
-#include "req.hpp"
-#include "rep.hpp"
-#include "pull.hpp"
-#include "push.hpp"
-#include "dealer.hpp"
-#include "router.hpp"
-#include "xpub.hpp"
-#include "xsub.hpp"
-#include "stream.hpp"
-#include "server.hpp"
-#include "client.hpp"
-#include "radio.hpp"
-#include "dish.hpp"
-#include "gather.hpp"
-#include "scatter.hpp"
-#include "dgram.hpp"
-#include "peer.hpp"
-#include "channel.hpp"
-
-void zmq::socket_base_t::inprocs_t::emplace (const char *endpoint_uri_,
-                                             pipe_t *pipe_)
-{
-    _inprocs.ZMQ_MAP_INSERT_OR_EMPLACE (std::string (endpoint_uri_), pipe_);
-}
-
-int zmq::socket_base_t::inprocs_t::erase_pipes (
-  const std::string &endpoint_uri_str_)
-{
-    const std::pair<map_t::iterator, map_t::iterator> range =
-      _inprocs.equal_range (endpoint_uri_str_);
-    if (range.first == range.second) {
-        errno = ENOENT;
-        return -1;
-    }
-
-    for (map_t::iterator it = range.first; it != range.second; ++it) {
-        it->second->send_disconnect_msg ();
-        it->second->terminate (true);
-    }
-    _inprocs.erase (range.first, range.second);
-    return 0;
-}
-
-void zmq::socket_base_t::inprocs_t::erase_pipe (const pipe_t *pipe_)
-{
-    for (map_t::iterator it = _inprocs.begin (), end = _inprocs.end ();
-         it != end; ++it)
-        if (it->second == pipe_) {
-            _inprocs.erase (it);
-            break;
-        }
-}
-
-bool zmq::socket_base_t::check_tag () const
-{
-    return _tag == 0xbaddecaf;
-}
-
-bool zmq::socket_base_t::is_thread_safe () const
-{
-    return _thread_safe;
-}
-
-zmq::socket_base_t *zmq::socket_base_t::create (int type_,
-                                                class ctx_t *parent_,
-                                                uint32_t tid_,
-                                                int sid_)
-{
-    socket_base_t *s = NULL;
-    switch (type_) {
-        case ZMQ_PAIR:
-            s = new (std::nothrow) pair_t (parent_, tid_, sid_);
-            break;
-        case ZMQ_PUB:
-            s = new (std::nothrow) pub_t (parent_, tid_, sid_);
-            break;
-        case ZMQ_SUB:
-            s = new (std::nothrow) sub_t (parent_, tid_, sid_);
-            break;
-        case ZMQ_REQ:
-            s = new (std::nothrow) req_t (parent_, tid_, sid_);
-            break;
-        case ZMQ_REP:
-            s = new (std::nothrow) rep_t (parent_, tid_, sid_);
-            break;
-        case ZMQ_DEALER:
-            s = new (std::nothrow) dealer_t (parent_, tid_, sid_);
-            break;
-        case ZMQ_ROUTER:
-            s = new (std::nothrow) router_t (parent_, tid_, sid_);
-            break;
-        case ZMQ_PULL:
-            s = new (std::nothrow) pull_t (parent_, tid_, sid_);
-            break;
-        case ZMQ_PUSH:
-            s = new (std::nothrow) push_t (parent_, tid_, sid_);
-            break;
-        case ZMQ_XPUB:
-            s = new (std::nothrow) xpub_t (parent_, tid_, sid_);
-            break;
-        case ZMQ_XSUB:
-            s = new (std::nothrow) xsub_t (parent_, tid_, sid_);
-            break;
-        case ZMQ_STREAM:
-            s = new (std::nothrow) stream_t (parent_, tid_, sid_);
-            break;
-        case ZMQ_SERVER:
-            s = new (std::nothrow) server_t (parent_, tid_, sid_);
-            break;
-        case ZMQ_CLIENT:
-            s = new (std::nothrow) client_t (parent_, tid_, sid_);
-            break;
-        case ZMQ_RADIO:
-            s = new (std::nothrow) radio_t (parent_, tid_, sid_);
-            break;
-        case ZMQ_DISH:
-            s = new (std::nothrow) dish_t (parent_, tid_, sid_);
-            break;
-        case ZMQ_GATHER:
-            s = new (std::nothrow) gather_t (parent_, tid_, sid_);
-            break;
-        case ZMQ_SCATTER:
-            s = new (std::nothrow) scatter_t (parent_, tid_, sid_);
-            break;
-        case ZMQ_DGRAM:
-            s = new (std::nothrow) dgram_t (parent_, tid_, sid_);
-            break;
-        case ZMQ_PEER:
-            s = new (std::nothrow) peer_t (parent_, tid_, sid_);
-            break;
-        case ZMQ_CHANNEL:
-            s = new (std::nothrow) channel_t (parent_, tid_, sid_);
-            break;
-        default:
-            errno = EINVAL;
-            return NULL;
-    }
-
-    alloc_assert (s);
-
-    if (s->_mailbox == NULL) {
-        s->_destroyed = true;
-        LIBZMQ_DELETE (s);
-        return NULL;
-    }
-
-    return s;
-}
-
-zmq::socket_base_t::socket_base_t (ctx_t *parent_,
-                                   uint32_t tid_,
-                                   int sid_,
-                                   bool thread_safe_) :
-    own_t (parent_, tid_),
-    _sync (),
-    _tag (0xbaddecaf),
-    _ctx_terminated (false),
-    _destroyed (false),
-    _poller (NULL),
-    _handle (static_cast<poller_t::handle_t> (NULL)),
-    _last_tsc (0),
-    _ticks (0),
-    _rcvmore (false),
-    _monitor_socket (NULL),
-    _monitor_events (0),
-    _thread_safe (thread_safe_),
-    _reaper_signaler (NULL),
-    _monitor_sync ()
-{
-    options.socket_id = sid_;
-    options.ipv6 = (parent_->get (ZMQ_IPV6) != 0);
-    options.linger.store (parent_->get (ZMQ_BLOCKY) ? -1 : 0);
-    options.zero_copy = parent_->get (ZMQ_ZERO_COPY_RECV) != 0;
-
-    if (_thread_safe) {
-        _mailbox = new (std::nothrow) mailbox_safe_t (&_sync);
-        zmq_assert (_mailbox);
-    } else {
-        mailbox_t *m = new (std::nothrow) mailbox_t ();
-        zmq_assert (m);
-
-        if (m->get_fd () != retired_fd)
-            _mailbox = m;
-        else {
-            LIBZMQ_DELETE (m);
-            _mailbox = NULL;
-        }
-    }
-}
-
-int zmq::socket_base_t::get_peer_state (const void *routing_id_,
-                                        size_t routing_id_size_) const
-{
-    LIBZMQ_UNUSED (routing_id_);
-    LIBZMQ_UNUSED (routing_id_size_);
-
-    //  Only ROUTER sockets support this
-    errno = ENOTSUP;
-    return -1;
-}
-
-zmq::socket_base_t::~socket_base_t ()
-{
-    if (_mailbox)
-        LIBZMQ_DELETE (_mailbox);
-
-    if (_reaper_signaler)
-        LIBZMQ_DELETE (_reaper_signaler);
-
-    scoped_lock_t lock (_monitor_sync);
-    stop_monitor ();
-
-    zmq_assert (_destroyed);
-}
-
-zmq::i_mailbox *zmq::socket_base_t::get_mailbox () const
-{
-    return _mailbox;
-}
-
-void zmq::socket_base_t::stop ()
-{
-    //  Called by ctx when it is terminated (zmq_ctx_term).
-    //  'stop' command is sent from the threads that called zmq_ctx_term to
-    //  the thread owning the socket. This way, blocking call in the
-    //  owner thread can be interrupted.
-    send_stop ();
-}
-
-// TODO consider renaming protocol_ to scheme_ in conformance with RFC 3986
-// terminology, but this requires extensive changes to be consistent
-int zmq::socket_base_t::parse_uri (const char *uri_,
-                                   std::string &protocol_,
-                                   std::string &path_)
-{
-    zmq_assert (uri_ != NULL);
-
-    const std::string uri (uri_);
-    const std::string::size_type pos = uri.find ("://");
-    if (pos == std::string::npos) {
-        errno = EINVAL;
-        return -1;
-    }
-    protocol_ = uri.substr (0, pos);
-    path_ = uri.substr (pos + 3);
-
-    if (protocol_.empty () || path_.empty ()) {
-        errno = EINVAL;
-        return -1;
-    }
-    return 0;
-}
-
-int zmq::socket_base_t::check_protocol (const std::string &protocol_) const
-{
-    //  First check out whether the protocol is something we are aware of.
-    if (protocol_ != protocol_name::inproc
-#if defined ZMQ_HAVE_IPC
-        && protocol_ != protocol_name::ipc
-#endif
-        && protocol_ != protocol_name::tcp
-#ifdef ZMQ_HAVE_WS
-        && protocol_ != protocol_name::ws
-#endif
-#ifdef ZMQ_HAVE_WSS
-        && protocol_ != protocol_name::wss
-#endif
-#if defined ZMQ_HAVE_OPENPGM
-        //  pgm/epgm transports only available if 0MQ is compiled with OpenPGM.
-        && protocol_ != protocol_name::pgm
-        && protocol_ != protocol_name::epgm
-#endif
-#if defined ZMQ_HAVE_TIPC
-        // TIPC transport is only available on Linux.
-        && protocol_ != protocol_name::tipc
-#endif
-#if defined ZMQ_HAVE_NORM
-        && protocol_ != protocol_name::norm
-#endif
-#if defined ZMQ_HAVE_VMCI
-        && protocol_ != protocol_name::vmci
-#endif
-        && protocol_ != protocol_name::udp) {
-        errno = EPROTONOSUPPORT;
-        return -1;
-    }
-
-    //  Check whether socket type and transport protocol match.
-    //  Specifically, multicast protocols can't be combined with
-    //  bi-directional messaging patterns (socket types).
-#if defined ZMQ_HAVE_OPENPGM || defined ZMQ_HAVE_NORM
-#if defined ZMQ_HAVE_OPENPGM && defined ZMQ_HAVE_NORM
-    if ((protocol_ == protocol_name::pgm || protocol_ == protocol_name::epgm
-         || protocol_ == protocol_name::norm)
-#elif defined ZMQ_HAVE_OPENPGM
-    if ((protocol_ == protocol_name::pgm || protocol_ == protocol_name::epgm)
-#else // defined ZMQ_HAVE_NORM
-    if (protocol_ == protocol_name::norm
-#endif
-        && options.type != ZMQ_PUB && options.type != ZMQ_SUB
-        && options.type != ZMQ_XPUB && options.type != ZMQ_XSUB) {
-        errno = ENOCOMPATPROTO;
-        return -1;
-    }
-#endif
-
-    if (protocol_ == protocol_name::udp
-        && (options.type != ZMQ_DISH && options.type != ZMQ_RADIO
-            && options.type != ZMQ_DGRAM)) {
-        errno = ENOCOMPATPROTO;
-        return -1;
-    }
-
-    //  Protocol is available.
-    return 0;
-}
-
-void zmq::socket_base_t::attach_pipe (pipe_t *pipe_,
-                                      bool subscribe_to_all_,
-                                      bool locally_initiated_)
-{
-    //  First, register the pipe so that we can terminate it later on.
-    pipe_->set_event_sink (this);
-    _pipes.push_back (pipe_);
-
-    //  Let the derived socket type know about new pipe.
-    xattach_pipe (pipe_, subscribe_to_all_, locally_initiated_);
-
-    //  If the socket is already being closed, ask any new pipes to terminate
-    //  straight away.
-    if (is_terminating ()) {
-        register_term_acks (1);
-        pipe_->terminate (false);
-    }
-}
-
-int zmq::socket_base_t::setsockopt (int option_,
-                                    const void *optval_,
-                                    size_t optvallen_)
-{
-    scoped_optional_lock_t sync_lock (_thread_safe ? &_sync : NULL);
-
-    if (unlikely (_ctx_terminated)) {
-        errno = ETERM;
-        return -1;
-    }
-
-    //  First, check whether specific socket type overloads the option.
-    int rc = xsetsockopt (option_, optval_, optvallen_);
-    if (rc == 0 || errno != EINVAL) {
-        return rc;
-    }
-
-    //  If the socket type doesn't support the option, pass it to
-    //  the generic option parser.
-    rc = options.setsockopt (option_, optval_, optvallen_);
-    update_pipe_options (option_);
-
-    return rc;
-}
-
-int zmq::socket_base_t::getsockopt (int option_,
-                                    void *optval_,
-                                    size_t *optvallen_)
-{
-    scoped_optional_lock_t sync_lock (_thread_safe ? &_sync : NULL);
-
-    if (unlikely (_ctx_terminated)) {
-        errno = ETERM;
-        return -1;
-    }
-
-    if (option_ == ZMQ_RCVMORE) {
-        return do_getsockopt<int> (optval_, optvallen_, _rcvmore ? 1 : 0);
-    }
-
-    if (option_ == ZMQ_FD) {
-        if (_thread_safe) {
-            // thread safe socket doesn't provide file descriptor
-            errno = EINVAL;
-            return -1;
-        }
-
-        return do_getsockopt<fd_t> (
-          optval_, optvallen_,
-          (static_cast<mailbox_t *> (_mailbox))->get_fd ());
-    }
-
-    if (option_ == ZMQ_EVENTS) {
-        const int rc = process_commands (0, false);
-        if (rc != 0 && (errno == EINTR || errno == ETERM)) {
-            return -1;
-        }
-        errno_assert (rc == 0);
-
-        return do_getsockopt<int> (optval_, optvallen_,
-                                   (has_out () ? ZMQ_POLLOUT : 0)
-                                     | (has_in () ? ZMQ_POLLIN : 0));
-    }
-
-    if (option_ == ZMQ_LAST_ENDPOINT) {
-        return do_getsockopt (optval_, optvallen_, _last_endpoint);
-    }
-
-    if (option_ == ZMQ_THREAD_SAFE) {
-        return do_getsockopt<int> (optval_, optvallen_, _thread_safe ? 1 : 0);
-    }
-
-    return options.getsockopt (option_, optval_, optvallen_);
-}
-
-int zmq::socket_base_t::join (const char *group_)
-{
-    scoped_optional_lock_t sync_lock (_thread_safe ? &_sync : NULL);
-
-    return xjoin (group_);
-}
-
-int zmq::socket_base_t::leave (const char *group_)
-{
-    scoped_optional_lock_t sync_lock (_thread_safe ? &_sync : NULL);
-
-    return xleave (group_);
-}
-
-void zmq::socket_base_t::add_signaler (signaler_t *s_)
-{
-    zmq_assert (_thread_safe);
-
-    scoped_lock_t sync_lock (_sync);
-    (static_cast<mailbox_safe_t *> (_mailbox))->add_signaler (s_);
-}
-
-void zmq::socket_base_t::remove_signaler (signaler_t *s_)
-{
-    zmq_assert (_thread_safe);
-
-    scoped_lock_t sync_lock (_sync);
-    (static_cast<mailbox_safe_t *> (_mailbox))->remove_signaler (s_);
-}
-
-int zmq::socket_base_t::bind (const char *endpoint_uri_)
-{
-    scoped_optional_lock_t sync_lock (_thread_safe ? &_sync : NULL);
-
-    if (unlikely (_ctx_terminated)) {
-        errno = ETERM;
-        return -1;
-    }
-
-    //  Process pending commands, if any.
-    int rc = process_commands (0, false);
-    if (unlikely (rc != 0)) {
-        return -1;
-    }
-
-    //  Parse endpoint_uri_ string.
-    std::string protocol;
-    std::string address;
-    if (parse_uri (endpoint_uri_, protocol, address)
-        || check_protocol (protocol)) {
-        return -1;
-    }
-
-    if (protocol == protocol_name::inproc) {
-        const endpoint_t endpoint = {this, options};
-        rc = register_endpoint (endpoint_uri_, endpoint);
-        if (rc == 0) {
-            connect_pending (endpoint_uri_, this);
-            _last_endpoint.assign (endpoint_uri_);
-            options.connected = true;
-        }
-        return rc;
-    }
-
-#if defined ZMQ_HAVE_OPENPGM || defined ZMQ_HAVE_NORM
-#if defined ZMQ_HAVE_OPENPGM && defined ZMQ_HAVE_NORM
-    if (protocol == protocol_name::pgm || protocol == protocol_name::epgm
-        || protocol == protocol_name::norm) {
-#elif defined ZMQ_HAVE_OPENPGM
-    if (protocol == protocol_name::pgm || protocol == protocol_name::epgm) {
-#else // defined ZMQ_HAVE_NORM
-    if (protocol == protocol_name::norm) {
-#endif
-        //  For convenience's sake, bind can be used interchangeable with
-        //  connect for PGM, EPGM, NORM transports.
-        rc = connect (endpoint_uri_);
-        if (rc != -1)
-            options.connected = true;
-        return rc;
-    }
-#endif
-
-    if (protocol == protocol_name::udp) {
-        if (!(options.type == ZMQ_DGRAM || options.type == ZMQ_DISH)) {
-            errno = ENOCOMPATPROTO;
-            return -1;
-        }
-
-        //  Choose the I/O thread to run the session in.
-        io_thread_t *io_thread = choose_io_thread (options.affinity);
-        if (!io_thread) {
-            errno = EMTHREAD;
-            return -1;
-        }
-
-        address_t *paddr =
-          new (std::nothrow) address_t (protocol, address, this->get_ctx ());
-        alloc_assert (paddr);
-
-        paddr->resolved.udp_addr = new (std::nothrow) udp_address_t ();
-        alloc_assert (paddr->resolved.udp_addr);
-        rc = paddr->resolved.udp_addr->resolve (address.c_str (), true,
-                                                options.ipv6);
-        if (rc != 0) {
-            LIBZMQ_DELETE (paddr);
-            return -1;
-        }
-
-        session_base_t *session =
-          session_base_t::create (io_thread, true, this, options, paddr);
-        errno_assert (session);
-
-        //  Create a bi-directional pipe.
-        object_t *parents[2] = {this, session};
-        pipe_t *new_pipes[2] = {NULL, NULL};
-
-        int hwms[2] = {options.sndhwm, options.rcvhwm};
-        bool conflates[2] = {false, false};
-        rc = pipepair (parents, new_pipes, hwms, conflates);
-        errno_assert (rc == 0);
-
-        //  Attach local end of the pipe to the socket object.
-        attach_pipe (new_pipes[0], true, true);
-        pipe_t *const newpipe = new_pipes[0];
-
-        //  Attach remote end of the pipe to the session object later on.
-        session->attach_pipe (new_pipes[1]);
-
-        //  Save last endpoint URI
-        paddr->to_string (_last_endpoint);
-
-        //  TODO shouldn't this use _last_endpoint instead of endpoint_uri_? as in the other cases
-        add_endpoint (endpoint_uri_pair_t (endpoint_uri_, std::string (),
-                                           endpoint_type_none),
-                      static_cast<own_t *> (session), newpipe);
-
-        return 0;
-    }
-
-    //  Remaining transports require to be run in an I/O thread, so at this
-    //  point we'll choose one.
-    io_thread_t *io_thread = choose_io_thread (options.affinity);
-    if (!io_thread) {
-        errno = EMTHREAD;
-        return -1;
-    }
-
-    if (protocol == protocol_name::tcp) {
-        tcp_listener_t *listener =
-          new (std::nothrow) tcp_listener_t (io_thread, this, options);
-        alloc_assert (listener);
-        rc = listener->set_local_address (address.c_str ());
-        if (rc != 0) {
-            LIBZMQ_DELETE (listener);
-            event_bind_failed (make_unconnected_bind_endpoint_pair (address),
-                               zmq_errno ());
-            return -1;
-        }
-
-        // Save last endpoint URI
-        listener->get_local_address (_last_endpoint);
-
-        add_endpoint (make_unconnected_bind_endpoint_pair (_last_endpoint),
-                      static_cast<own_t *> (listener), NULL);
-        options.connected = true;
-        return 0;
-    }
-
-#ifdef ZMQ_HAVE_WS
-#ifdef ZMQ_HAVE_WSS
-    if (protocol == protocol_name::ws || protocol == protocol_name::wss) {
-        ws_listener_t *listener = new (std::nothrow) ws_listener_t (
-          io_thread, this, options, protocol == protocol_name::wss);
-#else
-    if (protocol == protocol_name::ws) {
-        ws_listener_t *listener =
-          new (std::nothrow) ws_listener_t (io_thread, this, options, false);
-#endif
-        alloc_assert (listener);
-        rc = listener->set_local_address (address.c_str ());
-        if (rc != 0) {
-            LIBZMQ_DELETE (listener);
-            event_bind_failed (make_unconnected_bind_endpoint_pair (address),
-                               zmq_errno ());
-            return -1;
-        }
-
-        // Save last endpoint URI
-        listener->get_local_address (_last_endpoint);
-
-        add_endpoint (make_unconnected_bind_endpoint_pair (_last_endpoint),
-                      static_cast<own_t *> (listener), NULL);
-        options.connected = true;
-        return 0;
-    }
-#endif
-
-#if defined ZMQ_HAVE_IPC
-    if (protocol == protocol_name::ipc) {
-        ipc_listener_t *listener =
-          new (std::nothrow) ipc_listener_t (io_thread, this, options);
-        alloc_assert (listener);
-        int rc = listener->set_local_address (address.c_str ());
-        if (rc != 0) {
-            LIBZMQ_DELETE (listener);
-            event_bind_failed (make_unconnected_bind_endpoint_pair (address),
-                               zmq_errno ());
-            return -1;
-        }
-
-        // Save last endpoint URI
-        listener->get_local_address (_last_endpoint);
-
-        add_endpoint (make_unconnected_bind_endpoint_pair (_last_endpoint),
-                      static_cast<own_t *> (listener), NULL);
-        options.connected = true;
-        return 0;
-    }
-#endif
-#if defined ZMQ_HAVE_TIPC
-    if (protocol == protocol_name::tipc) {
-        tipc_listener_t *listener =
-          new (std::nothrow) tipc_listener_t (io_thread, this, options);
-        alloc_assert (listener);
-        int rc = listener->set_local_address (address.c_str ());
-        if (rc != 0) {
-            LIBZMQ_DELETE (listener);
-            event_bind_failed (make_unconnected_bind_endpoint_pair (address),
-                               zmq_errno ());
-            return -1;
-        }
-
-        // Save last endpoint URI
-        listener->get_local_address (_last_endpoint);
-
-        // TODO shouldn't this use _last_endpoint as in the other cases?
-        add_endpoint (make_unconnected_bind_endpoint_pair (endpoint_uri_),
-                      static_cast<own_t *> (listener), NULL);
-        options.connected = true;
-        return 0;
-    }
-#endif
-#if defined ZMQ_HAVE_VMCI
-    if (protocol == protocol_name::vmci) {
-        vmci_listener_t *listener =
-          new (std::nothrow) vmci_listener_t (io_thread, this, options);
-        alloc_assert (listener);
-        int rc = listener->set_local_address (address.c_str ());
-        if (rc != 0) {
-            LIBZMQ_DELETE (listener);
-            event_bind_failed (make_unconnected_bind_endpoint_pair (address),
-                               zmq_errno ());
-            return -1;
-        }
-
-        listener->get_local_address (_last_endpoint);
-
-        add_endpoint (make_unconnected_bind_endpoint_pair (_last_endpoint),
-                      static_cast<own_t *> (listener), NULL);
-        options.connected = true;
-        return 0;
-    }
-#endif
-
-    zmq_assert (false);
-    return -1;
-}
-
-int zmq::socket_base_t::connect (const char *endpoint_uri_)
-{
-    scoped_optional_lock_t sync_lock (_thread_safe ? &_sync : NULL);
-    return connect_internal (endpoint_uri_);
-}
-
-int zmq::socket_base_t::connect_internal (const char *endpoint_uri_)
-{
-    if (unlikely (_ctx_terminated)) {
-        errno = ETERM;
-        return -1;
-    }
-
-    //  Process pending commands, if any.
-    int rc = process_commands (0, false);
-    if (unlikely (rc != 0)) {
-        return -1;
-    }
-
-    //  Parse endpoint_uri_ string.
-    std::string protocol;
-    std::string address;
-    if (parse_uri (endpoint_uri_, protocol, address)
-        || check_protocol (protocol)) {
-        return -1;
-    }
-
-    if (protocol == protocol_name::inproc) {
-        //  TODO: inproc connect is specific with respect to creating pipes
-        //  as there's no 'reconnect' functionality implemented. Once that
-        //  is in place we should follow generic pipe creation algorithm.
-
-        //  Find the peer endpoint.
-        const endpoint_t peer = find_endpoint (endpoint_uri_);
-
-        // The total HWM for an inproc connection should be the sum of
-        // the binder's HWM and the connector's HWM.
-        const int sndhwm = peer.socket == NULL ? options.sndhwm
-                           : options.sndhwm != 0 && peer.options.rcvhwm != 0
-                             ? options.sndhwm + peer.options.rcvhwm
-                             : 0;
-        const int rcvhwm = peer.socket == NULL ? options.rcvhwm
-                           : options.rcvhwm != 0 && peer.options.sndhwm != 0
-                             ? options.rcvhwm + peer.options.sndhwm
-                             : 0;
-
-        //  Create a bi-directional pipe to connect the peers.
-        object_t *parents[2] = {this, peer.socket == NULL ? this : peer.socket};
-        pipe_t *new_pipes[2] = {NULL, NULL};
-
-        const bool conflate = get_effective_conflate_option (options);
-
-        int hwms[2] = {conflate ? -1 : sndhwm, conflate ? -1 : rcvhwm};
-        bool conflates[2] = {conflate, conflate};
-        rc = pipepair (parents, new_pipes, hwms, conflates);
-        if (!conflate) {
-            new_pipes[0]->set_hwms_boost (peer.options.sndhwm,
-                                          peer.options.rcvhwm);
-            new_pipes[1]->set_hwms_boost (options.sndhwm, options.rcvhwm);
-        }
-
-        errno_assert (rc == 0);
-
-        if (!peer.socket) {
-            //  The peer doesn't exist yet so we don't know whether
-            //  to send the routing id message or not. To resolve this,
-            //  we always send our routing id and drop it later if
-            //  the peer doesn't expect it.
-            send_routing_id (new_pipes[0], options);
-
-#ifdef ZMQ_BUILD_DRAFT_API
-            //  If set, send the hello msg of the local socket to the peer.
-            if (options.can_send_hello_msg && options.hello_msg.size () > 0) {
-                send_hello_msg (new_pipes[0], options);
-            }
-#endif
-
-            const endpoint_t endpoint = {this, options};
-            pend_connection (std::string (endpoint_uri_), endpoint, new_pipes);
-        } else {
-            //  If required, send the routing id of the local socket to the peer.
-            if (peer.options.recv_routing_id) {
-                send_routing_id (new_pipes[0], options);
-            }
-
-            //  If required, send the routing id of the peer to the local socket.
-            if (options.recv_routing_id) {
-                send_routing_id (new_pipes[1], peer.options);
-            }
-
-#ifdef ZMQ_BUILD_DRAFT_API
-            //  If set, send the hello msg of the local socket to the peer.
-            if (options.can_send_hello_msg && options.hello_msg.size () > 0) {
-                send_hello_msg (new_pipes[0], options);
-            }
-
-            //  If set, send the hello msg of the peer to the local socket.
-            if (peer.options.can_send_hello_msg
-                && peer.options.hello_msg.size () > 0) {
-                send_hello_msg (new_pipes[1], peer.options);
-            }
-
-            if (peer.options.can_recv_disconnect_msg
-                && peer.options.disconnect_msg.size () > 0)
-                new_pipes[0]->set_disconnect_msg (peer.options.disconnect_msg);
-#endif
-
-            //  Attach remote end of the pipe to the peer socket. Note that peer's
-            //  seqnum was incremented in find_endpoint function. We don't need it
-            //  increased here.
-            send_bind (peer.socket, new_pipes[1], false);
-        }
-
-        //  Attach local end of the pipe to this socket object.
-        attach_pipe (new_pipes[0], false, true);
-
-        // Save last endpoint URI
-        _last_endpoint.assign (endpoint_uri_);
-
-        // remember inproc connections for disconnect
-        _inprocs.emplace (endpoint_uri_, new_pipes[0]);
-
-        options.connected = true;
-        return 0;
-    }
-    const bool is_single_connect =
-      (options.type == ZMQ_DEALER || options.type == ZMQ_SUB
-       || options.type == ZMQ_PUB || options.type == ZMQ_REQ);
-    if (unlikely (is_single_connect)) {
-        if (0 != _endpoints.count (endpoint_uri_)) {
-            // There is no valid use for multiple connects for SUB-PUB nor
-            // DEALER-ROUTER nor REQ-REP. Multiple connects produces
-            // nonsensical results.
-            return 0;
-        }
-    }
-
-    //  Choose the I/O thread to run the session in.
-    io_thread_t *io_thread = choose_io_thread (options.affinity);
-    if (!io_thread) {
-        errno = EMTHREAD;
-        return -1;
-    }
-
-    address_t *paddr =
-      new (std::nothrow) address_t (protocol, address, this->get_ctx ());
-    alloc_assert (paddr);
-
-    //  Resolve address (if needed by the protocol)
-    if (protocol == protocol_name::tcp) {
-        //  Do some basic sanity checks on tcp:// address syntax
-        //  - hostname starts with digit or letter, with embedded '-' or '.'
-        //  - IPv6 address may contain hex chars and colons.
-        //  - IPv6 link local address may contain % followed by interface name / zone_id
-        //    (Reference: https://tools.ietf.org/html/rfc4007)
-        //  - IPv4 address may contain decimal digits and dots.
-        //  - Address must end in ":port" where port is *, or numeric
-        //  - Address may contain two parts separated by ':'
-        //  Following code is quick and dirty check to catch obvious errors,
-        //  without trying to be fully accurate.
-        const char *check = address.c_str ();
-        if (isalnum (*check) || isxdigit (*check) || *check == '['
-            || *check == ':') {
-            check++;
-            while (isalnum (*check) || isxdigit (*check) || *check == '.'
-                   || *check == '-' || *check == ':' || *check == '%'
-                   || *check == ';' || *check == '[' || *check == ']'
-                   || *check == '_' || *check == '*') {
-                check++;
-            }
-        }
-        //  Assume the worst, now look for success
-        rc = -1;
-        //  Did we reach the end of the address safely?
-        if (*check == 0) {
-            //  Do we have a valid port string? (cannot be '*' in connect
-            check = strrchr (address.c_str (), ':');
-            if (check) {
-                check++;
-                if (*check && (isdigit (*check)))
-                    rc = 0; //  Valid
-            }
-        }
-        if (rc == -1) {
-            errno = EINVAL;
-            LIBZMQ_DELETE (paddr);
-            return -1;
-        }
-        //  Defer resolution until a socket is opened
-        paddr->resolved.tcp_addr = NULL;
-    }
-#ifdef ZMQ_HAVE_WS
-#ifdef ZMQ_HAVE_WSS
-    else if (protocol == protocol_name::ws || protocol == protocol_name::wss) {
-        if (protocol == protocol_name::wss) {
-            paddr->resolved.wss_addr = new (std::nothrow) wss_address_t ();
-            alloc_assert (paddr->resolved.wss_addr);
-            rc = paddr->resolved.wss_addr->resolve (address.c_str (), false,
-                                                    options.ipv6);
-        } else
-#else
-    else if (protocol == protocol_name::ws) {
-#endif
-        {
-            paddr->resolved.ws_addr = new (std::nothrow) ws_address_t ();
-            alloc_assert (paddr->resolved.ws_addr);
-            rc = paddr->resolved.ws_addr->resolve (address.c_str (), false,
-                                                   options.ipv6);
-        }
-
-        if (rc != 0) {
-            LIBZMQ_DELETE (paddr);
-            return -1;
-        }
-    }
-#endif
-
-#if defined ZMQ_HAVE_IPC
-    else if (protocol == protocol_name::ipc) {
-        paddr->resolved.ipc_addr = new (std::nothrow) ipc_address_t ();
-        alloc_assert (paddr->resolved.ipc_addr);
-        int rc = paddr->resolved.ipc_addr->resolve (address.c_str ());
-        if (rc != 0) {
-            LIBZMQ_DELETE (paddr);
-            return -1;
-        }
-    }
-#endif
-
-    if (protocol == protocol_name::udp) {
-        if (options.type != ZMQ_RADIO) {
-            errno = ENOCOMPATPROTO;
-            LIBZMQ_DELETE (paddr);
-            return -1;
-        }
-
-        paddr->resolved.udp_addr = new (std::nothrow) udp_address_t ();
-        alloc_assert (paddr->resolved.udp_addr);
-        rc = paddr->resolved.udp_addr->resolve (address.c_str (), false,
-                                                options.ipv6);
-        if (rc != 0) {
-            LIBZMQ_DELETE (paddr);
-            return -1;
-        }
-    }
-
-    // TBD - Should we check address for ZMQ_HAVE_NORM???
-
-#ifdef ZMQ_HAVE_OPENPGM
-    if (protocol == protocol_name::pgm || protocol == protocol_name::epgm) {
-        struct pgm_addrinfo_t *res = NULL;
-        uint16_t port_number = 0;
-        int rc =
-          pgm_socket_t::init_address (address.c_str (), &res, &port_number);
-        if (res != NULL)
-            pgm_freeaddrinfo (res);
-        if (rc != 0 || port_number == 0) {
-            return -1;
-        }
-    }
-#endif
-#if defined ZMQ_HAVE_TIPC
-    else if (protocol == protocol_name::tipc) {
-        paddr->resolved.tipc_addr = new (std::nothrow) tipc_address_t ();
-        alloc_assert (paddr->resolved.tipc_addr);
-        int rc = paddr->resolved.tipc_addr->resolve (address.c_str ());
-        if (rc != 0) {
-            LIBZMQ_DELETE (paddr);
-            return -1;
-        }
-        const sockaddr_tipc *const saddr =
-          reinterpret_cast<const sockaddr_tipc *> (
-            paddr->resolved.tipc_addr->addr ());
-        // Cannot connect to random Port Identity
-        if (saddr->addrtype == TIPC_ADDR_ID
-            && paddr->resolved.tipc_addr->is_random ()) {
-            LIBZMQ_DELETE (paddr);
-            errno = EINVAL;
-            return -1;
-        }
-    }
-#endif
-#if defined ZMQ_HAVE_VMCI
-    else if (protocol == protocol_name::vmci) {
-        paddr->resolved.vmci_addr =
-          new (std::nothrow) vmci_address_t (this->get_ctx ());
-        alloc_assert (paddr->resolved.vmci_addr);
-        int rc = paddr->resolved.vmci_addr->resolve (address.c_str ());
-        if (rc != 0) {
-            LIBZMQ_DELETE (paddr);
-            return -1;
-        }
-    }
-#endif
-
-    //  Create session.
-    session_base_t *session =
-      session_base_t::create (io_thread, true, this, options, paddr);
-    errno_assert (session);
-
-    //  PGM does not support subscription forwarding; ask for all data to be
-    //  sent to this pipe. (same for NORM, currently?)
-#if defined ZMQ_HAVE_OPENPGM && defined ZMQ_HAVE_NORM
-    const bool subscribe_to_all =
-      protocol == protocol_name::pgm || protocol == protocol_name::epgm
-      || protocol == protocol_name::norm || protocol == protocol_name::udp;
-#elif defined ZMQ_HAVE_OPENPGM
-    const bool subscribe_to_all = protocol == protocol_name::pgm
-                                  || protocol == protocol_name::epgm
-                                  || protocol == protocol_name::udp;
-#elif defined ZMQ_HAVE_NORM
-    const bool subscribe_to_all =
-      protocol == protocol_name::norm || protocol == protocol_name::udp;
-#else
-    const bool subscribe_to_all = protocol == protocol_name::udp;
-#endif
-    pipe_t *newpipe = NULL;
-
-    if (options.immediate != 1 || subscribe_to_all) {
-        //  Create a bi-directional pipe.
-        object_t *parents[2] = {this, session};
-        pipe_t *new_pipes[2] = {NULL, NULL};
-
-        const bool conflate = get_effective_conflate_option (options);
-
-        int hwms[2] = {conflate ? -1 : options.sndhwm,
-                       conflate ? -1 : options.rcvhwm};
-        bool conflates[2] = {conflate, conflate};
-        rc = pipepair (parents, new_pipes, hwms, conflates);
-        errno_assert (rc == 0);
-
-        //  Attach local end of the pipe to the socket object.
-        attach_pipe (new_pipes[0], subscribe_to_all, true);
-        newpipe = new_pipes[0];
-
-        //  Attach remote end of the pipe to the session object later on.
-        session->attach_pipe (new_pipes[1]);
-    }
-
-    //  Save last endpoint URI
-    paddr->to_string (_last_endpoint);
-
-    add_endpoint (make_unconnected_connect_endpoint_pair (endpoint_uri_),
-                  static_cast<own_t *> (session), newpipe);
-    return 0;
-}
-
-std::string
-zmq::socket_base_t::resolve_tcp_addr (std::string endpoint_uri_pair_,
-                                      const char *tcp_address_)
-{
-    // The resolved last_endpoint is used as a key in the endpoints map.
-    // The address passed by the user might not match in the TCP case due to
-    // IPv4-in-IPv6 mapping (EG: tcp://[::ffff:127.0.0.1]:9999), so try to
-    // resolve before giving up. Given at this stage we don't know whether a
-    // socket is connected or bound, try with both.
-    if (_endpoints.find (endpoint_uri_pair_) == _endpoints.end ()) {
-        tcp_address_t *tcp_addr = new (std::nothrow) tcp_address_t ();
-        alloc_assert (tcp_addr);
-        int rc = tcp_addr->resolve (tcp_address_, false, options.ipv6);
-
-        if (rc == 0) {
-            tcp_addr->to_string (endpoint_uri_pair_);
-            if (_endpoints.find (endpoint_uri_pair_) == _endpoints.end ()) {
-                rc = tcp_addr->resolve (tcp_address_, true, options.ipv6);
-                if (rc == 0) {
-                    tcp_addr->to_string (endpoint_uri_pair_);
-                }
-            }
-        }
-        LIBZMQ_DELETE (tcp_addr);
-    }
-    return endpoint_uri_pair_;
-}
-
-void zmq::socket_base_t::add_endpoint (
-  const endpoint_uri_pair_t &endpoint_pair_, own_t *endpoint_, pipe_t *pipe_)
-{
-    //  Activate the session. Make it a child of this socket.
-    launch_child (endpoint_);
-    _endpoints.ZMQ_MAP_INSERT_OR_EMPLACE (endpoint_pair_.identifier (),
-                                          endpoint_pipe_t (endpoint_, pipe_));
-
-    if (pipe_ != NULL)
-        pipe_->set_endpoint_pair (endpoint_pair_);
-}
-
-int zmq::socket_base_t::term_endpoint (const char *endpoint_uri_)
-{
-    scoped_optional_lock_t sync_lock (_thread_safe ? &_sync : NULL);
-
-    //  Check whether the context hasn't been shut down yet.
-    if (unlikely (_ctx_terminated)) {
-        errno = ETERM;
-        return -1;
-    }
-
-    //  Check whether endpoint address passed to the function is valid.
-    if (unlikely (!endpoint_uri_)) {
-        errno = EINVAL;
-        return -1;
-    }
-
-    //  Process pending commands, if any, since there could be pending unprocessed process_own()'s
-    //  (from launch_child() for example) we're asked to terminate now.
-    const int rc = process_commands (0, false);
-    if (unlikely (rc != 0)) {
-        return -1;
-    }
-
-    //  Parse endpoint_uri_ string.
-    std::string uri_protocol;
-    std::string uri_path;
-    if (parse_uri (endpoint_uri_, uri_protocol, uri_path)
-        || check_protocol (uri_protocol)) {
-        return -1;
-    }
-
-    const std::string endpoint_uri_str = std::string (endpoint_uri_);
-
-    // Disconnect an inproc socket
-    if (uri_protocol == protocol_name::inproc) {
-        return unregister_endpoint (endpoint_uri_str, this) == 0
-                 ? 0
-                 : _inprocs.erase_pipes (endpoint_uri_str);
-    }
-
-    const std::string resolved_endpoint_uri =
-      uri_protocol == protocol_name::tcp
-        ? resolve_tcp_addr (endpoint_uri_str, uri_path.c_str ())
-        : endpoint_uri_str;
-
-    //  Find the endpoints range (if any) corresponding to the endpoint_uri_pair_ string.
-    const std::pair<endpoints_t::iterator, endpoints_t::iterator> range =
-      _endpoints.equal_range (resolved_endpoint_uri);
-    if (range.first == range.second) {
-        errno = ENOENT;
-        return -1;
-    }
-
-    for (endpoints_t::iterator it = range.first; it != range.second; ++it) {
-        //  If we have an associated pipe, terminate it.
-        if (it->second.second != NULL)
-            it->second.second->terminate (false);
-        term_child (it->second.first);
-    }
-    _endpoints.erase (range.first, range.second);
-
-    if (options.reconnect_stop & ZMQ_RECONNECT_STOP_AFTER_DISCONNECT) {
-        _disconnected = true;
-    }
-
-    return 0;
-}
-
-int zmq::socket_base_t::send (msg_t *msg_, int flags_)
-{
-    scoped_optional_lock_t sync_lock (_thread_safe ? &_sync : NULL);
-
-    //  Check whether the context hasn't been shut down yet.
-    if (unlikely (_ctx_terminated)) {
-        errno = ETERM;
-        return -1;
-    }
-
-    //  Check whether message passed to the function is valid.
-    if (unlikely (!msg_ || !msg_->check ())) {
-        errno = EFAULT;
-        return -1;
-    }
-
-    //  Process pending commands, if any.
-    int rc = process_commands (0, true);
-    if (unlikely (rc != 0)) {
-        return -1;
-    }
-
-    //  Clear any user-visible flags that are set on the message.
-    msg_->reset_flags (msg_t::more);
-
-    //  At this point we impose the flags on the message.
-    if (flags_ & ZMQ_SNDMORE)
-        msg_->set_flags (msg_t::more);
-
-    msg_->reset_metadata ();
-
-    //  Try to send the message using method in each socket class
-    rc = xsend (msg_);
-    if (rc == 0) {
-        return 0;
-    }
-    //  Special case for ZMQ_PUSH: -2 means pipe is dead while a
-    //  multi-part send is in progress and can't be recovered, so drop
-    //  silently when in blocking mode to keep backward compatibility.
-    if (unlikely (rc == -2)) {
-        if (!((flags_ & ZMQ_DONTWAIT) || options.sndtimeo == 0)) {
-            rc = msg_->close ();
-            errno_assert (rc == 0);
-            rc = msg_->init ();
-            errno_assert (rc == 0);
-            return 0;
-        }
-    }
-    if (unlikely (errno != EAGAIN)) {
-        return -1;
-    }
-
-    //  In case of non-blocking send we'll simply propagate
-    //  the error - including EAGAIN - up the stack.
-    if ((flags_ & ZMQ_DONTWAIT) || options.sndtimeo == 0) {
-        return -1;
-    }
-
-    //  Compute the time when the timeout should occur.
-    //  If the timeout is infinite, don't care.
-    int timeout = options.sndtimeo;
-    const uint64_t end = timeout < 0 ? 0 : (_clock.now_ms () + timeout);
-
-    //  Oops, we couldn't send the message. Wait for the next
-    //  command, process it and try to send the message again.
-    //  If timeout is reached in the meantime, return EAGAIN.
-    while (true) {
-        if (unlikely (process_commands (timeout, false) != 0)) {
-            return -1;
-        }
-        rc = xsend (msg_);
-        if (rc == 0)
-            break;
-        if (unlikely (errno != EAGAIN)) {
-            return -1;
-        }
-        if (timeout > 0) {
-            timeout = static_cast<int> (end - _clock.now_ms ());
-            if (timeout <= 0) {
-                errno = EAGAIN;
-                return -1;
-            }
-        }
-    }
-
-    return 0;
-}
-
-int zmq::socket_base_t::recv (msg_t *msg_, int flags_)
-{
-    scoped_optional_lock_t sync_lock (_thread_safe ? &_sync : NULL);
-
-    //  Check whether the context hasn't been shut down yet.
-    if (unlikely (_ctx_terminated)) {
-        errno = ETERM;
-        return -1;
-    }
-
-    //  Check whether message passed to the function is valid.
-    if (unlikely (!msg_ || !msg_->check ())) {
-        errno = EFAULT;
-        return -1;
-    }
-
-    //  Once every inbound_poll_rate messages check for signals and process
-    //  incoming commands. This happens only if we are not polling altogether
-    //  because there are messages available all the time. If poll occurs,
-    //  ticks is set to zero and thus we avoid this code.
-    //
-    //  Note that 'recv' uses different command throttling algorithm (the one
-    //  described above) from the one used by 'send'. This is because counting
-    //  ticks is more efficient than doing RDTSC all the time.
-    if (++_ticks == inbound_poll_rate) {
-        if (unlikely (process_commands (0, false) != 0)) {
-            return -1;
-        }
-        _ticks = 0;
-    }
-
-    //  Get the message.
-    int rc = xrecv (msg_);
-    if (unlikely (rc != 0 && errno != EAGAIN)) {
-        return -1;
-    }
-
-    //  If we have the message, return immediately.
-    if (rc == 0) {
-        extract_flags (msg_);
-        return 0;
-    }
-
-    //  If the message cannot be fetched immediately, there are two scenarios.
-    //  For non-blocking recv, commands are processed in case there's an
-    //  activate_reader command already waiting in a command pipe.
-    //  If it's not, return EAGAIN.
-    if ((flags_ & ZMQ_DONTWAIT) || options.rcvtimeo == 0) {
-        if (unlikely (process_commands (0, false) != 0)) {
-            return -1;
-        }
-        _ticks = 0;
-
-        rc = xrecv (msg_);
-        if (rc < 0) {
-            return rc;
-        }
-        extract_flags (msg_);
-
-        return 0;
-    }
-
-    //  Compute the time when the timeout should occur.
-    //  If the timeout is infinite, don't care.
-    int timeout = options.rcvtimeo;
-    const uint64_t end = timeout < 0 ? 0 : (_clock.now_ms () + timeout);
-
-    //  In blocking scenario, commands are processed over and over again until
-    //  we are able to fetch a message.
-    bool block = (_ticks != 0);
-    while (true) {
-        if (unlikely (process_commands (block ? timeout : 0, false) != 0)) {
-            return -1;
-        }
-        rc = xrecv (msg_);
-        if (rc == 0) {
-            _ticks = 0;
-            break;
-        }
-        if (unlikely (errno != EAGAIN)) {
-            return -1;
-        }
-        block = true;
-        if (timeout > 0) {
-            timeout = static_cast<int> (end - _clock.now_ms ());
-            if (timeout <= 0) {
-                errno = EAGAIN;
-                return -1;
-            }
-        }
-    }
-
-    extract_flags (msg_);
-    return 0;
-}
-
-int zmq::socket_base_t::close ()
-{
-    scoped_optional_lock_t sync_lock (_thread_safe ? &_sync : NULL);
-
-    //  Remove all existing signalers for thread safe sockets
-    if (_thread_safe)
-        (static_cast<mailbox_safe_t *> (_mailbox))->clear_signalers ();
-
-    //  Mark the socket as dead
-    _tag = 0xdeadbeef;
-
-
-    //  Transfer the ownership of the socket from this application thread
-    //  to the reaper thread which will take care of the rest of shutdown
-    //  process.
-    send_reap (this);
-
-    return 0;
-}
-
-bool zmq::socket_base_t::has_in ()
-{
-    return xhas_in ();
-}
-
-bool zmq::socket_base_t::has_out ()
-{
-    return xhas_out ();
-}
-
-void zmq::socket_base_t::start_reaping (poller_t *poller_)
-{
-    //  Plug the socket to the reaper thread.
-    _poller = poller_;
-
-    fd_t fd;
-
-    if (!_thread_safe)
-        fd = (static_cast<mailbox_t *> (_mailbox))->get_fd ();
-    else {
-        scoped_optional_lock_t sync_lock (_thread_safe ? &_sync : NULL);
-
-        _reaper_signaler = new (std::nothrow) signaler_t ();
-        zmq_assert (_reaper_signaler);
-
-        //  Add signaler to the safe mailbox
-        fd = _reaper_signaler->get_fd ();
-        (static_cast<mailbox_safe_t *> (_mailbox))
-          ->add_signaler (_reaper_signaler);
-
-        //  Send a signal to make sure reaper handle existing commands
-        _reaper_signaler->send ();
-    }
-
-    _handle = _poller->add_fd (fd, this);
-    _poller->set_pollin (_handle);
-
-    //  Initialise the termination and check whether it can be deallocated
-    //  immediately.
-    terminate ();
-    check_destroy ();
-}
-
-int zmq::socket_base_t::process_commands (int timeout_, bool throttle_)
-{
-    if (timeout_ == 0) {
-        //  If we are asked not to wait, check whether we haven't processed
-        //  commands recently, so that we can throttle the new commands.
-
-        //  Get the CPU's tick counter. If 0, the counter is not available.
-        const uint64_t tsc = zmq::clock_t::rdtsc ();
-
-        //  Optimised version of command processing - it doesn't have to check
-        //  for incoming commands each time. It does so only if certain time
-        //  elapsed since last command processing. Command delay varies
-        //  depending on CPU speed: It's ~1ms on 3GHz CPU, ~2ms on 1.5GHz CPU
-        //  etc. The optimisation makes sense only on platforms where getting
-        //  a timestamp is a very cheap operation (tens of nanoseconds).
-        if (tsc && throttle_) {
-            //  Check whether TSC haven't jumped backwards (in case of migration
-            //  between CPU cores) and whether certain time have elapsed since
-            //  last command processing. If it didn't do nothing.
-            if (tsc >= _last_tsc && tsc - _last_tsc <= max_command_delay)
-                return 0;
-            _last_tsc = tsc;
-        }
-    }
-
-    //  Check whether there are any commands pending for this thread.
-    command_t cmd;
-    int rc = _mailbox->recv (&cmd, timeout_);
-
-    //  Process all available commands.
-    while (rc == 0) {
-        cmd.destination->process_command (cmd);
-        rc = _mailbox->recv (&cmd, 0);
-    }
-
-    if (errno == EINTR)
-        return -1;
-
-    zmq_assert (errno == EAGAIN);
-
-    if (_ctx_terminated) {
-        errno = ETERM;
-        return -1;
-    }
-
-    return 0;
-}
-
-void zmq::socket_base_t::process_stop ()
-{
-    //  Here, someone have called zmq_ctx_term while the socket was still alive.
-    //  We'll remember the fact so that any blocking call is interrupted and any
-    //  further attempt to use the socket will return ETERM. The user is still
-    //  responsible for calling zmq_close on the socket though!
-    scoped_lock_t lock (_monitor_sync);
-    stop_monitor ();
-
-    _ctx_terminated = true;
-}
-
-void zmq::socket_base_t::process_bind (pipe_t *pipe_)
-{
-    attach_pipe (pipe_);
-}
-
-void zmq::socket_base_t::process_term (int linger_)
-{
-    //  Unregister all inproc endpoints associated with this socket.
-    //  Doing this we make sure that no new pipes from other sockets (inproc)
-    //  will be initiated.
-    unregister_endpoints (this);
-
-    //  Ask all attached pipes to terminate.
-    for (pipes_t::size_type i = 0, size = _pipes.size (); i != size; ++i) {
-        //  Only inprocs might have a disconnect message set
-        _pipes[i]->send_disconnect_msg ();
-        _pipes[i]->terminate (false);
-    }
-    register_term_acks (static_cast<int> (_pipes.size ()));
-
-    //  Continue the termination process immediately.
-    own_t::process_term (linger_);
-}
-
-void zmq::socket_base_t::process_term_endpoint (std::string *endpoint_)
-{
-    term_endpoint (endpoint_->c_str ());
-    delete endpoint_;
-}
-
-void zmq::socket_base_t::process_pipe_stats_publish (
-  uint64_t outbound_queue_count_,
-  uint64_t inbound_queue_count_,
-  endpoint_uri_pair_t *endpoint_pair_)
-{
-    uint64_t values[2] = {outbound_queue_count_, inbound_queue_count_};
-    event (*endpoint_pair_, values, 2, ZMQ_EVENT_PIPES_STATS);
-    delete endpoint_pair_;
-}
-
-/*
- * There are 2 pipes per connection, and the inbound one _must_ be queried from
- * the I/O thread. So ask the outbound pipe, in the application thread, to send
- * a message (pipe_peer_stats) to its peer. The message will carry the outbound
- * pipe stats and endpoint, and the reference to the socket object.
- * The inbound pipe on the I/O thread will then add its own stats and endpoint,
- * and write back a message to the socket object (pipe_stats_publish) which
- * will raise an event with the data.
- */
-int zmq::socket_base_t::query_pipes_stats ()
-{
-    {
-        scoped_lock_t lock (_monitor_sync);
-        if (!(_monitor_events & ZMQ_EVENT_PIPES_STATS)) {
-            errno = EINVAL;
-            return -1;
-        }
-    }
-    if (_pipes.size () == 0) {
-        errno = EAGAIN;
-        return -1;
-    }
-    for (pipes_t::size_type i = 0, size = _pipes.size (); i != size; ++i) {
-        _pipes[i]->send_stats_to_peer (this);
-    }
-
-    return 0;
-}
-
-void zmq::socket_base_t::update_pipe_options (int option_)
-{
-    if (option_ == ZMQ_SNDHWM || option_ == ZMQ_RCVHWM) {
-        for (pipes_t::size_type i = 0, size = _pipes.size (); i != size; ++i) {
-            _pipes[i]->set_hwms (options.rcvhwm, options.sndhwm);
-            _pipes[i]->send_hwms_to_peer (options.sndhwm, options.rcvhwm);
-        }
-    }
-}
-
-void zmq::socket_base_t::process_destroy ()
-{
-    _destroyed = true;
-}
-
-int zmq::socket_base_t::xsetsockopt (int, const void *, size_t)
-{
-    errno = EINVAL;
-    return -1;
-}
-
-bool zmq::socket_base_t::xhas_out ()
-{
-    return false;
-}
-
-int zmq::socket_base_t::xsend (msg_t *)
-{
-    errno = ENOTSUP;
-    return -1;
-}
-
-bool zmq::socket_base_t::xhas_in ()
-{
-    return false;
-}
-
-int zmq::socket_base_t::xjoin (const char *group_)
-{
-    LIBZMQ_UNUSED (group_);
-    errno = ENOTSUP;
-    return -1;
-}
-
-int zmq::socket_base_t::xleave (const char *group_)
-{
-    LIBZMQ_UNUSED (group_);
-    errno = ENOTSUP;
-    return -1;
-}
-
-int zmq::socket_base_t::xrecv (msg_t *)
-{
-    errno = ENOTSUP;
-    return -1;
-}
-
-void zmq::socket_base_t::xread_activated (pipe_t *)
-{
-    zmq_assert (false);
-}
-void zmq::socket_base_t::xwrite_activated (pipe_t *)
-{
-    zmq_assert (false);
-}
-
-void zmq::socket_base_t::xhiccuped (pipe_t *)
-{
-    zmq_assert (false);
-}
-
-void zmq::socket_base_t::in_event ()
-{
-    //  This function is invoked only once the socket is running in the context
-    //  of the reaper thread. Process any commands from other threads/sockets
-    //  that may be available at the moment. Ultimately, the socket will
-    //  be destroyed.
-    {
-        scoped_optional_lock_t sync_lock (_thread_safe ? &_sync : NULL);
-
-        //  If the socket is thread safe we need to unsignal the reaper signaler
-        if (_thread_safe)
-            _reaper_signaler->recv ();
-
-        process_commands (0, false);
-    }
-    check_destroy ();
-}
-
-void zmq::socket_base_t::out_event ()
-{
-    zmq_assert (false);
-}
-
-void zmq::socket_base_t::timer_event (int)
-{
-    zmq_assert (false);
-}
-
-void zmq::socket_base_t::check_destroy ()
-{
-    //  If the object was already marked as destroyed, finish the deallocation.
-    if (_destroyed) {
-        //  Remove the socket from the reaper's poller.
-        _poller->rm_fd (_handle);
-
-        //  Remove the socket from the context.
-        destroy_socket (this);
-
-        //  Notify the reaper about the fact.
-        send_reaped ();
-
-        //  Deallocate.
-        own_t::process_destroy ();
-    }
-}
-
-void zmq::socket_base_t::read_activated (pipe_t *pipe_)
-{
-    xread_activated (pipe_);
-}
-
-void zmq::socket_base_t::write_activated (pipe_t *pipe_)
-{
-    xwrite_activated (pipe_);
-}
-
-void zmq::socket_base_t::hiccuped (pipe_t *pipe_)
-{
-    if (options.immediate == 1)
-        pipe_->terminate (false);
-    else
-        // Notify derived sockets of the hiccup
-        xhiccuped (pipe_);
-}
-
-void zmq::socket_base_t::pipe_terminated (pipe_t *pipe_)
-{
-    //  Notify the specific socket type about the pipe termination.
-    xpipe_terminated (pipe_);
-
-    // Remove pipe from inproc pipes
-    _inprocs.erase_pipe (pipe_);
-
-    //  Remove the pipe from the list of attached pipes and confirm its
-    //  termination if we are already shutting down.
-    _pipes.erase (pipe_);
-
-    // Remove the pipe from _endpoints (set it to NULL).
-    const std::string &identifier = pipe_->get_endpoint_pair ().identifier ();
-    if (!identifier.empty ()) {
-        std::pair<endpoints_t::iterator, endpoints_t::iterator> range;
-        range = _endpoints.equal_range (identifier);
-
-        for (endpoints_t::iterator it = range.first; it != range.second; ++it) {
-            if (it->second.second == pipe_) {
-                it->second.second = NULL;
-                break;
-            }
-        }
-    }
-
-    if (is_terminating ())
-        unregister_term_ack ();
-}
-
-void zmq::socket_base_t::extract_flags (const msg_t *msg_)
-{
-    //  Test whether routing_id flag is valid for this socket type.
-    if (unlikely (msg_->flags () & msg_t::routing_id))
-        zmq_assert (options.recv_routing_id);
-
-    //  Remove MORE flag.
-    _rcvmore = (msg_->flags () & msg_t::more) != 0;
-}
-
-int zmq::socket_base_t::monitor (const char *endpoint_,
-                                 uint64_t events_,
-                                 int event_version_,
-                                 int type_)
-{
-    scoped_lock_t lock (_monitor_sync);
-
-    if (unlikely (_ctx_terminated)) {
-        errno = ETERM;
-        return -1;
-    }
-
-    //  Event version 1 supports only first 16 events.
-    if (unlikely (event_version_ == 1 && events_ >> 16 != 0)) {
-        errno = EINVAL;
-        return -1;
-    }
-
-    //  Support deregistering monitoring endpoints as well
-    if (endpoint_ == NULL) {
-        stop_monitor ();
-        return 0;
-    }
-    //  Parse endpoint_uri_ string.
-    std::string protocol;
-    std::string address;
-    if (parse_uri (endpoint_, protocol, address) || check_protocol (protocol))
-        return -1;
-
-    //  Event notification only supported over inproc://
-    if (protocol != protocol_name::inproc) {
-        errno = EPROTONOSUPPORT;
-        return -1;
-    }
-
-    // already monitoring. Stop previous monitor before starting new one.
-    if (_monitor_socket != NULL) {
-        stop_monitor (true);
-    }
-
-    // Check if the specified socket type is supported. It must be a
-    // one-way socket types that support the SNDMORE flag.
-    switch (type_) {
-        case ZMQ_PAIR:
-            break;
-        case ZMQ_PUB:
-            break;
-        case ZMQ_PUSH:
-            break;
-        default:
-            errno = EINVAL;
-            return -1;
-    }
-
-    //  Register events to monitor
-    _monitor_events = events_;
-    options.monitor_event_version = event_version_;
-    //  Create a monitor socket of the specified type.
-    _monitor_socket = zmq_socket (get_ctx (), type_);
-    if (_monitor_socket == NULL)
-        return -1;
-
-    //  Never block context termination on pending event messages
-    int linger = 0;
-    int rc =
-      zmq_setsockopt (_monitor_socket, ZMQ_LINGER, &linger, sizeof (linger));
-    if (rc == -1)
-        stop_monitor (false);
-
-    //  Spawn the monitor socket endpoint
-    rc = zmq_bind (_monitor_socket, endpoint_);
-    if (rc == -1)
-        stop_monitor (false);
-    return rc;
-}
-
-void zmq::socket_base_t::event_connected (
-  const endpoint_uri_pair_t &endpoint_uri_pair_, zmq::fd_t fd_)
-{
-    uint64_t values[1] = {static_cast<uint64_t> (fd_)};
-    event (endpoint_uri_pair_, values, 1, ZMQ_EVENT_CONNECTED);
-}
-
-void zmq::socket_base_t::event_connect_delayed (
-  const endpoint_uri_pair_t &endpoint_uri_pair_, int err_)
-{
-    uint64_t values[1] = {static_cast<uint64_t> (err_)};
-    event (endpoint_uri_pair_, values, 1, ZMQ_EVENT_CONNECT_DELAYED);
-}
-
-void zmq::socket_base_t::event_connect_retried (
-  const endpoint_uri_pair_t &endpoint_uri_pair_, int interval_)
-{
-    uint64_t values[1] = {static_cast<uint64_t> (interval_)};
-    event (endpoint_uri_pair_, values, 1, ZMQ_EVENT_CONNECT_RETRIED);
-}
-
-void zmq::socket_base_t::event_listening (
-  const endpoint_uri_pair_t &endpoint_uri_pair_, zmq::fd_t fd_)
-{
-    uint64_t values[1] = {static_cast<uint64_t> (fd_)};
-    event (endpoint_uri_pair_, values, 1, ZMQ_EVENT_LISTENING);
-}
-
-void zmq::socket_base_t::event_bind_failed (
-  const endpoint_uri_pair_t &endpoint_uri_pair_, int err_)
-{
-    uint64_t values[1] = {static_cast<uint64_t> (err_)};
-    event (endpoint_uri_pair_, values, 1, ZMQ_EVENT_BIND_FAILED);
-}
-
-void zmq::socket_base_t::event_accepted (
-  const endpoint_uri_pair_t &endpoint_uri_pair_, zmq::fd_t fd_)
-{
-    uint64_t values[1] = {static_cast<uint64_t> (fd_)};
-    event (endpoint_uri_pair_, values, 1, ZMQ_EVENT_ACCEPTED);
-}
-
-void zmq::socket_base_t::event_accept_failed (
-  const endpoint_uri_pair_t &endpoint_uri_pair_, int err_)
-{
-    uint64_t values[1] = {static_cast<uint64_t> (err_)};
-    event (endpoint_uri_pair_, values, 1, ZMQ_EVENT_ACCEPT_FAILED);
-}
-
-void zmq::socket_base_t::event_closed (
-  const endpoint_uri_pair_t &endpoint_uri_pair_, zmq::fd_t fd_)
-{
-    uint64_t values[1] = {static_cast<uint64_t> (fd_)};
-    event (endpoint_uri_pair_, values, 1, ZMQ_EVENT_CLOSED);
-}
-
-void zmq::socket_base_t::event_close_failed (
-  const endpoint_uri_pair_t &endpoint_uri_pair_, int err_)
-{
-    uint64_t values[1] = {static_cast<uint64_t> (err_)};
-    event (endpoint_uri_pair_, values, 1, ZMQ_EVENT_CLOSE_FAILED);
-}
-
-void zmq::socket_base_t::event_disconnected (
-  const endpoint_uri_pair_t &endpoint_uri_pair_, zmq::fd_t fd_)
-{
-    uint64_t values[1] = {static_cast<uint64_t> (fd_)};
-    event (endpoint_uri_pair_, values, 1, ZMQ_EVENT_DISCONNECTED);
-}
-
-void zmq::socket_base_t::event_handshake_failed_no_detail (
-  const endpoint_uri_pair_t &endpoint_uri_pair_, int err_)
-{
-    uint64_t values[1] = {static_cast<uint64_t> (err_)};
-    event (endpoint_uri_pair_, values, 1, ZMQ_EVENT_HANDSHAKE_FAILED_NO_DETAIL);
-}
-
-void zmq::socket_base_t::event_handshake_failed_protocol (
-  const endpoint_uri_pair_t &endpoint_uri_pair_, int err_)
-{
-    uint64_t values[1] = {static_cast<uint64_t> (err_)};
-    event (endpoint_uri_pair_, values, 1, ZMQ_EVENT_HANDSHAKE_FAILED_PROTOCOL);
-}
-
-void zmq::socket_base_t::event_handshake_failed_auth (
-  const endpoint_uri_pair_t &endpoint_uri_pair_, int err_)
-{
-    uint64_t values[1] = {static_cast<uint64_t> (err_)};
-    event (endpoint_uri_pair_, values, 1, ZMQ_EVENT_HANDSHAKE_FAILED_AUTH);
-}
-
-void zmq::socket_base_t::event_handshake_succeeded (
-  const endpoint_uri_pair_t &endpoint_uri_pair_, int err_)
-{
-    uint64_t values[1] = {static_cast<uint64_t> (err_)};
-    event (endpoint_uri_pair_, values, 1, ZMQ_EVENT_HANDSHAKE_SUCCEEDED);
-}
-
-void zmq::socket_base_t::event (const endpoint_uri_pair_t &endpoint_uri_pair_,
-                                uint64_t values_[],
-                                uint64_t values_count_,
-                                uint64_t type_)
-{
-    scoped_lock_t lock (_monitor_sync);
-    if (_monitor_events & type_) {
-        monitor_event (type_, values_, values_count_, endpoint_uri_pair_);
-    }
-}
-
-//  Send a monitor event
-void zmq::socket_base_t::monitor_event (
-  uint64_t event_,
-  const uint64_t values_[],
-  uint64_t values_count_,
-  const endpoint_uri_pair_t &endpoint_uri_pair_) const
-{
-    // this is a private method which is only called from
-    // contexts where the _monitor_sync mutex has been locked before
-
-    if (_monitor_socket) {
-        zmq_msg_t msg;
-
-        switch (options.monitor_event_version) {
-            case 1: {
-                //  The API should not allow to activate unsupported events
-                zmq_assert (event_ <= std::numeric_limits<uint16_t>::max ());
-                //  v1 only allows one value
-                zmq_assert (values_count_ == 1);
-                zmq_assert (values_[0]
-                            <= std::numeric_limits<uint32_t>::max ());
-
-                //  Send event and value in first frame
-                const uint16_t event = static_cast<uint16_t> (event_);
-                const uint32_t value = static_cast<uint32_t> (values_[0]);
-                zmq_msg_init_size (&msg, sizeof (event) + sizeof (value));
-                uint8_t *data = static_cast<uint8_t *> (zmq_msg_data (&msg));
-                //  Avoid dereferencing uint32_t on unaligned address
-                memcpy (data + 0, &event, sizeof (event));
-                memcpy (data + sizeof (event), &value, sizeof (value));
-                zmq_msg_send (&msg, _monitor_socket, ZMQ_SNDMORE);
-
-                const std::string &endpoint_uri =
-                  endpoint_uri_pair_.identifier ();
-
-                //  Send address in second frame
-                zmq_msg_init_size (&msg, endpoint_uri.size ());
-                memcpy (zmq_msg_data (&msg), endpoint_uri.c_str (),
-                        endpoint_uri.size ());
-                zmq_msg_send (&msg, _monitor_socket, 0);
-            } break;
-            case 2: {
-                //  Send event in first frame (64bit unsigned)
-                zmq_msg_init_size (&msg, sizeof (event_));
-                memcpy (zmq_msg_data (&msg), &event_, sizeof (event_));
-                zmq_msg_send (&msg, _monitor_socket, ZMQ_SNDMORE);
-
-                //  Send number of values that will follow in second frame
-                zmq_msg_init_size (&msg, sizeof (values_count_));
-                memcpy (zmq_msg_data (&msg), &values_count_,
-                        sizeof (values_count_));
-                zmq_msg_send (&msg, _monitor_socket, ZMQ_SNDMORE);
-
-                //  Send values in third-Nth frames (64bit unsigned)
-                for (uint64_t i = 0; i < values_count_; ++i) {
-                    zmq_msg_init_size (&msg, sizeof (values_[i]));
-                    memcpy (zmq_msg_data (&msg), &values_[i],
-                            sizeof (values_[i]));
-                    zmq_msg_send (&msg, _monitor_socket, ZMQ_SNDMORE);
-                }
-
-                //  Send local endpoint URI in second-to-last frame (string)
-                zmq_msg_init_size (&msg, endpoint_uri_pair_.local.size ());
-                memcpy (zmq_msg_data (&msg), endpoint_uri_pair_.local.c_str (),
-                        endpoint_uri_pair_.local.size ());
-                zmq_msg_send (&msg, _monitor_socket, ZMQ_SNDMORE);
-
-                //  Send remote endpoint URI in last frame (string)
-                zmq_msg_init_size (&msg, endpoint_uri_pair_.remote.size ());
-                memcpy (zmq_msg_data (&msg), endpoint_uri_pair_.remote.c_str (),
-                        endpoint_uri_pair_.remote.size ());
-                zmq_msg_send (&msg, _monitor_socket, 0);
-            } break;
-        }
-    }
-}
-
-void zmq::socket_base_t::stop_monitor (bool send_monitor_stopped_event_)
-{
-    // this is a private method which is only called from
-    // contexts where the _monitor_sync mutex has been locked before
-
-    if (_monitor_socket) {
-        if ((_monitor_events & ZMQ_EVENT_MONITOR_STOPPED)
-            && send_monitor_stopped_event_) {
-            uint64_t values[1] = {0};
-            monitor_event (ZMQ_EVENT_MONITOR_STOPPED, values, 1,
-                           endpoint_uri_pair_t ());
-        }
-        zmq_close (_monitor_socket);
-        _monitor_socket = NULL;
-        _monitor_events = 0;
-    }
-}
-
-bool zmq::socket_base_t::is_disconnected () const
-{
-    return _disconnected;
-}
-
-zmq::routing_socket_base_t::routing_socket_base_t (class ctx_t *parent_,
-                                                   uint32_t tid_,
-                                                   int sid_) :
-    socket_base_t (parent_, tid_, sid_)
-{
-}
-
-zmq::routing_socket_base_t::~routing_socket_base_t ()
-{
-    zmq_assert (_out_pipes.empty ());
-}
-
-int zmq::routing_socket_base_t::xsetsockopt (int option_,
-                                             const void *optval_,
-                                             size_t optvallen_)
-{
-    switch (option_) {
-        case ZMQ_CONNECT_ROUTING_ID:
-            // TODO why isn't it possible to set an empty connect_routing_id
-            //   (which is the default value)
-            if (optval_ && optvallen_) {
-                _connect_routing_id.assign (static_cast<const char *> (optval_),
-                                            optvallen_);
-                return 0;
-            }
-            break;
-    }
-    errno = EINVAL;
-    return -1;
-}
-
-void zmq::routing_socket_base_t::xwrite_activated (pipe_t *pipe_)
-{
-    const out_pipes_t::iterator end = _out_pipes.end ();
-    out_pipes_t::iterator it;
-    for (it = _out_pipes.begin (); it != end; ++it)
-        if (it->second.pipe == pipe_)
-            break;
-
-    zmq_assert (it != end);
-    zmq_assert (!it->second.active);
-    it->second.active = true;
-}
-
-std::string zmq::routing_socket_base_t::extract_connect_routing_id ()
-{
-    std::string res = ZMQ_MOVE (_connect_routing_id);
-    _connect_routing_id.clear ();
-    return res;
-}
-
-bool zmq::routing_socket_base_t::connect_routing_id_is_set () const
-{
-    return !_connect_routing_id.empty ();
-}
-
-void zmq::routing_socket_base_t::add_out_pipe (blob_t routing_id_,
-                                               pipe_t *pipe_)
-{
-    //  Add the record into output pipes lookup table
-    const out_pipe_t outpipe = {pipe_, true};
-    const bool ok =
-      _out_pipes.ZMQ_MAP_INSERT_OR_EMPLACE (ZMQ_MOVE (routing_id_), outpipe)
-        .second;
-    zmq_assert (ok);
-}
-
-bool zmq::routing_socket_base_t::has_out_pipe (const blob_t &routing_id_) const
-{
-    return 0 != _out_pipes.count (routing_id_);
-}
-
-zmq::routing_socket_base_t::out_pipe_t *
-zmq::routing_socket_base_t::lookup_out_pipe (const blob_t &routing_id_)
-{
-    // TODO we could probably avoid constructor a temporary blob_t to call this function
-    out_pipes_t::iterator it = _out_pipes.find (routing_id_);
-    return it == _out_pipes.end () ? NULL : &it->second;
-}
-
-const zmq::routing_socket_base_t::out_pipe_t *
-zmq::routing_socket_base_t::lookup_out_pipe (const blob_t &routing_id_) const
-{
-    // TODO we could probably avoid constructor a temporary blob_t to call this function
-    const out_pipes_t::const_iterator it = _out_pipes.find (routing_id_);
-    return it == _out_pipes.end () ? NULL : &it->second;
-}
-
-void zmq::routing_socket_base_t::erase_out_pipe (const pipe_t *pipe_)
-{
-    const size_t erased = _out_pipes.erase (pipe_->get_routing_id ());
-    zmq_assert (erased);
-}
-
-zmq::routing_socket_base_t::out_pipe_t
-zmq::routing_socket_base_t::try_erase_out_pipe (const blob_t &routing_id_)
-{
-    const out_pipes_t::iterator it = _out_pipes.find (routing_id_);
-    out_pipe_t res = {NULL, false};
-    if (it != _out_pipes.end ()) {
-        res = it->second;
-        _out_pipes.erase (it);
-    }
-    return res;
-}
diff --git a/libs/libzmq/src/socket_base.hpp b/libs/libzmq/src/socket_base.hpp
deleted file mode 100644
index 92deb9f..0000000
--- a/libs/libzmq/src/socket_base.hpp
+++ /dev/null
@@ -1,405 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_SOCKET_BASE_HPP_INCLUDED__
-#define __ZMQ_SOCKET_BASE_HPP_INCLUDED__
-
-#include <string>
-#include <map>
-#include <stdarg.h>
-
-#include "own.hpp"
-#include "array.hpp"
-#include "blob.hpp"
-#include "stdint.hpp"
-#include "poller.hpp"
-#include "i_poll_events.hpp"
-#include "i_mailbox.hpp"
-#include "clock.hpp"
-#include "pipe.hpp"
-#include "endpoint.hpp"
-
-extern "C" {
-void zmq_free_event (void *data_, void *hint_);
-}
-
-namespace zmq
-{
-class ctx_t;
-class msg_t;
-class pipe_t;
-
-class socket_base_t : public own_t,
-                      public array_item_t<>,
-                      public i_poll_events,
-                      public i_pipe_events
-{
-    friend class reaper_t;
-
-  public:
-    //  Returns false if object is not a socket.
-    bool check_tag () const;
-
-    //  Returns whether the socket is thread-safe.
-    bool is_thread_safe () const;
-
-    //  Create a socket of a specified type.
-    static socket_base_t *
-    create (int type_, zmq::ctx_t *parent_, uint32_t tid_, int sid_);
-
-    //  Returns the mailbox associated with this socket.
-    i_mailbox *get_mailbox () const;
-
-    //  Interrupt blocking call if the socket is stuck in one.
-    //  This function can be called from a different thread!
-    void stop ();
-
-    //  Interface for communication with the API layer.
-    int setsockopt (int option_, const void *optval_, size_t optvallen_);
-    int getsockopt (int option_, void *optval_, size_t *optvallen_);
-    int bind (const char *endpoint_uri_);
-    int connect (const char *endpoint_uri_);
-    int term_endpoint (const char *endpoint_uri_);
-    int send (zmq::msg_t *msg_, int flags_);
-    int recv (zmq::msg_t *msg_, int flags_);
-    void add_signaler (signaler_t *s_);
-    void remove_signaler (signaler_t *s_);
-    int close ();
-
-    //  These functions are used by the polling mechanism to determine
-    //  which events are to be reported from this socket.
-    bool has_in ();
-    bool has_out ();
-
-    //  Joining and leaving groups
-    int join (const char *group_);
-    int leave (const char *group_);
-
-    //  Using this function reaper thread ask the socket to register with
-    //  its poller.
-    void start_reaping (poller_t *poller_);
-
-    //  i_poll_events implementation. This interface is used when socket
-    //  is handled by the poller in the reaper thread.
-    void in_event () ZMQ_FINAL;
-    void out_event () ZMQ_FINAL;
-    void timer_event (int id_) ZMQ_FINAL;
-
-    //  i_pipe_events interface implementation.
-    void read_activated (pipe_t *pipe_) ZMQ_FINAL;
-    void write_activated (pipe_t *pipe_) ZMQ_FINAL;
-    void hiccuped (pipe_t *pipe_) ZMQ_FINAL;
-    void pipe_terminated (pipe_t *pipe_) ZMQ_FINAL;
-    void lock ();
-    void unlock ();
-
-    int monitor (const char *endpoint_,
-                 uint64_t events_,
-                 int event_version_,
-                 int type_);
-
-    void event_connected (const endpoint_uri_pair_t &endpoint_uri_pair_,
-                          zmq::fd_t fd_);
-    void event_connect_delayed (const endpoint_uri_pair_t &endpoint_uri_pair_,
-                                int err_);
-    void event_connect_retried (const endpoint_uri_pair_t &endpoint_uri_pair_,
-                                int interval_);
-    void event_listening (const endpoint_uri_pair_t &endpoint_uri_pair_,
-                          zmq::fd_t fd_);
-    void event_bind_failed (const endpoint_uri_pair_t &endpoint_uri_pair_,
-                            int err_);
-    void event_accepted (const endpoint_uri_pair_t &endpoint_uri_pair_,
-                         zmq::fd_t fd_);
-    void event_accept_failed (const endpoint_uri_pair_t &endpoint_uri_pair_,
-                              int err_);
-    void event_closed (const endpoint_uri_pair_t &endpoint_uri_pair_,
-                       zmq::fd_t fd_);
-    void event_close_failed (const endpoint_uri_pair_t &endpoint_uri_pair_,
-                             int err_);
-    void event_disconnected (const endpoint_uri_pair_t &endpoint_uri_pair_,
-                             zmq::fd_t fd_);
-    void event_handshake_failed_no_detail (
-      const endpoint_uri_pair_t &endpoint_uri_pair_, int err_);
-    void event_handshake_failed_protocol (
-      const endpoint_uri_pair_t &endpoint_uri_pair_, int err_);
-    void
-    event_handshake_failed_auth (const endpoint_uri_pair_t &endpoint_uri_pair_,
-                                 int err_);
-    void
-    event_handshake_succeeded (const endpoint_uri_pair_t &endpoint_uri_pair_,
-                               int err_);
-
-    //  Query the state of a specific peer. The default implementation
-    //  always returns an ENOTSUP error.
-    virtual int get_peer_state (const void *routing_id_,
-                                size_t routing_id_size_) const;
-
-    //  Request for pipes statistics - will generate a ZMQ_EVENT_PIPES_STATS
-    //  after gathering the data asynchronously. Requires event monitoring to
-    //  be enabled.
-    int query_pipes_stats ();
-
-    bool is_disconnected () const;
-
-  protected:
-    socket_base_t (zmq::ctx_t *parent_,
-                   uint32_t tid_,
-                   int sid_,
-                   bool thread_safe_ = false);
-    ~socket_base_t () ZMQ_OVERRIDE;
-
-    //  Concrete algorithms for the x- methods are to be defined by
-    //  individual socket types.
-    virtual void xattach_pipe (zmq::pipe_t *pipe_,
-                               bool subscribe_to_all_ = false,
-                               bool locally_initiated_ = false) = 0;
-
-    //  The default implementation assumes there are no specific socket
-    //  options for the particular socket type. If not so, ZMQ_FINAL this
-    //  method.
-    virtual int
-    xsetsockopt (int option_, const void *optval_, size_t optvallen_);
-
-    //  The default implementation assumes that send is not supported.
-    virtual bool xhas_out ();
-    virtual int xsend (zmq::msg_t *msg_);
-
-    //  The default implementation assumes that recv in not supported.
-    virtual bool xhas_in ();
-    virtual int xrecv (zmq::msg_t *msg_);
-
-    //  i_pipe_events will be forwarded to these functions.
-    virtual void xread_activated (pipe_t *pipe_);
-    virtual void xwrite_activated (pipe_t *pipe_);
-    virtual void xhiccuped (pipe_t *pipe_);
-    virtual void xpipe_terminated (pipe_t *pipe_) = 0;
-
-    //  the default implementation assumes that joub and leave are not supported.
-    virtual int xjoin (const char *group_);
-    virtual int xleave (const char *group_);
-
-    //  Delay actual destruction of the socket.
-    void process_destroy () ZMQ_FINAL;
-
-    int connect_internal (const char *endpoint_uri_);
-
-    // Mutex for synchronize access to the socket in thread safe mode
-    mutex_t _sync;
-
-  private:
-    // test if event should be sent and then dispatch it
-    void event (const endpoint_uri_pair_t &endpoint_uri_pair_,
-                uint64_t values_[],
-                uint64_t values_count_,
-                uint64_t type_);
-
-    // Socket event data dispatch
-    void monitor_event (uint64_t event_,
-                        const uint64_t values_[],
-                        uint64_t values_count_,
-                        const endpoint_uri_pair_t &endpoint_uri_pair_) const;
-
-    // Monitor socket cleanup
-    void stop_monitor (bool send_monitor_stopped_event_ = true);
-
-    //  Creates new endpoint ID and adds the endpoint to the map.
-    void add_endpoint (const endpoint_uri_pair_t &endpoint_pair_,
-                       own_t *endpoint_,
-                       pipe_t *pipe_);
-
-    //  Map of open endpoints.
-    typedef std::pair<own_t *, pipe_t *> endpoint_pipe_t;
-    typedef std::multimap<std::string, endpoint_pipe_t> endpoints_t;
-    endpoints_t _endpoints;
-
-    //  Map of open inproc endpoints.
-    class inprocs_t
-    {
-      public:
-        void emplace (const char *endpoint_uri_, pipe_t *pipe_);
-        int erase_pipes (const std::string &endpoint_uri_str_);
-        void erase_pipe (const pipe_t *pipe_);
-
-      private:
-        typedef std::multimap<std::string, pipe_t *> map_t;
-        map_t _inprocs;
-    };
-    inprocs_t _inprocs;
-
-    //  To be called after processing commands or invoking any command
-    //  handlers explicitly. If required, it will deallocate the socket.
-    void check_destroy ();
-
-    //  Moves the flags from the message to local variables,
-    //  to be later retrieved by getsockopt.
-    void extract_flags (const msg_t *msg_);
-
-    //  Used to check whether the object is a socket.
-    uint32_t _tag;
-
-    //  If true, associated context was already terminated.
-    bool _ctx_terminated;
-
-    //  If true, object should have been already destroyed. However,
-    //  destruction is delayed while we unwind the stack to the point
-    //  where it doesn't intersect the object being destroyed.
-    bool _destroyed;
-
-    //  Parse URI string.
-    static int
-    parse_uri (const char *uri_, std::string &protocol_, std::string &path_);
-
-    //  Check whether transport protocol, as specified in connect or
-    //  bind, is available and compatible with the socket type.
-    int check_protocol (const std::string &protocol_) const;
-
-    //  Register the pipe with this socket.
-    void attach_pipe (zmq::pipe_t *pipe_,
-                      bool subscribe_to_all_ = false,
-                      bool locally_initiated_ = false);
-
-    //  Processes commands sent to this socket (if any). If timeout is -1,
-    //  returns only after at least one command was processed.
-    //  If throttle argument is true, commands are processed at most once
-    //  in a predefined time period.
-    int process_commands (int timeout_, bool throttle_);
-
-    //  Handlers for incoming commands.
-    void process_stop () ZMQ_FINAL;
-    void process_bind (zmq::pipe_t *pipe_) ZMQ_FINAL;
-    void
-    process_pipe_stats_publish (uint64_t outbound_queue_count_,
-                                uint64_t inbound_queue_count_,
-                                endpoint_uri_pair_t *endpoint_pair_) ZMQ_FINAL;
-    void process_term (int linger_) ZMQ_FINAL;
-    void process_term_endpoint (std::string *endpoint_) ZMQ_FINAL;
-
-    void update_pipe_options (int option_);
-
-    std::string resolve_tcp_addr (std::string endpoint_uri_,
-                                  const char *tcp_address_);
-
-    //  Socket's mailbox object.
-    i_mailbox *_mailbox;
-
-    //  List of attached pipes.
-    typedef array_t<pipe_t, 3> pipes_t;
-    pipes_t _pipes;
-
-    //  Reaper's poller and handle of this socket within it.
-    poller_t *_poller;
-    poller_t::handle_t _handle;
-
-    //  Timestamp of when commands were processed the last time.
-    uint64_t _last_tsc;
-
-    //  Number of messages received since last command processing.
-    int _ticks;
-
-    //  True if the last message received had MORE flag set.
-    bool _rcvmore;
-
-    //  Improves efficiency of time measurement.
-    clock_t _clock;
-
-    // Monitor socket;
-    void *_monitor_socket;
-
-    // Bitmask of events being monitored
-    int64_t _monitor_events;
-
-    // Last socket endpoint resolved URI
-    std::string _last_endpoint;
-
-    // Indicate if the socket is thread safe
-    const bool _thread_safe;
-
-    // Signaler to be used in the reaping stage
-    signaler_t *_reaper_signaler;
-
-    // Mutex to synchronize access to the monitor Pair socket
-    mutex_t _monitor_sync;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (socket_base_t)
-
-    // Add a flag for mark disconnect action
-    bool _disconnected;
-};
-
-class routing_socket_base_t : public socket_base_t
-{
-  protected:
-    routing_socket_base_t (class ctx_t *parent_, uint32_t tid_, int sid_);
-    ~routing_socket_base_t () ZMQ_OVERRIDE;
-
-    // methods from socket_base_t
-    int xsetsockopt (int option_,
-                     const void *optval_,
-                     size_t optvallen_) ZMQ_OVERRIDE;
-    void xwrite_activated (pipe_t *pipe_) ZMQ_FINAL;
-
-    // own methods
-    std::string extract_connect_routing_id ();
-    bool connect_routing_id_is_set () const;
-
-    struct out_pipe_t
-    {
-        pipe_t *pipe;
-        bool active;
-    };
-
-    void add_out_pipe (blob_t routing_id_, pipe_t *pipe_);
-    bool has_out_pipe (const blob_t &routing_id_) const;
-    out_pipe_t *lookup_out_pipe (const blob_t &routing_id_);
-    const out_pipe_t *lookup_out_pipe (const blob_t &routing_id_) const;
-    void erase_out_pipe (const pipe_t *pipe_);
-    out_pipe_t try_erase_out_pipe (const blob_t &routing_id_);
-    template <typename Func> bool any_of_out_pipes (Func func_)
-    {
-        bool res = false;
-        for (out_pipes_t::iterator it = _out_pipes.begin (),
-                                   end = _out_pipes.end ();
-             it != end && !res; ++it) {
-            res |= func_ (*it->second.pipe);
-        }
-
-        return res;
-    }
-
-  private:
-    //  Outbound pipes indexed by the peer IDs.
-    typedef std::map<blob_t, out_pipe_t> out_pipes_t;
-    out_pipes_t _out_pipes;
-
-    // Next assigned name on a zmq_connect() call used by ROUTER and STREAM socket types
-    std::string _connect_routing_id;
-};
-}
-
-#endif
diff --git a/libs/libzmq/src/socket_poller.cpp b/libs/libzmq/src/socket_poller.cpp
deleted file mode 100644
index eecbf16..0000000
--- a/libs/libzmq/src/socket_poller.cpp
+++ /dev/null
@@ -1,695 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "socket_poller.hpp"
-#include "err.hpp"
-#include "polling_util.hpp"
-#include "macros.hpp"
-
-#include <limits.h>
-
-static bool is_thread_safe (const zmq::socket_base_t &socket_)
-{
-    // do not use getsockopt here, since that would fail during context termination
-    return socket_.is_thread_safe ();
-}
-
-// compare elements to value
-template <class It, class T, class Pred>
-static It find_if2 (It b_, It e_, const T &value, Pred pred)
-{
-    for (; b_ != e_; ++b_) {
-        if (pred (*b_, value)) {
-            break;
-        }
-    }
-    return b_;
-}
-
-zmq::socket_poller_t::socket_poller_t () :
-    _tag (0xCAFEBABE),
-    _signaler (NULL)
-#if defined ZMQ_POLL_BASED_ON_POLL
-    ,
-    _pollfds (NULL)
-#elif defined ZMQ_POLL_BASED_ON_SELECT
-    ,
-    _max_fd (0)
-#endif
-{
-    rebuild ();
-}
-
-zmq::socket_poller_t::~socket_poller_t ()
-{
-    //  Mark the socket_poller as dead
-    _tag = 0xdeadbeef;
-
-    for (items_t::iterator it = _items.begin (), end = _items.end (); it != end;
-         ++it) {
-        // TODO shouldn't this zmq_assert (it->socket->check_tag ()) instead?
-        if (it->socket && it->socket->check_tag ()
-            && is_thread_safe (*it->socket)) {
-            it->socket->remove_signaler (_signaler);
-        }
-    }
-
-    if (_signaler != NULL) {
-        LIBZMQ_DELETE (_signaler);
-    }
-
-#if defined ZMQ_POLL_BASED_ON_POLL
-    if (_pollfds) {
-        free (_pollfds);
-        _pollfds = NULL;
-    }
-#endif
-}
-
-bool zmq::socket_poller_t::check_tag () const
-{
-    return _tag == 0xCAFEBABE;
-}
-
-int zmq::socket_poller_t::signaler_fd (fd_t *fd_) const
-{
-    if (_signaler) {
-        *fd_ = _signaler->get_fd ();
-        return 0;
-    }
-    // Only thread-safe socket types are guaranteed to have a signaler.
-    errno = EINVAL;
-    return -1;
-}
-
-int zmq::socket_poller_t::add (socket_base_t *socket_,
-                               void *user_data_,
-                               short events_)
-{
-    if (find_if2 (_items.begin (), _items.end (), socket_, &is_socket)
-        != _items.end ()) {
-        errno = EINVAL;
-        return -1;
-    }
-
-    if (is_thread_safe (*socket_)) {
-        if (_signaler == NULL) {
-            _signaler = new (std::nothrow) signaler_t ();
-            if (!_signaler) {
-                errno = ENOMEM;
-                return -1;
-            }
-            if (!_signaler->valid ()) {
-                delete _signaler;
-                _signaler = NULL;
-                errno = EMFILE;
-                return -1;
-            }
-        }
-
-        socket_->add_signaler (_signaler);
-    }
-
-    const item_t item = {
-        socket_,
-        0,
-        user_data_,
-        events_
-#if defined ZMQ_POLL_BASED_ON_POLL
-        ,
-        -1
-#endif
-    };
-    try {
-        _items.push_back (item);
-    }
-    catch (const std::bad_alloc &) {
-        errno = ENOMEM;
-        return -1;
-    }
-    _need_rebuild = true;
-
-    return 0;
-}
-
-int zmq::socket_poller_t::add_fd (fd_t fd_, void *user_data_, short events_)
-{
-    if (find_if2 (_items.begin (), _items.end (), fd_, &is_fd)
-        != _items.end ()) {
-        errno = EINVAL;
-        return -1;
-    }
-
-    const item_t item = {
-        NULL,
-        fd_,
-        user_data_,
-        events_
-#if defined ZMQ_POLL_BASED_ON_POLL
-        ,
-        -1
-#endif
-    };
-    try {
-        _items.push_back (item);
-    }
-    catch (const std::bad_alloc &) {
-        errno = ENOMEM;
-        return -1;
-    }
-    _need_rebuild = true;
-
-    return 0;
-}
-
-int zmq::socket_poller_t::modify (const socket_base_t *socket_, short events_)
-{
-    const items_t::iterator it =
-      find_if2 (_items.begin (), _items.end (), socket_, &is_socket);
-
-    if (it == _items.end ()) {
-        errno = EINVAL;
-        return -1;
-    }
-
-    it->events = events_;
-    _need_rebuild = true;
-
-    return 0;
-}
-
-
-int zmq::socket_poller_t::modify_fd (fd_t fd_, short events_)
-{
-    const items_t::iterator it =
-      find_if2 (_items.begin (), _items.end (), fd_, &is_fd);
-
-    if (it == _items.end ()) {
-        errno = EINVAL;
-        return -1;
-    }
-
-    it->events = events_;
-    _need_rebuild = true;
-
-    return 0;
-}
-
-
-int zmq::socket_poller_t::remove (socket_base_t *socket_)
-{
-    const items_t::iterator it =
-      find_if2 (_items.begin (), _items.end (), socket_, &is_socket);
-
-    if (it == _items.end ()) {
-        errno = EINVAL;
-        return -1;
-    }
-
-    _items.erase (it);
-    _need_rebuild = true;
-
-    if (is_thread_safe (*socket_)) {
-        socket_->remove_signaler (_signaler);
-    }
-
-    return 0;
-}
-
-int zmq::socket_poller_t::remove_fd (fd_t fd_)
-{
-    const items_t::iterator it =
-      find_if2 (_items.begin (), _items.end (), fd_, &is_fd);
-
-    if (it == _items.end ()) {
-        errno = EINVAL;
-        return -1;
-    }
-
-    _items.erase (it);
-    _need_rebuild = true;
-
-    return 0;
-}
-
-int zmq::socket_poller_t::rebuild ()
-{
-    _use_signaler = false;
-    _pollset_size = 0;
-    _need_rebuild = false;
-
-#if defined ZMQ_POLL_BASED_ON_POLL
-
-    if (_pollfds) {
-        free (_pollfds);
-        _pollfds = NULL;
-    }
-
-    for (items_t::iterator it = _items.begin (), end = _items.end (); it != end;
-         ++it) {
-        if (it->events) {
-            if (it->socket && is_thread_safe (*it->socket)) {
-                if (!_use_signaler) {
-                    _use_signaler = true;
-                    _pollset_size++;
-                }
-            } else
-                _pollset_size++;
-        }
-    }
-
-    if (_pollset_size == 0)
-        return 0;
-
-    _pollfds = static_cast<pollfd *> (malloc (_pollset_size * sizeof (pollfd)));
-
-    if (!_pollfds) {
-        errno = ENOMEM;
-        _need_rebuild = true;
-        return -1;
-    }
-
-    int item_nbr = 0;
-
-    if (_use_signaler) {
-        item_nbr = 1;
-        _pollfds[0].fd = _signaler->get_fd ();
-        _pollfds[0].events = POLLIN;
-    }
-
-    for (items_t::iterator it = _items.begin (), end = _items.end (); it != end;
-         ++it) {
-        if (it->events) {
-            if (it->socket) {
-                if (!is_thread_safe (*it->socket)) {
-                    size_t fd_size = sizeof (zmq::fd_t);
-                    const int rc = it->socket->getsockopt (
-                      ZMQ_FD, &_pollfds[item_nbr].fd, &fd_size);
-                    zmq_assert (rc == 0);
-
-                    _pollfds[item_nbr].events = POLLIN;
-                    item_nbr++;
-                }
-            } else {
-                _pollfds[item_nbr].fd = it->fd;
-                _pollfds[item_nbr].events =
-                  (it->events & ZMQ_POLLIN ? POLLIN : 0)
-                  | (it->events & ZMQ_POLLOUT ? POLLOUT : 0)
-                  | (it->events & ZMQ_POLLPRI ? POLLPRI : 0);
-                it->pollfd_index = item_nbr;
-                item_nbr++;
-            }
-        }
-    }
-
-#elif defined ZMQ_POLL_BASED_ON_SELECT
-
-    //  Ensure we do not attempt to select () on more than FD_SETSIZE
-    //  file descriptors.
-    zmq_assert (_items.size () <= FD_SETSIZE);
-
-    _pollset_in.resize (_items.size ());
-    _pollset_out.resize (_items.size ());
-    _pollset_err.resize (_items.size ());
-
-    FD_ZERO (_pollset_in.get ());
-    FD_ZERO (_pollset_out.get ());
-    FD_ZERO (_pollset_err.get ());
-
-    for (items_t::iterator it = _items.begin (), end = _items.end (); it != end;
-         ++it) {
-        if (it->socket && is_thread_safe (*it->socket) && it->events) {
-            _use_signaler = true;
-            FD_SET (_signaler->get_fd (), _pollset_in.get ());
-            _pollset_size = 1;
-            break;
-        }
-    }
-
-    _max_fd = 0;
-
-    //  Build the fd_sets for passing to select ().
-    for (items_t::iterator it = _items.begin (), end = _items.end (); it != end;
-         ++it) {
-        if (it->events) {
-            //  If the poll item is a 0MQ socket we are interested in input on the
-            //  notification file descriptor retrieved by the ZMQ_FD socket option.
-            if (it->socket) {
-                if (!is_thread_safe (*it->socket)) {
-                    zmq::fd_t notify_fd;
-                    size_t fd_size = sizeof (zmq::fd_t);
-                    int rc =
-                      it->socket->getsockopt (ZMQ_FD, &notify_fd, &fd_size);
-                    zmq_assert (rc == 0);
-
-                    FD_SET (notify_fd, _pollset_in.get ());
-                    if (_max_fd < notify_fd)
-                        _max_fd = notify_fd;
-
-                    _pollset_size++;
-                }
-            }
-            //  Else, the poll item is a raw file descriptor. Convert the poll item
-            //  events to the appropriate fd_sets.
-            else {
-                if (it->events & ZMQ_POLLIN)
-                    FD_SET (it->fd, _pollset_in.get ());
-                if (it->events & ZMQ_POLLOUT)
-                    FD_SET (it->fd, _pollset_out.get ());
-                if (it->events & ZMQ_POLLERR)
-                    FD_SET (it->fd, _pollset_err.get ());
-                if (_max_fd < it->fd)
-                    _max_fd = it->fd;
-
-                _pollset_size++;
-            }
-        }
-    }
-
-#endif
-
-    return 0;
-}
-
-void zmq::socket_poller_t::zero_trail_events (
-  zmq::socket_poller_t::event_t *events_, int n_events_, int found_)
-{
-    for (int i = found_; i < n_events_; ++i) {
-        events_[i].socket = NULL;
-        events_[i].fd = zmq::retired_fd;
-        events_[i].user_data = NULL;
-        events_[i].events = 0;
-    }
-}
-
-#if defined ZMQ_POLL_BASED_ON_POLL
-int zmq::socket_poller_t::check_events (zmq::socket_poller_t::event_t *events_,
-                                        int n_events_)
-#elif defined ZMQ_POLL_BASED_ON_SELECT
-int zmq::socket_poller_t::check_events (zmq::socket_poller_t::event_t *events_,
-                                        int n_events_,
-                                        fd_set &inset_,
-                                        fd_set &outset_,
-                                        fd_set &errset_)
-#endif
-{
-    int found = 0;
-    for (items_t::iterator it = _items.begin (), end = _items.end ();
-         it != end && found < n_events_; ++it) {
-        //  The poll item is a 0MQ socket. Retrieve pending events
-        //  using the ZMQ_EVENTS socket option.
-        if (it->socket) {
-            size_t events_size = sizeof (uint32_t);
-            uint32_t events;
-            if (it->socket->getsockopt (ZMQ_EVENTS, &events, &events_size)
-                == -1) {
-                return -1;
-            }
-
-            if (it->events & events) {
-                events_[found].socket = it->socket;
-                events_[found].fd = zmq::retired_fd;
-                events_[found].user_data = it->user_data;
-                events_[found].events = it->events & events;
-                ++found;
-            }
-        }
-        //  Else, the poll item is a raw file descriptor, simply convert
-        //  the events to zmq_pollitem_t-style format.
-        else if (it->events) {
-#if defined ZMQ_POLL_BASED_ON_POLL
-            zmq_assert (it->pollfd_index >= 0);
-            const short revents = _pollfds[it->pollfd_index].revents;
-            short events = 0;
-
-            if (revents & POLLIN)
-                events |= ZMQ_POLLIN;
-            if (revents & POLLOUT)
-                events |= ZMQ_POLLOUT;
-            if (revents & POLLPRI)
-                events |= ZMQ_POLLPRI;
-            if (revents & ~(POLLIN | POLLOUT | POLLPRI))
-                events |= ZMQ_POLLERR;
-
-#elif defined ZMQ_POLL_BASED_ON_SELECT
-
-            short events = 0;
-
-            if (FD_ISSET (it->fd, &inset_))
-                events |= ZMQ_POLLIN;
-            if (FD_ISSET (it->fd, &outset_))
-                events |= ZMQ_POLLOUT;
-            if (FD_ISSET (it->fd, &errset_))
-                events |= ZMQ_POLLERR;
-#endif //POLL_SELECT
-
-            if (events) {
-                events_[found].socket = NULL;
-                events_[found].fd = it->fd;
-                events_[found].user_data = it->user_data;
-                events_[found].events = events;
-                ++found;
-            }
-        }
-    }
-
-    return found;
-}
-
-//Return 0 if timeout is expired otherwise 1
-int zmq::socket_poller_t::adjust_timeout (zmq::clock_t &clock_,
-                                          long timeout_,
-                                          uint64_t &now_,
-                                          uint64_t &end_,
-                                          bool &first_pass_)
-{
-    //  If socket_poller_t::timeout is zero, exit immediately whether there
-    //  are events or not.
-    if (timeout_ == 0)
-        return 0;
-
-    //  At this point we are meant to wait for events but there are none.
-    //  If timeout is infinite we can just loop until we get some events.
-    if (timeout_ < 0) {
-        if (first_pass_)
-            first_pass_ = false;
-        return 1;
-    }
-
-    //  The timeout is finite and there are no events. In the first pass
-    //  we get a timestamp of when the polling have begun. (We assume that
-    //  first pass have taken negligible time). We also compute the time
-    //  when the polling should time out.
-    now_ = clock_.now_ms ();
-    if (first_pass_) {
-        end_ = now_ + timeout_;
-        first_pass_ = false;
-        return 1;
-    }
-
-    //  Find out whether timeout have expired.
-    if (now_ >= end_)
-        return 0;
-
-    return 1;
-}
-
-int zmq::socket_poller_t::wait (zmq::socket_poller_t::event_t *events_,
-                                int n_events_,
-                                long timeout_)
-{
-    if (_items.empty () && timeout_ < 0) {
-        errno = EFAULT;
-        return -1;
-    }
-
-    if (_need_rebuild) {
-        const int rc = rebuild ();
-        if (rc == -1)
-            return -1;
-    }
-
-    if (unlikely (_pollset_size == 0)) {
-        if (timeout_ < 0) {
-            // Fail instead of trying to sleep forever
-            errno = EFAULT;
-            return -1;
-        }
-        // We'll report an error (timed out) as if the list was non-empty and
-        // no event occurred within the specified timeout. Otherwise the caller
-        // needs to check the return value AND the event to avoid using the
-        // nullified event data.
-        errno = EAGAIN;
-        if (timeout_ == 0)
-            return -1;
-#if defined ZMQ_HAVE_WINDOWS
-        Sleep (timeout_ > 0 ? timeout_ : INFINITE);
-        return -1;
-#elif defined ZMQ_HAVE_ANDROID
-        usleep (timeout_ * 1000);
-        return -1;
-#elif defined ZMQ_HAVE_OSX
-        usleep (timeout_ * 1000);
-        errno = EAGAIN;
-        return -1;
-#elif defined ZMQ_HAVE_VXWORKS
-        struct timespec ns_;
-        ns_.tv_sec = timeout_ / 1000;
-        ns_.tv_nsec = timeout_ % 1000 * 1000000;
-        nanosleep (&ns_, 0);
-        return -1;
-#else
-        usleep (timeout_ * 1000);
-        return -1;
-#endif
-    }
-
-#if defined ZMQ_POLL_BASED_ON_POLL
-    zmq::clock_t clock;
-    uint64_t now = 0;
-    uint64_t end = 0;
-
-    bool first_pass = true;
-
-    while (true) {
-        //  Compute the timeout for the subsequent poll.
-        int timeout;
-        if (first_pass)
-            timeout = 0;
-        else if (timeout_ < 0)
-            timeout = -1;
-        else
-            timeout =
-              static_cast<int> (std::min<uint64_t> (end - now, INT_MAX));
-
-        //  Wait for events.
-        const int rc = poll (_pollfds, _pollset_size, timeout);
-        if (rc == -1 && errno == EINTR) {
-            return -1;
-        }
-        errno_assert (rc >= 0);
-
-        //  Receive the signal from pollfd
-        if (_use_signaler && _pollfds[0].revents & POLLIN)
-            _signaler->recv ();
-
-        //  Check for the events.
-        const int found = check_events (events_, n_events_);
-        if (found) {
-            if (found > 0)
-                zero_trail_events (events_, n_events_, found);
-            return found;
-        }
-
-        //  Adjust timeout or break
-        if (adjust_timeout (clock, timeout_, now, end, first_pass) == 0)
-            break;
-    }
-    errno = EAGAIN;
-    return -1;
-
-#elif defined ZMQ_POLL_BASED_ON_SELECT
-
-    zmq::clock_t clock;
-    uint64_t now = 0;
-    uint64_t end = 0;
-
-    bool first_pass = true;
-
-    optimized_fd_set_t inset (_pollset_size);
-    optimized_fd_set_t outset (_pollset_size);
-    optimized_fd_set_t errset (_pollset_size);
-
-    while (true) {
-        //  Compute the timeout for the subsequent poll.
-        timeval timeout;
-        timeval *ptimeout;
-        if (first_pass) {
-            timeout.tv_sec = 0;
-            timeout.tv_usec = 0;
-            ptimeout = &timeout;
-        } else if (timeout_ < 0)
-            ptimeout = NULL;
-        else {
-            timeout.tv_sec = static_cast<long> ((end - now) / 1000);
-            timeout.tv_usec = static_cast<long> ((end - now) % 1000 * 1000);
-            ptimeout = &timeout;
-        }
-
-        //  Wait for events. Ignore interrupts if there's infinite timeout.
-        memcpy (inset.get (), _pollset_in.get (),
-                valid_pollset_bytes (*_pollset_in.get ()));
-        memcpy (outset.get (), _pollset_out.get (),
-                valid_pollset_bytes (*_pollset_out.get ()));
-        memcpy (errset.get (), _pollset_err.get (),
-                valid_pollset_bytes (*_pollset_err.get ()));
-        const int rc = select (static_cast<int> (_max_fd + 1), inset.get (),
-                               outset.get (), errset.get (), ptimeout);
-#if defined ZMQ_HAVE_WINDOWS
-        if (unlikely (rc == SOCKET_ERROR)) {
-            errno = wsa_error_to_errno (WSAGetLastError ());
-            wsa_assert (errno == ENOTSOCK);
-            return -1;
-        }
-#else
-        if (unlikely (rc == -1)) {
-            errno_assert (errno == EINTR || errno == EBADF);
-            return -1;
-        }
-#endif
-
-        if (_use_signaler && FD_ISSET (_signaler->get_fd (), inset.get ()))
-            _signaler->recv ();
-
-        //  Check for the events.
-        const int found = check_events (events_, n_events_, *inset.get (),
-                                        *outset.get (), *errset.get ());
-        if (found) {
-            if (found > 0)
-                zero_trail_events (events_, n_events_, found);
-            return found;
-        }
-
-        //  Adjust timeout or break
-        if (adjust_timeout (clock, timeout_, now, end, first_pass) == 0)
-            break;
-    }
-
-    errno = EAGAIN;
-    return -1;
-
-#else
-
-    //  Exotic platforms that support neither poll() nor select().
-    errno = ENOTSUP;
-    return -1;
-
-#endif
-}
diff --git a/libs/libzmq/src/socket_poller.hpp b/libs/libzmq/src/socket_poller.hpp
deleted file mode 100644
index 6f4923e..0000000
--- a/libs/libzmq/src/socket_poller.hpp
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_SOCKET_POLLER_HPP_INCLUDED__
-#define __ZMQ_SOCKET_POLLER_HPP_INCLUDED__
-
-#include "poller.hpp"
-
-#if defined ZMQ_POLL_BASED_ON_POLL && !defined ZMQ_HAVE_WINDOWS
-#include <poll.h>
-#endif
-
-#if defined ZMQ_HAVE_WINDOWS
-#include "windows.hpp"
-#elif defined ZMQ_HAVE_VXWORKS
-#include <unistd.h>
-#include <sys/time.h>
-#include <strings.h>
-#else
-#include <unistd.h>
-#endif
-
-#include <vector>
-
-#include "socket_base.hpp"
-#include "signaler.hpp"
-#include "polling_util.hpp"
-
-namespace zmq
-{
-class socket_poller_t
-{
-  public:
-    socket_poller_t ();
-    ~socket_poller_t ();
-
-    typedef zmq_poller_event_t event_t;
-
-    int add (socket_base_t *socket_, void *user_data_, short events_);
-    int modify (const socket_base_t *socket_, short events_);
-    int remove (socket_base_t *socket_);
-
-    int add_fd (fd_t fd_, void *user_data_, short events_);
-    int modify_fd (fd_t fd_, short events_);
-    int remove_fd (fd_t fd_);
-    // Returns the signaler's fd if there is one, otherwise errors.
-    int signaler_fd (fd_t *fd_) const;
-
-    int wait (event_t *events_, int n_events_, long timeout_);
-
-    int size () const { return static_cast<int> (_items.size ()); };
-
-    //  Return false if object is not a socket.
-    bool check_tag () const;
-
-  private:
-    typedef struct item_t
-    {
-        socket_base_t *socket;
-        fd_t fd;
-        void *user_data;
-        short events;
-#if defined ZMQ_POLL_BASED_ON_POLL
-        int pollfd_index;
-#endif
-    } item_t;
-
-    static void zero_trail_events (zmq::socket_poller_t::event_t *events_,
-                                   int n_events_,
-                                   int found_);
-#if defined ZMQ_POLL_BASED_ON_POLL
-    int check_events (zmq::socket_poller_t::event_t *events_, int n_events_);
-#elif defined ZMQ_POLL_BASED_ON_SELECT
-    int check_events (zmq::socket_poller_t::event_t *events_,
-                      int n_events_,
-                      fd_set &inset_,
-                      fd_set &outset_,
-                      fd_set &errset_);
-#endif
-    static int adjust_timeout (zmq::clock_t &clock_,
-                               long timeout_,
-                               uint64_t &now_,
-                               uint64_t &end_,
-                               bool &first_pass_);
-    static bool is_socket (const item_t &item, const socket_base_t *socket_)
-    {
-        return item.socket == socket_;
-    }
-    static bool is_fd (const item_t &item, fd_t fd_)
-    {
-        return !item.socket && item.fd == fd_;
-    }
-
-    int rebuild ();
-
-    //  Used to check whether the object is a socket_poller.
-    uint32_t _tag;
-
-    //  Signaler used for thread safe sockets polling
-    signaler_t *_signaler;
-
-    //  List of sockets
-    typedef std::vector<item_t> items_t;
-    items_t _items;
-
-    //  Does the pollset needs rebuilding?
-    bool _need_rebuild;
-
-    //  Should the signaler be used for the thread safe polling?
-    bool _use_signaler;
-
-    //  Size of the pollset
-    int _pollset_size;
-
-#if defined ZMQ_POLL_BASED_ON_POLL
-    pollfd *_pollfds;
-#elif defined ZMQ_POLL_BASED_ON_SELECT
-    resizable_optimized_fd_set_t _pollset_in;
-    resizable_optimized_fd_set_t _pollset_out;
-    resizable_optimized_fd_set_t _pollset_err;
-    zmq::fd_t _max_fd;
-#endif
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (socket_poller_t)
-};
-}
-
-#endif
diff --git a/libs/libzmq/src/socks.cpp b/libs/libzmq/src/socks.cpp
deleted file mode 100644
index b5a2f8f..0000000
--- a/libs/libzmq/src/socks.cpp
+++ /dev/null
@@ -1,373 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include <sys/types.h>
-
-#include "err.hpp"
-#include "socks.hpp"
-#include "tcp.hpp"
-#include "blob.hpp"
-
-#ifndef ZMQ_HAVE_WINDOWS
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#endif
-
-zmq::socks_greeting_t::socks_greeting_t (uint8_t method_) : num_methods (1)
-{
-    methods[0] = method_;
-}
-
-zmq::socks_greeting_t::socks_greeting_t (const uint8_t *methods_,
-                                         uint8_t num_methods_) :
-    num_methods (num_methods_)
-{
-    for (uint8_t i = 0; i < num_methods_; i++)
-        methods[i] = methods_[i];
-}
-
-zmq::socks_greeting_encoder_t::socks_greeting_encoder_t () :
-    _bytes_encoded (0), _bytes_written (0)
-{
-}
-
-void zmq::socks_greeting_encoder_t::encode (const socks_greeting_t &greeting_)
-{
-    uint8_t *ptr = _buf;
-
-    *ptr++ = 0x05;
-    *ptr++ = static_cast<uint8_t> (greeting_.num_methods);
-    for (uint8_t i = 0; i < greeting_.num_methods; i++)
-        *ptr++ = greeting_.methods[i];
-
-    _bytes_encoded = 2 + greeting_.num_methods;
-    _bytes_written = 0;
-}
-
-int zmq::socks_greeting_encoder_t::output (fd_t fd_)
-{
-    const int rc =
-      tcp_write (fd_, _buf + _bytes_written, _bytes_encoded - _bytes_written);
-    if (rc > 0)
-        _bytes_written += static_cast<size_t> (rc);
-    return rc;
-}
-
-bool zmq::socks_greeting_encoder_t::has_pending_data () const
-{
-    return _bytes_written < _bytes_encoded;
-}
-
-void zmq::socks_greeting_encoder_t::reset ()
-{
-    _bytes_encoded = _bytes_written = 0;
-}
-
-zmq::socks_choice_t::socks_choice_t (unsigned char method_) : method (method_)
-{
-}
-
-zmq::socks_choice_decoder_t::socks_choice_decoder_t () : _bytes_read (0)
-{
-}
-
-int zmq::socks_choice_decoder_t::input (fd_t fd_)
-{
-    zmq_assert (_bytes_read < 2);
-    const int rc = tcp_read (fd_, _buf + _bytes_read, 2 - _bytes_read);
-    if (rc > 0) {
-        _bytes_read += static_cast<size_t> (rc);
-        if (_buf[0] != 0x05)
-            return -1;
-    }
-    return rc;
-}
-
-bool zmq::socks_choice_decoder_t::message_ready () const
-{
-    return _bytes_read == 2;
-}
-
-zmq::socks_choice_t zmq::socks_choice_decoder_t::decode ()
-{
-    zmq_assert (message_ready ());
-    return socks_choice_t (_buf[1]);
-}
-
-void zmq::socks_choice_decoder_t::reset ()
-{
-    _bytes_read = 0;
-}
-
-
-zmq::socks_basic_auth_request_t::socks_basic_auth_request_t (
-  const std::string &username_, const std::string &password_) :
-    username (username_), password (password_)
-{
-    zmq_assert (username_.size () <= UINT8_MAX);
-    zmq_assert (password_.size () <= UINT8_MAX);
-}
-
-
-zmq::socks_basic_auth_request_encoder_t::socks_basic_auth_request_encoder_t () :
-    _bytes_encoded (0), _bytes_written (0)
-{
-}
-
-void zmq::socks_basic_auth_request_encoder_t::encode (
-  const socks_basic_auth_request_t &req_)
-{
-    unsigned char *ptr = _buf;
-    *ptr++ = 0x01;
-    *ptr++ = static_cast<unsigned char> (req_.username.size ());
-    memcpy (ptr, req_.username.c_str (), req_.username.size ());
-    ptr += req_.username.size ();
-    *ptr++ = static_cast<unsigned char> (req_.password.size ());
-    memcpy (ptr, req_.password.c_str (), req_.password.size ());
-    ptr += req_.password.size ();
-
-    _bytes_encoded = ptr - _buf;
-    _bytes_written = 0;
-}
-
-int zmq::socks_basic_auth_request_encoder_t::output (fd_t fd_)
-{
-    const int rc =
-      tcp_write (fd_, _buf + _bytes_written, _bytes_encoded - _bytes_written);
-    if (rc > 0)
-        _bytes_written += static_cast<size_t> (rc);
-    return rc;
-}
-
-bool zmq::socks_basic_auth_request_encoder_t::has_pending_data () const
-{
-    return _bytes_written < _bytes_encoded;
-}
-
-void zmq::socks_basic_auth_request_encoder_t::reset ()
-{
-    _bytes_encoded = _bytes_written = 0;
-}
-
-
-zmq::socks_auth_response_t::socks_auth_response_t (uint8_t response_code_) :
-    response_code (response_code_)
-{
-}
-
-zmq::socks_auth_response_decoder_t::socks_auth_response_decoder_t () :
-    _bytes_read (0)
-{
-}
-
-int zmq::socks_auth_response_decoder_t::input (fd_t fd_)
-{
-    zmq_assert (_bytes_read < 2);
-    const int rc = tcp_read (fd_, _buf + _bytes_read, 2 - _bytes_read);
-    if (rc > 0) {
-        _bytes_read += static_cast<size_t> (rc);
-        if (_buf[0] != 0x01)
-            return -1;
-    }
-    return rc;
-}
-
-bool zmq::socks_auth_response_decoder_t::message_ready () const
-{
-    return _bytes_read == 2;
-}
-
-zmq::socks_auth_response_t zmq::socks_auth_response_decoder_t::decode ()
-{
-    zmq_assert (message_ready ());
-    return socks_auth_response_t (_buf[1]);
-}
-
-void zmq::socks_auth_response_decoder_t::reset ()
-{
-    _bytes_read = 0;
-}
-
-
-zmq::socks_request_t::socks_request_t (uint8_t command_,
-                                       std::string hostname_,
-                                       uint16_t port_) :
-    command (command_), hostname (ZMQ_MOVE (hostname_)), port (port_)
-{
-    zmq_assert (hostname.size () <= UINT8_MAX);
-}
-
-zmq::socks_request_encoder_t::socks_request_encoder_t () :
-    _bytes_encoded (0), _bytes_written (0)
-{
-}
-
-void zmq::socks_request_encoder_t::encode (const socks_request_t &req_)
-{
-    zmq_assert (req_.hostname.size () <= UINT8_MAX);
-
-    unsigned char *ptr = _buf;
-    *ptr++ = 0x05;
-    *ptr++ = req_.command;
-    *ptr++ = 0x00;
-
-#if defined ZMQ_HAVE_OPENVMS && defined __ia64 && __INITIAL_POINTER_SIZE == 64
-    __addrinfo64 hints, *res = NULL;
-#else
-    addrinfo hints, *res = NULL;
-#endif
-
-    memset (&hints, 0, sizeof hints);
-
-    //  Suppress potential DNS lookups.
-    hints.ai_flags = AI_NUMERICHOST;
-
-    const int rc = getaddrinfo (req_.hostname.c_str (), NULL, &hints, &res);
-    if (rc == 0 && res->ai_family == AF_INET) {
-        const struct sockaddr_in *sockaddr_in =
-          reinterpret_cast<const struct sockaddr_in *> (res->ai_addr);
-        *ptr++ = 0x01;
-        memcpy (ptr, &sockaddr_in->sin_addr, 4);
-        ptr += 4;
-    } else if (rc == 0 && res->ai_family == AF_INET6) {
-        const struct sockaddr_in6 *sockaddr_in6 =
-          reinterpret_cast<const struct sockaddr_in6 *> (res->ai_addr);
-        *ptr++ = 0x04;
-        memcpy (ptr, &sockaddr_in6->sin6_addr, 16);
-        ptr += 16;
-    } else {
-        *ptr++ = 0x03;
-        *ptr++ = static_cast<unsigned char> (req_.hostname.size ());
-        memcpy (ptr, req_.hostname.c_str (), req_.hostname.size ());
-        ptr += req_.hostname.size ();
-    }
-
-    if (rc == 0)
-        freeaddrinfo (res);
-
-    *ptr++ = req_.port / 256;
-    *ptr++ = req_.port % 256;
-
-    _bytes_encoded = ptr - _buf;
-    _bytes_written = 0;
-}
-
-int zmq::socks_request_encoder_t::output (fd_t fd_)
-{
-    const int rc =
-      tcp_write (fd_, _buf + _bytes_written, _bytes_encoded - _bytes_written);
-    if (rc > 0)
-        _bytes_written += static_cast<size_t> (rc);
-    return rc;
-}
-
-bool zmq::socks_request_encoder_t::has_pending_data () const
-{
-    return _bytes_written < _bytes_encoded;
-}
-
-void zmq::socks_request_encoder_t::reset ()
-{
-    _bytes_encoded = _bytes_written = 0;
-}
-
-zmq::socks_response_t::socks_response_t (uint8_t response_code_,
-                                         const std::string &address_,
-                                         uint16_t port_) :
-    response_code (response_code_), address (address_), port (port_)
-{
-}
-
-zmq::socks_response_decoder_t::socks_response_decoder_t () : _bytes_read (0)
-{
-}
-
-int zmq::socks_response_decoder_t::input (fd_t fd_)
-{
-    size_t n = 0;
-
-    if (_bytes_read < 5)
-        n = 5 - _bytes_read;
-    else {
-        const uint8_t atyp = _buf[3];
-        zmq_assert (atyp == 0x01 || atyp == 0x03 || atyp == 0x04);
-        if (atyp == 0x01)
-            n = 3 + 2;
-        else if (atyp == 0x03)
-            n = _buf[4] + 2;
-        else if (atyp == 0x04)
-            n = 15 + 2;
-    }
-    const int rc = tcp_read (fd_, _buf + _bytes_read, n);
-    if (rc > 0) {
-        _bytes_read += static_cast<size_t> (rc);
-        if (_buf[0] != 0x05)
-            return -1;
-        if (_bytes_read >= 2)
-            if (_buf[1] > 0x08)
-                return -1;
-        if (_bytes_read >= 3)
-            if (_buf[2] != 0x00)
-                return -1;
-        if (_bytes_read >= 4) {
-            const uint8_t atyp = _buf[3];
-            if (atyp != 0x01 && atyp != 0x03 && atyp != 0x04)
-                return -1;
-        }
-    }
-    return rc;
-}
-
-bool zmq::socks_response_decoder_t::message_ready () const
-{
-    if (_bytes_read < 4)
-        return false;
-
-    const uint8_t atyp = _buf[3];
-    zmq_assert (atyp == 0x01 || atyp == 0x03 || atyp == 0x04);
-    if (atyp == 0x01)
-        return _bytes_read == 10;
-    if (atyp == 0x03)
-        return _bytes_read > 4 && _bytes_read == 4 + 1 + _buf[4] + 2u;
-
-    return _bytes_read == 22;
-}
-
-zmq::socks_response_t zmq::socks_response_decoder_t::decode ()
-{
-    zmq_assert (message_ready ());
-    return socks_response_t (_buf[1], "", 0);
-}
-
-void zmq::socks_response_decoder_t::reset ()
-{
-    _bytes_read = 0;
-}
diff --git a/libs/libzmq/src/socks.hpp b/libs/libzmq/src/socks.hpp
deleted file mode 100644
index bc3d5e2..0000000
--- a/libs/libzmq/src/socks.hpp
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_SOCKS_HPP_INCLUDED__
-#define __ZMQ_SOCKS_HPP_INCLUDED__
-
-#include <string>
-#include "fd.hpp"
-#include "stdint.hpp"
-
-namespace zmq
-{
-struct socks_greeting_t
-{
-    socks_greeting_t (uint8_t method_);
-    socks_greeting_t (const uint8_t *methods_, uint8_t num_methods_);
-
-    uint8_t methods[UINT8_MAX];
-    const size_t num_methods;
-};
-
-class socks_greeting_encoder_t
-{
-  public:
-    socks_greeting_encoder_t ();
-    void encode (const socks_greeting_t &greeting_);
-    int output (fd_t fd_);
-    bool has_pending_data () const;
-    void reset ();
-
-  private:
-    size_t _bytes_encoded;
-    size_t _bytes_written;
-    uint8_t _buf[2 + UINT8_MAX];
-};
-
-struct socks_choice_t
-{
-    socks_choice_t (uint8_t method_);
-
-    uint8_t method;
-};
-
-class socks_choice_decoder_t
-{
-  public:
-    socks_choice_decoder_t ();
-    int input (fd_t fd_);
-    bool message_ready () const;
-    socks_choice_t decode ();
-    void reset ();
-
-  private:
-    unsigned char _buf[2];
-    size_t _bytes_read;
-};
-
-
-struct socks_basic_auth_request_t
-{
-    socks_basic_auth_request_t (const std::string &username_,
-                                const std::string &password_);
-
-    const std::string username;
-    const std::string password;
-};
-
-class socks_basic_auth_request_encoder_t
-{
-  public:
-    socks_basic_auth_request_encoder_t ();
-    void encode (const socks_basic_auth_request_t &req_);
-    int output (fd_t fd_);
-    bool has_pending_data () const;
-    void reset ();
-
-  private:
-    size_t _bytes_encoded;
-    size_t _bytes_written;
-    uint8_t _buf[1 + 1 + UINT8_MAX + 1 + UINT8_MAX];
-};
-
-struct socks_auth_response_t
-{
-    socks_auth_response_t (uint8_t response_code_);
-    uint8_t response_code;
-};
-
-class socks_auth_response_decoder_t
-{
-  public:
-    socks_auth_response_decoder_t ();
-    int input (fd_t fd_);
-    bool message_ready () const;
-    socks_auth_response_t decode ();
-    void reset ();
-
-  private:
-    int8_t _buf[2];
-    size_t _bytes_read;
-};
-
-struct socks_request_t
-{
-    socks_request_t (uint8_t command_, std::string hostname_, uint16_t port_);
-
-    const uint8_t command;
-    const std::string hostname;
-    const uint16_t port;
-};
-
-class socks_request_encoder_t
-{
-  public:
-    socks_request_encoder_t ();
-    void encode (const socks_request_t &req_);
-    int output (fd_t fd_);
-    bool has_pending_data () const;
-    void reset ();
-
-  private:
-    size_t _bytes_encoded;
-    size_t _bytes_written;
-    uint8_t _buf[4 + UINT8_MAX + 1 + 2];
-};
-
-struct socks_response_t
-{
-    socks_response_t (uint8_t response_code_,
-                      const std::string &address_,
-                      uint16_t port_);
-    uint8_t response_code;
-    std::string address;
-    uint16_t port;
-};
-
-class socks_response_decoder_t
-{
-  public:
-    socks_response_decoder_t ();
-    int input (fd_t fd_);
-    bool message_ready () const;
-    socks_response_t decode ();
-    void reset ();
-
-  private:
-    int8_t _buf[4 + UINT8_MAX + 1 + 2];
-    size_t _bytes_read;
-};
-}
-
-#endif
diff --git a/libs/libzmq/src/socks_connecter.cpp b/libs/libzmq/src/socks_connecter.cpp
deleted file mode 100644
index b293160..0000000
--- a/libs/libzmq/src/socks_connecter.cpp
+++ /dev/null
@@ -1,424 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include <new>
-#include <string>
-
-#include "macros.hpp"
-#include "socks_connecter.hpp"
-#include "random.hpp"
-#include "err.hpp"
-#include "ip.hpp"
-#include "tcp.hpp"
-#include "address.hpp"
-#include "tcp_address.hpp"
-#include "session_base.hpp"
-#include "socks.hpp"
-
-#ifndef ZMQ_HAVE_WINDOWS
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#if defined ZMQ_HAVE_VXWORKS
-#include <sockLib.h>
-#endif
-#endif
-
-zmq::socks_connecter_t::socks_connecter_t (class io_thread_t *io_thread_,
-                                           class session_base_t *session_,
-                                           const options_t &options_,
-                                           address_t *addr_,
-                                           address_t *proxy_addr_,
-                                           bool delayed_start_) :
-    stream_connecter_base_t (
-      io_thread_, session_, options_, addr_, delayed_start_),
-    _proxy_addr (proxy_addr_),
-    _auth_method (socks_no_auth_required),
-    _status (unplugged)
-{
-    zmq_assert (_addr->protocol == protocol_name::tcp);
-    _proxy_addr->to_string (_endpoint);
-}
-
-zmq::socks_connecter_t::~socks_connecter_t ()
-{
-    LIBZMQ_DELETE (_proxy_addr);
-}
-
-void zmq::socks_connecter_t::set_auth_method_none ()
-{
-    _auth_method = socks_no_auth_required;
-    _auth_username.clear ();
-    _auth_password.clear ();
-}
-
-void zmq::socks_connecter_t::set_auth_method_basic (
-  const std::string &username_, const std::string &password_)
-{
-    _auth_method = socks_basic_auth;
-    _auth_username = username_;
-    _auth_password = password_;
-}
-
-void zmq::socks_connecter_t::in_event ()
-{
-    int expected_status = -1;
-    zmq_assert (_status != unplugged);
-
-    if (_status == waiting_for_choice) {
-        int rc = _choice_decoder.input (_s);
-        if (rc == 0 || rc == -1)
-            error ();
-        else if (_choice_decoder.message_ready ()) {
-            const socks_choice_t choice = _choice_decoder.decode ();
-            rc = process_server_response (choice);
-            if (rc == -1)
-                error ();
-            else {
-                if (choice.method == socks_basic_auth)
-                    expected_status = sending_basic_auth_request;
-                else
-                    expected_status = sending_request;
-            }
-        }
-    } else if (_status == waiting_for_auth_response) {
-        int rc = _auth_response_decoder.input (_s);
-        if (rc == 0 || rc == -1)
-            error ();
-        else if (_auth_response_decoder.message_ready ()) {
-            const socks_auth_response_t auth_response =
-              _auth_response_decoder.decode ();
-            rc = process_server_response (auth_response);
-            if (rc == -1)
-                error ();
-            else {
-                expected_status = sending_request;
-            }
-        }
-    } else if (_status == waiting_for_response) {
-        int rc = _response_decoder.input (_s);
-        if (rc == 0 || rc == -1)
-            error ();
-        else if (_response_decoder.message_ready ()) {
-            const socks_response_t response = _response_decoder.decode ();
-            rc = process_server_response (response);
-            if (rc == -1)
-                error ();
-            else {
-                rm_handle ();
-                create_engine (
-                  _s, get_socket_name<tcp_address_t> (_s, socket_end_local));
-                _s = -1;
-                _status = unplugged;
-            }
-        }
-    } else
-        error ();
-
-    if (expected_status == sending_basic_auth_request) {
-        _basic_auth_request_encoder.encode (
-          socks_basic_auth_request_t (_auth_username, _auth_password));
-        reset_pollin (_handle);
-        set_pollout (_handle);
-        _status = sending_basic_auth_request;
-    } else if (expected_status == sending_request) {
-        std::string hostname;
-        uint16_t port = 0;
-        if (parse_address (_addr->address, hostname, port) == -1)
-            error ();
-        else {
-            _request_encoder.encode (socks_request_t (1, hostname, port));
-            reset_pollin (_handle);
-            set_pollout (_handle);
-            _status = sending_request;
-        }
-    }
-}
-
-void zmq::socks_connecter_t::out_event ()
-{
-    zmq_assert (
-      _status == waiting_for_proxy_connection || _status == sending_greeting
-      || _status == sending_basic_auth_request || _status == sending_request);
-
-    if (_status == waiting_for_proxy_connection) {
-        const int rc = static_cast<int> (check_proxy_connection ());
-        if (rc == -1)
-            error ();
-        else {
-            _greeting_encoder.encode (socks_greeting_t (_auth_method));
-            _status = sending_greeting;
-        }
-    } else if (_status == sending_greeting) {
-        zmq_assert (_greeting_encoder.has_pending_data ());
-        const int rc = _greeting_encoder.output (_s);
-        if (rc == -1 || rc == 0)
-            error ();
-        else if (!_greeting_encoder.has_pending_data ()) {
-            reset_pollout (_handle);
-            set_pollin (_handle);
-            _status = waiting_for_choice;
-        }
-    } else if (_status == sending_basic_auth_request) {
-        zmq_assert (_basic_auth_request_encoder.has_pending_data ());
-        const int rc = _basic_auth_request_encoder.output (_s);
-        if (rc == -1 || rc == 0)
-            error ();
-        else if (!_basic_auth_request_encoder.has_pending_data ()) {
-            reset_pollout (_handle);
-            set_pollin (_handle);
-            _status = waiting_for_auth_response;
-        }
-    } else {
-        zmq_assert (_request_encoder.has_pending_data ());
-        const int rc = _request_encoder.output (_s);
-        if (rc == -1 || rc == 0)
-            error ();
-        else if (!_request_encoder.has_pending_data ()) {
-            reset_pollout (_handle);
-            set_pollin (_handle);
-            _status = waiting_for_response;
-        }
-    }
-}
-
-void zmq::socks_connecter_t::start_connecting ()
-{
-    zmq_assert (_status == unplugged);
-
-    //  Open the connecting socket.
-    const int rc = connect_to_proxy ();
-
-    //  Connect may succeed in synchronous manner.
-    if (rc == 0) {
-        _handle = add_fd (_s);
-        set_pollout (_handle);
-        _status = sending_greeting;
-    }
-    //  Connection establishment may be delayed. Poll for its completion.
-    else if (errno == EINPROGRESS) {
-        _handle = add_fd (_s);
-        set_pollout (_handle);
-        _status = waiting_for_proxy_connection;
-        _socket->event_connect_delayed (
-          make_unconnected_connect_endpoint_pair (_endpoint), zmq_errno ());
-    }
-    //  Handle any other error condition by eventual reconnect.
-    else {
-        if (_s != retired_fd)
-            close ();
-        add_reconnect_timer ();
-    }
-}
-
-int zmq::socks_connecter_t::process_server_response (
-  const socks_choice_t &response_)
-{
-    return response_.method == socks_no_auth_required
-               || response_.method == socks_basic_auth
-             ? 0
-             : -1;
-}
-
-int zmq::socks_connecter_t::process_server_response (
-  const socks_response_t &response_)
-{
-    return response_.response_code == 0 ? 0 : -1;
-}
-
-int zmq::socks_connecter_t::process_server_response (
-  const socks_auth_response_t &response_)
-{
-    return response_.response_code == 0 ? 0 : -1;
-}
-
-void zmq::socks_connecter_t::error ()
-{
-    rm_fd (_handle);
-    close ();
-    _greeting_encoder.reset ();
-    _choice_decoder.reset ();
-    _basic_auth_request_encoder.reset ();
-    _auth_response_decoder.reset ();
-    _request_encoder.reset ();
-    _response_decoder.reset ();
-    _status = unplugged;
-    add_reconnect_timer ();
-}
-
-int zmq::socks_connecter_t::connect_to_proxy ()
-{
-    zmq_assert (_s == retired_fd);
-
-    //  Resolve the address
-    if (_proxy_addr->resolved.tcp_addr != NULL) {
-        LIBZMQ_DELETE (_proxy_addr->resolved.tcp_addr);
-    }
-
-    _proxy_addr->resolved.tcp_addr = new (std::nothrow) tcp_address_t ();
-    alloc_assert (_proxy_addr->resolved.tcp_addr);
-    //  Automatic fallback to ipv4 is disabled here since this was the existing
-    //  behaviour, however I don't see a real reason for this. Maybe this can
-    //  be changed to true (and then the parameter can be removed entirely).
-    _s = tcp_open_socket (_proxy_addr->address.c_str (), options, false, false,
-                          _proxy_addr->resolved.tcp_addr);
-    if (_s == retired_fd) {
-        //  TODO we should emit some event in this case!
-        LIBZMQ_DELETE (_proxy_addr->resolved.tcp_addr);
-        return -1;
-    }
-    zmq_assert (_proxy_addr->resolved.tcp_addr != NULL);
-
-    // Set the socket to non-blocking mode so that we get async connect().
-    unblock_socket (_s);
-
-    const tcp_address_t *const tcp_addr = _proxy_addr->resolved.tcp_addr;
-
-    int rc;
-
-    // Set a source address for conversations
-    if (tcp_addr->has_src_addr ()) {
-#if defined ZMQ_HAVE_VXWORKS
-        rc = ::bind (_s, (sockaddr *) tcp_addr->src_addr (),
-                     tcp_addr->src_addrlen ());
-#else
-        rc = ::bind (_s, tcp_addr->src_addr (), tcp_addr->src_addrlen ());
-#endif
-        if (rc == -1) {
-            close ();
-            return -1;
-        }
-    }
-
-    //  Connect to the remote peer.
-#if defined ZMQ_HAVE_VXWORKS
-    rc = ::connect (_s, (sockaddr *) tcp_addr->addr (), tcp_addr->addrlen ());
-#else
-    rc = ::connect (_s, tcp_addr->addr (), tcp_addr->addrlen ());
-#endif
-    //  Connect was successful immediately.
-    if (rc == 0)
-        return 0;
-
-        //  Translate error codes indicating asynchronous connect has been
-        //  launched to a uniform EINPROGRESS.
-#ifdef ZMQ_HAVE_WINDOWS
-    const int last_error = WSAGetLastError ();
-    if (last_error == WSAEINPROGRESS || last_error == WSAEWOULDBLOCK)
-        errno = EINPROGRESS;
-    else {
-        errno = wsa_error_to_errno (last_error);
-        close ();
-    }
-#else
-    if (errno == EINTR)
-        errno = EINPROGRESS;
-#endif
-    return -1;
-}
-
-zmq::fd_t zmq::socks_connecter_t::check_proxy_connection () const
-{
-    //  Async connect has finished. Check whether an error occurred
-    int err = 0;
-#if defined ZMQ_HAVE_HPUX || defined ZMQ_HAVE_VXWORKS
-    int len = sizeof err;
-#else
-    socklen_t len = sizeof err;
-#endif
-
-    int rc = getsockopt (_s, SOL_SOCKET, SO_ERROR,
-                         reinterpret_cast<char *> (&err), &len);
-
-    //  Assert if the error was caused by 0MQ bug.
-    //  Networking problems are OK. No need to assert.
-#ifdef ZMQ_HAVE_WINDOWS
-    zmq_assert (rc == 0);
-    if (err != 0) {
-        wsa_assert (err == WSAECONNREFUSED || err == WSAETIMEDOUT
-                    || err == WSAECONNABORTED || err == WSAEHOSTUNREACH
-                    || err == WSAENETUNREACH || err == WSAENETDOWN
-                    || err == WSAEACCES || err == WSAEINVAL
-                    || err == WSAEADDRINUSE);
-        return -1;
-    }
-#else
-    //  Following code should handle both Berkeley-derived socket
-    //  implementations and Solaris.
-    if (rc == -1)
-        err = errno;
-    if (err != 0) {
-        errno = err;
-        errno_assert (errno == ECONNREFUSED || errno == ECONNRESET
-                      || errno == ETIMEDOUT || errno == EHOSTUNREACH
-                      || errno == ENETUNREACH || errno == ENETDOWN
-                      || errno == EINVAL);
-        return -1;
-    }
-#endif
-
-    rc = tune_tcp_socket (_s);
-    rc = rc
-         | tune_tcp_keepalives (
-           _s, options.tcp_keepalive, options.tcp_keepalive_cnt,
-           options.tcp_keepalive_idle, options.tcp_keepalive_intvl);
-    if (rc != 0)
-        return -1;
-
-    return 0;
-}
-
-int zmq::socks_connecter_t::parse_address (const std::string &address_,
-                                           std::string &hostname_,
-                                           uint16_t &port_)
-{
-    //  Find the ':' at end that separates address from the port number.
-    const size_t idx = address_.rfind (':');
-    if (idx == std::string::npos) {
-        errno = EINVAL;
-        return -1;
-    }
-
-    //  Extract hostname
-    if (idx < 2 || address_[0] != '[' || address_[idx - 1] != ']')
-        hostname_ = address_.substr (0, idx);
-    else
-        hostname_ = address_.substr (1, idx - 2);
-
-    //  Separate the hostname/port.
-    const std::string port_str = address_.substr (idx + 1);
-    //  Parse the port number (0 is not a valid port).
-    port_ = static_cast<uint16_t> (atoi (port_str.c_str ()));
-    if (port_ == 0) {
-        errno = EINVAL;
-        return -1;
-    }
-    return 0;
-}
diff --git a/libs/libzmq/src/socks_connecter.hpp b/libs/libzmq/src/socks_connecter.hpp
deleted file mode 100644
index de79415..0000000
--- a/libs/libzmq/src/socks_connecter.hpp
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __SOCKS_CONNECTER_HPP_INCLUDED__
-#define __SOCKS_CONNECTER_HPP_INCLUDED__
-
-#include "fd.hpp"
-#include "stream_connecter_base.hpp"
-#include "stdint.hpp"
-#include "socks.hpp"
-
-namespace zmq
-{
-class io_thread_t;
-class session_base_t;
-struct address_t;
-
-class socks_connecter_t ZMQ_FINAL : public stream_connecter_base_t
-{
-  public:
-    //  If 'delayed_start' is true connecter first waits for a while,
-    //  then starts connection process.
-    socks_connecter_t (zmq::io_thread_t *io_thread_,
-                       zmq::session_base_t *session_,
-                       const options_t &options_,
-                       address_t *addr_,
-                       address_t *proxy_addr_,
-                       bool delayed_start_);
-    ~socks_connecter_t ();
-
-    void set_auth_method_basic (const std::string &username,
-                                const std::string &password);
-    void set_auth_method_none ();
-
-
-  private:
-    enum
-    {
-        unplugged,
-        waiting_for_reconnect_time,
-        waiting_for_proxy_connection,
-        sending_greeting,
-        waiting_for_choice,
-        sending_basic_auth_request,
-        waiting_for_auth_response,
-        sending_request,
-        waiting_for_response
-    };
-
-    //  Method ID
-    enum
-    {
-        socks_no_auth_required = 0x00,
-        socks_basic_auth = 0x02,
-        socks_no_acceptable_method = 0xff
-    };
-
-    //  Handlers for I/O events.
-    void in_event ();
-    void out_event ();
-
-    //  Internal function to start the actual connection establishment.
-    void start_connecting ();
-
-    static int process_server_response (const socks_choice_t &response_);
-    static int process_server_response (const socks_response_t &response_);
-    static int process_server_response (const socks_auth_response_t &response_);
-
-    static int parse_address (const std::string &address_,
-                              std::string &hostname_,
-                              uint16_t &port_);
-
-    int connect_to_proxy ();
-
-    void error ();
-
-    //  Open TCP connecting socket. Returns -1 in case of error,
-    //  0 if connect was successful immediately. Returns -1 with
-    //  EAGAIN errno if async connect was launched.
-    int open ();
-
-    //  Get the file descriptor of newly created connection. Returns
-    //  retired_fd if the connection was unsuccessful.
-    zmq::fd_t check_proxy_connection () const;
-
-    socks_greeting_encoder_t _greeting_encoder;
-    socks_choice_decoder_t _choice_decoder;
-    socks_basic_auth_request_encoder_t _basic_auth_request_encoder;
-    socks_auth_response_decoder_t _auth_response_decoder;
-    socks_request_encoder_t _request_encoder;
-    socks_response_decoder_t _response_decoder;
-
-    //  SOCKS address; owned by this connecter.
-    address_t *_proxy_addr;
-
-    // User defined authentication method
-    int _auth_method;
-
-    // Credentials for basic authentication
-    std::string _auth_username;
-    std::string _auth_password;
-
-    int _status;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (socks_connecter_t)
-};
-}
-
-#endif
diff --git a/libs/libzmq/src/stdint.hpp b/libs/libzmq/src/stdint.hpp
deleted file mode 100644
index dc4d5df..0000000
--- a/libs/libzmq/src/stdint.hpp
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_STDINT_HPP_INCLUDED__
-#define __ZMQ_STDINT_HPP_INCLUDED__
-
-#if defined ZMQ_HAVE_SOLARIS || defined ZMQ_HAVE_OPENVMS
-
-#include <inttypes.h>
-
-#elif defined _MSC_VER && _MSC_VER < 1600
-
-#ifndef int8_t
-typedef __int8 int8_t;
-#endif
-#ifndef int16_t
-typedef __int16 int16_t;
-#endif
-#ifndef int32_t
-typedef __int32 int32_t;
-#endif
-#ifndef int64_t
-typedef __int64 int64_t;
-#endif
-#ifndef uint8_t
-typedef unsigned __int8 uint8_t;
-#endif
-#ifndef uint16_t
-typedef unsigned __int16 uint16_t;
-#endif
-#ifndef uint32_t
-typedef unsigned __int32 uint32_t;
-#endif
-#ifndef uint64_t
-typedef unsigned __int64 uint64_t;
-#endif
-#ifndef UINT16_MAX
-#define UINT16_MAX _UI16_MAX
-#endif
-#ifndef UINT32_MAX
-#define UINT32_MAX _UI32_MAX
-#endif
-
-#else
-
-#include <stdint.h>
-
-#endif
-
-#ifndef UINT8_MAX
-#define UINT8_MAX 0xFF
-#endif
-
-#endif
diff --git a/libs/libzmq/src/stream.cpp b/libs/libzmq/src/stream.cpp
deleted file mode 100644
index 3713c7e..0000000
--- a/libs/libzmq/src/stream.cpp
+++ /dev/null
@@ -1,291 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "macros.hpp"
-#include "stream.hpp"
-#include "pipe.hpp"
-#include "wire.hpp"
-#include "random.hpp"
-#include "likely.hpp"
-#include "err.hpp"
-
-zmq::stream_t::stream_t (class ctx_t *parent_, uint32_t tid_, int sid_) :
-    routing_socket_base_t (parent_, tid_, sid_),
-    _prefetched (false),
-    _routing_id_sent (false),
-    _current_out (NULL),
-    _more_out (false),
-    _next_integral_routing_id (generate_random ())
-{
-    options.type = ZMQ_STREAM;
-    options.raw_socket = true;
-
-    _prefetched_routing_id.init ();
-    _prefetched_msg.init ();
-}
-
-zmq::stream_t::~stream_t ()
-{
-    _prefetched_routing_id.close ();
-    _prefetched_msg.close ();
-}
-
-void zmq::stream_t::xattach_pipe (pipe_t *pipe_,
-                                  bool subscribe_to_all_,
-                                  bool locally_initiated_)
-{
-    LIBZMQ_UNUSED (subscribe_to_all_);
-
-    zmq_assert (pipe_);
-
-    identify_peer (pipe_, locally_initiated_);
-    _fq.attach (pipe_);
-}
-
-void zmq::stream_t::xpipe_terminated (pipe_t *pipe_)
-{
-    erase_out_pipe (pipe_);
-    _fq.pipe_terminated (pipe_);
-    // TODO router_t calls pipe_->rollback() here; should this be done here as
-    // well? then xpipe_terminated could be pulled up to routing_socket_base_t
-    if (pipe_ == _current_out)
-        _current_out = NULL;
-}
-
-void zmq::stream_t::xread_activated (pipe_t *pipe_)
-{
-    _fq.activated (pipe_);
-}
-
-int zmq::stream_t::xsend (msg_t *msg_)
-{
-    //  If this is the first part of the message it's the ID of the
-    //  peer to send the message to.
-    if (!_more_out) {
-        zmq_assert (!_current_out);
-
-        //  If we have malformed message (prefix with no subsequent message)
-        //  then just silently ignore it.
-        //  TODO: The connections should be killed instead.
-        if (msg_->flags () & msg_t::more) {
-            //  Find the pipe associated with the routing id stored in the prefix.
-            //  If there's no such pipe return an error
-
-            out_pipe_t *out_pipe = lookup_out_pipe (
-              blob_t (static_cast<unsigned char *> (msg_->data ()),
-                      msg_->size (), reference_tag_t ()));
-
-            if (out_pipe) {
-                _current_out = out_pipe->pipe;
-                if (!_current_out->check_write ()) {
-                    out_pipe->active = false;
-                    _current_out = NULL;
-                    errno = EAGAIN;
-                    return -1;
-                }
-            } else {
-                errno = EHOSTUNREACH;
-                return -1;
-            }
-        }
-
-        //  Expect one more message frame.
-        _more_out = true;
-
-        int rc = msg_->close ();
-        errno_assert (rc == 0);
-        rc = msg_->init ();
-        errno_assert (rc == 0);
-        return 0;
-    }
-
-    //  Ignore the MORE flag
-    msg_->reset_flags (msg_t::more);
-
-    //  This is the last part of the message.
-    _more_out = false;
-
-    //  Push the message into the pipe. If there's no out pipe, just drop it.
-    if (_current_out) {
-        // Close the remote connection if user has asked to do so
-        // by sending zero length message.
-        // Pending messages in the pipe will be dropped (on receiving term- ack)
-        if (msg_->size () == 0) {
-            _current_out->terminate (false);
-            int rc = msg_->close ();
-            errno_assert (rc == 0);
-            rc = msg_->init ();
-            errno_assert (rc == 0);
-            _current_out = NULL;
-            return 0;
-        }
-        const bool ok = _current_out->write (msg_);
-        if (likely (ok))
-            _current_out->flush ();
-        _current_out = NULL;
-    } else {
-        const int rc = msg_->close ();
-        errno_assert (rc == 0);
-    }
-
-    //  Detach the message from the data buffer.
-    const int rc = msg_->init ();
-    errno_assert (rc == 0);
-
-    return 0;
-}
-
-int zmq::stream_t::xsetsockopt (int option_,
-                                const void *optval_,
-                                size_t optvallen_)
-{
-    switch (option_) {
-        case ZMQ_STREAM_NOTIFY:
-            return do_setsockopt_int_as_bool_strict (optval_, optvallen_,
-                                                     &options.raw_notify);
-
-        default:
-            return routing_socket_base_t::xsetsockopt (option_, optval_,
-                                                       optvallen_);
-    }
-}
-
-int zmq::stream_t::xrecv (msg_t *msg_)
-{
-    if (_prefetched) {
-        if (!_routing_id_sent) {
-            const int rc = msg_->move (_prefetched_routing_id);
-            errno_assert (rc == 0);
-            _routing_id_sent = true;
-        } else {
-            const int rc = msg_->move (_prefetched_msg);
-            errno_assert (rc == 0);
-            _prefetched = false;
-        }
-        return 0;
-    }
-
-    pipe_t *pipe = NULL;
-    int rc = _fq.recvpipe (&_prefetched_msg, &pipe);
-    if (rc != 0)
-        return -1;
-
-    zmq_assert (pipe != NULL);
-    zmq_assert ((_prefetched_msg.flags () & msg_t::more) == 0);
-
-    //  We have received a frame with TCP data.
-    //  Rather than sending this frame, we keep it in prefetched
-    //  buffer and send a frame with peer's ID.
-    const blob_t &routing_id = pipe->get_routing_id ();
-    rc = msg_->close ();
-    errno_assert (rc == 0);
-    rc = msg_->init_size (routing_id.size ());
-    errno_assert (rc == 0);
-
-    // forward metadata (if any)
-    metadata_t *metadata = _prefetched_msg.metadata ();
-    if (metadata)
-        msg_->set_metadata (metadata);
-
-    memcpy (msg_->data (), routing_id.data (), routing_id.size ());
-    msg_->set_flags (msg_t::more);
-
-    _prefetched = true;
-    _routing_id_sent = true;
-
-    return 0;
-}
-
-bool zmq::stream_t::xhas_in ()
-{
-    //  We may already have a message pre-fetched.
-    if (_prefetched)
-        return true;
-
-    //  Try to read the next message.
-    //  The message, if read, is kept in the pre-fetch buffer.
-    pipe_t *pipe = NULL;
-    int rc = _fq.recvpipe (&_prefetched_msg, &pipe);
-    if (rc != 0)
-        return false;
-
-    zmq_assert (pipe != NULL);
-    zmq_assert ((_prefetched_msg.flags () & msg_t::more) == 0);
-
-    const blob_t &routing_id = pipe->get_routing_id ();
-    rc = _prefetched_routing_id.init_size (routing_id.size ());
-    errno_assert (rc == 0);
-
-    // forward metadata (if any)
-    metadata_t *metadata = _prefetched_msg.metadata ();
-    if (metadata)
-        _prefetched_routing_id.set_metadata (metadata);
-
-    memcpy (_prefetched_routing_id.data (), routing_id.data (),
-            routing_id.size ());
-    _prefetched_routing_id.set_flags (msg_t::more);
-
-    _prefetched = true;
-    _routing_id_sent = false;
-
-    return true;
-}
-
-bool zmq::stream_t::xhas_out ()
-{
-    //  In theory, STREAM socket is always ready for writing. Whether actual
-    //  attempt to write succeeds depends on which pipe the message is going
-    //  to be routed to.
-    return true;
-}
-
-void zmq::stream_t::identify_peer (pipe_t *pipe_, bool locally_initiated_)
-{
-    //  Always assign routing id for raw-socket
-    unsigned char buffer[5];
-    buffer[0] = 0;
-    blob_t routing_id;
-    if (locally_initiated_ && connect_routing_id_is_set ()) {
-        const std::string connect_routing_id = extract_connect_routing_id ();
-        routing_id.set (
-          reinterpret_cast<const unsigned char *> (connect_routing_id.c_str ()),
-          connect_routing_id.length ());
-        //  Not allowed to duplicate an existing rid
-        zmq_assert (!has_out_pipe (routing_id));
-    } else {
-        put_uint32 (buffer + 1, _next_integral_routing_id++);
-        routing_id.set (buffer, sizeof buffer);
-        memcpy (options.routing_id, routing_id.data (), routing_id.size ());
-        options.routing_id_size =
-          static_cast<unsigned char> (routing_id.size ());
-    }
-    pipe_->set_router_socket_routing_id (routing_id);
-    add_out_pipe (ZMQ_MOVE (routing_id), pipe_);
-}
diff --git a/libs/libzmq/src/stream.hpp b/libs/libzmq/src/stream.hpp
deleted file mode 100644
index b5ea24c..0000000
--- a/libs/libzmq/src/stream.hpp
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_STREAM_HPP_INCLUDED__
-#define __ZMQ_STREAM_HPP_INCLUDED__
-
-#include <map>
-
-#include "router.hpp"
-
-namespace zmq
-{
-class ctx_t;
-class pipe_t;
-
-class stream_t ZMQ_FINAL : public routing_socket_base_t
-{
-  public:
-    stream_t (zmq::ctx_t *parent_, uint32_t tid_, int sid_);
-    ~stream_t ();
-
-    //  Overrides of functions from socket_base_t.
-    void xattach_pipe (zmq::pipe_t *pipe_,
-                       bool subscribe_to_all_,
-                       bool locally_initiated_);
-    int xsend (zmq::msg_t *msg_);
-    int xrecv (zmq::msg_t *msg_);
-    bool xhas_in ();
-    bool xhas_out ();
-    void xread_activated (zmq::pipe_t *pipe_);
-    void xpipe_terminated (zmq::pipe_t *pipe_);
-    int xsetsockopt (int option_, const void *optval_, size_t optvallen_);
-
-  private:
-    //  Generate peer's id and update lookup map
-    void identify_peer (pipe_t *pipe_, bool locally_initiated_);
-
-    //  Fair queueing object for inbound pipes.
-    fq_t _fq;
-
-    //  True iff there is a message held in the pre-fetch buffer.
-    bool _prefetched;
-
-    //  If true, the receiver got the message part with
-    //  the peer's identity.
-    bool _routing_id_sent;
-
-    //  Holds the prefetched identity.
-    msg_t _prefetched_routing_id;
-
-    //  Holds the prefetched message.
-    msg_t _prefetched_msg;
-
-    //  The pipe we are currently writing to.
-    zmq::pipe_t *_current_out;
-
-    //  If true, more outgoing message parts are expected.
-    bool _more_out;
-
-    //  Routing IDs are generated. It's a simple increment and wrap-over
-    //  algorithm. This value is the next ID to use (if not used already).
-    uint32_t _next_integral_routing_id;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (stream_t)
-};
-}
-
-#endif
diff --git a/libs/libzmq/src/stream_connecter_base.cpp b/libs/libzmq/src/stream_connecter_base.cpp
deleted file mode 100644
index 138d7d6..0000000
--- a/libs/libzmq/src/stream_connecter_base.cpp
+++ /dev/null
@@ -1,199 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "stream_connecter_base.hpp"
-#include "session_base.hpp"
-#include "address.hpp"
-#include "random.hpp"
-#include "zmtp_engine.hpp"
-#include "raw_engine.hpp"
-
-#ifndef ZMQ_HAVE_WINDOWS
-#include <unistd.h>
-#else
-#include <winsock2.h>
-#endif
-
-#include <limits>
-
-zmq::stream_connecter_base_t::stream_connecter_base_t (
-  zmq::io_thread_t *io_thread_,
-  zmq::session_base_t *session_,
-  const zmq::options_t &options_,
-  zmq::address_t *addr_,
-  bool delayed_start_) :
-    own_t (io_thread_, options_),
-    io_object_t (io_thread_),
-    _addr (addr_),
-    _s (retired_fd),
-    _handle (static_cast<handle_t> (NULL)),
-    _socket (session_->get_socket ()),
-    _delayed_start (delayed_start_),
-    _reconnect_timer_started (false),
-    _current_reconnect_ivl (options.reconnect_ivl),
-    _session (session_)
-{
-    zmq_assert (_addr);
-    _addr->to_string (_endpoint);
-    // TODO the return value is unused! what if it fails? if this is impossible
-    // or does not matter, change such that endpoint in initialized using an
-    // initializer, and make endpoint const
-}
-
-zmq::stream_connecter_base_t::~stream_connecter_base_t ()
-{
-    zmq_assert (!_reconnect_timer_started);
-    zmq_assert (!_handle);
-    zmq_assert (_s == retired_fd);
-}
-
-void zmq::stream_connecter_base_t::process_plug ()
-{
-    if (_delayed_start)
-        add_reconnect_timer ();
-    else
-        start_connecting ();
-}
-
-void zmq::stream_connecter_base_t::process_term (int linger_)
-{
-    if (_reconnect_timer_started) {
-        cancel_timer (reconnect_timer_id);
-        _reconnect_timer_started = false;
-    }
-
-    if (_handle) {
-        rm_handle ();
-    }
-
-    if (_s != retired_fd)
-        close ();
-
-    own_t::process_term (linger_);
-}
-
-void zmq::stream_connecter_base_t::add_reconnect_timer ()
-{
-    if (options.reconnect_ivl > 0) {
-        const int interval = get_new_reconnect_ivl ();
-        add_timer (interval, reconnect_timer_id);
-        _socket->event_connect_retried (
-          make_unconnected_connect_endpoint_pair (_endpoint), interval);
-        _reconnect_timer_started = true;
-    }
-}
-
-int zmq::stream_connecter_base_t::get_new_reconnect_ivl ()
-{
-    //  TODO should the random jitter be really based on the configured initial
-    //  reconnect interval options.reconnect_ivl, or better on the
-    //  _current_reconnect_ivl?
-
-    //  The new interval is the current interval + random value.
-    const int random_jitter = generate_random () % options.reconnect_ivl;
-    const int interval =
-      _current_reconnect_ivl < std::numeric_limits<int>::max () - random_jitter
-        ? _current_reconnect_ivl + random_jitter
-        : std::numeric_limits<int>::max ();
-
-    //  Only change the new current reconnect interval if the maximum reconnect
-    //  interval was set and if it's larger than the reconnect interval.
-    if (options.reconnect_ivl_max > 0
-        && options.reconnect_ivl_max > options.reconnect_ivl) {
-        //  Calculate the next interval
-        _current_reconnect_ivl =
-          _current_reconnect_ivl < std::numeric_limits<int>::max () / 2
-            ? std::min (_current_reconnect_ivl * 2, options.reconnect_ivl_max)
-            : options.reconnect_ivl_max;
-    }
-
-    return interval;
-}
-
-void zmq::stream_connecter_base_t::rm_handle ()
-{
-    rm_fd (_handle);
-    _handle = static_cast<handle_t> (NULL);
-}
-
-void zmq::stream_connecter_base_t::close ()
-{
-    // TODO before, this was an assertion for _s != retired_fd, but this does not match usage of close
-    if (_s != retired_fd) {
-#ifdef ZMQ_HAVE_WINDOWS
-        const int rc = closesocket (_s);
-        wsa_assert (rc != SOCKET_ERROR);
-#else
-        const int rc = ::close (_s);
-        errno_assert (rc == 0);
-#endif
-        _socket->event_closed (
-          make_unconnected_connect_endpoint_pair (_endpoint), _s);
-        _s = retired_fd;
-    }
-}
-
-void zmq::stream_connecter_base_t::in_event ()
-{
-    //  We are not polling for incoming data, so we are actually called
-    //  because of error here. However, we can get error on out event as well
-    //  on some platforms, so we'll simply handle both events in the same way.
-    out_event ();
-}
-
-void zmq::stream_connecter_base_t::create_engine (
-  fd_t fd_, const std::string &local_address_)
-{
-    const endpoint_uri_pair_t endpoint_pair (local_address_, _endpoint,
-                                             endpoint_type_connect);
-
-    //  Create the engine object for this connection.
-    i_engine *engine;
-    if (options.raw_socket)
-        engine = new (std::nothrow) raw_engine_t (fd_, options, endpoint_pair);
-    else
-        engine = new (std::nothrow) zmtp_engine_t (fd_, options, endpoint_pair);
-    alloc_assert (engine);
-
-    //  Attach the engine to the corresponding session object.
-    send_attach (_session, engine);
-
-    //  Shut the connecter down.
-    terminate ();
-
-    _socket->event_connected (endpoint_pair, fd_);
-}
-
-void zmq::stream_connecter_base_t::timer_event (int id_)
-{
-    zmq_assert (id_ == reconnect_timer_id);
-    _reconnect_timer_started = false;
-    start_connecting ();
-}
diff --git a/libs/libzmq/src/stream_connecter_base.hpp b/libs/libzmq/src/stream_connecter_base.hpp
deleted file mode 100644
index 008c901..0000000
--- a/libs/libzmq/src/stream_connecter_base.hpp
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __STREAM_CONNECTER_BASE_HPP_INCLUDED__
-#define __STREAM_CONNECTER_BASE_HPP_INCLUDED__
-
-#include "fd.hpp"
-#include "own.hpp"
-#include "io_object.hpp"
-
-namespace zmq
-{
-class io_thread_t;
-class session_base_t;
-struct address_t;
-
-class stream_connecter_base_t : public own_t, public io_object_t
-{
-  public:
-    //  If 'delayed_start' is true connecter first waits for a while,
-    //  then starts connection process.
-    stream_connecter_base_t (zmq::io_thread_t *io_thread_,
-                             zmq::session_base_t *session_,
-                             const options_t &options_,
-                             address_t *addr_,
-                             bool delayed_start_);
-
-    ~stream_connecter_base_t () ZMQ_OVERRIDE;
-
-  protected:
-    //  Handlers for incoming commands.
-    void process_plug () ZMQ_FINAL;
-    void process_term (int linger_) ZMQ_OVERRIDE;
-
-    //  Handlers for I/O events.
-    void in_event () ZMQ_OVERRIDE;
-    void timer_event (int id_) ZMQ_OVERRIDE;
-
-    //  Internal function to create the engine after connection was established.
-    virtual void create_engine (fd_t fd, const std::string &local_address_);
-
-    //  Internal function to add a reconnect timer
-    void add_reconnect_timer ();
-
-    //  Removes the handle from the poller.
-    void rm_handle ();
-
-    //  Close the connecting socket.
-    void close ();
-
-    //  Address to connect to. Owned by session_base_t.
-    //  It is non-const since some parts may change during opening.
-    address_t *const _addr;
-
-    //  Underlying socket.
-    fd_t _s;
-
-    //  Handle corresponding to the listening socket, if file descriptor is
-    //  registered with the poller, or NULL.
-    handle_t _handle;
-
-    // String representation of endpoint to connect to
-    std::string _endpoint;
-
-    // Socket
-    zmq::socket_base_t *const _socket;
-
-  private:
-    //  ID of the timer used to delay the reconnection.
-    enum
-    {
-        reconnect_timer_id = 1
-    };
-
-    //  Internal function to return a reconnect backoff delay.
-    //  Will modify the current_reconnect_ivl used for next call
-    //  Returns the currently used interval
-    int get_new_reconnect_ivl ();
-
-    virtual void start_connecting () = 0;
-
-    //  If true, connecter is waiting a while before trying to connect.
-    const bool _delayed_start;
-
-    //  True iff a timer has been started.
-    bool _reconnect_timer_started;
-
-    //  Current reconnect ivl, updated for backoff strategy
-    int _current_reconnect_ivl;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (stream_connecter_base_t)
-
-  protected:
-    //  Reference to the session we belong to.
-    zmq::session_base_t *const _session;
-};
-}
-
-#endif
diff --git a/libs/libzmq/src/stream_engine_base.cpp b/libs/libzmq/src/stream_engine_base.cpp
deleted file mode 100644
index bb64e0d..0000000
--- a/libs/libzmq/src/stream_engine_base.cpp
+++ /dev/null
@@ -1,787 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "macros.hpp"
-
-#include <limits.h>
-#include <string.h>
-
-#ifndef ZMQ_HAVE_WINDOWS
-#include <unistd.h>
-#endif
-
-#include <new>
-#include <sstream>
-
-#include "stream_engine_base.hpp"
-#include "io_thread.hpp"
-#include "session_base.hpp"
-#include "v1_encoder.hpp"
-#include "v1_decoder.hpp"
-#include "v2_encoder.hpp"
-#include "v2_decoder.hpp"
-#include "null_mechanism.hpp"
-#include "plain_client.hpp"
-#include "plain_server.hpp"
-#include "gssapi_client.hpp"
-#include "gssapi_server.hpp"
-#include "curve_client.hpp"
-#include "curve_server.hpp"
-#include "raw_decoder.hpp"
-#include "raw_encoder.hpp"
-#include "config.hpp"
-#include "err.hpp"
-#include "ip.hpp"
-#include "tcp.hpp"
-#include "likely.hpp"
-#include "wire.hpp"
-
-static std::string get_peer_address (zmq::fd_t s_)
-{
-    std::string peer_address;
-
-    const int family = zmq::get_peer_ip_address (s_, peer_address);
-    if (family == 0)
-        peer_address.clear ();
-#if defined ZMQ_HAVE_SO_PEERCRED
-    else if (family == PF_UNIX) {
-        struct ucred cred;
-        socklen_t size = sizeof (cred);
-        if (!getsockopt (s_, SOL_SOCKET, SO_PEERCRED, &cred, &size)) {
-            std::ostringstream buf;
-            buf << ":" << cred.uid << ":" << cred.gid << ":" << cred.pid;
-            peer_address += buf.str ();
-        }
-    }
-#elif defined ZMQ_HAVE_LOCAL_PEERCRED
-    else if (family == PF_UNIX) {
-        struct xucred cred;
-        socklen_t size = sizeof (cred);
-        if (!getsockopt (s_, 0, LOCAL_PEERCRED, &cred, &size)
-            && cred.cr_version == XUCRED_VERSION) {
-            std::ostringstream buf;
-            buf << ":" << cred.cr_uid << ":";
-            if (cred.cr_ngroups > 0)
-                buf << cred.cr_groups[0];
-            buf << ":";
-            peer_address += buf.str ();
-        }
-    }
-#endif
-
-    return peer_address;
-}
-
-zmq::stream_engine_base_t::stream_engine_base_t (
-  fd_t fd_,
-  const options_t &options_,
-  const endpoint_uri_pair_t &endpoint_uri_pair_,
-  bool has_handshake_stage_) :
-    _options (options_),
-    _inpos (NULL),
-    _insize (0),
-    _decoder (NULL),
-    _outpos (NULL),
-    _outsize (0),
-    _encoder (NULL),
-    _mechanism (NULL),
-    _next_msg (NULL),
-    _process_msg (NULL),
-    _metadata (NULL),
-    _input_stopped (false),
-    _output_stopped (false),
-    _endpoint_uri_pair (endpoint_uri_pair_),
-    _has_handshake_timer (false),
-    _has_ttl_timer (false),
-    _has_timeout_timer (false),
-    _has_heartbeat_timer (false),
-    _peer_address (get_peer_address (fd_)),
-    _s (fd_),
-    _handle (static_cast<handle_t> (NULL)),
-    _plugged (false),
-    _handshaking (true),
-    _io_error (false),
-    _session (NULL),
-    _socket (NULL),
-    _has_handshake_stage (has_handshake_stage_)
-{
-    const int rc = _tx_msg.init ();
-    errno_assert (rc == 0);
-
-    //  Put the socket into non-blocking mode.
-    unblock_socket (_s);
-}
-
-zmq::stream_engine_base_t::~stream_engine_base_t ()
-{
-    zmq_assert (!_plugged);
-
-    if (_s != retired_fd) {
-#ifdef ZMQ_HAVE_WINDOWS
-        const int rc = closesocket (_s);
-        wsa_assert (rc != SOCKET_ERROR);
-#else
-        int rc = close (_s);
-#if defined(__FreeBSD_kernel__) || defined(__FreeBSD__)
-        // FreeBSD may return ECONNRESET on close() under load but this is not
-        // an error.
-        if (rc == -1 && errno == ECONNRESET)
-            rc = 0;
-#endif
-        errno_assert (rc == 0);
-#endif
-        _s = retired_fd;
-    }
-
-    const int rc = _tx_msg.close ();
-    errno_assert (rc == 0);
-
-    //  Drop reference to metadata and destroy it if we are
-    //  the only user.
-    if (_metadata != NULL) {
-        if (_metadata->drop_ref ()) {
-            LIBZMQ_DELETE (_metadata);
-        }
-    }
-
-    LIBZMQ_DELETE (_encoder);
-    LIBZMQ_DELETE (_decoder);
-    LIBZMQ_DELETE (_mechanism);
-}
-
-void zmq::stream_engine_base_t::plug (io_thread_t *io_thread_,
-                                      session_base_t *session_)
-{
-    zmq_assert (!_plugged);
-    _plugged = true;
-
-    //  Connect to session object.
-    zmq_assert (!_session);
-    zmq_assert (session_);
-    _session = session_;
-    _socket = _session->get_socket ();
-
-    //  Connect to I/O threads poller object.
-    io_object_t::plug (io_thread_);
-    _handle = add_fd (_s);
-    _io_error = false;
-
-    plug_internal ();
-}
-
-void zmq::stream_engine_base_t::unplug ()
-{
-    zmq_assert (_plugged);
-    _plugged = false;
-
-    //  Cancel all timers.
-    if (_has_handshake_timer) {
-        cancel_timer (handshake_timer_id);
-        _has_handshake_timer = false;
-    }
-
-    if (_has_ttl_timer) {
-        cancel_timer (heartbeat_ttl_timer_id);
-        _has_ttl_timer = false;
-    }
-
-    if (_has_timeout_timer) {
-        cancel_timer (heartbeat_timeout_timer_id);
-        _has_timeout_timer = false;
-    }
-
-    if (_has_heartbeat_timer) {
-        cancel_timer (heartbeat_ivl_timer_id);
-        _has_heartbeat_timer = false;
-    }
-    //  Cancel all fd subscriptions.
-    if (!_io_error)
-        rm_fd (_handle);
-
-    //  Disconnect from I/O threads poller object.
-    io_object_t::unplug ();
-
-    _session = NULL;
-}
-
-void zmq::stream_engine_base_t::terminate ()
-{
-    unplug ();
-    delete this;
-}
-
-void zmq::stream_engine_base_t::in_event ()
-{
-    // ignore errors
-    const bool res = in_event_internal ();
-    LIBZMQ_UNUSED (res);
-}
-
-bool zmq::stream_engine_base_t::in_event_internal ()
-{
-    zmq_assert (!_io_error);
-
-    //  If still handshaking, receive and process the greeting message.
-    if (unlikely (_handshaking)) {
-        if (handshake ()) {
-            //  Handshaking was successful.
-            //  Switch into the normal message flow.
-            _handshaking = false;
-
-            if (_mechanism == NULL && _has_handshake_stage)
-                _session->engine_ready ();
-        } else
-            return false;
-    }
-
-
-    zmq_assert (_decoder);
-
-    //  If there has been an I/O error, stop polling.
-    if (_input_stopped) {
-        rm_fd (_handle);
-        _io_error = true;
-        return true; // TODO or return false in this case too?
-    }
-
-    //  If there's no data to process in the buffer...
-    if (!_insize) {
-        //  Retrieve the buffer and read as much data as possible.
-        //  Note that buffer can be arbitrarily large. However, we assume
-        //  the underlying TCP layer has fixed buffer size and thus the
-        //  number of bytes read will be always limited.
-        size_t bufsize = 0;
-        _decoder->get_buffer (&_inpos, &bufsize);
-
-        const int rc = read (_inpos, bufsize);
-
-        if (rc == -1) {
-            if (errno != EAGAIN) {
-                error (connection_error);
-                return false;
-            }
-            return true;
-        }
-
-        //  Adjust input size
-        _insize = static_cast<size_t> (rc);
-        // Adjust buffer size to received bytes
-        _decoder->resize_buffer (_insize);
-    }
-
-    int rc = 0;
-    size_t processed = 0;
-
-    while (_insize > 0) {
-        rc = _decoder->decode (_inpos, _insize, processed);
-        zmq_assert (processed <= _insize);
-        _inpos += processed;
-        _insize -= processed;
-        if (rc == 0 || rc == -1)
-            break;
-        rc = (this->*_process_msg) (_decoder->msg ());
-        if (rc == -1)
-            break;
-    }
-
-    //  Tear down the connection if we have failed to decode input data
-    //  or the session has rejected the message.
-    if (rc == -1) {
-        if (errno != EAGAIN) {
-            error (protocol_error);
-            return false;
-        }
-        _input_stopped = true;
-        reset_pollin (_handle);
-    }
-
-    _session->flush ();
-    return true;
-}
-
-void zmq::stream_engine_base_t::out_event ()
-{
-    zmq_assert (!_io_error);
-
-    //  If write buffer is empty, try to read new data from the encoder.
-    if (!_outsize) {
-        //  Even when we stop polling as soon as there is no
-        //  data to send, the poller may invoke out_event one
-        //  more time due to 'speculative write' optimisation.
-        if (unlikely (_encoder == NULL)) {
-            zmq_assert (_handshaking);
-            return;
-        }
-
-        _outpos = NULL;
-        _outsize = _encoder->encode (&_outpos, 0);
-
-        while (_outsize < static_cast<size_t> (_options.out_batch_size)) {
-            if ((this->*_next_msg) (&_tx_msg) == -1) {
-                //  ws_engine can cause an engine error and delete it, so
-                //  bail out immediately to avoid use-after-free
-                if (errno == ECONNRESET)
-                    return;
-                else
-                    break;
-            }
-            _encoder->load_msg (&_tx_msg);
-            unsigned char *bufptr = _outpos + _outsize;
-            const size_t n =
-              _encoder->encode (&bufptr, _options.out_batch_size - _outsize);
-            zmq_assert (n > 0);
-            if (_outpos == NULL)
-                _outpos = bufptr;
-            _outsize += n;
-        }
-
-        //  If there is no data to send, stop polling for output.
-        if (_outsize == 0) {
-            _output_stopped = true;
-            reset_pollout ();
-            return;
-        }
-    }
-
-    //  If there are any data to write in write buffer, write as much as
-    //  possible to the socket. Note that amount of data to write can be
-    //  arbitrarily large. However, we assume that underlying TCP layer has
-    //  limited transmission buffer and thus the actual number of bytes
-    //  written should be reasonably modest.
-    const int nbytes = write (_outpos, _outsize);
-
-    //  IO error has occurred. We stop waiting for output events.
-    //  The engine is not terminated until we detect input error;
-    //  this is necessary to prevent losing incoming messages.
-    if (nbytes == -1) {
-        reset_pollout ();
-        return;
-    }
-
-    _outpos += nbytes;
-    _outsize -= nbytes;
-
-    //  If we are still handshaking and there are no data
-    //  to send, stop polling for output.
-    if (unlikely (_handshaking))
-        if (_outsize == 0)
-            reset_pollout ();
-}
-
-void zmq::stream_engine_base_t::restart_output ()
-{
-    if (unlikely (_io_error))
-        return;
-
-    if (likely (_output_stopped)) {
-        set_pollout ();
-        _output_stopped = false;
-    }
-
-    //  Speculative write: The assumption is that at the moment new message
-    //  was sent by the user the socket is probably available for writing.
-    //  Thus we try to write the data to socket avoiding polling for POLLOUT.
-    //  Consequently, the latency should be better in request/reply scenarios.
-    out_event ();
-}
-
-bool zmq::stream_engine_base_t::restart_input ()
-{
-    zmq_assert (_input_stopped);
-    zmq_assert (_session != NULL);
-    zmq_assert (_decoder != NULL);
-
-    int rc = (this->*_process_msg) (_decoder->msg ());
-    if (rc == -1) {
-        if (errno == EAGAIN)
-            _session->flush ();
-        else {
-            error (protocol_error);
-            return false;
-        }
-        return true;
-    }
-
-    while (_insize > 0) {
-        size_t processed = 0;
-        rc = _decoder->decode (_inpos, _insize, processed);
-        zmq_assert (processed <= _insize);
-        _inpos += processed;
-        _insize -= processed;
-        if (rc == 0 || rc == -1)
-            break;
-        rc = (this->*_process_msg) (_decoder->msg ());
-        if (rc == -1)
-            break;
-    }
-
-    if (rc == -1 && errno == EAGAIN)
-        _session->flush ();
-    else if (_io_error) {
-        error (connection_error);
-        return false;
-    } else if (rc == -1) {
-        error (protocol_error);
-        return false;
-    }
-
-    else {
-        _input_stopped = false;
-        set_pollin ();
-        _session->flush ();
-
-        //  Speculative read.
-        if (!in_event_internal ())
-            return false;
-    }
-
-    return true;
-}
-
-int zmq::stream_engine_base_t::next_handshake_command (msg_t *msg_)
-{
-    zmq_assert (_mechanism != NULL);
-
-    if (_mechanism->status () == mechanism_t::ready) {
-        mechanism_ready ();
-        return pull_and_encode (msg_);
-    }
-    if (_mechanism->status () == mechanism_t::error) {
-        errno = EPROTO;
-        return -1;
-    }
-    const int rc = _mechanism->next_handshake_command (msg_);
-
-    if (rc == 0)
-        msg_->set_flags (msg_t::command);
-
-    return rc;
-}
-
-int zmq::stream_engine_base_t::process_handshake_command (msg_t *msg_)
-{
-    zmq_assert (_mechanism != NULL);
-    const int rc = _mechanism->process_handshake_command (msg_);
-    if (rc == 0) {
-        if (_mechanism->status () == mechanism_t::ready)
-            mechanism_ready ();
-        else if (_mechanism->status () == mechanism_t::error) {
-            errno = EPROTO;
-            return -1;
-        }
-        if (_output_stopped)
-            restart_output ();
-    }
-
-    return rc;
-}
-
-void zmq::stream_engine_base_t::zap_msg_available ()
-{
-    zmq_assert (_mechanism != NULL);
-
-    const int rc = _mechanism->zap_msg_available ();
-    if (rc == -1) {
-        error (protocol_error);
-        return;
-    }
-    if (_input_stopped)
-        if (!restart_input ())
-            return;
-    if (_output_stopped)
-        restart_output ();
-}
-
-const zmq::endpoint_uri_pair_t &zmq::stream_engine_base_t::get_endpoint () const
-{
-    return _endpoint_uri_pair;
-}
-
-void zmq::stream_engine_base_t::mechanism_ready ()
-{
-    if (_options.heartbeat_interval > 0 && !_has_heartbeat_timer) {
-        add_timer (_options.heartbeat_interval, heartbeat_ivl_timer_id);
-        _has_heartbeat_timer = true;
-    }
-
-    if (_has_handshake_stage)
-        _session->engine_ready ();
-
-    bool flush_session = false;
-
-    if (_options.recv_routing_id) {
-        msg_t routing_id;
-        _mechanism->peer_routing_id (&routing_id);
-        const int rc = _session->push_msg (&routing_id);
-        if (rc == -1 && errno == EAGAIN) {
-            // If the write is failing at this stage with
-            // an EAGAIN the pipe must be being shut down,
-            // so we can just bail out of the routing id set.
-            return;
-        }
-        errno_assert (rc == 0);
-        flush_session = true;
-    }
-
-    if (_options.router_notify & ZMQ_NOTIFY_CONNECT) {
-        msg_t connect_notification;
-        connect_notification.init ();
-        const int rc = _session->push_msg (&connect_notification);
-        if (rc == -1 && errno == EAGAIN) {
-            // If the write is failing at this stage with
-            // an EAGAIN the pipe must be being shut down,
-            // so we can just bail out of the notification.
-            return;
-        }
-        errno_assert (rc == 0);
-        flush_session = true;
-    }
-
-    if (flush_session)
-        _session->flush ();
-
-    _next_msg = &stream_engine_base_t::pull_and_encode;
-    _process_msg = &stream_engine_base_t::write_credential;
-
-    //  Compile metadata.
-    properties_t properties;
-    init_properties (properties);
-
-    //  Add ZAP properties.
-    const properties_t &zap_properties = _mechanism->get_zap_properties ();
-    properties.insert (zap_properties.begin (), zap_properties.end ());
-
-    //  Add ZMTP properties.
-    const properties_t &zmtp_properties = _mechanism->get_zmtp_properties ();
-    properties.insert (zmtp_properties.begin (), zmtp_properties.end ());
-
-    zmq_assert (_metadata == NULL);
-    if (!properties.empty ()) {
-        _metadata = new (std::nothrow) metadata_t (properties);
-        alloc_assert (_metadata);
-    }
-
-    if (_has_handshake_timer) {
-        cancel_timer (handshake_timer_id);
-        _has_handshake_timer = false;
-    }
-
-    _socket->event_handshake_succeeded (_endpoint_uri_pair, 0);
-}
-
-int zmq::stream_engine_base_t::write_credential (msg_t *msg_)
-{
-    zmq_assert (_mechanism != NULL);
-    zmq_assert (_session != NULL);
-
-    const blob_t &credential = _mechanism->get_user_id ();
-    if (credential.size () > 0) {
-        msg_t msg;
-        int rc = msg.init_size (credential.size ());
-        zmq_assert (rc == 0);
-        memcpy (msg.data (), credential.data (), credential.size ());
-        msg.set_flags (msg_t::credential);
-        rc = _session->push_msg (&msg);
-        if (rc == -1) {
-            rc = msg.close ();
-            errno_assert (rc == 0);
-            return -1;
-        }
-    }
-    _process_msg = &stream_engine_base_t::decode_and_push;
-    return decode_and_push (msg_);
-}
-
-int zmq::stream_engine_base_t::pull_and_encode (msg_t *msg_)
-{
-    zmq_assert (_mechanism != NULL);
-
-    if (_session->pull_msg (msg_) == -1)
-        return -1;
-    if (_mechanism->encode (msg_) == -1)
-        return -1;
-    return 0;
-}
-
-int zmq::stream_engine_base_t::decode_and_push (msg_t *msg_)
-{
-    zmq_assert (_mechanism != NULL);
-
-    if (_mechanism->decode (msg_) == -1)
-        return -1;
-
-    if (_has_timeout_timer) {
-        _has_timeout_timer = false;
-        cancel_timer (heartbeat_timeout_timer_id);
-    }
-
-    if (_has_ttl_timer) {
-        _has_ttl_timer = false;
-        cancel_timer (heartbeat_ttl_timer_id);
-    }
-
-    if (msg_->flags () & msg_t::command) {
-        process_command_message (msg_);
-    }
-
-    if (_metadata)
-        msg_->set_metadata (_metadata);
-    if (_session->push_msg (msg_) == -1) {
-        if (errno == EAGAIN)
-            _process_msg = &stream_engine_base_t::push_one_then_decode_and_push;
-        return -1;
-    }
-    return 0;
-}
-
-int zmq::stream_engine_base_t::push_one_then_decode_and_push (msg_t *msg_)
-{
-    const int rc = _session->push_msg (msg_);
-    if (rc == 0)
-        _process_msg = &stream_engine_base_t::decode_and_push;
-    return rc;
-}
-
-int zmq::stream_engine_base_t::pull_msg_from_session (msg_t *msg_)
-{
-    return _session->pull_msg (msg_);
-}
-
-int zmq::stream_engine_base_t::push_msg_to_session (msg_t *msg_)
-{
-    return _session->push_msg (msg_);
-}
-
-void zmq::stream_engine_base_t::error (error_reason_t reason_)
-{
-    zmq_assert (_session);
-
-    if ((_options.router_notify & ZMQ_NOTIFY_DISCONNECT) && !_handshaking) {
-        // For router sockets with disconnect notification, rollback
-        // any incomplete message in the pipe, and push the disconnect
-        // notification message.
-        _session->rollback ();
-
-        msg_t disconnect_notification;
-        disconnect_notification.init ();
-        _session->push_msg (&disconnect_notification);
-    }
-
-    // protocol errors have been signaled already at the point where they occurred
-    if (reason_ != protocol_error
-        && (_mechanism == NULL
-            || _mechanism->status () == mechanism_t::handshaking)) {
-        const int err = errno;
-        _socket->event_handshake_failed_no_detail (_endpoint_uri_pair, err);
-        // special case: connecting to non-ZMTP process which immediately drops connection,
-        // or which never responds with greeting, should be treated as a protocol error
-        // (i.e. stop reconnect)
-        if (((reason_ == connection_error) || (reason_ == timeout_error))
-            && (_options.reconnect_stop
-                & ZMQ_RECONNECT_STOP_HANDSHAKE_FAILED)) {
-            reason_ = protocol_error;
-        }
-    }
-
-    _socket->event_disconnected (_endpoint_uri_pair, _s);
-    _session->flush ();
-    _session->engine_error (
-      !_handshaking
-        && (_mechanism == NULL
-            || _mechanism->status () != mechanism_t::handshaking),
-      reason_);
-    unplug ();
-    delete this;
-}
-
-void zmq::stream_engine_base_t::set_handshake_timer ()
-{
-    zmq_assert (!_has_handshake_timer);
-
-    if (_options.handshake_ivl > 0) {
-        add_timer (_options.handshake_ivl, handshake_timer_id);
-        _has_handshake_timer = true;
-    }
-}
-
-bool zmq::stream_engine_base_t::init_properties (properties_t &properties_)
-{
-    if (_peer_address.empty ())
-        return false;
-    properties_.ZMQ_MAP_INSERT_OR_EMPLACE (
-      std::string (ZMQ_MSG_PROPERTY_PEER_ADDRESS), _peer_address);
-
-    //  Private property to support deprecated SRCFD
-    std::ostringstream stream;
-    stream << static_cast<int> (_s);
-    std::string fd_string = stream.str ();
-    properties_.ZMQ_MAP_INSERT_OR_EMPLACE (std::string ("__fd"),
-                                           ZMQ_MOVE (fd_string));
-    return true;
-}
-
-void zmq::stream_engine_base_t::timer_event (int id_)
-{
-    if (id_ == handshake_timer_id) {
-        _has_handshake_timer = false;
-        //  handshake timer expired before handshake completed, so engine fail
-        error (timeout_error);
-    } else if (id_ == heartbeat_ivl_timer_id) {
-        _next_msg = &stream_engine_base_t::produce_ping_message;
-        out_event ();
-        add_timer (_options.heartbeat_interval, heartbeat_ivl_timer_id);
-    } else if (id_ == heartbeat_ttl_timer_id) {
-        _has_ttl_timer = false;
-        error (timeout_error);
-    } else if (id_ == heartbeat_timeout_timer_id) {
-        _has_timeout_timer = false;
-        error (timeout_error);
-    } else
-        // There are no other valid timer ids!
-        assert (false);
-}
-
-int zmq::stream_engine_base_t::read (void *data_, size_t size_)
-{
-    const int rc = zmq::tcp_read (_s, data_, size_);
-
-    if (rc == 0) {
-        // connection closed by peer
-        errno = EPIPE;
-        return -1;
-    }
-
-    return rc;
-}
-
-int zmq::stream_engine_base_t::write (const void *data_, size_t size_)
-{
-    return zmq::tcp_write (_s, data_, size_);
-}
diff --git a/libs/libzmq/src/stream_engine_base.hpp b/libs/libzmq/src/stream_engine_base.hpp
deleted file mode 100644
index 05bcc65..0000000
--- a/libs/libzmq/src/stream_engine_base.hpp
+++ /dev/null
@@ -1,221 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_STREAM_ENGINE_BASE_HPP_INCLUDED__
-#define __ZMQ_STREAM_ENGINE_BASE_HPP_INCLUDED__
-
-#include <stddef.h>
-
-#include "fd.hpp"
-#include "i_engine.hpp"
-#include "io_object.hpp"
-#include "i_encoder.hpp"
-#include "i_decoder.hpp"
-#include "options.hpp"
-#include "socket_base.hpp"
-#include "metadata.hpp"
-#include "msg.hpp"
-#include "tcp.hpp"
-
-namespace zmq
-{
-class io_thread_t;
-class session_base_t;
-class mechanism_t;
-
-//  This engine handles any socket with SOCK_STREAM semantics,
-//  e.g. TCP socket or an UNIX domain socket.
-
-class stream_engine_base_t : public io_object_t, public i_engine
-{
-  public:
-    stream_engine_base_t (fd_t fd_,
-                          const options_t &options_,
-                          const endpoint_uri_pair_t &endpoint_uri_pair_,
-                          bool has_handshake_stage_);
-    ~stream_engine_base_t () ZMQ_OVERRIDE;
-
-    //  i_engine interface implementation.
-    bool has_handshake_stage () ZMQ_FINAL { return _has_handshake_stage; };
-    void plug (zmq::io_thread_t *io_thread_,
-               zmq::session_base_t *session_) ZMQ_FINAL;
-    void terminate () ZMQ_FINAL;
-    bool restart_input () ZMQ_FINAL;
-    void restart_output () ZMQ_FINAL;
-    void zap_msg_available () ZMQ_FINAL;
-    const endpoint_uri_pair_t &get_endpoint () const ZMQ_FINAL;
-
-    //  i_poll_events interface implementation.
-    void in_event () ZMQ_FINAL;
-    void out_event () ZMQ_OVERRIDE;
-    void timer_event (int id_) ZMQ_FINAL;
-
-  protected:
-    typedef metadata_t::dict_t properties_t;
-    bool init_properties (properties_t &properties_);
-
-    //  Function to handle network disconnections.
-    virtual void error (error_reason_t reason_);
-
-    int next_handshake_command (msg_t *msg_);
-    int process_handshake_command (msg_t *msg_);
-
-    int pull_msg_from_session (msg_t *msg_);
-    int push_msg_to_session (msg_t *msg_);
-
-    int pull_and_encode (msg_t *msg_);
-    virtual int decode_and_push (msg_t *msg_);
-    int push_one_then_decode_and_push (msg_t *msg_);
-
-    void set_handshake_timer ();
-
-    virtual bool handshake () { return true; };
-    virtual void plug_internal (){};
-
-    virtual int process_command_message (msg_t *msg_)
-    {
-        LIBZMQ_UNUSED (msg_);
-        return -1;
-    };
-    virtual int produce_ping_message (msg_t *msg_)
-    {
-        LIBZMQ_UNUSED (msg_);
-        return -1;
-    };
-    virtual int process_heartbeat_message (msg_t *msg_)
-    {
-        LIBZMQ_UNUSED (msg_);
-        return -1;
-    };
-    virtual int produce_pong_message (msg_t *msg_)
-    {
-        LIBZMQ_UNUSED (msg_);
-        return -1;
-    };
-
-    virtual int read (void *data, size_t size_);
-    virtual int write (const void *data_, size_t size_);
-
-    void reset_pollout () { io_object_t::reset_pollout (_handle); }
-    void set_pollout () { io_object_t::set_pollout (_handle); }
-    void set_pollin () { io_object_t::set_pollin (_handle); }
-    session_base_t *session () { return _session; }
-    socket_base_t *socket () { return _socket; }
-
-    const options_t _options;
-
-    unsigned char *_inpos;
-    size_t _insize;
-    i_decoder *_decoder;
-
-    unsigned char *_outpos;
-    size_t _outsize;
-    i_encoder *_encoder;
-
-    mechanism_t *_mechanism;
-
-    int (stream_engine_base_t::*_next_msg) (msg_t *msg_);
-    int (stream_engine_base_t::*_process_msg) (msg_t *msg_);
-
-    //  Metadata to be attached to received messages. May be NULL.
-    metadata_t *_metadata;
-
-    //  True iff the engine couldn't consume the last decoded message.
-    bool _input_stopped;
-
-    //  True iff the engine doesn't have any message to encode.
-    bool _output_stopped;
-
-    //  Representation of the connected endpoints.
-    const endpoint_uri_pair_t _endpoint_uri_pair;
-
-    //  ID of the handshake timer
-    enum
-    {
-        handshake_timer_id = 0x40
-    };
-
-    //  True is linger timer is running.
-    bool _has_handshake_timer;
-
-    //  Heartbeat stuff
-    enum
-    {
-        heartbeat_ivl_timer_id = 0x80,
-        heartbeat_timeout_timer_id = 0x81,
-        heartbeat_ttl_timer_id = 0x82
-    };
-    bool _has_ttl_timer;
-    bool _has_timeout_timer;
-    bool _has_heartbeat_timer;
-
-
-    const std::string _peer_address;
-
-  private:
-    bool in_event_internal ();
-
-    //  Unplug the engine from the session.
-    void unplug ();
-
-    int write_credential (msg_t *msg_);
-
-    void mechanism_ready ();
-
-    //  Underlying socket.
-    fd_t _s;
-
-    handle_t _handle;
-
-    bool _plugged;
-
-    //  When true, we are still trying to determine whether
-    //  the peer is using versioned protocol, and if so, which
-    //  version.  When false, normal message flow has started.
-    bool _handshaking;
-
-    msg_t _tx_msg;
-
-    bool _io_error;
-
-    //  The session this engine is attached to.
-    zmq::session_base_t *_session;
-
-    //  Socket
-    zmq::socket_base_t *_socket;
-
-    //  Indicate if engine has an handshake stage, if it does, engine must call session.engine_ready
-    //  when handshake is completed.
-    bool _has_handshake_stage;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (stream_engine_base_t)
-};
-}
-
-#endif
diff --git a/libs/libzmq/src/stream_listener_base.cpp b/libs/libzmq/src/stream_listener_base.cpp
deleted file mode 100644
index ecd21be..0000000
--- a/libs/libzmq/src/stream_listener_base.cpp
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "stream_listener_base.hpp"
-#include "session_base.hpp"
-#include "socket_base.hpp"
-#include "zmtp_engine.hpp"
-#include "raw_engine.hpp"
-
-#ifndef ZMQ_HAVE_WINDOWS
-#include <unistd.h>
-#else
-#include <winsock2.h>
-#endif
-
-zmq::stream_listener_base_t::stream_listener_base_t (
-  zmq::io_thread_t *io_thread_,
-  zmq::socket_base_t *socket_,
-  const zmq::options_t &options_) :
-    own_t (io_thread_, options_),
-    io_object_t (io_thread_),
-    _s (retired_fd),
-    _handle (static_cast<handle_t> (NULL)),
-    _socket (socket_)
-{
-}
-
-zmq::stream_listener_base_t::~stream_listener_base_t ()
-{
-    zmq_assert (_s == retired_fd);
-    zmq_assert (!_handle);
-}
-
-int zmq::stream_listener_base_t::get_local_address (std::string &addr_) const
-{
-    addr_ = get_socket_name (_s, socket_end_local);
-    return addr_.empty () ? -1 : 0;
-}
-
-void zmq::stream_listener_base_t::process_plug ()
-{
-    //  Start polling for incoming connections.
-    _handle = add_fd (_s);
-    set_pollin (_handle);
-}
-
-void zmq::stream_listener_base_t::process_term (int linger_)
-{
-    rm_fd (_handle);
-    _handle = static_cast<handle_t> (NULL);
-    close ();
-    own_t::process_term (linger_);
-}
-
-int zmq::stream_listener_base_t::close ()
-{
-    // TODO this is identical to stream_connector_base_t::close
-
-    zmq_assert (_s != retired_fd);
-#ifdef ZMQ_HAVE_WINDOWS
-    const int rc = closesocket (_s);
-    wsa_assert (rc != SOCKET_ERROR);
-#else
-    const int rc = ::close (_s);
-    errno_assert (rc == 0);
-#endif
-    _socket->event_closed (make_unconnected_bind_endpoint_pair (_endpoint), _s);
-    _s = retired_fd;
-
-    return 0;
-}
-
-void zmq::stream_listener_base_t::create_engine (fd_t fd_)
-{
-    const endpoint_uri_pair_t endpoint_pair (
-      get_socket_name (fd_, socket_end_local),
-      get_socket_name (fd_, socket_end_remote), endpoint_type_bind);
-
-    i_engine *engine;
-    if (options.raw_socket)
-        engine = new (std::nothrow) raw_engine_t (fd_, options, endpoint_pair);
-    else
-        engine = new (std::nothrow) zmtp_engine_t (fd_, options, endpoint_pair);
-    alloc_assert (engine);
-
-    //  Choose I/O thread to run connecter in. Given that we are already
-    //  running in an I/O thread, there must be at least one available.
-    io_thread_t *io_thread = choose_io_thread (options.affinity);
-    zmq_assert (io_thread);
-
-    //  Create and launch a session object.
-    session_base_t *session =
-      session_base_t::create (io_thread, false, _socket, options, NULL);
-    errno_assert (session);
-    session->inc_seqnum ();
-    launch_child (session);
-    send_attach (session, engine, false);
-
-    _socket->event_accepted (endpoint_pair, fd_);
-}
diff --git a/libs/libzmq/src/stream_listener_base.hpp b/libs/libzmq/src/stream_listener_base.hpp
deleted file mode 100644
index 7158254..0000000
--- a/libs/libzmq/src/stream_listener_base.hpp
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_STREAM_LISTENER_BASE_HPP_INCLUDED__
-#define __ZMQ_STREAM_LISTENER_BASE_HPP_INCLUDED__
-
-#include <string>
-
-#include "fd.hpp"
-#include "own.hpp"
-#include "stdint.hpp"
-#include "io_object.hpp"
-#include "address.hpp"
-
-namespace zmq
-{
-class io_thread_t;
-class socket_base_t;
-
-class stream_listener_base_t : public own_t, public io_object_t
-{
-  public:
-    stream_listener_base_t (zmq::io_thread_t *io_thread_,
-                            zmq::socket_base_t *socket_,
-                            const options_t &options_);
-    ~stream_listener_base_t () ZMQ_OVERRIDE;
-
-    // Get the bound address for use with wildcards
-    int get_local_address (std::string &addr_) const;
-
-  protected:
-    virtual std::string get_socket_name (fd_t fd_,
-                                         socket_end_t socket_end_) const = 0;
-
-  private:
-    //  Handlers for incoming commands.
-    void process_plug () ZMQ_FINAL;
-    void process_term (int linger_) ZMQ_FINAL;
-
-  protected:
-    //  Close the listening socket.
-    virtual int close ();
-
-    virtual void create_engine (fd_t fd);
-
-    //  Underlying socket.
-    fd_t _s;
-
-    //  Handle corresponding to the listening socket.
-    handle_t _handle;
-
-    //  Socket the listener belongs to.
-    zmq::socket_base_t *_socket;
-
-    // String representation of endpoint to bind to
-    std::string _endpoint;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (stream_listener_base_t)
-};
-}
-
-#endif
diff --git a/libs/libzmq/src/sub.cpp b/libs/libzmq/src/sub.cpp
deleted file mode 100644
index 7240054..0000000
--- a/libs/libzmq/src/sub.cpp
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "sub.hpp"
-#include "msg.hpp"
-
-zmq::sub_t::sub_t (class ctx_t *parent_, uint32_t tid_, int sid_) :
-    xsub_t (parent_, tid_, sid_)
-{
-    options.type = ZMQ_SUB;
-
-    //  Switch filtering messages on (as opposed to XSUB which where the
-    //  filtering is off).
-    options.filter = true;
-}
-
-zmq::sub_t::~sub_t ()
-{
-}
-
-int zmq::sub_t::xsetsockopt (int option_,
-                             const void *optval_,
-                             size_t optvallen_)
-{
-    if (option_ != ZMQ_SUBSCRIBE && option_ != ZMQ_UNSUBSCRIBE) {
-        errno = EINVAL;
-        return -1;
-    }
-
-    //  Create the subscription message.
-    msg_t msg;
-    int rc;
-    const unsigned char *data = static_cast<const unsigned char *> (optval_);
-    if (option_ == ZMQ_SUBSCRIBE) {
-        rc = msg.init_subscribe (optvallen_, data);
-    } else {
-        rc = msg.init_cancel (optvallen_, data);
-    }
-    errno_assert (rc == 0);
-
-    //  Pass it further on in the stack.
-    rc = xsub_t::xsend (&msg);
-    return close_and_return (&msg, rc);
-}
-
-int zmq::sub_t::xsend (msg_t *)
-{
-    //  Override the XSUB's send.
-    errno = ENOTSUP;
-    return -1;
-}
-
-bool zmq::sub_t::xhas_out ()
-{
-    //  Override the XSUB's send.
-    return false;
-}
diff --git a/libs/libzmq/src/sub.hpp b/libs/libzmq/src/sub.hpp
deleted file mode 100644
index ee519c8..0000000
--- a/libs/libzmq/src/sub.hpp
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_SUB_HPP_INCLUDED__
-#define __ZMQ_SUB_HPP_INCLUDED__
-
-#include "xsub.hpp"
-
-namespace zmq
-{
-class ctx_t;
-class msg_t;
-class io_thread_t;
-class socket_base_t;
-
-class sub_t ZMQ_FINAL : public xsub_t
-{
-  public:
-    sub_t (zmq::ctx_t *parent_, uint32_t tid_, int sid_);
-    ~sub_t ();
-
-  protected:
-    int xsetsockopt (int option_, const void *optval_, size_t optvallen_);
-    int xsend (zmq::msg_t *msg_);
-    bool xhas_out ();
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (sub_t)
-};
-}
-
-#endif
diff --git a/libs/libzmq/src/tcp.cpp b/libs/libzmq/src/tcp.cpp
deleted file mode 100644
index e75c482..0000000
--- a/libs/libzmq/src/tcp.cpp
+++ /dev/null
@@ -1,430 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "macros.hpp"
-#include "ip.hpp"
-#include "tcp.hpp"
-#include "err.hpp"
-#include "options.hpp"
-
-#if !defined ZMQ_HAVE_WINDOWS
-#include <fcntl.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netinet/tcp.h>
-#include <unistd.h>
-#ifdef ZMQ_HAVE_VXWORKS
-#include <sockLib.h>
-#endif
-#endif
-
-#if defined ZMQ_HAVE_OPENVMS
-#include <ioctl.h>
-#endif
-
-#ifdef __APPLE__
-#include <TargetConditionals.h>
-#endif
-
-int zmq::tune_tcp_socket (fd_t s_)
-{
-    //  Disable Nagle's algorithm. We are doing data batching on 0MQ level,
-    //  so using Nagle wouldn't improve throughput in anyway, but it would
-    //  hurt latency.
-    int nodelay = 1;
-    const int rc =
-      setsockopt (s_, IPPROTO_TCP, TCP_NODELAY,
-                  reinterpret_cast<char *> (&nodelay), sizeof (int));
-    assert_success_or_recoverable (s_, rc);
-    if (rc != 0)
-        return rc;
-
-#ifdef ZMQ_HAVE_OPENVMS
-    //  Disable delayed acknowledgements as they hurt latency significantly.
-    int nodelack = 1;
-    rc = setsockopt (s_, IPPROTO_TCP, TCP_NODELACK, (char *) &nodelack,
-                     sizeof (int));
-    assert_success_or_recoverable (s_, rc);
-#endif
-    return rc;
-}
-
-int zmq::set_tcp_send_buffer (fd_t sockfd_, int bufsize_)
-{
-    const int rc =
-      setsockopt (sockfd_, SOL_SOCKET, SO_SNDBUF,
-                  reinterpret_cast<char *> (&bufsize_), sizeof bufsize_);
-    assert_success_or_recoverable (sockfd_, rc);
-    return rc;
-}
-
-int zmq::set_tcp_receive_buffer (fd_t sockfd_, int bufsize_)
-{
-    const int rc =
-      setsockopt (sockfd_, SOL_SOCKET, SO_RCVBUF,
-                  reinterpret_cast<char *> (&bufsize_), sizeof bufsize_);
-    assert_success_or_recoverable (sockfd_, rc);
-    return rc;
-}
-
-int zmq::tune_tcp_keepalives (fd_t s_,
-                              int keepalive_,
-                              int keepalive_cnt_,
-                              int keepalive_idle_,
-                              int keepalive_intvl_)
-{
-    // These options are used only under certain #ifdefs below.
-    LIBZMQ_UNUSED (keepalive_);
-    LIBZMQ_UNUSED (keepalive_cnt_);
-    LIBZMQ_UNUSED (keepalive_idle_);
-    LIBZMQ_UNUSED (keepalive_intvl_);
-
-    // If none of the #ifdefs apply, then s_ is unused.
-    LIBZMQ_UNUSED (s_);
-
-    //  Tuning TCP keep-alives if platform allows it
-    //  All values = -1 means skip and leave it for OS
-#ifdef ZMQ_HAVE_WINDOWS
-    if (keepalive_ != -1) {
-        tcp_keepalive keepalive_opts;
-        keepalive_opts.onoff = keepalive_;
-        keepalive_opts.keepalivetime =
-          keepalive_idle_ != -1 ? keepalive_idle_ * 1000 : 7200000;
-        keepalive_opts.keepaliveinterval =
-          keepalive_intvl_ != -1 ? keepalive_intvl_ * 1000 : 1000;
-        DWORD num_bytes_returned;
-        const int rc = WSAIoctl (s_, SIO_KEEPALIVE_VALS, &keepalive_opts,
-                                 sizeof (keepalive_opts), NULL, 0,
-                                 &num_bytes_returned, NULL, NULL);
-        assert_success_or_recoverable (s_, rc);
-        if (rc == SOCKET_ERROR)
-            return rc;
-    }
-#else
-#ifdef ZMQ_HAVE_SO_KEEPALIVE
-    if (keepalive_ != -1) {
-        int rc =
-          setsockopt (s_, SOL_SOCKET, SO_KEEPALIVE,
-                      reinterpret_cast<char *> (&keepalive_), sizeof (int));
-        assert_success_or_recoverable (s_, rc);
-        if (rc != 0)
-            return rc;
-
-#ifdef ZMQ_HAVE_TCP_KEEPCNT
-        if (keepalive_cnt_ != -1) {
-            int rc = setsockopt (s_, IPPROTO_TCP, TCP_KEEPCNT, &keepalive_cnt_,
-                                 sizeof (int));
-            assert_success_or_recoverable (s_, rc);
-            if (rc != 0)
-                return rc;
-        }
-#endif // ZMQ_HAVE_TCP_KEEPCNT
-
-#ifdef ZMQ_HAVE_TCP_KEEPIDLE
-        if (keepalive_idle_ != -1) {
-            int rc = setsockopt (s_, IPPROTO_TCP, TCP_KEEPIDLE,
-                                 &keepalive_idle_, sizeof (int));
-            assert_success_or_recoverable (s_, rc);
-            if (rc != 0)
-                return rc;
-        }
-#else // ZMQ_HAVE_TCP_KEEPIDLE
-#ifdef ZMQ_HAVE_TCP_KEEPALIVE
-        if (keepalive_idle_ != -1) {
-            int rc = setsockopt (s_, IPPROTO_TCP, TCP_KEEPALIVE,
-                                 &keepalive_idle_, sizeof (int));
-            assert_success_or_recoverable (s_, rc);
-            if (rc != 0)
-                return rc;
-        }
-#endif // ZMQ_HAVE_TCP_KEEPALIVE
-#endif // ZMQ_HAVE_TCP_KEEPIDLE
-
-#ifdef ZMQ_HAVE_TCP_KEEPINTVL
-        if (keepalive_intvl_ != -1) {
-            int rc = setsockopt (s_, IPPROTO_TCP, TCP_KEEPINTVL,
-                                 &keepalive_intvl_, sizeof (int));
-            assert_success_or_recoverable (s_, rc);
-            if (rc != 0)
-                return rc;
-        }
-#endif // ZMQ_HAVE_TCP_KEEPINTVL
-    }
-#endif // ZMQ_HAVE_SO_KEEPALIVE
-#endif // ZMQ_HAVE_WINDOWS
-
-    return 0;
-}
-
-int zmq::tune_tcp_maxrt (fd_t sockfd_, int timeout_)
-{
-    if (timeout_ <= 0)
-        return 0;
-
-    LIBZMQ_UNUSED (sockfd_);
-
-#if defined(ZMQ_HAVE_WINDOWS) && defined(TCP_MAXRT)
-    // msdn says it's supported in >= Vista, >= Windows Server 2003
-    timeout_ /= 1000; // in seconds
-    const int rc =
-      setsockopt (sockfd_, IPPROTO_TCP, TCP_MAXRT,
-                  reinterpret_cast<char *> (&timeout_), sizeof (timeout_));
-    assert_success_or_recoverable (sockfd_, rc);
-    return rc;
-// FIXME: should be ZMQ_HAVE_TCP_USER_TIMEOUT
-#elif defined(TCP_USER_TIMEOUT)
-    int rc = setsockopt (sockfd_, IPPROTO_TCP, TCP_USER_TIMEOUT, &timeout_,
-                         sizeof (timeout_));
-    assert_success_or_recoverable (sockfd_, rc);
-    return rc;
-#else
-    return 0;
-#endif
-}
-
-int zmq::tcp_write (fd_t s_, const void *data_, size_t size_)
-{
-#ifdef ZMQ_HAVE_WINDOWS
-
-    const int nbytes = send (s_, (char *) data_, static_cast<int> (size_), 0);
-
-    //  If not a single byte can be written to the socket in non-blocking mode
-    //  we'll get an error (this may happen during the speculative write).
-    const int last_error = WSAGetLastError ();
-    if (nbytes == SOCKET_ERROR && last_error == WSAEWOULDBLOCK)
-        return 0;
-
-    //  Signalise peer failure.
-    if (nbytes == SOCKET_ERROR
-        && (last_error == WSAENETDOWN || last_error == WSAENETRESET
-            || last_error == WSAEHOSTUNREACH || last_error == WSAECONNABORTED
-            || last_error == WSAETIMEDOUT || last_error == WSAECONNRESET))
-        return -1;
-
-    //  Circumvent a Windows bug:
-    //  See https://support.microsoft.com/en-us/kb/201213
-    //  See https://zeromq.jira.com/browse/LIBZMQ-195
-    if (nbytes == SOCKET_ERROR && last_error == WSAENOBUFS)
-        return 0;
-
-    wsa_assert (nbytes != SOCKET_ERROR);
-    return nbytes;
-
-#else
-    ssize_t nbytes = send (s_, static_cast<const char *> (data_), size_, 0);
-
-    //  Several errors are OK. When speculative write is being done we may not
-    //  be able to write a single byte from the socket. Also, SIGSTOP issued
-    //  by a debugging tool can result in EINTR error.
-    if (nbytes == -1
-        && (errno == EAGAIN || errno == EWOULDBLOCK || errno == EINTR))
-        return 0;
-
-    //  Signalise peer failure.
-    if (nbytes == -1) {
-#if !defined(TARGET_OS_IPHONE) || !TARGET_OS_IPHONE
-        errno_assert (errno != EACCES && errno != EBADF && errno != EDESTADDRREQ
-                      && errno != EFAULT && errno != EISCONN
-                      && errno != EMSGSIZE && errno != ENOMEM
-                      && errno != ENOTSOCK && errno != EOPNOTSUPP);
-#else
-        errno_assert (errno != EACCES && errno != EDESTADDRREQ
-                      && errno != EFAULT && errno != EISCONN
-                      && errno != EMSGSIZE && errno != ENOMEM
-                      && errno != ENOTSOCK && errno != EOPNOTSUPP);
-#endif
-        return -1;
-    }
-
-    return static_cast<int> (nbytes);
-
-#endif
-}
-
-int zmq::tcp_read (fd_t s_, void *data_, size_t size_)
-{
-#ifdef ZMQ_HAVE_WINDOWS
-
-    const int rc =
-      recv (s_, static_cast<char *> (data_), static_cast<int> (size_), 0);
-
-    //  If not a single byte can be read from the socket in non-blocking mode
-    //  we'll get an error (this may happen during the speculative read).
-    if (rc == SOCKET_ERROR) {
-        const int last_error = WSAGetLastError ();
-        if (last_error == WSAEWOULDBLOCK) {
-            errno = EAGAIN;
-        } else {
-            wsa_assert (
-              last_error == WSAENETDOWN || last_error == WSAENETRESET
-              || last_error == WSAECONNABORTED || last_error == WSAETIMEDOUT
-              || last_error == WSAECONNRESET || last_error == WSAECONNREFUSED
-              || last_error == WSAENOTCONN || last_error == WSAENOBUFS);
-            errno = wsa_error_to_errno (last_error);
-        }
-    }
-
-    return rc == SOCKET_ERROR ? -1 : rc;
-
-#else
-
-    const ssize_t rc = recv (s_, static_cast<char *> (data_), size_, 0);
-
-    //  Several errors are OK. When speculative read is being done we may not
-    //  be able to read a single byte from the socket. Also, SIGSTOP issued
-    //  by a debugging tool can result in EINTR error.
-    if (rc == -1) {
-#if !defined(TARGET_OS_IPHONE) || !TARGET_OS_IPHONE
-        errno_assert (errno != EBADF && errno != EFAULT && errno != ENOMEM
-                      && errno != ENOTSOCK);
-#else
-        errno_assert (errno != EFAULT && errno != ENOMEM && errno != ENOTSOCK);
-#endif
-        if (errno == EWOULDBLOCK || errno == EINTR)
-            errno = EAGAIN;
-    }
-
-    return static_cast<int> (rc);
-
-#endif
-}
-
-void zmq::tcp_tune_loopback_fast_path (const fd_t socket_)
-{
-#if defined ZMQ_HAVE_WINDOWS && defined SIO_LOOPBACK_FAST_PATH
-    int sio_loopback_fastpath = 1;
-    DWORD number_of_bytes_returned = 0;
-
-    const int rc = WSAIoctl (
-      socket_, SIO_LOOPBACK_FAST_PATH, &sio_loopback_fastpath,
-      sizeof sio_loopback_fastpath, NULL, 0, &number_of_bytes_returned, 0, 0);
-
-    if (SOCKET_ERROR == rc) {
-        const DWORD last_error = ::WSAGetLastError ();
-
-        if (WSAEOPNOTSUPP == last_error) {
-            // This system is not Windows 8 or Server 2012, and the call is not supported.
-        } else {
-            wsa_assert (false);
-        }
-    }
-#else
-    LIBZMQ_UNUSED (socket_);
-#endif
-}
-
-void zmq::tune_tcp_busy_poll (fd_t socket_, int busy_poll_)
-{
-#if defined(ZMQ_HAVE_BUSY_POLL)
-    if (busy_poll_ > 0) {
-        const int rc =
-          setsockopt (socket_, SOL_SOCKET, SO_BUSY_POLL,
-                      reinterpret_cast<char *> (&busy_poll_), sizeof (int));
-        assert_success_or_recoverable (socket_, rc);
-    }
-#else
-    LIBZMQ_UNUSED (socket_);
-    LIBZMQ_UNUSED (busy_poll_);
-#endif
-}
-
-zmq::fd_t zmq::tcp_open_socket (const char *address_,
-                                const zmq::options_t &options_,
-                                bool local_,
-                                bool fallback_to_ipv4_,
-                                zmq::tcp_address_t *out_tcp_addr_)
-{
-    //  Convert the textual address into address structure.
-    int rc = out_tcp_addr_->resolve (address_, local_, options_.ipv6);
-    if (rc != 0)
-        return retired_fd;
-
-    //  Create the socket.
-    fd_t s = open_socket (out_tcp_addr_->family (), SOCK_STREAM, IPPROTO_TCP);
-
-    //  IPv6 address family not supported, try automatic downgrade to IPv4.
-    if (s == retired_fd && fallback_to_ipv4_
-        && out_tcp_addr_->family () == AF_INET6 && errno == EAFNOSUPPORT
-        && options_.ipv6) {
-        rc = out_tcp_addr_->resolve (address_, local_, false);
-        if (rc != 0) {
-            return retired_fd;
-        }
-        s = open_socket (AF_INET, SOCK_STREAM, IPPROTO_TCP);
-    }
-
-    if (s == retired_fd) {
-        return retired_fd;
-    }
-
-    //  On some systems, IPv4 mapping in IPv6 sockets is disabled by default.
-    //  Switch it on in such cases.
-    if (out_tcp_addr_->family () == AF_INET6)
-        enable_ipv4_mapping (s);
-
-    // Set the IP Type-Of-Service priority for this socket
-    if (options_.tos != 0)
-        set_ip_type_of_service (s, options_.tos);
-
-    // Set the protocol-defined priority for this socket
-    if (options_.priority != 0)
-        set_socket_priority (s, options_.priority);
-
-    // Set the socket to loopback fastpath if configured.
-    if (options_.loopback_fastpath)
-        tcp_tune_loopback_fast_path (s);
-
-    // Bind the socket to a device if applicable
-    if (!options_.bound_device.empty ())
-        if (bind_to_device (s, options_.bound_device) == -1)
-            goto setsockopt_error;
-
-    //  Set the socket buffer limits for the underlying socket.
-    if (options_.sndbuf >= 0)
-        set_tcp_send_buffer (s, options_.sndbuf);
-    if (options_.rcvbuf >= 0)
-        set_tcp_receive_buffer (s, options_.rcvbuf);
-
-    //  This option removes several delays caused by scheduling, interrupts and context switching.
-    if (options_.busy_poll)
-        tune_tcp_busy_poll (s, options_.busy_poll);
-    return s;
-
-setsockopt_error:
-#ifdef ZMQ_HAVE_WINDOWS
-    rc = closesocket (s);
-    wsa_assert (rc != SOCKET_ERROR);
-#else
-    rc = ::close (s);
-    errno_assert (rc == 0);
-#endif
-    return retired_fd;
-}
diff --git a/libs/libzmq/src/tcp.hpp b/libs/libzmq/src/tcp.hpp
deleted file mode 100644
index 0b5e975..0000000
--- a/libs/libzmq/src/tcp.hpp
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_TCP_HPP_INCLUDED__
-#define __ZMQ_TCP_HPP_INCLUDED__
-
-#include "fd.hpp"
-
-namespace zmq
-{
-class tcp_address_t;
-struct options_t;
-
-//  Tunes the supplied TCP socket for the best latency.
-int tune_tcp_socket (fd_t s_);
-
-//  Sets the socket send buffer size.
-int set_tcp_send_buffer (fd_t sockfd_, int bufsize_);
-
-//  Sets the socket receive buffer size.
-int set_tcp_receive_buffer (fd_t sockfd_, int bufsize_);
-
-//  Tunes TCP keep-alives
-int tune_tcp_keepalives (fd_t s_,
-                         int keepalive_,
-                         int keepalive_cnt_,
-                         int keepalive_idle_,
-                         int keepalive_intvl_);
-
-//  Tunes TCP max retransmit timeout
-int tune_tcp_maxrt (fd_t sockfd_, int timeout_);
-
-//  Writes data to the socket. Returns the number of bytes actually
-//  written (even zero is to be considered to be a success). In case
-//  of error or orderly shutdown by the other peer -1 is returned.
-int tcp_write (fd_t s_, const void *data_, size_t size_);
-
-//  Reads data from the socket (up to 'size' bytes).
-//  Returns the number of bytes actually read or -1 on error.
-//  Zero indicates the peer has closed the connection.
-int tcp_read (fd_t s_, void *data_, size_t size_);
-
-void tcp_tune_loopback_fast_path (fd_t socket_);
-
-void tune_tcp_busy_poll (fd_t socket_, int busy_poll_);
-
-//  Resolves the given address_ string, opens a socket and sets socket options
-//  according to the passed options_. On success, returns the socket
-//  descriptor and assigns the resolved address to out_tcp_addr_. In case of
-//  an error, retired_fd is returned, and the value of out_tcp_addr_ is undefined.
-//  errno is set to an error code describing the cause of the error.
-fd_t tcp_open_socket (const char *address_,
-                      const options_t &options_,
-                      bool local_,
-                      bool fallback_to_ipv4_,
-                      tcp_address_t *out_tcp_addr_);
-}
-
-#endif
diff --git a/libs/libzmq/src/tcp_address.cpp b/libs/libzmq/src/tcp_address.cpp
deleted file mode 100644
index bdda66a..0000000
--- a/libs/libzmq/src/tcp_address.cpp
+++ /dev/null
@@ -1,307 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include <string>
-
-#include "macros.hpp"
-#include "tcp_address.hpp"
-#include "stdint.hpp"
-#include "err.hpp"
-#include "ip.hpp"
-
-#ifndef ZMQ_HAVE_WINDOWS
-#include <sys/types.h>
-#include <arpa/inet.h>
-#include <netinet/tcp.h>
-#include <net/if.h>
-#include <netdb.h>
-#include <ctype.h>
-#include <unistd.h>
-#include <stdlib.h>
-#endif
-
-#include <limits.h>
-
-zmq::tcp_address_t::tcp_address_t () : _has_src_addr (false)
-{
-    memset (&_address, 0, sizeof (_address));
-    memset (&_source_address, 0, sizeof (_source_address));
-}
-
-zmq::tcp_address_t::tcp_address_t (const sockaddr *sa_, socklen_t sa_len_) :
-    _has_src_addr (false)
-{
-    zmq_assert (sa_ && sa_len_ > 0);
-
-    memset (&_address, 0, sizeof (_address));
-    memset (&_source_address, 0, sizeof (_source_address));
-    if (sa_->sa_family == AF_INET
-        && sa_len_ >= static_cast<socklen_t> (sizeof (_address.ipv4)))
-        memcpy (&_address.ipv4, sa_, sizeof (_address.ipv4));
-    else if (sa_->sa_family == AF_INET6
-             && sa_len_ >= static_cast<socklen_t> (sizeof (_address.ipv6)))
-        memcpy (&_address.ipv6, sa_, sizeof (_address.ipv6));
-}
-
-int zmq::tcp_address_t::resolve (const char *name_, bool local_, bool ipv6_)
-{
-    // Test the ';' to know if we have a source address in name_
-    const char *src_delimiter = strrchr (name_, ';');
-    if (src_delimiter) {
-        const std::string src_name (name_, src_delimiter - name_);
-
-        ip_resolver_options_t src_resolver_opts;
-
-        src_resolver_opts
-          .bindable (true)
-          //  Restrict hostname/service to literals to avoid any DNS
-          //  lookups or service-name irregularity due to
-          //  indeterminate socktype.
-          .allow_dns (false)
-          .allow_nic_name (true)
-          .ipv6 (ipv6_)
-          .expect_port (true);
-
-        ip_resolver_t src_resolver (src_resolver_opts);
-
-        const int rc =
-          src_resolver.resolve (&_source_address, src_name.c_str ());
-        if (rc != 0)
-            return -1;
-        name_ = src_delimiter + 1;
-        _has_src_addr = true;
-    }
-
-    ip_resolver_options_t resolver_opts;
-
-    resolver_opts.bindable (local_)
-      .allow_dns (!local_)
-      .allow_nic_name (local_)
-      .ipv6 (ipv6_)
-      .expect_port (true);
-
-    ip_resolver_t resolver (resolver_opts);
-
-    return resolver.resolve (&_address, name_);
-}
-
-template <size_t N1, size_t N2>
-static std::string make_address_string (const char *hbuf_,
-                                        uint16_t port_,
-                                        const char (&ipv6_prefix_)[N1],
-                                        const char (&ipv6_suffix_)[N2])
-{
-    const size_t max_port_str_length = 5;
-    char buf[NI_MAXHOST + sizeof ipv6_prefix_ + sizeof ipv6_suffix_
-             + max_port_str_length];
-    char *pos = buf;
-    memcpy (pos, ipv6_prefix_, sizeof ipv6_prefix_ - 1);
-    pos += sizeof ipv6_prefix_ - 1;
-    const size_t hbuf_len = strlen (hbuf_);
-    memcpy (pos, hbuf_, hbuf_len);
-    pos += hbuf_len;
-    memcpy (pos, ipv6_suffix_, sizeof ipv6_suffix_ - 1);
-    pos += sizeof ipv6_suffix_ - 1;
-    pos += sprintf (pos, "%d", ntohs (port_));
-    return std::string (buf, pos - buf);
-}
-
-int zmq::tcp_address_t::to_string (std::string &addr_) const
-{
-    if (_address.family () != AF_INET && _address.family () != AF_INET6) {
-        addr_.clear ();
-        return -1;
-    }
-
-    //  Not using service resolving because of
-    //  https://github.com/zeromq/libzmq/commit/1824574f9b5a8ce786853320e3ea09fe1f822bc4
-    char hbuf[NI_MAXHOST];
-    const int rc = getnameinfo (addr (), addrlen (), hbuf, sizeof (hbuf), NULL,
-                                0, NI_NUMERICHOST);
-    if (rc != 0) {
-        addr_.clear ();
-        return rc;
-    }
-
-    const char ipv4_prefix[] = "tcp://";
-    const char ipv4_suffix[] = ":";
-    const char ipv6_prefix[] = "tcp://[";
-    const char ipv6_suffix[] = "]:";
-    if (_address.family () == AF_INET6) {
-        addr_ = make_address_string (hbuf, _address.ipv6.sin6_port, ipv6_prefix,
-                                     ipv6_suffix);
-    } else {
-        addr_ = make_address_string (hbuf, _address.ipv4.sin_port, ipv4_prefix,
-                                     ipv4_suffix);
-    }
-    return 0;
-}
-
-const sockaddr *zmq::tcp_address_t::addr () const
-{
-    return _address.as_sockaddr ();
-}
-
-socklen_t zmq::tcp_address_t::addrlen () const
-{
-    return _address.sockaddr_len ();
-}
-
-const sockaddr *zmq::tcp_address_t::src_addr () const
-{
-    return _source_address.as_sockaddr ();
-}
-
-socklen_t zmq::tcp_address_t::src_addrlen () const
-{
-    return _source_address.sockaddr_len ();
-}
-
-bool zmq::tcp_address_t::has_src_addr () const
-{
-    return _has_src_addr;
-}
-
-#if defined ZMQ_HAVE_WINDOWS
-unsigned short zmq::tcp_address_t::family () const
-#else
-sa_family_t zmq::tcp_address_t::family () const
-#endif
-{
-    return _address.family ();
-}
-
-zmq::tcp_address_mask_t::tcp_address_mask_t () : _address_mask (-1)
-{
-    memset (&_network_address, 0, sizeof (_network_address));
-}
-
-int zmq::tcp_address_mask_t::resolve (const char *name_, bool ipv6_)
-{
-    // Find '/' at the end that separates address from the cidr mask number.
-    // Allow empty mask clause and treat it like '/32' for ipv4 or '/128' for ipv6.
-    std::string addr_str, mask_str;
-    const char *delimiter = strrchr (name_, '/');
-    if (delimiter != NULL) {
-        addr_str.assign (name_, delimiter - name_);
-        mask_str.assign (delimiter + 1);
-        if (mask_str.empty ()) {
-            errno = EINVAL;
-            return -1;
-        }
-    } else
-        addr_str.assign (name_);
-
-    // Parse address part using standard routines.
-    ip_resolver_options_t resolver_opts;
-
-    resolver_opts.bindable (false)
-      .allow_dns (false)
-      .allow_nic_name (false)
-      .ipv6 (ipv6_)
-      .expect_port (false);
-
-    ip_resolver_t resolver (resolver_opts);
-
-    const int rc = resolver.resolve (&_network_address, addr_str.c_str ());
-    if (rc != 0)
-        return rc;
-
-    // Parse the cidr mask number.
-    const int full_mask_ipv4 =
-      sizeof (_network_address.ipv4.sin_addr) * CHAR_BIT;
-    const int full_mask_ipv6 =
-      sizeof (_network_address.ipv6.sin6_addr) * CHAR_BIT;
-    if (mask_str.empty ()) {
-        _address_mask = _network_address.family () == AF_INET6 ? full_mask_ipv6
-                                                               : full_mask_ipv4;
-    } else if (mask_str == "0")
-        _address_mask = 0;
-    else {
-        const long mask = strtol (mask_str.c_str (), NULL, 10);
-        if ((mask < 1)
-            || (_network_address.family () == AF_INET6 && mask > full_mask_ipv6)
-            || (_network_address.family () != AF_INET6
-                && mask > full_mask_ipv4)) {
-            errno = EINVAL;
-            return -1;
-        }
-        _address_mask = static_cast<int> (mask);
-    }
-
-    return 0;
-}
-
-bool zmq::tcp_address_mask_t::match_address (const struct sockaddr *ss_,
-                                             const socklen_t ss_len_) const
-{
-    zmq_assert (_address_mask != -1 && ss_ != NULL
-                && ss_len_
-                     >= static_cast<socklen_t> (sizeof (struct sockaddr)));
-
-    if (ss_->sa_family != _network_address.generic.sa_family)
-        return false;
-
-    if (_address_mask > 0) {
-        int mask;
-        const uint8_t *our_bytes, *their_bytes;
-        if (ss_->sa_family == AF_INET6) {
-            zmq_assert (ss_len_ == sizeof (struct sockaddr_in6));
-            their_bytes = reinterpret_cast<const uint8_t *> (
-              &((reinterpret_cast<const struct sockaddr_in6 *> (ss_))
-                  ->sin6_addr));
-            our_bytes = reinterpret_cast<const uint8_t *> (
-              &_network_address.ipv6.sin6_addr);
-            mask = sizeof (struct in6_addr) * 8;
-        } else {
-            zmq_assert (ss_len_ == sizeof (struct sockaddr_in));
-            their_bytes = reinterpret_cast<const uint8_t *> (&(
-              (reinterpret_cast<const struct sockaddr_in *> (ss_))->sin_addr));
-            our_bytes = reinterpret_cast<const uint8_t *> (
-              &_network_address.ipv4.sin_addr);
-            mask = sizeof (struct in_addr) * 8;
-        }
-        if (_address_mask < mask)
-            mask = _address_mask;
-
-        const size_t full_bytes = mask / 8;
-        if (memcmp (our_bytes, their_bytes, full_bytes) != 0)
-            return false;
-
-        const uint8_t last_byte_bits = 0xffU << (8 - mask % 8);
-        if (last_byte_bits) {
-            if ((their_bytes[full_bytes] & last_byte_bits)
-                != (our_bytes[full_bytes] & last_byte_bits))
-                return false;
-        }
-    }
-
-    return true;
-}
diff --git a/libs/libzmq/src/tcp_address.hpp b/libs/libzmq/src/tcp_address.hpp
deleted file mode 100644
index 4d3edf4..0000000
--- a/libs/libzmq/src/tcp_address.hpp
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_TCP_ADDRESS_HPP_INCLUDED__
-#define __ZMQ_TCP_ADDRESS_HPP_INCLUDED__
-
-#if !defined ZMQ_HAVE_WINDOWS
-#include <sys/socket.h>
-#include <netinet/in.h>
-#endif
-
-#include "ip_resolver.hpp"
-
-namespace zmq
-{
-class tcp_address_t
-{
-  public:
-    tcp_address_t ();
-    tcp_address_t (const sockaddr *sa_, socklen_t sa_len_);
-
-    //  This function translates textual TCP address into an address
-    //  structure. If 'local' is true, names are resolved as local interface
-    //  names. If it is false, names are resolved as remote hostnames.
-    //  If 'ipv6' is true, the name may resolve to IPv6 address.
-    int resolve (const char *name_, bool local_, bool ipv6_);
-
-    //  The opposite to resolve()
-    int to_string (std::string &addr_) const;
-
-#if defined ZMQ_HAVE_WINDOWS
-    unsigned short family () const;
-#else
-    sa_family_t family () const;
-#endif
-    const sockaddr *addr () const;
-    socklen_t addrlen () const;
-
-    const sockaddr *src_addr () const;
-    socklen_t src_addrlen () const;
-    bool has_src_addr () const;
-
-  private:
-    ip_addr_t _address;
-    ip_addr_t _source_address;
-    bool _has_src_addr;
-};
-
-class tcp_address_mask_t
-{
-  public:
-    tcp_address_mask_t ();
-
-    // This function enhances tcp_address_t::resolve() with ability to parse
-    // additional cidr-like(/xx) mask value at the end of the name string.
-    // Works only with remote hostnames.
-    int resolve (const char *name_, bool ipv6_);
-
-    bool match_address (const struct sockaddr *ss_, socklen_t ss_len_) const;
-
-  private:
-    ip_addr_t _network_address;
-    int _address_mask;
-};
-}
-
-#endif
diff --git a/libs/libzmq/src/tcp_connecter.cpp b/libs/libzmq/src/tcp_connecter.cpp
deleted file mode 100644
index a0138eb..0000000
--- a/libs/libzmq/src/tcp_connecter.cpp
+++ /dev/null
@@ -1,313 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include <new>
-#include <string>
-
-#include "macros.hpp"
-#include "tcp_connecter.hpp"
-#include "io_thread.hpp"
-#include "err.hpp"
-#include "ip.hpp"
-#include "tcp.hpp"
-#include "address.hpp"
-#include "tcp_address.hpp"
-#include "session_base.hpp"
-
-#if !defined ZMQ_HAVE_WINDOWS
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <arpa/inet.h>
-#include <netinet/tcp.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <fcntl.h>
-#ifdef ZMQ_HAVE_VXWORKS
-#include <sockLib.h>
-#endif
-#ifdef ZMQ_HAVE_OPENVMS
-#include <ioctl.h>
-#endif
-#endif
-
-#ifdef __APPLE__
-#include <TargetConditionals.h>
-#endif
-
-zmq::tcp_connecter_t::tcp_connecter_t (class io_thread_t *io_thread_,
-                                       class session_base_t *session_,
-                                       const options_t &options_,
-                                       address_t *addr_,
-                                       bool delayed_start_) :
-    stream_connecter_base_t (
-      io_thread_, session_, options_, addr_, delayed_start_),
-    _connect_timer_started (false)
-{
-    zmq_assert (_addr->protocol == protocol_name::tcp);
-}
-
-zmq::tcp_connecter_t::~tcp_connecter_t ()
-{
-    zmq_assert (!_connect_timer_started);
-}
-
-void zmq::tcp_connecter_t::process_term (int linger_)
-{
-    if (_connect_timer_started) {
-        cancel_timer (connect_timer_id);
-        _connect_timer_started = false;
-    }
-
-    stream_connecter_base_t::process_term (linger_);
-}
-
-void zmq::tcp_connecter_t::out_event ()
-{
-    if (_connect_timer_started) {
-        cancel_timer (connect_timer_id);
-        _connect_timer_started = false;
-    }
-
-    //  TODO this is still very similar to (t)ipc_connecter_t, maybe the
-    //  differences can be factored out
-
-    rm_handle ();
-
-    const fd_t fd = connect ();
-
-    if (fd == retired_fd
-        && ((options.reconnect_stop & ZMQ_RECONNECT_STOP_CONN_REFUSED)
-            && errno == ECONNREFUSED)) {
-        send_conn_failed (_session);
-        close ();
-        terminate ();
-        return;
-    }
-
-    //  Handle the error condition by attempt to reconnect.
-    if (fd == retired_fd || !tune_socket (fd)) {
-        close ();
-        add_reconnect_timer ();
-        return;
-    }
-
-    create_engine (fd, get_socket_name<tcp_address_t> (fd, socket_end_local));
-}
-
-void zmq::tcp_connecter_t::timer_event (int id_)
-{
-    if (id_ == connect_timer_id) {
-        _connect_timer_started = false;
-        rm_handle ();
-        close ();
-        add_reconnect_timer ();
-    } else
-        stream_connecter_base_t::timer_event (id_);
-}
-
-void zmq::tcp_connecter_t::start_connecting ()
-{
-    //  Open the connecting socket.
-    const int rc = open ();
-
-    //  Connect may succeed in synchronous manner.
-    if (rc == 0) {
-        _handle = add_fd (_s);
-        out_event ();
-    }
-
-    //  Connection establishment may be delayed. Poll for its completion.
-    else if (rc == -1 && errno == EINPROGRESS) {
-        _handle = add_fd (_s);
-        set_pollout (_handle);
-        _socket->event_connect_delayed (
-          make_unconnected_connect_endpoint_pair (_endpoint), zmq_errno ());
-
-        //  add userspace connect timeout
-        add_connect_timer ();
-    }
-
-    //  Handle any other error condition by eventual reconnect.
-    else {
-        if (_s != retired_fd)
-            close ();
-        add_reconnect_timer ();
-    }
-}
-
-void zmq::tcp_connecter_t::add_connect_timer ()
-{
-    if (options.connect_timeout > 0) {
-        add_timer (options.connect_timeout, connect_timer_id);
-        _connect_timer_started = true;
-    }
-}
-
-int zmq::tcp_connecter_t::open ()
-{
-    zmq_assert (_s == retired_fd);
-
-    //  Resolve the address
-    if (_addr->resolved.tcp_addr != NULL) {
-        LIBZMQ_DELETE (_addr->resolved.tcp_addr);
-    }
-
-    _addr->resolved.tcp_addr = new (std::nothrow) tcp_address_t ();
-    alloc_assert (_addr->resolved.tcp_addr);
-    _s = tcp_open_socket (_addr->address.c_str (), options, false, true,
-                          _addr->resolved.tcp_addr);
-    if (_s == retired_fd) {
-        //  TODO we should emit some event in this case!
-
-        LIBZMQ_DELETE (_addr->resolved.tcp_addr);
-        return -1;
-    }
-    zmq_assert (_addr->resolved.tcp_addr != NULL);
-
-    // Set the socket to non-blocking mode so that we get async connect().
-    unblock_socket (_s);
-
-    const tcp_address_t *const tcp_addr = _addr->resolved.tcp_addr;
-
-    int rc;
-
-    // Set a source address for conversations
-    if (tcp_addr->has_src_addr ()) {
-        //  Allow reusing of the address, to connect to different servers
-        //  using the same source port on the client.
-        int flag = 1;
-#ifdef ZMQ_HAVE_WINDOWS
-        rc = setsockopt (_s, SOL_SOCKET, SO_REUSEADDR,
-                         reinterpret_cast<const char *> (&flag), sizeof (int));
-        wsa_assert (rc != SOCKET_ERROR);
-#elif defined ZMQ_HAVE_VXWORKS
-        rc = setsockopt (_s, SOL_SOCKET, SO_REUSEADDR, (char *) &flag,
-                         sizeof (int));
-        errno_assert (rc == 0);
-#else
-        rc = setsockopt (_s, SOL_SOCKET, SO_REUSEADDR, &flag, sizeof (int));
-        errno_assert (rc == 0);
-#endif
-
-#if defined ZMQ_HAVE_VXWORKS
-        rc = ::bind (_s, (sockaddr *) tcp_addr->src_addr (),
-                     tcp_addr->src_addrlen ());
-#else
-        rc = ::bind (_s, tcp_addr->src_addr (), tcp_addr->src_addrlen ());
-#endif
-        if (rc == -1)
-            return -1;
-    }
-
-    //  Connect to the remote peer.
-#if defined ZMQ_HAVE_VXWORKS
-    rc = ::connect (_s, (sockaddr *) tcp_addr->addr (), tcp_addr->addrlen ());
-#else
-    rc = ::connect (_s, tcp_addr->addr (), tcp_addr->addrlen ());
-#endif
-    //  Connect was successful immediately.
-    if (rc == 0) {
-        return 0;
-    }
-
-    //  Translate error codes indicating asynchronous connect has been
-    //  launched to a uniform EINPROGRESS.
-#ifdef ZMQ_HAVE_WINDOWS
-    const int last_error = WSAGetLastError ();
-    if (last_error == WSAEINPROGRESS || last_error == WSAEWOULDBLOCK)
-        errno = EINPROGRESS;
-    else
-        errno = wsa_error_to_errno (last_error);
-#else
-    if (errno == EINTR)
-        errno = EINPROGRESS;
-#endif
-    return -1;
-}
-
-zmq::fd_t zmq::tcp_connecter_t::connect ()
-{
-    //  Async connect has finished. Check whether an error occurred
-    int err = 0;
-#if defined ZMQ_HAVE_HPUX || defined ZMQ_HAVE_VXWORKS
-    int len = sizeof err;
-#else
-    socklen_t len = sizeof err;
-#endif
-
-    const int rc = getsockopt (_s, SOL_SOCKET, SO_ERROR,
-                               reinterpret_cast<char *> (&err), &len);
-
-    //  Assert if the error was caused by 0MQ bug.
-    //  Networking problems are OK. No need to assert.
-#ifdef ZMQ_HAVE_WINDOWS
-    zmq_assert (rc == 0);
-    if (err != 0) {
-        if (err == WSAEBADF || err == WSAENOPROTOOPT || err == WSAENOTSOCK
-            || err == WSAENOBUFS) {
-            wsa_assert_no (err);
-        }
-        errno = wsa_error_to_errno (err);
-        return retired_fd;
-    }
-#else
-    //  Following code should handle both Berkeley-derived socket
-    //  implementations and Solaris.
-    if (rc == -1)
-        err = errno;
-    if (err != 0) {
-        errno = err;
-#if !defined(TARGET_OS_IPHONE) || !TARGET_OS_IPHONE
-        errno_assert (errno != EBADF && errno != ENOPROTOOPT
-                      && errno != ENOTSOCK && errno != ENOBUFS);
-#else
-        errno_assert (errno != ENOPROTOOPT && errno != ENOTSOCK
-                      && errno != ENOBUFS);
-#endif
-        return retired_fd;
-    }
-#endif
-
-    //  Return the newly connected socket.
-    const fd_t result = _s;
-    _s = retired_fd;
-    return result;
-}
-
-bool zmq::tcp_connecter_t::tune_socket (const fd_t fd_)
-{
-    const int rc = tune_tcp_socket (fd_)
-                   | tune_tcp_keepalives (
-                     fd_, options.tcp_keepalive, options.tcp_keepalive_cnt,
-                     options.tcp_keepalive_idle, options.tcp_keepalive_intvl)
-                   | tune_tcp_maxrt (fd_, options.tcp_maxrt);
-    return rc == 0;
-}
diff --git a/libs/libzmq/src/tcp_connecter.hpp b/libs/libzmq/src/tcp_connecter.hpp
deleted file mode 100644
index 4947703..0000000
--- a/libs/libzmq/src/tcp_connecter.hpp
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __TCP_CONNECTER_HPP_INCLUDED__
-#define __TCP_CONNECTER_HPP_INCLUDED__
-
-#include "fd.hpp"
-#include "stdint.hpp"
-#include "stream_connecter_base.hpp"
-
-namespace zmq
-{
-class tcp_connecter_t ZMQ_FINAL : public stream_connecter_base_t
-{
-  public:
-    //  If 'delayed_start' is true connecter first waits for a while,
-    //  then starts connection process.
-    tcp_connecter_t (zmq::io_thread_t *io_thread_,
-                     zmq::session_base_t *session_,
-                     const options_t &options_,
-                     address_t *addr_,
-                     bool delayed_start_);
-    ~tcp_connecter_t ();
-
-  private:
-    //  ID of the timer used to check the connect timeout, must be different from stream_connecter_base_t::reconnect_timer_id.
-    enum
-    {
-        connect_timer_id = 2
-    };
-
-    //  Handlers for incoming commands.
-    void process_term (int linger_);
-
-    //  Handlers for I/O events.
-    void out_event ();
-    void timer_event (int id_);
-
-    //  Internal function to start the actual connection establishment.
-    void start_connecting ();
-
-    //  Internal function to add a connect timer
-    void add_connect_timer ();
-
-    //  Open TCP connecting socket. Returns -1 in case of error,
-    //  0 if connect was successful immediately. Returns -1 with
-    //  EAGAIN errno if async connect was launched.
-    int open ();
-
-    //  Get the file descriptor of newly created connection. Returns
-    //  retired_fd if the connection was unsuccessful.
-    fd_t connect ();
-
-    //  Tunes a connected socket.
-    bool tune_socket (fd_t fd_);
-
-    //  True iff a timer has been started.
-    bool _connect_timer_started;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (tcp_connecter_t)
-};
-}
-
-#endif
diff --git a/libs/libzmq/src/tcp_listener.cpp b/libs/libzmq/src/tcp_listener.cpp
deleted file mode 100644
index 69581b7..0000000
--- a/libs/libzmq/src/tcp_listener.cpp
+++ /dev/null
@@ -1,277 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include <new>
-
-#include <string>
-#include <stdio.h>
-
-#include "tcp_listener.hpp"
-#include "io_thread.hpp"
-#include "config.hpp"
-#include "err.hpp"
-#include "ip.hpp"
-#include "tcp.hpp"
-#include "socket_base.hpp"
-#include "address.hpp"
-
-#ifndef ZMQ_HAVE_WINDOWS
-#include <unistd.h>
-#include <sys/socket.h>
-#include <arpa/inet.h>
-#include <netinet/tcp.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <fcntl.h>
-#ifdef ZMQ_HAVE_VXWORKS
-#include <sockLib.h>
-#endif
-#endif
-
-#ifdef ZMQ_HAVE_OPENVMS
-#include <ioctl.h>
-#endif
-
-zmq::tcp_listener_t::tcp_listener_t (io_thread_t *io_thread_,
-                                     socket_base_t *socket_,
-                                     const options_t &options_) :
-    stream_listener_base_t (io_thread_, socket_, options_)
-{
-}
-
-void zmq::tcp_listener_t::in_event ()
-{
-    const fd_t fd = accept ();
-
-    //  If connection was reset by the peer in the meantime, just ignore it.
-    //  TODO: Handle specific errors like ENFILE/EMFILE etc.
-    if (fd == retired_fd) {
-        _socket->event_accept_failed (
-          make_unconnected_bind_endpoint_pair (_endpoint), zmq_errno ());
-        return;
-    }
-
-    int rc = tune_tcp_socket (fd);
-    rc = rc
-         | tune_tcp_keepalives (
-           fd, options.tcp_keepalive, options.tcp_keepalive_cnt,
-           options.tcp_keepalive_idle, options.tcp_keepalive_intvl);
-    rc = rc | tune_tcp_maxrt (fd, options.tcp_maxrt);
-    if (rc != 0) {
-        _socket->event_accept_failed (
-          make_unconnected_bind_endpoint_pair (_endpoint), zmq_errno ());
-        return;
-    }
-
-    //  Create the engine object for this connection.
-    create_engine (fd);
-}
-
-std::string
-zmq::tcp_listener_t::get_socket_name (zmq::fd_t fd_,
-                                      socket_end_t socket_end_) const
-{
-    return zmq::get_socket_name<tcp_address_t> (fd_, socket_end_);
-}
-
-int zmq::tcp_listener_t::create_socket (const char *addr_)
-{
-    _s = tcp_open_socket (addr_, options, true, true, &_address);
-    if (_s == retired_fd) {
-        return -1;
-    }
-
-    //  TODO why is this only done for the listener?
-    make_socket_noninheritable (_s);
-
-    //  Allow reusing of the address.
-    int flag = 1;
-    int rc;
-#ifdef ZMQ_HAVE_WINDOWS
-    //  TODO this was changed for Windows from SO_REUSEADDRE to
-    //  SE_EXCLUSIVEADDRUSE by 0ab65324195ad70205514d465b03d851a6de051c,
-    //  so the comment above is no longer correct; also, now the settings are
-    //  different between listener and connecter with a src address.
-    //  is this intentional?
-    rc = setsockopt (_s, SOL_SOCKET, SO_EXCLUSIVEADDRUSE,
-                     reinterpret_cast<const char *> (&flag), sizeof (int));
-    wsa_assert (rc != SOCKET_ERROR);
-#elif defined ZMQ_HAVE_VXWORKS
-    rc =
-      setsockopt (_s, SOL_SOCKET, SO_REUSEADDR, (char *) &flag, sizeof (int));
-    errno_assert (rc == 0);
-#else
-    rc = setsockopt (_s, SOL_SOCKET, SO_REUSEADDR, &flag, sizeof (int));
-    errno_assert (rc == 0);
-#endif
-
-    //  Bind the socket to the network interface and port.
-#if defined ZMQ_HAVE_VXWORKS
-    rc = bind (_s, (sockaddr *) _address.addr (), _address.addrlen ());
-#else
-    rc = bind (_s, _address.addr (), _address.addrlen ());
-#endif
-#ifdef ZMQ_HAVE_WINDOWS
-    if (rc == SOCKET_ERROR) {
-        errno = wsa_error_to_errno (WSAGetLastError ());
-        goto error;
-    }
-#else
-    if (rc != 0)
-        goto error;
-#endif
-
-    //  Listen for incoming connections.
-    rc = listen (_s, options.backlog);
-#ifdef ZMQ_HAVE_WINDOWS
-    if (rc == SOCKET_ERROR) {
-        errno = wsa_error_to_errno (WSAGetLastError ());
-        goto error;
-    }
-#else
-    if (rc != 0)
-        goto error;
-#endif
-
-    return 0;
-
-error:
-    const int err = errno;
-    close ();
-    errno = err;
-    return -1;
-}
-
-int zmq::tcp_listener_t::set_local_address (const char *addr_)
-{
-    if (options.use_fd != -1) {
-        //  in this case, the addr_ passed is not used and ignored, since the
-        //  socket was already created by the application
-        _s = options.use_fd;
-    } else {
-        if (create_socket (addr_) == -1)
-            return -1;
-    }
-
-    _endpoint = get_socket_name (_s, socket_end_local);
-
-    _socket->event_listening (make_unconnected_bind_endpoint_pair (_endpoint),
-                              _s);
-    return 0;
-}
-
-zmq::fd_t zmq::tcp_listener_t::accept ()
-{
-    //  The situation where connection cannot be accepted due to insufficient
-    //  resources is considered valid and treated by ignoring the connection.
-    //  Accept one connection and deal with different failure modes.
-    zmq_assert (_s != retired_fd);
-
-    struct sockaddr_storage ss;
-    memset (&ss, 0, sizeof (ss));
-#if defined ZMQ_HAVE_HPUX || defined ZMQ_HAVE_VXWORKS
-    int ss_len = sizeof (ss);
-#else
-    socklen_t ss_len = sizeof (ss);
-#endif
-#if defined ZMQ_HAVE_SOCK_CLOEXEC && defined HAVE_ACCEPT4
-    fd_t sock = ::accept4 (_s, reinterpret_cast<struct sockaddr *> (&ss),
-                           &ss_len, SOCK_CLOEXEC);
-#else
-    const fd_t sock =
-      ::accept (_s, reinterpret_cast<struct sockaddr *> (&ss), &ss_len);
-#endif
-
-    if (sock == retired_fd) {
-#if defined ZMQ_HAVE_WINDOWS
-        const int last_error = WSAGetLastError ();
-        wsa_assert (last_error == WSAEWOULDBLOCK || last_error == WSAECONNRESET
-                    || last_error == WSAEMFILE || last_error == WSAENOBUFS);
-#elif defined ZMQ_HAVE_ANDROID
-        errno_assert (errno == EAGAIN || errno == EWOULDBLOCK || errno == EINTR
-                      || errno == ECONNABORTED || errno == EPROTO
-                      || errno == ENOBUFS || errno == ENOMEM || errno == EMFILE
-                      || errno == ENFILE || errno == EINVAL);
-#else
-        errno_assert (errno == EAGAIN || errno == EWOULDBLOCK || errno == EINTR
-                      || errno == ECONNABORTED || errno == EPROTO
-                      || errno == ENOBUFS || errno == ENOMEM || errno == EMFILE
-                      || errno == ENFILE);
-#endif
-        return retired_fd;
-    }
-
-    make_socket_noninheritable (sock);
-
-    if (!options.tcp_accept_filters.empty ()) {
-        bool matched = false;
-        for (options_t::tcp_accept_filters_t::size_type
-               i = 0,
-               size = options.tcp_accept_filters.size ();
-             i != size; ++i) {
-            if (options.tcp_accept_filters[i].match_address (
-                  reinterpret_cast<struct sockaddr *> (&ss), ss_len)) {
-                matched = true;
-                break;
-            }
-        }
-        if (!matched) {
-#ifdef ZMQ_HAVE_WINDOWS
-            const int rc = closesocket (sock);
-            wsa_assert (rc != SOCKET_ERROR);
-#else
-            int rc = ::close (sock);
-            errno_assert (rc == 0);
-#endif
-            return retired_fd;
-        }
-    }
-
-    if (zmq::set_nosigpipe (sock)) {
-#ifdef ZMQ_HAVE_WINDOWS
-        const int rc = closesocket (sock);
-        wsa_assert (rc != SOCKET_ERROR);
-#else
-        int rc = ::close (sock);
-        errno_assert (rc == 0);
-#endif
-        return retired_fd;
-    }
-
-    // Set the IP Type-Of-Service priority for this client socket
-    if (options.tos != 0)
-        set_ip_type_of_service (sock, options.tos);
-
-    // Set the protocol-defined priority for this client socket
-    if (options.priority != 0)
-        set_socket_priority (sock, options.priority);
-
-    return sock;
-}
diff --git a/libs/libzmq/src/tcp_listener.hpp b/libs/libzmq/src/tcp_listener.hpp
deleted file mode 100644
index 3f41b8f..0000000
--- a/libs/libzmq/src/tcp_listener.hpp
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_TCP_LISTENER_HPP_INCLUDED__
-#define __ZMQ_TCP_LISTENER_HPP_INCLUDED__
-
-#include "fd.hpp"
-#include "tcp_address.hpp"
-#include "stream_listener_base.hpp"
-
-namespace zmq
-{
-class tcp_listener_t ZMQ_FINAL : public stream_listener_base_t
-{
-  public:
-    tcp_listener_t (zmq::io_thread_t *io_thread_,
-                    zmq::socket_base_t *socket_,
-                    const options_t &options_);
-
-    //  Set address to listen on.
-    int set_local_address (const char *addr_);
-
-  protected:
-    std::string get_socket_name (fd_t fd_, socket_end_t socket_end_) const;
-
-  private:
-    //  Handlers for I/O events.
-    void in_event ();
-
-    //  Accept the new connection. Returns the file descriptor of the
-    //  newly created connection. The function may return retired_fd
-    //  if the connection was dropped while waiting in the listen backlog
-    //  or was denied because of accept filters.
-    fd_t accept ();
-
-    int create_socket (const char *addr_);
-
-    //  Address to listen on.
-    tcp_address_t _address;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (tcp_listener_t)
-};
-}
-
-#endif
diff --git a/libs/libzmq/src/thread.cpp b/libs/libzmq/src/thread.cpp
deleted file mode 100644
index 3504236..0000000
--- a/libs/libzmq/src/thread.cpp
+++ /dev/null
@@ -1,412 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "macros.hpp"
-#include "thread.hpp"
-#include "err.hpp"
-
-#ifdef ZMQ_HAVE_WINDOWS
-#include <winnt.h>
-#endif
-
-#ifdef __MINGW32__
-#include "pthread.h"
-#endif
-
-bool zmq::thread_t::get_started () const
-{
-    return _started;
-}
-
-#ifdef ZMQ_HAVE_WINDOWS
-
-extern "C" {
-#if defined _WIN32_WCE
-static DWORD thread_routine (LPVOID arg_)
-#else
-static unsigned int __stdcall thread_routine (void *arg_)
-#endif
-{
-    zmq::thread_t *self = static_cast<zmq::thread_t *> (arg_);
-    self->applyThreadName ();
-    self->_tfn (self->_arg);
-    return 0;
-}
-}
-
-void zmq::thread_t::start (thread_fn *tfn_, void *arg_, const char *name_)
-{
-    _tfn = tfn_;
-    _arg = arg_;
-    if (name_)
-        strncpy (_name, name_, sizeof (_name) - 1);
-
-    // set default stack size to 4MB to avoid std::map stack overflow on x64
-    unsigned int stack = 0;
-#if defined _WIN64
-    stack = 0x400000;
-#endif
-
-#if defined _WIN32_WCE
-    _descriptor = (HANDLE) CreateThread (NULL, stack, &::thread_routine, this,
-                                         0, &_thread_id);
-#else
-    _descriptor = (HANDLE) _beginthreadex (NULL, stack, &::thread_routine, this,
-                                           0, &_thread_id);
-#endif
-    win_assert (_descriptor != NULL);
-    _started = true;
-}
-
-bool zmq::thread_t::is_current_thread () const
-{
-    return GetCurrentThreadId () == _thread_id;
-}
-
-void zmq::thread_t::stop ()
-{
-    if (_started) {
-        const DWORD rc = WaitForSingleObject (_descriptor, INFINITE);
-        win_assert (rc != WAIT_FAILED);
-        const BOOL rc2 = CloseHandle (_descriptor);
-        win_assert (rc2 != 0);
-    }
-}
-
-void zmq::thread_t::setSchedulingParameters (
-  int priority_, int scheduling_policy_, const std::set<int> &affinity_cpus_)
-{
-    // not implemented
-    LIBZMQ_UNUSED (priority_);
-    LIBZMQ_UNUSED (scheduling_policy_);
-    LIBZMQ_UNUSED (affinity_cpus_);
-}
-
-void zmq::thread_t::
-  applySchedulingParameters () // to be called in secondary thread context
-{
-    // not implemented
-}
-
-#ifdef _MSC_VER
-
-namespace
-{
-#pragma pack(push, 8)
-struct thread_info_t
-{
-    DWORD _type;
-    LPCSTR _name;
-    DWORD _thread_id;
-    DWORD _flags;
-};
-#pragma pack(pop)
-}
-
-#endif
-
-void zmq::thread_t::
-  applyThreadName () // to be called in secondary thread context
-{
-    if (!_name[0] || !IsDebuggerPresent ())
-        return;
-
-#ifdef _MSC_VER
-
-    thread_info_t thread_info;
-    thread_info._type = 0x1000;
-    thread_info._name = _name;
-    thread_info._thread_id = -1;
-    thread_info._flags = 0;
-
-    __try {
-        const DWORD MS_VC_EXCEPTION = 0x406D1388;
-        RaiseException (MS_VC_EXCEPTION, 0,
-                        sizeof (thread_info) / sizeof (ULONG_PTR),
-                        (ULONG_PTR *) &thread_info);
-    }
-    __except (EXCEPTION_CONTINUE_EXECUTION) {
-    }
-
-#elif defined(__MINGW32__)
-
-    int rc = pthread_setname_np (pthread_self (), _name);
-    if (rc)
-        return;
-
-#else
-
-        // not implemented
-
-#endif
-}
-
-
-#elif defined ZMQ_HAVE_VXWORKS
-
-extern "C" {
-static void *thread_routine (void *arg_)
-{
-    zmq::thread_t *self = (zmq::thread_t *) arg_;
-    self->applySchedulingParameters ();
-    self->_tfn (self->_arg);
-    return NULL;
-}
-}
-
-void zmq::thread_t::start (thread_fn *tfn_, void *arg_, const char *name_)
-{
-    LIBZMQ_UNUSED (name_);
-    _tfn = tfn_;
-    _arg = arg_;
-    _descriptor = taskSpawn (NULL, DEFAULT_PRIORITY, DEFAULT_OPTIONS,
-                             DEFAULT_STACK_SIZE, (FUNCPTR) thread_routine,
-                             (int) this, 0, 0, 0, 0, 0, 0, 0, 0, 0);
-    if (_descriptor != NULL || _descriptor > 0)
-        _started = true;
-}
-
-void zmq::thread_t::stop ()
-{
-    if (_started)
-        while ((_descriptor != NULL || _descriptor > 0)
-               && taskIdVerify (_descriptor) == 0) {
-        }
-}
-
-bool zmq::thread_t::is_current_thread () const
-{
-    return taskIdSelf () == _descriptor;
-}
-
-void zmq::thread_t::setSchedulingParameters (
-  int priority_, int schedulingPolicy_, const std::set<int> &affinity_cpus_)
-{
-    _thread_priority = priority_;
-    _thread_sched_policy = schedulingPolicy_;
-    _thread_affinity_cpus = affinity_cpus_;
-}
-
-void zmq::thread_t::
-  applySchedulingParameters () // to be called in secondary thread context
-{
-    int priority =
-      (_thread_priority >= 0 ? _thread_priority : DEFAULT_PRIORITY);
-    priority = (priority < UCHAR_MAX ? priority : DEFAULT_PRIORITY);
-    if (_descriptor != NULL || _descriptor > 0) {
-        taskPrioritySet (_descriptor, priority);
-    }
-}
-
-void zmq::thread_t::
-  applyThreadName () // to be called in secondary thread context
-{
-    // not implemented
-}
-
-#else
-
-#include <signal.h>
-#include <unistd.h>
-#include <sys/time.h>
-#include <sys/resource.h>
-
-extern "C" {
-static void *thread_routine (void *arg_)
-{
-#if !defined ZMQ_HAVE_OPENVMS && !defined ZMQ_HAVE_ANDROID
-    //  Following code will guarantee more predictable latencies as it'll
-    //  disallow any signal handling in the I/O thread.
-    sigset_t signal_set;
-    int rc = sigfillset (&signal_set);
-    errno_assert (rc == 0);
-    rc = pthread_sigmask (SIG_BLOCK, &signal_set, NULL);
-    posix_assert (rc);
-#endif
-    zmq::thread_t *self = (zmq::thread_t *) arg_;
-    self->applySchedulingParameters ();
-    self->applyThreadName ();
-    self->_tfn (self->_arg);
-    return NULL;
-}
-}
-
-void zmq::thread_t::start (thread_fn *tfn_, void *arg_, const char *name_)
-{
-    _tfn = tfn_;
-    _arg = arg_;
-    if (name_)
-        strncpy (_name, name_, sizeof (_name) - 1);
-    int rc = pthread_create (&_descriptor, NULL, thread_routine, this);
-    posix_assert (rc);
-    _started = true;
-}
-
-void zmq::thread_t::stop ()
-{
-    if (_started) {
-        int rc = pthread_join (_descriptor, NULL);
-        posix_assert (rc);
-    }
-}
-
-bool zmq::thread_t::is_current_thread () const
-{
-    return bool (pthread_equal (pthread_self (), _descriptor));
-}
-
-void zmq::thread_t::setSchedulingParameters (
-  int priority_, int scheduling_policy_, const std::set<int> &affinity_cpus_)
-{
-    _thread_priority = priority_;
-    _thread_sched_policy = scheduling_policy_;
-    _thread_affinity_cpus = affinity_cpus_;
-}
-
-void zmq::thread_t::
-  applySchedulingParameters () // to be called in secondary thread context
-{
-#if defined _POSIX_THREAD_PRIORITY_SCHEDULING                                  \
-  && _POSIX_THREAD_PRIORITY_SCHEDULING >= 0
-    int policy = 0;
-    struct sched_param param;
-
-#if _POSIX_THREAD_PRIORITY_SCHEDULING == 0                                     \
-  && defined _SC_THREAD_PRIORITY_SCHEDULING
-    if (sysconf (_SC_THREAD_PRIORITY_SCHEDULING) < 0) {
-        return;
-    }
-#endif
-    int rc = pthread_getschedparam (pthread_self (), &policy, &param);
-    posix_assert (rc);
-
-    if (_thread_sched_policy != ZMQ_THREAD_SCHED_POLICY_DFLT) {
-        policy = _thread_sched_policy;
-    }
-
-    /* Quoting docs:
-       "Linux allows the static priority range 1 to 99 for the SCHED_FIFO and
-       SCHED_RR policies, and the priority 0 for the remaining policies."
-       Other policies may use the "nice value" in place of the priority:
-    */
-    bool use_nice_instead_priority =
-      (policy != SCHED_FIFO) && (policy != SCHED_RR);
-
-    if (_thread_priority != ZMQ_THREAD_PRIORITY_DFLT) {
-        if (use_nice_instead_priority)
-            param.sched_priority =
-              0; // this is the only supported priority for most scheduling policies
-        else
-            param.sched_priority =
-              _thread_priority; // user should provide a value between 1 and 99
-    }
-
-#ifdef __NetBSD__
-    if (policy == SCHED_OTHER)
-        param.sched_priority = -1;
-#endif
-
-    rc = pthread_setschedparam (pthread_self (), policy, &param);
-
-#if defined(__FreeBSD_kernel__) || defined(__FreeBSD__)
-    // If this feature is unavailable at run-time, don't abort.
-    if (rc == ENOSYS)
-        return;
-#endif
-
-    posix_assert (rc);
-
-#if !defined ZMQ_HAVE_VXWORKS
-    if (use_nice_instead_priority
-        && _thread_priority != ZMQ_THREAD_PRIORITY_DFLT) {
-        // assume the user wants to decrease the thread's nice value
-        // i.e., increase the chance of this thread being scheduled: try setting that to
-        // maximum priority.
-        rc = nice (-20);
-
-        errno_assert (rc != -1);
-        // IMPORTANT: EPERM is typically returned for unprivileged processes: that's because
-        //            CAP_SYS_NICE capability is required or RLIMIT_NICE resource limit should be changed to avoid EPERM!
-    }
-#endif
-
-#ifdef ZMQ_HAVE_PTHREAD_SET_AFFINITY
-    if (!_thread_affinity_cpus.empty ()) {
-        cpu_set_t cpuset;
-        CPU_ZERO (&cpuset);
-        for (std::set<int>::const_iterator it = _thread_affinity_cpus.begin (),
-                                           end = _thread_affinity_cpus.end ();
-             it != end; it++) {
-            CPU_SET ((int) (*it), &cpuset);
-        }
-        rc =
-          pthread_setaffinity_np (pthread_self (), sizeof (cpu_set_t), &cpuset);
-        posix_assert (rc);
-    }
-#endif
-#endif
-}
-
-void zmq::thread_t::
-  applyThreadName () // to be called in secondary thread context
-{
-    /* The thread name is a cosmetic string, added to ease debugging of
- * multi-threaded applications. It is not a big issue if this value
- * can not be set for any reason (such as Permission denied in some
- * cases where the application changes its EUID, etc.) The value of
- * "int rc" is retained where available, to help debuggers stepping
- * through code to see its value - but otherwise it is ignored.
- */
-    if (!_name[0])
-        return;
-
-        /* Fails with permission denied on Android 5/6 */
-#if defined(ZMQ_HAVE_ANDROID)
-    return;
-#endif
-
-#if defined(ZMQ_HAVE_PTHREAD_SETNAME_1)
-    int rc = pthread_setname_np (_name);
-    if (rc)
-        return;
-#elif defined(ZMQ_HAVE_PTHREAD_SETNAME_2)
-    int rc = pthread_setname_np (pthread_self (), _name);
-    if (rc)
-        return;
-#elif defined(ZMQ_HAVE_PTHREAD_SETNAME_3)
-    int rc = pthread_setname_np (pthread_self (), _name, NULL);
-    if (rc)
-        return;
-#elif defined(ZMQ_HAVE_PTHREAD_SET_NAME)
-    pthread_set_name_np (pthread_self (), _name);
-#endif
-}
-
-#endif
diff --git a/libs/libzmq/src/thread.hpp b/libs/libzmq/src/thread.hpp
deleted file mode 100644
index 1d58f4b..0000000
--- a/libs/libzmq/src/thread.hpp
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_THREAD_HPP_INCLUDED__
-#define __ZMQ_THREAD_HPP_INCLUDED__
-
-#if defined ZMQ_HAVE_VXWORKS
-#include <vxWorks.h>
-#include <taskLib.h>
-#elif !defined ZMQ_HAVE_WINDOWS
-#include <pthread.h>
-#endif
-#include <set>
-#include <cstring>
-
-namespace zmq
-{
-typedef void (thread_fn) (void *);
-
-//  Class encapsulating OS thread. Thread initiation/termination is done
-//  using special functions rather than in constructor/destructor so that
-//  thread isn't created during object construction by accident, causing
-//  newly created thread to access half-initialised object. Same applies
-//  to the destruction process: Thread should be terminated before object
-//  destruction begins, otherwise it can access half-destructed object.
-
-class thread_t
-{
-  public:
-    thread_t () :
-        _tfn (NULL),
-        _arg (NULL),
-        _started (false),
-        _thread_priority (ZMQ_THREAD_PRIORITY_DFLT),
-        _thread_sched_policy (ZMQ_THREAD_SCHED_POLICY_DFLT)
-    {
-        memset (_name, 0, sizeof (_name));
-    }
-
-#ifdef ZMQ_HAVE_VXWORKS
-    ~thread_t ()
-    {
-        if (descriptor != NULL || descriptor > 0) {
-            taskDelete (descriptor);
-        }
-    }
-#endif
-
-    //  Creates OS thread. 'tfn' is main thread function. It'll be passed
-    //  'arg' as an argument.
-    //  Name is 16 characters max including terminating NUL. Thread naming is
-    //  implemented only for pthread, and windows when a debugger is attached.
-    void start (thread_fn *tfn_, void *arg_, const char *name_);
-
-    //  Returns whether the thread was started, i.e. start was called.
-    bool get_started () const;
-
-    //  Returns whether the executing thread is the thread represented by the
-    //  thread object.
-    bool is_current_thread () const;
-
-    //  Waits for thread termination.
-    void stop ();
-
-    // Sets the thread scheduling parameters. Only implemented for
-    // pthread. Has no effect on other platforms.
-    void setSchedulingParameters (int priority_,
-                                  int scheduling_policy_,
-                                  const std::set<int> &affinity_cpus_);
-
-    //  These are internal members. They should be private, however then
-    //  they would not be accessible from the main C routine of the thread.
-    void applySchedulingParameters ();
-    void applyThreadName ();
-    thread_fn *_tfn;
-    void *_arg;
-    char _name[16];
-
-  private:
-    bool _started;
-
-#ifdef ZMQ_HAVE_WINDOWS
-    HANDLE _descriptor;
-#if defined _WIN32_WCE
-    DWORD _thread_id;
-#else
-    unsigned int _thread_id;
-#endif
-#elif defined ZMQ_HAVE_VXWORKS
-    int _descriptor;
-    enum
-    {
-        DEFAULT_PRIORITY = 100,
-        DEFAULT_OPTIONS = 0,
-        DEFAULT_STACK_SIZE = 4000
-    };
-#else
-    pthread_t _descriptor;
-#endif
-
-    //  Thread scheduling parameters.
-    int _thread_priority;
-    int _thread_sched_policy;
-    std::set<int> _thread_affinity_cpus;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (thread_t)
-};
-}
-
-#endif
diff --git a/libs/libzmq/src/timers.cpp b/libs/libzmq/src/timers.cpp
deleted file mode 100644
index e9b516e..0000000
--- a/libs/libzmq/src/timers.cpp
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
-Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-This file is part of libzmq, the ZeroMQ core engine in C++.
-
-libzmq is free software; you can redistribute it and/or modify it under
-the terms of the GNU Lesser General Public License (LGPL) as published
-by the Free Software Foundation; either version 3 of the License, or
-(at your option) any later version.
-
-As a special exception, the Contributors give you permission to link
-this library with independent modules to produce an executable,
-regardless of the license terms of these independent modules, and to
-copy and distribute the resulting executable under terms of your choice,
-provided that you also meet, for each linked independent module, the
-terms and conditions of the license of that module. An independent
-module is a module which is not derived from or based on this library.
-If you modify this library, you must extend this exception to your
-version of the library.
-
-libzmq is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-License for more details.
-
-You should have received a copy of the GNU Lesser General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "timers.hpp"
-#include "err.hpp"
-
-#include <algorithm>
-
-zmq::timers_t::timers_t () : _tag (0xCAFEDADA), _next_timer_id (0)
-{
-}
-
-zmq::timers_t::~timers_t ()
-{
-    //  Mark the timers as dead
-    _tag = 0xdeadbeef;
-}
-
-bool zmq::timers_t::check_tag () const
-{
-    return _tag == 0xCAFEDADA;
-}
-
-int zmq::timers_t::add (size_t interval_, timers_timer_fn handler_, void *arg_)
-{
-    if (handler_ == NULL) {
-        errno = EFAULT;
-        return -1;
-    }
-
-    uint64_t when = _clock.now_ms () + interval_;
-    timer_t timer = {++_next_timer_id, interval_, handler_, arg_};
-    _timers.insert (timersmap_t::value_type (when, timer));
-
-    return timer.timer_id;
-}
-
-struct zmq::timers_t::match_by_id
-{
-    match_by_id (int timer_id_) : _timer_id (timer_id_) {}
-
-    bool operator() (timersmap_t::value_type const &entry_) const
-    {
-        return entry_.second.timer_id == _timer_id;
-    }
-
-  private:
-    int _timer_id;
-};
-
-int zmq::timers_t::cancel (int timer_id_)
-{
-    // check first if timer exists at all
-    if (_timers.end ()
-        == std::find_if (_timers.begin (), _timers.end (),
-                         match_by_id (timer_id_))) {
-        errno = EINVAL;
-        return -1;
-    }
-
-    // check if timer was already canceled
-    if (_cancelled_timers.count (timer_id_)) {
-        errno = EINVAL;
-        return -1;
-    }
-
-    _cancelled_timers.insert (timer_id_);
-
-    return 0;
-}
-
-int zmq::timers_t::set_interval (int timer_id_, size_t interval_)
-{
-    const timersmap_t::iterator end = _timers.end ();
-    const timersmap_t::iterator it =
-      std::find_if (_timers.begin (), end, match_by_id (timer_id_));
-    if (it != end) {
-        timer_t timer = it->second;
-        timer.interval = interval_;
-        uint64_t when = _clock.now_ms () + interval_;
-        _timers.erase (it);
-        _timers.insert (timersmap_t::value_type (when, timer));
-
-        return 0;
-    }
-
-    errno = EINVAL;
-    return -1;
-}
-
-int zmq::timers_t::reset (int timer_id_)
-{
-    const timersmap_t::iterator end = _timers.end ();
-    const timersmap_t::iterator it =
-      std::find_if (_timers.begin (), end, match_by_id (timer_id_));
-    if (it != end) {
-        timer_t timer = it->second;
-        uint64_t when = _clock.now_ms () + timer.interval;
-        _timers.erase (it);
-        _timers.insert (timersmap_t::value_type (when, timer));
-
-        return 0;
-    }
-
-    errno = EINVAL;
-    return -1;
-}
-
-long zmq::timers_t::timeout ()
-{
-    const uint64_t now = _clock.now_ms ();
-    long res = -1;
-
-    const timersmap_t::iterator begin = _timers.begin ();
-    const timersmap_t::iterator end = _timers.end ();
-    timersmap_t::iterator it = begin;
-    for (; it != end; ++it) {
-        if (0 == _cancelled_timers.erase (it->second.timer_id)) {
-            //  Live timer, lets return the timeout
-            res = std::max (static_cast<long> (it->first - now), 0l);
-            break;
-        }
-    }
-
-    //  Remove timed-out timers
-    _timers.erase (begin, it);
-
-    return res;
-}
-
-int zmq::timers_t::execute ()
-{
-    const uint64_t now = _clock.now_ms ();
-
-    const timersmap_t::iterator begin = _timers.begin ();
-    const timersmap_t::iterator end = _timers.end ();
-    timersmap_t::iterator it = _timers.begin ();
-    for (; it != end; ++it) {
-        if (0 == _cancelled_timers.erase (it->second.timer_id)) {
-            //  Timer is not cancelled
-
-            //  Map is ordered, if we have to wait for current timer we can stop.
-            if (it->first > now)
-                break;
-
-            const timer_t &timer = it->second;
-
-            timer.handler (timer.timer_id, timer.arg);
-
-            _timers.insert (
-              timersmap_t::value_type (now + timer.interval, timer));
-        }
-    }
-    _timers.erase (begin, it);
-
-    return 0;
-}
diff --git a/libs/libzmq/src/timers.hpp b/libs/libzmq/src/timers.hpp
deleted file mode 100644
index ba8cdfb..0000000
--- a/libs/libzmq/src/timers.hpp
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
-Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-This file is part of libzmq, the ZeroMQ core engine in C++.
-
-libzmq is free software; you can redistribute it and/or modify it under
-the terms of the GNU Lesser General Public License (LGPL) as published
-by the Free Software Foundation; either version 3 of the License, or
-(at your option) any later version.
-
-As a special exception, the Contributors give you permission to link
-this library with independent modules to produce an executable,
-regardless of the license terms of these independent modules, and to
-copy and distribute the resulting executable under terms of your choice,
-provided that you also meet, for each linked independent module, the
-terms and conditions of the license of that module. An independent
-module is a module which is not derived from or based on this library.
-If you modify this library, you must extend this exception to your
-version of the library.
-
-libzmq is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-License for more details.
-
-You should have received a copy of the GNU Lesser General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_TIMERS_HPP_INCLUDED__
-#define __ZMQ_TIMERS_HPP_INCLUDED__
-
-#include <stddef.h>
-#include <map>
-#include <set>
-
-#include "clock.hpp"
-
-namespace zmq
-{
-typedef void (timers_timer_fn) (int timer_id_, void *arg_);
-
-class timers_t
-{
-  public:
-    timers_t ();
-    ~timers_t ();
-
-    //  Add timer to the set, timer repeats forever, or until cancel is called.
-    //  Returns a timer_id that is used to cancel the timer.
-    //  Returns -1 if there was an error.
-    int add (size_t interval_, timers_timer_fn handler_, void *arg_);
-
-    //  Set the interval of the timer.
-    //  This method is slow, cancelling exsting and adding a new timer yield better performance.
-    //  Returns 0 on success and -1 on error.
-    int set_interval (int timer_id_, size_t interval_);
-
-    //  Reset the timer.
-    //  This method is slow, cancelling exsting and adding a new timer yield better performance.
-    //  Returns 0 on success and -1 on error.
-    int reset (int timer_id_);
-
-    //  Cancel a timer.
-    //  Returns 0 on success and -1 on error.
-    int cancel (int timer_id_);
-
-    //  Returns the time in millisecond until the next timer.
-    //  Returns -1 if no timer is due.
-    long timeout ();
-
-    //  Execute timers.
-    //  Return 0 if all succeed and -1 if error.
-    int execute ();
-
-    //  Return false if object is not a timers class.
-    bool check_tag () const;
-
-  private:
-    //  Used to check whether the object is a timers class.
-    uint32_t _tag;
-
-    int _next_timer_id;
-
-    //  Clock instance.
-    clock_t _clock;
-
-    typedef struct timer_t
-    {
-        int timer_id;
-        size_t interval;
-        timers_timer_fn *handler;
-        void *arg;
-    } timer_t;
-
-    typedef std::multimap<uint64_t, timer_t> timersmap_t;
-    timersmap_t _timers;
-
-    typedef std::set<int> cancelled_timers_t;
-    cancelled_timers_t _cancelled_timers;
-
-    struct match_by_id;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (timers_t)
-};
-}
-
-#endif
diff --git a/libs/libzmq/src/tipc_address.cpp b/libs/libzmq/src/tipc_address.cpp
deleted file mode 100644
index 758b6a5..0000000
--- a/libs/libzmq/src/tipc_address.cpp
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-
-#include "tipc_address.hpp"
-
-#if defined ZMQ_HAVE_TIPC
-
-#include "err.hpp"
-
-#include <string>
-#include <sstream>
-
-zmq::tipc_address_t::tipc_address_t ()
-{
-    memset (&address, 0, sizeof address);
-    _random = false;
-}
-
-zmq::tipc_address_t::tipc_address_t (const sockaddr *sa_, socklen_t sa_len_)
-{
-    zmq_assert (sa_ && sa_len_ > 0);
-
-    memset (&address, 0, sizeof address);
-    if (sa_->sa_family == AF_TIPC)
-        memcpy (&address, sa_, sa_len_);
-
-    _random = false;
-}
-
-void zmq::tipc_address_t::set_random ()
-{
-    _random = true;
-}
-bool zmq::tipc_address_t::is_random () const
-{
-    return _random;
-}
-bool zmq::tipc_address_t::is_service () const
-{
-    if (address.addrtype == TIPC_ADDR_ID)
-        return false;
-
-    return true;
-}
-int zmq::tipc_address_t::resolve (const char *name_)
-{
-    unsigned int type = 0;
-    unsigned int lower = 0;
-    unsigned int upper = 0;
-    unsigned int ref = 0;
-    unsigned int z = 1, c = 0, n = 0;
-    char eof;
-    const char *domain;
-    int res;
-
-
-    if (strncmp (name_, "<*>", 3) == 0) {
-        set_random ();
-        address.family = AF_TIPC;
-        address.addrtype = TIPC_ADDR_ID;
-        address.addr.id.node = 0;
-        address.addr.id.ref = 0;
-        address.scope = 0;
-        return 0;
-    }
-
-    res = sscanf (name_, "{%u,%u,%u}", &type, &lower, &upper);
-    /* Fetch optional domain suffix. */
-    if ((domain = strchr (name_, '@'))) {
-        if (sscanf (domain, "@%u.%u.%u%c", &z, &c, &n, &eof) != 3)
-            return EINVAL;
-    }
-    if (res == 3) {
-        if (type < TIPC_RESERVED_TYPES || upper < lower)
-            return EINVAL;
-        address.family = AF_TIPC;
-        address.addrtype = TIPC_ADDR_NAMESEQ;
-        address.addr.nameseq.type = type;
-        address.addr.nameseq.lower = lower;
-        address.addr.nameseq.upper = upper;
-        address.scope = TIPC_ZONE_SCOPE;
-        return 0;
-    }
-    if (res == 2 && type > TIPC_RESERVED_TYPES) {
-        address.family = AF_TIPC;
-        address.addrtype = TIPC_ADDR_NAME;
-        address.addr.name.name.type = type;
-        address.addr.name.name.instance = lower;
-        address.addr.name.domain = tipc_addr (z, c, n);
-        address.scope = 0;
-        return 0;
-    } else if (res == 0) {
-        res = sscanf (name_, "<%u.%u.%u:%u>", &z, &c, &n, &ref);
-        if (res == 4) {
-            address.family = AF_TIPC;
-            address.addrtype = TIPC_ADDR_ID;
-            address.addr.id.node = tipc_addr (z, c, n);
-            address.addr.id.ref = ref;
-            address.scope = 0;
-            return 0;
-        }
-    }
-    return EINVAL;
-}
-
-int zmq::tipc_address_t::to_string (std::string &addr_) const
-{
-    if (address.family != AF_TIPC) {
-        addr_.clear ();
-        return -1;
-    }
-    std::stringstream s;
-    if (address.addrtype == TIPC_ADDR_NAMESEQ
-        || address.addrtype == TIPC_ADDR_NAME) {
-        s << "tipc://"
-          << "{" << address.addr.nameseq.type;
-        s << ", " << address.addr.nameseq.lower;
-        s << ", " << address.addr.nameseq.upper << "}";
-        addr_ = s.str ();
-    } else if (address.addrtype == TIPC_ADDR_ID || is_random ()) {
-        s << "tipc://"
-          << "<" << tipc_zone (address.addr.id.node);
-        s << "." << tipc_cluster (address.addr.id.node);
-        s << "." << tipc_node (address.addr.id.node);
-        s << ":" << address.addr.id.ref << ">";
-        addr_ = s.str ();
-    } else {
-        addr_.clear ();
-        return -1;
-    }
-    return 0;
-}
-
-const sockaddr *zmq::tipc_address_t::addr () const
-{
-    return (sockaddr *) &address;
-}
-
-socklen_t zmq::tipc_address_t::addrlen () const
-{
-    return static_cast<socklen_t> (sizeof address);
-}
-
-#endif
diff --git a/libs/libzmq/src/tipc_address.hpp b/libs/libzmq/src/tipc_address.hpp
deleted file mode 100644
index 55ae0e7..0000000
--- a/libs/libzmq/src/tipc_address.hpp
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_TIPC_ADDRESS_HPP_INCLUDED__
-#define __ZMQ_TIPC_ADDRESS_HPP_INCLUDED__
-
-#include <string>
-
-#include "platform.hpp"
-
-#if defined ZMQ_HAVE_TIPC
-
-#include <sys/socket.h>
-#if defined ZMQ_HAVE_VXWORKS
-#include <tipc/tipc.h>
-#else
-#include <linux/tipc.h>
-#endif
-
-namespace zmq
-{
-class tipc_address_t
-{
-  public:
-    tipc_address_t ();
-    tipc_address_t (const sockaddr *sa, socklen_t sa_len);
-
-    //  This function sets up the address "{type, lower, upper}" for TIPC transport
-    int resolve (const char *name);
-
-    //  The opposite to resolve()
-    int to_string (std::string &addr_) const;
-
-    // Handling different TIPC address types
-    bool is_service () const;
-    bool is_random () const;
-    void set_random ();
-
-    const sockaddr *addr () const;
-    socklen_t addrlen () const;
-
-  private:
-    bool _random;
-    struct sockaddr_tipc address;
-};
-}
-
-#endif
-
-#endif
diff --git a/libs/libzmq/src/tipc_connecter.cpp b/libs/libzmq/src/tipc_connecter.cpp
deleted file mode 100644
index 6057997..0000000
--- a/libs/libzmq/src/tipc_connecter.cpp
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-
-#include "tipc_connecter.hpp"
-
-#if defined ZMQ_HAVE_TIPC
-
-#include <new>
-#include <string>
-
-#include "io_thread.hpp"
-#include "platform.hpp"
-#include "random.hpp"
-#include "err.hpp"
-#include "ip.hpp"
-#include "address.hpp"
-#include "tipc_address.hpp"
-#include "session_base.hpp"
-
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#ifdef ZMQ_HAVE_VXWORKS
-#include <sockLib.h>
-#endif
-
-zmq::tipc_connecter_t::tipc_connecter_t (class io_thread_t *io_thread_,
-                                         class session_base_t *session_,
-                                         const options_t &options_,
-                                         address_t *addr_,
-                                         bool delayed_start_) :
-    stream_connecter_base_t (
-      io_thread_, session_, options_, addr_, delayed_start_)
-{
-    zmq_assert (_addr->protocol == "tipc");
-}
-
-void zmq::tipc_connecter_t::out_event ()
-{
-    fd_t fd = connect ();
-    rm_handle ();
-
-    //  Handle the error condition by attempt to reconnect.
-    if (fd == retired_fd) {
-        close ();
-        add_reconnect_timer ();
-        return;
-    }
-
-    create_engine (fd, get_socket_name<tipc_address_t> (fd, socket_end_local));
-}
-
-void zmq::tipc_connecter_t::start_connecting ()
-{
-    //  Open the connecting socket.
-    int rc = open ();
-
-    //  Connect may succeed in synchronous manner.
-    if (rc == 0) {
-        _handle = add_fd (_s);
-        out_event ();
-    }
-
-    //  Connection establishment may be delayed. Poll for its completion.
-    else if (rc == -1 && errno == EINPROGRESS) {
-        _handle = add_fd (_s);
-        set_pollout (_handle);
-        _socket->event_connect_delayed (
-          make_unconnected_connect_endpoint_pair (_endpoint), zmq_errno ());
-    }
-
-    //  Handle any other error condition by eventual reconnect.
-    else {
-        if (_s != retired_fd)
-            close ();
-        add_reconnect_timer ();
-    }
-}
-
-int zmq::tipc_connecter_t::open ()
-{
-    zmq_assert (_s == retired_fd);
-
-    // Cannot connect to random tipc addresses
-    if (_addr->resolved.tipc_addr->is_random ()) {
-        errno = EINVAL;
-        return -1;
-    }
-    //  Create the socket.
-    _s = open_socket (AF_TIPC, SOCK_STREAM, 0);
-    if (_s == retired_fd)
-        return -1;
-
-    //  Set the non-blocking flag.
-    unblock_socket (_s);
-    //  Connect to the remote peer.
-#ifdef ZMQ_HAVE_VXWORKS
-    int rc = ::connect (s, (sockaddr *) addr->resolved.tipc_addr->addr (),
-                        addr->resolved.tipc_addr->addrlen ());
-#else
-    int rc = ::connect (_s, _addr->resolved.tipc_addr->addr (),
-                        _addr->resolved.tipc_addr->addrlen ());
-#endif
-    //  Connect was successful immediately.
-    if (rc == 0)
-        return 0;
-
-    //  Translate other error codes indicating asynchronous connect has been
-    //  launched to a uniform EINPROGRESS.
-    if (rc == -1 && errno == EINTR) {
-        errno = EINPROGRESS;
-        return -1;
-    }
-    //  Forward the error.
-    return -1;
-}
-
-zmq::fd_t zmq::tipc_connecter_t::connect ()
-{
-    //  Following code should handle both Berkeley-derived socket
-    //  implementations and Solaris.
-    int err = 0;
-#ifdef ZMQ_HAVE_VXWORKS
-    int len = sizeof (err);
-#else
-    socklen_t len = sizeof (err);
-#endif
-    int rc = getsockopt (_s, SOL_SOCKET, SO_ERROR,
-                         reinterpret_cast<char *> (&err), &len);
-    if (rc == -1)
-        err = errno;
-    if (err != 0) {
-        //  Assert if the error was caused by 0MQ bug.
-        //  Networking problems are OK. No need to assert.
-        errno = err;
-        errno_assert (errno == ECONNREFUSED || errno == ECONNRESET
-                      || errno == ETIMEDOUT || errno == EHOSTUNREACH
-                      || errno == ENETUNREACH || errno == ENETDOWN);
-
-        return retired_fd;
-    }
-    fd_t result = _s;
-    _s = retired_fd;
-    return result;
-}
-
-#endif
diff --git a/libs/libzmq/src/tipc_connecter.hpp b/libs/libzmq/src/tipc_connecter.hpp
deleted file mode 100644
index e12643f..0000000
--- a/libs/libzmq/src/tipc_connecter.hpp
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __TIPC_CONNECTER_HPP_INCLUDED__
-#define __TIPC_CONNECTER_HPP_INCLUDED__
-
-#include "platform.hpp"
-
-#if defined ZMQ_HAVE_TIPC
-
-#include "fd.hpp"
-#include "stream_connecter_base.hpp"
-
-namespace zmq
-{
-class tipc_connecter_t ZMQ_FINAL : public stream_connecter_base_t
-{
-  public:
-    //  If 'delayed_start' is true connecter first waits for a while,
-    //  then starts connection process.
-    tipc_connecter_t (zmq::io_thread_t *io_thread_,
-                      zmq::session_base_t *session_,
-                      const options_t &options_,
-                      address_t *addr_,
-                      bool delayed_start_);
-
-  private:
-    //  Handlers for I/O events.
-    void out_event () ZMQ_FINAL;
-
-    //  Internal function to start the actual connection establishment.
-    void start_connecting () ZMQ_FINAL;
-
-    //  Get the file descriptor of newly created connection. Returns
-    //  retired_fd if the connection was unsuccessful.
-    fd_t connect ();
-
-    //  Open IPC connecting socket. Returns -1 in case of error,
-    //  0 if connect was successful immediately. Returns -1 with
-    //  EAGAIN errno if async connect was launched.
-    int open ();
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (tipc_connecter_t)
-};
-}
-
-#endif
-
-#endif
diff --git a/libs/libzmq/src/tipc_listener.cpp b/libs/libzmq/src/tipc_listener.cpp
deleted file mode 100644
index 338327b..0000000
--- a/libs/libzmq/src/tipc_listener.cpp
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-
-#include "tipc_listener.hpp"
-
-#if defined ZMQ_HAVE_TIPC
-
-#include <new>
-
-#include <string.h>
-
-#include "tipc_address.hpp"
-#include "io_thread.hpp"
-#include "config.hpp"
-#include "err.hpp"
-#include "ip.hpp"
-#include "socket_base.hpp"
-#include "address.hpp"
-
-#include <unistd.h>
-#include <sys/socket.h>
-#include <fcntl.h>
-#if defined ZMQ_HAVE_VXWORKS
-#include <sockLib.h>
-#include <tipc/tipc.h>
-#else
-#include <linux/tipc.h>
-#endif
-
-zmq::tipc_listener_t::tipc_listener_t (io_thread_t *io_thread_,
-                                       socket_base_t *socket_,
-                                       const options_t &options_) :
-    stream_listener_base_t (io_thread_, socket_, options_)
-{
-}
-
-void zmq::tipc_listener_t::in_event ()
-{
-    fd_t fd = accept ();
-
-    //  If connection was reset by the peer in the meantime, just ignore it.
-    //  TODO: Handle specific errors like ENFILE/EMFILE etc.
-    if (fd == retired_fd) {
-        _socket->event_accept_failed (
-          make_unconnected_bind_endpoint_pair (_endpoint), zmq_errno ());
-        return;
-    }
-
-    //  Create the engine object for this connection.
-    create_engine (fd);
-}
-
-std::string
-zmq::tipc_listener_t::get_socket_name (zmq::fd_t fd_,
-                                       socket_end_t socket_end_) const
-{
-    return zmq::get_socket_name<tipc_address_t> (fd_, socket_end_);
-}
-
-int zmq::tipc_listener_t::set_local_address (const char *addr_)
-{
-    // Convert str to address struct
-    int rc = _address.resolve (addr_);
-    if (rc != 0)
-        return -1;
-
-    // Cannot bind non-random Port Identity
-    const sockaddr_tipc *const a =
-      reinterpret_cast<const sockaddr_tipc *> (_address.addr ());
-    if (!_address.is_random () && a->addrtype == TIPC_ADDR_ID) {
-        errno = EINVAL;
-        return -1;
-    }
-
-    //  Create a listening socket.
-    _s = open_socket (AF_TIPC, SOCK_STREAM, 0);
-    if (_s == retired_fd)
-        return -1;
-
-    // If random Port Identity, update address object to reflect the assigned address
-    if (_address.is_random ()) {
-        struct sockaddr_storage ss;
-        const zmq_socklen_t sl = get_socket_address (_s, socket_end_local, &ss);
-        if (sl == 0)
-            goto error;
-
-        _address =
-          tipc_address_t (reinterpret_cast<struct sockaddr *> (&ss), sl);
-    }
-
-
-    _address.to_string (_endpoint);
-
-    //  Bind the socket to tipc name
-    if (_address.is_service ()) {
-#ifdef ZMQ_HAVE_VXWORKS
-        rc = bind (_s, (sockaddr *) address.addr (), address.addrlen ());
-#else
-        rc = bind (_s, _address.addr (), _address.addrlen ());
-#endif
-        if (rc != 0)
-            goto error;
-    }
-
-    //  Listen for incoming connections.
-    rc = listen (_s, options.backlog);
-    if (rc != 0)
-        goto error;
-
-    _socket->event_listening (make_unconnected_bind_endpoint_pair (_endpoint),
-                              _s);
-    return 0;
-
-error:
-    int err = errno;
-    close ();
-    errno = err;
-    return -1;
-}
-
-zmq::fd_t zmq::tipc_listener_t::accept ()
-{
-    //  Accept one connection and deal with different failure modes.
-    //  The situation where connection cannot be accepted due to insufficient
-    //  resources is considered valid and treated by ignoring the connection.
-    struct sockaddr_storage ss = {};
-    socklen_t ss_len = sizeof (ss);
-
-    zmq_assert (_s != retired_fd);
-#ifdef ZMQ_HAVE_VXWORKS
-    fd_t sock = ::accept (_s, (struct sockaddr *) &ss, (int *) &ss_len);
-#else
-    fd_t sock =
-      ::accept (_s, reinterpret_cast<struct sockaddr *> (&ss), &ss_len);
-#endif
-    if (sock == -1) {
-        errno_assert (errno == EAGAIN || errno == EWOULDBLOCK
-                      || errno == ENOBUFS || errno == EINTR
-                      || errno == ECONNABORTED || errno == EPROTO
-                      || errno == EMFILE || errno == ENFILE);
-        return retired_fd;
-    }
-    /*FIXME Accept filters?*/
-    return sock;
-}
-
-#endif
diff --git a/libs/libzmq/src/tipc_listener.hpp b/libs/libzmq/src/tipc_listener.hpp
deleted file mode 100644
index 040a99e..0000000
--- a/libs/libzmq/src/tipc_listener.hpp
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_TIPC_LISTENER_HPP_INCLUDED__
-#define __ZMQ_TIPC_LISTENER_HPP_INCLUDED__
-
-#include "platform.hpp"
-
-#if defined ZMQ_HAVE_TIPC
-
-#include <string>
-
-#include "fd.hpp"
-#include "stream_listener_base.hpp"
-#include "tipc_address.hpp"
-
-namespace zmq
-{
-class tipc_listener_t ZMQ_FINAL : public stream_listener_base_t
-{
-  public:
-    tipc_listener_t (zmq::io_thread_t *io_thread_,
-                     zmq::socket_base_t *socket_,
-                     const options_t &options_);
-
-    //  Set address to listen on.
-    int set_local_address (const char *addr_);
-
-  protected:
-    std::string get_socket_name (fd_t fd_,
-                                 socket_end_t socket_end_) const ZMQ_FINAL;
-
-  private:
-    //  Handlers for I/O events.
-    void in_event () ZMQ_FINAL;
-
-    //  Accept the new connection. Returns the file descriptor of the
-    //  newly created connection. The function may return retired_fd
-    //  if the connection was dropped while waiting in the listen backlog.
-    fd_t accept ();
-
-    // Address to listen on
-    tipc_address_t _address;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (tipc_listener_t)
-};
-}
-
-#endif
-
-#endif
diff --git a/libs/libzmq/src/trie.cpp b/libs/libzmq/src/trie.cpp
deleted file mode 100644
index 3c1e856..0000000
--- a/libs/libzmq/src/trie.cpp
+++ /dev/null
@@ -1,323 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "macros.hpp"
-#include "err.hpp"
-#include "trie.hpp"
-
-#include <stdlib.h>
-
-#include <new>
-#include <algorithm>
-
-zmq::trie_t::trie_t () : _refcnt (0), _min (0), _count (0), _live_nodes (0)
-{
-}
-
-zmq::trie_t::~trie_t ()
-{
-    if (_count == 1) {
-        zmq_assert (_next.node);
-        LIBZMQ_DELETE (_next.node);
-    } else if (_count > 1) {
-        for (unsigned short i = 0; i != _count; ++i) {
-            LIBZMQ_DELETE (_next.table[i]);
-        }
-        free (_next.table);
-    }
-}
-
-bool zmq::trie_t::add (unsigned char *prefix_, size_t size_)
-{
-    //  We are at the node corresponding to the prefix. We are done.
-    if (!size_) {
-        ++_refcnt;
-        return _refcnt == 1;
-    }
-
-    const unsigned char c = *prefix_;
-    if (c < _min || c >= _min + _count) {
-        //  The character is out of range of currently handled
-        //  characters. We have to extend the table.
-        if (!_count) {
-            _min = c;
-            _count = 1;
-            _next.node = NULL;
-        } else if (_count == 1) {
-            const unsigned char oldc = _min;
-            trie_t *oldp = _next.node;
-            _count = (_min < c ? c - _min : _min - c) + 1;
-            _next.table =
-              static_cast<trie_t **> (malloc (sizeof (trie_t *) * _count));
-            alloc_assert (_next.table);
-            for (unsigned short i = 0; i != _count; ++i)
-                _next.table[i] = 0;
-            _min = std::min (_min, c);
-            _next.table[oldc - _min] = oldp;
-        } else if (_min < c) {
-            //  The new character is above the current character range.
-            const unsigned short old_count = _count;
-            _count = c - _min + 1;
-            _next.table = static_cast<trie_t **> (
-              realloc (_next.table, sizeof (trie_t *) * _count));
-            zmq_assert (_next.table);
-            for (unsigned short i = old_count; i != _count; i++)
-                _next.table[i] = NULL;
-        } else {
-            //  The new character is below the current character range.
-            const unsigned short old_count = _count;
-            _count = (_min + old_count) - c;
-            _next.table = static_cast<trie_t **> (
-              realloc (_next.table, sizeof (trie_t *) * _count));
-            zmq_assert (_next.table);
-            memmove (_next.table + _min - c, _next.table,
-                     old_count * sizeof (trie_t *));
-            for (unsigned short i = 0; i != _min - c; i++)
-                _next.table[i] = NULL;
-            _min = c;
-        }
-    }
-
-    //  If next node does not exist, create one.
-    if (_count == 1) {
-        if (!_next.node) {
-            _next.node = new (std::nothrow) trie_t;
-            alloc_assert (_next.node);
-            ++_live_nodes;
-            zmq_assert (_live_nodes == 1);
-        }
-        return _next.node->add (prefix_ + 1, size_ - 1);
-    }
-    if (!_next.table[c - _min]) {
-        _next.table[c - _min] = new (std::nothrow) trie_t;
-        alloc_assert (_next.table[c - _min]);
-        ++_live_nodes;
-        zmq_assert (_live_nodes > 1);
-    }
-    return _next.table[c - _min]->add (prefix_ + 1, size_ - 1);
-}
-
-bool zmq::trie_t::rm (unsigned char *prefix_, size_t size_)
-{
-    //  TODO: Shouldn't an error be reported if the key does not exist?
-    if (!size_) {
-        if (!_refcnt)
-            return false;
-        _refcnt--;
-        return _refcnt == 0;
-    }
-    const unsigned char c = *prefix_;
-    if (!_count || c < _min || c >= _min + _count)
-        return false;
-
-    trie_t *next_node = _count == 1 ? _next.node : _next.table[c - _min];
-
-    if (!next_node)
-        return false;
-
-    const bool ret = next_node->rm (prefix_ + 1, size_ - 1);
-
-    //  Prune redundant nodes
-    if (next_node->is_redundant ()) {
-        LIBZMQ_DELETE (next_node);
-        zmq_assert (_count > 0);
-
-        if (_count == 1) {
-            //  The just pruned node is was the only live node
-            _next.node = 0;
-            _count = 0;
-            --_live_nodes;
-            zmq_assert (_live_nodes == 0);
-        } else {
-            _next.table[c - _min] = 0;
-            zmq_assert (_live_nodes > 1);
-            --_live_nodes;
-
-            //  Compact the table if possible
-            if (_live_nodes == 1) {
-                //  We can switch to using the more compact single-node
-                //  representation since the table only contains one live node
-                trie_t *node = 0;
-                //  Since we always compact the table the pruned node must
-                //  either be the left-most or right-most ptr in the node
-                //  table
-                if (c == _min) {
-                    //  The pruned node is the left-most node ptr in the
-                    //  node table => keep the right-most node
-                    node = _next.table[_count - 1];
-                    _min += _count - 1;
-                } else if (c == _min + _count - 1) {
-                    //  The pruned node is the right-most node ptr in the
-                    //  node table => keep the left-most node
-                    node = _next.table[0];
-                }
-                zmq_assert (node);
-                free (_next.table);
-                _next.node = node;
-                _count = 1;
-            } else if (c == _min) {
-                //  We can compact the table "from the left".
-                //  Find the left-most non-null node ptr, which we'll use as
-                //  our new min
-                unsigned char new_min = _min;
-                for (unsigned short i = 1; i < _count; ++i) {
-                    if (_next.table[i]) {
-                        new_min = i + _min;
-                        break;
-                    }
-                }
-                zmq_assert (new_min != _min);
-
-                trie_t **old_table = _next.table;
-                zmq_assert (new_min > _min);
-                zmq_assert (_count > new_min - _min);
-
-                _count = _count - (new_min - _min);
-                _next.table =
-                  static_cast<trie_t **> (malloc (sizeof (trie_t *) * _count));
-                alloc_assert (_next.table);
-
-                memmove (_next.table, old_table + (new_min - _min),
-                         sizeof (trie_t *) * _count);
-                free (old_table);
-
-                _min = new_min;
-            } else if (c == _min + _count - 1) {
-                //  We can compact the table "from the right".
-                //  Find the right-most non-null node ptr, which we'll use to
-                //  determine the new table size
-                unsigned short new_count = _count;
-                for (unsigned short i = 1; i < _count; ++i) {
-                    if (_next.table[_count - 1 - i]) {
-                        new_count = _count - i;
-                        break;
-                    }
-                }
-                zmq_assert (new_count != _count);
-                _count = new_count;
-
-                trie_t **old_table = _next.table;
-                _next.table =
-                  static_cast<trie_t **> (malloc (sizeof (trie_t *) * _count));
-                alloc_assert (_next.table);
-
-                memmove (_next.table, old_table, sizeof (trie_t *) * _count);
-                free (old_table);
-            }
-        }
-    }
-    return ret;
-}
-
-bool zmq::trie_t::check (const unsigned char *data_, size_t size_) const
-{
-    //  This function is on critical path. It deliberately doesn't use
-    //  recursion to get a bit better performance.
-    const trie_t *current = this;
-    while (true) {
-        //  We've found a corresponding subscription!
-        if (current->_refcnt)
-            return true;
-
-        //  We've checked all the data and haven't found matching subscription.
-        if (!size_)
-            return false;
-
-        //  If there's no corresponding slot for the first character
-        //  of the prefix, the message does not match.
-        const unsigned char c = *data_;
-        if (c < current->_min || c >= current->_min + current->_count)
-            return false;
-
-        //  Move to the next character.
-        if (current->_count == 1)
-            current = current->_next.node;
-        else {
-            current = current->_next.table[c - current->_min];
-            if (!current)
-                return false;
-        }
-        data_++;
-        size_--;
-    }
-}
-
-void zmq::trie_t::apply (
-  void (*func_) (unsigned char *data_, size_t size_, void *arg_), void *arg_)
-{
-    unsigned char *buff = NULL;
-    apply_helper (&buff, 0, 0, func_, arg_);
-    free (buff);
-}
-
-void zmq::trie_t::apply_helper (unsigned char **buff_,
-                                size_t buffsize_,
-                                size_t maxbuffsize_,
-                                void (*func_) (unsigned char *data_,
-                                               size_t size_,
-                                               void *arg_),
-                                void *arg_) const
-{
-    //  If this node is a subscription, apply the function.
-    if (_refcnt)
-        func_ (*buff_, buffsize_, arg_);
-
-    //  Adjust the buffer.
-    if (buffsize_ >= maxbuffsize_) {
-        maxbuffsize_ = buffsize_ + 256;
-        *buff_ = static_cast<unsigned char *> (realloc (*buff_, maxbuffsize_));
-        zmq_assert (*buff_);
-    }
-
-    //  If there are no subnodes in the trie, return.
-    if (_count == 0)
-        return;
-
-    //  If there's one subnode (optimisation).
-    if (_count == 1) {
-        (*buff_)[buffsize_] = _min;
-        buffsize_++;
-        _next.node->apply_helper (buff_, buffsize_, maxbuffsize_, func_, arg_);
-        return;
-    }
-
-    //  If there are multiple subnodes.
-    for (unsigned short c = 0; c != _count; c++) {
-        (*buff_)[buffsize_] = _min + c;
-        if (_next.table[c])
-            _next.table[c]->apply_helper (buff_, buffsize_ + 1, maxbuffsize_,
-                                          func_, arg_);
-    }
-}
-
-bool zmq::trie_t::is_redundant () const
-{
-    return _refcnt == 0 && _live_nodes == 0;
-}
diff --git a/libs/libzmq/src/trie.hpp b/libs/libzmq/src/trie.hpp
deleted file mode 100644
index 32a2c2c..0000000
--- a/libs/libzmq/src/trie.hpp
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_TRIE_HPP_INCLUDED__
-#define __ZMQ_TRIE_HPP_INCLUDED__
-
-#include <stddef.h>
-
-#include "macros.hpp"
-#include "stdint.hpp"
-
-namespace zmq
-{
-class trie_t
-{
-  public:
-    trie_t ();
-    ~trie_t ();
-
-    //  Add key to the trie. Returns true if this is a new item in the trie
-    //  rather than a duplicate.
-    bool add (unsigned char *prefix_, size_t size_);
-
-    //  Remove key from the trie. Returns true if the item is actually
-    //  removed from the trie.
-    bool rm (unsigned char *prefix_, size_t size_);
-
-    //  Check whether particular key is in the trie.
-    bool check (const unsigned char *data_, size_t size_) const;
-
-    //  Apply the function supplied to each subscription in the trie.
-    void apply (void (*func_) (unsigned char *data_, size_t size_, void *arg_),
-                void *arg_);
-
-  private:
-    void apply_helper (unsigned char **buff_,
-                       size_t buffsize_,
-                       size_t maxbuffsize_,
-                       void (*func_) (unsigned char *data_,
-                                      size_t size_,
-                                      void *arg_),
-                       void *arg_) const;
-    bool is_redundant () const;
-
-    uint32_t _refcnt;
-    unsigned char _min;
-    unsigned short _count;
-    unsigned short _live_nodes;
-    union
-    {
-        class trie_t *node;
-        class trie_t **table;
-    } _next;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (trie_t)
-};
-}
-
-#endif
diff --git a/libs/libzmq/src/tweetnacl.c b/libs/libzmq/src/tweetnacl.c
deleted file mode 100644
index 6e6f657..0000000
--- a/libs/libzmq/src/tweetnacl.c
+++ /dev/null
@@ -1,993 +0,0 @@
-/*
-    Copyright (c) 2016-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/*
-    The precompiled header is not used for c files so this is required here.
-*/
-#include "platform.hpp"
-
-#if defined(ZMQ_USE_TWEETNACL)
-
-/*
-    Disable warnings for this source only, rather than for the whole
-    codebase when building with C99 (gcc >= 4.2) or with Microsoft's compiler
-*/
-#if defined __GNUC__                                                           \
-  && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2))                  \
-  && __STDC_VERSION__ < 201112L
-#pragma GCC diagnostic ignored "-Wsign-compare"
-#elif defined _MSC_VER
-#pragma warning(disable : 4018 4244 4146)
-#endif
-
-/* clang-format off */
-
-#include "tweetnacl.h"
-
-#define FOR(i,n) for (i = 0;i < n;++i)
-#define sv static void
-
-static const u8
-  _0[16],
-  _9[32] = {9};
-static const gf
-  gf0,
-  gf1 = {1},
-  _121665 = {0xDB41,1},
-  D = {0x78a3, 0x1359, 0x4dca, 0x75eb, 0xd8ab, 0x4141, 0x0a4d, 0x0070, 0xe898, 0x7779, 0x4079, 0x8cc7, 0xfe73, 0x2b6f, 0x6cee, 0x5203},
-  D2 = {0xf159, 0x26b2, 0x9b94, 0xebd6, 0xb156, 0x8283, 0x149a, 0x00e0, 0xd130, 0xeef3, 0x80f2, 0x198e, 0xfce7, 0x56df, 0xd9dc, 0x2406},
-  X = {0xd51a, 0x8f25, 0x2d60, 0xc956, 0xa7b2, 0x9525, 0xc760, 0x692c, 0xdc5c, 0xfdd6, 0xe231, 0xc0a4, 0x53fe, 0xcd6e, 0x36d3, 0x2169},
-  Y = {0x6658, 0x6666, 0x6666, 0x6666, 0x6666, 0x6666, 0x6666, 0x6666, 0x6666, 0x6666, 0x6666, 0x6666, 0x6666, 0x6666, 0x6666, 0x6666},
-  I = {0xa0b0, 0x4a0e, 0x1b27, 0xc4ee, 0xe478, 0xad2f, 0x1806, 0x2f43, 0xd7a7, 0x3dfb, 0x0099, 0x2b4d, 0xdf0b, 0x4fc1, 0x2480, 0x2b83};
-
-static u32 L32(u32 x,int c) { return (x << c) | ((x&0xffffffff) >> (32 - c)); }
-
-static u32 ld32(const u8 *x)
-{
-  u32 u = x[3];
-  u = (u<<8)|x[2];
-  u = (u<<8)|x[1];
-  return (u<<8)|x[0];
-}
-
-static u64 dl64(const u8 *x)
-{
-  u64 i,u=0;
-  FOR(i,8) u=(u<<8)|x[i];
-  return u;
-}
-
-sv st32(u8 *x,u32 u)
-{
-  int i;
-  FOR(i,4) { x[i] = u; u >>= 8; }
-}
-
-sv ts64(u8 *x,u64 u)
-{
-  int i;
-  for (i = 7;i >= 0;--i) { x[i] = u; u >>= 8; }
-}
-
-static int vn(const u8 *x,const u8 *y,int n)
-{
-  u32 i,d = 0;
-  FOR(i,n) d |= x[i]^y[i];
-  return (1 & ((d - 1) >> 8)) - 1;
-}
-
-int crypto_verify_16(const u8 *x,const u8 *y)
-{
-  return vn(x,y,16);
-}
-
-int crypto_verify_32(const u8 *x,const u8 *y)
-{
-  return vn(x,y,32);
-}
-
-sv core(u8 *out,const u8 *in,const u8 *k,const u8 *c,int h)
-{
-  u32 w[16],x[16],y[16],t[4];
-  int i,j,m;
-
-  FOR(i,4) {
-    x[5*i] = ld32(c+4*i);
-    x[1+i] = ld32(k+4*i);
-    x[6+i] = ld32(in+4*i);
-    x[11+i] = ld32(k+16+4*i);
-  }
-
-  FOR(i,16) y[i] = x[i];
-
-  FOR(i,20) {
-    FOR(j,4) {
-      FOR(m,4) t[m] = x[(5*j+4*m)%16];
-      t[1] ^= L32(t[0]+t[3], 7);
-      t[2] ^= L32(t[1]+t[0], 9);
-      t[3] ^= L32(t[2]+t[1],13);
-      t[0] ^= L32(t[3]+t[2],18);
-      FOR(m,4) w[4*j+(j+m)%4] = t[m];
-    }
-    FOR(m,16) x[m] = w[m];
-  }
-
-  if (h) {
-    FOR(i,16) x[i] += y[i];
-    FOR(i,4) {
-      x[5*i] -= ld32(c+4*i);
-      x[6+i] -= ld32(in+4*i);
-    }
-    FOR(i,4) {
-      st32(out+4*i,x[5*i]);
-      st32(out+16+4*i,x[6+i]);
-    }
-  } else
-    FOR(i,16) st32(out + 4 * i,x[i] + y[i]);
-}
-
-int crypto_core_salsa20(u8 *out,const u8 *in,const u8 *k,const u8 *c)
-{
-  core(out,in,k,c,0);
-  return 0;
-}
-
-int crypto_core_hsalsa20(u8 *out,const u8 *in,const u8 *k,const u8 *c)
-{
-  core(out,in,k,c,1);
-  return 0;
-}
-
-static const u8 sigma[16] = "expand 32-byte k";
-
-int crypto_stream_salsa20_xor(u8 *c,const u8 *m,u64 b,const u8 *n,const u8 *k)
-{
-  u8 z[16],x[64];
-  u32 u,i;
-  if (!b) return 0;
-  FOR(i,16) z[i] = 0;
-  FOR(i,8) z[i] = n[i];
-  while (b >= 64) {
-    crypto_core_salsa20(x,z,k,sigma);
-    FOR(i,64) c[i] = (m?m[i]:0) ^ x[i];
-    u = 1;
-    for (i = 8;i < 16;++i) {
-      u += (u32) z[i];
-      z[i] = u;
-      u >>= 8;
-    }
-    b -= 64;
-    c += 64;
-    if (m) m += 64;
-  }
-  if (b) {
-    crypto_core_salsa20(x,z,k,sigma);
-    FOR(i,b) c[i] = (m?m[i]:0) ^ x[i];
-  }
-  return 0;
-}
-
-int crypto_stream_salsa20(u8 *c,u64 d,const u8 *n,const u8 *k)
-{
-  return crypto_stream_salsa20_xor(c,0,d,n,k);
-}
-
-int crypto_stream(u8 *c,u64 d,const u8 *n,const u8 *k)
-{
-  u8 s[32];
-  crypto_core_hsalsa20(s,n,k,sigma);
-  return crypto_stream_salsa20(c,d,n+16,s);
-}
-
-int crypto_stream_xor(u8 *c,const u8 *m,u64 d,const u8 *n,const u8 *k)
-{
-  u8 s[32];
-  crypto_core_hsalsa20(s,n,k,sigma);
-  return crypto_stream_salsa20_xor(c,m,d,n+16,s);
-}
-
-sv add1305(u32 *h,const u32 *c)
-{
-  u32 j,u = 0;
-  FOR(j,17) {
-    u += h[j] + c[j];
-    h[j] = u & 255;
-    u >>= 8;
-  }
-}
-
-static const u32 minusp[17] = {
-  5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 252
-} ;
-
-int crypto_onetimeauth(u8 *out,const u8 *m,u64 n,const u8 *k)
-{
-  u32 s,i,j,u,x[17],r[17],h[17],c[17],g[17];
-
-  FOR(j,17) r[j]=h[j]=0;
-  FOR(j,16) r[j]=k[j];
-  r[3]&=15;
-  r[4]&=252;
-  r[7]&=15;
-  r[8]&=252;
-  r[11]&=15;
-  r[12]&=252;
-  r[15]&=15;
-
-  while (n > 0) {
-    FOR(j,17) c[j] = 0;
-    for (j = 0;(j < 16) && (j < n);++j) c[j] = m[j];
-    c[j] = 1;
-    m += j; n -= j;
-    add1305(h,c);
-    FOR(i,17) {
-      x[i] = 0;
-      FOR(j,17) x[i] += h[j] * ((j <= i) ? r[i - j] : 320 * r[i + 17 - j]);
-    }
-    FOR(i,17) h[i] = x[i];
-    u = 0;
-    FOR(j,16) {
-      u += h[j];
-      h[j] = u & 255;
-      u >>= 8;
-    }
-    u += h[16]; h[16] = u & 3;
-    u = 5 * (u >> 2);
-    FOR(j,16) {
-      u += h[j];
-      h[j] = u & 255;
-      u >>= 8;
-    }
-    u += h[16]; h[16] = u;
-  }
-
-  FOR(j,17) g[j] = h[j];
-  add1305(h,minusp);
-  s = -(h[16] >> 7);
-  FOR(j,17) h[j] ^= s & (g[j] ^ h[j]);
-
-  FOR(j,16) c[j] = k[j + 16];
-  c[16] = 0;
-  add1305(h,c);
-  FOR(j,16) out[j] = h[j];
-  return 0;
-}
-
-int crypto_onetimeauth_verify(const u8 *h,const u8 *m,u64 n,const u8 *k)
-{
-  u8 x[16];
-  crypto_onetimeauth(x,m,n,k);
-  return crypto_verify_16(h,x);
-}
-
-int crypto_secretbox(u8 *c,const u8 *m,u64 d,const u8 *n,const u8 *k)
-{
-  int i;
-  if (d < 32) return -1;
-  crypto_stream_xor(c,m,d,n,k);
-  crypto_onetimeauth(c + 16,c + 32,d - 32,c);
-  FOR(i,16) c[i] = 0;
-  return 0;
-}
-
-int crypto_secretbox_open(u8 *m,const u8 *c,u64 d,const u8 *n,const u8 *k)
-{
-  int i;
-  u8 x[32];
-  if (d < 32) return -1;
-  crypto_stream(x,32,n,k);
-  if (crypto_onetimeauth_verify(c + 16,c + 32,d - 32,x) != 0) return -1;
-  crypto_stream_xor(m,c,d,n,k);
-  FOR(i,32) m[i] = 0;
-  return 0;
-}
-
-sv set25519(gf r, const gf a)
-{
-  int i;
-  FOR(i,16) r[i]=a[i];
-}
-
-sv car25519(gf o)
-{
-  int i;
-  i64 c;
-  FOR(i,16) {
-    o[i]+=(1LL<<16);
-    c=o[i]>>16;
-    o[(i+1)*(i<15)]+=c-1+37*(c-1)*(i==15);
-    o[i]-=c<<16;
-  }
-}
-
-sv sel25519(gf p,gf q,int b)
-{
-  i64 t,i,c=~(b-1);
-  FOR(i,16) {
-    t= c&(p[i]^q[i]);
-    p[i]^=t;
-    q[i]^=t;
-  }
-}
-
-sv pack25519(u8 *o,const gf n)
-{
-  int i,j,b;
-  gf m,t;
-  FOR(i,16) t[i]=n[i];
-  car25519(t);
-  car25519(t);
-  car25519(t);
-  FOR(j,2) {
-    m[0]=t[0]-0xffed;
-    for(i=1;i<15;i++) {
-      m[i]=t[i]-0xffff-((m[i-1]>>16)&1);
-      m[i-1]&=0xffff;
-    }
-    m[15]=t[15]-0x7fff-((m[14]>>16)&1);
-    b=(m[15]>>16)&1;
-    m[14]&=0xffff;
-    sel25519(t,m,1-b);
-  }
-  FOR(i,16) {
-    o[2*i]=t[i]&0xff;
-    o[2*i+1]=t[i]>>8;
-  }
-}
-
-static int neq25519(const gf a, const gf b)
-{
-  u8 c[32],d[32];
-  pack25519(c,a);
-  pack25519(d,b);
-  return crypto_verify_32(c,d);
-}
-
-static u8 par25519(const gf a)
-{
-  u8 d[32];
-  pack25519(d,a);
-  return d[0]&1;
-}
-
-sv unpack25519(gf o, const u8 *n)
-{
-  int i;
-  FOR(i,16) o[i]=n[2*i]+((i64)n[2*i+1]<<8);
-  o[15]&=0x7fff;
-}
-
-sv A(gf o,const gf a,const gf b)
-{
-  int i;
-  FOR(i,16) o[i]=a[i]+b[i];
-}
-
-sv Z(gf o,const gf a,const gf b)
-{
-  int i;
-  FOR(i,16) o[i]=a[i]-b[i];
-}
-
-sv M(gf o,const gf a,const gf b)
-{
-  i64 i,j,t[31];
-  FOR(i,31) t[i]=0;
-  FOR(i,16) FOR(j,16) t[i+j]+=a[i]*b[j];
-  FOR(i,15) t[i]+=38*t[i+16];
-  FOR(i,16) o[i]=t[i];
-  car25519(o);
-  car25519(o);
-}
-
-sv S(gf o,const gf a)
-{
-  M(o,a,a);
-}
-
-sv inv25519(gf o,const gf i)
-{
-  gf c;
-  int a;
-  FOR(a,16) c[a]=i[a];
-  for(a=253;a>=0;a--) {
-    S(c,c);
-    if(a!=2&&a!=4) M(c,c,i);
-  }
-  FOR(a,16) o[a]=c[a];
-}
-
-sv pow2523(gf o,const gf i)
-{
-  gf c;
-  int a;
-  FOR(a,16) c[a]=i[a];
-  for(a=250;a>=0;a--) {
-    S(c,c);
-    if(a!=1) M(c,c,i);
-  }
-  FOR(a,16) o[a]=c[a];
-}
-
-int crypto_scalarmult(u8 *q,const u8 *n,const u8 *p)
-{
-  u8 z[32];
-  i64 x[80],r,i;
-  gf a,b,c,d,e,f;
-  FOR(i,31) z[i]=n[i];
-  z[31]=(n[31]&127)|64;
-  z[0]&=248;
-  unpack25519(x,p);
-  FOR(i,16) {
-    b[i]=x[i];
-    d[i]=a[i]=c[i]=0;
-  }
-  a[0]=d[0]=1;
-  for(i=254;i>=0;--i) {
-    r=(z[i>>3]>>(i&7))&1;
-    sel25519(a,b,r);
-    sel25519(c,d,r);
-    A(e,a,c);
-    Z(a,a,c);
-    A(c,b,d);
-    Z(b,b,d);
-    S(d,e);
-    S(f,a);
-    M(a,c,a);
-    M(c,b,e);
-    A(e,a,c);
-    Z(a,a,c);
-    S(b,a);
-    Z(c,d,f);
-    M(a,c,_121665);
-    A(a,a,d);
-    M(c,c,a);
-    M(a,d,f);
-    M(d,b,x);
-    S(b,e);
-    sel25519(a,b,r);
-    sel25519(c,d,r);
-  }
-  FOR(i,16) {
-    x[i+16]=a[i];
-    x[i+32]=c[i];
-    x[i+48]=b[i];
-    x[i+64]=d[i];
-  }
-  inv25519(x+32,x+32);
-  M(x+16,x+16,x+32);
-  pack25519(q,x+16);
-  return 0;
-}
-
-int crypto_scalarmult_base(u8 *q,const u8 *n)
-{
-  return crypto_scalarmult(q,n,_9);
-}
-
-int crypto_box_keypair(u8 *y,u8 *x)
-{
-  randombytes(x,32);
-  return crypto_scalarmult_base(y,x);
-}
-
-int crypto_box_beforenm(u8 *k,const u8 *y,const u8 *x)
-{
-  u8 s[32];
-  crypto_scalarmult(s,x,y);
-  return crypto_core_hsalsa20(k,_0,s,sigma);
-}
-
-int crypto_box_afternm(u8 *c,const u8 *m,u64 d,const u8 *n,const u8 *k)
-{
-  return crypto_secretbox(c,m,d,n,k);
-}
-
-int crypto_box_open_afternm(u8 *m,const u8 *c,u64 d,const u8 *n,const u8 *k)
-{
-  return crypto_secretbox_open(m,c,d,n,k);
-}
-
-int crypto_box(u8 *c,const u8 *m,u64 d,const u8 *n,const u8 *y,const u8 *x)
-{
-  u8 k[32];
-  crypto_box_beforenm(k,y,x);
-  return crypto_box_afternm(c,m,d,n,k);
-}
-
-int crypto_box_open(u8 *m,const u8 *c,u64 d,const u8 *n,const u8 *y,const u8 *x)
-{
-  u8 k[32];
-  crypto_box_beforenm(k,y,x);
-  return crypto_box_open_afternm(m,c,d,n,k);
-}
-
-static u64 R(u64 x,int c) { return (x >> c) | (x << (64 - c)); }
-static u64 Ch(u64 x,u64 y,u64 z) { return (x & y) ^ (~x & z); }
-static u64 Maj(u64 x,u64 y,u64 z) { return (x & y) ^ (x & z) ^ (y & z); }
-static u64 Sigma0(u64 x) { return R(x,28) ^ R(x,34) ^ R(x,39); }
-static u64 Sigma1(u64 x) { return R(x,14) ^ R(x,18) ^ R(x,41); }
-static u64 sigma0(u64 x) { return R(x, 1) ^ R(x, 8) ^ (x >> 7); }
-static u64 sigma1(u64 x) { return R(x,19) ^ R(x,61) ^ (x >> 6); }
-
-static const u64 K[80] =
-{
-  0x428a2f98d728ae22ULL, 0x7137449123ef65cdULL, 0xb5c0fbcfec4d3b2fULL, 0xe9b5dba58189dbbcULL,
-  0x3956c25bf348b538ULL, 0x59f111f1b605d019ULL, 0x923f82a4af194f9bULL, 0xab1c5ed5da6d8118ULL,
-  0xd807aa98a3030242ULL, 0x12835b0145706fbeULL, 0x243185be4ee4b28cULL, 0x550c7dc3d5ffb4e2ULL,
-  0x72be5d74f27b896fULL, 0x80deb1fe3b1696b1ULL, 0x9bdc06a725c71235ULL, 0xc19bf174cf692694ULL,
-  0xe49b69c19ef14ad2ULL, 0xefbe4786384f25e3ULL, 0x0fc19dc68b8cd5b5ULL, 0x240ca1cc77ac9c65ULL,
-  0x2de92c6f592b0275ULL, 0x4a7484aa6ea6e483ULL, 0x5cb0a9dcbd41fbd4ULL, 0x76f988da831153b5ULL,
-  0x983e5152ee66dfabULL, 0xa831c66d2db43210ULL, 0xb00327c898fb213fULL, 0xbf597fc7beef0ee4ULL,
-  0xc6e00bf33da88fc2ULL, 0xd5a79147930aa725ULL, 0x06ca6351e003826fULL, 0x142929670a0e6e70ULL,
-  0x27b70a8546d22ffcULL, 0x2e1b21385c26c926ULL, 0x4d2c6dfc5ac42aedULL, 0x53380d139d95b3dfULL,
-  0x650a73548baf63deULL, 0x766a0abb3c77b2a8ULL, 0x81c2c92e47edaee6ULL, 0x92722c851482353bULL,
-  0xa2bfe8a14cf10364ULL, 0xa81a664bbc423001ULL, 0xc24b8b70d0f89791ULL, 0xc76c51a30654be30ULL,
-  0xd192e819d6ef5218ULL, 0xd69906245565a910ULL, 0xf40e35855771202aULL, 0x106aa07032bbd1b8ULL,
-  0x19a4c116b8d2d0c8ULL, 0x1e376c085141ab53ULL, 0x2748774cdf8eeb99ULL, 0x34b0bcb5e19b48a8ULL,
-  0x391c0cb3c5c95a63ULL, 0x4ed8aa4ae3418acbULL, 0x5b9cca4f7763e373ULL, 0x682e6ff3d6b2b8a3ULL,
-  0x748f82ee5defb2fcULL, 0x78a5636f43172f60ULL, 0x84c87814a1f0ab72ULL, 0x8cc702081a6439ecULL,
-  0x90befffa23631e28ULL, 0xa4506cebde82bde9ULL, 0xbef9a3f7b2c67915ULL, 0xc67178f2e372532bULL,
-  0xca273eceea26619cULL, 0xd186b8c721c0c207ULL, 0xeada7dd6cde0eb1eULL, 0xf57d4f7fee6ed178ULL,
-  0x06f067aa72176fbaULL, 0x0a637dc5a2c898a6ULL, 0x113f9804bef90daeULL, 0x1b710b35131c471bULL,
-  0x28db77f523047d84ULL, 0x32caab7b40c72493ULL, 0x3c9ebe0a15c9bebcULL, 0x431d67c49c100d4cULL,
-  0x4cc5d4becb3e42b6ULL, 0x597f299cfc657e2aULL, 0x5fcb6fab3ad6faecULL, 0x6c44198c4a475817ULL
-};
-
-int crypto_hashblocks(u8 *x,const u8 *m,u64 n)
-{
-  u64 z[8],b[8],a[8],w[16],t;
-  int i,j;
-
-  FOR(i,8) z[i] = a[i] = dl64(x + 8 * i);
-
-  while (n >= 128) {
-    FOR(i,16) w[i] = dl64(m + 8 * i);
-
-    FOR(i,80) {
-      FOR(j,8) b[j] = a[j];
-      t = a[7] + Sigma1(a[4]) + Ch(a[4],a[5],a[6]) + K[i] + w[i%16];
-      b[7] = t + Sigma0(a[0]) + Maj(a[0],a[1],a[2]);
-      b[3] += t;
-      FOR(j,8) a[(j+1)%8] = b[j];
-      if (i%16 == 15)
-        FOR(j,16)
-          w[j] += w[(j+9)%16] + sigma0(w[(j+1)%16]) + sigma1(w[(j+14)%16]);
-    }
-
-    FOR(i,8) { a[i] += z[i]; z[i] = a[i]; }
-
-    m += 128;
-    n -= 128;
-  }
-
-  FOR(i,8) ts64(x+8*i,z[i]);
-
-  return n;
-}
-
-static const u8 iv[64] = {
-  0x6a,0x09,0xe6,0x67,0xf3,0xbc,0xc9,0x08,
-  0xbb,0x67,0xae,0x85,0x84,0xca,0xa7,0x3b,
-  0x3c,0x6e,0xf3,0x72,0xfe,0x94,0xf8,0x2b,
-  0xa5,0x4f,0xf5,0x3a,0x5f,0x1d,0x36,0xf1,
-  0x51,0x0e,0x52,0x7f,0xad,0xe6,0x82,0xd1,
-  0x9b,0x05,0x68,0x8c,0x2b,0x3e,0x6c,0x1f,
-  0x1f,0x83,0xd9,0xab,0xfb,0x41,0xbd,0x6b,
-  0x5b,0xe0,0xcd,0x19,0x13,0x7e,0x21,0x79
-} ;
-
-int crypto_hash(u8 *out,const u8 *m,u64 n)
-{
-  u8 h[64],x[256];
-  u64 i,b = n;
-
-  FOR(i,64) h[i] = iv[i];
-
-  crypto_hashblocks(h,m,n);
-  m += n;
-  n &= 127;
-  m -= n;
-
-  FOR(i,256) x[i] = 0;
-  FOR(i,n) x[i] = m[i];
-  x[n] = 128;
-
-  n = 256-128*(n<112);
-  x[n-9] = b >> 61;
-  ts64(x+n-8,b<<3);
-  crypto_hashblocks(h,x,n);
-
-  FOR(i,64) out[i] = h[i];
-
-  return 0;
-}
-
-sv add(gf p[4],gf q[4])
-{
-  gf a,b,c,d,t,e,f,g,h;
-
-  Z(a, p[1], p[0]);
-  Z(t, q[1], q[0]);
-  M(a, a, t);
-  A(b, p[0], p[1]);
-  A(t, q[0], q[1]);
-  M(b, b, t);
-  M(c, p[3], q[3]);
-  M(c, c, D2);
-  M(d, p[2], q[2]);
-  A(d, d, d);
-  Z(e, b, a);
-  Z(f, d, c);
-  A(g, d, c);
-  A(h, b, a);
-
-  M(p[0], e, f);
-  M(p[1], h, g);
-  M(p[2], g, f);
-  M(p[3], e, h);
-}
-
-sv cswap(gf p[4],gf q[4],u8 b)
-{
-  int i;
-  FOR(i,4)
-    sel25519(p[i],q[i],b);
-}
-
-sv pack(u8 *r,gf p[4])
-{
-  gf tx, ty, zi;
-  inv25519(zi, p[2]);
-  M(tx, p[0], zi);
-  M(ty, p[1], zi);
-  pack25519(r, ty);
-  r[31] ^= par25519(tx) << 7;
-}
-
-sv scalarmult(gf p[4],gf q[4],const u8 *s)
-{
-  int i;
-  set25519(p[0],gf0);
-  set25519(p[1],gf1);
-  set25519(p[2],gf1);
-  set25519(p[3],gf0);
-  for (i = 255;i >= 0;--i) {
-      const u8 b = (s[i/8]>>(i&7))&1;
-    cswap(p,q,b);
-    add(q,p);
-    add(p,p);
-    cswap(p,q,b);
-  }
-}
-
-sv scalarbase(gf p[4],const u8 *s)
-{
-  gf q[4];
-  set25519(q[0],X);
-  set25519(q[1],Y);
-  set25519(q[2],gf1);
-  M(q[3],X,Y);
-  scalarmult(p,q,s);
-}
-
-int crypto_sign_keypair(u8 *pk, u8 *sk)
-{
-  u8 d[64];
-  gf p[4];
-  int i;
-
-  randombytes(sk, 32);
-  crypto_hash(d, sk, 32);
-  d[0] &= 248;
-  d[31] &= 127;
-  d[31] |= 64;
-
-  scalarbase(p,d);
-  pack(pk,p);
-
-  FOR(i,32) sk[32 + i] = pk[i];
-  return 0;
-}
-
-static const u64 L[32] = {0xed, 0xd3, 0xf5, 0x5c, 0x1a, 0x63, 0x12, 0x58, 0xd6, 0x9c, 0xf7, 0xa2, 0xde, 0xf9, 0xde, 0x14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x10};
-
-sv modL(u8 *r,i64 x[64])
-{
-  i64 carry,i,j;
-  for (i = 63;i >= 32;--i) {
-    carry = 0;
-    for (j = i - 32;j < i - 12;++j) {
-      x[j] += carry - 16 * x[i] * L[j - (i - 32)];
-      carry = (x[j] + 128) >> 8;
-      x[j] -= carry << 8;
-    }
-    x[j] += carry;
-    x[i] = 0;
-  }
-  carry = 0;
-  FOR(j,32) {
-    x[j] += carry - (x[31] >> 4) * L[j];
-    carry = x[j] >> 8;
-    x[j] &= 255;
-  }
-  FOR(j,32) x[j] -= carry * L[j];
-  FOR(i,32) {
-    x[i+1] += x[i] >> 8;
-    r[i] = x[i] & 255;
-  }
-}
-
-sv reduce(u8 *r)
-{
-  i64 x[64],i;
-  FOR(i,64) x[i] = (u64) r[i];
-  FOR(i,64) r[i] = 0;
-  modL(r,x);
-}
-
-int crypto_sign(u8 *sm,u64 *smlen,const u8 *m,u64 n,const u8 *sk)
-{
-  u8 d[64],h[64],r[64];
-  i64 i,j,x[64];
-  gf p[4];
-
-  crypto_hash(d, sk, 32);
-  d[0] &= 248;
-  d[31] &= 127;
-  d[31] |= 64;
-
-  *smlen = n+64;
-  FOR(i,n) sm[64 + i] = m[i];
-  FOR(i,32) sm[32 + i] = d[32 + i];
-
-  crypto_hash(r, sm+32, n+32);
-  reduce(r);
-  scalarbase(p,r);
-  pack(sm,p);
-
-  FOR(i,32) sm[i+32] = sk[i+32];
-  crypto_hash(h,sm,n + 64);
-  reduce(h);
-
-  FOR(i,64) x[i] = 0;
-  FOR(i,32) x[i] = (u64) r[i];
-  FOR(i,32) FOR(j,32) x[i+j] += h[i] * (u64) d[j];
-  modL(sm + 32,x);
-
-  return 0;
-}
-
-static int unpackneg(gf r[4],const u8 p[32])
-{
-  gf t, chk, num, den, den2, den4, den6;
-  set25519(r[2],gf1);
-  unpack25519(r[1],p);
-  S(num,r[1]);
-  M(den,num,D);
-  Z(num,num,r[2]);
-  A(den,r[2],den);
-
-  S(den2,den);
-  S(den4,den2);
-  M(den6,den4,den2);
-  M(t,den6,num);
-  M(t,t,den);
-
-  pow2523(t,t);
-  M(t,t,num);
-  M(t,t,den);
-  M(t,t,den);
-  M(r[0],t,den);
-
-  S(chk,r[0]);
-  M(chk,chk,den);
-  if (neq25519(chk, num)) M(r[0],r[0],I);
-
-  S(chk,r[0]);
-  M(chk,chk,den);
-  if (neq25519(chk, num)) return -1;
-
-  if (par25519(r[0]) == (p[31]>>7)) Z(r[0],gf0,r[0]);
-
-  M(r[3],r[0],r[1]);
-  return 0;
-}
-
-int crypto_sign_open(u8 *m,u64 *mlen,const u8 *sm,u64 n,const u8 *pk)
-{
-  int i;
-  u8 t[32],h[64];
-  gf p[4],q[4];
-
-  *mlen = -1;
-  if (n < 64) return -1;
-
-  if (unpackneg(q,pk)) return -1;
-
-  FOR(i,n) m[i] = sm[i];
-  FOR(i,32) m[i+32] = pk[i];
-  crypto_hash(h,m,n);
-  reduce(h);
-  scalarmult(p,q,h);
-
-  scalarbase(q,sm + 32);
-  add(p,q);
-  pack(t,p);
-
-  n -= 64;
-  if (crypto_verify_32(sm, t)) {
-    FOR(i,n) m[i] = 0;
-    return -1;
-  }
-
-  FOR(i,n) m[i] = sm[i + 64];
-  *mlen = n;
-  return 0;
-}
-
-
-#ifdef ZMQ_HAVE_WINDOWS
-
-#include <windows.h>
-#include <wincrypt.h>
-
-#define NCP ((HCRYPTPROV) 0)
-
-HCRYPTPROV hProvider = NCP;
-
-void randombytes(unsigned char *x,unsigned long long xlen)
-{
-    unsigned i;
-    BOOL ret;
-
-    if (hProvider == NCP) {
-        for (;;) {
-            ret = CryptAcquireContext(&hProvider, NULL, NULL,
-                                      PROV_RSA_FULL, CRYPT_VERIFYCONTEXT | CRYPT_SILENT);
-            if (ret != FALSE)
-                break;
-            Sleep (1);
-        }
-    }
-    while (xlen > 0) {
-        if (xlen < 1048576)
-            i = (unsigned) xlen;
-        else
-            i = 1048576;
-
-        ret = CryptGenRandom(hProvider, i, x);
-        if (ret == FALSE) {
-            Sleep(1);
-            continue;
-        }
-        x += i;
-        xlen -= i;
-    }
-}
-
-int randombytes_close(void)
-{
-    int rc = -1;
-    if ((hProvider != NCP) && (CryptReleaseContext(hProvider, 0) != FALSE)) {
-        hProvider = NCP;
-        rc = 0;
-    }
-    return rc;
-}
-
-int sodium_init (void)
-{
-    return 0;
-}
-
-#else
-
-#include <unistd.h>
-#include <assert.h>
-
-#ifdef ZMQ_HAVE_GETRANDOM
-#include <sys/random.h>
-#else
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-
-static int fd = -1;
-#endif
-
-void randombytes (unsigned char *x,unsigned long long xlen)
-{
-    int i;
-#ifndef ZMQ_HAVE_GETRANDOM
-    /*  Require that random_open has already been called, to avoid
-        race conditions. */
-    assert (fd != -1);
-#endif
-    while (xlen > 0) {
-        if (xlen < 1048576)
-            i = xlen;
-        else
-            i = 1048576;
-
-#ifdef ZMQ_HAVE_GETRANDOM
-        i = getrandom (x, i, 0);
-#else
-        i = read(fd,x,i);
-#endif
-        if (i < 1) {
-            sleep (1);
-            continue;
-        }
-        x += i;
-        xlen -= i;
-    }
-}
-
-/*  Do not call manually! Use random_close from random.hpp */
-int randombytes_close (void)
-{
-    int rc = -1;
-#ifndef ZMQ_HAVE_GETRANDOM
-    if (fd != -1 && close(fd) == 0) {
-        fd = -1;
-        rc = 0;
-    }
-#endif /* ZMQ_HAVE_GETRANDOM */
-    return rc;
-}
-
-/*  Do not call manually! Use random_open from random.hpp */
-int sodium_init (void)
-{
-#ifndef ZMQ_HAVE_GETRANDOM
-    if (fd == -1) {
-        for (;;) {
-            int flags = O_RDONLY;
-#ifdef ZMQ_HAVE_O_CLOEXEC
-            flags |= O_CLOEXEC;
-#endif
-            fd = open ("/dev/urandom", flags);
-            if (fd != -1)
-                break;
-            sleep (1);
-        }
-#if !defined ZMQ_HAVE_O_CLOEXEC && defined FD_CLOEXEC
-        int rc = fcntl (fd, F_SETFD, FD_CLOEXEC);
-        assert (rc != -1);
-#endif
-    }
-#endif /* ZMQ_HAVE_GETRANDOM */
-    return 0;
-}
-
-#endif
-
-#endif
-/* clang-format on */
diff --git a/libs/libzmq/src/tweetnacl.h b/libs/libzmq/src/tweetnacl.h
deleted file mode 100644
index 28fd9c1..0000000
--- a/libs/libzmq/src/tweetnacl.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
-    Copyright (c) 2016-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef TWEETNACL_H
-#define TWEETNACL_H
-
-#if defined(ZMQ_USE_TWEETNACL)
-
-#define crypto_box_SECRETKEYBYTES 32
-#define crypto_box_BOXZEROBYTES 16
-#define crypto_box_NONCEBYTES 24
-#define crypto_box_ZEROBYTES 32
-#define crypto_box_PUBLICKEYBYTES 32
-#define crypto_box_BEFORENMBYTES 32
-#define crypto_secretbox_KEYBYTES 32
-#define crypto_secretbox_NONCEBYTES 24
-#define crypto_secretbox_ZEROBYTES 32
-#define crypto_secretbox_BOXZEROBYTES 16
-typedef unsigned char u8;
-typedef unsigned long u32;
-typedef unsigned long long u64;
-typedef long long i64;
-typedef i64 gf[16];
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-void randombytes (unsigned char *, unsigned long long);
-/* Do not call manually! Use random_close from random.hpp */
-int randombytes_close (void);
-/* Do not call manually! Use random_open from random.hpp */
-int sodium_init (void);
-
-int crypto_box_keypair (u8 *y_, u8 *x_);
-int crypto_box_afternm (
-  u8 *c_, const u8 *m_, u64 d_, const u8 *n_, const u8 *k_);
-int crypto_box_open_afternm (
-  u8 *m_, const u8 *c_, u64 d_, const u8 *n_, const u8 *k_);
-int crypto_box (
-  u8 *c_, const u8 *m_, u64 d_, const u8 *n_, const u8 *y_, const u8 *x_);
-int crypto_box_open (
-  u8 *m_, const u8 *c_, u64 d_, const u8 *n_, const u8 *y_, const u8 *x_);
-int crypto_box_beforenm (u8 *k_, const u8 *y_, const u8 *x_);
-int crypto_scalarmult_base (u8 *q_, const u8 *n_);
-int crypto_secretbox (u8 *c_, const u8 *m_, u64 d_, const u8 *n_, const u8 *k_);
-int crypto_secretbox_open (
-  u8 *m_, const u8 *c_, u64 d_, const u8 *n_, const u8 *k_);
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-
-#endif
diff --git a/libs/libzmq/src/udp_address.cpp b/libs/libzmq/src/udp_address.cpp
deleted file mode 100644
index 5d1713f..0000000
--- a/libs/libzmq/src/udp_address.cpp
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include <string>
-#include <sstream>
-
-#include "macros.hpp"
-#include "udp_address.hpp"
-#include "stdint.hpp"
-#include "err.hpp"
-#include "ip.hpp"
-
-#ifndef ZMQ_HAVE_WINDOWS
-#include <sys/types.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <net/if.h>
-#include <ctype.h>
-#endif
-
-zmq::udp_address_t::udp_address_t () :
-    _bind_interface (-1), _is_multicast (false)
-{
-    _bind_address = ip_addr_t::any (AF_INET);
-    _target_address = ip_addr_t::any (AF_INET);
-}
-
-zmq::udp_address_t::~udp_address_t ()
-{
-}
-
-int zmq::udp_address_t::resolve (const char *name_, bool bind_, bool ipv6_)
-{
-    //  No IPv6 support yet
-    bool has_interface = false;
-
-    _address = name_;
-
-    //  If we have a semicolon then we should have an interface specifier in the
-    //  URL
-    const char *src_delimiter = strrchr (name_, ';');
-    if (src_delimiter) {
-        const std::string src_name (name_, src_delimiter - name_);
-
-        ip_resolver_options_t src_resolver_opts;
-
-        src_resolver_opts
-          .bindable (true)
-          //  Restrict hostname/service to literals to avoid any DNS
-          //  lookups or service-name irregularity due to
-          //  indeterminate socktype.
-          .allow_dns (false)
-          .allow_nic_name (true)
-          .ipv6 (ipv6_)
-          .expect_port (false);
-
-        ip_resolver_t src_resolver (src_resolver_opts);
-
-        const int rc = src_resolver.resolve (&_bind_address, src_name.c_str ());
-
-        if (rc != 0) {
-            return -1;
-        }
-
-        if (_bind_address.is_multicast ()) {
-            //  It doesn't make sense to have a multicast address as a source
-            errno = EINVAL;
-            return -1;
-        }
-
-        //  This is a hack because we need the interface index when binding
-        //  multicast IPv6, we can't do it by address. Unfortunately for the
-        //  time being we don't have a generic platform-independent function to
-        //  resolve an interface index from an address, so we only support it
-        //  when an actual interface name is provided.
-        if (src_name == "*") {
-            _bind_interface = 0;
-        } else {
-#ifdef HAVE_IF_NAMETOINDEX
-            _bind_interface = if_nametoindex (src_name.c_str ());
-            if (_bind_interface == 0) {
-                //  Error, probably not an interface name.
-                _bind_interface = -1;
-            }
-#endif
-        }
-
-        has_interface = true;
-        name_ = src_delimiter + 1;
-    }
-
-    ip_resolver_options_t resolver_opts;
-
-    resolver_opts.bindable (bind_)
-      .allow_dns (!bind_)
-      .allow_nic_name (bind_)
-      .expect_port (true)
-      .ipv6 (ipv6_);
-
-    ip_resolver_t resolver (resolver_opts);
-
-    const int rc = resolver.resolve (&_target_address, name_);
-    if (rc != 0) {
-        return -1;
-    }
-
-    _is_multicast = _target_address.is_multicast ();
-    const uint16_t port = _target_address.port ();
-
-    if (has_interface) {
-        //  If we have an interface specifier then the target address must be a
-        //  multicast address
-        if (!_is_multicast) {
-            errno = EINVAL;
-            return -1;
-        }
-
-        _bind_address.set_port (port);
-    } else {
-        //  If we don't have an explicit interface specifier then the URL is
-        //  ambiguous: if the target address is multicast then it's the
-        //  destination address and the bind address is ANY, if it's unicast
-        //  then it's the bind address when 'bind_' is true and the destination
-        //  otherwise
-        if (_is_multicast || !bind_) {
-            _bind_address = ip_addr_t::any (_target_address.family ());
-            _bind_address.set_port (port);
-            _bind_interface = 0;
-        } else {
-            //  If we were asked for a bind socket and the address
-            //  provided was not multicast then it was really meant as
-            //  a bind address and the target_address is useless.
-            _bind_address = _target_address;
-        }
-    }
-
-    if (_bind_address.family () != _target_address.family ()) {
-        errno = EINVAL;
-        return -1;
-    }
-
-    //  For IPv6 multicast we *must* have an interface index since we can't
-    //  bind by address.
-    if (ipv6_ && _is_multicast && _bind_interface < 0) {
-        errno = ENODEV;
-        return -1;
-    }
-
-    return 0;
-}
-
-int zmq::udp_address_t::family () const
-{
-    return _bind_address.family ();
-}
-
-bool zmq::udp_address_t::is_mcast () const
-{
-    return _is_multicast;
-}
-
-const zmq::ip_addr_t *zmq::udp_address_t::bind_addr () const
-{
-    return &_bind_address;
-}
-
-int zmq::udp_address_t::bind_if () const
-{
-    return _bind_interface;
-}
-
-const zmq::ip_addr_t *zmq::udp_address_t::target_addr () const
-{
-    return &_target_address;
-}
-
-int zmq::udp_address_t::to_string (std::string &addr_)
-{
-    // XXX what do (factor TCP code?)
-    addr_ = _address;
-    return 0;
-}
diff --git a/libs/libzmq/src/udp_address.hpp b/libs/libzmq/src/udp_address.hpp
deleted file mode 100644
index a2530d8..0000000
--- a/libs/libzmq/src/udp_address.hpp
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_UDP_ADDRESS_HPP_INCLUDED__
-#define __ZMQ_UDP_ADDRESS_HPP_INCLUDED__
-
-#if !defined ZMQ_HAVE_WINDOWS
-#include <sys/socket.h>
-#include <netinet/in.h>
-#endif
-
-#include <string>
-
-#include "ip_resolver.hpp"
-
-namespace zmq
-{
-class udp_address_t
-{
-  public:
-    udp_address_t ();
-    virtual ~udp_address_t ();
-
-    int resolve (const char *name_, bool bind_, bool ipv6_);
-
-    //  The opposite to resolve()
-    virtual int to_string (std::string &addr_);
-
-
-    int family () const;
-
-    bool is_mcast () const;
-
-    const ip_addr_t *bind_addr () const;
-    int bind_if () const;
-    const ip_addr_t *target_addr () const;
-
-  private:
-    ip_addr_t _bind_address;
-    int _bind_interface;
-    ip_addr_t _target_address;
-    bool _is_multicast;
-    std::string _address;
-};
-}
-
-#endif
diff --git a/libs/libzmq/src/udp_engine.cpp b/libs/libzmq/src/udp_engine.cpp
deleted file mode 100644
index d09bfe1..0000000
--- a/libs/libzmq/src/udp_engine.cpp
+++ /dev/null
@@ -1,629 +0,0 @@
-/*
-Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-This file is part of libzmq, the ZeroMQ core engine in C++.
-
-libzmq is free software; you can redistribute it and/or modify it under
-the terms of the GNU Lesser General Public License (LGPL) as published
-by the Free Software Foundation; either version 3 of the License, or
-(at your option) any later version.
-
-As a special exception, the Contributors give you permission to link
-this library with independent modules to produce an executable,
-regardless of the license terms of these independent modules, and to
-copy and distribute the resulting executable under terms of your choice,
-provided that you also meet, for each linked independent module, the
-terms and conditions of the license of that module. An independent
-module is a module which is not derived from or based on this library.
-If you modify this library, you must extend this exception to your
-version of the library.
-
-libzmq is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-License for more details.
-
-You should have received a copy of the GNU Lesser General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-
-#if !defined ZMQ_HAVE_WINDOWS
-#include <sys/types.h>
-#include <unistd.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#ifdef ZMQ_HAVE_VXWORKS
-#include <sockLib.h>
-#endif
-#endif
-
-#include "udp_address.hpp"
-#include "udp_engine.hpp"
-#include "session_base.hpp"
-#include "err.hpp"
-#include "ip.hpp"
-
-//  OSX uses a different name for this socket option
-#ifndef IPV6_ADD_MEMBERSHIP
-#define IPV6_ADD_MEMBERSHIP IPV6_JOIN_GROUP
-#endif
-
-#ifdef __APPLE__
-#include <TargetConditionals.h>
-#endif
-
-zmq::udp_engine_t::udp_engine_t (const options_t &options_) :
-    _plugged (false),
-    _fd (-1),
-    _session (NULL),
-    _handle (static_cast<handle_t> (NULL)),
-    _address (NULL),
-    _options (options_),
-    _send_enabled (false),
-    _recv_enabled (false)
-{
-}
-
-zmq::udp_engine_t::~udp_engine_t ()
-{
-    zmq_assert (!_plugged);
-
-    if (_fd != retired_fd) {
-#ifdef ZMQ_HAVE_WINDOWS
-        const int rc = closesocket (_fd);
-        wsa_assert (rc != SOCKET_ERROR);
-#else
-        int rc = close (_fd);
-        errno_assert (rc == 0);
-#endif
-        _fd = retired_fd;
-    }
-}
-
-int zmq::udp_engine_t::init (address_t *address_, bool send_, bool recv_)
-{
-    zmq_assert (address_);
-    zmq_assert (send_ || recv_);
-    _send_enabled = send_;
-    _recv_enabled = recv_;
-    _address = address_;
-
-    _fd = open_socket (_address->resolved.udp_addr->family (), SOCK_DGRAM,
-                       IPPROTO_UDP);
-    if (_fd == retired_fd)
-        return -1;
-
-    unblock_socket (_fd);
-
-    return 0;
-}
-
-void zmq::udp_engine_t::plug (io_thread_t *io_thread_, session_base_t *session_)
-{
-    zmq_assert (!_plugged);
-    _plugged = true;
-
-    zmq_assert (!_session);
-    zmq_assert (session_);
-    _session = session_;
-
-    //  Connect to I/O threads poller object.
-    io_object_t::plug (io_thread_);
-    _handle = add_fd (_fd);
-
-    const udp_address_t *const udp_addr = _address->resolved.udp_addr;
-
-    int rc = 0;
-
-    // Bind the socket to a device if applicable
-    if (!_options.bound_device.empty ()) {
-        rc = rc | bind_to_device (_fd, _options.bound_device);
-        if (rc != 0) {
-            assert_success_or_recoverable (_fd, rc);
-            error (connection_error);
-            return;
-        }
-    }
-
-    if (_send_enabled) {
-        if (!_options.raw_socket) {
-            const ip_addr_t *out = udp_addr->target_addr ();
-            _out_address = out->as_sockaddr ();
-            _out_address_len = out->sockaddr_len ();
-
-            if (out->is_multicast ()) {
-                const bool is_ipv6 = (out->family () == AF_INET6);
-                rc = rc
-                     | set_udp_multicast_loop (_fd, is_ipv6,
-                                               _options.multicast_loop);
-
-                if (_options.multicast_hops > 0) {
-                    rc = rc
-                         | set_udp_multicast_ttl (_fd, is_ipv6,
-                                                  _options.multicast_hops);
-                }
-
-                rc = rc | set_udp_multicast_iface (_fd, is_ipv6, udp_addr);
-            }
-        } else {
-            /// XXX fixme ?
-            _out_address = reinterpret_cast<sockaddr *> (&_raw_address);
-            _out_address_len =
-              static_cast<zmq_socklen_t> (sizeof (sockaddr_in));
-        }
-    }
-
-    if (_recv_enabled) {
-        rc = rc | set_udp_reuse_address (_fd, true);
-
-        const ip_addr_t *bind_addr = udp_addr->bind_addr ();
-        ip_addr_t any = ip_addr_t::any (bind_addr->family ());
-        const ip_addr_t *real_bind_addr;
-
-        const bool multicast = udp_addr->is_mcast ();
-
-        if (multicast) {
-            //  Multicast addresses should be allowed to bind to more than
-            //  one port as all ports should receive the message
-            rc = rc | set_udp_reuse_port (_fd, true);
-
-            //  In multicast we should bind ANY and use the mreq struct to
-            //  specify the interface
-            any.set_port (bind_addr->port ());
-
-            real_bind_addr = &any;
-        } else {
-            real_bind_addr = bind_addr;
-        }
-
-        if (rc != 0) {
-            error (protocol_error);
-            return;
-        }
-
-#ifdef ZMQ_HAVE_VXWORKS
-        rc = rc
-             | bind (_fd, (sockaddr *) real_bind_addr->as_sockaddr (),
-                     real_bind_addr->sockaddr_len ());
-#else
-        rc = rc
-             | bind (_fd, real_bind_addr->as_sockaddr (),
-                     real_bind_addr->sockaddr_len ());
-#endif
-        if (rc != 0) {
-            assert_success_or_recoverable (_fd, rc);
-            error (connection_error);
-            return;
-        }
-
-        if (multicast) {
-            rc = rc | add_membership (_fd, udp_addr);
-        }
-    }
-
-    if (rc != 0) {
-        error (protocol_error);
-    } else {
-        if (_send_enabled) {
-            set_pollout (_handle);
-        }
-
-        if (_recv_enabled) {
-            set_pollin (_handle);
-
-            //  Call restart output to drop all join/leave commands
-            restart_output ();
-        }
-    }
-}
-
-int zmq::udp_engine_t::set_udp_multicast_loop (fd_t s_,
-                                               bool is_ipv6_,
-                                               bool loop_)
-{
-    int level;
-    int optname;
-
-    if (is_ipv6_) {
-        level = IPPROTO_IPV6;
-        optname = IPV6_MULTICAST_LOOP;
-    } else {
-        level = IPPROTO_IP;
-        optname = IP_MULTICAST_LOOP;
-    }
-
-    int loop = loop_ ? 1 : 0;
-    const int rc = setsockopt (s_, level, optname,
-                               reinterpret_cast<char *> (&loop), sizeof (loop));
-    assert_success_or_recoverable (s_, rc);
-    return rc;
-}
-
-int zmq::udp_engine_t::set_udp_multicast_ttl (fd_t s_, bool is_ipv6_, int hops_)
-{
-    int level;
-
-    if (is_ipv6_) {
-        level = IPPROTO_IPV6;
-    } else {
-        level = IPPROTO_IP;
-    }
-
-    const int rc =
-      setsockopt (s_, level, IP_MULTICAST_TTL,
-                  reinterpret_cast<char *> (&hops_), sizeof (hops_));
-    assert_success_or_recoverable (s_, rc);
-    return rc;
-}
-
-int zmq::udp_engine_t::set_udp_multicast_iface (fd_t s_,
-                                                bool is_ipv6_,
-                                                const udp_address_t *addr_)
-{
-    int rc = 0;
-
-    if (is_ipv6_) {
-        int bind_if = addr_->bind_if ();
-
-        if (bind_if > 0) {
-            //  If a bind interface is provided we tell the
-            //  kernel to use it to send multicast packets
-            rc = setsockopt (s_, IPPROTO_IPV6, IPV6_MULTICAST_IF,
-                             reinterpret_cast<char *> (&bind_if),
-                             sizeof (bind_if));
-        }
-    } else {
-        struct in_addr bind_addr = addr_->bind_addr ()->ipv4.sin_addr;
-
-        if (bind_addr.s_addr != INADDR_ANY) {
-            rc = setsockopt (s_, IPPROTO_IP, IP_MULTICAST_IF,
-                             reinterpret_cast<char *> (&bind_addr),
-                             sizeof (bind_addr));
-        }
-    }
-
-    assert_success_or_recoverable (s_, rc);
-    return rc;
-}
-
-int zmq::udp_engine_t::set_udp_reuse_address (fd_t s_, bool on_)
-{
-    int on = on_ ? 1 : 0;
-    const int rc = setsockopt (s_, SOL_SOCKET, SO_REUSEADDR,
-                               reinterpret_cast<char *> (&on), sizeof (on));
-    assert_success_or_recoverable (s_, rc);
-    return rc;
-}
-
-int zmq::udp_engine_t::set_udp_reuse_port (fd_t s_, bool on_)
-{
-#ifndef SO_REUSEPORT
-    return 0;
-#else
-    int on = on_ ? 1 : 0;
-    int rc = setsockopt (s_, SOL_SOCKET, SO_REUSEPORT,
-                         reinterpret_cast<char *> (&on), sizeof (on));
-    assert_success_or_recoverable (s_, rc);
-    return rc;
-#endif
-}
-
-int zmq::udp_engine_t::add_membership (fd_t s_, const udp_address_t *addr_)
-{
-    const ip_addr_t *mcast_addr = addr_->target_addr ();
-    int rc = 0;
-
-    if (mcast_addr->family () == AF_INET) {
-        struct ip_mreq mreq;
-        mreq.imr_multiaddr = mcast_addr->ipv4.sin_addr;
-        mreq.imr_interface = addr_->bind_addr ()->ipv4.sin_addr;
-
-        rc = setsockopt (s_, IPPROTO_IP, IP_ADD_MEMBERSHIP,
-                         reinterpret_cast<char *> (&mreq), sizeof (mreq));
-
-    } else if (mcast_addr->family () == AF_INET6) {
-        struct ipv6_mreq mreq;
-        const int iface = addr_->bind_if ();
-
-        zmq_assert (iface >= -1);
-
-        mreq.ipv6mr_multiaddr = mcast_addr->ipv6.sin6_addr;
-        mreq.ipv6mr_interface = iface;
-
-        rc = setsockopt (s_, IPPROTO_IPV6, IPV6_ADD_MEMBERSHIP,
-                         reinterpret_cast<char *> (&mreq), sizeof (mreq));
-    }
-
-    assert_success_or_recoverable (s_, rc);
-    return rc;
-}
-
-void zmq::udp_engine_t::error (error_reason_t reason_)
-{
-    zmq_assert (_session);
-    _session->engine_error (false, reason_);
-    terminate ();
-}
-
-void zmq::udp_engine_t::terminate ()
-{
-    zmq_assert (_plugged);
-    _plugged = false;
-
-    rm_fd (_handle);
-
-    //  Disconnect from I/O threads poller object.
-    io_object_t::unplug ();
-
-    delete this;
-}
-
-void zmq::udp_engine_t::sockaddr_to_msg (zmq::msg_t *msg_,
-                                         const sockaddr_in *addr_)
-{
-    const char *const name = inet_ntoa (addr_->sin_addr);
-
-    char port[6];
-    const int port_len =
-      sprintf (port, "%d", static_cast<int> (ntohs (addr_->sin_port)));
-    zmq_assert (port_len > 0);
-
-    const size_t name_len = strlen (name);
-    const int size = static_cast<int> (name_len) + 1 /* colon */
-                     + port_len + 1;                 //  terminating NUL
-    const int rc = msg_->init_size (size);
-    errno_assert (rc == 0);
-    msg_->set_flags (msg_t::more);
-
-    //  use memcpy instead of strcpy/strcat, since this is more efficient when
-    //  we already know the lengths, which we calculated above
-    char *address = static_cast<char *> (msg_->data ());
-    memcpy (address, name, name_len);
-    address += name_len;
-    *address++ = ':';
-    memcpy (address, port, static_cast<size_t> (port_len));
-    address += port_len;
-    *address = 0;
-}
-
-int zmq::udp_engine_t::resolve_raw_address (const char *name_, size_t length_)
-{
-    memset (&_raw_address, 0, sizeof _raw_address);
-
-    const char *delimiter = NULL;
-
-    // Find delimiter, cannot use memrchr as it is not supported on windows
-    if (length_ != 0) {
-        int chars_left = static_cast<int> (length_);
-        const char *current_char = name_ + length_;
-        do {
-            if (*(--current_char) == ':') {
-                delimiter = current_char;
-                break;
-            }
-        } while (--chars_left != 0);
-    }
-
-    if (!delimiter) {
-        errno = EINVAL;
-        return -1;
-    }
-
-    const std::string addr_str (name_, delimiter - name_);
-    const std::string port_str (delimiter + 1, name_ + length_ - delimiter - 1);
-
-    //  Parse the port number (0 is not a valid port).
-    const uint16_t port = static_cast<uint16_t> (atoi (port_str.c_str ()));
-    if (port == 0) {
-        errno = EINVAL;
-        return -1;
-    }
-
-    _raw_address.sin_family = AF_INET;
-    _raw_address.sin_port = htons (port);
-    _raw_address.sin_addr.s_addr = inet_addr (addr_str.c_str ());
-
-    if (_raw_address.sin_addr.s_addr == INADDR_NONE) {
-        errno = EINVAL;
-        return -1;
-    }
-
-    return 0;
-}
-
-void zmq::udp_engine_t::out_event ()
-{
-    msg_t group_msg;
-    int rc = _session->pull_msg (&group_msg);
-    errno_assert (rc == 0 || (rc == -1 && errno == EAGAIN));
-
-    if (rc == 0) {
-        msg_t body_msg;
-        rc = _session->pull_msg (&body_msg);
-        //  If there's a group, there should also be a body
-        errno_assert (rc == 0);
-
-        const size_t group_size = group_msg.size ();
-        const size_t body_size = body_msg.size ();
-        size_t size;
-
-        if (_options.raw_socket) {
-            rc = resolve_raw_address (static_cast<char *> (group_msg.data ()),
-                                      group_size);
-
-            //  We discard the message if address is not valid
-            if (rc != 0) {
-                rc = group_msg.close ();
-                errno_assert (rc == 0);
-
-                rc = body_msg.close ();
-                errno_assert (rc == 0);
-
-                return;
-            }
-
-            size = body_size;
-
-            memcpy (_out_buffer, body_msg.data (), body_size);
-        } else {
-            size = group_size + body_size + 1;
-
-            // TODO: check if larger than maximum size
-            _out_buffer[0] = static_cast<unsigned char> (group_size);
-            memcpy (_out_buffer + 1, group_msg.data (), group_size);
-            memcpy (_out_buffer + 1 + group_size, body_msg.data (), body_size);
-        }
-
-        rc = group_msg.close ();
-        errno_assert (rc == 0);
-
-        body_msg.close ();
-        errno_assert (rc == 0);
-
-#ifdef ZMQ_HAVE_WINDOWS
-        rc = sendto (_fd, _out_buffer, static_cast<int> (size), 0, _out_address,
-                     _out_address_len);
-#elif defined ZMQ_HAVE_VXWORKS
-        rc = sendto (_fd, reinterpret_cast<caddr_t> (_out_buffer), size, 0,
-                     (sockaddr *) _out_address, _out_address_len);
-#else
-        rc = sendto (_fd, _out_buffer, size, 0, _out_address, _out_address_len);
-#endif
-        if (rc < 0) {
-#ifdef ZMQ_HAVE_WINDOWS
-            if (WSAGetLastError () != WSAEWOULDBLOCK) {
-                assert_success_or_recoverable (_fd, rc);
-                error (connection_error);
-            }
-#else
-            if (rc != EWOULDBLOCK) {
-                assert_success_or_recoverable (_fd, rc);
-                error (connection_error);
-            }
-#endif
-        }
-    } else {
-        reset_pollout (_handle);
-    }
-}
-
-const zmq::endpoint_uri_pair_t &zmq::udp_engine_t::get_endpoint () const
-{
-    return _empty_endpoint;
-}
-
-void zmq::udp_engine_t::restart_output ()
-{
-    //  If we don't support send we just drop all messages
-    if (!_send_enabled) {
-        msg_t msg;
-        while (_session->pull_msg (&msg) == 0)
-            msg.close ();
-    } else {
-        set_pollout (_handle);
-        out_event ();
-    }
-}
-
-void zmq::udp_engine_t::in_event ()
-{
-    sockaddr_storage in_address;
-    zmq_socklen_t in_addrlen =
-      static_cast<zmq_socklen_t> (sizeof (sockaddr_storage));
-
-    const int nbytes =
-      recvfrom (_fd, _in_buffer, MAX_UDP_MSG, 0,
-                reinterpret_cast<sockaddr *> (&in_address), &in_addrlen);
-
-    if (nbytes < 0) {
-#ifdef ZMQ_HAVE_WINDOWS
-        if (WSAGetLastError () != WSAEWOULDBLOCK) {
-            assert_success_or_recoverable (_fd, nbytes);
-            error (connection_error);
-        }
-#else
-        if (nbytes != EWOULDBLOCK) {
-            assert_success_or_recoverable (_fd, nbytes);
-            error (connection_error);
-        }
-#endif
-        return;
-    }
-
-    int rc;
-    int body_size;
-    int body_offset;
-    msg_t msg;
-
-    if (_options.raw_socket) {
-        zmq_assert (in_address.ss_family == AF_INET);
-        sockaddr_to_msg (&msg, reinterpret_cast<sockaddr_in *> (&in_address));
-
-        body_size = nbytes;
-        body_offset = 0;
-    } else {
-        // TODO in out_event, the group size is an *unsigned* char. what is
-        // the maximum value?
-        const char *group_buffer = _in_buffer + 1;
-        const int group_size = _in_buffer[0];
-
-        rc = msg.init_size (group_size);
-        errno_assert (rc == 0);
-        msg.set_flags (msg_t::more);
-        memcpy (msg.data (), group_buffer, group_size);
-
-        //  This doesn't fit, just ignore
-        if (nbytes - 1 < group_size)
-            return;
-
-        body_size = nbytes - 1 - group_size;
-        body_offset = 1 + group_size;
-    }
-    // Push group description to session
-    rc = _session->push_msg (&msg);
-    errno_assert (rc == 0 || (rc == -1 && errno == EAGAIN));
-
-    //  Group description message doesn't fit in the pipe, drop
-    if (rc != 0) {
-        rc = msg.close ();
-        errno_assert (rc == 0);
-
-        reset_pollin (_handle);
-        return;
-    }
-
-    rc = msg.close ();
-    errno_assert (rc == 0);
-    rc = msg.init_size (body_size);
-    errno_assert (rc == 0);
-    memcpy (msg.data (), _in_buffer + body_offset, body_size);
-
-    // Push message body to session
-    rc = _session->push_msg (&msg);
-    // Message body doesn't fit in the pipe, drop and reset session state
-    if (rc != 0) {
-        rc = msg.close ();
-        errno_assert (rc == 0);
-
-        _session->reset ();
-        reset_pollin (_handle);
-        return;
-    }
-
-    rc = msg.close ();
-    errno_assert (rc == 0);
-    _session->flush ();
-}
-
-bool zmq::udp_engine_t::restart_input ()
-{
-    if (_recv_enabled) {
-        set_pollin (_handle);
-        in_event ();
-    }
-
-    return true;
-}
diff --git a/libs/libzmq/src/udp_engine.hpp b/libs/libzmq/src/udp_engine.hpp
deleted file mode 100644
index 4208181..0000000
--- a/libs/libzmq/src/udp_engine.hpp
+++ /dev/null
@@ -1,92 +0,0 @@
-
-#ifndef __ZMQ_UDP_ENGINE_HPP_INCLUDED__
-#define __ZMQ_UDP_ENGINE_HPP_INCLUDED__
-
-#include "io_object.hpp"
-#include "i_engine.hpp"
-#include "address.hpp"
-#include "msg.hpp"
-
-#define MAX_UDP_MSG 8192
-
-namespace zmq
-{
-class io_thread_t;
-class session_base_t;
-
-class udp_engine_t ZMQ_FINAL : public io_object_t, public i_engine
-{
-  public:
-    udp_engine_t (const options_t &options_);
-    ~udp_engine_t ();
-
-    int init (address_t *address_, bool send_, bool recv_);
-
-    bool has_handshake_stage () ZMQ_FINAL { return false; };
-
-    //  i_engine interface implementation.
-    //  Plug the engine to the session.
-    void plug (zmq::io_thread_t *io_thread_, class session_base_t *session_);
-
-    //  Terminate and deallocate the engine. Note that 'detached'
-    //  events are not fired on termination.
-    void terminate ();
-
-    //  This method is called by the session to signalise that more
-    //  messages can be written to the pipe.
-    bool restart_input ();
-
-    //  This method is called by the session to signalise that there
-    //  are messages to send available.
-    void restart_output ();
-
-    void zap_msg_available (){};
-
-    void in_event ();
-    void out_event ();
-
-    const endpoint_uri_pair_t &get_endpoint () const;
-
-  private:
-    int resolve_raw_address (const char *name_, size_t length_);
-    static void sockaddr_to_msg (zmq::msg_t *msg_, const sockaddr_in *addr_);
-
-    static int set_udp_reuse_address (fd_t s_, bool on_);
-    static int set_udp_reuse_port (fd_t s_, bool on_);
-    // Indicate, if the multicast data being sent should be looped back
-    static int set_udp_multicast_loop (fd_t s_, bool is_ipv6_, bool loop_);
-    // Set multicast TTL
-    static int set_udp_multicast_ttl (fd_t s_, bool is_ipv6_, int hops_);
-    // Set multicast address/interface
-    int set_udp_multicast_iface (fd_t s_,
-                                 bool is_ipv6_,
-                                 const udp_address_t *addr_);
-    // Join a multicast group
-    int add_membership (fd_t s_, const udp_address_t *addr_);
-
-    //  Function to handle network issues.
-    void error (error_reason_t reason_);
-
-    const endpoint_uri_pair_t _empty_endpoint;
-
-    bool _plugged;
-
-    fd_t _fd;
-    session_base_t *_session;
-    handle_t _handle;
-    address_t *_address;
-
-    options_t _options;
-
-    sockaddr_in _raw_address;
-    const struct sockaddr *_out_address;
-    zmq_socklen_t _out_address_len;
-
-    char _out_buffer[MAX_UDP_MSG];
-    char _in_buffer[MAX_UDP_MSG];
-    bool _send_enabled;
-    bool _recv_enabled;
-};
-}
-
-#endif
diff --git a/libs/libzmq/src/v1_decoder.cpp b/libs/libzmq/src/v1_decoder.cpp
deleted file mode 100644
index df162b5..0000000
--- a/libs/libzmq/src/v1_decoder.cpp
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include <stdlib.h>
-#include <string.h>
-#include <limits>
-#include <limits.h>
-
-#include "decoder.hpp"
-#include "v1_decoder.hpp"
-#include "likely.hpp"
-#include "wire.hpp"
-#include "err.hpp"
-
-zmq::v1_decoder_t::v1_decoder_t (size_t bufsize_, int64_t maxmsgsize_) :
-    decoder_base_t<v1_decoder_t> (bufsize_), _max_msg_size (maxmsgsize_)
-{
-    int rc = _in_progress.init ();
-    errno_assert (rc == 0);
-
-    //  At the beginning, read one byte and go to one_byte_size_ready state.
-    next_step (_tmpbuf, 1, &v1_decoder_t::one_byte_size_ready);
-}
-
-zmq::v1_decoder_t::~v1_decoder_t ()
-{
-    const int rc = _in_progress.close ();
-    errno_assert (rc == 0);
-}
-
-int zmq::v1_decoder_t::one_byte_size_ready (unsigned char const *)
-{
-    //  First byte of size is read. If it is UCHAR_MAX (0xff) read 8-byte size.
-    //  Otherwise allocate the buffer for message data and read the
-    //  message data into it.
-    if (*_tmpbuf == UCHAR_MAX)
-        next_step (_tmpbuf, 8, &v1_decoder_t::eight_byte_size_ready);
-    else {
-        //  There has to be at least one byte (the flags) in the message).
-        if (!*_tmpbuf) {
-            errno = EPROTO;
-            return -1;
-        }
-
-        if (_max_msg_size >= 0
-            && static_cast<int64_t> (*_tmpbuf - 1) > _max_msg_size) {
-            errno = EMSGSIZE;
-            return -1;
-        }
-
-        int rc = _in_progress.close ();
-        assert (rc == 0);
-        rc = _in_progress.init_size (*_tmpbuf - 1);
-        if (rc != 0) {
-            errno_assert (errno == ENOMEM);
-            rc = _in_progress.init ();
-            errno_assert (rc == 0);
-            errno = ENOMEM;
-            return -1;
-        }
-
-        next_step (_tmpbuf, 1, &v1_decoder_t::flags_ready);
-    }
-    return 0;
-}
-
-int zmq::v1_decoder_t::eight_byte_size_ready (unsigned char const *)
-{
-    //  8-byte payload length is read. Allocate the buffer
-    //  for message body and read the message data into it.
-    const uint64_t payload_length = get_uint64 (_tmpbuf);
-
-    //  There has to be at least one byte (the flags) in the message).
-    if (payload_length == 0) {
-        errno = EPROTO;
-        return -1;
-    }
-
-    //  Message size must not exceed the maximum allowed size.
-    if (_max_msg_size >= 0
-        && payload_length - 1 > static_cast<uint64_t> (_max_msg_size)) {
-        errno = EMSGSIZE;
-        return -1;
-    }
-
-#ifndef __aarch64__
-    //  Message size must fit within range of size_t data type.
-    if (payload_length - 1 > std::numeric_limits<size_t>::max ()) {
-        errno = EMSGSIZE;
-        return -1;
-    }
-#endif
-
-    const size_t msg_size = static_cast<size_t> (payload_length - 1);
-
-    int rc = _in_progress.close ();
-    assert (rc == 0);
-    rc = _in_progress.init_size (msg_size);
-    if (rc != 0) {
-        errno_assert (errno == ENOMEM);
-        rc = _in_progress.init ();
-        errno_assert (rc == 0);
-        errno = ENOMEM;
-        return -1;
-    }
-
-    next_step (_tmpbuf, 1, &v1_decoder_t::flags_ready);
-    return 0;
-}
-
-int zmq::v1_decoder_t::flags_ready (unsigned char const *)
-{
-    //  Store the flags from the wire into the message structure.
-    _in_progress.set_flags (_tmpbuf[0] & msg_t::more);
-
-    next_step (_in_progress.data (), _in_progress.size (),
-               &v1_decoder_t::message_ready);
-
-    return 0;
-}
-
-int zmq::v1_decoder_t::message_ready (unsigned char const *)
-{
-    //  Message is completely read. Push it further and start reading
-    //  new message. (in_progress is a 0-byte message after this point.)
-    next_step (_tmpbuf, 1, &v1_decoder_t::one_byte_size_ready);
-    return 1;
-}
diff --git a/libs/libzmq/src/v1_decoder.hpp b/libs/libzmq/src/v1_decoder.hpp
deleted file mode 100644
index ccf63fc..0000000
--- a/libs/libzmq/src/v1_decoder.hpp
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_V1_DECODER_HPP_INCLUDED__
-#define __ZMQ_V1_DECODER_HPP_INCLUDED__
-
-#include "decoder.hpp"
-
-namespace zmq
-{
-//  Decoder for ZMTP/1.0 protocol. Converts data batches into messages.
-
-class v1_decoder_t ZMQ_FINAL : public decoder_base_t<v1_decoder_t>
-{
-  public:
-    v1_decoder_t (size_t bufsize_, int64_t maxmsgsize_);
-    ~v1_decoder_t ();
-
-    msg_t *msg () { return &_in_progress; }
-
-  private:
-    int one_byte_size_ready (unsigned char const *);
-    int eight_byte_size_ready (unsigned char const *);
-    int flags_ready (unsigned char const *);
-    int message_ready (unsigned char const *);
-
-    unsigned char _tmpbuf[8];
-    msg_t _in_progress;
-
-    const int64_t _max_msg_size;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (v1_decoder_t)
-};
-}
-
-#endif
diff --git a/libs/libzmq/src/v1_encoder.cpp b/libs/libzmq/src/v1_encoder.cpp
deleted file mode 100644
index 38e7e98..0000000
--- a/libs/libzmq/src/v1_encoder.cpp
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "encoder.hpp"
-#include "v1_encoder.hpp"
-#include "msg.hpp"
-#include "wire.hpp"
-
-#include <limits.h>
-
-zmq::v1_encoder_t::v1_encoder_t (size_t bufsize_) :
-    encoder_base_t<v1_encoder_t> (bufsize_)
-{
-    //  Write 0 bytes to the batch and go to message_ready state.
-    next_step (NULL, 0, &v1_encoder_t::message_ready, true);
-}
-
-zmq::v1_encoder_t::~v1_encoder_t ()
-{
-}
-
-void zmq::v1_encoder_t::size_ready ()
-{
-    //  Write message body into the buffer.
-    next_step (in_progress ()->data (), in_progress ()->size (),
-               &v1_encoder_t::message_ready, true);
-}
-
-void zmq::v1_encoder_t::message_ready ()
-{
-    size_t header_size = 2; // flags byte + size byte
-    //  Get the message size.
-    size_t size = in_progress ()->size ();
-
-    //  Account for the 'flags' byte.
-    size++;
-
-    //  Account for the subscribe/cancel byte.
-    if (in_progress ()->is_subscribe () || in_progress ()->is_cancel ())
-        size++;
-
-    //  For messages less than 255 bytes long, write one byte of message size.
-    //  For longer messages write 0xff escape character followed by 8-byte
-    //  message size. In both cases 'flags' field follows.
-    if (size < UCHAR_MAX) {
-        _tmpbuf[0] = static_cast<unsigned char> (size);
-        _tmpbuf[1] = (in_progress ()->flags () & msg_t::more);
-    } else {
-        _tmpbuf[0] = UCHAR_MAX;
-        put_uint64 (_tmpbuf + 1, size);
-        _tmpbuf[9] = (in_progress ()->flags () & msg_t::more);
-        header_size = 10;
-    }
-
-    //  Encode the subscribe/cancel byte. This is done in the encoder as
-    //  opposed to when the subscribe message is created to allow different
-    //  protocol behaviour on the wire in the v3.1 and legacy encoders.
-    //  It results in the work being done multiple times in case the sub
-    //  is sending the subscription/cancel to multiple pubs, but it cannot
-    //  be avoided. This processing can be moved to xsub once support for
-    //  ZMTP < 3.1 is dropped.
-    if (in_progress ()->is_subscribe ())
-        _tmpbuf[header_size++] = 1;
-    else if (in_progress ()->is_cancel ())
-        _tmpbuf[header_size++] = 0;
-
-    next_step (_tmpbuf, header_size, &v1_encoder_t::size_ready, false);
-}
diff --git a/libs/libzmq/src/v1_encoder.hpp b/libs/libzmq/src/v1_encoder.hpp
deleted file mode 100644
index 3f7a57e..0000000
--- a/libs/libzmq/src/v1_encoder.hpp
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_V1_ENCODER_HPP_INCLUDED__
-#define __ZMQ_V1_ENCODER_HPP_INCLUDED__
-
-#include "encoder.hpp"
-
-namespace zmq
-{
-//  Encoder for ZMTP/1.0 protocol. Converts messages into data batches.
-
-class v1_encoder_t ZMQ_FINAL : public encoder_base_t<v1_encoder_t>
-{
-  public:
-    v1_encoder_t (size_t bufsize_);
-    ~v1_encoder_t ();
-
-  private:
-    void size_ready ();
-    void message_ready ();
-
-    unsigned char _tmpbuf[11];
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (v1_encoder_t)
-};
-}
-
-#endif
diff --git a/libs/libzmq/src/v2_decoder.cpp b/libs/libzmq/src/v2_decoder.cpp
deleted file mode 100644
index 5848d6a..0000000
--- a/libs/libzmq/src/v2_decoder.cpp
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include <stdlib.h>
-#include <string.h>
-#include <cmath>
-
-#include "v2_protocol.hpp"
-#include "v2_decoder.hpp"
-#include "likely.hpp"
-#include "wire.hpp"
-#include "err.hpp"
-
-zmq::v2_decoder_t::v2_decoder_t (size_t bufsize_,
-                                 int64_t maxmsgsize_,
-                                 bool zero_copy_) :
-    decoder_base_t<v2_decoder_t, shared_message_memory_allocator> (bufsize_),
-    _msg_flags (0),
-    _zero_copy (zero_copy_),
-    _max_msg_size (maxmsgsize_)
-{
-    int rc = _in_progress.init ();
-    errno_assert (rc == 0);
-
-    //  At the beginning, read one byte and go to flags_ready state.
-    next_step (_tmpbuf, 1, &v2_decoder_t::flags_ready);
-}
-
-zmq::v2_decoder_t::~v2_decoder_t ()
-{
-    const int rc = _in_progress.close ();
-    errno_assert (rc == 0);
-}
-
-int zmq::v2_decoder_t::flags_ready (unsigned char const *)
-{
-    _msg_flags = 0;
-    if (_tmpbuf[0] & v2_protocol_t::more_flag)
-        _msg_flags |= msg_t::more;
-    if (_tmpbuf[0] & v2_protocol_t::command_flag)
-        _msg_flags |= msg_t::command;
-
-    //  The payload length is either one or eight bytes,
-    //  depending on whether the 'large' bit is set.
-    if (_tmpbuf[0] & v2_protocol_t::large_flag)
-        next_step (_tmpbuf, 8, &v2_decoder_t::eight_byte_size_ready);
-    else
-        next_step (_tmpbuf, 1, &v2_decoder_t::one_byte_size_ready);
-
-    return 0;
-}
-
-int zmq::v2_decoder_t::one_byte_size_ready (unsigned char const *read_from_)
-{
-    return size_ready (_tmpbuf[0], read_from_);
-}
-
-int zmq::v2_decoder_t::eight_byte_size_ready (unsigned char const *read_from_)
-{
-    //  The payload size is encoded as 64-bit unsigned integer.
-    //  The most significant byte comes first.
-    const uint64_t msg_size = get_uint64 (_tmpbuf);
-
-    return size_ready (msg_size, read_from_);
-}
-
-int zmq::v2_decoder_t::size_ready (uint64_t msg_size_,
-                                   unsigned char const *read_pos_)
-{
-    //  Message size must not exceed the maximum allowed size.
-    if (_max_msg_size >= 0)
-        if (unlikely (msg_size_ > static_cast<uint64_t> (_max_msg_size))) {
-            errno = EMSGSIZE;
-            return -1;
-        }
-
-    //  Message size must fit into size_t data type.
-    if (unlikely (msg_size_ != static_cast<size_t> (msg_size_))) {
-        errno = EMSGSIZE;
-        return -1;
-    }
-
-    int rc = _in_progress.close ();
-    assert (rc == 0);
-
-    // the current message can exceed the current buffer. We have to copy the buffer
-    // data into a new message and complete it in the next receive.
-
-    shared_message_memory_allocator &allocator = get_allocator ();
-    if (unlikely (!_zero_copy
-                  || msg_size_ > static_cast<size_t> (
-                       allocator.data () + allocator.size () - read_pos_))) {
-        // a new message has started, but the size would exceed the pre-allocated arena
-        // this happens every time when a message does not fit completely into the buffer
-        rc = _in_progress.init_size (static_cast<size_t> (msg_size_));
-    } else {
-        // construct message using n bytes from the buffer as storage
-        // increase buffer ref count
-        // if the message will be a large message, pass a valid refcnt memory location as well
-        rc =
-          _in_progress.init (const_cast<unsigned char *> (read_pos_),
-                             static_cast<size_t> (msg_size_),
-                             shared_message_memory_allocator::call_dec_ref,
-                             allocator.buffer (), allocator.provide_content ());
-
-        // For small messages, data has been copied and refcount does not have to be increased
-        if (_in_progress.is_zcmsg ()) {
-            allocator.advance_content ();
-            allocator.inc_ref ();
-        }
-    }
-
-    if (unlikely (rc)) {
-        errno_assert (errno == ENOMEM);
-        rc = _in_progress.init ();
-        errno_assert (rc == 0);
-        errno = ENOMEM;
-        return -1;
-    }
-
-    _in_progress.set_flags (_msg_flags);
-    // this sets read_pos to
-    // the message data address if the data needs to be copied
-    // for small message / messages exceeding the current buffer
-    // or
-    // to the current start address in the buffer because the message
-    // was constructed to use n bytes from the address passed as argument
-    next_step (_in_progress.data (), _in_progress.size (),
-               &v2_decoder_t::message_ready);
-
-    return 0;
-}
-
-int zmq::v2_decoder_t::message_ready (unsigned char const *)
-{
-    //  Message is completely read. Signal this to the caller
-    //  and prepare to decode next message.
-    next_step (_tmpbuf, 1, &v2_decoder_t::flags_ready);
-    return 1;
-}
diff --git a/libs/libzmq/src/v2_decoder.hpp b/libs/libzmq/src/v2_decoder.hpp
deleted file mode 100644
index 4c5d135..0000000
--- a/libs/libzmq/src/v2_decoder.hpp
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_V2_DECODER_HPP_INCLUDED__
-#define __ZMQ_V2_DECODER_HPP_INCLUDED__
-
-#include "decoder.hpp"
-#include "decoder_allocators.hpp"
-
-namespace zmq
-{
-//  Decoder for ZMTP/2.x framing protocol. Converts data stream into messages.
-//  The class has to inherit from shared_message_memory_allocator because
-//  the base class calls allocate in its constructor.
-class v2_decoder_t ZMQ_FINAL
-    : public decoder_base_t<v2_decoder_t, shared_message_memory_allocator>
-{
-  public:
-    v2_decoder_t (size_t bufsize_, int64_t maxmsgsize_, bool zero_copy_);
-    ~v2_decoder_t ();
-
-    //  i_decoder interface.
-    msg_t *msg () { return &_in_progress; }
-
-  private:
-    int flags_ready (unsigned char const *);
-    int one_byte_size_ready (unsigned char const *);
-    int eight_byte_size_ready (unsigned char const *);
-    int message_ready (unsigned char const *);
-
-    int size_ready (uint64_t size_, unsigned char const *);
-
-    unsigned char _tmpbuf[8];
-    unsigned char _msg_flags;
-    msg_t _in_progress;
-
-    const bool _zero_copy;
-    const int64_t _max_msg_size;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (v2_decoder_t)
-};
-}
-
-#endif
diff --git a/libs/libzmq/src/v2_encoder.cpp b/libs/libzmq/src/v2_encoder.cpp
deleted file mode 100644
index f331ade..0000000
--- a/libs/libzmq/src/v2_encoder.cpp
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "v2_protocol.hpp"
-#include "v2_encoder.hpp"
-#include "msg.hpp"
-#include "likely.hpp"
-#include "wire.hpp"
-
-#include <limits.h>
-
-zmq::v2_encoder_t::v2_encoder_t (size_t bufsize_) :
-    encoder_base_t<v2_encoder_t> (bufsize_)
-{
-    //  Write 0 bytes to the batch and go to message_ready state.
-    next_step (NULL, 0, &v2_encoder_t::message_ready, true);
-}
-
-zmq::v2_encoder_t::~v2_encoder_t ()
-{
-}
-
-void zmq::v2_encoder_t::message_ready ()
-{
-    //  Encode flags.
-    size_t size = in_progress ()->size ();
-    size_t header_size = 2; // flags byte + size byte
-    unsigned char &protocol_flags = _tmp_buf[0];
-    protocol_flags = 0;
-    if (in_progress ()->flags () & msg_t::more)
-        protocol_flags |= v2_protocol_t::more_flag;
-    if (in_progress ()->size () > UCHAR_MAX)
-        protocol_flags |= v2_protocol_t::large_flag;
-    if (in_progress ()->flags () & msg_t::command)
-        protocol_flags |= v2_protocol_t::command_flag;
-    if (in_progress ()->is_subscribe () || in_progress ()->is_cancel ())
-        ++size;
-
-    //  Encode the message length. For messages less then 256 bytes,
-    //  the length is encoded as 8-bit unsigned integer. For larger
-    //  messages, 64-bit unsigned integer in network byte order is used.
-    if (unlikely (size > UCHAR_MAX)) {
-        put_uint64 (_tmp_buf + 1, size);
-        header_size = 9; // flags byte + size 8 bytes
-    } else {
-        _tmp_buf[1] = static_cast<uint8_t> (size);
-    }
-
-    //  Encode the subscribe/cancel byte. This is done in the encoder as
-    //  opposed to when the subscribe message is created to allow different
-    //  protocol behaviour on the wire in the v3.1 and legacy encoders.
-    //  It results in the work being done multiple times in case the sub
-    //  is sending the subscription/cancel to multiple pubs, but it cannot
-    //  be avoided. This processing can be moved to xsub once support for
-    //  ZMTP < 3.1 is dropped.
-    if (in_progress ()->is_subscribe ())
-        _tmp_buf[header_size++] = 1;
-    else if (in_progress ()->is_cancel ())
-        _tmp_buf[header_size++] = 0;
-
-    next_step (_tmp_buf, header_size, &v2_encoder_t::size_ready, false);
-}
-
-void zmq::v2_encoder_t::size_ready ()
-{
-    //  Write message body into the buffer.
-    next_step (in_progress ()->data (), in_progress ()->size (),
-               &v2_encoder_t::message_ready, true);
-}
diff --git a/libs/libzmq/src/v2_encoder.hpp b/libs/libzmq/src/v2_encoder.hpp
deleted file mode 100644
index 4f60616..0000000
--- a/libs/libzmq/src/v2_encoder.hpp
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_V2_ENCODER_HPP_INCLUDED__
-#define __ZMQ_V2_ENCODER_HPP_INCLUDED__
-
-#include "encoder.hpp"
-
-namespace zmq
-{
-//  Encoder for 0MQ framing protocol. Converts messages into data stream.
-
-class v2_encoder_t ZMQ_FINAL : public encoder_base_t<v2_encoder_t>
-{
-  public:
-    v2_encoder_t (size_t bufsize_);
-    ~v2_encoder_t ();
-
-  private:
-    void size_ready ();
-    void message_ready ();
-
-    //  flags byte + size byte (or 8 bytes) + sub/cancel byte
-    unsigned char _tmp_buf[10];
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (v2_encoder_t)
-};
-}
-
-#endif
diff --git a/libs/libzmq/src/v2_protocol.hpp b/libs/libzmq/src/v2_protocol.hpp
deleted file mode 100644
index f129729..0000000
--- a/libs/libzmq/src/v2_protocol.hpp
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_V2_PROTOCOL_HPP_INCLUDED__
-#define __ZMQ_V2_PROTOCOL_HPP_INCLUDED__
-
-namespace zmq
-{
-//  Definition of constants for ZMTP/2.0 transport protocol.
-class v2_protocol_t
-{
-  public:
-    //  Message flags.
-    enum
-    {
-        more_flag = 1,
-        large_flag = 2,
-        command_flag = 4
-    };
-};
-}
-
-#endif
diff --git a/libs/libzmq/src/v3_1_encoder.cpp b/libs/libzmq/src/v3_1_encoder.cpp
deleted file mode 100644
index f9e11df..0000000
--- a/libs/libzmq/src/v3_1_encoder.cpp
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
-    Copyright (c) 2020 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "v2_protocol.hpp"
-#include "v3_1_encoder.hpp"
-#include "msg.hpp"
-#include "likely.hpp"
-#include "wire.hpp"
-
-#include <limits.h>
-
-zmq::v3_1_encoder_t::v3_1_encoder_t (size_t bufsize_) :
-    encoder_base_t<v3_1_encoder_t> (bufsize_)
-{
-    //  Write 0 bytes to the batch and go to message_ready state.
-    next_step (NULL, 0, &v3_1_encoder_t::message_ready, true);
-}
-
-zmq::v3_1_encoder_t::~v3_1_encoder_t ()
-{
-}
-
-void zmq::v3_1_encoder_t::message_ready ()
-{
-    //  Encode flags.
-    size_t size = in_progress ()->size ();
-    size_t header_size = 2; // flags byte + size byte
-    unsigned char &protocol_flags = _tmp_buf[0];
-    protocol_flags = 0;
-    if (in_progress ()->flags () & msg_t::more)
-        protocol_flags |= v2_protocol_t::more_flag;
-    if (in_progress ()->size () > UCHAR_MAX)
-        protocol_flags |= v2_protocol_t::large_flag;
-    if (in_progress ()->flags () & msg_t::command
-        || in_progress ()->is_subscribe () || in_progress ()->is_cancel ()) {
-        protocol_flags |= v2_protocol_t::command_flag;
-        if (in_progress ()->is_subscribe ())
-            size += zmq::msg_t::sub_cmd_name_size;
-        else if (in_progress ()->is_cancel ())
-            size += zmq::msg_t::cancel_cmd_name_size;
-    }
-
-    //  Encode the message length. For messages less then 256 bytes,
-    //  the length is encoded as 8-bit unsigned integer. For larger
-    //  messages, 64-bit unsigned integer in network byte order is used.
-    if (unlikely (size > UCHAR_MAX)) {
-        put_uint64 (_tmp_buf + 1, size);
-        header_size = 9; // flags byte + size 8 bytes
-    } else {
-        _tmp_buf[1] = static_cast<uint8_t> (size);
-    }
-
-    //  Encode the sub/cancel command string. This is done in the encoder as
-    //  opposed to when the subscribe message is created to allow different
-    //  protocol behaviour on the wire in the v3.1 and legacy encoders.
-    //  It results in the work being done multiple times in case the sub
-    //  is sending the subscription/cancel to multiple pubs, but it cannot
-    //  be avoided. This processing can be moved to xsub once support for
-    //  ZMTP < 3.1 is dropped.
-    if (in_progress ()->is_subscribe ()) {
-        memcpy (_tmp_buf + header_size, zmq::sub_cmd_name,
-                zmq::msg_t::sub_cmd_name_size);
-        header_size += zmq::msg_t::sub_cmd_name_size;
-    } else if (in_progress ()->is_cancel ()) {
-        memcpy (_tmp_buf + header_size, zmq::cancel_cmd_name,
-                zmq::msg_t::cancel_cmd_name_size);
-        header_size += zmq::msg_t::cancel_cmd_name_size;
-    }
-
-    next_step (_tmp_buf, header_size, &v3_1_encoder_t::size_ready, false);
-}
-
-void zmq::v3_1_encoder_t::size_ready ()
-{
-    //  Write message body into the buffer.
-    next_step (in_progress ()->data (), in_progress ()->size (),
-               &v3_1_encoder_t::message_ready, true);
-}
diff --git a/libs/libzmq/src/v3_1_encoder.hpp b/libs/libzmq/src/v3_1_encoder.hpp
deleted file mode 100644
index d5d9c13..0000000
--- a/libs/libzmq/src/v3_1_encoder.hpp
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
-    Copyright (c) 2020 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_V3_1_ENCODER_HPP_INCLUDED__
-#define __ZMQ_V3_1_ENCODER_HPP_INCLUDED__
-
-#include "encoder.hpp"
-#include "msg.hpp"
-
-namespace zmq
-{
-//  Encoder for 0MQ framing protocol. Converts messages into data stream.
-
-class v3_1_encoder_t ZMQ_FINAL : public encoder_base_t<v3_1_encoder_t>
-{
-  public:
-    v3_1_encoder_t (size_t bufsize_);
-    ~v3_1_encoder_t () ZMQ_FINAL;
-
-  private:
-    void size_ready ();
-    void message_ready ();
-
-    unsigned char _tmp_buf[9 + zmq::msg_t::sub_cmd_name_size];
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (v3_1_encoder_t)
-};
-}
-
-#endif
diff --git a/libs/libzmq/src/version.rc.in b/libs/libzmq/src/version.rc.in
deleted file mode 100644
index 3428055..0000000
--- a/libs/libzmq/src/version.rc.in
+++ /dev/null
@@ -1,93 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-//
-// VERSIONINFO resource
-//
-// http://msdn.microsoft.com/en-us/library/windows/desktop/aa381058(v=vs.85).aspx
-
-// @MAJOR@,@MINOR@,@BUILD@,@PATCH@
-#define VER_FILEVERSION		@ZMQ_VERSION_MAJOR@,@ZMQ_VERSION_MINOR@,@ZMQ_VERSION_PATCH@,0
-#define VER_FILEVERSION_STR	"@ZMQ_VERSION_MAJOR@.@ZMQ_VERSION_MINOR@.@ZMQ_VERSION_PATCH@.0\0"
-
-#define VER_PRODUCTVERSION	VER_FILEVERSION
-#define VER_PRODUCTVERSION_STR	VER_FILEVERSION_STR
-
-
-// versionID
-// Version-information resource identifier.  This value must be 1.
-1 VERSIONINFO
-
-//// fixed-info
-// Binary version number for the file.
-	FILEVERSION VER_FILEVERSION
-
-// Binary version number for the product with which the file is distributed.
-	PRODUCTVERSION VER_PRODUCTVERSION
-
-// Bits in the FILEFLAGS statement are valid.
-	FILEFLAGSMASK 0x17L
-
-// Attributes of the file.
-// VS_FF_DEBUG        =  1 : File contains debugging information or is compiled with debugging features enabled.
-// VS_FF_PATCHED      =  4 : File has been modified and is not identical to the original shipping file of the 
-//                           same version number.
-// VS_FF_PRERELEASE   =  2 : File is a development version, not a commercially released product.
-// VS_FF_PRIVATEBUILD =  8 : File was not built using standard release procedures.
-// VS_FF_SPECIALBUILD = 20 : File was built by the original company using standard release procedures but is a
-//                         : variation of the standard file of the same version number.
-#ifdef _DEBUG
-	FILEFLAGS 0x1L
-#else
-	FILEFLAGS 0x2L
-#endif
-
-// Operating system for which this file was designed.
-// VOS_DOS           = 0x10000 : File was designed for MS-DOS.
-// VOS_NT            = 0x40000 : File was designed for 32-bit Windows.
-// VOS_WINDOWS16     =     0x1 : File was designed for 16-bit Windows.
-// VOS_WINDOWS32     =     0x4 : File was designed for 32-bit Windows.
-// VOS_DOS_WINDOWS16 = 0x10001 : File was designed for 16-bit Windows running with MS-DOS.
-// VOS_DOS_WINDOWS32 = 0x10004 : File was designed for 32-bit Windows running with MS-DOS.
-// VOS_NT_WINDOWS32  = 0x40004 : File was designed for 32-bit Windows.
-// NB: appears obsolete, nothing for x64.
-	FILEOS 0x4L
-
-// General type of file.
-// VFT_APP        = 0x1 : File contains an application.
-// VFT_DLL        = 0x2 : File contains a dynamic-link library (DLL).
-// VFT_DRV        = 0x3 : File contains a device driver.
-// VFT_FONT       = 0x4 : File contains a font.
-// VFT_VXD        = 0x5 : File contains a virtual device.
-// VFT_STATIC_LIB = 0x7 : File contains a static-link library.
-	FILETYPE 0x2L
-
-// Function of the file.
-	FILESUBTYPE 0x0L
-
-BEGIN
-	BLOCK "StringFileInfo"
-	BEGIN
-		BLOCK "080904b0"
-		BEGIN
-			VALUE "CompanyName",      "iMatix Corporation"
-			VALUE "FileDescription",  "ZeroMQ lightweight messaging kernel"
-			VALUE "FileVersion",      VER_FILEVERSION_STR
-			VALUE "InternalName",     "zeromq"
-			VALUE "LegalCopyright",   "Copyright (c) 2012 The ZeroMQ Authors."
-			VALUE "OriginalFilename", "libzmq.dll"
-			VALUE "ProductName",      "ZeroMQ"
-			VALUE "ProductVersion",   VER_PRODUCTVERSION_STR
-		END
-	END
-
-	BLOCK "VarFileInfo"
-	BEGIN
-// langID, one of the following language codes.
-// 0x409 : U.S. English
-// 0x809 : U.K. English
-// charsetID, one of the following character-set identifiers.
-// 1200 : Unicode
-		VALUE "Translation", 0x809, 1200
-	END
-END
-
-// end of file.
diff --git a/libs/libzmq/src/vmci.cpp b/libs/libzmq/src/vmci.cpp
deleted file mode 100644
index b8807e3..0000000
--- a/libs/libzmq/src/vmci.cpp
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "precompiled.hpp"
-
-#include "ip.hpp"
-#include "vmci.hpp"
-#include "vmci_address.hpp"
-
-#if defined ZMQ_HAVE_VMCI
-
-#include <cassert>
-#include <vmci_sockets.h>
-
-void zmq::tune_vmci_buffer_size (ctx_t *context_,
-                                 fd_t sockfd_,
-                                 uint64_t default_size_,
-                                 uint64_t min_size_,
-                                 uint64_t max_size_)
-{
-    int family = context_->get_vmci_socket_family ();
-    assert (family != -1);
-
-    if (default_size_ != 0) {
-        int rc = setsockopt (sockfd_, family, SO_VMCI_BUFFER_SIZE,
-                             (char *) &default_size_, sizeof default_size_);
-#if defined ZMQ_HAVE_WINDOWS
-        wsa_assert (rc != SOCKET_ERROR);
-#else
-        errno_assert (rc == 0);
-#endif
-    }
-
-    if (min_size_ != 0) {
-        int rc = setsockopt (sockfd_, family, SO_VMCI_BUFFER_SIZE,
-                             (char *) &min_size_, sizeof min_size_);
-#if defined ZMQ_HAVE_WINDOWS
-        wsa_assert (rc != SOCKET_ERROR);
-#else
-        errno_assert (rc == 0);
-#endif
-    }
-
-    if (max_size_ != 0) {
-        int rc = setsockopt (sockfd_, family, SO_VMCI_BUFFER_SIZE,
-                             (char *) &max_size_, sizeof max_size_);
-#if defined ZMQ_HAVE_WINDOWS
-        wsa_assert (rc != SOCKET_ERROR);
-#else
-        errno_assert (rc == 0);
-#endif
-    }
-}
-
-#if defined ZMQ_HAVE_WINDOWS
-void zmq::tune_vmci_connect_timeout (ctx_t *context_,
-                                     fd_t sockfd_,
-                                     DWORD timeout_)
-#else
-void zmq::tune_vmci_connect_timeout (ctx_t *context_,
-                                     fd_t sockfd_,
-                                     struct timeval timeout_)
-#endif
-{
-    int family = context_->get_vmci_socket_family ();
-    assert (family != -1);
-
-    int rc = setsockopt (sockfd_, family, SO_VMCI_CONNECT_TIMEOUT,
-                         (char *) &timeout_, sizeof timeout_);
-#if defined ZMQ_HAVE_WINDOWS
-    wsa_assert (rc != SOCKET_ERROR);
-#else
-    errno_assert (rc == 0);
-#endif
-}
-
-zmq::fd_t zmq::vmci_open_socket (const char *address_,
-                                 const zmq::options_t &options_,
-                                 zmq::vmci_address_t *out_vmci_addr_)
-{
-    //  Convert the textual address into address structure.
-    int rc = out_vmci_addr_->resolve (address_);
-    if (rc != 0)
-        return retired_fd;
-
-    //  Create the socket.
-    fd_t s = open_socket (out_vmci_addr_->family (), SOCK_STREAM, 0);
-
-    if (s == retired_fd) {
-        return retired_fd;
-    }
-
-    return s;
-}
-
-#endif
diff --git a/libs/libzmq/src/vmci.hpp b/libs/libzmq/src/vmci.hpp
deleted file mode 100644
index a79b4bf..0000000
--- a/libs/libzmq/src/vmci.hpp
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_VMCI_HPP_INCLUDED__
-#define __ZMQ_VMCI_HPP_INCLUDED__
-
-#include <string>
-
-#include "platform.hpp"
-#include "fd.hpp"
-#include "ctx.hpp"
-
-#if defined ZMQ_HAVE_VMCI
-
-#if defined ZMQ_HAVE_WINDOWS
-#include "windows.hpp"
-#else
-#include <sys/time.h>
-#endif
-
-namespace zmq
-{
-void tune_vmci_buffer_size (ctx_t *context_,
-                            fd_t sockfd_,
-                            uint64_t default_size_,
-                            uint64_t min_size_,
-                            uint64_t max_size_);
-
-#if defined ZMQ_HAVE_WINDOWS
-void tune_vmci_connect_timeout (ctx_t *context_, fd_t sockfd_, DWORD timeout_);
-#else
-void tune_vmci_connect_timeout (ctx_t *context_,
-                                fd_t sockfd_,
-                                struct timeval timeout_);
-#endif
-
-fd_t vmci_open_socket (const char *address_,
-                       const options_t &options_,
-                       vmci_address_t *out_vmci_addr_);
-}
-
-#endif
-
-#endif
diff --git a/libs/libzmq/src/vmci_address.cpp b/libs/libzmq/src/vmci_address.cpp
deleted file mode 100644
index 7af36a0..0000000
--- a/libs/libzmq/src/vmci_address.cpp
+++ /dev/null
@@ -1,177 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-
-#include "vmci_address.hpp"
-
-#if defined(ZMQ_HAVE_VMCI)
-
-#include <climits>
-#include <string>
-#include <sstream>
-
-#include "err.hpp"
-
-zmq::vmci_address_t::vmci_address_t ()
-{
-    memset (&address, 0, sizeof address);
-}
-
-zmq::vmci_address_t::vmci_address_t (ctx_t *parent_) : parent (parent_)
-{
-    memset (&address, 0, sizeof address);
-}
-
-zmq::vmci_address_t::vmci_address_t (const sockaddr *sa,
-                                     socklen_t sa_len,
-                                     ctx_t *parent_) :
-    parent (parent_)
-{
-    zmq_assert (sa && sa_len > 0);
-
-    memset (&address, 0, sizeof address);
-    if (sa->sa_family == parent->get_vmci_socket_family ())
-        memcpy (&address, sa, sa_len);
-}
-
-int zmq::vmci_address_t::resolve (const char *path_)
-{
-    //  Find the ':' at end that separates address from the port number.
-    const char *delimiter = strrchr (path_, ':');
-    if (!delimiter) {
-        errno = EINVAL;
-        return -1;
-    }
-
-    //  Separate the address/port.
-    std::string addr_str (path_, delimiter - path_);
-    std::string port_str (delimiter + 1);
-
-    unsigned int cid = VMADDR_CID_ANY;
-    unsigned int port = VMADDR_PORT_ANY;
-
-    if (!addr_str.length ()) {
-        errno = EINVAL;
-        return -1;
-    } else if (addr_str == "@") {
-        cid = VMCISock_GetLocalCID ();
-
-        if (cid == VMADDR_CID_ANY) {
-            errno = ENODEV;
-            return -1;
-        }
-    } else if (addr_str != "*" && addr_str != "-1") {
-        const char *begin = addr_str.c_str ();
-        char *end = NULL;
-        unsigned long l = strtoul (begin, &end, 10);
-
-        if ((l == 0 && end == begin) || (l == ULONG_MAX && errno == ERANGE)
-            || l > UINT_MAX) {
-            errno = EINVAL;
-            return -1;
-        }
-
-        cid = static_cast<unsigned int> (l);
-    }
-
-    if (!port_str.length ()) {
-        errno = EINVAL;
-        return -1;
-    } else if (port_str != "*" && port_str != "-1") {
-        const char *begin = port_str.c_str ();
-        char *end = NULL;
-        unsigned long l = strtoul (begin, &end, 10);
-
-        if ((l == 0 && end == begin) || (l == ULONG_MAX && errno == ERANGE)
-            || l > UINT_MAX) {
-            errno = EINVAL;
-            return -1;
-        }
-
-        port = static_cast<unsigned int> (l);
-    }
-
-    address.svm_family =
-      static_cast<sa_family_t> (parent->get_vmci_socket_family ());
-    address.svm_cid = cid;
-    address.svm_port = port;
-
-    return 0;
-}
-
-int zmq::vmci_address_t::to_string (std::string &addr_) const
-{
-    if (address.svm_family != parent->get_vmci_socket_family ()) {
-        addr_.clear ();
-        return -1;
-    }
-
-    std::stringstream s;
-
-    s << "vmci://";
-
-    if (address.svm_cid == VMADDR_CID_ANY) {
-        s << "*";
-    } else {
-        s << address.svm_cid;
-    }
-
-    s << ":";
-
-    if (address.svm_port == VMADDR_PORT_ANY) {
-        s << "*";
-    } else {
-        s << address.svm_port;
-    }
-
-    addr_ = s.str ();
-    return 0;
-}
-
-const sockaddr *zmq::vmci_address_t::addr () const
-{
-    return reinterpret_cast<const sockaddr *> (&address);
-}
-
-socklen_t zmq::vmci_address_t::addrlen () const
-{
-    return static_cast<socklen_t> (sizeof address);
-}
-
-#if defined ZMQ_HAVE_WINDOWS
-unsigned short zmq::vmci_address_t::family () const
-#else
-sa_family_t zmq::vmci_address_t::family () const
-#endif
-{
-    return parent->get_vmci_socket_family ();
-}
-
-#endif
diff --git a/libs/libzmq/src/vmci_address.hpp b/libs/libzmq/src/vmci_address.hpp
deleted file mode 100644
index ae6b39f..0000000
--- a/libs/libzmq/src/vmci_address.hpp
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_VMCI_ADDRESS_HPP_INCLUDED__
-#define __ZMQ_VMCI_ADDRESS_HPP_INCLUDED__
-
-#include <string>
-
-#include "platform.hpp"
-#include "ctx.hpp"
-
-#if defined(ZMQ_HAVE_VMCI)
-#include <vmci_sockets.h>
-
-namespace zmq
-{
-class vmci_address_t
-{
-  public:
-    vmci_address_t ();
-    vmci_address_t (ctx_t *parent_);
-    vmci_address_t (const sockaddr *sa, socklen_t sa_len, ctx_t *parent_);
-
-    //  This function sets up the address for VMCI transport.
-    int resolve (const char *path_);
-
-    //  The opposite to resolve()
-    int to_string (std::string &addr_) const;
-
-#if defined ZMQ_HAVE_WINDOWS
-    unsigned short family () const;
-#else
-    sa_family_t family () const;
-#endif
-    const sockaddr *addr () const;
-    socklen_t addrlen () const;
-
-  private:
-    struct sockaddr_vm address;
-    ctx_t *parent;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (vmci_address_t)
-};
-}
-
-#endif
-
-#endif
diff --git a/libs/libzmq/src/vmci_connecter.cpp b/libs/libzmq/src/vmci_connecter.cpp
deleted file mode 100644
index 2e0e4b4..0000000
--- a/libs/libzmq/src/vmci_connecter.cpp
+++ /dev/null
@@ -1,301 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-
-#include "vmci_connecter.hpp"
-
-#if defined ZMQ_HAVE_VMCI
-
-#include <new>
-
-#include "io_thread.hpp"
-#include "platform.hpp"
-#include "random.hpp"
-#include "err.hpp"
-#include "ip.hpp"
-#include "address.hpp"
-#include "vmci_address.hpp"
-#include "vmci.hpp"
-#include "session_base.hpp"
-
-zmq::vmci_connecter_t::vmci_connecter_t (class io_thread_t *io_thread_,
-                                         class session_base_t *session_,
-                                         const options_t &options_,
-                                         address_t *addr_,
-                                         bool delayed_start_) :
-    stream_connecter_base_t (
-      io_thread_, session_, options_, addr_, delayed_start_),
-    _connect_timer_started (false)
-{
-    zmq_assert (_addr->protocol == protocol_name::vmci);
-}
-
-zmq::vmci_connecter_t::~vmci_connecter_t ()
-{
-    zmq_assert (!_connect_timer_started);
-}
-
-void zmq::vmci_connecter_t::process_term (int linger_)
-{
-    if (_connect_timer_started) {
-        cancel_timer (connect_timer_id);
-        _connect_timer_started = false;
-    }
-
-    stream_connecter_base_t::process_term (linger_);
-}
-
-void zmq::vmci_connecter_t::in_event ()
-{
-    //  We are not polling for incoming data, so we are actually called
-    //  because of error here. However, we can get error on out event as well
-    //  on some platforms, so we'll simply handle both events in the same way.
-    out_event ();
-}
-
-void zmq::vmci_connecter_t::out_event ()
-{
-    if (_connect_timer_started) {
-        cancel_timer (connect_timer_id);
-        _connect_timer_started = false;
-    }
-
-    //  TODO this is still very similar to (t)ipc_connecter_t, maybe the
-    //  differences can be factored out
-
-    rm_handle ();
-
-    const fd_t fd = connect ();
-
-    if (fd == retired_fd
-        && ((options.reconnect_stop & ZMQ_RECONNECT_STOP_CONN_REFUSED)
-            && errno == ECONNREFUSED)) {
-        send_conn_failed (_session);
-        close ();
-        terminate ();
-        return;
-    }
-
-    //  Handle the error condition by attempt to reconnect.
-    if (fd == retired_fd) {
-        close ();
-        add_reconnect_timer ();
-        return;
-    }
-
-    tune_vmci_buffer_size (this->get_ctx (), fd, options.vmci_buffer_size,
-                           options.vmci_buffer_min_size,
-                           options.vmci_buffer_max_size);
-
-    if (options.vmci_connect_timeout > 0) {
-#if defined ZMQ_HAVE_WINDOWS
-        tune_vmci_connect_timeout (this->get_ctx (), fd,
-                                   options.vmci_connect_timeout);
-#else
-        struct timeval timeout = {0, options.vmci_connect_timeout * 1000};
-        tune_vmci_connect_timeout (this->get_ctx (), fd, timeout);
-#endif
-    }
-
-    create_engine (
-      fd, zmq::vmci_connecter_t::get_socket_name (fd, socket_end_local));
-}
-
-std::string
-zmq::vmci_connecter_t::get_socket_name (zmq::fd_t fd_,
-                                        socket_end_t socket_end_) const
-{
-    struct sockaddr_storage ss;
-    const zmq_socklen_t sl = get_socket_address (fd_, socket_end_, &ss);
-    if (sl == 0) {
-        return std::string ();
-    }
-
-    const vmci_address_t addr (reinterpret_cast<struct sockaddr *> (&ss), sl,
-                               this->get_ctx ());
-    std::string address_string;
-    addr.to_string (address_string);
-    return address_string;
-}
-
-void zmq::vmci_connecter_t::timer_event (int id_)
-{
-    if (id_ == connect_timer_id) {
-        _connect_timer_started = false;
-        rm_handle ();
-        close ();
-        add_reconnect_timer ();
-    } else
-        stream_connecter_base_t::timer_event (id_);
-}
-
-void zmq::vmci_connecter_t::start_connecting ()
-{
-    //  Open the connecting socket.
-    const int rc = open ();
-
-    //  Connect may succeed in synchronous manner.
-    if (rc == 0) {
-        _handle = add_fd (_s);
-        out_event ();
-    }
-
-    //  Connection establishment may be delayed. Poll for its completion.
-    else if (rc == -1 && errno == EINPROGRESS) {
-        _handle = add_fd (_s);
-        set_pollout (_handle);
-        _socket->event_connect_delayed (
-          make_unconnected_connect_endpoint_pair (_endpoint), zmq_errno ());
-
-        //  add userspace connect timeout
-        add_connect_timer ();
-    }
-
-    //  Handle any other error condition by eventual reconnect.
-    else {
-        if (_s != retired_fd)
-            close ();
-        add_reconnect_timer ();
-    }
-}
-
-void zmq::vmci_connecter_t::add_connect_timer ()
-{
-    if (options.connect_timeout > 0) {
-        add_timer (options.connect_timeout, connect_timer_id);
-        _connect_timer_started = true;
-    }
-}
-
-int zmq::vmci_connecter_t::open ()
-{
-    zmq_assert (_s == retired_fd);
-
-    //  Resolve the address
-    if (_addr->resolved.vmci_addr != NULL) {
-        LIBZMQ_DELETE (_addr->resolved.vmci_addr);
-    }
-
-    _addr->resolved.vmci_addr =
-      new (std::nothrow) vmci_address_t (this->get_ctx ());
-    alloc_assert (_addr->resolved.vmci_addr);
-    _s = vmci_open_socket (_addr->address.c_str (), options,
-                           _addr->resolved.vmci_addr);
-    if (_s == retired_fd) {
-        //  TODO we should emit some event in this case!
-
-        LIBZMQ_DELETE (_addr->resolved.vmci_addr);
-        return -1;
-    }
-    zmq_assert (_addr->resolved.vmci_addr != NULL);
-
-    // Set the socket to non-blocking mode so that we get async connect().
-    unblock_socket (_s);
-
-    const vmci_address_t *const vmci_addr = _addr->resolved.vmci_addr;
-
-    int rc;
-
-    //  Connect to the remote peer.
-#if defined ZMQ_HAVE_VXWORKS
-    rc = ::connect (_s, (sockaddr *) vmci_addr->addr (), vmci_addr->addrlen ());
-#else
-    rc = ::connect (_s, vmci_addr->addr (), vmci_addr->addrlen ());
-#endif
-    //  Connect was successful immediately.
-    if (rc == 0) {
-        return 0;
-    }
-
-    //  Translate error codes indicating asynchronous connect has been
-    //  launched to a uniform EINPROGRESS.
-#ifdef ZMQ_HAVE_WINDOWS
-    const int last_error = WSAGetLastError ();
-    if (last_error == WSAEINPROGRESS || last_error == WSAEWOULDBLOCK)
-        errno = EINPROGRESS;
-    else
-        errno = wsa_error_to_errno (last_error);
-#else
-    if (errno == EINTR)
-        errno = EINPROGRESS;
-#endif
-    return -1;
-}
-
-zmq::fd_t zmq::vmci_connecter_t::connect ()
-{
-    //  Async connect has finished. Check whether an error occurred
-    int err = 0;
-#if defined ZMQ_HAVE_HPUX || defined ZMQ_HAVE_VXWORKS
-    int len = sizeof err;
-#else
-    socklen_t len = sizeof err;
-#endif
-
-    const int rc = getsockopt (_s, SOL_SOCKET, SO_ERROR,
-                               reinterpret_cast<char *> (&err), &len);
-
-    //  Assert if the error was caused by 0MQ bug.
-    //  Networking problems are OK. No need to assert.
-#ifdef ZMQ_HAVE_WINDOWS
-    zmq_assert (rc == 0);
-    if (err != 0) {
-        if (err == WSAEBADF || err == WSAENOPROTOOPT || err == WSAENOTSOCK
-            || err == WSAENOBUFS) {
-            wsa_assert_no (err);
-        }
-        errno = wsa_error_to_errno (err);
-        return retired_fd;
-    }
-#else
-    //  Following code should handle both Berkeley-derived socket
-    //  implementations and Solaris.
-    if (rc == -1)
-        err = errno;
-    if (err != 0) {
-        errno = err;
-#if !defined(TARGET_OS_IPHONE) || !TARGET_OS_IPHONE
-        errno_assert (errno != EBADF && errno != ENOPROTOOPT
-                      && errno != ENOTSOCK && errno != ENOBUFS);
-#else
-        errno_assert (errno != ENOPROTOOPT && errno != ENOTSOCK
-                      && errno != ENOBUFS);
-#endif
-        return retired_fd;
-    }
-#endif
-
-    //  Return the newly connected socket.
-    const fd_t result = _s;
-    _s = retired_fd;
-    return result;
-}
-
-#endif
diff --git a/libs/libzmq/src/vmci_connecter.hpp b/libs/libzmq/src/vmci_connecter.hpp
deleted file mode 100644
index 64a176a..0000000
--- a/libs/libzmq/src/vmci_connecter.hpp
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_VMCI_CONNECTER_HPP_INCLUDED__
-#define __ZMQ_VMCI_CONNECTER_HPP_INCLUDED__
-
-#include "platform.hpp"
-
-#if defined ZMQ_HAVE_VMCI
-
-#include "fd.hpp"
-#include "own.hpp"
-#include "stdint.hpp"
-#include "io_object.hpp"
-#include "stream_connecter_base.hpp"
-
-namespace zmq
-{
-class io_thread_t;
-class session_base_t;
-struct address_t;
-
-class vmci_connecter_t ZMQ_FINAL : public stream_connecter_base_t
-{
-  public:
-    //  If 'delayed_start' is true connecter first waits for a while,
-    //  then starts connection process.
-    vmci_connecter_t (zmq::io_thread_t *io_thread_,
-                      zmq::session_base_t *session_,
-                      const options_t &options_,
-                      address_t *addr_,
-                      bool delayed_start_);
-    ~vmci_connecter_t ();
-
-  protected:
-    std::string get_socket_name (fd_t fd_, socket_end_t socket_end_) const;
-
-  private:
-    //  ID of the timer used to check the connect timeout, must be different from stream_connecter_base_t::reconnect_timer_id.
-    enum
-    {
-        connect_timer_id = 2
-    };
-
-    //  Handlers for incoming commands.
-    void process_term (int linger_);
-
-    //  Handlers for I/O events.
-    void in_event ();
-    void out_event ();
-    void timer_event (int id_);
-
-    //  Internal function to start the actual connection establishment.
-    void start_connecting ();
-
-    //  Internal function to add a connect timer
-    void add_connect_timer ();
-
-    //  Internal function to return a reconnect backoff delay.
-    //  Will modify the current_reconnect_ivl used for next call
-    //  Returns the currently used interval
-    int get_new_reconnect_ivl ();
-
-    //  Open VMCI connecting socket. Returns -1 in case of error,
-    //  0 if connect was successful immediately. Returns -1 with
-    //  EAGAIN errno if async connect was launched.
-    int open ();
-
-    //  Get the file descriptor of newly created connection. Returns
-    //  retired_fd if the connection was unsuccessful.
-    fd_t connect ();
-
-    //  True iff a timer has been started.
-    bool _connect_timer_started;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (vmci_connecter_t)
-};
-}
-
-#endif
-
-#endif
diff --git a/libs/libzmq/src/vmci_listener.cpp b/libs/libzmq/src/vmci_listener.cpp
deleted file mode 100644
index c6b10df..0000000
--- a/libs/libzmq/src/vmci_listener.cpp
+++ /dev/null
@@ -1,215 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-
-#include "vmci_listener.hpp"
-
-#if defined ZMQ_HAVE_VMCI
-
-#include <new>
-
-//#include "stream_engine.hpp"
-#include "vmci_address.hpp"
-#include "io_thread.hpp"
-#include "session_base.hpp"
-#include "config.hpp"
-#include "err.hpp"
-#include "ip.hpp"
-#include "socket_base.hpp"
-#include "vmci.hpp"
-
-#if defined ZMQ_HAVE_WINDOWS
-#include "windows.hpp"
-#else
-#include <unistd.h>
-#include <fcntl.h>
-#endif
-
-zmq::vmci_listener_t::vmci_listener_t (io_thread_t *io_thread_,
-                                       socket_base_t *socket_,
-                                       const options_t &options_) :
-    stream_listener_base_t (io_thread_, socket_, options_)
-{
-}
-
-void zmq::vmci_listener_t::in_event ()
-{
-    fd_t fd = accept ();
-
-    //  If connection was reset by the peer in the meantime, just ignore it.
-    if (fd == retired_fd) {
-        _socket->event_accept_failed (
-          make_unconnected_bind_endpoint_pair (_endpoint), zmq_errno ());
-        return;
-    }
-
-    tune_vmci_buffer_size (this->get_ctx (), fd, options.vmci_buffer_size,
-                           options.vmci_buffer_min_size,
-                           options.vmci_buffer_max_size);
-
-    if (options.vmci_connect_timeout > 0) {
-#if defined ZMQ_HAVE_WINDOWS
-        tune_vmci_connect_timeout (this->get_ctx (), fd,
-                                   options.vmci_connect_timeout);
-#else
-        struct timeval timeout = {0, options.vmci_connect_timeout * 1000};
-        tune_vmci_connect_timeout (this->get_ctx (), fd, timeout);
-#endif
-    }
-
-    //  Create the engine object for this connection.
-    create_engine (fd);
-}
-
-std::string
-zmq::vmci_listener_t::get_socket_name (zmq::fd_t fd_,
-                                       socket_end_t socket_end_) const
-{
-    struct sockaddr_storage ss;
-    const zmq_socklen_t sl = get_socket_address (fd_, socket_end_, &ss);
-    if (sl == 0) {
-        return std::string ();
-    }
-
-    const vmci_address_t addr (reinterpret_cast<struct sockaddr *> (&ss), sl,
-                               this->get_ctx ());
-    std::string address_string;
-    addr.to_string (address_string);
-    return address_string;
-}
-
-int zmq::vmci_listener_t::set_local_address (const char *addr_)
-{
-    //  Create addr on stack for auto-cleanup
-    std::string addr (addr_);
-
-    //  Initialise the address structure.
-    vmci_address_t address (this->get_ctx ());
-    int rc = address.resolve (addr.c_str ());
-    if (rc != 0)
-        return -1;
-
-    //  Create a listening socket.
-    _s =
-      open_socket (this->get_ctx ()->get_vmci_socket_family (), SOCK_STREAM, 0);
-#ifdef ZMQ_HAVE_WINDOWS
-    if (s == INVALID_SOCKET) {
-        errno = wsa_error_to_errno (WSAGetLastError ());
-        return -1;
-    }
-#if !defined _WIN32_WCE
-    //  On Windows, preventing sockets to be inherited by child processes.
-    BOOL brc = SetHandleInformation ((HANDLE) _s, HANDLE_FLAG_INHERIT, 0);
-    win_assert (brc);
-#endif
-#else
-    if (_s == -1)
-        return -1;
-#endif
-
-    address.to_string (_endpoint);
-
-    //  Bind the socket.
-    rc = bind (_s, address.addr (), address.addrlen ());
-#ifdef ZMQ_HAVE_WINDOWS
-    if (rc == SOCKET_ERROR) {
-        errno = wsa_error_to_errno (WSAGetLastError ());
-        goto error;
-    }
-#else
-    if (rc != 0)
-        goto error;
-#endif
-
-    //  Listen for incoming connections.
-    rc = listen (_s, options.backlog);
-#ifdef ZMQ_HAVE_WINDOWS
-    if (rc == SOCKET_ERROR) {
-        errno = wsa_error_to_errno (WSAGetLastError ());
-        goto error;
-    }
-#else
-    if (rc != 0)
-        goto error;
-#endif
-
-    _socket->event_listening (make_unconnected_bind_endpoint_pair (_endpoint),
-                              _s);
-    return 0;
-
-error:
-    int err = errno;
-    close ();
-    errno = err;
-    return -1;
-}
-
-zmq::fd_t zmq::vmci_listener_t::accept ()
-{
-    //  Accept one connection and deal with different failure modes.
-    //  The situation where connection cannot be accepted due to insufficient
-    //  resources is considered valid and treated by ignoring the connection.
-    zmq_assert (_s != retired_fd);
-    fd_t sock = ::accept (_s, NULL, NULL);
-
-#ifdef ZMQ_HAVE_WINDOWS
-    if (sock == INVALID_SOCKET) {
-        wsa_assert (WSAGetLastError () == WSAEWOULDBLOCK
-                    || WSAGetLastError () == WSAECONNRESET
-                    || WSAGetLastError () == WSAEMFILE
-                    || WSAGetLastError () == WSAENOBUFS);
-        return retired_fd;
-    }
-#if !defined _WIN32_WCE
-    //  On Windows, preventing sockets to be inherited by child processes.
-    BOOL brc = SetHandleInformation ((HANDLE) sock, HANDLE_FLAG_INHERIT, 0);
-    win_assert (brc);
-#endif
-#else
-    if (sock == -1) {
-        errno_assert (errno == EAGAIN || errno == EWOULDBLOCK || errno == EINTR
-                      || errno == ECONNABORTED || errno == EPROTO
-                      || errno == ENOBUFS || errno == ENOMEM || errno == EMFILE
-                      || errno == ENFILE);
-        return retired_fd;
-    }
-#endif
-
-    //  Race condition can cause socket not to be closed (if fork happens
-    //  between accept and this point).
-#ifdef FD_CLOEXEC
-    int rc = fcntl (sock, F_SETFD, FD_CLOEXEC);
-    errno_assert (rc != -1);
-#endif
-
-    return sock;
-}
-
-#endif
diff --git a/libs/libzmq/src/vmci_listener.hpp b/libs/libzmq/src/vmci_listener.hpp
deleted file mode 100644
index abce079..0000000
--- a/libs/libzmq/src/vmci_listener.hpp
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_VMCI_LISTENER_HPP_INCLUDED__
-#define __ZMQ_VMCI_LISTENER_HPP_INCLUDED__
-
-#include "platform.hpp"
-
-#if defined ZMQ_HAVE_VMCI
-
-#include <string>
-
-#include "fd.hpp"
-#include "vmci_address.hpp"
-#include "stream_listener_base.hpp"
-
-namespace zmq
-{
-class vmci_listener_t ZMQ_FINAL : public stream_listener_base_t
-{
-  public:
-    vmci_listener_t (zmq::io_thread_t *io_thread_,
-                     zmq::socket_base_t *socket_,
-                     const options_t &options_);
-
-    //  Set address to listen on.
-    int set_local_address (const char *addr_);
-
-  protected:
-    std::string get_socket_name (fd_t fd_, socket_end_t socket_end_) const;
-
-  private:
-    //  Handlers for I/O events.
-    void in_event ();
-
-    //  Accept the new connection. Returns the file descriptor of the
-    //  newly created connection. The function may return retired_fd
-    //  if the connection was dropped while waiting in the listen backlog.
-    fd_t accept ();
-
-    int create_socket (const char *addr_);
-
-    //  Address to listen on.
-    vmci_address_t _address;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (vmci_listener_t)
-};
-}
-
-#endif
-
-#endif
diff --git a/libs/libzmq/src/windows.hpp b/libs/libzmq/src/windows.hpp
deleted file mode 100644
index c6d6251..0000000
--- a/libs/libzmq/src/windows.hpp
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_WINDOWS_HPP_INCLUDED__
-#define __ZMQ_WINDOWS_HPP_INCLUDED__
-
-#ifndef _CRT_SECURE_NO_WARNINGS
-#define _CRT_SECURE_NO_WARNINGS
-#endif
-#ifndef NOMINMAX
-#define NOMINMAX // Macros min(a,b) and max(a,b)
-#endif
-
-//  Set target version to Windows Server 2008, Windows Vista or higher.
-//  Windows XP (0x0501) is supported but without client & server socket types.
-#if !defined _WIN32_WINNT && !defined ZMQ_HAVE_WINDOWS_UWP
-#define _WIN32_WINNT 0x0600
-#endif
-
-#ifdef __MINGW32__
-//  Require Windows XP or higher with MinGW for getaddrinfo().
-#if (_WIN32_WINNT >= 0x0501)
-#else
-#error You need at least Windows XP target
-#endif
-#endif
-
-#include <winsock2.h>
-#include <windows.h>
-#include <mswsock.h>
-#include <iphlpapi.h>
-
-#if !defined __MINGW32__
-#include <mstcpip.h>
-#endif
-
-//  Workaround missing mstcpip.h in mingw32 (MinGW64 provides this)
-//  __MINGW64_VERSION_MAJOR is only defined when using in mingw-w64
-#if defined __MINGW32__ && !defined SIO_KEEPALIVE_VALS                         \
-  && !defined __MINGW64_VERSION_MAJOR
-struct tcp_keepalive
-{
-    u_long onoff;
-    u_long keepalivetime;
-    u_long keepaliveinterval;
-};
-#define SIO_KEEPALIVE_VALS _WSAIOW (IOC_VENDOR, 4)
-#endif
-
-#include <ws2tcpip.h>
-#include <ipexport.h>
-#if !defined _WIN32_WCE
-#include <process.h>
-#endif
-
-#if defined ZMQ_IOTHREAD_POLLER_USE_POLL || defined ZMQ_POLL_BASED_ON_POLL
-static inline int poll (struct pollfd *pfd, unsigned long nfds, int timeout)
-{
-    return WSAPoll (pfd, nfds, timeout);
-}
-#endif
-
-//  In MinGW environment AI_NUMERICSERV is not defined.
-#ifndef AI_NUMERICSERV
-#define AI_NUMERICSERV 0x0400
-#endif
-
-//  In MSVC prior to v14, snprintf is not available
-//  The closest implementation is the _snprintf_s function
-#if defined(_MSC_VER) && _MSC_VER < 1900
-#define snprintf(buffer_, count_, format_, ...)                                \
-    _snprintf_s (buffer_, count_, _TRUNCATE, format_, __VA_ARGS__)
-#endif
-
-//  Workaround missing struct sockaddr_un in afunix.h.
-//  Fix #3949.
-#if defined(ZMQ_HAVE_IPC) && !defined(ZMQ_HAVE_STRUCT_SOCKADDR_UN)
-struct sockaddr_un
-{
-    ADDRESS_FAMILY sun_family; /* AF_UNIX */
-    char sun_path[108];        /* pathname */
-};
-#endif
-
-#endif
diff --git a/libs/libzmq/src/wire.hpp b/libs/libzmq/src/wire.hpp
deleted file mode 100644
index 47b61b0..0000000
--- a/libs/libzmq/src/wire.hpp
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_WIRE_HPP_INCLUDED__
-#define __ZMQ_WIRE_HPP_INCLUDED__
-
-#include "stdint.hpp"
-
-namespace zmq
-{
-//  Helper functions to convert different integer types to/from network
-//  byte order.
-
-inline void put_uint8 (unsigned char *buffer_, uint8_t value_)
-{
-    *buffer_ = value_;
-}
-
-inline uint8_t get_uint8 (const unsigned char *buffer_)
-{
-    return *buffer_;
-}
-
-inline void put_uint16 (unsigned char *buffer_, uint16_t value_)
-{
-    buffer_[0] = static_cast<unsigned char> (((value_) >> 8) & 0xff);
-    buffer_[1] = static_cast<unsigned char> (value_ & 0xff);
-}
-
-inline uint16_t get_uint16 (const unsigned char *buffer_)
-{
-    return ((static_cast<uint16_t> (buffer_[0])) << 8)
-           | (static_cast<uint16_t> (buffer_[1]));
-}
-
-inline void put_uint32 (unsigned char *buffer_, uint32_t value_)
-{
-    buffer_[0] = static_cast<unsigned char> (((value_) >> 24) & 0xff);
-    buffer_[1] = static_cast<unsigned char> (((value_) >> 16) & 0xff);
-    buffer_[2] = static_cast<unsigned char> (((value_) >> 8) & 0xff);
-    buffer_[3] = static_cast<unsigned char> (value_ & 0xff);
-}
-
-inline uint32_t get_uint32 (const unsigned char *buffer_)
-{
-    return ((static_cast<uint32_t> (buffer_[0])) << 24)
-           | ((static_cast<uint32_t> (buffer_[1])) << 16)
-           | ((static_cast<uint32_t> (buffer_[2])) << 8)
-           | (static_cast<uint32_t> (buffer_[3]));
-}
-
-inline void put_uint64 (unsigned char *buffer_, uint64_t value_)
-{
-    buffer_[0] = static_cast<unsigned char> (((value_) >> 56) & 0xff);
-    buffer_[1] = static_cast<unsigned char> (((value_) >> 48) & 0xff);
-    buffer_[2] = static_cast<unsigned char> (((value_) >> 40) & 0xff);
-    buffer_[3] = static_cast<unsigned char> (((value_) >> 32) & 0xff);
-    buffer_[4] = static_cast<unsigned char> (((value_) >> 24) & 0xff);
-    buffer_[5] = static_cast<unsigned char> (((value_) >> 16) & 0xff);
-    buffer_[6] = static_cast<unsigned char> (((value_) >> 8) & 0xff);
-    buffer_[7] = static_cast<unsigned char> (value_ & 0xff);
-}
-
-inline uint64_t get_uint64 (const unsigned char *buffer_)
-{
-    return ((static_cast<uint64_t> (buffer_[0])) << 56)
-           | ((static_cast<uint64_t> (buffer_[1])) << 48)
-           | ((static_cast<uint64_t> (buffer_[2])) << 40)
-           | ((static_cast<uint64_t> (buffer_[3])) << 32)
-           | ((static_cast<uint64_t> (buffer_[4])) << 24)
-           | ((static_cast<uint64_t> (buffer_[5])) << 16)
-           | ((static_cast<uint64_t> (buffer_[6])) << 8)
-           | (static_cast<uint64_t> (buffer_[7]));
-}
-}
-
-#endif
diff --git a/libs/libzmq/src/ws_address.cpp b/libs/libzmq/src/ws_address.cpp
deleted file mode 100644
index 9e5224b..0000000
--- a/libs/libzmq/src/ws_address.cpp
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include <string>
-#include <sstream>
-
-#include "macros.hpp"
-#include "ws_address.hpp"
-#include "stdint.hpp"
-#include "err.hpp"
-#include "ip.hpp"
-
-#ifndef ZMQ_HAVE_WINDOWS
-#include <sys/types.h>
-#include <arpa/inet.h>
-#include <netinet/tcp.h>
-#include <net/if.h>
-#include <netdb.h>
-#include <ctype.h>
-#include <unistd.h>
-#include <stdlib.h>
-#endif
-
-#include <limits.h>
-
-zmq::ws_address_t::ws_address_t ()
-{
-    memset (&_address, 0, sizeof (_address));
-}
-
-zmq::ws_address_t::ws_address_t (const sockaddr *sa_, socklen_t sa_len_)
-{
-    zmq_assert (sa_ && sa_len_ > 0);
-
-    memset (&_address, 0, sizeof (_address));
-    if (sa_->sa_family == AF_INET
-        && sa_len_ >= static_cast<socklen_t> (sizeof (_address.ipv4)))
-        memcpy (&_address.ipv4, sa_, sizeof (_address.ipv4));
-    else if (sa_->sa_family == AF_INET6
-             && sa_len_ >= static_cast<socklen_t> (sizeof (_address.ipv6)))
-        memcpy (&_address.ipv6, sa_, sizeof (_address.ipv6));
-
-    _path = std::string ("");
-
-    char hbuf[NI_MAXHOST];
-    const int rc = getnameinfo (addr (), addrlen (), hbuf, sizeof (hbuf), NULL,
-                                0, NI_NUMERICHOST);
-    if (rc != 0) {
-        _host = std::string ("localhost");
-        return;
-    }
-
-    std::ostringstream os;
-
-    if (_address.family () == AF_INET6)
-        os << std::string ("[");
-
-    os << std::string (hbuf);
-
-    if (_address.family () == AF_INET6)
-        os << std::string ("]");
-
-    _host = os.str ();
-}
-
-int zmq::ws_address_t::resolve (const char *name_, bool local_, bool ipv6_)
-{
-    //  find the host part, It's important to use str*r*chr to only get
-    //  the latest colon since IPv6 addresses use colons as delemiters.
-    const char *delim = strrchr (name_, ':');
-    if (delim == NULL) {
-        errno = EINVAL;
-        return -1;
-    }
-    _host = std::string (name_, delim - name_);
-
-    // find the path part, which is optional
-    delim = strrchr (name_, '/');
-    std::string host_name;
-    if (delim) {
-        _path = std::string (delim);
-        // remove the path, otherwise resolving the port will fail with wildcard
-        host_name = std::string (name_, delim - name_);
-    } else {
-        _path = std::string ("/");
-        host_name = name_;
-    }
-
-    ip_resolver_options_t resolver_opts;
-    resolver_opts.bindable (local_)
-      .allow_dns (!local_)
-      .allow_nic_name (local_)
-      .ipv6 (ipv6_)
-      .allow_path (true)
-      .expect_port (true);
-
-    ip_resolver_t resolver (resolver_opts);
-
-    return resolver.resolve (&_address, host_name.c_str ());
-}
-
-int zmq::ws_address_t::to_string (std::string &addr_) const
-{
-    std::ostringstream os;
-    os << std::string ("ws://") << host () << std::string (":")
-       << _address.port () << _path;
-    addr_ = os.str ();
-
-    return 0;
-}
-
-const sockaddr *zmq::ws_address_t::addr () const
-{
-    return _address.as_sockaddr ();
-}
-
-socklen_t zmq::ws_address_t::addrlen () const
-{
-    return _address.sockaddr_len ();
-}
-
-const char *zmq::ws_address_t::host () const
-{
-    return _host.c_str ();
-}
-
-const char *zmq::ws_address_t::path () const
-{
-    return _path.c_str ();
-}
-
-#if defined ZMQ_HAVE_WINDOWS
-unsigned short zmq::ws_address_t::family () const
-#else
-sa_family_t zmq::ws_address_t::family () const
-#endif
-{
-    return _address.family ();
-}
diff --git a/libs/libzmq/src/ws_address.hpp b/libs/libzmq/src/ws_address.hpp
deleted file mode 100644
index a5d5de8..0000000
--- a/libs/libzmq/src/ws_address.hpp
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_WS_ADDRESS_HPP_INCLUDED__
-#define __ZMQ_WS_ADDRESS_HPP_INCLUDED__
-
-#if !defined ZMQ_HAVE_WINDOWS
-#include <sys/socket.h>
-#include <netinet/in.h>
-#endif
-
-#include "ip_resolver.hpp"
-
-namespace zmq
-{
-class ws_address_t
-{
-  public:
-    ws_address_t ();
-    ws_address_t (const sockaddr *sa_, socklen_t sa_len_);
-
-    //  This function translates textual WS address into an address
-    //  structure. If 'local' is true, names are resolved as local interface
-    //  names. If it is false, names are resolved as remote hostnames.
-    //  If 'ipv6' is true, the name may resolve to IPv6 address.
-    int resolve (const char *name_, bool local_, bool ipv6_);
-
-    //  The opposite to resolve()
-    int to_string (std::string &addr_) const;
-
-#if defined ZMQ_HAVE_WINDOWS
-    unsigned short family () const;
-#else
-    sa_family_t family () const;
-#endif
-    const sockaddr *addr () const;
-    socklen_t addrlen () const;
-
-    const char *host () const;
-    const char *path () const;
-
-  protected:
-    ip_addr_t _address;
-
-  private:
-    std::string _host;
-    std::string _path;
-};
-}
-
-#endif
diff --git a/libs/libzmq/src/ws_connecter.cpp b/libs/libzmq/src/ws_connecter.cpp
deleted file mode 100644
index f9321d9..0000000
--- a/libs/libzmq/src/ws_connecter.cpp
+++ /dev/null
@@ -1,306 +0,0 @@
-/*
-    Copyright (c) 2007-2019 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include <new>
-#include <string>
-
-#include "macros.hpp"
-#include "ws_connecter.hpp"
-#include "io_thread.hpp"
-#include "err.hpp"
-#include "ip.hpp"
-#include "tcp.hpp"
-#include "address.hpp"
-#include "ws_address.hpp"
-#include "ws_engine.hpp"
-#include "session_base.hpp"
-
-#ifdef ZMQ_HAVE_WSS
-#include "wss_engine.hpp"
-#include "wss_address.hpp"
-#endif
-
-#if !defined ZMQ_HAVE_WINDOWS
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <arpa/inet.h>
-#include <netinet/tcp.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <fcntl.h>
-#ifdef ZMQ_HAVE_VXWORKS
-#include <sockLib.h>
-#endif
-#ifdef ZMQ_HAVE_OPENVMS
-#include <ioctl.h>
-#endif
-#endif
-
-#ifdef __APPLE__
-#include <TargetConditionals.h>
-#endif
-
-zmq::ws_connecter_t::ws_connecter_t (class io_thread_t *io_thread_,
-                                     class session_base_t *session_,
-                                     const options_t &options_,
-                                     address_t *addr_,
-                                     bool delayed_start_,
-                                     bool wss_,
-                                     const std::string &tls_hostname_) :
-    stream_connecter_base_t (
-      io_thread_, session_, options_, addr_, delayed_start_),
-    _connect_timer_started (false),
-    _wss (wss_),
-    _hostname (tls_hostname_)
-{
-}
-
-zmq::ws_connecter_t::~ws_connecter_t ()
-{
-    zmq_assert (!_connect_timer_started);
-}
-
-void zmq::ws_connecter_t::process_term (int linger_)
-{
-    if (_connect_timer_started) {
-        cancel_timer (connect_timer_id);
-        _connect_timer_started = false;
-    }
-
-    stream_connecter_base_t::process_term (linger_);
-}
-
-void zmq::ws_connecter_t::out_event ()
-{
-    if (_connect_timer_started) {
-        cancel_timer (connect_timer_id);
-        _connect_timer_started = false;
-    }
-
-    //  TODO this is still very similar to (t)ipc_connecter_t, maybe the
-    //  differences can be factored out
-
-    rm_handle ();
-
-    const fd_t fd = connect ();
-
-    //  Handle the error condition by attempt to reconnect.
-    if (fd == retired_fd || !tune_socket (fd)) {
-        close ();
-        add_reconnect_timer ();
-        return;
-    }
-
-    if (_wss)
-#ifdef ZMQ_HAVE_WSS
-        create_engine (fd,
-                       get_socket_name<wss_address_t> (fd, socket_end_local));
-#else
-        assert (false);
-#endif
-    else
-        create_engine (fd,
-                       get_socket_name<ws_address_t> (fd, socket_end_local));
-}
-
-void zmq::ws_connecter_t::timer_event (int id_)
-{
-    if (id_ == connect_timer_id) {
-        _connect_timer_started = false;
-        rm_handle ();
-        close ();
-        add_reconnect_timer ();
-    } else
-        stream_connecter_base_t::timer_event (id_);
-}
-
-void zmq::ws_connecter_t::start_connecting ()
-{
-    //  Open the connecting socket.
-    const int rc = open ();
-
-    //  Connect may succeed in synchronous manner.
-    if (rc == 0) {
-        _handle = add_fd (_s);
-        out_event ();
-    }
-
-    //  Connection establishment may be delayed. Poll for its completion.
-    else if (rc == -1 && errno == EINPROGRESS) {
-        _handle = add_fd (_s);
-        set_pollout (_handle);
-        _socket->event_connect_delayed (
-          make_unconnected_connect_endpoint_pair (_endpoint), zmq_errno ());
-
-        //  add userspace connect timeout
-        add_connect_timer ();
-    }
-
-    //  Handle any other error condition by eventual reconnect.
-    else {
-        if (_s != retired_fd)
-            close ();
-        add_reconnect_timer ();
-    }
-}
-
-void zmq::ws_connecter_t::add_connect_timer ()
-{
-    if (options.connect_timeout > 0) {
-        add_timer (options.connect_timeout, connect_timer_id);
-        _connect_timer_started = true;
-    }
-}
-
-int zmq::ws_connecter_t::open ()
-{
-    zmq_assert (_s == retired_fd);
-
-    tcp_address_t tcp_addr;
-    _s = tcp_open_socket (_addr->address.c_str (), options, false, true,
-                          &tcp_addr);
-    if (_s == retired_fd)
-        return -1;
-
-    // Set the socket to non-blocking mode so that we get async connect().
-    unblock_socket (_s);
-
-    //  Connect to the remote peer.
-#ifdef ZMQ_HAVE_VXWORKS
-    int rc = ::connect (_s, (sockaddr *) tcp_addr.addr (), tcp_addr.addrlen ());
-#else
-    const int rc = ::connect (_s, tcp_addr.addr (), tcp_addr.addrlen ());
-#endif
-    //  Connect was successful immediately.
-    if (rc == 0) {
-        return 0;
-    }
-
-    //  Translate error codes indicating asynchronous connect has been
-    //  launched to a uniform EINPROGRESS.
-#ifdef ZMQ_HAVE_WINDOWS
-    const int last_error = WSAGetLastError ();
-    if (last_error == WSAEINPROGRESS || last_error == WSAEWOULDBLOCK)
-        errno = EINPROGRESS;
-    else
-        errno = wsa_error_to_errno (last_error);
-#else
-    if (errno == EINTR)
-        errno = EINPROGRESS;
-#endif
-    return -1;
-}
-
-zmq::fd_t zmq::ws_connecter_t::connect ()
-{
-    //  Async connect has finished. Check whether an error occurred
-    int err = 0;
-#if defined ZMQ_HAVE_HPUX || defined ZMQ_HAVE_VXWORKS
-    int len = sizeof err;
-#else
-    socklen_t len = sizeof err;
-#endif
-
-    const int rc = getsockopt (_s, SOL_SOCKET, SO_ERROR,
-                               reinterpret_cast<char *> (&err), &len);
-
-    //  Assert if the error was caused by 0MQ bug.
-    //  Networking problems are OK. No need to assert.
-#ifdef ZMQ_HAVE_WINDOWS
-    zmq_assert (rc == 0);
-    if (err != 0) {
-        if (err == WSAEBADF || err == WSAENOPROTOOPT || err == WSAENOTSOCK
-            || err == WSAENOBUFS) {
-            wsa_assert_no (err);
-        }
-        return retired_fd;
-    }
-#else
-    //  Following code should handle both Berkeley-derived socket
-    //  implementations and Solaris.
-    if (rc == -1)
-        err = errno;
-    if (err != 0) {
-        errno = err;
-#if !defined(TARGET_OS_IPHONE) || !TARGET_OS_IPHONE
-        errno_assert (errno != EBADF && errno != ENOPROTOOPT
-                      && errno != ENOTSOCK && errno != ENOBUFS);
-#else
-        errno_assert (errno != ENOPROTOOPT && errno != ENOTSOCK
-                      && errno != ENOBUFS);
-#endif
-        return retired_fd;
-    }
-#endif
-
-    //  Return the newly connected socket.
-    const fd_t result = _s;
-    _s = retired_fd;
-    return result;
-}
-
-bool zmq::ws_connecter_t::tune_socket (const fd_t fd_)
-{
-    const int rc =
-      tune_tcp_socket (fd_) | tune_tcp_maxrt (fd_, options.tcp_maxrt);
-    return rc == 0;
-}
-
-void zmq::ws_connecter_t::create_engine (fd_t fd_,
-                                         const std::string &local_address_)
-{
-    const endpoint_uri_pair_t endpoint_pair (local_address_, _endpoint,
-                                             endpoint_type_connect);
-
-    //  Create the engine object for this connection.
-    i_engine *engine = NULL;
-    if (_wss) {
-#ifdef ZMQ_HAVE_WSS
-        engine = new (std::nothrow)
-          wss_engine_t (fd_, options, endpoint_pair, *_addr->resolved.ws_addr,
-                        true, NULL, _hostname);
-#else
-        LIBZMQ_UNUSED (_hostname);
-        assert (false);
-#endif
-    } else
-        engine = new (std::nothrow) ws_engine_t (
-          fd_, options, endpoint_pair, *_addr->resolved.ws_addr, true);
-    alloc_assert (engine);
-
-    //  Attach the engine to the corresponding session object.
-    send_attach (_session, engine);
-
-    //  Shut the connecter down.
-    terminate ();
-
-    _socket->event_connected (endpoint_pair, fd_);
-}
diff --git a/libs/libzmq/src/ws_connecter.hpp b/libs/libzmq/src/ws_connecter.hpp
deleted file mode 100644
index 9755b21..0000000
--- a/libs/libzmq/src/ws_connecter.hpp
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
-    Copyright (c) 2007-2019 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __WS_CONNECTER_HPP_INCLUDED__
-#define __WS_CONNECTER_HPP_INCLUDED__
-
-#include "fd.hpp"
-#include "stdint.hpp"
-#include "stream_connecter_base.hpp"
-
-namespace zmq
-{
-class ws_connecter_t ZMQ_FINAL : public stream_connecter_base_t
-{
-  public:
-    //  If 'delayed_start' is true connecter first waits for a while,
-    //  then starts connection process.
-    ws_connecter_t (zmq::io_thread_t *io_thread_,
-                    zmq::session_base_t *session_,
-                    const options_t &options_,
-                    address_t *addr_,
-                    bool delayed_start_,
-                    bool wss_,
-                    const std::string &tls_hostname_);
-    ~ws_connecter_t ();
-
-  protected:
-    void create_engine (fd_t fd, const std::string &local_address_);
-
-  private:
-    //  ID of the timer used to check the connect timeout, must be different from stream_connecter_base_t::reconnect_timer_id.
-    enum
-    {
-        connect_timer_id = 2
-    };
-
-    //  Handlers for incoming commands.
-    void process_term (int linger_);
-
-    //  Handlers for I/O events.
-    void out_event ();
-    void timer_event (int id_);
-
-    //  Internal function to start the actual connection establishment.
-    void start_connecting ();
-
-    //  Internal function to add a connect timer
-    void add_connect_timer ();
-
-    //  Open TCP connecting socket. Returns -1 in case of error,
-    //  0 if connect was successful immediately. Returns -1 with
-    //  EAGAIN errno if async connect was launched.
-    int open ();
-
-    //  Get the file descriptor of newly created connection. Returns
-    //  retired_fd if the connection was unsuccessful.
-    fd_t connect ();
-
-    //  Tunes a connected socket.
-    bool tune_socket (fd_t fd_);
-
-    //  True iff a timer has been started.
-    bool _connect_timer_started;
-
-    bool _wss;
-    const std::string &_hostname;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (ws_connecter_t)
-};
-}
-
-#endif
diff --git a/libs/libzmq/src/ws_decoder.cpp b/libs/libzmq/src/ws_decoder.cpp
deleted file mode 100644
index 58b1270..0000000
--- a/libs/libzmq/src/ws_decoder.cpp
+++ /dev/null
@@ -1,276 +0,0 @@
-/*
-    Copyright (c) 2007-2019 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include <stdlib.h>
-#include <string.h>
-#include <cmath>
-
-#include "ws_protocol.hpp"
-#include "ws_decoder.hpp"
-#include "likely.hpp"
-#include "wire.hpp"
-#include "err.hpp"
-
-zmq::ws_decoder_t::ws_decoder_t (size_t bufsize_,
-                                 int64_t maxmsgsize_,
-                                 bool zero_copy_,
-                                 bool must_mask_) :
-    decoder_base_t<ws_decoder_t, shared_message_memory_allocator> (bufsize_),
-    _msg_flags (0),
-    _zero_copy (zero_copy_),
-    _max_msg_size (maxmsgsize_),
-    _must_mask (must_mask_),
-    _size (0)
-{
-    memset (_tmpbuf, 0, sizeof (_tmpbuf));
-    int rc = _in_progress.init ();
-    errno_assert (rc == 0);
-
-    //  At the beginning, read one byte and go to opcode_ready state.
-    next_step (_tmpbuf, 1, &ws_decoder_t::opcode_ready);
-}
-
-zmq::ws_decoder_t::~ws_decoder_t ()
-{
-    const int rc = _in_progress.close ();
-    errno_assert (rc == 0);
-}
-
-int zmq::ws_decoder_t::opcode_ready (unsigned char const *)
-{
-    const bool final = (_tmpbuf[0] & 0x80) != 0; // final bit
-    if (!final)
-        return -1; // non final messages are not supported
-
-    _opcode = static_cast<zmq::ws_protocol_t::opcode_t> (_tmpbuf[0] & 0xF);
-
-    _msg_flags = 0;
-
-    switch (_opcode) {
-        case zmq::ws_protocol_t::opcode_binary:
-            break;
-        case zmq::ws_protocol_t::opcode_close:
-            _msg_flags = msg_t::command | msg_t::close_cmd;
-            break;
-        case zmq::ws_protocol_t::opcode_ping:
-            _msg_flags = msg_t::ping | msg_t::command;
-            break;
-        case zmq::ws_protocol_t::opcode_pong:
-            _msg_flags = msg_t::pong | msg_t::command;
-            break;
-        default:
-            return -1;
-    }
-
-    next_step (_tmpbuf, 1, &ws_decoder_t::size_first_byte_ready);
-
-    return 0;
-}
-
-int zmq::ws_decoder_t::size_first_byte_ready (unsigned char const *read_from_)
-{
-    const bool is_masked = (_tmpbuf[0] & 0x80) != 0;
-
-    if (is_masked != _must_mask) // wrong mask value
-        return -1;
-
-    _size = static_cast<uint64_t> (_tmpbuf[0] & 0x7F);
-
-    if (_size < 126) {
-        if (_must_mask)
-            next_step (_tmpbuf, 4, &ws_decoder_t::mask_ready);
-        else if (_opcode == ws_protocol_t::opcode_binary) {
-            if (_size == 0)
-                return -1;
-            next_step (_tmpbuf, 1, &ws_decoder_t::flags_ready);
-        } else
-            return size_ready (read_from_);
-    } else if (_size == 126)
-        next_step (_tmpbuf, 2, &ws_decoder_t::short_size_ready);
-    else
-        next_step (_tmpbuf, 8, &ws_decoder_t::long_size_ready);
-
-    return 0;
-}
-
-
-int zmq::ws_decoder_t::short_size_ready (unsigned char const *read_from_)
-{
-    _size = (_tmpbuf[0] << 8) | _tmpbuf[1];
-
-    if (_must_mask)
-        next_step (_tmpbuf, 4, &ws_decoder_t::mask_ready);
-    else if (_opcode == ws_protocol_t::opcode_binary) {
-        if (_size == 0)
-            return -1;
-        next_step (_tmpbuf, 1, &ws_decoder_t::flags_ready);
-    } else
-        return size_ready (read_from_);
-
-    return 0;
-}
-
-int zmq::ws_decoder_t::long_size_ready (unsigned char const *read_from_)
-{
-    //  The payload size is encoded as 64-bit unsigned integer.
-    //  The most significant byte comes first.
-    _size = get_uint64 (_tmpbuf);
-
-    if (_must_mask)
-        next_step (_tmpbuf, 4, &ws_decoder_t::mask_ready);
-    else if (_opcode == ws_protocol_t::opcode_binary) {
-        if (_size == 0)
-            return -1;
-        next_step (_tmpbuf, 1, &ws_decoder_t::flags_ready);
-    } else
-        return size_ready (read_from_);
-
-    return 0;
-}
-
-int zmq::ws_decoder_t::mask_ready (unsigned char const *read_from_)
-{
-    memcpy (_mask, _tmpbuf, 4);
-
-    if (_opcode == ws_protocol_t::opcode_binary) {
-        if (_size == 0)
-            return -1;
-
-        next_step (_tmpbuf, 1, &ws_decoder_t::flags_ready);
-    } else
-        return size_ready (read_from_);
-
-    return 0;
-}
-
-int zmq::ws_decoder_t::flags_ready (unsigned char const *read_from_)
-{
-    unsigned char flags;
-
-    if (_must_mask)
-        flags = _tmpbuf[0] ^ _mask[0];
-    else
-        flags = _tmpbuf[0];
-
-    if (flags & ws_protocol_t::more_flag)
-        _msg_flags |= msg_t::more;
-    if (flags & ws_protocol_t::command_flag)
-        _msg_flags |= msg_t::command;
-
-    _size--;
-
-    return size_ready (read_from_);
-}
-
-
-int zmq::ws_decoder_t::size_ready (unsigned char const *read_pos_)
-{
-    //  Message size must not exceed the maximum allowed size.
-    if (_max_msg_size >= 0)
-        if (unlikely (_size > static_cast<uint64_t> (_max_msg_size))) {
-            errno = EMSGSIZE;
-            return -1;
-        }
-
-    //  Message size must fit into size_t data type.
-    if (unlikely (_size != static_cast<size_t> (_size))) {
-        errno = EMSGSIZE;
-        return -1;
-    }
-
-    int rc = _in_progress.close ();
-    assert (rc == 0);
-
-    // the current message can exceed the current buffer. We have to copy the buffer
-    // data into a new message and complete it in the next receive.
-
-    shared_message_memory_allocator &allocator = get_allocator ();
-    if (unlikely (!_zero_copy || allocator.data () > read_pos_
-                  || static_cast<size_t> (read_pos_ - allocator.data ())
-                       > allocator.size ()
-                  || _size > static_cast<size_t> (
-                       allocator.data () + allocator.size () - read_pos_))) {
-        // a new message has started, but the size would exceed the pre-allocated arena
-        // (or read_pos_ is in the initial handshake buffer)
-        // this happens every time when a message does not fit completely into the buffer
-        rc = _in_progress.init_size (static_cast<size_t> (_size));
-    } else {
-        // construct message using n bytes from the buffer as storage
-        // increase buffer ref count
-        // if the message will be a large message, pass a valid refcnt memory location as well
-        rc = _in_progress.init (
-          const_cast<unsigned char *> (read_pos_), static_cast<size_t> (_size),
-          shared_message_memory_allocator::call_dec_ref, allocator.buffer (),
-          allocator.provide_content ());
-
-        // For small messages, data has been copied and refcount does not have to be increased
-        if (_in_progress.is_zcmsg ()) {
-            allocator.advance_content ();
-            allocator.inc_ref ();
-        }
-    }
-
-    if (unlikely (rc)) {
-        errno_assert (errno == ENOMEM);
-        rc = _in_progress.init ();
-        errno_assert (rc == 0);
-        errno = ENOMEM;
-        return -1;
-    }
-
-    _in_progress.set_flags (_msg_flags);
-    // this sets read_pos to
-    // the message data address if the data needs to be copied
-    // for small message / messages exceeding the current buffer
-    // or
-    // to the current start address in the buffer because the message
-    // was constructed to use n bytes from the address passed as argument
-    next_step (_in_progress.data (), _in_progress.size (),
-               &ws_decoder_t::message_ready);
-
-    return 0;
-}
-
-int zmq::ws_decoder_t::message_ready (unsigned char const *)
-{
-    if (_must_mask) {
-        int mask_index = _opcode == ws_protocol_t::opcode_binary ? 1 : 0;
-
-        unsigned char *data =
-          static_cast<unsigned char *> (_in_progress.data ());
-        for (size_t i = 0; i < _size; ++i, mask_index++)
-            data[i] = data[i] ^ _mask[mask_index % 4];
-    }
-
-    //  Message is completely read. Signal this to the caller
-    //  and prepare to decode next message.
-    next_step (_tmpbuf, 1, &ws_decoder_t::opcode_ready);
-    return 1;
-}
diff --git a/libs/libzmq/src/ws_decoder.hpp b/libs/libzmq/src/ws_decoder.hpp
deleted file mode 100644
index a12f7d1..0000000
--- a/libs/libzmq/src/ws_decoder.hpp
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
-    Copyright (c) 2007-2019 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_WS_DECODER_HPP_INCLUDED__
-#define __ZMQ_WS_DECODER_HPP_INCLUDED__
-
-#include "decoder.hpp"
-#include "decoder_allocators.hpp"
-#include "ws_protocol.hpp"
-
-namespace zmq
-{
-//  Decoder for Web socket framing protocol. Converts data stream into messages.
-//  The class has to inherit from shared_message_memory_allocator because
-//  the base class calls allocate in its constructor.
-class ws_decoder_t ZMQ_FINAL
-    : public decoder_base_t<ws_decoder_t, shared_message_memory_allocator>
-{
-  public:
-    ws_decoder_t (size_t bufsize_,
-                  int64_t maxmsgsize_,
-                  bool zero_copy_,
-                  bool must_mask_);
-    ~ws_decoder_t ();
-
-    //  i_decoder interface.
-    msg_t *msg () { return &_in_progress; }
-
-  private:
-    int opcode_ready (unsigned char const *);
-    int size_first_byte_ready (unsigned char const *);
-    int short_size_ready (unsigned char const *);
-    int long_size_ready (unsigned char const *);
-    int mask_ready (unsigned char const *);
-    int flags_ready (unsigned char const *);
-    int message_ready (unsigned char const *);
-
-    int size_ready (unsigned char const *);
-
-    unsigned char _tmpbuf[8];
-    unsigned char _msg_flags;
-    msg_t _in_progress;
-
-    const bool _zero_copy;
-    const int64_t _max_msg_size;
-    const bool _must_mask;
-    uint64_t _size;
-    zmq::ws_protocol_t::opcode_t _opcode;
-    unsigned char _mask[4];
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (ws_decoder_t)
-};
-}
-
-#endif
diff --git a/libs/libzmq/src/ws_encoder.cpp b/libs/libzmq/src/ws_encoder.cpp
deleted file mode 100644
index 7d83361..0000000
--- a/libs/libzmq/src/ws_encoder.cpp
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
-    Copyright (c) 2007-2019 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "ws_protocol.hpp"
-#include "ws_encoder.hpp"
-#include "msg.hpp"
-#include "likely.hpp"
-#include "wire.hpp"
-#include "random.hpp"
-
-#include <limits.h>
-
-zmq::ws_encoder_t::ws_encoder_t (size_t bufsize_, bool must_mask_) :
-    encoder_base_t<ws_encoder_t> (bufsize_), _must_mask (must_mask_)
-{
-    //  Write 0 bytes to the batch and go to message_ready state.
-    next_step (NULL, 0, &ws_encoder_t::message_ready, true);
-    _masked_msg.init ();
-}
-
-zmq::ws_encoder_t::~ws_encoder_t ()
-{
-    _masked_msg.close ();
-}
-
-void zmq::ws_encoder_t::message_ready ()
-{
-    int offset = 0;
-
-    _is_binary = false;
-
-    if (in_progress ()->is_ping ())
-        _tmp_buf[offset++] = 0x80 | zmq::ws_protocol_t::opcode_ping;
-    else if (in_progress ()->is_pong ())
-        _tmp_buf[offset++] = 0x80 | zmq::ws_protocol_t::opcode_pong;
-    else if (in_progress ()->is_close_cmd ())
-        _tmp_buf[offset++] = 0x80 | zmq::ws_protocol_t::opcode_close;
-    else {
-        _tmp_buf[offset++] = 0x82; // Final | binary
-        _is_binary = true;
-    }
-
-    _tmp_buf[offset] = _must_mask ? 0x80 : 0x00;
-
-    size_t size = in_progress ()->size ();
-    if (_is_binary)
-        size++;
-    //  TODO: create an opcode for subscribe/cancel
-    if (in_progress ()->is_subscribe () || in_progress ()->is_cancel ())
-        size++;
-
-    if (size <= 125)
-        _tmp_buf[offset++] |= static_cast<unsigned char> (size & 127);
-    else if (size <= 0xFFFF) {
-        _tmp_buf[offset++] |= 126;
-        _tmp_buf[offset++] = static_cast<unsigned char> ((size >> 8) & 0xFF);
-        _tmp_buf[offset++] = static_cast<unsigned char> (size & 0xFF);
-    } else {
-        _tmp_buf[offset++] |= 127;
-        put_uint64 (_tmp_buf + offset, size);
-        offset += 8;
-    }
-
-    if (_must_mask) {
-        const uint32_t random = generate_random ();
-        put_uint32 (_tmp_buf + offset, random);
-        put_uint32 (_mask, random);
-        offset += 4;
-    }
-
-    int mask_index = 0;
-    if (_is_binary) {
-        //  Encode flags.
-        unsigned char protocol_flags = 0;
-        if (in_progress ()->flags () & msg_t::more)
-            protocol_flags |= ws_protocol_t::more_flag;
-        if (in_progress ()->flags () & msg_t::command)
-            protocol_flags |= ws_protocol_t::command_flag;
-
-        _tmp_buf[offset++] =
-          _must_mask ? protocol_flags ^ _mask[mask_index++] : protocol_flags;
-    }
-
-    //  Encode the subscribe/cancel byte.
-    //  TODO: remove once there is an opcode for subscribe/cancel
-    if (in_progress ()->is_subscribe ())
-        _tmp_buf[offset++] = _must_mask ? 1 ^ _mask[mask_index++] : 1;
-    else if (in_progress ()->is_cancel ())
-        _tmp_buf[offset++] = _must_mask ? 0 ^ _mask[mask_index++] : 0;
-
-    next_step (_tmp_buf, offset, &ws_encoder_t::size_ready, false);
-}
-
-void zmq::ws_encoder_t::size_ready ()
-{
-    if (_must_mask) {
-        assert (in_progress () != &_masked_msg);
-        const size_t size = in_progress ()->size ();
-
-        unsigned char *src =
-          static_cast<unsigned char *> (in_progress ()->data ());
-        unsigned char *dest = src;
-
-        //  If msg is shared or data is constant we cannot mask in-place, allocate a new msg for it
-        if (in_progress ()->flags () & msg_t::shared
-            || in_progress ()->is_cmsg ()) {
-            _masked_msg.close ();
-            _masked_msg.init_size (size);
-            dest = static_cast<unsigned char *> (_masked_msg.data ());
-        }
-
-        int mask_index = 0;
-        if (_is_binary)
-            ++mask_index;
-        //  TODO: remove once there is an opcode for subscribe/cancel
-        if (in_progress ()->is_subscribe () || in_progress ()->is_cancel ())
-            ++mask_index;
-        for (size_t i = 0; i < size; ++i, mask_index++)
-            dest[i] = src[i] ^ _mask[mask_index % 4];
-
-        next_step (dest, size, &ws_encoder_t::message_ready, true);
-    } else {
-        next_step (in_progress ()->data (), in_progress ()->size (),
-                   &ws_encoder_t::message_ready, true);
-    }
-}
diff --git a/libs/libzmq/src/ws_encoder.hpp b/libs/libzmq/src/ws_encoder.hpp
deleted file mode 100644
index 299259a..0000000
--- a/libs/libzmq/src/ws_encoder.hpp
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
-    Copyright (c) 2007-2019 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_WS_ENCODER_HPP_INCLUDED__
-#define __ZMQ_WS_ENCODER_HPP_INCLUDED__
-
-#include "encoder.hpp"
-
-namespace zmq
-{
-//  Encoder for web socket framing protocol. Converts messages into data stream.
-
-class ws_encoder_t ZMQ_FINAL : public encoder_base_t<ws_encoder_t>
-{
-  public:
-    ws_encoder_t (size_t bufsize_, bool must_mask_);
-    ~ws_encoder_t ();
-
-  private:
-    void size_ready ();
-    void message_ready ();
-
-    unsigned char _tmp_buf[16];
-    bool _must_mask;
-    unsigned char _mask[4];
-    msg_t _masked_msg;
-    bool _is_binary;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (ws_encoder_t)
-};
-}
-
-#endif
diff --git a/libs/libzmq/src/ws_engine.cpp b/libs/libzmq/src/ws_engine.cpp
deleted file mode 100644
index 615ffac..0000000
--- a/libs/libzmq/src/ws_engine.cpp
+++ /dev/null
@@ -1,1086 +0,0 @@
-/*
-Copyright (c) 2007-2019 Contributors as noted in the AUTHORS file
-
-This file is part of libzmq, the ZeroMQ core engine in C++.
-
-libzmq is free software; you can redistribute it and/or modify it under
-the terms of the GNU Lesser General Public License (LGPL) as published
-by the Free Software Foundation; either version 3 of the License, or
-(at your option) any later version.
-
-As a special exception, the Contributors give you permission to link
-this library with independent modules to produce an executable,
-regardless of the license terms of these independent modules, and to
-copy and distribute the resulting executable under terms of your choice,
-provided that you also meet, for each linked independent module, the
-terms and conditions of the license of that module. An independent
-module is a module which is not derived from or based on this library.
-If you modify this library, you must extend this exception to your
-version of the library.
-
-libzmq is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-License for more details.
-
-You should have received a copy of the GNU Lesser General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-
-#ifdef ZMQ_USE_NSS
-#include <secoid.h>
-#include <sechash.h>
-#define SHA_DIGEST_LENGTH 20
-#elif defined ZMQ_USE_BUILTIN_SHA1
-#include "../external/sha1/sha1.h"
-#elif defined ZMQ_USE_GNUTLS
-#define SHA_DIGEST_LENGTH 20
-#include <gnutls/gnutls.h>
-#include <gnutls/crypto.h>
-#endif
-
-#if !defined ZMQ_HAVE_WINDOWS
-#include <sys/types.h>
-#include <unistd.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#ifdef ZMQ_HAVE_VXWORKS
-#include <sockLib.h>
-#endif
-#endif
-
-#include <cstring>
-
-#include "compat.hpp"
-#include "tcp.hpp"
-#include "ws_engine.hpp"
-#include "session_base.hpp"
-#include "err.hpp"
-#include "ip.hpp"
-#include "random.hpp"
-#include "ws_decoder.hpp"
-#include "ws_encoder.hpp"
-#include "null_mechanism.hpp"
-#include "plain_server.hpp"
-#include "plain_client.hpp"
-
-#ifdef ZMQ_HAVE_CURVE
-#include "curve_client.hpp"
-#include "curve_server.hpp"
-#endif
-
-//  OSX uses a different name for this socket option
-#ifndef IPV6_ADD_MEMBERSHIP
-#define IPV6_ADD_MEMBERSHIP IPV6_JOIN_GROUP
-#endif
-
-#ifdef __APPLE__
-#include <TargetConditionals.h>
-#endif
-
-static int
-encode_base64 (const unsigned char *in_, int in_len_, char *out_, int out_len_);
-
-static void compute_accept_key (char *key_,
-                                unsigned char hash_[SHA_DIGEST_LENGTH]);
-
-zmq::ws_engine_t::ws_engine_t (fd_t fd_,
-                               const options_t &options_,
-                               const endpoint_uri_pair_t &endpoint_uri_pair_,
-                               const ws_address_t &address_,
-                               bool client_) :
-    stream_engine_base_t (fd_, options_, endpoint_uri_pair_, true),
-    _client (client_),
-    _address (address_),
-    _client_handshake_state (client_handshake_initial),
-    _server_handshake_state (handshake_initial),
-    _header_name_position (0),
-    _header_value_position (0),
-    _header_upgrade_websocket (false),
-    _header_connection_upgrade (false),
-    _heartbeat_timeout (0)
-{
-    memset (_websocket_key, 0, MAX_HEADER_VALUE_LENGTH + 1);
-    memset (_websocket_accept, 0, MAX_HEADER_VALUE_LENGTH + 1);
-    memset (_websocket_protocol, 0, 256);
-
-    _next_msg = &ws_engine_t::next_handshake_command;
-    _process_msg = &ws_engine_t::process_handshake_command;
-    _close_msg.init ();
-
-    if (_options.heartbeat_interval > 0) {
-        _heartbeat_timeout = _options.heartbeat_timeout;
-        if (_heartbeat_timeout == -1)
-            _heartbeat_timeout = _options.heartbeat_interval;
-    }
-}
-
-zmq::ws_engine_t::~ws_engine_t ()
-{
-    _close_msg.close ();
-}
-
-void zmq::ws_engine_t::start_ws_handshake ()
-{
-    if (_client) {
-        const char *protocol;
-        if (_options.mechanism == ZMQ_NULL)
-            protocol = "ZWS2.0/NULL,ZWS2.0";
-        else if (_options.mechanism == ZMQ_PLAIN)
-            protocol = "ZWS2.0/PLAIN";
-#ifdef ZMQ_HAVE_CURVE
-        else if (_options.mechanism == ZMQ_CURVE)
-            protocol = "ZWS2.0/CURVE";
-#endif
-        else {
-            // Avoid uninitialized variable error breaking UWP build
-            protocol = "";
-            assert (false);
-        }
-
-        unsigned char nonce[16];
-        int *p = reinterpret_cast<int *> (nonce);
-
-        // The nonce doesn't have to be secure one, it is just use to avoid proxy cache
-        *p = zmq::generate_random ();
-        *(p + 1) = zmq::generate_random ();
-        *(p + 2) = zmq::generate_random ();
-        *(p + 3) = zmq::generate_random ();
-
-        int size =
-          encode_base64 (nonce, 16, _websocket_key, MAX_HEADER_VALUE_LENGTH);
-        assert (size > 0);
-
-        size = snprintf (
-          reinterpret_cast<char *> (_write_buffer), WS_BUFFER_SIZE,
-          "GET %s HTTP/1.1\r\n"
-          "Host: %s\r\n"
-          "Upgrade: websocket\r\n"
-          "Connection: Upgrade\r\n"
-          "Sec-WebSocket-Key: %s\r\n"
-          "Sec-WebSocket-Protocol: %s\r\n"
-          "Sec-WebSocket-Version: 13\r\n\r\n",
-          _address.path (), _address.host (), _websocket_key, protocol);
-        assert (size > 0 && size < WS_BUFFER_SIZE);
-        _outpos = _write_buffer;
-        _outsize = size;
-        set_pollout ();
-    }
-}
-
-void zmq::ws_engine_t::plug_internal ()
-{
-    start_ws_handshake ();
-    set_pollin ();
-    in_event ();
-}
-
-int zmq::ws_engine_t::routing_id_msg (msg_t *msg_)
-{
-    const int rc = msg_->init_size (_options.routing_id_size);
-    errno_assert (rc == 0);
-    if (_options.routing_id_size > 0)
-        memcpy (msg_->data (), _options.routing_id, _options.routing_id_size);
-    _next_msg = &ws_engine_t::pull_msg_from_session;
-
-    return 0;
-}
-
-int zmq::ws_engine_t::process_routing_id_msg (msg_t *msg_)
-{
-    if (_options.recv_routing_id) {
-        msg_->set_flags (msg_t::routing_id);
-        const int rc = session ()->push_msg (msg_);
-        errno_assert (rc == 0);
-    } else {
-        int rc = msg_->close ();
-        errno_assert (rc == 0);
-        rc = msg_->init ();
-        errno_assert (rc == 0);
-    }
-
-    _process_msg = &ws_engine_t::push_msg_to_session;
-
-    return 0;
-}
-
-bool zmq::ws_engine_t::select_protocol (const char *protocol_)
-{
-    if (_options.mechanism == ZMQ_NULL && (strcmp ("ZWS2.0", protocol_) == 0)) {
-        _next_msg = static_cast<int (stream_engine_base_t::*) (msg_t *)> (
-          &ws_engine_t::routing_id_msg);
-        _process_msg = static_cast<int (stream_engine_base_t::*) (msg_t *)> (
-          &ws_engine_t::process_routing_id_msg);
-
-        // No mechanism in place, enabling heartbeat
-        if (_options.heartbeat_interval > 0 && !_has_heartbeat_timer) {
-            add_timer (_options.heartbeat_interval, heartbeat_ivl_timer_id);
-            _has_heartbeat_timer = true;
-        }
-
-        return true;
-    }
-    if (_options.mechanism == ZMQ_NULL
-        && strcmp ("ZWS2.0/NULL", protocol_) == 0) {
-        _mechanism = new (std::nothrow)
-          null_mechanism_t (session (), _peer_address, _options);
-        alloc_assert (_mechanism);
-        return true;
-    } else if (_options.mechanism == ZMQ_PLAIN
-               && strcmp ("ZWS2.0/PLAIN", protocol_) == 0) {
-        if (_options.as_server)
-            _mechanism = new (std::nothrow)
-              plain_server_t (session (), _peer_address, _options);
-        else
-            _mechanism =
-              new (std::nothrow) plain_client_t (session (), _options);
-        alloc_assert (_mechanism);
-        return true;
-    }
-#ifdef ZMQ_HAVE_CURVE
-    else if (_options.mechanism == ZMQ_CURVE
-             && strcmp ("ZWS2.0/CURVE", protocol_) == 0) {
-        if (_options.as_server)
-            _mechanism = new (std::nothrow)
-              curve_server_t (session (), _peer_address, _options, false);
-        else
-            _mechanism =
-              new (std::nothrow) curve_client_t (session (), _options, false);
-        alloc_assert (_mechanism);
-        return true;
-    }
-#endif
-
-    return false;
-}
-
-bool zmq::ws_engine_t::handshake ()
-{
-    bool complete;
-
-    if (_client)
-        complete = client_handshake ();
-    else
-        complete = server_handshake ();
-
-    if (complete) {
-        _encoder =
-          new (std::nothrow) ws_encoder_t (_options.out_batch_size, _client);
-        alloc_assert (_encoder);
-
-        _decoder = new (std::nothrow)
-          ws_decoder_t (_options.in_batch_size, _options.maxmsgsize,
-                        _options.zero_copy, !_client);
-        alloc_assert (_decoder);
-
-        socket ()->event_handshake_succeeded (_endpoint_uri_pair, 0);
-
-        set_pollout ();
-    }
-
-    return complete;
-}
-
-bool zmq::ws_engine_t::server_handshake ()
-{
-    const int nbytes = read (_read_buffer, WS_BUFFER_SIZE);
-    if (nbytes == -1) {
-        if (errno != EAGAIN)
-            error (zmq::i_engine::connection_error);
-        return false;
-    }
-
-    _inpos = _read_buffer;
-    _insize = nbytes;
-
-    while (_insize > 0) {
-        const char c = static_cast<char> (*_inpos);
-
-        switch (_server_handshake_state) {
-            case handshake_initial:
-                if (c == 'G')
-                    _server_handshake_state = request_line_G;
-                else
-                    _server_handshake_state = handshake_error;
-                break;
-            case request_line_G:
-                if (c == 'E')
-                    _server_handshake_state = request_line_GE;
-                else
-                    _server_handshake_state = handshake_error;
-                break;
-            case request_line_GE:
-                if (c == 'T')
-                    _server_handshake_state = request_line_GET;
-                else
-                    _server_handshake_state = handshake_error;
-                break;
-            case request_line_GET:
-                if (c == ' ')
-                    _server_handshake_state = request_line_GET_space;
-                else
-                    _server_handshake_state = handshake_error;
-                break;
-            case request_line_GET_space:
-                if (c == '\r' || c == '\n')
-                    _server_handshake_state = handshake_error;
-                // TODO: instead of check what is not allowed check what is allowed
-                if (c != ' ')
-                    _server_handshake_state = request_line_resource;
-                else
-                    _server_handshake_state = request_line_GET_space;
-                break;
-            case request_line_resource:
-                if (c == '\r' || c == '\n')
-                    _server_handshake_state = handshake_error;
-                else if (c == ' ')
-                    _server_handshake_state = request_line_resource_space;
-                else
-                    _server_handshake_state = request_line_resource;
-                break;
-            case request_line_resource_space:
-                if (c == 'H')
-                    _server_handshake_state = request_line_H;
-                else
-                    _server_handshake_state = handshake_error;
-                break;
-            case request_line_H:
-                if (c == 'T')
-                    _server_handshake_state = request_line_HT;
-                else
-                    _server_handshake_state = handshake_error;
-                break;
-            case request_line_HT:
-                if (c == 'T')
-                    _server_handshake_state = request_line_HTT;
-                else
-                    _server_handshake_state = handshake_error;
-                break;
-            case request_line_HTT:
-                if (c == 'P')
-                    _server_handshake_state = request_line_HTTP;
-                else
-                    _server_handshake_state = handshake_error;
-                break;
-            case request_line_HTTP:
-                if (c == '/')
-                    _server_handshake_state = request_line_HTTP_slash;
-                else
-                    _server_handshake_state = handshake_error;
-                break;
-            case request_line_HTTP_slash:
-                if (c == '1')
-                    _server_handshake_state = request_line_HTTP_slash_1;
-                else
-                    _server_handshake_state = handshake_error;
-                break;
-            case request_line_HTTP_slash_1:
-                if (c == '.')
-                    _server_handshake_state = request_line_HTTP_slash_1_dot;
-                else
-                    _server_handshake_state = handshake_error;
-                break;
-            case request_line_HTTP_slash_1_dot:
-                if (c == '1')
-                    _server_handshake_state = request_line_HTTP_slash_1_dot_1;
-                else
-                    _server_handshake_state = handshake_error;
-                break;
-            case request_line_HTTP_slash_1_dot_1:
-                if (c == '\r')
-                    _server_handshake_state = request_line_cr;
-                else
-                    _server_handshake_state = handshake_error;
-                break;
-            case request_line_cr:
-                if (c == '\n')
-                    _server_handshake_state = header_field_begin_name;
-                else
-                    _server_handshake_state = handshake_error;
-                break;
-            case header_field_begin_name:
-                switch (c) {
-                    case '\r':
-                        _server_handshake_state = handshake_end_line_cr;
-                        break;
-                    case '\n':
-                        _server_handshake_state = handshake_error;
-                        break;
-                    default:
-                        _header_name[0] = c;
-                        _header_name_position = 1;
-                        _server_handshake_state = header_field_name;
-                        break;
-                }
-                break;
-            case header_field_name:
-                if (c == '\r' || c == '\n')
-                    _server_handshake_state = handshake_error;
-                else if (c == ':') {
-                    _header_name[_header_name_position] = '\0';
-                    _server_handshake_state = header_field_colon;
-                } else if (_header_name_position + 1 > MAX_HEADER_NAME_LENGTH)
-                    _server_handshake_state = handshake_error;
-                else {
-                    _header_name[_header_name_position] = c;
-                    _header_name_position++;
-                    _server_handshake_state = header_field_name;
-                }
-                break;
-            case header_field_colon:
-            case header_field_value_trailing_space:
-                if (c == '\n')
-                    _server_handshake_state = handshake_error;
-                else if (c == '\r')
-                    _server_handshake_state = header_field_cr;
-                else if (c == ' ')
-                    _server_handshake_state = header_field_value_trailing_space;
-                else {
-                    _header_value[0] = c;
-                    _header_value_position = 1;
-                    _server_handshake_state = header_field_value;
-                }
-                break;
-            case header_field_value:
-                if (c == '\n')
-                    _server_handshake_state = handshake_error;
-                else if (c == '\r') {
-                    _header_value[_header_value_position] = '\0';
-
-                    if (strcasecmp ("upgrade", _header_name) == 0)
-                        _header_upgrade_websocket =
-                          strcasecmp ("websocket", _header_value) == 0;
-                    else if (strcasecmp ("connection", _header_name) == 0) {
-                        char *rest = NULL;
-                        char *element = strtok_r (_header_value, ",", &rest);
-                        while (element != NULL) {
-                            while (*element == ' ')
-                                element++;
-                            if (strcasecmp ("upgrade", element) == 0) {
-                                _header_connection_upgrade = true;
-                                break;
-                            }
-                            element = strtok_r (NULL, ",", &rest);
-                        }
-                    } else if (strcasecmp ("Sec-WebSocket-Key", _header_name)
-                               == 0)
-                        strcpy_s (_websocket_key, _header_value);
-                    else if (strcasecmp ("Sec-WebSocket-Protocol", _header_name)
-                             == 0) {
-                        // Currently only the ZWS2.0 is supported
-                        // Sec-WebSocket-Protocol can appear multiple times or be a comma separated list
-                        // if _websocket_protocol is already set we skip the check
-                        if (_websocket_protocol[0] == '\0') {
-                            char *rest = NULL;
-                            char *p = strtok_r (_header_value, ",", &rest);
-                            while (p != NULL) {
-                                if (*p == ' ')
-                                    p++;
-
-                                if (select_protocol (p)) {
-                                    strcpy_s (_websocket_protocol, p);
-                                    break;
-                                }
-
-                                p = strtok_r (NULL, ",", &rest);
-                            }
-                        }
-                    }
-
-                    _server_handshake_state = header_field_cr;
-                } else if (_header_value_position + 1 > MAX_HEADER_VALUE_LENGTH)
-                    _server_handshake_state = handshake_error;
-                else {
-                    _header_value[_header_value_position] = c;
-                    _header_value_position++;
-                    _server_handshake_state = header_field_value;
-                }
-                break;
-            case header_field_cr:
-                if (c == '\n')
-                    _server_handshake_state = header_field_begin_name;
-                else
-                    _server_handshake_state = handshake_error;
-                break;
-            case handshake_end_line_cr:
-                if (c == '\n') {
-                    if (_header_connection_upgrade && _header_upgrade_websocket
-                        && _websocket_protocol[0] != '\0'
-                        && _websocket_key[0] != '\0') {
-                        _server_handshake_state = handshake_complete;
-
-                        unsigned char hash[SHA_DIGEST_LENGTH];
-                        compute_accept_key (_websocket_key, hash);
-
-                        const int accept_key_len = encode_base64 (
-                          hash, SHA_DIGEST_LENGTH, _websocket_accept,
-                          MAX_HEADER_VALUE_LENGTH);
-                        assert (accept_key_len > 0);
-                        _websocket_accept[accept_key_len] = '\0';
-
-                        const int written =
-                          snprintf (reinterpret_cast<char *> (_write_buffer),
-                                    WS_BUFFER_SIZE,
-                                    "HTTP/1.1 101 Switching Protocols\r\n"
-                                    "Upgrade: websocket\r\n"
-                                    "Connection: Upgrade\r\n"
-                                    "Sec-WebSocket-Accept: %s\r\n"
-                                    "Sec-WebSocket-Protocol: %s\r\n"
-                                    "\r\n",
-                                    _websocket_accept, _websocket_protocol);
-                        assert (written >= 0 && written < WS_BUFFER_SIZE);
-                        _outpos = _write_buffer;
-                        _outsize = written;
-
-                        _inpos++;
-                        _insize--;
-
-                        return true;
-                    }
-                    _server_handshake_state = handshake_error;
-                } else
-                    _server_handshake_state = handshake_error;
-                break;
-            default:
-                assert (false);
-        }
-
-        _inpos++;
-        _insize--;
-
-        if (_server_handshake_state == handshake_error) {
-            // TODO: send bad request
-
-            socket ()->event_handshake_failed_protocol (
-              _endpoint_uri_pair, ZMQ_PROTOCOL_ERROR_WS_UNSPECIFIED);
-
-            error (zmq::i_engine::protocol_error);
-            return false;
-        }
-    }
-    return false;
-}
-
-bool zmq::ws_engine_t::client_handshake ()
-{
-    const int nbytes = read (_read_buffer, WS_BUFFER_SIZE);
-    if (nbytes == -1) {
-        if (errno != EAGAIN)
-            error (zmq::i_engine::connection_error);
-        return false;
-    }
-
-    _inpos = _read_buffer;
-    _insize = nbytes;
-
-    while (_insize > 0) {
-        const char c = static_cast<char> (*_inpos);
-
-        switch (_client_handshake_state) {
-            case client_handshake_initial:
-                if (c == 'H')
-                    _client_handshake_state = response_line_H;
-                else
-                    _client_handshake_state = client_handshake_error;
-                break;
-            case response_line_H:
-                if (c == 'T')
-                    _client_handshake_state = response_line_HT;
-                else
-                    _client_handshake_state = client_handshake_error;
-                break;
-            case response_line_HT:
-                if (c == 'T')
-                    _client_handshake_state = response_line_HTT;
-                else
-                    _client_handshake_state = client_handshake_error;
-                break;
-            case response_line_HTT:
-                if (c == 'P')
-                    _client_handshake_state = response_line_HTTP;
-                else
-                    _client_handshake_state = client_handshake_error;
-                break;
-            case response_line_HTTP:
-                if (c == '/')
-                    _client_handshake_state = response_line_HTTP_slash;
-                else
-                    _client_handshake_state = client_handshake_error;
-                break;
-            case response_line_HTTP_slash:
-                if (c == '1')
-                    _client_handshake_state = response_line_HTTP_slash_1;
-                else
-                    _client_handshake_state = client_handshake_error;
-                break;
-            case response_line_HTTP_slash_1:
-                if (c == '.')
-                    _client_handshake_state = response_line_HTTP_slash_1_dot;
-                else
-                    _client_handshake_state = client_handshake_error;
-                break;
-            case response_line_HTTP_slash_1_dot:
-                if (c == '1')
-                    _client_handshake_state = response_line_HTTP_slash_1_dot_1;
-                else
-                    _client_handshake_state = client_handshake_error;
-                break;
-            case response_line_HTTP_slash_1_dot_1:
-                if (c == ' ')
-                    _client_handshake_state =
-                      response_line_HTTP_slash_1_dot_1_space;
-                else
-                    _client_handshake_state = client_handshake_error;
-                break;
-            case response_line_HTTP_slash_1_dot_1_space:
-                if (c == ' ')
-                    _client_handshake_state =
-                      response_line_HTTP_slash_1_dot_1_space;
-                else if (c == '1')
-                    _client_handshake_state = response_line_status_1;
-                else
-                    _client_handshake_state = client_handshake_error;
-                break;
-            case response_line_status_1:
-                if (c == '0')
-                    _client_handshake_state = response_line_status_10;
-                else
-                    _client_handshake_state = client_handshake_error;
-                break;
-            case response_line_status_10:
-                if (c == '1')
-                    _client_handshake_state = response_line_status_101;
-                else
-                    _client_handshake_state = client_handshake_error;
-                break;
-            case response_line_status_101:
-                if (c == ' ')
-                    _client_handshake_state = response_line_status_101_space;
-                else
-                    _client_handshake_state = client_handshake_error;
-                break;
-            case response_line_status_101_space:
-                if (c == ' ')
-                    _client_handshake_state = response_line_status_101_space;
-                else if (c == 'S')
-                    _client_handshake_state = response_line_s;
-                else
-                    _client_handshake_state = client_handshake_error;
-                break;
-            case response_line_s:
-                if (c == 'w')
-                    _client_handshake_state = response_line_sw;
-                else
-                    _client_handshake_state = client_handshake_error;
-                break;
-            case response_line_sw:
-                if (c == 'i')
-                    _client_handshake_state = response_line_swi;
-                else
-                    _client_handshake_state = client_handshake_error;
-                break;
-            case response_line_swi:
-                if (c == 't')
-                    _client_handshake_state = response_line_swit;
-                else
-                    _client_handshake_state = client_handshake_error;
-                break;
-            case response_line_swit:
-                if (c == 'c')
-                    _client_handshake_state = response_line_switc;
-                else
-                    _client_handshake_state = client_handshake_error;
-                break;
-            case response_line_switc:
-                if (c == 'h')
-                    _client_handshake_state = response_line_switch;
-                else
-                    _client_handshake_state = client_handshake_error;
-                break;
-            case response_line_switch:
-                if (c == 'i')
-                    _client_handshake_state = response_line_switchi;
-                else
-                    _client_handshake_state = client_handshake_error;
-                break;
-            case response_line_switchi:
-                if (c == 'n')
-                    _client_handshake_state = response_line_switchin;
-                else
-                    _client_handshake_state = client_handshake_error;
-                break;
-            case response_line_switchin:
-                if (c == 'g')
-                    _client_handshake_state = response_line_switching;
-                else
-                    _client_handshake_state = client_handshake_error;
-                break;
-            case response_line_switching:
-                if (c == ' ')
-                    _client_handshake_state = response_line_switching_space;
-                else
-                    _client_handshake_state = client_handshake_error;
-                break;
-            case response_line_switching_space:
-                if (c == 'P')
-                    _client_handshake_state = response_line_p;
-                else
-                    _client_handshake_state = client_handshake_error;
-                break;
-            case response_line_p:
-                if (c == 'r')
-                    _client_handshake_state = response_line_pr;
-                else
-                    _client_handshake_state = client_handshake_error;
-                break;
-            case response_line_pr:
-                if (c == 'o')
-                    _client_handshake_state = response_line_pro;
-                else
-                    _client_handshake_state = client_handshake_error;
-                break;
-            case response_line_pro:
-                if (c == 't')
-                    _client_handshake_state = response_line_prot;
-                else
-                    _client_handshake_state = client_handshake_error;
-                break;
-            case response_line_prot:
-                if (c == 'o')
-                    _client_handshake_state = response_line_proto;
-                else
-                    _client_handshake_state = client_handshake_error;
-                break;
-            case response_line_proto:
-                if (c == 'c')
-                    _client_handshake_state = response_line_protoc;
-                else
-                    _client_handshake_state = client_handshake_error;
-                break;
-            case response_line_protoc:
-                if (c == 'o')
-                    _client_handshake_state = response_line_protoco;
-                else
-                    _client_handshake_state = client_handshake_error;
-                break;
-            case response_line_protoco:
-                if (c == 'l')
-                    _client_handshake_state = response_line_protocol;
-                else
-                    _client_handshake_state = client_handshake_error;
-                break;
-            case response_line_protocol:
-                if (c == 's')
-                    _client_handshake_state = response_line_protocols;
-                else
-                    _client_handshake_state = client_handshake_error;
-                break;
-            case response_line_protocols:
-                if (c == '\r')
-                    _client_handshake_state = response_line_cr;
-                else
-                    _client_handshake_state = client_handshake_error;
-                break;
-            case response_line_cr:
-                if (c == '\n')
-                    _client_handshake_state = client_header_field_begin_name;
-                else
-                    _client_handshake_state = client_handshake_error;
-                break;
-            case client_header_field_begin_name:
-                switch (c) {
-                    case '\r':
-                        _client_handshake_state = client_handshake_end_line_cr;
-                        break;
-                    case '\n':
-                        _client_handshake_state = client_handshake_error;
-                        break;
-                    default:
-                        _header_name[0] = c;
-                        _header_name_position = 1;
-                        _client_handshake_state = client_header_field_name;
-                        break;
-                }
-                break;
-            case client_header_field_name:
-                if (c == '\r' || c == '\n')
-                    _client_handshake_state = client_handshake_error;
-                else if (c == ':') {
-                    _header_name[_header_name_position] = '\0';
-                    _client_handshake_state = client_header_field_colon;
-                } else if (_header_name_position + 1 > MAX_HEADER_NAME_LENGTH)
-                    _client_handshake_state = client_handshake_error;
-                else {
-                    _header_name[_header_name_position] = c;
-                    _header_name_position++;
-                    _client_handshake_state = client_header_field_name;
-                }
-                break;
-            case client_header_field_colon:
-            case client_header_field_value_trailing_space:
-                if (c == '\n')
-                    _client_handshake_state = client_handshake_error;
-                else if (c == '\r')
-                    _client_handshake_state = client_header_field_cr;
-                else if (c == ' ')
-                    _client_handshake_state =
-                      client_header_field_value_trailing_space;
-                else {
-                    _header_value[0] = c;
-                    _header_value_position = 1;
-                    _client_handshake_state = client_header_field_value;
-                }
-                break;
-            case client_header_field_value:
-                if (c == '\n')
-                    _client_handshake_state = client_handshake_error;
-                else if (c == '\r') {
-                    _header_value[_header_value_position] = '\0';
-
-                    if (strcasecmp ("upgrade", _header_name) == 0)
-                        _header_upgrade_websocket =
-                          strcasecmp ("websocket", _header_value) == 0;
-                    else if (strcasecmp ("connection", _header_name) == 0)
-                        _header_connection_upgrade =
-                          strcasecmp ("upgrade", _header_value) == 0;
-                    else if (strcasecmp ("Sec-WebSocket-Accept", _header_name)
-                             == 0)
-                        strcpy_s (_websocket_accept, _header_value);
-                    else if (strcasecmp ("Sec-WebSocket-Protocol", _header_name)
-                             == 0) {
-                        if (_mechanism) {
-                            _client_handshake_state = client_handshake_error;
-                            break;
-                        }
-                        if (select_protocol (_header_value))
-                            strcpy_s (_websocket_protocol, _header_value);
-                    }
-                    _client_handshake_state = client_header_field_cr;
-                } else if (_header_value_position + 1 > MAX_HEADER_VALUE_LENGTH)
-                    _client_handshake_state = client_handshake_error;
-                else {
-                    _header_value[_header_value_position] = c;
-                    _header_value_position++;
-                    _client_handshake_state = client_header_field_value;
-                }
-                break;
-            case client_header_field_cr:
-                if (c == '\n')
-                    _client_handshake_state = client_header_field_begin_name;
-                else
-                    _client_handshake_state = client_handshake_error;
-                break;
-            case client_handshake_end_line_cr:
-                if (c == '\n') {
-                    if (_header_connection_upgrade && _header_upgrade_websocket
-                        && _websocket_protocol[0] != '\0'
-                        && _websocket_accept[0] != '\0') {
-                        _client_handshake_state = client_handshake_complete;
-
-                        // TODO: validate accept key
-
-                        _inpos++;
-                        _insize--;
-
-                        return true;
-                    }
-                    _client_handshake_state = client_handshake_error;
-                } else
-                    _client_handshake_state = client_handshake_error;
-                break;
-            default:
-                assert (false);
-        }
-
-        _inpos++;
-        _insize--;
-
-        if (_client_handshake_state == client_handshake_error) {
-            socket ()->event_handshake_failed_protocol (
-              _endpoint_uri_pair, ZMQ_PROTOCOL_ERROR_WS_UNSPECIFIED);
-
-            error (zmq::i_engine::protocol_error);
-            return false;
-        }
-    }
-
-    return false;
-}
-
-int zmq::ws_engine_t::decode_and_push (msg_t *msg_)
-{
-    zmq_assert (_mechanism != NULL);
-
-    //  with WS engine, ping and pong commands are control messages and should not go through any mechanism
-    if (msg_->is_ping () || msg_->is_pong () || msg_->is_close_cmd ()) {
-        if (process_command_message (msg_) == -1)
-            return -1;
-    } else if (_mechanism->decode (msg_) == -1)
-        return -1;
-
-    if (_has_timeout_timer) {
-        _has_timeout_timer = false;
-        cancel_timer (heartbeat_timeout_timer_id);
-    }
-
-    if (msg_->flags () & msg_t::command && !msg_->is_ping ()
-        && !msg_->is_pong () && !msg_->is_close_cmd ())
-        process_command_message (msg_);
-
-    if (_metadata)
-        msg_->set_metadata (_metadata);
-    if (session ()->push_msg (msg_) == -1) {
-        if (errno == EAGAIN)
-            _process_msg = &ws_engine_t::push_one_then_decode_and_push;
-        return -1;
-    }
-    return 0;
-}
-
-int zmq::ws_engine_t::produce_close_message (msg_t *msg_)
-{
-    int rc = msg_->move (_close_msg);
-    errno_assert (rc == 0);
-
-    _next_msg = static_cast<int (stream_engine_base_t::*) (msg_t *)> (
-      &ws_engine_t::produce_no_msg_after_close);
-
-    return rc;
-}
-
-int zmq::ws_engine_t::produce_no_msg_after_close (msg_t *msg_)
-{
-    LIBZMQ_UNUSED (msg_);
-    _next_msg = static_cast<int (stream_engine_base_t::*) (msg_t *)> (
-      &ws_engine_t::close_connection_after_close);
-
-    errno = EAGAIN;
-    return -1;
-}
-
-int zmq::ws_engine_t::close_connection_after_close (msg_t *msg_)
-{
-    LIBZMQ_UNUSED (msg_);
-    error (connection_error);
-    errno = ECONNRESET;
-    return -1;
-}
-
-int zmq::ws_engine_t::produce_ping_message (msg_t *msg_)
-{
-    int rc = msg_->init ();
-    errno_assert (rc == 0);
-    msg_->set_flags (msg_t::command | msg_t::ping);
-
-    _next_msg = &ws_engine_t::pull_and_encode;
-    if (!_has_timeout_timer && _heartbeat_timeout > 0) {
-        add_timer (_heartbeat_timeout, heartbeat_timeout_timer_id);
-        _has_timeout_timer = true;
-    }
-
-    return rc;
-}
-
-
-int zmq::ws_engine_t::produce_pong_message (msg_t *msg_)
-{
-    int rc = msg_->init ();
-    errno_assert (rc == 0);
-    msg_->set_flags (msg_t::command | msg_t::pong);
-
-    _next_msg = &ws_engine_t::pull_and_encode;
-    return rc;
-}
-
-
-int zmq::ws_engine_t::process_command_message (msg_t *msg_)
-{
-    if (msg_->is_ping ()) {
-        _next_msg = static_cast<int (stream_engine_base_t::*) (msg_t *)> (
-          &ws_engine_t::produce_pong_message);
-        out_event ();
-    } else if (msg_->is_close_cmd ()) {
-        int rc = _close_msg.copy (*msg_);
-        errno_assert (rc == 0);
-        _next_msg = static_cast<int (stream_engine_base_t::*) (msg_t *)> (
-          &ws_engine_t::produce_close_message);
-        out_event ();
-    }
-
-    return 0;
-}
-
-static int
-encode_base64 (const unsigned char *in_, int in_len_, char *out_, int out_len_)
-{
-    static const unsigned char base64enc_tab[65] =
-      "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-
-    int io = 0;
-    uint32_t v = 0;
-    int rem = 0;
-
-    for (int ii = 0; ii < in_len_; ii++) {
-        unsigned char ch;
-        ch = in_[ii];
-        v = (v << 8) | ch;
-        rem += 8;
-        while (rem >= 6) {
-            rem -= 6;
-            if (io >= out_len_)
-                return -1; /* truncation is failure */
-            out_[io++] = base64enc_tab[(v >> rem) & 63];
-        }
-    }
-    if (rem) {
-        v <<= (6 - rem);
-        if (io >= out_len_)
-            return -1; /* truncation is failure */
-        out_[io++] = base64enc_tab[v & 63];
-    }
-    while (io & 3) {
-        if (io >= out_len_)
-            return -1; /* truncation is failure */
-        out_[io++] = '=';
-    }
-    if (io >= out_len_)
-        return -1; /* no room for null terminator */
-    out_[io] = 0;
-    return io;
-}
-
-static void compute_accept_key (char *key_, unsigned char *hash_)
-{
-    const char *magic_string = "258EAFA5-E914-47DA-95CA-C5AB0DC85B11";
-#ifdef ZMQ_USE_NSS
-    unsigned int len;
-    HASH_HashType type = HASH_GetHashTypeByOidTag (SEC_OID_SHA1);
-    HASHContext *ctx = HASH_Create (type);
-    assert (ctx);
-
-    HASH_Begin (ctx);
-    HASH_Update (ctx, (unsigned char *) key_, (unsigned int) strlen (key_));
-    HASH_Update (ctx, (unsigned char *) magic_string,
-                 (unsigned int) strlen (magic_string));
-    HASH_End (ctx, hash_, &len, SHA_DIGEST_LENGTH);
-    HASH_Destroy (ctx);
-#elif defined ZMQ_USE_BUILTIN_SHA1
-    sha1_ctxt ctx;
-    SHA1_Init (&ctx);
-    SHA1_Update (&ctx, (unsigned char *) key_, strlen (key_));
-    SHA1_Update (&ctx, (unsigned char *) magic_string, strlen (magic_string));
-
-    SHA1_Final (hash_, &ctx);
-#elif defined ZMQ_USE_GNUTLS
-    gnutls_hash_hd_t hd;
-    gnutls_hash_init (&hd, GNUTLS_DIG_SHA1);
-    gnutls_hash (hd, key_, strlen (key_));
-    gnutls_hash (hd, magic_string, strlen (magic_string));
-    gnutls_hash_deinit (hd, hash_);
-#else
-#error "No sha1 implementation set"
-#endif
-}
diff --git a/libs/libzmq/src/ws_engine.hpp b/libs/libzmq/src/ws_engine.hpp
deleted file mode 100644
index bdf145b..0000000
--- a/libs/libzmq/src/ws_engine.hpp
+++ /dev/null
@@ -1,182 +0,0 @@
-/*
-    Copyright (c) 2007-2019 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_WS_ENGINE_HPP_INCLUDED__
-#define __ZMQ_WS_ENGINE_HPP_INCLUDED__
-
-#include "io_object.hpp"
-#include "address.hpp"
-#include "msg.hpp"
-#include "stream_engine_base.hpp"
-#include "ws_address.hpp"
-
-#define WS_BUFFER_SIZE 8192
-#define MAX_HEADER_NAME_LENGTH 1024
-#define MAX_HEADER_VALUE_LENGTH 2048
-
-namespace zmq
-{
-class io_thread_t;
-class session_base_t;
-
-typedef enum
-{
-    handshake_initial = 0,
-    request_line_G,
-    request_line_GE,
-    request_line_GET,
-    request_line_GET_space,
-    request_line_resource,
-    request_line_resource_space,
-    request_line_H,
-    request_line_HT,
-    request_line_HTT,
-    request_line_HTTP,
-    request_line_HTTP_slash,
-    request_line_HTTP_slash_1,
-    request_line_HTTP_slash_1_dot,
-    request_line_HTTP_slash_1_dot_1,
-    request_line_cr,
-    header_field_begin_name,
-    header_field_name,
-    header_field_colon,
-    header_field_value_trailing_space,
-    header_field_value,
-    header_field_cr,
-    handshake_end_line_cr,
-    handshake_complete,
-
-    handshake_error = -1
-} ws_server_handshake_state_t;
-
-
-typedef enum
-{
-    client_handshake_initial = 0,
-    response_line_H,
-    response_line_HT,
-    response_line_HTT,
-    response_line_HTTP,
-    response_line_HTTP_slash,
-    response_line_HTTP_slash_1,
-    response_line_HTTP_slash_1_dot,
-    response_line_HTTP_slash_1_dot_1,
-    response_line_HTTP_slash_1_dot_1_space,
-    response_line_status_1,
-    response_line_status_10,
-    response_line_status_101,
-    response_line_status_101_space,
-    response_line_s,
-    response_line_sw,
-    response_line_swi,
-    response_line_swit,
-    response_line_switc,
-    response_line_switch,
-    response_line_switchi,
-    response_line_switchin,
-    response_line_switching,
-    response_line_switching_space,
-    response_line_p,
-    response_line_pr,
-    response_line_pro,
-    response_line_prot,
-    response_line_proto,
-    response_line_protoc,
-    response_line_protoco,
-    response_line_protocol,
-    response_line_protocols,
-    response_line_cr,
-    client_header_field_begin_name,
-    client_header_field_name,
-    client_header_field_colon,
-    client_header_field_value_trailing_space,
-    client_header_field_value,
-    client_header_field_cr,
-    client_handshake_end_line_cr,
-    client_handshake_complete,
-
-    client_handshake_error = -1
-} ws_client_handshake_state_t;
-
-class ws_engine_t : public stream_engine_base_t
-{
-  public:
-    ws_engine_t (fd_t fd_,
-                 const options_t &options_,
-                 const endpoint_uri_pair_t &endpoint_uri_pair_,
-                 const ws_address_t &address_,
-                 bool client_);
-    ~ws_engine_t ();
-
-  protected:
-    int decode_and_push (msg_t *msg_);
-    int process_command_message (msg_t *msg_);
-    int produce_pong_message (msg_t *msg_);
-    int produce_ping_message (msg_t *msg_);
-    bool handshake ();
-    void plug_internal ();
-    void start_ws_handshake ();
-
-  private:
-    int routing_id_msg (msg_t *msg_);
-    int process_routing_id_msg (msg_t *msg_);
-    int produce_close_message (msg_t *msg_);
-    int produce_no_msg_after_close (msg_t *msg_);
-    int close_connection_after_close (msg_t *msg_);
-
-    bool select_protocol (const char *protocol);
-
-    bool client_handshake ();
-    bool server_handshake ();
-
-    bool _client;
-    ws_address_t _address;
-
-    ws_client_handshake_state_t _client_handshake_state;
-    ws_server_handshake_state_t _server_handshake_state;
-
-    unsigned char _read_buffer[WS_BUFFER_SIZE];
-    unsigned char _write_buffer[WS_BUFFER_SIZE];
-    char _header_name[MAX_HEADER_NAME_LENGTH + 1];
-    int _header_name_position;
-    char _header_value[MAX_HEADER_VALUE_LENGTH + 1];
-    int _header_value_position;
-
-    bool _header_upgrade_websocket;
-    bool _header_connection_upgrade;
-    char _websocket_protocol[256];
-    char _websocket_key[MAX_HEADER_VALUE_LENGTH + 1];
-    char _websocket_accept[MAX_HEADER_VALUE_LENGTH + 1];
-
-    int _heartbeat_timeout;
-    msg_t _close_msg;
-};
-}
-
-#endif
diff --git a/libs/libzmq/src/ws_listener.cpp b/libs/libzmq/src/ws_listener.cpp
deleted file mode 100644
index 43ca198..0000000
--- a/libs/libzmq/src/ws_listener.cpp
+++ /dev/null
@@ -1,338 +0,0 @@
-/*
-    Copyright (c) 2007-2019 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include <new>
-
-#include <string>
-#include <stdio.h>
-
-#include "ws_listener.hpp"
-#include "io_thread.hpp"
-#include "config.hpp"
-#include "err.hpp"
-#include "ip.hpp"
-#include "tcp.hpp"
-#include "socket_base.hpp"
-#include "address.hpp"
-#include "ws_engine.hpp"
-#include "session_base.hpp"
-
-#ifdef ZMQ_HAVE_WSS
-#include "wss_engine.hpp"
-#include "wss_address.hpp"
-#endif
-
-#ifndef ZMQ_HAVE_WINDOWS
-#include <unistd.h>
-#include <sys/socket.h>
-#include <arpa/inet.h>
-#include <netinet/tcp.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <fcntl.h>
-#ifdef ZMQ_HAVE_VXWORKS
-#include <sockLib.h>
-#endif
-#endif
-
-#ifdef ZMQ_HAVE_OPENVMS
-#include <ioctl.h>
-#endif
-
-zmq::ws_listener_t::ws_listener_t (io_thread_t *io_thread_,
-                                   socket_base_t *socket_,
-                                   const options_t &options_,
-                                   bool wss_) :
-    stream_listener_base_t (io_thread_, socket_, options_), _wss (wss_)
-{
-#ifdef ZMQ_HAVE_WSS
-    if (_wss) {
-        int rc = gnutls_certificate_allocate_credentials (&_tls_cred);
-        zmq_assert (rc == GNUTLS_E_SUCCESS);
-
-        gnutls_datum_t cert = {(unsigned char *) options_.wss_cert_pem.c_str (),
-                               (unsigned int) options_.wss_cert_pem.length ()};
-        gnutls_datum_t key = {(unsigned char *) options_.wss_key_pem.c_str (),
-                              (unsigned int) options_.wss_key_pem.length ()};
-        rc = gnutls_certificate_set_x509_key_mem (_tls_cred, &cert, &key,
-                                                  GNUTLS_X509_FMT_PEM);
-        zmq_assert (rc == GNUTLS_E_SUCCESS);
-    }
-#endif
-}
-
-zmq::ws_listener_t::~ws_listener_t ()
-{
-#ifdef ZMQ_HAVE_WSS
-    if (_wss)
-        gnutls_certificate_free_credentials (_tls_cred);
-#endif
-}
-
-void zmq::ws_listener_t::in_event ()
-{
-    const fd_t fd = accept ();
-
-    //  If connection was reset by the peer in the meantime, just ignore it.
-    //  TODO: Handle specific errors like ENFILE/EMFILE etc.
-    if (fd == retired_fd) {
-        _socket->event_accept_failed (
-          make_unconnected_bind_endpoint_pair (_endpoint), zmq_errno ());
-        return;
-    }
-
-    int rc = tune_tcp_socket (fd);
-    rc = rc | tune_tcp_maxrt (fd, options.tcp_maxrt);
-    if (rc != 0) {
-        _socket->event_accept_failed (
-          make_unconnected_bind_endpoint_pair (_endpoint), zmq_errno ());
-        return;
-    }
-
-    //  Create the engine object for this connection.
-    create_engine (fd);
-}
-
-std::string zmq::ws_listener_t::get_socket_name (zmq::fd_t fd_,
-                                                 socket_end_t socket_end_) const
-{
-    std::string socket_name;
-
-#ifdef ZMQ_HAVE_WSS
-    if (_wss)
-        socket_name = zmq::get_socket_name<wss_address_t> (fd_, socket_end_);
-    else
-#endif
-        socket_name = zmq::get_socket_name<ws_address_t> (fd_, socket_end_);
-
-    return socket_name + _address.path ();
-}
-
-int zmq::ws_listener_t::create_socket (const char *addr_)
-{
-    tcp_address_t address;
-    _s = tcp_open_socket (addr_, options, true, true, &address);
-    if (_s == retired_fd) {
-        return -1;
-    }
-
-    //  TODO why is this only done for the listener?
-    make_socket_noninheritable (_s);
-
-    //  Allow reusing of the address.
-    int flag = 1;
-    int rc;
-#ifdef ZMQ_HAVE_WINDOWS
-    //  TODO this was changed for Windows from SO_REUSEADDRE to
-    //  SE_EXCLUSIVEADDRUSE by 0ab65324195ad70205514d465b03d851a6de051c,
-    //  so the comment above is no longer correct; also, now the settings are
-    //  different between listener and connecter with a src address.
-    //  is this intentional?
-    rc = setsockopt (_s, SOL_SOCKET, SO_EXCLUSIVEADDRUSE,
-                     reinterpret_cast<const char *> (&flag), sizeof (int));
-    wsa_assert (rc != SOCKET_ERROR);
-#elif defined ZMQ_HAVE_VXWORKS
-    rc =
-      setsockopt (_s, SOL_SOCKET, SO_REUSEADDR, (char *) &flag, sizeof (int));
-    errno_assert (rc == 0);
-#else
-    rc = setsockopt (_s, SOL_SOCKET, SO_REUSEADDR, &flag, sizeof (int));
-    errno_assert (rc == 0);
-#endif
-
-    //  Bind the socket to the network interface and port.
-#if defined ZMQ_HAVE_VXWORKS
-    rc = bind (_s, (sockaddr *) _address.addr (), _address.addrlen ());
-#else
-    rc = bind (_s, address.addr (), address.addrlen ());
-#endif
-#ifdef ZMQ_HAVE_WINDOWS
-    if (rc == SOCKET_ERROR) {
-        errno = wsa_error_to_errno (WSAGetLastError ());
-        goto error;
-    }
-#else
-    if (rc != 0)
-        goto error;
-#endif
-
-    //  Listen for incoming connections.
-    rc = listen (_s, options.backlog);
-#ifdef ZMQ_HAVE_WINDOWS
-    if (rc == SOCKET_ERROR) {
-        errno = wsa_error_to_errno (WSAGetLastError ());
-        goto error;
-    }
-#else
-    if (rc != 0)
-        goto error;
-#endif
-
-    return 0;
-
-error:
-    const int err = errno;
-    close ();
-    errno = err;
-    return -1;
-}
-
-int zmq::ws_listener_t::set_local_address (const char *addr_)
-{
-    if (options.use_fd != -1) {
-        //  in this case, the addr_ passed is not used and ignored, since the
-        //  socket was already created by the application
-        _s = options.use_fd;
-    } else {
-        const int rc = _address.resolve (addr_, true, options.ipv6);
-        if (rc != 0)
-            return -1;
-
-        //  remove the path, otherwise resolving the port will fail with wildcard
-        const char *delim = strrchr (addr_, '/');
-        std::string host_address;
-        if (delim) {
-            host_address = std::string (addr_, delim - addr_);
-        } else {
-            host_address = addr_;
-        }
-
-        if (create_socket (host_address.c_str ()) == -1)
-            return -1;
-    }
-
-    _endpoint = get_socket_name (_s, socket_end_local);
-
-    _socket->event_listening (make_unconnected_bind_endpoint_pair (_endpoint),
-                              _s);
-    return 0;
-}
-
-zmq::fd_t zmq::ws_listener_t::accept ()
-{
-    //  The situation where connection cannot be accepted due to insufficient
-    //  resources is considered valid and treated by ignoring the connection.
-    //  Accept one connection and deal with different failure modes.
-    zmq_assert (_s != retired_fd);
-
-    struct sockaddr_storage ss;
-    memset (&ss, 0, sizeof (ss));
-#if defined ZMQ_HAVE_HPUX || defined ZMQ_HAVE_VXWORKS
-    int ss_len = sizeof (ss);
-#else
-    socklen_t ss_len = sizeof (ss);
-#endif
-#if defined ZMQ_HAVE_SOCK_CLOEXEC && defined HAVE_ACCEPT4
-    fd_t sock = ::accept4 (_s, reinterpret_cast<struct sockaddr *> (&ss),
-                           &ss_len, SOCK_CLOEXEC);
-#else
-    const fd_t sock =
-      ::accept (_s, reinterpret_cast<struct sockaddr *> (&ss), &ss_len);
-#endif
-
-    if (sock == retired_fd) {
-#if defined ZMQ_HAVE_WINDOWS
-        const int last_error = WSAGetLastError ();
-        wsa_assert (last_error == WSAEWOULDBLOCK || last_error == WSAECONNRESET
-                    || last_error == WSAEMFILE || last_error == WSAENOBUFS);
-#elif defined ZMQ_HAVE_ANDROID
-        errno_assert (errno == EAGAIN || errno == EWOULDBLOCK || errno == EINTR
-                      || errno == ECONNABORTED || errno == EPROTO
-                      || errno == ENOBUFS || errno == ENOMEM || errno == EMFILE
-                      || errno == ENFILE || errno == EINVAL);
-#else
-        errno_assert (errno == EAGAIN || errno == EWOULDBLOCK || errno == EINTR
-                      || errno == ECONNABORTED || errno == EPROTO
-                      || errno == ENOBUFS || errno == ENOMEM || errno == EMFILE
-                      || errno == ENFILE);
-#endif
-        return retired_fd;
-    }
-
-    make_socket_noninheritable (sock);
-
-    if (zmq::set_nosigpipe (sock)) {
-#ifdef ZMQ_HAVE_WINDOWS
-        const int rc = closesocket (sock);
-        wsa_assert (rc != SOCKET_ERROR);
-#else
-        int rc = ::close (sock);
-        errno_assert (rc == 0);
-#endif
-        return retired_fd;
-    }
-
-    // Set the IP Type-Of-Service priority for this client socket
-    if (options.tos != 0)
-        set_ip_type_of_service (sock, options.tos);
-
-    // Set the protocol-defined priority for this client socket
-    if (options.priority != 0)
-        set_socket_priority (sock, options.priority);
-
-    return sock;
-}
-
-void zmq::ws_listener_t::create_engine (fd_t fd_)
-{
-    const endpoint_uri_pair_t endpoint_pair (
-      get_socket_name (fd_, socket_end_local),
-      get_socket_name (fd_, socket_end_remote), endpoint_type_bind);
-
-    i_engine *engine = NULL;
-    if (_wss)
-#ifdef ZMQ_HAVE_WSS
-        engine = new (std::nothrow)
-          wss_engine_t (fd_, options, endpoint_pair, _address, false, _tls_cred,
-                        std::string ());
-#else
-        zmq_assert (false);
-#endif
-    else
-        engine = new (std::nothrow)
-          ws_engine_t (fd_, options, endpoint_pair, _address, false);
-
-    alloc_assert (engine);
-
-    //  Choose I/O thread to run connecter in. Given that we are already
-    //  running in an I/O thread, there must be at least one available.
-    io_thread_t *io_thread = choose_io_thread (options.affinity);
-    zmq_assert (io_thread);
-
-    //  Create and launch a session object.
-    session_base_t *session =
-      session_base_t::create (io_thread, false, _socket, options, NULL);
-    errno_assert (session);
-    session->inc_seqnum ();
-    launch_child (session);
-    send_attach (session, engine, false);
-
-    _socket->event_accepted (endpoint_pair, fd_);
-}
diff --git a/libs/libzmq/src/ws_listener.hpp b/libs/libzmq/src/ws_listener.hpp
deleted file mode 100644
index 88f3b08..0000000
--- a/libs/libzmq/src/ws_listener.hpp
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
-    Copyright (c) 2007-2019 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_WS_LISTENER_HPP_INCLUDED__
-#define __ZMQ_WS_LISTENER_HPP_INCLUDED__
-
-#include "fd.hpp"
-#include "ws_address.hpp"
-#include "stream_listener_base.hpp"
-
-#ifdef ZMQ_USE_GNUTLS
-#include <gnutls/gnutls.h>
-#endif
-
-namespace zmq
-{
-class ws_listener_t ZMQ_FINAL : public stream_listener_base_t
-{
-  public:
-    ws_listener_t (zmq::io_thread_t *io_thread_,
-                   zmq::socket_base_t *socket_,
-                   const options_t &options_,
-                   bool wss_);
-
-    ~ws_listener_t ();
-
-    //  Set address to listen on.
-    int set_local_address (const char *addr_);
-
-  protected:
-    std::string get_socket_name (fd_t fd_, socket_end_t socket_end_) const;
-    void create_engine (fd_t fd);
-
-  private:
-    //  Handlers for I/O events.
-    void in_event ();
-
-    //  Accept the new connection. Returns the file descriptor of the
-    //  newly created connection. The function may return retired_fd
-    //  if the connection was dropped while waiting in the listen backlog
-    //  or was denied because of accept filters.
-    fd_t accept ();
-
-    int create_socket (const char *addr_);
-
-    //  Address to listen on.
-    ws_address_t _address;
-
-    bool _wss;
-#ifdef ZMQ_HAVE_WSS
-    gnutls_certificate_credentials_t _tls_cred;
-#endif
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (ws_listener_t)
-};
-}
-
-#endif
diff --git a/libs/libzmq/src/ws_protocol.hpp b/libs/libzmq/src/ws_protocol.hpp
deleted file mode 100644
index b4b7e81..0000000
--- a/libs/libzmq/src/ws_protocol.hpp
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
-    Copyright (c) 2007-2019 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_WS_PROTOCOL_HPP_INCLUDED__
-#define __ZMQ_WS_PROTOCOL_HPP_INCLUDED__
-
-namespace zmq
-{
-//  Definition of constants for WS transport protocol.
-class ws_protocol_t
-{
-  public:
-    //  Message flags.
-    enum opcode_t
-    {
-        opcode_continuation = 0,
-        opcode_text = 0x01,
-        opcode_binary = 0x02,
-        opcode_close = 0x08,
-        opcode_ping = 0x09,
-        opcode_pong = 0xA
-    };
-
-    enum
-    {
-        more_flag = 1,
-        command_flag = 2
-    };
-};
-}
-
-#endif
diff --git a/libs/libzmq/src/wss_address.cpp b/libs/libzmq/src/wss_address.cpp
deleted file mode 100644
index abfec9e..0000000
--- a/libs/libzmq/src/wss_address.cpp
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
-    Copyright (c) 2019 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include <string>
-#include <sstream>
-
-#include "wss_address.hpp"
-
-zmq::wss_address_t::wss_address_t () : ws_address_t ()
-{
-}
-
-zmq::wss_address_t::wss_address_t (const sockaddr *sa_, socklen_t sa_len_) :
-    ws_address_t (sa_, sa_len_)
-{
-}
-
-int zmq::wss_address_t::to_string (std::string &addr_) const
-{
-    std::ostringstream os;
-    os << std::string ("wss://") << host () << std::string (":")
-       << _address.port () << path ();
-    addr_ = os.str ();
-
-    return 0;
-}
diff --git a/libs/libzmq/src/wss_address.hpp b/libs/libzmq/src/wss_address.hpp
deleted file mode 100644
index ec6a903..0000000
--- a/libs/libzmq/src/wss_address.hpp
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
-    Copyright (c) 2019 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_WSS_ADDRESS_HPP_INCLUDED__
-#define __ZMQ_WSS_ADDRESS_HPP_INCLUDED__
-
-#include "ws_address.hpp"
-
-namespace zmq
-{
-class wss_address_t : public ws_address_t
-{
-  public:
-    wss_address_t ();
-    wss_address_t (const sockaddr *sa_, socklen_t sa_len_);
-    //  The opposite to resolve()
-    int to_string (std::string &addr_) const;
-};
-}
-
-#endif
diff --git a/libs/libzmq/src/wss_engine.cpp b/libs/libzmq/src/wss_engine.cpp
deleted file mode 100644
index 935e9c1..0000000
--- a/libs/libzmq/src/wss_engine.cpp
+++ /dev/null
@@ -1,226 +0,0 @@
-/*
-Copyright (c) 2007-2019 Contributors as noted in the AUTHORS file
-
-This file is part of libzmq, the ZeroMQ core engine in C++.
-
-libzmq is free software; you can redistribute it and/or modify it under
-the terms of the GNU Lesser General Public License (LGPL) as published
-by the Free Software Foundation; either version 3 of the License, or
-(at your option) any later version.
-
-As a special exception, the Contributors give you permission to link
-this library with independent modules to produce an executable,
-regardless of the license terms of these independent modules, and to
-copy and distribute the resulting executable under terms of your choice,
-provided that you also meet, for each linked independent module, the
-terms and conditions of the license of that module. An independent
-module is a module which is not derived from or based on this library.
-If you modify this library, you must extend this exception to your
-version of the library.
-
-libzmq is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-License for more details.
-
-You should have received a copy of the GNU Lesser General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "wss_engine.hpp"
-
-static int verify_certificate_callback (gnutls_session_t session)
-{
-    unsigned int status;
-    const char *hostname;
-
-    // read hostname
-    hostname = (const char *) gnutls_session_get_ptr (session);
-
-    int rc = gnutls_certificate_verify_peers3 (session, hostname, &status);
-    zmq_assert (rc >= 0);
-
-    if (status != 0) {
-        // TODO: somehow log the error
-        // Certificate is not trusted
-        return GNUTLS_E_CERTIFICATE_ERROR;
-    }
-
-    // notify gnutls to continue handshake normally
-    return 0;
-}
-
-
-zmq::wss_engine_t::wss_engine_t (fd_t fd_,
-                                 const options_t &options_,
-                                 const endpoint_uri_pair_t &endpoint_uri_pair_,
-                                 ws_address_t &address_,
-                                 bool client_,
-                                 void *tls_server_cred_,
-                                 const std::string &hostname_) :
-    ws_engine_t (fd_, options_, endpoint_uri_pair_, address_, client_),
-    _established (false),
-    _tls_client_cred (NULL)
-{
-    int rc = 0;
-
-    if (client_) {
-        // TODO: move to session_base, to allow changing the socket options between connect calls
-        rc = gnutls_certificate_allocate_credentials (&_tls_client_cred);
-        zmq_assert (rc == 0);
-
-        if (options_.wss_trust_system)
-            gnutls_certificate_set_x509_system_trust (_tls_client_cred);
-
-        if (options_.wss_trust_pem.length () > 0) {
-            gnutls_datum_t trust = {
-              (unsigned char *) options_.wss_trust_pem.c_str (),
-              (unsigned int) options_.wss_trust_pem.length ()};
-            rc = gnutls_certificate_set_x509_trust_mem (
-              _tls_client_cred, &trust, GNUTLS_X509_FMT_PEM);
-            zmq_assert (rc >= 0);
-        }
-
-        gnutls_certificate_set_verify_function (_tls_client_cred,
-                                                verify_certificate_callback);
-
-        rc = gnutls_init (&_tls_session, GNUTLS_CLIENT | GNUTLS_NONBLOCK);
-        zmq_assert (rc == GNUTLS_E_SUCCESS);
-
-        if (!hostname_.empty ())
-            gnutls_server_name_set (_tls_session, GNUTLS_NAME_DNS,
-                                    hostname_.c_str (), hostname_.size ());
-
-        gnutls_session_set_ptr (
-          _tls_session,
-          hostname_.empty () ? NULL : const_cast<char *> (hostname_.c_str ()));
-
-        rc = gnutls_credentials_set (_tls_session, GNUTLS_CRD_CERTIFICATE,
-                                     _tls_client_cred);
-        zmq_assert (rc == GNUTLS_E_SUCCESS);
-    } else {
-        zmq_assert (tls_server_cred_);
-
-        rc = gnutls_init (&_tls_session, GNUTLS_SERVER | GNUTLS_NONBLOCK);
-        zmq_assert (rc == GNUTLS_E_SUCCESS);
-
-        rc = gnutls_credentials_set (_tls_session, GNUTLS_CRD_CERTIFICATE,
-                                     tls_server_cred_);
-        zmq_assert (rc == GNUTLS_E_SUCCESS);
-    }
-
-    gnutls_set_default_priority (_tls_session);
-    gnutls_transport_set_int (_tls_session, fd_);
-}
-
-zmq::wss_engine_t::~wss_engine_t ()
-{
-    gnutls_deinit (_tls_session);
-
-    if (_tls_client_cred)
-        gnutls_certificate_free_credentials (_tls_client_cred);
-}
-
-void zmq::wss_engine_t::plug_internal ()
-{
-    set_pollin ();
-    in_event ();
-}
-
-void zmq::wss_engine_t::out_event ()
-{
-    if (_established)
-        return ws_engine_t::out_event ();
-
-    do_handshake ();
-}
-
-bool zmq::wss_engine_t::do_handshake ()
-{
-    int rc = gnutls_handshake (_tls_session);
-
-    reset_pollout ();
-
-    if (rc == GNUTLS_E_SUCCESS) {
-        start_ws_handshake ();
-        _established = true;
-        return false;
-    } else if (rc == GNUTLS_E_AGAIN) {
-        int direction = gnutls_record_get_direction (_tls_session);
-        if (direction == 1)
-            set_pollout ();
-
-        return false;
-    } else if (rc == GNUTLS_E_INTERRUPTED
-               || rc == GNUTLS_E_WARNING_ALERT_RECEIVED) {
-        return false;
-    } else {
-        error (zmq::i_engine::connection_error);
-        return false;
-    }
-
-    return true;
-}
-
-bool zmq::wss_engine_t::handshake ()
-{
-    if (!_established) {
-        if (!do_handshake ()) {
-            return false;
-        }
-    }
-
-    return ws_engine_t::handshake ();
-}
-
-int zmq::wss_engine_t::read (void *data_, size_t size_)
-{
-    ssize_t rc = gnutls_record_recv (_tls_session, data_, size_);
-
-    if (rc == GNUTLS_E_REHANDSHAKE) {
-        gnutls_alert_send (_tls_session, GNUTLS_AL_WARNING,
-                           GNUTLS_A_NO_RENEGOTIATION);
-        return 0;
-    }
-
-    if (rc == GNUTLS_E_INTERRUPTED) {
-        errno = EINTR;
-        return -1;
-    }
-
-    if (rc == GNUTLS_E_AGAIN) {
-        errno = EAGAIN;
-        return -1;
-    }
-
-    if (rc == 0) {
-        errno = EPIPE;
-        return -1;
-    }
-
-    if (rc < 0) {
-        errno = EINVAL;
-        return -1;
-    }
-
-    // TODO: change return type to ssize_t (signed)
-    return rc;
-}
-
-int zmq::wss_engine_t::write (const void *data_, size_t size_)
-{
-    ssize_t rc = gnutls_record_send (_tls_session, data_, size_);
-
-    if (rc == GNUTLS_E_INTERRUPTED || rc == GNUTLS_E_AGAIN) {
-        return 0;
-    }
-
-    if (rc < 0) {
-        errno = EINVAL;
-        return -1;
-    }
-
-    // TODO: change return type to ssize_t (signed)
-    return rc;
-}
diff --git a/libs/libzmq/src/wss_engine.hpp b/libs/libzmq/src/wss_engine.hpp
deleted file mode 100644
index 0280c38..0000000
--- a/libs/libzmq/src/wss_engine.hpp
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
-    Copyright (c) 2007-2019 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_WSS_ENGINE_HPP_INCLUDED__
-#define __ZMQ_WSS_ENGINE_HPP_INCLUDED__
-
-#include <gnutls/gnutls.h>
-#include "ws_engine.hpp"
-
-#define WSS_BUFFER_SIZE 8192
-
-namespace zmq
-{
-class wss_engine_t : public ws_engine_t
-{
-  public:
-    wss_engine_t (fd_t fd_,
-                  const options_t &options_,
-                  const endpoint_uri_pair_t &endpoint_uri_pair_,
-                  ws_address_t &address_,
-                  bool client_,
-                  void *tls_server_cred_,
-                  const std::string &hostname_);
-    ~wss_engine_t ();
-
-    void out_event ();
-
-  protected:
-    bool handshake ();
-    void plug_internal ();
-    int read (void *data, size_t size_);
-    int write (const void *data_, size_t size_);
-
-  private:
-    bool do_handshake ();
-
-    bool _established;
-    gnutls_certificate_credentials_t _tls_client_cred;
-    gnutls_session_t _tls_session;
-};
-}
-
-#endif
diff --git a/libs/libzmq/src/xpub.cpp b/libs/libzmq/src/xpub.cpp
deleted file mode 100644
index a71543a..0000000
--- a/libs/libzmq/src/xpub.cpp
+++ /dev/null
@@ -1,411 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include <string.h>
-
-#include "xpub.hpp"
-#include "pipe.hpp"
-#include "err.hpp"
-#include "msg.hpp"
-#include "macros.hpp"
-#include "generic_mtrie_impl.hpp"
-
-zmq::xpub_t::xpub_t (class ctx_t *parent_, uint32_t tid_, int sid_) :
-    socket_base_t (parent_, tid_, sid_),
-    _verbose_subs (false),
-    _verbose_unsubs (false),
-    _more_send (false),
-    _more_recv (false),
-    _process_subscribe (false),
-    _only_first_subscribe (false),
-    _lossy (true),
-    _manual (false),
-    _send_last_pipe (false),
-    _pending_pipes (),
-    _welcome_msg ()
-{
-    _last_pipe = NULL;
-    options.type = ZMQ_XPUB;
-    _welcome_msg.init ();
-}
-
-zmq::xpub_t::~xpub_t ()
-{
-    _welcome_msg.close ();
-    for (std::deque<metadata_t *>::iterator it = _pending_metadata.begin (),
-                                            end = _pending_metadata.end ();
-         it != end; ++it)
-        if (*it && (*it)->drop_ref ())
-            LIBZMQ_DELETE (*it);
-}
-
-void zmq::xpub_t::xattach_pipe (pipe_t *pipe_,
-                                bool subscribe_to_all_,
-                                bool locally_initiated_)
-{
-    LIBZMQ_UNUSED (locally_initiated_);
-
-    zmq_assert (pipe_);
-    _dist.attach (pipe_);
-
-    //  If subscribe_to_all_ is specified, the caller would like to subscribe
-    //  to all data on this pipe, implicitly.
-    if (subscribe_to_all_)
-        _subscriptions.add (NULL, 0, pipe_);
-
-    // if welcome message exists, send a copy of it
-    if (_welcome_msg.size () > 0) {
-        msg_t copy;
-        copy.init ();
-        const int rc = copy.copy (_welcome_msg);
-        errno_assert (rc == 0);
-        const bool ok = pipe_->write (&copy);
-        zmq_assert (ok);
-        pipe_->flush ();
-    }
-
-    //  The pipe is active when attached. Let's read the subscriptions from
-    //  it, if any.
-    xread_activated (pipe_);
-}
-
-void zmq::xpub_t::xread_activated (pipe_t *pipe_)
-{
-    //  There are some subscriptions waiting. Let's process them.
-    msg_t msg;
-    while (pipe_->read (&msg)) {
-        metadata_t *metadata = msg.metadata ();
-        unsigned char *msg_data = static_cast<unsigned char *> (msg.data ()),
-                      *data = NULL;
-        size_t size = 0;
-        bool subscribe = false;
-        bool is_subscribe_or_cancel = false;
-        bool notify = false;
-
-        const bool first_part = !_more_recv;
-        _more_recv = (msg.flags () & msg_t::more) != 0;
-
-        if (first_part || _process_subscribe) {
-            //  Apply the subscription to the trie
-            if (msg.is_subscribe () || msg.is_cancel ()) {
-                data = static_cast<unsigned char *> (msg.command_body ());
-                size = msg.command_body_size ();
-                subscribe = msg.is_subscribe ();
-                is_subscribe_or_cancel = true;
-            } else if (msg.size () > 0 && (*msg_data == 0 || *msg_data == 1)) {
-                data = msg_data + 1;
-                size = msg.size () - 1;
-                subscribe = *msg_data == 1;
-                is_subscribe_or_cancel = true;
-            }
-        }
-
-        if (first_part)
-            _process_subscribe =
-              !_only_first_subscribe || is_subscribe_or_cancel;
-
-        if (is_subscribe_or_cancel) {
-            if (_manual) {
-                // Store manual subscription to use on termination
-                if (!subscribe)
-                    _manual_subscriptions.rm (data, size, pipe_);
-                else
-                    _manual_subscriptions.add (data, size, pipe_);
-
-                _pending_pipes.push_back (pipe_);
-            } else {
-                if (!subscribe) {
-                    const mtrie_t::rm_result rm_result =
-                      _subscriptions.rm (data, size, pipe_);
-                    //  TODO reconsider what to do if rm_result == mtrie_t::not_found
-                    notify =
-                      rm_result != mtrie_t::values_remain || _verbose_unsubs;
-                } else {
-                    const bool first_added =
-                      _subscriptions.add (data, size, pipe_);
-                    notify = first_added || _verbose_subs;
-                }
-            }
-
-            //  If the request was a new subscription, or the subscription
-            //  was removed, or verbose mode or manual mode are enabled, store it
-            //  so that it can be passed to the user on next recv call.
-            if (_manual || (options.type == ZMQ_XPUB && notify)) {
-                //  ZMTP 3.1 hack: we need to support sub/cancel commands, but
-                //  we can't give them back to userspace as it would be an API
-                //  breakage since the payload of the message is completely
-                //  different. Manually craft an old-style message instead.
-                //  Although with other transports it would be possible to simply
-                //  reuse the same buffer and prefix a 0/1 byte to the topic, with
-                //  inproc the subscribe/cancel command string is not present in
-                //  the message, so this optimization is not possible.
-                //  The pushback makes a copy of the data array anyway, so the
-                //  number of buffer copies does not change.
-                blob_t notification (size + 1);
-                if (subscribe)
-                    *notification.data () = 1;
-                else
-                    *notification.data () = 0;
-                memcpy (notification.data () + 1, data, size);
-
-                _pending_data.push_back (ZMQ_MOVE (notification));
-                if (metadata)
-                    metadata->add_ref ();
-                _pending_metadata.push_back (metadata);
-                _pending_flags.push_back (0);
-            }
-        } else if (options.type != ZMQ_PUB) {
-            //  Process user message coming upstream from xsub socket,
-            //  but not if the type is PUB, which never processes user
-            //  messages
-            _pending_data.push_back (blob_t (msg_data, msg.size ()));
-            if (metadata)
-                metadata->add_ref ();
-            _pending_metadata.push_back (metadata);
-            _pending_flags.push_back (msg.flags ());
-        }
-
-        msg.close ();
-    }
-}
-
-void zmq::xpub_t::xwrite_activated (pipe_t *pipe_)
-{
-    _dist.activated (pipe_);
-}
-
-int zmq::xpub_t::xsetsockopt (int option_,
-                              const void *optval_,
-                              size_t optvallen_)
-{
-    if (option_ == ZMQ_XPUB_VERBOSE || option_ == ZMQ_XPUB_VERBOSER
-        || option_ == ZMQ_XPUB_MANUAL_LAST_VALUE || option_ == ZMQ_XPUB_NODROP
-        || option_ == ZMQ_XPUB_MANUAL || option_ == ZMQ_ONLY_FIRST_SUBSCRIBE) {
-        if (optvallen_ != sizeof (int)
-            || *static_cast<const int *> (optval_) < 0) {
-            errno = EINVAL;
-            return -1;
-        }
-        if (option_ == ZMQ_XPUB_VERBOSE) {
-            _verbose_subs = (*static_cast<const int *> (optval_) != 0);
-            _verbose_unsubs = false;
-        } else if (option_ == ZMQ_XPUB_VERBOSER) {
-            _verbose_subs = (*static_cast<const int *> (optval_) != 0);
-            _verbose_unsubs = _verbose_subs;
-        } else if (option_ == ZMQ_XPUB_MANUAL_LAST_VALUE) {
-            _manual = (*static_cast<const int *> (optval_) != 0);
-            _send_last_pipe = _manual;
-        } else if (option_ == ZMQ_XPUB_NODROP)
-            _lossy = (*static_cast<const int *> (optval_) == 0);
-        else if (option_ == ZMQ_XPUB_MANUAL)
-            _manual = (*static_cast<const int *> (optval_) != 0);
-        else if (option_ == ZMQ_ONLY_FIRST_SUBSCRIBE)
-            _only_first_subscribe = (*static_cast<const int *> (optval_) != 0);
-    } else if (option_ == ZMQ_SUBSCRIBE && _manual) {
-        if (_last_pipe != NULL)
-            _subscriptions.add ((unsigned char *) optval_, optvallen_,
-                                _last_pipe);
-    } else if (option_ == ZMQ_UNSUBSCRIBE && _manual) {
-        if (_last_pipe != NULL)
-            _subscriptions.rm ((unsigned char *) optval_, optvallen_,
-                               _last_pipe);
-    } else if (option_ == ZMQ_XPUB_WELCOME_MSG) {
-        _welcome_msg.close ();
-
-        if (optvallen_ > 0) {
-            const int rc = _welcome_msg.init_size (optvallen_);
-            errno_assert (rc == 0);
-
-            unsigned char *data =
-              static_cast<unsigned char *> (_welcome_msg.data ());
-            memcpy (data, optval_, optvallen_);
-        } else
-            _welcome_msg.init ();
-    } else {
-        errno = EINVAL;
-        return -1;
-    }
-    return 0;
-}
-
-static void stub (zmq::mtrie_t::prefix_t data_, size_t size_, void *arg_)
-{
-    LIBZMQ_UNUSED (data_);
-    LIBZMQ_UNUSED (size_);
-    LIBZMQ_UNUSED (arg_);
-}
-
-void zmq::xpub_t::xpipe_terminated (pipe_t *pipe_)
-{
-    if (_manual) {
-        //  Remove the pipe from the trie and send corresponding manual
-        //  unsubscriptions upstream.
-        _manual_subscriptions.rm (pipe_, send_unsubscription, this, false);
-        //  Remove pipe without actually sending the message as it was taken
-        //  care of by the manual call above. subscriptions is the real mtrie,
-        //  so the pipe must be removed from there or it will be left over.
-        _subscriptions.rm (pipe_, stub, static_cast<void *> (NULL), false);
-
-        // In case the pipe is currently set as last we must clear it to prevent
-        // subscriptions from being re-added.
-        if (pipe_ == _last_pipe) {
-            _last_pipe = NULL;
-        }
-    } else {
-        //  Remove the pipe from the trie. If there are topics that nobody
-        //  is interested in anymore, send corresponding unsubscriptions
-        //  upstream.
-        _subscriptions.rm (pipe_, send_unsubscription, this, !_verbose_unsubs);
-    }
-
-    _dist.pipe_terminated (pipe_);
-}
-
-void zmq::xpub_t::mark_as_matching (pipe_t *pipe_, xpub_t *self_)
-{
-    self_->_dist.match (pipe_);
-}
-
-void zmq::xpub_t::mark_last_pipe_as_matching (pipe_t *pipe_, xpub_t *self_)
-{
-    if (self_->_last_pipe == pipe_)
-        self_->_dist.match (pipe_);
-}
-
-int zmq::xpub_t::xsend (msg_t *msg_)
-{
-    const bool msg_more = (msg_->flags () & msg_t::more) != 0;
-
-    //  For the first part of multi-part message, find the matching pipes.
-    if (!_more_send) {
-        // Ensure nothing from previous failed attempt to send is left matched
-        _dist.unmatch ();
-
-        if (unlikely (_manual && _last_pipe && _send_last_pipe)) {
-            _subscriptions.match (static_cast<unsigned char *> (msg_->data ()),
-                                  msg_->size (), mark_last_pipe_as_matching,
-                                  this);
-            _last_pipe = NULL;
-        } else
-            _subscriptions.match (static_cast<unsigned char *> (msg_->data ()),
-                                  msg_->size (), mark_as_matching, this);
-        // If inverted matching is used, reverse the selection now
-        if (options.invert_matching) {
-            _dist.reverse_match ();
-        }
-    }
-
-    int rc = -1; //  Assume we fail
-    if (_lossy || _dist.check_hwm ()) {
-        if (_dist.send_to_matching (msg_) == 0) {
-            //  If we are at the end of multi-part message we can mark
-            //  all the pipes as non-matching.
-            if (!msg_more)
-                _dist.unmatch ();
-            _more_send = msg_more;
-            rc = 0; //  Yay, sent successfully
-        }
-    } else
-        errno = EAGAIN;
-    return rc;
-}
-
-bool zmq::xpub_t::xhas_out ()
-{
-    return _dist.has_out ();
-}
-
-int zmq::xpub_t::xrecv (msg_t *msg_)
-{
-    //  If there is at least one
-    if (_pending_data.empty ()) {
-        errno = EAGAIN;
-        return -1;
-    }
-
-    // User is reading a message, set last_pipe and remove it from the deque
-    if (_manual && !_pending_pipes.empty ()) {
-        _last_pipe = _pending_pipes.front ();
-        _pending_pipes.pop_front ();
-
-        // If the distributor doesn't know about this pipe it must have already
-        // been terminated and thus we can't allow manual subscriptions.
-        if (_last_pipe != NULL && !_dist.has_pipe (_last_pipe)) {
-            _last_pipe = NULL;
-        }
-    }
-
-    int rc = msg_->close ();
-    errno_assert (rc == 0);
-    rc = msg_->init_size (_pending_data.front ().size ());
-    errno_assert (rc == 0);
-    memcpy (msg_->data (), _pending_data.front ().data (),
-            _pending_data.front ().size ());
-
-    // set metadata only if there is some
-    if (metadata_t *metadata = _pending_metadata.front ()) {
-        msg_->set_metadata (metadata);
-        // Remove ref corresponding to vector placement
-        metadata->drop_ref ();
-    }
-
-    msg_->set_flags (_pending_flags.front ());
-    _pending_data.pop_front ();
-    _pending_metadata.pop_front ();
-    _pending_flags.pop_front ();
-    return 0;
-}
-
-bool zmq::xpub_t::xhas_in ()
-{
-    return !_pending_data.empty ();
-}
-
-void zmq::xpub_t::send_unsubscription (zmq::mtrie_t::prefix_t data_,
-                                       size_t size_,
-                                       xpub_t *self_)
-{
-    if (self_->options.type != ZMQ_PUB) {
-        //  Place the unsubscription to the queue of pending (un)subscriptions
-        //  to be retrieved by the user later on.
-        blob_t unsub (size_ + 1);
-        *unsub.data () = 0;
-        if (size_ > 0)
-            memcpy (unsub.data () + 1, data_, size_);
-        self_->_pending_data.ZMQ_PUSH_OR_EMPLACE_BACK (ZMQ_MOVE (unsub));
-        self_->_pending_metadata.push_back (NULL);
-        self_->_pending_flags.push_back (0);
-
-        if (self_->_manual) {
-            self_->_last_pipe = NULL;
-            self_->_pending_pipes.push_back (NULL);
-        }
-    }
-}
diff --git a/libs/libzmq/src/xpub.hpp b/libs/libzmq/src/xpub.hpp
deleted file mode 100644
index 82504b0..0000000
--- a/libs/libzmq/src/xpub.hpp
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_XPUB_HPP_INCLUDED__
-#define __ZMQ_XPUB_HPP_INCLUDED__
-
-#include <deque>
-
-#include "socket_base.hpp"
-#include "session_base.hpp"
-#include "mtrie.hpp"
-#include "dist.hpp"
-
-namespace zmq
-{
-class ctx_t;
-class msg_t;
-class pipe_t;
-class io_thread_t;
-
-class xpub_t : public socket_base_t
-{
-  public:
-    xpub_t (zmq::ctx_t *parent_, uint32_t tid_, int sid_);
-    ~xpub_t () ZMQ_OVERRIDE;
-
-    //  Implementations of virtual functions from socket_base_t.
-    void xattach_pipe (zmq::pipe_t *pipe_,
-                       bool subscribe_to_all_ = false,
-                       bool locally_initiated_ = false) ZMQ_OVERRIDE;
-    int xsend (zmq::msg_t *msg_) ZMQ_FINAL;
-    bool xhas_out () ZMQ_FINAL;
-    int xrecv (zmq::msg_t *msg_) ZMQ_OVERRIDE;
-    bool xhas_in () ZMQ_OVERRIDE;
-    void xread_activated (zmq::pipe_t *pipe_) ZMQ_FINAL;
-    void xwrite_activated (zmq::pipe_t *pipe_) ZMQ_FINAL;
-    int
-    xsetsockopt (int option_, const void *optval_, size_t optvallen_) ZMQ_FINAL;
-    void xpipe_terminated (zmq::pipe_t *pipe_) ZMQ_FINAL;
-
-  private:
-    //  Function to be applied to the trie to send all the subscriptions
-    //  upstream.
-    static void send_unsubscription (zmq::mtrie_t::prefix_t data_,
-                                     size_t size_,
-                                     xpub_t *self_);
-
-    //  Function to be applied to each matching pipes.
-    static void mark_as_matching (zmq::pipe_t *pipe_, xpub_t *self_);
-
-    //  List of all subscriptions mapped to corresponding pipes.
-    mtrie_t _subscriptions;
-
-    //  List of manual subscriptions mapped to corresponding pipes.
-    mtrie_t _manual_subscriptions;
-
-    //  Distributor of messages holding the list of outbound pipes.
-    dist_t _dist;
-
-    // If true, send all subscription messages upstream, not just
-    // unique ones
-    bool _verbose_subs;
-
-    // If true, send all unsubscription messages upstream, not just
-    // unique ones
-    bool _verbose_unsubs;
-
-    //  True if we are in the middle of sending a multi-part message.
-    bool _more_send;
-
-    //  True if we are in the middle of receiving a multi-part message.
-    bool _more_recv;
-
-    //  If true, subscribe and cancel messages are processed for the rest
-    //  of multipart message.
-    bool _process_subscribe;
-
-    //  This option is enabled with ZMQ_ONLY_FIRST_SUBSCRIBE.
-    //  If true, messages following subscribe/unsubscribe in a multipart
-    //  message are treated as user data regardless of the first byte.
-    bool _only_first_subscribe;
-
-    //  Drop messages if HWM reached, otherwise return with EAGAIN
-    bool _lossy;
-
-    //  Subscriptions will not bed added automatically, only after calling set option with ZMQ_SUBSCRIBE or ZMQ_UNSUBSCRIBE
-    bool _manual;
-
-    //  Send message to the last pipe, only used if xpub is on manual and after calling set option with ZMQ_SUBSCRIBE
-    bool _send_last_pipe;
-
-    //  Function to be applied to match the last pipe.
-    static void mark_last_pipe_as_matching (zmq::pipe_t *pipe_, xpub_t *self_);
-
-    //  Last pipe that sent subscription message, only used if xpub is on manual
-    pipe_t *_last_pipe;
-
-    // Pipes that sent subscriptions messages that have not yet been processed, only used if xpub is on manual
-    std::deque<pipe_t *> _pending_pipes;
-
-    //  Welcome message to send to pipe when attached
-    msg_t _welcome_msg;
-
-    //  List of pending (un)subscriptions, ie. those that were already
-    //  applied to the trie, but not yet received by the user.
-    std::deque<blob_t> _pending_data;
-    std::deque<metadata_t *> _pending_metadata;
-    std::deque<unsigned char> _pending_flags;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (xpub_t)
-};
-}
-
-#endif
diff --git a/libs/libzmq/src/xsub.cpp b/libs/libzmq/src/xsub.cpp
deleted file mode 100644
index 795e4bf..0000000
--- a/libs/libzmq/src/xsub.cpp
+++ /dev/null
@@ -1,287 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include <string.h>
-
-#include "macros.hpp"
-#include "xsub.hpp"
-#include "err.hpp"
-
-zmq::xsub_t::xsub_t (class ctx_t *parent_, uint32_t tid_, int sid_) :
-    socket_base_t (parent_, tid_, sid_),
-    _verbose_unsubs (false),
-    _has_message (false),
-    _more_send (false),
-    _more_recv (false),
-    _process_subscribe (false),
-    _only_first_subscribe (false)
-{
-    options.type = ZMQ_XSUB;
-
-    //  When socket is being closed down we don't want to wait till pending
-    //  subscription commands are sent to the wire.
-    options.linger.store (0);
-
-    const int rc = _message.init ();
-    errno_assert (rc == 0);
-}
-
-zmq::xsub_t::~xsub_t ()
-{
-    const int rc = _message.close ();
-    errno_assert (rc == 0);
-}
-
-void zmq::xsub_t::xattach_pipe (pipe_t *pipe_,
-                                bool subscribe_to_all_,
-                                bool locally_initiated_)
-{
-    LIBZMQ_UNUSED (subscribe_to_all_);
-    LIBZMQ_UNUSED (locally_initiated_);
-
-    zmq_assert (pipe_);
-    _fq.attach (pipe_);
-    _dist.attach (pipe_);
-
-    //  Send all the cached subscriptions to the new upstream peer.
-    _subscriptions.apply (send_subscription, pipe_);
-    pipe_->flush ();
-}
-
-void zmq::xsub_t::xread_activated (pipe_t *pipe_)
-{
-    _fq.activated (pipe_);
-}
-
-void zmq::xsub_t::xwrite_activated (pipe_t *pipe_)
-{
-    _dist.activated (pipe_);
-}
-
-void zmq::xsub_t::xpipe_terminated (pipe_t *pipe_)
-{
-    _fq.pipe_terminated (pipe_);
-    _dist.pipe_terminated (pipe_);
-}
-
-void zmq::xsub_t::xhiccuped (pipe_t *pipe_)
-{
-    //  Send all the cached subscriptions to the hiccuped pipe.
-    _subscriptions.apply (send_subscription, pipe_);
-    pipe_->flush ();
-}
-
-int zmq::xsub_t::xsetsockopt (int option_,
-                              const void *optval_,
-                              size_t optvallen_)
-{
-    if (option_ == ZMQ_ONLY_FIRST_SUBSCRIBE) {
-        if (optvallen_ != sizeof (int)
-            || *static_cast<const int *> (optval_) < 0) {
-            errno = EINVAL;
-            return -1;
-        }
-        _only_first_subscribe = (*static_cast<const int *> (optval_) != 0);
-        return 0;
-    }
-#ifdef ZMQ_BUILD_DRAFT_API
-    else if (option_ == ZMQ_XSUB_VERBOSE_UNSUBSCRIBE) {
-        _verbose_unsubs = (*static_cast<const int *> (optval_) != 0);
-        return 0;
-    }
-#endif
-    errno = EINVAL;
-    return -1;
-}
-
-int zmq::xsub_t::xsend (msg_t *msg_)
-{
-    size_t size = msg_->size ();
-    unsigned char *data = static_cast<unsigned char *> (msg_->data ());
-
-    const bool first_part = !_more_send;
-    _more_send = (msg_->flags () & msg_t::more) != 0;
-
-    if (first_part) {
-        _process_subscribe = !_only_first_subscribe;
-    } else if (!_process_subscribe) {
-        //  User message sent upstream to XPUB socket
-        return _dist.send_to_all (msg_);
-    }
-
-    if (msg_->is_subscribe () || (size > 0 && *data == 1)) {
-        //  Process subscribe message
-        //  This used to filter out duplicate subscriptions,
-        //  however this is already done on the XPUB side and
-        //  doing it here as well breaks ZMQ_XPUB_VERBOSE
-        //  when there are forwarding devices involved.
-        if (!msg_->is_subscribe ()) {
-            data = data + 1;
-            size = size - 1;
-        }
-        _subscriptions.add (data, size);
-        _process_subscribe = true;
-        return _dist.send_to_all (msg_);
-    }
-    if (msg_->is_cancel () || (size > 0 && *data == 0)) {
-        //  Process unsubscribe message
-        if (!msg_->is_cancel ()) {
-            data = data + 1;
-            size = size - 1;
-        }
-        _process_subscribe = true;
-        const bool rm_result = _subscriptions.rm (data, size);
-        if (rm_result || _verbose_unsubs)
-            return _dist.send_to_all (msg_);
-    } else
-        //  User message sent upstream to XPUB socket
-        return _dist.send_to_all (msg_);
-
-    int rc = msg_->close ();
-    errno_assert (rc == 0);
-    rc = msg_->init ();
-    errno_assert (rc == 0);
-
-    return 0;
-}
-
-bool zmq::xsub_t::xhas_out ()
-{
-    //  Subscription can be added/removed anytime.
-    return true;
-}
-
-int zmq::xsub_t::xrecv (msg_t *msg_)
-{
-    //  If there's already a message prepared by a previous call to zmq_poll,
-    //  return it straight ahead.
-    if (_has_message) {
-        const int rc = msg_->move (_message);
-        errno_assert (rc == 0);
-        _has_message = false;
-        _more_recv = (msg_->flags () & msg_t::more) != 0;
-        return 0;
-    }
-
-    //  TODO: This can result in infinite loop in the case of continuous
-    //  stream of non-matching messages which breaks the non-blocking recv
-    //  semantics.
-    while (true) {
-        //  Get a message using fair queueing algorithm.
-        int rc = _fq.recv (msg_);
-
-        //  If there's no message available, return immediately.
-        //  The same when error occurs.
-        if (rc != 0)
-            return -1;
-
-        //  Check whether the message matches at least one subscription.
-        //  Non-initial parts of the message are passed
-        if (_more_recv || !options.filter || match (msg_)) {
-            _more_recv = (msg_->flags () & msg_t::more) != 0;
-            return 0;
-        }
-
-        //  Message doesn't match. Pop any remaining parts of the message
-        //  from the pipe.
-        while (msg_->flags () & msg_t::more) {
-            rc = _fq.recv (msg_);
-            errno_assert (rc == 0);
-        }
-    }
-}
-
-bool zmq::xsub_t::xhas_in ()
-{
-    //  There are subsequent parts of the partly-read message available.
-    if (_more_recv)
-        return true;
-
-    //  If there's already a message prepared by a previous call to zmq_poll,
-    //  return straight ahead.
-    if (_has_message)
-        return true;
-
-    //  TODO: This can result in infinite loop in the case of continuous
-    //  stream of non-matching messages.
-    while (true) {
-        //  Get a message using fair queueing algorithm.
-        int rc = _fq.recv (&_message);
-
-        //  If there's no message available, return immediately.
-        //  The same when error occurs.
-        if (rc != 0) {
-            errno_assert (errno == EAGAIN);
-            return false;
-        }
-
-        //  Check whether the message matches at least one subscription.
-        if (!options.filter || match (&_message)) {
-            _has_message = true;
-            return true;
-        }
-
-        //  Message doesn't match. Pop any remaining parts of the message
-        //  from the pipe.
-        while (_message.flags () & msg_t::more) {
-            rc = _fq.recv (&_message);
-            errno_assert (rc == 0);
-        }
-    }
-}
-
-bool zmq::xsub_t::match (msg_t *msg_)
-{
-    const bool matching = _subscriptions.check (
-      static_cast<unsigned char *> (msg_->data ()), msg_->size ());
-
-    return matching ^ options.invert_matching;
-}
-
-void zmq::xsub_t::send_subscription (unsigned char *data_,
-                                     size_t size_,
-                                     void *arg_)
-{
-    pipe_t *pipe = static_cast<pipe_t *> (arg_);
-
-    //  Create the subscription message.
-    msg_t msg;
-    const int rc = msg.init_subscribe (size_, data_);
-    errno_assert (rc == 0);
-
-    //  Send it to the pipe.
-    const bool sent = pipe->write (&msg);
-    //  If we reached the SNDHWM, and thus cannot send the subscription, drop
-    //  the subscription message instead. This matches the behaviour of
-    //  zmq_setsockopt(ZMQ_SUBSCRIBE, ...), which also drops subscriptions
-    //  when the SNDHWM is reached.
-    if (!sent)
-        msg.close ();
-}
diff --git a/libs/libzmq/src/xsub.hpp b/libs/libzmq/src/xsub.hpp
deleted file mode 100644
index 2fc37ea..0000000
--- a/libs/libzmq/src/xsub.hpp
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_XSUB_HPP_INCLUDED__
-#define __ZMQ_XSUB_HPP_INCLUDED__
-
-#include "socket_base.hpp"
-#include "session_base.hpp"
-#include "dist.hpp"
-#include "fq.hpp"
-#ifdef ZMQ_USE_RADIX_TREE
-#include "radix_tree.hpp"
-#else
-#include "trie.hpp"
-#endif
-
-namespace zmq
-{
-class ctx_t;
-class pipe_t;
-class io_thread_t;
-
-class xsub_t : public socket_base_t
-{
-  public:
-    xsub_t (zmq::ctx_t *parent_, uint32_t tid_, int sid_);
-    ~xsub_t () ZMQ_OVERRIDE;
-
-  protected:
-    //  Overrides of functions from socket_base_t.
-    void xattach_pipe (zmq::pipe_t *pipe_,
-                       bool subscribe_to_all_,
-                       bool locally_initiated_) ZMQ_FINAL;
-    int xsetsockopt (int option_,
-                     const void *optval_,
-                     size_t optvallen_) ZMQ_OVERRIDE;
-    int xsend (zmq::msg_t *msg_) ZMQ_OVERRIDE;
-    bool xhas_out () ZMQ_OVERRIDE;
-    int xrecv (zmq::msg_t *msg_) ZMQ_FINAL;
-    bool xhas_in () ZMQ_FINAL;
-    void xread_activated (zmq::pipe_t *pipe_) ZMQ_FINAL;
-    void xwrite_activated (zmq::pipe_t *pipe_) ZMQ_FINAL;
-    void xhiccuped (pipe_t *pipe_) ZMQ_FINAL;
-    void xpipe_terminated (zmq::pipe_t *pipe_) ZMQ_FINAL;
-
-  private:
-    //  Check whether the message matches at least one subscription.
-    bool match (zmq::msg_t *msg_);
-
-    //  Function to be applied to the trie to send all the subsciptions
-    //  upstream.
-    static void
-    send_subscription (unsigned char *data_, size_t size_, void *arg_);
-
-    //  Fair queueing object for inbound pipes.
-    fq_t _fq;
-
-    //  Object for distributing the subscriptions upstream.
-    dist_t _dist;
-
-    //  The repository of subscriptions.
-#ifdef ZMQ_USE_RADIX_TREE
-    radix_tree_t _subscriptions;
-#else
-    trie_t _subscriptions;
-#endif
-
-    // If true, send all unsubscription messages upstream, not just
-    // unique ones
-    bool _verbose_unsubs;
-
-    //  If true, 'message' contains a matching message to return on the
-    //  next recv call.
-    bool _has_message;
-    msg_t _message;
-
-    //  If true, part of a multipart message was already sent, but
-    //  there are following parts still waiting.
-    bool _more_send;
-
-    //  If true, part of a multipart message was already received, but
-    //  there are following parts still waiting.
-    bool _more_recv;
-
-    //  If true, subscribe and cancel messages are processed for the rest
-    //  of multipart message.
-    bool _process_subscribe;
-
-    //  This option is enabled with ZMQ_ONLY_FIRST_SUBSCRIBE.
-    //  If true, messages following subscribe/unsubscribe in a multipart
-    //  message are treated as user data regardless of the first byte.
-    bool _only_first_subscribe;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (xsub_t)
-};
-}
-
-#endif
diff --git a/libs/libzmq/src/ypipe.hpp b/libs/libzmq/src/ypipe.hpp
deleted file mode 100644
index 1c10136..0000000
--- a/libs/libzmq/src/ypipe.hpp
+++ /dev/null
@@ -1,205 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_YPIPE_HPP_INCLUDED__
-#define __ZMQ_YPIPE_HPP_INCLUDED__
-
-#include "atomic_ptr.hpp"
-#include "yqueue.hpp"
-#include "ypipe_base.hpp"
-
-namespace zmq
-{
-//  Lock-free queue implementation.
-//  Only a single thread can read from the pipe at any specific moment.
-//  Only a single thread can write to the pipe at any specific moment.
-//  T is the type of the object in the queue.
-//  N is granularity of the pipe, i.e. how many items are needed to
-//  perform next memory allocation.
-
-template <typename T, int N> class ypipe_t ZMQ_FINAL : public ypipe_base_t<T>
-{
-  public:
-    //  Initialises the pipe.
-    ypipe_t ()
-    {
-        //  Insert terminator element into the queue.
-        _queue.push ();
-
-        //  Let all the pointers to point to the terminator.
-        //  (unless pipe is dead, in which case c is set to NULL).
-        _r = _w = _f = &_queue.back ();
-        _c.set (&_queue.back ());
-    }
-
-    //  Following function (write) deliberately copies uninitialised data
-    //  when used with zmq_msg. Initialising the VSM body for
-    //  non-VSM messages won't be good for performance.
-
-#ifdef ZMQ_HAVE_OPENVMS
-#pragma message save
-#pragma message disable(UNINIT)
-#endif
-
-    //  Write an item to the pipe.  Don't flush it yet. If incomplete is
-    //  set to true the item is assumed to be continued by items
-    //  subsequently written to the pipe. Incomplete items are never
-    //  flushed down the stream.
-    void write (const T &value_, bool incomplete_)
-    {
-        //  Place the value to the queue, add new terminator element.
-        _queue.back () = value_;
-        _queue.push ();
-
-        //  Move the "flush up to here" pointer.
-        if (!incomplete_)
-            _f = &_queue.back ();
-    }
-
-#ifdef ZMQ_HAVE_OPENVMS
-#pragma message restore
-#endif
-
-    //  Pop an incomplete item from the pipe. Returns true if such
-    //  item exists, false otherwise.
-    bool unwrite (T *value_)
-    {
-        if (_f == &_queue.back ())
-            return false;
-        _queue.unpush ();
-        *value_ = _queue.back ();
-        return true;
-    }
-
-    //  Flush all the completed items into the pipe. Returns false if
-    //  the reader thread is sleeping. In that case, caller is obliged to
-    //  wake the reader up before using the pipe again.
-    bool flush ()
-    {
-        //  If there are no un-flushed items, do nothing.
-        if (_w == _f)
-            return true;
-
-        //  Try to set 'c' to 'f'.
-        if (_c.cas (_w, _f) != _w) {
-            //  Compare-and-swap was unsuccessful because 'c' is NULL.
-            //  This means that the reader is asleep. Therefore we don't
-            //  care about thread-safeness and update c in non-atomic
-            //  manner. We'll return false to let the caller know
-            //  that reader is sleeping.
-            _c.set (_f);
-            _w = _f;
-            return false;
-        }
-
-        //  Reader is alive. Nothing special to do now. Just move
-        //  the 'first un-flushed item' pointer to 'f'.
-        _w = _f;
-        return true;
-    }
-
-    //  Check whether item is available for reading.
-    bool check_read ()
-    {
-        //  Was the value prefetched already? If so, return.
-        if (&_queue.front () != _r && _r)
-            return true;
-
-        //  There's no prefetched value, so let us prefetch more values.
-        //  Prefetching is to simply retrieve the
-        //  pointer from c in atomic fashion. If there are no
-        //  items to prefetch, set c to NULL (using compare-and-swap).
-        _r = _c.cas (&_queue.front (), NULL);
-
-        //  If there are no elements prefetched, exit.
-        //  During pipe's lifetime r should never be NULL, however,
-        //  it can happen during pipe shutdown when items
-        //  are being deallocated.
-        if (&_queue.front () == _r || !_r)
-            return false;
-
-        //  There was at least one value prefetched.
-        return true;
-    }
-
-    //  Reads an item from the pipe. Returns false if there is no value.
-    //  available.
-    bool read (T *value_)
-    {
-        //  Try to prefetch a value.
-        if (!check_read ())
-            return false;
-
-        //  There was at least one value prefetched.
-        //  Return it to the caller.
-        *value_ = _queue.front ();
-        _queue.pop ();
-        return true;
-    }
-
-    //  Applies the function fn to the first element in the pipe
-    //  and returns the value returned by the fn.
-    //  The pipe mustn't be empty or the function crashes.
-    bool probe (bool (*fn_) (const T &))
-    {
-        const bool rc = check_read ();
-        zmq_assert (rc);
-
-        return (*fn_) (_queue.front ());
-    }
-
-  protected:
-    //  Allocation-efficient queue to store pipe items.
-    //  Front of the queue points to the first prefetched item, back of
-    //  the pipe points to last un-flushed item. Front is used only by
-    //  reader thread, while back is used only by writer thread.
-    yqueue_t<T, N> _queue;
-
-    //  Points to the first un-flushed item. This variable is used
-    //  exclusively by writer thread.
-    T *_w;
-
-    //  Points to the first un-prefetched item. This variable is used
-    //  exclusively by reader thread.
-    T *_r;
-
-    //  Points to the first item to be flushed in the future.
-    T *_f;
-
-    //  The single point of contention between writer and reader thread.
-    //  Points past the last flushed item. If it is NULL,
-    //  reader is asleep. This pointer should be always accessed using
-    //  atomic operations.
-    atomic_ptr_t<T> _c;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (ypipe_t)
-};
-}
-
-#endif
diff --git a/libs/libzmq/src/ypipe_base.hpp b/libs/libzmq/src/ypipe_base.hpp
deleted file mode 100644
index 50a534f..0000000
--- a/libs/libzmq/src/ypipe_base.hpp
+++ /dev/null
@@ -1,55 +0,0 @@
-
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_YPIPE_BASE_HPP_INCLUDED__
-#define __ZMQ_YPIPE_BASE_HPP_INCLUDED__
-
-#include "macros.hpp"
-
-namespace zmq
-{
-// ypipe_base abstracts ypipe and ypipe_conflate specific
-// classes, one is selected according to a the conflate
-// socket option
-
-template <typename T> class ypipe_base_t
-{
-  public:
-    virtual ~ypipe_base_t () ZMQ_DEFAULT;
-    virtual void write (const T &value_, bool incomplete_) = 0;
-    virtual bool unwrite (T *value_) = 0;
-    virtual bool flush () = 0;
-    virtual bool check_read () = 0;
-    virtual bool read (T *value_) = 0;
-    virtual bool probe (bool (*fn_) (const T &)) = 0;
-};
-}
-
-#endif
diff --git a/libs/libzmq/src/ypipe_conflate.hpp b/libs/libzmq/src/ypipe_conflate.hpp
deleted file mode 100644
index 7c96d57..0000000
--- a/libs/libzmq/src/ypipe_conflate.hpp
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_YPIPE_CONFLATE_HPP_INCLUDED__
-#define __ZMQ_YPIPE_CONFLATE_HPP_INCLUDED__
-
-#include "platform.hpp"
-#include "dbuffer.hpp"
-#include "ypipe_base.hpp"
-
-namespace zmq
-{
-//  Adapter for dbuffer, to plug it in instead of a queue for the sake
-//  of implementing the conflate socket option, which, if set, makes
-//  the receiving side to discard all incoming messages but the last one.
-//
-//  reader_awake flag is needed here to mimic ypipe delicate behaviour
-//  around the reader being asleep (see 'c' pointer being NULL in ypipe.hpp)
-
-template <typename T> class ypipe_conflate_t ZMQ_FINAL : public ypipe_base_t<T>
-{
-  public:
-    //  Initialises the pipe.
-    ypipe_conflate_t () : reader_awake (false) {}
-
-    //  Following function (write) deliberately copies uninitialised data
-    //  when used with zmq_msg. Initialising the VSM body for
-    //  non-VSM messages won't be good for performance.
-
-#ifdef ZMQ_HAVE_OPENVMS
-#pragma message save
-#pragma message disable(UNINIT)
-#endif
-    void write (const T &value_, bool incomplete_)
-    {
-        (void) incomplete_;
-
-        dbuffer.write (value_);
-    }
-
-#ifdef ZMQ_HAVE_OPENVMS
-#pragma message restore
-#endif
-
-    // There are no incomplete items for conflate ypipe
-    bool unwrite (T *) { return false; }
-
-    //  Flush is no-op for conflate ypipe. Reader asleep behaviour
-    //  is as of the usual ypipe.
-    //  Returns false if the reader thread is sleeping. In that case,
-    //  caller is obliged to wake the reader up before using the pipe again.
-    bool flush () { return reader_awake; }
-
-    //  Check whether item is available for reading.
-    bool check_read ()
-    {
-        const bool res = dbuffer.check_read ();
-        if (!res)
-            reader_awake = false;
-
-        return res;
-    }
-
-    //  Reads an item from the pipe. Returns false if there is no value.
-    //  available.
-    bool read (T *value_)
-    {
-        if (!check_read ())
-            return false;
-
-        return dbuffer.read (value_);
-    }
-
-    //  Applies the function fn to the first element in the pipe
-    //  and returns the value returned by the fn.
-    //  The pipe mustn't be empty or the function crashes.
-    bool probe (bool (*fn_) (const T &)) { return dbuffer.probe (fn_); }
-
-  protected:
-    dbuffer_t<T> dbuffer;
-    bool reader_awake;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (ypipe_conflate_t)
-};
-}
-
-#endif
diff --git a/libs/libzmq/src/yqueue.hpp b/libs/libzmq/src/yqueue.hpp
deleted file mode 100755
index 0780ea7..0000000
--- a/libs/libzmq/src/yqueue.hpp
+++ /dev/null
@@ -1,215 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_YQUEUE_HPP_INCLUDED__
-#define __ZMQ_YQUEUE_HPP_INCLUDED__
-
-#include <stdlib.h>
-#include <stddef.h>
-
-#include "err.hpp"
-#include "atomic_ptr.hpp"
-#include "platform.hpp"
-
-namespace zmq
-{
-//  yqueue is an efficient queue implementation. The main goal is
-//  to minimise number of allocations/deallocations needed. Thus yqueue
-//  allocates/deallocates elements in batches of N.
-//
-//  yqueue allows one thread to use push/back function and another one
-//  to use pop/front functions. However, user must ensure that there's no
-//  pop on the empty queue and that both threads don't access the same
-//  element in unsynchronised manner.
-//
-//  T is the type of the object in the queue.
-//  N is granularity of the queue (how many pushes have to be done till
-//  actual memory allocation is required).
-#if defined HAVE_POSIX_MEMALIGN
-// ALIGN is the memory alignment size to use in the case where we have
-// posix_memalign available. Default value is 64, this alignment will
-// prevent two queue chunks from occupying the same CPU cache line on
-// architectures where cache lines are <= 64 bytes (e.g. most things
-// except POWER). It is detected at build time to try to account for other
-// platforms like POWER and s390x.
-template <typename T, int N, size_t ALIGN = ZMQ_CACHELINE_SIZE> class yqueue_t
-#else
-template <typename T, int N> class yqueue_t
-#endif
-{
-  public:
-    //  Create the queue.
-    inline yqueue_t ()
-    {
-        _begin_chunk = allocate_chunk ();
-        alloc_assert (_begin_chunk);
-        _begin_pos = 0;
-        _back_chunk = NULL;
-        _back_pos = 0;
-        _end_chunk = _begin_chunk;
-        _end_pos = 0;
-    }
-
-    //  Destroy the queue.
-    inline ~yqueue_t ()
-    {
-        while (true) {
-            if (_begin_chunk == _end_chunk) {
-                free (_begin_chunk);
-                break;
-            }
-            chunk_t *o = _begin_chunk;
-            _begin_chunk = _begin_chunk->next;
-            free (o);
-        }
-
-        chunk_t *sc = _spare_chunk.xchg (NULL);
-        free (sc);
-    }
-
-    //  Returns reference to the front element of the queue.
-    //  If the queue is empty, behaviour is undefined.
-    inline T &front () { return _begin_chunk->values[_begin_pos]; }
-
-    //  Returns reference to the back element of the queue.
-    //  If the queue is empty, behaviour is undefined.
-    inline T &back () { return _back_chunk->values[_back_pos]; }
-
-    //  Adds an element to the back end of the queue.
-    inline void push ()
-    {
-        _back_chunk = _end_chunk;
-        _back_pos = _end_pos;
-
-        if (++_end_pos != N)
-            return;
-
-        chunk_t *sc = _spare_chunk.xchg (NULL);
-        if (sc) {
-            _end_chunk->next = sc;
-            sc->prev = _end_chunk;
-        } else {
-            _end_chunk->next = allocate_chunk ();
-            alloc_assert (_end_chunk->next);
-            _end_chunk->next->prev = _end_chunk;
-        }
-        _end_chunk = _end_chunk->next;
-        _end_pos = 0;
-    }
-
-    //  Removes element from the back end of the queue. In other words
-    //  it rollbacks last push to the queue. Take care: Caller is
-    //  responsible for destroying the object being unpushed.
-    //  The caller must also guarantee that the queue isn't empty when
-    //  unpush is called. It cannot be done automatically as the read
-    //  side of the queue can be managed by different, completely
-    //  unsynchronised thread.
-    inline void unpush ()
-    {
-        //  First, move 'back' one position backwards.
-        if (_back_pos)
-            --_back_pos;
-        else {
-            _back_pos = N - 1;
-            _back_chunk = _back_chunk->prev;
-        }
-
-        //  Now, move 'end' position backwards. Note that obsolete end chunk
-        //  is not used as a spare chunk. The analysis shows that doing so
-        //  would require free and atomic operation per chunk deallocated
-        //  instead of a simple free.
-        if (_end_pos)
-            --_end_pos;
-        else {
-            _end_pos = N - 1;
-            _end_chunk = _end_chunk->prev;
-            free (_end_chunk->next);
-            _end_chunk->next = NULL;
-        }
-    }
-
-    //  Removes an element from the front end of the queue.
-    inline void pop ()
-    {
-        if (++_begin_pos == N) {
-            chunk_t *o = _begin_chunk;
-            _begin_chunk = _begin_chunk->next;
-            _begin_chunk->prev = NULL;
-            _begin_pos = 0;
-
-            //  'o' has been more recently used than _spare_chunk,
-            //  so for cache reasons we'll get rid of the spare and
-            //  use 'o' as the spare.
-            chunk_t *cs = _spare_chunk.xchg (o);
-            free (cs);
-        }
-    }
-
-  private:
-    //  Individual memory chunk to hold N elements.
-    struct chunk_t
-    {
-        T values[N];
-        chunk_t *prev;
-        chunk_t *next;
-    };
-
-    static inline chunk_t *allocate_chunk ()
-    {
-#if defined HAVE_POSIX_MEMALIGN
-        void *pv;
-        if (posix_memalign (&pv, ALIGN, sizeof (chunk_t)) == 0)
-            return (chunk_t *) pv;
-        return NULL;
-#else
-        return static_cast<chunk_t *> (malloc (sizeof (chunk_t)));
-#endif
-    }
-
-    //  Back position may point to invalid memory if the queue is empty,
-    //  while begin & end positions are always valid. Begin position is
-    //  accessed exclusively be queue reader (front/pop), while back and
-    //  end positions are accessed exclusively by queue writer (back/push).
-    chunk_t *_begin_chunk;
-    int _begin_pos;
-    chunk_t *_back_chunk;
-    int _back_pos;
-    chunk_t *_end_chunk;
-    int _end_pos;
-
-    //  People are likely to produce and consume at similar rates.  In
-    //  this scenario holding onto the most recently freed chunk saves
-    //  us from having to call malloc/free.
-    atomic_ptr_t<chunk_t> _spare_chunk;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (yqueue_t)
-};
-}
-
-#endif
diff --git a/libs/libzmq/src/zap_client.cpp b/libs/libzmq/src/zap_client.cpp
deleted file mode 100644
index 1eba76b..0000000
--- a/libs/libzmq/src/zap_client.cpp
+++ /dev/null
@@ -1,313 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-
-#include "zap_client.hpp"
-#include "msg.hpp"
-#include "session_base.hpp"
-
-namespace zmq
-{
-const char zap_version[] = "1.0";
-const size_t zap_version_len = sizeof (zap_version) - 1;
-
-const char id[] = "1";
-const size_t id_len = sizeof (id) - 1;
-
-zap_client_t::zap_client_t (session_base_t *const session_,
-                            const std::string &peer_address_,
-                            const options_t &options_) :
-    mechanism_base_t (session_, options_), peer_address (peer_address_)
-{
-}
-
-void zap_client_t::send_zap_request (const char *mechanism_,
-                                     size_t mechanism_length_,
-                                     const uint8_t *credentials_,
-                                     size_t credentials_size_)
-{
-    send_zap_request (mechanism_, mechanism_length_, &credentials_,
-                      &credentials_size_, 1);
-}
-
-void zap_client_t::send_zap_request (const char *mechanism_,
-                                     size_t mechanism_length_,
-                                     const uint8_t **credentials_,
-                                     size_t *credentials_sizes_,
-                                     size_t credentials_count_)
-{
-    // write_zap_msg cannot fail. It could only fail if the HWM was exceeded,
-    // but on the ZAP socket, the HWM is disabled.
-
-    int rc;
-    msg_t msg;
-
-    //  Address delimiter frame
-    rc = msg.init ();
-    errno_assert (rc == 0);
-    msg.set_flags (msg_t::more);
-    rc = session->write_zap_msg (&msg);
-    errno_assert (rc == 0);
-
-    //  Version frame
-    rc = msg.init_size (zap_version_len);
-    errno_assert (rc == 0);
-    memcpy (msg.data (), zap_version, zap_version_len);
-    msg.set_flags (msg_t::more);
-    rc = session->write_zap_msg (&msg);
-    errno_assert (rc == 0);
-
-    //  Request ID frame
-    rc = msg.init_size (id_len);
-    errno_assert (rc == 0);
-    memcpy (msg.data (), id, id_len);
-    msg.set_flags (msg_t::more);
-    rc = session->write_zap_msg (&msg);
-    errno_assert (rc == 0);
-
-    //  Domain frame
-    rc = msg.init_size (options.zap_domain.length ());
-    errno_assert (rc == 0);
-    memcpy (msg.data (), options.zap_domain.c_str (),
-            options.zap_domain.length ());
-    msg.set_flags (msg_t::more);
-    rc = session->write_zap_msg (&msg);
-    errno_assert (rc == 0);
-
-    //  Address frame
-    rc = msg.init_size (peer_address.length ());
-    errno_assert (rc == 0);
-    memcpy (msg.data (), peer_address.c_str (), peer_address.length ());
-    msg.set_flags (msg_t::more);
-    rc = session->write_zap_msg (&msg);
-    errno_assert (rc == 0);
-
-    //  Routing id frame
-    rc = msg.init_size (options.routing_id_size);
-    errno_assert (rc == 0);
-    memcpy (msg.data (), options.routing_id, options.routing_id_size);
-    msg.set_flags (msg_t::more);
-    rc = session->write_zap_msg (&msg);
-    errno_assert (rc == 0);
-
-    //  Mechanism frame
-    rc = msg.init_size (mechanism_length_);
-    errno_assert (rc == 0);
-    memcpy (msg.data (), mechanism_, mechanism_length_);
-    if (credentials_count_)
-        msg.set_flags (msg_t::more);
-    rc = session->write_zap_msg (&msg);
-    errno_assert (rc == 0);
-
-    //  Credentials frames
-    for (size_t i = 0; i < credentials_count_; ++i) {
-        rc = msg.init_size (credentials_sizes_[i]);
-        errno_assert (rc == 0);
-        if (i < credentials_count_ - 1)
-            msg.set_flags (msg_t::more);
-        memcpy (msg.data (), credentials_[i], credentials_sizes_[i]);
-        rc = session->write_zap_msg (&msg);
-        errno_assert (rc == 0);
-    }
-}
-
-int zap_client_t::receive_and_process_zap_reply ()
-{
-    int rc = 0;
-    const size_t zap_reply_frame_count = 7;
-    msg_t msg[zap_reply_frame_count];
-
-    //  Initialize all reply frames
-    for (size_t i = 0; i < zap_reply_frame_count; i++) {
-        rc = msg[i].init ();
-        errno_assert (rc == 0);
-    }
-
-    for (size_t i = 0; i < zap_reply_frame_count; i++) {
-        rc = session->read_zap_msg (&msg[i]);
-        if (rc == -1) {
-            if (errno == EAGAIN) {
-                return 1;
-            }
-            return close_and_return (msg, -1);
-        }
-        if ((msg[i].flags () & msg_t::more)
-            == (i < zap_reply_frame_count - 1 ? 0 : msg_t::more)) {
-            session->get_socket ()->event_handshake_failed_protocol (
-              session->get_endpoint (), ZMQ_PROTOCOL_ERROR_ZAP_MALFORMED_REPLY);
-            errno = EPROTO;
-            return close_and_return (msg, -1);
-        }
-    }
-
-    //  Address delimiter frame
-    if (msg[0].size () > 0) {
-        //  TODO can a ZAP handler produce such a message at all?
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (), ZMQ_PROTOCOL_ERROR_ZAP_UNSPECIFIED);
-        errno = EPROTO;
-        return close_and_return (msg, -1);
-    }
-
-    //  Version frame
-    if (msg[1].size () != zap_version_len
-        || memcmp (msg[1].data (), zap_version, zap_version_len)) {
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (), ZMQ_PROTOCOL_ERROR_ZAP_BAD_VERSION);
-        errno = EPROTO;
-        return close_and_return (msg, -1);
-    }
-
-    //  Request id frame
-    if (msg[2].size () != id_len || memcmp (msg[2].data (), id, id_len)) {
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (), ZMQ_PROTOCOL_ERROR_ZAP_BAD_REQUEST_ID);
-        errno = EPROTO;
-        return close_and_return (msg, -1);
-    }
-
-    //  Status code frame, only 200, 300, 400 and 500 are valid status codes
-    const char *status_code_data = static_cast<const char *> (msg[3].data ());
-    if (msg[3].size () != 3 || status_code_data[0] < '2'
-        || status_code_data[0] > '5' || status_code_data[1] != '0'
-        || status_code_data[2] != '0') {
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (), ZMQ_PROTOCOL_ERROR_ZAP_INVALID_STATUS_CODE);
-        errno = EPROTO;
-        return close_and_return (msg, -1);
-    }
-
-    //  Save status code
-    status_code.assign (static_cast<char *> (msg[3].data ()), 3);
-
-    //  Save user id
-    set_user_id (msg[5].data (), msg[5].size ());
-
-    //  Process metadata frame
-    rc = parse_metadata (static_cast<const unsigned char *> (msg[6].data ()),
-                         msg[6].size (), true);
-
-    if (rc != 0) {
-        session->get_socket ()->event_handshake_failed_protocol (
-          session->get_endpoint (), ZMQ_PROTOCOL_ERROR_ZAP_INVALID_METADATA);
-        errno = EPROTO;
-        return close_and_return (msg, -1);
-    }
-
-    //  Close all reply frames
-    for (size_t i = 0; i < zap_reply_frame_count; i++) {
-        const int rc2 = msg[i].close ();
-        errno_assert (rc2 == 0);
-    }
-
-    handle_zap_status_code ();
-
-    return 0;
-}
-
-void zap_client_t::handle_zap_status_code ()
-{
-    //  we can assume here that status_code is a valid ZAP status code,
-    //  i.e. 200, 300, 400 or 500
-    int status_code_numeric = 0;
-    switch (status_code[0]) {
-        case '2':
-            return;
-        case '3':
-            status_code_numeric = 300;
-            break;
-        case '4':
-            status_code_numeric = 400;
-            break;
-        case '5':
-            status_code_numeric = 500;
-            break;
-    }
-
-    session->get_socket ()->event_handshake_failed_auth (
-      session->get_endpoint (), status_code_numeric);
-}
-
-zap_client_common_handshake_t::zap_client_common_handshake_t (
-  session_base_t *const session_,
-  const std::string &peer_address_,
-  const options_t &options_,
-  state_t zap_reply_ok_state_) :
-    mechanism_base_t (session_, options_),
-    zap_client_t (session_, peer_address_, options_),
-    state (waiting_for_hello),
-    _zap_reply_ok_state (zap_reply_ok_state_)
-{
-}
-
-zmq::mechanism_t::status_t zap_client_common_handshake_t::status () const
-{
-    if (state == ready)
-        return mechanism_t::ready;
-    if (state == error_sent)
-        return mechanism_t::error;
-
-    return mechanism_t::handshaking;
-}
-
-int zap_client_common_handshake_t::zap_msg_available ()
-{
-    zmq_assert (state == waiting_for_zap_reply);
-    return receive_and_process_zap_reply () == -1 ? -1 : 0;
-}
-
-void zap_client_common_handshake_t::handle_zap_status_code ()
-{
-    zap_client_t::handle_zap_status_code ();
-
-    //  we can assume here that status_code is a valid ZAP status code,
-    //  i.e. 200, 300, 400 or 500
-    switch (status_code[0]) {
-        case '2':
-            state = _zap_reply_ok_state;
-            break;
-        case '3':
-            //  a 300 error code (temporary failure)
-            //  should NOT result in an ERROR message, but instead the
-            //  client should be silently disconnected (see CURVEZMQ RFC)
-            //  therefore, go immediately to state error_sent
-            state = error_sent;
-            break;
-        default:
-            state = sending_error;
-    }
-}
-
-int zap_client_common_handshake_t::receive_and_process_zap_reply ()
-{
-    zmq_assert (state == waiting_for_zap_reply);
-    return zap_client_t::receive_and_process_zap_reply ();
-}
-}
diff --git a/libs/libzmq/src/zap_client.hpp b/libs/libzmq/src/zap_client.hpp
deleted file mode 100644
index 970a037..0000000
--- a/libs/libzmq/src/zap_client.hpp
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_ZAP_CLIENT_HPP_INCLUDED__
-#define __ZMQ_ZAP_CLIENT_HPP_INCLUDED__
-
-#include "mechanism_base.hpp"
-
-namespace zmq
-{
-class zap_client_t : public virtual mechanism_base_t
-{
-  public:
-    zap_client_t (session_base_t *session_,
-                  const std::string &peer_address_,
-                  const options_t &options_);
-
-    void send_zap_request (const char *mechanism_,
-                           size_t mechanism_length_,
-                           const uint8_t *credentials_,
-                           size_t credentials_size_);
-
-    void send_zap_request (const char *mechanism_,
-                           size_t mechanism_length_,
-                           const uint8_t **credentials_,
-                           size_t *credentials_sizes_,
-                           size_t credentials_count_);
-
-    virtual int receive_and_process_zap_reply ();
-    virtual void handle_zap_status_code ();
-
-  protected:
-    const std::string peer_address;
-
-    //  Status code as received from ZAP handler
-    std::string status_code;
-};
-
-class zap_client_common_handshake_t : public zap_client_t
-{
-  protected:
-    enum state_t
-    {
-        waiting_for_hello,
-        sending_welcome,
-        waiting_for_initiate,
-        waiting_for_zap_reply,
-        sending_ready,
-        sending_error,
-        error_sent,
-        ready
-    };
-
-    zap_client_common_handshake_t (session_base_t *session_,
-                                   const std::string &peer_address_,
-                                   const options_t &options_,
-                                   state_t zap_reply_ok_state_);
-
-    //  methods from mechanism_t
-    status_t status () const ZMQ_FINAL;
-    int zap_msg_available () ZMQ_FINAL;
-
-    //  zap_client_t methods
-    int receive_and_process_zap_reply () ZMQ_FINAL;
-    void handle_zap_status_code () ZMQ_FINAL;
-
-    //  Current FSM state
-    state_t state;
-
-  private:
-    const state_t _zap_reply_ok_state;
-};
-}
-
-#endif
diff --git a/libs/libzmq/src/zmq.cpp b/libs/libzmq/src/zmq.cpp
deleted file mode 100644
index 1733caf..0000000
--- a/libs/libzmq/src/zmq.cpp
+++ /dev/null
@@ -1,1841 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-// "Tell them I was a writer.
-//  A maker of software.
-//  A humanist. A father.
-//  And many things.
-//  But above all, a writer.
-//  Thank You. :)"
-//  - Pieter Hintjens
-
-#include "precompiled.hpp"
-#define ZMQ_TYPE_UNSAFE
-
-#include "macros.hpp"
-#include "poller.hpp"
-#include "peer.hpp"
-
-#if !defined ZMQ_HAVE_POLLER
-//  On AIX platform, poll.h has to be included first to get consistent
-//  definition of pollfd structure (AIX uses 'reqevents' and 'retnevents'
-//  instead of 'events' and 'revents' and defines macros to map from POSIX-y
-//  names to AIX-specific names).
-#if defined ZMQ_POLL_BASED_ON_POLL && !defined ZMQ_HAVE_WINDOWS
-#include <poll.h>
-#endif
-
-#include "polling_util.hpp"
-#endif
-
-// TODO: determine if this is an issue, since zmq.h is being loaded from pch.
-// zmq.h must be included *after* poll.h for AIX to build properly
-//#include "../include/zmq.h"
-
-#if !defined ZMQ_HAVE_WINDOWS
-#include <unistd.h>
-#ifdef ZMQ_HAVE_VXWORKS
-#include <strings.h>
-#endif
-#endif
-
-// XSI vector I/O
-#if defined ZMQ_HAVE_UIO
-#include <sys/uio.h>
-#else
-struct iovec
-{
-    void *iov_base;
-    size_t iov_len;
-};
-#endif
-
-#include <string.h>
-#include <stdlib.h>
-#include <new>
-#include <climits>
-
-#include "proxy.hpp"
-#include "socket_base.hpp"
-#include "stdint.hpp"
-#include "config.hpp"
-#include "likely.hpp"
-#include "clock.hpp"
-#include "ctx.hpp"
-#include "err.hpp"
-#include "msg.hpp"
-#include "fd.hpp"
-#include "metadata.hpp"
-#include "socket_poller.hpp"
-#include "timers.hpp"
-#include "ip.hpp"
-#include "address.hpp"
-
-#ifdef ZMQ_HAVE_PPOLL
-#include "polling_util.hpp"
-#include <sys/select.h>
-#endif
-
-#if defined ZMQ_HAVE_OPENPGM
-#define __PGM_WININT_H__
-#include <pgm/pgm.h>
-#endif
-
-//  Compile time check whether msg_t fits into zmq_msg_t.
-typedef char
-  check_msg_t_size[sizeof (zmq::msg_t) == sizeof (zmq_msg_t) ? 1 : -1];
-
-
-void zmq_version (int *major_, int *minor_, int *patch_)
-{
-    *major_ = ZMQ_VERSION_MAJOR;
-    *minor_ = ZMQ_VERSION_MINOR;
-    *patch_ = ZMQ_VERSION_PATCH;
-}
-
-
-const char *zmq_strerror (int errnum_)
-{
-    return zmq::errno_to_string (errnum_);
-}
-
-int zmq_errno (void)
-{
-    return errno;
-}
-
-
-//  New context API
-
-void *zmq_ctx_new (void)
-{
-    //  We do this before the ctx constructor since its embedded mailbox_t
-    //  object needs the network to be up and running (at least on Windows).
-    if (!zmq::initialize_network ()) {
-        return NULL;
-    }
-
-    //  Create 0MQ context.
-    zmq::ctx_t *ctx = new (std::nothrow) zmq::ctx_t;
-    if (ctx) {
-        if (!ctx->valid ()) {
-            delete ctx;
-            return NULL;
-        }
-    }
-    return ctx;
-}
-
-int zmq_ctx_term (void *ctx_)
-{
-    if (!ctx_ || !(static_cast<zmq::ctx_t *> (ctx_))->check_tag ()) {
-        errno = EFAULT;
-        return -1;
-    }
-
-    const int rc = (static_cast<zmq::ctx_t *> (ctx_))->terminate ();
-    const int en = errno;
-
-    //  Shut down only if termination was not interrupted by a signal.
-    if (!rc || en != EINTR) {
-        zmq::shutdown_network ();
-    }
-
-    errno = en;
-    return rc;
-}
-
-int zmq_ctx_shutdown (void *ctx_)
-{
-    if (!ctx_ || !(static_cast<zmq::ctx_t *> (ctx_))->check_tag ()) {
-        errno = EFAULT;
-        return -1;
-    }
-    return (static_cast<zmq::ctx_t *> (ctx_))->shutdown ();
-}
-
-int zmq_ctx_set (void *ctx_, int option_, int optval_)
-{
-    return zmq_ctx_set_ext (ctx_, option_, &optval_, sizeof (int));
-}
-
-int zmq_ctx_set_ext (void *ctx_,
-                     int option_,
-                     const void *optval_,
-                     size_t optvallen_)
-{
-    if (!ctx_ || !(static_cast<zmq::ctx_t *> (ctx_))->check_tag ()) {
-        errno = EFAULT;
-        return -1;
-    }
-    return (static_cast<zmq::ctx_t *> (ctx_))
-      ->set (option_, optval_, optvallen_);
-}
-
-int zmq_ctx_get (void *ctx_, int option_)
-{
-    if (!ctx_ || !(static_cast<zmq::ctx_t *> (ctx_))->check_tag ()) {
-        errno = EFAULT;
-        return -1;
-    }
-    return (static_cast<zmq::ctx_t *> (ctx_))->get (option_);
-}
-
-int zmq_ctx_get_ext (void *ctx_, int option_, void *optval_, size_t *optvallen_)
-{
-    if (!ctx_ || !(static_cast<zmq::ctx_t *> (ctx_))->check_tag ()) {
-        errno = EFAULT;
-        return -1;
-    }
-    return (static_cast<zmq::ctx_t *> (ctx_))
-      ->get (option_, optval_, optvallen_);
-}
-
-
-//  Stable/legacy context API
-
-void *zmq_init (int io_threads_)
-{
-    if (io_threads_ >= 0) {
-        void *ctx = zmq_ctx_new ();
-        zmq_ctx_set (ctx, ZMQ_IO_THREADS, io_threads_);
-        return ctx;
-    }
-    errno = EINVAL;
-    return NULL;
-}
-
-int zmq_term (void *ctx_)
-{
-    return zmq_ctx_term (ctx_);
-}
-
-int zmq_ctx_destroy (void *ctx_)
-{
-    return zmq_ctx_term (ctx_);
-}
-
-
-// Sockets
-
-static zmq::socket_base_t *as_socket_base_t (void *s_)
-{
-    zmq::socket_base_t *s = static_cast<zmq::socket_base_t *> (s_);
-    if (!s_ || !s->check_tag ()) {
-        errno = ENOTSOCK;
-        return NULL;
-    }
-    return s;
-}
-
-void *zmq_socket (void *ctx_, int type_)
-{
-    if (!ctx_ || !(static_cast<zmq::ctx_t *> (ctx_))->check_tag ()) {
-        errno = EFAULT;
-        return NULL;
-    }
-    zmq::ctx_t *ctx = static_cast<zmq::ctx_t *> (ctx_);
-    zmq::socket_base_t *s = ctx->create_socket (type_);
-    return static_cast<void *> (s);
-}
-
-int zmq_close (void *s_)
-{
-    zmq::socket_base_t *s = as_socket_base_t (s_);
-    if (!s)
-        return -1;
-    s->close ();
-    return 0;
-}
-
-int zmq_setsockopt (void *s_,
-                    int option_,
-                    const void *optval_,
-                    size_t optvallen_)
-{
-    zmq::socket_base_t *s = as_socket_base_t (s_);
-    if (!s)
-        return -1;
-    return s->setsockopt (option_, optval_, optvallen_);
-}
-
-int zmq_getsockopt (void *s_, int option_, void *optval_, size_t *optvallen_)
-{
-    zmq::socket_base_t *s = as_socket_base_t (s_);
-    if (!s)
-        return -1;
-    return s->getsockopt (option_, optval_, optvallen_);
-}
-
-int zmq_socket_monitor_versioned (
-  void *s_, const char *addr_, uint64_t events_, int event_version_, int type_)
-{
-    zmq::socket_base_t *s = as_socket_base_t (s_);
-    if (!s)
-        return -1;
-    return s->monitor (addr_, events_, event_version_, type_);
-}
-
-int zmq_socket_monitor (void *s_, const char *addr_, int events_)
-{
-    return zmq_socket_monitor_versioned (s_, addr_, events_, 1, ZMQ_PAIR);
-}
-
-int zmq_join (void *s_, const char *group_)
-{
-    zmq::socket_base_t *s = as_socket_base_t (s_);
-    if (!s)
-        return -1;
-    return s->join (group_);
-}
-
-int zmq_leave (void *s_, const char *group_)
-{
-    zmq::socket_base_t *s = as_socket_base_t (s_);
-    if (!s)
-        return -1;
-    return s->leave (group_);
-}
-
-int zmq_bind (void *s_, const char *addr_)
-{
-    zmq::socket_base_t *s = as_socket_base_t (s_);
-    if (!s)
-        return -1;
-    return s->bind (addr_);
-}
-
-int zmq_connect (void *s_, const char *addr_)
-{
-    zmq::socket_base_t *s = as_socket_base_t (s_);
-    if (!s)
-        return -1;
-    return s->connect (addr_);
-}
-
-uint32_t zmq_connect_peer (void *s_, const char *addr_)
-{
-    zmq::peer_t *s = static_cast<zmq::peer_t *> (s_);
-    if (!s_ || !s->check_tag ()) {
-        errno = ENOTSOCK;
-        return 0;
-    }
-
-    int socket_type;
-    size_t socket_type_size = sizeof (socket_type);
-    if (s->getsockopt (ZMQ_TYPE, &socket_type, &socket_type_size) != 0)
-        return 0;
-
-    if (socket_type != ZMQ_PEER) {
-        errno = ENOTSUP;
-        return 0;
-    }
-
-    return s->connect_peer (addr_);
-}
-
-
-int zmq_unbind (void *s_, const char *addr_)
-{
-    zmq::socket_base_t *s = as_socket_base_t (s_);
-    if (!s)
-        return -1;
-    return s->term_endpoint (addr_);
-}
-
-int zmq_disconnect (void *s_, const char *addr_)
-{
-    zmq::socket_base_t *s = as_socket_base_t (s_);
-    if (!s)
-        return -1;
-    return s->term_endpoint (addr_);
-}
-
-// Sending functions.
-
-static inline int
-s_sendmsg (zmq::socket_base_t *s_, zmq_msg_t *msg_, int flags_)
-{
-    size_t sz = zmq_msg_size (msg_);
-    const int rc = s_->send (reinterpret_cast<zmq::msg_t *> (msg_), flags_);
-    if (unlikely (rc < 0))
-        return -1;
-
-    //  This is what I'd like to do, my C++ fu is too weak -- PH 2016/02/09
-    //  int max_msgsz = s_->parent->get (ZMQ_MAX_MSGSZ);
-    size_t max_msgsz = INT_MAX;
-
-    //  Truncate returned size to INT_MAX to avoid overflow to negative values
-    return static_cast<int> (sz < max_msgsz ? sz : max_msgsz);
-}
-
-/*  To be deprecated once zmq_msg_send() is stable                           */
-int zmq_sendmsg (void *s_, zmq_msg_t *msg_, int flags_)
-{
-    return zmq_msg_send (msg_, s_, flags_);
-}
-
-int zmq_send (void *s_, const void *buf_, size_t len_, int flags_)
-{
-    zmq::socket_base_t *s = as_socket_base_t (s_);
-    if (!s)
-        return -1;
-    zmq_msg_t msg;
-    int rc = zmq_msg_init_buffer (&msg, buf_, len_);
-    if (unlikely (rc < 0))
-        return -1;
-
-    rc = s_sendmsg (s, &msg, flags_);
-    if (unlikely (rc < 0)) {
-        const int err = errno;
-        const int rc2 = zmq_msg_close (&msg);
-        errno_assert (rc2 == 0);
-        errno = err;
-        return -1;
-    }
-    //  Note the optimisation here. We don't close the msg object as it is
-    //  empty anyway. This may change when implementation of zmq_msg_t changes.
-    return rc;
-}
-
-int zmq_send_const (void *s_, const void *buf_, size_t len_, int flags_)
-{
-    zmq::socket_base_t *s = as_socket_base_t (s_);
-    if (!s)
-        return -1;
-    zmq_msg_t msg;
-    int rc =
-      zmq_msg_init_data (&msg, const_cast<void *> (buf_), len_, NULL, NULL);
-    if (rc != 0)
-        return -1;
-
-    rc = s_sendmsg (s, &msg, flags_);
-    if (unlikely (rc < 0)) {
-        const int err = errno;
-        const int rc2 = zmq_msg_close (&msg);
-        errno_assert (rc2 == 0);
-        errno = err;
-        return -1;
-    }
-    //  Note the optimisation here. We don't close the msg object as it is
-    //  empty anyway. This may change when implementation of zmq_msg_t changes.
-    return rc;
-}
-
-
-// Send multiple messages.
-// TODO: this function has no man page
-//
-// If flag bit ZMQ_SNDMORE is set the vector is treated as
-// a single multi-part message, i.e. the last message has
-// ZMQ_SNDMORE bit switched off.
-//
-int zmq_sendiov (void *s_, iovec *a_, size_t count_, int flags_)
-{
-    zmq::socket_base_t *s = as_socket_base_t (s_);
-    if (!s)
-        return -1;
-    if (unlikely (count_ <= 0 || !a_)) {
-        errno = EINVAL;
-        return -1;
-    }
-
-    int rc = 0;
-    zmq_msg_t msg;
-
-    for (size_t i = 0; i < count_; ++i) {
-        rc = zmq_msg_init_size (&msg, a_[i].iov_len);
-        if (rc != 0) {
-            rc = -1;
-            break;
-        }
-        memcpy (zmq_msg_data (&msg), a_[i].iov_base, a_[i].iov_len);
-        if (i == count_ - 1)
-            flags_ = flags_ & ~ZMQ_SNDMORE;
-        rc = s_sendmsg (s, &msg, flags_);
-        if (unlikely (rc < 0)) {
-            const int err = errno;
-            const int rc2 = zmq_msg_close (&msg);
-            errno_assert (rc2 == 0);
-            errno = err;
-            rc = -1;
-            break;
-        }
-    }
-    return rc;
-}
-
-// Receiving functions.
-
-static int s_recvmsg (zmq::socket_base_t *s_, zmq_msg_t *msg_, int flags_)
-{
-    const int rc = s_->recv (reinterpret_cast<zmq::msg_t *> (msg_), flags_);
-    if (unlikely (rc < 0))
-        return -1;
-
-    //  Truncate returned size to INT_MAX to avoid overflow to negative values
-    const size_t sz = zmq_msg_size (msg_);
-    return static_cast<int> (sz < INT_MAX ? sz : INT_MAX);
-}
-
-/*  To be deprecated once zmq_msg_recv() is stable                           */
-int zmq_recvmsg (void *s_, zmq_msg_t *msg_, int flags_)
-{
-    return zmq_msg_recv (msg_, s_, flags_);
-}
-
-
-int zmq_recv (void *s_, void *buf_, size_t len_, int flags_)
-{
-    zmq::socket_base_t *s = as_socket_base_t (s_);
-    if (!s)
-        return -1;
-    zmq_msg_t msg;
-    int rc = zmq_msg_init (&msg);
-    errno_assert (rc == 0);
-
-    const int nbytes = s_recvmsg (s, &msg, flags_);
-    if (unlikely (nbytes < 0)) {
-        const int err = errno;
-        rc = zmq_msg_close (&msg);
-        errno_assert (rc == 0);
-        errno = err;
-        return -1;
-    }
-
-    //  An oversized message is silently truncated.
-    const size_t to_copy = size_t (nbytes) < len_ ? size_t (nbytes) : len_;
-
-    //  We explicitly allow a null buffer argument if len is zero
-    if (to_copy) {
-        assert (buf_);
-        memcpy (buf_, zmq_msg_data (&msg), to_copy);
-    }
-    rc = zmq_msg_close (&msg);
-    errno_assert (rc == 0);
-
-    return nbytes;
-}
-
-// Receive a multi-part message
-//
-// Receives up to *count_ parts of a multi-part message.
-// Sets *count_ to the actual number of parts read.
-// ZMQ_RCVMORE is set to indicate if a complete multi-part message was read.
-// Returns number of message parts read, or -1 on error.
-//
-// Note: even if -1 is returned, some parts of the message
-// may have been read. Therefore the client must consult
-// *count_ to retrieve message parts successfully read,
-// even if -1 is returned.
-//
-// The iov_base* buffers of each iovec *a_ filled in by this
-// function may be freed using free().
-// TODO: this function has no man page
-//
-int zmq_recviov (void *s_, iovec *a_, size_t *count_, int flags_)
-{
-    zmq::socket_base_t *s = as_socket_base_t (s_);
-    if (!s)
-        return -1;
-    if (unlikely (!count_ || *count_ <= 0 || !a_)) {
-        errno = EINVAL;
-        return -1;
-    }
-
-    const size_t count = *count_;
-    int nread = 0;
-    bool recvmore = true;
-
-    *count_ = 0;
-
-    for (size_t i = 0; recvmore && i < count; ++i) {
-        zmq_msg_t msg;
-        int rc = zmq_msg_init (&msg);
-        errno_assert (rc == 0);
-
-        const int nbytes = s_recvmsg (s, &msg, flags_);
-        if (unlikely (nbytes < 0)) {
-            const int err = errno;
-            rc = zmq_msg_close (&msg);
-            errno_assert (rc == 0);
-            errno = err;
-            nread = -1;
-            break;
-        }
-
-        a_[i].iov_len = zmq_msg_size (&msg);
-        a_[i].iov_base = static_cast<char *> (malloc (a_[i].iov_len));
-        if (unlikely (!a_[i].iov_base)) {
-            errno = ENOMEM;
-            return -1;
-        }
-        memcpy (a_[i].iov_base, static_cast<char *> (zmq_msg_data (&msg)),
-                a_[i].iov_len);
-        // Assume zmq_socket ZMQ_RVCMORE is properly set.
-        const zmq::msg_t *p_msg = reinterpret_cast<const zmq::msg_t *> (&msg);
-        recvmore = p_msg->flags () & zmq::msg_t::more;
-        rc = zmq_msg_close (&msg);
-        errno_assert (rc == 0);
-        ++*count_;
-        ++nread;
-    }
-    return nread;
-}
-
-// Message manipulators.
-
-int zmq_msg_init (zmq_msg_t *msg_)
-{
-    return (reinterpret_cast<zmq::msg_t *> (msg_))->init ();
-}
-
-int zmq_msg_init_size (zmq_msg_t *msg_, size_t size_)
-{
-    return (reinterpret_cast<zmq::msg_t *> (msg_))->init_size (size_);
-}
-
-int zmq_msg_init_buffer (zmq_msg_t *msg_, const void *buf_, size_t size_)
-{
-    return (reinterpret_cast<zmq::msg_t *> (msg_))->init_buffer (buf_, size_);
-}
-
-int zmq_msg_init_data (
-  zmq_msg_t *msg_, void *data_, size_t size_, zmq_free_fn *ffn_, void *hint_)
-{
-    return (reinterpret_cast<zmq::msg_t *> (msg_))
-      ->init_data (data_, size_, ffn_, hint_);
-}
-
-int zmq_msg_send (zmq_msg_t *msg_, void *s_, int flags_)
-{
-    zmq::socket_base_t *s = as_socket_base_t (s_);
-    if (!s)
-        return -1;
-    return s_sendmsg (s, msg_, flags_);
-}
-
-int zmq_msg_recv (zmq_msg_t *msg_, void *s_, int flags_)
-{
-    zmq::socket_base_t *s = as_socket_base_t (s_);
-    if (!s)
-        return -1;
-    return s_recvmsg (s, msg_, flags_);
-}
-
-int zmq_msg_close (zmq_msg_t *msg_)
-{
-    return (reinterpret_cast<zmq::msg_t *> (msg_))->close ();
-}
-
-int zmq_msg_move (zmq_msg_t *dest_, zmq_msg_t *src_)
-{
-    return (reinterpret_cast<zmq::msg_t *> (dest_))
-      ->move (*reinterpret_cast<zmq::msg_t *> (src_));
-}
-
-int zmq_msg_copy (zmq_msg_t *dest_, zmq_msg_t *src_)
-{
-    return (reinterpret_cast<zmq::msg_t *> (dest_))
-      ->copy (*reinterpret_cast<zmq::msg_t *> (src_));
-}
-
-void *zmq_msg_data (zmq_msg_t *msg_)
-{
-    return (reinterpret_cast<zmq::msg_t *> (msg_))->data ();
-}
-
-size_t zmq_msg_size (const zmq_msg_t *msg_)
-{
-    return ((zmq::msg_t *) msg_)->size ();
-}
-
-int zmq_msg_more (const zmq_msg_t *msg_)
-{
-    return zmq_msg_get (msg_, ZMQ_MORE);
-}
-
-int zmq_msg_get (const zmq_msg_t *msg_, int property_)
-{
-    const char *fd_string;
-
-    switch (property_) {
-        case ZMQ_MORE:
-            return (((zmq::msg_t *) msg_)->flags () & zmq::msg_t::more) ? 1 : 0;
-        case ZMQ_SRCFD:
-            fd_string = zmq_msg_gets (msg_, "__fd");
-            if (fd_string == NULL)
-                return -1;
-
-            return atoi (fd_string);
-        case ZMQ_SHARED:
-            return (((zmq::msg_t *) msg_)->is_cmsg ())
-                       || (((zmq::msg_t *) msg_)->flags () & zmq::msg_t::shared)
-                     ? 1
-                     : 0;
-        default:
-            errno = EINVAL;
-            return -1;
-    }
-}
-
-int zmq_msg_set (zmq_msg_t *, int, int)
-{
-    //  No properties supported at present
-    errno = EINVAL;
-    return -1;
-}
-
-int zmq_msg_set_routing_id (zmq_msg_t *msg_, uint32_t routing_id_)
-{
-    return (reinterpret_cast<zmq::msg_t *> (msg_))
-      ->set_routing_id (routing_id_);
-}
-
-uint32_t zmq_msg_routing_id (zmq_msg_t *msg_)
-{
-    return (reinterpret_cast<zmq::msg_t *> (msg_))->get_routing_id ();
-}
-
-int zmq_msg_set_group (zmq_msg_t *msg_, const char *group_)
-{
-    return (reinterpret_cast<zmq::msg_t *> (msg_))->set_group (group_);
-}
-
-const char *zmq_msg_group (zmq_msg_t *msg_)
-{
-    return (reinterpret_cast<zmq::msg_t *> (msg_))->group ();
-}
-
-//  Get message metadata string
-
-const char *zmq_msg_gets (const zmq_msg_t *msg_, const char *property_)
-{
-    const zmq::metadata_t *metadata =
-      reinterpret_cast<const zmq::msg_t *> (msg_)->metadata ();
-    const char *value = NULL;
-    if (metadata)
-        value = metadata->get (std::string (property_));
-    if (value)
-        return value;
-
-    errno = EINVAL;
-    return NULL;
-}
-
-// Polling.
-
-#if defined ZMQ_HAVE_POLLER
-static int zmq_poller_poll (zmq_pollitem_t *items_, int nitems_, long timeout_)
-{
-    // implement zmq_poll on top of zmq_poller
-    int rc;
-    zmq_poller_event_t *events;
-    zmq::socket_poller_t poller;
-    events = new (std::nothrow) zmq_poller_event_t[nitems_];
-    alloc_assert (events);
-
-    bool repeat_items = false;
-    //  Register sockets with poller
-    for (int i = 0; i < nitems_; i++) {
-        items_[i].revents = 0;
-
-        bool modify = false;
-        short e = items_[i].events;
-        if (items_[i].socket) {
-            //  Poll item is a 0MQ socket.
-            for (int j = 0; j < i; ++j) {
-                // Check for repeat entries
-                if (items_[j].socket == items_[i].socket) {
-                    repeat_items = true;
-                    modify = true;
-                    e |= items_[j].events;
-                }
-            }
-            if (modify) {
-                rc = zmq_poller_modify (&poller, items_[i].socket, e);
-            } else {
-                rc = zmq_poller_add (&poller, items_[i].socket, NULL, e);
-            }
-            if (rc < 0) {
-                delete[] events;
-                return rc;
-            }
-        } else {
-            //  Poll item is a raw file descriptor.
-            for (int j = 0; j < i; ++j) {
-                // Check for repeat entries
-                if (!items_[j].socket && items_[j].fd == items_[i].fd) {
-                    repeat_items = true;
-                    modify = true;
-                    e |= items_[j].events;
-                }
-            }
-            if (modify) {
-                rc = zmq_poller_modify_fd (&poller, items_[i].fd, e);
-            } else {
-                rc = zmq_poller_add_fd (&poller, items_[i].fd, NULL, e);
-            }
-            if (rc < 0) {
-                delete[] events;
-                return rc;
-            }
-        }
-    }
-
-    //  Wait for events
-    rc = zmq_poller_wait_all (&poller, events, nitems_, timeout_);
-    if (rc < 0) {
-        delete[] events;
-        if (zmq_errno () == EAGAIN) {
-            return 0;
-        }
-        return rc;
-    }
-
-    //  Transform poller events into zmq_pollitem events.
-    //  items_ contains all items, while events only contains fired events.
-    //  If no sockets are repeated (likely), the two are still co-ordered, so step through the items
-    //  checking for matches only on the first event.
-    //  If there are repeat items, they cannot be assumed to be co-ordered,
-    //  so each pollitem must check fired events from the beginning.
-    int j_start = 0, found_events = rc;
-    for (int i = 0; i < nitems_; i++) {
-        for (int j = j_start; j < found_events; ++j) {
-            if ((items_[i].socket && items_[i].socket == events[j].socket)
-                || (!(items_[i].socket || events[j].socket)
-                    && items_[i].fd == events[j].fd)) {
-                items_[i].revents = events[j].events & items_[i].events;
-                if (!repeat_items) {
-                    // no repeats, we can ignore events we've already seen
-                    j_start++;
-                }
-                break;
-            }
-            if (!repeat_items) {
-                // no repeats, never have to look at j > j_start
-                break;
-            }
-        }
-    }
-
-    //  Cleanup
-    delete[] events;
-    return rc;
-}
-#endif // ZMQ_HAVE_POLLER
-
-int zmq_poll (zmq_pollitem_t *items_, int nitems_, long timeout_)
-{
-#if defined ZMQ_HAVE_POLLER
-    // if poller is present, use that if there is at least 1 thread-safe socket,
-    // otherwise fall back to the previous implementation as it's faster.
-    for (int i = 0; i != nitems_; i++) {
-        if (items_[i].socket) {
-            zmq::socket_base_t *s = as_socket_base_t (items_[i].socket);
-            if (s) {
-                if (s->is_thread_safe ())
-                    return zmq_poller_poll (items_, nitems_, timeout_);
-            } else {
-                //as_socket_base_t returned NULL : socket is invalid
-                return -1;
-            }
-        }
-    }
-#endif // ZMQ_HAVE_POLLER
-#if defined ZMQ_POLL_BASED_ON_POLL || defined ZMQ_POLL_BASED_ON_SELECT
-    if (unlikely (nitems_ < 0)) {
-        errno = EINVAL;
-        return -1;
-    }
-    if (unlikely (nitems_ == 0)) {
-        if (timeout_ == 0)
-            return 0;
-#if defined ZMQ_HAVE_WINDOWS
-        Sleep (timeout_ > 0 ? timeout_ : INFINITE);
-        return 0;
-#elif defined ZMQ_HAVE_VXWORKS
-        struct timespec ns_;
-        ns_.tv_sec = timeout_ / 1000;
-        ns_.tv_nsec = timeout_ % 1000 * 1000000;
-        return nanosleep (&ns_, 0);
-#else
-        return usleep (timeout_ * 1000);
-#endif
-    }
-    if (!items_) {
-        errno = EFAULT;
-        return -1;
-    }
-
-    zmq::clock_t clock;
-    uint64_t now = 0;
-    uint64_t end = 0;
-#if defined ZMQ_POLL_BASED_ON_POLL
-    zmq::fast_vector_t<pollfd, ZMQ_POLLITEMS_DFLT> pollfds (nitems_);
-
-    //  Build pollset for poll () system call.
-    for (int i = 0; i != nitems_; i++) {
-        //  If the poll item is a 0MQ socket, we poll on the file descriptor
-        //  retrieved by the ZMQ_FD socket option.
-        if (items_[i].socket) {
-            size_t zmq_fd_size = sizeof (zmq::fd_t);
-            if (zmq_getsockopt (items_[i].socket, ZMQ_FD, &pollfds[i].fd,
-                                &zmq_fd_size)
-                == -1) {
-                return -1;
-            }
-            pollfds[i].events = items_[i].events ? POLLIN : 0;
-        }
-        //  Else, the poll item is a raw file descriptor. Just convert the
-        //  events to normal POLLIN/POLLOUT for poll ().
-        else {
-            pollfds[i].fd = items_[i].fd;
-            pollfds[i].events =
-              (items_[i].events & ZMQ_POLLIN ? POLLIN : 0)
-              | (items_[i].events & ZMQ_POLLOUT ? POLLOUT : 0)
-              | (items_[i].events & ZMQ_POLLPRI ? POLLPRI : 0);
-        }
-    }
-#else
-    //  Ensure we do not attempt to select () on more than FD_SETSIZE
-    //  file descriptors.
-    //  TODO since this function is called by a client, we could return errno EINVAL/ENOMEM/... here
-    zmq_assert (nitems_ <= FD_SETSIZE);
-
-    zmq::optimized_fd_set_t pollset_in (nitems_);
-    FD_ZERO (pollset_in.get ());
-    zmq::optimized_fd_set_t pollset_out (nitems_);
-    FD_ZERO (pollset_out.get ());
-    zmq::optimized_fd_set_t pollset_err (nitems_);
-    FD_ZERO (pollset_err.get ());
-
-    zmq::fd_t maxfd = 0;
-
-    //  Build the fd_sets for passing to select ().
-    for (int i = 0; i != nitems_; i++) {
-        //  If the poll item is a 0MQ socket we are interested in input on the
-        //  notification file descriptor retrieved by the ZMQ_FD socket option.
-        if (items_[i].socket) {
-            size_t zmq_fd_size = sizeof (zmq::fd_t);
-            zmq::fd_t notify_fd;
-            if (zmq_getsockopt (items_[i].socket, ZMQ_FD, &notify_fd,
-                                &zmq_fd_size)
-                == -1)
-                return -1;
-            if (items_[i].events) {
-                FD_SET (notify_fd, pollset_in.get ());
-                if (maxfd < notify_fd)
-                    maxfd = notify_fd;
-            }
-        }
-        //  Else, the poll item is a raw file descriptor. Convert the poll item
-        //  events to the appropriate fd_sets.
-        else {
-            if (items_[i].events & ZMQ_POLLIN)
-                FD_SET (items_[i].fd, pollset_in.get ());
-            if (items_[i].events & ZMQ_POLLOUT)
-                FD_SET (items_[i].fd, pollset_out.get ());
-            if (items_[i].events & ZMQ_POLLERR)
-                FD_SET (items_[i].fd, pollset_err.get ());
-            if (maxfd < items_[i].fd)
-                maxfd = items_[i].fd;
-        }
-    }
-
-    zmq::optimized_fd_set_t inset (nitems_);
-    zmq::optimized_fd_set_t outset (nitems_);
-    zmq::optimized_fd_set_t errset (nitems_);
-#endif
-
-    bool first_pass = true;
-    int nevents = 0;
-
-    while (true) {
-#if defined ZMQ_POLL_BASED_ON_POLL
-
-        //  Compute the timeout for the subsequent poll.
-        const zmq::timeout_t timeout =
-          zmq::compute_timeout (first_pass, timeout_, now, end);
-
-        //  Wait for events.
-        {
-            const int rc = poll (&pollfds[0], nitems_, timeout);
-            if (rc == -1 && errno == EINTR) {
-                return -1;
-            }
-            errno_assert (rc >= 0);
-        }
-        //  Check for the events.
-        for (int i = 0; i != nitems_; i++) {
-            items_[i].revents = 0;
-
-            //  The poll item is a 0MQ socket. Retrieve pending events
-            //  using the ZMQ_EVENTS socket option.
-            if (items_[i].socket) {
-                size_t zmq_events_size = sizeof (uint32_t);
-                uint32_t zmq_events;
-                if (zmq_getsockopt (items_[i].socket, ZMQ_EVENTS, &zmq_events,
-                                    &zmq_events_size)
-                    == -1) {
-                    return -1;
-                }
-                if ((items_[i].events & ZMQ_POLLOUT)
-                    && (zmq_events & ZMQ_POLLOUT))
-                    items_[i].revents |= ZMQ_POLLOUT;
-                if ((items_[i].events & ZMQ_POLLIN)
-                    && (zmq_events & ZMQ_POLLIN))
-                    items_[i].revents |= ZMQ_POLLIN;
-            }
-            //  Else, the poll item is a raw file descriptor, simply convert
-            //  the events to zmq_pollitem_t-style format.
-            else {
-                if (pollfds[i].revents & POLLIN)
-                    items_[i].revents |= ZMQ_POLLIN;
-                if (pollfds[i].revents & POLLOUT)
-                    items_[i].revents |= ZMQ_POLLOUT;
-                if (pollfds[i].revents & POLLPRI)
-                    items_[i].revents |= ZMQ_POLLPRI;
-                if (pollfds[i].revents & ~(POLLIN | POLLOUT | POLLPRI))
-                    items_[i].revents |= ZMQ_POLLERR;
-            }
-
-            if (items_[i].revents)
-                nevents++;
-        }
-
-#else
-
-        //  Compute the timeout for the subsequent poll.
-        timeval timeout;
-        timeval *ptimeout;
-        if (first_pass) {
-            timeout.tv_sec = 0;
-            timeout.tv_usec = 0;
-            ptimeout = &timeout;
-        } else if (timeout_ < 0)
-            ptimeout = NULL;
-        else {
-            timeout.tv_sec = static_cast<long> ((end - now) / 1000);
-            timeout.tv_usec = static_cast<long> ((end - now) % 1000 * 1000);
-            ptimeout = &timeout;
-        }
-
-        //  Wait for events. Ignore interrupts if there's infinite timeout.
-        while (true) {
-            memcpy (inset.get (), pollset_in.get (),
-                    zmq::valid_pollset_bytes (*pollset_in.get ()));
-            memcpy (outset.get (), pollset_out.get (),
-                    zmq::valid_pollset_bytes (*pollset_out.get ()));
-            memcpy (errset.get (), pollset_err.get (),
-                    zmq::valid_pollset_bytes (*pollset_err.get ()));
-#if defined ZMQ_HAVE_WINDOWS
-            int rc =
-              select (0, inset.get (), outset.get (), errset.get (), ptimeout);
-            if (unlikely (rc == SOCKET_ERROR)) {
-                errno = zmq::wsa_error_to_errno (WSAGetLastError ());
-                wsa_assert (errno == ENOTSOCK);
-                return -1;
-            }
-#else
-            int rc = select (maxfd + 1, inset.get (), outset.get (),
-                             errset.get (), ptimeout);
-            if (unlikely (rc == -1)) {
-                errno_assert (errno == EINTR || errno == EBADF);
-                return -1;
-            }
-#endif
-            break;
-        }
-
-        //  Check for the events.
-        for (int i = 0; i != nitems_; i++) {
-            items_[i].revents = 0;
-
-            //  The poll item is a 0MQ socket. Retrieve pending events
-            //  using the ZMQ_EVENTS socket option.
-            if (items_[i].socket) {
-                size_t zmq_events_size = sizeof (uint32_t);
-                uint32_t zmq_events;
-                if (zmq_getsockopt (items_[i].socket, ZMQ_EVENTS, &zmq_events,
-                                    &zmq_events_size)
-                    == -1)
-                    return -1;
-                if ((items_[i].events & ZMQ_POLLOUT)
-                    && (zmq_events & ZMQ_POLLOUT))
-                    items_[i].revents |= ZMQ_POLLOUT;
-                if ((items_[i].events & ZMQ_POLLIN)
-                    && (zmq_events & ZMQ_POLLIN))
-                    items_[i].revents |= ZMQ_POLLIN;
-            }
-            //  Else, the poll item is a raw file descriptor, simply convert
-            //  the events to zmq_pollitem_t-style format.
-            else {
-                if (FD_ISSET (items_[i].fd, inset.get ()))
-                    items_[i].revents |= ZMQ_POLLIN;
-                if (FD_ISSET (items_[i].fd, outset.get ()))
-                    items_[i].revents |= ZMQ_POLLOUT;
-                if (FD_ISSET (items_[i].fd, errset.get ()))
-                    items_[i].revents |= ZMQ_POLLERR;
-            }
-
-            if (items_[i].revents)
-                nevents++;
-        }
-#endif
-
-        //  If timeout is zero, exit immediately whether there are events or not.
-        if (timeout_ == 0)
-            break;
-
-        //  If there are events to return, we can exit immediately.
-        if (nevents)
-            break;
-
-        //  At this point we are meant to wait for events but there are none.
-        //  If timeout is infinite we can just loop until we get some events.
-        if (timeout_ < 0) {
-            if (first_pass)
-                first_pass = false;
-            continue;
-        }
-
-        //  The timeout is finite and there are no events. In the first pass
-        //  we get a timestamp of when the polling have begun. (We assume that
-        //  first pass have taken negligible time). We also compute the time
-        //  when the polling should time out.
-        if (first_pass) {
-            now = clock.now_ms ();
-            end = now + timeout_;
-            if (now == end)
-                break;
-            first_pass = false;
-            continue;
-        }
-
-        //  Find out whether timeout have expired.
-        now = clock.now_ms ();
-        if (now >= end)
-            break;
-    }
-
-    return nevents;
-#else
-    //  Exotic platforms that support neither poll() nor select().
-    errno = ENOTSUP;
-    return -1;
-#endif
-}
-
-#ifdef ZMQ_HAVE_PPOLL
-// return values of 0 or -1 should be returned from zmq_poll; return value 1 means items passed checks
-int zmq_poll_check_items_ (zmq_pollitem_t *items_, int nitems_, long timeout_)
-{
-    if (unlikely (nitems_ < 0)) {
-        errno = EINVAL;
-        return -1;
-    }
-    if (unlikely (nitems_ == 0)) {
-        if (timeout_ == 0)
-            return 0;
-#if defined ZMQ_HAVE_WINDOWS
-        Sleep (timeout_ > 0 ? timeout_ : INFINITE);
-        return 0;
-#elif defined ZMQ_HAVE_VXWORKS
-        struct timespec ns_;
-        ns_.tv_sec = timeout_ / 1000;
-        ns_.tv_nsec = timeout_ % 1000 * 1000000;
-        return nanosleep (&ns_, 0);
-#else
-        return usleep (timeout_ * 1000);
-#endif
-    }
-    if (!items_) {
-        errno = EFAULT;
-        return -1;
-    }
-    return 1;
-}
-
-struct zmq_poll_select_fds_t_
-{
-    explicit zmq_poll_select_fds_t_ (int nitems_) :
-        pollset_in (nitems_),
-        pollset_out (nitems_),
-        pollset_err (nitems_),
-        inset (nitems_),
-        outset (nitems_),
-        errset (nitems_),
-        maxfd (0)
-    {
-        FD_ZERO (pollset_in.get ());
-        FD_ZERO (pollset_out.get ());
-        FD_ZERO (pollset_err.get ());
-    }
-
-    zmq::optimized_fd_set_t pollset_in;
-    zmq::optimized_fd_set_t pollset_out;
-    zmq::optimized_fd_set_t pollset_err;
-    zmq::optimized_fd_set_t inset;
-    zmq::optimized_fd_set_t outset;
-    zmq::optimized_fd_set_t errset;
-    zmq::fd_t maxfd;
-};
-
-zmq_poll_select_fds_t_
-zmq_poll_build_select_fds_ (zmq_pollitem_t *items_, int nitems_, int &rc)
-{
-    //  Ensure we do not attempt to select () on more than FD_SETSIZE
-    //  file descriptors.
-    //  TODO since this function is called by a client, we could return errno EINVAL/ENOMEM/... here
-    zmq_assert (nitems_ <= FD_SETSIZE);
-
-    zmq_poll_select_fds_t_ fds (nitems_);
-
-    //  Build the fd_sets for passing to select ().
-    for (int i = 0; i != nitems_; i++) {
-        //  If the poll item is a 0MQ socket we are interested in input on the
-        //  notification file descriptor retrieved by the ZMQ_FD socket option.
-        if (items_[i].socket) {
-            size_t zmq_fd_size = sizeof (zmq::fd_t);
-            zmq::fd_t notify_fd;
-            if (zmq_getsockopt (items_[i].socket, ZMQ_FD, &notify_fd,
-                                &zmq_fd_size)
-                == -1) {
-                rc = -1;
-                return fds;
-            }
-            if (items_[i].events) {
-                FD_SET (notify_fd, fds.pollset_in.get ());
-                if (fds.maxfd < notify_fd)
-                    fds.maxfd = notify_fd;
-            }
-        }
-        //  Else, the poll item is a raw file descriptor. Convert the poll item
-        //  events to the appropriate fd_sets.
-        else {
-            if (items_[i].events & ZMQ_POLLIN)
-                FD_SET (items_[i].fd, fds.pollset_in.get ());
-            if (items_[i].events & ZMQ_POLLOUT)
-                FD_SET (items_[i].fd, fds.pollset_out.get ());
-            if (items_[i].events & ZMQ_POLLERR)
-                FD_SET (items_[i].fd, fds.pollset_err.get ());
-            if (fds.maxfd < items_[i].fd)
-                fds.maxfd = items_[i].fd;
-        }
-    }
-
-    rc = 0;
-    return fds;
-}
-
-timeval *zmq_poll_select_set_timeout_ (
-  long timeout_, bool first_pass, uint64_t now, uint64_t end, timeval &timeout)
-{
-    timeval *ptimeout;
-    if (first_pass) {
-        timeout.tv_sec = 0;
-        timeout.tv_usec = 0;
-        ptimeout = &timeout;
-    } else if (timeout_ < 0)
-        ptimeout = NULL;
-    else {
-        timeout.tv_sec = static_cast<long> ((end - now) / 1000);
-        timeout.tv_usec = static_cast<long> ((end - now) % 1000 * 1000);
-        ptimeout = &timeout;
-    }
-    return ptimeout;
-}
-
-timespec *zmq_poll_select_set_timeout_ (
-  long timeout_, bool first_pass, uint64_t now, uint64_t end, timespec &timeout)
-{
-    timespec *ptimeout;
-    if (first_pass) {
-        timeout.tv_sec = 0;
-        timeout.tv_nsec = 0;
-        ptimeout = &timeout;
-    } else if (timeout_ < 0)
-        ptimeout = NULL;
-    else {
-        timeout.tv_sec = static_cast<long> ((end - now) / 1000);
-        timeout.tv_nsec = static_cast<long> ((end - now) % 1000 * 1000000);
-        ptimeout = &timeout;
-    }
-    return ptimeout;
-}
-
-int zmq_poll_select_check_events_ (zmq_pollitem_t *items_,
-                                   int nitems_,
-                                   zmq_poll_select_fds_t_ &fds,
-                                   int &nevents)
-{
-    //  Check for the events.
-    for (int i = 0; i != nitems_; i++) {
-        items_[i].revents = 0;
-
-        //  The poll item is a 0MQ socket. Retrieve pending events
-        //  using the ZMQ_EVENTS socket option.
-        if (items_[i].socket) {
-            size_t zmq_events_size = sizeof (uint32_t);
-            uint32_t zmq_events;
-            if (zmq_getsockopt (items_[i].socket, ZMQ_EVENTS, &zmq_events,
-                                &zmq_events_size)
-                == -1)
-                return -1;
-            if ((items_[i].events & ZMQ_POLLOUT) && (zmq_events & ZMQ_POLLOUT))
-                items_[i].revents |= ZMQ_POLLOUT;
-            if ((items_[i].events & ZMQ_POLLIN) && (zmq_events & ZMQ_POLLIN))
-                items_[i].revents |= ZMQ_POLLIN;
-        }
-        //  Else, the poll item is a raw file descriptor, simply convert
-        //  the events to zmq_pollitem_t-style format.
-        else {
-            if (FD_ISSET (items_[i].fd, fds.inset.get ()))
-                items_[i].revents |= ZMQ_POLLIN;
-            if (FD_ISSET (items_[i].fd, fds.outset.get ()))
-                items_[i].revents |= ZMQ_POLLOUT;
-            if (FD_ISSET (items_[i].fd, fds.errset.get ()))
-                items_[i].revents |= ZMQ_POLLERR;
-        }
-
-        if (items_[i].revents)
-            nevents++;
-    }
-
-    return 0;
-}
-
-bool zmq_poll_must_break_loop_ (long timeout_,
-                                int nevents,
-                                bool &first_pass,
-                                zmq::clock_t &clock,
-                                uint64_t &now,
-                                uint64_t &end)
-{
-    //  If timeout is zero, exit immediately whether there are events or not.
-    if (timeout_ == 0)
-        return true;
-
-    //  If there are events to return, we can exit immediately.
-    if (nevents)
-        return true;
-
-    //  At this point we are meant to wait for events but there are none.
-    //  If timeout is infinite we can just loop until we get some events.
-    if (timeout_ < 0) {
-        if (first_pass)
-            first_pass = false;
-        return false;
-    }
-
-    //  The timeout is finite and there are no events. In the first pass
-    //  we get a timestamp of when the polling have begun. (We assume that
-    //  first pass have taken negligible time). We also compute the time
-    //  when the polling should time out.
-    if (first_pass) {
-        now = clock.now_ms ();
-        end = now + timeout_;
-        if (now == end)
-            return true;
-        first_pass = false;
-        return false;
-    }
-
-    //  Find out whether timeout have expired.
-    now = clock.now_ms ();
-    if (now >= end)
-        return true;
-
-    // finally, in all other cases, we just continue
-    return false;
-}
-#endif // ZMQ_HAVE_PPOLL
-
-#if !defined _WIN32
-int zmq_ppoll (zmq_pollitem_t *items_,
-               int nitems_,
-               long timeout_,
-               const sigset_t *sigmask_)
-#else
-// Windows has no sigset_t
-int zmq_ppoll (zmq_pollitem_t *items_,
-               int nitems_,
-               long timeout_,
-               const void *sigmask_)
-#endif
-{
-#ifdef ZMQ_HAVE_PPOLL
-    int rc = zmq_poll_check_items_ (items_, nitems_, timeout_);
-    if (rc <= 0) {
-        return rc;
-    }
-
-    zmq::clock_t clock;
-    uint64_t now = 0;
-    uint64_t end = 0;
-    zmq_poll_select_fds_t_ fds =
-      zmq_poll_build_select_fds_ (items_, nitems_, rc);
-    if (rc == -1) {
-        return -1;
-    }
-
-    bool first_pass = true;
-    int nevents = 0;
-
-    while (true) {
-        //  Compute the timeout for the subsequent poll.
-        timespec timeout;
-        timespec *ptimeout = zmq_poll_select_set_timeout_ (timeout_, first_pass,
-                                                           now, end, timeout);
-
-        //  Wait for events. Ignore interrupts if there's infinite timeout.
-        while (true) {
-            memcpy (fds.inset.get (), fds.pollset_in.get (),
-                    zmq::valid_pollset_bytes (*fds.pollset_in.get ()));
-            memcpy (fds.outset.get (), fds.pollset_out.get (),
-                    zmq::valid_pollset_bytes (*fds.pollset_out.get ()));
-            memcpy (fds.errset.get (), fds.pollset_err.get (),
-                    zmq::valid_pollset_bytes (*fds.pollset_err.get ()));
-            int rc =
-              pselect (fds.maxfd + 1, fds.inset.get (), fds.outset.get (),
-                       fds.errset.get (), ptimeout, sigmask_);
-            if (unlikely (rc == -1)) {
-                errno_assert (errno == EINTR || errno == EBADF);
-                return -1;
-            }
-            break;
-        }
-
-        rc = zmq_poll_select_check_events_ (items_, nitems_, fds, nevents);
-        if (rc < 0) {
-            return rc;
-        }
-
-        if (zmq_poll_must_break_loop_ (timeout_, nevents, first_pass, clock,
-                                       now, end)) {
-            break;
-        }
-    }
-
-    return nevents;
-#else
-    errno = ENOTSUP;
-    return -1;
-#endif // ZMQ_HAVE_PPOLL
-}
-
-//  The poller functionality
-
-void *zmq_poller_new (void)
-{
-    zmq::socket_poller_t *poller = new (std::nothrow) zmq::socket_poller_t;
-    if (!poller) {
-        errno = ENOMEM;
-    }
-    return poller;
-}
-
-int zmq_poller_destroy (void **poller_p_)
-{
-    if (poller_p_) {
-        const zmq::socket_poller_t *const poller =
-          static_cast<const zmq::socket_poller_t *> (*poller_p_);
-        if (poller && poller->check_tag ()) {
-            delete poller;
-            *poller_p_ = NULL;
-            return 0;
-        }
-    }
-    errno = EFAULT;
-    return -1;
-}
-
-
-static int check_poller (void *const poller_)
-{
-    if (!poller_
-        || !(static_cast<zmq::socket_poller_t *> (poller_))->check_tag ()) {
-        errno = EFAULT;
-        return -1;
-    }
-
-    return 0;
-}
-
-static int check_events (const short events_)
-{
-    if (events_ & ~(ZMQ_POLLIN | ZMQ_POLLOUT | ZMQ_POLLERR | ZMQ_POLLPRI)) {
-        errno = EINVAL;
-        return -1;
-    }
-    return 0;
-}
-
-static int check_poller_registration_args (void *const poller_, void *const s_)
-{
-    if (-1 == check_poller (poller_))
-        return -1;
-
-    if (!s_ || !(static_cast<zmq::socket_base_t *> (s_))->check_tag ()) {
-        errno = ENOTSOCK;
-        return -1;
-    }
-
-    return 0;
-}
-
-static int check_poller_fd_registration_args (void *const poller_,
-                                              const zmq::fd_t fd_)
-{
-    if (-1 == check_poller (poller_))
-        return -1;
-
-    if (fd_ == zmq::retired_fd) {
-        errno = EBADF;
-        return -1;
-    }
-
-    return 0;
-}
-
-int zmq_poller_size (void *poller_)
-{
-    if (-1 == check_poller (poller_))
-        return -1;
-
-    return (static_cast<zmq::socket_poller_t *> (poller_))->size ();
-}
-
-int zmq_poller_add (void *poller_, void *s_, void *user_data_, short events_)
-{
-    if (-1 == check_poller_registration_args (poller_, s_)
-        || -1 == check_events (events_))
-        return -1;
-
-    zmq::socket_base_t *socket = static_cast<zmq::socket_base_t *> (s_);
-
-    return (static_cast<zmq::socket_poller_t *> (poller_))
-      ->add (socket, user_data_, events_);
-}
-
-int zmq_poller_add_fd (void *poller_,
-                       zmq::fd_t fd_,
-                       void *user_data_,
-                       short events_)
-{
-    if (-1 == check_poller_fd_registration_args (poller_, fd_)
-        || -1 == check_events (events_))
-        return -1;
-
-    return (static_cast<zmq::socket_poller_t *> (poller_))
-      ->add_fd (fd_, user_data_, events_);
-}
-
-
-int zmq_poller_modify (void *poller_, void *s_, short events_)
-{
-    if (-1 == check_poller_registration_args (poller_, s_)
-        || -1 == check_events (events_))
-        return -1;
-
-    const zmq::socket_base_t *const socket =
-      static_cast<const zmq::socket_base_t *> (s_);
-
-    return (static_cast<zmq::socket_poller_t *> (poller_))
-      ->modify (socket, events_);
-}
-
-int zmq_poller_modify_fd (void *poller_, zmq::fd_t fd_, short events_)
-{
-    if (-1 == check_poller_fd_registration_args (poller_, fd_)
-        || -1 == check_events (events_))
-        return -1;
-
-    return (static_cast<zmq::socket_poller_t *> (poller_))
-      ->modify_fd (fd_, events_);
-}
-
-int zmq_poller_remove (void *poller_, void *s_)
-{
-    if (-1 == check_poller_registration_args (poller_, s_))
-        return -1;
-
-    zmq::socket_base_t *socket = static_cast<zmq::socket_base_t *> (s_);
-
-    return (static_cast<zmq::socket_poller_t *> (poller_))->remove (socket);
-}
-
-int zmq_poller_remove_fd (void *poller_, zmq::fd_t fd_)
-{
-    if (-1 == check_poller_fd_registration_args (poller_, fd_))
-        return -1;
-
-    return (static_cast<zmq::socket_poller_t *> (poller_))->remove_fd (fd_);
-}
-
-int zmq_poller_wait (void *poller_, zmq_poller_event_t *event_, long timeout_)
-{
-    const int rc = zmq_poller_wait_all (poller_, event_, 1, timeout_);
-
-    if (rc < 0 && event_) {
-        event_->socket = NULL;
-        event_->fd = zmq::retired_fd;
-        event_->user_data = NULL;
-        event_->events = 0;
-    }
-    // wait_all returns number of events, but we return 0 for any success
-    return rc >= 0 ? 0 : rc;
-}
-
-int zmq_poller_wait_all (void *poller_,
-                         zmq_poller_event_t *events_,
-                         int n_events_,
-                         long timeout_)
-{
-    if (-1 == check_poller (poller_))
-        return -1;
-
-    if (!events_) {
-        errno = EFAULT;
-        return -1;
-    }
-    if (n_events_ < 0) {
-        errno = EINVAL;
-        return -1;
-    }
-
-    const int rc =
-      (static_cast<zmq::socket_poller_t *> (poller_))
-        ->wait (reinterpret_cast<zmq::socket_poller_t::event_t *> (events_),
-                n_events_, timeout_);
-
-    return rc;
-}
-
-int zmq_poller_fd (void *poller_, zmq_fd_t *fd_)
-{
-    if (!poller_
-        || !(static_cast<zmq::socket_poller_t *> (poller_)->check_tag ())) {
-        errno = EFAULT;
-        return -1;
-    }
-    return static_cast<zmq::socket_poller_t *> (poller_)->signaler_fd (fd_);
-}
-
-//  Peer-specific state
-
-int zmq_socket_get_peer_state (void *s_,
-                               const void *routing_id_,
-                               size_t routing_id_size_)
-{
-    const zmq::socket_base_t *const s = as_socket_base_t (s_);
-    if (!s)
-        return -1;
-
-    return s->get_peer_state (routing_id_, routing_id_size_);
-}
-
-//  Timers
-
-void *zmq_timers_new (void)
-{
-    zmq::timers_t *timers = new (std::nothrow) zmq::timers_t;
-    alloc_assert (timers);
-    return timers;
-}
-
-int zmq_timers_destroy (void **timers_p_)
-{
-    void *timers = *timers_p_;
-    if (!timers || !(static_cast<zmq::timers_t *> (timers))->check_tag ()) {
-        errno = EFAULT;
-        return -1;
-    }
-    delete (static_cast<zmq::timers_t *> (timers));
-    *timers_p_ = NULL;
-    return 0;
-}
-
-int zmq_timers_add (void *timers_,
-                    size_t interval_,
-                    zmq_timer_fn handler_,
-                    void *arg_)
-{
-    if (!timers_ || !(static_cast<zmq::timers_t *> (timers_))->check_tag ()) {
-        errno = EFAULT;
-        return -1;
-    }
-
-    return (static_cast<zmq::timers_t *> (timers_))
-      ->add (interval_, handler_, arg_);
-}
-
-int zmq_timers_cancel (void *timers_, int timer_id_)
-{
-    if (!timers_ || !(static_cast<zmq::timers_t *> (timers_))->check_tag ()) {
-        errno = EFAULT;
-        return -1;
-    }
-
-    return (static_cast<zmq::timers_t *> (timers_))->cancel (timer_id_);
-}
-
-int zmq_timers_set_interval (void *timers_, int timer_id_, size_t interval_)
-{
-    if (!timers_ || !(static_cast<zmq::timers_t *> (timers_))->check_tag ()) {
-        errno = EFAULT;
-        return -1;
-    }
-
-    return (static_cast<zmq::timers_t *> (timers_))
-      ->set_interval (timer_id_, interval_);
-}
-
-int zmq_timers_reset (void *timers_, int timer_id_)
-{
-    if (!timers_ || !(static_cast<zmq::timers_t *> (timers_))->check_tag ()) {
-        errno = EFAULT;
-        return -1;
-    }
-
-    return (static_cast<zmq::timers_t *> (timers_))->reset (timer_id_);
-}
-
-long zmq_timers_timeout (void *timers_)
-{
-    if (!timers_ || !(static_cast<zmq::timers_t *> (timers_))->check_tag ()) {
-        errno = EFAULT;
-        return -1;
-    }
-
-    return (static_cast<zmq::timers_t *> (timers_))->timeout ();
-}
-
-int zmq_timers_execute (void *timers_)
-{
-    if (!timers_ || !(static_cast<zmq::timers_t *> (timers_))->check_tag ()) {
-        errno = EFAULT;
-        return -1;
-    }
-
-    return (static_cast<zmq::timers_t *> (timers_))->execute ();
-}
-
-//  The proxy functionality
-
-int zmq_proxy (void *frontend_, void *backend_, void *capture_)
-{
-    if (!frontend_ || !backend_) {
-        errno = EFAULT;
-        return -1;
-    }
-    return zmq::proxy (static_cast<zmq::socket_base_t *> (frontend_),
-                       static_cast<zmq::socket_base_t *> (backend_),
-                       static_cast<zmq::socket_base_t *> (capture_));
-}
-
-int zmq_proxy_steerable (void *frontend_,
-                         void *backend_,
-                         void *capture_,
-                         void *control_)
-{
-    if (!frontend_ || !backend_) {
-        errno = EFAULT;
-        return -1;
-    }
-    return zmq::proxy (static_cast<zmq::socket_base_t *> (frontend_),
-                       static_cast<zmq::socket_base_t *> (backend_),
-                       static_cast<zmq::socket_base_t *> (capture_),
-                       static_cast<zmq::socket_base_t *> (control_));
-}
-
-//  The deprecated device functionality
-
-int zmq_device (int /* type */, void *frontend_, void *backend_)
-{
-    return zmq::proxy (static_cast<zmq::socket_base_t *> (frontend_),
-                       static_cast<zmq::socket_base_t *> (backend_), NULL);
-}
-
-//  Probe library capabilities; for now, reports on transport and security
-
-int zmq_has (const char *capability_)
-{
-#if defined(ZMQ_HAVE_IPC)
-    if (strcmp (capability_, zmq::protocol_name::ipc) == 0)
-        return true;
-#endif
-#if defined(ZMQ_HAVE_OPENPGM)
-    if (strcmp (capability_, zmq::protocol_name::pgm) == 0)
-        return true;
-#endif
-#if defined(ZMQ_HAVE_TIPC)
-    if (strcmp (capability_, zmq::protocol_name::tipc) == 0)
-        return true;
-#endif
-#if defined(ZMQ_HAVE_NORM)
-    if (strcmp (capability_, zmq::protocol_name::norm) == 0)
-        return true;
-#endif
-#if defined(ZMQ_HAVE_CURVE)
-    if (strcmp (capability_, "curve") == 0)
-        return true;
-#endif
-#if defined(HAVE_LIBGSSAPI_KRB5)
-    if (strcmp (capability_, "gssapi") == 0)
-        return true;
-#endif
-#if defined(ZMQ_HAVE_VMCI)
-    if (strcmp (capability_, zmq::protocol_name::vmci) == 0)
-        return true;
-#endif
-#if defined(ZMQ_BUILD_DRAFT_API)
-    if (strcmp (capability_, "draft") == 0)
-        return true;
-#endif
-#if defined(ZMQ_HAVE_WS)
-    if (strcmp (capability_, "WS") == 0)
-        return true;
-#endif
-#if defined(ZMQ_HAVE_WSS)
-    if (strcmp (capability_, "WSS") == 0)
-        return true;
-#endif
-    //  Whatever the application asked for, we don't have
-    return false;
-}
-
-int zmq_socket_monitor_pipes_stats (void *s_)
-{
-    zmq::socket_base_t *s = as_socket_base_t (s_);
-    if (!s)
-        return -1;
-    return s->query_pipes_stats ();
-}
diff --git a/libs/libzmq/src/zmq_draft.h b/libs/libzmq/src/zmq_draft.h
deleted file mode 100644
index 5378ce5..0000000
--- a/libs/libzmq/src/zmq_draft.h
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_DRAFT_H_INCLUDED__
-#define __ZMQ_DRAFT_H_INCLUDED__
-
-/******************************************************************************/
-/*  These functions are DRAFT and disabled in stable releases, and subject to */
-/*  change at ANY time until declared stable.                                 */
-/******************************************************************************/
-
-#ifndef ZMQ_BUILD_DRAFT_API
-
-/*  DRAFT Socket types.                                                       */
-#define ZMQ_SERVER 12
-#define ZMQ_CLIENT 13
-#define ZMQ_RADIO 14
-#define ZMQ_DISH 15
-#define ZMQ_GATHER 16
-#define ZMQ_SCATTER 17
-#define ZMQ_DGRAM 18
-#define ZMQ_PEER 19
-#define ZMQ_CHANNEL 20
-
-/*  DRAFT Socket options.                                                     */
-#define ZMQ_ZAP_ENFORCE_DOMAIN 93
-#define ZMQ_LOOPBACK_FASTPATH 94
-#define ZMQ_METADATA 95
-#define ZMQ_MULTICAST_LOOP 96
-#define ZMQ_ROUTER_NOTIFY 97
-#define ZMQ_XPUB_MANUAL_LAST_VALUE 98
-#define ZMQ_SOCKS_USERNAME 99
-#define ZMQ_SOCKS_PASSWORD 100
-#define ZMQ_IN_BATCH_SIZE 101
-#define ZMQ_OUT_BATCH_SIZE 102
-#define ZMQ_WSS_KEY_PEM 103
-#define ZMQ_WSS_CERT_PEM 104
-#define ZMQ_WSS_TRUST_PEM 105
-#define ZMQ_WSS_HOSTNAME 106
-#define ZMQ_WSS_TRUST_SYSTEM 107
-#define ZMQ_ONLY_FIRST_SUBSCRIBE 108
-#define ZMQ_RECONNECT_STOP 109
-#define ZMQ_HELLO_MSG 110
-#define ZMQ_DISCONNECT_MSG 111
-#define ZMQ_PRIORITY 112
-#define ZMQ_BUSY_POLL 113
-#define ZMQ_HICCUP_MSG 114
-#define ZMQ_XSUB_VERBOSE_UNSUBSCRIBE 115
-
-/*  DRAFT ZMQ_RECONNECT_STOP options                                          */
-#define ZMQ_RECONNECT_STOP_CONN_REFUSED 0x1
-#define ZMQ_RECONNECT_STOP_HANDSHAKE_FAILED 0x2
-#define ZMQ_RECONNECT_STOP_AFTER_DISCONNECT 0x4
-
-/*  DRAFT Context options                                                     */
-#define ZMQ_ZERO_COPY_RECV 10
-
-/*  DRAFT Context methods.                                                    */
-int zmq_ctx_set_ext (void *context_,
-                     int option_,
-                     const void *optval_,
-                     size_t optvallen_);
-int zmq_ctx_get_ext (void *context_,
-                     int option_,
-                     void *optval_,
-                     size_t *optvallen_);
-
-/*  DRAFT Socket methods.                                                     */
-int zmq_join (void *s_, const char *group_);
-int zmq_leave (void *s_, const char *group_);
-
-/*  DRAFT Msg methods.                                                        */
-int zmq_msg_set_routing_id (zmq_msg_t *msg_, uint32_t routing_id_);
-uint32_t zmq_msg_routing_id (zmq_msg_t *msg_);
-int zmq_msg_set_group (zmq_msg_t *msg_, const char *group_);
-const char *zmq_msg_group (zmq_msg_t *msg_);
-int zmq_msg_init_buffer (zmq_msg_t *msg_, const void *buf_, size_t size_);
-
-/*  DRAFT Msg property names.                                                 */
-#define ZMQ_MSG_PROPERTY_ROUTING_ID "Routing-Id"
-#define ZMQ_MSG_PROPERTY_SOCKET_TYPE "Socket-Type"
-#define ZMQ_MSG_PROPERTY_USER_ID "User-Id"
-#define ZMQ_MSG_PROPERTY_PEER_ADDRESS "Peer-Address"
-
-/*  Router notify options                                                     */
-#define ZMQ_NOTIFY_CONNECT 1
-#define ZMQ_NOTIFY_DISCONNECT 2
-
-/******************************************************************************/
-/*  Poller polling on sockets,fd and thread-safe sockets                      */
-/******************************************************************************/
-
-#if defined _WIN32
-typedef SOCKET zmq_fd_t;
-#else
-typedef int zmq_fd_t;
-#endif
-
-typedef struct zmq_poller_event_t
-{
-    void *socket;
-    zmq_fd_t fd;
-    void *user_data;
-    short events;
-} zmq_poller_event_t;
-
-void *zmq_poller_new (void);
-int zmq_poller_destroy (void **poller_p_);
-int zmq_poller_size (void *poller_);
-int zmq_poller_add (void *poller_,
-                    void *socket_,
-                    void *user_data_,
-                    short events_);
-int zmq_poller_modify (void *poller_, void *socket_, short events_);
-int zmq_poller_remove (void *poller_, void *socket_);
-int zmq_poller_wait (void *poller_, zmq_poller_event_t *event_, long timeout_);
-int zmq_poller_wait_all (void *poller_,
-                         zmq_poller_event_t *events_,
-                         int n_events_,
-                         long timeout_);
-zmq_fd_t zmq_poller_fd (void *poller_);
-
-int zmq_poller_add_fd (void *poller_,
-                       zmq_fd_t fd_,
-                       void *user_data_,
-                       short events_);
-int zmq_poller_modify_fd (void *poller_, zmq_fd_t fd_, short events_);
-int zmq_poller_remove_fd (void *poller_, zmq_fd_t fd_);
-
-int zmq_socket_get_peer_state (void *socket_,
-                               const void *routing_id_,
-                               size_t routing_id_size_);
-
-/*  DRAFT Socket monitoring events                                            */
-#define ZMQ_EVENT_PIPES_STATS 0x10000
-
-#define ZMQ_CURRENT_EVENT_VERSION 1
-#define ZMQ_CURRENT_EVENT_VERSION_DRAFT 2
-
-#define ZMQ_EVENT_ALL_V1 ZMQ_EVENT_ALL
-#define ZMQ_EVENT_ALL_V2 ZMQ_EVENT_ALL_V1 | ZMQ_EVENT_PIPES_STATS
-
-int zmq_socket_monitor_versioned (
-  void *s_, const char *addr_, uint64_t events_, int event_version_, int type_);
-int zmq_socket_monitor_pipes_stats (void *s_);
-
-#if !defined _WIN32
-int zmq_ppoll (zmq_pollitem_t *items_,
-               int nitems_,
-               long timeout_,
-               const sigset_t *sigmask_);
-#else
-// Windows has no sigset_t
-int zmq_ppoll (zmq_pollitem_t *items_,
-               int nitems_,
-               long timeout_,
-               const void *sigmask_);
-#endif
-
-#endif // ZMQ_BUILD_DRAFT_API
-
-#endif //ifndef __ZMQ_DRAFT_H_INCLUDED__
diff --git a/libs/libzmq/src/zmq_utils.cpp b/libs/libzmq/src/zmq_utils.cpp
deleted file mode 100644
index e83fc8f..0000000
--- a/libs/libzmq/src/zmq_utils.cpp
+++ /dev/null
@@ -1,326 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-
-#include "macros.hpp"
-#include "clock.hpp"
-#include "err.hpp"
-#include "thread.hpp"
-#include "atomic_counter.hpp"
-#include "atomic_ptr.hpp"
-#include "random.hpp"
-#include <assert.h>
-#include <new>
-
-#if !defined ZMQ_HAVE_WINDOWS
-#include <unistd.h>
-#endif
-
-#if defined(ZMQ_USE_TWEETNACL)
-#include "tweetnacl.h"
-#elif defined(ZMQ_USE_LIBSODIUM)
-#include "sodium.h"
-#endif
-
-void zmq_sleep (int seconds_)
-{
-#if defined ZMQ_HAVE_WINDOWS
-    Sleep (seconds_ * 1000);
-#else
-    sleep (seconds_);
-#endif
-}
-
-void *zmq_stopwatch_start ()
-{
-    uint64_t *watch = static_cast<uint64_t *> (malloc (sizeof (uint64_t)));
-    alloc_assert (watch);
-    *watch = zmq::clock_t::now_us ();
-    return static_cast<void *> (watch);
-}
-
-unsigned long zmq_stopwatch_intermediate (void *watch_)
-{
-    const uint64_t end = zmq::clock_t::now_us ();
-    const uint64_t start = *static_cast<uint64_t *> (watch_);
-    return static_cast<unsigned long> (end - start);
-}
-
-unsigned long zmq_stopwatch_stop (void *watch_)
-{
-    const unsigned long res = zmq_stopwatch_intermediate (watch_);
-    free (watch_);
-    return res;
-}
-
-void *zmq_threadstart (zmq_thread_fn *func_, void *arg_)
-{
-    zmq::thread_t *thread = new (std::nothrow) zmq::thread_t;
-    alloc_assert (thread);
-    thread->start (func_, arg_, "ZMQapp");
-    return thread;
-}
-
-void zmq_threadclose (void *thread_)
-{
-    zmq::thread_t *p_thread = static_cast<zmq::thread_t *> (thread_);
-    p_thread->stop ();
-    LIBZMQ_DELETE (p_thread);
-}
-
-//  Z85 codec, taken from 0MQ RFC project, implements RFC32 Z85 encoding
-
-//  Maps base 256 to base 85
-static char encoder[85 + 1] = {"0123456789"
-                               "abcdefghij"
-                               "klmnopqrst"
-                               "uvwxyzABCD"
-                               "EFGHIJKLMN"
-                               "OPQRSTUVWX"
-                               "YZ.-:+=^!/"
-                               "*?&<>()[]{"
-                               "}@%$#"};
-
-//  Maps base 85 to base 256
-//  We chop off lower 32 and higher 128 ranges
-//  0xFF denotes invalid characters within this range
-static uint8_t decoder[96] = {
-  0xFF, 0x44, 0xFF, 0x54, 0x53, 0x52, 0x48, 0xFF, 0x4B, 0x4C, 0x46, 0x41,
-  0xFF, 0x3F, 0x3E, 0x45, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-  0x08, 0x09, 0x40, 0xFF, 0x49, 0x42, 0x4A, 0x47, 0x51, 0x24, 0x25, 0x26,
-  0x27, 0x28, 0x29, 0x2A, 0x2B, 0x2C, 0x2D, 0x2E, 0x2F, 0x30, 0x31, 0x32,
-  0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3A, 0x3B, 0x3C, 0x3D, 0x4D,
-  0xFF, 0x4E, 0x43, 0xFF, 0xFF, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x10,
-  0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1A, 0x1B, 0x1C,
-  0x1D, 0x1E, 0x1F, 0x20, 0x21, 0x22, 0x23, 0x4F, 0xFF, 0x50, 0xFF, 0xFF};
-
-//  --------------------------------------------------------------------------
-//  Encode a binary frame as a string; destination string MUST be at least
-//  size * 5 / 4 bytes long plus 1 byte for the null terminator. Returns
-//  dest. Size must be a multiple of 4.
-//  Returns NULL and sets errno = EINVAL for invalid input.
-
-char *zmq_z85_encode (char *dest_, const uint8_t *data_, size_t size_)
-{
-    if (size_ % 4 != 0) {
-        errno = EINVAL;
-        return NULL;
-    }
-    unsigned int char_nbr = 0;
-    unsigned int byte_nbr = 0;
-    uint32_t value = 0;
-    while (byte_nbr < size_) {
-        //  Accumulate value in base 256 (binary)
-        value = value * 256 + data_[byte_nbr++];
-        if (byte_nbr % 4 == 0) {
-            //  Output value in base 85
-            unsigned int divisor = 85 * 85 * 85 * 85;
-            while (divisor) {
-                dest_[char_nbr++] = encoder[value / divisor % 85];
-                divisor /= 85;
-            }
-            value = 0;
-        }
-    }
-    assert (char_nbr == size_ * 5 / 4);
-    dest_[char_nbr] = 0;
-    return dest_;
-}
-
-
-//  --------------------------------------------------------------------------
-//  Decode an encoded string into a binary frame; dest must be at least
-//  strlen (string) * 4 / 5 bytes long. Returns dest. strlen (string)
-//  must be a multiple of 5.
-//  Returns NULL and sets errno = EINVAL for invalid input.
-
-uint8_t *zmq_z85_decode (uint8_t *dest_, const char *string_)
-{
-    unsigned int byte_nbr = 0;
-    unsigned int char_nbr = 0;
-    uint32_t value = 0;
-    size_t src_len = strlen (string_);
-
-    if (src_len < 5 || src_len % 5 != 0)
-        goto error_inval;
-
-    while (string_[char_nbr]) {
-        //  Accumulate value in base 85
-        if (UINT32_MAX / 85 < value) {
-            //  Invalid z85 encoding, represented value exceeds 0xffffffff
-            goto error_inval;
-        }
-        value *= 85;
-        const uint8_t index = string_[char_nbr++] - 32;
-        if (index >= sizeof (decoder)) {
-            //  Invalid z85 encoding, character outside range
-            goto error_inval;
-        }
-        const uint32_t summand = decoder[index];
-        if (summand == 0xFF || summand > (UINT32_MAX - value)) {
-            //  Invalid z85 encoding, invalid character or represented value exceeds 0xffffffff
-            goto error_inval;
-        }
-        value += summand;
-        if (char_nbr % 5 == 0) {
-            //  Output value in base 256
-            unsigned int divisor = 256 * 256 * 256;
-            while (divisor) {
-                dest_[byte_nbr++] = value / divisor % 256;
-                divisor /= 256;
-            }
-            value = 0;
-        }
-    }
-    if (char_nbr % 5 != 0) {
-        goto error_inval;
-    }
-    assert (byte_nbr == strlen (string_) * 4 / 5);
-    return dest_;
-
-error_inval:
-    errno = EINVAL;
-    return NULL;
-}
-
-//  --------------------------------------------------------------------------
-//  Generate a public/private keypair with tweetnacl or libsodium.
-//  Generated keys will be 40 byte z85-encoded strings.
-//  Returns 0 on success, -1 on failure, setting errno.
-//  Sets errno = ENOTSUP in the absence of a CURVE library.
-
-int zmq_curve_keypair (char *z85_public_key_, char *z85_secret_key_)
-{
-#if defined(ZMQ_HAVE_CURVE)
-#if crypto_box_PUBLICKEYBYTES != 32 || crypto_box_SECRETKEYBYTES != 32
-#error "CURVE encryption library not built correctly"
-#endif
-
-    uint8_t public_key[32];
-    uint8_t secret_key[32];
-
-    zmq::random_open ();
-
-    const int res = crypto_box_keypair (public_key, secret_key);
-    zmq_z85_encode (z85_public_key_, public_key, 32);
-    zmq_z85_encode (z85_secret_key_, secret_key, 32);
-
-    zmq::random_close ();
-
-    return res;
-#else
-    (void) z85_public_key_, (void) z85_secret_key_;
-    errno = ENOTSUP;
-    return -1;
-#endif
-}
-
-//  --------------------------------------------------------------------------
-//  Derive the public key from a private key using tweetnacl or libsodium.
-//  Derived key will be 40 byte z85-encoded string.
-//  Returns 0 on success, -1 on failure, setting errno.
-//  Sets errno = ENOTSUP in the absence of a CURVE library.
-
-int zmq_curve_public (char *z85_public_key_, const char *z85_secret_key_)
-{
-#if defined(ZMQ_HAVE_CURVE)
-#if crypto_box_PUBLICKEYBYTES != 32 || crypto_box_SECRETKEYBYTES != 32
-#error "CURVE encryption library not built correctly"
-#endif
-
-    uint8_t public_key[32];
-    uint8_t secret_key[32];
-
-    zmq::random_open ();
-
-    if (zmq_z85_decode (secret_key, z85_secret_key_) == NULL)
-        return -1;
-
-    // Return codes are suppressed as none of these can actually fail.
-    crypto_scalarmult_base (public_key, secret_key);
-    zmq_z85_encode (z85_public_key_, public_key, 32);
-
-    zmq::random_close ();
-
-    return 0;
-#else
-    (void) z85_public_key_, (void) z85_secret_key_;
-    errno = ENOTSUP;
-    return -1;
-#endif
-}
-
-
-//  --------------------------------------------------------------------------
-//  Initialize a new atomic counter, which is set to zero
-
-void *zmq_atomic_counter_new (void)
-{
-    zmq::atomic_counter_t *counter = new (std::nothrow) zmq::atomic_counter_t;
-    alloc_assert (counter);
-    return counter;
-}
-
-//  Se the value of the atomic counter
-
-void zmq_atomic_counter_set (void *counter_, int value_)
-{
-    (static_cast<zmq::atomic_counter_t *> (counter_))->set (value_);
-}
-
-//  Increment the atomic counter, and return the old value
-
-int zmq_atomic_counter_inc (void *counter_)
-{
-    return (static_cast<zmq::atomic_counter_t *> (counter_))->add (1);
-}
-
-//  Decrement the atomic counter and return 1 (if counter >= 1), or
-//  0 if counter hit zero.
-
-int zmq_atomic_counter_dec (void *counter_)
-{
-    return (static_cast<zmq::atomic_counter_t *> (counter_))->sub (1) ? 1 : 0;
-}
-
-//  Return actual value of atomic counter
-
-int zmq_atomic_counter_value (void *counter_)
-{
-    return (static_cast<zmq::atomic_counter_t *> (counter_))->get ();
-}
-
-//  Destroy atomic counter, and set reference to NULL
-
-void zmq_atomic_counter_destroy (void **counter_p_)
-{
-    delete (static_cast<zmq::atomic_counter_t *> (*counter_p_));
-    *counter_p_ = NULL;
-}
diff --git a/libs/libzmq/src/zmtp_engine.cpp b/libs/libzmq/src/zmtp_engine.cpp
deleted file mode 100644
index 0bde866..0000000
--- a/libs/libzmq/src/zmtp_engine.cpp
+++ /dev/null
@@ -1,587 +0,0 @@
-/*
-    Copyright (c) 2007-2019 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "precompiled.hpp"
-#include "macros.hpp"
-
-#include <limits.h>
-#include <string.h>
-
-#ifndef ZMQ_HAVE_WINDOWS
-#include <unistd.h>
-#endif
-
-#include <new>
-#include <sstream>
-
-#include "zmtp_engine.hpp"
-#include "io_thread.hpp"
-#include "session_base.hpp"
-#include "v1_encoder.hpp"
-#include "v1_decoder.hpp"
-#include "v2_encoder.hpp"
-#include "v2_decoder.hpp"
-#include "v3_1_encoder.hpp"
-#include "null_mechanism.hpp"
-#include "plain_client.hpp"
-#include "plain_server.hpp"
-#include "gssapi_client.hpp"
-#include "gssapi_server.hpp"
-#include "curve_client.hpp"
-#include "curve_server.hpp"
-#include "raw_decoder.hpp"
-#include "raw_encoder.hpp"
-#include "config.hpp"
-#include "err.hpp"
-#include "ip.hpp"
-#include "likely.hpp"
-#include "wire.hpp"
-
-zmq::zmtp_engine_t::zmtp_engine_t (
-  fd_t fd_,
-  const options_t &options_,
-  const endpoint_uri_pair_t &endpoint_uri_pair_) :
-    stream_engine_base_t (fd_, options_, endpoint_uri_pair_, true),
-    _greeting_size (v2_greeting_size),
-    _greeting_bytes_read (0),
-    _subscription_required (false),
-    _heartbeat_timeout (0)
-{
-    _next_msg = static_cast<int (stream_engine_base_t::*) (msg_t *)> (
-      &zmtp_engine_t::routing_id_msg);
-    _process_msg = static_cast<int (stream_engine_base_t::*) (msg_t *)> (
-      &zmtp_engine_t::process_routing_id_msg);
-
-    int rc = _pong_msg.init ();
-    errno_assert (rc == 0);
-
-    rc = _routing_id_msg.init ();
-    errno_assert (rc == 0);
-
-    if (_options.heartbeat_interval > 0) {
-        _heartbeat_timeout = _options.heartbeat_timeout;
-        if (_heartbeat_timeout == -1)
-            _heartbeat_timeout = _options.heartbeat_interval;
-    }
-}
-
-zmq::zmtp_engine_t::~zmtp_engine_t ()
-{
-    const int rc = _routing_id_msg.close ();
-    errno_assert (rc == 0);
-}
-
-void zmq::zmtp_engine_t::plug_internal ()
-{
-    // start optional timer, to prevent handshake hanging on no input
-    set_handshake_timer ();
-
-    //  Send the 'length' and 'flags' fields of the routing id message.
-    //  The 'length' field is encoded in the long format.
-    _outpos = _greeting_send;
-    _outpos[_outsize++] = UCHAR_MAX;
-    put_uint64 (&_outpos[_outsize], _options.routing_id_size + 1);
-    _outsize += 8;
-    _outpos[_outsize++] = 0x7f;
-
-    set_pollin ();
-    set_pollout ();
-    //  Flush all the data that may have been already received downstream.
-    in_event ();
-}
-
-//  Position of the revision and minor fields in the greeting.
-const size_t revision_pos = 10;
-const size_t minor_pos = 11;
-
-bool zmq::zmtp_engine_t::handshake ()
-{
-    zmq_assert (_greeting_bytes_read < _greeting_size);
-    //  Receive the greeting.
-    const int rc = receive_greeting ();
-    if (rc == -1)
-        return false;
-    const bool unversioned = rc != 0;
-
-    if (!(this
-            ->*select_handshake_fun (unversioned, _greeting_recv[revision_pos],
-                                     _greeting_recv[minor_pos])) ())
-        return false;
-
-    // Start polling for output if necessary.
-    if (_outsize == 0)
-        set_pollout ();
-
-    return true;
-}
-
-int zmq::zmtp_engine_t::receive_greeting ()
-{
-    bool unversioned = false;
-    while (_greeting_bytes_read < _greeting_size) {
-        const int n = read (_greeting_recv + _greeting_bytes_read,
-                            _greeting_size - _greeting_bytes_read);
-        if (n == -1) {
-            if (errno != EAGAIN)
-                error (connection_error);
-            return -1;
-        }
-
-        _greeting_bytes_read += n;
-
-        //  We have received at least one byte from the peer.
-        //  If the first byte is not 0xff, we know that the
-        //  peer is using unversioned protocol.
-        if (_greeting_recv[0] != 0xff) {
-            unversioned = true;
-            break;
-        }
-
-        if (_greeting_bytes_read < signature_size)
-            continue;
-
-        //  Inspect the right-most bit of the 10th byte (which coincides
-        //  with the 'flags' field if a regular message was sent).
-        //  Zero indicates this is a header of a routing id message
-        //  (i.e. the peer is using the unversioned protocol).
-        if (!(_greeting_recv[9] & 0x01)) {
-            unversioned = true;
-            break;
-        }
-
-        //  The peer is using versioned protocol.
-        receive_greeting_versioned ();
-    }
-    return unversioned ? 1 : 0;
-}
-
-void zmq::zmtp_engine_t::receive_greeting_versioned ()
-{
-    //  Send the major version number.
-    if (_outpos + _outsize == _greeting_send + signature_size) {
-        if (_outsize == 0)
-            set_pollout ();
-        _outpos[_outsize++] = 3; //  Major version number
-    }
-
-    if (_greeting_bytes_read > signature_size) {
-        if (_outpos + _outsize == _greeting_send + signature_size + 1) {
-            if (_outsize == 0)
-                set_pollout ();
-
-            //  Use ZMTP/2.0 to talk to older peers.
-            if (_greeting_recv[revision_pos] == ZMTP_1_0
-                || _greeting_recv[revision_pos] == ZMTP_2_0)
-                _outpos[_outsize++] = _options.type;
-            else {
-                _outpos[_outsize++] = 1; //  Minor version number
-                memset (_outpos + _outsize, 0, 20);
-
-                zmq_assert (_options.mechanism == ZMQ_NULL
-                            || _options.mechanism == ZMQ_PLAIN
-                            || _options.mechanism == ZMQ_CURVE
-                            || _options.mechanism == ZMQ_GSSAPI);
-
-                if (_options.mechanism == ZMQ_NULL)
-                    memcpy (_outpos + _outsize, "NULL", 4);
-                else if (_options.mechanism == ZMQ_PLAIN)
-                    memcpy (_outpos + _outsize, "PLAIN", 5);
-                else if (_options.mechanism == ZMQ_GSSAPI)
-                    memcpy (_outpos + _outsize, "GSSAPI", 6);
-                else if (_options.mechanism == ZMQ_CURVE)
-                    memcpy (_outpos + _outsize, "CURVE", 5);
-                _outsize += 20;
-                memset (_outpos + _outsize, 0, 32);
-                _outsize += 32;
-                _greeting_size = v3_greeting_size;
-            }
-        }
-    }
-}
-
-zmq::zmtp_engine_t::handshake_fun_t zmq::zmtp_engine_t::select_handshake_fun (
-  bool unversioned_, unsigned char revision_, unsigned char minor_)
-{
-    //  Is the peer using ZMTP/1.0 with no revision number?
-    if (unversioned_) {
-        return &zmtp_engine_t::handshake_v1_0_unversioned;
-    }
-    switch (revision_) {
-        case ZMTP_1_0:
-            return &zmtp_engine_t::handshake_v1_0;
-        case ZMTP_2_0:
-            return &zmtp_engine_t::handshake_v2_0;
-        case ZMTP_3_x:
-            switch (minor_) {
-                case 0:
-                    return &zmtp_engine_t::handshake_v3_0;
-                default:
-                    return &zmtp_engine_t::handshake_v3_1;
-            }
-        default:
-            return &zmtp_engine_t::handshake_v3_1;
-    }
-}
-
-bool zmq::zmtp_engine_t::handshake_v1_0_unversioned ()
-{
-    //  We send and receive rest of routing id message
-    if (session ()->zap_enabled ()) {
-        // reject ZMTP 1.0 connections if ZAP is enabled
-        error (protocol_error);
-        return false;
-    }
-
-    _encoder = new (std::nothrow) v1_encoder_t (_options.out_batch_size);
-    alloc_assert (_encoder);
-
-    _decoder = new (std::nothrow)
-      v1_decoder_t (_options.in_batch_size, _options.maxmsgsize);
-    alloc_assert (_decoder);
-
-    //  We have already sent the message header.
-    //  Since there is no way to tell the encoder to
-    //  skip the message header, we simply throw that
-    //  header data away.
-    const size_t header_size =
-      _options.routing_id_size + 1 >= UCHAR_MAX ? 10 : 2;
-    unsigned char tmp[10], *bufferp = tmp;
-
-    //  Prepare the routing id message and load it into encoder.
-    //  Then consume bytes we have already sent to the peer.
-    int rc = _routing_id_msg.close ();
-    zmq_assert (rc == 0);
-    rc = _routing_id_msg.init_size (_options.routing_id_size);
-    zmq_assert (rc == 0);
-    memcpy (_routing_id_msg.data (), _options.routing_id,
-            _options.routing_id_size);
-    _encoder->load_msg (&_routing_id_msg);
-    const size_t buffer_size = _encoder->encode (&bufferp, header_size);
-    zmq_assert (buffer_size == header_size);
-
-    //  Make sure the decoder sees the data we have already received.
-    _inpos = _greeting_recv;
-    _insize = _greeting_bytes_read;
-
-    //  To allow for interoperability with peers that do not forward
-    //  their subscriptions, we inject a phantom subscription message
-    //  message into the incoming message stream.
-    if (_options.type == ZMQ_PUB || _options.type == ZMQ_XPUB)
-        _subscription_required = true;
-
-    //  We are sending our routing id now and the next message
-    //  will come from the socket.
-    _next_msg = &zmtp_engine_t::pull_msg_from_session;
-
-    //  We are expecting routing id message.
-    _process_msg = static_cast<int (stream_engine_base_t::*) (msg_t *)> (
-      &zmtp_engine_t::process_routing_id_msg);
-
-    return true;
-}
-
-bool zmq::zmtp_engine_t::handshake_v1_0 ()
-{
-    if (session ()->zap_enabled ()) {
-        // reject ZMTP 1.0 connections if ZAP is enabled
-        error (protocol_error);
-        return false;
-    }
-
-    _encoder = new (std::nothrow) v1_encoder_t (_options.out_batch_size);
-    alloc_assert (_encoder);
-
-    _decoder = new (std::nothrow)
-      v1_decoder_t (_options.in_batch_size, _options.maxmsgsize);
-    alloc_assert (_decoder);
-
-    return true;
-}
-
-bool zmq::zmtp_engine_t::handshake_v2_0 ()
-{
-    if (session ()->zap_enabled ()) {
-        // reject ZMTP 2.0 connections if ZAP is enabled
-        error (protocol_error);
-        return false;
-    }
-
-    _encoder = new (std::nothrow) v2_encoder_t (_options.out_batch_size);
-    alloc_assert (_encoder);
-
-    _decoder = new (std::nothrow) v2_decoder_t (
-      _options.in_batch_size, _options.maxmsgsize, _options.zero_copy);
-    alloc_assert (_decoder);
-
-    return true;
-}
-
-bool zmq::zmtp_engine_t::handshake_v3_x (const bool downgrade_sub_)
-{
-    if (_options.mechanism == ZMQ_NULL
-        && memcmp (_greeting_recv + 12, "NULL\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0",
-                   20)
-             == 0) {
-        _mechanism = new (std::nothrow)
-          null_mechanism_t (session (), _peer_address, _options);
-        alloc_assert (_mechanism);
-    } else if (_options.mechanism == ZMQ_PLAIN
-               && memcmp (_greeting_recv + 12,
-                          "PLAIN\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0", 20)
-                    == 0) {
-        if (_options.as_server)
-            _mechanism = new (std::nothrow)
-              plain_server_t (session (), _peer_address, _options);
-        else
-            _mechanism =
-              new (std::nothrow) plain_client_t (session (), _options);
-        alloc_assert (_mechanism);
-    }
-#ifdef ZMQ_HAVE_CURVE
-    else if (_options.mechanism == ZMQ_CURVE
-             && memcmp (_greeting_recv + 12,
-                        "CURVE\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0", 20)
-                  == 0) {
-        if (_options.as_server)
-            _mechanism = new (std::nothrow) curve_server_t (
-              session (), _peer_address, _options, downgrade_sub_);
-        else
-            _mechanism = new (std::nothrow)
-              curve_client_t (session (), _options, downgrade_sub_);
-        alloc_assert (_mechanism);
-    }
-#endif
-#ifdef HAVE_LIBGSSAPI_KRB5
-    else if (_options.mechanism == ZMQ_GSSAPI
-             && memcmp (_greeting_recv + 12,
-                        "GSSAPI\0\0\0\0\0\0\0\0\0\0\0\0\0\0", 20)
-                  == 0) {
-        if (_options.as_server)
-            _mechanism = new (std::nothrow)
-              gssapi_server_t (session (), _peer_address, _options);
-        else
-            _mechanism =
-              new (std::nothrow) gssapi_client_t (session (), _options);
-        alloc_assert (_mechanism);
-    }
-#endif
-    else {
-        socket ()->event_handshake_failed_protocol (
-          session ()->get_endpoint (),
-          ZMQ_PROTOCOL_ERROR_ZMTP_MECHANISM_MISMATCH);
-        error (protocol_error);
-        return false;
-    }
-    _next_msg = &zmtp_engine_t::next_handshake_command;
-    _process_msg = &zmtp_engine_t::process_handshake_command;
-
-    return true;
-}
-
-bool zmq::zmtp_engine_t::handshake_v3_0 ()
-{
-    _encoder = new (std::nothrow) v2_encoder_t (_options.out_batch_size);
-    alloc_assert (_encoder);
-
-    _decoder = new (std::nothrow) v2_decoder_t (
-      _options.in_batch_size, _options.maxmsgsize, _options.zero_copy);
-    alloc_assert (_decoder);
-
-    return zmq::zmtp_engine_t::handshake_v3_x (true);
-}
-
-bool zmq::zmtp_engine_t::handshake_v3_1 ()
-{
-    _encoder = new (std::nothrow) v3_1_encoder_t (_options.out_batch_size);
-    alloc_assert (_encoder);
-
-    _decoder = new (std::nothrow) v2_decoder_t (
-      _options.in_batch_size, _options.maxmsgsize, _options.zero_copy);
-    alloc_assert (_decoder);
-
-    return zmq::zmtp_engine_t::handshake_v3_x (false);
-}
-
-int zmq::zmtp_engine_t::routing_id_msg (msg_t *msg_)
-{
-    const int rc = msg_->init_size (_options.routing_id_size);
-    errno_assert (rc == 0);
-    if (_options.routing_id_size > 0)
-        memcpy (msg_->data (), _options.routing_id, _options.routing_id_size);
-    _next_msg = &zmtp_engine_t::pull_msg_from_session;
-    return 0;
-}
-
-int zmq::zmtp_engine_t::process_routing_id_msg (msg_t *msg_)
-{
-    if (_options.recv_routing_id) {
-        msg_->set_flags (msg_t::routing_id);
-        const int rc = session ()->push_msg (msg_);
-        errno_assert (rc == 0);
-    } else {
-        int rc = msg_->close ();
-        errno_assert (rc == 0);
-        rc = msg_->init ();
-        errno_assert (rc == 0);
-    }
-
-    if (_subscription_required) {
-        msg_t subscription;
-
-        //  Inject the subscription message, so that also
-        //  ZMQ 2.x peers receive published messages.
-        int rc = subscription.init_size (1);
-        errno_assert (rc == 0);
-        *static_cast<unsigned char *> (subscription.data ()) = 1;
-        rc = session ()->push_msg (&subscription);
-        errno_assert (rc == 0);
-    }
-
-    _process_msg = &zmtp_engine_t::push_msg_to_session;
-
-    return 0;
-}
-
-int zmq::zmtp_engine_t::produce_ping_message (msg_t *msg_)
-{
-    // 16-bit TTL + \4PING == 7
-    const size_t ping_ttl_len = msg_t::ping_cmd_name_size + 2;
-    zmq_assert (_mechanism != NULL);
-
-    int rc = msg_->init_size (ping_ttl_len);
-    errno_assert (rc == 0);
-    msg_->set_flags (msg_t::command);
-    // Copy in the command message
-    memcpy (msg_->data (), "\4PING", msg_t::ping_cmd_name_size);
-
-    uint16_t ttl_val = htons (_options.heartbeat_ttl);
-    memcpy (static_cast<uint8_t *> (msg_->data ()) + msg_t::ping_cmd_name_size,
-            &ttl_val, sizeof (ttl_val));
-
-    rc = _mechanism->encode (msg_);
-    _next_msg = &zmtp_engine_t::pull_and_encode;
-    if (!_has_timeout_timer && _heartbeat_timeout > 0) {
-        add_timer (_heartbeat_timeout, heartbeat_timeout_timer_id);
-        _has_timeout_timer = true;
-    }
-    return rc;
-}
-
-int zmq::zmtp_engine_t::produce_pong_message (msg_t *msg_)
-{
-    zmq_assert (_mechanism != NULL);
-
-    int rc = msg_->move (_pong_msg);
-    errno_assert (rc == 0);
-
-    rc = _mechanism->encode (msg_);
-    _next_msg = &zmtp_engine_t::pull_and_encode;
-    return rc;
-}
-
-int zmq::zmtp_engine_t::process_heartbeat_message (msg_t *msg_)
-{
-    if (msg_->is_ping ()) {
-        // 16-bit TTL + \4PING == 7
-        const size_t ping_ttl_len = msg_t::ping_cmd_name_size + 2;
-        const size_t ping_max_ctx_len = 16;
-        uint16_t remote_heartbeat_ttl;
-
-        // Get the remote heartbeat TTL to setup the timer
-        memcpy (&remote_heartbeat_ttl,
-                static_cast<uint8_t *> (msg_->data ())
-                  + msg_t::ping_cmd_name_size,
-                ping_ttl_len - msg_t::ping_cmd_name_size);
-        remote_heartbeat_ttl = ntohs (remote_heartbeat_ttl);
-        // The remote heartbeat is in 10ths of a second
-        // so we multiply it by 100 to get the timer interval in ms.
-        remote_heartbeat_ttl *= 100;
-
-        if (!_has_ttl_timer && remote_heartbeat_ttl > 0) {
-            add_timer (remote_heartbeat_ttl, heartbeat_ttl_timer_id);
-            _has_ttl_timer = true;
-        }
-
-        //  As per ZMTP 3.1 the PING command might contain an up to 16 bytes
-        //  context which needs to be PONGed back, so build the pong message
-        //  here and store it. Truncate it if it's too long.
-        //  Given the engine goes straight to out_event, sequential PINGs will
-        //  not be a problem.
-        const size_t context_len =
-          std::min (msg_->size () - ping_ttl_len, ping_max_ctx_len);
-        const int rc =
-          _pong_msg.init_size (msg_t::ping_cmd_name_size + context_len);
-        errno_assert (rc == 0);
-        _pong_msg.set_flags (msg_t::command);
-        memcpy (_pong_msg.data (), "\4PONG", msg_t::ping_cmd_name_size);
-        if (context_len > 0)
-            memcpy (static_cast<uint8_t *> (_pong_msg.data ())
-                      + msg_t::ping_cmd_name_size,
-                    static_cast<uint8_t *> (msg_->data ()) + ping_ttl_len,
-                    context_len);
-
-        _next_msg = static_cast<int (stream_engine_base_t::*) (msg_t *)> (
-          &zmtp_engine_t::produce_pong_message);
-        out_event ();
-    }
-
-    return 0;
-}
-
-int zmq::zmtp_engine_t::process_command_message (msg_t *msg_)
-{
-    const uint8_t cmd_name_size =
-      *(static_cast<const uint8_t *> (msg_->data ()));
-    const size_t ping_name_size = msg_t::ping_cmd_name_size - 1;
-    const size_t sub_name_size = msg_t::sub_cmd_name_size - 1;
-    const size_t cancel_name_size = msg_t::cancel_cmd_name_size - 1;
-    //  Malformed command
-    if (unlikely (msg_->size () < cmd_name_size + sizeof (cmd_name_size)))
-        return -1;
-
-    const uint8_t *const cmd_name =
-      static_cast<const uint8_t *> (msg_->data ()) + 1;
-    if (cmd_name_size == ping_name_size
-        && memcmp (cmd_name, "PING", cmd_name_size) == 0)
-        msg_->set_flags (zmq::msg_t::ping);
-    if (cmd_name_size == ping_name_size
-        && memcmp (cmd_name, "PONG", cmd_name_size) == 0)
-        msg_->set_flags (zmq::msg_t::pong);
-    if (cmd_name_size == sub_name_size
-        && memcmp (cmd_name, "SUBSCRIBE", cmd_name_size) == 0)
-        msg_->set_flags (zmq::msg_t::subscribe);
-    if (cmd_name_size == cancel_name_size
-        && memcmp (cmd_name, "CANCEL", cmd_name_size) == 0)
-        msg_->set_flags (zmq::msg_t::cancel);
-
-    if (msg_->is_ping () || msg_->is_pong ())
-        return process_heartbeat_message (msg_);
-
-    return 0;
-}
diff --git a/libs/libzmq/src/zmtp_engine.hpp b/libs/libzmq/src/zmtp_engine.hpp
deleted file mode 100644
index 10f4134..0000000
--- a/libs/libzmq/src/zmtp_engine.hpp
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
-    Copyright (c) 2007-2019 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __ZMQ_ZMTP_ENGINE_HPP_INCLUDED__
-#define __ZMQ_ZMTP_ENGINE_HPP_INCLUDED__
-
-#include <stddef.h>
-
-#include "fd.hpp"
-#include "i_engine.hpp"
-#include "io_object.hpp"
-#include "i_encoder.hpp"
-#include "i_decoder.hpp"
-#include "options.hpp"
-#include "socket_base.hpp"
-#include "metadata.hpp"
-#include "msg.hpp"
-#include "stream_engine_base.hpp"
-
-namespace zmq
-{
-//  Protocol revisions
-enum
-{
-    ZMTP_1_0 = 0,
-    ZMTP_2_0 = 1,
-    ZMTP_3_x = 3
-};
-
-class io_thread_t;
-class session_base_t;
-class mechanism_t;
-
-//  This engine handles any socket with SOCK_STREAM semantics,
-//  e.g. TCP socket or an UNIX domain socket.
-
-class zmtp_engine_t ZMQ_FINAL : public stream_engine_base_t
-{
-  public:
-    zmtp_engine_t (fd_t fd_,
-                   const options_t &options_,
-                   const endpoint_uri_pair_t &endpoint_uri_pair_);
-    ~zmtp_engine_t ();
-
-  protected:
-    //  Detects the protocol used by the peer.
-    bool handshake ();
-
-    void plug_internal ();
-
-    int process_command_message (msg_t *msg_);
-    int produce_ping_message (msg_t *msg_);
-    int process_heartbeat_message (msg_t *msg_);
-    int produce_pong_message (msg_t *msg_);
-
-  private:
-    //  Receive the greeting from the peer.
-    int receive_greeting ();
-    void receive_greeting_versioned ();
-
-    typedef bool (zmtp_engine_t::*handshake_fun_t) ();
-    static handshake_fun_t select_handshake_fun (bool unversioned,
-                                                 unsigned char revision,
-                                                 unsigned char minor);
-
-    bool handshake_v1_0_unversioned ();
-    bool handshake_v1_0 ();
-    bool handshake_v2_0 ();
-    bool handshake_v3_x (bool downgrade_sub);
-    bool handshake_v3_0 ();
-    bool handshake_v3_1 ();
-
-    int routing_id_msg (msg_t *msg_);
-    int process_routing_id_msg (msg_t *msg_);
-
-    msg_t _routing_id_msg;
-
-    //  Need to store PING payload for PONG
-    msg_t _pong_msg;
-
-    static const size_t signature_size = 10;
-
-    //  Size of ZMTP/1.0 and ZMTP/2.0 greeting message
-    static const size_t v2_greeting_size = 12;
-
-    //  Size of ZMTP/3.0 greeting message
-    static const size_t v3_greeting_size = 64;
-
-    //  Expected greeting size.
-    size_t _greeting_size;
-
-    //  Greeting received from, and sent to peer
-    unsigned char _greeting_recv[v3_greeting_size];
-    unsigned char _greeting_send[v3_greeting_size];
-
-    //  Size of greeting received so far
-    unsigned int _greeting_bytes_read;
-
-    //  Indicates whether the engine is to inject a phantom
-    //  subscription message into the incoming stream.
-    //  Needed to support old peers.
-    bool _subscription_required;
-
-    int _heartbeat_timeout;
-
-    ZMQ_NON_COPYABLE_NOR_MOVABLE (zmtp_engine_t)
-};
-}
-
-#endif
diff --git a/libs/libzmq/tests/CMakeLists.txt b/libs/libzmq/tests/CMakeLists.txt
deleted file mode 100644
index 63e3c37..0000000
--- a/libs/libzmq/tests/CMakeLists.txt
+++ /dev/null
@@ -1,322 +0,0 @@
-# CMake build script for ZeroMQ tests
-cmake_minimum_required(VERSION "2.8.1")
-
-# On Windows: solution file will be called tests.sln
-project(tests)
-
-set(tests
-    test_ancillaries
-    test_system
-    test_pair_inproc
-    test_pair_tcp
-    test_reqrep_inproc
-    test_reqrep_tcp
-    test_hwm
-    test_hwm_pubsub
-    test_reqrep_device
-    test_sub_forward
-    test_invalid_rep
-    test_msg_flags
-    test_msg_ffn
-    test_connect_resolve
-    test_immediate
-    test_last_endpoint
-    test_term_endpoint
-    test_router_mandatory
-    test_probe_router
-    test_stream
-    test_stream_empty
-    test_stream_disconnect
-    test_disconnect_inproc
-    test_unbind_wildcard
-    test_ctx_options
-    test_ctx_destroy
-    test_security_no_zap_handler
-    test_security_null
-    test_security_plain
-    test_security_zap
-    test_iov
-    test_spec_req
-    test_spec_rep
-    test_spec_dealer
-    test_spec_router
-    test_spec_pushpull
-    test_req_correlate
-    test_req_relaxed
-    test_conflate
-    test_inproc_connect
-    test_issue_566
-    test_shutdown_stress
-    test_timeo
-    test_many_sockets
-    test_diffserv
-    test_connect_rid
-    test_xpub_nodrop
-    test_pub_invert_matching
-    test_setsockopt
-    test_sockopt_hwm
-    test_heartbeats
-    test_atomics
-    test_bind_src_address
-    test_capabilities
-    test_metadata
-    test_router_handover
-    test_srcfd
-    test_stream_timeout
-    test_xpub_manual
-    test_xpub_welcome_msg
-    test_xpub_verbose
-    test_base85
-    test_bind_after_connect_tcp
-    test_sodium
-    test_monitor
-    test_socket_null
-    test_reconnect_ivl
-    test_reconnect_options
-    test_tcp_accept_filter
-    test_mock_pub_sub)
-
-if(NOT WIN32)
-  list(APPEND tests test_security_gssapi test_socks test_connect_null_fuzzer test_bind_null_fuzzer test_connect_fuzzer test_bind_fuzzer)
-endif()
-
-if(ZMQ_HAVE_CURVE)
-  # TODO: always fails running under Github Actions via CMake
-  if(NOT CMAKE_SYSTEM_NAME MATCHES "Linux")
-    list(APPEND tests test_security_curve)
-  endif()
-  if(NOT WIN32)
-    list(APPEND tests test_connect_curve_fuzzer test_bind_curve_fuzzer test_z85_decode_fuzzer)
-  endif()
-endif()
-
-option(ENABLE_CAPSH "Run tests that require sudo and capsh (for cap_net_admin)" OFF)
-if(ENABLE_CAPSH)
-  find_program(CAPSH_PROGRAM NAMES capsh)
-
-  if(CAPSH_PROGRAM)
-    list(APPEND tests test_pair_tcp_cap_net_admin)
-  else()
-    message(STATUS "capsh not found, skipping tests that require CAP_NET_ADMIN")
-  endif()
-endif()
-
-if(ZMQ_HAVE_IPC)
-  list(APPEND tests test_ipc_wildcard test_pair_ipc test_reqrep_ipc test_rebind_ipc)
-endif()
-
-if(NOT WIN32)
-  list(
-    APPEND
-    tests
-    test_proxy
-    test_proxy_hwm
-    test_proxy_single_socket
-    test_proxy_terminate
-    test_getsockopt_memset
-    test_filter_ipc
-    test_stream_exceeds_buffer
-    test_router_mandatory_hwm
-    test_use_fd
-    test_zmq_poll_fd)
-  if(HAVE_FORK)
-    list(APPEND tests test_fork)
-  endif()
-  if(CMAKE_SYSTEM_NAME MATCHES "Linux")
-    list(APPEND tests test_abstract_ipc)
-    if(ZMQ_HAVE_TIPC)
-      list(
-        APPEND
-        tests
-        test_address_tipc
-        test_pair_tipc
-        test_reqrep_device_tipc
-        test_reqrep_tipc
-        test_router_mandatory_tipc
-        test_sub_forward_tipc
-        test_connect_delay_tipc
-        test_shutdown_stress_tipc
-        test_term_endpoint_tipc)
-    endif()
-  endif()
-endif()
-
-if(WITH_VMCI)
-  list(APPEND tests test_pair_vmci test_reqrep_vmci)
-endif()
-
-if(ENABLE_DRAFTS)
-  list(
-    APPEND
-    tests
-    test_poller
-    test_thread_safe
-    test_client_server
-    test_timers
-    test_radio_dish
-    test_scatter_gather
-    test_dgram
-    test_app_meta
-    test_router_notify
-    test_xpub_manual_last_value
-    test_peer
-    test_msg_init
-    test_channel
-    test_hello_msg
-    test_disconnect_msg
-    test_hiccup_msg
-    test_zmq_ppoll_fd
-    test_xsub_verbose
-)
-  if(HAVE_FORK)
-    list(APPEND tests test_zmq_ppoll_signals)
-  endif()
-  if(ZMQ_HAVE_BUSY_POLL)
-    list(APPEND tests test_busy_poll)
-  endif()
-endif()
-
-if(ZMQ_HAVE_WS)
-  list(APPEND tests test_ws_transport)
-  if(ZMQ_HAVE_WSS)
-    list(APPEND tests test_wss_transport)
-  endif()
-endif()
-
-# add location of platform.hpp for Windows builds
-if(WIN32)
-  add_definitions(-DZMQ_CUSTOM_PLATFORM_HPP)
-  add_definitions(-D_WINSOCK_DEPRECATED_NO_WARNINGS)
-  # Same name on 64bit systems
-  link_libraries(ws2_32.lib)
-endif()
-
-add_library(
-  unity STATIC
-  "${CMAKE_CURRENT_LIST_DIR}/../external/unity/unity.c" "${CMAKE_CURRENT_LIST_DIR}/../external/unity/unity.h"
-  "${CMAKE_CURRENT_LIST_DIR}/../external/unity/unity_internals.h")
-set_target_properties(unity PROPERTIES PUBLIC_HEADER "${CMAKE_CURRENT_LIST_DIR}/../external/unity/unity.h")
-target_compile_definitions(unity PUBLIC "UNITY_USE_COMMAND_LINE_ARGS" "UNITY_EXCLUDE_FLOAT")
-target_include_directories(unity PUBLIC "${CMAKE_CURRENT_LIST_DIR}/../external/unity")
-
-set(TESTUTIL_SOURCES
-    testutil.cpp
-    testutil.hpp
-    testutil_monitoring.cpp
-    testutil_monitoring.hpp
-    testutil_security.cpp
-    testutil_security.hpp
-    testutil_unity.cpp
-    testutil_unity.hpp)
-if(BUILD_STATIC)
-  add_library(testutil-static STATIC ${TESTUTIL_SOURCES})
-  target_link_libraries(testutil-static libzmq-static ${OPTIONAL_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} unity)
-endif()
-if(BUILD_SHARED)
-  add_library(testutil STATIC ${TESTUTIL_SOURCES})
-  target_link_libraries(testutil libzmq ${OPTIONAL_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} unity)
-endif()
-if(BUILD_STATIC AND NOT BUILD_SHARED)
-  # use testutil-static for both tests and unit tests
-  set(TESTUTIL_LIB testutil-static)
-else()
-  # use testutil for tests and testutil-static for unit tests
-  set(TESTUTIL_LIB testutil)
-endif()
-
-if(MSVC_VERSION LESS 1700)
-  set_source_files_properties("${CMAKE_CURRENT_LIST_DIR}/../external/unity/unity.c" PROPERTIES LANGUAGE CXX)
-endif()
-
-if(MSVC_VERSION LESS 1600)
-  target_compile_definitions(unity PUBLIC "UNITY_EXCLUDE_STDINT_H")
-endif()
-
-# add include dirs for all targets
-include_directories("${ZeroMQ_SOURCE_DIR}/../include" "${ZeroMQ_BINARY_DIR}")
-if(WIN32)
-  add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE)
-endif()
-
-# Does not work, times out every time
-if(WIN32)
-  list(REMOVE_ITEM tests test_many_sockets)
-endif()
-
-foreach(test ${tests})
-  # target_sources not supported before CMake 3.1
-  if(ZMQ_HAVE_CURVE AND ${test} MATCHES test_security_curve)
-    add_executable(${test} ${test}.cpp "../src/tweetnacl.c" "../src/err.cpp" "../src/random.cpp" "../src/clock.cpp")
-  else()
-    add_executable(${test} ${test}.cpp)
-  endif()
-  target_link_libraries(${test} ${TESTUTIL_LIB})
-  if(WIN32)
-    # This is the output for Debug dynamic builds on Visual Studio 6.0 You should provide the correct directory, don't
-    # know how to do it automatically
-    find_path(LIBZMQ_PATH "libzmq.lib" PATHS "../bin/Win32/Debug/v120/dynamic")
-    if(NOT ${LIBZMQ_PATH} STREQUAL "LIBZMQ_PATH-NOTFOUND")
-      set_target_properties(${test} PROPERTIES LINK_FLAGS "/LIBPATH:${LIBZMQ_PATH}")
-    endif()
-  else()
-    # per-test directories not generated on OS X / Darwin
-    if(NOT ${CMAKE_CXX_COMPILER_ID} MATCHES "Clang.*")
-      link_directories(${test} PRIVATE "${ZeroMQ_SOURCE_DIR}/../lib")
-    endif()
-  endif()
-
-  if(RT_LIBRARY)
-    target_link_libraries(${test} ${RT_LIBRARY})
-  endif()
-
-  if(CMAKE_SYSTEM_NAME MATCHES "QNX")
-    target_link_libraries(${test} socket)
-    target_link_libraries(${test} m)
-  endif()
-
-  if(WIN32)
-    add_test(
-      NAME ${test}
-      WORKING_DIRECTORY ${LIBRARY_OUTPUT_PATH}
-      COMMAND ${test})
-  else()
-    if(${test} MATCHES "_cap_net_admin")
-      add_test(NAME ${test} COMMAND sh -c "sudo ${CAPSH_PROGRAM} --caps=cap_net_admin+eip -- -c $<TARGET_FILE:${test}>")
-    else()
-      add_test(NAME ${test} COMMAND ${test})
-    endif()
-  endif()
-  set_tests_properties(${test} PROPERTIES TIMEOUT 10)
-  set_tests_properties(${test} PROPERTIES SKIP_RETURN_CODE 77)
-endforeach()
-
-# override timeout for these tests
-set_tests_properties(test_heartbeats PROPERTIES TIMEOUT 60)
-
-if(WIN32 AND ENABLE_DRAFTS)
-  set_tests_properties(test_radio_dish PROPERTIES TIMEOUT 30)
-endif()
-
-if(NOT CMAKE_SYSTEM_NAME MATCHES "Linux")
-  if(ZMQ_HAVE_CURVE)
-    set_tests_properties(test_security_curve PROPERTIES TIMEOUT 60)
-  endif()
-  # add additional required flags ZMQ_USE_TWEETNACL will already be defined when not using sodium
-  if(ZMQ_HAVE_CURVE AND NOT ZMQ_USE_TWEETNACL)
-    target_compile_definitions(test_security_curve PRIVATE "-DZMQ_USE_TWEETNACL")
-  endif()
-endif()
-
-set_tests_properties(test_security_zap PROPERTIES TIMEOUT 60)
-set_tests_properties(test_reconnect_ivl PROPERTIES TIMEOUT 15)
-
-# Check whether all tests in the current folder are present
-file(READ "${CMAKE_CURRENT_LIST_FILE}" CURRENT_LIST_FILE_CONTENT)
-file(GLOB ALL_TEST_SOURCES "test_*.cpp")
-foreach(TEST_SOURCE ${ALL_TEST_SOURCES})
-  get_filename_component(TESTNAME "${TEST_SOURCE}" NAME_WE)
-  string(REGEX MATCH "${TESTNAME}" MATCH_TESTNAME "${CURRENT_LIST_FILE_CONTENT}")
-  if(NOT MATCH_TESTNAME)
-    message(AUTHOR_WARNING "Test '${TESTNAME}' is not known to CTest.")
-  endif()
-endforeach()
diff --git a/libs/libzmq/tests/README.md b/libs/libzmq/tests/README.md
deleted file mode 100644
index f456898..0000000
--- a/libs/libzmq/tests/README.md
+++ /dev/null
@@ -1,45 +0,0 @@
-#   Guidelines for tests
-
-Write your test case as if you were writing clean application code. It should be safe to compile on all platforms.
-
-Normally, you should only include the header files from the tests directory, e.g. `testutil.hpp`. Do not include files from src. Do not use the internal libzmq API. Tests for these should be placed in unittests instead.
-
-If you must write non-portable code, wrap it in #ifdefs to ensure it will compile and run on all systems.
-
-Note that testutil.hpp includes platform.h. Do not include it yourself as it changes location depending on the build system and OS.
-
-All sources must contain the correct copyright header. Please copy from test_system.cpp if you're not certain.
-
-Write new tests using the unity test framework. For an example, see test_sockopt_hwm.
-
-Please use only ANSI C99 in test cases, no C++. This is to make the code more reusable.
-
-On many slower environments, like embedded systems, VMs or CI systems, tests might
-fail because it takes time for sockets to settle after a connect. If you need
-to add a sleep, please be consistent with all the other tests and use:
-  msleep (SETTLE_TIME);
-  
-#   Ensure proper cleanup
-
-If a test program uses unity, it will execute test cases individually, and will continue to run further test cases if an assertion in one test case fails. However, the test case that had an assertion failure will be aborted.
-To ensure that the resources of the test case are properly cleaned up, use appropriate setUp and tearDown functions. These are run by unity before each test case starts resp. after it ended (whether successfully or not).
-The same setUp and tearDown function is used for all test cases in a test program.
-
-For many test cases, the following setUp and tearDown functions will be appropriate:
-	void setUp ()
-	{
-		setup_test_context ();
-	}
-
-	void tearDown ()
-	{
-		teardown_test_context ();
-	}
-
-Within the tests, do not use zmq_socket and zmq_close then but test_context_socket and test_context_socket_close instead. These functions will register/unregister sockets with the test_context. 
-All sockets not closed when tearDown is executed, with forcibly be closed with linger=0 before terminating the context. Note that it is a misuse not to close sockets during successful test execution, 
-and a warning will be output.
-
-#   Building tests in Windows
-
-The tests are only built via cmake, not when using the checked-in Visual Studio .sln files.
diff --git a/libs/libzmq/tests/test_abstract_ipc.cpp b/libs/libzmq/tests/test_abstract_ipc.cpp
deleted file mode 100644
index f01d8bd..0000000
--- a/libs/libzmq/tests/test_abstract_ipc.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-#include <string.h>
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-static const char test_endpoint[] = "ipc://@tmp-tester";
-static const char test_endpoint_empty[] = "ipc://@";
-
-void test_roundtrip ()
-{
-    void *sb = test_context_socket (ZMQ_DEALER);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (sb, test_endpoint));
-
-    char endpoint[MAX_SOCKET_STRING];
-    size_t size = sizeof (endpoint);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (sb, ZMQ_LAST_ENDPOINT, endpoint, &size));
-    TEST_ASSERT_EQUAL_INT (0, strncmp (endpoint, test_endpoint, size));
-
-    void *sc = test_context_socket (ZMQ_DEALER);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sc, test_endpoint));
-
-    bounce (sb, sc);
-
-    test_context_socket_close (sc);
-    test_context_socket_close (sb);
-}
-
-void test_empty_abstract_name ()
-{
-    void *sb = test_context_socket (ZMQ_DEALER);
-    TEST_ASSERT_FAILURE_ERRNO (EINVAL, zmq_bind (sb, test_endpoint_empty));
-
-    test_context_socket_close (sb);
-}
-
-int main (void)
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_roundtrip);
-    RUN_TEST (test_empty_abstract_name);
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_address_tipc.cpp b/libs/libzmq/tests/test_address_tipc.cpp
deleted file mode 100644
index de545a1..0000000
--- a/libs/libzmq/tests/test_address_tipc.cpp
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
-    Copyright (c) 2007-2018 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void test_tipc_port_name_and_domain ()
-{
-    // test Port Name addressing
-    void *sb = test_context_socket (ZMQ_REP);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (sb, "tipc://{5560,0,0}"));
-
-    void *sc = test_context_socket (ZMQ_REQ);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sc, "tipc://{5560,0}@0.0.0"));
-
-    bounce (sb, sc);
-
-    test_context_socket_close (sc);
-    test_context_socket_close (sb);
-}
-
-void test_tipc_port_identity ()
-{
-    char endpoint[256];
-    unsigned int z, c, n, ref;
-
-    void *sb = test_context_socket (ZMQ_REP);
-    void *sc = test_context_socket (ZMQ_REQ);
-
-    // Test binding to random Port Identity and
-    // test resolving assigned address, should return a properly formatted string
-    bind_loopback_tipc (sb, endpoint, sizeof endpoint);
-
-    int rc = sscanf (&endpoint[0], "tipc://<%u.%u.%u:%u>", &z, &c, &n, &ref);
-    TEST_ASSERT_EQUAL_INT (4, rc);
-
-    TEST_ASSERT_NOT_EQUAL_MESSAGE (
-      0, ref, "tipc port number must not be 0 after random assignment");
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sc, endpoint));
-
-    bounce (sb, sc);
-
-    test_context_socket_close (sc);
-    test_context_socket_close (sb);
-}
-
-void test_tipc_bad_addresses ()
-{
-    // Test Port Name addressing
-    void *sb = test_context_socket (ZMQ_REP);
-
-    // Test binding to a fixed address, should fail
-    TEST_ASSERT_FAILURE_ERRNO (EINVAL, zmq_bind (sb, "tipc://<1.2.3:123123>"));
-
-    // Test connecting to random identity, should fail
-    TEST_ASSERT_FAILURE_ERRNO (EINVAL, zmq_connect (sb, "tipc://<*>"));
-
-    // Clean up
-    test_context_socket_close (sb);
-}
-
-
-int main ()
-{
-    setup_test_environment ();
-
-    if (!is_tipc_available ()) {
-        printf ("TIPC environment unavailable, skipping test\n");
-        return 77;
-    }
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_tipc_port_name_and_domain);
-    RUN_TEST (test_tipc_port_identity);
-    RUN_TEST (test_tipc_bad_addresses);
-
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_ancillaries.cpp b/libs/libzmq/tests/test_ancillaries.cpp
deleted file mode 100644
index 2f98256..0000000
--- a/libs/libzmq/tests/test_ancillaries.cpp
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/*
- * File for adding tests for ancillary API methods and other miscellaenous
- * API internals. Please ensure that when adding such tests into this file,
- * that they are short-lived so they do not trigger timeouts in the
- * CI build environments.
- */
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-void setUp ()
-{
-}
-
-void tearDown ()
-{
-}
-
-void test_version ()
-{
-    int major, minor, patch;
-
-    zmq_version (&major, &minor, &patch);
-    TEST_ASSERT_EQUAL_INT (ZMQ_VERSION_MAJOR, major);
-    TEST_ASSERT_EQUAL_INT (ZMQ_VERSION_MINOR, minor);
-    TEST_ASSERT_EQUAL_INT (ZMQ_VERSION_PATCH, patch);
-}
-
-void test_strerrror ()
-{
-    TEST_ASSERT_NOT_NULL (zmq_strerror (EINVAL));
-}
-
-int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_version);
-    RUN_TEST (test_strerrror);
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_app_meta.cpp b/libs/libzmq/tests/test_app_meta.cpp
deleted file mode 100644
index f1f824b..0000000
--- a/libs/libzmq/tests/test_app_meta.cpp
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
-    Copyright (c) 2007-2018 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-#include <unity.h>
-
-#include <string.h>
-
-void setUp ()
-{
-}
-void tearDown ()
-{
-}
-
-void test_app_meta_reqrep ()
-{
-    void *ctx;
-    zmq_msg_t msg;
-    void *rep_sock, *req_sock;
-    char connect_address[MAX_SOCKET_STRING];
-    const char *req_hello = "X-hello:hello";
-    const char *req_connection = "X-connection:primary";
-    const char *req_z85 = "X-bin:009c6";
-    const char *rep_hello = "X-hello:world";
-    const char *rep_connection = "X-connection:backup";
-    const char *bad_strings[] = {
-      ":",
-      "key:",
-      ":value",
-      "keyvalue",
-      "",
-      "X-"
-      "KeyTooLongKeyTooLongKeyTooLongKeyTooLongKeyTooLongKeyTooLongKeyTooLongKe"
-      "yTooLongKeyTooLongKeyTooLongKeyTooLongKeyTooLongKeyTooLongKeyTooLongKeyT"
-      "ooLongKeyTooLongKeyTooLongKeyTooLongKeyTooLongKeyTooLongKeyTooLongKeyToo"
-      "LongKeyTooLongKeyTooLongKeyTooLongKeyTooLong:value"};
-
-    ctx = zmq_ctx_new ();
-    rep_sock = zmq_socket (ctx, ZMQ_REP);
-    TEST_ASSERT_NOT_NULL (rep_sock);
-    req_sock = zmq_socket (ctx, ZMQ_REQ);
-    TEST_ASSERT_NOT_NULL (req_sock);
-
-    int rc =
-      zmq_setsockopt (rep_sock, ZMQ_METADATA, rep_hello, strlen (rep_hello));
-    TEST_ASSERT_EQUAL_INT (0, rc);
-
-    int l = 0;
-    rc = zmq_setsockopt (rep_sock, ZMQ_LINGER, &l, sizeof (l));
-    TEST_ASSERT_EQUAL_INT (0, rc);
-
-    rc = zmq_setsockopt (rep_sock, ZMQ_METADATA, rep_connection,
-                         strlen (rep_connection));
-    TEST_ASSERT_EQUAL_INT (0, rc);
-
-    for (int i = 0; i < 6; i++) {
-        rc = zmq_setsockopt (rep_sock, ZMQ_METADATA, bad_strings[i],
-                             strlen (bad_strings[i]));
-        TEST_ASSERT_EQUAL_INT (-1, rc);
-    }
-
-    bind_loopback_ipv4 (rep_sock, connect_address, sizeof connect_address);
-
-    l = 0;
-    rc = zmq_setsockopt (req_sock, ZMQ_LINGER, &l, sizeof (l));
-    TEST_ASSERT_EQUAL_INT (0, rc);
-
-    rc = zmq_setsockopt (req_sock, ZMQ_METADATA, req_hello, strlen (req_hello));
-    TEST_ASSERT_EQUAL_INT (0, rc);
-
-    rc = zmq_setsockopt (req_sock, ZMQ_METADATA, req_connection,
-                         strlen (req_connection));
-    TEST_ASSERT_EQUAL_INT (0, rc);
-
-    rc = zmq_setsockopt (req_sock, ZMQ_METADATA, req_z85, strlen (req_z85));
-    TEST_ASSERT_EQUAL_INT (0, rc);
-
-    rc = zmq_connect (req_sock, connect_address);
-    TEST_ASSERT_EQUAL_INT (0, rc);
-
-    rc = zmq_msg_init_size (&msg, 1);
-    TEST_ASSERT_EQUAL_INT (0, rc);
-
-    char *data = static_cast<char *> (zmq_msg_data (&msg));
-    data[0] = 1;
-
-    rc = zmq_msg_send (&msg, req_sock, 0);
-    TEST_ASSERT_EQUAL_INT (1, rc);
-
-    rc = zmq_msg_init (&msg);
-    TEST_ASSERT_EQUAL_INT (0, rc);
-
-    rc = zmq_msg_recv (&msg, rep_sock, 0);
-    TEST_ASSERT_EQUAL_INT (1, rc);
-
-    TEST_ASSERT_EQUAL_STRING ("hello", zmq_msg_gets (&msg, "X-hello"));
-    TEST_ASSERT_EQUAL_STRING ("primary", zmq_msg_gets (&msg, "X-connection"));
-    const char *const bindata = zmq_msg_gets (&msg, "X-bin");
-    TEST_ASSERT_NOT_NULL (bindata);
-    uint8_t rawdata[4];
-    const uint8_t *const ret = zmq_z85_decode (rawdata, bindata);
-    TEST_ASSERT_NOT_NULL (ret);
-    TEST_ASSERT_EQUAL_UINT8 (0, rawdata[0]);
-    TEST_ASSERT_EQUAL_UINT8 (1, rawdata[1]);
-    TEST_ASSERT_EQUAL_UINT8 (2, rawdata[2]);
-    TEST_ASSERT_EQUAL_UINT8 (3, rawdata[3]);
-
-    TEST_ASSERT_NULL (zmq_msg_gets (&msg, "X-foobar"));
-    TEST_ASSERT_NULL (zmq_msg_gets (&msg, "foobar"));
-
-    rc = zmq_msg_send (&msg, rep_sock, 0);
-    TEST_ASSERT_EQUAL_INT (1, rc);
-
-    rc = zmq_msg_recv (&msg, req_sock, 0);
-    TEST_ASSERT_EQUAL_INT (1, rc);
-
-    TEST_ASSERT_EQUAL_STRING ("world", zmq_msg_gets (&msg, "X-hello"));
-    TEST_ASSERT_EQUAL_STRING ("backup", zmq_msg_gets (&msg, "X-connection"));
-
-    rc = zmq_msg_close (&msg);
-    TEST_ASSERT_EQUAL_INT (0, rc);
-
-    rc = zmq_close (req_sock);
-    TEST_ASSERT_EQUAL_INT (0, rc);
-
-    rc = zmq_close (rep_sock);
-    TEST_ASSERT_EQUAL_INT (0, rc);
-
-    zmq_ctx_term (ctx);
-}
-
-
-int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_app_meta_reqrep);
-
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_atomics.cpp b/libs/libzmq/tests/test_atomics.cpp
deleted file mode 100644
index b1e5772..0000000
--- a/libs/libzmq/tests/test_atomics.cpp
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-#include <unity.h>
-
-void setUp ()
-{
-}
-
-void tearDown ()
-{
-}
-
-void test ()
-{
-    void *counter = zmq_atomic_counter_new ();
-    TEST_ASSERT_EQUAL_INT (0, zmq_atomic_counter_value (counter));
-    TEST_ASSERT_EQUAL_INT (0, zmq_atomic_counter_inc (counter));
-    TEST_ASSERT_EQUAL_INT (1, zmq_atomic_counter_inc (counter));
-    TEST_ASSERT_EQUAL_INT (2, zmq_atomic_counter_inc (counter));
-    TEST_ASSERT_EQUAL_INT (3, zmq_atomic_counter_value (counter));
-    TEST_ASSERT_EQUAL_INT (1, zmq_atomic_counter_dec (counter));
-    TEST_ASSERT_EQUAL_INT (1, zmq_atomic_counter_dec (counter));
-    TEST_ASSERT_EQUAL_INT (0, zmq_atomic_counter_dec (counter));
-    zmq_atomic_counter_set (counter, 2);
-    TEST_ASSERT_EQUAL_INT (1, zmq_atomic_counter_dec (counter));
-    TEST_ASSERT_EQUAL_INT (0, zmq_atomic_counter_dec (counter));
-    zmq_atomic_counter_destroy (&counter);
-}
-
-int main ()
-{
-    UNITY_BEGIN ();
-    RUN_TEST (test);
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_base85.cpp b/libs/libzmq/tests/test_base85.cpp
deleted file mode 100644
index d2fc131..0000000
--- a/libs/libzmq/tests/test_base85.cpp
+++ /dev/null
@@ -1,204 +0,0 @@
-/*
-    Copyright (c) 2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-void setUp ()
-{
-}
-
-void tearDown ()
-{
-}
-
-// Test vector: rfc.zeromq.org/spec:32/Z85
-void test__zmq_z85_encode__valid__success ()
-{
-    static const size_t size = 8;
-    static const size_t length = size * 5 / 4;
-    static const uint8_t decoded[size] = {0x86, 0x4F, 0xD2, 0x6F,
-                                          0xB5, 0x59, 0xF7, 0x5B};
-    static const char expected[length + 1] = "HelloWorld";
-    char out_encoded[length + 1] = {0};
-
-    errno = 0;
-    TEST_ASSERT_NOT_NULL (zmq_z85_encode (out_encoded, decoded, size));
-    TEST_ASSERT_EQUAL_STRING (expected, out_encoded);
-    TEST_ASSERT_EQUAL_INT (0, zmq_errno ());
-}
-
-// Buffer length must be evenly divisible by 4 or must fail with EINVAL.
-void test__zmq_z85_encode__invalid__failure (size_t size_)
-{
-    errno = 0;
-    TEST_ASSERT_NULL (zmq_z85_encode (NULL, NULL, size_));
-    TEST_ASSERT_EQUAL_INT (EINVAL, zmq_errno ());
-}
-
-// Test vector: rfc.zeromq.org/spec:32/Z85
-void test__zmq_z85_decode__valid__success ()
-{
-    static const size_t size = 10 * 4 / 5;
-    static const uint8_t expected[size] = {0x86, 0x4F, 0xD2, 0x6F,
-                                           0xB5, 0x59, 0xF7, 0x5B};
-    static const char *encoded = "HelloWorld";
-    uint8_t out_decoded[size] = {0};
-
-    errno = 0;
-    TEST_ASSERT_NOT_NULL (zmq_z85_decode (out_decoded, encoded));
-    TEST_ASSERT_EQUAL_INT (0, zmq_errno ());
-    TEST_ASSERT_EQUAL_UINT8_ARRAY (expected, out_decoded, size);
-}
-
-// Invalid input data must fail with EINVAL.
-template <size_t SIZE>
-void test__zmq_z85_decode__invalid__failure (const char (&encoded_)[SIZE])
-{
-    uint8_t decoded[SIZE * 4 / 5 + 1];
-    errno = 0;
-    TEST_ASSERT_NULL (zmq_z85_decode (decoded, encoded_));
-    TEST_ASSERT_EQUAL_INT (EINVAL, zmq_errno ());
-}
-
-
-// call zmq_z85_encode, then zmq_z85_decode, and compare the results with the original
-template <size_t SIZE>
-void test__zmq_z85_encode__zmq_z85_decode__roundtrip (
-  const uint8_t (&test_data_)[SIZE])
-{
-    char test_data_z85[SIZE * 5 / 4 + 1];
-    const char *const res1 = zmq_z85_encode (test_data_z85, test_data_, SIZE);
-    TEST_ASSERT_NOT_NULL (res1);
-
-    uint8_t test_data_decoded[SIZE];
-    const uint8_t *const res2 =
-      zmq_z85_decode (test_data_decoded, test_data_z85);
-    TEST_ASSERT_NOT_NULL (res2);
-
-    TEST_ASSERT_EQUAL_UINT8_ARRAY (test_data_, test_data_decoded, SIZE);
-}
-
-// call zmq_z85_encode, then zmq_z85_decode, and compare the results with the original
-template <size_t SIZE>
-void test__zmq_z85_decode__zmq_z85_encode__roundtrip (
-  const char (&test_data_)[SIZE])
-{
-    const size_t decoded_size = (SIZE - 1) * 4 / 5;
-    uint8_t test_data_decoded[decoded_size];
-    const uint8_t *const res1 = zmq_z85_decode (test_data_decoded, test_data_);
-    TEST_ASSERT_NOT_NULL (res1);
-
-    char test_data_z85[SIZE];
-    const char *const res2 =
-      zmq_z85_encode (test_data_z85, test_data_decoded, decoded_size);
-    TEST_ASSERT_NOT_NULL (res2);
-
-    TEST_ASSERT_EQUAL_UINT8_ARRAY (test_data_, test_data_z85, SIZE);
-}
-
-#define def_test__zmq_z85_basename(basename, name, param)                      \
-    void test__zmq_z85_##basename##_##name ()                                  \
-    {                                                                          \
-        test__zmq_z85_##basename (param);                                      \
-    }
-
-#define def_test__zmq_z85_encode__invalid__failure(name, param)                \
-    def_test__zmq_z85_basename (encode__invalid__failure, name, param)
-
-def_test__zmq_z85_encode__invalid__failure (1, 1)
-  def_test__zmq_z85_encode__invalid__failure (42, 42)
-
-#define def_test__zmq_z85_decode__invalid__failure(name, param)                \
-    def_test__zmq_z85_basename (decode__invalid__failure, name, param)
-
-  // String length must be evenly divisible by 5 or must fail with EINVAL.
-  def_test__zmq_z85_decode__invalid__failure (indivisble_by_5_multiple_chars,
-                                              "01234567")
-    def_test__zmq_z85_decode__invalid__failure (indivisble_by_5_one_char, "0")
-
-  // decode invalid data with the maximum representable value
-  def_test__zmq_z85_decode__invalid__failure (max, "#####")
-
-  // decode invalid data with the minimum value beyond the limit
-  // "%nSc0" is 0xffffffff
-  def_test__zmq_z85_decode__invalid__failure (above_limit, "%nSc1")
-
-  // decode invalid data with an invalid character in the range of valid
-  // characters
-  def_test__zmq_z85_decode__invalid__failure (char_within, "####\0047")
-
-  // decode invalid data with an invalid character just below the range of valid
-  // characters
-  def_test__zmq_z85_decode__invalid__failure (char_adjacent_below, "####\0200")
-
-  // decode invalid data with an invalid character just above the range of valid
-  // characters
-  def_test__zmq_z85_decode__invalid__failure (char_adjacent_above, "####\0037")
-
-#define def_test__encode__zmq_z85_decode__roundtrip(name, param)               \
-    def_test__zmq_z85_basename (encode__zmq_z85_decode__roundtrip, name, param)
-
-    const uint8_t test_data_min[] = {0x00, 0x00, 0x00, 0x00};
-const uint8_t test_data_max[] = {0xff, 0xff, 0xff, 0xff};
-
-def_test__encode__zmq_z85_decode__roundtrip (min, test_data_min)
-  def_test__encode__zmq_z85_decode__roundtrip (max, test_data_max)
-
-#define def_test__decode__zmq_z85_encode__roundtrip(name, param)               \
-    def_test__zmq_z85_basename (decode__zmq_z85_encode__roundtrip, name, param)
-
-    const char test_data_regular[] = "r^/rM9M=rMToK)63O8dCvd9D<PY<7iGlC+{BiSnG";
-
-def_test__decode__zmq_z85_encode__roundtrip (regular, test_data_regular)
-
-  int main ()
-{
-    UNITY_BEGIN ();
-    RUN_TEST (test__zmq_z85_encode__valid__success);
-    RUN_TEST (test__zmq_z85_encode__invalid__failure_1);
-    RUN_TEST (test__zmq_z85_encode__invalid__failure_42);
-
-    RUN_TEST (test__zmq_z85_decode__valid__success);
-    RUN_TEST (
-      test__zmq_z85_decode__invalid__failure_indivisble_by_5_multiple_chars);
-    RUN_TEST (test__zmq_z85_decode__invalid__failure_indivisble_by_5_one_char);
-    RUN_TEST (test__zmq_z85_decode__invalid__failure_max);
-    RUN_TEST (test__zmq_z85_decode__invalid__failure_above_limit);
-    RUN_TEST (test__zmq_z85_decode__invalid__failure_char_within);
-    RUN_TEST (test__zmq_z85_decode__invalid__failure_char_adjacent_below);
-    RUN_TEST (test__zmq_z85_decode__invalid__failure_char_adjacent_above);
-
-    RUN_TEST (test__zmq_z85_encode__zmq_z85_decode__roundtrip_min);
-    RUN_TEST (test__zmq_z85_encode__zmq_z85_decode__roundtrip_max);
-
-    RUN_TEST (test__zmq_z85_decode__zmq_z85_encode__roundtrip_regular);
-
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_bind_after_connect_tcp.cpp b/libs/libzmq/tests/test_bind_after_connect_tcp.cpp
deleted file mode 100644
index eb2ecb1..0000000
--- a/libs/libzmq/tests/test_bind_after_connect_tcp.cpp
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
-    Copyright (c) 2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void test_x ()
-{
-    void *sb = test_context_socket (ZMQ_DEALER);
-    void *sc = test_context_socket (ZMQ_DEALER);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sc, ENDPOINT_3));
-
-    send_string_expect_success (sc, "foobar", 0);
-    send_string_expect_success (sc, "baz", 0);
-    send_string_expect_success (sc, "buzz", 0);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (sb, ENDPOINT_3));
-
-    recv_string_expect_success (sb, "foobar", 0);
-    recv_string_expect_success (sb, "baz", 0);
-    recv_string_expect_success (sb, "buzz", 0);
-
-    test_context_socket_close (sc);
-    test_context_socket_close (sb);
-}
-
-int main (void)
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_x);
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_bind_curve_fuzzer.cpp b/libs/libzmq/tests/test_bind_curve_fuzzer.cpp
deleted file mode 100644
index 35d2d76..0000000
--- a/libs/libzmq/tests/test_bind_curve_fuzzer.cpp
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
-    Copyright (c) 2020 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifdef ZMQ_USE_FUZZING_ENGINE
-#include <fuzzer/FuzzedDataProvider.h>
-#endif
-
-#include <string.h>
-
-#include "testutil.hpp"
-#include "testutil_security.hpp"
-
-// Test that the ZMTP engine handles invalid handshake when binding
-// https://rfc.zeromq.org/spec/37/
-extern "C" int LLVMFuzzerTestOneInput (const uint8_t *data, size_t size)
-{
-    const char *fixed_client_public =
-      "{{k*81)yMWEF{/BxdMd[5RL^qRFxBgoL<8m.D^KD";
-    const char *fixed_client_secret =
-      "N?Gmik8R[2ACw{b7*[-$S6[4}aO#?DB?#=<OQPc7";
-    const char *fixed_server_public =
-      "3.9-xXwy{g*w72TP*3iB9IJJRxlBH<ufTAvPd2>C";
-    const char *fixed_server_secret =
-      "T}t5GLq%&Qm1)y3ywu-}pY3KEA//{^Ut!M1ut+B4";
-    void *handler;
-    void *zap_thread;
-    void *server;
-    void *server_mon;
-    char my_endpoint[MAX_SOCKET_STRING];
-
-    setup_test_context ();
-    memcpy (valid_client_public, fixed_client_public, 41);
-    setup_context_and_server_side (
-      &handler, &zap_thread, &server, &server_mon, my_endpoint, &zap_handler,
-      &socket_config_curve_server, (void *) fixed_server_secret);
-    fd_t client = connect_socket (my_endpoint);
-
-    //  If there is not enough data for a full greeting, just send what we can
-    //  Otherwise send greeting first, as expected by the protocol
-    uint8_t buf[512];
-    if (size >= 64) {
-        send (client, (void *) data, 64, MSG_NOSIGNAL);
-        data += 64;
-        size -= 64;
-    }
-    recv (client, buf, 64, 0);
-    // Then send HELLO and expect WELCOME if there's enough data
-    if (size >= 202) {
-        send (client, (void *) data, 202, MSG_NOSIGNAL);
-        data += 202;
-        size -= 202;
-        recv (client, buf, 170, MSG_DONTWAIT);
-    }
-    // Then send READY and expect INITIATE if there's enough data
-    if (size >= 301) {
-        send (client, (void *) data, 301, MSG_NOSIGNAL);
-        data += 301;
-        size -= 301;
-        recv (client, buf, 512, MSG_DONTWAIT);
-    }
-    msleep (250);
-    for (ssize_t sent = 0; size > 0 && (sent != -1 || errno == EINTR);
-         size -= sent > 0 ? sent : 0, data += sent > 0 ? sent : 0)
-        sent = send (client, (const char *) data, size, MSG_NOSIGNAL);
-    msleep (250);
-
-    //  Drain the queue, if any
-    zmq_msg_t msg;
-    zmq_msg_init (&msg);
-    while (-1 != zmq_msg_recv (&msg, server, ZMQ_DONTWAIT)) {
-        zmq_msg_close (&msg);
-        zmq_msg_init (&msg);
-    }
-
-    //  A well-behaved client should work while the malformed data from the other
-    //  is being received
-    curve_client_data_t curve_client_data = {
-      fixed_server_public, fixed_client_public, fixed_client_secret};
-    void *client_mon;
-    void *client_good = create_and_connect_client (
-      my_endpoint, socket_config_curve_client, &curve_client_data, &client_mon);
-
-    bounce (server, client_good);
-
-    close (client);
-    test_context_socket_close_zero_linger (client_good);
-    test_context_socket_close_zero_linger (client_mon);
-    shutdown_context_and_server_side (zap_thread, server, server_mon, handler);
-    teardown_test_context ();
-
-    return 0;
-}
-
-#ifndef ZMQ_USE_FUZZING_ENGINE
-void test_bind_curve_fuzzer ()
-{
-    uint8_t **data;
-    size_t *len, num_cases = 0;
-    if (fuzzer_corpus_encode (
-          "tests/libzmq-fuzz-corpora/test_bind_curve_fuzzer_seed_corpus", &data,
-          &len, &num_cases)
-        != 0)
-        exit (77);
-
-    while (num_cases-- > 0) {
-        TEST_ASSERT_SUCCESS_ERRNO (
-          LLVMFuzzerTestOneInput (data[num_cases], len[num_cases]));
-        free (data[num_cases]);
-    }
-
-    free (data);
-    free (len);
-}
-
-int main (int argc, char **argv)
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_bind_curve_fuzzer);
-
-    return UNITY_END ();
-}
-#endif
diff --git a/libs/libzmq/tests/test_bind_fuzzer.cpp b/libs/libzmq/tests/test_bind_fuzzer.cpp
deleted file mode 100644
index 484e2e8..0000000
--- a/libs/libzmq/tests/test_bind_fuzzer.cpp
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
-    Copyright (c) 2020 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifdef ZMQ_USE_FUZZING_ENGINE
-#include <fuzzer/FuzzedDataProvider.h>
-#endif
-
-#include <string>
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-#ifndef PATH_MAX
-#define PATH_MAX 1024
-#endif
-
-// Test that zmq_bind can handle malformed strings
-extern "C" int LLVMFuzzerTestOneInput (const uint8_t *data, size_t size)
-{
-    //  This test might create socket files, so move to /tmp to avoid clobbering
-    //  the working directory with random filenames
-    char *pwd = (char *) malloc (PATH_MAX + 1);
-    TEST_ASSERT_NOT_NULL (pwd);
-    TEST_ASSERT_NOT_NULL (getcwd (pwd, PATH_MAX + 1));
-    TEST_ASSERT_SUCCESS_ERRNO (chdir ("/tmp"));
-
-    setup_test_context ();
-    std::string my_endpoint (reinterpret_cast<const char *> (data), size);
-    void *socket = test_context_socket (ZMQ_PUB);
-    zmq_bind (socket, my_endpoint.c_str ());
-
-    test_context_socket_close_zero_linger (socket);
-    teardown_test_context ();
-    TEST_ASSERT_SUCCESS_ERRNO (chdir (pwd));
-    free (pwd);
-
-    return 0;
-}
-
-#ifndef ZMQ_USE_FUZZING_ENGINE
-void test_bind_fuzzer ()
-{
-    uint8_t **data;
-    size_t *len, num_cases = 0;
-    if (fuzzer_corpus_encode (
-          "tests/libzmq-fuzz-corpora/test_bind_fuzzer_seed_corpus", &data, &len,
-          &num_cases)
-        != 0)
-        exit (77);
-
-    while (num_cases-- > 0) {
-        TEST_ASSERT_SUCCESS_ERRNO (
-          LLVMFuzzerTestOneInput (data[num_cases], len[num_cases]));
-        free (data[num_cases]);
-    }
-
-    free (data);
-    free (len);
-}
-
-int main (int argc, char **argv)
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_bind_fuzzer);
-
-    return UNITY_END ();
-}
-#endif
diff --git a/libs/libzmq/tests/test_bind_null_fuzzer.cpp b/libs/libzmq/tests/test_bind_null_fuzzer.cpp
deleted file mode 100644
index 98685cf..0000000
--- a/libs/libzmq/tests/test_bind_null_fuzzer.cpp
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
-    Copyright (c) 2020 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifdef ZMQ_USE_FUZZING_ENGINE
-#include <fuzzer/FuzzedDataProvider.h>
-#endif
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-// Test that the ZMTP engine handles invalid handshake when binding
-// https://rfc.zeromq.org/spec/37/
-extern "C" int LLVMFuzzerTestOneInput (const uint8_t *data, size_t size)
-{
-    setup_test_context ();
-    char my_endpoint[MAX_SOCKET_STRING];
-    void *server = test_context_socket (ZMQ_PUB);
-    //  As per API by default there's no limit to the size of a message,
-    //  but the sanitizer allocator will barf over a gig or so
-    int64_t max_msg_size = 64 * 1024 * 1024;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (server, ZMQ_MAXMSGSIZE, &max_msg_size, sizeof (int64_t)));
-    bind_loopback_ipv4 (server, my_endpoint, sizeof (my_endpoint));
-    fd_t client = connect_socket (my_endpoint);
-
-    void *client_good = test_context_socket (ZMQ_SUB);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (client_good, ZMQ_SUBSCRIBE, "", 0));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (client_good, my_endpoint));
-
-    //  If there is not enough data for a full greeting, just send what we can
-    //  Otherwise send greeting first, as expected by the protocol
-    uint8_t buf[64];
-    if (size >= 64) {
-        send (client, (void *) data, 64, MSG_NOSIGNAL);
-        data += 64;
-        size -= 64;
-    }
-    recv (client, buf, 64, 0);
-    msleep (250);
-    for (ssize_t sent = 0; size > 0 && (sent != -1 || errno == EINTR);
-         size -= sent > 0 ? sent : 0, data += sent > 0 ? sent : 0)
-        sent = send (client, (const char *) data, size, MSG_NOSIGNAL);
-    msleep (250);
-
-    TEST_ASSERT_EQUAL_INT (6, zmq_send_const (server, "HELLO", 6, 0));
-    TEST_ASSERT_EQUAL_INT (6, zmq_recv (client_good, buf, 6, 0));
-
-    close (client);
-    test_context_socket_close_zero_linger (client_good);
-    test_context_socket_close_zero_linger (server);
-    teardown_test_context ();
-
-    return 0;
-}
-
-#ifndef ZMQ_USE_FUZZING_ENGINE
-void test_bind_null_fuzzer ()
-{
-    uint8_t **data;
-    size_t *len, num_cases = 0;
-    if (fuzzer_corpus_encode (
-          "tests/libzmq-fuzz-corpora/test_bind_null_fuzzer_seed_corpus", &data,
-          &len, &num_cases)
-        != 0)
-        exit (77);
-
-    while (num_cases-- > 0) {
-        TEST_ASSERT_SUCCESS_ERRNO (
-          LLVMFuzzerTestOneInput (data[num_cases], len[num_cases]));
-        free (data[num_cases]);
-    }
-
-    free (data);
-    free (len);
-}
-
-int main (int argc, char **argv)
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_bind_null_fuzzer);
-
-    return UNITY_END ();
-}
-#endif
diff --git a/libs/libzmq/tests/test_bind_src_address.cpp b/libs/libzmq/tests/test_bind_src_address.cpp
deleted file mode 100644
index 8f80a3a..0000000
--- a/libs/libzmq/tests/test_bind_src_address.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void test_x ()
-{
-    void *sock = test_context_socket (ZMQ_PUB);
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_connect (sock, "tcp://127.0.0.1:0;localhost:1234"));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_connect (sock, "tcp://localhost:5555;localhost:1235"));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_connect (sock, "tcp://lo:5555;localhost:1235"));
-
-    test_context_socket_close (sock);
-}
-
-int main (void)
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_x);
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_bind_stream_fuzzer.cpp b/libs/libzmq/tests/test_bind_stream_fuzzer.cpp
deleted file mode 100644
index 0d43ca3..0000000
--- a/libs/libzmq/tests/test_bind_stream_fuzzer.cpp
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
-    Copyright (c) 2020 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifdef ZMQ_USE_FUZZING_ENGINE
-#include <fuzzer/FuzzedDataProvider.h>
-#endif
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-// Test that the ZMTP engine handles invalid handshake when binding
-// https://rfc.zeromq.org/spec/37/
-extern "C" int LLVMFuzzerTestOneInput (const uint8_t *data, size_t size)
-{
-    setup_test_context ();
-    char my_endpoint[MAX_SOCKET_STRING];
-    void *server = test_context_socket (ZMQ_STREAM);
-    //  As per API by default there's no limit to the size of a message,
-    //  but the sanitizer allocator will barf over a gig or so
-    int64_t max_msg_size = 64 * 1024 * 1024;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (server, ZMQ_MAXMSGSIZE, &max_msg_size, sizeof (int64_t)));
-    bind_loopback_ipv4 (server, my_endpoint, sizeof (my_endpoint));
-    fd_t client = connect_socket (my_endpoint);
-
-    //  If there is not enough data for a full greeting, just send what we can
-    //  Otherwise send greeting first, as expected by the protocol
-    uint8_t buf[64];
-    if (size >= 64) {
-        send (client, (void *) data, 64, MSG_NOSIGNAL);
-        data += 64;
-        size -= 64;
-    }
-    recv (client, buf, 64, MSG_DONTWAIT);
-    msleep (250);
-    for (ssize_t sent = 0; size > 0 && (sent != -1 || errno == EINTR);
-         size -= sent > 0 ? sent : 0, data += sent > 0 ? sent : 0)
-        sent = send (client, (const char *) data, size, MSG_NOSIGNAL);
-    msleep (250);
-
-    zmq_msg_t msg;
-    zmq_msg_init (&msg);
-    while (-1 != zmq_msg_recv (&msg, server, ZMQ_DONTWAIT)) {
-        zmq_msg_close (&msg);
-        zmq_msg_init (&msg);
-    }
-
-    void *client_good = test_context_socket (ZMQ_DEALER);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (client_good, my_endpoint));
-
-    TEST_ASSERT_EQUAL_INT (6, zmq_send_const (client_good, "HELLO", 6, 0));
-    zmq_msg_t routing_id;
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init (&routing_id));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_recv (&routing_id, server, 0));
-    TEST_ASSERT_TRUE (zmq_msg_more (&routing_id));
-    char const *peer_address = zmq_msg_gets (&routing_id, "Peer-Address");
-    zmq_msg_close (&routing_id);
-    TEST_ASSERT_NOT_NULL (peer_address);
-    TEST_ASSERT_EQUAL_STRING ("127.0.0.1", peer_address);
-    TEST_ASSERT_EQUAL_INT (
-      0, TEST_ASSERT_SUCCESS_ERRNO (zmq_recv (server, buf, 64, 0)));
-    zmq_msg_init (&msg);
-    while (-1 != zmq_msg_recv (&msg, server, ZMQ_DONTWAIT)) {
-        zmq_msg_close (&msg);
-        zmq_msg_init (&msg);
-    }
-
-    close (client);
-    test_context_socket_close_zero_linger (client_good);
-    test_context_socket_close_zero_linger (server);
-    teardown_test_context ();
-
-    return 0;
-}
-
-#ifndef ZMQ_USE_FUZZING_ENGINE
-void test_bind_stream_fuzzer ()
-{
-    uint8_t **data;
-    size_t *len, num_cases = 0;
-    if (fuzzer_corpus_encode (
-          "tests/libzmq-fuzz-corpora/test_bind_stream_fuzzer_seed_corpus",
-          &data, &len, &num_cases)
-        != 0)
-        exit (77);
-
-    while (num_cases-- > 0) {
-        TEST_ASSERT_SUCCESS_ERRNO (
-          LLVMFuzzerTestOneInput (data[num_cases], len[num_cases]));
-        free (data[num_cases]);
-    }
-
-    free (data);
-    free (len);
-}
-
-int main (int argc, char **argv)
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_bind_stream_fuzzer);
-
-    return UNITY_END ();
-}
-#endif
diff --git a/libs/libzmq/tests/test_bind_ws_fuzzer.cpp b/libs/libzmq/tests/test_bind_ws_fuzzer.cpp
deleted file mode 100644
index bec0688..0000000
--- a/libs/libzmq/tests/test_bind_ws_fuzzer.cpp
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
-    Copyright (c) 2020 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifdef ZMQ_USE_FUZZING_ENGINE
-#include <fuzzer/FuzzedDataProvider.h>
-#endif
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-// Test that the ZMTP WebSocket engine handles invalid handshake when connecting
-// https://rfc.zeromq.org/spec/45/
-extern "C" int LLVMFuzzerTestOneInput (const uint8_t *data, size_t size)
-{
-    setup_test_context ();
-    char my_endpoint[MAX_SOCKET_STRING];
-    size_t my_endpoint_size = sizeof (my_endpoint);
-    void *server = test_context_socket (ZMQ_DEALER);
-    //  As per API by default there's no limit to the size of a message,
-    //  but the sanitizer allocator will barf over a gig or so
-    int64_t max_msg_size = 64 * 1024 * 1024;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (server, ZMQ_MAXMSGSIZE, &max_msg_size, sizeof (int64_t)));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (server, "ws://127.0.0.1:*"));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_getsockopt (server, ZMQ_LAST_ENDPOINT,
-                                               my_endpoint, &my_endpoint_size));
-    //  Remove trailing /
-    my_endpoint[my_endpoint_size - 2] = '\0';
-    fd_t client = connect_socket (my_endpoint, AF_INET, IPPROTO_WS);
-
-    void *client_good = test_context_socket (ZMQ_DEALER);
-    my_endpoint[my_endpoint_size - 2] = '/';
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (client_good, my_endpoint));
-
-    //  If there is not enough data for a full handshake, just send what we can
-    //  Otherwise send websocket handshake first, as expected by the protocol
-    uint8_t buf[256];
-    if (size >= 192) {
-        send (client, (void *) data, 192, MSG_NOSIGNAL);
-        data += 192;
-        size -= 192;
-    }
-    recv (client, buf, 256, MSG_DONTWAIT);
-    msleep (250);
-    for (ssize_t sent = 0; size > 0 && (sent != -1 || errno == EINTR);
-         size -= sent > 0 ? sent : 0, data += sent > 0 ? sent : 0)
-        sent = send (client, (const char *) data, size, MSG_NOSIGNAL);
-    msleep (250);
-    recv (client, buf, 256, MSG_DONTWAIT);
-
-    zmq_msg_t msg;
-    zmq_msg_init (&msg);
-    while (-1 != zmq_msg_recv (&msg, server, ZMQ_DONTWAIT)) {
-        zmq_msg_close (&msg);
-        zmq_msg_init (&msg);
-    }
-
-    send_string_expect_success (client_good, "abc", 0);
-    recv_string_expect_success (server, "abc", 0);
-
-    close (client);
-    test_context_socket_close_zero_linger (client_good);
-    test_context_socket_close_zero_linger (server);
-    teardown_test_context ();
-
-    return 0;
-}
-
-#ifndef ZMQ_USE_FUZZING_ENGINE
-void test_bind_ws_fuzzer ()
-{
-    uint8_t **data;
-    size_t *len, num_cases = 0;
-    if (fuzzer_corpus_encode (
-          "tests/libzmq-fuzz-corpora/test_bind_ws_fuzzer_seed_corpus", &data,
-          &len, &num_cases)
-        != 0)
-        exit (77);
-
-    while (num_cases-- > 0) {
-        TEST_ASSERT_SUCCESS_ERRNO (
-          LLVMFuzzerTestOneInput (data[num_cases], len[num_cases]));
-        free (data[num_cases]);
-    }
-
-    free (data);
-    free (len);
-}
-
-int main (int argc, char **argv)
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_bind_ws_fuzzer);
-
-    return UNITY_END ();
-}
-#endif
diff --git a/libs/libzmq/tests/test_busy_poll.cpp b/libs/libzmq/tests/test_busy_poll.cpp
deleted file mode 100644
index e040554..0000000
--- a/libs/libzmq/tests/test_busy_poll.cpp
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
-    Copyright (c) 2007-2021 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void test_busy_poll ()
-{
-    //  Create a socket
-    void *socket = test_context_socket (ZMQ_DEALER);
-
-    //  set socket ZMQ_BUSY_POLL options
-    int busy_poll = 1;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (socket, ZMQ_BUSY_POLL, &busy_poll, sizeof (int)));
-
-    //  bind socket
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (socket, "tcp://127.0.0.1:*"));
-
-    //  Clean up.
-    test_context_socket_close (socket);
-}
-
-int main ()
-{
-    setup_test_environment ();
-    UNITY_BEGIN ();
-    RUN_TEST (test_busy_poll);
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_capabilities.cpp b/libs/libzmq/tests/test_capabilities.cpp
deleted file mode 100644
index 5417fed..0000000
--- a/libs/libzmq/tests/test_capabilities.cpp
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-void setUp ()
-{
-}
-
-void tearDown ()
-{
-}
-
-void test_capabilities ()
-{
-#if defined(ZMQ_HAVE_IPC)
-    TEST_ASSERT_TRUE (zmq_has ("ipc"));
-#else
-    TEST_ASSERT_TRUE (!zmq_has ("ipc"));
-#endif
-
-#if defined(ZMQ_HAVE_OPENPGM)
-    TEST_ASSERT_TRUE (zmq_has ("pgm"));
-#else
-    TEST_ASSERT_TRUE (!zmq_has ("pgm"));
-#endif
-
-#if defined(ZMQ_HAVE_TIPC)
-    TEST_ASSERT_TRUE (zmq_has ("tipc"));
-#else
-    TEST_ASSERT_TRUE (!zmq_has ("tipc"));
-#endif
-
-#if defined(ZMQ_HAVE_NORM)
-    TEST_ASSERT_TRUE (zmq_has ("norm"));
-#else
-    TEST_ASSERT_TRUE (!zmq_has ("norm"));
-#endif
-
-#if defined(ZMQ_HAVE_CURVE)
-    TEST_ASSERT_TRUE (zmq_has ("curve"));
-#else
-    TEST_ASSERT_TRUE (!zmq_has ("curve"));
-#endif
-
-#if defined(HAVE_LIBGSSAPI_KRB5)
-    TEST_ASSERT_TRUE (zmq_has ("gssapi"));
-#else
-    TEST_ASSERT_TRUE (!zmq_has ("gssapi"));
-#endif
-
-#if defined(ZMQ_HAVE_VMCI)
-    TEST_ASSERT_TRUE (zmq_has ("vmci"));
-#else
-    TEST_ASSERT_TRUE (!zmq_has ("vmci"));
-#endif
-
-#if defined(ZMQ_BUILD_DRAFT_API)
-    TEST_ASSERT_TRUE (zmq_has ("draft"));
-#else
-    TEST_ASSERT_TRUE (!zmq_has ("draft"));
-#endif
-}
-
-int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_capabilities);
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_channel.cpp b/libs/libzmq/tests/test_channel.cpp
deleted file mode 100644
index 42777b4..0000000
--- a/libs/libzmq/tests/test_channel.cpp
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
-    Copyright (c) 2007-2020 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-#include <unity.h>
-
-void *sb;
-void *sc;
-
-void setUp ()
-{
-    setup_test_context ();
-
-    sb = test_context_socket (ZMQ_CHANNEL);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (sb, "inproc://a"));
-
-    sc = test_context_socket (ZMQ_CHANNEL);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sc, "inproc://a"));
-}
-
-void tearDown ()
-{
-    test_context_socket_close (sc);
-    test_context_socket_close (sb);
-
-    teardown_test_context ();
-}
-
-void test_roundtrip ()
-{
-    send_string_expect_success (sb, "HELLO", 0);
-    recv_string_expect_success (sc, "HELLO", 0);
-
-    send_string_expect_success (sc, "WORLD", 0);
-    recv_string_expect_success (sb, "WORLD", 0);
-}
-
-void test_sndmore_fails ()
-{
-    int rc = zmq_send (sc, "X", 1, ZMQ_SNDMORE);
-    TEST_ASSERT_EQUAL_INT (-1, rc);
-    TEST_ASSERT_EQUAL_INT (EINVAL, errno);
-}
-
-int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_roundtrip);
-    RUN_TEST (test_sndmore_fails);
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_client_server.cpp b/libs/libzmq/tests/test_client_server.cpp
deleted file mode 100644
index c74883d..0000000
--- a/libs/libzmq/tests/test_client_server.cpp
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void create_inproc_client_server_pair (void **server_, void **client_)
-{
-    *server_ = test_context_socket (ZMQ_SERVER);
-    *client_ = test_context_socket (ZMQ_CLIENT);
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_bind (*server_, "inproc://test-client-server"));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_connect (*client_, "inproc://test-client-server"));
-}
-
-void send_sndmore_expect_failure (void *socket_)
-{
-    int rc = zmq_send (socket_, "X", 1, ZMQ_SNDMORE);
-    TEST_ASSERT_EQUAL_INT (-1, rc);
-    TEST_ASSERT_EQUAL_INT (EINVAL, errno);
-}
-
-void test_client_sndmore_fails ()
-{
-    void *server, *client;
-    create_inproc_client_server_pair (&server, &client);
-
-    send_sndmore_expect_failure (client);
-
-    test_context_socket_close (server);
-    test_context_socket_close (client);
-}
-
-void test_server_sndmore_fails ()
-{
-    void *server, *client;
-    create_inproc_client_server_pair (&server, &client);
-
-    send_sndmore_expect_failure (server);
-
-    test_context_socket_close (server);
-    test_context_socket_close (client);
-}
-
-void test_routing_id ()
-{
-    void *server, *client;
-    create_inproc_client_server_pair (&server, &client);
-
-    send_string_expect_success (client, "X", 0);
-
-    uint32_t routing_id;
-    {
-        zmq_msg_t msg;
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init (&msg));
-
-        int rc = TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_recv (&msg, server, 0));
-        TEST_ASSERT_EQUAL_INT (1, rc);
-
-        routing_id = zmq_msg_routing_id (&msg);
-        TEST_ASSERT_NOT_EQUAL (0, routing_id);
-
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&msg));
-    }
-
-    {
-        zmq_msg_t msg;
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init_size (&msg, 1));
-
-        char *data = static_cast<char *> (zmq_msg_data (&msg));
-        data[0] = 2;
-
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_set_routing_id (&msg, routing_id));
-
-        int rc = zmq_msg_send (&msg, server, 0);
-        TEST_ASSERT_EQUAL_INT (1, rc);
-    }
-
-    {
-        zmq_msg_t msg;
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init (&msg));
-
-        int rc = zmq_msg_recv (&msg, client, 0);
-        TEST_ASSERT_EQUAL_INT (1, rc);
-
-        routing_id = zmq_msg_routing_id (&msg);
-        TEST_ASSERT_EQUAL_UINT32 (0, routing_id);
-
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&msg));
-    }
-
-    test_context_socket_close (server);
-    test_context_socket_close (client);
-}
-
-int main (void)
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_client_sndmore_fails);
-    RUN_TEST (test_server_sndmore_fails);
-    RUN_TEST (test_routing_id);
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_conflate.cpp b/libs/libzmq/tests/test_conflate.cpp
deleted file mode 100644
index dce3fb3..0000000
--- a/libs/libzmq/tests/test_conflate.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void test_conflate ()
-{
-    char my_endpoint[MAX_SOCKET_STRING];
-
-    int rc;
-
-    void *s_in = test_context_socket (ZMQ_PULL);
-
-    int conflate = 1;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (s_in, ZMQ_CONFLATE, &conflate, sizeof (conflate)));
-    bind_loopback_ipv4 (s_in, my_endpoint, sizeof my_endpoint);
-
-    void *s_out = test_context_socket (ZMQ_PUSH);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (s_out, my_endpoint));
-
-    int message_count = 20;
-    for (int j = 0; j < message_count; ++j) {
-        TEST_ASSERT_SUCCESS_ERRNO (
-          zmq_send (s_out, (void *) &j, sizeof (int), 0));
-    }
-    msleep (SETTLE_TIME);
-
-    int payload_recved = 0;
-    rc = TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_recv (s_in, (void *) &payload_recved, sizeof (int), 0));
-    TEST_ASSERT_GREATER_THAN_INT (0, rc);
-    TEST_ASSERT_EQUAL_INT (message_count - 1, payload_recved);
-
-    test_context_socket_close (s_in);
-    test_context_socket_close (s_out);
-}
-
-int main (int, char *[])
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_conflate);
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_connect_curve_fuzzer.cpp b/libs/libzmq/tests/test_connect_curve_fuzzer.cpp
deleted file mode 100644
index 30a0ccb..0000000
--- a/libs/libzmq/tests/test_connect_curve_fuzzer.cpp
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
-    Copyright (c) 2020 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifdef ZMQ_USE_FUZZING_ENGINE
-#include <fuzzer/FuzzedDataProvider.h>
-#endif
-
-#include "testutil.hpp"
-#include "testutil_security.hpp"
-
-// Test that the ZMTP engine handles invalid handshake when connecting
-// https://rfc.zeromq.org/spec/37/
-// https://rfc.zeromq.org/spec/26/
-extern "C" int LLVMFuzzerTestOneInput (const uint8_t *data, size_t size)
-{
-    const char *fixed_client_public =
-      "{{k*81)yMWEF{/BxdMd[5RL^qRFxBgoL<8m.D^KD";
-    const char *fixed_client_secret =
-      "N?Gmik8R[2ACw{b7*[-$S6[4}aO#?DB?#=<OQPc7";
-    const char *fixed_server_public =
-      "3.9-xXwy{g*w72TP*3iB9IJJRxlBH<ufTAvPd2>C";
-
-    setup_test_context ();
-    char my_endpoint[MAX_SOCKET_STRING];
-    fd_t server = bind_socket_resolve_port ("127.0.0.1", "0", my_endpoint);
-
-    curve_client_data_t curve_client_data = {
-      fixed_server_public, fixed_client_public, fixed_client_secret};
-    void *client_mon;
-    void *client = create_and_connect_client (
-      my_endpoint, socket_config_curve_client, &curve_client_data, &client_mon);
-
-    fd_t server_accept =
-      TEST_ASSERT_SUCCESS_RAW_ERRNO (accept (server, NULL, NULL));
-
-    //  If there is not enough data for a full greeting, just send what we can
-    //  Otherwise send greeting first, as expected by the protocol
-    uint8_t buf[512];
-    if (size >= 64) {
-        send (server_accept, (void *) data, 64, MSG_NOSIGNAL);
-        data += 64;
-        size -= 64;
-    }
-    recv (server_accept, buf, 64, 0);
-    // Then expect HELLO and send WELCOME if there's enough data
-    if (size >= 170) {
-        recv (server_accept, buf, 202, 0);
-        send (server_accept, (void *) data, 170, MSG_NOSIGNAL);
-        data += 170;
-        size -= 170;
-    }
-    // Then expect INITIATE and send READY if there's enough data
-    if (size >= 72) {
-        recv (server_accept, buf, 512, 0);
-        send (server_accept, (void *) data, 72, MSG_NOSIGNAL);
-        data += 72;
-        size -= 72;
-    }
-    msleep (250);
-    for (ssize_t sent = 0; size > 0 && (sent != -1 || errno == EINTR);
-         size -= sent > 0 ? sent : 0, data += sent > 0 ? sent : 0)
-        sent = send (server_accept, (const char *) data, size, MSG_NOSIGNAL);
-    recv (server_accept, buf, 512, MSG_DONTWAIT);
-    msleep (250);
-
-    zmq_msg_t msg;
-    zmq_msg_init (&msg);
-    while (-1 != zmq_msg_recv (&msg, client, ZMQ_DONTWAIT)) {
-        zmq_msg_close (&msg);
-        zmq_msg_init (&msg);
-    }
-
-    close (server_accept);
-    close (server);
-
-    test_context_socket_close_zero_linger (client);
-    test_context_socket_close_zero_linger (client_mon);
-    teardown_test_context ();
-
-    return 0;
-}
-
-#ifndef ZMQ_USE_FUZZING_ENGINE
-void test_connect_curve_fuzzer ()
-{
-    uint8_t **data;
-    size_t *len, num_cases = 0;
-    if (fuzzer_corpus_encode (
-          "tests/libzmq-fuzz-corpora/test_connect_curve_fuzzer_seed_corpus",
-          &data, &len, &num_cases)
-        != 0)
-        exit (77);
-
-    while (num_cases-- > 0) {
-        TEST_ASSERT_SUCCESS_ERRNO (
-          LLVMFuzzerTestOneInput (data[num_cases], len[num_cases]));
-        free (data[num_cases]);
-    }
-
-    free (data);
-    free (len);
-}
-
-int main (int argc, char **argv)
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_connect_curve_fuzzer);
-
-    return UNITY_END ();
-}
-#endif
diff --git a/libs/libzmq/tests/test_connect_delay_tipc.cpp b/libs/libzmq/tests/test_connect_delay_tipc.cpp
deleted file mode 100644
index 8fd40f1..0000000
--- a/libs/libzmq/tests/test_connect_delay_tipc.cpp
+++ /dev/null
@@ -1,246 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-#include "testutil_security.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void test_send_one_connected_one_unconnected ()
-{
-    int val;
-    // TEST 1.
-    // First we're going to attempt to send messages to two
-    // pipes, one connected, the other not. We should see
-    // the PUSH load balancing to both pipes, and hence half
-    // of the messages getting queued, as connect() creates a
-    // pipe immediately.
-
-    void *to = test_context_socket (ZMQ_PULL);
-    int timeout = 5000;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (to, ZMQ_LINGER, &timeout, sizeof (timeout)));
-
-    // Bind the one valid receiver
-    val = 0;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (to, ZMQ_LINGER, &val, sizeof (val)));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (to, "tipc://{6555,0,0}"));
-
-    // Create a socket pushing to two endpoints - only 1 message should arrive.
-    void *from = test_context_socket (ZMQ_PUSH);
-
-    val = 0;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (from, ZMQ_LINGER, &val, sizeof (val)));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (from, ZMQ_LINGER, &timeout, sizeof (timeout)));
-    // This pipe will not connect
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (from, "tipc://{5556,0}@0.0.0"));
-    // This pipe will
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (from, "tipc://{6555,0}@0.0.0"));
-
-    // We send 10 messages, 5 should just get stuck in the queue
-    // for the not-yet-connected pipe
-    const int send_count = 10;
-    for (int i = 0; i < send_count; ++i) {
-        send_string_expect_success (from, "Hello", 0);
-    }
-
-    // We now consume from the connected pipe
-    // - we should see just 5
-    timeout = SETTLE_TIME;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (to, ZMQ_RCVTIMEO, &timeout, sizeof (int)));
-
-    int seen = 0;
-    while (true) {
-        char buffer[16];
-        int rc = zmq_recv (to, &buffer, sizeof (buffer), 0);
-        if (rc == -1) {
-            TEST_ASSERT_EQUAL_INT (EAGAIN, zmq_errno ());
-            break; //  Break when we didn't get a message
-        }
-        seen++;
-    }
-    TEST_ASSERT_EQUAL_INT (send_count / 2, seen);
-
-    test_context_socket_close (from);
-    test_context_socket_close (to);
-}
-
-void test_send_one_connected_one_unconnected_with_delay ()
-{
-    int val;
-
-    // TEST 2
-    // This time we will do the same thing, connect two pipes,
-    // one of which will succeed in connecting to a bound
-    // receiver, the other of which will fail. However, we will
-    // also set the delay attach on connect flag, which should
-    // cause the pipe attachment to be delayed until the connection
-    // succeeds.
-
-    // Bind the valid socket
-    void *to = test_context_socket (ZMQ_PULL);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (to, "tipc://{5560,0,0}"));
-    int timeout = 5000;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (to, ZMQ_LINGER, &timeout, sizeof (timeout)));
-
-    val = 0;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (to, ZMQ_LINGER, &val, sizeof (val)));
-
-    // Create a socket pushing to two endpoints - all messages should arrive.
-    void *from = test_context_socket (ZMQ_PUSH);
-
-    val = 0;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (from, ZMQ_LINGER, &val, sizeof (val)));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (from, ZMQ_LINGER, &timeout, sizeof (timeout)));
-
-    // Set the key flag
-    val = 1;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (from, ZMQ_DELAY_ATTACH_ON_CONNECT, &val, sizeof (val)));
-
-    // Connect to the invalid socket
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (from, "tipc://{5561,0}@0.0.0"));
-    // Connect to the valid socket
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (from, "tipc://{5560,0}@0.0.0"));
-
-    // Send 10 messages, all should be routed to the connected pipe
-    const int send_count = 10;
-    for (int i = 0; i < send_count; ++i) {
-        send_string_expect_success (from, "Hello", 0);
-    }
-    timeout = SETTLE_TIME;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (to, ZMQ_RCVTIMEO, &timeout, sizeof (int)));
-
-    int seen = 0;
-    while (true) {
-        char buffer[16];
-        int rc = zmq_recv (to, &buffer, sizeof (buffer), 0);
-        if (rc == -1) {
-            TEST_ASSERT_EQUAL_INT (EAGAIN, zmq_errno ());
-            break; //  Break when we didn't get a message
-        }
-        seen++;
-    }
-    TEST_ASSERT_EQUAL_INT (send_count, seen);
-
-    test_context_socket_close (from);
-    test_context_socket_close (to);
-}
-
-void test_send_disconnected_with_delay ()
-{
-    // TEST 3
-    // This time we want to validate that the same blocking behaviour
-    // occurs with an existing connection that is broken. We will send
-    // messages to a connected pipe, disconnect and verify the messages
-    // block. Then we reconnect and verify messages flow again.
-    void *backend = test_context_socket (ZMQ_DEALER);
-    void *frontend = test_context_socket (ZMQ_DEALER);
-    void *monitor = test_context_socket (ZMQ_PAIR);
-    int rc;
-    int zero = 0;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (backend, ZMQ_LINGER, &zero, sizeof (zero)));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (frontend, ZMQ_LINGER, &zero, sizeof (zero)));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_socket_monitor (frontend, "inproc://monitor",
-                                                   ZMQ_EVENT_DISCONNECTED));
-    int timeout = 5000;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (backend, ZMQ_LINGER, &timeout, sizeof (timeout)));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (frontend, ZMQ_LINGER, &timeout, sizeof (timeout)));
-
-    //  Frontend connects to backend using DELAY_ATTACH_ON_CONNECT
-    int on = 1;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (frontend, ZMQ_DELAY_ATTACH_ON_CONNECT, &on, sizeof (on)));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (backend, "tipc://{5560,0,0}"));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (monitor, "inproc://monitor"));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (frontend, "tipc://{5560,0}@0.0.0"));
-
-    //  Ping backend to frontend so we know when the connection is up
-    send_string_expect_success (backend, "Hello", 0);
-    recv_string_expect_success (frontend, "Hello", 0);
-
-    // Send message from frontend to backend
-    send_string_expect_success (frontend, "Hello", ZMQ_DONTWAIT);
-
-    test_context_socket_close (backend);
-
-    // Wait for disconnect to happen
-    expect_monitor_event (monitor, ZMQ_EVENT_DISCONNECTED);
-
-    // Send a message, might succeed depending on scheduling of the I/O thread
-    do {
-        rc = zmq_send (frontend, "Hello", 5, ZMQ_DONTWAIT);
-        TEST_ASSERT_TRUE (rc == 5 || (rc == -1 && zmq_errno () == EAGAIN));
-    } while (rc == 5);
-
-    //  Recreate backend socket
-    backend = test_context_socket (ZMQ_DEALER);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (backend, ZMQ_LINGER, &zero, sizeof (zero)));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (backend, "tipc://{5560,0,0}"));
-
-    //  Ping backend to frontend so we know when the connection is up
-    send_string_expect_success (backend, "Hello", 0);
-    recv_string_expect_success (frontend, "Hello", 0);
-
-    // After the reconnect, should succeed
-    send_string_expect_success (frontend, "Hello", ZMQ_DONTWAIT);
-
-    test_context_socket_close (monitor);
-    test_context_socket_close (backend);
-    test_context_socket_close (frontend);
-}
-
-int main (void)
-{
-    if (!is_tipc_available ()) {
-        printf ("TIPC environment unavailable, skipping test\n");
-        return 77;
-    }
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_send_one_connected_one_unconnected);
-    RUN_TEST (test_send_one_connected_one_unconnected_with_delay);
-    RUN_TEST (test_send_disconnected_with_delay);
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_connect_fuzzer.cpp b/libs/libzmq/tests/test_connect_fuzzer.cpp
deleted file mode 100644
index c7b42e8..0000000
--- a/libs/libzmq/tests/test_connect_fuzzer.cpp
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
-    Copyright (c) 2020 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifdef ZMQ_USE_FUZZING_ENGINE
-#include <fuzzer/FuzzedDataProvider.h>
-#endif
-
-#include <string>
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-// Test that zmq_connect can handle malformed strings
-extern "C" int LLVMFuzzerTestOneInput (const uint8_t *data, size_t size)
-{
-    setup_test_context ();
-    std::string my_endpoint (reinterpret_cast<const char *> (data), size);
-    void *socket = test_context_socket (ZMQ_PUB);
-    zmq_connect (socket, my_endpoint.c_str ());
-
-    test_context_socket_close_zero_linger (socket);
-    teardown_test_context ();
-
-    return 0;
-}
-
-#ifndef ZMQ_USE_FUZZING_ENGINE
-void test_connect_fuzzer ()
-{
-    uint8_t **data;
-    size_t *len, num_cases = 0;
-    if (fuzzer_corpus_encode (
-          "tests/libzmq-fuzz-corpora/test_connect_fuzzer_seed_corpus", &data,
-          &len, &num_cases)
-        != 0)
-        exit (77);
-
-    while (num_cases-- > 0) {
-        TEST_ASSERT_SUCCESS_ERRNO (
-          LLVMFuzzerTestOneInput (data[num_cases], len[num_cases]));
-        free (data[num_cases]);
-    }
-
-    free (data);
-    free (len);
-}
-
-int main (int argc, char **argv)
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_connect_fuzzer);
-
-    return UNITY_END ();
-}
-#endif
diff --git a/libs/libzmq/tests/test_connect_null_fuzzer.cpp b/libs/libzmq/tests/test_connect_null_fuzzer.cpp
deleted file mode 100644
index a942a61..0000000
--- a/libs/libzmq/tests/test_connect_null_fuzzer.cpp
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
-    Copyright (c) 2020 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifdef ZMQ_USE_FUZZING_ENGINE
-#include <fuzzer/FuzzedDataProvider.h>
-#endif
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-// Test that the ZMTP engine handles invalid handshake when connecting
-// https://rfc.zeromq.org/spec/37/
-extern "C" int LLVMFuzzerTestOneInput (const uint8_t *data, size_t size)
-{
-    setup_test_context ();
-    char my_endpoint[MAX_SOCKET_STRING];
-    fd_t server = bind_socket_resolve_port ("127.0.0.1", "0", my_endpoint);
-
-    void *client = test_context_socket (ZMQ_SUB);
-    //  As per API by default there's no limit to the size of a message,
-    //  but the sanitizer allocator will barf over a gig or so
-    int64_t max_msg_size = 64 * 1024 * 1024;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (client, ZMQ_MAXMSGSIZE, &max_msg_size, sizeof (int64_t)));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (client, ZMQ_SUBSCRIBE, "", 0));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (client, my_endpoint));
-
-    fd_t server_accept =
-      TEST_ASSERT_SUCCESS_RAW_ERRNO (accept (server, NULL, NULL));
-
-    //  If there is not enough data for a full greeting, just send what we can
-    //  Otherwise send greeting first, as expected by the protocol
-    uint8_t buf[64];
-    if (size >= 64) {
-        send (server_accept, (void *) data, 64, MSG_NOSIGNAL);
-        data += 64;
-        size -= 64;
-    }
-    recv (server_accept, buf, 64, 0);
-    msleep (250);
-    for (ssize_t sent = 0; size > 0 && (sent != -1 || errno == EINTR);
-         size -= sent > 0 ? sent : 0, data += sent > 0 ? sent : 0)
-        sent = send (server_accept, (const char *) data, size, MSG_NOSIGNAL);
-    msleep (250);
-
-    zmq_msg_t msg;
-    zmq_msg_init (&msg);
-    while (-1 != zmq_msg_recv (&msg, client, ZMQ_DONTWAIT)) {
-        zmq_msg_close (&msg);
-        zmq_msg_init (&msg);
-    }
-
-    close (server_accept);
-    close (server);
-
-    test_context_socket_close_zero_linger (client);
-    teardown_test_context ();
-
-    return 0;
-}
-
-#ifndef ZMQ_USE_FUZZING_ENGINE
-void test_connect_null_fuzzer ()
-{
-    uint8_t **data;
-    size_t *len, num_cases = 0;
-    if (fuzzer_corpus_encode (
-          "tests/libzmq-fuzz-corpora/test_connect_null_fuzzer_seed_corpus",
-          &data, &len, &num_cases)
-        != 0)
-        exit (77);
-
-    while (num_cases-- > 0) {
-        TEST_ASSERT_SUCCESS_ERRNO (
-          LLVMFuzzerTestOneInput (data[num_cases], len[num_cases]));
-        free (data[num_cases]);
-    }
-
-    free (data);
-    free (len);
-}
-
-int main (int argc, char **argv)
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_connect_null_fuzzer);
-
-    return UNITY_END ();
-}
-#endif
diff --git a/libs/libzmq/tests/test_connect_resolve.cpp b/libs/libzmq/tests/test_connect_resolve.cpp
deleted file mode 100644
index b846ca3..0000000
--- a/libs/libzmq/tests/test_connect_resolve.cpp
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-
-#include "testutil_unity.hpp"
-
-#include <unity.h>
-
-void *sock;
-
-void setUp ()
-{
-    setup_test_context ();
-    sock = test_context_socket (ZMQ_PUB);
-}
-
-void tearDown ()
-{
-    test_context_socket_close (sock);
-    sock = NULL;
-    teardown_test_context ();
-}
-
-void test_hostname_ipv4 ()
-{
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sock, "tcp://localhost:1234"));
-}
-
-void test_loopback_ipv6 ()
-{
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sock, "tcp://[::1]:1234"));
-}
-
-void test_invalid_service_fails ()
-{
-    int rc = zmq_connect (sock, "tcp://localhost:invalid");
-    TEST_ASSERT_EQUAL_INT (-1, rc);
-}
-
-void test_hostname_with_spaces_fails ()
-{
-    int rc = zmq_connect (sock, "tcp://in val id:1234");
-    TEST_ASSERT_EQUAL_INT (-1, rc);
-}
-
-void test_no_hostname_fails ()
-{
-    int rc = zmq_connect (sock, "tcp://");
-    TEST_ASSERT_EQUAL_INT (-1, rc);
-}
-
-void test_x ()
-{
-    int rc = zmq_connect (sock, "tcp://192.168.0.200:*");
-    TEST_ASSERT_EQUAL_INT (-1, rc);
-}
-
-void test_invalid_proto_fails ()
-{
-    int rc = zmq_connect (sock, "invalid://localhost:1234");
-    TEST_ASSERT_EQUAL_INT (-1, rc);
-    TEST_ASSERT_EQUAL_INT (EPROTONOSUPPORT, errno);
-}
-
-int main (void)
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_hostname_ipv4);
-    RUN_TEST (test_loopback_ipv6);
-    RUN_TEST (test_hostname_with_spaces_fails);
-    RUN_TEST (test_no_hostname_fails);
-    RUN_TEST (test_invalid_service_fails);
-    RUN_TEST (test_invalid_proto_fails);
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_connect_rid.cpp b/libs/libzmq/tests/test_connect_rid.cpp
deleted file mode 100644
index 49dbded..0000000
--- a/libs/libzmq/tests/test_connect_rid.cpp
+++ /dev/null
@@ -1,252 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-#include <string.h>
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-const char *rconn1routing_id = "conn1";
-const char *x_routing_id = "X";
-const char *y_routing_id = "Y";
-const char *z_routing_id = "Z";
-
-void test_stream_2_stream ()
-{
-    char buff[256];
-    const char msg[] = "hi 1";
-    const int disabled = 0;
-    const int zero = 0;
-    char my_endpoint[MAX_SOCKET_STRING];
-
-    //  Set up listener STREAM.
-    void *rbind = test_context_socket (ZMQ_STREAM);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (rbind, ZMQ_STREAM_NOTIFY, &disabled, sizeof (disabled)));
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (rbind, ZMQ_LINGER, &zero, sizeof zero));
-    bind_loopback_ipv4 (rbind, my_endpoint, sizeof my_endpoint);
-
-    //  Set up connection stream.
-    void *rconn1 = test_context_socket (ZMQ_STREAM);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (rconn1, ZMQ_LINGER, &zero, sizeof zero));
-
-    //  Do the connection.
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (rconn1, ZMQ_CONNECT_ROUTING_ID,
-                                               rconn1routing_id,
-                                               strlen (rconn1routing_id)));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (rconn1, my_endpoint));
-
-    /*  Uncomment to test assert on duplicate routing id.
-    //  Test duplicate connect attempt.
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (rconn1, ZMQ_CONNECT_ROUTING_ID, rconn1routing_id, strlen(rconn1routing_id)));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (rconn1, bindip));
-*/
-    //  Send data to the bound stream.
-    send_string_expect_success (rconn1, rconn1routing_id, ZMQ_SNDMORE);
-    send_string_expect_success (rconn1, msg, 0);
-
-    //  Accept data on the bound stream.
-    TEST_ASSERT_GREATER_THAN (
-      0, TEST_ASSERT_SUCCESS_ERRNO (zmq_recv (rbind, buff, 256, 0)));
-    TEST_ASSERT_EQUAL (0, buff[0]); // an auto-generated routing id
-    recv_string_expect_success (rbind, msg, 0);
-
-    // Handle close of the socket.
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_unbind (rbind, my_endpoint));
-    test_context_socket_close (rbind);
-    test_context_socket_close (rconn1);
-}
-
-void test_router_2_router (bool named_)
-{
-    char buff[256];
-    const char msg[] = "hi 1";
-    const int zero = 0;
-    char my_endpoint[MAX_SOCKET_STRING];
-
-    //  Create bind socket.
-    void *rbind = test_context_socket (ZMQ_ROUTER);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (rbind, ZMQ_LINGER, &zero, sizeof (zero)));
-    bind_loopback_ipv4 (rbind, my_endpoint, sizeof my_endpoint);
-
-    //  Create connection socket.
-    void *rconn1 = test_context_socket (ZMQ_ROUTER);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (rconn1, ZMQ_LINGER, &zero, sizeof (zero)));
-
-    //  If we're in named mode, set some identities.
-    if (named_) {
-        TEST_ASSERT_SUCCESS_ERRNO (
-          zmq_setsockopt (rbind, ZMQ_ROUTING_ID, x_routing_id, 1));
-        TEST_ASSERT_SUCCESS_ERRNO (
-          zmq_setsockopt (rconn1, ZMQ_ROUTING_ID, y_routing_id, 1));
-    }
-
-    //  Make call to connect using a connect_routing_id.
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (rconn1, ZMQ_CONNECT_ROUTING_ID,
-                                               rconn1routing_id,
-                                               strlen (rconn1routing_id)));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (rconn1, my_endpoint));
-    /*  Uncomment to test assert on duplicate routing id
-    //  Test duplicate connect attempt.
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (rconn1, ZMQ_CONNECT_ROUTING_ID, rconn1routing_id, strlen (rconn1routing_id)));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (rconn1, bindip));
-*/
-    //  Send some data.
-
-    send_string_expect_success (rconn1, rconn1routing_id, ZMQ_SNDMORE);
-    send_string_expect_success (rconn1, msg, 0);
-
-    //  Receive the name.
-    const int routing_id_len = zmq_recv (rbind, buff, 256, 0);
-    if (named_) {
-        TEST_ASSERT_EQUAL_INT (strlen (y_routing_id), routing_id_len);
-        TEST_ASSERT_EQUAL_STRING_LEN (y_routing_id, buff, routing_id_len);
-    } else {
-        TEST_ASSERT_TRUE (routing_id_len && 0 == buff[0]);
-    }
-
-    //  Receive the data.
-    recv_string_expect_success (rbind, msg, 0);
-
-    //  Send some data back.
-    const int ret = zmq_send (rbind, buff, routing_id_len, ZMQ_SNDMORE);
-    TEST_ASSERT_EQUAL_INT (routing_id_len, ret);
-    send_string_expect_success (rbind, "ok", 0);
-
-    //  If bound socket identity naming a problem, we'll likely see something funky here.
-    recv_string_expect_success (rconn1, rconn1routing_id, 0);
-    recv_string_expect_success (rconn1, "ok", 0);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_unbind (rbind, my_endpoint));
-    test_context_socket_close (rbind);
-    test_context_socket_close (rconn1);
-}
-
-void test_router_2_router_while_receiving ()
-{
-    char buff[256];
-    const char msg[] = "hi 1";
-    const int zero = 0;
-    char x_endpoint[MAX_SOCKET_STRING];
-    char z_endpoint[MAX_SOCKET_STRING];
-
-    //  Create xbind socket.
-    void *xbind = test_context_socket (ZMQ_ROUTER);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (xbind, ZMQ_LINGER, &zero, sizeof (zero)));
-    bind_loopback_ipv4 (xbind, x_endpoint, sizeof x_endpoint);
-
-    //  Create zbind socket.
-    void *zbind = test_context_socket (ZMQ_ROUTER);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (zbind, ZMQ_LINGER, &zero, sizeof (zero)));
-    bind_loopback_ipv4 (zbind, z_endpoint, sizeof z_endpoint);
-
-    //  Create connection socket.
-    void *yconn = test_context_socket (ZMQ_ROUTER);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (yconn, ZMQ_LINGER, &zero, sizeof (zero)));
-
-    // set identities for each socket
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (
-      xbind, ZMQ_ROUTING_ID, x_routing_id, strlen (x_routing_id)));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (yconn, ZMQ_ROUTING_ID, y_routing_id, 2));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (
-      zbind, ZMQ_ROUTING_ID, z_routing_id, strlen (z_routing_id)));
-
-    //  Connect Y to X using a routing id
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (
-      yconn, ZMQ_CONNECT_ROUTING_ID, x_routing_id, strlen (x_routing_id)));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (yconn, x_endpoint));
-
-    //  Send some data from Y to X.
-    send_string_expect_success (yconn, x_routing_id, ZMQ_SNDMORE);
-    send_string_expect_success (yconn, msg, 0);
-
-    // wait for the Y->X message to be received
-    msleep (SETTLE_TIME);
-
-    // Now X tries to connect to Z and send a message
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (
-      xbind, ZMQ_CONNECT_ROUTING_ID, z_routing_id, strlen (z_routing_id)));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (xbind, z_endpoint));
-
-    //  Try to send some data from X to Z.
-    send_string_expect_success (xbind, z_routing_id, ZMQ_SNDMORE);
-    send_string_expect_success (xbind, msg, 0);
-
-    // wait for the X->Z message to be received (so that our non-blocking check will actually
-    // fail if the message is routed to Y)
-    msleep (SETTLE_TIME);
-
-    // nothing should have been received on the Y socket
-    TEST_ASSERT_FAILURE_ERRNO (EAGAIN,
-                               zmq_recv (yconn, buff, 256, ZMQ_DONTWAIT));
-
-    // the message should have been received on the Z socket
-    recv_string_expect_success (zbind, x_routing_id, 0);
-    recv_string_expect_success (zbind, msg, 0);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_unbind (xbind, x_endpoint));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_unbind (zbind, z_endpoint));
-
-    test_context_socket_close (yconn);
-    test_context_socket_close (xbind);
-    test_context_socket_close (zbind);
-}
-
-void test_router_2_router_unnamed ()
-{
-    test_router_2_router (false);
-}
-
-void test_router_2_router_named ()
-{
-    test_router_2_router (true);
-}
-
-int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_stream_2_stream);
-    RUN_TEST (test_router_2_router_unnamed);
-    RUN_TEST (test_router_2_router_named);
-    RUN_TEST (test_router_2_router_while_receiving);
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_connect_stream_fuzzer.cpp b/libs/libzmq/tests/test_connect_stream_fuzzer.cpp
deleted file mode 100644
index 998d015..0000000
--- a/libs/libzmq/tests/test_connect_stream_fuzzer.cpp
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
-    Copyright (c) 2020 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifdef ZMQ_USE_FUZZING_ENGINE
-#include <fuzzer/FuzzedDataProvider.h>
-#endif
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-// Test that the ZMTP engine handles invalid handshake when connecting
-// https://rfc.zeromq.org/spec/37/
-extern "C" int LLVMFuzzerTestOneInput (const uint8_t *data, size_t size)
-{
-    setup_test_context ();
-    char my_endpoint[MAX_SOCKET_STRING];
-    fd_t server = bind_socket_resolve_port ("127.0.0.1", "0", my_endpoint);
-
-    void *client = test_context_socket (ZMQ_STREAM);
-    //  As per API by default there's no limit to the size of a message,
-    //  but the sanitizer allocator will barf over a gig or so
-    int64_t max_msg_size = 64 * 1024 * 1024;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (client, ZMQ_MAXMSGSIZE, &max_msg_size, sizeof (int64_t)));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (client, my_endpoint));
-
-    fd_t server_accept =
-      TEST_ASSERT_SUCCESS_RAW_ERRNO (accept (server, NULL, NULL));
-
-    //  If there is not enough data for a full greeting, just send what we can
-    //  Otherwise send greeting first, as expected by the protocol
-    uint8_t buf[64];
-    if (size >= 64) {
-        send (server_accept, (void *) data, 64, MSG_NOSIGNAL);
-        data += 64;
-        size -= 64;
-    }
-    recv (server_accept, buf, 64, MSG_DONTWAIT);
-    msleep (250);
-    for (ssize_t sent = 0; size > 0 && (sent != -1 || errno == EINTR);
-         size -= sent > 0 ? sent : 0, data += sent > 0 ? sent : 0)
-        sent = send (server_accept, (const char *) data, size, MSG_NOSIGNAL);
-    msleep (250);
-
-    zmq_msg_t msg;
-    zmq_msg_init (&msg);
-    while (-1 != zmq_msg_recv (&msg, client, ZMQ_DONTWAIT)) {
-        zmq_msg_close (&msg);
-        zmq_msg_init (&msg);
-    }
-
-    close (server_accept);
-    close (server);
-
-    test_context_socket_close_zero_linger (client);
-    teardown_test_context ();
-
-    return 0;
-}
-
-#ifndef ZMQ_USE_FUZZING_ENGINE
-void test_connect_null_fuzzer ()
-{
-    uint8_t **data;
-    size_t *len, num_cases = 0;
-    if (fuzzer_corpus_encode (
-          "tests/libzmq-fuzz-corpora/test_connect_null_fuzzer_seed_corpus",
-          &data, &len, &num_cases)
-        != 0)
-        exit (77);
-
-    while (num_cases-- > 0) {
-        TEST_ASSERT_SUCCESS_ERRNO (
-          LLVMFuzzerTestOneInput (data[num_cases], len[num_cases]));
-        free (data[num_cases]);
-    }
-
-    free (data);
-    free (len);
-}
-
-int main (int argc, char **argv)
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_connect_null_fuzzer);
-
-    return UNITY_END ();
-}
-#endif
diff --git a/libs/libzmq/tests/test_connect_ws_fuzzer.cpp b/libs/libzmq/tests/test_connect_ws_fuzzer.cpp
deleted file mode 100644
index cdd0180..0000000
--- a/libs/libzmq/tests/test_connect_ws_fuzzer.cpp
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
-    Copyright (c) 2020 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifdef ZMQ_USE_FUZZING_ENGINE
-#include <fuzzer/FuzzedDataProvider.h>
-#endif
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-// Test that the ZMTP WebSocket engine handles invalid handshake when connecting
-// https://rfc.zeromq.org/spec/45/
-extern "C" int LLVMFuzzerTestOneInput (const uint8_t *data, size_t size)
-{
-    setup_test_context ();
-    char my_endpoint[MAX_SOCKET_STRING];
-    fd_t server = bind_socket_resolve_port ("127.0.0.1", "0", my_endpoint,
-                                            AF_INET, IPPROTO_WS);
-
-    void *client = test_context_socket (ZMQ_PULL);
-    //  As per API by default there's no limit to the size of a message,
-    //  but the sanitizer allocator will barf over a gig or so
-    int64_t max_msg_size = 64 * 1024 * 1024;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (client, ZMQ_MAXMSGSIZE, &max_msg_size, sizeof (int64_t)));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (client, my_endpoint));
-
-    fd_t server_accept =
-      TEST_ASSERT_SUCCESS_RAW_ERRNO (accept (server, NULL, NULL));
-
-    //  If there is not enough data for a full handshake, just send what we can
-    //  Otherwise send websocket handshake first, as expected by the protocol
-    uint8_t buf[256];
-    recv (server_accept, buf, 256, 0);
-    if (size >= 166) {
-        send (server_accept, (void *) data, 166, MSG_NOSIGNAL);
-        data += 166;
-        size -= 166;
-    }
-    recv (server_accept, buf, 256, MSG_DONTWAIT);
-    //  Then send the READY command
-    if (size >= 29) {
-        send (server_accept, (void *) data, 29, MSG_NOSIGNAL);
-        data += 29;
-        size -= 29;
-    }
-    msleep (250);
-    for (ssize_t sent = 0; size > 0 && (sent != -1 || errno == EINTR);
-         size -= sent > 0 ? sent : 0, data += sent > 0 ? sent : 0)
-        sent = send (server_accept, (const char *) data, size, MSG_NOSIGNAL);
-    msleep (250);
-
-    zmq_msg_t msg;
-    zmq_msg_init (&msg);
-    while (-1 != zmq_msg_recv (&msg, client, ZMQ_DONTWAIT)) {
-        zmq_msg_close (&msg);
-        zmq_msg_init (&msg);
-    }
-
-    close (server_accept);
-    close (server);
-
-    test_context_socket_close_zero_linger (client);
-    teardown_test_context ();
-
-    return 0;
-}
-
-#ifndef ZMQ_USE_FUZZING_ENGINE
-void test_connect_ws_fuzzer ()
-{
-    uint8_t **data;
-    size_t *len, num_cases = 0;
-    if (fuzzer_corpus_encode (
-          "tests/libzmq-fuzz-corpora/test_connect_ws_fuzzer_seed_corpus", &data,
-          &len, &num_cases)
-        != 0)
-        exit (77);
-
-    while (num_cases-- > 0) {
-        TEST_ASSERT_SUCCESS_ERRNO (
-          LLVMFuzzerTestOneInput (data[num_cases], len[num_cases]));
-        free (data[num_cases]);
-    }
-
-    free (data);
-    free (len);
-}
-
-int main (int argc, char **argv)
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_connect_ws_fuzzer);
-
-    return UNITY_END ();
-}
-#endif
diff --git a/libs/libzmq/tests/test_ctx_destroy.cpp b/libs/libzmq/tests/test_ctx_destroy.cpp
deleted file mode 100644
index 661ca19..0000000
--- a/libs/libzmq/tests/test_ctx_destroy.cpp
+++ /dev/null
@@ -1,255 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-#include <unity.h>
-
-void setUp ()
-{
-}
-
-void tearDown ()
-{
-}
-
-static void receiver (void *socket_)
-{
-    char buffer[16];
-    int rc = zmq_recv (socket_, &buffer, sizeof (buffer), 0);
-    // TODO which error is expected here? use TEST_ASSERT_FAILURE_ERRNO instead
-    TEST_ASSERT_EQUAL_INT (-1, rc);
-}
-
-void test_ctx_destroy ()
-{
-    //  Set up our context and sockets
-    void *ctx = zmq_ctx_new ();
-    TEST_ASSERT_NOT_NULL (ctx);
-
-    void *socket = zmq_socket (ctx, ZMQ_PULL);
-    TEST_ASSERT_NOT_NULL (socket);
-
-    // Close the socket
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_close (socket));
-
-    // Destroy the context
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_ctx_destroy (ctx));
-}
-
-void test_ctx_shutdown ()
-{
-    //  Set up our context and sockets
-    void *ctx = zmq_ctx_new ();
-    TEST_ASSERT_NOT_NULL (ctx);
-
-    void *socket = zmq_socket (ctx, ZMQ_PULL);
-    TEST_ASSERT_NOT_NULL (socket);
-
-    // Spawn a thread to receive on socket
-    void *receiver_thread = zmq_threadstart (&receiver, socket);
-
-    // Wait for thread to start up and block
-    msleep (SETTLE_TIME);
-
-    // Shutdown context, if we used destroy here we would deadlock.
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_ctx_shutdown (ctx));
-
-    // Wait for thread to finish
-    zmq_threadclose (receiver_thread);
-
-    // Close the socket.
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_close (socket));
-
-    // Destroy the context, will now not hang as we have closed the socket.
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_ctx_destroy (ctx));
-}
-
-void test_ctx_shutdown_socket_opened_after ()
-{
-    //  Set up our context.
-    void *ctx = zmq_ctx_new ();
-    TEST_ASSERT_NOT_NULL (ctx);
-
-    // Open a socket to start context, and close it immediately again.
-    void *socket = zmq_socket (ctx, ZMQ_PULL);
-    TEST_ASSERT_NOT_NULL (socket);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_close (socket));
-
-    // Shutdown context.
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_ctx_shutdown (ctx));
-
-    // Opening socket should now fail.
-    TEST_ASSERT_NULL (zmq_socket (ctx, ZMQ_PULL));
-    TEST_ASSERT_FAILURE_ERRNO (ETERM, -1);
-
-    // Destroy the context.
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_ctx_destroy (ctx));
-}
-
-void test_ctx_shutdown_only_socket_opened_after ()
-{
-    //  Set up our context.
-    void *ctx = zmq_ctx_new ();
-    TEST_ASSERT_NOT_NULL (ctx);
-
-    // Shutdown context.
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_ctx_shutdown (ctx));
-
-    // Opening socket should now fail.
-    TEST_ASSERT_NULL (zmq_socket (ctx, ZMQ_PULL));
-    TEST_ASSERT_FAILURE_ERRNO (ETERM, -1);
-
-    // Destroy the context.
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_ctx_destroy (ctx));
-}
-
-void test_zmq_ctx_term_null_fails ()
-{
-    int rc = zmq_ctx_term (NULL);
-    TEST_ASSERT_EQUAL_INT (-1, rc);
-    TEST_ASSERT_EQUAL_INT (EFAULT, errno);
-}
-
-void test_zmq_term_null_fails ()
-{
-    int rc = zmq_term (NULL);
-    TEST_ASSERT_EQUAL_INT (-1, rc);
-    TEST_ASSERT_EQUAL_INT (EFAULT, errno);
-}
-
-void test_zmq_ctx_shutdown_null_fails ()
-{
-    int rc = zmq_ctx_shutdown (NULL);
-    TEST_ASSERT_EQUAL_INT (-1, rc);
-    TEST_ASSERT_EQUAL_INT (EFAULT, errno);
-}
-
-#ifdef ZMQ_HAVE_POLLER
-struct poller_test_data_t
-{
-    int socket_type;
-    void *ctx;
-    void *counter;
-};
-
-void run_poller (void *data_)
-{
-    const poller_test_data_t *const poller_test_data =
-      static_cast<const poller_test_data_t *> (data_);
-
-    void *socket =
-      zmq_socket (poller_test_data->ctx, poller_test_data->socket_type);
-    TEST_ASSERT_NOT_NULL (socket);
-
-    void *poller = zmq_poller_new ();
-    TEST_ASSERT_NOT_NULL (poller);
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_poller_add (poller, socket, NULL, ZMQ_POLLIN));
-
-    zmq_atomic_counter_set (poller_test_data->counter, 1);
-
-    zmq_poller_event_t event;
-    TEST_ASSERT_FAILURE_ERRNO (ETERM, zmq_poller_wait (poller, &event, -1));
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_poller_destroy (&poller));
-
-    // Close the socket
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_close (socket));
-}
-#endif
-
-void test_poller_exists_with_socket_on_zmq_ctx_term (const int socket_type_)
-{
-#ifdef ZMQ_HAVE_POLLER
-    struct poller_test_data_t poller_test_data;
-
-    poller_test_data.socket_type = socket_type_;
-
-    //  Set up our context and sockets
-    poller_test_data.ctx = zmq_ctx_new ();
-    TEST_ASSERT_NOT_NULL (poller_test_data.ctx);
-
-    poller_test_data.counter = zmq_atomic_counter_new ();
-    TEST_ASSERT_NOT_NULL (poller_test_data.counter);
-
-    void *thread = zmq_threadstart (run_poller, &poller_test_data);
-    TEST_ASSERT_NOT_NULL (thread);
-
-    while (zmq_atomic_counter_value (poller_test_data.counter) == 0) {
-        msleep (10);
-    }
-
-    // Destroy the context
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_ctx_destroy (poller_test_data.ctx));
-
-    zmq_threadclose (thread);
-
-    zmq_atomic_counter_destroy (&poller_test_data.counter);
-#else
-    TEST_IGNORE_MESSAGE ("libzmq without zmq_poller_* support, ignoring test");
-#endif
-}
-
-void test_poller_exists_with_socket_on_zmq_ctx_term_thread_safe_socket ()
-{
-#ifdef ZMQ_BUILD_DRAFT_API
-    test_poller_exists_with_socket_on_zmq_ctx_term (ZMQ_CLIENT);
-#else
-    TEST_IGNORE_MESSAGE ("libzmq without DRAFT support, ignoring test");
-#endif
-}
-
-void test_poller_exists_with_socket_on_zmq_ctx_term_non_thread_safe_socket ()
-{
-    test_poller_exists_with_socket_on_zmq_ctx_term (ZMQ_DEALER);
-}
-
-int main (void)
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_ctx_destroy);
-    RUN_TEST (test_ctx_shutdown);
-    RUN_TEST (test_ctx_shutdown_socket_opened_after);
-    RUN_TEST (test_ctx_shutdown_only_socket_opened_after);
-    RUN_TEST (test_zmq_ctx_term_null_fails);
-    RUN_TEST (test_zmq_term_null_fails);
-    RUN_TEST (test_zmq_ctx_shutdown_null_fails);
-
-    RUN_TEST (
-      test_poller_exists_with_socket_on_zmq_ctx_term_non_thread_safe_socket);
-    RUN_TEST (
-      test_poller_exists_with_socket_on_zmq_ctx_term_thread_safe_socket);
-
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_ctx_options.cpp b/libs/libzmq/tests/test_ctx_options.cpp
deleted file mode 100644
index a785606..0000000
--- a/libs/libzmq/tests/test_ctx_options.cpp
+++ /dev/null
@@ -1,310 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include <limits>
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-#define WAIT_FOR_BACKGROUND_THREAD_INSPECTION (0)
-
-#ifdef ZMQ_HAVE_LINUX
-#include <sys/time.h>
-#include <sys/resource.h>
-#include <unistd.h> // for sleep()
-#include <sched.h>
-
-#define TEST_POLICY                                                            \
-    (SCHED_OTHER) // NOTE: SCHED_OTHER is the default Linux scheduler
-
-bool is_allowed_to_raise_priority ()
-{
-    // NOTE1: if setrlimit() fails with EPERM, this means that current user has not enough permissions.
-    // NOTE2: even for privileged users (e.g., root) getrlimit() would usually return 0 as nice limit; the only way to
-    //        discover if the user is able to increase the nice value is to actually try to change the rlimit:
-    struct rlimit rlim;
-    rlim.rlim_cur = 40;
-    rlim.rlim_max = 40;
-    if (setrlimit (RLIMIT_NICE, &rlim) == 0) {
-        // rlim_cur == 40 means that this process is allowed to set a nice value of -20
-        if (WAIT_FOR_BACKGROUND_THREAD_INSPECTION)
-            printf ("This process has enough permissions to raise ZMQ "
-                    "background thread priority!\n");
-        return true;
-    }
-
-    if (WAIT_FOR_BACKGROUND_THREAD_INSPECTION)
-        printf ("This process has NOT enough permissions to raise ZMQ "
-                "background thread priority.\n");
-    return false;
-}
-
-#else
-
-#define TEST_POLICY (0)
-
-bool is_allowed_to_raise_priority ()
-{
-    return false;
-}
-
-#endif
-
-
-void test_ctx_thread_opts ()
-{
-    // verify that setting negative values (e.g., default values) fail:
-    TEST_ASSERT_FAILURE_ERRNO (
-      EINVAL, zmq_ctx_set (get_test_context (), ZMQ_THREAD_SCHED_POLICY,
-                           ZMQ_THREAD_SCHED_POLICY_DFLT));
-    TEST_ASSERT_FAILURE_ERRNO (EINVAL, zmq_ctx_set (get_test_context (),
-                                                    ZMQ_THREAD_PRIORITY,
-                                                    ZMQ_THREAD_PRIORITY_DFLT));
-
-
-    // test scheduling policy:
-
-    // set context options that alter the background thread CPU scheduling/affinity settings;
-    // as of ZMQ 4.2.3 this has an effect only on POSIX systems (nothing happens on Windows, but still it should return success):
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_ctx_set (get_test_context (), ZMQ_THREAD_SCHED_POLICY, TEST_POLICY));
-    TEST_ASSERT_EQUAL_INT (
-      TEST_POLICY, zmq_ctx_get (get_test_context (), ZMQ_THREAD_SCHED_POLICY));
-
-    // test priority:
-
-    // in theory SCHED_OTHER supports only the static priority 0 but quoting the docs
-    //     http://man7.org/linux/man-pages/man7/sched.7.html
-    // "The thread to run is chosen from the static priority 0 list based on
-    // a dynamic priority that is determined only inside this list.  The
-    // dynamic priority is based on the nice value [...]
-    // The nice value can be modified using nice(2), setpriority(2), or sched_setattr(2)."
-    // ZMQ will internally use nice(2) to set the nice value when using SCHED_OTHER.
-    // However changing the nice value of a process requires appropriate permissions...
-    // check that the current effective user is able to do that:
-    if (is_allowed_to_raise_priority ()) {
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_ctx_set (
-          get_test_context (), ZMQ_THREAD_PRIORITY,
-          1 /* any positive value different than the default will be ok */));
-    }
-
-
-    // test affinity:
-
-    // this should result in background threads being placed only on the
-    // first CPU available on this system; try experimenting with other values
-    // (e.g., 5 to use CPU index 5) and use "top -H" or "taskset -pc" to see the result
-
-    int cpus_add[] = {0, 1};
-    for (unsigned int idx = 0; idx < sizeof (cpus_add) / sizeof (cpus_add[0]);
-         idx++) {
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_ctx_set (
-          get_test_context (), ZMQ_THREAD_AFFINITY_CPU_ADD, cpus_add[idx]));
-    }
-
-    // you can also remove CPUs from list of affinities:
-    int cpus_remove[] = {1};
-    for (unsigned int idx = 0;
-         idx < sizeof (cpus_remove) / sizeof (cpus_remove[0]); idx++) {
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_ctx_set (get_test_context (),
-                                                ZMQ_THREAD_AFFINITY_CPU_REMOVE,
-                                                cpus_remove[idx]));
-    }
-
-
-    // test INTEGER thread name prefix:
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_ctx_set (get_test_context (), ZMQ_THREAD_NAME_PREFIX, 1234));
-    TEST_ASSERT_EQUAL_INT (
-      1234, zmq_ctx_get (get_test_context (), ZMQ_THREAD_NAME_PREFIX));
-
-#ifdef ZMQ_BUILD_DRAFT_API
-    // test STRING thread name prefix:
-
-    const char prefix[] = "MyPrefix9012345"; // max len is 16 chars
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_ctx_set_ext (get_test_context (), ZMQ_THREAD_NAME_PREFIX, prefix,
-                       sizeof (prefix) / sizeof (char)));
-
-    char buf[16];
-    size_t buflen = sizeof (buf) / sizeof (char);
-    zmq_ctx_get_ext (get_test_context (), ZMQ_THREAD_NAME_PREFIX, buf, &buflen);
-    TEST_ASSERT_EQUAL_STRING (prefix, buf);
-#endif
-}
-
-void test_ctx_zero_copy ()
-{
-#ifdef ZMQ_ZERO_COPY_RECV
-    int zero_copy;
-    // Default value is 1.
-    zero_copy = zmq_ctx_get (get_test_context (), ZMQ_ZERO_COPY_RECV);
-    TEST_ASSERT_EQUAL_INT (1, zero_copy);
-
-    // Test we can set it to 0.
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_ctx_set (get_test_context (), ZMQ_ZERO_COPY_RECV, 0));
-    zero_copy = zmq_ctx_get (get_test_context (), ZMQ_ZERO_COPY_RECV);
-    TEST_ASSERT_EQUAL_INT (0, zero_copy);
-
-    // Create a TCP socket pair using the context and test that messages can be
-    // received. Note that inproc sockets cannot be used for this test.
-    void *pull = zmq_socket (get_test_context (), ZMQ_PULL);
-    char endpoint[MAX_SOCKET_STRING];
-    bind_loopback_ipv4 (pull, endpoint, sizeof endpoint);
-
-    void *push = zmq_socket (get_test_context (), ZMQ_PUSH);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (push, endpoint));
-
-    const char *small_str = "abcd";
-    const char *large_str =
-      "01234567890123456789012345678901234567890123456789";
-
-    send_string_expect_success (push, small_str, 0);
-    send_string_expect_success (push, large_str, 0);
-
-    recv_string_expect_success (pull, small_str, 0);
-    recv_string_expect_success (pull, large_str, 0);
-
-    // Clean up.
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_close (push));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_close (pull));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_ctx_set (get_test_context (), ZMQ_ZERO_COPY_RECV, 1));
-    TEST_ASSERT_EQUAL_INT (
-      1, zmq_ctx_get (get_test_context (), ZMQ_ZERO_COPY_RECV));
-#endif
-}
-
-void test_ctx_option_max_sockets ()
-{
-    TEST_ASSERT_EQUAL_INT (ZMQ_MAX_SOCKETS_DFLT,
-                           zmq_ctx_get (get_test_context (), ZMQ_MAX_SOCKETS));
-}
-
-void test_ctx_option_socket_limit ()
-{
-#if defined(ZMQ_USE_SELECT)
-    TEST_ASSERT_EQUAL_INT (FD_SETSIZE - 1, zmq_ctx_get (ctx, ZMQ_SOCKET_LIMIT));
-#elif defined(ZMQ_USE_POLL) || defined(ZMQ_USE_EPOLL)                          \
-  || defined(ZMQ_USE_DEVPOLL) || defined(ZMQ_USE_KQUEUE)
-    TEST_ASSERT_EQUAL_INT (65535, zmq_ctx_get (ctx, ZMQ_SOCKET_LIMIT));
-#endif
-}
-
-void test_ctx_option_io_threads ()
-{
-    TEST_ASSERT_EQUAL_INT (ZMQ_IO_THREADS_DFLT,
-                           zmq_ctx_get (get_test_context (), ZMQ_IO_THREADS));
-}
-
-void test_ctx_option_ipv6 ()
-{
-    TEST_ASSERT_EQUAL_INT (0, zmq_ctx_get (get_test_context (), ZMQ_IPV6));
-}
-
-void test_ctx_option_msg_t_size ()
-{
-#if defined(ZMQ_MSG_T_SIZE)
-    TEST_ASSERT_EQUAL_INT (sizeof (zmq_msg_t),
-                           zmq_ctx_get (get_test_context (), ZMQ_MSG_T_SIZE));
-#endif
-}
-
-void test_ctx_option_ipv6_set ()
-{
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_ctx_set (get_test_context (), ZMQ_IPV6, true));
-    TEST_ASSERT_EQUAL_INT (1, zmq_ctx_get (get_test_context (), ZMQ_IPV6));
-}
-
-void test_ctx_option_blocky ()
-{
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_ctx_set (get_test_context (), ZMQ_IPV6, true));
-
-    void *router = test_context_socket (ZMQ_ROUTER);
-    int value;
-    size_t optsize = sizeof (int);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (router, ZMQ_IPV6, &value, &optsize));
-    TEST_ASSERT_EQUAL_INT (1, value);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (router, ZMQ_LINGER, &value, &optsize));
-    TEST_ASSERT_EQUAL_INT (-1, value);
-    test_context_socket_close (router);
-
-#if WAIT_FOR_BACKGROUND_THREAD_INSPECTION
-    // this is useful when you want to use an external tool (like top or taskset) to view
-    // properties of the background threads
-    printf ("Sleeping for 100sec. You can now use 'top -H -p $(pgrep -f "
-            "test_ctx_options)' and 'taskset -pc <ZMQ background thread PID>' "
-            "to view ZMQ background thread properties.\n");
-    sleep (100);
-#endif
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_ctx_set (get_test_context (), ZMQ_BLOCKY, false));
-    TEST_ASSERT_EQUAL_INT (0, TEST_ASSERT_SUCCESS_ERRNO ((zmq_ctx_get (
-                                get_test_context (), ZMQ_BLOCKY))));
-    router = test_context_socket (ZMQ_ROUTER);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (router, ZMQ_LINGER, &value, &optsize));
-    TEST_ASSERT_EQUAL_INT (0, value);
-    test_context_socket_close (router);
-}
-
-void test_ctx_option_invalid ()
-{
-    TEST_ASSERT_EQUAL_INT (-1, zmq_ctx_set (get_test_context (), -1, 0));
-    TEST_ASSERT_EQUAL_INT (EINVAL, errno);
-    TEST_ASSERT_EQUAL_INT (-1, zmq_ctx_get (get_test_context (), -1));
-    TEST_ASSERT_EQUAL_INT (EINVAL, errno);
-}
-
-int main (void)
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_ctx_option_max_sockets);
-    RUN_TEST (test_ctx_option_socket_limit);
-    RUN_TEST (test_ctx_option_io_threads);
-    RUN_TEST (test_ctx_option_ipv6);
-    RUN_TEST (test_ctx_option_msg_t_size);
-    RUN_TEST (test_ctx_option_ipv6_set);
-    RUN_TEST (test_ctx_thread_opts);
-    RUN_TEST (test_ctx_zero_copy);
-    RUN_TEST (test_ctx_option_blocky);
-    RUN_TEST (test_ctx_option_invalid);
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_dgram.cpp b/libs/libzmq/tests/test_dgram.cpp
deleted file mode 100644
index e4f1cf5..0000000
--- a/libs/libzmq/tests/test_dgram.cpp
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
-    Copyright (c) 2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-#include <stdlib.h>
-#include <string.h>
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void str_send_to (void *s_, const char *content_, const char *address_)
-{
-    send_string_expect_success (s_, address_, ZMQ_SNDMORE);
-    send_string_expect_success (s_, content_, 0);
-}
-
-void str_recv_from (void *s_, char **ptr_content_, char **ptr_address_)
-{
-    *ptr_address_ = s_recv (s_);
-    TEST_ASSERT_NOT_NULL (ptr_address_);
-
-    *ptr_content_ = s_recv (s_);
-    TEST_ASSERT_NOT_NULL (ptr_content_);
-}
-
-static const char test_question[] = "Is someone there ?";
-static const char test_answer[] = "Yes, there is !";
-
-void test_connect_fails ()
-{
-    void *socket = test_context_socket (ZMQ_DGRAM);
-
-    //  Connecting dgram should fail
-    TEST_ASSERT_FAILURE_ERRNO (ENOCOMPATPROTO,
-                               zmq_connect (socket, ENDPOINT_4));
-
-    test_context_socket_close (socket);
-}
-
-void test_roundtrip ()
-{
-    char *message_string;
-    char *address;
-
-    void *sender = test_context_socket (ZMQ_DGRAM);
-    void *listener = test_context_socket (ZMQ_DGRAM);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (listener, ENDPOINT_4));
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (sender, ENDPOINT_5));
-
-    str_send_to (sender, test_question, strrchr (ENDPOINT_4, '/') + 1);
-
-    str_recv_from (listener, &message_string, &address);
-    TEST_ASSERT_EQUAL_STRING (test_question, message_string);
-    TEST_ASSERT_EQUAL_STRING (strrchr (ENDPOINT_5, '/') + 1, address);
-    free (message_string);
-
-    str_send_to (listener, test_answer, address);
-    free (address);
-
-    str_recv_from (sender, &message_string, &address);
-    TEST_ASSERT_EQUAL_STRING (test_answer, message_string);
-    TEST_ASSERT_EQUAL_STRING (strrchr (ENDPOINT_4, '/') + 1, address);
-    free (message_string);
-    free (address);
-
-    test_context_socket_close (sender);
-    test_context_socket_close (listener);
-}
-
-int main (void)
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_connect_fails);
-    RUN_TEST (test_roundtrip);
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_diffserv.cpp b/libs/libzmq/tests/test_diffserv.cpp
deleted file mode 100644
index 4ed6dc6..0000000
--- a/libs/libzmq/tests/test_diffserv.cpp
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void test_diffserv ()
-{
-    int tos = 0x28;
-    int o_tos;
-    size_t tos_size = sizeof (tos);
-    char my_endpoint[MAX_SOCKET_STRING];
-
-    void *sb = test_context_socket (ZMQ_PAIR);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (sb, ZMQ_TOS, &tos, tos_size));
-    bind_loopback_ipv4 (sb, my_endpoint, sizeof (my_endpoint));
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_getsockopt (sb, ZMQ_TOS, &o_tos, &tos_size));
-    TEST_ASSERT_EQUAL (tos, o_tos);
-
-    void *sc = test_context_socket (ZMQ_PAIR);
-    tos = 0x58;
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (sc, ZMQ_TOS, &tos, tos_size));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sc, my_endpoint));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_getsockopt (sc, ZMQ_TOS, &o_tos, &tos_size));
-    TEST_ASSERT_EQUAL (tos, o_tos);
-
-    // Wireshark can be used to verify that the server socket is
-    // using DSCP 0x28 in packets to the client while the client
-    // is using 0x58 in packets to the server.
-    bounce (sb, sc);
-
-    test_context_socket_close (sc);
-    test_context_socket_close (sb);
-}
-
-int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_diffserv);
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_disconnect_inproc.cpp b/libs/libzmq/tests/test_disconnect_inproc.cpp
deleted file mode 100644
index 240f29d..0000000
--- a/libs/libzmq/tests/test_disconnect_inproc.cpp
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-#include <string.h>
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-/// Initialize a zeromq message with a given null-terminated string
-#define ZMQ_PREPARE_STRING(msg, data, size)                                    \
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init (&msg));                           \
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init_size (&msg, size + 1));            \
-    memcpy (zmq_msg_data (&msg), data, size + 1);
-
-static int publicationsReceived = 0;
-static bool isSubscribed = false;
-
-void test_disconnect_inproc ()
-{
-    void *pub_socket = test_context_socket (ZMQ_XPUB);
-    void *sub_socket = test_context_socket (ZMQ_SUB);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sub_socket, ZMQ_SUBSCRIBE, "foo", 3));
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_bind (pub_socket, "inproc://someInProcDescriptor"));
-
-    int more;
-    size_t more_size = sizeof (more);
-
-    for (int iteration = 0;; ++iteration) {
-        zmq_pollitem_t items[] = {
-          {sub_socket, 0, ZMQ_POLLIN, 0}, // read publications
-          {pub_socket, 0, ZMQ_POLLIN, 0}, // read subscriptions
-        };
-        int rc = zmq_poll (items, 2, 100);
-
-        if (items[1].revents & ZMQ_POLLIN) {
-            for (more = 1; more;) {
-                zmq_msg_t msg;
-                zmq_msg_init (&msg);
-                TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_recv (&msg, pub_socket, 0));
-                const char *const buffer =
-                  static_cast<const char *> (zmq_msg_data (&msg));
-
-                if (buffer[0] == 0) {
-                    TEST_ASSERT_TRUE (isSubscribed);
-                    isSubscribed = false;
-                } else {
-                    TEST_ASSERT_FALSE (isSubscribed);
-                    isSubscribed = true;
-                }
-
-                TEST_ASSERT_SUCCESS_ERRNO (
-                  zmq_getsockopt (pub_socket, ZMQ_RCVMORE, &more, &more_size));
-                TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&msg));
-            }
-        }
-
-        if (items[0].revents & ZMQ_POLLIN) {
-            more = 1;
-            for (more = 1; more;) {
-                zmq_msg_t msg;
-                TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init (&msg));
-                TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_recv (&msg, sub_socket, 0));
-                TEST_ASSERT_SUCCESS_ERRNO (
-                  zmq_getsockopt (sub_socket, ZMQ_RCVMORE, &more, &more_size));
-                TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&msg));
-            }
-            publicationsReceived++;
-        }
-        if (iteration == 1) {
-            TEST_ASSERT_SUCCESS_ERRNO (
-              zmq_connect (sub_socket, "inproc://someInProcDescriptor"));
-            msleep (SETTLE_TIME);
-        }
-        if (iteration == 4) {
-            TEST_ASSERT_SUCCESS_ERRNO (
-              zmq_disconnect (sub_socket, "inproc://someInProcDescriptor"));
-        }
-        if (iteration > 4 && rc == 0)
-            break;
-
-        zmq_msg_t channel_envlp;
-        ZMQ_PREPARE_STRING (channel_envlp, "foo", 3);
-        TEST_ASSERT_SUCCESS_ERRNO (
-          zmq_msg_send (&channel_envlp, pub_socket, ZMQ_SNDMORE));
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&channel_envlp));
-
-        zmq_msg_t message;
-        ZMQ_PREPARE_STRING (message, "this is foo!", 12);
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_send (&message, pub_socket, 0));
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&message));
-    }
-    TEST_ASSERT_EQUAL_INT (3, publicationsReceived);
-    TEST_ASSERT_FALSE (isSubscribed);
-
-    test_context_socket_close (pub_socket);
-    test_context_socket_close (sub_socket);
-}
-
-int main (int, char **)
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_disconnect_inproc);
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_disconnect_msg.cpp b/libs/libzmq/tests/test_disconnect_msg.cpp
deleted file mode 100644
index 73efef3..0000000
--- a/libs/libzmq/tests/test_disconnect_msg.cpp
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void test (const char *address)
-{
-    //  Create a server
-    void *server = test_context_socket (ZMQ_SERVER);
-
-    //  set server socket options
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (server, ZMQ_DISCONNECT_MSG, "D", 1));
-
-    //  bind server
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (server, address));
-
-    //  Create a client
-    void *client = test_context_socket (ZMQ_CLIENT);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (client, ZMQ_HELLO_MSG, "H", 1));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (client, address));
-
-    // Receive the hello message from client
-    recv_string_expect_success (server, "H", 0);
-
-    // Kill the client
-    test_context_socket_close (client);
-
-    // Receive the disconnect message
-    recv_string_expect_success (server, "D", 0);
-
-    //  Clean up.
-    test_context_socket_close (server);
-}
-
-void test_tcp ()
-{
-    test ("tcp://127.0.0.1:5569");
-}
-
-void test_inproc ()
-{
-    test ("inproc://disconnect-msg");
-}
-
-
-void test_inproc_disconnect ()
-{
-    const char *address = "inproc://disconnect-msg";
-
-    //  Create a server
-    void *server = test_context_socket (ZMQ_SERVER);
-
-    //  set server socket options
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (server, ZMQ_DISCONNECT_MSG, "D", 1));
-
-    //  bind server
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (server, address));
-
-    //  Create a client
-    void *client = test_context_socket (ZMQ_CLIENT);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (client, ZMQ_HELLO_MSG, "H", 1));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (client, address));
-
-    // Receive the hello message from client
-    recv_string_expect_success (server, "H", 0);
-
-    // disconnect the client
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_disconnect (client, address));
-
-    // Receive the disconnect message
-    recv_string_expect_success (server, "D", 0);
-
-    //  Clean up.
-    test_context_socket_close (client);
-    test_context_socket_close (server);
-}
-
-int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_tcp);
-    RUN_TEST (test_inproc);
-    RUN_TEST (test_inproc_disconnect);
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_filter_ipc.cpp b/libs/libzmq/tests/test_filter_ipc.cpp
deleted file mode 100644
index 57fdd94..0000000
--- a/libs/libzmq/tests/test_filter_ipc.cpp
+++ /dev/null
@@ -1,220 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-#include <unistd.h>
-#include <grp.h>
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-static void bounce_fail (void *server_, void *client_)
-{
-    const char *content = "12345678ABCDEFGH12345678abcdefgh";
-    char buffer[32];
-
-    //  Send message from client to server
-    send_string_expect_success (client_, content, ZMQ_SNDMORE);
-    send_string_expect_success (client_, content, 0);
-
-    //  Receive message at server side (should not succeed)
-    int timeout = SETTLE_TIME;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (server_, ZMQ_RCVTIMEO, &timeout, sizeof (int)));
-    TEST_ASSERT_FAILURE_ERRNO (EAGAIN, zmq_recv (server_, buffer, 32, 0));
-
-    //  Send message from server to client to test other direction
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (server_, ZMQ_SNDTIMEO, &timeout, sizeof (int)));
-    TEST_ASSERT_FAILURE_ERRNO (EAGAIN,
-                               zmq_send (server_, content, 32, ZMQ_SNDMORE));
-}
-
-template <class T>
-static void
-run_test (int opt_, T optval_, int expected_error_, int bounce_test_)
-{
-    void *sb = test_context_socket (ZMQ_DEALER);
-
-    if (opt_) {
-        const int rc = zmq_setsockopt (sb, opt_, &optval_, sizeof (optval_));
-        if (expected_error_) {
-            TEST_ASSERT_FAILURE_ERRNO (expected_error_, rc);
-        } else {
-            TEST_ASSERT_SUCCESS_ERRNO (rc);
-        }
-    }
-
-    void *sc = test_context_socket (ZMQ_DEALER);
-
-    // If a test fails, don't hang for too long
-    int timeout = 2500;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sb, ZMQ_RCVTIMEO, &timeout, sizeof (int)));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sb, ZMQ_SNDTIMEO, &timeout, sizeof (int)));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sc, ZMQ_RCVTIMEO, &timeout, sizeof (int)));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sc, ZMQ_SNDTIMEO, &timeout, sizeof (int)));
-    int interval = -1;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sc, ZMQ_RECONNECT_IVL, &interval, sizeof (int)));
-
-    if (bounce_test_) {
-        const char *endpoint = "ipc://test_filter_ipc.sock";
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (sb, endpoint));
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sc, endpoint));
-
-        if (bounce_test_ > 0)
-            bounce (sb, sc);
-        else
-            bounce_fail (sb, sc);
-    }
-
-    // TODO only use zero linger when bounce_test_ < 0?
-    test_context_socket_close_zero_linger (sc);
-    test_context_socket_close_zero_linger (sb);
-}
-
-#if defined ZMQ_HAVE_SO_PEERCRED || defined ZMQ_HAVE_LOCAL_PEERCRED
-gid_t group, supgroup, notgroup;
-
-void init_groups ()
-{
-    // Get the group and supplemental groups of the process owner
-    gid_t groups[100];
-    int ngroups = getgroups (100, groups);
-    TEST_ASSERT_NOT_EQUAL (-1, ngroups);
-    group = getgid ();
-    supgroup = group;
-    notgroup = group + 1;
-    for (int i = 0; i < ngroups; i++) {
-        if (supgroup == group && group != groups[i]) {
-            if (getgrgid (groups[i]))
-                supgroup = groups[i];
-        }
-        if (notgroup <= groups[i])
-            notgroup = groups[i] + 1;
-    }
-}
-#endif
-
-void test_no_filters ()
-{
-    run_test<int> (0, 0, 0, 1);
-}
-
-#if defined ZMQ_HAVE_SO_PEERCRED || defined ZMQ_HAVE_LOCAL_PEERCRED
-void test_filter_with_process_owner_uid ()
-{
-    run_test<uid_t> (ZMQ_IPC_FILTER_UID, getuid (), 0, 1);
-}
-void test_filter_with_possibly_nonexistent_uid ()
-{
-    run_test<uid_t> (ZMQ_IPC_FILTER_UID, getuid () + 1, 0, -1);
-}
-void test_filter_with_process_owner_gid ()
-{
-    run_test<gid_t> (ZMQ_IPC_FILTER_GID, group, 0, 1);
-}
-void test_filter_with_supplemental_process_owner_gid ()
-{
-    run_test<gid_t> (ZMQ_IPC_FILTER_GID, supgroup, 0, 1);
-}
-void test_filter_with_possibly_nonexistent_gid ()
-{
-    run_test<gid_t> (ZMQ_IPC_FILTER_GID, notgroup, 0, -1);
-}
-#if defined ZMQ_HAVE_SO_PEERCRED
-void test_filter_with_current_process_pid ()
-{
-    run_test<pid_t> (ZMQ_IPC_FILTER_PID, getpid (), 0, 1);
-}
-void test_filter_with_possibly_nonexistent_pid ()
-{
-    run_test<pid_t> (ZMQ_IPC_FILTER_PID, getpid () + 1, 0, -1);
-}
-#else
-void test_filter_with_pid_fails ()
-{
-    // Setup of PID filter should fail with operation not supported error
-    // TODO EINVAL is not ENOTSUP (!)
-    run_test<pid_t> (ZMQ_IPC_FILTER_PID, getpid (), EINVAL, 0);
-}
-#endif
-#else
-void test_filter_with_zero_uid_fails ()
-{
-    run_test<uid_t> (ZMQ_IPC_FILTER_UID, 0, EINVAL, 0);
-}
-void test_filter_with_zero_gid_fails ()
-{
-    run_test<gid_t> (ZMQ_IPC_FILTER_GID, 0, EINVAL, 0);
-}
-void test_filter_with_zero_pid_fails ()
-{
-    run_test<pid_t> (ZMQ_IPC_FILTER_PID, 0, EINVAL, 0);
-}
-#endif // defined ZMQ_HAVE_SO_PEERCRED || defined ZMQ_HAVE_LOCAL_PEERCRED
-
-int main (void)
-{
-#if !defined(ZMQ_HAVE_WINDOWS)
-    setup_test_environment ();
-
-#if defined ZMQ_HAVE_SO_PEERCRED || defined ZMQ_HAVE_LOCAL_PEERCRED
-    init_groups ();
-#endif
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_no_filters);
-#if defined ZMQ_HAVE_SO_PEERCRED || defined ZMQ_HAVE_LOCAL_PEERCRED
-    RUN_TEST (test_filter_with_process_owner_uid);
-    RUN_TEST (test_filter_with_possibly_nonexistent_uid);
-    RUN_TEST (test_filter_with_process_owner_gid);
-    RUN_TEST (test_filter_with_supplemental_process_owner_gid);
-    RUN_TEST (test_filter_with_possibly_nonexistent_gid);
-#if defined ZMQ_HAVE_SO_PEERCRED
-    RUN_TEST (test_filter_with_current_process_pid);
-    RUN_TEST (test_filter_with_possibly_nonexistent_pid);
-#else
-    RUN_TEST (test_filter_with_pid_fails);
-#endif
-#else
-    RUN_TEST (test_filter_with_zero_uid_fails);
-    RUN_TEST (test_filter_with_zero_gid_fails);
-    RUN_TEST (test_filter_with_zero_pid_fails);
-#endif // defined ZMQ_HAVE_SO_PEERCRED || defined ZMQ_HAVE_LOCAL_PEERCRED
-    return UNITY_END ();
-#else
-    return 0;
-#endif
-}
diff --git a/libs/libzmq/tests/test_fork.cpp b/libs/libzmq/tests/test_fork.cpp
deleted file mode 100644
index 212a65c..0000000
--- a/libs/libzmq/tests/test_fork.cpp
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-#include <assert.h>
-
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/wait.h>
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-char connect_address[MAX_SOCKET_STRING];
-
-#define NUM_MESSAGES 5
-
-void test_fork ()
-{
-#if !defined(ZMQ_HAVE_WINDOWS)
-    //  Create and bind pull socket to receive messages
-    void *pull = test_context_socket (ZMQ_PULL);
-    bind_loopback_ipv4 (pull, connect_address, sizeof connect_address);
-
-    int pid = fork ();
-    if (pid == 0) {
-        // use regular assertions in the child process
-
-        //  Child process
-        //  Immediately close parent sockets and context
-        zmq_close (pull);
-        zmq_ctx_term (get_test_context ());
-
-        //  Create new context, socket, connect and send some messages
-        void *child_ctx = zmq_ctx_new ();
-        assert (child_ctx);
-        void *push = zmq_socket (child_ctx, ZMQ_PUSH);
-        assert (push);
-        int rc = zmq_connect (push, connect_address);
-        assert (rc == 0);
-        int count;
-        for (count = 0; count < NUM_MESSAGES; count++)
-            zmq_send (push, "Hello", 5, 0);
-
-        zmq_close (push);
-        zmq_ctx_destroy (child_ctx);
-        exit (0);
-    } else {
-        //  Parent process
-        int count;
-        for (count = 0; count < NUM_MESSAGES; count++) {
-            recv_string_expect_success (pull, "Hello", 0);
-        }
-        int child_status;
-        while (true) {
-            int rc = waitpid (pid, &child_status, 0);
-            if (rc == -1 && errno == EINTR)
-                continue;
-            TEST_ASSERT_GREATER_THAN (0, rc);
-            //  Verify the status code of the child was zero
-            TEST_ASSERT_EQUAL (0, WEXITSTATUS (child_status));
-            break;
-        }
-        test_context_socket_close (pull);
-    }
-#endif
-}
-
-int main (void)
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_fork);
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_getsockopt_memset.cpp b/libs/libzmq/tests/test_getsockopt_memset.cpp
deleted file mode 100644
index caab9c2..0000000
--- a/libs/libzmq/tests/test_getsockopt_memset.cpp
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-#include <string.h>
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void test_getsockopt_memset ()
-{
-    int64_t more;
-    size_t more_size = sizeof (more);
-
-    void *sb = test_context_socket (ZMQ_PUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (sb, "inproc://a"));
-
-    void *sc = test_context_socket (ZMQ_SUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sc, "inproc://a"));
-
-    memset (&more, 0xFF, sizeof (int64_t));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (sc, ZMQ_RCVMORE, &more, &more_size));
-    TEST_ASSERT_EQUAL_INT (sizeof (int), more_size);
-    TEST_ASSERT_EQUAL_INT (0, more);
-
-    // Cleanup
-    test_context_socket_close (sc);
-    test_context_socket_close (sb);
-}
-
-int main (void)
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_getsockopt_memset);
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_heartbeats.cpp b/libs/libzmq/tests/test_heartbeats.cpp
deleted file mode 100644
index 23c6fa1..0000000
--- a/libs/libzmq/tests/test_heartbeats.cpp
+++ /dev/null
@@ -1,449 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of 0MQ.
-
-    0MQ is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    0MQ is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#if defined(ZMQ_HAVE_WINDOWS)
-#include <winsock2.h>
-#include <ws2tcpip.h>
-#include <stdexcept>
-#define close closesocket
-typedef SOCKET raw_socket;
-#else
-#include <arpa/inet.h>
-#include <unistd.h>
-typedef int raw_socket;
-#endif
-
-#include <limits.h>
-#include <stdlib.h>
-#include <string.h>
-
-// TODO remove this here, either ensure that UINT16_MAX is always properly
-// defined or handle this at a more central location
-#ifndef UINT16_MAX
-#define UINT16_MAX 65535
-#endif
-
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-//  Read one event off the monitor socket; return value and address
-//  by reference, if not null, and event number by value. Returns -1
-//  in case of error.
-
-static int get_monitor_event (void *monitor_)
-{
-    for (int i = 0; i < 10; i++) {
-        //  First frame in message contains event number and value
-        zmq_msg_t msg;
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init (&msg));
-        if (zmq_msg_recv (&msg, monitor_, ZMQ_DONTWAIT) == -1) {
-            msleep (SETTLE_TIME);
-            continue; //  Interrupted, presumably
-        }
-        TEST_ASSERT_TRUE (zmq_msg_more (&msg));
-
-        uint8_t *data = static_cast<uint8_t *> (zmq_msg_data (&msg));
-        uint16_t event = *reinterpret_cast<uint16_t *> (data);
-
-        //  Second frame in message contains event address
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init (&msg));
-        if (zmq_msg_recv (&msg, monitor_, 0) == -1) {
-            return -1; //  Interrupted, presumably
-        }
-        TEST_ASSERT_FALSE (zmq_msg_more (&msg));
-
-        return event;
-    }
-    return -1;
-}
-
-static void recv_with_retry (raw_socket fd_, char *buffer_, int bytes_)
-{
-    int received = 0;
-    while (true) {
-        int rc = TEST_ASSERT_SUCCESS_RAW_ERRNO (
-          recv (fd_, buffer_ + received, bytes_ - received, 0));
-        TEST_ASSERT_GREATER_THAN_INT (0, rc);
-        received += rc;
-        TEST_ASSERT_LESS_OR_EQUAL_INT (bytes_, received);
-        if (received == bytes_)
-            break;
-    }
-}
-
-static void mock_handshake (raw_socket fd_, int mock_ping_)
-{
-    char buffer[128];
-    memset (buffer, 0, sizeof (buffer));
-    memcpy (buffer, zmtp_greeting_null, sizeof (zmtp_greeting_null));
-
-    int rc = TEST_ASSERT_SUCCESS_RAW_ERRNO (
-      send (fd_, buffer, sizeof (zmtp_greeting_null), 0));
-    TEST_ASSERT_EQUAL_INT (sizeof (zmtp_greeting_null), rc);
-
-    recv_with_retry (fd_, buffer, sizeof (zmtp_greeting_null));
-
-    memset (buffer, 0, sizeof (buffer));
-    memcpy (buffer, zmtp_ready_dealer, sizeof (zmtp_ready_dealer));
-    rc = TEST_ASSERT_SUCCESS_RAW_ERRNO (
-      send (fd_, buffer, sizeof (zmtp_ready_dealer), 0));
-    TEST_ASSERT_EQUAL_INT (sizeof (zmtp_ready_dealer), rc);
-
-    //  greeting
-    recv_with_retry (fd_, buffer, sizeof (zmtp_ready_dealer));
-
-    if (mock_ping_) {
-        //  test PING context - should be replicated in the PONG
-        //  to avoid timeouts, do a bulk send
-        const uint8_t zmtp_ping[12] = {4,   10, 4, 'P', 'I', 'N',
-                                       'G', 0,  0, 'L', 'O', 'L'};
-        uint8_t zmtp_pong[10] = {4, 8, 4, 'P', 'O', 'N', 'G', 'L', 'O', 'L'};
-        memset (buffer, 0, sizeof (buffer));
-        memcpy (buffer, zmtp_ping, 12);
-        rc = TEST_ASSERT_SUCCESS_RAW_ERRNO (send (fd_, buffer, 12, 0));
-        TEST_ASSERT_EQUAL_INT (12, rc);
-
-        //  test a larger body that won't fit in a small message and should get
-        //  truncated
-        memset (buffer, 'z', sizeof (buffer));
-        memcpy (buffer, zmtp_ping, 12);
-        buffer[1] = 65;
-        rc = TEST_ASSERT_SUCCESS_RAW_ERRNO (send (fd_, buffer, 67, 0));
-        TEST_ASSERT_EQUAL_INT (67, rc);
-
-        //  small pong
-        recv_with_retry (fd_, buffer, 10);
-        TEST_ASSERT_EQUAL_INT (0, memcmp (zmtp_pong, buffer, 10));
-        //  large pong
-        recv_with_retry (fd_, buffer, 23);
-        uint8_t zmtp_pooong[65] = {4, 21, 4, 'P', 'O', 'N', 'G', 'L', 'O', 'L'};
-        memset (zmtp_pooong + 10, 'z', 55);
-        TEST_ASSERT_EQUAL_INT (0, memcmp (zmtp_pooong, buffer, 23));
-    }
-}
-
-static void setup_curve (void *socket_, int is_server_)
-{
-    const char *secret_key;
-    const char *public_key;
-    const char *server_key;
-
-    if (is_server_) {
-        secret_key = "JTKVSB%%)wK0E.X)V>+}o?pNmC{O&4W4b!Ni{Lh6";
-        public_key = "rq:rM>}U?@Lns47E1%kR.o@n%FcmmsL/@{H8]yf7";
-        server_key = NULL;
-    } else {
-        secret_key = "D:)Q[IlAW!ahhC2ac:9*A}h:p?([4%wOTJ%JR%cs";
-        public_key = "Yne@$w-vo<fVvi]a<NY6T1ed:M$fCG*[IaLV{hID";
-        server_key = "rq:rM>}U?@Lns47E1%kR.o@n%FcmmsL/@{H8]yf7";
-    }
-
-    zmq_setsockopt (socket_, ZMQ_CURVE_SECRETKEY, secret_key,
-                    strlen (secret_key));
-    zmq_setsockopt (socket_, ZMQ_CURVE_PUBLICKEY, public_key,
-                    strlen (public_key));
-    if (is_server_)
-        zmq_setsockopt (socket_, ZMQ_CURVE_SERVER, &is_server_,
-                        sizeof (is_server_));
-    else
-        zmq_setsockopt (socket_, ZMQ_CURVE_SERVERKEY, server_key,
-                        strlen (server_key));
-}
-
-static void prep_server_socket (int set_heartbeats_,
-                                int is_curve_,
-                                void **server_out_,
-                                void **mon_out_,
-                                char *endpoint_,
-                                size_t ep_length_,
-                                int socket_type_)
-{
-    //  We'll be using this socket in raw mode
-    void *server = test_context_socket (socket_type_);
-
-    int value = 0;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (server, ZMQ_LINGER, &value, sizeof (value)));
-
-    if (set_heartbeats_) {
-        value = 50;
-        TEST_ASSERT_SUCCESS_ERRNO (
-          zmq_setsockopt (server, ZMQ_HEARTBEAT_IVL, &value, sizeof (value)));
-    }
-
-    if (is_curve_)
-        setup_curve (server, 1);
-
-    bind_loopback_ipv4 (server, endpoint_, ep_length_);
-
-    //  Create and connect a socket for collecting monitor events on dealer
-    void *server_mon = test_context_socket (ZMQ_PAIR);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_socket_monitor (
-      server, "inproc://monitor-dealer",
-      ZMQ_EVENT_CONNECTED | ZMQ_EVENT_DISCONNECTED | ZMQ_EVENT_ACCEPTED));
-
-    //  Connect to the inproc endpoint so we'll get events
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_connect (server_mon, "inproc://monitor-dealer"));
-
-    *server_out_ = server;
-    *mon_out_ = server_mon;
-}
-
-// This checks for a broken TCP connection (or, in this case a stuck one
-// where the peer never responds to PINGS). There should be an accepted event
-// then a disconnect event.
-static void test_heartbeat_timeout (int server_type_, int mock_ping_)
-{
-    int rc;
-    char my_endpoint[MAX_SOCKET_STRING];
-
-    void *server, *server_mon;
-    prep_server_socket (!mock_ping_, 0, &server, &server_mon, my_endpoint,
-                        MAX_SOCKET_STRING, server_type_);
-
-    fd_t s = connect_socket (my_endpoint);
-
-    // Mock a ZMTP 3 client so we can forcibly time out a connection
-    mock_handshake (s, mock_ping_);
-
-    // By now everything should report as connected
-    rc = get_monitor_event (server_mon);
-    TEST_ASSERT_EQUAL_INT (ZMQ_EVENT_ACCEPTED, rc);
-
-    if (!mock_ping_) {
-        // We should have been disconnected
-        rc = get_monitor_event (server_mon);
-        TEST_ASSERT_EQUAL_INT (ZMQ_EVENT_DISCONNECTED, rc);
-    }
-
-    close (s);
-
-    test_context_socket_close (server);
-    test_context_socket_close (server_mon);
-}
-
-// This checks that peers respect the TTL value in ping messages
-// We set up a mock ZMTP 3 client and send a ping message with a TLL
-// to a server that is not doing any heartbeating. Then we sleep,
-// if the server disconnects the client, then we know the TTL did
-// its thing correctly.
-static void test_heartbeat_ttl (int client_type_, int server_type_)
-{
-    int rc, value;
-    char my_endpoint[MAX_SOCKET_STRING];
-
-    void *server, *server_mon, *client;
-    prep_server_socket (0, 0, &server, &server_mon, my_endpoint,
-                        MAX_SOCKET_STRING, server_type_);
-
-    client = test_context_socket (client_type_);
-
-    // Set the heartbeat TTL to 0.1 seconds
-    value = 100;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (client, ZMQ_HEARTBEAT_TTL, &value, sizeof (value)));
-
-    // Set the heartbeat interval to much longer than the TTL so that
-    // the socket times out oon the remote side.
-    value = 250;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (client, ZMQ_HEARTBEAT_IVL, &value, sizeof (value)));
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (client, my_endpoint));
-
-    // By now everything should report as connected
-    rc = get_monitor_event (server_mon);
-    TEST_ASSERT_EQUAL_INT (ZMQ_EVENT_ACCEPTED, rc);
-
-    msleep (SETTLE_TIME);
-
-    // We should have been disconnected
-    rc = get_monitor_event (server_mon);
-    TEST_ASSERT_EQUAL_INT (ZMQ_EVENT_DISCONNECTED, rc);
-
-    test_context_socket_close (server);
-    test_context_socket_close (server_mon);
-    test_context_socket_close (client);
-}
-
-// This checks for normal operation - that is pings and pongs being
-// exchanged normally. There should be an accepted event on the server,
-// and then no event afterwards.
-static void
-test_heartbeat_notimeout (int is_curve_, int client_type_, int server_type_)
-{
-    int rc;
-    char my_endpoint[MAX_SOCKET_STRING];
-
-    void *server, *server_mon;
-    prep_server_socket (1, is_curve_, &server, &server_mon, my_endpoint,
-                        MAX_SOCKET_STRING, server_type_);
-
-    void *client = test_context_socket (client_type_);
-    if (is_curve_)
-        setup_curve (client, 0);
-    rc = zmq_connect (client, my_endpoint);
-
-    // Give it a sec to connect and handshake
-    msleep (SETTLE_TIME);
-
-    // By now everything should report as connected
-    rc = get_monitor_event (server_mon);
-    TEST_ASSERT_EQUAL_INT (ZMQ_EVENT_ACCEPTED, rc);
-
-    // We should still be connected because pings and pongs are happenin'
-    rc = get_monitor_event (server_mon);
-    // TODO: this fails ~1% of the runs on OBS but it does not seem to be reproducible anywhere else
-    if (rc == 512)
-        TEST_IGNORE_MESSAGE (
-          "Unreliable test occasionally fails on slow CIs, ignoring");
-    TEST_ASSERT_EQUAL_INT (-1, rc);
-
-    test_context_socket_close (client);
-    test_context_socket_close (server);
-    test_context_socket_close (server_mon);
-}
-
-void test_heartbeat_timeout_router ()
-{
-    test_heartbeat_timeout (ZMQ_ROUTER, 0);
-}
-
-void test_heartbeat_timeout_router_mock_ping ()
-{
-    test_heartbeat_timeout (ZMQ_ROUTER, 1);
-}
-
-#define DEFINE_TESTS(first, second, first_define, second_define)               \
-    void test_heartbeat_ttl_##first##_##second ()                              \
-    {                                                                          \
-        test_heartbeat_ttl (first_define, second_define);                      \
-    }                                                                          \
-    void test_heartbeat_notimeout_##first##_##second ()                        \
-    {                                                                          \
-        test_heartbeat_notimeout (0, first_define, second_define);             \
-    }                                                                          \
-    void test_heartbeat_notimeout_##first##_##second##_with_curve ()           \
-    {                                                                          \
-        test_heartbeat_notimeout (1, first_define, second_define);             \
-    }
-
-DEFINE_TESTS (dealer, router, ZMQ_DEALER, ZMQ_ROUTER)
-DEFINE_TESTS (req, rep, ZMQ_REQ, ZMQ_REP)
-DEFINE_TESTS (pull, push, ZMQ_PULL, ZMQ_PUSH)
-DEFINE_TESTS (sub, pub, ZMQ_SUB, ZMQ_PUB)
-DEFINE_TESTS (pair, pair, ZMQ_PAIR, ZMQ_PAIR)
-
-#ifdef ZMQ_BUILD_DRAFT_API
-DEFINE_TESTS (gather, scatter, ZMQ_GATHER, ZMQ_SCATTER)
-DEFINE_TESTS (client, server, ZMQ_CLIENT, ZMQ_SERVER)
-#endif
-
-const int deciseconds_per_millisecond = 100;
-const int heartbeat_ttl_max =
-  (UINT16_MAX + 1) * deciseconds_per_millisecond - 1;
-
-void test_setsockopt_heartbeat_success (const int value_)
-{
-    void *const socket = test_context_socket (ZMQ_PAIR);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (socket, ZMQ_HEARTBEAT_TTL, &value_, sizeof (value_)));
-
-    int value_read;
-    size_t value_read_size = sizeof (value_read);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_getsockopt (socket, ZMQ_HEARTBEAT_TTL,
-                                               &value_read, &value_read_size));
-
-    TEST_ASSERT_EQUAL_INT (value_ - value_ % deciseconds_per_millisecond,
-                           value_read);
-
-    test_context_socket_close (socket);
-}
-
-void test_setsockopt_heartbeat_ttl_max ()
-{
-    test_setsockopt_heartbeat_success (heartbeat_ttl_max);
-}
-
-void test_setsockopt_heartbeat_ttl_more_than_max_fails ()
-{
-    void *const socket = test_context_socket (ZMQ_PAIR);
-    const int value = heartbeat_ttl_max + 1;
-    TEST_ASSERT_FAILURE_ERRNO (
-      EINVAL,
-      zmq_setsockopt (socket, ZMQ_HEARTBEAT_TTL, &value, sizeof (value)));
-
-    test_context_socket_close (socket);
-}
-
-void test_setsockopt_heartbeat_ttl_near_zero ()
-{
-    test_setsockopt_heartbeat_success (deciseconds_per_millisecond - 1);
-}
-
-int main (void)
-{
-    //  The test cases are very long-running. The default timeout of 60 seconds
-    //  is not always enough.
-    setup_test_environment (90);
-
-    UNITY_BEGIN ();
-
-    RUN_TEST (test_heartbeat_timeout_router);
-    RUN_TEST (test_heartbeat_timeout_router_mock_ping);
-
-    RUN_TEST (test_heartbeat_ttl_dealer_router);
-    RUN_TEST (test_heartbeat_ttl_req_rep);
-    RUN_TEST (test_heartbeat_ttl_pull_push);
-    RUN_TEST (test_heartbeat_ttl_sub_pub);
-    RUN_TEST (test_heartbeat_ttl_pair_pair);
-
-    RUN_TEST (test_setsockopt_heartbeat_ttl_max);
-    RUN_TEST (test_setsockopt_heartbeat_ttl_more_than_max_fails);
-    RUN_TEST (test_setsockopt_heartbeat_ttl_near_zero);
-
-    RUN_TEST (test_heartbeat_notimeout_dealer_router);
-    RUN_TEST (test_heartbeat_notimeout_req_rep);
-    RUN_TEST (test_heartbeat_notimeout_pull_push);
-    RUN_TEST (test_heartbeat_notimeout_sub_pub);
-    RUN_TEST (test_heartbeat_notimeout_pair_pair);
-
-    RUN_TEST (test_heartbeat_notimeout_dealer_router_with_curve);
-    RUN_TEST (test_heartbeat_notimeout_req_rep_with_curve);
-    RUN_TEST (test_heartbeat_notimeout_pull_push_with_curve);
-    RUN_TEST (test_heartbeat_notimeout_sub_pub_with_curve);
-    RUN_TEST (test_heartbeat_notimeout_pair_pair_with_curve);
-
-#ifdef ZMQ_BUILD_DRAFT_API
-    RUN_TEST (test_heartbeat_ttl_client_server);
-    RUN_TEST (test_heartbeat_ttl_gather_scatter);
-
-    RUN_TEST (test_heartbeat_notimeout_client_server);
-    RUN_TEST (test_heartbeat_notimeout_gather_scatter);
-
-    RUN_TEST (test_heartbeat_notimeout_client_server_with_curve);
-    RUN_TEST (test_heartbeat_notimeout_gather_scatter_with_curve);
-#endif
-
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_hello_msg.cpp b/libs/libzmq/tests/test_hello_msg.cpp
deleted file mode 100644
index e38ea87..0000000
--- a/libs/libzmq/tests/test_hello_msg.cpp
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
-    Copyright (c) 2007-2020 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void test (const char *address)
-{
-    //  Create a router
-    void *router = test_context_socket (ZMQ_ROUTER);
-    char my_endpoint[MAX_SOCKET_STRING];
-
-    //  set router socket options
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (router, ZMQ_HELLO_MSG, "H", 1));
-
-    //  bind router
-    test_bind (router, address, my_endpoint, MAX_SOCKET_STRING);
-
-    //  Create a dealer
-    void *dealer = test_context_socket (ZMQ_DEALER);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (dealer, my_endpoint));
-
-    // Receive the hello message
-    recv_string_expect_success (dealer, "H", 0);
-
-    //  Clean up.
-    test_context_socket_close (dealer);
-    test_context_socket_close (router);
-}
-
-void test_tcp ()
-{
-    test ("tcp://127.0.0.1:*");
-}
-
-void test_inproc ()
-{
-    test ("inproc://hello-msg");
-}
-
-void test_inproc_late_bind ()
-{
-    char address[] = "inproc://late-hello-msg";
-
-    //  Create a server
-    void *server = test_context_socket (ZMQ_SERVER);
-
-    //  set server socket options
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (server, ZMQ_HELLO_MSG, "W", 1));
-
-    //  Create a dealer
-    void *client = test_context_socket (ZMQ_CLIENT);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (client, ZMQ_HELLO_MSG, "H", 1));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (client, address));
-
-    //  bind server after the dealer
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (server, address));
-
-    // Receive the welcome message from server
-    recv_string_expect_success (client, "W", 0);
-
-    // Receive the hello message from client
-    recv_string_expect_success (server, "H", 0);
-
-    //  Clean up.
-    test_context_socket_close (client);
-    test_context_socket_close (server);
-}
-
-int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_tcp);
-    RUN_TEST (test_inproc);
-    RUN_TEST (test_inproc_late_bind);
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_hiccup_msg.cpp b/libs/libzmq/tests/test_hiccup_msg.cpp
deleted file mode 100644
index c7784b2..0000000
--- a/libs/libzmq/tests/test_hiccup_msg.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
-    Copyright (c) 2007-2021 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void test ()
-{
-    char address[MAX_SOCKET_STRING];
-    size_t addr_length = sizeof (address);
-
-    //  Create a server
-    void *server = test_context_socket (ZMQ_SERVER);
-
-    //  bind server
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (server, "tcp://127.0.0.1:*"));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (server, ZMQ_LAST_ENDPOINT, address, &addr_length));
-
-    //  Create a client
-    void *client = test_context_socket (ZMQ_CLIENT);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (client, ZMQ_HELLO_MSG, "HELLO", 5));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (client, ZMQ_HICCUP_MSG, "HICCUP", 6));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (client, address));
-
-    // Receive the hello message from client
-    recv_string_expect_success (server, "HELLO", 0);
-
-    // Kill the server
-    test_context_socket_close (server);
-
-    // Receive the hiccup message
-    recv_string_expect_success (client, "HICCUP", 0);
-
-    //  Clean up.
-    test_context_socket_close (client);
-}
-
-int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test);
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_hwm.cpp b/libs/libzmq/tests/test_hwm.cpp
deleted file mode 100644
index e07d188..0000000
--- a/libs/libzmq/tests/test_hwm.cpp
+++ /dev/null
@@ -1,306 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-const int MAX_SENDS = 10000;
-
-enum TestType
-{
-    BIND_FIRST,
-    CONNECT_FIRST
-};
-
-void test_defaults ()
-{
-    // Set up bind socket
-    void *bind_socket = test_context_socket (ZMQ_PULL);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (bind_socket, "inproc://a"));
-
-    // Set up connect socket
-    void *connect_socket = test_context_socket (ZMQ_PUSH);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (connect_socket, "inproc://a"));
-
-    // Send until we block
-    int send_count = 0;
-    while (send_count < MAX_SENDS
-           && zmq_send (connect_socket, NULL, 0, ZMQ_DONTWAIT) == 0)
-        ++send_count;
-
-    msleep (SETTLE_TIME);
-
-    // Now receive all sent messages
-    int recv_count = 0;
-    while (zmq_recv (bind_socket, NULL, 0, ZMQ_DONTWAIT) == 0)
-        ++recv_count;
-
-    TEST_ASSERT_EQUAL_INT (send_count, recv_count);
-
-    // Clean up
-    test_context_socket_close (connect_socket);
-    test_context_socket_close (bind_socket);
-
-    // Default values are 1000 on send and 1000 one receive, so 2000 total
-    TEST_ASSERT_EQUAL_INT (2000, send_count);
-}
-
-int count_msg (int send_hwm_, int recv_hwm_, TestType test_type_)
-{
-    void *bind_socket;
-    void *connect_socket;
-    if (test_type_ == BIND_FIRST) {
-        // Set up bind socket
-        bind_socket = test_context_socket (ZMQ_PULL);
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (
-          bind_socket, ZMQ_RCVHWM, &recv_hwm_, sizeof (recv_hwm_)));
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (bind_socket, "inproc://a"));
-
-        // Set up connect socket
-        connect_socket = test_context_socket (ZMQ_PUSH);
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (
-          connect_socket, ZMQ_SNDHWM, &send_hwm_, sizeof (send_hwm_)));
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (connect_socket, "inproc://a"));
-
-        //  we must wait for the connect to succeed here, unfortunately we don't
-        //  have monitoring events for inproc, so we just hope SETTLE_TIME suffices
-        msleep (SETTLE_TIME);
-    } else {
-        // Set up connect socket
-        connect_socket = test_context_socket (ZMQ_PUSH);
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (
-          connect_socket, ZMQ_SNDHWM, &send_hwm_, sizeof (send_hwm_)));
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (connect_socket, "inproc://a"));
-
-        // Set up bind socket
-        bind_socket = test_context_socket (ZMQ_PULL);
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (
-          bind_socket, ZMQ_RCVHWM, &recv_hwm_, sizeof (recv_hwm_)));
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (bind_socket, "inproc://a"));
-    }
-
-    // Send until we block
-    int send_count = 0;
-    while (send_count < MAX_SENDS
-           && zmq_send (connect_socket, NULL, 0, ZMQ_DONTWAIT) == 0)
-        ++send_count;
-
-    // Now receive all sent messages
-    int recv_count = 0;
-    while (zmq_recv (bind_socket, NULL, 0, ZMQ_DONTWAIT) == 0)
-        ++recv_count;
-
-    TEST_ASSERT_EQUAL_INT (send_count, recv_count);
-
-    // Now it should be possible to send one more.
-    send_string_expect_success (connect_socket, NULL, 0);
-
-    //  Consume the remaining message.
-    recv_string_expect_success (bind_socket, NULL, 0);
-
-    // Clean up
-    test_context_socket_close (connect_socket);
-    test_context_socket_close (bind_socket);
-
-    return send_count;
-}
-
-int test_inproc_bind_first (int send_hwm_, int recv_hwm_)
-{
-    return count_msg (send_hwm_, recv_hwm_, BIND_FIRST);
-}
-
-int test_inproc_connect_first (int send_hwm_, int recv_hwm_)
-{
-    return count_msg (send_hwm_, recv_hwm_, CONNECT_FIRST);
-}
-
-int test_inproc_connect_and_close_first (int send_hwm_, int recv_hwm_)
-{
-    // Set up connect socket
-    void *connect_socket = test_context_socket (ZMQ_PUSH);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (connect_socket, ZMQ_SNDHWM,
-                                               &send_hwm_, sizeof (send_hwm_)));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (connect_socket, "inproc://a"));
-
-    // Send until we block
-    int send_count = 0;
-    while (send_count < MAX_SENDS
-           && zmq_send (connect_socket, NULL, 0, ZMQ_DONTWAIT) == 0)
-        ++send_count;
-
-    // Close connect
-    test_context_socket_close (connect_socket);
-
-    // Set up bind socket
-    void *bind_socket = test_context_socket (ZMQ_PULL);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (bind_socket, ZMQ_RCVHWM, &recv_hwm_, sizeof (recv_hwm_)));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (bind_socket, "inproc://a"));
-
-    // Now receive all sent messages
-    int recv_count = 0;
-    while (zmq_recv (bind_socket, NULL, 0, ZMQ_DONTWAIT) == 0)
-        ++recv_count;
-
-    TEST_ASSERT_EQUAL_INT (send_count, recv_count);
-
-    // Clean up
-    test_context_socket_close (bind_socket);
-
-    return send_count;
-}
-
-int test_inproc_bind_and_close_first (int send_hwm_, int /* recv_hwm */)
-{
-    // Set up bind socket
-    void *bind_socket = test_context_socket (ZMQ_PUSH);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (bind_socket, ZMQ_SNDHWM, &send_hwm_, sizeof (send_hwm_)));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (bind_socket, "inproc://a"));
-
-    // Send until we block
-    int send_count = 0;
-    while (send_count < MAX_SENDS
-           && zmq_send (bind_socket, NULL, 0, ZMQ_DONTWAIT) == 0)
-        ++send_count;
-
-    // Close bind
-    test_context_socket_close (bind_socket);
-
-    /* TODO Can't currently do connect without then wiring up a bind as things hang, this needs top be fixed.
-    // Set up connect socket
-    void *connect_socket = test_context_socket (ZMQ_PULL);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (connect_socket, ZMQ_RCVHWM, &recv_hwm, sizeof (recv_hwm)));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (connect_socket, "inproc://a"));
-
-    // Now receive all sent messages
-    int recv_count = 0;
-    while (zmq_recv (connect_socket, NULL, 0, ZMQ_DONTWAIT) == 0)
-        ++recv_count;
-
-    TEST_ASSERT_EQUAL_INT(send_count, recv_count);
-    */
-
-    // Clean up
-    //test_context_socket_close (connect_socket);
-
-    return send_count;
-}
-
-void test_infinite_both_inproc_bind_first ()
-{
-    int count = test_inproc_bind_first (0, 0);
-    TEST_ASSERT_EQUAL_INT (MAX_SENDS, count);
-}
-
-void test_infinite_both_inproc_connect_first ()
-{
-    int count = test_inproc_connect_first (0, 0);
-    TEST_ASSERT_EQUAL_INT (MAX_SENDS, count);
-}
-
-void test_infinite_receive_inproc_bind_first ()
-{
-    int count = test_inproc_bind_first (1, 0);
-    TEST_ASSERT_EQUAL_INT (MAX_SENDS, count);
-}
-
-void test_infinite_receive_inproc_connect_first ()
-{
-    int count = test_inproc_connect_first (1, 0);
-    TEST_ASSERT_EQUAL_INT (MAX_SENDS, count);
-}
-
-void test_infinite_send_inproc_bind_first ()
-{
-    int count = test_inproc_bind_first (0, 1);
-    TEST_ASSERT_EQUAL_INT (MAX_SENDS, count);
-}
-
-void test_infinite_send_inproc_connect_first ()
-{
-    int count = test_inproc_connect_first (0, 1);
-    TEST_ASSERT_EQUAL_INT (MAX_SENDS, count);
-}
-
-void test_finite_both_bind_first ()
-{
-    // Send and recv buffers hwm 1, so total that can be queued is 2
-    int count = test_inproc_bind_first (1, 1);
-    TEST_ASSERT_EQUAL_INT (2, count);
-}
-void test_finite_both_connect_first ()
-{
-    // Send and recv buffers hwm 1, so total that can be queued is 2
-    int count = test_inproc_connect_first (1, 1);
-    TEST_ASSERT_EQUAL_INT (2, count);
-}
-
-void test_infinite_recv_connect_and_close_first ()
-{
-    // Send hwm of 1, send before bind so total that can be queued is 1
-    int count = test_inproc_connect_and_close_first (1, 0);
-    TEST_ASSERT_EQUAL_INT (1, count);
-}
-
-void test_infinite_recv_bind_and_close_first ()
-{
-    // Send hwm of 1, send from bind side before connect so total that can be queued should be 1,
-    // however currently all messages get thrown away before the connect.  BUG?
-    /*int count = */ test_inproc_bind_and_close_first (1, 0);
-    // TEST_ASSERT_EQUAL_INT (1, count);
-}
-
-int main (void)
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_defaults);
-
-    RUN_TEST (test_infinite_both_inproc_bind_first);
-    RUN_TEST (test_infinite_both_inproc_connect_first);
-
-    RUN_TEST (test_infinite_receive_inproc_bind_first);
-    RUN_TEST (test_infinite_receive_inproc_connect_first);
-
-    RUN_TEST (test_infinite_send_inproc_bind_first);
-    RUN_TEST (test_infinite_send_inproc_connect_first);
-
-    RUN_TEST (test_finite_both_bind_first);
-    RUN_TEST (test_finite_both_connect_first);
-
-    RUN_TEST (test_infinite_recv_connect_and_close_first);
-    RUN_TEST (test_infinite_recv_bind_and_close_first);
-
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_hwm_pubsub.cpp b/libs/libzmq/tests/test_hwm_pubsub.cpp
deleted file mode 100644
index b85e6dc..0000000
--- a/libs/libzmq/tests/test_hwm_pubsub.cpp
+++ /dev/null
@@ -1,304 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-#include <string.h>
-
-// NOTE: on OSX the endpoint returned by ZMQ_LAST_ENDPOINT may be quite long,
-//       ensure we have extra space for that:
-#define SOCKET_STRING_LEN (MAX_SOCKET_STRING * 4)
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-int test_defaults (int send_hwm_, int msg_cnt_, const char *endpoint_)
-{
-    char pub_endpoint[SOCKET_STRING_LEN];
-
-    // Set up and bind XPUB socket
-    void *pub_socket = test_context_socket (ZMQ_XPUB);
-    test_bind (pub_socket, endpoint_, pub_endpoint, sizeof pub_endpoint);
-
-    // Set up and connect SUB socket
-    void *sub_socket = test_context_socket (ZMQ_SUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sub_socket, pub_endpoint));
-
-    //set a hwm on publisher
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (pub_socket, ZMQ_SNDHWM, &send_hwm_, sizeof (send_hwm_)));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sub_socket, ZMQ_SUBSCRIBE, 0, 0));
-
-    // Wait before starting TX operations till 1 subscriber has subscribed
-    // (in this test there's 1 subscriber only)
-    const char subscription_to_all_topics[] = {1, 0};
-    recv_string_expect_success (pub_socket, subscription_to_all_topics, 0);
-
-    // Send until we reach "mute" state
-    int send_count = 0;
-    while (send_count < msg_cnt_
-           && zmq_send (pub_socket, "test message", 13, ZMQ_DONTWAIT) == 13)
-        ++send_count;
-
-    TEST_ASSERT_EQUAL_INT (send_hwm_, send_count);
-    msleep (SETTLE_TIME);
-
-    // Now receive all sent messages
-    int recv_count = 0;
-    char dummybuff[64];
-    while (13 == zmq_recv (sub_socket, &dummybuff, 64, ZMQ_DONTWAIT)) {
-        ++recv_count;
-    }
-
-    TEST_ASSERT_EQUAL_INT (send_hwm_, recv_count);
-
-    // Clean up
-    test_context_socket_close (sub_socket);
-    test_context_socket_close (pub_socket);
-
-    return recv_count;
-}
-
-int receive (void *socket_, int *is_termination_)
-{
-    int recv_count = 0;
-    *is_termination_ = 0;
-
-    // Now receive all sent messages
-    char buffer[255];
-    int len;
-    while ((len = zmq_recv (socket_, buffer, sizeof (buffer), 0)) >= 0) {
-        ++recv_count;
-
-        if (len == 3 && strncmp (buffer, "end", len) == 0) {
-            *is_termination_ = 1;
-            return recv_count;
-        }
-    }
-
-    return recv_count;
-}
-
-int test_blocking (int send_hwm_, int msg_cnt_, const char *endpoint_)
-{
-    char pub_endpoint[SOCKET_STRING_LEN];
-
-    // Set up bind socket
-    void *pub_socket = test_context_socket (ZMQ_XPUB);
-    test_bind (pub_socket, endpoint_, pub_endpoint, sizeof pub_endpoint);
-
-    // Set up connect socket
-    void *sub_socket = test_context_socket (ZMQ_SUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sub_socket, pub_endpoint));
-
-    //set a hwm on publisher
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (pub_socket, ZMQ_SNDHWM, &send_hwm_, sizeof (send_hwm_)));
-    int wait = 1;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (pub_socket, ZMQ_XPUB_NODROP, &wait, sizeof (wait)));
-    int timeout_ms = 10;
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (
-      sub_socket, ZMQ_RCVTIMEO, &timeout_ms, sizeof (timeout_ms)));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sub_socket, ZMQ_SUBSCRIBE, 0, 0));
-
-    // Wait before starting TX operations till 1 subscriber has subscribed
-    // (in this test there's 1 subscriber only)
-    const uint8_t subscription_to_all_topics[] = {1};
-    recv_array_expect_success (pub_socket, subscription_to_all_topics, 0);
-
-    // Send until we block
-    int send_count = 0;
-    int recv_count = 0;
-    int blocked_count = 0;
-    int is_termination = 0;
-    while (send_count < msg_cnt_) {
-        const int rc = zmq_send (pub_socket, NULL, 0, ZMQ_DONTWAIT);
-        if (rc == 0) {
-            ++send_count;
-        } else if (-1 == rc) {
-            // if the PUB socket blocks due to HWM, errno should be EAGAIN:
-            blocked_count++;
-            TEST_ASSERT_FAILURE_ERRNO (EAGAIN, -1);
-            recv_count += receive (sub_socket, &is_termination);
-        }
-    }
-
-    // if send_hwm_ < msg_cnt_, we should block at least once:
-    char counts_string[128];
-    snprintf (counts_string, sizeof counts_string - 1,
-              "sent = %i, received = %i", send_count, recv_count);
-    TEST_ASSERT_GREATER_THAN_INT_MESSAGE (0, blocked_count, counts_string);
-
-    // dequeue SUB socket again, to make sure XPUB has space to send the termination message
-    recv_count += receive (sub_socket, &is_termination);
-
-    // send termination message
-    send_string_expect_success (pub_socket, "end", 0);
-
-    // now block on the SUB side till we get the termination message
-    while (is_termination == 0)
-        recv_count += receive (sub_socket, &is_termination);
-
-    // remove termination message from the count:
-    recv_count--;
-
-    TEST_ASSERT_EQUAL_INT (send_count, recv_count);
-
-    // Clean up
-    test_context_socket_close (sub_socket);
-    test_context_socket_close (pub_socket);
-
-    return recv_count;
-}
-
-// hwm should apply to the messages that have already been received
-// with hwm 11024: send 9999 msg, receive 9999, send 1100, receive 1100
-void test_reset_hwm ()
-{
-    const int first_count = 9999;
-    const int second_count = 1100;
-    int hwm = 11024;
-    char my_endpoint[SOCKET_STRING_LEN];
-
-    // Set up bind socket
-    void *pub_socket = test_context_socket (ZMQ_PUB);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (pub_socket, ZMQ_SNDHWM, &hwm, sizeof (hwm)));
-    bind_loopback_ipv4 (pub_socket, my_endpoint, MAX_SOCKET_STRING);
-
-    // Set up connect socket
-    void *sub_socket = test_context_socket (ZMQ_SUB);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sub_socket, ZMQ_RCVHWM, &hwm, sizeof (hwm)));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sub_socket, my_endpoint));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sub_socket, ZMQ_SUBSCRIBE, 0, 0));
-
-    msleep (SETTLE_TIME);
-
-    // Send messages
-    int send_count = 0;
-    while (send_count < first_count
-           && zmq_send (pub_socket, NULL, 0, ZMQ_DONTWAIT) == 0)
-        ++send_count;
-    TEST_ASSERT_EQUAL_INT (first_count, send_count);
-
-    msleep (SETTLE_TIME);
-
-    // Now receive all sent messages
-    int recv_count = 0;
-    while (0 == zmq_recv (sub_socket, NULL, 0, ZMQ_DONTWAIT)) {
-        ++recv_count;
-    }
-    TEST_ASSERT_EQUAL_INT (first_count, recv_count);
-
-    msleep (SETTLE_TIME);
-
-    // Send messages
-    send_count = 0;
-    while (send_count < second_count
-           && zmq_send (pub_socket, NULL, 0, ZMQ_DONTWAIT) == 0)
-        ++send_count;
-    TEST_ASSERT_EQUAL_INT (second_count, send_count);
-
-    msleep (SETTLE_TIME);
-
-    // Now receive all sent messages
-    recv_count = 0;
-    while (0 == zmq_recv (sub_socket, NULL, 0, ZMQ_DONTWAIT)) {
-        ++recv_count;
-    }
-    TEST_ASSERT_EQUAL_INT (second_count, recv_count);
-
-    // Clean up
-    test_context_socket_close (sub_socket);
-    test_context_socket_close (pub_socket);
-}
-
-void test_defaults_large (const char *bind_endpoint_)
-{
-    // send 1000 msg on hwm 1000, receive 1000
-    TEST_ASSERT_EQUAL_INT (1000, test_defaults (1000, 1000, bind_endpoint_));
-}
-
-void test_defaults_small (const char *bind_endpoint_)
-{
-    // send 1000 msg on hwm 100, receive 100
-    TEST_ASSERT_EQUAL_INT (100, test_defaults (100, 100, bind_endpoint_));
-}
-
-void test_blocking (const char *bind_endpoint_)
-{
-    // send 6000 msg on hwm 2000, drops above hwm, only receive hwm:
-    TEST_ASSERT_EQUAL_INT (6000, test_blocking (2000, 6000, bind_endpoint_));
-}
-
-#define DEFINE_REGULAR_TEST_CASES(name, bind_endpoint)                         \
-    void test_defaults_large_##name ()                                         \
-    {                                                                          \
-        test_defaults_large (bind_endpoint);                                   \
-    }                                                                          \
-                                                                               \
-    void test_defaults_small_##name ()                                         \
-    {                                                                          \
-        test_defaults_small (bind_endpoint);                                   \
-    }                                                                          \
-                                                                               \
-    void test_blocking_##name () { test_blocking (bind_endpoint); }
-
-#define RUN_REGULAR_TEST_CASES(name)                                           \
-    RUN_TEST (test_defaults_large_##name);                                     \
-    RUN_TEST (test_defaults_small_##name);                                     \
-    RUN_TEST (test_blocking_##name)
-
-DEFINE_REGULAR_TEST_CASES (tcp, "tcp://127.0.0.1:*")
-DEFINE_REGULAR_TEST_CASES (inproc, "inproc://a")
-
-#if !defined(ZMQ_HAVE_WINDOWS) && !defined(ZMQ_HAVE_GNU)
-DEFINE_REGULAR_TEST_CASES (ipc, "ipc://*")
-#endif
-
-int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-
-    RUN_REGULAR_TEST_CASES (tcp);
-    RUN_REGULAR_TEST_CASES (inproc);
-
-#if !defined(ZMQ_HAVE_WINDOWS) && !defined(ZMQ_HAVE_GNU)
-    RUN_REGULAR_TEST_CASES (ipc);
-#endif
-    RUN_TEST (test_reset_hwm);
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_immediate.cpp b/libs/libzmq/tests/test_immediate.cpp
deleted file mode 100644
index 08dc3b9..0000000
--- a/libs/libzmq/tests/test_immediate.cpp
+++ /dev/null
@@ -1,225 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-    
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void test_immediate_1 ()
-{
-    int val;
-    int rc;
-    char buffer[16];
-    size_t len = MAX_SOCKET_STRING;
-    char my_endpoint[MAX_SOCKET_STRING];
-    // TEST 1.
-    // First we're going to attempt to send messages to two
-    // pipes, one connected, the other not. We should see
-    // the PUSH load balancing to both pipes, and hence half
-    // of the messages getting queued, as connect() creates a
-    // pipe immediately.
-
-    void *to = test_context_socket (ZMQ_PULL);
-
-    // Bind the one valid receiver
-    val = 0;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (to, ZMQ_LINGER, &val, sizeof (val)));
-    bind_loopback_ipv4 (to, my_endpoint, len);
-
-    // Create a socket pushing to two endpoints - only 1 message should arrive.
-    void *from = test_context_socket (ZMQ_PUSH);
-
-    val = 0;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (from, ZMQ_LINGER, &val, sizeof (val)));
-    // This pipe will not connect (provided the ephemeral port is not 5556)
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (from, "tcp://localhost:5556"));
-    // This pipe will
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (from, my_endpoint));
-
-    msleep (SETTLE_TIME);
-
-    // We send 10 messages, 5 should just get stuck in the queue
-    // for the not-yet-connected pipe
-    for (int i = 0; i < 10; ++i) {
-        send_string_expect_success (from, "Hello", 0);
-    }
-
-    // We now consume from the connected pipe
-    // - we should see just 5
-    int timeout = 250;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (to, ZMQ_RCVTIMEO, &timeout, sizeof (int)));
-
-    int seen = 0;
-    while (true) {
-        rc = zmq_recv (to, &buffer, sizeof (buffer), 0);
-        if (rc == -1)
-            break; //  Break when we didn't get a message
-        seen++;
-    }
-    // TODO: this fails ~1% of the runs on OBS but it does not seem to be reproducible anywhere else
-    if (seen == 0)
-        TEST_IGNORE_MESSAGE (
-          "Unreliable test occasionally fails on slow CIs, ignoring");
-    TEST_ASSERT_EQUAL_INT (5, seen);
-
-    test_context_socket_close (from);
-    test_context_socket_close (to);
-}
-
-
-void test_immediate_2 ()
-{
-    // This time we will do the same thing, connect two pipes,
-    // one of which will succeed in connecting to a bound
-    // receiver, the other of which will fail. However, we will
-    // also set the delay attach on connect flag, which should
-    // cause the pipe attachment to be delayed until the connection
-    // succeeds.
-
-    // Bind the valid socket
-    void *to = test_context_socket (ZMQ_PULL);
-    size_t len = MAX_SOCKET_STRING;
-    char my_endpoint[MAX_SOCKET_STRING];
-    bind_loopback_ipv4 (to, my_endpoint, len);
-
-    int val = 0;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (to, ZMQ_LINGER, &val, sizeof (val)));
-
-    // Create a socket pushing to two endpoints - all messages should arrive.
-    void *from = test_context_socket (ZMQ_PUSH);
-
-    val = 0;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (from, ZMQ_LINGER, &val, sizeof (val)));
-
-    // Set the key flag
-    val = 1;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (from, ZMQ_IMMEDIATE, &val, sizeof (val)));
-
-    // Connect to the invalid socket
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (from, "tcp://localhost:5561"));
-    // Connect to the valid socket
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (from, my_endpoint));
-
-    // Send 10 messages, all should be routed to the connected pipe
-    for (int i = 0; i < 10; ++i) {
-        send_string_expect_success (from, "Hello", 0);
-    }
-    int timeout = 250;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (to, ZMQ_RCVTIMEO, &timeout, sizeof (int)));
-
-    int seen = 0;
-    while (true) {
-        char buffer[16];
-        int rc = zmq_recv (to, &buffer, sizeof (buffer), 0);
-        if (rc == -1)
-            break; //  Break when we didn't get a message
-        seen++;
-    }
-    TEST_ASSERT_EQUAL_INT (10, seen);
-
-    test_context_socket_close (from);
-    test_context_socket_close (to);
-}
-
-void test_immediate_3 ()
-{
-    // This time we want to validate that the same blocking behaviour
-    // occurs with an existing connection that is broken. We will send
-    // messages to a connected pipe, disconnect and verify the messages
-    // block. Then we reconnect and verify messages flow again.
-    void *backend = test_context_socket (ZMQ_DEALER);
-    void *frontend = test_context_socket (ZMQ_DEALER);
-
-    int zero = 0;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (backend, ZMQ_LINGER, &zero, sizeof (zero)));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (frontend, ZMQ_LINGER, &zero, sizeof (zero)));
-
-    //  Frontend connects to backend using IMMEDIATE
-    int on = 1;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (frontend, ZMQ_IMMEDIATE, &on, sizeof (on)));
-
-    size_t len = MAX_SOCKET_STRING;
-    char my_endpoint[MAX_SOCKET_STRING];
-    bind_loopback_ipv4 (backend, my_endpoint, len);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (frontend, my_endpoint));
-
-    //  Ping backend to frontend so we know when the connection is up
-    send_string_expect_success (backend, "Hello", 0);
-    recv_string_expect_success (frontend, "Hello", 0);
-
-    // Send message from frontend to backend
-    send_string_expect_success (frontend, "Hello", ZMQ_DONTWAIT);
-
-    test_context_socket_close (backend);
-
-    //  Give time to process disconnect
-    msleep (SETTLE_TIME * 10);
-
-    // Send a message, should fail
-    TEST_ASSERT_FAILURE_ERRNO (EAGAIN,
-                               zmq_send (frontend, "Hello", 5, ZMQ_DONTWAIT));
-
-    //  Recreate backend socket
-    backend = test_context_socket (ZMQ_DEALER);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (backend, ZMQ_LINGER, &zero, sizeof (zero)));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (backend, my_endpoint));
-
-    //  Ping backend to frontend so we know when the connection is up
-    send_string_expect_success (backend, "Hello", 0);
-    recv_string_expect_success (frontend, "Hello", 0);
-
-    // After the reconnect, should succeed
-    send_string_expect_success (frontend, "Hello", ZMQ_DONTWAIT);
-
-    test_context_socket_close (backend);
-    test_context_socket_close (frontend);
-}
-
-int main (void)
-{
-    setup_test_environment ();
-    UNITY_BEGIN ();
-    RUN_TEST (test_immediate_1);
-    RUN_TEST (test_immediate_2);
-    RUN_TEST (test_immediate_3);
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_inproc_connect.cpp b/libs/libzmq/tests/test_inproc_connect.cpp
deleted file mode 100644
index 7a3acbd..0000000
--- a/libs/libzmq/tests/test_inproc_connect.cpp
+++ /dev/null
@@ -1,355 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-static void pusher (void * /*unused*/)
-{
-    // Connect first
-    // do not use test_context_socket here, as it is not thread-safe
-    void *connect_socket = zmq_socket (get_test_context (), ZMQ_PAIR);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (connect_socket, "inproc://sink"));
-
-    // Queue up some data
-    send_string_expect_success (connect_socket, "foobar", 0);
-
-    // Cleanup
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_close (connect_socket));
-}
-
-static void simult_conn (void *endpt_)
-{
-    // Pull out arguments - endpoint string
-    const char *endpt = static_cast<const char *> (endpt_);
-
-    // Connect
-    // do not use test_context_socket here, as it is not thread-safe
-    void *connect_socket = zmq_socket (get_test_context (), ZMQ_PAIR);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (connect_socket, endpt));
-    recv_string_expect_success (connect_socket, "foobar", 0);
-
-    // Cleanup
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_close (connect_socket));
-}
-
-static void simult_bind (void *endpt_)
-{
-    // Pull out arguments - context followed by endpoint string
-    const char *endpt = static_cast<const char *> (endpt_);
-
-    // Bind
-    // do not use test_context_socket here, as it is not thread-safe
-    void *bind_socket = zmq_socket (get_test_context (), ZMQ_PAIR);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (bind_socket, endpt));
-    send_string_expect_success (bind_socket, "foobar", 0);
-
-    // Cleanup
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_close (bind_socket));
-}
-
-void test_bind_before_connect ()
-{
-    // Bind first
-    void *bind_socket = test_context_socket (ZMQ_PAIR);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (bind_socket, "inproc://bbc"));
-
-    // Now connect
-    void *connect_socket = test_context_socket (ZMQ_PAIR);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (connect_socket, "inproc://bbc"));
-
-    // Queue up some data
-    send_string_expect_success (connect_socket, "foobar", 0);
-
-    // Read pending message
-    recv_string_expect_success (bind_socket, "foobar", 0);
-
-    // Cleanup
-    test_context_socket_close (connect_socket);
-    test_context_socket_close (bind_socket);
-}
-
-void test_connect_before_bind ()
-{
-    // Connect first
-    void *connect_socket = test_context_socket (ZMQ_PAIR);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (connect_socket, "inproc://cbb"));
-
-    // Queue up some data
-    send_string_expect_success (connect_socket, "foobar", 0);
-
-    // Now bind
-    void *bind_socket = test_context_socket (ZMQ_PAIR);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (bind_socket, "inproc://cbb"));
-
-    // Read pending message
-    recv_string_expect_success (bind_socket, "foobar", 0);
-
-    // Cleanup
-    test_context_socket_close (connect_socket);
-    test_context_socket_close (bind_socket);
-}
-
-void test_connect_before_bind_pub_sub ()
-{
-    // Connect first
-    void *connect_socket = test_context_socket (ZMQ_PUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (connect_socket, "inproc://cbbps"));
-
-    // Queue up some data, this will be dropped
-    send_string_expect_success (connect_socket, "before", 0);
-
-    // Now bind
-    void *bind_socket = test_context_socket (ZMQ_SUB);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (bind_socket, ZMQ_SUBSCRIBE, "", 0));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (bind_socket, "inproc://cbbps"));
-
-    // Wait for pub-sub connection to happen
-    msleep (SETTLE_TIME);
-
-    // Queue up some data, this not will be dropped
-    send_string_expect_success (connect_socket, "after", 0);
-
-    // Read pending message
-    recv_string_expect_success (bind_socket, "after", 0);
-
-    // Cleanup
-    test_context_socket_close (connect_socket);
-    test_context_socket_close (bind_socket);
-}
-
-void test_connect_before_bind_ctx_term ()
-{
-    for (int i = 0; i < 20; ++i) {
-        // Connect first
-        void *connect_socket = test_context_socket (ZMQ_ROUTER);
-
-        char ep[32];
-        sprintf (ep, "inproc://cbbrr%d", i);
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (connect_socket, ep));
-
-        // Cleanup
-        test_context_socket_close (connect_socket);
-    }
-}
-
-void test_multiple_connects ()
-{
-    const unsigned int no_of_connects = 10;
-
-    void *connect_socket[no_of_connects];
-
-    // Connect first
-    for (unsigned int i = 0; i < no_of_connects; ++i) {
-        connect_socket[i] = test_context_socket (ZMQ_PUSH);
-        TEST_ASSERT_SUCCESS_ERRNO (
-          zmq_connect (connect_socket[i], "inproc://multiple"));
-
-        // Queue up some data
-        send_string_expect_success (connect_socket[i], "foobar", 0);
-    }
-
-    // Now bind
-    void *bind_socket = test_context_socket (ZMQ_PULL);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (bind_socket, "inproc://multiple"));
-
-    for (unsigned int i = 0; i < no_of_connects; ++i) {
-        recv_string_expect_success (bind_socket, "foobar", 0);
-    }
-
-    // Cleanup
-    for (unsigned int i = 0; i < no_of_connects; ++i) {
-        test_context_socket_close (connect_socket[i]);
-    }
-
-    test_context_socket_close (bind_socket);
-}
-
-void test_multiple_threads ()
-{
-    const unsigned int no_of_threads = 30;
-
-    void *threads[no_of_threads];
-
-    // Connect first
-    for (unsigned int i = 0; i < no_of_threads; ++i) {
-        threads[i] = zmq_threadstart (&pusher, NULL);
-    }
-
-    // Now bind
-    void *bind_socket = test_context_socket (ZMQ_PULL);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (bind_socket, "inproc://sink"));
-
-    for (unsigned int i = 0; i < no_of_threads; ++i) {
-        // Read pending message
-        recv_string_expect_success (bind_socket, "foobar", 0);
-    }
-
-    // Cleanup
-    for (unsigned int i = 0; i < no_of_threads; ++i) {
-        zmq_threadclose (threads[i]);
-    }
-
-    test_context_socket_close (bind_socket);
-}
-
-void test_simultaneous_connect_bind_threads ()
-{
-    const unsigned int no_of_times = 50;
-    void *threads[no_of_times * 2];
-    void *thr_args[no_of_times];
-    char endpts[no_of_times][20];
-
-    // Set up thread arguments: context followed by endpoint string
-    for (unsigned int i = 0; i < no_of_times; ++i) {
-        thr_args[i] = (void *) endpts[i];
-        sprintf (endpts[i], "inproc://foo_%d", i);
-    }
-
-    // Spawn all threads as simultaneously as possible
-    for (unsigned int i = 0; i < no_of_times; ++i) {
-        threads[i * 2 + 0] = zmq_threadstart (&simult_conn, thr_args[i]);
-        threads[i * 2 + 1] = zmq_threadstart (&simult_bind, thr_args[i]);
-    }
-
-    // Close all threads
-    for (unsigned int i = 0; i < no_of_times; ++i) {
-        zmq_threadclose (threads[i * 2 + 0]);
-        zmq_threadclose (threads[i * 2 + 1]);
-    }
-}
-
-void test_routing_id ()
-{
-    //  Create the infrastructure
-    void *sc = test_context_socket (ZMQ_DEALER);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sc, "inproc://routing_id"));
-
-    void *sb = test_context_socket (ZMQ_ROUTER);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (sb, "inproc://routing_id"));
-
-    //  Send 2-part message.
-    TEST_ASSERT_EQUAL_INT (
-      1, TEST_ASSERT_SUCCESS_ERRNO (zmq_send (sc, "A", 1, ZMQ_SNDMORE)));
-    TEST_ASSERT_EQUAL_INT (
-      1, TEST_ASSERT_SUCCESS_ERRNO (zmq_send (sc, "B", 1, 0)));
-
-    //  Routing id comes first.
-    zmq_msg_t msg;
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init (&msg));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_recv (&msg, sb, 0));
-    TEST_ASSERT_EQUAL_INT (1, zmq_msg_more (&msg));
-
-    //  Then the first part of the message body.
-    TEST_ASSERT_EQUAL_INT (
-      1, TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_recv (&msg, sb, 0)));
-    TEST_ASSERT_EQUAL_INT (1, zmq_msg_more (&msg));
-
-    //  And finally, the second part of the message body.
-    TEST_ASSERT_EQUAL_INT (
-      1, TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_recv (&msg, sb, 0)));
-    TEST_ASSERT_EQUAL_INT (0, zmq_msg_more (&msg));
-
-    //  Deallocate the infrastructure.
-    test_context_socket_close (sc);
-    test_context_socket_close (sb);
-}
-
-void test_connect_only ()
-{
-    void *connect_socket = test_context_socket (ZMQ_PUSH);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (connect_socket, "inproc://a"));
-
-    test_context_socket_close (connect_socket);
-}
-
-
-void test_unbind ()
-{
-    // Bind and unbind socket 1
-    void *bind_socket1 = test_context_socket (ZMQ_PAIR);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (bind_socket1, "inproc://unbind"));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_unbind (bind_socket1, "inproc://unbind"));
-
-    // Bind socket 2
-    void *bind_socket2 = test_context_socket (ZMQ_PAIR);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (bind_socket2, "inproc://unbind"));
-
-    // Now connect
-    void *connect_socket = test_context_socket (ZMQ_PAIR);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (connect_socket, "inproc://unbind"));
-
-    // Queue up some data
-    send_string_expect_success (connect_socket, "foobar", 0);
-
-    // Read pending message
-    recv_string_expect_success (bind_socket2, "foobar", 0);
-
-    // Cleanup
-    test_context_socket_close (connect_socket);
-    test_context_socket_close (bind_socket1);
-    test_context_socket_close (bind_socket2);
-}
-
-void test_shutdown_during_pend ()
-{
-    // Connect first
-    void *connect_socket = test_context_socket (ZMQ_PAIR);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (connect_socket, "inproc://cbb"));
-
-    zmq_ctx_shutdown (get_test_context ());
-
-    // Cleanup
-    test_context_socket_close (connect_socket);
-}
-
-int main (void)
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_bind_before_connect);
-    RUN_TEST (test_connect_before_bind);
-    RUN_TEST (test_connect_before_bind_pub_sub);
-    RUN_TEST (test_connect_before_bind_ctx_term);
-    RUN_TEST (test_multiple_connects);
-    RUN_TEST (test_multiple_threads);
-    RUN_TEST (test_simultaneous_connect_bind_threads);
-    RUN_TEST (test_routing_id);
-    RUN_TEST (test_connect_only);
-    RUN_TEST (test_unbind);
-    RUN_TEST (test_shutdown_during_pend);
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_invalid_rep.cpp b/libs/libzmq/tests/test_invalid_rep.cpp
deleted file mode 100644
index ae9fb18..0000000
--- a/libs/libzmq/tests/test_invalid_rep.cpp
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void test_invalid_rep ()
-{
-    //  Create REQ/ROUTER wiring.
-    void *router_socket = test_context_socket (ZMQ_ROUTER);
-    void *req_socket = test_context_socket (ZMQ_REQ);
-
-    int linger = 0;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (router_socket, ZMQ_LINGER, &linger, sizeof (int)));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (req_socket, ZMQ_LINGER, &linger, sizeof (int)));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (router_socket, "inproc://hi"));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (req_socket, "inproc://hi"));
-
-    //  Initial request.
-    send_string_expect_success (req_socket, "r", 0);
-
-    //  Receive the request.
-    char addr[32];
-    int addr_size;
-    char bottom[1];
-    char body[1];
-    TEST_ASSERT_SUCCESS_ERRNO (
-      addr_size = zmq_recv (router_socket, addr, sizeof (addr), 0));
-    TEST_ASSERT_EQUAL_INT (0, TEST_ASSERT_SUCCESS_ERRNO (zmq_recv (
-                                router_socket, bottom, sizeof (bottom), 0)));
-    TEST_ASSERT_EQUAL_INT (1, TEST_ASSERT_SUCCESS_ERRNO (zmq_recv (
-                                router_socket, body, sizeof (body), 0)));
-
-    //  Send invalid reply.
-    TEST_ASSERT_EQUAL_INT (addr_size, TEST_ASSERT_SUCCESS_ERRNO (zmq_send (
-                                        router_socket, addr, addr_size, 0)));
-
-    //  Send valid reply.
-    TEST_ASSERT_EQUAL_INT (
-      addr_size, TEST_ASSERT_SUCCESS_ERRNO (
-                   zmq_send (router_socket, addr, addr_size, ZMQ_SNDMORE)));
-    TEST_ASSERT_EQUAL_INT (0, TEST_ASSERT_SUCCESS_ERRNO (zmq_send (
-                                router_socket, bottom, 0, ZMQ_SNDMORE)));
-    send_string_expect_success (router_socket, "b", 0);
-
-    //  Check whether we've got the valid reply.
-    recv_string_expect_success (req_socket, "b", 0);
-
-    //  Tear down the wiring.
-    test_context_socket_close (router_socket);
-    test_context_socket_close (req_socket);
-}
-
-int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_invalid_rep);
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_iov.cpp b/libs/libzmq/tests/test_iov.cpp
deleted file mode 100644
index f9ccbaf..0000000
--- a/libs/libzmq/tests/test_iov.cpp
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-#include <stdlib.h>
-#include <string.h>
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-// XSI vector I/O
-#if defined ZMQ_HAVE_UIO
-#include <sys/uio.h>
-#else
-struct iovec
-{
-    void *iov_base;
-    size_t iov_len;
-};
-#endif
-
-static void do_check (void *sb_, void *sc_, size_t msg_size_)
-{
-    TEST_ASSERT_NOT_NULL (sb_);
-    TEST_ASSERT_NOT_NULL (sc_);
-    TEST_ASSERT_GREATER_THAN (0, msg_size_);
-
-    const char msg_val = '1';
-    const int num_messages = 10;
-    size_t send_count, recv_count;
-
-    send_count = recv_count = num_messages;
-
-    char *ref_msg = static_cast<char *> (malloc (msg_size_));
-    TEST_ASSERT_NOT_NULL (ref_msg);
-    memset (ref_msg, msg_val, msg_size_);
-
-    // zmq_sendiov(3) as a single multi-part send
-    struct iovec send_iov[num_messages];
-    char *buf = static_cast<char *> (malloc (msg_size_ * num_messages));
-
-    for (int i = 0; i < num_messages; i++) {
-        send_iov[i].iov_base = &buf[i * msg_size_];
-        send_iov[i].iov_len = msg_size_;
-        memcpy (send_iov[i].iov_base, ref_msg, msg_size_);
-
-        // TODO: this assertion only checks if memcpy behaves as expected... remove this or assert something else?
-        TEST_ASSERT_EQUAL_HEX8_ARRAY (ref_msg, send_iov[i].iov_base, msg_size_);
-    }
-
-    // Test errors - zmq_recviov - null socket
-    TEST_ASSERT_FAILURE_ERRNO (
-      ENOTSOCK, zmq_sendiov (NULL, send_iov, send_count, ZMQ_SNDMORE));
-    // Test errors - zmq_recviov - invalid send count
-    TEST_ASSERT_FAILURE_ERRNO (EINVAL, zmq_sendiov (sc_, send_iov, 0, 0));
-    // Test errors - zmq_recviov - null iovec
-    TEST_ASSERT_FAILURE_ERRNO (EINVAL, zmq_sendiov (sc_, NULL, send_count, 0));
-
-    // Test success
-
-    // The zmq_sendiov(3) API method does not follow the same semantics as
-    // zmq_recviov(3); the latter returns the count of messages sent, rightly
-    // so, whilst the former sends the number of bytes successfully sent from
-    // the last message, which does not hold much sense from a batch send
-    // perspective; hence the assert checks if the result is same as msg_size.
-    TEST_ASSERT_EQUAL_INT (
-      (int) msg_size_, TEST_ASSERT_SUCCESS_ERRNO (
-                         zmq_sendiov (sc_, send_iov, send_count, ZMQ_SNDMORE)));
-
-    // zmq_recviov(3) single-shot
-    struct iovec recv_iov[num_messages];
-
-    // Test errors - zmq_recviov - null socket
-    TEST_ASSERT_FAILURE_ERRNO (ENOTSOCK,
-                               zmq_recviov (NULL, recv_iov, &recv_count, 0));
-    // Test error - zmq_recviov - invalid receive count
-    TEST_ASSERT_FAILURE_ERRNO (EINVAL, zmq_recviov (sb_, recv_iov, NULL, 0));
-    size_t invalid_recv_count = 0;
-    TEST_ASSERT_FAILURE_ERRNO (
-      EINVAL, zmq_recviov (sb_, recv_iov, &invalid_recv_count, 0));
-    // Test error - zmq_recviov - null iovec
-    TEST_ASSERT_FAILURE_ERRNO (EINVAL, zmq_recviov (sb_, NULL, &recv_count, 0));
-
-    // Test success
-    TEST_ASSERT_EQUAL_INT (
-      num_messages,
-      TEST_ASSERT_SUCCESS_ERRNO (zmq_recviov (sb_, recv_iov, &recv_count, 0)));
-
-    for (int i = 0; i < num_messages; i++) {
-        TEST_ASSERT_NOT_NULL (recv_iov[i].iov_base);
-        TEST_ASSERT_EQUAL_STRING_LEN (ref_msg, recv_iov[i].iov_base, msg_size_);
-        free (recv_iov[i].iov_base);
-    }
-
-    TEST_ASSERT_EQUAL_INT (send_count, recv_count);
-    free (ref_msg);
-    free (buf);
-}
-
-void test_iov ()
-{
-    void *sb = test_context_socket (ZMQ_PULL);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (sb, "inproc://a"));
-
-    msleep (SETTLE_TIME);
-
-    void *sc = test_context_socket (ZMQ_PUSH);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sc, "inproc://a"));
-
-    // message bigger than VSM max
-    do_check (sb, sc, 100);
-
-    // message smaller than VSM max
-    do_check (sb, sc, 10);
-
-    test_context_socket_close (sc);
-    test_context_socket_close (sb);
-}
-
-int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_iov);
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_ipc_wildcard.cpp b/libs/libzmq/tests/test_ipc_wildcard.cpp
deleted file mode 100644
index 2f0ae17..0000000
--- a/libs/libzmq/tests/test_ipc_wildcard.cpp
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void test_ipc_wildcard ()
-{
-    void *sb = test_context_socket (ZMQ_PAIR);
-    char endpoint[200];
-    bind_loopback_ipc (sb, endpoint, sizeof endpoint);
-
-    void *sc = test_context_socket (ZMQ_PAIR);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sc, endpoint));
-
-    bounce (sb, sc);
-
-    test_context_socket_close (sc);
-    test_context_socket_close (sb);
-}
-
-int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_ipc_wildcard);
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_issue_566.cpp b/libs/libzmq/tests/test_issue_566.cpp
deleted file mode 100644
index 7a8859f..0000000
--- a/libs/libzmq/tests/test_issue_566.cpp
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-//  Issue 566 describes a problem in libzmq v4.0.0 where a dealer to router
-//  connection would fail randomly. The test works when the two sockets are
-//  on the same context, and failed when they were on separate contexts.
-//  Fixed by https://github.com/zeromq/libzmq/commit/be25cf.
-void test_issue_566 ()
-{
-    char my_endpoint[MAX_SOCKET_STRING];
-    void *ctx1 = zmq_ctx_new ();
-    TEST_ASSERT_NOT_NULL (ctx1);
-
-    void *ctx2 = zmq_ctx_new ();
-    TEST_ASSERT_NOT_NULL (ctx2);
-
-    void *router = zmq_socket (ctx1, ZMQ_ROUTER);
-    int on = 1;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (router, ZMQ_ROUTER_MANDATORY, &on, sizeof (on)));
-    bind_loopback_ipv4 (router, my_endpoint, sizeof (my_endpoint));
-
-    //  Repeat often enough to be sure this works as it should
-    for (int cycle = 0; cycle < 100; cycle++) {
-        //  Create dealer with unique explicit routing id
-        //  We assume the router learns this out-of-band
-        void *dealer = zmq_socket (ctx2, ZMQ_DEALER);
-        //  Leave space for NULL char from sprintf, gcc warning
-        char routing_id[11];
-        sprintf (routing_id, "%09d", cycle);
-        TEST_ASSERT_SUCCESS_ERRNO (
-          zmq_setsockopt (dealer, ZMQ_ROUTING_ID, routing_id, 10));
-        int rcvtimeo = 1000;
-        TEST_ASSERT_SUCCESS_ERRNO (
-          zmq_setsockopt (dealer, ZMQ_RCVTIMEO, &rcvtimeo, sizeof (int)));
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (dealer, my_endpoint));
-
-        //  Router will try to send to dealer, at short intervals.
-        //  It typically takes 2-5 msec for the connection to establish
-        //  on a loopback interface, but we'll allow up to one second
-        //  before failing the test (e.g. for running on a debugger or
-        //  a very slow system).
-        for (int attempt = 0; attempt < 500; attempt++) {
-            zmq_poll (NULL, 0, 2);
-            int rc = zmq_send (router, routing_id, 10, ZMQ_SNDMORE);
-            if (rc == -1 && errno == EHOSTUNREACH)
-                continue;
-            TEST_ASSERT_EQUAL (10, rc);
-            send_string_expect_success (router, "HELLO", 0);
-            break;
-        }
-        recv_string_expect_success (dealer, "HELLO", 0);
-        close_zero_linger (dealer);
-    }
-    zmq_close (router);
-    zmq_ctx_destroy (ctx1);
-    zmq_ctx_destroy (ctx2);
-}
-
-int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_issue_566);
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_last_endpoint.cpp b/libs/libzmq/tests/test_last_endpoint.cpp
deleted file mode 100644
index 663b8d7..0000000
--- a/libs/libzmq/tests/test_last_endpoint.cpp
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-static void do_bind_and_verify (void *s_, const char *endpoint_)
-{
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (s_, endpoint_));
-    char reported[255];
-    size_t size = 255;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (s_, ZMQ_LAST_ENDPOINT, reported, &size));
-    TEST_ASSERT_EQUAL_STRING (endpoint_, reported);
-}
-
-void test_last_endpoint ()
-{
-    void *sb = test_context_socket (ZMQ_ROUTER);
-    int val = 0;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sb, ZMQ_LINGER, &val, sizeof (val)));
-
-    do_bind_and_verify (sb, ENDPOINT_1);
-    do_bind_and_verify (sb, ENDPOINT_2);
-
-    test_context_socket_close (sb);
-}
-
-int main (void)
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_last_endpoint);
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_many_sockets.cpp b/libs/libzmq/tests/test_many_sockets.cpp
deleted file mode 100644
index 9444a38..0000000
--- a/libs/libzmq/tests/test_many_sockets.cpp
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <vector>
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void test_system_max ()
-{
-    // Keep allocating sockets until we run out of system resources
-    const int no_of_sockets = 2 * 65536;
-    zmq_ctx_set (get_test_context (), ZMQ_MAX_SOCKETS, no_of_sockets);
-    std::vector<void *> sockets;
-
-    while (true) {
-        void *socket = zmq_socket (get_test_context (), ZMQ_PAIR);
-        if (!socket)
-            break;
-        sockets.push_back (socket);
-    }
-    TEST_ASSERT_LESS_OR_EQUAL (no_of_sockets,
-                               static_cast<int> (sockets.size ()));
-    printf ("Socket creation failed after %i sockets\n",
-            static_cast<int> (sockets.size ()));
-
-    //  System is out of resources, further calls to zmq_socket should return NULL
-    for (unsigned int i = 0; i < 10; ++i) {
-        TEST_ASSERT_NULL (zmq_socket (get_test_context (), ZMQ_PAIR));
-    }
-    // Clean up.
-    for (unsigned int i = 0; i < sockets.size (); ++i)
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_close (sockets[i]));
-}
-
-void test_zmq_default_max ()
-{
-    //  Keep allocating sockets until we hit the default limit
-    std::vector<void *> sockets;
-
-    while (true) {
-        void *socket = zmq_socket (get_test_context (), ZMQ_PAIR);
-        if (!socket)
-            break;
-        sockets.push_back (socket);
-    }
-    //  We may stop sooner if system has fewer available sockets
-    TEST_ASSERT_LESS_OR_EQUAL (ZMQ_MAX_SOCKETS_DFLT, sockets.size ());
-
-    //  Further calls to zmq_socket should return NULL
-    for (unsigned int i = 0; i < 10; ++i) {
-        TEST_ASSERT_NULL (zmq_socket (get_test_context (), ZMQ_PAIR));
-    }
-
-    //  Clean up
-    for (unsigned int i = 0; i < sockets.size (); ++i)
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_close (sockets[i]));
-}
-
-int main (void)
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_system_max);
-    RUN_TEST (test_zmq_default_max);
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_metadata.cpp b/libs/libzmq/tests/test_metadata.cpp
deleted file mode 100644
index 642e8d6..0000000
--- a/libs/libzmq/tests/test_metadata.cpp
+++ /dev/null
@@ -1,187 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-#include <stdlib.h>
-#include <unity.h>
-
-void setUp ()
-{
-}
-
-void tearDown ()
-{
-}
-
-static void zap_handler (void *handler_)
-{
-    uint8_t metadata[] = {5, 'H', 'e', 'l', 'l', 'o', 0,  0,
-                          0, 5,   'W', 'o', 'r', 'l', 'd'};
-
-    //  Process ZAP requests forever
-    while (true) {
-        char *version = s_recv (handler_);
-        if (!version)
-            break; //  Terminating
-
-        char *sequence = s_recv (handler_);
-        char *domain = s_recv (handler_);
-        char *address = s_recv (handler_);
-        char *routing_id = s_recv (handler_);
-        char *mechanism = s_recv (handler_);
-
-        TEST_ASSERT_EQUAL_STRING ("1.0", version);
-        TEST_ASSERT_EQUAL_STRING ("NULL", mechanism);
-
-        send_string_expect_success (handler_, version, ZMQ_SNDMORE);
-        send_string_expect_success (handler_, sequence, ZMQ_SNDMORE);
-        if (streq (domain, "DOMAIN")) {
-            send_string_expect_success (handler_, "200", ZMQ_SNDMORE);
-            send_string_expect_success (handler_, "OK", ZMQ_SNDMORE);
-            send_string_expect_success (handler_, "anonymous", ZMQ_SNDMORE);
-            zmq_send (handler_, metadata, sizeof (metadata), 0);
-        } else {
-            send_string_expect_success (handler_, "400", ZMQ_SNDMORE);
-            send_string_expect_success (handler_, "BAD DOMAIN", ZMQ_SNDMORE);
-            send_string_expect_success (handler_, "", ZMQ_SNDMORE);
-            send_string_expect_success (handler_, "", 0);
-        }
-        free (version);
-        free (sequence);
-        free (domain);
-        free (address);
-        free (routing_id);
-        free (mechanism);
-    }
-    close_zero_linger (handler_);
-}
-
-void test_metadata ()
-{
-    char my_endpoint[MAX_SOCKET_STRING];
-    setup_test_context ();
-
-    //  Spawn ZAP handler
-    //  We create and bind ZAP socket in main thread to avoid case
-    //  where child thread does not start up fast enough.
-    void *handler = zmq_socket (get_test_context (), ZMQ_REP);
-    TEST_ASSERT_NOT_NULL (handler);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (handler, "inproc://zeromq.zap.01"));
-    void *zap_thread = zmq_threadstart (&zap_handler, handler);
-
-    void *server = test_context_socket (ZMQ_DEALER);
-    void *client = test_context_socket (ZMQ_DEALER);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (server, ZMQ_ZAP_DOMAIN, "DOMAIN", 6));
-    bind_loopback_ipv4 (server, my_endpoint, sizeof (my_endpoint));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (client, my_endpoint));
-
-    send_string_expect_success (client, "This is a message", 0);
-    zmq_msg_t msg;
-    zmq_msg_init (&msg);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_recv (&msg, server, 0));
-    TEST_ASSERT_EQUAL_STRING ("World", zmq_msg_gets (&msg, "Hello"));
-    TEST_ASSERT_EQUAL_STRING ("DEALER", zmq_msg_gets (&msg, "Socket-Type"));
-    TEST_ASSERT_EQUAL_STRING ("anonymous", zmq_msg_gets (&msg, "User-Id"));
-    TEST_ASSERT_EQUAL_STRING ("127.0.0.1", zmq_msg_gets (&msg, "Peer-Address"));
-
-    TEST_ASSERT_NULL (zmq_msg_gets (&msg, "No Such"));
-    TEST_ASSERT_EQUAL_INT (EINVAL, zmq_errno ());
-    zmq_msg_close (&msg);
-
-    test_context_socket_close_zero_linger (client);
-    test_context_socket_close_zero_linger (server);
-
-    //  Shutdown
-    teardown_test_context ();
-
-    //  Wait until ZAP handler terminates
-    zmq_threadclose (zap_thread);
-}
-
-void test_router_prefetch_metadata ()
-{
-    char my_endpoint[MAX_SOCKET_STRING];
-    setup_test_context ();
-
-    //  Spawn ZAP handler
-    //  We create and bind ZAP socket in main thread to avoid case
-    //  where child thread does not start up fast enough.
-    void *handler = zmq_socket (get_test_context (), ZMQ_REP);
-    TEST_ASSERT_NOT_NULL (handler);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (handler, "inproc://zeromq.zap.01"));
-    void *zap_thread = zmq_threadstart (&zap_handler, handler);
-
-    void *server = test_context_socket (ZMQ_ROUTER);
-    void *client = test_context_socket (ZMQ_REQ);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (server, ZMQ_ZAP_DOMAIN, "DOMAIN", 6));
-    bind_loopback_ipv4 (server, my_endpoint, sizeof (my_endpoint));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (client, my_endpoint));
-
-    send_string_expect_success (client, "This is a message", 0);
-
-    msleep (SETTLE_TIME);
-
-    // Check for messages in the ROUTER socket which will trigger a prefetch
-    unsigned long int dummy;
-    size_t dummy_size = sizeof (dummy);
-    zmq_getsockopt (server, ZMQ_EVENTS, &dummy, &dummy_size);
-
-    zmq_msg_t msg;
-
-    // Ensure all frames in the message contain metadata
-    for (int i = 0; i < 3; i++) {
-        zmq_msg_init (&msg);
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_recv (&msg, server, 0));
-        TEST_ASSERT_EQUAL_STRING ("World", zmq_msg_gets (&msg, "Hello"));
-        zmq_msg_close (&msg);
-    }
-
-    test_context_socket_close_zero_linger (client);
-    test_context_socket_close_zero_linger (server);
-
-    //  Shutdown
-    teardown_test_context ();
-
-    //  Wait until ZAP handler terminates
-    zmq_threadclose (zap_thread);
-}
-
-
-int main ()
-{
-    setup_test_environment ();
-    UNITY_BEGIN ();
-    RUN_TEST (test_metadata);
-    RUN_TEST (test_router_prefetch_metadata);
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_mock_pub_sub.cpp b/libs/libzmq/tests/test_mock_pub_sub.cpp
deleted file mode 100644
index 757c1e1..0000000
--- a/libs/libzmq/tests/test_mock_pub_sub.cpp
+++ /dev/null
@@ -1,244 +0,0 @@
-/*
-    Copyright (c) 2018 Contributors as noted in the AUTHORS file
-
-    This file is part of 0MQ.
-
-    0MQ is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    0MQ is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-#include <stdlib.h>
-#include <string.h>
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-//  Read one event off the monitor socket; return value and address
-//  by reference, if not null, and event number by value. Returns -1
-//  in case of error.
-
-static int get_monitor_event (void *monitor_)
-{
-    for (int i = 0; i < 2; i++) {
-        //  First frame in message contains event number and value
-        zmq_msg_t msg;
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init (&msg));
-        if (zmq_msg_recv (&msg, monitor_, ZMQ_DONTWAIT) == -1) {
-            msleep (SETTLE_TIME);
-            continue; //  Interrupted, presumably
-        }
-        TEST_ASSERT_TRUE (zmq_msg_more (&msg));
-
-        uint8_t *data = static_cast<uint8_t *> (zmq_msg_data (&msg));
-        uint16_t event = *reinterpret_cast<uint16_t *> (data);
-
-        //  Second frame in message contains event address
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init (&msg));
-        if (zmq_msg_recv (&msg, monitor_, 0) == -1) {
-            return -1; //  Interrupted, presumably
-        }
-        TEST_ASSERT_FALSE (zmq_msg_more (&msg));
-
-        return event;
-    }
-    return -1;
-}
-
-static void recv_with_retry (fd_t fd_, char *buffer_, int bytes_)
-{
-    int received = 0;
-    while (true) {
-        int rc = TEST_ASSERT_SUCCESS_RAW_ERRNO (
-          recv (fd_, buffer_ + received, bytes_ - received, 0));
-        TEST_ASSERT_GREATER_THAN_INT (0, rc);
-        received += rc;
-        TEST_ASSERT_LESS_OR_EQUAL_INT (bytes_, received);
-        if (received == bytes_)
-            break;
-    }
-}
-
-static void mock_handshake (fd_t fd_, bool sub_command, bool mock_pub)
-{
-    char buffer[128];
-    memset (buffer, 0, sizeof (buffer));
-    memcpy (buffer, zmtp_greeting_null, sizeof (zmtp_greeting_null));
-
-    //  Mock ZMTP 3.1 which uses commands
-    if (sub_command) {
-        buffer[11] = 1;
-    }
-    int rc = TEST_ASSERT_SUCCESS_RAW_ERRNO (send (fd_, buffer, 64, 0));
-    TEST_ASSERT_EQUAL_INT (64, rc);
-
-    recv_with_retry (fd_, buffer, 64);
-
-    if (!mock_pub) {
-        rc = TEST_ASSERT_SUCCESS_RAW_ERRNO (send (
-          fd_, (const char *) zmtp_ready_sub, sizeof (zmtp_ready_sub), 0));
-        TEST_ASSERT_EQUAL_INT (sizeof (zmtp_ready_sub), rc);
-    } else {
-        rc = TEST_ASSERT_SUCCESS_RAW_ERRNO (send (
-          fd_, (const char *) zmtp_ready_xpub, sizeof (zmtp_ready_xpub), 0));
-        TEST_ASSERT_EQUAL_INT (sizeof (zmtp_ready_xpub), rc);
-    }
-
-    //  greeting - XPUB has one extra byte
-    memset (buffer, 0, sizeof (buffer));
-    recv_with_retry (fd_, buffer,
-                     mock_pub ? sizeof (zmtp_ready_sub)
-                              : sizeof (zmtp_ready_xpub));
-}
-
-static void prep_server_socket (void **server_out_,
-                                void **mon_out_,
-                                char *endpoint_,
-                                size_t ep_length_,
-                                int socket_type)
-{
-    //  We'll be using this socket in raw mode
-    void *server = test_context_socket (socket_type);
-
-    int value = 0;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (server, ZMQ_LINGER, &value, sizeof (value)));
-
-    bind_loopback_ipv4 (server, endpoint_, ep_length_);
-
-    //  Create and connect a socket for collecting monitor events on xpub
-    void *server_mon = test_context_socket (ZMQ_PAIR);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_socket_monitor (
-      server, "inproc://monitor-dealer",
-      ZMQ_EVENT_CONNECTED | ZMQ_EVENT_DISCONNECTED | ZMQ_EVENT_ACCEPTED));
-
-    //  Connect to the inproc endpoint so we'll get events
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_connect (server_mon, "inproc://monitor-dealer"));
-
-    *server_out_ = server;
-    *mon_out_ = server_mon;
-}
-
-static void test_mock_pub_sub (bool sub_command_, bool mock_pub_)
-{
-    int rc;
-    char my_endpoint[MAX_SOCKET_STRING];
-
-    void *server, *server_mon;
-    prep_server_socket (&server, &server_mon, my_endpoint, MAX_SOCKET_STRING,
-                        mock_pub_ ? ZMQ_SUB : ZMQ_XPUB);
-
-    fd_t s = connect_socket (my_endpoint);
-
-    // Mock a ZMTP 3 client so we can forcibly try sub commands
-    mock_handshake (s, sub_command_, mock_pub_);
-
-    // By now everything should report as connected
-    rc = get_monitor_event (server_mon);
-    TEST_ASSERT_EQUAL_INT (ZMQ_EVENT_ACCEPTED, rc);
-
-    char buffer[32];
-    memset (buffer, 0, sizeof (buffer));
-
-    if (mock_pub_) {
-        rc = zmq_setsockopt (server, ZMQ_SUBSCRIBE, "A", 1);
-        TEST_ASSERT_EQUAL_INT (0, rc);
-        //  SUB binds, let its state machine run
-        //  Because zeromq attach the pipe after the handshake, we need more time here before we can run the state-machine
-        msleep (1);
-        zmq_recv (server, buffer, 16, ZMQ_DONTWAIT);
-
-        if (sub_command_) {
-            recv_with_retry (s, buffer, 13);
-            TEST_ASSERT_EQUAL_INT (0,
-                                   memcmp (buffer, "\4\xb\x9SUBSCRIBEA", 13));
-        } else {
-            recv_with_retry (s, buffer, 4);
-            TEST_ASSERT_EQUAL_INT (0, memcmp (buffer, "\0\2\1A", 4));
-        }
-
-        memcpy (buffer, "\0\4ALOL", 6);
-        rc = TEST_ASSERT_SUCCESS_RAW_ERRNO (send (s, buffer, 6, 0));
-        TEST_ASSERT_EQUAL_INT (6, rc);
-
-        memset (buffer, 0, sizeof (buffer));
-        rc = zmq_recv (server, buffer, 4, 0);
-        TEST_ASSERT_EQUAL_INT (4, rc);
-        TEST_ASSERT_EQUAL_INT (0, memcmp (buffer, "ALOL", 4));
-    } else {
-        if (sub_command_) {
-            const uint8_t sub[13] = {4,   11,  9,   'S', 'U', 'B', 'S',
-                                     'C', 'R', 'I', 'B', 'E', 'A'};
-            rc = TEST_ASSERT_SUCCESS_RAW_ERRNO (
-              send (s, (const char *) sub, 13, 0));
-            TEST_ASSERT_EQUAL_INT (13, rc);
-        } else {
-            const uint8_t sub[4] = {0, 2, 1, 'A'};
-            rc = TEST_ASSERT_SUCCESS_RAW_ERRNO (
-              send (s, (const char *) sub, 4, 0));
-            TEST_ASSERT_EQUAL_INT (4, rc);
-        }
-        rc = zmq_recv (server, buffer, 2, 0);
-        TEST_ASSERT_EQUAL_INT (2, rc);
-        TEST_ASSERT_EQUAL_INT (0, memcmp (buffer, "\1A", 2));
-
-        rc = zmq_send (server, "ALOL", 4, 0);
-        TEST_ASSERT_EQUAL_INT (4, rc);
-
-        memset (buffer, 0, sizeof (buffer));
-        recv_with_retry (s, buffer, 6);
-        TEST_ASSERT_EQUAL_INT (0, memcmp (buffer, "\0\4ALOL", 6));
-    }
-
-    close (s);
-
-    test_context_socket_close (server);
-    test_context_socket_close (server_mon);
-}
-
-void test_mock_sub_command ()
-{
-    test_mock_pub_sub (true, false);
-}
-
-void test_mock_sub_legacy ()
-{
-    test_mock_pub_sub (false, false);
-}
-
-void test_mock_pub_command ()
-{
-    test_mock_pub_sub (true, true);
-}
-
-void test_mock_pub_legacy ()
-{
-    test_mock_pub_sub (false, true);
-}
-
-int main (void)
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-
-    RUN_TEST (test_mock_sub_command);
-    RUN_TEST (test_mock_sub_legacy);
-    RUN_TEST (test_mock_pub_command);
-    RUN_TEST (test_mock_pub_legacy);
-
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_monitor.cpp b/libs/libzmq/tests/test_monitor.cpp
deleted file mode 100644
index 7398dbd..0000000
--- a/libs/libzmq/tests/test_monitor.cpp
+++ /dev/null
@@ -1,465 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_monitoring.hpp"
-
-#include "testutil_unity.hpp"
-
-#include <stdlib.h>
-#include <string.h>
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void test_monitor_invalid_protocol_fails ()
-{
-    void *client = test_context_socket (ZMQ_DEALER);
-
-    //  Socket monitoring only works over inproc://
-    TEST_ASSERT_FAILURE_ERRNO (
-      EPROTONOSUPPORT, zmq_socket_monitor (client, "tcp://127.0.0.1:*", 0));
-
-#ifdef ZMQ_EVENT_PIPES_STATS
-    //  Stats command needs to be called on a valid socket with monitoring
-    //  enabled
-    TEST_ASSERT_FAILURE_ERRNO (ENOTSOCK, zmq_socket_monitor_pipes_stats (NULL));
-    TEST_ASSERT_FAILURE_ERRNO (EINVAL, zmq_socket_monitor_pipes_stats (client));
-#endif
-
-    test_context_socket_close_zero_linger (client);
-}
-
-void test_monitor_basic ()
-{
-    char my_endpoint[MAX_SOCKET_STRING];
-
-    //  We'll monitor these two sockets
-    void *client = test_context_socket (ZMQ_DEALER);
-    void *server = test_context_socket (ZMQ_DEALER);
-
-    //  Monitor all events on client and server sockets
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_socket_monitor (client, "inproc://monitor-client", ZMQ_EVENT_ALL));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_socket_monitor (server, "inproc://monitor-server", ZMQ_EVENT_ALL));
-
-    //  Create two sockets for collecting monitor events
-    void *client_mon = test_context_socket (ZMQ_PAIR);
-    void *server_mon = test_context_socket (ZMQ_PAIR);
-
-    //  Connect these to the inproc endpoints so they'll get events
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_connect (client_mon, "inproc://monitor-client"));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_connect (server_mon, "inproc://monitor-server"));
-
-    //  Now do a basic ping test
-    bind_loopback_ipv4 (server, my_endpoint, sizeof my_endpoint);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (client, my_endpoint));
-    bounce (server, client);
-
-    //  Close client and server
-    //  TODO why does this use zero_linger?
-    test_context_socket_close_zero_linger (client);
-    test_context_socket_close_zero_linger (server);
-
-    //  Now collect and check events from both sockets
-    int event = get_monitor_event (client_mon, NULL, NULL);
-    if (event == ZMQ_EVENT_CONNECT_DELAYED)
-        event = get_monitor_event (client_mon, NULL, NULL);
-    TEST_ASSERT_EQUAL_INT (ZMQ_EVENT_CONNECTED, event);
-    expect_monitor_event (client_mon, ZMQ_EVENT_HANDSHAKE_SUCCEEDED);
-    event = get_monitor_event (client_mon, NULL, NULL);
-    if (event == ZMQ_EVENT_DISCONNECTED) {
-        expect_monitor_event (client_mon, ZMQ_EVENT_CONNECT_RETRIED);
-        expect_monitor_event (client_mon, ZMQ_EVENT_MONITOR_STOPPED);
-    } else
-        TEST_ASSERT_EQUAL_INT (ZMQ_EVENT_MONITOR_STOPPED, event);
-
-    //  This is the flow of server events
-    expect_monitor_event (server_mon, ZMQ_EVENT_LISTENING);
-    expect_monitor_event (server_mon, ZMQ_EVENT_ACCEPTED);
-    expect_monitor_event (server_mon, ZMQ_EVENT_HANDSHAKE_SUCCEEDED);
-    event = get_monitor_event (server_mon, NULL, NULL);
-    //  Sometimes the server sees the client closing before it gets closed.
-    if (event != ZMQ_EVENT_DISCONNECTED) {
-        TEST_ASSERT_EQUAL_INT (ZMQ_EVENT_CLOSED, event);
-        event = get_monitor_event (server_mon, NULL, NULL);
-    }
-    if (event != ZMQ_EVENT_DISCONNECTED) {
-        TEST_ASSERT_EQUAL_INT (ZMQ_EVENT_MONITOR_STOPPED, event);
-    }
-    //  TODO: When not waiting until the monitor stopped, the I/O thread runs
-    //  into some deadlock. This must be fixed, but until it is fixed, we wait
-    //  here in order to have more reliable test execution.
-    while (event != ZMQ_EVENT_MONITOR_STOPPED) {
-        event = get_monitor_event (server_mon, NULL, NULL);
-    }
-
-    //  Close down the sockets
-    //  TODO why does this use zero_linger?
-    test_context_socket_close_zero_linger (client_mon);
-    test_context_socket_close_zero_linger (server_mon);
-}
-
-#if (defined ZMQ_CURRENT_EVENT_VERSION && ZMQ_CURRENT_EVENT_VERSION >= 2)      \
-  || (defined ZMQ_CURRENT_EVENT_VERSION                                        \
-      && ZMQ_CURRENT_EVENT_VERSION_DRAFT >= 2)
-void test_monitor_versioned_invalid_socket_type ()
-{
-    void *client = test_context_socket (ZMQ_DEALER);
-
-    //  Socket monitoring only works with ZMQ_PAIR, ZMQ_PUB and ZMQ_PUSH.
-    TEST_ASSERT_FAILURE_ERRNO (
-      EINVAL, zmq_socket_monitor_versioned (
-                client, "inproc://invalid-socket-type", 0, 2, ZMQ_CLIENT));
-
-    test_context_socket_close_zero_linger (client);
-}
-
-void test_monitor_versioned_basic (bind_function_t bind_function_,
-                                   const char *expected_prefix_,
-                                   int type_)
-{
-    char server_endpoint[MAX_SOCKET_STRING];
-    char client_mon_endpoint[MAX_SOCKET_STRING];
-    char server_mon_endpoint[MAX_SOCKET_STRING];
-
-    //  Create a unique endpoint for each call so we don't have
-    //  to wait for the sockets to unbind.
-    snprintf (client_mon_endpoint, MAX_SOCKET_STRING, "inproc://client%s%d",
-              expected_prefix_, type_);
-    snprintf (server_mon_endpoint, MAX_SOCKET_STRING, "inproc://server%s%d",
-              expected_prefix_, type_);
-
-    //  We'll monitor these two sockets
-    void *client = test_context_socket (ZMQ_DEALER);
-    void *server = test_context_socket (ZMQ_DEALER);
-
-    //  Monitor all events on client and server sockets
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_socket_monitor_versioned (
-      client, client_mon_endpoint, ZMQ_EVENT_ALL_V2, 2, type_));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_socket_monitor_versioned (
-      server, server_mon_endpoint, ZMQ_EVENT_ALL_V2, 2, type_));
-
-    //  Choose the appropriate consumer socket type.
-    int mon_type = ZMQ_PAIR;
-    switch (type_) {
-        case ZMQ_PAIR:
-            mon_type = ZMQ_PAIR;
-            break;
-        case ZMQ_PUSH:
-            mon_type = ZMQ_PULL;
-            break;
-        case ZMQ_PUB:
-            mon_type = ZMQ_SUB;
-            break;
-    }
-
-    //  Create two sockets for collecting monitor events
-    void *client_mon = test_context_socket (mon_type);
-    void *server_mon = test_context_socket (mon_type);
-
-    //  Additionally subscribe to all events if a PUB socket is used.
-    if (type_ == ZMQ_PUB) {
-        TEST_ASSERT_SUCCESS_ERRNO (
-          zmq_setsockopt (client_mon, ZMQ_SUBSCRIBE, "", 0));
-        TEST_ASSERT_SUCCESS_ERRNO (
-          zmq_setsockopt (server_mon, ZMQ_SUBSCRIBE, "", 0));
-    }
-
-    //  Connect these to the inproc endpoints so they'll get events
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (client_mon, client_mon_endpoint));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (server_mon, server_mon_endpoint));
-
-    //  Now do a basic ping test
-    bind_function_ (server, server_endpoint, sizeof server_endpoint);
-
-    int ipv6;
-    size_t ipv6_size = sizeof (ipv6);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (server, ZMQ_IPV6, &ipv6, &ipv6_size));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (client, ZMQ_IPV6, &ipv6, sizeof (int)));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (client, server_endpoint));
-    bounce (server, client);
-
-    //  Close client and server
-    //  TODO why does this use zero_linger?
-    test_context_socket_close_zero_linger (client);
-    test_context_socket_close_zero_linger (server);
-
-    char *client_local_address = NULL;
-    char *client_remote_address = NULL;
-
-    //  Now collect and check events from both sockets
-    int64_t event = get_monitor_event_v2 (
-      client_mon, NULL, &client_local_address, &client_remote_address);
-    if (event == ZMQ_EVENT_CONNECT_DELAYED) {
-        free (client_local_address);
-        free (client_remote_address);
-        event = get_monitor_event_v2 (client_mon, NULL, &client_local_address,
-                                      &client_remote_address);
-    }
-    TEST_ASSERT_EQUAL (ZMQ_EVENT_CONNECTED, event);
-    TEST_ASSERT_EQUAL_STRING (server_endpoint, client_remote_address);
-    TEST_ASSERT_EQUAL_STRING_LEN (expected_prefix_, client_local_address,
-                                  strlen (expected_prefix_));
-    TEST_ASSERT_NOT_EQUAL (
-      0, strcmp (client_local_address, client_remote_address));
-
-    expect_monitor_event_v2 (client_mon, ZMQ_EVENT_HANDSHAKE_SUCCEEDED,
-                             client_local_address, client_remote_address);
-    event = get_monitor_event_v2 (client_mon, NULL, NULL, NULL);
-    if (event == ZMQ_EVENT_DISCONNECTED) {
-        expect_monitor_event_v2 (client_mon, ZMQ_EVENT_CONNECT_RETRIED,
-                                 client_local_address, client_remote_address);
-        expect_monitor_event_v2 (client_mon, ZMQ_EVENT_MONITOR_STOPPED, "", "");
-    } else
-        TEST_ASSERT_EQUAL_INT (ZMQ_EVENT_MONITOR_STOPPED, event);
-
-    //  This is the flow of server events
-    expect_monitor_event_v2 (server_mon, ZMQ_EVENT_LISTENING,
-                             client_remote_address, "");
-    expect_monitor_event_v2 (server_mon, ZMQ_EVENT_ACCEPTED,
-                             client_remote_address, client_local_address);
-    expect_monitor_event_v2 (server_mon, ZMQ_EVENT_HANDSHAKE_SUCCEEDED,
-                             client_remote_address, client_local_address);
-    event = get_monitor_event_v2 (server_mon, NULL, NULL, NULL);
-    //  Sometimes the server sees the client closing before it gets closed.
-    if (event != ZMQ_EVENT_DISCONNECTED) {
-        TEST_ASSERT_EQUAL_INT (ZMQ_EVENT_CLOSED, event);
-        event = get_monitor_event_v2 (server_mon, NULL, NULL, NULL);
-    }
-    if (event != ZMQ_EVENT_DISCONNECTED) {
-        TEST_ASSERT_EQUAL_INT (ZMQ_EVENT_MONITOR_STOPPED, event);
-    }
-    //  TODO: When not waiting until the monitor stopped, the I/O thread runs
-    //  into some deadlock. This must be fixed, but until it is fixed, we wait
-    //  here in order to have more reliable test execution.
-    while (event != ZMQ_EVENT_MONITOR_STOPPED) {
-        event = get_monitor_event_v2 (server_mon, NULL, NULL, NULL);
-    }
-    free (client_local_address);
-    free (client_remote_address);
-
-    //  Close down the sockets
-    //  TODO why does this use zero_linger?
-    test_context_socket_close_zero_linger (client_mon);
-    test_context_socket_close_zero_linger (server_mon);
-}
-
-void test_monitor_versioned_basic_tcp_ipv4 ()
-{
-    static const char prefix[] = "tcp://127.0.0.1:";
-    test_monitor_versioned_basic (bind_loopback_ipv4, prefix, ZMQ_PAIR);
-    test_monitor_versioned_basic (bind_loopback_ipv4, prefix, ZMQ_PUB);
-    test_monitor_versioned_basic (bind_loopback_ipv4, prefix, ZMQ_PUSH);
-}
-
-void test_monitor_versioned_basic_tcp_ipv6 ()
-{
-    static const char prefix[] = "tcp://[::1]:";
-    test_monitor_versioned_basic (bind_loopback_ipv6, prefix, ZMQ_PAIR);
-    test_monitor_versioned_basic (bind_loopback_ipv6, prefix, ZMQ_PUB);
-    test_monitor_versioned_basic (bind_loopback_ipv6, prefix, ZMQ_PUSH);
-}
-
-void test_monitor_versioned_basic_ipc ()
-{
-    static const char prefix[] = "ipc://";
-    test_monitor_versioned_basic (bind_loopback_ipc, prefix, ZMQ_PAIR);
-    test_monitor_versioned_basic (bind_loopback_ipc, prefix, ZMQ_PUB);
-    test_monitor_versioned_basic (bind_loopback_ipc, prefix, ZMQ_PUSH);
-}
-
-void test_monitor_versioned_basic_tipc ()
-{
-    static const char prefix[] = "tipc://";
-    test_monitor_versioned_basic (bind_loopback_tipc, prefix, ZMQ_PAIR);
-    test_monitor_versioned_basic (bind_loopback_tipc, prefix, ZMQ_PUB);
-    test_monitor_versioned_basic (bind_loopback_tipc, prefix, ZMQ_PUSH);
-}
-
-#ifdef ZMQ_EVENT_PIPES_STATS
-void test_monitor_versioned_stats (bind_function_t bind_function_,
-                                   const char *expected_prefix_)
-{
-    char server_endpoint[MAX_SOCKET_STRING];
-    const int pulls_count = 4;
-    void *pulls[pulls_count];
-
-    //  We'll monitor these two sockets
-    void *push = test_context_socket (ZMQ_PUSH);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_socket_monitor_versioned (
-      push, "inproc://monitor-push", ZMQ_EVENT_PIPES_STATS, 2, ZMQ_PAIR));
-
-    //  Should fail if there are no pipes to monitor
-    TEST_ASSERT_FAILURE_ERRNO (EAGAIN, zmq_socket_monitor_pipes_stats (push));
-
-    void *push_mon = test_context_socket (ZMQ_PAIR);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (push_mon, "inproc://monitor-push"));
-
-    //  Set lower HWM - queues will be filled so we should see it in the stats
-    int send_hwm = 500;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (push, ZMQ_SNDHWM, &send_hwm, sizeof (send_hwm)));
-    //  Set very low TCP buffers so that messages cannot be stored in-flight
-    const int tcp_buffer_size = 4096;
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (
-      push, ZMQ_SNDBUF, &tcp_buffer_size, sizeof (tcp_buffer_size)));
-    bind_function_ (push, server_endpoint, sizeof (server_endpoint));
-
-    int ipv6;
-    size_t ipv6_size = sizeof (ipv6);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (push, ZMQ_IPV6, &ipv6, &ipv6_size));
-    for (int i = 0; i < pulls_count; ++i) {
-        pulls[i] = test_context_socket (ZMQ_PULL);
-        TEST_ASSERT_SUCCESS_ERRNO (
-          zmq_setsockopt (pulls[i], ZMQ_IPV6, &ipv6, sizeof (int)));
-        int timeout_ms = 10;
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (
-          pulls[i], ZMQ_RCVTIMEO, &timeout_ms, sizeof (timeout_ms)));
-        TEST_ASSERT_SUCCESS_ERRNO (
-          zmq_setsockopt (pulls[i], ZMQ_RCVHWM, &send_hwm, sizeof (send_hwm)));
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (
-          pulls[i], ZMQ_RCVBUF, &tcp_buffer_size, sizeof (tcp_buffer_size)));
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (pulls[i], server_endpoint));
-    }
-
-    //  Send until we block
-    int send_count = 0;
-    //  Saturate the TCP buffers too
-    char data[tcp_buffer_size * 2];
-    memset (data, 0, sizeof (data));
-    //  Saturate all pipes - send + receive - on all connections
-    while (send_count < send_hwm * 2 * pulls_count) {
-        TEST_ASSERT_EQUAL_INT (sizeof (data),
-                               zmq_send (push, data, sizeof (data), 0));
-        ++send_count;
-    }
-
-    //  Drain one of the pulls - doesn't matter how many messages, at least one
-    send_count = send_count / 4;
-    do {
-        zmq_recv (pulls[0], data, sizeof (data), 0);
-        --send_count;
-    } while (send_count > 0);
-
-    //  To kick the application thread, do a dummy getsockopt - users here
-    //  should use the monitor and the other sockets in a poll.
-    unsigned long int dummy;
-    size_t dummy_size = sizeof (dummy);
-    msleep (SETTLE_TIME);
-    //  Note that the pipe stats on the sender will not get updated until the
-    //  receiver has processed at least lwm ((hwm + 1) / 2) messages AND until
-    //  the application thread has ran through the mailbox, as the update is
-    //  delivered via a message (send_activate_write)
-    zmq_getsockopt (push, ZMQ_EVENTS, &dummy, &dummy_size);
-
-    //  Ask for stats and check that they match
-    zmq_socket_monitor_pipes_stats (push);
-
-    msleep (SETTLE_TIME);
-    zmq_getsockopt (push, ZMQ_EVENTS, &dummy, &dummy_size);
-
-    for (int i = 0; i < pulls_count; ++i) {
-        char *push_local_address = NULL;
-        char *push_remote_address = NULL;
-        uint64_t *queue_stat = NULL;
-        int64_t event = get_monitor_event_v2 (
-          push_mon, &queue_stat, &push_local_address, &push_remote_address);
-        TEST_ASSERT_EQUAL_STRING (server_endpoint, push_local_address);
-        TEST_ASSERT_EQUAL_STRING_LEN (expected_prefix_, push_remote_address,
-                                      strlen (expected_prefix_));
-        TEST_ASSERT_EQUAL_INT (ZMQ_EVENT_PIPES_STATS, event);
-        TEST_ASSERT_NOT_NULL (queue_stat);
-        TEST_ASSERT_EQUAL_INT (i == 0 ? 0 : send_hwm, queue_stat[0]);
-        TEST_ASSERT_EQUAL_INT (0, queue_stat[1]);
-        free (push_local_address);
-        free (push_remote_address);
-        free (queue_stat);
-    }
-
-    //  Close client and server
-    test_context_socket_close_zero_linger (push_mon);
-    test_context_socket_close_zero_linger (push);
-    for (int i = 0; i < pulls_count; ++i)
-        test_context_socket_close_zero_linger (pulls[i]);
-}
-
-void test_monitor_versioned_stats_tcp_ipv4 ()
-{
-    static const char prefix[] = "tcp://127.0.0.1:";
-    test_monitor_versioned_stats (bind_loopback_ipv4, prefix);
-}
-
-void test_monitor_versioned_stats_tcp_ipv6 ()
-{
-    static const char prefix[] = "tcp://[::1]:";
-    test_monitor_versioned_stats (bind_loopback_ipv6, prefix);
-}
-
-void test_monitor_versioned_stats_ipc ()
-{
-    static const char prefix[] = "ipc://";
-    test_monitor_versioned_stats (bind_loopback_ipc, prefix);
-}
-#endif // ZMQ_EVENT_PIPES_STATS
-#endif
-
-int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_monitor_invalid_protocol_fails);
-    RUN_TEST (test_monitor_basic);
-
-#if (defined ZMQ_CURRENT_EVENT_VERSION && ZMQ_CURRENT_EVENT_VERSION >= 2)      \
-  || (defined ZMQ_CURRENT_EVENT_VERSION                                        \
-      && ZMQ_CURRENT_EVENT_VERSION_DRAFT >= 2)
-    RUN_TEST (test_monitor_versioned_invalid_socket_type);
-    RUN_TEST (test_monitor_versioned_basic_tcp_ipv4);
-    RUN_TEST (test_monitor_versioned_basic_tcp_ipv6);
-    RUN_TEST (test_monitor_versioned_basic_ipc);
-    RUN_TEST (test_monitor_versioned_basic_tipc);
-#ifdef ZMQ_EVENT_PIPES_STATS
-    RUN_TEST (test_monitor_versioned_stats_tcp_ipv4);
-    RUN_TEST (test_monitor_versioned_stats_tcp_ipv6);
-    RUN_TEST (test_monitor_versioned_stats_ipc);
-#endif
-#endif
-
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_msg_ffn.cpp b/libs/libzmq/tests/test_msg_ffn.cpp
deleted file mode 100644
index 5f40f28..0000000
--- a/libs/libzmq/tests/test_msg_ffn.cpp
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-#include <string.h>
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void ffn (void *data_, void *hint_)
-{
-    // Signal that ffn has been called by writing "freed" to hint
-    (void) data_; //  Suppress 'unused' warnings at compile time
-    memcpy (hint_, (void *) "freed", 5);
-}
-
-void test_msg_init_ffn ()
-{
-    //  Create the infrastructure
-    char my_endpoint[MAX_SOCKET_STRING];
-
-    void *router = test_context_socket (ZMQ_ROUTER);
-    bind_loopback_ipv4 (router, my_endpoint, sizeof my_endpoint);
-
-    void *dealer = test_context_socket (ZMQ_DEALER);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (dealer, my_endpoint));
-
-    // Test that creating and closing a message triggers ffn
-    zmq_msg_t msg;
-    char hint[5];
-    char data[255];
-    memset (data, 0, 255);
-    memcpy (data, (void *) "data", 4);
-    memcpy (hint, (void *) "hint", 4);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_msg_init_data (&msg, (void *) data, 255, ffn, (void *) hint));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&msg));
-
-    msleep (SETTLE_TIME);
-    TEST_ASSERT_EQUAL_STRING_LEN ("freed", hint, 5);
-    memcpy (hint, (void *) "hint", 4);
-
-    // Making and closing a copy triggers ffn
-    zmq_msg_t msg2;
-    zmq_msg_init (&msg2);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_msg_init_data (&msg, (void *) data, 255, ffn, (void *) hint));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_copy (&msg2, &msg));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&msg2));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&msg));
-
-    msleep (SETTLE_TIME);
-    TEST_ASSERT_EQUAL_STRING_LEN ("freed", hint, 5);
-    memcpy (hint, (void *) "hint", 4);
-
-    // Test that sending a message triggers ffn
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_msg_init_data (&msg, (void *) data, 255, ffn, (void *) hint));
-
-    zmq_msg_send (&msg, dealer, 0);
-    char buf[255];
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_recv (router, buf, 255, 0));
-    TEST_ASSERT_EQUAL_INT (255, zmq_recv (router, buf, 255, 0));
-    TEST_ASSERT_EQUAL_STRING_LEN (data, buf, 4);
-
-    msleep (SETTLE_TIME);
-    TEST_ASSERT_EQUAL_STRING_LEN ("freed", hint, 5);
-    memcpy (hint, (void *) "hint", 4);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&msg));
-
-    // Sending a copy of a message triggers ffn
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init (&msg2));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_msg_init_data (&msg, (void *) data, 255, ffn, (void *) hint));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_copy (&msg2, &msg));
-
-    zmq_msg_send (&msg, dealer, 0);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_recv (router, buf, 255, 0));
-    TEST_ASSERT_EQUAL_INT (255, zmq_recv (router, buf, 255, 0));
-    TEST_ASSERT_EQUAL_STRING_LEN (data, buf, 4);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&msg2));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&msg));
-
-    msleep (SETTLE_TIME);
-    TEST_ASSERT_EQUAL_STRING_LEN ("freed", hint, 5);
-
-    //  Deallocate the infrastructure.
-    test_context_socket_close (router);
-    test_context_socket_close (dealer);
-}
-
-int main (void)
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_msg_init_ffn);
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_msg_flags.cpp b/libs/libzmq/tests/test_msg_flags.cpp
deleted file mode 100644
index 55cf348..0000000
--- a/libs/libzmq/tests/test_msg_flags.cpp
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void test_more ()
-{
-    //  Create the infrastructure
-    void *sb = test_context_socket (ZMQ_ROUTER);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (sb, "inproc://a"));
-
-    void *sc = test_context_socket (ZMQ_DEALER);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sc, "inproc://a"));
-
-    //  Send 2-part message.
-    send_string_expect_success (sc, "A", ZMQ_SNDMORE);
-    send_string_expect_success (sc, "B", 0);
-
-    //  Routing id comes first.
-    zmq_msg_t msg;
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init (&msg));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_recv (&msg, sb, 0));
-    TEST_ASSERT_EQUAL_INT (1, TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_more (&msg)));
-
-    //  Then the first part of the message body.
-    TEST_ASSERT_EQUAL_INT (
-      1, TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_recv (&msg, sb, 0)));
-    TEST_ASSERT_EQUAL_INT (1, TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_more (&msg)));
-
-    //  And finally, the second part of the message body.
-    TEST_ASSERT_EQUAL_INT (
-      1, TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_recv (&msg, sb, 0)));
-    TEST_ASSERT_EQUAL_INT (0, TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_more (&msg)));
-
-    //  Deallocate the infrastructure.
-    test_context_socket_close (sc);
-    test_context_socket_close (sb);
-}
-
-void test_shared_refcounted ()
-{
-    // Test ZMQ_SHARED property (case 1, refcounted messages)
-    zmq_msg_t msg_a;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_msg_init_size (&msg_a, 1024)); // large enough to be a type_lmsg
-
-    // Message is not shared
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_get (&msg_a, ZMQ_SHARED));
-
-    zmq_msg_t msg_b;
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init (&msg_b));
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_copy (&msg_b, &msg_a));
-
-    // Message is now shared
-    TEST_ASSERT_EQUAL_INT (
-      1, TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_get (&msg_b, ZMQ_SHARED)));
-
-    // cleanup
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&msg_a));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&msg_b));
-}
-
-void test_shared_const ()
-{
-    zmq_msg_t msg_a;
-    // Test ZMQ_SHARED property (case 2, constant data messages)
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_msg_init_data (&msg_a, (void *) "TEST", 5, 0, 0));
-
-    // Message reports as shared
-    TEST_ASSERT_EQUAL_INT (
-      1, TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_get (&msg_a, ZMQ_SHARED)));
-
-    // cleanup
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&msg_a));
-}
-
-int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_more);
-    RUN_TEST (test_shared_refcounted);
-    RUN_TEST (test_shared_const);
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_msg_init.cpp b/libs/libzmq/tests/test_msg_init.cpp
deleted file mode 100644
index 75e7810..0000000
--- a/libs/libzmq/tests/test_msg_init.cpp
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-#include <string.h>
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void test_msg_init ()
-{
-    zmq_msg_t msg;
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init (&msg));
-    TEST_ASSERT_EQUAL_INT (0, zmq_msg_size (&msg));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&msg));
-}
-
-void test_msg_init_size ()
-{
-    const char *data = "foobar";
-    zmq_msg_t msg;
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init_size (&msg, 6));
-    TEST_ASSERT_EQUAL_INT (6, zmq_msg_size (&msg));
-    memcpy (zmq_msg_data (&msg), data, 6);
-    TEST_ASSERT_EQUAL_STRING_LEN (data, zmq_msg_data (&msg), 6);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&msg));
-
-    zmq_msg_t msg2;
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init_size (&msg2, 0));
-    TEST_ASSERT_EQUAL_INT (0, zmq_msg_size (&msg2));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&msg2));
-}
-
-void test_msg_init_buffer ()
-{
-    const char *data = "foobar";
-    zmq_msg_t msg;
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init_buffer (&msg, data, 6));
-    TEST_ASSERT_EQUAL_INT (6, zmq_msg_size (&msg));
-    TEST_ASSERT (data != zmq_msg_data (&msg));
-    TEST_ASSERT_EQUAL_STRING_LEN (data, zmq_msg_data (&msg), 6);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&msg));
-
-    zmq_msg_t msg2;
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init_buffer (&msg2, NULL, 0));
-    TEST_ASSERT_EQUAL_INT (0, zmq_msg_size (&msg2));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&msg2));
-}
-
-int main (void)
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_msg_init);
-    RUN_TEST (test_msg_init_size);
-    RUN_TEST (test_msg_init_buffer);
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_pair_inproc.cpp b/libs/libzmq/tests/test_pair_inproc.cpp
deleted file mode 100644
index efbd930..0000000
--- a/libs/libzmq/tests/test_pair_inproc.cpp
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-#include <unity.h>
-
-void *sb;
-void *sc;
-
-void setUp ()
-{
-    setup_test_context ();
-
-    sb = test_context_socket (ZMQ_PAIR);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (sb, "inproc://a"));
-
-    sc = test_context_socket (ZMQ_PAIR);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sc, "inproc://a"));
-}
-
-void tearDown ()
-{
-    test_context_socket_close (sc);
-    test_context_socket_close (sb);
-
-    teardown_test_context ();
-}
-
-void test_roundtrip ()
-{
-    bounce (sb, sc);
-}
-
-// TODO it appears that this has nothing to do with pair or inproc, and belongs somewhere else
-void test_zmq_send_const ()
-{
-    TEST_ASSERT_EQUAL_INT (3, TEST_ASSERT_SUCCESS_ERRNO (
-                                zmq_send_const (sb, "foo", 3, ZMQ_SNDMORE)));
-    TEST_ASSERT_EQUAL_INT (
-      6, TEST_ASSERT_SUCCESS_ERRNO (zmq_send_const (sb, "foobar", 6, 0)));
-
-    recv_string_expect_success (sc, "foo", 0);
-    recv_string_expect_success (sc, "foobar", 0);
-}
-
-int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_roundtrip);
-    RUN_TEST (test_zmq_send_const);
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_pair_ipc.cpp b/libs/libzmq/tests/test_pair_ipc.cpp
deleted file mode 100644
index 1872fd8..0000000
--- a/libs/libzmq/tests/test_pair_ipc.cpp
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-#include <string>
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void test_roundtrip ()
-{
-    char my_endpoint[256];
-
-    void *sb = test_context_socket (ZMQ_PAIR);
-    bind_loopback_ipc (sb, my_endpoint, sizeof my_endpoint);
-
-    void *sc = test_context_socket (ZMQ_PAIR);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sc, my_endpoint));
-
-    bounce (sb, sc);
-
-    test_context_socket_close (sc);
-    test_context_socket_close (sb);
-}
-
-static const char prefix[] = "ipc://";
-
-void test_endpoint_too_long ()
-{
-    std::string endpoint_too_long;
-    endpoint_too_long.append (prefix);
-    for (size_t i = 0; i < 108; ++i) {
-        endpoint_too_long.append ("a");
-    }
-
-    void *sb = test_context_socket (ZMQ_PAIR);
-    // TODO ENAMETOOLONG is not listed in the errors returned by zmq_bind,
-    // should this be EINVAL?
-    TEST_ASSERT_FAILURE_ERRNO (ENAMETOOLONG,
-                               zmq_bind (sb, endpoint_too_long.data ()));
-
-    test_context_socket_close (sb);
-}
-
-
-int main (void)
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_roundtrip);
-    RUN_TEST (test_endpoint_too_long);
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_pair_tcp.cpp b/libs/libzmq/tests/test_pair_tcp.cpp
deleted file mode 100644
index 81b442d..0000000
--- a/libs/libzmq/tests/test_pair_tcp.cpp
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-#include <string.h>
-
-#if defined _WIN32
-#include "../src/windows.hpp"
-#endif
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-typedef void (*extra_func_t) (void *socket_);
-
-#ifdef ZMQ_BUILD_DRAFT
-void set_sockopt_fastpath (void *socket)
-{
-    int value = 1;
-    int rc =
-      zmq_setsockopt (socket, ZMQ_LOOPBACK_FASTPATH, &value, sizeof value);
-    assert (rc == 0);
-}
-#endif
-
-void test_pair_tcp (extra_func_t extra_func_ = NULL)
-{
-    void *sb = test_context_socket (ZMQ_PAIR);
-
-    if (extra_func_)
-        extra_func_ (sb);
-
-    char my_endpoint[MAX_SOCKET_STRING];
-    bind_loopback_ipv4 (sb, my_endpoint, sizeof my_endpoint);
-
-    void *sc = test_context_socket (ZMQ_PAIR);
-    if (extra_func_)
-        extra_func_ (sc);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sc, my_endpoint));
-
-    bounce (sb, sc);
-
-    test_context_socket_close (sc);
-    test_context_socket_close (sb);
-}
-
-void test_pair_tcp_regular ()
-{
-    test_pair_tcp ();
-}
-
-void test_pair_tcp_connect_by_name ()
-{
-    // all other tcp test cases bind to a loopback wildcard address, then
-    // retrieve the bound endpoint, which is numerical, and use that to
-    // connect. this test cases specifically uses "localhost" to connect
-    // to ensure that names are correctly resolved
-    void *sb = test_context_socket (ZMQ_PAIR);
-
-    char bound_endpoint[MAX_SOCKET_STRING];
-    bind_loopback_ipv4 (sb, bound_endpoint, sizeof bound_endpoint);
-
-    // extract the bound port number
-    const char *pos = strrchr (bound_endpoint, ':');
-    TEST_ASSERT_NOT_NULL (pos);
-    const char connect_endpoint_prefix[] = "tcp://localhost";
-    char connect_endpoint[MAX_SOCKET_STRING];
-    strcpy (connect_endpoint, connect_endpoint_prefix);
-    strcat (connect_endpoint, pos);
-
-    void *sc = test_context_socket (ZMQ_PAIR);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sc, connect_endpoint));
-
-    bounce (sb, sc);
-
-    test_context_socket_close (sc);
-    test_context_socket_close (sb);
-}
-
-
-#ifdef ZMQ_BUILD_DRAFT
-void test_pair_tcp_fastpath ()
-{
-    test_pair_tcp (set_sockopt_fastpath);
-}
-#endif
-
-#ifdef _WIN32
-void test_io_completion_port ()
-{
-    void *const s = test_context_socket (ZMQ_PAIR);
-    SOCKET fd;
-    size_t fd_size = sizeof fd;
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_getsockopt (s, ZMQ_FD, &fd, &fd_size));
-
-    ::WSAPROTOCOL_INFO pi;
-    TEST_ASSERT_SUCCESS_RAW_ERRNO (
-      ::WSADuplicateSocket (fd, ::GetCurrentProcessId (), &pi));
-    const SOCKET socket = ::WSASocket (pi.iAddressFamily /*AF_INET*/,
-                                       pi.iSocketType /*SOCK_STREAM*/,
-                                       pi.iProtocol /*IPPROTO_TCP*/, &pi, 0, 0);
-
-    const HANDLE iocp =
-      ::CreateIoCompletionPort (INVALID_HANDLE_VALUE, NULL, 0, 0);
-    TEST_ASSERT_NOT_EQUAL (NULL, iocp);
-    const HANDLE res =
-      ::CreateIoCompletionPort (reinterpret_cast<HANDLE> (socket), iocp, 0, 0);
-    TEST_ASSERT_NOT_EQUAL (NULL, res);
-
-    TEST_ASSERT_SUCCESS_RAW_ERRNO (closesocket (socket));
-    TEST_ASSERT_TRUE (CloseHandle (iocp));
-
-    test_context_socket_close (s);
-}
-#endif
-
-int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_pair_tcp_regular);
-    RUN_TEST (test_pair_tcp_connect_by_name);
-#ifdef ZMQ_BUILD_DRAFT
-    RUN_TEST (test_pair_tcp_fastpath);
-#endif
-#ifdef _WIN32
-    RUN_TEST (test_io_completion_port);
-#endif
-
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_pair_tcp_cap_net_admin.cpp b/libs/libzmq/tests/test_pair_tcp_cap_net_admin.cpp
deleted file mode 100644
index 6871bf9..0000000
--- a/libs/libzmq/tests/test_pair_tcp_cap_net_admin.cpp
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-typedef void (*extra_func_t) (void *socket_);
-
-void set_sockopt_bind_to_device (void *socket)
-{
-    const char device[] = "lo";
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (socket, ZMQ_BINDTODEVICE, &device, sizeof (device) - 1));
-}
-
-//  TODO this is duplicated from test_pair_tcp
-void test_pair_tcp (extra_func_t extra_func_ = NULL)
-{
-    void *sb = test_context_socket (ZMQ_PAIR);
-
-    if (extra_func_)
-        extra_func_ (sb);
-
-    char my_endpoint[MAX_SOCKET_STRING];
-    size_t my_endpoint_length = sizeof my_endpoint;
-    int rc = zmq_bind (sb, "tcp://127.0.0.1:*");
-    if (rc < 0 && errno == EOPNOTSUPP)
-        TEST_IGNORE_MESSAGE ("SO_BINDTODEVICE not supported");
-    TEST_ASSERT_SUCCESS_ERRNO (rc);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (sb, ZMQ_LAST_ENDPOINT, my_endpoint, &my_endpoint_length));
-
-    void *sc = test_context_socket (ZMQ_PAIR);
-    if (extra_func_)
-        extra_func_ (sc);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sc, my_endpoint));
-
-    bounce (sb, sc);
-
-    test_context_socket_close (sc);
-    test_context_socket_close (sb);
-}
-
-void test_pair_tcp_bind_to_device ()
-{
-    test_pair_tcp (set_sockopt_bind_to_device);
-}
-
-int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_pair_tcp_bind_to_device);
-
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_pair_tipc.cpp b/libs/libzmq/tests/test_pair_tipc.cpp
deleted file mode 100644
index 9040dda..0000000
--- a/libs/libzmq/tests/test_pair_tipc.cpp
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include <stdio.h>
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void test_roundtrip ()
-{
-    void *sb = test_context_socket (ZMQ_PAIR);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (sb, "tipc://{5560,0,0}"));
-
-    void *sc = test_context_socket (ZMQ_PAIR);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sc, "tipc://{5560,0}@0.0.0"));
-
-    bounce (sb, sc);
-
-    test_context_socket_close (sc);
-    test_context_socket_close (sb);
-}
-
-int main ()
-{
-    if (!is_tipc_available ()) {
-        printf ("TIPC environment unavailable, skipping test\n");
-        return 77;
-    }
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_roundtrip);
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_pair_vmci.cpp b/libs/libzmq/tests/test_pair_vmci.cpp
deleted file mode 100644
index 87150ed..0000000
--- a/libs/libzmq/tests/test_pair_vmci.cpp
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include <string>
-#include <sstream>
-#include <vmci_sockets.h>
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void test_pair_vmci ()
-{
-    std::stringstream s;
-    s << "vmci://" << VMCISock_GetLocalCID () << ":" << 5560;
-    std::string endpoint = s.str ();
-
-    void *sb = test_context_socket (ZMQ_PAIR);
-    int rc = zmq_bind (sb, endpoint.c_str ());
-    if (rc < 0 && errno == EAFNOSUPPORT)
-        TEST_IGNORE_MESSAGE ("VMCI not supported");
-    TEST_ASSERT_SUCCESS_ERRNO (rc);
-
-    void *sc = test_context_socket (ZMQ_PAIR);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sc, endpoint.c_str ()));
-
-    expect_bounce_fail (sb, sc);
-
-    test_context_socket_close_zero_linger (sc);
-    test_context_socket_close_zero_linger (sb);
-}
-
-int main (void)
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_pair_vmci);
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_peer.cpp b/libs/libzmq/tests/test_peer.cpp
deleted file mode 100644
index 30127f5..0000000
--- a/libs/libzmq/tests/test_peer.cpp
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void test_peer ()
-{
-    size_t len = MAX_SOCKET_STRING;
-    char my_endpoint[MAX_SOCKET_STRING];
-
-    void *peer1 = test_context_socket (ZMQ_PEER);
-    bind_loopback (peer1, false, my_endpoint, len);
-
-    void *peer2 = test_context_socket (ZMQ_PEER);
-    uint32_t peer1_routing_id = zmq_connect_peer (peer2, my_endpoint);
-    TEST_ASSERT_NOT_EQUAL (0, peer1_routing_id);
-
-    {
-        zmq_msg_t msg;
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init_size (&msg, 1));
-
-        char *data = static_cast<char *> (zmq_msg_data (&msg));
-        data[0] = 1;
-
-        TEST_ASSERT_SUCCESS_ERRNO (
-          zmq_msg_set_routing_id (&msg, peer1_routing_id));
-
-        int rc = zmq_msg_send (&msg, peer2, 0);
-        TEST_ASSERT_EQUAL_INT (1, rc);
-    }
-
-    uint32_t peer2_routing_id;
-    {
-        zmq_msg_t msg;
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init (&msg));
-
-        int rc = TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_recv (&msg, peer1, 0));
-        TEST_ASSERT_EQUAL_INT (1, rc);
-
-        peer2_routing_id = zmq_msg_routing_id (&msg);
-        TEST_ASSERT_NOT_EQUAL (0, peer2_routing_id);
-
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&msg));
-    }
-
-    {
-        zmq_msg_t msg;
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init_size (&msg, 1));
-
-        char *data = static_cast<char *> (zmq_msg_data (&msg));
-        data[0] = 2;
-
-        TEST_ASSERT_SUCCESS_ERRNO (
-          zmq_msg_set_routing_id (&msg, peer2_routing_id));
-
-        int rc = zmq_msg_send (&msg, peer1, 0);
-        TEST_ASSERT_EQUAL_INT (1, rc);
-    }
-
-    {
-        zmq_msg_t msg;
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init (&msg));
-
-        int rc = zmq_msg_recv (&msg, peer2, 0);
-        TEST_ASSERT_EQUAL_INT (1, rc);
-
-        uint32_t routing_id = zmq_msg_routing_id (&msg);
-        TEST_ASSERT_EQUAL_UINT32 (peer1_routing_id, routing_id);
-
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&msg));
-    }
-
-    test_context_socket_close (peer1);
-    test_context_socket_close (peer2);
-}
-
-int main (void)
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_peer);
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_poller.cpp b/libs/libzmq/tests/test_poller.cpp
deleted file mode 100644
index 78a352b..0000000
--- a/libs/libzmq/tests/test_poller.cpp
+++ /dev/null
@@ -1,778 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-#include <limits.h>
-
-#ifndef _WIN32
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <unistd.h>
-#endif
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-fd_t get_fd (void *socket_)
-{
-    fd_t fd;
-    size_t fd_size = sizeof fd;
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_getsockopt (socket_, ZMQ_FD, &fd, &fd_size));
-    return fd;
-}
-
-void test_null_poller_pointers_destroy_direct ()
-{
-    TEST_ASSERT_FAILURE_ERRNO (EFAULT, zmq_poller_destroy (NULL));
-}
-
-void test_null_poller_pointers_destroy_indirect ()
-{
-    void *null_poller = NULL;
-    TEST_ASSERT_FAILURE_ERRNO (EFAULT, zmq_poller_destroy (&null_poller));
-}
-
-void test_null_poller_pointers_size_direct ()
-{
-    TEST_ASSERT_FAILURE_ERRNO (EFAULT, zmq_poller_size (NULL));
-}
-
-void test_null_poller_pointers_size_indirect ()
-{
-    void *null_poller = NULL;
-    TEST_ASSERT_FAILURE_ERRNO (EFAULT, zmq_poller_size (&null_poller));
-}
-
-void test_null_poller_pointers_add_direct ()
-{
-    void *socket = test_context_socket (ZMQ_PAIR);
-    TEST_ASSERT_FAILURE_ERRNO (EFAULT,
-                               zmq_poller_add (NULL, socket, NULL, ZMQ_POLLIN));
-    test_context_socket_close (socket);
-}
-
-void test_null_poller_pointers_add_indirect ()
-{
-    void *null_poller = NULL;
-    void *socket = test_context_socket (ZMQ_PAIR);
-    TEST_ASSERT_FAILURE_ERRNO (
-      EFAULT, zmq_poller_add (&null_poller, socket, NULL, ZMQ_POLLIN));
-    test_context_socket_close (socket);
-}
-
-void test_null_poller_pointers_modify_direct ()
-{
-    void *socket = test_context_socket (ZMQ_PAIR);
-    TEST_ASSERT_FAILURE_ERRNO (EFAULT,
-                               zmq_poller_modify (NULL, socket, ZMQ_POLLIN));
-    test_context_socket_close (socket);
-}
-
-void test_null_poller_pointers_modify_indirect ()
-{
-    void *null_poller = NULL;
-    void *socket = test_context_socket (ZMQ_PAIR);
-    TEST_ASSERT_FAILURE_ERRNO (
-      EFAULT, zmq_poller_modify (&null_poller, socket, ZMQ_POLLIN));
-    test_context_socket_close (socket);
-}
-
-void test_null_poller_pointers_remove_direct ()
-{
-    void *socket = test_context_socket (ZMQ_PAIR);
-    TEST_ASSERT_FAILURE_ERRNO (EFAULT, zmq_poller_remove (NULL, socket));
-    test_context_socket_close (socket);
-}
-
-void test_null_poller_pointers_remove_indirect ()
-{
-    void *null_poller = NULL;
-    void *socket = test_context_socket (ZMQ_PAIR);
-    TEST_ASSERT_FAILURE_ERRNO (EFAULT,
-                               zmq_poller_remove (&null_poller, socket));
-    test_context_socket_close (socket);
-}
-
-void test_null_poller_pointers_add_fd_direct ()
-{
-    void *socket = test_context_socket (ZMQ_PAIR);
-    const fd_t fd = get_fd (socket);
-
-    TEST_ASSERT_FAILURE_ERRNO (EFAULT,
-                               zmq_poller_add_fd (NULL, fd, NULL, ZMQ_POLLIN));
-    test_context_socket_close (socket);
-}
-
-void test_null_poller_pointers_add_fd_indirect ()
-{
-    void *socket = test_context_socket (ZMQ_PAIR);
-    const fd_t fd = get_fd (socket);
-    void *null_poller = NULL;
-    TEST_ASSERT_FAILURE_ERRNO (
-      EFAULT, zmq_poller_add_fd (&null_poller, fd, NULL, ZMQ_POLLIN));
-    test_context_socket_close (socket);
-}
-
-void test_null_poller_pointers_modify_fd_direct ()
-{
-    void *socket = test_context_socket (ZMQ_PAIR);
-    const fd_t fd = get_fd (socket);
-    TEST_ASSERT_FAILURE_ERRNO (EFAULT,
-                               zmq_poller_modify_fd (NULL, fd, ZMQ_POLLIN));
-    test_context_socket_close (socket);
-}
-
-void test_null_poller_pointers_modify_fd_indirect ()
-{
-    void *socket = test_context_socket (ZMQ_PAIR);
-    const fd_t fd = get_fd (socket);
-    void *null_poller = NULL;
-    TEST_ASSERT_FAILURE_ERRNO (
-      EFAULT, zmq_poller_modify_fd (&null_poller, fd, ZMQ_POLLIN));
-    test_context_socket_close (socket);
-}
-
-void test_null_poller_pointers_remove_fd_direct ()
-{
-    void *socket = test_context_socket (ZMQ_PAIR);
-    const fd_t fd = get_fd (socket);
-    TEST_ASSERT_FAILURE_ERRNO (EFAULT, zmq_poller_remove_fd (NULL, fd));
-    test_context_socket_close (socket);
-}
-
-void test_null_poller_pointers_remove_fd_indirect ()
-{
-    void *socket = test_context_socket (ZMQ_PAIR);
-    const fd_t fd = get_fd (socket);
-    void *null_poller = NULL;
-    TEST_ASSERT_FAILURE_ERRNO (EFAULT, zmq_poller_remove_fd (&null_poller, fd));
-    test_context_socket_close (socket);
-}
-
-void test_null_poller_pointers_wait_direct ()
-{
-    zmq_poller_event_t event;
-    TEST_ASSERT_FAILURE_ERRNO (EFAULT, zmq_poller_wait (NULL, &event, 0));
-}
-
-void test_null_poller_pointers_wait_indirect ()
-{
-    zmq_poller_event_t event;
-    void *null_poller = NULL;
-    TEST_ASSERT_FAILURE_ERRNO (EFAULT,
-                               zmq_poller_wait (&null_poller, &event, 0));
-}
-
-void test_null_poller_pointers_wait_all_direct ()
-{
-    zmq_poller_event_t event;
-    TEST_ASSERT_FAILURE_ERRNO (EFAULT,
-                               zmq_poller_wait_all (NULL, &event, 1, 0));
-}
-
-void test_null_poller_pointers_wait_all_indirect ()
-{
-    zmq_poller_event_t event;
-    void *null_poller = NULL;
-    TEST_ASSERT_FAILURE_ERRNO (
-      EFAULT, zmq_poller_wait_all (&null_poller, &event, 1, 0));
-}
-
-void test_null_poller_pointer_poller_fd ()
-{
-    void *null_poller = NULL;
-    fd_t fd;
-    TEST_ASSERT_FAILURE_ERRNO (EFAULT, zmq_poller_fd (&null_poller, &fd));
-}
-
-void test_null_socket_pointers ()
-{
-    void *poller = zmq_poller_new ();
-    TEST_ASSERT_NOT_NULL (poller);
-
-    TEST_ASSERT_FAILURE_ERRNO (ENOTSOCK,
-                               zmq_poller_add (poller, NULL, NULL, ZMQ_POLLIN));
-
-    TEST_ASSERT_FAILURE_ERRNO (ENOTSOCK,
-                               zmq_poller_modify (poller, NULL, ZMQ_POLLIN));
-
-    TEST_ASSERT_FAILURE_ERRNO (ENOTSOCK, zmq_poller_remove (poller, NULL));
-
-    fd_t null_socket_fd = retired_fd;
-
-    TEST_ASSERT_FAILURE_ERRNO (
-      EBADF, zmq_poller_add_fd (poller, null_socket_fd, NULL, ZMQ_POLLIN));
-
-    TEST_ASSERT_FAILURE_ERRNO (
-      EBADF, zmq_poller_modify_fd (poller, null_socket_fd, ZMQ_POLLIN));
-
-    TEST_ASSERT_FAILURE_ERRNO (EBADF,
-                               zmq_poller_remove_fd (poller, null_socket_fd));
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_poller_destroy (&poller));
-}
-
-typedef void (*extra_poller_socket_func_t) (void *poller_, void *socket_);
-
-void test_with_empty_poller (extra_poller_socket_func_t extra_func_)
-{
-    void *socket = test_context_socket (ZMQ_PAIR);
-
-    void *poller = zmq_poller_new ();
-    TEST_ASSERT_NOT_NULL (poller);
-
-    extra_func_ (poller, socket);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_poller_destroy (&poller));
-
-    test_context_socket_close (socket);
-}
-
-typedef void (*extra_poller_func_t) (void *poller_);
-
-void test_with_valid_poller (extra_poller_func_t extra_func_)
-{
-    void *socket = test_context_socket (ZMQ_PAIR);
-
-    void *poller = zmq_poller_new ();
-    TEST_ASSERT_NOT_NULL (poller);
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_poller_add (poller, socket, NULL, ZMQ_POLLIN));
-
-    extra_func_ (poller);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_poller_destroy (&poller));
-
-    test_context_socket_close (socket);
-}
-
-void test_call_poller_fd_no_signaler ()
-{
-    void *socket = test_context_socket (ZMQ_PAIR);
-
-    void *poller = zmq_poller_new ();
-    TEST_ASSERT_NOT_NULL (poller);
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_poller_add (poller, socket, NULL, ZMQ_POLLIN));
-
-    fd_t fd;
-    TEST_ASSERT_FAILURE_ERRNO (EINVAL, zmq_poller_fd (poller, &fd));
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_poller_destroy (&poller));
-
-    test_context_socket_close (socket);
-}
-
-void test_call_poller_fd ()
-{
-    void *socket = test_context_socket (ZMQ_CLIENT);
-
-    void *poller = zmq_poller_new ();
-    TEST_ASSERT_NOT_NULL (poller);
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_poller_add (poller, socket, NULL, ZMQ_POLLIN));
-
-    fd_t fd;
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_poller_fd (poller, &fd));
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_poller_destroy (&poller));
-
-    test_context_socket_close (socket);
-}
-
-void call_poller_wait_null_event_fails (void *poller_)
-{
-    TEST_ASSERT_FAILURE_ERRNO (EFAULT, zmq_poller_wait (poller_, NULL, 0));
-}
-
-void call_poller_wait_all_null_event_fails_event_count_nonzero (void *poller_)
-{
-    TEST_ASSERT_FAILURE_ERRNO (EFAULT,
-                               zmq_poller_wait_all (poller_, NULL, 1, 0));
-}
-
-void call_poller_wait_all_null_event_fails_event_count_zero (void *poller_)
-{
-#if 0
-    //  TODO this causes an assertion, which is not consistent if the number
-    //  of events may be 0, the pointer should be allowed to by NULL in that
-    //  case too
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_poller_wait_all (poller, NULL, 0, 0));
-#endif
-}
-
-#define TEST_CASE_FUNC_PARAM(name, func)                                       \
-    void test_##name () { func (name); }
-
-TEST_CASE_FUNC_PARAM (call_poller_wait_null_event_fails, test_with_valid_poller)
-TEST_CASE_FUNC_PARAM (call_poller_wait_all_null_event_fails_event_count_nonzero,
-                      test_with_valid_poller)
-TEST_CASE_FUNC_PARAM (call_poller_wait_all_null_event_fails_event_count_zero,
-                      test_with_valid_poller)
-
-void call_poller_size (void *poller_, void *socket_)
-{
-    int rc = zmq_poller_size (poller_);
-    TEST_ASSERT_SUCCESS_ERRNO (rc);
-    TEST_ASSERT_EQUAL (rc, 0);
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_poller_add (poller_, socket_, NULL, ZMQ_POLLIN));
-    rc = zmq_poller_size (poller_);
-    TEST_ASSERT_SUCCESS_ERRNO (rc);
-    TEST_ASSERT_EQUAL (rc, 1);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_poller_modify (poller_, socket_, 0));
-    rc = zmq_poller_size (poller_);
-    TEST_ASSERT_SUCCESS_ERRNO (rc);
-    TEST_ASSERT_EQUAL (rc, 1);
-
-    fd_t plain_socket = socket (AF_INET, SOCK_STREAM, IPPROTO_TCP);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_poller_add_fd (poller_, plain_socket, NULL, ZMQ_POLLOUT));
-    rc = zmq_poller_size (poller_);
-    TEST_ASSERT_SUCCESS_ERRNO (rc);
-    TEST_ASSERT_EQUAL (rc, 2);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_poller_remove (poller_, socket_));
-    rc = zmq_poller_size (poller_);
-    TEST_ASSERT_SUCCESS_ERRNO (rc);
-    TEST_ASSERT_EQUAL (rc, 1);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_poller_remove_fd (poller_, plain_socket));
-    TEST_ASSERT_SUCCESS_ERRNO (close (plain_socket));
-    rc = zmq_poller_size (poller_);
-    TEST_ASSERT_SUCCESS_ERRNO (rc);
-    TEST_ASSERT_EQUAL (rc, 0);
-}
-
-void call_poller_add_twice_fails (void *poller_, void *socket_)
-{
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_poller_add (poller_, socket_, NULL, ZMQ_POLLIN));
-
-    //  attempt to add the same socket twice
-    TEST_ASSERT_FAILURE_ERRNO (
-      EINVAL, zmq_poller_add (poller_, socket_, NULL, ZMQ_POLLIN));
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_poller_remove (poller_, socket_));
-}
-
-void call_poller_remove_unregistered_fails (void *poller_, void *socket_)
-{
-    //  attempt to remove socket that is not present
-    TEST_ASSERT_FAILURE_ERRNO (EINVAL, zmq_poller_remove (poller_, socket_));
-}
-
-void call_poller_modify_unregistered_fails (void *poller_, void *socket_)
-{
-    //  attempt to modify socket that is not present
-    TEST_ASSERT_FAILURE_ERRNO (
-      EINVAL, zmq_poller_modify (poller_, socket_, ZMQ_POLLIN));
-}
-
-void call_poller_add_no_events (void *poller_, void *socket_)
-{
-    //  add a socket with no events initially (may be activated later with
-    //  zmq_poller_modify)
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_poller_add (poller_, socket_, NULL, 0));
-    //  TODO test that no events are signalled
-}
-
-void call_poller_modify_no_events (void *poller_, void *socket_)
-{
-    //  deactivates all events for a socket temporarily (may be activated again
-    //  later with zmq_poller_modify)
-    zmq_poller_add (poller_, socket_, NULL, ZMQ_POLLIN);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_poller_modify (poller_, socket_, 0));
-    //  TODO test that no events are signalled
-}
-
-void call_poller_add_fd_twice_fails (void *poller_, void * /*zeromq_socket*/)
-{
-    fd_t plain_socket = socket (AF_INET, SOCK_STREAM, IPPROTO_TCP);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_poller_add_fd (poller_, plain_socket, NULL, ZMQ_POLLIN));
-
-    //  attempt to add the same plain socket twice
-    TEST_ASSERT_FAILURE_ERRNO (
-      EINVAL, zmq_poller_add_fd (poller_, plain_socket, NULL, ZMQ_POLLIN));
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_poller_remove_fd (poller_, plain_socket));
-
-    TEST_ASSERT_SUCCESS_ERRNO (close (plain_socket));
-}
-
-void call_poller_remove_fd_unregistered_fails (void *poller_,
-                                               void * /*zeromq_socket*/)
-{
-    fd_t plain_socket = socket (AF_INET, SOCK_STREAM, IPPROTO_TCP);
-
-    //  attempt to remove plain socket that is not present
-    TEST_ASSERT_FAILURE_ERRNO (EINVAL,
-                               zmq_poller_remove_fd (poller_, plain_socket));
-
-    TEST_ASSERT_SUCCESS_ERRNO (close (plain_socket));
-}
-
-void call_poller_modify_fd_unregistered_fails (void *poller_,
-                                               void * /*zeromq_socket*/)
-{
-    fd_t plain_socket = socket (AF_INET, SOCK_STREAM, IPPROTO_TCP);
-
-    //  attempt to remove plain socket that is not present
-    TEST_ASSERT_FAILURE_ERRNO (
-      EINVAL, zmq_poller_modify_fd (poller_, plain_socket, ZMQ_POLLIN));
-
-    TEST_ASSERT_SUCCESS_ERRNO (close (plain_socket));
-}
-
-void call_poller_add_invalid_events_fails (void *poller_, void *zeromq_socket_)
-{
-    TEST_ASSERT_FAILURE_ERRNO (
-      EINVAL, zmq_poller_add (poller_, zeromq_socket_, NULL, SHRT_MAX));
-}
-
-void call_poller_modify_invalid_events_fails (void *poller_,
-                                              void *zeromq_socket_)
-{
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_poller_add (poller_, zeromq_socket_, NULL, 0));
-
-    TEST_ASSERT_FAILURE_ERRNO (
-      EINVAL, zmq_poller_modify (poller_, zeromq_socket_, SHRT_MAX));
-}
-
-void call_poller_add_fd_invalid_events_fails (void *poller_,
-                                              void * /*zeromq_socket*/)
-{
-    fd_t plain_socket = socket (AF_INET, SOCK_STREAM, IPPROTO_TCP);
-    TEST_ASSERT_FAILURE_ERRNO (
-      EINVAL, zmq_poller_add_fd (poller_, plain_socket, NULL, SHRT_MAX));
-
-    TEST_ASSERT_SUCCESS_ERRNO (close (plain_socket));
-}
-
-void call_poller_modify_fd_invalid_events_fails (void *poller_,
-                                                 void * /*zeromq_socket*/)
-{
-    fd_t plain_socket = socket (AF_INET, SOCK_STREAM, IPPROTO_TCP);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_poller_add_fd (poller_, plain_socket, NULL, 0));
-    TEST_ASSERT_FAILURE_ERRNO (
-      EINVAL, zmq_poller_modify_fd (poller_, plain_socket, SHRT_MAX));
-
-    TEST_ASSERT_SUCCESS_ERRNO (close (plain_socket));
-}
-
-TEST_CASE_FUNC_PARAM (call_poller_size, test_with_empty_poller)
-TEST_CASE_FUNC_PARAM (call_poller_add_twice_fails, test_with_empty_poller)
-TEST_CASE_FUNC_PARAM (call_poller_remove_unregistered_fails,
-                      test_with_empty_poller)
-TEST_CASE_FUNC_PARAM (call_poller_modify_unregistered_fails,
-                      test_with_empty_poller)
-TEST_CASE_FUNC_PARAM (call_poller_add_no_events, test_with_empty_poller)
-TEST_CASE_FUNC_PARAM (call_poller_modify_no_events, test_with_empty_poller)
-TEST_CASE_FUNC_PARAM (call_poller_add_fd_twice_fails, test_with_empty_poller)
-TEST_CASE_FUNC_PARAM (call_poller_remove_fd_unregistered_fails,
-                      test_with_empty_poller)
-TEST_CASE_FUNC_PARAM (call_poller_modify_fd_unregistered_fails,
-                      test_with_empty_poller)
-
-TEST_CASE_FUNC_PARAM (call_poller_add_invalid_events_fails,
-                      test_with_empty_poller)
-TEST_CASE_FUNC_PARAM (call_poller_modify_invalid_events_fails,
-                      test_with_empty_poller)
-TEST_CASE_FUNC_PARAM (call_poller_add_fd_invalid_events_fails,
-                      test_with_empty_poller)
-TEST_CASE_FUNC_PARAM (call_poller_modify_fd_invalid_events_fails,
-                      test_with_empty_poller)
-
-void call_poller_wait_empty_with_timeout_fails (void *poller_,
-                                                void * /*socket*/)
-{
-    zmq_poller_event_t event;
-    // waiting on poller with no registered sockets should report error
-    TEST_ASSERT_FAILURE_ERRNO (EAGAIN, zmq_poller_wait (poller_, &event, 0));
-}
-
-void call_poller_wait_empty_without_timeout_fails (void *poller_,
-                                                   void * /*socket*/)
-{
-    zmq_poller_event_t event;
-    //  this would never be able to return since no socket was registered, and should yield an error
-    TEST_ASSERT_FAILURE_ERRNO (EFAULT, zmq_poller_wait (poller_, &event, -1));
-}
-
-void call_poller_wait_all_empty_negative_count_fails (void *poller_,
-                                                      void * /*socket*/)
-{
-    zmq_poller_event_t event;
-    TEST_ASSERT_FAILURE_ERRNO (EINVAL,
-                               zmq_poller_wait_all (poller_, &event, -1, 0));
-}
-
-void call_poller_wait_all_empty_without_timeout_fails (void *poller_,
-                                                       void * /*socket*/)
-{
-    zmq_poller_event_t event;
-    TEST_ASSERT_FAILURE_ERRNO (EAGAIN,
-                               zmq_poller_wait_all (poller_, &event, 0, 0));
-}
-
-void call_poller_wait_all_empty_with_timeout_fails (void *poller_,
-                                                    void * /*socket*/)
-{
-    zmq_poller_event_t event;
-    //  this would never be able to return since no socket was registered, and should yield an error
-    TEST_ASSERT_FAILURE_ERRNO (EFAULT,
-                               zmq_poller_wait_all (poller_, &event, 0, -1));
-}
-
-void call_poller_wait_all_inf_disabled_fails (void *poller_, void *socket_)
-{
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_poller_add (poller_, socket_, NULL, 0));
-
-    zmq_poller_event_t events[1];
-    TEST_ASSERT_FAILURE_ERRNO (EAGAIN,
-                               zmq_poller_wait_all (poller_, events, 1, 0));
-    TEST_ASSERT_FAILURE_ERRNO (EFAULT,
-                               zmq_poller_wait_all (poller_, events, 1, -1));
-}
-
-TEST_CASE_FUNC_PARAM (call_poller_wait_empty_with_timeout_fails,
-                      test_with_empty_poller)
-TEST_CASE_FUNC_PARAM (call_poller_wait_empty_without_timeout_fails,
-                      test_with_empty_poller)
-TEST_CASE_FUNC_PARAM (call_poller_wait_all_empty_negative_count_fails,
-                      test_with_empty_poller)
-TEST_CASE_FUNC_PARAM (call_poller_wait_all_empty_without_timeout_fails,
-                      test_with_empty_poller)
-TEST_CASE_FUNC_PARAM (call_poller_wait_all_empty_with_timeout_fails,
-                      test_with_empty_poller)
-TEST_CASE_FUNC_PARAM (call_poller_wait_all_inf_disabled_fails,
-                      test_with_empty_poller)
-
-void test_poll_basic ()
-{
-    //  Create few sockets
-    void *vent = test_context_socket (ZMQ_PUSH);
-
-    size_t len = MAX_SOCKET_STRING;
-    char my_endpoint[MAX_SOCKET_STRING];
-    bind_loopback_ipv4 (vent, my_endpoint, len);
-
-    void *sink = test_context_socket (ZMQ_PULL);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sink, my_endpoint));
-
-    //  Set up poller
-    void *poller = zmq_poller_new ();
-
-    // register sink
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_poller_add (poller, sink, sink, ZMQ_POLLIN));
-
-    //  Send a message
-    const char *vent_sink_msg = "H";
-    send_string_expect_success (vent, vent_sink_msg, 0);
-
-    //  We expect a message only on the sink
-    zmq_poller_event_t event;
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_poller_wait (poller, &event, -1));
-    TEST_ASSERT_EQUAL_PTR (sink, event.socket);
-    TEST_ASSERT_EQUAL_PTR (sink, event.user_data);
-    recv_string_expect_success (sink, vent_sink_msg, 0);
-
-    //  We expect timed out
-    TEST_ASSERT_FAILURE_ERRNO (EAGAIN, zmq_poller_wait (poller, &event, 0));
-
-    //  Stop polling sink
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_poller_remove (poller, sink));
-
-    //  Clean up
-    test_context_socket_close (vent);
-    test_context_socket_close (sink);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_poller_destroy (&poller));
-}
-
-void test_poll_fd ()
-{
-    //  Create sockets
-    void *vent = test_context_socket (ZMQ_PUSH);
-
-    size_t len = MAX_SOCKET_STRING;
-    char my_endpoint[MAX_SOCKET_STRING];
-    bind_loopback_ipv4 (vent, my_endpoint, len);
-
-    void *bowl = test_context_socket (ZMQ_PULL);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (bowl, my_endpoint));
-
-    //  Set up poller
-    void *poller = zmq_poller_new ();
-
-    //  Check we can poll an FD
-    const fd_t fd = get_fd (bowl);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_poller_add_fd (poller, fd, bowl, ZMQ_POLLIN));
-
-    zmq_poller_event_t event;
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_poller_wait (poller, &event, 500));
-    TEST_ASSERT_NULL (event.socket);
-    TEST_ASSERT_EQUAL (fd, event.fd);
-    TEST_ASSERT_EQUAL_PTR (bowl, event.user_data);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_poller_remove_fd (poller, fd));
-
-    //  Clean up
-    test_context_socket_close (vent);
-    test_context_socket_close (bowl);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_poller_destroy (&poller));
-}
-
-void test_poll_client_server ()
-{
-#if defined(ZMQ_SERVER) && defined(ZMQ_CLIENT)
-    //  Create sockets
-    void *server = test_context_socket (ZMQ_SERVER);
-
-    size_t len = MAX_SOCKET_STRING;
-    char my_endpoint[MAX_SOCKET_STRING];
-    bind_loopback_ipv4 (server, my_endpoint, len);
-
-    void *client = test_context_socket (ZMQ_CLIENT);
-
-    //  Set up poller
-    void *poller = zmq_poller_new ();
-
-    //  Polling on thread safe sockets
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_poller_add (poller, server, NULL, ZMQ_POLLIN));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (client, my_endpoint));
-
-    const char *client_server_msg = "I";
-    send_string_expect_success (client, client_server_msg, 0);
-
-    zmq_poller_event_t event;
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_poller_wait (poller, &event, 500));
-    TEST_ASSERT_EQUAL_PTR (server, event.socket);
-    TEST_ASSERT_NULL (event.user_data);
-#ifndef _WIN32
-    TEST_ASSERT (event.fd == -1);
-#endif
-    recv_string_expect_success (server, client_server_msg, 0);
-
-    //  Polling on pollout
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_poller_modify (poller, server, ZMQ_POLLOUT | ZMQ_POLLIN));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_poller_wait (poller, &event, 0));
-    TEST_ASSERT_EQUAL_PTR (server, event.socket);
-    TEST_ASSERT_NULL (event.user_data);
-#ifndef _WIN32
-    TEST_ASSERT (event.fd == -1);
-#endif
-    TEST_ASSERT_EQUAL_INT (ZMQ_POLLOUT, event.events);
-
-    //  Stop polling server
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_poller_remove (poller, server));
-
-    //  Clean up
-    test_context_socket_close (server);
-    test_context_socket_close (client);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_poller_destroy (&poller));
-#endif
-}
-
-int main (void)
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_null_poller_pointers_destroy_direct);
-    RUN_TEST (test_null_poller_pointers_destroy_indirect);
-    RUN_TEST (test_null_poller_pointers_size_direct);
-    RUN_TEST (test_null_poller_pointers_size_indirect);
-    RUN_TEST (test_null_poller_pointers_add_direct);
-    RUN_TEST (test_null_poller_pointers_add_indirect);
-    RUN_TEST (test_null_poller_pointers_modify_direct);
-    RUN_TEST (test_null_poller_pointers_modify_indirect);
-    RUN_TEST (test_null_poller_pointers_remove_direct);
-    RUN_TEST (test_null_poller_pointers_remove_indirect);
-    RUN_TEST (test_null_poller_pointers_add_fd_direct);
-    RUN_TEST (test_null_poller_pointers_add_fd_indirect);
-    RUN_TEST (test_null_poller_pointers_modify_fd_direct);
-    RUN_TEST (test_null_poller_pointers_modify_fd_indirect);
-    RUN_TEST (test_null_poller_pointers_remove_fd_direct);
-    RUN_TEST (test_null_poller_pointers_remove_fd_indirect);
-    RUN_TEST (test_null_poller_pointers_wait_direct);
-    RUN_TEST (test_null_poller_pointers_wait_indirect);
-    RUN_TEST (test_null_poller_pointers_wait_all_direct);
-    RUN_TEST (test_null_poller_pointers_wait_all_indirect);
-    RUN_TEST (test_null_poller_pointer_poller_fd);
-
-    RUN_TEST (test_null_socket_pointers);
-
-    RUN_TEST (test_call_poller_wait_null_event_fails);
-    RUN_TEST (test_call_poller_wait_all_null_event_fails_event_count_nonzero);
-    RUN_TEST (test_call_poller_wait_all_null_event_fails_event_count_zero);
-
-    RUN_TEST (test_call_poller_size);
-    RUN_TEST (test_call_poller_add_twice_fails);
-    RUN_TEST (test_call_poller_remove_unregistered_fails);
-    RUN_TEST (test_call_poller_modify_unregistered_fails);
-    RUN_TEST (test_call_poller_add_no_events);
-    RUN_TEST (test_call_poller_modify_no_events);
-    RUN_TEST (test_call_poller_add_fd_twice_fails);
-    RUN_TEST (test_call_poller_remove_fd_unregistered_fails);
-    RUN_TEST (test_call_poller_modify_fd_unregistered_fails);
-    RUN_TEST (test_call_poller_add_invalid_events_fails);
-    RUN_TEST (test_call_poller_modify_invalid_events_fails);
-    RUN_TEST (test_call_poller_add_fd_invalid_events_fails);
-    RUN_TEST (test_call_poller_modify_fd_invalid_events_fails);
-
-    RUN_TEST (test_call_poller_wait_empty_with_timeout_fails);
-    RUN_TEST (test_call_poller_wait_empty_without_timeout_fails);
-    RUN_TEST (test_call_poller_wait_all_empty_negative_count_fails);
-    RUN_TEST (test_call_poller_wait_all_empty_without_timeout_fails);
-    RUN_TEST (test_call_poller_wait_all_empty_with_timeout_fails);
-    RUN_TEST (test_call_poller_wait_all_inf_disabled_fails);
-
-    RUN_TEST (test_call_poller_fd_no_signaler);
-    RUN_TEST (test_call_poller_fd);
-
-    RUN_TEST (test_poll_basic);
-    RUN_TEST (test_poll_fd);
-    RUN_TEST (test_poll_client_server);
-
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_probe_router.cpp b/libs/libzmq/tests/test_probe_router.cpp
deleted file mode 100644
index 14e68e3..0000000
--- a/libs/libzmq/tests/test_probe_router.cpp
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void test_probe_router_router ()
-{
-    //  Create server and bind to endpoint
-    void *server = test_context_socket (ZMQ_ROUTER);
-
-    char my_endpoint[MAX_SOCKET_STRING];
-    bind_loopback_ipv4 (server, my_endpoint, sizeof (my_endpoint));
-
-    //  Create client and connect to server, doing a probe
-    void *client = test_context_socket (ZMQ_ROUTER);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (client, ZMQ_ROUTING_ID, "X", 1));
-    int probe = 1;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (client, ZMQ_PROBE_ROUTER, &probe, sizeof (probe)));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (client, my_endpoint));
-
-    //  We expect a routing id=X + empty message from client
-    recv_string_expect_success (server, "X", 0);
-    unsigned char buffer[255];
-    TEST_ASSERT_EQUAL_INT (
-      0, TEST_ASSERT_SUCCESS_ERRNO (zmq_recv (server, buffer, 255, 0)));
-
-    //  Send a message to client now
-    send_string_expect_success (server, "X", ZMQ_SNDMORE);
-    send_string_expect_success (server, "Hello", 0);
-
-    // receive the routing ID, which is auto-generated in this case, since the
-    // peer did not set one explicitly
-    TEST_ASSERT_EQUAL_INT (
-      5, TEST_ASSERT_SUCCESS_ERRNO (zmq_recv (client, buffer, 255, 0)));
-
-    recv_string_expect_success (client, "Hello", 0);
-
-    test_context_socket_close (server);
-    test_context_socket_close (client);
-}
-
-void test_probe_router_dealer ()
-{
-    //  Create server and bind to endpoint
-    void *server = test_context_socket (ZMQ_ROUTER);
-
-    char my_endpoint[MAX_SOCKET_STRING];
-    bind_loopback_ipv4 (server, my_endpoint, sizeof (my_endpoint));
-
-    //  Create client and connect to server, doing a probe
-    void *client = test_context_socket (ZMQ_DEALER);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (client, ZMQ_ROUTING_ID, "X", 1));
-    int probe = 1;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (client, ZMQ_PROBE_ROUTER, &probe, sizeof (probe)));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (client, my_endpoint));
-
-    //  We expect a routing id=X + empty message from client
-    recv_string_expect_success (server, "X", 0);
-    unsigned char buffer[255];
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_recv (server, buffer, 255, 0));
-
-    //  Send a message to client now
-    send_string_expect_success (server, "X", ZMQ_SNDMORE);
-    send_string_expect_success (server, "Hello", 0);
-
-    recv_string_expect_success (client, "Hello", 0);
-
-    test_context_socket_close (server);
-    test_context_socket_close (client);
-}
-
-int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-
-    RUN_TEST (test_probe_router_router);
-    RUN_TEST (test_probe_router_dealer);
-
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_proxy.cpp b/libs/libzmq/tests/test_proxy.cpp
deleted file mode 100644
index 5666721..0000000
--- a/libs/libzmq/tests/test_proxy.cpp
+++ /dev/null
@@ -1,470 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-#include <stdlib.h>
-#include <string.h>
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-#define CONTENT_SIZE 13
-#define CONTENT_SIZE_MAX 32
-#define ROUTING_ID_SIZE 10
-#define ROUTING_ID_SIZE_MAX 32
-#define QT_WORKERS 5
-#define QT_CLIENTS 3
-#define is_verbose 0
-
-struct thread_data
-{
-    int id;
-};
-
-typedef struct
-{
-    uint64_t msg_in;
-    uint64_t bytes_in;
-    uint64_t msg_out;
-    uint64_t bytes_out;
-} zmq_socket_stats_t;
-
-typedef struct
-{
-    zmq_socket_stats_t frontend;
-    zmq_socket_stats_t backend;
-} zmq_proxy_stats_t;
-
-void *g_clients_pkts_out = NULL;
-void *g_workers_pkts_out = NULL;
-
-// Asynchronous client-to-server (DEALER to ROUTER) - pure libzmq
-//
-// While this example runs in a single process, that is to make
-// it easier to start and stop the example. Each task may have its own
-// context and conceptually acts as a separate process. To have this
-// behaviour, it is necessary to replace the inproc transport of the
-// control socket by a tcp transport.
-
-// This is our client task
-// It connects to the server, and then sends a request once per second
-// It collects responses as they arrive, and it prints them out. We will
-// run several client tasks in parallel, each with a different random ID.
-
-static void client_task (void *db_)
-{
-    const thread_data *const databag = static_cast<const thread_data *> (db_);
-    // Endpoint socket gets random port to avoid test failing when port in use
-    void *endpoint = zmq_socket (get_test_context (), ZMQ_PAIR);
-    TEST_ASSERT_NOT_NULL (endpoint);
-    int linger = 0;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (endpoint, ZMQ_LINGER, &linger, sizeof (linger)));
-    char endpoint_source[256];
-    sprintf (endpoint_source, "inproc://endpoint%d", databag->id);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (endpoint, endpoint_source));
-    char *my_endpoint = s_recv (endpoint);
-    TEST_ASSERT_NOT_NULL (my_endpoint);
-
-    void *client = zmq_socket (get_test_context (), ZMQ_DEALER);
-    TEST_ASSERT_NOT_NULL (client);
-
-    // Control socket receives terminate command from main over inproc
-    void *control = zmq_socket (get_test_context (), ZMQ_SUB);
-    TEST_ASSERT_NOT_NULL (control);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (control, ZMQ_SUBSCRIBE, "", 0));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (control, ZMQ_LINGER, &linger, sizeof (linger)));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (control, "inproc://control"));
-
-    char content[CONTENT_SIZE_MAX] = {};
-    // Set random routing id to make tracing easier
-    char routing_id[ROUTING_ID_SIZE] = {};
-    sprintf (routing_id, "%04X-%04X", rand () % 0xFFFF, rand () % 0xFFFF);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (
-      client, ZMQ_ROUTING_ID, routing_id,
-      ROUTING_ID_SIZE)); // includes '\0' as an helper for printf
-    linger = 0;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (client, ZMQ_LINGER, &linger, sizeof (linger)));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (client, my_endpoint));
-
-    zmq_pollitem_t items[] = {{client, 0, ZMQ_POLLIN, 0},
-                              {control, 0, ZMQ_POLLIN, 0}};
-    int request_nbr = 0;
-    bool run = true;
-    bool keep_sending = true;
-    while (run) {
-        // Tick once per 200 ms, pulling in arriving messages
-        int centitick;
-        for (centitick = 0; centitick < 20; centitick++) {
-            zmq_poll (items, 2, 10);
-            if (items[0].revents & ZMQ_POLLIN) {
-                int rcvmore;
-                size_t sz = sizeof (rcvmore);
-                int rc = TEST_ASSERT_SUCCESS_ERRNO (
-                  zmq_recv (client, content, CONTENT_SIZE_MAX, 0));
-                TEST_ASSERT_EQUAL_INT (CONTENT_SIZE, rc);
-                if (is_verbose)
-                    printf (
-                      "client receive - routing_id = %s    content = %s\n",
-                      routing_id, content);
-                //  Check that message is still the same
-                TEST_ASSERT_EQUAL_STRING_LEN ("request #", content, 9);
-                TEST_ASSERT_SUCCESS_ERRNO (
-                  zmq_getsockopt (client, ZMQ_RCVMORE, &rcvmore, &sz));
-                TEST_ASSERT_FALSE (rcvmore);
-            }
-            if (items[1].revents & ZMQ_POLLIN) {
-                int rc = zmq_recv (control, content, CONTENT_SIZE_MAX, 0);
-
-                if (rc > 0) {
-                    content[rc] = 0; // NULL-terminate the command string
-                    if (is_verbose)
-                        printf (
-                          "client receive - routing_id = %s    command = %s\n",
-                          routing_id, content);
-                    if (memcmp (content, "TERMINATE", 9) == 0) {
-                        run = false;
-                        break;
-                    }
-                    if (memcmp (content, "STOP", 4) == 0) {
-                        keep_sending = false;
-                        break;
-                    }
-                }
-            }
-        }
-
-        if (keep_sending) {
-            sprintf (content, "request #%03d", ++request_nbr); // CONTENT_SIZE
-            if (is_verbose)
-                printf ("client send - routing_id = %s    request #%03d\n",
-                        routing_id, request_nbr);
-            zmq_atomic_counter_inc (g_clients_pkts_out);
-
-            TEST_ASSERT_EQUAL_INT (CONTENT_SIZE,
-                                   zmq_send (client, content, CONTENT_SIZE, 0));
-        }
-    }
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_close (client));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_close (control));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_close (endpoint));
-    free (my_endpoint);
-}
-
-// This is our server task.
-// It uses the multithreaded server model to deal requests out to a pool
-// of workers and route replies back to clients. One worker can handle
-// one request at a time but one client can talk to multiple workers at
-// once.
-
-static void server_worker (void * /*unused_*/);
-
-void server_task (void * /*unused_*/)
-{
-    // Frontend socket talks to clients over TCP
-    char my_endpoint[MAX_SOCKET_STRING];
-    void *frontend = zmq_socket (get_test_context (), ZMQ_ROUTER);
-    TEST_ASSERT_NOT_NULL (frontend);
-    int linger = 0;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (frontend, ZMQ_LINGER, &linger, sizeof (linger)));
-    bind_loopback_ipv4 (frontend, my_endpoint, sizeof my_endpoint);
-
-    // Backend socket talks to workers over inproc
-    void *backend = zmq_socket (get_test_context (), ZMQ_DEALER);
-    TEST_ASSERT_NOT_NULL (backend);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (backend, ZMQ_LINGER, &linger, sizeof (linger)));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (backend, "inproc://backend"));
-
-    // Control socket receives terminate command from main over inproc
-    void *control = zmq_socket (get_test_context (), ZMQ_REP);
-    TEST_ASSERT_NOT_NULL (control);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (control, ZMQ_LINGER, &linger, sizeof (linger)));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (control, "inproc://control_proxy"));
-
-    // Launch pool of worker threads, precise number is not critical
-    int thread_nbr;
-    void *threads[5];
-    for (thread_nbr = 0; thread_nbr < QT_WORKERS; thread_nbr++)
-        threads[thread_nbr] = zmq_threadstart (&server_worker, NULL);
-
-    // Endpoint socket sends random port to avoid test failing when port in use
-    void *endpoint_receivers[QT_CLIENTS];
-    char endpoint_source[256];
-    for (int i = 0; i < QT_CLIENTS; ++i) {
-        endpoint_receivers[i] = zmq_socket (get_test_context (), ZMQ_PAIR);
-        TEST_ASSERT_NOT_NULL (endpoint_receivers[i]);
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (
-          endpoint_receivers[i], ZMQ_LINGER, &linger, sizeof (linger)));
-        sprintf (endpoint_source, "inproc://endpoint%d", i);
-        TEST_ASSERT_SUCCESS_ERRNO (
-          zmq_bind (endpoint_receivers[i], endpoint_source));
-    }
-
-    for (int i = 0; i < QT_CLIENTS; ++i) {
-        send_string_expect_success (endpoint_receivers[i], my_endpoint, 0);
-    }
-
-    // Connect backend to frontend via a proxy
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_proxy_steerable (frontend, backend, NULL, control));
-
-    for (thread_nbr = 0; thread_nbr < QT_WORKERS; thread_nbr++)
-        zmq_threadclose (threads[thread_nbr]);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_close (frontend));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_close (backend));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_close (control));
-    for (int i = 0; i < QT_CLIENTS; ++i) {
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_close (endpoint_receivers[i]));
-    }
-}
-
-// Each worker task works on one request at a time and sends a random number
-// of replies back, with random delays between replies:
-// The comments in the first column, if suppressed, makes it a poller version
-
-static void server_worker (void * /*unused_*/)
-{
-    void *worker = zmq_socket (get_test_context (), ZMQ_DEALER);
-    TEST_ASSERT_NOT_NULL (worker);
-    int linger = 0;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (worker, ZMQ_LINGER, &linger, sizeof (linger)));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (worker, "inproc://backend"));
-
-    // Control socket receives terminate command from main over inproc
-    void *control = zmq_socket (get_test_context (), ZMQ_SUB);
-    TEST_ASSERT_NOT_NULL (control);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (control, ZMQ_SUBSCRIBE, "", 0));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (control, ZMQ_LINGER, &linger, sizeof (linger)));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (control, "inproc://control"));
-
-    char content[CONTENT_SIZE_MAX] =
-      {}; // bigger than what we need to check that
-    char routing_id[ROUTING_ID_SIZE_MAX] =
-      {}; // the size received is the size sent
-
-    bool run = true;
-    bool keep_sending = true;
-    while (run) {
-        int rc = zmq_recv (control, content, CONTENT_SIZE_MAX,
-                           ZMQ_DONTWAIT); // usually, rc == -1 (no message)
-        if (rc > 0) {
-            content[rc] = 0; // NULL-terminate the command string
-            if (is_verbose)
-                printf ("server_worker receives command = %s\n", content);
-            if (memcmp (content, "TERMINATE", 9) == 0)
-                run = false;
-            if (memcmp (content, "STOP", 4) == 0)
-                keep_sending = false;
-        }
-        // The DEALER socket gives us the reply envelope and message
-        // if we don't poll, we have to use ZMQ_DONTWAIT, if we poll, we can block-receive with 0
-        rc = zmq_recv (worker, routing_id, ROUTING_ID_SIZE_MAX, ZMQ_DONTWAIT);
-        if (rc == ROUTING_ID_SIZE) {
-            rc = zmq_recv (worker, content, CONTENT_SIZE_MAX, 0);
-            TEST_ASSERT_EQUAL_INT (CONTENT_SIZE, rc);
-            if (is_verbose)
-                printf ("server receive - routing_id = %s    content = %s\n",
-                        routing_id, content);
-
-            // Send 0..4 replies back
-            if (keep_sending) {
-                int reply, replies = rand () % 5;
-                for (reply = 0; reply < replies; reply++) {
-                    // Sleep for some fraction of a second
-                    msleep (rand () % 10 + 1);
-
-                    //  Send message from server to client
-                    if (is_verbose)
-                        printf ("server send - routing_id = %s    reply\n",
-                                routing_id);
-                    zmq_atomic_counter_inc (g_workers_pkts_out);
-
-                    rc = zmq_send (worker, routing_id, ROUTING_ID_SIZE,
-                                   ZMQ_SNDMORE);
-                    TEST_ASSERT_EQUAL_INT (ROUTING_ID_SIZE, rc);
-                    rc = zmq_send (worker, content, CONTENT_SIZE, 0);
-                    TEST_ASSERT_EQUAL_INT (CONTENT_SIZE, rc);
-                }
-            }
-        }
-    }
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_close (worker));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_close (control));
-}
-
-uint64_t recv_stat (void *sock_, bool last_)
-{
-    uint64_t res;
-    zmq_msg_t stats_msg;
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init (&stats_msg));
-    TEST_ASSERT_EQUAL_INT (sizeof (uint64_t),
-                           zmq_recvmsg (sock_, &stats_msg, 0));
-    memcpy (&res, zmq_msg_data (&stats_msg), zmq_msg_size (&stats_msg));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&stats_msg));
-
-    int more;
-    size_t moresz = sizeof more;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (sock_, ZMQ_RCVMORE, &more, &moresz));
-    TEST_ASSERT_TRUE ((last_ && !more) || (!last_ && more));
-
-    return res;
-}
-
-// Utility function to interrogate the proxy:
-
-void check_proxy_stats (void *control_proxy_)
-{
-    zmq_proxy_stats_t total_stats;
-
-    send_string_expect_success (control_proxy_, "STATISTICS", 0);
-
-    // first frame of the reply contains FRONTEND stats:
-    total_stats.frontend.msg_in = recv_stat (control_proxy_, false);
-    total_stats.frontend.bytes_in = recv_stat (control_proxy_, false);
-    total_stats.frontend.msg_out = recv_stat (control_proxy_, false);
-    total_stats.frontend.bytes_out = recv_stat (control_proxy_, false);
-
-    // second frame of the reply contains BACKEND stats:
-    total_stats.backend.msg_in = recv_stat (control_proxy_, false);
-    total_stats.backend.bytes_in = recv_stat (control_proxy_, false);
-    total_stats.backend.msg_out = recv_stat (control_proxy_, false);
-    total_stats.backend.bytes_out = recv_stat (control_proxy_, true);
-
-    // check stats
-
-    if (is_verbose) {
-        printf (
-          "frontend: pkts_in=%lu bytes_in=%lu  pkts_out=%lu bytes_out=%lu\n",
-          static_cast<unsigned long int> (total_stats.frontend.msg_in),
-          static_cast<unsigned long int> (total_stats.frontend.bytes_in),
-          static_cast<unsigned long int> (total_stats.frontend.msg_out),
-          static_cast<unsigned long int> (total_stats.frontend.bytes_out));
-        printf (
-          "backend: pkts_in=%lu bytes_in=%lu  pkts_out=%lu bytes_out=%lu\n",
-          static_cast<unsigned long int> (total_stats.backend.msg_in),
-          static_cast<unsigned long int> (total_stats.backend.bytes_in),
-          static_cast<unsigned long int> (total_stats.backend.msg_out),
-          static_cast<unsigned long int> (total_stats.backend.bytes_out));
-
-        printf ("clients sent out %d requests\n",
-                zmq_atomic_counter_value (g_clients_pkts_out));
-        printf ("workers sent out %d replies\n",
-                zmq_atomic_counter_value (g_workers_pkts_out));
-    }
-    TEST_ASSERT_EQUAL_UINT (
-      (unsigned) zmq_atomic_counter_value (g_clients_pkts_out),
-      total_stats.frontend.msg_in);
-    TEST_ASSERT_EQUAL_UINT (
-      (unsigned) zmq_atomic_counter_value (g_workers_pkts_out),
-      total_stats.frontend.msg_out);
-    TEST_ASSERT_EQUAL_UINT (
-      (unsigned) zmq_atomic_counter_value (g_workers_pkts_out),
-      total_stats.backend.msg_in);
-    TEST_ASSERT_EQUAL_UINT (
-      (unsigned) zmq_atomic_counter_value (g_clients_pkts_out),
-      total_stats.backend.msg_out);
-}
-
-
-// The main thread simply starts several clients and a server, and then
-// waits for the server to finish.
-
-void test_proxy ()
-{
-    g_clients_pkts_out = zmq_atomic_counter_new ();
-    g_workers_pkts_out = zmq_atomic_counter_new ();
-
-    // Control socket receives terminate command from main over inproc
-    void *control = test_context_socket (ZMQ_PUB);
-    int linger = 0;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (control, ZMQ_LINGER, &linger, sizeof (linger)));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (control, "inproc://control"));
-
-    // Control socket receives terminate command from main over inproc
-    void *control_proxy = test_context_socket (ZMQ_REQ);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (control_proxy, ZMQ_LINGER, &linger, sizeof (linger)));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_bind (control_proxy, "inproc://control_proxy"));
-
-    void *threads[QT_CLIENTS + 1];
-    struct thread_data databags[QT_CLIENTS + 1];
-    for (int i = 0; i < QT_CLIENTS; i++) {
-        databags[i].id = i;
-        threads[i] = zmq_threadstart (&client_task, &databags[i]);
-    }
-    threads[QT_CLIENTS] = zmq_threadstart (&server_task, NULL);
-    msleep (500); // Run for 500 ms then quit
-
-    if (is_verbose)
-        printf ("stopping all clients and server workers\n");
-    send_string_expect_success (control, "STOP", 0);
-
-    msleep (500); // Wait for all clients and workers to STOP
-
-    if (is_verbose)
-        printf ("retrieving stats from the proxy\n");
-    check_proxy_stats (control_proxy);
-
-    if (is_verbose)
-        printf ("shutting down all clients and server workers\n");
-    send_string_expect_success (control, "TERMINATE", 0);
-
-    if (is_verbose)
-        printf ("shutting down the proxy\n");
-    send_string_expect_success (control_proxy, "TERMINATE", 0);
-
-    test_context_socket_close (control);
-    test_context_socket_close (control_proxy);
-
-    for (int i = 0; i < QT_CLIENTS + 1; i++)
-        zmq_threadclose (threads[i]);
-}
-
-int main (void)
-{
-    setup_test_environment (360);
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_proxy);
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_proxy_hwm.cpp b/libs/libzmq/tests/test_proxy_hwm.cpp
deleted file mode 100644
index 463d881..0000000
--- a/libs/libzmq/tests/test_proxy_hwm.cpp
+++ /dev/null
@@ -1,426 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-#include <string.h>
-#include <unity.h>
-#include <assert.h>
-#include <unistd.h>
-
-//
-// Asynchronous proxy test using ZMQ_XPUB_NODROP and HWM:
-//
-// Topology:
-//
-//   XPUB                      SUB
-//    |                         |
-//    \-----> XSUB -> XPUB -----/
-//           ^^^^^^^^^^^^^^
-//             ZMQ proxy
-//
-// All connections use "inproc" transport and have artificially-low HWMs set.
-// Then the PUB socket starts flooding the Proxy. The SUB is artificially slow
-// at receiving messages.
-// This scenario simulates what happens when a SUB is slower than
-// its (X)PUB: since ZMQ_XPUB_NODROP=1, the XPUB will block and then
-// also the (X)PUB socket will block.
-// The exact number of the messages that go through before (X)PUB blocks depends
-// on ZeroMQ internals and how the OS will schedule the different threads.
-// In the meanwhile asking statistics to the Proxy must NOT be blocking.
-//
-
-
-#define HWM 10
-#define NUM_BYTES_PER_MSG 50000
-
-
-typedef struct
-{
-    void *context;
-    const char *frontend_endpoint;
-    const char *backend_endpoint;
-    const char *control_endpoint;
-
-    void *subscriber_received_all;
-} proxy_hwm_cfg_t;
-
-static void lower_hwm (void *skt_)
-{
-    int send_hwm = HWM;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (skt_, ZMQ_SNDHWM, &send_hwm, sizeof (send_hwm)));
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (skt_, ZMQ_RCVHWM, &send_hwm, sizeof (send_hwm)));
-}
-
-static void publisher_thread_main (void *pvoid_)
-{
-    const proxy_hwm_cfg_t *const cfg =
-      static_cast<const proxy_hwm_cfg_t *> (pvoid_);
-
-    void *pubsocket = zmq_socket (cfg->context, ZMQ_XPUB);
-    assert (pubsocket);
-
-    lower_hwm (pubsocket);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (pubsocket, cfg->frontend_endpoint));
-
-    int optval = 1;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (pubsocket, ZMQ_XPUB_NODROP, &optval, sizeof (optval)));
-
-    // Wait before starting TX operations till 1 subscriber has subscribed
-    // (in this test there's 1 subscriber only)
-    const char subscription_to_all_topics[] = {1, 0};
-    recv_string_expect_success (pubsocket, subscription_to_all_topics, 0);
-
-    uint64_t send_count = 0;
-    while (true) {
-        zmq_msg_t msg;
-        int rc = zmq_msg_init_size (&msg, NUM_BYTES_PER_MSG);
-        assert (rc == 0);
-
-        /* Fill in message content with 'AAAAAA' */
-        memset (zmq_msg_data (&msg), 'A', NUM_BYTES_PER_MSG);
-
-        /* Send the message to the socket */
-        rc = zmq_msg_send (&msg, pubsocket, ZMQ_DONTWAIT);
-        if (rc != -1) {
-            send_count++;
-        } else {
-            TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&msg));
-            break;
-        }
-    }
-
-    // VERIFY EXPECTED RESULTS
-    // EXPLANATION FOR TX TO BE CONSIDERED SUCCESSFUL:
-    // this test has 3 threads doing I/O across 2 queues. Depending on the scheduling,
-    // it might happen that 20, 30 or 40 messages go through before the pub blocks.
-    // That's because the receiver thread gets kicked once every (hwm_ + 1) / 2 sent
-    // messages (search for zeromq sources compute_lwm function).
-    // So depending on the scheduling of the second thread, the publisher might get one,
-    // two or three more batches in. The ceiling is 40 as there's 2 queues.
-    //
-    assert (4 * HWM >= send_count && 2 * HWM <= send_count);
-
-    // CLEANUP
-
-    zmq_close (pubsocket);
-}
-
-static void subscriber_thread_main (void *pvoid_)
-{
-    const proxy_hwm_cfg_t *const cfg =
-      static_cast<const proxy_hwm_cfg_t *> (pvoid_);
-
-    void *subsocket = zmq_socket (cfg->context, ZMQ_SUB);
-    assert (subsocket);
-
-    lower_hwm (subsocket);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (subsocket, ZMQ_SUBSCRIBE, 0, 0));
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (subsocket, cfg->backend_endpoint));
-
-
-    // receive all sent messages
-    uint64_t rxsuccess = 0;
-    bool success = true;
-    while (success) {
-        zmq_msg_t msg;
-        int rc = zmq_msg_init (&msg);
-        assert (rc == 0);
-
-        rc = zmq_msg_recv (&msg, subsocket, 0);
-        if (rc != -1) {
-            TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&msg));
-            rxsuccess++;
-
-            // after receiving 1st message, set a finite timeout (default is infinite)
-            int timeout_ms = 100;
-            TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (
-              subsocket, ZMQ_RCVTIMEO, &timeout_ms, sizeof (timeout_ms)));
-        } else {
-            break;
-        }
-
-        msleep (100);
-    }
-
-
-    // VERIFY EXPECTED RESULTS
-    // EXPLANATION FOR RX TO BE CONSIDERED SUCCESSFUL:
-    // see publisher thread why we have 3 possible outcomes as number of RX messages
-
-    assert (4 * HWM >= rxsuccess && 2 * HWM <= rxsuccess);
-
-    // INFORM THAT WE COMPLETED:
-
-    zmq_atomic_counter_inc (cfg->subscriber_received_all);
-
-    // CLEANUP
-
-    zmq_close (subsocket);
-}
-
-bool recv_stat (void *sock_, bool last_, uint64_t *res_)
-{
-    zmq_msg_t stats_msg;
-
-    int rc = zmq_msg_init (&stats_msg);
-    assert (rc == 0);
-
-    rc = zmq_msg_recv (&stats_msg, sock_, 0); //ZMQ_DONTWAIT);
-    if (rc == -1 && errno == EAGAIN) {
-        rc = zmq_msg_close (&stats_msg);
-        assert (rc == 0);
-        return false; // cannot retrieve the stat
-    }
-
-    assert (rc == sizeof (uint64_t));
-    memcpy (res_, zmq_msg_data (&stats_msg), zmq_msg_size (&stats_msg));
-
-    rc = zmq_msg_close (&stats_msg);
-    assert (rc == 0);
-
-    int more;
-    size_t moresz = sizeof more;
-    rc = zmq_getsockopt (sock_, ZMQ_RCVMORE, &more, &moresz);
-    assert (rc == 0);
-    assert ((last_ && !more) || (!last_ && more));
-
-    return true;
-}
-
-// Utility function to interrogate the proxy:
-
-typedef struct
-{
-    uint64_t msg_in;
-    uint64_t bytes_in;
-    uint64_t msg_out;
-    uint64_t bytes_out;
-} zmq_socket_stats_t;
-
-typedef struct
-{
-    zmq_socket_stats_t frontend;
-    zmq_socket_stats_t backend;
-} zmq_proxy_stats_t;
-
-bool check_proxy_stats (void *control_proxy_)
-{
-    zmq_proxy_stats_t total_stats;
-    int rc;
-
-    rc = zmq_send (control_proxy_, "STATISTICS", 10, ZMQ_DONTWAIT);
-    assert (rc == 10 || (rc == -1 && errno == EAGAIN));
-    if (rc == -1 && errno == EAGAIN) {
-        return false;
-    }
-
-    // first frame of the reply contains FRONTEND stats:
-    if (!recv_stat (control_proxy_, false, &total_stats.frontend.msg_in)) {
-        return false;
-    }
-
-    recv_stat (control_proxy_, false, &total_stats.frontend.bytes_in);
-    recv_stat (control_proxy_, false, &total_stats.frontend.msg_out);
-    recv_stat (control_proxy_, false, &total_stats.frontend.bytes_out);
-
-    // second frame of the reply contains BACKEND stats:
-    recv_stat (control_proxy_, false, &total_stats.backend.msg_in);
-    recv_stat (control_proxy_, false, &total_stats.backend.bytes_in);
-    recv_stat (control_proxy_, false, &total_stats.backend.msg_out);
-    recv_stat (control_proxy_, true, &total_stats.backend.bytes_out);
-
-    return true;
-}
-
-static void proxy_stats_asker_thread_main (void *pvoid_)
-{
-    const proxy_hwm_cfg_t *const cfg =
-      static_cast<const proxy_hwm_cfg_t *> (pvoid_);
-
-    // CONTROL REQ
-
-    void *control_req =
-      zmq_socket (cfg->context,
-                  ZMQ_REQ); // this one can be used to send command to the proxy
-    assert (control_req);
-
-    // connect CONTROL-REQ: a socket to which send commands
-    int rc = zmq_connect (control_req, cfg->control_endpoint);
-    assert (rc == 0);
-
-
-    // IMPORTANT: by setting the tx/rx timeouts, we avoid getting blocked when interrogating a proxy which is
-    //            itself blocked in a zmq_msg_send() on its XPUB socket having ZMQ_XPUB_NODROP=1!
-
-    int optval = 10;
-    rc = zmq_setsockopt (control_req, ZMQ_SNDTIMEO, &optval, sizeof (optval));
-    assert (rc == 0);
-    rc = zmq_setsockopt (control_req, ZMQ_RCVTIMEO, &optval, sizeof (optval));
-    assert (rc == 0);
-
-    optval = 10;
-    rc =
-      zmq_setsockopt (control_req, ZMQ_REQ_CORRELATE, &optval, sizeof (optval));
-    assert (rc == 0);
-
-    rc =
-      zmq_setsockopt (control_req, ZMQ_REQ_RELAXED, &optval, sizeof (optval));
-    assert (rc == 0);
-
-
-    // Start!
-
-    while (!zmq_atomic_counter_value (cfg->subscriber_received_all)) {
-        check_proxy_stats (control_req);
-        usleep (1000); // 1ms -> in best case we will get 1000updates/second
-    }
-
-
-    // Ask the proxy to exit: the subscriber has received all messages
-
-    rc = zmq_send (control_req, "TERMINATE", 9, 0);
-    assert (rc == 9);
-
-    zmq_close (control_req);
-}
-
-static void proxy_thread_main (void *pvoid_)
-{
-    const proxy_hwm_cfg_t *const cfg =
-      static_cast<const proxy_hwm_cfg_t *> (pvoid_);
-    int rc;
-
-    // FRONTEND SUB
-
-    void *frontend_xsub = zmq_socket (
-      cfg->context,
-      ZMQ_XSUB); // the frontend is the one exposed to internal threads (INPROC)
-    assert (frontend_xsub);
-
-    lower_hwm (frontend_xsub);
-
-    // bind FRONTEND
-    rc = zmq_bind (frontend_xsub, cfg->frontend_endpoint);
-    assert (rc == 0);
-
-
-    // BACKEND PUB
-
-    void *backend_xpub = zmq_socket (
-      cfg->context,
-      ZMQ_XPUB); // the backend is the one exposed to the external world (TCP)
-    assert (backend_xpub);
-
-    int optval = 1;
-    rc =
-      zmq_setsockopt (backend_xpub, ZMQ_XPUB_NODROP, &optval, sizeof (optval));
-    assert (rc == 0);
-
-    lower_hwm (backend_xpub);
-
-    // bind BACKEND
-    rc = zmq_bind (backend_xpub, cfg->backend_endpoint);
-    assert (rc == 0);
-
-
-    // CONTROL REP
-
-    void *control_rep = zmq_socket (
-      cfg->context,
-      ZMQ_REP); // this one is used by the proxy to receive&reply to commands
-    assert (control_rep);
-
-    // bind CONTROL
-    rc = zmq_bind (control_rep, cfg->control_endpoint);
-    assert (rc == 0);
-
-
-    // start proxying!
-
-    zmq_proxy_steerable (frontend_xsub, backend_xpub, NULL, control_rep);
-
-    zmq_close (frontend_xsub);
-    zmq_close (backend_xpub);
-    zmq_close (control_rep);
-}
-
-
-// The main thread simply starts several clients and a server, and then
-// waits for the server to finish.
-
-int main (void)
-{
-    setup_test_environment ();
-
-    void *context = zmq_ctx_new ();
-    assert (context);
-
-
-    // START ALL SECONDARY THREADS
-
-    proxy_hwm_cfg_t cfg;
-    cfg.context = context;
-    cfg.frontend_endpoint = "inproc://frontend";
-    cfg.backend_endpoint = "inproc://backend";
-    cfg.control_endpoint = "inproc://ctrl";
-    cfg.subscriber_received_all = zmq_atomic_counter_new ();
-
-    void *proxy = zmq_threadstart (&proxy_thread_main, (void *) &cfg);
-    assert (proxy != 0);
-    void *publisher = zmq_threadstart (&publisher_thread_main, (void *) &cfg);
-    assert (publisher != 0);
-    void *subscriber = zmq_threadstart (&subscriber_thread_main, (void *) &cfg);
-    assert (subscriber != 0);
-    void *asker =
-      zmq_threadstart (&proxy_stats_asker_thread_main, (void *) &cfg);
-    assert (asker != 0);
-
-
-    // CLEANUP
-
-    zmq_threadclose (publisher);
-    zmq_threadclose (subscriber);
-    zmq_threadclose (asker);
-    zmq_threadclose (proxy);
-
-    int rc = zmq_ctx_term (context);
-    assert (rc == 0);
-
-    zmq_atomic_counter_destroy (&cfg.subscriber_received_all);
-
-    return 0;
-}
diff --git a/libs/libzmq/tests/test_proxy_single_socket.cpp b/libs/libzmq/tests/test_proxy_single_socket.cpp
deleted file mode 100644
index 8545267..0000000
--- a/libs/libzmq/tests/test_proxy_single_socket.cpp
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-#include <stdlib.h>
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-// This is our server task.
-// It runs a proxy with a single REP socket as both frontend and backend.
-
-void server_task (void * /*unused_*/)
-{
-    char my_endpoint[MAX_SOCKET_STRING];
-    void *rep = zmq_socket (get_test_context (), ZMQ_REP);
-    TEST_ASSERT_NOT_NULL (rep);
-    bind_loopback_ipv4 (rep, my_endpoint, sizeof my_endpoint);
-
-    // Control socket receives terminate command from main over inproc
-    void *control = zmq_socket (get_test_context (), ZMQ_REQ);
-    TEST_ASSERT_NOT_NULL (control);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (control, "inproc://control"));
-    send_string_expect_success (control, my_endpoint, 0);
-
-    // Use rep as both frontend and backend
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_proxy_steerable (rep, rep, NULL, control));
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_close (rep));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_close (control));
-}
-
-
-// The main thread simply starts several clients and a server, and then
-// waits for the server to finish.
-void test_proxy_single_socket ()
-{
-    void *server_thread = zmq_threadstart (&server_task, NULL);
-
-    // Control socket receives terminate command from main over inproc
-    void *control = test_context_socket (ZMQ_REP);
-    TEST_ASSERT_NOT_NULL (control);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (control, "inproc://control"));
-    char *my_endpoint = s_recv (control);
-    TEST_ASSERT_NOT_NULL (my_endpoint);
-
-    // client socket pings proxy over tcp
-    void *req = test_context_socket (ZMQ_REQ);
-    TEST_ASSERT_NOT_NULL (req);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (req, my_endpoint));
-
-    send_string_expect_success (req, "msg1", 0);
-    recv_string_expect_success (req, "msg1", 0);
-
-    send_string_expect_success (req, "msg22", 0);
-    recv_string_expect_success (req, "msg22", 0);
-
-    send_string_expect_success (control, "TERMINATE", 0);
-
-    test_context_socket_close (control);
-    test_context_socket_close (req);
-    free (my_endpoint);
-
-    zmq_threadclose (server_thread);
-}
-
-int main (void)
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_proxy_single_socket);
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_proxy_terminate.cpp b/libs/libzmq/tests/test_proxy_terminate.cpp
deleted file mode 100644
index 69daade..0000000
--- a/libs/libzmq/tests/test_proxy_terminate.cpp
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-#include <stdlib.h>
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-// This is a test for issue #1382. The server thread creates a SUB-PUSH
-// steerable proxy. The main process then sends messages to the SUB
-// but there is no pull on the other side, previously the proxy blocks
-// in writing to the backend, preventing the proxy from terminating
-
-void server_task (void * /*unused_*/)
-{
-    char my_endpoint[MAX_SOCKET_STRING];
-    // Frontend socket talks to main process
-    void *frontend = zmq_socket (get_test_context (), ZMQ_SUB);
-    TEST_ASSERT_NOT_NULL (frontend);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (frontend, ZMQ_SUBSCRIBE, "", 0));
-    bind_loopback_ipv4 (frontend, my_endpoint, sizeof my_endpoint);
-
-    // Nice socket which is never read
-    void *backend = zmq_socket (get_test_context (), ZMQ_PUSH);
-    TEST_ASSERT_NOT_NULL (backend);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (backend, "tcp://127.0.0.1:*"));
-
-    // Control socket receives terminate command from main over inproc
-    void *control = zmq_socket (get_test_context (), ZMQ_REQ);
-    TEST_ASSERT_NOT_NULL (control);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (control, "inproc://control"));
-    send_string_expect_success (control, my_endpoint, 0);
-
-    // Connect backend to frontend via a proxy
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_proxy_steerable (frontend, backend, NULL, control));
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_close (frontend));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_close (backend));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_close (control));
-}
-
-
-// The main thread simply starts a basic steerable proxy server, publishes some messages, and then
-// waits for the server to terminate.
-void test_proxy_terminate ()
-{
-    void *thread = zmq_threadstart (&server_task, NULL);
-
-    // Control socket receives terminate command from main over inproc
-    void *control = test_context_socket (ZMQ_REP);
-    TEST_ASSERT_NOT_NULL (control);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (control, "inproc://control"));
-    char *my_endpoint = s_recv (control);
-    TEST_ASSERT_NOT_NULL (my_endpoint);
-
-    msleep (500); // Run for 500 ms
-
-    // Start a secondary publisher which writes data to the SUB-PUSH server socket
-    void *publisher = test_context_socket (ZMQ_PUB);
-    TEST_ASSERT_NOT_NULL (publisher);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (publisher, my_endpoint));
-
-    msleep (SETTLE_TIME);
-    send_string_expect_success (publisher, "This is a test", 0);
-
-    msleep (50);
-    send_string_expect_success (publisher, "This is a test", 0);
-
-    msleep (50);
-    send_string_expect_success (publisher, "This is a test", 0);
-    send_string_expect_success (control, "TERMINATE", 0);
-
-    test_context_socket_close (publisher);
-    test_context_socket_close (control);
-    free (my_endpoint);
-
-    zmq_threadclose (thread);
-}
-
-int main (void)
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_proxy_terminate);
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_pub_invert_matching.cpp b/libs/libzmq/tests/test_pub_invert_matching.cpp
deleted file mode 100644
index 4a5b3f5..0000000
--- a/libs/libzmq/tests/test_pub_invert_matching.cpp
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-#include <string.h>
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void test ()
-{
-    //  Create a publisher
-    void *pub = test_context_socket (ZMQ_PUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (pub, "inproc://soname"));
-
-    //  Create two subscribers
-    void *sub1 = test_context_socket (ZMQ_SUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sub1, "inproc://soname"));
-
-    void *sub2 = test_context_socket (ZMQ_SUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sub2, "inproc://soname"));
-
-    //  Subscribe pub1 to one prefix
-    //  and pub2 to another prefix.
-    const char prefi_x1[] = "prefix1";
-    const char prefi_x2[] = "p2";
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sub1, ZMQ_SUBSCRIBE, prefi_x1, strlen (prefi_x1)));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sub2, ZMQ_SUBSCRIBE, prefi_x2, strlen (prefi_x2)));
-
-    //  Send a message with the first prefix
-    send_string_expect_success (pub, prefi_x1, 0);
-    msleep (SETTLE_TIME);
-
-    //  sub1 should receive it, but not sub2
-    recv_string_expect_success (sub1, prefi_x1, ZMQ_DONTWAIT);
-
-    TEST_ASSERT_FAILURE_ERRNO (EAGAIN, zmq_recv (sub2, NULL, 0, ZMQ_DONTWAIT));
-
-    //  Send a message with the second prefix
-    send_string_expect_success (pub, prefi_x2, 0);
-    msleep (SETTLE_TIME);
-
-    //  sub2 should receive it, but not sub1
-    recv_string_expect_success (sub2, prefi_x2, ZMQ_DONTWAIT);
-
-    TEST_ASSERT_FAILURE_ERRNO (EAGAIN, zmq_recv (sub1, NULL, 0, ZMQ_DONTWAIT));
-
-    //  Now invert the matching
-    int invert = 1;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (pub, ZMQ_INVERT_MATCHING, &invert, sizeof (invert)));
-
-    //  ... on both sides, otherwise the SUB socket will filter the messages out
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sub1, ZMQ_INVERT_MATCHING, &invert, sizeof (invert)));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sub2, ZMQ_INVERT_MATCHING, &invert, sizeof (invert)));
-
-    //  Send a message with the first prefix
-    send_string_expect_success (pub, prefi_x1, 0);
-    msleep (SETTLE_TIME);
-
-    //  sub2 should receive it, but not sub1
-    recv_string_expect_success (sub2, prefi_x1, ZMQ_DONTWAIT);
-
-    TEST_ASSERT_FAILURE_ERRNO (EAGAIN, zmq_recv (sub1, NULL, 0, ZMQ_DONTWAIT));
-
-    //  Send a message with the second prefix
-    send_string_expect_success (pub, prefi_x2, 0);
-    msleep (SETTLE_TIME);
-
-    //  sub1 should receive it, but not sub2
-    recv_string_expect_success (sub1, prefi_x2, ZMQ_DONTWAIT);
-
-    TEST_ASSERT_FAILURE_ERRNO (EAGAIN, zmq_recv (sub2, NULL, 0, ZMQ_DONTWAIT));
-
-    //  Clean up.
-    test_context_socket_close (pub);
-    test_context_socket_close (sub1);
-    test_context_socket_close (sub2);
-}
-
-int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test);
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_pubsub.cpp b/libs/libzmq/tests/test_pubsub.cpp
deleted file mode 100644
index 44796e8..0000000
--- a/libs/libzmq/tests/test_pubsub.cpp
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
-    Copyright (c) 2007-2020 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void test (const char *address)
-{
-    //  Create a publisher
-    void *publisher = test_context_socket (ZMQ_PUB);
-    char my_endpoint[MAX_SOCKET_STRING];
-
-    //  Bind publisher
-    test_bind (publisher, address, my_endpoint, MAX_SOCKET_STRING);
-
-    //  Create a subscriber
-    void *subscriber = test_context_socket (ZMQ_SUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (subscriber, my_endpoint));
-
-    //  Subscribe to all messages.
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (subscriber, ZMQ_SUBSCRIBE, "", 0));
-
-    //  Wait a bit till the subscription gets to the publisher
-    msleep (SETTLE_TIME);
-
-    //  Send an empty message
-    send_string_expect_success (publisher, "test", 0);
-
-    //  Receive the message in the subscriber
-    recv_string_expect_success (subscriber, "test", 0);
-
-    //  Clean up.
-    test_context_socket_close (publisher);
-    test_context_socket_close (subscriber);
-}
-
-void test_norm ()
-{
-#if defined ZMQ_HAVE_NORM
-    test ("norm://224.1.2.3:5556");
-#else
-    TEST_IGNORE_MESSAGE ("libzmq without NORM, ignoring test");
-#endif
-}
-
-int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_norm);
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_radio_dish.cpp b/libs/libzmq/tests/test_radio_dish.cpp
deleted file mode 100644
index 3c3fb18..0000000
--- a/libs/libzmq/tests/test_radio_dish.cpp
+++ /dev/null
@@ -1,555 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-#include <string.h>
-
-#ifndef _WIN32
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <unistd.h>
-#endif
-
-// Helper macro to define the v4/v6 function pairs
-#define MAKE_TEST_V4V6(_test)                                                  \
-    static void _test##_ipv4 () { _test (false); }                             \
-                                                                               \
-    static void _test##_ipv6 ()                                                \
-    {                                                                          \
-        if (!is_ipv6_available ()) {                                           \
-            TEST_IGNORE_MESSAGE ("ipv6 is not available");                     \
-        }                                                                      \
-        _test (true);                                                          \
-    }
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void msg_send_expect_success (void *s_, const char *group_, const char *body_)
-{
-    zmq_msg_t msg;
-    const size_t len = strlen (body_);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init_size (&msg, len));
-
-    memcpy (zmq_msg_data (&msg), body_, len);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_set_group (&msg, group_));
-
-    int rc = zmq_msg_send (&msg, s_, 0);
-    TEST_ASSERT_EQUAL_INT ((int) len, rc);
-
-    // TODO isn't the msg closed by zmq_msg_send?
-    zmq_msg_close (&msg);
-}
-
-void msg_recv_cmp (void *s_, const char *group_, const char *body_)
-{
-    zmq_msg_t msg;
-    const size_t len = strlen (body_);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init (&msg));
-
-    int recv_rc = TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_recv (&msg, s_, 0));
-    TEST_ASSERT_EQUAL_INT (len, recv_rc);
-
-    TEST_ASSERT_EQUAL_STRING (group_, zmq_msg_group (&msg));
-
-    TEST_ASSERT_EQUAL_STRING_LEN (body_, zmq_msg_data (&msg), len);
-
-    zmq_msg_close (&msg);
-}
-
-void test_leave_unjoined_fails ()
-{
-    void *dish = test_context_socket (ZMQ_DISH);
-
-    //  Leaving a group which we didn't join
-    TEST_ASSERT_FAILURE_ERRNO (EINVAL, zmq_leave (dish, "Movies"));
-
-    test_context_socket_close (dish);
-}
-
-void test_long_group ()
-{
-    size_t len = MAX_SOCKET_STRING;
-    char my_endpoint[MAX_SOCKET_STRING];
-
-    void *radio = test_context_socket (ZMQ_RADIO);
-    bind_loopback (radio, false, my_endpoint, len);
-
-    void *dish = test_context_socket (ZMQ_DISH);
-
-    // Joining to a long group, over 14 chars
-    char group[19] = "0123456789ABCDEFGH";
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_join (dish, group));
-
-    // Connecting
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (dish, my_endpoint));
-
-    msleep (SETTLE_TIME);
-
-    //  This is going to be sent to the dish
-    msg_send_expect_success (radio, group, "HELLO");
-
-    //  Check the correct message arrived
-    msg_recv_cmp (dish, group, "HELLO");
-
-    test_context_socket_close (dish);
-    test_context_socket_close (radio);
-}
-
-void test_join_too_long_fails ()
-{
-    void *dish = test_context_socket (ZMQ_DISH);
-
-    //  Joining too long group
-    char too_long_group[ZMQ_GROUP_MAX_LENGTH + 2];
-    for (int index = 0; index < ZMQ_GROUP_MAX_LENGTH + 2; index++)
-        too_long_group[index] = 'A';
-    too_long_group[ZMQ_GROUP_MAX_LENGTH + 1] = '\0';
-    TEST_ASSERT_FAILURE_ERRNO (EINVAL, zmq_join (dish, too_long_group));
-
-    test_context_socket_close (dish);
-}
-
-void test_join_twice_fails ()
-{
-    void *dish = test_context_socket (ZMQ_DISH);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_join (dish, "Movies"));
-
-    // Duplicate Joining
-    TEST_ASSERT_FAILURE_ERRNO (EINVAL, zmq_join (dish, "Movies"));
-
-    test_context_socket_close (dish);
-}
-
-void test_radio_dish_tcp_poll (int ipv6_)
-{
-    size_t len = MAX_SOCKET_STRING;
-    char my_endpoint[MAX_SOCKET_STRING];
-
-    void *radio = test_context_socket (ZMQ_RADIO);
-    bind_loopback (radio, ipv6_, my_endpoint, len);
-
-    void *dish = test_context_socket (ZMQ_DISH);
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (dish, ZMQ_IPV6, &ipv6_, sizeof (int)));
-
-    // Joining
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_join (dish, "Movies"));
-
-    // Connecting
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (dish, my_endpoint));
-
-    msleep (SETTLE_TIME);
-
-    //  This is not going to be sent as dish only subscribe to "Movies"
-    msg_send_expect_success (radio, "TV", "Friends");
-
-    //  This is going to be sent to the dish
-    msg_send_expect_success (radio, "Movies", "Godfather");
-
-    //  Check the correct message arrived
-    msg_recv_cmp (dish, "Movies", "Godfather");
-
-    //  Join group during connection optvallen
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_join (dish, "TV"));
-
-    zmq_sleep (1);
-
-    //  This should arrive now as we joined the group
-    msg_send_expect_success (radio, "TV", "Friends");
-
-    //  Check the correct message arrived
-    msg_recv_cmp (dish, "TV", "Friends");
-
-    //  Leaving group
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_leave (dish, "TV"));
-
-    zmq_sleep (1);
-
-    //  This is not going to be sent as dish only subscribe to "Movies"
-    msg_send_expect_success (radio, "TV", "Friends");
-
-    //  This is going to be sent to the dish
-    msg_send_expect_success (radio, "Movies", "Godfather");
-
-    // test zmq_poll with dish
-    zmq_pollitem_t items[] = {
-      {radio, 0, ZMQ_POLLIN, 0}, // read publications
-      {dish, 0, ZMQ_POLLIN, 0},  // read subscriptions
-    };
-    int rc = zmq_poll (items, 2, 2000);
-    TEST_ASSERT_EQUAL_INT (1, rc);
-    TEST_ASSERT_EQUAL_INT (ZMQ_POLLIN, items[1].revents);
-
-    //  Check the correct message arrived
-    msg_recv_cmp (dish, "Movies", "Godfather");
-
-    test_context_socket_close (dish);
-    test_context_socket_close (radio);
-}
-MAKE_TEST_V4V6 (test_radio_dish_tcp_poll)
-
-void test_dish_connect_fails (int ipv6_)
-{
-    void *dish = test_context_socket (ZMQ_DISH);
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (dish, ZMQ_IPV6, &ipv6_, sizeof (int)));
-
-    const char *url = ipv6_ ? "udp://[::1]:5556" : "udp://127.0.0.1:5556";
-
-    //  Connecting dish should fail
-    TEST_ASSERT_FAILURE_ERRNO (ENOCOMPATPROTO, zmq_connect (dish, url));
-
-    test_context_socket_close (dish);
-}
-MAKE_TEST_V4V6 (test_dish_connect_fails)
-
-void test_radio_bind_fails (int ipv6_)
-{
-    void *radio = test_context_socket (ZMQ_RADIO);
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (radio, ZMQ_IPV6, &ipv6_, sizeof (int)));
-
-    //  Connecting dish should fail
-    //  Bind radio should fail
-    TEST_ASSERT_FAILURE_ERRNO (ENOCOMPATPROTO,
-                               zmq_bind (radio, "udp://*:5556"));
-
-    test_context_socket_close (radio);
-}
-MAKE_TEST_V4V6 (test_radio_bind_fails)
-
-void test_radio_dish_udp (int ipv6_)
-{
-    void *radio = test_context_socket (ZMQ_RADIO);
-    void *dish = test_context_socket (ZMQ_DISH);
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (radio, ZMQ_IPV6, &ipv6_, sizeof (int)));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (dish, ZMQ_IPV6, &ipv6_, sizeof (int)));
-
-    const char *radio_url = ipv6_ ? "udp://[::1]:5556" : "udp://127.0.0.1:5556";
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (dish, "udp://*:5556"));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (radio, radio_url));
-
-    msleep (SETTLE_TIME);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_join (dish, "TV"));
-
-    msg_send_expect_success (radio, "TV", "Friends");
-    msg_recv_cmp (dish, "TV", "Friends");
-
-    test_context_socket_close (dish);
-    test_context_socket_close (radio);
-}
-MAKE_TEST_V4V6 (test_radio_dish_udp)
-
-#define MCAST_IPV4 "226.8.5.5"
-#define MCAST_IPV6 "ff02::7a65:726f:6df1:0a01"
-
-static const char *mcast_url (int ipv6_)
-{
-    if (ipv6_) {
-        return "udp://[" MCAST_IPV6 "]:5555";
-    }
-    return "udp://" MCAST_IPV4 ":5555";
-}
-
-//  OSX uses a different name for this socket option
-#ifndef IPV6_ADD_MEMBERSHIP
-#define IPV6_ADD_MEMBERSHIP IPV6_JOIN_GROUP
-#endif
-
-union sa_u
-{
-    struct sockaddr generic;
-    struct sockaddr_in ipv4;
-    struct sockaddr_in6 ipv6;
-};
-
-//  Test if multicast is available on this machine by attempting to
-//  send a receive a multicast datagram
-static bool is_multicast_available (int ipv6_)
-{
-    int family = ipv6_ ? AF_INET6 : AF_INET;
-    fd_t bind_sock = retired_fd;
-    fd_t send_sock = retired_fd;
-    int port = 5555;
-    bool success = false;
-    const char *msg = "it works";
-    char buf[32];
-    union sa_u any;
-    union sa_u mcast;
-    socklen_t sl;
-    int rc;
-
-    if (ipv6_) {
-        struct sockaddr_in6 *any_ipv6 = &any.ipv6;
-        struct sockaddr_in6 *mcast_ipv6 = &mcast.ipv6;
-
-        any_ipv6->sin6_family = AF_INET6;
-        any_ipv6->sin6_port = htons (port);
-        any_ipv6->sin6_flowinfo = 0;
-        any_ipv6->sin6_scope_id = 0;
-
-        rc = test_inet_pton (AF_INET6, "::", &any_ipv6->sin6_addr);
-        if (rc == 0) {
-            goto out;
-        }
-
-        *mcast_ipv6 = *any_ipv6;
-
-        rc = test_inet_pton (AF_INET6, MCAST_IPV6, &mcast_ipv6->sin6_addr);
-        if (rc == 0) {
-            goto out;
-        }
-
-        sl = sizeof (*any_ipv6);
-    } else {
-        struct sockaddr_in *any_ipv4 = &any.ipv4;
-        struct sockaddr_in *mcast_ipv4 = &mcast.ipv4;
-
-        any_ipv4->sin_family = AF_INET;
-        any_ipv4->sin_port = htons (5555);
-
-        rc = test_inet_pton (AF_INET, "0.0.0.0", &any_ipv4->sin_addr);
-        if (rc == 0) {
-            goto out;
-        }
-
-        *mcast_ipv4 = *any_ipv4;
-
-        rc = test_inet_pton (AF_INET, MCAST_IPV4, &mcast_ipv4->sin_addr);
-        if (rc == 0) {
-            goto out;
-        }
-
-        sl = sizeof (*any_ipv4);
-    }
-
-    bind_sock = socket (family, SOCK_DGRAM, IPPROTO_UDP);
-    if (bind_sock < 0) {
-        goto out;
-    }
-
-    send_sock = socket (family, SOCK_DGRAM, IPPROTO_UDP);
-    if (bind_sock < 0) {
-        goto out;
-    }
-
-    rc = bind (bind_sock, &any.generic, sl);
-    if (rc < 0) {
-        goto out;
-    }
-
-    if (ipv6_) {
-        struct ipv6_mreq mreq;
-        const sockaddr_in6 *const mcast_ipv6 = &mcast.ipv6;
-
-        mreq.ipv6mr_multiaddr = mcast_ipv6->sin6_addr;
-        mreq.ipv6mr_interface = 0;
-
-        rc = setsockopt (bind_sock, IPPROTO_IPV6, IPV6_ADD_MEMBERSHIP,
-                         as_setsockopt_opt_t (&mreq), sizeof (mreq));
-        if (rc < 0) {
-            goto out;
-        }
-
-        int loop = 1;
-        rc = setsockopt (send_sock, IPPROTO_IPV6, IPV6_MULTICAST_LOOP,
-                         as_setsockopt_opt_t (&loop), sizeof (loop));
-        if (rc < 0) {
-            goto out;
-        }
-    } else {
-        struct ip_mreq mreq;
-        const sockaddr_in *const mcast_ipv4 = &mcast.ipv4;
-
-        mreq.imr_multiaddr = mcast_ipv4->sin_addr;
-        mreq.imr_interface.s_addr = htonl (INADDR_ANY);
-
-        rc = setsockopt (bind_sock, IPPROTO_IP, IP_ADD_MEMBERSHIP,
-                         as_setsockopt_opt_t (&mreq), sizeof (mreq));
-        if (rc < 0) {
-            goto out;
-        }
-
-        int loop = 1;
-        rc = setsockopt (send_sock, IPPROTO_IP, IP_MULTICAST_LOOP,
-                         as_setsockopt_opt_t (&loop), sizeof (loop));
-        if (rc < 0) {
-            goto out;
-        }
-    }
-
-    msleep (SETTLE_TIME);
-
-    rc = sendto (send_sock, msg, static_cast<socklen_t> (strlen (msg)), 0,
-                 &mcast.generic, sl);
-    if (rc < 0) {
-        goto out;
-    }
-
-    msleep (SETTLE_TIME);
-
-    rc = recvfrom (bind_sock, buf, sizeof (buf) - 1, 0, NULL, 0);
-    if (rc < 0) {
-        goto out;
-    }
-
-    buf[rc] = '\0';
-
-    success = (strcmp (msg, buf) == 0);
-
-out:
-    if (bind_sock >= 0) {
-        close (bind_sock);
-    }
-
-    if (send_sock >= 0) {
-        close (send_sock);
-    }
-
-    return success;
-}
-
-static void ignore_if_unavailable (int ipv6_)
-{
-    if (ipv6_ && !is_ipv6_available ())
-        TEST_IGNORE_MESSAGE ("No IPV6 available");
-    if (!is_multicast_available (ipv6_))
-        TEST_IGNORE_MESSAGE ("No multicast available");
-}
-
-static void test_radio_dish_mcast (int ipv6_)
-{
-    ignore_if_unavailable (ipv6_);
-
-    void *radio = test_context_socket (ZMQ_RADIO);
-    void *dish = test_context_socket (ZMQ_DISH);
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (radio, ZMQ_IPV6, &ipv6_, sizeof (int)));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (dish, ZMQ_IPV6, &ipv6_, sizeof (int)));
-
-    const char *url = mcast_url (ipv6_);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (dish, url));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (radio, url));
-
-    msleep (SETTLE_TIME);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_join (dish, "TV"));
-
-    msg_send_expect_success (radio, "TV", "Friends");
-    msg_recv_cmp (dish, "TV", "Friends");
-
-    test_context_socket_close (dish);
-    test_context_socket_close (radio);
-}
-MAKE_TEST_V4V6 (test_radio_dish_mcast)
-
-static void test_radio_dish_no_loop (int ipv6_)
-{
-#ifdef _WIN32
-    TEST_IGNORE_MESSAGE (
-      "ZMQ_MULTICAST_LOOP=false does not appear to work on Windows (TODO)");
-#endif
-    ignore_if_unavailable (ipv6_);
-
-    void *radio = test_context_socket (ZMQ_RADIO);
-    void *dish = test_context_socket (ZMQ_DISH);
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (radio, ZMQ_IPV6, &ipv6_, sizeof (int)));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (dish, ZMQ_IPV6, &ipv6_, sizeof (int)));
-
-    //  Disable multicast loop for radio
-    int loop = 0;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (radio, ZMQ_MULTICAST_LOOP, &loop, sizeof (int)));
-
-    const char *url = mcast_url (ipv6_);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (dish, url));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (radio, url));
-
-    msleep (SETTLE_TIME);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_join (dish, "TV"));
-
-    msg_send_expect_success (radio, "TV", "Friends");
-
-    // Looping is disabled, we shouldn't receive anything
-    msleep (SETTLE_TIME);
-
-    TEST_ASSERT_FAILURE_ERRNO (EAGAIN, zmq_recv (dish, NULL, 0, ZMQ_DONTWAIT));
-
-    test_context_socket_close (dish);
-    test_context_socket_close (radio);
-}
-MAKE_TEST_V4V6 (test_radio_dish_no_loop)
-
-int main (void)
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_leave_unjoined_fails);
-    RUN_TEST (test_join_too_long_fails);
-    RUN_TEST (test_long_group);
-    RUN_TEST (test_join_twice_fails);
-    RUN_TEST (test_radio_bind_fails_ipv4);
-    RUN_TEST (test_radio_bind_fails_ipv6);
-    RUN_TEST (test_dish_connect_fails_ipv4);
-    RUN_TEST (test_dish_connect_fails_ipv6);
-    RUN_TEST (test_radio_dish_tcp_poll_ipv4);
-    RUN_TEST (test_radio_dish_tcp_poll_ipv6);
-    RUN_TEST (test_radio_dish_udp_ipv4);
-    RUN_TEST (test_radio_dish_udp_ipv6);
-
-    RUN_TEST (test_radio_dish_mcast_ipv4);
-    RUN_TEST (test_radio_dish_no_loop_ipv4);
-
-    RUN_TEST (test_radio_dish_mcast_ipv6);
-    RUN_TEST (test_radio_dish_no_loop_ipv6);
-
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_rebind_ipc.cpp b/libs/libzmq/tests/test_rebind_ipc.cpp
deleted file mode 100644
index 61736ee..0000000
--- a/libs/libzmq/tests/test_rebind_ipc.cpp
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void test_rebind_ipc ()
-{
-    char my_endpoint[MAX_SOCKET_STRING];
-    make_random_ipc_endpoint (my_endpoint);
-
-    void *sb0 = test_context_socket (ZMQ_PUSH);
-    void *sb1 = test_context_socket (ZMQ_PUSH);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (sb0, my_endpoint));
-
-    void *sc = test_context_socket (ZMQ_PULL);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sc, my_endpoint));
-
-    send_string_expect_success (sb0, "42", 0);
-    recv_string_expect_success (sc, "42", 0);
-
-    test_context_socket_close (sb0);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (sb1, my_endpoint));
-
-    send_string_expect_success (sb1, "42", 0);
-    recv_string_expect_success (sc, "42", 0);
-
-    test_context_socket_close (sc);
-    test_context_socket_close (sb1);
-}
-
-int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_rebind_ipc);
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_reconnect_ivl.cpp b/libs/libzmq/tests/test_reconnect_ivl.cpp
deleted file mode 100644
index 51be336..0000000
--- a/libs/libzmq/tests/test_reconnect_ivl.cpp
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
-    Copyright (c) 2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void test_reconnect_ivl_against_pair_socket (const char *my_endpoint_,
-                                             void *sb_)
-{
-    void *sc = test_context_socket (ZMQ_PAIR);
-    int interval = -1;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sc, ZMQ_RECONNECT_IVL, &interval, sizeof (int)));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sc, my_endpoint_));
-
-    bounce (sb_, sc);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_unbind (sb_, my_endpoint_));
-
-    expect_bounce_fail (sb_, sc);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (sb_, my_endpoint_));
-
-    expect_bounce_fail (sb_, sc);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sc, my_endpoint_));
-
-    bounce (sb_, sc);
-
-    test_context_socket_close (sc);
-}
-
-#if defined(ZMQ_HAVE_IPC) && !defined(ZMQ_HAVE_GNU)
-void test_reconnect_ivl_ipc (void)
-{
-    char my_endpoint[256];
-    make_random_ipc_endpoint (my_endpoint);
-
-    void *sb = test_context_socket (ZMQ_PAIR);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (sb, my_endpoint));
-
-    test_reconnect_ivl_against_pair_socket (my_endpoint, sb);
-    test_context_socket_close (sb);
-}
-#endif
-
-void test_reconnect_ivl_tcp (bind_function_t bind_function_)
-{
-    char my_endpoint[MAX_SOCKET_STRING];
-
-    void *sb = test_context_socket (ZMQ_PAIR);
-    bind_function_ (sb, my_endpoint, sizeof my_endpoint);
-
-    test_reconnect_ivl_against_pair_socket (my_endpoint, sb);
-    test_context_socket_close (sb);
-}
-
-void test_reconnect_ivl_tcp_ipv4 ()
-{
-    test_reconnect_ivl_tcp (bind_loopback_ipv4);
-}
-
-void test_reconnect_ivl_tcp_ipv6 ()
-{
-    if (is_ipv6_available ()) {
-        zmq_ctx_set (get_test_context (), ZMQ_IPV6, 1);
-        test_reconnect_ivl_tcp (bind_loopback_ipv6);
-    }
-}
-
-int main (void)
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-#if defined(ZMQ_HAVE_IPC) && !defined(ZMQ_HAVE_GNU)
-    RUN_TEST (test_reconnect_ivl_ipc);
-#endif
-    RUN_TEST (test_reconnect_ivl_tcp_ipv4);
-    RUN_TEST (test_reconnect_ivl_tcp_ipv6);
-
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_reconnect_options.cpp b/libs/libzmq/tests/test_reconnect_options.cpp
deleted file mode 100644
index ba46117..0000000
--- a/libs/libzmq/tests/test_reconnect_options.cpp
+++ /dev/null
@@ -1,297 +0,0 @@
-/*
-    Copyright (c) 2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include <assert.h>
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-#include "testutil_monitoring.hpp"
-
-#include <unity.h>
-
-// test behavior with (mostly) default values
-void reconnect_default ()
-{
-    // setup pub socket
-    void *pub = test_context_socket (ZMQ_PUB);
-    //  Bind pub socket
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (pub, ENDPOINT_0));
-
-    // setup sub socket
-    void *sub = test_context_socket (ZMQ_SUB);
-    //  Monitor all events on sub
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_socket_monitor (sub, "inproc://monitor-sub", ZMQ_EVENT_ALL));
-    //  Create socket for collecting monitor events
-    void *sub_mon = test_context_socket (ZMQ_PAIR);
-    //  Connect so they'll get events
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sub_mon, "inproc://monitor-sub"));
-    // set reconnect interval so only a single reconnect is tried
-    int interval = 60 * 1000;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sub, ZMQ_RECONNECT_IVL, &interval, sizeof (interval)));
-    // connect to pub
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sub, ENDPOINT_0));
-
-    //  confirm that we get following events
-    expect_monitor_event (sub_mon, ZMQ_EVENT_CONNECT_DELAYED);
-    expect_monitor_event (sub_mon, ZMQ_EVENT_CONNECTED);
-    expect_monitor_event (sub_mon, ZMQ_EVENT_HANDSHAKE_SUCCEEDED);
-
-    // close the pub socket
-    test_context_socket_close_zero_linger (pub);
-
-    //  confirm that we get following events
-    expect_monitor_event (sub_mon, ZMQ_EVENT_DISCONNECTED);
-    expect_monitor_event (sub_mon, ZMQ_EVENT_CONNECT_RETRIED);
-
-    // ZMQ_EVENT_CONNECT_RETRIED should be last event, because of timeout set above
-    int event;
-    char *event_address;
-    int rc = get_monitor_event_with_timeout (sub_mon, &event, &event_address,
-                                             2 * 1000);
-    assert (rc == -1);
-
-    //  Close sub
-    //  TODO why does this use zero_linger?
-    test_context_socket_close_zero_linger (sub);
-
-    //  Close monitor
-    //  TODO why does this use zero_linger?
-    test_context_socket_close_zero_linger (sub_mon);
-}
-
-
-// test successful reconnect
-void reconnect_success ()
-{
-    // setup pub socket
-    void *pub = test_context_socket (ZMQ_PUB);
-    //  Bind pub socket
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (pub, ENDPOINT_0));
-
-    // setup sub socket
-    void *sub = test_context_socket (ZMQ_SUB);
-    //  Monitor all events on sub
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_socket_monitor (sub, "inproc://monitor-sub", ZMQ_EVENT_ALL));
-    //  Create socket for collecting monitor events
-    void *sub_mon = test_context_socket (ZMQ_PAIR);
-    //  Connect so they'll get events
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sub_mon, "inproc://monitor-sub"));
-    // set reconnect interval so only a single reconnect is tried
-    int interval = 1 * 1000;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sub, ZMQ_RECONNECT_IVL, &interval, sizeof (interval)));
-    // connect to pub
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sub, ENDPOINT_0));
-
-    //  confirm that we get following events
-    expect_monitor_event (sub_mon, ZMQ_EVENT_CONNECT_DELAYED);
-    expect_monitor_event (sub_mon, ZMQ_EVENT_CONNECTED);
-    expect_monitor_event (sub_mon, ZMQ_EVENT_HANDSHAKE_SUCCEEDED);
-
-    // close the pub socket
-    test_context_socket_close_zero_linger (pub);
-
-    //  confirm that we get following events
-    expect_monitor_event (sub_mon, ZMQ_EVENT_DISCONNECTED);
-    expect_monitor_event (sub_mon, ZMQ_EVENT_CONNECT_RETRIED);
-
-    // ZMQ_EVENT_CONNECT_RETRIED should be last event, because of timeout set above
-    int event;
-    char *event_address;
-    int rc = get_monitor_event_with_timeout (sub_mon, &event, &event_address,
-                                             SETTLE_TIME);
-    assert (rc == -1);
-
-    //  Now re-bind pub socket and wait for re-connect
-    pub = test_context_socket (ZMQ_PUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (pub, ENDPOINT_0));
-    msleep (SETTLE_TIME);
-
-    //  confirm that we get following events
-    expect_monitor_event (sub_mon, ZMQ_EVENT_CONNECT_DELAYED);
-    expect_monitor_event (sub_mon, ZMQ_EVENT_CONNECTED);
-    expect_monitor_event (sub_mon, ZMQ_EVENT_HANDSHAKE_SUCCEEDED);
-
-    // ZMQ_EVENT_HANDSHAKE_SUCCEEDED should be last event
-    rc = get_monitor_event_with_timeout (sub_mon, &event, &event_address,
-                                         SETTLE_TIME);
-    assert (rc == -1);
-
-    //  Close sub
-    //  TODO why does this use zero_linger?
-    test_context_socket_close_zero_linger (sub);
-    test_context_socket_close_zero_linger (pub);
-
-    //  Close monitor
-    //  TODO why does this use zero_linger?
-    test_context_socket_close_zero_linger (sub_mon);
-}
-
-
-#ifdef ZMQ_BUILD_DRAFT_API
-// test stopping reconnect on connection refused
-void reconnect_stop_on_refused ()
-{
-    // setup pub socket
-    void *pub = test_context_socket (ZMQ_PUB);
-    //  Bind pub socket
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (pub, ENDPOINT_0));
-
-    // setup sub socket
-    void *sub = test_context_socket (ZMQ_SUB);
-    //  Monitor all events on sub
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_socket_monitor (sub, "inproc://monitor-sub", ZMQ_EVENT_ALL));
-    //  Create socket for collecting monitor events
-    void *sub_mon = test_context_socket (ZMQ_PAIR);
-    //  Connect so they'll get events
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sub_mon, "inproc://monitor-sub"));
-    // set option to stop reconnecting on error
-    int stopReconnectOnError = ZMQ_RECONNECT_STOP_CONN_REFUSED;
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (sub, ZMQ_RECONNECT_STOP,
-                                               &stopReconnectOnError,
-                                               sizeof (stopReconnectOnError)));
-    // connect to pub
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sub, ENDPOINT_0));
-
-    //  confirm that we get following events
-    expect_monitor_event (sub_mon, ZMQ_EVENT_CONNECT_DELAYED);
-    expect_monitor_event (sub_mon, ZMQ_EVENT_CONNECTED);
-    expect_monitor_event (sub_mon, ZMQ_EVENT_HANDSHAKE_SUCCEEDED);
-
-    // close the pub socket
-    test_context_socket_close_zero_linger (pub);
-
-    //  confirm that we get following events
-    expect_monitor_event (sub_mon, ZMQ_EVENT_DISCONNECTED);
-    expect_monitor_event (sub_mon, ZMQ_EVENT_CONNECT_RETRIED);
-    expect_monitor_event (sub_mon, ZMQ_EVENT_CONNECT_DELAYED);
-    expect_monitor_event (sub_mon, ZMQ_EVENT_CLOSED);
-
-    // ZMQ_EVENT_CLOSED should be last event, because of ZMQ_RECONNECT_STOP set above
-    int event = 0;
-    char *event_address;
-    int rc = get_monitor_event_with_timeout (sub_mon, &event, &event_address,
-                                             2 * 1000);
-    int limit = 0;
-    while ((rc != -1) && (++limit < 1000)) {
-        print_unexpected_event_stderr (event, rc, 0, -1);
-        rc = get_monitor_event_with_timeout (sub_mon, &event, &event_address,
-                                             2 * 1000);
-    }
-
-    //  Close sub
-    //  TODO why does this use zero_linger?
-    test_context_socket_close_zero_linger (sub);
-
-    //  Close monitor
-    //  TODO why does this use zero_linger?
-    test_context_socket_close_zero_linger (sub_mon);
-}
-#endif
-
-#ifdef ZMQ_BUILD_DRAFT_API
-// test stopping reconnect on connection refused
-void reconnect_stop_on_handshake_failed ()
-{
-    char bind_address[MAX_SOCKET_STRING];
-    size_t addr_length = sizeof (bind_address);
-    void *dummy = test_context_socket (ZMQ_STREAM);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (dummy, "tcp://127.0.0.1:0"));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (dummy, ZMQ_LAST_ENDPOINT, bind_address, &addr_length));
-
-    // setup sub socket
-    void *sub = test_context_socket (ZMQ_SUB);
-    //  Monitor all events on sub
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_socket_monitor (sub, "inproc://monitor-sub", ZMQ_EVENT_ALL));
-    //  Create socket for collecting monitor events
-    void *sub_mon = test_context_socket (ZMQ_PAIR);
-    //  Connect so they'll get events
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sub_mon, "inproc://monitor-sub"));
-    // set handshake interval (i.e., timeout) to a more reasonable value
-    int handshakeInterval = 1000;
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (
-      sub, ZMQ_HANDSHAKE_IVL, &handshakeInterval, sizeof (handshakeInterval)));
-    // set option to stop reconnecting on failed handshake
-    int stopReconnectOnError = ZMQ_RECONNECT_STOP_HANDSHAKE_FAILED;
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (sub, ZMQ_RECONNECT_STOP,
-                                               &stopReconnectOnError,
-                                               sizeof (stopReconnectOnError)));
-    // connect to dummy stream socket above
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sub, bind_address));
-
-#if 1
-    // ZMQ_EVENT_DISCONNECTED should be last event, because of ZMQ_RECONNECT_STOP set above
-    expect_monitor_event (sub_mon, ZMQ_EVENT_CONNECT_DELAYED);
-    expect_monitor_event (sub_mon, ZMQ_EVENT_CONNECTED);
-    expect_monitor_event (sub_mon, ZMQ_EVENT_HANDSHAKE_FAILED_NO_DETAIL);
-    expect_monitor_event (sub_mon, ZMQ_EVENT_DISCONNECTED);
-#else
-    print_events (sub_mon, 2 * 1000, 1000);
-#endif
-
-    //  Close sub
-    //  TODO why does this use zero_linger?
-    test_context_socket_close_zero_linger (sub);
-    test_context_socket_close_zero_linger (dummy);
-
-    //  Close monitor
-    //  TODO why does this use zero_linger?
-    test_context_socket_close_zero_linger (sub_mon);
-}
-#endif
-
-void setUp ()
-{
-    setup_test_context ();
-}
-
-void tearDown ()
-{
-    teardown_test_context ();
-}
-
-int main (void)
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-
-    RUN_TEST (reconnect_default);
-    RUN_TEST (reconnect_success);
-#ifdef ZMQ_BUILD_DRAFT_API
-    RUN_TEST (reconnect_stop_on_refused);
-    RUN_TEST (reconnect_stop_on_handshake_failed);
-#endif
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_req_correlate.cpp b/libs/libzmq/tests/test_req_correlate.cpp
deleted file mode 100644
index 04dee10..0000000
--- a/libs/libzmq/tests/test_req_correlate.cpp
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void test_req_correlate ()
-{
-    void *req = test_context_socket (ZMQ_REQ);
-    void *router = test_context_socket (ZMQ_ROUTER);
-
-    int enabled = 1;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (req, ZMQ_REQ_CORRELATE, &enabled, sizeof (int)));
-
-    char my_endpoint[MAX_SOCKET_STRING];
-    bind_loopback_ipv4 (router, my_endpoint, sizeof my_endpoint);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (req, my_endpoint));
-
-    // Send a multi-part request.
-    s_send_seq (req, "ABC", "DEF", SEQ_END);
-
-    zmq_msg_t msg;
-    zmq_msg_init (&msg);
-
-    // Receive peer routing id
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_recv (&msg, router, 0));
-    TEST_ASSERT_GREATER_THAN_INT (0, zmq_msg_size (&msg));
-    zmq_msg_t peer_id_msg;
-    zmq_msg_init (&peer_id_msg);
-    zmq_msg_copy (&peer_id_msg, &msg);
-
-    int more = 0;
-    size_t more_size = sizeof (more);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (router, ZMQ_RCVMORE, &more, &more_size));
-    TEST_ASSERT_TRUE (more);
-
-    // Receive request id 1
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_recv (&msg, router, 0));
-    TEST_ASSERT_EQUAL_UINT (sizeof (uint32_t), zmq_msg_size (&msg));
-    const uint32_t req_id = *static_cast<uint32_t *> (zmq_msg_data (&msg));
-    zmq_msg_t req_id_msg;
-    zmq_msg_init (&req_id_msg);
-    zmq_msg_copy (&req_id_msg, &msg);
-
-    more = 0;
-    more_size = sizeof (more);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (router, ZMQ_RCVMORE, &more, &more_size));
-    TEST_ASSERT_TRUE (more);
-
-    // Receive the rest.
-    s_recv_seq (router, 0, "ABC", "DEF", SEQ_END);
-
-    uint32_t bad_req_id = req_id + 1;
-
-    // Send back a bad reply: wrong req id, 0, data
-    zmq_msg_copy (&msg, &peer_id_msg);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_send (&msg, router, ZMQ_SNDMORE));
-    zmq_msg_init_data (&msg, &bad_req_id, sizeof (uint32_t), NULL, NULL);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_send (&msg, router, ZMQ_SNDMORE));
-    s_send_seq (router, 0, "DATA", SEQ_END);
-
-    // Send back a good reply: good req id, 0, data
-    zmq_msg_copy (&msg, &peer_id_msg);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_send (&msg, router, ZMQ_SNDMORE));
-    zmq_msg_copy (&msg, &req_id_msg);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_send (&msg, router, ZMQ_SNDMORE));
-    s_send_seq (router, 0, "GHI", SEQ_END);
-
-    // Receive reply. If bad reply got through, we wouldn't see
-    // this particular data.
-    s_recv_seq (req, "GHI", SEQ_END);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&msg));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&peer_id_msg));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&req_id_msg));
-
-    test_context_socket_close_zero_linger (req);
-    test_context_socket_close_zero_linger (router);
-}
-
-int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_req_correlate);
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_req_relaxed.cpp b/libs/libzmq/tests/test_req_relaxed.cpp
deleted file mode 100644
index fc9777f..0000000
--- a/libs/libzmq/tests/test_req_relaxed.cpp
+++ /dev/null
@@ -1,233 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-#include <unity.h>
-
-const size_t services = 5;
-
-void *req;
-void *rep[services];
-
-void setUp ()
-{
-    setup_test_context ();
-
-    char my_endpoint[MAX_SOCKET_STRING];
-    req = test_context_socket (ZMQ_REQ);
-
-    int enabled = 1;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (req, ZMQ_REQ_RELAXED, &enabled, sizeof (int)));
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (req, ZMQ_REQ_CORRELATE, &enabled, sizeof (int)));
-
-    bind_loopback_ipv4 (req, my_endpoint, sizeof (my_endpoint));
-
-    for (size_t peer = 0; peer < services; peer++) {
-        rep[peer] = test_context_socket (ZMQ_REP);
-
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (rep[peer], my_endpoint));
-
-        //  These tests require strict ordering, so wait for the connections to
-        //  happen before opening the next, so that messages flow in the
-        //  expected direction
-        msleep (SETTLE_TIME);
-    }
-}
-
-void tearDown ()
-{
-    test_context_socket_close_zero_linger (req);
-    for (size_t peer = 0; peer < services; peer++)
-        test_context_socket_close_zero_linger (rep[peer]);
-
-    teardown_test_context ();
-}
-
-static void bounce (void *socket_)
-{
-    int more;
-    size_t more_size = sizeof (more);
-    do {
-        zmq_msg_t recv_part, sent_part;
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init (&recv_part));
-
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_recv (&recv_part, socket_, 0));
-
-        TEST_ASSERT_SUCCESS_ERRNO (
-          zmq_getsockopt (socket_, ZMQ_RCVMORE, &more, &more_size));
-
-        zmq_msg_init (&sent_part);
-        zmq_msg_copy (&sent_part, &recv_part);
-
-        TEST_ASSERT_SUCCESS_ERRNO (
-          zmq_msg_send (&sent_part, socket_, more ? ZMQ_SNDMORE : 0));
-
-        zmq_msg_close (&recv_part);
-    } while (more);
-}
-
-static int get_events (void *socket_)
-{
-    int events;
-    size_t events_size = sizeof (events);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (socket_, ZMQ_EVENTS, &events, &events_size));
-    return events;
-}
-
-void test_case_1 ()
-{
-    //  Case 1: Second send() before a reply arrives in a pipe.
-
-    int events = get_events (req);
-    TEST_ASSERT_EQUAL_INT (ZMQ_POLLOUT, events);
-
-    //  Send a request, ensure it arrives, don't send a reply
-    s_send_seq (req, "A", "B", SEQ_END);
-    s_recv_seq (rep[0], "A", "B", SEQ_END);
-
-    events = get_events (req);
-    TEST_ASSERT_EQUAL_INT (ZMQ_POLLOUT, events);
-
-    //  Send another request on the REQ socket
-    s_send_seq (req, "C", "D", SEQ_END);
-    s_recv_seq (rep[1], "C", "D", SEQ_END);
-
-    events = get_events (req);
-    TEST_ASSERT_EQUAL_INT (ZMQ_POLLOUT, events);
-
-    //  Send a reply to the first request - that should be discarded by the REQ
-    s_send_seq (rep[0], "WRONG", SEQ_END);
-
-    //  Send the expected reply
-    s_send_seq (rep[1], "OK", SEQ_END);
-    s_recv_seq (req, "OK", SEQ_END);
-
-    //  Another standard req-rep cycle, just to check
-    s_send_seq (req, "E", SEQ_END);
-    s_recv_seq (rep[2], "E", SEQ_END);
-    s_send_seq (rep[2], "F", "G", SEQ_END);
-    s_recv_seq (req, "F", "G", SEQ_END);
-}
-
-void test_case_2 ()
-{
-    //  Case 2: Second send() after a reply is already in a pipe on the REQ.
-
-    // TODO instead of rerunning the previous test cases, only do the relevant parts (or change the peer)
-    test_case_1 ();
-
-    //  Send a request, ensure it arrives, send a reply
-    s_send_seq (req, "H", SEQ_END);
-    s_recv_seq (rep[3], "H", SEQ_END);
-    s_send_seq (rep[3], "BAD", SEQ_END);
-
-    //  Wait for message to be there.
-    msleep (SETTLE_TIME);
-
-    //  Without receiving that reply, send another request on the REQ socket
-    s_send_seq (req, "I", SEQ_END);
-    s_recv_seq (rep[4], "I", SEQ_END);
-
-    //  Send the expected reply
-    s_send_seq (rep[4], "GOOD", SEQ_END);
-    s_recv_seq (req, "GOOD", SEQ_END);
-}
-
-void test_case_3 ()
-{
-    //  Case 3: Check issue #1690. Two send() in a row should not close the
-    //  communication pipes. For example pipe from req to rep[0] should not be
-    //  closed after executing Case 1. So rep[0] should be the next to receive,
-    //  not rep[1].
-
-    // TODO instead of rerunning the previous test cases, only do the relevant parts (or change the peer)
-    test_case_2 ();
-
-    s_send_seq (req, "J", SEQ_END);
-    s_recv_seq (rep[0], "J", SEQ_END);
-}
-
-void test_case_4 ()
-{
-    // TODO this test case does not use the sockets from setUp
-
-    //  Case 4: Check issue #1695. As messages may pile up before a responder
-    //  is available, we check that responses to messages other than the last
-    //  sent one are correctly discarded by the REQ pipe
-
-    //  Setup REQ socket as client
-    void *req = test_context_socket (ZMQ_REQ);
-
-    int enabled = 1;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (req, ZMQ_REQ_RELAXED, &enabled, sizeof (int)));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (req, ZMQ_REQ_CORRELATE, &enabled, sizeof (int)));
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (req, ENDPOINT_0));
-
-    //  Setup ROUTER socket as server but do not bind it just yet
-    void *router = test_context_socket (ZMQ_ROUTER);
-
-    //  Send two requests
-    s_send_seq (req, "TO_BE_DISCARDED", SEQ_END);
-    s_send_seq (req, "TO_BE_ANSWERED", SEQ_END);
-
-    //  Bind server allowing it to receive messages
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (router, ENDPOINT_0));
-
-    //  Read the two messages and send them back as is
-    bounce (router);
-    bounce (router);
-
-    //  Read the expected correlated reply. As the ZMQ_REQ_CORRELATE is active,
-    //  the expected answer is "TO_BE_ANSWERED", not "TO_BE_DISCARDED".
-    s_recv_seq (req, "TO_BE_ANSWERED", SEQ_END);
-
-    test_context_socket_close_zero_linger (req);
-    test_context_socket_close_zero_linger (router);
-}
-
-int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_case_1);
-    RUN_TEST (test_case_2);
-    RUN_TEST (test_case_3);
-    RUN_TEST (test_case_4);
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_reqrep_device.cpp b/libs/libzmq/tests/test_reqrep_device.cpp
deleted file mode 100644
index 3b7b207..0000000
--- a/libs/libzmq/tests/test_reqrep_device.cpp
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void test_roundtrip ()
-{
-    char endpoint1[MAX_SOCKET_STRING];
-    char endpoint2[MAX_SOCKET_STRING];
-
-    //  Create a req/rep device.
-    void *dealer = test_context_socket (ZMQ_DEALER);
-    bind_loopback_ipv4 (dealer, endpoint1, sizeof (endpoint1));
-
-    void *router = test_context_socket (ZMQ_ROUTER);
-    bind_loopback_ipv4 (router, endpoint2, sizeof (endpoint2));
-
-    //  Create a worker.
-    void *rep = test_context_socket (ZMQ_REP);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (rep, endpoint1));
-
-    //  Create a client.
-    void *req = test_context_socket (ZMQ_REQ);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (req, endpoint2));
-
-    //  Send a request.
-    send_string_expect_success (req, "ABC", ZMQ_SNDMORE);
-    send_string_expect_success (req, "DEF", 0);
-
-    //  Pass the request through the device.
-    for (int i = 0; i != 4; i++) {
-        zmq_msg_t msg;
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init (&msg));
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_recv (&msg, router, 0));
-        int rcvmore;
-        size_t sz = sizeof (rcvmore);
-        TEST_ASSERT_SUCCESS_ERRNO (
-          zmq_getsockopt (router, ZMQ_RCVMORE, &rcvmore, &sz));
-        TEST_ASSERT_SUCCESS_ERRNO (
-          zmq_msg_send (&msg, dealer, rcvmore ? ZMQ_SNDMORE : 0));
-    }
-
-    //  Receive the request.
-    recv_string_expect_success (rep, "ABC", 0);
-    int rcvmore;
-    size_t sz = sizeof (rcvmore);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (rep, ZMQ_RCVMORE, &rcvmore, &sz));
-    TEST_ASSERT_TRUE (rcvmore);
-    recv_string_expect_success (rep, "DEF", 0);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (rep, ZMQ_RCVMORE, &rcvmore, &sz));
-    TEST_ASSERT_FALSE (rcvmore);
-
-    //  Send the reply.
-    send_string_expect_success (rep, "GHI", ZMQ_SNDMORE);
-    send_string_expect_success (rep, "JKL", 0);
-
-    //  Pass the reply through the device.
-    for (int i = 0; i != 4; i++) {
-        zmq_msg_t msg;
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init (&msg));
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_recv (&msg, dealer, 0));
-        int rcvmore;
-        size_t sz = sizeof (rcvmore);
-        TEST_ASSERT_SUCCESS_ERRNO (
-          zmq_getsockopt (dealer, ZMQ_RCVMORE, &rcvmore, &sz));
-        TEST_ASSERT_SUCCESS_ERRNO (
-          zmq_msg_send (&msg, router, rcvmore ? ZMQ_SNDMORE : 0));
-    }
-
-    //  Receive the reply.
-    recv_string_expect_success (req, "GHI", 0);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (req, ZMQ_RCVMORE, &rcvmore, &sz));
-    TEST_ASSERT_TRUE (rcvmore);
-    recv_string_expect_success (req, "JKL", 0);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (req, ZMQ_RCVMORE, &rcvmore, &sz));
-    TEST_ASSERT_FALSE (rcvmore);
-
-    //  Clean up.
-    test_context_socket_close (req);
-    test_context_socket_close (rep);
-    test_context_socket_close (router);
-    test_context_socket_close (dealer);
-}
-
-int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_roundtrip);
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_reqrep_device_tipc.cpp b/libs/libzmq/tests/test_reqrep_device_tipc.cpp
deleted file mode 100644
index 930c9da..0000000
--- a/libs/libzmq/tests/test_reqrep_device_tipc.cpp
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-// TODO this is heavily duplicated with test_reqrep_device.cpp
-void test_roundtrip ()
-{
-    //  Create a req/rep device.
-    void *dealer = test_context_socket (ZMQ_DEALER);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (dealer, "tipc://{5560,0,0}"));
-    void *router = test_context_socket (ZMQ_ROUTER);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (router, "tipc://{5561,0,0}"));
-
-    //  Create a worker.
-    void *rep = test_context_socket (ZMQ_REP);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (rep, "tipc://{5560,0}@0.0.0"));
-
-    //  Create a client.
-    void *req = test_context_socket (ZMQ_REQ);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (req, "tipc://{5561,0}@0.0.0"));
-
-    //  Send a request.
-    send_string_expect_success (req, "ABC", ZMQ_SNDMORE);
-    send_string_expect_success (req, "DEF", 0);
-
-    //  Pass the request through the device.
-    for (int i = 0; i != 4; i++) {
-        zmq_msg_t msg;
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init (&msg));
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_recv (&msg, router, 0));
-        int rcvmore;
-        size_t sz = sizeof (rcvmore);
-        TEST_ASSERT_SUCCESS_ERRNO (
-          zmq_getsockopt (router, ZMQ_RCVMORE, &rcvmore, &sz));
-        TEST_ASSERT_SUCCESS_ERRNO (
-          zmq_msg_send (&msg, dealer, rcvmore ? ZMQ_SNDMORE : 0));
-    }
-
-    //  Receive the request.
-    recv_string_expect_success (rep, "ABC", 0);
-    int rcvmore;
-    size_t sz = sizeof (rcvmore);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (rep, ZMQ_RCVMORE, &rcvmore, &sz));
-    TEST_ASSERT_TRUE (rcvmore);
-    recv_string_expect_success (rep, "DEF", 0);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (rep, ZMQ_RCVMORE, &rcvmore, &sz));
-    TEST_ASSERT_FALSE (rcvmore);
-
-    //  Send the reply.
-    send_string_expect_success (rep, "GHI", ZMQ_SNDMORE);
-    send_string_expect_success (rep, "JKL", 0);
-
-    //  Pass the reply through the device.
-    for (int i = 0; i != 4; i++) {
-        zmq_msg_t msg;
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init (&msg));
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_recv (&msg, dealer, 0));
-        int rcvmore;
-        size_t sz = sizeof (rcvmore);
-        TEST_ASSERT_SUCCESS_ERRNO (
-          zmq_getsockopt (dealer, ZMQ_RCVMORE, &rcvmore, &sz));
-        TEST_ASSERT_SUCCESS_ERRNO (
-          zmq_msg_send (&msg, router, rcvmore ? ZMQ_SNDMORE : 0));
-    }
-
-    //  Receive the reply.
-    recv_string_expect_success (req, "GHI", 0);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (req, ZMQ_RCVMORE, &rcvmore, &sz));
-    TEST_ASSERT_TRUE (rcvmore);
-    recv_string_expect_success (req, "JKL", 0);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (req, ZMQ_RCVMORE, &rcvmore, &sz));
-    TEST_ASSERT_FALSE (rcvmore);
-
-    //  Clean up.
-    test_context_socket_close (req);
-    test_context_socket_close (rep);
-    test_context_socket_close (router);
-    test_context_socket_close (dealer);
-}
-
-int main ()
-{
-    if (!is_tipc_available ()) {
-        printf ("TIPC environment unavailable, skipping test\n");
-        return 77;
-    }
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_roundtrip);
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_reqrep_inproc.cpp b/libs/libzmq/tests/test_reqrep_inproc.cpp
deleted file mode 100644
index d12d67e..0000000
--- a/libs/libzmq/tests/test_reqrep_inproc.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void test_roundtrip ()
-{
-    void *sb = test_context_socket (ZMQ_REP);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (sb, "inproc://a"));
-
-    void *sc = test_context_socket (ZMQ_REQ);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sc, "inproc://a"));
-
-    bounce (sb, sc);
-
-    test_context_socket_close (sc);
-    test_context_socket_close (sb);
-}
-
-int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_roundtrip);
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_reqrep_ipc.cpp b/libs/libzmq/tests/test_reqrep_ipc.cpp
deleted file mode 100644
index 90b9903..0000000
--- a/libs/libzmq/tests/test_reqrep_ipc.cpp
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-#include <stdlib.h>
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void test_leak ()
-{
-    char my_endpoint[256];
-
-    void *sb = test_context_socket (ZMQ_REP);
-    bind_loopback_ipc (sb, my_endpoint, sizeof my_endpoint);
-
-    void *sc = test_context_socket (ZMQ_REQ);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sc, my_endpoint));
-
-    static const char leakymsg[] = "leakymsg";
-    send_string_expect_success (sc, leakymsg, 0);
-
-    char *buf = s_recv (sb);
-    free (buf);
-
-    test_context_socket_close (sc);
-
-    msleep (SETTLE_TIME);
-
-    send_string_expect_success (sb, leakymsg, 0);
-
-    test_context_socket_close (sb);
-}
-
-void test_simple (void)
-{
-    char my_endpoint[256];
-
-    void *sb = test_context_socket (ZMQ_REP);
-    bind_loopback_ipc (sb, my_endpoint, sizeof my_endpoint);
-
-    void *sc = test_context_socket (ZMQ_REQ);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sc, my_endpoint));
-
-    bounce (sb, sc);
-
-    test_context_socket_close (sc);
-    test_context_socket_close (sb);
-}
-
-int main (void)
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_simple);
-    RUN_TEST (test_leak);
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_reqrep_tcp.cpp b/libs/libzmq/tests/test_reqrep_tcp.cpp
deleted file mode 100644
index c1bdf47..0000000
--- a/libs/libzmq/tests/test_reqrep_tcp.cpp
+++ /dev/null
@@ -1,220 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-#include <string.h>
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void test_single_connect (int ipv6_)
-{
-    size_t len = MAX_SOCKET_STRING;
-    char my_endpoint[MAX_SOCKET_STRING];
-
-    void *sb = test_context_socket (ZMQ_REP);
-    bind_loopback (sb, ipv6_, my_endpoint, len);
-
-    void *sc = test_context_socket (ZMQ_REQ);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sc, ZMQ_IPV6, &ipv6_, sizeof (int)));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sc, my_endpoint));
-
-    bounce (sb, sc);
-
-    // the sockets are disconnected and unbound explicitly in this test case
-    // to check that this can be done successfully with the expected
-    // endpoints/addresses
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_disconnect (sc, my_endpoint));
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_unbind (sb, my_endpoint));
-
-    test_context_socket_close (sc);
-    test_context_socket_close (sb);
-}
-
-void make_connect_address (char *connect_address_,
-                           const int ipv6_,
-                           const int port_,
-                           const char *bind_address_)
-{
-    sprintf (connect_address_, "tcp://%s:%i;%s", ipv6_ ? "[::1]" : "127.0.0.1",
-             port_, strrchr (bind_address_, '/') + 1);
-}
-
-void test_multi_connect (int ipv6_)
-{
-    size_t len = MAX_SOCKET_STRING;
-    char my_endpoint_0[MAX_SOCKET_STRING];
-    char my_endpoint_1[MAX_SOCKET_STRING];
-    char my_endpoint_2[MAX_SOCKET_STRING];
-    char my_endpoint_3[MAX_SOCKET_STRING * 2];
-
-    void *sb0 = test_context_socket (ZMQ_REP);
-    bind_loopback (sb0, ipv6_, my_endpoint_0, len);
-
-    void *sb1 = test_context_socket (ZMQ_REP);
-    bind_loopback (sb1, ipv6_, my_endpoint_1, len);
-
-    void *sb2 = test_context_socket (ZMQ_REP);
-    bind_loopback (sb2, ipv6_, my_endpoint_2, len);
-
-    void *sc = test_context_socket (ZMQ_REQ);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sc, ZMQ_IPV6, &ipv6_, sizeof (int)));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sc, my_endpoint_0));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sc, my_endpoint_1));
-    make_connect_address (my_endpoint_3, ipv6_, 5564, my_endpoint_2);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sc, my_endpoint_3));
-
-    bounce (sb0, sc);
-    bounce (sb1, sc);
-    bounce (sb2, sc);
-    bounce (sb0, sc);
-    bounce (sb1, sc);
-    bounce (sb2, sc);
-    bounce (sb0, sc);
-
-    /// see comment on zmq_disconnect/zmq_unbind in test_single_connect
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_disconnect (sc, my_endpoint_0));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_disconnect (sc, my_endpoint_3));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_disconnect (sc, my_endpoint_1));
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_unbind (sb0, my_endpoint_0));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_unbind (sb1, my_endpoint_1));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_unbind (sb2, my_endpoint_2));
-
-    test_context_socket_close (sc);
-    test_context_socket_close (sb0);
-    test_context_socket_close (sb1);
-    test_context_socket_close (sb2);
-}
-
-void test_multi_connect_same_port (int ipv6_)
-{
-    size_t len = MAX_SOCKET_STRING;
-    char my_endpoint_0[MAX_SOCKET_STRING];
-    char my_endpoint_1[MAX_SOCKET_STRING];
-    char my_endpoint_2[MAX_SOCKET_STRING * 2];
-    char my_endpoint_3[MAX_SOCKET_STRING * 2];
-    char my_endpoint_4[MAX_SOCKET_STRING * 2];
-    char my_endpoint_5[MAX_SOCKET_STRING * 2];
-
-    void *sb0 = test_context_socket (ZMQ_REP);
-    bind_loopback (sb0, ipv6_, my_endpoint_0, len);
-
-    void *sb1 = test_context_socket (ZMQ_REP);
-    bind_loopback (sb1, ipv6_, my_endpoint_1, len);
-
-    void *sc0 = test_context_socket (ZMQ_REQ);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sc0, ZMQ_IPV6, &ipv6_, sizeof (int)));
-    make_connect_address (my_endpoint_2, ipv6_, 5564, my_endpoint_0);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sc0, my_endpoint_2));
-    make_connect_address (my_endpoint_3, ipv6_, 5565, my_endpoint_1);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sc0, my_endpoint_3));
-
-    void *sc1 = test_context_socket (ZMQ_REQ);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sc1, ZMQ_IPV6, &ipv6_, sizeof (int)));
-    make_connect_address (my_endpoint_4, ipv6_, 5565, my_endpoint_0);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sc1, my_endpoint_4));
-    make_connect_address (my_endpoint_5, ipv6_, 5564, my_endpoint_1);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sc1, my_endpoint_5));
-
-    bounce (sb0, sc0);
-    bounce (sb1, sc0);
-    bounce (sb0, sc1);
-    bounce (sb1, sc1);
-    bounce (sb0, sc0);
-    bounce (sb1, sc0);
-
-    /// see comment on zmq_disconnect/zmq_unbind in test_single_connect
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_disconnect (sc1, my_endpoint_4));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_disconnect (sc1, my_endpoint_5));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_disconnect (sc0, my_endpoint_2));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_disconnect (sc0, my_endpoint_3));
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_unbind (sb0, my_endpoint_0));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_unbind (sb1, my_endpoint_1));
-
-    test_context_socket_close (sc0);
-    test_context_socket_close (sc1);
-    test_context_socket_close (sb0);
-    test_context_socket_close (sb1);
-}
-
-void test_single_connect_ipv4 ()
-{
-    test_single_connect (false);
-}
-
-void test_multi_connect_ipv4 ()
-{
-    test_multi_connect (false);
-}
-
-void test_multi_connect_same_port_ipv4 ()
-{
-    test_multi_connect_same_port (false);
-}
-
-void test_single_connect_ipv6 ()
-{
-    test_single_connect (true);
-}
-
-void test_multi_connect_ipv6 ()
-{
-    test_multi_connect (true);
-}
-
-void test_multi_connect_same_port_ipv6 ()
-{
-    test_multi_connect_same_port (true);
-}
-
-int main (void)
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_single_connect_ipv4);
-    RUN_TEST (test_multi_connect_ipv4);
-    RUN_TEST (test_multi_connect_same_port_ipv4);
-    RUN_TEST (test_single_connect_ipv6);
-    RUN_TEST (test_multi_connect_ipv6);
-    RUN_TEST (test_multi_connect_same_port_ipv6);
-
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_reqrep_tipc.cpp b/libs/libzmq/tests/test_reqrep_tipc.cpp
deleted file mode 100644
index c4b64c8..0000000
--- a/libs/libzmq/tests/test_reqrep_tipc.cpp
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void test_roundtrip ()
-{
-    void *sb = test_context_socket (ZMQ_REP);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (sb, "tipc://{5560,0,0}"));
-
-    void *sc = test_context_socket (ZMQ_REQ);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sc, "tipc://{5560,0}@0.0.0"));
-
-    bounce (sb, sc);
-
-    test_context_socket_close (sc);
-    test_context_socket_close (sb);
-}
-
-int main (void)
-{
-    if (!is_tipc_available ()) {
-        printf ("TIPC environment unavailable, skipping test\n");
-        return 77;
-    }
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_roundtrip);
-
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_reqrep_vmci.cpp b/libs/libzmq/tests/test_reqrep_vmci.cpp
deleted file mode 100644
index f93b910..0000000
--- a/libs/libzmq/tests/test_reqrep_vmci.cpp
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include <string>
-#include <sstream>
-#include <vmci_sockets.h>
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void test_reqrep_vmci ()
-{
-    std::stringstream s;
-    s << "vmci://" << VMCISock_GetLocalCID () << ":" << 5560;
-    std::string endpoint = s.str ();
-
-    void *sb = test_context_socket (ZMQ_DEALER);
-    int rc = zmq_bind (sb, endpoint.c_str ());
-    if (rc < 0 && errno == EAFNOSUPPORT)
-        TEST_IGNORE_MESSAGE ("VMCI not supported");
-    TEST_ASSERT_SUCCESS_ERRNO (rc);
-
-    void *sc = test_context_socket (ZMQ_DEALER);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sc, endpoint.c_str ()));
-
-    expect_bounce_fail (sb, sc);
-
-    test_context_socket_close_zero_linger (sc);
-    test_context_socket_close_zero_linger (sb);
-}
-
-int main (void)
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_reqrep_vmci);
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_router_handover.cpp b/libs/libzmq/tests/test_router_handover.cpp
deleted file mode 100644
index 65cd82e..0000000
--- a/libs/libzmq/tests/test_router_handover.cpp
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void test_with_handover ()
-{
-    char my_endpoint[MAX_SOCKET_STRING];
-    void *router = test_context_socket (ZMQ_ROUTER);
-    bind_loopback_ipv4 (router, my_endpoint, sizeof my_endpoint);
-
-    // Enable the handover flag
-    int handover = 1;
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (router, ZMQ_ROUTER_HANDOVER,
-                                               &handover, sizeof (handover)));
-
-    //  Create dealer called "X" and connect it to our router
-    void *dealer_one = test_context_socket (ZMQ_DEALER);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (dealer_one, ZMQ_ROUTING_ID, "X", 1));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (dealer_one, my_endpoint));
-
-    //  Get message from dealer to know when connection is ready
-    char buffer[255];
-    send_string_expect_success (dealer_one, "Hello", 0);
-
-    recv_string_expect_success (router, "X", 0);
-    recv_string_expect_success (router, "Hello", 0);
-
-    // Now create a second dealer that uses the same routing id
-    void *dealer_two = test_context_socket (ZMQ_DEALER);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (dealer_two, ZMQ_ROUTING_ID, "X", 1));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (dealer_two, my_endpoint));
-
-    //  Get message from dealer to know when connection is ready
-    send_string_expect_success (dealer_two, "Hello", 0);
-
-    recv_string_expect_success (router, "X", 0);
-    recv_string_expect_success (router, "Hello", 0);
-
-    //  Send a message to 'X' routing id. This should be delivered
-    //  to the second dealer, instead of the first because of the handover.
-    send_string_expect_success (router, "X", ZMQ_SNDMORE);
-    send_string_expect_success (router, "Hello", 0);
-
-    //  Ensure that the first dealer doesn't receive the message
-    //  but the second one does
-    const int timeout = SETTLE_TIME;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (dealer_one, ZMQ_RCVTIMEO, &timeout, sizeof timeout));
-    TEST_ASSERT_FAILURE_ERRNO (EAGAIN, zmq_recv (dealer_one, buffer, 255, 0));
-
-    recv_string_expect_success (dealer_two, "Hello", 0);
-
-    test_context_socket_close (router);
-    test_context_socket_close (dealer_one);
-    test_context_socket_close (dealer_two);
-}
-
-void test_without_handover ()
-{
-    size_t len = MAX_SOCKET_STRING;
-    char my_endpoint[MAX_SOCKET_STRING];
-    void *router = test_context_socket (ZMQ_ROUTER);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (router, "tcp://127.0.0.1:*"));
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (router, ZMQ_LAST_ENDPOINT, my_endpoint, &len));
-
-    //  Create dealer called "X" and connect it to our router
-    void *dealer_one = test_context_socket (ZMQ_DEALER);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (dealer_one, ZMQ_ROUTING_ID, "X", 1));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (dealer_one, my_endpoint));
-
-    //  Get message from dealer to know when connection is ready
-    char buffer[255];
-    send_string_expect_success (dealer_one, "Hello", 0);
-
-    recv_string_expect_success (router, "X", 0);
-    recv_string_expect_success (router, "Hello", 0);
-
-    // Now create a second dealer that uses the same routing id
-    void *dealer_two = test_context_socket (ZMQ_DEALER);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (dealer_two, ZMQ_ROUTING_ID, "X", 1));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (dealer_two, my_endpoint));
-
-    //  Send message from second dealer
-    send_string_expect_success (dealer_two, "Hello", 0);
-
-    //  This should be ignored by the router
-    const int timeout = SETTLE_TIME;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (router, ZMQ_RCVTIMEO, &timeout, sizeof timeout));
-    TEST_ASSERT_FAILURE_ERRNO (EAGAIN, zmq_recv (router, buffer, 255, 0));
-
-    //  Send a message to 'X' routing id. This should be delivered
-    //  to the second dealer, instead of the first because of the handover.
-    send_string_expect_success (router, "X", ZMQ_SNDMORE);
-    send_string_expect_success (router, "Hello", 0);
-
-    //  Ensure that the second dealer doesn't receive the message
-    //  but the first one does
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (dealer_two, ZMQ_RCVTIMEO, &timeout, sizeof timeout));
-    TEST_ASSERT_FAILURE_ERRNO (EAGAIN, zmq_recv (dealer_two, buffer, 255, 0));
-
-    recv_string_expect_success (dealer_one, "Hello", 0);
-
-    test_context_socket_close (router);
-    test_context_socket_close (dealer_one);
-    test_context_socket_close (dealer_two);
-}
-
-int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_with_handover);
-    RUN_TEST (test_without_handover);
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_router_mandatory.cpp b/libs/libzmq/tests/test_router_mandatory.cpp
deleted file mode 100644
index 021f671..0000000
--- a/libs/libzmq/tests/test_router_mandatory.cpp
+++ /dev/null
@@ -1,233 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-#include <string.h>
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-#ifdef ZMQ_BUILD_DRAFT_API
-bool send_msg_to_peer_if_ready (void *router_, const char *peer_routing_id_)
-{
-    int rc = TEST_ASSERT_SUCCESS_MESSAGE_ERRNO (
-      zmq_socket_get_peer_state (router_, peer_routing_id_, 1),
-      peer_routing_id_);
-    if (rc & ZMQ_POLLOUT) {
-        send_string_expect_success (router_, peer_routing_id_,
-                                    ZMQ_SNDMORE | ZMQ_DONTWAIT);
-        send_string_expect_success (router_, "Hello", ZMQ_DONTWAIT);
-
-        return true;
-    }
-    return false;
-}
-#endif
-
-void test_get_peer_state ()
-{
-#ifdef ZMQ_BUILD_DRAFT_API
-    void *router = test_context_socket (ZMQ_ROUTER);
-
-    int mandatory = 1;
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (router, ZMQ_ROUTER_MANDATORY,
-                                               &mandatory, sizeof (mandatory)));
-
-    const char *my_endpoint = "inproc://test_get_peer_state";
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (router, my_endpoint));
-
-    void *dealer1 = test_context_socket (ZMQ_DEALER);
-    void *dealer2 = test_context_socket (ZMQ_DEALER);
-
-    //  Lower HWMs to allow doing the test with fewer messages
-    const int hwm = 100;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (router, ZMQ_SNDHWM, &hwm, sizeof (int)));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (dealer1, ZMQ_RCVHWM, &hwm, sizeof (int)));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (dealer2, ZMQ_RCVHWM, &hwm, sizeof (int)));
-
-    const char *dealer1_routing_id = "X";
-    const char *dealer2_routing_id = "Y";
-
-    //  Name dealer1 "X" and connect it to our router
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (dealer1, ZMQ_ROUTING_ID, dealer1_routing_id, 1));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (dealer1, my_endpoint));
-
-    //  Name dealer2 "Y" and connect it to our router
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (dealer2, ZMQ_ROUTING_ID, dealer2_routing_id, 1));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (dealer2, my_endpoint));
-
-    //  Get message from both dealers to know when connection is ready
-    send_string_expect_success (dealer1, "Hello", 0);
-    recv_string_expect_success (router, dealer1_routing_id, 0);
-    recv_string_expect_success (router, "Hello", 0);
-
-    send_string_expect_success (dealer2, "Hello", 0);
-    recv_string_expect_success (router, dealer2_routing_id, 0);
-    recv_string_expect_success (router, "Hello", 0);
-
-    void *poller = zmq_poller_new ();
-    TEST_ASSERT_NOT_NULL (poller);
-
-    //  Poll on router and dealer1, but not on dealer2
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_poller_add (poller, router, NULL, ZMQ_POLLOUT));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_poller_add (poller, dealer1, NULL, ZMQ_POLLIN));
-
-    const unsigned int count = 10000;
-    const unsigned int event_size = 2;
-    bool dealer2_blocked = false;
-    unsigned int dealer1_sent = 0, dealer2_sent = 0, dealer1_received = 0;
-    zmq_poller_event_t events[event_size];
-    for (unsigned int iteration = 0; iteration < count; ++iteration) {
-        TEST_ASSERT_SUCCESS_ERRNO (
-          zmq_poller_wait_all (poller, events, event_size, -1));
-        for (unsigned int event_no = 0; event_no < event_size; ++event_no) {
-            const zmq_poller_event_t &current_event = events[event_no];
-            if (current_event.socket == router
-                && current_event.events & ZMQ_POLLOUT) {
-                if (send_msg_to_peer_if_ready (router, dealer1_routing_id))
-                    ++dealer1_sent;
-
-                if (send_msg_to_peer_if_ready (router, dealer2_routing_id))
-                    ++dealer2_sent;
-                else
-                    dealer2_blocked = true;
-            }
-            if (current_event.socket == dealer1
-                && current_event.events & ZMQ_POLLIN) {
-                recv_string_expect_success (dealer1, "Hello", ZMQ_DONTWAIT);
-                int more;
-                size_t more_size = sizeof (more);
-                TEST_ASSERT_SUCCESS_ERRNO (
-                  zmq_getsockopt (dealer1, ZMQ_RCVMORE, &more, &more_size));
-                TEST_ASSERT_FALSE (more);
-
-                ++dealer1_received;
-            }
-            // never read from dealer2, so its pipe becomes full eventually
-        }
-    }
-    printf ("dealer1_sent = %u, dealer2_sent = %u, dealer1_received = %u\n",
-            dealer1_sent, dealer2_sent, dealer1_received);
-    TEST_ASSERT_TRUE (dealer2_blocked);
-    zmq_poller_destroy (&poller);
-
-    test_context_socket_close (router);
-    test_context_socket_close (dealer1);
-    test_context_socket_close (dealer2);
-#endif
-}
-
-void test_get_peer_state_corner_cases ()
-{
-#ifdef ZMQ_BUILD_DRAFT_API
-    const char peer_routing_id[] = "foo";
-
-    //  call get_peer_state with NULL socket
-    int rc = zmq_socket_get_peer_state (NULL, peer_routing_id,
-                                        strlen (peer_routing_id));
-    TEST_ASSERT_EQUAL_INT (-1, rc);
-    TEST_ASSERT_EQUAL_INT (ENOTSOCK, errno);
-
-    void *dealer = test_context_socket (ZMQ_DEALER);
-    void *router = test_context_socket (ZMQ_ROUTER);
-
-    //  call get_peer_state with a non-ROUTER socket
-    rc = zmq_socket_get_peer_state (dealer, peer_routing_id,
-                                    strlen (peer_routing_id));
-    TEST_ASSERT_EQUAL_INT (-1, rc);
-    TEST_ASSERT_EQUAL_INT (ENOTSUP, errno);
-
-    //  call get_peer_state for an unknown routing id
-    rc = zmq_socket_get_peer_state (router, peer_routing_id,
-                                    strlen (peer_routing_id));
-    TEST_ASSERT_EQUAL_INT (-1, rc);
-    TEST_ASSERT_EQUAL_INT (EHOSTUNREACH, errno);
-
-    test_context_socket_close (router);
-    test_context_socket_close (dealer);
-#endif
-}
-
-void test_basic ()
-{
-    char my_endpoint[MAX_SOCKET_STRING];
-    void *router = test_context_socket (ZMQ_ROUTER);
-    bind_loopback_ipv4 (router, my_endpoint, sizeof my_endpoint);
-
-    //  Send a message to an unknown peer with the default setting
-    //  This will not report any error
-    send_string_expect_success (router, "UNKNOWN", ZMQ_SNDMORE);
-    send_string_expect_success (router, "DATA", 0);
-
-    //  Send a message to an unknown peer with mandatory routing
-    //  This will fail
-    int mandatory = 1;
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (router, ZMQ_ROUTER_MANDATORY,
-                                               &mandatory, sizeof (mandatory)));
-    int rc = zmq_send (router, "UNKNOWN", 7, ZMQ_SNDMORE);
-    TEST_ASSERT_EQUAL_INT (-1, rc);
-    TEST_ASSERT_EQUAL_INT (EHOSTUNREACH, errno);
-
-    //  Create dealer called "X" and connect it to our router
-    void *dealer = test_context_socket (ZMQ_DEALER);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (dealer, ZMQ_ROUTING_ID, "X", 1));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (dealer, my_endpoint));
-
-    //  Get message from dealer to know when connection is ready
-    send_string_expect_success (dealer, "Hello", 0);
-    recv_string_expect_success (router, "X", 0);
-
-    //  Send a message to connected dealer now
-    //  It should work
-    send_string_expect_success (router, "X", ZMQ_SNDMORE);
-    send_string_expect_success (router, "Hello", 0);
-
-    test_context_socket_close (router);
-    test_context_socket_close (dealer);
-}
-
-int main (void)
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_basic);
-    RUN_TEST (test_get_peer_state);
-    RUN_TEST (test_get_peer_state_corner_cases);
-
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_router_mandatory_hwm.cpp b/libs/libzmq/tests/test_router_mandatory_hwm.cpp
deleted file mode 100644
index 1b3ad9f..0000000
--- a/libs/libzmq/tests/test_router_mandatory_hwm.cpp
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-// DEBUG shouldn't be defined in sources as it will cause a redefined symbol
-// error when it is defined in the build configuration. It appears that the
-// intent here is to semi-permanently disable DEBUG tracing statements, so the
-// implementation is changed to accommodate that intent.
-//#define DEBUG 0
-#define TRACE_ENABLED 0
-
-void test_router_mandatory_hwm ()
-{
-    if (TRACE_ENABLED)
-        fprintf (stderr, "Staring router mandatory HWM test ...\n");
-    char my_endpoint[MAX_SOCKET_STRING];
-    void *router = test_context_socket (ZMQ_ROUTER);
-
-    // Configure router socket to mandatory routing and set HWM and linger
-    int mandatory = 1;
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (router, ZMQ_ROUTER_MANDATORY,
-                                               &mandatory, sizeof (mandatory)));
-    int sndhwm = 1;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (router, ZMQ_SNDHWM, &sndhwm, sizeof (sndhwm)));
-    int linger = 1;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (router, ZMQ_LINGER, &linger, sizeof (linger)));
-
-    bind_loopback_ipv4 (router, my_endpoint, sizeof my_endpoint);
-
-    //  Create dealer called "X" and connect it to our router, configure HWM
-    void *dealer = test_context_socket (ZMQ_DEALER);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (dealer, ZMQ_ROUTING_ID, "X", 1));
-    int rcvhwm = 1;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (dealer, ZMQ_RCVHWM, &rcvhwm, sizeof (rcvhwm)));
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (dealer, my_endpoint));
-
-    //  Get message from dealer to know when connection is ready
-    send_string_expect_success (dealer, "Hello", 0);
-    recv_string_expect_success (router, "X", 0);
-
-    int i;
-    const int buf_size = 65536;
-    const uint8_t buf[buf_size] = {0};
-    // Send first batch of messages
-    for (i = 0; i < 100000; ++i) {
-        if (TRACE_ENABLED)
-            fprintf (stderr, "Sending message %d ...\n", i);
-        const int rc = zmq_send (router, "X", 1, ZMQ_DONTWAIT | ZMQ_SNDMORE);
-        if (rc == -1 && zmq_errno () == EAGAIN)
-            break;
-        TEST_ASSERT_EQUAL_INT (1, rc);
-        send_array_expect_success (router, buf, ZMQ_DONTWAIT);
-    }
-    // This should fail after one message but kernel buffering could
-    // skew results
-    TEST_ASSERT_LESS_THAN_INT (10, i);
-    msleep (1000);
-    // Send second batch of messages
-    for (; i < 100000; ++i) {
-        if (TRACE_ENABLED)
-            fprintf (stderr, "Sending message %d (part 2) ...\n", i);
-        const int rc = zmq_send (router, "X", 1, ZMQ_DONTWAIT | ZMQ_SNDMORE);
-        if (rc == -1 && zmq_errno () == EAGAIN)
-            break;
-        TEST_ASSERT_EQUAL_INT (1, rc);
-        send_array_expect_success (router, buf, ZMQ_DONTWAIT);
-    }
-    // This should fail after two messages but kernel buffering could
-    // skew results
-    TEST_ASSERT_LESS_THAN_INT (20, i);
-
-    if (TRACE_ENABLED)
-        fprintf (stderr, "Done sending messages.\n");
-
-    test_context_socket_close (router);
-    test_context_socket_close (dealer);
-}
-
-int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_router_mandatory_hwm);
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_router_mandatory_tipc.cpp b/libs/libzmq/tests/test_router_mandatory_tipc.cpp
deleted file mode 100644
index af9b256..0000000
--- a/libs/libzmq/tests/test_router_mandatory_tipc.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include <stdio.h>
-#include "testutil.hpp"
-
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void test_router_mandatory_tipc ()
-{
-    if (!is_tipc_available ()) {
-        TEST_IGNORE_MESSAGE ("TIPC environment unavailable, skipping test");
-    }
-
-    // Creating the first socket.
-    void *sa = test_context_socket (ZMQ_ROUTER);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (sa, "tipc://{15560,0,0}"));
-
-    // Sending a message to an unknown peer with the default setting
-    send_string_expect_success (sa, "UNKNOWN", ZMQ_SNDMORE);
-    send_string_expect_success (sa, "DATA", 0);
-
-    int mandatory = 1;
-
-    // Set mandatory routing on socket
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (sa, ZMQ_ROUTER_MANDATORY,
-                                               &mandatory, sizeof (mandatory)));
-
-    // Send a message and check that it fails
-    TEST_ASSERT_FAILURE_ERRNO (
-      EHOSTUNREACH, zmq_send (sa, "UNKNOWN", 7, ZMQ_SNDMORE | ZMQ_DONTWAIT));
-
-    test_context_socket_close (sa);
-}
-
-int main (void)
-{
-    UNITY_BEGIN ();
-    RUN_TEST (test_router_mandatory_tipc);
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_router_notify.cpp b/libs/libzmq/tests/test_router_notify.cpp
deleted file mode 100644
index ff3ca4b..0000000
--- a/libs/libzmq/tests/test_router_notify.cpp
+++ /dev/null
@@ -1,322 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-#include <string.h>
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void test_sockopt_router_notify ()
-{
-    void *router = test_context_socket (ZMQ_ROUTER);
-    int opt_notify;
-
-    int opt_notify_read;
-    size_t opt_notify_read_size = sizeof (opt_notify_read);
-
-
-    // default value is off when socket is constructed
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_getsockopt (
-      router, ZMQ_ROUTER_NOTIFY, &opt_notify_read, &opt_notify_read_size));
-
-    TEST_ASSERT_EQUAL (0, opt_notify_read);
-
-
-    // valid value - Connect
-    opt_notify = ZMQ_NOTIFY_CONNECT;
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (
-      router, ZMQ_ROUTER_NOTIFY, &opt_notify, sizeof (opt_notify)));
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_getsockopt (
-      router, ZMQ_ROUTER_NOTIFY, &opt_notify_read, &opt_notify_read_size));
-
-    TEST_ASSERT_EQUAL (opt_notify, opt_notify_read);
-
-
-    // valid value - Disconnect
-    opt_notify = ZMQ_NOTIFY_DISCONNECT;
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (
-      router, ZMQ_ROUTER_NOTIFY, &opt_notify, sizeof (opt_notify)));
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_getsockopt (
-      router, ZMQ_ROUTER_NOTIFY, &opt_notify_read, &opt_notify_read_size));
-
-    TEST_ASSERT_EQUAL (opt_notify, opt_notify_read);
-
-
-    // valid value - Off
-    opt_notify = 0;
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (
-      router, ZMQ_ROUTER_NOTIFY, &opt_notify, sizeof (opt_notify)));
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_getsockopt (
-      router, ZMQ_ROUTER_NOTIFY, &opt_notify_read, &opt_notify_read_size));
-
-    TEST_ASSERT_EQUAL (opt_notify, opt_notify_read);
-
-
-    // valid value - Both
-    opt_notify = ZMQ_NOTIFY_CONNECT | ZMQ_NOTIFY_DISCONNECT;
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (
-      router, ZMQ_ROUTER_NOTIFY, &opt_notify, sizeof (opt_notify)));
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_getsockopt (
-      router, ZMQ_ROUTER_NOTIFY, &opt_notify_read, &opt_notify_read_size));
-
-    TEST_ASSERT_EQUAL (opt_notify, opt_notify_read);
-
-
-    // value boundary
-    opt_notify = -1;
-    TEST_ASSERT_FAILURE_ERRNO (
-      EINVAL, zmq_setsockopt (router, ZMQ_ROUTER_NOTIFY, &opt_notify,
-                              sizeof (opt_notify)));
-
-    opt_notify = (ZMQ_NOTIFY_CONNECT | ZMQ_NOTIFY_DISCONNECT) + 1;
-    TEST_ASSERT_FAILURE_ERRNO (
-      EINVAL, zmq_setsockopt (router, ZMQ_ROUTER_NOTIFY, &opt_notify,
-                              sizeof (opt_notify)));
-
-    // failures don't update the value
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_getsockopt (
-      router, ZMQ_ROUTER_NOTIFY, &opt_notify_read, &opt_notify_read_size));
-
-    TEST_ASSERT_EQUAL (ZMQ_NOTIFY_CONNECT | ZMQ_NOTIFY_DISCONNECT,
-                       opt_notify_read);
-
-
-    test_context_socket_close (router);
-
-
-    // check a non-router socket type
-    void *dealer = test_context_socket (ZMQ_DEALER);
-
-    // setsockopt fails for non-router sockets
-    opt_notify = ZMQ_NOTIFY_CONNECT;
-    TEST_ASSERT_FAILURE_ERRNO (
-      EINVAL, zmq_setsockopt (dealer, ZMQ_ROUTER_NOTIFY, &opt_notify,
-                              sizeof (opt_notify)));
-
-    // getsockopts returns off for any non-router socket
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_getsockopt (
-      dealer, ZMQ_ROUTER_NOTIFY, &opt_notify_read, &opt_notify_read_size));
-
-    TEST_ASSERT_EQUAL (0, opt_notify_read);
-
-
-    test_context_socket_close (dealer);
-}
-
-
-void test_router_notify_helper (int opt_notify_)
-{
-    void *router = test_context_socket (ZMQ_ROUTER);
-    int opt_more;
-    size_t opt_more_length = sizeof (opt_more);
-    int opt_events;
-    size_t opt_events_length = sizeof (opt_events);
-    char connect_address[MAX_SOCKET_STRING];
-
-
-    // valid values
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (
-      router, ZMQ_ROUTER_NOTIFY, &opt_notify_, sizeof (opt_notify_)));
-
-    bind_loopback_ipv4 (router, connect_address, sizeof connect_address);
-
-    void *dealer = test_context_socket (ZMQ_DEALER);
-    const char *dealer_routing_id = "X";
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (dealer, ZMQ_ROUTING_ID, dealer_routing_id, 1));
-
-    // dealer connects
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (dealer, connect_address));
-
-    // connection notification msg
-    if (opt_notify_ & ZMQ_NOTIFY_CONNECT) {
-        // routing-id only message of the connect
-        recv_string_expect_success (router, dealer_routing_id,
-                                    0);             // 1st part: routing-id
-        recv_string_expect_success (router, "", 0); // 2nd part: empty
-        TEST_ASSERT_SUCCESS_ERRNO (
-          zmq_getsockopt (router, ZMQ_RCVMORE, &opt_more, &opt_more_length));
-        TEST_ASSERT_EQUAL (0, opt_more);
-    }
-
-    // test message from the dealer
-    send_string_expect_success (dealer, "Hello", 0);
-    recv_string_expect_success (router, dealer_routing_id, 0);
-    recv_string_expect_success (router, "Hello", 0);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (router, ZMQ_RCVMORE, &opt_more, &opt_more_length));
-    TEST_ASSERT_EQUAL (0, opt_more);
-
-    // dealer disconnects
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_disconnect (dealer, connect_address));
-
-    // need one more process_commands() (???)
-    msleep (SETTLE_TIME);
-    zmq_getsockopt (dealer, ZMQ_EVENTS, &opt_events, &opt_events_length);
-
-    // connection notification msg
-    if (opt_notify_ & ZMQ_NOTIFY_DISCONNECT) {
-        // routing-id only message of the connect
-        recv_string_expect_success (router, dealer_routing_id,
-                                    0);             // 1st part: routing-id
-        recv_string_expect_success (router, "", 0); // 2nd part: empty
-        TEST_ASSERT_SUCCESS_ERRNO (
-          zmq_getsockopt (router, ZMQ_RCVMORE, &opt_more, &opt_more_length));
-        TEST_ASSERT_EQUAL (0, opt_more);
-    }
-
-    test_context_socket_close (dealer);
-    test_context_socket_close (router);
-}
-
-
-void test_router_notify_connect ()
-{
-    test_router_notify_helper (ZMQ_NOTIFY_CONNECT);
-}
-
-
-void test_router_notify_disconnect ()
-{
-    test_router_notify_helper (ZMQ_NOTIFY_DISCONNECT);
-}
-
-
-void test_router_notify_both ()
-{
-    test_router_notify_helper (ZMQ_NOTIFY_CONNECT | ZMQ_NOTIFY_DISCONNECT);
-}
-
-
-void test_handshake_fail ()
-{
-    // setup router socket
-    void *router = test_context_socket (ZMQ_ROUTER);
-    int opt_timeout = 200;
-    int opt_notify = ZMQ_NOTIFY_CONNECT | ZMQ_NOTIFY_DISCONNECT;
-    char connect_address[MAX_SOCKET_STRING];
-
-    // valid values
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (
-      router, ZMQ_ROUTER_NOTIFY, &opt_notify, sizeof (opt_notify)));
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (
-      router, ZMQ_RCVTIMEO, &opt_timeout, sizeof (opt_timeout)));
-
-    bind_loopback_ipv4 (router, connect_address, sizeof connect_address);
-
-    // send something on raw tcp
-    void *stream = test_context_socket (ZMQ_STREAM);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (stream, connect_address));
-
-    send_string_expect_success (stream, "not-a-handshake", 0);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_disconnect (stream, connect_address));
-    test_context_socket_close (stream);
-
-    // no notification delivered
-    char buffer[255];
-    TEST_ASSERT_FAILURE_ERRNO (EAGAIN,
-                               zmq_recv (router, buffer, sizeof (buffer), 0));
-
-    test_context_socket_close (router);
-}
-
-
-void test_error_during_multipart ()
-{
-    /*
-     * If the disconnect occurs in the middle of the multipart
-     * message, the socket should not add the notification at the
-     * end of the incomplete message. It must discard the incomplete
-     * message, and delivert the notification as a new message.
-     */
-
-    char connect_address[MAX_SOCKET_STRING];
-    char long_str[128] = {0};
-    memset (long_str, '*', sizeof (long_str) - 1);
-
-    // setup router
-    void *router = test_context_socket (ZMQ_ROUTER);
-
-    int opt_notify = ZMQ_NOTIFY_DISCONNECT;
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (
-      router, ZMQ_ROUTER_NOTIFY, &opt_notify, sizeof (opt_notify)));
-
-    int64_t opt_maxmsgsize = 64; // the handshake fails if this is too small
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (
-      router, ZMQ_MAXMSGSIZE, &opt_maxmsgsize, sizeof (opt_maxmsgsize)));
-
-    bind_loopback_ipv4 (router, connect_address, sizeof connect_address);
-
-    // setup dealer
-    void *dealer = test_context_socket (ZMQ_DEALER);
-    const char *dealer_routing_id = "X";
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (dealer, ZMQ_ROUTING_ID, dealer_routing_id, 1));
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (dealer, connect_address));
-
-
-    // send multipart message, the 2nd part causes a disconnect.
-    send_string_expect_success (dealer, "Hello2", ZMQ_SNDMORE);
-    send_string_expect_success (dealer, long_str, 0);
-
-    // disconnect notification
-    recv_string_expect_success (router, dealer_routing_id, 0);
-    recv_string_expect_success (router, "", 0);
-
-
-    test_context_socket_close (dealer);
-    test_context_socket_close (router);
-}
-
-
-int main (void)
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_sockopt_router_notify);
-    RUN_TEST (test_router_notify_connect);
-    RUN_TEST (test_router_notify_disconnect);
-    RUN_TEST (test_router_notify_both);
-    RUN_TEST (test_handshake_fail);
-    RUN_TEST (test_error_during_multipart);
-
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_scatter_gather.cpp b/libs/libzmq/tests/test_scatter_gather.cpp
deleted file mode 100644
index 275f155..0000000
--- a/libs/libzmq/tests/test_scatter_gather.cpp
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void test_scatter_gather_multipart_fails ()
-{
-    void *scatter = test_context_socket (ZMQ_SCATTER);
-    void *gather = test_context_socket (ZMQ_GATHER);
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_bind (scatter, "inproc://test-scatter-gather"));
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_connect (gather, "inproc://test-scatter-gather"));
-
-    //  Should fail, multipart is not supported
-    TEST_ASSERT_FAILURE_ERRNO (EINVAL,
-                               zmq_send_const (scatter, "1", 1, ZMQ_SNDMORE));
-
-    test_context_socket_close (scatter);
-    test_context_socket_close (gather);
-}
-
-void test_scatter_gather ()
-{
-    void *scatter = test_context_socket (ZMQ_SCATTER);
-    void *gather = test_context_socket (ZMQ_GATHER);
-    void *gather2 = test_context_socket (ZMQ_GATHER);
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_bind (scatter, "inproc://test-scatter-gather"));
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_connect (gather, "inproc://test-scatter-gather"));
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_connect (gather2, "inproc://test-scatter-gather"));
-
-    send_string_expect_success (scatter, "1", 0);
-    send_string_expect_success (scatter, "2", 0);
-
-    recv_string_expect_success (gather, "1", 0);
-    recv_string_expect_success (gather2, "2", 0);
-
-    test_context_socket_close (scatter);
-    test_context_socket_close (gather);
-    test_context_socket_close (gather2);
-}
-
-int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_scatter_gather);
-    RUN_TEST (test_scatter_gather_multipart_fails);
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_security_curve.cpp b/libs/libzmq/tests/test_security_curve.cpp
deleted file mode 100644
index edc74cd..0000000
--- a/libs/libzmq/tests/test_security_curve.cpp
+++ /dev/null
@@ -1,608 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-// TODO remove this workaround for handling libsodium/tweetnacl
-
-//  To define SIZE_MAX with older compilers
-#define __STDC_LIMIT_MACROS
-
-#if defined ZMQ_CUSTOM_PLATFORM_HPP
-#include "platform.hpp"
-#else
-#include "../src/platform.hpp"
-#endif
-
-#ifndef ZMQ_USE_TWEETNACL
-#define ZMQ_USE_TWEETNACL
-#endif
-#ifdef ZMQ_USE_LIBSODIUM
-#undef ZMQ_USE_LIBSODIUM
-#endif
-
-#include "testutil.hpp"
-#include "testutil_security.hpp"
-#include <unity.h>
-
-#include "../src/tweetnacl.h"
-#include "../src/curve_client_tools.hpp"
-#include "../src/random.hpp"
-
-char error_message_buffer[256];
-
-void *handler;
-void *zap_thread;
-void *server;
-void *server_mon;
-char my_endpoint[MAX_SOCKET_STRING];
-
-void setUp ()
-{
-    setup_test_context ();
-    setup_context_and_server_side (&handler, &zap_thread, &server, &server_mon,
-                                   my_endpoint);
-}
-
-void tearDown ()
-{
-    shutdown_context_and_server_side (zap_thread, server, server_mon, handler);
-    teardown_test_context ();
-}
-
-const int timeout = 250;
-
-const char large_routing_id[] = "0123456789012345678901234567890123456789"
-                                "0123456789012345678901234567890123456789"
-                                "0123456789012345678901234567890123456789"
-                                "0123456789012345678901234567890123456789"
-                                "0123456789012345678901234567890123456789"
-                                "0123456789012345678901234567890123456789"
-                                "012345678901234";
-
-static void zap_handler_large_routing_id (void * /*unused_*/)
-{
-    zap_handler_generic (zap_ok, large_routing_id);
-}
-
-void expect_new_client_curve_bounce_fail (const char *server_public_,
-                                          const char *client_public_,
-                                          const char *client_secret_,
-                                          char *my_endpoint_,
-                                          void *server_,
-                                          void **client_mon_ = NULL,
-                                          int expected_client_event_ = 0,
-                                          int expected_client_value_ = 0)
-{
-    curve_client_data_t curve_client_data = {server_public_, client_public_,
-                                             client_secret_};
-    expect_new_client_bounce_fail (
-      my_endpoint_, server_, socket_config_curve_client, &curve_client_data,
-      client_mon_, expected_client_event_, expected_client_value_);
-}
-
-void test_null_key (void *server_,
-                    void *server_mon_,
-                    char *my_endpoint_,
-                    char *server_public_,
-                    char *client_public_,
-                    char *client_secret_)
-{
-    expect_new_client_curve_bounce_fail (server_public_, client_public_,
-                                         client_secret_, my_endpoint_, server_);
-
-    int handshake_failed_encryption_event_count =
-      expect_monitor_event_multiple (server_mon_,
-                                     ZMQ_EVENT_HANDSHAKE_FAILED_PROTOCOL,
-                                     ZMQ_PROTOCOL_ERROR_ZMTP_CRYPTOGRAPHIC);
-
-    // handshake_failed_encryption_event_count should be at least two because
-    // expect_bounce_fail involves two exchanges
-    // however, with valgrind we see only one event (maybe the next one takes
-    // very long, or does not happen at all because something else takes very
-    // long)
-
-    fprintf (stderr,
-             "count of "
-             "ZMQ_EVENT_HANDSHAKE_FAILED_PROTOCOL/"
-             "ZMQ_PROTOCOL_ERROR_ZMTP_CRYPTOGRAPHIC events: %i\n",
-             handshake_failed_encryption_event_count);
-}
-
-void test_curve_security_with_valid_credentials ()
-{
-    curve_client_data_t curve_client_data = {
-      valid_server_public, valid_client_public, valid_client_secret};
-    void *client_mon;
-    void *client = create_and_connect_client (
-      my_endpoint, socket_config_curve_client, &curve_client_data, &client_mon);
-    bounce (server, client);
-    test_context_socket_close (client);
-
-    int event = get_monitor_event_with_timeout (server_mon, NULL, NULL, -1);
-    assert (event == ZMQ_EVENT_HANDSHAKE_SUCCEEDED);
-
-    assert_no_more_monitor_events_with_timeout (server_mon, timeout);
-
-    event = get_monitor_event_with_timeout (client_mon, NULL, NULL, -1);
-    assert (event == ZMQ_EVENT_HANDSHAKE_SUCCEEDED);
-
-    assert_no_more_monitor_events_with_timeout (client_mon, timeout);
-
-    test_context_socket_close (client_mon);
-}
-
-void test_curve_security_with_bogus_client_credentials ()
-{
-    //  This must be caught by the ZAP handler
-    char bogus_public[41];
-    char bogus_secret[41];
-    zmq_curve_keypair (bogus_public, bogus_secret);
-
-    expect_new_client_curve_bounce_fail (
-      valid_server_public, bogus_public, bogus_secret, my_endpoint, server,
-      NULL, ZMQ_EVENT_HANDSHAKE_FAILED_AUTH, 400);
-
-    int server_event_count = 0;
-    server_event_count = expect_monitor_event_multiple (
-      server_mon, ZMQ_EVENT_HANDSHAKE_FAILED_AUTH, 400);
-    TEST_ASSERT_LESS_OR_EQUAL_INT (1, server_event_count);
-
-    // there may be more than one ZAP request due to repeated attempts by the client
-    TEST_ASSERT (0 == server_event_count
-                 || 1 <= zmq_atomic_counter_value (zap_requests_handled));
-}
-
-void expect_zmtp_mechanism_mismatch (void *client_,
-                                     char *my_endpoint_,
-                                     void *server_,
-                                     void *server_mon_)
-{
-    //  This must be caught by the curve_server class, not passed to ZAP
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (client_, my_endpoint_));
-    expect_bounce_fail (server_, client_);
-    test_context_socket_close_zero_linger (client_);
-
-    expect_monitor_event_multiple (server_mon_,
-                                   ZMQ_EVENT_HANDSHAKE_FAILED_PROTOCOL,
-                                   ZMQ_PROTOCOL_ERROR_ZMTP_MECHANISM_MISMATCH);
-
-    TEST_ASSERT_EQUAL_INT (0, zmq_atomic_counter_value (zap_requests_handled));
-}
-
-void test_curve_security_with_null_client_credentials ()
-{
-    void *client = test_context_socket (ZMQ_DEALER);
-
-    expect_zmtp_mechanism_mismatch (client, my_endpoint, server, server_mon);
-}
-
-void test_curve_security_with_plain_client_credentials ()
-{
-    void *client = test_context_socket (ZMQ_DEALER);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (client, ZMQ_PLAIN_USERNAME, "admin", 5));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (client, ZMQ_PLAIN_PASSWORD, "password", 8));
-
-    expect_zmtp_mechanism_mismatch (client, my_endpoint, server, server_mon);
-}
-
-void test_curve_security_unauthenticated_message ()
-{
-    // Unauthenticated messages from a vanilla socket shouldn't be received
-    fd_t s = connect_socket (my_endpoint);
-    // send anonymous ZMTP/1.0 greeting
-    send (s, "\x01\x00", 2, 0);
-    // send sneaky message that shouldn't be received
-    send (s, "\x08\x00sneaky\0", 9, 0);
-
-    zmq_setsockopt (server, ZMQ_RCVTIMEO, &timeout, sizeof (timeout));
-    char *buf = s_recv (server);
-    TEST_ASSERT_NULL_MESSAGE (buf, "Received unauthenticated message");
-    close (s);
-}
-
-void send_all (fd_t fd_, const char *data_, socket_size_t size_)
-{
-    while (size_ > 0) {
-        int res = send (fd_, data_, size_, 0);
-        TEST_ASSERT_GREATER_THAN_INT (0, res);
-        size_ -= res;
-        data_ += res;
-    }
-}
-
-template <size_t N> void send (fd_t fd_, const char (&data_)[N])
-{
-    send_all (fd_, data_, N - 1);
-}
-
-template <size_t N> void send (fd_t fd_, const uint8_t (&data_)[N])
-{
-    send_all (fd_, reinterpret_cast<const char *> (&data_), N);
-}
-
-void test_curve_security_invalid_hello_wrong_length ()
-{
-    fd_t s = connect_socket (my_endpoint);
-
-    send (s, zmtp_greeting_curve);
-
-    // send CURVE HELLO of wrong size
-    send (s, "\x04\x06\x05HELLO");
-
-    expect_monitor_event_multiple (
-      server_mon, ZMQ_EVENT_HANDSHAKE_FAILED_PROTOCOL,
-      ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_HELLO);
-
-    close (s);
-}
-
-const size_t hello_length = 200;
-const size_t welcome_length = 168;
-
-zmq::curve_client_tools_t make_curve_client_tools ()
-{
-    uint8_t valid_client_secret_decoded[32];
-    uint8_t valid_client_public_decoded[32];
-
-    zmq_z85_decode (valid_client_public_decoded, valid_client_public);
-    zmq_z85_decode (valid_client_secret_decoded, valid_client_secret);
-
-    uint8_t valid_server_public_decoded[32];
-    zmq_z85_decode (valid_server_public_decoded, valid_server_public);
-
-    return zmq::curve_client_tools_t (valid_client_public_decoded,
-                                      valid_client_secret_decoded,
-                                      valid_server_public_decoded);
-}
-
-// same as htonll, which is only available on few platforms (recent Windows, but not on Linux, e.g.(
-static uint64_t host_to_network (uint64_t value_)
-{
-    // The answer is 42
-    static const int num = 42;
-
-    // Check the endianness
-    if (*reinterpret_cast<const char *> (&num) == num) {
-        const uint32_t high_part = htonl (static_cast<uint32_t> (value_ >> 32));
-        const uint32_t low_part =
-          htonl (static_cast<uint32_t> (value_ & 0xFFFFFFFFLL));
-
-        return (static_cast<uint64_t> (low_part) << 32) | high_part;
-    }
-    return value_;
-}
-
-template <size_t N> void send_command (fd_t s_, char (&command_)[N])
-{
-    if (N < 256) {
-        send (s_, "\x04");
-        char len = (char) N;
-        send_all (s_, &len, 1);
-    } else {
-        send (s_, "\x06");
-        uint64_t len = host_to_network (N);
-        send_all (s_, reinterpret_cast<char *> (&len), 8);
-    }
-    send_all (s_, command_, N);
-}
-
-void test_curve_security_invalid_hello_command_name ()
-{
-    fd_t s = connect_socket (my_endpoint);
-
-    send (s, zmtp_greeting_curve);
-
-    zmq::curve_client_tools_t tools = make_curve_client_tools ();
-
-    // send CURVE HELLO with a misspelled command name (but otherwise correct)
-    char hello[hello_length];
-    TEST_ASSERT_SUCCESS_ERRNO (tools.produce_hello (hello, 0));
-    hello[5] = 'X';
-
-    send_command (s, hello);
-
-    expect_monitor_event_multiple (server_mon,
-                                   ZMQ_EVENT_HANDSHAKE_FAILED_PROTOCOL,
-                                   ZMQ_PROTOCOL_ERROR_ZMTP_UNEXPECTED_COMMAND);
-
-    close (s);
-}
-
-void test_curve_security_invalid_hello_version ()
-{
-    fd_t s = connect_socket (my_endpoint);
-
-    send (s, zmtp_greeting_curve);
-
-    zmq::curve_client_tools_t tools = make_curve_client_tools ();
-
-    // send CURVE HELLO with a wrong version number (but otherwise correct)
-    char hello[hello_length];
-    TEST_ASSERT_SUCCESS_ERRNO (tools.produce_hello (hello, 0));
-    hello[6] = 2;
-
-    send_command (s, hello);
-
-    expect_monitor_event_multiple (
-      server_mon, ZMQ_EVENT_HANDSHAKE_FAILED_PROTOCOL,
-      ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_HELLO);
-
-    close (s);
-}
-
-void flush_read (fd_t fd_)
-{
-    int res;
-    char buf[256];
-
-    while ((res = recv (fd_, buf, 256, 0)) == 256) {
-    }
-    TEST_ASSERT_NOT_EQUAL (-1, res);
-}
-
-void recv_all (fd_t fd_, uint8_t *data_, socket_size_t len_)
-{
-    socket_size_t received = 0;
-    while (received < len_) {
-        int res = recv (fd_, reinterpret_cast<char *> (data_), len_, 0);
-        TEST_ASSERT_GREATER_THAN_INT (0, res);
-
-        data_ += res;
-        received += res;
-    }
-}
-
-void recv_greeting (fd_t fd_)
-{
-    uint8_t greeting[64];
-    recv_all (fd_, greeting, 64);
-    //  TODO assert anything about the greeting received from the server?
-}
-
-fd_t connect_exchange_greeting_and_send_hello (
-  char *my_endpoint_, zmq::curve_client_tools_t &tools_)
-{
-    fd_t s = connect_socket (my_endpoint_);
-
-    send (s, zmtp_greeting_curve);
-    recv_greeting (s);
-
-    // send valid CURVE HELLO
-    char hello[hello_length];
-    TEST_ASSERT_SUCCESS_ERRNO (tools_.produce_hello (hello, 0));
-
-    send_command (s, hello);
-    return s;
-}
-
-void test_curve_security_invalid_initiate_wrong_length ()
-{
-    zmq::curve_client_tools_t tools = make_curve_client_tools ();
-
-    fd_t s = connect_exchange_greeting_and_send_hello (my_endpoint, tools);
-
-    // receive but ignore WELCOME
-    flush_read (s);
-
-    int res = get_monitor_event_with_timeout (server_mon, NULL, NULL, timeout);
-    TEST_ASSERT_EQUAL_INT (-1, res);
-
-    send (s, "\x04\x09\x08INITIATE");
-
-    expect_monitor_event_multiple (
-      server_mon, ZMQ_EVENT_HANDSHAKE_FAILED_PROTOCOL,
-      ZMQ_PROTOCOL_ERROR_ZMTP_MALFORMED_COMMAND_INITIATE);
-
-    close (s);
-}
-
-fd_t connect_exchange_greeting_and_hello_welcome (
-  char *my_endpoint_,
-  void *server_mon_,
-  int timeout_,
-  zmq::curve_client_tools_t &tools_)
-{
-    fd_t s = connect_exchange_greeting_and_send_hello (my_endpoint_, tools_);
-
-    // receive but ignore WELCOME
-    uint8_t welcome[welcome_length + 2];
-    recv_all (s, welcome, welcome_length + 2);
-
-    uint8_t cn_precom[crypto_box_BEFORENMBYTES];
-    TEST_ASSERT_SUCCESS_ERRNO (
-      tools_.process_welcome (welcome + 2, welcome_length, cn_precom));
-
-    const int res =
-      get_monitor_event_with_timeout (server_mon_, NULL, NULL, timeout_);
-    TEST_ASSERT_EQUAL_INT (-1, res);
-
-    return s;
-}
-
-void test_curve_security_invalid_initiate_command_name ()
-{
-    zmq::curve_client_tools_t tools = make_curve_client_tools ();
-    fd_t s = connect_exchange_greeting_and_hello_welcome (
-      my_endpoint, server_mon, timeout, tools);
-
-    char initiate[257];
-    tools.produce_initiate (initiate, 257, 1, NULL, 0);
-    // modify command name
-    initiate[5] = 'X';
-
-    send_command (s, initiate);
-
-    expect_monitor_event_multiple (server_mon,
-                                   ZMQ_EVENT_HANDSHAKE_FAILED_PROTOCOL,
-                                   ZMQ_PROTOCOL_ERROR_ZMTP_UNEXPECTED_COMMAND);
-
-    close (s);
-}
-
-void test_curve_security_invalid_initiate_command_encrypted_cookie ()
-{
-    zmq::curve_client_tools_t tools = make_curve_client_tools ();
-    fd_t s = connect_exchange_greeting_and_hello_welcome (
-      my_endpoint, server_mon, timeout, tools);
-
-    char initiate[257];
-    tools.produce_initiate (initiate, 257, 1, NULL, 0);
-    // make garbage from encrypted cookie
-    initiate[30] = !initiate[30];
-
-    send_command (s, initiate);
-
-    expect_monitor_event_multiple (server_mon,
-                                   ZMQ_EVENT_HANDSHAKE_FAILED_PROTOCOL,
-                                   ZMQ_PROTOCOL_ERROR_ZMTP_CRYPTOGRAPHIC);
-
-    close (s);
-}
-
-void test_curve_security_invalid_initiate_command_encrypted_content ()
-{
-    zmq::curve_client_tools_t tools = make_curve_client_tools ();
-    fd_t s = connect_exchange_greeting_and_hello_welcome (
-      my_endpoint, server_mon, timeout, tools);
-
-    char initiate[257];
-    tools.produce_initiate (initiate, 257, 1, NULL, 0);
-    // make garbage from encrypted content
-    initiate[150] = !initiate[150];
-
-    send_command (s, initiate);
-
-    expect_monitor_event_multiple (server_mon,
-                                   ZMQ_EVENT_HANDSHAKE_FAILED_PROTOCOL,
-                                   ZMQ_PROTOCOL_ERROR_ZMTP_CRYPTOGRAPHIC);
-
-    close (s);
-}
-
-void test_curve_security_invalid_keysize (void *ctx_)
-{
-    //  Check return codes for invalid buffer sizes
-    void *client = zmq_socket (ctx_, ZMQ_DEALER);
-    TEST_ASSERT_NOT_NULL (client);
-    errno = 0;
-    int rc =
-      zmq_setsockopt (client, ZMQ_CURVE_SERVERKEY, valid_server_public, 123);
-    assert (rc == -1 && errno == EINVAL);
-    errno = 0;
-    rc = zmq_setsockopt (client, ZMQ_CURVE_PUBLICKEY, valid_client_public, 123);
-    assert (rc == -1 && errno == EINVAL);
-    errno = 0;
-    rc = zmq_setsockopt (client, ZMQ_CURVE_SECRETKEY, valid_client_secret, 123);
-    assert (rc == -1 && errno == EINVAL);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_close (client));
-}
-
-// TODO why isn't this const?
-char null_key[] = "0000000000000000000000000000000000000000";
-
-void test_null_server_key ()
-{
-    //  Check CURVE security with a null server key
-    //  This will be caught by the curve_server class, not passed to ZAP
-    test_null_key (server, server_mon, my_endpoint, null_key,
-                   valid_client_public, valid_client_secret);
-}
-
-void test_null_client_public_key ()
-{
-    //  Check CURVE security with a null client public key
-    //  This will be caught by the curve_server class, not passed to ZAP
-    test_null_key (server, server_mon, my_endpoint, valid_server_public,
-                   null_key, valid_client_secret);
-}
-
-void test_null_client_secret_key ()
-{
-    //  Check CURVE security with a null client public key
-    //  This will be caught by the curve_server class, not passed to ZAP
-    test_null_key (server, server_mon, my_endpoint, valid_server_public,
-                   valid_client_public, null_key);
-}
-
-
-int main (void)
-{
-    if (!zmq_has ("curve")) {
-        printf ("CURVE encryption not installed, skipping test\n");
-        return 0;
-    }
-
-    zmq::random_open ();
-
-    setup_testutil_security_curve ();
-
-
-    setup_test_environment (180);
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_curve_security_with_valid_credentials);
-    RUN_TEST (test_null_server_key);
-    RUN_TEST (test_null_client_public_key);
-    RUN_TEST (test_null_client_secret_key);
-    RUN_TEST (test_curve_security_with_bogus_client_credentials);
-    RUN_TEST (test_curve_security_with_null_client_credentials);
-    RUN_TEST (test_curve_security_with_plain_client_credentials);
-    RUN_TEST (test_curve_security_unauthenticated_message);
-
-    //  tests with misbehaving CURVE client
-    RUN_TEST (test_curve_security_invalid_hello_wrong_length);
-    RUN_TEST (test_curve_security_invalid_hello_command_name);
-    RUN_TEST (test_curve_security_invalid_hello_version);
-    RUN_TEST (test_curve_security_invalid_initiate_wrong_length);
-    RUN_TEST (test_curve_security_invalid_initiate_command_name);
-    RUN_TEST (test_curve_security_invalid_initiate_command_encrypted_cookie);
-    RUN_TEST (test_curve_security_invalid_initiate_command_encrypted_content);
-
-    // TODO this requires a deviating test setup, must be moved to a separate executable/fixture
-    //  test with a large routing id (resulting in large metadata)
-    fprintf (stderr,
-             "test_curve_security_with_valid_credentials (large routing id)\n");
-    setup_test_context ();
-    setup_context_and_server_side (&handler, &zap_thread, &server, &server_mon,
-                                   my_endpoint, &zap_handler_large_routing_id,
-                                   &socket_config_curve_server,
-                                   &valid_server_secret, large_routing_id);
-    test_curve_security_with_valid_credentials ();
-    shutdown_context_and_server_side (zap_thread, server, server_mon, handler);
-    teardown_test_context ();
-
-    void *ctx = zmq_ctx_new ();
-    test_curve_security_invalid_keysize (ctx);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_ctx_term (ctx));
-
-    zmq::random_close ();
-
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_security_gssapi.cpp b/libs/libzmq/tests/test_security_gssapi.cpp
deleted file mode 100644
index 2203d4d..0000000
--- a/libs/libzmq/tests/test_security_gssapi.cpp
+++ /dev/null
@@ -1,274 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_monitoring.hpp"
-#include "testutil_unity.hpp"
-
-#include <stdlib.h>
-#include <string.h>
-
-//  This test requires a KRB5 environment with the following
-//  service principal (substitute your host.domain and REALM):
-//
-//    zmqtest2/host.domain@REALM   (host.domain should be host running test)
-//
-//  Export keys for this principal to a keytab file and set the environment
-//  variables KRB5_KTNAME and KRB5_CLIENT_KTNAME to FILE:/path/to/your/keytab.
-//  The test will use it both for client and server roles.
-//
-//  The test is derived in large part from test_security_curve.cpp
-
-const char *name = "zmqtest2";
-
-static volatile int zap_deny_all = 0;
-
-//  --------------------------------------------------------------------------
-//  This methods receives and validates ZAP requests (allowing or denying
-//  each client connection).
-//  N.B. on failure, each crypto type in keytab will be tried
-
-static void zap_handler (void *handler_)
-{
-    //  Process ZAP requests forever
-    while (true) {
-        char *version = s_recv (handler_);
-        if (!version)
-            break; //  Terminating
-
-        char *sequence = s_recv (handler_);
-        char *domain = s_recv (handler_);
-        char *address = s_recv (handler_);
-        char *routing_id = s_recv (handler_);
-        char *mechanism = s_recv (handler_);
-        char *principal = s_recv (handler_);
-
-        TEST_ASSERT_EQUAL_STRING ("1.0", version);
-        TEST_ASSERT_EQUAL_STRING ("GSSAPI", mechanism);
-
-        send_string_expect_success (handler_, version, ZMQ_SNDMORE);
-        send_string_expect_success (handler_, sequence, ZMQ_SNDMORE);
-
-        if (!zap_deny_all) {
-            send_string_expect_success (handler_, "200", ZMQ_SNDMORE);
-            send_string_expect_success (handler_, "OK", ZMQ_SNDMORE);
-            send_string_expect_success (handler_, "anonymous", ZMQ_SNDMORE);
-            send_string_expect_success (handler_, "", 0);
-            //fprintf (stderr, "ALLOW %s\n", principal);
-        } else {
-            send_string_expect_success (handler_, "400", ZMQ_SNDMORE);
-            send_string_expect_success (handler_, "Denied", ZMQ_SNDMORE);
-            send_string_expect_success (handler_, "", ZMQ_SNDMORE);
-            send_string_expect_success (handler_, "", 0);
-            //fprintf (stderr, "DENY %s\n", principal);
-        }
-        free (version);
-        free (sequence);
-        free (domain);
-        free (address);
-        free (routing_id);
-        free (mechanism);
-        free (principal);
-    }
-    zmq_close (handler_);
-}
-
-static char my_endpoint[MAX_SOCKET_STRING];
-static void *zap_thread;
-static void *server;
-static void *server_mon;
-
-void check_krb_available ()
-{
-    if (!getenv ("KRB5_KTNAME") || !getenv ("KRB5_CLIENT_KTNAME")) {
-        TEST_IGNORE_MESSAGE ("KRB5 environment unavailable, skipping test");
-    }
-}
-
-void setUp ()
-{
-    setup_test_context ();
-
-    zap_thread = 0;
-    server = NULL;
-    server_mon = NULL;
-
-    check_krb_available ();
-
-    //  Spawn ZAP handler
-    //  We create and bind ZAP socket in main thread to avoid case
-    //  where child thread does not start up fast enough.
-    void *handler = zmq_socket (get_test_context (), ZMQ_REP);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (handler, "inproc://zeromq.zap.01"));
-    zap_thread = zmq_threadstart (&zap_handler, handler);
-
-    //  Server socket will accept connections
-    server = test_context_socket (ZMQ_DEALER);
-    int as_server = 1;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (server, ZMQ_GSSAPI_SERVER, &as_server, sizeof (int)));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (server, ZMQ_GSSAPI_PRINCIPAL, name, strlen (name) + 1));
-    int name_type = ZMQ_GSSAPI_NT_HOSTBASED;
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (
-      server, ZMQ_GSSAPI_PRINCIPAL_NAMETYPE, &name_type, sizeof (name_type)));
-    bind_loopback_ipv4 (server, my_endpoint, sizeof my_endpoint);
-
-    //  Monitor handshake events on the server
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_socket_monitor (
-      server, "inproc://monitor-server",
-      ZMQ_EVENT_HANDSHAKE_SUCCEEDED | ZMQ_EVENT_HANDSHAKE_FAILED_AUTH
-        | ZMQ_EVENT_HANDSHAKE_FAILED_PROTOCOL));
-
-    //  Create socket for collecting monitor events
-    server_mon = test_context_socket (ZMQ_PAIR);
-
-    //  Connect it to the inproc endpoints so they'll get events
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_connect (server_mon, "inproc://monitor-server"));
-}
-
-void tearDown ()
-{
-    //  Shutdown
-    if (server_mon)
-        test_context_socket_close_zero_linger (server_mon);
-    if (server)
-        test_context_socket_close (server);
-    teardown_test_context ();
-
-    //  Wait until ZAP handler terminates
-    if (zap_thread)
-        zmq_threadclose (zap_thread);
-}
-
-void test_valid_creds ()
-{
-    void *client = test_context_socket (ZMQ_DEALER);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (
-      client, ZMQ_GSSAPI_SERVICE_PRINCIPAL, name, strlen (name) + 1));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (client, ZMQ_GSSAPI_PRINCIPAL, name, strlen (name) + 1));
-    int name_type = ZMQ_GSSAPI_NT_HOSTBASED;
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (
-      client, ZMQ_GSSAPI_PRINCIPAL_NAMETYPE, &name_type, sizeof (name_type)));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (client, my_endpoint));
-
-    bounce (server, client);
-    test_context_socket_close (client);
-
-    int event = get_monitor_event (server_mon, NULL, NULL);
-    TEST_ASSERT_EQUAL_INT (ZMQ_EVENT_HANDSHAKE_SUCCEEDED, event);
-}
-
-//  Check security with valid but unauthorized credentials
-//  Note: ZAP may see multiple requests - after a failure, client will
-//  fall back to other crypto types for principal, if available.
-void test_unauth_creds ()
-{
-    void *client = test_context_socket (ZMQ_DEALER);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (
-      client, ZMQ_GSSAPI_SERVICE_PRINCIPAL, name, strlen (name) + 1));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (client, ZMQ_GSSAPI_PRINCIPAL, name, strlen (name) + 1));
-    int name_type = ZMQ_GSSAPI_NT_HOSTBASED;
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (
-      client, ZMQ_GSSAPI_PRINCIPAL_NAMETYPE, &name_type, sizeof (name_type)));
-    zap_deny_all = 1;
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (client, my_endpoint));
-
-    expect_bounce_fail (server, client);
-    test_context_socket_close_zero_linger (client);
-
-    int event = get_monitor_event (server_mon, NULL, NULL);
-    TEST_ASSERT_EQUAL_INT (ZMQ_EVENT_HANDSHAKE_FAILED_AUTH, event);
-}
-
-//  Check GSSAPI security with NULL client credentials
-//  This must be caught by the gssapi_server class, not passed to ZAP
-void test_null_creds ()
-{
-    void *client = test_context_socket (ZMQ_DEALER);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (client, my_endpoint));
-    expect_bounce_fail (server, client);
-    test_context_socket_close_zero_linger (client);
-
-    int error;
-    int event = get_monitor_event (server_mon, &error, NULL);
-    TEST_ASSERT_EQUAL_INT (ZMQ_EVENT_HANDSHAKE_FAILED_PROTOCOL, event);
-    TEST_ASSERT_EQUAL_INT (ZMQ_PROTOCOL_ERROR_ZMTP_MECHANISM_MISMATCH, error);
-}
-
-//  Check GSSAPI security with PLAIN client credentials
-//  This must be caught by the curve_server class, not passed to ZAP
-void test_plain_creds ()
-{
-    void *client = test_context_socket (ZMQ_DEALER);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (client, ZMQ_PLAIN_USERNAME, "admin", 5));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (client, ZMQ_PLAIN_PASSWORD, "password", 8));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (client, my_endpoint));
-    expect_bounce_fail (server, client);
-    test_context_socket_close_zero_linger (client);
-}
-
-// Unauthenticated messages from a vanilla socket shouldn't be received
-void test_vanilla_socket ()
-{
-    fd_t s = connect_socket (my_endpoint);
-    // send anonymous ZMTP/1.0 greeting
-    send (s, "\x01\x00", 2, 0);
-    // send sneaky message that shouldn't be received
-    send (s, "\x08\x00sneaky\0", 9, 0);
-    int timeout = 250;
-    zmq_setsockopt (server, ZMQ_RCVTIMEO, &timeout, sizeof (timeout));
-    char *buf = s_recv (server);
-    if (buf != NULL) {
-        printf ("Received unauthenticated message: %s\n", buf);
-        TEST_ASSERT_NULL (buf);
-    }
-    close (s);
-}
-
-int main (void)
-{
-    // Avoid entanglements with user's credential cache
-    setenv ("KRB5CCNAME", "MEMORY", 1);
-
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_valid_creds);
-    RUN_TEST (test_null_creds);
-    RUN_TEST (test_plain_creds);
-    RUN_TEST (test_vanilla_socket);
-    RUN_TEST (test_unauth_creds);
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_security_no_zap_handler.cpp b/libs/libzmq/tests/test_security_no_zap_handler.cpp
deleted file mode 100644
index cce2ef6..0000000
--- a/libs/libzmq/tests/test_security_no_zap_handler.cpp
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void test_no_zap_handler ()
-{
-    //  We first test client/server with a ZAP domain but with no handler
-    //  If there is no handler, libzmq should ignore the ZAP option unless
-    //  ZMQ_ZAP_ENFORCE_DOMAIN is set
-    void *server = test_context_socket (ZMQ_DEALER);
-    void *client = test_context_socket (ZMQ_DEALER);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (server, ZMQ_ZAP_DOMAIN, "TEST", 5));
-    char my_endpoint[MAX_SOCKET_STRING];
-    bind_loopback_ipv4 (server, my_endpoint, sizeof my_endpoint);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (client, my_endpoint));
-    bounce (server, client);
-    test_context_socket_close_zero_linger (client);
-    test_context_socket_close_zero_linger (server);
-}
-
-void test_no_zap_handler_enforce_domain ()
-{
-#ifdef ZMQ_ZAP_ENFORCE_DOMAIN
-    //  Now set ZMQ_ZAP_ENFORCE_DOMAIN which strictly enforces the ZAP
-    //  RFC but is backward-incompatible, now it should fail
-    void *server = test_context_socket (ZMQ_DEALER);
-    void *client = test_context_socket (ZMQ_DEALER);
-    int required = 1;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (server, ZMQ_ZAP_ENFORCE_DOMAIN, &required, sizeof (int)));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (server, ZMQ_ZAP_DOMAIN, "TEST", 5));
-    char my_endpoint[MAX_SOCKET_STRING];
-    bind_loopback_ipv4 (server, my_endpoint, sizeof my_endpoint);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (client, my_endpoint));
-    expect_bounce_fail (server, client);
-    test_context_socket_close_zero_linger (client);
-    test_context_socket_close_zero_linger (server);
-#endif
-}
-
-int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_no_zap_handler);
-    RUN_TEST (test_no_zap_handler_enforce_domain);
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_security_null.cpp b/libs/libzmq/tests/test_security_null.cpp
deleted file mode 100644
index d6e17a2..0000000
--- a/libs/libzmq/tests/test_security_null.cpp
+++ /dev/null
@@ -1,199 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-#if defined(ZMQ_HAVE_WINDOWS)
-#include <winsock2.h>
-#include <ws2tcpip.h>
-#include <stdexcept>
-#define close closesocket
-#else
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <unistd.h>
-#endif
-
-#include <stdlib.h>
-
-static void zap_handler (void *handler_)
-{
-    //  Process ZAP requests forever
-    while (true) {
-        char *version = s_recv (handler_);
-        if (!version)
-            break; //  Terminating
-
-        char *sequence = s_recv (handler_);
-        char *domain = s_recv (handler_);
-        char *address = s_recv (handler_);
-        char *routing_id = s_recv (handler_);
-        char *mechanism = s_recv (handler_);
-
-        TEST_ASSERT_EQUAL_STRING ("1.0", version);
-        TEST_ASSERT_EQUAL_STRING ("NULL", mechanism);
-
-        send_string_expect_success (handler_, version, ZMQ_SNDMORE);
-        send_string_expect_success (handler_, sequence, ZMQ_SNDMORE);
-        if (streq (domain, "TEST")) {
-            send_string_expect_success (handler_, "200", ZMQ_SNDMORE);
-            send_string_expect_success (handler_, "OK", ZMQ_SNDMORE);
-            send_string_expect_success (handler_, "anonymous", ZMQ_SNDMORE);
-            send_string_expect_success (handler_, "", 0);
-        } else {
-            send_string_expect_success (handler_, "400", ZMQ_SNDMORE);
-            send_string_expect_success (handler_, "BAD DOMAIN", ZMQ_SNDMORE);
-            send_string_expect_success (handler_, "", ZMQ_SNDMORE);
-            send_string_expect_success (handler_, "", 0);
-        }
-        free (version);
-        free (sequence);
-        free (domain);
-        free (address);
-        free (routing_id);
-        free (mechanism);
-    }
-    close_zero_linger (handler_);
-}
-
-void *zap_thread;
-
-static void setup_zap_handler ()
-{
-    //  Spawn ZAP handler
-    //  We create and bind ZAP socket in main thread to avoid case
-    //  where child thread does not start up fast enough.
-    void *handler = zmq_socket (get_test_context (), ZMQ_REP);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (handler, "inproc://zeromq.zap.01"));
-    zap_thread = zmq_threadstart (&zap_handler, handler);
-}
-
-static void teardown_zap_handler ()
-{
-    //  Wait until ZAP handler terminates
-    zmq_threadclose (zap_thread);
-}
-
-void setUp ()
-{
-    setup_test_context ();
-    setup_zap_handler ();
-}
-
-void tearDown ()
-{
-    teardown_test_context ();
-    teardown_zap_handler ();
-}
-
-void test_no_domain ()
-{
-    //  We first test client/server with no ZAP domain
-    //  Libzmq does not call our ZAP handler, the connect must succeed
-    void *server = test_context_socket (ZMQ_DEALER);
-    void *client = test_context_socket (ZMQ_DEALER);
-    char my_endpoint[MAX_SOCKET_STRING];
-    bind_loopback_ipv4 (server, my_endpoint, sizeof my_endpoint);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (client, my_endpoint));
-    bounce (server, client);
-    test_context_socket_close_zero_linger (client);
-    test_context_socket_close_zero_linger (server);
-}
-
-void test_wrong_domain_fails ()
-{
-    //  Now define a ZAP domain for the server; this enables
-    //  authentication. We're using the wrong domain so this test
-    //  must fail.
-    void *server = test_context_socket (ZMQ_DEALER);
-    void *client = test_context_socket (ZMQ_DEALER);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (server, ZMQ_ZAP_DOMAIN, "WRONG", 5));
-    char my_endpoint[MAX_SOCKET_STRING];
-    bind_loopback_ipv4 (server, my_endpoint, sizeof my_endpoint);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (client, my_endpoint));
-    expect_bounce_fail (server, client);
-    test_context_socket_close_zero_linger (client);
-    test_context_socket_close_zero_linger (server);
-}
-
-void test_success ()
-{
-    //  Now use the right domain, the test must pass
-    void *server = test_context_socket (ZMQ_DEALER);
-    void *client = test_context_socket (ZMQ_DEALER);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (server, ZMQ_ZAP_DOMAIN, "TEST", 4));
-    char my_endpoint[MAX_SOCKET_STRING];
-    bind_loopback_ipv4 (server, my_endpoint, sizeof my_endpoint);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (client, my_endpoint));
-    bounce (server, client);
-    test_context_socket_close_zero_linger (client);
-    test_context_socket_close_zero_linger (server);
-}
-
-void test_vanilla_socket ()
-{
-    // Unauthenticated messages from a vanilla socket shouldn't be received
-    void *server = test_context_socket (ZMQ_DEALER);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (server, ZMQ_ZAP_DOMAIN, "WRONG", 5));
-    char my_endpoint[MAX_SOCKET_STRING];
-    bind_loopback_ipv4 (server, my_endpoint, sizeof my_endpoint);
-
-    fd_t s = connect_socket (my_endpoint);
-
-    // send anonymous ZMTP/1.0 greeting
-    send (s, "\x01\x00", 2, 0);
-    // send sneaky message that shouldn't be received
-    send (s, "\x08\x00sneaky\0", 9, 0);
-    int timeout = 250;
-    zmq_setsockopt (server, ZMQ_RCVTIMEO, &timeout, sizeof (timeout));
-    char *buf = s_recv (server);
-    if (buf != NULL) {
-        printf ("Received unauthenticated message: %s\n", buf);
-        TEST_ASSERT_NULL (buf);
-    }
-    close (s);
-    test_context_socket_close_zero_linger (server);
-}
-
-int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_no_domain);
-    RUN_TEST (test_wrong_domain_fails);
-    RUN_TEST (test_success);
-    RUN_TEST (test_vanilla_socket);
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_security_plain.cpp b/libs/libzmq/tests/test_security_plain.cpp
deleted file mode 100644
index 7cfc53c..0000000
--- a/libs/libzmq/tests/test_security_plain.cpp
+++ /dev/null
@@ -1,211 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-#include <stdlib.h>
-#include <string.h>
-
-static void zap_handler (void *zap_)
-{
-    //  Process ZAP requests forever
-    while (true) {
-        char *version = s_recv (zap_);
-        if (!version)
-            break; //  Terminating
-        char *sequence = s_recv (zap_);
-        char *domain = s_recv (zap_);
-        char *address = s_recv (zap_);
-        char *routing_id = s_recv (zap_);
-        char *mechanism = s_recv (zap_);
-        char *username = s_recv (zap_);
-        char *password = s_recv (zap_);
-
-        TEST_ASSERT_EQUAL_STRING ("1.0", version);
-        TEST_ASSERT_EQUAL_STRING ("PLAIN", mechanism);
-        TEST_ASSERT_EQUAL_STRING ("IDENT", routing_id);
-
-        send_string_expect_success (zap_, version, ZMQ_SNDMORE);
-        send_string_expect_success (zap_, sequence, ZMQ_SNDMORE);
-        if (streq (username, "admin") && streq (password, "password")) {
-            send_string_expect_success (zap_, "200", ZMQ_SNDMORE);
-            send_string_expect_success (zap_, "OK", ZMQ_SNDMORE);
-            send_string_expect_success (zap_, "anonymous", ZMQ_SNDMORE);
-            send_string_expect_success (zap_, "", 0);
-        } else {
-            send_string_expect_success (zap_, "400", ZMQ_SNDMORE);
-            send_string_expect_success (zap_, "Invalid username or password",
-                                        ZMQ_SNDMORE);
-            send_string_expect_success (zap_, "", ZMQ_SNDMORE);
-            send_string_expect_success (zap_, "", 0);
-        }
-        free (version);
-        free (sequence);
-        free (domain);
-        free (address);
-        free (routing_id);
-        free (mechanism);
-        free (username);
-        free (password);
-    }
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_close (zap_));
-}
-
-void *zap_thread;
-
-char my_endpoint[MAX_SOCKET_STRING];
-
-static void setup_zap_handler ()
-{
-    //  Spawn ZAP handler
-    //  We create and bind ZAP socket in main thread to avoid case
-    //  where child thread does not start up fast enough.
-    void *handler = zmq_socket (get_test_context (), ZMQ_REP);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (handler, "inproc://zeromq.zap.01"));
-    zap_thread = zmq_threadstart (&zap_handler, handler);
-}
-
-static void teardown_zap_handler ()
-{
-    //  Wait until ZAP handler terminates
-    zmq_threadclose (zap_thread);
-}
-
-const char domain[] = "test";
-
-void *server;
-
-static void setup_server ()
-{
-    //  Server socket will accept connections
-    server = test_context_socket (ZMQ_DEALER);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (server, ZMQ_ROUTING_ID, "IDENT", 6));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (server, ZMQ_ZAP_DOMAIN, domain, strlen (domain)));
-    const int as_server = 1;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (server, ZMQ_PLAIN_SERVER, &as_server, sizeof (int)));
-    bind_loopback_ipv4 (server, my_endpoint, sizeof my_endpoint);
-}
-
-static void teardown_server ()
-{
-    test_context_socket_close (server);
-}
-
-void setUp ()
-{
-    setup_test_context ();
-    setup_zap_handler ();
-    setup_server ();
-}
-
-void tearDown ()
-{
-    teardown_server ();
-    teardown_test_context ();
-    teardown_zap_handler ();
-}
-
-void test_plain_success ()
-{
-    //  Check PLAIN security with correct username/password
-    void *client = test_context_socket (ZMQ_DEALER);
-    const char username[] = "admin";
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (client, ZMQ_PLAIN_USERNAME, username, strlen (username)));
-    const char password[] = "password";
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (client, ZMQ_PLAIN_PASSWORD, password, strlen (password)));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (client, my_endpoint));
-    bounce (server, client);
-    test_context_socket_close (client);
-}
-
-void test_plain_client_as_server_fails ()
-{
-    //  Check PLAIN security with badly configured client (as_server)
-    //  This will be caught by the plain_server class, not passed to ZAP
-    void *client = test_context_socket (ZMQ_DEALER);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (client, ZMQ_ZAP_DOMAIN, domain, strlen (domain)));
-    const int as_server = 1;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (client, ZMQ_PLAIN_SERVER, &as_server, sizeof (int)));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (client, my_endpoint));
-    expect_bounce_fail (server, client);
-    test_context_socket_close_zero_linger (client);
-}
-
-void test_plain_wrong_credentials_fails ()
-{
-    //  Check PLAIN security -- failed authentication
-    void *client = test_context_socket (ZMQ_DEALER);
-    const char username[] = "wronguser";
-    const char password[] = "wrongpass";
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (client, ZMQ_PLAIN_USERNAME, username, strlen (username)));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (client, ZMQ_PLAIN_PASSWORD, password, strlen (password)));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (client, my_endpoint));
-    expect_bounce_fail (server, client);
-    test_context_socket_close_zero_linger (client);
-}
-
-void test_plain_vanilla_socket ()
-{
-    // Unauthenticated messages from a vanilla socket shouldn't be received
-    fd_t s = connect_socket (my_endpoint);
-    // send anonymous ZMTP/1.0 greeting
-    send (s, "\x01\x00", 2, 0);
-    // send sneaky message that shouldn't be received
-    send (s, "\x08\x00sneaky\0", 9, 0);
-    int timeout = 250;
-    zmq_setsockopt (server, ZMQ_RCVTIMEO, &timeout, sizeof (timeout));
-    char *buf = s_recv (server);
-    if (buf != NULL) {
-        printf ("Received unauthenticated message: %s\n", buf);
-        TEST_ASSERT_NULL (buf);
-    }
-    close (s);
-}
-
-int main (void)
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_plain_success);
-    RUN_TEST (test_plain_client_as_server_fails);
-    RUN_TEST (test_plain_wrong_credentials_fails);
-    RUN_TEST (test_plain_vanilla_socket);
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_security_zap.cpp b/libs/libzmq/tests/test_security_zap.cpp
deleted file mode 100644
index d76a1c2..0000000
--- a/libs/libzmq/tests/test_security_zap.cpp
+++ /dev/null
@@ -1,472 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil_security.hpp"
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-static void zap_handler_wrong_version (void * /*unused_*/)
-{
-    zap_handler_generic (zap_wrong_version);
-}
-
-static void zap_handler_wrong_request_id (void * /*unused_*/)
-{
-    zap_handler_generic (zap_wrong_request_id);
-}
-
-static void zap_handler_wrong_status_invalid (void * /*unused_*/)
-{
-    zap_handler_generic (zap_status_invalid);
-}
-
-static void zap_handler_wrong_status_temporary_failure (void * /*unused_*/)
-{
-    zap_handler_generic (zap_status_temporary_failure);
-}
-
-static void zap_handler_wrong_status_internal_error (void * /*unused_*/)
-{
-    zap_handler_generic (zap_status_internal_error);
-}
-
-static void zap_handler_too_many_parts (void * /*unused_*/)
-{
-    zap_handler_generic (zap_too_many_parts);
-}
-
-static void zap_handler_disconnect (void * /*unused_*/)
-{
-    zap_handler_generic (zap_disconnect);
-}
-
-static void zap_handler_do_not_recv (void * /*unused_*/)
-{
-    zap_handler_generic (zap_do_not_recv);
-}
-
-static void zap_handler_do_not_send (void * /*unused_*/)
-{
-    zap_handler_generic (zap_do_not_send);
-}
-
-int expect_new_client_bounce_fail_and_count_monitor_events (
-  char *my_endpoint_,
-  void *server_,
-  socket_config_fn socket_config_,
-  void *socket_config_data_,
-  void **client_mon_,
-  void *server_mon_,
-  int expected_server_event_,
-  int expected_server_value_,
-  int expected_client_event_ = 0,
-  int expected_client_value_ = 0)
-{
-    expect_new_client_bounce_fail (
-      my_endpoint_, server_, socket_config_, socket_config_data_, client_mon_,
-      expected_client_event_, expected_client_value_);
-
-    int events_received = 0;
-    events_received = expect_monitor_event_multiple (
-      server_mon_, expected_server_event_, expected_server_value_);
-
-    return events_received;
-}
-
-void test_zap_unsuccessful (char *my_endpoint_,
-                            void *server_,
-                            void *server_mon_,
-                            int expected_server_event_,
-                            int expected_server_value_,
-                            socket_config_fn socket_config_,
-                            void *socket_config_data_,
-                            void **client_mon_ = NULL,
-                            int expected_client_event_ = 0,
-                            int expected_client_value_ = 0)
-{
-    int server_events_received =
-      expect_new_client_bounce_fail_and_count_monitor_events (
-        my_endpoint_, server_, socket_config_, socket_config_data_, client_mon_,
-        server_mon_, expected_server_event_, expected_server_value_,
-        expected_client_event_, expected_client_value_);
-
-    //  there may be more than one ZAP request due to repeated attempts by the
-    //  client (actually only in case if ZAP status code 300)
-    TEST_ASSERT_TRUE (server_events_received == 0
-                      || 1 <= zmq_atomic_counter_value (zap_requests_handled));
-}
-
-void test_zap_unsuccessful_no_handler (char *my_endpoint_,
-                                       void *server_,
-                                       void *server_mon_,
-                                       int expected_event_,
-                                       int expected_err_,
-                                       socket_config_fn socket_config_,
-                                       void *socket_config_data_,
-                                       void **client_mon_ = NULL)
-{
-    const int events_received =
-      expect_new_client_bounce_fail_and_count_monitor_events (
-        my_endpoint_, server_, socket_config_, socket_config_data_, client_mon_,
-        server_mon_, expected_event_, expected_err_);
-
-    //  there may be more than one ZAP request due to repeated attempts by the
-    //  client
-    TEST_ASSERT_GREATER_THAN_INT (0, events_received);
-}
-
-void test_zap_protocol_error (char *my_endpoint_,
-                              void *server_,
-                              void *server_mon_,
-                              socket_config_fn socket_config_,
-                              void *socket_config_data_,
-                              int expected_error_)
-{
-    test_zap_unsuccessful (my_endpoint_, server_, server_mon_,
-                           ZMQ_EVENT_HANDSHAKE_FAILED_PROTOCOL, expected_error_,
-                           socket_config_, socket_config_data_);
-}
-
-void test_zap_unsuccessful_status_300 (char *my_endpoint_,
-                                       void *server_,
-                                       void *server_mon_,
-                                       socket_config_fn client_socket_config_,
-                                       void *client_socket_config_data_)
-{
-    void *client_mon;
-    test_zap_unsuccessful (
-      my_endpoint_, server_, server_mon_, ZMQ_EVENT_HANDSHAKE_FAILED_AUTH, 300,
-      client_socket_config_, client_socket_config_data_, &client_mon);
-
-    // we can use a 0 timeout here, since the client socket is already closed
-    assert_no_more_monitor_events_with_timeout (client_mon, 0);
-
-    test_context_socket_close (client_mon);
-}
-
-void test_zap_unsuccessful_status_500 (char *my_endpoint_,
-                                       void *server_,
-                                       void *server_mon_,
-                                       socket_config_fn client_socket_config_,
-                                       void *client_socket_config_data_)
-{
-    test_zap_unsuccessful (my_endpoint_, server_, server_mon_,
-                           ZMQ_EVENT_HANDSHAKE_FAILED_AUTH, 500,
-                           client_socket_config_, client_socket_config_data_,
-                           NULL, ZMQ_EVENT_HANDSHAKE_FAILED_AUTH, 500);
-}
-
-static void
-test_zap_protocol_error_closure (socket_config_fn server_socket_config_,
-                                 socket_config_fn client_socket_config_,
-                                 void *client_socket_config_data_,
-                                 void *server_socket_config_data_,
-                                 zmq_thread_fn zap_handler_,
-                                 int expected_failure_)
-{
-    void *handler, *zap_thread, *server, *server_mon;
-    char my_endpoint[MAX_SOCKET_STRING];
-
-    setup_context_and_server_side (
-      &handler, &zap_thread, &server, &server_mon, my_endpoint, zap_handler_,
-      server_socket_config_, server_socket_config_data_);
-    test_zap_protocol_error (my_endpoint, server, server_mon,
-                             client_socket_config_, client_socket_config_data_,
-                             expected_failure_);
-    shutdown_context_and_server_side (zap_thread, server, server_mon, handler);
-}
-
-static void
-test_zap_protocol_error_wrong_version (socket_config_fn server_socket_config_,
-                                       socket_config_fn client_socket_config_,
-                                       void *client_socket_config_data_,
-                                       void *server_socket_config_data_)
-{
-    test_zap_protocol_error_closure (
-      server_socket_config_, client_socket_config_, client_socket_config_data_,
-      server_socket_config_data_, &zap_handler_wrong_version,
-      ZMQ_PROTOCOL_ERROR_ZAP_BAD_VERSION);
-}
-
-static void test_zap_protocol_error_wrong_request_id (
-  socket_config_fn server_socket_config_,
-  socket_config_fn client_socket_config_,
-  void *client_socket_config_data_,
-  void *server_socket_config_data_)
-{
-    test_zap_protocol_error_closure (
-      server_socket_config_, client_socket_config_, client_socket_config_data_,
-      server_socket_config_data_, &zap_handler_wrong_request_id,
-      ZMQ_PROTOCOL_ERROR_ZAP_BAD_REQUEST_ID);
-}
-
-static void test_zap_protocol_error_wrong_status_invalid (
-  socket_config_fn server_socket_config_,
-  socket_config_fn client_socket_config_,
-  void *client_socket_config_data_,
-  void *server_socket_config_data_)
-{
-    test_zap_protocol_error_closure (
-      server_socket_config_, client_socket_config_, client_socket_config_data_,
-      server_socket_config_data_, &zap_handler_wrong_status_invalid,
-      ZMQ_PROTOCOL_ERROR_ZAP_INVALID_STATUS_CODE);
-}
-
-static void
-test_zap_protocol_error_too_many_parts (socket_config_fn server_socket_config_,
-                                        socket_config_fn client_socket_config_,
-                                        void *client_socket_config_data_,
-                                        void *server_socket_config_data_)
-{
-    test_zap_protocol_error_closure (
-      server_socket_config_, client_socket_config_, client_socket_config_data_,
-      server_socket_config_data_, &zap_handler_too_many_parts,
-      ZMQ_PROTOCOL_ERROR_ZAP_MALFORMED_REPLY);
-}
-
-//  TODO the failed status (300/500) should be observable as monitoring events on the client side as well (they are
-//  already transmitted as an ERROR message)
-
-static void
-test_zap_wrong_status_temporary_failure (socket_config_fn server_socket_config_,
-                                         socket_config_fn client_socket_config_,
-                                         void *client_socket_config_data_,
-                                         void *server_socket_config_data_)
-{
-    void *handler, *zap_thread, *server, *server_mon;
-    char my_endpoint[MAX_SOCKET_STRING];
-    setup_context_and_server_side (
-      &handler, &zap_thread, &server, &server_mon, my_endpoint,
-      &zap_handler_wrong_status_temporary_failure, server_socket_config_,
-      server_socket_config_data_);
-    test_zap_unsuccessful_status_300 (my_endpoint, server, server_mon,
-                                      client_socket_config_,
-                                      client_socket_config_data_);
-    shutdown_context_and_server_side (zap_thread, server, server_mon, handler);
-}
-
-static void
-test_zap_wrong_status_internal_error (socket_config_fn server_socket_config_,
-                                      socket_config_fn client_socket_config_,
-                                      void *client_socket_config_data_)
-{
-    void *handler, *zap_thread, *server, *server_mon;
-    char my_endpoint[MAX_SOCKET_STRING];
-    setup_context_and_server_side (
-      &handler, &zap_thread, &server, &server_mon, my_endpoint,
-      &zap_handler_wrong_status_internal_error, server_socket_config_);
-    test_zap_unsuccessful_status_500 (my_endpoint, server, server_mon,
-                                      client_socket_config_,
-                                      client_socket_config_data_);
-    shutdown_context_and_server_side (zap_thread, server, server_mon, handler);
-}
-
-static void
-test_zap_unsuccesful_no_handler_started (socket_config_fn server_socket_config_,
-                                         socket_config_fn client_socket_config_,
-                                         void *client_socket_config_data_,
-                                         void *server_socket_config_data_)
-{
-#ifdef ZMQ_ZAP_ENFORCE_DOMAIN
-    void *handler, *zap_thread, *server, *server_mon;
-    char my_endpoint[MAX_SOCKET_STRING];
-    // TODO this looks wrong, where will the enforce value be used?
-
-    //  no ZAP handler
-    int enforce = 1;
-    setup_context_and_server_side (
-      &handler, &zap_thread, &server, &server_mon, my_endpoint, NULL,
-      server_socket_config_,
-      server_socket_config_data_ ? server_socket_config_data_ : &enforce);
-    test_zap_unsuccessful_no_handler (
-      my_endpoint, server, server_mon, ZMQ_EVENT_HANDSHAKE_FAILED_NO_DETAIL,
-      EFAULT, client_socket_config_, client_socket_config_data_);
-    shutdown_context_and_server_side (zap_thread, server, server_mon, handler);
-#endif
-}
-
-static void
-test_zap_unsuccesful_no_handler_closure (socket_config_fn server_socket_config_,
-                                         socket_config_fn client_socket_config_,
-                                         void *client_socket_config_data_,
-                                         zmq_thread_fn zap_handler_func_,
-                                         bool zap_handler_disconnected_ = false)
-{
-    void *handler, *zap_thread, *server, *server_mon;
-    char my_endpoint[MAX_SOCKET_STRING];
-    setup_context_and_server_side (&handler, &zap_thread, &server, &server_mon,
-                                   my_endpoint, zap_handler_func_,
-                                   server_socket_config_);
-    test_zap_unsuccessful_no_handler (
-      my_endpoint, server, server_mon, ZMQ_EVENT_HANDSHAKE_FAILED_NO_DETAIL,
-      EPIPE, client_socket_config_, client_socket_config_data_);
-    shutdown_context_and_server_side (zap_thread, server, server_mon, handler,
-                                      zap_handler_disconnected_);
-}
-
-static void
-test_zap_unsuccesful_disconnect (socket_config_fn server_socket_config_,
-                                 socket_config_fn client_socket_config_,
-                                 void *client_socket_config_data_)
-{
-    test_zap_unsuccesful_no_handler_closure (
-      server_socket_config_, client_socket_config_, client_socket_config_data_,
-      &zap_handler_disconnect, true);
-}
-
-static void
-test_zap_unsuccesful_do_not_recv (socket_config_fn server_socket_config_,
-                                  socket_config_fn client_socket_config_,
-                                  void *client_socket_config_data_)
-{
-    test_zap_unsuccesful_no_handler_closure (
-      server_socket_config_, client_socket_config_, client_socket_config_data_,
-      &zap_handler_do_not_recv);
-}
-
-static void
-test_zap_unsuccesful_do_not_send (socket_config_fn server_socket_config_,
-                                  socket_config_fn client_socket_config_,
-                                  void *client_socket_config_data_)
-{
-    test_zap_unsuccesful_no_handler_closure (
-      server_socket_config_, client_socket_config_, client_socket_config_data_,
-      &zap_handler_do_not_send);
-}
-
-#define DEFINE_ZAP_ERROR_TESTS(                                                \
-  name_, server_socket_config_, server_socket_config_data_,                    \
-  client_socket_config_, client_socket_config_data_)                           \
-    void test_zap_protocol_error_wrong_version_##name_ ()                      \
-    {                                                                          \
-        test_zap_protocol_error_wrong_version (                                \
-          server_socket_config_, client_socket_config_,                        \
-          client_socket_config_data_, server_socket_config_data_);             \
-    }                                                                          \
-    void test_zap_protocol_error_wrong_request_id_##name_ ()                   \
-    {                                                                          \
-        test_zap_protocol_error_wrong_request_id (                             \
-          server_socket_config_, client_socket_config_,                        \
-          client_socket_config_data_, server_socket_config_data_);             \
-    }                                                                          \
-    void test_zap_protocol_error_wrong_status_invalid_##name_ ()               \
-    {                                                                          \
-        test_zap_protocol_error_wrong_status_invalid (                         \
-          server_socket_config_, client_socket_config_,                        \
-          client_socket_config_data_, server_socket_config_data_);             \
-    }                                                                          \
-    void test_zap_protocol_error_too_many_parts_##name_ ()                     \
-    {                                                                          \
-        test_zap_protocol_error_too_many_parts (                               \
-          server_socket_config_, client_socket_config_,                        \
-          client_socket_config_data_, server_socket_config_data_);             \
-    }                                                                          \
-    void test_zap_wrong_status_temporary_failure_##name_ ()                    \
-    {                                                                          \
-        test_zap_wrong_status_temporary_failure (                              \
-          server_socket_config_, client_socket_config_,                        \
-          client_socket_config_data_, server_socket_config_data_);             \
-    }                                                                          \
-    void test_zap_wrong_status_internal_error_##name_ ()                       \
-    {                                                                          \
-        test_zap_wrong_status_internal_error (server_socket_config_,           \
-                                              client_socket_config_,           \
-                                              client_socket_config_data_);     \
-    }                                                                          \
-    void test_zap_unsuccessful_no_handler_started_##name_ ()                   \
-    {                                                                          \
-        test_zap_unsuccesful_no_handler_started (                              \
-          server_socket_config_, client_socket_config_,                        \
-          client_socket_config_data_, server_socket_config_data_);             \
-    }                                                                          \
-    void test_zap_unsuccessful_disconnect_##name_ ()                           \
-    {                                                                          \
-        test_zap_unsuccesful_disconnect (server_socket_config_,                \
-                                         client_socket_config_,                \
-                                         client_socket_config_data_);          \
-    }                                                                          \
-    void test_zap_unsuccessful_do_not_recv_##name_ ()                          \
-    {                                                                          \
-        test_zap_unsuccesful_do_not_recv (server_socket_config_,               \
-                                          client_socket_config_,               \
-                                          client_socket_config_data_);         \
-    }                                                                          \
-    void test_zap_unsuccessful_do_not_send_##name_ ()                          \
-    {                                                                          \
-        test_zap_unsuccesful_do_not_send (server_socket_config_,               \
-                                          client_socket_config_,               \
-                                          client_socket_config_data_);         \
-    }
-
-DEFINE_ZAP_ERROR_TESTS (
-  null, &socket_config_null_server, NULL, &socket_config_null_client, NULL)
-
-DEFINE_ZAP_ERROR_TESTS (
-  plain, &socket_config_plain_server, NULL, &socket_config_plain_client, NULL)
-
-static curve_client_data_t curve_client_data = {
-  valid_server_public, valid_client_public, valid_client_secret};
-
-DEFINE_ZAP_ERROR_TESTS (curve,
-                        &socket_config_curve_server,
-                        valid_server_secret,
-                        &socket_config_curve_client,
-                        &curve_client_data)
-
-#define RUN_ZAP_ERROR_TESTS(name_)                                             \
-    {                                                                          \
-        RUN_TEST (test_zap_protocol_error_wrong_version_##name_);              \
-        RUN_TEST (test_zap_protocol_error_wrong_request_id_##name_);           \
-        RUN_TEST (test_zap_protocol_error_wrong_status_invalid_##name_);       \
-        RUN_TEST (test_zap_protocol_error_too_many_parts_##name_);             \
-        RUN_TEST (test_zap_wrong_status_temporary_failure_##name_);            \
-        RUN_TEST (test_zap_wrong_status_internal_error_##name_);               \
-        RUN_TEST (test_zap_unsuccessful_no_handler_started_##name_);           \
-        RUN_TEST (test_zap_unsuccessful_disconnect_##name_);                   \
-        RUN_TEST (test_zap_unsuccessful_do_not_recv_##name_);                  \
-        RUN_TEST (test_zap_unsuccessful_do_not_send_##name_);                  \
-    }
-
-int main ()
-{
-    setup_test_environment ();
-
-    if (zmq_has ("curve")) {
-        setup_testutil_security_curve ();
-    }
-
-    UNITY_BEGIN ();
-    RUN_ZAP_ERROR_TESTS (null);
-    RUN_ZAP_ERROR_TESTS (plain);
-    if (zmq_has ("curve")) {
-        RUN_ZAP_ERROR_TESTS (curve);
-    }
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_setsockopt.cpp b/libs/libzmq/tests/test_setsockopt.cpp
deleted file mode 100644
index 7e51a51..0000000
--- a/libs/libzmq/tests/test_setsockopt.cpp
+++ /dev/null
@@ -1,185 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-#include <string.h>
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void test_setsockopt_tcp_recv_buffer ()
-{
-    void *socket = test_context_socket (ZMQ_PUSH);
-
-    int val = 0;
-    size_t placeholder = sizeof (val);
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (socket, ZMQ_RCVBUF, &val, &placeholder));
-    TEST_ASSERT_EQUAL_INT (-1, val);
-
-    val = 16384;
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (socket, ZMQ_RCVBUF, &val, sizeof (val)));
-    TEST_ASSERT_EQUAL_INT (16384, val);
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (socket, ZMQ_RCVBUF, &val, &placeholder));
-    TEST_ASSERT_EQUAL_INT (16384, val);
-
-    test_context_socket_close (socket);
-}
-
-void test_setsockopt_tcp_send_buffer ()
-{
-    void *socket = test_context_socket (ZMQ_PUSH);
-
-    int val = 0;
-    size_t placeholder = sizeof (val);
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (socket, ZMQ_SNDBUF, &val, &placeholder));
-    TEST_ASSERT_EQUAL_INT (-1, val);
-
-    val = 16384;
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (socket, ZMQ_SNDBUF, &val, sizeof (val)));
-    TEST_ASSERT_EQUAL_INT (16384, val);
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (socket, ZMQ_SNDBUF, &val, &placeholder));
-    TEST_ASSERT_EQUAL_INT (16384, val);
-
-    test_context_socket_close (socket);
-}
-
-void test_setsockopt_use_fd ()
-{
-    void *socket = test_context_socket (ZMQ_PUSH);
-
-    int val = 0;
-    size_t placeholder = sizeof (val);
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (socket, ZMQ_USE_FD, &val, &placeholder));
-    TEST_ASSERT_EQUAL_INT (-1, val);
-
-    val = 3;
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (socket, ZMQ_USE_FD, &val, sizeof (val)));
-    TEST_ASSERT_EQUAL_INT (3, val);
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (socket, ZMQ_USE_FD, &val, &placeholder));
-    TEST_ASSERT_EQUAL_INT (3, val);
-
-    test_context_socket_close (socket);
-}
-
-#define BOUNDDEVBUFSZ 16
-void test_setsockopt_bindtodevice ()
-{
-    void *socket = test_context_socket (ZMQ_PUSH);
-
-#ifdef ZMQ_BINDTODEVICE
-    char devname[BOUNDDEVBUFSZ];
-    size_t buflen = BOUNDDEVBUFSZ;
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (socket, ZMQ_BINDTODEVICE, devname, &buflen));
-    TEST_ASSERT_EQUAL_INT8 ('\0', devname[0]);
-    TEST_ASSERT_EQUAL_UINT (1, buflen);
-
-    sprintf (devname, "testdev");
-    buflen = strlen (devname);
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (socket, ZMQ_BINDTODEVICE, devname, buflen));
-
-    buflen = BOUNDDEVBUFSZ;
-    memset (devname, 0, buflen);
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (socket, ZMQ_BINDTODEVICE, devname, &buflen));
-    TEST_ASSERT_EQUAL_STRING_LEN ("testdev", devname, buflen);
-#endif
-
-    test_context_socket_close (socket);
-}
-
-void test_setsockopt_priority ()
-{
-#ifdef ZMQ_BUILD_DRAFT_API
-#ifdef ZMQ_HAVE_SO_PRIORITY
-    void *socket = test_context_socket (ZMQ_PUSH);
-
-    int val = 5;
-    size_t placeholder = sizeof (val);
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (socket, ZMQ_PRIORITY, &val, &placeholder));
-    TEST_ASSERT_EQUAL_INT (0, val);
-
-    val = 3;
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (socket, ZMQ_PRIORITY, &val, sizeof (val)));
-    TEST_ASSERT_EQUAL_INT (3, val);
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (socket, ZMQ_PRIORITY, &val, &placeholder));
-    TEST_ASSERT_EQUAL_INT (3, val);
-
-    test_context_socket_close (socket);
-#else
-    TEST_IGNORE_MESSAGE ("libzmq without ZMQ_PRIORITY support, "
-                         "ignoring setsockopt_priority test");
-#endif
-#else
-    TEST_IGNORE_MESSAGE ("libzmq without DRAFT support, ignoring "
-                         "setsockopt_priority test");
-#endif
-}
-
-int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_setsockopt_tcp_recv_buffer);
-    RUN_TEST (test_setsockopt_tcp_send_buffer);
-    RUN_TEST (test_setsockopt_use_fd);
-    RUN_TEST (test_setsockopt_bindtodevice);
-    RUN_TEST (test_setsockopt_priority);
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_shutdown_stress.cpp b/libs/libzmq/tests/test_shutdown_stress.cpp
deleted file mode 100644
index 11fb136..0000000
--- a/libs/libzmq/tests/test_shutdown_stress.cpp
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-void setUp ()
-{
-}
-
-void tearDown ()
-{
-}
-
-#define THREAD_COUNT 100
-
-struct thread_data
-{
-    char endpoint[MAX_SOCKET_STRING];
-};
-
-extern "C" {
-static void worker (void *data_)
-{
-    const thread_data *const tdata = static_cast<const thread_data *> (data_);
-
-    void *socket = zmq_socket (get_test_context (), ZMQ_SUB);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (socket, tdata->endpoint));
-
-    //  Start closing the socket while the connecting process is underway.
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_close (socket));
-}
-}
-
-void test_shutdown_stress ()
-{
-    void *threads[THREAD_COUNT];
-
-    for (int j = 0; j != 10; j++) {
-        //  Check the shutdown with many parallel I/O threads.
-        struct thread_data tdata;
-        setup_test_context ();
-        zmq_ctx_set (get_test_context (), ZMQ_IO_THREADS, 7);
-
-        void *socket = test_context_socket (ZMQ_PUB);
-
-        bind_loopback_ipv4 (socket, tdata.endpoint, sizeof (tdata.endpoint));
-
-        for (int i = 0; i != THREAD_COUNT; i++) {
-            threads[i] = zmq_threadstart (&worker, &tdata);
-        }
-
-        for (int i = 0; i != THREAD_COUNT; i++) {
-            zmq_threadclose (threads[i]);
-        }
-
-        test_context_socket_close (socket);
-
-        teardown_test_context ();
-    }
-}
-
-int main ()
-{
-    setup_test_environment (180);
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_shutdown_stress);
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_shutdown_stress_tipc.cpp b/libs/libzmq/tests/test_shutdown_stress_tipc.cpp
deleted file mode 100644
index 9d91ff0..0000000
--- a/libs/libzmq/tests/test_shutdown_stress_tipc.cpp
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-#include <pthread.h>
-
-void setUp ()
-{
-}
-
-void tearDown ()
-{
-}
-
-#define THREAD_COUNT 100
-
-extern "C" {
-static void *worker (void *ctx)
-{
-    void *s = zmq_socket (ctx, ZMQ_SUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (s, "tipc://{5560,0}@0.0.0"));
-
-    //  Start closing the socket while the connecting process is underway.
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_close (s));
-
-    return NULL;
-}
-}
-
-void test_shutdown_stress_tipc ()
-{
-    void *s1;
-    int i;
-    int j;
-    pthread_t threads[THREAD_COUNT];
-
-    for (j = 0; j != 10; j++) {
-        //  Check the shutdown with many parallel I/O threads.
-        setup_test_context ();
-        zmq_ctx_set (get_test_context (), ZMQ_IO_THREADS, 7);
-
-        s1 = test_context_socket (ZMQ_PUB);
-
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (s1, "tipc://{5560,0,0}"));
-
-        for (i = 0; i != THREAD_COUNT; i++) {
-            TEST_ASSERT_SUCCESS_RAW_ERRNO (
-              pthread_create (&threads[i], NULL, worker, get_test_context ()));
-        }
-
-        for (i = 0; i != THREAD_COUNT; i++) {
-            TEST_ASSERT_SUCCESS_RAW_ERRNO (pthread_join (threads[i], NULL));
-        }
-
-        test_context_socket_close (s1);
-
-        teardown_test_context ();
-    }
-}
-
-int main ()
-{
-    if (!is_tipc_available ()) {
-        printf ("TIPC environment unavailable, skipping test\n");
-        return 77;
-    }
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_shutdown_stress_tipc);
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_socket_null.cpp b/libs/libzmq/tests/test_socket_null.cpp
deleted file mode 100644
index 7c1cc9f..0000000
--- a/libs/libzmq/tests/test_socket_null.cpp
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-
-#include <unity.h>
-
-void setUp ()
-{
-}
-
-void tearDown ()
-{
-}
-
-//  tests all socket-related functions with a NULL socket argument
-void test_zmq_socket_null_context ()
-{
-    TEST_ASSERT_NULL (zmq_socket (NULL, ZMQ_PAIR));
-    TEST_ASSERT_EQUAL_INT (EFAULT, errno); // TODO use EINVAL instead?
-}
-
-void test_zmq_close_null_socket ()
-{
-    int rc = zmq_close (NULL);
-    TEST_ASSERT_EQUAL_INT (-1, rc);
-    TEST_ASSERT_EQUAL_INT (ENOTSOCK, errno); // TODO use EINVAL instead?
-}
-
-void test_zmq_setsockopt_null_socket ()
-{
-    int hwm = 100;
-    size_t hwm_size = sizeof hwm;
-    int rc = zmq_setsockopt (NULL, ZMQ_SNDHWM, &hwm, hwm_size);
-    TEST_ASSERT_EQUAL_INT (-1, rc);
-    TEST_ASSERT_EQUAL_INT (ENOTSOCK, errno); // TODO use EINVAL instead?
-}
-
-void test_zmq_getsockopt_null_socket ()
-{
-    int hwm;
-    size_t hwm_size = sizeof hwm;
-    int rc = zmq_getsockopt (NULL, ZMQ_SNDHWM, &hwm, &hwm_size);
-    TEST_ASSERT_EQUAL_INT (-1, rc);
-    TEST_ASSERT_EQUAL_INT (ENOTSOCK, errno); // TODO use EINVAL instead?
-}
-
-void test_zmq_socket_monitor_null_socket ()
-{
-    int rc = zmq_socket_monitor (NULL, "inproc://monitor", ZMQ_EVENT_ALL);
-    TEST_ASSERT_EQUAL_INT (-1, rc);
-    TEST_ASSERT_EQUAL_INT (ENOTSOCK, errno); // TODO use EINVAL instead?
-}
-
-#ifdef ZMQ_BUILD_DRAFT_API
-void test_zmq_join_null_socket ()
-{
-    int rc = zmq_join (NULL, "group");
-    TEST_ASSERT_EQUAL_INT (-1, rc);
-    TEST_ASSERT_EQUAL_INT (ENOTSOCK, errno); // TODO use EINVAL instead?
-}
-
-void test_zmq_leave_null_socket ()
-{
-    int rc = zmq_leave (NULL, "group");
-    TEST_ASSERT_EQUAL_INT (-1, rc);
-    TEST_ASSERT_EQUAL_INT (ENOTSOCK, errno); // TODO use EINVAL instead?
-}
-#endif
-
-
-void test_zmq_bind_null_socket ()
-{
-    int rc = zmq_bind (NULL, "inproc://socket");
-    TEST_ASSERT_EQUAL_INT (-1, rc);
-    TEST_ASSERT_EQUAL_INT (ENOTSOCK, errno); // TODO use EINVAL instead?
-}
-
-void test_zmq_connect_null_socket ()
-{
-    int rc = zmq_connect (NULL, "inproc://socket");
-    TEST_ASSERT_EQUAL_INT (-1, rc);
-    TEST_ASSERT_EQUAL_INT (ENOTSOCK, errno); // TODO use EINVAL instead?
-}
-
-void test_zmq_unbind_null_socket ()
-{
-    int rc = zmq_unbind (NULL, "inproc://socket");
-    TEST_ASSERT_EQUAL_INT (-1, rc);
-    TEST_ASSERT_EQUAL_INT (ENOTSOCK, errno); // TODO use EINVAL instead?
-}
-
-void test_zmq_disconnect_null_socket ()
-{
-    int rc = zmq_disconnect (NULL, "inproc://socket");
-    TEST_ASSERT_EQUAL_INT (-1, rc);
-    TEST_ASSERT_EQUAL_INT (ENOTSOCK, errno); // TODO use EINVAL instead?
-}
-
-int main (void)
-{
-    UNITY_BEGIN ();
-    RUN_TEST (test_zmq_socket_null_context);
-    RUN_TEST (test_zmq_close_null_socket);
-    RUN_TEST (test_zmq_setsockopt_null_socket);
-    RUN_TEST (test_zmq_getsockopt_null_socket);
-    RUN_TEST (test_zmq_socket_monitor_null_socket);
-    RUN_TEST (test_zmq_bind_null_socket);
-    RUN_TEST (test_zmq_connect_null_socket);
-    RUN_TEST (test_zmq_unbind_null_socket);
-    RUN_TEST (test_zmq_disconnect_null_socket);
-
-#ifdef ZMQ_BUILD_DRAFT_API
-    RUN_TEST (test_zmq_join_null_socket);
-    RUN_TEST (test_zmq_leave_null_socket);
-#endif
-
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_socket_options_fuzzer.cpp b/libs/libzmq/tests/test_socket_options_fuzzer.cpp
deleted file mode 100644
index adbac6c..0000000
--- a/libs/libzmq/tests/test_socket_options_fuzzer.cpp
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
-    Copyright (c) 2020 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifdef ZMQ_USE_FUZZING_ENGINE
-#include <fuzzer/FuzzedDataProvider.h>
-#endif
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-#ifdef ZMQ_DISCONNECT_MSG
-#define LAST_OPTION ZMQ_DISCONNECT_MSG
-#else
-#define LAST_OPTION ZMQ_BINDTODEVICE
-#endif
-
-extern "C" int LLVMFuzzerTestOneInput (const uint8_t *data, size_t size)
-{
-    int option;
-    void *ctx = zmq_ctx_new ();
-    TEST_ASSERT_NOT_NULL (ctx);
-    void *server = zmq_socket (ctx, ZMQ_XPUB);
-    TEST_ASSERT_NOT_NULL (server);
-
-    if (!size)
-        return 0;
-
-    for (option = ZMQ_AFFINITY; option <= LAST_OPTION; ++option) {
-        uint8_t out[8192];
-        size_t out_size = 8192;
-
-        zmq_setsockopt (server, option, data, size);
-        zmq_getsockopt (server, option, out, &out_size);
-    }
-
-    zmq_close (server);
-    zmq_ctx_term (ctx);
-
-    return 0;
-}
-
-#ifndef ZMQ_USE_FUZZING_ENGINE
-void test_socket_options_fuzzer ()
-{
-    uint8_t **data;
-    size_t *len, num_cases = 0;
-    if (fuzzer_corpus_encode (
-          "tests/libzmq-fuzz-corpora/test_socket_options_fuzzer_seed_corpus",
-          &data, &len, &num_cases)
-        != 0)
-        exit (77);
-
-    while (num_cases-- > 0) {
-        TEST_ASSERT_SUCCESS_ERRNO (
-          LLVMFuzzerTestOneInput (data[num_cases], len[num_cases]));
-        free (data[num_cases]);
-    }
-
-    free (data);
-    free (len);
-}
-
-int main (int argc, char **argv)
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_socket_options_fuzzer);
-
-    return UNITY_END ();
-}
-#endif
diff --git a/libs/libzmq/tests/test_sockopt_hwm.cpp b/libs/libzmq/tests/test_sockopt_hwm.cpp
deleted file mode 100644
index d96118e..0000000
--- a/libs/libzmq/tests/test_sockopt_hwm.cpp
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-const int MAX_SENDS = 10000;
-
-void test_change_before_connected ()
-{
-    int rc;
-
-    void *bind_socket = test_context_socket (ZMQ_PUSH);
-    void *connect_socket = test_context_socket (ZMQ_PULL);
-
-    int val = 2;
-    rc = zmq_setsockopt (connect_socket, ZMQ_RCVHWM, &val, sizeof (val));
-    TEST_ASSERT_EQUAL_INT (0, rc);
-    rc = zmq_setsockopt (bind_socket, ZMQ_SNDHWM, &val, sizeof (val));
-    TEST_ASSERT_EQUAL_INT (0, rc);
-
-    zmq_connect (connect_socket, "inproc://a");
-    zmq_bind (bind_socket, "inproc://a");
-
-    size_t placeholder = sizeof (val);
-    val = 0;
-    rc = zmq_getsockopt (bind_socket, ZMQ_SNDHWM, &val, &placeholder);
-    TEST_ASSERT_EQUAL_INT (0, rc);
-    TEST_ASSERT_EQUAL_INT (2, val);
-
-    int send_count = 0;
-    while (send_count < MAX_SENDS
-           && zmq_send (bind_socket, NULL, 0, ZMQ_DONTWAIT) == 0)
-        ++send_count;
-
-    TEST_ASSERT_EQUAL_INT (4, send_count);
-
-    test_context_socket_close (bind_socket);
-    test_context_socket_close (connect_socket);
-}
-
-void test_change_after_connected ()
-{
-    int rc;
-
-    void *bind_socket = test_context_socket (ZMQ_PUSH);
-    void *connect_socket = test_context_socket (ZMQ_PULL);
-
-    int val = 1;
-    rc = zmq_setsockopt (connect_socket, ZMQ_RCVHWM, &val, sizeof (val));
-    TEST_ASSERT_EQUAL_INT (0, rc);
-    rc = zmq_setsockopt (bind_socket, ZMQ_SNDHWM, &val, sizeof (val));
-    TEST_ASSERT_EQUAL_INT (0, rc);
-
-    zmq_connect (connect_socket, "inproc://a");
-    zmq_bind (bind_socket, "inproc://a");
-
-    val = 5;
-    rc = zmq_setsockopt (bind_socket, ZMQ_SNDHWM, &val, sizeof (val));
-    TEST_ASSERT_EQUAL_INT (0, rc);
-
-    size_t placeholder = sizeof (val);
-    val = 0;
-    rc = zmq_getsockopt (bind_socket, ZMQ_SNDHWM, &val, &placeholder);
-    TEST_ASSERT_EQUAL_INT (0, rc);
-    TEST_ASSERT_EQUAL_INT (5, val);
-
-    int send_count = 0;
-    while (send_count < MAX_SENDS
-           && zmq_send (bind_socket, NULL, 0, ZMQ_DONTWAIT) == 0)
-        ++send_count;
-
-    TEST_ASSERT_EQUAL_INT (6, send_count);
-
-    test_context_socket_close (bind_socket);
-    test_context_socket_close (connect_socket);
-}
-
-int send_until_wouldblock (void *socket_)
-{
-    int send_count = 0;
-    while (send_count < MAX_SENDS
-           && zmq_send (socket_, &send_count, sizeof (send_count), ZMQ_DONTWAIT)
-                == sizeof (send_count)) {
-        ++send_count;
-    }
-    return send_count;
-}
-
-int test_fill_up_to_hwm (void *socket_, int sndhwm_)
-{
-    int send_count = send_until_wouldblock (socket_);
-    fprintf (stderr, "sndhwm==%i, send_count==%i\n", sndhwm_, send_count);
-    TEST_ASSERT_LESS_OR_EQUAL_INT (sndhwm_ + 1, send_count);
-    TEST_ASSERT_GREATER_THAN_INT (sndhwm_ / 10, send_count);
-    return send_count;
-}
-
-void test_decrease_when_full ()
-{
-    int rc;
-
-    void *bind_socket = test_context_socket (ZMQ_PUSH);
-    void *connect_socket = test_context_socket (ZMQ_PULL);
-
-    int val = 1;
-    rc = zmq_setsockopt (connect_socket, ZMQ_RCVHWM, &val, sizeof (val));
-    TEST_ASSERT_EQUAL_INT (0, rc);
-
-    int sndhwm = 100;
-    rc = zmq_setsockopt (bind_socket, ZMQ_SNDHWM, &sndhwm, sizeof (sndhwm));
-    TEST_ASSERT_EQUAL_INT (0, rc);
-
-    zmq_bind (bind_socket, "inproc://a");
-    zmq_connect (connect_socket, "inproc://a");
-
-    //  we must wait for the connect to succeed here, unfortunately we don't
-    //  have monitoring events for inproc, so we just hope SETTLE_TIME suffices
-    msleep (SETTLE_TIME);
-
-    // Fill up to hwm
-    int send_count = test_fill_up_to_hwm (bind_socket, sndhwm);
-
-    // Decrease snd hwm
-    sndhwm = 70;
-    rc = zmq_setsockopt (bind_socket, ZMQ_SNDHWM, &sndhwm, sizeof (sndhwm));
-    TEST_ASSERT_EQUAL_INT (0, rc);
-
-    int sndhwm_read = 0;
-    size_t sndhwm_read_size = sizeof (sndhwm_read);
-    rc =
-      zmq_getsockopt (bind_socket, ZMQ_SNDHWM, &sndhwm_read, &sndhwm_read_size);
-    TEST_ASSERT_EQUAL_INT (0, rc);
-    TEST_ASSERT_EQUAL_INT (sndhwm, sndhwm_read);
-
-    msleep (SETTLE_TIME);
-
-    // Read out all data (should get up to previous hwm worth so none were dropped)
-    int read_count = 0;
-    int read_data = 0;
-    while (
-      read_count < MAX_SENDS
-      && zmq_recv (connect_socket, &read_data, sizeof (read_data), ZMQ_DONTWAIT)
-           == sizeof (read_data)) {
-        TEST_ASSERT_EQUAL_INT (read_data, read_count);
-        ++read_count;
-    }
-
-    TEST_ASSERT_EQUAL_INT (send_count, read_count);
-
-    // Give io thread some time to catch up
-    msleep (SETTLE_TIME);
-
-    // Fill up to new hwm
-    test_fill_up_to_hwm (bind_socket, sndhwm);
-
-    test_context_socket_close (bind_socket);
-    test_context_socket_close (connect_socket);
-}
-
-
-int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_change_before_connected);
-    RUN_TEST (test_change_after_connected);
-    RUN_TEST (test_decrease_when_full);
-
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_socks.cpp b/libs/libzmq/tests/test_socks.cpp
deleted file mode 100644
index 4d7b42e..0000000
--- a/libs/libzmq/tests/test_socks.cpp
+++ /dev/null
@@ -1,893 +0,0 @@
-/*
-    Copyright (c) 2019 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifdef _WIN32
-#include "../src/windows.hpp"
-#else
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <unistd.h>
-#endif
-
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <errno.h>
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void recvall (int sock_fd, char *buffer, int len)
-{
-    int res;
-    int total = 0;
-    while (len - total > 0) {
-        res = recv (sock_fd, buffer + total, len - total, 0);
-        if (res == -1)
-            fprintf (stderr, "socks_server: error receiving %d bytes: %d %d\n",
-                     len, res, errno);
-        TEST_ASSERT_SUCCESS_RAW_ERRNO (res);
-        TEST_ASSERT (res != 0);
-        total += res;
-    }
-    TEST_ASSERT (total == len);
-}
-
-int recvonce (int sock_fd, char *buffer, int len)
-{
-    int res;
-    res = recv (sock_fd, buffer, len, 0);
-    if (res == -1)
-        fprintf (stderr, "socks_server: error receiving bytes: %d %d\n", res,
-                 errno);
-    TEST_ASSERT_SUCCESS_RAW_ERRNO (res);
-    return res;
-}
-
-void sendall (int sock_fd, char *buffer, int len)
-{
-    int res;
-    int total = 0;
-    while (len - total > 0) {
-        res = send (sock_fd, buffer + total, len - total, 0);
-        if (res == -1)
-            fprintf (stderr, "socks_server: error sending %d bytes: %d %d\n",
-                     len, res, errno);
-        TEST_ASSERT_SUCCESS_RAW_ERRNO (res);
-        TEST_ASSERT (res != 0);
-        total += res;
-    }
-}
-
-int remote_connect (int socket, uint32_t addr, uint16_t port)
-{
-    int res;
-    struct sockaddr_in ip4addr;
-    ip4addr.sin_family = AF_INET;
-    ip4addr.sin_addr.s_addr = htonl (addr);
-    ip4addr.sin_port = htons (port);
-    res = connect (socket, (struct sockaddr *) &ip4addr, sizeof ip4addr);
-    return res;
-}
-
-void *setup_socks_server (char *socks_server_address,
-                          int socks_server_address_len)
-{
-    fprintf (stderr, "socks_server: setup socks server\n");
-    int server_fd =
-      bind_socket_resolve_port ("127.0.0.1", "0", socks_server_address);
-    memmove (socks_server_address, strchr (socks_server_address, '/') + 2,
-             strlen (strchr (socks_server_address, '/') + 1));
-    fprintf (stderr, "socks_server: bound to: tcp://%s\n",
-             socks_server_address);
-    return (void *) (intptr_t) server_fd;
-}
-
-void socks_server_task (void *socks_server,
-                        const char *username,
-                        const char *password,
-                        int max_client_connect)
-{
-    int server_fd = (int) (intptr_t) socks_server;
-    fprintf (stderr, "socks_server: starting server thread\n");
-
-    int res;
-    res = listen (server_fd, max_client_connect);
-    TEST_ASSERT_SUCCESS_RAW_ERRNO (res);
-
-    int auth_method;
-    if (username == NULL || username[0] == '\0') {
-        auth_method = 0x0; /* No auth */
-    } else {
-        auth_method = 0x2; /* Basic auth */
-        if (password == NULL)
-            password = "";
-    }
-
-    int count = 0;
-    while (count < max_client_connect) {
-        int client = -1;
-        do {
-            char buffer[4096];
-            fprintf (stderr, "socks_server: waiting for connection\n");
-            client = accept (server_fd, NULL, NULL);
-            TEST_ASSERT_SUCCESS_RAW_ERRNO (client);
-            count++;
-            fprintf (stderr, "socks_server: accepted client connection %d/%d\n",
-                     count, max_client_connect);
-
-            /* Greetings [version, nmethods, methods...]. */
-            recvall (client, buffer, 2);
-            TEST_ASSERT (buffer[0] == 0x5);
-            int nmethods = buffer[1];
-            int method = 0xff;
-            recvall (client, buffer, nmethods);
-            for (int i = 0; i < nmethods; i++) {
-                if (buffer[i] == auth_method)
-                    method = auth_method;
-            }
-            fprintf (stderr, "socks_server: received greetings\n");
-
-            /* Greetings response [version, method]. */
-            buffer[0] = 0x5;
-            buffer[1] = method;
-            sendall (client, buffer, 2);
-            fprintf (stderr,
-                     "socks_server: answered greetings (method: 0x%x)\n",
-                     method);
-
-            if (method == 0xff)
-                break; /* Out of client connection */
-
-            if (method == 0x2) {
-                int len;
-                int err = 0;
-                recvall (client, buffer, 1);
-                if (buffer[0] != 0x1) {
-                    err = 1;
-                } else {
-                    recvall (client, buffer, 1);
-                    len = (unsigned char) buffer[0];
-                    recvall (client, buffer, len);
-                    buffer[len] = '\0';
-                    if (strcmp (username, buffer) != 0) {
-                        fprintf (stderr,
-                                 "socks_server: error on username check: '%s', "
-                                 "expected: '%s'\n",
-                                 buffer, username);
-                        err = 1;
-                    }
-                    recvall (client, buffer, 1);
-                    len = (unsigned char) buffer[0];
-                    recvall (client, buffer, len);
-                    buffer[len] = '\0';
-                    if (strcmp (password, buffer) != 0) {
-                        fprintf (stderr,
-                                 "socks_server: error on password check: '%s', "
-                                 "expected: '%s'\n",
-                                 buffer, password);
-                        err = 1;
-                    }
-                }
-                fprintf (stderr, "socks_server: received credentials\n");
-                buffer[0] = 0x1;
-                buffer[1] = err;
-                sendall (client, buffer, 2);
-                fprintf (stderr,
-                         "socks_server: answered credentials (err: 0x%x)\n",
-                         err);
-                if (err != 0)
-                    break; /* Out of client connection. */
-            }
-
-            /* Request [version, cmd, rsv, atype, dst.addr, dst.port */
-            /* Test only tcp connect on top of IPV4 */
-            recvall (client, buffer, 4);
-            TEST_ASSERT (buffer[0] == 0x5);
-            TEST_ASSERT (buffer[1] == 0x1); /* CONNECT cmd */
-            TEST_ASSERT (buffer[2] == 0x0); /* reserved, ensure we send 0 */
-            fprintf (stderr,
-                     "socks_server: received command (cmd: %d, atype: %d)\n",
-                     buffer[1], buffer[3]);
-            /* IPv4 ADDR & PORT */
-            uint32_t naddr = 0, bind_naddr = 0;
-            uint16_t nport = 0, bind_nport = 0;
-            int remote = -1;
-            int err = 0;
-            int request_atype = buffer[3];
-            if (request_atype == 0x1) /* ATYPE IPv4 */ {
-                recvall (client, (char *) &naddr, 4);
-                fprintf (stderr,
-                         "socks_server: received address (addr: 0x%x)\n",
-                         ntohl (naddr));
-            } else if (request_atype == 0x3) /* ATYPE DOMAINNAME */ {
-                int len;
-                recvall (client, buffer, 1);
-                len = (unsigned char) buffer[0];
-                recvall (client, buffer, len);
-                buffer[len] = '\0';
-                fprintf (stderr,
-                         "socks_server: received domainname (hostname: %s)\n",
-                         buffer);
-                /* For the test we support static resolution of
-                   hostname "somedomainnmame.org" to localhost */
-                if (strcmp ("somedomainname.org", buffer) == 0) {
-                    naddr = htonl (0x7f000001); /* 127.0.0.1 */
-                } else {
-                    err = 0x4; /* Host unreachable */
-                }
-            } else if (request_atype == 0x4) {
-                /* For the test we simulate IPV6 connection request ::1, but connect to IPv4 localhost */
-                unsigned char nipv6local[16] = {0};
-                nipv6local[15] = 1;
-                recvall (client, buffer, 16);
-                fprintf (stderr,
-                         "socks_server: received ipv6 address (buffer:");
-                for (int i = 0; i < 16; i++)
-                    fprintf (stderr, " 0x%x", (unsigned char) buffer[i]);
-                fprintf (stderr, ")\n");
-                if (memcmp (buffer, nipv6local, 16) == 0) {
-                    naddr = htonl (0x7f000001); /* 127.0.0.1 */
-                } else {
-                    err = 0x4; /* Host unreachable */
-                }
-            } else {
-                err = 0x8; /* ATYPE not supported */
-            }
-            recvall (client, (char *) &nport, 2);
-            fprintf (stderr, "socks_server: received port (port: %d)\n",
-                     ntohs (nport));
-            if (err == 0) {
-                fprintf (stderr, "socks_server: trying to connect to %x:%d\n",
-                         ntohl (naddr), ntohs (nport));
-                remote = socket (AF_INET, SOCK_STREAM, IPPROTO_TCP);
-                res = remote_connect (remote, ntohl (naddr), ntohs (nport));
-                if (res != 0) {
-                    err = 0x5; /* Connection refused */
-                } else {
-                    struct sockaddr_in ip4addr;
-                    socklen_t len = sizeof (ip4addr);
-                    res =
-                      getsockname (remote, (struct sockaddr *) &ip4addr, &len);
-                    TEST_ASSERT_SUCCESS_RAW_ERRNO (res);
-                    fprintf (stderr,
-                             "socks_server: connected and bound at: %x:%d\n",
-                             ntohl (ip4addr.sin_addr.s_addr),
-                             ntohs (ip4addr.sin_port));
-                    bind_naddr = ip4addr.sin_addr.s_addr;
-                    bind_nport = ip4addr.sin_port;
-                }
-            }
-
-            /* Reply request */
-            buffer[0] = 0x5;
-            buffer[1] = err;
-            buffer[2] = 0;
-            buffer[3] = request_atype;
-            sendall (client, buffer, 4);
-            if (request_atype == 0x1) /* ATYPE IPv4 */ {
-                sendall (client, (char *) &bind_naddr, 4);
-            } else if (request_atype == 0x3) {
-                /* This is just for testing reply with a hostname,
-                   normally a resolved address is passed in return to connect. */
-                buffer[0] = strlen ("localhost");
-                sendall (client, buffer, 1);
-                strcpy (buffer, "localhost");
-                sendall (client, buffer, strlen ("localhost"));
-            } else if (request_atype == 0x4) {
-                /* We simulate a bind to ::1, though the actual connection is IPv4 */
-                char nipv6local[16] = {0};
-                nipv6local[15] = 1;
-                sendall (client, nipv6local, sizeof nipv6local);
-            }
-            sendall (client, (char *) &bind_nport, 2);
-            fprintf (stderr, "socks_server: replied to request (err: 0x%x)\n",
-                     err);
-            if (err != 0)
-                break; /* Out of client connection. */
-
-            /* Communication loop */
-            zmq_pollitem_t items[] = {
-              {NULL, client, ZMQ_POLLIN, 0},
-              {NULL, remote, ZMQ_POLLIN, 0},
-            };
-            fprintf (stderr,
-                     "socks_server: waiting for input (client fd: %d, remote "
-                     "fd: %d)\n",
-                     client, remote);
-            while (1) {
-                if (client == -1 || remote == -1)
-                    break;
-                if (zmq_poll (items, 2, -1) < 0)
-                    break;
-                int nbytes;
-                for (int i = 0; i < 2; i++) {
-                    if ((items[i].revents & ZMQ_POLLIN) == 0)
-                        continue;
-                    fprintf (stderr, "socks_server: ready to read from fd %d\n",
-                             items[i].fd);
-                    int write_fd, read_fd = items[i].fd;
-                    if (read_fd == client) {
-                        write_fd = remote;
-                    } else {
-                        write_fd = client;
-                    }
-                    nbytes = recvonce (read_fd, buffer, sizeof buffer);
-                    fprintf (stderr, "socks_server: read returned: %d\n",
-                             nbytes);
-                    if (nbytes == 0 || nbytes == -1) {
-                        /* End of stream or error */
-                        if (read_fd == client) {
-                            close (client);
-                            client = -1;
-                        }
-                        if (read_fd == remote) {
-                            close (remote);
-                            remote = -1;
-                        }
-                        break;
-                    }
-                    sendall (write_fd, buffer, nbytes);
-                }
-            }
-            if (remote != -1) {
-                close (remote);
-                remote = -1;
-            }
-            fprintf (stderr, "socks_server: closed remote connection %d/%d\n",
-                     count, max_client_connect);
-        } while (0); /* Client socket scope. */
-        if (client != -1) {
-            close (client);
-            client = -1;
-        }
-        fprintf (stderr, "socks_server: closed client connection %d/%d\n",
-                 count, max_client_connect);
-    }
-    close (server_fd);
-    fprintf (stderr, "socks_server: closed server\n");
-}
-
-void socks_server_no_auth (void *socks_server)
-{
-    socks_server_task (socks_server, NULL, NULL, 1);
-}
-
-void socks_server_no_auth_delay (void *socks_server)
-{
-    fprintf (stderr, "socks_server: delay no auth socks server start\n");
-    // Enough delay to have client connecting before proxy listens
-    msleep (SETTLE_TIME * 10);
-    socks_server_task (socks_server, NULL, NULL, 1);
-}
-
-void socks_server_basic_auth (void *socks_server)
-{
-    socks_server_task (socks_server, "someuser", "somepass", 1);
-}
-
-void socks_server_basic_auth_delay (void *socks_server)
-{
-    fprintf (stderr, "socks_server: delay basic auth socks server start\n");
-    // Enough delay to have client connecting before proxy listens
-    msleep (SETTLE_TIME * 10);
-    socks_server_task (socks_server, "someuser", "somepass", 1);
-}
-
-void socks_server_basic_auth_no_pass (void *socks_server)
-{
-    socks_server_task (socks_server, "someuser", NULL, 1);
-}
-
-void *setup_push_server (char *connect_address, int connect_address_size)
-{
-    int res;
-    const char *bind_address = "tcp://127.0.0.1:*";
-    void *push = test_context_socket (ZMQ_PUSH);
-    res = zmq_bind (push, bind_address);
-    TEST_ASSERT_SUCCESS_ERRNO (res);
-    size_t len = connect_address_size;
-    res = zmq_getsockopt (push, ZMQ_LAST_ENDPOINT, connect_address, &len);
-    TEST_ASSERT_SUCCESS_ERRNO (res);
-    fprintf (stderr, "push_server: bound to: %s\n", connect_address);
-    return push;
-}
-
-void *setup_pull_client (const char *connect_address, const char *socks_proxy)
-{
-    int res;
-    void *pull = test_context_socket (ZMQ_PULL);
-    if (socks_proxy != NULL) {
-        res = zmq_setsockopt (pull, ZMQ_SOCKS_PROXY, socks_proxy,
-                              strlen (socks_proxy));
-        TEST_ASSERT_SUCCESS_ERRNO (res);
-        fprintf (stderr, "pull_client: use socks proxy: tcp://%s\n",
-                 socks_proxy);
-    }
-    res = zmq_connect (pull, connect_address);
-    TEST_ASSERT_SUCCESS_ERRNO (res);
-    fprintf (stderr, "pull_client: connected to: %s\n", connect_address);
-    return pull;
-}
-
-#ifdef ZMQ_BUILD_DRAFT_API
-void *setup_pull_client_with_auth (const char *connect_address,
-                                   const char *socks_proxy,
-                                   const char *username,
-                                   const char *password)
-{
-    int res;
-    void *pull = test_context_socket (ZMQ_PULL);
-
-    if (socks_proxy != NULL) {
-        res = zmq_setsockopt (pull, ZMQ_SOCKS_PROXY, socks_proxy,
-                              strlen (socks_proxy));
-        TEST_ASSERT_SUCCESS_ERRNO (res);
-        fprintf (stderr, "pull_client: use socks proxy: tcp://%s\n",
-                 socks_proxy);
-    }
-
-    res = zmq_setsockopt (pull, ZMQ_SOCKS_USERNAME, username,
-                          username == NULL ? 0 : strlen (username));
-    TEST_ASSERT_SUCCESS_ERRNO (res);
-
-    res = zmq_setsockopt (pull, ZMQ_SOCKS_PASSWORD, password,
-                          password == NULL ? 0 : strlen (password));
-    TEST_ASSERT_SUCCESS_ERRNO (res);
-
-    res = zmq_connect (pull, connect_address);
-    TEST_ASSERT_SUCCESS_ERRNO (res);
-    fprintf (stderr, "pull_client: connected to: %s\n", connect_address);
-    return pull;
-}
-#endif
-
-void communicate (void *push, void *pull)
-{
-    fprintf (stderr, "push_server: sending 2 messages\n");
-    s_send_seq (push, "ABC", SEQ_END);
-    s_send_seq (push, "DEF", SEQ_END);
-
-    fprintf (stderr, "pull_client: receiving 2 messages\n");
-    s_recv_seq (pull, "ABC", SEQ_END);
-    s_recv_seq (pull, "DEF", SEQ_END);
-}
-
-void test_socks_no_socks (void)
-{
-    char connect_address[MAX_SOCKET_STRING];
-
-    void *push = setup_push_server (connect_address, sizeof connect_address);
-    void *pull = setup_pull_client (connect_address, NULL);
-    communicate (push, pull);
-
-    test_context_socket_close_zero_linger (push);
-    test_context_socket_close_zero_linger (pull);
-}
-
-void test_socks (void)
-{
-    char socks_server_address[MAX_SOCKET_STRING];
-    char connect_address[MAX_SOCKET_STRING];
-
-    void *socks =
-      setup_socks_server (socks_server_address, sizeof socks_server_address);
-    void *push = setup_push_server (connect_address, sizeof connect_address);
-    void *pull = setup_pull_client (connect_address, socks_server_address);
-    void *thread = zmq_threadstart (&socks_server_no_auth, socks);
-
-    communicate (push, pull);
-
-    test_context_socket_close_zero_linger (push);
-    test_context_socket_close_zero_linger (pull);
-
-    zmq_threadclose (thread);
-}
-
-void test_socks_delay (void)
-{
-    char socks_server_address[MAX_SOCKET_STRING];
-    char connect_address[MAX_SOCKET_STRING];
-
-    void *socks =
-      setup_socks_server (socks_server_address, sizeof socks_server_address);
-    void *push = setup_push_server (connect_address, sizeof connect_address);
-    void *pull = setup_pull_client (connect_address, socks_server_address);
-    void *thread = zmq_threadstart (&socks_server_no_auth_delay, socks);
-
-    communicate (push, pull);
-
-    test_context_socket_close_zero_linger (push);
-    test_context_socket_close_zero_linger (pull);
-
-    zmq_threadclose (thread);
-}
-
-void test_socks_domainname (void)
-{
-    char socks_server_address[MAX_SOCKET_STRING];
-    char connect_address[MAX_SOCKET_STRING];
-    char connect_address_hostname[MAX_SOCKET_STRING];
-
-    void *socks =
-      setup_socks_server (socks_server_address, sizeof socks_server_address);
-    void *push = setup_push_server (connect_address, sizeof connect_address);
-    // Will be resolved by the proxy test server to 127.0.0.1
-    strcpy (connect_address_hostname, "tcp://somedomainname.org");
-    strcat (connect_address_hostname, strrchr (connect_address, ':'));
-    void *pull =
-      setup_pull_client (connect_address_hostname, socks_server_address);
-    void *thread = zmq_threadstart (&socks_server_no_auth, socks);
-
-    communicate (push, pull);
-
-    test_context_socket_close_zero_linger (push);
-    test_context_socket_close_zero_linger (pull);
-
-    zmq_threadclose (thread);
-}
-
-void test_socks_ipv6 (void)
-{
-    char socks_server_address[MAX_SOCKET_STRING];
-    char connect_address[MAX_SOCKET_STRING];
-    char connect_address_hostname[MAX_SOCKET_STRING];
-
-    void *socks =
-      setup_socks_server (socks_server_address, sizeof socks_server_address);
-    void *push = setup_push_server (connect_address, sizeof connect_address);
-    // Will be resolved by the proxy test server to 127.0.0.1
-    strcpy (connect_address_hostname, "tcp://::1");
-    strcat (connect_address_hostname, strrchr (connect_address, ':'));
-    void *pull =
-      setup_pull_client (connect_address_hostname, socks_server_address);
-    void *thread = zmq_threadstart (&socks_server_no_auth, socks);
-
-    communicate (push, pull);
-
-    test_context_socket_close_zero_linger (push);
-    test_context_socket_close_zero_linger (pull);
-
-    zmq_threadclose (thread);
-}
-
-void test_socks_ipv6_sb (void)
-{
-    char socks_server_address[MAX_SOCKET_STRING];
-    char connect_address[MAX_SOCKET_STRING];
-    char connect_address_hostname[MAX_SOCKET_STRING];
-
-    void *socks =
-      setup_socks_server (socks_server_address, sizeof socks_server_address);
-    void *push = setup_push_server (connect_address, sizeof connect_address);
-    // Will be resolved by the proxy test server to 127.0.0.1
-    strcpy (connect_address_hostname, "tcp://[::1]");
-    strcat (connect_address_hostname, strrchr (connect_address, ':'));
-    void *pull =
-      setup_pull_client (connect_address_hostname, socks_server_address);
-    void *thread = zmq_threadstart (&socks_server_no_auth, socks);
-
-    communicate (push, pull);
-
-    test_context_socket_close_zero_linger (push);
-    test_context_socket_close_zero_linger (pull);
-
-    zmq_threadclose (thread);
-}
-
-void test_socks_bind_before_connect (void)
-{
-    char socks_server_address[MAX_SOCKET_STRING];
-    char connect_address[MAX_SOCKET_STRING];
-    char socks_address_bind_before_connect[MAX_SOCKET_STRING * 2];
-
-    void *socks =
-      setup_socks_server (socks_server_address, sizeof socks_server_address);
-    // Will do a bind before connect when connecting to proxy
-    strcpy (socks_address_bind_before_connect, "127.0.0.1:0;");
-    strcat (socks_address_bind_before_connect, socks_server_address);
-    void *push = setup_push_server (connect_address, sizeof connect_address);
-    void *pull =
-      setup_pull_client (connect_address, socks_address_bind_before_connect);
-    void *thread = zmq_threadstart (&socks_server_no_auth, socks);
-
-    communicate (push, pull);
-
-    test_context_socket_close_zero_linger (push);
-    test_context_socket_close_zero_linger (pull);
-
-    zmq_threadclose (thread);
-}
-
-void test_socks_basic_auth (void)
-{
-#ifdef ZMQ_BUILD_DRAFT_API
-    char socks_server_address[MAX_SOCKET_STRING];
-    char connect_address[MAX_SOCKET_STRING];
-
-    void *socks =
-      setup_socks_server (socks_server_address, sizeof socks_server_address);
-    void *push = setup_push_server (connect_address, sizeof connect_address);
-    void *pull = setup_pull_client_with_auth (
-      connect_address, socks_server_address, "someuser", "somepass");
-    void *thread = zmq_threadstart (&socks_server_basic_auth, socks);
-
-    communicate (push, pull);
-
-    test_context_socket_close_zero_linger (push);
-    test_context_socket_close_zero_linger (pull);
-
-    zmq_threadclose (thread);
-#else
-    TEST_IGNORE_MESSAGE (
-      "libzmq without DRAFT support, ignoring socks basic auth test");
-#endif
-}
-
-void test_socks_basic_auth_delay (void)
-{
-#ifdef ZMQ_BUILD_DRAFT_API
-    char socks_server_address[MAX_SOCKET_STRING];
-    char connect_address[MAX_SOCKET_STRING];
-
-    void *socks =
-      setup_socks_server (socks_server_address, sizeof socks_server_address);
-    void *push = setup_push_server (connect_address, sizeof connect_address);
-    void *pull = setup_pull_client_with_auth (
-      connect_address, socks_server_address, "someuser", "somepass");
-    void *thread = zmq_threadstart (&socks_server_basic_auth_delay, socks);
-
-    communicate (push, pull);
-
-    test_context_socket_close_zero_linger (push);
-    test_context_socket_close_zero_linger (pull);
-
-    zmq_threadclose (thread);
-#else
-    TEST_IGNORE_MESSAGE (
-      "libzmq without DRAFT support, ignoring socks basic auth test");
-#endif
-}
-
-void test_socks_basic_auth_empty_user (void)
-{
-#ifdef ZMQ_BUILD_DRAFT_API
-    char socks_server_address[MAX_SOCKET_STRING];
-    char connect_address[MAX_SOCKET_STRING];
-
-    void *socks =
-      setup_socks_server (socks_server_address, sizeof socks_server_address);
-    void *push = setup_push_server (connect_address, sizeof connect_address);
-    void *pull = setup_pull_client_with_auth (connect_address,
-                                              socks_server_address, "", NULL);
-    void *thread = zmq_threadstart (&socks_server_no_auth, socks);
-
-    communicate (push, pull);
-
-    test_context_socket_close_zero_linger (push);
-    test_context_socket_close_zero_linger (pull);
-
-    zmq_threadclose (thread);
-#else
-    TEST_IGNORE_MESSAGE (
-      "libzmq without DRAFT support, ignoring socks basic auth test");
-#endif
-}
-
-void test_socks_basic_auth_null_user (void)
-{
-#ifdef ZMQ_BUILD_DRAFT_API
-    char socks_server_address[MAX_SOCKET_STRING];
-    char connect_address[MAX_SOCKET_STRING];
-
-    void *socks =
-      setup_socks_server (socks_server_address, sizeof socks_server_address);
-    void *push = setup_push_server (connect_address, sizeof connect_address);
-    void *pull = setup_pull_client_with_auth (connect_address,
-                                              socks_server_address, NULL, NULL);
-    void *thread = zmq_threadstart (&socks_server_no_auth, socks);
-
-    communicate (push, pull);
-
-    test_context_socket_close_zero_linger (push);
-    test_context_socket_close_zero_linger (pull);
-
-    zmq_threadclose (thread);
-#else
-    TEST_IGNORE_MESSAGE (
-      "libzmq without DRAFT support, ignoring socks basic auth test");
-#endif
-}
-
-void test_socks_basic_auth_empty_pass (void)
-{
-#ifdef ZMQ_BUILD_DRAFT_API
-    char socks_server_address[MAX_SOCKET_STRING];
-    char connect_address[MAX_SOCKET_STRING];
-
-    void *socks =
-      setup_socks_server (socks_server_address, sizeof socks_server_address);
-    void *push = setup_push_server (connect_address, sizeof connect_address);
-    void *pull = setup_pull_client_with_auth (
-      connect_address, socks_server_address, "someuser", "");
-    void *thread = zmq_threadstart (&socks_server_basic_auth_no_pass, socks);
-
-    communicate (push, pull);
-
-    test_context_socket_close_zero_linger (push);
-    test_context_socket_close_zero_linger (pull);
-
-    zmq_threadclose (thread);
-#else
-    TEST_IGNORE_MESSAGE (
-      "libzmq without DRAFT support, ignoring socks basic auth test");
-#endif
-}
-
-void test_socks_basic_auth_null_pass (void)
-{
-#ifdef ZMQ_BUILD_DRAFT_API
-    char socks_server_address[MAX_SOCKET_STRING];
-    char connect_address[MAX_SOCKET_STRING];
-
-    void *socks =
-      setup_socks_server (socks_server_address, sizeof socks_server_address);
-    void *push = setup_push_server (connect_address, sizeof connect_address);
-    void *pull = setup_pull_client_with_auth (
-      connect_address, socks_server_address, "someuser", NULL);
-    void *thread = zmq_threadstart (&socks_server_basic_auth_no_pass, socks);
-
-    communicate (push, pull);
-
-    test_context_socket_close_zero_linger (push);
-    test_context_socket_close_zero_linger (pull);
-
-    zmq_threadclose (thread);
-#else
-    TEST_IGNORE_MESSAGE (
-      "libzmq without DRAFT support, ignoring socks basic auth test");
-#endif
-}
-
-
-void test_string_opt_ok (const char *msg, int opt, const char *value)
-{
-    int res;
-    void *sub = test_context_socket (ZMQ_SUB);
-    fprintf (stderr, "test_string_opt_ok: testing %s\n", msg);
-    res = zmq_setsockopt (sub, opt, value, strlen (value));
-    TEST_ASSERT_SUCCESS_ERRNO (res);
-    char buffer[1024];
-    size_t res_len = (size_t) sizeof buffer;
-    res = zmq_getsockopt (sub, opt, buffer, &res_len);
-    TEST_ASSERT_SUCCESS_ERRNO (res);
-    TEST_ASSERT_EQUAL (strlen (value) + 1, res_len);
-    TEST_ASSERT (strcmp (buffer, value) == 0);
-    test_context_socket_close_zero_linger (sub);
-}
-
-void test_opt_ok (const char *msg,
-                  int opt,
-                  const char *value,
-                  size_t len,
-                  const char *expected_value,
-                  size_t expected_len)
-{
-    int res;
-    void *sub = test_context_socket (ZMQ_SUB);
-    fprintf (stderr, "test_opt_ok: testing %s\n", msg);
-    res = zmq_setsockopt (sub, opt, value, len);
-    TEST_ASSERT_SUCCESS_ERRNO (res);
-    char buffer[1024];
-    size_t res_len = (size_t) sizeof buffer;
-    res = zmq_getsockopt (sub, opt, buffer, &res_len);
-    TEST_ASSERT_SUCCESS_ERRNO (res);
-    TEST_ASSERT_EQUAL (expected_len + 1, res_len);
-    TEST_ASSERT_EQUAL (expected_len, strlen (buffer));
-    TEST_ASSERT (strncmp (buffer, expected_value, expected_len) == 0);
-    test_context_socket_close_zero_linger (sub);
-}
-
-void test_opt_invalid (const char *msg, int opt, const char *value, int len)
-{
-    int res;
-    void *sub = test_context_socket (ZMQ_SUB);
-    fprintf (stderr, "test_opt_invalid: testing %s\n", msg);
-    res = zmq_setsockopt (sub, opt, value, len);
-    TEST_ASSERT_FAILURE_ERRNO (EINVAL, res);
-    test_context_socket_close_zero_linger (sub);
-}
-
-void test_socks_proxy_options (void)
-{
-    // NULL is equivalent to not set and returns empty string
-    test_opt_ok ("NULL proxy", ZMQ_SOCKS_PROXY, NULL, 0, "", 0);
-    test_string_opt_ok ("valid proxy", ZMQ_SOCKS_PROXY, "somehost:1080");
-    // Empty value not allowed for proxy server
-    test_opt_invalid ("empty proxy", ZMQ_SOCKS_PROXY, "", 0);
-}
-
-void test_socks_userpass_options (void)
-{
-#ifdef ZMQ_BUILD_DRAFT_API
-    char buffer[1024];
-    for (int i = 0; i < (int) sizeof buffer; i++) {
-        buffer[i] = 'a' + i % 26;
-    }
-
-    // NULL is equivalent to not-set or ""
-    test_opt_ok ("NULL username", ZMQ_SOCKS_USERNAME, NULL, 0, "", 0);
-    // Empty value is allowed for username, means no authentication
-    test_string_opt_ok ("empty username", ZMQ_SOCKS_USERNAME, "");
-    test_string_opt_ok ("valid username", ZMQ_SOCKS_USERNAME, "someuser");
-    test_opt_ok ("255 bytes username", ZMQ_SOCKS_USERNAME, buffer, 255, buffer,
-                 255);
-    test_opt_invalid ("too long username", ZMQ_SOCKS_USERNAME, buffer, 256);
-
-    // NULL is equivalent to not-set or ""
-    test_opt_ok ("NULL password", ZMQ_SOCKS_PASSWORD, NULL, 0, "", 0);
-    // Empty value allowed for password
-    test_string_opt_ok ("empty password", ZMQ_SOCKS_PASSWORD, "");
-    test_string_opt_ok ("valid password", ZMQ_SOCKS_PASSWORD, "someuser");
-    test_opt_ok ("255 bytes password", ZMQ_SOCKS_PASSWORD, buffer, 255, buffer,
-                 255);
-    test_opt_invalid ("too long password", ZMQ_SOCKS_PASSWORD, buffer, 256);
-#else
-    TEST_IGNORE_MESSAGE ("libzmq without DRAFT support, ignoring socks setopt "
-                         "username/password test");
-#endif
-}
-
-int main ()
-{
-    setup_test_environment (180);
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_socks_proxy_options);
-    RUN_TEST (test_socks_userpass_options);
-    RUN_TEST (test_socks_no_socks);
-    RUN_TEST (test_socks);
-    RUN_TEST (test_socks_delay);
-    RUN_TEST (test_socks_domainname);
-    RUN_TEST (test_socks_ipv6);
-    RUN_TEST (test_socks_ipv6_sb);
-    RUN_TEST (test_socks_bind_before_connect);
-    RUN_TEST (test_socks_basic_auth);
-    RUN_TEST (test_socks_basic_auth_delay);
-    RUN_TEST (test_socks_basic_auth_empty_user);
-    RUN_TEST (test_socks_basic_auth_null_user);
-    RUN_TEST (test_socks_basic_auth_empty_pass);
-    RUN_TEST (test_socks_basic_auth_null_pass);
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_sodium.cpp b/libs/libzmq/tests/test_sodium.cpp
deleted file mode 100644
index 1cd7fce..0000000
--- a/libs/libzmq/tests/test_sodium.cpp
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
-    Copyright (c) 2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-void setUp ()
-{
-}
-
-void tearDown ()
-{
-}
-
-// There is no way to test for correctness because of the embedded RNG.
-void test__zmq_curve_keypair__always__success (void)
-{
-    errno = 0;
-    char public_key[41] = {0};
-    char secret_key[41] = {0};
-
-    const int rc = zmq_curve_keypair (public_key, secret_key);
-
-#if defined(ZMQ_HAVE_CURVE)
-    TEST_ASSERT_SUCCESS_ERRNO (rc);
-#else
-    TEST_ASSERT_FAILURE_ERRNO (ENOTSUP, rc);
-#endif
-}
-
-void test__zmq_curve_public__valid__success ()
-{
-    // These are paired according to hintjens.com/blog:45
-    static const char public_key[] = "Yne@$w-vo<fVvi]a<NY6T1ed:M$fCG*[IaLV{hID";
-    static const char secret_key[] = "D:)Q[IlAW!ahhC2ac:9*A}h:p?([4%wOTJ%JR%cs";
-
-    errno = 0;
-    char out_public[41] = {0};
-
-    const int rc = zmq_curve_public (out_public, secret_key);
-
-#if defined(ZMQ_HAVE_CURVE)
-    TEST_ASSERT_SUCCESS_ERRNO (rc);
-    TEST_ASSERT_EQUAL_STRING (public_key, out_public);
-#else
-    TEST_ASSERT_FAILURE_ERRNO (ENOTSUP, rc);
-    (void) public_key;
-#endif
-}
-
-// The key length must be evenly divisible by 5 or must fail with EINVAL.
-void test__zmq_curve_public__invalid__failure (const char *secret_)
-{
-    errno = 0;
-    char out_public[41] = {0};
-
-    const int rc = zmq_curve_public (out_public, secret_);
-
-#if defined(ZMQ_HAVE_CURVE)
-    TEST_ASSERT_FAILURE_ERRNO (EINVAL, rc);
-    TEST_ASSERT_EQUAL_STRING ("", out_public);
-#else
-    TEST_ASSERT_FAILURE_ERRNO (ENOTSUP, rc);
-#endif
-}
-
-void test__zmq_curve_public__invalid__failure_short ()
-{
-    test__zmq_curve_public__invalid__failure ("42");
-}
-
-void test__zmq_curve_public__invalid__failure_long ()
-{
-    test__zmq_curve_public__invalid__failure (
-      "0123456789012345678901234567890123456789.");
-}
-
-int main ()
-{
-    UNITY_BEGIN ();
-    RUN_TEST (test__zmq_curve_keypair__always__success);
-
-    RUN_TEST (test__zmq_curve_public__valid__success);
-    RUN_TEST (test__zmq_curve_public__invalid__failure_short);
-    RUN_TEST (test__zmq_curve_public__invalid__failure_long);
-
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_spec_dealer.cpp b/libs/libzmq/tests/test_spec_dealer.cpp
deleted file mode 100644
index e7b6eb2..0000000
--- a/libs/libzmq/tests/test_spec_dealer.cpp
+++ /dev/null
@@ -1,215 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-// SHALL route outgoing messages to available peers using a round-robin
-// strategy.
-void test_round_robin_out (const char *bind_address_)
-{
-    void *dealer = test_context_socket (ZMQ_DEALER);
-
-    char connect_address[MAX_SOCKET_STRING];
-    test_bind (dealer, bind_address_, connect_address,
-               sizeof (connect_address));
-
-    const size_t services = 5;
-    void *rep[services];
-    for (size_t peer = 0; peer < services; ++peer) {
-        rep[peer] = test_context_socket (ZMQ_REP);
-
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (rep[peer], connect_address));
-    }
-
-    // Wait for connections.
-    msleep (SETTLE_TIME);
-
-    // Send all requests
-    for (size_t i = 0; i < services; ++i)
-        s_send_seq (dealer, 0, "ABC", SEQ_END);
-
-    // Expect every REP got one message
-    zmq_msg_t msg;
-    zmq_msg_init (&msg);
-
-    for (size_t peer = 0; peer < services; ++peer)
-        s_recv_seq (rep[peer], "ABC", SEQ_END);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&msg));
-
-    test_context_socket_close_zero_linger (dealer);
-
-    for (size_t peer = 0; peer < services; ++peer)
-        test_context_socket_close_zero_linger (rep[peer]);
-}
-
-// SHALL receive incoming messages from its peers using a fair-queuing
-// strategy.
-void test_fair_queue_in (const char *bind_address_)
-{
-    void *receiver = test_context_socket (ZMQ_DEALER);
-
-    char connect_address[MAX_SOCKET_STRING];
-    test_bind (receiver, bind_address_, connect_address,
-               sizeof (connect_address));
-
-    const size_t services = 5;
-    void *senders[services];
-    for (size_t peer = 0; peer < services; ++peer) {
-        senders[peer] = test_context_socket (ZMQ_DEALER);
-
-        TEST_ASSERT_SUCCESS_ERRNO (
-          zmq_connect (senders[peer], connect_address));
-    }
-
-    zmq_msg_t msg;
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init (&msg));
-
-    s_send_seq (senders[0], "A", SEQ_END);
-    s_recv_seq (receiver, "A", SEQ_END);
-
-    s_send_seq (senders[0], "A", SEQ_END);
-    s_recv_seq (receiver, "A", SEQ_END);
-
-    // send our requests
-    for (size_t peer = 0; peer < services; ++peer)
-        s_send_seq (senders[peer], "B", SEQ_END);
-
-    // Wait for data.
-    msleep (SETTLE_TIME);
-
-    // handle the requests
-    for (size_t peer = 0; peer < services; ++peer)
-        s_recv_seq (receiver, "B", SEQ_END);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&msg));
-
-    test_context_socket_close_zero_linger (receiver);
-
-    for (size_t peer = 0; peer < services; ++peer)
-        test_context_socket_close_zero_linger (senders[peer]);
-}
-
-// SHALL create a double queue when a peer connects to it. If this peer
-// disconnects, the DEALER socket SHALL destroy its double queue and SHALL
-// discard any messages it contains.
-void test_destroy_queue_on_disconnect (const char *bind_address_)
-{
-    void *a = test_context_socket (ZMQ_DEALER);
-
-    char connect_address[MAX_SOCKET_STRING];
-    test_bind (a, bind_address_, connect_address, sizeof (connect_address));
-
-    void *b = test_context_socket (ZMQ_DEALER);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (b, connect_address));
-
-    // Send a message in both directions
-    s_send_seq (a, "ABC", SEQ_END);
-    s_send_seq (b, "DEF", SEQ_END);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_disconnect (b, connect_address));
-
-    // Disconnect may take time and need command processing.
-    zmq_pollitem_t poller[2] = {{a, 0, 0, 0}, {b, 0, 0, 0}};
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_poll (poller, 2, 100));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_poll (poller, 2, 100));
-
-    // No messages should be available, sending should fail.
-    zmq_msg_t msg;
-    zmq_msg_init (&msg);
-
-    TEST_ASSERT_FAILURE_ERRNO (EAGAIN, zmq_send (a, 0, 0, ZMQ_DONTWAIT));
-
-    TEST_ASSERT_FAILURE_ERRNO (EAGAIN, zmq_msg_recv (&msg, a, ZMQ_DONTWAIT));
-
-    // After a reconnect of B, the messages should still be gone
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (b, connect_address));
-
-    TEST_ASSERT_FAILURE_ERRNO (EAGAIN, zmq_msg_recv (&msg, a, ZMQ_DONTWAIT));
-
-    TEST_ASSERT_FAILURE_ERRNO (EAGAIN, zmq_msg_recv (&msg, b, ZMQ_DONTWAIT));
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&msg));
-
-    test_context_socket_close_zero_linger (a);
-    test_context_socket_close_zero_linger (b);
-}
-
-// SHALL block on sending, or return a suitable error, when it has no connected peers.
-void test_block_on_send_no_peers (const char *bind_address_)
-{
-    void *sc = test_context_socket (ZMQ_DEALER);
-
-    int timeout = 250;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sc, ZMQ_SNDTIMEO, &timeout, sizeof (timeout)));
-
-    TEST_ASSERT_FAILURE_ERRNO (EAGAIN, zmq_send (sc, 0, 0, ZMQ_DONTWAIT));
-    TEST_ASSERT_FAILURE_ERRNO (EAGAIN, zmq_send (sc, 0, 0, 0));
-
-    test_context_socket_close (sc);
-}
-
-#define TEST_CASES(name, bind_address)                                         \
-    void test_round_robin_out_##name ()                                        \
-    {                                                                          \
-        test_round_robin_out (bind_address);                                   \
-    }                                                                          \
-    void test_fair_queue_in_##name () { test_fair_queue_in (bind_address); }   \
-    void test_block_on_send_no_peers_##name ()                                 \
-    {                                                                          \
-        test_block_on_send_no_peers (bind_address);                            \
-    }
-
-TEST_CASES (inproc, "inproc://a")
-TEST_CASES (tcp, "tcp://127.0.0.1:*")
-
-int main (void)
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-
-    RUN_TEST (test_round_robin_out_inproc);
-    RUN_TEST (test_fair_queue_in_inproc);
-    RUN_TEST (test_block_on_send_no_peers_inproc);
-
-    RUN_TEST (test_round_robin_out_tcp);
-    RUN_TEST (test_fair_queue_in_tcp);
-    RUN_TEST (test_block_on_send_no_peers_tcp);
-
-    // TODO *** Test disabled until libzmq does this properly ***
-    // test_destroy_queue_on_disconnect (ctx);
-
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_spec_pushpull.cpp b/libs/libzmq/tests/test_spec_pushpull.cpp
deleted file mode 100644
index 4ffc7e6..0000000
--- a/libs/libzmq/tests/test_spec_pushpull.cpp
+++ /dev/null
@@ -1,418 +0,0 @@
-/*
-    Copyright (c) 2007-2018 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-#include <stdlib.h>
-#include <string.h>
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-char connect_address[MAX_SOCKET_STRING];
-
-// PUSH: SHALL route outgoing messages to connected peers using a
-// round-robin strategy.
-void test_push_round_robin_out (const char *bind_address_)
-{
-    void *push = test_context_socket (ZMQ_PUSH);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (push, bind_address_));
-    size_t len = MAX_SOCKET_STRING;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (push, ZMQ_LAST_ENDPOINT, connect_address, &len));
-
-    const size_t services = 5;
-    void *pulls[services];
-    for (size_t peer = 0; peer < services; ++peer) {
-        pulls[peer] = test_context_socket (ZMQ_PULL);
-
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (pulls[peer], connect_address));
-    }
-
-    // Wait for connections.
-    msleep (SETTLE_TIME);
-
-    // Send 2N messages
-    for (size_t peer = 0; peer < services; ++peer)
-        s_send_seq (push, "ABC", SEQ_END);
-    for (size_t peer = 0; peer < services; ++peer)
-        s_send_seq (push, "DEF", SEQ_END);
-
-    // Expect every PULL got one of each
-    for (size_t peer = 0; peer < services; ++peer) {
-        s_recv_seq (pulls[peer], "ABC", SEQ_END);
-        s_recv_seq (pulls[peer], "DEF", SEQ_END);
-    }
-
-    test_context_socket_close_zero_linger (push);
-
-    for (size_t peer = 0; peer < services; ++peer)
-        test_context_socket_close_zero_linger (pulls[peer]);
-}
-
-// PULL: SHALL receive incoming messages from its peers using a fair-queuing
-// strategy.
-void test_pull_fair_queue_in (const char *bind_address_)
-{
-    void *pull = test_context_socket (ZMQ_PULL);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (pull, bind_address_));
-    size_t len = MAX_SOCKET_STRING;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (pull, ZMQ_LAST_ENDPOINT, connect_address, &len));
-
-    const unsigned char services = 5;
-    void *pushs[services];
-    for (unsigned char peer = 0; peer < services; ++peer) {
-        pushs[peer] = test_context_socket (ZMQ_PUSH);
-
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (pushs[peer], connect_address));
-    }
-
-    // Wait for connections.
-    msleep (SETTLE_TIME);
-
-    int first_half = 0;
-    int second_half = 0;
-
-    // Send 2N messages
-    for (unsigned char peer = 0; peer < services; ++peer) {
-        char *str = strdup ("A");
-
-        str[0] += peer;
-        s_send_seq (pushs[peer], str, SEQ_END);
-        first_half += str[0];
-
-        str[0] += services;
-        s_send_seq (pushs[peer], str, SEQ_END);
-        second_half += str[0];
-
-        free (str);
-    }
-
-    // Wait for data.
-    msleep (SETTLE_TIME);
-
-    zmq_msg_t msg;
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init (&msg));
-
-    // Expect to pull one from each first
-    for (size_t peer = 0; peer < services; ++peer) {
-        TEST_ASSERT_EQUAL_INT (
-          2, TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_recv (&msg, pull, 0)));
-        const char *str = static_cast<const char *> (zmq_msg_data (&msg));
-        first_half -= str[0];
-    }
-    TEST_ASSERT_EQUAL_INT (0, first_half);
-
-    // And then get the second batch
-    for (size_t peer = 0; peer < services; ++peer) {
-        TEST_ASSERT_EQUAL_INT (
-          2, TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_recv (&msg, pull, 0)));
-        const char *str = static_cast<const char *> (zmq_msg_data (&msg));
-        second_half -= str[0];
-    }
-    TEST_ASSERT_EQUAL_INT (0, second_half);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&msg));
-
-    test_context_socket_close_zero_linger (pull);
-
-    for (size_t peer = 0; peer < services; ++peer)
-        test_context_socket_close_zero_linger (pushs[peer]);
-}
-
-// PUSH: SHALL block on sending, or return a suitable error, when it has no
-// available peers.
-void test_push_block_on_send_no_peers (const char *bind_address_)
-{
-    void *sc = test_context_socket (ZMQ_PUSH);
-
-    int timeout = 250;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sc, ZMQ_SNDTIMEO, &timeout, sizeof (timeout)));
-
-    TEST_ASSERT_FAILURE_ERRNO (EAGAIN, zmq_send (sc, 0, 0, ZMQ_DONTWAIT));
-    TEST_ASSERT_FAILURE_ERRNO (EAGAIN, zmq_send (sc, 0, 0, 0));
-
-    test_context_socket_close (sc);
-}
-
-// PUSH and PULL: SHALL create this queue when a peer connects to it. If
-// this peer disconnects, the socket SHALL destroy its queue and SHALL
-// discard any messages it contains.
-void test_destroy_queue_on_disconnect (const char *bind_address_)
-{
-    void *a = test_context_socket (ZMQ_PUSH);
-
-    int hwm = 1;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (a, ZMQ_SNDHWM, &hwm, sizeof (hwm)));
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (a, bind_address_));
-    size_t len = MAX_SOCKET_STRING;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (a, ZMQ_LAST_ENDPOINT, connect_address, &len));
-
-    void *b = test_context_socket (ZMQ_PULL);
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (b, ZMQ_RCVHWM, &hwm, sizeof (hwm)));
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (b, connect_address));
-
-    // Send two messages, one should be stuck in A's outgoing queue, the other
-    // arrives at B.
-    s_send_seq (a, "ABC", SEQ_END);
-    s_send_seq (a, "DEF", SEQ_END);
-
-    // Both queues should now be full, indicated by A blocking on send.
-    TEST_ASSERT_FAILURE_ERRNO (EAGAIN, zmq_send (a, 0, 0, ZMQ_DONTWAIT));
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_disconnect (b, connect_address));
-
-    // Disconnect may take time and need command processing.
-    zmq_pollitem_t poller[2] = {{a, 0, 0, 0}, {b, 0, 0, 0}};
-    TEST_ASSERT_EQUAL_INT (
-      0, TEST_ASSERT_SUCCESS_ERRNO (zmq_poll (poller, 2, 100)));
-    TEST_ASSERT_EQUAL_INT (
-      0, TEST_ASSERT_SUCCESS_ERRNO (zmq_poll (poller, 2, 100)));
-
-    zmq_msg_t msg;
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init (&msg));
-
-    // Can't receive old data on B.
-    TEST_ASSERT_FAILURE_ERRNO (EAGAIN, zmq_msg_recv (&msg, b, ZMQ_DONTWAIT));
-
-    // Sending fails.
-    TEST_ASSERT_FAILURE_ERRNO (EAGAIN, zmq_send (a, 0, 0, ZMQ_DONTWAIT));
-
-    // Reconnect B
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (b, connect_address));
-
-    // Still can't receive old data on B.
-    TEST_ASSERT_FAILURE_ERRNO (EAGAIN, zmq_msg_recv (&msg, b, ZMQ_DONTWAIT));
-
-    // two messages should be sendable before the queues are filled up.
-    s_send_seq (a, "ABC", SEQ_END);
-    s_send_seq (a, "DEF", SEQ_END);
-
-    TEST_ASSERT_FAILURE_ERRNO (EAGAIN, zmq_send (a, 0, 0, ZMQ_DONTWAIT));
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&msg));
-
-    test_context_socket_close_zero_linger (a);
-    test_context_socket_close_zero_linger (b);
-}
-
-// PUSH and PULL: SHALL either receive or drop multipart messages atomically.
-void test_push_multipart_atomic_drop (const char *bind_address_,
-                                      const bool block_)
-{
-    int linger = 0;
-    int hwm = 1;
-
-    void *push = test_context_socket (ZMQ_PUSH);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (push, ZMQ_LINGER, &linger, sizeof (linger)));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (push, ZMQ_SNDHWM, &hwm, sizeof (hwm)));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (push, bind_address_));
-    size_t addr_len = MAX_SOCKET_STRING;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (push, ZMQ_LAST_ENDPOINT, connect_address, &addr_len));
-
-    void *pull = test_context_socket (ZMQ_PULL);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (pull, ZMQ_LINGER, &linger, sizeof (linger)));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (pull, ZMQ_RCVHWM, &hwm, sizeof (hwm)));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (pull, connect_address));
-
-    // Wait for connections.
-    msleep (SETTLE_TIME);
-
-    int rc;
-    zmq_msg_t msg_data;
-    // A large message is needed to overrun the TCP buffers
-    const size_t len = 16 * 1024 * 1024;
-    size_t zmq_events_size = sizeof (int);
-    int zmq_events;
-
-    // Normal case - exercise the queues
-    send_string_expect_success (push, "0", ZMQ_SNDMORE);
-    send_string_expect_success (push, "0", ZMQ_SNDMORE);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init_size (&msg_data, len));
-    memset (zmq_msg_data (&msg_data), 'a', len);
-    TEST_ASSERT_EQUAL_INT (len, zmq_msg_send (&msg_data, push, 0));
-
-    recv_string_expect_success (pull, "0", 0);
-    recv_string_expect_success (pull, "0", 0);
-    zmq_msg_init (&msg_data);
-    TEST_ASSERT_EQUAL_INT (len, zmq_msg_recv (&msg_data, pull, 0));
-    zmq_msg_close (&msg_data);
-
-    // Fill the HWMs of sender and receiver, one message each
-    send_string_expect_success (push, "1", 0);
-
-    send_string_expect_success (push, "2", ZMQ_SNDMORE);
-    send_string_expect_success (push, "2", ZMQ_SNDMORE);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init_size (&msg_data, len));
-    memset (zmq_msg_data (&msg_data), 'b', len);
-    TEST_ASSERT_EQUAL_INT (len, zmq_msg_send (&msg_data, push, 0));
-
-    // Disconnect and simulate a poll (doesn't work on Windows) to
-    // let the commands run and let the pipes start to be deallocated
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_disconnect (pull, connect_address));
-
-    zmq_getsockopt (push, ZMQ_EVENTS, &zmq_events, &zmq_events_size);
-    zmq_getsockopt (pull, ZMQ_EVENTS, &zmq_events, &zmq_events_size);
-    msleep (SETTLE_TIME);
-    zmq_getsockopt (push, ZMQ_EVENTS, &zmq_events, &zmq_events_size);
-    zmq_getsockopt (pull, ZMQ_EVENTS, &zmq_events, &zmq_events_size);
-
-    // Reconnect and immediately push a large message into the pipe,
-    // if the problem is reproduced the pipe is in the process of being
-    // terminated but still exists (state term_ack_sent) and had already
-    // accepted the frame, so with the first frames already gone and
-    // unreachable only the last is left, and is stuck in the lb.
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (pull, connect_address));
-
-    send_string_expect_success (push, "3", ZMQ_SNDMORE);
-    send_string_expect_success (push, "3", ZMQ_SNDMORE);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init_size (&msg_data, len));
-    memset (zmq_msg_data (&msg_data), 'c', len);
-    if (block_) {
-        TEST_ASSERT_EQUAL_INT (len,
-                               zmq_msg_send (&msg_data, push, ZMQ_SNDMORE));
-    } else {
-        rc = zmq_msg_send (&msg_data, push, ZMQ_SNDMORE | ZMQ_DONTWAIT);
-        // inproc won't fail, much faster to connect/disconnect pipes than TCP
-        if (rc == -1) {
-            // at this point the new pipe is there and it works
-            send_string_expect_success (push, "3", ZMQ_SNDMORE);
-            send_string_expect_success (push, "3", ZMQ_SNDMORE);
-            TEST_ASSERT_EQUAL_INT (len,
-                                   zmq_msg_send (&msg_data, push, ZMQ_SNDMORE));
-        }
-    }
-    send_string_expect_success (push, "3b", 0);
-
-    zmq_getsockopt (push, ZMQ_EVENTS, &zmq_events, &zmq_events_size);
-    zmq_getsockopt (pull, ZMQ_EVENTS, &zmq_events, &zmq_events_size);
-    msleep (SETTLE_TIME);
-    zmq_getsockopt (push, ZMQ_EVENTS, &zmq_events, &zmq_events_size);
-    zmq_getsockopt (pull, ZMQ_EVENTS, &zmq_events, &zmq_events_size);
-
-    send_string_expect_success (push, "5", ZMQ_SNDMORE);
-    send_string_expect_success (push, "5", ZMQ_SNDMORE);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init_size (&msg_data, len));
-    memset (zmq_msg_data (&msg_data), 'd', len);
-    TEST_ASSERT_EQUAL_INT (len, zmq_msg_send (&msg_data, push, 0));
-
-    // On very slow machines the message will not be lost, as it will
-    // be sent when the new pipe is already in place, so avoid failing
-    // and simply carry on as it would be very noisy otherwise.
-    // Receive both to avoid leaking metadata.
-    // If only the "5" message is received, the problem is reproduced, and
-    // without the fix the first message received would be the last large
-    // frame of "3".
-    char buffer[2];
-    rc =
-      TEST_ASSERT_SUCCESS_ERRNO (zmq_recv (pull, buffer, sizeof (buffer), 0));
-    TEST_ASSERT_EQUAL_INT (1, rc);
-    TEST_ASSERT_TRUE (buffer[0] == '3' || buffer[0] == '5');
-    if (buffer[0] == '3') {
-        recv_string_expect_success (pull, "3", 0);
-        zmq_msg_init (&msg_data);
-        TEST_ASSERT_EQUAL_INT (len, zmq_msg_recv (&msg_data, pull, 0));
-        zmq_msg_close (&msg_data);
-        recv_string_expect_success (pull, "3b", 0);
-        recv_string_expect_success (pull, "5", 0);
-    }
-    recv_string_expect_success (pull, "5", 0);
-    zmq_msg_init (&msg_data);
-    TEST_ASSERT_EQUAL_INT (len, zmq_msg_recv (&msg_data, pull, 0));
-    zmq_msg_close (&msg_data);
-
-    test_context_socket_close_zero_linger (pull);
-    test_context_socket_close_zero_linger (push);
-}
-
-#define def_test_spec_pushpull(name, bind_address_)                            \
-    void test_spec_pushpull_##name##_push_round_robin_out ()                   \
-    {                                                                          \
-        test_push_round_robin_out (bind_address_);                             \
-    }                                                                          \
-    void test_spec_pushpull_##name##_pull_fair_queue_in ()                     \
-    {                                                                          \
-        test_pull_fair_queue_in (bind_address_);                               \
-    }                                                                          \
-    void test_spec_pushpull_##name##_push_block_on_send_no_peers ()            \
-    {                                                                          \
-        test_push_block_on_send_no_peers (bind_address_);                      \
-    }                                                                          \
-    void test_spec_pushpull_##name##_destroy_queue_on_disconnect ()            \
-    {                                                                          \
-        test_destroy_queue_on_disconnect (bind_address_);                      \
-    }                                                                          \
-    void test_spec_pushpull_##name##_push_multipart_atomic_drop_block ()       \
-    {                                                                          \
-        test_push_multipart_atomic_drop (bind_address_, true);                 \
-    }                                                                          \
-    void test_spec_pushpull_##name##_push_multipart_atomic_drop_non_block ()   \
-    {                                                                          \
-        test_push_multipart_atomic_drop (bind_address_, false);                \
-    }
-
-def_test_spec_pushpull (inproc, "inproc://a")
-
-  def_test_spec_pushpull (tcp, "tcp://127.0.0.1:*")
-
-    int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_spec_pushpull_inproc_push_round_robin_out);
-    RUN_TEST (test_spec_pushpull_tcp_push_round_robin_out);
-    RUN_TEST (test_spec_pushpull_inproc_pull_fair_queue_in);
-    RUN_TEST (test_spec_pushpull_tcp_pull_fair_queue_in);
-    RUN_TEST (test_spec_pushpull_inproc_push_block_on_send_no_peers);
-    RUN_TEST (test_spec_pushpull_tcp_push_block_on_send_no_peers);
-    // TODO Tests disabled until libzmq does this properly
-    //RUN_TEST (test_spec_pushpull_inproc_destroy_queue_on_disconnect);
-    //RUN_TEST (test_spec_pushpull_tcp_destroy_queue_on_disconnect);
-    RUN_TEST (test_spec_pushpull_inproc_push_multipart_atomic_drop_block);
-    RUN_TEST (test_spec_pushpull_inproc_push_multipart_atomic_drop_non_block);
-    RUN_TEST (test_spec_pushpull_tcp_push_multipart_atomic_drop_block);
-    RUN_TEST (test_spec_pushpull_tcp_push_multipart_atomic_drop_non_block);
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_spec_rep.cpp b/libs/libzmq/tests/test_spec_rep.cpp
deleted file mode 100644
index 034c2b7..0000000
--- a/libs/libzmq/tests/test_spec_rep.cpp
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-#include <stdlib.h>
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-char connect_address[MAX_SOCKET_STRING];
-
-void test_fair_queue_in (const char *bind_address_)
-{
-    void *rep = test_context_socket (ZMQ_REP);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (rep, bind_address_));
-    size_t len = MAX_SOCKET_STRING;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (rep, ZMQ_LAST_ENDPOINT, connect_address, &len));
-
-    const size_t services = 5;
-    void *reqs[services];
-    for (size_t peer = 0; peer < services; ++peer) {
-        reqs[peer] = test_context_socket (ZMQ_REQ);
-
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (reqs[peer], connect_address));
-    }
-
-    msleep (SETTLE_TIME);
-
-    s_send_seq (reqs[0], "A", SEQ_END);
-    s_recv_seq (rep, "A", SEQ_END);
-    s_send_seq (rep, "A", SEQ_END);
-    s_recv_seq (reqs[0], "A", SEQ_END);
-
-    s_send_seq (reqs[0], "A", SEQ_END);
-    s_recv_seq (rep, "A", SEQ_END);
-    s_send_seq (rep, "A", SEQ_END);
-    s_recv_seq (reqs[0], "A", SEQ_END);
-
-    // TODO: following test fails randomly on some boxes
-#ifdef SOMEONE_FIXES_THIS
-    // send N requests
-    for (size_t peer = 0; peer < services; ++peer) {
-        char *str = strdup ("A");
-        str[0] += peer;
-        s_send_seq (reqs[peer], str, SEQ_END);
-        free (str);
-    }
-
-    // handle N requests
-    for (size_t peer = 0; peer < services; ++peer) {
-        char *str = strdup ("A");
-        str[0] += peer;
-        //  Test fails here
-        s_recv_seq (rep, str, SEQ_END);
-        s_send_seq (rep, str, SEQ_END);
-        s_recv_seq (reqs[peer], str, SEQ_END);
-        free (str);
-    }
-#endif
-    test_context_socket_close_zero_linger (rep);
-
-    for (size_t peer = 0; peer < services; ++peer)
-        test_context_socket_close_zero_linger (reqs[peer]);
-}
-
-void test_envelope (const char *bind_address_)
-{
-    void *rep = test_context_socket (ZMQ_REP);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (rep, bind_address_));
-    size_t len = MAX_SOCKET_STRING;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (rep, ZMQ_LAST_ENDPOINT, connect_address, &len));
-
-    void *dealer = test_context_socket (ZMQ_DEALER);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (dealer, connect_address));
-
-    // minimal envelope
-    s_send_seq (dealer, 0, "A", SEQ_END);
-    s_recv_seq (rep, "A", SEQ_END);
-    s_send_seq (rep, "A", SEQ_END);
-    s_recv_seq (dealer, 0, "A", SEQ_END);
-
-    // big envelope
-    s_send_seq (dealer, "X", "Y", 0, "A", SEQ_END);
-    s_recv_seq (rep, "A", SEQ_END);
-    s_send_seq (rep, "A", SEQ_END);
-    s_recv_seq (dealer, "X", "Y", 0, "A", SEQ_END);
-
-    test_context_socket_close_zero_linger (rep);
-    test_context_socket_close_zero_linger (dealer);
-}
-
-const char bind_inproc[] = "inproc://a";
-const char bind_tcp[] = "tcp://127.0.0.1:*";
-
-void test_fair_queue_in_inproc ()
-{
-    test_fair_queue_in (bind_inproc);
-}
-
-void test_fair_queue_in_tcp ()
-{
-    test_fair_queue_in (bind_tcp);
-}
-
-void test_envelope_inproc ()
-{
-    test_envelope (bind_inproc);
-}
-
-void test_envelope_tcp ()
-{
-    test_envelope (bind_tcp);
-}
-
-int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-
-    // SHALL receive incoming messages from its peers using a fair-queuing
-    // strategy.
-    RUN_TEST (test_fair_queue_in_inproc);
-    RUN_TEST (test_fair_queue_in_tcp);
-
-    // For an incoming message:
-    // SHALL remove and store the address envelope, including the delimiter.
-    // SHALL pass the remaining data frames to its calling application.
-    // SHALL wait for a single reply message from its calling application.
-    // SHALL prepend the address envelope and delimiter.
-    // SHALL deliver this message back to the originating peer.
-    RUN_TEST (test_envelope_inproc);
-    RUN_TEST (test_envelope_tcp);
-
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_spec_req.cpp b/libs/libzmq/tests/test_spec_req.cpp
deleted file mode 100644
index a2abe92..0000000
--- a/libs/libzmq/tests/test_spec_req.cpp
+++ /dev/null
@@ -1,253 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-char connect_address[MAX_SOCKET_STRING];
-
-void test_round_robin_out (const char *bind_address_)
-{
-    void *req = test_context_socket (ZMQ_REQ);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (req, bind_address_));
-    size_t len = MAX_SOCKET_STRING;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (req, ZMQ_LAST_ENDPOINT, connect_address, &len));
-
-    const size_t services = 5;
-    void *rep[services];
-    for (size_t peer = 0; peer < services; peer++) {
-        rep[peer] = test_context_socket (ZMQ_REP);
-
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (rep[peer], connect_address));
-    }
-    //  We have to give the connects time to finish otherwise the requests
-    //  will not properly round-robin. We could alternatively connect the
-    //  REQ sockets to the REP sockets.
-    msleep (SETTLE_TIME * services);
-
-    // Send our peer-replies, and expect every REP it used once in order
-    for (size_t peer = 0; peer < services; peer++) {
-        s_send_seq (req, "ABC", SEQ_END);
-        s_recv_seq (rep[peer], "ABC", SEQ_END);
-        s_send_seq (rep[peer], "DEF", SEQ_END);
-        s_recv_seq (req, "DEF", SEQ_END);
-    }
-
-    test_context_socket_close_zero_linger (req);
-    for (size_t peer = 0; peer < services; peer++)
-        test_context_socket_close_zero_linger (rep[peer]);
-}
-
-void test_req_only_listens_to_current_peer (const char *bind_address_)
-{
-    void *req = test_context_socket (ZMQ_REQ);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (req, ZMQ_ROUTING_ID, "A", 2));
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (req, bind_address_));
-    size_t len = MAX_SOCKET_STRING;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (req, ZMQ_LAST_ENDPOINT, connect_address, &len));
-
-    const size_t services = 3;
-    void *router[services];
-
-    for (size_t i = 0; i < services; ++i) {
-        router[i] = test_context_socket (ZMQ_ROUTER);
-
-        int enabled = 1;
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (
-          router[i], ZMQ_ROUTER_MANDATORY, &enabled, sizeof (enabled)));
-
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (router[i], connect_address));
-    }
-
-    // Wait for connects to finish.
-    msleep (SETTLE_TIME);
-
-    for (size_t i = 0; i < services; ++i) {
-        // There still is a race condition when a stale peer's message
-        // arrives at the REQ just after a request was sent to that peer.
-        // To avoid that happening in the test, sleep for a bit.
-        TEST_ASSERT_EQUAL_INT (1,
-                               TEST_ASSERT_SUCCESS_ERRNO (zmq_poll (0, 0, 10)));
-
-        s_send_seq (req, "ABC", SEQ_END);
-
-        // Receive on router i
-        s_recv_seq (router[i], "A", 0, "ABC", SEQ_END);
-
-        // Send back replies on all routers
-        for (size_t j = 0; j < services; ++j) {
-            const char *replies[] = {"WRONG", "GOOD"};
-            const char *reply = replies[i == j ? 1 : 0];
-            s_send_seq (router[j], "A", 0, reply, SEQ_END);
-        }
-
-        // Receive only the good reply
-        s_recv_seq (req, "GOOD", SEQ_END);
-    }
-
-    test_context_socket_close_zero_linger (req);
-    for (size_t i = 0; i < services; ++i)
-        test_context_socket_close_zero_linger (router[i]);
-}
-
-void test_req_message_format (const char *bind_address_)
-{
-    void *req = test_context_socket (ZMQ_REQ);
-    void *router = test_context_socket (ZMQ_ROUTER);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (req, bind_address_));
-    size_t len = MAX_SOCKET_STRING;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (req, ZMQ_LAST_ENDPOINT, connect_address, &len));
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (router, connect_address));
-
-    // Send a multi-part request.
-    s_send_seq (req, "ABC", "DEF", SEQ_END);
-
-    zmq_msg_t msg;
-    zmq_msg_init (&msg);
-
-    // Receive peer routing id
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_recv (&msg, router, 0));
-    TEST_ASSERT_GREATER_THAN_INT (0, zmq_msg_size (&msg));
-    zmq_msg_t peer_id_msg;
-    zmq_msg_init (&peer_id_msg);
-    zmq_msg_copy (&peer_id_msg, &msg);
-
-    int more = 0;
-    size_t more_size = sizeof (more);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (router, ZMQ_RCVMORE, &more, &more_size));
-    TEST_ASSERT_TRUE (more);
-
-    // Receive the rest.
-    s_recv_seq (router, 0, "ABC", "DEF", SEQ_END);
-
-    // Send back a single-part reply.
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_msg_send (&peer_id_msg, router, ZMQ_SNDMORE));
-    s_send_seq (router, 0, "GHI", SEQ_END);
-
-    // Receive reply.
-    s_recv_seq (req, "GHI", SEQ_END);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&msg));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&peer_id_msg));
-
-    test_context_socket_close_zero_linger (req);
-    test_context_socket_close_zero_linger (router);
-}
-
-void test_block_on_send_no_peers ()
-{
-    void *sc = test_context_socket (ZMQ_REQ);
-
-    int timeout = 250;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sc, ZMQ_SNDTIMEO, &timeout, sizeof (timeout)));
-
-    TEST_ASSERT_FAILURE_ERRNO (EAGAIN, zmq_send (sc, 0, 0, ZMQ_DONTWAIT));
-    TEST_ASSERT_FAILURE_ERRNO (EAGAIN, zmq_send (sc, 0, 0, 0));
-
-    test_context_socket_close (sc);
-}
-
-const char bind_inproc[] = "inproc://a";
-const char bind_tcp[] = "tcp://127.0.0.1:*";
-
-void test_round_robin_out_inproc ()
-{
-    test_round_robin_out (bind_inproc);
-}
-
-void test_round_robin_out_tcp ()
-{
-    test_round_robin_out (bind_tcp);
-}
-
-void test_req_message_format_inproc ()
-{
-    test_req_message_format (bind_inproc);
-}
-
-void test_req_message_format_tcp ()
-{
-    test_req_message_format (bind_tcp);
-}
-
-void test_req_only_listens_to_current_peer_inproc ()
-{
-    test_req_only_listens_to_current_peer (bind_inproc);
-}
-
-void test_req_only_listens_to_current_peer_tcp ()
-{
-    test_req_only_listens_to_current_peer (bind_tcp);
-}
-
-int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-
-    // SHALL route outgoing messages to connected peers using a round-robin
-    // strategy.
-    RUN_TEST (test_round_robin_out_inproc);
-    RUN_TEST (test_round_robin_out_tcp);
-
-    // The request and reply messages SHALL have this format on the wire:
-    // * A delimiter, consisting of an empty frame, added by the REQ socket.
-    // * One or more data frames, comprising the message visible to the
-    //   application.
-    RUN_TEST (test_req_message_format_inproc);
-    RUN_TEST (test_req_message_format_tcp);
-
-    // SHALL block on sending, or return a suitable error, when it has no
-    // connected peers.
-    RUN_TEST (test_block_on_send_no_peers);
-
-    // SHALL accept an incoming message only from the last peer that it sent a
-    // request to.
-    // SHALL discard silently any messages received from other peers.
-    // TODO PH: this test is still failing; disabled for now to allow build to
-    // complete.
-    // RUN_TEST (test_req_only_listens_to_current_peer_inproc);
-    // RUN_TEST (test_req_only_listens_to_current_peer_tcp);
-
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_spec_router.cpp b/libs/libzmq/tests/test_spec_router.cpp
deleted file mode 100644
index 9e882f0..0000000
--- a/libs/libzmq/tests/test_spec_router.cpp
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-#include <stdlib.h>
-#include <string.h>
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-// SHALL receive incoming messages from its peers using a fair-queuing
-// strategy.
-void test_fair_queue_in (const char *bind_address_)
-{
-    char connect_address[MAX_SOCKET_STRING];
-    void *receiver = test_context_socket (ZMQ_ROUTER);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (receiver, bind_address_));
-    size_t len = MAX_SOCKET_STRING;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (receiver, ZMQ_LAST_ENDPOINT, connect_address, &len));
-
-    const unsigned char services = 5;
-    void *senders[services];
-    for (unsigned char peer = 0; peer < services; ++peer) {
-        senders[peer] = test_context_socket (ZMQ_DEALER);
-
-        char *str = strdup ("A");
-        str[0] += peer;
-        TEST_ASSERT_SUCCESS_ERRNO (
-          zmq_setsockopt (senders[peer], ZMQ_ROUTING_ID, str, 2));
-        free (str);
-
-        TEST_ASSERT_SUCCESS_ERRNO (
-          zmq_connect (senders[peer], connect_address));
-    }
-
-    msleep (SETTLE_TIME);
-
-    zmq_msg_t msg;
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init (&msg));
-
-    s_send_seq (senders[0], "M", SEQ_END);
-    s_recv_seq (receiver, "A", "M", SEQ_END);
-
-    s_send_seq (senders[0], "M", SEQ_END);
-    s_recv_seq (receiver, "A", "M", SEQ_END);
-
-    int sum = 0;
-
-    // send N requests
-    for (unsigned char peer = 0; peer < services; ++peer) {
-        s_send_seq (senders[peer], "M", SEQ_END);
-        sum += 'A' + peer;
-    }
-
-    TEST_ASSERT_EQUAL_INT (services * 'A' + services * (services - 1) / 2, sum);
-
-    // handle N requests
-    for (unsigned char peer = 0; peer < services; ++peer) {
-        TEST_ASSERT_EQUAL_INT (
-          2, TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_recv (&msg, receiver, 0)));
-        const char *id = static_cast<const char *> (zmq_msg_data (&msg));
-        sum -= id[0];
-
-        s_recv_seq (receiver, "M", SEQ_END);
-    }
-
-    TEST_ASSERT_EQUAL_INT (0, sum);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&msg));
-
-    test_context_socket_close_zero_linger (receiver);
-
-    for (size_t peer = 0; peer < services; ++peer)
-        test_context_socket_close_zero_linger (senders[peer]);
-
-    // Wait for disconnects.
-    msleep (SETTLE_TIME);
-}
-
-// SHALL create a double queue when a peer connects to it. If this peer
-// disconnects, the ROUTER socket SHALL destroy its double queue and SHALL
-// discard any messages it contains.
-void test_destroy_queue_on_disconnect (const char *bind_address_)
-{
-    void *a = test_context_socket (ZMQ_ROUTER);
-
-    int enabled = 1;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (a, ZMQ_ROUTER_MANDATORY, &enabled, sizeof (enabled)));
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (a, bind_address_));
-    size_t len = MAX_SOCKET_STRING;
-    char connect_address[MAX_SOCKET_STRING];
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (a, ZMQ_LAST_ENDPOINT, connect_address, &len));
-
-    void *b = test_context_socket (ZMQ_DEALER);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (b, ZMQ_ROUTING_ID, "B", 2));
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (b, connect_address));
-
-    // Wait for connection.
-    msleep (SETTLE_TIME);
-
-    // Send a message in both directions
-    s_send_seq (a, "B", "ABC", SEQ_END);
-    s_send_seq (b, "DEF", SEQ_END);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_disconnect (b, connect_address));
-
-    // Disconnect may take time and need command processing.
-    zmq_pollitem_t poller[2] = {{a, 0, 0, 0}, {b, 0, 0, 0}};
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_poll (poller, 2, 100));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_poll (poller, 2, 100));
-
-    // No messages should be available, sending should fail.
-    zmq_msg_t msg;
-    zmq_msg_init (&msg);
-
-    TEST_ASSERT_FAILURE_ERRNO (
-      EHOSTUNREACH, zmq_send (a, "B", 2, ZMQ_SNDMORE | ZMQ_DONTWAIT));
-
-    TEST_ASSERT_FAILURE_ERRNO (EAGAIN, zmq_msg_recv (&msg, a, ZMQ_DONTWAIT));
-
-    // After a reconnect of B, the messages should still be gone
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (b, connect_address));
-
-    TEST_ASSERT_FAILURE_ERRNO (EAGAIN, zmq_msg_recv (&msg, a, ZMQ_DONTWAIT));
-
-    TEST_ASSERT_FAILURE_ERRNO (EAGAIN, zmq_msg_recv (&msg, b, ZMQ_DONTWAIT));
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&msg));
-
-    test_context_socket_close_zero_linger (a);
-    test_context_socket_close_zero_linger (b);
-
-    // Wait for disconnects.
-    msleep (SETTLE_TIME);
-}
-
-#define TEST_SUITE(name, bind_address)                                         \
-    void test_fair_queue_in_##name () { test_fair_queue_in (bind_address); }   \
-    void test_destroy_queue_on_disconnect_##name ()                            \
-    {                                                                          \
-        test_destroy_queue_on_disconnect (bind_address);                       \
-    }
-
-TEST_SUITE (inproc, "inproc://a")
-TEST_SUITE (tcp, "tcp://127.0.0.1:*")
-
-int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_fair_queue_in_tcp);
-    RUN_TEST (test_fair_queue_in_inproc);
-    // TODO commented out until libzmq implements this properly
-    // RUN_TEST (test_destroy_queue_on_disconnect_tcp);
-    // RUN_TEST (test_destroy_queue_on_disconnect_inproc);
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_srcfd.cpp b/libs/libzmq/tests/test_srcfd.cpp
deleted file mode 100644
index e0c08d1..0000000
--- a/libs/libzmq/tests/test_srcfd.cpp
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-#include <string.h>
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-#define MSG_SIZE 20
-
-#ifdef _WIN32
-#include <winsock2.h>
-#include <ws2tcpip.h>
-#else
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netdb.h>
-#endif
-
-void test_srcfd ()
-{
-    char my_endpoint[MAX_SOCKET_STRING];
-
-    //  Create the infrastructure
-
-    void *rep = test_context_socket (ZMQ_REP);
-    void *req = test_context_socket (ZMQ_REQ);
-
-    bind_loopback_ipv4 (rep, my_endpoint, sizeof (my_endpoint));
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (req, my_endpoint));
-
-    char tmp[MSG_SIZE];
-    memset (tmp, 0, MSG_SIZE);
-    zmq_send (req, tmp, MSG_SIZE, 0);
-
-    zmq_msg_t msg;
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init (&msg));
-
-    zmq_recvmsg (rep, &msg, 0);
-    TEST_ASSERT_EQUAL_UINT (MSG_SIZE, zmq_msg_size (&msg));
-
-    // get the messages source file descriptor
-    int src_fd = zmq_msg_get (&msg, ZMQ_SRCFD);
-    TEST_ASSERT_GREATER_OR_EQUAL (0, src_fd);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&msg));
-
-    // get the remote endpoint
-    struct sockaddr_storage ss;
-#ifdef ZMQ_HAVE_HPUX
-    int addrlen = sizeof ss;
-#else
-    socklen_t addrlen = sizeof ss;
-#endif
-    TEST_ASSERT_SUCCESS_RAW_ERRNO (
-      getpeername (src_fd, (struct sockaddr *) &ss, &addrlen));
-
-    char host[NI_MAXHOST];
-    TEST_ASSERT_SUCCESS_RAW_ERRNO (getnameinfo ((struct sockaddr *) &ss,
-                                                addrlen, host, sizeof host,
-                                                NULL, 0, NI_NUMERICHOST));
-
-    // assert it is localhost which connected
-    TEST_ASSERT_EQUAL_STRING ("127.0.0.1", host);
-
-    test_context_socket_close (rep);
-    test_context_socket_close (req);
-
-    // sleep a bit for the socket to be freed
-    msleep (SETTLE_TIME);
-
-    // getting name from closed socket will fail
-#ifdef ZMQ_HAVE_WINDOWS
-    const int expected_errno = WSAENOTSOCK;
-#else
-    const int expected_errno = EBADF;
-#endif
-    TEST_ASSERT_FAILURE_RAW_ERRNO (
-      expected_errno, getpeername (src_fd, (struct sockaddr *) &ss, &addrlen));
-}
-
-int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_srcfd);
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_stream.cpp b/libs/libzmq/tests/test_stream.cpp
deleted file mode 100644
index 0ae8bf0..0000000
--- a/libs/libzmq/tests/test_stream.cpp
+++ /dev/null
@@ -1,303 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-#include <string.h>
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-//  ZMTP protocol greeting structure
-
-typedef uint8_t byte;
-typedef struct
-{
-    byte signature[10]; //  0xFF 8*0x00 0x7F
-    byte version[2];    //  0x03 0x01 for ZMTP/3.1
-    byte mechanism[20]; //  "NULL"
-    byte as_server;
-    byte filler[31];
-} zmtp_greeting_t;
-
-#define ZMTP_DEALER 5 //  Socket type constants
-
-//  This is a greeting matching what 0MQ will send us; note the
-//  8-byte size is set to 1 for backwards compatibility
-
-static zmtp_greeting_t greeting = {
-  {0xFF, 0, 0, 0, 0, 0, 0, 0, 1, 0x7F}, {3, 1}, {'N', 'U', 'L', 'L'}, 0, {0}};
-
-static void test_stream_to_dealer ()
-{
-    int rc;
-    char my_endpoint[MAX_SOCKET_STRING];
-
-    //  We'll be using this socket in raw mode
-    void *stream = test_context_socket (ZMQ_STREAM);
-
-    int zero = 0;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (stream, ZMQ_LINGER, &zero, sizeof (zero)));
-    int enabled = 1;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (stream, ZMQ_STREAM_NOTIFY, &enabled, sizeof (enabled)));
-    bind_loopback_ipv4 (stream, my_endpoint, sizeof my_endpoint);
-
-    //  We'll be using this socket as the other peer
-    void *dealer = test_context_socket (ZMQ_DEALER);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (dealer, ZMQ_LINGER, &zero, sizeof (zero)));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (dealer, my_endpoint));
-
-    //  Send a message on the dealer socket
-    send_string_expect_success (dealer, "Hello", 0);
-
-    //  Connecting sends a zero message
-    //  First frame is routing id
-    zmq_msg_t routing_id;
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init (&routing_id));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_recv (&routing_id, stream, 0));
-    TEST_ASSERT_TRUE (zmq_msg_more (&routing_id));
-
-    //  Verify the existence of Peer-Address metadata
-    char const *peer_address = zmq_msg_gets (&routing_id, "Peer-Address");
-    TEST_ASSERT_NOT_NULL (peer_address);
-    TEST_ASSERT_EQUAL_STRING ("127.0.0.1", peer_address);
-
-    //  Second frame is zero
-    byte buffer[255];
-    TEST_ASSERT_EQUAL_INT (
-      0, TEST_ASSERT_SUCCESS_ERRNO (zmq_recv (stream, buffer, 255, 0)));
-
-    //  Verify the existence of Peer-Address metadata
-    peer_address = zmq_msg_gets (&routing_id, "Peer-Address");
-    TEST_ASSERT_NOT_NULL (peer_address);
-    TEST_ASSERT_EQUAL_STRING ("127.0.0.1", peer_address);
-
-    //  Real data follows
-    //  First frame is routing id
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_recv (&routing_id, stream, 0));
-    TEST_ASSERT_TRUE (zmq_msg_more (&routing_id));
-
-    //  Verify the existence of Peer-Address metadata
-    peer_address = zmq_msg_gets (&routing_id, "Peer-Address");
-    TEST_ASSERT_NOT_NULL (peer_address);
-    TEST_ASSERT_EQUAL_STRING ("127.0.0.1", peer_address);
-
-    //  Second frame is greeting signature
-    recv_array_expect_success (stream, greeting.signature, 0);
-
-    //  Send our own protocol greeting
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_send (&routing_id, stream, ZMQ_SNDMORE));
-    TEST_ASSERT_EQUAL_INT (
-      sizeof (greeting), TEST_ASSERT_SUCCESS_ERRNO (
-                           zmq_send (stream, &greeting, sizeof (greeting), 0)));
-
-    //  Now we expect the data from the DEALER socket
-    //  We want the rest of greeting along with the Ready command
-    int bytes_read = 0;
-    while (bytes_read < 97) {
-        //  First frame is the routing id of the connection (each time)
-        TEST_ASSERT_GREATER_THAN_INT (
-          0, TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_recv (&routing_id, stream, 0)));
-        TEST_ASSERT_TRUE (zmq_msg_more (&routing_id));
-        //  Second frame contains the next chunk of data
-        TEST_ASSERT_SUCCESS_ERRNO (
-          rc = zmq_recv (stream, buffer + bytes_read, 255 - bytes_read, 0));
-        bytes_read += rc;
-    }
-
-    //  First two bytes are major and minor version numbers.
-    TEST_ASSERT_EQUAL_INT (3, buffer[0]); //  ZMTP/3.1
-    TEST_ASSERT_EQUAL_INT (1, buffer[1]);
-
-    //  Mechanism is "NULL"
-    TEST_ASSERT_EQUAL_INT8_ARRAY (buffer + 2,
-                                  "NULL\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0", 20);
-    TEST_ASSERT_EQUAL_INT8_ARRAY (buffer + 54, "\4\51\5READY", 8);
-    TEST_ASSERT_EQUAL_INT8_ARRAY (buffer + 62, "\13Socket-Type\0\0\0\6DEALER",
-                                  22);
-    TEST_ASSERT_EQUAL_INT8_ARRAY (buffer + 84, "\10Identity\0\0\0\0", 13);
-
-    //  Announce we are ready
-    memcpy (buffer, "\4\51\5READY", 8);
-    memcpy (buffer + 8, "\13Socket-Type\0\0\0\6ROUTER", 22);
-    memcpy (buffer + 30, "\10Identity\0\0\0\0", 13);
-
-    //  Send Ready command
-    TEST_ASSERT_GREATER_THAN_INT (0, TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_send (
-                                       &routing_id, stream, ZMQ_SNDMORE)));
-    TEST_ASSERT_EQUAL_INT (
-      43, TEST_ASSERT_SUCCESS_ERRNO (zmq_send (stream, buffer, 43, 0)));
-
-    //  Now we expect the data from the DEALER socket
-    //  First frame is, again, the routing id of the connection
-    TEST_ASSERT_GREATER_THAN_INT (
-      0, TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_recv (&routing_id, stream, 0)));
-    TEST_ASSERT_TRUE (zmq_msg_more (&routing_id));
-
-    //  Third frame contains Hello message from DEALER
-    TEST_ASSERT_EQUAL_INT (7, TEST_ASSERT_SUCCESS_ERRNO (
-                                zmq_recv (stream, buffer, sizeof buffer, 0)));
-
-    //  Then we have a 5-byte message "Hello"
-    TEST_ASSERT_EQUAL_INT (0, buffer[0]); //  Flags = 0
-    TEST_ASSERT_EQUAL_INT (5, buffer[1]); //  Size = 5
-    TEST_ASSERT_EQUAL_INT8_ARRAY (buffer + 2, "Hello", 5);
-
-    //  Send "World" back to DEALER
-    TEST_ASSERT_GREATER_THAN_INT (0, TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_send (
-                                       &routing_id, stream, ZMQ_SNDMORE)));
-    byte world[] = {0, 5, 'W', 'o', 'r', 'l', 'd'};
-    TEST_ASSERT_EQUAL_INT (
-      sizeof (world),
-      TEST_ASSERT_SUCCESS_ERRNO (zmq_send (stream, world, sizeof (world), 0)));
-
-    //  Expect response on DEALER socket
-    recv_string_expect_success (dealer, "World", 0);
-
-    //  Test large messages over STREAM socket
-#define size 64000
-    uint8_t msgout[size];
-    memset (msgout, 0xAB, size);
-    zmq_send (dealer, msgout, size, 0);
-
-    uint8_t msgin[9 + size];
-    memset (msgin, 0, 9 + size);
-    bytes_read = 0;
-    while (bytes_read < 9 + size) {
-        //  Get routing id frame
-        TEST_ASSERT_GREATER_THAN_INT (
-          0, TEST_ASSERT_SUCCESS_ERRNO (zmq_recv (stream, buffer, 256, 0)));
-        //  Get next chunk
-        TEST_ASSERT_GREATER_THAN_INT (
-          0,
-          TEST_ASSERT_SUCCESS_ERRNO (rc = zmq_recv (stream, msgin + bytes_read,
-                                                    9 + size - bytes_read, 0)));
-        bytes_read += rc;
-    }
-    for (int byte_nbr = 0; byte_nbr < size; byte_nbr++) {
-        TEST_ASSERT_EQUAL_UINT8 (0xAB, msgin[9 + byte_nbr]);
-    }
-    test_context_socket_close (dealer);
-    test_context_socket_close (stream);
-}
-
-
-static void test_stream_to_stream ()
-{
-    char my_endpoint[MAX_SOCKET_STRING];
-    //  Set-up our context and sockets
-
-    void *server = test_context_socket (ZMQ_STREAM);
-    int enabled = 1;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (server, ZMQ_STREAM_NOTIFY, &enabled, sizeof (enabled)));
-    bind_loopback_ipv4 (server, my_endpoint, sizeof my_endpoint);
-
-    void *client = test_context_socket (ZMQ_STREAM);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (client, ZMQ_STREAM_NOTIFY, &enabled, sizeof (enabled)));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (client, my_endpoint));
-    uint8_t id[256];
-    uint8_t buffer[256];
-
-    //  Connecting sends a zero message
-    //  Server: First frame is routing id, second frame is zero
-    TEST_ASSERT_GREATER_THAN_INT (
-      0, TEST_ASSERT_SUCCESS_ERRNO (zmq_recv (server, id, 256, 0)));
-    TEST_ASSERT_EQUAL_INT (
-      0, TEST_ASSERT_SUCCESS_ERRNO (zmq_recv (server, buffer, 256, 0)));
-    //  Client: First frame is routing id, second frame is zero
-    TEST_ASSERT_GREATER_THAN_INT (
-      0, TEST_ASSERT_SUCCESS_ERRNO (zmq_recv (client, id, 256, 0)));
-    TEST_ASSERT_EQUAL_INT (
-      0, TEST_ASSERT_SUCCESS_ERRNO (zmq_recv (client, buffer, 256, 0)));
-
-    //  Sent HTTP request on client socket
-    //  Get server routing id
-    size_t id_size = sizeof id;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (client, ZMQ_ROUTING_ID, id, &id_size));
-    //  First frame is server routing id
-    TEST_ASSERT_EQUAL_INT ((int) id_size, TEST_ASSERT_SUCCESS_ERRNO (zmq_send (
-                                            client, id, id_size, ZMQ_SNDMORE)));
-    //  Second frame is HTTP GET request
-    TEST_ASSERT_EQUAL_INT (
-      7, TEST_ASSERT_SUCCESS_ERRNO (zmq_send (client, "GET /\n\n", 7, 0)));
-
-    //  Get HTTP request; ID frame and then request
-    TEST_ASSERT_GREATER_THAN_INT (
-      0, TEST_ASSERT_SUCCESS_ERRNO (zmq_recv (server, id, 256, 0)));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_recv (server, buffer, 256, 0));
-    TEST_ASSERT_EQUAL_INT8_ARRAY (buffer, "GET /\n\n", 7);
-
-    //  Send reply back to client
-    char http_response[] = "HTTP/1.0 200 OK\r\n"
-                           "Content-Type: text/plain\r\n"
-                           "\r\n"
-                           "Hello, World!";
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_send (server, id, id_size, ZMQ_SNDMORE));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_send (server, http_response, sizeof (http_response), ZMQ_SNDMORE));
-
-    //  Send zero to close connection to client
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_send (server, id, id_size, ZMQ_SNDMORE));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_send (server, NULL, 0, ZMQ_SNDMORE));
-
-    //  Get reply at client and check that it's complete
-    TEST_ASSERT_GREATER_THAN_INT (
-      0, TEST_ASSERT_SUCCESS_ERRNO (zmq_recv (client, id, 256, 0)));
-    TEST_ASSERT_EQUAL_INT (
-      sizeof http_response,
-      TEST_ASSERT_SUCCESS_ERRNO (zmq_recv (client, buffer, 256, 0)));
-    TEST_ASSERT_EQUAL_INT8_ARRAY (buffer, http_response,
-                                  sizeof (http_response));
-
-    // //  Get disconnection notification
-    // FIXME: why does this block? Bug in STREAM disconnect notification?
-    // id_size = zmq_recv (client, id, 256, 0);
-    // assert (id_size > 0);
-    // rc = zmq_recv (client, buffer, 256, 0);
-    // assert (rc == 0);
-
-    test_context_socket_close (server);
-    test_context_socket_close (client);
-}
-
-int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_stream_to_dealer);
-    RUN_TEST (test_stream_to_stream);
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_stream_disconnect.cpp b/libs/libzmq/tests/test_stream_disconnect.cpp
deleted file mode 100644
index d46916f..0000000
--- a/libs/libzmq/tests/test_stream_disconnect.cpp
+++ /dev/null
@@ -1,265 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-#include <string.h>
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-static const int SERVER = 0;
-static const int CLIENT = 1;
-
-struct test_message_t
-{
-    int turn;
-    const char *text;
-};
-
-// NOTE: messages are sent without null terminator.
-const test_message_t dialog[] = {
-  {CLIENT, "i can haz cheez burger?"},
-  {SERVER, "y u no disonnect?"},
-  {CLIENT, ""},
-};
-const int steps = sizeof (dialog) / sizeof (dialog[0]);
-
-bool has_more (void *socket_)
-{
-    int more = 0;
-    size_t more_size = sizeof (more);
-    int rc = zmq_getsockopt (socket_, ZMQ_RCVMORE, &more, &more_size);
-    if (rc != 0)
-        return false;
-    return more != 0;
-}
-
-void test_stream_disconnect ()
-{
-    size_t len = MAX_SOCKET_STRING;
-    char bind_endpoint[MAX_SOCKET_STRING];
-    char connect_endpoint[MAX_SOCKET_STRING];
-    void *sockets[2];
-
-    sockets[SERVER] = test_context_socket (ZMQ_STREAM);
-    int enabled = 1;
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (
-      sockets[SERVER], ZMQ_STREAM_NOTIFY, &enabled, sizeof (enabled)));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (sockets[SERVER], "tcp://0.0.0.0:*"));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (sockets[SERVER], ZMQ_LAST_ENDPOINT, bind_endpoint, &len));
-
-    //  Apparently Windows can't connect to 0.0.0.0. A better fix would be welcome.
-#ifdef ZMQ_HAVE_WINDOWS
-    sprintf (connect_endpoint, "tcp://127.0.0.1:%s",
-             strrchr (bind_endpoint, ':') + 1);
-#else
-    strcpy (connect_endpoint, bind_endpoint);
-#endif
-
-    sockets[CLIENT] = test_context_socket (ZMQ_STREAM);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (
-      sockets[CLIENT], ZMQ_STREAM_NOTIFY, &enabled, sizeof (enabled)));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sockets[CLIENT], connect_endpoint));
-
-    // wait for connect notification
-    // Server: Grab the 1st frame (peer routing id).
-    zmq_msg_t peer_frame;
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init (&peer_frame));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_recv (&peer_frame, sockets[SERVER], 0));
-    TEST_ASSERT_GREATER_THAN_INT (0, zmq_msg_size (&peer_frame));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&peer_frame));
-    TEST_ASSERT_TRUE (has_more (sockets[SERVER]));
-
-    // Server: Grab the 2nd frame (actual payload).
-    zmq_msg_t data_frame;
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init (&data_frame));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_recv (&data_frame, sockets[SERVER], 0));
-    TEST_ASSERT_EQUAL_INT (0, zmq_msg_size (&data_frame));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&data_frame));
-
-    // Client: Grab the 1st frame (peer routing id).
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init (&peer_frame));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_recv (&peer_frame, sockets[CLIENT], 0));
-    TEST_ASSERT_GREATER_THAN_INT (0, zmq_msg_size (&peer_frame));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&peer_frame));
-    TEST_ASSERT_TRUE (has_more (sockets[CLIENT]));
-
-    // Client: Grab the 2nd frame (actual payload).
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init (&data_frame));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_recv (&data_frame, sockets[CLIENT], 0));
-    TEST_ASSERT_EQUAL_INT (0, zmq_msg_size (&data_frame));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&data_frame));
-
-    // Send initial message.
-    char blob_data[256];
-    size_t blob_size = sizeof (blob_data);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (sockets[CLIENT], ZMQ_ROUTING_ID, blob_data, &blob_size));
-    TEST_ASSERT_GREATER_THAN (0, blob_size);
-    zmq_msg_t msg;
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init_size (&msg, blob_size));
-    memcpy (zmq_msg_data (&msg), blob_data, blob_size);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_msg_send (&msg, sockets[dialog[0].turn], ZMQ_SNDMORE));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&msg));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_msg_init_size (&msg, strlen (dialog[0].text)));
-    memcpy (zmq_msg_data (&msg), dialog[0].text, strlen (dialog[0].text));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_msg_send (&msg, sockets[dialog[0].turn], ZMQ_SNDMORE));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&msg));
-
-    // TODO: make sure this loop doesn't loop forever if something is wrong
-    //       with the test (or the implementation).
-
-    int step = 0;
-    while (step < steps) {
-        // Wait until something happens.
-        zmq_pollitem_t items[] = {
-          {sockets[SERVER], 0, ZMQ_POLLIN, 0},
-          {sockets[CLIENT], 0, ZMQ_POLLIN, 0},
-        };
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_poll (items, 2, 100));
-
-        // Check for data received by the server.
-        if (items[SERVER].revents & ZMQ_POLLIN) {
-            TEST_ASSERT_EQUAL_INT (CLIENT, dialog[step].turn);
-
-            // Grab the 1st frame (peer routing id).
-            zmq_msg_t peer_frame;
-            TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init (&peer_frame));
-            TEST_ASSERT_SUCCESS_ERRNO (
-              zmq_msg_recv (&peer_frame, sockets[SERVER], 0));
-            TEST_ASSERT_GREATER_THAN_INT (0, zmq_msg_size (&peer_frame));
-            TEST_ASSERT_TRUE (has_more (sockets[SERVER]));
-
-            // Grab the 2nd frame (actual payload).
-            zmq_msg_t data_frame;
-            TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init (&data_frame));
-            TEST_ASSERT_SUCCESS_ERRNO (
-              zmq_msg_recv (&data_frame, sockets[SERVER], 0));
-
-            // Make sure payload matches what we expect.
-            const char *const data =
-              static_cast<const char *> (zmq_msg_data (&data_frame));
-            const size_t size = zmq_msg_size (&data_frame);
-            // 0-length frame is a disconnection notification.  The server
-            // should receive it as the last step in the dialogue.
-            if (size == 0) {
-                ++step;
-                TEST_ASSERT_EQUAL_INT (steps, step);
-            } else {
-                TEST_ASSERT_EQUAL_INT (strlen (dialog[step].text), size);
-                TEST_ASSERT_EQUAL_STRING_LEN (dialog[step].text, data, size);
-
-                ++step;
-
-                TEST_ASSERT_LESS_THAN_INT (steps, step);
-
-                // Prepare the response.
-                TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&data_frame));
-                TEST_ASSERT_SUCCESS_ERRNO (
-                  zmq_msg_init_size (&data_frame, strlen (dialog[step].text)));
-                memcpy (zmq_msg_data (&data_frame), dialog[step].text,
-                        zmq_msg_size (&data_frame));
-
-                // Send the response.
-                TEST_ASSERT_SUCCESS_ERRNO (
-                  zmq_msg_send (&peer_frame, sockets[SERVER], ZMQ_SNDMORE));
-                TEST_ASSERT_SUCCESS_ERRNO (
-                  zmq_msg_send (&data_frame, sockets[SERVER], ZMQ_SNDMORE));
-            }
-
-            // Release resources.
-            TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&peer_frame));
-            TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&data_frame));
-        }
-
-        // Check for data received by the client.
-        if (items[CLIENT].revents & ZMQ_POLLIN) {
-            TEST_ASSERT_EQUAL_INT (SERVER, dialog[step].turn);
-
-            // Grab the 1st frame (peer routing id).
-            zmq_msg_t peer_frame;
-            TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init (&peer_frame));
-            TEST_ASSERT_SUCCESS_ERRNO (
-              zmq_msg_recv (&peer_frame, sockets[CLIENT], 0));
-            TEST_ASSERT_GREATER_THAN_INT (0, zmq_msg_size (&peer_frame));
-            TEST_ASSERT_TRUE (has_more (sockets[CLIENT]));
-
-            // Grab the 2nd frame (actual payload).
-            zmq_msg_t data_frame;
-            TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init (&data_frame));
-            TEST_ASSERT_SUCCESS_ERRNO (
-              zmq_msg_recv (&data_frame, sockets[CLIENT], 0));
-            TEST_ASSERT_GREATER_THAN_INT (0, zmq_msg_size (&data_frame));
-
-            // Make sure payload matches what we expect.
-            const char *const data =
-              static_cast<const char *> (zmq_msg_data (&data_frame));
-            const size_t size = zmq_msg_size (&data_frame);
-            TEST_ASSERT_EQUAL_INT (strlen (dialog[step].text), size);
-            TEST_ASSERT_EQUAL_STRING_LEN (dialog[step].text, data, size);
-
-            ++step;
-
-            // Prepare the response (next line in the dialog).
-            TEST_ASSERT_LESS_THAN_INT (steps, step);
-            TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&data_frame));
-            TEST_ASSERT_SUCCESS_ERRNO (
-              zmq_msg_init_size (&data_frame, strlen (dialog[step].text)));
-            memcpy (zmq_msg_data (&data_frame), dialog[step].text,
-                    zmq_msg_size (&data_frame));
-
-            // Send the response.
-            TEST_ASSERT_SUCCESS_ERRNO (
-              zmq_msg_send (&peer_frame, sockets[CLIENT], ZMQ_SNDMORE));
-            TEST_ASSERT_SUCCESS_ERRNO (
-              zmq_msg_send (&data_frame, sockets[CLIENT], ZMQ_SNDMORE));
-
-            // Release resources.
-            TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&peer_frame));
-            TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&data_frame));
-        }
-    }
-    TEST_ASSERT_EQUAL_INT (steps, step);
-    test_context_socket_close (sockets[CLIENT]);
-    test_context_socket_close (sockets[SERVER]);
-}
-
-int main (int, char **)
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_stream_disconnect);
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_stream_empty.cpp b/libs/libzmq/tests/test_stream_empty.cpp
deleted file mode 100644
index dd4c2c6..0000000
--- a/libs/libzmq/tests/test_stream_empty.cpp
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void test_stream_empty ()
-{
-    char my_endpoint[MAX_SOCKET_STRING];
-
-    void *stream = test_context_socket (ZMQ_STREAM);
-    void *dealer = test_context_socket (ZMQ_DEALER);
-
-    bind_loopback_ipv4 (stream, my_endpoint, sizeof my_endpoint);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (dealer, my_endpoint));
-    send_string_expect_success (dealer, "", 0);
-
-    zmq_msg_t ident, empty;
-    zmq_msg_init (&ident);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_recv (&ident, stream, 0));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_msg_init_data (&empty, (void *) "", 0, NULL, NULL));
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_send (&ident, stream, ZMQ_SNDMORE));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&ident));
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_send (&empty, stream, 0));
-
-    //  This close used to fail with Bad Address
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&empty));
-
-    test_context_socket_close_zero_linger (dealer);
-    test_context_socket_close_zero_linger (stream);
-}
-
-int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_stream_empty);
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_stream_exceeds_buffer.cpp b/libs/libzmq/tests/test_stream_exceeds_buffer.cpp
deleted file mode 100644
index e8478ad..0000000
--- a/libs/libzmq/tests/test_stream_exceeds_buffer.cpp
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-#include <string.h>
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void test_stream_exceeds_buffer ()
-{
-    const int msgsize = 8193;
-    char sndbuf[msgsize] = "\xde\xad\xbe\xef";
-    unsigned char rcvbuf[msgsize];
-    char my_endpoint[MAX_SOCKET_STRING];
-
-    int server_sock = bind_socket_resolve_port ("127.0.0.1", "0", my_endpoint);
-
-    void *zsock = test_context_socket (ZMQ_STREAM);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (zsock, my_endpoint));
-
-    int client_sock =
-      TEST_ASSERT_SUCCESS_RAW_ERRNO (accept (server_sock, NULL, NULL));
-
-    TEST_ASSERT_SUCCESS_RAW_ERRNO (close (server_sock));
-
-    TEST_ASSERT_EQUAL_INT (msgsize, send (client_sock, sndbuf, msgsize, 0));
-
-    zmq_msg_t msg;
-    zmq_msg_init (&msg);
-
-    int rcvbytes = 0;
-    while (rcvbytes == 0) // skip connection notification, if any
-    {
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_recv (&msg, zsock, 0)); // peerid
-        TEST_ASSERT_TRUE (zmq_msg_more (&msg));
-        rcvbytes = TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_recv (&msg, zsock, 0));
-        TEST_ASSERT_FALSE (zmq_msg_more (&msg));
-    }
-
-    // for this test, we only collect the first chunk
-    // since the corruption already occurs in the first chunk
-    memcpy (rcvbuf, zmq_msg_data (&msg), zmq_msg_size (&msg));
-
-    zmq_msg_close (&msg);
-    test_context_socket_close (zsock);
-    close (client_sock);
-
-    TEST_ASSERT_GREATER_OR_EQUAL (4, rcvbytes);
-
-    // notice that only the 1st byte gets corrupted
-    TEST_ASSERT_EQUAL_UINT (0xef, rcvbuf[3]);
-    TEST_ASSERT_EQUAL_UINT (0xbe, rcvbuf[2]);
-    TEST_ASSERT_EQUAL_UINT (0xad, rcvbuf[1]);
-    TEST_ASSERT_EQUAL_UINT (0xde, rcvbuf[0]);
-}
-
-int main ()
-{
-    UNITY_BEGIN ();
-    RUN_TEST (test_stream_exceeds_buffer);
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_stream_timeout.cpp b/libs/libzmq/tests/test_stream_timeout.cpp
deleted file mode 100644
index 0ab4ca6..0000000
--- a/libs/libzmq/tests/test_stream_timeout.cpp
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_monitoring.hpp"
-#include "testutil_unity.hpp"
-
-#include <stdlib.h>
-#include <string.h>
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-static void test_stream_handshake_timeout_accept ()
-{
-    char my_endpoint[MAX_SOCKET_STRING];
-
-    //  We use this socket in raw mode, to make a connection and send nothing
-    void *stream = test_context_socket (ZMQ_STREAM);
-
-    int zero = 0;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (stream, ZMQ_LINGER, &zero, sizeof (zero)));
-
-    //  We'll be using this socket to test TCP stream handshake timeout
-    void *dealer = test_context_socket (ZMQ_DEALER);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (dealer, ZMQ_LINGER, &zero, sizeof (zero)));
-    int val, tenth = 100;
-    size_t vsize = sizeof (val);
-
-    // check for the expected default handshake timeout value - 30 sec
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (dealer, ZMQ_HANDSHAKE_IVL, &val, &vsize));
-    TEST_ASSERT_EQUAL (sizeof (val), vsize);
-    TEST_ASSERT_EQUAL_INT (30000, val);
-    // make handshake timeout faster - 1/10 sec
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (dealer, ZMQ_HANDSHAKE_IVL, &tenth, sizeof (tenth)));
-    vsize = sizeof (val);
-    // make sure zmq_setsockopt changed the value
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (dealer, ZMQ_HANDSHAKE_IVL, &val, &vsize));
-    TEST_ASSERT_EQUAL (sizeof (val), vsize);
-    TEST_ASSERT_EQUAL_INT (tenth, val);
-
-    //  Create and connect a socket for collecting monitor events on dealer
-    void *dealer_mon = test_context_socket (ZMQ_PAIR);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_socket_monitor (
-      dealer, "inproc://monitor-dealer",
-      ZMQ_EVENT_CONNECTED | ZMQ_EVENT_DISCONNECTED | ZMQ_EVENT_ACCEPTED));
-
-    //  Connect to the inproc endpoint so we'll get events
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_connect (dealer_mon, "inproc://monitor-dealer"));
-
-    // bind dealer socket to accept connection from non-sending stream socket
-    bind_loopback_ipv4 (dealer, my_endpoint, sizeof my_endpoint);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (stream, my_endpoint));
-
-    // we should get ZMQ_EVENT_ACCEPTED and then ZMQ_EVENT_DISCONNECTED
-    int event = get_monitor_event (dealer_mon, NULL, NULL);
-    TEST_ASSERT_EQUAL_INT (ZMQ_EVENT_ACCEPTED, event);
-    event = get_monitor_event (dealer_mon, NULL, NULL);
-    TEST_ASSERT_EQUAL_INT (ZMQ_EVENT_DISCONNECTED, event);
-
-    test_context_socket_close (dealer);
-    test_context_socket_close (dealer_mon);
-    test_context_socket_close (stream);
-}
-
-static void test_stream_handshake_timeout_connect ()
-{
-    char my_endpoint[MAX_SOCKET_STRING];
-
-    //  We use this socket in raw mode, to accept a connection and send nothing
-    void *stream = test_context_socket (ZMQ_STREAM);
-
-    int zero = 0;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (stream, ZMQ_LINGER, &zero, sizeof (zero)));
-
-    bind_loopback_ipv4 (stream, my_endpoint, sizeof my_endpoint);
-
-    //  We'll be using this socket to test TCP stream handshake timeout
-    void *dealer = test_context_socket (ZMQ_DEALER);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (dealer, ZMQ_LINGER, &zero, sizeof (zero)));
-    int val, tenth = 100;
-    size_t vsize = sizeof (val);
-
-    // check for the expected default handshake timeout value - 30 sec
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (dealer, ZMQ_HANDSHAKE_IVL, &val, &vsize));
-    TEST_ASSERT_EQUAL (sizeof (val), vsize);
-    TEST_ASSERT_EQUAL_INT (30000, val);
-    // make handshake timeout faster - 1/10 sec
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (dealer, ZMQ_HANDSHAKE_IVL, &tenth, sizeof (tenth)));
-    vsize = sizeof (val);
-    // make sure zmq_setsockopt changed the value
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (dealer, ZMQ_HANDSHAKE_IVL, &val, &vsize));
-    TEST_ASSERT_EQUAL (sizeof (val), vsize);
-    TEST_ASSERT_EQUAL_INT (tenth, val);
-
-    //  Create and connect a socket for collecting monitor events on dealer
-    void *dealer_mon = test_context_socket (ZMQ_PAIR);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_socket_monitor (
-      dealer, "inproc://monitor-dealer",
-      ZMQ_EVENT_CONNECTED | ZMQ_EVENT_DISCONNECTED | ZMQ_EVENT_ACCEPTED));
-
-    //  Connect to the inproc endpoint so we'll get events
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_connect (dealer_mon, "inproc://monitor-dealer"));
-
-    // connect dealer socket to non-sending stream socket
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (dealer, my_endpoint));
-
-    // we should get ZMQ_EVENT_CONNECTED and then ZMQ_EVENT_DISCONNECTED
-    int event = get_monitor_event (dealer_mon, NULL, NULL);
-    TEST_ASSERT_EQUAL_INT (ZMQ_EVENT_CONNECTED, event);
-    event = get_monitor_event (dealer_mon, NULL, NULL);
-    TEST_ASSERT_EQUAL_INT (ZMQ_EVENT_DISCONNECTED, event);
-
-    test_context_socket_close (dealer);
-    test_context_socket_close (dealer_mon);
-    test_context_socket_close (stream);
-}
-
-int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_stream_handshake_timeout_accept);
-    RUN_TEST (test_stream_handshake_timeout_connect);
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_sub_forward.cpp b/libs/libzmq/tests/test_sub_forward.cpp
deleted file mode 100644
index c5a9865..0000000
--- a/libs/libzmq/tests/test_sub_forward.cpp
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void test ()
-{
-    char endpoint1[MAX_SOCKET_STRING];
-    char endpoint2[MAX_SOCKET_STRING];
-
-    //  First, create an intermediate device
-    void *xpub = test_context_socket (ZMQ_XPUB);
-    bind_loopback_ipv4 (xpub, endpoint1, sizeof (endpoint1));
-
-    void *xsub = test_context_socket (ZMQ_XSUB);
-    bind_loopback_ipv4 (xsub, endpoint2, sizeof (endpoint2));
-
-    //  Create a publisher
-    void *pub = test_context_socket (ZMQ_PUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (pub, endpoint2));
-
-    //  Create a subscriber
-    void *sub = test_context_socket (ZMQ_SUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sub, endpoint1));
-
-    //  Subscribe for all messages.
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (sub, ZMQ_SUBSCRIBE, "", 0));
-
-    //  Pass the subscription upstream through the device
-    char buff[32];
-    int size;
-    TEST_ASSERT_SUCCESS_ERRNO (size = zmq_recv (xpub, buff, sizeof (buff), 0));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_send (xsub, buff, size, 0));
-
-    //  Wait a bit till the subscription gets to the publisher
-    msleep (SETTLE_TIME);
-
-    //  Send an empty message
-    send_string_expect_success (pub, "", 0);
-
-    //  Pass the message downstream through the device
-    TEST_ASSERT_SUCCESS_ERRNO (size = zmq_recv (xsub, buff, sizeof (buff), 0));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_send (xpub, buff, size, 0));
-
-    //  Receive the message in the subscriber
-    recv_string_expect_success (sub, "", 0);
-
-    //  Clean up.
-    test_context_socket_close (xpub);
-    test_context_socket_close (xsub);
-    test_context_socket_close (pub);
-    test_context_socket_close (sub);
-}
-
-int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test);
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_sub_forward_tipc.cpp b/libs/libzmq/tests/test_sub_forward_tipc.cpp
deleted file mode 100644
index 949c0d1..0000000
--- a/libs/libzmq/tests/test_sub_forward_tipc.cpp
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void test ()
-{
-    //  First, create an intermediate device.
-    void *xpub = test_context_socket (ZMQ_XPUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (xpub, "tipc://{5560,0,0}"));
-    void *xsub = test_context_socket (ZMQ_XSUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (xsub, "tipc://{5561,0,0}"));
-
-    //  Create a publisher.
-    void *pub = test_context_socket (ZMQ_PUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (pub, "tipc://{5561,0}@0.0.0"));
-
-    //  Create a subscriber.
-    void *sub = test_context_socket (ZMQ_SUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sub, "tipc://{5560,0}@0.0.0"));
-
-    // TODO the remainder of this method is duplicated with test_sub_forward
-
-    //  Subscribe for all messages.
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (sub, ZMQ_SUBSCRIBE, "", 0));
-
-    //  Pass the subscription upstream through the device
-    char buff[32];
-    int size;
-    TEST_ASSERT_SUCCESS_ERRNO (size = zmq_recv (xpub, buff, sizeof (buff), 0));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_send (xsub, buff, size, 0));
-
-    //  Wait a bit till the subscription gets to the publisher
-    msleep (SETTLE_TIME);
-
-    //  Send an empty message
-    send_string_expect_success (pub, "", 0);
-
-    //  Pass the message downstream through the device
-    TEST_ASSERT_SUCCESS_ERRNO (size = zmq_recv (xsub, buff, sizeof (buff), 0));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_send (xpub, buff, size, 0));
-
-    //  Receive the message in the subscriber
-    recv_string_expect_success (sub, "", 0);
-
-    //  Clean up.
-    test_context_socket_close (xpub);
-    test_context_socket_close (xsub);
-    test_context_socket_close (pub);
-    test_context_socket_close (sub);
-}
-
-int main ()
-{
-    if (!is_tipc_available ()) {
-        printf ("TIPC environment unavailable, skipping test\n");
-        return 77;
-    }
-
-    UNITY_BEGIN ();
-    RUN_TEST (test);
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_system.cpp b/libs/libzmq/tests/test_system.cpp
deleted file mode 100644
index 8c59550..0000000
--- a/libs/libzmq/tests/test_system.cpp
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-#if defined(ZMQ_HAVE_WINDOWS)
-#include <winsock2.h>
-#include <stdexcept>
-#else
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <unistd.h>
-#endif
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-//  Solaris has a default of 256 max files per process
-#ifdef ZMQ_HAVE_SOLARIS
-#define MAX_SOCKETS 200
-#else
-#define MAX_SOCKETS 1000
-#endif
-
-#if defined(ZMQ_HAVE_WINDOWS)
-
-void initialise_network (void)
-{
-    WSADATA info;
-    if (WSAStartup (MAKEWORD (2, 0), &info) != 0)
-        throw std::runtime_error ("Could not start WSA");
-}
-
-#else
-
-void initialise_network (void)
-{
-}
-
-#endif
-
-void test_localhost ()
-{
-    //  Check that we have local networking via ZeroMQ
-    void *dealer = test_context_socket (ZMQ_DEALER);
-    if (zmq_bind (dealer, "tcp://127.0.0.1:*") == -1) {
-        TEST_FAIL_MESSAGE (
-          "E: Cannot find 127.0.0.1 -- your system does not have local\n"
-          "E: networking. Please fix this before running libzmq checks.\n");
-    }
-
-    test_context_socket_close (dealer);
-}
-
-void test_max_sockets ()
-{
-    //  Check that we can create 1,000 sockets
-    fd_t handle[MAX_SOCKETS];
-    int count;
-    for (count = 0; count < MAX_SOCKETS; count++) {
-        handle[count] = socket (AF_INET, SOCK_STREAM, IPPROTO_TCP);
-        if (handle[count] == retired_fd) {
-            printf ("W: Only able to create %d sockets on this box\n", count);
-            const char msg[] =
-              "I: Tune your system to increase maximum allowed file handles\n"
-#if !defined(ZMQ_HAVE_WINDOWS)
-              "I: Run 'ulimit -n 1200' in bash\n"
-#endif
-              ;
-            TEST_FAIL_MESSAGE (msg);
-        }
-    }
-    //  Release the socket handles
-    for (count = 0; count < MAX_SOCKETS; count++) {
-        close (handle[count]);
-    }
-}
-
-//  This test case stresses the system to shake out known configuration
-//  problems. We're direct system calls when necessary. Some code may
-//  need wrapping to be properly portable.
-
-int main (void)
-{
-    initialise_network ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_localhost);
-    RUN_TEST (test_max_sockets);
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_tcp_accept_filter.cpp b/libs/libzmq/tests/test_tcp_accept_filter.cpp
deleted file mode 100644
index 1bb4117..0000000
--- a/libs/libzmq/tests/test_tcp_accept_filter.cpp
+++ /dev/null
@@ -1,215 +0,0 @@
-/*
-    Copyright (c) 2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-#include <cstring>
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void test_reconnect_ivl_against_pair_socket (const char *my_endpoint_,
-                                             void *sb_)
-{
-    void *sc = test_context_socket (ZMQ_PAIR);
-    int interval = -1;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sc, ZMQ_RECONNECT_IVL, &interval, sizeof (int)));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sc, my_endpoint_));
-
-    bounce (sb_, sc);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_unbind (sb_, my_endpoint_));
-
-    expect_bounce_fail (sb_, sc);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (sb_, my_endpoint_));
-
-    expect_bounce_fail (sb_, sc);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sc, my_endpoint_));
-
-    bounce (sb_, sc);
-
-    test_context_socket_close (sc);
-}
-
-void test_reconnect_ivl_tcp (bind_function_t bind_function_)
-{
-    char my_endpoint[MAX_SOCKET_STRING];
-
-    void *sb = test_context_socket (ZMQ_PAIR);
-    bind_function_ (sb, my_endpoint, sizeof my_endpoint);
-
-    test_reconnect_ivl_against_pair_socket (my_endpoint, sb);
-    test_context_socket_close (sb);
-}
-
-void test_bad_filter_string (const char *const filter_)
-{
-    void *socket = test_context_socket (ZMQ_PAIR);
-
-    TEST_ASSERT_FAILURE_ERRNO (EINVAL,
-                               zmq_setsockopt (socket, ZMQ_TCP_ACCEPT_FILTER,
-                                               filter_, strlen (filter_)));
-
-    test_context_socket_close (socket);
-}
-
-#define TEST_BAD_FILTER_STRING(case, filter)                                   \
-    void test_bad_filter_string_##case () { test_bad_filter_string (filter); }
-
-TEST_BAD_FILTER_STRING (foo, "foo")
-TEST_BAD_FILTER_STRING (zeros_foo, "0.0.0.0foo")
-TEST_BAD_FILTER_STRING (zeros_foo_mask, "0.0.0.0/foo")
-TEST_BAD_FILTER_STRING (zeros_empty_mask, "0.0.0.0/")
-TEST_BAD_FILTER_STRING (zeros_negative_mask, "0.0.0.0/-1")
-TEST_BAD_FILTER_STRING (zeros_too_large_mask, "0.0.0.0/33")
-
-void test_clear ()
-{
-    void *bind_socket = test_context_socket (ZMQ_PAIR);
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (bind_socket, ZMQ_TCP_ACCEPT_FILTER, NULL, 0));
-
-#if 0
-    // XXX Shouldn't this work as well?
-    const char empty_filter[] = "";
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (
-      socket, ZMQ_TCP_ACCEPT_FILTER, empty_filter, strlen (empty_filter)));
-#endif
-
-    char endpoint[MAX_SOCKET_STRING];
-    bind_loopback_ipv4 (bind_socket, endpoint, sizeof (endpoint));
-
-    void *connect_socket = test_context_socket (ZMQ_PAIR);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (connect_socket, endpoint));
-
-    bounce (bind_socket, connect_socket);
-
-    test_context_socket_close (connect_socket);
-    test_context_socket_close (bind_socket);
-}
-
-const char non_matching_filter[] = "127.0.0.255/32";
-
-void test_set_non_matching_and_clear ()
-{
-    void *bind_socket = test_context_socket (ZMQ_PAIR);
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (bind_socket, ZMQ_TCP_ACCEPT_FILTER, non_matching_filter,
-                      strlen (non_matching_filter)));
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (bind_socket, ZMQ_TCP_ACCEPT_FILTER, NULL, 0));
-
-    char endpoint[MAX_SOCKET_STRING];
-    bind_loopback_ipv4 (bind_socket, endpoint, sizeof (endpoint));
-
-    void *connect_socket = test_context_socket (ZMQ_PAIR);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (connect_socket, endpoint));
-
-    bounce (bind_socket, connect_socket);
-
-    test_context_socket_close (connect_socket);
-    test_context_socket_close (bind_socket);
-}
-
-void test_set_matching (const char *const filter_)
-{
-    void *bind_socket = test_context_socket (ZMQ_PAIR);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (
-      bind_socket, ZMQ_TCP_ACCEPT_FILTER, filter_, strlen (filter_)));
-
-    char endpoint[MAX_SOCKET_STRING];
-    bind_loopback_ipv4 (bind_socket, endpoint, sizeof (endpoint));
-
-    void *connect_socket = test_context_socket (ZMQ_PAIR);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (connect_socket, endpoint));
-
-    bounce (bind_socket, connect_socket);
-
-    test_context_socket_close (connect_socket);
-    test_context_socket_close (bind_socket);
-}
-
-void test_set_matching_1 ()
-{
-    test_set_matching ("127.0.0.1/32");
-}
-
-void test_set_matching_2 ()
-{
-    test_set_matching ("0.0.0.0/0");
-}
-
-void test_set_non_matching ()
-{
-    void *bind_socket = test_context_socket (ZMQ_PAIR);
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (bind_socket, ZMQ_TCP_ACCEPT_FILTER, non_matching_filter,
-                      strlen (non_matching_filter)));
-
-    char endpoint[MAX_SOCKET_STRING];
-    bind_loopback_ipv4 (bind_socket, endpoint, sizeof (endpoint));
-
-    void *connect_socket = test_context_socket (ZMQ_PAIR);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (connect_socket, endpoint));
-
-    expect_bounce_fail (bind_socket, connect_socket);
-
-    test_context_socket_close_zero_linger (connect_socket);
-    test_context_socket_close_zero_linger (bind_socket);
-}
-
-int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_bad_filter_string_foo);
-    RUN_TEST (test_bad_filter_string_zeros_foo);
-    RUN_TEST (test_bad_filter_string_zeros_foo_mask);
-    RUN_TEST (test_bad_filter_string_zeros_empty_mask);
-    RUN_TEST (test_bad_filter_string_zeros_negative_mask);
-    RUN_TEST (test_bad_filter_string_zeros_too_large_mask);
-
-    RUN_TEST (test_clear);
-    RUN_TEST (test_set_non_matching_and_clear);
-    RUN_TEST (test_set_matching_1);
-    RUN_TEST (test_set_matching_2);
-
-    RUN_TEST (test_set_non_matching);
-
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_term_endpoint.cpp b/libs/libzmq/tests/test_term_endpoint.cpp
deleted file mode 100644
index 6430a7f..0000000
--- a/libs/libzmq/tests/test_term_endpoint.cpp
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-/* Use the worst case filename size for the buffer (+1 for trailing NUL), this
- * is larger than MAX_SOCKET_STRING, which is not large enough for IPC */
-#define BUF_SIZE (FILENAME_MAX + 1)
-
-const char *ep_wc_tcp = "tcp://127.0.0.1:*";
-#if !defined ZMQ_HAVE_WINDOWS && !defined ZMQ_HAVE_OPENVMS
-const char *ep_wc_ipc = "ipc://*";
-#endif
-#if defined ZMQ_HAVE_VMCI
-const char *ep_wc_vmci = "vmci://*:*";
-#endif
-
-void test_send_after_unbind_fails ()
-{
-    char my_endpoint[BUF_SIZE];
-
-    //  Create infrastructure.
-    void *push = test_context_socket (ZMQ_PUSH);
-    bind_loopback_ipv4 (push, my_endpoint, BUF_SIZE);
-
-    void *pull = test_context_socket (ZMQ_PULL);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (pull, my_endpoint));
-
-    //  Pass one message through to ensure the connection is established
-    send_string_expect_success (push, "ABC", 0);
-    recv_string_expect_success (pull, "ABC", 0);
-
-    //  Unbind the listening endpoint
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_unbind (push, my_endpoint));
-
-    //  Allow unbind to settle
-    msleep (SETTLE_TIME);
-
-    //  Check that sending would block (there's no outbound connection)
-    TEST_ASSERT_FAILURE_ERRNO (EAGAIN, zmq_send (push, "ABC", 3, ZMQ_DONTWAIT));
-
-    //  Clean up
-    test_context_socket_close (pull);
-    test_context_socket_close (push);
-}
-
-void test_send_after_disconnect_fails ()
-{
-    //  Create infrastructure
-    void *pull = test_context_socket (ZMQ_PULL);
-    char my_endpoint[BUF_SIZE];
-    bind_loopback_ipv4 (pull, my_endpoint, BUF_SIZE);
-
-    void *push = test_context_socket (ZMQ_PUSH);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (push, my_endpoint));
-
-    //  Pass one message through to ensure the connection is established.
-    send_string_expect_success (push, "ABC", 0);
-    recv_string_expect_success (pull, "ABC", 0);
-
-    //  Disconnect the bound endpoint
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_disconnect (push, my_endpoint));
-
-    //  Allow disconnect to settle
-    msleep (SETTLE_TIME);
-
-    //  Check that sending would block (there's no inbound connections).
-    TEST_ASSERT_FAILURE_ERRNO (EAGAIN, zmq_send (push, "ABC", 3, ZMQ_DONTWAIT));
-
-    //  Clean up
-    test_context_socket_close (pull);
-    test_context_socket_close (push);
-}
-
-void test_unbind_via_last_endpoint ()
-{
-    //  Create infrastructure (wild-card binding)
-    void *push = test_context_socket (ZMQ_PUSH);
-    char my_endpoint[BUF_SIZE];
-    bind_loopback_ipv4 (push, my_endpoint, BUF_SIZE);
-
-    void *pull = test_context_socket (ZMQ_PULL);
-
-#if !defined ZMQ_HAVE_WINDOWS && !defined ZMQ_HAVE_OPENVMS
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (pull, ep_wc_ipc));
-#endif
-#if defined ZMQ_HAVE_VMCI
-    void *req = test_context_socket (ZMQ_REQ);
-    int rc = zmq_bind (req, ep_wc_vmci);
-    if (rc < 0 && errno == EAFNOSUPPORT)
-        TEST_IGNORE_MESSAGE ("VMCI not supported");
-    TEST_ASSERT_SUCCESS_ERRNO (rc);
-#endif
-
-    // Unbind sockets binded by wild-card address
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_unbind (push, my_endpoint));
-
-    size_t buf_size = 0;
-    (void) buf_size;
-
-#if !defined ZMQ_HAVE_WINDOWS && !defined ZMQ_HAVE_OPENVMS
-    buf_size = sizeof (my_endpoint);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (pull, ZMQ_LAST_ENDPOINT, my_endpoint, &buf_size));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_unbind (pull, my_endpoint));
-#endif
-#if defined ZMQ_HAVE_VMCI
-    buf_size = sizeof (my_endpoint);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (req, ZMQ_LAST_ENDPOINT, my_endpoint, &buf_size));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_unbind (req, my_endpoint));
-#endif
-
-    //  Clean up
-    test_context_socket_close (pull);
-    test_context_socket_close (push);
-}
-
-void test_wildcard_unbind_fails ()
-{
-    //  Create infrastructure (wild-card binding)
-    void *push = test_context_socket (ZMQ_PUSH);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (push, ep_wc_tcp));
-    void *pull = test_context_socket (ZMQ_PULL);
-#if !defined ZMQ_HAVE_WINDOWS && !defined ZMQ_HAVE_OPENVMS
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (pull, ep_wc_ipc));
-#endif
-#if defined ZMQ_HAVE_VMCI
-    void *req = test_context_socket (ZMQ_REQ);
-    int rc = zmq_bind (req, ep_wc_vmci);
-    if (rc < 0 && errno == EAFNOSUPPORT)
-        TEST_IGNORE_MESSAGE ("VMCI not supported");
-    TEST_ASSERT_SUCCESS_ERRNO (rc);
-#endif
-
-    // Sockets binded by wild-card address can't be unbinded by wild-card address
-    TEST_ASSERT_FAILURE_ERRNO (ENOENT, zmq_unbind (push, ep_wc_tcp));
-#if !defined ZMQ_HAVE_WINDOWS && !defined ZMQ_HAVE_OPENVMS
-    TEST_ASSERT_FAILURE_ERRNO (ENOENT, zmq_unbind (pull, ep_wc_ipc));
-#endif
-#if defined ZMQ_HAVE_VMCI
-    TEST_ASSERT_FAILURE_ERRNO (ENOENT, zmq_unbind (req, ep_wc_vmci));
-#endif
-
-    //  Clean up
-    test_context_socket_close (pull);
-    test_context_socket_close (push);
-}
-
-int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_send_after_unbind_fails);
-    RUN_TEST (test_send_after_disconnect_fails);
-    RUN_TEST (test_unbind_via_last_endpoint);
-    RUN_TEST (test_wildcard_unbind_fails);
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_term_endpoint_tipc.cpp b/libs/libzmq/tests/test_term_endpoint_tipc.cpp
deleted file mode 100644
index 7562b0d..0000000
--- a/libs/libzmq/tests/test_term_endpoint_tipc.cpp
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-const char ep[] = "tipc://{5560,0,0}";
-const char name[] = "tipc://{5560,0}@0.0.0";
-
-void test_term_endpoint_unbind_tipc ()
-{
-    if (!is_tipc_available ()) {
-        TEST_IGNORE_MESSAGE ("TIPC environment unavailable, skipping test\n");
-    }
-
-    //  Create infrastructure.
-    void *push = test_context_socket (ZMQ_PUSH);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (push, ep));
-    void *pull = test_context_socket (ZMQ_PULL);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (pull, name));
-
-    //  Pass one message through to ensure the connection is established.
-    send_string_expect_success (push, "ABC", 0);
-    recv_string_expect_success (pull, "ABC", 0);
-
-    // Unbind the lisnening endpoint
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_unbind (push, ep));
-
-    // Let events some time
-    msleep (SETTLE_TIME);
-
-    //  Check that sending would block (there's no outbound connection).
-    TEST_ASSERT_FAILURE_ERRNO (EAGAIN, zmq_send (push, "ABC", 3, ZMQ_DONTWAIT));
-
-    //  Clean up.
-    test_context_socket_close (pull);
-    test_context_socket_close (push);
-}
-
-void test_term_endpoint_disconnect_tipc ()
-{
-    if (!is_tipc_available ()) {
-        TEST_IGNORE_MESSAGE ("TIPC environment unavailable, skipping test\n");
-    }
-
-    //  Create infrastructure.
-    void *push = test_context_socket (ZMQ_PUSH);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (push, name));
-    void *pull = test_context_socket (ZMQ_PULL);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (pull, ep));
-
-    //  Pass one message through to ensure the connection is established.
-    send_string_expect_success (push, "ABC", 0);
-    recv_string_expect_success (pull, "ABC", 0);
-
-    // Disconnect the bound endpoint
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_disconnect (push, name));
-
-    msleep (SETTLE_TIME);
-
-    //  Check that sending would block (there's no inbound connections).
-    TEST_ASSERT_FAILURE_ERRNO (EAGAIN, zmq_send (push, "ABC", 3, ZMQ_DONTWAIT));
-
-    //  Clean up.
-    test_context_socket_close (pull);
-    test_context_socket_close (push);
-}
-
-int main (void)
-{
-    UNITY_BEGIN ();
-    RUN_TEST (test_term_endpoint_unbind_tipc);
-    RUN_TEST (test_term_endpoint_disconnect_tipc);
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_thread_safe.cpp b/libs/libzmq/tests/test_thread_safe.cpp
deleted file mode 100644
index bbd2f0d..0000000
--- a/libs/libzmq/tests/test_thread_safe.cpp
+++ /dev/null
@@ -1,106 +0,0 @@
-/*:
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-//  Client threads loop on send/recv until told to exit
-void client_thread (void *client_)
-{
-    for (int count = 0; count < 15000; count++) {
-        send_string_expect_success (client_, "0", 0);
-    }
-    send_string_expect_success (client_, "1", 0);
-}
-
-void test_thread_safe ()
-{
-    char my_endpoint[MAX_SOCKET_STRING];
-
-    void *server = test_context_socket (ZMQ_SERVER);
-    bind_loopback_ipv4 (server, my_endpoint, sizeof my_endpoint);
-
-    void *client = test_context_socket (ZMQ_CLIENT);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (client, my_endpoint));
-
-    void *t1 = zmq_threadstart (client_thread, client);
-    void *t2 = zmq_threadstart (client_thread, client);
-
-    char data;
-    int threads_completed = 0;
-    while (threads_completed < 2) {
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_recv (server, &data, 1, 0));
-        if (data == '1')
-            threads_completed++; //  Thread ended
-    }
-    zmq_threadclose (t1);
-    zmq_threadclose (t2);
-
-    test_context_socket_close (server);
-    test_context_socket_close (client);
-}
-
-void test_getsockopt_thread_safe (void *const socket_)
-{
-    int thread_safe;
-    size_t size = sizeof (int);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (socket_, ZMQ_THREAD_SAFE, &thread_safe, &size));
-    TEST_ASSERT_EQUAL_INT (1, thread_safe);
-}
-
-void test_client_getsockopt_thread_safe ()
-{
-    void *client = test_context_socket (ZMQ_CLIENT);
-    test_getsockopt_thread_safe (client);
-    test_context_socket_close (client);
-}
-
-void test_server_getsockopt_thread_safe ()
-{
-    void *server = test_context_socket (ZMQ_SERVER);
-    test_getsockopt_thread_safe (server);
-    test_context_socket_close (server);
-}
-
-int main (void)
-{
-    setup_test_environment ();
-
-    // TODO this file could be merged with test_client_server
-    UNITY_BEGIN ();
-    RUN_TEST (test_client_getsockopt_thread_safe);
-    RUN_TEST (test_server_getsockopt_thread_safe);
-    RUN_TEST (test_thread_safe);
-
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_timeo.cpp b/libs/libzmq/tests/test_timeo.cpp
deleted file mode 100644
index 5de316f..0000000
--- a/libs/libzmq/tests/test_timeo.cpp
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void test_timeo ()
-{
-    void *frontend = test_context_socket (ZMQ_DEALER);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (frontend, "inproc://timeout_test"));
-
-    //  Receive on disconnected socket returns immediately
-    char buffer[32];
-    TEST_ASSERT_FAILURE_ERRNO (EAGAIN,
-                               zmq_recv (frontend, buffer, 32, ZMQ_DONTWAIT));
-
-
-    //  Check whether receive timeout is honored
-    const int timeout = 250;
-    const int jitter = 50;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (frontend, ZMQ_RCVTIMEO, &timeout, sizeof (int)));
-
-    void *stopwatch = zmq_stopwatch_start ();
-    TEST_ASSERT_FAILURE_ERRNO (EAGAIN, zmq_recv (frontend, buffer, 32, 0));
-    unsigned int elapsed = zmq_stopwatch_stop (stopwatch) / 1000;
-    TEST_ASSERT_GREATER_THAN_INT (timeout - jitter, elapsed);
-    if (elapsed >= timeout + jitter) {
-        // we cannot assert this on a non-RT system
-        fprintf (stderr,
-                 "zmq_recv took quite long, with a timeout of %i ms, it took "
-                 "actually %i ms\n",
-                 timeout, elapsed);
-    }
-
-    //  Check that normal message flow works as expected
-    void *backend = test_context_socket (ZMQ_DEALER);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (backend, "inproc://timeout_test"));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (backend, ZMQ_SNDTIMEO, &timeout, sizeof (int)));
-
-    send_string_expect_success (backend, "Hello", 0);
-    recv_string_expect_success (frontend, "Hello", 0);
-
-    //  Clean-up
-    test_context_socket_close (backend);
-    test_context_socket_close (frontend);
-}
-
-int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_timeo);
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_timers.cpp b/libs/libzmq/tests/test_timers.cpp
deleted file mode 100644
index fb4a765..0000000
--- a/libs/libzmq/tests/test_timers.cpp
+++ /dev/null
@@ -1,222 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#define __STDC_LIMIT_MACROS // to define SIZE_MAX with older compilers
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-void setUp ()
-{
-}
-
-void tearDown ()
-{
-}
-
-void handler (int timer_id_, void *arg_)
-{
-    (void) timer_id_; //  Stop 'unused' compiler warnings
-    *(static_cast<bool *> (arg_)) = true;
-}
-
-int sleep_and_execute (void *timers_)
-{
-    int timeout = zmq_timers_timeout (timers_);
-
-    //  Sleep methods are inaccurate, so we sleep in a loop until time arrived
-    while (timeout > 0) {
-        msleep (timeout);
-        timeout = zmq_timers_timeout (timers_);
-    }
-
-    return zmq_timers_execute (timers_);
-}
-
-void test_null_timer_pointers ()
-{
-    void *timers = NULL;
-
-    TEST_ASSERT_FAILURE_ERRNO (EFAULT, zmq_timers_destroy (&timers));
-
-//  TODO this currently triggers an access violation
-#if 0
-  TEST_ASSERT_FAILURE_ERRNO(EFAULT, zmq_timers_destroy (NULL));
-#endif
-
-    const size_t dummy_interval = 100;
-    const int dummy_timer_id = 1;
-
-    TEST_ASSERT_FAILURE_ERRNO (
-      EFAULT, zmq_timers_add (timers, dummy_interval, &handler, NULL));
-    TEST_ASSERT_FAILURE_ERRNO (
-      EFAULT, zmq_timers_add (&timers, dummy_interval, &handler, NULL));
-
-    TEST_ASSERT_FAILURE_ERRNO (EFAULT,
-                               zmq_timers_cancel (timers, dummy_timer_id));
-    TEST_ASSERT_FAILURE_ERRNO (EFAULT,
-                               zmq_timers_cancel (&timers, dummy_timer_id));
-
-    TEST_ASSERT_FAILURE_ERRNO (
-      EFAULT, zmq_timers_set_interval (timers, dummy_timer_id, dummy_interval));
-    TEST_ASSERT_FAILURE_ERRNO (
-      EFAULT,
-      zmq_timers_set_interval (&timers, dummy_timer_id, dummy_interval));
-
-    TEST_ASSERT_FAILURE_ERRNO (EFAULT,
-                               zmq_timers_reset (timers, dummy_timer_id));
-    TEST_ASSERT_FAILURE_ERRNO (EFAULT,
-                               zmq_timers_reset (&timers, dummy_timer_id));
-
-    TEST_ASSERT_FAILURE_ERRNO (EFAULT, zmq_timers_timeout (timers));
-    TEST_ASSERT_FAILURE_ERRNO (EFAULT, zmq_timers_timeout (&timers));
-
-    TEST_ASSERT_FAILURE_ERRNO (EFAULT, zmq_timers_execute (timers));
-    TEST_ASSERT_FAILURE_ERRNO (EFAULT, zmq_timers_execute (&timers));
-}
-
-void test_corner_cases ()
-{
-    void *timers = zmq_timers_new ();
-    TEST_ASSERT_NOT_NULL (timers);
-
-    const size_t dummy_interval = SIZE_MAX;
-    const int dummy_timer_id = 1;
-
-    //  attempt to cancel non-existent timer
-    TEST_ASSERT_FAILURE_ERRNO (EINVAL,
-                               zmq_timers_cancel (timers, dummy_timer_id));
-
-    //  attempt to set interval of non-existent timer
-    TEST_ASSERT_FAILURE_ERRNO (
-      EINVAL, zmq_timers_set_interval (timers, dummy_timer_id, dummy_interval));
-
-    //  attempt to reset non-existent timer
-    TEST_ASSERT_FAILURE_ERRNO (EINVAL,
-                               zmq_timers_reset (timers, dummy_timer_id));
-
-    //  attempt to add NULL handler
-    TEST_ASSERT_FAILURE_ERRNO (
-      EFAULT, zmq_timers_add (timers, dummy_interval, NULL, NULL));
-
-    const int timer_id = TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_timers_add (timers, dummy_interval, handler, NULL));
-
-    //  attempt to cancel timer twice
-    //  TODO should this case really be an error? canceling twice could be allowed
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_timers_cancel (timers, timer_id));
-
-    TEST_ASSERT_FAILURE_ERRNO (EINVAL, zmq_timers_cancel (timers, timer_id));
-
-    //  timeout without any timers active
-    TEST_ASSERT_FAILURE_ERRNO (EINVAL, zmq_timers_timeout (timers));
-
-    //  cleanup
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_timers_destroy (&timers));
-}
-
-void test_timers ()
-{
-    void *timers = zmq_timers_new ();
-    TEST_ASSERT_NOT_NULL (timers);
-
-    bool timer_invoked = false;
-
-    const unsigned long full_timeout = 100;
-    void *const stopwatch = zmq_stopwatch_start ();
-
-    const int timer_id = TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_timers_add (timers, full_timeout, handler, &timer_invoked));
-
-    //  Timer should not have been invoked yet
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_timers_execute (timers));
-
-    if (zmq_stopwatch_intermediate (stopwatch) < full_timeout) {
-        TEST_ASSERT_FALSE (timer_invoked);
-    }
-
-    //  Wait half the time and check again
-    long timeout = TEST_ASSERT_SUCCESS_ERRNO (zmq_timers_timeout (timers));
-    msleep (timeout / 2);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_timers_execute (timers));
-    if (zmq_stopwatch_intermediate (stopwatch) < full_timeout) {
-        TEST_ASSERT_FALSE (timer_invoked);
-    }
-
-    // Wait until the end
-    TEST_ASSERT_SUCCESS_ERRNO (sleep_and_execute (timers));
-    TEST_ASSERT_TRUE (timer_invoked);
-    timer_invoked = false;
-
-    //  Wait half the time and check again
-    timeout = TEST_ASSERT_SUCCESS_ERRNO (zmq_timers_timeout (timers));
-    msleep (timeout / 2);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_timers_execute (timers));
-    if (zmq_stopwatch_intermediate (stopwatch) < 2 * full_timeout) {
-        TEST_ASSERT_FALSE (timer_invoked);
-    }
-
-    // Reset timer and wait half of the time left
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_timers_reset (timers, timer_id));
-    msleep (timeout / 2);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_timers_execute (timers));
-    if (zmq_stopwatch_stop (stopwatch) < 2 * full_timeout) {
-        TEST_ASSERT_FALSE (timer_invoked);
-    }
-
-    // Wait until the end
-    TEST_ASSERT_SUCCESS_ERRNO (sleep_and_execute (timers));
-    TEST_ASSERT_TRUE (timer_invoked);
-    timer_invoked = false;
-
-    // reschedule
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_timers_set_interval (timers, timer_id, 50));
-    TEST_ASSERT_SUCCESS_ERRNO (sleep_and_execute (timers));
-    TEST_ASSERT_TRUE (timer_invoked);
-    timer_invoked = false;
-
-    // cancel timer
-    timeout = TEST_ASSERT_SUCCESS_ERRNO (zmq_timers_timeout (timers));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_timers_cancel (timers, timer_id));
-    msleep (timeout * 2);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_timers_execute (timers));
-    TEST_ASSERT_FALSE (timer_invoked);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_timers_destroy (&timers));
-}
-
-int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_timers);
-    RUN_TEST (test_null_timer_pointers);
-    RUN_TEST (test_corner_cases);
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_unbind_wildcard.cpp b/libs/libzmq/tests/test_unbind_wildcard.cpp
deleted file mode 100644
index f25d6ac..0000000
--- a/libs/libzmq/tests/test_unbind_wildcard.cpp
+++ /dev/null
@@ -1,205 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of 0MQ.
-
-    0MQ is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    0MQ is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-#include <string.h>
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void test_address_wildcard_ipv4 ()
-{
-    /* Address wildcard, IPv6 disabled */
-    void *sb = test_context_socket (ZMQ_REP);
-    void *sc = test_context_socket (ZMQ_REQ);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (sb, "tcp://*:*"));
-
-    char bind_endpoint[256];
-    char connect_endpoint[256];
-    size_t endpoint_len = sizeof (bind_endpoint);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (sb, ZMQ_LAST_ENDPOINT, bind_endpoint, &endpoint_len));
-
-    //  Apparently Windows can't connect to 0.0.0.0. A better fix would be welcome.
-#ifdef ZMQ_HAVE_WINDOWS
-    sprintf (connect_endpoint, "tcp://127.0.0.1:%s",
-             strrchr (bind_endpoint, ':') + 1);
-#else
-    strcpy (connect_endpoint, bind_endpoint);
-#endif
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sc, connect_endpoint));
-
-    bounce (sb, sc);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_disconnect (sc, connect_endpoint));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_unbind (sb, bind_endpoint));
-
-    test_context_socket_close (sc);
-    test_context_socket_close (sb);
-}
-
-void test_address_wildcard_ipv6 ()
-{
-    int ipv6 = is_ipv6_available ();
-
-    /* Address wildcard, IPv6 enabled */
-    void *sb = test_context_socket (ZMQ_REP);
-    void *sc = test_context_socket (ZMQ_REQ);
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sb, ZMQ_IPV6, &ipv6, sizeof (int)));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sc, ZMQ_IPV6, &ipv6, sizeof (int)));
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (sb, "tcp://*:*"));
-
-    char bind_endpoint[256];
-    char connect_endpoint[256];
-    size_t endpoint_len = sizeof (bind_endpoint);
-    memset (bind_endpoint, 0, endpoint_len);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (sb, ZMQ_LAST_ENDPOINT, bind_endpoint, &endpoint_len));
-
-#ifdef ZMQ_HAVE_WINDOWS
-    if (ipv6)
-        sprintf (connect_endpoint, "tcp://[::1]:%s",
-                 strrchr (bind_endpoint, ':') + 1);
-    else
-        sprintf (connect_endpoint, "tcp://127.0.0.1:%s",
-                 strrchr (bind_endpoint, ':') + 1);
-#else
-    strcpy (connect_endpoint, bind_endpoint);
-#endif
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sc, connect_endpoint));
-
-    bounce (sb, sc);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_disconnect (sc, connect_endpoint));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_unbind (sb, bind_endpoint));
-
-    test_context_socket_close (sc);
-    test_context_socket_close (sb);
-}
-
-void test_port_wildcard_ipv4_address ()
-{
-    /* Port wildcard, IPv4 address, IPv6 disabled */
-    void *sb = test_context_socket (ZMQ_REP);
-    void *sc = test_context_socket (ZMQ_REQ);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (sb, "tcp://127.0.0.1:*"));
-
-    char endpoint[256];
-    size_t endpoint_len = sizeof (endpoint);
-    memset (endpoint, 0, endpoint_len);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (sb, ZMQ_LAST_ENDPOINT, endpoint, &endpoint_len));
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sc, endpoint));
-
-    bounce (sb, sc);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_disconnect (sc, endpoint));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_unbind (sb, endpoint));
-
-    test_context_socket_close (sc);
-    test_context_socket_close (sb);
-}
-
-void test_port_wildcard_ipv4_address_ipv6 ()
-{
-    /* Port wildcard, IPv4 address, IPv6 enabled */
-    void *sb = test_context_socket (ZMQ_REP);
-    void *sc = test_context_socket (ZMQ_REQ);
-
-    const int ipv6 = is_ipv6_available ();
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sb, ZMQ_IPV6, &ipv6, sizeof (int)));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sc, ZMQ_IPV6, &ipv6, sizeof (int)));
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (sb, "tcp://127.0.0.1:*"));
-
-    char endpoint[256];
-    size_t endpoint_len = sizeof (endpoint);
-    memset (endpoint, 0, endpoint_len);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (sb, ZMQ_LAST_ENDPOINT, endpoint, &endpoint_len));
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sc, endpoint));
-
-    bounce (sb, sc);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_disconnect (sc, endpoint));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_unbind (sb, endpoint));
-
-    test_context_socket_close (sc);
-    test_context_socket_close (sb);
-}
-
-void test_port_wildcard_ipv6_address ()
-{
-    const int ipv6 = is_ipv6_available ();
-    if (!ipv6)
-        TEST_IGNORE_MESSAGE ("ipv6 is not available");
-
-    /* Port wildcard, IPv6 address, IPv6 enabled */
-    void *sb = test_context_socket (ZMQ_REP);
-    void *sc = test_context_socket (ZMQ_REQ);
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sb, ZMQ_IPV6, &ipv6, sizeof (int)));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sc, ZMQ_IPV6, &ipv6, sizeof (int)));
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (sb, "tcp://[::1]:*"));
-
-    char endpoint[256];
-    size_t endpoint_len = sizeof (endpoint);
-    memset (endpoint, 0, endpoint_len);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (sb, ZMQ_LAST_ENDPOINT, endpoint, &endpoint_len));
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sc, endpoint));
-
-    bounce (sb, sc);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_disconnect (sc, endpoint));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_unbind (sb, endpoint));
-
-    test_context_socket_close (sc);
-    test_context_socket_close (sb);
-}
-
-int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_address_wildcard_ipv4);
-    RUN_TEST (test_address_wildcard_ipv6);
-    RUN_TEST (test_port_wildcard_ipv4_address);
-    RUN_TEST (test_port_wildcard_ipv4_address_ipv6);
-    RUN_TEST (test_port_wildcard_ipv6_address);
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_use_fd.cpp b/libs/libzmq/tests/test_use_fd.cpp
deleted file mode 100644
index 888cf20..0000000
--- a/libs/libzmq/tests/test_use_fd.cpp
+++ /dev/null
@@ -1,218 +0,0 @@
-/*
-    Copyright (c) 2016-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-#if !defined(ZMQ_HAVE_WINDOWS)
-
-void pre_allocate_sock_tcp (void *socket_, char *my_endpoint_)
-{
-    fd_t s = bind_socket_resolve_port ("127.0.0.1", "0", my_endpoint_);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (socket_, ZMQ_USE_FD, &s, sizeof (s)));
-}
-
-typedef void (*pre_allocate_sock_fun_t) (void *, char *);
-
-void setup_socket_pair (pre_allocate_sock_fun_t pre_allocate_sock_fun_,
-                        int bind_socket_type_,
-                        int connect_socket_type_,
-                        void **out_sb_,
-                        void **out_sc_)
-{
-    *out_sb_ = test_context_socket (bind_socket_type_);
-
-    char my_endpoint[MAX_SOCKET_STRING];
-    pre_allocate_sock_fun_ (*out_sb_, my_endpoint);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (*out_sb_, my_endpoint));
-
-    *out_sc_ = test_context_socket (connect_socket_type_);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (*out_sc_, my_endpoint));
-}
-
-void test_socket_pair (pre_allocate_sock_fun_t pre_allocate_sock_fun_,
-                       int bind_socket_type_,
-                       int connect_socket_type_)
-{
-    void *sb, *sc;
-    setup_socket_pair (pre_allocate_sock_fun_, bind_socket_type_,
-                       connect_socket_type_, &sb, &sc);
-
-    bounce (sb, sc);
-
-    test_context_socket_close (sc);
-    test_context_socket_close (sb);
-}
-
-void test_req_rep (pre_allocate_sock_fun_t pre_allocate_sock_fun_)
-{
-    test_socket_pair (pre_allocate_sock_fun_, ZMQ_REP, ZMQ_REQ);
-}
-
-void test_pair (pre_allocate_sock_fun_t pre_allocate_sock_fun_)
-{
-    test_socket_pair (pre_allocate_sock_fun_, ZMQ_PAIR, ZMQ_PAIR);
-}
-
-void test_client_server (pre_allocate_sock_fun_t pre_allocate_sock_fun_)
-{
-#if defined(ZMQ_SERVER) && defined(ZMQ_CLIENT)
-    void *sb, *sc;
-    setup_socket_pair (pre_allocate_sock_fun_, ZMQ_SERVER, ZMQ_CLIENT, &sb,
-                       &sc);
-
-    zmq_msg_t msg;
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init_size (&msg, 1));
-
-    char *data = static_cast<char *> (zmq_msg_data (&msg));
-    data[0] = 1;
-
-    int rc = zmq_msg_send (&msg, sc, ZMQ_SNDMORE);
-    // TODO which error code is expected?
-    TEST_ASSERT_EQUAL_INT (-1, rc);
-
-    rc = zmq_msg_send (&msg, sc, 0);
-    TEST_ASSERT_EQUAL_INT (1, rc);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init (&msg));
-
-    rc = zmq_msg_recv (&msg, sb, 0);
-    TEST_ASSERT_EQUAL_INT (1, rc);
-
-    uint32_t routing_id = zmq_msg_routing_id (&msg);
-    TEST_ASSERT_NOT_EQUAL (0, routing_id);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&msg));
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init_size (&msg, 1));
-
-    data = static_cast<char *> (zmq_msg_data (&msg));
-    data[0] = 2;
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_set_routing_id (&msg, routing_id));
-
-    rc = zmq_msg_send (&msg, sb, ZMQ_SNDMORE);
-    // TODO which error code is expected?
-    TEST_ASSERT_EQUAL_INT (-1, rc);
-
-    rc = zmq_msg_send (&msg, sb, 0);
-    TEST_ASSERT_EQUAL_INT (1, rc);
-
-    rc = zmq_msg_recv (&msg, sc, 0);
-    TEST_ASSERT_EQUAL_INT (1, rc);
-
-    routing_id = zmq_msg_routing_id (&msg);
-    TEST_ASSERT_EQUAL_INT (0, routing_id);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&msg));
-
-    test_context_socket_close (sc);
-    test_context_socket_close (sb);
-#endif
-}
-
-void test_req_rep_tcp ()
-{
-    test_req_rep (pre_allocate_sock_tcp);
-}
-
-void test_pair_tcp ()
-{
-    test_pair (pre_allocate_sock_tcp);
-}
-
-void test_client_server_tcp ()
-{
-#if defined(ZMQ_SERVER) && defined(ZMQ_CLIENT)
-    test_client_server (pre_allocate_sock_tcp);
-#endif
-}
-
-char ipc_endpoint[MAX_SOCKET_STRING] = "";
-
-void pre_allocate_sock_ipc (void *sb_, char *my_endpoint_)
-{
-    fd_t s = bind_socket_resolve_port ("", "", my_endpoint_, AF_UNIX, 0);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sb_, ZMQ_USE_FD, &s, sizeof (s)));
-    strcpy (ipc_endpoint, strchr (my_endpoint_, '/') + 2);
-}
-
-void test_req_rep_ipc ()
-{
-    test_req_rep (pre_allocate_sock_ipc);
-
-    TEST_ASSERT_SUCCESS_ERRNO (unlink (ipc_endpoint));
-}
-
-void test_pair_ipc ()
-{
-    test_pair (pre_allocate_sock_ipc);
-
-    TEST_ASSERT_SUCCESS_ERRNO (unlink (ipc_endpoint));
-}
-
-void test_client_server_ipc ()
-{
-#if defined(ZMQ_SERVER) && defined(ZMQ_CLIENT)
-    test_client_server (pre_allocate_sock_ipc);
-
-    TEST_ASSERT_SUCCESS_ERRNO (unlink (ipc_endpoint));
-#endif
-}
-
-int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_req_rep_tcp);
-    RUN_TEST (test_pair_tcp);
-    RUN_TEST (test_client_server_tcp);
-
-    RUN_TEST (test_req_rep_ipc);
-    RUN_TEST (test_pair_ipc);
-    RUN_TEST (test_client_server_ipc);
-
-    return UNITY_END ();
-}
-#else
-int main ()
-{
-    return 0;
-}
-#endif
diff --git a/libs/libzmq/tests/test_ws_transport.cpp b/libs/libzmq/tests/test_ws_transport.cpp
deleted file mode 100644
index 49b810f..0000000
--- a/libs/libzmq/tests/test_ws_transport.cpp
+++ /dev/null
@@ -1,319 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include <string.h>
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void test_roundtrip ()
-{
-    char bind_address[MAX_SOCKET_STRING];
-    char connect_address[MAX_SOCKET_STRING];
-    size_t addr_length = sizeof (connect_address);
-
-    void *sb = test_context_socket (ZMQ_REP);
-    void *sc = test_context_socket (ZMQ_REQ);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (sb, "ws://*:*/roundtrip"));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (sb, ZMQ_LAST_ENDPOINT, bind_address, &addr_length));
-
-    // Windows can't connect to 0.0.0.0
-    sprintf (connect_address, "ws://127.0.0.1%s", strrchr (bind_address, ':'));
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sc, connect_address));
-
-    bounce (sb, sc);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_disconnect (sc, connect_address));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_unbind (sb, bind_address));
-
-    test_context_socket_close (sc);
-    test_context_socket_close (sb);
-}
-
-void test_roundtrip_without_path ()
-{
-    char connect_address[MAX_SOCKET_STRING];
-    size_t addr_length = sizeof (connect_address);
-    void *sb = test_context_socket (ZMQ_REP);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (sb, "ws://127.0.0.1:*"));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (sb, ZMQ_LAST_ENDPOINT, connect_address, &addr_length));
-
-    void *sc = test_context_socket (ZMQ_REQ);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sc, connect_address));
-
-    bounce (sb, sc);
-
-    test_context_socket_close (sc);
-    test_context_socket_close (sb);
-}
-
-
-void test_heartbeat ()
-{
-    char connect_address[MAX_SOCKET_STRING];
-    size_t addr_length = sizeof (connect_address);
-    void *sb = test_context_socket (ZMQ_REP);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (sb, "ws://127.0.0.1:*/heartbeat"));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (sb, ZMQ_LAST_ENDPOINT, connect_address, &addr_length));
-
-    void *sc = test_context_socket (ZMQ_REQ);
-
-    // Setting heartbeat settings
-    int ivl = 10;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sc, ZMQ_HEARTBEAT_IVL, &ivl, sizeof (ivl)));
-
-    // Disable reconnect, to make sure the ping-pong actually work
-    ivl = -1;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sc, ZMQ_RECONNECT_IVL, &ivl, sizeof (ivl)));
-
-    // Connect to server
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sc, connect_address));
-
-    // Make sure some ping and pong going through
-    msleep (100);
-
-    bounce (sb, sc);
-
-    test_context_socket_close (sc);
-    test_context_socket_close (sb);
-}
-
-void test_short_message ()
-{
-    char connect_address[MAX_SOCKET_STRING];
-    size_t addr_length = sizeof (connect_address);
-    void *sb = test_context_socket (ZMQ_REP);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (sb, "ws://127.0.0.1:*/short"));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (sb, ZMQ_LAST_ENDPOINT, connect_address, &addr_length));
-
-    void *sc = test_context_socket (ZMQ_REQ);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sc, connect_address));
-
-    zmq_msg_t msg;
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init_size (&msg, 255));
-
-    for (unsigned char i = 0; i < 255; ++i)
-        ((unsigned char *) zmq_msg_data (&msg))[i] = i;
-
-    int rc = zmq_msg_send (&msg, sc, 0);
-    TEST_ASSERT_EQUAL_INT (255, rc);
-
-    rc = zmq_msg_recv (&msg, sb, 0);
-    TEST_ASSERT_EQUAL_INT (255, rc);
-
-    for (unsigned char i = 0; i < 255; ++i)
-        TEST_ASSERT_EQUAL_INT (i, ((unsigned char *) zmq_msg_data (&msg))[i]);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&msg));
-
-    test_context_socket_close (sc);
-    test_context_socket_close (sb);
-}
-
-void test_large_message ()
-{
-    char connect_address[MAX_SOCKET_STRING];
-    size_t addr_length = sizeof (connect_address);
-    void *sb = test_context_socket (ZMQ_REP);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (sb, "ws://127.0.0.1:*/large"));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (sb, ZMQ_LAST_ENDPOINT, connect_address, &addr_length));
-
-    void *sc = test_context_socket (ZMQ_REQ);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sc, connect_address));
-
-    zmq_msg_t msg;
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_init_size (&msg, 65536));
-
-    for (int i = 0; i < 65536; ++i)
-        ((unsigned char *) zmq_msg_data (&msg))[i] = i % 255;
-
-    int rc = zmq_msg_send (&msg, sc, 0);
-    TEST_ASSERT_EQUAL_INT (65536, rc);
-
-    rc = zmq_msg_recv (&msg, sb, 0);
-    TEST_ASSERT_EQUAL_INT (65536, rc);
-
-    for (int i = 0; i < 65536; ++i)
-        TEST_ASSERT_EQUAL_INT (i % 255,
-                               ((unsigned char *) zmq_msg_data (&msg))[i]);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_close (&msg));
-
-    test_context_socket_close (sc);
-    test_context_socket_close (sb);
-}
-
-void test_curve ()
-{
-    char connect_address[MAX_SOCKET_STRING];
-    size_t addr_length = sizeof (connect_address);
-    char client_public[41];
-    char client_secret[41];
-    char server_public[41];
-    char server_secret[41];
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_curve_keypair (server_public, server_secret));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_curve_keypair (client_public, client_secret));
-
-    void *server = test_context_socket (ZMQ_REP);
-    int as_server = 1;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (server, ZMQ_CURVE_SERVER, &as_server, sizeof (int)));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (server, ZMQ_CURVE_SECRETKEY, server_secret, 41));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (server, "ws://127.0.0.1:*/roundtrip"));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_getsockopt (server, ZMQ_LAST_ENDPOINT,
-                                               connect_address, &addr_length));
-
-    void *client = test_context_socket (ZMQ_REQ);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (client, ZMQ_CURVE_SERVERKEY, server_public, 41));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (client, ZMQ_CURVE_PUBLICKEY, client_public, 41));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (client, ZMQ_CURVE_SECRETKEY, client_secret, 41));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (client, connect_address));
-
-    bounce (server, client);
-
-    test_context_socket_close (client);
-    test_context_socket_close (server);
-}
-
-
-void test_mask_shared_msg ()
-{
-    char connect_address[MAX_SOCKET_STRING];
-    size_t addr_length = sizeof (connect_address);
-    void *sb = test_context_socket (ZMQ_DEALER);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (sb, "ws://127.0.0.1:*/mask-shared"));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (sb, ZMQ_LAST_ENDPOINT, connect_address, &addr_length));
-
-    void *sc = test_context_socket (ZMQ_DEALER);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sc, connect_address));
-
-    zmq_msg_t msg;
-    zmq_msg_init_size (
-      &msg, 255); // Message have to be long enough so it won't fit inside msg
-    unsigned char *data = (unsigned char *) zmq_msg_data (&msg);
-    for (int i = 0; i < 255; i++)
-        data[i] = i;
-
-    //  Taking a copy to make the msg shared
-    zmq_msg_t copy;
-    zmq_msg_init (&copy);
-    zmq_msg_copy (&copy, &msg);
-
-    //  Sending the shared msg
-    int rc = zmq_msg_send (&msg, sc, 0);
-    TEST_ASSERT_EQUAL_INT (255, rc);
-
-    //  Recv the msg and check that it was masked correctly
-    rc = zmq_msg_recv (&msg, sb, 0);
-    TEST_ASSERT_EQUAL_INT (255, rc);
-    data = (unsigned char *) zmq_msg_data (&msg);
-    for (int i = 0; i < 255; i++)
-        TEST_ASSERT_EQUAL_INT (i, data[i]);
-
-    //  Testing that copy was not masked
-    data = (unsigned char *) zmq_msg_data (&copy);
-    for (int i = 0; i < 255; i++)
-        TEST_ASSERT_EQUAL_INT (i, data[i]);
-
-    //  Constant msg cannot be masked as well, as it is constant
-    rc = zmq_send_const (sc, "HELLO", 5, 0);
-    TEST_ASSERT_EQUAL_INT (5, rc);
-    recv_string_expect_success (sb, "HELLO", 0);
-
-    zmq_msg_close (&copy);
-    zmq_msg_close (&msg);
-
-    test_context_socket_close (sc);
-    test_context_socket_close (sb);
-}
-
-void test_pub_sub ()
-{
-    char connect_address[MAX_SOCKET_STRING];
-    size_t addr_length = sizeof (connect_address);
-    void *sb = test_context_socket (ZMQ_XPUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (sb, "ws://127.0.0.1:*"));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (sb, ZMQ_LAST_ENDPOINT, connect_address, &addr_length));
-
-    void *sc = test_context_socket (ZMQ_SUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (sc, ZMQ_SUBSCRIBE, "A", 1));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (sc, ZMQ_SUBSCRIBE, "B", 1));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sc, connect_address));
-
-    recv_string_expect_success (sb, "\1A", 0);
-    recv_string_expect_success (sb, "\1B", 0);
-
-    send_string_expect_success (sb, "A", 0);
-    send_string_expect_success (sb, "B", 0);
-
-    recv_string_expect_success (sc, "A", 0);
-    recv_string_expect_success (sc, "B", 0);
-
-    test_context_socket_close (sc);
-    test_context_socket_close (sb);
-}
-
-
-int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_roundtrip_without_path);
-    RUN_TEST (test_roundtrip);
-    RUN_TEST (test_short_message);
-    RUN_TEST (test_large_message);
-    RUN_TEST (test_heartbeat);
-    RUN_TEST (test_mask_shared_msg);
-    RUN_TEST (test_pub_sub);
-
-    if (zmq_has ("curve"))
-        RUN_TEST (test_curve);
-
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_wss_transport.cpp b/libs/libzmq/tests/test_wss_transport.cpp
deleted file mode 100644
index 7865ab6..0000000
--- a/libs/libzmq/tests/test_wss_transport.cpp
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include <string.h>
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-#ifdef ZMQ_WSS_CERT_PEM
-const char *key =
-  "-----BEGIN PRIVATE KEY-----\n"
-  "MIIJQwIBADANBgkqhkiG9w0BAQEFAASCCS0wggkpAgEAAoICAQDnzizmqK1e0iRR\n"
-  "lY75z9q3TWVBzFYX00Rl18GT2liW6AYzOB/qa55EhjTf4snhC2FaUoosu4MYRdvo\n"
-  "8qBOpFvnQDScJ6o06LyrWyL15kkBYEsTkjmDEXe/TxUVE2IBb991m1F91SIEjK5m\n"
-  "NRH2aRjrN5mL9f8+Crrv96Y4sxGCDkqwOarViFbDYFxdYa7WrvZImpknrmM5KPyg\n"
-  "PtU9gqnlIgAU9bPTGUJGdQeQ+AWKOgw6unV8IiKEX8jyHBoKiAqTspRCCV9yDOKx\n"
-  "eVUGgkcAMpeSv8HVboNbfof8DI+eT8EtYNsWW4dINgiYYEGZIhy74X2dKria6hCc\n"
-  "AYdS+/90nf0RAyymniDtgTGrMIXFmjlYpLngqfAo+zzl21dGh3VnRUFbTak8CH4g\n"
-  "wYIefJFerwJP1im5jAiULWHaiOOk2r5fHdxbBLebqcaWBRSGGNE9cj4bj/qYuHAf\n"
-  "VrNW5+CN3j0h5ss/f8lOoDbbrb6GtSJfI16fuQZd2hW84u38EuVd1/mzbVMv7Bip\n"
-  "yzjbEAcOgn0Mk89zZewooz8Sxr2e1R47/5CCHJodUFqc5hmcnOqRd7YmpM68bS7V\n"
-  "KbnOY3w9Llw6tkXMitmtUs7IiKZ1ViXA3UzMSumvEJKMqOnfNEUH9pkqYe2lVbay\n"
-  "1HSk/hz7AkprVPMlqlF12x/794fg9wIDAQABAoICAHI10UWsYg9P9nkD+Tf4Q0kB\n"
-  "JxyuMtT2UMLk9QmGERP5KeTeiEsVzxrwDOkqclEhLEw2UsILeWHiOaGiuX1F2cos\n"
-  "hj9SA7ih2yOKecUyO1IkQZlY+GEtoBRwQHDr5ePTXQQzDIm1E1eugNb22uzPh2mN\n"
-  "MWgWQjYtT0GggRN6luu/YulE4Hjo/eaxeZDA6kX4WnwXP9KfR2AIY8AIdUQjNtYg\n"
-  "VG3/SSR/U3onexzgNsqOIyxkZjJNFzilgPpZAjOiJ6Px3r5So+Yrlx3eLBhS4+yj\n"
-  "AK9bL4ObOblAtHtpLPHRVdqn2ApB+nuHs+BvvKJYflPLm/pt7BrXrGtRDX3Dj27T\n"
-  "sXPZTBsPmFr8vqlbgIYNCiY3uQonsAO95o0Y0Dx6oVFlzL1ajP49KmUye+p/wEHc\n"
-  "1XfYD8DxfU+ECEZk1/DvmKIPc4cZr2U1i9RBVRiKFd4NFIGYylLihuYhB9FZEyWQ\n"
-  "p0TwM3DFs7PwIQNPE6mGKtjgdgBGkY4AGfCxQzdp1mM+I2700OIx0EHAbxm5JMQm\n"
-  "NQKtBWliiz7+DLK/NWrDVS8N8tdkZVpHUK6ahvJbYG8oDqX0me6Bmk+0SaQJujis\n"
-  "fOPFRNGanr0X97+fqMJnDeOfXAcYurXBm81IkGilUF+2a0wWhS7PGhOT4dcLKRU8\n"
-  "tcmIZRJDWWyv2uQGg2yhAoIBAQD5sM7SX/ZuQ44HHmjQP59//vxCoZYqcPtf+52z\n"
-  "kCpRnbbzFh/uTLRBvQ5NjZp7XOpZ/3y05JnarYChjCuVjG5+SJO7UQ0pl5N7LL0r\n"
-  "3YGSRkfBGE05AiccyitonQssnJ4GVGfkt+1l9kVn4aMN9YkgoWc68vFzHY9CfIjS\n"
-  "3d7QM89vGJBmBCpLG9WC0R24VNH6mfnM0MANwFlYFk9a2cKWueNjMidtHaNgry7A\n"
-  "lWKn7jEUizkb5kNiVoFC+9qYx16unR1U2K4eRJoOhOLNWPaPuGX219iMvQ+CHs2T\n"
-  "ZA72qj0d29t2wS8RmFXAIRNDuc7MkPh3iTF4jdRt57/pU1WPAoIBAQDtqavyOx/h\n"
-  "kilyGjALfca68iQscWuVmWCVzFFfeGvFN4IXSxgM38xmtSEhAILVf7ozv/QNJsxv\n"
-  "9l1xGkY+FaoFTSxglMw0iO4fZwNp2GuEy57jFzJuJyzE4FiueNb5dzoZnGnXxJIS\n"
-  "bnprZgR42aaYAU0PzPwrqyc3PXv2J4tn6O8Mt53JO4bN+/XomD4oQBOhM0iLuS7t\n"
-  "xTUQnsaHr1QglSIGQf4XOmXTO0+dE5uhFXkKP0Frq4MtoJUdEiWNzOdzwzxAZJTL\n"
-  "v8dPOQud9yxKxwRg2rroasKgyRgE6GHqKSRhggiMwVOFzeMxPLJ2oeWmpRZXiMoH\n"
-  "dkiCnPh7DBoZAoIBAGSuUJcvrrSDdO+V6XmfTfdUn+9WLLDsYdAwK0TOauICEFUw\n"
-  "pKt4Lm8bhnrrEFGSA8VKacSfMRKmR2nclW5188/j//3WDtKolgVi4tyfMrICuMg5\n"
-  "vlmwbokDVEGYoXrZpDa1Ljdhms40YYQjzZXBXgvUSUXR1F4wmyWaBanRYRje61PG\n"
-  "ueMI5uzmSk+3dp5vRUQhdkKKIgbpep00Ucc2a2pPhkrnXFJ5UvmXaeip0+AXAZ9h\n"
-  "DCQd0yoB65lQ6LIWIi2SmNMvk/YMf3o/Rxy6NKF7H1JLcrw9N9WmCgrWm9oGhyJV\n"
-  "Fsdp2krj/B++tn/mmmaORkIdBd+wgOnYOuAghC0CggEBAK6KtLgyieh9Eqk06GIY\n"
-  "HlJ/sOde6Pc2bIO3SW/HHcb6TDVVNjWGSzSHA+yb1np70sFc0RyziOMVWWzOMhY4\n"
-  "jORV2CiaPxq6Eb/IRO6APf6KGIeJKsVRSgTRCvAf2SnfUTEr+WO4ftrAfnHPu6sR\n"
-  "ldL+6ZyYG/7qNOPR6O9P/YbzwFRjqaL3b7ppuCD5ZnTjEkeKRVYwS3HeKmmpYf6W\n"
-  "Wj+PpyxXXQesIMowPfkLRHnaLknDSQWNMcrZq4ltIV1xxe3zzZUxCUJV90eMiqaZ\n"
-  "t9K3NNT47tnwRj4VUemQzRBO5OQjvqm49eFH4vnvLNYJcoKfrbfdwxoV2YzrQWYE\n"
-  "7kkCggEBAKzLviuI6eoaPwgKeR2wrFBbrucnY4yqkVIFzFRpjM6azzMArYVpslZW\n"
-  "DTdmi/2QCd9altVAT20Yvml8YqrFszpINV1DqBIfHtQPEy9oKrhFW92rhuJQo/aX\n"
-  "1yILvzmyzLdpQG6zLm7TD7mEkumiT9F3ObeoVnAOllEwUrNAfDPPclRHGowJs6Ya\n"
-  "wv50Idk62v7gnXny9OyFN3kUq6dtwItYqmalfKKGXhTi49mEWX39SSZSt+a15oKM\n"
-  "21fKHdqiG/AXST7n8IlBGRzyW9TqTnmVC5zj7esmqfRT0eno399hl0LOZgJoa4dx\n"
-  "lMwbKi/uEdrUT3ei3nAxnuQolXgClZk=\n"
-  "-----END PRIVATE KEY-----";
-
-const char *cert =
-  "-----BEGIN CERTIFICATE-----\n"
-  "MIIFkTCCA3mgAwIBAgIUWazS3jRxgV/9TgdybZ9ch7nYsQIwDQYJKoZIhvcNAQEL\n"
-  "BQAwVzELMAkGA1UEBhMCWFgxFTATBgNVBAcMDERlZmF1bHQgQ2l0eTEcMBoGA1UE\n"
-  "CgwTRGVmYXVsdCBDb21wYW55IEx0ZDETMBEGA1UEAwwKemVyb21xLm9yZzAgFw0x\n"
-  "OTExMTAwODMzMThaGA8yMTE5MTAxNzA4MzMxOFowVzELMAkGA1UEBhMCWFgxFTAT\n"
-  "BgNVBAcMDERlZmF1bHQgQ2l0eTEcMBoGA1UECgwTRGVmYXVsdCBDb21wYW55IEx0\n"
-  "ZDETMBEGA1UEAwwKemVyb21xLm9yZzCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCC\n"
-  "AgoCggIBAOfOLOaorV7SJFGVjvnP2rdNZUHMVhfTRGXXwZPaWJboBjM4H+prnkSG\n"
-  "NN/iyeELYVpSiiy7gxhF2+jyoE6kW+dANJwnqjTovKtbIvXmSQFgSxOSOYMRd79P\n"
-  "FRUTYgFv33WbUX3VIgSMrmY1EfZpGOs3mYv1/z4Kuu/3pjizEYIOSrA5qtWIVsNg\n"
-  "XF1hrtau9kiamSeuYzko/KA+1T2CqeUiABT1s9MZQkZ1B5D4BYo6DDq6dXwiIoRf\n"
-  "yPIcGgqICpOylEIJX3IM4rF5VQaCRwAyl5K/wdVug1t+h/wMj55PwS1g2xZbh0g2\n"
-  "CJhgQZkiHLvhfZ0quJrqEJwBh1L7/3Sd/REDLKaeIO2BMaswhcWaOVikueCp8Cj7\n"
-  "POXbV0aHdWdFQVtNqTwIfiDBgh58kV6vAk/WKbmMCJQtYdqI46Tavl8d3FsEt5up\n"
-  "xpYFFIYY0T1yPhuP+pi4cB9Ws1bn4I3ePSHmyz9/yU6gNtutvoa1Il8jXp+5Bl3a\n"
-  "Fbzi7fwS5V3X+bNtUy/sGKnLONsQBw6CfQyTz3Nl7CijPxLGvZ7VHjv/kIIcmh1Q\n"
-  "WpzmGZyc6pF3tiakzrxtLtUpuc5jfD0uXDq2RcyK2a1SzsiIpnVWJcDdTMxK6a8Q\n"
-  "koyo6d80RQf2mSph7aVVtrLUdKT+HPsCSmtU8yWqUXXbH/v3h+D3AgMBAAGjUzBR\n"
-  "MB0GA1UdDgQWBBTVHR+4lBIBcr2rEEMdideTAkwDZDAfBgNVHSMEGDAWgBTVHR+4\n"
-  "lBIBcr2rEEMdideTAkwDZDAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUA\n"
-  "A4ICAQB9M5p9z92UhVXg2baUj9QBN2YFGAeveFRpZ9Y/wktEssTqMKkc+39UtfJS\n"
-  "UclZnzMEhLyTieNqf+8GCgLLI0YSTIJpWwzvQBcXPoo+8IcexANvxR22KZrE51y4\n"
-  "/YfCKh8Q0ZbG8oc5Br8YHwipzGcmWjWtznfMpuaELezv/r381QV1Sbmpw2a0jvwp\n"
-  "uA/bc+4IZ9yvrhC9KkOUnivnCV71U2Wy8zOvrBEJicuGOc+lbWJRKyjbMDi1IybG\n"
-  "VnemtkQEyXFh6f1h8AdaN+Xj7qXX/YKmNk20Siu4qDNo8nozVpOL2DHjoKLa4N2c\n"
-  "ULG3kXScxVxWqCuPVNeypV2TZ9uSVFeKK/VJ5iGvFeifDsqVVo6WC4Pdz0WYes8H\n"
-  "3VqEPSwmNJ1FswLpYpGgCEFnkGRPFFB5dmwr0fuubkgaJPatxrImFac+nukfqZ8N\n"
-  "x/d4t72u1yIs0HnrkAj96ZIUXH5jFGPXbD8eGO0hzw+wbY9KRLXGBBl2B4EAaBdt\n"
-  "Cmp8R8xus3FGDZ5RVftZvTQO2CiTC4yn9Wab/ADDwcXDs6ntHctx4xQpm0tLqMoz\n"
-  "BTH8+ftqyzklar35gJluD84oh1kynEojrPkUvb75NlzxikBSF3pRrOx30Myy7DBx\n"
-  "rhUIqDFxqlYFx9InEzHlvI7cWWdMNqAmSxpz4SXMrd/7PJG+Ag==\n"
-  "-----END CERTIFICATE-----";
-
-void test_roundtrip ()
-{
-    char connect_address[MAX_SOCKET_STRING + strlen ("/roundtrip")];
-    size_t addr_length = sizeof (connect_address);
-    void *sb = test_context_socket (ZMQ_REP);
-    zmq_setsockopt (sb, ZMQ_WSS_CERT_PEM, cert, strlen (cert));
-    zmq_setsockopt (sb, ZMQ_WSS_KEY_PEM, key, strlen (key));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (sb, "wss://*:*/roundtrip"));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (sb, ZMQ_LAST_ENDPOINT, connect_address, &addr_length));
-    strcat (connect_address, "/roundtrip");
-
-    void *sc = test_context_socket (ZMQ_REQ);
-    zmq_setsockopt (sc, ZMQ_WSS_TRUST_PEM, cert, strlen (cert));
-    zmq_setsockopt (sc, ZMQ_WSS_HOSTNAME, "zeromq.org", strlen ("zeromq.org"));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sc, connect_address));
-
-    bounce (sb, sc);
-
-    test_context_socket_close (sc);
-    test_context_socket_close (sb);
-}
-
-int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_roundtrip);
-    return UNITY_END ();
-}
-#else
-int main ()
-{
-    printf ("WSS unavailable, skipping test\n");
-    return 77;
-}
-#endif
diff --git a/libs/libzmq/tests/test_xpub_manual.cpp b/libs/libzmq/tests/test_xpub_manual.cpp
deleted file mode 100644
index b9db2bc..0000000
--- a/libs/libzmq/tests/test_xpub_manual.cpp
+++ /dev/null
@@ -1,539 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void test_basic ()
-{
-    //  Create a publisher
-    void *pub = test_context_socket (ZMQ_XPUB);
-    int manual = 1;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (pub, ZMQ_XPUB_MANUAL, &manual, 4));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (pub, "inproc://soname"));
-
-    //  Create a subscriber
-    void *sub = test_context_socket (ZMQ_XSUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sub, "inproc://soname"));
-
-    //  Subscribe for A
-    const char subscription[] = {1, 'A', 0};
-    send_string_expect_success (sub, subscription, 0);
-
-    // Receive subscriptions from subscriber
-    recv_string_expect_success (pub, subscription, 0);
-
-    // Subscribe socket for B instead
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (pub, ZMQ_SUBSCRIBE, "B", 1));
-
-    // Sending A message and B Message
-    send_string_expect_success (pub, "A", 0);
-    send_string_expect_success (pub, "B", 0);
-
-    recv_string_expect_success (sub, "B", ZMQ_DONTWAIT);
-
-    //  Clean up.
-    test_context_socket_close (pub);
-    test_context_socket_close (sub);
-}
-
-void test_unsubscribe_manual ()
-{
-    //  Create a publisher
-    void *pub = test_context_socket (ZMQ_XPUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (pub, "inproc://soname"));
-
-    //  set pub socket options
-    int manual = 1;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (pub, ZMQ_XPUB_MANUAL, &manual, sizeof (manual)));
-
-    //  Create a subscriber
-    void *sub = test_context_socket (ZMQ_XSUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sub, "inproc://soname"));
-
-    //  Subscribe for A
-    const uint8_t subscription1[] = {1, 'A'};
-    send_array_expect_success (sub, subscription1, 0);
-
-    //  Subscribe for B
-    const uint8_t subscription2[] = {1, 'B'};
-    send_array_expect_success (sub, subscription2, 0);
-
-    char buffer[3];
-
-    // Receive subscription "A" from subscriber
-    recv_array_expect_success (pub, subscription1, 0);
-
-    // Subscribe socket for XA instead
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (pub, ZMQ_SUBSCRIBE, "XA", 2));
-
-    // Receive subscription "B" from subscriber
-    recv_array_expect_success (pub, subscription2, 0);
-
-    // Subscribe socket for XB instead
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (pub, ZMQ_SUBSCRIBE, "XB", 2));
-
-    //  Unsubscribe from A
-    const uint8_t unsubscription1[2] = {0, 'A'};
-    send_array_expect_success (sub, unsubscription1, 0);
-
-    // Receive unsubscription "A" from subscriber
-    recv_array_expect_success (pub, unsubscription1, 0);
-
-    // Unsubscribe socket from XA instead
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (pub, ZMQ_UNSUBSCRIBE, "XA", 2));
-
-    // Sending messages XA, XB
-    send_string_expect_success (pub, "XA", 0);
-    send_string_expect_success (pub, "XB", 0);
-
-    // Subscriber should receive XB only
-    recv_string_expect_success (sub, "XB", ZMQ_DONTWAIT);
-
-    // Close subscriber
-    test_context_socket_close (sub);
-
-    // Receive unsubscription "B"
-    const char unsubscription2[2] = {0, 'B'};
-    TEST_ASSERT_EQUAL_INT (
-      sizeof unsubscription2,
-      TEST_ASSERT_SUCCESS_ERRNO (zmq_recv (pub, buffer, sizeof buffer, 0)));
-    TEST_ASSERT_EQUAL_INT8_ARRAY (unsubscription2, buffer,
-                                  sizeof unsubscription2);
-
-    // Unsubscribe socket from XB instead
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (pub, ZMQ_UNSUBSCRIBE, "XB", 2));
-
-    //  Clean up.
-    test_context_socket_close (pub);
-}
-
-void test_xpub_proxy_unsubscribe_on_disconnect ()
-{
-    const uint8_t topic_buff[] = {"1"};
-    const uint8_t payload_buff[] = {"X"};
-
-    char my_endpoint_backend[MAX_SOCKET_STRING];
-    char my_endpoint_frontend[MAX_SOCKET_STRING];
-
-    int manual = 1;
-
-    // proxy frontend
-    void *xsub_proxy = test_context_socket (ZMQ_XSUB);
-    bind_loopback_ipv4 (xsub_proxy, my_endpoint_frontend,
-                        sizeof my_endpoint_frontend);
-
-    // proxy backend
-    void *xpub_proxy = test_context_socket (ZMQ_XPUB);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (xpub_proxy, ZMQ_XPUB_MANUAL, &manual, 4));
-    bind_loopback_ipv4 (xpub_proxy, my_endpoint_backend,
-                        sizeof my_endpoint_backend);
-
-    // publisher
-    void *pub = test_context_socket (ZMQ_PUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (pub, my_endpoint_frontend));
-
-    // first subscriber subscribes
-    void *sub1 = test_context_socket (ZMQ_SUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sub1, my_endpoint_backend));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sub1, ZMQ_SUBSCRIBE, topic_buff, 1));
-
-    // wait
-    msleep (SETTLE_TIME);
-
-    // proxy reroutes and confirms subscriptions
-    const uint8_t subscription[2] = {1, *topic_buff};
-    recv_array_expect_success (xpub_proxy, subscription, ZMQ_DONTWAIT);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (xpub_proxy, ZMQ_SUBSCRIBE, topic_buff, 1));
-    send_array_expect_success (xsub_proxy, subscription, 0);
-
-    // second subscriber subscribes
-    void *sub2 = test_context_socket (ZMQ_SUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sub2, my_endpoint_backend));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sub2, ZMQ_SUBSCRIBE, topic_buff, 1));
-
-    // wait
-    msleep (SETTLE_TIME);
-
-    // proxy reroutes
-    recv_array_expect_success (xpub_proxy, subscription, ZMQ_DONTWAIT);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (xpub_proxy, ZMQ_SUBSCRIBE, topic_buff, 1));
-    send_array_expect_success (xsub_proxy, subscription, 0);
-
-    // wait
-    msleep (SETTLE_TIME);
-
-    // let publisher send a msg
-    send_array_expect_success (pub, topic_buff, ZMQ_SNDMORE);
-    send_array_expect_success (pub, payload_buff, 0);
-
-    // wait
-    msleep (SETTLE_TIME);
-
-    // proxy reroutes data messages to subscribers
-    recv_array_expect_success (xsub_proxy, topic_buff, ZMQ_DONTWAIT);
-    recv_array_expect_success (xsub_proxy, payload_buff, ZMQ_DONTWAIT);
-    send_array_expect_success (xpub_proxy, topic_buff, ZMQ_SNDMORE);
-    send_array_expect_success (xpub_proxy, payload_buff, 0);
-
-    // wait
-    msleep (SETTLE_TIME);
-
-    // each subscriber should now get a message
-    recv_array_expect_success (sub2, topic_buff, ZMQ_DONTWAIT);
-    recv_array_expect_success (sub2, payload_buff, ZMQ_DONTWAIT);
-
-    recv_array_expect_success (sub1, topic_buff, ZMQ_DONTWAIT);
-    recv_array_expect_success (sub1, payload_buff, ZMQ_DONTWAIT);
-
-    //  Disconnect both subscribers
-    test_context_socket_close (sub1);
-    test_context_socket_close (sub2);
-
-    // wait
-    msleep (SETTLE_TIME);
-
-    // unsubscribe messages are passed from proxy to publisher
-    const uint8_t unsubscription[] = {0, *topic_buff};
-    recv_array_expect_success (xpub_proxy, unsubscription, 0);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (xpub_proxy, ZMQ_UNSUBSCRIBE, topic_buff, 1));
-    send_array_expect_success (xsub_proxy, unsubscription, 0);
-
-    // should receive another unsubscribe msg
-    recv_array_expect_success (xpub_proxy, unsubscription, 0);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (xpub_proxy, ZMQ_UNSUBSCRIBE, topic_buff, 1));
-    send_array_expect_success (xsub_proxy, unsubscription, 0);
-
-    // wait
-    msleep (SETTLE_TIME);
-
-    // let publisher send a msg
-    send_array_expect_success (pub, topic_buff, ZMQ_SNDMORE);
-    send_array_expect_success (pub, payload_buff, 0);
-
-    // wait
-    msleep (SETTLE_TIME);
-
-    // nothing should come to the proxy
-    char buffer[1];
-    TEST_ASSERT_FAILURE_ERRNO (
-      EAGAIN, zmq_recv (xsub_proxy, buffer, sizeof buffer, ZMQ_DONTWAIT));
-
-    test_context_socket_close (pub);
-    test_context_socket_close (xpub_proxy);
-    test_context_socket_close (xsub_proxy);
-}
-
-void test_missing_subscriptions ()
-{
-    const char *topic1 = "1";
-    const char *topic2 = "2";
-    const char *payload = "X";
-
-    char my_endpoint_backend[MAX_SOCKET_STRING];
-    char my_endpoint_frontend[MAX_SOCKET_STRING];
-
-    int manual = 1;
-
-    // proxy frontend
-    void *xsub_proxy = test_context_socket (ZMQ_XSUB);
-    bind_loopback_ipv4 (xsub_proxy, my_endpoint_frontend,
-                        sizeof my_endpoint_frontend);
-
-    // proxy backend
-    void *xpub_proxy = test_context_socket (ZMQ_XPUB);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (xpub_proxy, ZMQ_XPUB_MANUAL, &manual, 4));
-    bind_loopback_ipv4 (xpub_proxy, my_endpoint_backend,
-                        sizeof my_endpoint_backend);
-
-    // publisher
-    void *pub = test_context_socket (ZMQ_PUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (pub, my_endpoint_frontend));
-
-    // Here's the problem: because subscribers subscribe in quick succession,
-    // the proxy is unable to confirm the first subscription before receiving
-    // the second. This causes the first subscription to get lost.
-
-    // first subscriber
-    void *sub1 = test_context_socket (ZMQ_SUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sub1, my_endpoint_backend));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (sub1, ZMQ_SUBSCRIBE, topic1, 1));
-
-    // wait
-    msleep (SETTLE_TIME);
-
-    // proxy now reroutes and confirms subscriptions
-    const uint8_t subscription1[] = {1, static_cast<uint8_t> (topic1[0])};
-    recv_array_expect_success (xpub_proxy, subscription1, ZMQ_DONTWAIT);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (xpub_proxy, ZMQ_SUBSCRIBE, topic1, 1));
-    send_array_expect_success (xsub_proxy, subscription1, 0);
-
-    // second subscriber
-    void *sub2 = test_context_socket (ZMQ_SUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sub2, my_endpoint_backend));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (sub2, ZMQ_SUBSCRIBE, topic2, 1));
-
-    // wait
-    msleep (SETTLE_TIME);
-
-    const uint8_t subscription2[] = {1, static_cast<uint8_t> (topic2[0])};
-    recv_array_expect_success (xpub_proxy, subscription2, ZMQ_DONTWAIT);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (xpub_proxy, ZMQ_SUBSCRIBE, topic2, 1));
-    send_array_expect_success (xsub_proxy, subscription2, 0);
-
-    // wait
-    msleep (SETTLE_TIME);
-
-    // let publisher send 2 msgs, each with its own topic_buff
-    send_string_expect_success (pub, topic1, ZMQ_SNDMORE);
-    send_string_expect_success (pub, payload, 0);
-    send_string_expect_success (pub, topic2, ZMQ_SNDMORE);
-    send_string_expect_success (pub, payload, 0);
-
-    // wait
-    msleep (SETTLE_TIME);
-
-    // proxy reroutes data messages to subscribers
-    recv_string_expect_success (xsub_proxy, topic1, ZMQ_DONTWAIT);
-    recv_string_expect_success (xsub_proxy, payload, ZMQ_DONTWAIT);
-    send_string_expect_success (xpub_proxy, topic1, ZMQ_SNDMORE);
-    send_string_expect_success (xpub_proxy, payload, 0);
-
-    recv_string_expect_success (xsub_proxy, topic2, ZMQ_DONTWAIT);
-    recv_string_expect_success (xsub_proxy, payload, ZMQ_DONTWAIT);
-    send_string_expect_success (xpub_proxy, topic2, ZMQ_SNDMORE);
-    send_string_expect_success (xpub_proxy, payload, 0);
-
-    // wait
-    msleep (SETTLE_TIME);
-
-    // each subscriber should now get a message
-    recv_string_expect_success (sub2, topic2, ZMQ_DONTWAIT);
-    recv_string_expect_success (sub2, payload, ZMQ_DONTWAIT);
-
-    recv_string_expect_success (sub1, topic1, ZMQ_DONTWAIT);
-    recv_string_expect_success (sub1, payload, ZMQ_DONTWAIT);
-
-    //  Clean up
-    test_context_socket_close (sub1);
-    test_context_socket_close (sub2);
-    test_context_socket_close (pub);
-    test_context_socket_close (xpub_proxy);
-    test_context_socket_close (xsub_proxy);
-}
-
-void test_unsubscribe_cleanup ()
-{
-    char my_endpoint[MAX_SOCKET_STRING];
-
-    //  Create a publisher
-    void *pub = test_context_socket (ZMQ_XPUB);
-    int manual = 1;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (pub, ZMQ_XPUB_MANUAL, &manual, 4));
-    bind_loopback_ipv4 (pub, my_endpoint, sizeof my_endpoint);
-
-    //  Create a subscriber
-    void *sub = test_context_socket (ZMQ_XSUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sub, my_endpoint));
-
-    //  Subscribe for A
-    const uint8_t subscription1[2] = {1, 'A'};
-    send_array_expect_success (sub, subscription1, 0);
-
-
-    // Receive subscriptions from subscriber
-    recv_array_expect_success (pub, subscription1, 0);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (pub, ZMQ_SUBSCRIBE, "XA", 2));
-
-    // send 2 messages
-    send_string_expect_success (pub, "XA", 0);
-    send_string_expect_success (pub, "XB", 0);
-
-    // receive the single message
-    recv_string_expect_success (sub, "XA", 0);
-
-    // should be nothing left in the queue
-    char buffer[2];
-    TEST_ASSERT_FAILURE_ERRNO (
-      EAGAIN, zmq_recv (sub, buffer, sizeof buffer, ZMQ_DONTWAIT));
-
-    // close the socket
-    test_context_socket_close (sub);
-
-    // closing the socket will result in an unsubscribe event
-    const uint8_t unsubscription[2] = {0, 'A'};
-    recv_array_expect_success (pub, unsubscription, 0);
-
-    // this doesn't really do anything
-    // there is no last_pipe set it will just fail silently
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (pub, ZMQ_UNSUBSCRIBE, "XA", 2));
-
-    // reconnect
-    sub = test_context_socket (ZMQ_XSUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sub, my_endpoint));
-
-    // send a subscription for B
-    const uint8_t subscription2[2] = {1, 'B'};
-    send_array_expect_success (sub, subscription2, 0);
-
-    // receive the subscription, overwrite it to XB
-    recv_array_expect_success (pub, subscription2, 0);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (pub, ZMQ_SUBSCRIBE, "XB", 2));
-
-    // send 2 messages
-    send_string_expect_success (pub, "XA", 0);
-    send_string_expect_success (pub, "XB", 0);
-
-    // receive the single message
-    recv_string_expect_success (sub, "XB", 0);
-
-    // should be nothing left in the queue
-    TEST_ASSERT_FAILURE_ERRNO (
-      EAGAIN, zmq_recv (sub, buffer, sizeof buffer, ZMQ_DONTWAIT));
-
-    //  Clean up.
-    test_context_socket_close (pub);
-    test_context_socket_close (sub);
-}
-
-void test_user_message ()
-{
-    //  Create a publisher
-    void *pub = test_context_socket (ZMQ_XPUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (pub, "inproc://soname"));
-
-    //  Create a subscriber
-    void *sub = test_context_socket (ZMQ_XSUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sub, "inproc://soname"));
-
-    //  Send some data that is neither sub nor unsub
-    const char subscription[] = {2, 'A', 0};
-    send_string_expect_success (sub, subscription, 0);
-
-    // Receive subscriptions from subscriber
-    recv_string_expect_success (pub, subscription, 0);
-
-    //  Clean up.
-    test_context_socket_close (pub);
-    test_context_socket_close (sub);
-}
-
-#ifdef ZMQ_ONLY_FIRST_SUBSCRIBE
-void test_user_message_multi ()
-{
-    const int only_first_subscribe = 1;
-
-    //  Create a publisher
-    void *pub = test_context_socket (ZMQ_XPUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (pub, "inproc://soname"));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (pub, ZMQ_ONLY_FIRST_SUBSCRIBE,
-                                               &only_first_subscribe,
-                                               sizeof (only_first_subscribe)));
-
-    //  Create a subscriber
-    void *sub = test_context_socket (ZMQ_XSUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sub, "inproc://soname"));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (sub, ZMQ_ONLY_FIRST_SUBSCRIBE,
-                                               &only_first_subscribe,
-                                               sizeof (only_first_subscribe)));
-
-    //  Send some data that is neither sub nor unsub
-    const uint8_t msg_common[] = {'A', 'B', 'C'};
-    //  Message starts with 0 but should still treated as user
-    const uint8_t msg_0a[] = {0, 'B', 'C'};
-    const uint8_t msg_0b[] = {0, 'C', 'D'};
-    //  Message starts with 1 but should still treated as user
-    const uint8_t msg_1a[] = {1, 'B', 'C'};
-    const uint8_t msg_1b[] = {1, 'C', 'D'};
-
-    // Test second message starting with 0
-    send_array_expect_success (sub, msg_common, ZMQ_SNDMORE);
-    send_array_expect_success (sub, msg_0a, 0);
-
-    // Receive messages from subscriber
-    recv_array_expect_success (pub, msg_common, 0);
-    recv_array_expect_success (pub, msg_0a, 0);
-
-    // Test second message starting with 1
-    send_array_expect_success (sub, msg_common, ZMQ_SNDMORE);
-    send_array_expect_success (sub, msg_1a, 0);
-
-    // Receive messages from subscriber
-    recv_array_expect_success (pub, msg_common, 0);
-    recv_array_expect_success (pub, msg_1a, 0);
-
-    // Test first message starting with 1
-    send_array_expect_success (sub, msg_1a, ZMQ_SNDMORE);
-    send_array_expect_success (sub, msg_1b, 0);
-    recv_array_expect_success (pub, msg_1a, 0);
-    recv_array_expect_success (pub, msg_1b, 0);
-
-    send_array_expect_success (sub, msg_0a, ZMQ_SNDMORE);
-    send_array_expect_success (sub, msg_0b, 0);
-    recv_array_expect_success (pub, msg_0a, 0);
-    recv_array_expect_success (pub, msg_0b, 0);
-
-    //  Clean up.
-    test_context_socket_close (pub);
-    test_context_socket_close (sub);
-}
-#endif
-
-int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_basic);
-    RUN_TEST (test_unsubscribe_manual);
-    RUN_TEST (test_xpub_proxy_unsubscribe_on_disconnect);
-    RUN_TEST (test_missing_subscriptions);
-    RUN_TEST (test_unsubscribe_cleanup);
-    RUN_TEST (test_user_message);
-#ifdef ZMQ_ONLY_FIRST_SUBSCRIBE
-    RUN_TEST (test_user_message_multi);
-#endif
-
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_xpub_manual_last_value.cpp b/libs/libzmq/tests/test_xpub_manual_last_value.cpp
deleted file mode 100644
index 733e34a..0000000
--- a/libs/libzmq/tests/test_xpub_manual_last_value.cpp
+++ /dev/null
@@ -1,514 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void test_basic ()
-{
-    //  Create a publisher
-    void *pub = test_context_socket (ZMQ_XPUB);
-    int manual = 1;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (pub, ZMQ_XPUB_MANUAL_LAST_VALUE, &manual, 4));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (pub, "inproc://soname"));
-
-    //  Create a subscriber
-    void *sub = test_context_socket (ZMQ_XSUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sub, "inproc://soname"));
-
-    //  Subscribe for A
-    const char subscription[] = {1, 'A', 0};
-    send_string_expect_success (sub, subscription, 0);
-
-    // Receive subscriptions from subscriber
-    recv_string_expect_success (pub, subscription, 0);
-
-    // Subscribe socket for B instead
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (pub, ZMQ_SUBSCRIBE, "B", 1));
-
-    // Sending A message and B Message
-    send_string_expect_success (pub, "A", 0);
-    send_string_expect_success (pub, "B", 0);
-
-    recv_string_expect_success (sub, "B", ZMQ_DONTWAIT);
-
-    //  Clean up.
-    test_context_socket_close (pub);
-    test_context_socket_close (sub);
-}
-
-void test_unsubscribe_manual ()
-{
-    //  Create a publisher
-    void *pub = test_context_socket (ZMQ_XPUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (pub, "inproc://soname"));
-
-    //  set pub socket options
-    int manual = 1;
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (pub, ZMQ_XPUB_MANUAL_LAST_VALUE,
-                                               &manual, sizeof (manual)));
-
-    //  Create a subscriber
-    void *sub = test_context_socket (ZMQ_XSUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sub, "inproc://soname"));
-
-    //  Subscribe for A
-    const uint8_t subscription1[] = {1, 'A'};
-    send_array_expect_success (sub, subscription1, 0);
-
-    //  Subscribe for B
-    const uint8_t subscription2[] = {1, 'B'};
-    send_array_expect_success (sub, subscription2, 0);
-
-    char buffer[3];
-
-    // Receive subscription "A" from subscriber
-    recv_array_expect_success (pub, subscription1, 0);
-
-    // Subscribe socket for XA instead
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (pub, ZMQ_SUBSCRIBE, "XA", 2));
-
-    // Receive subscription "B" from subscriber
-    recv_array_expect_success (pub, subscription2, 0);
-
-    // Subscribe socket for XB instead
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (pub, ZMQ_SUBSCRIBE, "XB", 2));
-
-    //  Unsubscribe from A
-    const uint8_t unsubscription1[2] = {0, 'A'};
-    send_array_expect_success (sub, unsubscription1, 0);
-
-    // Receive unsubscription "A" from subscriber
-    recv_array_expect_success (pub, unsubscription1, 0);
-
-    // Unsubscribe socket from XA instead
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (pub, ZMQ_UNSUBSCRIBE, "XA", 2));
-
-    // Sending messages XA, XB
-    send_string_expect_success (pub, "XA", 0);
-    send_string_expect_success (pub, "XB", 0);
-
-    // Subscriber should receive XB only
-    recv_string_expect_success (sub, "XB", ZMQ_DONTWAIT);
-
-    // Close subscriber
-    test_context_socket_close (sub);
-
-    // Receive unsubscription "B"
-    const char unsubscription2[2] = {0, 'B'};
-    TEST_ASSERT_EQUAL_INT (
-      sizeof unsubscription2,
-      TEST_ASSERT_SUCCESS_ERRNO (zmq_recv (pub, buffer, sizeof buffer, 0)));
-    TEST_ASSERT_EQUAL_INT8_ARRAY (unsubscription2, buffer,
-                                  sizeof unsubscription2);
-
-    // Unsubscribe socket from XB instead
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (pub, ZMQ_UNSUBSCRIBE, "XB", 2));
-
-    //  Clean up.
-    test_context_socket_close (pub);
-}
-
-void test_xpub_proxy_unsubscribe_on_disconnect ()
-{
-    const uint8_t topic_buff[] = {"1"};
-    const uint8_t payload_buff[] = {"X"};
-
-    char my_endpoint_backend[MAX_SOCKET_STRING];
-    char my_endpoint_frontend[MAX_SOCKET_STRING];
-
-    int manual = 1;
-
-    // proxy frontend
-    void *xsub_proxy = test_context_socket (ZMQ_XSUB);
-    bind_loopback_ipv4 (xsub_proxy, my_endpoint_frontend,
-                        sizeof my_endpoint_frontend);
-
-    // proxy backend
-    void *xpub_proxy = test_context_socket (ZMQ_XPUB);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (xpub_proxy, ZMQ_XPUB_MANUAL_LAST_VALUE, &manual, 4));
-    bind_loopback_ipv4 (xpub_proxy, my_endpoint_backend,
-                        sizeof my_endpoint_backend);
-
-    // publisher
-    void *pub = test_context_socket (ZMQ_PUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (pub, my_endpoint_frontend));
-
-    // first subscriber subscribes
-    void *sub1 = test_context_socket (ZMQ_SUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sub1, my_endpoint_backend));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sub1, ZMQ_SUBSCRIBE, topic_buff, 1));
-
-    // wait
-    msleep (SETTLE_TIME);
-
-    // proxy reroutes and confirms subscriptions
-    const uint8_t subscription[2] = {1, *topic_buff};
-    recv_array_expect_success (xpub_proxy, subscription, ZMQ_DONTWAIT);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (xpub_proxy, ZMQ_SUBSCRIBE, topic_buff, 1));
-    send_array_expect_success (xsub_proxy, subscription, 0);
-
-    // second subscriber subscribes
-    void *sub2 = test_context_socket (ZMQ_SUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sub2, my_endpoint_backend));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sub2, ZMQ_SUBSCRIBE, topic_buff, 1));
-
-    // wait
-    msleep (SETTLE_TIME);
-
-    // proxy reroutes
-    recv_array_expect_success (xpub_proxy, subscription, ZMQ_DONTWAIT);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (xpub_proxy, ZMQ_SUBSCRIBE, topic_buff, 1));
-    send_array_expect_success (xsub_proxy, subscription, 0);
-
-    // wait
-    msleep (SETTLE_TIME);
-
-    // let publisher send a msg
-    send_array_expect_success (pub, topic_buff, ZMQ_SNDMORE);
-    send_array_expect_success (pub, payload_buff, 0);
-
-    // wait
-    msleep (SETTLE_TIME);
-
-    // proxy reroutes data messages to subscribers
-    recv_array_expect_success (xsub_proxy, topic_buff, ZMQ_DONTWAIT);
-    recv_array_expect_success (xsub_proxy, payload_buff, ZMQ_DONTWAIT);
-
-    // send 2 messages
-    send_array_expect_success (xpub_proxy, topic_buff, ZMQ_SNDMORE);
-    send_array_expect_success (xpub_proxy, payload_buff, 0);
-    send_array_expect_success (xpub_proxy, topic_buff, ZMQ_SNDMORE);
-    send_array_expect_success (xpub_proxy, payload_buff, 0);
-
-    // wait
-    msleep (SETTLE_TIME);
-
-    // sub2 will get 2 messages because the last subscription is sub2.
-    recv_array_expect_success (sub2, topic_buff, ZMQ_DONTWAIT);
-    recv_array_expect_success (sub2, payload_buff, ZMQ_DONTWAIT);
-    recv_array_expect_success (sub2, topic_buff, ZMQ_DONTWAIT);
-    recv_array_expect_success (sub2, payload_buff, ZMQ_DONTWAIT);
-
-    recv_array_expect_success (sub1, topic_buff, ZMQ_DONTWAIT);
-    recv_array_expect_success (sub1, payload_buff, ZMQ_DONTWAIT);
-
-    //  Disconnect both subscribers
-    test_context_socket_close (sub1);
-    test_context_socket_close (sub2);
-
-    // wait
-    msleep (SETTLE_TIME);
-
-    // unsubscribe messages are passed from proxy to publisher
-    const uint8_t unsubscription[] = {0, *topic_buff};
-    recv_array_expect_success (xpub_proxy, unsubscription, 0);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (xpub_proxy, ZMQ_UNSUBSCRIBE, topic_buff, 1));
-    send_array_expect_success (xsub_proxy, unsubscription, 0);
-
-    // should receive another unsubscribe msg
-    recv_array_expect_success (xpub_proxy, unsubscription, 0);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (xpub_proxy, ZMQ_UNSUBSCRIBE, topic_buff, 1));
-    send_array_expect_success (xsub_proxy, unsubscription, 0);
-
-    // wait
-    msleep (SETTLE_TIME);
-
-    // let publisher send a msg
-    send_array_expect_success (pub, topic_buff, ZMQ_SNDMORE);
-    send_array_expect_success (pub, payload_buff, 0);
-
-    // wait
-    msleep (SETTLE_TIME);
-
-    // nothing should come to the proxy
-    char buffer[1];
-    TEST_ASSERT_FAILURE_ERRNO (
-      EAGAIN, zmq_recv (xsub_proxy, buffer, sizeof buffer, ZMQ_DONTWAIT));
-
-    test_context_socket_close (pub);
-    test_context_socket_close (xpub_proxy);
-    test_context_socket_close (xsub_proxy);
-}
-
-void test_missing_subscriptions ()
-{
-    const char *topic1 = "1";
-    const char *topic2 = "2";
-    const char *payload = "X";
-
-    char my_endpoint_backend[MAX_SOCKET_STRING];
-    char my_endpoint_frontend[MAX_SOCKET_STRING];
-
-    int manual = 1;
-
-    // proxy frontend
-    void *xsub_proxy = test_context_socket (ZMQ_XSUB);
-    bind_loopback_ipv4 (xsub_proxy, my_endpoint_frontend,
-                        sizeof my_endpoint_frontend);
-
-    // proxy backend
-    void *xpub_proxy = test_context_socket (ZMQ_XPUB);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (xpub_proxy, ZMQ_XPUB_MANUAL_LAST_VALUE, &manual, 4));
-    bind_loopback_ipv4 (xpub_proxy, my_endpoint_backend,
-                        sizeof my_endpoint_backend);
-
-    // publisher
-    void *pub = test_context_socket (ZMQ_PUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (pub, my_endpoint_frontend));
-
-    // Here's the problem: because subscribers subscribe in quick succession,
-    // the proxy is unable to confirm the first subscription before receiving
-    // the second. This causes the first subscription to get lost.
-
-    // first subscriber
-    void *sub1 = test_context_socket (ZMQ_SUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sub1, my_endpoint_backend));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (sub1, ZMQ_SUBSCRIBE, topic1, 1));
-
-    // wait
-    msleep (SETTLE_TIME);
-
-    // proxy now reroutes and confirms subscriptions
-    const uint8_t subscription1[] = {1, static_cast<uint8_t> (topic1[0])};
-    recv_array_expect_success (xpub_proxy, subscription1, ZMQ_DONTWAIT);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (xpub_proxy, ZMQ_SUBSCRIBE, topic1, 1));
-    send_array_expect_success (xsub_proxy, subscription1, 0);
-
-    // second subscriber
-    void *sub2 = test_context_socket (ZMQ_SUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sub2, my_endpoint_backend));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (sub2, ZMQ_SUBSCRIBE, topic2, 1));
-
-    // wait
-    msleep (SETTLE_TIME);
-
-    // proxy now reroutes and confirms subscriptions
-    const uint8_t subscription2[] = {1, static_cast<uint8_t> (topic2[0])};
-    recv_array_expect_success (xpub_proxy, subscription2, ZMQ_DONTWAIT);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (xpub_proxy, ZMQ_SUBSCRIBE, topic2, 1));
-    send_array_expect_success (xsub_proxy, subscription2, 0);
-
-    // wait
-    msleep (SETTLE_TIME);
-
-    // let publisher send 2 msgs, each with its own topic_buff
-    send_string_expect_success (pub, topic1, ZMQ_SNDMORE);
-    send_string_expect_success (pub, payload, 0);
-    send_string_expect_success (pub, topic2, ZMQ_SNDMORE);
-    send_string_expect_success (pub, payload, 0);
-
-    // wait
-    msleep (SETTLE_TIME);
-
-    // proxy reroutes data messages to subscribers
-    recv_string_expect_success (xsub_proxy, topic1, ZMQ_DONTWAIT);
-    recv_string_expect_success (xsub_proxy, payload, ZMQ_DONTWAIT);
-    send_string_expect_success (xpub_proxy, topic1, ZMQ_SNDMORE);
-    send_string_expect_success (xpub_proxy, payload, 0);
-
-    recv_string_expect_success (xsub_proxy, topic2, ZMQ_DONTWAIT);
-    recv_string_expect_success (xsub_proxy, payload, ZMQ_DONTWAIT);
-    send_string_expect_success (xpub_proxy, topic2, ZMQ_SNDMORE);
-    send_string_expect_success (xpub_proxy, payload, 0);
-
-    // wait
-    msleep (SETTLE_TIME);
-
-    // only sub2 should now get a message
-    recv_string_expect_success (sub2, topic2, ZMQ_DONTWAIT);
-    recv_string_expect_success (sub2, payload, ZMQ_DONTWAIT);
-
-    //recv_string_expect_success (sub1, topic1, ZMQ_DONTWAIT);
-    //recv_string_expect_success (sub1, payload, ZMQ_DONTWAIT);
-
-    //  Clean up
-    test_context_socket_close (sub1);
-    test_context_socket_close (sub2);
-    test_context_socket_close (pub);
-    test_context_socket_close (xpub_proxy);
-    test_context_socket_close (xsub_proxy);
-}
-
-void test_unsubscribe_cleanup ()
-{
-    char my_endpoint[MAX_SOCKET_STRING];
-
-    //  Create a publisher
-    void *pub = test_context_socket (ZMQ_XPUB);
-    int manual = 1;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (pub, ZMQ_XPUB_MANUAL_LAST_VALUE, &manual, 4));
-    bind_loopback_ipv4 (pub, my_endpoint, sizeof my_endpoint);
-
-    //  Create a subscriber
-    void *sub = test_context_socket (ZMQ_XSUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sub, my_endpoint));
-
-    //  Subscribe for A
-    const uint8_t subscription1[2] = {1, 'A'};
-    send_array_expect_success (sub, subscription1, 0);
-
-
-    // Receive subscriptions from subscriber
-    recv_array_expect_success (pub, subscription1, 0);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (pub, ZMQ_SUBSCRIBE, "XA", 2));
-
-    // send 2 messages
-    send_string_expect_success (pub, "XA", 0);
-    send_string_expect_success (pub, "XB", 0);
-
-    // receive the single message
-    recv_string_expect_success (sub, "XA", 0);
-
-    // should be nothing left in the queue
-    char buffer[2];
-    TEST_ASSERT_FAILURE_ERRNO (
-      EAGAIN, zmq_recv (sub, buffer, sizeof buffer, ZMQ_DONTWAIT));
-
-    // close the socket
-    test_context_socket_close (sub);
-
-    // closing the socket will result in an unsubscribe event
-    const uint8_t unsubscription[2] = {0, 'A'};
-    recv_array_expect_success (pub, unsubscription, 0);
-
-    // this doesn't really do anything
-    // there is no last_pipe set it will just fail silently
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (pub, ZMQ_UNSUBSCRIBE, "XA", 2));
-
-    // reconnect
-    sub = test_context_socket (ZMQ_XSUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sub, my_endpoint));
-
-    // send a subscription for B
-    const uint8_t subscription2[2] = {1, 'B'};
-    send_array_expect_success (sub, subscription2, 0);
-
-    // receive the subscription, overwrite it to XB
-    recv_array_expect_success (pub, subscription2, 0);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (pub, ZMQ_SUBSCRIBE, "XB", 2));
-
-    // send 2 messages
-    send_string_expect_success (pub, "XA", 0);
-    send_string_expect_success (pub, "XB", 0);
-
-    // receive the single message
-    recv_string_expect_success (sub, "XB", 0);
-
-    // should be nothing left in the queue
-    TEST_ASSERT_FAILURE_ERRNO (
-      EAGAIN, zmq_recv (sub, buffer, sizeof buffer, ZMQ_DONTWAIT));
-
-    //  Clean up.
-    test_context_socket_close (pub);
-    test_context_socket_close (sub);
-}
-
-void test_manual_last_value ()
-{
-    //  Create a publisher
-    void *pub = test_context_socket (ZMQ_XPUB);
-
-    int hwm = 2000;
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (pub, ZMQ_SNDHWM, &hwm, 4));
-
-    //  set pub socket options
-    int manual = 1;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (pub, ZMQ_XPUB_MANUAL_LAST_VALUE, &manual, 4));
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (pub, "inproc://soname"));
-
-    //  Create a subscriber
-    void *sub = test_context_socket (ZMQ_SUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sub, "inproc://soname"));
-
-    //  Create another subscriber
-    void *sub2 = test_context_socket (ZMQ_SUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sub2, "inproc://soname"));
-
-    //  Subscribe for "A".
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (sub, ZMQ_SUBSCRIBE, "A", 1));
-
-    const uint8_t subscription[2] = {1, 'A'};
-    //  we must wait for the subscription to be processed here, otherwise some
-    //  or all published messages might be lost
-    recv_array_expect_success (pub, subscription, 0);
-
-    //  manual subscribe message
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (pub, ZMQ_SUBSCRIBE, "A", 1));
-    send_string_expect_success (pub, "A", 0);
-    recv_string_expect_success (sub, "A", 0);
-
-    //  Subscribe for "A".
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (sub2, ZMQ_SUBSCRIBE, "A", 1));
-    recv_array_expect_success (pub, subscription, 0);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (pub, ZMQ_SUBSCRIBE, "A", 1));
-    send_string_expect_success (pub, "A", 0);
-    recv_string_expect_success (sub2, "A", 0);
-
-    char buffer[255];
-    //  sub won't get a message because the last subscription pipe is sub2.
-    TEST_ASSERT_FAILURE_ERRNO (
-      EAGAIN, zmq_recv (sub, buffer, sizeof (buffer), ZMQ_DONTWAIT));
-
-    //  Clean up.
-    test_context_socket_close (pub);
-    test_context_socket_close (sub);
-    test_context_socket_close (sub2);
-}
-
-int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_basic);
-    RUN_TEST (test_unsubscribe_manual);
-    RUN_TEST (test_xpub_proxy_unsubscribe_on_disconnect);
-    RUN_TEST (test_missing_subscriptions);
-    RUN_TEST (test_unsubscribe_cleanup);
-    RUN_TEST (test_manual_last_value);
-
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_xpub_nodrop.cpp b/libs/libzmq/tests/test_xpub_nodrop.cpp
deleted file mode 100644
index 8599f77..0000000
--- a/libs/libzmq/tests/test_xpub_nodrop.cpp
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void test ()
-{
-    //  Create a publisher
-    void *pub = test_context_socket (ZMQ_XPUB);
-
-    int hwm = 2000;
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (pub, ZMQ_SNDHWM, &hwm, 4));
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (pub, "inproc://soname"));
-
-    //  set pub socket options
-    int wait = 1;
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (pub, ZMQ_XPUB_NODROP, &wait, 4));
-
-    //  Create a subscriber
-    void *sub = test_context_socket (ZMQ_SUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sub, "inproc://soname"));
-
-    //  Subscribe for all messages.
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (sub, ZMQ_SUBSCRIBE, "", 0));
-
-    //  we must wait for the subscription to be processed here, otherwise some
-    //  or all published messages might be lost
-    recv_string_expect_success (pub, "\1", 0);
-
-    int hwmlimit = hwm - 1;
-    int send_count = 0;
-
-    //  Send an empty message
-    for (int i = 0; i < hwmlimit; i++) {
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_send (pub, NULL, 0, 0));
-        send_count++;
-    }
-
-    int recv_count = 0;
-    do {
-        //  Receive the message in the subscriber
-        int rc = zmq_recv (sub, NULL, 0, 0);
-        if (rc == -1) {
-            TEST_ASSERT_EQUAL_INT (EAGAIN, errno);
-            break;
-        }
-        TEST_ASSERT_EQUAL_INT (0, rc);
-        recv_count++;
-
-        if (recv_count == 1) {
-            const int sub_rcvtimeo = 250;
-            TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (
-              sub, ZMQ_RCVTIMEO, &sub_rcvtimeo, sizeof (sub_rcvtimeo)));
-        }
-
-    } while (true);
-
-    TEST_ASSERT_EQUAL_INT (send_count, recv_count);
-
-    //  Now test real blocking behavior
-    //  Set a timeout, default is infinite
-    int timeout = 0;
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (pub, ZMQ_SNDTIMEO, &timeout, 4));
-
-    send_count = 0;
-    recv_count = 0;
-    hwmlimit = hwm;
-
-    //  Send an empty message until we get an error, which must be EAGAIN
-    while (zmq_send (pub, "", 0, 0) == 0)
-        send_count++;
-    TEST_ASSERT_EQUAL_INT (EAGAIN, errno);
-
-    if (send_count > 0) {
-        //  Receive first message with blocking
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_recv (sub, NULL, 0, 0));
-        recv_count++;
-
-        while (zmq_recv (sub, NULL, 0, ZMQ_DONTWAIT) == 0)
-            recv_count++;
-    }
-
-    TEST_ASSERT_EQUAL_INT (send_count, recv_count);
-
-    //  Clean up.
-    test_context_socket_close (pub);
-    test_context_socket_close (sub);
-}
-
-int main ()
-{
-    setup_test_environment ();
-    UNITY_BEGIN ();
-    RUN_TEST (test);
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_xpub_verbose.cpp b/libs/libzmq/tests/test_xpub_verbose.cpp
deleted file mode 100644
index 258c567..0000000
--- a/libs/libzmq/tests/test_xpub_verbose.cpp
+++ /dev/null
@@ -1,330 +0,0 @@
-/*
-    Copyright (c) 2018 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-const uint8_t unsubscribe_a_msg[] = {0, 'A'};
-const uint8_t subscribe_a_msg[] = {1, 'A'};
-const uint8_t subscribe_b_msg[] = {1, 'B'};
-
-const char test_endpoint[] = "inproc://soname";
-const char topic_a[] = "A";
-const char topic_b[] = "B";
-
-void test_xpub_verbose_one_sub ()
-{
-    void *pub = test_context_socket (ZMQ_XPUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (pub, test_endpoint));
-
-    void *sub = test_context_socket (ZMQ_SUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sub, test_endpoint));
-
-    //  Subscribe for A
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (sub, ZMQ_SUBSCRIBE, topic_a, 1));
-
-    // Receive subscriptions from subscriber
-    recv_array_expect_success (pub, subscribe_a_msg, 0);
-
-    // Subscribe socket for B instead
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (sub, ZMQ_SUBSCRIBE, topic_b, 1));
-
-    // Receive subscriptions from subscriber
-    recv_array_expect_success (pub, subscribe_b_msg, 0);
-
-    //  Subscribe again for A again
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (sub, ZMQ_SUBSCRIBE, topic_a, 1));
-
-    //  This time it is duplicated, so it will be filtered out
-    TEST_ASSERT_FAILURE_ERRNO (EAGAIN, zmq_recv (pub, NULL, 0, ZMQ_DONTWAIT));
-
-    int verbose = 1;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (pub, ZMQ_XPUB_VERBOSE, &verbose, sizeof (int)));
-
-    // Subscribe socket for A again
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (sub, ZMQ_SUBSCRIBE, topic_a, 1));
-
-    // This time with VERBOSE the duplicated sub will be received
-    recv_array_expect_success (pub, subscribe_a_msg, 0);
-
-    // Sending A message and B Message
-    send_string_expect_success (pub, topic_a, 0);
-    send_string_expect_success (pub, topic_b, 0);
-
-    recv_string_expect_success (sub, topic_a, 0);
-    recv_string_expect_success (sub, topic_b, 0);
-
-    //  Clean up.
-    test_context_socket_close (pub);
-    test_context_socket_close (sub);
-}
-
-void create_xpub_with_2_subs (void **pub_, void **sub0_, void **sub1_)
-{
-    *pub_ = test_context_socket (ZMQ_XPUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (*pub_, test_endpoint));
-
-    *sub0_ = test_context_socket (ZMQ_SUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (*sub0_, test_endpoint));
-
-    *sub1_ = test_context_socket (ZMQ_SUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (*sub1_, test_endpoint));
-}
-
-void create_duplicate_subscription (void *pub_, void *sub0_, void *sub1_)
-{
-    //  Subscribe for A
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sub0_, ZMQ_SUBSCRIBE, topic_a, 1));
-
-    // Receive subscriptions from subscriber
-    recv_array_expect_success (pub_, subscribe_a_msg, 0);
-
-    //  Subscribe again for A on the other socket
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sub1_, ZMQ_SUBSCRIBE, topic_a, 1));
-
-    //  This time it is duplicated, so it will be filtered out by XPUB
-    TEST_ASSERT_FAILURE_ERRNO (EAGAIN, zmq_recv (pub_, NULL, 0, ZMQ_DONTWAIT));
-}
-
-void test_xpub_verbose_two_subs ()
-{
-    void *pub, *sub0, *sub1;
-    create_xpub_with_2_subs (&pub, &sub0, &sub1);
-    create_duplicate_subscription (pub, sub0, sub1);
-
-    // Subscribe socket for B instead
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sub0, ZMQ_SUBSCRIBE, topic_b, 1));
-
-    // Receive subscriptions from subscriber
-    recv_array_expect_success (pub, subscribe_b_msg, 0);
-
-    int verbose = 1;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (pub, ZMQ_XPUB_VERBOSE, &verbose, sizeof (int)));
-
-    // Subscribe socket for A again
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sub1, ZMQ_SUBSCRIBE, topic_a, 1));
-
-    // This time with VERBOSE the duplicated sub will be received
-    recv_array_expect_success (pub, subscribe_a_msg, 0);
-
-    // Sending A message and B Message
-    send_string_expect_success (pub, topic_a, 0);
-
-    send_string_expect_success (pub, topic_b, 0);
-
-    recv_string_expect_success (sub0, topic_a, 0);
-    recv_string_expect_success (sub1, topic_a, 0);
-    recv_string_expect_success (sub0, topic_b, 0);
-
-    //  Clean up.
-    test_context_socket_close (pub);
-    test_context_socket_close (sub0);
-    test_context_socket_close (sub1);
-}
-
-void test_xpub_verboser_one_sub ()
-{
-    //  Create a publisher
-    void *pub = test_context_socket (ZMQ_XPUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (pub, test_endpoint));
-
-    //  Create a subscriber
-    void *sub = test_context_socket (ZMQ_SUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sub, test_endpoint));
-
-    //  Unsubscribe for A, does not exist yet
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sub, ZMQ_UNSUBSCRIBE, topic_a, 1));
-
-    //  Does not exist, so it will be filtered out by XSUB
-    TEST_ASSERT_FAILURE_ERRNO (EAGAIN, zmq_recv (pub, NULL, 0, ZMQ_DONTWAIT));
-
-    //  Subscribe for A
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (sub, ZMQ_SUBSCRIBE, topic_a, 1));
-
-    // Receive subscriptions from subscriber
-    recv_array_expect_success (pub, subscribe_a_msg, 0);
-
-    //  Subscribe again for A again, XSUB will increase refcount
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (sub, ZMQ_SUBSCRIBE, topic_a, 1));
-
-    //  This time it is duplicated, so it will be filtered out by XPUB
-    TEST_ASSERT_FAILURE_ERRNO (EAGAIN, zmq_recv (pub, NULL, 0, ZMQ_DONTWAIT));
-
-    //  Unsubscribe for A, this time it exists in XPUB
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sub, ZMQ_UNSUBSCRIBE, topic_a, 1));
-
-    //  XSUB refcounts and will not actually send unsub to PUB until the number
-    //  of unsubs match the earlier subs
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sub, ZMQ_UNSUBSCRIBE, topic_a, 1));
-
-    // Receive unsubscriptions from subscriber
-    recv_array_expect_success (pub, unsubscribe_a_msg, 0);
-
-    //  XSUB only sends the last and final unsub, so XPUB will only receive 1
-    TEST_ASSERT_FAILURE_ERRNO (EAGAIN, zmq_recv (pub, NULL, 0, ZMQ_DONTWAIT));
-
-    //  Unsubscribe for A, does not exist anymore
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sub, ZMQ_UNSUBSCRIBE, topic_a, 1));
-
-    //  Does not exist, so it will be filtered out by XSUB
-    TEST_ASSERT_FAILURE_ERRNO (EAGAIN, zmq_recv (pub, NULL, 0, ZMQ_DONTWAIT));
-
-    int verbose = 1;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (pub, ZMQ_XPUB_VERBOSER, &verbose, sizeof (int)));
-
-    // Subscribe socket for A again
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (sub, ZMQ_SUBSCRIBE, topic_a, 1));
-
-    // Receive subscriptions from subscriber, did not exist anymore
-    recv_array_expect_success (pub, subscribe_a_msg, 0);
-
-    // Sending A message to make sure everything still works
-    send_string_expect_success (pub, topic_a, 0);
-
-    recv_string_expect_success (sub, topic_a, 0);
-
-    //  Unsubscribe for A, this time it exists
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sub, ZMQ_UNSUBSCRIBE, topic_a, 1));
-
-    // Receive unsubscriptions from subscriber
-    recv_array_expect_success (pub, unsubscribe_a_msg, 0);
-
-    //  Unsubscribe for A again, it does not exist anymore so XSUB will filter
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sub, ZMQ_UNSUBSCRIBE, topic_a, 1));
-
-    //  XSUB only sends unsub if it matched it in its trie, IOW: it will only
-    //  send it if it existed in the first place even with XPUB_VERBBOSER
-    TEST_ASSERT_FAILURE_ERRNO (EAGAIN, zmq_recv (pub, NULL, 0, ZMQ_DONTWAIT));
-
-    //  Clean up.
-    test_context_socket_close (pub);
-    test_context_socket_close (sub);
-}
-
-void test_xpub_verboser_two_subs ()
-{
-    void *pub, *sub0, *sub1;
-    create_xpub_with_2_subs (&pub, &sub0, &sub1);
-    create_duplicate_subscription (pub, sub0, sub1);
-
-    //  Unsubscribe for A, this time it exists in XPUB
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sub0, ZMQ_UNSUBSCRIBE, topic_a, 1));
-
-    //  sub1 is still subscribed, so no notification
-    TEST_ASSERT_FAILURE_ERRNO (EAGAIN, zmq_recv (pub, NULL, 0, ZMQ_DONTWAIT));
-
-    //  Unsubscribe the second socket to trigger the notification
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sub1, ZMQ_UNSUBSCRIBE, topic_a, 1));
-
-    // Receive unsubscriptions since all sockets are gone
-    recv_array_expect_success (pub, unsubscribe_a_msg, 0);
-
-    //  Make really sure there is only one notification
-    TEST_ASSERT_FAILURE_ERRNO (EAGAIN, zmq_recv (pub, NULL, 0, ZMQ_DONTWAIT));
-
-    int verbose = 1;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (pub, ZMQ_XPUB_VERBOSER, &verbose, sizeof (int)));
-
-    // Subscribe socket for A again
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sub0, ZMQ_SUBSCRIBE, topic_a, 1));
-
-    // Subscribe socket for A again
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sub1, ZMQ_SUBSCRIBE, topic_a, 1));
-
-    // Receive subscriptions from subscriber, did not exist anymore
-    recv_array_expect_success (pub, subscribe_a_msg, 0);
-
-    //  VERBOSER is set, so subs from both sockets are received
-    recv_array_expect_success (pub, subscribe_a_msg, 0);
-
-    // Sending A message to make sure everything still works
-    send_string_expect_success (pub, topic_a, 0);
-
-    recv_string_expect_success (sub0, topic_a, 0);
-    recv_string_expect_success (sub1, topic_a, 0);
-
-    //  Unsubscribe for A
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sub1, ZMQ_UNSUBSCRIBE, topic_a, 1));
-
-    // Receive unsubscriptions from first subscriber due to VERBOSER
-    recv_array_expect_success (pub, unsubscribe_a_msg, 0);
-
-    //  Unsubscribe for A again from the other socket
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sub0, ZMQ_UNSUBSCRIBE, topic_a, 1));
-
-    // Receive unsubscriptions from first subscriber due to VERBOSER
-    recv_array_expect_success (pub, unsubscribe_a_msg, 0);
-
-    //  Unsubscribe again to make sure it gets filtered now
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (sub1, ZMQ_UNSUBSCRIBE, topic_a, 1));
-
-    //  Unmatched, so XSUB filters even with VERBOSER
-    TEST_ASSERT_FAILURE_ERRNO (EAGAIN, zmq_recv (pub, NULL, 0, ZMQ_DONTWAIT));
-
-    //  Clean up.
-    test_context_socket_close (pub);
-    test_context_socket_close (sub0);
-    test_context_socket_close (sub1);
-}
-
-int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_xpub_verbose_one_sub);
-    RUN_TEST (test_xpub_verbose_two_subs);
-    RUN_TEST (test_xpub_verboser_one_sub);
-    RUN_TEST (test_xpub_verboser_two_subs);
-
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_xpub_welcome_msg.cpp b/libs/libzmq/tests/test_xpub_welcome_msg.cpp
deleted file mode 100644
index 0066d9f..0000000
--- a/libs/libzmq/tests/test_xpub_welcome_msg.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void test ()
-{
-    //  Create a publisher
-    void *pub = test_context_socket (ZMQ_XPUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (pub, "inproc://soname"));
-
-    //  set pub socket options
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (pub, ZMQ_XPUB_WELCOME_MSG, "W", 1));
-
-    //  Create a subscriber
-    void *sub = test_context_socket (ZMQ_SUB);
-
-    // Subscribe to the welcome message
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (sub, ZMQ_SUBSCRIBE, "W", 1));
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sub, "inproc://soname"));
-
-    const uint8_t buffer[2] = {1, 'W'};
-
-    // Receive the welcome subscription
-    recv_array_expect_success (pub, buffer, 0);
-
-    // Receive the welcome message
-    recv_string_expect_success (sub, "W", 0);
-
-    //  Clean up.
-    test_context_socket_close (pub);
-    test_context_socket_close (sub);
-}
-
-int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test);
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_xsub_verbose.cpp b/libs/libzmq/tests/test_xsub_verbose.cpp
deleted file mode 100644
index 85305cd..0000000
--- a/libs/libzmq/tests/test_xsub_verbose.cpp
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
-    Copyright (c) 2021 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-const uint8_t unsubscribe_a_msg[] = {0, 'A'};
-const uint8_t subscribe_a_msg[] = {1, 'A'};
-
-const char test_endpoint[] = "inproc://soname";
-
-void test_xsub_verbose_unsubscribe ()
-{
-    void *pub = test_context_socket (ZMQ_XPUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (pub, test_endpoint));
-
-    void *sub = test_context_socket (ZMQ_XSUB);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sub, test_endpoint));
-
-    // set option ZMQ_XPUB_VERBOSER to get all messages
-    int xbup_verboser = 1;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (pub, ZMQ_XPUB_VERBOSER, &xbup_verboser, sizeof (int)));
-
-    // unsubscribe from topic A, does not exist yet
-    send_array_expect_success (sub, unsubscribe_a_msg, 0);
-
-    // does not exist, so it will be filtered out by XSUB
-    TEST_ASSERT_FAILURE_ERRNO (EAGAIN, zmq_recv (pub, NULL, 0, ZMQ_DONTWAIT));
-
-    // subscribe to topic A
-    send_array_expect_success (sub, subscribe_a_msg, 0);
-
-    // receive subscription from subscriber
-    recv_array_expect_success (pub, subscribe_a_msg, 0);
-
-    // subscribe again to topic A
-    send_array_expect_success (sub, subscribe_a_msg, 0);
-
-    // receive subscription from subscriber
-    recv_array_expect_success (pub, subscribe_a_msg, 0);
-
-    // unsubscribe from topic A
-    send_array_expect_success (sub, unsubscribe_a_msg, 0);
-
-    // The first unsubscribe will be filtered out
-    TEST_ASSERT_FAILURE_ERRNO (EAGAIN, zmq_recv (pub, NULL, 0, ZMQ_DONTWAIT));
-
-    // unsubscribe again from topic A
-    send_array_expect_success (sub, unsubscribe_a_msg, 0);
-
-    // receive unsubscription from subscriber
-    recv_array_expect_success (pub, unsubscribe_a_msg, 0);
-
-    // set option ZMQ_XSUB_VERBOSE_UNSUBSCRIBE to get duplicate unsubscribes
-    int xsub_verbose = 1;
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (
-      sub, ZMQ_XSUB_VERBOSE_UNSUBSCRIBE, &xsub_verbose, sizeof (int)));
-
-    // unsubscribe from topic A, does not exist yet
-    send_array_expect_success (sub, unsubscribe_a_msg, 0);
-
-    // does not exist, but with ZMQ_XSUB_VERBOSE_UNSUBSCRIBE set it will be forwarded anyway
-    recv_array_expect_success (pub, unsubscribe_a_msg, 0);
-
-    // subscribe to topic A
-    send_array_expect_success (sub, subscribe_a_msg, 0);
-
-    // receive subscription from subscriber
-    recv_array_expect_success (pub, subscribe_a_msg, 0);
-
-    // subscribe again to topic A
-    send_array_expect_success (sub, subscribe_a_msg, 0);
-
-    // receive subscription from subscriber
-    recv_array_expect_success (pub, subscribe_a_msg, 0);
-
-    // unsubscribe from topic A
-    send_array_expect_success (sub, unsubscribe_a_msg, 0);
-
-    // receive unsubscription from subscriber
-    recv_array_expect_success (pub, unsubscribe_a_msg, 0);
-
-    // unsubscribe again from topic A
-    send_array_expect_success (sub, unsubscribe_a_msg, 0);
-
-    // receive unsubscription from subscriber
-    recv_array_expect_success (pub, unsubscribe_a_msg, 0);
-
-    //  Clean up.
-    test_context_socket_close (pub);
-    test_context_socket_close (sub);
-}
-
-int main ()
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_xsub_verbose_unsubscribe);
-
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_z85_decode_fuzzer.cpp b/libs/libzmq/tests/test_z85_decode_fuzzer.cpp
deleted file mode 100644
index ab81752..0000000
--- a/libs/libzmq/tests/test_z85_decode_fuzzer.cpp
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
-    Copyright (c) 2020 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifdef ZMQ_USE_FUZZING_ENGINE
-#include <fuzzer/FuzzedDataProvider.h>
-#endif
-
-#include <string>
-#include <stdlib.h>
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-extern "C" int LLVMFuzzerTestOneInput (const uint8_t *data, size_t size)
-{
-    uint8_t *secret_key;
-
-    if (size < 5)
-        return 0;
-
-    // As per API definition, input must be divisible by 5, so truncate it if it's not
-    size -= size % 5;
-    // As per API definition, the destination must be at least 0.8 times the input data
-    TEST_ASSERT_NOT_NULL (secret_key = (uint8_t *) malloc (size * 4 / 5));
-
-    std::string z85_secret_key (reinterpret_cast<const char *> (data), size);
-    zmq_z85_decode (secret_key, z85_secret_key.c_str ());
-
-    free (secret_key);
-
-    return 0;
-}
-
-#ifndef ZMQ_USE_FUZZING_ENGINE
-void test_z85_decode_fuzzer ()
-{
-    uint8_t **data;
-    size_t *len, num_cases = 0;
-    if (fuzzer_corpus_encode (
-          "tests/libzmq-fuzz-corpora/test_z85_decode_fuzzer_seed_corpus", &data,
-          &len, &num_cases)
-        != 0)
-        exit (77);
-
-    while (num_cases-- > 0) {
-        TEST_ASSERT_SUCCESS_ERRNO (
-          LLVMFuzzerTestOneInput (data[num_cases], len[num_cases]));
-        free (data[num_cases]);
-    }
-
-    free (data);
-    free (len);
-}
-
-int main (int argc, char **argv)
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_z85_decode_fuzzer);
-
-    return UNITY_END ();
-}
-#endif
diff --git a/libs/libzmq/tests/test_zmq_poll_fd.cpp b/libs/libzmq/tests/test_zmq_poll_fd.cpp
deleted file mode 100644
index e155310..0000000
--- a/libs/libzmq/tests/test_zmq_poll_fd.cpp
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
-    Copyright (c) 2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-#include <netdb.h>
-#include <string.h>
-
-#ifndef _WIN32
-#include <unistd.h>
-#endif
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void test_poll_fd ()
-{
-    int recv_socket = socket (AF_INET, SOCK_DGRAM, IPPROTO_UDP);
-    TEST_ASSERT_NOT_EQUAL (-1, recv_socket);
-
-    int flag = 1;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      setsockopt (recv_socket, SOL_SOCKET, SO_REUSEADDR, &flag, sizeof (int)));
-
-    struct sockaddr_in saddr = bind_bsd_socket (recv_socket);
-
-    void *sb = test_context_socket (ZMQ_REP);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (sb, "tcp://127.0.0.1:*"));
-
-    zmq_pollitem_t pollitems[] = {
-      {sb, 0, ZMQ_POLLIN, 0},
-      {NULL, recv_socket, ZMQ_POLLIN, 0},
-    };
-
-    int send_socket = socket (AF_INET, SOCK_DGRAM, IPPROTO_UDP);
-    TEST_ASSERT_NOT_EQUAL (-1, send_socket);
-
-    char buf[10];
-    memset (buf, 1, 10);
-
-    TEST_ASSERT_SUCCESS_ERRNO (sendto (
-      send_socket, buf, 10, 0, (struct sockaddr *) &saddr, sizeof (saddr)));
-
-    TEST_ASSERT_EQUAL (1, zmq_poll (pollitems, 2, 1));
-    TEST_ASSERT_BITS_LOW (ZMQ_POLLIN, pollitems[0].revents);
-    TEST_ASSERT_BITS_HIGH (ZMQ_POLLIN, pollitems[1].revents);
-
-    test_context_socket_close (sb);
-
-    close (send_socket);
-    close (recv_socket);
-}
-
-int main ()
-{
-    UNITY_BEGIN ();
-    RUN_TEST (test_poll_fd);
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_zmq_ppoll_fd.cpp b/libs/libzmq/tests/test_zmq_ppoll_fd.cpp
deleted file mode 100644
index 65b1c07..0000000
--- a/libs/libzmq/tests/test_zmq_ppoll_fd.cpp
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
-    Copyright (c) 2021 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-#include <string.h>
-
-#ifndef _WIN32
-#include <netdb.h>
-#include <unistd.h>
-#endif
-
-SETUP_TEARDOWN_TESTCONTEXT
-
-void test_ppoll_fd ()
-{
-#ifdef ZMQ_HAVE_PPOLL
-    int recv_socket = socket (AF_INET, SOCK_DGRAM, IPPROTO_UDP);
-    TEST_ASSERT_NOT_EQUAL (-1, recv_socket);
-
-    int flag = 1;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      setsockopt (recv_socket, SOL_SOCKET, SO_REUSEADDR, &flag, sizeof (int)));
-
-    struct sockaddr_in saddr = bind_bsd_socket (recv_socket);
-
-    void *sb = test_context_socket (ZMQ_REP);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (sb, "tcp://127.0.0.1:*"));
-
-    zmq_pollitem_t pollitems[] = {
-      {sb, 0, ZMQ_POLLIN, 0},
-      {NULL, recv_socket, ZMQ_POLLIN, 0},
-    };
-
-    int send_socket = socket (AF_INET, SOCK_DGRAM, IPPROTO_UDP);
-    TEST_ASSERT_NOT_EQUAL (-1, send_socket);
-
-    char buf[10];
-    memset (buf, 1, 10);
-
-    TEST_ASSERT_SUCCESS_ERRNO (sendto (
-      send_socket, buf, 10, 0, (struct sockaddr *) &saddr, sizeof (saddr)));
-
-    TEST_ASSERT_EQUAL (1, zmq_ppoll (pollitems, 2, 1, NULL));
-    TEST_ASSERT_BITS_LOW (ZMQ_POLLIN, pollitems[0].revents);
-    TEST_ASSERT_BITS_HIGH (ZMQ_POLLIN, pollitems[1].revents);
-
-    test_context_socket_close (sb);
-
-    close (send_socket);
-    close (recv_socket);
-#else
-    TEST_IGNORE_MESSAGE ("libzmq without zmq_ppoll, ignoring test");
-#endif // ZMQ_HAVE_PPOLL
-}
-
-int main ()
-{
-    UNITY_BEGIN ();
-    RUN_TEST (test_ppoll_fd);
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/test_zmq_ppoll_signals.cpp b/libs/libzmq/tests/test_zmq_ppoll_signals.cpp
deleted file mode 100644
index 44d90b0..0000000
--- a/libs/libzmq/tests/test_zmq_ppoll_signals.cpp
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
-    Copyright (c) 2021 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-// author: E. G. Patrick Bos, Netherlands eScience Center, 2021
-
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-#include <string.h> // memset
-// types.h and wait.h for waitpid:
-#include <sys/types.h>
-#include <sys/wait.h>
-
-static bool sigterm_received = false;
-
-void handle_sigterm (int /*signum*/)
-{
-    sigterm_received = true;
-}
-
-void recv_string_expect_success_or_eagain (void *socket_,
-                                           const char *str_,
-                                           int flags_)
-{
-    const size_t len = str_ ? strlen (str_) : 0;
-    char buffer[255];
-    TEST_ASSERT_LESS_OR_EQUAL_MESSAGE (sizeof (buffer), len,
-                                       "recv_string_expect_success cannot be "
-                                       "used for strings longer than 255 "
-                                       "characters");
-
-    const int rc = zmq_recv (socket_, buffer, sizeof (buffer), flags_);
-    if (rc < 0) {
-        if (errno == EAGAIN) {
-            printf ("got EAGAIN\n");
-            return;
-        } else {
-            TEST_ASSERT_SUCCESS_ERRNO (rc);
-        }
-    } else {
-        TEST_ASSERT_EQUAL_INT ((int) len, rc);
-        if (str_)
-            TEST_ASSERT_EQUAL_STRING_LEN (str_, buffer, len);
-    }
-}
-
-void test_ppoll_signals ()
-{
-#ifdef ZMQ_HAVE_PPOLL
-    pid_t child_pid;
-    do {
-        child_pid = fork ();
-    } while (child_pid == -1); // retry if fork fails
-
-    if (child_pid > 0) { // parent
-        setup_test_context ();
-        void *socket = test_context_socket (ZMQ_REQ);
-        // to make sure we don't hang when the child has already exited at the end, we set a receive timeout of five seconds
-        int recv_timeout = 5000;
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (
-          socket, ZMQ_RCVTIMEO, &recv_timeout, sizeof (recv_timeout)));
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (socket, "tcp://*:6660"));
-        // bind is on the master process to avoid zombie children to hold on to binds
-
-        // first send a test message to check whether the signal mask is setup in the child process
-        send_string_expect_success (socket, "breaker breaker", 0);
-        recv_string_expect_success (socket, "one-niner", 0);
-
-        // then send the signal
-        kill (child_pid, SIGTERM);
-
-        // for good measure, and to make sure everything went as expected, close off with another handshake, which will trigger the second poll call on the other side
-        send_string_expect_success (socket, "breaker breaker", 0);
-        // in case the 1 second sleep was not enough on the child side, we are also fine with an EAGAIN here
-        recv_string_expect_success_or_eagain (socket, "one-niner", 0);
-
-        // finish
-        test_context_socket_close (socket);
-
-        // wait for child
-        int status = 0;
-        pid_t pid;
-        do {
-            pid = waitpid (child_pid, &status, 0);
-        } while (-1 == pid
-                 && EINTR == errno); // retry on interrupted system call
-
-        if (0 != status) {
-            if (WIFEXITED (status)) {
-                printf ("exited, status=%d\n", WEXITSTATUS (status));
-            } else if (WIFSIGNALED (status)) {
-                printf ("killed by signal %d\n", WTERMSIG (status));
-            } else if (WIFSTOPPED (status)) {
-                printf ("stopped by signal %d\n", WSTOPSIG (status));
-            } else if (WIFCONTINUED (status)) {
-                printf ("continued\n");
-            }
-        }
-
-        if (-1 == pid) {
-            printf ("waitpid returned -1, with errno %s\n", strerror (errno));
-        }
-    } else { // child
-        setup_test_context ();
-        // set up signal mask and install handler for SIGTERM
-        sigset_t sigmask, sigmask_without_sigterm;
-        sigemptyset (&sigmask);
-        sigaddset (&sigmask, SIGTERM);
-        sigprocmask (SIG_BLOCK, &sigmask, &sigmask_without_sigterm);
-        struct sigaction sa;
-        memset (&sa, '\0', sizeof (sa));
-        sa.sa_handler = handle_sigterm;
-        TEST_ASSERT_SUCCESS_ERRNO (sigaction (SIGTERM, &sa, NULL));
-
-        void *socket = test_context_socket (ZMQ_REP);
-        TEST_ASSERT_SUCCESS_ERRNO (
-          zmq_connect (socket, "tcp://127.0.0.1:6660"));
-
-        zmq_pollitem_t pollitems[] = {
-          {socket, 0, ZMQ_POLLIN, 0},
-        };
-
-        // first receive test message and send back handshake
-        recv_string_expect_success (socket, "breaker breaker", 0);
-        send_string_expect_success (socket, "one-niner", 0);
-
-        // now start ppolling, which should exit with EINTR because of the SIGTERM
-        TEST_ASSERT_FAILURE_ERRNO (
-          EINTR, zmq_ppoll (pollitems, 1, -1, &sigmask_without_sigterm));
-        TEST_ASSERT_TRUE (sigterm_received);
-
-        // poll again for the final handshake
-        TEST_ASSERT_SUCCESS_ERRNO (
-          zmq_ppoll (pollitems, 1, -1, &sigmask_without_sigterm));
-        TEST_ASSERT_BITS_HIGH (ZMQ_POLLIN, pollitems[0].revents);
-        // receive and send back handshake
-        recv_string_expect_success (socket, "breaker breaker", 0);
-        send_string_expect_success (socket, "one-niner", 0);
-
-        // finish
-        // wait before closing socket, so that parent has time to receive
-        sleep (1);
-        test_context_socket_close (socket);
-        _Exit (0);
-    }
-#else
-    TEST_IGNORE_MESSAGE ("libzmq without zmq_ppoll, ignoring test");
-#endif // ZMQ_HAVE_PPOLL
-}
-
-// We note that using zmq_poll instead of zmq_ppoll in the test above, while
-// also not using the sigmask, will fail most of the time, because it is
-// impossible to predict during which call the signal will be handled. Of
-// course, every call could be surrounded with an EINTR check and a subsequent
-// check of sigterm_received's value, but even then a race condition can occur,
-// see the explanation given here: https://250bpm.com/blog:12/
-
-int main ()
-{
-    UNITY_BEGIN ();
-    RUN_TEST (test_ppoll_signals);
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/tests/testutil.cpp b/libs/libzmq/tests/testutil.cpp
deleted file mode 100644
index 5306aff..0000000
--- a/libs/libzmq/tests/testutil.cpp
+++ /dev/null
@@ -1,623 +0,0 @@
-/*
-    Copyright (c) 2007-2019 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "testutil.hpp"
-#include "testutil_unity.hpp"
-
-#include <stdarg.h>
-#include <string.h>
-
-#if defined _WIN32
-#include "../src/windows.hpp"
-#if defined _MSC_VER
-#if defined ZMQ_HAVE_IPC
-#include <direct.h>
-#include <afunix.h>
-#endif
-#include <crtdbg.h>
-#pragma warning(disable : 4996)
-// iphlpapi is needed for if_nametoindex (not on Windows XP)
-#if _WIN32_WINNT > _WIN32_WINNT_WINXP
-#pragma comment(lib, "iphlpapi")
-#endif
-#endif
-#else
-#include <pthread.h>
-#include <unistd.h>
-#include <signal.h>
-#include <stdlib.h>
-#include <grp.h>
-#include <sys/wait.h>
-#include <sys/socket.h>
-#include <sys/types.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <net/if.h>
-#include <netdb.h>
-#include <sys/un.h>
-#include <dirent.h>
-#if defined(ZMQ_HAVE_AIX)
-#include <sys/types.h>
-#include <sys/socketvar.h>
-#endif
-#endif
-
-#ifndef PATH_MAX
-#define PATH_MAX 1024
-#endif
-
-const char *SEQ_END = (const char *) 1;
-
-const char bounce_content[] = "12345678ABCDEFGH12345678abcdefgh";
-
-static void send_bounce_msg (void *socket_)
-{
-    send_string_expect_success (socket_, bounce_content, ZMQ_SNDMORE);
-    send_string_expect_success (socket_, bounce_content, 0);
-}
-
-static void recv_bounce_msg (void *socket_)
-{
-    recv_string_expect_success (socket_, bounce_content, 0);
-    int rcvmore;
-    size_t sz = sizeof (rcvmore);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (socket_, ZMQ_RCVMORE, &rcvmore, &sz));
-    TEST_ASSERT_TRUE (rcvmore);
-    recv_string_expect_success (socket_, bounce_content, 0);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (socket_, ZMQ_RCVMORE, &rcvmore, &sz));
-    TEST_ASSERT_FALSE (rcvmore);
-}
-
-void bounce (void *server_, void *client_)
-{
-    //  Send message from client to server
-    send_bounce_msg (client_);
-
-    //  Receive message at server side and
-    //  check that message is still the same
-    recv_bounce_msg (server_);
-
-    //  Send two parts back to client
-    send_bounce_msg (server_);
-
-    //  Receive the two parts at the client side
-    recv_bounce_msg (client_);
-}
-
-static void send_bounce_msg_may_fail (void *socket_)
-{
-    int timeout = 250;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (socket_, ZMQ_SNDTIMEO, &timeout, sizeof (int)));
-    int rc = zmq_send (socket_, bounce_content, 32, ZMQ_SNDMORE);
-    TEST_ASSERT_TRUE ((rc == 32) || ((rc == -1) && (errno == EAGAIN)));
-    rc = zmq_send (socket_, bounce_content, 32, 0);
-    TEST_ASSERT_TRUE ((rc == 32) || ((rc == -1) && (errno == EAGAIN)));
-}
-
-static void recv_bounce_msg_fail (void *socket_)
-{
-    int timeout = 250;
-    char buffer[32];
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (socket_, ZMQ_RCVTIMEO, &timeout, sizeof (int)));
-    TEST_ASSERT_FAILURE_ERRNO (EAGAIN, zmq_recv (socket_, buffer, 32, 0));
-}
-
-void expect_bounce_fail (void *server_, void *client_)
-{
-    //  Send message from client to server
-    send_bounce_msg_may_fail (client_);
-
-    //  Receive message at server side (should not succeed)
-    recv_bounce_msg_fail (server_);
-
-    //  Send message from server to client to test other direction
-    //  If connection failed, send may block, without a timeout
-    send_bounce_msg_may_fail (server_);
-
-    //  Receive message at client side (should not succeed)
-    recv_bounce_msg_fail (client_);
-}
-
-char *s_recv (void *socket_)
-{
-    char buffer[256];
-    int size = zmq_recv (socket_, buffer, 255, 0);
-    if (size == -1)
-        return NULL;
-    if (size > 255)
-        size = 255;
-    buffer[size] = 0;
-    return strdup (buffer);
-}
-
-void s_send_seq (void *socket_, ...)
-{
-    va_list ap;
-    va_start (ap, socket_);
-    const char *data = va_arg (ap, const char *);
-    while (true) {
-        const char *prev = data;
-        data = va_arg (ap, const char *);
-        bool end = data == SEQ_END;
-
-        if (!prev) {
-            TEST_ASSERT_SUCCESS_ERRNO (
-              zmq_send (socket_, 0, 0, end ? 0 : ZMQ_SNDMORE));
-        } else {
-            TEST_ASSERT_SUCCESS_ERRNO (zmq_send (
-              socket_, prev, strlen (prev) + 1, end ? 0 : ZMQ_SNDMORE));
-        }
-        if (end)
-            break;
-    }
-    va_end (ap);
-}
-
-void s_recv_seq (void *socket_, ...)
-{
-    zmq_msg_t msg;
-    zmq_msg_init (&msg);
-
-    int more;
-    size_t more_size = sizeof (more);
-
-    va_list ap;
-    va_start (ap, socket_);
-    const char *data = va_arg (ap, const char *);
-
-    while (true) {
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_msg_recv (&msg, socket_, 0));
-
-        if (!data)
-            TEST_ASSERT_EQUAL_INT (0, zmq_msg_size (&msg));
-        else
-            TEST_ASSERT_EQUAL_STRING (data, (const char *) zmq_msg_data (&msg));
-
-        data = va_arg (ap, const char *);
-        bool end = data == SEQ_END;
-
-        TEST_ASSERT_SUCCESS_ERRNO (
-          zmq_getsockopt (socket_, ZMQ_RCVMORE, &more, &more_size));
-
-        TEST_ASSERT_TRUE (!more == end);
-        if (end)
-            break;
-    }
-    va_end (ap);
-
-    zmq_msg_close (&msg);
-}
-
-void close_zero_linger (void *socket_)
-{
-    int linger = 0;
-    int rc = zmq_setsockopt (socket_, ZMQ_LINGER, &linger, sizeof (linger));
-    TEST_ASSERT_TRUE (rc == 0 || errno == ETERM);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_close (socket_));
-}
-
-void setup_test_environment (int timeout_seconds_)
-{
-#if defined _WIN32
-#if defined _MSC_VER
-    _set_abort_behavior (0, _WRITE_ABORT_MSG);
-    _CrtSetReportMode (_CRT_ASSERT, _CRTDBG_MODE_FILE);
-    _CrtSetReportFile (_CRT_ASSERT, _CRTDBG_FILE_STDERR);
-#endif
-#else
-#if defined ZMQ_HAVE_CYGWIN
-    // abort test after 121 seconds
-    alarm (121);
-#else
-#if !defined ZMQ_DISABLE_TEST_TIMEOUT
-    // abort test after timeout_seconds_ seconds
-    alarm (timeout_seconds_);
-#endif
-#endif
-#endif
-#if defined __MVS__
-    // z/OS UNIX System Services: Ignore SIGPIPE during test runs, as a
-    // workaround for no SO_NOGSIGPIPE socket option.
-    signal (SIGPIPE, SIG_IGN);
-#endif
-}
-
-void msleep (int milliseconds_)
-{
-#ifdef ZMQ_HAVE_WINDOWS
-    Sleep (milliseconds_);
-#else
-    usleep (static_cast<useconds_t> (milliseconds_) * 1000);
-#endif
-}
-
-int is_ipv6_available ()
-{
-#if defined(ZMQ_HAVE_WINDOWS) && (_WIN32_WINNT < 0x0600)
-    return 0;
-#else
-    int rc, ipv6 = 1;
-    struct sockaddr_in6 test_addr;
-
-    memset (&test_addr, 0, sizeof (test_addr));
-    test_addr.sin6_family = AF_INET6;
-    inet_pton (AF_INET6, "::1", &(test_addr.sin6_addr));
-
-    fd_t fd = socket (AF_INET6, SOCK_STREAM, IPPROTO_IP);
-    if (fd == retired_fd)
-        ipv6 = 0;
-    else {
-#ifdef ZMQ_HAVE_WINDOWS
-        setsockopt (fd, SOL_SOCKET, SO_REUSEADDR, (const char *) &ipv6,
-                    sizeof (int));
-        rc = setsockopt (fd, IPPROTO_IPV6, IPV6_V6ONLY, (const char *) &ipv6,
-                         sizeof (int));
-        if (rc == SOCKET_ERROR)
-            ipv6 = 0;
-        else {
-            rc = bind (fd, (struct sockaddr *) &test_addr, sizeof (test_addr));
-            if (rc == SOCKET_ERROR)
-                ipv6 = 0;
-        }
-#else
-        setsockopt (fd, SOL_SOCKET, SO_REUSEADDR, &ipv6, sizeof (int));
-        rc = setsockopt (fd, IPPROTO_IPV6, IPV6_V6ONLY, &ipv6, sizeof (int));
-        if (rc != 0)
-            ipv6 = 0;
-        else {
-            rc = bind (fd, reinterpret_cast<struct sockaddr *> (&test_addr),
-                       sizeof (test_addr));
-            if (rc != 0)
-                ipv6 = 0;
-        }
-#endif
-        close (fd);
-    }
-
-    return ipv6;
-#endif // _WIN32_WINNT < 0x0600
-}
-
-int is_tipc_available ()
-{
-#ifndef ZMQ_HAVE_TIPC
-    return 0;
-#else
-    int tipc = 0;
-
-    void *ctx = zmq_init (1);
-    TEST_ASSERT_NOT_NULL (ctx);
-    void *rep = zmq_socket (ctx, ZMQ_REP);
-    TEST_ASSERT_NOT_NULL (rep);
-    tipc = zmq_bind (rep, "tipc://{5560,0,0}");
-
-    zmq_close (rep);
-    zmq_ctx_term (ctx);
-
-    return tipc == 0;
-#endif // ZMQ_HAVE_TIPC
-}
-
-int test_inet_pton (int af_, const char *src_, void *dst_)
-{
-#if defined(ZMQ_HAVE_WINDOWS) && (_WIN32_WINNT < 0x0600)
-    if (af_ == AF_INET) {
-        struct in_addr *ip4addr = (struct in_addr *) dst_;
-
-        ip4addr->s_addr = inet_addr (src_);
-
-        //  INADDR_NONE is -1 which is also a valid representation for IP
-        //  255.255.255.255
-        if (ip4addr->s_addr == INADDR_NONE
-            && strcmp (src_, "255.255.255.255") != 0) {
-            return 0;
-        }
-
-        //  Success
-        return 1;
-    } else {
-        //  Not supported.
-        return 0;
-    }
-#else
-    return inet_pton (af_, src_, dst_);
-#endif
-}
-
-sockaddr_in bind_bsd_socket (int socket_)
-{
-    struct sockaddr_in saddr;
-    memset (&saddr, 0, sizeof (saddr));
-    saddr.sin_family = AF_INET;
-    saddr.sin_addr.s_addr = INADDR_ANY;
-#if !defined(_WIN32_WINNT) || (_WIN32_WINNT >= 0x0600)
-    saddr.sin_port = 0;
-#else
-    saddr.sin_port = htons (PORT_6);
-#endif
-
-    TEST_ASSERT_SUCCESS_RAW_ERRNO (
-      bind (socket_, (struct sockaddr *) &saddr, sizeof (saddr)));
-
-#if !defined(_WIN32_WINNT) || (_WIN32_WINNT >= 0x0600)
-    socklen_t saddr_len = sizeof (saddr);
-    TEST_ASSERT_SUCCESS_RAW_ERRNO (
-      getsockname (socket_, (struct sockaddr *) &saddr, &saddr_len));
-#endif
-
-    return saddr;
-}
-
-fd_t connect_socket (const char *endpoint_, const int af_, const int protocol_)
-{
-    struct sockaddr_storage addr;
-    //  OSX is very opinionated and wants the size to match the AF family type
-    socklen_t addr_len;
-    const fd_t s_pre = socket (af_, SOCK_STREAM,
-                               protocol_ == IPPROTO_UDP   ? IPPROTO_UDP
-                               : protocol_ == IPPROTO_TCP ? IPPROTO_TCP
-                                                          : 0);
-#ifdef ZMQ_HAVE_WINDOWS
-    TEST_ASSERT_NOT_EQUAL (INVALID_SOCKET, s_pre);
-#else
-    TEST_ASSERT_NOT_EQUAL (-1, s_pre);
-#endif
-
-    if (af_ == AF_INET || af_ == AF_INET6) {
-        const char *port = strrchr (endpoint_, ':') + 1;
-        char address[MAX_SOCKET_STRING];
-        // getaddrinfo does not like [x:y::z]
-        if (*strchr (endpoint_, '/') + 2 == '[') {
-            strcpy (address, strchr (endpoint_, '[') + 1);
-            address[strlen (address) - strlen (port) - 2] = '\0';
-        } else {
-            strcpy (address, strchr (endpoint_, '/') + 2);
-            address[strlen (address) - strlen (port) - 1] = '\0';
-        }
-
-        struct addrinfo *in, hint;
-        memset (&hint, 0, sizeof (struct addrinfo));
-        hint.ai_flags = AI_NUMERICSERV;
-        hint.ai_family = af_;
-        hint.ai_socktype = protocol_ == IPPROTO_UDP ? SOCK_DGRAM : SOCK_STREAM;
-        hint.ai_protocol = protocol_ == IPPROTO_UDP ? IPPROTO_UDP : IPPROTO_TCP;
-
-        TEST_ASSERT_SUCCESS_RAW_ZERO_ERRNO (
-          getaddrinfo (address, port, &hint, &in));
-        TEST_ASSERT_NOT_NULL (in);
-        memcpy (&addr, in->ai_addr, in->ai_addrlen);
-        addr_len = (socklen_t) in->ai_addrlen;
-        freeaddrinfo (in);
-    } else {
-#if defined(ZMQ_HAVE_IPC)
-        //  Cannot cast addr as gcc 4.4 will fail with strict aliasing errors
-        (*(struct sockaddr_un *) &addr).sun_family = AF_UNIX;
-        strcpy ((*(struct sockaddr_un *) &addr).sun_path, endpoint_);
-        addr_len = sizeof (struct sockaddr_un);
-#else
-        return retired_fd;
-#endif
-    }
-
-    TEST_ASSERT_SUCCESS_RAW_ERRNO (
-      connect (s_pre, (struct sockaddr *) &addr, addr_len));
-
-    return s_pre;
-}
-
-fd_t bind_socket_resolve_port (const char *address_,
-                               const char *port_,
-                               char *my_endpoint_,
-                               const int af_,
-                               const int protocol_)
-{
-    struct sockaddr_storage addr;
-    //  OSX is very opinionated and wants the size to match the AF family type
-    socklen_t addr_len;
-    const fd_t s_pre = socket (af_, SOCK_STREAM,
-                               protocol_ == IPPROTO_UDP   ? IPPROTO_UDP
-                               : protocol_ == IPPROTO_TCP ? IPPROTO_TCP
-                                                          : 0);
-#ifdef ZMQ_HAVE_WINDOWS
-    TEST_ASSERT_NOT_EQUAL (INVALID_SOCKET, s_pre);
-#else
-    TEST_ASSERT_NOT_EQUAL (-1, s_pre);
-#endif
-
-    if (af_ == AF_INET || af_ == AF_INET6) {
-#ifdef ZMQ_HAVE_WINDOWS
-        const char flag = '\1';
-#elif defined ZMQ_HAVE_VXWORKS
-        char flag = '\1';
-#else
-        int flag = 1;
-#endif
-        struct addrinfo *in, hint;
-        memset (&hint, 0, sizeof (struct addrinfo));
-        hint.ai_flags = AI_NUMERICSERV;
-        hint.ai_family = af_;
-        hint.ai_socktype = protocol_ == IPPROTO_UDP ? SOCK_DGRAM : SOCK_STREAM;
-        hint.ai_protocol = protocol_ == IPPROTO_UDP ? IPPROTO_UDP : IPPROTO_TCP;
-
-        TEST_ASSERT_SUCCESS_RAW_ERRNO (
-          setsockopt (s_pre, SOL_SOCKET, SO_REUSEADDR, &flag, sizeof (int)));
-        TEST_ASSERT_SUCCESS_RAW_ZERO_ERRNO (
-          getaddrinfo (address_, port_, &hint, &in));
-        TEST_ASSERT_NOT_NULL (in);
-        memcpy (&addr, in->ai_addr, in->ai_addrlen);
-        addr_len = (socklen_t) in->ai_addrlen;
-        freeaddrinfo (in);
-    } else {
-#if defined(ZMQ_HAVE_IPC)
-        //  Cannot cast addr as gcc 4.4 will fail with strict aliasing errors
-        (*(struct sockaddr_un *) &addr).sun_family = AF_UNIX;
-        addr_len = sizeof (struct sockaddr_un);
-#if defined ZMQ_HAVE_WINDOWS
-        char buffer[MAX_PATH] = "";
-
-        TEST_ASSERT_SUCCESS_RAW_ERRNO (tmpnam_s (buffer));
-        TEST_ASSERT_SUCCESS_RAW_ERRNO (_mkdir (buffer));
-        strcat (buffer, "/ipc");
-#else
-        char buffer[PATH_MAX] = "";
-        strcpy (buffer, "tmpXXXXXX");
-#ifdef HAVE_MKDTEMP
-        TEST_ASSERT_TRUE (mkdtemp (buffer));
-        strcat (buffer, "/socket");
-#else
-        int fd = mkstemp (buffer);
-        TEST_ASSERT_TRUE (fd != -1);
-        close (fd);
-#endif
-#endif
-        strcpy ((*(struct sockaddr_un *) &addr).sun_path, buffer);
-        memcpy (my_endpoint_, "ipc://", 7);
-        strcat (my_endpoint_, buffer);
-
-        // TODO check return value of unlink
-        unlink (buffer);
-#else
-        return retired_fd;
-#endif
-    }
-
-    TEST_ASSERT_SUCCESS_RAW_ERRNO (
-      bind (s_pre, (struct sockaddr *) &addr, addr_len));
-    TEST_ASSERT_SUCCESS_RAW_ERRNO (listen (s_pre, SOMAXCONN));
-
-    if (af_ == AF_INET || af_ == AF_INET6) {
-        addr_len = sizeof (struct sockaddr_storage);
-        TEST_ASSERT_SUCCESS_RAW_ERRNO (
-          getsockname (s_pre, (struct sockaddr *) &addr, &addr_len));
-        sprintf (my_endpoint_, "%s://%s:%u",
-                 protocol_ == IPPROTO_TCP   ? "tcp"
-                 : protocol_ == IPPROTO_UDP ? "udp"
-                 : protocol_ == IPPROTO_WSS ? "wss"
-                                            : "ws",
-                 address_,
-                 af_ == AF_INET
-                   ? ntohs ((*(struct sockaddr_in *) &addr).sin_port)
-                   : ntohs ((*(struct sockaddr_in6 *) &addr).sin6_port));
-    }
-
-    return s_pre;
-}
-
-bool streq (const char *lhs_, const char *rhs_)
-{
-    return strcmp (lhs_, rhs_) == 0;
-}
-
-bool strneq (const char *lhs_, const char *rhs_)
-{
-    return strcmp (lhs_, rhs_) != 0;
-}
-
-#if defined _WIN32
-int fuzzer_corpus_encode (const char *dirname,
-                          uint8_t ***data,
-                          size_t **len,
-                          size_t *num_cases)
-{
-    (void) dirname;
-    (void) data;
-    (void) len;
-    (void) num_cases;
-
-    return -1;
-}
-
-#else
-
-int fuzzer_corpus_encode (const char *dirname,
-                          uint8_t ***data,
-                          size_t **len,
-                          size_t *num_cases)
-{
-    TEST_ASSERT_NOT_NULL (dirname);
-    TEST_ASSERT_NOT_NULL (data);
-    TEST_ASSERT_NOT_NULL (len);
-
-    struct dirent *ent;
-    DIR *dir = opendir (dirname);
-    if (!dir)
-        return -1;
-
-    *len = NULL;
-    *data = NULL;
-    *num_cases = 0;
-
-    while ((ent = readdir (dir)) != NULL) {
-        if (!strcmp (ent->d_name, ".") || !strcmp (ent->d_name, ".."))
-            continue;
-
-        char *filename =
-          (char *) malloc (strlen (dirname) + strlen (ent->d_name) + 2);
-        TEST_ASSERT_NOT_NULL (filename);
-        strcpy (filename, dirname);
-        strcat (filename, "/");
-        strcat (filename, ent->d_name);
-        FILE *f = fopen (filename, "r");
-        free (filename);
-        if (!f)
-            continue;
-
-        fseek (f, 0, SEEK_END);
-        size_t file_len = ftell (f);
-        fseek (f, 0, SEEK_SET);
-        if (file_len == 0) {
-            fclose (f);
-            continue;
-        }
-
-        *len = (size_t *) realloc (*len, (*num_cases + 1) * sizeof (size_t));
-        TEST_ASSERT_NOT_NULL (*len);
-        *(*len + *num_cases) = file_len;
-        *data =
-          (uint8_t **) realloc (*data, (*num_cases + 1) * sizeof (uint8_t *));
-        TEST_ASSERT_NOT_NULL (*data);
-        *(*data + *num_cases) =
-          (uint8_t *) malloc (file_len * sizeof (uint8_t));
-        TEST_ASSERT_NOT_NULL (*(*data + *num_cases));
-        size_t read_bytes = 0;
-        read_bytes = fread (*(*data + *num_cases), 1, file_len, f);
-        TEST_ASSERT_EQUAL (file_len, read_bytes);
-        (*num_cases)++;
-
-        fclose (f);
-    }
-
-    closedir (dir);
-
-    return 0;
-}
-#endif
diff --git a/libs/libzmq/tests/testutil.hpp b/libs/libzmq/tests/testutil.hpp
deleted file mode 100644
index da51c46..0000000
--- a/libs/libzmq/tests/testutil.hpp
+++ /dev/null
@@ -1,245 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __TESTUTIL_HPP_INCLUDED__
-#define __TESTUTIL_HPP_INCLUDED__
-
-#if defined ZMQ_CUSTOM_PLATFORM_HPP
-#include "platform.hpp"
-#else
-#include "../src/platform.hpp"
-#endif
-#include "../include/zmq.h"
-#include "../src/stdint.hpp"
-
-//  For AF_INET and IPPROTO_TCP
-#if defined _WIN32
-#include "../src/windows.hpp"
-#if defined(__MINGW32__)
-#include <unistd.h>
-#endif
-#else
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <unistd.h>
-#include <stdlib.h>
-#endif
-
-//  This defines the settle time used in tests; raise this if we
-//  get test failures on slower systems due to binds/connects not
-//  settled. Tested to work reliably at 1 msec on a fast PC.
-#define SETTLE_TIME 300 //  In msec
-//  Commonly used buffer size for ZMQ_LAST_ENDPOINT
-//  this used to be sizeof ("tcp://[::ffff:127.127.127.127]:65536"), but this
-//  may be too short for ipc wildcard binds, e.g.
-#define MAX_SOCKET_STRING 256
-
-//  We need to test codepaths with non-random bind ports. List them here to
-//  keep them unique, to allow parallel test runs.
-#define ENDPOINT_0 "tcp://127.0.0.1:5555"
-#define ENDPOINT_1 "tcp://127.0.0.1:5556"
-#define ENDPOINT_2 "tcp://127.0.0.1:5557"
-#define ENDPOINT_3 "tcp://127.0.0.1:5558"
-#define ENDPOINT_4 "udp://127.0.0.1:5559"
-#define ENDPOINT_5 "udp://127.0.0.1:5560"
-#define PORT_6 5561
-
-//  For tests that mock ZMTP
-const uint8_t zmtp_greeting_null[64] = {
-  0xff, 0, 0, 0, 0, 0, 0, 0, 0, 0x7f, 3, 0, 'N', 'U', 'L', 'L',
-  0,    0, 0, 0, 0, 0, 0, 0, 0, 0,    0, 0, 0,   0,   0,   0,
-  0,    0, 0, 0, 0, 0, 0, 0, 0, 0,    0, 0, 0,   0,   0,   0};
-
-const uint8_t zmtp_greeting_curve[64] = {
-  0xff, 0, 0, 0, 0, 0, 0, 0, 0, 0x7f, 3, 0, 'C', 'U', 'R', 'V',
-  'E',  0, 0, 0, 0, 0, 0, 0, 0, 0,    0, 0, 0,   0,   0,   0,
-  0,    0, 0, 0, 0, 0, 0, 0, 0, 0,    0, 0, 0,   0,   0,   0};
-const uint8_t zmtp_ready_dealer[43] = {
-  4,   41,  5,   'R', 'E', 'A', 'D', 'Y', 11,  'S', 'o', 'c', 'k', 'e', 't',
-  '-', 'T', 'y', 'p', 'e', 0,   0,   0,   6,   'D', 'E', 'A', 'L', 'E', 'R',
-  8,   'I', 'd', 'e', 'n', 't', 'i', 't', 'y', 0,   0,   0,   0};
-const uint8_t zmtp_ready_xpub[28] = {
-  4,   26,  5,   'R', 'E', 'A', 'D', 'Y', 11, 'S', 'o', 'c', 'k', 'e',
-  't', '-', 'T', 'y', 'p', 'e', 0,   0,   0,  4,   'X', 'P', 'U', 'B'};
-const uint8_t zmtp_ready_sub[27] = {
-  4,   25,  5,   'R', 'E', 'A', 'D', 'Y', 11, 'S', 'o', 'c', 'k', 'e',
-  't', '-', 'T', 'y', 'p', 'e', 0,   0,   0,  3,   'S', 'U', 'B'};
-
-#undef NDEBUG
-
-#ifndef MSG_NOSIGNAL
-#define MSG_NOSIGNAL 0
-#endif
-
-// duplicated from fd.hpp
-#ifdef ZMQ_HAVE_WINDOWS
-#ifndef NOMINMAX
-#define NOMINMAX // Macros min(a,b) and max(a,b)
-#endif
-
-#include <winsock2.h>
-#include <ws2tcpip.h>
-#include <stdexcept>
-#define close closesocket
-typedef int socket_size_t;
-inline const char *as_setsockopt_opt_t (const void *opt)
-{
-    return static_cast<const char *> (opt);
-}
-#else
-typedef size_t socket_size_t;
-inline const void *as_setsockopt_opt_t (const void *opt_)
-{
-    return opt_;
-}
-#endif
-
-// duplicated from fd.hpp
-typedef zmq_fd_t fd_t;
-#ifdef ZMQ_HAVE_WINDOWS
-#if defined _MSC_VER && _MSC_VER <= 1400
-enum
-{
-    retired_fd = (zmq_fd_t) (~0)
-};
-#else
-enum
-#if _MSC_VER >= 1800
-  : zmq_fd_t
-#endif
-{
-    retired_fd = INVALID_SOCKET
-};
-#endif
-#else
-enum
-{
-    retired_fd = -1
-};
-#endif
-
-//  In MSVC prior to v14, snprintf is not available
-//  The closest implementation is the _snprintf_s function
-#if defined _MSC_VER && _MSC_VER < 1900
-#define snprintf(buffer_, count_, format_, ...)                                \
-    _snprintf_s (buffer_, count_, _TRUNCATE, format_, __VA_ARGS__)
-#endif
-
-#define LIBZMQ_UNUSED(object) (void) object
-
-//  Bounce a message from client to server and back
-//  For REQ/REP or DEALER/DEALER pairs only
-void bounce (void *server_, void *client_);
-
-//  Same as bounce, but expect messages to never arrive
-//  for security or subscriber reasons.
-void expect_bounce_fail (void *server_, void *client_);
-
-//  Receive 0MQ string from socket and convert into C string
-//  Caller must free returned string. Returns NULL if the context
-//  is being terminated.
-char *s_recv (void *socket_);
-
-bool streq (const char *lhs, const char *rhs);
-bool strneq (const char *lhs, const char *rhs);
-
-extern const char *SEQ_END;
-
-//  Sends a message composed of frames that are C strings or null frames.
-//  The list must be terminated by SEQ_END.
-//  Example: s_send_seq (req, "ABC", 0, "DEF", SEQ_END);
-
-void s_send_seq (void *socket_, ...);
-
-//  Receives message a number of frames long and checks that the frames have
-//  the given data which can be either C strings or 0 for a null frame.
-//  The list must be terminated by SEQ_END.
-//  Example: s_recv_seq (rep, "ABC", 0, "DEF", SEQ_END);
-
-void s_recv_seq (void *socket_, ...);
-
-
-//  Sets a zero linger period on a socket and closes it.
-void close_zero_linger (void *socket_);
-
-//  Setups the test environment. Must be called at the beginning of each test
-//  executable. On POSIX systems, it sets an alarm to the specified number of
-//  seconds, after which the test will be killed. Set to 0 to disable this
-//  timeout.
-void setup_test_environment (int timeout_seconds_ = 60);
-
-//  Provide portable millisecond sleep
-//  http://www.cplusplus.com/forum/unices/60161/
-//  http://en.cppreference.com/w/cpp/thread/sleep_for
-
-void msleep (int milliseconds_);
-
-// check if IPv6 is available (0/false if not, 1/true if it is)
-// only way to reliably check is to actually open a socket and try to bind it
-int is_ipv6_available (void);
-
-// check if tipc is available (0/false if not, 1/true if it is)
-// only way to reliably check is to actually open a socket and try to bind it
-// as it depends on a non-default kernel module to be already loaded
-int is_tipc_available (void);
-
-//  Wrapper around 'inet_pton' for systems that don't support it (e.g. Windows
-//  XP)
-int test_inet_pton (int af_, const char *src_, void *dst_);
-
-//  Binds an ipv4 BSD socket to an ephemeral port, returns the compiled sockaddr
-struct sockaddr_in bind_bsd_socket (int socket);
-
-//  Some custom definitions in addition to IPPROTO_TCP and IPPROTO_UDP
-#define IPPROTO_WS 10000
-#define IPPROTO_WSS 10001
-
-//  Connects a BSD socket to the ZMQ endpoint. Works with ipv4/ipv6/unix.
-fd_t connect_socket (const char *endpoint_,
-                     const int af_ = AF_INET,
-                     const int protocol_ = IPPROTO_TCP);
-
-//  Binds a BSD socket to an ephemeral port, returns the file descriptor.
-//  The resulting ZMQ endpoint will be stored in my_endpoint, including the protocol
-//  prefix, so ensure it is writable and of appropriate size.
-//  Works with ipv4/ipv6/unix. With unix sockets address_/port_ can be empty and
-//  my_endpoint_ will contain a random path.
-fd_t bind_socket_resolve_port (const char *address_,
-                               const char *port_,
-                               char *my_endpoint_,
-                               const int af_ = AF_INET,
-                               const int protocol_ = IPPROTO_TCP);
-
-int fuzzer_corpus_encode (const char *filename,
-                          uint8_t ***data,
-                          size_t **len,
-                          size_t *num_cases);
-
-#endif
diff --git a/libs/libzmq/tests/testutil_monitoring.cpp b/libs/libzmq/tests/testutil_monitoring.cpp
deleted file mode 100644
index 8668cae..0000000
--- a/libs/libzmq/tests/testutil_monitoring.cpp
+++ /dev/null
@@ -1,407 +0,0 @@
-/*
-    Copyright (c) 2007-2019 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "testutil_monitoring.hpp"
-#include "testutil_unity.hpp"
-
-#include <stdlib.h>
-#include <string.h>
-
-static int
-receive_monitor_address (void *monitor_, char **address_, bool expect_more_)
-{
-    zmq_msg_t msg;
-
-    zmq_msg_init (&msg);
-    if (zmq_msg_recv (&msg, monitor_, 0) == -1)
-        return -1; //  Interrupted, presumably
-    TEST_ASSERT_EQUAL (expect_more_, zmq_msg_more (&msg));
-
-    if (address_) {
-        const uint8_t *const data =
-          static_cast<const uint8_t *> (zmq_msg_data (&msg));
-        const size_t size = zmq_msg_size (&msg);
-        *address_ = static_cast<char *> (malloc (size + 1));
-        memcpy (*address_, data, size);
-        (*address_)[size] = 0;
-    }
-    zmq_msg_close (&msg);
-
-    return 0;
-}
-
-//  Read one event off the monitor socket; return value and address
-//  by reference, if not null, and event number by value. Returns -1
-//  in case of error.
-static int get_monitor_event_internal (void *monitor_,
-                                       int *value_,
-                                       char **address_,
-                                       int recv_flag_)
-{
-    //  First frame in message contains event number and value
-    zmq_msg_t msg;
-    zmq_msg_init (&msg);
-    if (zmq_msg_recv (&msg, monitor_, recv_flag_) == -1) {
-        TEST_ASSERT_FAILURE_ERRNO (EAGAIN, -1);
-        return -1; //  timed out or no message available
-    }
-    TEST_ASSERT_TRUE (zmq_msg_more (&msg));
-
-    uint8_t *data = static_cast<uint8_t *> (zmq_msg_data (&msg));
-    uint16_t event = *reinterpret_cast<uint16_t *> (data);
-    if (value_)
-        memcpy (value_, data + 2, sizeof (uint32_t));
-
-    //  Second frame in message contains event address
-    TEST_ASSERT_SUCCESS_ERRNO (
-      receive_monitor_address (monitor_, address_, false));
-
-    return event;
-}
-
-int get_monitor_event_with_timeout (void *monitor_,
-                                    int *value_,
-                                    char **address_,
-                                    int timeout_)
-{
-    int res;
-    if (timeout_ == -1) {
-        // process infinite timeout in small steps to allow the user
-        // to see some information on the console
-
-        int timeout_step = 250;
-        int wait_time = 0;
-        zmq_setsockopt (monitor_, ZMQ_RCVTIMEO, &timeout_step,
-                        sizeof (timeout_step));
-        while (
-          (res = get_monitor_event_internal (monitor_, value_, address_, 0))
-          == -1) {
-            wait_time += timeout_step;
-            fprintf (stderr, "Still waiting for monitor event after %i ms\n",
-                     wait_time);
-        }
-    } else {
-        zmq_setsockopt (monitor_, ZMQ_RCVTIMEO, &timeout_, sizeof (timeout_));
-        res = get_monitor_event_internal (monitor_, value_, address_, 0);
-    }
-    int timeout_infinite = -1;
-    zmq_setsockopt (monitor_, ZMQ_RCVTIMEO, &timeout_infinite,
-                    sizeof (timeout_infinite));
-    return res;
-}
-
-int get_monitor_event (void *monitor_, int *value_, char **address_)
-{
-    return get_monitor_event_with_timeout (monitor_, value_, address_, -1);
-}
-
-void expect_monitor_event (void *monitor_, int expected_event_)
-{
-    TEST_ASSERT_EQUAL_HEX (expected_event_,
-                           get_monitor_event (monitor_, NULL, NULL));
-}
-
-static void print_unexpected_event (char *buf_,
-                                    size_t buf_size_,
-                                    int event_,
-                                    int err_,
-                                    int expected_event_,
-                                    int expected_err_)
-{
-    snprintf (buf_, buf_size_,
-              "Unexpected event: 0x%x, value = %i/0x%x (expected: 0x%x, value "
-              "= %i/0x%x)\n",
-              event_, err_, err_, expected_event_, expected_err_,
-              expected_err_);
-}
-
-void print_unexpected_event_stderr (int event_,
-                                    int err_,
-                                    int expected_event_,
-                                    int expected_err_)
-{
-    char buf[256];
-    print_unexpected_event (buf, sizeof buf, event_, err_, expected_event_,
-                            expected_err_);
-    fputs (buf, stderr);
-}
-
-int expect_monitor_event_multiple (void *server_mon_,
-                                   int expected_event_,
-                                   int expected_err_,
-                                   bool optional_)
-{
-    int count_of_expected_events = 0;
-    int client_closed_connection = 0;
-    int timeout = 250;
-    int wait_time = 0;
-
-    int event;
-    int err;
-    while ((event =
-              get_monitor_event_with_timeout (server_mon_, &err, NULL, timeout))
-             != -1
-           || !count_of_expected_events) {
-        if (event == -1) {
-            if (optional_)
-                break;
-            wait_time += timeout;
-            fprintf (stderr,
-                     "Still waiting for first event after %ims (expected event "
-                     "%x (value %i/0x%x))\n",
-                     wait_time, expected_event_, expected_err_, expected_err_);
-            continue;
-        }
-        // ignore errors with EPIPE/ECONNRESET/ECONNABORTED, which can happen
-        // ECONNRESET can happen on very slow machines, when the engine writes
-        // to the peer and then tries to read the socket before the peer reads
-        // ECONNABORTED happens when a client aborts a connection via RST/timeout
-        if (event == ZMQ_EVENT_HANDSHAKE_FAILED_NO_DETAIL
-            && ((err == EPIPE && expected_err_ != EPIPE) || err == ECONNRESET
-                || err == ECONNABORTED)) {
-            fprintf (stderr,
-                     "Ignored event (skipping any further events): %x (err = "
-                     "%i == %s)\n",
-                     event, err, zmq_strerror (err));
-            client_closed_connection = 1;
-            break;
-        }
-        if (event != expected_event_
-            || (-1 != expected_err_ && err != expected_err_)) {
-            char buf[256];
-            print_unexpected_event (buf, sizeof buf, event, err,
-                                    expected_event_, expected_err_);
-            TEST_FAIL_MESSAGE (buf);
-        }
-        ++count_of_expected_events;
-    }
-    TEST_ASSERT_TRUE (optional_ || count_of_expected_events > 0
-                      || client_closed_connection);
-
-    return count_of_expected_events;
-}
-
-static int64_t get_monitor_event_internal_v2 (void *monitor_,
-                                              uint64_t **value_,
-                                              char **local_address_,
-                                              char **remote_address_,
-                                              int recv_flag_)
-{
-    //  First frame in message contains event number
-    zmq_msg_t msg;
-    zmq_msg_init (&msg);
-    if (zmq_msg_recv (&msg, monitor_, recv_flag_) == -1) {
-        TEST_ASSERT_FAILURE_ERRNO (EAGAIN, -1);
-        return -1; //  timed out or no message available
-    }
-    TEST_ASSERT_TRUE (zmq_msg_more (&msg));
-    TEST_ASSERT_EQUAL_UINT (sizeof (uint64_t), zmq_msg_size (&msg));
-
-    uint64_t event;
-    memcpy (&event, zmq_msg_data (&msg), sizeof (event));
-    zmq_msg_close (&msg);
-
-    //  Second frame in message contains the number of values
-    zmq_msg_init (&msg);
-    if (zmq_msg_recv (&msg, monitor_, recv_flag_) == -1) {
-        TEST_ASSERT_FAILURE_ERRNO (EAGAIN, -1);
-        return -1; //  timed out or no message available
-    }
-    TEST_ASSERT_TRUE (zmq_msg_more (&msg));
-    TEST_ASSERT_EQUAL_UINT (sizeof (uint64_t), zmq_msg_size (&msg));
-
-    uint64_t value_count;
-    memcpy (&value_count, zmq_msg_data (&msg), sizeof (value_count));
-    zmq_msg_close (&msg);
-
-    if (value_) {
-        *value_ =
-          (uint64_t *) malloc ((size_t) value_count * sizeof (uint64_t));
-        TEST_ASSERT_NOT_NULL (*value_);
-    }
-
-    for (uint64_t i = 0; i < value_count; ++i) {
-        //  Subsequent frames in message contain event values
-        zmq_msg_init (&msg);
-        if (zmq_msg_recv (&msg, monitor_, recv_flag_) == -1) {
-            TEST_ASSERT_FAILURE_ERRNO (EAGAIN, -1);
-            return -1; //  timed out or no message available
-        }
-        TEST_ASSERT_TRUE (zmq_msg_more (&msg));
-        TEST_ASSERT_EQUAL_UINT (sizeof (uint64_t), zmq_msg_size (&msg));
-
-        if (value_ && *value_)
-            memcpy (&(*value_)[i], zmq_msg_data (&msg), sizeof (uint64_t));
-        zmq_msg_close (&msg);
-    }
-
-    //  Second-to-last frame in message contains local address
-    TEST_ASSERT_SUCCESS_ERRNO (
-      receive_monitor_address (monitor_, local_address_, true));
-
-    //  Last frame in message contains remote address
-    TEST_ASSERT_SUCCESS_ERRNO (
-      receive_monitor_address (monitor_, remote_address_, false));
-
-    return event;
-}
-
-static int64_t get_monitor_event_with_timeout_v2 (void *monitor_,
-                                                  uint64_t **value_,
-                                                  char **local_address_,
-                                                  char **remote_address_,
-                                                  int timeout_)
-{
-    int64_t res;
-    if (timeout_ == -1) {
-        // process infinite timeout in small steps to allow the user
-        // to see some information on the console
-
-        int timeout_step = 250;
-        int wait_time = 0;
-        zmq_setsockopt (monitor_, ZMQ_RCVTIMEO, &timeout_step,
-                        sizeof (timeout_step));
-        while ((res = get_monitor_event_internal_v2 (
-                  monitor_, value_, local_address_, remote_address_, 0))
-               == -1) {
-            wait_time += timeout_step;
-            fprintf (stderr, "Still waiting for monitor event after %i ms\n",
-                     wait_time);
-        }
-    } else {
-        zmq_setsockopt (monitor_, ZMQ_RCVTIMEO, &timeout_, sizeof (timeout_));
-        res = get_monitor_event_internal_v2 (monitor_, value_, local_address_,
-                                             remote_address_, 0);
-    }
-    int timeout_infinite = -1;
-    zmq_setsockopt (monitor_, ZMQ_RCVTIMEO, &timeout_infinite,
-                    sizeof (timeout_infinite));
-    return res;
-}
-
-int64_t get_monitor_event_v2 (void *monitor_,
-                              uint64_t **value_,
-                              char **local_address_,
-                              char **remote_address_)
-{
-    return get_monitor_event_with_timeout_v2 (monitor_, value_, local_address_,
-                                              remote_address_, -1);
-}
-
-void expect_monitor_event_v2 (void *monitor_,
-                              int64_t expected_event_,
-                              const char *expected_local_address_,
-                              const char *expected_remote_address_)
-{
-    char *local_address = NULL;
-    char *remote_address = NULL;
-    int64_t event = get_monitor_event_v2 (
-      monitor_, NULL, expected_local_address_ ? &local_address : NULL,
-      expected_remote_address_ ? &remote_address : NULL);
-    bool failed = false;
-    char buf[256];
-    char *pos = buf;
-    if (event != expected_event_) {
-        pos += snprintf (pos, sizeof buf - (pos - buf),
-                         "Expected monitor event %llx, but received %llx\n",
-                         static_cast<long long> (expected_event_),
-                         static_cast<long long> (event));
-        failed = true;
-    }
-    if (expected_local_address_
-        && 0 != strcmp (local_address, expected_local_address_)) {
-        pos += snprintf (pos, sizeof buf - (pos - buf),
-                         "Expected local address %s, but received %s\n",
-                         expected_local_address_, local_address);
-    }
-    if (expected_remote_address_
-        && 0 != strcmp (remote_address, expected_remote_address_)) {
-        snprintf (pos, sizeof buf - (pos - buf),
-                  "Expected remote address %s, but received %s\n",
-                  expected_remote_address_, remote_address);
-    }
-    free (local_address);
-    free (remote_address);
-    TEST_ASSERT_FALSE_MESSAGE (failed, buf);
-}
-
-
-const char *get_zmqEventName (uint64_t event)
-{
-    switch (event) {
-        case ZMQ_EVENT_CONNECTED:
-            return "CONNECTED";
-        case ZMQ_EVENT_CONNECT_DELAYED:
-            return "CONNECT_DELAYED";
-        case ZMQ_EVENT_CONNECT_RETRIED:
-            return "CONNECT_RETRIED";
-        case ZMQ_EVENT_LISTENING:
-            return "LISTENING";
-        case ZMQ_EVENT_BIND_FAILED:
-            return "BIND_FAILED";
-        case ZMQ_EVENT_ACCEPTED:
-            return "ACCEPTED";
-        case ZMQ_EVENT_ACCEPT_FAILED:
-            return "ACCEPT_FAILED";
-        case ZMQ_EVENT_CLOSED:
-            return "CLOSED";
-        case ZMQ_EVENT_CLOSE_FAILED:
-            return "CLOSE_FAILED";
-        case ZMQ_EVENT_DISCONNECTED:
-            return "DISCONNECTED";
-        case ZMQ_EVENT_MONITOR_STOPPED:
-            return "MONITOR_STOPPED";
-        case ZMQ_EVENT_HANDSHAKE_FAILED_NO_DETAIL:
-            return "HANDSHAKE_FAILED_NO_DETAIL";
-        case ZMQ_EVENT_HANDSHAKE_SUCCEEDED:
-            return "HANDSHAKE_SUCCEEDED";
-        case ZMQ_EVENT_HANDSHAKE_FAILED_PROTOCOL:
-            return "HANDSHAKE_FAILED_PROTOCOL";
-        case ZMQ_EVENT_HANDSHAKE_FAILED_AUTH:
-            return "HANDSHAKE_FAILED_AUTH";
-        default:
-            return "UNKNOWN";
-    }
-}
-
-void print_events (void *socket, int timeout, int limit)
-{
-    // print events received
-    int value;
-    char *event_address;
-    int event =
-      get_monitor_event_with_timeout (socket, &value, &event_address, timeout);
-    int i = 0;
-    ;
-    while ((event != -1) && (++i < limit)) {
-        const char *eventName = get_zmqEventName (event);
-        printf ("Got event: %s\n", eventName);
-        event = get_monitor_event_with_timeout (socket, &value, &event_address,
-                                                timeout);
-    }
-}
diff --git a/libs/libzmq/tests/testutil_monitoring.hpp b/libs/libzmq/tests/testutil_monitoring.hpp
deleted file mode 100644
index eb6817d..0000000
--- a/libs/libzmq/tests/testutil_monitoring.hpp
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __TESTUTIL_MONITORING_HPP_INCLUDED__
-#define __TESTUTIL_MONITORING_HPP_INCLUDED__
-
-#include "../include/zmq.h"
-#include "../src/stdint.hpp"
-
-#include <stddef.h>
-
-//  General, i.e. non-security specific, monitor utilities
-
-int get_monitor_event_with_timeout (void *monitor_,
-                                    int *value_,
-                                    char **address_,
-                                    int timeout_);
-
-//  Read one event off the monitor socket; return value and address
-//  by reference, if not null, and event number by value. Returns -1
-//  in case of error.
-int get_monitor_event (void *monitor_, int *value_, char **address_);
-
-void expect_monitor_event (void *monitor_, int expected_event_);
-
-void print_unexpected_event_stderr (int event_,
-                                    int err_,
-                                    int expected_event_,
-                                    int expected_err_);
-
-//  expects that one or more occurrences of the expected event are received
-//  via the specified socket monitor
-//  returns the number of occurrences of the expected event
-//  interrupts, if a ZMQ_EVENT_HANDSHAKE_FAILED_NO_DETAIL with EPIPE, ECONNRESET
-//  or ECONNABORTED occurs; in this case, 0 is returned
-//  this should be investigated further, see
-//  https://github.com/zeromq/libzmq/issues/2644
-int expect_monitor_event_multiple (void *server_mon_,
-                                   int expected_event_,
-                                   int expected_err_ = -1,
-                                   bool optional_ = false);
-
-int64_t get_monitor_event_v2 (void *monitor_,
-                              uint64_t **value_,
-                              char **local_address_,
-                              char **remote_address_);
-
-void expect_monitor_event_v2 (void *monitor_,
-                              int64_t expected_event_,
-                              const char *expected_local_address_ = NULL,
-                              const char *expected_remote_address_ = NULL);
-
-
-const char *get_zmqEventName (uint64_t event);
-void print_events (void *socket, int timeout, int limit);
-
-#endif
diff --git a/libs/libzmq/tests/testutil_security.cpp b/libs/libzmq/tests/testutil_security.cpp
deleted file mode 100644
index bb6efb2..0000000
--- a/libs/libzmq/tests/testutil_security.cpp
+++ /dev/null
@@ -1,416 +0,0 @@
-/*
-    Copyright (c) 2007-2019 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "testutil_security.hpp"
-
-#include <stdlib.h>
-#include <string.h>
-
-const char *test_zap_domain = "ZAPTEST";
-
-void socket_config_null_client (void *server_, void *server_secret_)
-{
-    LIBZMQ_UNUSED (server_);
-    LIBZMQ_UNUSED (server_secret_);
-}
-
-void socket_config_null_server (void *server_, void *server_secret_)
-{
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (
-      server_, ZMQ_ZAP_DOMAIN, test_zap_domain, strlen (test_zap_domain)));
-#ifdef ZMQ_ZAP_ENFORCE_DOMAIN
-    int required = server_secret_ ? *static_cast<int *> (server_secret_) : 0;
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (server_, ZMQ_ZAP_ENFORCE_DOMAIN,
-                                               &required, sizeof (int)));
-#else
-    LIBZMQ_UNUSED (server_secret_);
-#endif
-}
-
-static const char test_plain_username[] = "testuser";
-static const char test_plain_password[] = "testpass";
-
-void socket_config_plain_client (void *server_, void *server_secret_)
-{
-    LIBZMQ_UNUSED (server_secret_);
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (server_, ZMQ_PLAIN_PASSWORD, test_plain_password, 8));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (server_, ZMQ_PLAIN_USERNAME, test_plain_username, 8));
-}
-
-void socket_config_plain_server (void *server_, void *server_secret_)
-{
-    LIBZMQ_UNUSED (server_secret_);
-
-    int as_server = 1;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (server_, ZMQ_PLAIN_SERVER, &as_server, sizeof (int)));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (
-      server_, ZMQ_ZAP_DOMAIN, test_zap_domain, strlen (test_zap_domain)));
-}
-
-char valid_client_public[41];
-char valid_client_secret[41];
-char valid_server_public[41];
-char valid_server_secret[41];
-
-void setup_testutil_security_curve ()
-{
-    //  Generate new keypairs for these tests
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_curve_keypair (valid_client_public, valid_client_secret));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_curve_keypair (valid_server_public, valid_server_secret));
-}
-
-void socket_config_curve_server (void *server_, void *server_secret_)
-{
-    int as_server = 1;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (server_, ZMQ_CURVE_SERVER, &as_server, sizeof (int)));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (server_, ZMQ_CURVE_SECRETKEY, server_secret_, 41));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (
-      server_, ZMQ_ZAP_DOMAIN, test_zap_domain, strlen (test_zap_domain)));
-
-#ifdef ZMQ_ZAP_ENFORCE_DOMAIN
-    int required = 1;
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (server_, ZMQ_ZAP_ENFORCE_DOMAIN,
-                                               &required, sizeof (int)));
-#endif
-}
-
-void socket_config_curve_client (void *client_, void *data_)
-{
-    const curve_client_data_t *const curve_client_data =
-      static_cast<const curve_client_data_t *> (data_);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (
-      client_, ZMQ_CURVE_SERVERKEY, curve_client_data->server_public, 41));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (
-      client_, ZMQ_CURVE_PUBLICKEY, curve_client_data->client_public, 41));
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (
-      client_, ZMQ_CURVE_SECRETKEY, curve_client_data->client_secret, 41));
-}
-
-void *zap_requests_handled;
-
-void zap_handler_generic (zap_protocol_t zap_protocol_,
-                          const char *expected_routing_id_)
-{
-    void *control = zmq_socket (get_test_context (), ZMQ_REQ);
-    TEST_ASSERT_NOT_NULL (control);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_connect (control, "inproc://handler-control"));
-
-    void *handler = zmq_socket (get_test_context (), ZMQ_REP);
-    TEST_ASSERT_NOT_NULL (handler);
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (handler, "inproc://zeromq.zap.01"));
-
-    //  Signal main thread that we are ready
-    send_string_expect_success (control, "GO", 0);
-
-    zmq_pollitem_t items[] = {
-      {control, 0, ZMQ_POLLIN, 0},
-      {handler, 0, ZMQ_POLLIN, 0},
-    };
-
-    // if ordered not to receive the request, ignore the second poll item
-    const int numitems = (zap_protocol_ == zap_do_not_recv) ? 1 : 2;
-
-    //  Process ZAP requests forever
-    while (zmq_poll (items, numitems, -1) >= 0) {
-        if (items[0].revents & ZMQ_POLLIN) {
-            recv_string_expect_success (control, "STOP", 0);
-            break; //  Terminating - main thread signal
-        }
-        if (!(items[1].revents & ZMQ_POLLIN))
-            continue;
-
-        char *version = s_recv (handler);
-        if (!version)
-            break; //  Terminating - peer's socket closed
-        if (zap_protocol_ == zap_disconnect) {
-            free (version);
-            break;
-        }
-
-        char *sequence = s_recv (handler);
-        char *domain = s_recv (handler);
-        char *address = s_recv (handler);
-        char *routing_id = s_recv (handler);
-        char *mechanism = s_recv (handler);
-        bool authentication_succeeded = false;
-        if (streq (mechanism, "CURVE")) {
-            uint8_t client_key[32];
-            TEST_ASSERT_EQUAL_INT (32, TEST_ASSERT_SUCCESS_ERRNO (zmq_recv (
-                                         handler, client_key, 32, 0)));
-
-            char client_key_text[41];
-            zmq_z85_encode (client_key_text, client_key, 32);
-
-            authentication_succeeded =
-              streq (client_key_text, valid_client_public);
-        } else if (streq (mechanism, "PLAIN")) {
-            char client_username[32];
-            int size = TEST_ASSERT_SUCCESS_ERRNO (
-              zmq_recv (handler, client_username, 32, 0));
-            client_username[size] = 0;
-
-            char client_password[32];
-            size = TEST_ASSERT_SUCCESS_ERRNO (
-              zmq_recv (handler, client_password, 32, 0));
-            client_password[size] = 0;
-
-            authentication_succeeded =
-              streq (test_plain_username, client_username)
-              && streq (test_plain_password, client_password);
-        } else if (streq (mechanism, "NULL")) {
-            authentication_succeeded = true;
-        } else {
-            char msg[128];
-            printf ("Unsupported mechanism: %s\n", mechanism);
-            TEST_FAIL_MESSAGE (msg);
-        }
-
-        TEST_ASSERT_EQUAL_STRING ("1.0", version);
-        TEST_ASSERT_EQUAL_STRING (expected_routing_id_, routing_id);
-
-        send_string_expect_success (
-          handler,
-          zap_protocol_ == zap_wrong_version ? "invalid_version" : version,
-          ZMQ_SNDMORE);
-        send_string_expect_success (handler,
-                                    zap_protocol_ == zap_wrong_request_id
-                                      ? "invalid_request_id"
-                                      : sequence,
-                                    ZMQ_SNDMORE);
-
-        if (authentication_succeeded) {
-            const char *status_code;
-            switch (zap_protocol_) {
-                case zap_status_internal_error:
-                    status_code = "500";
-                    break;
-                case zap_status_temporary_failure:
-                    status_code = "300";
-                    break;
-                case zap_status_invalid:
-                    status_code = "invalid_status";
-                    break;
-                default:
-                    status_code = "200";
-            }
-            send_string_expect_success (handler, status_code, ZMQ_SNDMORE);
-            send_string_expect_success (handler, "OK", ZMQ_SNDMORE);
-            send_string_expect_success (handler, "anonymous", ZMQ_SNDMORE);
-            if (zap_protocol_ == zap_too_many_parts) {
-                send_string_expect_success (handler, "", ZMQ_SNDMORE);
-            }
-            if (zap_protocol_ != zap_do_not_send)
-                send_string_expect_success (handler, "", 0);
-        } else {
-            send_string_expect_success (handler, "400", ZMQ_SNDMORE);
-            send_string_expect_success (handler, "Invalid client public key",
-                                        ZMQ_SNDMORE);
-            send_string_expect_success (handler, "", ZMQ_SNDMORE);
-            if (zap_protocol_ != zap_do_not_send)
-                send_string_expect_success (handler, "", 0);
-        }
-        free (version);
-        free (sequence);
-        free (domain);
-        free (address);
-        free (routing_id);
-        free (mechanism);
-
-        zmq_atomic_counter_inc (zap_requests_handled);
-    }
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_unbind (handler, "inproc://zeromq.zap.01"));
-    close_zero_linger (handler);
-
-    if (zap_protocol_ != zap_disconnect) {
-        send_string_expect_success (control, "STOPPED", 0);
-    }
-    close_zero_linger (control);
-}
-
-void zap_handler (void *)
-{
-    zap_handler_generic (zap_ok);
-}
-
-static void setup_handshake_socket_monitor (void *server_,
-                                            void **server_mon_,
-                                            const char *monitor_endpoint_)
-{
-    //  Monitor handshake events on the server
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_socket_monitor (
-      server_, monitor_endpoint_,
-      ZMQ_EVENT_HANDSHAKE_SUCCEEDED | ZMQ_EVENT_HANDSHAKE_FAILED_NO_DETAIL
-        | ZMQ_EVENT_HANDSHAKE_FAILED_AUTH
-        | ZMQ_EVENT_HANDSHAKE_FAILED_PROTOCOL));
-
-    //  Create socket for collecting monitor events
-    *server_mon_ = test_context_socket (ZMQ_PAIR);
-    int linger = 0;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (*server_mon_, ZMQ_LINGER, &linger, sizeof (linger)));
-
-    //  Connect it to the inproc endpoints so they'll get events
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (*server_mon_, monitor_endpoint_));
-}
-
-void setup_context_and_server_side (void **zap_control_,
-                                    void **zap_thread_,
-                                    void **server_,
-                                    void **server_mon_,
-                                    char *my_endpoint_,
-                                    zmq_thread_fn zap_handler_,
-                                    socket_config_fn socket_config_,
-                                    void *socket_config_data_,
-                                    const char *routing_id_)
-{
-    //  Spawn ZAP handler
-    zap_requests_handled = zmq_atomic_counter_new ();
-    TEST_ASSERT_NOT_NULL (zap_requests_handled);
-
-    *zap_control_ = test_context_socket (ZMQ_REP);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_bind (*zap_control_, "inproc://handler-control"));
-    int linger = 0;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (*zap_control_, ZMQ_LINGER, &linger, sizeof (linger)));
-
-    if (zap_handler_ != NULL) {
-        *zap_thread_ = zmq_threadstart (zap_handler_, NULL);
-
-        recv_string_expect_success (*zap_control_, "GO", 0);
-    } else
-        *zap_thread_ = NULL;
-
-    //  Server socket will accept connections
-    *server_ = test_context_socket (ZMQ_DEALER);
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (*server_, ZMQ_LINGER, &linger, sizeof (linger)));
-    //  As per API by default there's no limit to the size of a message,
-    //  but the sanitizer allocator will barf over a gig or so
-    int64_t max_msg_size = 64 * 1024 * 1024;
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (
-      *server_, ZMQ_MAXMSGSIZE, &max_msg_size, sizeof (int64_t)));
-
-    socket_config_ (*server_, socket_config_data_);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (
-      *server_, ZMQ_ROUTING_ID, routing_id_, strlen (routing_id_)));
-
-    bind_loopback_ipv4 (*server_, my_endpoint_, MAX_SOCKET_STRING);
-
-    const char server_monitor_endpoint[] = "inproc://monitor-server";
-    setup_handshake_socket_monitor (*server_, server_mon_,
-                                    server_monitor_endpoint);
-}
-
-void shutdown_context_and_server_side (void *zap_thread_,
-                                       void *server_,
-                                       void *server_mon_,
-                                       void *zap_control_,
-                                       bool zap_handler_stopped_)
-{
-    if (zap_thread_ && !zap_handler_stopped_) {
-        send_string_expect_success (zap_control_, "STOP", 0);
-        recv_string_expect_success (zap_control_, "STOPPED", 0);
-        TEST_ASSERT_SUCCESS_ERRNO (
-          zmq_unbind (zap_control_, "inproc://handler-control"));
-    }
-    test_context_socket_close (zap_control_);
-    zmq_socket_monitor (server_, NULL, 0);
-    test_context_socket_close (server_mon_);
-    test_context_socket_close (server_);
-
-    //  Wait until ZAP handler terminates
-    if (zap_thread_)
-        zmq_threadclose (zap_thread_);
-
-    zmq_atomic_counter_destroy (&zap_requests_handled);
-}
-
-void *create_and_connect_client (char *my_endpoint_,
-                                 socket_config_fn socket_config_,
-                                 void *socket_config_data_,
-                                 void **client_mon_)
-{
-    void *client = test_context_socket (ZMQ_DEALER);
-    //  As per API by default there's no limit to the size of a message,
-    //  but the sanitizer allocator will barf over a gig or so
-    int64_t max_msg_size = 64 * 1024 * 1024;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (client, ZMQ_MAXMSGSIZE, &max_msg_size, sizeof (int64_t)));
-
-    socket_config_ (client, socket_config_data_);
-
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (client, my_endpoint_));
-
-    if (client_mon_) {
-        setup_handshake_socket_monitor (client, client_mon_,
-                                        "inproc://client-monitor");
-    }
-
-    return client;
-}
-
-void expect_new_client_bounce_fail (char *my_endpoint_,
-                                    void *server_,
-                                    socket_config_fn socket_config_,
-                                    void *socket_config_data_,
-                                    void **client_mon_,
-                                    int expected_client_event_,
-                                    int expected_client_value_)
-{
-    void *my_client_mon = NULL;
-    TEST_ASSERT_TRUE (client_mon_ == NULL || expected_client_event_ == 0);
-    if (expected_client_event_ != 0)
-        client_mon_ = &my_client_mon;
-    void *client = create_and_connect_client (my_endpoint_, socket_config_,
-                                              socket_config_data_, client_mon_);
-    expect_bounce_fail (server_, client);
-
-    if (expected_client_event_ != 0) {
-        int events_received = 0;
-        events_received = expect_monitor_event_multiple (
-          my_client_mon, expected_client_event_, expected_client_value_, false);
-
-        TEST_ASSERT_EQUAL_INT (1, events_received);
-
-        test_context_socket_close (my_client_mon);
-    }
-
-    test_context_socket_close_zero_linger (client);
-}
diff --git a/libs/libzmq/tests/testutil_security.hpp b/libs/libzmq/tests/testutil_security.hpp
deleted file mode 100644
index 03d0176..0000000
--- a/libs/libzmq/tests/testutil_security.hpp
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
-    Copyright (c) 2007-2017 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __TESTUTIL_SECURITY_HPP_INCLUDED__
-#define __TESTUTIL_SECURITY_HPP_INCLUDED__
-
-#include "testutil_unity.hpp"
-#include "testutil_monitoring.hpp"
-
-//  security test utils
-
-typedef void (socket_config_fn) (void *, void *);
-
-//  NULL specific functions
-void socket_config_null_client (void *server_, void *server_secret_);
-
-void socket_config_null_server (void *server_, void *server_secret_);
-
-//  PLAIN specific functions
-void socket_config_plain_client (void *server_, void *server_secret_);
-
-void socket_config_plain_server (void *server_, void *server_secret_);
-
-//  CURVE specific functions
-
-//  We'll generate random test keys at startup
-extern char valid_client_public[41];
-extern char valid_client_secret[41];
-extern char valid_server_public[41];
-extern char valid_server_secret[41];
-
-void setup_testutil_security_curve ();
-
-void socket_config_curve_server (void *server_, void *server_secret_);
-
-struct curve_client_data_t
-{
-    const char *server_public;
-    const char *client_public;
-    const char *client_secret;
-};
-
-void socket_config_curve_client (void *client_, void *data_);
-
-//  --------------------------------------------------------------------------
-//  This methods receives and validates ZAP requests (allowing or denying
-//  each client connection).
-
-enum zap_protocol_t
-{
-    zap_ok,
-    // ZAP-compliant non-standard cases
-    zap_status_temporary_failure,
-    zap_status_internal_error,
-    // ZAP protocol errors
-    zap_wrong_version,
-    zap_wrong_request_id,
-    zap_status_invalid,
-    zap_too_many_parts,
-    zap_disconnect,
-    zap_do_not_recv,
-    zap_do_not_send
-};
-
-extern void *zap_requests_handled;
-
-void zap_handler_generic (zap_protocol_t zap_protocol_,
-                          const char *expected_routing_id_ = "IDENT");
-
-void zap_handler (void * /*unused_*/);
-
-//  Security-specific monitor event utilities
-
-// assert_* are macros rather than functions, to allow assertion failures be
-// attributed to the causing source code line
-#define assert_no_more_monitor_events_with_timeout(monitor, timeout)                  \
-    {                                                                                 \
-        int event_count = 0;                                                          \
-        int event, err;                                                               \
-        while ((event = get_monitor_event_with_timeout ((monitor), &err, NULL,        \
-                                                        (timeout)))                   \
-               != -1) {                                                               \
-            if (event == ZMQ_EVENT_HANDSHAKE_FAILED_NO_DETAIL                         \
-                && (err == EPIPE || err == ECONNRESET                                 \
-                    || err == ECONNABORTED)) {                                        \
-                fprintf (stderr,                                                      \
-                         "Ignored event (skipping any further events): %x "           \
-                         "(err = %i == %s)\n",                                        \
-                         event, err, zmq_strerror (err));                             \
-                continue;                                                             \
-            }                                                                         \
-            ++event_count;                                                            \
-            /* TODO write this into a buffer and attach to the assertion msg below */ \
-            print_unexpected_event_stderr (event, err, 0, 0);                         \
-        }                                                                             \
-        TEST_ASSERT_EQUAL_INT (0, event_count);                                       \
-    }
-
-void setup_context_and_server_side (
-  void **zap_control_,
-  void **zap_thread_,
-  void **server_,
-  void **server_mon_,
-  char *my_endpoint_,
-  zmq_thread_fn zap_handler_ = &zap_handler,
-  socket_config_fn socket_config_ = &socket_config_curve_server,
-  void *socket_config_data_ = valid_server_secret,
-  const char *routing_id_ = "IDENT");
-
-void shutdown_context_and_server_side (void *zap_thread_,
-                                       void *server_,
-                                       void *server_mon_,
-                                       void *zap_control_,
-                                       bool zap_handler_stopped_ = false);
-
-void *create_and_connect_client (char *my_endpoint_,
-                                 socket_config_fn socket_config_,
-                                 void *socket_config_data_,
-                                 void **client_mon_ = NULL);
-
-void expect_new_client_bounce_fail (char *my_endpoint_,
-                                    void *server_,
-                                    socket_config_fn socket_config_,
-                                    void *socket_config_data_,
-                                    void **client_mon_ = NULL,
-                                    int expected_client_event_ = 0,
-                                    int expected_client_value_ = 0);
-
-#endif
diff --git a/libs/libzmq/tests/testutil_unity.cpp b/libs/libzmq/tests/testutil_unity.cpp
deleted file mode 100644
index 79fda92..0000000
--- a/libs/libzmq/tests/testutil_unity.cpp
+++ /dev/null
@@ -1,335 +0,0 @@
-/*
-    Copyright (c) 2007-2019 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "testutil_unity.hpp"
-
-#include <stdlib.h>
-#include <string.h>
-
-#ifdef _WIN32
-#include <direct.h>
-#else
-#include <unistd.h>
-#endif
-
-int test_assert_success_message_errno_helper (int rc_,
-                                              const char *msg_,
-                                              const char *expr_,
-                                              int line_)
-{
-    if (rc_ == -1) {
-        char buffer[512];
-        buffer[sizeof (buffer) - 1] =
-          0; // to ensure defined behavior with VC++ <= 2013
-        snprintf (buffer, sizeof (buffer) - 1,
-                  "%s failed%s%s%s, errno = %i (%s)", expr_,
-                  msg_ ? " (additional info: " : "", msg_ ? msg_ : "",
-                  msg_ ? ")" : "", zmq_errno (), zmq_strerror (zmq_errno ()));
-        UNITY_TEST_FAIL (line_, buffer);
-    }
-    return rc_;
-}
-
-int test_assert_success_message_raw_errno_helper (
-  int rc_, const char *msg_, const char *expr_, int line_, bool zero)
-{
-    if (rc_ == -1 || (zero && rc_ != 0)) {
-#if defined ZMQ_HAVE_WINDOWS
-        int current_errno = WSAGetLastError ();
-#else
-        int current_errno = errno;
-#endif
-
-        char buffer[512];
-        buffer[sizeof (buffer) - 1] =
-          0; // to ensure defined behavior with VC++ <= 2013
-        snprintf (
-          buffer, sizeof (buffer) - 1, "%s failed%s%s%s with %d, errno = %i/%s",
-          expr_, msg_ ? " (additional info: " : "", msg_ ? msg_ : "",
-          msg_ ? ")" : "", rc_, current_errno, strerror (current_errno));
-        UNITY_TEST_FAIL (line_, buffer);
-    }
-    return rc_;
-}
-
-int test_assert_success_message_raw_zero_errno_helper (int rc_,
-                                                       const char *msg_,
-                                                       const char *expr_,
-                                                       int line_)
-{
-    return test_assert_success_message_raw_errno_helper (rc_, msg_, expr_,
-                                                         line_, true);
-}
-
-int test_assert_failure_message_raw_errno_helper (
-  int rc_, int expected_errno_, const char *msg_, const char *expr_, int line_)
-{
-    char buffer[512];
-    buffer[sizeof (buffer) - 1] =
-      0; // to ensure defined behavior with VC++ <= 2013
-    if (rc_ != -1) {
-        snprintf (buffer, sizeof (buffer) - 1,
-                  "%s was unexpectedly successful%s%s%s, expected "
-                  "errno = %i, actual return value = %i",
-                  expr_, msg_ ? " (additional info: " : "", msg_ ? msg_ : "",
-                  msg_ ? ")" : "", expected_errno_, rc_);
-        UNITY_TEST_FAIL (line_, buffer);
-    } else {
-#if defined ZMQ_HAVE_WINDOWS
-        int current_errno = WSAGetLastError ();
-#else
-        int current_errno = errno;
-#endif
-        if (current_errno != expected_errno_) {
-            snprintf (buffer, sizeof (buffer) - 1,
-                      "%s failed with an unexpected error%s%s%s, expected "
-                      "errno = %i, actual errno = %i",
-                      expr_, msg_ ? " (additional info: " : "",
-                      msg_ ? msg_ : "", msg_ ? ")" : "", expected_errno_,
-                      current_errno);
-            UNITY_TEST_FAIL (line_, buffer);
-        }
-    }
-    return rc_;
-}
-
-void send_string_expect_success (void *socket_, const char *str_, int flags_)
-{
-    const size_t len = str_ ? strlen (str_) : 0;
-    const int rc = zmq_send (socket_, str_, len, flags_);
-    TEST_ASSERT_EQUAL_INT ((int) len, rc);
-}
-
-void recv_string_expect_success (void *socket_, const char *str_, int flags_)
-{
-    const size_t len = str_ ? strlen (str_) : 0;
-    char buffer[255];
-    TEST_ASSERT_LESS_OR_EQUAL_MESSAGE (sizeof (buffer), len,
-                                       "recv_string_expect_success cannot be "
-                                       "used for strings longer than 255 "
-                                       "characters");
-
-    const int rc = TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_recv (socket_, buffer, sizeof (buffer), flags_));
-    TEST_ASSERT_EQUAL_INT ((int) len, rc);
-    if (str_)
-        TEST_ASSERT_EQUAL_STRING_LEN (str_, buffer, len);
-}
-
-static void *internal_manage_test_context (bool init_, bool clear_)
-{
-    static void *test_context = NULL;
-    if (clear_) {
-        TEST_ASSERT_NOT_NULL (test_context);
-        TEST_ASSERT_SUCCESS_ERRNO (zmq_ctx_term (test_context));
-        test_context = NULL;
-    } else {
-        if (init_) {
-            TEST_ASSERT_NULL (test_context);
-            test_context = zmq_ctx_new ();
-            TEST_ASSERT_NOT_NULL (test_context);
-        }
-    }
-    return test_context;
-}
-
-static void internal_manage_test_sockets (void *socket_, bool add_)
-{
-    static void *test_sockets[MAX_TEST_SOCKETS];
-    static size_t test_socket_count = 0;
-    if (!socket_) {
-        TEST_ASSERT_FALSE (add_);
-
-        // force-close all sockets
-        if (test_socket_count) {
-            for (size_t i = 0; i < test_socket_count; ++i) {
-                close_zero_linger (test_sockets[i]);
-            }
-            fprintf (stderr,
-                     "WARNING: Forced closure of %i sockets, this is an "
-                     "implementation error unless the test case failed\n",
-                     static_cast<int> (test_socket_count));
-            test_socket_count = 0;
-        }
-    } else {
-        if (add_) {
-            ++test_socket_count;
-            TEST_ASSERT_LESS_THAN_MESSAGE (MAX_TEST_SOCKETS, test_socket_count,
-                                           "MAX_TEST_SOCKETS must be "
-                                           "increased, or you cannot use the "
-                                           "test context");
-            test_sockets[test_socket_count - 1] = socket_;
-        } else {
-            bool found = false;
-            for (size_t i = 0; i < test_socket_count; ++i) {
-                if (test_sockets[i] == socket_) {
-                    found = true;
-                }
-                if (found) {
-                    if (i < test_socket_count)
-                        test_sockets[i] = test_sockets[i + 1];
-                }
-            }
-            TEST_ASSERT_TRUE_MESSAGE (found,
-                                      "Attempted to close a socket that was "
-                                      "not created by test_context_socket");
-            --test_socket_count;
-        }
-    }
-}
-
-void setup_test_context ()
-{
-    internal_manage_test_context (true, false);
-}
-
-void *get_test_context ()
-{
-    return internal_manage_test_context (false, false);
-}
-
-void teardown_test_context ()
-{
-    // this condition allows an explicit call to teardown_test_context from a
-    // test. if this is never used, it should probably be removed, to detect
-    // misuses
-    if (get_test_context ()) {
-        internal_manage_test_sockets (NULL, false);
-        internal_manage_test_context (false, true);
-    }
-}
-
-void *test_context_socket (int type_)
-{
-    void *const socket = zmq_socket (get_test_context (), type_);
-    TEST_ASSERT_NOT_NULL (socket);
-    internal_manage_test_sockets (socket, true);
-    return socket;
-}
-
-void *test_context_socket_close (void *socket_)
-{
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_close (socket_));
-    internal_manage_test_sockets (socket_, false);
-    return socket_;
-}
-
-void *test_context_socket_close_zero_linger (void *socket_)
-{
-    const int linger = 0;
-    int rc = zmq_setsockopt (socket_, ZMQ_LINGER, &linger, sizeof (linger));
-    TEST_ASSERT_TRUE (rc == 0 || zmq_errno () == ETERM);
-    return test_context_socket_close (socket_);
-}
-
-void test_bind (void *socket_,
-                const char *bind_address_,
-                char *my_endpoint_,
-                size_t len_)
-{
-    TEST_ASSERT_SUCCESS_ERRNO (zmq_bind (socket_, bind_address_));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_getsockopt (socket_, ZMQ_LAST_ENDPOINT, my_endpoint_, &len_));
-}
-
-void bind_loopback (void *socket_, int ipv6_, char *my_endpoint_, size_t len_)
-{
-    if (ipv6_ && !is_ipv6_available ()) {
-        TEST_IGNORE_MESSAGE ("ipv6 is not available");
-    }
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_setsockopt (socket_, ZMQ_IPV6, &ipv6_, sizeof (int)));
-
-    test_bind (socket_, ipv6_ ? "tcp://[::1]:*" : "tcp://127.0.0.1:*",
-               my_endpoint_, len_);
-}
-
-void bind_loopback_ipv4 (void *socket_, char *my_endpoint_, size_t len_)
-{
-    bind_loopback (socket_, false, my_endpoint_, len_);
-}
-
-void bind_loopback_ipv6 (void *socket_, char *my_endpoint_, size_t len_)
-{
-    bind_loopback (socket_, true, my_endpoint_, len_);
-}
-
-void bind_loopback_ipc (void *socket_, char *my_endpoint_, size_t len_)
-{
-    if (!zmq_has ("ipc")) {
-        TEST_IGNORE_MESSAGE ("ipc is not available");
-    }
-
-    test_bind (socket_, "ipc://*", my_endpoint_, len_);
-}
-
-void bind_loopback_tipc (void *socket_, char *my_endpoint_, size_t len_)
-{
-    if (!is_tipc_available ()) {
-        TEST_IGNORE_MESSAGE ("tipc is not available");
-    }
-
-    test_bind (socket_, "tipc://<*>", my_endpoint_, len_);
-}
-
-#if defined(ZMQ_HAVE_IPC)
-void make_random_ipc_endpoint (char *out_endpoint_)
-{
-#ifdef ZMQ_HAVE_WINDOWS
-    char random_file[MAX_PATH];
-
-    {
-        const errno_t rc = tmpnam_s (random_file);
-        TEST_ASSERT_EQUAL (0, rc);
-    }
-
-    // TODO or use CreateDirectoryA and specify permissions?
-    const int rc = _mkdir (random_file);
-    TEST_ASSERT_EQUAL (0, rc);
-
-    strcat (random_file, "/ipc");
-
-#else
-    char random_file[16];
-    strcpy (random_file, "tmpXXXXXX");
-
-#ifdef HAVE_MKDTEMP
-    TEST_ASSERT_TRUE (mkdtemp (random_file));
-    strcat (random_file, "/ipc");
-#else
-    int fd = mkstemp (random_file);
-    TEST_ASSERT_TRUE (fd != -1);
-    close (fd);
-#endif
-#endif
-
-    strcpy (out_endpoint_, "ipc://");
-    strcat (out_endpoint_, random_file);
-}
-#endif
diff --git a/libs/libzmq/tests/testutil_unity.hpp b/libs/libzmq/tests/testutil_unity.hpp
deleted file mode 100644
index b00c0c8..0000000
--- a/libs/libzmq/tests/testutil_unity.hpp
+++ /dev/null
@@ -1,280 +0,0 @@
-#pragma once
-
-/*
-Copyright (c) 2018 Contributors as noted in the AUTHORS file
-
-This file is part of libzmq, the ZeroMQ core engine in C++.
-
-libzmq is free software; you can redistribute it and/or modify it under
-the terms of the GNU Lesser General Public License (LGPL) as published
-by the Free Software Foundation; either version 3 of the License, or
-(at your option) any later version.
-
-As a special exception, the Contributors give you permission to link
-this library with independent modules to produce an executable,
-regardless of the license terms of these independent modules, and to
-copy and distribute the resulting executable under terms of your choice,
-provided that you also meet, for each linked independent module, the
-terms and conditions of the license of that module. An independent
-module is a module which is not derived from or based on this library.
-If you modify this library, you must extend this exception to your
-version of the library.
-
-libzmq is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-License for more details.
-
-You should have received a copy of the GNU Lesser General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "../include/zmq.h"
-
-#include "testutil.hpp"
-
-#include <unity.h>
-
-// Internal helper functions that are not intended to be directly called from
-// tests. They must be declared in the header since they are used by macros.
-
-int test_assert_success_message_errno_helper (int rc_,
-                                              const char *msg_,
-                                              const char *expr_,
-                                              int line);
-
-int test_assert_success_message_raw_errno_helper (
-  int rc_, const char *msg_, const char *expr_, int line, bool zero_ = false);
-
-int test_assert_success_message_raw_zero_errno_helper (int rc_,
-                                                       const char *msg_,
-                                                       const char *expr_,
-                                                       int line);
-
-int test_assert_failure_message_raw_errno_helper (
-  int rc_, int expected_errno_, const char *msg_, const char *expr_, int line);
-
-/////////////////////////////////////////////////////////////////////////////
-// Macros extending Unity's TEST_ASSERT_* macros in a similar fashion.
-/////////////////////////////////////////////////////////////////////////////
-
-// For TEST_ASSERT_SUCCESS_ERRNO, TEST_ASSERT_SUCCESS_MESSAGE_ERRNO and
-// TEST_ASSERT_FAILURE_ERRNO, 'expr' must be an expression evaluating
-// to a result in the style of a libzmq API function, i.e. an integer which
-// is non-negative in case of success, and -1 in case of a failure, and sets
-// the value returned by zmq_errno () to the error code.
-// TEST_ASSERT_SUCCESS_RAW_ERRNO and TEST_ASSERT_FAILURE_RAW_ERRNO are similar,
-// but used with the native socket API functions, and expect that the error
-// code can be retrieved in the native way (i.e. WSAGetLastError on Windows,
-// and errno otherwise).
-
-// Asserts that the libzmq API 'expr' is successful. In case of a failure, the
-// assertion message includes the literal 'expr', the error number as
-// determined by zmq_errno(), and the additional 'msg'.
-// In case of success, the result of the macro is the result of 'expr'.
-#define TEST_ASSERT_SUCCESS_MESSAGE_ERRNO(expr, msg)                           \
-    test_assert_success_message_errno_helper (expr, msg, #expr, __LINE__)
-
-// Asserts that the libzmq API 'expr' is successful. In case of a failure, the
-// assertion message includes the literal 'expr' and the error code.
-// A typical use would be:
-//   TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (socket, endpoint));
-// In case of success, the result of the macro is the result of 'expr'.
-//
-// If an additional message should be displayed in case of a failure, use
-// TEST_ASSERT_SUCCESS_MESSAGE_ERRNO.
-#define TEST_ASSERT_SUCCESS_ERRNO(expr)                                        \
-    test_assert_success_message_errno_helper (expr, NULL, #expr, __LINE__)
-
-// Asserts that the socket API 'expr' is successful. In case of a failure, the
-// assertion message includes the literal 'expr' and the error code.
-// A typical use would be:
-//   TEST_ASSERT_SUCCESS_RAW_ERRNO (send (fd, buffer, 64, 0));
-// In case of success, the result of the macro is the result of 'expr'.
-// Success is strictly defined by a return value different from -1, as opposed
-// to checking that it is 0, like TEST_ASSERT_FAILURE_RAW_ZERO_ERRNO does.
-#define TEST_ASSERT_SUCCESS_RAW_ERRNO(expr)                                    \
-    test_assert_success_message_raw_errno_helper (expr, NULL, #expr, __LINE__)
-
-// Asserts that the socket API 'expr' is successful. In case of a failure, the
-// assertion message includes the literal 'expr' and the error code.
-// A typical use would be:
-//   TEST_ASSERT_SUCCESS_RAW_ZERO_ERRNO (send (fd, buffer, 64, 0));
-// In case of success, the result of the macro is the result of 'expr'.
-// Success is strictly defined by a return value of 0, as opposed to checking
-// that it is not -1, like TEST_ASSERT_FAILURE_RAW_ERRNO does.
-#define TEST_ASSERT_SUCCESS_RAW_ZERO_ERRNO(expr)                               \
-    test_assert_success_message_raw_zero_errno_helper (expr, NULL, #expr,      \
-                                                       __LINE__)
-
-// Asserts that the socket API 'expr' is not successful, and the error code is
-// 'error_code'. In case of an unexpected succces, or a failure with an
-// unexpected error code, the assertion message includes the literal 'expr'
-// and, in case of a failure, the actual error code.
-#define TEST_ASSERT_FAILURE_RAW_ERRNO(error_code, expr)                        \
-    test_assert_failure_message_raw_errno_helper (expr, error_code, NULL,      \
-                                                  #expr, __LINE__)
-
-// Asserts that the libzmq API 'expr' is not successful, and the error code is
-// 'error_code'. In case of an unexpected succces, or a failure with an
-// unexpected error code, the assertion message includes the literal 'expr'
-// and, in case of a failure, the actual error code.
-#define TEST_ASSERT_FAILURE_ERRNO(error_code, expr)                            \
-    {                                                                          \
-        int _rc = (expr);                                                      \
-        TEST_ASSERT_EQUAL_INT (-1, _rc);                                       \
-        TEST_ASSERT_EQUAL_INT (error_code, errno);                             \
-    }
-
-/////////////////////////////////////////////////////////////////////////////
-// Utility functions for testing sending and receiving.
-/////////////////////////////////////////////////////////////////////////////
-
-// Sends a string via a libzmq socket, and expects the operation to be
-// successful (the meaning of which depends on the socket type and configured
-// options, and might include dropping the message). Otherwise, a Unity test
-// assertion is triggered.
-// 'socket_' must be the libzmq socket to use for sending.
-// 'str_' must be a 0-terminated string.
-// 'flags_' are as documented by the zmq_send function.
-void send_string_expect_success (void *socket_, const char *str_, int flags_);
-
-// Receives a message via a libzmq socket, and expects the operation to be
-// successful, and the message to be a given string. Otherwise, a Unity test
-// assertion is triggered.
-// 'socket_' must be the libzmq socket to use for receiving.
-// 'str_' must be a 0-terminated string.
-// 'flags_' are as documented by the zmq_recv function.
-void recv_string_expect_success (void *socket_, const char *str_, int flags_);
-
-// Sends a byte array via a libzmq socket, and expects the operation to be
-// successful (the meaning of which depends on the socket type and configured
-// options, and might include dropping the message). Otherwise, a Unity test
-// assertion is triggered.
-// 'socket_' must be the libzmq socket to use for sending.
-// 'array_' must be a C uint8_t array. The array size is automatically
-// determined via template argument deduction.
-// 'flags_' are as documented by the zmq_send function.
-template <size_t SIZE>
-void send_array_expect_success (void *socket_,
-                                const uint8_t (&array_)[SIZE],
-                                int flags_)
-{
-    const int rc = zmq_send (socket_, array_, SIZE, flags_);
-    TEST_ASSERT_EQUAL_INT (static_cast<int> (SIZE), rc);
-}
-
-// Receives a message via a libzmq socket, and expects the operation to be
-// successful, and the message to be a given byte array. Otherwise, a Unity
-// test assertion is triggered.
-// 'socket_' must be the libzmq socket to use for receiving.
-// 'array_' must be a C uint8_t array. The array size is automatically
-// determined via template argument deduction.
-// 'flags_' are as documented by the zmq_recv function.
-template <size_t SIZE>
-void recv_array_expect_success (void *socket_,
-                                const uint8_t (&array_)[SIZE],
-                                int flags_)
-{
-    char buffer[255];
-    TEST_ASSERT_LESS_OR_EQUAL_MESSAGE (sizeof (buffer), SIZE,
-                                       "recv_string_expect_success cannot be "
-                                       "used for strings longer than 255 "
-                                       "characters");
-
-    const int rc = TEST_ASSERT_SUCCESS_ERRNO (
-      zmq_recv (socket_, buffer, sizeof (buffer), flags_));
-    TEST_ASSERT_EQUAL_INT (static_cast<int> (SIZE), rc);
-    TEST_ASSERT_EQUAL_UINT8_ARRAY (array_, buffer, SIZE);
-}
-
-/////////////////////////////////////////////////////////////////////////////
-// Utility function for handling a test libzmq context, that is set up and
-// torn down for each Unity test case, such that a clean context is available
-// for each test case, and some consistency checks can be performed.
-/////////////////////////////////////////////////////////////////////////////
-
-// Use this is an test executable to perform a default setup and teardown of
-// the test context, which is appropriate for many libzmq test cases.
-#define SETUP_TEARDOWN_TESTCONTEXT                                             \
-    void setUp () { setup_test_context (); }                                   \
-    void tearDown () { teardown_test_context (); }
-
-// The maximum number of sockets that can be managed by the test context.
-#define MAX_TEST_SOCKETS 128
-
-// Expected to be called during Unity's setUp function.
-void setup_test_context ();
-
-// Returns the test context, e.g. to create sockets in another thread using
-// zmq_socket, or set context options.
-void *get_test_context ();
-
-// Expected to be called during Unity's tearDown function. Checks that all
-// sockets created via test_context_socket have been properly closed using
-// test_context_socket_close or test_context_socket_close_zero_linger, and generates a warning otherwise.
-void teardown_test_context ();
-
-// Creates a libzmq socket on the test context, and tracks its lifecycle.
-// You MUST use test_context_socket_close or test_context_socket_close_zero_linger
-// to close a socket created via this function, otherwise undefined behaviour
-// will result.
-// CAUTION: this function is not thread-safe, and may only be used from the
-// main thread.
-void *test_context_socket (int type_);
-
-// Closes a socket created via test_context_socket.
-// CAUTION: this function is not thread-safe, and may only be used from the
-// main thread.
-void *test_context_socket_close (void *socket_);
-
-// Closes a socket created via test_context_socket after setting its linger
-// timeout to 0.
-// CAUTION: this function is not thread-safe, and may only be used from the
-// main thread.
-void *test_context_socket_close_zero_linger (void *socket_);
-
-/////////////////////////////////////////////////////////////////////////////
-// Utility function for handling wildcard binds.
-/////////////////////////////////////////////////////////////////////////////
-
-// All function binds a socket to some wildcard address, and retrieve the bound
-// endpoint via the ZMQ_LAST_ENDPOINT socket option to a given buffer.
-// Triggers a Unity test assertion in case of a failure (including the buffer
-// being too small for the resulting endpoint string).
-
-// Binds to an explicitly given (wildcard) address.
-// TODO redesign such that this function is not necessary to be exposed, but
-// the protocol to use is rather specified via an enum value
-void test_bind (void *socket_,
-                const char *bind_address_,
-                char *my_endpoint_,
-                size_t len_);
-
-// Binds to a tcp endpoint using the ipv4 or ipv6 loopback wildcard address.
-void bind_loopback (void *socket_, int ipv6_, char *my_endpoint_, size_t len_);
-
-typedef void (*bind_function_t) (void *socket_,
-                                 char *my_endpoint_,
-                                 size_t len_);
-
-// Binds to a tcp endpoint using the ipv4 loopback wildcard address.
-void bind_loopback_ipv4 (void *socket_, char *my_endpoint_, size_t len_);
-
-// Binds to a tcp endpoint using the ipv6 loopback wildcard address.
-void bind_loopback_ipv6 (void *socket_, char *my_endpoint_, size_t len_);
-
-// Binds to an ipc endpoint using the ipc wildcard address.
-// Note that the returned address cannot be reused to bind a second socket.
-// If you need to do this, use make_random_ipc_endpoint instead.
-void bind_loopback_ipc (void *socket_, char *my_endpoint_, size_t len_);
-
-// Binds to an ipc endpoint using the tipc wildcard address.
-void bind_loopback_tipc (void *socket_, char *my_endpoint_, size_t len_);
-
-#if defined(ZMQ_HAVE_IPC)
-// utility function to create a random IPC endpoint, similar to what a ipc://*
-// wildcard binding does, but in a way it can be reused for multiple binds
-// TODO also add a len parameter here
-void make_random_ipc_endpoint (char *out_endpoint_);
-#endif
diff --git a/libs/libzmq/tools/curve_keygen.cpp b/libs/libzmq/tools/curve_keygen.cpp
deleted file mode 100644
index ff495c4..0000000
--- a/libs/libzmq/tools/curve_keygen.cpp
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
-    Copyright (c) 2007-2016 Contributors as noted in the AUTHORS file
-
-    This file is part of libzmq, the ZeroMQ core engine in C++.
-
-    libzmq is free software; you can redistribute it and/or modify it under
-    the terms of the GNU Lesser General Public License (LGPL) as published
-    by the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    As a special exception, the Contributors give you permission to link
-    this library with independent modules to produce an executable,
-    regardless of the license terms of these independent modules, and to
-    copy and distribute the resulting executable under terms of your choice,
-    provided that you also meet, for each linked independent module, the
-    terms and conditions of the license of that module. An independent
-    module is a module which is not derived from or based on this library.
-    If you modify this library, you must extend this exception to your
-    version of the library.
-
-    libzmq is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-    License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include <stdlib.h>
-#include <assert.h>
-#include <zmq.h>
-
-int main (void)
-{
-    puts ("This tool generates a CurveZMQ keypair, as two printable strings "
-          "you can");
-    puts ("use in configuration files or source code. The encoding uses Z85, "
-          "which");
-    puts (
-      "is a base-85 format that is described in 0MQ RFC 32, and which has an");
-    puts ("implementation in the z85_codec.h source used by this tool. The "
-          "keypair");
-    puts (
-      "always works with the secret key held by one party and the public key");
-    puts ("distributed (securely!) to peers wishing to connect to it.");
-
-    char public_key[41];
-    char secret_key[41];
-    if (zmq_curve_keypair (public_key, secret_key)) {
-        if (zmq_errno () == ENOTSUP)
-            puts ("To use curve_keygen, please install libsodium and then "
-                  "rebuild libzmq.");
-        exit (1);
-    }
-
-    puts ("\n== CURVE PUBLIC KEY ==");
-    puts (public_key);
-
-    puts ("\n== CURVE SECRET KEY ==");
-    puts (secret_key);
-
-    exit (0);
-}
diff --git a/libs/libzmq/unittests/CMakeLists.txt b/libs/libzmq/unittests/CMakeLists.txt
deleted file mode 100644
index 7132f00..0000000
--- a/libs/libzmq/unittests/CMakeLists.txt
+++ /dev/null
@@ -1,73 +0,0 @@
-# CMake build script for ZeroMQ unit tests
-cmake_minimum_required(VERSION "2.8.1")
-
-set(unittests
-    unittest_ypipe
-    unittest_poller
-    unittest_mtrie
-    unittest_ip_resolver
-    unittest_udp_address
-    unittest_radix_tree
-    unittest_curve_encoding)
-
-# if(ENABLE_DRAFTS) list(APPEND tests ) endif(ENABLE_DRAFTS)
-
-# add location of platform.hpp for Windows builds
-if(WIN32)
-  add_definitions(-DZMQ_CUSTOM_PLATFORM_HPP)
-  add_definitions(-D_WINSOCK_DEPRECATED_NO_WARNINGS)
-  # Same name on 64bit systems
-  link_libraries(ws2_32.lib)
-endif()
-
-include_directories("${ZeroMQ_SOURCE_DIR}/include" "${ZeroMQ_SOURCE_DIR}/src" "${ZeroMQ_BINARY_DIR}")
-include_directories("${ZeroMQ_SOURCE_DIR}/external/unity")
-
-foreach(test ${unittests})
-  # target_sources not supported before CMake 3.1
-  add_executable(${test} ${test}.cpp "unittest_resolver_common.hpp")
-
-  # per-test directories not generated on OS X / Darwin
-  if(NOT ${CMAKE_CXX_COMPILER_ID} MATCHES "Clang.*")
-    link_directories(${test} PRIVATE "${ZeroMQ_SOURCE_DIR}/../lib")
-  endif()
-
-  target_link_libraries(${test} testutil-static)
-
-  if(RT_LIBRARY)
-    target_link_libraries(${test} ${RT_LIBRARY})
-  endif()
-
-  if(CMAKE_SYSTEM_NAME MATCHES "QNX")
-    target_link_libraries(${test} socket)
-    target_link_libraries(${test} m)
-  endif()
-
-  if(WIN32)
-    add_test(
-      NAME ${test}
-      WORKING_DIRECTORY ${LIBRARY_OUTPUT_PATH}
-      COMMAND ${test})
-  else()
-    add_test(NAME ${test} COMMAND ${test})
-  endif()
-
-  set_tests_properties(${test} PROPERTIES TIMEOUT 10)
-
-  # TODO prevent libzmq (non-static) being in the list of link libraries at all
-  get_target_property(LIBS ${test} LINK_LIBRARIES)
-  list(REMOVE_ITEM LIBS libzmq)
-  set_target_properties(${test} PROPERTIES LINK_LIBRARIES "${LIBS}")
-endforeach()
-
-# Check whether all tests in the current folder are present TODO duplicated with tests/CMakeLists.txt, define as a
-# function?
-file(READ "${CMAKE_CURRENT_LIST_FILE}" CURRENT_LIST_FILE_CONTENT)
-file(GLOB ALL_TEST_SOURCES "test_*.cpp")
-foreach(TEST_SOURCE ${ALL_TEST_SOURCES})
-  get_filename_component(TESTNAME "${TEST_SOURCE}" NAME_WE)
-  string(REGEX MATCH "${TESTNAME}" MATCH_TESTNAME "${CURRENT_LIST_FILE_CONTENT}")
-  if(NOT MATCH_TESTNAME)
-    message(AUTHOR_WARNING "Test '${TESTNAME}' is not known to CTest.")
-  endif()
-endforeach()
diff --git a/libs/libzmq/unittests/unittest_curve_encoding.cpp b/libs/libzmq/unittests/unittest_curve_encoding.cpp
deleted file mode 100644
index a331476..0000000
--- a/libs/libzmq/unittests/unittest_curve_encoding.cpp
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
-Copyright (c) 2018 Contributors as noted in the AUTHORS file
-
-This file is part of 0MQ.
-
-0MQ is free software; you can redistribute it and/or modify it under
-the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
-(at your option) any later version.
-
-0MQ is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "../tests/testutil_unity.hpp"
-
-// TODO: remove this ugly hack
-#ifdef close
-#undef close
-#endif
-
-#include <curve_mechanism_base.hpp>
-#include <msg.hpp>
-#include <random.hpp>
-
-#include <unity.h>
-
-#include <vector>
-
-void setUp ()
-{
-}
-
-void tearDown ()
-{
-}
-
-void test_roundtrip (zmq::msg_t *msg_)
-{
-#ifdef ZMQ_HAVE_CURVE
-    const std::vector<uint8_t> original (static_cast<uint8_t *> (msg_->data ()),
-                                         static_cast<uint8_t *> (msg_->data ())
-                                           + msg_->size ());
-
-    zmq::curve_encoding_t encoding_client ("CurveZMQMESSAGEC",
-                                           "CurveZMQMESSAGES",
-                                           false);
-    zmq::curve_encoding_t encoding_server ("CurveZMQMESSAGES",
-                                           "CurveZMQMESSAGEC",
-                                           false);
-
-    uint8_t client_public[32];
-    uint8_t client_secret[32];
-    TEST_ASSERT_SUCCESS_ERRNO (
-      crypto_box_keypair (client_public, client_secret));
-
-    uint8_t server_public[32];
-    uint8_t server_secret[32];
-    TEST_ASSERT_SUCCESS_ERRNO (
-      crypto_box_keypair (server_public, server_secret));
-
-    TEST_ASSERT_SUCCESS_ERRNO (
-      crypto_box_beforenm (encoding_client.get_writable_precom_buffer (),
-                           server_public, client_secret));
-    TEST_ASSERT_SUCCESS_ERRNO (
-      crypto_box_beforenm (encoding_server.get_writable_precom_buffer (),
-                           client_public, server_secret));
-
-    TEST_ASSERT_SUCCESS_ERRNO (encoding_client.encode (msg_));
-
-    // TODO: This is hacky...
-    encoding_server.set_peer_nonce (0);
-    int error_event_code;
-    TEST_ASSERT_SUCCESS_ERRNO (
-      encoding_server.decode (msg_, &error_event_code));
-
-    TEST_ASSERT_EQUAL_INT (original.size (), msg_->size ());
-    if (!original.empty ()) {
-        TEST_ASSERT_EQUAL_UINT8_ARRAY (&original[0], msg_->data (),
-                                       original.size ());
-    }
-#else
-    TEST_IGNORE_MESSAGE ("CURVE support is disabled");
-#endif
-}
-
-void test_roundtrip_empty ()
-{
-    zmq::msg_t msg;
-    msg.init ();
-
-    test_roundtrip (&msg);
-
-    msg.close ();
-}
-
-void test_roundtrip_small ()
-{
-    zmq::msg_t msg;
-    msg.init_size (32);
-    memcpy (msg.data (), "0123456789ABCDEF0123456789ABCDEF", 32);
-
-    test_roundtrip (&msg);
-
-    msg.close ();
-}
-
-void test_roundtrip_large ()
-{
-    zmq::msg_t msg;
-    msg.init_size (2048);
-    for (size_t pos = 0; pos < 2048; pos += 32) {
-        memcpy (static_cast<char *> (msg.data ()) + pos,
-                "0123456789ABCDEF0123456789ABCDEF", 32);
-    }
-
-    test_roundtrip (&msg);
-
-    msg.close ();
-}
-
-void test_roundtrip_empty_more ()
-{
-    zmq::msg_t msg;
-    msg.init ();
-    msg.set_flags (zmq::msg_t::more);
-
-    test_roundtrip (&msg);
-    TEST_ASSERT_TRUE (msg.flags () & zmq::msg_t::more);
-
-    msg.close ();
-}
-
-int main ()
-{
-    setup_test_environment ();
-    zmq::random_open ();
-
-    UNITY_BEGIN ();
-
-    RUN_TEST (test_roundtrip_empty);
-    RUN_TEST (test_roundtrip_small);
-    RUN_TEST (test_roundtrip_large);
-
-    RUN_TEST (test_roundtrip_empty_more);
-
-    zmq::random_close ();
-
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/unittests/unittest_ip_resolver.cpp b/libs/libzmq/unittests/unittest_ip_resolver.cpp
deleted file mode 100644
index 3d1fa8c..0000000
--- a/libs/libzmq/unittests/unittest_ip_resolver.cpp
+++ /dev/null
@@ -1,969 +0,0 @@
-/*
-Copyright (c) 2018 Contributors as noted in the AUTHORS file
-
-This file is part of 0MQ.
-
-0MQ is free software; you can redistribute it and/or modify it under
-the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
-(at your option) any later version.
-
-0MQ is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include <unity.h>
-#include "../src/macros.hpp"
-#include "../tests/testutil.hpp"
-#include "../tests/testutil_unity.hpp"
-#include "../unittests/unittest_resolver_common.hpp"
-
-#include <ip_resolver.hpp>
-#include <ip.hpp>
-
-#ifndef _WIN32
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netdb.h>
-#endif
-
-void setUp ()
-{
-}
-
-void tearDown ()
-{
-}
-
-class test_ip_resolver_t ZMQ_FINAL : public zmq::ip_resolver_t
-{
-  public:
-    test_ip_resolver_t (zmq::ip_resolver_options_t opts_) :
-        ip_resolver_t (opts_)
-    {
-    }
-
-  protected:
-    struct dns_lut_t
-    {
-        const char *hostname;
-        const char *ipv4;
-        const char *ipv6;
-    };
-
-    int do_getaddrinfo (const char *node_,
-                        const char *service_,
-                        const struct addrinfo *hints_,
-                        struct addrinfo **res_) ZMQ_FINAL
-    {
-        static const struct dns_lut_t dns_lut[] = {
-          {"ip.zeromq.org", "10.100.0.1", "fdf5:d058:d656::1"},
-          {"ipv4only.zeromq.org", "10.100.0.2", "::ffff:10.100.0.2"},
-          {"ipv6only.zeromq.org", NULL, "fdf5:d058:d656::2"},
-        };
-        unsigned lut_len = sizeof (dns_lut) / sizeof (dns_lut[0]);
-        struct addrinfo ai;
-
-        TEST_ASSERT_NULL (service_);
-
-        bool ipv6 = (hints_->ai_family == AF_INET6);
-        bool no_dns = (hints_->ai_flags & AI_NUMERICHOST) != 0;
-        const char *ip = NULL;
-
-        if (!no_dns) {
-            for (unsigned i = 0; i < lut_len; i++) {
-                if (strcmp (dns_lut[i].hostname, node_) == 0) {
-                    if (ipv6) {
-                        ip = dns_lut[i].ipv6;
-                    } else {
-                        ip = dns_lut[i].ipv4;
-
-                        if (ip == NULL) {
-                            //  No address associated with NAME
-                            return EAI_NODATA;
-                        }
-                    }
-                }
-            }
-        }
-
-        if (ip == NULL) {
-            //  No entry for 'node_' found in the LUT (or DNS is
-            //  forbidden), assume that it's a numeric IP address
-            ip = node_;
-        }
-
-        //  Call the real getaddrinfo implementation, making sure that it won't
-        //  attempt to resolve using DNS
-        ai = *hints_;
-        ai.ai_flags |= AI_NUMERICHOST;
-
-        return zmq::ip_resolver_t::do_getaddrinfo (ip, NULL, &ai, res_);
-    }
-
-    unsigned int do_if_nametoindex (const char *ifname_) ZMQ_FINAL
-    {
-        static const char *dummy_interfaces[] = {
-          "lo0",
-          "eth0",
-          "eth1",
-        };
-        unsigned lut_len =
-          sizeof (dummy_interfaces) / sizeof (dummy_interfaces[0]);
-
-        for (unsigned i = 0; i < lut_len; i++) {
-            if (strcmp (dummy_interfaces[i], ifname_) == 0) {
-                //  The dummy index will be the position in the array + 1 (0 is
-                //  invalid)
-                return i + 1;
-            }
-        }
-
-        //  Not found
-        return 0;
-    }
-};
-
-//  Attempt a resolution and test the results. If 'expected_addr_' is NULL
-//  assume that the resolution is meant to fail.
-//
-//  On windows we can receive an IPv4 address even when an IPv6 is requested, if
-//  we're in this situation then we compare to 'expected_addr_v4_failover_'
-//  instead.
-static void test_resolve (zmq::ip_resolver_options_t opts_,
-                          const char *name_,
-                          const char *expected_addr_,
-                          uint16_t expected_port_ = 0,
-                          uint16_t expected_zone_ = 0,
-                          const char *expected_addr_v4_failover_ = NULL)
-{
-    zmq::ip_addr_t addr;
-    int family = opts_.ipv6 () ? AF_INET6 : AF_INET;
-
-    if (family == AF_INET6 && !is_ipv6_available ()) {
-        TEST_IGNORE_MESSAGE ("ipv6 is not available");
-    }
-
-    //  Generate an invalid but well-defined 'ip_addr_t'. Avoids testing
-    //  uninitialized values if the code is buggy.
-    memset (&addr, 0xba, sizeof (addr));
-
-    test_ip_resolver_t resolver (opts_);
-
-    int rc = resolver.resolve (&addr, name_);
-
-    if (expected_addr_ == NULL) {
-        // TODO also check the expected errno
-        TEST_ASSERT_EQUAL (-1, rc);
-        return;
-    }
-    TEST_ASSERT_SUCCESS_ERRNO (rc);
-
-
-    validate_address (family, &addr, expected_addr_, expected_port_,
-                      expected_zone_, expected_addr_v4_failover_);
-}
-
-// Helper macro to define the v4/v6 function pairs
-#define MAKE_TEST_V4V6(_test)                                                  \
-    static void _test##_ipv4 () { _test (false); }                             \
-                                                                               \
-    static void _test##_ipv6 () { _test (true); }
-
-static void test_bind_any (bool ipv6_)
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.bindable (true).expect_port (true).ipv6 (ipv6_);
-
-    const char *expected = ipv6_ ? "::" : "0.0.0.0";
-    test_resolve (resolver_opts, "*:*", expected, 0);
-}
-MAKE_TEST_V4V6 (test_bind_any)
-
-static void test_bind_any_port0 (bool ipv6_)
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.bindable (true).expect_port (true).ipv6 (ipv6_);
-
-    //  Should be equivalent to "*:*"
-    const char *expected = ipv6_ ? "::" : "0.0.0.0";
-    test_resolve (resolver_opts, "*:0", expected, 0);
-}
-MAKE_TEST_V4V6 (test_bind_any_port0)
-
-static void test_nobind_any (bool ipv6_)
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.expect_port (true).ipv6 (ipv6_);
-
-    //  Wildcard should be rejected if we're not looking for a
-    //  bindable address
-    test_resolve (resolver_opts, "*:*", NULL);
-}
-MAKE_TEST_V4V6 (test_nobind_any)
-
-static void test_nobind_any_port (bool ipv6_)
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.expect_port (true).ipv6 (ipv6_);
-
-    //  Wildcard should be rejected if we're not looking for a
-    //  bindable address
-    test_resolve (resolver_opts, "*:1234", NULL);
-}
-MAKE_TEST_V4V6 (test_nobind_any_port)
-
-static void test_nobind_addr_anyport (bool ipv6_)
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.expect_port (true).ipv6 (ipv6_);
-
-    //  Wildcard port should be rejected for non-bindable addresses
-    test_resolve (resolver_opts, "127.0.0.1:*", NULL);
-}
-MAKE_TEST_V4V6 (test_nobind_addr_anyport)
-
-static void test_nobind_addr_port0 (bool ipv6_)
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.expect_port (true).ipv6 (ipv6_);
-
-    //  Connecting to port 0 is allowed, although it might not be massively
-    //  useful
-    const char *expected = ipv6_ ? "::ffff:127.0.0.1" : "127.0.0.1";
-    const char *fallback = ipv6_ ? "127.0.0.1" : NULL;
-    test_resolve (resolver_opts, "127.0.0.1:0", expected, 0, 0, fallback);
-}
-MAKE_TEST_V4V6 (test_nobind_addr_port0)
-
-static void test_parse_ipv4_simple ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    test_resolve (resolver_opts, "1.2.128.129", "1.2.128.129");
-}
-
-static void test_parse_ipv4_zero ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    test_resolve (resolver_opts, "0.0.0.0", "0.0.0.0");
-}
-
-static void test_parse_ipv4_max ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    test_resolve (resolver_opts, "255.255.255.255", "255.255.255.255");
-}
-
-static void test_parse_ipv4_brackets ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    //  Not particularly useful, but valid
-    test_resolve (resolver_opts, "[1.2.128.129]", "1.2.128.129");
-}
-
-static void test_parse_ipv4_brackets_missingl ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    test_resolve (resolver_opts, "1.2.128.129]", NULL);
-}
-
-static void test_parse_ipv4_brackets_missingr ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    test_resolve (resolver_opts, "[1.2.128.129", NULL);
-}
-
-static void test_parse_ipv4_brackets_bad ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    test_resolve (resolver_opts, "[1.2.128].129", NULL);
-}
-
-static void test_parse_ipv4_reject_port ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    //  No port expected, should be rejected
-    test_resolve (resolver_opts, "1.2.128.129:123", NULL);
-}
-
-static void test_parse_ipv4_reject_any ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    //  No port expected, should be rejected
-    test_resolve (resolver_opts, "1.2.128.129:*", NULL);
-}
-
-static void test_parse_ipv4_reject_ipv6 ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    //  No port expected, should be rejected
-    test_resolve (resolver_opts, "::1", NULL);
-}
-
-static void test_parse_ipv4_port ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.expect_port (true);
-
-    test_resolve (resolver_opts, "1.2.128.129:123", "1.2.128.129", 123);
-}
-
-static void test_parse_ipv4_port0 ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.expect_port (true);
-
-    //  Port 0 is accepted and is equivalent to *
-    test_resolve (resolver_opts, "1.2.128.129:0", "1.2.128.129", 0);
-}
-
-static void test_parse_ipv4_port_garbage ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.expect_port (true);
-
-    //  The code doesn't validate that the port doesn't contain garbage
-    test_resolve (resolver_opts, "1.2.3.4:567bad", "1.2.3.4", 567);
-}
-
-static void test_parse_ipv4_port_missing ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.expect_port (true);
-
-    test_resolve (resolver_opts, "1.2.3.4", NULL);
-}
-
-static void test_parse_ipv4_port_bad ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.expect_port (true);
-
-    test_resolve (resolver_opts, "1.2.3.4:bad", NULL);
-}
-
-static void test_parse_ipv4_port_brackets ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.expect_port (true);
-
-    test_resolve (resolver_opts, "[192.168.1.1]:5555", "192.168.1.1", 5555);
-}
-
-static void test_parse_ipv4_port_brackets_bad ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.expect_port (true);
-
-    test_resolve (resolver_opts, "[192.168.1.1:]5555", NULL);
-}
-
-static void test_parse_ipv4_port_brackets_bad2 ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.expect_port (true);
-
-    test_resolve (resolver_opts, "[192.168.1.1:5555]", NULL);
-}
-
-static void test_parse_ipv4_wild_brackets_bad ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.expect_port (true);
-
-    test_resolve (resolver_opts, "[192.168.1.1:*]", NULL);
-}
-
-static void test_parse_ipv4_port_ipv6_reject ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.expect_port (true);
-
-    test_resolve (resolver_opts, "[::1]:1234", NULL);
-}
-
-static void test_parse_ipv6_simple ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.ipv6 (true);
-
-    test_resolve (resolver_opts, "::1", "::1");
-}
-
-static void test_parse_ipv6_simple2 ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.ipv6 (true);
-
-    test_resolve (resolver_opts, "abcd:1234::1:0:234", "abcd:1234::1:0:234");
-}
-
-static void test_parse_ipv6_zero ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.ipv6 (true);
-
-    test_resolve (resolver_opts, "::", "::");
-}
-
-static void test_parse_ipv6_max ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.ipv6 (true);
-
-    test_resolve (resolver_opts, "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff",
-                  "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff");
-}
-
-static void test_parse_ipv6_brackets ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.ipv6 (true);
-
-    test_resolve (resolver_opts, "[::1]", "::1");
-}
-
-static void test_parse_ipv6_brackets_missingl ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.ipv6 (true);
-
-    test_resolve (resolver_opts, "::1]", NULL);
-}
-
-static void test_parse_ipv6_brackets_missingr ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.ipv6 (true);
-
-    test_resolve (resolver_opts, "[::1", NULL);
-}
-
-static void test_parse_ipv6_brackets_bad ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.ipv6 (true);
-
-    test_resolve (resolver_opts, "[abcd:1234::1:]0:234", NULL);
-}
-
-static void test_parse_ipv6_port ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.ipv6 (true).expect_port (true);
-
-    test_resolve (resolver_opts, "[1234::1]:80", "1234::1", 80);
-}
-
-static void test_parse_ipv6_port_any ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.ipv6 (true).expect_port (true).bindable (true);
-
-    test_resolve (resolver_opts, "[1234::1]:*", "1234::1", 0);
-}
-
-static void test_parse_ipv6_port_nobrackets ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.ipv6 (true).expect_port (true);
-
-    //  Should this be allowed? Seems error-prone but so far ZMQ accepts it.
-    test_resolve (resolver_opts, "abcd:1234::1:0:234:123", "abcd:1234::1:0:234",
-                  123);
-}
-
-static void test_parse_ipv4_in_ipv6 ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.ipv6 (true);
-
-    //  Parsing IPv4 should also work if an IPv6 is requested, it returns an
-    //  IPv6 with the IPv4 address embedded (except sometimes on Windows where
-    //  we end up with an IPv4 anyway)
-    test_resolve (resolver_opts, "11.22.33.44", "::ffff:11.22.33.44", 0, 0,
-                  "11.22.33.44");
-}
-
-static void test_parse_ipv4_in_ipv6_port ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.ipv6 (true).expect_port (true);
-
-    test_resolve (resolver_opts, "11.22.33.44:55", "::ffff:11.22.33.44", 55, 0,
-                  "11.22.33.44");
-}
-
-static void test_parse_ipv6_scope_int ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.ipv6 (true);
-
-    test_resolve (resolver_opts, "3000:4:5::1:234%2", "3000:4:5::1:234", 0, 2);
-}
-
-static void test_parse_ipv6_scope_zero ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.ipv6 (true);
-
-    test_resolve (resolver_opts, "3000:4:5::1:234%0", NULL);
-}
-
-static void test_parse_ipv6_scope_int_port ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.expect_port (true).ipv6 (true);
-
-    test_resolve (resolver_opts, "3000:4:5::1:234%2:1111", "3000:4:5::1:234",
-                  1111, 2);
-}
-
-static void test_parse_ipv6_scope_if ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.ipv6 (true);
-
-    test_resolve (resolver_opts, "3000:4:5::1:234%eth1", "3000:4:5::1:234", 0,
-                  3);
-}
-
-static void test_parse_ipv6_scope_if_port ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.expect_port (true).ipv6 (true);
-
-    test_resolve (resolver_opts, "3000:4:5::1:234%eth0:8080", "3000:4:5::1:234",
-                  8080, 2);
-}
-
-static void test_parse_ipv6_scope_if_port_brackets ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.expect_port (true).ipv6 (true);
-
-    test_resolve (resolver_opts, "[3000:4:5::1:234%eth0]:8080",
-                  "3000:4:5::1:234", 8080, 2);
-}
-
-static void test_parse_ipv6_scope_badif ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.ipv6 (true);
-
-    test_resolve (resolver_opts, "3000:4:5::1:234%bad0", NULL);
-}
-
-static void test_dns_ipv4_simple ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.allow_dns (true);
-
-    test_resolve (resolver_opts, "ip.zeromq.org", "10.100.0.1");
-}
-
-static void test_dns_ipv4_only ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.allow_dns (true);
-
-    test_resolve (resolver_opts, "ipv4only.zeromq.org", "10.100.0.2");
-}
-
-static void test_dns_ipv4_invalid ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.allow_dns (true);
-
-    test_resolve (resolver_opts, "invalid.zeromq.org", NULL);
-}
-
-static void test_dns_ipv4_ipv6 ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.allow_dns (true);
-
-    test_resolve (resolver_opts, "ipv6only.zeromq.org", NULL);
-}
-
-static void test_dns_ipv4_numeric ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.allow_dns (true);
-
-    //  Numeric IPs should still work
-    test_resolve (resolver_opts, "5.4.3.2", "5.4.3.2");
-}
-
-static void test_dns_ipv4_port ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.expect_port (true).allow_dns (true);
-
-    test_resolve (resolver_opts, "ip.zeromq.org:1234", "10.100.0.1", 1234);
-}
-
-static void test_dns_ipv6_simple ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.ipv6 (true).allow_dns (true);
-
-    test_resolve (resolver_opts, "ip.zeromq.org", "fdf5:d058:d656::1");
-}
-
-static void test_dns_ipv6_only ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.ipv6 (true).allow_dns (true);
-
-    test_resolve (resolver_opts, "ipv6only.zeromq.org", "fdf5:d058:d656::2");
-}
-
-static void test_dns_ipv6_invalid ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.ipv6 (true).allow_dns (true);
-
-    test_resolve (resolver_opts, "invalid.zeromq.org", NULL);
-}
-
-static void test_dns_ipv6_ipv4 ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.ipv6 (true).allow_dns (true);
-
-    //  If a host doesn't have an IPv6 then it should resolve as an embedded v4
-    //  address in an IPv6
-    test_resolve (resolver_opts, "ipv4only.zeromq.org", "::ffff:10.100.0.2");
-}
-
-static void test_dns_ipv6_numeric ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.ipv6 (true).allow_dns (true);
-
-    //  Numeric IPs should still work
-    test_resolve (resolver_opts, "fdf5:d058:d656::1", "fdf5:d058:d656::1");
-}
-
-static void test_dns_ipv6_port ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.ipv6 (true).expect_port (true).allow_dns (true);
-
-    test_resolve (resolver_opts, "ip.zeromq.org:1234", "fdf5:d058:d656::1",
-                  1234);
-}
-
-void test_dns_brackets ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.allow_dns (true);
-
-    test_resolve (resolver_opts, "[ip.zeromq.org]", "10.100.0.1");
-}
-
-void test_dns_brackets_bad ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.allow_dns (true);
-
-    test_resolve (resolver_opts, "[ip.zeromq].org", NULL);
-}
-
-void test_dns_brackets_port ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.allow_dns (true);
-
-    test_resolve (resolver_opts, "[ip.zeromq.org]:22", "10.100.0.1", 22);
-}
-
-void test_dns_brackets_port_bad ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.allow_dns (true);
-
-    test_resolve (resolver_opts, "[ip.zeromq.org:22]", NULL);
-}
-
-void test_dns_deny (bool ipv6_)
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.allow_dns (false).ipv6 (ipv6_);
-
-    //  DNS resolution shouldn't work when disallowed
-    test_resolve (resolver_opts, "ip.zeromq.org", NULL);
-}
-MAKE_TEST_V4V6 (test_dns_deny)
-
-void test_dns_ipv6_scope ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.allow_dns (true).ipv6 (true);
-
-    //  Not sure if that's very useful but you could technically add a scope
-    //  identifier to a hostname
-    test_resolve (resolver_opts, "ip.zeromq.org%lo0", "fdf5:d058:d656::1", 0,
-                  1);
-}
-
-void test_dns_ipv6_scope_port ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.allow_dns (true).expect_port (true).ipv6 (true);
-
-    //  Not sure if that's very useful but you could technically add a scope
-    //  identifier to a hostname
-    test_resolve (resolver_opts, "ip.zeromq.org%lo0:4444", "fdf5:d058:d656::1",
-                  4444, 1);
-}
-
-void test_dns_ipv6_scope_port_brackets ()
-{
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.allow_dns (true).expect_port (true).ipv6 (true);
-
-    test_resolve (resolver_opts, "[ip.zeromq.org%lo0]:4444",
-                  "fdf5:d058:d656::1", 4444, 1);
-}
-
-static void test_addr (int family_, const char *addr_, bool multicast_)
-{
-    if (family_ == AF_INET6 && !is_ipv6_available ()) {
-        TEST_IGNORE_MESSAGE ("ipv6 is not available");
-    }
-
-    zmq::ip_resolver_options_t resolver_opts;
-
-    resolver_opts.ipv6 (family_ == AF_INET6);
-
-    test_ip_resolver_t resolver (resolver_opts);
-    zmq::ip_addr_t addr;
-
-    TEST_ASSERT_SUCCESS_ERRNO (resolver.resolve (&addr, addr_));
-
-    TEST_ASSERT_EQUAL (family_, addr.family ());
-    TEST_ASSERT_EQUAL (multicast_, addr.is_multicast ());
-}
-
-static void test_addr_unicast_ipv4 ()
-{
-    test_addr (AF_INET, "1.2.3.4", false);
-}
-
-static void test_addr_unicast_ipv6 ()
-{
-    test_addr (AF_INET6, "abcd::1", false);
-}
-
-static void test_addr_multicast_ipv4 ()
-{
-    test_addr (AF_INET, "230.1.2.3", true);
-}
-
-static void test_addr_multicast_ipv6 ()
-{
-    test_addr (AF_INET6, "ffab::1234", true);
-}
-
-static void test_addr_multicast_ipv4_min ()
-{
-    test_addr (AF_INET, "224.0.0.0", true);
-}
-
-static void test_addr_multicast_ipv6_min ()
-{
-    test_addr (AF_INET6, "ff00::", true);
-}
-
-static void test_addr_multicast_ipv4_max ()
-{
-    test_addr (AF_INET, "239.255.255.255", true);
-}
-
-static void test_addr_multicast_ipv6_max ()
-{
-    test_addr (AF_INET6, "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff", true);
-}
-
-static void test_addr_multicast_ipv4_sub ()
-{
-    test_addr (AF_INET, "223.255.255.255", false);
-}
-
-static void test_addr_multicast_ipv6_sub ()
-{
-    test_addr (AF_INET6, "feff:ffff:ffff:ffff:ffff:ffff:ffff:ffff", false);
-}
-
-static void test_addr_multicast_ipv4_over ()
-{
-    test_addr (AF_INET, "240.0.0.0", false);
-}
-
-int main (void)
-{
-    zmq::initialize_network ();
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-
-    RUN_TEST (test_bind_any_ipv4);
-    RUN_TEST (test_bind_any_ipv6);
-    RUN_TEST (test_bind_any_port0_ipv4);
-    RUN_TEST (test_bind_any_port0_ipv6);
-    RUN_TEST (test_nobind_any_ipv4);
-    RUN_TEST (test_nobind_any_ipv6);
-    RUN_TEST (test_nobind_any_port_ipv4);
-    RUN_TEST (test_nobind_any_port_ipv6);
-    RUN_TEST (test_nobind_addr_anyport_ipv4);
-    RUN_TEST (test_nobind_addr_anyport_ipv6);
-    RUN_TEST (test_nobind_addr_port0_ipv4);
-    RUN_TEST (test_nobind_addr_port0_ipv6);
-    RUN_TEST (test_parse_ipv4_simple);
-    RUN_TEST (test_parse_ipv4_zero);
-    RUN_TEST (test_parse_ipv4_max);
-    RUN_TEST (test_parse_ipv4_brackets);
-    RUN_TEST (test_parse_ipv4_brackets_missingl);
-    RUN_TEST (test_parse_ipv4_brackets_missingr);
-    RUN_TEST (test_parse_ipv4_brackets_bad);
-    RUN_TEST (test_parse_ipv4_reject_port);
-    RUN_TEST (test_parse_ipv4_reject_any);
-    RUN_TEST (test_parse_ipv4_reject_ipv6);
-    RUN_TEST (test_parse_ipv4_port);
-    RUN_TEST (test_parse_ipv4_port0);
-    RUN_TEST (test_parse_ipv4_port_garbage);
-    RUN_TEST (test_parse_ipv4_port_missing);
-    RUN_TEST (test_parse_ipv4_port_bad);
-    RUN_TEST (test_parse_ipv4_port_brackets);
-    RUN_TEST (test_parse_ipv4_port_brackets_bad);
-    RUN_TEST (test_parse_ipv4_port_brackets_bad2);
-    RUN_TEST (test_parse_ipv4_wild_brackets_bad);
-    RUN_TEST (test_parse_ipv4_port_ipv6_reject);
-    RUN_TEST (test_parse_ipv6_simple);
-    RUN_TEST (test_parse_ipv6_simple2);
-    RUN_TEST (test_parse_ipv6_zero);
-    RUN_TEST (test_parse_ipv6_max);
-    RUN_TEST (test_parse_ipv6_brackets);
-    RUN_TEST (test_parse_ipv6_brackets_missingl);
-    RUN_TEST (test_parse_ipv6_brackets_missingr);
-    RUN_TEST (test_parse_ipv6_brackets_bad);
-    RUN_TEST (test_parse_ipv6_port);
-    RUN_TEST (test_parse_ipv6_port_any);
-    RUN_TEST (test_parse_ipv6_port_nobrackets);
-    RUN_TEST (test_parse_ipv4_in_ipv6);
-    RUN_TEST (test_parse_ipv4_in_ipv6_port);
-    RUN_TEST (test_parse_ipv6_scope_int);
-    RUN_TEST (test_parse_ipv6_scope_zero);
-    RUN_TEST (test_parse_ipv6_scope_int_port);
-    RUN_TEST (test_parse_ipv6_scope_if);
-    RUN_TEST (test_parse_ipv6_scope_if_port);
-    RUN_TEST (test_parse_ipv6_scope_if_port_brackets);
-    RUN_TEST (test_parse_ipv6_scope_badif);
-    RUN_TEST (test_dns_ipv4_simple);
-    RUN_TEST (test_dns_ipv4_only);
-    RUN_TEST (test_dns_ipv4_invalid);
-    RUN_TEST (test_dns_ipv4_ipv6);
-    RUN_TEST (test_dns_ipv4_numeric);
-    RUN_TEST (test_dns_ipv4_port);
-    RUN_TEST (test_dns_ipv6_simple);
-    RUN_TEST (test_dns_ipv6_only);
-    RUN_TEST (test_dns_ipv6_invalid);
-    RUN_TEST (test_dns_ipv6_ipv4);
-    RUN_TEST (test_dns_ipv6_numeric);
-    RUN_TEST (test_dns_ipv6_port);
-    RUN_TEST (test_dns_brackets);
-    RUN_TEST (test_dns_brackets_bad);
-    RUN_TEST (test_dns_deny_ipv4);
-    RUN_TEST (test_dns_deny_ipv6);
-    RUN_TEST (test_dns_ipv6_scope);
-    RUN_TEST (test_dns_ipv6_scope_port);
-    RUN_TEST (test_dns_ipv6_scope_port_brackets);
-    RUN_TEST (test_addr_unicast_ipv4);
-    RUN_TEST (test_addr_unicast_ipv6);
-    RUN_TEST (test_addr_multicast_ipv4);
-    RUN_TEST (test_addr_multicast_ipv6);
-    RUN_TEST (test_addr_multicast_ipv4_min);
-    RUN_TEST (test_addr_multicast_ipv6_min);
-    RUN_TEST (test_addr_multicast_ipv4_max);
-    RUN_TEST (test_addr_multicast_ipv6_max);
-    RUN_TEST (test_addr_multicast_ipv4_sub);
-    RUN_TEST (test_addr_multicast_ipv6_sub);
-    RUN_TEST (test_addr_multicast_ipv4_over);
-
-    zmq::shutdown_network ();
-
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/unittests/unittest_mtrie.cpp b/libs/libzmq/unittests/unittest_mtrie.cpp
deleted file mode 100644
index e85f7f3..0000000
--- a/libs/libzmq/unittests/unittest_mtrie.cpp
+++ /dev/null
@@ -1,458 +0,0 @@
-/*
-Copyright (c) 2018 Contributors as noted in the AUTHORS file
-
-This file is part of 0MQ.
-
-0MQ is free software; you can redistribute it and/or modify it under
-the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
-(at your option) any later version.
-
-0MQ is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "../tests/testutil.hpp"
-
-#if defined(min)
-#undef min
-#endif
-
-#include <generic_mtrie_impl.hpp>
-
-#include <unity.h>
-
-void setUp ()
-{
-}
-void tearDown ()
-{
-}
-
-int getlen (const zmq::generic_mtrie_t<int>::prefix_t &data_)
-{
-    return static_cast<int> (strlen (reinterpret_cast<const char *> (data_)));
-}
-
-void test_create ()
-{
-    zmq::generic_mtrie_t<int> mtrie;
-}
-
-void mtrie_count (int *pipe_, int *count_)
-{
-    LIBZMQ_UNUSED (pipe_);
-    ++*count_;
-}
-
-void test_check_empty_match_nonempty_data ()
-{
-    zmq::generic_mtrie_t<int> mtrie;
-    const zmq::generic_mtrie_t<int>::prefix_t test_name =
-      reinterpret_cast<zmq::generic_mtrie_t<int>::prefix_t> ("foo");
-
-    int count = 0;
-    mtrie.match (test_name, getlen (test_name), mtrie_count, &count);
-    TEST_ASSERT_EQUAL_INT (0, count);
-}
-
-void test_check_empty_match_empty_data ()
-{
-    zmq::generic_mtrie_t<int> mtrie;
-
-    int count = 0;
-    mtrie.match (NULL, 0, mtrie_count, &count);
-    TEST_ASSERT_EQUAL_INT (0, count);
-}
-
-void test_add_single_entry_match_exact ()
-{
-    int pipe;
-
-    zmq::generic_mtrie_t<int> mtrie;
-    const zmq::generic_mtrie_t<int>::prefix_t test_name =
-      reinterpret_cast<zmq::generic_mtrie_t<int>::prefix_t> ("foo");
-
-    bool res = mtrie.add (test_name, getlen (test_name), &pipe);
-    TEST_ASSERT_TRUE (res);
-
-    int count = 0;
-    mtrie.match (test_name, getlen (test_name), mtrie_count, &count);
-    TEST_ASSERT_EQUAL_INT (1, count);
-}
-
-void test_add_single_entry_twice_match_exact ()
-{
-    int pipe;
-
-    zmq::generic_mtrie_t<int> mtrie;
-    const zmq::generic_mtrie_t<int>::prefix_t test_name =
-      reinterpret_cast<zmq::generic_mtrie_t<int>::prefix_t> ("foo");
-
-    bool res = mtrie.add (test_name, getlen (test_name), &pipe);
-    TEST_ASSERT_TRUE (res);
-
-    res = mtrie.add (test_name, getlen (test_name), &pipe);
-    TEST_ASSERT_FALSE (res);
-
-    int count = 0;
-    mtrie.match (test_name, getlen (test_name), mtrie_count, &count);
-    TEST_ASSERT_EQUAL_INT (1, count);
-}
-
-void test_add_two_entries_with_same_name_match_exact ()
-{
-    int pipe_1, pipe_2;
-
-    zmq::generic_mtrie_t<int> mtrie;
-    const zmq::generic_mtrie_t<int>::prefix_t test_name =
-      reinterpret_cast<zmq::generic_mtrie_t<int>::prefix_t> ("foo");
-
-    bool res = mtrie.add (test_name, getlen (test_name), &pipe_1);
-    TEST_ASSERT_TRUE (res);
-
-    res = mtrie.add (test_name, getlen (test_name), &pipe_2);
-    TEST_ASSERT_FALSE (res);
-
-    int count = 0;
-    mtrie.match (test_name, getlen (test_name), mtrie_count, &count);
-    TEST_ASSERT_EQUAL_INT (2, count);
-}
-
-void test_add_two_entries_match_prefix_and_exact ()
-{
-    int pipe_1, pipe_2;
-
-    zmq::generic_mtrie_t<int> mtrie;
-    const zmq::generic_mtrie_t<int>::prefix_t test_name_prefix =
-      reinterpret_cast<zmq::generic_mtrie_t<int>::prefix_t> ("foo");
-    const zmq::generic_mtrie_t<int>::prefix_t test_name_full =
-      reinterpret_cast<zmq::generic_mtrie_t<int>::prefix_t> ("foobar");
-
-    bool res = mtrie.add (test_name_prefix, getlen (test_name_prefix), &pipe_1);
-    TEST_ASSERT_TRUE (res);
-
-    res = mtrie.add (test_name_full, getlen (test_name_full), &pipe_2);
-    TEST_ASSERT_TRUE (res);
-
-    int count = 0;
-    mtrie.match (test_name_full, getlen (test_name_full), mtrie_count, &count);
-    TEST_ASSERT_EQUAL_INT (2, count);
-}
-
-void test_add_rm_single_entry_match_exact ()
-{
-    int pipe;
-    zmq::generic_mtrie_t<int> mtrie;
-    const zmq::generic_mtrie_t<int>::prefix_t test_name =
-      reinterpret_cast<zmq::generic_mtrie_t<int>::prefix_t> ("foo");
-
-    mtrie.add (test_name, getlen (test_name), &pipe);
-    zmq::generic_mtrie_t<int>::rm_result res =
-      mtrie.rm (test_name, getlen (test_name), &pipe);
-    TEST_ASSERT_EQUAL (zmq::generic_mtrie_t<int>::last_value_removed, res);
-
-    int count = 0;
-    mtrie.match (test_name, getlen (test_name), mtrie_count, &count);
-    TEST_ASSERT_EQUAL_INT (0, count);
-}
-
-void test_rm_nonexistent_0_size_empty ()
-{
-    int pipe;
-    zmq::generic_mtrie_t<int> mtrie;
-
-    zmq::generic_mtrie_t<int>::rm_result res = mtrie.rm (0, 0, &pipe);
-    TEST_ASSERT_EQUAL (zmq::generic_mtrie_t<int>::not_found, res);
-}
-
-void test_rm_nonexistent_empty ()
-{
-    int pipe;
-    zmq::generic_mtrie_t<int> mtrie;
-    const zmq::generic_mtrie_t<int>::prefix_t test_name =
-      reinterpret_cast<zmq::generic_mtrie_t<int>::prefix_t> ("foo");
-
-    zmq::generic_mtrie_t<int>::rm_result res =
-      mtrie.rm (test_name, getlen (test_name), &pipe);
-    TEST_ASSERT_EQUAL (zmq::generic_mtrie_t<int>::not_found, res);
-
-    int count = 0;
-    mtrie.match (test_name, getlen (test_name), mtrie_count, &count);
-    TEST_ASSERT_EQUAL_INT (0, count);
-}
-
-void test_add_and_rm_other (const char *add_name_, const char *rm_name_)
-{
-    int addpipe, rmpipe;
-    zmq::generic_mtrie_t<int> mtrie;
-    const zmq::generic_mtrie_t<int>::prefix_t add_name_data =
-      reinterpret_cast<zmq::generic_mtrie_t<int>::prefix_t> (add_name_);
-    const zmq::generic_mtrie_t<int>::prefix_t rm_name_data =
-      reinterpret_cast<zmq::generic_mtrie_t<int>::prefix_t> (rm_name_);
-
-    mtrie.add (add_name_data, getlen (add_name_data), &addpipe);
-
-    zmq::generic_mtrie_t<int>::rm_result res =
-      mtrie.rm (rm_name_data, getlen (rm_name_data), &rmpipe);
-    TEST_ASSERT_EQUAL (zmq::generic_mtrie_t<int>::not_found, res);
-
-    {
-        int count = 0;
-        mtrie.match (add_name_data, getlen (add_name_data), mtrie_count,
-                     &count);
-        TEST_ASSERT_EQUAL_INT (1, count);
-    }
-
-    if (strncmp (add_name_, rm_name_,
-                 std::min (strlen (add_name_), strlen (rm_name_) + 1))
-        != 0) {
-        int count = 0;
-        mtrie.match (rm_name_data, getlen (rm_name_data), mtrie_count, &count);
-        TEST_ASSERT_EQUAL_INT (0, count);
-    }
-}
-
-void test_rm_nonexistent_nonempty_samename ()
-{
-    // TODO this triggers an assertion
-    test_add_and_rm_other ("foo", "foo");
-}
-
-void test_rm_nonexistent_nonempty_differentname ()
-{
-    test_add_and_rm_other ("foo", "bar");
-}
-
-void test_rm_nonexistent_nonempty_prefix ()
-{
-    // TODO here, a test assertion fails
-    test_add_and_rm_other ("foobar", "foo");
-}
-
-void test_rm_nonexistent_nonempty_prefixed ()
-{
-    test_add_and_rm_other ("foo", "foobar");
-}
-
-void add_indexed_expect_unique (zmq::generic_mtrie_t<int> &mtrie_,
-                                int *pipes_,
-                                const char **names_,
-                                size_t i_)
-{
-    const zmq::generic_mtrie_t<int>::prefix_t name_data =
-      reinterpret_cast<zmq::generic_mtrie_t<int>::prefix_t> (names_[i_]);
-
-    bool res = mtrie_.add (name_data, getlen (name_data), &pipes_[i_]);
-    TEST_ASSERT_EQUAL (zmq::generic_mtrie_t<int>::last_value_removed, res);
-}
-
-void test_rm_nonexistent_between ()
-{
-    int pipes[3];
-    const char *names[] = {"foo1", "foo2", "foo3"};
-
-    zmq::generic_mtrie_t<int> mtrie;
-    add_indexed_expect_unique (mtrie, pipes, names, 0);
-    add_indexed_expect_unique (mtrie, pipes, names, 2);
-
-    const zmq::generic_mtrie_t<int>::prefix_t name_data =
-      reinterpret_cast<zmq::generic_mtrie_t<int>::prefix_t> (names[1]);
-
-    zmq::generic_mtrie_t<int>::rm_result res =
-      mtrie.rm (name_data, getlen (name_data), &pipes[1]);
-    TEST_ASSERT_EQUAL (zmq::generic_mtrie_t<int>::not_found, res);
-}
-
-template <size_t N>
-void add_entries (zmq::generic_mtrie_t<int> &mtrie_,
-                  int (&pipes_)[N],
-                  const char *(&names_)[N])
-{
-    for (size_t i = 0; i < N; ++i) {
-        add_indexed_expect_unique (mtrie_, pipes_, names_, i);
-    }
-}
-
-void test_add_multiple ()
-{
-    int pipes[3];
-    const char *names[] = {"foo1", "foo2", "foo3"};
-
-    zmq::generic_mtrie_t<int> mtrie;
-    add_entries (mtrie, pipes, names);
-
-    for (size_t i = 0; i < sizeof (names) / sizeof (names[0]); ++i) {
-        const zmq::generic_mtrie_t<int>::prefix_t name_data =
-          reinterpret_cast<zmq::generic_mtrie_t<int>::prefix_t> (names[i]);
-        int count = 0;
-        mtrie.match (name_data, getlen (name_data), mtrie_count, &count);
-        TEST_ASSERT_EQUAL_INT (1, count);
-    }
-}
-
-void test_add_multiple_reverse ()
-{
-    int pipes[3];
-    const char *names[] = {"foo1", "foo2", "foo3"};
-
-    zmq::generic_mtrie_t<int> mtrie;
-    for (int i = 2; i >= 0; --i) {
-        add_indexed_expect_unique (mtrie, pipes, names,
-                                   static_cast<size_t> (i));
-    }
-
-    for (size_t i = 0; i < 3; ++i) {
-        const zmq::generic_mtrie_t<int>::prefix_t name_data =
-          reinterpret_cast<zmq::generic_mtrie_t<int>::prefix_t> (names[i]);
-        int count = 0;
-        mtrie.match (name_data, getlen (name_data), mtrie_count, &count);
-        TEST_ASSERT_EQUAL_INT (1, count);
-    }
-}
-
-template <size_t N> void add_and_rm_entries (const char *(&names_)[N])
-{
-    int pipes[N];
-    zmq::generic_mtrie_t<int> mtrie;
-    add_entries (mtrie, pipes, names_);
-
-    for (size_t i = 0; i < N; ++i) {
-        const zmq::generic_mtrie_t<int>::prefix_t name_data =
-          reinterpret_cast<zmq::generic_mtrie_t<int>::prefix_t> (names_[i]);
-
-        zmq::generic_mtrie_t<int>::rm_result res =
-          mtrie.rm (name_data, getlen (name_data), &pipes[i]);
-        TEST_ASSERT_EQUAL (zmq::generic_mtrie_t<int>::last_value_removed, res);
-    }
-}
-
-void test_rm_multiple_in_order ()
-{
-    const char *names[] = {"foo1", "foo2", "foo3"};
-    add_and_rm_entries (names);
-}
-
-void test_rm_multiple_reverse_order ()
-{
-    const char *names[] = {"foo3", "foo2", "foo1"};
-    add_and_rm_entries (names);
-}
-
-void check_name (zmq::generic_mtrie_t<int>::prefix_t data_,
-                 size_t len_,
-                 const char *name_)
-{
-    TEST_ASSERT_EQUAL_UINT (strlen (name_), len_);
-    TEST_ASSERT_EQUAL_STRING_LEN (name_, data_, len_);
-}
-
-template <size_t N> void add_entries_rm_pipes_unique (const char *(&names_)[N])
-{
-    int pipes[N];
-    zmq::generic_mtrie_t<int> mtrie;
-    add_entries (mtrie, pipes, names_);
-
-    for (size_t i = 0; i < N; ++i) {
-        mtrie.rm (&pipes[i], check_name, names_[i], false);
-    }
-}
-
-void test_rm_with_callback_multiple_in_order ()
-{
-    const char *names[] = {"foo1", "foo2", "foo3"};
-
-    add_entries_rm_pipes_unique (names);
-}
-
-void test_rm_with_callback_multiple_reverse_order ()
-{
-    const char *names[] = {"foo3", "foo2", "foo1"};
-
-    add_entries_rm_pipes_unique (names);
-}
-
-void check_count (zmq::generic_mtrie_t<int>::prefix_t data_,
-                  size_t len_,
-                  int *count_)
-{
-    --(*count_);
-    TEST_ASSERT_GREATER_OR_EQUAL (0, *count_);
-}
-
-void add_duplicate_entry (zmq::generic_mtrie_t<int> &mtrie_, int (&pipes_)[2])
-{
-    const char *name = "foo";
-
-    const zmq::generic_mtrie_t<int>::prefix_t name_data =
-      reinterpret_cast<zmq::generic_mtrie_t<int>::prefix_t> (name);
-
-    bool res = mtrie_.add (name_data, getlen (name_data), &pipes_[0]);
-    TEST_ASSERT_TRUE (res);
-    res = mtrie_.add (name_data, getlen (name_data), &pipes_[1]);
-    TEST_ASSERT_FALSE (res);
-}
-
-void test_rm_with_callback_duplicate ()
-{
-    int pipes[2];
-    zmq::generic_mtrie_t<int> mtrie;
-    add_duplicate_entry (mtrie, pipes);
-
-    int count = 1;
-    mtrie.rm (&pipes[0], check_count, &count, false);
-    count = 1;
-    mtrie.rm (&pipes[1], check_count, &count, false);
-}
-
-void test_rm_with_callback_duplicate_uniq_only ()
-{
-    int pipes[2];
-    zmq::generic_mtrie_t<int> mtrie;
-    add_duplicate_entry (mtrie, pipes);
-
-    int count = 0;
-    mtrie.rm (&pipes[0], check_count, &count, true);
-    count = 1;
-    mtrie.rm (&pipes[1], check_count, &count, true);
-}
-
-int main (void)
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_create);
-    RUN_TEST (test_check_empty_match_nonempty_data);
-    RUN_TEST (test_check_empty_match_empty_data);
-    RUN_TEST (test_add_single_entry_match_exact);
-    RUN_TEST (test_add_single_entry_twice_match_exact);
-    RUN_TEST (test_add_rm_single_entry_match_exact);
-    RUN_TEST (test_add_two_entries_match_prefix_and_exact);
-    RUN_TEST (test_add_two_entries_with_same_name_match_exact);
-
-    RUN_TEST (test_rm_nonexistent_0_size_empty);
-    RUN_TEST (test_rm_nonexistent_empty);
-    RUN_TEST (test_rm_nonexistent_nonempty_samename);
-    RUN_TEST (test_rm_nonexistent_nonempty_differentname);
-    RUN_TEST (test_rm_nonexistent_nonempty_prefix);
-    RUN_TEST (test_rm_nonexistent_nonempty_prefixed);
-    RUN_TEST (test_rm_nonexistent_between);
-
-    RUN_TEST (test_add_multiple);
-    RUN_TEST (test_add_multiple_reverse);
-    RUN_TEST (test_rm_multiple_in_order);
-    RUN_TEST (test_rm_multiple_reverse_order);
-
-    RUN_TEST (test_rm_with_callback_multiple_in_order);
-    RUN_TEST (test_rm_with_callback_multiple_reverse_order);
-    RUN_TEST (test_rm_with_callback_duplicate);
-    RUN_TEST (test_rm_with_callback_duplicate_uniq_only);
-
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/unittests/unittest_poller.cpp b/libs/libzmq/unittests/unittest_poller.cpp
deleted file mode 100644
index 0d150d8..0000000
--- a/libs/libzmq/unittests/unittest_poller.cpp
+++ /dev/null
@@ -1,280 +0,0 @@
-/*
-Copyright (c) 2018 Contributors as noted in the AUTHORS file
-
-This file is part of 0MQ.
-
-0MQ is free software; you can redistribute it and/or modify it under
-the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
-(at your option) any later version.
-
-0MQ is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "../tests/testutil.hpp"
-
-#include <poller.hpp>
-#include <i_poll_events.hpp>
-#include <ip.hpp>
-
-#include <unity.h>
-
-#ifndef _WIN32
-#include <unistd.h>
-#define closesocket close
-#endif
-
-void setUp ()
-{
-}
-void tearDown ()
-{
-}
-
-void test_create ()
-{
-    zmq::thread_ctx_t thread_ctx;
-    zmq::poller_t poller (thread_ctx);
-}
-
-#if 0
-// TODO this triggers an assertion. should it be a valid use case?
-void test_start_empty ()
-{
-    zmq::thread_ctx_t thread_ctx;
-    zmq::poller_t poller (thread_ctx);
-    poller.start ();
-    msleep (SETTLE_TIME);
-}
-#endif
-
-struct test_events_t : zmq::i_poll_events
-{
-    test_events_t (zmq::fd_t fd_, zmq::poller_t &poller_) :
-        _fd (fd_),
-        _poller (poller_)
-    {
-        (void) _fd;
-    }
-
-    void in_event () ZMQ_OVERRIDE
-    {
-        _poller.rm_fd (_handle);
-        _handle = (zmq::poller_t::handle_t) NULL;
-
-        // this must only be incremented after rm_fd
-        in_events.add (1);
-    }
-
-
-    void out_event () ZMQ_OVERRIDE
-    {
-        // TODO
-    }
-
-
-    void timer_event (int id_) ZMQ_OVERRIDE
-    {
-        LIBZMQ_UNUSED (id_);
-        _poller.rm_fd (_handle);
-        _handle = (zmq::poller_t::handle_t) NULL;
-
-        // this must only be incremented after rm_fd
-        timer_events.add (1);
-    }
-
-    void set_handle (zmq::poller_t::handle_t handle_) { _handle = handle_; }
-
-    zmq::atomic_counter_t in_events, timer_events;
-
-  private:
-    zmq::fd_t _fd;
-    zmq::poller_t &_poller;
-    zmq::poller_t::handle_t _handle;
-};
-
-void wait_in_events (test_events_t &events_)
-{
-    void *watch = zmq_stopwatch_start ();
-    while (events_.in_events.get () < 1) {
-        msleep (1);
-#ifdef ZMQ_BUILD_DRAFT
-        TEST_ASSERT_LESS_OR_EQUAL_MESSAGE (SETTLE_TIME,
-                                           zmq_stopwatch_intermediate (watch),
-                                           "Timeout waiting for in event");
-#endif
-    }
-    zmq_stopwatch_stop (watch);
-}
-
-void wait_timer_events (test_events_t &events_)
-{
-    void *watch = zmq_stopwatch_start ();
-    while (events_.timer_events.get () < 1) {
-        msleep (1);
-#ifdef ZMQ_BUILD_DRAFT
-        TEST_ASSERT_LESS_OR_EQUAL_MESSAGE (SETTLE_TIME,
-                                           zmq_stopwatch_intermediate (watch),
-                                           "Timeout waiting for timer event");
-#endif
-    }
-    zmq_stopwatch_stop (watch);
-}
-
-void create_nonblocking_fdpair (zmq::fd_t *r_, zmq::fd_t *w_)
-{
-    int rc = zmq::make_fdpair (r_, w_);
-    TEST_ASSERT_EQUAL_INT (0, rc);
-    TEST_ASSERT_NOT_EQUAL (zmq::retired_fd, *r_);
-    TEST_ASSERT_NOT_EQUAL (zmq::retired_fd, *w_);
-    zmq::unblock_socket (*r_);
-    zmq::unblock_socket (*w_);
-}
-
-void send_signal (zmq::fd_t w_)
-{
-#if defined ZMQ_HAVE_EVENTFD
-    const uint64_t inc = 1;
-    ssize_t sz = write (w_, &inc, sizeof (inc));
-    assert (sz == sizeof (inc));
-#else
-    {
-        char msg[] = "test";
-        int rc = send (w_, msg, sizeof (msg), 0);
-        assert (rc == sizeof (msg));
-    }
-#endif
-}
-
-void close_fdpair (zmq::fd_t w_, zmq::fd_t r_)
-{
-    int rc = closesocket (w_);
-    TEST_ASSERT_EQUAL_INT (0, rc);
-#if !defined ZMQ_HAVE_EVENTFD
-    rc = closesocket (r_);
-    TEST_ASSERT_EQUAL_INT (0, rc);
-#else
-    LIBZMQ_UNUSED (r_);
-#endif
-}
-
-void test_add_fd_and_start_and_receive_data ()
-{
-    zmq::thread_ctx_t thread_ctx;
-    zmq::poller_t poller (thread_ctx);
-
-    zmq::fd_t r, w;
-    create_nonblocking_fdpair (&r, &w);
-
-    test_events_t events (r, poller);
-
-    zmq::poller_t::handle_t handle = poller.add_fd (r, &events);
-    events.set_handle (handle);
-    poller.set_pollin (handle);
-    poller.start ();
-
-    send_signal (w);
-
-    wait_in_events (events);
-
-    // required cleanup
-    close_fdpair (w, r);
-}
-
-void test_add_fd_and_remove_by_timer ()
-{
-    zmq::fd_t r, w;
-    create_nonblocking_fdpair (&r, &w);
-
-    zmq::thread_ctx_t thread_ctx;
-    zmq::poller_t poller (thread_ctx);
-
-    test_events_t events (r, poller);
-
-    zmq::poller_t::handle_t handle = poller.add_fd (r, &events);
-    events.set_handle (handle);
-
-    poller.add_timer (50, &events, 0);
-    poller.start ();
-
-    wait_timer_events (events);
-
-    // required cleanup
-    close_fdpair (w, r);
-}
-
-#ifdef _WIN32
-void test_add_fd_with_pending_failing_connect ()
-{
-    zmq::thread_ctx_t thread_ctx;
-    zmq::poller_t poller (thread_ctx);
-
-    zmq::fd_t bind_socket = socket (AF_INET, SOCK_STREAM, 0);
-    sockaddr_in addr = {0};
-    addr.sin_family = AF_INET;
-    addr.sin_addr.s_addr = htonl (INADDR_LOOPBACK);
-    addr.sin_port = 0;
-    TEST_ASSERT_EQUAL_INT (0, bind (bind_socket,
-                                    reinterpret_cast<const sockaddr *> (&addr),
-                                    sizeof (addr)));
-
-    int addr_len = static_cast<int> (sizeof (addr));
-    TEST_ASSERT_EQUAL_INT (0, getsockname (bind_socket,
-                                           reinterpret_cast<sockaddr *> (&addr),
-                                           &addr_len));
-
-    zmq::fd_t connect_socket = socket (AF_INET, SOCK_STREAM, 0);
-    zmq::unblock_socket (connect_socket);
-
-    TEST_ASSERT_EQUAL_INT (
-      -1, connect (connect_socket, reinterpret_cast<const sockaddr *> (&addr),
-                   sizeof (addr)));
-    TEST_ASSERT_EQUAL_INT (WSAEWOULDBLOCK, WSAGetLastError ());
-
-    test_events_t events (connect_socket, poller);
-
-    zmq::poller_t::handle_t handle = poller.add_fd (connect_socket, &events);
-    events.set_handle (handle);
-    poller.set_pollin (handle);
-    poller.start ();
-
-    wait_in_events (events);
-
-    int value;
-    int value_len = sizeof (value);
-    TEST_ASSERT_EQUAL_INT (0, getsockopt (connect_socket, SOL_SOCKET, SO_ERROR,
-                                          reinterpret_cast<char *> (&value),
-                                          &value_len));
-    TEST_ASSERT_EQUAL_INT (WSAECONNREFUSED, value);
-
-    // required cleanup
-    close (connect_socket);
-    close (bind_socket);
-}
-#endif
-
-int main (void)
-{
-    UNITY_BEGIN ();
-
-    zmq::initialize_network ();
-    setup_test_environment ();
-
-    RUN_TEST (test_create);
-    RUN_TEST (test_add_fd_and_start_and_receive_data);
-    RUN_TEST (test_add_fd_and_remove_by_timer);
-
-#if defined _WIN32
-    RUN_TEST (test_add_fd_with_pending_failing_connect);
-#endif
-
-    zmq::shutdown_network ();
-
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/unittests/unittest_radix_tree.cpp b/libs/libzmq/unittests/unittest_radix_tree.cpp
deleted file mode 100644
index 380b573..0000000
--- a/libs/libzmq/unittests/unittest_radix_tree.cpp
+++ /dev/null
@@ -1,290 +0,0 @@
-/*
-Copyright (c) 2018 Contributors as noted in the AUTHORS file
-
-This file is part of 0MQ.
-
-0MQ is free software; you can redistribute it and/or modify it under
-the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
-(at your option) any later version.
-
-0MQ is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "../tests/testutil.hpp"
-
-#include <radix_tree.hpp>
-#include <stdint.hpp>
-
-#include <set>
-#include <string>
-#include <string.h>
-#include <unity.h>
-#include <vector>
-
-void setUp ()
-{
-}
-void tearDown ()
-{
-}
-
-bool tree_add (zmq::radix_tree_t &tree_, const std::string &key_)
-{
-    return tree_.add (reinterpret_cast<const unsigned char *> (key_.data ()),
-                      key_.size ());
-}
-
-bool tree_rm (zmq::radix_tree_t &tree_, const std::string &key_)
-{
-    return tree_.rm (reinterpret_cast<const unsigned char *> (key_.data ()),
-                     key_.size ());
-}
-
-bool tree_check (zmq::radix_tree_t &tree_, const std::string &key_)
-{
-    return tree_.check (reinterpret_cast<const unsigned char *> (key_.data ()),
-                        key_.size ());
-}
-
-void test_empty ()
-{
-    zmq::radix_tree_t tree;
-
-    TEST_ASSERT_TRUE (tree.size () == 0);
-}
-
-void test_add_single_entry ()
-{
-    zmq::radix_tree_t tree;
-
-    TEST_ASSERT_TRUE (tree_add (tree, "foo"));
-}
-
-void test_add_same_entry_twice ()
-{
-    zmq::radix_tree_t tree;
-
-    TEST_ASSERT_TRUE (tree_add (tree, "test"));
-    TEST_ASSERT_FALSE (tree_add (tree, "test"));
-}
-
-void test_rm_when_empty ()
-{
-    zmq::radix_tree_t tree;
-
-    TEST_ASSERT_FALSE (tree_rm (tree, "test"));
-}
-
-void test_rm_single_entry ()
-{
-    zmq::radix_tree_t tree;
-
-    tree_add (tree, "temporary");
-    TEST_ASSERT_TRUE (tree_rm (tree, "temporary"));
-}
-
-void test_rm_unique_entry_twice ()
-{
-    zmq::radix_tree_t tree;
-
-    tree_add (tree, "test");
-    TEST_ASSERT_TRUE (tree_rm (tree, "test"));
-    TEST_ASSERT_FALSE (tree_rm (tree, "test"));
-}
-
-void test_rm_duplicate_entry ()
-{
-    zmq::radix_tree_t tree;
-
-    tree_add (tree, "test");
-    tree_add (tree, "test");
-    TEST_ASSERT_FALSE (tree_rm (tree, "test"));
-    TEST_ASSERT_TRUE (tree_rm (tree, "test"));
-}
-
-void test_rm_common_prefix ()
-{
-    zmq::radix_tree_t tree;
-
-    tree_add (tree, "checkpoint");
-    tree_add (tree, "checklist");
-    TEST_ASSERT_FALSE (tree_rm (tree, "check"));
-}
-
-void test_rm_common_prefix_entry ()
-{
-    zmq::radix_tree_t tree;
-
-    tree_add (tree, "checkpoint");
-    tree_add (tree, "checklist");
-    tree_add (tree, "check");
-    TEST_ASSERT_TRUE (tree_rm (tree, "check"));
-}
-
-void test_rm_null_entry ()
-{
-    zmq::radix_tree_t tree;
-
-    tree_add (tree, "");
-    TEST_ASSERT_TRUE (tree_rm (tree, ""));
-}
-
-void test_check_empty ()
-{
-    zmq::radix_tree_t tree;
-
-    TEST_ASSERT_FALSE (tree_check (tree, "foo"));
-}
-
-void test_check_added_entry ()
-{
-    zmq::radix_tree_t tree;
-
-    tree_add (tree, "entry");
-    TEST_ASSERT_TRUE (tree_check (tree, "entry"));
-}
-
-void test_check_common_prefix ()
-{
-    zmq::radix_tree_t tree;
-
-    tree_add (tree, "introduce");
-    tree_add (tree, "introspect");
-    TEST_ASSERT_FALSE (tree_check (tree, "intro"));
-}
-
-void test_check_prefix ()
-{
-    zmq::radix_tree_t tree;
-
-    tree_add (tree, "toasted");
-    TEST_ASSERT_FALSE (tree_check (tree, "toast"));
-    TEST_ASSERT_FALSE (tree_check (tree, "toaste"));
-    TEST_ASSERT_FALSE (tree_check (tree, "toaster"));
-}
-
-void test_check_nonexistent_entry ()
-{
-    zmq::radix_tree_t tree;
-
-    tree_add (tree, "red");
-    TEST_ASSERT_FALSE (tree_check (tree, "blue"));
-}
-
-void test_check_query_longer_than_entry ()
-{
-    zmq::radix_tree_t tree;
-
-    tree_add (tree, "foo");
-    TEST_ASSERT_TRUE (tree_check (tree, "foobar"));
-}
-
-void test_check_null_entry_added ()
-{
-    zmq::radix_tree_t tree;
-
-    tree_add (tree, "");
-    TEST_ASSERT_TRUE (tree_check (tree, "all queries return true"));
-}
-
-void test_size ()
-{
-    zmq::radix_tree_t tree;
-
-    // Adapted from the example on wikipedia.
-    std::vector<std::string> keys;
-    keys.push_back ("tester");
-    keys.push_back ("water");
-    keys.push_back ("slow");
-    keys.push_back ("slower");
-    keys.push_back ("test");
-    keys.push_back ("team");
-    keys.push_back ("toast");
-
-    for (size_t i = 0; i < keys.size (); ++i)
-        TEST_ASSERT_TRUE (tree_add (tree, keys[i]));
-    TEST_ASSERT_TRUE (tree.size () == keys.size ());
-    for (size_t i = 0; i < keys.size (); ++i)
-        TEST_ASSERT_FALSE (tree_add (tree, keys[i]));
-    TEST_ASSERT_TRUE (tree.size () == 2 * keys.size ());
-    for (size_t i = 0; i < keys.size (); ++i)
-        TEST_ASSERT_FALSE (tree_rm (tree, keys[i]));
-    TEST_ASSERT_TRUE (tree.size () == keys.size ());
-    for (size_t i = 0; i < keys.size (); ++i)
-        TEST_ASSERT_TRUE (tree_rm (tree, keys[i]));
-    TEST_ASSERT_TRUE (tree.size () == 0);
-}
-
-void return_key (unsigned char *data_, size_t size_, void *arg_)
-{
-    std::vector<std::string> *vec =
-      reinterpret_cast<std::vector<std::string> *> (arg_);
-    std::string key;
-    for (size_t i = 0; i < size_; ++i)
-        key.push_back (static_cast<char> (data_[i]));
-    vec->push_back (key);
-}
-
-void test_apply ()
-{
-    zmq::radix_tree_t tree;
-
-    std::set<std::string> keys;
-    keys.insert ("tester");
-    keys.insert ("water");
-    keys.insert ("slow");
-    keys.insert ("slower");
-    keys.insert ("test");
-    keys.insert ("team");
-    keys.insert ("toast");
-
-    const std::set<std::string>::iterator end = keys.end ();
-    for (std::set<std::string>::iterator it = keys.begin (); it != end; ++it)
-        tree_add (tree, *it);
-
-    std::vector<std::string> *vec = new std::vector<std::string> ();
-    tree.apply (return_key, static_cast<void *> (vec));
-    for (size_t i = 0; i < vec->size (); ++i)
-        TEST_ASSERT_TRUE (keys.count ((*vec)[i]) > 0);
-    delete vec;
-}
-
-int main (void)
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-
-    RUN_TEST (test_empty);
-    RUN_TEST (test_add_single_entry);
-    RUN_TEST (test_add_same_entry_twice);
-
-    RUN_TEST (test_rm_when_empty);
-    RUN_TEST (test_rm_single_entry);
-    RUN_TEST (test_rm_unique_entry_twice);
-    RUN_TEST (test_rm_duplicate_entry);
-    RUN_TEST (test_rm_common_prefix);
-    RUN_TEST (test_rm_common_prefix_entry);
-    RUN_TEST (test_rm_null_entry);
-
-    RUN_TEST (test_check_empty);
-    RUN_TEST (test_check_added_entry);
-    RUN_TEST (test_check_common_prefix);
-    RUN_TEST (test_check_prefix);
-    RUN_TEST (test_check_nonexistent_entry);
-    RUN_TEST (test_check_query_longer_than_entry);
-    RUN_TEST (test_check_null_entry_added);
-
-    RUN_TEST (test_size);
-
-    RUN_TEST (test_apply);
-
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/unittests/unittest_resolver_common.hpp b/libs/libzmq/unittests/unittest_resolver_common.hpp
deleted file mode 100644
index ebbc446..0000000
--- a/libs/libzmq/unittests/unittest_resolver_common.hpp
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
-Copyright (c) 2018 Contributors as noted in the AUTHORS file
-
-This file is part of 0MQ.
-
-0MQ is free software; you can redistribute it and/or modify it under
-the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
-(at your option) any later version.
-
-0MQ is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef __UNITTEST_RESOLVER_COMMON_INCLUDED__
-#define __UNITTEST_RESOLVER_COMMON_INCLUDED__
-
-#include <ip_resolver.hpp>
-#include <string.h>
-
-//  Attempt a resolution and test the results.
-//
-//  On windows we can receive an IPv4 address even when an IPv6 is requested, if
-//  we're in this situation then we compare to 'expected_addr_v4_failover_'
-//  instead.
-void validate_address (int family,
-                       const zmq::ip_addr_t *addr_,
-                       const char *expected_addr_,
-                       uint16_t expected_port_ = 0,
-                       uint16_t expected_zone_ = 0,
-                       const char *expected_addr_v4_failover_ = NULL)
-{
-#if defined ZMQ_HAVE_WINDOWS
-    if (family == AF_INET6 && expected_addr_v4_failover_ != NULL
-        && addr_->family () == AF_INET) {
-        //  We've requested an IPv6 but the system gave us an IPv4, use the
-        //  failover address
-        family = AF_INET;
-        expected_addr_ = expected_addr_v4_failover_;
-    }
-#else
-    (void) expected_addr_v4_failover_;
-#endif
-
-    TEST_ASSERT_EQUAL (family, addr_->family ());
-
-    if (family == AF_INET6) {
-        struct in6_addr expected_addr;
-        const sockaddr_in6 *ip6_addr = &addr_->ipv6;
-
-        TEST_ASSERT_EQUAL (
-          1, test_inet_pton (AF_INET6, expected_addr_, &expected_addr));
-
-        int neq = memcmp (&ip6_addr->sin6_addr, &expected_addr,
-                          sizeof (expected_addr_));
-
-        TEST_ASSERT_EQUAL (0, neq);
-        TEST_ASSERT_EQUAL (htons (expected_port_), ip6_addr->sin6_port);
-        TEST_ASSERT_EQUAL (expected_zone_, ip6_addr->sin6_scope_id);
-    } else {
-        struct in_addr expected_addr;
-        const sockaddr_in *ip4_addr = &addr_->ipv4;
-
-        TEST_ASSERT_EQUAL (
-          1, test_inet_pton (AF_INET, expected_addr_, &expected_addr));
-
-        TEST_ASSERT_EQUAL (expected_addr.s_addr, ip4_addr->sin_addr.s_addr);
-        TEST_ASSERT_EQUAL (htons (expected_port_), ip4_addr->sin_port);
-    }
-}
-
-#endif // __UNITTEST_RESOLVER_COMMON_INCLUDED__
diff --git a/libs/libzmq/unittests/unittest_udp_address.cpp b/libs/libzmq/unittests/unittest_udp_address.cpp
deleted file mode 100644
index 84dfdc5..0000000
--- a/libs/libzmq/unittests/unittest_udp_address.cpp
+++ /dev/null
@@ -1,335 +0,0 @@
-/*
-Copyright (c) 2018 Contributors as noted in the AUTHORS file
-
-This file is part of 0MQ.
-
-0MQ is free software; you can redistribute it and/or modify it under
-the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
-(at your option) any later version.
-
-0MQ is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include <unity.h>
-#include "../tests/testutil.hpp"
-#include "../unittests/unittest_resolver_common.hpp"
-
-#include <ip.hpp>
-#include <udp_address.hpp>
-
-void setUp ()
-{
-}
-
-void tearDown ()
-{
-}
-
-//  Test an UDP address resolution. If 'dest_addr_' is NULL assume the
-//  resolution is supposed to fail.
-static void test_resolve (bool bind_,
-                          int family_,
-                          const char *name_,
-                          const char *target_addr_,
-                          uint16_t expected_port_,
-                          const char *bind_addr_,
-                          bool multicast_)
-{
-    if (family_ == AF_INET6 && !is_ipv6_available ()) {
-        TEST_IGNORE_MESSAGE ("ipv6 is not available");
-    }
-
-    zmq::udp_address_t addr;
-
-    int rc = addr.resolve (name_, bind_, family_ == AF_INET6);
-
-    if (target_addr_ == NULL) {
-        TEST_ASSERT_EQUAL (-1, rc);
-        TEST_ASSERT_EQUAL (EINVAL, errno);
-        return;
-    }
-    TEST_ASSERT_EQUAL (0, rc);
-
-
-    TEST_ASSERT_EQUAL (multicast_, addr.is_mcast ());
-
-    if (bind_addr_ == NULL) {
-        // Bind ANY
-        if (family_ == AF_INET) {
-            bind_addr_ = "0.0.0.0";
-        } else {
-            bind_addr_ = "::";
-        }
-    }
-
-    validate_address (family_, addr.target_addr (), target_addr_,
-                      expected_port_);
-    validate_address (family_, addr.bind_addr (), bind_addr_, expected_port_);
-}
-
-static void test_resolve_bind (int family_,
-                               const char *name_,
-                               const char *dest_addr_,
-                               uint16_t expected_port_ = 0,
-                               const char *bind_addr_ = NULL,
-                               bool multicast_ = false)
-{
-    test_resolve (true, family_, name_, dest_addr_, expected_port_, bind_addr_,
-                  multicast_);
-}
-
-static void test_resolve_connect (int family_,
-                                  const char *name_,
-                                  const char *dest_addr_,
-                                  uint16_t expected_port_ = 0,
-                                  const char *bind_addr_ = NULL,
-                                  bool multicast_ = false)
-{
-    test_resolve (false, family_, name_, dest_addr_, expected_port_, bind_addr_,
-                  multicast_);
-}
-
-static void test_resolve_ipv4_simple ()
-{
-    test_resolve_connect (AF_INET, "127.0.0.1:5555", "127.0.0.1", 5555);
-}
-
-static void test_resolve_ipv6_simple ()
-{
-    test_resolve_connect (AF_INET6, "[::1]:123", "::1", 123);
-}
-
-static void test_resolve_ipv4_bind ()
-{
-    test_resolve_bind (AF_INET, "127.0.0.1:5555", "127.0.0.1", 5555,
-                       "127.0.0.1");
-}
-
-static void test_resolve_ipv6_bind ()
-{
-    test_resolve_bind (AF_INET6, "[abcd::1234:1]:5555", "abcd::1234:1", 5555,
-                       "abcd::1234:1");
-}
-
-static void test_resolve_ipv4_bind_any ()
-{
-    test_resolve_bind (AF_INET, "*:*", "0.0.0.0", 0, "0.0.0.0");
-}
-
-static void test_resolve_ipv6_bind_any ()
-{
-    test_resolve_bind (AF_INET6, "*:*", "::", 0, "::");
-}
-
-static void test_resolve_ipv4_bind_anyport ()
-{
-    test_resolve_bind (AF_INET, "127.0.0.1:*", "127.0.0.1", 0, "127.0.0.1");
-}
-
-static void test_resolve_ipv6_bind_anyport ()
-{
-    test_resolve_bind (AF_INET6, "[1:2:3:4::5]:*", "1:2:3:4::5", 0,
-                       "1:2:3:4::5");
-}
-
-static void test_resolve_ipv4_bind_any_port ()
-{
-    test_resolve_bind (AF_INET, "*:5555", "0.0.0.0", 5555, "0.0.0.0");
-}
-
-static void test_resolve_ipv6_bind_any_port ()
-{
-    test_resolve_bind (AF_INET6, "*:5555", "::", 5555, "::");
-}
-
-static void test_resolve_ipv4_connect_any ()
-{
-    //  Cannot use wildcard for connection
-    test_resolve_connect (AF_INET, "*:5555", NULL);
-}
-
-static void test_resolve_ipv6_connect_any ()
-{
-    //  Cannot use wildcard for connection
-    test_resolve_connect (AF_INET6, "*:5555", NULL);
-}
-
-static void test_resolve_ipv4_connect_anyport ()
-{
-    test_resolve_connect (AF_INET, "127.0.0.1:*", NULL);
-}
-
-static void test_resolve_ipv6_connect_anyport ()
-{
-    test_resolve_connect (AF_INET6, "[::1]:*", NULL);
-}
-
-static void test_resolve_ipv4_connect_port0 ()
-{
-    test_resolve_connect (AF_INET, "127.0.0.1:0", "127.0.0.1", 0);
-}
-
-static void test_resolve_ipv6_connect_port0 ()
-{
-    test_resolve_connect (AF_INET6, "[2000:abcd::1]:0", "2000:abcd::1", 0);
-}
-
-static void test_resolve_ipv4_bind_mcast ()
-{
-    test_resolve_bind (AF_INET, "239.0.0.1:1234", "239.0.0.1", 1234, "0.0.0.0",
-                       true);
-}
-
-static void test_resolve_ipv6_bind_mcast ()
-{
-    test_resolve_bind (AF_INET6, "[ff00::1]:1234", "ff00::1", 1234, "::", true);
-}
-
-static void test_resolve_ipv4_connect_mcast ()
-{
-    test_resolve_connect (AF_INET, "239.0.0.1:2222", "239.0.0.1", 2222, NULL,
-                          true);
-}
-
-static void test_resolve_ipv6_connect_mcast ()
-{
-    test_resolve_connect (AF_INET6, "[ff00::1]:2222", "ff00::1", 2222, NULL,
-                          true);
-}
-
-static void test_resolve_ipv4_mcast_src_bind ()
-{
-    test_resolve_bind (AF_INET, "127.0.0.1;230.2.8.12:5555", "230.2.8.12", 5555,
-                       "127.0.0.1", true);
-}
-
-static void test_resolve_ipv6_mcast_src_bind ()
-{
-    if (!is_ipv6_available ()) {
-        TEST_IGNORE_MESSAGE ("ipv6 is not available");
-    }
-
-    zmq::udp_address_t addr;
-    int rc = addr.resolve ("[::1];[ffab::4]:5555", true, true);
-
-    //  For the time being this fails because we only support binding multicast
-    //  by interface name, not interface IP
-    TEST_ASSERT_EQUAL (-1, rc);
-    TEST_ASSERT_EQUAL (ENODEV, errno);
-}
-
-static void test_resolve_ipv4_mcast_src_bind_any ()
-{
-    test_resolve_bind (AF_INET, "*;230.2.8.12:5555", "230.2.8.12", 5555,
-                       "0.0.0.0", true);
-}
-
-static void test_resolve_ipv6_mcast_src_bind_any ()
-{
-    test_resolve_bind (AF_INET6, "*;[ffff::]:5555", "ffff::", 5555, "::", true);
-}
-
-static void test_resolve_ipv4_mcast_src_connect ()
-{
-    test_resolve_connect (AF_INET, "8.9.10.11;230.2.8.12:5555", "230.2.8.12",
-                          5555, "8.9.10.11", true);
-}
-
-static void test_resolve_ipv6_mcast_src_connect ()
-{
-    if (!is_ipv6_available ()) {
-        TEST_IGNORE_MESSAGE ("ipv6 is not available");
-    }
-
-    zmq::udp_address_t addr;
-    int rc = addr.resolve ("[1:2:3::4];[ff01::1]:5555", false, true);
-
-    //  For the time being this fails because we only support binding multicast
-    //  by interface name, not interface IP
-    TEST_ASSERT_EQUAL (-1, rc);
-    TEST_ASSERT_EQUAL (ENODEV, errno);
-}
-
-static void test_resolve_ipv4_mcast_src_connect_any ()
-{
-    test_resolve_connect (AF_INET, "*;230.2.8.12:5555", "230.2.8.12", 5555,
-                          "0.0.0.0", true);
-}
-
-static void test_resolve_ipv6_mcast_src_connect_any ()
-{
-    test_resolve_connect (AF_INET6, "*;[ff10::1]:5555", "ff10::1", 5555,
-                          "::", true);
-}
-
-static void test_resolve_ipv4_mcast_src_bind_bad ()
-{
-    test_resolve_bind (AF_INET, "127.0.0.1;1.2.3.4:5555", NULL);
-}
-
-static void test_resolve_ipv6_mcast_src_bind_bad ()
-{
-    test_resolve_bind (AF_INET6, "[::1];[fe00::1]:5555", NULL);
-}
-
-static void test_resolve_ipv4_mcast_src_connect_bad ()
-{
-    test_resolve_connect (AF_INET, "127.0.0.1;1.2.3.4:5555", NULL);
-}
-
-static void test_resolve_ipv6_mcast_src_connect_bad ()
-{
-    test_resolve_connect (AF_INET6, "[::1];[fe00:1]:5555", NULL);
-}
-
-int main (void)
-{
-    zmq::initialize_network ();
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-
-    RUN_TEST (test_resolve_ipv4_simple);
-    RUN_TEST (test_resolve_ipv6_simple);
-    RUN_TEST (test_resolve_ipv4_bind);
-    RUN_TEST (test_resolve_ipv6_bind);
-    RUN_TEST (test_resolve_ipv4_bind_any);
-    RUN_TEST (test_resolve_ipv6_bind_any);
-    RUN_TEST (test_resolve_ipv4_bind_anyport);
-    RUN_TEST (test_resolve_ipv6_bind_anyport);
-    RUN_TEST (test_resolve_ipv4_bind_any_port);
-    RUN_TEST (test_resolve_ipv6_bind_any_port);
-    RUN_TEST (test_resolve_ipv4_connect_any);
-    RUN_TEST (test_resolve_ipv6_connect_any);
-    RUN_TEST (test_resolve_ipv4_connect_anyport);
-    RUN_TEST (test_resolve_ipv6_connect_anyport);
-    RUN_TEST (test_resolve_ipv4_connect_port0);
-    RUN_TEST (test_resolve_ipv6_connect_port0);
-    RUN_TEST (test_resolve_ipv4_bind_mcast);
-    RUN_TEST (test_resolve_ipv6_bind_mcast);
-    RUN_TEST (test_resolve_ipv4_connect_mcast);
-    RUN_TEST (test_resolve_ipv6_connect_mcast);
-    RUN_TEST (test_resolve_ipv4_mcast_src_bind);
-    RUN_TEST (test_resolve_ipv6_mcast_src_bind);
-    RUN_TEST (test_resolve_ipv4_mcast_src_bind_any);
-    RUN_TEST (test_resolve_ipv6_mcast_src_bind_any);
-    RUN_TEST (test_resolve_ipv4_mcast_src_connect);
-    RUN_TEST (test_resolve_ipv6_mcast_src_connect);
-    RUN_TEST (test_resolve_ipv4_mcast_src_connect_any);
-    RUN_TEST (test_resolve_ipv6_mcast_src_connect_any);
-    RUN_TEST (test_resolve_ipv4_mcast_src_bind_bad);
-    RUN_TEST (test_resolve_ipv6_mcast_src_bind_bad);
-    RUN_TEST (test_resolve_ipv4_mcast_src_connect_bad);
-    RUN_TEST (test_resolve_ipv6_mcast_src_connect_bad);
-
-    zmq::shutdown_network ();
-
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/unittests/unittest_ypipe.cpp b/libs/libzmq/unittests/unittest_ypipe.cpp
deleted file mode 100644
index c99717f..0000000
--- a/libs/libzmq/unittests/unittest_ypipe.cpp
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
-Copyright (c) 2018 Contributors as noted in the AUTHORS file
-
-This file is part of 0MQ.
-
-0MQ is free software; you can redistribute it and/or modify it under
-the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
-(at your option) any later version.
-
-0MQ is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "../tests/testutil.hpp"
-
-#include <ypipe.hpp>
-
-#include <unity.h>
-
-void setUp ()
-{
-}
-void tearDown ()
-{
-}
-
-void test_create ()
-{
-    zmq::ypipe_t<int, 1> ypipe;
-}
-
-void test_check_read_empty ()
-{
-    zmq::ypipe_t<int, 1> ypipe;
-    TEST_ASSERT_FALSE (ypipe.check_read ());
-}
-
-void test_read_empty ()
-{
-    zmq::ypipe_t<int, 1> ypipe;
-    int read_value = -1;
-    TEST_ASSERT_FALSE (ypipe.read (&read_value));
-    TEST_ASSERT_EQUAL (-1, read_value);
-}
-
-void test_write_complete_and_check_read_and_read ()
-{
-    const int value = 42;
-    zmq::ypipe_t<int, 1> ypipe;
-    ypipe.write (value, false);
-    TEST_ASSERT_FALSE (ypipe.check_read ());
-    int read_value = -1;
-    TEST_ASSERT_FALSE (ypipe.read (&read_value));
-    TEST_ASSERT_EQUAL_INT (-1, read_value);
-}
-
-void test_write_complete_and_flush_and_check_read_and_read ()
-{
-    const int value = 42;
-    zmq::ypipe_t<int, 1> ypipe;
-    ypipe.write (value, false);
-    ypipe.flush ();
-    TEST_ASSERT_TRUE (ypipe.check_read ());
-    int read_value = -1;
-    TEST_ASSERT_TRUE (ypipe.read (&read_value));
-    TEST_ASSERT_EQUAL_INT (value, read_value);
-}
-
-int main (void)
-{
-    setup_test_environment ();
-
-    UNITY_BEGIN ();
-    RUN_TEST (test_create);
-    RUN_TEST (test_check_read_empty);
-    RUN_TEST (test_read_empty);
-    RUN_TEST (test_write_complete_and_check_read_and_read);
-    RUN_TEST (test_write_complete_and_flush_and_check_read_and_read);
-
-    return UNITY_END ();
-}
diff --git a/libs/libzmq/version.sh b/libs/libzmq/version.sh
deleted file mode 100755
index b4425d0..0000000
--- a/libs/libzmq/version.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-#
-# This script extracts the 0MQ version from include/zmq.h, which is the master
-# location for this information.
-#
-if [ ! -f include/zmq.h ]; then
-    echo "version.sh: error: include/zmq.h does not exist" 1>&2
-    exit 1
-fi
-MAJOR=`egrep '^#define +ZMQ_VERSION_MAJOR +[0-9]+$' include/zmq.h`
-MINOR=`egrep '^#define +ZMQ_VERSION_MINOR +[0-9]+$' include/zmq.h`
-PATCH=`egrep '^#define +ZMQ_VERSION_PATCH +[0-9]+$' include/zmq.h`
-if [ -z "$MAJOR" -o -z "$MINOR" -o -z "$PATCH" ]; then
-    echo "version.sh: error: could not extract version from include/zmq.h" 1>&2
-    exit 1
-fi
-MAJOR=`echo $MAJOR | awk '{ print $3 }'`
-MINOR=`echo $MINOR | awk '{ print $3 }'`
-PATCH=`echo $PATCH | awk '{ print $3 }'`
-echo $MAJOR.$MINOR.$PATCH | tr -d '\n'
-
diff --git a/libs/protobuf b/libs/protobuf
new file mode 160000
index 0000000..d63a145
--- /dev/null
+++ b/libs/protobuf
@@ -0,0 +1 @@
+Subproject commit d63a145c7e8721f0de4954323a8c207c5f0c8b1c
diff --git a/libs/protobuf/.bazelignore b/libs/protobuf/.bazelignore
deleted file mode 100644
index 5c3a81c..0000000
--- a/libs/protobuf/.bazelignore
+++ /dev/null
@@ -1,4 +0,0 @@
-# These are fetched as external repositories.
-third_party/benchmark
-third_party/googletest
-_build/
diff --git a/libs/protobuf/.github/ISSUE_TEMPLATE/bug_report.md b/libs/protobuf/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index f9411a6..0000000
--- a/libs/protobuf/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,39 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: ''
-assignees: ''
-
----
-
-<!--
-
-NOTE: this form is for bug reports only.
-For questions or troubleshooting, please post on the protobuf mailing list:
-https://groups.google.com/forum/#!forum/protobuf 
-Stack Overflow is also a useful if unofficial resource https://stackoverflow.com/questions/tagged/protocol-buffers
--->
-
-**What version of protobuf and what language are you using?**
-Version: main/v3.6.0/v3.5.0 etc.
-Language: C++/Java/Python/C#/Ruby/PHP/Objective-C/Javascript
-
-**What operating system (Linux, Windows, ...) and version?**
-
-**What runtime / compiler are you using (e.g., python version or gcc version)**
-
-**What did you do?**
-Steps to reproduce the behavior:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-**What did you expect to see**
-
-**What did you see instead?**
-
-Make sure you include information that can help us debug (full error message, exception listing, stack trace, logs).
-
-**Anything else we should know about your project / environment**
diff --git a/libs/protobuf/.github/ISSUE_TEMPLATE/feature_request.md b/libs/protobuf/.github/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index 28b9bc9..0000000
--- a/libs/protobuf/.github/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,28 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-title: ''
-labels: ''
-assignees: ''
-
----
-
-<!--
-
-NOTE: this form is for feature requests (including cleanup requests) only. For questions or troubleshooting, please see the protobuf mailing list: https://groups.google.com/forum/#!forum/protobuf
-
--->
-
-
-**What language does this apply to?**
-If it's a proto syntax change, is it for proto2 or proto3?
-If it's about generated code change, what programming language?
-
-**Describe the problem you are trying to solve.**
-
-**Describe the solution you'd like**
-
-**Describe alternatives you've considered**
-
-**Additional context**
-Add any other context or screenshots about the feature request here.
diff --git a/libs/protobuf/.github/mergeable.yml b/libs/protobuf/.github/mergeable.yml
deleted file mode 100644
index 1768852..0000000
--- a/libs/protobuf/.github/mergeable.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-mergeable:
-  pull_requests:
-    label:
-      and:
-        - must_exclude:
-            regex: '^disposition/DO NOT MERGE'
-            message: 'Pull request marked not mergeable'
-        - or:
-          - and:
-            - must_include:
-                regex: 'release notes: yes'
-                message: 'Include release notes: yes'
-            - must_include:
-                regex: '^(autotools|bazel|c#|c\+\+|cleanup|cmake|conformance tests|integration|go|java|javascript|objective-c|php|protoc|python|ruby|kotlin)'
-                message: 'at least a language label (e.g., c++, java, python). Or apply one of the following labels: autotools, bazel, cmake, cleanup, conformance tests, integration, protoc.'
-          - must_include:
-              regex: 'release notes: no'
-              message: 'Include release notes: no'
diff --git a/libs/protobuf/.github/workflows/codespell.yml b/libs/protobuf/.github/workflows/codespell.yml
deleted file mode 100644
index 887c8a2..0000000
--- a/libs/protobuf/.github/workflows/codespell.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-# GitHub Action to automate the identification of common misspellings in text files.
-# https://github.com/codespell-project/actions-codespell
-# https://github.com/codespell-project/codespell
-name: codespell
-on: [push, pull_request]
-jobs:
-  codespell:
-    name: Check for spelling errors
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: codespell-project/actions-codespell@master
-        with:
-          check_filenames: true
-          skip: ./.git,./conformance/third_party,*.snk,*.pb,*.pb.cc,*.pb.h,./src/google/protobuf/testdata,./objectivec/Tests,./python/compatibility_tests/v2.5.0/tests/google/protobuf/internal,./.github/workflows/codespell.yml
-          ignore_words_list: "alow,alse,ba,cleare,copyable,cloneable,dedup,dur,errorprone,falsy,files',fo,fundementals,hel,importd,inout,leapyear,nd,nin,ois,ons,parseable,process',ro,te,testof,ue,unparseable,wasn,wee,gae,keyserver,objext,od,optin,streem,sur"
diff --git a/libs/protobuf/.github/workflows/objc_cocoapods.yml b/libs/protobuf/.github/workflows/objc_cocoapods.yml
deleted file mode 100644
index d828ae3..0000000
--- a/libs/protobuf/.github/workflows/objc_cocoapods.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-name: 'ObjC CocoaPods'
-
-on:
-  push:
-    paths:
-    - '.github/workflows/objc_cocoapods.yml'
-    - 'Protobuf.podspec'
-    - 'objectivec/**'
-    - '!objectivec/DevTools/**'
-    - '!objectivec/ProtocolBuffers_*.xcodeproj/**'
-    - '!objectivec/Tests/**'
-  pull_request:
-    paths:
-    - '.github/workflows/objc_cocoapods.yml'
-    - 'Protobuf.podspec'
-    - 'objectivec/**'
-    - '!objectivec/DevTools/**'
-    - '!objectivec/ProtocolBuffers_*.xcodeproj/**'
-    - '!objectivec/Tests/**'
-
-jobs:
-  pod-lib-lint:
-    runs-on: macos-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        # Add back 'watchos'. See CocoaPods/CocoaPods#11558
-        PLATFORM: ["ios", "macos", "tvos"]
-        CONFIGURATION: ["Debug", "Release"]
-    steps:
-    - uses: actions/checkout@v2
-    - name: Pod lib lint
-      run:  |
-        pod lib lint --verbose \
-          --configuration=${{ matrix.CONFIGURATION }} \
-          --platforms=${{ matrix.PLATFORM }} \
-          Protobuf.podspec
diff --git a/libs/protobuf/.github/workflows/php-ext.yml b/libs/protobuf/.github/workflows/php-ext.yml
deleted file mode 100644
index 4d3af3e..0000000
--- a/libs/protobuf/.github/workflows/php-ext.yml
+++ /dev/null
@@ -1,48 +0,0 @@
-name: PHP extension
-
-on:
-  - push
-  - pull_request
-
-jobs:
-  build-php:
-    name: Build PHP extension
-    runs-on: ubuntu-latest
-    container: ${{ matrix.php-image }}
-    strategy:
-      matrix:
-        php-image:
-          - php:7.4-cli
-          - php:8.1-cli
-    steps:
-      - name: Install python3
-        run: |
-          apt-get update -q
-          apt-get install -qy python3
-      - name: Install bazel
-        run: |
-          apt-get install -qy wget
-          mkdir $HOME/bin
-          wget -O $HOME/bin/bazel https://github.com/bazelbuild/bazel/releases/download/5.3.2/bazel-5.3.2-linux-x86_64
-          chmod a+x $HOME/bin/bazel
-      - name: Install git
-        run: |
-          apt-get update -q
-          apt-get install -qy --no-install-recommends git
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          submodules: recursive
-      - name: Create package
-        run: |
-          cd $GITHUB_WORKSPACE
-          rm -rf bazel-bin/php/protobuf-*.tgz
-          $HOME/bin/bazel build php:release
-      - name: Compile extension
-        run: |
-          cd /tmp
-          MAKE="make -j$(nproc)" pecl install $GITHUB_WORKSPACE/bazel-bin/php/protobuf-*.tgz
-      - name: Enable extension
-        run: docker-php-ext-enable protobuf
-      - name: Inspect extension
-        run: php --ri protobuf
diff --git a/libs/protobuf/.gitignore b/libs/protobuf/.gitignore
deleted file mode 100644
index 62de6f1..0000000
--- a/libs/protobuf/.gitignore
+++ /dev/null
@@ -1,217 +0,0 @@
-# autogen.sh-generated files
-Makefile.in
-src/Makefile.in
-config.guess
-config.h.in
-config.sub
-configure
-depcomp
-install-sh
-ltmain.sh
-missing
-
-aclocal.m4
-m4/libtool.m4
-m4/ltoptions.m4
-m4/ltsugar.m4
-m4/ltversion.m4
-m4/lt~obsolete.m4
-autom4te.cache
-
-# downloaded files
-/gmock
-
-# in-tree configure-generated files
-Makefile
-src/Makefile
-/config.h
-config.log
-config.status
-
-libtool
-protobuf-lite.pc
-protobuf.pc
-.deps
-stamp-h1
-
-# in-tree build products
-*.o
-*.lo
-*.la
-src/.libs
-*.so
-
-.dirstamp
-
-any_test.pb.*
-map*unittest.pb.*
-unittest*.pb.*
-src/google/protobuf/compiler/cpp/test*.pb.*
-src/google/protobuf/util/**/*.pb.cc
-src/google/protobuf/util/**/*.pb.h
-
-*.pyc
-*.egg-info
-*_pb2.py
-python/**/*.egg
-python/.eggs/
-python/.tox
-python/build/
-python/docs/_build/
-
-src/js_embed
-src/protoc
-src/unittest_proto_middleman
-
-# vim generated
-*.swp
-
-# Generated test scaffolding
-src/no_warning_test.cc
-src/no-warning-test
-src/protobuf*-test
-src/test_plugin
-src/testzip.*
-src/zcg*zip
-ar-lib
-
-test-driver
-compile
-
-src/**/*.log
-src/**/*.trs
-
-# JavaBuild output.
-java/**/target
-java/.idea
-java/**/*.iml
-
-# Windows native output.
-cmake/build
-build_msvc
-# Directories suggested by cmake/README.md
-/debug/
-/solution/
-/release/
-
-# NuGet packages: we want the repository configuration, but not the
-# packages themselves.
-/csharp/src/packages/*/
-
-# OS X's Finder creates these for state about opened windows/etc.
-**/.DS_Store
-
-# Cocoapods artifacts
-# Podfile.lock and the workspace file are tracked, to ease deleting them. That's
-# needed to trigger "pod install" to rerun the preinstall commands.
-Pods/
-
-# Conformance test output
-conformance/.libs/
-conformance/com/
-conformance/conformance-cpp
-conformance/conformance-csharp
-conformance/conformance-java
-conformance/conformance-objc
-conformance/conformance-test-runner
-conformance/conformance.pb.cc
-conformance/conformance.pb.h
-conformance/Conformance.pbobjc.h
-conformance/Conformance.pbobjc.m
-conformance/conformance_pb.js
-conformance/conformance_pb.rb
-conformance/core
-conformance/failing_tests.txt
-conformance/google/
-conformance/google-protobuf/
-conformance/javac_middleman
-conformance/lite/
-conformance/nonexistent_tests.txt
-conformance/protoc_middleman
-conformance/succeeding_tests.txt
-conformance/Conformance/
-conformance/GPBMetadata/
-conformance/Google/
-conformance/Protobuf_test_messages/
-conformance/conformance-php
-conformance/conformance-php-c
-conformance/*.class
-
-# php test output
-composer.lock
-php/.phpunit.result.cache
-php/tests/.phpunit.result.cache
-php/tests/generated/
-php/tests/old_protoc
-php/tests/phpunit-9.phar
-php/tests/protobuf/
-php/tests/core
-php/tests/vgcore*
-php/tests/multirequest.result
-php/tests/nohup.out
-php/tests/.phpunit.result.cache
-php/tests/phpunit-*
-php/ext/google/protobuf/.libs/
-php/ext/google/protobuf/Makefile.fragments
-php/ext/google/protobuf/Makefile.global
-php/ext/google/protobuf/Makefile.objects
-php/ext/google/protobuf/acinclude.m4
-php/ext/google/protobuf/build/
-php/ext/google/protobuf/bundled_php.c
-php/ext/google/protobuf/config.h
-php/ext/google/protobuf/config.h.in~
-php/ext/google/protobuf/config.nice
-php/ext/google/protobuf/configure.ac
-php/ext/google/protobuf/configure.in
-php/ext/google/protobuf/mkinstalldirs
-php/ext/google/protobuf/run-tests.php
-php/ext/google/protobuf/third_party/
-vendor/
-
-# Ignore the bazel symlinks
-/bazel-*
-
-# ruby test output
-ruby/tests/basic_test_pb.rb
-ruby/tests/basic_test_proto2_pb.rb
-ruby/tests/generated_code_pb.rb
-ruby/tests/test_import_pb.rb
-ruby/tests/test_ruby_package_pb.rb
-ruby/tests/generated_code_proto2_pb.rb
-ruby/tests/multi_level_nesting_test_pb.rb
-ruby/tests/test_import_proto2_pb.rb
-ruby/tests/test_ruby_package_proto2_pb.rb
-ruby/Gemfile.lock
-ruby/compatibility_tests/v3.0.0/protoc
-ruby/compatibility_tests/v3.0.0/tests/generated_code_pb.rb
-ruby/compatibility_tests/v3.0.0/tests/test_import_pb.rb
-
-# IntelliJ CLion Config files and build output
-cmake/.idea
-cmake/cmake-build-debug/
-
-# Common build subdirectories.
-.build/
-_build/
-
-# Visual Studio 2017
-.vs
-
-# Visual Studio Code
-/.vscode/
-
-# IntelliJ
-.idea
-*.iml
-
-# Eclipse
-**/.settings
-**/.project
-**/.classpath
-
-# BenchmarkDotNet
-BenchmarkDotNet.Artifacts/
-
-# Clangd uses these common ephemeral files
-.cache
-compile_commands.json
diff --git a/libs/protobuf/.gitmodules b/libs/protobuf/.gitmodules
deleted file mode 100644
index bcd125a..0000000
--- a/libs/protobuf/.gitmodules
+++ /dev/null
@@ -1,7 +0,0 @@
-[submodule "third_party/benchmark"]
-	path = third_party/benchmark
-	url = https://github.com/google/benchmark.git
-[submodule "third_party/googletest"]
-	path = third_party/googletest
-	url = https://github.com/google/googletest.git
-	ignore = dirty
diff --git a/libs/protobuf/.readthedocs.yml b/libs/protobuf/.readthedocs.yml
deleted file mode 100644
index 88f4c10..0000000
--- a/libs/protobuf/.readthedocs.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-# .readthedocs.yml
-# Read the Docs configuration file
-# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
-
-# Required
-version: 2
-
-sphinx:
-  configuration: python/docs/conf.py
-  fail_on_warning: false
-
-# Setup build requirements for docs.
-# Use conda so that we can install the latest libprotobuf package without
-# having to build from scratch just for docs builds.
-conda:
-  environment: python/docs/environment.yml
-
-python:
-  version: 3.7
-  install:
-    - method: setuptools
-      path: python
diff --git a/libs/protobuf/BUILD.bazel b/libs/protobuf/BUILD.bazel
deleted file mode 100644
index 0f6e41e..0000000
--- a/libs/protobuf/BUILD.bazel
+++ /dev/null
@@ -1,1368 +0,0 @@
-# Bazel (https://bazel.build/) BUILD file for Protobuf.
-
-load("@bazel_skylib//rules:common_settings.bzl", "string_flag")
-load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library", "cc_test")
-load("@rules_pkg//:mappings.bzl", "pkg_files", "strip_prefix")
-load("@rules_proto//proto:defs.bzl", "proto_lang_toolchain", "proto_library")
-load("@rules_python//python:defs.bzl", "py_library")
-load("@rules_java//java:defs.bzl", "java_binary", "java_lite_proto_library", "java_proto_library")
-load("//build_defs:cpp_opts.bzl", "COPTS", "LINK_OPTS", "PROTOC_LINK_OPTS")
-load(
-    ":protobuf.bzl",
-    "adapt_proto_library",
-    "cc_proto_library",
-    "internal_copied_filegroup",
-    "internal_protobuf_py_tests",
-    "py_proto_library",
-)
-
-licenses(["notice"])
-
-exports_files(["LICENSE"])
-
-################################################################################
-# Protobuf Runtime Library
-################################################################################
-
-cc_library(
-    name = "protobuf_lite",
-    srcs = [
-        # AUTOGEN(protobuf_lite_srcs)
-        "src/google/protobuf/any_lite.cc",
-        "src/google/protobuf/arena.cc",
-        "src/google/protobuf/arenastring.cc",
-        "src/google/protobuf/arenaz_sampler.cc",
-        "src/google/protobuf/extension_set.cc",
-        "src/google/protobuf/generated_enum_util.cc",
-        "src/google/protobuf/generated_message_tctable_lite.cc",
-        "src/google/protobuf/generated_message_util.cc",
-        "src/google/protobuf/implicit_weak_message.cc",
-        "src/google/protobuf/inlined_string_field.cc",
-        "src/google/protobuf/io/coded_stream.cc",
-        "src/google/protobuf/io/io_win32.cc",
-        "src/google/protobuf/io/strtod.cc",
-        "src/google/protobuf/io/zero_copy_stream.cc",
-        "src/google/protobuf/io/zero_copy_stream_impl.cc",
-        "src/google/protobuf/io/zero_copy_stream_impl_lite.cc",
-        "src/google/protobuf/map.cc",
-        "src/google/protobuf/message_lite.cc",
-        "src/google/protobuf/parse_context.cc",
-        "src/google/protobuf/repeated_field.cc",
-        "src/google/protobuf/repeated_ptr_field.cc",
-        "src/google/protobuf/stubs/bytestream.cc",
-        "src/google/protobuf/stubs/common.cc",
-        "src/google/protobuf/stubs/int128.cc",
-        "src/google/protobuf/stubs/status.cc",
-        "src/google/protobuf/stubs/statusor.cc",
-        "src/google/protobuf/stubs/stringpiece.cc",
-        "src/google/protobuf/stubs/stringprintf.cc",
-        "src/google/protobuf/stubs/structurally_valid.cc",
-        "src/google/protobuf/stubs/strutil.cc",
-        "src/google/protobuf/stubs/time.cc",
-        "src/google/protobuf/wire_format_lite.cc",
-    ],
-    hdrs = glob([
-        "src/google/protobuf/**/*.h",
-        "src/google/protobuf/**/*.inc",
-    ]),
-    copts = COPTS,
-    includes = ["src/"],
-    linkopts = LINK_OPTS,
-    visibility = ["//visibility:public"],
-)
-
-cc_library(
-    name = "protobuf",
-    srcs = [
-        # AUTOGEN(protobuf_srcs)
-        "src/google/protobuf/any.cc",
-        "src/google/protobuf/any.pb.cc",
-        "src/google/protobuf/api.pb.cc",
-        "src/google/protobuf/compiler/importer.cc",
-        "src/google/protobuf/compiler/parser.cc",
-        "src/google/protobuf/descriptor.cc",
-        "src/google/protobuf/descriptor.pb.cc",
-        "src/google/protobuf/descriptor_database.cc",
-        "src/google/protobuf/duration.pb.cc",
-        "src/google/protobuf/dynamic_message.cc",
-        "src/google/protobuf/empty.pb.cc",
-        "src/google/protobuf/extension_set_heavy.cc",
-        "src/google/protobuf/field_mask.pb.cc",
-        "src/google/protobuf/generated_message_bases.cc",
-        "src/google/protobuf/generated_message_reflection.cc",
-        "src/google/protobuf/generated_message_tctable_full.cc",
-        "src/google/protobuf/io/gzip_stream.cc",
-        "src/google/protobuf/io/printer.cc",
-        "src/google/protobuf/io/tokenizer.cc",
-        "src/google/protobuf/map_field.cc",
-        "src/google/protobuf/message.cc",
-        "src/google/protobuf/reflection_ops.cc",
-        "src/google/protobuf/service.cc",
-        "src/google/protobuf/source_context.pb.cc",
-        "src/google/protobuf/struct.pb.cc",
-        "src/google/protobuf/stubs/substitute.cc",
-        "src/google/protobuf/text_format.cc",
-        "src/google/protobuf/timestamp.pb.cc",
-        "src/google/protobuf/type.pb.cc",
-        "src/google/protobuf/unknown_field_set.cc",
-        "src/google/protobuf/util/delimited_message_util.cc",
-        "src/google/protobuf/util/field_comparator.cc",
-        "src/google/protobuf/util/field_mask_util.cc",
-        "src/google/protobuf/util/internal/datapiece.cc",
-        "src/google/protobuf/util/internal/default_value_objectwriter.cc",
-        "src/google/protobuf/util/internal/error_listener.cc",
-        "src/google/protobuf/util/internal/field_mask_utility.cc",
-        "src/google/protobuf/util/internal/json_escaping.cc",
-        "src/google/protobuf/util/internal/json_objectwriter.cc",
-        "src/google/protobuf/util/internal/json_stream_parser.cc",
-        "src/google/protobuf/util/internal/object_writer.cc",
-        "src/google/protobuf/util/internal/proto_writer.cc",
-        "src/google/protobuf/util/internal/protostream_objectsource.cc",
-        "src/google/protobuf/util/internal/protostream_objectwriter.cc",
-        "src/google/protobuf/util/internal/type_info.cc",
-        "src/google/protobuf/util/internal/utility.cc",
-        "src/google/protobuf/util/json_util.cc",
-        "src/google/protobuf/util/message_differencer.cc",
-        "src/google/protobuf/util/time_util.cc",
-        "src/google/protobuf/util/type_resolver_util.cc",
-        "src/google/protobuf/wire_format.cc",
-        "src/google/protobuf/wrappers.pb.cc",
-    ],
-    hdrs = glob([
-        "src/**/*.h",
-        "src/**/*.inc",
-    ]),
-    copts = COPTS,
-    includes = ["src/"],
-    linkopts = LINK_OPTS,
-    visibility = ["//visibility:public"],
-    deps = [":protobuf_lite"] + select({
-        "//build_defs:config_msvc": [],
-        "//conditions:default": ["@zlib//:zlib"],
-    }),
-)
-
-# This provides just the header files for use in projects that need to build
-# shared libraries for dynamic loading. This target is available until Bazel
-# adds native support for such use cases.
-# TODO(keveman): Remove this target once the support gets added to Bazel.
-cc_library(
-    name = "protobuf_headers",
-    hdrs = glob([
-        "src/**/*.h",
-        "src/**/*.inc",
-    ]),
-    includes = ["src/"],
-    visibility = ["//visibility:public"],
-)
-
-# DEPRECATED: Prefer :well_known_type_protos for the Well-Known Types
-# (https://developers.google.com/protocol-buffers/docs/reference/google.protobuf)
-# or :descriptor_proto(_srcs) for descriptor.proto (source), or
-# :compiler_plugin_proto for compiler/plugin.proto.
-filegroup(
-    name = "well_known_protos",
-    srcs = [
-        "src/google/protobuf/compiler/plugin.proto",
-        "src/google/protobuf/descriptor.proto",
-        ":well_known_type_protos",
-    ],
-    deprecation = "Prefer :well_known_type_protos instead.",
-    visibility = ["//visibility:public"],
-)
-
-filegroup(
-    name = "well_known_type_protos",
-    srcs = [
-        "src/google/protobuf/any.proto",
-        "src/google/protobuf/api.proto",
-        "src/google/protobuf/duration.proto",
-        "src/google/protobuf/empty.proto",
-        "src/google/protobuf/field_mask.proto",
-        "src/google/protobuf/source_context.proto",
-        "src/google/protobuf/struct.proto",
-        "src/google/protobuf/timestamp.proto",
-        "src/google/protobuf/type.proto",
-        "src/google/protobuf/wrappers.proto",
-    ],
-    visibility = ["//visibility:public"],
-)
-
-filegroup(
-    name = "built_in_runtime_protos",
-    srcs = [
-        "src/google/protobuf/compiler/plugin.proto",
-        "src/google/protobuf/descriptor.proto",
-    ],
-    visibility = ["//:__subpackages__"],
-)
-
-exports_files(
-    srcs = [
-        "src/google/protobuf/any.proto",
-        "src/google/protobuf/api.proto",
-        "src/google/protobuf/compiler/plugin.proto",
-        "src/google/protobuf/descriptor.proto",
-        "src/google/protobuf/duration.proto",
-        "src/google/protobuf/empty.proto",
-        "src/google/protobuf/field_mask.proto",
-        "src/google/protobuf/source_context.proto",
-        "src/google/protobuf/struct.proto",
-        "src/google/protobuf/timestamp.proto",
-        "src/google/protobuf/type.proto",
-        "src/google/protobuf/wrappers.proto",
-    ],
-    visibility = ["//pkg:__pkg__"],
-)
-
-alias(
-    name = "lite_well_known_protos",
-    actual = ":well_known_type_protos",
-    visibility = ["//visibility:public"],
-)
-
-adapt_proto_library(
-    name = "cc_wkt_protos_genproto",
-    visibility = ["//visibility:public"],
-    deps = [
-        "//:any_proto",
-        "//:api_proto",
-        "//:compiler_plugin_proto",
-        "//:descriptor_proto",
-        "//:duration_proto",
-        "//:empty_proto",
-        "//:field_mask_proto",
-        "//:source_context_proto",
-        "//:struct_proto",
-        "//:timestamp_proto",
-        "//:type_proto",
-        "//:wrappers_proto",
-    ],
-)
-
-cc_library(
-    name = "cc_wkt_protos",
-    deprecation = "Only for backward compatibility. Do not use.",
-    visibility = ["//visibility:public"],
-)
-
-################################################################################
-# Well Known Types Proto Library Rules
-#
-# https://developers.google.com/protocol-buffers/docs/reference/google.protobuf
-################################################################################
-# These proto_library rules can be used with one of the language specific proto
-# library rules i.e. java_proto_library:
-#
-# java_proto_library(
-#   name = "any_java_proto",
-#   deps = ["@com_google_protobuf//:any_proto],
-# )
-################################################################################
-
-proto_library(
-    name = "any_proto",
-    srcs = ["src/google/protobuf/any.proto"],
-    strip_import_prefix = "src",
-    visibility = ["//visibility:public"],
-)
-
-proto_library(
-    name = "api_proto",
-    srcs = ["src/google/protobuf/api.proto"],
-    strip_import_prefix = "src",
-    visibility = ["//visibility:public"],
-    deps = [
-        "//:source_context_proto",
-        "//:type_proto",
-    ],
-)
-
-proto_library(
-    name = "duration_proto",
-    srcs = ["//:src/google/protobuf/duration.proto"],
-    strip_import_prefix = "src",
-    visibility = ["//visibility:public"],
-)
-
-proto_library(
-    name = "empty_proto",
-    srcs = ["src/google/protobuf/empty.proto"],
-    strip_import_prefix = "src",
-    visibility = ["//visibility:public"],
-)
-
-proto_library(
-    name = "field_mask_proto",
-    srcs = ["src/google/protobuf/field_mask.proto"],
-    strip_import_prefix = "src",
-    visibility = ["//visibility:public"],
-)
-
-proto_library(
-    name = "source_context_proto",
-    srcs = ["src/google/protobuf/source_context.proto"],
-    strip_import_prefix = "src",
-    visibility = ["//visibility:public"],
-)
-
-proto_library(
-    name = "struct_proto",
-    srcs = ["src/google/protobuf/struct.proto"],
-    strip_import_prefix = "src",
-    visibility = ["//visibility:public"],
-)
-
-proto_library(
-    name = "timestamp_proto",
-    srcs = ["src/google/protobuf/timestamp.proto"],
-    strip_import_prefix = "src",
-    visibility = ["//visibility:public"],
-)
-
-proto_library(
-    name = "type_proto",
-    srcs = ["src/google/protobuf/type.proto"],
-    strip_import_prefix = "src",
-    visibility = ["//visibility:public"],
-    deps = [
-        "//:any_proto",
-        "//:source_context_proto",
-    ],
-)
-
-proto_library(
-    name = "wrappers_proto",
-    srcs = ["src/google/protobuf/wrappers.proto"],
-    strip_import_prefix = "src",
-    visibility = ["//visibility:public"],
-)
-
-# Built-in runtime types
-
-proto_library(
-    name = "compiler_plugin_proto",
-    srcs = ["src/google/protobuf/compiler/plugin.proto"],
-    strip_import_prefix = "src",
-    visibility = ["//visibility:public"],
-    deps = ["//:descriptor_proto"],
-)
-
-proto_library(
-    name = "descriptor_proto",
-    srcs = ["src/google/protobuf/descriptor.proto"],
-    strip_import_prefix = "src",
-    visibility = ["//visibility:public"],
-)
-
-################################################################################
-# Protocol Buffers Compiler
-################################################################################
-
-cc_library(
-    name = "protoc_lib",
-    srcs = [
-        # AUTOGEN(protoc_lib_srcs)
-        "src/google/protobuf/compiler/code_generator.cc",
-        "src/google/protobuf/compiler/command_line_interface.cc",
-        "src/google/protobuf/compiler/cpp/enum.cc",
-        "src/google/protobuf/compiler/cpp/enum_field.cc",
-        "src/google/protobuf/compiler/cpp/extension.cc",
-        "src/google/protobuf/compiler/cpp/field.cc",
-        "src/google/protobuf/compiler/cpp/file.cc",
-        "src/google/protobuf/compiler/cpp/generator.cc",
-        "src/google/protobuf/compiler/cpp/helpers.cc",
-        "src/google/protobuf/compiler/cpp/map_field.cc",
-        "src/google/protobuf/compiler/cpp/message.cc",
-        "src/google/protobuf/compiler/cpp/message_field.cc",
-        "src/google/protobuf/compiler/cpp/padding_optimizer.cc",
-        "src/google/protobuf/compiler/cpp/parse_function_generator.cc",
-        "src/google/protobuf/compiler/cpp/primitive_field.cc",
-        "src/google/protobuf/compiler/cpp/service.cc",
-        "src/google/protobuf/compiler/cpp/string_field.cc",
-        "src/google/protobuf/compiler/csharp/csharp_doc_comment.cc",
-        "src/google/protobuf/compiler/csharp/csharp_enum.cc",
-        "src/google/protobuf/compiler/csharp/csharp_enum_field.cc",
-        "src/google/protobuf/compiler/csharp/csharp_field_base.cc",
-        "src/google/protobuf/compiler/csharp/csharp_generator.cc",
-        "src/google/protobuf/compiler/csharp/csharp_helpers.cc",
-        "src/google/protobuf/compiler/csharp/csharp_map_field.cc",
-        "src/google/protobuf/compiler/csharp/csharp_message.cc",
-        "src/google/protobuf/compiler/csharp/csharp_message_field.cc",
-        "src/google/protobuf/compiler/csharp/csharp_primitive_field.cc",
-        "src/google/protobuf/compiler/csharp/csharp_reflection_class.cc",
-        "src/google/protobuf/compiler/csharp/csharp_repeated_enum_field.cc",
-        "src/google/protobuf/compiler/csharp/csharp_repeated_message_field.cc",
-        "src/google/protobuf/compiler/csharp/csharp_repeated_primitive_field.cc",
-        "src/google/protobuf/compiler/csharp/csharp_source_generator_base.cc",
-        "src/google/protobuf/compiler/csharp/csharp_wrapper_field.cc",
-        "src/google/protobuf/compiler/java/context.cc",
-        "src/google/protobuf/compiler/java/doc_comment.cc",
-        "src/google/protobuf/compiler/java/enum.cc",
-        "src/google/protobuf/compiler/java/enum_field.cc",
-        "src/google/protobuf/compiler/java/enum_field_lite.cc",
-        "src/google/protobuf/compiler/java/enum_lite.cc",
-        "src/google/protobuf/compiler/java/extension.cc",
-        "src/google/protobuf/compiler/java/extension_lite.cc",
-        "src/google/protobuf/compiler/java/field.cc",
-        "src/google/protobuf/compiler/java/file.cc",
-        "src/google/protobuf/compiler/java/generator.cc",
-        "src/google/protobuf/compiler/java/generator_factory.cc",
-        "src/google/protobuf/compiler/java/helpers.cc",
-        "src/google/protobuf/compiler/java/kotlin_generator.cc",
-        "src/google/protobuf/compiler/java/map_field.cc",
-        "src/google/protobuf/compiler/java/map_field_lite.cc",
-        "src/google/protobuf/compiler/java/message.cc",
-        "src/google/protobuf/compiler/java/message_builder.cc",
-        "src/google/protobuf/compiler/java/message_builder_lite.cc",
-        "src/google/protobuf/compiler/java/message_field.cc",
-        "src/google/protobuf/compiler/java/message_field_lite.cc",
-        "src/google/protobuf/compiler/java/message_lite.cc",
-        "src/google/protobuf/compiler/java/name_resolver.cc",
-        "src/google/protobuf/compiler/java/primitive_field.cc",
-        "src/google/protobuf/compiler/java/primitive_field_lite.cc",
-        "src/google/protobuf/compiler/java/service.cc",
-        "src/google/protobuf/compiler/java/shared_code_generator.cc",
-        "src/google/protobuf/compiler/java/string_field.cc",
-        "src/google/protobuf/compiler/java/string_field_lite.cc",
-        "src/google/protobuf/compiler/objectivec/objectivec_enum.cc",
-        "src/google/protobuf/compiler/objectivec/objectivec_enum_field.cc",
-        "src/google/protobuf/compiler/objectivec/objectivec_extension.cc",
-        "src/google/protobuf/compiler/objectivec/objectivec_field.cc",
-        "src/google/protobuf/compiler/objectivec/objectivec_file.cc",
-        "src/google/protobuf/compiler/objectivec/objectivec_generator.cc",
-        "src/google/protobuf/compiler/objectivec/objectivec_helpers.cc",
-        "src/google/protobuf/compiler/objectivec/objectivec_map_field.cc",
-        "src/google/protobuf/compiler/objectivec/objectivec_message.cc",
-        "src/google/protobuf/compiler/objectivec/objectivec_message_field.cc",
-        "src/google/protobuf/compiler/objectivec/objectivec_oneof.cc",
-        "src/google/protobuf/compiler/objectivec/objectivec_primitive_field.cc",
-        "src/google/protobuf/compiler/php/php_generator.cc",
-        "src/google/protobuf/compiler/plugin.cc",
-        "src/google/protobuf/compiler/plugin.pb.cc",
-        "src/google/protobuf/compiler/python/generator.cc",
-        "src/google/protobuf/compiler/python/helpers.cc",
-        "src/google/protobuf/compiler/python/pyi_generator.cc",
-        "src/google/protobuf/compiler/ruby/ruby_generator.cc",
-        "src/google/protobuf/compiler/subprocess.cc",
-        "src/google/protobuf/compiler/zip_writer.cc",
-    ],
-    copts = COPTS,
-    includes = ["src/"],
-    linkopts = LINK_OPTS,
-    visibility = ["//visibility:public"],
-    deps = [":protobuf"],
-)
-
-cc_binary(
-    name = "protoc",
-    srcs = ["src/google/protobuf/compiler/main.cc"],
-    linkopts = LINK_OPTS + PROTOC_LINK_OPTS,
-    visibility = ["//visibility:public"],
-    deps = [":protoc_lib"],
-)
-
-################################################################################
-# Tests
-################################################################################
-
-filegroup(
-    name = "testdata",
-    srcs = glob(["src/google/protobuf/testdata/**/*"]),
-    visibility = [
-        "//:__subpackages__",
-        "@upb//:__subpackages__",
-    ],
-)
-
-RELATIVE_LITE_TEST_PROTOS = [
-    # AUTOGEN(lite_test_protos)
-    "google/protobuf/map_lite_unittest.proto",
-    "google/protobuf/unittest_import_lite.proto",
-    "google/protobuf/unittest_import_public_lite.proto",
-    "google/protobuf/unittest_lite.proto",
-]
-
-LITE_TEST_PROTOS = ["src/" + s for s in RELATIVE_LITE_TEST_PROTOS]
-
-RELATIVE_TEST_PROTOS = [
-    # AUTOGEN(test_protos)
-    "google/protobuf/any_test.proto",
-    "google/protobuf/compiler/cpp/test_bad_identifiers.proto",
-    "google/protobuf/compiler/cpp/test_large_enum_value.proto",
-    "google/protobuf/map_proto2_unittest.proto",
-    "google/protobuf/map_unittest.proto",
-    "google/protobuf/unittest.proto",
-    "google/protobuf/unittest_arena.proto",
-    "google/protobuf/unittest_custom_options.proto",
-    "google/protobuf/unittest_drop_unknown_fields.proto",
-    "google/protobuf/unittest_embed_optimize_for.proto",
-    "google/protobuf/unittest_empty.proto",
-    "google/protobuf/unittest_enormous_descriptor.proto",
-    "google/protobuf/unittest_import.proto",
-    "google/protobuf/unittest_import_public.proto",
-    "google/protobuf/unittest_lazy_dependencies.proto",
-    "google/protobuf/unittest_lazy_dependencies_custom_option.proto",
-    "google/protobuf/unittest_lazy_dependencies_enum.proto",
-    "google/protobuf/unittest_lite_imports_nonlite.proto",
-    "google/protobuf/unittest_mset.proto",
-    "google/protobuf/unittest_mset_wire_format.proto",
-    "google/protobuf/unittest_no_field_presence.proto",
-    "google/protobuf/unittest_no_generic_services.proto",
-    "google/protobuf/unittest_optimize_for.proto",
-    "google/protobuf/unittest_preserve_unknown_enum.proto",
-    "google/protobuf/unittest_preserve_unknown_enum2.proto",
-    "google/protobuf/unittest_proto3.proto",
-    "google/protobuf/unittest_proto3_arena.proto",
-    "google/protobuf/unittest_proto3_arena_lite.proto",
-    "google/protobuf/unittest_proto3_lite.proto",
-    "google/protobuf/unittest_proto3_optional.proto",
-    "google/protobuf/unittest_well_known_types.proto",
-    "google/protobuf/util/internal/testdata/anys.proto",
-    "google/protobuf/util/internal/testdata/books.proto",
-    "google/protobuf/util/internal/testdata/default_value.proto",
-    "google/protobuf/util/internal/testdata/default_value_test.proto",
-    "google/protobuf/util/internal/testdata/field_mask.proto",
-    "google/protobuf/util/internal/testdata/maps.proto",
-    "google/protobuf/util/internal/testdata/oneofs.proto",
-    "google/protobuf/util/internal/testdata/proto3.proto",
-    "google/protobuf/util/internal/testdata/struct.proto",
-    "google/protobuf/util/internal/testdata/timestamp_duration.proto",
-    "google/protobuf/util/internal/testdata/wrappers.proto",
-    "google/protobuf/util/json_format.proto",
-    "google/protobuf/util/json_format_proto3.proto",
-    "google/protobuf/util/message_differencer_unittest.proto",
-]
-
-TEST_PROTOS = ["src/" + s for s in RELATIVE_TEST_PROTOS]
-
-GENERIC_RELATIVE_TEST_PROTOS = [
-    "google/protobuf/map_proto2_unittest.proto",
-    "google/protobuf/map_unittest.proto",
-    "google/protobuf/unittest.proto",
-    "google/protobuf/unittest_arena.proto",
-    "google/protobuf/unittest_custom_options.proto",
-    "google/protobuf/unittest_drop_unknown_fields.proto",
-    "google/protobuf/unittest_embed_optimize_for.proto",
-    "google/protobuf/unittest_empty.proto",
-    "google/protobuf/unittest_enormous_descriptor.proto",
-    "google/protobuf/unittest_import.proto",
-    "google/protobuf/unittest_import_public.proto",
-    "google/protobuf/unittest_lazy_dependencies.proto",
-    "google/protobuf/unittest_lazy_dependencies_custom_option.proto",
-    "google/protobuf/unittest_lazy_dependencies_enum.proto",
-    "google/protobuf/unittest_lite_imports_nonlite.proto",
-    "google/protobuf/unittest_mset.proto",
-    "google/protobuf/unittest_mset_wire_format.proto",
-    "google/protobuf/unittest_no_field_presence.proto",
-    "google/protobuf/unittest_no_generic_services.proto",
-    "google/protobuf/unittest_optimize_for.proto",
-    "google/protobuf/unittest_preserve_unknown_enum.proto",
-    "google/protobuf/unittest_preserve_unknown_enum2.proto",
-    "google/protobuf/unittest_proto3.proto",
-    "google/protobuf/unittest_proto3_arena.proto",
-    "google/protobuf/unittest_proto3_arena_lite.proto",
-    "google/protobuf/unittest_proto3_lite.proto",
-    "google/protobuf/unittest_proto3_optional.proto",
-    "google/protobuf/unittest_well_known_types.proto",
-]
-
-GENERIC_TEST_PROTOS = ["src/" + s for s in GENERIC_RELATIVE_TEST_PROTOS]
-
-proto_library(
-    name = "generic_test_protos",
-    srcs = LITE_TEST_PROTOS + GENERIC_TEST_PROTOS,
-    strip_import_prefix = "src",
-    visibility = ["//:__subpackages__"],
-    deps = [
-        "//:any_proto",
-        "//:api_proto",
-        "//:descriptor_proto",
-        "//:duration_proto",
-        "//:empty_proto",
-        "//:field_mask_proto",
-        "//:source_context_proto",
-        "//:struct_proto",
-        "//:timestamp_proto",
-        "//:type_proto",
-        "//:wrappers_proto",
-    ],
-)
-
-cc_proto_library(
-    name = "cc_test_protos",
-    srcs = LITE_TEST_PROTOS + TEST_PROTOS,
-    include = "src",
-    default_runtime = ":protobuf",
-    protoc = ":protoc",
-    deps = [":cc_wkt_protos"],
-)
-
-COMMON_TEST_SRCS = [
-    # AUTOGEN(common_test_srcs)
-    "src/google/protobuf/arena_test_util.cc",
-    "src/google/protobuf/map_lite_test_util.cc",
-    "src/google/protobuf/test_util_lite.cc",
-    "src/google/protobuf/map_test_util.inc",
-    "src/google/protobuf/reflection_tester.cc",
-    "src/google/protobuf/test_util.cc",
-    "src/google/protobuf/test_util.inc",
-    "src/google/protobuf/testing/file.cc",
-    "src/google/protobuf/testing/googletest.cc",
-]
-
-cc_binary(
-    name = "test_plugin",
-    testonly = True,
-    srcs = [
-        # AUTOGEN(test_plugin_srcs)
-        "src/google/protobuf/compiler/mock_code_generator.cc",
-        "src/google/protobuf/compiler/test_plugin.cc",
-        "src/google/protobuf/testing/file.cc",
-    ],
-    deps = [
-        ":protobuf",
-        ":protoc_lib",
-        "@com_google_googletest//:gtest",
-    ],
-)
-
-cc_test(
-    name = "win32_test",
-    srcs = ["src/google/protobuf/io/io_win32_unittest.cc"],
-    tags = [
-        "manual",
-        "windows",
-    ],
-    deps = [
-        ":protobuf_lite",
-        "@com_google_googletest//:gtest",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
-cc_test(
-    name = "protobuf_test",
-    srcs = COMMON_TEST_SRCS + [
-        # AUTOGEN(test_srcs)
-        "src/google/protobuf/any_test.cc",
-        "src/google/protobuf/arena_unittest.cc",
-        "src/google/protobuf/arenastring_unittest.cc",
-        "src/google/protobuf/arenaz_sampler_test.cc",
-        "src/google/protobuf/compiler/annotation_test_util.cc",
-        "src/google/protobuf/compiler/command_line_interface_unittest.cc",
-        "src/google/protobuf/compiler/cpp/bootstrap_unittest.cc",
-        "src/google/protobuf/compiler/cpp/metadata_test.cc",
-        "src/google/protobuf/compiler/cpp/move_unittest.cc",
-        "src/google/protobuf/compiler/cpp/plugin_unittest.cc",
-        "src/google/protobuf/compiler/cpp/unittest.cc",
-        "src/google/protobuf/compiler/cpp/unittest.inc",
-        "src/google/protobuf/compiler/csharp/csharp_bootstrap_unittest.cc",
-        "src/google/protobuf/compiler/csharp/csharp_generator_unittest.cc",
-        "src/google/protobuf/compiler/importer_unittest.cc",
-        "src/google/protobuf/compiler/java/doc_comment_unittest.cc",
-        "src/google/protobuf/compiler/java/plugin_unittest.cc",
-        "src/google/protobuf/compiler/mock_code_generator.cc",
-        "src/google/protobuf/compiler/objectivec/objectivec_helpers_unittest.cc",
-        "src/google/protobuf/compiler/parser_unittest.cc",
-        "src/google/protobuf/compiler/python/plugin_unittest.cc",
-        "src/google/protobuf/compiler/ruby/ruby_generator_unittest.cc",
-        "src/google/protobuf/descriptor_database_unittest.cc",
-        "src/google/protobuf/descriptor_unittest.cc",
-        "src/google/protobuf/drop_unknown_fields_test.cc",
-        "src/google/protobuf/dynamic_message_unittest.cc",
-        "src/google/protobuf/extension_set_unittest.cc",
-        "src/google/protobuf/generated_message_reflection_unittest.cc",
-        "src/google/protobuf/generated_message_tctable_lite_test.cc",
-        "src/google/protobuf/inlined_string_field_unittest.cc",
-        "src/google/protobuf/io/coded_stream_unittest.cc",
-        "src/google/protobuf/io/io_win32_unittest.cc",
-        "src/google/protobuf/io/printer_unittest.cc",
-        "src/google/protobuf/io/tokenizer_unittest.cc",
-        "src/google/protobuf/io/zero_copy_stream_unittest.cc",
-        "src/google/protobuf/map_field_test.cc",
-        "src/google/protobuf/map_test.cc",
-        "src/google/protobuf/map_test.inc",
-        "src/google/protobuf/message_unittest.cc",
-        "src/google/protobuf/message_unittest.inc",
-        "src/google/protobuf/no_field_presence_test.cc",
-        "src/google/protobuf/preserve_unknown_enum_test.cc",
-        "src/google/protobuf/proto3_arena_lite_unittest.cc",
-        "src/google/protobuf/proto3_arena_unittest.cc",
-        "src/google/protobuf/proto3_lite_unittest.cc",
-        "src/google/protobuf/proto3_lite_unittest.inc",
-        "src/google/protobuf/reflection_ops_unittest.cc",
-        "src/google/protobuf/repeated_field_reflection_unittest.cc",
-        "src/google/protobuf/repeated_field_unittest.cc",
-        "src/google/protobuf/stubs/bytestream_unittest.cc",
-        "src/google/protobuf/stubs/common_unittest.cc",
-        "src/google/protobuf/stubs/int128_unittest.cc",
-        "src/google/protobuf/stubs/status_test.cc",
-        "src/google/protobuf/stubs/statusor_test.cc",
-        "src/google/protobuf/stubs/stringpiece_unittest.cc",
-        "src/google/protobuf/stubs/stringprintf_unittest.cc",
-        "src/google/protobuf/stubs/structurally_valid_unittest.cc",
-        "src/google/protobuf/stubs/strutil_unittest.cc",
-        "src/google/protobuf/stubs/template_util_unittest.cc",
-        "src/google/protobuf/stubs/time_test.cc",
-        "src/google/protobuf/text_format_unittest.cc",
-        "src/google/protobuf/unknown_field_set_unittest.cc",
-        "src/google/protobuf/util/delimited_message_util_test.cc",
-        "src/google/protobuf/util/field_comparator_test.cc",
-        "src/google/protobuf/util/field_mask_util_test.cc",
-        "src/google/protobuf/util/internal/default_value_objectwriter_test.cc",
-        "src/google/protobuf/util/internal/json_objectwriter_test.cc",
-        "src/google/protobuf/util/internal/json_stream_parser_test.cc",
-        "src/google/protobuf/util/internal/protostream_objectsource_test.cc",
-        "src/google/protobuf/util/internal/protostream_objectwriter_test.cc",
-        "src/google/protobuf/util/internal/type_info_test_helper.cc",
-        "src/google/protobuf/util/json_util_test.cc",
-        "src/google/protobuf/util/message_differencer_unittest.cc",
-        "src/google/protobuf/util/time_util_test.cc",
-        "src/google/protobuf/util/type_resolver_util_test.cc",
-        "src/google/protobuf/well_known_types_unittest.cc",
-        "src/google/protobuf/wire_format_unittest.cc",
-        "src/google/protobuf/wire_format_unittest.inc",
-    ],
-    copts = COPTS + select({
-        "//build_defs:config_msvc": [],
-        "//conditions:default": [
-            "-Wno-deprecated-declarations",
-        ],
-    }),
-    data = [
-        # Files for csharp_bootstrap_unittest.cc.
-        "//conformance:all_files",
-        ":test_plugin",
-    ] + glob([
-        "src/google/protobuf/**/*",
-    ]) + glob(
-        [
-            # Files for csharp_bootstrap_unittest.cc.
-            "csharp/src/**/*",
-        ],
-        allow_empty = True,
-    ),
-    includes = [
-        "src/",
-    ],
-    linkopts = LINK_OPTS,
-    deps = [
-        ":cc_test_protos",
-        ":protobuf",
-        ":protoc_lib",
-        "@com_google_googletest//:gtest",
-        "@com_google_googletest//:gtest_main",
-    ] + select({
-        "//build_defs:config_msvc": [],
-        "//conditions:default": ["@zlib//:zlib"],
-    }),
-)
-
-################################################################################
-# Java support
-################################################################################
-
-alias(
-    name = "protobuf_java",
-    actual = "//java/core",
-    visibility = ["//visibility:public"],
-)
-
-alias(
-    name = "protobuf_javalite",
-    actual = "//java/lite",
-    visibility = ["//visibility:public"],
-)
-
-alias(
-    name = "protobuf_java_util",
-    actual = "//java/util",
-    visibility = ["//visibility:public"],
-)
-
-alias(
-    name = "java_toolchain",
-    actual = "//java/core:toolchain",
-    visibility = ["//visibility:public"],
-)
-
-alias(
-    name = "javalite_toolchain",
-    actual = "//java/lite:toolchain",
-    visibility = ["//visibility:public"],
-)
-
-################################################################################
-# Python support
-################################################################################
-
-py_library(
-    name = "python_srcs",
-    srcs = glob(
-        [
-            "python/google/protobuf/**/*.py",
-        ],
-    ),
-    imports = ["python"],
-    srcs_version = "PY2AND3",
-    visibility = ["@upb//:__subpackages__"],
-)
-
-py_library(
-    name = "python_test_srcs",
-    srcs = glob(
-        [
-            "python/google/protobuf/internal/*_test.py",
-            "python/google/protobuf/internal/test_util.py",
-        ],
-    ),
-    imports = ["python"],
-    srcs_version = "PY3",
-    visibility = ["@upb//:__subpackages__"],
-)
-
-cc_binary(
-    name = "python/google/protobuf/internal/_api_implementation.so",
-    srcs = ["python/google/protobuf/internal/api_implementation.cc"],
-    copts = COPTS + [
-        "-DPYTHON_PROTO2_CPP_IMPL_V2",
-    ],
-    linkshared = 1,
-    linkstatic = 1,
-    tags = [
-        # Exclude this target from wildcard expansion (//...) because it may
-        # not even be buildable. It will be built if it is needed according
-        # to :use_fast_cpp_protos.
-        # https://docs.bazel.build/versions/master/be/common-definitions.html#common-attributes
-        "manual",
-    ],
-    deps = select({
-        "//conditions:default": [],
-        ":use_fast_cpp_protos": ["//external:python_headers"],
-    }),
-)
-
-cc_binary(
-    name = "python/google/protobuf/pyext/_message.so",
-    srcs = glob([
-        "python/google/protobuf/pyext/*.cc",
-        "python/google/protobuf/pyext/*.h",
-    ]),
-    copts = COPTS + [
-        "-DGOOGLE_PROTOBUF_HAS_ONEOF=1",
-    ] + select({
-        "//conditions:default": [],
-        ":allow_oversize_protos": ["-DPROTOBUF_PYTHON_ALLOW_OVERSIZE_PROTOS=1"],
-    }),
-    includes = [
-        "python/",
-        "src/",
-    ],
-    linkshared = 1,
-    linkstatic = 1,
-    tags = [
-        # Exclude this target from wildcard expansion (//...) because it may
-        # not even be buildable. It will be built if it is needed according
-        # to :use_fast_cpp_protos.
-        # https://docs.bazel.build/versions/master/be/common-definitions.html#common-attributes
-        "manual",
-    ],
-    deps = [
-        ":protobuf",
-        ":proto_api",
-    ] + select({
-        "//conditions:default": [],
-        ":use_fast_cpp_protos": ["//external:python_headers"],
-    }),
-)
-
-config_setting(
-    name = "use_fast_cpp_protos",
-    values = {
-        "define": "use_fast_cpp_protos=true",
-    },
-    visibility = [
-        # Public, but Protobuf only visibility.
-        "//:__subpackages__",
-    ],
-)
-
-config_setting(
-    name = "allow_oversize_protos",
-    values = {
-        "define": "allow_oversize_protos=true",
-    },
-    visibility = [
-        # Public, but Protobuf only visibility.
-        "//:__subpackages__",
-    ],
-)
-
-# Copy the builtin proto files from src/google/protobuf to
-# python/google/protobuf. This way, the generated Python sources will be in the
-# same directory as the Python runtime sources. This is necessary for the
-# modules to be imported correctly since they are all part of the same Python
-# package.
-internal_copied_filegroup(
-    name = "protos_python",
-    srcs = [
-        "src/google/protobuf/any.proto",
-        "src/google/protobuf/api.proto",
-        "src/google/protobuf/compiler/plugin.proto",
-        "src/google/protobuf/descriptor.proto",
-        "src/google/protobuf/duration.proto",
-        "src/google/protobuf/empty.proto",
-        "src/google/protobuf/field_mask.proto",
-        "src/google/protobuf/source_context.proto",
-        "src/google/protobuf/struct.proto",
-        "src/google/protobuf/timestamp.proto",
-        "src/google/protobuf/type.proto",
-        "src/google/protobuf/wrappers.proto",
-    ],
-    dest = "python",
-    strip_prefix = "src",
-)
-
-py_proto_library(
-    name = "well_known_types_py_pb2",
-    srcs = [
-        "python/google/protobuf/any.proto",
-        "python/google/protobuf/api.proto",
-        "python/google/protobuf/compiler/plugin.proto",
-        "python/google/protobuf/descriptor.proto",
-        "python/google/protobuf/duration.proto",
-        "python/google/protobuf/empty.proto",
-        "python/google/protobuf/field_mask.proto",
-        "python/google/protobuf/source_context.proto",
-        "python/google/protobuf/struct.proto",
-        "python/google/protobuf/timestamp.proto",
-        "python/google/protobuf/type.proto",
-        "python/google/protobuf/wrappers.proto",
-    ],
-    include = "python",
-    default_runtime = "",
-    protoc = ":protoc",
-    srcs_version = "PY2AND3",
-    visibility = ["//visibility:public"],
-)
-
-py_library(
-    name = "protobuf_python",
-    data = select({
-        "//conditions:default": [],
-        ":use_fast_cpp_protos": [
-            ":python/google/protobuf/internal/_api_implementation.so",
-            ":python/google/protobuf/pyext/_message.so",
-        ],
-    }),
-    visibility = ["//visibility:public"],
-    deps = [
-        ":python_srcs",
-        ":well_known_types_py_pb2",
-    ],
-)
-
-# Copy the test proto files from src/google/protobuf to
-# python/google/protobuf. This way, the generated Python sources will be in the
-# same directory as the Python runtime sources. This is necessary for the
-# modules to be imported correctly by the tests since they are all part of the
-# same Python package.
-internal_copied_filegroup(
-    name = "protos_python_test",
-    srcs = LITE_TEST_PROTOS + TEST_PROTOS,
-    dest = "python",
-    strip_prefix = "src",
-)
-
-# TODO(dzc): Remove this once py_proto_library can have labels in srcs, in
-# which case we can simply add :protos_python_test in srcs.
-COPIED_LITE_TEST_PROTOS = ["python/" + s for s in RELATIVE_LITE_TEST_PROTOS]
-
-COPIED_TEST_PROTOS = ["python/" + s for s in RELATIVE_TEST_PROTOS]
-
-py_proto_library(
-    name = "python_common_test_protos",
-    srcs = COPIED_LITE_TEST_PROTOS + COPIED_TEST_PROTOS,
-    include = "python",
-    default_runtime = "",
-    protoc = ":protoc",
-    srcs_version = "PY2AND3",
-    visibility = ["//visibility:public"],
-    deps = [":well_known_types_py_pb2"],
-)
-
-py_proto_library(
-    name = "python_specific_test_protos",
-    srcs = glob([
-        "python/google/protobuf/internal/*.proto",
-        "python/google/protobuf/internal/import_test_package/*.proto",
-    ]),
-    include = "python",
-    default_runtime = ":protobuf_python",
-    protoc = ":protoc",
-    srcs_version = "PY2AND3",
-    visibility = ["//visibility:public"],
-    deps = [":python_common_test_protos"],
-)
-
-py_library(
-    name = "python_tests",
-    srcs = glob(
-        [
-            "python/google/protobuf/internal/*_test.py",
-            "python/google/protobuf/internal/test_util.py",
-            "python/google/protobuf/internal/import_test_package/__init__.py",
-        ],
-    ),
-    imports = ["python"],
-    srcs_version = "PY2AND3",
-    deps = [
-        ":protobuf_python",
-        ":python_common_test_protos",
-        ":python_specific_test_protos",
-    ],
-)
-
-internal_protobuf_py_tests(
-    name = "python_tests_batch",
-    data = glob([
-        "src/google/protobuf/**/*",
-    ]),
-    modules = [
-        "descriptor_database_test",
-        "descriptor_pool_test",
-        "descriptor_test",
-        "generator_test",
-        "json_format_test",
-        "message_factory_test",
-        "message_test",
-        "proto_builder_test",
-        "reflection_test",
-        "service_reflection_test",
-        "symbol_database_test",
-        "text_encoding_test",
-        "text_format_test",
-        "unknown_fields_test",
-        "wire_format_test",
-    ],
-    deps = [":python_tests"],
-)
-
-cc_library(
-    name = "proto_api",
-    hdrs = ["python/google/protobuf/proto_api.h"],
-    visibility = ["//visibility:public"],
-    deps = [
-        "//external:python_headers",
-    ],
-)
-
-proto_lang_toolchain(
-    name = "cc_toolchain",
-    blacklisted_protos = [
-        "@com_google_protobuf//:any_proto",
-        "@com_google_protobuf//:api_proto",
-        "@com_google_protobuf//:compiler_plugin_proto",
-        "@com_google_protobuf//:descriptor_proto",
-        "@com_google_protobuf//:duration_proto",
-        "@com_google_protobuf//:empty_proto",
-        "@com_google_protobuf//:field_mask_proto",
-        "@com_google_protobuf//:source_context_proto",
-        "@com_google_protobuf//:struct_proto",
-        "@com_google_protobuf//:timestamp_proto",
-        "@com_google_protobuf//:type_proto",
-        "@com_google_protobuf//:wrappers_proto",
-    ],
-    command_line = "--cpp_out=$(OUT)",
-    runtime = ":protobuf",
-    visibility = ["//visibility:public"],
-)
-
-alias(
-    name = "objectivec",
-    actual = "//objectivec",
-    tags = ["manual"],
-    visibility = ["//visibility:public"],
-)
-
-alias(
-    name = "protobuf_objc",
-    actual = "//objectivec",
-    tags = ["manual"],
-    visibility = ["//visibility:public"],
-)
-
-################################################################################
-# Test generated proto support
-################################################################################
-
-genrule(
-    name = "generated_protos",
-    srcs = ["src/google/protobuf/unittest_import.proto"],
-    outs = ["unittest_gen_import.proto"],
-    cmd = "cat $(SRCS) | sed 's|google/|src/google/|' >  $(OUTS)",
-)
-
-proto_library(
-    name = "generated_protos_proto",
-    srcs = [
-        "src/google/protobuf/unittest_import_public.proto",
-        "unittest_gen_import.proto",
-    ],
-)
-
-py_proto_library(
-    name = "generated_protos_py",
-    srcs = [
-        "src/google/protobuf/unittest_import_public.proto",
-        "unittest_gen_import.proto",
-    ],
-    default_runtime = "",
-    protoc = ":protoc",
-)
-
-################################################################################
-# Conformance tests
-################################################################################
-
-alias(
-    name = "conformance_test_runner",
-    actual = "//conformance:conformance_test_runner",
-    visibility = ["//visibility:public"],
-)
-
-proto_library(
-    name = "test_messages_proto2_proto",
-    strip_import_prefix = "src",
-    srcs = ["src/google/protobuf/test_messages_proto2.proto"],
-    visibility = ["//visibility:public"],
-)
-
-proto_library(
-    name = "test_messages_proto3_proto",
-    strip_import_prefix = "src",
-    srcs = ["src/google/protobuf/test_messages_proto3.proto"],
-    visibility = ["//visibility:public"],
-    deps = [
-        ":any_proto",
-        ":duration_proto",
-        ":field_mask_proto",
-        ":struct_proto",
-        ":timestamp_proto",
-        ":wrappers_proto",
-    ],
-)
-
-# TODO: re-enable this test if appropriate, or replace with something that
-# uses the new setup.
-# sh_test(
-#     name = "build_files_updated_unittest",
-#     srcs = [
-#         "build_files_updated_unittest.sh",
-#     ],
-#     data = [
-#         "BUILD",
-#         "cmake/extract_includes.bat.in",
-#         "cmake/libprotobuf.cmake",
-#         "cmake/libprotobuf-lite.cmake",
-#         "cmake/libprotoc.cmake",
-#         "cmake/tests.cmake",
-#         "src/Makefile.am",
-#         "update_file_lists.sh",
-#     ],
-# )
-
-java_proto_library(
-    name = "test_messages_proto2_java_proto",
-    visibility = [
-        "//conformance:__pkg__",
-        "//java:__subpackages__",
-    ],
-    deps = [":test_messages_proto2_proto"],
-)
-
-java_proto_library(
-    name = "test_messages_proto3_java_proto",
-    visibility = [
-        "//conformance:__pkg__",
-        "//java:__subpackages__",
-    ],
-    deps = [":test_messages_proto3_proto"],
-)
-
-java_lite_proto_library(
-    name = "test_messages_proto2_java_proto_lite",
-    visibility = [
-        "//conformance:__pkg__",
-        "//java:__subpackages__",
-    ],
-    deps = [":test_messages_proto2_proto"],
-)
-
-java_lite_proto_library(
-    name = "test_messages_proto3_java_proto_lite",
-    visibility = [
-        "//conformance:__pkg__",
-        "//java:__subpackages__",
-    ],
-    deps = [":test_messages_proto3_proto"],
-)
-
-filegroup(
-    name = "bzl_srcs",
-    srcs = glob(["**/*.bzl"]),
-    visibility = ["//visibility:public"],
-)
-
-# Kotlin proto rules
-
-proto_library(
-    name = "kt_unittest_lite",
-    srcs = [
-        "src/google/protobuf/map_lite_unittest.proto",
-        "src/google/protobuf/unittest_import_lite.proto",
-        "src/google/protobuf/unittest_import_public_lite.proto",
-        "src/google/protobuf/unittest_lite.proto",
-    ],
-    visibility = ["//java/kotlin-lite:__subpackages__"],
-    strip_import_prefix = "src",
-)
-
-proto_library(
-    name = "kt_unittest",
-    srcs = [
-        "src/google/protobuf/map_proto2_unittest.proto",
-        "src/google/protobuf/unittest.proto",
-        "src/google/protobuf/unittest_import.proto",
-        "src/google/protobuf/unittest_import_public.proto",
-    ],
-    visibility = ["//java/kotlin:__subpackages__"],
-    strip_import_prefix = "src",
-)
-
-proto_library(
-    name = "kt_proto3_unittest",
-    srcs = [
-        "src/google/protobuf/unittest_import.proto",
-        "src/google/protobuf/unittest_import_public.proto",
-        "src/google/protobuf/unittest_proto3.proto",
-    ],
-    visibility = [
-        "//java/kotlin:__subpackages__",
-        "//java/kotlin-lite:__subpackages__",
-    ],
-    strip_import_prefix = "src",
-)
-
-################################################################################
-# Packaging rules
-################################################################################
-
-# Files included in all source distributions
-pkg_files(
-    name = "common_dist_files",
-    srcs = glob(
-        [
-            "*.bzl",
-            "cmake/*.cmake",
-            "cmake/*.in",
-            "editors/*",
-
-            # Several of these files are generated by autogen.sh, so using
-            # glob() lets us ignore them if they are missing. (This is not good
-            # practice, though.)
-            "Makefile.in",
-            "aclocal.m4",
-            "ar-lib",
-            "compile",
-            "config*",
-            "depcomp",
-            "install-sh",
-            "ltmain.sh",
-            "m4/*.m4",
-            "missing",
-            "protobuf*.pc.in",
-            "test-driver",
-        ],
-        allow_empty = True,
-    ) + [
-        "BUILD.bazel",
-        "CHANGES.txt",
-        "CMakeLists.txt",
-        "CONTRIBUTORS.txt",
-        "LICENSE",
-        "Makefile.am",
-        "README.md",
-        "WORKSPACE",
-        "autogen.sh",
-        "build_files_updated_unittest.sh",
-        "cmake/CMakeLists.txt",
-        "cmake/README.md",
-        "generate_descriptor_proto.sh",
-        "maven_install.json",
-        "update_file_lists.sh",
-        "//third_party:BUILD.bazel",
-        "//third_party:zlib.BUILD",
-        "//util/python:BUILD.bazel",
-    ],
-    strip_prefix = strip_prefix.from_root(""),
-    visibility = ["//pkg:__pkg__"],
-)
-
-# C++ runtime
-pkg_files(
-    name = "cpp_dist_files",
-    srcs = glob(
-        ["src/**/*"],
-        exclude = [
-            "src/google/protobuf/compiler/objectivec/method_dump.sh",  # not in autotools dist
-        ],
-    ),
-    strip_prefix = strip_prefix.from_root(""),
-    visibility = ["//pkg:__pkg__"],
-)
-
-# Additional files for C#
-pkg_files(
-    name = "csharp_dist_files",
-    srcs = [
-        "global.json",
-    ],
-    visibility = ["//pkg:__pkg__"],
-)
-
-# Additional files for ObjC
-pkg_files(
-    name = "objectivec_dist_files",
-    srcs = [
-        "Protobuf.podspec",
-    ],
-    visibility = ["//pkg:__pkg__"],
-)
-
-# Python runtime
-pkg_files(
-    name = "python_dist_files",
-    srcs = glob([
-        "python/google/**/*.proto",
-        "python/google/**/*.py",
-        "python/google/protobuf/internal/*.cc",
-        "python/google/protobuf/pyext/*.cc",
-        "python/google/protobuf/pyext/*.h",
-    ]) + [
-        "python/MANIFEST.in",
-        "python/README.md",
-        "python/google/protobuf/proto_api.h",
-        "python/google/protobuf/pyext/README",
-        "python/google/protobuf/python_protobuf.h",
-        "python/mox.py",
-        "python/release.sh",
-        "python/setup.cfg",
-        "python/setup.py",
-        "python/stubout.py",
-        "python/tox.ini",
-    ],
-    strip_prefix = strip_prefix.from_root(""),
-    visibility = ["//pkg:__pkg__"],
-)
diff --git a/libs/protobuf/CHANGES.txt b/libs/protobuf/CHANGES.txt
deleted file mode 100644
index cf6a74d..0000000
--- a/libs/protobuf/CHANGES.txt
+++ /dev/null
@@ -1,3490 +0,0 @@
-2022-12-07 version 21.11 (C++/Java/Python/PHP/Objective-C/C#/Ruby)
-  Python
-  * Add license file to pypi wheels (#10936)
-  * Fix round-trip bug (#10158)
-
-2022-11-29 version 21.10 (C++/Java/Python/PHP/Objective-C/C#/Ruby)
-
-  Java
-  * Use bit-field int values in buildPartial to skip work on unset groups of fields. (#10960)
-  * Mark nested builder as clean after clear is called (#10984)
-  UPB
-  * Fix UPB_LIKELY() for 32-bit Windows builds; update protobuf_deps to point to the current upb 21.x (#11028)
-  Other
-  * Add public modifiers to kotlin code (#11068)
-
-2022-10-26 version 21.9 (C++/Java/Python/PHP/Objective-C/C#/Ruby)
-
-  C++
-  * Update zlib to 1.2.13 (#10819)
-
-  Python
-  * Target MacOS 10.9 to fix #10799 (#10807)
-
-  Ruby
-  * Replace libc strdup usage with internal impl to restore musl compat (#10818)
-
-2022-10-18 version 21.8 (C++/Java/Python/PHP/Objective-C/C#/Ruby)
-
-  Other
-  * Fix for grpc.tools #17995 & protobuf #7474 (handle UTF-8 paths in argumentfile) (#10721)
-
-  C++
-  * 21.x No longer define no_threadlocal on OpenBSD (#10743)
-
-  Java
-  * Mark default instance as immutable first to avoid race during static initialization of default instances (#10771)
-
-  Ruby
-  * Auto capitalize enums name in Ruby (#10454) (#10763)
-
-
-2022-09-29 version 21.7 (C++/Java/Python/PHP/Objective-C/C#/Ruby)
-  Java
-  * Refactoring java full runtime to reuse sub-message builders and prepare to
-    migrate parsing logic from parse constructor to builder.
-  * Move proto wireformat parsing functionality from the private "parsing
-    constructor" to the Builder class.
-  * Change the Lite runtime to prefer merging from the wireformat into mutable
-    messages rather than building up a new immutable object before merging. This
-    way results in fewer allocations and copy operations.
-  * Make message-type extensions merge from wire-format instead of building up
-    instances and merging afterwards. This has much better performance.
-  * Fix TextFormat parser to build up recurring (but supposedly not repeated)
-    sub-messages directly from text rather than building a new sub-message and
-    merging the fully formed message into the existing field.
-
-2022-09-13 version 21.6 (C++/Java/Python/PHP/Objective-C/C#/Ruby)
-
-C++
-* Reduce memory consumption of MessageSet parsing
-
-2022-08-09 version 21.5 (C++/Java/Python/PHP/Objective-C/C#/Ruby)
-
-  PHP
-  * Added getContainingOneof and getRealContainingOneof to descriptor.
-  * fix PHP readonly legacy files for nested messages
-
-  Python
-  * Fixed comparison of maps in Python.
-
-
-2022-07-25 version 21.4 (C++/Java/Python/PHP/Objective-C/C#/Ruby)
-
-  C++
-  * Reduce the required alignment of ArenaString from 8 to 4 (#10298)
-
-
-2022-07-19 version 21.3 (C++/Java/Python/PHP/Objective-C/C#/Ruby)
-  C++
-  * Add header search paths to Protobuf-C++.podspec (#10024)
-  * Fixed Visual Studio constinit errors (#10232)
-  * Fix #9947: make the ABI compatible between debug and non-debug builds (#10271)
-
-  UPB
-  * Allow empty package names (fixes behavior regression in 4.21.0)
-  * Fix a SEGV bug when comparing a non-materialized sub-message (#10208)
-  * Fix several bugs in descriptor mapping containers (eg. descriptor.services_by_name)
-    * for x in mapping now yields keys rather than values, to match Python conventions and the behavior of the old library.
-    * Lookup operations now correctly reject unhashable types as map keys.
-    * We implement repr() to use the same format as dict.
-  * Fix maps to use the ScalarMapContainer class when appropriate
-  * Fix bug when parsing an unknown value in a proto2 enum extension (protocolbuffers/upb#717)
-
-  PHP
-  * Add "readonly" as a keyword for PHP and add previous classnames to descriptor pool (#10041)
-
-  Python
-  * Make //:protobuf_python and //:well_known_types_py_pb2 public (#10118)
-
-  Bazel
-  * Add back a filegroup for :well_known_protos (#10061)
-
-2022-06-27 version 21.2 (C++/Java/Python/PHP/Objective-C/C#/Ruby)
-  C++
-  * ArenaString improvements (fix alignment issue)
-
-  PHP
-  * API changes for OneOf  (#10102)
-
-
-2022-05-27 version 21.1 (C++/Java/Python/PHP/Objective-C/C#/Ruby)
-
-  C++
-  * cmake: Revert "Fix cmake install targets (#9822)" (#10060)
-  * Remove Abseil dependency from CMake build (#10056)
-
-  Python
-  * Update python wheel metadata with more information incl. required python version (#10058)
-  * Fix segmentation fault when instantiating field via repeated field assignment (#10066)
-
-2022-05-25 version 21.0 (C++/Java/Python/PHP/Objective-C/C#/Ruby)
-
-  C++
-  * cmake: Call get_filename_component() with DIRECTORY mode instead of PATH mode (#9614)
-  * Escape GetObject macro inside protoc-generated code (#9739)
-  * Update CMake configuration to add a dependency on Abseil (#9793)
-  * Fix cmake install targets (#9822)
-  * Use __constinit only in GCC 12.2 and up (#9936)
-
-  Java
-  * Update protobuf_version.bzl to separate protoc and per-language java … (#9900)
-
-  Python
-  * Increment python major version to 4 in version.json for python upb (#9926)
-  * The C extension module for Python has been rewritten to use the upb library.
-    This is expected to deliver significant performance benefits, especially when
-    parsing large payloads.  There are some minor breaking changes, but these
-    should not impact most users.  For more information see:
-    https://developers.google.com/protocol-buffers/docs/news/2022-05-06#python-updates
-  * Fixed win32 build and fixed str(message) on all Windows platforms. (#9976)
-  * The binary wheel for macOS now supports Apple silicon.
-
-  PHP
-  * [PHP] fix PHP build system (#9571)
-  * Fix building packaged PHP extension (#9727)
-  * fix: reserve "ReadOnly" keyword for PHP 8.1 and add compatibility (#9633)
-  * fix: phpdoc syntax for repeatedfield parameters (#9784)
-  * fix: phpdoc for repeatedfield (#9783)
-  * Change enum string name for reserved words (#9780)
-  * chore: [PHP] fix phpdoc for MapField keys (#9536)
-  * Fixed PHP SEGV by not writing to shared memory for zend_class_entry. (#9996)
-
-  Ruby
-  * Allow pre-compiled binaries for ruby 3.1.0 (#9566)
-  * Implement `respond_to?` in RubyMessage (#9677)
-  * [Ruby] Fix RepeatedField#last, #first inconsistencies (#9722)
-  * Do not use range based UTF-8 validation in truffleruby (#9769)
-  * Improve range handling logic of `RepeatedField` (#9799)
-  * Support x64-mingw-ucrt platform
-
-  Other
-  * [Kotlin] remove redundant public modifiers for compiled code (#9642)
-  * [C#] Update GetExtension to support getting typed value (#9655)
-  * Fix invalid dependency manifest when using `descriptor_set_out` (#9647)
-  * Fix C# generator handling of a field named "none" in a oneof (#9636)
-  * Add initial version.json file for 21-dev (#9840)
-  * Remove duplicate java generated code (#9909)
-  * Cherry-pick PR #9981 into 21.x branch (#10000)
-
-
-2022-05-19 version 21.0-rc2(C++/Java/Python/PHP/Objective-C/C#/Ruby)
-
-  Python
-  * Fix windows builds
-  * Throw more helpful error if generated code is out of date
-  * Fixed two reference leaks
-
-  Ruby
-  * Support x64-mingw-ucrt platform
-
-  PHP
-  * Fix SEGV by not writing to shared memory for zend_class_entry
-
-  C#
-  * Suppress warning CS8981
-
-  Other
-  * Fix Maven release to release actual osx_aarch64 binary
-  * Fix protoc zips to have the proto files for well known types
-
-2022-05-10 version 21.0-rc1 (C++/Java/Python/PHP/Objective-C/C#/Ruby)
-
-  C++
-  * Rename main cmake/CMakeLists.txt to CMakeLists.txt (#9603)
-  * avoid allocating memory if all extension are cleared (#9345)
-  * cmake: Call get_filename_component() with DIRECTORY mode instead of PATH mode (#9614)
-  * Escape GetObject macro inside protoc-generated code (#9739)
-  * Update CMake configuration to add a dependency on Abseil (#9793)
-  * Use __constinit only in GCC 12.2 and up (#9936)
-  * Refactor generated message class layout
-  * Optimize tokenizer ParseInteger by removing division
-  * Reserve exactly the right amount of capacity in ExtensionSet::MergeFrom
-  * Parse FLT_MAX correctly when represented in JSON
-
-  Java
-  * Update protobuf_version.bzl to separate protoc and per-language java … (#9900)
-  * 6x speedup in ArrayEncoder.writeUInt32NotTag
-
-  Python
-  * Increment python major version to 4 in version.json for python upb (#9926)
-  * The C extension module for Python has been rewritten to use the upb library.
-    This is expected to deliver significant performance benefits, especially when
-    parsing large payloads.  There are some minor breaking changes, but these
-    should not impact most users.  For more information see:
-    https://developers.google.com/protocol-buffers/docs/news/2022-05-06#python-updates
-  * Due to the breaking changes for Python, the major version number for Python
-    has been incremented.
-  * The binary wheel for macOS now supports Apple silicon.
-
-
-  PHP
-  * chore: [PHP] fix phpdoc for MapField keys (#9536)
-  * [PHP] Remove unnecessary zval initialization (#9600)
-  * [PHP] fix PHP build system (#9571)
-  * Fix building packaged PHP extension (#9727)
-  * fix: reserve "ReadOnly" keyword for PHP 8.1 and add compatibility (#9633)
-  * fix: phpdoc syntax for repeatedfield parameters (#9784)
-  * fix: phpdoc for repeatedfield (#9783)
-  * Change enum string name for reserved words (#9780)
-  * Fixed composer.json to only advertise compatibility with PHP 7.0+.  (#9819)
-
-  Ruby
-  * Allow pre-compiled binaries for ruby 3.1.0 (#9566)
-  * Implement `respond_to?` in RubyMessage (#9677)
-  * [Ruby] Fix RepeatedField#last, #first inconsistencies (#9722)
-  * Do not use range based UTF-8 validation in truffleruby (#9769)
-  * Improve range handling logic of `RepeatedField` (#9799)
-  * Disable the aarch64 build on macOS until it can be fixed. (#9816)
-
-  Other
-  * [Kotlin] remove redundant public modifiers for compiled code (#9642)
-  * [C#] Update GetExtension to support getting typed value (#9655)
-  * Fix invalid dependency manifest when using `descriptor_set_out` (#9647)
-  * Fix C# generator handling of a field named "none" in a oneof (#9636)
-  * Add initial version.json file for 21-dev (#9840)
-  * Remove duplicate java generated code (#9909)
-  * Fix versioning issues in 3.20.0
-
-  Compiler
-  * Protoc outputs the list of suggested field numbers when invalid field
-    numbers are specified in the .proto file.
-  * Require package names to be less than 512 bytes in length
-
-2022-04-21 version 3.20.1 (C++/Java/Python/PHP/Objective-C/C#/Ruby/JavaScript)
-
-  PHP
-  * Fix building packaged PHP extension (#9727)
-
-  Other
-  * Fix versioning issues in 3.20.0
-
-2022-03-04 version 3.20.0 (C++/Java/Python/PHP/Objective-C/C#/Ruby/JavaScript)
-
-  Ruby
-  * Dropped Ruby 2.3 and 2.4 support for CI and releases. (#9311)
-  * Added Ruby 3.1 support for CI and releases (#9566).
-  * Message.decode/encode: Add recursion_limit option (#9218/#9486)
-  * Allocate with xrealloc()/xfree() so message allocation is visible to the
-    Ruby GC.  In certain tests this leads to much lower memory usage due to more
-    frequent GC runs (#9586).
-  * Fix conversion of singleton classes in Ruby (#9342)
-  * Suppress warning for intentional circular require (#9556)
-  * JSON will now output shorter strings for double and float fields when possible
-    without losing precision.
-  * Encoding and decoding of binary format will now work properly on big-endian
-    systems.
-  * UTF-8 verification was fixed to properly reject surrogate code points.
-  * Unknown enums for proto2 protos now properly implement proto2's behavior of
-    putting such values in unknown fields.
-
-  Java
-  * Revert "Standardize on Array copyOf" (#9400)
-  * Resolve more java field accessor name conflicts (#8198)
-  * Don't support map fields in DynamicMessage.Builder.{getFieldBuilder,getRepeatedFieldBuilder}
-  * Fix parseFrom to only throw InvalidProtocolBufferException
-  * InvalidProtocolBufferException now allows arbitrary wrapped Exception types.
-  * Fix bug in `FieldSet.Builder.mergeFrom`
-  * Flush CodedOutputStream also flushes underlying OutputStream
-  * When oneof case is the same and the field type is Message, merge the
-    subfield. (previously it was replaced.)’
-  * Add @CheckReturnValue to some protobuf types
-  * Report original exceptions when parsing JSON
-  * Add more info to @deprecated javadoc for set/get/has methods
-  * Fix initialization bug in doc comment line numbers
-  * Fix comments for message set wire format.
-
-  Kotlin
-  * Add test scope to kotlin-test for protobuf-kotlin-lite (#9518)
-  * Add orNull extensions for optional message fields.
-  * Add orNull extensions to all proto3 message fields.
-
-  Python
-  * Dropped support for Python < 3.7 (#9480)
-  * Protoc is now able to generate python stubs (.pyi) with --pyi_out
-  * Pin multibuild scripts to get manylinux1 wheels back (#9216)
-  * Fix type annotations of some Duration and Timestamp methods.
-  * Repeated field containers are now generic in field types and could be used
-    in type annotations.
-  * Protobuf python generated codes are simplified. Descriptors and message
-    classes' definitions are now dynamic created in internal/builder.py.
-    Insertion Points for messages classes are discarded.
-  * has_presence is added for FieldDescriptor in python
-  * Loosen indexing type requirements to allow valid __index__() implementations
-    rather than only PyLongObjects.
-  * Fix the deepcopy bug caused by not copying message_listener.
-  * Added python JSON parse recursion limit (default 100)
-  * Path info is added for python JSON parse errors
-  * Pure python repeated scalar fields will not able to pickle. Convert to list
-    first.
-  * Timestamp.ToDatetime() now accepts an optional tzinfo parameter. If
-    specified, the function returns a timezone-aware datetime in the given time
-    zone. If omitted or None, the function returns a timezone-naive UTC datetime
-    (as previously).
-  * Adds client_streaming and server_streaming fields to MethodDescriptor.
-  * Add "ensure_ascii" parameter to json_format.MessageToJson. This allows smaller
-    JSON serializations with UTF-8 or other non-ASCII encodings.
-  * Added experimental support for directly assigning numpy scalars and array.
-  * Improve the calculation of public_dependencies in DescriptorPool.
-  * [Breaking Change] Disallow setting fields to numpy singleton arrays or repeated fields to numpy
-    multi-dimensional arrays. Numpy arrays should be indexed or flattened explicitly before assignment.
-
-  Compiler
-  * Migrate IsDefault(const std::string*) and UnsafeSetDefault(const std::string*)
-  * Implement strong qualified tags for TaggedPtr
-  * Rework allocations to power-of-two byte sizes.
-  * Migrate IsDefault(const std::string*) and UnsafeSetDefault(const std::string*)
-  * Implement strong qualified tags for TaggedPtr
-  * Make TaggedPtr Set...() calls explicitly spell out the content type.
-  * Check for parsing error before verifying UTF8.
-  * Enforce a maximum message nesting limit of 32 in the descriptor builder to
-    guard against stack overflows
-  * Fixed bugs in operators for RepeatedPtrIterator
-  * Assert a maximum map alignment for allocated values
-  * Fix proto1 group extension protodb parsing error
-  * Do not log/report the same descriptor symbol multiple times if it contains
-    more than one invalid character.
-  * Add UnknownFieldSet::SerializeToString and SerializeToCodedStream.
-  * Remove explicit default pointers and deprecated API from protocol compiler
-
-  Arenas
-  * Change Repeated*Field to reuse memory when using arenas.
-  * Implements pbarenaz for profiling proto arenas
-  * Introduce CreateString() and CreateArenaString() for cleaner semantics
-  * Fix unreferenced parameter for MSVC builds
-  * Add UnsafeSetAllocated to be used for one-of string fields.
-  * Make Arena::AllocateAligned() a public function.
-  * Determine if ArenaDtor related code generation is necessary in one place.
-  * Implement on demand register ArenaDtor for InlinedStringField
-
-  C++
-  * Enable testing via CTest (#8737)
-  * Add option to use external GTest in CMake (#8736)
-  * CMake: Set correct sonames for libprotobuf-lite.so and libprotoc.so (#8635) (#9529)
-  * Add cmake option `protobuf_INSTALL` to not install files (#7123)
-  * CMake: Allow custom plugin options e.g. to generate mocks (#9105)
-  * CMake: Use linker version scripts (#9545)
-  * Manually *struct Cord fields to work better with arenas.
-  * Manually destruct map fields.
-  * Generate narrower code
-  * Fix https://github.com/protocolbuffers/protobuf/issues/9378 by removing
-    shadowed _cached_size_ field
-  * Remove GetPointer() and explicit nullptr defaults.
-  * Add proto_h flag for speeding up large builds
-  * Add missing overload for reference wrapped fields.
-  * Add MergedDescriptorDatabase::FindAllFileNames()
-  * RepeatedField now defines an iterator type instead of using a pointer.
-  * Remove obsolete macros GOOGLE_PROTOBUF_HAS_ONEOF and GOOGLE_PROTOBUF_HAS_ARENAS.
-
-  PHP
-  * Fix: add missing reserved classnames (#9458)
-  * PHP 8.1 compatibility (#9370)
-
-  C#
-  * Fix trim warnings (#9182)
-  * Fixes NullReferenceException when accessing FieldDescriptor.IsPacked (#9430)
-  * Add ToProto() method to all descriptor classes (#9426)
-  * Add an option to preserve proto names in JsonFormatter (#6307)
-
-  Objective-C
-  * Add prefix_to_proto_package_mappings_path option. (#9498)
-  * Rename `proto_package_to_prefix_mappings_path` to `package_to_prefix_mappings_path`. (#9552)
-  * Add a generation option to control use of forward declarations in headers. (#9568)
-
-2022-01-28 version 3.19.4 (C++/Java/Python/PHP/Objective-C/C#/Ruby/JavaScript)
-
-  Python
-  * Make libprotobuf symbols local on OSX to fix issue #9395 (#9435)
-
-  Ruby
-  * Fixed a data loss bug that could occur when the number of `optional`
-    fields in a message is an exact multiple of 32. (#9440).
-
-  PHP
-  * Fixed a data loss bug that could occur when the number of `optional`
-    fields in a message is an exact multiple of 32. (#9440).
-
-2022-01-10 version 3.19.3 (C++/Java/Python/PHP/Objective-C/C#/Ruby/JavaScript)
-
-  Python
-  * Fix missing Windows wheel for Python 3.10 on PyPI
-
-2022-01-05 version 3.19.2 (C++/Java/Python/PHP/Objective-C/C#/Ruby/JavaScript)
-
-  Java
-  * Improve performance characteristics of UnknownFieldSet parsing (#9371)
-  * This release addresses a Security Advisory for Java users
-   (https://github.com/protocolbuffers/protobuf/security/advisories/GHSA-wrvw-hg22-4m67)
-
-2022-01-05 version 3.18.2 (C++/Java/Python/PHP/Objective-C/C#/Ruby/JavaScript)
-
-  Java
-  * Improve performance characteristics of UnknownFieldSet parsing (#9371)
-  * This release addresses a Security Advisory for Java users
-   (https://github.com/protocolbuffers/protobuf/security/advisories/GHSA-wrvw-hg22-4m67)
-
-2022-01-05 version 3.16.1 (Java)
-
-  Java
-  * Improve performance characteristics of UnknownFieldSet parsing (#9371)
-  * This release addresses a Security Advisory for Java users
-   (https://github.com/protocolbuffers/protobuf/security/advisories/GHSA-wrvw-hg22-4m67)
-
-2021-10-28 version 3.19.1 (C++/Java/Python/PHP/Objective-C/C#/Ruby/JavaScript)
-
-  Bazel
-  * Ensure that release archives contain everything needed for Bazel (#9131)
-  * Align dependency handling with Bazel best practices (#9165)
-
-  JavaScript
-  * Fix `ReferenceError: window is not defined` when getting the global object (#9156)
-
-  Ruby
-  * Fix memory leak in MessageClass.encode (#9150)
-
-2021-10-15 version 3.19.0 (C++/Java/Python/PHP/Objective-C/C#/Ruby/JavaScript)
-
-  C++
-  * Make proto2::Message::DiscardUnknownFields() non-virtual
-  * Separate RepeatedPtrField into its own header file
-  * For default floating point values of 0, consider all bits significant
-  * cmake: support `MSVC_RUNTIME_LIBRARY` property (#8851)
-  * Fix shadowing warnings (#8926)
-  * Fix for issue #8484, constant initialization doesn't compile in msvc clang-cl environment (#8993)
-  * Fix build on AIX and SunOS (#8373) (#9065)
-  * Add Android stlport and default toolchains to BUILD. (#8290)
-
-  Java
-  * For default floating point values of 0, consider all bits significant
-  * Annotate `//java/com/google/protobuf/util/...` with nullness annotations
-  * Use ArrayList copy constructor (#7853)
-
-  Kotlin
-  * Switch Kotlin proto DSLs to be implemented with inline value classes
-  * Fix inlining and deprecation for repeated string fields in kotlin (#9120)
-
-  Python
-  * Proto2 DecodeError now includes message name in error message
-  * Make MessageToDict convert map keys to strings (#8122)
-  * Add python-requires in setup.py (#8989)
-  * Add python 3.10 (#9034)
-
-  JavaScript
-  * Skip exports if not available by CommonJS (#8856)
-  * JS: Comply with CSP no-unsafe-eval. (#8864)
-
-  PHP
-  * Added "object" as a reserved name for PHP (#8962)
-
-  Ruby
-  * Override Map.clone to use Map's dup method (#7938)
-  * Ruby: build extensions for arm64-darwin (#8232)
-  * Add class method Timestamp.from_time to ruby well known types (#8562)
-  * Adopt pure ruby DSL implementation for JRuby (#9047)
-  * Add size to Map class (#8068)
-  * Fix for descriptor_pb.rb: google/protobuf should be required first (#9121)
-
-  C#
-  * Correctly set ExtensionRegistry when parsing with MessageParser, but using an already existing CodedInputStream (#7246)
-  * [C#] Make FieldDescriptor propertyName public (#7642)
-
-2021-10-04 version 3.18.1 (C++/Java/Python/PHP/Objective-C/C#/Ruby/JavaScript)
-
-  Python
-  * Update setup.py to reflect that we now require at least Python 3.5 (#8989)
-  * Performance fix for DynamicMessage: force GetRaw() to be inlined (#9023)
-
-  Ruby
-  * Update ruby_generator.cc to allow proto2 imports in proto3 (#9003)
-
-2021-09-13 version 3.18.0 (C++/Java/Python/PHP/Objective-C/C#/Ruby/JavaScript)
-
-  Python
-  * Removed Python 2.x support.
-  * Pure python descriptor_pool.AddSerializedFile() will always build the
-    file and return FileDescriptor which is same with python c++ extension
-  * type errors thrown by MergeFrom now report fully qualified class names
-  * Protobuf python generated code are simplified. Some platforms that uses
-    "is"("is not") to compare the enum or descriptor's label/type may fail,
-    should use "=="("!=") instead.
-
-  C++
-  * Generated code now uses the c++11 standard integer types int{32,64}_t and
-    uint{32,64}_t
-  * Reduce memory usage of the DescriptorPool type.
-  * Moved the zero-argument New() method on messages to the base class (internal
-    optimization).
-  * Unused return values marked with `PROTOBUF_MUST_USE_RESULT` are now
-    correctly attributed.
-  * Demotes PrintPath log for maps in MessageDifferencer down from WARNING to
-    INFO.
-  * Make sure FullMessageName() is always private.
-  * Fix race condition in EnumDescriptor.
-  * Remove MessageLite::GetMaybeArenaPointer.
-
-  Java
-  * Add @deprecated javadoc for set/get/has methods
-  * correctly decode \? escape sequence in text protos
-  * Avoid depending on Objects.requireNonNull() until we can verify that no
-    users are depending on older Android versions.
-  * disallow null string map values in put and putAll
-  * Add `@CheckReturnValue` to `ByteString` API.
-  * Make the `hasPresence` method public in `FieldDescriptor`.
-  * Report more detailed messages in Duration and Timestamp proto parsing
-    errors.
-  * New Timestamps.fromDate utility method that converts a java.util.Date to a
-    Timestamp proto object.
-
-  Kotlin
-  * Generated Kotlin code is Explicit API mode compatible
-
-2021-09-13 version 3.18.0 (C++/Java/Python/PHP/Objective-C/C#/Ruby/JavaScript)
-  C++
-  * Fix warnings raised by clang 11 (#8664)
-  * Make StringPiece constructible from std::string_view (#8707)
-  * Add missing capability attributes for LLVM 12 (#8714)
-  * Stop using std::iterator (deprecated in C++17). (#8741)
-  * Move field_access_listener from libprotobuf-lite to libprotobuf (#8775)
-  * Fix #7047 Safely handle setlocale (#8735)
-  * Remove deprecated version of SetTotalBytesLimit() (#8794)
-  * Support arena allocation of google::protobuf::AnyMetadata (#8758)
-  * Fix undefined symbol error around SharedCtor() (#8827)
-  * Fix default value of enum(int) in json_util with proto2 (#8835)
-  * Better Smaller ByteSizeLong
-  * Introduce event filters for inject_field_listener_events
-  * Reduce memory usage of DescriptorPool
-  * For lazy fields copy serialized form when allowed.
-  * Re-introduce the InlinedStringField class
-  * v2 access listener
-  * Reduce padding in the proto's ExtensionRegistry map.
-  * GetExtension performance optimizations
-  * Make tracker a static variable rather than call static functions
-  * Support extensions in field access listener
-  * Annotate MergeFrom for field access listener
-  * Fix incomplete types for field access listener
-  * Add map_entry/new_map_entry to SpecificField in MessageDifferencer. They
-    record the map items which are different in MessageDifferencer's reporter.
-  * Reduce binary size due to fieldless proto messages
-  * TextFormat: ParseInfoTree supports getting field end location in addition to
-    start.
-  * Fix repeated enum extension size in field listener
-  * Enable Any Text Expansion for Descriptors::DebugString()
-  * Switch from int{8,16,32,64} to int{8,16,32,64}_t
-  * Reduce memory usage of the DescriptorPool type.
-
-  Java
-  * Fix errorprone conflict (#8723)
-  * Removing deprecated TimeUtil class. (#8749)
-  * Optimized FieldDescriptor.valueOf() to avoid array copying.
-  * Removing deprecated TimeUtil class.
-  * Add Durations.parseUnchecked(String) and Timestamps.parseUnchecked(String)
-  * FieldMaskUtil: Add convenience method to mask the fields out of a given proto.
-
-  JavaScript
-  * Optimize binary parsing of repeated float64
-  * Fix for optimization when reading doubles from binary wire format
-  * Replace toArray implementation with toJSON.
-
-  Python
-  * Drops support for 2.7 and 3.5.
-
-  PHP
-  * Migrate PHP & Ruby to ABSL wyhash (#8854)
-  * Added support for PHP 8.1 (currently in RC1) to the C extension (#8964)
-  * Fixed PHP SEGV when constructing messages from a destructor. (#8969)
-
-  Ruby
-  * Move DSL implementation from C to pure Ruby (#8850)
-  * Fixed a memory bug with RepeatedField#+. (#8970)
-
-  Other
-  * [csharp] ByteString.CreateCodedInput should use ArraySegment offset and count (#8740)
-  * [ObjC] Add support for using the proto package to prefix symbols. (#8760)
-  * field_presence.md: fix Go example (#8788)
-
-
-  Kotlin
-  * Suppress NOTHING_TO_INLINE in Kotlin generated inline functions.
-
-2021-06-04 version 3.17.3 (C++/Java/Python/PHP/Objective-C/C#/Ruby/JavaScript)
-  Python
-  * Note: This is the last release to support Python 2.7. Future releases will
-    require Python >= 3.5.
-
-  C++
-  * Introduce FieldAccessListener.
-  * Stop emitting boilerplate {Copy/Merge}From in each ProtoBuf class
-  * Fixed some uninitialized variable warnings in generated_message_reflection.cc.
-
-  Kotlin
-  * Fix duplicate proto files error (#8699)
-
-  Java
-  * Fixed parser to check that we are at a proper limit when a sub-message has
-    finished parsing.
-
-2021-05-25 version 3.17.2 (C++/Java/Python/PHP/Objective-C/C#/Ruby/JavaScript)
-  Kotlin
-  * Fix duplicate class error (#8653)
-
-  PHP
-  * Fixed SEGV in sub-message getters for well-known types when message is unset
-    (#8670)
-
-2021-05-07 version 3.17.1 (C++/Java/Python/PHP/Objective-C/C#/Ruby/JavaScript)
-  PHP
-  * Fixed PHP memory leaks and arginfo errors. (#8614)
-  * Fixed JSON parser to allow multiple values from the same oneof as long as
-    all but one are null.
-
-  Ruby
-  * Fixed memory bug: properly root repeated/map field when assigning. (#8639)
-  * Fixed JSON parser to allow multiple values from the same oneof as long as
-    all but one are null.
-
-
-2021-05-07 version 3.17.0 (C++/Java/Python/PHP/Objective-C/C#/Ruby/JavaScript)
-
-  Protocol Compiler
-  * Fix the generated source information for reserved values in Enums.
-
-  C++
-  * Fix -Wunused-parameter in map<string, int> fields (fixes #8494) (#8500)
-  * Use byteswap.h when building against musl libc (#8503)
-  * Fix -Wundefined-inline error when using SharedCtor() or SharedDtor() (#8532)
-  * Fix bug where `Descriptor::DebugString()` printed proto3 synthetic oneofs.
-  * Provide stable versions of `SortAndUnique()`.
-  * Make sure to cache proto3 optional message fields when they are cleared.
-  * Expose UnsafeArena methods to Reflection.
-  * Use std::string::empty() rather than std::string::size() > 0.
-
-  Kotlin
-  * Restrict extension setter and getter operators to non-nullable T.
-
-  Java
-  * updating GSON and Guava to more recent versions (#8524)
-  * Reduce the time spent evaluating isExtensionNumber by storing the extension
-    ranges in a TreeMap for faster queries. This is particularly relevant for
-    protos which define a large number of extension ranges, for example when
-    each tag is defined as an extension.
-  * Fix java bytecode estimation logic for optional fields.
-  * Optimize Descriptor.isExtensionNumber.
-
-  Python
-  * Add MethodDescriptor.CopyToProto() (#8327)
-  * Remove unused python_protobuf.{cc,h} (#8513)
-  * Start publishing python aarch64 manylinux wheels normally (#8530)
-  * Fix constness issue detected by MSVC standard conforming mode (#8568)
-  * Make JSON parsing match C++ and Java when multiple fields from the same
-    oneof are present and all but one is null.
-
-  Ruby
-  * Add support for proto3 json_name in compiler and field definitions (#8356)
-  * Fixed memory leak of Ruby arena objects. (#8461)
-  * Fix source gem compilation (#8471)
-  * Fix various exceptions in Ruby on 64-bit Windows (#8563)
-  * Fix crash when calculating Message hash values on 64-bit Windows (#8565)
-
-  Conformance Tests
-  * Added a conformance test for the case of multiple fields from the same
-    oneof.
-
-2021-04-06 version 3.16.0 (C++/Java/Python/PHP/Objective-C/C#/Ruby/JavaScript)
-  Other
-  * Opensourcing kotlin protos (#8272)
-  * Use a newer version of rules_proto, with the new rule `proto_descriptor_set` (#8469)
-
-  C++
-  * Fix compiler warnings issue found in conformance_test_runner #8189 (#8190)
-  * Fix MinGW-w64 build issues. (#8286)
-  * [Protoc] C++ Resolved an issue where NO_DESTROY and CONSTINIT are in incorrect order (#8296)
-  * Fix PROTOBUF_CONSTINIT macro redefinition (#8323)
-  * Delete StringPiecePod (#8353)
-  * Fix gcc error: comparison of unsigned expression in '>= 0' is always … (#8309)
-  * Fix cmake install on iOS (#8301)
-  * Create a CMake option to control whether or not RTTI is enabled (#8347)
-  * Fix endian.h location on FreeBSD (#8351)
-  * Refactor util::Status (#8354)
-  * Make util::Status more similar to absl::Status (#8405)
-  * Fix -Wsuggest-destructor-override for generated C++ proto classes. (#8408)
-  * Refactor StatusOr and StringPiece (#8406)
-  * Refactor uint128 (#8416)
-  * The ::pb namespace is no longer exposed due to conflicts.
-  * Allow MessageDifferencer::TreatAsSet() (and friends) to override previous
-    calls instead of crashing.
-  * Reduce the size of generated proto headers for protos with `string` or
-    `bytes` fields.
-  * Move arena() operation on uncommon path to out-of-line routine
-  * For iterator-pair function parameter types, take both iterators by value.
-  * Code-space savings and perhaps some modest performance improvements in
-    RepeatedPtrField.
-  * Eliminate nullptr check from every tag parse.
-  * Remove unused _$name$_cached_byte_size_ fields.
-  * Serialize extension ranges together when not broken by a proto field in the
-    middle.
-  * Do out-of-line allocation and deallocation of string object in ArenaString.
-  * Streamline ParseContext::ParseMessage<T> to avoid code bloat and improve
-    performance.
-  * New member functions RepeatedField::Assign, RepeatedPtrField::{Add, Assign}.
-  * Fix undefined behavior warning due to innocuous uninitialization of value
-    on an error path.
-  * Avoid expensive inlined code space for encoding message length for messages
-    >= 128 bytes and instead do a procedure call to a shared out-of-line routine.
-  * util::DefaultFieldComparator will be final in a future version of protobuf.
-    Subclasses should inherit from SimpleFieldComparator instead.
-
-  C#
-  * Add .NET 5 target and improve WriteString performance with SIMD (#8147)
-
-  Java
-  * deps: update JUnit and Truth (#8319)
-  * Detect invalid overflow of byteLimit and return InvalidProtocolBufferException as documented.
-  * Exceptions thrown while reading from an InputStream in parseFrom are now
-    included as causes.
-  * Support potentially more efficient proto parsing from RopeByteStrings.
-  * Clarify runtime of ByteString.Output.toStringBuffer().
-  * Added UnsafeByteOperations to protobuf-lite (#8426)
-
-  JavaScript
-  * Make Any.pack() chainable.
-
-  Python
-  * Fix some constness / char literal issues being found by MSVC standard conforming mode (#8344)
-  * Switch on "new" buffer API (#8339)
-  * Enable crosscompiling aarch64 python wheels under dockcross manylinux docker image (#8280)
-  * Fixed a bug in text format where a trailing colon was printed for repeated field.
-  * When TextFormat encounters a duplicate message map key, replace the current
-    one instead of merging.
-
-  Objective-C
-  * Move the class map to a CFDictionary. (#8328)
-
-  PHP
-  * read_property() handler is not supposed to return NULL (#8362)
-  * Changed parameter type from long to integer (#7613)
-  * fix: README supported PHP version for C extension (#8236)
-
-  Ruby
-  * Fixed quadratic memory usage when appending to arrays. (#8364)
-  * Fixed memory leak of Ruby arena objects. (#8461)
-  * Add support for proto3 json_name in compiler and field definitions. (#8356)
-
-  Other
-  * Some doc on AOT compilation and protobuf (#8294)
-  * [CMake] Ability to pass options to protoc executable from cmake (#8374)
-  * Add --fatal_warnings flag to treat warnings as errors (#8131)
-  * [bazel] Remove deprecated way to depend on googletest (#8396)
-  * add error returns missing from protoc to prevent it from exiting with… (#8409)
-
-
-2021-04-07 version 3.15.8 (C++/Java/Python/PHP/Objective-C/C#/Ruby/JavaScript)
-
-  Ruby
-  * Fixed memory leak of Ruby arena objects (#8461)
-
-2021-04-02 version 3.15.7 (C++/Java/Python/PHP/Objective-C/C#/Ruby/JavaScript)
-
-  C++
-  * Remove the ::pb namespace (alias) (#8423)
-
-  Ruby
-  * Fix unbounded memory growth for Ruby <2.7 (#8429)
-  * Fixed message equality in cases where the message type is different (#8434)
-
-2021-03-10 version 3.15.6 (C++/Java/Python/PHP/Objective-C/C#/Ruby/JavaScript)
-
-  Ruby
-  * Fixed bug in string comparison logic (#8386)
-
-2021-03-04 version 3.15.5 (C++/Java/Python/PHP/Objective-C/C#/Ruby/JavaScript)
-
-  Ruby
-  * Fixed quadratic memory use in array append (#8379)
-
-  PHP
-  * Fixed quadratic memory use in array append (#8379)
-
-  C++
-  * Do not disable RTTI by default in the CMake build (#8377)
-
-2021-03-02 version 3.15.4 (C++/Java/Python/PHP/Objective-C/C#/Ruby/JavaScript)
-
-  Ruby
-  * Fixed SEGV when users pass nil messages (#8363)
-  * Fixed quadratic memory usage when appending to arrays (#8364)
-
-  C++
-  * Create a CMake option to control whether or not RTTI is enabled (#8361)
-
-  PHP
-  * read_property() handler is not supposed to return NULL (#8362)
-
-2021-02-25 version 3.15.3 (C++/Java/Python/PHP/Objective-C/C#/Ruby/JavaScript)
-
-  Ruby
-  * Ruby <2.7 now uses WeakMap too, which prevents memory leaks. (#8341)
-
-2021-02-23 version 3.15.2 (C++/Java/Python/PHP/Objective-C/C#/Ruby/JavaScript)
-
-  Ruby
-  * Fix for FieldDescriptor.get(msg) (#8330)
-
-  C++
-  * Fix PROTOBUF_CONSTINIT macro redefinition (#8323)
-
-2021-02-05 version 3.15.1 (C++/Java/Python/PHP/Objective-C/C#/Ruby/JavaScript)
-
-  Ruby
-  * Bugfix for Message.[] for repeated or map fields (#8313)
-
-2021-02-05 version 3.15.0 (C++/Java/Python/PHP/Objective-C/C#/Ruby/JavaScript)
-
-  Protocol Compiler
-  * Optional fields for proto3 are enabled by default, and no longer require
-    the --experimental_allow_proto3_optional flag.
-
-  C++
-  * MessageDifferencer: fixed bug when using custom ignore with multiple
-    unknown fields
-  * Use init_seg in MSVC to push initialization to an earlier phase.
-  * Runtime no longer triggers -Wsign-compare warnings.
-  * Fixed -Wtautological-constant-out-of-range-compare warning.
-  * DynamicCastToGenerated works for nullptr input for even if RTTI is disabled
-  * Arena is refactored and optimized.
-  * Clarified/specified that the exact value of Arena::SpaceAllocated() is an
-    implementation detail users must not rely on. It should not be used in
-    unit tests.
-  * Change the signature of Any::PackFrom() to return false on error.
-  * Add fast reflection getter API for strings.
-  * Constant initialize the global message instances
-  * Avoid potential for missed wakeup in UnknownFieldSet
-  * Now Proto3 Oneof fields have "has" methods for checking their presence in
-    C++.
-  * Bugfix for NVCC
-  * Return early in _InternalSerialize for empty maps.
-  * Adding functionality for outputting map key values in proto path logging
-    output (does not affect comparison logic) and stop printing 'value' in the
-    path. The modified print functionality is in the
-    MessageDifferencer::StreamReporter.
-  * Fixed https://github.com/protocolbuffers/protobuf/issues/8129
-  * Ensure that null char symbol, package and file names do not result in a
-    crash.
-  * Constant initialize the global message instances
-  * Pretty print 'max' instead of numeric values in reserved ranges.
-  * Removed remaining instances of std::is_pod, which is deprecated in C++20.
-  * Changes to reduce code size for unknown field handling by making uncommon
-    cases out of line.
-  * Fix std::is_pod deprecated in C++20 (#7180)
-  * Fix some -Wunused-parameter warnings (#8053)
-  * Fix detecting file as directory on zOS issue #8051 (#8052)
-  * Don't include sys/param.h for _BYTE_ORDER (#8106)
-  * remove CMAKE_THREAD_LIBS_INIT from pkgconfig CFLAGS (#8154)
-  * Fix TextFormatMapTest.DynamicMessage issue#5136 (#8159)
-  * Fix for compiler warning issue#8145 (#8160)
-  * fix: support deprecated enums for GCC < 6 (#8164)
-  * Fix some warning when compiling with Visual Studio 2019 on x64 target (#8125)
-
-  Python
-  * Provided an override for the reverse() method that will reverse the internal
-    collection directly instead of using the other methods of the BaseContainer.
-  * MessageFactory.CreateProtoype can be overridden to customize class creation.
-  * Fix PyUnknownFields memory leak (#7928)
-  * Add macOS Big Sur compatibility (#8126)
-
-  JavaScript
-  * Generate `getDescriptor` methods with `*` as their `this` type.
-  * Enforce `let/const` for generated messages.
-  * js/binary/utils.js: Fix jspb.utils.joinUnsignedDecimalString to work with negative bitsLow and low but non-zero bitsHigh parameter. (#8170)
-
-  PHP
-  * Added support for PHP 8. (#8105)
-  * unregister INI entries and fix invalid read on shutdown (#8042)
-  * Fix PhpDoc comments for message accessors to include "|null". (#8136)
-  * fix: convert native PHP floats to single precision (#8187)
-  * Fixed PHP to support field numbers >=2**28. (#8235)
-  * feat: add support for deprecated fields to PHP compiler (#8223)
-  * Protect against stack overflow if the user derives from Message. (#8248)
-  * Fixed clone for Message, RepeatedField, and MapField. (#8245)
-  * Updated upb to allow nonzero offset minutes in JSON timestamps. (#8258)
-
-  Ruby
-  * Added support for Ruby 3. (#8184)
-  * Rewrote the data storage layer to be based on upb_msg objects from the
-    upb library. This should lead to much better parsing performance,
-    particularly for large messages. (#8184).
-  * Fill out JRuby support (#7923)
-  * [Ruby] Fix: (SIGSEGV) gRPC-Ruby issue on Windows. memory alloc infinite
-    recursion/run out of memory (#8195)
-  * Fix jruby support to handle messages nested more than 1 level deep (#8194)
-
-  Java
-  * Avoid possible UnsupportedOperationException when using CodedInputSteam
-    with a direct ByteBuffer.
-  * Make Durations.comparator() and Timestamps.comparator() Serializable.
-  * Add more detailed error information for dynamic message field type
-    validation failure
-  * Removed declarations of functions declared in java_names.h from
-    java_helpers.h.
-  * Now Proto3 Oneof fields have "has" methods for checking their presence in
-    Java.
-  * Annotates Java proto generated *_FIELD_NUMBER constants.
-  * Add -assumevalues to remove JvmMemoryAccessor on Android.
-
-  C#
-  * Fix parsing negative Int32Value that crosses segment boundary (#8035)
-  * Change ByteString to use memory and support unsafe create without copy (#7645)
-  * Optimize MapField serialization by removing MessageAdapter (#8143)
-  * Allow FileDescriptors to be parsed with extension registries (#8220)
-  * Optimize writing small strings (#8149)
-
-2020-11-11 version 3.14.0 (C++/Java/Python/PHP/Objective-C/C#/Ruby/JavaScript)
-
-  Protocol Compiler
-  * The proto compiler no longer requires a .proto filename when it is not
-    generating code.
-  * Added flag `--deterministic_output` to `protoc --encode=...`.
-  * Fixed deadlock when using google.protobuf.Any embedded in aggregate options.
-
-  C++
-  * Arenas are now unconditionally enabled. cc_enable_arenas no longer has
-    any effect.
-  * Removed inlined string support, which is incompatible with arenas.
-  * Fix a memory corruption bug in reflection when mixing optional and
-    non-optional fields.
-  * Make SpaceUsed() calculation more thorough for map fields.
-  * Add stack overflow protection for text format with unknown field values.
-  * FieldPath::FollowAll() now returns a bool to signal if an out-of-bounds
-    error was encountered.
-  * Performance improvements for Map.
-  * Minor formatting fix when dumping a descriptor to .proto format with
-    DebugString.
-  * UBSAN fix in RepeatedField (#2073).
-  * When running under ASAN, skip a test that makes huge allocations.
-  * Fixed a crash that could happen when creating more than 256 extensions in
-    a single message.
-  * Fix a crash in BuildFile when passing in invalid descriptor proto.
-  * Parser security fix when operating with CodedInputStream.
-  * Warn against the use of AllowUnknownExtension.
-  * Migrated to C++11 for-range loops instead of index-based loops where
-    possible. This fixes a lot of warnings when compiling with -Wsign-compare.
-  * Fix segment fault for proto3 optional (#7805)
-  * Adds a CMake option to build `libprotoc` separately (#7949)
-
-  Java
-  * Bugfix in mergeFrom() when a oneof has multiple message fields.
-  * Fix RopeByteString.RopeInputStream.read() returning -1 when told to read
-    0 bytes when not at EOF.
-  * Redefine remove(Object) on primitive repeated field Lists to avoid
-    autoboxing.
-  * Support "\u" escapes in textformat string literals.
-  * Trailing empty spaces are no longer ignored for FieldMask.
-  * Fix FieldMaskUtil.subtract to recursively remove mask.
-  * Mark enums with `@java.lang.Deprecated` if the proto enum has option
-    `deprecated = true;`.
-  * Adding forgotten duration.proto to the lite library (#7738)
-
-  Python
-  * Print google.protobuf.NullValue as null instead of "NULL_VALUE" when it is
-    used outside WKT Value/Struct.
-  * Fix bug occurring when attempting to deep copy an enum type in python 3.
-  * Add a setuptools extension for generating Python protobufs (#7783)
-  * Remove uses of pkg_resources in non-namespace packages. (#7902)
-  * [bazel/py] Omit google/__init__.py from the Protobuf runtime. (#7908)
-  * Removed the unnecessary setuptools package dependency for Python package (#7511)
-  * Fix PyUnknownFields memory leak (#7928)
-
-  PHP
-  * Added support for "==" to the PHP C extension (#7883)
-  * Added `==` operators for Map and Array. (#7900)
-  * Native C well-known types (#7944)
-  * Optimized away hex2bin() call in generated code (#8006)
-  * New version of upb, and a new hash function wyhash in third_party. (#8000)
-  * add missing hasOneof method to check presence of oneof fields (#8003)
-
-  Go:
-  * Update go_package options to reference google.golang.org/protobuf module.
-
-  C#:
-  * annotate ByteString.CopyFrom(ReadOnlySpan<byte>) as SecuritySafeCritical (#7701)
-  * Fix C# optional field reflection when there are regular fields too (#7705)
-  * Fix parsing negative Int32Value that crosses segment boundary (#8035)
-
-  Javascript:
-  * JS: parse (un)packed fields conditionally (#7379)
-
-2020-07-14 version 3.13.0 (C++/Java/Python/PHP/Objective-C/C#/Ruby/JavaScript)
-
-  PHP:
-  * The C extension is completely rewritten. The new C extension has significantly
-    better parsing performance and fixes a handful of conformance issues. It will
-    also make it easier to add support for more features like proto2 and proto3 presence.
-  * The new C extension does not support PHP 5.x. PHP 5.x users can still use pure-PHP.
-
-  C++:
-  * Removed deprecated unsafe arena string accessors
-  * Enabled heterogeneous lookup for std::string keys in maps.
-  * Removed implicit conversion from StringPiece to std::string
-  * Fix use-after-destroy bug when the Map is allocated in the arena.
-  * Improved the randomness of map ordering
-  * Added stack overflow protection for text format with unknown fields
-  * Use std::hash for proto maps to help with portability.
-  * Added more Windows macros to proto whitelist.
-  * Arena constructors for map entry messages are now marked "explicit"
-    (for regular messages they were already explicit).
-  * Fix subtle aliasing bug in RepeatedField::Add
-  * Fix mismatch between MapEntry ByteSize and Serialize with respect to unset
-    fields.
-
-  Python:
-  * JSON format conformance fixes:
-    * Reject lowercase t for Timestamp json format.
-    * Print full_name directly for extensions (no camelCase).
-    * Reject boolean values for integer fields.
-    * Reject NaN, Infinity, -Infinity that is not quoted.
-    * Base64 fixes for bytes fields: accept URL-safe base64 and missing padding.
-  * Bugfix for fields/files named "async" or "await".
-  * Improved the error message when AttributeError is returned from __getattr__
-    in EnumTypeWrapper.
-
-  Java:
-  * Fixed a bug where setting optional proto3 enums with setFooValue() would
-    not mark the value as present.
-  * Add Subtract function to FieldMaskUtil.
-
-  C#:
-  * Dropped support for netstandard1.0 (replaced by support for netstandard1.1).
-    This was required to modernize the parsing stack to use the `Span<byte>`
-    type internally. (#7351)
-  * Add `ParseFrom(ReadOnlySequence<byte>)` method to enable GC friendly
-    parsing with reduced allocations and buffer copies. (#7351)
-  * Add support for serialization directly to a `IBufferWriter<byte>` or
-    to a `Span<byte>` to enable GC friendly serialization.
-    The new API is available as extension methods on the `IMessage` type. (#7576)
-  * Add `GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE` define to make
-    generated code compatible with old C# compilers (pre-roslyn compilers
-    from .NET framework and old versions of mono) that do not support
-    ref structs. Users that are still on a legacy stack that does
-    not support C# 7.2 compiler might need to use the new define
-    in their projects to be able to build the newly generated code. (#7490)
-  * Due to the major overhaul of parsing and serialization internals (#7351 and #7576),
-    it is recommended to regenerate your generated code to achieve the best
-    performance (the legacy generated code will still work, but might incur
-    a slight performance penalty).
-
-2020-07-28 version 3.12.4 (C++/Java/Python/PHP/Objective-C/C#/Ruby/JavaScript)
-
-This release contains no significant changes, but exists because 3.12.3 was
-mistakenly tagged at the wrong commit.
-
-2020-06-01 version 3.12.3 (C++/Java/Python/PHP/Objective-C/C#/Ruby/JavaScript)
-
-  Objective-C
-  * Tweak the union used for Extensions to support old generated code. #7573
-
-2020-05-26 version 3.12.2 (C++/Java/Python/PHP/Objective-C/C#/Ruby/JavaScript)
-
-  C++
-  * Simplified the template export macros to fix the build for mingw32. (#7539)
-
-  Objective-C
-  * Fix for the :protobuf_objc target in the Bazel BUILD file. (#7538)
-
-2020-05-20 version 3.12.1 (C++/Java/Python/PHP/Objective-C/C#/Ruby/JavaScript)
-
-  Ruby
-  * Re-add binary gems for Ruby 2.3 and 2.4. These are EOL upstream, however
-    many people still use them and dropping support will require more
-    coordination.
-
-2020-05-12 version 3.12.0 (C++/Java/Python/PHP/Objective-C/C#/Ruby/JavaScript)
-
-  Protocol Compiler
-  * [experimental] Singular, non-message typed fields in proto3 now support
-    presence tracking. This is enabled by adding the "optional" field label and
-    passing the --experimental_allow_proto3_optional flag to protoc.
-    * For usage info, see docs/field_presence.md.
-    * During this experimental phase, code generators should update to support
-      proto3 presence, see docs/implementing_proto3_presence.md for instructions.
-  * Allow duplicate symbol names when multiple descriptor sets are passed on
-    the command-line, to match the behavior when multiple .proto files are passed.
-  * Deterministic `protoc --descriptor_set_out` (#7175)
-
-  C++
-  * [experimental] Added proto3 presence support.
-  * New descriptor APIs to support proto3 presence.
-  * Enable Arenas by default on all .proto files.
-  * Documented that users are not allowed to subclass Message or MessageLite.
-  * Mark generated classes as final; inheriting from protos is strongly discouraged.
-  * Add stack overflow protection for text format with unknown fields.
-  * Add accessors for map key and value FieldDescriptors.
-  * Add FieldMaskUtil::FromFieldNumbers().
-  * MessageDifferencer: use ParsePartial() on Any fields so the diff does not
-    fail when there are missing required fields.
-  * ReflectionOps::Merge(): lookup messages in the right factory, if it can.
-  * Added Descriptor::WellKnownTypes enum and Descriptor::well_known_type()
-    accessor as an easier way of determining if a message is a Well-Known Type.
-  * Optimized RepeatedField::Add() when it is used in a loop.
-  * Made proto move/swap more efficient.
-  * De-virtualize the GetArena() method in MessageLite.
-  * Improves performance of json_stream_parser.cc by factor 1000 (#7230)
-  * bug: #7076 undefine Windows OUT and OPTIONAL macros (#7087)
-  * Fixed a bug in FieldDescriptor::DebugString() that would erroneously print
-    an "optional" label for a field in a oneof.
-  * Fix bug in parsing bool extensions that assumed they are always 1 byte.
-  * Fix off-by-one error in FieldOptions::ByteSize() when extensions are present.
-  * Clarified the comments to show an example of the difference between
-    Descriptor::extension and DescriptorPool::FindAllExtensions.
-  * Add a compiler option 'code_size' to force optimize_for=code_size on all
-    protos where this is possible.
-
-  Java
-  * [experimental] Added proto3 presence support.
-  * Mark java enum _VALUE constants as @Deprecated if the enum field is deprecated
-  * reduce <clinit> size for enums with allow_alias set to true.
-  * Sort map fields alphabetically by the field's key when printing textproto.
-  * Fixed a bug in map sorting that appeared in -rc1 and -rc2 (#7508).
-  * TextFormat.merge() handles Any as top level type.
-  * Throw a descriptive IllegalArgumentException when calling
-    getValueDescriptor() on enum special value UNRECOGNIZED instead of
-    ArrayIndexOutOfBoundsException.
-  * Fixed an issue with JsonFormat.printer() where setting printingEnumsAsInts()
-    would override the configuration passed into includingDefaultValueFields().
-  * Implement overrides of indexOf() and contains() on primitive lists returned
-    for repeated fields to avoid autoboxing the list contents.
-  * Add overload to FieldMaskUtil.fromStringList that accepts a descriptor.
-  * [bazel] Move Java runtime/toolchains into //java (#7190)
-
-  Python
-  * [experimental] Added proto3 presence support.
-  * [experimental] fast import protobuf module, only works with cpp generated code linked in.
-  * Truncate 'float' fields to 4 bytes of precision in setters for pure-Python
-    implementation (C++ extension was already doing this).
-  * Fixed a memory leak in C++ bindings.
-  * Added a deprecation warning when code tries to create Descriptor objects
-    directly.
-  * Fix unintended comparison between bytes and string in descriptor.py.
-  * Avoid printing excess digits for float fields in TextFormat.
-  * Remove Python 2.5 syntax compatibility from the proto compiler generated _pb2.py module code.
-  * Drop 3.3, 3.4 and use single version docker images for all python tests (#7396)
-
-  JavaScript
-  * Fix js message pivot selection (#6813)
-
-  PHP
-  * Persistent Descriptor Pool (#6899)
-  * Implement lazy loading of php class for proto messages (#6911)
-  * Correct @return in Any.unpack docblock (#7089)
-  * Ignore unknown enum value when ignore_unknown specified (#7455)
-
-  Ruby
-  * [experimental] Implemented proto3 presence for Ruby. (#7406)
-  * Stop building binary gems for ruby <2.5 (#7453)
-  * Fix for wrappers with a zero value (#7195)
-  * Fix for JSON serialization of 0/empty-valued wrapper types (#7198)
-  * Call "Class#new" over rb_class_new_instance in decoding (#7352)
-  * Build extensions for Ruby 2.7 (#7027)
-  * assigning 'nil' to submessage should clear the field. (#7397)
-
-  C#
-  * [experimental] Add support for proto3 presence fields in C# (#7382)
-  * Mark GetOption API as obsolete and expose the "GetOptions()" method on descriptors instead (#7491)
-  * Remove Has/Clear members for C# message fields in proto2 (#7429)
-  * Enforce recursion depth checking for unknown fields (#7132)
-  * Fix conformance test failures for Google.Protobuf (#6910)
-  * Cleanup various bits of Google.Protobuf (#6674)
-  * Fix latest ArgumentException for C# extensions (#6938)
-  * Remove unnecessary branch from ReadTag (#7289)
-
-  Objective-C
-  * [experimental] ObjC Proto3 optional support (#7421)
-  * Block subclassing of generated classes (#7124)
-  * Use references to Obj C classes instead of names in descriptors. (#7026)
-  * Revisit how the WKTs are bundled with ObjC. (#7173)
-
-  Other
-  * Add a proto_lang_toolchain for javalite (#6882)
-  * [bazel] Update gtest and deprecate //external:{gtest,gtest_main} (#7237)
-  * Add application note for explicit presence tracking. (#7390)
-  * Howto doc for implementing proto3 presence in a code generator. (#7407)
-
-
-2020-02-14 version 3.11.4 (C++/Java/Python/PHP/Objective-C/C#/Ruby/JavaScript)
-
-  C#
-  * Fix latest ArgumentException for C# extensions (#7188)
-  * Enforce recursion depth checking for unknown fields (#7210)
-
-  Ruby
-  * Fix wrappers with a zero value (#7195)
-  * Fix JSON serialization of 0/empty-valued wrapper types (#7198)
-
-2020-01-31 version 3.11.3 (C++/Java/Python/PHP/Objective-C/C#/Ruby/JavaScript)
-
-  C++
-  * Add OUT and OPTIONAL to windows portability files (#7087)
-
-  PHP
-  * Refactored ulong to zend_ulong for php7.4 compatibility (#7147)
-  * Call register_class before getClass from desc to fix segfault (#7077)
-
-
-2019-12-10 version 3.11.2 (C++/Java/Python/PHP/Objective-C/C#/Ruby/JavaScript)
-
-  PHP
-  * Make c extension portable for php 7.4 (#6968)
-
-
-2019-12-02 version 3.11.1 (C++/Java/Python/PHP/Objective-C/C#/Ruby/JavaScript)
-
-  PHP
-  * Extern declare protobuf_globals (#6946)
-
-
-2019-11-19 version 3.11.0 (C++/Java/Python/PHP/Objective-C/C#/Ruby/JavaScript)
-
-  C++
-  * Make serialization method naming consistent
-  * Make proto runtime + generated code free of deprecation warnings
-  * Moved ShutdownProtobufLibrary() to message_lite.h.  For backward compatibility a declaration is still available in stubs/common.h, but users should prefer message_lite.h
-  * Removed non-namespace macro EXPECT_OK()
-  * Removed mathlimits.h from stubs in favor of using std::numeric_limits from C++11
-  * Fixed bug in parser when ending on a group tag
-  * Add a helper function to UnknownFieldSet to deal with the changing return value of message::unknown_fields()
-  * Fix incorrect use of string_view iterators
-  * Support direct pickling of nested messages
-  * Skip extension tag validation for MessageSet if unknown dependencies are allowed
-  * Updated deprecation macros to annotate deprecated code (#6612)
-  * Remove conversion warning in MapEntryFuncs::ByteSizeLong (#6766)
-  * Revert "Make shared libraries be able to link to MSVC static runtime libraries, so that VC runtime is not required." (#6914)
-
-  Java
-  * Remove the usage of MethodHandle, so that Android users prior to API version 26 can use protobuf-java
-  * Publish ProGuard config for javalite
-  * Fix for StrictMode disk read violation in ExtensionRegistryLite
-  * Include part of the ByteString's content in its toString().
-  * Include unknown fields when merging proto3 messages in Java lite builders
-
-  Python
-  * Add float_precision option in json format printer
-  * Optionally print bytes fields as messages in unknown fields, if possible
-  * FieldPath: fix testing IsSet on root path ''
-  * Experimental code gen (fast import protobuf module) which only work with cpp generated code linked in
-
-  JavaScript
-  * Remove guard for Symbol iterator for jspb.Map
-
-  PHP
-  * Avoid too much overhead in layout_init (#6716)
-  * Lazily Create Singular Wrapper Message (#6833)
-  * Implement lazy loading of php class for proto messages (#6911)
-
-  Ruby
-  * Ruby lazy wrappers optimization (#6797)
-
-  C#
-  * (RepeatedField): Capacity property to resize the internal array (#6530)
-  * Experimental proto2 support is now officially available (#4642, #5183, #5350, #5936)
-  * Getting started doc: https://github.com/protocolbuffers/protobuf/blob/master/docs/csharp/proto2.md
-  * Add length checks to ExtensionCollection (#6759)
-  * Optimize parsing of some primitive and wrapper types (#6843)
-  * Use 3 parameter Encoding.GetString for default string values (#6828)
-  * Change _Extensions property to normal body rather than expression (#6856)
-
-  Objective C
-  * Fixed unaligned reads for 32bit arm with newer Xcode versions (#6678)
-
-
-2019-09-03 version 3.10.0 (C++/Java/Python/PHP/Objective-C/C#/Ruby/JavaScript)
-
-  C++
-  * Switch the proto parser to the faster MOMI parser.
-  * Properly escape Struct keys in the proto3 JSON serializer.
-  * Fix crash on uninitialized map entries.
-  * Informed the compiler of has-bit invariant to produce better code
-  * Unused imports of files defining descriptor extensions will now be reported
-  * Add proto2::util::RemoveSubranges to remove multiple subranges in linear time.
-  * Added BaseTextGenerator::GetCurrentIndentationSize()
-  * Made implicit weak fields compatible with the Apple linker
-  * Support 32 bit values for ProtoStreamObjectWriter to Struct.
-  * Removed the internal-only header coded_stream_inl.h and the internal-only methods defined there.
-  * Enforced no SWIG wrapping of descriptor_database.h (other headers already had this restriction).
-  * Implementation of the equivalent of the MOMI parser for serialization. This removes one of the two serialization routines, by making the fast array serialization routine completely general. SerializeToCodedStream can now be implemented in terms of the much much faster array serialization. The array serialization regresses slightly, but when array serialization is not possible this wins big.
-  * Do not convert unknown field name to snake case to accurately report error.
-  * Fix a UBSAN warnings. (#6333)
-  * Add podspec for C++ (#6404)
-  * protoc: fix source code info location for missing label (#6436)
-  * C++ Add move constructor for Reflection's SetString (#6477)
-
-  Java
-  * Call loadDescriptor outside of synchronized block to remove one possible source of deadlock.
-  * Have oneof enums implement a separate interface (other than EnumLite) for clarity.
-  * Opensource Android Memory Accessors
-  * Update TextFormat to make use of the new TypeRegistry.
-  * Support getFieldBuilder and getRepeatedFieldBuilder in ExtendableBuilder
-  * Update JsonFormat to make use of the new TypeRegistry.
-  * Add proguard config generator for GmmBenchmarkSuiteLite.
-  * Change ProtobufArrayList to use Object[] instead of ArrayList for 5-10% faster parsing
-  * Implement ProtobufArrayList.add(E) for 20% (5%-40%) faster overall protolite2 parsing
-  * Make a copy of JsonFormat.TypeRegistry at the protobuf top level package. This will eventually replace JsonFormat.TypeRegistry.
-  * Fix javadoc warnings in generated files (#6231)
-  * Java: Add Automatic-Module-Name entries to the Manifest (#6568)
-
-  Python
-  * Add descriptor methods in descriptor_pool are deprecated.
-  * Uses explicit imports to prevent multithread test failures in py3.
-  * Added __delitem__ for Python extension dict
-  * Update six version to 1.12.0 and fix legacy_create_init issue (#6391)
-
-  JavaScript
-  * Remove deprecated boolean option to getResultBase64String().
-  * Fix sint64 zig-zag encoding.
-  * Simplify hash64 string conversion to avoid DIGIT array. Should reduce overhead if these functions aren't used, and be more efficient by avoiding linear array searches.
-  * Change the parameter types of binaryReaderFn in ExtensionFieldBinaryInfo to (number, ?, ?).
-  * Create dates.ts and time_of_days.ts to mirror Java versions. This is a near-identical conversion of c.g.type.util.{Dates,TimeOfDays} respectively.
-  * Migrate moneys to TypeScript.
-
-  PHP
-  * Fix incorrect leap day for Timestamp (#6696)
-  * Initialize well known type values (#6713)
-
-  Ruby
-  * Fix scope resolution for Google namespace (#5878)
-  * Support hashes for struct initializers (#5716)
-  * Optimized away the creation of empty string objects. (#6502)
-  * Roll forward Ruby upb changes now that protobuf Ruby build is fixed (#5866)
-  * Optimized layout_mark() for Ruby (#6521)
-  * Optimization for layout_init() (#6547)
-  * Fix for GC of Ruby map frames. (#6533)
-  * Fixed leap year handling by reworking upb_mktime() -> upb_timegm(). (#6695)
-
-  Objective C
-  * Remove OSReadLittle* due to alignment requirements (#6678)
-  * Don't use unions and instead use memcpy for the type swaps. (#6672)
-
-  Other
-  * Override CocoaPods module to lowercase (#6464)
-
-
-2019-06-28 version 3.9.0 (C++/Java/Python/PHP/Objective-C/C#/Ruby/JavaScript)
-
-  C++
-  * Optimize and simplify implementation of RepeatedPtrFieldBase
-  * Don't create unnecessary unknown field sets.
-  * Remove branch from accessors to repeated field element array.
-  * Added delimited parse and serialize util.
-  * Reduce size by not emitting constants for fieldnumbers
-  * Fix a bug when comparing finite and infinite field values with explicit tolerances.
-  * TextFormat::Parser should use a custom Finder to look up extensions by number if one is provided.
-  * Add MessageLite::Utf8DebugString() to make MessageLite more compatible with Message.
-  * Fail fast for better performance in DescriptorPool::FindExtensionByNumber() if descriptor has no defined extensions.
-  * Adding the file name to help debug colliding extensions
-  * Added FieldDescriptor::PrintableNameForExtension() and DescriptorPool::FindExtensionByPrintableName().
-    The latter will replace Reflection::FindKnownExtensionByName().
-  * Replace NULL with nullptr
-  * Created a new Add method in repeated field that allows adding a range of elements all at once.
-  * Enabled enum name-to-value mapping functions for C++ lite
-  * Avoid dynamic initialization in descriptor.proto generated code
-  * Move stream functions to MessageLite from Message.
-  * Move all zero_copy_stream functionality to io_lite.
-  * Do not create array of matched fields for simple repeated fields
-  * Enabling silent mode by default to reduce make compilation noise. (#6237)
-
-  Java
-  * Expose TextFormat.Printer and make it configurable. Deprecate the static methods.
-  * Library for constructing google.protobuf.Struct and google.protobuf.Value
-  * Make OneofDescriptor extend GenericDescriptor.
-  * Expose streamingness of service methods from MethodDescriptor.
-  * Fix a bug where TextFormat fails to parse Any filed with > 1 embedded message sub-fields.
-  * Establish consistent JsonFormat behavior for nulls in oneofs, regardless of order.
-  * Update GSON version to 3.8.5. (#6268)
-  * Add `protobuf_java_lite` Bazel target. (#6177)
-
-  Python
-  * Change implementation of Name() for enums that allow aliases in proto2 in Python
-    to be in line with claims in C++ implementation (to return first value).
-  * Explicitly say what field cannot be set when the new value fails a type check.
-  * Duplicate register in descriptor pool will raise errors
-  * Add __slots__ to all well_known_types classes, custom attributes are not allowed anymore.
-  * text_format only present 8 valid digits for float fields by default
-
-  JavaScript
-  * Add Oneof enum to the list of goog.provide
-
-  PHP
-  * Make php message class final to avoid mocking. (#6277)
-  * Rename get/setXXXValue to get/setXXXWrapper. (#6295)
-
-  Ruby
-  * Remove to_hash methods. (#6166)
-
-
-2019-04-29 version 3.8.0 (C++/Java/Python/PHP/Objective-C/C#/Ruby/JavaScript)
-
-  C++
-  * Use std::atomic<int32> in case of myriad2 platform
-  * Always declare enums to be int-sized
-  * Added DebugString() and ShortDebugString() methods on MessageLite
-  * Specialized different parse loop control flows
-  * Make hasbits potentially in register. The or's start forming an obstacle because it's a read modify store on the same mem address on each iteration.
-  * Move to an internal MACRO for parser validity checks.
-  * Improve map parsing performance.
-  * Make MergePartialFromCodedStream non virtual. This allows direct calls, potential inlining and is also a code health improvement
-  * Add an overall limit to parse_context to prevent reading past it. This allows to remove a annoying level of indirection.
-  * Fix a mistake, we shouldn't verify map key/value strings for utf8 in opt mode for proto2.
-  * Further improvements to cut binary size.
-  * Prepare to make MergePartialFromCodedStream non-virtual.
-  * A report on some interesting behavior change in python (caused by b/27494216) made me realize there is a check that needs to be done in case the parse ended on a end group tag.
-  * Add a note of caution to the comments around skip in CodedOutputStream.
-  * Simplify end check.
-  * Add overload for ParseMessage for MessageLite/Message types. If the explicit type is not known inlining won't help de-virtualizing the virtual call.
-  * Reduce linker input. It turns out that ParseMessage is not inlined, producing  template instantiations that are used only once and save nothing but cost more.
-  * Improve the parser.
-  * [c++17] Changed proto2::RepeatedPtrField iterators to no longer derive from the deprecated std::iterator class.
-  * Change the default value of case_insensitive_enum_parsing to false for JsonStringToMessage.
-  * Add a warning if a field name doesn't match the style guide.
-  * Fix TextFormat not round-trip correctly when float value is max float.
-  * Added locationed info for some errors at compiler
-  * Python reserved keywords are now working with getattr()/setattr() for most descriptors.
-  * Added AllowUnknownField() in text_format
-  * Append '_' to C++ reserved keywords for message, enum, extension
-  * Fix MSVC warning C4244 in protobuf's parse_context.h.
-  * Updating Iterators to be compatible with C++17 in MSVC.
-  * Use capability annotation in mutex.h
-  * Fix "UndefinedBehaviorSanitizer: cfi-bad-type"
-  * CriticalSectionLock class as a lightweight replacement for std::mutex on Windows platforms.
-  * Removed vestigial wire_format_lite_inl.h
-
-  C#
-  * Added System.Memory dependency.
-
-  Java
-  * Make Java protoc code generator ignore optimize_for LITE_RUNTIME. Users should instead use the Java lite protoc plugin.
-  * Change Extension getMessageDefaultInstance() to return Message instead of MessageLite.
-  * Prevent malicious input streams from leaking buffers for ByteString or ByteBuffer parsing.
-  * Release new Javalite runtime.
-  * Show warning in case potential file name conflict.
-  * Allow Java reserved keywords to be used in extensions.
-  * Added setAllowUnknownFields() in text format
-  * Add memoization to ExtensionRegistryLite.getEmptyRegistry()
-  * Improve performance of CodedOutputStream.writeUInt32NoTag
-  * Add an optimized mismatch-finding algorithm to UnsafeUtil.
-  * When serializing uint32 varints, check that we have MAX_VARINT32_SIZE bytes left, not just MAX_VARINT_SIZE.
-  * Minor optimization to RopeByteString.PieceIterator
-
-  JavaScript
-  * Simplify generated toObject code when the default value is used.
-
-  Python
-  * Changes implementation of Name() for enums that allow aliases in proto2 in Python to be in line with claims in C++ implementation (to return first value).
-  * Added double_format option in text format printer.
-  * Added iter and __contains__ to extension dict
-  * Added allow_unknown_field option in python text format parser
-  * Fixed Timestamp.ToDatetime() loses precision issue
-  * Support unknown field in text format printer.
-  * Float field will be convert to inf if bigger than struct.unpack('f', b'\xff\xff\x7f\x7f')[0] which is about 3.4028234664e+38,
-  convert to -inf if smaller than -3.4028234664e+38
-  * Allowed casting str->bytes in Message.__setstate__
-
-  Ruby
-  * Helper methods to get enum name for Ruby.
-
-
-2019-01-24 version 3.7.0 (C++/Java/Python/PHP/Objective-C/C#/Ruby/JavaScript)
-
-  C++
-  * Introduced new MOMI (maybe-outside-memory-interval) parser.
-  * Add an option to json_util to parse enum as case-insensitive. In the future, enum parsing in json_util will become case-sensitive.
-  * Added conformance test for enum aliases
-  * Added support for --cpp_out=speed:...
-  * Added use of C++ override keyword where appropriate
-  * Many other cleanups and fixes.
-
-  Java
-  * Fix illegal reflective access warning in JDK 9+
-  * Add BOM
-
-  Python
-  * Added Python 3.7 compatibility.
-  * Modified ParseFromString to return bytes parsed .
-  * Introduce Proto C API.
-  * FindFileContainingSymbol in descriptor pool is now able to find field and enum values.
-  * reflection.MakeClass()  and  reflection.ParseMessage() are deprecated.
-  * Added DescriptorPool.FindMethodByName() method in pure python (c extension already has it)
-  * Flipped proto3 to preserve unknown fields by default.
-  * Added support for memoryview in python3 proto message parsing.
-  * Added MergeFrom for repeated scalar fields in c extension (pure python already has it)
-  * Surrogates are now rejected at setters in python3.
-  * Added public unknown field API.
-  * RecursionLimit is also set to max if allow_oversize_protos is enabled.
-  * Disallow duplicate scalars in proto3 text_format parse.
-  * Fix some segment faults for c extension map field.
-
-  PHP
-  * Most issues for json encoding/decoding in the c extension have been fixed. There are still some edge cases not fixed. For more details, check conformance/failure_list_php_c.txt.
-  * Supports php 7.3
-  * Added helper methods to convert between enum values and names.
-  * Allow setting/getting wrapper message fields using primitive values.
-  * Various bug fixes.
-
-  Ruby
-  * Ruby 2.6 support.
-  * Drops support for ruby < 2.3.
-  * Most issues for json encoding/decoding in the c extension have been fixed. There are still some edge cases not fixed. For more details, check conformance/failure_list_ruby.txt.
-  * Json parsing can specify an option to ignore unknown fields: msg.decode_json(data, {ignore_unknown_fields: true}).
-  * Added support for proto2 syntax (partially).
-  * Various bug fixes.
-
-  Csharp
-  * More support for FieldMask include merge, intersect and more.
-  * Increasing the default recursion limit to 100.
-  * Support loading FileDescriptors dynamically.
-  * Provide access to comments from descriptors.
-  * Added Any.Is method.
-  * Compatible with C# 6
-  * Added IComparable and comparison operators on Timestamp.
-
-  Objective C
-  * Add ability to introspect list of enum values (#4678)
-  * Copy the value when setting message/data fields (#5215)
-  * Support suppressing the objc package prefix checks on a list of files (#5309)
-  * More complete keyword and NSObject method (via categories) checks for field names, can result in more fields being rename, but avoids the collisions at runtime (#5289)
-  * Small fixes to TextFormat generation for extensions (#5362)
-  * Provide more details/context in deprecation messages (#5412)
-  * Array/Dictionary enumeration blocks NS_NOESCAPE annotation for Swift (#5421)
-  * Properly annotate extensions for ARC when their names imply behaviors (#5427)
-  * Enum alias name collision improvements (#5480)
-
-
-2018-07-27 version 3.6.1 (C++/Java/Python/PHP/Objective-C/C#/Ruby/JavaScript)
-
-  C++
-  * Introduced workaround for Windows issue with std::atomic and std::once_flag
-    initialization (#4777, #4773).
-
-  PHP
-  * Added compatibility with PHP 7.3 (#4898).
-
-  Ruby
-  * Fixed Ruby crash involving Any encoding (#4718).
-
-2018-06-01 version 3.6.0 (C++/Java/Python/PHP/Objective-C/C#/Ruby/JavaScript)
-
-  C++
-  * Starting from this release, we now require C++11. For those we cannot yet
-    upgrade to C++11, we will try to keep the 3.5.x branch updated with
-    critical bug fixes only. If you have any concerns about this, please
-    comment on issue #2780.
-  * Moved to C++11 types like std::atomic and std::unique_ptr and away from our
-    old custom-built equivalents.
-  * Added support for repeated message fields in lite protos using implicit
-    weak fields. This is an experimental feature that allows the linker to
-    strip out more unused messages than previously was possible.
-  * Fixed SourceCodeInfo for interpreted options and extension range options.
-  * Fixed always_print_enums_as_ints option for JSON serialization.
-  * Added support for ignoring unknown enum values when parsing JSON.
-  * Create std::string in Arena memory.
-  * Fixed ValidateDateTime to correctly check the day.
-  * Fixed bug in ZeroCopyStreamByteSink.
-  * Various other cleanups and fixes.
-
-  Java
-  * Dropped support for Java 6.
-  * Added a UTF-8 decoder that uses Unsafe to directly decode a byte buffer.
-  * Added deprecation annotations to generated code for deprecated oneof
-    fields.
-  * Fixed map field serialization in DynamicMessage.
-  * Cleanup and documentation for Java Lite runtime.
-  * Various other fixes and cleanups
-  * Fixed unboxed arraylists to handle an edge case
-  * Improved performance for copying between unboxed arraylists
-  * Fixed lite protobuf to avoid Java compiler warnings
-  * Improved test coverage for lite runtime
-  * Performance improvements for lite runtime
-
-  Python
-  * Fixed bytes/string map key incompatibility between C++ and pure-Python
-    implementations (issue #4029)
-  * Added __init__.py files to compiler and util subpackages
-  * Use /MT for all Windows versions
-  * Fixed an issue affecting the Python-C++ implementation when used with
-    Cython (issue #2896)
-  * Various text format fixes
-  * Various fixes to resolve behavior differences between the pure-Python and
-    Python-C++ implementations
-
-  PHP
-  * Added php_metadata_namespace to control the file path of generated metadata
-    file.
-  * Changed generated classes of nested message/enum. E.g., Foo.Bar, which
-    previously generates Foo_Bar, now generates Foo/Bar
-  * Added array constructor. When creating a message, users can pass a php
-    array whose content is field name to value pairs into constructor. The
-    created message will be initialized according to the array. Note that
-    message field should use a message value instead of a sub-array.
-  * Various bug fixes.
-
-  Objective-C
-  * We removed some helper class methods from GPBDictionary to shrink the size
-    of the library, the functionary is still there, but you may need to do some
-    specific +alloc / -init… methods instead.
-  * Minor improvements in the performance of object field getters/setters by
-    avoiding some memory management overhead.
-  * Fix a memory leak during the raising of some errors.
-  * Make header importing completely order independent.
-  * Small code improvements for things the undefined behaviors compiler option
-    was flagging.
-
-  Ruby
-  * Added ruby_package file option to control the module of generated class.
-  * Various bug fixes.
-
-  Javascript
-  * Allow setting string to int64 field.
-
-  Csharp
-  * Unknown fields are now parsed and then sent back on the wire. They can be
-    discarded at parse time via a CodedInputStream option.
-  * Movement towards working with .NET 3.5 and Unity
-  * Expression trees are no longer used
-  * AOT generics issues in Unity/il2cpp have a workaround (see this commit for
-    details)
-  * Floating point values are now compared bitwise (affects NaN value
-    comparisons)
-  * The default size limit when parsing is now 2GB rather than 64MB
-  * MessageParser now supports parsing from a slice of a byte array
-  * JSON list parsing now accepts null values where the underlying proto
-    representation does
-
-2017-12-20 version 3.5.1 (C++/Java/Python/PHP/Objective-C/C#/Ruby/JavaScript)
-  Planned Future Changes
-  * Make C++ implementation C++11 only: we plan to require C++11 to build
-    protobuf code starting from 3.6.0 release. Please join this github issue:
-    https://github.com/protocolbuffers/protobuf/issues/2780 to provide your feedback.
-
-  protoc
-  * Fixed a bug introduced in 3.5.0 and protoc in Windows now accepts non-ascii
-    characters in paths again.
-
-  C++
-  * Removed several usages of C++11 features in the code base.
-  * Fixed some compiler warnings.
-
-  PHP
-  * Fixed memory leak in C-extension implementation.
-  * Added discardUnknokwnFields API.
-  * Removed duplicated typedef in C-extension headers.
-  * Avoided calling private php methods (timelib_update_ts).
-  * Fixed Any.php to use fully-qualified name for DescriptorPool.
-
-  Ruby
-  * Added Google_Protobuf_discard_unknown for discarding unknown fields in
-    messages.
-
-  C#
-  * Unknown fields are now preserved by default.
-  * Floating point values are now bitwise compared, affecting message equality
-    check and Contains() API in map and repeated fields.
-
-
-2017-11-13 version 3.5.0 (C++/Java/Python/PHP/Objective-C/C#/Ruby/JavaScript)
-  Planned Future Changes
-  * Make C++ implementation C++11 only: we plan to require C++11 to build
-    protobuf code starting from 3.6.0 release. Please join this github issue:
-    https://github.com/protocolbuffers/protobuf/issues/2780 to provide your feedback.
-
-  General
-  * Unknown fields are now preserved in proto3 for most of the language
-    implementations for proto3 by default. See the per-language section for
-    details.
-  * reserve keyword are now supported in enums
-
-  C++
-  * Proto3 messages are now preserving unknown fields by default. If you rely on
-    unknowns fields being dropped. Please use DiscardUnknownFields() explicitly.
-  * Deprecated the unsafe_arena_release_* and unsafe_arena_add_allocated_*
-    methods for string fields.
-  * Added move constructor and move assignment to RepeatedField,
-    RepeatedPtrField and google::protobuf::Any.
-  * Added perfect forwarding in Arena::CreateMessage
-  * In-progress experimental support for implicit weak fields with lite protos.
-    This feature allows the linker to strip out more unused messages and reduce
-    binary size.
-  * Various performance optimizations.
-
-  Java
-  * Proto3 messages are now preserving unknown fields by default. If you’d like
-    to drop unknown fields, please use the DiscardUnknownFieldsParser API. For
-    example:
-      Parser<Foo> parser = DiscardUnknownFieldsParser.wrap(Foo.parser());
-      Foo foo = parser.parseFrom(input);
-  * Added a new CodedInputStream decoder for Iterable<ByteBuffer> with direct
-    ByteBuffers.
-  * TextFormat now prints unknown length-delimited fields as messages if
-    possible.
-  * FieldMaskUtil.merge() no longer creates unnecessary empty messages when a
-    message field is unset in both source message and destination message.
-  * Various performance optimizations.
-
-  Python
-  * Proto3 messages are now preserving unknown fields by default. Use
-    message.DiscardUnknownFields() to drop unknown fields.
-  * Add FieldDescriptor.file in generated code.
-  * Add descriptor pool FindOneofByName in pure python.
-  * Change unknown enum values into unknown field set .
-  * Add more Python dict/list compatibility for Struct/ListValue.
-  * Add utf-8 support for text_format.Merge()/Parse().
-  * Support numeric unknown enum values for proto3 JSON format.
-  * Add warning for Unexpected end-group tag in cpp extension.
-
-  PHP
-  * Proto3 messages are now preserving unknown fields.
-  * Provide well known type messages in runtime.
-  * Add prefix ‘PB’ to generated class of reserved names.
-  * Fixed all conformance tests for encode/decode json in php runtime. C
-    extension needs more work.
-
-  Objective-C
-  * Fixed some issues around copying of messages with unknown fields and then
-    mutating the unknown fields in the copy.
-
-  C#
-  * Added unknown field support in JsonParser.
-  * Fixed oneof message field merge.
-  * Simplify parsing messages from array slices.
-
-  Ruby
-  * Unknown fields are now preserved by default.
-  * Fixed several bugs for segment fault.
-
-  Javascript
-  * Decoder can handle both paced and unpacked data no matter how the proto is
-    defined.
-  * Decoder now accept long varint for 32 bit integers.
-
-
-2017-08-14 version 3.4.0 (C++/Java/Python/PHP/Objective-C/C#/Ruby/JavaScript)
-  Planned Future Changes
-  * There are some changes that are not included in this release but are planned
-    for the near future
-      - Preserve unknown fields in proto3: We are going to bring unknown fields
-        back into proto3. In this release, some languages start to support
-        preserving unknown fields in proto3, controlled by flags/options. Some
-        languages also introduce explicit APIs to drop unknown fields for
-        migration. Please read the change log sections by languages for details.
-        For general timeline and plan:
-
-          https://docs.google.com/document/d/1KMRX-G91Aa-Y2FkEaHeeviLRRNblgIahbsk4wA14gRk/view
-
-        For issues and discussions:
-
-          https://github.com/protocolbuffers/protobuf/issues/272
-
-      - Make C++ implementation C++11 only: we plan to require C++11 to build
-        protobuf code starting from 3.5.0 or 3.6.0 release, after unknown fields
-        semantic changes are finished. Please join this
-        github issue:
-
-          https://github.com/protocolbuffers/protobuf/issues/2780
-
-        to provide your feedback.
-
-  General
-  * Extension ranges now accept options and are customizable.
-  * "reserve" keyword now supports “max� in field number ranges,
-    e.g.  reserve 1000 to max;
-
-  C++
-  * Proto3 messages are now able to preserve unknown fields. The default
-    behavior is still to drop unknowns, which will be flipped in a future
-    release. If you rely on unknowns fields being dropped. Please use
-    Message::DiscardUnknownFields() explicitly.
-  * Packable proto3 fields are now packed by default in serialization.
-  * Following C++11 features are introduced when C++11 is available:
-      - move-constructor and move-assignment are introduced to messages
-      - Repeated fields constructor now takes std::initializer_list
-      - rvalue setters are introduced for string fields
-  * Experimental Table-Driven parsing and serialization available to test. To
-    enable it, pass in table_driven_parsing table_driven_serialization protoc
-    generator flags for C++
-
-      $ protoc --cpp_out=table_driven_parsing,table_driven_serialization:./ \
-        test.proto
-
-  * lite generator parameter supported by the generator. Once set, all generated
-    files, use lite runtime regardless of the optimizer_for setting in the
-    .proto file.
-  * Various optimizations to make C++ code more performant on PowerPC platform
-  * Fixed maps data corruption when the maps are modified by both reflection API
-    and generated API.
-  * Deterministic serialization on maps reflection now uses stable sort.
-  * file() accessors are introduced to various *Descriptor classes to make
-    writing template function easier.
-  * ByteSize() and SpaceUsed() are deprecated.Use ByteSizeLong() and
-    SpaceUsedLong() instead
-  * Consistent hash function is used for maps in DEBUG and NDEBUG build.
-  * "using namespace std" is removed from stubs/common.h
-  * Various performance optimizations and bug fixes
-
-  Java
-  * Introduced new parser API DiscardUnknownFieldsParser in preparation of
-    proto3 unknown fields preservation change. Users who want to drop unknown
-    fields should migrate to use this new parser API. For example:
-
-      Parser<Foo> parser = DiscardUnknownFieldsParser.wrap(Foo.parser());
-      Foo foo = parser.parseFrom(input);
-
-  * Introduced new TextFormat API printUnicodeFieldValue() that prints field
-    value without escaping unicode characters.
-  * Added Durations.compare(Duration, Duration) and
-    Timestamps.compare(Timestamp, Timestamp).
-  * JsonFormat now accepts base64url encoded bytes fields.
-  * Optimized CodedInputStream to do less copies when parsing large bytes
-    fields.
-  * Optimized TextFormat to allocate less memory when printing.
-
-  Python
-  * SerializeToString API is changed to SerializeToString(self, **kwargs),
-    deterministic parameter is accepted for deterministic serialization.
-  * Added sort_keys parameter in json format to make the output deterministic.
-  * Added indent parameter in json format.
-  * Added extension support in json format.
-  * Added __repr__ support for repeated field in cpp implementation.
-  * Added file in FieldDescriptor.
-  * Added pretty-print filter to text format.
-  * Services and method descriptors are always printed even if generic_service
-    option is turned off.
-  * Note: AppEngine 2.5 is deprecated on June 2017 that AppEngine 2.5 will
-    never update protobuf runtime. Users who depend on AppEngine 2.5 should use
-    old protoc.
-
-  PHP
-  * Support PHP generic services. Specify file option php_generic_service=true
-    to enable generating service interface.
-  * Message, repeated and map fields setters take value instead of reference.
-  * Added map iterator in c extension.
-  * Support json  encode/decode.
-  * Added more type info in getter/setter phpdoc
-  * Fixed the problem that c extension and php implementation cannot be used
-    together.
-  * Added file option php_namespace to use custom php namespace instead of
-    package.
-  * Added fluent setter.
-  * Added descriptor API in runtime for custom encode/decode.
-  * Various bug fixes.
-
-  Objective-C
-  * Fix for GPBExtensionRegistry copying and add tests.
-  * Optimize GPBDictionary.m codegen to reduce size of overall library by 46K
-    per architecture.
-  * Fix some cases of reading of 64bit map values.
-  * Properly error on a tag with field number zero.
-  * Preserve unknown fields in proto3 syntax files.
-  * Document the exceptions on some of the writing apis.
-
-  C#
-  * Implemented IReadOnlyDictionary<K,V> in MapField<K,V>
-  * Added TryUnpack method for Any message in addition to Unpack.
-  * Converted C# projects to MSBuild (csproj) format.
-
-  Ruby
-  * Several bug fixes.
-
-  Javascript
-  * Added support of field option js_type. Now one can specify the JS type of a
-    64-bit integer field to be string in the generated code by adding option
-    [jstype = JS_STRING] on the field.
-
-2017-04-05 version 3.3.0 (C++/Java/Python/PHP/Objective-C/C#/Ruby/JavaScript)
-  Planned Future Changes
-  * There are some changes that are not included in this release but are
-    planned for the near future:
-      - Preserve unknown fields in proto3: please read this doc:
-
-          https://docs.google.com/document/d/1KMRX-G91Aa-Y2FkEaHeeviLRRNblgIahbsk4wA14gRk/view
-
-        for the timeline and follow up this github issue:
-
-          https://github.com/protocolbuffers/protobuf/issues/272
-
-        for discussion.
-      - Make C++ implementation C++11 only: we plan to require C++11 to build
-        protobuf code starting from 3.4.0 or 3.5.0 release. Please join this
-        github issue:
-
-          https://github.com/protocolbuffers/protobuf/issues/2780
-
-        to provide your feedback.
-
-  C++
-  * Fixed map fields serialization of DynamicMessage to correctly serialize
-    both key and value regardless of their presence.
-  * Parser now rejects field number 0 correctly.
-  * New API Message::SpaceUsedLong() that’s equivalent to
-    Message::SpaceUsed() but returns the value in size_t.
-  * JSON support
-    - New flag always_print_enums_as_ints in JsonPrintOptions.
-    - New flag preserve_proto_field_names in JsonPrintOptions. It will instruct
-      the JSON printer to use the original field name declared in the .proto
-      file instead of converting them to lowerCamelCase when printing JSON.
-    - JsonPrintOptions.always_print_primtive_fields now works for oneof message
-      fields.
-    - Fixed a bug that doesn’t allow different fields to set the same json_name
-      value.
-    - Fixed a performance bug that causes excessive memory copy when printing
-      large messages.
-  * Various performance optimizations.
-
-  Java
-  * Map field setters eagerly validate inputs and throw NullPointerExceptions
-    as appropriate.
-  * Added ByteBuffer overloads to the generated parsing methods and the Parser
-    interface.
-  * proto3 enum's getNumber() method now throws on UNRECOGNIZED values.
-  * Output of JsonFormat is now locale independent.
-
-  Python
-  * Added FindServiceByName() in the pure-Python DescriptorPool. This works only
-    for descriptors added with DescriptorPool.Add(). Generated descriptor_pool
-    does not support this yet.
-  * Added a descriptor_pool parameter for parsing Any in text_format.Parse().
-  * descriptor_pool.FindFileContainingSymbol() now is able to find nested
-    extensions.
-  * Extending empty [] to repeated field now sets parent message presence.
-
-  PHP
-  * Added file option php_class_prefix. The prefix will be prepended to all
-    generated classes defined in the file.
-  * When encoding, negative int32 values are sign-extended to int64.
-  * Repeated/Map field setter accepts a regular PHP array. Type checking is
-    done on the array elements.
-  * encode/decode are renamed to serializeToString/mergeFromString.
-  * Added mergeFrom, clear method on Message.
-  * Fixed a bug that oneof accessor didn’t return the field name that is
-    actually set.
-  * C extension now works with php7.
-  * This is the first GA release of PHP. We guarantee that old generated code
-    can always work with new runtime and new generated code.
-
-  Objective-C
-  * Fixed help for GPBTimestamp for dates before the epoch that contain
-    fractional seconds.
-  * Added GPBMessageDropUnknownFieldsRecursively() to remove unknowns from a
-    message and any sub messages.
-  * Addressed a threading race in extension registration/lookup.
-  * Increased the max message parsing depth to 100 to match the other languages.
-  * Removed some use of dispatch_once in favor of atomic compare/set since it
-    needs to be heap based.
-  * Fixes for new Xcode 8.3 warnings.
-
-  C#
-  * Fixed MapField.Values.CopyTo, which would throw an exception unnecessarily
-    if provided exactly the right size of array to copy to.
-  * Fixed enum JSON formatting when multiple names mapped to the same numeric
-    value.
-  * Added JSON formatting option to format enums as integers.
-  * Modified RepeatedField<T> to implement IReadOnlyList<T>.
-  * Introduced the start of custom option handling; it's not as pleasant as it
-    might be, but the information is at least present. We expect to extend code
-    generation to improve this in the future.
-  * Introduced ByteString.FromStream and ByteString.FromStreamAsync to
-    efficiently create a ByteString from a stream.
-  * Added whole-message deprecation, which decorates the class with [Obsolete].
-
-  Ruby
-  * Fixed Message#to_h for messages with map fields.
-  * Fixed memcpy() in binary gems to work for old glibc, without breaking the
-    build for non-glibc libc’s like musl.
-
-  Javascript
-  * Added compatibility tests for version 3.0.0.
-  * Added conformance tests.
-  * Fixed serialization of extensions: we need to emit a value even if it is
-    falsy (like the number 0).
-  * Use closurebuilder.py in favor of calcdeps.py for compiling JavaScript.
-
-2017-01-23 version 3.2.0 (C++/Java/Python/PHP/Ruby/Objective-C/C#/JavaScript/Lite)
-  General
-  * Added protoc version number to protoc plugin protocol. It can be used by
-    protoc plugin to detect which version of protoc is used with the plugin and
-    mitigate known problems in certain version of protoc.
-
-  C++
-  * The default parsing byte size limit has been raised from 64MB to 2GB.
-  * Added rvalue setters for non-arena string fields.
-  * Enabled debug logging for Android.
-  * Fixed a double-free problem when using Reflection::SetAllocatedMessage()
-    with extension fields.
-  * Fixed several deterministic serialization bugs:
-    * MessageLite::SerializeAsString() now respects the global deterministic
-      serialization flag.
-    * Extension fields are serialized deterministically as well.  Fixed protocol
-      compiler to correctly report importing-self as an error.
-  * Fixed FileDescriptor::DebugString() to print custom options correctly.
-  * Various performance/codesize optimizations and cleanups.
-
-  Java
-  * The default parsing byte size limit has been raised from 64MB to 2GB.
-  * Added recursion limit when parsing JSON.
-  * Fixed a bug that enumType.getDescriptor().getOptions() doesn't have custom
-    options.
-  * Fixed generated code to support field numbers up to 2^29-1.
-
-  Python
-  * You can now assign NumPy scalars/arrays (np.int32, np.int64) to protobuf
-    fields, and assigning other numeric types has been optimized for
-    performance.
-  * Pure-Python: message types are now garbage-collectable.
-  * Python/C++: a lot of internal cleanup/refactoring.
-
-  PHP (Alpha)
-  * For 64-bit integers type (int64/uint64/sfixed64/fixed64/sint64), use PHP
-    integer on 64-bit environment and PHP string on 32-bit environment.
-  * PHP generated code also conforms to PSR-4 now.
-  * Fixed ZTS build for c extension.
-  * Fixed c extension build on Mac.
-  * Fixed c extension build on 32-bit linux.
-  * Fixed the bug that message without namespace is not found in the descriptor
-    pool. (#2240)
-  * Fixed the bug that repeated field is not iterable in c extension.
-  * Message names Empty will be converted to GPBEmpty in generated code.
-  * Added phpdoc in generated files.
-  * The released API is almost stable. Unless there is large problem, we won't
-    change it. See
-    https://developers.google.com/protocol-buffers/docs/reference/php-generated
-    for more details.
-
-  Objective-C
-  * Added support for push/pop of the stream limit on CodedInputStream for
-    anyone doing manual parsing.
-
-  C#
-  * No changes.
-
-  Ruby
-  * Message objects now support #respond_to? for field getters/setters.
-  * You can now compare “message == non_message_object� and it will return false
-    instead of throwing an exception.
-  * JRuby: fixed #hashCode to properly reflect the values in the message.
-
-  Javascript
-  * Deserialization of repeated fields no longer has quadratic performance
-    behavior.
-  * UTF-8 encoding/decoding now properly supports high codepoints.
-  * Added convenience methods for some well-known types: Any, Struct, and
-    Timestamp. These make it easier to convert data between native JavaScript
-    types and the well-known protobuf types.
-
-2016-09-23 version 3.1.0 (C++/Java/Python/PHP/Ruby/Objective-C/C#/JavaScript/Lite)
-  General
-  * Proto3 support in PHP (alpha).
-  * Various bug fixes.
-
-  C++
-  * Added MessageLite::ByteSizeLong() that’s equivalent to
-    MessageLite::ByteSize() but returns the value in size_t. Useful to check
-    whether a message is over the 2G size limit that protobuf can support.
-  * Moved default_instances to global variables. This allows default_instance
-    addresses to be known at compile time.
-  * Adding missing generic gcc 64-bit atomicops.
-  * Restore New*Callback into google::protobuf namespace since these are used
-    by the service stubs code
-  * JSON support.
-    * Fixed some conformance issues.
-  * Fixed a JSON serialization bug for bytes fields.
-
-  Java
-  * Fixed a bug in TextFormat that doesn’t accept empty repeated fields (i.e.,
-    “field: [ ]�).
-  * JSON support
-    * Fixed JsonFormat to do correct snake_case-to-camelCase conversion for
-      non-style-conforming field names.
-    * Fixed JsonFormat to parse empty Any message correctly.
-    * Added an option to JsonFormat.Parser to ignore unknown fields.
-  * Experimental API
-    * Added UnsafeByteOperations.unsafeWrap(byte[]) to wrap a byte array into
-      ByteString without copy.
-
-  Python
-  * JSON support
-    * Fixed some conformance issues.
-
-  PHP (Alpha)
-  * We have added the proto3 support for PHP via both a pure PHP package and a
-    native c extension. The pure PHP package is intended to provide usability
-    to wider range of PHP platforms, while the c extension is intended to
-    provide higher performance. Both implementations provide the same runtime
-    APIs and share the same generated code. Users don’t need to re-generate
-    code for the same proto definition when they want to switch the
-    implementation later. The pure PHP package is included in the php/src
-    directory, and the c extension is included in the php/ext directory.
-
-    Both implementations provide idiomatic PHP APIs:
-    * All messages and enums are defined as PHP classes.
-    * All message fields can only be accessed via getter/setter.
-    * Both repeated field elements and map elements are stored in containers
-      that act like a normal PHP array.
-
-    Unlike several existing third-party PHP implementations for protobuf, our
-    implementations are built on a "strongly-typed" philosophy: message fields
-    and array/map containers will throw exceptions eagerly when values of the
-    incorrect type (not including those that can be type converted, e.g.,
-    double <-> integer <-> numeric string) are inserted.
-
-    Currently, pure PHP runtime supports php5.5, 5.6 and 7 on linux. C
-    extension runtime supports php5.5 and 5.6 on linux.
-
-    See php/README.md for more details about installment. See
-    https://developers.google.com/protocol-buffers/docs/phptutorial for more
-    details about APIs.
-
-  Objective-C
-  * Helpers are now provided for working the Any well known type (see
-    GPBWellKnownTypes.h for the api additions).
-  * Some improvements in startup code (especially when extensions aren’t used).
-
-  Javascript
-  * Fixed missing import of jspb.Map
-  * Fixed valueWriterFn variable name
-
-  Ruby
-  * Fixed hash computation for JRuby's RubyMessage
-  * Make sure map parsing frames are GC-rooted.
-  * Added API support for well-known types.
-
-  C#
-  * Removed check on dependency in the C# reflection API.
-
-2016-09-06 version 3.0.2 (C++/Java/Python/Ruby/Objective-C/C#/JavaScript/Lite)
-  General
-  * Various bug fixes.
-
-  Objective C
-  * Fix for oneofs in proto3 syntax files where fields were set to the zero
-    value.
-  * Fix for embedded null character in strings.
-  * CocoaDocs support
-
-  Ruby
-  * Fixed memory corruption bug in parsing that could occur under GC pressure.
-
-  Javascript
-  * jspb.Map is now properly exported to CommonJS modules.
-
-  C#
-  * Removed legacy_enum_values flag.
-
-
-2016-07-27 version 3.0.0 (C++/Java/Python/Ruby/Objective-C/C#/JavaScript/Lite)
-  General
-  * This log only contains changes since the beta-4 release. Summarized change
-    log since the last stable release (v2.6.1) can be found in the github
-    release page.
-
-  Compatibility Notice
-  * v3.0.0 is the first API stable release of the v3.x series. We do not expect
-    any future API breaking changes.
-  * For C++, Java Lite and Objective-C, source level compatibility is
-    guaranteed.  Upgrading from v3.0.0 to newer minor version releases will be
-    source compatible. For example, if your code compiles against protobuf
-    v3.0.0, it will continue to compile after you upgrade protobuf library to
-    v3.1.0.
-  * For other languages, both source level compatibility and binary level
-    compatibility are guaranteed. For example, if you have a Java binary built
-    against protobuf v3.0.0. After switching the protobuf runtime binary to
-    v3.1.0, your built binary should continue to work.
-  * Compatibility is only guaranteed for documented API and documented
-    behaviors. If you are using undocumented API (e.g., use anything in the C++
-    internal namespace), it can be broken by minor version releases in an
-    undetermined manner.
-
-  Ruby
-  * When you assign a string field `a.string_field = "X"`, we now call
-    #encode(UTF-8) on the string and freeze the copy. This saves you from
-    needing to ensure the string is already encoded as UTF-8. It also prevents
-    you from mutating the string after it has been assigned (this is how we
-    ensure it stays valid UTF-8).
-  * The generated file for `foo.proto` is now `foo_pb.rb` instead of just
-    `foo.rb`. This makes it easier to see which imports/requires are from
-    protobuf generated code, and also prevents conflicts with any `foo.rb` file
-    you might have written directly in Ruby. It is a backward-incompatible
-    change: you will need to update all of your `require` statements.
-  * For package names like `foo_bar`, we now translate this to the Ruby module
-    `FooBar`. This is more idiomatic Ruby than what we used to do (`Foo_bar`).
-
-  JavaScript
-  * Scalar fields like numbers and boolean now return defaults instead of
-    `undefined` or `null` when they are unset. You can test for presence
-    explicitly by calling `hasFoo()`, which we now generate for scalar fields.
-
-  Java Lite
-  * Java Lite is now implemented as a separate plugin, maintained in the
-    `javalite` branch. Both lite runtime and protoc artifacts will be available
-    in Maven.
-
-  C#
-  * Target platforms now .NET 4.5, selected portable subsets and .NET Core.
-  * legacy_enum_values option is no longer supported.
-
-2016-07-15 version 3.0.0-beta-4 (C++/Java/Python/Ruby/Objective-C/C#/JavaScript)
-  General
-  * Added a deterministic serialization API for C++. The deterministic
-    serialization guarantees that given a binary, equal messages will be
-    serialized to the same bytes. This allows applications like MapReduce to
-    group equal messages based on the serialized bytes. The deterministic
-    serialization is, however, NOT canonical across languages; it is also
-    unstable across different builds with schema changes due to unknown fields.
-    Users who need canonical serialization, e.g. persistent storage in a
-    canonical form, fingerprinting, etc, should define their own
-    canonicalization specification and implement the serializer using reflection
-    APIs rather than relying on this API.
-  * Added OneofOptions. You can now define custom options for oneof groups.
-      import "google/protobuf/descriptor.proto";
-      extend google.protobuf.OneofOptions {
-        optional int32 my_oneof_extension = 12345;
-      }
-      message Foo {
-        oneof oneof_group {
-          (my_oneof_extension) = 54321;
-          ...
-        }
-      }
-
-  C++ (beta)
-  * Introduced a deterministic serialization API in
-    CodedOutputStream::SetSerializationDeterministic(bool). See the notes about
-    deterministic serialization in the General section.
-  * Added google::protobuf::Map::swap() to swap two map fields.
-  * Fixed a memory leak when calling Reflection::ReleaseMessage() on a message
-    allocated on arena.
-  * Improved error reporting when parsing text format protos.
-  * JSON
-      - Added a new parser option to ignore unknown fields when parsing JSON.
-      - Added convenient methods for message to/from JSON conversion.
-  * Various performance optimizations.
-
-  Java (beta)
-  * File option "java_generate_equals_and_hash" is now deprecated. equals() and
-    hashCode() methods are generated by default.
-  * Added a new JSON printer option "omittingInsignificantWhitespace" to produce
-    a more compact JSON output. The printer will pretty-print by default.
-  * Updated Java runtime to be compatible with 2.5.0/2.6.1 generated protos.
-
-  Python (beta)
-  * Added support to pretty print Any messages in text format.
-  * Added a flag to ignore unknown fields when parsing JSON.
-  * Bugfix: "@type" field of a JSON Any message is now correctly put before
-    other fields.
-
-  Objective-C (beta)
-  * Updated the code to support compiling with more compiler warnings
-    enabled. (Issue 1616)
-  * Exposing more detailed errors for parsing failures. (PR 1623)
-  * Small (breaking) change to the naming of some methods on the support classes
-    for map<>. There were collisions with the system provided KVO support, so
-    the names were changed to avoid those issues.  (PR 1699)
-  * Fixed for proper Swift bridging of error handling during parsing. (PR 1712)
-  * Complete support for generating sources that will go into a Framework and
-    depend on generated sources from other Frameworks. (Issue 1457)
-
-  C# (beta)
-  * RepeatedField optimizations.
-  * Support for .NET Core.
-  * Minor bug fixes.
-  * Ability to format a single value in JsonFormatter (advanced usage only).
-  * Modifications to attributes applied to generated code.
-
-  Javascript (alpha)
-  * Maps now have a real map API instead of being treated as repeated fields.
-  * Well-known types are now provided in the google-protobuf package, and the
-    code generator knows to require() them from that package.
-  * Bugfix: non-canonical varints are correctly decoded.
-
-  Ruby (alpha)
-  * Accessors for oneof fields now return default values instead of nil.
-
-  Java Lite
-  * Java lite support is removed from protocol compiler. It will be supported
-    as a protocol compiler plugin in a separate code branch.
-
-2016-05-16 version 3.0.0-beta-3 (C++/Java/Python/Ruby/Nano/Objective-C/C#/JavaScript)
-  General
-  * Supported Proto3 lite-runtime in C++/Java for mobile platforms.
-  * Any type now supports APIs to specify prefixes other than
-    type.googleapis.com
-  * Removed javanano_use_deprecated_package option; Nano will always has its own
-    ".nano" package.
-
-  C++ (Beta)
-  * Improved hash maps.
-      - Improved hash maps comments. In particular, please note that equal hash
-        maps will not necessarily have the same iteration order and
-        serialization.
-      - Added a new hash maps implementation that will become the default in a
-        later release.
-  * Arenas
-      - Several inlined methods in Arena were moved to out-of-line to improve
-        build performance and code size.
-      - Added SpaceAllocatedAndUsed() to report both space used and allocated
-      - Added convenient class UnsafeArenaAllocatedRepeatedPtrFieldBackInserter
-  * Any
-      - Allow custom type URL prefixes in Any packing.
-      - TextFormat now expand the Any type rather than printing bytes.
-  * Performance optimizations and various bug fixes.
-
-  Java (Beta)
-  * Introduced an ExperimentalApi annotation. Annotated APIs are experimental
-    and are subject to change in a backward incompatible way in future releases.
-  * Introduced zero-copy serialization as an ExperimentalApi
-      - Introduction of the `ByteOutput` interface. This is similar to
-        `OutputStream` but provides semantics for lazy writing (i.e. no
-        immediate copy required) of fields that are considered to be immutable.
-      - `ByteString` now supports writing to a `ByteOutput`, which will directly
-        expose the internals of the `ByteString` (i.e. `byte[]` or `ByteBuffer`)
-        to the `ByteOutput` without copying.
-      - `CodedOutputStream` now supports writing to a `ByteOutput`. `ByteString`
-        instances that are too large to fit in the internal buffer will be
-        (lazily) written to the `ByteOutput` directly.
-      - This allows applications using large `ByteString` fields to avoid
-        duplication of these fields entirely. Such an application can supply a
-        `ByteOutput` that chains together the chunks received from
-        `CodedOutputStream` before forwarding them onto the IO system.
-  * Other related changes to `CodedOutputStream`
-      - Additional use of `sun.misc.Unsafe` where possible to perform fast
-        access to `byte[]` and `ByteBuffer` values and avoiding unnecessary
-        range checking.
-      - `ByteBuffer`-backed `CodedOutputStream` now writes directly to the
-        `ByteBuffer` rather than to an intermediate array.
-  * Improved lite-runtime.
-      - Lite protos now implement deep equals/hashCode/toString
-      - Significantly improved the performance of Builder#mergeFrom() and
-        Builder#mergeDelimitedFrom()
-  * Various bug fixes and small feature enhancement.
-      - Fixed stack overflow when in hashCode() for infinite recursive oneofs.
-      - Fixed the lazy field parsing in lite to merge rather than overwrite.
-      - TextFormat now supports reporting line/column numbers on errors.
-      - Updated to add appropriate @Override for better compiler errors.
-
-  Python (Beta)
-  * Added JSON format for Any, Struct, Value and ListValue
-  * [ ] is now accepted for both repeated scalar fields and repeated message
-    fields in text format parser.
-  * Numerical field name is now supported in text format.
-  * Added DiscardUnknownFields API for python protobuf message.
-
-  Objective-C (Beta)
-  * Proto comments now come over as HeaderDoc comments in the generated sources
-    so Xcode can pick them up and display them.
-  * The library headers have been updated to use HeaderDoc comments so Xcode can
-    pick them up and display them.
-  * The per message and per field overhead in both generated code and runtime
-    object sizes was reduced.
-  * Generated code now include deprecated annotations when the proto file
-    included them.
-
-  C# (Beta)
-  In general: some changes are breaking, which require regenerating messages.
-  Most user-written code will not be impacted *except* for the renaming of enum
-  values.
-
-  * Allow custom type URL prefixes in `Any` packing, and ignore them when
-    unpacking
-  * `protoc` is now in a separate NuGet package (Google.Protobuf.Tools)
-  * New option: `internal_access` to generate internal classes
-  * Enum values are now PascalCased, and if there's a prefix which matches the
-    name of the enum, that is removed (so an enum `COLOR` with a value
-    `COLOR_BLUE` would generate a value of just `Blue`). An option
-    (`legacy_enum_values`) is temporarily available to disable this, but the
-    option will be removed for GA.
-  * `json_name` option is now honored
-  * If group tags are encountered when parsing, they are validated more
-    thoroughly (although we don't support actual groups)
-  * NuGet dependencies are better specified
-  * Breaking: `Preconditions` is renamed to `ProtoPreconditions`
-  * Breaking: `GeneratedCodeInfo` is renamed to `GeneratedClrTypeInfo`
-  * `JsonFormatter` now allows writing to a `TextWriter`
-  * New interface, `ICustomDiagnosticMessage` to allow more compact
-    representations from `ToString`
-  * `CodedInputStream` and `CodedOutputStream` now implement `IDisposable`,
-    which simply disposes of the streams they were constructed with
-  * Map fields no longer support null values (in line with other languages)
-  * Improvements in JSON formatting and parsing
-
-  Javascript (Alpha)
-  * Better support for "bytes" fields: bytes fields can be read as either a
-    base64 string or UInt8Array (in environments where TypedArray is supported).
-  * New support for CommonJS imports.  This should make it easier to use the
-    JavaScript support in Node.js and tools like WebPack.  See js/README.md for
-    more information.
-  * Some significant internal refactoring to simplify and modularize the code.
-
-  Ruby (Alpha)
-  * JSON serialization now properly uses camelCased names, with a runtime option
-    that will preserve original names from .proto files instead.
-  * Well-known types are now included in the distribution.
-  * Release now includes binary gems for Windows, Mac, and Linux instead of just
-    source gems.
-  * Bugfix for serializing oneofs.
-
-  C++/Java Lite (Alpha)
-    A new "lite" generator parameter was introduced in the protoc for C++ and
-    Java for Proto3 syntax messages. Example usage:
-
-     ./protoc --cpp_out=lite:$OUTPUT_PATH foo.proto
-
-    The protoc will treat the current input and all the transitive dependencies
-    as LITE. The same generator parameter must be used to generate the
-    dependencies.
-
-    In Proto3 syntax files, "optimized_for=LITE_RUNTIME" is no longer supported.
-
-
-2015-12-30 version 3.0.0-beta-2 (C++/Java/Python/Ruby/Nano/Objective-C/C#/JavaScript)
-  General
-  * Introduced a new language implementation: JavaScript.
-  * Added a new field option "json_name". By default proto field names are
-    converted to "lowerCamelCase" in proto3 JSON format. This option can be
-    used to override this behavior and specify a different JSON name for the
-    field.
-  * Added conformance tests to ensure implementations are following proto3 JSON
-    specification.
-
-  C++ (Beta)
-  * Various bug fixes and improvements to the JSON support utility:
-      - Duplicate map keys in JSON are now rejected (i.e., translation will
-        fail).
-      - Fixed wire-format for google.protobuf.Value/ListValue.
-      - Fixed precision loss when converting google.protobuf.Timestamp.
-      - Fixed a bug when parsing invalid UTF-8 code points.
-      - Fixed a memory leak.
-      - Reduced call stack usage.
-
-  Java (Beta)
-  * Cleaned up some unused methods on CodedOutputStream.
-  * Presized lists for packed fields during parsing in the lite runtime to
-    reduce allocations and improve performance.
-  * Improved the performance of unknown fields in the lite runtime.
-  * Introduced UnsafeByteStrings to support zero-copy ByteString creation.
-  * Various bug fixes and improvements to the JSON support utility:
-      - Fixed a thread-safety bug.
-      - Added a new option “preservingProtoFieldNames� to JsonFormat.
-      - Added a new option “includingDefaultValueFields� to JsonFormat.
-      - Updated the JSON utility to comply with proto3 JSON specification.
-
-  Python (Beta)
-  * Added proto3 JSON format utility. It includes support for all field types
-    and a few well-known types except for Any and Struct.
-  * Added runtime support for Any, Timestamp, Duration and FieldMask.
-  * [ ] is now accepted for repeated scalar fields in text format parser.
-  * Map fields now have proper O(1) performance for lookup/insert/delete
-    when using the Python/C++ implementation. They were previously using O(n)
-    search-based algorithms because the C++ reflection interface didn't
-    support true map operations.
-
-  Objective-C (Beta)
-  * Various bug-fixes and code tweaks to pass more strict compiler warnings.
-  * Now has conformance test coverage and is passing all tests.
-
-  C# (Beta)
-  * Various bug-fixes.
-  * Code generation: Files generated in directories based on namespace.
-  * Code generation: Include comments from .proto files in XML doc
-    comments (naively)
-  * Code generation: Change organization/naming of "reflection class" (access
-    to file descriptor)
-  * Code generation and library: Add Parser property to MessageDescriptor,
-    and introduce a non-generic parser type.
-  * Library: Added TypeRegistry to support JSON parsing/formatting of Any.
-  * Library: Added Any.Pack/Unpack support.
-  * Library: Implemented JSON parsing.
-
-  Javascript (Alpha)
-  * Added proto3 support for JavaScript. The runtime is written in pure
-    JavaScript and works in browsers and in Node.js. To generate JavaScript
-    code for your proto, invoke protoc with "--js_out". See js/README.md
-    for more build instructions.
-
-2015-08-26 version 3.0.0-beta-1 (C++/Java/Python/Ruby/Nano/Objective-C/C#)
-  About Beta
-  * This is the first beta release of protobuf v3.0.0. Not all languages
-    have reached beta stage. Languages not marked as beta are still in
-    alpha (i.e., be prepared for API breaking changes).
-
-  General
-  * Proto3 JSON is supported in several languages (fully supported in C++
-    and Java, partially supported in Ruby/C#). The JSON spec is defined in
-    the proto3 language guide:
-
-      https://developers.google.com/protocol-buffers/docs/proto3#json
-
-    We will publish a more detailed spec to define the exact behavior of
-    proto3-conformant JSON serializers and parsers. Until then, do not rely
-    on specific behaviors of the implementation if it’s not documented in
-    the above spec. More specifically, the behavior is not yet finalized for
-    the following:
-      - Parsing invalid JSON input (e.g., input with trailing commas).
-      - Non-camelCase names in JSON input.
-      - The same field appears multiple times in JSON input.
-      - JSON arrays contain “null� values.
-      - The message has unknown fields.
-
-  * Proto3 now enforces strict UTF-8 checking. Parsing will fail if a string
-    field contains non UTF-8 data.
-
-  C++ (Beta)
-  * Introduced new utility functions/classes in the google/protobuf/util
-    directory:
-      - MessageDifferencer: compare two proto messages and report their
-                            differences.
-      - JsonUtil: support converting protobuf binary format to/from JSON.
-      - TimeUtil: utility functions to work with well-known types Timestamp
-                  and Duration.
-      - FieldMaskUtil: utility functions to work with FieldMask.
-
-  * Performance optimization of arena construction and destruction.
-  * Bug fixes for arena and maps support.
-  * Changed to use cmake for Windows Visual Studio builds.
-  * Added Bazel support.
-
-  Java (Beta)
-  * Introduced a new util package that will be distributed as a separate
-    artifact in maven. It contains:
-      - JsonFormat: convert proto messages to/from JSON.
-      - TimeUtil: utility functions to work with Timestamp and Duration.
-      - FieldMaskUtil: utility functions to work with FieldMask.
-
-  * The static PARSER in each generated message is deprecated, and it will
-    be removed in a future release. A static parser() getter is generated
-    for each message type instead.
-  * Performance optimizations for String fields serialization.
-  * Performance optimizations for Lite runtime on Android:
-      - Reduced allocations
-      - Reduced method overhead after ProGuarding
-      - Reduced code size after ProGuarding
-
-  Python (Alpha)
-  * Removed legacy Python 2.5 support.
-  * Moved to a single Python 2.x/3.x-compatible codebase, instead of using 2to3.
-  * Fixed build/tests on Python 2.6, 2.7, 3.3, and 3.4.
-      - Pure-Python works on all four.
-      - Python/C++ implementation works on all but 3.4, due to changes in the
-        Python/C++ API in 3.4.
-  * Some preliminary work has been done to allow for multiple DescriptorPools
-    with Python/C++.
-
-  Ruby (Alpha)
-  * Many bugfixes:
-      - fixed parsing/serialization of bytes, sint, sfixed types
-      - other parser bugfixes
-      - fixed memory leak affecting Ruby 2.2
-
-  JavaNano (Alpha)
-  * JavaNano generated code now will be put in a nano package by default to
-    avoid conflicts with Java generated code.
-
-  Objective-C (Alpha)
-  * Added non-null markup to ObjC library. Requires SDK 8.4+ to build.
-  * Many bugfixes:
-      - Removed the class/enum filter.
-      - Renamed some internal types to avoid conflicts with the well-known types
-        protos.
-      - Added missing support for parsing repeated primitive fields in packed or
-        unpacked forms.
-      - Added *Count for repeated and map<> fields to avoid auto-create when
-        checking for them being set.
-
-  C# (Alpha)
-  * Namespace changed to Google.Protobuf (and NuGet package will be named
-    correspondingly).
-  * Target platforms now .NET 4.5 and selected portable subsets only.
-  * Removed lite runtime.
-  * Reimplementation to use mutable message types.
-  * Null references used to represent "no value" for message type fields.
-  * Proto3 semantics supported; proto2 files are prohibited for C# codegen.
-    Most proto3 features supported:
-      - JSON formatting (a.k.a. serialization to JSON), including well-known
-        types (except for Any).
-      - Wrapper types mapped to nullable value types (or string/ByteString
-        allowing nullability). JSON parsing is not supported yet.
-      - maps
-      - oneof
-      - enum unknown value preservation
-
-2015-05-25 version 3.0.0-alpha-3 (Objective-C/C#):
-  General
-  * Introduced two new language implementations (Objective-C, C#) to proto3.
-  * Explicit "optional" keyword are disallowed in proto3 syntax, as fields are
-    optional by default.
-  * Group fields are no longer supported in proto3 syntax.
-  * Changed repeated primitive fields to use packed serialization by default in
-    proto3 (implemented for C++, Java, Python in this release).  The user can
-    still disable packed serialization by setting packed to false for now.
-  * Added well-known type protos (any.proto, empty.proto, timestamp.proto,
-    duration.proto, etc.). Users can import and use these protos just like
-    regular proto files. Additional runtime support will be added for them in
-    future releases (in the form of utility helper functions, or having them
-    replaced by language specific types in generated code).
-  * Added a "reserved" keyword in both proto2 and proto3 syntax. User can use
-    this keyword to declare reserved field numbers and names to prevent them
-    from being reused by other fields in the same message.
-
-    To reserve field numbers, add a reserved declaration in your message:
-
-      message TestMessage {
-        reserved 2, 15, 9 to 11, 3;
-      }
-
-    This reserves field numbers 2, 3, 9, 10, 11 and 15. If a user uses any of
-    these as field numbers, the protocol buffer compiler will report an error.
-
-    Field names can also be reserved:
-
-      message TestMessage {
-        reserved "foo", "bar";
-      }
-
-  * Various bug fixes since 3.0.0-alpha-2
-
-  Objective-C
-    Objective-C includes a code generator and a native objective-c runtime
-    library.  By adding “--objc_out� to protoc, the code generator will generate
-    a header(*.pbobjc.h) and an implementation file(*.pbobjc.m) for each proto
-    file.
-
-    In this first release, the generated interface provides: enums, messages,
-    field support(single, repeated, map, oneof), proto2 and proto3 syntax
-    support, parsing and serialization. It’s  compatible with ARC and non-ARC
-    usage. Besides, user can also access it via the swift bridging header.
-
-    See objectivec/README.md for details.
-
-  C#
-    * C# protobufs are based on project
-      https://github.com/jskeet/protobuf-csharp-port. The original project was
-      frozen and all the new development will happen here.
-    * Codegen plugin for C# was completely rewritten to C++ and is now an
-      integral part of protoc.
-    * Some refactorings and cleanup has been applied to the C# runtime library.
-    * Only proto2 is supported in C# at the moment, proto3 support is in
-      progress and will likely bring significant breaking changes to the API.
-
-    See csharp/README.md for details.
-
-  C++
-    * Added runtime support for Any type. To use Any in your proto file, first
-      import the definition of Any:
-
-        // foo.proto
-        import "google/protobuf/any.proto";
-        message Foo {
-          google.protobuf.Any any_field = 1;
-        }
-        message Bar {
-          int32 value = 1;
-        }
-
-      Then in C++ you can access the Any field using PackFrom()/UnpackTo()
-      methods:
-
-        Foo foo;
-        Bar bar = ...;
-        foo.mutable_any_field()->PackFrom(bar);
-        ...
-        if (foo.any_field().IsType<Bar>()) {
-          foo.any_field().UnpackTo(&bar);
-          ...
-        }
-    * In text format, entries of a map field will be sorted by key.
-
-  Java
-    * Continued optimizations on the lite runtime to improve performance for
-      Android.
-
-  Python
-    * Added map support.
-      - maps now have a dict-like interface (msg.map_field[key] = value)
-      - existing code that modifies maps via the repeated field interface
-        will need to be updated.
-
-  Ruby
-    * Improvements to RepeatedField's emulation of the Ruby Array API.
-    * Various speedups and internal cleanups.
-
-2015-02-26 version 3.0.0-alpha-2 (Python/Ruby/JavaNano):
-  General
-  * Introduced three new language implementations (Ruby, JavaNano, and
-    Python) to proto3.
-  * Various bug fixes since 3.0.0-alpha-1
-
-  Python:
-    Python has received several updates, most notably support for proto3
-    semantics in any .proto file that declares syntax="proto3".
-    Messages declared in proto3 files no longer represent field presence
-    for scalar fields (number, enums, booleans, or strings).  You can
-    no longer call HasField() for such fields, and they are serialized
-    based on whether they have a non-zero/empty/false value.
-
-    One other notable change is in the C++-accelerated implementation.
-    Descriptor objects (which describe the protobuf schema and allow
-    reflection over it) are no longer duplicated between the Python
-    and C++ layers.  The Python descriptors are now simple wrappers
-    around the C++ descriptors.  This change should significantly
-    reduce the memory usage of programs that use a lot of message
-    types.
-
-  Ruby:
-    We have added proto3 support for Ruby via a native C extension.
-
-    The Ruby extension itself is included in the ruby/ directory, and details on
-    building and installing the extension are in ruby/README.md. The extension
-    will also be published as a Ruby gem. Code generator support is included as
-    part of `protoc` with the `--ruby_out` flag.
-
-    The Ruby extension implements a user-friendly DSL to define message types
-    (also generated by the code generator from `.proto` files).  Once a message
-    type is defined, the user may create instances of the message that behave in
-    ways idiomatic to Ruby. For example:
-
-    - Message fields are present as ordinary Ruby properties (getter method
-      `foo` and setter method `foo=`).
-    - Repeated field elements are stored in a container that acts like a native
-      Ruby array, and map elements are stored in a container that acts like a
-      native Ruby hashmap.
-    - The usual well-known methods, such as `#to_s`, `#dup`, and the like, are
-      present.
-
-    Unlike several existing third-party Ruby extensions for protobuf, this
-    extension is built on a "strongly-typed" philosophy: message fields and
-    array/map containers will throw exceptions eagerly when values of the
-    incorrect type are inserted.
-
-    See ruby/README.md for details.
-
-  JavaNano:
-    JavaNano is a special code generator and runtime library designed especially
-    for resource-restricted systems, like Android. It is very resource-friendly
-    in both the amount of code and the runtime overhead. Here is an an overview
-    of JavaNano features compared with the official Java protobuf:
-
-    - No descriptors or message builders.
-    - All messages are mutable; fields are public Java fields.
-    - For optional fields only, encapsulation behind setter/getter/hazzer/
-      clearer functions is opt-in, which provide proper 'has' state support.
-    - For proto2, if not opted in, has state (field presence) is not available.
-      Serialization outputs all fields not equal to their defaults.
-      The behavior is consistent with proto3 semantics.
-    - Required fields (proto2 only) are always serialized.
-    - Enum constants are integers; protection against invalid values only
-      when parsing from the wire.
-    - Enum constants can be generated into container interfaces bearing
-      the enum's name (so the referencing code is in Java style).
-    - CodedInputByteBufferNano can only take byte[] (not InputStream).
-    - Similarly CodedOutputByteBufferNano can only write to byte[].
-    - Repeated fields are in arrays, not ArrayList or Vector. Null array
-      elements are allowed and silently ignored.
-    - Full support for serializing/deserializing repeated packed fields.
-    - Support  extensions (in proto2).
-    - Unset messages/groups are null, not an immutable empty default
-      instance.
-    - toByteArray(...) and mergeFrom(...) are now static functions of
-      MessageNano.
-    - The 'bytes' type translates to the Java type byte[].
-
-    See javanano/README.txt for details.
-
-2014-12-01 version 3.0.0-alpha-1 (C++/Java):
-
-  General
-  * Introduced Protocol Buffers language version 3 (aka proto3).
-
-    When protobuf was initially opensourced it implemented Protocol Buffers
-    language version 2 (aka proto2), which is why the version number
-    started from v2.0.0. From v3.0.0, a new language version (proto3) is
-    introduced while the old version (proto2) will continue to be supported.
-
-    The main intent of introducing proto3 is to clean up protobuf before
-    pushing the language as the foundation of Google's new API platform.
-    In proto3, the language is simplified, both for ease of use and  to
-    make it available in a wider range of programming languages. At the
-    same time a few features are added to better support common idioms
-    found in APIs.
-
-    The following are the main new features in language version 3:
-
-      1. Removal of field presence logic for primitive value fields, removal
-         of required fields, and removal of default values. This makes proto3
-         significantly easier to implement with open struct representations,
-         as in languages like Android Java, Objective C, or Go.
-      2. Removal of unknown fields.
-      3. Removal of extensions, which are instead replaced by a new standard
-         type called Any.
-      4. Fix semantics for unknown enum values.
-      5. Addition of maps.
-      6. Addition of a small set of standard types for representation of time,
-         dynamic data, etc.
-      7. A well-defined encoding in JSON as an alternative to binary proto
-         encoding.
-
-    This release (v3.0.0-alpha-1) includes partial proto3 support for C++ and
-    Java. Items 6 (well-known types) and 7 (JSON format) in the above feature
-    list are not implemented.
-
-    A new notion "syntax" is introduced to specify whether a .proto file
-    uses proto2 or proto3:
-
-      // foo.proto
-      syntax = "proto3";
-      message Bar {...}
-
-    If omitted, the protocol compiler will generate a warning and "proto2" will
-    be used as the default. This warning will be turned into an error in a
-    future release.
-
-    We recommend that new Protocol Buffers users use proto3. However, we do not
-    generally recommend that existing users migrate from proto2 from proto3 due
-    to API incompatibility, and we will continue to support proto2 for a long
-    time.
-
-  * Added support for map fields (implemented in C++/Java for both proto2 and
-    proto3).
-
-    Map fields can be declared using the following syntax:
-
-      message Foo {
-        map<string, string> values = 1;
-      }
-
-    Data of a map field will be stored in memory as an unordered map and it
-    can be accessed through generated accessors.
-
-  C++
-  * Added arena allocation support (for both proto2 and proto3).
-
-    Profiling shows memory allocation and deallocation constitutes a significant
-    fraction of CPU-time spent in protobuf code and arena allocation is a
-    technique introduced to reduce this cost. With arena allocation, new
-    objects will be allocated from a large piece of preallocated memory and
-    deallocation of these objects is almost free. Early adoption shows 20% to
-    50% improvement in some Google binaries.
-
-    To enable arena support, add the following option to your .proto file:
-
-      option cc_enable_arenas = true;
-
-    Protocol compiler will generate additional code to make the generated
-    message classes work with arenas. This does not change the existing API
-    of protobuf messages and does not affect wire format. Your existing code
-    should continue to work after adding this option. In the future we will
-    make this option enabled by default.
-
-    To actually take advantage of arena allocation, you need to use the arena
-    APIs when creating messages. A quick example of using the arena API:
-
-      {
-        google::protobuf::Arena arena;
-        // Allocate a protobuf message in the arena.
-        MyMessage* message = Arena::CreateMessage<MyMessage>(&arena);
-        // All submessages will be allocated in the same arena.
-        if (!message->ParseFromString(data)) {
-          // Deal with malformed input data.
-        }
-        // Must not delete the message here. It will be deleted automatically
-        // when the arena is destroyed.
-      }
-
-    Currently arena does not work with map fields. Enabling arena in a .proto
-    file containing map fields will result in compile errors in the generated
-    code. This will be addressed in a future release.
-
-2014-10-20 version 2.6.1:
-
-  C++
-  * Added atomicops support for Solaris.
-  * Released memory allocated by InitializeDefaultRepeatedFields() and
-    GetEmptyString(). Some memory sanitizers reported them as memory leaks.
-
-  Java
-  * Updated DynamicMessage.setField() to handle repeated enum values
-    correctly.
-  * Fixed a bug that caused NullPointerException to be thrown when
-    converting manually constructed FileDescriptorProto to
-    FileDescriptor.
-
-  Python
-  * Fixed WhichOneof() to work with de-serialized protobuf messages.
-  * Fixed a missing file problem of Python C++ implementation.
-
-2014-08-15 version 2.6.0:
-
-  General
-  * Added oneofs(unions) feature. Fields in the same oneof will share
-    memory and at most one field can be set at the same time. Use the
-    oneof keyword to define a oneof like:
-      message SampleMessage {
-        oneof test_oneof {
-          string name = 4;
-          YourMessage sub_message = 9;
-        }
-      }
-  * Files, services, enums, messages, methods and enum values can be marked
-    as deprecated now.
-  * Added Support for list values, including lists of messages, when
-    parsing text-formatted protos in C++ and Java.
-      For example:  foo: [1, 2, 3]
-
-  C++
-  * Enhanced customization on TestFormat printing.
-  * Added SwapFields() in reflection API to swap a subset of fields.
-    Added SetAllocatedMessage() in reflection API.
-  * Repeated primitive extensions are now packable. The
-    [packed=true] option only affects serializers. Therefore, it is
-    possible to switch a repeated extension field to packed format
-    without breaking backwards-compatibility.
-  * Various speed optimizations.
-
-  Java
-  * writeTo() method in ByteString can now write a substring to an
-    output stream. Added endWith() method for ByteString.
-  * ByteString and ByteBuffer are now supported in CodedInputStream
-    and CodedOutputStream.
-  * java_generate_equals_and_hash can now be used with the LITE_RUNTIME.
-
-  Python
-  * A new C++-backed extension module (aka "cpp api v2") that replaces the
-    old ("cpp api v1") one.  Much faster than the pure Python code.  This one
-    resolves many bugs and is recommended for general use over the
-    pure Python when possible.
-  * Descriptors now have enum_types_by_name and extension_types_by_name dict
-    attributes.
-  * Support for Python 3.
-
-2013-02-27 version 2.5.0:
-
-  General
-  * New notion "import public" that allows a proto file to forward the content
-    it imports to its importers. For example,
-      // foo.proto
-      import public "bar.proto";
-      import "baz.proto";
-
-      // qux.proto
-      import "foo.proto";
-      // Stuff defined in bar.proto may be used in this file, but stuff from
-      // baz.proto may NOT be used without importing it explicitly.
-    This is useful for moving proto files. To move a proto file, just leave
-    a single "import public" in the old proto file.
-  * New enum option "allow_alias" that specifies whether different symbols can
-    be assigned the same numeric value. Default value is "true". Setting it to
-    false causes the compiler to reject enum definitions where multiple symbols
-    have the same numeric value.
-    Note: We plan to flip the default value to "false" in a future release.
-    Projects using enum aliases should set the option to "true" in their .proto
-    files.
-
-  C++
-  * New generated method set_allocated_foo(Type* foo) for message and string
-    fields. This method allows you to set the field to a pre-allocated object
-    and the containing message takes the ownership of that object.
-  * Added SetAllocatedExtension() and ReleaseExtension() to extensions API.
-  * Custom options are now formatted correctly when descriptors are printed in
-    text format.
-  * Various speed optimizations.
-
-  Java
-  * Comments in proto files are now collected and put into generated code as
-    comments for corresponding classes and data members.
-  * Added Parser to parse directly into messages without a Builder. For
-    example,
-      Foo foo = Foo.PARSER.ParseFrom(input);
-    Using Parser is ~25% faster than using Builder to parse messages.
-  * Added getters/setters to access the underlying ByteString of a string field
-    directly.
-  * ByteString now supports more operations: substring(), prepend(), and
-    append(). The implementation of ByteString uses a binary tree structure
-    to support these operations efficiently.
-  * New method findInitializationErrors() that lists all missing required
-    fields.
-  * Various code size and speed optimizations.
-
-  Python
-  * Added support for dynamic message creation. DescriptorDatabase,
-    DescriptorPool, and MessageFactory work like their C++ counterparts to
-    simplify Descriptor construction from *DescriptorProtos, and MessageFactory
-    provides a message instance from a Descriptor.
-  * Added pickle support for protobuf messages.
-  * Unknown fields are now preserved after parsing.
-  * Fixed bug where custom options were not correctly populated. Custom
-    options can be accessed now.
-  * Added EnumTypeWrapper that provides better accessibility to enum types.
-  * Added ParseMessage(descriptor, bytes) to generate a new Message instance
-    from a descriptor and a byte string.
-
-2011-05-01 version 2.4.1:
-
-  C++
-  * Fixed the friendship problem for old compilers to make the library now gcc 3
-    compatible again.
-  * Fixed vcprojects/extract_includes.bat to extract compiler/plugin.h.
-
-  Java
-  * Removed usages of JDK 1.6 only features to make the library now JDK 1.5
-    compatible again.
-  * Fixed a bug about negative enum values.
-  * serialVersionUID is now defined in generated messages for java serializing.
-  * Fixed protoc to use java.lang.Object, which makes "Object" now a valid
-    message name again.
-
-  Python
-  * Experimental C++ implementation now requires C++ protobuf library installed.
-    See the README.txt in the python directory for details.
-
-2011-02-02 version 2.4.0:
-
-  General
-  * The RPC (cc|java|py)_generic_services default value is now false instead of
-    true.
-  * Custom options can have aggregate types. For example,
-      message MyOption {
-        optional string comment = 1;
-        optional string author = 2;
-      }
-      extend google.protobuf.FieldOptions {
-        optional MyOption myoption = 12345;
-      }
-    This option can now be set as follows:
-      message SomeType {
-        optional int32 field = 1 [(myoption) = { comment:'x' author:'y' }];
-      }
-
-  C++
-  * Various speed and code size optimizations.
-  * Added a release_foo() method on string and message fields.
-  * Fixed gzip_output_stream sub-stream handling.
-
-  Java
-  * Builders now maintain sub-builders for sub-messages. Use getFooBuilder() to
-    get the builder for the sub-message "foo". This allows you to repeatedly
-    modify deeply-nested sub-messages without rebuilding them.
-  * Builder.build() no longer invalidates the Builder for generated messages
-    (You may continue to modify it and then build another message).
-  * Code generator will generate efficient equals() and hashCode()
-    implementations if new option java_generate_equals_and_hash is enabled.
-    (Otherwise, reflection-based implementations are used.)
-  * Generated messages now implement Serializable.
-  * Fields with [deprecated=true] will be marked with @Deprecated in Java.
-  * Added lazy conversion of UTF-8 encoded strings to String objects to improve
-    performance.
-  * Various optimizations.
-  * Enum value can be accessed directly, instead of calling getNumber() on the
-    enum member.
-  * For each enum value, an integer constant is also generated with the suffix
-    _VALUE.
-
-  Python
-  * Added an experimental  C++ implementation for Python messages via a Python
-    extension. Implementation type is controlled by an environment variable
-    PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION (valid values: "cpp" and "python")
-    The default value is currently "python" but will be changed to "cpp" in
-    future release.
-  * Improved performance on message instantiation significantly.
-    Most of the work on message instantiation is done just once per message
-    class, instead of once per message instance.
-  * Improved performance on text message parsing.
-  * Allow add() to forward keyword arguments to the concrete class.
-      E.g. instead of
-        item = repeated_field.add()
-        item.foo = bar
-        item.baz = quux
-      You can do:
-        repeated_field.add(foo=bar, baz=quux)
-  * Added a sort() interface to the BaseContainer.
-  * Added an extend() method to repeated composite fields.
-  * Added UTF8 debug string support.
-
-2010-01-08 version 2.3.0:
-
-  General
-  * Parsers for repeated numeric fields now always accept both packed and
-    unpacked input.  The [packed=true] option only affects serializers.
-    Therefore, it is possible to switch a field to packed format without
-    breaking backwards-compatibility -- as long as all parties are using
-    protobuf 2.3.0 or above, at least.
-  * The generic RPC service code generated by the C++, Java, and Python
-    generators can be disabled via file options:
-      option cc_generic_services = false;
-      option java_generic_services = false;
-      option py_generic_services = false;
-    This allows plugins to generate alternative code, possibly specific to some
-    particular RPC implementation.
-
-  protoc
-  * Now supports a plugin system for code generators.  Plugins can generate
-    code for new languages or inject additional code into the output of other
-    code generators.  Plugins are just binaries which accept a protocol buffer
-    on stdin and write a protocol buffer to stdout, so they may be written in
-    any language.  See src/google/protobuf/compiler/plugin.proto.
-    **WARNING**:  Plugins are experimental.  The interface may change in a
-    future version.
-  * If the output location ends in .zip or .jar, protoc will write its output
-    to a zip/jar archive instead of a directory.  For example:
-      protoc --java_out=myproto_srcs.jar --python_out=myproto.zip myproto.proto
-    Currently the archive contents are not compressed, though this could change
-    in the future.
-  * inf, -inf, and nan can now be used as default values for float and double
-    fields.
-
-  C++
-  * Various speed and code size optimizations.
-  * DynamicMessageFactory is now fully thread-safe.
-  * Message::Utf8DebugString() method is like DebugString() but avoids escaping
-    UTF-8 bytes.
-  * Compiled-in message types can now contain dynamic extensions, through use
-    of CodedInputStream::SetExtensionRegistry().
-  * Now compiles shared libraries (DLLs) by default on Cygwin and MinGW, to
-    match other platforms.  Use --disable-shared to avoid this.
-
-  Java
-  * parseDelimitedFrom() and mergeDelimitedFrom() now detect EOF and return
-    false/null instead of throwing an exception.
-  * Fixed some initialization ordering bugs.
-  * Fixes for OpenJDK 7.
-
-  Python
-  * 10-25 times faster than 2.2.0, still pure-Python.
-  * Calling a mutating method on a sub-message always instantiates the message
-    in its parent even if the mutating method doesn't actually mutate anything
-    (e.g. parsing from an empty string).
-  * Expanded descriptors a bit.
-
-2009-08-11 version 2.2.0:
-
-  C++
-  * Lite mode:  The "optimize_for = LITE_RUNTIME" option causes the compiler
-    to generate code which only depends libprotobuf-lite, which is much smaller
-    than libprotobuf but lacks descriptors, reflection, and some other features.
-  * Fixed bug where Message.Swap(Message) was only implemented for
-    optimize_for_speed.  Swap now properly implemented in both modes
-    (Issue 91).
-  * Added RemoveLast and SwapElements(index1, index2) to Reflection
-    interface for repeated elements.
-  * Added Swap(Message) to Reflection interface.
-  * Floating-point literals in generated code that are intended to be
-    single-precision now explicitly have 'f' suffix to avoid pedantic warnings
-    produced by some compilers.
-  * The [deprecated=true] option now causes the C++ code generator to generate
-    a GCC-style deprecation annotation (no-op on other compilers).
-  * google::protobuf::GetEnumDescriptor<SomeGeneratedEnumType>() returns the
-    EnumDescriptor for that type -- useful for templates which cannot call
-    SomeGeneratedEnumType_descriptor().
-  * Various optimizations and obscure bug fixes.
-
-  Java
-  * Lite mode:  The "optimize_for = LITE_RUNTIME" option causes the compiler
-    to generate code which only depends libprotobuf-lite, which is much smaller
-    than libprotobuf but lacks descriptors, reflection, and some other features.
-  * Lots of style cleanups.
-
-  Python
-  * Fixed endianness bug with floats and doubles.
-  * Text format parsing support.
-  * Fix bug with parsing packed repeated fields in embedded messages.
-  * Ability to initialize fields by passing keyword args to constructor.
-  * Support iterators in extend and __setslice__ for containers.
-
-2009-05-13 version 2.1.0:
-
-  General
-  * Repeated fields of primitive types (types other that string, group, and
-    nested messages) may now use the option [packed = true] to get a more
-    efficient encoding.  In the new encoding, the entire list is written
-    as a single byte blob using the "length-delimited" wire type.  Within
-    this blob, the individual values are encoded the same way they would
-    be normally except without a tag before each value (thus, they are
-    tightly "packed").
-  * For each field, the generated code contains an integer constant assigned
-    to the field number.  For example, the .proto file:
-      message Foo { optional int bar_baz = 123; }
-    would generate the following constants, all with the integer value 123:
-      C++:     Foo::kBarBazFieldNumber
-      Java:    Foo.BAR_BAZ_FIELD_NUMBER
-      Python:  Foo.BAR_BAZ_FIELD_NUMBER
-    Constants are also generated for extensions, with the same naming scheme.
-    These constants may be used as switch cases.
-  * Updated bundled Google Test to version 1.3.0.  Google Test is now bundled
-    in its verbatim form as a nested autoconf package, so you can drop in any
-    other version of Google Test if needed.
-  * optimize_for = SPEED is now the default, by popular demand.  Use
-    optimize_for = CODE_SIZE if code size is more important in your app.
-  * It is now an error to define a default value for a repeated field.
-    Previously, this was silently ignored (it had no effect on the generated
-    code).
-  * Fields can now be marked deprecated like:
-      optional int32 foo = 1 [deprecated = true];
-    Currently this does not have any actual effect, but in the future the code
-    generators may generate deprecation annotations in each language.
-  * Cross-compiling should now be possible using the --with-protoc option to
-    configure.  See README.txt for more info.
-
-  protoc
-  * --error_format=msvs option causes errors to be printed in Visual Studio
-    format, which should allow them to be clicked on in the build log to go
-    directly to the error location.
-  * The type name resolver will no longer resolve type names to fields.  For
-    example, this now works:
-      message Foo {}
-      message Bar {
-        optional int32 Foo = 1;
-        optional Foo baz = 2;
-      }
-    Previously, the type of "baz" would resolve to "Bar.Foo", and you'd get
-    an error because Bar.Foo is a field, not a type.  Now the type of "baz"
-    resolves to the message type Foo.  This change is unlikely to make a
-    difference to anyone who follows the Protocol Buffers style guide.
-
-  C++
-  * Several optimizations, including but not limited to:
-    - Serialization, especially to flat arrays, is 10%-50% faster, possibly
-      more for small objects.
-    - Several descriptor operations which previously required locking no longer
-      do.
-    - Descriptors are now constructed lazily on first use, rather than at
-      process startup time.  This should save memory in programs which do not
-      use descriptors or reflection.
-    - UnknownFieldSet completely redesigned to be more efficient (especially in
-      terms of memory usage).
-    - Various optimizations to reduce code size (though the serialization speed
-      optimizations increased code size).
-  * Message interface has method ParseFromBoundedZeroCopyStream() which parses
-    a limited number of bytes from an input stream rather than parsing until
-    EOF.
-  * GzipInputStream and GzipOutputStream support reading/writing gzip- or
-    zlib-compressed streams if zlib is available.
-    (google/protobuf/io/gzip_stream.h)
-  * DescriptorPool::FindAllExtensions() and corresponding
-    DescriptorDatabase::FindAllExtensions() can be used to enumerate all
-    extensions of a given type.
-  * For each enum type Foo, protoc will generate functions:
-      const string& Foo_Name(Foo value);
-      bool Foo_Parse(const string& name, Foo* result);
-    The former returns the name of the enum constant corresponding to the given
-    value while the latter finds the value corresponding to a name.
-  * RepeatedField and RepeatedPtrField now have back-insertion iterators.
-  * String fields now have setters that take a char* and a size, in addition
-    to the existing ones that took char* or const string&.
-  * DescriptorPool::AllowUnknownDependencies() may be used to tell
-    DescriptorPool to create placeholder descriptors for unknown entities
-    referenced in a FileDescriptorProto.  This can allow you to parse a .proto
-    file without having access to other .proto files that it imports, for
-    example.
-  * Updated gtest to latest version.  The gtest package is now included as a
-    nested autoconf package, so it should be able to drop new versions into the
-    "gtest" subdirectory without modification.
-
-  Java
-  * Fixed bug where Message.mergeFrom(Message) failed to merge extensions.
-  * Message interface has new method toBuilder() which is equivalent to
-    newBuilderForType().mergeFrom(this).
-  * All enums now implement the ProtocolMessageEnum interface.
-  * Setting a field to null now throws NullPointerException.
-  * Fixed tendency for TextFormat's parsing to overflow the stack when
-    parsing large string values.  The underlying problem is with Java's
-    regex implementation (which unfortunately uses recursive backtracking
-    rather than building an NFA).  Worked around by making use of possessive
-    quantifiers.
-  * Generated service classes now also generate pure interfaces.  For a service
-    Foo, Foo.Interface is a pure interface containing all of the service's
-    defined methods.  Foo.newReflectiveService() can be called to wrap an
-    instance of this interface in a class that implements the generic
-    RpcService interface, which provides reflection support that is usually
-    needed by RPC server implementations.
-  * RPC interfaces now support blocking operation in addition to non-blocking.
-    The protocol compiler generates separate blocking and non-blocking stubs
-    which operate against separate blocking and non-blocking RPC interfaces.
-    RPC implementations will have to implement the new interfaces in order to
-    support blocking mode.
-  * New I/O methods parseDelimitedFrom(), mergeDelimitedFrom(), and
-    writeDelimitedTo() read and write "delimited" messages from/to a stream,
-    meaning that the message size precedes the data.  This way, you can write
-    multiple messages to a stream without having to worry about delimiting
-    them yourself.
-  * Throw a more descriptive exception when build() is double-called.
-  * Add a method to query whether CodedInputStream is at the end of the input
-    stream.
-  * Add a method to reset a CodedInputStream's size counter; useful when
-    reading many messages with the same stream.
-  * equals() and hashCode() now account for unknown fields.
-
-  Python
-  * Added slicing support for repeated scalar fields. Added slice retrieval and
-    removal of repeated composite fields.
-  * Updated RPC interfaces to allow for blocking operation.  A client may
-    now pass None for a callback when making an RPC, in which case the
-    call will block until the response is received, and the response
-    object will be returned directly to the caller.  This interface change
-    cannot be used in practice until RPC implementations are updated to
-    implement it.
-  * Changes to input_stream.py should make protobuf compatible with appengine.
-
-2008-11-25 version 2.0.3:
-
-  protoc
-  * Enum values may now have custom options, using syntax similar to field
-    options.
-  * Fixed bug where .proto files which use custom options but don't actually
-    define them (i.e. they import another .proto file defining the options)
-    had to explicitly import descriptor.proto.
-  * Adjacent string literals in .proto files will now be concatenated, like in
-    C.
-  * If an input file is a Windows absolute path (e.g. "C:\foo\bar.proto") and
-    the import path only contains "." (or contains "." but does not contain
-    the file), protoc incorrectly thought that the file was under ".", because
-    it thought that the path was relative (since it didn't start with a slash).
-    This has been fixed.
-
-  C++
-  * Generated message classes now have a Swap() method which efficiently swaps
-    the contents of two objects.
-  * All message classes now have a SpaceUsed() method which returns an estimate
-    of the number of bytes of allocated memory currently owned by the object.
-    This is particularly useful when you are reusing a single message object
-    to improve performance but want to make sure it doesn't bloat up too large.
-  * New method Message::SerializeAsString() returns a string containing the
-    serialized data.  May be more convenient than calling
-    SerializeToString(string*).
-  * In debug mode, log error messages when string-type fields are found to
-    contain bytes that are not valid UTF-8.
-  * Fixed bug where a message with multiple extension ranges couldn't parse
-    extensions.
-  * Fixed bug where MergeFrom(const Message&) didn't do anything if invoked on
-    a message that contained no fields (but possibly contained extensions).
-  * Fixed ShortDebugString() to not be O(n^2).  Durr.
-  * Fixed crash in TextFormat parsing if the first token in the input caused a
-    tokenization error.
-  * Fixed obscure bugs in zero_copy_stream_impl.cc.
-  * Added support for HP C++ on Tru64.
-  * Only build tests on "make check", not "make".
-  * Fixed alignment issue that caused crashes when using DynamicMessage on
-    64-bit Sparc machines.
-  * Simplify template usage to work with MSVC 2003.
-  * Work around GCC 4.3.x x86_64 compiler bug that caused crashes on startup.
-    (This affected Fedora 9 in particular.)
-  * Now works on "Solaris 10 using recent Sun Studio".
-
-  Java
-  * New overload of mergeFrom() which parses a slice of a byte array instead
-    of the whole thing.
-  * New method ByteString.asReadOnlyByteBuffer() does what it sounds like.
-  * Improved performance of isInitialized() when optimizing for code size.
-
-  Python
-  * Corrected ListFields() signature in Message base class to match what
-    subclasses actually implement.
-  * Some minor refactoring.
-  * Don't pass self as first argument to superclass constructor (no longer
-    allowed in Python 2.6).
-
-2008-09-29 version 2.0.2:
-
-  General
-  * License changed from Apache 2.0 to 3-Clause BSD.
-  * It is now possible to define custom "options", which are basically
-    annotations which may be placed on definitions in a .proto file.
-    For example, you might define a field option called "foo" like so:
-      import "google/protobuf/descriptor.proto"
-      extend google.protobuf.FieldOptions {
-        optional string foo = 12345;
-      }
-    Then you annotate a field using the "foo" option:
-      message MyMessage {
-        optional int32 some_field = 1 [(foo) = "bar"]
-      }
-    The value of this option is then visible via the message's
-    Descriptor:
-      const FieldDescriptor* field =
-        MyMessage::descriptor()->FindFieldByName("some_field");
-      assert(field->options().GetExtension(foo) == "bar");
-    This feature has been implemented and tested in C++ and Java.
-    Other languages may or may not need to do extra work to support
-    custom options, depending on how they construct descriptors.
-
-  C++
-  * Fixed some GCC warnings that only occur when using -pedantic.
-  * Improved static initialization code, making ordering more
-    predictable among other things.
-  * TextFormat will no longer accept messages which contain multiple
-    instances of a singular field.  Previously, the latter instance
-    would overwrite the former.
-  * Now works on systems that don't have hash_map.
-
-  Java
-  * Print @Override annotation in generated code where appropriate.
-
-  Python
-  * Strings now use the "unicode" type rather than the "str" type.
-    String fields may still be assigned ASCII "str" values; they will
-    automatically be converted.
-  * Adding a property to an object representing a repeated field now
-    raises an exception.  For example:
-      # No longer works (and never should have).
-      message.some_repeated_field.foo = 1
-
-  Windows
-  * We now build static libraries rather than DLLs by default on MSVC.
-    See vsprojects/readme.txt for more information.
-
-2008-08-15 version 2.0.1:
-
-  protoc
-  * New flags --encode and --decode can be used to convert between protobuf text
-    format and binary format from the command-line.
-  * New flag --descriptor_set_out can be used to write FileDescriptorProtos for
-    all parsed files directly into a single output file.  This is particularly
-    useful if you wish to parse .proto files from programs written in languages
-    other than C++: just run protoc as a background process and have it output
-    a FileDescriptorList, then parse that natively.
-  * Improved error message when an enum value's name conflicts with another
-    symbol defined in the enum type's scope, e.g. if two enum types declared
-    in the same scope have values with the same name.  This is disallowed for
-    compatibility with C++, but this wasn't clear from the error.
-  * Fixed absolute output paths on Windows.
-  * Allow trailing slashes in --proto_path mappings.
-
-  C++
-  * Reflection objects are now per-class rather than per-instance.  To make this
-    possible, the Reflection interface had to be changed such that all methods
-    take the Message instance as a parameter.  This change improves performance
-    significantly in memory-bandwidth-limited use cases, since it makes the
-    message objects smaller.  Note that source-incompatible interface changes
-    like this will not be made again after the library leaves beta.
-  * Heuristically detect sub-messages when printing unknown fields.
-  * Fix static initialization ordering bug that caused crashes at startup when
-    compiling on Mac with static linking.
-  * Fixed TokenizerTest when compiling with -DNDEBUG on Linux.
-  * Fixed incorrect definition of kint32min.
-  * Fix bytes type setter to work with byte sequences with embedded NULLs.
-  * Other irrelevant tweaks.
-
-  Java
-  * Fixed UnknownFieldSet's parsing of varints larger than 32 bits.
-  * Fixed TextFormat's parsing of "inf" and "nan".
-  * Fixed TextFormat's parsing of comments.
-  * Added info to Java POM that will be required when we upload the
-    package to a Maven repo.
-
-  Python
-  * MergeFrom(message) and CopyFrom(message) are now implemented.
-  * SerializeToString() raises an exception if the message is missing required
-    fields.
-  * Code organization improvements.
-  * Fixed doc comments for RpcController and RpcChannel, which had somehow been
-    swapped.
-  * Fixed text_format_test on Windows where floating-point exponents sometimes
-    contain extra zeros.
-  * Fix Python service CallMethod() implementation.
-
-  Other
-  * Improved readmes.
-  * VIM syntax highlighting improvements.
-
-2008-07-07 version 2.0.0:
-
-  * First public release.
diff --git a/libs/protobuf/CMakeLists.txt b/libs/protobuf/CMakeLists.txt
deleted file mode 100644
index 04cb330..0000000
--- a/libs/protobuf/CMakeLists.txt
+++ /dev/null
@@ -1,351 +0,0 @@
-# Minimum CMake required
-cmake_minimum_required(VERSION 3.5)
-
-if(protobuf_VERBOSE)
-  message(STATUS "Protocol Buffers Configuring...")
-endif()
-
-# CMake policies
-cmake_policy(SET CMP0022 NEW)
-# On MacOS use @rpath/ for target's install name prefix path
-if (POLICY CMP0042)
-  cmake_policy(SET CMP0042 NEW)
-endif ()
-# Clear VERSION variables when no VERSION is given to project()
-if(POLICY CMP0048)
-  cmake_policy(SET CMP0048 NEW)
-endif()
-# MSVC runtime library flags are selected by an abstraction.
-if(POLICY CMP0091)
-  cmake_policy(SET CMP0091 NEW)
-endif()
-
-# Project
-project(protobuf C CXX)
-
-if(protobuf_DEPRECATED_CMAKE_SUBDIRECTORY_USAGE)
-  if(CMAKE_PROJECT_NAME STREQUAL "protobuf")
-    get_filename_component(CMAKE_SOURCE_DIR ${CMAKE_SOURCE_DIR} DIRECTORY)
-  endif()
-  get_filename_component(CMAKE_CURRENT_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR} DIRECTORY)
-  get_filename_component(PROJECT_SOURCE_DIR ${PROJECT_SOURCE_DIR} DIRECTORY)
-  get_filename_component(protobuf_SOURCE_DIR ${protobuf_SOURCE_DIR} DIRECTORY)
-endif()
-
-# Add c++11 flags
-if (CYGWIN)
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11")
-else()
-  set(CMAKE_CXX_STANDARD 11)
-  set(CMAKE_CXX_STANDARD_REQUIRED ON)
-  set(CMAKE_CXX_EXTENSIONS OFF)
-endif()
-
-# The Intel compiler isn't able to deal with noinline member functions of
-# template classes defined in headers.  As such it spams the output with
-#   warning #2196: routine is both "inline" and "noinline"
-# This silences that warning.
-if (CMAKE_CXX_COMPILER_ID MATCHES Intel)
-  string(APPEND CMAKE_CXX_FLAGS " -diag-disable=2196")
-endif()
-
-# Options
-option(protobuf_INSTALL "Install protobuf binaries and files" ON)
-if(WITH_PROTOC)
-  set(protobuf_PROTOC_EXE ${WITH_PROTOC} CACHE FILEPATH "Protocol Buffer Compiler executable" FORCE)
-endif()
-option(protobuf_BUILD_TESTS "Build tests" ON)
-option(protobuf_BUILD_CONFORMANCE "Build conformance tests" OFF)
-option(protobuf_BUILD_EXAMPLES "Build examples" OFF)
-option(protobuf_BUILD_PROTOC_BINARIES "Build libprotoc and protoc compiler" ON)
-option(protobuf_BUILD_LIBPROTOC "Build libprotoc" OFF)
-option(protobuf_DISABLE_RTTI "Remove runtime type information in the binaries" OFF)
-if (BUILD_SHARED_LIBS)
-  set(protobuf_BUILD_SHARED_LIBS_DEFAULT ON)
-else (BUILD_SHARED_LIBS)
-  set(protobuf_BUILD_SHARED_LIBS_DEFAULT OFF)
-endif (BUILD_SHARED_LIBS)
-option(protobuf_BUILD_SHARED_LIBS "Build Shared Libraries" ${protobuf_BUILD_SHARED_LIBS_DEFAULT})
-include(CMakeDependentOption)
-cmake_dependent_option(protobuf_MSVC_STATIC_RUNTIME "Link static runtime libraries" ON
-  "NOT protobuf_BUILD_SHARED_LIBS" OFF)
-set(protobuf_WITH_ZLIB_DEFAULT ON)
-option(protobuf_WITH_ZLIB "Build with zlib support" ${protobuf_WITH_ZLIB_DEFAULT})
-set(protobuf_DEBUG_POSTFIX "d"
-  CACHE STRING "Default debug postfix")
-mark_as_advanced(protobuf_DEBUG_POSTFIX)
-# User options
-include(${protobuf_SOURCE_DIR}/cmake/protobuf-options.cmake)
-
-# Overrides for option dependencies
-if (protobuf_BUILD_PROTOC_BINARIES OR protobuf_BUILD_TESTS)
-  set(protobuf_BUILD_LIBPROTOC ON)
-endif ()
-# Path to main configure script
-set(protobuf_CONFIGURE_SCRIPT "${protobuf_SOURCE_DIR}/configure.ac")
-
-# Parse configure script
-set(protobuf_AC_INIT_REGEX
-  "^AC_INIT\\(\\[([^]]+)\\],\\[([^]]+)\\],\\[([^]]+)\\],\\[([^]]+)\\]\\)$")
-file(STRINGS "${protobuf_CONFIGURE_SCRIPT}" protobuf_AC_INIT_LINE
-  LIMIT_COUNT 1 REGEX "^AC_INIT")
-# Description
-string(REGEX REPLACE        "${protobuf_AC_INIT_REGEX}" "\\1"
-    protobuf_DESCRIPTION    "${protobuf_AC_INIT_LINE}")
-# Version
-string(REGEX REPLACE        "${protobuf_AC_INIT_REGEX}" "\\2"
-    protobuf_VERSION_STRING "${protobuf_AC_INIT_LINE}")
-# Contact
-string(REGEX REPLACE        "${protobuf_AC_INIT_REGEX}" "\\3"
-    protobuf_CONTACT        "${protobuf_AC_INIT_LINE}")
-# Parse version tweaks
-set(protobuf_VERSION_REGEX "^([0-9]+)\\.([0-9]+)\\.([0-9]+)([-]rc[-]|\\.)?([0-9]*)$")
-string(REGEX REPLACE     "${protobuf_VERSION_REGEX}" "\\1"
-  protobuf_VERSION_MAJOR "${protobuf_VERSION_STRING}")
-string(REGEX REPLACE     "${protobuf_VERSION_REGEX}" "\\2"
-  protobuf_VERSION_MINOR "${protobuf_VERSION_STRING}")
-string(REGEX REPLACE     "${protobuf_VERSION_REGEX}" "\\3"
-  protobuf_VERSION_PATCH "${protobuf_VERSION_STRING}")
-string(REGEX REPLACE     "${protobuf_VERSION_REGEX}" "\\5"
-  protobuf_VERSION_PRERELEASE "${protobuf_VERSION_STRING}")
-
-message(STATUS "${protobuf_VERSION_PRERELEASE}")
-
-# Package version
-set(protobuf_VERSION
-  "${protobuf_VERSION_MAJOR}.${protobuf_VERSION_MINOR}.${protobuf_VERSION_PATCH}")
-
-if(protobuf_VERSION_PRERELEASE)
-  set(protobuf_VERSION "${protobuf_VERSION}.${protobuf_VERSION_PRERELEASE}")
-else()
-  set(protobuf_VERSION "${protobuf_VERSION}.0")
-endif()
-message(STATUS "${protobuf_VERSION}")
-
-if(protobuf_VERBOSE)
-  message(STATUS "Configuration script parsing status [")
-  message(STATUS "  Description : ${protobuf_DESCRIPTION}")
-  message(STATUS "  Version     : ${protobuf_VERSION} (${protobuf_VERSION_STRING})")
-  message(STATUS "  Contact     : ${protobuf_CONTACT}")
-  message(STATUS "]")
-endif()
-
-add_definitions(-DGOOGLE_PROTOBUF_CMAKE_BUILD)
-
-if (protobuf_DISABLE_RTTI)
-  add_definitions(-DGOOGLE_PROTOBUF_NO_RTTI=1)
-endif()
-
-file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/cmaketest.map
-"{
-  global:
-    main;
-  local:
-    *;
-};")
-# CheckLinkerFlag module available in CMake >=3.18.
-if(${CMAKE_VERSION} VERSION_GREATER 3.18 OR ${CMAKE_VERSION} VERSION_EQUAL 3.18)
-  include(CheckLinkerFlag)
-  check_linker_flag(CXX -Wl,--version-script=${CMAKE_CURRENT_BINARY_DIR}/cmaketest.map protobuf_HAVE_LD_VERSION_SCRIPT)
-else()
-  include(CheckCXXSourceCompiles)
-  set(OLD_CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS})
-  set(CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS} -Wl,--version-script=${CMAKE_CURRENT_BINARY_DIR}/cmaketest.map)
-  check_cxx_source_compiles("
-    int main() {
-      return 0;
-    }
-  " protobuf_HAVE_LD_VERSION_SCRIPT)
-  set(CMAKE_REQUIRED_FLAGS ${OLD_CMAKE_REQUIRED_FLAGS})
-endif()
-file(REMOVE ${CMAKE_CURRENT_BINARY_DIR}/cmaketest.map)
-
-find_package(Threads REQUIRED)
-
-set(_protobuf_FIND_ZLIB)
-if (protobuf_WITH_ZLIB)
-  find_package(ZLIB)
-  if (ZLIB_FOUND)
-    set(HAVE_ZLIB 1)
-    # FindZLIB module define ZLIB_INCLUDE_DIRS variable
-    # Set ZLIB_INCLUDE_DIRECTORIES for compatible
-    set(ZLIB_INCLUDE_DIRECTORIES ${ZLIB_INCLUDE_DIRECTORIES} ${ZLIB_INCLUDE_DIRS})
-    # Using imported target if exists
-    if (TARGET ZLIB::ZLIB)
-      set(ZLIB_LIBRARIES ZLIB::ZLIB)
-      set(_protobuf_FIND_ZLIB "if(NOT ZLIB_FOUND)\n  find_package(ZLIB)\nendif()")
-    endif (TARGET ZLIB::ZLIB)
-  else (ZLIB_FOUND)
-    set(HAVE_ZLIB 0)
-    # Explicitly set these to empty (override NOT_FOUND) so cmake doesn't
-    # complain when we use them later.
-    set(ZLIB_INCLUDE_DIRECTORIES)
-    set(ZLIB_LIBRARIES)
-  endif (ZLIB_FOUND)
-endif (protobuf_WITH_ZLIB)
-
-if (HAVE_ZLIB)
-  add_definitions(-DHAVE_ZLIB)
-endif (HAVE_ZLIB)
-
-# We need to link with libatomic on systems that do not have builtin atomics, or
-# don't have builtin support for 8 byte atomics
-set(protobuf_LINK_LIBATOMIC false)
-if (NOT MSVC)
-  include(CheckCXXSourceCompiles)
-  set(OLD_CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS})
-  set(CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS} -std=c++11)
-  check_cxx_source_compiles("
-    #include <atomic>
-    int main() {
-      return std::atomic<int64_t>{};
-    }
-  " protobuf_HAVE_BUILTIN_ATOMICS)
-  if (NOT protobuf_HAVE_BUILTIN_ATOMICS)
-    set(protobuf_LINK_LIBATOMIC true)
-  endif (NOT protobuf_HAVE_BUILTIN_ATOMICS)
-  set(CMAKE_REQUIRED_FLAGS ${OLD_CMAKE_REQUIRED_FLAGS})
-endif (NOT MSVC)
-
-if (protobuf_BUILD_SHARED_LIBS)
-  set(protobuf_SHARED_OR_STATIC "SHARED")
-else (protobuf_BUILD_SHARED_LIBS)
-  set(protobuf_SHARED_OR_STATIC "STATIC")
-  # The CMAKE_<LANG>_FLAGS(_<BUILD_TYPE>)? is meant to be user controlled.
-  # Prior to CMake 3.15, the MSVC runtime library was pushed into the same flags
-  # making programmatic control difficult.  Prefer the functionality in newer
-  # CMake versions when available.
-  if(${CMAKE_VERSION} VERSION_GREATER 3.15 OR ${CMAKE_VERSION} VERSION_EQUAL 3.15)
-    if (protobuf_MSVC_STATIC_RUNTIME)
-        set(CMAKE_MSVC_RUNTIME_LIBRARY MultiThreaded$<$<CONFIG:Debug>:Debug>)
-    else()
-        set(CMAKE_MSVC_RUNTIME_LIBRARY MultiThreaded$<$<CONFIG:Debug>:Debug>DLL)
-    endif()
-  else()
-    # In case we are building static libraries, link also the runtime library statically
-    # so that MSVCR*.DLL is not required at runtime.
-    # https://msdn.microsoft.com/en-us/library/2kzt1wy3.aspx
-    # This is achieved by replacing msvc option /MD with /MT and /MDd with /MTd
-    # http://www.cmake.org/Wiki/CMake_FAQ#How_can_I_build_my_MSVC_application_with_a_static_runtime.3F
-    if (MSVC AND protobuf_MSVC_STATIC_RUNTIME)
-      foreach(flag_var
-          CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE
-          CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO)
-        if(${flag_var} MATCHES "/MD")
-          string(REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}")
-        endif(${flag_var} MATCHES "/MD")
-      endforeach(flag_var)
-    endif (MSVC AND protobuf_MSVC_STATIC_RUNTIME)
-  endif()
-endif (protobuf_BUILD_SHARED_LIBS)
-
-if (MSVC)
-  if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
-    # Build with multiple processes
-    add_definitions(/MP)
-  endif()
-  # Set source file and execution character sets to UTF-8
-  add_definitions(/utf-8)
-  # MSVC warning suppressions
-  add_definitions(
-    /wd4065 # switch statement contains 'default' but no 'case' labels
-    /wd4244 # 'conversion' conversion from 'type1' to 'type2', possible loss of data
-    /wd4251 # 'identifier' : class 'type' needs to have dll-interface to be used by clients of class 'type2'
-    /wd4267 # 'var' : conversion from 'size_t' to 'type', possible loss of data
-    /wd4305 # 'identifier' : truncation from 'type1' to 'type2'
-    /wd4307 # 'operator' : integral constant overflow
-    /wd4309 # 'conversion' : truncation of constant value
-    /wd4334 # 'operator' : result of 32-bit shift implicitly converted to 64 bits (was 64-bit shift intended?)
-    /wd4355 # 'this' : used in base member initializer list
-    /wd4506 # no definition for inline function 'function'
-    /wd4800 # 'type' : forcing value to bool 'true' or 'false' (performance warning)
-    /wd4996 # The compiler encountered a deprecated declaration.
-  )
-  # Allow big object
-  add_definitions(/bigobj)
-  string(REPLACE "/" "\\" PROTOBUF_SOURCE_WIN32_PATH ${protobuf_SOURCE_DIR})
-  string(REPLACE "/" "\\" PROTOBUF_BINARY_WIN32_PATH ${protobuf_BINARY_DIR})
-  string(REPLACE "." ","  protobuf_RC_FILEVERSION "${protobuf_VERSION}")
-  configure_file(${protobuf_SOURCE_DIR}/cmake/extract_includes.bat.in extract_includes.bat)
-
-  # Suppress linker warnings about files with no symbols defined.
-  set(CMAKE_STATIC_LINKER_FLAGS "${CMAKE_STATIC_LINKER_FLAGS} /ignore:4221")
-
-  if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
-    # Configure Resource Compiler
-    enable_language(RC)
-    # use English language (0x409) in resource compiler
-    set(rc_flags "/l0x409")
-    # fix rc.exe invocations because of usage of add_definitions()
-    set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> ${rc_flags} <DEFINES> /fo<OBJECT> <SOURCE>")
-  endif()
-
-  # Generate the version.rc file used elsewhere.
-  configure_file(${protobuf_SOURCE_DIR}/cmake/version.rc.in ${CMAKE_CURRENT_BINARY_DIR}/version.rc @ONLY)
-  set(protobuf_version_rc_file ${CMAKE_CURRENT_BINARY_DIR}/version.rc)
-
-  # Add the "lib" prefix for generated .lib outputs.
-  set(LIB_PREFIX lib)
-else (MSVC)
-  # No version.rc file.
-  set(protobuf_version_rc_file)
-
-  # When building with "make", "lib" prefix will be added automatically by
-  # the build tool.
-  set(LIB_PREFIX)
-endif (MSVC)
-
-include_directories(
-  ${ZLIB_INCLUDE_DIRECTORIES}
-  ${protobuf_BINARY_DIR}
-  ${protobuf_SOURCE_DIR}/src)
-
-if (protobuf_UNICODE)
-  add_definitions(-DUNICODE -D_UNICODE)
-endif (protobuf_UNICODE)
-
-include(${protobuf_SOURCE_DIR}/cmake/libprotobuf-lite.cmake)
-include(${protobuf_SOURCE_DIR}/cmake/libprotobuf.cmake)
-if (protobuf_BUILD_LIBPROTOC)
-  include(${protobuf_SOURCE_DIR}/cmake/libprotoc.cmake)
-endif (protobuf_BUILD_LIBPROTOC)
-if (protobuf_BUILD_PROTOC_BINARIES)
-  include(${protobuf_SOURCE_DIR}/cmake/protoc.cmake)
-  if (NOT DEFINED protobuf_PROTOC_EXE)
-    set(protobuf_PROTOC_EXE protoc)
-  endif (NOT DEFINED protobuf_PROTOC_EXE)
-endif (protobuf_BUILD_PROTOC_BINARIES)
-
-# Ensure we have a protoc executable if we need one
-if (protobuf_BUILD_TESTS OR protobuf_BUILD_CONFORMANCE OR protobuf_BUILD_EXAMPLES)
-  if (NOT DEFINED protobuf_PROTOC_EXE)
-    find_program(protobuf_PROTOC_EXE protoc)
-    if (NOT protobuf_PROTOC_EXE)
-      message(FATAL "Build requires 'protoc' but binary not found and not building protoc.")
-    endif ()
-  endif ()
-  if(protobuf_VERBOSE)
-    message(STATUS "Using protoc : ${protobuf_PROTOC_EXE}")
-  endif(protobuf_VERBOSE)
-endif ()
-
-if (protobuf_BUILD_TESTS)
-  enable_testing()
-  include(${protobuf_SOURCE_DIR}/cmake/tests.cmake)
-endif (protobuf_BUILD_TESTS)
-
-if (protobuf_BUILD_CONFORMANCE)
-  include(${protobuf_SOURCE_DIR}/cmake/conformance.cmake)
-endif (protobuf_BUILD_CONFORMANCE)
-
-if (protobuf_INSTALL)
-  include(${protobuf_SOURCE_DIR}/cmake/install.cmake)
-endif (protobuf_INSTALL)
-
-if (protobuf_BUILD_EXAMPLES)
-  include(${protobuf_SOURCE_DIR}/cmake/examples.cmake)
-endif (protobuf_BUILD_EXAMPLES)
-
-if(protobuf_VERBOSE)
-  message(STATUS "Protocol Buffers Configuring done")
-endif(protobuf_VERBOSE)
diff --git a/libs/protobuf/CONTRIBUTING.md b/libs/protobuf/CONTRIBUTING.md
deleted file mode 100644
index a16d63c..0000000
--- a/libs/protobuf/CONTRIBUTING.md
+++ /dev/null
@@ -1,120 +0,0 @@
-# Contributing to Protocol Buffers
-
-We welcome some types of contributions to protocol buffers. This doc describes the
-process to contribute patches to protobuf and the general guidelines we
-expect contributors to follow.
-
-## What We Accept
-
-* Bug fixes with unit tests demonstrating the problem are very welcome.
-  We also appreciate bug reports, even when they don't come with a patch.
-  Bug fixes without tests are usually not accepted.
-* New APIs and features with adequate test coverage and documentation
-  may be accepted if they do not compromise backwards 
-  compatibility. However there's a fairly high bar of usefulness a new public
-  method must clear before it will be accepted. Features that are fine in 
-  isolation are often rejected because they don't have enough impact to justify the 
-  conceptual burden and ongoing maintenance cost. It's best to file an issue 
-  and get agreement from maintainers on the value of a new feature before
-  working on a PR.
-* Performance optimizations may be accepted if they have convincing benchmarks that demonstrate 
-  an improvement and they do not significantly increase complexity.  
-* Changes to existing APIs are almost never accepted. Stability and
-  backwards compatibility are paramount. In the unlikely event a breaking change 
-  is required, it must usually be implemented in google3 first. 
-* Changes to the wire and text formats are never accepted. Any breaking change
-  to these formats would have to be implemented as a completely new format.
-  We cannot begin generating protos that cannot be parsed by existing code.
-
-## Before You Start
-
-We accept patches in the form of github pull requests. If you are new to
-github, please read [How to create github pull requests](https://help.github.com/articles/about-pull-requests/)
-first.
-
-### Contributor License Agreements
-
-Contributions to this project must be accompanied by a Contributor License
-Agreement. You (or your employer) retain the copyright to your contribution,
-this simply gives us permission to use and redistribute your contributions
-as part of the project.
-
-* If you are an individual writing original source code and you're sure you
-  own the intellectual property, then you'll need to sign an [individual CLA](https://cla.developers.google.com/about/google-individual?csw=1).
-* If you work for a company that wants to allow you to contribute your work,
-  then you'll need to sign a [corporate CLA](https://cla.developers.google.com/about/google-corporate?csw=1).
-
-### Coding Style
-
-This project follows [Google’s Coding Style Guides](https://github.com/google/styleguide).
-Before sending out your pull request, please familiarize yourself with the
-corresponding style guides and make sure the proposed code change is style
-conforming.
-
-## Contributing Process
-
-Most pull requests should go to the main branch and the change will be
-included in the next major/minor version release (e.g., 3.6.0 release). If you
-need to include a bug fix in a patch release (e.g., 3.5.2), make sure it’s
-already merged to main, and then create a pull request cherry-picking the
-commits from main branch to the release branch (e.g., branch 3.5.x).
-
-For each pull request, a protobuf team member will be assigned to review the
-pull request. For minor cleanups, the pull request may be merged right away
-after an initial review. For larger changes, you will likely receive multiple
-rounds of comments and it may take some time to complete. We will try to keep
-our response time within 7-days but if you don’t get any response in a few
-days, feel free to comment on the threads to get our attention. We also expect
-you to respond to our comments within a reasonable amount of time. If we don’t
-hear from you for 2 weeks or longer, we may close the pull request. You can
-still send the pull request again once you have time to work on it.
-
-Once a pull request is merged, we will take care of the rest and get it into
-the final release.
-
-## Pull Request Guidelines
-
-* If you are a Googler, it is preferable to first create an internal CL and
-  have it reviewed and submitted. The code propagation process will deliver the
-  change to GitHub.
-* Create small PRs that are narrowly focused on addressing a single concern.
-  We often receive PRs that are trying to fix several things at a time, but if
-  only one fix is considered acceptable, nothing gets merged and both author's
-  & reviewer's time is wasted. Create more PRs to address different concerns and
-  everyone will be happy.
-* For speculative changes, consider opening an issue and discussing it first.
-  If you are suggesting a behavioral or API change, make sure you get explicit
-  support from a protobuf team member before sending us the pull request.
-* Provide a good PR description as a record of what change is being made and
-  why it was made. Link to a GitHub issue if it exists.
-* Don't fix code style and formatting unless you are already changing that
-  line to address an issue. PRs with irrelevant changes won't be merged. If
-  you do want to fix formatting or style, do that in a separate PR.
-* Unless your PR is trivial, you should expect there will be reviewer comments
-  that you'll need to address before merging. We expect you to be reasonably
-  responsive to those comments, otherwise the PR will be closed after 2-3 weeks
-  of inactivity.
-* Maintain clean commit history and use meaningful commit messages. PRs with
-  messy commit history are difficult to review and won't be merged. Use rebase
-  -i upstream/main to curate your commit history and/or to bring in latest
-  changes from main (but avoid rebasing in the middle of a code review).
-* Keep your PR up to date with upstream/main (if there are merge conflicts,
-  we can't really merge your change).
-* All tests need to be passing before your change can be merged. We recommend
-  you run tests locally before creating your PR to catch breakages early on.
-  Ultimately, the green signal will be provided by our testing infrastructure.
-  The reviewer will help you if there are test failures that seem not related
-  to the change you are making.
-
-## Reviewer Guidelines
-
-* Make sure that all tests are passing before approval.
-* Apply the "release notes: yes" label if the pull request's description should
-  be included in the next release (e.g., any new feature / bug fix).
-  Apply the "release notes: no" label if the pull request's description should
-  not be included in the next release (e.g., refactoring changes that does not
-  change behavior, integration from Google internal, updating tests, etc.).
-* Apply the appropriate language label (e.g., C++, Java, Python, etc.) to the
-  pull request. This will make it easier to identify which languages the pull
-  request affects, allowing us to better identify appropriate reviewer, create
-  a better release note, and make it easier to identify issues in the future.
diff --git a/libs/protobuf/CONTRIBUTORS.txt b/libs/protobuf/CONTRIBUTORS.txt
deleted file mode 100644
index c2da98f..0000000
--- a/libs/protobuf/CONTRIBUTORS.txt
+++ /dev/null
@@ -1,107 +0,0 @@
-This file contains a list of people who have made large contributions
-to the public version of Protocol Buffers.
-
-Original Protocol Buffers design and implementation:
-  Sanjay Ghemawat <sanjay@google.com>
-  Jeff Dean <jeff@google.com>
-  Daniel Dulitz <daniel@google.com>
-  Craig Silverstein
-  Paul Haahr <haahr@google.com>
-  Corey Anderson <corin@google.com>
-  (and many others)
-
-Proto2 C++ and Java primary author:
-  Kenton Varda <kenton@google.com>
-
-Proto2 Python primary authors:
-  Will Robinson <robinson@google.com>
-  Petar Petrov <petar@google.com>
-
-Java Nano primary authors:
-  Brian Duff <bduff@google.com>
-  Tom Chao <chaot@google.com>
-  Max Cai <maxtroy@google.com>
-  Ulas Kirazci <ulas@google.com>
-
-Large code contributions:
-  Jason Hsueh <jasonh@google.com>
-  Joseph Schorr <jschorr@google.com>
-  Wenbo Zhu <wenboz@google.com>
-
-Large quantity of code reviews:
-  Scott Bruce <sbruce@google.com>
-  Frank Yellin
-  Neal Norwitz <nnorwitz@google.com>
-  Jeffrey Yasskin <jyasskin@google.com>
-  Ambrose Feinstein <ambrose@google.com>
-
-Documentation:
-  Lisa Carey <lcarey@google.com>
-
-Maven packaging:
-  Gregory Kick <gak@google.com>
-
-Patch contributors:
-  Kevin Ko <kevin.s.ko@gmail.com>
-    * Small patch to handle trailing slashes in --proto_path flag.
-  Johan Euphrosine <proppy@aminche.com>
-    * Small patch to fix Python CallMethod().
-  Ulrich Kunitz <kune@deine-taler.de>
-    * Small optimizations to Python serialization.
-  Leandro Lucarella <llucax@gmail.com>
-    * VI syntax highlighting tweaks.
-    * Fix compiler to not make output executable.
-  Dilip Joseph <dilip.antony.joseph@gmail.com>
-    * Heuristic detection of sub-messages when printing unknown fields in
-      text format.
-  Brian Atkinson <nairb774@gmail.com>
-    * Added @Override annotation to generated Java code where appropriate.
-  Vincent Choinière <Choiniere.Vincent@hydro.qc.ca>
-    * Tru64 support.
-  Monty Taylor <monty.taylor@gmail.com>
-    * Solaris 10 + Sun Studio fixes.
-  Alek Storm <alek.storm@gmail.com>
-    * Slicing support for repeated scalar fields for the Python API.
-  Oleg Smolsky <oleg.smolsky@gmail.com>
-    * MS Visual Studio error format option.
-    * Detect unordered_map in stl_hash.m4.
-  Brian Olson <brianolson@google.com>
-    * gzip/zlib I/O support.
-  Michael Poole <mdpoole@troilus.org>
-    * Fixed warnings about generated constructors not explicitly initializing
-      all fields (only present with certain compiler settings).
-    * Added generation of field number constants.
-  Wink Saville <wink@google.com>
-    * Fixed initialization ordering problem in logging code.
-  Will Pierce <willp@nuclei.com>
-    * Small patch improving performance of in Python serialization.
-  Alexandre Vassalotti <alexandre@peadrop.com>
-    * Emacs mode for Protocol Buffers (editors/protobuf-mode.el).
-  Scott Stafford <scott.stafford@gmail.com>
-    * Added Swap(), SwapElements(), and RemoveLast() to Reflection interface.
-  Alexander Melnikov <alm@sibmail.ru>
-    * HPUX support.
-  Oliver Jowett <oliver.jowett@gmail.com>
-    * Detect whether zlib is new enough in configure script.
-    * Fixes for Solaris 10 32/64-bit confusion.
-  Evan Jones <evanj@mit.edu>
-    * Optimize Java serialization code when writing a small message to a stream.
-    * Optimize Java serialization of strings so that UTF-8 encoding happens only
-      once per string per serialization call.
-    * Clean up some Java warnings.
-    * Fix bug with permanent callbacks that delete themselves when run.
-  Michael Kucharski <m.kucharski@gmail.com>
-    * Added CodedInputStream.getTotalBytesRead().
-  Kacper Kowalik <xarthisius.kk@gmail.com>
-    * Fixed m4/acx_pthread.m4 problem for some Linux distributions.
-  William Orr <will@worrbase.com>
-    * Fixed detection of sched_yield on Solaris.
-    * Added atomicops for Solaris
-  Andrew Paprocki <andrew@ishiboo.com>
-    * Fixed minor IBM xlC compiler build issues
-    * Added atomicops for AIX (POWER)
-  Nipunn Koorapati <nipunn1313@gmail.com>
-    * Provide a type alias field ValueType on EnumTypeWrapper
-    * Match service argument names to abstract interface
-
-
diff --git a/libs/protobuf/LICENSE b/libs/protobuf/LICENSE
deleted file mode 100644
index 19b305b..0000000
--- a/libs/protobuf/LICENSE
+++ /dev/null
@@ -1,32 +0,0 @@
-Copyright 2008 Google Inc.  All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-    * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Code generated by the Protocol Buffer compiler is owned by the owner
-of the input file used when generating it.  This code is not
-standalone and requires a support library to be linked with it.  This
-support library is itself covered by the above license.
diff --git a/libs/protobuf/Makefile.am b/libs/protobuf/Makefile.am
deleted file mode 100644
index 681cd8c..0000000
--- a/libs/protobuf/Makefile.am
+++ /dev/null
@@ -1,1292 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-ACLOCAL_AMFLAGS = -I m4
-
-AUTOMAKE_OPTIONS = foreign
-
-# Build . before src so that our all-local and clean-local hooks kicks in at
-# the right time.
-SUBDIRS = . src
-
-# Always include third_party directories in distributions.
-#
-# Note that distribution artifacts will be produced by Bazel in the future.
-# See pkg/BUILD.bazel for overall definitions.
-DIST_SUBDIRS = src conformance benchmarks third_party/googletest
-
-# Build gmock before we build protobuf tests.  We don't add gmock to SUBDIRS
-# because then "make check" would also build and run all of gmock's own tests,
-# which takes a lot of time and is generally not useful to us.  Also, we don't
-# want "make install" to recurse into gmock since we don't want to overwrite
-# the installed version of gmock if there is one.
-check-local:
-	@echo "Making lib/libgmock.a lib/libgmock_main.a in gmock"
-	@cd third_party/googletest/googletest && $(MAKE) $(AM_MAKEFLAGS) lib/libgtest.la lib/libgtest_main.la
-	@cd third_party/googletest/googlemock && $(MAKE) $(AM_MAKEFLAGS) lib/libgmock.la lib/libgmock_main.la
-
-# We would like to clean gmock when "make clean" is invoked.  But we have to
-# be careful because clean-local is also invoked during "make distclean", but
-# "make distclean" already recurses into gmock because it's listed among the
-# DIST_SUBDIRS.  distclean will delete gmock/Makefile, so if we then try to
-# cd to the directory again and "make clean" it will fail.  So, check that the
-# Makefile exists before recursing.
-clean-local:
-	@if test -e third_party/googletest/Makefile; then \
-	  echo "Making clean in googletest"; \
-	  cd third_party/googletest && $(MAKE) $(AM_MAKEFLAGS) clean; \
-	fi; \
-	if test -e conformance/Makefile; then \
-	  echo "Making clean in conformance"; \
-	  cd conformance && $(MAKE) $(AM_MAKEFLAGS) clean; \
-	fi; \
-	if test -e benchmarks/Makefile; then \
-	  echo "Making clean in benchmarks"; \
-	  cd benchmarks && $(MAKE) $(AM_MAKEFLAGS) clean; \
-	fi; \
-	if test -e objectivec/DevTools; then \
-	  echo "Cleaning any ObjC pyc files"; \
-	  rm -f objectivec/DevTools/*.pyc; \
-	fi
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = protobuf.pc protobuf-lite.pc
-
-# Note: please keep this in sync with the dist_files rule in csharp/BUILD.bazel.
-csharp_EXTRA_DIST=                                                           \
-  global.json                                                                \
-  csharp/.editorconfig                                                       \
-  csharp/.gitignore                                                          \
-  csharp/CHANGES.txt                                                         \
-  csharp/Google.Protobuf.Tools.targets                                       \
-  csharp/Google.Protobuf.Tools.nuspec                                        \
-  csharp/NuGet.Config                                                        \
-  csharp/README.md                                                           \
-  csharp/build_packages.bat                                                  \
-  csharp/build_tools.sh                                                      \
-  csharp/buildall.bat                                                        \
-  csharp/buildall.sh                                                         \
-  csharp/generate_protos.sh                                                  \
-  csharp/install_dotnet_sdk.ps1                                              \
-  csharp/keys/Google.Protobuf.public.snk                                     \
-  csharp/keys/Google.Protobuf.snk                                            \
-  csharp/keys/README.md                                                      \
-  csharp/protos/README.md                                                    \
-  csharp/protos/map_unittest_proto3.proto                                    \
-  csharp/protos/old_extensions1.proto                                        \
-  csharp/protos/old_extensions2.proto                                        \
-  csharp/protos/unittest_issue6936_a.proto                                   \
-  csharp/protos/unittest_issue6936_b.proto                                   \
-  csharp/protos/unittest_issue6936_c.proto                                   \
-  csharp/protos/unittest_custom_options_proto3.proto                         \
-  csharp/protos/unittest_import_public_proto3.proto                          \
-  csharp/protos/unittest_import_public.proto                                 \
-  csharp/protos/unittest_import_proto3.proto                                 \
-  csharp/protos/unittest_import.proto                                        \
-  csharp/protos/unittest_issues.proto                                        \
-  csharp/protos/unittest_proto3.proto                                        \
-  csharp/protos/unittest_selfreferential_options.proto                       \
-  csharp/protos/unittest.proto                                               \
-  csharp/src/AddressBook/AddPerson.cs                                        \
-  csharp/src/AddressBook/Addressbook.cs                                      \
-  csharp/src/AddressBook/AddressBook.csproj                                  \
-  csharp/src/AddressBook/ListPeople.cs                                       \
-  csharp/src/AddressBook/Program.cs                                          \
-  csharp/src/AddressBook/SampleUsage.cs                                      \
-  csharp/src/Google.Protobuf.Benchmarks/BenchmarkDatasetConfig.cs            \
-  csharp/src/Google.Protobuf.Benchmarks/BenchmarkMessage1Proto3.cs           \
-  csharp/src/Google.Protobuf.Benchmarks/Benchmarks.cs                        \
-  csharp/src/Google.Protobuf.Benchmarks/ByteStringBenchmark.cs               \
-  csharp/src/Google.Protobuf.Benchmarks/Google.Protobuf.Benchmarks.csproj    \
-  csharp/src/Google.Protobuf.Benchmarks/GoogleMessageBenchmark.cs            \
-  csharp/src/Google.Protobuf.Benchmarks/ParseMessagesBenchmark.cs            \
-  csharp/src/Google.Protobuf.Benchmarks/ParseRawPrimitivesBenchmark.cs       \
-  csharp/src/Google.Protobuf.Benchmarks/Program.cs                           \
-  csharp/src/Google.Protobuf.Benchmarks/wrapper_benchmark_messages.proto     \
-  csharp/src/Google.Protobuf.Benchmarks/WrapperBenchmarkMessages.cs          \
-  csharp/src/Google.Protobuf.Benchmarks/WriteMessagesBenchmark.cs            \
-  csharp/src/Google.Protobuf.Benchmarks/WriteRawPrimitivesBenchmark.cs       \
-  csharp/src/Google.Protobuf.Conformance/Conformance.cs                      \
-  csharp/src/Google.Protobuf.Conformance/Google.Protobuf.Conformance.csproj  \
-  csharp/src/Google.Protobuf.Conformance/Program.cs                          \
-  csharp/src/Google.Protobuf.JsonDump/Google.Protobuf.JsonDump.csproj        \
-  csharp/src/Google.Protobuf.JsonDump/Program.cs                             \
-  csharp/src/Google.Protobuf.Test/Buffers/ArrayBufferWriter.cs               \
-  csharp/src/Google.Protobuf.Test/ByteStringTest.cs                          \
-  csharp/src/Google.Protobuf.Test/CodedInputStreamExtensions.cs              \
-  csharp/src/Google.Protobuf.Test/CodedInputStreamTest.cs                    \
-  csharp/src/Google.Protobuf.Test/CodedOutputStreamTest.cs                   \
-  csharp/src/Google.Protobuf.Test/Collections/MapFieldTest.cs                \
-  csharp/src/Google.Protobuf.Test/Collections/ProtobufEqualityComparersTest.cs \
-  csharp/src/Google.Protobuf.Test/Collections/RepeatedFieldTest.cs           \
-  csharp/src/Google.Protobuf.Test/Compatibility/PropertyInfoExtensionsTest.cs \
-  csharp/src/Google.Protobuf.Test/Compatibility/StreamExtensionsTest.cs      \
-  csharp/src/Google.Protobuf.Test/Compatibility/TypeExtensionsTest.cs        \
-  csharp/src/Google.Protobuf.Test/DeprecatedMemberTest.cs                    \
-  csharp/src/Google.Protobuf.Test/EqualityTester.cs                          \
-  csharp/src/Google.Protobuf.Test/ExtensionSetTest.cs                        \
-  csharp/src/Google.Protobuf.Test/FieldCodecTest.cs                          \
-  csharp/src/Google.Protobuf.Test/FieldMaskTreeTest.cs                       \
-  csharp/src/Google.Protobuf.Test/GeneratedMessageTest.cs                    \
-  csharp/src/Google.Protobuf.Test/GeneratedMessageTest.Proto2.cs             \
-  csharp/src/Google.Protobuf.Test/Google.Protobuf.Test.csproj                \
-  csharp/src/Google.Protobuf.Test/IssuesTest.cs                              \
-  csharp/src/Google.Protobuf.Test/JsonFormatterTest.cs                       \
-  csharp/src/Google.Protobuf.Test/JsonParserTest.cs                          \
-  csharp/src/Google.Protobuf.Test/JsonTokenizerTest.cs                       \
-  csharp/src/Google.Protobuf.Test/LegacyGeneratedCodeTest.cs                 \
-  csharp/src/Google.Protobuf.Test/MessageParsingHelpers.cs                   \
-  csharp/src/Google.Protobuf.Test/Proto3OptionalTest.cs                      \
-  csharp/src/Google.Protobuf.Test/ReadOnlySequenceFactory.cs                 \
-  csharp/src/Google.Protobuf.Test/RefStructCompatibilityTest.cs              \
-  csharp/src/Google.Protobuf.Test/Reflection/CustomOptionsTest.cs            \
-  csharp/src/Google.Protobuf.Test/Reflection/DescriptorDeclarationTest.cs    \
-  csharp/src/Google.Protobuf.Test/Reflection/DescriptorsTest.cs              \
-  csharp/src/Google.Protobuf.Test/Reflection/FieldAccessTest.cs              \
-  csharp/src/Google.Protobuf.Test/Reflection/TypeRegistryTest.cs             \
-  csharp/src/Google.Protobuf.Test/SampleEnum.cs                              \
-  csharp/src/Google.Protobuf.Test/SampleMessages.cs                          \
-  csharp/src/Google.Protobuf.Test/SampleNaNs.cs                              \
-  csharp/src/Google.Protobuf.Test/TestCornerCases.cs                         \
-  csharp/src/Google.Protobuf.Test.TestProtos/Google.Protobuf.Test.TestProtos.csproj \
-  csharp/src/Google.Protobuf.Test.TestProtos/UnittestIssue6936A.cs              \
-  csharp/src/Google.Protobuf.Test.TestProtos/UnittestIssue6936B.cs              \
-  csharp/src/Google.Protobuf.Test.TestProtos/UnittestIssue6936C.cs              \
-  csharp/src/Google.Protobuf.Test.TestProtos/ForeignMessagePartial.cs           \
-  csharp/src/Google.Protobuf.Test.TestProtos/MapUnittestProto3.cs               \
-  csharp/src/Google.Protobuf.Test.TestProtos/OldExtensions1.cs                  \
-  csharp/src/Google.Protobuf.Test.TestProtos/OldExtensions2.cs                  \
-  csharp/src/Google.Protobuf.Test.TestProtos/TestMessagesProto2.cs              \
-  csharp/src/Google.Protobuf.Test.TestProtos/TestMessagesProto3.cs              \
-  csharp/src/Google.Protobuf.Test.TestProtos/UnittestCustomOptionsProto3.cs     \
-  csharp/src/Google.Protobuf.Test.TestProtos/UnittestImportProto3.cs            \
-  csharp/src/Google.Protobuf.Test.TestProtos/UnittestImportPublicProto3.cs      \
-  csharp/src/Google.Protobuf.Test.TestProtos/UnittestImportPublic.cs            \
-  csharp/src/Google.Protobuf.Test.TestProtos/UnittestImport.cs                  \
-  csharp/src/Google.Protobuf.Test.TestProtos/UnittestIssues.cs                  \
-  csharp/src/Google.Protobuf.Test.TestProtos/UnittestProto3.cs                  \
-  csharp/src/Google.Protobuf.Test.TestProtos/UnittestProto3Optional.cs          \
-  csharp/src/Google.Protobuf.Test.TestProtos/UnittestSelfreferentialOptions.cs  \
-  csharp/src/Google.Protobuf.Test.TestProtos/UnittestWellKnownTypes.cs          \
-  csharp/src/Google.Protobuf.Test.TestProtos/Unittest.cs                        \
-  csharp/src/Google.Protobuf.Test/WellKnownTypes/AnyTest.cs                  \
-  csharp/src/Google.Protobuf.Test/WellKnownTypes/DurationTest.cs             \
-  csharp/src/Google.Protobuf.Test/WellKnownTypes/FieldMaskTest.cs            \
-  csharp/src/Google.Protobuf.Test/WellKnownTypes/TimestampTest.cs            \
-  csharp/src/Google.Protobuf.Test/WellKnownTypes/WrappersTest.cs             \
-  csharp/src/Google.Protobuf.Test/UnknownFieldSetTest.cs                     \
-  csharp/src/Google.Protobuf.Test/testprotos.pb                              \
-  csharp/src/Google.Protobuf.sln                                             \
-  csharp/src/Google.Protobuf/ByteArray.cs                                    \
-  csharp/src/Google.Protobuf/ByteString.cs                                   \
-  csharp/src/Google.Protobuf/ByteStringAsync.cs                              \
-  csharp/src/Google.Protobuf/CodedInputStream.cs                             \
-  csharp/src/Google.Protobuf/CodedOutputStream.ComputeSize.cs                \
-  csharp/src/Google.Protobuf/CodedOutputStream.cs                            \
-  csharp/src/Google.Protobuf/Collections/Lists.cs                            \
-  csharp/src/Google.Protobuf/Collections/MapField.cs                         \
-  csharp/src/Google.Protobuf/Collections/ProtobufEqualityComparers.cs        \
-  csharp/src/Google.Protobuf/Collections/ReadOnlyDictionary.cs               \
-  csharp/src/Google.Protobuf/Collections/RepeatedField.cs                    \
-  csharp/src/Google.Protobuf/Compatibility/DynamicallyAccessedMembersAttribute.cs \
-  csharp/src/Google.Protobuf/Compatibility/DynamicallyAccessedMemberTypes.cs \
-  csharp/src/Google.Protobuf/Compatibility/MethodInfoExtensions.cs           \
-  csharp/src/Google.Protobuf/Compatibility/PropertyInfoExtensions.cs         \
-  csharp/src/Google.Protobuf/Compatibility/RequiresUnreferencedCodeAttribute.cs \
-  csharp/src/Google.Protobuf/Compatibility/StreamExtensions.cs               \
-  csharp/src/Google.Protobuf/Compatibility/TypeExtensions.cs                 \
-  csharp/src/Google.Protobuf/Compatibility/UnconditionalSuppressMessageAttribute.cs \
-  csharp/src/Google.Protobuf/Extension.cs                                    \
-  csharp/src/Google.Protobuf/ExtensionRegistry.cs                            \
-  csharp/src/Google.Protobuf/ExtensionSet.cs                                 \
-  csharp/src/Google.Protobuf/ExtensionValue.cs                               \
-  csharp/src/Google.Protobuf/FieldCodec.cs                                   \
-  csharp/src/Google.Protobuf/FieldMaskTree.cs                                \
-  csharp/src/Google.Protobuf/FrameworkPortability.cs                         \
-  csharp/src/Google.Protobuf/Google.Protobuf.csproj                          \
-  csharp/src/Google.Protobuf/IBufferMessage.cs                               \
-  csharp/src/Google.Protobuf/ICustomDiagnosticMessage.cs                     \
-  csharp/src/Google.Protobuf/IDeepCloneable.cs                               \
-  csharp/src/Google.Protobuf/IExtendableMessage.cs                           \
-  csharp/src/Google.Protobuf/IMessage.cs                                     \
-  csharp/src/Google.Protobuf/InvalidJsonException.cs                         \
-  csharp/src/Google.Protobuf/InvalidProtocolBufferException.cs               \
-  csharp/src/Google.Protobuf/JsonFormatter.cs                                \
-  csharp/src/Google.Protobuf/JsonParser.cs                                   \
-  csharp/src/Google.Protobuf/JsonToken.cs                                    \
-  csharp/src/Google.Protobuf/JsonTokenizer.cs                                \
-  csharp/src/Google.Protobuf/LimitedInputStream.cs                           \
-  csharp/src/Google.Protobuf/MessageExtensions.cs                            \
-  csharp/src/Google.Protobuf/MessageParser.cs                                \
-  csharp/src/Google.Protobuf/ObjectIntPair.cs                                \
-  csharp/src/Google.Protobuf/ParseContext.cs                                 \
-  csharp/src/Google.Protobuf/ParserInternalState.cs                          \
-  csharp/src/Google.Protobuf/ParsingPrimitives.cs                            \
-  csharp/src/Google.Protobuf/ParsingPrimitivesMessages.cs                    \
-  csharp/src/Google.Protobuf/ParsingPrimitivesWrappers.cs                    \
-  csharp/src/Google.Protobuf/ProtoPreconditions.cs                           \
-  csharp/src/Google.Protobuf/SegmentedBufferHelper.cs                        \
-  csharp/src/Google.Protobuf/Properties/AssemblyInfo.cs                      \
-  csharp/src/Google.Protobuf/Reflection/CustomOptions.cs                     \
-  csharp/src/Google.Protobuf/Reflection/Descriptor.cs                        \
-  csharp/src/Google.Protobuf/Reflection/DescriptorBase.cs                    \
-  csharp/src/Google.Protobuf/Reflection/DescriptorDeclaration.cs             \
-  csharp/src/Google.Protobuf/Reflection/DescriptorPool.cs                    \
-  csharp/src/Google.Protobuf/Reflection/DescriptorUtil.cs                    \
-  csharp/src/Google.Protobuf/Reflection/DescriptorValidationException.cs     \
-  csharp/src/Google.Protobuf/Reflection/EnumDescriptor.cs                    \
-  csharp/src/Google.Protobuf/Reflection/EnumValueDescriptor.cs               \
-  csharp/src/Google.Protobuf/Reflection/ExtensionAccessor.cs                 \
-  csharp/src/Google.Protobuf/Reflection/ExtensionCollection.cs               \
-  csharp/src/Google.Protobuf/Reflection/FieldAccessorBase.cs                 \
-  csharp/src/Google.Protobuf/Reflection/FieldDescriptor.cs                   \
-  csharp/src/Google.Protobuf/Reflection/FieldType.cs                         \
-  csharp/src/Google.Protobuf/Reflection/FileDescriptor.cs                    \
-  csharp/src/Google.Protobuf/Reflection/GeneratedClrTypeInfo.cs              \
-  csharp/src/Google.Protobuf/Reflection/IDescriptor.cs                       \
-  csharp/src/Google.Protobuf/Reflection/IFieldAccessor.cs                    \
-  csharp/src/Google.Protobuf/Reflection/MapFieldAccessor.cs                  \
-  csharp/src/Google.Protobuf/Reflection/MessageDescriptor.cs                 \
-  csharp/src/Google.Protobuf/Reflection/MethodDescriptor.cs                  \
-  csharp/src/Google.Protobuf/Reflection/OneofAccessor.cs                     \
-  csharp/src/Google.Protobuf/Reflection/OneofDescriptor.cs                   \
-  csharp/src/Google.Protobuf/Reflection/OriginalNameAttribute.cs             \
-  csharp/src/Google.Protobuf/Reflection/PackageDescriptor.cs                 \
-  csharp/src/Google.Protobuf/Reflection/ReflectionUtil.cs                    \
-  csharp/src/Google.Protobuf/Reflection/RepeatedFieldAccessor.cs             \
-  csharp/src/Google.Protobuf/Reflection/ServiceDescriptor.cs                 \
-  csharp/src/Google.Protobuf/Reflection/SingleFieldAccessor.cs               \
-  csharp/src/Google.Protobuf/Reflection/TypeRegistry.cs                      \
-  csharp/src/Google.Protobuf/WellKnownTypes/Any.cs                           \
-  csharp/src/Google.Protobuf/WellKnownTypes/AnyPartial.cs                    \
-  csharp/src/Google.Protobuf/WellKnownTypes/Api.cs                           \
-  csharp/src/Google.Protobuf/WellKnownTypes/Duration.cs                      \
-  csharp/src/Google.Protobuf/WellKnownTypes/DurationPartial.cs               \
-  csharp/src/Google.Protobuf/WellKnownTypes/Empty.cs                         \
-  csharp/src/Google.Protobuf/WellKnownTypes/FieldMask.cs                     \
-  csharp/src/Google.Protobuf/WellKnownTypes/FieldMaskPartial.cs              \
-  csharp/src/Google.Protobuf/WellKnownTypes/SourceContext.cs                 \
-  csharp/src/Google.Protobuf/WellKnownTypes/Struct.cs                        \
-  csharp/src/Google.Protobuf/WellKnownTypes/TimeExtensions.cs                \
-  csharp/src/Google.Protobuf/WellKnownTypes/Timestamp.cs                     \
-  csharp/src/Google.Protobuf/WellKnownTypes/TimestampPartial.cs              \
-  csharp/src/Google.Protobuf/WellKnownTypes/Type.cs                          \
-  csharp/src/Google.Protobuf/WellKnownTypes/ValuePartial.cs                  \
-  csharp/src/Google.Protobuf/WellKnownTypes/Wrappers.cs                      \
-  csharp/src/Google.Protobuf/WellKnownTypes/WrappersPartial.cs               \
-  csharp/src/Google.Protobuf/WireFormat.cs                                   \
-  csharp/src/Google.Protobuf/WritingPrimitivesMessages.cs                    \
-  csharp/src/Google.Protobuf/WritingPrimitives.cs                            \
-  csharp/src/Google.Protobuf/WriterInternalState.cs                          \
-  csharp/src/Google.Protobuf/WriteContext.cs                                 \
-  csharp/src/Google.Protobuf/WriteBufferHelper.cs                            \
-  csharp/src/Google.Protobuf/UnknownField.cs                                 \
-  csharp/src/Google.Protobuf/UnknownFieldSet.cs                              \
-  csharp/src/Google.Protobuf/UnsafeByteOperations.cs
-
-# Note: please keep this in sync with the dist_files rules under java/.../BUILD.bazel.
-java_EXTRA_DIST=                                                                   \
-  java/README.md                                                                   \
-  java/bom/pom.xml                                                                 \
-  java/core/BUILD.bazel                                                            \
-  java/core/generate-sources-build.xml                                             \
-  java/core/generate-test-sources-build.xml                                        \
-  java/core/pom.xml                                                                \
-  java/core/pom_template.xml                                                       \
-  java/core/src/main/java/com/google/protobuf/AbstractMessage.java                 \
-  java/core/src/main/java/com/google/protobuf/AbstractMessageLite.java             \
-  java/core/src/main/java/com/google/protobuf/AbstractParser.java                  \
-  java/core/src/main/java/com/google/protobuf/AbstractProtobufList.java            \
-  java/core/src/main/java/com/google/protobuf/AllocatedBuffer.java                 \
-  java/core/src/main/java/com/google/protobuf/Android.java                         \
-  java/core/src/main/java/com/google/protobuf/ArrayDecoders.java                   \
-  java/core/src/main/java/com/google/protobuf/BinaryReader.java                    \
-  java/core/src/main/java/com/google/protobuf/BinaryWriter.java                    \
-  java/core/src/main/java/com/google/protobuf/BlockingRpcChannel.java              \
-  java/core/src/main/java/com/google/protobuf/BlockingService.java                 \
-  java/core/src/main/java/com/google/protobuf/BooleanArrayList.java                \
-  java/core/src/main/java/com/google/protobuf/BufferAllocator.java                 \
-  java/core/src/main/java/com/google/protobuf/ByteBufferWriter.java                \
-  java/core/src/main/java/com/google/protobuf/ByteOutput.java                      \
-  java/core/src/main/java/com/google/protobuf/ByteString.java                      \
-  java/core/src/main/java/com/google/protobuf/CanIgnoreReturnValue.java            \
-  java/core/src/main/java/com/google/protobuf/CheckReturnValue.java                \
-  java/core/src/main/java/com/google/protobuf/CodedInputStream.java                \
-  java/core/src/main/java/com/google/protobuf/CodedInputStreamReader.java          \
-  java/core/src/main/java/com/google/protobuf/CodedOutputStream.java               \
-  java/core/src/main/java/com/google/protobuf/CodedOutputStreamWriter.java         \
-  java/core/src/main/java/com/google/protobuf/CompileTimeConstant.java             \
-  java/core/src/main/java/com/google/protobuf/DescriptorMessageInfoFactory.java    \
-  java/core/src/main/java/com/google/protobuf/Descriptors.java                     \
-  java/core/src/main/java/com/google/protobuf/DiscardUnknownFieldsParser.java      \
-  java/core/src/main/java/com/google/protobuf/DoubleArrayList.java                 \
-  java/core/src/main/java/com/google/protobuf/DynamicMessage.java                  \
-  java/core/src/main/java/com/google/protobuf/ExperimentalApi.java                 \
-  java/core/src/main/java/com/google/protobuf/Extension.java                       \
-  java/core/src/main/java/com/google/protobuf/ExtensionLite.java                   \
-  java/core/src/main/java/com/google/protobuf/ExtensionRegistry.java               \
-  java/core/src/main/java/com/google/protobuf/ExtensionRegistryFactory.java        \
-  java/core/src/main/java/com/google/protobuf/ExtensionRegistryLite.java           \
-  java/core/src/main/java/com/google/protobuf/ExtensionSchema.java                 \
-  java/core/src/main/java/com/google/protobuf/ExtensionSchemaFull.java             \
-  java/core/src/main/java/com/google/protobuf/ExtensionSchemaLite.java             \
-  java/core/src/main/java/com/google/protobuf/ExtensionSchemas.java                \
-  java/core/src/main/java/com/google/protobuf/FieldInfo.java                       \
-  java/core/src/main/java/com/google/protobuf/FieldSet.java                        \
-  java/core/src/main/java/com/google/protobuf/FieldType.java                       \
-  java/core/src/main/java/com/google/protobuf/FloatArrayList.java                  \
-  java/core/src/main/java/com/google/protobuf/GeneratedMessage.java                \
-  java/core/src/main/java/com/google/protobuf/GeneratedMessageInfoFactory.java     \
-  java/core/src/main/java/com/google/protobuf/GeneratedMessageLite.java            \
-  java/core/src/main/java/com/google/protobuf/GeneratedMessageV3.java              \
-  java/core/src/main/java/com/google/protobuf/InlineMe.java                        \
-  java/core/src/main/java/com/google/protobuf/IntArrayList.java                    \
-  java/core/src/main/java/com/google/protobuf/Internal.java                        \
-  java/core/src/main/java/com/google/protobuf/InvalidProtocolBufferException.java  \
-  java/core/src/main/java/com/google/protobuf/IterableByteBufferInputStream.java   \
-  java/core/src/main/java/com/google/protobuf/JavaType.java                        \
-  java/core/src/main/java/com/google/protobuf/LazyField.java                       \
-  java/core/src/main/java/com/google/protobuf/LazyFieldLite.java                   \
-  java/core/src/main/java/com/google/protobuf/LazyStringArrayList.java             \
-  java/core/src/main/java/com/google/protobuf/LazyStringList.java                  \
-  java/core/src/main/java/com/google/protobuf/ListFieldSchema.java                 \
-  java/core/src/main/java/com/google/protobuf/LongArrayList.java                   \
-  java/core/src/main/java/com/google/protobuf/ManifestSchemaFactory.java           \
-  java/core/src/main/java/com/google/protobuf/MapEntry.java                        \
-  java/core/src/main/java/com/google/protobuf/MapEntryLite.java                    \
-  java/core/src/main/java/com/google/protobuf/MapField.java                        \
-  java/core/src/main/java/com/google/protobuf/MapFieldLite.java                    \
-  java/core/src/main/java/com/google/protobuf/MapFieldSchema.java                  \
-  java/core/src/main/java/com/google/protobuf/MapFieldSchemaFull.java              \
-  java/core/src/main/java/com/google/protobuf/MapFieldSchemaLite.java              \
-  java/core/src/main/java/com/google/protobuf/MapFieldSchemas.java                 \
-  java/core/src/main/java/com/google/protobuf/Message.java                         \
-  java/core/src/main/java/com/google/protobuf/MessageInfo.java                     \
-  java/core/src/main/java/com/google/protobuf/MessageInfoFactory.java              \
-  java/core/src/main/java/com/google/protobuf/MessageLite.java                     \
-  java/core/src/main/java/com/google/protobuf/MessageLiteOrBuilder.java            \
-  java/core/src/main/java/com/google/protobuf/MessageLiteToString.java             \
-  java/core/src/main/java/com/google/protobuf/MessageOrBuilder.java                \
-  java/core/src/main/java/com/google/protobuf/MessageReflection.java               \
-  java/core/src/main/java/com/google/protobuf/MessageSchema.java                   \
-  java/core/src/main/java/com/google/protobuf/MessageSetSchema.java                \
-  java/core/src/main/java/com/google/protobuf/MutabilityOracle.java                \
-  java/core/src/main/java/com/google/protobuf/NewInstanceSchema.java               \
-  java/core/src/main/java/com/google/protobuf/NewInstanceSchemaFull.java           \
-  java/core/src/main/java/com/google/protobuf/NewInstanceSchemaLite.java           \
-  java/core/src/main/java/com/google/protobuf/NewInstanceSchemas.java              \
-  java/core/src/main/java/com/google/protobuf/NioByteString.java                   \
-  java/core/src/main/java/com/google/protobuf/OneofInfo.java                       \
-  java/core/src/main/java/com/google/protobuf/Parser.java                          \
-  java/core/src/main/java/com/google/protobuf/PrimitiveNonBoxingCollection.java    \
-  java/core/src/main/java/com/google/protobuf/ProtoSyntax.java                     \
-  java/core/src/main/java/com/google/protobuf/Protobuf.java                        \
-  java/core/src/main/java/com/google/protobuf/ProtobufArrayList.java               \
-  java/core/src/main/java/com/google/protobuf/ProtobufLists.java                   \
-  java/core/src/main/java/com/google/protobuf/ProtocolMessageEnum.java             \
-  java/core/src/main/java/com/google/protobuf/ProtocolStringList.java              \
-  java/core/src/main/java/com/google/protobuf/RawMessageInfo.java                  \
-  java/core/src/main/java/com/google/protobuf/Reader.java                          \
-  java/core/src/main/java/com/google/protobuf/RepeatedFieldBuilder.java            \
-  java/core/src/main/java/com/google/protobuf/RepeatedFieldBuilderV3.java          \
-  java/core/src/main/java/com/google/protobuf/RopeByteString.java                  \
-  java/core/src/main/java/com/google/protobuf/RpcCallback.java                     \
-  java/core/src/main/java/com/google/protobuf/RpcChannel.java                      \
-  java/core/src/main/java/com/google/protobuf/RpcController.java                   \
-  java/core/src/main/java/com/google/protobuf/RpcUtil.java                         \
-  java/core/src/main/java/com/google/protobuf/Schema.java                          \
-  java/core/src/main/java/com/google/protobuf/SchemaFactory.java                   \
-  java/core/src/main/java/com/google/protobuf/SchemaUtil.java                      \
-  java/core/src/main/java/com/google/protobuf/Service.java                         \
-  java/core/src/main/java/com/google/protobuf/ServiceException.java                \
-  java/core/src/main/java/com/google/protobuf/SingleFieldBuilder.java              \
-  java/core/src/main/java/com/google/protobuf/SingleFieldBuilderV3.java            \
-  java/core/src/main/java/com/google/protobuf/SmallSortedMap.java                  \
-  java/core/src/main/java/com/google/protobuf/StructuralMessageInfo.java           \
-  java/core/src/main/java/com/google/protobuf/TextFormat.java                      \
-  java/core/src/main/java/com/google/protobuf/TextFormatEscaper.java               \
-  java/core/src/main/java/com/google/protobuf/TextFormatParseInfoTree.java         \
-  java/core/src/main/java/com/google/protobuf/TextFormatParseLocation.java         \
-  java/core/src/main/java/com/google/protobuf/TypeRegistry.java                    \
-  java/core/src/main/java/com/google/protobuf/UninitializedMessageException.java   \
-  java/core/src/main/java/com/google/protobuf/UnknownFieldSchema.java              \
-  java/core/src/main/java/com/google/protobuf/UnknownFieldSet.java                 \
-  java/core/src/main/java/com/google/protobuf/UnknownFieldSetLite.java             \
-  java/core/src/main/java/com/google/protobuf/UnknownFieldSetLiteSchema.java       \
-  java/core/src/main/java/com/google/protobuf/UnknownFieldSetSchema.java           \
-  java/core/src/main/java/com/google/protobuf/UnmodifiableLazyStringList.java      \
-  java/core/src/main/java/com/google/protobuf/UnsafeByteOperations.java            \
-  java/core/src/main/java/com/google/protobuf/UnsafeUtil.java                      \
-  java/core/src/main/java/com/google/protobuf/Utf8.java                            \
-  java/core/src/main/java/com/google/protobuf/WireFormat.java                      \
-  java/core/src/main/java/com/google/protobuf/Writer.java                          \
-  java/core/src/test/java/com/google/protobuf/AbstractMessageTest.java             \
-  java/core/src/test/java/com/google/protobuf/AbstractProto2LiteSchemaTest.java    \
-  java/core/src/test/java/com/google/protobuf/AbstractProto2SchemaTest.java        \
-  java/core/src/test/java/com/google/protobuf/AbstractProto3LiteSchemaTest.java    \
-  java/core/src/test/java/com/google/protobuf/AbstractProto3SchemaTest.java        \
-  java/core/src/test/java/com/google/protobuf/AbstractSchemaTest.java              \
-  java/core/src/test/java/com/google/protobuf/AnyTest.java                         \
-  java/core/src/test/java/com/google/protobuf/ArrayDecodersTest.java               \
-  java/core/src/test/java/com/google/protobuf/BinaryProtocolTest.java              \
-  java/core/src/test/java/com/google/protobuf/BooleanArrayListTest.java            \
-  java/core/src/test/java/com/google/protobuf/BoundedByteStringTest.java           \
-  java/core/src/test/java/com/google/protobuf/ByteBufferWriterTest.java            \
-  java/core/src/test/java/com/google/protobuf/ByteStringTest.java                  \
-  java/core/src/test/java/com/google/protobuf/CachedFieldSizeTest.java             \
-  java/core/src/test/java/com/google/protobuf/CheckUtf8Test.java                   \
-  java/core/src/test/java/com/google/protobuf/CodedAdapterTest.java                \
-  java/core/src/test/java/com/google/protobuf/CodedInputStreamTest.java            \
-  java/core/src/test/java/com/google/protobuf/CodedOutputStreamTest.java           \
-  java/core/src/test/java/com/google/protobuf/DecodeUtf8Test.java                  \
-  java/core/src/test/java/com/google/protobuf/DeprecatedFieldTest.java             \
-  java/core/src/test/java/com/google/protobuf/DescriptorsTest.java                 \
-  java/core/src/test/java/com/google/protobuf/DiscardUnknownFieldsTest.java        \
-  java/core/src/test/java/com/google/protobuf/DoubleArrayListTest.java             \
-  java/core/src/test/java/com/google/protobuf/DynamicMessageTest.java              \
-  java/core/src/test/java/com/google/protobuf/EnumTest.java                        \
-  java/core/src/test/java/com/google/protobuf/ExperimentalMessageFactory.java      \
-  java/core/src/test/java/com/google/protobuf/ExperimentalSerializationUtil.java   \
-  java/core/src/test/java/com/google/protobuf/ExperimentalTestDataProvider.java    \
-  java/core/src/test/java/com/google/protobuf/ExtensionRegistryFactoryTest.java    \
-  java/core/src/test/java/com/google/protobuf/FieldPresenceTest.java               \
-  java/core/src/test/java/com/google/protobuf/FloatArrayListTest.java              \
-  java/core/src/test/java/com/google/protobuf/GeneratedMessageTest.java            \
-  java/core/src/test/java/com/google/protobuf/IntArrayListTest.java                \
-  java/core/src/test/java/com/google/protobuf/InvalidProtocolBufferExceptionTest.java \
-  java/core/src/test/java/com/google/protobuf/IsValidUtf8Test.java                 \
-  java/core/src/test/java/com/google/protobuf/IsValidUtf8TestUtil.java             \
-  java/core/src/test/java/com/google/protobuf/LazyFieldLiteTest.java               \
-  java/core/src/test/java/com/google/protobuf/LazyFieldTest.java                   \
-  java/core/src/test/java/com/google/protobuf/LazyMessageLiteTest.java             \
-  java/core/src/test/java/com/google/protobuf/LazyStringArrayListTest.java         \
-  java/core/src/test/java/com/google/protobuf/LazyStringEndToEndTest.java          \
-  java/core/src/test/java/com/google/protobuf/LiteEqualsAndHashTest.java           \
-  java/core/src/test/java/com/google/protobuf/LiteralByteStringTest.java           \
-  java/core/src/test/java/com/google/protobuf/LongArrayListTest.java               \
-  java/core/src/test/java/com/google/protobuf/MapForProto2LiteTest.java            \
-  java/core/src/test/java/com/google/protobuf/MapForProto2Test.java                \
-  java/core/src/test/java/com/google/protobuf/MapLiteTest.java                     \
-  java/core/src/test/java/com/google/protobuf/MapTest.java                         \
-  java/core/src/test/java/com/google/protobuf/MessageTest.java                     \
-  java/core/src/test/java/com/google/protobuf/NestedBuildersTest.java              \
-  java/core/src/test/java/com/google/protobuf/NioByteStringTest.java               \
-  java/core/src/test/java/com/google/protobuf/PackedFieldTest.java                 \
-  java/core/src/test/java/com/google/protobuf/ParseExceptionsTest.java             \
-  java/core/src/test/java/com/google/protobuf/ParserLiteTest.java                  \
-  java/core/src/test/java/com/google/protobuf/ParserTest.java                      \
-  java/core/src/test/java/com/google/protobuf/Proto2ExtensionLookupSchemaTest.java \
-  java/core/src/test/java/com/google/protobuf/Proto2LiteSchemaTest.java            \
-  java/core/src/test/java/com/google/protobuf/Proto2MessageFactory.java            \
-  java/core/src/test/java/com/google/protobuf/Proto2MessageLiteFactory.java        \
-  java/core/src/test/java/com/google/protobuf/Proto2SchemaTest.java                \
-  java/core/src/test/java/com/google/protobuf/Proto2UnknownEnumValueTest.java      \
-  java/core/src/test/java/com/google/protobuf/Proto3LiteSchemaTest.java            \
-  java/core/src/test/java/com/google/protobuf/Proto3MessageFactory.java            \
-  java/core/src/test/java/com/google/protobuf/Proto3MessageLiteFactory.java        \
-  java/core/src/test/java/com/google/protobuf/Proto3SchemaTest.java                \
-  java/core/src/test/java/com/google/protobuf/ProtobufArrayListTest.java           \
-  java/core/src/test/java/com/google/protobuf/RepeatedFieldBuilderV3Test.java      \
-  java/core/src/test/java/com/google/protobuf/RopeByteStringSubstringTest.java     \
-  java/core/src/test/java/com/google/protobuf/RopeByteStringTest.java              \
-  java/core/src/test/java/com/google/protobuf/ServiceTest.java                     \
-  java/core/src/test/java/com/google/protobuf/SingleFieldBuilderV3Test.java        \
-  java/core/src/test/java/com/google/protobuf/SmallSortedMapTest.java              \
-  java/core/src/test/java/com/google/protobuf/TestBadIdentifiers.java              \
-  java/core/src/test/java/com/google/protobuf/TestBadIdentifiersLite.java          \
-  java/core/src/test/java/com/google/protobuf/TestSchemas.java                     \
-  java/core/src/test/java/com/google/protobuf/TestSchemasLite.java                 \
-  java/core/src/test/java/com/google/protobuf/TestUtil.java                        \
-  java/core/src/test/java/com/google/protobuf/TestUtilLite.java                    \
-  java/core/src/test/java/com/google/protobuf/TextFormatParseInfoTreeTest.java     \
-  java/core/src/test/java/com/google/protobuf/TextFormatParseLocationTest.java     \
-  java/core/src/test/java/com/google/protobuf/TextFormatTest.java                  \
-  java/core/src/test/java/com/google/protobuf/TypeRegistryTest.java                \
-  java/core/src/test/java/com/google/protobuf/UnknownEnumValueTest.java            \
-  java/core/src/test/java/com/google/protobuf/UnknownFieldSetTest.java             \
-  java/core/src/test/java/com/google/protobuf/UnknownFieldSetPerformanceTest.java             \
-  java/core/src/test/java/com/google/protobuf/UnmodifiableLazyStringListTest.java  \
-  java/core/src/test/java/com/google/protobuf/Utf8Test.java                        \
-  java/core/src/test/java/com/google/protobuf/WellKnownTypesTest.java              \
-  java/core/src/test/java/com/google/protobuf/WireFormatLiteTest.java              \
-  java/core/src/test/java/com/google/protobuf/WireFormatTest.java                  \
-  java/core/src/test/java/com/google/protobuf/WrappersLiteOfMethodTest.java        \
-  java/core/src/test/java/com/google/protobuf/WrappersOfMethodTest.java            \
-  java/core/src/test/proto/com/google/protobuf/any_test.proto                      \
-  java/core/src/test/proto/com/google/protobuf/cached_field_size_test.proto        \
-  java/core/src/test/proto/com/google/protobuf/deprecated_file.proto               \
-  java/core/src/test/proto/com/google/protobuf/dynamic_message_test.proto          \
-  java/core/src/test/proto/com/google/protobuf/field_presence_test.proto           \
-  java/core/src/test/proto/com/google/protobuf/lazy_fields_lite.proto              \
-  java/core/src/test/proto/com/google/protobuf/lite_equals_and_hash.proto          \
-  java/core/src/test/proto/com/google/protobuf/map_for_proto2_lite_test.proto      \
-  java/core/src/test/proto/com/google/protobuf/map_for_proto2_test.proto           \
-  java/core/src/test/proto/com/google/protobuf/map_initialization_order_test.proto \
-  java/core/src/test/proto/com/google/protobuf/map_lite_test.proto                 \
-  java/core/src/test/proto/com/google/protobuf/map_test.proto                      \
-  java/core/src/test/proto/com/google/protobuf/multiple_files_test.proto           \
-  java/core/src/test/proto/com/google/protobuf/nested_builders_test.proto          \
-  java/core/src/test/proto/com/google/protobuf/nested_extension.proto              \
-  java/core/src/test/proto/com/google/protobuf/nested_extension_lite.proto         \
-  java/core/src/test/proto/com/google/protobuf/non_nested_extension.proto          \
-  java/core/src/test/proto/com/google/protobuf/non_nested_extension_lite.proto     \
-  java/core/src/test/proto/com/google/protobuf/outer_class_name_test.proto         \
-  java/core/src/test/proto/com/google/protobuf/outer_class_name_test2.proto        \
-  java/core/src/test/proto/com/google/protobuf/outer_class_name_test3.proto        \
-  java/core/src/test/proto/com/google/protobuf/packed_field_test.proto             \
-  java/core/src/test/proto/com/google/protobuf/proto2_message.proto                \
-  java/core/src/test/proto/com/google/protobuf/proto2_message_lite.proto           \
-  java/core/src/test/proto/com/google/protobuf/proto2_unknown_enum_values.proto    \
-  java/core/src/test/proto/com/google/protobuf/proto3_message.proto                \
-  java/core/src/test/proto/com/google/protobuf/proto3_message_lite.proto           \
-  java/core/src/test/proto/com/google/protobuf/test_bad_identifiers.proto          \
-  java/core/src/test/proto/com/google/protobuf/test_check_utf8.proto               \
-  java/core/src/test/proto/com/google/protobuf/test_check_utf8_size.proto          \
-  java/core/src/test/proto/com/google/protobuf/test_custom_options.proto           \
-  java/core/src/test/proto/com/google/protobuf/wrappers_test.proto                 \
-  java/internal/BUILD.bazel                                                        \
-  java/internal/testing.bzl                                                        \
-  java/kotlin/BUILD.bazel                                                          \
-  java/kotlin/generate-sources-build.xml                                           \
-  java/kotlin/generate-test-sources-build.xml                                      \
-  java/kotlin/pom.xml                                                              \
-  java/kotlin/pom_template.xml                                                     \
-  java/kotlin/src/main/kotlin/com/google/protobuf/Anies.kt                         \
-  java/kotlin/src/main/kotlin/com/google/protobuf/ByteStrings.kt                   \
-  java/kotlin/src/main/kotlin/com/google/protobuf/DslList.kt                       \
-  java/kotlin/src/main/kotlin/com/google/protobuf/DslMap.kt                        \
-  java/kotlin/src/main/kotlin/com/google/protobuf/DslProxy.kt                      \
-  java/kotlin/src/main/kotlin/com/google/protobuf/ExtendableMessageExtensions.kt   \
-  java/kotlin/src/main/kotlin/com/google/protobuf/ExtensionList.kt                 \
-  java/kotlin/src/main/kotlin/com/google/protobuf/OnlyForUseByGeneratedProtoCode.kt\
-  java/kotlin/src/main/kotlin/com/google/protobuf/ProtoDslMarker.kt                \
-  java/kotlin/src/main/kotlin/com/google/protobuf/UnmodifiableCollections.kt       \
-  java/kotlin/src/test/kotlin/com/google/protobuf/AniesTest.kt                     \
-  java/kotlin/src/test/kotlin/com/google/protobuf/ByteStringsTest.kt               \
-  java/kotlin/src/test/kotlin/com/google/protobuf/DslListTest.kt                   \
-  java/kotlin/src/test/kotlin/com/google/protobuf/DslMapTest.kt                    \
-  java/kotlin/src/test/kotlin/com/google/protobuf/ExtendableMessageExtensionsTest.kt\
-  java/kotlin/src/test/kotlin/com/google/protobuf/ExtensionListTest.kt             \
-  java/kotlin/src/test/kotlin/com/google/protobuf/Proto2Test.kt                    \
-  java/kotlin/src/test/kotlin/com/google/protobuf/Proto3Test.kt                    \
-  java/kotlin/src/test/proto/com/google/protobuf/evil_names_proto2.proto           \
-  java/kotlin/src/test/proto/com/google/protobuf/evil_names_proto3.proto           \
-  java/kotlin/src/test/proto/com/google/protobuf/example_extensible_message.proto  \
-  java/kotlin/src/test/proto/com/google/protobuf/multiple_files_proto3.proto       \
-  java/kotlin-lite/BUILD.bazel                                                     \
-  java/kotlin-lite/generate-sources-build.xml                                      \
-  java/kotlin-lite/generate-test-sources-build.xml                                 \
-  java/kotlin-lite/lite.awk                                                        \
-  java/kotlin-lite/pom.xml                                                         \
-  java/kotlin-lite/pom_template.xml                                                \
-  java/kotlin-lite/process-lite-sources-build.xml                                  \
-  java/kotlin-lite/src/main/kotlin/com/google/protobuf/ExtendableMessageLiteExtensions.kt\
-  java/kotlin-lite/src/test/kotlin/com/google/protobuf/ExtendableMessageLiteExtensionsTest.kt\
-  java/kotlin-lite/src/test/kotlin/com/google/protobuf/Proto2LiteTest.kt           \
-  java/lite.md                                                                     \
-  java/lite/BUILD.bazel                                                            \
-  java/lite/generate-sources-build.xml                                             \
-  java/lite/generate-test-sources-build.xml                                        \
-  java/lite/lite.awk                                                               \
-  java/lite/pom.xml                                                                \
-  java/lite/pom_template.xml                                                       \
-  java/lite/process-lite-sources-build.xml                                         \
-  java/lite/src/test/java/com/google/protobuf/LiteTest.java                        \
-  java/BUILD.bazel                                                                 \
-  java/pom.xml                                                                     \
-  java/util/BUILD.bazel                                                            \
-  java/util/pom.xml                                                                \
-  java/util/pom_template.xml                                                       \
-  java/util/src/main/java/com/google/protobuf/util/Durations.java                  \
-  java/util/src/main/java/com/google/protobuf/util/FieldMaskTree.java              \
-  java/util/src/main/java/com/google/protobuf/util/FieldMaskUtil.java              \
-  java/util/src/main/java/com/google/protobuf/util/JsonFormat.java                 \
-  java/util/src/main/java/com/google/protobuf/util/Structs.java                    \
-  java/util/src/main/java/com/google/protobuf/util/Timestamps.java                 \
-  java/util/src/main/java/com/google/protobuf/util/Values.java                     \
-  java/util/src/test/java/com/google/protobuf/util/DurationsTest.java              \
-  java/util/src/test/java/com/google/protobuf/util/FieldMaskTreeTest.java          \
-  java/util/src/test/java/com/google/protobuf/util/FieldMaskUtilTest.java          \
-  java/util/src/test/java/com/google/protobuf/util/JsonFormatTest.java             \
-  java/util/src/test/java/com/google/protobuf/util/StructsTest.java                \
-  java/util/src/test/java/com/google/protobuf/util/TimestampsTest.java             \
-  java/util/src/test/java/com/google/protobuf/util/ValuesTest.java                 \
-  java/util/src/test/proto/com/google/protobuf/util/json_test.proto
-
-# Note: please keep this in sync with the dist_files rule in objectivec/BUILD.bazel.
-objectivec_EXTRA_DIST=                                                       \
-  objectivec/.clang-format                                                   \
-  objectivec/BUILD.bazel                                                     \
-  objectivec/DevTools/check_version_stamps.sh                                \
-  objectivec/DevTools/compile_testing_protos.sh                              \
-  objectivec/DevTools/full_mac_build.sh                                      \
-  objectivec/DevTools/pddm.py                                                \
-  objectivec/DevTools/pddm_tests.py                                          \
-  objectivec/generate_well_known_types.sh                                    \
-  objectivec/google/protobuf/Any.pbobjc.h                                    \
-  objectivec/google/protobuf/Api.pbobjc.h                                    \
-  objectivec/google/protobuf/Duration.pbobjc.h                               \
-  objectivec/google/protobuf/Empty.pbobjc.h                                  \
-  objectivec/google/protobuf/FieldMask.pbobjc.h                              \
-  objectivec/google/protobuf/SourceContext.pbobjc.h                          \
-  objectivec/google/protobuf/Struct.pbobjc.h                                 \
-  objectivec/google/protobuf/Timestamp.pbobjc.h                              \
-  objectivec/google/protobuf/Type.pbobjc.h                                   \
-  objectivec/google/protobuf/Wrappers.pbobjc.h                               \
-  objectivec/GPBAny.pbobjc.h                                                 \
-  objectivec/GPBAny.pbobjc.m                                                 \
-  objectivec/GPBApi.pbobjc.h                                                 \
-  objectivec/GPBApi.pbobjc.m                                                 \
-  objectivec/GPBArray.h                                                      \
-  objectivec/GPBArray.m                                                      \
-  objectivec/GPBArray_PackagePrivate.h                                       \
-  objectivec/GPBBootstrap.h                                                  \
-  objectivec/GPBCodedInputStream.h                                           \
-  objectivec/GPBCodedInputStream.m                                           \
-  objectivec/GPBCodedInputStream_PackagePrivate.h                            \
-  objectivec/GPBCodedOutputStream.h                                          \
-  objectivec/GPBCodedOutputStream.m                                          \
-  objectivec/GPBCodedOutputStream_PackagePrivate.h                           \
-  objectivec/GPBDescriptor.h                                                 \
-  objectivec/GPBDescriptor.m                                                 \
-  objectivec/GPBDescriptor_PackagePrivate.h                                  \
-  objectivec/GPBDictionary.h                                                 \
-  objectivec/GPBDictionary.m                                                 \
-  objectivec/GPBDictionary_PackagePrivate.h                                  \
-  objectivec/GPBDuration.pbobjc.h                                            \
-  objectivec/GPBDuration.pbobjc.m                                            \
-  objectivec/GPBEmpty.pbobjc.h                                               \
-  objectivec/GPBEmpty.pbobjc.m                                               \
-  objectivec/GPBExtensionInternals.h                                         \
-  objectivec/GPBExtensionInternals.m                                         \
-  objectivec/GPBExtensionRegistry.h                                          \
-  objectivec/GPBExtensionRegistry.m                                          \
-  objectivec/GPBFieldMask.pbobjc.h                                           \
-  objectivec/GPBFieldMask.pbobjc.m                                           \
-  objectivec/GPBMessage.h                                                    \
-  objectivec/GPBMessage.m                                                    \
-  objectivec/GPBMessage_PackagePrivate.h                                     \
-  objectivec/GPBProtocolBuffers.h                                            \
-  objectivec/GPBProtocolBuffers.m                                            \
-  objectivec/GPBProtocolBuffers_RuntimeSupport.h                             \
-  objectivec/GPBRootObject.h                                                 \
-  objectivec/GPBRootObject.m                                                 \
-  objectivec/GPBRootObject_PackagePrivate.h                                  \
-  objectivec/GPBRuntimeTypes.h                                               \
-  objectivec/GPBSourceContext.pbobjc.h                                       \
-  objectivec/GPBSourceContext.pbobjc.m                                       \
-  objectivec/GPBStruct.pbobjc.h                                              \
-  objectivec/GPBStruct.pbobjc.m                                              \
-  objectivec/GPBTimestamp.pbobjc.h                                           \
-  objectivec/GPBTimestamp.pbobjc.m                                           \
-  objectivec/GPBType.pbobjc.h                                                \
-  objectivec/GPBType.pbobjc.m                                                \
-  objectivec/GPBUnknownField.h                                               \
-  objectivec/GPBUnknownField.m                                               \
-  objectivec/GPBUnknownField_PackagePrivate.h                                \
-  objectivec/GPBUnknownFieldSet.h                                            \
-  objectivec/GPBUnknownFieldSet.m                                            \
-  objectivec/GPBUnknownFieldSet_PackagePrivate.h                             \
-  objectivec/GPBUtilities.h                                                  \
-  objectivec/GPBUtilities.m                                                  \
-  objectivec/GPBUtilities_PackagePrivate.h                                   \
-  objectivec/GPBWellKnownTypes.h                                             \
-  objectivec/GPBWellKnownTypes.m                                             \
-  objectivec/GPBWireFormat.h                                                 \
-  objectivec/GPBWireFormat.m                                                 \
-  objectivec/GPBWrappers.pbobjc.h                                            \
-  objectivec/GPBWrappers.pbobjc.m                                            \
-  objectivec/ProtocolBuffers_iOS.xcodeproj/project.pbxproj                   \
-  objectivec/ProtocolBuffers_iOS.xcodeproj/project.xcworkspace/contents.xcworkspacedata \
-  objectivec/ProtocolBuffers_iOS.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist \
-  objectivec/ProtocolBuffers_iOS.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings \
-  objectivec/ProtocolBuffers_iOS.xcodeproj/xcshareddata/xcschemes/PerformanceTests.xcscheme \
-  objectivec/ProtocolBuffers_iOS.xcodeproj/xcshareddata/xcschemes/ProtocolBuffers.xcscheme \
-  objectivec/ProtocolBuffers_OSX.xcodeproj/project.pbxproj                   \
-  objectivec/ProtocolBuffers_OSX.xcodeproj/project.xcworkspace/contents.xcworkspacedata \
-  objectivec/ProtocolBuffers_OSX.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist \
-  objectivec/ProtocolBuffers_OSX.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings \
-  objectivec/ProtocolBuffers_OSX.xcodeproj/xcshareddata/xcschemes/PerformanceTests.xcscheme \
-  objectivec/ProtocolBuffers_OSX.xcodeproj/xcshareddata/xcschemes/ProtocolBuffers.xcscheme \
-  objectivec/ProtocolBuffers_tvOS.xcodeproj/project.pbxproj                  \
-  objectivec/ProtocolBuffers_tvOS.xcodeproj/project.xcworkspace/contents.xcworkspacedata \
-  objectivec/ProtocolBuffers_tvOS.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist \
-  objectivec/ProtocolBuffers_tvOS.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings \
-  objectivec/ProtocolBuffers_tvOS.xcodeproj/xcshareddata/xcschemes/PerformanceTests.xcscheme \
-  objectivec/ProtocolBuffers_tvOS.xcodeproj/xcshareddata/xcschemes/ProtocolBuffers.xcscheme \
-  objectivec/README.md                                                       \
-  objectivec/Tests/golden_message                                            \
-  objectivec/Tests/golden_packed_fields_message                              \
-  objectivec/Tests/GPBARCUnittestProtos.m                                    \
-  objectivec/Tests/GPBArrayTests.m                                           \
-  objectivec/Tests/GPBCodedInputStreamTests.m                                \
-  objectivec/Tests/GPBCodedOuputStreamTests.m                                \
-  objectivec/Tests/GPBCompileTest01.m                                        \
-  objectivec/Tests/GPBCompileTest02.m                                        \
-  objectivec/Tests/GPBCompileTest03.m                                        \
-  objectivec/Tests/GPBCompileTest04.m                                        \
-  objectivec/Tests/GPBCompileTest05.m                                        \
-  objectivec/Tests/GPBCompileTest06.m                                        \
-  objectivec/Tests/GPBCompileTest07.m                                        \
-  objectivec/Tests/GPBCompileTest08.m                                        \
-  objectivec/Tests/GPBCompileTest09.m                                        \
-  objectivec/Tests/GPBCompileTest10.m                                        \
-  objectivec/Tests/GPBCompileTest11.m                                        \
-  objectivec/Tests/GPBCompileTest12.m                                        \
-  objectivec/Tests/GPBCompileTest13.m                                        \
-  objectivec/Tests/GPBCompileTest14.m                                        \
-  objectivec/Tests/GPBCompileTest15.m                                        \
-  objectivec/Tests/GPBCompileTest16.m                                        \
-  objectivec/Tests/GPBCompileTest17.m                                        \
-  objectivec/Tests/GPBCompileTest18.m                                        \
-  objectivec/Tests/GPBCompileTest19.m                                        \
-  objectivec/Tests/GPBCompileTest20.m                                        \
-  objectivec/Tests/GPBCompileTest21.m                                        \
-  objectivec/Tests/GPBCompileTest22.m                                        \
-  objectivec/Tests/GPBCompileTest23.m                                        \
-  objectivec/Tests/GPBCompileTest24.m                                        \
-  objectivec/Tests/GPBCompileTest25.m                                        \
-  objectivec/Tests/GPBConcurrencyTests.m                                     \
-  objectivec/Tests/GPBDescriptorTests.m                                      \
-  objectivec/Tests/GPBDictionaryTests+Bool.m                                 \
-  objectivec/Tests/GPBDictionaryTests+Int32.m                                \
-  objectivec/Tests/GPBDictionaryTests+Int64.m                                \
-  objectivec/Tests/GPBDictionaryTests+String.m                               \
-  objectivec/Tests/GPBDictionaryTests+UInt32.m                               \
-  objectivec/Tests/GPBDictionaryTests+UInt64.m                               \
-  objectivec/Tests/GPBDictionaryTests.m                                      \
-  objectivec/Tests/GPBDictionaryTests.pddm                                   \
-  objectivec/Tests/GPBExtensionRegistryTest.m                                \
-  objectivec/Tests/GPBMessageTests+ClassNames.m                              \
-  objectivec/Tests/GPBMessageTests+Merge.m                                   \
-  objectivec/Tests/GPBMessageTests+Runtime.m                                 \
-  objectivec/Tests/GPBMessageTests+Serialization.m                           \
-  objectivec/Tests/GPBMessageTests.m                                         \
-  objectivec/Tests/GPBObjectiveCPlusPlusTest.mm                              \
-  objectivec/Tests/GPBPerfTests.m                                            \
-  objectivec/Tests/GPBSwiftTests.swift                                       \
-  objectivec/Tests/GPBTestUtilities.h                                        \
-  objectivec/Tests/GPBTestUtilities.m                                        \
-  objectivec/Tests/GPBUnittestProtos.m                                       \
-  objectivec/Tests/GPBUnittestProtos2.m                                      \
-  objectivec/Tests/GPBUnknownFieldSetTest.m                                  \
-  objectivec/Tests/GPBUtilitiesTests.m                                       \
-  objectivec/Tests/GPBWellKnownTypesTest.m                                   \
-  objectivec/Tests/GPBWireFormatTests.m                                      \
-  objectivec/Tests/text_format_extensions_unittest_data.txt                   \
-  objectivec/Tests/text_format_map_unittest_data.txt                          \
-  objectivec/Tests/text_format_unittest_data.txt                              \
-  objectivec/Tests/unittest_cycle.proto                                       \
-  objectivec/Tests/unittest_deprecated.proto                                  \
-  objectivec/Tests/unittest_deprecated_file.proto                             \
-  objectivec/Tests/unittest_extension_chain_a.proto                           \
-  objectivec/Tests/unittest_extension_chain_b.proto                           \
-  objectivec/Tests/unittest_extension_chain_c.proto                           \
-  objectivec/Tests/unittest_extension_chain_d.proto                           \
-  objectivec/Tests/unittest_extension_chain_e.proto                           \
-  objectivec/Tests/unittest_extension_chain_f.proto                           \
-  objectivec/Tests/unittest_extension_chain_g.proto                           \
-  objectivec/Tests/unittest_objc.proto                                        \
-  objectivec/Tests/unittest_objc_options.proto                                \
-  objectivec/Tests/unittest_objc_startup.proto                                \
-  objectivec/Tests/unittest_runtime_proto2.proto                              \
-  objectivec/Tests/unittest_runtime_proto3.proto                              \
-  objectivec/Tests/UnitTests-Bridging-Header.h                                \
-  objectivec/Tests/UnitTests-Info.plist                                       \
-  Protobuf.podspec
-
-# Note: please keep this in sync with the dist_files rule in php/BUILD.bazel.
-php_EXTRA_DIST=                                                       \
-  php/README.md                                                       \
-  php/REFCOUNTING.md                                                  \
-  php/composer.json                                                   \
-  php/composer.json.dist                                              \
-  php/ext/google/protobuf/arena.c                                     \
-  php/ext/google/protobuf/arena.h                                     \
-  php/ext/google/protobuf/array.c                                     \
-  php/ext/google/protobuf/array.h                                     \
-  php/ext/google/protobuf/config.m4                                   \
-  php/ext/google/protobuf/convert.c                                   \
-  php/ext/google/protobuf/convert.h                                   \
-  php/ext/google/protobuf/def.c                                       \
-  php/ext/google/protobuf/def.h                                       \
-  php/ext/google/protobuf/generate_package_xml.sh                     \
-  php/ext/google/protobuf/map.c                                       \
-  php/ext/google/protobuf/map.h                                       \
-  php/ext/google/protobuf/message.c                                   \
-  php/ext/google/protobuf/message.h                                   \
-  php/ext/google/protobuf/names.c                                     \
-  php/ext/google/protobuf/names.h                                     \
-  php/ext/google/protobuf/php-upb.c                                   \
-  php/ext/google/protobuf/php-upb.h                                   \
-  php/ext/google/protobuf/php_protobuf.h                              \
-  php/ext/google/protobuf/protobuf.c                                  \
-  php/ext/google/protobuf/protobuf.h                                  \
-  php/ext/google/protobuf/template_package.xml                        \
-  php/ext/google/protobuf/wkt.inc                                     \
-  php/ext/google/protobuf/tests/unnecessary_zval.phpt                 \
-  php/generate_descriptor_protos.sh                                   \
-  php/generate_test_protos.sh                                         \
-  php/release.sh                                                      \
-  php/src/GPBMetadata/Google/Protobuf/Any.php                         \
-  php/src/GPBMetadata/Google/Protobuf/Api.php                         \
-  php/src/GPBMetadata/Google/Protobuf/Duration.php                    \
-  php/src/GPBMetadata/Google/Protobuf/FieldMask.php                   \
-  php/src/GPBMetadata/Google/Protobuf/GPBEmpty.php                    \
-  php/src/GPBMetadata/Google/Protobuf/Internal/Descriptor.php         \
-  php/src/GPBMetadata/Google/Protobuf/SourceContext.php               \
-  php/src/GPBMetadata/Google/Protobuf/Struct.php                      \
-  php/src/GPBMetadata/Google/Protobuf/Timestamp.php                   \
-  php/src/GPBMetadata/Google/Protobuf/Type.php                        \
-  php/src/GPBMetadata/Google/Protobuf/Wrappers.php                    \
-  php/src/Google/Protobuf/Any.php                                     \
-  php/src/Google/Protobuf/Api.php                                     \
-  php/src/Google/Protobuf/BoolValue.php                               \
-  php/src/Google/Protobuf/BytesValue.php                              \
-  php/src/Google/Protobuf/Descriptor.php                              \
-  php/src/Google/Protobuf/DescriptorPool.php                          \
-  php/src/Google/Protobuf/DoubleValue.php                             \
-  php/src/Google/Protobuf/Duration.php                                \
-  php/src/Google/Protobuf/Enum.php                                    \
-  php/src/Google/Protobuf/EnumDescriptor.php                          \
-  php/src/Google/Protobuf/EnumValue.php                               \
-  php/src/Google/Protobuf/EnumValueDescriptor.php                     \
-  php/src/Google/Protobuf/Field.php                                   \
-  php/src/Google/Protobuf/FieldDescriptor.php                         \
-  php/src/Google/Protobuf/FieldMask.php                               \
-  php/src/Google/Protobuf/Field/Cardinality.php                       \
-  php/src/Google/Protobuf/Field_Cardinality.php                       \
-  php/src/Google/Protobuf/Field/Kind.php                              \
-  php/src/Google/Protobuf/Field_Kind.php                              \
-  php/src/Google/Protobuf/FloatValue.php                              \
-  php/src/Google/Protobuf/GPBEmpty.php                                \
-  php/src/Google/Protobuf/Int32Value.php                              \
-  php/src/Google/Protobuf/Int64Value.php                              \
-  php/src/Google/Protobuf/Internal/AnyBase.php                        \
-  php/src/Google/Protobuf/Internal/CodedInputStream.php               \
-  php/src/Google/Protobuf/Internal/CodedOutputStream.php              \
-  php/src/Google/Protobuf/Internal/Descriptor.php                     \
-  php/src/Google/Protobuf/Internal/DescriptorPool.php                 \
-  php/src/Google/Protobuf/Internal/DescriptorProto.php                \
-  php/src/Google/Protobuf/Internal/DescriptorProto/ExtensionRange.php \
-  php/src/Google/Protobuf/Internal/DescriptorProto/ReservedRange.php  \
-  php/src/Google/Protobuf/Internal/EnumBuilderContext.php             \
-  php/src/Google/Protobuf/Internal/EnumDescriptor.php                 \
-  php/src/Google/Protobuf/Internal/EnumDescriptorProto.php            \
-  php/src/Google/Protobuf/Internal/EnumDescriptorProto/EnumReservedRange.php \
-  php/src/Google/Protobuf/Internal/EnumOptions.php                    \
-  php/src/Google/Protobuf/Internal/EnumValueDescriptorProto.php       \
-  php/src/Google/Protobuf/Internal/EnumValueOptions.php               \
-  php/src/Google/Protobuf/Internal/ExtensionRangeOptions.php          \
-  php/src/Google/Protobuf/Internal/FieldDescriptorProto.php           \
-  php/src/Google/Protobuf/Internal/FieldDescriptor.php                \
-  php/src/Google/Protobuf/Internal/FieldDescriptorProto.php           \
-  php/src/Google/Protobuf/Internal/FieldDescriptorProto/Label.php     \
-  php/src/Google/Protobuf/Internal/FieldDescriptorProto/Type.php      \
-  php/src/Google/Protobuf/Internal/FieldOptions.php                   \
-  php/src/Google/Protobuf/Internal/FieldOptions/CType.php             \
-  php/src/Google/Protobuf/Internal/FieldOptions/JSType.php            \
-  php/src/Google/Protobuf/Internal/FileDescriptor.php                 \
-  php/src/Google/Protobuf/Internal/FileDescriptorProto.php            \
-  php/src/Google/Protobuf/Internal/FileDescriptorSet.php              \
-  php/src/Google/Protobuf/Internal/FileOptions.php                    \
-  php/src/Google/Protobuf/Internal/FileOptions/OptimizeMode.php       \
-  php/src/Google/Protobuf/Internal/GPBDecodeException.php             \
-  php/src/Google/Protobuf/Internal/GPBJsonWire.php                    \
-  php/src/Google/Protobuf/Internal/GPBLabel.php                       \
-  php/src/Google/Protobuf/Internal/GPBType.php                        \
-  php/src/Google/Protobuf/Internal/GPBUtil.php                        \
-  php/src/Google/Protobuf/Internal/GPBWire.php                        \
-  php/src/Google/Protobuf/Internal/GPBWireType.php                    \
-  php/src/Google/Protobuf/Internal/GeneratedCodeInfo.php              \
-  php/src/Google/Protobuf/Internal/GeneratedCodeInfo/Annotation.php   \
-  php/src/Google/Protobuf/Internal/GetPublicDescriptorTrait.php       \
-  php/src/Google/Protobuf/Internal/HasPublicDescriptorTrait.php       \
-  php/src/Google/Protobuf/Internal/MapEntry.php                       \
-  php/src/Google/Protobuf/Internal/MapField.php                       \
-  php/src/Google/Protobuf/Internal/MapFieldIter.php                   \
-  php/src/Google/Protobuf/Internal/Message.php                        \
-  php/src/Google/Protobuf/Internal/MessageBuilderContext.php          \
-  php/src/Google/Protobuf/Internal/MessageOptions.php                 \
-  php/src/Google/Protobuf/Internal/MethodDescriptorProto.php          \
-  php/src/Google/Protobuf/Internal/MethodOptions.php                  \
-  php/src/Google/Protobuf/Internal/MethodOptions/IdempotencyLevel.php \
-  php/src/Google/Protobuf/Internal/OneofDescriptor.php                \
-  php/src/Google/Protobuf/Internal/OneofDescriptorProto.php           \
-  php/src/Google/Protobuf/Internal/OneofField.php                     \
-  php/src/Google/Protobuf/Internal/OneofOptions.php                   \
-  php/src/Google/Protobuf/Internal/RawInputStream.php                 \
-  php/src/Google/Protobuf/Internal/RepeatedField.php                  \
-  php/src/Google/Protobuf/Internal/RepeatedFieldIter.php              \
-  php/src/Google/Protobuf/Internal/ServiceDescriptorProto.php         \
-  php/src/Google/Protobuf/Internal/ServiceOptions.php                 \
-  php/src/Google/Protobuf/Internal/SourceCodeInfo.php                 \
-  php/src/Google/Protobuf/Internal/SourceCodeInfo/Location.php        \
-  php/src/Google/Protobuf/Internal/TimestampBase.php                  \
-  php/src/Google/Protobuf/Internal/UninterpretedOption.php            \
-  php/src/Google/Protobuf/Internal/UninterpretedOption/NamePart.php   \
-  php/src/Google/Protobuf/Internal/DescriptorProto_ExtensionRange.php \
-  php/src/Google/Protobuf/Internal/DescriptorProto_ReservedRange.php  \
-  php/src/Google/Protobuf/Internal/EnumDescriptorProto_EnumReservedRange.php \
-  php/src/Google/Protobuf/Internal/FieldDescriptorProto_Label.php     \
-  php/src/Google/Protobuf/Internal/FieldDescriptorProto_Type.php      \
-  php/src/Google/Protobuf/Internal/FieldOptions_CType.php             \
-  php/src/Google/Protobuf/Internal/FieldOptions_JSType.php            \
-  php/src/Google/Protobuf/Internal/FileOptions_OptimizeMode.php       \
-  php/src/Google/Protobuf/Internal/GeneratedCodeInfo_Annotation.php   \
-  php/src/Google/Protobuf/Internal/MethodOptions_IdempotencyLevel.php \
-  php/src/Google/Protobuf/Internal/SourceCodeInfo_Location.php        \
-  php/src/Google/Protobuf/Internal/UninterpretedOption_NamePart.php   \
-  php/src/Google/Protobuf/ListValue.php                               \
-  php/src/Google/Protobuf/Method.php                                  \
-  php/src/Google/Protobuf/Mixin.php                                   \
-  php/src/Google/Protobuf/NullValue.php                               \
-  php/src/Google/Protobuf/OneofDescriptor.php                         \
-  php/src/Google/Protobuf/Option.php                                  \
-  php/src/Google/Protobuf/SourceContext.php                           \
-  php/src/Google/Protobuf/StringValue.php                             \
-  php/src/Google/Protobuf/Struct.php                                  \
-  php/src/Google/Protobuf/Syntax.php                                  \
-  php/src/Google/Protobuf/Timestamp.php                               \
-  php/src/Google/Protobuf/Type.php                                    \
-  php/src/Google/Protobuf/UInt32Value.php                             \
-  php/src/Google/Protobuf/UInt64Value.php                             \
-  php/src/Google/Protobuf/Value.php                                   \
-  php/src/phpdoc.dist.xml                                             \
-  php/tests/ArrayTest.php                                             \
-  php/tests/compatibility_test.sh                                     \
-  php/tests/compile_extension.sh                                      \
-  php/tests/DescriptorsTest.php                                       \
-  php/tests/EncodeDecodeTest.php                                      \
-  php/tests/force_c_ext.php                                           \
-  php/tests/gdb_test.sh                                               \
-  php/tests/generated_previous/GPBMetadata/ProtoPrevious/TestPreviouslyUnreservedMessage.php \
-  php/tests/generated_previous/Previous/readonly.php                  \
-  php/tests/GeneratedClassTest.php                                    \
-  php/tests/GeneratedPhpdocTest.php                                   \
-  php/tests/GeneratedServiceTest.php                                  \
-  php/tests/MapFieldTest.php                                          \
-  php/tests/memory_leak_test.php                                      \
-  php/tests/memory_leak_test.sh                                       \
-  php/tests/multirequest.php                                          \
-  php/tests/multirequest.sh                                           \
-  php/tests/PhpImplementationTest.php                                 \
-  php/tests/PreviouslyGeneratedClassTest.php                          \
-  php/tests/proto/empty/echo.proto                                    \
-  php/tests/proto/test.proto                                          \
-  php/tests/proto/test_descriptors.proto                              \
-  php/tests/proto/test_empty_php_namespace.proto                      \
-  php/tests/proto/test_import_descriptor_proto.proto                  \
-  php/tests/proto/test_include.proto                                  \
-  php/tests/proto/test_no_namespace.proto                             \
-  php/tests/proto/test_php_namespace.proto                            \
-  php/tests/proto/test_prefix.proto                                   \
-  php/tests/proto/test_reserved_enum_lower.proto                      \
-  php/tests/proto/test_reserved_enum_upper.proto                      \
-  php/tests/proto/test_reserved_enum_value_lower.proto                \
-  php/tests/proto/test_reserved_enum_value_upper.proto                \
-  php/tests/proto/test_reserved_message_lower.proto                   \
-  php/tests/proto/test_reserved_message_upper.proto                   \
-  php/tests/proto/test_service.proto                                  \
-  php/tests/proto/test_service_namespace.proto                        \
-  php/tests/proto/test_wrapper_type_setters.proto                     \
-  php/tests/proto_previous/test_previously_unreserved_message.proto   \
-  php/tests/test_base.php                                             \
-  php/tests/test_util.php                                             \
-  php/tests/valgrind.supp                                             \
-  php/tests/WellKnownTest.php                                         \
-  php/tests/WrapperTypeSettersTest.php
-
-# Note: please keep this in sync with the python_dist_files rule in BUILD.bazel.
-python_EXTRA_DIST=                                                           \
-  python/MANIFEST.in                                                         \
-  python/google/__init__.py                                                  \
-  python/google/protobuf/__init__.py                                         \
-  python/google/protobuf/compiler/__init__.py                                \
-  python/google/protobuf/descriptor.py                                       \
-  python/google/protobuf/descriptor_database.py                              \
-  python/google/protobuf/descriptor_pool.py                                  \
-  python/google/protobuf/internal/__init__.py                                \
-  python/google/protobuf/internal/_parameterized.py                          \
-  python/google/protobuf/internal/any_test.proto                             \
-  python/google/protobuf/internal/any_test.proto                             \
-  python/google/protobuf/internal/api_implementation.cc                      \
-  python/google/protobuf/internal/api_implementation.py                      \
-  python/google/protobuf/internal/builder.py                                 \
-  python/google/protobuf/internal/containers.py                              \
-  python/google/protobuf/internal/decoder.py                                 \
-  python/google/protobuf/internal/descriptor_database_test.py                \
-  python/google/protobuf/internal/descriptor_pool_test.py                    \
-  python/google/protobuf/internal/descriptor_pool_test1.proto                \
-  python/google/protobuf/internal/descriptor_pool_test2.proto                \
-  python/google/protobuf/internal/descriptor_test.py                         \
-  python/google/protobuf/internal/encoder.py                                 \
-  python/google/protobuf/internal/enum_type_wrapper.py                       \
-  python/google/protobuf/internal/extension_dict.py                          \
-  python/google/protobuf/internal/factory_test1.proto                        \
-  python/google/protobuf/internal/factory_test2.proto                        \
-  python/google/protobuf/internal/file_options_test.proto                    \
-  python/google/protobuf/internal/generator_test.py                          \
-  python/google/protobuf/internal/import_test.py                             \
-  python/google/protobuf/internal/import_test_package/__init__.py            \
-  python/google/protobuf/internal/import_test_package/import_public.proto    \
-  python/google/protobuf/internal/import_test_package/import_public_nested.proto \
-  python/google/protobuf/internal/import_test_package/inner.proto            \
-  python/google/protobuf/internal/import_test_package/outer.proto            \
-  python/google/protobuf/internal/json_format_test.py                        \
-  python/google/protobuf/internal/keywords_test.py                           \
-  python/google/protobuf/internal/message_factory_test.py                    \
-  python/google/protobuf/internal/message_listener.py                        \
-  python/google/protobuf/internal/message_set_extensions.proto               \
-  python/google/protobuf/internal/message_test.py                            \
-  python/google/protobuf/internal/missing_enum_values.proto                  \
-  python/google/protobuf/internal/more_extensions.proto                      \
-  python/google/protobuf/internal/more_extensions_dynamic.proto              \
-  python/google/protobuf/internal/more_messages.proto                        \
-  python/google/protobuf/internal/no_package.proto                           \
-  python/google/protobuf/internal/packed_field_test.proto                    \
-  python/google/protobuf/internal/proto_builder_test.py                      \
-  python/google/protobuf/internal/python_message.py                          \
-  python/google/protobuf/internal/python_protobuf.cc                         \
-  python/google/protobuf/internal/reflection_test.py                         \
-  python/google/protobuf/internal/service_reflection_test.py                 \
-  python/google/protobuf/internal/symbol_database_test.py                    \
-  python/google/protobuf/internal/test_bad_identifiers.proto                 \
-  python/google/protobuf/internal/test_proto3_optional.proto                 \
-  python/google/protobuf/internal/test_util.py                               \
-  python/google/protobuf/internal/testing_refleaks.py                        \
-  python/google/protobuf/internal/text_encoding_test.py                      \
-  python/google/protobuf/internal/text_format_test.py                        \
-  python/google/protobuf/internal/type_checkers.py                           \
-  python/google/protobuf/internal/unknown_fields_test.py                     \
-  python/google/protobuf/internal/well_known_types.py                        \
-  python/google/protobuf/internal/well_known_types.py                        \
-  python/google/protobuf/internal/well_known_types_test.py                   \
-  python/google/protobuf/internal/well_known_types_test.py                   \
-  python/google/protobuf/internal/wire_format.py                             \
-  python/google/protobuf/internal/wire_format_test.py                        \
-  python/google/protobuf/json_format.py                                      \
-  python/google/protobuf/message.py                                          \
-  python/google/protobuf/message_factory.py                                  \
-  python/google/protobuf/proto_api.h                                         \
-  python/google/protobuf/proto_builder.py                                    \
-  python/google/protobuf/pyext/README                                        \
-  python/google/protobuf/pyext/__init__.py                                   \
-  python/google/protobuf/pyext/cpp_message.py                                \
-  python/google/protobuf/pyext/descriptor.cc                                 \
-  python/google/protobuf/pyext/descriptor.h                                  \
-  python/google/protobuf/pyext/descriptor_containers.cc                      \
-  python/google/protobuf/pyext/descriptor_containers.h                       \
-  python/google/protobuf/pyext/descriptor_database.cc                        \
-  python/google/protobuf/pyext/descriptor_database.h                         \
-  python/google/protobuf/pyext/descriptor_pool.cc                            \
-  python/google/protobuf/pyext/descriptor_pool.h                             \
-  python/google/protobuf/pyext/extension_dict.cc                             \
-  python/google/protobuf/pyext/extension_dict.h                              \
-  python/google/protobuf/pyext/map_container.cc                              \
-  python/google/protobuf/pyext/map_container.h                               \
-  python/google/protobuf/pyext/message.cc                                    \
-  python/google/protobuf/pyext/message.h                                     \
-  python/google/protobuf/pyext/field.cc                                      \
-  python/google/protobuf/pyext/field.h                                       \
-  python/google/protobuf/pyext/unknown_fields.cc                             \
-  python/google/protobuf/pyext/unknown_fields.h                              \
-  python/google/protobuf/pyext/message_factory.cc                            \
-  python/google/protobuf/pyext/message_factory.h                             \
-  python/google/protobuf/pyext/message_module.cc                             \
-  python/google/protobuf/pyext/proto2_api_test.proto                         \
-  python/google/protobuf/pyext/python.proto                                  \
-  python/google/protobuf/pyext/repeated_composite_container.cc               \
-  python/google/protobuf/pyext/repeated_composite_container.h                \
-  python/google/protobuf/pyext/repeated_scalar_container.cc                  \
-  python/google/protobuf/pyext/repeated_scalar_container.h                   \
-  python/google/protobuf/pyext/safe_numerics.h                               \
-  python/google/protobuf/pyext/scoped_pyobject_ptr.h                         \
-  python/google/protobuf/pyext/unknown_field_set.cc                          \
-  python/google/protobuf/pyext/unknown_field_set.h                           \
-  python/google/protobuf/python_protobuf.h                                   \
-  python/google/protobuf/reflection.py                                       \
-  python/google/protobuf/service.py                                          \
-  python/google/protobuf/service_reflection.py                               \
-  python/google/protobuf/symbol_database.py                                  \
-  python/google/protobuf/text_encoding.py                                    \
-  python/google/protobuf/text_format.py                                      \
-  python/google/protobuf/unknown_fields.py                                   \
-  python/google/protobuf/util/__init__.py                                    \
-  python/release.sh                                                          \
-  python/mox.py                                                              \
-  python/setup.cfg                                                           \
-  python/setup.py                                                            \
-  python/stubout.py                                                          \
-  python/tox.ini                                                             \
-  python/README.md
-
-# Note: please keep this in sync with the dist_files rule in ruby/BUILD.bazel.
-ruby_EXTRA_DIST=                                                             \
-  ruby/Gemfile                                                               \
-  ruby/.gitignore                                                            \
-  ruby/README.md                                                             \
-  ruby/Rakefile                                                              \
-  ruby/compatibility_tests/v3.0.0/tests/test_import.proto                    \
-  ruby/compatibility_tests/v3.0.0/tests/stress.rb                            \
-  ruby/compatibility_tests/v3.0.0/tests/repeated_field_test.rb               \
-  ruby/compatibility_tests/v3.0.0/tests/generated_code_test.rb               \
-  ruby/compatibility_tests/v3.0.0/tests/generated_code.proto                 \
-  ruby/compatibility_tests/v3.0.0/tests/basic.rb                             \
-  ruby/compatibility_tests/v3.0.0/test.sh                                    \
-  ruby/compatibility_tests/v3.0.0/Rakefile                                   \
-  ruby/compatibility_tests/v3.0.0/README.md                                  \
-  ruby/ext/google/protobuf_c/convert.c                                       \
-  ruby/ext/google/protobuf_c/convert.h                                       \
-  ruby/ext/google/protobuf_c/defs.c                                          \
-  ruby/ext/google/protobuf_c/defs.h                                          \
-  ruby/ext/google/protobuf_c/extconf.rb                                      \
-  ruby/ext/google/protobuf_c/map.c                                           \
-  ruby/ext/google/protobuf_c/map.h                                           \
-  ruby/ext/google/protobuf_c/message.c                                       \
-  ruby/ext/google/protobuf_c/message.h                                       \
-  ruby/ext/google/protobuf_c/protobuf.c                                      \
-  ruby/ext/google/protobuf_c/protobuf.h                                      \
-  ruby/ext/google/protobuf_c/repeated_field.c                                \
-  ruby/ext/google/protobuf_c/repeated_field.h                                \
-  ruby/ext/google/protobuf_c/ruby-upb.c                                      \
-  ruby/ext/google/protobuf_c/ruby-upb.h                                      \
-  ruby/ext/google/protobuf_c/wrap_memcpy.c                                   \
-  ruby/google-protobuf.gemspec                                               \
-  ruby/lib/google/protobuf/descriptor_dsl.rb                                 \
-  ruby/lib/google/protobuf/message_exts.rb                                   \
-  ruby/lib/google/protobuf/repeated_field.rb                                 \
-  ruby/lib/google/protobuf/well_known_types.rb                               \
-  ruby/lib/google/protobuf.rb                                                \
-  ruby/pom.xml                                                               \
-  ruby/src/main/java/com/google/protobuf/jruby/RubyDescriptor.java           \
-  ruby/src/main/java/com/google/protobuf/jruby/RubyDescriptorPool.java       \
-  ruby/src/main/java/com/google/protobuf/jruby/RubyEnum.java                 \
-  ruby/src/main/java/com/google/protobuf/jruby/RubyEnumDescriptor.java       \
-  ruby/src/main/java/com/google/protobuf/jruby/RubyFieldDescriptor.java      \
-  ruby/src/main/java/com/google/protobuf/jruby/RubyFileDescriptor.java       \
-  ruby/src/main/java/com/google/protobuf/jruby/RubyMap.java                  \
-  ruby/src/main/java/com/google/protobuf/jruby/RubyMessage.java              \
-  ruby/src/main/java/com/google/protobuf/jruby/RubyOneofDescriptor.java      \
-  ruby/src/main/java/com/google/protobuf/jruby/RubyProtobuf.java             \
-  ruby/src/main/java/com/google/protobuf/jruby/RubyRepeatedField.java        \
-  ruby/src/main/java/com/google/protobuf/jruby/SentinelOuterClass.java       \
-  ruby/src/main/java/com/google/protobuf/jruby/Utils.java                    \
-  ruby/src/main/java/google/ProtobufJavaService.java                         \
-  ruby/src/main/sentinel.proto                                               \
-  ruby/tests/basic_proto2.rb                                                 \
-  ruby/tests/basic_test_proto2.proto                                         \
-  ruby/tests/basic_test.proto                                                \
-  ruby/tests/basic.rb                                                        \
-  ruby/tests/common_tests.rb                                                 \
-  ruby/tests/encode_decode_test.rb                                           \
-  ruby/tests/gc_test.rb                                                      \
-  ruby/tests/repeated_field_test.rb                                          \
-  ruby/tests/stress.rb                                                       \
-  ruby/tests/generated_code_proto2_test.rb                                   \
-  ruby/tests/generated_code_proto2.proto                                     \
-  ruby/tests/generated_code.proto                                            \
-  ruby/tests/multi_level_nesting_test.proto                                  \
-  ruby/tests/multi_level_nesting_test.rb                                     \
-  ruby/tests/test_import_proto2.proto                                        \
-  ruby/tests/test_import.proto                                               \
-  ruby/tests/test_ruby_package_proto2.proto                                  \
-  ruby/tests/test_ruby_package.proto                                         \
-  ruby/tests/generated_code_test.rb                                          \
-  ruby/tests/well_known_types_test.rb                                        \
-  ruby/tests/type_errors.rb                                                  \
-  ruby/travis-test.sh
-
-all_EXTRA_DIST=$(csharp_EXTRA_DIST) $(java_EXTRA_DIST) $(objectivec_EXTRA_DIST) $(php_EXTRA_DIST) $(python_EXTRA_DIST) $(ruby_EXTRA_DIST)
-
-# Note: please keep this in sync with the common_dist_files rule in BUILD.bazel.
-EXTRA_DIST = $(@DIST_LANG@_EXTRA_DIST)              \
-  autogen.sh                                        \
-  generate_descriptor_proto.sh                      \
-  README.md                                         \
-  LICENSE                                           \
-  CONTRIBUTORS.txt                                  \
-  CHANGES.txt                                       \
-  update_file_lists.sh                              \
-  BUILD.bazel                                       \
-  WORKSPACE                                         \
-  CMakeLists.txt                                    \
-  build_defs/BUILD.bazel                            \
-  build_defs/cc_proto_blacklist_test.bzl            \
-  build_defs/compiler_config_setting.bzl            \
-  build_defs/cpp_opts.bzl                           \
-  build_files_updated_unittest.sh                   \
-  cmake/CMakeLists.txt                              \
-  cmake/README.md                                   \
-  cmake/conformance.cmake                           \
-  cmake/examples.cmake                              \
-  cmake/extract_includes.bat.in                     \
-  cmake/install.cmake                               \
-  cmake/libprotobuf-lite.cmake                      \
-  cmake/libprotobuf.cmake                           \
-  cmake/libprotoc.cmake                             \
-  cmake/protobuf-config-version.cmake.in            \
-  cmake/protobuf-config.cmake.in                    \
-  cmake/protobuf-lite.pc.cmake                      \
-  cmake/protobuf-module.cmake.in                    \
-  cmake/protobuf-options.cmake                      \
-  cmake/protobuf.pc.cmake                           \
-  cmake/protoc.cmake                                \
-  cmake/tests.cmake                                 \
-  cmake/version.rc.in                               \
-  csharp/BUILD.bazel                                \
-  editors/README.txt                                \
-  editors/proto.vim                                 \
-  editors/protobuf-mode.el                          \
-  examples/AddPerson.java                           \
-  examples/BUILD.bazel                              \
-  examples/CMakeLists.txt                           \
-  examples/ListPeople.java                          \
-  examples/Makefile                                 \
-  examples/README.md                                \
-  examples/WORKSPACE                                \
-  examples/add_person.cc                            \
-  examples/add_person.dart                          \
-  examples/add_person.py                            \
-  examples/addressbook.proto                        \
-  examples/go/cmd/add_person/add_person.go          \
-  examples/go/cmd/add_person/add_person_test.go     \
-  examples/go/cmd/list_people/list_people.go        \
-  examples/go/cmd/list_people/list_people_test.go   \
-  examples/go/go.sum                                \
-  examples/go/go.mod                                \
-  examples/list_people.cc                           \
-  examples/list_people.dart                         \
-  examples/list_people.py                           \
-  examples/pubspec.yaml                             \
-  conformance/BUILD.bazel                           \
-  conformance/defs.bzl                              \
-  maven_install.json                                \
-  php/BUILD.bazel                                   \
-  protobuf.bzl                                      \
-  protobuf_deps.bzl                                 \
-  protobuf_release.bzl                              \
-  protobuf_version.bzl                              \
-  ruby/BUILD.bazel                                  \
-  third_party/zlib.BUILD                            \
-  util/python/BUILD.bazel
-
-# Deletes all the files generated by autogen.sh.
-MAINTAINERCLEANFILES =   \
-  aclocal.m4             \
-  ar-lib                 \
-  config.guess           \
-  config.sub             \
-  configure              \
-  depcomp                \
-  install-sh             \
-  ltmain.sh              \
-  Makefile.in            \
-  missing                \
-  mkinstalldirs          \
-  config.h.in            \
-  stamp.h.in             \
-  m4/ltsugar.m4          \
-  m4/libtool.m4          \
-  m4/ltversion.m4        \
-  m4/lt~obsolete.m4      \
-  m4/ltoptions.m4
diff --git a/libs/protobuf/Protobuf-C++.podspec b/libs/protobuf/Protobuf-C++.podspec
deleted file mode 100644
index 43a3213..0000000
--- a/libs/protobuf/Protobuf-C++.podspec
+++ /dev/null
@@ -1,41 +0,0 @@
-Pod::Spec.new do |s|
-  s.name     = 'Protobuf-C++'
-  s.version  = '3.21.12'
-  s.summary  = 'Protocol Buffers v3 runtime library for C++.'
-  s.homepage = 'https://github.com/google/protobuf'
-  s.license  = 'BSD-3-Clause'
-  s.authors  = { 'The Protocol Buffers contributors' => 'protobuf@googlegroups.com' }
-  s.cocoapods_version = '>= 1.0'
-
-  s.source = { :git => 'https://github.com/google/protobuf.git',
-               :tag => "v#{s.version}" }
-
-  s.source_files = 'src/google/protobuf/*.{h,cc,inc}',
-                   'src/google/protobuf/stubs/*.{h,cc}',
-                   'src/google/protobuf/io/*.{h,cc}',
-                   'src/google/protobuf/util/*.{h,cc}',
-                   'src/google/protobuf/util/internal/*.{h,cc}'
-
-  # Excluding all the tests in the directories above
-  s.exclude_files = 'src/google/**/*_test.{h,cc,inc}',
-                    'src/google/**/*_unittest.{h,cc}',
-                    'src/google/protobuf/test_util*.{h,cc}',
-                    'src/google/protobuf/map_lite_test_util.{h,cc}',
-                    'src/google/protobuf/map_test_util*.{h,cc,inc}',
-                    'src/google/protobuf/reflection_tester.{h,cc}'
-
-  s.header_mappings_dir = 'src'
-
-  s.ios.deployment_target = '7.0'
-  s.osx.deployment_target = '10.9'
-  s.tvos.deployment_target = '9.0'
-  s.watchos.deployment_target = '2.0'
-
-  s.pod_target_xcconfig = {
-    # Do not let src/google/protobuf/stubs/time.h override system API
-    'USE_HEADERMAP' => 'NO',
-    'ALWAYS_SEARCH_USER_PATHS' => 'NO',
-    'HEADER_SEARCH_PATHS' => '"$(PODS_TARGET_SRCROOT)/src"'
-  }
-
-end
diff --git a/libs/protobuf/Protobuf.podspec b/libs/protobuf/Protobuf.podspec
deleted file mode 100644
index ebb533d..0000000
--- a/libs/protobuf/Protobuf.podspec
+++ /dev/null
@@ -1,50 +0,0 @@
-# This file describes to Cocoapods how to integrate the Objective-C runtime into a dependent
-# project.
-# Despite this file being specific to Objective-C, it needs to be on the root of the repository.
-# Otherwise, Cocoapods gives trouble like not picking up the license file correctly, or not letting
-# dependent projects use the :git notation to refer to the library.
-Pod::Spec.new do |s|
-  s.name     = 'Protobuf'
-  s.version  = '3.21.12'
-  s.summary  = 'Protocol Buffers v.3 runtime library for Objective-C.'
-  s.homepage = 'https://github.com/protocolbuffers/protobuf'
-  s.license  = 'BSD-3-Clause'
-  s.authors  = { 'The Protocol Buffers contributors' => 'protobuf@googlegroups.com' }
-  s.cocoapods_version = '>= 1.0'
-
-  s.source = { :git => 'https://github.com/protocolbuffers/protobuf.git',
-               :tag => "v#{s.version}" }
-
-  s.source_files = 'objectivec/*.{h,m}',
-                   'objectivec/google/protobuf/Any.pbobjc.h',
-                   'objectivec/google/protobuf/Api.pbobjc.h',
-                   'objectivec/google/protobuf/Duration.pbobjc.h',
-                   'objectivec/google/protobuf/Empty.pbobjc.h',
-                   'objectivec/google/protobuf/FieldMask.pbobjc.h',
-                   'objectivec/google/protobuf/SourceContext.pbobjc.h',
-                   'objectivec/google/protobuf/Struct.pbobjc.h',
-                   'objectivec/google/protobuf/Timestamp.pbobjc.h',
-                   'objectivec/google/protobuf/Type.pbobjc.h',
-                   'objectivec/google/protobuf/Wrappers.pbobjc.h'
-  # The following would cause duplicate symbol definitions. GPBProtocolBuffers is expected to be
-  # left out, as it's an umbrella implementation file.
-  s.exclude_files = 'objectivec/GPBProtocolBuffers.m'
-
-  # Set a CPP symbol so the code knows to use framework imports.
-  s.user_target_xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS=1' }
-  s.pod_target_xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS=1' }
-
-  s.ios.deployment_target = '9.0'
-  s.osx.deployment_target = '10.9'
-  s.tvos.deployment_target = '9.0'
-  s.watchos.deployment_target = '2.0'
-  s.requires_arc = false
-
-  # The unittest need the generate sources from the testing related .proto
-  # files. So to add a `test_spec`, there would also need to be something like a
-  # `script_phases` to generate them, but there would also need to be a way to
-  # ensure `protoc` had be built. Another option would be to move to a model
-  # where the needed files are always generated and checked in. Neither of these
-  # seem that great at the moment, so the tests have *not* been wired into here
-  # at this time.
-end
diff --git a/libs/protobuf/README.md b/libs/protobuf/README.md
deleted file mode 100644
index c2e6575..0000000
--- a/libs/protobuf/README.md
+++ /dev/null
@@ -1,84 +0,0 @@
-Protocol Buffers - Google's data interchange format
-===================================================
-
-Copyright 2008 Google Inc.
-
-https://developers.google.com/protocol-buffers/
-
-Overview
---------
-
-Protocol Buffers (a.k.a., protobuf) are Google's language-neutral,
-platform-neutral, extensible mechanism for serializing structured data. You
-can find [protobuf's documentation on the Google Developers site](https://developers.google.com/protocol-buffers/).
-
-This README file contains protobuf installation instructions. To install
-protobuf, you need to install the protocol compiler (used to compile .proto
-files) and the protobuf runtime for your chosen programming language.
-
-Protocol Compiler Installation
-------------------------------
-
-The protocol compiler is written in C++. If you are using C++, please follow
-the [C++ Installation Instructions](src/README.md) to install protoc along
-with the C++ runtime.
-
-For non-C++ users, the simplest way to install the protocol compiler is to
-download a pre-built binary from our release page:
-
-  [https://github.com/protocolbuffers/protobuf/releases](https://github.com/protocolbuffers/protobuf/releases)
-
-In the downloads section of each release, you can find pre-built binaries in
-zip packages: protoc-$VERSION-$PLATFORM.zip. It contains the protoc binary
-as well as a set of standard .proto files distributed along with protobuf.
-
-If you are looking for an old version that is not available in the release
-page, check out the maven repo here:
-
-  [https://repo1.maven.org/maven2/com/google/protobuf/protoc/](https://repo1.maven.org/maven2/com/google/protobuf/protoc/)
-
-These pre-built binaries are only provided for released versions. If you want
-to use the github main version at HEAD, or you need to modify protobuf code,
-or you are using C++, it's recommended to build your own protoc binary from
-source.
-
-If you would like to build protoc binary from source, see the [C++ Installation
-Instructions](src/README.md).
-
-Protobuf Runtime Installation
------------------------------
-
-Protobuf supports several different programming languages. For each programming
-language, you can find instructions in the corresponding source directory about
-how to install protobuf runtime for that specific language:
-
-| Language                             | Source                                                      |
-|--------------------------------------|-------------------------------------------------------------|
-| C++ (include C++ runtime and protoc) | [src](src)                                                  |
-| Java                                 | [java](java)                                                |
-| Python                               | [python](python)                                            |
-| Objective-C                          | [objectivec](objectivec)                                    |
-| C#                                   | [csharp](csharp)                                            |
-| Ruby                                 | [ruby](ruby)                                                |
-| Go                                   | [protocolbuffers/protobuf-go](https://github.com/protocolbuffers/protobuf-go)|
-| PHP                                  | [php](php)                                                  |
-| Dart                                 | [dart-lang/protobuf](https://github.com/dart-lang/protobuf) |
-
-Quick Start
------------
-
-The best way to learn how to use protobuf is to follow the tutorials in our
-developer guide:
-
-https://developers.google.com/protocol-buffers/docs/tutorials
-
-If you want to learn from code examples, take a look at the examples in the
-[examples](examples) directory.
-
-Documentation
--------------
-
-The complete documentation for Protocol Buffers is available via the
-web at:
-
-https://developers.google.com/protocol-buffers/
diff --git a/libs/protobuf/SECURITY.md b/libs/protobuf/SECURITY.md
deleted file mode 100644
index 76a40ee..0000000
--- a/libs/protobuf/SECURITY.md
+++ /dev/null
@@ -1,4 +0,0 @@
-To report security concerns or vulnerabilities within protobuf, please use
-Google's official channel for reporting these.
-
-https://www.google.com/appserve/security-bugs/m2/new
diff --git a/libs/protobuf/WORKSPACE b/libs/protobuf/WORKSPACE
deleted file mode 100644
index d01122a..0000000
--- a/libs/protobuf/WORKSPACE
+++ /dev/null
@@ -1,71 +0,0 @@
-workspace(name = "com_google_protobuf")
-
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
-
-local_repository(
-    name = "com_google_protobuf_examples",
-    path = "examples",
-)
-
-http_archive(
-    name = "com_google_googletest",
-    sha256 = "9dc9157a9a1551ec7a7e43daea9a694a0bb5fb8bec81235d8a1e6ef64c716dcb",
-    strip_prefix = "googletest-release-1.10.0",
-    urls = [
-        "https://mirror.bazel.build/github.com/google/googletest/archive/release-1.10.0.tar.gz",
-        "https://github.com/google/googletest/archive/release-1.10.0.tar.gz",
-    ],
-)
-
-http_archive(
-    name = "com_github_google_benchmark",
-    sha256 = "2a778d821997df7d8646c9c59b8edb9a573a6e04c534c01892a40aa524a7b68c",
-    strip_prefix = "benchmark-bf585a2789e30585b4e3ce6baf11ef2750b54677",
-    urls = [
-        "https://github.com/google/benchmark/archive/bf585a2789e30585b4e3ce6baf11ef2750b54677.zip",
-    ],
-)
-
-# Load common dependencies.
-load("//:protobuf_deps.bzl", "PROTOBUF_MAVEN_ARTIFACTS", "protobuf_deps")
-protobuf_deps()
-
-bind(
-    name = "python_headers",
-    actual = "//util/python:python_headers",
-)
-
-load("@rules_jvm_external//:defs.bzl", "maven_install")
-
-maven_install(
-    artifacts = PROTOBUF_MAVEN_ARTIFACTS,
-    # For updating instructions, see:
-    # https://github.com/bazelbuild/rules_jvm_external#updating-maven_installjson
-    maven_install_json = "//:maven_install.json",
-    repositories = [
-        "https://repo1.maven.org/maven2",
-        "https://repo.maven.apache.org/maven2",
-    ],
-)
-
-load("@maven//:defs.bzl", "pinned_maven_install")
-
-pinned_maven_install()
-
-# For `cc_proto_blacklist_test` and `build_test`.
-load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")
-
-bazel_skylib_workspace()
-
-load("@rules_pkg//:deps.bzl", "rules_pkg_dependencies")
-rules_pkg_dependencies()
-
-# For `kt_jvm_library`
-load("@io_bazel_rules_kotlin//kotlin:repositories.bzl", "kotlin_repositories")
-kotlin_repositories()
-
-load("@io_bazel_rules_kotlin//kotlin:core.bzl", "kt_register_toolchains")
-kt_register_toolchains()
-
-load("@upb//bazel:workspace_deps.bzl", "upb_deps")
-upb_deps()
diff --git a/libs/protobuf/appveyor.bat b/libs/protobuf/appveyor.bat
deleted file mode 100644
index 005fb11..0000000
--- a/libs/protobuf/appveyor.bat
+++ /dev/null
@@ -1,48 +0,0 @@
-setlocal
-
-IF %platform%==MinGW GOTO build_mingw
-IF %language%==cpp GOTO build_cpp
-IF %language%==csharp GOTO build_csharp
-
-echo Unsupported language %language% and platform %platform%. Exiting.
-goto :error
-
-:build_mingw
-echo Building MinGW
-set PATH=C:\mingw-w64\x86_64-7.2.0-posix-seh-rt_v5-rev1\mingw64\bin;%PATH:C:\Program Files\Git\usr\bin;=%
-mkdir build_mingw
-cd build_mingw
-cmake -G "%generator%" -Dprotobuf_BUILD_SHARED_LIBS=%BUILD_DLL% -Dprotobuf_UNICODE=%UNICODE% -Dprotobuf_BUILD_TESTS=0 ../cmake
-mingw32-make -j8 all || goto error
-rem cd %configuration%
-rem tests.exe || goto error
-goto :EOF
-
-:build_cpp
-echo Building C++
-mkdir build_msvc
-cd build_msvc
-cmake -G "%generator%" -Dprotobuf_BUILD_SHARED_LIBS=%BUILD_DLL% -Dprotobuf_UNICODE=%UNICODE% ../cmake
-msbuild protobuf.sln /p:Platform=%vcplatform% /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" || goto error
-cd %configuration%
-tests.exe || goto error
-goto :EOF
-
-:build_csharp
-echo Building C#
-cd csharp\src
-REM The platform environment variable is implicitly used by msbuild;
-REM we don't want it.
-set platform=
-dotnet restore
-dotnet build -c %configuration% || goto error
-
-echo Testing C#
-dotnet test -c %configuration% -f netcoreapp3.1 Google.Protobuf.Test\Google.Protobuf.Test.csproj || goto error
-dotnet test -c %configuration% -f net451 Google.Protobuf.Test\Google.Protobuf.Test.csproj || goto error
-
-goto :EOF
-
-:error
-echo Failed!
-EXIT /b %ERRORLEVEL%
diff --git a/libs/protobuf/appveyor.yml b/libs/protobuf/appveyor.yml
deleted file mode 100644
index 91f737a..0000000
--- a/libs/protobuf/appveyor.yml
+++ /dev/null
@@ -1,47 +0,0 @@
-configuration:
-  - Debug
-
-environment:
-  matrix:
-    # Only test few combinations: "Visual Studio 2015 (14) + Win64/MinGW + Debug + DLL". We can
-    # test more combinations but AppVeyor just takes too long to finish (each
-    # combination takes ~15mins).
-    - platform: MinGW
-      language: cpp
-      image: Visual Studio 2015
-
-    - platform: Win64
-      language: cpp
-      image: Visual Studio 2015
-      BUILD_DLL: ON
-      UNICODE: ON
-
-    - platform: Win64
-      language: cpp
-      image: Visual Studio 2017
-      BUILD_DLL: OFF
-      UNICODE: ON
-
-    - platform: Win64
-      language: csharp
-      image: Visual Studio 2017
-
-# Our build scripts run tests automatically; we don't want AppVeyor
-# to try to detect them itself.
-test: off
-
-install:
-  - git submodule update --init --recursive
-
-before_build:
-  - if %platform%==MinGW set generator=MinGW Makefiles
-  - if %platform%==Win32 set generator=Visual Studio 14
-  - if %platform%==Win64 set generator=Visual Studio 14 Win64
-  - if %platform%==Win32 set vcplatform=Win32
-  - if %platform%==Win64 set vcplatform=x64
-
-build_script:
-  - CALL appveyor.bat
-
-skip_commits:
-  message: /.*\[skip appveyor\].*/
diff --git a/libs/protobuf/autogen.sh b/libs/protobuf/autogen.sh
deleted file mode 100755
index 105bf09..0000000
--- a/libs/protobuf/autogen.sh
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/sh
-
-# Run this script to generate the configure script and other files that will
-# be included in the distribution.  These files are not checked in because they
-# are automatically generated.
-
-set -e
-
-if [ ! -z "$@" ]; then
-  for argument in "$@"; do
-    case $argument in
-	  # make curl silent
-      "-s")
-        curlopts="-s"
-        ;;
-    esac
-  done
-fi
-
-# Check that we're being run from the right directory.
-if test ! -f src/google/protobuf/stubs/common.h; then
-  cat >&2 << __EOF__
-Could not find source code.  Make sure you are running this script from the
-root of the distribution tree.
-__EOF__
-  exit 1
-fi
-
-set -ex
-
-# The absence of a m4 directory in googletest causes autoreconf to fail when
-# building under the CentOS docker image. It's a warning in regular build on
-# Ubuntu/gLinux as well. (This is only needed if git submodules have been
-# initialized, which is typically only needed for testing; see the installation
-# instructions for details.)
-if test -d third_party/googletest; then
-  mkdir -p third_party/googletest/m4
-fi
-
-# TODO(kenton):  Remove the ",no-obsolete" part and fix the resulting warnings.
-autoreconf -f -i -Wall,no-obsolete
-
-rm -rf autom4te.cache config.h.in~
-exit 0
diff --git a/libs/protobuf/benchmarks/BUILD.bazel b/libs/protobuf/benchmarks/BUILD.bazel
deleted file mode 100644
index 36f6283..0000000
--- a/libs/protobuf/benchmarks/BUILD.bazel
+++ /dev/null
@@ -1,98 +0,0 @@
-load("@rules_cc//cc:defs.bzl", "cc_proto_library")
-load("@rules_java//java:defs.bzl", "java_proto_library")
-load("@rules_pkg//:mappings.bzl", "pkg_filegroup", "pkg_files", "strip_prefix")
-load("@rules_proto//proto:defs.bzl", "proto_library")
-
-proto_library(
-    name = "benchmarks_proto",
-    srcs = [
-        "benchmarks.proto",
-    ],
-    strip_import_prefix = "/benchmarks",
-    visibility = [
-        "//benchmarks:__subpackages__",
-    ],
-)
-
-cc_proto_library(
-    name = "benchmarks_cc_proto",
-    visibility = [
-        "//benchmarks:__subpackages__",
-    ],
-    deps = [
-        "benchmarks_proto",
-    ],
-)
-
-java_proto_library(
-    name = "benchmarks_java_proto",
-    visibility = [
-        "//benchmarks:__subpackages__",
-    ],
-    deps = [
-        "benchmarks_proto",
-    ],
-)
-
-proto_library(
-    name = "google_size_proto",
-    srcs = [
-        "google_size.proto",
-    ],
-    strip_import_prefix = "/benchmarks",
-    visibility = [
-        "//benchmarks:__subpackages__",
-    ],
-)
-
-cc_proto_library(
-    name = "google_size_cc_proto",
-    visibility = [
-        "//benchmarks:__subpackages__",
-    ],
-    deps = [
-        "google_size_proto",
-    ],
-)
-
-java_proto_library(
-    name = "google_size_java_proto",
-    visibility = [
-        "//benchmarks:__subpackages__",
-    ],
-    deps = [
-        "google_size_proto",
-    ],
-)
-
-pkg_files(
-    name = "dist_files",
-    srcs = glob(
-        [
-            "*",
-            "python/*.cc",
-            "util/*.cc",
-        ],
-        exclude = [
-            "__init__.py",  # not in autotools dist
-            "go/*",
-        ],
-    ),
-    strip_prefix = strip_prefix.from_root(""),
-)
-
-# Convenience filegroup for all files that should be packaged.
-pkg_filegroup(
-    name = "all_dist_files",
-    srcs = [
-        ":dist_files",
-        "//benchmarks/cpp:dist_files",
-        # "//benchmarks/datasets:dist_files",  # not in autotools dist
-        "//benchmarks/datasets/google_message1/proto2:dist_files",
-        "//benchmarks/datasets/google_message1/proto3:dist_files",
-        "//benchmarks/datasets/google_message2:dist_files",
-        "//benchmarks/datasets/google_message3:dist_files",
-        "//benchmarks/datasets/google_message4:dist_files",
-    ],
-    visibility = ["//pkg:__pkg__"],
-)
diff --git a/libs/protobuf/benchmarks/Makefile.am b/libs/protobuf/benchmarks/Makefile.am
deleted file mode 100644
index ed57978..0000000
--- a/libs/protobuf/benchmarks/Makefile.am
+++ /dev/null
@@ -1,664 +0,0 @@
-benchmarks_protoc_inputs_benchmark_wrapper =                               \
-	benchmarks.proto
-
-benchmarks_protoc_inputs =                                                 \
-	datasets/google_message1/proto3/benchmark_message1_proto3.proto
-
-benchmarks_protoc_inputs_proto2 =                                          \
-	datasets/google_message1/proto2/benchmark_message1_proto2.proto          \
-	datasets/google_message2/benchmark_message2.proto                        \
-	datasets/google_message3/benchmark_message3.proto                        \
-	datasets/google_message3/benchmark_message3_1.proto                      \
-	datasets/google_message3/benchmark_message3_2.proto                      \
-	datasets/google_message3/benchmark_message3_3.proto                      \
-	datasets/google_message3/benchmark_message3_4.proto                      \
-	datasets/google_message3/benchmark_message3_5.proto                      \
-	datasets/google_message3/benchmark_message3_6.proto                      \
-	datasets/google_message3/benchmark_message3_7.proto                      \
-	datasets/google_message3/benchmark_message3_8.proto                      \
-	datasets/google_message4/benchmark_message4.proto                        \
-	datasets/google_message4/benchmark_message4_1.proto                      \
-	datasets/google_message4/benchmark_message4_2.proto                      \
-	datasets/google_message4/benchmark_message4_3.proto
-
-make_tmp_dir:
-	mkdir -p 'tmp/java/src/main/java'
-	touch make_tmp_dir
-
-
-# We have to cd to $(srcdir) before executing protoc because $(protoc_inputs) is
-# relative to srcdir, which may not be the same as the current directory when
-# building out-of-tree.
-protoc_middleman: make_tmp_dir $(top_srcdir)/src/protoc$(EXEEXT) $(benchmarks_protoc_inputs) $(well_known_type_protoc_inputs) $(benchmarks_protoc_inputs_benchmark_wrapper)
-	oldpwd=`pwd` && ( cd $(srcdir) && $$oldpwd/../src/protoc$(EXEEXT) -I. -I$(top_srcdir)/src --cpp_out=$$oldpwd/cpp --java_out=$$oldpwd/tmp/java/src/main/java --python_out=$$oldpwd/tmp $(benchmarks_protoc_inputs) $(benchmarks_protoc_inputs_benchmark_wrapper) )
-	touch protoc_middleman
-
-protoc_middleman2:  make_tmp_dir $(top_srcdir)/src/protoc$(EXEEXT) $(benchmarks_protoc_inputs_proto2) $(well_known_type_protoc_inputs)
-	oldpwd=`pwd` && ( cd $(srcdir) && $$oldpwd/../src/protoc$(EXEEXT) -I. -I$(top_srcdir)/src --cpp_out=$$oldpwd/cpp --java_out=$$oldpwd/tmp/java/src/main/java --python_out=$$oldpwd/tmp $(benchmarks_protoc_inputs_proto2) )
-	touch protoc_middleman2
-
-all_data = $$(find $$(cd $(srcdir) && pwd) -type f -name "dataset.*.pb" -not -path "$$(cd $(srcdir) && pwd)/tmp/*")
-
-############# CPP RULES ##############
-
-benchmarks_protoc_outputs =                                                \
-	cpp/benchmarks.pb.cc                                                     \
-	cpp/datasets/google_message1/proto3/benchmark_message1_proto3.pb.cc
-
-benchmarks_protoc_outputs_header =                                         \
-	cpp/benchmarks.pb.h                                                      \
-	cpp/datasets/google_message1/proto3/benchmark_message1_proto3.pb.h
-
-benchmarks_protoc_outputs_proto2_header =                                  \
-	cpp/datasets/google_message1/proto2/benchmark_message1_proto2.pb.h       \
-	cpp/datasets/google_message2/benchmark_message2.pb.h                     \
-	cpp/datasets/google_message3/benchmark_message3.pb.h                     \
-	cpp/datasets/google_message3/benchmark_message3_1.pb.h                   \
-	cpp/datasets/google_message3/benchmark_message3_2.pb.h                   \
-	cpp/datasets/google_message3/benchmark_message3_3.pb.h                   \
-	cpp/datasets/google_message3/benchmark_message3_4.pb.h                   \
-	cpp/datasets/google_message3/benchmark_message3_5.pb.h                   \
-	cpp/datasets/google_message3/benchmark_message3_6.pb.h                   \
-	cpp/datasets/google_message3/benchmark_message3_7.pb.h                   \
-	cpp/datasets/google_message3/benchmark_message3_8.pb.h                   \
-	cpp/datasets/google_message4/benchmark_message4.pb.h                     \
-	cpp/datasets/google_message4/benchmark_message4_1.pb.h                   \
-	cpp/datasets/google_message4/benchmark_message4_2.pb.h                   \
-	cpp/datasets/google_message4/benchmark_message4_3.pb.h
-
-benchmarks_protoc_outputs_proto2 =                                         \
-	cpp/datasets/google_message1/proto2/benchmark_message1_proto2.pb.cc      \
-	cpp/datasets/google_message2/benchmark_message2.pb.cc                    \
-	cpp/datasets/google_message3/benchmark_message3.pb.cc                    \
-	cpp/datasets/google_message3/benchmark_message3_1.pb.cc                  \
-	cpp/datasets/google_message3/benchmark_message3_2.pb.cc                  \
-	cpp/datasets/google_message3/benchmark_message3_3.pb.cc                  \
-	cpp/datasets/google_message3/benchmark_message3_4.pb.cc                  \
-	cpp/datasets/google_message3/benchmark_message3_5.pb.cc                  \
-	cpp/datasets/google_message3/benchmark_message3_6.pb.cc                  \
-	cpp/datasets/google_message3/benchmark_message3_7.pb.cc                  \
-	cpp/datasets/google_message3/benchmark_message3_8.pb.cc                  \
-	cpp/datasets/google_message4/benchmark_message4.pb.cc                    \
-	cpp/datasets/google_message4/benchmark_message4_1.pb.cc                  \
-	cpp/datasets/google_message4/benchmark_message4_2.pb.cc                  \
-	cpp/datasets/google_message4/benchmark_message4_3.pb.cc
-
-
-$(benchmarks_protoc_outputs): protoc_middleman
-$(benchmarks_protoc_outputs_header): protoc_middleman
-$(benchmarks_protoc_outputs_proto2): protoc_middleman2
-$(benchmarks_protoc_outputs_proto2_header): protoc_middleman2
-
-initialize_submodule:
-	oldpwd=`pwd`
-	cd $(top_srcdir) && git submodule update --init -r third_party/benchmark && cd third_party/benchmark \
-	 && cmake -DCMAKE_BUILD_TYPE=Release && make
-	cd $$oldpwd
-	touch initialize_submodule
-
-$(top_srcdir)/third_party/benchmark/src/libbenchmark.a: initialize_submodule
-
-AM_CXXFLAGS = $(NO_OPT_CXXFLAGS) $(PROTOBUF_OPT_FLAG) -Wall -Wwrite-strings -Woverloaded-virtual -Wno-sign-compare
-
-bin_PROGRAMS = cpp-benchmark
-
-cpp_benchmark_LDADD = $(top_srcdir)/src/libprotobuf.la $(top_srcdir)/third_party/benchmark/src/libbenchmark.a
-cpp_benchmark_SOURCES = cpp/cpp_benchmark.cc
-cpp_benchmark_CPPFLAGS = -I$(top_srcdir)/src -I$(srcdir)/cpp -I$(top_srcdir)/third_party/benchmark/include
-# Explicit deps because BUILT_SOURCES are only done before a "make all/check"
-# so a direct "make test_cpp" could fail if parallel enough.
-# See: https://www.gnu.org/software/automake/manual/html_node/Built-Sources-Example.html#Recording-Dependencies-manually
-cpp/cpp_benchmark-cpp_benchmark.$(OBJEXT): $(benchmarks_protoc_outputs) $(benchmarks_protoc_outputs_proto2) $(benchmarks_protoc_outputs_header) $(benchmarks_protoc_outputs_proto2_header) $(top_srcdir)/src/libprotobuf.la $(top_srcdir)/third_party/benchmark/src/libbenchmark.a
-cpp/benchmark-cpp_benchmark.$(OBJEXT): $(benchmarks_protoc_outputs) $(benchmarks_protoc_outputs_proto2) $(benchmarks_protoc_outputs_header) $(benchmarks_protoc_outputs_proto2_header) $(top_srcdir)/src/libprotobuf.la $(top_srcdir)/third_party/benchmark/src/libbenchmark.a
-nodist_cpp_benchmark_SOURCES =                                             \
-	$(benchmarks_protoc_outputs)                                             \
-	$(benchmarks_protoc_outputs_proto2)                                      \
-	$(benchmarks_protoc_outputs_proto2_header)                               \
-	$(benchmarks_protoc_outputs_header)
-
-cpp: protoc_middleman protoc_middleman2 cpp-benchmark initialize_submodule
-	./cpp-benchmark $(all_data)
-
-############ CPP RULES END ############
-
-############# JAVA RULES ##############
-
-java_benchmark_testing_files =                                      \
-	java/src/main/java/com/google/protobuf/ProtoCaliperBenchmark.java
-
-javac_middleman: $(java_benchmark_testing_files) protoc_middleman protoc_middleman2
-	cp -r $(srcdir)/java tmp
-	mkdir -p tmp/java/lib
-	cp $(top_srcdir)/java/core/target/*.jar tmp/java/lib/protobuf-java.jar
-	cd tmp/java && mvn clean compile assembly:single -Dprotobuf.version=$(PACKAGE_VERSION) && cd ../..
-	@touch javac_middleman
-
-java-benchmark: javac_middleman
-	@echo "Writing shortcut script java-benchmark..."
-	@echo '#! /bin/bash' > java-benchmark
-	@echo 'all_data=""' >> java-benchmark
-	@echo 'conf=()' >> java-benchmark
-	@echo 'data_files=""' >> java-benchmark
-	@echo 'for arg in $$@; do if [[ $${arg:0:1} == "-" ]]; then conf+=($$arg); else data_files+="$$arg,"; fi; done' >> java-benchmark
-	@echo 'java -cp '\"tmp/java/target/*:$(top_srcdir)/java/core/target/*:$(top_srcdir)/java/util/target/*\"" \\" >>java-benchmark
-	@echo '   com.google.caliper.runner.CaliperMain com.google.protobuf.ProtoCaliperBenchmark -i runtime '"\\"  >> java-benchmark
-	@echo '   -b serializeToByteArray,serializeToMemoryStream,deserializeFromByteArray,deserializeFromMemoryStream '"\\" >> java-benchmark
-	@echo '   -DdataFile=$${data_files:0:-1} $${conf[*]}' >> java-benchmark
-	@chmod +x java-benchmark
-
-java: protoc_middleman protoc_middleman2 java-benchmark
-	./java-benchmark $(all_data)
-
-############# JAVA RULES END ##############
-
-
-############# PYTHON RULES ##############
-
-python_add_init: protoc_middleman protoc_middleman2
-	all_file=`find tmp -type f -regex '.*\.py'` &&                   \
-	for file in $${all_file[@]}; do                                  \
-		path="$${file%/*}";                                            \
-		while true; do                                                 \
-			touch "$$path/__init__.py" && chmod +x "$$path/__init__.py"; \
-			if [[ $$path != *"/"* ]]; then break; fi;                    \
-			path=$${path%/*};                                            \
-		done                                                           \
-	done
-
-python_cpp_pkg_flags = `pkg-config --cflags --libs python3`
-
-lib_LTLIBRARIES = libbenchmark_messages.la
-libbenchmark_messages_la_SOURCES = python/python_benchmark_messages.cc
-libbenchmark_messages_la_LIBADD = $(top_srcdir)/src/.libs/libprotobuf.la
-libbenchmark_messages_la_LDFLAGS = -version-info 1:0:0 -export-dynamic
-libbenchmark_messages_la_CPPFLAGS = -I$(top_srcdir)/src -I$(srcdir)/cpp $(python_cpp_pkg_flags)
-libbenchmark_messages_la-python_benchmark_messages.$(OBJEXT): $(benchmarks_protoc_outputs_header) $(benchmarks_protoc_outputs_proto2_header) $(benchmarks_protoc_outputs) $(benchmarks_protoc_outputs_proto2)
-nodist_libbenchmark_messages_la_SOURCES =                         \
-	$(benchmarks_protoc_outputs)                                    \
-	$(benchmarks_protoc_outputs_proto2)                             \
-	$(benchmarks_protoc_outputs_proto2_header)                      \
-	$(benchmarks_protoc_outputs_header)
-
-python-pure-python-benchmark: python_add_init
-	@echo "Writing shortcut script python-pure-python-benchmark..."
-	@echo '#! /bin/bash' > python-pure-python-benchmark
-	@echo export LD_LIBRARY_PATH=$(top_srcdir)/src/.libs >> python-pure-python-benchmark
-	@echo export DYLD_LIBRARY_PATH=$(top_srcdir)/src/.libs >> python-pure-python-benchmark
-	@echo export PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=\'python\' >> python-pure-python-benchmark
-	@echo cp $(srcdir)/python/py_benchmark.py tmp >> python-pure-python-benchmark
-	@echo python3 tmp/py_benchmark.py '$$@' >> python-pure-python-benchmark
-	@chmod +x python-pure-python-benchmark
-
-python-cpp-reflection-benchmark: python_add_init
-	@echo "Writing shortcut script python-cpp-reflection-benchmark..."
-	@echo '#! /bin/bash' > python-cpp-reflection-benchmark
-	@echo export LD_LIBRARY_PATH=$(top_srcdir)/src/.libs >> python-cpp-reflection-benchmark
-	@echo export DYLD_LIBRARY_PATH=$(top_srcdir)/src/.libs >> python-cpp-reflection-benchmark
-	@echo export PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=\'cpp\' >> python-cpp-reflection-benchmark
-	@echo cp $(srcdir)/python/py_benchmark.py tmp >> python-cpp-reflection-benchmark
-	@echo python3 tmp/py_benchmark.py '$$@' >> python-cpp-reflection-benchmark
-	@chmod +x python-cpp-reflection-benchmark
-
-python-cpp-generated-code-benchmark: python_add_init libbenchmark_messages.la
-	@echo "Writing shortcut script python-cpp-generated-code-benchmark..."
-	@echo '#! /bin/bash' > python-cpp-generated-code-benchmark
-	@echo export LD_LIBRARY_PATH=$(top_srcdir)/src/.libs >> python-cpp-generated-code-benchmark
-	@echo export DYLD_LIBRARY_PATH=$(top_srcdir)/src/.libs >> python-cpp-generated-code-benchmark
-	@echo export PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=\'cpp\' >> python-cpp-generated-code-benchmark
-	@echo cp $(srcdir)/python/py_benchmark.py tmp >> python-cpp-generated-code-benchmark
-	@echo python3 tmp/py_benchmark.py --cpp_generated '$$@' >> python-cpp-generated-code-benchmark
-	@chmod +x python-cpp-generated-code-benchmark
-
-python-pure-python: python-pure-python-benchmark
-	./python-pure-python-benchmark $(all_data)
-
-python-cpp-reflection: python-cpp-reflection-benchmark
-	./python-cpp-reflection-benchmark $(all_data)
-
-python-cpp-generated-code: python-cpp-generated-code-benchmark
-	./python-cpp-generated-code-benchmark $(all_data)
-
-############# PYTHON RULES END ##############
-
-############# GO RULES BEGIN ##############
-
-benchmarks_protoc_inputs_proto2_message1 =                                 \
-	datasets/google_message1/proto2/benchmark_message1_proto2.proto
-
-benchmarks_protoc_inputs_proto2_message2 =                                 \
-	datasets/google_message2/benchmark_message2.proto
-
-benchmarks_protoc_inputs_proto2_message3 =                                 \
-	datasets/google_message3/benchmark_message3.proto                        \
-	datasets/google_message3/benchmark_message3_1.proto                      \
-	datasets/google_message3/benchmark_message3_2.proto                      \
-	datasets/google_message3/benchmark_message3_3.proto                      \
-	datasets/google_message3/benchmark_message3_4.proto                      \
-	datasets/google_message3/benchmark_message3_5.proto                      \
-	datasets/google_message3/benchmark_message3_6.proto                      \
-	datasets/google_message3/benchmark_message3_7.proto                      \
-	datasets/google_message3/benchmark_message3_8.proto
-
-benchmarks_protoc_inputs_proto2_message4 =                                 \
-	datasets/google_message4/benchmark_message4.proto                        \
-	datasets/google_message4/benchmark_message4_1.proto                      \
-	datasets/google_message4/benchmark_message4_2.proto                      \
-	datasets/google_message4/benchmark_message4_3.proto
-
-go_protoc_middleman: make_tmp_dir $(top_srcdir)/src/protoc$(EXEEXT) $(benchmarks_protoc_inputs) $(well_known_type_protoc_inputs) $(benchmarks_protoc_inputs_proto2_message1) $(benchmarks_protoc_inputs_proto2_message2) $(benchmarks_protoc_inputs_proto2_message3) $(benchmarks_protoc_inputs_proto2_message4) $(well_known_type_protoc_inputs)
-	oldpwd=`pwd` && ( cd $(srcdir) && $$oldpwd/../src/protoc$(EXEEXT) -I. -I$(top_srcdir)/src --go_out=$$oldpwd/tmp $(benchmarks_protoc_inputs) )
-	oldpwd=`pwd` && ( cd $(srcdir) && $$oldpwd/../src/protoc$(EXEEXT) -I. -I$(top_srcdir)/src --go_out=$$oldpwd/tmp $(benchmarks_protoc_inputs_benchmark_wrapper) )
-	oldpwd=`pwd` && ( cd $(srcdir) && $$oldpwd/../src/protoc$(EXEEXT) -I. -I$(top_srcdir)/src --go_out=$$oldpwd/tmp $(benchmarks_protoc_inputs_proto2_message1) )
-	oldpwd=`pwd` && ( cd $(srcdir) && $$oldpwd/../src/protoc$(EXEEXT) -I. -I$(top_srcdir)/src --go_out=$$oldpwd/tmp $(benchmarks_protoc_inputs_proto2_message2) )
-	oldpwd=`pwd` && ( cd $(srcdir) && $$oldpwd/../src/protoc$(EXEEXT) -I. -I$(top_srcdir)/src --go_out=$$oldpwd/tmp $(benchmarks_protoc_inputs_proto2_message3) )
-	oldpwd=`pwd` && ( cd $(srcdir) && $$oldpwd/../src/protoc$(EXEEXT) -I. -I$(top_srcdir)/src --go_out=$$oldpwd/tmp $(benchmarks_protoc_inputs_proto2_message4) )
-	touch go_protoc_middleman
-
-go-benchmark: go_protoc_middleman
-	@echo "Writing shortcut script go-benchmark..."
-	@echo '#! /bin/bash' > go-benchmark
-	@echo 'cd $(srcdir)/go' >> go-benchmark
-	@echo 'all_data=""' >> go-benchmark
-	@echo 'conf=()' >> go-benchmark
-	@echo 'data_files=()' >> go-benchmark
-	@echo 'for arg in $$@; do if [[ $${arg:0:1} == "-" ]]; then conf+=($$arg); else data_files+=("$$arg"); fi; done' >> go-benchmark
-	@echo 'go test -bench=. $${conf[*]} -- $${data_files[*]}' >> go-benchmark
-	@echo 'cd ..' >> go-benchmark
-	@chmod +x go-benchmark
-
-go: go_protoc_middleman go-benchmark
-	./go-benchmark $(all_data)
-
-############# GO RULES END ##############
-
-############# GOGO RULES BEGIN ############
-
-cpp_no_group_benchmarks_protoc_outputs_header =                             \
-	gogo/cpp_no_group/benchmarks.pb.h                                         \
-	gogo/cpp_no_group/datasets/google_message1/proto3/benchmark_message1_proto3.pb.h
-
-cpp_no_group_benchmarks_protoc_outputs =                                    \
-	gogo/cpp_no_group/benchmarks.pb.cc                                        \
-	gogo/cpp_no_group/datasets/google_message1/proto3/benchmark_message1_proto3.pb.cc
-
-cpp_no_group_benchmarks_protoc_outputs_proto2_header =                      \
-	gogo/cpp_no_group/datasets/google_message1/proto2/benchmark_message1_proto2.pb.h \
-	gogo/cpp_no_group/datasets/google_message2/benchmark_message2.pb.h        \
-	gogo/cpp_no_group/datasets/google_message3/benchmark_message3.pb.h        \
-	gogo/cpp_no_group/datasets/google_message3/benchmark_message3_1.pb.h      \
-	gogo/cpp_no_group/datasets/google_message3/benchmark_message3_2.pb.h      \
-	gogo/cpp_no_group/datasets/google_message3/benchmark_message3_3.pb.h      \
-	gogo/cpp_no_group/datasets/google_message3/benchmark_message3_4.pb.h      \
-	gogo/cpp_no_group/datasets/google_message3/benchmark_message3_5.pb.h      \
-	gogo/cpp_no_group/datasets/google_message3/benchmark_message3_6.pb.h      \
-	gogo/cpp_no_group/datasets/google_message3/benchmark_message3_7.pb.h      \
-	gogo/cpp_no_group/datasets/google_message3/benchmark_message3_8.pb.h      \
-	gogo/cpp_no_group/datasets/google_message4/benchmark_message4.pb.h        \
-	gogo/cpp_no_group/datasets/google_message4/benchmark_message4_1.pb.h      \
-	gogo/cpp_no_group/datasets/google_message4/benchmark_message4_2.pb.h      \
-	gogo/cpp_no_group/datasets/google_message4/benchmark_message4_3.pb.h
-
-cpp_no_group_benchmarks_protoc_outputs_proto2 =                             \
-	gogo/cpp_no_group/datasets/google_message1/proto2/benchmark_message1_proto2.pb.cc \
-	gogo/cpp_no_group/datasets/google_message2/benchmark_message2.pb.cc       \
-	gogo/cpp_no_group/datasets/google_message3/benchmark_message3.pb.cc       \
-	gogo/cpp_no_group/datasets/google_message3/benchmark_message3_1.pb.cc     \
-	gogo/cpp_no_group/datasets/google_message3/benchmark_message3_2.pb.cc     \
-	gogo/cpp_no_group/datasets/google_message3/benchmark_message3_3.pb.cc     \
-	gogo/cpp_no_group/datasets/google_message3/benchmark_message3_4.pb.cc     \
-	gogo/cpp_no_group/datasets/google_message3/benchmark_message3_5.pb.cc     \
-	gogo/cpp_no_group/datasets/google_message3/benchmark_message3_6.pb.cc     \
-	gogo/cpp_no_group/datasets/google_message3/benchmark_message3_7.pb.cc     \
-	gogo/cpp_no_group/datasets/google_message3/benchmark_message3_8.pb.cc     \
-	gogo/cpp_no_group/datasets/google_message4/benchmark_message4.pb.cc       \
-	gogo/cpp_no_group/datasets/google_message4/benchmark_message4_1.pb.cc     \
-	gogo/cpp_no_group/datasets/google_message4/benchmark_message4_2.pb.cc     \
-	gogo/cpp_no_group/datasets/google_message4/benchmark_message4_3.pb.cc
-
-$(cpp_no_group_benchmarks_protoc_outputs): cpp_no_group_protoc_middleman
-$(cpp_no_group_benchmarks_protoc_outputs_header): cpp_no_group_protoc_middleman
-$(cpp_no_group_benchmarks_protoc_outputs_proto2): cpp_no_group_protoc_middleman
-$(cpp_no_group_benchmarks_protoc_outputs_proto2_header): cpp_no_group_protoc_middleman
-
-generate_cpp_no_group_benchmark_code:
-	cp $(srcdir)/cpp/cpp_benchmark.cc gogo/cpp_no_group/cpp_benchmark.cc
-	sed -i -e "s/\#include \"datasets/\#include \"gogo\/cpp_no_group\/datasets/g" gogo/cpp_no_group/cpp_benchmark.cc
-	sed -i -e "s/\#include \"benchmarks.pb.h/\#include \"gogo\/cpp_no_group\/benchmarks.pb.h/g" gogo/cpp_no_group/cpp_benchmark.cc
-	touch generate_cpp_no_group_benchmark_code
-
-bin_PROGRAMS += cpp-no-group-benchmark
-cpp_no_group_benchmark_LDADD = $(top_srcdir)/src/libprotobuf.la $(top_srcdir)/third_party/benchmark/src/libbenchmark.a
-cpp_no_group_benchmark_SOURCES = gogo/cpp_no_group/cpp_benchmark.cc
-cpp_no_group_benchmark_CPPFLAGS = -I$(top_srcdir)/src -I$(srcdir)/gogo/cpp_no_group -I$(top_srcdir)/third_party/benchmark/include
-# Explicit deps because BUILT_SOURCES are only done before a "make all/check"
-# so a direct "make test_cpp" could fail if parallel enough.
-# See: https://www.gnu.org/software/automake/manual/html_node/Built-Sources-Example.html#Recording-Dependencies-manually
-gogo/cpp_no_group/cpp_no_group_benchmark-cpp_benchmark.$(OBJEXT): $(cpp_no_group_benchmarks_protoc_outputs) $(cpp_no_group_benchmarks_protoc_outputs_proto2) $(cpp_no_group_benchmarks_protoc_outputs_header) \
-	$(cpp_no_group_benchmarks_protoc_outputs_proto2_header) $(top_srcdir)/third_party/benchmark/src/libbenchmark.a generate_cpp_no_group_benchmark_code
-gogo/cpp_no_group/cpp_benchmark.cc: generate_cpp_no_group_benchmark_code
-nodist_cpp_no_group_benchmark_SOURCES =                                    \
-	$(cpp_no_group_benchmarks_protoc_outputs_proto2)                         \
-	$(cpp_no_group_benchmarks_protoc_outputs)                                \
-	$(cpp_no_group_benchmarks_protoc_outputs_header)                         \
-	$(cpp_no_group_benchmarks_protoc_outputs_proto2_header)
-
-cpp_no_group: cpp_no_group_protoc_middleman generate_gogo_data cpp-no-group-benchmark
-	./cpp-no-group-benchmark $(gogo_data)
-
-gogo_proto_middleman: protoc-gen-gogoproto
-	mkdir -p "tmp/gogo_proto"
-	oldpwd=`pwd` && ( cd $(srcdir) && $$oldpwd/../src/protoc$(EXEEXT) -I$(srcdir) -I$(top_srcdir) --plugin=protoc-gen-gogoproto --gogoproto_out=$$oldpwd/tmp/gogo_proto $(benchmarks_protoc_inputs) $(benchmarks_protoc_inputs_benchmark_wrapper) $(benchmarks_protoc_inputs_proto2) )
-	touch gogo_proto_middleman
-
-gogo_data = $$(for data in $(all_data); do echo "tmp/gogo_data$${data\#$(srcdir)}"; done | xargs)
-
-generate_gogo_data: protoc_middleman protoc_middleman2 gogo-data-scrubber
-	mkdir -p `dirname $(gogo_data)`
-	./gogo-data-scrubber $(all_data) $(gogo_data)
-	touch generate_gogo_data
-
-make_tmp_dir_gogo:
-	mkdir -p tmp/go_no_group/benchmark_code
-	mkdir -p tmp/gogofast/benchmark_code
-	mkdir -p tmp/gogofaster/benchmark_code
-	mkdir -p tmp/gogoslick/benchmark_code
-	touch make_tmp_dir_gogo
-
-go_no_group_protoc_middleman: make_tmp_dir_gogo $(top_srcdir)/src/protoc$(EXEEXT) gogo_proto_middleman $(well_known_type_protoc_inputs)
-	oldpwd=`pwd` && ( cd $(srcdir)/tmp/gogo_proto && $$oldpwd/../src/protoc$(EXEEXT) -I. -I$$oldpwd/$(top_srcdir)/src --go_out=$$oldpwd/tmp/go_no_group $(benchmarks_protoc_inputs) )
-	oldpwd=`pwd` && ( cd $(srcdir)/tmp/gogo_proto && $$oldpwd/../src/protoc$(EXEEXT) -I. -I$$oldpwd/$(top_srcdir)/src --go_out=$$oldpwd/tmp/go_no_group $(benchmarks_protoc_inputs_benchmark_wrapper) )
-	oldpwd=`pwd` && ( cd $(srcdir)/tmp/gogo_proto && $$oldpwd/../src/protoc$(EXEEXT) -I. -I$$oldpwd/$(top_srcdir)/src --go_out=$$oldpwd/tmp/go_no_group $(benchmarks_protoc_inputs_proto2_message1) )
-	oldpwd=`pwd` && ( cd $(srcdir)/tmp/gogo_proto && $$oldpwd/../src/protoc$(EXEEXT) -I. -I$$oldpwd/$(top_srcdir)/src --go_out=$$oldpwd/tmp/go_no_group $(benchmarks_protoc_inputs_proto2_message2) )
-	oldpwd=`pwd` && ( cd $(srcdir)/tmp/gogo_proto && $$oldpwd/../src/protoc$(EXEEXT) -I. -I$$oldpwd/$(top_srcdir)/src --go_out=$$oldpwd/tmp/go_no_group $(benchmarks_protoc_inputs_proto2_message3) )
-	oldpwd=`pwd` && ( cd $(srcdir)/tmp/gogo_proto && $$oldpwd/../src/protoc$(EXEEXT) -I. -I$$oldpwd/$(top_srcdir)/src --go_out=$$oldpwd/tmp/go_no_group $(benchmarks_protoc_inputs_proto2_message4) )
-	touch go_no_group_protoc_middleman
-
-cpp_no_group_protoc_middleman: make_tmp_dir_gogo $(top_srcdir)/src/protoc$(EXEEXT) gogo_proto_middleman $(well_known_type_protoc_inputs)
-	oldpwd=`pwd` && ( cd $(srcdir)/tmp/gogo_proto && $$oldpwd/../src/protoc$(EXEEXT) -I. -I$$oldpwd/$(top_srcdir)/src --cpp_out=$$oldpwd/gogo/cpp_no_group $(benchmarks_protoc_inputs) )
-	oldpwd=`pwd` && ( cd $(srcdir)/tmp/gogo_proto && $$oldpwd/../src/protoc$(EXEEXT) -I. -I$$oldpwd/$(top_srcdir)/src --cpp_out=$$oldpwd/gogo/cpp_no_group $(benchmarks_protoc_inputs_benchmark_wrapper) )
-	oldpwd=`pwd` && ( cd $(srcdir)/tmp/gogo_proto && $$oldpwd/../src/protoc$(EXEEXT) -I. -I$$oldpwd/$(top_srcdir)/src --cpp_out=$$oldpwd/gogo/cpp_no_group $(benchmarks_protoc_inputs_proto2_message1) )
-	oldpwd=`pwd` && ( cd $(srcdir)/tmp/gogo_proto && $$oldpwd/../src/protoc$(EXEEXT) -I. -I$$oldpwd/$(top_srcdir)/src --cpp_out=$$oldpwd/gogo/cpp_no_group $(benchmarks_protoc_inputs_proto2_message2) )
-	oldpwd=`pwd` && ( cd $(srcdir)/tmp/gogo_proto && $$oldpwd/../src/protoc$(EXEEXT) -I. -I$$oldpwd/$(top_srcdir)/src --cpp_out=$$oldpwd/gogo/cpp_no_group $(benchmarks_protoc_inputs_proto2_message3) )
-	oldpwd=`pwd` && ( cd $(srcdir)/tmp/gogo_proto && $$oldpwd/../src/protoc$(EXEEXT) -I. -I$$oldpwd/$(top_srcdir)/src --cpp_out=$$oldpwd/gogo/cpp_no_group $(benchmarks_protoc_inputs_proto2_message4) )
-	touch cpp_no_group_protoc_middleman
-
-gogofast_protoc_middleman: make_tmp_dir_gogo $(top_srcdir)/src/protoc$(EXEEXT) gogo_proto_middleman $(well_known_type_protoc_inputs)
-	oldpwd=`pwd` && ( cd $(srcdir)/tmp/gogo_proto && $$oldpwd/../src/protoc$(EXEEXT) -I. -I$$oldpwd/$(top_srcdir)/src --gogofast_out=$$oldpwd/tmp/gogofast $(benchmarks_protoc_inputs) )
-	oldpwd=`pwd` && ( cd $(srcdir)/tmp/gogo_proto && $$oldpwd/../src/protoc$(EXEEXT) -I. -I$$oldpwd/$(top_srcdir)/src --gogofast_out=$$oldpwd/tmp/gogofast $(benchmarks_protoc_inputs_benchmark_wrapper) )
-	oldpwd=`pwd` && ( cd $(srcdir)/tmp/gogo_proto && $$oldpwd/../src/protoc$(EXEEXT) -I. -I$$oldpwd/$(top_srcdir)/src --gogofast_out=$$oldpwd/tmp/gogofast $(benchmarks_protoc_inputs_proto2_message1) )
-	oldpwd=`pwd` && ( cd $(srcdir)/tmp/gogo_proto && $$oldpwd/../src/protoc$(EXEEXT) -I. -I$$oldpwd/$(top_srcdir)/src --gogofast_out=$$oldpwd/tmp/gogofast $(benchmarks_protoc_inputs_proto2_message2) )
-	oldpwd=`pwd` && ( cd $(srcdir)/tmp/gogo_proto && $$oldpwd/../src/protoc$(EXEEXT) -I. -I$$oldpwd/$(top_srcdir)/src --gogofast_out=$$oldpwd/tmp/gogofast $(benchmarks_protoc_inputs_proto2_message3) )
-	oldpwd=`pwd` && ( cd $(srcdir)/tmp/gogo_proto && $$oldpwd/../src/protoc$(EXEEXT) -I. -I$$oldpwd/$(top_srcdir)/src --gogofast_out=$$oldpwd/tmp/gogofast $(benchmarks_protoc_inputs_proto2_message4) )
-	touch gogofast_protoc_middleman
-
-gogofaster_protoc_middleman: make_tmp_dir_gogo $(top_srcdir)/src/protoc$(EXEEXT) gogo_proto_middleman $(well_known_type_protoc_inputs)
-	oldpwd=`pwd` && ( cd $(srcdir)/tmp/gogo_proto && $$oldpwd/../src/protoc$(EXEEXT) -I. -I$$oldpwd/$(top_srcdir)/src --gogofaster_out=$$oldpwd/tmp/gogofaster $(benchmarks_protoc_inputs) )
-	oldpwd=`pwd` && ( cd $(srcdir)/tmp/gogo_proto && $$oldpwd/../src/protoc$(EXEEXT) -I. -I$$oldpwd/$(top_srcdir)/src --gogofaster_out=$$oldpwd/tmp/gogofaster $(benchmarks_protoc_inputs_benchmark_wrapper) )
-	oldpwd=`pwd` && ( cd $(srcdir)/tmp/gogo_proto && $$oldpwd/../src/protoc$(EXEEXT) -I. -I$$oldpwd/$(top_srcdir)/src --gogofaster_out=$$oldpwd/tmp/gogofaster $(benchmarks_protoc_inputs_proto2_message1) )
-	oldpwd=`pwd` && ( cd $(srcdir)/tmp/gogo_proto && $$oldpwd/../src/protoc$(EXEEXT) -I. -I$$oldpwd/$(top_srcdir)/src --gogofaster_out=$$oldpwd/tmp/gogofaster $(benchmarks_protoc_inputs_proto2_message2) )
-	oldpwd=`pwd` && ( cd $(srcdir)/tmp/gogo_proto && $$oldpwd/../src/protoc$(EXEEXT) -I. -I$$oldpwd/$(top_srcdir)/src --gogofaster_out=$$oldpwd/tmp/gogofaster $(benchmarks_protoc_inputs_proto2_message3) )
-	oldpwd=`pwd` && ( cd $(srcdir)/tmp/gogo_proto && $$oldpwd/../src/protoc$(EXEEXT) -I. -I$$oldpwd/$(top_srcdir)/src --gogofaster_out=$$oldpwd/tmp/gogofaster $(benchmarks_protoc_inputs_proto2_message4) )
-	touch gogofaster_protoc_middleman
-
-gogoslick_protoc_middleman: make_tmp_dir_gogo $(top_srcdir)/src/protoc$(EXEEXT) gogo_proto_middleman $(well_known_type_protoc_inputs)
-	oldpwd=`pwd` && ( cd $(srcdir)/tmp/gogo_proto && $$oldpwd/../src/protoc$(EXEEXT) -I. -I$$oldpwd/$(top_srcdir)/src --gogoslick_out=$$oldpwd/tmp/gogoslick $(benchmarks_protoc_inputs) )
-	oldpwd=`pwd` && ( cd $(srcdir)/tmp/gogo_proto && $$oldpwd/../src/protoc$(EXEEXT) -I. -I$$oldpwd/$(top_srcdir)/src --gogoslick_out=$$oldpwd/tmp/gogoslick $(benchmarks_protoc_inputs_benchmark_wrapper) )
-	oldpwd=`pwd` && ( cd $(srcdir)/tmp/gogo_proto && $$oldpwd/../src/protoc$(EXEEXT) -I. -I$$oldpwd/$(top_srcdir)/src --gogoslick_out=$$oldpwd/tmp/gogoslick $(benchmarks_protoc_inputs_proto2_message1) )
-	oldpwd=`pwd` && ( cd $(srcdir)/tmp/gogo_proto && $$oldpwd/../src/protoc$(EXEEXT) -I. -I$$oldpwd/$(top_srcdir)/src --gogoslick_out=$$oldpwd/tmp/gogoslick $(benchmarks_protoc_inputs_proto2_message2) )
-	oldpwd=`pwd` && ( cd $(srcdir)/tmp/gogo_proto && $$oldpwd/../src/protoc$(EXEEXT) -I. -I$$oldpwd/$(top_srcdir)/src --gogoslick_out=$$oldpwd/tmp/gogoslick $(benchmarks_protoc_inputs_proto2_message3) )
-	oldpwd=`pwd` && ( cd $(srcdir)/tmp/gogo_proto && $$oldpwd/../src/protoc$(EXEEXT) -I. -I$$oldpwd/$(top_srcdir)/src --gogoslick_out=$$oldpwd/tmp/gogoslick $(benchmarks_protoc_inputs_proto2_message4) )
-	touch gogoslick_protoc_middleman
-
-generate-gogo-benchmark-code:
-	@echo '#! /bin/bash' > generate-gogo-benchmark-code
-	@echo 'cp $(srcdir)/go/go_benchmark_test.go tmp/$$1/benchmark_code/$$1_benchmark1_test.go' >> generate-gogo-benchmark-code
-	@echo 'sed -i -e "s/\.\.\/tmp/../g" tmp/$$1/benchmark_code/$$1_benchmark1_test.go' >> generate-gogo-benchmark-code
-	@echo 'sed -i -e "s/b\.Run(\"\(.*\)\"/b.Run(\"\1\_$$1\"/g" tmp/$$1/benchmark_code/$$1_benchmark1_test.go' >> generate-gogo-benchmark-code
-	@echo 'if [[ $$2 == 1 ]]; then sed -i -e "s/github\.com\/golang/github.com\/gogo/g" tmp/$$1/benchmark_code/$$1_benchmark1_test.go; fi ' >> generate-gogo-benchmark-code
-	@chmod +x generate-gogo-benchmark-code
-
-generate_all_gogo_benchmark_code: generate-gogo-benchmark-code make_tmp_dir_gogo
-	./generate-gogo-benchmark-code go_no_group 0
-	./generate-gogo-benchmark-code gogofast 1
-	./generate-gogo-benchmark-code gogofaster 1
-	./generate-gogo-benchmark-code gogoslick 1
-
-gogo-benchmark:
-	@echo "Writing shortcut script gogo-benchmark..."
-	@echo '#! /bin/bash' > gogo-benchmark
-	@echo 'cd tmp/$$1/benchmark_code' >> gogo-benchmark
-	@echo 'shift' >> gogo-benchmark
-	@echo 'all_data=""' >> gogo-benchmark
-	@echo 'for data_file in $$@; do all_data="$$all_data ../../../$$data_file"; done' >> gogo-benchmark
-	@echo 'go test -bench=. -- $$all_data' >> gogo-benchmark
-	@echo 'cd ../..' >> gogo-benchmark
-	@chmod +x gogo-benchmark
-
-go_no_group: go_no_group_protoc_middleman generate_gogo_data generate_all_gogo_benchmark_code gogo-benchmark
-	./gogo-benchmark go_no_group $(gogo_data)
-
-gogofast: gogofast_protoc_middleman generate_gogo_data gogo-benchmark generate_all_gogo_benchmark_code
-	./gogo-benchmark gogofast $(gogo_data)
-
-gogofaster: gogofaster_protoc_middleman  generate_gogo_data gogo-benchmark generate_all_gogo_benchmark_code
-	./gogo-benchmark gogofaster $(gogo_data)
-
-gogoslick: gogoslick_protoc_middleman  generate_gogo_data gogo-benchmark generate_all_gogo_benchmark_code
-	./gogo-benchmark gogoslick $(gogo_data)
-
-
-############# GOGO RULES END ############
-
-
-############ UTIL RULES BEGIN ############
-
-bin_PROGRAMS += protoc-gen-gogoproto gogo-data-scrubber protoc-gen-proto2_to_proto3 proto3-data-stripper
-
-protoc_gen_gogoproto_LDADD = $(top_srcdir)/src/libprotobuf.la $(top_srcdir)/src/libprotoc.la
-protoc_gen_gogoproto_SOURCES = util/protoc-gen-gogoproto.cc
-protoc_gen_gogoproto_CPPFLAGS = -I$(top_srcdir)/src -I$(srcdir)/cpp -I$(srcdir)/util
-
-gogo_data_scrubber_LDADD = $(top_srcdir)/src/libprotobuf.la
-gogo_data_scrubber_SOURCES = util/gogo_data_scrubber.cc
-gogo_data_scrubber_CPPFLAGS = -I$(top_srcdir)/src -I$(srcdir)/cpp -I$(srcdir)/util
-util/gogo_data_scrubber-gogo_data_scrubber.$(OBJEXT): $(benchmarks_protoc_outputs) $(benchmarks_protoc_outputs_proto2) $(benchmarks_protoc_outputs_header) $(benchmarks_protoc_outputs_proto2_header)
-nodist_gogo_data_scrubber_SOURCES =                                        \
-	$(benchmarks_protoc_outputs)                                             \
-	$(benchmarks_protoc_outputs_proto2)                                      \
-	$(benchmarks_protoc_outputs_proto2_header)                               \
-	$(benchmarks_protoc_outputs_header)
-
-protoc_gen_proto2_to_proto3_LDADD = $(top_srcdir)/src/libprotobuf.la $(top_srcdir)/src/libprotoc.la
-protoc_gen_proto2_to_proto3_SOURCES = util/protoc-gen-proto2_to_proto3.cc
-protoc_gen_proto2_to_proto3_CPPFLAGS = -I$(top_srcdir)/src -I$(srcdir)/cpp -I$(srcdir)/util
-
-proto3_data_stripper_LDADD = $(top_srcdir)/src/libprotobuf.la
-proto3_data_stripper_SOURCES = util/proto3_data_stripper.cc
-proto3_data_stripper_CPPFLAGS = -I$(top_srcdir)/src -I$(srcdir)/cpp -I$(srcdir)/util
-util/proto3_data_stripper-proto3_data_stripper.$(OBJEXT): $(benchmarks_protoc_outputs) $(benchmarks_protoc_outputs_proto2) $(benchmarks_protoc_outputs_header) $(benchmarks_protoc_outputs_proto2_header)
-nodist_proto3_data_stripper_SOURCES =                                      \
-	$(benchmarks_protoc_outputs)                                             \
-	$(benchmarks_protoc_outputs_proto2)                                      \
-	$(benchmarks_protoc_outputs_proto2_header)                               \
-	$(benchmarks_protoc_outputs_header)
-
-
-############ UTIL RULES END ############
-
-############ PROTO3 PREPARATION BEGIN #############
-
-proto3_proto_middleman: protoc-gen-proto2_to_proto3
-	mkdir -p "tmp/proto3_proto"
-	oldpwd=`pwd` && ( cd $(srcdir) && $$oldpwd/../src/protoc$(EXEEXT) -I$(srcdir) -I$(top_srcdir) --plugin=protoc-gen-proto2_to_proto3 --proto2_to_proto3_out=$$oldpwd/tmp/proto3_proto $(benchmarks_protoc_inputs) $(benchmarks_protoc_inputs_benchmark_wrapper) $(benchmarks_protoc_inputs_proto2) )
-	touch proto3_proto_middleman
-
-full_srcdir = $$(cd $(srcdir) && pwd)
-proto3_data = $$(for data in $(all_data); do echo $(full_srcdir)"/tmp/proto3_data$${data\#$(full_srcdir)}"; done | xargs)
-
-generate_proto3_data: protoc_middleman protoc_middleman2 proto3-data-stripper
-	mkdir -p `dirname $(proto3_data)`
-	./proto3-data-stripper $(all_data) $(proto3_data)
-	touch generate_proto3_data
-
-############ PROTO3 PREPARATION END #############
-
-############ PHP RULES BEGIN #################
-
-proto3_middleman_php: proto3_proto_middleman
-	mkdir -p "tmp/php"
-	oldpwd=`pwd` && ( cd tmp/proto3_proto && $$oldpwd/../src/protoc$(EXEEXT) -I$(srcdir) -I$(top_srcdir) --php_out=$$oldpwd/tmp/php $(benchmarks_protoc_inputs) $(benchmarks_protoc_inputs_benchmark_wrapper) $(benchmarks_protoc_inputs_proto2) )
-	touch proto3_middleman_php
-
-php-benchmark: proto3_middleman_php generate_proto3_data
-	mkdir -p "tmp/php/Google/Protobuf/Benchmark" && cp php/PhpBenchmark.php "tmp/php/Google/Protobuf/Benchmark"
-	cp php/autoload.php "tmp/php"
-	@echo "Writing shortcut script php-benchmark..."
-	@echo '#! /bin/bash' > php-benchmark
-	@echo 'export PROTOBUF_PHP_SRCDIR="$$(cd $(top_srcdir) && pwd)/php/src"' >> php-benchmark
-	@echo 'cd tmp/php' >> php-benchmark
-	@echo 'export CURRENT_DIR=$$(pwd)' >> php-benchmark
-	@echo 'php -d auto_prepend_file="autoload.php" -d include_path="$$(pwd)" Google/Protobuf/Benchmark/PhpBenchmark.php $$@' >> php-benchmark
-	@echo 'cd ../..' >> php-benchmark
-	@chmod +x php-benchmark
-
-php: php-benchmark proto3_middleman_php
-	./php-benchmark --behavior_prefix="php" $(proto3_data)
-
-php_c_extension:
-	cd $(top_srcdir)/php/ext/google/protobuf && phpize && ./configure CFLAGS='-O3' && make -j8
-
-php-c-benchmark: proto3_middleman_php generate_proto3_data php_c_extension php_c_extension
-	mkdir -p "tmp/php/Google/Protobuf/Benchmark" && cp php/PhpBenchmark.php "tmp/php/Google/Protobuf/Benchmark"
-	cp php/autoload.php "tmp/php"
-	@echo "Writing shortcut script php-c-benchmark..."
-	@echo '#! /bin/bash' > php-c-benchmark
-	@echo 'export PROTOBUF_PHP_SRCDIR="$$(cd $(top_srcdir) && pwd)/php/src"' >> php-c-benchmark
-	@echo 'export PROTOBUF_PHP_EXTDIR="$$PROTOBUF_PHP_SRCDIR/../ext/google/protobuf/modules"' >> php-c-benchmark
-	@echo 'cd tmp/php' >> php-c-benchmark
-	@echo 'export CURRENT_DIR=$$(pwd)' >> php-c-benchmark
-	@echo 'php -d auto_prepend_file="autoload.php" -d include_path="$$(pwd)" -d extension="$$PROTOBUF_PHP_EXTDIR/protobuf.so" Google/Protobuf/Benchmark/PhpBenchmark.php $$@' >> php-c-benchmark
-	@echo 'cd ../..' >> php-c-benchmark
-	@chmod +x php-c-benchmark
-
-php_c: php-c-benchmark proto3_middleman_php
-	./php-c-benchmark --behavior_prefix="php_c" $(proto3_data)
-
-
-############ PHP RULES END #################
-
-############ protobuf.js RULE BEGIN #############
-
-pbjs_preparation:
-	mkdir -p tmp/protobuf.js
-	cd tmp/protobuf.js && git clone https://github.com/dcodeIO/protobuf.js.git && \
-			cd protobuf.js && npm install && npm run build
-	cd tmp/protobuf.js && npm install benchmark
-	cp protobuf.js/* tmp/protobuf.js
-	cp js/benchmark_suite.js tmp/protobuf.js
-	touch pbjs_preparation
-
-pbjs_middleman: pbjs_preparation
-	export OLDDIR=$$(pwd) && cd tmp/protobuf.js && node generate_pbjs_files.js --target static-module --include_path=$$OLDDIR -o generated_bundle_code.js $(benchmarks_protoc_inputs) $(benchmarks_protoc_inputs_benchmark_wrapper) $(benchmarks_protoc_inputs_proto2)
-	touch pbjs_middleman
-
-pbjs-benchmark: pbjs_middleman
-	@echo '#! /bin/bash' > pbjs-benchmark
-	@echo 'cd tmp/protobuf.js' >> pbjs-benchmark
-	@echo 'sed -i "s/protobufjs/.\/protobuf.js/g" generated_bundle_code.js' >> pbjs-benchmark
-	@echo 'env NODE_PATH=".:./node_modules:$$NODE_PATH" node protobufjs_benchmark.js $$@' >> pbjs-benchmark
-	@chmod +x pbjs-benchmark
-
-pbjs: pbjs-benchmark
-	./pbjs-benchmark $(all_data)
-
-############ protobuf.js RULE END #############
-
-############ JS RULE BEGIN #############
-
-js_preparation:
-	mkdir -p tmp/js
-	oldpwd=$$(pwd) && cd $(top_srcdir)/js && npm install && npm test
-	cd tmp/js && npm install benchmark
-	cp js/* tmp/js
-	touch js_preparation
-
-js_middleman: js_preparation
-	oldpwd=`pwd` && ( cd $(srcdir) && $$oldpwd/../src/protoc$(EXEEXT) -I. -I$(top_srcdir)/src --js_out=import_style=commonjs,binary:$$oldpwd/tmp/js $(benchmarks_protoc_inputs) $(benchmarks_protoc_inputs_benchmark_wrapper) $(benchmarks_protoc_inputs_proto2))
-	touch js_middleman
-
-js-benchmark: js_middleman
-	@echo '#! /bin/bash' > js-benchmark
-	@echo 'export TOP_JS_SRCDIR=$$(cd $(top_srcdir)/js && pwd)' >> js-benchmark
-	@echo 'cd tmp/js' >> js-benchmark
-	@echo 'env NODE_PATH="$$TOP_JS_SRCDIR:.:./node_modules:$$NODE_PATH" node --max-old-space-size=4096 js_benchmark.js $$@' >> js-benchmark
-	@chmod +x js-benchmark
-
-js: js-benchmark
-	./js-benchmark $(all_data)
-
-############ JS RULE END #############
-
-EXTRA_DIST =									\
-	$(benchmarks_protoc_inputs_benchmark_wrapper)				\
-	$(benchmarks_protoc_inputs)						\
-	$(benchmarks_protoc_inputs_proto2)					\
-	google_size.proto
-
-MAINTAINERCLEANFILES =                                                     \
-	Makefile.in
-
-CLEANFILES =                                                               \
-	$(benchmarks_protoc_outputs)                                             \
-	$(benchmarks_protoc_outputs_header)                                      \
-	$(benchmarks_protoc_outputs_proto2)                                      \
-	$(benchmarks_protoc_outputs_proto2_header)                               \
-	initialize_submodule                                                     \
-	make_tmp_dir                                                             \
-	protoc_middleman                                                         \
-	protoc_middleman2                                                        \
-	javac_middleman                                                          \
-	java-benchmark                                                           \
-	python_cpp_proto_library                                                 \
-	python-pure-python-benchmark                                             \
-	python-cpp-reflection-benchmark                                          \
-	python-cpp-generated-code-benchmark                                      \
-	go-benchmark                                                             \
-	go_protoc_middleman                                                      \
-	make_tmp_dir_gogo                                                        \
-	gogo_proto_middleman                                                     \
-	generate_gogo_data                                                       \
-	go_no_group_protoc_middleman                                             \
-	go_no_group                                                              \
-	go-no-group-benchmark                                                    \
-	$(cpp_no_group_benchmarks_protoc_outputs_header)                         \
-	$(cpp_no_group_benchmarks_protoc_outputs)                                \
-	$(cpp_no_group_benchmarks_protoc_outputs_proto2_header)                  \
-	$(cpp_no_group_benchmarks_protoc_outputs_proto2)                         \
-	generate_all_gogo_benchmark_code                                         \
-	generate-gogo-benchmark-code                                             \
-	cpp_no_group_protoc_middleman                                            \
-	generate_cpp_no_group_benchmark_code                                     \
-	generate_gogo_benchmark_code                                             \
-	gogofast_protoc_middleman                                                \
-	gogofast                                                                 \
-	gogofaster_protoc_middleman                                              \
-	gogofaster                                                               \
-	gogoslick_protoc_middleman                                               \
-	gogoslick                                                                \
-	gogo-benchmark                                                           \
-	gogo/cpp_no_group/cpp_benchmark.*                                        \
-	proto3_proto_middleman                                                   \
-	generate_proto3_data                                                     \
-	php-benchmark                                                            \
-	php-c-benchmark                                                          \
-	proto3_middleman_php                                                     \
-	pbjs_preparation                                                         \
-	pbjs_middleman                                                           \
-	pbjs-benchmark                                                           \
-	js_preparation                                                           \
-	js_middleman                                                             \
-	js-benchmark
-
-clean-local:
-	-rm -rf tmp/*
-
diff --git a/libs/protobuf/benchmarks/README.md b/libs/protobuf/benchmarks/README.md
deleted file mode 100644
index 70c3596..0000000
--- a/libs/protobuf/benchmarks/README.md
+++ /dev/null
@@ -1,239 +0,0 @@
-
-# Protocol Buffers Benchmarks
-
-This directory contains benchmarking schemas and data sets that you
-can use to test a variety of performance scenarios against your
-protobuf language runtime. If you are looking for performance
-numbers of officially supported languages, see [Protobuf Performance](
-https://github.com/protocolbuffers/protobuf/blob/main/docs/performance.md).
-
-## Prerequisite
-
-First, you need to follow the instruction in the root directory's README to
-build your language's protobuf, then:
-
-### CPP
-You need to install [cmake](https://cmake.org/) before building the benchmark.
-
-We are using [google/benchmark](https://github.com/google/benchmark) as the
-benchmark tool for testing cpp. This will be automatically made during build the
-cpp benchmark.
-
-The cpp protobuf performance can be improved by linking with
-[TCMalloc](https://google.github.io/tcmalloc).
-
-### Java
-We're using maven to build the java benchmarks, which is the same as to build
-the Java protobuf. There're no other tools need to install. We're using
-[google/caliper](https://github.com/google/caliper) as benchmark tool, which
-can be automatically included by maven.
-
-### Python
-We're using python C++ API for testing the generated
-CPP proto version of python protobuf, which is also a prerequisite for Python
-protobuf cpp implementation. You need to install the correct version of Python
-C++ extension package before run generated CPP proto version of Python
-protobuf's benchmark. e.g. under Ubuntu, you need to
-
-```
-$ sudo apt-get install python-dev
-$ sudo apt-get install python3-dev
-```
-And you also need to make sure `pkg-config` is installed.
-
-### Go
-Go protobufs are maintained at [github.com/golang/protobuf](
-http://github.com/golang/protobuf). If not done already, you need to install the
-toolchain and the Go protoc-gen-go plugin for protoc.
-
-To install protoc-gen-go, run:
-
-```
-$ go get -u github.com/golang/protobuf/protoc-gen-go
-$ export PATH=$PATH:$(go env GOPATH)/bin
-```
-
-The first command installs `protoc-gen-go` into the `bin` directory in your local `GOPATH`.
-The second command adds the `bin` directory to your `PATH` so that `protoc` can locate the plugin later.
-
-### PHP
-PHP benchmark's requirement is the same as PHP protobuf's requirements. The benchmark will automatically
-include PHP protobuf's src and build the c extension if required.
-
-### Node.js
-Node.js benchmark need [node](https://nodejs.org/en/)(higher than V6) and [npm](https://www.npmjs.com/) package manager installed. This benchmark is using the [benchmark](https://www.npmjs.com/package/benchmark) framework to test, which needn't to manually install. And another prerequisite is [protobuf js](https://github.com/protocolbuffers/protobuf/tree/main/js), which needn't to manually install either
-
-### C#
-The C# benchmark code is built as part of the main Google.Protobuf
-solution. It requires the .NET Core SDK, and depends on
-[BenchmarkDotNet](https://github.com/dotnet/BenchmarkDotNet), which
-will be downloaded automatically.
-
-## Run instructions
-
-To run all the benchmark dataset:
-
-### Java:
-
-First build the Java binary in the usual way with Maven:
-
-```
-$ cd java
-$ mvn install
-```
-
-Assuming that completes successfully,
-
-```
-$ cd ../benchmarks
-$ make java
-```
-
-### CPP:
-
-```
-$ make cpp
-```
-
-For linking with tcmalloc:
-
-```
-$ env LD_PRELOAD={directory to libtcmalloc.so} make cpp
-```
-
-### Python:
-
-We have three versions of python protobuf implementation: pure python, cpp
-reflection and cpp generated code. To run these version benchmark, you need to:
-
-#### Pure Python:
-
-```
-$ make python-pure-python
-```
-
-#### CPP reflection:
-
-```
-$ make python-cpp-reflection
-```
-
-#### CPP generated code:
-
-```
-$ make python-cpp-generated-code
-```
-
-### Go
-```
-$ make go
-```
-
-
-### PHP
-We have two version of php protobuf implementation: pure php, php with c extension. To run these version benchmark, you need to:
-#### Pure PHP
-```
-$ make php
-```
-#### PHP with c extension
-```
-$ make php_c
-```
-
-### Node.js
-```
-$ make js
-```
-
-To run a specific dataset or run with specific options:
-
-### Java:
-
-```
-$ make java-benchmark
-$ ./java-benchmark $(specific generated dataset file name) [$(caliper options)]
-```
-
-### CPP:
-
-```
-$ make cpp-benchmark
-$ ./cpp-benchmark $(specific generated dataset file name) [$(benchmark options)]
-```
-
-### Python:
-
-For Python benchmark we have `--json` for outputting the json result
-
-#### Pure Python:
-
-```
-$ make python-pure-python-benchmark
-$ ./python-pure-python-benchmark [--json] $(specific generated dataset file name)
-```
-
-#### CPP reflection:
-
-```
-$ make python-cpp-reflection-benchmark
-$ ./python-cpp-reflection-benchmark [--json] $(specific generated dataset file name)
-```
-
-#### CPP generated code:
-
-```
-$ make python-cpp-generated-code-benchmark
-$ ./python-cpp-generated-code-benchmark [--json] $(specific generated dataset file name)
-```
-
-### Go:
-```
-$ make go-benchmark
-$ ./go-benchmark $(specific generated dataset file name) [go testing options]
-```
-
-### PHP
-#### Pure PHP
-```
-$ make php-benchmark
-$ ./php-benchmark $(specific generated dataset file name)
-```
-#### PHP with c extension
-```
-$ make php-c-benchmark
-$ ./php-c-benchmark $(specific generated dataset file name)
-```
-
-### Node.js
-```
-$ make js-benchmark
-$ ./js-benchmark $(specific generated dataset file name)
-```
-
-### C#
-From `csharp/src/Google.Protobuf.Benchmarks`, run:
-
-```
-$ dotnet run -c Release
-```
-
-We intend to add support for this within the makefile in due course.
-
-## Benchmark datasets
-
-Each data set is in the format of benchmarks.proto:
-
-1. name is the benchmark dataset's name.
-2. message_name is the benchmark's message type full name (including package and message name)
-3. payload is the list of raw data.
-
-The schema for the datasets is described in `benchmarks.proto`.
-
-Benchmark likely want to run several benchmarks against each data set (parse,
-serialize, possibly JSON, possibly using different APIs, etc).
-
-We would like to add more data sets.  In general we will favor data sets
-that make the overall suite diverse without being too large or having
-too many similar tests.  Ideally everyone can run through the entire
-suite without the test run getting too long.
diff --git a/libs/protobuf/benchmarks/__init__.py b/libs/protobuf/benchmarks/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/libs/protobuf/benchmarks/benchmarks.proto b/libs/protobuf/benchmarks/benchmarks.proto
deleted file mode 100644
index 51c0b54..0000000
--- a/libs/protobuf/benchmarks/benchmarks.proto
+++ /dev/null
@@ -1,63 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto3";
-package benchmarks;
-option java_package = "com.google.protobuf.benchmarks";
-
-message BenchmarkDataset {
-  // Name of the benchmark dataset.  This should be unique across all datasets.
-  // Should only contain word characters: [a-zA-Z0-9_]
-  string name = 1;
-
-  // Fully-qualified name of the protobuf message for this dataset.
-  // It will be one of the messages defined benchmark_messages_proto2.proto
-  // or benchmark_messages_proto3.proto.
-  //
-  // Implementations that do not support reflection can implement this with
-  // an explicit "if/else" chain that lists every known message defined
-  // in those files.
-  string message_name = 2;
-
-  // The payload(s) for this dataset.  They should be parsed or serialized
-  // in sequence, in a loop, ie.
-  //
-  //  while (!benchmarkDone) {  // Benchmark runner decides when to exit.
-  //    for (i = 0; i < benchmark.payload.length; i++) {
-  //      parse(benchmark.payload[i])
-  //    }
-  //  }
-  //
-  // This is intended to let datasets include a variety of data to provide
-  // potentially more realistic results than just parsing the same message
-  // over and over.  A single message parsed repeatedly could yield unusually
-  // good branch prediction performance.
-  repeated bytes payload = 3;
-}
diff --git a/libs/protobuf/benchmarks/cpp/BUILD.bazel b/libs/protobuf/benchmarks/cpp/BUILD.bazel
deleted file mode 100644
index 7a3d3ba..0000000
--- a/libs/protobuf/benchmarks/cpp/BUILD.bazel
+++ /dev/null
@@ -1,26 +0,0 @@
-load("@rules_cc//cc:defs.bzl", "cc_binary")
-load("@rules_pkg//:mappings.bzl", "pkg_files", "strip_prefix")
-
-cc_binary(
-    name = "cpp",
-    srcs = [
-        "cpp_benchmark.cc",
-    ],
-    tags = ["benchmark"],
-    deps = [
-        "//:protobuf",
-        "//benchmarks:benchmarks_cc_proto",
-        "//benchmarks/datasets:cc_protos",
-        "@com_github_google_benchmark//:benchmark_main",
-    ],
-)
-
-pkg_files(
-    name = "dist_files",
-    srcs = [
-        "BUILD.bazel",
-        "cpp_benchmark.cc",
-    ],
-    strip_prefix = strip_prefix.from_root(""),
-    visibility = ["//benchmarks:__pkg__"],
-)
diff --git a/libs/protobuf/benchmarks/cpp/cpp_benchmark.cc b/libs/protobuf/benchmarks/cpp/cpp_benchmark.cc
deleted file mode 100644
index 036d234..0000000
--- a/libs/protobuf/benchmarks/cpp/cpp_benchmark.cc
+++ /dev/null
@@ -1,254 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <fstream>
-#include <iostream>
-#include "benchmark/benchmark.h"
-#include "benchmarks.pb.h"
-#include "datasets/google_message1/proto2/benchmark_message1_proto2.pb.h"
-#include "datasets/google_message1/proto3/benchmark_message1_proto3.pb.h"
-#include "datasets/google_message2/benchmark_message2.pb.h"
-#include "datasets/google_message3/benchmark_message3.pb.h"
-#include "datasets/google_message4/benchmark_message4.pb.h"
-
-
-#define PREFIX "dataset."
-#define SUFFIX ".pb"
-
-using benchmarks::BenchmarkDataset;
-using google::protobuf::Arena;
-using google::protobuf::Descriptor;
-using google::protobuf::DescriptorPool;
-using google::protobuf::Message;
-using google::protobuf::MessageFactory;
-
-class Fixture : public benchmark::Fixture {
- public:
-  Fixture(const BenchmarkDataset& dataset, const std::string& suffix) {
-    for (int i = 0; i < dataset.payload_size(); i++) {
-      payloads_.push_back(dataset.payload(i));
-    }
-
-    const Descriptor* d =
-        DescriptorPool::generated_pool()->FindMessageTypeByName(
-            dataset.message_name());
-
-    if (!d) {
-      std::cerr << "Couldn't find message named '" << dataset.message_name()
-                << "\n";
-    }
-
-    prototype_ = MessageFactory::generated_factory()->GetPrototype(d);
-    SetName((dataset.name() + suffix).c_str());
-  }
-
- protected:
-  std::vector<std::string> payloads_;
-  const Message* prototype_;
-};
-
-class WrappingCounter {
- public:
-  WrappingCounter(size_t limit) : value_(0), limit_(limit) {}
-
-  size_t Next() {
-    size_t ret = value_;
-    if (++value_ == limit_) {
-      value_ = 0;
-    }
-    return ret;
-  }
-
- private:
-  size_t value_;
-  size_t limit_;
-};
-
-template <class T>
-class ParseNewFixture : public Fixture {
- public:
-  ParseNewFixture(const BenchmarkDataset& dataset)
-      : Fixture(dataset, "_parse_new") {}
-
-  virtual void BenchmarkCase(benchmark::State& state) {
-    WrappingCounter i(payloads_.size());
-    size_t total = 0;
-
-    while (state.KeepRunning()) {
-      T m;
-      const std::string& payload = payloads_[i.Next()];
-      total += payload.size();
-      m.ParseFromString(payload);
-    }
-
-    state.SetBytesProcessed(total);
-  }
-};
-
-template <class T>
-class ParseNewArenaFixture : public Fixture {
- public:
-  ParseNewArenaFixture(const BenchmarkDataset& dataset)
-      : Fixture(dataset, "_parse_newarena") {}
-
-  virtual void BenchmarkCase(benchmark::State& state) {
-    WrappingCounter i(payloads_.size());
-    size_t total = 0;
-    Arena arena;
-
-    while (state.KeepRunning()) {
-      arena.Reset();
-      Message* m = Arena::CreateMessage<T>(&arena);
-      const std::string& payload = payloads_[i.Next()];
-      total += payload.size();
-      m->ParseFromString(payload);
-    }
-
-    state.SetBytesProcessed(total);
-  }
-};
-
-template <class T>
-class ParseReuseFixture : public Fixture {
- public:
-  ParseReuseFixture(const BenchmarkDataset& dataset)
-      : Fixture(dataset, "_parse_reuse") {}
-
-  virtual void BenchmarkCase(benchmark::State& state) {
-    T m;
-    WrappingCounter i(payloads_.size());
-    size_t total = 0;
-
-    while (state.KeepRunning()) {
-      const std::string& payload = payloads_[i.Next()];
-      total += payload.size();
-      m.ParseFromString(payload);
-    }
-
-    state.SetBytesProcessed(total);
-  }
-};
-
-template <class T>
-class SerializeFixture : public Fixture {
- public:
-  SerializeFixture(const BenchmarkDataset& dataset)
-      : Fixture(dataset, "_serialize") {
-    for (size_t i = 0; i < payloads_.size(); i++) {
-      message_.push_back(new T);
-      message_.back()->ParseFromString(payloads_[i]);
-    }
-  }
-
-  ~SerializeFixture() {
-    for (size_t i = 0; i < message_.size(); i++) {
-      delete message_[i];
-    }
-  }
-
-  virtual void BenchmarkCase(benchmark::State& state) {
-    size_t total = 0;
-    std::string str;
-    WrappingCounter i(payloads_.size());
-
-    while (state.KeepRunning()) {
-      str.clear();
-      message_[i.Next()]->SerializeToString(&str);
-      total += str.size();
-    }
-
-    state.SetBytesProcessed(total);
-  }
-
- private:
-  std::vector<T*> message_;
-};
-
-std::string ReadFile(const std::string& name) {
-  std::ifstream file(name.c_str());
-  GOOGLE_CHECK(file.is_open()) << "Couldn't find file '" << name <<
-                                  "', please make sure you are running "
-                                  "this command from the benchmarks/ "
-                                  "directory.\n";
-  return std::string((std::istreambuf_iterator<char>(file)),
-                     std::istreambuf_iterator<char>());
-}
-
-template <class T>
-void RegisterBenchmarksForType(const BenchmarkDataset& dataset) {
-  ::benchmark::internal::RegisterBenchmarkInternal(
-      new ParseNewFixture<T>(dataset));
-  ::benchmark::internal::RegisterBenchmarkInternal(
-      new ParseReuseFixture<T>(dataset));
-  ::benchmark::internal::RegisterBenchmarkInternal(
-      new ParseNewArenaFixture<T>(dataset));
-  ::benchmark::internal::RegisterBenchmarkInternal(
-      new SerializeFixture<T>(dataset));
-}
-
-void RegisterBenchmarks(const std::string& dataset_bytes) {
-  BenchmarkDataset dataset;
-  GOOGLE_CHECK(dataset.ParseFromString(dataset_bytes));
-
-  if (dataset.message_name() == "benchmarks.proto3.GoogleMessage1") {
-    RegisterBenchmarksForType<benchmarks::proto3::GoogleMessage1>(dataset);
-  } else if (dataset.message_name() == "benchmarks.proto2.GoogleMessage1") {
-    RegisterBenchmarksForType<benchmarks::proto2::GoogleMessage1>(dataset);
-  } else if (dataset.message_name() == "benchmarks.proto2.GoogleMessage2") {
-    RegisterBenchmarksForType<benchmarks::proto2::GoogleMessage2>(dataset);
-  } else if (dataset.message_name() ==
-      "benchmarks.google_message3.GoogleMessage3") {
-    RegisterBenchmarksForType
-    <benchmarks::google_message3::GoogleMessage3>(dataset);
-  } else if (dataset.message_name() ==
-      "benchmarks.google_message4.GoogleMessage4") {
-    RegisterBenchmarksForType
-    <benchmarks::google_message4::GoogleMessage4>(dataset);
-  } else {
-    std::cerr << "Unknown message type: " << dataset.message_name();
-    exit(1);
-  }
-}
-
-int main(int argc, char *argv[]) {
-  ::benchmark::Initialize(&argc, argv);
-  if (argc == 1) {
-    std::cerr << "Usage: ./cpp-benchmark <input data>" << std::endl;
-    std::cerr << "input data is in the format of \"benchmarks.proto\""
-        << std::endl;
-    return 1;
-  } else {
-    for (int i = 1; i < argc; i++) {
-      RegisterBenchmarks(ReadFile(argv[i]));
-    }
-  }
-
-  ::benchmark::RunSpecifiedBenchmarks();
-}
diff --git a/libs/protobuf/benchmarks/datasets/BUILD.bazel b/libs/protobuf/benchmarks/datasets/BUILD.bazel
deleted file mode 100644
index 2a8b402..0000000
--- a/libs/protobuf/benchmarks/datasets/BUILD.bazel
+++ /dev/null
@@ -1,67 +0,0 @@
-load("@rules_cc//cc:defs.bzl", "cc_library")
-load("@rules_java//java:defs.bzl", "java_library")
-load("@rules_pkg//:mappings.bzl", "pkg_files", "strip_prefix")
-load("@rules_proto//proto:defs.bzl", "proto_library")
-
-filegroup(
-    name = "datasets",
-    srcs = [
-        "//benchmarks/datasets/google_message1/proto2:datasets",
-        "//benchmarks/datasets/google_message1/proto3:datasets",
-        "//benchmarks/datasets/google_message2:datasets",
-        "//benchmarks/datasets/google_message3:datasets",
-        "//benchmarks/datasets/google_message4:datasets",
-    ],
-    visibility = [
-        "//benchmarks:__subpackages__",
-    ],
-)
-
-proto_library(
-    name = "protos",
-    visibility = [
-        "//benchmarks:__subpackages__",
-    ],
-    deps = [
-        "//benchmarks/datasets/google_message1/proto2:benchmark_message1_proto2_proto",
-        "//benchmarks/datasets/google_message1/proto3:benchmark_message1_proto3_proto",
-        "//benchmarks/datasets/google_message2:benchmark_message2_proto",
-        "//benchmarks/datasets/google_message3:benchmark_message3_proto",
-        "//benchmarks/datasets/google_message4:benchmark_message4_proto",
-    ],
-)
-
-cc_library(
-    name = "cc_protos",
-    visibility = [
-        "//benchmarks:__subpackages__",
-    ],
-    deps = [
-        "//benchmarks/datasets/google_message1/proto2:benchmark_message1_proto2_cc_proto",
-        "//benchmarks/datasets/google_message1/proto3:benchmark_message1_proto3_cc_proto",
-        "//benchmarks/datasets/google_message2:benchmark_message2_cc_proto",
-        "//benchmarks/datasets/google_message3:benchmark_message3_cc_proto",
-        "//benchmarks/datasets/google_message4:benchmark_message4_cc_proto",
-    ],
-)
-
-java_library(
-    name = "java_protos",
-    visibility = [
-        "//benchmarks:__subpackages__",
-    ],
-    exports = [
-        "//benchmarks/datasets/google_message1/proto2:benchmark_message1_proto2_java_proto",
-        "//benchmarks/datasets/google_message1/proto3:benchmark_message1_proto3_java_proto",
-        "//benchmarks/datasets/google_message2:benchmark_message2_java_proto",
-        "//benchmarks/datasets/google_message3:benchmark_message3_java_proto",
-        "//benchmarks/datasets/google_message4:benchmark_message4_java_proto",
-    ],
-)
-
-pkg_files(
-    name = "dist_files",
-    srcs = ["BUILD.bazel"],
-    strip_prefix = strip_prefix.from_root(""),
-    visibility = ["//benchmarks:__pkg__"],
-)
diff --git a/libs/protobuf/benchmarks/datasets/google_message1/proto2/BUILD.bazel b/libs/protobuf/benchmarks/datasets/google_message1/proto2/BUILD.bazel
deleted file mode 100644
index 30caed5..0000000
--- a/libs/protobuf/benchmarks/datasets/google_message1/proto2/BUILD.bazel
+++ /dev/null
@@ -1,52 +0,0 @@
-load("@rules_cc//cc:defs.bzl", "cc_proto_library")
-load("@rules_java//java:defs.bzl", "java_proto_library")
-load("@rules_pkg//:mappings.bzl", "pkg_files", "strip_prefix")
-load("@rules_proto//proto:defs.bzl", "proto_library")
-
-filegroup(
-    name = "datasets",
-    srcs = [
-        "dataset.google_message1_proto2.pb",
-    ],
-    visibility = [
-        "//benchmarks/datasets:__pkg__",
-    ],
-)
-
-proto_library(
-    name = "benchmark_message1_proto2_proto",
-    srcs = [
-        "benchmark_message1_proto2.proto",
-    ],
-    strip_import_prefix = "/benchmarks",
-    visibility = [
-        "//benchmarks/datasets:__pkg__",
-    ],
-)
-
-cc_proto_library(
-    name = "benchmark_message1_proto2_cc_proto",
-    visibility = [
-        "//benchmarks/datasets:__pkg__",
-    ],
-    deps = [
-        "benchmark_message1_proto2_proto",
-    ],
-)
-
-java_proto_library(
-    name = "benchmark_message1_proto2_java_proto",
-    visibility = [
-        "//benchmarks/datasets:__pkg__",
-    ],
-    deps = [
-        "benchmark_message1_proto2_proto",
-    ],
-)
-
-pkg_files(
-    name = "dist_files",
-    srcs = glob(["*"]),
-    strip_prefix = strip_prefix.from_root(""),
-    visibility = ["//benchmarks:__pkg__"],
-)
diff --git a/libs/protobuf/benchmarks/datasets/google_message1/proto2/benchmark_message1_proto2.proto b/libs/protobuf/benchmarks/datasets/google_message1/proto2/benchmark_message1_proto2.proto
deleted file mode 100644
index e404b9f..0000000
--- a/libs/protobuf/benchmarks/datasets/google_message1/proto2/benchmark_message1_proto2.proto
+++ /dev/null
@@ -1,108 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Benchmark messages for proto2.
-
-syntax = "proto2";
-
-package benchmarks.proto2;
-option java_package = "com.google.protobuf.benchmarks";
-
-// This is the default, but we specify it here explicitly.
-option optimize_for = SPEED;
-
-option cc_enable_arenas = true;
-
-message GoogleMessage1 {
-  required string field1 = 1;
-  optional string field9 = 9;
-  optional string field18 = 18;
-  optional bool field80 = 80 [default = false];
-  optional bool field81 = 81 [default = true];
-  required int32 field2 = 2;
-  required int32 field3 = 3;
-  optional int32 field280 = 280;
-  optional int32 field6 = 6 [default = 0];
-  optional int64 field22 = 22;
-  optional string field4 = 4;
-  repeated fixed64 field5 = 5;
-  optional bool field59 = 59 [default = false];
-  optional string field7 = 7;
-  optional int32 field16 = 16;
-  optional int32 field130 = 130 [default = 0];
-  optional bool field12 = 12 [default = true];
-  optional bool field17 = 17 [default = true];
-  optional bool field13 = 13 [default = true];
-  optional bool field14 = 14 [default = true];
-  optional int32 field104 = 104 [default = 0];
-  optional int32 field100 = 100 [default = 0];
-  optional int32 field101 = 101 [default = 0];
-  optional string field102 = 102;
-  optional string field103 = 103;
-  optional int32 field29 = 29 [default = 0];
-  optional bool field30 = 30 [default = false];
-  optional int32 field60 = 60 [default = -1];
-  optional int32 field271 = 271 [default = -1];
-  optional int32 field272 = 272 [default = -1];
-  optional int32 field150 = 150;
-  optional int32 field23 = 23 [default = 0];
-  optional bool field24 = 24 [default = false];
-  optional int32 field25 = 25 [default = 0];
-  optional GoogleMessage1SubMessage field15 = 15;
-  optional bool field78 = 78;
-  optional int32 field67 = 67 [default = 0];
-  optional int32 field68 = 68;
-  optional int32 field128 = 128 [default = 0];
-  optional string field129 = 129 [default = "xxxxxxxxxxxxxxxxxxxxx"];
-  optional int32 field131 = 131 [default = 0];
-}
-
-message GoogleMessage1SubMessage {
-  optional int32 field1 = 1 [default = 0];
-  optional int32 field2 = 2 [default = 0];
-  optional int32 field3 = 3 [default = 0];
-  optional string field15 = 15;
-  optional bool field12 = 12 [default = true];
-  optional int64 field13 = 13;
-  optional int64 field14 = 14;
-  optional int32 field16 = 16;
-  optional int32 field19 = 19 [default = 2];
-  optional bool field20 = 20 [default = true];
-  optional bool field28 = 28 [default = true];
-  optional fixed64 field21 = 21;
-  optional int32 field22 = 22;
-  optional bool field23 = 23 [default = false];
-  optional bool field206 = 206 [default = false];
-  optional fixed32 field203 = 203;
-  optional int32 field204 = 204;
-  optional string field205 = 205;
-  optional uint64 field207 = 207;
-  optional uint64 field300 = 300;
-}
diff --git a/libs/protobuf/benchmarks/datasets/google_message1/proto2/dataset.google_message1_proto2.pb b/libs/protobuf/benchmarks/datasets/google_message1/proto2/dataset.google_message1_proto2.pb
deleted file mode 100644
index f6fe784..0000000
Binary files a/libs/protobuf/benchmarks/datasets/google_message1/proto2/dataset.google_message1_proto2.pb and /dev/null differ
diff --git a/libs/protobuf/benchmarks/datasets/google_message1/proto3/BUILD.bazel b/libs/protobuf/benchmarks/datasets/google_message1/proto3/BUILD.bazel
deleted file mode 100644
index 0dc59d1..0000000
--- a/libs/protobuf/benchmarks/datasets/google_message1/proto3/BUILD.bazel
+++ /dev/null
@@ -1,52 +0,0 @@
-load("@rules_cc//cc:defs.bzl", "cc_proto_library")
-load("@rules_java//java:defs.bzl", "java_proto_library")
-load("@rules_proto//proto:defs.bzl", "proto_library")
-load("@rules_pkg//:mappings.bzl", "pkg_files", "strip_prefix")
-
-filegroup(
-    name = "datasets",
-    srcs = [
-        "dataset.google_message1_proto3.pb",
-    ],
-    visibility = [
-        "//benchmarks/datasets:__pkg__",
-    ],
-)
-
-proto_library(
-    name = "benchmark_message1_proto3_proto",
-    srcs = [
-        "benchmark_message1_proto3.proto",
-    ],
-    strip_import_prefix = "/benchmarks",
-    visibility = [
-        "//benchmarks/datasets:__pkg__",
-    ],
-)
-
-cc_proto_library(
-    name = "benchmark_message1_proto3_cc_proto",
-    visibility = [
-        "//benchmarks/datasets:__pkg__",
-    ],
-    deps = [
-        "benchmark_message1_proto3_proto",
-    ],
-)
-
-java_proto_library(
-    name = "benchmark_message1_proto3_java_proto",
-    visibility = [
-        "//benchmarks/datasets:__pkg__",
-    ],
-    deps = [
-        "benchmark_message1_proto3_proto",
-    ],
-)
-
-pkg_files(
-    name = "dist_files",
-    srcs = glob(["*"]),
-    strip_prefix = strip_prefix.from_root(""),
-    visibility = ["//benchmarks:__pkg__"],
-)
diff --git a/libs/protobuf/benchmarks/datasets/google_message1/proto3/benchmark_message1_proto3.proto b/libs/protobuf/benchmarks/datasets/google_message1/proto3/benchmark_message1_proto3.proto
deleted file mode 100644
index 8aee2f6..0000000
--- a/libs/protobuf/benchmarks/datasets/google_message1/proto3/benchmark_message1_proto3.proto
+++ /dev/null
@@ -1,108 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Benchmark messages for proto3.
-
-syntax = "proto3";
-
-package benchmarks.proto3;
-option java_package = "com.google.protobuf.benchmarks";
-
-// This is the default, but we specify it here explicitly.
-option optimize_for = SPEED;
-
-option cc_enable_arenas = true;
-
-message GoogleMessage1 {
-  string field1 = 1;
-  string field9 = 9;
-  string field18 = 18;
-  bool field80 = 80;
-  bool field81 = 81;
-  int32 field2 = 2;
-  int32 field3 = 3;
-  int32 field280 = 280;
-  int32 field6 = 6;
-  int64 field22 = 22;
-  string field4 = 4;
-  repeated fixed64 field5 = 5;
-  bool field59 = 59;
-  string field7 = 7;
-  int32 field16 = 16;
-  int32 field130 = 130;
-  bool field12 = 12;
-  bool field17 = 17;
-  bool field13 = 13;
-  bool field14 = 14;
-  int32 field104 = 104;
-  int32 field100 = 100;
-  int32 field101 = 101;
-  string field102 = 102;
-  string field103 = 103;
-  int32 field29 = 29;
-  bool field30 = 30;
-  int32 field60 = 60;
-  int32 field271 = 271;
-  int32 field272 = 272;
-  int32 field150 = 150;
-  int32 field23 = 23;
-  bool field24 = 24;
-  int32 field25 = 25;
-  GoogleMessage1SubMessage field15 = 15;
-  bool field78 = 78;
-  int32 field67 = 67;
-  int32 field68 = 68;
-  int32 field128 = 128;
-  string field129 = 129;
-  int32 field131 = 131;
-}
-
-message GoogleMessage1SubMessage {
-  int32 field1 = 1;
-  int32 field2 = 2;
-  int32 field3 = 3;
-  string field15 = 15;
-  bool field12 = 12;
-  int64 field13 = 13;
-  int64 field14 = 14;
-  int32 field16 = 16;
-  int32 field19 = 19;
-  bool field20  = 20;
-  bool field28 = 28;
-  fixed64 field21 = 21;
-  int32 field22 = 22;
-  bool field23 = 23;
-  bool field206 = 206;
-  fixed32 field203 = 203;
-  int32 field204 = 204;
-  string field205 = 205;
-  uint64 field207 = 207;
-  uint64 field300 = 300;
-}
diff --git a/libs/protobuf/benchmarks/datasets/google_message1/proto3/dataset.google_message1_proto3.pb b/libs/protobuf/benchmarks/datasets/google_message1/proto3/dataset.google_message1_proto3.pb
deleted file mode 100644
index 4955bed..0000000
Binary files a/libs/protobuf/benchmarks/datasets/google_message1/proto3/dataset.google_message1_proto3.pb and /dev/null differ
diff --git a/libs/protobuf/benchmarks/datasets/google_message2/BUILD.bazel b/libs/protobuf/benchmarks/datasets/google_message2/BUILD.bazel
deleted file mode 100644
index f3d66a2..0000000
--- a/libs/protobuf/benchmarks/datasets/google_message2/BUILD.bazel
+++ /dev/null
@@ -1,52 +0,0 @@
-load("@rules_cc//cc:defs.bzl", "cc_proto_library")
-load("@rules_java//java:defs.bzl", "java_proto_library")
-load("@rules_pkg//:mappings.bzl", "pkg_files", "strip_prefix")
-load("@rules_proto//proto:defs.bzl", "proto_library")
-
-filegroup(
-    name = "datasets",
-    srcs = [
-        "dataset.google_message2.pb",
-    ],
-    visibility = [
-        "//benchmarks/datasets:__pkg__",
-    ],
-)
-
-proto_library(
-    name = "benchmark_message2_proto",
-    srcs = [
-        "benchmark_message2.proto",
-    ],
-    strip_import_prefix = "/benchmarks",
-    visibility = [
-        "//benchmarks/datasets:__pkg__",
-    ],
-)
-
-cc_proto_library(
-    name = "benchmark_message2_cc_proto",
-    visibility = [
-        "//benchmarks/datasets:__pkg__",
-    ],
-    deps = [
-        "benchmark_message2_proto",
-    ],
-)
-
-java_proto_library(
-    name = "benchmark_message2_java_proto",
-    visibility = [
-        "//benchmarks/datasets:__pkg__",
-    ],
-    deps = [
-        "benchmark_message2_proto",
-    ],
-)
-
-pkg_files(
-    name = "dist_files",
-    srcs = glob(["*"]),
-    strip_prefix = strip_prefix.from_root(""),
-    visibility = ["//benchmarks:__pkg__"],
-)
diff --git a/libs/protobuf/benchmarks/datasets/google_message2/benchmark_message2.proto b/libs/protobuf/benchmarks/datasets/google_message2/benchmark_message2.proto
deleted file mode 100644
index 500c5d6..0000000
--- a/libs/protobuf/benchmarks/datasets/google_message2/benchmark_message2.proto
+++ /dev/null
@@ -1,108 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// LINT: ALLOW_GROUPS
-
-// Benchmark messages for proto2.
-
-syntax = "proto2";
-
-package benchmarks.proto2;
-option java_package = "com.google.protobuf.benchmarks";
-
-// This is the default, but we specify it here explicitly.
-option optimize_for = SPEED;
-
-option cc_enable_arenas = true;
-
-message GoogleMessage2 {
-  optional string field1 = 1;
-  optional int64 field3 = 3;
-  optional int64 field4 = 4;
-  optional int64 field30 = 30;
-  optional bool field75 = 75 [default = false];
-  optional string field6 = 6;
-  optional bytes field2 = 2;
-  optional int32 field21 = 21 [default = 0];
-  optional int32 field71 = 71;
-  optional float field25 = 25;
-  optional int32 field109 = 109 [default = 0];
-  optional int32 field210 = 210 [default = 0];
-  optional int32 field211 = 211 [default = 0];
-  optional int32 field212 = 212 [default = 0];
-  optional int32 field213 = 213 [default = 0];
-  optional int32 field216 = 216 [default = 0];
-  optional int32 field217 = 217 [default = 0];
-  optional int32 field218 = 218 [default = 0];
-  optional int32 field220 = 220 [default = 0];
-  optional int32 field221 = 221 [default = 0];
-  optional float field222 = 222 [default = 0.0];
-  optional int32 field63 = 63;
-
-  repeated group Group1 = 10 {
-    required float field11 = 11;
-    optional float field26 = 26;
-    optional string field12 = 12;
-    optional string field13 = 13;
-    repeated string field14 = 14;
-    required uint64 field15 = 15;
-    optional int32 field5 = 5;
-    optional string field27 = 27;
-    optional int32 field28 = 28;
-    optional string field29 = 29;
-    optional string field16 = 16;
-    repeated string field22 = 22;
-    repeated int32 field73 = 73;
-    optional int32 field20 = 20 [default = 0];
-    optional string field24 = 24;
-    optional GoogleMessage2GroupedMessage field31 = 31;
-  }
-  repeated string field128 = 128;
-  optional int64 field131 = 131;
-  repeated string field127 = 127;
-  optional int32 field129 = 129;
-  repeated int64 field130 = 130;
-  optional bool field205 = 205 [default = false];
-  optional bool field206 = 206 [default = false];
-}
-
-message GoogleMessage2GroupedMessage {
-  optional float field1 = 1;
-  optional float field2 = 2;
-  optional float field3 = 3 [default = 0.0];
-  optional bool field4 = 4;
-  optional bool field5 = 5;
-  optional bool field6 = 6 [default = true];
-  optional bool field7 = 7 [default = false];
-  optional float field8 = 8;
-  optional bool field9 = 9;
-  optional float field10 = 10;
-  optional int64 field11 = 11;
-}
diff --git a/libs/protobuf/benchmarks/datasets/google_message2/dataset.google_message2.pb b/libs/protobuf/benchmarks/datasets/google_message2/dataset.google_message2.pb
deleted file mode 100644
index 3fa0e49..0000000
Binary files a/libs/protobuf/benchmarks/datasets/google_message2/dataset.google_message2.pb and /dev/null differ
diff --git a/libs/protobuf/benchmarks/datasets/google_message3/BUILD.bazel b/libs/protobuf/benchmarks/datasets/google_message3/BUILD.bazel
deleted file mode 100644
index a729e50..0000000
--- a/libs/protobuf/benchmarks/datasets/google_message3/BUILD.bazel
+++ /dev/null
@@ -1,58 +0,0 @@
-load("@rules_cc//cc:defs.bzl", "cc_proto_library")
-load("@rules_java//java:defs.bzl", "java_proto_library")
-load("@rules_pkg//:mappings.bzl", "pkg_files", "strip_prefix")
-load("@rules_proto//proto:defs.bzl", "proto_library")
-
-filegroup(
-    name = "datasets",
-    srcs = [],
-    visibility = [
-        "//benchmarks/datasets:__pkg__",
-    ],
-)
-
-proto_library(
-    name = "benchmark_message3_proto",
-    srcs = [
-        "benchmark_message3.proto",
-        "benchmark_message3_1.proto",
-        "benchmark_message3_2.proto",
-        "benchmark_message3_3.proto",
-        "benchmark_message3_4.proto",
-        "benchmark_message3_5.proto",
-        "benchmark_message3_6.proto",
-        "benchmark_message3_7.proto",
-        "benchmark_message3_8.proto",
-    ],
-    strip_import_prefix = "/benchmarks",
-    visibility = [
-        "//benchmarks/datasets:__pkg__",
-    ],
-)
-
-cc_proto_library(
-    name = "benchmark_message3_cc_proto",
-    visibility = [
-        "//benchmarks/datasets:__pkg__",
-    ],
-    deps = [
-        "benchmark_message3_proto",
-    ],
-)
-
-java_proto_library(
-    name = "benchmark_message3_java_proto",
-    visibility = [
-        "//benchmarks/datasets:__pkg__",
-    ],
-    deps = [
-        "benchmark_message3_proto",
-    ],
-)
-
-pkg_files(
-    name = "dist_files",
-    srcs = glob(["*"]),
-    strip_prefix = strip_prefix.from_root(""),
-    visibility = ["//benchmarks:__pkg__"],
-)
diff --git a/libs/protobuf/benchmarks/datasets/google_message3/benchmark_message3.proto b/libs/protobuf/benchmarks/datasets/google_message3/benchmark_message3.proto
deleted file mode 100644
index 82422f9..0000000
--- a/libs/protobuf/benchmarks/datasets/google_message3/benchmark_message3.proto
+++ /dev/null
@@ -1,566 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// LINT: ALLOW_GROUPS
-
-syntax = "proto2";
-
-package benchmarks.google_message3;
-
-import "datasets/google_message3/benchmark_message3_1.proto";
-import "datasets/google_message3/benchmark_message3_2.proto";
-import "datasets/google_message3/benchmark_message3_3.proto";
-import "datasets/google_message3/benchmark_message3_4.proto";
-import "datasets/google_message3/benchmark_message3_5.proto";
-import "datasets/google_message3/benchmark_message3_7.proto";
-import "datasets/google_message3/benchmark_message3_8.proto";
-
-option cc_enable_arenas = true;
-option java_package = "com.google.protobuf.benchmarks";
-
-message GoogleMessage3 {
-  optional .benchmarks.google_message3.Message37487 field37519 = 2;
-  optional .benchmarks.google_message3.Message36876 field37520 = 3;
-  optional .benchmarks.google_message3.Message13062 field37521 = 4;
-  optional .benchmarks.google_message3.Message952 field37522 = 5;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field37523 = 6;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field37524 = 7;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field37525 = 8;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field37526 = 9;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field37527 = 10;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field37528 = 11;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field37529 = 12;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field37530 = 13;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field37531 = 14;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field37532 = 15;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field37533 = 16;
-}
-
-message Message1327 {
-  repeated .benchmarks.google_message3.UnusedEmptyMessage field1369 = 1;
-  repeated .benchmarks.google_message3.Message1328 field1370 = 3;
-  repeated .benchmarks.google_message3.UnusedEmptyMessage field1371 = 5;
-  repeated .benchmarks.google_message3.UnusedEmptyMessage field1372 = 6;
-  extend .benchmarks.google_message3.Message0 {
-    optional .benchmarks.google_message3.Message1327 field1373 = 23104162;
-  }
-}
-
-message Message3672 {
-  optional .benchmarks.google_message3.Enum3476 field3727 = 1;
-  optional int32 field3728 = 11;
-  optional int32 field3729 = 2;
-  repeated group Message3673 = 3 {
-    required .benchmarks.google_message3.Enum3476 field3738 = 4;
-    required int32 field3739 = 5;
-  }
-  repeated group Message3674 = 6 {
-    required .benchmarks.google_message3.Enum3476 field3740 = 7;
-    required int32 field3741 = 8;
-  }
-  optional bool field3732 = 9;
-  optional int32 field3733 = 10;
-  optional .benchmarks.google_message3.Enum3476 field3734 = 20;
-  optional int32 field3735 = 21;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field3736 = 50;
-  extend .benchmarks.google_message3.Message0 {
-    optional .benchmarks.google_message3.Message3672 field3737 = 3144435;
-  }
-}
-
-message Message3804 {
-  required int64 field3818 = 1;
-  required bool field3819 = 2;
-  repeated .benchmarks.google_message3.Enum3805 field3820 = 4;
-  optional int32 field3821 = 5;
-  optional bool field3822 = 6;
-  optional int64 field3823 = 7;
-  optional .benchmarks.google_message3.Enum3783 field3824 = 8;
-  extend .benchmarks.google_message3.Message0 {
-    optional .benchmarks.google_message3.Message3804 field3825 = 59241828;
-  }
-}
-
-message Message6849 {
-  repeated .benchmarks.google_message3.Message6850 field6910 = 1;
-  extend .benchmarks.google_message3.Message0 {
-    optional .benchmarks.google_message3.Message6849 field6911 = 107558455;
-  }
-}
-
-message Message6866 {
-  repeated .benchmarks.google_message3.Message6863 field6973 = 1;
-  extend .benchmarks.google_message3.Message0 {
-    optional .benchmarks.google_message3.Message6866 field6974 = 22259060;
-  }
-}
-
-message Message6870 {
-  repeated .benchmarks.google_message3.Message6871 field6991 = 1;
-  extend .benchmarks.google_message3.Message0 {
-    optional .benchmarks.google_message3.Message6870 field6992 = 90034652;
-  }
-}
-
-message Message7651 {
-  optional string field7685 = 1;
-  optional int64 field7686 = 2;
-  optional int64 field7687 = 3;
-  optional int64 field7688 = 4;
-  optional int32 field7689 = 5;
-  optional int32 field7690 = 6;
-  optional int32 field7691 = 7;
-  optional int32 field7692 = 8;
-  optional int32 field7693 = 9;
-  optional int32 field7694 = 10;
-  optional int32 field7695 = 11;
-  optional int32 field7696 = 12;
-  optional int32 field7697 = 13;
-  optional int32 field7698 = 14;
-  optional int32 field7699 = 15;
-  optional int32 field7700 = 16;
-  optional int32 field7701 = 17;
-  optional int32 field7702 = 18;
-  optional bool field7703 = 19;
-  repeated int32 field7704 = 20;
-  repeated int32 field7705 = 21;
-  repeated string field7706 = 22;
-  repeated string field7707 = 23;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field7708 = 24;
-  optional int32 field7709 = 25;
-  optional int32 field7710 = 26;
-  optional int32 field7711 = 27;
-  optional int32 field7712 = 43;
-  optional int32 field7713 = 28;
-  optional int32 field7714 = 29;
-  repeated .benchmarks.google_message3.Message7547 field7715 = 30;
-  repeated .benchmarks.google_message3.Message7547 field7716 = 31;
-  repeated .benchmarks.google_message3.UnusedEmptyMessage field7717 = 32;
-  repeated string field7718 = 33;
-  repeated string field7719 = 34;
-  repeated .benchmarks.google_message3.Message7648 field7720 = 35;
-  optional bool field7721 = 36;
-  optional bool field7722 = 37;
-  optional bool field7723 = 38;
-  optional bool field7724 = 39;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field7725 = 40;
-  optional .benchmarks.google_message3.UnusedEnum field7726 = 41;
-  optional .benchmarks.google_message3.Enum7654 field7727 = 42;
-  optional string field7728 = 44;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field7729 = 45;
-  extend .benchmarks.google_message3.Message0 {
-    optional .benchmarks.google_message3.Message7651 field7730 = 55876009;
-  }
-}
-
-message Message7864 {
-  optional string field7866 = 1;
-  optional string field7867 = 2;
-  repeated .benchmarks.google_message3.Message7865 field7868 = 5;
-  repeated .benchmarks.google_message3.Message7865 field7869 = 6;
-  repeated .benchmarks.google_message3.Message7865 field7870 = 7;
-  repeated .benchmarks.google_message3.UnusedEmptyMessage field7871 = 8;
-  extend .benchmarks.google_message3.Message0 {
-    optional .benchmarks.google_message3.Message7864 field7872 = 44542730;
-  }
-}
-
-message Message7929 {
-  optional int64 field7942 = 1;
-  optional int64 field7943 = 4;
-  optional int64 field7944 = 5;
-  optional int64 field7945 = 12;
-  optional int64 field7946 = 13;
-  optional int64 field7947 = 18;
-  optional int64 field7948 = 6;
-  optional int64 field7949 = 7;
-  repeated .benchmarks.google_message3.Message7919 field7950 = 8;
-  repeated .benchmarks.google_message3.UnusedEmptyMessage field7951 = 20;
-  repeated .benchmarks.google_message3.Message7920 field7952 = 14;
-  repeated .benchmarks.google_message3.Message7921 field7953 = 15;
-  repeated .benchmarks.google_message3.Message7928 field7954 = 17;
-  optional int64 field7955 = 19;
-  optional bool field7956 = 2;
-  optional int64 field7957 = 3;
-  optional int64 field7958 = 9;
-  repeated .benchmarks.google_message3.UnusedEmptyMessage field7959 = 10;
-  repeated bytes field7960 = 11;
-  optional int64 field7961 = 16;
-  extend .benchmarks.google_message3.Message0 {
-    optional .benchmarks.google_message3.Message7929 field7962 = 53392238;
-  }
-}
-
-message Message8508 {
-  repeated .benchmarks.google_message3.Message8511 field8517 = 8;
-  repeated .benchmarks.google_message3.Message8512 field8518 = 9;
-  repeated .benchmarks.google_message3.Message8513 field8519 = 11;
-  optional bool field8520 = 13;
-  optional .benchmarks.google_message3.Message8514 field8521 = 14;
-  repeated .benchmarks.google_message3.UnusedEmptyMessage field8522 = 15;
-  repeated .benchmarks.google_message3.Message8515 field8523 = 16;
-  repeated .benchmarks.google_message3.UnusedEmptyMessage field8524 = 17;
-  optional int64 field8525 = 1;
-  optional float field8526 = 2;
-  optional int64 field8527 = 3;
-  optional int64 field8528 = 4;
-  optional int32 field8529 = 5;
-  optional bytes field8530 = 6;
-  repeated bytes field8531 = 7;
-  optional bool field8532 = 10;
-  optional bytes field8533 = 12;
-  extend .benchmarks.google_message3.Message0 {
-    optional .benchmarks.google_message3.Message8508 field8534 = 3811804;
-  }
-}
-
-message Message9122 {
-  optional float field9132 = 1;
-  optional float field9133 = 2;
-  extend .benchmarks.google_message3.Message0 {
-    optional .benchmarks.google_message3.Message9122 field9134 = 120398939;
-  }
-}
-
-message Message10177 {
-  repeated .benchmarks.google_message3.Message10155 field10270 = 1;
-  extend .benchmarks.google_message3.Message0 {
-    optional .benchmarks.google_message3.Message10177 field10271 = 26801105;
-  }
-}
-
-message Message10278 {
-  repeated int32 field10286 = 1 [packed = true];
-  repeated int32 field10287 = 2 [packed = true];
-  optional int32 field10288 = 3;
-  extend .benchmarks.google_message3.Message10155 {
-    optional .benchmarks.google_message3.Message10278 field10289 = 29374161;
-  }
-}
-
-message Message10323 {
-  repeated .benchmarks.google_message3.Message10320 field10360 = 1;
-  extend .benchmarks.google_message3.Message10155 {
-    optional .benchmarks.google_message3.Message10323 field10361 = 27922524;
-  }
-}
-
-message Message10324 {
-  repeated .benchmarks.google_message3.Message10322 field10362 = 1;
-  optional .benchmarks.google_message3.Message10321 field10363 = 2;
-  extend .benchmarks.google_message3.Message10155 {
-    optional .benchmarks.google_message3.Message10324 field10364 = 27832297;
-  }
-}
-
-message Message11990 {
-  repeated .benchmarks.google_message3.Message11988 field12030 = 1;
-  extend .benchmarks.google_message3.Message0 {
-    optional .benchmarks.google_message3.Message11990 field12031 = 21265426;
-  }
-}
-
-message Message12691 {
-  optional string field12713 = 1;
-  optional int32 field12714 = 2;
-  optional .benchmarks.google_message3.Message12668 field12715 = 3;
-  extend .benchmarks.google_message3.Message0 {
-    optional .benchmarks.google_message3.Message12691 field12716 = 28426536;
-  }
-}
-
-message Message12870 {
-  required int32 field12879 = 1;
-  optional int32 field12880 = 7;
-  required int32 field12881 = 2;
-  optional uint64 field12882 = 3;
-  optional string field12883 = 2001;
-  optional fixed64 field12884 = 4;
-  repeated fixed64 field12885 = 14;
-  optional int32 field12886 = 9;
-  optional int64 field12887 = 18;
-  repeated .benchmarks.google_message3.Message12870 field12888 = 8;
-  optional int32 field12889 = 5;
-  optional uint64 field12890 = 6;
-  optional int32 field12891 = 10;
-  optional int32 field12892 = 11;
-  optional double field12893 = 12;
-  optional .benchmarks.google_message3.Message12825 field12894 = 13;
-  optional double field12895 = 15;
-  optional string field12896 = 16;
-  optional .benchmarks.google_message3.Enum12871 field12897 = 17;
-  optional int32 field12898 = 19;
-  extend .benchmarks.google_message3.Message0 {
-    optional .benchmarks.google_message3.Message12870 field12899 = 5447656;
-  }
-}
-
-message Message13154 {
-  required float field13164 = 1;
-  required float field13165 = 2;
-  extend .benchmarks.google_message3.Message13145 {
-    optional .benchmarks.google_message3.Message13154 field13166 = 47301086;
-  }
-}
-
-message Message16507 {
-  optional bool field16510 = 3;
-  optional bool field16511 = 4;
-  optional bool field16512 = 14;
-  repeated string field16513 = 5;
-  repeated string field16514 = 6;
-  optional string field16515 = 8;
-  repeated int32 field16516 = 9;
-  repeated int32 field16517 = 10;
-  optional int32 field16518 = 7;
-  optional string field16519 = 15;
-  repeated string field16520 = 11;
-  repeated .benchmarks.google_message3.UnusedEmptyMessage field16521 = 27;
-  repeated .benchmarks.google_message3.UnusedEmptyMessage field16522 = 22;
-  repeated .benchmarks.google_message3.UnusedEmptyMessage field16523 = 28;
-  optional string field16524 = 18;
-  optional int32 field16525 = 19;
-  optional int32 field16526 = 20;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field16527 = 23;
-  optional bool field16528 = 24;
-  repeated string field16529 = 25;
-  optional double field16530 = 26;
-  optional .benchmarks.google_message3.Message16478 field16531 = 30;
-  optional bool field16532 = 31;
-  optional string field16533 = 32;
-  optional bool field16534 = 33;
-  optional bool field16535 = 35;
-  optional bool field16536 = 36;
-  optional bool field16537 = 37;
-  optional bool field16538 = 38;
-  optional bool field16539 = 39;
-  optional bool field16540 = 40;
-  repeated string field16541 = 41;
-  extensions 21 to 21;
-  extend .benchmarks.google_message3.Message0 {
-    optional .benchmarks.google_message3.Message16507 field16542 = 5569941;
-  }
-}
-
-message Message16564 {
-  repeated .benchmarks.google_message3.Message16552 field16568 = 1;
-  extend .benchmarks.google_message3.Message0 {
-    optional .benchmarks.google_message3.Message16564 field16569 = 25830030;
-  }
-}
-
-message Message16661 {
-  repeated .benchmarks.google_message3.Message16660 field16671 = 1;
-  repeated uint64 field16672 = 2;
-  extend .benchmarks.google_message3.Message0 {
-    optional .benchmarks.google_message3.Message16661 field16673 = 31274398;
-  }
-}
-
-message Message16746 {
-  repeated .benchmarks.google_message3.Message16727 field16806 = 1;
-  optional bool field16807 = 2;
-  optional bool field16808 = 3;
-  repeated .benchmarks.google_message3.Message16725 field16809 = 4;
-  extend .benchmarks.google_message3.Message0 {
-    optional .benchmarks.google_message3.Message16746 field16810 = 28406765;
-  }
-}
-
-message Message17786 {
-  repeated group Message17787 = 1 {
-    required int32 field18177 = 2;
-    required int32 field18178 = 3;
-    optional .benchmarks.google_message3.Message17783 field18179 = 4;
-    optional .benchmarks.google_message3.UnusedEmptyMessage field18180 = 5;
-    optional .benchmarks.google_message3.UnusedEmptyMessage field18181 = 6;
-    repeated .benchmarks.google_message3.UnusedEmptyMessage field18182 = 8;
-    optional .benchmarks.google_message3.UnusedEmptyMessage field18183 = 9;
-    optional .benchmarks.google_message3.Message17726 field18184 = 10;
-    optional .benchmarks.google_message3.UnusedEmptyMessage field18185 = 11;
-    optional .benchmarks.google_message3.Message16945 field18186 = 102;
-    optional .benchmarks.google_message3.UnusedEmptyMessage field18187 = 12;
-    optional .benchmarks.google_message3.UnusedEmptyMessage field18188 = 13;
-    optional .benchmarks.google_message3.UnusedEmptyMessage field18189 = 7;
-    optional .benchmarks.google_message3.UnusedEmptyMessage field18190 = 100;
-    optional .benchmarks.google_message3.UnusedEmptyMessage field18191 = 101;
-    optional .benchmarks.google_message3.UnusedEmptyMessage field18192 = 14;
-    optional .benchmarks.google_message3.UnusedEmptyMessage field18193 = 19;
-    optional .benchmarks.google_message3.UnusedEmptyMessage field18194 = 22;
-    optional .benchmarks.google_message3.UnusedEmptyMessage field18195 = 24;
-    optional .benchmarks.google_message3.Enum16925 field18196 = 21;
-    optional bool field18197 = 18;
-    repeated .benchmarks.google_message3.UnusedEnum field18198 = 23;
-    optional .benchmarks.google_message3.UnusedEmptyMessage field18199 = 15;
-    optional string field18200 = 16;
-    optional string field18201 = 17;
-    optional bool field18202 = 99;
-  }
-  repeated .benchmarks.google_message3.Message17782 field18175 = 20;
-  extend .benchmarks.google_message3.Message0 {
-    optional .benchmarks.google_message3.Message17786 field18176 = 11823055;
-  }
-}
-
-message Message22857 {
-  repeated .benchmarks.google_message3.Message22853 field22874 = 1;
-  extend .benchmarks.google_message3.Message10155 {
-    optional .benchmarks.google_message3.Message22857 field22875 = 67799715;
-  }
-}
-
-message Message24404 {
-  repeated group Message24405 = 1 {
-    required int32 field24686 = 2;
-    required int32 field24687 = 3;
-    optional .benchmarks.google_message3.Message24317 field24688 = 4;
-    optional .benchmarks.google_message3.UnusedEmptyMessage field24689 = 5;
-    optional .benchmarks.google_message3.Message24376 field24690 = 6;
-    optional .benchmarks.google_message3.Message24345 field24691 = 7;
-    optional .benchmarks.google_message3.UnusedEmptyMessage field24692 = 8;
-    optional .benchmarks.google_message3.Message24379 field24693 = 9;
-    optional .benchmarks.google_message3.UnusedEmptyMessage field24694 = 10;
-    optional .benchmarks.google_message3.UnusedEmptyMessage field24695 = 11;
-    optional .benchmarks.google_message3.Message24391 field24696 = 12;
-    optional .benchmarks.google_message3.UnusedEmptyMessage field24697 = 13;
-    optional .benchmarks.google_message3.UnusedEmptyMessage field24698 = 14;
-    optional .benchmarks.google_message3.UnusedEmptyMessage field24699 = 22;
-    optional .benchmarks.google_message3.UnusedEmptyMessage field24700 = 23;
-    optional .benchmarks.google_message3.UnusedEmptyMessage field24701 = 25;
-    optional .benchmarks.google_message3.Enum16925 field24702 = 18;
-    optional float field24703 = 20;
-    optional bool field24704 = 19;
-    repeated .benchmarks.google_message3.Enum16891 field24705 = 24;
-    optional .benchmarks.google_message3.UnusedEmptyMessage field24706 = 15;
-    optional string field24707 = 16;
-    optional string field24708 = 17;
-    optional float field24709 = 21;
-    optional bool field24710 = 26;
-    optional .benchmarks.google_message3.UnusedEnum field24711 = 27;
-    optional bool field24712 = 28;
-    optional .benchmarks.google_message3.UnusedEnum field24713 = 29;
-    optional bool field24714 = 31;
-    optional bool field24715 = 99;
-    optional int64 field24716 = 32;
-  }
-  optional .benchmarks.google_message3.Message24403 field24684 = 30;
-  extend .benchmarks.google_message3.Message0 {
-    optional .benchmarks.google_message3.Message24404 field24685 = 9129287;
-  }
-}
-
-message Message27300 {
-  repeated .benchmarks.google_message3.UnusedEmptyMessage field27302 = 1;
-  optional string field27303 = 2;
-  extend .benchmarks.google_message3.Message0 {
-    optional .benchmarks.google_message3.Message27300 field27304 = 24956467;
-  }
-}
-
-message Message27453 {
-  optional string field27459 = 15;
-  repeated string field27460 = 1;
-  repeated float field27461 = 6;
-  repeated int32 field27462 = 27;
-  repeated int32 field27463 = 28;
-  repeated .benchmarks.google_message3.Message27454 field27464 = 24;
-  repeated string field27465 = 2;
-  repeated float field27466 = 7;
-  repeated string field27467 = 22;
-  repeated string field27468 = 23;
-  optional string field27469 = 26;
-  repeated .benchmarks.google_message3.Message27357 field27470 = 8;
-  optional .benchmarks.google_message3.Message27360 field27471 = 16;
-  optional string field27472 = 25;
-  optional string field27473 = 11;
-  optional bool field27474 = 13;
-  optional bool field27475 = 14;
-  optional bool field27476 = 17;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field27477 = 12;
-  optional bool field27478 = 34268945;
-  optional bool field27479 = 20;
-  optional string field27480 = 21;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field27481 = 10;
-  extend .benchmarks.google_message3.Message0 {
-    optional .benchmarks.google_message3.Message27453 field27482 = 8086204;
-  }
-}
-
-extend .benchmarks.google_message3.Message16945 {
-  optional string field17026 = 472;
-  repeated string field17027 = 818;
-  optional .benchmarks.google_message3.Message0 field17031 = 215;
-  repeated .benchmarks.google_message3.Message0 field17032 = 292;
-  repeated .benchmarks.google_message3.Message0 field17038 = 234;
-  repeated .benchmarks.google_message3.Message0 field17039 = 235;
-  optional .benchmarks.google_message3.Message0 field17042 = 246;
-  optional string field17043 = 224;
-  optional string field17044 = 225;
-  repeated string field17048 = 63;
-  repeated string field17049 = 64;
-  repeated .benchmarks.google_message3.Message0 field17052 = 233;
-  repeated .benchmarks.google_message3.Message0 field17053 = 66;
-  repeated string field17056 = 275;
-  optional string field17057 = 226;
-  repeated .benchmarks.google_message3.Message0 field17060 = 27;
-  repeated string field17073 = 75;
-  repeated .benchmarks.google_message3.Message0 field17076 = 77;
-  repeated string field17078 = 296;
-  repeated .benchmarks.google_message3.Message0 field17082 = 160;
-  repeated .benchmarks.google_message3.Message0 field17091 = 585;
-  repeated .benchmarks.google_message3.Message0 field17098 = 987;
-  repeated .benchmarks.google_message3.Message0 field17101 = 157;
-  repeated string field17102 = 158;
-  repeated string field17107 = 166;
-  repeated string field17133 = 567;
-  repeated string field17134 = 572;
-  repeated string field17160 = 49;
-  repeated string field17168 = 32;
-  repeated string field17170 = 34;
-  repeated .benchmarks.google_message3.Message0 field17172 = 509;
-  repeated string field17174 = 39;
-  repeated .benchmarks.google_message3.Message0 field17175 = 40;
-  repeated .benchmarks.google_message3.Message0 field17178 = 511;
-  repeated .benchmarks.google_message3.Message0 field17185 = 50;
-  repeated int32 field17207 = 1081;
-  repeated .benchmarks.google_message3.Message0 field17238 = 184;
-  repeated .benchmarks.google_message3.Message0 field17289 = 177;
-  repeated .benchmarks.google_message3.Message0 field17290 = 178;
-  repeated .benchmarks.google_message3.Message0 field17296 = 474;
-  repeated string field17298 = 44;
-  repeated .benchmarks.google_message3.Message0 field17301 = 47;
-  optional .benchmarks.google_message3.Message0 field17412 = 21;
-  repeated .benchmarks.google_message3.Message0 field17438 = 132;
-  repeated .benchmarks.google_message3.Message0 field17458 = 512;
-  repeated string field17460 = 560;
-  repeated string field17466 = 552;
-  repeated .benchmarks.google_message3.Message0 field17617 = 1080;
-  repeated int32 field17618 = 1084;
-}
diff --git a/libs/protobuf/benchmarks/datasets/google_message3/benchmark_message3_1.proto b/libs/protobuf/benchmarks/datasets/google_message3/benchmark_message3_1.proto
deleted file mode 100644
index 1ee5c9e..0000000
--- a/libs/protobuf/benchmarks/datasets/google_message3/benchmark_message3_1.proto
+++ /dev/null
@@ -1,1298 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// LINT: ALLOW_GROUPS
-
-syntax = "proto2";
-
-package benchmarks.google_message3;
-
-import "datasets/google_message3/benchmark_message3_2.proto";
-import "datasets/google_message3/benchmark_message3_3.proto";
-import "datasets/google_message3/benchmark_message3_5.proto";
-import "datasets/google_message3/benchmark_message3_7.proto";
-import "datasets/google_message3/benchmark_message3_8.proto";
-
-option cc_enable_arenas = true;
-option java_package = "com.google.protobuf.benchmarks";
-
-message Message34390 {
-  repeated .benchmarks.google_message3.Message34387 field34452 = 1;
-  extend .benchmarks.google_message3.Message0 {
-    optional .benchmarks.google_message3.Message34390 field34453 = 92144610;
-  }
-}
-
-message Message34624 {
-  optional .benchmarks.google_message3.Message34621 field34683 = 1;
-  optional .benchmarks.google_message3.Message34621 field34684 = 2;
-  extend .benchmarks.google_message3.Message0 {
-    optional .benchmarks.google_message3.Message34624 field34685 = 18178548;
-  }
-}
-
-message Message34791 {
-  optional fixed64 field34793 = 1;
-  repeated group Message34792 = 2 {
-    required string field34808 = 3;
-    optional string field34809 = 4;
-  }
-  optional int32 field34795 = 5;
-  optional int32 field34796 = 6;
-  optional int32 field34797 = 7;
-  optional int32 field34798 = 8;
-  optional int32 field34799 = 9;
-  optional int32 field34800 = 10;
-  optional bool field34801 = 11;
-  optional float field34802 = 12;
-  optional int32 field34803 = 13;
-  optional string field34804 = 14;
-  optional int64 field34805 = 15;
-  repeated fixed64 field34806 = 17 [packed = true];
-  extend .benchmarks.google_message3.Message0 {
-    optional .benchmarks.google_message3.Message34791 field34807 = 6330340;
-  }
-}
-
-message Message35483 {
-  optional int32 field35499 = 1;
-  optional string field35500 = 2;
-  optional string field35501 = 3;
-  optional string field35502 = 4;
-  repeated .benchmarks.google_message3.Message35476 field35503 = 5;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field35504 = 6;
-  extend .benchmarks.google_message3.Message0 {
-    optional .benchmarks.google_message3.Message35483 field35505 = 7913554;
-  }
-}
-
-message Message35807 {
-  optional int32 field35810 = 1;
-  optional int32 field35811 = 2;
-  optional int32 field35812 = 3;
-  optional int32 field35813 = 4;
-  optional int32 field35814 = 5;
-  optional int32 field35815 = 6;
-  optional int32 field35816 = 7;
-  optional int32 field35817 = 8;
-  extend .benchmarks.google_message3.Message0 {
-    optional .benchmarks.google_message3.Message35807 field35818 = 3803299;
-  }
-}
-
-message Message37487 {
-  optional bytes field37501 = 2;
-  optional bool field37502 = 3;
-}
-
-message Message13062 {
-  optional int64 field13075 = 1;
-  optional string field13076 = 2;
-  optional int32 field13077 = 3;
-  optional string field13078 = 4;
-  optional int32 field13079 = 5;
-}
-
-message Message952 {
-  repeated .benchmarks.google_message3.Message949 field963 = 1;
-}
-
-message Message36876 {
-  optional .benchmarks.google_message3.Message2356 field36980 = 1;
-  repeated group Message36877 = 111 {
-    required string field37044 = 112;
-    optional int32 field37045 = 113;
-    optional bytes field37046 = 114;
-    optional int32 field37047 = 115;
-    optional int32 field37048 = 157;
-  }
-  repeated group Message36878 = 168 {}
-  repeated group Message36879 = 55 {
-    required string field37050 = 56;
-    optional int32 field37051 = 69;
-  }
-  repeated .benchmarks.google_message3.UnusedEmptyMessage field36984 = 78;
-  optional group Message36880 = 137 {}
-  optional uint64 field36986 = 59;
-  optional bytes field36987 = 121;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field36988 = 2;
-  optional .benchmarks.google_message3.Message7029 field36989 = 118;
-  optional .benchmarks.google_message3.Message35573 field36990 = 11;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field36991 = 21;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field36992 = 22;
-  optional float field36993 = 13;
-  optional int32 field36994 = 20;
-  optional bool field36995 = 51;
-  optional bool field36996 = 57;
-  repeated .benchmarks.google_message3.UnusedEmptyMessage field36997 = 100;
-  optional int32 field36998 = 47;
-  optional int32 field36999 = 48;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field37000 = 68;
-  repeated group Message36881 = 23 {}
-  optional .benchmarks.google_message3.Message4144 field37002 = 125;
-  repeated group Message36882 = 35 {}
-  optional .benchmarks.google_message3.UnusedEmptyMessage field37004 = 49;
-  optional .benchmarks.google_message3.Message18921 field37005 = 52;
-  optional .benchmarks.google_message3.Message36858 field37006 = 46;
-  optional .benchmarks.google_message3.Message18831 field37007 = 54;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field37008 = 58;
-  optional .benchmarks.google_message3.Message18283 field37009 = 10;
-  optional string field37010 = 44;
-  optional string field37011 = 103;
-  optional .benchmarks.google_message3.Message0 field37012 = 43;
-  optional .benchmarks.google_message3.Message0 field37013 = 143;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field37014 = 53;
-  optional .benchmarks.google_message3.Message36869 field37015 = 15;
-  optional group Message36883 = 3 {}
-  repeated group Message36884 = 16 {}
-  repeated group Message36885 = 27 {}
-  optional group Message36886 = 32 {}
-  repeated .benchmarks.google_message3.UnusedEnum field37020 = 71;
-  repeated int32 field37021 = 70;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field37022 = 66;
-  optional .benchmarks.google_message3.Message13090 field37023 = 67;
-  optional group Message36887 = 62 {}
-  repeated .benchmarks.google_message3.Message10155 field37025 = 50;
-  repeated .benchmarks.google_message3.Message11874 field37026 = 151;
-  optional string field37027 = 12;
-  optional int64 field37028 = 72;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field37029 = 73;
-  optional .benchmarks.google_message3.Message35546 field37030 = 108;
-  optional group Message36888 = 74 {
-    optional uint64 field37089 = 75;
-    optional bool field37090 = 76;
-    optional uint64 field37091 = 165;
-    optional double field37092 = 166;
-    optional uint64 field37093 = 109;
-    optional bytes field37094 = 122;
-  }
-  repeated .benchmarks.google_message3.Message19255 field37032 = 104;
-  optional .benchmarks.google_message3.Message33968 field37033 = 105;
-  optional bool field37034 = 106;
-  repeated .benchmarks.google_message3.UnusedEmptyMessage field37035 = 107;
-  optional .benchmarks.google_message3.Message6644 field37036 = 110;
-  optional bytes field37037 = 133;
-  optional group Message36889 = 116 {
-    optional int64 field37095 = 117;
-    optional string field37096 = 145;
-    optional int32 field37097 = 123;
-    optional bool field37098 = 163;
-    optional int32 field37099 = 164;
-    optional int32 field37100 = 149;
-    optional .benchmarks.google_message3.UnusedEmptyMessage field37101 = 129;
-    optional .benchmarks.google_message3.Message13174 field37102 = 124;
-    optional .benchmarks.google_message3.Message13169 field37103 = 128;
-    optional uint64 field37104 = 132;
-    repeated .benchmarks.google_message3.Enum36890 field37105 = 131;
-    optional bool field37106 = 134;
-    optional bool field37107 = 140;
-    optional .benchmarks.google_message3.UnusedEmptyMessage field37108 = 135;
-    optional float field37109 = 136;
-    optional float field37110 = 156;
-    optional bool field37111 = 142;
-    optional int64 field37112 = 167;
-    optional .benchmarks.google_message3.UnusedEmptyMessage field37113 = 146;
-    optional bool field37114 = 148;
-    optional .benchmarks.google_message3.UnusedEmptyMessage field37115 = 154;
-    optional .benchmarks.google_message3.UnusedEnum field37116 = 158;
-    repeated .benchmarks.google_message3.UnusedEnum field37117 = 159;
-    optional int32 field37118 = 160;
-    repeated string field37119 = 161;
-  }
-  repeated group Message36910 = 119 {}
-  optional group Message36911 = 126 {
-    optional .benchmarks.google_message3.UnusedEmptyMessage field37121 = 127;
-    optional .benchmarks.google_message3.Message35538 field37122 = 130;
-    optional .benchmarks.google_message3.Message35540 field37123 = 144;
-    optional .benchmarks.google_message3.Message35542 field37124 = 150;
-  }
-  optional group Message36912 = 152 {
-    optional .benchmarks.google_message3.Message3901 field37125 = 153;
-    optional .benchmarks.google_message3.Message3901 field37126 = 162;
-  }
-  optional .benchmarks.google_message3.UnusedEmptyMessage field37042 = 155;
-}
-
-message Message1328 {}
-
-message Message6850 {}
-
-message Message6863 {
-  optional .benchmarks.google_message3.Enum6858 field6931 = 1;
-  optional .benchmarks.google_message3.Enum6858 field6932 = 2;
-  optional .benchmarks.google_message3.UnusedEnum field6933 = 36;
-  optional bool field6934 = 27;
-  optional .benchmarks.google_message3.Message6773 field6935 = 26;
-  optional int32 field6936 = 30;
-  optional int32 field6937 = 37;
-  optional .benchmarks.google_message3.Enum6815 field6938 = 31;
-  optional string field6939 = 3;
-  optional int32 field6940 = 4;
-  optional .benchmarks.google_message3.Enum6822 field6941 = 15;
-  optional bool field6942 = 10;
-  optional bool field6943 = 17;
-  optional float field6944 = 18;
-  optional float field6945 = 19;
-  optional int32 field6946 = 5;
-  optional int32 field6947 = 6;
-  optional bool field6948 = 7;
-  optional int32 field6949 = 12;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field6950 = 8;
-  optional uint64 field6951 = 9;
-  optional string field6952 = 11;
-  optional bytes field6953 = 13;
-  optional int32 field6954 = 14;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field6955 = 16;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field6956 = 22;
-  optional .benchmarks.google_message3.Message3886 field6957 = 38;
-  optional string field6958 = 20;
-  optional uint32 field6959 = 21;
-  optional .benchmarks.google_message3.Message6743 field6960 = 23;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field6961 = 29;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field6962 = 33;
-  optional bool field6963 = 34;
-}
-
-message Message6871 {}
-
-message Message7547 {
-  required bytes field7549 = 1;
-  required int32 field7550 = 2;
-}
-
-message Message7648 {
-  optional string field7669 = 1;
-  optional int32 field7670 = 2;
-  optional int32 field7671 = 3;
-  optional int32 field7672 = 4;
-  optional int32 field7673 = 5;
-  optional int32 field7674 = 6;
-  optional float field7675 = 7;
-  optional bool field7676 = 8;
-  optional bool field7677 = 9;
-  optional bool field7678 = 10;
-  optional bool field7679 = 11;
-  optional bool field7680 = 12;
-}
-
-message Message7865 {}
-
-message Message7928 {
-  optional string field7940 = 1;
-  optional int64 field7941 = 2;
-}
-
-message Message7919 {
-  optional fixed64 field7931 = 1;
-  optional int64 field7932 = 2;
-  optional bytes field7933 = 3;
-}
-
-message Message7920 {
-  optional int64 field7934 = 1;
-  optional int64 field7935 = 2;
-}
-
-message Message7921 {
-  optional int32 field7936 = 1;
-  optional int64 field7937 = 2;
-  optional float field7938 = 3;
-  optional .benchmarks.google_message3.UnusedEnum field7939 = 4;
-}
-
-message Message8511 {
-  optional .benchmarks.google_message3.Message8224 field8539 = 1;
-  optional string field8540 = 2;
-  optional bool field8541 = 3;
-  optional int64 field8542 = 4;
-  optional string field8543 = 5;
-}
-
-message Message8512 {
-  optional .benchmarks.google_message3.Message8301 field8544 = 1;
-  optional .benchmarks.google_message3.Message8302 field8545 = 2;
-  optional string field8546 = 3;
-  optional bool field8547 = 4;
-  optional int64 field8548 = 5;
-  optional string field8549 = 6;
-}
-
-message Message8513 {
-  repeated .benchmarks.google_message3.Message8392 field8550 = 1;
-  optional string field8551 = 2;
-  optional bool field8552 = 3;
-  optional string field8553 = 4;
-}
-
-message Message8514 {
-  optional string field8554 = 1;
-  optional int64 field8555 = 2;
-  optional bool field8556 = 3;
-  repeated .benchmarks.google_message3.Message8130 field8557 = 4;
-  optional string field8558 = 5;
-}
-
-message Message8515 {
-  optional .benchmarks.google_message3.Message8479 field8559 = 1;
-  optional .benchmarks.google_message3.Message8478 field8560 = 2;
-  optional string field8561 = 3;
-}
-
-message Message10320 {
-  optional .benchmarks.google_message3.Enum10335 field10347 = 1;
-  repeated .benchmarks.google_message3.Message10319 field10348 = 2;
-  optional int32 field10349 = 3;
-  optional int32 field10350 = 4;
-  optional int32 field10351 = 5;
-  optional int32 field10352 = 6;
-  optional .benchmarks.google_message3.Enum10337 field10353 = 7;
-}
-
-message Message10321 {
-  optional int32 field10354 = 1;
-  optional int32 field10355 = 2;
-  optional uint64 field10356 = 3;
-}
-
-message Message10322 {
-  optional .benchmarks.google_message3.Message4016 field10357 = 1;
-  optional bool field10358 = 2;
-  optional bool field10359 = 3;
-}
-
-message Message11988 {
-  optional string field12021 = 1;
-  optional string field12022 = 2;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field12023 = 3;
-  optional .benchmarks.google_message3.Message10155 field12024 = 4;
-}
-
-message Message12668 {
-  repeated .benchmarks.google_message3.Message12669 field12677 = 1;
-  optional int32 field12678 = 2;
-  optional int32 field12679 = 3;
-  optional int32 field12680 = 4;
-}
-
-message Message12825 {
-  repeated .benchmarks.google_message3.Message12818 field12862 = 1;
-  optional int32 field12863 = 2;
-  optional .benchmarks.google_message3.Message12819 field12864 = 3;
-  optional .benchmarks.google_message3.Message12820 field12865 = 4;
-  optional int32 field12866 = 5;
-  repeated .benchmarks.google_message3.Message12821 field12867 = 6;
-  repeated .benchmarks.google_message3.UnusedEmptyMessage field12868 = 7;
-}
-
-message Message16478 {
-  repeated .benchmarks.google_message3.Message16479 field16481 = 1;
-  optional bool field16482 = 3;
-  optional int32 field16483 = 2;
-}
-
-message Message16552 {
-  optional fixed64 field16565 = 1;
-  optional int32 field16566 = 2;
-  optional .benchmarks.google_message3.Enum16553 field16567 = 3;
-}
-
-message Message16660 {
-  optional string field16668 = 1;
-  optional string field16669 = 2;
-  optional int32 field16670 = 3;
-}
-
-message Message16727 {
-  required .benchmarks.google_message3.Enum16728 field16782 = 1;
-  required string field16783 = 2;
-  optional string field16784 = 3;
-  optional int32 field16785 = 23;
-  required string field16786 = 4;
-  optional string field16787 = 5;
-  optional string field16788 = 6;
-  required .benchmarks.google_message3.Enum16732 field16789 = 7;
-  optional string field16790 = 8;
-  optional string field16791 = 9;
-  optional string field16792 = 10;
-  optional .benchmarks.google_message3.Enum16738 field16793 = 11;
-  optional int32 field16794 = 12;
-  repeated .benchmarks.google_message3.Message16722 field16795 = 13;
-  optional bool field16796 = 19;
-  optional bool field16797 = 24;
-  optional string field16798 = 14;
-  optional int64 field16799 = 15;
-  optional bool field16800 = 16;
-  optional string field16801 = 17;
-  optional .benchmarks.google_message3.Enum16698 field16802 = 18;
-  optional .benchmarks.google_message3.Message16724 field16803 = 20;
-  optional bool field16804 = 22;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field16805 = 25;
-  extensions 1000 to 536870911;
-}
-
-message Message16725 {
-  optional .benchmarks.google_message3.Enum16728 field16774 = 1;
-  repeated string field16775 = 2;
-}
-
-message Message17726 {
-  optional string field17801 = 1;
-  repeated string field17802 = 2;
-  optional string field17803 = 3;
-  repeated string field17804 = 4;
-  optional string field17805 = 5;
-  repeated string field17806 = 6;
-  optional string field17807 = 7;
-  optional string field17808 = 8;
-  repeated string field17809 = 15;
-  repeated string field17810 = 16;
-  repeated string field17811 = 17;
-  repeated .benchmarks.google_message3.UnusedEmptyMessage field17812 = 18;
-  optional string field17813 = 9;
-  optional string field17814 = 10;
-  optional string field17815 = 11;
-  optional string field17816 = 12;
-  optional string field17817 = 13;
-  optional string field17818 = 14;
-  optional string field17819 = 19;
-  repeated .benchmarks.google_message3.Message17728 field17820 = 20;
-  repeated .benchmarks.google_message3.Message17728 field17821 = 21;
-  repeated .benchmarks.google_message3.UnusedEmptyMessage field17822 = 30;
-}
-
-message Message17782 {
-  optional string field18153 = 1;
-  optional string field18154 = 2;
-}
-
-message Message17783 {
-  optional string field18155 = 1;
-  optional string field18156 = 2;
-  optional string field18157 = 3;
-  repeated group Message17784 = 4 {
-    optional string field18162 = 5;
-    optional string field18163 = 6;
-    optional string field18164 = 7;
-    repeated string field18165 = 8;
-    optional string field18166 = 17;
-    optional string field18167 = 18;
-  }
-  repeated group Message17785 = 9 {
-    optional string field18168 = 10;
-    optional string field18169 = 11;
-    optional .benchmarks.google_message3.Message17783 field18170 = 12;
-    optional string field18171 = 13;
-    optional string field18172 = 14;
-    repeated string field18173 = 15;
-  }
-  repeated string field18160 = 16;
-}
-
-message Message16945 {
-  optional string field16946 = 1;
-  optional string field16947 = 2;
-  optional string field16948 = 3;
-  optional string field16949 = 4;
-  optional string field16950 = 5;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field16951 = 872;
-  repeated .benchmarks.google_message3.Message0 field16952 = 16;
-  repeated .benchmarks.google_message3.UnusedEmptyMessage field16953 = 54;
-  repeated .benchmarks.google_message3.Message0 field16954 = 55;
-  repeated string field16955 = 58;
-  repeated string field16956 = 59;
-  repeated string field16957 = 62;
-  repeated string field16958 = 37;
-  repeated string field16959 = 18;
-  repeated .benchmarks.google_message3.UnusedEmptyMessage field16960 = 38;
-  repeated .benchmarks.google_message3.Message0 field16961 = 67;
-  repeated .benchmarks.google_message3.Message0 field16962 = 130;
-  repeated .benchmarks.google_message3.UnusedEmptyMessage field16963 = 136;
-  repeated string field16964 = 138;
-  repeated .benchmarks.google_message3.UnusedEmptyMessage field16965 = 156;
-  repeated string field16966 = 139;
-  repeated .benchmarks.google_message3.UnusedEmptyMessage field16967 = 126;
-  repeated string field16968 = 152;
-  repeated .benchmarks.google_message3.Message0 field16969 = 183;
-  repeated string field16970 = 168;
-  repeated string field16971 = 212;
-  repeated string field16972 = 213;
-  repeated .benchmarks.google_message3.UnusedEmptyMessage field16973 = 189;
-  repeated .benchmarks.google_message3.UnusedEmptyMessage field16974 = 190;
-  repeated string field16975 = 191;
-  repeated string field16976 = 192;
-  repeated .benchmarks.google_message3.Message0 field16977 = 193;
-  repeated .benchmarks.google_message3.UnusedEmptyMessage field16978 = 194;
-  repeated .benchmarks.google_message3.UnusedEmptyMessage field16979 = 195;
-  repeated int32 field16980 = 196;
-  repeated .benchmarks.google_message3.UnusedEmptyMessage field16981 = 95;
-  repeated string field16982 = 96;
-  repeated .benchmarks.google_message3.UnusedEmptyMessage field16983 = 97;
-  repeated string field16984 = 1086;
-  repeated .benchmarks.google_message3.UnusedEmptyMessage field16985 = 98;
-  repeated string field16986 = 99;
-  repeated string field16987 = 100;
-  repeated string field16988 = 48;
-  optional string field16989 = 22;
-  repeated .benchmarks.google_message3.UnusedEmptyMessage field16990 = 51;
-  repeated string field16991 = 81;
-  repeated string field16992 = 85;
-  repeated string field16993 = 169;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field16994 = 260;
-  optional int32 field16995 = 198;
-  optional int32 field16996 = 204;
-  optional string field16997 = 1087;
-  repeated string field16998 = 197;
-  repeated string field16999 = 206;
-  optional string field17000 = 211;
-  repeated string field17001 = 205;
-  repeated .benchmarks.google_message3.UnusedEmptyMessage field17002 = 68;
-  repeated .benchmarks.google_message3.UnusedEmptyMessage field17003 = 69;
-  repeated .benchmarks.google_message3.UnusedEmptyMessage field17004 = 70;
-  repeated .benchmarks.google_message3.UnusedEmptyMessage field17005 = 71;
-  repeated .benchmarks.google_message3.UnusedEmptyMessage field17006 = 72;
-  repeated .benchmarks.google_message3.UnusedEmptyMessage field17007 = 19;
-  repeated .benchmarks.google_message3.UnusedEmptyMessage field17008 = 24;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field17009 = 23;
-  repeated .benchmarks.google_message3.Message0 field17010 = 131;
-  repeated string field17011 = 133;
-  repeated .benchmarks.google_message3.UnusedEmptyMessage field17012 = 142;
-  repeated string field17013 = 143;
-  repeated .benchmarks.google_message3.UnusedEmptyMessage field17014 = 153;
-  repeated .benchmarks.google_message3.Message0 field17015 = 170;
-  repeated string field17016 = 171;
-  repeated string field17017 = 172;
-  repeated string field17018 = 173;
-  repeated string field17019 = 174;
-  repeated string field17020 = 175;
-  repeated string field17021 = 186;
-  repeated string field17022 = 101;
-  repeated .benchmarks.google_message3.Message0 field17023 = 102;
-  repeated string field17024 = 274;
-  extensions 17 to 17;
-  extensions 21 to 21;
-  extensions 25 to 25;
-  extensions 27 to 27;
-  extensions 29 to 29;
-  extensions 30 to 30;
-  extensions 31 to 31;
-  extensions 32 to 32;
-  extensions 33 to 33;
-  extensions 34 to 34;
-  extensions 35 to 35;
-  extensions 36 to 36;
-  extensions 39 to 39;
-  extensions 40 to 40;
-  extensions 41 to 41;
-  extensions 42 to 42;
-  extensions 43 to 43;
-  extensions 44 to 44;
-  extensions 45 to 45;
-  extensions 46 to 46;
-  extensions 47 to 47;
-  extensions 49 to 49;
-  extensions 50 to 50;
-  extensions 52 to 52;
-  extensions 53 to 53;
-  extensions 56 to 56;
-  extensions 57 to 57;
-  extensions 60 to 60;
-  extensions 61 to 61;
-  extensions 63 to 63;
-  extensions 64 to 64;
-  extensions 65 to 65;
-  extensions 66 to 66;
-  extensions 73 to 73;
-  extensions 74 to 74;
-  extensions 75 to 75;
-  extensions 76 to 76;
-  extensions 77 to 77;
-  extensions 78 to 78;
-  extensions 79 to 79;
-  extensions 80 to 80;
-  extensions 82 to 82;
-  extensions 83 to 83;
-  extensions 84 to 84;
-  extensions 86 to 86;
-  extensions 87 to 87;
-  extensions 88 to 88;
-  extensions 89 to 89;
-  extensions 90 to 90;
-  extensions 91 to 91;
-  extensions 92 to 92;
-  extensions 93 to 93;
-  extensions 94 to 94;
-  extensions 103 to 103;
-  extensions 104 to 104;
-  extensions 105 to 105;
-  extensions 106 to 106;
-  extensions 107 to 107;
-  extensions 108 to 108;
-  extensions 109 to 109;
-  extensions 110 to 110;
-  extensions 111 to 111;
-  extensions 112 to 112;
-  extensions 113 to 113;
-  extensions 114 to 114;
-  extensions 115 to 115;
-  extensions 116 to 116;
-  extensions 117 to 117;
-  extensions 118 to 118;
-  extensions 119 to 119;
-  extensions 120 to 120;
-  extensions 121 to 121;
-  extensions 122 to 122;
-  extensions 123 to 123;
-  extensions 124 to 124;
-  extensions 125 to 125;
-  extensions 127 to 127;
-  extensions 128 to 128;
-  extensions 129 to 129;
-  extensions 132 to 132;
-  extensions 134 to 134;
-  extensions 135 to 135;
-  extensions 137 to 137;
-  extensions 140 to 140;
-  extensions 141 to 141;
-  extensions 144 to 144;
-  extensions 145 to 145;
-  extensions 146 to 146;
-  extensions 147 to 147;
-  extensions 148 to 148;
-  extensions 149 to 149;
-  extensions 150 to 150;
-  extensions 151 to 151;
-  extensions 154 to 154;
-  extensions 155 to 155;
-  extensions 157 to 157;
-  extensions 158 to 158;
-  extensions 159 to 159;
-  extensions 160 to 160;
-  extensions 161 to 161;
-  extensions 162 to 162;
-  extensions 163 to 163;
-  extensions 164 to 164;
-  extensions 165 to 165;
-  extensions 166 to 166;
-  extensions 167 to 167;
-  extensions 176 to 176;
-  extensions 177 to 177;
-  extensions 178 to 178;
-  extensions 179 to 179;
-  extensions 180 to 180;
-  extensions 181 to 181;
-  extensions 182 to 182;
-  extensions 184 to 184;
-  extensions 185 to 185;
-  extensions 187 to 187;
-  extensions 188 to 188;
-  extensions 199 to 199;
-  extensions 200 to 200;
-  extensions 201 to 201;
-  extensions 202 to 202;
-  extensions 203 to 203;
-  extensions 207 to 207;
-  extensions 208 to 208;
-  extensions 209 to 209;
-  extensions 210 to 210;
-  extensions 214 to 214;
-  extensions 215 to 215;
-  extensions 216 to 216;
-  extensions 217 to 217;
-  extensions 218 to 218;
-  extensions 219 to 219;
-  extensions 220 to 220;
-  extensions 221 to 221;
-  extensions 222 to 222;
-  extensions 223 to 223;
-  extensions 224 to 224;
-  extensions 225 to 225;
-  extensions 226 to 226;
-  extensions 227 to 227;
-  extensions 228 to 228;
-  extensions 229 to 229;
-  extensions 230 to 230;
-  extensions 231 to 231;
-  extensions 232 to 232;
-  extensions 233 to 233;
-  extensions 234 to 234;
-  extensions 235 to 235;
-  extensions 236 to 236;
-  extensions 237 to 237;
-  extensions 238 to 238;
-  extensions 239 to 239;
-  extensions 240 to 240;
-  extensions 241 to 241;
-  extensions 242 to 242;
-  extensions 243 to 243;
-  extensions 244 to 244;
-  extensions 245 to 245;
-  extensions 246 to 246;
-  extensions 247 to 247;
-  extensions 248 to 248;
-  extensions 249 to 249;
-  extensions 250 to 250;
-  extensions 251 to 251;
-  extensions 252 to 252;
-  extensions 253 to 253;
-  extensions 254 to 254;
-  extensions 255 to 255;
-  extensions 256 to 256;
-  extensions 257 to 257;
-  extensions 258 to 258;
-  extensions 259 to 259;
-  extensions 261 to 261;
-  extensions 262 to 262;
-  extensions 263 to 263;
-  extensions 264 to 264;
-  extensions 265 to 265;
-  extensions 266 to 266;
-  extensions 267 to 267;
-  extensions 268 to 268;
-  extensions 269 to 269;
-  extensions 270 to 270;
-  extensions 271 to 271;
-  extensions 272 to 272;
-  extensions 273 to 273;
-  extensions 275 to 275;
-  extensions 276 to 276;
-  extensions 277 to 277;
-  extensions 278 to 278;
-  extensions 279 to 279;
-  extensions 280 to 280;
-  extensions 281 to 281;
-  extensions 282 to 282;
-  extensions 283 to 283;
-  extensions 284 to 284;
-  extensions 285 to 285;
-  extensions 286 to 286;
-  extensions 290 to 290;
-  extensions 291 to 291;
-  extensions 292 to 292;
-  extensions 293 to 293;
-  extensions 294 to 294;
-  extensions 295 to 295;
-  extensions 296 to 296;
-  extensions 297 to 297;
-  extensions 298 to 298;
-  extensions 299 to 299;
-  extensions 300 to 300;
-  extensions 301 to 301;
-  extensions 302 to 302;
-  extensions 303 to 303;
-  extensions 304 to 304;
-  extensions 305 to 305;
-  extensions 306 to 306;
-  extensions 307 to 307;
-  extensions 308 to 308;
-  extensions 309 to 309;
-  extensions 310 to 310;
-  extensions 311 to 311;
-  extensions 312 to 312;
-  extensions 313 to 313;
-  extensions 314 to 314;
-  extensions 315 to 315;
-  extensions 316 to 316;
-  extensions 317 to 317;
-  extensions 318 to 318;
-  extensions 319 to 319;
-  extensions 320 to 320;
-  extensions 321 to 321;
-  extensions 322 to 322;
-  extensions 323 to 323;
-  extensions 324 to 324;
-  extensions 325 to 325;
-  extensions 326 to 326;
-  extensions 327 to 327;
-  extensions 328 to 328;
-  extensions 329 to 329;
-  extensions 330 to 330;
-  extensions 331 to 331;
-  extensions 332 to 332;
-  extensions 333 to 333;
-  extensions 334 to 334;
-  extensions 335 to 335;
-  extensions 336 to 336;
-  extensions 337 to 337;
-  extensions 338 to 338;
-  extensions 339 to 339;
-  extensions 340 to 340;
-  extensions 341 to 341;
-  extensions 342 to 342;
-  extensions 343 to 343;
-  extensions 344 to 344;
-  extensions 345 to 345;
-  extensions 346 to 346;
-  extensions 347 to 347;
-  extensions 348 to 348;
-  extensions 349 to 349;
-  extensions 350 to 350;
-  extensions 351 to 351;
-  extensions 352 to 352;
-  extensions 353 to 353;
-  extensions 354 to 354;
-  extensions 355 to 355;
-  extensions 356 to 356;
-  extensions 357 to 357;
-  extensions 358 to 358;
-  extensions 359 to 359;
-  extensions 360 to 360;
-  extensions 361 to 361;
-  extensions 362 to 362;
-  extensions 363 to 363;
-  extensions 364 to 364;
-  extensions 365 to 365;
-  extensions 366 to 366;
-  extensions 367 to 367;
-  extensions 368 to 368;
-  extensions 369 to 369;
-  extensions 370 to 370;
-  extensions 371 to 371;
-  extensions 372 to 372;
-  extensions 373 to 373;
-  extensions 374 to 374;
-  extensions 375 to 375;
-  extensions 376 to 376;
-  extensions 377 to 377;
-  extensions 378 to 378;
-  extensions 379 to 379;
-  extensions 380 to 380;
-  extensions 381 to 381;
-  extensions 382 to 382;
-  extensions 383 to 383;
-  extensions 384 to 384;
-  extensions 385 to 385;
-  extensions 386 to 386;
-  extensions 387 to 387;
-  extensions 388 to 388;
-  extensions 389 to 389;
-  extensions 390 to 390;
-  extensions 391 to 391;
-  extensions 392 to 392;
-  extensions 393 to 393;
-  extensions 394 to 394;
-  extensions 395 to 395;
-  extensions 396 to 396;
-  extensions 397 to 397;
-  extensions 398 to 398;
-  extensions 399 to 399;
-  extensions 400 to 400;
-  extensions 401 to 401;
-  extensions 402 to 402;
-  extensions 403 to 403;
-  extensions 404 to 404;
-  extensions 405 to 405;
-  extensions 406 to 406;
-  extensions 407 to 407;
-  extensions 408 to 408;
-  extensions 409 to 409;
-  extensions 410 to 410;
-  extensions 411 to 411;
-  extensions 412 to 412;
-  extensions 413 to 413;
-  extensions 414 to 414;
-  extensions 415 to 415;
-  extensions 416 to 416;
-  extensions 417 to 417;
-  extensions 418 to 418;
-  extensions 419 to 419;
-  extensions 420 to 420;
-  extensions 421 to 421;
-  extensions 422 to 422;
-  extensions 423 to 423;
-  extensions 424 to 424;
-  extensions 425 to 425;
-  extensions 426 to 426;
-  extensions 427 to 427;
-  extensions 428 to 428;
-  extensions 429 to 429;
-  extensions 430 to 430;
-  extensions 431 to 431;
-  extensions 432 to 432;
-  extensions 433 to 433;
-  extensions 434 to 434;
-  extensions 435 to 435;
-  extensions 436 to 436;
-  extensions 437 to 437;
-  extensions 438 to 438;
-  extensions 439 to 439;
-  extensions 440 to 440;
-  extensions 441 to 441;
-  extensions 442 to 442;
-  extensions 443 to 443;
-  extensions 444 to 444;
-  extensions 445 to 445;
-  extensions 446 to 446;
-  extensions 447 to 447;
-  extensions 448 to 448;
-  extensions 449 to 449;
-  extensions 450 to 450;
-  extensions 451 to 451;
-  extensions 452 to 452;
-  extensions 453 to 453;
-  extensions 454 to 454;
-  extensions 455 to 455;
-  extensions 456 to 456;
-  extensions 457 to 457;
-  extensions 458 to 458;
-  extensions 459 to 459;
-  extensions 460 to 460;
-  extensions 461 to 461;
-  extensions 462 to 462;
-  extensions 463 to 463;
-  extensions 464 to 464;
-  extensions 465 to 465;
-  extensions 466 to 466;
-  extensions 467 to 467;
-  extensions 468 to 468;
-  extensions 469 to 469;
-  extensions 470 to 470;
-  extensions 471 to 471;
-  extensions 472 to 472;
-  extensions 473 to 473;
-  extensions 474 to 474;
-  extensions 509 to 509;
-  extensions 511 to 511;
-  extensions 512 to 512;
-  extensions 513 to 513;
-  extensions 514 to 514;
-  extensions 515 to 515;
-  extensions 516 to 516;
-  extensions 517 to 517;
-  extensions 518 to 518;
-  extensions 519 to 519;
-  extensions 520 to 520;
-  extensions 521 to 521;
-  extensions 522 to 522;
-  extensions 523 to 523;
-  extensions 524 to 524;
-  extensions 525 to 525;
-  extensions 526 to 526;
-  extensions 527 to 527;
-  extensions 528 to 528;
-  extensions 529 to 529;
-  extensions 530 to 530;
-  extensions 531 to 531;
-  extensions 532 to 532;
-  extensions 533 to 533;
-  extensions 534 to 534;
-  extensions 535 to 535;
-  extensions 536 to 536;
-  extensions 537 to 537;
-  extensions 538 to 538;
-  extensions 539 to 539;
-  extensions 540 to 540;
-  extensions 541 to 541;
-  extensions 542 to 542;
-  extensions 543 to 543;
-  extensions 544 to 544;
-  extensions 545 to 545;
-  extensions 546 to 546;
-  extensions 547 to 547;
-  extensions 548 to 548;
-  extensions 549 to 549;
-  extensions 550 to 550;
-  extensions 551 to 551;
-  extensions 552 to 552;
-  extensions 553 to 553;
-  extensions 554 to 554;
-  extensions 555 to 555;
-  extensions 556 to 556;
-  extensions 557 to 557;
-  extensions 558 to 558;
-  extensions 559 to 559;
-  extensions 560 to 560;
-  extensions 561 to 561;
-  extensions 562 to 562;
-  extensions 563 to 563;
-  extensions 564 to 564;
-  extensions 565 to 565;
-  extensions 566 to 566;
-  extensions 567 to 567;
-  extensions 568 to 568;
-  extensions 569 to 569;
-  extensions 570 to 570;
-  extensions 571 to 571;
-  extensions 572 to 572;
-  extensions 573 to 573;
-  extensions 574 to 574;
-  extensions 575 to 575;
-  extensions 576 to 576;
-  extensions 577 to 577;
-  extensions 578 to 578;
-  extensions 579 to 579;
-  extensions 580 to 580;
-  extensions 581 to 581;
-  extensions 582 to 582;
-  extensions 583 to 583;
-  extensions 584 to 584;
-  extensions 585 to 585;
-  extensions 586 to 586;
-  extensions 587 to 587;
-  extensions 588 to 588;
-  extensions 589 to 589;
-  extensions 590 to 590;
-  extensions 604 to 604;
-  extensions 605 to 605;
-  extensions 606 to 606;
-  extensions 607 to 607;
-  extensions 608 to 608;
-  extensions 609 to 609;
-  extensions 610 to 610;
-  extensions 611 to 611;
-  extensions 612 to 612;
-  extensions 613 to 613;
-  extensions 614 to 614;
-  extensions 615 to 615;
-  extensions 616 to 616;
-  extensions 617 to 617;
-  extensions 618 to 618;
-  extensions 619 to 619;
-  extensions 620 to 620;
-  extensions 621 to 621;
-  extensions 622 to 622;
-  extensions 623 to 623;
-  extensions 624 to 624;
-  extensions 625 to 625;
-  extensions 626 to 626;
-  extensions 627 to 627;
-  extensions 628 to 628;
-  extensions 629 to 629;
-  extensions 813 to 813;
-  extensions 814 to 814;
-  extensions 815 to 815;
-  extensions 816 to 816;
-  extensions 817 to 817;
-  extensions 818 to 818;
-  extensions 819 to 819;
-  extensions 820 to 820;
-  extensions 821 to 821;
-  extensions 822 to 822;
-  extensions 823 to 823;
-  extensions 824 to 824;
-  extensions 827 to 827;
-  extensions 828 to 828;
-  extensions 829 to 829;
-  extensions 830 to 830;
-  extensions 831 to 831;
-  extensions 832 to 832;
-  extensions 833 to 833;
-  extensions 834 to 834;
-  extensions 835 to 835;
-  extensions 836 to 836;
-  extensions 837 to 837;
-  extensions 838 to 838;
-  extensions 839 to 839;
-  extensions 840 to 840;
-  extensions 841 to 841;
-  extensions 842 to 842;
-  extensions 843 to 843;
-  extensions 844 to 844;
-  extensions 845 to 845;
-  extensions 846 to 846;
-  extensions 847 to 847;
-  extensions 848 to 848;
-  extensions 849 to 849;
-  extensions 850 to 850;
-  extensions 851 to 851;
-  extensions 852 to 852;
-  extensions 853 to 853;
-  extensions 854 to 854;
-  extensions 855 to 855;
-  extensions 856 to 856;
-  extensions 857 to 857;
-  extensions 858 to 858;
-  extensions 859 to 859;
-  extensions 860 to 860;
-  extensions 861 to 861;
-  extensions 862 to 862;
-  extensions 863 to 863;
-  extensions 864 to 864;
-  extensions 865 to 865;
-  extensions 866 to 866;
-  extensions 867 to 867;
-  extensions 868 to 868;
-  extensions 869 to 869;
-  extensions 870 to 870;
-  extensions 871 to 871;
-  extensions 880 to 880;
-  extensions 881 to 881;
-  extensions 882 to 882;
-  extensions 883 to 883;
-  extensions 884 to 884;
-  extensions 885 to 885;
-  extensions 886 to 886;
-  extensions 887 to 887;
-  extensions 888 to 888;
-  extensions 890 to 890;
-  extensions 891 to 891;
-  extensions 892 to 892;
-  extensions 912 to 912;
-  extensions 914 to 914;
-  extensions 915 to 915;
-  extensions 916 to 916;
-  extensions 917 to 917;
-  extensions 918 to 918;
-  extensions 919 to 919;
-  extensions 920 to 920;
-  extensions 921 to 921;
-  extensions 922 to 922;
-  extensions 923 to 923;
-  extensions 924 to 924;
-  extensions 925 to 925;
-  extensions 926 to 926;
-  extensions 927 to 927;
-  extensions 928 to 928;
-  extensions 929 to 929;
-  extensions 930 to 930;
-  extensions 931 to 931;
-  extensions 932 to 932;
-  extensions 933 to 933;
-  extensions 934 to 934;
-  extensions 935 to 935;
-  extensions 936 to 936;
-  extensions 937 to 937;
-  extensions 938 to 938;
-  extensions 939 to 939;
-  extensions 940 to 940;
-  extensions 941 to 941;
-  extensions 942 to 942;
-  extensions 943 to 943;
-  extensions 944 to 944;
-  extensions 945 to 945;
-  extensions 946 to 946;
-  extensions 947 to 947;
-  extensions 949 to 949;
-  extensions 950 to 950;
-  extensions 951 to 951;
-  extensions 952 to 952;
-  extensions 954 to 954;
-  extensions 955 to 955;
-  extensions 956 to 956;
-  extensions 957 to 957;
-  extensions 958 to 958;
-  extensions 959 to 959;
-  extensions 960 to 960;
-  extensions 961 to 961;
-  extensions 962 to 962;
-  extensions 963 to 963;
-  extensions 964 to 964;
-  extensions 965 to 965;
-  extensions 966 to 966;
-  extensions 967 to 967;
-  extensions 968 to 968;
-  extensions 969 to 969;
-  extensions 970 to 970;
-  extensions 971 to 971;
-  extensions 972 to 972;
-  extensions 973 to 973;
-  extensions 974 to 974;
-  extensions 975 to 975;
-  extensions 976 to 976;
-  extensions 977 to 977;
-  extensions 978 to 978;
-  extensions 979 to 979;
-  extensions 980 to 980;
-  extensions 981 to 981;
-  extensions 982 to 982;
-  extensions 983 to 983;
-  extensions 984 to 984;
-  extensions 985 to 985;
-  extensions 987 to 987;
-  extensions 988 to 988;
-  extensions 1000 to 1000;
-  extensions 1001 to 1001;
-  extensions 1002 to 1002;
-  extensions 1003 to 1003;
-  extensions 1004 to 1004;
-  extensions 1005 to 1005;
-  extensions 1006 to 1006;
-  extensions 1007 to 1007;
-  extensions 1008 to 1008;
-  extensions 1009 to 1009;
-  extensions 1010 to 1010;
-  extensions 1011 to 1011;
-  extensions 1012 to 1012;
-  extensions 1013 to 1013;
-  extensions 1014 to 1014;
-  extensions 1015 to 1015;
-  extensions 1016 to 1016;
-  extensions 1017 to 1017;
-  extensions 1018 to 1018;
-  extensions 1019 to 1019;
-  extensions 1020 to 1020;
-  extensions 1021 to 1021;
-  extensions 1022 to 1022;
-  extensions 1023 to 1023;
-  extensions 1024 to 1024;
-  extensions 1025 to 1025;
-  extensions 1026 to 1026;
-  extensions 1027 to 1027;
-  extensions 1028 to 1028;
-  extensions 1029 to 1029;
-  extensions 1030 to 1030;
-  extensions 1031 to 1031;
-  extensions 1032 to 1032;
-  extensions 1033 to 1033;
-  extensions 1034 to 1034;
-  extensions 1035 to 1035;
-  extensions 1036 to 1036;
-  extensions 1037 to 1037;
-  extensions 1038 to 1038;
-  extensions 1039 to 1039;
-  extensions 1040 to 1040;
-  extensions 1041 to 1041;
-  extensions 1042 to 1042;
-  extensions 1043 to 1043;
-  extensions 1044 to 1044;
-  extensions 1045 to 1045;
-  extensions 1046 to 1046;
-  extensions 1047 to 1047;
-  extensions 1048 to 1048;
-  extensions 1049 to 1049;
-  extensions 1050 to 1050;
-  extensions 1051 to 1051;
-  extensions 1052 to 1052;
-  extensions 1053 to 1053;
-  extensions 1054 to 1054;
-  extensions 1055 to 1055;
-  extensions 1056 to 1056;
-  extensions 1057 to 1057;
-  extensions 1058 to 1058;
-  extensions 1079 to 1079;
-  extensions 1080 to 1080;
-  extensions 1081 to 1081;
-  extensions 1082 to 1082;
-  extensions 1083 to 1083;
-  extensions 1084 to 1084;
-  extensions 1085 to 1085;
-  extend .benchmarks.google_message3.Message0 {
-    optional .benchmarks.google_message3.Message16945 field17025 = 22068132;
-  }
-}
diff --git a/libs/protobuf/benchmarks/datasets/google_message3/benchmark_message3_2.proto b/libs/protobuf/benchmarks/datasets/google_message3/benchmark_message3_2.proto
deleted file mode 100644
index d123a72..0000000
--- a/libs/protobuf/benchmarks/datasets/google_message3/benchmark_message3_2.proto
+++ /dev/null
@@ -1,528 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// LINT: ALLOW_GROUPS
-
-syntax = "proto2";
-
-package benchmarks.google_message3;
-
-import "datasets/google_message3/benchmark_message3_3.proto";
-import "datasets/google_message3/benchmark_message3_4.proto";
-import "datasets/google_message3/benchmark_message3_5.proto";
-import "datasets/google_message3/benchmark_message3_7.proto";
-import "datasets/google_message3/benchmark_message3_8.proto";
-
-option cc_enable_arenas = true;
-option java_package = "com.google.protobuf.benchmarks";
-
-message Message22853 {
-  optional .benchmarks.google_message3.Enum22854 field22869 = 1;
-  repeated uint32 field22870 = 2 [packed = true];
-  repeated float field22871 = 3 [packed = true];
-  repeated float field22872 = 5 [packed = true];
-  optional .benchmarks.google_message3.UnusedEmptyMessage field22873 = 4;
-}
-
-message Message24345 {
-  optional string field24533 = 1;
-  optional .benchmarks.google_message3.UnusedEnum field24534 = 22;
-  optional .benchmarks.google_message3.Message24346 field24535 = 2;
-  optional string field24536 = 3;
-  optional string field24537 = 4;
-  optional .benchmarks.google_message3.UnusedEnum field24538 = 23;
-  optional string field24539 = 5;
-  required string field24540 = 6;
-  optional string field24541 = 7;
-  optional string field24542 = 8;
-  optional .benchmarks.google_message3.Message24316 field24543 = 9;
-  optional .benchmarks.google_message3.Message24376 field24544 = 10;
-  optional string field24545 = 11;
-  optional string field24546 = 19;
-  optional string field24547 = 20;
-  optional string field24548 = 21;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field24549 = 12;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field24550 = 13;
-  repeated string field24551 = 14;
-  optional string field24552 = 15;
-  optional int32 field24553 = 18;
-  optional .benchmarks.google_message3.Message24379 field24554 = 16;
-  optional string field24555 = 17;
-  repeated .benchmarks.google_message3.Message24356 field24556 = 24;
-  repeated .benchmarks.google_message3.Message24366 field24557 = 25;
-}
-
-message Message24403 {
-  optional .benchmarks.google_message3.Message24401 field24681 = 1;
-  optional .benchmarks.google_message3.Message24402 field24682 = 2;
-}
-
-message Message24391 {
-  optional string field24631 = 1;
-  optional string field24632 = 2;
-  repeated string field24633 = 3;
-  optional string field24634 = 4;
-  repeated string field24635 = 5;
-  repeated string field24636 = 16;
-  optional string field24637 = 17;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field24638 = 25;
-  optional string field24639 = 7;
-  optional string field24640 = 18;
-  optional string field24641 = 19;
-  optional string field24642 = 20;
-  optional int32 field24643 = 24;
-  optional .benchmarks.google_message3.Message24379 field24644 = 8;
-  repeated .benchmarks.google_message3.UnusedEmptyMessage field24645 = 9;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field24646 = 10;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field24647 = 11;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field24648 = 12;
-  repeated .benchmarks.google_message3.UnusedEmptyMessage field24649 = 13;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field24650 = 14;
-  optional string field24651 = 21;
-  optional int32 field24652 = 22;
-  optional int32 field24653 = 23;
-  repeated string field24654 = 15;
-  repeated string field24655 = 6;
-}
-
-message Message27454 {}
-
-message Message27357 {
-  optional string field27410 = 1;
-  optional float field27411 = 2;
-  optional string field27412 = 3;
-  optional bool field27413 = 4;
-  optional bool field27414 = 5;
-}
-
-message Message27360 {
-  optional .benchmarks.google_message3.Message27358 field27426 = 1;
-  optional .benchmarks.google_message3.Enum27361 field27427 = 2;
-  optional .benchmarks.google_message3.Message27358 field27428 = 3;
-  repeated .benchmarks.google_message3.UnusedEmptyMessage field27429 = 4;
-}
-
-message Message34387 {
-  optional string field34446 = 1;
-  repeated .benchmarks.google_message3.Message34381 field34447 = 2;
-  optional .benchmarks.google_message3.UnusedEnum field34448 = 3;
-  optional .benchmarks.google_message3.Enum34388 field34449 = 4;
-  optional int64 field34450 = 5;
-}
-
-message Message34621 {
-  optional double field34651 = 1;
-  optional double field34652 = 2;
-  optional double field34653 = 3;
-  optional double field34654 = 4;
-  optional double field34655 = 11;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field34656 = 13;
-  optional .benchmarks.google_message3.Message34619 field34657 = 14;
-  optional string field34658 = 5;
-  optional string field34659 = 9;
-  optional double field34660 = 12;
-  optional bytes field34661 = 19;
-  optional string field34662 = 15;
-  optional string field34663 = 16;
-  optional string field34664 = 17;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field34665 = 18;
-  optional .benchmarks.google_message3.Message34621 field34666 = 20;
-  repeated .benchmarks.google_message3.UnusedEmptyMessage field34667 = 100;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field34668 = 101;
-  extend .benchmarks.google_message3.Message0 {
-    optional .benchmarks.google_message3.Message34621 field34669 = 17562023;
-  }
-}
-
-message Message35476 {
-  optional string field35484 = 1;
-  optional string field35485 = 2;
-  optional string field35486 = 3;
-  optional .benchmarks.google_message3.Enum35477 field35487 = 4;
-  optional float field35488 = 5;
-  optional float field35489 = 6;
-  optional float field35490 = 7;
-  optional float field35491 = 8;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field35492 = 9;
-  optional int32 field35493 = 10;
-  optional int32 field35494 = 11;
-  optional int32 field35495 = 12;
-  optional string field35496 = 13;
-  optional string field35497 = 14;
-}
-
-message Message949 {
-  optional string field955 = 1;
-  optional int64 field956 = 2;
-  optional int64 field957 = 3;
-  optional .benchmarks.google_message3.Message730 field958 = 4;
-  repeated string field959 = 5;
-  optional string field960 = 6;
-  optional bool field961 = 7;
-}
-
-message Message36869 {
-  optional int32 field36970 = 1;
-  optional int32 field36971 = 2;
-}
-
-message Message33968 {
-  repeated group Message33969 = 1 {}
-  repeated .benchmarks.google_message3.Message33958 field33989 = 3;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field33990 = 106;
-  optional bool field33991 = 108;
-  optional .benchmarks.google_message3.UnusedEnum field33992 = 107;
-}
-
-message Message6644 {
-  optional .benchmarks.google_message3.UnusedEmptyMessage field6701 = 8;
-  optional string field6702 = 1;
-  optional double field6703 = 2;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field6704 = 9;
-  optional bytes field6705 = 3;
-  optional bytes field6706 = 19;
-  optional .benchmarks.google_message3.Message6637 field6707 = 4;
-  repeated .benchmarks.google_message3.Message6126 field6708 = 18;
-  optional bool field6709 = 6;
-  optional .benchmarks.google_message3.Message6643 field6710 = 10;
-  optional string field6711 = 12;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field6712 = 14;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field6713 = 15;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field6714 = 16;
-  optional int32 field6715 = 17;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field6716 = 20;
-}
-
-message Message18831 {
-  repeated group Message18832 = 1 {
-    optional int32 field18836 = 2;
-    optional string field18837 = 5;
-    optional float field18838 = 3;
-    optional float field18839 = 9;
-    optional int32 field18840 = 11;
-    repeated uint64 field18841 = 4;
-    repeated group Message18833 = 6 {
-      required uint64 field18843 = 7;
-      optional string field18844 = 8;
-      optional float field18845 = 10;
-      optional int32 field18846 = 12;
-      optional bool field18847 = 13;
-    }
-  }
-}
-
-message Message13090 {
-  optional .benchmarks.google_message3.Message13083 field13141 = 1;
-  optional .benchmarks.google_message3.Message13088 field13142 = 2;
-}
-
-message Message11874 {
-  optional .benchmarks.google_message3.Message10391 field11888 = 3;
-  optional string field11889 = 4;
-  optional .benchmarks.google_message3.Message11873 field11890 = 6;
-  optional bool field11891 = 7;
-  extensions 1 to 1;
-  extensions 2 to 2;
-  extensions 5 to 5;
-}
-
-message Message4144 {
-  repeated group Message4145 = 1 {
-    required .benchmarks.google_message3.Enum4146 field4165 = 2;
-    required int32 field4166 = 3;
-    optional .benchmarks.google_message3.Enum4160 field4167 = 9;
-    optional bytes field4168 = 4;
-    optional .benchmarks.google_message3.Enum4152 field4169 = 5;
-    optional string field4170 = 6;
-  }
-}
-
-message Message35573 {
-  optional fixed64 field35695 = 16;
-  optional string field35696 = 1000;
-  optional string field35697 = 1004;
-  optional int32 field35698 = 1003;
-  repeated group Message35574 = 1012 {}
-  optional int64 field35700 = 1011;
-  optional int64 field35701 = 1005;
-  optional int64 field35702 = 1006;
-  optional int64 field35703 = 1007;
-  optional int64 field35704 = 1008;
-  repeated group Message35575 = 1 {
-    optional int64 field35709 = 2;
-    optional string field35710 = 3;
-    optional string field35711 = 19;
-    optional int32 field35712 = 20;
-    optional int32 field35713 = 21;
-    optional int32 field35714 = 22;
-    optional bool field35715 = 23;
-    optional int32 field35716 = 47;
-    optional int32 field35717 = 48;
-    optional bool field35718 = 24;
-    optional fixed64 field35719 = 25;
-    optional bytes field35720 = 52;
-    optional int32 field35721 = 18;
-    optional fixed32 field35722 = 43;
-    optional bool field35723 = 26;
-    optional int32 field35724 = 27;
-    optional int32 field35725 = 17;
-    optional bool field35726 = 45;
-    repeated int32 field35727 = 33;
-    repeated int32 field35728 = 58;
-    optional float field35729 = 34;
-    optional float field35730 = 1009;
-    optional int32 field35731 = 28;
-    repeated fixed64 field35732 = 1001;
-    repeated fixed64 field35733 = 1002;
-    optional int32 field35734 = 44;
-    optional int32 field35735 = 50;
-    optional int32 field35736 = 36;
-    optional int32 field35737 = 40;
-    optional bool field35738 = 1016;
-    optional bool field35739 = 1010;
-    optional int32 field35740 = 37;
-    optional int32 field35741 = 38;
-    optional string field35742 = 46;
-    optional uint32 field35743 = 60;
-    repeated bytes field35744 = 56;
-    optional .benchmarks.google_message3.Message0 field35745 = 57;
-    required group Message35576 = 4 {
-      optional fixed64 field35747 = 5;
-      optional int32 field35748 = 6;
-      optional int32 field35749 = 49;
-      optional int32 field35750 = 7;
-      optional uint32 field35751 = 59;
-      optional int32 field35752 = 14;
-      optional int32 field35753 = 15;
-      optional int32 field35754 = 35;
-      optional bytes field35755 = 53;
-      optional int32 field35756 = 8;
-      optional string field35757 = 9;
-      optional fixed64 field35758 = 10;
-      optional int32 field35759 = 11;
-      optional int32 field35760 = 12;
-      optional int32 field35761 = 41;
-      optional int32 field35762 = 30;
-      optional int32 field35763 = 31;
-      optional int32 field35764 = 13;
-      optional bytes field35765 = 39;
-      optional string field35766 = 29;
-      optional int32 field35767 = 42;
-      repeated int32 field35768 = 32;
-      repeated int32 field35769 = 51;
-      optional int64 field35770 = 54;
-      optional .benchmarks.google_message3.Message0 field35771 = 55;
-    }
-  }
-}
-
-message Message36858 {
-  repeated int32 field36956 = 1;
-  repeated string field36957 = 2;
-  repeated string field36958 = 12;
-  optional int32 field36959 = 3;
-  optional int32 field36960 = 4;
-  optional int32 field36961 = 14;
-  optional string field36962 = 11;
-  optional bool field36963 = 5;
-  optional bool field36964 = 13;
-  optional int64 field36965 = 6;
-  optional .benchmarks.google_message3.Message35506 field36966 = 7;
-  repeated group Message36859 = 8 {
-    required .benchmarks.google_message3.Enum36860 field36968 = 9;
-    optional float field36969 = 10;
-  }
-}
-
-message Message13174 {
-  required int32 field13237 = 6;
-  optional int32 field13238 = 3;
-  required int32 field13239 = 4;
-  optional int32 field13240 = 8;
-  optional double field13241 = 5;
-  optional double field13242 = 7;
-  optional int32 field13243 = 17;
-  optional int32 field13244 = 19;
-  optional double field13245 = 20;
-  optional int32 field13246 = 9;
-  optional double field13247 = 10;
-  optional int32 field13248 = 11;
-  optional .benchmarks.google_message3.Message13151 field13249 = 21;
-  optional int32 field13250 = 1;
-  optional double field13251 = 2;
-  optional double field13252 = 15;
-  optional double field13253 = 16;
-  optional double field13254 = 12;
-  optional double field13255 = 13;
-  optional double field13256 = 14;
-  optional int32 field13257 = 18;
-}
-
-message Message18283 {
-  optional .benchmarks.google_message3.UnusedEmptyMessage field18478 = 1;
-  optional int32 field18479 = 4;
-  optional int32 field18480 = 106;
-  optional int32 field18481 = 107;
-  optional int32 field18482 = 108;
-  optional int32 field18483 = 109;
-  optional int32 field18484 = 105;
-  optional int32 field18485 = 113;
-  optional int32 field18486 = 114;
-  optional int32 field18487 = 124;
-  optional int32 field18488 = 125;
-  optional int32 field18489 = 128;
-  optional int32 field18490 = 135;
-  optional bool field18491 = 166;
-  optional bool field18492 = 136;
-  optional int32 field18493 = 140;
-  optional int32 field18494 = 171;
-  optional int32 field18495 = 148;
-  optional int32 field18496 = 145;
-  optional float field18497 = 117;
-  optional int32 field18498 = 146;
-  optional string field18499 = 3;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field18500 = 5;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field18501 = 6;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field18502 = 9;
-  optional .benchmarks.google_message3.Message18253 field18503 = 155;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field18504 = 184;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field18505 = 163;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field18506 = 16;
-  repeated int32 field18507 = 20;
-  repeated int32 field18508 = 7;
-  repeated string field18509 = 194;
-  optional bytes field18510 = 30;
-  optional int32 field18511 = 31;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field18512 = 178;
-  optional string field18513 = 8;
-  optional float field18514 = 2;
-  optional float field18515 = 100;
-  optional float field18516 = 101;
-  optional float field18517 = 102;
-  optional int32 field18518 = 103;
-  repeated .benchmarks.google_message3.UnusedEmptyMessage field18519 = 104;
-  optional int32 field18520 = 110;
-  optional int32 field18521 = 112;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field18522 = 111;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field18523 = 115;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field18524 = 119;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field18525 = 127;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field18526 = 185;
-  optional int32 field18527 = 120;
-  optional int32 field18528 = 132;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field18529 = 126;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field18530 = 129;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field18531 = 131;
-  optional fixed64 field18532 = 150;
-  optional int32 field18533 = 133;
-  optional int32 field18534 = 134;
-  optional int32 field18535 = 139;
-  optional fixed64 field18536 = 137;
-  optional fixed64 field18537 = 138;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field18538 = 141;
-  optional int32 field18539 = 142;
-  optional int32 field18540 = 181;
-  optional .benchmarks.google_message3.Message16816 field18541 = 143;
-  optional .benchmarks.google_message3.Message16685 field18542 = 154;
-  optional int32 field18543 = 144;
-  optional int64 field18544 = 147;
-  optional int64 field18545 = 149;
-  optional int32 field18546 = 151;
-  optional int32 field18547 = 152;
-  optional int32 field18548 = 153;
-  optional float field18549 = 161;
-  optional .benchmarks.google_message3.Message0 field18550 = 123;
-  repeated int64 field18551 = 156;
-  optional int32 field18552 = 157;
-  repeated fixed64 field18553 = 188;
-  optional int32 field18554 = 158;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field18555 = 159;
-  optional bool field18556 = 160;
-  optional uint64 field18557 = 162;
-  optional int32 field18558 = 164;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field18559 = 10;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field18560 = 167;
-  optional int32 field18561 = 168;
-  repeated fixed64 field18562 = 169;
-  repeated string field18563 = 170;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field18564 = 172;
-  optional int64 field18565 = 173;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field18566 = 174;
-  optional int64 field18567 = 175;
-  optional uint32 field18568 = 189;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field18569 = 176;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field18570 = 177;
-  optional uint32 field18571 = 179;
-  optional uint32 field18572 = 180;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field18573 = 182;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field18574 = 183;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field18575 = 121;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field18576 = 186;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field18577 = 187;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field18578 = 190;
-  optional int32 field18579 = 191;
-  optional float field18580 = 192;
-  optional bool field18581 = 193;
-  extensions 116 to 116;
-  extensions 118 to 118;
-  extensions 130 to 130;
-  extensions 165 to 165;
-}
-
-message Message13169 {
-  repeated .benchmarks.google_message3.Message13168 field13223 = 1;
-  required .benchmarks.google_message3.Message13167 field13224 = 2;
-  optional string field13225 = 3;
-}
-
-message Message19255 {
-  optional string field19257 = 1;
-}
-
-message Message35542 {
-  optional bool field35543 = 1;
-  optional bool field35544 = 2;
-  optional bool field35545 = 3;
-}
-
-message Message3901 {
-  optional int32 field3990 = 1;
-  optional int32 field3991 = 2;
-  optional int32 field3992 = 3;
-  optional int32 field3993 = 4;
-  optional int32 field3994 = 7;
-  optional int32 field3995 = 8;
-  optional int32 field3996 = 9;
-  optional int32 field3997 = 10;
-  optional int32 field3998 = 11;
-  optional int32 field3999 = 12;
-  optional .benchmarks.google_message3.UnusedEnum field4000 = 6;
-  optional int32 field4001 = 5;
-}
diff --git a/libs/protobuf/benchmarks/datasets/google_message3/benchmark_message3_3.proto b/libs/protobuf/benchmarks/datasets/google_message3/benchmark_message3_3.proto
deleted file mode 100644
index 2e534a6..0000000
--- a/libs/protobuf/benchmarks/datasets/google_message3/benchmark_message3_3.proto
+++ /dev/null
@@ -1,496 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// LINT: ALLOW_GROUPS
-
-syntax = "proto2";
-
-package benchmarks.google_message3;
-
-import "datasets/google_message3/benchmark_message3_4.proto";
-import "datasets/google_message3/benchmark_message3_5.proto";
-import "datasets/google_message3/benchmark_message3_7.proto";
-import "datasets/google_message3/benchmark_message3_8.proto";
-
-option cc_enable_arenas = true;
-option java_package = "com.google.protobuf.benchmarks";
-
-message Message35546 {
-  optional int64 field35556 = 1;
-  optional int32 field35557 = 2;
-  optional bool field35558 = 3;
-  optional int64 field35559 = 13;
-  optional group Message35547 = 4 {
-    required int32 field35569 = 5;
-    required int32 field35570 = 6;
-  }
-  optional group Message35548 = 10 {
-    required int64 field35571 = 11;
-    required int64 field35572 = 12;
-  }
-  optional bool field35562 = 14;
-  optional bool field35563 = 15;
-  optional int32 field35564 = 16;
-  optional bool field35565 = 17;
-  optional bool field35566 = 18;
-  optional string field35567 = 100;
-}
-
-message Message2356 {
-  optional .benchmarks.google_message3.Message1374 field2368 = 121;
-  optional uint64 field2369 = 1;
-  optional int32 field2370 = 2;
-  optional int32 field2371 = 17;
-  required string field2372 = 3;
-  optional int32 field2373 = 7;
-  optional bytes field2374 = 8;
-  optional string field2375 = 4;
-  optional string field2376 = 101;
-  optional int32 field2377 = 102;
-  optional int32 field2378 = 103;
-  optional int32 field2379 = 104;
-  optional int32 field2380 = 113;
-  optional int32 field2381 = 114;
-  optional int32 field2382 = 115;
-  optional int32 field2383 = 117;
-  optional int32 field2384 = 118;
-  optional int32 field2385 = 119;
-  optional int32 field2386 = 105;
-  optional bytes field2387 = 5;
-  optional group Message2357 = 6 {
-    optional int64 field2399 = 9;
-    optional int32 field2400 = 10;
-    optional int32 field2401 = 11;
-    optional int32 field2402 = 12;
-    optional int32 field2403 = 13;
-    optional int32 field2404 = 116;
-    optional int32 field2405 = 106;
-    required bytes field2406 = 14;
-    optional int32 field2407 = 45;
-    optional int32 field2408 = 112;
-    optional bool field2409 = 122;
-    optional bytes field2410 = 124;
-  }
-  optional string field2389 = 120;
-  optional group Message2358 = 107 {}
-  repeated group Message2359 = 40 {
-    optional string field2413 = 41;
-    optional string field2414 = 42;
-    optional string field2415 = 43;
-    optional string field2416 = 44;
-    optional int32 field2417 = 46;
-    optional string field2418 = 47;
-    optional float field2419 = 110;
-    optional float field2420 = 111;
-  }
-  optional int32 field2392 = 50;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field2393 = 60;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field2394 = 70;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field2395 = 80;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field2396 = 90;
-  optional string field2397 = 100;
-  optional string field2398 = 123;
-}
-
-message Message7029 {
-  required int32 field7183 = 1;
-  optional int32 field7184 = 2;
-  optional int32 field7185 = 3;
-  optional int32 field7186 = 4;
-  optional int32 field7187 = 5;
-  optional int32 field7188 = 6;
-  optional int32 field7189 = 17;
-  optional int32 field7190 = 18;
-  optional int32 field7191 = 49;
-  optional int32 field7192 = 28;
-  optional int32 field7193 = 33;
-  optional int32 field7194 = 25;
-  optional int32 field7195 = 26;
-  optional int32 field7196 = 40;
-  optional int32 field7197 = 41;
-  optional int32 field7198 = 42;
-  optional int32 field7199 = 43;
-  optional int32 field7200 = 19;
-  optional int32 field7201 = 7;
-  optional int32 field7202 = 8;
-  optional int32 field7203 = 9;
-  optional int32 field7204 = 10;
-  optional int32 field7205 = 11;
-  optional int32 field7206 = 12;
-  repeated group Message7030 = 13 {
-    optional string field7226 = 14;
-    optional string field7227 = 15;
-    optional int64 field7228 = 16;
-  }
-  repeated group Message7031 = 21 {
-    optional string field7229 = 22;
-    optional int32 field7230 = 23;
-    optional int32 field7231 = 24;
-    optional int32 field7232 = 30;
-    optional int32 field7233 = 31;
-    optional int32 field7234 = 35;
-  }
-  optional int32 field7209 = 20;
-  optional float field7210 = 27;
-  optional int32 field7211 = 29;
-  optional int32 field7212 = 32;
-  optional string field7213 = 48;
-  optional bool field7214 = 34;
-  optional int32 field7215 = 36;
-  optional float field7216 = 37;
-  optional bool field7217 = 38;
-  optional bool field7218 = 39;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field7219 = 44;
-  optional int32 field7220 = 45;
-  optional int32 field7221 = 46;
-  optional int32 field7222 = 47;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field7223 = 50;
-  optional int32 field7224 = 51;
-}
-
-message Message35538 {
-  required int64 field35539 = 1;
-}
-
-message Message18921 {
-  optional string field18946 = 1;
-  optional fixed64 field18947 = 2;
-  optional int32 field18948 = 3;
-  optional double field18949 = 4;
-  optional bool field18950 = 17;
-  optional bool field18951 = 23;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field18952 = 24;
-  repeated group Message18922 = 5 {
-    optional uint64 field18959 = 6;
-    optional string field18960 = 13;
-    optional bool field18961 = 21;
-    optional bool field18962 = 33;
-    optional int32 field18963 = 7;
-    optional int32 field18964 = 8;
-    optional string field18965 = 9;
-    optional .benchmarks.google_message3.Message18856 field18966 = 10;
-    optional uint64 field18967 = 34;
-    optional .benchmarks.google_message3.UnusedEmptyMessage field18968 = 11;
-    optional uint64 field18969 = 35;
-    optional float field18970 = 12;
-    repeated string field18971 = 14;
-    optional bool field18972 = 15;
-    optional bool field18973 = 16;
-    optional float field18974 = 22;
-    optional int32 field18975 = 18;
-    optional int32 field18976 = 19;
-    optional int32 field18977 = 20;
-    optional .benchmarks.google_message3.UnusedEmptyMessage field18978 = 25;
-    optional .benchmarks.google_message3.UnusedEnum field18979 = 26;
-    repeated string field18980 = 27;
-    optional float field18981 = 28;
-  }
-  repeated .benchmarks.google_message3.UnusedEmptyMessage field18954 = 29;
-  repeated .benchmarks.google_message3.Message18943 field18955 = 30;
-  repeated .benchmarks.google_message3.Message18944 field18956 = 31;
-  repeated .benchmarks.google_message3.UnusedEmptyMessage field18957 = 32;
-}
-
-message Message35540 {
-  optional bool field35541 = 1;
-}
-
-message Message3886 {
-  repeated group Message3887 = 1 {
-    required string field3932 = 2;
-    optional string field3933 = 9;
-    optional .benchmarks.google_message3.Message3850 field3934 = 3;
-    optional bytes field3935 = 8;
-  }
-}
-
-message Message6743 {
-  optional .benchmarks.google_message3.Message6721 field6759 = 1;
-  optional .benchmarks.google_message3.Message6723 field6760 = 2;
-  optional .benchmarks.google_message3.Message6723 field6761 = 8;
-  optional .benchmarks.google_message3.Message6725 field6762 = 3;
-  optional .benchmarks.google_message3.Message6726 field6763 = 4;
-  optional .benchmarks.google_message3.Message6733 field6764 = 5;
-  optional .benchmarks.google_message3.Message6734 field6765 = 6;
-  optional .benchmarks.google_message3.Message6742 field6766 = 7;
-}
-
-message Message6773 {
-  optional .benchmarks.google_message3.Enum6769 field6794 = 1;
-  optional int32 field6795 = 9;
-  optional .benchmarks.google_message3.UnusedEnum field6796 = 10;
-  optional int32 field6797 = 11;
-  optional int32 field6798 = 2;
-  optional .benchmarks.google_message3.Enum6774 field6799 = 3;
-  optional double field6800 = 5;
-  optional double field6801 = 7;
-  optional double field6802 = 8;
-  optional .benchmarks.google_message3.Enum6782 field6803 = 6;
-}
-
-message Message8224 {
-  optional .benchmarks.google_message3.UnusedEmptyMessage field8255 = 1;
-  optional .benchmarks.google_message3.Message8184 field8256 = 2;
-  optional .benchmarks.google_message3.Message7966 field8257 = 3;
-  optional string field8258 = 4;
-  optional string field8259 = 5;
-  optional bool field8260 = 6;
-  optional int64 field8261 = 7;
-  optional string field8262 = 8;
-  optional int64 field8263 = 9;
-  optional double field8264 = 10;
-  optional int64 field8265 = 11;
-  repeated string field8266 = 12;
-  optional int64 field8267 = 13;
-  optional int32 field8268 = 14;
-  optional int32 field8269 = 15;
-  optional int64 field8270 = 16;
-  optional double field8271 = 17;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field8272 = 18;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field8273 = 19;
-  repeated .benchmarks.google_message3.UnusedEmptyMessage field8274 = 20;
-  optional bool field8275 = 21;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field8276 = 22;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field8277 = 23;
-  repeated .benchmarks.google_message3.UnusedEmptyMessage field8278 = 24;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field8279 = 25;
-  optional bool field8280 = 26;
-  repeated .benchmarks.google_message3.UnusedEmptyMessage field8281 = 27;
-}
-
-message Message8392 {
-  optional string field8395 = 1;
-  optional string field8396 = 2;
-  optional .benchmarks.google_message3.Message7966 field8397 = 3;
-  optional string field8398 = 4;
-  optional string field8399 = 5;
-  optional string field8400 = 6;
-  optional string field8401 = 7;
-  optional string field8402 = 8;
-  optional string field8403 = 9;
-}
-
-message Message8130 {
-  optional string field8156 = 1;
-  optional string field8157 = 2;
-  optional string field8158 = 4;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field8159 = 6;
-  repeated string field8160 = 7;
-  optional int64 field8161 = 8;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field8162 = 9;
-  optional string field8163 = 10;
-  optional string field8164 = 11;
-  optional string field8165 = 12;
-  optional string field8166 = 13;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field8167 = 14;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field8168 = 15;
-  optional string field8169 = 16;
-  optional .benchmarks.google_message3.UnusedEnum field8170 = 17;
-  optional .benchmarks.google_message3.UnusedEnum field8171 = 18;
-  optional bool field8172 = 19;
-  optional bool field8173 = 20;
-  optional double field8174 = 21;
-  optional int32 field8175 = 22;
-  optional int32 field8176 = 23;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field8177 = 24;
-  repeated .benchmarks.google_message3.UnusedEmptyMessage field8178 = 25;
-  repeated .benchmarks.google_message3.UnusedEmptyMessage field8179 = 26;
-}
-
-message Message8478 {
-  optional string field8489 = 7;
-  optional .benchmarks.google_message3.Message7966 field8490 = 1;
-  optional .benchmarks.google_message3.Message8476 field8491 = 2;
-  optional int64 field8492 = 3;
-  optional .benchmarks.google_message3.Message8476 field8493 = 4;
-  repeated .benchmarks.google_message3.Message8477 field8494 = 5;
-  optional .benchmarks.google_message3.Message8454 field8495 = 6;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field8496 = 8;
-}
-
-message Message8479 {
-  optional .benchmarks.google_message3.Message8475 field8497 = 1;
-  optional .benchmarks.google_message3.Message7966 field8498 = 2;
-  optional .benchmarks.google_message3.Message8476 field8499 = 3;
-  optional .benchmarks.google_message3.Message8476 field8500 = 4;
-  optional string field8501 = 6;
-  optional string field8502 = 7;
-  optional .benchmarks.google_message3.Message7966 field8503 = 8;
-  optional .benchmarks.google_message3.Message8455 field8504 = 5;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field8505 = 9;
-}
-
-message Message10319 {
-  optional .benchmarks.google_message3.Enum10325 field10340 = 1;
-  optional int32 field10341 = 4;
-  optional int32 field10342 = 5;
-  optional bytes field10343 = 3;
-  optional string field10344 = 2;
-  optional string field10345 = 6;
-  optional string field10346 = 7;
-}
-
-message Message4016 {
-  required int32 field4017 = 1;
-  required int32 field4018 = 2;
-  required int32 field4019 = 3;
-  required int32 field4020 = 4;
-}
-
-message Message12669 {
-  optional .benchmarks.google_message3.Message12559 field12681 = 1;
-  optional float field12682 = 2;
-  optional bool field12683 = 3;
-  optional .benchmarks.google_message3.Enum12670 field12684 = 4;
-}
-
-message Message12819 {
-  optional double field12834 = 1;
-  optional double field12835 = 2;
-  optional double field12836 = 3;
-  optional double field12837 = 4;
-  optional double field12838 = 5;
-  optional double field12839 = 6;
-}
-
-message Message12820 {
-  optional int32 field12840 = 1;
-  optional int32 field12841 = 2;
-  optional int32 field12842 = 3;
-  optional int32 field12843 = 8;
-  optional int32 field12844 = 4;
-  optional int32 field12845 = 5;
-  optional int32 field12846 = 6;
-  optional int32 field12847 = 7;
-}
-
-message Message12821 {
-  optional int32 field12848 = 1;
-  optional int32 field12849 = 2;
-  optional int32 field12850 = 3;
-  optional int32 field12851 = 4;
-  optional int32 field12852 = 5;
-}
-
-message Message12818 {
-  optional uint64 field12829 = 1;
-  optional int32 field12830 = 2;
-  optional int32 field12831 = 3;
-  optional int32 field12832 = 5;
-  repeated .benchmarks.google_message3.Message12817 field12833 = 4;
-}
-
-message Message16479 {
-  optional .benchmarks.google_message3.Message16480 field16484 = 1;
-  optional int32 field16485 = 5;
-  optional float field16486 = 2;
-  optional uint32 field16487 = 4;
-  optional bool field16488 = 3;
-  optional uint32 field16489 = 6;
-}
-
-message Message16722 {
-  optional string field16752 = 1;
-  optional string field16753 = 2;
-  optional string field16754 = 3;
-  optional int32 field16755 = 5;
-  optional string field16756 = 4;
-}
-
-message Message16724 {
-  optional int64 field16761 = 1;
-  optional float field16762 = 2;
-  optional int64 field16763 = 3;
-  optional int64 field16764 = 4;
-  optional bool field16765 = 5;
-  repeated string field16766 = 6;
-  repeated string field16767 = 7;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field16768 = 8;
-  optional bool field16769 = 9;
-  optional uint32 field16770 = 10;
-  optional .benchmarks.google_message3.Enum16728 field16771 = 11;
-  repeated int32 field16772 = 12;
-  optional bool field16773 = 13;
-}
-
-message Message17728 {}
-
-message Message24356 {
-  optional string field24559 = 1;
-  optional string field24560 = 2;
-  optional int32 field24561 = 14;
-  optional string field24562 = 3;
-  optional string field24563 = 4;
-  optional string field24564 = 5;
-  optional .benchmarks.google_message3.UnusedEnum field24565 = 13;
-  optional string field24566 = 6;
-  optional .benchmarks.google_message3.Enum24361 field24567 = 12;
-  optional string field24568 = 7;
-  optional string field24569 = 8;
-  optional string field24570 = 9;
-  repeated .benchmarks.google_message3.UnusedEmptyMessage field24571 = 10;
-  repeated string field24572 = 11;
-  repeated string field24573 = 15;
-}
-
-message Message24376 {
-  optional string field24589 = 1;
-  optional string field24590 = 2;
-  optional string field24591 = 3;
-  required .benchmarks.google_message3.Message24377 field24592 = 4;
-  optional .benchmarks.google_message3.Message24317 field24593 = 5;
-  optional string field24594 = 6;
-  optional .benchmarks.google_message3.Message24378 field24595 = 7;
-  repeated string field24596 = 8;
-  repeated .benchmarks.google_message3.UnusedEmptyMessage field24597 = 14;
-  repeated string field24598 = 9;
-  repeated string field24599 = 10;
-  repeated string field24600 = 11;
-  optional string field24601 = 12;
-  repeated string field24602 = 13;
-}
-
-message Message24366 {
-  optional string field24574 = 1;
-  optional string field24575 = 2;
-  optional string field24576 = 3;
-  optional int32 field24577 = 10;
-  optional string field24578 = 13;
-  optional string field24579 = 4;
-  optional string field24580 = 5;
-  optional .benchmarks.google_message3.UnusedEnum field24581 = 9;
-  optional string field24582 = 14;
-  optional .benchmarks.google_message3.UnusedEnum field24583 = 15;
-  optional string field24584 = 6;
-  optional string field24585 = 12;
-  repeated .benchmarks.google_message3.UnusedEmptyMessage field24586 = 7;
-  repeated string field24587 = 8;
-  repeated string field24588 = 11;
-}
diff --git a/libs/protobuf/benchmarks/datasets/google_message3/benchmark_message3_4.proto b/libs/protobuf/benchmarks/datasets/google_message3/benchmark_message3_4.proto
deleted file mode 100644
index b304148..0000000
--- a/libs/protobuf/benchmarks/datasets/google_message3/benchmark_message3_4.proto
+++ /dev/null
@@ -1,514 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// LINT: ALLOW_GROUPS
-
-syntax = "proto2";
-
-package benchmarks.google_message3;
-
-import "datasets/google_message3/benchmark_message3_5.proto";
-import "datasets/google_message3/benchmark_message3_6.proto";
-import "datasets/google_message3/benchmark_message3_7.proto";
-import "datasets/google_message3/benchmark_message3_8.proto";
-
-option cc_enable_arenas = true;
-option java_package = "com.google.protobuf.benchmarks";
-
-message Message24346 {}
-
-message Message24401 {
-  optional .benchmarks.google_message3.Message24400 field24679 = 1;
-}
-
-message Message24402 {
-  optional .benchmarks.google_message3.Message24400 field24680 = 1;
-}
-
-message Message24379 {
-  optional string field24603 = 1;
-  optional string field24604 = 2;
-  optional string field24605 = 3;
-  required .benchmarks.google_message3.Message24380 field24606 = 4;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field24607 = 5;
-  optional string field24608 = 6;
-  optional .benchmarks.google_message3.Message24381 field24609 = 7;
-  repeated string field24610 = 8;
-  repeated .benchmarks.google_message3.UnusedEmptyMessage field24611 = 17;
-  repeated string field24612 = 9;
-  repeated string field24613 = 10;
-  repeated string field24614 = 11;
-  optional string field24615 = 14;
-  optional string field24616 = 12;
-  optional string field24617 = 16;
-  repeated .benchmarks.google_message3.UnusedEmptyMessage field24618 = 13;
-  repeated string field24619 = 15;
-  repeated string field24620 = 18;
-}
-
-message Message27358 {
-  optional int32 field27415 = 1;
-  optional int32 field27416 = 2;
-}
-
-message Message34381 {
-  optional string field34398 = 1;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field34399 = 2;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field34400 = 3;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field34401 = 4;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field34402 = 5;
-  optional bool field34403 = 6;
-  optional bool field34404 = 7;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field34405 = 8;
-  optional bool field34406 = 9;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field34407 = 10;
-}
-
-message Message34619 {
-  optional double field34641 = 1;
-  optional double field34642 = 2;
-  optional double field34643 = 3;
-  optional double field34644 = 4;
-  optional double field34645 = 11;
-  optional double field34646 = 5;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field34647 = 100;
-}
-
-message Message730 {
-  optional string field897 = 19;
-  repeated string field898 = 27;
-  repeated string field899 = 28;
-  repeated string field900 = 21;
-  optional string field901 = 30;
-  repeated uint32 field902 = 20;
-  repeated uint32 field903 = 32;
-  repeated string field904 = 16;
-  repeated .benchmarks.google_message3.Message697 field905 = 6;
-  repeated .benchmarks.google_message3.Message704 field906 = 7;
-  repeated string field907 = 18;
-  repeated .benchmarks.google_message3.Message703 field908 = 8;
-  repeated string field909 = 9;
-  optional .benchmarks.google_message3.Message716 field910 = 10;
-  optional .benchmarks.google_message3.Message718 field911 = 11;
-  optional bool field912 = 14;
-  repeated .benchmarks.google_message3.Message715 field913 = 4;
-  repeated string field914 = 17;
-  repeated string field915 = 23;
-  repeated .benchmarks.google_message3.Message719 field916 = 24;
-  repeated .benchmarks.google_message3.Message728 field917 = 26;
-  repeated .benchmarks.google_message3.Message702 field918 = 35;
-  optional string field919 = 36;
-  repeated string field920 = 37;
-  optional int64 field921 = 38;
-  repeated .benchmarks.google_message3.UnusedEmptyMessage field922 = 39;
-  repeated .benchmarks.google_message3.UnusedEmptyMessage field923 = 1;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field924 = 2;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field925 = 3;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field926 = 5;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field927 = 13;
-  repeated string field928 = 22;
-  optional bytes field929 = 31;
-  extensions 25 to 25;
-  extensions 29 to 29;
-  extensions 34 to 34;
-  extensions 15 to 15;
-}
-
-message Message33958 {
-  optional string field33977 = 1;
-  optional string field33978 = 9;
-  repeated group Message33959 = 2 {
-    required string field33982 = 3;
-    optional string field33983 = 4;
-    optional string field33984 = 5;
-    optional fixed64 field33985 = 8;
-    optional bool field33986 = 10;
-    optional .benchmarks.google_message3.Message0 field33987 = 6;
-  }
-  optional .benchmarks.google_message3.Enum33960 field33980 = 7;
-  extend .benchmarks.google_message3.Message0 {
-    optional .benchmarks.google_message3.Message33958 field33981 = 10747482;
-  }
-}
-
-message Message6637 {
-  optional .benchmarks.google_message3.UnusedEmptyMessage field6670 = 2;
-  repeated .benchmarks.google_message3.UnusedEmptyMessage field6671 = 1;
-  optional int32 field6672 = 3;
-  repeated string field6673 = 4;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field6674 = 5;
-}
-
-message Message6643 {
-  optional .benchmarks.google_message3.UnusedEmptyMessage field6683 = 3;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field6684 = 4;
-  optional double field6685 = 5;
-  optional double field6686 = 6;
-  optional int32 field6687 = 1;
-  optional int32 field6688 = 2;
-  optional double field6689 = 9;
-  optional bytes field6690 = 10;
-  optional int32 field6691 = 11;
-  optional bool field6692 = 12;
-  optional bool field6693 = 13;
-  optional .benchmarks.google_message3.Message6578 field6694 = 15;
-  optional .benchmarks.google_message3.UnusedEnum field6695 = 16;
-  optional int64 field6696 = 17;
-  repeated .benchmarks.google_message3.UnusedEmptyMessage field6697 = 22;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field6698 = 19;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field6699 = 20;
-  optional int32 field6700 = 21;
-}
-
-message Message6126 {
-  required string field6152 = 1;
-  repeated .benchmarks.google_message3.UnusedEmptyMessage field6153 = 9;
-  optional int32 field6154 = 14;
-  optional bytes field6155 = 10;
-  optional .benchmarks.google_message3.Message6024 field6156 = 12;
-  optional int32 field6157 = 4;
-  optional string field6158 = 5;
-  optional int32 field6159 = 6;
-  repeated int32 field6160 = 2;
-  repeated int32 field6161 = 3;
-  repeated .benchmarks.google_message3.Message6052 field6162 = 7;
-  repeated .benchmarks.google_message3.UnusedEmptyMessage field6163 = 11;
-  optional .benchmarks.google_message3.Enum6065 field6164 = 15;
-  repeated .benchmarks.google_message3.UnusedEmptyMessage field6165 = 8;
-  optional bool field6166 = 13;
-  optional bool field6167 = 16;
-  optional bool field6168 = 18;
-  repeated .benchmarks.google_message3.Message6054 field6169 = 17;
-  optional int32 field6170 = 19;
-}
-
-message Message13083 {
-  optional float field13096 = 1;
-  repeated group Message13084 = 2 {
-    required float field13107 = 3;
-    required int32 field13108 = 4;
-    optional float field13109 = 5;
-    repeated .benchmarks.google_message3.Enum13092 field13110 = 6;
-  }
-  optional float field13098 = 44;
-  optional float field13099 = 45;
-  optional uint64 field13100 = 46;
-  optional float field13101 = 47;
-  optional group Message13085 = 16 {}
-  repeated group Message13086 = 23 {}
-  repeated group Message13087 = 29 {}
-  optional .benchmarks.google_message3.UnusedEmptyMessage field13105 = 43;
-}
-
-message Message13088 {
-  repeated group Message13089 = 1 {
-    required string field13139 = 2;
-    optional float field13140 = 3;
-  }
-  optional int64 field13136 = 4;
-  optional bool field13137 = 5;
-}
-
-message Message10391 {
-  optional .benchmarks.google_message3.Enum10392 field10411 = 1;
-  optional .benchmarks.google_message3.UnusedEnum field10412 = 2;
-  optional int64 field10413 = 3;
-  optional string field10414 = 4;
-  optional string field10415 = 5;
-  optional bytes field10416 = 6;
-  optional bool field10417 = 8;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field10418 = 9;
-  optional bool field10419 = 10;
-}
-
-message Message11873 {
-  optional string field11876 = 1;
-  optional string field11877 = 4;
-  optional .benchmarks.google_message3.Message10573 field11878 = 5;
-  optional .benchmarks.google_message3.Message10582 field11879 = 6;
-  optional .benchmarks.google_message3.Message10824 field11880 = 7;
-  optional .benchmarks.google_message3.Message10773 field11881 = 12;
-  optional .benchmarks.google_message3.Message11866 field11882 = 8;
-  optional .benchmarks.google_message3.Message10818 field11883 = 13;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field11884 = 16;
-  optional .benchmarks.google_message3.Message10155 field11885 = 11;
-  optional .benchmarks.google_message3.Message10469 field11886 = 14;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field11887 = 15;
-  extensions 9 to 9;
-  extensions 10 to 10;
-}
-
-message Message35506 {
-  optional int32 field35524 = 1;
-  optional string field35525 = 2;
-  optional .benchmarks.google_message3.Enum35507 field35526 = 3;
-  repeated .benchmarks.google_message3.UnusedEmptyMessage field35527 = 4;
-}
-
-message Message13151 {
-  repeated .benchmarks.google_message3.Message13145 field13158 = 1;
-}
-
-message Message18253 {
-  repeated group Message18254 = 1 {
-    required fixed64 field18362 = 2;
-    required double field18363 = 3;
-  }
-}
-
-message Message16685 {
-  repeated .benchmarks.google_message3.Message16686 field16694 = 2;
-}
-
-message Message16816 {
-  optional float field16826 = 1;
-  optional .benchmarks.google_message3.Enum16819 field16827 = 2;
-  optional float field16828 = 3;
-  repeated group Message16817 = 4 {}
-  optional bool field16830 = 7;
-  optional bool field16831 = 8;
-  repeated group Message16818 = 12 {}
-  optional string field16833 = 10;
-  optional bool field16834 = 13;
-  optional bool field16835 = 14;
-}
-
-message Message13168 {
-  required int32 field13212 = 1;
-  optional fixed64 field13213 = 7;
-  optional bool field13214 = 8;
-  optional fixed64 field13215 = 10;
-  optional bool field13216 = 11;
-  optional .benchmarks.google_message3.Message12796 field13217 = 9;
-  required double field13218 = 2;
-  required bool field13219 = 3;
-  optional int32 field13220 = 4;
-  required bool field13221 = 5;
-  optional int32 field13222 = 6;
-}
-
-message Message13167 {
-  required int32 field13199 = 1;
-  optional int32 field13200 = 2;
-  optional int32 field13201 = 3;
-  optional bool field13202 = 8;
-  optional fixed64 field13203 = 12;
-  optional bool field13204 = 13;
-  optional .benchmarks.google_message3.Message12796 field13205 = 11;
-  optional fixed64 field13206 = 9;
-  optional bool field13207 = 10;
-  repeated int32 field13208 = 4;
-  optional int32 field13209 = 5;
-  optional int32 field13210 = 6;
-  optional int32 field13211 = 7;
-}
-
-message Message1374 {
-  required string field1375 = 1;
-  optional string field1376 = 2;
-}
-
-message Message18943 {}
-
-message Message18944 {}
-
-message Message18856 {
-  optional string field18857 = 1;
-  optional string field18858 = 2;
-  optional bool field18859 = 31;
-  optional string field18860 = 26;
-  optional string field18861 = 3;
-  optional string field18862 = 4;
-  optional string field18863 = 5;
-  optional string field18864 = 17;
-  optional string field18865 = 6;
-  optional string field18866 = 7;
-  optional string field18867 = 8;
-  optional string field18868 = 9;
-  optional string field18869 = 10;
-  optional string field18870 = 11;
-  optional string field18871 = 21;
-  optional string field18872 = 18;
-  optional string field18873 = 19;
-  optional string field18874 = 20;
-  optional string field18875 = 22;
-  optional string field18876 = 23;
-  optional string field18877 = 24;
-  optional string field18878 = 25;
-  optional string field18879 = 12;
-  optional string field18880 = 13;
-  optional string field18881 = 29;
-  optional string field18882 = 30;
-  optional string field18883 = 15;
-  optional string field18884 = 16;
-  repeated string field18885 = 14;
-  optional string field18886 = 27;
-  optional string field18887 = 28;
-}
-
-message Message3850 {
-  optional .benchmarks.google_message3.Enum3851 field3924 = 2;
-  optional bool field3925 = 12;
-  optional int32 field3926 = 4;
-  optional bool field3927 = 10;
-  optional bool field3928 = 13;
-  optional bool field3929 = 14;
-}
-
-message Message6721 {
-  optional .benchmarks.google_message3.Message6722 field6744 = 1;
-  optional bool field6745 = 2;
-  optional bool field6746 = 3;
-  optional bool field6747 = 4;
-}
-
-message Message6742 {
-  optional bool field6758 = 1;
-}
-
-message Message6726 {
-  optional int64 field6752 = 1;
-  repeated .benchmarks.google_message3.Message6727 field6753 = 2;
-}
-
-message Message6733 {
-  optional int64 field6754 = 1;
-  optional int64 field6755 = 2;
-  optional bool field6756 = 3;
-}
-
-message Message6723 {
-  optional int64 field6748 = 1;
-  repeated .benchmarks.google_message3.Message6724 field6749 = 2;
-}
-
-message Message6725 {
-  optional int32 field6750 = 1;
-  optional int32 field6751 = 2;
-}
-
-message Message6734 {
-  repeated .benchmarks.google_message3.Message6735 field6757 = 1;
-}
-
-message Message8184 {
-  optional .benchmarks.google_message3.Message7966 field8228 = 1;
-  optional bool field8229 = 2;
-  repeated .benchmarks.google_message3.Message8183 field8230 = 3;
-}
-
-message Message8477 {
-  optional .benchmarks.google_message3.Message7966 field8486 = 1;
-  optional int64 field8487 = 2;
-  optional string field8488 = 3;
-}
-
-message Message8454 {
-  optional .benchmarks.google_message3.Message8449 field8465 = 1;
-  optional int64 field8466 = 3;
-  optional int32 field8467 = 4;
-  optional bool field8468 = 5;
-  extend .benchmarks.google_message3.Message8301 {
-    optional .benchmarks.google_message3.Message8454 field8469 = 66;
-  }
-}
-
-message Message8476 {
-  optional string field8483 = 1;
-  optional string field8484 = 2;
-  optional string field8485 = 3;
-}
-
-message Message8455 {
-  optional .benchmarks.google_message3.Message8449 field8470 = 1;
-  repeated .benchmarks.google_message3.Message8456 field8471 = 2;
-  optional .benchmarks.google_message3.Message8457 field8472 = 5;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field8473 = 6;
-  extend .benchmarks.google_message3.Message8302 {
-    optional .benchmarks.google_message3.Message8455 field8474 = 66;
-  }
-}
-
-message Message8475 {
-  optional string field8481 = 1;
-  optional int64 field8482 = 2;
-}
-
-message Message12559 {}
-
-message Message12817 {
-  optional int32 field12826 = 1;
-  optional int32 field12827 = 2;
-  optional int32 field12828 = 3;
-}
-
-message Message16480 {
-  optional .benchmarks.google_message3.Message13358 field16490 = 1;
-  optional .benchmarks.google_message3.Enum16042 field16491 = 2;
-  optional .benchmarks.google_message3.Message13912 field16492 = 3;
-  optional string field16493 = 4;
-  optional string field16494 = 5;
-  optional string field16495 = 6;
-  optional string field16496 = 7;
-  optional .benchmarks.google_message3.Message13358 field16497 = 8;
-  optional fixed32 field16498 = 9;
-}
-
-message Message24317 {
-  optional string field24446 = 1;
-  optional .benchmarks.google_message3.Message24312 field24447 = 2;
-  repeated .benchmarks.google_message3.Message24315 field24448 = 3;
-  repeated .benchmarks.google_message3.Message24313 field24449 = 4;
-  repeated .benchmarks.google_message3.Message24316 field24450 = 5;
-  repeated .benchmarks.google_message3.UnusedEmptyMessage field24451 = 6;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field24452 = 7;
-  repeated string field24453 = 8;
-  repeated string field24454 = 9;
-  repeated string field24455 = 10;
-  repeated string field24456 = 28;
-  optional string field24457 = 11;
-  optional string field24458 = 12;
-  optional string field24459 = 13;
-  optional string field24460 = 14;
-  repeated string field24461 = 15;
-  optional string field24462 = 16;
-  repeated string field24463 = 17;
-  repeated string field24464 = 18;
-  repeated string field24465 = 19;
-  repeated string field24466 = 20;
-  repeated string field24467 = 21;
-  repeated string field24468 = 22;
-  repeated string field24469 = 23;
-  repeated string field24470 = 24;
-  optional string field24471 = 25;
-  optional string field24472 = 26;
-  repeated string field24473 = 27;
-  optional bool field24474 = 40;
-}
diff --git a/libs/protobuf/benchmarks/datasets/google_message3/benchmark_message3_5.proto b/libs/protobuf/benchmarks/datasets/google_message3/benchmark_message3_5.proto
deleted file mode 100644
index e72d7ee..0000000
--- a/libs/protobuf/benchmarks/datasets/google_message3/benchmark_message3_5.proto
+++ /dev/null
@@ -1,496 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// LINT: ALLOW_GROUPS
-
-syntax = "proto2";
-
-package benchmarks.google_message3;
-
-import "datasets/google_message3/benchmark_message3_6.proto";
-import "datasets/google_message3/benchmark_message3_7.proto";
-import "datasets/google_message3/benchmark_message3_8.proto";
-
-option cc_enable_arenas = true;
-option java_package = "com.google.protobuf.benchmarks";
-
-message Message24377 {}
-
-message Message24378 {}
-
-message Message24400 {
-  optional int32 field24674 = 1;
-  optional int32 field24675 = 2;
-  optional int32 field24676 = 3;
-  optional int32 field24677 = 4;
-  optional int32 field24678 = 5;
-}
-
-message Message24380 {}
-
-message Message24381 {}
-
-message Message719 {
-  repeated string field881 = 1;
-  repeated string field882 = 2;
-  repeated string field883 = 3;
-  optional .benchmarks.google_message3.Enum720 field884 = 4;
-}
-
-message Message728 {
-  required string field887 = 1;
-  repeated string field888 = 2;
-  repeated .benchmarks.google_message3.Message703 field889 = 3;
-  repeated .benchmarks.google_message3.Message715 field890 = 4;
-  repeated string field891 = 5;
-  repeated string field892 = 6;
-  optional .benchmarks.google_message3.Message718 field893 = 7;
-  optional .benchmarks.google_message3.Message716 field894 = 8;
-  repeated string field895 = 9;
-  extensions 10 to 10;
-  extensions 11 to 11;
-  extensions 12 to 12;
-}
-
-message Message704 {
-  optional string field800 = 1;
-  optional string field801 = 7;
-  optional string field802 = 2;
-  optional string field803 = 3;
-  optional string field804 = 4;
-  optional string field805 = 5;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field806 = 6;
-}
-
-message Message697 {
-  optional string field743 = 7;
-  repeated string field744 = 1;
-  repeated string field745 = 2;
-  repeated string field746 = 33;
-  repeated string field747 = 29;
-  repeated string field748 = 30;
-  repeated string field749 = 31;
-  repeated string field750 = 32;
-  repeated string field751 = 13;
-  repeated string field752 = 6;
-  repeated string field753 = 3;
-  repeated string field754 = 14;
-  repeated string field755 = 15;
-  repeated string field756 = 16;
-  repeated string field757 = 4;
-  repeated string field758 = 34;
-  repeated string field759 = 35;
-  repeated string field760 = 5;
-  repeated string field761 = 17;
-  repeated string field762 = 18;
-  repeated string field763 = 19;
-  optional bool field764 = 36;
-  repeated string field765 = 8;
-  repeated string field766 = 9;
-  optional string field767 = 27;
-  optional bool field768 = 25;
-  optional .benchmarks.google_message3.Message700 field769 = 10;
-  optional bool field770 = 11;
-  optional bool field771 = 24;
-  repeated string field772 = 12;
-  repeated string field773 = 20;
-  repeated string field774 = 21;
-  repeated string field775 = 22;
-  repeated .benchmarks.google_message3.Message699 field776 = 23;
-  repeated .benchmarks.google_message3.Message698 field777 = 37;
-  optional int64 field778 = 38;
-  extensions 28 to 28;
-  extensions 26 to 26;
-}
-
-message Message0 {
-  option message_set_wire_format = true;
-
-  extensions 4 to 2147483646;
-}
-
-message Message6578 {
-  optional .benchmarks.google_message3.Enum6579 field6632 = 1;
-  optional .benchmarks.google_message3.Enum6588 field6633 = 2;
-}
-
-message Message6024 {
-  optional .benchmarks.google_message3.Enum6025 field6048 = 1;
-  optional string field6049 = 2;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field6050 = 3;
-}
-
-message Message6052 {
-  required string field6084 = 1;
-  required bytes field6085 = 2;
-}
-
-message Message6054 {
-  required string field6089 = 1;
-  optional string field6090 = 2;
-}
-
-message Message10573 {
-  repeated .benchmarks.google_message3.Message10576 field10580 = 1;
-  optional string field10581 = 2;
-  extensions 10000 to 536870911;
-}
-
-message Message10824 {
-  required string field10825 = 1;
-  optional int32 field10826 = 2;
-}
-
-message Message10582 {
-  required bool field10583 = 1;
-  required double field10584 = 2;
-  optional bool field10585 = 3;
-  optional double field10586 = 4;
-  optional double field10587 = 5;
-  optional bool field10588 = 6;
-}
-
-message Message10155 {
-  required int32 field10195 = 1;
-  required int32 field10196 = 2;
-  optional .benchmarks.google_message3.Enum10157 field10197 = 59;
-  optional int32 field10198 = 18;
-  optional int32 field10199 = 19;
-  optional int32 field10200 = 21;
-  repeated group Message10156 = 50 {
-    optional .benchmarks.google_message3.Enum8862 field10266 = 51;
-    optional int32 field10267 = 52;
-    optional int32 field10268 = 53;
-    optional int32 field10269 = 54;
-  }
-  optional int32 field10202 = 3;
-  optional int32 field10203 = 4;
-  optional int32 field10204 = 5;
-  optional bool field10205 = 84;
-  optional bool field10206 = 33;
-  optional int32 field10207 = 75;
-  optional float field10208 = 26;
-  optional int32 field10209 = 27;
-  optional int32 field10210 = 49;
-  optional int32 field10211 = 10;
-  optional float field10212 = 78;
-  optional .benchmarks.google_message3.Message9151 field10213 = 91;
-  optional int32 field10214 = 11;
-  optional int32 field10215 = 12;
-  optional float field10216 = 41;
-  optional .benchmarks.google_message3.Message10154 field10217 = 61;
-  optional int32 field10218 = 23;
-  optional bytes field10219 = 24;
-  optional int32 field10220 = 65;
-  repeated bytes field10221 = 66;
-  optional int32 field10222 = 70;
-  optional bytes field10223 = 71;
-  repeated fixed64 field10224 = 73;
-  optional float field10225 = 29;
-  optional int32 field10226 = 30;
-  optional float field10227 = 31;
-  optional int32 field10228 = 32;
-  optional float field10229 = 34;
-  optional int32 field10230 = 35;
-  optional string field10231 = 22;
-  optional fixed64 field10232 = 13;
-  optional fixed64 field10233 = 20;
-  optional bool field10234 = 79;
-  repeated .benchmarks.google_message3.Enum10167 field10235 = 80
-      [packed = true];
-  optional int32 field10236 = 14;
-  optional int32 field10237 = 15;
-  optional int32 field10238 = 28;
-  repeated string field10239 = 16;
-  optional .benchmarks.google_message3.Message9182 field10240 = 17;
-  optional int32 field10241 = 63;
-  optional float field10242 = 64;
-  optional float field10243 = 37;
-  repeated float field10244 = 43;
-  optional int32 field10245 = 44;
-  optional .benchmarks.google_message3.Message9242 field10246 = 45;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field10247 = 46;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field10248 = 62;
-  optional .benchmarks.google_message3.Message8944 field10249 = 48;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field10250 = 87;
-  optional int32 field10251 = 58;
-  optional int32 field10252 = 92;
-  optional .benchmarks.google_message3.Message9123 field10253 = 93;
-  optional .benchmarks.google_message3.Message9160 field10254 = 60;
-  optional .benchmarks.google_message3.Message8890 field10255 = 67;
-  optional string field10256 = 69;
-  optional int64 field10257 = 74;
-  optional float field10258 = 82;
-  optional float field10259 = 85;
-  optional float field10260 = 86;
-  optional int64 field10261 = 83;
-  optional string field10262 = 77;
-  optional bool field10263 = 88;
-  repeated .benchmarks.google_message3.Message9628 field10264 = 94;
-  extensions 57 to 57;
-  extensions 1000 to 536870911;
-}
-
-message Message11866 {
-  required .benchmarks.google_message3.Message11014 field11868 = 1;
-  optional bool field11869 = 2;
-  optional double field11870 = 3;
-  optional double field11871 = 4;
-  repeated .benchmarks.google_message3.UnusedEmptyMessage field11872 = 5;
-}
-
-message Message10469 {
-  optional string field10473 = 1;
-  optional float field10474 = 2;
-  optional int32 field10475 = 3;
-  optional int32 field10476 = 4;
-  optional int32 field10477 = 5;
-  optional bool field10478 = 6;
-  optional bool field10479 = 7;
-  optional int32 field10480 = 8;
-  optional float field10481 = 9;
-}
-
-message Message10818 {
-  optional .benchmarks.google_message3.Message10800 field10819 = 1;
-  optional .benchmarks.google_message3.Message10801 field10820 = 2;
-}
-
-message Message10773 {
-  optional bool field10774 = 9;
-  optional bool field10775 = 1;
-  optional bool field10776 = 23;
-  optional bool field10777 = 2;
-  optional bool field10778 = 3;
-  optional int32 field10779 = 4;
-  optional int32 field10780 = 5;
-  optional int32 field10781 = 6;
-  optional int32 field10782 = 7;
-  optional int32 field10783 = 8;
-  optional int32 field10784 = 10;
-  optional .benchmarks.google_message3.Message10749 field10785 = 11;
-  repeated .benchmarks.google_message3.UnusedEmptyMessage field10786 = 12;
-  optional bool field10787 = 13;
-  optional bool field10788 = 15;
-  optional bool field10789 = 16;
-  optional int32 field10790 = 17;
-  optional int32 field10791 = 18;
-  optional bool field10792 = 19;
-  optional bool field10793 = 20;
-  optional bool field10794 = 21;
-  optional .benchmarks.google_message3.UnusedEnum field10795 = 14;
-  optional .benchmarks.google_message3.UnusedEnum field10796 = 22;
-}
-
-message Message13145 {
-  required .benchmarks.google_message3.Enum13146 field13155 = 1;
-  optional float field13156 = 2;
-  optional float field13157 = 3;
-  extensions 1000 to 536870911;
-}
-
-message Message16686 {}
-
-message Message12796 {
-  repeated fixed64 field12800 = 1;
-  optional uint64 field12801 = 2;
-}
-
-message Message6722 {}
-
-message Message6727 {}
-
-message Message6724 {}
-
-message Message6735 {}
-
-message Message8183 {
-  optional string field8226 = 1;
-  optional string field8227 = 2;
-}
-
-message Message8301 {
-  optional string field8328 = 1;
-  optional .benchmarks.google_message3.Message7966 field8329 = 2;
-  optional string field8330 = 3;
-  optional string field8331 = 4;
-  repeated .benchmarks.google_message3.Message8290 field8332 = 5;
-  optional .benchmarks.google_message3.Message7966 field8333 = 6;
-  repeated .benchmarks.google_message3.Message8298 field8334 = 7;
-  optional .benchmarks.google_message3.Message8300 field8335 = 8;
-  optional int64 field8336 = 9;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field8337 = 10;
-  optional .benchmarks.google_message3.Message7965 field8338 = 11;
-  extensions 64 to 536870911;
-}
-
-message Message8456 {}
-
-message Message8302 {
-  optional string field8339 = 1;
-  optional .benchmarks.google_message3.Message7966 field8340 = 2;
-  optional string field8341 = 3;
-  optional string field8342 = 4;
-  optional string field8343 = 5;
-  optional string field8344 = 6;
-  optional string field8345 = 7;
-  optional int64 field8346 = 8;
-  optional int64 field8347 = 9;
-  repeated .benchmarks.google_message3.Message8290 field8348 = 10;
-  optional string field8349 = 11;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field8350 = 12;
-  optional .benchmarks.google_message3.Message8291 field8351 = 13;
-  optional int64 field8352 = 14;
-  optional .benchmarks.google_message3.Message8296 field8353 = 15;
-  optional string field8354 = 16;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field8355 = 17;
-  repeated int32 field8356 = 18;
-  repeated int32 field8357 = 19;
-  repeated .benchmarks.google_message3.UnusedEmptyMessage field8358 = 20;
-  optional .benchmarks.google_message3.Message7965 field8359 = 21;
-  extensions 64 to 536870911;
-}
-
-message Message8457 {}
-
-message Message8449 {
-  optional string field8458 = 1;
-  optional bool field8459 = 2;
-  optional .benchmarks.google_message3.Enum8450 field8460 = 3;
-  repeated string field8461 = 4;
-  optional string field8462 = 5;
-  optional string field8463 = 6;
-  optional .benchmarks.google_message3.Message7966 field8464 = 7;
-}
-
-message Message13358 {
-  required fixed64 field13359 = 1;
-  required fixed64 field13360 = 2;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field13361 = 3;
-}
-
-message Message13912 {
-  required fixed32 field13913 = 1;
-  required fixed32 field13914 = 2;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field13915 = 500;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field13916 = 15;
-}
-
-message Message24316 {
-  repeated string field24443 = 1;
-  repeated string field24444 = 2;
-  repeated string field24445 = 3;
-}
-
-message Message24312 {
-  optional string field24421 = 1;
-  optional string field24422 = 2;
-  repeated string field24423 = 3;
-  repeated string field24424 = 4;
-  repeated string field24425 = 5;
-  repeated string field24426 = 6;
-}
-
-message Message24313 {
-  optional string field24427 = 1;
-  optional string field24428 = 2;
-  repeated string field24429 = 3;
-  optional string field24430 = 4;
-  optional string field24431 = 5;
-  optional string field24432 = 6;
-  optional string field24433 = 7;
-  repeated string field24434 = 8;
-  optional string field24435 = 9;
-  repeated string field24436 = 10;
-}
-
-message Message24315 {
-  required string field24440 = 1;
-  repeated string field24441 = 2;
-  repeated string field24442 = 3;
-}
-
-message Message716 {
-  required string field872 = 1;
-  required int32 field873 = 2;
-  optional bool field874 = 3;
-  optional .benchmarks.google_message3.Message717 field875 = 4;
-}
-
-message Message718 {
-  repeated string field878 = 1;
-  repeated string field879 = 2;
-  optional string field880 = 3;
-}
-
-message Message703 {
-  required string field795 = 1;
-  repeated string field796 = 2;
-  repeated string field797 = 3;
-  optional string field798 = 4;
-  repeated string field799 = 5;
-}
-
-message Message715 {
-  required string field859 = 1;
-  optional string field860 = 7;
-  repeated .benchmarks.google_message3.Message707 field861 = 2;
-  repeated .benchmarks.google_message3.Message708 field862 = 3;
-  repeated .benchmarks.google_message3.Message711 field863 = 4;
-  repeated .benchmarks.google_message3.Message712 field864 = 5;
-  repeated .benchmarks.google_message3.Message713 field865 = 6;
-  repeated .benchmarks.google_message3.Message714 field866 = 8;
-  repeated .benchmarks.google_message3.Message710 field867 = 9;
-  repeated .benchmarks.google_message3.Message709 field868 = 10;
-  repeated .benchmarks.google_message3.Message705 field869 = 11;
-  repeated .benchmarks.google_message3.Message702 field870 = 12;
-  repeated .benchmarks.google_message3.Message706 field871 = 13;
-}
-
-message Message700 {
-  repeated string field789 = 1;
-  repeated string field790 = 2;
-}
-
-message Message699 {
-  required string field787 = 1;
-  repeated string field788 = 2;
-}
-
-message Message698 {
-  optional string field779 = 1;
-  optional string field780 = 2;
-  optional string field781 = 3;
-  optional string field782 = 4;
-  optional uint64 field783 = 5;
-  optional uint32 field784 = 6;
-  optional int64 field785 = 7;
-  repeated string field786 = 8;
-}
diff --git a/libs/protobuf/benchmarks/datasets/google_message3/benchmark_message3_6.proto b/libs/protobuf/benchmarks/datasets/google_message3/benchmark_message3_6.proto
deleted file mode 100644
index c766f7c..0000000
--- a/libs/protobuf/benchmarks/datasets/google_message3/benchmark_message3_6.proto
+++ /dev/null
@@ -1,483 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// LINT: ALLOW_GROUPS
-
-syntax = "proto2";
-
-package benchmarks.google_message3;
-
-import "datasets/google_message3/benchmark_message3_7.proto";
-import "datasets/google_message3/benchmark_message3_8.proto";
-
-option cc_enable_arenas = true;
-option java_package = "com.google.protobuf.benchmarks";
-
-message Message10576 {}
-
-message Message10154 {
-  optional bytes field10192 = 1;
-  optional int32 field10193 = 2;
-}
-
-message Message8944 {
-  optional string field9045 = 2;
-  optional string field9046 = 3;
-  optional string field9047 = 23;
-  optional string field9048 = 52;
-  optional int32 field9049 = 53;
-  optional int32 field9050 = 54;
-  optional float field9051 = 55;
-  optional float field9052 = 56;
-  optional string field9053 = 57;
-  optional int64 field9054 = 1;
-  optional bool field9055 = 4;
-  optional int32 field9056 = 5;
-  optional int32 field9057 = 6;
-  optional int32 field9058 = 7;
-  optional float field9059 = 8;
-  optional float field9060 = 11;
-  optional float field9061 = 9;
-  optional float field9062 = 10;
-  optional float field9063 = 13;
-  optional bool field9064 = 14;
-  optional float field9065 = 70;
-  optional int32 field9066 = 71;
-  optional .benchmarks.google_message3.Enum8945 field9067 = 15;
-  optional int32 field9068 = 16;
-  optional int32 field9069 = 17;
-  optional float field9070 = 18;
-  optional float field9071 = 19;
-  optional int32 field9072 = 28;
-  optional int32 field9073 = 29;
-  optional float field9074 = 60;
-  optional float field9075 = 61;
-  optional int32 field9076 = 72;
-  optional int32 field9077 = 73;
-  optional .benchmarks.google_message3.Enum8951 field9078 = 62;
-  optional string field9079 = 20;
-  optional string field9080 = 21;
-  optional string field9081 = 22;
-  optional double field9082 = 31;
-  optional double field9083 = 32;
-  optional double field9084 = 33;
-  optional double field9085 = 36;
-  optional .benchmarks.google_message3.UnusedEnum field9086 = 37;
-  optional double field9087 = 38;
-  optional double field9088 = 39;
-  optional double field9089 = 63;
-  optional double field9090 = 64;
-  optional double field9091 = 65;
-  optional double field9092 = 34;
-  optional .benchmarks.google_message3.UnusedEnum field9093 = 35;
-  optional .benchmarks.google_message3.UnusedEnum field9094 = 66;
-  optional string field9095 = 40;
-  optional string field9096 = 41;
-  optional string field9097 = 42;
-  optional string field9098 = 43;
-  optional string field9099 = 44;
-  optional string field9100 = 45;
-  optional string field9101 = 46;
-  optional string field9102 = 47;
-  optional string field9103 = 48;
-  optional string field9104 = 49;
-  optional .benchmarks.google_message3.Message8939 field9105 = 100;
-  optional int64 field9106 = 101;
-}
-
-message Message9182 {
-  optional string field9205 = 1;
-  optional string field9206 = 2;
-  optional float field9207 = 16;
-  optional int32 field9208 = 17;
-  optional int32 field9209 = 27;
-  optional int32 field9210 = 7;
-  optional int32 field9211 = 8;
-  optional float field9212 = 26;
-  optional float field9213 = 22;
-  optional bool field9214 = 28;
-  repeated .benchmarks.google_message3.UnusedEmptyMessage field9215 = 21;
-  repeated .benchmarks.google_message3.UnusedEmptyMessage field9216 = 25;
-  repeated .benchmarks.google_message3.Message9181 field9217 = 29;
-  optional bool field9218 = 18;
-  optional bool field9219 = 19;
-  optional bool field9220 = 20;
-  optional .benchmarks.google_message3.Message9164 field9221 = 30;
-  optional .benchmarks.google_message3.Message9165 field9222 = 31;
-  optional .benchmarks.google_message3.Message9166 field9223 = 32;
-  optional float field9224 = 33;
-  optional .benchmarks.google_message3.Message9151 field9225 = 34;
-  optional float field9226 = 35;
-  optional float field9227 = 36;
-  optional float field9228 = 37;
-  optional float field9229 = 38;
-  optional float field9230 = 39;
-  extensions 3 to 6;
-  extensions 9 to 15;
-  extensions 23 to 23;
-  extensions 24 to 24;
-  extensions 1000 to 536870911;
-}
-
-message Message9160 {
-  optional int32 field9161 = 1;
-  optional bytes field9162 = 2;
-}
-
-message Message9242 {
-  repeated .benchmarks.google_message3.Enum9243 field9327 = 1;
-}
-
-message Message8890 {
-  repeated .benchmarks.google_message3.Message8888 field8916 = 1;
-}
-
-message Message9123 {
-  optional float field9135 = 1;
-}
-
-message Message9628 {
-  optional .benchmarks.google_message3.Message9627 field9673 = 1;
-  optional string field9674 = 2;
-  repeated int32 field9675 = 3;
-  optional int32 field9676 = 4;
-}
-
-message Message11014 {
-  optional int32 field11780 = 40;
-  optional string field11781 = 46;
-  optional bool field11782 = 47;
-  optional .benchmarks.google_message3.Enum11107 field11783 = 1;
-  optional int32 field11784 = 2;
-  optional double field11785 = 4;
-  optional int32 field11786 = 5;
-  optional int32 field11787 = 6;
-  optional double field11788 = 7;
-  optional double field11789 = 8;
-  optional int64 field11790 = 9;
-  optional bool field11791 = 10;
-  optional int64 field11792 = 28;
-  optional bool field11793 = 37;
-  optional .benchmarks.google_message3.Enum11541 field11794 = 44;
-  optional double field11795 = 49;
-  optional double field11796 = 51;
-  optional int64 field11797 = 54;
-  optional int64 field11798 = 55;
-  optional .benchmarks.google_message3.UnusedEnum field11799 = 57;
-  optional .benchmarks.google_message3.Enum11468 field11800 = 58;
-  optional int32 field11801 = 59;
-  optional .benchmarks.google_message3.UnusedEnum field11802 = 60;
-  optional int32 field11803 = 61;
-  optional int32 field11804 = 62;
-  optional int32 field11805 = 69;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field11806 = 68;
-  repeated .benchmarks.google_message3.Message11018 field11807 = 71;
-  optional bool field11808 = 50;
-  optional bool field11809 = 56;
-  optional bool field11810 = 66;
-  optional bool field11811 = 63;
-  optional bool field11812 = 64;
-  optional bool field11813 = 65;
-  optional bool field11814 = 67;
-  optional .benchmarks.google_message3.Enum11107 field11815 = 15;
-  optional int64 field11816 = 16;
-  optional double field11817 = 17;
-  optional int64 field11818 = 18;
-  optional int32 field11819 = 19;
-  optional int64 field11820 = 20;
-  optional int32 field11821 = 42;
-  optional int64 field11822 = 52;
-  optional int64 field11823 = 53;
-  optional int64 field11824 = 41;
-  optional double field11825 = 48;
-  repeated .benchmarks.google_message3.Message11020 field11826 = 70;
-  repeated .benchmarks.google_message3.UnusedEmptyMessage field11827 = 72;
-  optional double field11828 = 25;
-  optional string field11829 = 26;
-  optional int64 field11830 = 27;
-  optional int64 field11831 = 32;
-  optional uint64 field11832 = 33;
-  optional bool field11833 = 29;
-  optional bool field11834 = 34;
-  optional string field11835 = 30;
-  optional int32 field11836 = 3;
-  optional int32 field11837 = 31;
-  optional int32 field11838 = 73;
-  optional int32 field11839 = 35;
-  optional .benchmarks.google_message3.Enum11022 field11840 = 36;
-  optional .benchmarks.google_message3.Message11013 field11841 = 38;
-  optional double field11842 = 39;
-  optional int32 field11843 = 45;
-  optional bool field11844 = 74;
-}
-
-message Message10801 {
-  optional .benchmarks.google_message3.Message10800 field10812 = 1;
-  repeated .benchmarks.google_message3.Message10802 field10813 = 2;
-  optional int32 field10814 = 3;
-}
-
-message Message10749 {
-  repeated .benchmarks.google_message3.Message10748 field10754 = 1;
-}
-
-message Message8298 {
-  optional .benchmarks.google_message3.Message7966 field8321 = 1;
-  optional int64 field8322 = 2;
-  optional string field8323 = 3;
-}
-
-message Message8300 {
-  optional string field8326 = 1;
-  optional .benchmarks.google_message3.Message7966 field8327 = 2;
-}
-
-message Message8291 {
-  optional string field8306 = 1;
-  optional int32 field8307 = 2;
-  optional string field8308 = 3;
-  optional string field8309 = 4;
-  optional .benchmarks.google_message3.Enum8292 field8310 = 5;
-}
-
-message Message8296 {
-  optional .benchmarks.google_message3.Message7966 field8311 = 1;
-  optional string field8312 = 2;
-  optional .benchmarks.google_message3.Message7966 field8313 = 3;
-  optional int32 field8314 = 4;
-  optional int32 field8315 = 5;
-  optional string field8316 = 6;
-}
-
-message Message7965 {
-  optional int32 field7967 = 1;
-  optional int32 field7968 = 2;
-}
-
-message Message8290 {
-  optional string field8304 = 1;
-  optional string field8305 = 2;
-}
-
-message Message717 {
-  repeated string field876 = 1;
-  optional double field877 = 2;
-}
-
-message Message713 {
-  required .benchmarks.google_message3.Message708 field852 = 1;
-  repeated string field853 = 2;
-}
-
-message Message705 {
-  required string field807 = 1;
-  optional string field808 = 2;
-  optional string field809 = 3;
-  optional bool field810 = 4;
-  optional string field811 = 5;
-  optional string field812 = 6;
-  repeated string field813 = 7;
-}
-
-message Message709 {
-  repeated string field829 = 1;
-  repeated string field830 = 2;
-  repeated string field831 = 3;
-  repeated string field832 = 4;
-  repeated string field833 = 5;
-}
-
-message Message702 {
-  optional string field793 = 1;
-  optional string field794 = 2;
-}
-
-message Message714 {
-  optional string field854 = 1;
-  optional string field855 = 2;
-  optional string field856 = 3;
-  optional string field857 = 4;
-  optional uint32 field858 = 5;
-}
-
-message Message710 {
-  repeated string field834 = 1;
-  optional string field835 = 2;
-  optional string field836 = 3;
-  repeated string field837 = 4;
-  repeated string field838 = 5;
-}
-
-message Message706 {
-  repeated string field814 = 1;
-  optional string field815 = 2;
-  repeated string field816 = 3;
-  repeated string field817 = 4;
-}
-
-message Message707 {
-  required string field818 = 1;
-  required string field819 = 2;
-  required string field820 = 3;
-  optional bool field821 = 4;
-  repeated string field822 = 5;
-}
-
-message Message711 {
-  optional .benchmarks.google_message3.UnusedEmptyMessage field839 = 1;
-  repeated string field840 = 4;
-  repeated string field841 = 2;
-  repeated string field842 = 3;
-}
-
-message Message712 {
-  repeated string field843 = 1;
-  required string field844 = 2;
-  optional string field845 = 3;
-  repeated string field846 = 4;
-  repeated string field847 = 5;
-  optional string field848 = 6;
-  repeated string field849 = 7;
-  optional string field850 = 8;
-  optional string field851 = 9;
-}
-
-message Message8939 {
-  optional string field9010 = 1;
-  optional string field9011 = 2;
-  optional string field9012 = 3;
-  repeated string field9013 = 4;
-  optional string field9014 = 5;
-  repeated group Message8940 = 11 {}
-  optional int64 field9016 = 21;
-  optional int64 field9017 = 22;
-  optional int64 field9018 = 23;
-  optional group Message8941 = 31 {
-    optional string field9033 = 32;
-    optional string field9034 = 33;
-    optional string field9035 = 34;
-    optional string field9036 = 35;
-    optional string field9037 = 36;
-    optional string field9038 = 37;
-  }
-  optional .benchmarks.google_message3.Message8942 field9020 = 38;
-  repeated .benchmarks.google_message3.UnusedEmptyMessage field9021 = 39;
-  repeated string field9022 = 41;
-  optional string field9023 = 42;
-  optional string field9024 = 43;
-  optional string field9025 = 44;
-  optional string field9026 = 45;
-  optional string field9027 = 46;
-  optional string field9028 = 47;
-  optional .benchmarks.google_message3.UnusedEnum field9029 = 48;
-  optional .benchmarks.google_message3.UnusedEnum field9030 = 49;
-  optional group Message8943 = 51 {
-    optional string field9039 = 1;
-    optional string field9040 = 2;
-    optional string field9041 = 3;
-    optional string field9042 = 4;
-    optional string field9043 = 5;
-    optional string field9044 = 6;
-  }
-}
-
-message Message9181 {
-  optional string field9204 = 1;
-}
-
-message Message9164 {
-  optional int32 field9168 = 1;
-  optional int32 field9169 = 2;
-  optional int32 field9170 = 3;
-}
-
-message Message9165 {
-  optional float field9171 = 1;
-  optional float field9172 = 2;
-}
-
-message Message9166 {
-  optional float field9173 = 1;
-  optional int32 field9174 = 2;
-}
-
-message Message9151 {
-  optional double field9152 = 1;
-  optional double field9153 = 2;
-  optional float field9154 = 3;
-  optional float field9155 = 4;
-  optional float field9156 = 5;
-  optional float field9157 = 6;
-  optional float field9158 = 7;
-  optional float field9159 = 8;
-}
-
-message Message8888 {
-  optional int32 field8908 = 1;
-  optional .benchmarks.google_message3.Enum8900 field8909 = 4;
-  repeated int32 field8910 = 2 [packed = true];
-  optional bytes field8911 = 3;
-}
-
-message Message9627 {
-  required int32 field9668 = 1;
-  required int32 field9669 = 2;
-  required int32 field9670 = 3;
-  required int32 field9671 = 4;
-  optional float field9672 = 5;
-}
-
-message Message11020 {}
-
-message Message11013 {
-  optional bytes field11757 = 19;
-  optional bytes field11758 = 1;
-  optional bytes field11759 = 2;
-  optional bytes field11760 = 3;
-  optional bytes field11761 = 4;
-  optional bytes field11762 = 5;
-  optional bytes field11763 = 6;
-  optional bytes field11764 = 7;
-  optional bytes field11765 = 8;
-  optional bytes field11766 = 9;
-  optional bytes field11767 = 10;
-  optional bytes field11768 = 11;
-  optional bytes field11769 = 12;
-  optional bytes field11770 = 13;
-  optional bytes field11771 = 14;
-  optional bytes field11772 = 15;
-  optional bytes field11773 = 16;
-  optional bytes field11774 = 17;
-  optional bytes field11775 = 18;
-  optional bytes field11776 = 20;
-  optional bytes field11777 = 21;
-  optional .benchmarks.google_message3.UnusedEmptyMessage field11778 = 23;
-  repeated .benchmarks.google_message3.Message11011 field11779 = 22;
-}
diff --git a/libs/protobuf/benchmarks/datasets/google_message3/benchmark_message3_7.proto b/libs/protobuf/benchmarks/datasets/google_message3/benchmark_message3_7.proto
deleted file mode 100644
index 0f8f10c..0000000
--- a/libs/protobuf/benchmarks/datasets/google_message3/benchmark_message3_7.proto
+++ /dev/null
@@ -1,81 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto2";
-
-package benchmarks.google_message3;
-
-option cc_enable_arenas = true;
-option java_package = "com.google.protobuf.benchmarks";
-
-message Message11018 {}
-
-message Message10800 {
-  optional string field10808 = 1;
-  optional int64 field10809 = 2;
-  optional bool field10810 = 3;
-  optional float field10811 = 4;
-}
-
-message Message10802 {}
-
-message Message10748 {
-  optional string field10750 = 1;
-  optional int32 field10751 = 2;
-  optional int32 field10752 = 3;
-  optional int32 field10753 = 4;
-}
-
-message Message7966 {
-  optional string field7969 = 1;
-  optional bool field7970 = 2;
-}
-
-message Message708 {
-  optional .benchmarks.google_message3.Message741 field823 = 1;
-  repeated string field824 = 6;
-  optional string field825 = 2;
-  optional string field826 = 3;
-  repeated string field827 = 4;
-  repeated string field828 = 5;
-}
-
-message Message8942 {}
-
-message Message11011 {
-  required bytes field11752 = 1;
-  required bytes field11753 = 2;
-}
-
-message UnusedEmptyMessage {}
-
-message Message741 {
-  repeated string field936 = 1;
-}
diff --git a/libs/protobuf/benchmarks/datasets/google_message3/benchmark_message3_8.proto b/libs/protobuf/benchmarks/datasets/google_message3/benchmark_message3_8.proto
deleted file mode 100644
index 68fe8e9..0000000
--- a/libs/protobuf/benchmarks/datasets/google_message3/benchmark_message3_8.proto
+++ /dev/null
@@ -1,1925 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto2";
-
-package benchmarks.google_message3;
-
-option cc_enable_arenas = true;
-option java_package = "com.google.protobuf.benchmarks";
-
-enum Enum720 {
-  ENUM_VALUE721 = 1;
-  ENUM_VALUE722 = 2;
-}
-
-enum Enum3476 {
-  ENUM_VALUE3477 = 0;
-  ENUM_VALUE3478 = 1;
-  ENUM_VALUE3479 = 2;
-  ENUM_VALUE3480 = 3;
-  ENUM_VALUE3481 = 4;
-  ENUM_VALUE3482 = 5;
-  ENUM_VALUE3483 = 6;
-  ENUM_VALUE3484 = 7;
-  ENUM_VALUE3485 = 8;
-  ENUM_VALUE3486 = 9;
-  ENUM_VALUE3487 = 10;
-  ENUM_VALUE3488 = 11;
-  ENUM_VALUE3489 = 12;
-  ENUM_VALUE3490 = 13;
-  ENUM_VALUE3491 = 14;
-  ENUM_VALUE3492 = 15;
-  ENUM_VALUE3493 = 16;
-  ENUM_VALUE3494 = 17;
-  ENUM_VALUE3495 = 18;
-  ENUM_VALUE3496 = 19;
-  ENUM_VALUE3497 = 20;
-  ENUM_VALUE3498 = 21;
-  ENUM_VALUE3499 = 22;
-  ENUM_VALUE3500 = 23;
-  ENUM_VALUE3501 = 24;
-  ENUM_VALUE3502 = 25;
-  ENUM_VALUE3503 = 26;
-  ENUM_VALUE3504 = 27;
-  ENUM_VALUE3505 = 28;
-  ENUM_VALUE3506 = 29;
-  ENUM_VALUE3507 = 30;
-  ENUM_VALUE3508 = 31;
-  ENUM_VALUE3509 = 32;
-  ENUM_VALUE3510 = 33;
-  ENUM_VALUE3511 = 34;
-  ENUM_VALUE3512 = 35;
-  ENUM_VALUE3513 = 36;
-  ENUM_VALUE3514 = 37;
-  ENUM_VALUE3515 = 38;
-  ENUM_VALUE3516 = 39;
-  ENUM_VALUE3517 = 40;
-  ENUM_VALUE3518 = 41;
-  ENUM_VALUE3519 = 42;
-  ENUM_VALUE3520 = 43;
-  ENUM_VALUE3521 = 44;
-  ENUM_VALUE3522 = 45;
-  ENUM_VALUE3523 = 46;
-  ENUM_VALUE3524 = 47;
-  ENUM_VALUE3525 = 48;
-  ENUM_VALUE3526 = 49;
-  ENUM_VALUE3527 = 50;
-  ENUM_VALUE3528 = 51;
-  ENUM_VALUE3529 = 52;
-  ENUM_VALUE3530 = 53;
-  ENUM_VALUE3531 = 54;
-  ENUM_VALUE3532 = 55;
-  ENUM_VALUE3533 = 56;
-  ENUM_VALUE3534 = 57;
-  ENUM_VALUE3535 = 58;
-  ENUM_VALUE3536 = 59;
-  ENUM_VALUE3537 = 60;
-  ENUM_VALUE3538 = 61;
-  ENUM_VALUE3539 = 62;
-  ENUM_VALUE3540 = 63;
-  ENUM_VALUE3541 = 64;
-  ENUM_VALUE3542 = 65;
-  ENUM_VALUE3543 = 66;
-  ENUM_VALUE3544 = 67;
-  ENUM_VALUE3545 = 68;
-  ENUM_VALUE3546 = 69;
-  ENUM_VALUE3547 = 70;
-  ENUM_VALUE3548 = 71;
-  ENUM_VALUE3549 = 72;
-  ENUM_VALUE3550 = 73;
-  ENUM_VALUE3551 = 74;
-  ENUM_VALUE3552 = 75;
-  ENUM_VALUE3553 = 76;
-  ENUM_VALUE3554 = 77;
-  ENUM_VALUE3555 = 78;
-  ENUM_VALUE3556 = 79;
-  ENUM_VALUE3557 = 80;
-  ENUM_VALUE3558 = 81;
-  ENUM_VALUE3559 = 82;
-  ENUM_VALUE3560 = 83;
-  ENUM_VALUE3561 = 84;
-  ENUM_VALUE3562 = 85;
-  ENUM_VALUE3563 = 86;
-  ENUM_VALUE3564 = 87;
-  ENUM_VALUE3565 = 88;
-  ENUM_VALUE3566 = 89;
-  ENUM_VALUE3567 = 90;
-  ENUM_VALUE3568 = 91;
-  ENUM_VALUE3569 = 92;
-  ENUM_VALUE3570 = 93;
-  ENUM_VALUE3571 = 94;
-  ENUM_VALUE3572 = 95;
-  ENUM_VALUE3573 = 96;
-  ENUM_VALUE3574 = 97;
-  ENUM_VALUE3575 = 98;
-  ENUM_VALUE3576 = 99;
-  ENUM_VALUE3577 = 100;
-  ENUM_VALUE3578 = 101;
-  ENUM_VALUE3579 = 102;
-  ENUM_VALUE3580 = 103;
-  ENUM_VALUE3581 = 104;
-  ENUM_VALUE3582 = 105;
-  ENUM_VALUE3583 = 106;
-  ENUM_VALUE3584 = 107;
-  ENUM_VALUE3585 = 108;
-  ENUM_VALUE3586 = 109;
-  ENUM_VALUE3587 = 110;
-  ENUM_VALUE3588 = 111;
-  ENUM_VALUE3589 = 112;
-  ENUM_VALUE3590 = 113;
-  ENUM_VALUE3591 = 114;
-  ENUM_VALUE3592 = 115;
-  ENUM_VALUE3593 = 116;
-  ENUM_VALUE3594 = 117;
-  ENUM_VALUE3595 = 118;
-  ENUM_VALUE3596 = 119;
-  ENUM_VALUE3597 = 120;
-  ENUM_VALUE3598 = 121;
-  ENUM_VALUE3599 = 122;
-  ENUM_VALUE3600 = 123;
-  ENUM_VALUE3601 = 124;
-  ENUM_VALUE3602 = 125;
-  ENUM_VALUE3603 = 126;
-  ENUM_VALUE3604 = 127;
-  ENUM_VALUE3605 = 128;
-  ENUM_VALUE3606 = 129;
-  ENUM_VALUE3607 = 130;
-  ENUM_VALUE3608 = 131;
-  ENUM_VALUE3609 = 132;
-  ENUM_VALUE3610 = 133;
-  ENUM_VALUE3611 = 134;
-  ENUM_VALUE3612 = 135;
-  ENUM_VALUE3613 = 136;
-  ENUM_VALUE3614 = 137;
-  ENUM_VALUE3615 = 138;
-  ENUM_VALUE3616 = 139;
-  ENUM_VALUE3617 = 140;
-  ENUM_VALUE3618 = 141;
-  ENUM_VALUE3619 = 142;
-  ENUM_VALUE3620 = 143;
-  ENUM_VALUE3621 = 144;
-  ENUM_VALUE3622 = 145;
-  ENUM_VALUE3623 = 146;
-  ENUM_VALUE3624 = 147;
-  ENUM_VALUE3625 = 148;
-  ENUM_VALUE3626 = 149;
-  ENUM_VALUE3627 = 150;
-  ENUM_VALUE3628 = 151;
-  ENUM_VALUE3629 = 152;
-  ENUM_VALUE3630 = 153;
-  ENUM_VALUE3631 = 154;
-  ENUM_VALUE3632 = 155;
-  ENUM_VALUE3633 = 156;
-  ENUM_VALUE3634 = 157;
-  ENUM_VALUE3635 = 158;
-  ENUM_VALUE3636 = 159;
-  ENUM_VALUE3637 = 160;
-  ENUM_VALUE3638 = 161;
-  ENUM_VALUE3639 = 162;
-  ENUM_VALUE3640 = 163;
-  ENUM_VALUE3641 = 164;
-  ENUM_VALUE3642 = 165;
-  ENUM_VALUE3643 = 166;
-  ENUM_VALUE3644 = 167;
-  ENUM_VALUE3645 = 168;
-  ENUM_VALUE3646 = 169;
-  ENUM_VALUE3647 = 170;
-  ENUM_VALUE3648 = 171;
-  ENUM_VALUE3649 = 172;
-  ENUM_VALUE3650 = 173;
-  ENUM_VALUE3651 = 174;
-  ENUM_VALUE3652 = 175;
-  ENUM_VALUE3653 = 176;
-  ENUM_VALUE3654 = 177;
-  ENUM_VALUE3655 = 178;
-  ENUM_VALUE3656 = 179;
-  ENUM_VALUE3657 = 180;
-  ENUM_VALUE3658 = 181;
-  ENUM_VALUE3659 = 182;
-  ENUM_VALUE3660 = 183;
-}
-
-enum Enum3805 {
-  ENUM_VALUE3806 = 0;
-  ENUM_VALUE3807 = 1;
-  ENUM_VALUE3808 = 2;
-  ENUM_VALUE3809 = 3;
-  ENUM_VALUE3810 = 4;
-  ENUM_VALUE3811 = 5;
-  ENUM_VALUE3812 = 6;
-  ENUM_VALUE3813 = 7;
-  ENUM_VALUE3814 = 8;
-  ENUM_VALUE3815 = 9;
-  ENUM_VALUE3816 = 11;
-  ENUM_VALUE3817 = 10;
-}
-
-enum Enum3783 {
-  ENUM_VALUE3784 = 0;
-  ENUM_VALUE3785 = 1;
-  ENUM_VALUE3786 = 2;
-  ENUM_VALUE3787 = 3;
-  ENUM_VALUE3788 = 4;
-  ENUM_VALUE3789 = 5;
-  ENUM_VALUE3790 = 6;
-  ENUM_VALUE3791 = 7;
-  ENUM_VALUE3792 = 8;
-  ENUM_VALUE3793 = 9;
-  ENUM_VALUE3794 = 10;
-  ENUM_VALUE3795 = 11;
-  ENUM_VALUE3796 = 12;
-  ENUM_VALUE3797 = 13;
-  ENUM_VALUE3798 = 14;
-  ENUM_VALUE3799 = 15;
-  ENUM_VALUE3800 = 16;
-  ENUM_VALUE3801 = 20;
-  ENUM_VALUE3802 = 21;
-  ENUM_VALUE3803 = 50;
-}
-
-enum Enum3851 {
-  ENUM_VALUE3852 = 0;
-  ENUM_VALUE3853 = 1;
-  ENUM_VALUE3854 = 2;
-  ENUM_VALUE3855 = 3;
-  ENUM_VALUE3856 = 4;
-  ENUM_VALUE3857 = 5;
-  ENUM_VALUE3858 = 6;
-  ENUM_VALUE3859 = 7;
-  ENUM_VALUE3860 = 8;
-  ENUM_VALUE3861 = 9;
-  ENUM_VALUE3862 = 10;
-  ENUM_VALUE3863 = 11;
-  ENUM_VALUE3864 = 12;
-  ENUM_VALUE3865 = 13;
-  ENUM_VALUE3866 = 14;
-  ENUM_VALUE3867 = 15;
-  ENUM_VALUE3868 = 16;
-  ENUM_VALUE3869 = 17;
-}
-
-enum UnusedEnum {
-  UNUSED_ENUM_VALUE1 = 0;
-  UNUSED_ENUM_VALUE2 = 1;
-}
-
-enum Enum4146 {
-  ENUM_VALUE4147 = 0;
-  ENUM_VALUE4148 = 1;
-  ENUM_VALUE4149 = 2;
-  ENUM_VALUE4150 = 3;
-  ENUM_VALUE4151 = 4;
-}
-
-enum Enum4160 {
-  ENUM_VALUE4161 = 0;
-  ENUM_VALUE4162 = 1;
-}
-
-enum Enum4152 {
-  ENUM_VALUE4153 = 0;
-  ENUM_VALUE4154 = 1;
-  ENUM_VALUE4155 = 2;
-  ENUM_VALUE4156 = 3;
-  ENUM_VALUE4157 = 4;
-  ENUM_VALUE4158 = 5;
-  ENUM_VALUE4159 = 6;
-}
-
-enum Enum6025 {
-  ENUM_VALUE6026 = 0;
-  ENUM_VALUE6027 = 1;
-  ENUM_VALUE6028 = 2;
-  ENUM_VALUE6029 = 3;
-  ENUM_VALUE6030 = 4;
-  ENUM_VALUE6031 = 5;
-  ENUM_VALUE6032 = 6;
-  ENUM_VALUE6033 = 7;
-  ENUM_VALUE6034 = 8;
-  ENUM_VALUE6035 = 9;
-  ENUM_VALUE6036 = 10;
-  ENUM_VALUE6037 = 11;
-  ENUM_VALUE6038 = 12;
-  ENUM_VALUE6039 = 13;
-  ENUM_VALUE6040 = 14;
-  ENUM_VALUE6041 = 15;
-  ENUM_VALUE6042 = 16;
-  ENUM_VALUE6043 = 17;
-  ENUM_VALUE6044 = 18;
-  ENUM_VALUE6045 = 19;
-  ENUM_VALUE6046 = 20;
-  ENUM_VALUE6047 = 21;
-}
-
-enum Enum6065 {
-  ENUM_VALUE6066 = 0;
-  ENUM_VALUE6067 = 1;
-  ENUM_VALUE6068 = 2;
-  ENUM_VALUE6069 = 3;
-  ENUM_VALUE6070 = 4;
-  ENUM_VALUE6071 = 5;
-  ENUM_VALUE6072 = 6;
-  ENUM_VALUE6073 = 7;
-  ENUM_VALUE6074 = 8;
-  ENUM_VALUE6075 = 9;
-  ENUM_VALUE6076 = 10;
-  ENUM_VALUE6077 = 11;
-  ENUM_VALUE6078 = 12;
-  ENUM_VALUE6079 = 13;
-  ENUM_VALUE6080 = 14;
-}
-
-enum Enum6579 {
-  ENUM_VALUE6580 = 0;
-  ENUM_VALUE6581 = 2;
-  ENUM_VALUE6582 = 3;
-  ENUM_VALUE6583 = 5;
-  ENUM_VALUE6584 = 10;
-  ENUM_VALUE6585 = 15;
-  ENUM_VALUE6586 = 25;
-  ENUM_VALUE6587 = 30;
-}
-
-enum Enum6588 {
-  ENUM_VALUE6589 = 0;
-  ENUM_VALUE6590 = 1;
-  ENUM_VALUE6591 = 2;
-  ENUM_VALUE6592 = 3;
-  ENUM_VALUE6593 = 4;
-  ENUM_VALUE6594 = 5;
-  ENUM_VALUE6595 = 6;
-  ENUM_VALUE6596 = 7;
-  ENUM_VALUE6597 = 8;
-  ENUM_VALUE6598 = 9;
-  ENUM_VALUE6599 = 10;
-  ENUM_VALUE6600 = 11;
-  ENUM_VALUE6601 = 12;
-  ENUM_VALUE6602 = 13;
-  ENUM_VALUE6603 = 14;
-  ENUM_VALUE6604 = 15;
-  ENUM_VALUE6605 = 16;
-  ENUM_VALUE6606 = 17;
-  ENUM_VALUE6607 = 19;
-  ENUM_VALUE6608 = 20;
-  ENUM_VALUE6609 = 21;
-  ENUM_VALUE6610 = 22;
-  ENUM_VALUE6611 = 23;
-  ENUM_VALUE6612 = 24;
-  ENUM_VALUE6613 = 25;
-  ENUM_VALUE6614 = 26;
-  ENUM_VALUE6615 = 27;
-  ENUM_VALUE6616 = 28;
-  ENUM_VALUE6617 = 29;
-  ENUM_VALUE6618 = 30;
-  ENUM_VALUE6619 = 31;
-  ENUM_VALUE6620 = 32;
-  ENUM_VALUE6621 = 33;
-  ENUM_VALUE6622 = 34;
-}
-
-enum Enum6769 {
-  ENUM_VALUE6770 = 0;
-  ENUM_VALUE6771 = 1;
-  ENUM_VALUE6772 = 2;
-}
-
-enum Enum6774 {
-  ENUM_VALUE6775 = 0;
-  ENUM_VALUE6776 = 1;
-  ENUM_VALUE6777 = 2;
-  ENUM_VALUE6778 = 3;
-  ENUM_VALUE6779 = 4;
-  ENUM_VALUE6780 = 5;
-  ENUM_VALUE6781 = 6;
-}
-
-enum Enum6782 {
-  ENUM_VALUE6783 = 0;
-  ENUM_VALUE6784 = 1;
-  ENUM_VALUE6785 = 2;
-  ENUM_VALUE6786 = 3;
-  ENUM_VALUE6787 = 4;
-  ENUM_VALUE6788 = 5;
-}
-
-enum Enum6858 {
-  ENUM_VALUE6859 = 1;
-  ENUM_VALUE6860 = 2;
-  ENUM_VALUE6861 = 3;
-  ENUM_VALUE6862 = 4;
-}
-
-enum Enum6815 {
-  ENUM_VALUE6816 = 0;
-  ENUM_VALUE6817 = 1;
-  ENUM_VALUE6818 = 2;
-  ENUM_VALUE6819 = 3;
-  ENUM_VALUE6820 = 4;
-  ENUM_VALUE6821 = 5;
-}
-
-enum Enum6822 {
-  ENUM_VALUE6823 = 0;
-  ENUM_VALUE6824 = 1;
-  ENUM_VALUE6825 = 2;
-  ENUM_VALUE6826 = 3;
-}
-
-enum Enum7654 {
-  ENUM_VALUE7655 = 1;
-  ENUM_VALUE7656 = 2;
-  ENUM_VALUE7657 = 3;
-}
-
-enum Enum8292 {
-  ENUM_VALUE8293 = 0;
-  ENUM_VALUE8294 = 1;
-  ENUM_VALUE8295 = 2;
-}
-
-enum Enum8450 {
-  ENUM_VALUE8451 = 0;
-  ENUM_VALUE8452 = 1;
-  ENUM_VALUE8453 = 2;
-}
-
-enum Enum8900 {
-  ENUM_VALUE8901 = 0;
-  ENUM_VALUE8902 = 1;
-  ENUM_VALUE8903 = 2;
-  ENUM_VALUE8904 = 3;
-  ENUM_VALUE8905 = 4;
-}
-
-enum Enum8945 {
-  ENUM_VALUE8946 = 0;
-  ENUM_VALUE8947 = 1;
-  ENUM_VALUE8948 = 2;
-  ENUM_VALUE8949 = 3;
-  ENUM_VALUE8950 = 4;
-}
-
-enum Enum8951 {
-  ENUM_VALUE8952 = 1;
-  ENUM_VALUE8953 = 2;
-  ENUM_VALUE8954 = 3;
-  ENUM_VALUE8955 = 4;
-  ENUM_VALUE8956 = 5;
-  ENUM_VALUE8957 = 6;
-  ENUM_VALUE8958 = 7;
-  ENUM_VALUE8959 = 8;
-}
-
-enum Enum9243 {
-  ENUM_VALUE9244 = -1;
-  ENUM_VALUE9245 = 0;
-  ENUM_VALUE9246 = 1;
-  ENUM_VALUE9247 = 2;
-  ENUM_VALUE9248 = 3;
-  ENUM_VALUE9249 = 4;
-  ENUM_VALUE9250 = 5;
-  ENUM_VALUE9251 = 6;
-  ENUM_VALUE9252 = 7;
-  ENUM_VALUE9253 = 8;
-  ENUM_VALUE9254 = 9;
-  ENUM_VALUE9255 = 10;
-  ENUM_VALUE9256 = 11;
-  ENUM_VALUE9257 = 12;
-  ENUM_VALUE9258 = 13;
-  ENUM_VALUE9259 = 14;
-  ENUM_VALUE9260 = 15;
-  ENUM_VALUE9261 = 16;
-  ENUM_VALUE9262 = 17;
-  ENUM_VALUE9263 = 71;
-  ENUM_VALUE9264 = 72;
-  ENUM_VALUE9265 = 73;
-  ENUM_VALUE9266 = 74;
-  ENUM_VALUE9267 = 18;
-  ENUM_VALUE9268 = 20;
-  ENUM_VALUE9269 = 21;
-  ENUM_VALUE9270 = 22;
-  ENUM_VALUE9271 = 23;
-  ENUM_VALUE9272 = 61;
-  ENUM_VALUE9273 = 62;
-  ENUM_VALUE9274 = 63;
-  ENUM_VALUE9275 = 64;
-  ENUM_VALUE9276 = 66;
-  ENUM_VALUE9277 = 67;
-  ENUM_VALUE9278 = 24;
-  ENUM_VALUE9279 = 25;
-  ENUM_VALUE9280 = 26;
-  ENUM_VALUE9281 = 27;
-  ENUM_VALUE9282 = 28;
-  ENUM_VALUE9283 = 29;
-  ENUM_VALUE9284 = 30;
-  ENUM_VALUE9285 = 31;
-  ENUM_VALUE9286 = 32;
-  ENUM_VALUE9287 = 33;
-  ENUM_VALUE9288 = 34;
-  ENUM_VALUE9289 = 35;
-  ENUM_VALUE9290 = 36;
-  ENUM_VALUE9291 = 37;
-  ENUM_VALUE9292 = 38;
-  ENUM_VALUE9293 = 39;
-  ENUM_VALUE9294 = 40;
-  ENUM_VALUE9295 = 41;
-  ENUM_VALUE9296 = 42;
-  ENUM_VALUE9297 = 43;
-  ENUM_VALUE9298 = 44;
-  ENUM_VALUE9299 = 45;
-  ENUM_VALUE9300 = 46;
-  ENUM_VALUE9301 = 47;
-  ENUM_VALUE9302 = 48;
-  ENUM_VALUE9303 = 49;
-  ENUM_VALUE9304 = 50;
-  ENUM_VALUE9305 = 51;
-  ENUM_VALUE9306 = 52;
-  ENUM_VALUE9307 = 53;
-  ENUM_VALUE9308 = 54;
-  ENUM_VALUE9309 = 55;
-  ENUM_VALUE9310 = 56;
-  ENUM_VALUE9311 = 57;
-  ENUM_VALUE9312 = 58;
-  ENUM_VALUE9313 = 59;
-  ENUM_VALUE9314 = 60;
-  ENUM_VALUE9315 = 68;
-  ENUM_VALUE9316 = 69;
-  ENUM_VALUE9317 = 70;
-  ENUM_VALUE9318 = 1000;
-  ENUM_VALUE9319 = 1001;
-  ENUM_VALUE9320 = 1002;
-  ENUM_VALUE9321 = 1003;
-  ENUM_VALUE9322 = 1004;
-  ENUM_VALUE9323 = 1005;
-  ENUM_VALUE9324 = 1006;
-  ENUM_VALUE9325 = 1007;
-  ENUM_VALUE9326 = 65;
-}
-
-enum Enum10157 {
-  ENUM_VALUE10158 = 0;
-  ENUM_VALUE10159 = 1;
-  ENUM_VALUE10160 = 2;
-  ENUM_VALUE10161 = 3;
-  ENUM_VALUE10162 = 4;
-  ENUM_VALUE10163 = 5;
-  ENUM_VALUE10164 = 6;
-  ENUM_VALUE10165 = 7;
-  ENUM_VALUE10166 = 8;
-}
-
-enum Enum10167 {
-  ENUM_VALUE10168 = 0;
-  ENUM_VALUE10169 = 1;
-  ENUM_VALUE10170 = 2;
-  ENUM_VALUE10171 = 3;
-  ENUM_VALUE10172 = 4;
-  ENUM_VALUE10173 = 5;
-  ENUM_VALUE10174 = 6;
-  ENUM_VALUE10175 = 7;
-  ENUM_VALUE10176 = 8;
-}
-
-enum Enum8862 {
-  ENUM_VALUE8863 = 0;
-  ENUM_VALUE8864 = 1;
-  ENUM_VALUE8865 = 2;
-  ENUM_VALUE8866 = 3;
-  ENUM_VALUE8867 = 4;
-  ENUM_VALUE8868 = 5;
-  ENUM_VALUE8869 = 6;
-  ENUM_VALUE8870 = 7;
-  ENUM_VALUE8871 = 13;
-  ENUM_VALUE8872 = 14;
-  ENUM_VALUE8873 = 8;
-  ENUM_VALUE8874 = 9;
-  ENUM_VALUE8875 = 10;
-  ENUM_VALUE8876 = 11;
-  ENUM_VALUE8877 = 12;
-  ENUM_VALUE8878 = 15;
-}
-
-enum Enum10325 {
-  ENUM_VALUE10326 = 0;
-  ENUM_VALUE10327 = 1;
-  ENUM_VALUE10328 = 2;
-  ENUM_VALUE10329 = 3;
-  ENUM_VALUE10330 = 4;
-  ENUM_VALUE10331 = 5;
-  ENUM_VALUE10332 = 6;
-  ENUM_VALUE10333 = 7;
-  ENUM_VALUE10334 = 8;
-}
-
-enum Enum10335 { ENUM_VALUE10336 = 0; }
-
-enum Enum10337 {
-  ENUM_VALUE10338 = 0;
-  ENUM_VALUE10339 = 1;
-}
-
-enum Enum10392 {
-  ENUM_VALUE10393 = 0;
-  ENUM_VALUE10394 = 1;
-  ENUM_VALUE10395 = 2;
-  ENUM_VALUE10396 = 3;
-  ENUM_VALUE10397 = 4;
-  ENUM_VALUE10398 = 5;
-  ENUM_VALUE10399 = 6;
-  ENUM_VALUE10400 = 7;
-  ENUM_VALUE10401 = 8;
-  ENUM_VALUE10402 = 15;
-  ENUM_VALUE10403 = 9;
-  ENUM_VALUE10404 = 10;
-  ENUM_VALUE10405 = 11;
-  ENUM_VALUE10406 = 12;
-  ENUM_VALUE10407 = 13;
-  ENUM_VALUE10408 = 14;
-  ENUM_VALUE10409 = 101;
-  ENUM_VALUE10410 = 102;
-}
-
-enum Enum11107 {
-  ENUM_VALUE11108 = 0;
-  ENUM_VALUE11109 = 1;
-  ENUM_VALUE11110 = 2;
-  ENUM_VALUE11111 = 3;
-  ENUM_VALUE11112 = 4;
-  ENUM_VALUE11113 = 5;
-  ENUM_VALUE11114 = 6;
-  ENUM_VALUE11115 = 7;
-  ENUM_VALUE11116 = 8;
-  ENUM_VALUE11117 = 9;
-  ENUM_VALUE11118 = 10;
-  ENUM_VALUE11119 = 11;
-  ENUM_VALUE11120 = 12;
-  ENUM_VALUE11121 = 13;
-  ENUM_VALUE11122 = 14;
-  ENUM_VALUE11123 = 15;
-  ENUM_VALUE11124 = 16;
-  ENUM_VALUE11125 = 17;
-  ENUM_VALUE11126 = 18;
-  ENUM_VALUE11127 = 19;
-  ENUM_VALUE11128 = 20;
-  ENUM_VALUE11129 = 21;
-  ENUM_VALUE11130 = 22;
-  ENUM_VALUE11131 = 23;
-  ENUM_VALUE11132 = 24;
-  ENUM_VALUE11133 = 25;
-  ENUM_VALUE11134 = 26;
-  ENUM_VALUE11135 = 27;
-  ENUM_VALUE11136 = 28;
-  ENUM_VALUE11137 = 29;
-  ENUM_VALUE11138 = 30;
-  ENUM_VALUE11139 = 31;
-  ENUM_VALUE11140 = 32;
-  ENUM_VALUE11141 = 33;
-  ENUM_VALUE11142 = 34;
-  ENUM_VALUE11143 = 35;
-  ENUM_VALUE11144 = 36;
-  ENUM_VALUE11145 = 37;
-  ENUM_VALUE11146 = 38;
-  ENUM_VALUE11147 = 39;
-  ENUM_VALUE11148 = 40;
-  ENUM_VALUE11149 = 41;
-  ENUM_VALUE11150 = 42;
-  ENUM_VALUE11151 = 43;
-  ENUM_VALUE11152 = 44;
-  ENUM_VALUE11153 = 45;
-  ENUM_VALUE11154 = 46;
-  ENUM_VALUE11155 = 47;
-  ENUM_VALUE11156 = 48;
-  ENUM_VALUE11157 = 49;
-  ENUM_VALUE11158 = 50;
-  ENUM_VALUE11159 = 51;
-  ENUM_VALUE11160 = 52;
-  ENUM_VALUE11161 = 53;
-  ENUM_VALUE11162 = 54;
-  ENUM_VALUE11163 = 55;
-  ENUM_VALUE11164 = 56;
-  ENUM_VALUE11165 = 57;
-  ENUM_VALUE11166 = 58;
-  ENUM_VALUE11167 = 59;
-  ENUM_VALUE11168 = 60;
-  ENUM_VALUE11169 = 61;
-  ENUM_VALUE11170 = 62;
-  ENUM_VALUE11171 = 63;
-  ENUM_VALUE11172 = 64;
-  ENUM_VALUE11173 = 65;
-  ENUM_VALUE11174 = 66;
-  ENUM_VALUE11175 = 67;
-  ENUM_VALUE11176 = 68;
-  ENUM_VALUE11177 = 69;
-  ENUM_VALUE11178 = 70;
-  ENUM_VALUE11179 = 71;
-  ENUM_VALUE11180 = 72;
-  ENUM_VALUE11181 = 73;
-  ENUM_VALUE11182 = 74;
-  ENUM_VALUE11183 = 75;
-  ENUM_VALUE11184 = 76;
-  ENUM_VALUE11185 = 77;
-  ENUM_VALUE11186 = 78;
-  ENUM_VALUE11187 = 79;
-  ENUM_VALUE11188 = 80;
-  ENUM_VALUE11189 = 81;
-  ENUM_VALUE11190 = 82;
-  ENUM_VALUE11191 = 83;
-  ENUM_VALUE11192 = 84;
-  ENUM_VALUE11193 = 85;
-  ENUM_VALUE11194 = 86;
-  ENUM_VALUE11195 = 87;
-  ENUM_VALUE11196 = 88;
-  ENUM_VALUE11197 = 89;
-  ENUM_VALUE11198 = 90;
-  ENUM_VALUE11199 = 91;
-  ENUM_VALUE11200 = 92;
-  ENUM_VALUE11201 = 93;
-  ENUM_VALUE11202 = 94;
-  ENUM_VALUE11203 = 95;
-  ENUM_VALUE11204 = 96;
-  ENUM_VALUE11205 = 97;
-  ENUM_VALUE11206 = 98;
-  ENUM_VALUE11207 = 99;
-  ENUM_VALUE11208 = 100;
-  ENUM_VALUE11209 = 101;
-  ENUM_VALUE11210 = 102;
-  ENUM_VALUE11211 = 103;
-  ENUM_VALUE11212 = 104;
-  ENUM_VALUE11213 = 105;
-  ENUM_VALUE11214 = 106;
-  ENUM_VALUE11215 = 107;
-  ENUM_VALUE11216 = 108;
-  ENUM_VALUE11217 = 109;
-  ENUM_VALUE11218 = 110;
-  ENUM_VALUE11219 = 111;
-  ENUM_VALUE11220 = 112;
-  ENUM_VALUE11221 = 113;
-  ENUM_VALUE11222 = 114;
-  ENUM_VALUE11223 = 115;
-  ENUM_VALUE11224 = 116;
-  ENUM_VALUE11225 = 117;
-  ENUM_VALUE11226 = 118;
-  ENUM_VALUE11227 = 119;
-  ENUM_VALUE11228 = 120;
-  ENUM_VALUE11229 = 121;
-  ENUM_VALUE11230 = 122;
-  ENUM_VALUE11231 = 123;
-  ENUM_VALUE11232 = 124;
-  ENUM_VALUE11233 = 125;
-  ENUM_VALUE11234 = 126;
-  ENUM_VALUE11235 = 127;
-  ENUM_VALUE11236 = 128;
-  ENUM_VALUE11237 = 129;
-  ENUM_VALUE11238 = 130;
-  ENUM_VALUE11239 = 131;
-  ENUM_VALUE11240 = 132;
-  ENUM_VALUE11241 = 133;
-  ENUM_VALUE11242 = 134;
-  ENUM_VALUE11243 = 135;
-  ENUM_VALUE11244 = 136;
-  ENUM_VALUE11245 = 137;
-  ENUM_VALUE11246 = 138;
-  ENUM_VALUE11247 = 139;
-  ENUM_VALUE11248 = 140;
-  ENUM_VALUE11249 = 141;
-  ENUM_VALUE11250 = 142;
-  ENUM_VALUE11251 = 143;
-  ENUM_VALUE11252 = 144;
-  ENUM_VALUE11253 = 145;
-  ENUM_VALUE11254 = 146;
-  ENUM_VALUE11255 = 147;
-  ENUM_VALUE11256 = 148;
-  ENUM_VALUE11257 = 149;
-  ENUM_VALUE11258 = 150;
-  ENUM_VALUE11259 = 151;
-  ENUM_VALUE11260 = 152;
-  ENUM_VALUE11261 = 153;
-  ENUM_VALUE11262 = 154;
-  ENUM_VALUE11263 = 155;
-  ENUM_VALUE11264 = 156;
-  ENUM_VALUE11265 = 157;
-  ENUM_VALUE11266 = 158;
-  ENUM_VALUE11267 = 159;
-  ENUM_VALUE11268 = 160;
-  ENUM_VALUE11269 = 161;
-  ENUM_VALUE11270 = 163;
-  ENUM_VALUE11271 = 164;
-  ENUM_VALUE11272 = 165;
-  ENUM_VALUE11273 = 166;
-  ENUM_VALUE11274 = 167;
-  ENUM_VALUE11275 = 168;
-  ENUM_VALUE11276 = 169;
-  ENUM_VALUE11277 = 170;
-  ENUM_VALUE11278 = 171;
-  ENUM_VALUE11279 = 172;
-  ENUM_VALUE11280 = 173;
-  ENUM_VALUE11281 = 174;
-  ENUM_VALUE11282 = 175;
-  ENUM_VALUE11283 = 176;
-  ENUM_VALUE11284 = 177;
-  ENUM_VALUE11285 = 178;
-  ENUM_VALUE11286 = 179;
-  ENUM_VALUE11287 = 180;
-  ENUM_VALUE11288 = 181;
-  ENUM_VALUE11289 = 182;
-  ENUM_VALUE11290 = 183;
-  ENUM_VALUE11291 = 184;
-  ENUM_VALUE11292 = 185;
-  ENUM_VALUE11293 = 187;
-  ENUM_VALUE11294 = 188;
-  ENUM_VALUE11295 = 189;
-  ENUM_VALUE11296 = 190;
-  ENUM_VALUE11297 = 191;
-  ENUM_VALUE11298 = 192;
-  ENUM_VALUE11299 = 193;
-  ENUM_VALUE11300 = 194;
-  ENUM_VALUE11301 = 195;
-  ENUM_VALUE11302 = 196;
-  ENUM_VALUE11303 = 197;
-  ENUM_VALUE11304 = 198;
-  ENUM_VALUE11305 = 65535;
-  ENUM_VALUE11306 = 65536;
-  ENUM_VALUE11307 = 65537;
-  ENUM_VALUE11308 = 65538;
-  ENUM_VALUE11309 = 65539;
-  ENUM_VALUE11310 = 65540;
-  ENUM_VALUE11311 = 65541;
-  ENUM_VALUE11312 = 65542;
-  ENUM_VALUE11313 = 65543;
-  ENUM_VALUE11314 = 65544;
-  ENUM_VALUE11315 = 65545;
-  ENUM_VALUE11316 = 65546;
-  ENUM_VALUE11317 = 65547;
-  ENUM_VALUE11318 = 65548;
-  ENUM_VALUE11319 = 65549;
-  ENUM_VALUE11320 = 65550;
-  ENUM_VALUE11321 = 65551;
-  ENUM_VALUE11322 = 65552;
-  ENUM_VALUE11323 = 65553;
-  ENUM_VALUE11324 = 65554;
-  ENUM_VALUE11325 = 65555;
-  ENUM_VALUE11326 = 65556;
-  ENUM_VALUE11327 = 65557;
-  ENUM_VALUE11328 = 65558;
-  ENUM_VALUE11329 = 65559;
-  ENUM_VALUE11330 = 65560;
-  ENUM_VALUE11331 = 65561;
-  ENUM_VALUE11332 = 65562;
-  ENUM_VALUE11333 = 65563;
-  ENUM_VALUE11334 = 69632;
-  ENUM_VALUE11335 = 69633;
-  ENUM_VALUE11336 = 69634;
-  ENUM_VALUE11337 = 69635;
-  ENUM_VALUE11338 = 69636;
-  ENUM_VALUE11339 = 69637;
-  ENUM_VALUE11340 = 69638;
-  ENUM_VALUE11341 = 69639;
-  ENUM_VALUE11342 = 69640;
-  ENUM_VALUE11343 = 69641;
-  ENUM_VALUE11344 = 69642;
-  ENUM_VALUE11345 = 69643;
-  ENUM_VALUE11346 = 69644;
-  ENUM_VALUE11347 = 69645;
-  ENUM_VALUE11348 = 69646;
-  ENUM_VALUE11349 = 69647;
-  ENUM_VALUE11350 = 69648;
-  ENUM_VALUE11351 = 69649;
-  ENUM_VALUE11352 = 69650;
-  ENUM_VALUE11353 = 69651;
-  ENUM_VALUE11354 = 69652;
-  ENUM_VALUE11355 = 69653;
-  ENUM_VALUE11356 = 69654;
-  ENUM_VALUE11357 = 69655;
-  ENUM_VALUE11358 = 69656;
-  ENUM_VALUE11359 = 69657;
-  ENUM_VALUE11360 = 69658;
-  ENUM_VALUE11361 = 69659;
-  ENUM_VALUE11362 = 69660;
-  ENUM_VALUE11363 = 69661;
-  ENUM_VALUE11364 = 69662;
-  ENUM_VALUE11365 = 73728;
-  ENUM_VALUE11366 = 73729;
-  ENUM_VALUE11367 = 77824;
-  ENUM_VALUE11368 = 77825;
-  ENUM_VALUE11369 = 81920;
-  ENUM_VALUE11370 = 81921;
-  ENUM_VALUE11371 = 81922;
-  ENUM_VALUE11372 = 81923;
-  ENUM_VALUE11373 = 86016;
-  ENUM_VALUE11374 = 86017;
-  ENUM_VALUE11375 = 86018;
-  ENUM_VALUE11376 = 86019;
-  ENUM_VALUE11377 = 86020;
-  ENUM_VALUE11378 = 86021;
-  ENUM_VALUE11379 = 86022;
-  ENUM_VALUE11380 = 86023;
-  ENUM_VALUE11381 = 86024;
-  ENUM_VALUE11382 = 86025;
-  ENUM_VALUE11383 = 86026;
-  ENUM_VALUE11384 = 86027;
-  ENUM_VALUE11385 = 86028;
-  ENUM_VALUE11386 = 86029;
-  ENUM_VALUE11387 = 86030;
-  ENUM_VALUE11388 = 86031;
-  ENUM_VALUE11389 = 86032;
-  ENUM_VALUE11390 = 86033;
-  ENUM_VALUE11391 = 86034;
-  ENUM_VALUE11392 = 86035;
-  ENUM_VALUE11393 = 86036;
-  ENUM_VALUE11394 = 86037;
-  ENUM_VALUE11395 = 86038;
-  ENUM_VALUE11396 = 86039;
-  ENUM_VALUE11397 = 86040;
-  ENUM_VALUE11398 = 86041;
-  ENUM_VALUE11399 = 86042;
-  ENUM_VALUE11400 = 86043;
-  ENUM_VALUE11401 = 86044;
-  ENUM_VALUE11402 = 86045;
-  ENUM_VALUE11403 = 86046;
-  ENUM_VALUE11404 = 86047;
-  ENUM_VALUE11405 = 86048;
-  ENUM_VALUE11406 = 86049;
-  ENUM_VALUE11407 = 86050;
-  ENUM_VALUE11408 = 86051;
-  ENUM_VALUE11409 = 86052;
-  ENUM_VALUE11410 = 86053;
-  ENUM_VALUE11411 = 86054;
-  ENUM_VALUE11412 = 86055;
-  ENUM_VALUE11413 = 86056;
-  ENUM_VALUE11414 = 86057;
-  ENUM_VALUE11415 = 86058;
-  ENUM_VALUE11416 = 86059;
-  ENUM_VALUE11417 = 86060;
-  ENUM_VALUE11418 = 86061;
-  ENUM_VALUE11419 = 86062;
-  ENUM_VALUE11420 = 86063;
-  ENUM_VALUE11421 = 86064;
-  ENUM_VALUE11422 = 86065;
-  ENUM_VALUE11423 = 86066;
-  ENUM_VALUE11424 = 86067;
-  ENUM_VALUE11425 = 86068;
-  ENUM_VALUE11426 = 86069;
-  ENUM_VALUE11427 = 86070;
-  ENUM_VALUE11428 = 86071;
-  ENUM_VALUE11429 = 86072;
-  ENUM_VALUE11430 = 86073;
-  ENUM_VALUE11431 = 86074;
-  ENUM_VALUE11432 = 86077;
-  ENUM_VALUE11433 = 86078;
-  ENUM_VALUE11434 = 86079;
-  ENUM_VALUE11435 = 86080;
-  ENUM_VALUE11436 = 86081;
-  ENUM_VALUE11437 = 86082;
-  ENUM_VALUE11438 = 86083;
-  ENUM_VALUE11439 = 86084;
-  ENUM_VALUE11440 = 90112;
-  ENUM_VALUE11441 = 94208;
-  ENUM_VALUE11442 = 94209;
-  ENUM_VALUE11443 = 94210;
-  ENUM_VALUE11444 = 94211;
-  ENUM_VALUE11445 = 94212;
-  ENUM_VALUE11446 = 94213;
-  ENUM_VALUE11447 = 94214;
-  ENUM_VALUE11448 = 94215;
-  ENUM_VALUE11449 = 94216;
-  ENUM_VALUE11450 = 94217;
-  ENUM_VALUE11451 = 94218;
-  ENUM_VALUE11452 = 94219;
-  ENUM_VALUE11453 = 94220;
-  ENUM_VALUE11454 = 94221;
-  ENUM_VALUE11455 = 94222;
-  ENUM_VALUE11456 = 94223;
-  ENUM_VALUE11457 = 94224;
-  ENUM_VALUE11458 = 98304;
-  ENUM_VALUE11459 = 98305;
-  ENUM_VALUE11460 = 98306;
-  ENUM_VALUE11461 = 98307;
-  ENUM_VALUE11462 = 98308;
-  ENUM_VALUE11463 = 102400;
-  ENUM_VALUE11464 = 131072;
-  ENUM_VALUE11465 = 131073;
-  ENUM_VALUE11466 = 135168;
-  ENUM_VALUE11467 = 9439507;
-}
-
-enum Enum11541 {
-  ENUM_VALUE11542 = -1;
-  ENUM_VALUE11543 = 0;
-  ENUM_VALUE11544 = 1;
-  ENUM_VALUE11545 = 2;
-  ENUM_VALUE11546 = 3;
-  ENUM_VALUE11547 = 4;
-  ENUM_VALUE11548 = 5;
-  ENUM_VALUE11549 = 6;
-  ENUM_VALUE11550 = 7;
-  ENUM_VALUE11551 = 8;
-  ENUM_VALUE11552 = 9;
-  ENUM_VALUE11553 = 10;
-  ENUM_VALUE11554 = 11;
-  ENUM_VALUE11555 = 12;
-  ENUM_VALUE11556 = 13;
-  ENUM_VALUE11557 = 14;
-  ENUM_VALUE11558 = 15;
-  ENUM_VALUE11559 = 16;
-  ENUM_VALUE11560 = 17;
-  ENUM_VALUE11561 = 18;
-  ENUM_VALUE11562 = 19;
-  ENUM_VALUE11563 = 20;
-  ENUM_VALUE11564 = 21;
-  ENUM_VALUE11565 = 22;
-  ENUM_VALUE11566 = 23;
-  ENUM_VALUE11567 = 24;
-  ENUM_VALUE11568 = 25;
-  ENUM_VALUE11569 = 26;
-  ENUM_VALUE11570 = 27;
-  ENUM_VALUE11571 = 28;
-  ENUM_VALUE11572 = 29;
-  ENUM_VALUE11573 = 30;
-  ENUM_VALUE11574 = 31;
-  ENUM_VALUE11575 = 32;
-  ENUM_VALUE11576 = 33;
-  ENUM_VALUE11577 = 34;
-  ENUM_VALUE11578 = 35;
-  ENUM_VALUE11579 = 36;
-  ENUM_VALUE11580 = 37;
-  ENUM_VALUE11581 = 38;
-  ENUM_VALUE11582 = 39;
-  ENUM_VALUE11583 = 40;
-  ENUM_VALUE11584 = 41;
-  ENUM_VALUE11585 = 42;
-  ENUM_VALUE11586 = 43;
-  ENUM_VALUE11587 = 44;
-  ENUM_VALUE11588 = 45;
-  ENUM_VALUE11589 = 46;
-  ENUM_VALUE11590 = 47;
-  ENUM_VALUE11591 = 48;
-  ENUM_VALUE11592 = 49;
-  ENUM_VALUE11593 = 50;
-  ENUM_VALUE11594 = 51;
-  ENUM_VALUE11595 = 52;
-  ENUM_VALUE11596 = 53;
-  ENUM_VALUE11597 = 54;
-  ENUM_VALUE11598 = 55;
-  ENUM_VALUE11599 = 56;
-  ENUM_VALUE11600 = 57;
-  ENUM_VALUE11601 = 58;
-  ENUM_VALUE11602 = 59;
-  ENUM_VALUE11603 = 60;
-  ENUM_VALUE11604 = 61;
-  ENUM_VALUE11605 = 62;
-  ENUM_VALUE11606 = 63;
-  ENUM_VALUE11607 = 64;
-  ENUM_VALUE11608 = 65;
-  ENUM_VALUE11609 = 66;
-  ENUM_VALUE11610 = 67;
-  ENUM_VALUE11611 = 68;
-  ENUM_VALUE11612 = 69;
-  ENUM_VALUE11613 = 70;
-  ENUM_VALUE11614 = 71;
-  ENUM_VALUE11615 = 72;
-  ENUM_VALUE11616 = 73;
-  ENUM_VALUE11617 = 74;
-  ENUM_VALUE11618 = 75;
-  ENUM_VALUE11619 = 76;
-  ENUM_VALUE11620 = 77;
-  ENUM_VALUE11621 = 78;
-  ENUM_VALUE11622 = 79;
-  ENUM_VALUE11623 = 80;
-  ENUM_VALUE11624 = 81;
-  ENUM_VALUE11625 = 82;
-  ENUM_VALUE11626 = 83;
-  ENUM_VALUE11627 = 84;
-  ENUM_VALUE11628 = 85;
-  ENUM_VALUE11629 = 86;
-  ENUM_VALUE11630 = 87;
-  ENUM_VALUE11631 = 88;
-  ENUM_VALUE11632 = 89;
-  ENUM_VALUE11633 = 90;
-  ENUM_VALUE11634 = 91;
-  ENUM_VALUE11635 = 92;
-  ENUM_VALUE11636 = 93;
-  ENUM_VALUE11637 = 94;
-  ENUM_VALUE11638 = 95;
-  ENUM_VALUE11639 = 96;
-  ENUM_VALUE11640 = 97;
-  ENUM_VALUE11641 = 98;
-  ENUM_VALUE11642 = 99;
-  ENUM_VALUE11643 = 100;
-  ENUM_VALUE11644 = 101;
-  ENUM_VALUE11645 = 102;
-  ENUM_VALUE11646 = 103;
-  ENUM_VALUE11647 = 104;
-  ENUM_VALUE11648 = 105;
-  ENUM_VALUE11649 = 106;
-  ENUM_VALUE11650 = 107;
-  ENUM_VALUE11651 = 108;
-  ENUM_VALUE11652 = 109;
-  ENUM_VALUE11653 = 110;
-  ENUM_VALUE11654 = 111;
-  ENUM_VALUE11655 = 112;
-  ENUM_VALUE11656 = 113;
-  ENUM_VALUE11657 = 114;
-  ENUM_VALUE11658 = 115;
-  ENUM_VALUE11659 = 116;
-  ENUM_VALUE11660 = 117;
-  ENUM_VALUE11661 = 118;
-  ENUM_VALUE11662 = 119;
-  ENUM_VALUE11663 = 120;
-  ENUM_VALUE11664 = 121;
-  ENUM_VALUE11665 = 122;
-  ENUM_VALUE11666 = 123;
-  ENUM_VALUE11667 = 124;
-  ENUM_VALUE11668 = 125;
-  ENUM_VALUE11669 = 126;
-  ENUM_VALUE11670 = 127;
-  ENUM_VALUE11671 = 128;
-  ENUM_VALUE11672 = 129;
-  ENUM_VALUE11673 = 130;
-  ENUM_VALUE11674 = 131;
-  ENUM_VALUE11675 = 132;
-  ENUM_VALUE11676 = 133;
-  ENUM_VALUE11677 = 134;
-  ENUM_VALUE11678 = 135;
-  ENUM_VALUE11679 = 136;
-  ENUM_VALUE11680 = 137;
-  ENUM_VALUE11681 = 138;
-  ENUM_VALUE11682 = 139;
-  ENUM_VALUE11683 = 140;
-  ENUM_VALUE11684 = 141;
-  ENUM_VALUE11685 = 142;
-  ENUM_VALUE11686 = 143;
-  ENUM_VALUE11687 = 144;
-  ENUM_VALUE11688 = 145;
-  ENUM_VALUE11689 = 146;
-  ENUM_VALUE11690 = 147;
-  ENUM_VALUE11691 = 148;
-  ENUM_VALUE11692 = 149;
-  ENUM_VALUE11693 = 150;
-  ENUM_VALUE11694 = 151;
-  ENUM_VALUE11695 = 152;
-  ENUM_VALUE11696 = 153;
-  ENUM_VALUE11697 = 154;
-  ENUM_VALUE11698 = 155;
-  ENUM_VALUE11699 = 156;
-  ENUM_VALUE11700 = 157;
-  ENUM_VALUE11701 = 158;
-  ENUM_VALUE11702 = 159;
-  ENUM_VALUE11703 = 160;
-  ENUM_VALUE11704 = 161;
-  ENUM_VALUE11705 = 162;
-  ENUM_VALUE11706 = 163;
-  ENUM_VALUE11707 = 164;
-  ENUM_VALUE11708 = 165;
-  ENUM_VALUE11709 = 166;
-  ENUM_VALUE11710 = 167;
-  ENUM_VALUE11711 = 168;
-  ENUM_VALUE11712 = 169;
-  ENUM_VALUE11713 = 170;
-  ENUM_VALUE11714 = 171;
-  ENUM_VALUE11715 = 172;
-  ENUM_VALUE11716 = 173;
-  ENUM_VALUE11717 = 174;
-  ENUM_VALUE11718 = 175;
-  ENUM_VALUE11719 = 176;
-  ENUM_VALUE11720 = 177;
-  ENUM_VALUE11721 = 178;
-  ENUM_VALUE11722 = 179;
-  ENUM_VALUE11723 = 180;
-  ENUM_VALUE11724 = 181;
-  ENUM_VALUE11725 = 182;
-  ENUM_VALUE11726 = 183;
-  ENUM_VALUE11727 = 184;
-  ENUM_VALUE11728 = 185;
-  ENUM_VALUE11729 = 186;
-  ENUM_VALUE11730 = 187;
-  ENUM_VALUE11731 = 188;
-  ENUM_VALUE11732 = 16777215;
-}
-
-enum Enum11468 {
-  ENUM_VALUE11469 = -99;
-  ENUM_VALUE11470 = 0;
-  ENUM_VALUE11471 = 1;
-  ENUM_VALUE11472 = 2;
-  ENUM_VALUE11473 = 3;
-  ENUM_VALUE11474 = 4;
-  ENUM_VALUE11475 = 28;
-  ENUM_VALUE11476 = 22;
-  ENUM_VALUE11477 = 38;
-  ENUM_VALUE11478 = 512;
-  ENUM_VALUE11479 = 2048;
-  ENUM_VALUE11480 = 66;
-  ENUM_VALUE11481 = 578;
-  ENUM_VALUE11482 = 77;
-  ENUM_VALUE11483 = 88;
-  ENUM_VALUE11484 = 100;
-  ENUM_VALUE11485 = 110;
-  ENUM_VALUE11486 = 2158;
-  ENUM_VALUE11487 = 122;
-  ENUM_VALUE11488 = 2170;
-  ENUM_VALUE11489 = 144;
-  ENUM_VALUE11490 = 244;
-  ENUM_VALUE11491 = 2292;
-  ENUM_VALUE11492 = 44;
-}
-
-enum Enum11022 {
-  ENUM_VALUE11023 = 0;
-  ENUM_VALUE11024 = 1;
-  ENUM_VALUE11025 = 2;
-  ENUM_VALUE11026 = 3;
-  ENUM_VALUE11027 = 4;
-  ENUM_VALUE11028 = 5;
-  ENUM_VALUE11029 = 6;
-  ENUM_VALUE11030 = 7;
-  ENUM_VALUE11031 = 8;
-  ENUM_VALUE11032 = 9;
-  ENUM_VALUE11033 = 10;
-  ENUM_VALUE11034 = 11;
-  ENUM_VALUE11035 = 12;
-  ENUM_VALUE11036 = 13;
-  ENUM_VALUE11037 = 14;
-  ENUM_VALUE11038 = 15;
-  ENUM_VALUE11039 = 16;
-  ENUM_VALUE11040 = 17;
-  ENUM_VALUE11041 = 18;
-  ENUM_VALUE11042 = 19;
-  ENUM_VALUE11043 = 20;
-  ENUM_VALUE11044 = 21;
-  ENUM_VALUE11045 = 22;
-  ENUM_VALUE11046 = 23;
-  ENUM_VALUE11047 = 24;
-  ENUM_VALUE11048 = 25;
-  ENUM_VALUE11049 = 26;
-  ENUM_VALUE11050 = 27;
-  ENUM_VALUE11051 = 28;
-  ENUM_VALUE11052 = 29;
-  ENUM_VALUE11053 = 30;
-  ENUM_VALUE11054 = 31;
-  ENUM_VALUE11055 = 32;
-  ENUM_VALUE11056 = 33;
-  ENUM_VALUE11057 = 34;
-  ENUM_VALUE11058 = 35;
-  ENUM_VALUE11059 = 36;
-  ENUM_VALUE11060 = 37;
-  ENUM_VALUE11061 = 38;
-  ENUM_VALUE11062 = 39;
-  ENUM_VALUE11063 = 40;
-  ENUM_VALUE11064 = 41;
-  ENUM_VALUE11065 = 42;
-  ENUM_VALUE11066 = 43;
-  ENUM_VALUE11067 = 44;
-  ENUM_VALUE11068 = 45;
-  ENUM_VALUE11069 = 46;
-  ENUM_VALUE11070 = 47;
-  ENUM_VALUE11071 = 48;
-  ENUM_VALUE11072 = 49;
-  ENUM_VALUE11073 = 50;
-  ENUM_VALUE11074 = 51;
-  ENUM_VALUE11075 = 52;
-  ENUM_VALUE11076 = 53;
-  ENUM_VALUE11077 = 54;
-  ENUM_VALUE11078 = 55;
-  ENUM_VALUE11079 = 56;
-  ENUM_VALUE11080 = 57;
-  ENUM_VALUE11081 = 58;
-  ENUM_VALUE11082 = 59;
-  ENUM_VALUE11083 = 60;
-  ENUM_VALUE11084 = 61;
-  ENUM_VALUE11085 = 62;
-  ENUM_VALUE11086 = 63;
-  ENUM_VALUE11087 = 64;
-  ENUM_VALUE11088 = 65;
-  ENUM_VALUE11089 = 66;
-  ENUM_VALUE11090 = 67;
-  ENUM_VALUE11091 = 68;
-  ENUM_VALUE11092 = 69;
-  ENUM_VALUE11093 = 70;
-  ENUM_VALUE11094 = 71;
-  ENUM_VALUE11095 = 72;
-  ENUM_VALUE11096 = 73;
-  ENUM_VALUE11097 = 74;
-  ENUM_VALUE11098 = 75;
-  ENUM_VALUE11099 = 76;
-  ENUM_VALUE11100 = 77;
-  ENUM_VALUE11101 = 78;
-  ENUM_VALUE11102 = 79;
-  ENUM_VALUE11103 = 80;
-  ENUM_VALUE11104 = 81;
-  ENUM_VALUE11105 = 82;
-  ENUM_VALUE11106 = 83;
-}
-
-enum Enum12670 {
-  ENUM_VALUE12671 = 0;
-  ENUM_VALUE12672 = 1;
-  ENUM_VALUE12673 = 2;
-}
-
-enum Enum12871 {
-  ENUM_VALUE12872 = 1;
-  ENUM_VALUE12873 = 2;
-  ENUM_VALUE12874 = 3;
-  ENUM_VALUE12875 = 4;
-  ENUM_VALUE12876 = 5;
-  ENUM_VALUE12877 = 6;
-}
-
-enum Enum13092 {
-  ENUM_VALUE13093 = 1;
-  ENUM_VALUE13094 = 2;
-  ENUM_VALUE13095 = 3;
-}
-
-enum Enum13146 {
-  ENUM_VALUE13147 = 0;
-  ENUM_VALUE13148 = 1;
-  ENUM_VALUE13149 = 2;
-  ENUM_VALUE13150 = 3;
-}
-
-enum Enum16042 {
-  ENUM_VALUE16043 = 0;
-  ENUM_VALUE16044 = 1;
-  ENUM_VALUE16045 = 17;
-  ENUM_VALUE16046 = 273;
-  ENUM_VALUE16047 = 274;
-  ENUM_VALUE16048 = 4385;
-  ENUM_VALUE16049 = 4386;
-  ENUM_VALUE16050 = 4387;
-  ENUM_VALUE16051 = 4388;
-  ENUM_VALUE16052 = 4389;
-  ENUM_VALUE16053 = 4390;
-  ENUM_VALUE16054 = 4391;
-  ENUM_VALUE16055 = 4392;
-  ENUM_VALUE16056 = 4393;
-  ENUM_VALUE16057 = 276;
-  ENUM_VALUE16058 = 277;
-  ENUM_VALUE16059 = 18;
-  ENUM_VALUE16060 = 289;
-  ENUM_VALUE16061 = 291;
-  ENUM_VALUE16062 = 4657;
-  ENUM_VALUE16063 = 74513;
-  ENUM_VALUE16064 = 4658;
-  ENUM_VALUE16065 = 4659;
-  ENUM_VALUE16066 = 4660;
-  ENUM_VALUE16067 = 4661;
-  ENUM_VALUE16068 = 4662;
-  ENUM_VALUE16069 = 4663;
-  ENUM_VALUE16070 = 4664;
-  ENUM_VALUE16071 = 292;
-  ENUM_VALUE16072 = 4673;
-  ENUM_VALUE16073 = 4674;
-  ENUM_VALUE16074 = 293;
-  ENUM_VALUE16075 = 19;
-  ENUM_VALUE16076 = 20;
-  ENUM_VALUE16077 = 321;
-  ENUM_VALUE16078 = 5137;
-  ENUM_VALUE16079 = 5138;
-  ENUM_VALUE16080 = 5139;
-  ENUM_VALUE16081 = 5140;
-  ENUM_VALUE16082 = 5141;
-  ENUM_VALUE16083 = 5142;
-  ENUM_VALUE16084 = 82273;
-  ENUM_VALUE16085 = 82274;
-  ENUM_VALUE16086 = 82275;
-  ENUM_VALUE16087 = 82276;
-  ENUM_VALUE16088 = 82277;
-  ENUM_VALUE16089 = 82278;
-  ENUM_VALUE16090 = 5143;
-  ENUM_VALUE16091 = 5144;
-  ENUM_VALUE16092 = 5145;
-  ENUM_VALUE16093 = 5146;
-  ENUM_VALUE16094 = 82337;
-  ENUM_VALUE16095 = 5147;
-  ENUM_VALUE16096 = 5148;
-  ENUM_VALUE16097 = 322;
-  ENUM_VALUE16098 = 323;
-  ENUM_VALUE16099 = 324;
-  ENUM_VALUE16100 = 325;
-  ENUM_VALUE16101 = 326;
-  ENUM_VALUE16102 = 327;
-  ENUM_VALUE16103 = 328;
-  ENUM_VALUE16104 = 21;
-  ENUM_VALUE16105 = 337;
-  ENUM_VALUE16106 = 22;
-  ENUM_VALUE16107 = 23;
-  ENUM_VALUE16108 = 24;
-  ENUM_VALUE16109 = 2;
-  ENUM_VALUE16110 = 33;
-  ENUM_VALUE16111 = 34;
-  ENUM_VALUE16112 = 545;
-  ENUM_VALUE16113 = 8721;
-  ENUM_VALUE16114 = 8723;
-  ENUM_VALUE16115 = 8724;
-  ENUM_VALUE16116 = 546;
-  ENUM_VALUE16117 = 8739;
-  ENUM_VALUE16118 = 8740;
-  ENUM_VALUE16119 = 547;
-  ENUM_VALUE16120 = 548;
-  ENUM_VALUE16121 = 549;
-  ENUM_VALUE16122 = 550;
-  ENUM_VALUE16123 = 551;
-  ENUM_VALUE16124 = 552;
-  ENUM_VALUE16125 = 553;
-  ENUM_VALUE16126 = 35;
-  ENUM_VALUE16127 = 36;
-  ENUM_VALUE16128 = 37;
-  ENUM_VALUE16129 = 593;
-  ENUM_VALUE16130 = 594;
-  ENUM_VALUE16131 = 595;
-  ENUM_VALUE16132 = 596;
-  ENUM_VALUE16133 = 597;
-  ENUM_VALUE16134 = 38;
-  ENUM_VALUE16135 = 609;
-  ENUM_VALUE16136 = 610;
-  ENUM_VALUE16137 = 617;
-  ENUM_VALUE16138 = 614;
-  ENUM_VALUE16139 = 615;
-  ENUM_VALUE16140 = 616;
-  ENUM_VALUE16141 = 618;
-  ENUM_VALUE16142 = 620;
-  ENUM_VALUE16143 = 9937;
-  ENUM_VALUE16144 = 9938;
-  ENUM_VALUE16145 = 9939;
-  ENUM_VALUE16146 = 9940;
-  ENUM_VALUE16147 = 9941;
-  ENUM_VALUE16148 = 39;
-  ENUM_VALUE16149 = 40;
-  ENUM_VALUE16150 = 41;
-  ENUM_VALUE16151 = 42;
-  ENUM_VALUE16152 = 43;
-  ENUM_VALUE16153 = 44;
-  ENUM_VALUE16154 = 45;
-  ENUM_VALUE16155 = 11793;
-  ENUM_VALUE16156 = 3;
-  ENUM_VALUE16157 = 49;
-  ENUM_VALUE16158 = 50;
-  ENUM_VALUE16159 = 51;
-  ENUM_VALUE16160 = 817;
-  ENUM_VALUE16161 = 818;
-  ENUM_VALUE16162 = 819;
-  ENUM_VALUE16163 = 52;
-  ENUM_VALUE16164 = 833;
-  ENUM_VALUE16165 = 53;
-  ENUM_VALUE16166 = 54;
-  ENUM_VALUE16167 = 4;
-  ENUM_VALUE16168 = 1041;
-  ENUM_VALUE16169 = 16657;
-  ENUM_VALUE16170 = 16658;
-  ENUM_VALUE16171 = 16659;
-  ENUM_VALUE16172 = 16660;
-  ENUM_VALUE16173 = 16661;
-  ENUM_VALUE16174 = 1042;
-  ENUM_VALUE16175 = 16673;
-  ENUM_VALUE16176 = 1043;
-  ENUM_VALUE16177 = 16689;
-  ENUM_VALUE16178 = 16690;
-  ENUM_VALUE16179 = 16691;
-  ENUM_VALUE16180 = 16692;
-  ENUM_VALUE16181 = 16693;
-  ENUM_VALUE16182 = 16694;
-  ENUM_VALUE16183 = 16695;
-  ENUM_VALUE16184 = 1044;
-  ENUM_VALUE16185 = 16705;
-  ENUM_VALUE16186 = 16706;
-  ENUM_VALUE16187 = 16707;
-  ENUM_VALUE16188 = 16708;
-  ENUM_VALUE16189 = 16709;
-  ENUM_VALUE16190 = 16710;
-  ENUM_VALUE16191 = 16711;
-  ENUM_VALUE16192 = 16712;
-  ENUM_VALUE16193 = 16713;
-  ENUM_VALUE16194 = 1046;
-  ENUM_VALUE16195 = 16737;
-  ENUM_VALUE16196 = 1047;
-  ENUM_VALUE16197 = 16753;
-  ENUM_VALUE16198 = 268049;
-  ENUM_VALUE16199 = 268050;
-  ENUM_VALUE16200 = 268051;
-  ENUM_VALUE16201 = 268052;
-  ENUM_VALUE16202 = 1048;
-  ENUM_VALUE16203 = 16769;
-  ENUM_VALUE16204 = 16770;
-  ENUM_VALUE16205 = 16771;
-  ENUM_VALUE16206 = 16772;
-  ENUM_VALUE16207 = 16773;
-  ENUM_VALUE16208 = 1049;
-  ENUM_VALUE16209 = 1056;
-  ENUM_VALUE16210 = 1058;
-  ENUM_VALUE16211 = 1059;
-  ENUM_VALUE16212 = 1060;
-  ENUM_VALUE16213 = 1061;
-  ENUM_VALUE16214 = 5;
-  ENUM_VALUE16215 = 6;
-  ENUM_VALUE16216 = 97;
-  ENUM_VALUE16217 = 98;
-  ENUM_VALUE16218 = 99;
-  ENUM_VALUE16219 = 100;
-  ENUM_VALUE16220 = 101;
-  ENUM_VALUE16221 = 102;
-  ENUM_VALUE16222 = 103;
-  ENUM_VALUE16223 = 104;
-  ENUM_VALUE16224 = 105;
-  ENUM_VALUE16225 = 106;
-  ENUM_VALUE16226 = 108;
-  ENUM_VALUE16227 = 1729;
-  ENUM_VALUE16228 = 1730;
-  ENUM_VALUE16229 = 1731;
-  ENUM_VALUE16230 = 7;
-  ENUM_VALUE16231 = 8;
-  ENUM_VALUE16232 = 9;
-  ENUM_VALUE16233 = 10;
-  ENUM_VALUE16234 = 161;
-  ENUM_VALUE16235 = 2577;
-  ENUM_VALUE16236 = 41233;
-  ENUM_VALUE16237 = 41234;
-  ENUM_VALUE16238 = 2578;
-  ENUM_VALUE16239 = 2579;
-  ENUM_VALUE16240 = 41265;
-  ENUM_VALUE16241 = 2580;
-  ENUM_VALUE16242 = 2581;
-  ENUM_VALUE16243 = 41297;
-  ENUM_VALUE16244 = 41298;
-  ENUM_VALUE16245 = 41299;
-  ENUM_VALUE16246 = 41300;
-  ENUM_VALUE16247 = 2582;
-  ENUM_VALUE16248 = 2583;
-  ENUM_VALUE16249 = 2584;
-  ENUM_VALUE16250 = 162;
-  ENUM_VALUE16251 = 2593;
-  ENUM_VALUE16252 = 41489;
-  ENUM_VALUE16253 = 663825;
-  ENUM_VALUE16254 = 663826;
-  ENUM_VALUE16255 = 41490;
-  ENUM_VALUE16256 = 41491;
-  ENUM_VALUE16257 = 41492;
-  ENUM_VALUE16258 = 663873;
-  ENUM_VALUE16259 = 2594;
-  ENUM_VALUE16260 = 41505;
-  ENUM_VALUE16261 = 41506;
-  ENUM_VALUE16262 = 41507;
-  ENUM_VALUE16263 = 2595;
-  ENUM_VALUE16264 = 41521;
-  ENUM_VALUE16265 = 41522;
-  ENUM_VALUE16266 = 41523;
-  ENUM_VALUE16267 = 41524;
-  ENUM_VALUE16268 = 41525;
-  ENUM_VALUE16269 = 664401;
-  ENUM_VALUE16270 = 664402;
-  ENUM_VALUE16271 = 41526;
-  ENUM_VALUE16272 = 41527;
-  ENUM_VALUE16273 = 2596;
-  ENUM_VALUE16274 = 2597;
-  ENUM_VALUE16275 = 2598;
-  ENUM_VALUE16276 = 41569;
-  ENUM_VALUE16277 = 41570;
-  ENUM_VALUE16278 = 41571;
-  ENUM_VALUE16279 = 41572;
-  ENUM_VALUE16280 = 41573;
-  ENUM_VALUE16281 = 665169;
-  ENUM_VALUE16282 = 665170;
-  ENUM_VALUE16283 = 665171;
-  ENUM_VALUE16284 = 665172;
-  ENUM_VALUE16285 = 2599;
-  ENUM_VALUE16286 = 2600;
-  ENUM_VALUE16287 = 2601;
-  ENUM_VALUE16288 = 2603;
-  ENUM_VALUE16289 = 2604;
-  ENUM_VALUE16290 = 163;
-  ENUM_VALUE16291 = 2608;
-  ENUM_VALUE16292 = 2609;
-  ENUM_VALUE16293 = 2610;
-  ENUM_VALUE16294 = 2611;
-  ENUM_VALUE16295 = 2612;
-  ENUM_VALUE16296 = 164;
-  ENUM_VALUE16297 = 2625;
-  ENUM_VALUE16298 = 2626;
-  ENUM_VALUE16299 = 42017;
-  ENUM_VALUE16300 = 42018;
-  ENUM_VALUE16301 = 42019;
-  ENUM_VALUE16302 = 2627;
-  ENUM_VALUE16303 = 2628;
-  ENUM_VALUE16304 = 165;
-  ENUM_VALUE16305 = 2641;
-  ENUM_VALUE16306 = 42257;
-  ENUM_VALUE16307 = 42258;
-  ENUM_VALUE16308 = 2642;
-  ENUM_VALUE16309 = 2643;
-  ENUM_VALUE16310 = 2644;
-  ENUM_VALUE16311 = 2646;
-  ENUM_VALUE16312 = 2647;
-  ENUM_VALUE16313 = 42353;
-  ENUM_VALUE16314 = 2648;
-  ENUM_VALUE16315 = 2649;
-  ENUM_VALUE16316 = 2650;
-  ENUM_VALUE16317 = 2651;
-  ENUM_VALUE16318 = 2652;
-  ENUM_VALUE16319 = 2653;
-  ENUM_VALUE16320 = 2654;
-  ENUM_VALUE16321 = 42481;
-  ENUM_VALUE16322 = 42482;
-  ENUM_VALUE16323 = 42483;
-  ENUM_VALUE16324 = 166;
-  ENUM_VALUE16325 = 2657;
-  ENUM_VALUE16326 = 2658;
-  ENUM_VALUE16327 = 42529;
-  ENUM_VALUE16328 = 2659;
-  ENUM_VALUE16329 = 2660;
-  ENUM_VALUE16330 = 2661;
-  ENUM_VALUE16331 = 2662;
-  ENUM_VALUE16332 = 2663;
-  ENUM_VALUE16333 = 42609;
-  ENUM_VALUE16334 = 2664;
-  ENUM_VALUE16335 = 2665;
-  ENUM_VALUE16336 = 42753;
-  ENUM_VALUE16337 = 42754;
-  ENUM_VALUE16338 = 42755;
-  ENUM_VALUE16339 = 11;
-  ENUM_VALUE16340 = 177;
-  ENUM_VALUE16341 = 2833;
-  ENUM_VALUE16342 = 179;
-  ENUM_VALUE16343 = 180;
-  ENUM_VALUE16344 = 2881;
-  ENUM_VALUE16345 = 182;
-  ENUM_VALUE16346 = 183;
-  ENUM_VALUE16347 = 12;
-  ENUM_VALUE16348 = 3089;
-  ENUM_VALUE16349 = 194;
-  ENUM_VALUE16350 = 195;
-  ENUM_VALUE16351 = 196;
-  ENUM_VALUE16352 = 198;
-  ENUM_VALUE16353 = 3169;
-  ENUM_VALUE16354 = 199;
-  ENUM_VALUE16355 = 200;
-  ENUM_VALUE16356 = 208;
-  ENUM_VALUE16357 = 3329;
-  ENUM_VALUE16358 = 3330;
-  ENUM_VALUE16359 = 3331;
-  ENUM_VALUE16360 = 209;
-  ENUM_VALUE16361 = 210;
-  ENUM_VALUE16362 = 211;
-  ENUM_VALUE16363 = 3377;
-  ENUM_VALUE16364 = 3378;
-  ENUM_VALUE16365 = 3379;
-  ENUM_VALUE16366 = 3380;
-  ENUM_VALUE16367 = 3381;
-  ENUM_VALUE16368 = 865809;
-  ENUM_VALUE16369 = 865810;
-  ENUM_VALUE16370 = 865811;
-  ENUM_VALUE16371 = 865812;
-  ENUM_VALUE16372 = 865813;
-  ENUM_VALUE16373 = 865814;
-  ENUM_VALUE16374 = 865815;
-  ENUM_VALUE16375 = 865816;
-  ENUM_VALUE16376 = 865817;
-  ENUM_VALUE16377 = 865818;
-  ENUM_VALUE16378 = 865819;
-  ENUM_VALUE16379 = 865820;
-  ENUM_VALUE16380 = 865821;
-  ENUM_VALUE16381 = 865822;
-  ENUM_VALUE16382 = 865823;
-  ENUM_VALUE16383 = 865824;
-  ENUM_VALUE16384 = 865825;
-  ENUM_VALUE16385 = 865826;
-  ENUM_VALUE16386 = 865827;
-  ENUM_VALUE16387 = 865828;
-  ENUM_VALUE16388 = 865829;
-  ENUM_VALUE16389 = 212;
-  ENUM_VALUE16390 = 3393;
-  ENUM_VALUE16391 = 3394;
-  ENUM_VALUE16392 = 3395;
-  ENUM_VALUE16393 = 213;
-  ENUM_VALUE16394 = 214;
-  ENUM_VALUE16395 = 215;
-  ENUM_VALUE16396 = 3441;
-  ENUM_VALUE16397 = 3442;
-  ENUM_VALUE16398 = 216;
-  ENUM_VALUE16399 = 217;
-  ENUM_VALUE16400 = 3473;
-  ENUM_VALUE16401 = 3474;
-  ENUM_VALUE16402 = 3475;
-  ENUM_VALUE16403 = 254;
-  ENUM_VALUE16404 = 255;
-}
-
-enum Enum16553 {
-  ENUM_VALUE16554 = 0;
-  ENUM_VALUE16555 = 1;
-  ENUM_VALUE16556 = 2;
-  ENUM_VALUE16557 = 3;
-  ENUM_VALUE16558 = 4;
-  ENUM_VALUE16559 = 5;
-  ENUM_VALUE16560 = 6;
-  ENUM_VALUE16561 = 7;
-  ENUM_VALUE16562 = 8;
-  ENUM_VALUE16563 = 9;
-}
-
-enum Enum16728 {
-  ENUM_VALUE16729 = 1;
-  ENUM_VALUE16730 = 2;
-  ENUM_VALUE16731 = 3;
-}
-
-enum Enum16732 {
-  ENUM_VALUE16733 = 1;
-  ENUM_VALUE16734 = 2;
-  ENUM_VALUE16735 = 3;
-  ENUM_VALUE16736 = 4;
-  ENUM_VALUE16737 = 5;
-}
-
-enum Enum16738 {
-  ENUM_VALUE16739 = 1;
-  ENUM_VALUE16740 = 2;
-  ENUM_VALUE16741 = 3;
-  ENUM_VALUE16742 = 4;
-  ENUM_VALUE16743 = 5;
-  ENUM_VALUE16744 = 6;
-  ENUM_VALUE16745 = 7;
-}
-
-enum Enum16698 {
-  ENUM_VALUE16699 = -1;
-  ENUM_VALUE16700 = 100;
-  ENUM_VALUE16701 = 2;
-  ENUM_VALUE16702 = 0;
-  ENUM_VALUE16703 = 1;
-  ENUM_VALUE16704 = 4;
-  ENUM_VALUE16705 = 11;
-  ENUM_VALUE16706 = 12;
-  ENUM_VALUE16707 = 3;
-  ENUM_VALUE16708 = 5;
-  ENUM_VALUE16709 = 6;
-  ENUM_VALUE16710 = 7;
-  ENUM_VALUE16711 = 8;
-  ENUM_VALUE16712 = 9;
-  ENUM_VALUE16713 = 10;
-  ENUM_VALUE16714 = 13;
-  ENUM_VALUE16715 = 14;
-  ENUM_VALUE16716 = 15;
-  ENUM_VALUE16717 = 16;
-  ENUM_VALUE16718 = 18;
-  ENUM_VALUE16719 = 17;
-  ENUM_VALUE16720 = 19;
-  ENUM_VALUE16721 = 20;
-}
-
-enum Enum16819 {
-  ENUM_VALUE16820 = 0;
-  ENUM_VALUE16821 = 1;
-  ENUM_VALUE16822 = 2;
-  ENUM_VALUE16823 = 3;
-  ENUM_VALUE16824 = 4;
-  ENUM_VALUE16825 = 5;
-}
-
-enum Enum16925 {
-  ENUM_VALUE16926 = 0;
-  ENUM_VALUE16927 = 1;
-  ENUM_VALUE16928 = 2;
-  ENUM_VALUE16929 = 3;
-  ENUM_VALUE16930 = 4;
-  ENUM_VALUE16931 = 5;
-  ENUM_VALUE16932 = 6;
-  ENUM_VALUE16933 = 7;
-  ENUM_VALUE16934 = 8;
-  ENUM_VALUE16935 = 9;
-  ENUM_VALUE16936 = 10;
-  ENUM_VALUE16937 = 11;
-  ENUM_VALUE16938 = 12;
-  ENUM_VALUE16939 = 13;
-}
-
-enum Enum22854 {
-  ENUM_VALUE22855 = 0;
-  ENUM_VALUE22856 = 1;
-}
-
-enum Enum24361 {
-  ENUM_VALUE24362 = 0;
-  ENUM_VALUE24363 = 1;
-  ENUM_VALUE24364 = 2;
-  ENUM_VALUE24365 = 3;
-}
-
-enum Enum16891 {
-  ENUM_VALUE16892 = 0;
-  ENUM_VALUE16893 = 1;
-  ENUM_VALUE16894 = 2;
-  ENUM_VALUE16895 = 3;
-  ENUM_VALUE16896 = 4;
-  ENUM_VALUE16897 = 5;
-  ENUM_VALUE16898 = 6;
-  ENUM_VALUE16899 = 7;
-  ENUM_VALUE16900 = 8;
-  ENUM_VALUE16901 = 9;
-  ENUM_VALUE16902 = 10;
-  ENUM_VALUE16903 = 11;
-  ENUM_VALUE16904 = 12;
-  ENUM_VALUE16905 = 13;
-  ENUM_VALUE16906 = 14;
-  ENUM_VALUE16907 = 15;
-  ENUM_VALUE16908 = 16;
-  ENUM_VALUE16909 = 17;
-  ENUM_VALUE16910 = 18;
-  ENUM_VALUE16911 = 19;
-  ENUM_VALUE16912 = 20;
-  ENUM_VALUE16913 = 21;
-  ENUM_VALUE16914 = 22;
-  ENUM_VALUE16915 = 23;
-  ENUM_VALUE16916 = 24;
-  ENUM_VALUE16917 = 25;
-  ENUM_VALUE16918 = 26;
-  ENUM_VALUE16919 = 27;
-  ENUM_VALUE16920 = 28;
-  ENUM_VALUE16921 = 29;
-  ENUM_VALUE16922 = 30;
-  ENUM_VALUE16923 = 31;
-}
-
-enum Enum27361 {
-  ENUM_VALUE27362 = 0;
-  ENUM_VALUE27363 = 1;
-  ENUM_VALUE27364 = 2;
-  ENUM_VALUE27365 = 3;
-  ENUM_VALUE27366 = 4;
-}
-
-enum Enum33960 {
-  ENUM_VALUE33961 = 0;
-  ENUM_VALUE33962 = 1;
-  ENUM_VALUE33963 = 2;
-  ENUM_VALUE33964 = 3;
-  ENUM_VALUE33965 = 4;
-  ENUM_VALUE33966 = 5;
-  ENUM_VALUE33967 = 6;
-}
-
-enum Enum34388 { ENUM_VALUE34389 = 1; }
-
-enum Enum35477 {
-  ENUM_VALUE35478 = 4;
-  ENUM_VALUE35479 = 3;
-  ENUM_VALUE35480 = 2;
-  ENUM_VALUE35481 = 1;
-  ENUM_VALUE35482 = 0;
-}
-
-enum Enum35507 {
-  ENUM_VALUE35508 = 0;
-  ENUM_VALUE35509 = 1;
-  ENUM_VALUE35510 = 2;
-  ENUM_VALUE35511 = 3;
-  ENUM_VALUE35512 = 4;
-  ENUM_VALUE35513 = 5;
-  ENUM_VALUE35514 = 6;
-  ENUM_VALUE35515 = 7;
-  ENUM_VALUE35516 = 8;
-  ENUM_VALUE35517 = 9;
-}
-
-enum Enum36860 {
-  ENUM_VALUE36861 = 0;
-  ENUM_VALUE36862 = 1;
-  ENUM_VALUE36863 = 2;
-  ENUM_VALUE36864 = 3;
-  ENUM_VALUE36865 = 4;
-  ENUM_VALUE36866 = 5;
-  ENUM_VALUE36867 = 6;
-  ENUM_VALUE36868 = 7;
-}
-
-enum Enum36890 {
-  ENUM_VALUE36891 = 0;
-  ENUM_VALUE36892 = 1;
-}
diff --git a/libs/protobuf/benchmarks/datasets/google_message4/BUILD.bazel b/libs/protobuf/benchmarks/datasets/google_message4/BUILD.bazel
deleted file mode 100644
index 33de093..0000000
--- a/libs/protobuf/benchmarks/datasets/google_message4/BUILD.bazel
+++ /dev/null
@@ -1,53 +0,0 @@
-load("@rules_cc//cc:defs.bzl", "cc_proto_library")
-load("@rules_java//java:defs.bzl", "java_proto_library")
-load("@rules_pkg//:mappings.bzl", "pkg_files", "strip_prefix")
-load("@rules_proto//proto:defs.bzl", "proto_library")
-
-filegroup(
-    name = "datasets",
-    srcs = [],
-    visibility = [
-        "//benchmarks/datasets:__pkg__",
-    ],
-)
-
-proto_library(
-    name = "benchmark_message4_proto",
-    srcs = [
-        "benchmark_message4.proto",
-        "benchmark_message4_1.proto",
-        "benchmark_message4_2.proto",
-        "benchmark_message4_3.proto",
-    ],
-    strip_import_prefix = "/benchmarks",
-    visibility = [
-        "//benchmarks/datasets:__pkg__",
-    ],
-)
-
-cc_proto_library(
-    name = "benchmark_message4_cc_proto",
-    visibility = [
-        "//benchmarks/datasets:__pkg__",
-    ],
-    deps = [
-        "benchmark_message4_proto",
-    ],
-)
-
-java_proto_library(
-    name = "benchmark_message4_java_proto",
-    visibility = [
-        "//benchmarks/datasets:__pkg__",
-    ],
-    deps = [
-        "benchmark_message4_proto",
-    ],
-)
-
-pkg_files(
-    name = "dist_files",
-    srcs = glob(["*"]),
-    strip_prefix = strip_prefix.from_root(""),
-    visibility = ["//benchmarks:__pkg__"],
-)
diff --git a/libs/protobuf/benchmarks/datasets/google_message4/benchmark_message4.proto b/libs/protobuf/benchmarks/datasets/google_message4/benchmark_message4.proto
deleted file mode 100644
index 424ed10..0000000
--- a/libs/protobuf/benchmarks/datasets/google_message4/benchmark_message4.proto
+++ /dev/null
@@ -1,484 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// LINT: ALLOW_GROUPS
-
-syntax = "proto2";
-
-package benchmarks.google_message4;
-
-import "datasets/google_message4/benchmark_message4_1.proto";
-import "datasets/google_message4/benchmark_message4_2.proto";
-import "datasets/google_message4/benchmark_message4_3.proto";
-
-option cc_enable_arenas = true;
-option java_package = "com.google.protobuf.benchmarks";
-
-message GoogleMessage4 {
-  optional int32 field37503 = 1;
-  optional .benchmarks.google_message4.UnusedEmptyMessage field37504 = 2;
-  optional .benchmarks.google_message4.UnusedEmptyMessage field37505 = 3;
-  optional .benchmarks.google_message4.UnusedEmptyMessage field37506 = 4;
-  optional .benchmarks.google_message4.UnusedEmptyMessage field37507 = 5;
-  optional .benchmarks.google_message4.Message37489 field37508 = 6;
-  optional .benchmarks.google_message4.UnusedEmptyMessage field37509 = 7;
-  optional .benchmarks.google_message4.UnusedEmptyMessage field37510 = 8;
-  optional .benchmarks.google_message4.UnusedEmptyMessage field37511 = 9;
-  optional .benchmarks.google_message4.UnusedEmptyMessage field37512 = 10;
-  optional .benchmarks.google_message4.UnusedEmptyMessage field37513 = 11;
-  optional .benchmarks.google_message4.UnusedEmptyMessage field37514 = 12;
-  optional .benchmarks.google_message4.UnusedEmptyMessage field37515 = 13;
-  optional .benchmarks.google_message4.UnusedEmptyMessage field37516 = 14;
-  optional .benchmarks.google_message4.UnusedEmptyMessage field37517 = 15;
-  optional .benchmarks.google_message4.UnusedEmptyMessage field37518 = 16;
-}
-
-message Message37489 {
-  optional .benchmarks.google_message4.Message2517 field37534 = 3;
-  optional .benchmarks.google_message4.Message7330 field37535 = 4;
-  optional .benchmarks.google_message4.Message8815 field37536 = 6;
-  optional .benchmarks.google_message4.Message8817 field37537 = 7;
-  optional .benchmarks.google_message4.Message8835 field37538 = 8;
-  optional .benchmarks.google_message4.Message8848 field37539 = 9;
-  optional .benchmarks.google_message4.Message8856 field37540 = 11;
-  optional .benchmarks.google_message4.Message12717 field37541 = 15;
-  optional .benchmarks.google_message4.Message12748 field37542 = 20;
-  optional .benchmarks.google_message4.Message7319 field37543 = 22;
-  optional .benchmarks.google_message4.Message12908 field37544 = 24;
-  optional .benchmarks.google_message4.Message12910 field37545 = 25;
-  optional .benchmarks.google_message4.Message12960 field37546 = 30;
-  optional .benchmarks.google_message4.Message176 field37547 = 33;
-  optional .benchmarks.google_message4.Message13000 field37548 = 34;
-  optional .benchmarks.google_message4.Message13035 field37549 = 35;
-  optional .benchmarks.google_message4.Message37331 field37550 = 36;
-  optional .benchmarks.google_message4.Message37329 field37551 = 37;
-  optional .benchmarks.google_message4.Message37327 field37552 = 38;
-  optional .benchmarks.google_message4.Message37333 field37553 = 39;
-  optional .benchmarks.google_message4.Message37335 field37554 = 40;
-}
-
-message Message7319 {
-  optional .benchmarks.google_message4.UnusedEmptyMessage field7321 = 1;
-  optional .benchmarks.google_message4.UnusedEmptyMessage field7322 = 7;
-}
-
-message Message12717 {
-  optional .benchmarks.google_message4.UnusedEmptyMessage field12719 = 1;
-  optional string field12720 = 2;
-  optional uint32 field12721 = 3;
-  optional .benchmarks.google_message4.Message11976 field12722 = 4;
-  repeated .benchmarks.google_message4.Message11948 field12723 = 5;
-  optional .benchmarks.google_message4.Message11947 field12724 = 6;
-  optional .benchmarks.google_message4.Message12687 field12725 = 7;
-  repeated .benchmarks.google_message4.Message11948 field12726 = 8;
-  optional int64 field12727 = 9;
-}
-
-message Message37331 {
-  optional .benchmarks.google_message4.UnusedEmptyMessage field37367 = 4;
-  required .benchmarks.google_message4.Message37326 field37368 = 1;
-  required int64 field37369 = 2;
-  required bytes field37370 = 3;
-}
-
-message Message8815 {
-  optional .benchmarks.google_message4.UnusedEmptyMessage field8819 = 1;
-  repeated .benchmarks.google_message4.Message8768 field8820 = 2;
-  optional bool field8821 = 3;
-}
-
-message Message7330 {
-  optional .benchmarks.google_message4.UnusedEmptyMessage field7332 = 1;
-  optional .benchmarks.google_message4.Message3069 field7333 = 2;
-  optional .benchmarks.google_message4.Message7320 field7334 = 3;
-  optional .benchmarks.google_message4.UnusedEmptyMessage field7335 = 4;
-  optional bool field7336 = 5;
-  optional int64 field7337 = 6;
-}
-
-message Message12960 {
-  optional .benchmarks.google_message4.UnusedEmptyMessage field12962 = 1;
-  optional .benchmarks.google_message4.Message12948 field12963 = 2;
-}
-
-message Message176 {
-  required string field408 = 1;
-  optional int32 field409 = 4;
-  optional string field410 = 50;
-  optional int32 field411 = 2;
-  optional uint64 field412 = 47;
-  optional string field413 = 56;
-  optional int32 field414 = 24;
-  optional string field415 = 21;
-  optional bytes field416 = 3;
-  optional string field417 = 57;
-  optional int32 field418 = 51;
-  optional float field419 = 7;
-  optional bool field420 = 5;
-  optional bool field421 = 28;
-  optional int32 field422 = 6;
-  repeated int32 field423 = 40;
-  optional .benchmarks.google_message4.UnusedEmptyMessage field424 = 41;
-  optional bool field425 = 25;
-  optional uint64 field426 = 26;
-  optional int32 field427 = 38;
-  optional bytes field428 = 15;
-  optional bytes field429 = 55;
-  optional bytes field430 = 16;
-  optional bytes field431 = 23;
-  optional bool field432 = 33;
-  optional bytes field433 = 31;
-  optional bytes field434 = 32;
-  optional int32 field435 = 36;
-  optional uint64 field436 = 17;
-  optional int32 field437 = 45;
-  optional uint64 field438 = 18;
-  optional string field439 = 46;
-  optional .benchmarks.google_message4.UnusedEmptyMessage field440 = 64;
-  optional int32 field441 = 39;
-  optional uint64 field442 = 48;
-  optional bytes field443 = 19;
-  optional bytes field444 = 42;
-  optional bytes field445 = 43;
-  optional string field446 = 44;
-  optional string field447 = 49;
-  optional int64 field448 = 20;
-  optional bool field449 = 53;
-  optional .benchmarks.google_message4.UnusedEmptyMessage field450 = 54;
-  repeated .benchmarks.google_message4.UnusedEmptyMessage field451 = 22;
-  optional .benchmarks.google_message4.UnusedEnum field452 = 27;
-  optional int32 field453 = 29;
-  optional int32 field454 = 30;
-  optional .benchmarks.google_message4.UnusedEnum field455 = 37;
-  optional .benchmarks.google_message4.UnusedEnum field456 = 34;
-  optional int32 field457 = 35;
-  repeated group Message178 = 101 {}
-  optional bool field459 = 52;
-  optional uint64 field460 = 58;
-  optional uint64 field461 = 59;
-  optional .benchmarks.google_message4.UnusedEmptyMessage field462 = 60;
-  optional .benchmarks.google_message4.UnusedEmptyMessage field463 = 61;
-  optional .benchmarks.google_message4.UnusedEnum field464 = 62;
-  repeated string field465 = 63;
-  optional .benchmarks.google_message4.UnusedEmptyMessage field466 = 65;
-}
-
-message Message8817 {
-  optional .benchmarks.google_message4.UnusedEmptyMessage field8825 = 1;
-  repeated .benchmarks.google_message4.Message8768 field8826 = 2;
-  optional string field8827 = 3;
-}
-
-message Message8835 {
-  optional .benchmarks.google_message4.UnusedEmptyMessage field8837 = 1;
-  repeated string field8838 = 2;
-  optional .benchmarks.google_message4.UnusedEnum field8839 = 3;
-}
-
-message Message37333 {
-  optional .benchmarks.google_message4.UnusedEmptyMessage field37372 = 3;
-  required .benchmarks.google_message4.Message37326 field37373 = 1;
-  optional uint64 field37374 = 2;
-}
-
-message Message13000 {
-  optional int64 field13015 = 1;
-  repeated .benchmarks.google_message4.Message12979 field13016 = 2;
-}
-
-message Message37335 {
-  optional .benchmarks.google_message4.UnusedEmptyMessage field37376 = 4;
-  required .benchmarks.google_message4.Message37326 field37377 = 1;
-  required .benchmarks.google_message4.Message37173 field37378 = 2;
-  optional uint64 field37379 = 3;
-}
-
-message Message8848 {
-  optional .benchmarks.google_message4.UnusedEmptyMessage field8850 = 1;
-  optional string field8851 = 2;
-  optional bytes field8852 = 3;
-}
-
-message Message13035 {
-  optional int64 field13058 = 1;
-  repeated int64 field13059 = 2;
-}
-
-message Message8856 {
-  optional .benchmarks.google_message4.UnusedEmptyMessage field8858 = 1;
-  optional string field8859 = 2;
-}
-
-message Message12908 {
-  optional .benchmarks.google_message4.UnusedEmptyMessage field12912 = 1;
-  optional string field12913 = 2;
-  optional .benchmarks.google_message4.Message12799 field12914 = 3;
-  optional int64 field12915 = 4;
-  optional .benchmarks.google_message4.Message3804 field12916 = 5;
-  optional .benchmarks.google_message4.Message12870 field12917 = 6;
-}
-
-message Message12910 {
-  optional .benchmarks.google_message4.UnusedEmptyMessage field12920 = 1;
-  optional .benchmarks.google_message4.Message12818 field12921 = 2;
-  repeated .benchmarks.google_message4.Message12903 field12922 = 3;
-}
-
-message Message37327 {
-  optional .benchmarks.google_message4.UnusedEmptyMessage field37347 = 11;
-  required .benchmarks.google_message4.Message37326 field37348 = 1;
-  optional bool field37349 = 2;
-  optional bool field37350 = 3;
-  optional bool field37351 = 4;
-  optional bool field37352 = 5;
-  optional bool field37353 = 6;
-  optional .benchmarks.google_message4.UnusedEmptyMessage field37354 = 7;
-  optional uint64 field37355 = 8;
-  optional bool field37356 = 9;
-  optional bool field37357 = 10;
-}
-
-message Message37329 {
-  optional .benchmarks.google_message4.UnusedEmptyMessage field37359 = 6;
-  required .benchmarks.google_message4.Message37326 field37360 = 1;
-  required int64 field37361 = 2;
-  required int64 field37362 = 3;
-  optional bool field37363 = 4;
-}
-
-message Message2517 {
-  optional .benchmarks.google_message4.UnusedEmptyMessage field2519 = 1;
-  optional .benchmarks.google_message4.Message2356 field2520 = 2;
-  optional .benchmarks.google_message4.Message0 field2521 = 3;
-  optional .benchmarks.google_message4.Message2463 field2522 = 4;
-  repeated .benchmarks.google_message4.Message971 field2523 = 5;
-}
-
-message Message12748 {
-  optional .benchmarks.google_message4.UnusedEmptyMessage field12754 = 1;
-  optional string field12755 = 2;
-  optional string field12756 = 3;
-  optional .benchmarks.google_message4.Enum12735 field12757 = 4;
-}
-
-message Message12687 {
-  repeated .benchmarks.google_message4.Message12686 field12701 = 1;
-}
-
-message Message11948 {
-  optional string field11954 = 1;
-  repeated .benchmarks.google_message4.Message11949 field11955 = 2;
-  optional bool field11956 = 3;
-}
-
-message Message11976 {
-  repeated .benchmarks.google_message4.Message11975 field12002 = 1;
-}
-
-message Message7320 {
-  optional .benchmarks.google_message4.UnusedEmptyMessage field7323 = 1;
-  optional .benchmarks.google_message4.Message7287 field7324 = 8;
-}
-
-message Message3069 {
-  optional .benchmarks.google_message4.Message3061 field3374 = 1;
-  optional bytes field3375 = 2;
-  repeated group Message3070 = 3 {
-    required .benchmarks.google_message4.Enum3071 field3378 = 4;
-    required bytes field3379 = 5;
-  }
-  extensions 10000 to 536870911;
-}
-
-message Message12948 {
-  repeated .benchmarks.google_message4.Message12949 field12958 = 1;
-}
-
-message Message8768 {
-  optional string field8782 = 1;
-  optional .benchmarks.google_message4.Message8572 field8783 = 2;
-  optional bool field8784 = 3;
-  repeated .benchmarks.google_message4.Message8774 field8785 = 4;
-  optional int64 field8786 = 5;
-  optional .benchmarks.google_message4.UnusedEmptyMessage field8787 = 6;
-  optional string field8788 = 7;
-}
-
-message Message12979 {
-  required bytes field12981 = 1;
-  repeated string field12982 = 2;
-  optional .benchmarks.google_message4.UnusedEmptyMessage field12983 = 3;
-  optional int64 field12984 = 4;
-  optional string field12985 = 5;
-  optional int32 field12986 = 6;
-  optional .benchmarks.google_message4.UnusedEmptyMessage field12987 = 7;
-}
-
-message Message37173 {
-  optional string field37252 = 1;
-  optional int64 field37253 = 2;
-  optional .benchmarks.google_message4.UnusedEnum field37254 = 4;
-  optional bool field37255 = 5;
-  optional bool field37256 = 6;
-  optional bool field37257 = 7;
-  optional string field37258 = 8;
-  optional string field37259 = 9;
-  optional uint32 field37260 = 10;
-  optional fixed32 field37261 = 11;
-  optional string field37262 = 12;
-  optional string field37263 = 13;
-  optional string field37264 = 14;
-  optional int32 field37265 = 15;
-  optional int64 field37266 = 16;
-  optional int64 field37267 = 17;
-  optional int32 field37268 = 18;
-  optional int32 field37269 = 19;
-  optional .benchmarks.google_message4.UnusedEmptyMessage field37270 = 20;
-  optional .benchmarks.google_message4.UnusedEmptyMessage field37271 = 21;
-  optional .benchmarks.google_message4.UnusedEmptyMessage field37272 = 22;
-  optional .benchmarks.google_message4.UnusedEmptyMessage field37273 = 23;
-  optional .benchmarks.google_message4.UnusedEmptyMessage field37274 = 24;
-  optional string field37275 = 25;
-  optional bool field37276 = 26;
-}
-
-message Message12799 {
-  required string field12809 = 1;
-  repeated fixed64 field12810 = 2;
-  repeated .benchmarks.google_message4.Message12776 field12811 = 8;
-  repeated int32 field12812 = 4;
-  repeated .benchmarks.google_message4.Message12798 field12813 = 5;
-  required int32 field12814 = 3;
-  optional int32 field12815 = 6;
-  optional .benchmarks.google_message4.Message12797 field12816 = 7;
-}
-
-message Message12870 {
-  required int32 field12879 = 1;
-  optional int32 field12880 = 7;
-  required int32 field12881 = 2;
-  optional uint64 field12882 = 3;
-  optional string field12883 = 2001;
-  optional fixed64 field12884 = 4;
-  repeated fixed64 field12885 = 14;
-  optional int32 field12886 = 9;
-  optional int64 field12887 = 18;
-  repeated .benchmarks.google_message4.Message12870 field12888 = 8;
-  optional int32 field12889 = 5;
-  optional uint64 field12890 = 6;
-  optional int32 field12891 = 10;
-  optional int32 field12892 = 11;
-  optional double field12893 = 12;
-  optional .benchmarks.google_message4.Message12825 field12894 = 13;
-  optional double field12895 = 15;
-  optional string field12896 = 16;
-  optional .benchmarks.google_message4.Enum12871 field12897 = 17;
-  optional int32 field12898 = 19;
-}
-
-message Message3804 {
-  required int64 field3818 = 1;
-  required bool field3819 = 2;
-  repeated .benchmarks.google_message4.Enum3805 field3820 = 4;
-  optional int32 field3821 = 5;
-  optional bool field3822 = 6;
-  optional int64 field3823 = 7;
-  optional .benchmarks.google_message4.Enum3783 field3824 = 8;
-}
-
-message Message12903 {
-  optional string field12905 = 1;
-  optional .benchmarks.google_message4.Message8587 field12906 = 2;
-  repeated .benchmarks.google_message4.Message8590 field12907 = 3;
-}
-
-message Message37326 {
-  required string field37345 = 1;
-  optional string field37346 = 2;
-}
-
-message Message2356 {
-  optional .benchmarks.google_message4.Message1374 field2368 = 121;
-  optional uint64 field2369 = 1;
-  optional int32 field2370 = 2;
-  optional int32 field2371 = 17;
-  required string field2372 = 3;
-  optional int32 field2373 = 7;
-  optional bytes field2374 = 8;
-  optional string field2375 = 4;
-  optional string field2376 = 101;
-  optional int32 field2377 = 102;
-  optional int32 field2378 = 103;
-  optional int32 field2379 = 104;
-  optional int32 field2380 = 113;
-  optional int32 field2381 = 114;
-  optional int32 field2382 = 115;
-  optional int32 field2383 = 117;
-  optional int32 field2384 = 118;
-  optional int32 field2385 = 119;
-  optional int32 field2386 = 105;
-  optional bytes field2387 = 5;
-  optional group Message2357 = 6 {
-    optional int64 field2399 = 9;
-    optional int32 field2400 = 10;
-    optional int32 field2401 = 11;
-    optional int32 field2402 = 12;
-    optional int32 field2403 = 13;
-    optional int32 field2404 = 116;
-    optional int32 field2405 = 106;
-    required bytes field2406 = 14;
-    optional int32 field2407 = 45;
-    optional int32 field2408 = 112;
-    optional bool field2409 = 122;
-    optional bytes field2410 = 124;
-  }
-  optional string field2389 = 120;
-  optional group Message2358 = 107 {}
-  repeated group Message2359 = 40 {}
-  optional int32 field2392 = 50;
-  optional .benchmarks.google_message4.UnusedEmptyMessage field2393 = 60;
-  optional .benchmarks.google_message4.UnusedEmptyMessage field2394 = 70;
-  optional .benchmarks.google_message4.UnusedEmptyMessage field2395 = 80;
-  optional .benchmarks.google_message4.UnusedEmptyMessage field2396 = 90;
-  optional string field2397 = 100;
-  optional string field2398 = 123;
-}
-
-message Message0 {
-  option message_set_wire_format = true;
-
-  extensions 4 to 2147483646;
-}
-
-message Message971 {
-  optional string field972 = 1;
-  optional int32 field973 = 2;
-  optional bool field974 = 3;
-}
diff --git a/libs/protobuf/benchmarks/datasets/google_message4/benchmark_message4_1.proto b/libs/protobuf/benchmarks/datasets/google_message4/benchmark_message4_1.proto
deleted file mode 100644
index c5deecd..0000000
--- a/libs/protobuf/benchmarks/datasets/google_message4/benchmark_message4_1.proto
+++ /dev/null
@@ -1,500 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// LINT: ALLOW_GROUPS
-
-syntax = "proto2";
-
-package benchmarks.google_message4;
-
-import "datasets/google_message4/benchmark_message4_2.proto";
-import "datasets/google_message4/benchmark_message4_3.proto";
-
-option cc_enable_arenas = true;
-option java_package = "com.google.protobuf.benchmarks";
-
-message Message2463 {
-  repeated .benchmarks.google_message4.Message2462 field2498 = 1;
-}
-
-message Message12686 {
-  optional string field12699 = 1;
-  optional .benchmarks.google_message4.Message12685 field12700 = 2;
-}
-
-message Message11949 {}
-
-message Message11975 {
-  optional string field11992 = 1;
-  optional int32 field11993 = 2;
-  repeated .benchmarks.google_message4.Message10320 field11994 = 3;
-  optional .benchmarks.google_message4.Message11947 field11995 = 4;
-  optional .benchmarks.google_message4.Message11920 field11996 = 5;
-  optional bool field11997 = 6;
-  repeated string field11998 = 7;
-  optional float field11999 = 8;
-  repeated .benchmarks.google_message4.UnusedEnum field12000 = 9;
-  optional int32 field12001 = 11;
-}
-
-message Message7287 {
-  optional .benchmarks.google_message4.Message6133 field7311 = 1;
-  optional .benchmarks.google_message4.UnusedEmptyMessage field7312 = 8;
-  optional string field7313 = 3;
-  optional .benchmarks.google_message4.Message6643 field7314 = 4;
-  optional .benchmarks.google_message4.Enum7288 field7315 = 5;
-  optional bytes field7316 = 6;
-  optional .benchmarks.google_message4.UnusedEmptyMessage field7317 = 7;
-  optional .benchmarks.google_message4.UnusedEmptyMessage field7318 = 9;
-}
-
-message Message3061 {
-  optional string field3286 = 2;
-  optional int32 field3287 = 77;
-  optional string field3288 = 49;
-  required .benchmarks.google_message4.Message3046 field3289 = 3;
-  optional .benchmarks.google_message4.Message3046 field3290 = 58;
-  optional group Message3062 = 4 {
-    required int32 field3335 = 5;
-    optional int32 field3336 = 6;
-    optional int32 field3337 = 7;
-  }
-  optional .benchmarks.google_message4.Message3060 field3292 = 104;
-  optional int64 field3293 = 32;
-  optional int32 field3294 = 41;
-  optional group Message3063 = 13 {
-    required int32 field3338 = 14;
-    optional .benchmarks.google_message4.Enum2851 field3339 = 18;
-    optional int64 field3340 = 15;
-    optional int64 field3341 = 23;
-  }
-  optional .benchmarks.google_message4.Enum2834 field3296 = 94;
-  optional bool field3297 = 25;
-  optional bool field3298 = 50;
-  optional string field3299 = 89;
-  optional string field3300 = 91;
-  optional string field3301 = 105;
-  optional .benchmarks.google_message4.Message3050 field3302 = 53;
-  optional fixed64 field3303 = 51;
-  optional fixed64 field3304 = 106;
-  optional int32 field3305 = 60;
-  optional string field3306 = 44;
-  optional bytes field3307 = 81;
-  optional string field3308 = 70;
-  optional bytes field3309 = 45;
-  optional .benchmarks.google_message4.Enum2806 field3310 = 71;
-  optional int32 field3311 = 72;
-  optional bytes field3312 = 78;
-  optional int32 field3313 = 20;
-  repeated group Message3064 = 8 {
-    required .benchmarks.google_message4.Enum2602 field3342 = 9;
-    optional int32 field3343 = 92;
-    optional string field3344 = 10;
-    optional bytes field3345 = 11;
-    optional int32 field3346 = 12;
-    optional .benchmarks.google_message4.Message3060 field3347 = 98;
-    optional .benchmarks.google_message4.UnusedEmptyMessage field3348 = 82;
-    optional .benchmarks.google_message4.Message3050 field3349 = 80;
-    optional fixed64 field3350 = 52;
-    optional int32 field3351 = 33;
-    optional string field3352 = 42;
-    optional string field3353 = 69;
-    optional bytes field3354 = 43;
-    optional .benchmarks.google_message4.Enum2806 field3355 = 73;
-    optional int32 field3356 = 74;
-    optional int32 field3357 = 90;
-    optional bytes field3358 = 79;
-    optional int32 field3359 = 19;
-    optional .benchmarks.google_message4.Enum2834 field3360 = 95;
-  }
-  optional .benchmarks.google_message4.UnusedEmptyMessage field3315 = 39;
-  optional int32 field3316 = 76;
-  optional group Message3065 = 63 {}
-  optional .benchmarks.google_message4.Enum2806 field3318 = 54;
-  optional int32 field3319 = 46;
-  repeated string field3320 = 24;
-  optional fixed32 field3321 = 38;
-  optional bytes field3322 = 99;
-  optional fixed64 field3323 = 1;
-  optional fixed64 field3324 = 97;
-  repeated .benchmarks.google_message4.Message3040 field3325 = 16;
-  repeated .benchmarks.google_message4.Message3041 field3326 = 61;
-  optional group Message3066 = 21 {
-    optional int32 field3366 = 22;
-    optional int32 field3367 = 55;
-    optional int32 field3368 = 88;
-    optional int32 field3369 = 56;
-    optional int32 field3370 = 75;
-    optional int32 field3371 = 57;
-    optional .benchmarks.google_message4.UnusedEmptyMessage field3372 = 85;
-    optional .benchmarks.google_message4.UnusedEmptyMessage field3373 = 96;
-  }
-  optional .benchmarks.google_message4.UnusedEmptyMessage field3328 = 47;
-  optional .benchmarks.google_message4.UnusedEmptyMessage field3329 = 48;
-  optional fixed64 field3330 = 40;
-  optional .benchmarks.google_message4.UnusedEmptyMessage field3331 = 86;
-  optional .benchmarks.google_message4.UnusedEmptyMessage field3332 = 59;
-  optional int32 field3333 = 17;
-}
-
-message Message12949 {}
-
-message Message8572 {
-  optional bytes field8647 = 1;
-  optional bytes field8648 = 3;
-  optional .benchmarks.google_message4.Message3886 field8649 = 4;
-  optional .benchmarks.google_message4.Message3919 field8650 = 57;
-  optional bool field8651 = 5;
-  optional int32 field8652 = 6;
-  optional int32 field8653 = 49;
-  optional .benchmarks.google_message4.Message7905 field8654 = 7;
-  optional int32 field8655 = 10;
-  optional .benchmarks.google_message4.UnusedEmptyMessage field8656 = 11;
-  optional bool field8657 = 35;
-  optional bytes field8658 = 12;
-  optional string field8659 = 14;
-  optional .benchmarks.google_message4.UnusedEmptyMessage field8660 = 13;
-  optional bytes field8661 = 15;
-  optional .benchmarks.google_message4.UnusedEmptyMessage field8662 = 17;
-  optional int32 field8663 = 18;
-  optional int32 field8664 = 19;
-  optional bool field8665 = 20;
-  optional .benchmarks.google_message4.Enum3476 field8666 = 31;
-  optional bool field8667 = 36;
-  optional .benchmarks.google_message4.UnusedEmptyMessage field8668 = 39;
-  optional bytes field8669 = 22;
-  optional int32 field8670 = 24;
-  optional .benchmarks.google_message4.Message3052 field8671 = 25;
-  optional bytes field8672 = 26;
-  optional bytes field8673 = 28;
-  optional int32 field8674 = 29;
-  optional bytes field8675 = 30;
-  optional bytes field8676 = 32;
-  optional string field8677 = 33;
-  optional int32 field8678 = 34;
-  optional int32 field8679 = 37;
-  optional double field8680 = 38;
-  optional double field8681 = 42;
-  optional .benchmarks.google_message4.Message3922 field8682 = 40;
-  optional .benchmarks.google_message4.UnusedEmptyMessage field8683 = 43;
-  optional int64 field8684 = 44;
-  optional .benchmarks.google_message4.Message7929 field8685 = 45;
-  optional uint64 field8686 = 46;
-  optional uint32 field8687 = 48;
-  optional .benchmarks.google_message4.Message7843 field8688 = 47;
-  optional .benchmarks.google_message4.Message7864 field8689 = 50;
-  optional .benchmarks.google_message4.UnusedEmptyMessage field8690 = 52;
-  optional bool field8691 = 58;
-  optional bool field8692 = 54;
-  optional string field8693 = 55;
-  optional .benchmarks.google_message4.UnusedEmptyMessage field8694 = 41;
-  optional .benchmarks.google_message4.UnusedEmptyMessage field8695 = 53;
-  optional .benchmarks.google_message4.Message8575 field8696 = 61;
-}
-
-message Message8774 {
-  optional string field8810 = 1;
-  optional string field8811 = 2;
-  optional string field8812 = 3;
-  optional string field8813 = 4;
-  optional string field8814 = 5;
-}
-
-message Message12776 {
-  optional string field12786 = 1;
-  optional fixed64 field12787 = 11;
-  optional int32 field12788 = 6;
-  optional int32 field12789 = 13;
-  optional int32 field12790 = 14;
-  optional int32 field12791 = 15;
-  optional int32 field12792 = 16;
-  optional .benchmarks.google_message4.UnusedEmptyMessage field12793 = 8;
-  optional .benchmarks.google_message4.Message12774 field12794 = 10;
-  optional .benchmarks.google_message4.UnusedEmptyMessage field12795 = 12;
-  extensions 2 to 2;
-  extensions 3 to 3;
-  extensions 4 to 4;
-  extensions 5 to 5;
-  extensions 7 to 7;
-  extensions 9 to 9;
-}
-
-message Message12798 {
-  optional int32 field12805 = 1;
-  optional int32 field12806 = 2;
-  optional .benchmarks.google_message4.Message12774 field12807 = 6;
-  optional bool field12808 = 7;
-}
-
-message Message12797 {
-  optional .benchmarks.google_message4.Message12796 field12802 = 1;
-  repeated .benchmarks.google_message4.Message12796 field12803 = 2;
-  optional string field12804 = 3;
-}
-
-message Message12825 {
-  repeated .benchmarks.google_message4.Message12818 field12862 = 1;
-  optional int32 field12863 = 2;
-  optional .benchmarks.google_message4.Message12819 field12864 = 3;
-  optional .benchmarks.google_message4.Message12820 field12865 = 4;
-  optional int32 field12866 = 5;
-  repeated .benchmarks.google_message4.Message12821 field12867 = 6;
-  repeated .benchmarks.google_message4.UnusedEmptyMessage field12868 = 7;
-}
-
-message Message8590 {}
-
-message Message8587 {}
-
-message Message1374 {
-  required string field1375 = 1;
-  optional string field1376 = 2;
-}
-
-message Message2462 {
-  required bytes field2496 = 1;
-  required double field2497 = 2;
-}
-
-message Message12685 {
-  repeated string field12692 = 1;
-  repeated string field12693 = 2;
-  optional int64 field12694 = 3;
-  optional uint32 field12695 = 4;
-  repeated string field12696 = 5;
-  optional string field12697 = 6;
-  optional string field12698 = 7;
-}
-
-message Message10320 {
-  optional .benchmarks.google_message4.Enum10335 field10347 = 1;
-  repeated .benchmarks.google_message4.Message10319 field10348 = 2;
-  optional int32 field10349 = 3;
-  optional int32 field10350 = 4;
-  optional int32 field10351 = 5;
-  optional int32 field10352 = 6;
-  optional .benchmarks.google_message4.Enum10337 field10353 = 7;
-}
-
-message Message11947 {
-  optional uint32 field11951 = 1;
-  optional bool field11952 = 2;
-  optional int32 field11953 = 3;
-}
-
-message Message11920 {
-  optional .benchmarks.google_message4.Enum11901 field11945 = 1;
-  optional .benchmarks.google_message4.UnusedEnum field11946 = 2;
-}
-
-message Message6643 {
-  optional .benchmarks.google_message4.UnusedEmptyMessage field6683 = 3;
-  optional .benchmarks.google_message4.UnusedEmptyMessage field6684 = 4;
-  optional double field6685 = 5;
-  optional double field6686 = 6;
-  optional int32 field6687 = 1;
-  optional int32 field6688 = 2;
-  optional double field6689 = 9;
-  optional bytes field6690 = 10;
-  optional int32 field6691 = 11;
-  optional bool field6692 = 12;
-  optional bool field6693 = 13;
-  optional .benchmarks.google_message4.Message6578 field6694 = 15;
-  optional .benchmarks.google_message4.UnusedEnum field6695 = 16;
-  optional int64 field6696 = 17;
-  repeated .benchmarks.google_message4.UnusedEmptyMessage field6697 = 22;
-  optional .benchmarks.google_message4.UnusedEmptyMessage field6698 = 19;
-  optional .benchmarks.google_message4.UnusedEmptyMessage field6699 = 20;
-  optional int32 field6700 = 21;
-}
-
-message Message6133 {
-  optional .benchmarks.google_message4.Message4016 field6173 = 12;
-  optional double field6174 = 16;
-  required string field6175 = 1;
-  required string field6176 = 2;
-  required string field6177 = 3;
-  optional string field6178 = 4;
-  optional string field6179 = 8;
-  repeated .benchmarks.google_message4.Message6109 field6180 = 5;
-  repeated .benchmarks.google_message4.Message5908 field6181 = 13;
-  repeated .benchmarks.google_message4.Message6107 field6182 = 7;
-  repeated .benchmarks.google_message4.Message6126 field6183 = 9;
-  repeated .benchmarks.google_message4.Message6129 field6184 = 15;
-  optional int32 field6185 = 10;
-  optional int32 field6186 = 11;
-  optional .benchmarks.google_message4.Message4016 field6187 = 17;
-  optional double field6188 = 14;
-  optional double field6189 = 18;
-  optional string field6190 = 19;
-  optional string field6191 = 20;
-  repeated .benchmarks.google_message4.Message5881 field6192 = 21;
-}
-
-message Message6109 {
-  optional string field6140 = 1;
-  required .benchmarks.google_message4.Enum6111 field6141 = 2;
-  optional int32 field6142 = 9;
-  optional string field6143 = 3;
-  repeated .benchmarks.google_message4.Message6110 field6144 = 4;
-  repeated int32 field6145 = 7;
-  repeated int32 field6146 = 8;
-  optional .benchmarks.google_message4.Message6133 field6147 = 10;
-  repeated int32 field6148 = 11;
-  optional string field6149 = 12;
-  optional string field6150 = 13;
-  optional bool field6151 = 14;
-  extensions 1000 to 536870911;
-}
-
-message Message3046 {
-  required .benchmarks.google_message4.Enum2593 field3222 = 1;
-  optional int32 field3223 = 4;
-}
-
-message Message3060 {
-  optional int64 field3283 = 1;
-  optional int64 field3284 = 2;
-  optional int64 field3285 = 3;
-}
-
-message Message3041 {
-  optional string field3214 = 1;
-  optional int32 field3215 = 2;
-}
-
-message Message3040 {
-  required fixed64 field3209 = 1;
-  repeated fixed64 field3210 = 4;
-  optional int32 field3211 = 5;
-  optional fixed64 field3212 = 2;
-  required string field3213 = 3;
-}
-
-message Message3050 {
-  optional bytes field3245 = 5;
-  optional int32 field3246 = 2;
-  optional bytes field3247 = 6;
-  optional int32 field3248 = 4;
-  optional fixed32 field3249 = 1;
-  optional fixed32 field3250 = 3;
-}
-
-message Message7905 {
-  optional int32 field7911 = 1;
-  optional bool field7912 = 2;
-  optional bytes field7913 = 3;
-  optional int32 field7914 = 4;
-  optional int32 field7915 = 5;
-  optional bytes field7916 = 6;
-  optional int32 field7917 = 7;
-}
-
-message Message3886 {
-  repeated group Message3887 = 1 {
-    required string field3932 = 2;
-    optional string field3933 = 9;
-    optional .benchmarks.google_message4.Message3850 field3934 = 3;
-    optional bytes field3935 = 8;
-  }
-}
-
-message Message7864 {
-  optional string field7866 = 1;
-  optional string field7867 = 2;
-  repeated .benchmarks.google_message4.Message7865 field7868 = 5;
-  repeated .benchmarks.google_message4.Message7865 field7869 = 6;
-  repeated .benchmarks.google_message4.Message7865 field7870 = 7;
-  repeated .benchmarks.google_message4.UnusedEmptyMessage field7871 = 8;
-}
-
-message Message3922 {
-  optional uint64 field4012 = 1;
-}
-
-message Message3052 {
-  repeated string field3254 = 1;
-  repeated string field3255 = 2;
-  repeated bytes field3256 = 3;
-  repeated string field3257 = 4;
-  optional bool field3258 = 5;
-  optional int32 field3259 = 6;
-  optional int32 field3260 = 7;
-  optional string field3261 = 8;
-  optional string field3262 = 9;
-}
-
-message Message8575 {}
-
-message Message7843 {
-  optional bool field7844 = 5;
-  optional int32 field7845 = 1;
-  optional .benchmarks.google_message4.UnusedEmptyMessage field7846 = 22;
-  repeated int32 field7847 = 3;
-  repeated string field7848 = 11;
-  optional .benchmarks.google_message4.UnusedEnum field7849 = 15;
-  optional .benchmarks.google_message4.UnusedEmptyMessage field7850 = 6;
-  optional .benchmarks.google_message4.UnusedEmptyMessage field7851 = 14;
-  optional .benchmarks.google_message4.UnusedEmptyMessage field7852 = 10;
-  optional .benchmarks.google_message4.Message7511 field7853 = 13;
-  optional .benchmarks.google_message4.UnusedEmptyMessage field7854 = 16;
-  optional .benchmarks.google_message4.UnusedEmptyMessage field7855 = 17;
-  optional .benchmarks.google_message4.UnusedEmptyMessage field7856 = 19;
-  optional .benchmarks.google_message4.UnusedEmptyMessage field7857 = 18;
-  optional .benchmarks.google_message4.UnusedEnum field7858 = 20;
-  optional int32 field7859 = 2;
-}
-
-message Message3919 {
-  repeated .benchmarks.google_message4.Message3920 field4009 = 1;
-}
-
-message Message7929 {
-  optional int64 field7942 = 1;
-  optional int64 field7943 = 4;
-  optional int64 field7944 = 5;
-  optional int64 field7945 = 12;
-  optional int64 field7946 = 13;
-  optional int64 field7947 = 18;
-  optional int64 field7948 = 6;
-  optional int64 field7949 = 7;
-  repeated .benchmarks.google_message4.Message7919 field7950 = 8;
-  repeated .benchmarks.google_message4.UnusedEmptyMessage field7951 = 20;
-  repeated .benchmarks.google_message4.Message7920 field7952 = 14;
-  repeated .benchmarks.google_message4.Message7921 field7953 = 15;
-  repeated .benchmarks.google_message4.Message7928 field7954 = 17;
-  optional int64 field7955 = 19;
-  optional bool field7956 = 2;
-  optional int64 field7957 = 3;
-  optional int64 field7958 = 9;
-  repeated .benchmarks.google_message4.UnusedEmptyMessage field7959 = 10;
-  repeated bytes field7960 = 11;
-  optional int64 field7961 = 16;
-}
diff --git a/libs/protobuf/benchmarks/datasets/google_message4/benchmark_message4_2.proto b/libs/protobuf/benchmarks/datasets/google_message4/benchmark_message4_2.proto
deleted file mode 100644
index 0c4cdfd..0000000
--- a/libs/protobuf/benchmarks/datasets/google_message4/benchmark_message4_2.proto
+++ /dev/null
@@ -1,316 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto2";
-
-package benchmarks.google_message4;
-
-import "datasets/google_message4/benchmark_message4_3.proto";
-
-option cc_enable_arenas = true;
-option java_package = "com.google.protobuf.benchmarks";
-
-message Message12774 {
-  optional uint32 field12777 = 1;
-  optional uint32 field12778 = 2;
-  optional uint32 field12779 = 3;
-  optional uint32 field12780 = 4;
-  optional uint32 field12781 = 5;
-  optional bool field12782 = 6;
-}
-
-message Message12796 {
-  repeated fixed64 field12800 = 1;
-  optional uint64 field12801 = 2;
-}
-
-message Message12821 {
-  optional int32 field12848 = 1;
-  optional int32 field12849 = 2;
-  optional int32 field12850 = 3;
-  optional int32 field12851 = 4;
-  optional int32 field12852 = 5;
-}
-
-message Message12820 {
-  optional int32 field12840 = 1;
-  optional int32 field12841 = 2;
-  optional int32 field12842 = 3;
-  optional int32 field12843 = 8;
-  optional int32 field12844 = 4;
-  optional int32 field12845 = 5;
-  optional int32 field12846 = 6;
-  optional int32 field12847 = 7;
-}
-
-message Message12819 {
-  optional double field12834 = 1;
-  optional double field12835 = 2;
-  optional double field12836 = 3;
-  optional double field12837 = 4;
-  optional double field12838 = 5;
-  optional double field12839 = 6;
-}
-
-message Message12818 {
-  optional uint64 field12829 = 1;
-  optional int32 field12830 = 2;
-  optional int32 field12831 = 3;
-  optional int32 field12832 = 5;
-  repeated .benchmarks.google_message4.Message12817 field12833 = 4;
-}
-
-message Message10319 {
-  optional .benchmarks.google_message4.Enum10325 field10340 = 1;
-  optional int32 field10341 = 4;
-  optional int32 field10342 = 5;
-  optional bytes field10343 = 3;
-  optional string field10344 = 2;
-  optional string field10345 = 6;
-  optional string field10346 = 7;
-}
-
-message Message6578 {
-  optional .benchmarks.google_message4.Enum6579 field6632 = 1;
-  optional .benchmarks.google_message4.Enum6588 field6633 = 2;
-}
-
-message Message6126 {
-  required string field6152 = 1;
-  repeated .benchmarks.google_message4.Message6127 field6153 = 9;
-  optional int32 field6154 = 14;
-  optional bytes field6155 = 10;
-  optional .benchmarks.google_message4.Message6024 field6156 = 12;
-  optional int32 field6157 = 4;
-  optional string field6158 = 5;
-  optional int32 field6159 = 6;
-  repeated int32 field6160 = 2;
-  repeated int32 field6161 = 3;
-  repeated .benchmarks.google_message4.Message6052 field6162 = 7;
-  repeated .benchmarks.google_message4.UnusedEmptyMessage field6163 = 11;
-  optional .benchmarks.google_message4.Enum6065 field6164 = 15;
-  repeated .benchmarks.google_message4.Message6127 field6165 = 8;
-  optional bool field6166 = 13;
-  optional bool field6167 = 16;
-  optional bool field6168 = 18;
-  repeated .benchmarks.google_message4.Message6054 field6169 = 17;
-  optional int32 field6170 = 19;
-}
-
-message Message5881 {
-  required double field5897 = 1;
-  optional string field5898 = 5;
-  optional .benchmarks.google_message4.Message5861 field5899 = 2;
-  optional .benchmarks.google_message4.UnusedEmptyMessage field5900 = 3;
-  optional .benchmarks.google_message4.Message5867 field5901 = 4;
-  optional .benchmarks.google_message4.Message5880 field5902 = 6;
-}
-
-message Message6110 {}
-
-message Message6107 {
-  optional .benchmarks.google_message4.Message4016 field6134 = 1;
-  optional int32 field6135 = 2;
-  optional string field6136 = 3;
-  repeated int32 field6137 = 4;
-  optional int32 field6138 = 5;
-  repeated .benchmarks.google_message4.Message6108 field6139 = 6;
-}
-
-message Message6129 {
-  required .benchmarks.google_message4.Enum6130 field6171 = 1;
-  required string field6172 = 2;
-}
-
-message Message5908 {
-  optional string field5971 = 1;
-  optional int32 field5972 = 2;
-  optional int32 field5973 = 3;
-  optional .benchmarks.google_message4.Enum5909 field5974 = 45;
-  optional .benchmarks.google_message4.Enum5912 field5975 = 4;
-  optional fixed32 field5976 = 50;
-  optional fixed32 field5977 = 5;
-  optional fixed32 field5978 = 6;
-  optional string field5979 = 7;
-  optional .benchmarks.google_message4.Enum5915 field5980 = 8;
-  optional .benchmarks.google_message4.Message5903 field5981 = 9;
-  optional .benchmarks.google_message4.Message5903 field5982 = 10;
-  optional .benchmarks.google_message4.Enum5920 field5983 = 11;
-  optional .benchmarks.google_message4.Enum5923 field5984 = 40;
-  optional .benchmarks.google_message4.Message5903 field5985 = 41;
-  optional .benchmarks.google_message4.Message5903 field5986 = 42;
-  optional .benchmarks.google_message4.Enum5928 field5987 = 47;
-  optional bool field5988 = 48;
-  repeated fixed32 field5989 = 49;
-  optional string field5990 = 12;
-  optional .benchmarks.google_message4.Message5903 field5991 = 13;
-  optional .benchmarks.google_message4.Message5903 field5992 = 14;
-  optional .benchmarks.google_message4.Message5903 field5993 = 15;
-  optional .benchmarks.google_message4.Message5903 field5994 = 16;
-  optional .benchmarks.google_message4.Message5903 field5995 = 32;
-  optional .benchmarks.google_message4.Message5903 field5996 = 33;
-  optional .benchmarks.google_message4.Message5903 field5997 = 34;
-  optional .benchmarks.google_message4.Message5903 field5998 = 35;
-  optional .benchmarks.google_message4.Enum5931 field5999 = 17;
-  optional .benchmarks.google_message4.Enum5935 field6000 = 18;
-  optional .benchmarks.google_message4.Enum5939 field6001 = 36;
-  optional .benchmarks.google_message4.Enum5939 field6002 = 37;
-  repeated int32 field6003 = 19;
-  optional uint32 field6004 = 20;
-  optional uint32 field6005 = 21;
-  optional uint32 field6006 = 22;
-  optional uint32 field6007 = 23;
-  optional .benchmarks.google_message4.Enum5946 field6008 = 24;
-  optional .benchmarks.google_message4.Enum5946 field6009 = 25;
-  optional .benchmarks.google_message4.Enum5946 field6010 = 26;
-  optional .benchmarks.google_message4.Enum5946 field6011 = 27;
-  optional fixed32 field6012 = 28;
-  optional fixed32 field6013 = 29;
-  optional fixed32 field6014 = 30;
-  optional fixed32 field6015 = 31;
-  optional int32 field6016 = 38;
-  optional float field6017 = 39;
-  optional .benchmarks.google_message4.Enum5957 field6018 = 43;
-  optional .benchmarks.google_message4.Message5907 field6019 = 44;
-  optional .benchmarks.google_message4.Enum5962 field6020 = 46;
-}
-
-message Message3850 {
-  optional .benchmarks.google_message4.Enum3851 field3924 = 2;
-  optional bool field3925 = 12;
-  optional int32 field3926 = 4;
-  optional bool field3927 = 10;
-  optional bool field3928 = 13;
-  optional bool field3929 = 14;
-}
-
-message Message7865 {}
-
-message Message7511 {
-  optional bool field7523 = 1;
-  optional .benchmarks.google_message4.Enum7512 field7524 = 2;
-  optional int32 field7525 = 3;
-  optional int32 field7526 = 4;
-  optional bool field7527 = 5;
-  optional int32 field7528 = 6;
-  optional int32 field7529 = 7;
-}
-
-message Message3920 {}
-
-message Message7928 {
-  optional string field7940 = 1;
-  optional int64 field7941 = 2;
-}
-
-message Message7921 {
-  optional int32 field7936 = 1;
-  optional int64 field7937 = 2;
-  optional float field7938 = 3;
-  optional .benchmarks.google_message4.Enum7922 field7939 = 4;
-}
-
-message Message7920 {
-  optional int64 field7934 = 1;
-  optional int64 field7935 = 2;
-}
-
-message Message7919 {
-  optional fixed64 field7931 = 1;
-  optional int64 field7932 = 2;
-  optional bytes field7933 = 3;
-}
-
-message Message12817 {
-  optional int32 field12826 = 1;
-  optional int32 field12827 = 2;
-  optional int32 field12828 = 3;
-}
-
-message Message6054 {
-  required string field6089 = 1;
-  optional string field6090 = 2;
-}
-
-message Message6127 {}
-
-message Message6052 {
-  required string field6084 = 1;
-  required bytes field6085 = 2;
-}
-
-message Message6024 {
-  optional .benchmarks.google_message4.Enum6025 field6048 = 1;
-  optional string field6049 = 2;
-  optional .benchmarks.google_message4.UnusedEmptyMessage field6050 = 3;
-}
-
-message Message5861 {
-  required .benchmarks.google_message4.Enum5862 field5882 = 1;
-  required string field5883 = 2;
-  optional bool field5884 = 3;
-  optional string field5885 = 4;
-}
-
-message Message5880 {
-  optional string field5896 = 1;
-}
-
-message Message5867 {
-  optional .benchmarks.google_message4.Enum5868 field5890 = 1;
-  optional string field5891 = 2;
-  optional .benchmarks.google_message4.Enum5873 field5892 = 3;
-  optional int32 field5893 = 4;
-  optional .benchmarks.google_message4.UnusedEnum field5894 = 5;
-  optional bool field5895 = 6;
-}
-
-message Message4016 {
-  required int32 field4017 = 1;
-  required int32 field4018 = 2;
-  required int32 field4019 = 3;
-  required int32 field4020 = 4;
-}
-
-message Message6108 {}
-
-message Message5907 {
-  optional .benchmarks.google_message4.Message5903 field5967 = 1;
-  optional .benchmarks.google_message4.Message5903 field5968 = 2;
-  optional .benchmarks.google_message4.Message5903 field5969 = 3;
-  optional .benchmarks.google_message4.Message5903 field5970 = 4;
-}
-
-message UnusedEmptyMessage {}
-
-message Message5903 {
-  required int32 field5965 = 1;
-  optional .benchmarks.google_message4.Enum5904 field5966 = 2;
-}
diff --git a/libs/protobuf/benchmarks/datasets/google_message4/benchmark_message4_3.proto b/libs/protobuf/benchmarks/datasets/google_message4/benchmark_message4_3.proto
deleted file mode 100644
index 42e254b..0000000
--- a/libs/protobuf/benchmarks/datasets/google_message4/benchmark_message4_3.proto
+++ /dev/null
@@ -1,779 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto2";
-
-package benchmarks.google_message4;
-
-option cc_enable_arenas = true;
-option java_package = "com.google.protobuf.benchmarks";
-
-enum UnusedEnum {
-  UNUSED_ENUM_VALUE1 = 0;
-  UNUSED_ENUM_VALUE2 = 1;
-}
-
-enum Enum2593 {
-  ENUM_VALUE2594 = 0;
-  ENUM_VALUE2595 = 1;
-  ENUM_VALUE2596 = 2;
-  ENUM_VALUE2597 = 3;
-  ENUM_VALUE2598 = 4;
-  ENUM_VALUE2599 = 5;
-  ENUM_VALUE2600 = 6;
-  ENUM_VALUE2601 = 7;
-}
-
-enum Enum2834 {
-  ENUM_VALUE2835 = 0;
-  ENUM_VALUE2836 = 1;
-  ENUM_VALUE2837 = 2;
-}
-
-enum Enum2806 {
-  ENUM_VALUE2807 = 0;
-  ENUM_VALUE2808 = 1;
-  ENUM_VALUE2809 = 2;
-  ENUM_VALUE2810 = 3;
-  ENUM_VALUE2811 = 4;
-  ENUM_VALUE2812 = 5;
-  ENUM_VALUE2813 = 6;
-  ENUM_VALUE2814 = 7;
-  ENUM_VALUE2815 = 8;
-  ENUM_VALUE2816 = 9;
-  ENUM_VALUE2817 = 10;
-  ENUM_VALUE2818 = 11;
-  ENUM_VALUE2819 = 12;
-  ENUM_VALUE2820 = 13;
-  ENUM_VALUE2821 = 14;
-}
-
-enum Enum2851 {
-  option allow_alias = true;
-
-  ENUM_VALUE2852 = 0;
-  ENUM_VALUE2853 = 0;
-  ENUM_VALUE2854 = 1;
-  ENUM_VALUE2855 = 2;
-  ENUM_VALUE2856 = 3;
-  ENUM_VALUE2857 = 4;
-  ENUM_VALUE2858 = 5;
-  ENUM_VALUE2859 = 6;
-  ENUM_VALUE2860 = 7;
-  ENUM_VALUE2861 = 8;
-  ENUM_VALUE2862 = 9;
-  ENUM_VALUE2863 = 10;
-  ENUM_VALUE2864 = 11;
-  ENUM_VALUE2865 = 12;
-  ENUM_VALUE2866 = 13;
-  ENUM_VALUE2867 = 14;
-  ENUM_VALUE2868 = 15;
-  ENUM_VALUE2869 = 16;
-  ENUM_VALUE2870 = 17;
-  ENUM_VALUE2871 = 18;
-  ENUM_VALUE2872 = 19;
-  ENUM_VALUE2873 = 20;
-  ENUM_VALUE2874 = 21;
-  ENUM_VALUE2875 = 22;
-  ENUM_VALUE2876 = 23;
-  ENUM_VALUE2877 = 24;
-  ENUM_VALUE2878 = 25;
-  ENUM_VALUE2879 = 26;
-  ENUM_VALUE2880 = 27;
-  ENUM_VALUE2881 = 28;
-  ENUM_VALUE2882 = 29;
-  ENUM_VALUE2883 = 30;
-  ENUM_VALUE2884 = 31;
-  ENUM_VALUE2885 = 32;
-  ENUM_VALUE2886 = 33;
-  ENUM_VALUE2887 = 34;
-  ENUM_VALUE2888 = 35;
-  ENUM_VALUE2889 = 36;
-  ENUM_VALUE2890 = 37;
-  ENUM_VALUE2891 = 38;
-  ENUM_VALUE2892 = 39;
-  ENUM_VALUE2893 = 40;
-  ENUM_VALUE2894 = 41;
-  ENUM_VALUE2895 = 42;
-  ENUM_VALUE2896 = 43;
-  ENUM_VALUE2897 = 44;
-  ENUM_VALUE2898 = 45;
-  ENUM_VALUE2899 = 46;
-  ENUM_VALUE2900 = 47;
-  ENUM_VALUE2901 = 48;
-  ENUM_VALUE2902 = 49;
-  ENUM_VALUE2903 = 50;
-  ENUM_VALUE2904 = 51;
-  ENUM_VALUE2905 = 52;
-  ENUM_VALUE2906 = 53;
-  ENUM_VALUE2907 = 54;
-  ENUM_VALUE2908 = 55;
-  ENUM_VALUE2909 = 56;
-  ENUM_VALUE2910 = 57;
-  ENUM_VALUE2911 = 58;
-  ENUM_VALUE2912 = 59;
-  ENUM_VALUE2913 = 60;
-  ENUM_VALUE2914 = 61;
-  ENUM_VALUE2915 = 62;
-  ENUM_VALUE2916 = 63;
-  ENUM_VALUE2917 = 64;
-  ENUM_VALUE2918 = 65;
-  ENUM_VALUE2919 = 66;
-  ENUM_VALUE2920 = 67;
-  ENUM_VALUE2921 = 68;
-  ENUM_VALUE2922 = 69;
-  ENUM_VALUE2923 = 70;
-  ENUM_VALUE2924 = 71;
-  ENUM_VALUE2925 = 72;
-  ENUM_VALUE2926 = 73;
-  ENUM_VALUE2927 = 74;
-  ENUM_VALUE2928 = 75;
-  ENUM_VALUE2929 = 76;
-  ENUM_VALUE2930 = 77;
-  ENUM_VALUE2931 = 78;
-  ENUM_VALUE2932 = 79;
-  ENUM_VALUE2933 = 80;
-  ENUM_VALUE2934 = 81;
-  ENUM_VALUE2935 = 82;
-  ENUM_VALUE2936 = 83;
-  ENUM_VALUE2937 = 84;
-  ENUM_VALUE2938 = 85;
-  ENUM_VALUE2939 = 86;
-  ENUM_VALUE2940 = 87;
-  ENUM_VALUE2941 = 88;
-  ENUM_VALUE2942 = 89;
-  ENUM_VALUE2943 = 90;
-  ENUM_VALUE2944 = 91;
-  ENUM_VALUE2945 = 92;
-  ENUM_VALUE2946 = 93;
-  ENUM_VALUE2947 = 94;
-  ENUM_VALUE2948 = 95;
-  ENUM_VALUE2949 = 96;
-  ENUM_VALUE2950 = 97;
-  ENUM_VALUE2951 = 98;
-  ENUM_VALUE2952 = 99;
-  ENUM_VALUE2953 = 100;
-  ENUM_VALUE2954 = 101;
-  ENUM_VALUE2955 = 102;
-  ENUM_VALUE2956 = 103;
-  ENUM_VALUE2957 = 104;
-  ENUM_VALUE2958 = 105;
-  ENUM_VALUE2959 = 106;
-  ENUM_VALUE2960 = 107;
-  ENUM_VALUE2961 = 108;
-  ENUM_VALUE2962 = 109;
-  ENUM_VALUE2963 = 110;
-  ENUM_VALUE2964 = 111;
-  ENUM_VALUE2965 = 112;
-  ENUM_VALUE2966 = 113;
-  ENUM_VALUE2967 = 114;
-  ENUM_VALUE2968 = 115;
-  ENUM_VALUE2969 = 116;
-  ENUM_VALUE2970 = 117;
-  ENUM_VALUE2971 = 118;
-  ENUM_VALUE2972 = 119;
-}
-
-enum Enum2602 {
-  ENUM_VALUE2603 = 0;
-  ENUM_VALUE2604 = 1;
-  ENUM_VALUE2605 = 2;
-  ENUM_VALUE2606 = 3;
-  ENUM_VALUE2607 = 4;
-  ENUM_VALUE2608 = 5;
-  ENUM_VALUE2609 = 6;
-  ENUM_VALUE2610 = 7;
-  ENUM_VALUE2611 = 8;
-  ENUM_VALUE2612 = 9;
-  ENUM_VALUE2613 = 10;
-  ENUM_VALUE2614 = 11;
-}
-
-enum Enum3071 {
-  ENUM_VALUE3072 = 1;
-  ENUM_VALUE3073 = 2;
-  ENUM_VALUE3074 = 3;
-  ENUM_VALUE3075 = 4;
-  ENUM_VALUE3076 = 5;
-  ENUM_VALUE3077 = 6;
-  ENUM_VALUE3078 = 7;
-  ENUM_VALUE3079 = 8;
-  ENUM_VALUE3080 = 9;
-  ENUM_VALUE3081 = 10;
-  ENUM_VALUE3082 = 11;
-  ENUM_VALUE3083 = 12;
-  ENUM_VALUE3084 = 13;
-  ENUM_VALUE3085 = 14;
-  ENUM_VALUE3086 = 15;
-  ENUM_VALUE3087 = 16;
-  ENUM_VALUE3088 = 17;
-  ENUM_VALUE3089 = 18;
-  ENUM_VALUE3090 = 19;
-  ENUM_VALUE3091 = 20;
-  ENUM_VALUE3092 = 21;
-  ENUM_VALUE3093 = 22;
-  ENUM_VALUE3094 = 23;
-  ENUM_VALUE3095 = 24;
-  ENUM_VALUE3096 = 25;
-  ENUM_VALUE3097 = 26;
-  ENUM_VALUE3098 = 27;
-  ENUM_VALUE3099 = 28;
-}
-
-enum Enum3805 {
-  ENUM_VALUE3806 = 0;
-  ENUM_VALUE3807 = 1;
-  ENUM_VALUE3808 = 2;
-  ENUM_VALUE3809 = 3;
-  ENUM_VALUE3810 = 4;
-  ENUM_VALUE3811 = 5;
-  ENUM_VALUE3812 = 6;
-  ENUM_VALUE3813 = 7;
-  ENUM_VALUE3814 = 8;
-  ENUM_VALUE3815 = 9;
-  ENUM_VALUE3816 = 11;
-  ENUM_VALUE3817 = 10;
-}
-
-enum Enum3783 {
-  ENUM_VALUE3784 = 0;
-  ENUM_VALUE3785 = 1;
-  ENUM_VALUE3786 = 2;
-  ENUM_VALUE3787 = 3;
-  ENUM_VALUE3788 = 4;
-  ENUM_VALUE3789 = 5;
-  ENUM_VALUE3790 = 6;
-  ENUM_VALUE3791 = 7;
-  ENUM_VALUE3792 = 8;
-  ENUM_VALUE3793 = 9;
-  ENUM_VALUE3794 = 10;
-  ENUM_VALUE3795 = 11;
-  ENUM_VALUE3796 = 12;
-  ENUM_VALUE3797 = 13;
-  ENUM_VALUE3798 = 14;
-  ENUM_VALUE3799 = 15;
-  ENUM_VALUE3800 = 16;
-  ENUM_VALUE3801 = 20;
-  ENUM_VALUE3802 = 21;
-  ENUM_VALUE3803 = 50;
-}
-
-enum Enum3851 {
-  ENUM_VALUE3852 = 0;
-  ENUM_VALUE3853 = 1;
-  ENUM_VALUE3854 = 2;
-  ENUM_VALUE3855 = 3;
-  ENUM_VALUE3856 = 4;
-  ENUM_VALUE3857 = 5;
-  ENUM_VALUE3858 = 6;
-  ENUM_VALUE3859 = 7;
-  ENUM_VALUE3860 = 8;
-  ENUM_VALUE3861 = 9;
-  ENUM_VALUE3862 = 10;
-  ENUM_VALUE3863 = 11;
-  ENUM_VALUE3864 = 12;
-  ENUM_VALUE3865 = 13;
-  ENUM_VALUE3866 = 14;
-  ENUM_VALUE3867 = 15;
-  ENUM_VALUE3868 = 16;
-  ENUM_VALUE3869 = 17;
-}
-
-enum Enum5862 {
-  ENUM_VALUE5863 = 1;
-  ENUM_VALUE5864 = 2;
-  ENUM_VALUE5865 = 3;
-}
-
-enum Enum5868 {
-  ENUM_VALUE5869 = 0;
-  ENUM_VALUE5870 = 1;
-  ENUM_VALUE5871 = 2;
-  ENUM_VALUE5872 = 3;
-}
-
-enum Enum5873 {
-  ENUM_VALUE5874 = 0;
-  ENUM_VALUE5875 = 1;
-  ENUM_VALUE5876 = 2;
-}
-
-enum Enum5904 {
-  ENUM_VALUE5905 = 0;
-  ENUM_VALUE5906 = 1;
-}
-
-enum Enum5909 {
-  ENUM_VALUE5910 = 0;
-  ENUM_VALUE5911 = 1;
-}
-
-enum Enum5912 {
-  ENUM_VALUE5913 = 0;
-  ENUM_VALUE5914 = 1;
-}
-
-enum Enum5915 {
-  ENUM_VALUE5916 = 0;
-  ENUM_VALUE5917 = 1;
-  ENUM_VALUE5918 = 2;
-  ENUM_VALUE5919 = 3;
-}
-
-enum Enum5920 {
-  ENUM_VALUE5921 = 0;
-  ENUM_VALUE5922 = 1;
-}
-
-enum Enum5923 {
-  ENUM_VALUE5924 = 0;
-  ENUM_VALUE5925 = 1;
-  ENUM_VALUE5926 = 2;
-  ENUM_VALUE5927 = 3;
-}
-
-enum Enum5928 {
-  ENUM_VALUE5929 = 0;
-  ENUM_VALUE5930 = 1;
-}
-
-enum Enum5931 {
-  ENUM_VALUE5932 = 0;
-  ENUM_VALUE5933 = 1;
-  ENUM_VALUE5934 = 2;
-}
-
-enum Enum5935 {
-  ENUM_VALUE5936 = 0;
-  ENUM_VALUE5937 = 1;
-  ENUM_VALUE5938 = 2;
-}
-
-enum Enum5939 {
-  ENUM_VALUE5940 = 0;
-  ENUM_VALUE5941 = 1;
-  ENUM_VALUE5942 = 2;
-  ENUM_VALUE5943 = 3;
-  ENUM_VALUE5944 = 4;
-  ENUM_VALUE5945 = 5;
-}
-
-enum Enum5946 {
-  ENUM_VALUE5947 = 0;
-  ENUM_VALUE5948 = 1;
-  ENUM_VALUE5949 = 2;
-  ENUM_VALUE5950 = 3;
-  ENUM_VALUE5951 = 4;
-  ENUM_VALUE5952 = 5;
-  ENUM_VALUE5953 = 6;
-  ENUM_VALUE5954 = 7;
-  ENUM_VALUE5955 = 8;
-  ENUM_VALUE5956 = 9;
-}
-
-enum Enum5957 {
-  ENUM_VALUE5958 = 0;
-  ENUM_VALUE5959 = 1;
-  ENUM_VALUE5960 = 2;
-  ENUM_VALUE5961 = 3;
-}
-
-enum Enum5962 {
-  ENUM_VALUE5963 = 0;
-  ENUM_VALUE5964 = 1;
-}
-
-enum Enum6025 {
-  ENUM_VALUE6026 = 0;
-  ENUM_VALUE6027 = 1;
-  ENUM_VALUE6028 = 2;
-  ENUM_VALUE6029 = 3;
-  ENUM_VALUE6030 = 4;
-  ENUM_VALUE6031 = 5;
-  ENUM_VALUE6032 = 6;
-  ENUM_VALUE6033 = 7;
-  ENUM_VALUE6034 = 8;
-  ENUM_VALUE6035 = 9;
-  ENUM_VALUE6036 = 10;
-  ENUM_VALUE6037 = 11;
-  ENUM_VALUE6038 = 12;
-  ENUM_VALUE6039 = 13;
-  ENUM_VALUE6040 = 14;
-  ENUM_VALUE6041 = 15;
-  ENUM_VALUE6042 = 16;
-  ENUM_VALUE6043 = 17;
-  ENUM_VALUE6044 = 18;
-  ENUM_VALUE6045 = 19;
-  ENUM_VALUE6046 = 20;
-  ENUM_VALUE6047 = 21;
-}
-
-enum Enum6111 {
-  ENUM_VALUE6112 = 1;
-  ENUM_VALUE6113 = 2;
-  ENUM_VALUE6114 = 3;
-  ENUM_VALUE6115 = 4;
-  ENUM_VALUE6116 = 5;
-  ENUM_VALUE6117 = 6;
-  ENUM_VALUE6118 = 7;
-  ENUM_VALUE6119 = 8;
-  ENUM_VALUE6120 = 9;
-  ENUM_VALUE6121 = 10;
-  ENUM_VALUE6122 = 11;
-  ENUM_VALUE6123 = 12;
-  ENUM_VALUE6124 = 13;
-  ENUM_VALUE6125 = 14;
-}
-
-enum Enum6065 {
-  ENUM_VALUE6066 = 0;
-  ENUM_VALUE6067 = 1;
-  ENUM_VALUE6068 = 2;
-  ENUM_VALUE6069 = 3;
-  ENUM_VALUE6070 = 4;
-  ENUM_VALUE6071 = 5;
-  ENUM_VALUE6072 = 6;
-  ENUM_VALUE6073 = 7;
-  ENUM_VALUE6074 = 8;
-  ENUM_VALUE6075 = 9;
-  ENUM_VALUE6076 = 10;
-  ENUM_VALUE6077 = 11;
-  ENUM_VALUE6078 = 12;
-  ENUM_VALUE6079 = 13;
-  ENUM_VALUE6080 = 14;
-}
-
-enum Enum6130 {
-  ENUM_VALUE6131 = 0;
-  ENUM_VALUE6132 = 1;
-}
-
-enum Enum6579 {
-  ENUM_VALUE6580 = 0;
-  ENUM_VALUE6581 = 2;
-  ENUM_VALUE6582 = 3;
-  ENUM_VALUE6583 = 5;
-  ENUM_VALUE6584 = 10;
-  ENUM_VALUE6585 = 15;
-  ENUM_VALUE6586 = 25;
-  ENUM_VALUE6587 = 30;
-}
-
-enum Enum6588 {
-  ENUM_VALUE6589 = 0;
-  ENUM_VALUE6590 = 1;
-  ENUM_VALUE6591 = 2;
-  ENUM_VALUE6592 = 3;
-  ENUM_VALUE6593 = 4;
-  ENUM_VALUE6594 = 5;
-  ENUM_VALUE6595 = 6;
-  ENUM_VALUE6596 = 7;
-  ENUM_VALUE6597 = 8;
-  ENUM_VALUE6598 = 9;
-  ENUM_VALUE6599 = 10;
-  ENUM_VALUE6600 = 11;
-  ENUM_VALUE6601 = 12;
-  ENUM_VALUE6602 = 13;
-  ENUM_VALUE6603 = 14;
-  ENUM_VALUE6604 = 15;
-  ENUM_VALUE6605 = 16;
-  ENUM_VALUE6606 = 17;
-  ENUM_VALUE6607 = 19;
-  ENUM_VALUE6608 = 20;
-  ENUM_VALUE6609 = 21;
-  ENUM_VALUE6610 = 22;
-  ENUM_VALUE6611 = 23;
-  ENUM_VALUE6612 = 24;
-  ENUM_VALUE6613 = 25;
-  ENUM_VALUE6614 = 26;
-  ENUM_VALUE6615 = 27;
-  ENUM_VALUE6616 = 28;
-  ENUM_VALUE6617 = 29;
-  ENUM_VALUE6618 = 30;
-  ENUM_VALUE6619 = 31;
-  ENUM_VALUE6620 = 32;
-  ENUM_VALUE6621 = 33;
-  ENUM_VALUE6622 = 34;
-}
-
-enum Enum7288 {
-  ENUM_VALUE7289 = 0;
-  ENUM_VALUE7290 = 1;
-  ENUM_VALUE7291 = 2;
-  ENUM_VALUE7292 = 3;
-}
-
-enum Enum7512 {
-  ENUM_VALUE7513 = 0;
-  ENUM_VALUE7514 = 1;
-  ENUM_VALUE7515 = 2;
-  ENUM_VALUE7516 = 3;
-  ENUM_VALUE7517 = 4;
-  ENUM_VALUE7518 = 5;
-  ENUM_VALUE7519 = 6;
-  ENUM_VALUE7520 = 7;
-}
-
-enum Enum7922 {
-  ENUM_VALUE7923 = 1;
-  ENUM_VALUE7924 = 2;
-  ENUM_VALUE7925 = 3;
-  ENUM_VALUE7926 = 4;
-  ENUM_VALUE7927 = 5;
-}
-
-enum Enum3476 {
-  ENUM_VALUE3477 = 0;
-  ENUM_VALUE3478 = 1;
-  ENUM_VALUE3479 = 2;
-  ENUM_VALUE3480 = 3;
-  ENUM_VALUE3481 = 4;
-  ENUM_VALUE3482 = 5;
-  ENUM_VALUE3483 = 6;
-  ENUM_VALUE3484 = 7;
-  ENUM_VALUE3485 = 8;
-  ENUM_VALUE3486 = 9;
-  ENUM_VALUE3487 = 10;
-  ENUM_VALUE3488 = 11;
-  ENUM_VALUE3489 = 12;
-  ENUM_VALUE3490 = 13;
-  ENUM_VALUE3491 = 14;
-  ENUM_VALUE3492 = 15;
-  ENUM_VALUE3493 = 16;
-  ENUM_VALUE3494 = 17;
-  ENUM_VALUE3495 = 18;
-  ENUM_VALUE3496 = 19;
-  ENUM_VALUE3497 = 20;
-  ENUM_VALUE3498 = 21;
-  ENUM_VALUE3499 = 22;
-  ENUM_VALUE3500 = 23;
-  ENUM_VALUE3501 = 24;
-  ENUM_VALUE3502 = 25;
-  ENUM_VALUE3503 = 26;
-  ENUM_VALUE3504 = 27;
-  ENUM_VALUE3505 = 28;
-  ENUM_VALUE3506 = 29;
-  ENUM_VALUE3507 = 30;
-  ENUM_VALUE3508 = 31;
-  ENUM_VALUE3509 = 32;
-  ENUM_VALUE3510 = 33;
-  ENUM_VALUE3511 = 34;
-  ENUM_VALUE3512 = 35;
-  ENUM_VALUE3513 = 36;
-  ENUM_VALUE3514 = 37;
-  ENUM_VALUE3515 = 38;
-  ENUM_VALUE3516 = 39;
-  ENUM_VALUE3517 = 40;
-  ENUM_VALUE3518 = 41;
-  ENUM_VALUE3519 = 42;
-  ENUM_VALUE3520 = 43;
-  ENUM_VALUE3521 = 44;
-  ENUM_VALUE3522 = 45;
-  ENUM_VALUE3523 = 46;
-  ENUM_VALUE3524 = 47;
-  ENUM_VALUE3525 = 48;
-  ENUM_VALUE3526 = 49;
-  ENUM_VALUE3527 = 50;
-  ENUM_VALUE3528 = 51;
-  ENUM_VALUE3529 = 52;
-  ENUM_VALUE3530 = 53;
-  ENUM_VALUE3531 = 54;
-  ENUM_VALUE3532 = 55;
-  ENUM_VALUE3533 = 56;
-  ENUM_VALUE3534 = 57;
-  ENUM_VALUE3535 = 58;
-  ENUM_VALUE3536 = 59;
-  ENUM_VALUE3537 = 60;
-  ENUM_VALUE3538 = 61;
-  ENUM_VALUE3539 = 62;
-  ENUM_VALUE3540 = 63;
-  ENUM_VALUE3541 = 64;
-  ENUM_VALUE3542 = 65;
-  ENUM_VALUE3543 = 66;
-  ENUM_VALUE3544 = 67;
-  ENUM_VALUE3545 = 68;
-  ENUM_VALUE3546 = 69;
-  ENUM_VALUE3547 = 70;
-  ENUM_VALUE3548 = 71;
-  ENUM_VALUE3549 = 72;
-  ENUM_VALUE3550 = 73;
-  ENUM_VALUE3551 = 74;
-  ENUM_VALUE3552 = 75;
-  ENUM_VALUE3553 = 76;
-  ENUM_VALUE3554 = 77;
-  ENUM_VALUE3555 = 78;
-  ENUM_VALUE3556 = 79;
-  ENUM_VALUE3557 = 80;
-  ENUM_VALUE3558 = 81;
-  ENUM_VALUE3559 = 82;
-  ENUM_VALUE3560 = 83;
-  ENUM_VALUE3561 = 84;
-  ENUM_VALUE3562 = 85;
-  ENUM_VALUE3563 = 86;
-  ENUM_VALUE3564 = 87;
-  ENUM_VALUE3565 = 88;
-  ENUM_VALUE3566 = 89;
-  ENUM_VALUE3567 = 90;
-  ENUM_VALUE3568 = 91;
-  ENUM_VALUE3569 = 92;
-  ENUM_VALUE3570 = 93;
-  ENUM_VALUE3571 = 94;
-  ENUM_VALUE3572 = 95;
-  ENUM_VALUE3573 = 96;
-  ENUM_VALUE3574 = 97;
-  ENUM_VALUE3575 = 98;
-  ENUM_VALUE3576 = 99;
-  ENUM_VALUE3577 = 100;
-  ENUM_VALUE3578 = 101;
-  ENUM_VALUE3579 = 102;
-  ENUM_VALUE3580 = 103;
-  ENUM_VALUE3581 = 104;
-  ENUM_VALUE3582 = 105;
-  ENUM_VALUE3583 = 106;
-  ENUM_VALUE3584 = 107;
-  ENUM_VALUE3585 = 108;
-  ENUM_VALUE3586 = 109;
-  ENUM_VALUE3587 = 110;
-  ENUM_VALUE3588 = 111;
-  ENUM_VALUE3589 = 112;
-  ENUM_VALUE3590 = 113;
-  ENUM_VALUE3591 = 114;
-  ENUM_VALUE3592 = 115;
-  ENUM_VALUE3593 = 116;
-  ENUM_VALUE3594 = 117;
-  ENUM_VALUE3595 = 118;
-  ENUM_VALUE3596 = 119;
-  ENUM_VALUE3597 = 120;
-  ENUM_VALUE3598 = 121;
-  ENUM_VALUE3599 = 122;
-  ENUM_VALUE3600 = 123;
-  ENUM_VALUE3601 = 124;
-  ENUM_VALUE3602 = 125;
-  ENUM_VALUE3603 = 126;
-  ENUM_VALUE3604 = 127;
-  ENUM_VALUE3605 = 128;
-  ENUM_VALUE3606 = 129;
-  ENUM_VALUE3607 = 130;
-  ENUM_VALUE3608 = 131;
-  ENUM_VALUE3609 = 132;
-  ENUM_VALUE3610 = 133;
-  ENUM_VALUE3611 = 134;
-  ENUM_VALUE3612 = 135;
-  ENUM_VALUE3613 = 136;
-  ENUM_VALUE3614 = 137;
-  ENUM_VALUE3615 = 138;
-  ENUM_VALUE3616 = 139;
-  ENUM_VALUE3617 = 140;
-  ENUM_VALUE3618 = 141;
-  ENUM_VALUE3619 = 142;
-  ENUM_VALUE3620 = 143;
-  ENUM_VALUE3621 = 144;
-  ENUM_VALUE3622 = 145;
-  ENUM_VALUE3623 = 146;
-  ENUM_VALUE3624 = 147;
-  ENUM_VALUE3625 = 148;
-  ENUM_VALUE3626 = 149;
-  ENUM_VALUE3627 = 150;
-  ENUM_VALUE3628 = 151;
-  ENUM_VALUE3629 = 152;
-  ENUM_VALUE3630 = 153;
-  ENUM_VALUE3631 = 154;
-  ENUM_VALUE3632 = 155;
-  ENUM_VALUE3633 = 156;
-  ENUM_VALUE3634 = 157;
-  ENUM_VALUE3635 = 158;
-  ENUM_VALUE3636 = 159;
-  ENUM_VALUE3637 = 160;
-  ENUM_VALUE3638 = 161;
-  ENUM_VALUE3639 = 162;
-  ENUM_VALUE3640 = 163;
-  ENUM_VALUE3641 = 164;
-  ENUM_VALUE3642 = 165;
-  ENUM_VALUE3643 = 166;
-  ENUM_VALUE3644 = 167;
-  ENUM_VALUE3645 = 168;
-  ENUM_VALUE3646 = 169;
-  ENUM_VALUE3647 = 170;
-  ENUM_VALUE3648 = 171;
-  ENUM_VALUE3649 = 172;
-  ENUM_VALUE3650 = 173;
-  ENUM_VALUE3651 = 174;
-  ENUM_VALUE3652 = 175;
-  ENUM_VALUE3653 = 176;
-  ENUM_VALUE3654 = 177;
-  ENUM_VALUE3655 = 178;
-  ENUM_VALUE3656 = 179;
-  ENUM_VALUE3657 = 180;
-  ENUM_VALUE3658 = 181;
-  ENUM_VALUE3659 = 182;
-  ENUM_VALUE3660 = 183;
-}
-
-enum Enum10325 {
-  ENUM_VALUE10326 = 0;
-  ENUM_VALUE10327 = 1;
-  ENUM_VALUE10328 = 2;
-  ENUM_VALUE10329 = 3;
-  ENUM_VALUE10330 = 4;
-  ENUM_VALUE10331 = 5;
-  ENUM_VALUE10332 = 6;
-  ENUM_VALUE10333 = 7;
-  ENUM_VALUE10334 = 8;
-}
-
-enum Enum10335 { ENUM_VALUE10336 = 0; }
-
-enum Enum10337 {
-  ENUM_VALUE10338 = 0;
-  ENUM_VALUE10339 = 1;
-}
-
-enum Enum11901 {
-  ENUM_VALUE11902 = 0;
-  ENUM_VALUE11903 = 1;
-  ENUM_VALUE11904 = 2;
-  ENUM_VALUE11905 = 3;
-}
-
-enum Enum12735 {
-  ENUM_VALUE12736 = 0;
-  ENUM_VALUE12737 = 1;
-  ENUM_VALUE12738 = 2;
-  ENUM_VALUE12739 = 3;
-}
-
-enum Enum12871 {
-  ENUM_VALUE12872 = 1;
-  ENUM_VALUE12873 = 2;
-  ENUM_VALUE12874 = 3;
-  ENUM_VALUE12875 = 4;
-  ENUM_VALUE12876 = 5;
-  ENUM_VALUE12877 = 6;
-}
diff --git a/libs/protobuf/benchmarks/go/go_benchmark_test.go b/libs/protobuf/benchmarks/go/go_benchmark_test.go
deleted file mode 100644
index 8c741b7..0000000
--- a/libs/protobuf/benchmarks/go/go_benchmark_test.go
+++ /dev/null
@@ -1,124 +0,0 @@
-package main
-
-import (
-	benchmarkWrapper "../tmp"
-	googleMessage1Proto2 "../tmp/datasets/google_message1/proto2"
-	googleMessage1Proto3 "../tmp/datasets/google_message1/proto3"
-	googleMessage2 "../tmp/datasets/google_message2"
-	googleMessage3 "../tmp/datasets/google_message3"
-	googleMessage4 "../tmp/datasets/google_message4"
-	"flag"
-	"github.com/golang/protobuf/proto"
-	"io/ioutil"
-	"testing"
-)
-
-// Data is returned by the Load function.
-type Dataset struct {
-	name        string
-	newMessage  func() proto.Message
-	marshaled   [][]byte
-	unmarshaled []proto.Message
-}
-
-var datasets []Dataset
-
-// This is used to getDefaultInstance for a message type.
-func generateNewMessageFunction(dataset benchmarkWrapper.BenchmarkDataset) func() proto.Message {
-	switch dataset.MessageName {
-	case "benchmarks.proto3.GoogleMessage1":
-		return func() proto.Message { return new(googleMessage1Proto3.GoogleMessage1) }
-	case "benchmarks.proto2.GoogleMessage1":
-		return func() proto.Message { return new(googleMessage1Proto2.GoogleMessage1) }
-	case "benchmarks.proto2.GoogleMessage2":
-		return func() proto.Message { return new(googleMessage2.GoogleMessage2) }
-	case "benchmarks.google_message3.GoogleMessage3":
-		return func() proto.Message { return new(googleMessage3.GoogleMessage3) }
-	case "benchmarks.google_message4.GoogleMessage4":
-		return func() proto.Message { return new(googleMessage4.GoogleMessage4) }
-	default:
-		panic("Unknown message type: " + dataset.MessageName)
-	}
-}
-
-func init() {
-	flag.Parse()
-	for _, f := range flag.Args() {
-		// Load the benchmark.
-		b, err := ioutil.ReadFile(f)
-		if err != nil {
-			panic(err)
-		}
-
-		// Parse the benchmark.
-		var dm benchmarkWrapper.BenchmarkDataset
-		if err := proto.Unmarshal(b, &dm); err != nil {
-			panic(err)
-		}
-
-		// Determine the concrete protobuf message type to use.
-		var ds Dataset
-		ds.newMessage = generateNewMessageFunction(dm)
-
-		// Unmarshal each test message.
-		for _, payload := range dm.Payload {
-			ds.marshaled = append(ds.marshaled, payload)
-			m := ds.newMessage()
-			if err := proto.Unmarshal(payload, m); err != nil {
-				panic(err)
-			}
-			ds.unmarshaled = append(ds.unmarshaled, m)
-		}
-		ds.name = f
-
-		datasets = append(datasets, ds)
-	}
-}
-
-func Benchmark(b *testing.B) {
-	for _, ds := range datasets {
-		b.Run(ds.name, func(b *testing.B) {
-			b.Run("Unmarshal", func(b *testing.B) {
-				for i := 0; i < b.N; i++ {
-					for j, payload := range ds.marshaled {
-						out := ds.newMessage()
-						if err := proto.Unmarshal(payload, out); err != nil {
-							b.Fatalf("can't unmarshal message %d %v", j, err)
-						}
-					}
-				}
-			})
-			b.Run("Marshal", func(b *testing.B) {
-				for i := 0; i < b.N; i++ {
-					for j, m := range ds.unmarshaled {
-						if _, err := proto.Marshal(m); err != nil {
-							b.Fatalf("can't marshal message %d %+v: %v", j, m, err)
-						}
-					}
-				}
-			})
-			b.Run("Size", func(b *testing.B) {
-				for i := 0; i < b.N; i++ {
-					for _, m := range ds.unmarshaled {
-						proto.Size(m)
-					}
-				}
-			})
-			b.Run("Clone", func(b *testing.B) {
-				for i := 0; i < b.N; i++ {
-					for _, m := range ds.unmarshaled {
-						proto.Clone(m)
-					}
-				}
-			})
-			b.Run("Merge", func(b *testing.B) {
-				for i := 0; i < b.N; i++ {
-					for _, m := range ds.unmarshaled {
-						out := ds.newMessage()
-						proto.Merge(out, m)
-					}
-				}
-			})
-		})
-	}
-}
diff --git a/libs/protobuf/benchmarks/google_size.proto b/libs/protobuf/benchmarks/google_size.proto
deleted file mode 100644
index d2d319f..0000000
--- a/libs/protobuf/benchmarks/google_size.proto
+++ /dev/null
@@ -1,138 +0,0 @@
-syntax = "proto2";
-
-package benchmarks;
-
-option java_outer_classname = "GoogleSize";
-option optimize_for = CODE_SIZE;
-
-message SizeMessage1 {
-  required string field1 = 1;
-  optional string field9 = 9;
-  optional string field18 = 18;
-  optional bool field80 = 80 [default=false];
-  optional bool field81 = 81 [default=true];
-  required int32 field2 = 2;
-  required int32 field3 = 3;
-  optional int32 field280 = 280;
-  optional int32 field6 = 6 [default=0];
-  optional int64 field22 = 22;
-  optional string field4 = 4;
-  repeated fixed64 field5 = 5;
-  optional bool field59 = 59 [default=false];
-  optional string field7 = 7;
-  optional int32 field16 = 16;
-  optional int32 field130 = 130 [default=0];
-  optional bool field12 = 12 [default=true];
-  optional bool field17 = 17 [default=true];
-  optional bool field13 = 13 [default=true];
-  optional bool field14 = 14 [default=true];
-  optional int32 field104 = 104 [default=0];
-  optional int32 field100 = 100 [default=0];
-  optional int32 field101 = 101 [default=0];
-  optional string field102 = 102;
-  optional string field103 = 103;
-  optional int32 field29 = 29 [default=0];
-  optional bool field30 = 30 [default=false];
-  optional int32 field60 = 60 [default=-1];
-  optional int32 field271 = 271 [default=-1];
-  optional int32 field272 = 272 [default=-1];
-  optional int32 field150 = 150;
-  optional int32 field23 = 23 [default=0];
-  optional bool field24 = 24 [default=false];
-  optional int32 field25 = 25 [default=0];
-  optional SizeMessage1SubMessage field15 = 15;
-  optional bool field78 = 78;
-  optional int32 field67 = 67 [default=0];
-  optional int32 field68 = 68;
-  optional int32 field128 = 128 [default=0];
-  optional string field129 = 129 [default="xxxxxxxxxxxxxxxxxxxxx"];
-  optional int32 field131 = 131 [default=0];
-}
-
-message SizeMessage1SubMessage {
-  optional int32 field1 = 1 [default=0];
-  optional int32 field2 = 2 [default=0];
-  optional int32 field3 = 3 [default=0];
-  optional string field15 = 15;
-  optional bool field12 = 12 [default=true];
-  optional int64 field13 = 13;
-  optional int64 field14 = 14;
-  optional int32 field16 = 16;
-  optional int32 field19 = 19 [default=2];
-  optional bool field20  = 20 [default=true];
-  optional bool field28 = 28 [default=true];
-  optional fixed64 field21 = 21;
-  optional int32 field22 = 22;
-  optional bool field23 = 23 [ default=false ];
-  optional bool field206 = 206 [default=false];
-  optional fixed32 field203 = 203;
-  optional int32 field204 = 204;
-  optional string field205 = 205;
-  optional uint64 field207 = 207;
-  optional uint64 field300 = 300;
-}
-
-message SizeMessage2 {
-  optional string field1 = 1;
-  optional int64 field3 = 3;
-  optional int64 field4 = 4;
-  optional int64 field30 = 30;
-  optional bool field75  = 75 [default=false];
-  optional string field6 = 6;
-  optional bytes field2 = 2;
-  optional int32 field21 = 21 [default=0];
-  optional int32 field71 = 71;
-  optional float field25 = 25;
-  optional int32 field109 = 109 [default=0];
-  optional int32 field210 = 210 [default=0];
-  optional int32 field211 = 211 [default=0];
-  optional int32 field212 = 212 [default=0];
-  optional int32 field213 = 213 [default=0];
-  optional int32 field216 = 216 [default=0];
-  optional int32 field217 = 217 [default=0];
-  optional int32 field218 = 218 [default=0];
-  optional int32 field220 = 220 [default=0];
-  optional int32 field221 = 221 [default=0];
-  optional float field222 = 222 [default=0.0];
-  optional int32 field63 = 63;
-
-  repeated group Group1 = 10 {
-    required float field11 = 11;
-    optional float field26 = 26;
-    optional string field12 = 12;
-    optional string field13 = 13;
-    repeated string field14 = 14;
-    required uint64 field15 = 15;
-    optional int32 field5 = 5;
-    optional string field27 = 27;
-    optional int32 field28 = 28;
-    optional string field29 = 29;
-    optional string field16 = 16;
-    repeated string field22 = 22;
-    repeated int32 field73 = 73;
-    optional int32 field20 = 20 [default=0];
-    optional string field24 = 24;
-    optional SizeMessage2GroupedMessage field31 = 31;
-  }
-  repeated string field128 = 128;
-  optional int64 field131 = 131;
-  repeated string field127 = 127;
-  optional int32 field129 = 129;
-  repeated int64 field130 = 130;
-  optional bool field205 = 205 [default=false];
-  optional bool field206 = 206 [default=false];
-}
-
-message SizeMessage2GroupedMessage {
-  optional float field1 = 1;
-  optional float field2 = 2;
-  optional float field3 = 3 [default=0.0];
-  optional bool field4 = 4;
-  optional bool field5 = 5;
-  optional bool field6 = 6 [default=true];
-  optional bool field7 = 7 [default=false];
-  optional float field8 = 8;
-  optional bool field9 = 9;
-  optional float field10 = 10;
-  optional int64 field11 = 11;
-}
diff --git a/libs/protobuf/benchmarks/java/pom.xml b/libs/protobuf/benchmarks/java/pom.xml
deleted file mode 100644
index c0dc940..0000000
--- a/libs/protobuf/benchmarks/java/pom.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>protobuf-java-benchmark</artifactId>
-  <groupId>com.google.protobuf</groupId>
-  <version>1.0.0</version>
-  <name>Protocol Buffers [Benchmark]</name>
-  <description>The benchmark tools for Protobuf Java.</description>
-
-  <dependencies>
-    <dependency>
-      <groupId>com.google.protobuf</groupId>
-      <artifactId>protobuf-java</artifactId>
-      <version>${protobuf.version}</version>
-      <type>jar</type>
-      <scope>system</scope>
-      <systemPath>${project.basedir}/lib/protobuf-java.jar</systemPath>
-    </dependency>
-    <dependency>
-      <groupId>com.google.caliper</groupId>
-      <artifactId>caliper</artifactId>
-      <version>1.0-beta-3</version>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-assembly-plugin</artifactId>
-          <version>2.4.1</version>
-          <configuration>
-            <!-- get all project dependencies -->
-            <descriptorRefs>
-              <descriptorRef>jar-with-dependencies</descriptorRef>
-            </descriptorRefs>
-            <!-- MainClass in mainfest make a executable jar -->
-            <archive>
-              <manifest>
-                <mainClass>com.mkyong.core.utils.App</mainClass>
-              </manifest>
-            </archive>
-          </configuration>
-          <executions>
-            <execution>
-              <id>make-assembly</id>
-              <!-- bind to the packaging phase -->
-              <phase>package</phase>
-              <goals>
-                <goal>single</goal>
-              </goals>
-            </execution>
-          </executions>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-compiler-plugin</artifactId>
-          <version>3.5.1</version>
-          <configuration>
-            <source>1.8</source>
-            <target>1.8</target>
-          </configuration>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-jar-plugin</artifactId>
-          <version>2.5</version>
-          <configuration>
-            <archive>
-              <manifest>
-                <addClasspath>true</addClasspath>
-                <mainClass>com.google.protocolbuffers.ProtoBench</mainClass>
-              </manifest>
-            </archive>
-          </configuration>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-source-plugin</artifactId>
-          <version>2.4</version>
-          <executions>
-            <execution>
-              <id>attach-sources</id>
-              <goals>
-                <goal>jar-no-fork</goal>
-              </goals>
-            </execution>
-          </executions>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
-</project>
-
diff --git a/libs/protobuf/benchmarks/java/src/main/java/com/google/protobuf/ProtoCaliperBenchmark.java b/libs/protobuf/benchmarks/java/src/main/java/com/google/protobuf/ProtoCaliperBenchmark.java
deleted file mode 100644
index ef30749..0000000
--- a/libs/protobuf/benchmarks/java/src/main/java/com/google/protobuf/ProtoCaliperBenchmark.java
+++ /dev/null
@@ -1,208 +0,0 @@
-package com.google.protobuf;
-
-import com.google.caliper.BeforeExperiment;
-import com.google.caliper.Benchmark;
-import com.google.caliper.Param;
-import com.google.protobuf.benchmarks.Benchmarks.BenchmarkDataset;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.RandomAccessFile;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Basic benchmarks for Java protobuf parsing.
- */
-public class ProtoCaliperBenchmark {
-  public enum BenchmarkMessageType {
-    GOOGLE_MESSAGE1_PROTO3 {
-      @Override
-      ExtensionRegistry getExtensionRegistry() {
-        return ExtensionRegistry.newInstance();
-      }
-      @Override
-      Message getDefaultInstance() {
-        return com.google.protobuf.benchmarks.BenchmarkMessage1Proto3.GoogleMessage1
-            .getDefaultInstance();
-      }
-    },
-    GOOGLE_MESSAGE1_PROTO2 {
-      @Override ExtensionRegistry getExtensionRegistry() {
-        return ExtensionRegistry.newInstance();
-      }
-      @Override
-      Message getDefaultInstance() {
-        return com.google.protobuf.benchmarks.BenchmarkMessage1Proto2.GoogleMessage1
-            .getDefaultInstance();
-      }
-    },
-    GOOGLE_MESSAGE2 {
-      @Override
-      ExtensionRegistry getExtensionRegistry() {
-        return ExtensionRegistry.newInstance();
-      }
-      @Override
-      Message getDefaultInstance() {
-        return com.google.protobuf.benchmarks.BenchmarkMessage2.GoogleMessage2.getDefaultInstance();
-      }
-    },
-    GOOGLE_MESSAGE3 {
-      @Override
-      ExtensionRegistry getExtensionRegistry() {
-        ExtensionRegistry extensions = ExtensionRegistry.newInstance();
-        com.google.protobuf.benchmarks.BenchmarkMessage38.registerAllExtensions(extensions);
-        com.google.protobuf.benchmarks.BenchmarkMessage37.registerAllExtensions(extensions);
-        com.google.protobuf.benchmarks.BenchmarkMessage36.registerAllExtensions(extensions);
-        com.google.protobuf.benchmarks.BenchmarkMessage35.registerAllExtensions(extensions);
-        com.google.protobuf.benchmarks.BenchmarkMessage34.registerAllExtensions(extensions);
-        com.google.protobuf.benchmarks.BenchmarkMessage33.registerAllExtensions(extensions);
-        com.google.protobuf.benchmarks.BenchmarkMessage32.registerAllExtensions(extensions);
-        com.google.protobuf.benchmarks.BenchmarkMessage31.registerAllExtensions(extensions);
-        com.google.protobuf.benchmarks.BenchmarkMessage3.registerAllExtensions(extensions);
-        return extensions;
-      }
-      @Override
-      Message getDefaultInstance() {
-        return com.google.protobuf.benchmarks.BenchmarkMessage3.GoogleMessage3.getDefaultInstance();
-      }
-    },
-    GOOGLE_MESSAGE4 {
-      @Override
-      ExtensionRegistry getExtensionRegistry() {
-        ExtensionRegistry extensions = ExtensionRegistry.newInstance();
-        com.google.protobuf.benchmarks.BenchmarkMessage43.registerAllExtensions(extensions);
-        com.google.protobuf.benchmarks.BenchmarkMessage42.registerAllExtensions(extensions);
-        com.google.protobuf.benchmarks.BenchmarkMessage41.registerAllExtensions(extensions);
-        com.google.protobuf.benchmarks.BenchmarkMessage4.registerAllExtensions(extensions);
-        return extensions;
-      }
-      @Override
-      Message getDefaultInstance() {
-        return com.google.protobuf.benchmarks.BenchmarkMessage4.GoogleMessage4.getDefaultInstance();
-      }
-    };
-
-    abstract ExtensionRegistry getExtensionRegistry();
-    abstract Message getDefaultInstance();
-  }
-
-  private BenchmarkMessageType benchmarkMessageType;
-  @Param("")
-  private String dataFile;
-
-  private byte[] inputData;
-  private BenchmarkDataset benchmarkDataset;
-  private Message defaultMessage;
-  private ExtensionRegistry extensions;
-  private List<byte[]> inputDataList;
-  private List<ByteArrayInputStream> inputStreamList;
-  private List<ByteString> inputStringList;
-  private List<Message> sampleMessageList;
-
-  private BenchmarkMessageType getMessageType() throws IOException {
-    if (benchmarkDataset.getMessageName().equals("benchmarks.proto3.GoogleMessage1")) {
-      return BenchmarkMessageType.GOOGLE_MESSAGE1_PROTO3;
-    } else if (benchmarkDataset.getMessageName().equals("benchmarks.proto2.GoogleMessage1")) {
-      return BenchmarkMessageType.GOOGLE_MESSAGE1_PROTO2;
-    } else if (benchmarkDataset.getMessageName().equals("benchmarks.proto2.GoogleMessage2")) {
-      return BenchmarkMessageType.GOOGLE_MESSAGE2;
-    } else if (benchmarkDataset.getMessageName().
-        equals("benchmarks.google_message3.GoogleMessage3")) {
-      return BenchmarkMessageType.GOOGLE_MESSAGE3;
-    } else if (benchmarkDataset.getMessageName().
-        equals("benchmarks.google_message4.GoogleMessage4")) {
-      return BenchmarkMessageType.GOOGLE_MESSAGE4;
-    } else {
-      throw new IllegalStateException("Invalid DataFile! There's no testing message named "
-          + benchmarkDataset.getMessageName());
-    }
-  }
-
-  @BeforeExperiment
-  void setUp() throws IOException {
-    if (!dataFile.equals("")) {
-      RandomAccessFile file = new RandomAccessFile(new File(dataFile), "r");
-      inputData = new byte[(int) file.length()];
-      file.readFully(inputData);
-      benchmarkDataset = BenchmarkDataset.parseFrom(inputData);
-      benchmarkMessageType = getMessageType();
-    } else {
-      inputData = new byte[0];
-      benchmarkDataset = BenchmarkDataset.parseFrom(inputData);
-      benchmarkMessageType = BenchmarkMessageType.GOOGLE_MESSAGE2;
-    }
-    defaultMessage = benchmarkMessageType.getDefaultInstance();
-    extensions = benchmarkMessageType.getExtensionRegistry();
-    inputDataList = new ArrayList<byte[]>();
-    inputStreamList = new ArrayList<ByteArrayInputStream>();
-    inputStringList = new ArrayList<ByteString>();
-    sampleMessageList = new ArrayList<Message>();
-
-    for (int i = 0; i < benchmarkDataset.getPayloadCount(); i++) {
-      byte[] singleInputData = benchmarkDataset.getPayload(i).toByteArray();
-      inputDataList.add(benchmarkDataset.getPayload(i).toByteArray());
-      inputStreamList.add(new ByteArrayInputStream(
-          benchmarkDataset.getPayload(i).toByteArray()));
-      inputStringList.add(benchmarkDataset.getPayload(i));
-      sampleMessageList.add(
-          defaultMessage.newBuilderForType().mergeFrom(singleInputData, extensions).build());
-    }
-  }
-
-  @SuppressWarnings("IgnoredPureGetter")
-  @Benchmark
-  void serializeToByteArray(int reps) throws IOException {
-    if (sampleMessageList.size() == 0) {
-      return;
-    }
-    for (int i = 0; i < reps; i++) {
-      for (int j = 0; j < sampleMessageList.size(); j++) {
-        sampleMessageList.get(j).toByteArray();
-      }
-    }
-  }
-
-  @Benchmark
-  void serializeToMemoryStream(int reps) throws IOException {
-    if (sampleMessageList.size() == 0) {
-      return;
-    }
-    for (int i = 0; i < reps; i++) {
-      for (int j = 0; j < sampleMessageList.size(); j++) {
-        ByteArrayOutputStream output = new ByteArrayOutputStream();
-        sampleMessageList.get(j).writeTo(output);
-      }
-    }
-  }
-
-  @Benchmark
-  void deserializeFromByteArray(int reps) throws IOException {
-    if (inputDataList.size() == 0) {
-      return;
-    }
-    for (int i = 0; i < reps; i++) {
-      for (int j = 0; j < inputDataList.size(); j++) {
-        benchmarkMessageType.getDefaultInstance().getParserForType().parseFrom(
-          inputDataList.get(j), extensions);
-      }
-    }
-  }
-
-  @Benchmark
-  void deserializeFromMemoryStream(int reps) throws IOException {
-    if (inputStreamList.size() == 0) {
-      return;
-    }
-    for (int i = 0; i < reps; i++) {
-      for (int j = 0; j < inputStreamList.size(); j++) {
-        benchmarkMessageType.getDefaultInstance().getParserForType().parseFrom(
-            inputStreamList.get(j), extensions);
-        inputStreamList.get(j).reset();
-      }
-    }
-  }
-}
-
-
diff --git a/libs/protobuf/benchmarks/js/benchmark_suite.js b/libs/protobuf/benchmarks/js/benchmark_suite.js
deleted file mode 100644
index c5c3e51..0000000
--- a/libs/protobuf/benchmarks/js/benchmark_suite.js
+++ /dev/null
@@ -1,33 +0,0 @@
-var benchmark = require("benchmark");
-
-function newBenchmark(messageName, filename, language) {
-  var benches = [];
-  return {
-    suite: new benchmark.Suite(messageName + filename + language )
-      .on("add", function(event) {
-          benches.push(event.target);
-      })
-      .on("start", function() {
-          process.stdout.write(
-            "benchmarking message " + messageName
-            + " of dataset file " + filename
-            + "'s performance ..." + "\n\n");
-      })
-      .on("cycle", function(event) {
-          process.stdout.write(String(event.target) + "\n");
-      })
-      .on("complete", function() {
-          var getHz = function(bench) {
-            return 1 / (bench.stats.mean + bench.stats.moe);
-          }
-          benches.forEach(function(val, index) {
-            benches[index] = getHz(val);
-          });
-      }),
-     benches: benches
-  }
-}
-
-module.exports = {
-        newBenchmark: newBenchmark
-}
diff --git a/libs/protobuf/benchmarks/js/js_benchmark.js b/libs/protobuf/benchmarks/js/js_benchmark.js
deleted file mode 100644
index 9ba4828..0000000
--- a/libs/protobuf/benchmarks/js/js_benchmark.js
+++ /dev/null
@@ -1,82 +0,0 @@
-require('./datasets/google_message1/proto2/benchmark_message1_proto2_pb.js');
-require('./datasets/google_message1/proto3/benchmark_message1_proto3_pb.js');
-require('./datasets/google_message2/benchmark_message2_pb.js');
-require('./datasets/google_message3/benchmark_message3_pb.js');
-require('./datasets/google_message4/benchmark_message4_pb.js');
-require('./benchmarks_pb.js');
-
-var fs = require('fs');
-var benchmarkSuite = require("./benchmark_suite.js");
-
-
-function getNewPrototype(name) {
-  var message = eval("proto." + name);
-  if (typeof(message) == "undefined") {
-    throw "type " + name + " is undefined";
-  }
-  return message;
-}
-
-var results = [];
-var json_file = "";
-
-console.log("#####################################################");
-console.log("Js Benchmark: ");
-process.argv.forEach(function(filename, index) {
-  if (index < 2) {
-    return;
-  }
-  if (filename.indexOf("--json_output") != -1) {
-    json_file = filename.replace(/^--json_output=/, '');
-    return;
-  }
-
-  var benchmarkDataset =
-      proto.benchmarks.BenchmarkDataset.deserializeBinary(fs.readFileSync(filename));
-  var messageList = [];
-  var totalBytes = 0;
-  benchmarkDataset.getPayloadList().forEach(function(onePayload) {
-    var message = getNewPrototype(benchmarkDataset.getMessageName());
-    messageList.push(message.deserializeBinary(onePayload));
-    totalBytes += onePayload.length;
-  });
-
-  var scenarios = benchmarkSuite.newBenchmark(
-      benchmarkDataset.getMessageName(), filename, "js");
-  scenarios.suite
-  .add("js deserialize", function() {
-    benchmarkDataset.getPayloadList().forEach(function(onePayload) {
-      var protoType = getNewPrototype(benchmarkDataset.getMessageName());
-      protoType.deserializeBinary(onePayload);
-    });
-  })
-  .add("js serialize", function() {
-    var protoType = getNewPrototype(benchmarkDataset.getMessageName());
-    messageList.forEach(function(message) {
-      message.serializeBinary();
-    });
-  })
-  .run({"Async": false});
-
-  results.push({
-    filename: filename,
-    benchmarks: {
-      protobufjs_decoding: scenarios.benches[0] * totalBytes / 1024 / 1024,
-      protobufjs_encoding: scenarios.benches[1] * totalBytes / 1024 / 1024
-    }
-  })
-
-  console.log("Throughput for deserialize: "
-    + scenarios.benches[0] * totalBytes / 1024 / 1024 + "MB/s" );
-  console.log("Throughput for serialize: "
-    + scenarios.benches[1] * totalBytes / 1024 / 1024 + "MB/s" );
-  console.log("");
-});
-console.log("#####################################################");
-
-if (json_file != "") {
-  fs.writeFile(json_file, JSON.stringify(results), (err) => {
-    if (err) throw err;
-  });
-}
-
diff --git a/libs/protobuf/benchmarks/php/PhpBenchmark.php b/libs/protobuf/benchmarks/php/PhpBenchmark.php
deleted file mode 100644
index d3db61d..0000000
--- a/libs/protobuf/benchmarks/php/PhpBenchmark.php
+++ /dev/null
@@ -1,170 +0,0 @@
-<?php
-
-namespace Google\Protobuf\Benchmark;
-ini_set('memory_limit', '4096M');
-
-const NAME = "PhpBenchmark.php";
-
-function _require_all($dir, &$prefix) {
-    // require all php files
-    foreach (glob("$dir/*") as $path) {
-        if (preg_match('/\.php$/', $path) &&
-            substr($path, -strlen(NAME)) != NAME) {
-                require_once(substr($path, strlen($prefix) + 1));
-            } elseif (is_dir($path)) {
-                _require_all($path, $prefix);
-            }
-    }
-}
-// include all file
-foreach (explode(PATH_SEPARATOR, get_include_path()) as $one_include_path) {
-    _require_all($one_include_path, $one_include_path);
-}
-
-use Benchmarks\BenchmarkDataset;
-
-class BenchmarkMethod
-{
-    // $args[0]: dataset
-    // $args[1]: message class
-    static function parse(&$args) {
-        $payloads = $args[0]->getPayload();
-        for ($i = $payloads->count() - 1; $i >= 0; $i--) {
-            (new $args[1]())->mergeFromString($payloads->offsetGet($i));
-        }
-    }
-
-    // $args: array of message
-    static function serialize(&$args) {
-        foreach ($args as &$temp_message) {
-            $temp_message->serializeToString();
-        }
-    }
-}
-
-class Benchmark
-{
-    private $benchmark_name;
-    private $args;
-    private $benchmark_time;
-    private $total_bytes;
-    private $coefficient;
-
-    public function __construct($benchmark_name, $args, $total_bytes,
-        $benchmark_time = 5.0) {
-            $this->args = $args;
-            $this->benchmark_name = $benchmark_name;
-            $this->benchmark_time = $benchmark_time;
-            $this->total_bytes = $total_bytes;
-            $this->coefficient = pow (10, 0) / pow(2, 20);
-    }
-
-    public function runBenchmark() {
-        $t = $this->runBenchmarkWithTimes(1);
-        $times = ceil($this->benchmark_time / $t);
-        return $this->total_bytes * $times /
-        ($times == 1 ? $t : $this->runBenchmarkWithTimes($times)) *
-        $this->coefficient;
-    }
-
-    private function runBenchmarkWithTimes($times) {
-        $st = microtime(true);
-        for ($i = 0; $i < $times; $i++) {
-            call_user_func_array($this->benchmark_name, array(&$this->args));
-        }
-        $en = microtime(true);
-        return $en - $st;
-    }
-}
-
-function getMessageName(&$dataset) {
-    switch ($dataset->getMessageName()) {
-        case "benchmarks.proto3.GoogleMessage1":
-            return "\Benchmarks\Proto3\GoogleMessage1";
-        case "benchmarks.proto2.GoogleMessage1":
-            return "\Benchmarks\Proto2\GoogleMessage1";
-        case "benchmarks.proto2.GoogleMessage2":
-            return "\Benchmarks\Proto2\GoogleMessage2";
-        case "benchmarks.google_message3.GoogleMessage3":
-            return "\Benchmarks\Google_message3\GoogleMessage3";
-        case "benchmarks.google_message4.GoogleMessage4":
-            return "\Benchmarks\Google_message4\GoogleMessage4";
-        default:
-            exit("Message " . $dataset->getMessageName() . " not found !");
-    }
-}
-
-function runBenchmark($file, $behavior_prefix) {
-    $datafile = fopen($file, "r") or die("Unable to open file " . $file);
-    $bytes = fread($datafile, filesize($file));
-    $dataset = new BenchmarkDataset(NULL);
-    $dataset->mergeFromString($bytes);
-    $message_name = getMessageName($dataset);
-    $message_list = array();
-    $total_bytes = 0;
-    $payloads = $dataset->getPayload();
-    for ($i = $payloads->count() - 1; $i >= 0; $i--) {
-        $new_message = new $message_name();
-        $new_message->mergeFromString($payloads->offsetGet($i));
-        array_push($message_list, $new_message);
-        $total_bytes += strlen($payloads->offsetGet($i));
-    }
-
-    $parse_benchmark = new Benchmark(
-        "\Google\Protobuf\Benchmark\BenchmarkMethod::parse",
-        array($dataset, $message_name), $total_bytes);
-    $serialize_benchmark = new Benchmark(
-        "\Google\Protobuf\Benchmark\BenchmarkMethod::serialize",
-        $message_list, $total_bytes);
-
-    return array(
-        "filename" => $file,
-        "benchmarks" => array(
-            $behavior_prefix . "_parse" => $parse_benchmark->runBenchmark(),
-            $behavior_prefix . "_serailize" => $serialize_benchmark->runBenchmark()
-        ),
-        "message_name" => $dataset->getMessageName()
-    );
-}
-
-// main
-$json_output = false;
-$results = array();
-$behavior_prefix = "";
-
-foreach ($argv as $index => $arg) {
-    if ($index == 0) {
-        continue;
-    }
-    if ($arg == "--json") {
-        $json_output = true;
-    } else if (strpos($arg, "--behavior_prefix") == 0) {
-        $behavior_prefix = str_replace("--behavior_prefix=", "", $arg);
-    }
-}
-
-foreach ($argv as $index => $arg) {
-    if ($index == 0) {
-        continue;
-    }
-    if (substr($arg, 0, 2) == "--") {
-        continue;
-    } else {
-        array_push($results, runBenchmark($arg, $behavior_prefix));
-    }
-}
-
-if ($json_output) {
-    print json_encode($results);
-} else {
-    print "PHP protobuf benchmark result:\n\n";
-    foreach ($results as $result) {
-        printf("result for test data file: %s\n", $result["filename"]);
-        foreach ($result["benchmarks"] as $benchmark => $throughput) {
-            printf("   Throughput for benchmark %s: %.2f MB/s\n",
-                $benchmark, $throughput);
-        }
-    }
-}
-
-?>
diff --git a/libs/protobuf/benchmarks/php/autoload.php b/libs/protobuf/benchmarks/php/autoload.php
deleted file mode 100644
index 52a8741..0000000
--- a/libs/protobuf/benchmarks/php/autoload.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-define("GOOGLE_INTERNAL_NAMESPACE", "Google\\Protobuf\\Internal\\");
-define("GOOGLE_NAMESPACE", "Google\\Protobuf\\");
-define("GOOGLE_GPBMETADATA_NAMESPACE", "GPBMetadata\\Google\\Protobuf\\");
-define("BENCHMARK_NAMESPACE", "Benchmarks");
-define("BENCHMARK_GPBMETADATA_NAMESPACE", "GPBMetadata\\Benchmarks");
-
-function protobuf_autoloader_impl($class, $prefix, $include_path) {
-    $length = strlen($prefix);
-    if ((substr($class, 0, $length) === $prefix)) {
-        $path = $include_path . '/' . implode('/', array_map('ucwords', explode('\\', $class))) . '.php';
-        include_once $path;
-    }
-}
-
-function protobuf_autoloader($class) {
-    protobuf_autoloader_impl($class, GOOGLE_INTERNAL_NAMESPACE, getenv('PROTOBUF_PHP_SRCDIR'));
-    protobuf_autoloader_impl($class, GOOGLE_NAMESPACE, getenv('PROTOBUF_PHP_SRCDIR'));
-    protobuf_autoloader_impl($class, GOOGLE_GPBMETADATA_NAMESPACE, getenv('PROTOBUF_PHP_SRCDIR'));
-    protobuf_autoloader_impl($class, BENCHMARK_NAMESPACE, getenv('CURRENT_DIR'));
-    protobuf_autoloader_impl($class, BENCHMARK_GPBMETADATA_NAMESPACE, getenv('CURRENT_DIR'));
-}
-
-spl_autoload_register('protobuf_autoloader');
diff --git a/libs/protobuf/benchmarks/protobuf.js/generate_pbjs_files.js b/libs/protobuf/benchmarks/protobuf.js/generate_pbjs_files.js
deleted file mode 100644
index 11945bf..0000000
--- a/libs/protobuf/benchmarks/protobuf.js/generate_pbjs_files.js
+++ /dev/null
@@ -1,25 +0,0 @@
-var pbjs = require("./protobuf.js/cli").pbjs
-
-var argv = [];
-var protoFiles = [];
-var prefix = "";
-process.argv.forEach(function(val, index) {
-  var arg = val;
-  if (arg.length > 6 && arg.substring(arg.length - 6) == ".proto") {
-    protoFiles.push(arg);
-  } else if (arg.length > 15 && arg.substring(0, 15) ==  "--include_path=") {
-    prefix = arg.substring(15);
-  } else if (index >= 2) {
-    argv.push(arg);
-  }
-});
-protoFiles.forEach(function(val) {
-  argv.push(prefix + "/" + val);
-});
-
-pbjs.main(argv, function(err, output){
-  if (err) {
-    console.log(err);
-  }
-});
-
diff --git a/libs/protobuf/benchmarks/protobuf.js/protobufjs_benchmark.js b/libs/protobuf/benchmarks/protobuf.js/protobufjs_benchmark.js
deleted file mode 100644
index e062d1c..0000000
--- a/libs/protobuf/benchmarks/protobuf.js/protobufjs_benchmark.js
+++ /dev/null
@@ -1,66 +0,0 @@
-var root = require("./generated_bundle_code.js");
-var fs = require('fs');
-var benchmark = require("./node_modules/benchmark");
-var benchmarkSuite = require("./benchmark_suite.js");
-
-
-function getNewPrototype(name) {
-  var message = eval("root." + name);
-  if (typeof(message) == "undefined") {
-    throw "type " + name + " is undefined";
-  }
-  return message;
-}
-
-
-var results = [];
-
-console.log("#####################################################");
-console.log("ProtobufJs Benchmark: ");
-process.argv.forEach(function(filename, index) {
-  if (index < 2) {
-    return;
-  }
-  var benchmarkDataset =
-      root.benchmarks.BenchmarkDataset.decode(fs.readFileSync(filename));
-  var messageList = [];
-  var totalBytes = 0;
-  benchmarkDataset.payload.forEach(function(onePayload) {
-    var message = getNewPrototype(benchmarkDataset.messageName);
-    messageList.push(message.decode(onePayload));
-    totalBytes += onePayload.length;
-  });
-
-  var scenarios = benchmarkSuite.newBenchmark(
-    benchmarkDataset.messageName, filename, "protobufjs");
-  scenarios.suite
-  .add("protobuf.js static decoding", function() {
-    benchmarkDataset.payload.forEach(function(onePayload) {
-      var protoType = getNewPrototype(benchmarkDataset.messageName);
-      protoType.decode(onePayload);
-    });
-  })
-  .add("protobuf.js static encoding", function() {
-    var protoType = getNewPrototype(benchmarkDataset.messageName);
-    messageList.forEach(function(message) {
-      protoType.encode(message).finish();
-    });
-  })
-  .run({"Async": false});
-
-  results.push({
-    filename: filename,
-    benchmarks: {
-      protobufjs_decoding: scenarios.benches[0] * totalBytes,
-      protobufjs_encoding: scenarios.benches[1] * totalBytes
-    }
-  })
-
-  console.log("Throughput for decoding: "
-    + scenarios.benches[0] * totalBytes / 1024 / 1024 + "MB/s" );
-  console.log("Throughput for encoding: "
-    + scenarios.benches[1] * totalBytes / 1024 / 1024 + "MB/s" );
-  console.log("");
-});
-console.log("#####################################################");
-
diff --git a/libs/protobuf/benchmarks/python/__init__.py b/libs/protobuf/benchmarks/python/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/libs/protobuf/benchmarks/python/py_benchmark.py b/libs/protobuf/benchmarks/python/py_benchmark.py
deleted file mode 100644
index 60e377e..0000000
--- a/libs/protobuf/benchmarks/python/py_benchmark.py
+++ /dev/null
@@ -1,161 +0,0 @@
-from __future__ import print_function
-import sys
-import os
-import timeit
-import math
-import argparse
-import fnmatch
-import json
-
-parser = argparse.ArgumentParser(description="Python protobuf benchmark")
-parser.add_argument("data_files", metavar="dataFile", nargs="+",
-                    help="testing data files.")
-parser.add_argument("--json", action="store_const", dest="json",
-                    const="yes", default="no",
-                    help="Whether to output json results")
-parser.add_argument("--behavior_prefix", dest="behavior_prefix",
-                    help="The output json format's behavior's name's prefix",
-                    default="")
-# BEGIN CPP GENERATED MESSAGE
-parser.add_argument("--cpp_generated", action="store_const",
-                    dest="cpp_generated", const="yes", default="no",
-                    help="Whether to link generated code library")
-# END CPP GENERATED MESSAGE
-args = parser.parse_args()
-# BEGIN CPP GENERATED MESSAGE
-# CPP generated code must be linked before importing the generated Python code
-# for the descriptor can be found in the pool
-if args.cpp_generated != "no":
-  sys.path.append( os.path.dirname( os.path.dirname( os.path.abspath(__file__) ) ) + "/.libs" )
-  import libbenchmark_messages
-  sys.path.append( os.path.dirname( os.path.dirname( os.path.abspath(__file__) ) ) + "/tmp" )
-# END CPP GENERATED MESSAGE
-
-
-import datasets.google_message1.proto2.benchmark_message1_proto2_pb2 as benchmark_message1_proto2_pb2
-import datasets.google_message1.proto3.benchmark_message1_proto3_pb2 as benchmark_message1_proto3_pb2
-import datasets.google_message2.benchmark_message2_pb2 as benchmark_message2_pb2
-import datasets.google_message3.benchmark_message3_pb2 as benchmark_message3_pb2
-import datasets.google_message4.benchmark_message4_pb2 as benchmark_message4_pb2
-import benchmarks_pb2 as benchmarks_pb2
-
-
-def run_one_test(filename):
-  data = open(filename, "rb").read()
-  benchmark_dataset = benchmarks_pb2.BenchmarkDataset()
-  benchmark_dataset.ParseFromString(data)
-  total_bytes = 0
-  for payload in benchmark_dataset.payload:
-    total_bytes += len(payload)
-  benchmark_util = Benchmark(full_iteration=len(benchmark_dataset.payload),
-                             module="py_benchmark",
-                             setup_method="init",
-                             total_bytes=total_bytes)
-  result={}
-  result["filename"] =  filename
-  result["message_name"] =  benchmark_dataset.message_name
-  result["benchmarks"] = {}
-  benchmark_util.set_test_method("parse_from_benchmark")
-  result["benchmarks"][args.behavior_prefix + "_parse_from_benchmark"] = \
-    benchmark_util.run_benchmark(setup_method_args='"%s"' % (filename))
-  benchmark_util.set_test_method("serialize_to_benchmark")
-  result["benchmarks"][args.behavior_prefix + "_serialize_to_benchmark"] = \
-    benchmark_util.run_benchmark(setup_method_args='"%s"' % (filename))
-  return result
-
-
-def init(filename):
-  global benchmark_dataset, message_class, message_list, counter, total_bytes
-  message_list=[]
-  counter = 0
-  total_bytes = 0
-  data = open(filename, "rb").read()
-  benchmark_dataset = benchmarks_pb2.BenchmarkDataset()
-  benchmark_dataset.ParseFromString(data)
-
-  if benchmark_dataset.message_name == "benchmarks.proto3.GoogleMessage1":
-    message_class = benchmark_message1_proto3_pb2.GoogleMessage1
-  elif benchmark_dataset.message_name == "benchmarks.proto2.GoogleMessage1":
-    message_class = benchmark_message1_proto2_pb2.GoogleMessage1
-  elif benchmark_dataset.message_name == "benchmarks.proto2.GoogleMessage2":
-    message_class = benchmark_message2_pb2.GoogleMessage2
-  elif benchmark_dataset.message_name == "benchmarks.google_message3.GoogleMessage3":
-    message_class = benchmark_message3_pb2.GoogleMessage3
-  elif benchmark_dataset.message_name == "benchmarks.google_message4.GoogleMessage4":
-    message_class = benchmark_message4_pb2.GoogleMessage4
-  else:
-    raise IOError("Message %s not found!" % (benchmark_dataset.message_name))
-
-  for one_payload in benchmark_dataset.payload:
-    temp = message_class()
-    temp.ParseFromString(one_payload)
-    message_list.append(temp)
-    total_bytes += len(one_payload)
-
-
-def parse_from_benchmark():
-  global counter, message_class, benchmark_dataset
-  m = message_class().ParseFromString(benchmark_dataset.payload[counter % len(benchmark_dataset.payload)])
-  counter = counter + 1
-
-
-def serialize_to_benchmark():
-  global counter, message_list, message_class
-  s = message_list[counter % len(benchmark_dataset.payload)].SerializeToString()
-  counter = counter + 1
-
-
-class Benchmark:
-  def __init__(self, module=None, test_method=None,
-               setup_method=None, total_bytes=None, full_iteration = 1):
-    self.full_iteration = full_iteration
-    self.module = module
-    self.test_method = test_method
-    self.setup_method = setup_method
-    self.total_bytes = total_bytes
-
-  def set_test_method(self, test_method):
-    self.test_method = test_method
-
-  def full_setup_code(self, setup_method_args=''):
-    setup_code = ""
-    setup_code += "from %s import %s\n" % (self.module, self.test_method)
-    setup_code += "from %s import %s\n" % (self.module, self.setup_method)
-    setup_code += "%s(%s)\n" % (self.setup_method, setup_method_args)
-    return setup_code
-
-  def dry_run(self, test_method_args='', setup_method_args=''):
-    return timeit.timeit(stmt="%s(%s)" % (self.test_method, test_method_args),
-                         setup=self.full_setup_code(setup_method_args),
-                         number=self.full_iteration);
-
-  def run_benchmark(self, test_method_args='', setup_method_args=''):
-    reps = self.full_iteration;
-    t = self.dry_run(test_method_args, setup_method_args);
-    if t < 3 :
-      reps = int(math.ceil(3 / t)) * self.full_iteration
-    if reps != self.full_iteration:
-        t = timeit.timeit(stmt="%s(%s)" % (self.test_method, test_method_args),
-                          setup=self.full_setup_code(setup_method_args),
-                          number=reps);
-    return self.total_bytes * 1.0 / 2 ** 20 / (1.0 * t / reps * self.full_iteration)
-
-
-if __name__ == "__main__":
-  results = []
-  for file in args.data_files:
-    results.append(run_one_test(file))
-
-  if args.json != "no":
-    print(json.dumps(results))
-  else:
-    for result in results:
-      print("Message %s of dataset file %s" % \
-          (result["message_name"], result["filename"]))
-      print("Average throughput for parse_from_benchmark: %.2f MB/s" % \
-          (result["benchmarks"][ \
-                      args.behavior_prefix + "_parse_from_benchmark"]))
-      print("Average throughput for serialize_to_benchmark: %.2f MB/s" % \
-          (result["benchmarks"][ \
-                      args.behavior_prefix + "_serialize_to_benchmark"]))
-      print("")
diff --git a/libs/protobuf/benchmarks/python/python_benchmark_messages.cc b/libs/protobuf/benchmarks/python/python_benchmark_messages.cc
deleted file mode 100644
index f6ddcf3..0000000
--- a/libs/protobuf/benchmarks/python/python_benchmark_messages.cc
+++ /dev/null
@@ -1,31 +0,0 @@
-#include <Python.h>
-
-#include "benchmarks.pb.h"
-#include "datasets/google_message1/proto2/benchmark_message1_proto2.pb.h"
-#include "datasets/google_message1/proto3/benchmark_message1_proto3.pb.h"
-#include "datasets/google_message2/benchmark_message2.pb.h"
-#include "datasets/google_message3/benchmark_message3.pb.h"
-#include "datasets/google_message4/benchmark_message4.pb.h"
-
-static struct PyModuleDef _module = {PyModuleDef_HEAD_INIT,
-                                     "libbenchmark_messages",
-                                     "Benchmark messages Python module",
-                                     -1,
-                                     NULL,
-                                     NULL,
-                                     NULL,
-                                     NULL,
-                                     NULL};
-
-extern "C" {
-PyMODINIT_FUNC PyInit_libbenchmark_messages() {
-  benchmarks::BenchmarkDataset().descriptor();
-  benchmarks::proto3::GoogleMessage1().descriptor();
-  benchmarks::proto2::GoogleMessage1().descriptor();
-  benchmarks::proto2::GoogleMessage2().descriptor();
-  benchmarks::google_message3::GoogleMessage3().descriptor();
-  benchmarks::google_message4::GoogleMessage4().descriptor();
-
-  return PyModule_Create(&_module);
-}
-}
diff --git a/libs/protobuf/benchmarks/util/__init__.py b/libs/protobuf/benchmarks/util/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/libs/protobuf/benchmarks/util/big_query_utils.py b/libs/protobuf/benchmarks/util/big_query_utils.py
deleted file mode 100755
index aea55bb..0000000
--- a/libs/protobuf/benchmarks/util/big_query_utils.py
+++ /dev/null
@@ -1,189 +0,0 @@
-#!/usr/bin/env python2.7
-
-from __future__ import print_function
-import argparse
-import json
-import uuid
-import httplib2
-
-from apiclient import discovery
-from apiclient.errors import HttpError
-from oauth2client.client import GoogleCredentials
-
-# 30 days in milliseconds
-_EXPIRATION_MS = 30 * 24 * 60 * 60 * 1000
-NUM_RETRIES = 3
-
-
-def create_big_query():
-    """Authenticates with cloud platform and gets a BiqQuery service object
-  """
-    creds = GoogleCredentials.get_application_default()
-    return discovery.build(
-        'bigquery', 'v2', credentials=creds, cache_discovery=False)
-
-
-def create_dataset(biq_query, project_id, dataset_id):
-    is_success = True
-    body = {
-        'datasetReference': {
-            'projectId': project_id,
-            'datasetId': dataset_id
-        }
-    }
-
-    try:
-        dataset_req = biq_query.datasets().insert(
-            projectId=project_id, body=body)
-        dataset_req.execute(num_retries=NUM_RETRIES)
-    except HttpError as http_error:
-        if http_error.resp.status == 409:
-            print('Warning: The dataset %s already exists' % dataset_id)
-        else:
-            # Note: For more debugging info, print "http_error.content"
-            print('Error in creating dataset: %s. Err: %s' % (dataset_id,
-                                                              http_error))
-            is_success = False
-    return is_success
-
-
-def create_table(big_query, project_id, dataset_id, table_id, table_schema,
-                 description):
-    fields = [{
-        'name': field_name,
-        'type': field_type,
-        'description': field_description
-    } for (field_name, field_type, field_description) in table_schema]
-    return create_table2(big_query, project_id, dataset_id, table_id, fields,
-                         description)
-
-
-def create_partitioned_table(big_query,
-                             project_id,
-                             dataset_id,
-                             table_id,
-                             table_schema,
-                             description,
-                             partition_type='DAY',
-                             expiration_ms=_EXPIRATION_MS):
-    """Creates a partitioned table. By default, a date-paritioned table is created with
-  each partition lasting 30 days after it was last modified.
-  """
-    fields = [{
-        'name': field_name,
-        'type': field_type,
-        'description': field_description
-    } for (field_name, field_type, field_description) in table_schema]
-    return create_table2(big_query, project_id, dataset_id, table_id, fields,
-                         description, partition_type, expiration_ms)
-
-
-def create_table2(big_query,
-                  project_id,
-                  dataset_id,
-                  table_id,
-                  fields_schema,
-                  description,
-                  partition_type=None,
-                  expiration_ms=None):
-    is_success = True
-
-    body = {
-        'description': description,
-        'schema': {
-            'fields': fields_schema
-        },
-        'tableReference': {
-            'datasetId': dataset_id,
-            'projectId': project_id,
-            'tableId': table_id
-        }
-    }
-
-    if partition_type and expiration_ms:
-        body["timePartitioning"] = {
-            "type": partition_type,
-            "expirationMs": expiration_ms
-        }
-
-    try:
-        table_req = big_query.tables().insert(
-            projectId=project_id, datasetId=dataset_id, body=body)
-        res = table_req.execute(num_retries=NUM_RETRIES)
-        print('Successfully created %s "%s"' % (res['kind'], res['id']))
-    except HttpError as http_error:
-        if http_error.resp.status == 409:
-            print('Warning: Table %s already exists' % table_id)
-        else:
-            print('Error in creating table: %s. Err: %s' % (table_id,
-                                                            http_error))
-            is_success = False
-    return is_success
-
-
-def patch_table(big_query, project_id, dataset_id, table_id, fields_schema):
-    is_success = True
-
-    body = {
-        'schema': {
-            'fields': fields_schema
-        },
-        'tableReference': {
-            'datasetId': dataset_id,
-            'projectId': project_id,
-            'tableId': table_id
-        }
-    }
-
-    try:
-        table_req = big_query.tables().patch(
-            projectId=project_id,
-            datasetId=dataset_id,
-            tableId=table_id,
-            body=body)
-        res = table_req.execute(num_retries=NUM_RETRIES)
-        print('Successfully patched %s "%s"' % (res['kind'], res['id']))
-    except HttpError as http_error:
-        print('Error in creating table: %s. Err: %s' % (table_id, http_error))
-        is_success = False
-    return is_success
-
-
-def insert_rows(big_query, project_id, dataset_id, table_id, rows_list):
-    is_success = True
-    body = {'rows': rows_list}
-    try:
-        insert_req = big_query.tabledata().insertAll(
-            projectId=project_id,
-            datasetId=dataset_id,
-            tableId=table_id,
-            body=body)
-        res = insert_req.execute(num_retries=NUM_RETRIES)
-        if res.get('insertErrors', None):
-            print('Error inserting rows! Response: %s' % res)
-            is_success = False
-    except HttpError as http_error:
-        print('Error inserting rows to the table %s' % table_id)
-        is_success = False
-
-    return is_success
-
-
-def sync_query_job(big_query, project_id, query, timeout=5000):
-    query_data = {'query': query, 'timeoutMs': timeout}
-    query_job = None
-    try:
-        query_job = big_query.jobs().query(
-            projectId=project_id,
-            body=query_data).execute(num_retries=NUM_RETRIES)
-    except HttpError as http_error:
-        print('Query execute job failed with error: %s' % http_error)
-        print(http_error.content)
-    return query_job
-
-
-    # List of (column name, column type, description) tuples
-def make_row(unique_row_id, row_values_dict):
-    """row_values_dict is a dictionary of column name and column value.
-  """
-    return {'insertId': unique_row_id, 'json': row_values_dict}
diff --git a/libs/protobuf/benchmarks/util/data_proto2_to_proto3_util.h b/libs/protobuf/benchmarks/util/data_proto2_to_proto3_util.h
deleted file mode 100644
index 5eea850..0000000
--- a/libs/protobuf/benchmarks/util/data_proto2_to_proto3_util.h
+++ /dev/null
@@ -1,64 +0,0 @@
-#ifndef PROTOBUF_BENCHMARKS_UTIL_DATA_PROTO2_TO_PROTO3_UTIL_H_
-#define PROTOBUF_BENCHMARKS_UTIL_DATA_PROTO2_TO_PROTO3_UTIL_H_
-
-#include "google/protobuf/message.h"
-#include "google/protobuf/descriptor.h"
-
-using google::protobuf::FieldDescriptor;
-using google::protobuf::Message;
-using google::protobuf::Reflection;
-
-namespace google {
-namespace protobuf {
-namespace util {
-
-class DataStripper {
- public:
-  void StripMessage(Message *message) {
-    std::vector<const FieldDescriptor*> set_fields;
-    const Reflection* reflection = message->GetReflection();
-    reflection->ListFields(*message, &set_fields);
-
-    for (size_t i = 0; i < set_fields.size(); i++) {
-      const FieldDescriptor* field = set_fields[i];
-      if (ShouldBeClear(field)) {
-        reflection->ClearField(message, field);
-        continue;
-      }
-      if (field->type() == FieldDescriptor::TYPE_MESSAGE) {
-        if (field->is_repeated()) {
-          for (int j = 0; j < reflection->FieldSize(*message, field); j++) {
-            StripMessage(reflection->MutableRepeatedMessage(message, field, j));
-          }
-        } else {
-          StripMessage(reflection->MutableMessage(message, field));
-        }
-      }
-    }
-
-    reflection->MutableUnknownFields(message)->Clear();
-  }
- private:
-  virtual bool ShouldBeClear(const FieldDescriptor *field) = 0;
-};
-
-class GogoDataStripper : public DataStripper {
- private:
-  virtual bool ShouldBeClear(const FieldDescriptor *field) {
-    return field->type() == FieldDescriptor::TYPE_GROUP;
-  }
-};
-
-class Proto3DataStripper : public DataStripper {
- private:
-  virtual bool ShouldBeClear(const FieldDescriptor *field) {
-    return field->type() == FieldDescriptor::TYPE_GROUP ||
-           field->is_extension();
-  }
-};
-
-}  // namespace util
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // PROTOBUF_BENCHMARKS_UTIL_DATA_PROTO2_TO_PROTO3_UTIL_H_
diff --git a/libs/protobuf/benchmarks/util/gogo_data_scrubber.cc b/libs/protobuf/benchmarks/util/gogo_data_scrubber.cc
deleted file mode 100644
index 9ef57b0..0000000
--- a/libs/protobuf/benchmarks/util/gogo_data_scrubber.cc
+++ /dev/null
@@ -1,74 +0,0 @@
-#include "benchmarks.pb.h"
-#include "datasets/google_message1/proto2/benchmark_message1_proto2.pb.h"
-#include "datasets/google_message1/proto3/benchmark_message1_proto3.pb.h"
-#include "datasets/google_message2/benchmark_message2.pb.h"
-#include "datasets/google_message3/benchmark_message3.pb.h"
-#include "datasets/google_message4/benchmark_message4.pb.h"
-#include "data_proto2_to_proto3_util.h"
-
-#include <fstream>
-
-using google::protobuf::util::GogoDataStripper;
-
-std::string ReadFile(const std::string& name) {
-  std::ifstream file(name.c_str());
-  GOOGLE_CHECK(file.is_open()) << "Couldn't find file '"
-      << name
-      << "', please make sure you are running this command from the benchmarks"
-      << " directory.\n";
-  return std::string((std::istreambuf_iterator<char>(file)),
-                     std::istreambuf_iterator<char>());
-}
-
-int main(int argc, char *argv[]) {
-  if (argc % 2 == 0 || argc == 1) {
-    std::cerr << "Usage: [input_files] [output_file_names] where " <<
-        "input_files are one to one mapping to output_file_names." <<
-        std::endl;
-    return 1;
-  }
-
-  for (int i = argc / 2; i > 0; i--) {
-    const std::string &input_file = argv[i];
-    const std::string &output_file = argv[i + argc / 2];
-
-    std::cerr << "Generating " << input_file
-        << " to " << output_file << std::endl;
-    benchmarks::BenchmarkDataset dataset;
-    Message* message;
-    std::string dataset_payload = ReadFile(input_file);
-    GOOGLE_CHECK(dataset.ParseFromString(dataset_payload))
-      << "Can' t parse data file " << input_file;
-
-    if (dataset.message_name() == "benchmarks.proto3.GoogleMessage1") {
-      message = new benchmarks::proto3::GoogleMessage1;
-    } else if (dataset.message_name() == "benchmarks.proto2.GoogleMessage1") {
-      message = new benchmarks::proto2::GoogleMessage1;
-    } else if (dataset.message_name() == "benchmarks.proto2.GoogleMessage2") {
-      message = new benchmarks::proto2::GoogleMessage2;
-    } else if (dataset.message_name() ==
-        "benchmarks.google_message3.GoogleMessage3") {
-      message = new benchmarks::google_message3::GoogleMessage3;
-    } else if (dataset.message_name() ==
-        "benchmarks.google_message4.GoogleMessage4") {
-      message = new benchmarks::google_message4::GoogleMessage4;
-    } else {
-      std::cerr << "Unknown message type: " << dataset.message_name();
-      exit(1);
-    }
-
-    for (int i = 0; i < dataset.payload_size(); i++) {
-      message->ParseFromString(dataset.payload(i));
-      GogoDataStripper stripper;
-      stripper.StripMessage(message);
-      dataset.set_payload(i, message->SerializeAsString());
-    }
-
-    std::ofstream ofs(output_file);
-    ofs << dataset.SerializeAsString();
-    ofs.close();
-  }
-
-
-  return 0;
-}
diff --git a/libs/protobuf/benchmarks/util/proto3_data_stripper.cc b/libs/protobuf/benchmarks/util/proto3_data_stripper.cc
deleted file mode 100644
index 3096c4c..0000000
--- a/libs/protobuf/benchmarks/util/proto3_data_stripper.cc
+++ /dev/null
@@ -1,74 +0,0 @@
-#include "benchmarks.pb.h"
-#include "datasets/google_message1/proto2/benchmark_message1_proto2.pb.h"
-#include "datasets/google_message1/proto3/benchmark_message1_proto3.pb.h"
-#include "datasets/google_message2/benchmark_message2.pb.h"
-#include "datasets/google_message3/benchmark_message3.pb.h"
-#include "datasets/google_message4/benchmark_message4.pb.h"
-#include "data_proto2_to_proto3_util.h"
-
-#include <fstream>
-
-using google::protobuf::util::Proto3DataStripper;
-
-std::string ReadFile(const std::string& name) {
-  std::ifstream file(name.c_str());
-  GOOGLE_CHECK(file.is_open()) << "Couldn't find file '"
-      << name
-      << "', please make sure you are running this command from the benchmarks"
-      << " directory.\n";
-  return std::string((std::istreambuf_iterator<char>(file)),
-                     std::istreambuf_iterator<char>());
-}
-
-int main(int argc, char *argv[]) {
-  if (argc % 2 == 0 || argc == 1) {
-    std::cerr << "Usage: [input_files] [output_file_names] where " <<
-        "input_files are one to one mapping to output_file_names." <<
-        std::endl;
-    return 1;
-  }
-
-  for (int i = argc / 2; i > 0; i--) {
-    const std::string &input_file = argv[i];
-    const std::string &output_file = argv[i + argc / 2];
-
-    std::cerr << "Generating " << input_file
-        << " to " << output_file << std::endl;
-    benchmarks::BenchmarkDataset dataset;
-    Message* message;
-    std::string dataset_payload = ReadFile(input_file);
-    GOOGLE_CHECK(dataset.ParseFromString(dataset_payload))
-      << "Can' t parse data file " << input_file;
-
-    if (dataset.message_name() == "benchmarks.proto3.GoogleMessage1") {
-      message = new benchmarks::proto3::GoogleMessage1;
-    } else if (dataset.message_name() == "benchmarks.proto2.GoogleMessage1") {
-      message = new benchmarks::proto2::GoogleMessage1;
-    } else if (dataset.message_name() == "benchmarks.proto2.GoogleMessage2") {
-      message = new benchmarks::proto2::GoogleMessage2;
-    } else if (dataset.message_name() ==
-        "benchmarks.google_message3.GoogleMessage3") {
-      message = new benchmarks::google_message3::GoogleMessage3;
-    } else if (dataset.message_name() ==
-        "benchmarks.google_message4.GoogleMessage4") {
-      message = new benchmarks::google_message4::GoogleMessage4;
-    } else {
-      std::cerr << "Unknown message type: " << dataset.message_name();
-      exit(1);
-    }
-
-    for (int i = 0; i < dataset.payload_size(); i++) {
-      message->ParseFromString(dataset.payload(i));
-      Proto3DataStripper stripper;
-      stripper.StripMessage(message);
-      dataset.set_payload(i, message->SerializeAsString());
-    }
-
-    std::ofstream ofs(output_file);
-    ofs << dataset.SerializeAsString();
-    ofs.close();
-  }
-
-
-  return 0;
-}
diff --git a/libs/protobuf/benchmarks/util/protoc-gen-gogoproto.cc b/libs/protobuf/benchmarks/util/protoc-gen-gogoproto.cc
deleted file mode 100644
index 9c1b3d0..0000000
--- a/libs/protobuf/benchmarks/util/protoc-gen-gogoproto.cc
+++ /dev/null
@@ -1,103 +0,0 @@
-#include "google/protobuf/compiler/code_generator.h"
-#include "google/protobuf/io/zero_copy_stream.h"
-#include "google/protobuf/io/printer.h"
-#include "google/protobuf/descriptor.h"
-#include "google/protobuf/descriptor.pb.h"
-#include "schema_proto2_to_proto3_util.h"
-
-#include "google/protobuf/compiler/plugin.h"
-
-using google::protobuf::FileDescriptorProto;
-using google::protobuf::FileDescriptor;
-using google::protobuf::DescriptorPool;
-using google::protobuf::io::Printer;
-using google::protobuf::util::SchemaGroupStripper;
-using google::protobuf::util::EnumScrubber;
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-
-namespace {
-
-string StripProto(string filename) {
-  if (filename.substr(filename.size() - 11) == ".protodevel") {
-    // .protodevel
-    return filename.substr(0, filename.size() - 11);
-  } else {
-    // .proto
-    return filename.substr(0, filename.size() - 6);
-  }
-}
-
-DescriptorPool new_pool_;
-
-}  // namespace
-
-class GoGoProtoGenerator : public CodeGenerator {
- public:
-  virtual bool GenerateAll(const std::vector<const FileDescriptor*>& files,
-                           const string& parameter,
-                           GeneratorContext* context,
-                           string* error) const {
-    for (int i = 0; i < files.size(); i++) {
-      for (auto file : files) {
-        bool can_generate =
-            (new_pool_.FindFileByName(file->name()) == nullptr);
-        for (int j = 0; j < file->dependency_count(); j++) {
-          can_generate &= (new_pool_.FindFileByName(
-              file->dependency(j)->name()) != nullptr);
-        }
-        for (int j = 0; j < file->public_dependency_count(); j++) {
-          can_generate &= (new_pool_.FindFileByName(
-              file->public_dependency(j)->name()) != nullptr);
-        }
-        for (int j = 0; j < file->weak_dependency_count(); j++) {
-          can_generate &= (new_pool_.FindFileByName(
-              file->weak_dependency(j)->name()) != nullptr);
-        }
-        if (can_generate) {
-          Generate(file, parameter, context, error);
-          break;
-        }
-      }
-    }
-
-    return true;
-  }
-
-  virtual bool Generate(const FileDescriptor* file,
-                        const string& parameter,
-                        GeneratorContext* context,
-                        string* error) const {
-    FileDescriptorProto new_file;
-    file->CopyTo(&new_file);
-    SchemaGroupStripper::StripFile(file, &new_file);
-
-    EnumScrubber enum_scrubber;
-    enum_scrubber.ScrubFile(&new_file);
-
-    string filename = file->name();
-    string basename = StripProto(filename);
-
-    std::vector<std::pair<string,string>> option_pairs;
-    ParseGeneratorParameter(parameter, &option_pairs);
-
-    std::unique_ptr<google::protobuf::io::ZeroCopyOutputStream> output(
-        context->Open(basename + ".proto"));
-    string content = new_pool_.BuildFile(new_file)->DebugString();
-    Printer printer(output.get(), '$');
-    printer.WriteRaw(content.c_str(), content.size());
-
-    return true;
-  }
-};
-
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-int main(int argc, char* argv[]) {
-  google::protobuf::compiler::GoGoProtoGenerator generator;
-  return google::protobuf::compiler::PluginMain(argc, argv, &generator);
-}
diff --git a/libs/protobuf/benchmarks/util/protoc-gen-proto2_to_proto3.cc b/libs/protobuf/benchmarks/util/protoc-gen-proto2_to_proto3.cc
deleted file mode 100644
index d0a8902..0000000
--- a/libs/protobuf/benchmarks/util/protoc-gen-proto2_to_proto3.cc
+++ /dev/null
@@ -1,115 +0,0 @@
-#include "google/protobuf/compiler/code_generator.h"
-#include "google/protobuf/io/zero_copy_stream.h"
-#include "google/protobuf/io/printer.h"
-#include "google/protobuf/descriptor.h"
-#include "google/protobuf/descriptor.pb.h"
-#include "schema_proto2_to_proto3_util.h"
-
-#include "google/protobuf/compiler/plugin.h"
-
-using google::protobuf::FileDescriptorProto;
-using google::protobuf::FileDescriptor;
-using google::protobuf::DescriptorPool;
-using google::protobuf::io::Printer;
-using google::protobuf::util::SchemaGroupStripper;
-using google::protobuf::util::EnumScrubber;
-using google::protobuf::util::ExtensionStripper;
-using google::protobuf::util::FieldScrubber;
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-
-namespace {
-
-string StripProto(string filename) {
-  return filename.substr(0, filename.rfind(".proto"));
-}
-
-DescriptorPool* GetPool() {
-  static DescriptorPool *pool = new DescriptorPool();
-  return pool;
-}
-
-}  // namespace
-
-class Proto2ToProto3Generator final : public CodeGenerator {
- public:
-  bool GenerateAll(const std::vector<const FileDescriptor*>& files,
-                           const string& parameter,
-                           GeneratorContext* context,
-                           string* error) const {
-    for (int i = 0; i < files.size(); i++) {
-      for (auto file : files) {
-        if (CanGenerate(file)) {
-          Generate(file, parameter, context, error);
-          break;
-        }
-      }
-    }
-
-    return true;
-  }
-
-  bool Generate(const FileDescriptor* file,
-                        const string& parameter,
-                        GeneratorContext* context,
-                        string* error) const {
-    FileDescriptorProto new_file;
-    file->CopyTo(&new_file);
-    SchemaGroupStripper::StripFile(file, &new_file);
-
-    EnumScrubber enum_scrubber;
-    enum_scrubber.ScrubFile(&new_file);
-    ExtensionStripper::StripFile(&new_file);
-    FieldScrubber::ScrubFile(&new_file);
-    new_file.set_syntax("proto3");
-
-    string filename = file->name();
-    string basename = StripProto(filename);
-
-    std::vector<std::pair<string,string>> option_pairs;
-    ParseGeneratorParameter(parameter, &option_pairs);
-
-    std::unique_ptr<google::protobuf::io::ZeroCopyOutputStream> output(
-        context->Open(basename + ".proto"));
-    string content = GetPool()->BuildFile(new_file)->DebugString();
-    Printer printer(output.get(), '$');
-    printer.WriteRaw(content.c_str(), content.size());
-
-    return true;
-  }
- private:
-  bool CanGenerate(const FileDescriptor* file) const {
-    if (GetPool()->FindFileByName(file->name()) != nullptr) {
-      return false;
-    }
-    for (int j = 0; j < file->dependency_count(); j++) {
-      if (GetPool()->FindFileByName(file->dependency(j)->name()) == nullptr) {
-        return false;
-      }
-    }
-    for (int j = 0; j < file->public_dependency_count(); j++) {
-      if (GetPool()->FindFileByName(
-          file->public_dependency(j)->name()) == nullptr) {
-        return false;
-      }
-    }
-    for (int j = 0; j < file->weak_dependency_count(); j++) {
-      if (GetPool()->FindFileByName(
-          file->weak_dependency(j)->name()) == nullptr) {
-        return false;
-      }
-    }
-    return true;
-  }
-};
-
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-int main(int argc, char* argv[]) {
-  google::protobuf::compiler::Proto2ToProto3Generator generator;
-  return google::protobuf::compiler::PluginMain(argc, argv, &generator);
-}
diff --git a/libs/protobuf/benchmarks/util/result_parser.py b/libs/protobuf/benchmarks/util/result_parser.py
deleted file mode 100644
index d3251a8..0000000
--- a/libs/protobuf/benchmarks/util/result_parser.py
+++ /dev/null
@@ -1,352 +0,0 @@
-# This import depends on the automake rule protoc_middleman, please make sure
-# protoc_middleman has been built before run this file.
-import argparse
-import json
-import re
-import os.path
-# BEGIN OPENSOURCE
-import sys
-sys.path.append(os.path.join(os.path.dirname(os.path.realpath(__file__)), os.pardir))
-# END OPENSOURCE
-import tmp.benchmarks_pb2 as benchmarks_pb2
-
-__file_size_map = {}
-
-def __get_data_size(filename):
-  if filename[0] != '/':
-    filename = os.path.dirname(os.path.abspath(__file__)) + "/../" + filename
-  if filename in __file_size_map:
-    return __file_size_map[filename]
-  benchmark_dataset = benchmarks_pb2.BenchmarkDataset()
-  benchmark_dataset.ParseFromString(
-      open(filename, "rb").read())
-  size = 0
-  count = 0
-  for payload in benchmark_dataset.payload:
-    size += len(payload)
-    count += 1
-  __file_size_map[filename] = (size, 1.0 * size / count)
-  return size, 1.0 * size / count
-
-
-def __extract_file_name(file_name):
-  name_list = re.split(r"[/\.]", file_name)
-  short_file_name = ""
-  for name in name_list:
-    if name[:14] == "google_message":
-      short_file_name = name
-  return short_file_name
-
-
-__results = []
-
-
-# CPP results example:
-# [
-#   "benchmarks": [
-#     {
-#       "bytes_per_second": int,
-#       "cpu_time_ns": double,
-#       "iterations": int,
-#       "name: string,
-#       "real_time_ns: double,
-#       ...
-#     },
-#     ...
-#   ],
-#   ...
-# ]
-def __parse_cpp_result(filename):
-  if filename == "":
-    return
-  if filename[0] != '/':
-    filename = os.path.dirname(os.path.abspath(__file__)) + '/' + filename
-  with open(filename, encoding="utf-8") as f:
-    results = json.loads(f.read())
-    for benchmark in results["benchmarks"]:
-      data_filename = "".join(
-          re.split("(_parse_|_serialize)", benchmark["name"])[0])
-      behavior = benchmark["name"][len(data_filename) + 1:]
-      if data_filename[:2] == "BM":
-        data_filename = data_filename[3:]
-      __results.append({
-        "language": "cpp",
-        "dataFilename": data_filename,
-        "behavior": behavior,
-        "throughput": benchmark["bytes_per_second"] / 2.0 ** 20
-      })
-
-
-# Synthetic benchmark results example:
-# [
-#   "benchmarks": [
-#     {
-#       "cpu_time_ns": double,
-#       "iterations": int,
-#       "name: string,
-#       "real_time_ns: double,
-#       ...
-#     },
-#     ...
-#   ],
-#   ...
-# ]
-def __parse_synthetic_result(filename):
-  if filename == "":
-    return
-  if filename[0] != "/":
-    filename = os.path.dirname(os.path.abspath(__file__)) + "/" + filename
-  with open(filename, encoding="utf-8") as f:
-    results = json.loads(f.read())
-    for benchmark in results["benchmarks"]:
-      __results.append({
-          "language": "cpp",
-          "dataFilename": "",
-          "behavior": "synthetic",
-          "throughput": 10.0**9 / benchmark["cpu_time_ns"]
-      })
-
-
-# Python results example:
-# [
-#   [
-#     {
-#       "filename": string,
-#       "benchmarks": {
-#         behavior: results,
-#         ...
-#       },
-#     },
-#     ...
-#   ], #pure-python
-#   ...
-# ]
-def __parse_python_result(filename):
-  if filename == "":
-    return
-  if filename[0] != '/':
-    filename = os.path.dirname(os.path.abspath(__file__)) + '/' + filename
-  with open(filename, encoding="utf-8") as f:
-    results_list = json.loads(f.read())
-    for results in results_list:
-      for result in results:
-        _, avg_size = __get_data_size(result["filename"])
-        for behavior in result["benchmarks"]:
-          __results.append({
-            "language": "python",
-            "dataFilename": __extract_file_name(result["filename"]),
-            "behavior": behavior,
-            "throughput": result["benchmarks"][behavior]
-          })
-
-
-# Java results example:
-# [
-#   {
-#     "id": string,
-#     "instrumentSpec": {...},
-#     "measurements": [
-#       {
-#         "weight": float,
-#         "value": {
-#           "magnitude": float,
-#           "unit": string
-#         },
-#         ...
-#       },
-#       ...
-#     ],
-#     "run": {...},
-#     "scenario": {
-#       "benchmarkSpec": {
-#         "methodName": string,
-#         "parameters": {
-#            defined parameters in the benchmark: parameters value
-#         },
-#         ...
-#       },
-#       ...
-#     }
-#
-#   },
-#   ...
-# ]
-def __parse_java_result(filename):
-  if filename == "":
-    return
-  if filename[0] != '/':
-    filename = os.path.dirname(os.path.abspath(__file__)) + '/' + filename
-  with open(filename, encoding="utf-8") as f:
-    results = json.loads(f.read())
-    for result in results:
-      total_weight = 0
-      total_value = 0
-      for measurement in result["measurements"]:
-        total_weight += measurement["weight"]
-        total_value += measurement["value"]["magnitude"]
-      avg_time = total_value * 1.0 / total_weight
-      total_size, _ = __get_data_size(
-          result["scenario"]["benchmarkSpec"]["parameters"]["dataFile"])
-      __results.append({
-        "language": "java",
-        "throughput": total_size / avg_time * 1e9 / 2 ** 20,
-        "behavior": result["scenario"]["benchmarkSpec"]["methodName"],
-        "dataFilename": __extract_file_name(
-            result["scenario"]["benchmarkSpec"]["parameters"]["dataFile"])
-      })
-
-
-# Go benchmark results:
-#
-# goos: linux
-# goarch: amd64
-# Benchmark/.././datasets/google_message2/dataset.google_message2.pb/Unmarshal-12               3000      705784 ns/op
-# Benchmark/.././datasets/google_message2/dataset.google_message2.pb/Marshal-12                 2000      634648 ns/op
-# Benchmark/.././datasets/google_message2/dataset.google_message2.pb/Size-12                    5000      244174 ns/op
-# Benchmark/.././datasets/google_message2/dataset.google_message2.pb/Clone-12                    300     4120954 ns/op
-# Benchmark/.././datasets/google_message2/dataset.google_message2.pb/Merge-12                    300     4108632 ns/op
-# PASS
-# ok    _/usr/local/google/home/yilunchong/mygit/protobuf/benchmarks  124.173s
-def __parse_go_result(filename):
-  if filename == "":
-    return
-  if filename[0] != '/':
-    filename = os.path.dirname(os.path.abspath(__file__)) + '/' + filename
-  with open(filename, encoding="utf-8") as f:
-    for line in f:
-      result_list = re.split(r"[\ \t]+", line)
-      if result_list[0][:9] != "Benchmark":
-        continue
-      first_slash_index = result_list[0].find('/')
-      last_slash_index = result_list[0].rfind('/')
-      full_filename = result_list[0][first_slash_index+1:last_slash_index]
-      total_bytes, _ = __get_data_size(full_filename)
-      behavior_with_suffix = result_list[0][last_slash_index+1:]
-      last_dash = behavior_with_suffix.rfind("-")
-      if last_dash == -1:
-        behavior = behavior_with_suffix
-      else:
-        behavior = behavior_with_suffix[:last_dash]
-      __results.append({
-        "dataFilename": __extract_file_name(full_filename),
-        "throughput": total_bytes / float(result_list[2]) * 1e9 / 2 ** 20,
-        "behavior": behavior,
-        "language": "go"
-      })
-
-
-# Self built json results example:
-#
-# [
-#   {
-#     "filename": string,
-#     "benchmarks": {
-#       behavior: results,
-#       ...
-#     },
-#   },
-#   ...
-# ]
-def __parse_custom_result(filename, language):
-  if filename == "":
-    return
-  if filename[0] != '/':
-    filename = os.path.dirname(os.path.abspath(__file__)) + '/' + filename
-  with open(filename, encoding="utf-8") as f:
-    results = json.loads(f.read())
-    for result in results:
-      _, avg_size = __get_data_size(result["filename"])
-      for behavior in result["benchmarks"]:
-        __results.append({
-          "language": language,
-          "dataFilename": __extract_file_name(result["filename"]),
-          "behavior": behavior,
-          "throughput": result["benchmarks"][behavior]
-        })
-
-
-def __parse_js_result(filename, language):
-  return __parse_custom_result(filename, language)
-
-def __parse_php_result(filename, language):
-  return __parse_custom_result(filename, language)
-
-
-def get_result_from_file(cpp_file="",
-                         java_file="",
-                         python_file="",
-                         go_file="",
-                         synthetic_file="",
-                         node_file="",
-                         php_c_file="",
-                         php_file=""):
-  results = {}
-  if cpp_file != "":
-    __parse_cpp_result(cpp_file)
-  if java_file != "":
-    __parse_java_result(java_file)
-  if python_file != "":
-    __parse_python_result(python_file)
-  if go_file != "":
-    __parse_go_result(go_file)
-  if synthetic_file != "":
-    __parse_synthetic_result(synthetic_file)
-  if node_file != "":
-    __parse_js_result(node_file, "node")
-  if php_file != "":
-    __parse_php_result(php_file, "php")
-  if php_c_file != "":
-    __parse_php_result(php_c_file, "php")
-
-  return __results
-
-
-if __name__ == "__main__":
-  parser = argparse.ArgumentParser()
-  parser.add_argument(
-      "-cpp",
-      "--cpp_input_file",
-      help="The CPP benchmark result file's name",
-      default="")
-  parser.add_argument(
-      "-java",
-      "--java_input_file",
-      help="The Java benchmark result file's name",
-      default="")
-  parser.add_argument(
-      "-python",
-      "--python_input_file",
-      help="The Python benchmark result file's name",
-      default="")
-  parser.add_argument(
-      "-go",
-      "--go_input_file",
-      help="The golang benchmark result file's name",
-      default="")
-  parser.add_argument(
-      "-node",
-      "--node_input_file",
-      help="The node.js benchmark result file's name",
-      default="")
-  parser.add_argument(
-      "-php",
-      "--php_input_file",
-      help="The pure php benchmark result file's name",
-      default="")
-  parser.add_argument(
-      "-php_c",
-      "--php_c_input_file",
-      help="The php with c ext benchmark result file's name",
-      default="")
-  args = parser.parse_args()
-
-  results = get_result_from_file(
-      cpp_file=args.cpp_input_file,
-      java_file=args.java_input_file,
-      python_file=args.python_input_file,
-      go_file=args.go_input_file,
-      node_file=args.node_input_file,
-      php_file=args.php_input_file,
-      php_c_file=args.php_c_input_file,
-  )
-  print(json.dumps(results, indent=2))
diff --git a/libs/protobuf/benchmarks/util/result_uploader.py b/libs/protobuf/benchmarks/util/result_uploader.py
deleted file mode 100644
index 2a35d96..0000000
--- a/libs/protobuf/benchmarks/util/result_uploader.py
+++ /dev/null
@@ -1,107 +0,0 @@
-from __future__ import print_function
-from __future__ import absolute_import
-import argparse
-import os
-import re
-import copy
-import uuid
-import calendar
-import time
-import datetime
-
-from util import big_query_utils
-from util import result_parser
-
-_PROJECT_ID = 'grpc-testing'
-_DATASET = 'protobuf_benchmark_result'
-_TABLE = 'opensource_result_v2'
-_NOW = "%d%02d%02d" % (datetime.datetime.now().year,
-                       datetime.datetime.now().month,
-                       datetime.datetime.now().day)
-
-_INITIAL_TIME = calendar.timegm(time.gmtime())
-
-def get_metadata():
-  build_number = os.getenv('BUILD_NUMBER')
-  build_url = os.getenv('BUILD_URL')
-  job_name = os.getenv('JOB_NAME')
-  git_commit = os.getenv('GIT_COMMIT')
-  # actual commit is the actual head of PR that is getting tested
-  git_actual_commit = os.getenv('ghprbActualCommit')
-
-  utc_timestamp = str(calendar.timegm(time.gmtime()))
-  metadata = {'created': utc_timestamp}
-
-  if build_number:
-    metadata['buildNumber'] = build_number
-  if build_url:
-    metadata['buildUrl'] = build_url
-  if job_name:
-    metadata['jobName'] = job_name
-  if git_commit:
-    metadata['gitCommit'] = git_commit
-  if git_actual_commit:
-    metadata['gitActualCommit'] = git_actual_commit
-
-  return metadata
-
-
-def upload_result(result_list, metadata):
-  for result in result_list:
-    new_result = {}
-    new_result["metric"] = "throughput"
-    new_result["value"] = result["throughput"]
-    new_result["unit"] = "MB/s"
-    new_result["test"] = "protobuf_benchmark"
-    new_result["product_name"] = "protobuf"
-    labels_string = ""
-    for key in result:
-      labels_string += ",|%s:%s|" % (key, result[key])
-    new_result["labels"] = labels_string[1:]
-    new_result["timestamp"] = _INITIAL_TIME
-    print(labels_string)
-
-    bq = big_query_utils.create_big_query()
-    row = big_query_utils.make_row(str(uuid.uuid4()), new_result)
-    if not big_query_utils.insert_rows(bq, _PROJECT_ID, _DATASET,
-                                        _TABLE + "$" + _NOW,
-                                        [row]):
-      print('Error when uploading result', new_result)
-
-
-if __name__ == "__main__":
-  parser = argparse.ArgumentParser()
-  parser.add_argument("-cpp", "--cpp_input_file",
-                      help="The CPP benchmark result file's name",
-                      default="")
-  parser.add_argument("-java", "--java_input_file",
-                      help="The Java benchmark result file's name",
-                      default="")
-  parser.add_argument("-python", "--python_input_file",
-                      help="The Python benchmark result file's name",
-                      default="")
-  parser.add_argument("-go", "--go_input_file",
-                      help="The golang benchmark result file's name",
-                      default="")
-  parser.add_argument("-node", "--node_input_file",
-                      help="The node.js benchmark result file's name",
-                      default="")
-  parser.add_argument("-php", "--php_input_file",
-                      help="The pure php benchmark result file's name",
-                      default="")
-  parser.add_argument("-php_c", "--php_c_input_file",
-                      help="The php with c ext benchmark result file's name",
-                      default="")
-  args = parser.parse_args()
-
-  metadata = get_metadata()
-  print("uploading results...")
-  upload_result(result_parser.get_result_from_file(
-      cpp_file=args.cpp_input_file,
-      java_file=args.java_input_file,
-      python_file=args.python_input_file,
-      go_file=args.go_input_file,
-      node_file=args.node_input_file,
-      php_file=args.php_input_file,
-      php_c_file=args.php_c_input_file,
-  ), metadata)
diff --git a/libs/protobuf/benchmarks/util/schema_proto2_to_proto3_util.h b/libs/protobuf/benchmarks/util/schema_proto2_to_proto3_util.h
deleted file mode 100644
index 0079f6f..0000000
--- a/libs/protobuf/benchmarks/util/schema_proto2_to_proto3_util.h
+++ /dev/null
@@ -1,194 +0,0 @@
-#ifndef PROTOBUF_BENCHMARKS_UTIL_SCHEMA_PROTO2_TO_PROTO3_UTIL_H_
-#define PROTOBUF_BENCHMARKS_UTIL_SCHEMA_PROTO2_TO_PROTO3_UTIL_H_
-
-#include "google/protobuf/message.h"
-#include "google/protobuf/descriptor.h"
-#include "google/protobuf/descriptor.pb.h"
-
-#include <sstream>
-#include <algorithm>
-
-using google::protobuf::Descriptor;
-using google::protobuf::DescriptorProto;
-using google::protobuf::FileDescriptorProto;
-using google::protobuf::FieldDescriptorProto;
-using google::protobuf::Message;
-using google::protobuf::EnumValueDescriptorProto;
-
-namespace google {
-namespace protobuf {
-namespace util {
-
-class SchemaGroupStripper {
-
- public:
-  static void StripFile(const FileDescriptor* old_file,
-                        FileDescriptorProto *file) {
-    for (int i = file->mutable_message_type()->size() - 1; i >= 0; i--) {
-      if (IsMessageSet(old_file->message_type(i))) {
-        file->mutable_message_type()->DeleteSubrange(i, 1);
-        continue;
-      }
-      StripMessage(old_file->message_type(i), file->mutable_message_type(i));
-    }
-    for (int i = file->mutable_extension()->size() - 1; i >= 0; i--) {
-      auto field = old_file->extension(i);
-      if (field->type() == FieldDescriptor::TYPE_GROUP ||
-          IsMessageSet(field->message_type()) ||
-          IsMessageSet(field->containing_type())) {
-        file->mutable_extension()->DeleteSubrange(i, 1);
-      }
-    }
-  }
-
- private:
-  static bool IsMessageSet(const Descriptor *descriptor) {
-    if (descriptor != nullptr
-        && descriptor->options().message_set_wire_format()) {
-      return true;
-    }
-    return false;
-  }
-
-  static void StripMessage(const Descriptor *old_message,
-                           DescriptorProto *new_message) {
-    for (int i = new_message->mutable_field()->size() - 1; i >= 0; i--) {
-      if (old_message->field(i)->type() == FieldDescriptor::TYPE_GROUP ||
-          IsMessageSet(old_message->field(i)->message_type())) {
-        new_message->mutable_field()->DeleteSubrange(i, 1);
-      }
-    }
-    for (int i = new_message->mutable_extension()->size() - 1; i >= 0; i--) {
-      auto field_type_name = new_message->mutable_extension(i)->type_name();
-      if (old_message->extension(i)->type() == FieldDescriptor::TYPE_GROUP ||
-          IsMessageSet(old_message->extension(i)->containing_type()) ||
-          IsMessageSet(old_message->extension(i)->message_type())) {
-        new_message->mutable_extension()->DeleteSubrange(i, 1);
-      }
-    }
-    for (int i = 0; i < new_message->mutable_nested_type()->size(); i++) {
-      StripMessage(old_message->nested_type(i),
-                   new_message->mutable_nested_type(i));
-    }
-  }
-
-};
-
-class EnumScrubber {
-
- public:
-  EnumScrubber()
-      : total_added_(0) {
-  }
-
-  void ScrubFile(FileDescriptorProto *file) {
-    for (int i = 0; i < file->enum_type_size(); i++) {
-      ScrubEnum(file->mutable_enum_type(i));
-    }
-    for (int i = 0; i < file->mutable_message_type()->size(); i++) {
-      ScrubMessage(file->mutable_message_type(i));
-    }
-  }
-
- private:
-  void ScrubEnum(EnumDescriptorProto *enum_type) {
-    if (enum_type->value(0).number() != 0) {
-      bool has_zero = false;
-      for (int j = 0; j < enum_type->value().size(); j++) {
-        if (enum_type->value(j).number() == 0) {
-          EnumValueDescriptorProto temp_enum_value;
-          temp_enum_value.CopyFrom(enum_type->value(j));
-          enum_type->mutable_value(j)->CopyFrom(enum_type->value(0));
-          enum_type->mutable_value(0)->CopyFrom(temp_enum_value);
-          has_zero = true;
-          break;
-        }
-      }
-      if (!has_zero) {
-        enum_type->mutable_value()->Add();
-        for (int i = enum_type->mutable_value()->size() - 1; i > 0; i--) {
-          enum_type->mutable_value(i)->CopyFrom(
-              *enum_type->mutable_value(i - 1));
-        }
-        enum_type->mutable_value(0)->set_number(0);
-        enum_type->mutable_value(0)->set_name("ADDED_ZERO_VALUE_" +
-                                              std::to_string(total_added_++));
-      }
-    }
-
-  }
-
-  void ScrubMessage(DescriptorProto *message_type) {
-    for (int i = 0; i < message_type->mutable_enum_type()->size(); i++) {
-      ScrubEnum(message_type->mutable_enum_type(i));
-    }
-    for (int i = 0; i < message_type->mutable_nested_type()->size(); i++) {
-      ScrubMessage(message_type->mutable_nested_type(i));
-    }
-  }
-
-  int total_added_;
-};
-
-class ExtensionStripper {
- public:
-  static void StripFile(FileDescriptorProto *file) {
-    for (int i = 0; i < file->mutable_message_type()->size(); i++) {
-      StripMessage(file->mutable_message_type(i));
-    }
-    file->mutable_extension()->Clear();
-  }
- private:
-  static void StripMessage(DescriptorProto *message_type) {
-    message_type->mutable_extension()->Clear();
-    message_type->clear_extension_range();
-    for (int i = 0; i < message_type->mutable_nested_type()->size(); i++) {
-      StripMessage(message_type->mutable_nested_type(i));
-    }
-  }
-};
-
-
-class FieldScrubber {
- public:
-  static void ScrubFile(FileDescriptorProto *file) {
-    for (int i = 0; i < file->mutable_message_type()->size(); i++) {
-      ScrubMessage(file->mutable_message_type(i));
-    }
-    for (int i = 0; i < file->mutable_extension()->size(); i++) {
-      file->mutable_extension(i)->clear_default_value();
-      if (ShouldClearLabel(file->mutable_extension(i))) {
-        file->mutable_extension(i)->clear_label();
-      }
-    }
-  }
- private:
-  static bool ShouldClearLabel(const FieldDescriptorProto *field) {
-    return field->label() == FieldDescriptorProto::LABEL_REQUIRED;
-  }
-
-  static void ScrubMessage(DescriptorProto *message_type) {
-    message_type->mutable_extension()->Clear();
-    for (int i = 0; i < message_type->mutable_extension()->size(); i++) {
-      message_type->mutable_extension(i)->clear_default_value();
-      if (ShouldClearLabel(message_type->mutable_extension(i))) {
-        message_type->mutable_extension(i)->clear_label();
-      }
-    }
-    for (int i = 0; i < message_type->mutable_field()->size(); i++) {
-      message_type->mutable_field(i)->clear_default_value();
-      if (ShouldClearLabel(message_type->mutable_field(i))) {
-        message_type->mutable_field(i)->clear_label();
-      }
-    }
-    for (int i = 0; i < message_type->mutable_nested_type()->size(); i++) {
-      ScrubMessage(message_type->mutable_nested_type(i));
-    }
-  }
-};
-
-}  // namespace util
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // PROTOBUF_BENCHMARKS_UTIL_SCHEMA_PROTO2_TO_PROTO3_UTIL_H_
diff --git a/libs/protobuf/build_defs/BUILD.bazel b/libs/protobuf/build_defs/BUILD.bazel
deleted file mode 100644
index a5d831c..0000000
--- a/libs/protobuf/build_defs/BUILD.bazel
+++ /dev/null
@@ -1,173 +0,0 @@
-# Internal Starlark definitions for Protobuf.
-
-load("@rules_cc//cc:defs.bzl", starlark_cc_proto_library = "cc_proto_library")
-load("@rules_pkg//:mappings.bzl", "pkg_files", "strip_prefix")
-load(":cc_proto_blacklist_test.bzl", "cc_proto_blacklist_test")
-load(":compiler_config_setting.bzl", "create_compiler_config_setting")
-
-package(
-    default_visibility = [
-        # Public, but Protobuf only visibility.
-        "//:__subpackages__",
-    ],
-)
-
-create_compiler_config_setting(
-    name = "config_msvc",
-    value = "msvc-cl",
-)
-
-# Android NDK builds can specify different crosstool_top flags to choose which
-# STL they use for C++. We need these multiple variants to catch all of those
-# versions of crosstool_top and reliably detect Android.
-#
-# For more info on the various crosstool_tops used by NDK Bazel builds, see:
-# https://docs.bazel.build/versions/master/android-ndk.html#configuring-the-stl
-
-config_setting(
-    name = "config_android",
-    values = {
-        "crosstool_top": "//external:android/crosstool",
-    },
-)
-
-config_setting(
-    name = "config_android-stlport",
-    values = {
-        "crosstool_top": "@androidndk//:toolchain-stlport",
-    },
-)
-
-config_setting(
-    name = "config_android-libcpp",
-    values = {
-        "crosstool_top": "@androidndk//:toolchain-libcpp",
-    },
-)
-
-config_setting(
-    name = "config_android-gnu-libstdcpp",
-    values = {
-        "crosstool_top": "@androidndk//:toolchain-gnu-libstdcpp",
-    },
-)
-
-config_setting(
-    name = "config_android-default",
-    values = {
-        "crosstool_top": "@androidndk//:default_crosstool",
-    },
-)
-
-config_setting(
-    name = "config_win32",
-    values = {
-        "cpu": "win32",
-    },
-)
-
-config_setting(
-    name = "config_win64",
-    values = {
-        "cpu": "win64",
-    },
-)
-
-# Internal testing:
-
-starlark_cc_proto_library(
-    name = "any_cc_proto",
-    visibility = ["//visibility:private"],
-    deps = ["//:any_proto"],
-)
-
-starlark_cc_proto_library(
-    name = "api_cc_proto",
-    visibility = ["//visibility:private"],
-    deps = ["//:api_proto"],
-)
-
-starlark_cc_proto_library(
-    name = "compiler_plugin_cc_proto",
-    visibility = ["//visibility:private"],
-    deps = ["//:compiler_plugin_proto"],
-)
-
-starlark_cc_proto_library(
-    name = "descriptor_cc_proto",
-    visibility = ["//visibility:private"],
-    deps = ["//:descriptor_proto"],
-)
-
-starlark_cc_proto_library(
-    name = "duration_cc_proto",
-    visibility = ["//visibility:private"],
-    deps = ["//:duration_proto"],
-)
-
-starlark_cc_proto_library(
-    name = "empty_cc_proto",
-    visibility = ["//visibility:private"],
-    deps = ["//:empty_proto"],
-)
-
-starlark_cc_proto_library(
-    name = "field_mask_cc_proto",
-    visibility = ["//visibility:private"],
-    deps = ["//:field_mask_proto"],
-)
-
-starlark_cc_proto_library(
-    name = "source_context_cc_proto",
-    visibility = ["//visibility:private"],
-    deps = ["//:source_context_proto"],
-)
-
-starlark_cc_proto_library(
-    name = "struct_cc_proto",
-    visibility = ["//visibility:private"],
-    deps = ["//:struct_proto"],
-)
-
-starlark_cc_proto_library(
-    name = "timestamp_cc_proto",
-    visibility = ["//visibility:private"],
-    deps = ["//:timestamp_proto"],
-)
-
-starlark_cc_proto_library(
-    name = "type_cc_proto",
-    visibility = ["//visibility:private"],
-    deps = ["//:type_proto"],
-)
-
-starlark_cc_proto_library(
-    name = "wrappers_cc_proto",
-    visibility = ["//visibility:private"],
-    deps = ["//:wrappers_proto"],
-)
-
-cc_proto_blacklist_test(
-    name = "cc_proto_blacklist_test",
-    deps = [
-        ":any_cc_proto",
-        ":api_cc_proto",
-        ":compiler_plugin_cc_proto",
-        ":descriptor_cc_proto",
-        ":duration_cc_proto",
-        ":empty_cc_proto",
-        ":field_mask_cc_proto",
-        ":source_context_cc_proto",
-        ":struct_cc_proto",
-        ":timestamp_cc_proto",
-        ":type_cc_proto",
-        ":wrappers_cc_proto",
-    ],
-)
-
-pkg_files(
-    name = "dist_files",
-    srcs = glob(["*"]),
-    strip_prefix = strip_prefix.from_root(""),
-    visibility = ["//pkg:__pkg__"],
-)
diff --git a/libs/protobuf/build_defs/cc_proto_blacklist_test.bzl b/libs/protobuf/build_defs/cc_proto_blacklist_test.bzl
deleted file mode 100644
index 260abde..0000000
--- a/libs/protobuf/build_defs/cc_proto_blacklist_test.bzl
+++ /dev/null
@@ -1,38 +0,0 @@
-"""Contains a unittest to verify that `cc_proto_library` does not generate code for blacklisted `.proto` sources (i.e. WKPs)."""
-
-load("@bazel_skylib//lib:unittest.bzl", "asserts", "unittest")
-
-def _cc_proto_blacklist_test_impl(ctx):
-    """Verifies that there are no C++ compile actions for Well-Known-Protos.
-
-    Args:
-      ctx: The rule context.
-
-    Returns: A (not further specified) sequence of providers.
-    """
-
-    env = unittest.begin(ctx)
-
-    for dep in ctx.attr.deps:
-        files = dep.files.to_list()
-        asserts.equals(
-            env,
-            [],
-            files,
-            "Expected that target '{}' does not provide files, got {}".format(
-                dep.label,
-                len(files),
-            ),
-        )
-
-    return unittest.end(env)
-
-cc_proto_blacklist_test = unittest.make(
-    impl = _cc_proto_blacklist_test_impl,
-    attrs = {
-        "deps": attr.label_list(
-            mandatory = True,
-            providers = [CcInfo],
-        ),
-    },
-)
diff --git a/libs/protobuf/build_defs/compiler_config_setting.bzl b/libs/protobuf/build_defs/compiler_config_setting.bzl
deleted file mode 100644
index f4d1f7b..0000000
--- a/libs/protobuf/build_defs/compiler_config_setting.bzl
+++ /dev/null
@@ -1,23 +0,0 @@
-"""Creates config_setting that allows selecting based on 'compiler' value."""
-
-def create_compiler_config_setting(name, value, visibility = None):
-    # The "do_not_use_tools_cpp_compiler_present" attribute exists to
-    # distinguish between older versions of Bazel that do not support
-    # "@bazel_tools//tools/cpp:compiler" flag_value, and newer ones that do.
-    # In the future, the only way to select on the compiler will be through
-    # flag_values{"@bazel_tools//tools/cpp:compiler"} and the else branch can
-    # be removed.
-    if hasattr(cc_common, "do_not_use_tools_cpp_compiler_present"):
-        native.config_setting(
-            name = name,
-            flag_values = {
-                "@bazel_tools//tools/cpp:compiler": value,
-            },
-            visibility = visibility,
-        )
-    else:
-        native.config_setting(
-            name = name,
-            values = {"compiler": value},
-            visibility = visibility,
-        )
diff --git a/libs/protobuf/build_defs/cpp_opts.bzl b/libs/protobuf/build_defs/cpp_opts.bzl
deleted file mode 100644
index 1d5594d..0000000
--- a/libs/protobuf/build_defs/cpp_opts.bzl
+++ /dev/null
@@ -1,47 +0,0 @@
-# C++ compile/link options for Protobuf.
-
-COPTS = select({
-    "//build_defs:config_msvc": [
-        "/wd4065",  # switch statement contains 'default' but no 'case' labels
-        "/wd4244",  # 'conversion' conversion from 'type1' to 'type2', possible loss of data
-        "/wd4251",  # 'identifier' : class 'type' needs to have dll-interface to be used by clients of class 'type2'
-        "/wd4267",  # 'var' : conversion from 'size_t' to 'type', possible loss of data
-        "/wd4305",  # 'identifier' : truncation from 'type1' to 'type2'
-        "/wd4307",  # 'operator' : integral constant overflow
-        "/wd4309",  # 'conversion' : truncation of constant value
-        "/wd4334",  # 'operator' : result of 32-bit shift implicitly converted to 64 bits (was 64-bit shift intended?)
-        "/wd4355",  # 'this' : used in base member initializer list
-        "/wd4506",  # no definition for inline function 'function'
-        "/wd4800",  # 'type' : forcing value to bool 'true' or 'false' (performance warning)
-        "/wd4996",  # The compiler encountered a deprecated declaration.
-    ],
-    "//conditions:default": [
-        "-DHAVE_ZLIB",
-        "-Woverloaded-virtual",
-        "-Wno-sign-compare",
-    ],
-})
-
-# Android and MSVC builds do not need to link in a separate pthread library.
-LINK_OPTS = select({
-    "//build_defs:config_android": [],
-    "//build_defs:config_android-stlport": [],
-    "//build_defs:config_android-libcpp": [],
-    "//build_defs:config_android-gnu-libstdcpp": [],
-    "//build_defs:config_android-default": [],
-    "//build_defs:config_msvc": [
-        # Suppress linker warnings about files with no symbols defined.
-        "-ignore:4221",
-    ],
-    "//conditions:default": [
-        "-lpthread",
-        "-lm",
-    ],
-})
-
-# When cross-compiling for Windows we need to statically link pthread and the C++ library.
-PROTOC_LINK_OPTS = select({
-    "//build_defs:config_win32": ["-static"],
-    "//build_defs:config_win64": ["-static"],
-    "//conditions:default": [],
-})
diff --git a/libs/protobuf/build_files_updated_unittest.sh b/libs/protobuf/build_files_updated_unittest.sh
deleted file mode 100755
index 87541c3..0000000
--- a/libs/protobuf/build_files_updated_unittest.sh
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/bash
-
-# This script verifies that BUILD files and cmake files are in sync with src/Makefile.am
-
-set -eo pipefail
-
-if [ "$(uname)" != "Linux" ]; then
-  echo "build_files_updated_unittest only supported on Linux. Skipping..."
-  exit 0
-fi
-
-# Keep in sync with files needed by update_file_lists.sh
-generated_files=(
-  "BUILD"
-  "cmake/extract_includes.bat.in"
-  "cmake/libprotobuf-lite.cmake"
-  "cmake/libprotobuf.cmake"
-  "cmake/libprotoc.cmake"
-  "cmake/tests.cmake"
-  "src/Makefile.am"
-)
-
-# If we're running in Bazel, use the Bazel-provided temp-dir.
-if [ -n "${TEST_TMPDIR}" ]; then
-  # Env-var TEST_TMPDIR is set, assume that this is Bazel.
-  # Bazel may have opinions whether we are allowed to delete TEST_TMPDIR.
-  test_root="${TEST_TMPDIR}/build_files_updated_unittest"
-  mkdir "${test_root}"
-else
-  # Seems like we're not executed by Bazel.
-  test_root=$(mktemp -d)
-fi
-
-# From now on, fail if there are any unbound variables.
-set -u
-
-# Remove artifacts after test is finished.
-function cleanup {
-  rm -rf "${test_root}"
-}
-trap cleanup EXIT
-
-# Create golden dir and add snapshot of current state.
-golden_dir="${test_root}/golden"
-mkdir -p "${golden_dir}/cmake" "${golden_dir}/src"
-for file in ${generated_files[@]}; do
-  cp "${file}" "${golden_dir}/${file}"
-done
-
-# Create test dir, copy current state into it, and execute update script.
-test_dir="${test_root}/test"
-cp -R "${golden_dir}" "${test_dir}"
-
-cp "update_file_lists.sh" "${test_dir}/update_file_lists.sh"
-chmod +x "${test_dir}/update_file_lists.sh"
-cd "${test_root}/test"
-bash "${test_dir}/update_file_lists.sh"
-
-# Test whether there are any differences
-for file in ${generated_files[@]}; do
-  diff -du "${golden_dir}/${file}" "${test_dir}/${file}"
-done
diff --git a/libs/protobuf/cmake/CMakeLists.txt b/libs/protobuf/cmake/CMakeLists.txt
deleted file mode 100644
index 4e39573..0000000
--- a/libs/protobuf/cmake/CMakeLists.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-cmake_minimum_required(VERSION 3.5)
-
-message(WARNING "Calling of cmake with source directory set to \"cmake\" subdirectory of Protocol Buffers project is deprecated. Top-level directory of Protocol Buffers project should be used instead.")
-
-project(protobuf C CXX)
-
-set(protobuf_DEPRECATED_CMAKE_SUBDIRECTORY_USAGE TRUE)
-
-include(../CMakeLists.txt)
diff --git a/libs/protobuf/cmake/README.md b/libs/protobuf/cmake/README.md
deleted file mode 100644
index ce3e680..0000000
--- a/libs/protobuf/cmake/README.md
+++ /dev/null
@@ -1,399 +0,0 @@
-This directory contains *CMake* files that can be used to build protobuf
-with *MSVC* on *Windows*. You can build the project from *Command Prompt*
-and using an *Visual Studio* IDE.
-
-You need to have [CMake](http://www.cmake.org), [Visual Studio](https://www.visualstudio.com)
-and optionally [Git](http://git-scm.com) installed on your computer before proceeding.
-
-Most of the instructions will be given to the *Сommand Prompt*, but the same
-actions can be performed using appropriate GUI tools.
-
-Environment Setup
-=================
-
-Open the appropriate *Command Prompt* from the *Start* menu.
-
-For example *x86 Native Tools Command Prompt for VS 2019*:
-
-    C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional>
-
-Change to your working directory:
-
-    C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional>cd C:\Path\to
-    C:\Path\to>
-
-Where *C:\Path\to* is path to your real working directory.
-
-Create a folder where protobuf headers/libraries/binaries will be installed after built:
-
-    C:\Path\to>mkdir install
-
-If *cmake* command is not available from *Command Prompt*, add it to system *PATH* variable:
-
-    C:\Path\to>set PATH=%PATH%;C:\Program Files (x86)\CMake\bin
-
-If *git* command is not available from *Command Prompt*, add it to system *PATH* variable:
-
-    C:\Path\to>set PATH=%PATH%;C:\Program Files\Git\cmd
-
-Optionally, you will want to download [ninja](https://ninja-build.org/) and add it to your *PATH* variable.
-
-    C:\Path\to>set PATH=%PATH%;C:\tools\ninja
-
-Good. Now you are ready to continue.
-
-Getting Sources
-===============
-
-You can get the latest stable source packages from the release page:
-
-    https://github.com/protocolbuffers/protobuf/releases/latest
-
-For example: if you only need C++, download `protobuf-cpp-[VERSION].tar.gz`; if
-you need C++ and Java, download `protobuf-java-[VERSION].tar.gz` (every package
-contains C++ source already); if you need C++ and multiple other languages,
-download `protobuf-all-[VERSION].tar.gz`.
-
-Or you can use git to clone from protobuf git repository.
-
-     C:\Path\to> mkdir src & cd src
-     C:\Path\to\src> git clone -b [release_tag] https://github.com/protocolbuffers/protobuf.git
-
-Where *[release_tag]* is a git tag like *v3.0.0-beta-1* or a branch name like *main*
-if you want to get the latest code.
-
-Go to the project folder:
-
-     C:\Path\to\src> cd protobuf
-     C:\Path\to\src\protobuf>
-
-Remember to update any submodules if you are using git clone (you can skip this
-step if you are using a release .tar.gz or .zip package):
-
-```console
-C:\Path\to\src\protobuf> git submodule update --init --recursive
-```
-
-Good. Now you are ready for *CMake* configuration.
-
-CMake Configuration
-===================
-
-*CMake* supports a lot of different
-[generators](http://www.cmake.org/cmake/help/latest/manual/cmake-generators.7.html)
-for various native build systems.
-
-Of most interest to Windows programmers are the following:
-
-* [Makefile](http://www.cmake.org/cmake/help/latest/manual/cmake-generators.7.html#makefile-generators).
-  This generates NMake Makefiles for Visual Studio. These work, but they are rather slow.
-
-* [Visual Studio](http://www.cmake.org/cmake/help/latest/manual/cmake-generators.7.html#visual-studio-generators)
-  This generates a Visual Studio solution for the project.
-
-* [Ninja](https://cmake.org/cmake/help/latest/manual/cmake-generators.7.html#ninja-generator)
-  This uses the external tool [Ninja](https://ninja-build.org/) to build. It is the fastest solution available.
-  
-Note that as of Visual Studio 2015, Visual Studio includes
-[support for opening directly CMake-based projects](https://docs.microsoft.com/en-us/cpp/build/cmake-projects-in-visual-studio).
-
-It is considered good practice not to build CMake projects in the source tree but in a separate folder.
-
-Create a temporary *build* folder and change your working directory to it:
-
-     mkdir C:\Path\to\build\protobuf
-     cd C:\Path\to\build\protobuf
-     C:\Path\to\build\protobuf>
-
-The *Makefile* and *Ninja* generators can build the project in only one configuration, so you need to build
-a separate folder for each configuration.
-
-To start using a *Release* configuration via the *NMmake* generator:
-
-     C:\Path\to\build\protobuf>mkdir release & cd release
-     C:\Path\to\build\protobuf\release>cmake -G "NMake Makefiles" ^
-     -DCMAKE_BUILD_TYPE=Release ^
-     -DCMAKE_INSTALL_PREFIX=C:\Path\to\install ^
-     C:\Path\to\src\protobuf
-
-It will generate a *NMake* *Makefile* in the current directory.
-
-To use *Debug* configuration using *Ninja*:
-
-     C:\Path\to\build\protobuf>mkdir debug & cd debug
-     C:\Path\to\build\protobuf\debug>cmake -G "Ninja" ^
-     -DCMAKE_BUILD_TYPE=Debug ^
-     -DCMAKE_INSTALL_PREFIX=C:\Path\to\install ^
-     C:\Path\to\src\protobuf
-
-It will generate *Ninja* build scripts in current directory.
-
-The *Visual Studio* generator is multi-configuration: it will generate a single *.sln* file that can be used for both *Debug* and *Release*:
-
-     C:\Path\to\build\protobuf>mkdir solution & cd solution
-     C:\Path\to\build\protobuf\solution>cmake -G "Visual Studio 16 2019" ^
-     -DCMAKE_INSTALL_PREFIX=C:\Path\to\install ^
-     C:\Path\to\src\protobuf
-
-It will generate *Visual Studio* solution file *protobuf.sln* in current directory.
-
-Unit Tests
-----------
-
-Unit tests are being built along with the rest of protobuf. The unit tests require Google Mock (now a part of Google Test).
-
-A copy of [Google Test](https://github.com/google/googletest) is included as a Git submodule in the `third-party/googletest` folder.
-(You do need to initialize the Git submodules as explained above.)
-
-Alternately, you may want to use protobuf in a larger set-up, you may want to use that standard CMake approach where
-you build and install a shared copy of Google Test.
-
-After you've built and installed your Google Test copy, you need add the following definition to your *cmake* command line
-during the configuration step: `-Dprotobuf_USE_EXTERNAL_GTEST=ON`.
-This will cause the standard CMake `find_package(GTest REQUIRED)` to be used.
-
-[find_package](https://cmake.org/cmake/help/latest/command/find_package.html) will search in a default location,
-which on Windows is *C:\Program Files*. This is most likely not what you want. You will want instead to search for
-Google Test in your project's root directory (i.e. the same directory you've passed to `CMAKE_INSTALL_PREFIX` when
-building Google Test). For this, you need to set the `CMAKE_PREFIX_PATH` CMake variable. (There are other ways in CMake,
-see the [manual](https://cmake.org/cmake/help/latest/command/find_package.html) for details.)
-
-For example:
-
-     C:\Path\to\build\protobuf>mkdir solution & cd solution
-     C:\Path\to\build\protobuf\solution>cmake -G "Visual Studio 16 2019" ^
-     -DCMAKE_INSTALL_PREFIX=C:\Path\to\install ^
-     -DCMAKE_PREFIX_PATH=C:\Path\to\my_big_project ^
-     -Dprotobuf_USE_EXTERNAL_GTEST=ON ^
-     C:\Path\to\src\protobuf
-
-In most cases, `CMAKE_PREFIX_PATH` and `CMAKE_INSTALL_PREFIX` will point to the same directory.
-
-To disable testing completely, you need to add the following argument to you *cmake* command line: `-Dprotobuf_BUILD_TESTS=OFF`.
-
-For example:
-
-     C:\Path\to\build\protobuf\solution>cmake -G "Visual Studio 16 2019" ^
-     -DCMAKE_INSTALL_PREFIX=C:\Path\to\install ^
-     -Dprotobuf_BUILD_TESTS=OFF ^
-     C:\Path\to\src\protobuf
-
-Compiling
-=========
-
-The standard way to compile a *CMake* project is `cmake --build <directory>`.
-
-
-Note that if your generator supports multiple configurations, you will probably want to specify which one to build:
-
-     cmake --build C:\Path\to\build\protobuf\solution --config Release
-
-You can also run directly the build tool you've configured:
-
-     C:\Path\to\build\protobuf\release>nmake
-
-or
-
-     C:\Path\to\build\protobuf\debug>ninja
-
-And wait for the compilation to finish.
-
-If you prefer to use the IDE:
-
-  * Open the generated protobuf.sln file in Microsoft Visual Studio.
-  * Choose "Debug" or "Release" configuration as desired.
-  * From the Build menu, choose "Build Solution".
-
-And wait for the compilation to finish.
-
-Testing
-=======
-
-To run unit-tests, first you must compile protobuf as described above.
-Then run:
-
-     C:\Path\to\protobuf\cmake\build\release>ctest --progress --output-on-failure
-
-You can also build the `check` target (not idiomatic CMake usage, though):
-
-     C:\Path\to\protobuf\cmake\build\release>cmake --build . --target check
-
-or
-
-    C:\Path\to\build\protobuf\release>ninja check
-
-You can also build project *check* from Visual Studio solution.
-Yes, it may sound strange, but it works.
-
-You should see output similar to:
-
-     Running main() from gmock_main.cc
-     [==========] Running 1546 tests from 165 test cases.
-
-     ...
-
-     [==========] 1546 tests from 165 test cases ran. (2529 ms total)
-     [  PASSED  ] 1546 tests.
-
-To run specific tests, you need to pass some command line arguments to the test program itself:
-
-     C:\Path\to\build\protobuf\release>tests.exe --gtest_filter=AnyTest*
-     Running main() from gmock_main.cc
-     Note: Google Test filter = AnyTest*
-     [==========] Running 3 tests from 1 test case.
-     [----------] Global test environment set-up.
-     [----------] 3 tests from AnyTest
-     [ RUN      ] AnyTest.TestPackAndUnpack
-     [       OK ] AnyTest.TestPackAndUnpack (0 ms)
-     [ RUN      ] AnyTest.TestPackAndUnpackAny
-     [       OK ] AnyTest.TestPackAndUnpackAny (0 ms)
-     [ RUN      ] AnyTest.TestIs
-     [       OK ] AnyTest.TestIs (0 ms)
-     [----------] 3 tests from AnyTest (1 ms total)
-
-     [----------] Global test environment tear-down
-     [==========] 3 tests from 1 test case ran. (2 ms total)
-     [  PASSED  ] 3 tests.
-
-Note that the tests must be run from the source folder.
-
-If all tests are passed, safely continue.
-
-Installing
-==========
-
-To install protobuf to the *install* folder you've specified in the configuration step, you need to build the `install` target:
-
-     cmake --build C:\Path\to\build\protobuf\solution --config Release --target install
-
-Or if you prefer:
-
-     C:\Path\to\build\protobuf\release>nmake install
-
-or
-
-     C:\Path\to\build\protobuf\debug>ninja install
-
-You can also build project *INSTALL* from Visual Studio solution.
-It sounds not so strange and it works.
-
-This will create the following folders under the *install* location:
-  * bin - that contains protobuf *protoc.exe* compiler;
-  * include - that contains C++ headers and protobuf *.proto files;
-  * lib - that contains linking libraries and *CMake* configuration files for *protobuf* package.
-
-Now you can if needed:
-  * Copy the contents of the include directory to wherever you want to put headers.
-  * Copy protoc.exe wherever you put build tools (probably somewhere in your PATH).
-  * Copy linking libraries libprotobuf[d].lib, libprotobuf-lite[d].lib, and libprotoc[d].lib wherever you put libraries.
-
-To avoid conflicts between the MSVC debug and release runtime libraries, when
-compiling a debug build of your application, you may need to link against a
-debug build of libprotobufd.lib with "d" postfix.  Similarly, release builds should link against
-release libprotobuf.lib library.
-
-DLLs vs. static linking
-=======================
-
-Static linking is now the default for the Protocol Buffer libraries.  Due to
-issues with Win32's use of a separate heap for each DLL, as well as binary
-compatibility issues between different versions of MSVC's STL library, it is
-recommended that you use static linkage only.  However, it is possible to
-build libprotobuf and libprotoc as DLLs if you really want.  To do this,
-do the following:
-
-  * Add an additional flag `-Dprotobuf_BUILD_SHARED_LIBS=ON` when invoking cmake
-  * Follow the same steps as described in the above section.
-  * When compiling your project, make sure to `#define PROTOBUF_USE_DLLS`.
-
-When distributing your software to end users, we strongly recommend that you
-do NOT install libprotobuf.dll or libprotoc.dll to any shared location.
-Instead, keep these libraries next to your binaries, in your application's
-own install directory.  C++ makes it very difficult to maintain binary
-compatibility between releases, so it is likely that future versions of these
-libraries will *not* be usable as drop-in replacements.
-
-If your project is itself a DLL intended for use by third-party software, we
-recommend that you do NOT expose protocol buffer objects in your library's
-public interface, and that you statically link protocol buffers into your
-library.
-
-ZLib support
-============
-
-If you want to include GzipInputStream and GzipOutputStream
-(google/protobuf/io/gzip_stream.h) in libprotobuf, you will need to do a few
-additional steps.
-
-Obtain a copy of the zlib library.  The pre-compiled DLL at zlib.net works.
-You need prepare it:
-
-  * Make sure zlib's two headers are in your `C:\Path\to\install\include` path
-  * Make sure zlib's linking libraries (*.lib file) is in your
-    `C:\Path\to\install\lib` library path.
-
-You can also compile it from source by yourself.
-
-Getting sources:
-
-     C:\Path\to\src>git clone -b v1.2.8 https://github.com/madler/zlib.git
-     C:\Path\to\src>cd zlib
-
-Compiling and Installing:
-
-     C:\Path\to\src\zlib>mkdir C:\Path\to\build\zlib & cd C:\Path\to\build\zlib
-     C:\Path\to\build\zlib>mkdir release & cd release
-     C:\Path\to\build\zlib\release>cmake -G "Ninja" -DCMAKE_BUILD_TYPE=Release ^
-     -DCMAKE_INSTALL_PREFIX=C:\Path\to\install C:\Path\to\src\zlib
-     C:\Path\to\src\zlib\build\release>cmake --build . --target install
-
-You can make *debug* version or use *Visual Studio* generator also as before for the
-protobuf project.
-
-Now add *bin* folder from *install* to system *PATH*:
-
-     C:\Path\to>set PATH=%PATH%;C:\Path\to\install\bin
-
-You need reconfigure protobuf with flag `-Dprotobuf_WITH_ZLIB=ON` when invoking cmake.
-
-Note that if you have compiled ZLIB yourself, as stated above,
-further disable the option `-Dprotobuf_MSVC_STATIC_RUNTIME=OFF`.
-
-If it reports NOTFOUND for zlib_include or zlib_lib, you might haven't put
-the headers or the .lib file in the right directory.
-
-If you already have ZLIB library and headers at some other location on your system then alternatively you can define following configuration flags to locate them:
-
-     -DZLIB_INCLUDE_DIR=<path to dir containing zlib headers>
-     -DZLIB_LIB=<path to dir containing zlib>
-
-Build and testing protobuf as usual.
-
-Notes on Compiler Warnings
-==========================
-
-The following warnings have been disabled while building the protobuf libraries
-and compiler.  You may have to disable some of them in your own project as
-well, or live with them.
-
-* C4244 - Conversion from 'type1' to 'type2', possible loss of data.
-* C4251 - 'identifier' : class 'type' needs to have dll-interface to be used by
-  clients of class 'type2'
-* C4267 - Conversion from 'size_t' to 'type', possible loss of data.
-* C4305 - 'identifier' : truncation from 'type1' to 'type2'
-* C4355 - 'this' : used in base member initializer list
-* C4800 - 'type' : forcing value to bool 'true' or 'false' (performance warning)
-* C4996 - 'function': was declared deprecated
-
-C4251 is of particular note, if you are compiling the Protocol Buffer library
-as a DLL (see previous section).  The protocol buffer library uses templates in
-its public interfaces.  MSVC does not provide any reasonable way to export
-template classes from a DLL.  However, in practice, it appears that exporting
-templates is not necessary anyway.  Since the complete definition of any
-template is available in the header files, anyone importing the DLL will just
-end up compiling instances of the templates into their own binary.  The
-Protocol Buffer implementation does not rely on static template members being
-unique, so there should be no problem with this, but MSVC prints warning
-nevertheless.  So, we disable it.  Unfortunately, this warning will also be
-produced when compiling code which merely uses protocol buffers, meaning you
-may have to disable it in your code too.
diff --git a/libs/protobuf/cmake/conformance.cmake b/libs/protobuf/cmake/conformance.cmake
deleted file mode 100644
index d6c435a..0000000
--- a/libs/protobuf/cmake/conformance.cmake
+++ /dev/null
@@ -1,49 +0,0 @@
-
-add_custom_command(
-  OUTPUT ${protobuf_SOURCE_DIR}/conformance/conformance.pb.cc
-  DEPENDS ${protobuf_PROTOC_EXE} ${protobuf_SOURCE_DIR}/conformance/conformance.proto
-  COMMAND ${protobuf_PROTOC_EXE} ${protobuf_SOURCE_DIR}/conformance/conformance.proto
-      --proto_path=${protobuf_SOURCE_DIR}/conformance
-      --cpp_out=${protobuf_SOURCE_DIR}/conformance
-)
-
-add_custom_command(
-  OUTPUT ${protobuf_SOURCE_DIR}/src/google/protobuf/test_messages_proto3.pb.cc
-         ${protobuf_SOURCE_DIR}/src/google/protobuf/test_messages_proto2.pb.cc
-  DEPENDS ${protobuf_PROTOC_EXE} ${protobuf_SOURCE_DIR}/src/google/protobuf/test_messages_proto3.proto
-          ${protobuf_PROTOC_EXE} ${protobuf_SOURCE_DIR}/src/google/protobuf/test_messages_proto2.proto
-  COMMAND ${protobuf_PROTOC_EXE} ${protobuf_SOURCE_DIR}/src/google/protobuf/test_messages_proto3.proto
-                 ${protobuf_SOURCE_DIR}/src/google/protobuf/test_messages_proto2.proto
-      --proto_path=${protobuf_SOURCE_DIR}/src
-      --cpp_out=${protobuf_SOURCE_DIR}/src
-)
-
-add_executable(conformance_test_runner
-  ${protobuf_SOURCE_DIR}/conformance/binary_json_conformance_suite.cc
-  ${protobuf_SOURCE_DIR}/conformance/binary_json_conformance_suite.h
-  ${protobuf_SOURCE_DIR}/conformance/conformance.pb.cc
-  ${protobuf_SOURCE_DIR}/conformance/conformance_test.cc
-  ${protobuf_SOURCE_DIR}/conformance/conformance_test_runner.cc
-  ${protobuf_SOURCE_DIR}/conformance/third_party/jsoncpp/json.h
-  ${protobuf_SOURCE_DIR}/conformance/third_party/jsoncpp/jsoncpp.cpp
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/test_messages_proto2.pb.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/test_messages_proto3.pb.cc
-)
-
-add_executable(conformance_cpp
-  ${protobuf_SOURCE_DIR}/conformance/conformance.pb.cc
-  ${protobuf_SOURCE_DIR}/conformance/conformance_cpp.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/test_messages_proto2.pb.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/test_messages_proto3.pb.cc
-)
-
-target_include_directories(
-  conformance_test_runner
-  PUBLIC ${protobuf_SOURCE_DIR}/conformance)
-
-target_include_directories(
-  conformance_cpp
-  PUBLIC ${protobuf_SOURCE_DIR}/conformance)
-
-target_link_libraries(conformance_test_runner libprotobuf)
-target_link_libraries(conformance_cpp libprotobuf)
diff --git a/libs/protobuf/cmake/examples.cmake b/libs/protobuf/cmake/examples.cmake
deleted file mode 100644
index 3b83d2b..0000000
--- a/libs/protobuf/cmake/examples.cmake
+++ /dev/null
@@ -1,57 +0,0 @@
-if(protobuf_VERBOSE)
-  message(STATUS "Protocol Buffers Examples Configuring...")
-endif()
-
-get_filename_component(examples_dir "${protobuf_SOURCE_DIR}/examples" ABSOLUTE)
-
-if(protobuf_VERBOSE)
-  message(STATUS "Protocol Buffers Examples Configuring done")
-endif()
-include(ExternalProject)
-
-# Internal utility function: Create a custom target representing a build of examples with custom options.
-function(add_examples_build NAME)
-
-  ExternalProject_Add(${NAME}
-    PREFIX ${NAME}
-    SOURCE_DIR "${examples_dir}"
-    BINARY_DIR ${NAME}
-    STAMP_DIR ${NAME}/logs
-    INSTALL_COMMAND "" #Skip
-    LOG_CONFIGURE 1
-    CMAKE_CACHE_ARGS "-DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}"
-                     "-Dprotobuf_VERBOSE:BOOL=${protobuf_VERBOSE}"
-                     ${ARGN}
-  )
-  set_property(TARGET ${NAME} PROPERTY FOLDER "Examples")
-  set_property(TARGET ${NAME} PROPERTY EXCLUDE_FROM_ALL TRUE)
-endfunction()
-
-# Add examples as an external project.
-# sub_directory cannot be used because the find_package(protobuf) call would cause failures with redefined targets.
-add_examples_build(examples "-Dprotobuf_DIR:PATH=${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_CMAKEDIR}")
-add_dependencies(examples libprotobuf protoc)
-
-option(protobuf_BUILD_EXAMPLES_MULTITEST "Build Examples in multiple configurations. Useful for testing." OFF)
-mark_as_advanced(protobuf_BUILD_EXAMPLES_MULTITEST)
-if(protobuf_BUILD_EXAMPLES_MULTITEST)
-  set_property(GLOBAL PROPERTY USE_FOLDERS ON)
-
-  #Build using the legacy compatibility module.
-  add_examples_build(examples-legacy
-    "-Dprotobuf_DIR:PATH=${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_CMAKEDIR}"
-    "-Dprotobuf_MODULE_COMPATIBLE:BOOL=TRUE"
-  )
-  add_dependencies(examples-legacy libprotobuf protoc)
-
-  #Build using the installed library.
-  add_examples_build(examples-installed
-    "-Dprotobuf_DIR:PATH=${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_CMAKEDIR}"
-  )
-
-  #Build using the installed library in legacy compatibility mode.
-  add_examples_build(examples-installed-legacy
-    "-Dprotobuf_DIR:PATH=${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_CMAKEDIR}"
-    "-Dprotobuf_MODULE_COMPATIBLE:BOOL=TRUE"
-  )
-endif()
diff --git a/libs/protobuf/cmake/extract_includes.bat.in b/libs/protobuf/cmake/extract_includes.bat.in
deleted file mode 100644
index 1292829..0000000
--- a/libs/protobuf/cmake/extract_includes.bat.in
+++ /dev/null
@@ -1,144 +0,0 @@
-mkdir include
-mkdir include\google
-mkdir include\google\protobuf
-mkdir include\google\protobuf\compiler
-mkdir include\google\protobuf\compiler\cpp
-mkdir include\google\protobuf\compiler\csharp
-mkdir include\google\protobuf\compiler\java
-mkdir include\google\protobuf\compiler\objectivec
-mkdir include\google\protobuf\compiler\php
-mkdir include\google\protobuf\compiler\python
-mkdir include\google\protobuf\compiler\ruby
-mkdir include\google\protobuf\io
-mkdir include\google\protobuf\stubs
-mkdir include\google\protobuf\util
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\any.h" include\google\protobuf\any.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\any.pb.h" include\google\protobuf\any.pb.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\api.pb.h" include\google\protobuf\api.pb.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\arena.h" include\google\protobuf\arena.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\arena_impl.h" include\google\protobuf\arena_impl.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\arenastring.h" include\google\protobuf\arenastring.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\arenaz_sampler.h" include\google\protobuf\arenaz_sampler.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\compiler\code_generator.h" include\google\protobuf\compiler\code_generator.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\compiler\command_line_interface.h" include\google\protobuf\compiler\command_line_interface.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\compiler\cpp\file.h" include\google\protobuf\compiler\cpp\file.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\compiler\cpp\cpp_generator.h" include\google\protobuf\compiler\cpp\cpp_generator.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\compiler\cpp\generator.h" include\google\protobuf\compiler\cpp\generator.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\compiler\cpp\helpers.h" include\google\protobuf\compiler\cpp\helpers.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\compiler\cpp\names.h" include\google\protobuf\compiler\cpp\names.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\compiler\csharp\csharp_doc_comment.h" include\google\protobuf\compiler\csharp\csharp_doc_comment.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\compiler\csharp\csharp_generator.h" include\google\protobuf\compiler\csharp\csharp_generator.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\compiler\csharp\csharp_names.h" include\google\protobuf\compiler\csharp\csharp_names.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\compiler\csharp\csharp_options.h" include\google\protobuf\compiler\csharp\csharp_options.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\compiler\importer.h" include\google\protobuf\compiler\importer.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\compiler\java\generator.h" include\google\protobuf\compiler\java\generator.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\compiler\java\java_generator.h" include\google\protobuf\compiler\java\java_generator.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\compiler\java\kotlin_generator.h" include\google\protobuf\compiler\java\kotlin_generator.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\compiler\java\names.h" include\google\protobuf\compiler\java\names.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\compiler\objectivec\objectivec_generator.h" include\google\protobuf\compiler\objectivec\objectivec_generator.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\compiler\objectivec\objectivec_helpers.h" include\google\protobuf\compiler\objectivec\objectivec_helpers.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\compiler\parser.h" include\google\protobuf\compiler\parser.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\compiler\php\php_generator.h" include\google\protobuf\compiler\php\php_generator.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\compiler\plugin.h" include\google\protobuf\compiler\plugin.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\compiler\plugin.pb.h" include\google\protobuf\compiler\plugin.pb.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\compiler\python\generator.h" include\google\protobuf\compiler\python\generator.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\compiler\python\pyi_generator.h" include\google\protobuf\compiler\python\pyi_generator.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\compiler\python\python_generator.h" include\google\protobuf\compiler\python\python_generator.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\compiler\ruby\ruby_generator.h" include\google\protobuf\compiler\ruby\ruby_generator.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\descriptor.h" include\google\protobuf\descriptor.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\descriptor.pb.h" include\google\protobuf\descriptor.pb.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\descriptor_database.h" include\google\protobuf\descriptor_database.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\duration.pb.h" include\google\protobuf\duration.pb.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\dynamic_message.h" include\google\protobuf\dynamic_message.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\empty.pb.h" include\google\protobuf\empty.pb.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\endian.h" include\google\protobuf\endian.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\explicitly_constructed.h" include\google\protobuf\explicitly_constructed.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\extension_set.h" include\google\protobuf\extension_set.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\extension_set_inl.h" include\google\protobuf\extension_set_inl.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\field_access_listener.h" include\google\protobuf\field_access_listener.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\field_mask.pb.h" include\google\protobuf\field_mask.pb.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\generated_enum_reflection.h" include\google\protobuf\generated_enum_reflection.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\generated_enum_util.h" include\google\protobuf\generated_enum_util.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\generated_message_bases.h" include\google\protobuf\generated_message_bases.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\generated_message_reflection.h" include\google\protobuf\generated_message_reflection.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\generated_message_tctable_decl.h" include\google\protobuf\generated_message_tctable_decl.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\generated_message_tctable_impl.h" include\google\protobuf\generated_message_tctable_impl.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\generated_message_util.h" include\google\protobuf\generated_message_util.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\has_bits.h" include\google\protobuf\has_bits.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\implicit_weak_message.h" include\google\protobuf\implicit_weak_message.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\inlined_string_field.h" include\google\protobuf\inlined_string_field.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\io\coded_stream.h" include\google\protobuf\io\coded_stream.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\io\gzip_stream.h" include\google\protobuf\io\gzip_stream.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\io\io_win32.h" include\google\protobuf\io\io_win32.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\io\printer.h" include\google\protobuf\io\printer.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\io\strtod.h" include\google\protobuf\io\strtod.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\io\tokenizer.h" include\google\protobuf\io\tokenizer.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\io\zero_copy_stream.h" include\google\protobuf\io\zero_copy_stream.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\io\zero_copy_stream_impl.h" include\google\protobuf\io\zero_copy_stream_impl.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\io\zero_copy_stream_impl_lite.h" include\google\protobuf\io\zero_copy_stream_impl_lite.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\map.h" include\google\protobuf\map.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\map_entry.h" include\google\protobuf\map_entry.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\map_entry_lite.h" include\google\protobuf\map_entry_lite.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\map_field.h" include\google\protobuf\map_field.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\map_field_inl.h" include\google\protobuf\map_field_inl.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\map_field_lite.h" include\google\protobuf\map_field_lite.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\map_type_handler.h" include\google\protobuf\map_type_handler.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\message.h" include\google\protobuf\message.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\message_lite.h" include\google\protobuf\message_lite.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\metadata.h" include\google\protobuf\metadata.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\metadata_lite.h" include\google\protobuf\metadata_lite.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\parse_context.h" include\google\protobuf\parse_context.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\port.h" include\google\protobuf\port.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\port_def.inc" include\google\protobuf\port_def.inc
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\port_undef.inc" include\google\protobuf\port_undef.inc
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\reflection.h" include\google\protobuf\reflection.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\reflection_ops.h" include\google\protobuf\reflection_ops.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\repeated_field.h" include\google\protobuf\repeated_field.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\repeated_ptr_field.h" include\google\protobuf\repeated_ptr_field.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\service.h" include\google\protobuf\service.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\source_context.pb.h" include\google\protobuf\source_context.pb.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\struct.pb.h" include\google\protobuf\struct.pb.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\stubs\bytestream.h" include\google\protobuf\stubs\bytestream.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\stubs\callback.h" include\google\protobuf\stubs\callback.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\stubs\casts.h" include\google\protobuf\stubs\casts.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\stubs\common.h" include\google\protobuf\stubs\common.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\stubs\hash.h" include\google\protobuf\stubs\hash.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\stubs\logging.h" include\google\protobuf\stubs\logging.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\stubs\macros.h" include\google\protobuf\stubs\macros.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\stubs\map_util.h" include\google\protobuf\stubs\map_util.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\stubs\mutex.h" include\google\protobuf\stubs\mutex.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\stubs\once.h" include\google\protobuf\stubs\once.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\stubs\platform_macros.h" include\google\protobuf\stubs\platform_macros.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\stubs\port.h" include\google\protobuf\stubs\port.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\stubs\status.h" include\google\protobuf\stubs\status.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\stubs\stl_util.h" include\google\protobuf\stubs\stl_util.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\stubs\stringpiece.h" include\google\protobuf\stubs\stringpiece.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\stubs\strutil.h" include\google\protobuf\stubs\strutil.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\stubs\template_util.h" include\google\protobuf\stubs\template_util.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\text_format.h" include\google\protobuf\text_format.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\timestamp.pb.h" include\google\protobuf\timestamp.pb.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\type.pb.h" include\google\protobuf\type.pb.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\unknown_field_set.h" include\google\protobuf\unknown_field_set.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\util\delimited_message_util.h" include\google\protobuf\util\delimited_message_util.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\util\field_comparator.h" include\google\protobuf\util\field_comparator.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\util\field_mask_util.h" include\google\protobuf\util\field_mask_util.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\util\json_util.h" include\google\protobuf\util\json_util.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\util\message_differencer.h" include\google\protobuf\util\message_differencer.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\util\time_util.h" include\google\protobuf\util\time_util.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\util\type_resolver.h" include\google\protobuf\util\type_resolver.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\util\type_resolver_util.h" include\google\protobuf\util\type_resolver_util.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\wire_format.h" include\google\protobuf\wire_format.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\wire_format_lite.h" include\google\protobuf\wire_format_lite.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\wrappers.pb.h" include\google\protobuf\wrappers.pb.h
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\any.proto" include\google\protobuf\any.proto
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\api.proto" include\google\protobuf\api.proto
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\compiler\plugin.proto" include\google\protobuf\compiler\plugin.proto
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\descriptor.proto" include\google\protobuf\descriptor.proto
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\duration.proto" include\google\protobuf\duration.proto
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\empty.proto" include\google\protobuf\empty.proto
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\field_mask.proto" include\google\protobuf\field_mask.proto
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\source_context.proto" include\google\protobuf\source_context.proto
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\struct.proto" include\google\protobuf\struct.proto
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\timestamp.proto" include\google\protobuf\timestamp.proto
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\type.proto" include\google\protobuf\type.proto
-copy "${PROTOBUF_SOURCE_WIN32_PATH}\..\src\google\protobuf\wrappers.proto" include\google\protobuf\wrappers.proto
diff --git a/libs/protobuf/cmake/install.cmake b/libs/protobuf/cmake/install.cmake
deleted file mode 100644
index 825cb25..0000000
--- a/libs/protobuf/cmake/install.cmake
+++ /dev/null
@@ -1,156 +0,0 @@
-include(GNUInstallDirs)
-
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/protobuf.pc.cmake
-               ${CMAKE_CURRENT_BINARY_DIR}/protobuf.pc @ONLY)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/protobuf-lite.pc.cmake
-               ${CMAKE_CURRENT_BINARY_DIR}/protobuf-lite.pc @ONLY)
-
-set(_protobuf_libraries libprotobuf-lite libprotobuf)
-if (protobuf_BUILD_LIBPROTOC)
-    list(APPEND _protobuf_libraries libprotoc)
-endif (protobuf_BUILD_LIBPROTOC)
-
-foreach(_library ${_protobuf_libraries})
-  set_property(TARGET ${_library}
-    PROPERTY INTERFACE_INCLUDE_DIRECTORIES
-    $<BUILD_INTERFACE:${protobuf_SOURCE_DIR}/src>
-    $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
-  if (UNIX AND NOT APPLE)
-    set_property(TARGET ${_library}
-      PROPERTY INSTALL_RPATH "$ORIGIN")
-  elseif (APPLE)
-    set_property(TARGET ${_library}
-      PROPERTY INSTALL_RPATH "@loader_path")
-  endif()
-  install(TARGETS ${_library} EXPORT protobuf-targets
-    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT ${_library}
-    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT ${_library}
-    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT ${_library})
-endforeach()
-
-if (protobuf_BUILD_PROTOC_BINARIES)
-  install(TARGETS protoc EXPORT protobuf-targets
-    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT protoc
-    BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT protoc)
-  if (UNIX AND NOT APPLE)
-    set_property(TARGET protoc
-      PROPERTY INSTALL_RPATH "$ORIGIN/../${CMAKE_INSTALL_LIBDIR}")
-  elseif (APPLE)
-    set_property(TARGET protoc
-      PROPERTY INSTALL_RPATH "@loader_path/../lib")
-  endif()
-endif (protobuf_BUILD_PROTOC_BINARIES)
-
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/protobuf.pc ${CMAKE_CURRENT_BINARY_DIR}/protobuf-lite.pc DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
-
-file(STRINGS ${protobuf_SOURCE_DIR}/cmake/extract_includes.bat.in _extract_strings
-  REGEX "^copy")
-foreach(_extract_string ${_extract_strings})
-  string(REGEX REPLACE "^.* .+ include\\\\(.+)$" "\\1"
-    _header ${_extract_string})
-  string(REPLACE "\\" "/" _header ${_header})
-  get_filename_component(_extract_from "${protobuf_SOURCE_DIR}/src/${_header}" ABSOLUTE)
-  get_filename_component(_extract_name ${_header} NAME)
-  get_filename_component(_extract_to "${CMAKE_INSTALL_INCLUDEDIR}/${_header}" DIRECTORY)
-  if(EXISTS "${_extract_from}")
-    install(FILES "${_extract_from}"
-      DESTINATION "${_extract_to}"
-      COMPONENT protobuf-headers
-      RENAME "${_extract_name}")
-  else()
-    message(AUTHOR_WARNING "The file \"${_extract_from}\" is listed in "
-      "\"${protobuf_SOURCE_DIR}/cmake/extract_includes.bat.in\" "
-      "but there not exists. The file will not be installed.")
-  endif()
-endforeach()
-
-# Internal function for parsing auto tools scripts
-function(_protobuf_auto_list FILE_NAME VARIABLE)
-  file(STRINGS ${FILE_NAME} _strings)
-  set(_list)
-  foreach(_string ${_strings})
-    set(_found)
-    string(REGEX MATCH "^[ \t]*${VARIABLE}[ \t]*=[ \t]*" _found "${_string}")
-    if(_found)
-      string(LENGTH "${_found}" _length)
-      string(SUBSTRING "${_string}" ${_length} -1 _draft_list)
-      foreach(_item ${_draft_list})
-        string(STRIP "${_item}" _item)
-        list(APPEND _list "${_item}")
-      endforeach()
-    endif()
-  endforeach()
-  set(${VARIABLE} ${_list} PARENT_SCOPE)
-endfunction()
-
-# Install well-known type proto files
-_protobuf_auto_list("${protobuf_SOURCE_DIR}/src/Makefile.am" nobase_dist_proto_DATA)
-foreach(_file ${nobase_dist_proto_DATA})
-  get_filename_component(_file_from "${protobuf_SOURCE_DIR}/src/${_file}" ABSOLUTE)
-  get_filename_component(_file_name ${_file} NAME)
-  get_filename_component(_dir ${_file} DIRECTORY)
-  if(EXISTS "${_file_from}")
-    install(FILES "${_file_from}"
-      DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${_dir}"
-      COMPONENT protobuf-protos
-      RENAME "${_file_name}")
-  else()
-    message(AUTHOR_WARNING "The file \"${_file_from}\" is listed in "
-      "\"${protobuf_SOURCE_DIR}/src/Makefile.am\" as nobase_dist_proto_DATA "
-      "but there not exists. The file will not be installed.")
-  endif()
-endforeach()
-
-# Install configuration
-set(_cmakedir_desc "Directory relative to CMAKE_INSTALL to install the cmake configuration files")
-set(_exampledir_desc "Directory relative to CMAKE_INSTALL_DATA to install examples")
-if(NOT MSVC)
-  set(CMAKE_INSTALL_CMAKEDIR "${CMAKE_INSTALL_LIBDIR}/cmake/protobuf" CACHE STRING "${_cmakedir_desc}")
-  set(CMAKE_INSTALL_EXAMPLEDIR "${CMAKE_INSTALL_DATADIR}/protobuf/examples" CACHE STRING "${_exampledir_desc}")
-else()
-  set(CMAKE_INSTALL_CMAKEDIR "cmake" CACHE STRING "${_cmakedir_desc}")
-  set(CMAKE_INSTALL_EXAMPLEDIR "examples" CACHE STRING "${_exampledir_desc}")
-endif()
-mark_as_advanced(CMAKE_INSTALL_CMAKEDIR)
-mark_as_advanced(CMAKE_INSTALL_EXAMPLEDIR)
-
-configure_file(${protobuf_SOURCE_DIR}/cmake/protobuf-config.cmake.in
-  ${CMAKE_INSTALL_CMAKEDIR}/protobuf-config.cmake @ONLY)
-configure_file(${protobuf_SOURCE_DIR}/cmake/protobuf-config-version.cmake.in
-  ${CMAKE_INSTALL_CMAKEDIR}/protobuf-config-version.cmake @ONLY)
-configure_file(${protobuf_SOURCE_DIR}/cmake/protobuf-module.cmake.in
-  ${CMAKE_INSTALL_CMAKEDIR}/protobuf-module.cmake @ONLY)
-configure_file(${protobuf_SOURCE_DIR}/cmake/protobuf-options.cmake
-  ${CMAKE_INSTALL_CMAKEDIR}/protobuf-options.cmake @ONLY)
-
-# Allows the build directory to be used as a find directory.
-
-if (protobuf_BUILD_PROTOC_BINARIES)
-  export(TARGETS libprotobuf-lite libprotobuf libprotoc protoc
-    NAMESPACE protobuf::
-    FILE ${CMAKE_INSTALL_CMAKEDIR}/protobuf-targets.cmake
-  )
-else (protobuf_BUILD_PROTOC_BINARIES)
-  export(TARGETS libprotobuf-lite libprotobuf
-    NAMESPACE protobuf::
-    FILE ${CMAKE_INSTALL_CMAKEDIR}/protobuf-targets.cmake
-  )
-endif (protobuf_BUILD_PROTOC_BINARIES)
-
-install(EXPORT protobuf-targets
-  DESTINATION "${CMAKE_INSTALL_CMAKEDIR}"
-  NAMESPACE protobuf::
-  COMPONENT protobuf-export)
-
-install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_INSTALL_CMAKEDIR}/
-  DESTINATION "${CMAKE_INSTALL_CMAKEDIR}"
-  COMPONENT protobuf-export
-  PATTERN protobuf-targets.cmake EXCLUDE
-)
-
-option(protobuf_INSTALL_EXAMPLES "Install the examples folder" OFF)
-if(protobuf_INSTALL_EXAMPLES)
-  install(DIRECTORY examples/
-    DESTINATION "${CMAKE_INSTALL_EXAMPLEDIR}"
-    COMPONENT protobuf-examples)
-endif()
diff --git a/libs/protobuf/cmake/libprotobuf-lite.cmake b/libs/protobuf/cmake/libprotobuf-lite.cmake
deleted file mode 100644
index 83e9703..0000000
--- a/libs/protobuf/cmake/libprotobuf-lite.cmake
+++ /dev/null
@@ -1,118 +0,0 @@
-set(libprotobuf_lite_files
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/any_lite.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/arena.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/arenastring.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/arenaz_sampler.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/extension_set.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/generated_enum_util.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/generated_message_tctable_lite.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/generated_message_util.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/implicit_weak_message.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/inlined_string_field.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/io/coded_stream.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/io/io_win32.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/io/strtod.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/io/zero_copy_stream.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/io/zero_copy_stream_impl.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/io/zero_copy_stream_impl_lite.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/map.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/message_lite.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/parse_context.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/repeated_field.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/repeated_ptr_field.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/bytestream.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/common.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/int128.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/status.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/statusor.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/stringpiece.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/stringprintf.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/structurally_valid.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/strutil.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/time.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/wire_format_lite.cc
-)
-
-set(libprotobuf_lite_includes
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/any.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/arena.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/arena_impl.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/arenastring.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/arenaz_sampler.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/endian.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/explicitly_constructed.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/extension_set.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/extension_set_inl.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/generated_enum_util.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/generated_message_tctable_decl.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/generated_message_tctable_impl.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/generated_message_util.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/has_bits.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/implicit_weak_message.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/inlined_string_field.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/io/coded_stream.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/io/io_win32.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/io/strtod.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/io/zero_copy_stream.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/io/zero_copy_stream_impl.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/io/zero_copy_stream_impl_lite.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/map.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/map_entry_lite.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/map_field_lite.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/map_type_handler.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/message_lite.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/metadata_lite.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/parse_context.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/port.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/repeated_field.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/repeated_ptr_field.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/bytestream.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/callback.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/casts.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/common.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/hash.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/logging.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/macros.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/map_util.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/mutex.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/once.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/platform_macros.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/port.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/status.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/stl_util.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/stringpiece.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/strutil.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/template_util.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/wire_format_lite.h
-)
-
-add_library(libprotobuf-lite ${protobuf_SHARED_OR_STATIC}
-  ${libprotobuf_lite_files} ${libprotobuf_lite_includes} ${protobuf_version_rc_file})
-if(protobuf_HAVE_LD_VERSION_SCRIPT)
-  if(${CMAKE_VERSION} VERSION_GREATER 3.13 OR ${CMAKE_VERSION} VERSION_EQUAL 3.13)
-    target_link_options(libprotobuf-lite PRIVATE -Wl,--version-script=${protobuf_SOURCE_DIR}/src/libprotobuf-lite.map)
-  elseif(protobuf_BUILD_SHARED_LIBS)
-    target_link_libraries(libprotobuf-lite PRIVATE -Wl,--version-script=${protobuf_SOURCE_DIR}/src/libprotobuf-lite.map)
-  endif()
-  set_target_properties(libprotobuf-lite PROPERTIES
-    LINK_DEPENDS ${protobuf_SOURCE_DIR}/src/libprotobuf-lite.map)
-endif()
-target_link_libraries(libprotobuf-lite PRIVATE ${CMAKE_THREAD_LIBS_INIT})
-if(protobuf_LINK_LIBATOMIC)
-  target_link_libraries(libprotobuf-lite PRIVATE atomic)
-endif()
-if(${CMAKE_SYSTEM_NAME} STREQUAL "Android")
-  target_link_libraries(libprotobuf-lite PRIVATE log)
-endif()
-target_include_directories(libprotobuf-lite PUBLIC ${protobuf_SOURCE_DIR}/src)
-if(protobuf_BUILD_SHARED_LIBS)
-  target_compile_definitions(libprotobuf-lite
-    PUBLIC  PROTOBUF_USE_DLLS
-    PRIVATE LIBPROTOBUF_EXPORTS)
-endif()
-set_target_properties(libprotobuf-lite PROPERTIES
-    VERSION ${protobuf_VERSION}
-    SOVERSION 32
-    OUTPUT_NAME ${LIB_PREFIX}protobuf-lite
-    DEBUG_POSTFIX "${protobuf_DEBUG_POSTFIX}")
-add_library(protobuf::libprotobuf-lite ALIAS libprotobuf-lite)
diff --git a/libs/protobuf/cmake/libprotobuf.cmake b/libs/protobuf/cmake/libprotobuf.cmake
deleted file mode 100644
index 07e4bcf..0000000
--- a/libs/protobuf/cmake/libprotobuf.cmake
+++ /dev/null
@@ -1,134 +0,0 @@
-set(libprotobuf_files
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/any.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/any.pb.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/api.pb.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/importer.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/parser.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/descriptor.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/descriptor.pb.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/descriptor_database.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/duration.pb.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/dynamic_message.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/empty.pb.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/extension_set_heavy.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/field_mask.pb.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/generated_message_bases.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/generated_message_reflection.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/generated_message_tctable_full.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/io/gzip_stream.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/io/printer.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/io/tokenizer.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/map_field.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/message.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/reflection_ops.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/service.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/source_context.pb.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/struct.pb.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/substitute.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/text_format.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/timestamp.pb.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/type.pb.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/unknown_field_set.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/util/delimited_message_util.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/util/field_comparator.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/util/field_mask_util.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/util/internal/datapiece.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/util/internal/default_value_objectwriter.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/util/internal/error_listener.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/util/internal/field_mask_utility.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/util/internal/json_escaping.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/util/internal/json_objectwriter.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/util/internal/json_stream_parser.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/util/internal/object_writer.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/util/internal/proto_writer.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/util/internal/protostream_objectsource.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/util/internal/protostream_objectwriter.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/util/internal/type_info.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/util/internal/utility.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/util/json_util.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/util/message_differencer.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/util/time_util.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/util/type_resolver_util.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/wire_format.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/wrappers.pb.cc
-)
-
-set(libprotobuf_includes
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/any.pb.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/api.pb.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/importer.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/parser.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/descriptor.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/descriptor.pb.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/descriptor_database.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/duration.pb.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/dynamic_message.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/empty.pb.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/field_access_listener.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/field_mask.pb.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/generated_enum_reflection.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/generated_message_bases.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/generated_message_reflection.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/io/gzip_stream.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/io/printer.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/io/tokenizer.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/map_entry.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/map_field.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/map_field_inl.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/message.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/metadata.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/reflection.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/reflection_internal.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/reflection_ops.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/service.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/source_context.pb.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/struct.pb.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/text_format.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/timestamp.pb.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/type.pb.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/unknown_field_set.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/util/delimited_message_util.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/util/field_comparator.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/util/field_mask_util.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/util/json_util.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/util/message_differencer.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/util/time_util.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/util/type_resolver.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/util/type_resolver_util.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/wire_format.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/wrappers.pb.h
-)
-
-add_library(libprotobuf ${protobuf_SHARED_OR_STATIC}
-  ${libprotobuf_lite_files} ${libprotobuf_files} ${libprotobuf_includes} ${protobuf_version_rc_file})
-if(protobuf_HAVE_LD_VERSION_SCRIPT)
-  if(${CMAKE_VERSION} VERSION_GREATER 3.13 OR ${CMAKE_VERSION} VERSION_EQUAL 3.13)
-    target_link_options(libprotobuf PRIVATE -Wl,--version-script=${protobuf_SOURCE_DIR}/src/libprotobuf.map)
-  elseif(protobuf_BUILD_SHARED_LIBS)
-    target_link_libraries(libprotobuf PRIVATE -Wl,--version-script=${protobuf_SOURCE_DIR}/src/libprotobuf.map)
-  endif()
-  set_target_properties(libprotobuf PROPERTIES
-    LINK_DEPENDS ${protobuf_SOURCE_DIR}/src/libprotobuf.map)
-endif()
-target_link_libraries(libprotobuf PRIVATE ${CMAKE_THREAD_LIBS_INIT})
-if(protobuf_WITH_ZLIB)
-  target_link_libraries(libprotobuf PRIVATE ${ZLIB_LIBRARIES})
-endif()
-if(protobuf_LINK_LIBATOMIC)
-  target_link_libraries(libprotobuf PRIVATE atomic)
-endif()
-if(${CMAKE_SYSTEM_NAME} STREQUAL "Android")
-  target_link_libraries(libprotobuf PRIVATE log)
-endif()
-target_include_directories(libprotobuf PUBLIC ${protobuf_SOURCE_DIR}/src)
-if(protobuf_BUILD_SHARED_LIBS)
-  target_compile_definitions(libprotobuf
-    PUBLIC  PROTOBUF_USE_DLLS
-    PRIVATE LIBPROTOBUF_EXPORTS)
-endif()
-set_target_properties(libprotobuf PROPERTIES
-    VERSION ${protobuf_VERSION}
-    SOVERSION 32
-    OUTPUT_NAME ${LIB_PREFIX}protobuf
-    DEBUG_POSTFIX "${protobuf_DEBUG_POSTFIX}")
-add_library(protobuf::libprotobuf ALIAS libprotobuf)
diff --git a/libs/protobuf/cmake/libprotoc.cmake b/libs/protobuf/cmake/libprotoc.cmake
deleted file mode 100644
index 15a47e5..0000000
--- a/libs/protobuf/cmake/libprotoc.cmake
+++ /dev/null
@@ -1,136 +0,0 @@
-set(libprotoc_files
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/code_generator.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/command_line_interface.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/enum.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/enum_field.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/extension.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/field.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/file.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/generator.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/helpers.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/map_field.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/message.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/message_field.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/padding_optimizer.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/parse_function_generator.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/primitive_field.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/service.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/string_field.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/csharp/csharp_doc_comment.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/csharp/csharp_enum.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/csharp/csharp_enum_field.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/csharp/csharp_field_base.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/csharp/csharp_generator.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/csharp/csharp_helpers.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/csharp/csharp_map_field.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/csharp/csharp_message.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/csharp/csharp_message_field.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/csharp/csharp_primitive_field.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/csharp/csharp_reflection_class.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/csharp/csharp_repeated_enum_field.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/csharp/csharp_repeated_message_field.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/csharp/csharp_repeated_primitive_field.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/csharp/csharp_source_generator_base.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/csharp/csharp_wrapper_field.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/context.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/doc_comment.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/enum.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/enum_field.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/enum_field_lite.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/enum_lite.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/extension.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/extension_lite.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/field.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/file.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/generator.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/generator_factory.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/helpers.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/kotlin_generator.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/map_field.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/map_field_lite.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/message.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/message_builder.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/message_builder_lite.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/message_field.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/message_field_lite.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/message_lite.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/name_resolver.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/primitive_field.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/primitive_field_lite.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/service.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/shared_code_generator.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/string_field.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/string_field_lite.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/objectivec/objectivec_enum.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/objectivec/objectivec_enum_field.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/objectivec/objectivec_extension.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/objectivec/objectivec_field.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/objectivec/objectivec_file.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/objectivec/objectivec_generator.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/objectivec/objectivec_helpers.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/objectivec/objectivec_map_field.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/objectivec/objectivec_message.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/objectivec/objectivec_message_field.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/objectivec/objectivec_oneof.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/objectivec/objectivec_primitive_field.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/php/php_generator.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/plugin.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/plugin.pb.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/python/generator.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/python/helpers.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/python/pyi_generator.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/ruby/ruby_generator.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/subprocess.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/zip_writer.cc
-)
-
-set(libprotoc_headers
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/code_generator.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/command_line_interface.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/cpp_generator.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/file.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/generator.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/helpers.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/names.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/csharp/csharp_doc_comment.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/csharp/csharp_generator.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/csharp/csharp_names.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/csharp/csharp_options.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/generator.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/java_generator.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/kotlin_generator.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/names.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/objectivec/objectivec_generator.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/objectivec/objectivec_helpers.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/php/php_generator.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/plugin.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/python/generator.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/python/pyi_generator.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/python/python_generator.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/ruby/ruby_generator.h
-)
-
-add_library(libprotoc ${protobuf_SHARED_OR_STATIC}
-  ${libprotoc_files} ${libprotoc_headers} ${protobuf_version_rc_file})
-if(protobuf_HAVE_LD_VERSION_SCRIPT)
-  if(${CMAKE_VERSION} VERSION_GREATER 3.13 OR ${CMAKE_VERSION} VERSION_EQUAL 3.13)
-    target_link_options(libprotoc PRIVATE -Wl,--version-script=${protobuf_SOURCE_DIR}/src/libprotoc.map)
-  elseif(protobuf_BUILD_SHARED_LIBS)
-    target_link_libraries(libprotoc PRIVATE -Wl,--version-script=${protobuf_SOURCE_DIR}/src/libprotoc.map)
-  endif()
-  set_target_properties(libprotoc PROPERTIES
-    LINK_DEPENDS ${protobuf_SOURCE_DIR}/src/libprotoc.map)
-endif()
-target_link_libraries(libprotoc PRIVATE libprotobuf)
-if(protobuf_BUILD_SHARED_LIBS)
-  target_compile_definitions(libprotoc
-    PUBLIC  PROTOBUF_USE_DLLS
-    PRIVATE LIBPROTOC_EXPORTS)
-endif()
-set_target_properties(libprotoc PROPERTIES
-    COMPILE_DEFINITIONS LIBPROTOC_EXPORTS
-    VERSION ${protobuf_VERSION}
-    SOVERSION 32
-    OUTPUT_NAME ${LIB_PREFIX}protoc
-    DEBUG_POSTFIX "${protobuf_DEBUG_POSTFIX}")
-add_library(protobuf::libprotoc ALIAS libprotoc)
diff --git a/libs/protobuf/cmake/protobuf-config-version.cmake.in b/libs/protobuf/cmake/protobuf-config-version.cmake.in
deleted file mode 100644
index 3fa0176..0000000
--- a/libs/protobuf/cmake/protobuf-config-version.cmake.in
+++ /dev/null
@@ -1,60 +0,0 @@
-set(PACKAGE_VERSION "@protobuf_VERSION@")
-set(${PACKAGE_FIND_NAME}_VERSION_PRERELEASE "@protobuf_VERSION_PRERELEASE@" PARENT_SCOPE)
-
-# Prerelease versions cannot be passed in directly via the find_package command,
-# so we allow users to specify it in a variable
-if(NOT DEFINED "${PACKAGE_FIND_NAME}_FIND_VERSION_PRERELEASE")
-  set("${${PACKAGE_FIND_NAME}_FIND_VERSION_PRERELEASE}" "")
-else()
-  set(PACKAGE_FIND_VERSION ${PACKAGE_FIND_VERSION}-${${PACKAGE_FIND_NAME}_FIND_VERSION_PRERELEASE})
-endif()
-set(PACKAGE_FIND_VERSION_PRERELEASE "${${PACKAGE_FIND_NAME}_FIND_VERSION_PRERELEASE}")
-
-# VERSION_EQUAL ignores the prerelease strings, so we use STREQUAL.
-if(PACKAGE_FIND_VERSION STREQUAL PACKAGE_VERSION)
-  set(PACKAGE_VERSION_EXACT TRUE)
-endif()
-
-set(PACKAGE_VERSION_COMPATIBLE TRUE) #Assume true until shown otherwise
-
-if(PACKAGE_FIND_VERSION) #Only perform version checks if one is given
-  if(NOT PACKAGE_FIND_VERSION_MAJOR EQUAL "@protobuf_VERSION_MAJOR@")
-    set(PACKAGE_VERSION_COMPATIBLE FALSE)
-  elseif(PACKAGE_FIND_VERSION VERSION_GREATER PACKAGE_VERSION)
-    set(PACKAGE_VERSION_COMPATIBLE FALSE)
-  elseif(PACKAGE_FIND_VERSION VERSION_EQUAL PACKAGE_VERSION)
-    # Do not match prerelease versions to non-prerelease version requests.
-      if(NOT "@protobuf_VERSION_PRERELEASE@" STREQUAL "" AND PACKAGE_FIND_VERSION_PRERELEASE STREQUAL "")
-      message(AUTHOR_WARNING "To use this prerelease version of ${PACKAGE_FIND_NAME}, set ${PACKAGE_FIND_NAME}_FIND_VERSION_PRERELEASE to '@protobuf_VERSION_PRERELEASE@' or greater.")
-      set(PACKAGE_VERSION_COMPATIBLE FALSE)
-    endif()
-
-    # Not robustly SemVer compliant, but protobuf never uses '.' separated prerelease identifiers.
-    if(PACKAGE_FIND_VERSION_PRERELEASE STRGREATER "@protobuf_VERSION_PRERELEASE@")
-      set(PACKAGE_VERSION_COMPATIBLE FALSE)
-    endif()
-  endif()
-endif()
-
-# Check and save build options used to create this package
-macro(_check_and_save_build_option OPTION VALUE)
-  if(DEFINED ${PACKAGE_FIND_NAME}_${OPTION} AND
-    NOT ${PACKAGE_FIND_NAME}_${OPTION} STREQUAL ${VALUE})
-    set(PACKAGE_VERSION_UNSUITABLE TRUE)
-  endif()
-  set(${PACKAGE_FIND_NAME}_${OPTION} ${VALUE} PARENT_SCOPE)
-endmacro()
-_check_and_save_build_option(WITH_ZLIB @protobuf_WITH_ZLIB@)
-_check_and_save_build_option(MSVC_STATIC_RUNTIME @protobuf_MSVC_STATIC_RUNTIME@)
-_check_and_save_build_option(BUILD_SHARED_LIBS @protobuf_BUILD_SHARED_LIBS@)
-
-# if the installed or the using project don't have CMAKE_SIZEOF_VOID_P set, ignore it:
-if(CMAKE_SIZEOF_VOID_P AND "@CMAKE_SIZEOF_VOID_P@")
-  # check that the installed version has the same 32/64bit-ness as the one which is currently searching:
-  if(NOT CMAKE_SIZEOF_VOID_P EQUAL "@CMAKE_SIZEOF_VOID_P@")
-    math(EXPR installedBits "@CMAKE_SIZEOF_VOID_P@ * 8")
-    set(PACKAGE_VERSION "${PACKAGE_VERSION} (${installedBits}bit)")
-    set(PACKAGE_VERSION_UNSUITABLE TRUE)
-  endif()
-endif()
-
diff --git a/libs/protobuf/cmake/protobuf-config.cmake.in b/libs/protobuf/cmake/protobuf-config.cmake.in
deleted file mode 100644
index 6166911..0000000
--- a/libs/protobuf/cmake/protobuf-config.cmake.in
+++ /dev/null
@@ -1,169 +0,0 @@
-# User options
-include("${CMAKE_CURRENT_LIST_DIR}/protobuf-options.cmake")
-
-# Depend packages
-@_protobuf_FIND_ZLIB@
-
-# Imported targets
-include("${CMAKE_CURRENT_LIST_DIR}/protobuf-targets.cmake")
-
-function(protobuf_generate)
-  include(CMakeParseArguments)
-
-  set(_options APPEND_PATH)
-  set(_singleargs LANGUAGE OUT_VAR EXPORT_MACRO PROTOC_OUT_DIR PLUGIN PLUGIN_OPTIONS)
-  if(COMMAND target_sources)
-    list(APPEND _singleargs TARGET)
-  endif()
-  set(_multiargs PROTOS IMPORT_DIRS GENERATE_EXTENSIONS PROTOC_OPTIONS)
-
-  cmake_parse_arguments(protobuf_generate "${_options}" "${_singleargs}" "${_multiargs}" "${ARGN}")
-
-  if(NOT protobuf_generate_PROTOS AND NOT protobuf_generate_TARGET)
-    message(SEND_ERROR "Error: protobuf_generate called without any targets or source files")
-    return()
-  endif()
-
-  if(NOT protobuf_generate_OUT_VAR AND NOT protobuf_generate_TARGET)
-    message(SEND_ERROR "Error: protobuf_generate called without a target or output variable")
-    return()
-  endif()
-
-  if(NOT protobuf_generate_LANGUAGE)
-    set(protobuf_generate_LANGUAGE cpp)
-  endif()
-  string(TOLOWER ${protobuf_generate_LANGUAGE} protobuf_generate_LANGUAGE)
-
-  if(NOT protobuf_generate_PROTOC_OUT_DIR)
-    set(protobuf_generate_PROTOC_OUT_DIR ${CMAKE_CURRENT_BINARY_DIR})
-  endif()
-
-  if(protobuf_generate_EXPORT_MACRO AND protobuf_generate_LANGUAGE STREQUAL cpp)
-    set(_dll_export_decl "dllexport_decl=${protobuf_generate_EXPORT_MACRO}")
-  endif()
-
-  foreach(_option ${_dll_export_decl} ${protobuf_generate_PLUGIN_OPTIONS})
-    # append comma - not using CMake lists and string replacement as users
-    # might have semicolons in options
-    if(_plugin_options)
-      set( _plugin_options "${_plugin_options},")
-    endif()
-    set(_plugin_options "${_plugin_options}${_option}")
-  endforeach()
-
-  if(protobuf_generate_PLUGIN)
-      set(_plugin "--plugin=${protobuf_generate_PLUGIN}")
-  endif()
-
-  if(NOT protobuf_generate_GENERATE_EXTENSIONS)
-    if(protobuf_generate_LANGUAGE STREQUAL cpp)
-      set(protobuf_generate_GENERATE_EXTENSIONS .pb.h .pb.cc)
-    elseif(protobuf_generate_LANGUAGE STREQUAL python)
-      set(protobuf_generate_GENERATE_EXTENSIONS _pb2.py)
-    else()
-      message(SEND_ERROR "Error: protobuf_generate given unknown Language ${LANGUAGE}, please provide a value for GENERATE_EXTENSIONS")
-      return()
-    endif()
-  endif()
-
-  if(protobuf_generate_TARGET)
-    get_target_property(_source_list ${protobuf_generate_TARGET} SOURCES)
-    foreach(_file ${_source_list})
-      if(_file MATCHES "proto$")
-        list(APPEND protobuf_generate_PROTOS ${_file})
-      endif()
-    endforeach()
-  endif()
-
-  if(NOT protobuf_generate_PROTOS)
-    message(SEND_ERROR "Error: protobuf_generate could not find any .proto files")
-    return()
-  endif()
-
-  if(protobuf_generate_APPEND_PATH)
-    # Create an include path for each file specified
-    foreach(_file ${protobuf_generate_PROTOS})
-      get_filename_component(_abs_file ${_file} ABSOLUTE)
-      get_filename_component(_abs_dir ${_abs_file} DIRECTORY)
-      list(FIND _protobuf_include_path ${_abs_dir} _contains_already)
-      if(${_contains_already} EQUAL -1)
-          list(APPEND _protobuf_include_path -I ${_abs_dir})
-      endif()
-    endforeach()
-  endif()
-
-  foreach(DIR ${protobuf_generate_IMPORT_DIRS})
-    get_filename_component(ABS_PATH ${DIR} ABSOLUTE)
-    list(FIND _protobuf_include_path ${ABS_PATH} _contains_already)
-    if(${_contains_already} EQUAL -1)
-        list(APPEND _protobuf_include_path -I ${ABS_PATH})
-    endif()
-  endforeach()
-
-  if(NOT _protobuf_include_path)
-    set(_protobuf_include_path -I ${CMAKE_CURRENT_SOURCE_DIR})
-  endif()
-
-  set(_generated_srcs_all)
-  foreach(_proto ${protobuf_generate_PROTOS})
-    get_filename_component(_abs_file ${_proto} ABSOLUTE)
-    get_filename_component(_abs_dir ${_abs_file} DIRECTORY)
-
-    get_filename_component(_file_full_name ${_proto} NAME)
-    string(FIND "${_file_full_name}" "." _file_last_ext_pos REVERSE)
-    string(SUBSTRING "${_file_full_name}" 0 ${_file_last_ext_pos} _basename)
-
-    set(_suitable_include_found FALSE)
-    foreach(DIR ${_protobuf_include_path})
-      if(NOT DIR STREQUAL "-I")
-        file(RELATIVE_PATH _rel_dir ${DIR} ${_abs_dir})
-        string(FIND "${_rel_dir}" "../" _is_in_parent_folder)
-        if (NOT ${_is_in_parent_folder} EQUAL 0)
-          set(_suitable_include_found TRUE)
-          break()
-        endif()
-      endif()
-    endforeach()
-
-    if(NOT _suitable_include_found)
-      message(SEND_ERROR "Error: protobuf_generate could not find any correct proto include directory.")
-      return()
-    endif()
-
-    set(_generated_srcs)
-    foreach(_ext ${protobuf_generate_GENERATE_EXTENSIONS})
-      list(APPEND _generated_srcs "${protobuf_generate_PROTOC_OUT_DIR}/${_rel_dir}/${_basename}${_ext}")
-    endforeach()
-    list(APPEND _generated_srcs_all ${_generated_srcs})
-
-    set(_comment "Running ${protobuf_generate_LANGUAGE} protocol buffer compiler on ${_proto}")
-    if(protobuf_generate_PROTOC_OPTIONS)
-      set(_comment "${_comment}, protoc-options: ${protobuf_generate_PROTOC_OPTIONS}")
-    endif()
-    if(_plugin_options)
-      set(_comment "${_comment}, plugin-options: ${_plugin_options}")
-    endif()
-
-    add_custom_command(
-      OUTPUT ${_generated_srcs}
-      COMMAND protobuf::protoc
-      ARGS ${protobuf_generate_PROTOC_OPTIONS} --${protobuf_generate_LANGUAGE}_out ${_plugin_options}:${protobuf_generate_PROTOC_OUT_DIR} ${_plugin} ${_protobuf_include_path} ${_abs_file}
-      DEPENDS ${_abs_file} protobuf::protoc
-      COMMENT ${_comment}
-      VERBATIM )
-  endforeach()
-
-  set_source_files_properties(${_generated_srcs_all} PROPERTIES GENERATED TRUE)
-  if(protobuf_generate_OUT_VAR)
-    set(${protobuf_generate_OUT_VAR} ${_generated_srcs_all} PARENT_SCOPE)
-  endif()
-  if(protobuf_generate_TARGET)
-    target_sources(${protobuf_generate_TARGET} PRIVATE ${_generated_srcs_all})
-  endif()
-
-endfunction()
-
-# CMake FindProtobuf module compatible file
-if(protobuf_MODULE_COMPATIBLE)
-  include("${CMAKE_CURRENT_LIST_DIR}/protobuf-module.cmake")
-endif()
diff --git a/libs/protobuf/cmake/protobuf-lite.pc.cmake b/libs/protobuf/cmake/protobuf-lite.pc.cmake
deleted file mode 100644
index 9745cb8..0000000
--- a/libs/protobuf/cmake/protobuf-lite.pc.cmake
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@CMAKE_INSTALL_PREFIX@
-exec_prefix=@CMAKE_INSTALL_PREFIX@
-libdir=@CMAKE_INSTALL_FULL_LIBDIR@
-includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
-
-Name: Protocol Buffers
-Description: Google's Data Interchange Format
-Version: @protobuf_VERSION@
-Libs: -L${libdir} -lprotobuf-lite @CMAKE_THREAD_LIBS_INIT@
-Cflags: -I${includedir}
-Conflicts: protobuf
diff --git a/libs/protobuf/cmake/protobuf-module.cmake.in b/libs/protobuf/cmake/protobuf-module.cmake.in
deleted file mode 100644
index 0bb05e3..0000000
--- a/libs/protobuf/cmake/protobuf-module.cmake.in
+++ /dev/null
@@ -1,189 +0,0 @@
-# This file contains backwards compatibility patches for various legacy functions and variables
-# Functions
-
-function(PROTOBUF_GENERATE_CPP SRCS HDRS)
-  cmake_parse_arguments(protobuf_generate_cpp "" "EXPORT_MACRO" "" ${ARGN})
-
-  set(_proto_files "${protobuf_generate_cpp_UNPARSED_ARGUMENTS}")
-  if(NOT _proto_files)
-    message(SEND_ERROR "Error: PROTOBUF_GENERATE_CPP() called without any proto files")
-    return()
-  endif()
-
-  if(PROTOBUF_GENERATE_CPP_APPEND_PATH)
-    set(_append_arg APPEND_PATH)
-  endif()
-
-  if(DEFINED Protobuf_IMPORT_DIRS)
-    set(_import_arg IMPORT_DIRS ${Protobuf_IMPORT_DIRS})
-  endif()
-
-  set(_outvar)
-  protobuf_generate(${_append_arg} LANGUAGE cpp EXPORT_MACRO ${protobuf_generate_cpp_EXPORT_MACRO} OUT_VAR _outvar ${_import_arg} PROTOS ${_proto_files})
-
-  set(${SRCS})
-  set(${HDRS})
-  foreach(_file ${_outvar})
-    if(_file MATCHES "cc$")
-      list(APPEND ${SRCS} ${_file})
-    else()
-      list(APPEND ${HDRS} ${_file})
-    endif()
-  endforeach()
-  set(${SRCS} ${${SRCS}} PARENT_SCOPE)
-  set(${HDRS} ${${HDRS}} PARENT_SCOPE)
-endfunction()
-
-function(PROTOBUF_GENERATE_PYTHON SRCS)
-  if(NOT ARGN)
-    message(SEND_ERROR "Error: PROTOBUF_GENERATE_PYTHON() called without any proto files")
-    return()
-  endif()
-
-  if(PROTOBUF_GENERATE_CPP_APPEND_PATH)
-    set(_append_arg APPEND_PATH)
-  endif()
-
-  if(DEFINED Protobuf_IMPORT_DIRS)
-    set(_import_arg IMPORT_DIRS ${Protobuf_IMPORT_DIRS})
-  endif()
-
-  set(_outvar)
-  protobuf_generate(${_append_arg} LANGUAGE python OUT_VAR _outvar ${_import_arg} PROTOS ${ARGN})
-  set(${SRCS} ${_outvar} PARENT_SCOPE)
-endfunction()
-
-# Environment
-
-# Backwards compatibility
-# Define camel case versions of input variables
-foreach(UPPER
-    PROTOBUF_SRC_ROOT_FOLDER
-    PROTOBUF_IMPORT_DIRS
-    PROTOBUF_DEBUG
-    PROTOBUF_LIBRARY
-    PROTOBUF_PROTOC_LIBRARY
-    PROTOBUF_INCLUDE_DIR
-    PROTOBUF_PROTOC_EXECUTABLE
-    PROTOBUF_LIBRARY_DEBUG
-    PROTOBUF_PROTOC_LIBRARY_DEBUG
-    PROTOBUF_LITE_LIBRARY
-    PROTOBUF_LITE_LIBRARY_DEBUG
-    )
-    if (DEFINED ${UPPER})
-        string(REPLACE "PROTOBUF_" "Protobuf_" Camel ${UPPER})
-        if (NOT DEFINED ${Camel})
-            set(${Camel} ${${UPPER}})
-        endif()
-    endif()
-endforeach()
-
-if(DEFINED Protobuf_SRC_ROOT_FOLDER)
-  message(AUTHOR_WARNING "Variable Protobuf_SRC_ROOT_FOLDER defined, but not"
-    " used in CONFIG mode")
-endif()
-
-include(SelectLibraryConfigurations)
-
-# Internal function: search for normal library as well as a debug one
-#    if the debug one is specified also include debug/optimized keywords
-#    in *_LIBRARIES variable
-function(_protobuf_find_libraries name filename)
-  if(${name}_LIBRARIES)
-    # Use result recorded by a previous call.
-  elseif(${name}_LIBRARY)
-    # Honor cache entry used by CMake 3.5 and lower.
-    set(${name}_LIBRARIES "${${name}_LIBRARY}" PARENT_SCOPE)
-  elseif(TARGET protobuf::lib${filename})
-    get_target_property(${name}_LIBRARY_RELEASE protobuf::lib${filename}
-      LOCATION_RELEASE)
-    get_target_property(${name}_LIBRARY_RELWITHDEBINFO protobuf::lib${filename}
-      LOCATION_RELWITHDEBINFO)
-    get_target_property(${name}_LIBRARY_MINSIZEREL protobuf::lib${filename}
-      LOCATION_MINSIZEREL)
-    get_target_property(${name}_LIBRARY_DEBUG protobuf::lib${filename}
-      LOCATION_DEBUG)
-
-    select_library_configurations(${name})
-    set(${name}_LIBRARY ${${name}_LIBRARY} PARENT_SCOPE)
-    set(${name}_LIBRARIES ${${name}_LIBRARIES} PARENT_SCOPE)
-  endif()
-endfunction()
-
-#
-# Main.
-#
-
-# By default have PROTOBUF_GENERATE_CPP macro pass -I to protoc
-# for each directory where a proto file is referenced.
-if(NOT DEFINED PROTOBUF_GENERATE_CPP_APPEND_PATH)
-  set(PROTOBUF_GENERATE_CPP_APPEND_PATH TRUE)
-endif()
-
-# The Protobuf library
-_protobuf_find_libraries(Protobuf protobuf)
-
-# The Protobuf Lite library
-_protobuf_find_libraries(Protobuf_LITE protobuf-lite)
-
-# The Protobuf Protoc Library
-_protobuf_find_libraries(Protobuf_PROTOC protoc)
-
-# Set the include directory
-get_target_property(Protobuf_INCLUDE_DIRS protobuf::libprotobuf
-  INTERFACE_INCLUDE_DIRECTORIES)
-
-# Set the protoc Executable
-if(NOT Protobuf_PROTOC_EXECUTABLE AND TARGET protobuf::protoc)
-  get_target_property(Protobuf_PROTOC_EXECUTABLE protobuf::protoc
-    IMPORTED_LOCATION_RELEASE)
-  if(NOT EXISTS "${Protobuf_PROTOC_EXECUTABLE}")
-    get_target_property(Protobuf_PROTOC_EXECUTABLE protobuf::protoc
-      IMPORTED_LOCATION_RELWITHDEBINFO)
-  endif()
-  if(NOT EXISTS "${Protobuf_PROTOC_EXECUTABLE}")
-    get_target_property(Protobuf_PROTOC_EXECUTABLE protobuf::protoc
-      IMPORTED_LOCATION_MINSIZEREL)
-  endif()
-  if(NOT EXISTS "${Protobuf_PROTOC_EXECUTABLE}")
-    get_target_property(Protobuf_PROTOC_EXECUTABLE protobuf::protoc
-      IMPORTED_LOCATION_DEBUG)
-  endif()
-  if(NOT EXISTS "${Protobuf_PROTOC_EXECUTABLE}")
-    get_target_property(Protobuf_PROTOC_EXECUTABLE protobuf::protoc
-      IMPORTED_LOCATION_NOCONFIG)
-  endif()
-endif()
-
-# Version info variable
-set(Protobuf_VERSION "@protobuf_VERSION@")
-
-include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(Protobuf
-    REQUIRED_VARS Protobuf_PROTOC_EXECUTABLE Protobuf_LIBRARIES Protobuf_INCLUDE_DIRS
-    VERSION_VAR Protobuf_VERSION
-)
-
-# Backwards compatibility
-# Define upper case versions of output variables
-foreach(Camel
-    Protobuf_VERSION
-    Protobuf_SRC_ROOT_FOLDER
-    Protobuf_IMPORT_DIRS
-    Protobuf_DEBUG
-    Protobuf_INCLUDE_DIRS
-    Protobuf_LIBRARIES
-    Protobuf_PROTOC_LIBRARIES
-    Protobuf_LITE_LIBRARIES
-    Protobuf_LIBRARY
-    Protobuf_PROTOC_LIBRARY
-    Protobuf_INCLUDE_DIR
-    Protobuf_PROTOC_EXECUTABLE
-    Protobuf_LIBRARY_DEBUG
-    Protobuf_PROTOC_LIBRARY_DEBUG
-    Protobuf_LITE_LIBRARY
-    Protobuf_LITE_LIBRARY_DEBUG
-    )
-    string(TOUPPER ${Camel} UPPER)
-    set(${UPPER} ${${Camel}})
-endforeach()
diff --git a/libs/protobuf/cmake/protobuf-options.cmake b/libs/protobuf/cmake/protobuf-options.cmake
deleted file mode 100644
index 93ec898..0000000
--- a/libs/protobuf/cmake/protobuf-options.cmake
+++ /dev/null
@@ -1,7 +0,0 @@
-# Verbose output
-option(protobuf_VERBOSE "Enable for verbose output" OFF)
-mark_as_advanced(protobuf_VERBOSE)
-
-# FindProtobuf module compatible
-option(protobuf_MODULE_COMPATIBLE "CMake built-in FindProtobuf.cmake module compatible" OFF)
-mark_as_advanced(protobuf_MODULE_COMPATIBLE)
diff --git a/libs/protobuf/cmake/protobuf.pc.cmake b/libs/protobuf/cmake/protobuf.pc.cmake
deleted file mode 100644
index f068e69..0000000
--- a/libs/protobuf/cmake/protobuf.pc.cmake
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@CMAKE_INSTALL_PREFIX@
-exec_prefix=@CMAKE_INSTALL_PREFIX@
-libdir=@CMAKE_INSTALL_FULL_LIBDIR@
-includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
-
-Name: Protocol Buffers
-Description: Google's Data Interchange Format
-Version: @protobuf_VERSION@
-Libs: -L${libdir} -lprotobuf @CMAKE_THREAD_LIBS_INIT@
-Cflags: -I${includedir}
-Conflicts: protobuf-lite
diff --git a/libs/protobuf/cmake/protoc.cmake b/libs/protobuf/cmake/protoc.cmake
deleted file mode 100644
index 472b642..0000000
--- a/libs/protobuf/cmake/protoc.cmake
+++ /dev/null
@@ -1,13 +0,0 @@
-set(protoc_files
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/main.cc
-)
-
-add_executable(protoc ${protoc_files} ${protobuf_version_rc_file})
-target_link_libraries(protoc
-  libprotoc
-  libprotobuf
-)
-add_executable(protobuf::protoc ALIAS protoc)
-
-set_target_properties(protoc PROPERTIES
-    VERSION ${protobuf_VERSION})
diff --git a/libs/protobuf/cmake/tests.cmake b/libs/protobuf/cmake/tests.cmake
deleted file mode 100644
index 1905673..0000000
--- a/libs/protobuf/cmake/tests.cmake
+++ /dev/null
@@ -1,294 +0,0 @@
-option(protobuf_USE_EXTERNAL_GTEST "Use external Google Test (i.e. not the one in third_party/googletest)" OFF)
-
-option(protobuf_TEST_XML_OUTDIR "Output directory for XML logs from tests." "")
-
-option(protobuf_ABSOLUTE_TEST_PLUGIN_PATH
-  "Using absolute test_plugin path in tests" ON)
-mark_as_advanced(protobuf_ABSOLUTE_TEST_PLUGIN_PATH)
-
-if (protobuf_USE_EXTERNAL_GTEST)
-  find_package(GTest REQUIRED)
-else()
-  if (NOT EXISTS "${protobuf_SOURCE_DIR}/third_party/googletest/CMakeLists.txt")
-    message(FATAL_ERROR
-            "Cannot find third_party/googletest directory that's needed to "
-            "build tests. If you use git, make sure you have cloned submodules:\n"
-            "  git submodule update --init --recursive\n"
-            "If instead you want to skip tests, run cmake with:\n"
-            "  cmake -Dprotobuf_BUILD_TESTS=OFF\n")
-  endif()
-
-  set(googlemock_source_dir "${protobuf_SOURCE_DIR}/third_party/googletest/googlemock")
-  set(googletest_source_dir "${protobuf_SOURCE_DIR}/third_party/googletest/googletest")
-  include_directories(
-    ${googlemock_source_dir}
-    ${googletest_source_dir}
-    ${googletest_source_dir}/include
-    ${googlemock_source_dir}/include
-  )
-
-  add_library(gmock STATIC
-    "${googlemock_source_dir}/src/gmock-all.cc"
-    "${googletest_source_dir}/src/gtest-all.cc"
-  )
-  target_link_libraries(gmock ${CMAKE_THREAD_LIBS_INIT})
-  add_library(gmock_main STATIC "${googlemock_source_dir}/src/gmock_main.cc")
-  target_link_libraries(gmock_main gmock)
-
-  add_library(GTest::gmock ALIAS gmock)
-  add_library(GTest::gmock_main ALIAS gmock_main)
-endif()
-
-set(lite_test_protos
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/map_lite_unittest.proto
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_import_lite.proto
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_import_public_lite.proto
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_lite.proto
-)
-
-set(tests_protos
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/any_test.proto
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/test_bad_identifiers.proto
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/test_large_enum_value.proto
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/map_proto2_unittest.proto
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/map_unittest.proto
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest.proto
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_arena.proto
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_custom_options.proto
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_drop_unknown_fields.proto
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_embed_optimize_for.proto
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_empty.proto
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_enormous_descriptor.proto
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_import.proto
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_import_public.proto
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_lazy_dependencies.proto
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_lazy_dependencies_custom_option.proto
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_lazy_dependencies_enum.proto
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_lite_imports_nonlite.proto
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_mset.proto
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_mset_wire_format.proto
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_no_field_presence.proto
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_no_generic_services.proto
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_optimize_for.proto
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_preserve_unknown_enum.proto
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_preserve_unknown_enum2.proto
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_proto3.proto
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_proto3_arena.proto
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_proto3_arena_lite.proto
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_proto3_lite.proto
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_proto3_optional.proto
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/unittest_well_known_types.proto
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/util/internal/testdata/anys.proto
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/util/internal/testdata/books.proto
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/util/internal/testdata/default_value.proto
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/util/internal/testdata/default_value_test.proto
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/util/internal/testdata/field_mask.proto
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/util/internal/testdata/maps.proto
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/util/internal/testdata/oneofs.proto
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/util/internal/testdata/proto3.proto
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/util/internal/testdata/struct.proto
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/util/internal/testdata/timestamp_duration.proto
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/util/internal/testdata/wrappers.proto
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/util/json_format.proto
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/util/json_format_proto3.proto
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/util/message_differencer_unittest.proto
-)
-
-macro(compile_proto_file filename)
-  string(REPLACE .proto .pb.cc pb_file ${filename})
-  add_custom_command(
-    OUTPUT ${pb_file}
-    DEPENDS ${protobuf_PROTOC_EXE} ${filename}
-    COMMAND ${protobuf_PROTOC_EXE} ${filename}
-        --proto_path=${protobuf_SOURCE_DIR}/src
-        --cpp_out=${protobuf_SOURCE_DIR}/src
-        --experimental_allow_proto3_optional
-  )
-endmacro(compile_proto_file)
-
-set(lite_test_proto_files)
-foreach(proto_file ${lite_test_protos})
-  compile_proto_file(${proto_file})
-  set(lite_test_proto_files ${lite_test_proto_files} ${pb_file})
-endforeach(proto_file)
-
-set(tests_proto_files)
-foreach(proto_file ${tests_protos})
-  compile_proto_file(${proto_file})
-  set(tests_proto_files ${tests_proto_files} ${pb_file})
-endforeach(proto_file)
-
-set(common_lite_test_files
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/arena_test_util.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/map_lite_test_util.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/test_util_lite.cc
-)
-
-add_library(protobuf-lite-test-common STATIC
-  ${common_lite_test_files} ${lite_test_proto_files})
-target_link_libraries(protobuf-lite-test-common libprotobuf-lite GTest::gmock)
-
-set(common_test_files
-  ${common_lite_test_files}
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/mock_code_generator.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/map_test_util.inc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/reflection_tester.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/test_util.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/testing/file.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/testing/googletest.cc
-)
-
-add_library(protobuf-test-common STATIC
-  ${common_test_files} ${tests_proto_files})
-target_link_libraries(protobuf-test-common libprotobuf GTest::gmock)
-
-set(tests_files
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/any_test.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/arena_unittest.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/arenastring_unittest.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/arenaz_sampler_test.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/annotation_test_util.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/annotation_test_util.h
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/command_line_interface_unittest.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/bootstrap_unittest.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/message_size_unittest.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/metadata_test.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/move_unittest.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/plugin_unittest.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/unittest.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/cpp/unittest.inc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/csharp/csharp_bootstrap_unittest.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/csharp/csharp_generator_unittest.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/importer_unittest.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/doc_comment_unittest.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/java/plugin_unittest.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/objectivec/objectivec_helpers_unittest.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/parser_unittest.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/python/plugin_unittest.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/ruby/ruby_generator_unittest.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/descriptor_database_unittest.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/descriptor_unittest.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/drop_unknown_fields_test.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/dynamic_message_unittest.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/extension_set_unittest.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/generated_message_reflection_unittest.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/generated_message_tctable_lite_test.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/inlined_string_field_unittest.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/io/coded_stream_unittest.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/io/io_win32_unittest.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/io/printer_unittest.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/io/tokenizer_unittest.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/io/zero_copy_stream_unittest.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/map_field_test.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/map_test.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/map_test.inc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/message_unittest.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/message_unittest.inc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/no_field_presence_test.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/preserve_unknown_enum_test.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/proto3_arena_lite_unittest.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/proto3_arena_unittest.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/proto3_lite_unittest.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/proto3_lite_unittest.inc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/reflection_ops_unittest.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/repeated_field_reflection_unittest.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/repeated_field_unittest.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/bytestream_unittest.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/common_unittest.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/int128_unittest.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/status_test.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/statusor_test.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/stringpiece_unittest.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/stringprintf_unittest.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/structurally_valid_unittest.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/strutil_unittest.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/template_util_unittest.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/stubs/time_test.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/text_format_unittest.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/unknown_field_set_unittest.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/util/delimited_message_util_test.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/util/field_comparator_test.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/util/field_mask_util_test.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/util/internal/default_value_objectwriter_test.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/util/internal/json_objectwriter_test.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/util/internal/json_stream_parser_test.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/util/internal/protostream_objectsource_test.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/util/internal/protostream_objectwriter_test.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/util/internal/type_info_test_helper.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/util/json_util_test.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/util/message_differencer_unittest.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/util/time_util_test.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/util/type_resolver_util_test.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/well_known_types_unittest.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/wire_format_unittest.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/wire_format_unittest.inc
-)
-
-if(protobuf_ABSOLUTE_TEST_PLUGIN_PATH)
-  add_compile_options(-DGOOGLE_PROTOBUF_TEST_PLUGIN_PATH="$<TARGET_FILE:test_plugin>")
-endif()
-
-if(MINGW)
-  set_source_files_properties(${tests_files} PROPERTIES COMPILE_FLAGS "-Wno-narrowing")
-
-  # required for tests on MinGW Win64
-  if (CMAKE_SIZEOF_VOID_P EQUAL 8)
-    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--stack,16777216")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wa,-mbig-obj")
-  endif()
-
-endif()
-
-if(protobuf_TEST_XML_OUTDIR)
-  if(NOT "${protobuf_TEST_XML_OUTDIR}" MATCHES "[/\\]$")
-    string(APPEND protobuf_TEST_XML_OUTDIR "/")
-  endif()
-  set(protobuf_GTEST_ARGS "--gtest_output=xml:${protobuf_TEST_XML_OUTDIR}")
-else()
-  set(protobuf_GTEST_ARGS)
-endif()
-
-add_executable(tests ${tests_files})
-if (MSVC)
-  target_compile_options(tests PRIVATE
-    /wd4146 # unary minus operator applied to unsigned type, result still unsigned
-  )
-endif()
-target_link_libraries(tests protobuf-lite-test-common protobuf-test-common libprotoc libprotobuf GTest::gmock_main)
-
-set(test_plugin_files
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/mock_code_generator.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/compiler/test_plugin.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/testing/file.cc
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/testing/file.h
-)
-
-add_executable(test_plugin ${test_plugin_files})
-target_link_libraries(test_plugin libprotoc libprotobuf GTest::gmock)
-
-set(lite_test_files
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/lite_unittest.cc
-)
-add_executable(lite-test ${lite_test_files})
-target_link_libraries(lite-test protobuf-lite-test-common libprotobuf-lite GTest::gmock_main)
-
-add_test(NAME lite-test
-  COMMAND lite-test ${protobuf_GTEST_ARGS})
-
-set(lite_arena_test_files
-  ${protobuf_SOURCE_DIR}/src/google/protobuf/lite_arena_unittest.cc
-)
-add_executable(lite-arena-test ${lite_arena_test_files})
-target_link_libraries(lite-arena-test protobuf-lite-test-common libprotobuf-lite GTest::gmock_main)
-
-add_test(NAME lite-arena-test
-  COMMAND lite-arena-test ${protobuf_GTEST_ARGS})
-
-add_custom_target(check
-  COMMAND tests
-  DEPENDS tests test_plugin
-  WORKING_DIRECTORY ${protobuf_SOURCE_DIR})
-
-add_test(NAME check
-  COMMAND tests ${protobuf_GTEST_ARGS}
-  WORKING_DIRECTORY "${protobuf_SOURCE_DIR}")
diff --git a/libs/protobuf/cmake/version.rc.in b/libs/protobuf/cmake/version.rc.in
deleted file mode 100644
index f6e7c4a..0000000
--- a/libs/protobuf/cmake/version.rc.in
+++ /dev/null
@@ -1,45 +0,0 @@
-#define VS_FF_DEBUG 0x1L
-#define VS_VERSION_INFO 0x1L
-#define VS_FFI_FILEFLAGSMASK 0x17L
-#define VER_PRIVATEBUILD 0x0L
-#define VER_PRERELEASE 0x0L
-#define VOS__WINDOWS32 0x4L
-#define VFT_DLL 0x2L
-#define VFT2_UNKNOWN 0x0L
-
-#ifndef DEBUG
-#define VER_DEBUG 0
-#else
-#define VER_DEBUG VS_FF_DEBUG
-#endif
-
-
-VS_VERSION_INFO VERSIONINFO
-  FILEVERSION    @protobuf_RC_FILEVERSION@
-  PRODUCTVERSION @protobuf_RC_FILEVERSION@
-  FILEFLAGSMASK  VS_FFI_FILEFLAGSMASK
-  FILEFLAGS      VER_DEBUG
-  FILEOS         VOS__WINDOWS32
-  FILETYPE       VFT_DLL
-BEGIN
-    BLOCK "VarFileInfo"
-    BEGIN
-        // English language (0x409) and the Windows Unicode codepage (1200)
-        VALUE "Translation", 0x409, 1200
-    END
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "FileDescription", "Compiled with @CMAKE_CXX_COMPILER_ID@ @CMAKE_CXX_COMPILER_VERSION@\0"
-            VALUE "ProductVersion", "@protobuf_VERSION@\0"
-            VALUE "FileVersion", "@protobuf_VERSION@\0"
-            VALUE "InternalName", "protobuf\0"
-            VALUE "ProductName", "Protocol Buffers - Google's Data Interchange Format\0"
-            VALUE "CompanyName", "Google Inc.\0"
-            VALUE "LegalCopyright", "Copyright 2008 Google Inc.  All rights reserved.\0"
-            VALUE "Licence", "BSD\0"
-            VALUE "Info", "https://developers.google.com/protocol-buffers/\0"
-        END
-    END
-END
diff --git a/libs/protobuf/configure.ac b/libs/protobuf/configure.ac
deleted file mode 100644
index 7243fd3..0000000
--- a/libs/protobuf/configure.ac
+++ /dev/null
@@ -1,247 +0,0 @@
-## Process this file with autoconf to produce configure.
-## In general, the safest way to proceed is to run ./autogen.sh
-
-AC_PREREQ(2.59)
-
-# Note:  If you change the version, you must also update it in:
-# * Protobuf.podspec
-# * csharp/Google.Protobuf.Tools.nuspec
-# * csharp/src/*/AssemblyInfo.cs
-# * csharp/src/Google.Protobuf/Google.Protobuf.nuspec
-# * java/*/pom.xml
-# * python/google/protobuf/__init__.py
-# * protoc-artifacts/pom.xml
-# * src/google/protobuf/stubs/common.h
-# * src/Makefile.am (Update -version-info for LDFLAGS if needed)
-#
-# In the SVN trunk, the version should always be the next anticipated release
-# version with the "-pre" suffix.  (We used to use "-SNAPSHOT" but this pushed
-# the size of one file name in the dist tarfile over the 99-char limit.)
-AC_INIT([Protocol Buffers],[3.21.12],[protobuf@googlegroups.com],[protobuf])
-
-AM_MAINTAINER_MODE([enable])
-
-AC_CONFIG_SRCDIR(src/google/protobuf/message.cc)
-# The config file is generated but not used by the source code, since we only
-# need very few of them, e.g. HAVE_PTHREAD and HAVE_ZLIB. Those macros are
-# passed down in CXXFLAGS manually in src/Makefile.am
-AC_CONFIG_HEADERS([config.h])
-AC_CONFIG_MACRO_DIR([m4])
-
-AC_ARG_VAR(DIST_LANG, [language to include in the distribution package (i.e., make dist)])
-case "$DIST_LANG" in
-  "") DIST_LANG=all ;;
-  all | cpp | csharp | java | python | javanano | objectivec | ruby | php) ;;
-  *) AC_MSG_FAILURE([unknown language: $DIST_LANG]) ;;
-esac
-AC_SUBST(DIST_LANG)
-
-# autoconf's default CXXFLAGS are usually "-g -O2".  These aren't necessarily
-# the best choice for libprotobuf.
-AS_IF([test "x${ac_cv_env_CFLAGS_set}" = "x"],
-      [CFLAGS=""])
-AS_IF([test "x${ac_cv_env_CXXFLAGS_set}" = "x"],
-      [CXXFLAGS=""])
-
-AC_CANONICAL_TARGET
-
-AM_INIT_AUTOMAKE([1.9 tar-ustar subdir-objects])
-
-# Silent rules enabled: the output is minimal but informative.
-# In particular, the warnings from the compiler stick out very clearly.
-# To see all logs, use the --disable-silent-rules on configure or via make V=1
-AM_SILENT_RULES([yes])
-
-AC_ARG_WITH([zlib],
-  [AS_HELP_STRING([--with-zlib],
-    [include classes for streaming compressed data in and out @<:@default=check@:>@])],
-  [],[with_zlib=check])
-
-AC_ARG_WITH([zlib-include],
-  [AS_HELP_STRING([--with-zlib-include=PATH],
-    [zlib include directory])],
-  [CPPFLAGS="-I$withval $CPPFLAGS"])
-
-AC_ARG_WITH([zlib-lib],
-  [AS_HELP_STRING([--with-zlib-lib=PATH],
-    [zlib lib directory])],
-  [LDFLAGS="-L$withval $LDFLAGS"])
-
-AC_ARG_WITH([protoc],
-  [AS_HELP_STRING([--with-protoc=COMMAND],
-    [use the given protoc command instead of building a new one when building tests (useful for cross-compiling)])],
-  [],[with_protoc=no])
-
-# Checks for programs.
-AC_PROG_CC
-AC_PROG_CXX
-AC_PROG_CXX_FOR_BUILD
-AC_LANG([C++])
-ACX_USE_SYSTEM_EXTENSIONS
-m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
-AM_CONDITIONAL(GCC, test "$GCC" = yes)   # let the Makefile know if we're gcc
-AS_CASE([$target_os], [darwin*], [AC_PROG_OBJC], [AM_CONDITIONAL([am__fastdepOBJC], [false])])
-
-# test_util.cc takes forever to compile with GCC and optimization turned on.
-AC_MSG_CHECKING([C++ compiler flags...])
-AS_IF([test "x${ac_cv_env_CXXFLAGS_set}" = "x"],[
-  AS_IF([test "$GCC" = "yes"],[
-    PROTOBUF_OPT_FLAG="-O2"
-    CXXFLAGS="${CXXFLAGS} -g"
-  ])
-
-  # Protocol Buffers contains several checks that are intended to be used only
-  # for debugging and which might hurt performance.  Most users are probably
-  # end users who don't want these checks, so add -DNDEBUG by default.
-  CXXFLAGS="$CXXFLAGS -std=c++11 -DNDEBUG"
-
-  AC_MSG_RESULT([use default: $PROTOBUF_OPT_FLAG $CXXFLAGS])
-],[
-  AC_MSG_RESULT([use user-supplied: $CXXFLAGS])
-])
-
-AC_SUBST(PROTOBUF_OPT_FLAG)
-
-ACX_CHECK_SUNCC
-
-# Have to do libtool after SUNCC, other wise it "helpfully" adds Crun Cstd
-# to the link
-AC_PROG_LIBTOOL
-
-# Check whether the linker supports version scripts
-AC_MSG_CHECKING([whether the linker supports version scripts])
-save_LDFLAGS=$LDFLAGS
-LDFLAGS="$LDFLAGS -Wl,--version-script=conftest.map"
-cat > conftest.map <<EOF
-{
-  global:
-    main;
-  local:
-    *;
-};
-EOF
-AC_LINK_IFELSE(
-  [AC_LANG_SOURCE([int main() { return 0; }])],
-  [have_ld_version_script=yes; AC_MSG_RESULT(yes)],
-  [have_ld_version_script=no; AC_MSG_RESULT(no)])
-LDFLAGS=$save_LDFLAGS
-AM_CONDITIONAL([HAVE_LD_VERSION_SCRIPT], [test "$have_ld_version_script" = "yes"])
-
-# Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS([fcntl.h inttypes.h limits.h stdlib.h unistd.h])
-
-# Checks for library functions.
-AC_FUNC_MEMCMP
-AC_FUNC_STRTOD
-AC_CHECK_FUNCS([ftruncate memset mkdir strchr strerror strtol])
-
-# Check for zlib.
-HAVE_ZLIB=0
-AS_IF([test "$with_zlib" != no], [
-  AC_MSG_CHECKING([zlib version])
-
-  # First check the zlib header version.
-  AC_COMPILE_IFELSE(
-    [AC_LANG_PROGRAM([[
-        #include <zlib.h>
-        #if !defined(ZLIB_VERNUM) || (ZLIB_VERNUM < 0x1204)
-        # error zlib version too old
-        #endif
-        ]], [])], [
-    AC_MSG_RESULT([ok (1.2.0.4 or later)])
-
-    # Also need to add -lz to the linker flags and make sure this succeeds.
-    AC_SEARCH_LIBS([zlibVersion], [z], [
-      AC_DEFINE([HAVE_ZLIB], [1], [Enable classes using zlib compression.])
-      HAVE_ZLIB=1
-    ], [
-      AS_IF([test "$with_zlib" != check], [
-        AC_MSG_FAILURE([--with-zlib was given, but no working zlib library was found])
-      ])
-    ])
-  ], [
-    AS_IF([test "$with_zlib" = check], [
-      AC_MSG_RESULT([headers missing or too old (requires 1.2.0.4)])
-    ], [
-      AC_MSG_FAILURE([--with-zlib was given, but zlib headers were not present or were too old (requires 1.2.0.4)])
-    ])
-  ])
-])
-AM_CONDITIONAL([HAVE_ZLIB], [test $HAVE_ZLIB = 1])
-
-# Add -std=c++11 if necesssary. It is important for us to do this before the
-# libatomic check below, since that also depends on C++11.
-AX_CXX_COMPILE_STDCXX([11], [noext], [mandatory])
-
-dnl On some platforms, std::atomic needs a helper library
-AC_MSG_CHECKING(whether -latomic is needed)
-AC_LINK_IFELSE([AC_LANG_SOURCE([[
-  #include <atomic>
-  #include <cstdint>
-  std::atomic<std::int64_t> v;
-  int main() {
-    return v;
-  }
-]])], STD_ATOMIC_NEED_LIBATOMIC=no, STD_ATOMIC_NEED_LIBATOMIC=yes)
-AC_MSG_RESULT($STD_ATOMIC_NEED_LIBATOMIC)
-if test "x$STD_ATOMIC_NEED_LIBATOMIC" = xyes; then
-  LIBATOMIC_LIBS="-latomic"
-fi
-AC_SUBST([LIBATOMIC_LIBS])
-
-AS_IF([test "$with_protoc" != "no"], [
-  PROTOC=$with_protoc
-  AS_IF([test "$with_protoc" = "yes"], [
-    # No argument given.  Use system protoc.
-    PROTOC=protoc
-  ])
-  AS_IF([echo "$PROTOC" | grep -q '^@<:@^/@:>@.*/'], [
-    # Does not start with a slash, but contains a slash.  So, it's a relative
-    # path (as opposed to an absolute path or an executable in $PATH).
-    # Since it will actually be executed from the src directory, prefix with
-    # the current directory.  We also insert $ac_top_build_prefix in case this
-    # is a nested package and --with-protoc was actually given on the outer
-    # package's configure script.
-    PROTOC=`pwd`/${ac_top_build_prefix}$PROTOC
-  ])
-  AC_SUBST([PROTOC])
-])
-AM_CONDITIONAL([USE_EXTERNAL_PROTOC], [test "$with_protoc" != "no"])
-
-AX_PTHREAD
-AM_CONDITIONAL([HAVE_PTHREAD], [test "x$ax_pthread_ok" = "xyes"])
-# We still keep this for improving pbconfig.h for unsupported platforms.
-AC_CXX_STL_HASH
-
-# Enable ObjC support for conformance directory on OS X.
-OBJC_CONFORMANCE_TEST=0
-case "$target_os" in
-  darwin*)
-    OBJC_CONFORMANCE_TEST=1
-    ;;
-esac
-AM_CONDITIONAL([OBJC_CONFORMANCE_TEST], [test $OBJC_CONFORMANCE_TEST = 1])
-
-AC_MSG_CHECKING(whether -llog is needed)
-ANDROID_TEST=no
-case "$target_os" in
-  *android*)
-    ANDROID_TEST=yes
-    ;;
-esac
-AC_MSG_RESULT($ANDROID_TEST)
-if test "x$ANDROID_TEST" = xyes; then
-  LIBLOG_LIBS="-llog"
-fi
-AC_SUBST([LIBLOG_LIBS])
-
-# HACK:  Make gmock's configure script pick up our copy of CFLAGS and CXXFLAGS,
-#   since the flags added by ACX_CHECK_SUNCC must be used when compiling gmock
-#   too.
-export CFLAGS
-export CXXFLAGS
-AC_CONFIG_SUBDIRS([third_party/googletest])
-
-AC_CONFIG_FILES([Makefile src/Makefile benchmarks/Makefile conformance/Makefile protobuf.pc protobuf-lite.pc])
-AC_OUTPUT
diff --git a/libs/protobuf/conformance/BUILD.bazel b/libs/protobuf/conformance/BUILD.bazel
deleted file mode 100644
index 7de2b8e..0000000
--- a/libs/protobuf/conformance/BUILD.bazel
+++ /dev/null
@@ -1,183 +0,0 @@
-# Conformance testing for Protobuf.
-
-load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library", "cc_proto_library")
-load(
-    "@rules_pkg//:mappings.bzl",
-    "pkg_attributes",
-    "pkg_filegroup",
-    "pkg_files",
-    "strip_prefix",
-)
-
-exports_files([
-    "conformance_test_runner.sh",
-    "failure_list_java.txt",
-    "failure_list_java_lite.txt",
-    "text_format_failure_list_java.txt",
-    "text_format_failure_list_java_lite.txt",
-])
-
-cc_proto_library(
-    name = "test_messages_proto2_proto_cc",
-    deps = ["//:test_messages_proto2_proto"],
-)
-
-cc_proto_library(
-    name = "test_messages_proto3_proto_cc",
-    deps = ["//:test_messages_proto3_proto"],
-)
-
-proto_library(
-    name = "conformance_proto",
-    srcs = ["conformance.proto"],
-    visibility = ["//visibility:public"],
-)
-
-cc_proto_library(
-    name = "conformance_proto_cc",
-    deps = [":conformance_proto"],
-)
-
-java_proto_library(
-    name = "conformance_java_proto",
-    visibility = [
-        "//java:__subpackages__",
-    ],
-    deps = [":conformance_proto"],
-)
-
-java_lite_proto_library(
-    name = "conformance_java_proto_lite",
-    visibility = [
-        "//java:__subpackages__",
-    ],
-    deps = [":conformance_proto"],
-)
-
-cc_library(
-    name = "jsoncpp",
-    srcs = ["third_party/jsoncpp/jsoncpp.cpp"],
-    hdrs = ["third_party/jsoncpp/json.h"],
-    includes = ["."],
-)
-
-cc_library(
-    name = "conformance_test",
-    srcs = [
-        "conformance_test.cc",
-        "conformance_test_runner.cc",
-    ],
-    hdrs = [
-        "conformance_test.h",
-    ],
-    includes = ["."],
-    deps = [":conformance_proto_cc"],
-)
-
-cc_library(
-    name = "binary_json_conformance_suite",
-    srcs = ["binary_json_conformance_suite.cc"],
-    hdrs = ["binary_json_conformance_suite.h"],
-    deps = [
-        ":conformance_test",
-        ":jsoncpp",
-        ":test_messages_proto2_proto_cc",
-        ":test_messages_proto3_proto_cc",
-    ],
-)
-
-cc_library(
-    name = "text_format_conformance_suite",
-    srcs = ["text_format_conformance_suite.cc"],
-    hdrs = ["text_format_conformance_suite.h"],
-    deps = [
-        ":conformance_test",
-        ":test_messages_proto2_proto_cc",
-        ":test_messages_proto3_proto_cc",
-    ],
-)
-
-cc_binary(
-    name = "conformance_test_runner",
-    srcs = ["conformance_test_main.cc"],
-    visibility = ["//visibility:public"],
-    deps = [
-        ":binary_json_conformance_suite",
-        ":conformance_test",
-        ":text_format_conformance_suite",
-    ],
-)
-
-java_binary(
-    name = "conformance_java",
-    srcs = ["ConformanceJava.java"],
-    main_class = "ConformanceJava",
-    visibility = [
-        "//java:__subpackages__",
-    ],
-    deps = [
-        ":conformance_java_proto",
-        "//:protobuf_java",
-        "//:protobuf_java_util",
-        "//:test_messages_proto2_java_proto",
-        "//:test_messages_proto3_java_proto",
-    ],
-)
-
-java_binary(
-    name = "conformance_java_lite",
-    srcs = ["ConformanceJavaLite.java"],
-    main_class = "ConformanceJavaLite",
-    visibility = [
-        "//java:__subpackages__",
-    ],
-    deps = [
-        ":conformance_java_proto_lite",
-        "//:protobuf_java_util",
-        "//:protobuf_javalite",
-        "//:test_messages_proto2_java_proto_lite",
-        "//:test_messages_proto3_java_proto_lite",
-    ],
-)
-
-filegroup(
-    name = "all_files",
-    srcs = glob(["**/*"]),
-    visibility = ["//:__pkg__"],
-)
-
-pkg_files(
-    name = "dist_files",
-    srcs = glob(
-        ["**/*"],
-        exclude = [
-            # Handled by dist_scripts:
-            "conformance_test_runner.sh",
-
-            # The following are not in autotools dist:
-            "autoload.php",
-            "conformance_nodejs.js",
-            "failure_list_jruby.txt",
-            "update_failure_list.py",
-        ],
-    ),
-    strip_prefix = strip_prefix.from_root(""),
-    visibility = ["//pkg:__pkg__"],
-)
-
-pkg_files(
-    name = "dist_scripts",
-    srcs = ["conformance_test_runner.sh"],
-    attributes = pkg_attributes(mode = "0555"),
-    strip_prefix = strip_prefix.from_root(""),
-    visibility = ["//pkg:__pkg__"],
-)
-
-pkg_filegroup(
-    name = "all_dist_files",
-    srcs = [
-        ":dist_files",
-        ":dist_scripts",
-    ],
-    visibility = ["//pkg:__pkg__"],
-)
diff --git a/libs/protobuf/conformance/ConformanceJava.java b/libs/protobuf/conformance/ConformanceJava.java
deleted file mode 100644
index 571b413..0000000
--- a/libs/protobuf/conformance/ConformanceJava.java
+++ /dev/null
@@ -1,418 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-import com.google.protobuf.AbstractMessage;
-import com.google.protobuf.ByteString;
-import com.google.protobuf.CodedInputStream;
-import com.google.protobuf.ExtensionRegistry;
-import com.google.protobuf.InvalidProtocolBufferException;
-import com.google.protobuf.Parser;
-import com.google.protobuf.TextFormat;
-import com.google.protobuf.conformance.Conformance;
-import com.google.protobuf.util.JsonFormat;
-import com.google.protobuf.util.JsonFormat.TypeRegistry;
-import com.google.protobuf_test_messages.proto2.TestMessagesProto2;
-import com.google.protobuf_test_messages.proto2.TestMessagesProto2.TestAllTypesProto2;
-import com.google.protobuf_test_messages.proto3.TestMessagesProto3;
-import com.google.protobuf_test_messages.proto3.TestMessagesProto3.TestAllTypesProto3;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-
-class ConformanceJava {
-  private int testCount = 0;
-  private TypeRegistry typeRegistry;
-
-  private boolean readFromStdin(byte[] buf, int len) throws Exception {
-    int ofs = 0;
-    while (len > 0) {
-      int read = System.in.read(buf, ofs, len);
-      if (read == -1) {
-        return false; // EOF
-      }
-      ofs += read;
-      len -= read;
-    }
-
-    return true;
-  }
-
-  private void writeToStdout(byte[] buf) throws Exception {
-    System.out.write(buf);
-  }
-
-  // Returns -1 on EOF (the actual values will always be positive).
-  private int readLittleEndianIntFromStdin() throws Exception {
-    byte[] buf = new byte[4];
-    if (!readFromStdin(buf, 4)) {
-      return -1;
-    }
-    return (buf[0] & 0xff)
-        | ((buf[1] & 0xff) << 8)
-        | ((buf[2] & 0xff) << 16)
-        | ((buf[3] & 0xff) << 24);
-  }
-
-  private void writeLittleEndianIntToStdout(int val) throws Exception {
-    byte[] buf = new byte[4];
-    buf[0] = (byte) val;
-    buf[1] = (byte) (val >> 8);
-    buf[2] = (byte) (val >> 16);
-    buf[3] = (byte) (val >> 24);
-    writeToStdout(buf);
-  }
-
-  private enum BinaryDecoderType {
-    BTYE_STRING_DECODER,
-    BYTE_ARRAY_DECODER,
-    ARRAY_BYTE_BUFFER_DECODER,
-    READONLY_ARRAY_BYTE_BUFFER_DECODER,
-    DIRECT_BYTE_BUFFER_DECODER,
-    READONLY_DIRECT_BYTE_BUFFER_DECODER,
-    INPUT_STREAM_DECODER;
-  }
-
-  private static class BinaryDecoder<T extends AbstractMessage> {
-    public T decode(
-        ByteString bytes, BinaryDecoderType type, Parser<T> parser, ExtensionRegistry extensions)
-        throws InvalidProtocolBufferException {
-      switch (type) {
-        case BTYE_STRING_DECODER:
-        case BYTE_ARRAY_DECODER:
-          return parser.parseFrom(bytes, extensions);
-        case ARRAY_BYTE_BUFFER_DECODER:
-          {
-            ByteBuffer buffer = ByteBuffer.allocate(bytes.size());
-            bytes.copyTo(buffer);
-            buffer.flip();
-            return parser.parseFrom(CodedInputStream.newInstance(buffer), extensions);
-          }
-        case READONLY_ARRAY_BYTE_BUFFER_DECODER:
-          {
-            return parser.parseFrom(
-                CodedInputStream.newInstance(bytes.asReadOnlyByteBuffer()), extensions);
-          }
-        case DIRECT_BYTE_BUFFER_DECODER:
-          {
-            ByteBuffer buffer = ByteBuffer.allocateDirect(bytes.size());
-            bytes.copyTo(buffer);
-            buffer.flip();
-            return parser.parseFrom(CodedInputStream.newInstance(buffer), extensions);
-          }
-        case READONLY_DIRECT_BYTE_BUFFER_DECODER:
-          {
-            ByteBuffer buffer = ByteBuffer.allocateDirect(bytes.size());
-            bytes.copyTo(buffer);
-            buffer.flip();
-            return parser.parseFrom(
-                CodedInputStream.newInstance(buffer.asReadOnlyBuffer()), extensions);
-          }
-        case INPUT_STREAM_DECODER:
-          {
-            return parser.parseFrom(bytes.newInput(), extensions);
-          }
-      }
-      return null;
-    }
-  }
-
-  private <T extends AbstractMessage> T parseBinary(
-      ByteString bytes, Parser<T> parser, ExtensionRegistry extensions)
-      throws InvalidProtocolBufferException {
-    ArrayList<T> messages = new ArrayList<>();
-    ArrayList<InvalidProtocolBufferException> exceptions = new ArrayList<>();
-
-    for (int i = 0; i < BinaryDecoderType.values().length; i++) {
-      messages.add(null);
-      exceptions.add(null);
-    }
-    if (messages.isEmpty()) {
-      throw new RuntimeException("binary decoder types missing");
-    }
-
-    BinaryDecoder<T> decoder = new BinaryDecoder<>();
-
-    boolean hasMessage = false;
-    boolean hasException = false;
-    for (int i = 0; i < BinaryDecoderType.values().length; ++i) {
-      try {
-        // = BinaryDecoderType.values()[i].parseProto3(bytes);
-        messages.set(i, decoder.decode(bytes, BinaryDecoderType.values()[i], parser, extensions));
-        hasMessage = true;
-      } catch (InvalidProtocolBufferException e) {
-        exceptions.set(i, e);
-        hasException = true;
-      }
-    }
-
-    if (hasMessage && hasException) {
-      StringBuilder sb =
-          new StringBuilder("Binary decoders disagreed on whether the payload was valid.\n");
-      for (int i = 0; i < BinaryDecoderType.values().length; ++i) {
-        sb.append(BinaryDecoderType.values()[i].name());
-        if (messages.get(i) != null) {
-          sb.append(" accepted the payload.\n");
-        } else {
-          sb.append(" rejected the payload.\n");
-        }
-      }
-      throw new RuntimeException(sb.toString());
-    }
-
-    if (hasException) {
-      // We do not check if exceptions are equal. Different implementations may return different
-      // exception messages. Throw an arbitrary one out instead.
-      InvalidProtocolBufferException exception = null;
-      for (InvalidProtocolBufferException e : exceptions) {
-        if (exception != null) {
-          exception.addSuppressed(e);
-        } else {
-          exception = e;
-        }
-      }
-      throw exception;
-    }
-
-    // Fast path comparing all the messages with the first message, assuming equality being
-    // symmetric and transitive.
-    boolean allEqual = true;
-    for (int i = 1; i < messages.size(); ++i) {
-      if (!messages.get(0).equals(messages.get(i))) {
-        allEqual = false;
-        break;
-      }
-    }
-
-    // Slow path: compare and find out all unequal pairs.
-    if (!allEqual) {
-      StringBuilder sb = new StringBuilder();
-      for (int i = 0; i < messages.size() - 1; ++i) {
-        for (int j = i + 1; j < messages.size(); ++j) {
-          if (!messages.get(i).equals(messages.get(j))) {
-            sb.append(BinaryDecoderType.values()[i].name())
-                .append(" and ")
-                .append(BinaryDecoderType.values()[j].name())
-                .append(" parsed the payload differently.\n");
-          }
-        }
-      }
-      throw new RuntimeException(sb.toString());
-    }
-
-    return messages.get(0);
-  }
-
-  private Conformance.ConformanceResponse doTest(Conformance.ConformanceRequest request) {
-    AbstractMessage testMessage;
-    String messageType = request.getMessageType();
-    boolean isProto3 =
-        messageType.equals("protobuf_test_messages.proto3.TestAllTypesProto3");
-    boolean isProto2 =
-        messageType.equals("protobuf_test_messages.proto2.TestAllTypesProto2");
-
-    switch (request.getPayloadCase()) {
-      case PROTOBUF_PAYLOAD:
-        {
-          if (isProto3) {
-            try {
-              ExtensionRegistry extensions = ExtensionRegistry.newInstance();
-              TestMessagesProto3.registerAllExtensions(extensions);
-              testMessage =
-                  parseBinary(
-                      request.getProtobufPayload(), TestAllTypesProto3.parser(), extensions);
-            } catch (InvalidProtocolBufferException e) {
-              return Conformance.ConformanceResponse.newBuilder()
-                  .setParseError(e.getMessage())
-                  .build();
-            }
-          } else if (isProto2) {
-            try {
-              ExtensionRegistry extensions = ExtensionRegistry.newInstance();
-              TestMessagesProto2.registerAllExtensions(extensions);
-              testMessage =
-                  parseBinary(
-                      request.getProtobufPayload(), TestAllTypesProto2.parser(), extensions);
-            } catch (InvalidProtocolBufferException e) {
-              return Conformance.ConformanceResponse.newBuilder()
-                  .setParseError(e.getMessage())
-                  .build();
-            }
-          } else {
-            throw new IllegalArgumentException(
-                "Protobuf request has unexpected payload type: " + messageType);
-          }
-          break;
-        }
-      case JSON_PAYLOAD:
-        {
-          try {
-            JsonFormat.Parser parser = JsonFormat.parser().usingTypeRegistry(typeRegistry);
-            if (request.getTestCategory()
-                == Conformance.TestCategory.JSON_IGNORE_UNKNOWN_PARSING_TEST) {
-              parser = parser.ignoringUnknownFields();
-            }
-            if (isProto3) {
-              TestMessagesProto3.TestAllTypesProto3.Builder builder =
-                  TestMessagesProto3.TestAllTypesProto3.newBuilder();
-              parser.merge(request.getJsonPayload(), builder);
-              testMessage = builder.build();
-            } else if (isProto2) {
-              TestMessagesProto2.TestAllTypesProto2.Builder builder =
-                  TestMessagesProto2.TestAllTypesProto2.newBuilder();
-              parser.merge(request.getJsonPayload(), builder);
-              testMessage = builder.build();
-            } else {
-              throw new IllegalArgumentException(
-                  "Protobuf request has unexpected payload type: " + messageType);
-            }
-          } catch (InvalidProtocolBufferException e) {
-            return Conformance.ConformanceResponse.newBuilder()
-                .setParseError(e.getMessage())
-                .build();
-          }
-          break;
-        }
-      case TEXT_PAYLOAD:
-        {
-          if (isProto3) {
-            try {
-              TestMessagesProto3.TestAllTypesProto3.Builder builder =
-                  TestMessagesProto3.TestAllTypesProto3.newBuilder();
-              TextFormat.merge(request.getTextPayload(), builder);
-              testMessage = builder.build();
-            } catch (TextFormat.ParseException e) {
-              return Conformance.ConformanceResponse.newBuilder()
-                  .setParseError(e.getMessage())
-                  .build();
-            }
-          } else if (isProto2) {
-            try {
-              TestMessagesProto2.TestAllTypesProto2.Builder builder =
-                  TestMessagesProto2.TestAllTypesProto2.newBuilder();
-              TextFormat.merge(request.getTextPayload(), builder);
-              testMessage = builder.build();
-            } catch (TextFormat.ParseException e) {
-              return Conformance.ConformanceResponse.newBuilder()
-                  .setParseError(e.getMessage())
-                  .build();
-            }
-          } else {
-            throw new IllegalArgumentException(
-               "Protobuf request has unexpected payload type: " + messageType);
-          }
-          break;
-        }
-      case PAYLOAD_NOT_SET:
-        {
-          throw new IllegalArgumentException("Request didn't have payload.");
-        }
-
-      default:
-        {
-          throw new IllegalArgumentException("Unexpected payload case.");
-        }
-    }
-
-    switch (request.getRequestedOutputFormat()) {
-      case UNSPECIFIED:
-        throw new IllegalArgumentException("Unspecified output format.");
-
-      case PROTOBUF:
-        {
-          ByteString messageString = testMessage.toByteString();
-          return Conformance.ConformanceResponse.newBuilder()
-              .setProtobufPayload(messageString)
-              .build();
-        }
-
-      case JSON:
-        try {
-          return Conformance.ConformanceResponse.newBuilder()
-              .setJsonPayload(
-                  JsonFormat.printer().usingTypeRegistry(typeRegistry).print(testMessage))
-              .build();
-        } catch (InvalidProtocolBufferException | IllegalArgumentException e) {
-          return Conformance.ConformanceResponse.newBuilder()
-              .setSerializeError(e.getMessage())
-              .build();
-        }
-
-      case TEXT_FORMAT:
-        return Conformance.ConformanceResponse.newBuilder()
-            .setTextPayload(TextFormat.printer().printToString(testMessage))
-            .build();
-
-      default:
-        {
-          throw new IllegalArgumentException("Unexpected request output.");
-        }
-    }
-  }
-
-  private boolean doTestIo() throws Exception {
-    int bytes = readLittleEndianIntFromStdin();
-
-    if (bytes == -1) {
-      return false; // EOF
-    }
-
-    byte[] serializedInput = new byte[bytes];
-
-    if (!readFromStdin(serializedInput, bytes)) {
-      throw new RuntimeException("Unexpected EOF from test program.");
-    }
-
-    Conformance.ConformanceRequest request =
-        Conformance.ConformanceRequest.parseFrom(serializedInput);
-    Conformance.ConformanceResponse response = doTest(request);
-    byte[] serializedOutput = response.toByteArray();
-
-    writeLittleEndianIntToStdout(serializedOutput.length);
-    writeToStdout(serializedOutput);
-
-    return true;
-  }
-
-  public void run() throws Exception {
-    typeRegistry =
-        TypeRegistry.newBuilder()
-            .add(TestMessagesProto3.TestAllTypesProto3.getDescriptor())
-            .build();
-    while (doTestIo()) {
-      this.testCount++;
-    }
-
-    System.err.println(
-        "ConformanceJava: received EOF from test runner after " + this.testCount + " tests");
-  }
-
-  public static void main(String[] args) throws Exception {
-    new ConformanceJava().run();
-  }
-}
diff --git a/libs/protobuf/conformance/ConformanceJavaLite.java b/libs/protobuf/conformance/ConformanceJavaLite.java
deleted file mode 100644
index eb3d06a..0000000
--- a/libs/protobuf/conformance/ConformanceJavaLite.java
+++ /dev/null
@@ -1,351 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-import com.google.protobuf.ByteString;
-import com.google.protobuf.CodedInputStream;
-import com.google.protobuf.ExtensionRegistryLite;
-import com.google.protobuf.InvalidProtocolBufferException;
-import com.google.protobuf.MessageLite;
-import com.google.protobuf.Parser;
-import com.google.protobuf.conformance.Conformance;
-import com.google.protobuf_test_messages.proto2.TestMessagesProto2;
-import com.google.protobuf_test_messages.proto2.TestMessagesProto2.TestAllTypesProto2;
-import com.google.protobuf_test_messages.proto3.TestMessagesProto3;
-import com.google.protobuf_test_messages.proto3.TestMessagesProto3.TestAllTypesProto3;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-
-class ConformanceJavaLite {
-  private int testCount = 0;
-
-  private boolean readFromStdin(byte[] buf, int len) throws Exception {
-    int ofs = 0;
-    while (len > 0) {
-      int read = System.in.read(buf, ofs, len);
-      if (read == -1) {
-        return false; // EOF
-      }
-      ofs += read;
-      len -= read;
-    }
-
-    return true;
-  }
-
-  private void writeToStdout(byte[] buf) throws Exception {
-    System.out.write(buf);
-  }
-
-  // Returns -1 on EOF (the actual values will always be positive).
-  private int readLittleEndianIntFromStdin() throws Exception {
-    byte[] buf = new byte[4];
-    if (!readFromStdin(buf, 4)) {
-      return -1;
-    }
-    return (buf[0] & 0xff)
-        | ((buf[1] & 0xff) << 8)
-        | ((buf[2] & 0xff) << 16)
-        | ((buf[3] & 0xff) << 24);
-  }
-
-  private void writeLittleEndianIntToStdout(int val) throws Exception {
-    byte[] buf = new byte[4];
-    buf[0] = (byte) val;
-    buf[1] = (byte) (val >> 8);
-    buf[2] = (byte) (val >> 16);
-    buf[3] = (byte) (val >> 24);
-    writeToStdout(buf);
-  }
-
-  private enum BinaryDecoderType {
-    BTYE_STRING_DECODER,
-    BYTE_ARRAY_DECODER,
-    ARRAY_BYTE_BUFFER_DECODER,
-    READONLY_ARRAY_BYTE_BUFFER_DECODER,
-    DIRECT_BYTE_BUFFER_DECODER,
-    READONLY_DIRECT_BYTE_BUFFER_DECODER,
-    INPUT_STREAM_DECODER;
-  }
-
-  private static class BinaryDecoder<T extends MessageLite> {
-    public T decode(
-        ByteString bytes,
-        BinaryDecoderType type,
-        Parser<T> parser,
-        ExtensionRegistryLite extensions)
-        throws InvalidProtocolBufferException {
-      switch (type) {
-        case BTYE_STRING_DECODER:
-        case BYTE_ARRAY_DECODER:
-          return parser.parseFrom(bytes, extensions);
-        case ARRAY_BYTE_BUFFER_DECODER:
-          {
-            ByteBuffer buffer = ByteBuffer.allocate(bytes.size());
-            bytes.copyTo(buffer);
-            buffer.flip();
-            return parser.parseFrom(CodedInputStream.newInstance(buffer), extensions);
-          }
-        case READONLY_ARRAY_BYTE_BUFFER_DECODER:
-          {
-            return parser.parseFrom(
-                CodedInputStream.newInstance(bytes.asReadOnlyByteBuffer()), extensions);
-          }
-        case DIRECT_BYTE_BUFFER_DECODER:
-          {
-            ByteBuffer buffer = ByteBuffer.allocateDirect(bytes.size());
-            bytes.copyTo(buffer);
-            buffer.flip();
-            return parser.parseFrom(CodedInputStream.newInstance(buffer), extensions);
-          }
-        case READONLY_DIRECT_BYTE_BUFFER_DECODER:
-          {
-            ByteBuffer buffer = ByteBuffer.allocateDirect(bytes.size());
-            bytes.copyTo(buffer);
-            buffer.flip();
-            return parser.parseFrom(
-                CodedInputStream.newInstance(buffer.asReadOnlyBuffer()), extensions);
-          }
-        case INPUT_STREAM_DECODER:
-          {
-            return parser.parseFrom(bytes.newInput(), extensions);
-          }
-      }
-      return null;
-    }
-  }
-
-  private <T extends MessageLite> T parseBinary(
-      ByteString bytes, Parser<T> parser, ExtensionRegistryLite extensions)
-      throws InvalidProtocolBufferException {
-    ArrayList<T> messages = new ArrayList<>();
-    ArrayList<InvalidProtocolBufferException> exceptions = new ArrayList<>();
-
-    for (int i = 0; i < BinaryDecoderType.values().length; i++) {
-      messages.add(null);
-      exceptions.add(null);
-    }
-    if (messages.isEmpty()) {
-      throw new RuntimeException("binary decoder types missing");
-    }
-
-    BinaryDecoder<T> decoder = new BinaryDecoder<>();
-
-    boolean hasMessage = false;
-    boolean hasException = false;
-    for (int i = 0; i < BinaryDecoderType.values().length; ++i) {
-      try {
-        messages.set(i, decoder.decode(bytes, BinaryDecoderType.values()[i], parser, extensions));
-        hasMessage = true;
-      } catch (InvalidProtocolBufferException e) {
-        exceptions.set(i, e);
-        hasException = true;
-      }
-    }
-
-    if (hasMessage && hasException) {
-      StringBuilder sb =
-          new StringBuilder("Binary decoders disagreed on whether the payload was valid.\n");
-      for (int i = 0; i < BinaryDecoderType.values().length; ++i) {
-        sb.append(BinaryDecoderType.values()[i].name());
-        if (messages.get(i) != null) {
-          sb.append(" accepted the payload.\n");
-        } else {
-          sb.append(" rejected the payload.\n");
-        }
-      }
-      throw new RuntimeException(sb.toString());
-    }
-
-    if (hasException) {
-      // We do not check if exceptions are equal. Different implementations may return different
-      // exception messages. Throw an arbitrary one out instead.
-      InvalidProtocolBufferException exception = null;
-      for (InvalidProtocolBufferException e : exceptions) {
-        if (exception != null) {
-          exception.addSuppressed(e);
-        } else {
-          exception = e;
-        }
-      }
-      throw exception;
-    }
-
-    // Fast path comparing all the messages with the first message, assuming equality being
-    // symmetric and transitive.
-    boolean allEqual = true;
-    for (int i = 1; i < messages.size(); ++i) {
-      if (!messages.get(0).equals(messages.get(i))) {
-        allEqual = false;
-        break;
-      }
-    }
-
-    // Slow path: compare and find out all unequal pairs.
-    if (!allEqual) {
-      StringBuilder sb = new StringBuilder();
-      for (int i = 0; i < messages.size() - 1; ++i) {
-        for (int j = i + 1; j < messages.size(); ++j) {
-          if (!messages.get(i).equals(messages.get(j))) {
-            sb.append(BinaryDecoderType.values()[i].name())
-                .append(" and ")
-                .append(BinaryDecoderType.values()[j].name())
-                .append(" parsed the payload differently.\n");
-          }
-        }
-      }
-      throw new RuntimeException(sb.toString());
-    }
-
-    return messages.get(0);
-  }
-
-  private Conformance.ConformanceResponse doTest(Conformance.ConformanceRequest request) {
-    com.google.protobuf.MessageLite testMessage;
-    boolean isProto3 =
-        request.getMessageType().equals("protobuf_test_messages.proto3.TestAllTypesProto3");
-    boolean isProto2 =
-        request.getMessageType().equals("protobuf_test_messages.proto2.TestAllTypesProto2");
-
-    switch (request.getPayloadCase()) {
-      case PROTOBUF_PAYLOAD:
-        {
-          if (isProto3) {
-            try {
-              ExtensionRegistryLite extensions = ExtensionRegistryLite.newInstance();
-              TestMessagesProto3.registerAllExtensions(extensions);
-              testMessage =
-                  parseBinary(
-                      request.getProtobufPayload(), TestAllTypesProto3.parser(), extensions);
-            } catch (InvalidProtocolBufferException e) {
-              return Conformance.ConformanceResponse.newBuilder()
-                  .setParseError(e.getMessage())
-                  .build();
-            }
-          } else if (isProto2) {
-            try {
-              ExtensionRegistryLite extensions = ExtensionRegistryLite.newInstance();
-              TestMessagesProto2.registerAllExtensions(extensions);
-              testMessage =
-                  parseBinary(
-                      request.getProtobufPayload(), TestAllTypesProto2.parser(), extensions);
-            } catch (InvalidProtocolBufferException e) {
-              return Conformance.ConformanceResponse.newBuilder()
-                  .setParseError(e.getMessage())
-                  .build();
-            }
-          } else {
-            throw new RuntimeException("Protobuf request doesn't have specific payload type.");
-          }
-          break;
-        }
-      case JSON_PAYLOAD:
-        {
-          return Conformance.ConformanceResponse.newBuilder()
-              .setSkipped("Lite runtime does not support JSON format.")
-              .build();
-        }
-      case TEXT_PAYLOAD:
-        {
-          return Conformance.ConformanceResponse.newBuilder()
-              .setSkipped("Lite runtime does not support Text format.")
-              .build();
-        }
-      case PAYLOAD_NOT_SET:
-        {
-          throw new RuntimeException("Request didn't have payload.");
-        }
-      default:
-        {
-          throw new RuntimeException("Unexpected payload case.");
-        }
-    }
-
-    switch (request.getRequestedOutputFormat()) {
-      case UNSPECIFIED:
-        throw new RuntimeException("Unspecified output format.");
-
-      case PROTOBUF:
-        return Conformance.ConformanceResponse.newBuilder()
-            .setProtobufPayload(testMessage.toByteString())
-            .build();
-
-      case JSON:
-        return Conformance.ConformanceResponse.newBuilder()
-            .setSkipped("Lite runtime does not support JSON format.")
-            .build();
-
-      case TEXT_FORMAT:
-        return Conformance.ConformanceResponse.newBuilder()
-            .setSkipped("Lite runtime does not support Text format.")
-            .build();
-      default:
-        {
-          throw new RuntimeException("Unexpected request output.");
-        }
-    }
-  }
-
-  private boolean doTestIo() throws Exception {
-    int bytes = readLittleEndianIntFromStdin();
-
-    if (bytes == -1) {
-      return false; // EOF
-    }
-
-    byte[] serializedInput = new byte[bytes];
-
-    if (!readFromStdin(serializedInput, bytes)) {
-      throw new RuntimeException("Unexpected EOF from test program.");
-    }
-
-    Conformance.ConformanceRequest request =
-        Conformance.ConformanceRequest.parseFrom(serializedInput);
-    Conformance.ConformanceResponse response = doTest(request);
-    byte[] serializedOutput = response.toByteArray();
-
-    writeLittleEndianIntToStdout(serializedOutput.length);
-    writeToStdout(serializedOutput);
-
-    return true;
-  }
-
-  public void run() throws Exception {
-    while (doTestIo()) {
-      this.testCount++;
-    }
-
-    System.err.println(
-        "ConformanceJavaLite: received EOF from test runner after " + this.testCount + " tests");
-  }
-
-  public static void main(String[] args) throws Exception {
-    new ConformanceJavaLite().run();
-  }
-}
diff --git a/libs/protobuf/conformance/Makefile.am b/libs/protobuf/conformance/Makefile.am
deleted file mode 100644
index 415412b..0000000
--- a/libs/protobuf/conformance/Makefile.am
+++ /dev/null
@@ -1,372 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-conformance_protoc_inputs =                                    \
-  conformance.proto                                            \
-  $(top_srcdir)/src/google/protobuf/test_messages_proto3.proto
-
-# proto2 input files, should be separated with proto3, as we
-# can't generate proto2 files for php.
-conformance_proto2_protoc_inputs =                             \
-  $(top_srcdir)/src/google/protobuf/test_messages_proto2.proto
-
-well_known_type_protoc_inputs =                                \
-  $(top_srcdir)/src/google/protobuf/any.proto                  \
-  $(top_srcdir)/src/google/protobuf/duration.proto             \
-  $(top_srcdir)/src/google/protobuf/field_mask.proto           \
-  $(top_srcdir)/src/google/protobuf/struct.proto               \
-  $(top_srcdir)/src/google/protobuf/timestamp.proto            \
-  $(top_srcdir)/src/google/protobuf/wrappers.proto
-
-
-protoc_outputs =                                               \
-  conformance.pb.cc                                            \
-  conformance.pb.h
-
-other_language_protoc_outputs =                                \
-  conformance_pb2.py                                           \
-  Conformance.pbobjc.h                                         \
-  Conformance.pbobjc.m                                         \
-  conformance_pb.js                                            \
-  conformance_pb.rb                                            \
-  com/google/protobuf/Any.java                                 \
-  com/google/protobuf/AnyOrBuilder.java                        \
-  com/google/protobuf/AnyProto.java                            \
-  com/google/protobuf/BoolValue.java                           \
-  com/google/protobuf/BoolValueOrBuilder.java                  \
-  com/google/protobuf/BytesValue.java                          \
-  com/google/protobuf/BytesValueOrBuilder.java                 \
-  com/google/protobuf/conformance/Conformance.java             \
-  com/google/protobuf/DoubleValue.java                         \
-  com/google/protobuf/DoubleValueOrBuilder.java                \
-  com/google/protobuf/Duration.java                            \
-  com/google/protobuf/DurationOrBuilder.java                   \
-  com/google/protobuf/DurationProto.java                       \
-  com/google/protobuf/FieldMask.java                           \
-  com/google/protobuf/FieldMaskOrBuilder.java                  \
-  com/google/protobuf/FieldMaskProto.java                      \
-  com/google/protobuf/FloatValue.java                          \
-  com/google/protobuf/FloatValueOrBuilder.java                 \
-  com/google/protobuf/Int32Value.java                          \
-  com/google/protobuf/Int32ValueOrBuilder.java                 \
-  com/google/protobuf/Int64Value.java                          \
-  com/google/protobuf/Int64ValueOrBuilder.java                 \
-  com/google/protobuf/ListValue.java                           \
-  com/google/protobuf/ListValueOrBuilder.java                  \
-  com/google/protobuf/NullValue.java                           \
-  com/google/protobuf/StringValue.java                         \
-  com/google/protobuf/StringValueOrBuilder.java                \
-  com/google/protobuf/Struct.java                              \
-  com/google/protobuf/StructOrBuilder.java                     \
-  com/google/protobuf/StructProto.java                         \
-  com/google/protobuf/Timestamp.java                           \
-  com/google/protobuf/TimestampOrBuilder.java                  \
-  com/google/protobuf/TimestampProto.java                      \
-  com/google/protobuf/UInt32Value.java                         \
-  com/google/protobuf/UInt32ValueOrBuilder.java                \
-  com/google/protobuf/UInt64Value.java                         \
-  com/google/protobuf/UInt64ValueOrBuilder.java                \
-  com/google/protobuf/Value.java                               \
-  com/google/protobuf/ValueOrBuilder.java                      \
-  com/google/protobuf/WrappersProto.java                       \
-  com/google/protobuf_test_messages/proto3/TestMessagesProto3.java \
-  com/google/protobuf_test_messages/proto2/TestMessagesProto2.java \
-  google/protobuf/any.pb.cc                                    \
-  google/protobuf/any.pb.h                                     \
-  google/protobuf/any.rb                                       \
-  google/protobuf/any_pb2.py                                   \
-  google/protobuf/duration.pb.cc                               \
-  google/protobuf/duration.pb.h                                \
-  google/protobuf/duration.rb                                  \
-  google/protobuf/duration_pb2.py                              \
-  google/protobuf/field_mask.pb.cc                             \
-  google/protobuf/field_mask.pb.h                              \
-  google/protobuf/field_mask.rb                                \
-  google/protobuf/field_mask_pb2.py                            \
-  google/protobuf/struct.pb.cc                                 \
-  google/protobuf/struct.pb.h                                  \
-  google/protobuf/struct.rb                                    \
-  google/protobuf/struct_pb2.py                                \
-  google/protobuf/TestMessagesProto2.pbobjc.h                  \
-  google/protobuf/TestMessagesProto2.pbobjc.m                  \
-  google/protobuf/TestMessagesProto3.pbobjc.h                  \
-  google/protobuf/TestMessagesProto3.pbobjc.m                  \
-  google/protobuf/test_messages_proto3.pb.cc                   \
-  google/protobuf/test_messages_proto3.pb.h                    \
-  google/protobuf/test_messages_proto2.pb.cc                   \
-  google/protobuf/test_messages_proto2.pb.h                    \
-  google/protobuf/test_messages_proto3_pb.rb                   \
-  google/protobuf/test_messages_proto3_pb2.py                  \
-  google/protobuf/test_messages_proto2_pb2.py                  \
-  google/protobuf/timestamp.pb.cc                              \
-  google/protobuf/timestamp.pb.h                               \
-  google/protobuf/timestamp.rb                                 \
-  google/protobuf/timestamp_pb2.py                             \
-  google/protobuf/wrappers.pb.cc                               \
-  google/protobuf/wrappers.pb.h                                \
-  google/protobuf/wrappers.rb                                  \
-  google/protobuf/wrappers_pb2.py                              \
-  Conformance/ConformanceRequest.php                           \
-  Conformance/ConformanceResponse.php                          \
-  Conformance/FailureSet.php                                   \
-  Conformance/WireFormat.php                                   \
-  GPBMetadata/Conformance.php                                  \
-  GPBMetadata/Google/Protobuf/Any.php                          \
-  GPBMetadata/Google/Protobuf/Duration.php                     \
-  GPBMetadata/Google/Protobuf/FieldMask.php                    \
-  GPBMetadata/Google/Protobuf/Struct.php                       \
-  GPBMetadata/Google/Protobuf/TestMessagesProto3.php           \
-  GPBMetadata/Google/Protobuf/Timestamp.php                    \
-  GPBMetadata/Google/Protobuf/Wrappers.php                     \
-  Google/Protobuf/Any.php                                      \
-  Google/Protobuf/BoolValue.php                                \
-  Google/Protobuf/BytesValue.php                               \
-  Google/Protobuf/DoubleValue.php                              \
-  Google/Protobuf/Duration.php                                 \
-  Google/Protobuf/FieldMask.php                                \
-  Google/Protobuf/FloatValue.php                               \
-  Google/Protobuf/Int32Value.php                               \
-  Google/Protobuf/Int64Value.php                               \
-  Google/Protobuf/ListValue.php                                \
-  Google/Protobuf/NullValue.php                                \
-  Google/Protobuf/StringValue.php                              \
-  Google/Protobuf/Struct.php                                   \
-  Google/Protobuf/Timestamp.php                                \
-  Google/Protobuf/UInt32Value.php                              \
-  Google/Protobuf/UInt64Value.php                              \
-  Google/Protobuf/Value.php                                    \
-  Protobuf_test_messages/Proto3/ForeignEnum.php                \
-  Protobuf_test_messages/Proto3/ForeignMessage.php             \
-  Protobuf_test_messages/Proto3/TestAllTypes_NestedEnum.php    \
-  Protobuf_test_messages/Proto3/TestAllTypes_NestedMessage.php \
-  Protobuf_test_messages/Proto3/TestAllTypes.php
-  # lite/com/google/protobuf/Any.java                            \
-  # lite/com/google/protobuf/AnyOrBuilder.java                   \
-  # lite/com/google/protobuf/AnyProto.java                       \
-  # lite/com/google/protobuf/BoolValue.java                      \
-  # lite/com/google/protobuf/BoolValueOrBuilder.java             \
-  # lite/com/google/protobuf/BytesValue.java                     \
-  # lite/com/google/protobuf/BytesValueOrBuilder.java            \
-  # lite/com/google/protobuf/conformance/Conformance.java        \
-  # lite/com/google/protobuf/DoubleValue.java                    \
-  # lite/com/google/protobuf/DoubleValueOrBuilder.java           \
-  # lite/com/google/protobuf/Duration.java                       \
-  # lite/com/google/protobuf/DurationOrBuilder.java              \
-  # lite/com/google/protobuf/DurationProto.java                  \
-  # lite/com/google/protobuf/FieldMask.java                      \
-  # lite/com/google/protobuf/FieldMaskOrBuilder.java             \
-  # lite/com/google/protobuf/FieldMaskProto.java                 \
-  # lite/com/google/protobuf/FloatValue.java                     \
-  # lite/com/google/protobuf/FloatValueOrBuilder.java            \
-  # lite/com/google/protobuf/Int32Value.java                     \
-  # lite/com/google/protobuf/Int32ValueOrBuilder.java            \
-  # lite/com/google/protobuf/Int64Value.java                     \
-  # lite/com/google/protobuf/Int64ValueOrBuilder.java            \
-  # lite/com/google/protobuf/ListValue.java                      \
-  # lite/com/google/protobuf/ListValueOrBuilder.java             \
-  # lite/com/google/protobuf/NullValue.java                      \
-  # lite/com/google/protobuf/StringValue.java                    \
-  # lite/com/google/protobuf/StringValueOrBuilder.java           \
-  # lite/com/google/protobuf/Struct.java                         \
-  # lite/com/google/protobuf/StructOrBuilder.java                \
-  # lite/com/google/protobuf/StructProto.java                    \
-  # lite/com/google/protobuf/Timestamp.java                      \
-  # lite/com/google/protobuf/TimestampOrBuilder.java             \
-  # lite/com/google/protobuf/TimestampProto.java                 \
-  # lite/com/google/protobuf/UInt32Value.java                    \
-  # lite/com/google/protobuf/UInt32ValueOrBuilder.java           \
-  # lite/com/google/protobuf/UInt64Value.java                    \
-  # lite/com/google/protobuf/UInt64ValueOrBuilder.java           \
-  # lite/com/google/protobuf/Value.java                          \
-  # lite/com/google/protobuf/ValueOrBuilder.java                 \
-  # lite/com/google/protobuf/WrappersProto.java
-
-bin_PROGRAMS = conformance-test-runner conformance-cpp
-
-# All source files excepet C++/Objective-C ones should be explicitly listed
-# here because the autoconf tools don't include files of other languages
-# automatically.
-EXTRA_DIST =                  \
-  ConformanceJava.java        \
-  ConformanceJavaLite.java    \
-  README.md                   \
-  conformance.proto           \
-  conformance_python.py       \
-  conformance_ruby.rb         \
-  conformance_php.php         \
-  failure_list_cpp.txt        \
-  failure_list_csharp.txt     \
-  failure_list_java.txt       \
-  failure_list_js.txt         \
-  failure_list_objc.txt       \
-  failure_list_python.txt     \
-  failure_list_python_cpp.txt \
-  failure_list_python-post26.txt \
-  failure_list_ruby.txt       \
-  failure_list_php.txt        \
-  failure_list_php_c.txt
-
-conformance_test_runner_LDADD = $(top_srcdir)/src/libprotobuf.la
-conformance_test_runner_SOURCES = conformance_test.h conformance_test.cc \
-                                  conformance_test_main.cc               \
-                                  binary_json_conformance_suite.h        \
-                                  binary_json_conformance_suite.cc       \
-                                  text_format_conformance_suite.h        \
-                                  text_format_conformance_suite.cc       \
-                                  conformance_test_runner.cc             \
-                                  third_party/jsoncpp/json.h             \
-                                  third_party/jsoncpp/jsoncpp.cpp
-nodist_conformance_test_runner_SOURCES = conformance.pb.cc google/protobuf/test_messages_proto3.pb.cc google/protobuf/test_messages_proto2.pb.cc
-conformance_test_runner_CPPFLAGS = -I$(top_srcdir)/src -I$(srcdir)
-conformance_test_runner_CXXFLAGS = -std=c++11
-# Explicit deps because BUILT_SOURCES are only done before a "make all/check"
-# so a direct "make test_cpp" could fail if parallel enough.
-conformance_test_runner-conformance_test.$(OBJEXT): conformance.pb.h
-conformance_test_runner-conformance_test_runner.$(OBJEXT): conformance.pb.h
-
-conformance_cpp_LDADD = $(top_srcdir)/src/libprotobuf.la
-conformance_cpp_SOURCES = conformance_cpp.cc
-nodist_conformance_cpp_SOURCES = conformance.pb.cc google/protobuf/test_messages_proto3.pb.cc google/protobuf/test_messages_proto2.pb.cc
-conformance_cpp_CPPFLAGS = -I$(top_srcdir)/src
-# Explicit dep because BUILT_SOURCES are only done before a "make all/check"
-# so a direct "make test_cpp" could fail if parallel enough.
-conformance_cpp-conformance_cpp.$(OBJEXT): conformance.pb.h
-
-if OBJC_CONFORMANCE_TEST
-
-bin_PROGRAMS += conformance-objc
-
-conformance_objc_SOURCES = conformance_objc.m ../objectivec/GPBProtocolBuffers.m
-nodist_conformance_objc_SOURCES = Conformance.pbobjc.m google/protobuf/TestMessagesProto2.pbobjc.m google/protobuf/TestMessagesProto3.pbobjc.m
-# On travis, the build fails without the isysroot because whatever system
-# headers are being found don't include generics support for
-# NSArray/NSDictionary, the only guess is their image at one time had an odd
-# setup for Xcode and old frameworks are being found.
-conformance_objc_CPPFLAGS = -I$(top_srcdir)/objectivec -isysroot `xcrun --sdk macosx --show-sdk-path`
-conformance_objc_LDFLAGS = -framework Foundation
-# Explicit dep because BUILT_SOURCES are only done before a "make all/check"
-# so a direct "make test_objc" could fail if parallel enough.
-conformance_objc-conformance_objc.$(OBJEXT): Conformance.pbobjc.h google/protobuf/TestMessagesProto2.pbobjc.h google/protobuf/TestMessagesProto3.pbobjc.h
-
-endif
-
-# JavaScript well-known types are expected to be in a directory called
-# google-protobuf, because they are usually in the google-protobuf npm
-# package.  But we want to use the sources from our tree, so we recreate
-# that directory structure here.
-google-protobuf:
-	mkdir google-protobuf
-
-if USE_EXTERNAL_PROTOC
-
-# Some implementations include pre-generated versions of well-known types.
-protoc_middleman: $(conformance_protoc_inputs) $(conformance_proto2_protoc_inputs) $(well_known_type_protoc_inputs) google-protobuf
-	$(PROTOC) -I$(srcdir) -I$(top_srcdir) --cpp_out=. --java_out=. --ruby_out=. --objc_out=. --python_out=. --php_out=. $(conformance_protoc_inputs)
-	$(PROTOC) -I$(srcdir) -I$(top_srcdir) --cpp_out=. --java_out=. --ruby_out=. --objc_out=. --python_out=. $(conformance_proto2_protoc_inputs)
-	$(PROTOC) -I$(srcdir) -I$(top_srcdir) --cpp_out=. --java_out=. --ruby_out=. --python_out=. $(well_known_type_protoc_inputs)
-	## $(PROTOC) -I$(srcdir) -I$(top_srcdir) --java_out=lite:lite $(conformance_protoc_inputs) $(well_known_type_protoc_inputs)
-	touch protoc_middleman
-
-else
-
-# We have to cd to $(srcdir) before executing protoc because $(protoc_inputs) is
-# relative to srcdir, which may not be the same as the current directory when
-# building out-of-tree.
-protoc_middleman: $(top_srcdir)/src/protoc$(EXEEXT) $(conformance_protoc_inputs) $(conformance_proto2_protoc_inputs) $(well_known_type_protoc_inputs) google-protobuf
-	oldpwd=`pwd` && ( cd $(srcdir) && $$oldpwd/../src/protoc$(EXEEXT) -I. -I$(top_srcdir)/src --cpp_out=$$oldpwd --java_out=$$oldpwd --ruby_out=$$oldpwd --objc_out=$$oldpwd --python_out=$$oldpwd --php_out=$$oldpwd $(conformance_protoc_inputs) )
-	oldpwd=`pwd` && ( cd $(srcdir) && $$oldpwd/../src/protoc$(EXEEXT) -I. -I$(top_srcdir)/src --cpp_out=$$oldpwd --java_out=$$oldpwd --ruby_out=$$oldpwd --objc_out=$$oldpwd --python_out=$$oldpwd $(conformance_proto2_protoc_inputs) )
-	oldpwd=`pwd` && ( cd $(srcdir) && $$oldpwd/../src/protoc$(EXEEXT) -I. -I$(top_srcdir)/src --cpp_out=$$oldpwd --java_out=$$oldpwd --ruby_out=$$oldpwd --python_out=$$oldpwd $(well_known_type_protoc_inputs) )
-	## @mkdir -p lite
-	## oldpwd=`pwd` && ( cd $(srcdir) && $$oldpwd/../src/protoc$(EXEEXT) -I. -I$(top_srcdir)/src --java_out=lite:$$oldpwd/lite $(conformance_protoc_inputs) $(well_known_type_protoc_inputs) )
-	touch protoc_middleman
-
-endif
-
-$(protoc_outputs): protoc_middleman
-
-$(other_language_protoc_outputs): protoc_middleman
-
-CLEANFILES = $(protoc_outputs) protoc_middleman javac_middleman conformance-java javac_middleman_lite conformance-java-lite conformance-csharp conformance-php conformance-php-c $(other_language_protoc_outputs)
-
-MAINTAINERCLEANFILES =   \
-  Makefile.in
-
-javac_middleman: ConformanceJava.java protoc_middleman $(other_language_protoc_outputs)
-	jar=`ls ../java/util/target/*jar-with-dependencies.jar` && javac -classpath ../java/target/classes:$$jar ConformanceJava.java com/google/protobuf/conformance/Conformance.java com/google/protobuf_test_messages/proto3/TestMessagesProto3.java com/google/protobuf_test_messages/proto2/TestMessagesProto2.java
-	@touch javac_middleman
-
-conformance-java: javac_middleman
-	@echo "Writing shortcut script conformance-java..."
-	@echo '#! /bin/sh' > conformance-java
-	@jar=`ls ../java/util/target/*jar-with-dependencies.jar` && echo java -classpath .:../java/target/classes:$$jar ConformanceJava '$$@' >> conformance-java
-	@chmod +x conformance-java
-
-javac_middleman_lite: ConformanceJavaLite.java protoc_middleman $(other_language_protoc_outputs)
-	javac -classpath ../java/lite/target/classes:lite ConformanceJavaLite.java lite/com/google/protobuf/conformance/Conformance.java
-	@touch javac_middleman_lite
-
-conformance-java-lite: javac_middleman_lite
-	@echo "Writing shortcut script conformance-java-lite..."
-	@echo '#! /bin/sh' > conformance-java-lite
-	@echo java -classpath .:../java/lite/target/classes:lite ConformanceJavaLite '$$@' >> conformance-java-lite
-	@chmod +x conformance-java-lite
-
-# Currently the conformance code is alongside the rest of the C#
-# source, as it's easier to maintain there. We assume we've already
-# built that, so we just need a script to run it.
-conformance-csharp: $(other_language_protoc_outputs)
-	@echo "Writing shortcut script conformance-csharp..."
-	@echo '#! /bin/sh' > conformance-csharp
-	@echo 'dotnet ../csharp/src/Google.Protobuf.Conformance/bin/Release/netcoreapp3.1/Google.Protobuf.Conformance.dll "$$@"' >> conformance-csharp
-	@chmod +x conformance-csharp
-
-conformance-php:
-	@echo "Writing shortcut script conformance-php..."
-	@echo '#! /bin/sh' > conformance-php
-	@echo 'php -d auto_prepend_file=autoload.php ./conformance_php.php' >> conformance-php
-	@chmod +x conformance-php
-
-conformance-php-c:
-	@echo "Writing shortcut script conformance-php-c..."
-	@echo '#! /bin/sh' > conformance-php-c
-	@echo 'php -dextension=../php/ext/google/protobuf/modules/protobuf.so ./conformance_php.php' >> conformance-php-c
-	@chmod +x conformance-php-c
-
-# Targets for actually running tests.
-test_cpp: protoc_middleman conformance-test-runner conformance-cpp
-	./conformance-test-runner --enforce_recommended --failure_list failure_list_cpp.txt --text_format_failure_list text_format_failure_list_cpp.txt ./conformance-cpp
-
-test_java: protoc_middleman conformance-test-runner conformance-java
-	./conformance-test-runner --enforce_recommended --failure_list failure_list_java.txt --text_format_failure_list text_format_failure_list_java.txt ./conformance-java
-
-test_java_lite: protoc_middleman conformance-test-runner conformance-java-lite
-	./conformance-test-runner --enforce_recommended ./conformance-java-lite
-
-test_csharp: protoc_middleman conformance-test-runner conformance-csharp
-	./conformance-test-runner --enforce_recommended --failure_list failure_list_csharp.txt --text_format_failure_list text_format_failure_list_csharp.txt ./conformance-csharp
-
-test_ruby: protoc_middleman conformance-test-runner $(other_language_protoc_outputs)
-	RUBYLIB=../ruby/lib:. ./conformance-test-runner --enforce_recommended --failure_list failure_list_ruby.txt --text_format_failure_list text_format_failure_list_ruby.txt ./conformance_ruby.rb
-
-test_jruby: protoc_middleman conformance-test-runner $(other_language_protoc_outputs)
-	RUBYLIB=../ruby/lib:. ./conformance-test-runner --enforce_recommended --failure_list failure_list_jruby.txt --text_format_failure_list text_format_failure_list_jruby.txt ./conformance_ruby.rb
-
-test_php: protoc_middleman conformance-test-runner conformance-php $(other_language_protoc_outputs)
-	./conformance-test-runner --enforce_recommended --failure_list failure_list_php.txt --text_format_failure_list text_format_failure_list_php.txt ./conformance-php
-
-test_php_c: protoc_middleman conformance-test-runner conformance-php-c $(other_language_protoc_outputs)
-	./conformance-test-runner --enforce_recommended --failure_list failure_list_php_c.txt --text_format_failure_list text_format_failure_list_php.txt ./conformance-php-c
-
-# These depend on library paths being properly set up.  The easiest way to
-# run them is to just use "tox" from the python dir.
-test_python: protoc_middleman conformance-test-runner
-	./conformance-test-runner --enforce_recommended --failure_list failure_list_python.txt --text_format_failure_list text_format_failure_list_python.txt ./conformance_python.py
-
-test_python_cpp: protoc_middleman conformance-test-runner
-	./conformance-test-runner --enforce_recommended --failure_list failure_list_python_cpp.txt --text_format_failure_list text_format_failure_list_python_cpp.txt ./conformance_python.py
-
-if OBJC_CONFORMANCE_TEST
-
-test_objc: protoc_middleman conformance-test-runner conformance-objc
-	./conformance-test-runner --enforce_recommended --failure_list failure_list_objc.txt ./conformance-objc
-
-endif
diff --git a/libs/protobuf/conformance/README.md b/libs/protobuf/conformance/README.md
deleted file mode 100644
index 901d287..0000000
--- a/libs/protobuf/conformance/README.md
+++ /dev/null
@@ -1,71 +0,0 @@
-Protocol Buffers - Google's data interchange format
-===================================================
-
-Copyright 2008 Google Inc.
-
-This directory contains conformance tests for testing completeness and
-correctness of Protocol Buffers implementations.  These tests are designed
-to be easy to run against any Protocol Buffers implementation.
-
-This directory contains the tester process `conformance-test`, which
-contains all of the tests themselves.  Then separate programs written
-in whatever language you want to test communicate with the tester
-program over a pipe.
-
-Before running any of these tests, make sure you run `make` in the base
-directory to build `protoc`, since all the tests depend on it.
-
-    $ make
-
-Running the tests for C++
--------------------------
-
-To run the tests against the C++ implementation, run:
-
-    $ cd conformance && make test_cpp
-
-Running the tests for JavaScript (Node.js)
-------------------------------------------
-
-To run the JavaScript tests against Node.js, make sure you have "node"
-on your path and then run:
-
-    $ cd conformance && make test_nodejs
-
-Running the tests for Ruby (MRI)
---------------------------------
-
-To run the Ruby tests against MRI, first build the C extension:
-
-    $ cd ruby && rake
-
-Then run the tests like so:
-
-    $ cd conformance && make test_ruby
-
-Running the tests for other languages
--------------------------------------
-
-Most of the languages in the Protobuf source tree are set up to run
-conformance tests.  However some of them are more tricky to set up
-properly.  See `tests.sh` in the base of the repository to see how
-Kokoro runs the tests.
-
-Testing other Protocol Buffer implementations
----------------------------------------------
-
-To run these tests against a new Protocol Buffers implementation, write a
-program in your language that uses the protobuf implementation you want
-to test.  This program should implement the testing protocol defined in
-[conformance.proto](https://github.com/protocolbuffers/protobuf/blob/main/conformance/conformance.proto).
-This is designed to be as easy as possible: the C++ version is only
-150 lines and is a good example for what this program should look like
-(see [conformance_cpp.cc](https://github.com/protocolbuffers/protobuf/blob/main/conformance/conformance_cpp.cc)).
-The program only needs to be able to read from stdin and write to stdout.
-
-Portability
------------
-
-Note that the test runner currently does not work on Windows.  Patches
-to fix this are welcome!  (But please get in touch first to settle on
-a general implementation strategy).
diff --git a/libs/protobuf/conformance/autoload.php b/libs/protobuf/conformance/autoload.php
deleted file mode 100644
index 0f49aec..0000000
--- a/libs/protobuf/conformance/autoload.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-define("GOOGLE_INTERNAL_NAMESPACE", "Google\\Protobuf\\Internal\\");
-define("GOOGLE_NAMESPACE", "Google\\Protobuf\\");
-define("GOOGLE_GPBMETADATA_NAMESPACE", "GPBMetadata\\Google\\Protobuf\\");
-
-function protobuf_autoloader_impl($class, $prefix) {
-    $length = strlen($prefix);
-    if ((substr($class, 0, $length) === $prefix)) {
-        $path = '../php/src/' . implode('/', array_map('ucwords', explode('\\', $class))) . '.php';
-        include_once $path;
-    }
-}
-
-function protobuf_autoloader($class) {
-    protobuf_autoloader_impl($class, GOOGLE_INTERNAL_NAMESPACE);
-    protobuf_autoloader_impl($class, GOOGLE_NAMESPACE);
-    protobuf_autoloader_impl($class, GOOGLE_GPBMETADATA_NAMESPACE);
-}
-
-spl_autoload_register('protobuf_autoloader');
diff --git a/libs/protobuf/conformance/binary_json_conformance_suite.cc b/libs/protobuf/conformance/binary_json_conformance_suite.cc
deleted file mode 100644
index 9b1548d..0000000
--- a/libs/protobuf/conformance/binary_json_conformance_suite.cc
+++ /dev/null
@@ -1,3264 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include "binary_json_conformance_suite.h"
-
-#include <google/protobuf/text_format.h>
-#include <google/protobuf/wire_format_lite.h>
-#include <google/protobuf/util/json_util.h>
-#include <google/protobuf/util/type_resolver_util.h>
-#include "third_party/jsoncpp/json.h"
-#include "conformance_test.h"
-#include <google/protobuf/test_messages_proto2.pb.h>
-#include <google/protobuf/test_messages_proto3.pb.h>
-#include <google/protobuf/stubs/status.h>
-
-namespace proto2_messages = protobuf_test_messages::proto2;
-
-using conformance::ConformanceRequest;
-using conformance::ConformanceResponse;
-using conformance::WireFormat;
-using google::protobuf::Descriptor;
-using google::protobuf::FieldDescriptor;
-using google::protobuf::Message;
-using google::protobuf::TextFormat;
-using google::protobuf::internal::WireFormatLite;
-using google::protobuf::util::NewTypeResolverForDescriptorPool;
-using proto2_messages::TestAllTypesProto2;
-using protobuf_test_messages::proto3::TestAllTypesProto3;
-using std::string;
-
-namespace {
-
-static const char kTypeUrlPrefix[] = "type.googleapis.com";
-
-static string GetTypeUrl(const Descriptor* message) {
-  return string(kTypeUrlPrefix) + "/" + message->full_name();
-}
-
-/* Routines for building arbitrary protos *************************************/
-
-// We would use CodedOutputStream except that we want more freedom to build
-// arbitrary protos (even invalid ones).
-
-const string empty;
-
-string cat(const string& a, const string& b,
-           const string& c = empty,
-           const string& d = empty,
-           const string& e = empty,
-           const string& f = empty,
-           const string& g = empty,
-           const string& h = empty,
-           const string& i = empty,
-           const string& j = empty,
-           const string& k = empty,
-           const string& l = empty) {
-  string ret;
-  ret.reserve(a.size() + b.size() + c.size() + d.size() + e.size() + f.size() +
-              g.size() + h.size() + i.size() + j.size() + k.size() + l.size());
-  ret.append(a);
-  ret.append(b);
-  ret.append(c);
-  ret.append(d);
-  ret.append(e);
-  ret.append(f);
-  ret.append(g);
-  ret.append(h);
-  ret.append(i);
-  ret.append(j);
-  ret.append(k);
-  ret.append(l);
-  return ret;
-}
-
-// The maximum number of bytes that it takes to encode a 64-bit varint.
-#define VARINT_MAX_LEN 10
-
-size_t vencode64(uint64_t val, int over_encoded_bytes, char *buf) {
-  if (val == 0) { buf[0] = 0; return 1; }
-  size_t i = 0;
-  while (val) {
-    uint8_t byte = val & 0x7fU;
-    val >>= 7;
-    if (val || over_encoded_bytes) byte |= 0x80U;
-    buf[i++] = byte;
-  }
-  while (over_encoded_bytes--) {
-    assert(i < 10);
-    uint8_t byte = over_encoded_bytes ? 0x80 : 0;
-    buf[i++] = byte;
-  }
-  return i;
-}
-
-string varint(uint64_t x) {
-  char buf[VARINT_MAX_LEN];
-  size_t len = vencode64(x, 0, buf);
-  return string(buf, len);
-}
-
-// Encodes a varint that is |extra| bytes longer than it needs to be, but still
-// valid.
-string longvarint(uint64_t x, int extra) {
-  char buf[VARINT_MAX_LEN];
-  size_t len = vencode64(x, extra, buf);
-  return string(buf, len);
-}
-
-// TODO: proper byte-swapping for big-endian machines.
-string fixed32(void *data) { return string(static_cast<char*>(data), 4); }
-string fixed64(void *data) { return string(static_cast<char*>(data), 8); }
-
-string delim(const string& buf) { return cat(varint(buf.size()), buf); }
-string u32(uint32_t u32) { return fixed32(&u32); }
-string u64(uint64_t u64) { return fixed64(&u64); }
-string flt(float f) { return fixed32(&f); }
-string dbl(double d) { return fixed64(&d); }
-string zz32(int32_t x) { return varint(WireFormatLite::ZigZagEncode32(x)); }
-string zz64(int64_t x) { return varint(WireFormatLite::ZigZagEncode64(x)); }
-
-string tag(uint32_t fieldnum, char wire_type) {
-  return varint((fieldnum << 3) | wire_type);
-}
-
-string GetDefaultValue(FieldDescriptor::Type type) {
-  switch (type) {
-    case FieldDescriptor::TYPE_INT32:
-    case FieldDescriptor::TYPE_INT64:
-    case FieldDescriptor::TYPE_UINT32:
-    case FieldDescriptor::TYPE_UINT64:
-    case FieldDescriptor::TYPE_ENUM:
-    case FieldDescriptor::TYPE_BOOL:
-      return varint(0);
-    case FieldDescriptor::TYPE_SINT32:
-      return zz32(0);
-    case FieldDescriptor::TYPE_SINT64:
-      return zz64(0);
-    case FieldDescriptor::TYPE_FIXED32:
-    case FieldDescriptor::TYPE_SFIXED32:
-      return u32(0);
-    case FieldDescriptor::TYPE_FIXED64:
-    case FieldDescriptor::TYPE_SFIXED64:
-      return u64(0);
-    case FieldDescriptor::TYPE_FLOAT:
-      return flt(0);
-    case FieldDescriptor::TYPE_DOUBLE:
-      return dbl(0);
-    case FieldDescriptor::TYPE_STRING:
-    case FieldDescriptor::TYPE_BYTES:
-    case FieldDescriptor::TYPE_MESSAGE:
-      return delim("");
-    default:
-      return "";
-  }
-  return "";
-}
-
-string GetNonDefaultValue(FieldDescriptor::Type type) {
-  switch (type) {
-    case FieldDescriptor::TYPE_INT32:
-    case FieldDescriptor::TYPE_INT64:
-    case FieldDescriptor::TYPE_UINT32:
-    case FieldDescriptor::TYPE_UINT64:
-    case FieldDescriptor::TYPE_ENUM:
-    case FieldDescriptor::TYPE_BOOL:
-      return varint(1);
-    case FieldDescriptor::TYPE_SINT32:
-      return zz32(1);
-    case FieldDescriptor::TYPE_SINT64:
-      return zz64(1);
-    case FieldDescriptor::TYPE_FIXED32:
-    case FieldDescriptor::TYPE_SFIXED32:
-      return u32(1);
-    case FieldDescriptor::TYPE_FIXED64:
-    case FieldDescriptor::TYPE_SFIXED64:
-      return u64(1);
-    case FieldDescriptor::TYPE_FLOAT:
-      return flt(1);
-    case FieldDescriptor::TYPE_DOUBLE:
-      return dbl(1);
-    case FieldDescriptor::TYPE_STRING:
-    case FieldDescriptor::TYPE_BYTES:
-      return delim("a");
-    case FieldDescriptor::TYPE_MESSAGE:
-      return delim(cat(tag(1, WireFormatLite::WIRETYPE_VARINT), varint(1234)));
-    default:
-      return "";
-  }
-  return "";
-}
-
-#define UNKNOWN_FIELD 666
-
-enum class Packed {
-  kUnspecified = 0,
-  kTrue = 1,
-  kFalse = 2,
-};
-
-const FieldDescriptor* GetFieldForType(FieldDescriptor::Type type,
-                                       bool repeated, bool is_proto3,
-                                       Packed packed = Packed::kUnspecified) {
-  const Descriptor* d = is_proto3 ?
-      TestAllTypesProto3().GetDescriptor() : TestAllTypesProto2().GetDescriptor();
-  for (int i = 0; i < d->field_count(); i++) {
-    const FieldDescriptor* f = d->field(i);
-    if (f->type() == type && f->is_repeated() == repeated) {
-      if ((packed == Packed::kTrue && !f->is_packed()) ||
-          (packed == Packed::kFalse && f->is_packed())) {
-        continue;
-      }
-      return f;
-    }
-  }
-
-  string packed_string = "";
-  const string repeated_string = repeated ? "Repeated " : "Singular ";
-  const string proto_string = is_proto3 ? "Proto3" : "Proto2";
-  if (packed == Packed::kTrue) {
-    packed_string = "Packed ";
-  }
-  if (packed == Packed::kFalse) {
-    packed_string = "Unpacked ";
-  }
-  GOOGLE_LOG(FATAL) << "Couldn't find field with type: " << repeated_string.c_str()
-             << packed_string.c_str() << FieldDescriptor::TypeName(type)
-             << " for " << proto_string.c_str();
-  return nullptr;
-}
-
-const FieldDescriptor* GetFieldForMapType(FieldDescriptor::Type key_type,
-                                          FieldDescriptor::Type value_type,
-                                          bool is_proto3) {
-  const Descriptor* d = is_proto3 ? TestAllTypesProto3().GetDescriptor()
-                                  : TestAllTypesProto2().GetDescriptor();
-  for (int i = 0; i < d->field_count(); i++) {
-    const FieldDescriptor* f = d->field(i);
-    if (f->is_map()) {
-      const Descriptor* map_entry = f->message_type();
-      const FieldDescriptor* key = map_entry->field(0);
-      const FieldDescriptor* value = map_entry->field(1);
-      if (key->type() == key_type && value->type() == value_type) {
-        return f;
-      }
-    }
-  }
-
-  const string proto_string = is_proto3 ? "Proto3" : "Proto2";
-  GOOGLE_LOG(FATAL) << "Couldn't find map field with type: "
-             << FieldDescriptor::TypeName(key_type) << " and "
-             << FieldDescriptor::TypeName(key_type) << " for "
-             << proto_string.c_str();
-  return nullptr;
-}
-
-const FieldDescriptor* GetFieldForOneofType(FieldDescriptor::Type type,
-                                            bool is_proto3,
-                                            bool exclusive = false) {
-  const Descriptor* d = is_proto3 ? TestAllTypesProto3().GetDescriptor()
-                                  : TestAllTypesProto2().GetDescriptor();
-  for (int i = 0; i < d->field_count(); i++) {
-    const FieldDescriptor* f = d->field(i);
-    if (f->containing_oneof() && ((f->type() == type) ^ exclusive)) {
-      return f;
-    }
-  }
-
-  const string proto_string = is_proto3 ? "Proto3" : "Proto2";
-  GOOGLE_LOG(FATAL) << "Couldn't find oneof field with type: "
-             << FieldDescriptor::TypeName(type) << " for "
-             << proto_string.c_str();
-  return nullptr;
-}
-
-string UpperCase(string str) {
-  for (size_t i = 0; i < str.size(); i++) {
-    str[i] = toupper(str[i]);
-  }
-  return str;
-}
-
-std::unique_ptr<Message> NewTestMessage(bool is_proto3) {
-  std::unique_ptr<Message> prototype;
-  if (is_proto3) {
-    prototype.reset(new TestAllTypesProto3());
-  } else {
-    prototype.reset(new TestAllTypesProto2());
-  }
-  return prototype;
-}
-
-bool IsProto3Default(FieldDescriptor::Type type, const string& binary_data) {
-  switch (type) {
-    case FieldDescriptor::TYPE_DOUBLE:
-      return binary_data == dbl(0);
-    case FieldDescriptor::TYPE_FLOAT:
-      return binary_data == flt(0);
-    case FieldDescriptor::TYPE_BOOL:
-    case FieldDescriptor::TYPE_INT64:
-    case FieldDescriptor::TYPE_UINT64:
-    case FieldDescriptor::TYPE_INT32:
-    case FieldDescriptor::TYPE_UINT32:
-    case FieldDescriptor::TYPE_SINT32:
-    case FieldDescriptor::TYPE_SINT64:
-    case FieldDescriptor::TYPE_ENUM:
-      return binary_data == varint(0);
-    case FieldDescriptor::TYPE_FIXED64:
-    case FieldDescriptor::TYPE_SFIXED64:
-      return binary_data == u64(0);
-    case FieldDescriptor::TYPE_FIXED32:
-    case FieldDescriptor::TYPE_SFIXED32:
-      return binary_data == u32(0);
-    case FieldDescriptor::TYPE_STRING:
-    case FieldDescriptor::TYPE_BYTES:
-      return binary_data == delim("");
-    default:
-      return false;
-  }
-}
-
-}  // anonymous namespace
-
-namespace google {
-namespace protobuf {
-
-bool BinaryAndJsonConformanceSuite::ParseJsonResponse(
-    const ConformanceResponse& response,
-    Message* test_message) {
-  string binary_protobuf;
-  util::Status status =
-      JsonToBinaryString(type_resolver_.get(), type_url_,
-                         response.json_payload(), &binary_protobuf);
-
-  if (!status.ok()) {
-    return false;
-  }
-
-  if (!test_message->ParseFromString(binary_protobuf)) {
-    GOOGLE_LOG(FATAL) << "INTERNAL ERROR: internal JSON->protobuf transcode "
-               << "yielded unparseable proto.";
-    return false;
-  }
-
-  return true;
-}
-
-bool BinaryAndJsonConformanceSuite::ParseResponse(
-    const ConformanceResponse& response,
-    const ConformanceRequestSetting& setting,
-    Message* test_message) {
-  const ConformanceRequest& request = setting.GetRequest();
-  WireFormat requested_output = request.requested_output_format();
-  const string& test_name = setting.GetTestName();
-  ConformanceLevel level = setting.GetLevel();
-
-  switch (response.result_case()) {
-    case ConformanceResponse::kProtobufPayload: {
-      if (requested_output != conformance::PROTOBUF) {
-        ReportFailure(test_name, level, request, response,
-                      StrCat("Test was asked for ",
-                                   WireFormatToString(requested_output),
-                                   " output but provided PROTOBUF instead.")
-                          .c_str());
-        return false;
-      }
-
-      if (!test_message->ParseFromString(response.protobuf_payload())) {
-        ReportFailure(test_name, level, request, response,
-                   "Protobuf output we received from test was unparseable.");
-        return false;
-      }
-
-      break;
-    }
-
-    case ConformanceResponse::kJsonPayload: {
-      if (requested_output != conformance::JSON) {
-        ReportFailure(test_name, level, request, response,
-                      StrCat("Test was asked for ",
-                                   WireFormatToString(requested_output),
-                                   " output but provided JSON instead.")
-                          .c_str());
-        return false;
-      }
-
-      if (!ParseJsonResponse(response, test_message)) {
-        ReportFailure(test_name, level, request, response,
-                      "JSON output we received from test was unparseable.");
-        return false;
-      }
-
-      break;
-    }
-
-    default:
-      GOOGLE_LOG(FATAL) << test_name
-                 << ": unknown payload type: " << response.result_case();
-  }
-
-  return true;
-}
-
-void BinaryAndJsonConformanceSuite::ExpectParseFailureForProtoWithProtoVersion (
-    const string& proto, const string& test_name, ConformanceLevel level,
-    bool is_proto3) {
-  std::unique_ptr<Message> prototype = NewTestMessage(is_proto3);
-  // We don't expect output, but if the program erroneously accepts the protobuf
-  // we let it send its response as this.  We must not leave it unspecified.
-  ConformanceRequestSetting setting(
-      level, conformance::PROTOBUF, conformance::PROTOBUF,
-      conformance::BINARY_TEST,
-      *prototype, test_name, proto);
-
-  const ConformanceRequest& request = setting.GetRequest();
-  ConformanceResponse response;
-  string effective_test_name = StrCat(
-      setting.ConformanceLevelToString(level),
-      (is_proto3 ? ".Proto3" : ".Proto2"), ".ProtobufInput.", test_name);
-
-  RunTest(effective_test_name, request, &response);
-  if (response.result_case() == ConformanceResponse::kParseError) {
-    ReportSuccess(effective_test_name);
-  } else if (response.result_case() == ConformanceResponse::kSkipped) {
-    ReportSkip(effective_test_name, request, response);
-  } else {
-    ReportFailure(effective_test_name, level, request, response,
-                  "Should have failed to parse, but didn't.");
-  }
-}
-
-// Expect that this precise protobuf will cause a parse error.
-void BinaryAndJsonConformanceSuite::ExpectParseFailureForProto(
-    const string& proto, const string& test_name, ConformanceLevel level) {
-  ExpectParseFailureForProtoWithProtoVersion(proto, test_name, level, true);
-  ExpectParseFailureForProtoWithProtoVersion(proto, test_name, level, false);
-}
-
-// Expect that this protobuf will cause a parse error, even if it is followed
-// by valid protobuf data.  We can try running this twice: once with this
-// data verbatim and once with this data followed by some valid data.
-//
-// TODO(haberman): implement the second of these.
-void BinaryAndJsonConformanceSuite::ExpectHardParseFailureForProto(
-    const string& proto, const string& test_name, ConformanceLevel level) {
-  return ExpectParseFailureForProto(proto, test_name, level);
-}
-
-void BinaryAndJsonConformanceSuite::RunValidJsonTest(
-    const string& test_name, ConformanceLevel level, const string& input_json,
-    const string& equivalent_text_format) {
-  TestAllTypesProto3 prototype;
-  ConformanceRequestSetting setting1(
-      level, conformance::JSON, conformance::PROTOBUF,
-      conformance::JSON_TEST,
-      prototype, test_name, input_json);
-  RunValidInputTest(setting1, equivalent_text_format);
-  ConformanceRequestSetting setting2(
-      level, conformance::JSON, conformance::JSON,
-      conformance::JSON_TEST,
-      prototype, test_name, input_json);
-  RunValidInputTest(setting2, equivalent_text_format);
-}
-
-void BinaryAndJsonConformanceSuite::RunValidJsonTestWithProtobufInput(
-    const string& test_name, ConformanceLevel level, const TestAllTypesProto3& input,
-    const string& equivalent_text_format) {
-  ConformanceRequestSetting setting(
-      level, conformance::PROTOBUF, conformance::JSON,
-      conformance::JSON_TEST,
-      input, test_name, input.SerializeAsString());
-  RunValidInputTest(setting, equivalent_text_format);
-}
-
-void BinaryAndJsonConformanceSuite::RunValidJsonIgnoreUnknownTest(
-    const string& test_name, ConformanceLevel level, const string& input_json,
-    const string& equivalent_text_format) {
-  TestAllTypesProto3 prototype;
-  ConformanceRequestSetting setting(
-      level, conformance::JSON, conformance::PROTOBUF,
-      conformance::JSON_IGNORE_UNKNOWN_PARSING_TEST,
-      prototype, test_name, input_json);
-  RunValidInputTest(setting, equivalent_text_format);
-}
-
-void BinaryAndJsonConformanceSuite::RunValidProtobufTest(
-    const string& test_name, ConformanceLevel level,
-    const string& input_protobuf, const string& equivalent_text_format,
-    bool is_proto3) {
-  std::unique_ptr<Message> prototype = NewTestMessage(is_proto3);
-
-  ConformanceRequestSetting setting1(
-      level, conformance::PROTOBUF, conformance::PROTOBUF,
-      conformance::BINARY_TEST,
-      *prototype, test_name, input_protobuf);
-  RunValidInputTest(setting1, equivalent_text_format);
-
-  if (is_proto3) {
-    ConformanceRequestSetting setting2(
-        level, conformance::PROTOBUF, conformance::JSON,
-        conformance::BINARY_TEST,
-        *prototype, test_name, input_protobuf);
-    RunValidInputTest(setting2, equivalent_text_format);
-  }
-}
-
-void BinaryAndJsonConformanceSuite::RunValidBinaryProtobufTest(
-    const string& test_name, ConformanceLevel level,
-    const string& input_protobuf, bool is_proto3) {
-  RunValidBinaryProtobufTest(test_name, level, input_protobuf, input_protobuf,
-                             is_proto3);
-}
-
-void BinaryAndJsonConformanceSuite::RunValidBinaryProtobufTest(
-    const string& test_name, ConformanceLevel level,
-    const string& input_protobuf, const string& expected_protobuf,
-    bool is_proto3) {
-  std::unique_ptr<Message> prototype = NewTestMessage(is_proto3);
-  ConformanceRequestSetting setting(
-      level, conformance::PROTOBUF, conformance::PROTOBUF,
-      conformance::BINARY_TEST,
-      *prototype, test_name, input_protobuf);
-  RunValidBinaryInputTest(setting, expected_protobuf, true);
-}
-
-void BinaryAndJsonConformanceSuite::RunValidProtobufTestWithMessage(
-    const string& test_name, ConformanceLevel level, const Message *input,
-    const string& equivalent_text_format, bool is_proto3) {
-  RunValidProtobufTest(test_name, level, input->SerializeAsString(),
-                       equivalent_text_format, is_proto3);
-}
-
-// According to proto JSON specification, JSON serializers follow more strict
-// rules than parsers (e.g., a serializer must serialize int32 values as JSON
-// numbers while the parser is allowed to accept them as JSON strings). This
-// method allows strict checking on a proto JSON serializer by inspecting
-// the JSON output directly.
-void BinaryAndJsonConformanceSuite::RunValidJsonTestWithValidator(
-    const string& test_name, ConformanceLevel level, const string& input_json,
-    const Validator& validator, bool is_proto3) {
-  std::unique_ptr<Message> prototype = NewTestMessage(is_proto3);
-  ConformanceRequestSetting setting(level, conformance::JSON, conformance::JSON,
-                                    conformance::JSON_TEST, *prototype,
-                                    test_name, input_json);
-  const ConformanceRequest& request = setting.GetRequest();
-  ConformanceResponse response;
-  string effective_test_name =
-      StrCat(setting.ConformanceLevelToString(level),
-                   is_proto3 ? ".Proto3.JsonInput." : ".Proto2.JsonInput.",
-                   test_name, ".Validator");
-
-  RunTest(effective_test_name, request, &response);
-
-  if (response.result_case() == ConformanceResponse::kSkipped) {
-    ReportSkip(effective_test_name, request, response);
-    return;
-  }
-
-  if (response.result_case() != ConformanceResponse::kJsonPayload) {
-    ReportFailure(effective_test_name, level, request, response,
-                  "Expected JSON payload but got type %d.",
-                  response.result_case());
-    return;
-  }
-  Json::Reader reader;
-  Json::Value value;
-  if (!reader.parse(response.json_payload(), value)) {
-    ReportFailure(effective_test_name, level, request, response,
-                  "JSON payload cannot be parsed as valid JSON: %s",
-                  reader.getFormattedErrorMessages().c_str());
-    return;
-  }
-  if (!validator(value)) {
-    ReportFailure(effective_test_name, level, request, response,
-                  "JSON payload validation failed.");
-    return;
-  }
-  ReportSuccess(effective_test_name);
-}
-
-void BinaryAndJsonConformanceSuite::ExpectParseFailureForJson(
-    const string& test_name, ConformanceLevel level, const string& input_json) {
-  TestAllTypesProto3 prototype;
-  // We don't expect output, but if the program erroneously accepts the protobuf
-  // we let it send its response as this.  We must not leave it unspecified.
-  ConformanceRequestSetting setting(
-      level, conformance::JSON, conformance::JSON,
-      conformance::JSON_TEST,
-      prototype, test_name, input_json);
-  const ConformanceRequest& request = setting.GetRequest();
-  ConformanceResponse response;
-  string effective_test_name = StrCat(
-      setting.ConformanceLevelToString(level), ".Proto3.JsonInput.", test_name);
-
-  RunTest(effective_test_name, request, &response);
-  if (response.result_case() == ConformanceResponse::kParseError) {
-    ReportSuccess(effective_test_name);
-  } else if (response.result_case() == ConformanceResponse::kSkipped) {
-    ReportSkip(effective_test_name, request, response);
-  } else {
-    ReportFailure(effective_test_name, level, request, response,
-                  "Should have failed to parse, but didn't.");
-  }
-}
-
-void BinaryAndJsonConformanceSuite::ExpectSerializeFailureForJson(
-    const string& test_name, ConformanceLevel level, const string& text_format) {
-  TestAllTypesProto3 payload_message;
-  GOOGLE_CHECK(TextFormat::ParseFromString(text_format, &payload_message))
-      << "Failed to parse: " << text_format;
-
-  TestAllTypesProto3 prototype;
-  ConformanceRequestSetting setting(
-      level, conformance::PROTOBUF, conformance::JSON,
-      conformance::JSON_TEST,
-      prototype, test_name, payload_message.SerializeAsString());
-  const ConformanceRequest& request = setting.GetRequest();
-  ConformanceResponse response;
-  string effective_test_name = StrCat(
-      setting.ConformanceLevelToString(level), ".", test_name, ".JsonOutput");
-
-  RunTest(effective_test_name, request, &response);
-  if (response.result_case() == ConformanceResponse::kSerializeError) {
-    ReportSuccess(effective_test_name);
-  } else if (response.result_case() == ConformanceResponse::kSkipped) {
-    ReportSkip(effective_test_name, request, response);
-  } else {
-    ReportFailure(effective_test_name, level, request, response,
-                  "Should have failed to serialize, but didn't.");
-  }
-}
-
-void BinaryAndJsonConformanceSuite::TestPrematureEOFForType(
-    FieldDescriptor::Type type) {
-  // Incomplete values for each wire type.
-  static const string incompletes[6] = {
-    string("\x80"),     // VARINT
-    string("abcdefg"),  // 64BIT
-    string("\x80"),     // DELIMITED (partial length)
-    string(),           // START_GROUP (no value required)
-    string(),           // END_GROUP (no value required)
-    string("abc")       // 32BIT
-  };
-
-  const FieldDescriptor* field = GetFieldForType(type, false, true);
-  const FieldDescriptor* rep_field = GetFieldForType(type, true, true);
-  WireFormatLite::WireType wire_type = WireFormatLite::WireTypeForFieldType(
-      static_cast<WireFormatLite::FieldType>(type));
-  const string& incomplete = incompletes[wire_type];
-  const string type_name =
-      UpperCase(string(".") + FieldDescriptor::TypeName(type));
-
-  ExpectParseFailureForProto(
-      tag(field->number(), wire_type),
-      "PrematureEofBeforeKnownNonRepeatedValue" + type_name, REQUIRED);
-
-  ExpectParseFailureForProto(
-      tag(rep_field->number(), wire_type),
-      "PrematureEofBeforeKnownRepeatedValue" + type_name, REQUIRED);
-
-  ExpectParseFailureForProto(
-      tag(UNKNOWN_FIELD, wire_type),
-      "PrematureEofBeforeUnknownValue" + type_name, REQUIRED);
-
-  ExpectParseFailureForProto(
-      cat( tag(field->number(), wire_type), incomplete ),
-      "PrematureEofInsideKnownNonRepeatedValue" + type_name, REQUIRED);
-
-  ExpectParseFailureForProto(
-      cat( tag(rep_field->number(), wire_type), incomplete ),
-      "PrematureEofInsideKnownRepeatedValue" + type_name, REQUIRED);
-
-  ExpectParseFailureForProto(
-      cat( tag(UNKNOWN_FIELD, wire_type), incomplete ),
-      "PrematureEofInsideUnknownValue" + type_name, REQUIRED);
-
-  if (wire_type == WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-    ExpectParseFailureForProto(
-        cat( tag(field->number(), wire_type), varint(1) ),
-        "PrematureEofInDelimitedDataForKnownNonRepeatedValue" + type_name,
-        REQUIRED);
-
-    ExpectParseFailureForProto(
-        cat( tag(rep_field->number(), wire_type), varint(1) ),
-        "PrematureEofInDelimitedDataForKnownRepeatedValue" + type_name,
-        REQUIRED);
-
-    // EOF in the middle of delimited data for unknown value.
-    ExpectParseFailureForProto(
-        cat( tag(UNKNOWN_FIELD, wire_type), varint(1) ),
-        "PrematureEofInDelimitedDataForUnknownValue" + type_name, REQUIRED);
-
-    if (type == FieldDescriptor::TYPE_MESSAGE) {
-      // Submessage ends in the middle of a value.
-      string incomplete_submsg =
-          cat( tag(WireFormatLite::TYPE_INT32, WireFormatLite::WIRETYPE_VARINT),
-                incompletes[WireFormatLite::WIRETYPE_VARINT] );
-      ExpectHardParseFailureForProto(
-          cat( tag(field->number(), WireFormatLite::WIRETYPE_LENGTH_DELIMITED),
-               varint(incomplete_submsg.size()),
-               incomplete_submsg ),
-          "PrematureEofInSubmessageValue" + type_name, REQUIRED);
-    }
-  } else if (type != FieldDescriptor::TYPE_GROUP) {
-    // Non-delimited, non-group: eligible for packing.
-
-    // Packed region ends in the middle of a value.
-    ExpectHardParseFailureForProto(
-        cat(tag(rep_field->number(), WireFormatLite::WIRETYPE_LENGTH_DELIMITED),
-            varint(incomplete.size()), incomplete),
-        "PrematureEofInPackedFieldValue" + type_name, REQUIRED);
-
-    // EOF in the middle of packed region.
-    ExpectParseFailureForProto(
-        cat(tag(rep_field->number(), WireFormatLite::WIRETYPE_LENGTH_DELIMITED),
-            varint(1)),
-        "PrematureEofInPackedField" + type_name, REQUIRED);
-  }
-}
-
-void BinaryAndJsonConformanceSuite::TestValidDataForType(
-    FieldDescriptor::Type type,
-    std::vector<std::pair<std::string, std::string>> values) {
-  for (int is_proto3 = 0; is_proto3 < 2; is_proto3++) {
-    const string type_name =
-        UpperCase(string(".") + FieldDescriptor::TypeName(type));
-    WireFormatLite::WireType wire_type = WireFormatLite::WireTypeForFieldType(
-        static_cast<WireFormatLite::FieldType>(type));
-    const FieldDescriptor* field = GetFieldForType(type, false, is_proto3);
-    const FieldDescriptor* rep_field = GetFieldForType(type, true, is_proto3);
-
-    // Test singular data for singular fields.
-    for (size_t i = 0; i < values.size(); i++) {
-      string proto = cat(tag(field->number(), wire_type), values[i].first);
-      // In proto3, default primitive fields should not be encoded.
-      string expected_proto =
-          is_proto3 && IsProto3Default(field->type(), values[i].second)
-              ? ""
-              : cat(tag(field->number(), wire_type), values[i].second);
-      std::unique_ptr<Message> test_message = NewTestMessage(is_proto3);
-      test_message->MergeFromString(expected_proto);
-      string text = test_message->DebugString();
-
-      RunValidProtobufTest(
-          StrCat("ValidDataScalar", type_name, "[", i, "]"), REQUIRED,
-          proto, text, is_proto3);
-      RunValidBinaryProtobufTest(
-          StrCat("ValidDataScalarBinary", type_name, "[", i, "]"),
-          RECOMMENDED, proto, expected_proto, is_proto3);
-    }
-
-    // Test repeated data for singular fields.
-    // For scalar message fields, repeated values are merged, which is tested
-    // separately.
-    if (type != FieldDescriptor::TYPE_MESSAGE) {
-      string proto;
-      for (size_t i = 0; i < values.size(); i++) {
-        proto += cat(tag(field->number(), wire_type), values[i].first);
-      }
-      string expected_proto =
-          cat(tag(field->number(), wire_type), values.back().second);
-      std::unique_ptr<Message> test_message = NewTestMessage(is_proto3);
-      test_message->MergeFromString(expected_proto);
-      string text = test_message->DebugString();
-
-      RunValidProtobufTest("RepeatedScalarSelectsLast" + type_name, REQUIRED,
-                           proto, text, is_proto3);
-    }
-
-    // Test repeated fields.
-    if (FieldDescriptor::IsTypePackable(type)) {
-      const FieldDescriptor* packed_field =
-          GetFieldForType(type, true, is_proto3, Packed::kTrue);
-      const FieldDescriptor* unpacked_field =
-          GetFieldForType(type, true, is_proto3, Packed::kFalse);
-
-      string default_proto_packed;
-      string default_proto_unpacked;
-      string default_proto_packed_expected;
-      string default_proto_unpacked_expected;
-      string packed_proto_packed;
-      string packed_proto_unpacked;
-      string packed_proto_expected;
-      string unpacked_proto_packed;
-      string unpacked_proto_unpacked;
-      string unpacked_proto_expected;
-
-      for (size_t i = 0; i < values.size(); i++) {
-        default_proto_unpacked +=
-            cat(tag(rep_field->number(), wire_type), values[i].first);
-        default_proto_unpacked_expected +=
-            cat(tag(rep_field->number(), wire_type), values[i].second);
-        default_proto_packed += values[i].first;
-        default_proto_packed_expected += values[i].second;
-        packed_proto_unpacked +=
-            cat(tag(packed_field->number(), wire_type), values[i].first);
-        packed_proto_packed += values[i].first;
-        packed_proto_expected += values[i].second;
-        unpacked_proto_unpacked +=
-            cat(tag(unpacked_field->number(), wire_type), values[i].first);
-        unpacked_proto_packed += values[i].first;
-        unpacked_proto_expected +=
-            cat(tag(unpacked_field->number(), wire_type), values[i].second);
-      }
-      default_proto_packed = cat(
-          tag(rep_field->number(), WireFormatLite::WIRETYPE_LENGTH_DELIMITED),
-          delim(default_proto_packed));
-      default_proto_packed_expected = cat(
-          tag(rep_field->number(), WireFormatLite::WIRETYPE_LENGTH_DELIMITED),
-          delim(default_proto_packed_expected));
-      packed_proto_packed = cat(tag(packed_field->number(),
-                                    WireFormatLite::WIRETYPE_LENGTH_DELIMITED),
-                                delim(packed_proto_packed));
-      packed_proto_expected =
-          cat(tag(packed_field->number(),
-                  WireFormatLite::WIRETYPE_LENGTH_DELIMITED),
-              delim(packed_proto_expected));
-      unpacked_proto_packed =
-          cat(tag(unpacked_field->number(),
-                  WireFormatLite::WIRETYPE_LENGTH_DELIMITED),
-              delim(unpacked_proto_packed));
-
-      std::unique_ptr<Message> test_message = NewTestMessage(is_proto3);
-      test_message->MergeFromString(default_proto_packed_expected);
-      string text = test_message->DebugString();
-
-      // Ensures both packed and unpacked data can be parsed.
-      RunValidProtobufTest(
-          StrCat("ValidDataRepeated", type_name, ".UnpackedInput"),
-          REQUIRED, default_proto_unpacked, text, is_proto3);
-      RunValidProtobufTest(
-          StrCat("ValidDataRepeated", type_name, ".PackedInput"),
-          REQUIRED, default_proto_packed, text, is_proto3);
-
-      // proto2 should encode as unpacked by default and proto3 should encode as
-      // packed by default.
-      string expected_proto = rep_field->is_packed()
-                                  ? default_proto_packed_expected
-                                  : default_proto_unpacked_expected;
-      RunValidBinaryProtobufTest(StrCat("ValidDataRepeated", type_name,
-                                              ".UnpackedInput.DefaultOutput"),
-                                 RECOMMENDED, default_proto_unpacked,
-                                 expected_proto, is_proto3);
-      RunValidBinaryProtobufTest(StrCat("ValidDataRepeated", type_name,
-                                              ".PackedInput.DefaultOutput"),
-                                 RECOMMENDED, default_proto_packed,
-                                 expected_proto, is_proto3);
-      RunValidBinaryProtobufTest(StrCat("ValidDataRepeated", type_name,
-                                              ".UnpackedInput.PackedOutput"),
-                                 RECOMMENDED, packed_proto_unpacked,
-                                 packed_proto_expected, is_proto3);
-      RunValidBinaryProtobufTest(StrCat("ValidDataRepeated", type_name,
-                                              ".PackedInput.PackedOutput"),
-                                 RECOMMENDED, packed_proto_packed,
-                                 packed_proto_expected, is_proto3);
-      RunValidBinaryProtobufTest(StrCat("ValidDataRepeated", type_name,
-                                              ".UnpackedInput.UnpackedOutput"),
-                                 RECOMMENDED, unpacked_proto_unpacked,
-                                 unpacked_proto_expected, is_proto3);
-      RunValidBinaryProtobufTest(StrCat("ValidDataRepeated", type_name,
-                                              ".PackedInput.UnpackedOutput"),
-                                 RECOMMENDED, unpacked_proto_packed,
-                                 unpacked_proto_expected, is_proto3);
-    } else {
-      string proto;
-      string expected_proto;
-      for (size_t i = 0; i < values.size(); i++) {
-        proto += cat(tag(rep_field->number(), wire_type), values[i].first);
-        expected_proto +=
-            cat(tag(rep_field->number(), wire_type), values[i].second);
-      }
-      std::unique_ptr<Message> test_message = NewTestMessage(is_proto3);
-      test_message->MergeFromString(expected_proto);
-      string text = test_message->DebugString();
-
-      RunValidProtobufTest(StrCat("ValidDataRepeated", type_name),
-                           REQUIRED, proto, text, is_proto3);
-    }
-  }
-}
-
-void BinaryAndJsonConformanceSuite::TestValidDataForRepeatedScalarMessage() {
-  std::vector<std::string> values = {
-      delim(cat(
-          tag(2, WireFormatLite::WIRETYPE_LENGTH_DELIMITED),
-          delim(cat(tag(1, WireFormatLite::WIRETYPE_VARINT), varint(1234),
-                    tag(2, WireFormatLite::WIRETYPE_VARINT), varint(1234),
-                    tag(31, WireFormatLite::WIRETYPE_VARINT), varint(1234))))),
-      delim(cat(
-          tag(2, WireFormatLite::WIRETYPE_LENGTH_DELIMITED),
-          delim(cat(tag(1, WireFormatLite::WIRETYPE_VARINT), varint(4321),
-                    tag(3, WireFormatLite::WIRETYPE_VARINT), varint(4321),
-                    tag(31, WireFormatLite::WIRETYPE_VARINT), varint(4321))))),
-  };
-
-  const std::string expected =
-      R"({
-        corecursive: {
-          optional_int32: 4321,
-          optional_int64: 1234,
-          optional_uint32: 4321,
-          repeated_int32: [1234, 4321],
-        }
-      })";
-
-  for (int is_proto3 = 0; is_proto3 < 2; is_proto3++) {
-    string proto;
-    const FieldDescriptor* field =
-        GetFieldForType(FieldDescriptor::TYPE_MESSAGE, false, is_proto3);
-    for (size_t i = 0; i < values.size(); i++) {
-      proto +=
-          cat(tag(field->number(), WireFormatLite::WIRETYPE_LENGTH_DELIMITED),
-              values[i]);
-    }
-
-    RunValidProtobufTest("RepeatedScalarMessageMerge", REQUIRED, proto,
-                         field->name() + ": " + expected, is_proto3);
-  }
-}
-
-void BinaryAndJsonConformanceSuite::TestValidDataForMapType(
-    FieldDescriptor::Type key_type, FieldDescriptor::Type value_type) {
-  const string key_type_name =
-      UpperCase(string(".") + FieldDescriptor::TypeName(key_type));
-  const string value_type_name =
-      UpperCase(string(".") + FieldDescriptor::TypeName(value_type));
-  WireFormatLite::WireType key_wire_type = WireFormatLite::WireTypeForFieldType(
-      static_cast<WireFormatLite::FieldType>(key_type));
-  WireFormatLite::WireType value_wire_type =
-      WireFormatLite::WireTypeForFieldType(
-          static_cast<WireFormatLite::FieldType>(value_type));
-
-  string key1_data = cat(tag(1, key_wire_type), GetDefaultValue(key_type));
-  string value1_data =
-      cat(tag(2, value_wire_type), GetDefaultValue(value_type));
-  string key2_data = cat(tag(1, key_wire_type), GetNonDefaultValue(key_type));
-  string value2_data =
-      cat(tag(2, value_wire_type), GetNonDefaultValue(value_type));
-
-  for (int is_proto3 = 0; is_proto3 < 2; is_proto3++) {
-    const FieldDescriptor* field =
-        GetFieldForMapType(key_type, value_type, is_proto3);
-
-    {
-      // Tests map with default key and value.
-      string proto =
-          cat(tag(field->number(), WireFormatLite::WIRETYPE_LENGTH_DELIMITED),
-              delim(cat(key1_data, value1_data)));
-      std::unique_ptr<Message> test_message = NewTestMessage(is_proto3);
-      test_message->MergeFromString(proto);
-      string text = test_message->DebugString();
-      RunValidProtobufTest(StrCat("ValidDataMap", key_type_name,
-                                        value_type_name, ".Default"),
-                           REQUIRED, proto, text, is_proto3);
-    }
-
-    {
-      // Tests map with missing default key and value.
-      string proto =
-          cat(tag(field->number(), WireFormatLite::WIRETYPE_LENGTH_DELIMITED),
-              delim(""));
-      std::unique_ptr<Message> test_message = NewTestMessage(is_proto3);
-      test_message->MergeFromString(proto);
-      string text = test_message->DebugString();
-      RunValidProtobufTest(StrCat("ValidDataMap", key_type_name,
-                                        value_type_name, ".MissingDefault"),
-                           REQUIRED, proto, text, is_proto3);
-    }
-
-    {
-      // Tests map with non-default key and value.
-      string proto =
-          cat(tag(field->number(), WireFormatLite::WIRETYPE_LENGTH_DELIMITED),
-              delim(cat(key2_data, value2_data)));
-      std::unique_ptr<Message> test_message = NewTestMessage(is_proto3);
-      test_message->MergeFromString(proto);
-      string text = test_message->DebugString();
-      RunValidProtobufTest(StrCat("ValidDataMap", key_type_name,
-                                        value_type_name, ".NonDefault"),
-                           REQUIRED, proto, text, is_proto3);
-    }
-
-    {
-      // Tests map with unordered key and value.
-      string proto =
-          cat(tag(field->number(), WireFormatLite::WIRETYPE_LENGTH_DELIMITED),
-              delim(cat(value2_data, key2_data)));
-      std::unique_ptr<Message> test_message = NewTestMessage(is_proto3);
-      test_message->MergeFromString(proto);
-      string text = test_message->DebugString();
-      RunValidProtobufTest(StrCat("ValidDataMap", key_type_name,
-                                        value_type_name, ".Unordered"),
-                           REQUIRED, proto, text, is_proto3);
-    }
-
-    {
-      // Tests map with duplicate key.
-      string proto1 =
-          cat(tag(field->number(), WireFormatLite::WIRETYPE_LENGTH_DELIMITED),
-              delim(cat(key2_data, value1_data)));
-      string proto2 =
-          cat(tag(field->number(), WireFormatLite::WIRETYPE_LENGTH_DELIMITED),
-              delim(cat(key2_data, value2_data)));
-      string proto = cat(proto1, proto2);
-      std::unique_ptr<Message> test_message = NewTestMessage(is_proto3);
-      test_message->MergeFromString(proto2);
-      string text = test_message->DebugString();
-      RunValidProtobufTest(StrCat("ValidDataMap", key_type_name,
-                                        value_type_name, ".DuplicateKey"),
-                           REQUIRED, proto, text, is_proto3);
-    }
-
-    {
-      // Tests map with duplicate key in map entry.
-      string proto =
-          cat(tag(field->number(), WireFormatLite::WIRETYPE_LENGTH_DELIMITED),
-              delim(cat(key1_data, key2_data, value2_data)));
-      std::unique_ptr<Message> test_message = NewTestMessage(is_proto3);
-      test_message->MergeFromString(proto);
-      string text = test_message->DebugString();
-      RunValidProtobufTest(
-          StrCat("ValidDataMap", key_type_name, value_type_name,
-                       ".DuplicateKeyInMapEntry"),
-          REQUIRED, proto, text, is_proto3);
-    }
-
-    {
-      // Tests map with duplicate value in map entry.
-      string proto =
-          cat(tag(field->number(), WireFormatLite::WIRETYPE_LENGTH_DELIMITED),
-              delim(cat(key2_data, value1_data, value2_data)));
-      std::unique_ptr<Message> test_message = NewTestMessage(is_proto3);
-      test_message->MergeFromString(proto);
-      string text = test_message->DebugString();
-      RunValidProtobufTest(
-          StrCat("ValidDataMap", key_type_name, value_type_name,
-                       ".DuplicateValueInMapEntry"),
-          REQUIRED, proto, text, is_proto3);
-    }
-  }
-}
-
-void BinaryAndJsonConformanceSuite::TestOverwriteMessageValueMap() {
-  string key_data =
-      cat(tag(1, WireFormatLite::WIRETYPE_LENGTH_DELIMITED), delim(""));
-  string field1_data = cat(tag(1, WireFormatLite::WIRETYPE_VARINT), varint(1));
-  string field2_data = cat(tag(2, WireFormatLite::WIRETYPE_VARINT), varint(1));
-  string field31_data =
-      cat(tag(31, WireFormatLite::WIRETYPE_VARINT), varint(1));
-  string submsg1_data = delim(cat(field1_data, field31_data));
-  string submsg2_data = delim(cat(field2_data, field31_data));
-  string value1_data =
-      cat(tag(2, WireFormatLite::WIRETYPE_LENGTH_DELIMITED),
-          delim(cat(tag(2, WireFormatLite::WIRETYPE_LENGTH_DELIMITED),
-                    submsg1_data)));
-  string value2_data =
-      cat(tag(2, WireFormatLite::WIRETYPE_LENGTH_DELIMITED),
-          delim(cat(tag(2, WireFormatLite::WIRETYPE_LENGTH_DELIMITED),
-                    submsg2_data)));
-
-  for (int is_proto3 = 0; is_proto3 < 2; is_proto3++) {
-    const FieldDescriptor* field = GetFieldForMapType(
-        FieldDescriptor::TYPE_STRING, FieldDescriptor::TYPE_MESSAGE, is_proto3);
-
-    string proto1 =
-        cat(tag(field->number(), WireFormatLite::WIRETYPE_LENGTH_DELIMITED),
-            delim(cat(key_data, value1_data)));
-    string proto2 =
-        cat(tag(field->number(), WireFormatLite::WIRETYPE_LENGTH_DELIMITED),
-            delim(cat(key_data, value2_data)));
-    string proto = cat(proto1, proto2);
-    std::unique_ptr<Message> test_message = NewTestMessage(is_proto3);
-    test_message->MergeFromString(proto2);
-    string text = test_message->DebugString();
-    RunValidProtobufTest("ValidDataMap.STRING.MESSAGE.MergeValue", REQUIRED,
-                         proto, text, is_proto3);
-  }
-}
-
-void BinaryAndJsonConformanceSuite::TestValidDataForOneofType(
-    FieldDescriptor::Type type) {
-  const string type_name =
-      UpperCase(string(".") + FieldDescriptor::TypeName(type));
-  WireFormatLite::WireType wire_type = WireFormatLite::WireTypeForFieldType(
-      static_cast<WireFormatLite::FieldType>(type));
-
-  for (int is_proto3 = 0; is_proto3 < 2; is_proto3++) {
-    const FieldDescriptor* field = GetFieldForOneofType(type, is_proto3);
-    const string default_value =
-        cat(tag(field->number(), wire_type), GetDefaultValue(type));
-    const string non_default_value =
-        cat(tag(field->number(), wire_type), GetNonDefaultValue(type));
-
-    {
-      // Tests oneof with default value.
-      const string proto = default_value;
-      std::unique_ptr<Message> test_message = NewTestMessage(is_proto3);
-      test_message->MergeFromString(proto);
-      string text = test_message->DebugString();
-
-      RunValidProtobufTest(
-          StrCat("ValidDataOneof", type_name, ".DefaultValue"), REQUIRED,
-          proto, text, is_proto3);
-      RunValidBinaryProtobufTest(
-          StrCat("ValidDataOneofBinary", type_name, ".DefaultValue"),
-          RECOMMENDED, proto, proto, is_proto3);
-    }
-
-    {
-      // Tests oneof with non-default value.
-      const string proto = non_default_value;
-      std::unique_ptr<Message> test_message = NewTestMessage(is_proto3);
-      test_message->MergeFromString(proto);
-      string text = test_message->DebugString();
-
-      RunValidProtobufTest(
-          StrCat("ValidDataOneof", type_name, ".NonDefaultValue"),
-          REQUIRED, proto, text, is_proto3);
-      RunValidBinaryProtobufTest(
-          StrCat("ValidDataOneofBinary", type_name, ".NonDefaultValue"),
-          RECOMMENDED, proto, proto, is_proto3);
-    }
-
-    {
-      // Tests oneof with multiple values of the same field.
-      const string proto = StrCat(default_value, non_default_value);
-      const string expected_proto = non_default_value;
-      std::unique_ptr<Message> test_message = NewTestMessage(is_proto3);
-      test_message->MergeFromString(expected_proto);
-      string text = test_message->DebugString();
-
-      RunValidProtobufTest(StrCat("ValidDataOneof", type_name,
-                                        ".MultipleValuesForSameField"),
-                           REQUIRED, proto, text, is_proto3);
-      RunValidBinaryProtobufTest(StrCat("ValidDataOneofBinary", type_name,
-                                              ".MultipleValuesForSameField"),
-                                 RECOMMENDED, proto, expected_proto, is_proto3);
-    }
-
-    {
-      // Tests oneof with multiple values of the different fields.
-      const FieldDescriptor* other_field =
-          GetFieldForOneofType(type, is_proto3, true);
-      FieldDescriptor::Type other_type = other_field->type();
-      WireFormatLite::WireType other_wire_type =
-          WireFormatLite::WireTypeForFieldType(
-              static_cast<WireFormatLite::FieldType>(other_type));
-      const string other_value =
-          cat(tag(other_field->number(), other_wire_type),
-              GetDefaultValue(other_type));
-
-      const string proto = StrCat(other_value, non_default_value);
-      const string expected_proto = non_default_value;
-      std::unique_ptr<Message> test_message = NewTestMessage(is_proto3);
-      test_message->MergeFromString(expected_proto);
-      string text = test_message->DebugString();
-
-      RunValidProtobufTest(StrCat("ValidDataOneof", type_name,
-                                        ".MultipleValuesForDifferentField"),
-                           REQUIRED, proto, text, is_proto3);
-      RunValidBinaryProtobufTest(
-          StrCat("ValidDataOneofBinary", type_name,
-                       ".MultipleValuesForDifferentField"),
-          RECOMMENDED, proto, expected_proto, is_proto3);
-    }
-  }
-}
-
-void BinaryAndJsonConformanceSuite::TestMergeOneofMessage() {
-  string field1_data = cat(tag(1, WireFormatLite::WIRETYPE_VARINT), varint(1));
-  string field2a_data = cat(tag(2, WireFormatLite::WIRETYPE_VARINT), varint(1));
-  string field2b_data = cat(tag(2, WireFormatLite::WIRETYPE_VARINT), varint(1));
-  string field89_data =
-      cat(tag(89, WireFormatLite::WIRETYPE_VARINT), varint(1));
-  string submsg1_data =
-      cat(tag(2, WireFormatLite::WIRETYPE_LENGTH_DELIMITED),
-          delim(cat(field1_data, field2a_data, field89_data)));
-  string submsg2_data = cat(tag(2, WireFormatLite::WIRETYPE_LENGTH_DELIMITED),
-                            delim(cat(field2b_data, field89_data)));
-  string merged_data =
-      cat(tag(2, WireFormatLite::WIRETYPE_LENGTH_DELIMITED),
-          delim(cat(field1_data, field2b_data, field89_data, field89_data)));
-
-  for (int is_proto3 = 0; is_proto3 < 2; is_proto3++) {
-    const FieldDescriptor* field =
-        GetFieldForOneofType(FieldDescriptor::TYPE_MESSAGE, is_proto3);
-
-    string proto1 =
-        cat(tag(field->number(), WireFormatLite::WIRETYPE_LENGTH_DELIMITED),
-            delim(submsg1_data));
-    string proto2 =
-        cat(tag(field->number(), WireFormatLite::WIRETYPE_LENGTH_DELIMITED),
-            delim(submsg2_data));
-    string proto = cat(proto1, proto2);
-    string expected_proto =
-        cat(tag(field->number(), WireFormatLite::WIRETYPE_LENGTH_DELIMITED),
-            delim(merged_data));
-
-    std::unique_ptr<Message> test_message = NewTestMessage(is_proto3);
-    test_message->MergeFromString(expected_proto);
-    string text = test_message->DebugString();
-    RunValidProtobufTest("ValidDataOneof.MESSAGE.Merge", REQUIRED, proto, text,
-                         is_proto3);
-    RunValidBinaryProtobufTest("ValidDataOneofBinary.MESSAGE.Merge",
-                               RECOMMENDED, proto, expected_proto, is_proto3);
-  }
-}
-
-void BinaryAndJsonConformanceSuite::TestIllegalTags() {
-  // field num 0 is illegal
-  string nullfield[] = {
-    "\1DEADBEEF",
-    "\2\1\1",
-    "\3\4",
-    "\5DEAD"
-  };
-  for (int i = 0; i < 4; i++) {
-    string name = "IllegalZeroFieldNum_Case_0";
-    name.back() += i;
-    ExpectParseFailureForProto(nullfield[i], name, REQUIRED);
-  }
-}
-template <class MessageType>
-void BinaryAndJsonConformanceSuite::TestOneofMessage (
-    MessageType &message, bool is_proto3) {
-  message.set_oneof_uint32(0);
-  RunValidProtobufTestWithMessage(
-      "OneofZeroUint32", RECOMMENDED, &message, "oneof_uint32: 0", is_proto3);
-  message.mutable_oneof_nested_message()->set_a(0);
-  RunValidProtobufTestWithMessage(
-      "OneofZeroMessage", RECOMMENDED, &message,
-      is_proto3 ? "oneof_nested_message: {}" : "oneof_nested_message: {a: 0}",
-      is_proto3);
-  message.mutable_oneof_nested_message()->set_a(1);
-  RunValidProtobufTestWithMessage(
-      "OneofZeroMessageSetTwice", RECOMMENDED, &message,
-      "oneof_nested_message: {a: 1}",
-      is_proto3);
-  message.set_oneof_string("");
-  RunValidProtobufTestWithMessage(
-      "OneofZeroString", RECOMMENDED, &message, "oneof_string: \"\"", is_proto3);
-  message.set_oneof_bytes("");
-  RunValidProtobufTestWithMessage(
-      "OneofZeroBytes", RECOMMENDED, &message, "oneof_bytes: \"\"", is_proto3);
-  message.set_oneof_bool(false);
-  RunValidProtobufTestWithMessage(
-      "OneofZeroBool", RECOMMENDED, &message, "oneof_bool: false", is_proto3);
-  message.set_oneof_uint64(0);
-  RunValidProtobufTestWithMessage(
-      "OneofZeroUint64", RECOMMENDED, &message, "oneof_uint64: 0", is_proto3);
-  message.set_oneof_float(0.0f);
-  RunValidProtobufTestWithMessage(
-      "OneofZeroFloat", RECOMMENDED, &message, "oneof_float: 0", is_proto3);
-  message.set_oneof_double(0.0);
-  RunValidProtobufTestWithMessage(
-      "OneofZeroDouble", RECOMMENDED, &message, "oneof_double: 0", is_proto3);
-  message.set_oneof_enum(MessageType::FOO);
-  RunValidProtobufTestWithMessage(
-      "OneofZeroEnum", RECOMMENDED, &message, "oneof_enum: FOO", is_proto3);
-}
-
-template <class MessageType>
-void BinaryAndJsonConformanceSuite::TestUnknownMessage(
-    MessageType& message, bool is_proto3) {
-  message.ParseFromString("\xA8\x1F\x01");
-  RunValidBinaryProtobufTest("UnknownVarint", REQUIRED,
-                             message.SerializeAsString(), is_proto3);
-}
-
-void BinaryAndJsonConformanceSuite::RunSuiteImpl() {
-  // Hack to get the list of test failures based on whether
-  // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER is enabled or not.
-  conformance::FailureSet failure_set;
-  ConformanceRequest req;
-  ConformanceResponse res;
-  req.set_message_type(failure_set.GetTypeName());
-  req.set_protobuf_payload("");
-  req.set_requested_output_format(conformance::WireFormat::PROTOBUF);
-  RunTest("FindFailures", req, &res);
-  GOOGLE_CHECK(failure_set.MergeFromString(res.protobuf_payload()));
-  for (const string& failure : failure_set.failure()) {
-    AddExpectedFailedTest(failure);
-  }
-
-  type_resolver_.reset(NewTypeResolverForDescriptorPool(
-      kTypeUrlPrefix, DescriptorPool::generated_pool()));
-  type_url_ = GetTypeUrl(TestAllTypesProto3::descriptor());
-
-  for (int i = 1; i <= FieldDescriptor::MAX_TYPE; i++) {
-    if (i == FieldDescriptor::TYPE_GROUP) continue;
-    TestPrematureEOFForType(static_cast<FieldDescriptor::Type>(i));
-  }
-
-  TestIllegalTags();
-
-  int64 kInt64Min = -9223372036854775808ULL;
-  int64 kInt64Max = 9223372036854775807ULL;
-  uint64 kUint64Max = 18446744073709551615ULL;
-  int32 kInt32Max = 2147483647;
-  int32 kInt32Min = -2147483648;
-  uint32 kUint32Max = 4294967295UL;
-
-  TestValidDataForType(
-      FieldDescriptor::TYPE_DOUBLE,
-      {
-          {dbl(0), dbl(0)},
-          {dbl(0.1), dbl(0.1)},
-          {dbl(1.7976931348623157e+308), dbl(1.7976931348623157e+308)},
-          {dbl(2.22507385850720138309e-308), dbl(2.22507385850720138309e-308)},
-      });
-  TestValidDataForType(
-      FieldDescriptor::TYPE_FLOAT,
-      {
-          {flt(0), flt(0)},
-          {flt(0.1), flt(0.1)},
-          {flt(1.00000075e-36), flt(1.00000075e-36)},
-          {flt(3.402823e+38), flt(3.402823e+38)},  // 3.40282347e+38
-          {flt(1.17549435e-38f), flt(1.17549435e-38)},
-      });
-  TestValidDataForType(FieldDescriptor::TYPE_INT64,
-                       {
-                           {varint(0), varint(0)},
-                           {varint(12345), varint(12345)},
-                           {varint(kInt64Max), varint(kInt64Max)},
-                           {varint(kInt64Min), varint(kInt64Min)},
-                       });
-  TestValidDataForType(FieldDescriptor::TYPE_UINT64,
-                       {
-                           {varint(0), varint(0)},
-                           {varint(12345), varint(12345)},
-                           {varint(kUint64Max), varint(kUint64Max)},
-                       });
-  TestValidDataForType(FieldDescriptor::TYPE_INT32,
-                       {
-                           {varint(0), varint(0)},
-                           {varint(12345), varint(12345)},
-                           {longvarint(12345, 2), varint(12345)},
-                           {longvarint(12345, 7), varint(12345)},
-                           {varint(kInt32Max), varint(kInt32Max)},
-                           {varint(kInt32Min), varint(kInt32Min)},
-                           {varint(1LL << 33), varint(0)},
-                           {varint((1LL << 33) - 1), varint(-1)},
-                           {varint(kInt64Max), varint(-1)},
-                           {varint(kInt64Min + 1), varint(1)},
-                       });
-  TestValidDataForType(
-      FieldDescriptor::TYPE_UINT32,
-      {
-          {varint(0), varint(0)},
-          {varint(12345), varint(12345)},
-          {longvarint(12345, 2), varint(12345)},
-          {longvarint(12345, 7), varint(12345)},
-          {varint(kUint32Max), varint(kUint32Max)},  // UINT32_MAX
-          {varint(1LL << 33), varint(0)},
-          {varint((1LL << 33) + 1), varint(1)},
-          {varint((1LL << 33) - 1), varint((1LL << 32) - 1)},
-          {varint(kInt64Max), varint((1LL << 32) - 1)},
-          {varint(kInt64Min + 1), varint(1)},
-      });
-  TestValidDataForType(FieldDescriptor::TYPE_FIXED64,
-                       {
-                           {u64(0), u64(0)},
-                           {u64(12345), u64(12345)},
-                           {u64(kUint64Max), u64(kUint64Max)},
-                       });
-  TestValidDataForType(FieldDescriptor::TYPE_FIXED32,
-                       {
-                           {u32(0), u32(0)},
-                           {u32(12345), u32(12345)},
-                           {u32(kUint32Max), u32(kUint32Max)},  // UINT32_MAX
-                       });
-  TestValidDataForType(FieldDescriptor::TYPE_SFIXED64,
-                       {
-                           {u64(0), u64(0)},
-                           {u64(12345), u64(12345)},
-                           {u64(kInt64Max), u64(kInt64Max)},
-                           {u64(kInt64Min), u64(kInt64Min)},
-                       });
-  TestValidDataForType(FieldDescriptor::TYPE_SFIXED32,
-                       {
-                           {u32(0), u32(0)},
-                           {u32(12345), u32(12345)},
-                           {u32(kInt32Max), u32(kInt32Max)},
-                           {u32(kInt32Min), u32(kInt32Min)},
-                       });
-  // Bools should be serialized as 0 for false and 1 for true. Parsers should
-  // also interpret any nonzero value as true.
-  TestValidDataForType(FieldDescriptor::TYPE_BOOL,
-                       {
-                           {varint(0), varint(0)},
-                           {varint(1), varint(1)},
-                           {varint(-1), varint(1)},
-                           {varint(12345678), varint(1)},
-                           {varint(1LL << 33), varint(1)},
-                           {varint(kInt64Max), varint(1)},
-                           {varint(kInt64Min), varint(1)},
-                       });
-  TestValidDataForType(FieldDescriptor::TYPE_SINT32,
-                       {
-                           {zz32(0), zz32(0)},
-                           {zz32(12345), zz32(12345)},
-                           {zz32(kInt32Max), zz32(kInt32Max)},
-                           {zz32(kInt32Min), zz32(kInt32Min)},
-                           {zz64(kInt32Max + 2LL), zz32(1)},
-                       });
-  TestValidDataForType(FieldDescriptor::TYPE_SINT64,
-                       {
-                           {zz64(0), zz64(0)},
-                           {zz64(12345), zz64(12345)},
-                           {zz64(kInt64Max), zz64(kInt64Max)},
-                           {zz64(kInt64Min), zz64(kInt64Min)},
-                       });
-  TestValidDataForType(
-      FieldDescriptor::TYPE_STRING,
-      {
-          {delim(""), delim("")},
-          {delim("Hello world!"), delim("Hello world!")},
-          {delim("\'\"\?\\\a\b\f\n\r\t\v"),
-           delim("\'\"\?\\\a\b\f\n\r\t\v")},       // escape
-          {delim("谷歌"), delim("谷歌")},          // Google in Chinese
-          {delim("\u8C37\u6B4C"), delim("谷歌")},  // unicode escape
-          {delim("\u8c37\u6b4c"), delim("谷歌")},  // lowercase unicode
-          {delim("\xF0\x9F\x98\x81"), delim("\xF0\x9F\x98\x81")},  // emoji: �
-      });
-  TestValidDataForType(FieldDescriptor::TYPE_BYTES,
-                       {
-                           {delim(""), delim("")},
-                           {delim("Hello world!"), delim("Hello world!")},
-                           {delim("\x01\x02"), delim("\x01\x02")},
-                           {delim("\xfb"), delim("\xfb")},
-                       });
-  TestValidDataForType(FieldDescriptor::TYPE_ENUM,
-                       {
-                           {varint(0), varint(0)},
-                           {varint(1), varint(1)},
-                           {varint(2), varint(2)},
-                           {varint(-1), varint(-1)},
-                           {varint(kInt64Max), varint(-1)},
-                           {varint(kInt64Min + 1), varint(1)},
-                       });
-  TestValidDataForRepeatedScalarMessage();
-  TestValidDataForType(
-      FieldDescriptor::TYPE_MESSAGE,
-      {
-          {delim(""), delim("")},
-          {delim(cat(tag(1, WireFormatLite::WIRETYPE_VARINT), varint(1234))),
-           delim(cat(tag(1, WireFormatLite::WIRETYPE_VARINT), varint(1234)))},
-      });
-
-  TestValidDataForMapType(FieldDescriptor::TYPE_INT32,
-                          FieldDescriptor::TYPE_INT32);
-  TestValidDataForMapType(FieldDescriptor::TYPE_INT64,
-                          FieldDescriptor::TYPE_INT64);
-  TestValidDataForMapType(FieldDescriptor::TYPE_UINT32,
-                          FieldDescriptor::TYPE_UINT32);
-  TestValidDataForMapType(FieldDescriptor::TYPE_UINT64,
-                          FieldDescriptor::TYPE_UINT64);
-  TestValidDataForMapType(FieldDescriptor::TYPE_SINT32,
-                          FieldDescriptor::TYPE_SINT32);
-  TestValidDataForMapType(FieldDescriptor::TYPE_SINT64,
-                          FieldDescriptor::TYPE_SINT64);
-  TestValidDataForMapType(FieldDescriptor::TYPE_FIXED32,
-                          FieldDescriptor::TYPE_FIXED32);
-  TestValidDataForMapType(FieldDescriptor::TYPE_FIXED64,
-                          FieldDescriptor::TYPE_FIXED64);
-  TestValidDataForMapType(FieldDescriptor::TYPE_SFIXED32,
-                          FieldDescriptor::TYPE_SFIXED32);
-  TestValidDataForMapType(FieldDescriptor::TYPE_SFIXED64,
-                          FieldDescriptor::TYPE_SFIXED64);
-  TestValidDataForMapType(FieldDescriptor::TYPE_INT32,
-                          FieldDescriptor::TYPE_FLOAT);
-  TestValidDataForMapType(FieldDescriptor::TYPE_INT32,
-                          FieldDescriptor::TYPE_DOUBLE);
-  TestValidDataForMapType(FieldDescriptor::TYPE_BOOL,
-                          FieldDescriptor::TYPE_BOOL);
-  TestValidDataForMapType(FieldDescriptor::TYPE_STRING,
-                          FieldDescriptor::TYPE_STRING);
-  TestValidDataForMapType(FieldDescriptor::TYPE_STRING,
-                          FieldDescriptor::TYPE_BYTES);
-  TestValidDataForMapType(FieldDescriptor::TYPE_STRING,
-                          FieldDescriptor::TYPE_ENUM);
-  TestValidDataForMapType(FieldDescriptor::TYPE_STRING,
-                          FieldDescriptor::TYPE_MESSAGE);
-  // Additional test to check overwriting message value map.
-  TestOverwriteMessageValueMap();
-
-  TestValidDataForOneofType(FieldDescriptor::TYPE_UINT32);
-  TestValidDataForOneofType(FieldDescriptor::TYPE_BOOL);
-  TestValidDataForOneofType(FieldDescriptor::TYPE_UINT64);
-  TestValidDataForOneofType(FieldDescriptor::TYPE_FLOAT);
-  TestValidDataForOneofType(FieldDescriptor::TYPE_DOUBLE);
-  TestValidDataForOneofType(FieldDescriptor::TYPE_STRING);
-  TestValidDataForOneofType(FieldDescriptor::TYPE_BYTES);
-  TestValidDataForOneofType(FieldDescriptor::TYPE_ENUM);
-  TestValidDataForOneofType(FieldDescriptor::TYPE_MESSAGE);
-  // Additional test to check merging oneof message.
-  TestMergeOneofMessage();
-
-  // TODO(haberman):
-  // TestValidDataForType(FieldDescriptor::TYPE_GROUP
-
-  // Unknown fields.
-  {
-    TestAllTypesProto3 messageProto3;
-    TestAllTypesProto2 messageProto2;
-    // TODO(yilunchong): update this behavior when unknown field's behavior
-    // changed in open source. Also delete
-    // Required.Proto3.ProtobufInput.UnknownVarint.ProtobufOutput
-    // from failure list of python_cpp python java
-    TestUnknownMessage(messageProto3, true);
-    TestUnknownMessage(messageProto2, false);
-  }
-
-  RunJsonTests();
-}
-
-void BinaryAndJsonConformanceSuite::RunJsonTests() {
-  RunValidJsonTest("HelloWorld", REQUIRED,
-                   "{\"optionalString\":\"Hello, World!\"}",
-                   "optional_string: 'Hello, World!'");
-
-  // NOTE: The spec for JSON support is still being sorted out, these may not
-  // all be correct.
-
-  RunJsonTestsForFieldNameConvention();
-  RunJsonTestsForNonRepeatedTypes();
-  RunJsonTestsForRepeatedTypes();
-  RunJsonTestsForNullTypes();
-  RunJsonTestsForWrapperTypes();
-  RunJsonTestsForFieldMask();
-  RunJsonTestsForStruct();
-  RunJsonTestsForValue();
-  RunJsonTestsForAny();
-
-  RunValidJsonIgnoreUnknownTest("IgnoreUnknownJsonNumber", REQUIRED,
-                                R"({
-        "unknown": 1
-      })",
-                                "");
-  RunValidJsonIgnoreUnknownTest("IgnoreUnknownJsonString", REQUIRED,
-                                R"({
-        "unknown": "a"
-      })",
-                                "");
-  RunValidJsonIgnoreUnknownTest("IgnoreUnknownJsonTrue", REQUIRED,
-                                R"({
-        "unknown": true
-      })",
-                                "");
-  RunValidJsonIgnoreUnknownTest("IgnoreUnknownJsonFalse", REQUIRED,
-                                R"({
-        "unknown": false
-      })",
-                                "");
-  RunValidJsonIgnoreUnknownTest("IgnoreUnknownJsonNull", REQUIRED,
-                                R"({
-        "unknown": null
-      })",
-                                "");
-  RunValidJsonIgnoreUnknownTest("IgnoreUnknownJsonObject", REQUIRED,
-                                R"({
-        "unknown": {"a": 1}
-      })",
-                                "");
-
-  ExpectParseFailureForJson("RejectTopLevelNull", REQUIRED, "null");
-}
-
-void BinaryAndJsonConformanceSuite::RunJsonTestsForFieldNameConvention() {
-  RunValidJsonTest(
-      "FieldNameInSnakeCase", REQUIRED,
-      R"({
-        "fieldname1": 1,
-        "fieldName2": 2,
-        "FieldName3": 3,
-        "fieldName4": 4
-      })",
-      R"(
-        fieldname1: 1
-        field_name2: 2
-        _field_name3: 3
-        field__name4_: 4
-      )");
-  RunValidJsonTest(
-      "FieldNameWithNumbers", REQUIRED,
-      R"({
-        "field0name5": 5,
-        "field0Name6": 6
-      })",
-      R"(
-        field0name5: 5
-        field_0_name6: 6
-      )");
-  RunValidJsonTest(
-      "FieldNameWithMixedCases", REQUIRED,
-      R"({
-        "fieldName7": 7,
-        "FieldName8": 8,
-        "fieldName9": 9,
-        "FieldName10": 10,
-        "FIELDNAME11": 11,
-        "FIELDName12": 12
-      })",
-      R"(
-        fieldName7: 7
-        FieldName8: 8
-        field_Name9: 9
-        Field_Name10: 10
-        FIELD_NAME11: 11
-        FIELD_name12: 12
-      )");
-  RunValidJsonTest(
-      "FieldNameWithDoubleUnderscores", RECOMMENDED,
-      R"({
-        "FieldName13": 13,
-        "FieldName14": 14,
-        "fieldName15": 15,
-        "fieldName16": 16,
-        "fieldName17": 17,
-        "FieldName18": 18
-      })",
-      R"(
-        __field_name13: 13
-        __Field_name14: 14
-        field__name15: 15
-        field__Name16: 16
-        field_name17__: 17
-        Field_name18__: 18
-      )");
-  // Using the original proto field name in JSON is also allowed.
-  RunValidJsonTest(
-      "OriginalProtoFieldName", REQUIRED,
-      R"({
-        "fieldname1": 1,
-        "field_name2": 2,
-        "_field_name3": 3,
-        "field__name4_": 4,
-        "field0name5": 5,
-        "field_0_name6": 6,
-        "fieldName7": 7,
-        "FieldName8": 8,
-        "field_Name9": 9,
-        "Field_Name10": 10,
-        "FIELD_NAME11": 11,
-        "FIELD_name12": 12,
-        "__field_name13": 13,
-        "__Field_name14": 14,
-        "field__name15": 15,
-        "field__Name16": 16,
-        "field_name17__": 17,
-        "Field_name18__": 18
-      })",
-      R"(
-        fieldname1: 1
-        field_name2: 2
-        _field_name3: 3
-        field__name4_: 4
-        field0name5: 5
-        field_0_name6: 6
-        fieldName7: 7
-        FieldName8: 8
-        field_Name9: 9
-        Field_Name10: 10
-        FIELD_NAME11: 11
-        FIELD_name12: 12
-        __field_name13: 13
-        __Field_name14: 14
-        field__name15: 15
-        field__Name16: 16
-        field_name17__: 17
-        Field_name18__: 18
-      )");
-  // Field names can be escaped.
-  RunValidJsonTest(
-      "FieldNameEscaped", REQUIRED,
-      R"({"fieldn\u0061me1": 1})",
-      "fieldname1: 1");
-  // String ends with escape character.
-  ExpectParseFailureForJson(
-      "StringEndsWithEscapeChar", RECOMMENDED,
-      "{\"optionalString\": \"abc\\");
-  // Field names must be quoted (or it's not valid JSON).
-  ExpectParseFailureForJson(
-      "FieldNameNotQuoted", RECOMMENDED,
-      "{fieldname1: 1}");
-  // Trailing comma is not allowed (not valid JSON).
-  ExpectParseFailureForJson(
-      "TrailingCommaInAnObject", RECOMMENDED,
-      R"({"fieldname1":1,})");
-  ExpectParseFailureForJson(
-      "TrailingCommaInAnObjectWithSpace", RECOMMENDED,
-      R"({"fieldname1":1 ,})");
-  ExpectParseFailureForJson(
-      "TrailingCommaInAnObjectWithSpaceCommaSpace", RECOMMENDED,
-      R"({"fieldname1":1 , })");
-  ExpectParseFailureForJson(
-      "TrailingCommaInAnObjectWithNewlines", RECOMMENDED,
-      R"({
-        "fieldname1":1,
-      })");
-  // JSON doesn't support comments.
-  ExpectParseFailureForJson(
-      "JsonWithComments", RECOMMENDED,
-      R"({
-        // This is a comment.
-        "fieldname1": 1
-      })");
-  // JSON spec says whitespace doesn't matter, so try a few spacings to be sure.
-  RunValidJsonTest(
-      "OneLineNoSpaces", RECOMMENDED,
-      "{\"optionalInt32\":1,\"optionalInt64\":2}",
-      R"(
-        optional_int32: 1
-        optional_int64: 2
-      )");
-  RunValidJsonTest(
-      "OneLineWithSpaces", RECOMMENDED,
-      "{ \"optionalInt32\" : 1 , \"optionalInt64\" : 2 }",
-      R"(
-        optional_int32: 1
-        optional_int64: 2
-      )");
-  RunValidJsonTest(
-      "MultilineNoSpaces", RECOMMENDED,
-      "{\n\"optionalInt32\"\n:\n1\n,\n\"optionalInt64\"\n:\n2\n}",
-      R"(
-        optional_int32: 1
-        optional_int64: 2
-      )");
-  RunValidJsonTest(
-      "MultilineWithSpaces", RECOMMENDED,
-      "{\n  \"optionalInt32\"  :  1\n  ,\n  \"optionalInt64\"  :  2\n}\n",
-      R"(
-        optional_int32: 1
-        optional_int64: 2
-      )");
-  // Missing comma between key/value pairs.
-  ExpectParseFailureForJson(
-      "MissingCommaOneLine", RECOMMENDED,
-      "{ \"optionalInt32\": 1 \"optionalInt64\": 2 }");
-  ExpectParseFailureForJson(
-      "MissingCommaMultiline", RECOMMENDED,
-      "{\n  \"optionalInt32\": 1\n  \"optionalInt64\": 2\n}");
-  // Duplicated field names are not allowed.
-  ExpectParseFailureForJson(
-      "FieldNameDuplicate", RECOMMENDED,
-      R"({
-        "optionalNestedMessage": {a: 1},
-        "optionalNestedMessage": {}
-      })");
-  ExpectParseFailureForJson(
-      "FieldNameDuplicateDifferentCasing1", RECOMMENDED,
-      R"({
-        "optional_nested_message": {a: 1},
-        "optionalNestedMessage": {}
-      })");
-  ExpectParseFailureForJson(
-      "FieldNameDuplicateDifferentCasing2", RECOMMENDED,
-      R"({
-        "optionalNestedMessage": {a: 1},
-        "optional_nested_message": {}
-      })");
-  // Serializers should use lowerCamelCase by default.
-  RunValidJsonTestWithValidator(
-      "FieldNameInLowerCamelCase", REQUIRED,
-      R"({
-        "fieldname1": 1,
-        "fieldName2": 2,
-        "FieldName3": 3,
-        "fieldName4": 4
-      })",
-      [](const Json::Value& value) {
-        return value.isMember("fieldname1") &&
-            value.isMember("fieldName2") &&
-            value.isMember("FieldName3") &&
-            value.isMember("fieldName4");
-      },
-      true);
-  RunValidJsonTestWithValidator(
-      "FieldNameWithNumbers", REQUIRED,
-      R"({
-        "field0name5": 5,
-        "field0Name6": 6
-      })",
-      [](const Json::Value& value) {
-        return value.isMember("field0name5") &&
-            value.isMember("field0Name6");
-      },
-      true);
-  RunValidJsonTestWithValidator(
-      "FieldNameWithMixedCases", REQUIRED,
-      R"({
-        "fieldName7": 7,
-        "FieldName8": 8,
-        "fieldName9": 9,
-        "FieldName10": 10,
-        "FIELDNAME11": 11,
-        "FIELDName12": 12
-      })",
-      [](const Json::Value& value) {
-        return value.isMember("fieldName7") &&
-            value.isMember("FieldName8") &&
-            value.isMember("fieldName9") &&
-            value.isMember("FieldName10") &&
-            value.isMember("FIELDNAME11") &&
-            value.isMember("FIELDName12");
-      },
-      true);
-  RunValidJsonTestWithValidator(
-      "FieldNameWithDoubleUnderscores", RECOMMENDED,
-      R"({
-        "FieldName13": 13,
-        "FieldName14": 14,
-        "fieldName15": 15,
-        "fieldName16": 16,
-        "fieldName17": 17,
-        "FieldName18": 18
-      })",
-      [](const Json::Value& value) {
-        return value.isMember("FieldName13") &&
-            value.isMember("FieldName14") &&
-            value.isMember("fieldName15") &&
-            value.isMember("fieldName16") &&
-            value.isMember("fieldName17") &&
-            value.isMember("FieldName18");
-      },
-      true);
-  RunValidJsonTestWithValidator(
-      "StoresDefaultPrimitive", REQUIRED,
-      R"({
-        "FieldName13": 0
-      })",
-      [](const Json::Value& value) { return value.isMember("FieldName13"); },
-      false);
-  RunValidJsonTestWithValidator(
-      "SkipsDefaultPrimitive", REQUIRED,
-      R"({
-        "FieldName13": 0
-      })",
-      [](const Json::Value& value) { return !value.isMember("FieldName13"); },
-      true);
-  RunValidJsonTestWithValidator(
-      "FieldNameExtension", RECOMMENDED,
-      R"({
-        "[protobuf_test_messages.proto2.extension_int32]": 1
-      })",
-      [](const Json::Value& value) {
-        return value.isMember(
-            "[protobuf_test_messages.proto2.extension_int32]");
-      },
-      false);
-}
-
-void BinaryAndJsonConformanceSuite::RunJsonTestsForNonRepeatedTypes() {
-  // Integer fields.
-  RunValidJsonTest(
-      "Int32FieldMaxValue", REQUIRED,
-      R"({"optionalInt32": 2147483647})",
-      "optional_int32: 2147483647");
-  RunValidJsonTest(
-      "Int32FieldMinValue", REQUIRED,
-      R"({"optionalInt32": -2147483648})",
-      "optional_int32: -2147483648");
-  RunValidJsonTest(
-      "Uint32FieldMaxValue", REQUIRED,
-      R"({"optionalUint32": 4294967295})",
-      "optional_uint32: 4294967295");
-  RunValidJsonTest(
-      "Int64FieldMaxValue", REQUIRED,
-      R"({"optionalInt64": "9223372036854775807"})",
-      "optional_int64: 9223372036854775807");
-  RunValidJsonTest(
-      "Int64FieldMinValue", REQUIRED,
-      R"({"optionalInt64": "-9223372036854775808"})",
-      "optional_int64: -9223372036854775808");
-  RunValidJsonTest(
-      "Uint64FieldMaxValue", REQUIRED,
-      R"({"optionalUint64": "18446744073709551615"})",
-      "optional_uint64: 18446744073709551615");
-  // While not the largest Int64, this is the largest
-  // Int64 which can be exactly represented within an
-  // IEEE-754 64-bit float, which is the expected level
-  // of interoperability guarantee. Larger values may
-  // work in some implementations, but should not be
-  // relied upon.
-  RunValidJsonTest(
-      "Int64FieldMaxValueNotQuoted", REQUIRED,
-      R"({"optionalInt64": 9223372036854774784})",
-      "optional_int64: 9223372036854774784");
-  RunValidJsonTest(
-      "Int64FieldMinValueNotQuoted", REQUIRED,
-      R"({"optionalInt64": -9223372036854775808})",
-      "optional_int64: -9223372036854775808");
-  // Largest interoperable Uint64; see comment above
-  // for Int64FieldMaxValueNotQuoted.
-  RunValidJsonTest(
-      "Uint64FieldMaxValueNotQuoted", REQUIRED,
-      R"({"optionalUint64": 18446744073709549568})",
-      "optional_uint64: 18446744073709549568");
-  // Values can be represented as JSON strings.
-  RunValidJsonTest(
-      "Int32FieldStringValue", REQUIRED,
-      R"({"optionalInt32": "2147483647"})",
-      "optional_int32: 2147483647");
-  RunValidJsonTest(
-      "Int32FieldStringValueEscaped", REQUIRED,
-      R"({"optionalInt32": "2\u003147483647"})",
-      "optional_int32: 2147483647");
-
-  // Parsers reject out-of-bound integer values.
-  ExpectParseFailureForJson(
-      "Int32FieldTooLarge", REQUIRED,
-      R"({"optionalInt32": 2147483648})");
-  ExpectParseFailureForJson(
-      "Int32FieldTooSmall", REQUIRED,
-      R"({"optionalInt32": -2147483649})");
-  ExpectParseFailureForJson(
-      "Uint32FieldTooLarge", REQUIRED,
-      R"({"optionalUint32": 4294967296})");
-  ExpectParseFailureForJson(
-      "Int64FieldTooLarge", REQUIRED,
-      R"({"optionalInt64": "9223372036854775808"})");
-  ExpectParseFailureForJson(
-      "Int64FieldTooSmall", REQUIRED,
-      R"({"optionalInt64": "-9223372036854775809"})");
-  ExpectParseFailureForJson(
-      "Uint64FieldTooLarge", REQUIRED,
-      R"({"optionalUint64": "18446744073709551616"})");
-  // Parser reject non-integer numeric values as well.
-  ExpectParseFailureForJson(
-      "Int32FieldNotInteger", REQUIRED,
-      R"({"optionalInt32": 0.5})");
-  ExpectParseFailureForJson(
-      "Uint32FieldNotInteger", REQUIRED,
-      R"({"optionalUint32": 0.5})");
-  ExpectParseFailureForJson(
-      "Int64FieldNotInteger", REQUIRED,
-      R"({"optionalInt64": "0.5"})");
-  ExpectParseFailureForJson(
-      "Uint64FieldNotInteger", REQUIRED,
-      R"({"optionalUint64": "0.5"})");
-
-  // Integers but represented as float values are accepted.
-  RunValidJsonTest(
-      "Int32FieldFloatTrailingZero", REQUIRED,
-      R"({"optionalInt32": 100000.000})",
-      "optional_int32: 100000");
-  RunValidJsonTest(
-      "Int32FieldExponentialFormat", REQUIRED,
-      R"({"optionalInt32": 1e5})",
-      "optional_int32: 100000");
-  RunValidJsonTest(
-      "Int32FieldMaxFloatValue", REQUIRED,
-      R"({"optionalInt32": 2.147483647e9})",
-      "optional_int32: 2147483647");
-  RunValidJsonTest(
-      "Int32FieldMinFloatValue", REQUIRED,
-      R"({"optionalInt32": -2.147483648e9})",
-      "optional_int32: -2147483648");
-  RunValidJsonTest(
-      "Uint32FieldMaxFloatValue", REQUIRED,
-      R"({"optionalUint32": 4.294967295e9})",
-      "optional_uint32: 4294967295");
-
-  // Parser reject non-numeric values.
-  ExpectParseFailureForJson(
-      "Int32FieldNotNumber", REQUIRED,
-      R"({"optionalInt32": "3x3"})");
-  ExpectParseFailureForJson(
-      "Uint32FieldNotNumber", REQUIRED,
-      R"({"optionalUint32": "3x3"})");
-  ExpectParseFailureForJson(
-      "Int64FieldNotNumber", REQUIRED,
-      R"({"optionalInt64": "3x3"})");
-  ExpectParseFailureForJson(
-      "Uint64FieldNotNumber", REQUIRED,
-      R"({"optionalUint64": "3x3"})");
-  // JSON does not allow "+" on numeric values.
-  ExpectParseFailureForJson(
-      "Int32FieldPlusSign", REQUIRED,
-      R"({"optionalInt32": +1})");
-  // JSON doesn't allow leading 0s.
-  ExpectParseFailureForJson(
-      "Int32FieldLeadingZero", REQUIRED,
-      R"({"optionalInt32": 01})");
-  ExpectParseFailureForJson(
-      "Int32FieldNegativeWithLeadingZero", REQUIRED,
-      R"({"optionalInt32": -01})");
-  // String values must follow the same syntax rule. Specifically leading
-  // or trailing spaces are not allowed.
-  ExpectParseFailureForJson(
-      "Int32FieldLeadingSpace", REQUIRED,
-      R"({"optionalInt32": " 1"})");
-  ExpectParseFailureForJson(
-      "Int32FieldTrailingSpace", REQUIRED,
-      R"({"optionalInt32": "1 "})");
-
-  // 64-bit values are serialized as strings.
-  RunValidJsonTestWithValidator(
-      "Int64FieldBeString", RECOMMENDED, R"({"optionalInt64": 1})",
-      [](const Json::Value& value) {
-        return value["optionalInt64"].type() == Json::stringValue &&
-            value["optionalInt64"].asString() == "1";
-      },
-      true);
-  RunValidJsonTestWithValidator(
-      "Uint64FieldBeString", RECOMMENDED, R"({"optionalUint64": 1})",
-      [](const Json::Value& value) {
-        return value["optionalUint64"].type() == Json::stringValue &&
-            value["optionalUint64"].asString() == "1";
-      },
-      true);
-
-  // Bool fields.
-  RunValidJsonTest(
-      "BoolFieldTrue", REQUIRED,
-      R"({"optionalBool":true})",
-      "optional_bool: true");
-  RunValidJsonTest(
-      "BoolFieldFalse", REQUIRED,
-      R"({"optionalBool":false})",
-      "optional_bool: false");
-
-  // Other forms are not allowed.
-  ExpectParseFailureForJson(
-      "BoolFieldIntegerZero", RECOMMENDED,
-      R"({"optionalBool":0})");
-  ExpectParseFailureForJson(
-      "BoolFieldIntegerOne", RECOMMENDED,
-      R"({"optionalBool":1})");
-  ExpectParseFailureForJson(
-      "BoolFieldCamelCaseTrue", RECOMMENDED,
-      R"({"optionalBool":True})");
-  ExpectParseFailureForJson(
-      "BoolFieldCamelCaseFalse", RECOMMENDED,
-      R"({"optionalBool":False})");
-  ExpectParseFailureForJson(
-      "BoolFieldAllCapitalTrue", RECOMMENDED,
-      R"({"optionalBool":TRUE})");
-  ExpectParseFailureForJson(
-      "BoolFieldAllCapitalFalse", RECOMMENDED,
-      R"({"optionalBool":FALSE})");
-  ExpectParseFailureForJson(
-      "BoolFieldDoubleQuotedTrue", RECOMMENDED,
-      R"({"optionalBool":"true"})");
-  ExpectParseFailureForJson(
-      "BoolFieldDoubleQuotedFalse", RECOMMENDED,
-      R"({"optionalBool":"false"})");
-
-  // Float fields.
-  RunValidJsonTest(
-      "FloatFieldMinPositiveValue", REQUIRED,
-      R"({"optionalFloat": 1.175494e-38})",
-      "optional_float: 1.175494e-38");
-  RunValidJsonTest(
-      "FloatFieldMaxNegativeValue", REQUIRED,
-      R"({"optionalFloat": -1.175494e-38})",
-      "optional_float: -1.175494e-38");
-  RunValidJsonTest(
-      "FloatFieldMaxPositiveValue", REQUIRED,
-      R"({"optionalFloat": 3.402823e+38})",
-      "optional_float: 3.402823e+38");
-  RunValidJsonTest(
-      "FloatFieldMinNegativeValue", REQUIRED,
-      R"({"optionalFloat": 3.402823e+38})",
-      "optional_float: 3.402823e+38");
-  // Values can be quoted.
-  RunValidJsonTest(
-      "FloatFieldQuotedValue", REQUIRED,
-      R"({"optionalFloat": "1"})",
-      "optional_float: 1");
-  // Special values.
-  RunValidJsonTest(
-      "FloatFieldNan", REQUIRED,
-      R"({"optionalFloat": "NaN"})",
-      "optional_float: nan");
-  RunValidJsonTest(
-      "FloatFieldInfinity", REQUIRED,
-      R"({"optionalFloat": "Infinity"})",
-      "optional_float: inf");
-  RunValidJsonTest(
-      "FloatFieldNegativeInfinity", REQUIRED,
-      R"({"optionalFloat": "-Infinity"})",
-      "optional_float: -inf");
-  // Non-canonical Nan will be correctly normalized.
-  {
-    TestAllTypesProto3 message;
-    // IEEE floating-point standard 32-bit quiet NaN:
-    //   0111 1111 1xxx xxxx xxxx xxxx xxxx xxxx
-    message.set_optional_float(
-        WireFormatLite::DecodeFloat(0x7FA12345));
-    RunValidJsonTestWithProtobufInput(
-        "FloatFieldNormalizeQuietNan", REQUIRED, message,
-        "optional_float: nan");
-    // IEEE floating-point standard 64-bit signaling NaN:
-    //   1111 1111 1xxx xxxx xxxx xxxx xxxx xxxx
-    message.set_optional_float(
-        WireFormatLite::DecodeFloat(0xFFB54321));
-    RunValidJsonTestWithProtobufInput(
-        "FloatFieldNormalizeSignalingNan", REQUIRED, message,
-        "optional_float: nan");
-  }
-
-  // Special values must be quoted.
-  ExpectParseFailureForJson(
-      "FloatFieldNanNotQuoted", RECOMMENDED,
-      R"({"optionalFloat": NaN})");
-  ExpectParseFailureForJson(
-      "FloatFieldInfinityNotQuoted", RECOMMENDED,
-      R"({"optionalFloat": Infinity})");
-  ExpectParseFailureForJson(
-      "FloatFieldNegativeInfinityNotQuoted", RECOMMENDED,
-      R"({"optionalFloat": -Infinity})");
-  // Parsers should reject out-of-bound values.
-  ExpectParseFailureForJson(
-      "FloatFieldTooSmall", REQUIRED,
-      R"({"optionalFloat": -3.502823e+38})");
-  ExpectParseFailureForJson(
-      "FloatFieldTooLarge", REQUIRED,
-      R"({"optionalFloat": 3.502823e+38})");
-
-  // Double fields.
-  RunValidJsonTest(
-      "DoubleFieldMinPositiveValue", REQUIRED,
-      R"({"optionalDouble": 2.22507e-308})",
-      "optional_double: 2.22507e-308");
-  RunValidJsonTest(
-      "DoubleFieldMaxNegativeValue", REQUIRED,
-      R"({"optionalDouble": -2.22507e-308})",
-      "optional_double: -2.22507e-308");
-  RunValidJsonTest(
-      "DoubleFieldMaxPositiveValue", REQUIRED,
-      R"({"optionalDouble": 1.79769e+308})",
-      "optional_double: 1.79769e+308");
-  RunValidJsonTest(
-      "DoubleFieldMinNegativeValue", REQUIRED,
-      R"({"optionalDouble": -1.79769e+308})",
-      "optional_double: -1.79769e+308");
-  // Values can be quoted.
-  RunValidJsonTest(
-      "DoubleFieldQuotedValue", REQUIRED,
-      R"({"optionalDouble": "1"})",
-      "optional_double: 1");
-  // Special values.
-  RunValidJsonTest(
-      "DoubleFieldNan", REQUIRED,
-      R"({"optionalDouble": "NaN"})",
-      "optional_double: nan");
-  RunValidJsonTest(
-      "DoubleFieldInfinity", REQUIRED,
-      R"({"optionalDouble": "Infinity"})",
-      "optional_double: inf");
-  RunValidJsonTest(
-      "DoubleFieldNegativeInfinity", REQUIRED,
-      R"({"optionalDouble": "-Infinity"})",
-      "optional_double: -inf");
-  // Non-canonical Nan will be correctly normalized.
-  {
-    TestAllTypesProto3 message;
-    message.set_optional_double(
-        WireFormatLite::DecodeDouble(int64{0x7FFA123456789ABC}));
-    RunValidJsonTestWithProtobufInput(
-        "DoubleFieldNormalizeQuietNan", REQUIRED, message,
-        "optional_double: nan");
-    message.set_optional_double(
-        WireFormatLite::DecodeDouble(uint64{0xFFFBCBA987654321}));
-    RunValidJsonTestWithProtobufInput(
-        "DoubleFieldNormalizeSignalingNan", REQUIRED, message,
-        "optional_double: nan");
-  }
-
-  // Special values must be quoted.
-  ExpectParseFailureForJson(
-      "DoubleFieldNanNotQuoted", RECOMMENDED,
-      R"({"optionalDouble": NaN})");
-  ExpectParseFailureForJson(
-      "DoubleFieldInfinityNotQuoted", RECOMMENDED,
-      R"({"optionalDouble": Infinity})");
-  ExpectParseFailureForJson(
-      "DoubleFieldNegativeInfinityNotQuoted", RECOMMENDED,
-      R"({"optionalDouble": -Infinity})");
-
-  // Parsers should reject out-of-bound values.
-  ExpectParseFailureForJson(
-      "DoubleFieldTooSmall", REQUIRED,
-      R"({"optionalDouble": -1.89769e+308})");
-  ExpectParseFailureForJson(
-      "DoubleFieldTooLarge", REQUIRED,
-      R"({"optionalDouble": +1.89769e+308})");
-
-  // Enum fields.
-  RunValidJsonTest(
-      "EnumField", REQUIRED,
-      R"({"optionalNestedEnum": "FOO"})",
-      "optional_nested_enum: FOO");
-  // Enum fields with alias
-  RunValidJsonTest(
-      "EnumFieldWithAlias", REQUIRED,
-      R"({"optionalAliasedEnum": "ALIAS_BAZ"})",
-      "optional_aliased_enum: ALIAS_BAZ");
-  RunValidJsonTest(
-      "EnumFieldWithAliasUseAlias", REQUIRED,
-      R"({"optionalAliasedEnum": "MOO"})",
-      "optional_aliased_enum: ALIAS_BAZ");
-  RunValidJsonTest(
-      "EnumFieldWithAliasLowerCase", REQUIRED,
-      R"({"optionalAliasedEnum": "moo"})",
-      "optional_aliased_enum: ALIAS_BAZ");
-  RunValidJsonTest(
-      "EnumFieldWithAliasDifferentCase", REQUIRED,
-      R"({"optionalAliasedEnum": "bAz"})",
-      "optional_aliased_enum: ALIAS_BAZ");
-  // Enum values must be represented as strings.
-  ExpectParseFailureForJson(
-      "EnumFieldNotQuoted", REQUIRED,
-      R"({"optionalNestedEnum": FOO})");
-  // Numeric values are allowed.
-  RunValidJsonTest(
-      "EnumFieldNumericValueZero", REQUIRED,
-      R"({"optionalNestedEnum": 0})",
-      "optional_nested_enum: FOO");
-  RunValidJsonTest(
-      "EnumFieldNumericValueNonZero", REQUIRED,
-      R"({"optionalNestedEnum": 1})",
-      "optional_nested_enum: BAR");
-  // Unknown enum values are represented as numeric values.
-  RunValidJsonTestWithValidator(
-      "EnumFieldUnknownValue", REQUIRED, R"({"optionalNestedEnum": 123})",
-      [](const Json::Value& value) {
-        return value["optionalNestedEnum"].type() == Json::intValue &&
-            value["optionalNestedEnum"].asInt() == 123;
-      },
-      true);
-
-  // String fields.
-  RunValidJsonTest(
-      "StringField", REQUIRED,
-      R"({"optionalString": "Hello world!"})",
-      "optional_string: \"Hello world!\"");
-  RunValidJsonTest(
-      "StringFieldUnicode", REQUIRED,
-      // Google in Chinese.
-      R"({"optionalString": "谷歌"})",
-      R"(optional_string: "谷歌")");
-  RunValidJsonTest(
-      "StringFieldEscape", REQUIRED,
-      R"({"optionalString": "\"\\\/\b\f\n\r\t"})",
-      R"(optional_string: "\"\\/\b\f\n\r\t")");
-  RunValidJsonTest(
-      "StringFieldUnicodeEscape", REQUIRED,
-      R"({"optionalString": "\u8C37\u6B4C"})",
-      R"(optional_string: "谷歌")");
-  RunValidJsonTest(
-      "StringFieldUnicodeEscapeWithLowercaseHexLetters", REQUIRED,
-      R"({"optionalString": "\u8c37\u6b4c"})",
-      R"(optional_string: "谷歌")");
-  RunValidJsonTest(
-      "StringFieldSurrogatePair", REQUIRED,
-      // The character is an emoji: grinning face with smiling eyes. �
-      R"({"optionalString": "\uD83D\uDE01"})",
-      R"(optional_string: "\xF0\x9F\x98\x81")");
-
-  // Unicode escapes must start with "\u" (lowercase u).
-  ExpectParseFailureForJson(
-      "StringFieldUppercaseEscapeLetter", RECOMMENDED,
-      R"({"optionalString": "\U8C37\U6b4C"})");
-  ExpectParseFailureForJson(
-      "StringFieldInvalidEscape", RECOMMENDED,
-      R"({"optionalString": "\uXXXX\u6B4C"})");
-  ExpectParseFailureForJson(
-      "StringFieldUnterminatedEscape", RECOMMENDED,
-      R"({"optionalString": "\u8C3"})");
-  ExpectParseFailureForJson(
-      "StringFieldUnpairedHighSurrogate", RECOMMENDED,
-      R"({"optionalString": "\uD800"})");
-  ExpectParseFailureForJson(
-      "StringFieldUnpairedLowSurrogate", RECOMMENDED,
-      R"({"optionalString": "\uDC00"})");
-  ExpectParseFailureForJson(
-      "StringFieldSurrogateInWrongOrder", RECOMMENDED,
-      R"({"optionalString": "\uDE01\uD83D"})");
-  ExpectParseFailureForJson(
-      "StringFieldNotAString", REQUIRED,
-      R"({"optionalString": 12345})");
-
-  // Bytes fields.
-  RunValidJsonTest(
-      "BytesField", REQUIRED,
-      R"({"optionalBytes": "AQI="})",
-      R"(optional_bytes: "\x01\x02")");
-  RunValidJsonTest(
-      "BytesFieldBase64Url", RECOMMENDED,
-      R"({"optionalBytes": "-_"})",
-      R"(optional_bytes: "\xfb")");
-
-  // Message fields.
-  RunValidJsonTest(
-      "MessageField", REQUIRED,
-      R"({"optionalNestedMessage": {"a": 1234}})",
-      "optional_nested_message: {a: 1234}");
-
-  // Oneof fields.
-  ExpectParseFailureForJson(
-      "OneofFieldDuplicate", REQUIRED,
-      R"({"oneofUint32": 1, "oneofString": "test"})");
-  RunValidJsonTest("OneofFieldNullFirst", REQUIRED,
-                   R"({"oneofUint32": null, "oneofString": "test"})",
-                   "oneof_string: \"test\"");
-  RunValidJsonTest("OneofFieldNullSecond", REQUIRED,
-                   R"({"oneofString": "test", "oneofUint32": null})",
-                   "oneof_string: \"test\"");
-  // Ensure zero values for oneof make it out/backs.
-  TestAllTypesProto3 messageProto3;
-  TestAllTypesProto2 messageProto2;
-  TestOneofMessage(messageProto3, true);
-  TestOneofMessage(messageProto2, false);
-  RunValidJsonTest(
-      "OneofZeroUint32", RECOMMENDED,
-      R"({"oneofUint32": 0})", "oneof_uint32: 0");
-  RunValidJsonTest(
-      "OneofZeroMessage", RECOMMENDED,
-      R"({"oneofNestedMessage": {}})", "oneof_nested_message: {}");
-  RunValidJsonTest(
-      "OneofZeroString", RECOMMENDED,
-      R"({"oneofString": ""})", "oneof_string: \"\"");
-  RunValidJsonTest(
-      "OneofZeroBytes", RECOMMENDED,
-      R"({"oneofBytes": ""})", "oneof_bytes: \"\"");
-  RunValidJsonTest(
-      "OneofZeroBool", RECOMMENDED,
-      R"({"oneofBool": false})", "oneof_bool: false");
-  RunValidJsonTest(
-      "OneofZeroUint64", RECOMMENDED,
-      R"({"oneofUint64": 0})", "oneof_uint64: 0");
-  RunValidJsonTest(
-      "OneofZeroFloat", RECOMMENDED,
-      R"({"oneofFloat": 0.0})", "oneof_float: 0");
-  RunValidJsonTest(
-      "OneofZeroDouble", RECOMMENDED,
-      R"({"oneofDouble": 0.0})", "oneof_double: 0");
-  RunValidJsonTest(
-      "OneofZeroEnum", RECOMMENDED,
-      R"({"oneofEnum":"FOO"})", "oneof_enum: FOO");
-
-  // Map fields.
-  RunValidJsonTest(
-      "Int32MapField", REQUIRED,
-      R"({"mapInt32Int32": {"1": 2, "3": 4}})",
-      "map_int32_int32: {key: 1 value: 2}"
-      "map_int32_int32: {key: 3 value: 4}");
-  ExpectParseFailureForJson(
-      "Int32MapFieldKeyNotQuoted", RECOMMENDED,
-      R"({"mapInt32Int32": {1: 2, 3: 4}})");
-  RunValidJsonTest(
-      "Uint32MapField", REQUIRED,
-      R"({"mapUint32Uint32": {"1": 2, "3": 4}})",
-      "map_uint32_uint32: {key: 1 value: 2}"
-      "map_uint32_uint32: {key: 3 value: 4}");
-  ExpectParseFailureForJson(
-      "Uint32MapFieldKeyNotQuoted", RECOMMENDED,
-      R"({"mapUint32Uint32": {1: 2, 3: 4}})");
-  RunValidJsonTest(
-      "Int64MapField", REQUIRED,
-      R"({"mapInt64Int64": {"1": 2, "3": 4}})",
-      "map_int64_int64: {key: 1 value: 2}"
-      "map_int64_int64: {key: 3 value: 4}");
-  ExpectParseFailureForJson(
-      "Int64MapFieldKeyNotQuoted", RECOMMENDED,
-      R"({"mapInt64Int64": {1: 2, 3: 4}})");
-  RunValidJsonTest(
-      "Uint64MapField", REQUIRED,
-      R"({"mapUint64Uint64": {"1": 2, "3": 4}})",
-      "map_uint64_uint64: {key: 1 value: 2}"
-      "map_uint64_uint64: {key: 3 value: 4}");
-  ExpectParseFailureForJson(
-      "Uint64MapFieldKeyNotQuoted", RECOMMENDED,
-      R"({"mapUint64Uint64": {1: 2, 3: 4}})");
-  RunValidJsonTest(
-      "BoolMapField", REQUIRED,
-      R"({"mapBoolBool": {"true": true, "false": false}})",
-      "map_bool_bool: {key: true value: true}"
-      "map_bool_bool: {key: false value: false}");
-  ExpectParseFailureForJson(
-      "BoolMapFieldKeyNotQuoted", RECOMMENDED,
-      R"({"mapBoolBool": {true: true, false: false}})");
-  RunValidJsonTest(
-      "MessageMapField", REQUIRED,
-      R"({
-        "mapStringNestedMessage": {
-          "hello": {"a": 1234},
-          "world": {"a": 5678}
-        }
-      })",
-      R"(
-        map_string_nested_message: {
-          key: "hello"
-          value: {a: 1234}
-        }
-        map_string_nested_message: {
-          key: "world"
-          value: {a: 5678}
-        }
-      )");
-  // Since Map keys are represented as JSON strings, escaping should be allowed.
-  RunValidJsonTest(
-      "Int32MapEscapedKey", REQUIRED,
-      R"({"mapInt32Int32": {"\u0031": 2}})",
-      "map_int32_int32: {key: 1 value: 2}");
-  RunValidJsonTest(
-      "Int64MapEscapedKey", REQUIRED,
-      R"({"mapInt64Int64": {"\u0031": 2}})",
-      "map_int64_int64: {key: 1 value: 2}");
-  RunValidJsonTest(
-      "BoolMapEscapedKey", REQUIRED,
-      R"({"mapBoolBool": {"tr\u0075e": true}})",
-      "map_bool_bool: {key: true value: true}");
-
-  // http://www.rfc-editor.org/rfc/rfc7159.txt says strings have to use double
-  // quotes.
-  ExpectParseFailureForJson("StringFieldSingleQuoteKey", RECOMMENDED,
-                            R"({'optionalString': "Hello world!"})");
-  ExpectParseFailureForJson("StringFieldSingleQuoteValue", RECOMMENDED,
-                            R"({"optionalString": 'Hello world!'})");
-  ExpectParseFailureForJson("StringFieldSingleQuoteBoth", RECOMMENDED,
-                            R"({'optionalString': 'Hello world!'})");
-}
-
-void BinaryAndJsonConformanceSuite::RunJsonTestsForRepeatedTypes() {
-  // Repeated fields.
-  RunValidJsonTest("PrimitiveRepeatedField", REQUIRED,
-                   R"({"repeatedInt32": [1, 2, 3, 4]})",
-                   "repeated_int32: [1, 2, 3, 4]");
-  RunValidJsonTest("EnumRepeatedField", REQUIRED,
-                   R"({"repeatedNestedEnum": ["FOO", "BAR", "BAZ"]})",
-                   "repeated_nested_enum: [FOO, BAR, BAZ]");
-  RunValidJsonTest("StringRepeatedField", REQUIRED,
-                   R"({"repeatedString": ["Hello", "world"]})",
-                   R"(repeated_string: ["Hello", "world"])");
-  RunValidJsonTest("BytesRepeatedField", REQUIRED,
-                   R"({"repeatedBytes": ["AAEC", "AQI="]})",
-                   R"(repeated_bytes: ["\x00\x01\x02", "\x01\x02"])");
-  RunValidJsonTest("MessageRepeatedField", REQUIRED,
-                   R"({"repeatedNestedMessage": [{"a": 1234}, {"a": 5678}]})",
-                   "repeated_nested_message: {a: 1234}"
-                   "repeated_nested_message: {a: 5678}");
-
-  // Repeated field elements are of incorrect type.
-  ExpectParseFailureForJson(
-      "RepeatedFieldWrongElementTypeExpectingIntegersGotBool", REQUIRED,
-      R"({"repeatedInt32": [1, false, 3, 4]})");
-  ExpectParseFailureForJson(
-      "RepeatedFieldWrongElementTypeExpectingIntegersGotString", REQUIRED,
-      R"({"repeatedInt32": [1, 2, "name", 4]})");
-  ExpectParseFailureForJson(
-      "RepeatedFieldWrongElementTypeExpectingIntegersGotMessage", REQUIRED,
-      R"({"repeatedInt32": [1, 2, 3, {"a": 4}]})");
-  ExpectParseFailureForJson(
-      "RepeatedFieldWrongElementTypeExpectingStringsGotInt", REQUIRED,
-      R"({"repeatedString": ["1", 2, "3", "4"]})");
-  ExpectParseFailureForJson(
-      "RepeatedFieldWrongElementTypeExpectingStringsGotBool", REQUIRED,
-      R"({"repeatedString": ["1", "2", false, "4"]})");
-  ExpectParseFailureForJson(
-      "RepeatedFieldWrongElementTypeExpectingStringsGotMessage", REQUIRED,
-      R"({"repeatedString": ["1", 2, "3", {"a": 4}]})");
-  ExpectParseFailureForJson(
-      "RepeatedFieldWrongElementTypeExpectingMessagesGotInt", REQUIRED,
-      R"({"repeatedNestedMessage": [{"a": 1}, 2]})");
-  ExpectParseFailureForJson(
-      "RepeatedFieldWrongElementTypeExpectingMessagesGotBool", REQUIRED,
-      R"({"repeatedNestedMessage": [{"a": 1}, false]})");
-  ExpectParseFailureForJson(
-      "RepeatedFieldWrongElementTypeExpectingMessagesGotString", REQUIRED,
-      R"({"repeatedNestedMessage": [{"a": 1}, "2"]})");
-  // Trailing comma in the repeated field is not allowed.
-  ExpectParseFailureForJson("RepeatedFieldTrailingComma", RECOMMENDED,
-                            R"({"repeatedInt32": [1, 2, 3, 4,]})");
-  ExpectParseFailureForJson("RepeatedFieldTrailingCommaWithSpace", RECOMMENDED,
-                            "{\"repeatedInt32\": [1, 2, 3, 4 ,]}");
-  ExpectParseFailureForJson("RepeatedFieldTrailingCommaWithSpaceCommaSpace",
-                            RECOMMENDED,
-                            "{\"repeatedInt32\": [1, 2, 3, 4 , ]}");
-  ExpectParseFailureForJson(
-      "RepeatedFieldTrailingCommaWithNewlines", RECOMMENDED,
-      "{\"repeatedInt32\": [\n  1,\n  2,\n  3,\n  4,\n]}");
-}
-
-void BinaryAndJsonConformanceSuite::RunJsonTestsForNullTypes() {
-  // "null" is accepted for all fields types.
-  RunValidJsonTest(
-      "AllFieldAcceptNull", REQUIRED,
-      R"({
-        "optionalInt32": null,
-        "optionalInt64": null,
-        "optionalUint32": null,
-        "optionalUint64": null,
-        "optionalSint32": null,
-        "optionalSint64": null,
-        "optionalFixed32": null,
-        "optionalFixed64": null,
-        "optionalSfixed32": null,
-        "optionalSfixed64": null,
-        "optionalFloat": null,
-        "optionalDouble": null,
-        "optionalBool": null,
-        "optionalString": null,
-        "optionalBytes": null,
-        "optionalNestedEnum": null,
-        "optionalNestedMessage": null,
-        "repeatedInt32": null,
-        "repeatedInt64": null,
-        "repeatedUint32": null,
-        "repeatedUint64": null,
-        "repeatedSint32": null,
-        "repeatedSint64": null,
-        "repeatedFixed32": null,
-        "repeatedFixed64": null,
-        "repeatedSfixed32": null,
-        "repeatedSfixed64": null,
-        "repeatedFloat": null,
-        "repeatedDouble": null,
-        "repeatedBool": null,
-        "repeatedString": null,
-        "repeatedBytes": null,
-        "repeatedNestedEnum": null,
-        "repeatedNestedMessage": null,
-        "mapInt32Int32": null,
-        "mapBoolBool": null,
-        "mapStringNestedMessage": null
-      })",
-      "");
-
-  // Repeated field elements cannot be null.
-  ExpectParseFailureForJson(
-      "RepeatedFieldPrimitiveElementIsNull", RECOMMENDED,
-      R"({"repeatedInt32": [1, null, 2]})");
-  ExpectParseFailureForJson(
-      "RepeatedFieldMessageElementIsNull", RECOMMENDED,
-      R"({"repeatedNestedMessage": [{"a":1}, null, {"a":2}]})");
-  // Map field keys cannot be null.
-  ExpectParseFailureForJson(
-      "MapFieldKeyIsNull", RECOMMENDED,
-      R"({"mapInt32Int32": {null: 1}})");
-  // Map field values cannot be null.
-  ExpectParseFailureForJson(
-      "MapFieldValueIsNull", RECOMMENDED,
-      R"({"mapInt32Int32": {"0": null}})");
-}
-
-void BinaryAndJsonConformanceSuite::RunJsonTestsForWrapperTypes() {
-  RunValidJsonTest("OptionalBoolWrapper", REQUIRED,
-                   R"({"optionalBoolWrapper": false})",
-                   "optional_bool_wrapper: {value: false}");
-  RunValidJsonTest(
-      "OptionalInt32Wrapper", REQUIRED,
-      R"({"optionalInt32Wrapper": 0})",
-      "optional_int32_wrapper: {value: 0}");
-  RunValidJsonTest(
-      "OptionalUint32Wrapper", REQUIRED,
-      R"({"optionalUint32Wrapper": 0})",
-      "optional_uint32_wrapper: {value: 0}");
-  RunValidJsonTest(
-      "OptionalInt64Wrapper", REQUIRED,
-      R"({"optionalInt64Wrapper": 0})",
-      "optional_int64_wrapper: {value: 0}");
-  RunValidJsonTest(
-      "OptionalUint64Wrapper", REQUIRED,
-      R"({"optionalUint64Wrapper": 0})",
-      "optional_uint64_wrapper: {value: 0}");
-  RunValidJsonTest(
-      "OptionalFloatWrapper", REQUIRED,
-      R"({"optionalFloatWrapper": 0})",
-      "optional_float_wrapper: {value: 0}");
-  RunValidJsonTest(
-      "OptionalDoubleWrapper", REQUIRED,
-      R"({"optionalDoubleWrapper": 0})",
-      "optional_double_wrapper: {value: 0}");
-  RunValidJsonTest(
-      "OptionalStringWrapper", REQUIRED,
-      R"({"optionalStringWrapper": ""})",
-      R"(optional_string_wrapper: {value: ""})");
-  RunValidJsonTest(
-      "OptionalBytesWrapper", REQUIRED,
-      R"({"optionalBytesWrapper": ""})",
-      R"(optional_bytes_wrapper: {value: ""})");
-  RunValidJsonTest(
-      "OptionalWrapperTypesWithNonDefaultValue", REQUIRED,
-      R"({
-        "optionalBoolWrapper": true,
-        "optionalInt32Wrapper": 1,
-        "optionalUint32Wrapper": 1,
-        "optionalInt64Wrapper": "1",
-        "optionalUint64Wrapper": "1",
-        "optionalFloatWrapper": 1,
-        "optionalDoubleWrapper": 1,
-        "optionalStringWrapper": "1",
-        "optionalBytesWrapper": "AQI="
-      })",
-      R"(
-        optional_bool_wrapper: {value: true}
-        optional_int32_wrapper: {value: 1}
-        optional_uint32_wrapper: {value: 1}
-        optional_int64_wrapper: {value: 1}
-        optional_uint64_wrapper: {value: 1}
-        optional_float_wrapper: {value: 1}
-        optional_double_wrapper: {value: 1}
-        optional_string_wrapper: {value: "1"}
-        optional_bytes_wrapper: {value: "\x01\x02"}
-      )");
-  RunValidJsonTest(
-      "RepeatedBoolWrapper", REQUIRED,
-      R"({"repeatedBoolWrapper": [true, false]})",
-      "repeated_bool_wrapper: {value: true}"
-      "repeated_bool_wrapper: {value: false}");
-  RunValidJsonTest(
-      "RepeatedInt32Wrapper", REQUIRED,
-      R"({"repeatedInt32Wrapper": [0, 1]})",
-      "repeated_int32_wrapper: {value: 0}"
-      "repeated_int32_wrapper: {value: 1}");
-  RunValidJsonTest(
-      "RepeatedUint32Wrapper", REQUIRED,
-      R"({"repeatedUint32Wrapper": [0, 1]})",
-      "repeated_uint32_wrapper: {value: 0}"
-      "repeated_uint32_wrapper: {value: 1}");
-  RunValidJsonTest(
-      "RepeatedInt64Wrapper", REQUIRED,
-      R"({"repeatedInt64Wrapper": [0, 1]})",
-      "repeated_int64_wrapper: {value: 0}"
-      "repeated_int64_wrapper: {value: 1}");
-  RunValidJsonTest(
-      "RepeatedUint64Wrapper", REQUIRED,
-      R"({"repeatedUint64Wrapper": [0, 1]})",
-      "repeated_uint64_wrapper: {value: 0}"
-      "repeated_uint64_wrapper: {value: 1}");
-  RunValidJsonTest(
-      "RepeatedFloatWrapper", REQUIRED,
-      R"({"repeatedFloatWrapper": [0, 1]})",
-      "repeated_float_wrapper: {value: 0}"
-      "repeated_float_wrapper: {value: 1}");
-  RunValidJsonTest(
-      "RepeatedDoubleWrapper", REQUIRED,
-      R"({"repeatedDoubleWrapper": [0, 1]})",
-      "repeated_double_wrapper: {value: 0}"
-      "repeated_double_wrapper: {value: 1}");
-  RunValidJsonTest(
-      "RepeatedStringWrapper", REQUIRED,
-      R"({"repeatedStringWrapper": ["", "AQI="]})",
-      R"(
-        repeated_string_wrapper: {value: ""}
-        repeated_string_wrapper: {value: "AQI="}
-      )");
-  RunValidJsonTest(
-      "RepeatedBytesWrapper", REQUIRED,
-      R"({"repeatedBytesWrapper": ["", "AQI="]})",
-      R"(
-        repeated_bytes_wrapper: {value: ""}
-        repeated_bytes_wrapper: {value: "\x01\x02"}
-      )");
-  RunValidJsonTest(
-      "WrapperTypesWithNullValue", REQUIRED,
-      R"({
-        "optionalBoolWrapper": null,
-        "optionalInt32Wrapper": null,
-        "optionalUint32Wrapper": null,
-        "optionalInt64Wrapper": null,
-        "optionalUint64Wrapper": null,
-        "optionalFloatWrapper": null,
-        "optionalDoubleWrapper": null,
-        "optionalStringWrapper": null,
-        "optionalBytesWrapper": null,
-        "repeatedBoolWrapper": null,
-        "repeatedInt32Wrapper": null,
-        "repeatedUint32Wrapper": null,
-        "repeatedInt64Wrapper": null,
-        "repeatedUint64Wrapper": null,
-        "repeatedFloatWrapper": null,
-        "repeatedDoubleWrapper": null,
-        "repeatedStringWrapper": null,
-        "repeatedBytesWrapper": null
-      })",
-      "");
-
-  // Duration
-  RunValidJsonTest(
-      "DurationMinValue", REQUIRED,
-      R"({"optionalDuration": "-315576000000.999999999s"})",
-      "optional_duration: {seconds: -315576000000 nanos: -999999999}");
-  RunValidJsonTest(
-      "DurationMaxValue", REQUIRED,
-      R"({"optionalDuration": "315576000000.999999999s"})",
-      "optional_duration: {seconds: 315576000000 nanos: 999999999}");
-  RunValidJsonTest(
-      "DurationRepeatedValue", REQUIRED,
-      R"({"repeatedDuration": ["1.5s", "-1.5s"]})",
-      "repeated_duration: {seconds: 1 nanos: 500000000}"
-      "repeated_duration: {seconds: -1 nanos: -500000000}");
-  RunValidJsonTest(
-      "DurationNull", REQUIRED,
-      R"({"optionalDuration": null})",
-      "");
-
-  ExpectParseFailureForJson(
-      "DurationMissingS", REQUIRED,
-      R"({"optionalDuration": "1"})");
-  ExpectParseFailureForJson(
-      "DurationJsonInputTooSmall", REQUIRED,
-      R"({"optionalDuration": "-315576000001.000000000s"})");
-  ExpectParseFailureForJson(
-      "DurationJsonInputTooLarge", REQUIRED,
-      R"({"optionalDuration": "315576000001.000000000s"})");
-  ExpectSerializeFailureForJson(
-      "DurationProtoInputTooSmall", REQUIRED,
-      "optional_duration: {seconds: -315576000001 nanos: 0}");
-  ExpectSerializeFailureForJson(
-      "DurationProtoInputTooLarge", REQUIRED,
-      "optional_duration: {seconds: 315576000001 nanos: 0}");
-
-  RunValidJsonTestWithValidator(
-      "DurationHasZeroFractionalDigit", RECOMMENDED,
-      R"({"optionalDuration": "1.000000000s"})",
-      [](const Json::Value& value) {
-        return value["optionalDuration"].asString() == "1s";
-      },
-      true);
-  RunValidJsonTestWithValidator(
-      "DurationHas3FractionalDigits", RECOMMENDED,
-      R"({"optionalDuration": "1.010000000s"})",
-      [](const Json::Value& value) {
-        return value["optionalDuration"].asString() == "1.010s";
-      },
-      true);
-  RunValidJsonTestWithValidator(
-      "DurationHas6FractionalDigits", RECOMMENDED,
-      R"({"optionalDuration": "1.000010000s"})",
-      [](const Json::Value& value) {
-        return value["optionalDuration"].asString() == "1.000010s";
-      },
-      true);
-  RunValidJsonTestWithValidator(
-      "DurationHas9FractionalDigits", RECOMMENDED,
-      R"({"optionalDuration": "1.000000010s"})",
-      [](const Json::Value& value) {
-        return value["optionalDuration"].asString() == "1.000000010s";
-      },
-      true);
-
-  // Timestamp
-  RunValidJsonTest(
-      "TimestampMinValue", REQUIRED,
-      R"({"optionalTimestamp": "0001-01-01T00:00:00Z"})",
-      "optional_timestamp: {seconds: -62135596800}");
-  RunValidJsonTest(
-      "TimestampMaxValue", REQUIRED,
-      R"({"optionalTimestamp": "9999-12-31T23:59:59.999999999Z"})",
-      "optional_timestamp: {seconds: 253402300799 nanos: 999999999}");
-  RunValidJsonTest(
-      "TimestampRepeatedValue", REQUIRED,
-      R"({
-        "repeatedTimestamp": [
-          "0001-01-01T00:00:00Z",
-          "9999-12-31T23:59:59.999999999Z"
-        ]
-      })",
-      "repeated_timestamp: {seconds: -62135596800}"
-      "repeated_timestamp: {seconds: 253402300799 nanos: 999999999}");
-  RunValidJsonTest("TimestampLeap", REQUIRED,
-                   R"({"optionalTimestamp": "1993-02-10T00:00:00.000Z"})",
-                   "optional_timestamp: {seconds: 729302400}");
-  RunValidJsonTest("TimestampWithPositiveOffset", REQUIRED,
-                   R"({"optionalTimestamp": "1970-01-01T08:00:01+08:00"})",
-                   "optional_timestamp: {seconds: 1}");
-  RunValidJsonTest("TimestampWithNegativeOffset", REQUIRED,
-                   R"({"optionalTimestamp": "1969-12-31T16:00:01-08:00"})",
-                   "optional_timestamp: {seconds: 1}");
-  RunValidJsonTest(
-      "TimestampNull", REQUIRED,
-      R"({"optionalTimestamp": null})",
-      "");
-
-  ExpectParseFailureForJson(
-      "TimestampJsonInputTooSmall", REQUIRED,
-      R"({"optionalTimestamp": "0000-01-01T00:00:00Z"})");
-  ExpectParseFailureForJson(
-      "TimestampJsonInputTooLarge", REQUIRED,
-      R"({"optionalTimestamp": "10000-01-01T00:00:00Z"})");
-  ExpectParseFailureForJson(
-      "TimestampJsonInputMissingZ", REQUIRED,
-      R"({"optionalTimestamp": "0001-01-01T00:00:00"})");
-  ExpectParseFailureForJson(
-      "TimestampJsonInputMissingT", REQUIRED,
-      R"({"optionalTimestamp": "0001-01-01 00:00:00Z"})");
-  ExpectParseFailureForJson(
-      "TimestampJsonInputLowercaseZ", REQUIRED,
-      R"({"optionalTimestamp": "0001-01-01T00:00:00z"})");
-  ExpectParseFailureForJson(
-      "TimestampJsonInputLowercaseT", REQUIRED,
-      R"({"optionalTimestamp": "0001-01-01t00:00:00Z"})");
-  ExpectSerializeFailureForJson(
-      "TimestampProtoInputTooSmall", REQUIRED,
-      "optional_timestamp: {seconds: -62135596801}");
-  ExpectSerializeFailureForJson(
-      "TimestampProtoInputTooLarge", REQUIRED,
-      "optional_timestamp: {seconds: 253402300800}");
-  RunValidJsonTestWithValidator(
-      "TimestampZeroNormalized", RECOMMENDED,
-      R"({"optionalTimestamp": "1969-12-31T16:00:00-08:00"})",
-      [](const Json::Value& value) {
-        return value["optionalTimestamp"].asString() == "1970-01-01T00:00:00Z";
-      },
-      true);
-  RunValidJsonTestWithValidator(
-      "TimestampHasZeroFractionalDigit", RECOMMENDED,
-      R"({"optionalTimestamp": "1970-01-01T00:00:00.000000000Z"})",
-      [](const Json::Value& value) {
-        return value["optionalTimestamp"].asString() == "1970-01-01T00:00:00Z";
-      },
-      true);
-  RunValidJsonTestWithValidator(
-      "TimestampHas3FractionalDigits", RECOMMENDED,
-      R"({"optionalTimestamp": "1970-01-01T00:00:00.010000000Z"})",
-      [](const Json::Value& value) {
-        return value["optionalTimestamp"].asString() ==
-               "1970-01-01T00:00:00.010Z";
-      },
-      true);
-  RunValidJsonTestWithValidator(
-      "TimestampHas6FractionalDigits", RECOMMENDED,
-      R"({"optionalTimestamp": "1970-01-01T00:00:00.000010000Z"})",
-      [](const Json::Value& value) {
-        return value["optionalTimestamp"].asString() ==
-               "1970-01-01T00:00:00.000010Z";
-      },
-      true);
-  RunValidJsonTestWithValidator(
-      "TimestampHas9FractionalDigits", RECOMMENDED,
-      R"({"optionalTimestamp": "1970-01-01T00:00:00.000000010Z"})",
-      [](const Json::Value& value) {
-        return value["optionalTimestamp"].asString() ==
-               "1970-01-01T00:00:00.000000010Z";
-      },
-      true);
-}
-
-void BinaryAndJsonConformanceSuite::RunJsonTestsForFieldMask() {
-  RunValidJsonTest(
-      "FieldMask", REQUIRED,
-      R"({"optionalFieldMask": "foo,barBaz"})",
-      R"(optional_field_mask: {paths: "foo" paths: "bar_baz"})");
-  RunValidJsonTest(
-      "EmptyFieldMask", REQUIRED,
-      R"({"optionalFieldMask": ""})",
-      R"(optional_field_mask: {})");
-  ExpectParseFailureForJson(
-      "FieldMaskInvalidCharacter", RECOMMENDED,
-      R"({"optionalFieldMask": "foo,bar_bar"})");
-  ExpectSerializeFailureForJson(
-      "FieldMaskPathsDontRoundTrip", RECOMMENDED,
-      R"(optional_field_mask: {paths: "fooBar"})");
-  ExpectSerializeFailureForJson(
-      "FieldMaskNumbersDontRoundTrip", RECOMMENDED,
-      R"(optional_field_mask: {paths: "foo_3_bar"})");
-  ExpectSerializeFailureForJson(
-      "FieldMaskTooManyUnderscore", RECOMMENDED,
-      R"(optional_field_mask: {paths: "foo__bar"})");
-}
-
-void BinaryAndJsonConformanceSuite::RunJsonTestsForStruct() {
-  RunValidJsonTest(
-      "Struct", REQUIRED,
-      R"({
-        "optionalStruct": {
-          "nullValue": null,
-          "intValue": 1234,
-          "boolValue": true,
-          "doubleValue": 1234.5678,
-          "stringValue": "Hello world!",
-          "listValue": [1234, "5678"],
-          "objectValue": {
-            "value": 0
-          }
-        }
-      })",
-      R"(
-        optional_struct: {
-          fields: {
-            key: "nullValue"
-            value: {null_value: NULL_VALUE}
-          }
-          fields: {
-            key: "intValue"
-            value: {number_value: 1234}
-          }
-          fields: {
-            key: "boolValue"
-            value: {bool_value: true}
-          }
-          fields: {
-            key: "doubleValue"
-            value: {number_value: 1234.5678}
-          }
-          fields: {
-            key: "stringValue"
-            value: {string_value: "Hello world!"}
-          }
-          fields: {
-            key: "listValue"
-            value: {
-              list_value: {
-                values: {
-                  number_value: 1234
-                }
-                values: {
-                  string_value: "5678"
-                }
-              }
-            }
-          }
-          fields: {
-            key: "objectValue"
-            value: {
-              struct_value: {
-                fields: {
-                  key: "value"
-                  value: {
-                    number_value: 0
-                  }
-                }
-              }
-            }
-          }
-        }
-      )");
-  RunValidJsonTest(
-      "StructWithEmptyListValue", REQUIRED,
-      R"({
-        "optionalStruct": {
-          "listValue": []
-        }
-      })",
-      R"(
-        optional_struct: {
-          fields: {
-            key: "listValue"
-            value: {
-              list_value: {
-              }
-            }
-          }
-        }
-      )");
-}
-
-void BinaryAndJsonConformanceSuite::RunJsonTestsForValue() {
-  RunValidJsonTest(
-      "ValueAcceptInteger", REQUIRED,
-      R"({"optionalValue": 1})",
-      "optional_value: { number_value: 1}");
-  RunValidJsonTest(
-      "ValueAcceptFloat", REQUIRED,
-      R"({"optionalValue": 1.5})",
-      "optional_value: { number_value: 1.5}");
-  RunValidJsonTest(
-      "ValueAcceptBool", REQUIRED,
-      R"({"optionalValue": false})",
-      "optional_value: { bool_value: false}");
-  RunValidJsonTest(
-      "ValueAcceptNull", REQUIRED,
-      R"({"optionalValue": null})",
-      "optional_value: { null_value: NULL_VALUE}");
-  RunValidJsonTest(
-      "ValueAcceptString", REQUIRED,
-      R"({"optionalValue": "hello"})",
-      R"(optional_value: { string_value: "hello"})");
-  RunValidJsonTest(
-      "ValueAcceptList", REQUIRED,
-      R"({"optionalValue": [0, "hello"]})",
-      R"(
-        optional_value: {
-          list_value: {
-            values: {
-              number_value: 0
-            }
-            values: {
-              string_value: "hello"
-            }
-          }
-        }
-      )");
-  RunValidJsonTest(
-      "ValueAcceptObject", REQUIRED,
-      R"({"optionalValue": {"value": 1}})",
-      R"(
-        optional_value: {
-          struct_value: {
-            fields: {
-              key: "value"
-              value: {
-                number_value: 1
-              }
-            }
-          }
-        }
-      )");
-  RunValidJsonTest(
-      "RepeatedValue", REQUIRED,
-      R"({
-        "repeatedValue": [["a"]]
-      })",
-      R"(
-        repeated_value: [
-          {
-            list_value: {
-              values: [
-                { string_value: "a"}
-              ]
-            }
-          }
-        ]
-      )");
-  RunValidJsonTest(
-      "RepeatedListValue", REQUIRED,
-      R"({
-        "repeatedListValue": [["a"]]
-      })",
-      R"(
-        repeated_list_value: [
-          {
-            values: [
-              { string_value: "a"}
-            ]
-          }
-        ]
-      )");
-  RunValidJsonTestWithValidator(
-      "NullValueInOtherOneofOldFormat", RECOMMENDED,
-      R"({"oneofNullValue": "NULL_VALUE"})",
-      [](const Json::Value& value) {
-        return (value.isMember("oneofNullValue") &&
-                value["oneofNullValue"].isNull());
-      },
-      true);
-  RunValidJsonTestWithValidator(
-      "NullValueInOtherOneofNewFormat", RECOMMENDED,
-      R"({"oneofNullValue": null})",
-      [](const Json::Value& value) {
-        return (value.isMember("oneofNullValue") &&
-                value["oneofNullValue"].isNull());
-      },
-      true);
-  RunValidJsonTestWithValidator(
-      "NullValueInNormalMessage", RECOMMENDED,
-      R"({"optionalNullValue": null})",
-      [](const Json::Value& value) {
-        return value.empty();
-      },
-      true);
-}
-
-void BinaryAndJsonConformanceSuite::RunJsonTestsForAny() {
-  RunValidJsonTest(
-      "Any", REQUIRED,
-      R"({
-        "optionalAny": {
-          "@type": "type.googleapis.com/protobuf_test_messages.proto3.TestAllTypesProto3",
-          "optionalInt32": 12345
-        }
-      })",
-      R"(
-        optional_any: {
-          [type.googleapis.com/protobuf_test_messages.proto3.TestAllTypesProto3] {
-            optional_int32: 12345
-          }
-        }
-      )");
-  RunValidJsonTest(
-      "AnyNested", REQUIRED,
-      R"({
-        "optionalAny": {
-          "@type": "type.googleapis.com/google.protobuf.Any",
-          "value": {
-            "@type": "type.googleapis.com/protobuf_test_messages.proto3.TestAllTypesProto3",
-            "optionalInt32": 12345
-          }
-        }
-      })",
-      R"(
-        optional_any: {
-          [type.googleapis.com/google.protobuf.Any] {
-            [type.googleapis.com/protobuf_test_messages.proto3.TestAllTypesProto3] {
-              optional_int32: 12345
-            }
-          }
-        }
-      )");
-  // The special "@type" tag is not required to appear first.
-  RunValidJsonTest(
-      "AnyUnorderedTypeTag", REQUIRED,
-      R"({
-        "optionalAny": {
-          "optionalInt32": 12345,
-          "@type": "type.googleapis.com/protobuf_test_messages.proto3.TestAllTypesProto3"
-        }
-      })",
-      R"(
-        optional_any: {
-          [type.googleapis.com/protobuf_test_messages.proto3.TestAllTypesProto3] {
-            optional_int32: 12345
-          }
-        }
-      )");
-  // Well-known types in Any.
-  RunValidJsonTest(
-      "AnyWithInt32ValueWrapper", REQUIRED,
-      R"({
-        "optionalAny": {
-          "@type": "type.googleapis.com/google.protobuf.Int32Value",
-          "value": 12345
-        }
-      })",
-      R"(
-        optional_any: {
-          [type.googleapis.com/google.protobuf.Int32Value] {
-            value: 12345
-          }
-        }
-      )");
-  RunValidJsonTest(
-      "AnyWithDuration", REQUIRED,
-      R"({
-        "optionalAny": {
-          "@type": "type.googleapis.com/google.protobuf.Duration",
-          "value": "1.5s"
-        }
-      })",
-      R"(
-        optional_any: {
-          [type.googleapis.com/google.protobuf.Duration] {
-            seconds: 1
-            nanos: 500000000
-          }
-        }
-      )");
-  RunValidJsonTest(
-      "AnyWithTimestamp", REQUIRED,
-      R"({
-        "optionalAny": {
-          "@type": "type.googleapis.com/google.protobuf.Timestamp",
-          "value": "1970-01-01T00:00:00Z"
-        }
-      })",
-      R"(
-        optional_any: {
-          [type.googleapis.com/google.protobuf.Timestamp] {
-            seconds: 0
-            nanos: 0
-          }
-        }
-      )");
-  RunValidJsonTest(
-      "AnyWithFieldMask", REQUIRED,
-      R"({
-        "optionalAny": {
-          "@type": "type.googleapis.com/google.protobuf.FieldMask",
-          "value": "foo,barBaz"
-        }
-      })",
-      R"(
-        optional_any: {
-          [type.googleapis.com/google.protobuf.FieldMask] {
-            paths: ["foo", "bar_baz"]
-          }
-        }
-      )");
-  RunValidJsonTest(
-      "AnyWithStruct", REQUIRED,
-      R"({
-        "optionalAny": {
-          "@type": "type.googleapis.com/google.protobuf.Struct",
-          "value": {
-            "foo": 1
-          }
-        }
-      })",
-      R"(
-        optional_any: {
-          [type.googleapis.com/google.protobuf.Struct] {
-            fields: {
-              key: "foo"
-              value: {
-                number_value: 1
-              }
-            }
-          }
-        }
-      )");
-  RunValidJsonTest(
-      "AnyWithValueForJsonObject", REQUIRED,
-      R"({
-        "optionalAny": {
-          "@type": "type.googleapis.com/google.protobuf.Value",
-          "value": {
-            "foo": 1
-          }
-        }
-      })",
-      R"(
-        optional_any: {
-          [type.googleapis.com/google.protobuf.Value] {
-            struct_value: {
-              fields: {
-                key: "foo"
-                value: {
-                  number_value: 1
-                }
-              }
-            }
-          }
-        }
-      )");
-  RunValidJsonTest(
-      "AnyWithValueForInteger", REQUIRED,
-      R"({
-        "optionalAny": {
-          "@type": "type.googleapis.com/google.protobuf.Value",
-          "value": 1
-        }
-      })",
-      R"(
-        optional_any: {
-          [type.googleapis.com/google.protobuf.Value] {
-            number_value: 1
-          }
-        }
-      )");
-}
-
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/conformance/binary_json_conformance_suite.h b/libs/protobuf/conformance/binary_json_conformance_suite.h
deleted file mode 100644
index 280ff95..0000000
--- a/libs/protobuf/conformance/binary_json_conformance_suite.h
+++ /dev/null
@@ -1,141 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef CONFORMANCE_BINARY_JSON_CONFORMANCE_SUITE_H
-#define CONFORMANCE_BINARY_JSON_CONFORMANCE_SUITE_H
-
-#include "third_party/jsoncpp/json.h"
-#include "conformance_test.h"
-
-namespace google {
-namespace protobuf {
-
-class BinaryAndJsonConformanceSuite : public ConformanceTestSuite {
- public:
-  BinaryAndJsonConformanceSuite() {}
-
- private:
-  void RunSuiteImpl() override;
-  void RunJsonTests();
-  void RunJsonTestsForFieldNameConvention();
-  void RunJsonTestsForNonRepeatedTypes();
-  void RunJsonTestsForRepeatedTypes();
-  void RunJsonTestsForNullTypes();
-  void RunJsonTestsForWrapperTypes();
-  void RunJsonTestsForFieldMask();
-  void RunJsonTestsForStruct();
-  void RunJsonTestsForValue();
-  void RunJsonTestsForAny();
-  void RunValidJsonTest(const std::string& test_name, ConformanceLevel level,
-                        const std::string& input_json,
-                        const std::string& equivalent_text_format);
-  void RunValidJsonTestWithProtobufInput(
-      const std::string& test_name, ConformanceLevel level,
-      const protobuf_test_messages::proto3::TestAllTypesProto3& input,
-      const std::string& equivalent_text_format);
-  void RunValidJsonIgnoreUnknownTest(const std::string& test_name,
-                                     ConformanceLevel level,
-                                     const std::string& input_json,
-                                     const std::string& equivalent_text_format);
-  void RunValidProtobufTest(const std::string& test_name,
-                            ConformanceLevel level,
-                            const std::string& input_protobuf,
-                            const std::string& equivalent_text_format,
-                            bool is_proto3);
-  void RunValidBinaryProtobufTest(const std::string& test_name,
-                                  ConformanceLevel level,
-                                  const std::string& input_protobuf,
-                                  bool is_proto3);
-  void RunValidBinaryProtobufTest(const std::string& test_name,
-                                  ConformanceLevel level,
-                                  const std::string& input_protobuf,
-                                  const std::string& expected_protobuf,
-                                  bool is_proto3);
-  void RunValidProtobufTestWithMessage(
-      const std::string& test_name, ConformanceLevel level,
-      const Message* input, const std::string& equivalent_text_format,
-      bool is_proto3);
-
-  bool ParseJsonResponse(
-      const conformance::ConformanceResponse& response,
-      Message* test_message);
-  bool ParseResponse(
-      const conformance::ConformanceResponse& response,
-      const ConformanceRequestSetting& setting,
-      Message* test_message) override;
-
-  typedef std::function<bool(const Json::Value&)> Validator;
-  void RunValidJsonTestWithValidator(const std::string& test_name,
-                                     ConformanceLevel level,
-                                     const std::string& input_json,
-                                     const Validator& validator,
-                                     bool is_proto3);
-  void ExpectParseFailureForJson(const std::string& test_name,
-                                 ConformanceLevel level,
-                                 const std::string& input_json);
-  void ExpectSerializeFailureForJson(const std::string& test_name,
-                                     ConformanceLevel level,
-                                     const std::string& text_format);
-  void ExpectParseFailureForProtoWithProtoVersion(const std::string& proto,
-                                                  const std::string& test_name,
-                                                  ConformanceLevel level,
-                                                  bool is_proto3);
-  void ExpectParseFailureForProto(const std::string& proto,
-                                  const std::string& test_name,
-                                  ConformanceLevel level);
-  void ExpectHardParseFailureForProto(const std::string& proto,
-                                      const std::string& test_name,
-                                      ConformanceLevel level);
-  void TestPrematureEOFForType(google::protobuf::FieldDescriptor::Type type);
-  void TestIllegalTags();
-  template <class MessageType>
-  void TestOneofMessage (MessageType &message,
-                         bool is_proto3);
-  template <class MessageType>
-  void TestUnknownMessage (MessageType &message,
-                           bool is_proto3);
-  void TestValidDataForType(
-      google::protobuf::FieldDescriptor::Type,
-      std::vector<std::pair<std::string, std::string>> values);
-  void TestValidDataForRepeatedScalarMessage();
-  void TestValidDataForMapType(google::protobuf::FieldDescriptor::Type,
-                               google::protobuf::FieldDescriptor::Type);
-  void TestValidDataForOneofType(google::protobuf::FieldDescriptor::Type);
-  void TestMergeOneofMessage();
-  void TestOverwriteMessageValueMap();
-
-  std::unique_ptr<google::protobuf::util::TypeResolver> type_resolver_;
-  std::string type_url_;
-};
-
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // CONFORMANCE_BINARY_JSON_CONFORMANCE_SUITE_H
diff --git a/libs/protobuf/conformance/conformance.proto b/libs/protobuf/conformance/conformance.proto
deleted file mode 100644
index 7248e98..0000000
--- a/libs/protobuf/conformance/conformance.proto
+++ /dev/null
@@ -1,176 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto3";
-package conformance;
-option java_package = "com.google.protobuf.conformance";
-
-// This defines the conformance testing protocol.  This protocol exists between
-// the conformance test suite itself and the code being tested.  For each test,
-// the suite will send a ConformanceRequest message and expect a
-// ConformanceResponse message.
-//
-// You can either run the tests in two different ways:
-//
-//   1. in-process (using the interface in conformance_test.h).
-//
-//   2. as a sub-process communicating over a pipe.  Information about how to
-//      do this is in conformance_test_runner.cc.
-//
-// Pros/cons of the two approaches:
-//
-//   - running as a sub-process is much simpler for languages other than C/C++.
-//
-//   - running as a sub-process may be more tricky in unusual environments like
-//     iOS apps, where fork/stdin/stdout are not available.
-
-enum WireFormat {
-  UNSPECIFIED = 0;
-  PROTOBUF = 1;
-  JSON = 2;
-  JSPB = 3;  // Google internal only. Opensource testees just skip it.
-  TEXT_FORMAT = 4;
-}
-
-enum TestCategory {
-  UNSPECIFIED_TEST = 0;
-  BINARY_TEST = 1;  // Test binary wire format.
-  JSON_TEST = 2;    // Test json wire format.
-  // Similar to JSON_TEST. However, during parsing json, testee should ignore
-  // unknown fields. This feature is optional. Each implementation can decide
-  // whether to support it.  See
-  // https://developers.google.com/protocol-buffers/docs/proto3#json_options
-  // for more detail.
-  JSON_IGNORE_UNKNOWN_PARSING_TEST = 3;
-  // Test jspb wire format. Google internal only. Opensource testees just skip it.
-  JSPB_TEST = 4;
-  // Test text format. For cpp, java and python, testees can already deal with
-  // this type. Testees of other languages can simply skip it.
-  TEXT_FORMAT_TEST = 5;
-}
-
-// The conformance runner will request a list of failures as the first request.
-// This will be known by message_type == "conformance.FailureSet", a conformance
-// test should return a serialized FailureSet in protobuf_payload.
-message FailureSet {
-  repeated string failure = 1;
-}
-
-// Represents a single test case's input.  The testee should:
-//
-//   1. parse this proto (which should always succeed)
-//   2. parse the protobuf or JSON payload in "payload" (which may fail)
-//   3. if the parse succeeded, serialize the message in the requested format.
-message ConformanceRequest {
-  // The payload (whether protobuf of JSON) is always for a
-  // protobuf_test_messages.proto3.TestAllTypes proto (as defined in
-  // src/google/protobuf/proto3_test_messages.proto).
-  //
-  // TODO(haberman): if/when we expand the conformance tests to support proto2,
-  // we will want to include a field that lets the payload/response be a
-  // protobuf_test_messages.google.protobuf.TestAllTypes message instead.
-  oneof payload {
-    bytes protobuf_payload = 1;
-    string json_payload = 2;
-    // Google internal only.  Opensource testees just skip it.
-    string jspb_payload = 7;
-    string text_payload = 8;
-  }
-
-  // Which format should the testee serialize its message to?
-  WireFormat requested_output_format = 3;
-
-  // The full name for the test message to use; for the moment, either:
-  // protobuf_test_messages.proto3.TestAllTypesProto3 or
-  // protobuf_test_messages.google.protobuf.TestAllTypesProto2.
-  string message_type = 4;
-
-  // Each test is given a specific test category. Some category may need
-  // specific support in testee programs. Refer to the definition of TestCategory
-  // for more information.
-  TestCategory test_category = 5;
-
-  // Specify details for how to encode jspb.
-  JspbEncodingConfig jspb_encoding_options = 6;
-
-  // This can be used in json and text format. If true, testee should print
-  // unknown fields instead of ignore. This feature is optional.
-  bool print_unknown_fields = 9;
-}
-
-// Represents a single test case's output.
-message ConformanceResponse {
-  oneof result {
-    // This string should be set to indicate parsing failed.  The string can
-    // provide more information about the parse error if it is available.
-    //
-    // Setting this string does not necessarily mean the testee failed the
-    // test.  Some of the test cases are intentionally invalid input.
-    string parse_error = 1;
-
-    // If the input was successfully parsed but errors occurred when
-    // serializing it to the requested output format, set the error message in
-    // this field.
-    string serialize_error = 6;
-
-    // This should be set if some other error occurred.  This will always
-    // indicate that the test failed.  The string can provide more information
-    // about the failure.
-    string runtime_error = 2;
-
-    // If the input was successfully parsed and the requested output was
-    // protobuf, serialize it to protobuf and set it in this field.
-    bytes protobuf_payload = 3;
-
-    // If the input was successfully parsed and the requested output was JSON,
-    // serialize to JSON and set it in this field.
-    string json_payload = 4;
-
-    // For when the testee skipped the test, likely because a certain feature
-    // wasn't supported, like JSON input/output.
-    string skipped = 5;
-
-    // If the input was successfully parsed and the requested output was JSPB,
-    // serialize to JSPB and set it in this field. JSPB is google internal only
-    // format. Opensource testees can just skip it.
-    string jspb_payload = 7;
-
-    // If the input was successfully parsed and the requested output was
-    // TEXT_FORMAT, serialize to TEXT_FORMAT and set it in this field.
-    string text_payload = 8;
-  }
-}
-
-// Encoding options for jspb format.
-message JspbEncodingConfig {
-  // Encode the value field of Any as jspb array if true, otherwise binary.
-  bool use_jspb_array_any_format = 1;
-}
-
diff --git a/libs/protobuf/conformance/conformance_cpp.cc b/libs/protobuf/conformance/conformance_cpp.cc
deleted file mode 100644
index 5782789..0000000
--- a/libs/protobuf/conformance/conformance_cpp.cc
+++ /dev/null
@@ -1,268 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <errno.h>
-#include <stdarg.h>
-#include <unistd.h>
-
-#include <google/protobuf/message.h>
-#include <google/protobuf/text_format.h>
-#include <google/protobuf/util/json_util.h>
-#include <google/protobuf/util/type_resolver_util.h>
-#include <google/protobuf/stubs/status.h>
-#include "conformance.pb.h"
-#include <google/protobuf/test_messages_proto2.pb.h>
-#include <google/protobuf/test_messages_proto3.pb.h>
-#include <google/protobuf/stubs/status.h>
-
-using conformance::ConformanceRequest;
-using conformance::ConformanceResponse;
-using google::protobuf::Descriptor;
-using google::protobuf::DescriptorPool;
-using google::protobuf::Message;
-using google::protobuf::MessageFactory;
-using google::protobuf::TextFormat;
-using google::protobuf::util::BinaryToJsonString;
-using google::protobuf::util::JsonParseOptions;
-using google::protobuf::util::JsonToBinaryString;
-using google::protobuf::util::NewTypeResolverForDescriptorPool;
-using google::protobuf::util::TypeResolver;
-using protobuf_test_messages::proto3::TestAllTypesProto3;
-using protobuf_test_messages::proto2::TestAllTypesProto2;
-using std::string;
-
-static const char kTypeUrlPrefix[] = "type.googleapis.com";
-
-const char* kFailures[] = {
-};
-
-static string GetTypeUrl(const Descriptor* message) {
-  return string(kTypeUrlPrefix) + "/" + message->full_name();
-}
-
-int test_count = 0;
-bool verbose = false;
-TypeResolver* type_resolver;
-string* type_url;
-
-namespace google {
-namespace protobuf {
-
-using util::Status;
-
-bool CheckedRead(int fd, void *buf, size_t len) {
-  size_t ofs = 0;
-  while (len > 0) {
-    ssize_t bytes_read = read(fd, (char*)buf + ofs, len);
-
-    if (bytes_read == 0) return false;
-
-    if (bytes_read < 0) {
-      GOOGLE_LOG(FATAL) << "Error reading from test runner: " << strerror(errno);
-    }
-
-    len -= bytes_read;
-    ofs += bytes_read;
-  }
-
-  return true;
-}
-
-void CheckedWrite(int fd, const void *buf, size_t len) {
-  if (write(fd, buf, len) != len) {
-    GOOGLE_LOG(FATAL) << "Error writing to test runner: " << strerror(errno);
-  }
-}
-
-void DoTest(const ConformanceRequest& request, ConformanceResponse* response) {
-  Message *test_message;
-  google::protobuf::LinkMessageReflection<TestAllTypesProto2>();
-  google::protobuf::LinkMessageReflection<TestAllTypesProto3>();
-  const Descriptor *descriptor = DescriptorPool::generated_pool()->FindMessageTypeByName(
-      request.message_type());
-  if (!descriptor) {
-    GOOGLE_LOG(FATAL) << "No such message type: " << request.message_type();
-  }
-  test_message = MessageFactory::generated_factory()->GetPrototype(descriptor)->New();
-
-  switch (request.payload_case()) {
-    case ConformanceRequest::kProtobufPayload: {
-      if (!test_message->ParseFromString(request.protobuf_payload())) {
-        // Getting parse details would involve something like:
-        //   http://stackoverflow.com/questions/22121922/how-can-i-get-more-details-about-errors-generated-during-protobuf-parsing-c
-        response->set_parse_error("Parse error (no more details available).");
-        return;
-      }
-      break;
-    }
-
-    case ConformanceRequest::kJsonPayload: {
-      string proto_binary;
-      JsonParseOptions options;
-      options.ignore_unknown_fields =
-          (request.test_category() ==
-              conformance::JSON_IGNORE_UNKNOWN_PARSING_TEST);
-      util::Status status =
-          JsonToBinaryString(type_resolver, *type_url, request.json_payload(),
-                             &proto_binary, options);
-      if (!status.ok()) {
-        response->set_parse_error(string("Parse error: ") +
-                                  std::string(status.message()));
-        return;
-      }
-
-      if (!test_message->ParseFromString(proto_binary)) {
-        response->set_runtime_error(
-            "Parsing JSON generates invalid proto output.");
-        return;
-      }
-      break;
-    }
-
-    case ConformanceRequest::kTextPayload: {
-      if (!TextFormat::ParseFromString(request.text_payload(), test_message)) {
-        response->set_parse_error("Parse error");
-        return;
-      }
-      break;
-    }
-
-    case ConformanceRequest::PAYLOAD_NOT_SET:
-      GOOGLE_LOG(FATAL) << "Request didn't have payload.";
-      break;
-
-    default:
-      GOOGLE_LOG(FATAL) << "unknown payload type: " << request.payload_case();
-      break;
-  }
-
-  conformance::FailureSet failures;
-  if (descriptor == failures.GetDescriptor()) {
-    for (const char* s : kFailures) failures.add_failure(s);
-    test_message = &failures;
-  }
-
-  switch (request.requested_output_format()) {
-    case conformance::UNSPECIFIED:
-      GOOGLE_LOG(FATAL) << "Unspecified output format";
-      break;
-
-    case conformance::PROTOBUF: {
-      GOOGLE_CHECK(test_message->SerializeToString(
-          response->mutable_protobuf_payload()));
-      break;
-    }
-
-    case conformance::JSON: {
-      string proto_binary;
-      GOOGLE_CHECK(test_message->SerializeToString(&proto_binary));
-      util::Status status =
-          BinaryToJsonString(type_resolver, *type_url, proto_binary,
-                             response->mutable_json_payload());
-      if (!status.ok()) {
-        response->set_serialize_error(
-            string("Failed to serialize JSON output: ") +
-            std::string(status.message()));
-        return;
-      }
-      break;
-    }
-
-    case conformance::TEXT_FORMAT: {
-      TextFormat::Printer printer;
-      printer.SetHideUnknownFields(!request.print_unknown_fields());
-      GOOGLE_CHECK(printer.PrintToString(*test_message,
-                                  response->mutable_text_payload()));
-      break;
-    }
-
-    default:
-      GOOGLE_LOG(FATAL) << "Unknown output format: "
-                 << request.requested_output_format();
-  }
-}
-
-bool DoTestIo() {
-  string serialized_input;
-  string serialized_output;
-  ConformanceRequest request;
-  ConformanceResponse response;
-  uint32_t bytes;
-
-  if (!CheckedRead(STDIN_FILENO, &bytes, sizeof(uint32_t))) {
-    // EOF.
-    return false;
-  }
-
-  serialized_input.resize(bytes);
-
-  if (!CheckedRead(STDIN_FILENO, (char*)serialized_input.c_str(), bytes)) {
-    GOOGLE_LOG(ERROR) << "Unexpected EOF on stdin. " << strerror(errno);
-  }
-
-  if (!request.ParseFromString(serialized_input)) {
-    GOOGLE_LOG(FATAL) << "Parse of ConformanceRequest proto failed.";
-    return false;
-  }
-
-  DoTest(request, &response);
-
-  response.SerializeToString(&serialized_output);
-
-  bytes = serialized_output.size();
-  CheckedWrite(STDOUT_FILENO, &bytes, sizeof(uint32_t));
-  CheckedWrite(STDOUT_FILENO, serialized_output.c_str(), bytes);
-
-  if (verbose) {
-    fprintf(stderr, "conformance-cpp: request=%s, response=%s\n",
-            request.ShortDebugString().c_str(),
-            response.ShortDebugString().c_str());
-  }
-
-  test_count++;
-
-  return true;
-}
-
-}  // namespace protobuf
-}  // namespace google
-
-int main() {
-  type_resolver = NewTypeResolverForDescriptorPool(
-      kTypeUrlPrefix, DescriptorPool::generated_pool());
-  type_url = new string(GetTypeUrl(TestAllTypesProto3::descriptor()));
-  while (1) {
-    if (!google::protobuf::DoTestIo()) {
-      fprintf(stderr, "conformance-cpp: received EOF from test runner "
-                      "after %d tests, exiting\n", test_count);
-      return 0;
-    }
-  }
-}
diff --git a/libs/protobuf/conformance/conformance_nodejs.js b/libs/protobuf/conformance/conformance_nodejs.js
deleted file mode 100755
index 275fac4..0000000
--- a/libs/protobuf/conformance/conformance_nodejs.js
+++ /dev/null
@@ -1,189 +0,0 @@
-#!/usr/bin/env node
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-var conformance = require('conformance_pb');
-var test_messages_proto3 = require('google/protobuf/test_messages_proto3_pb');
-var test_messages_proto2 = require('google/protobuf/test_messages_proto2_pb');
-var fs = require('fs');
-
-var testCount = 0;
-
-function doTest(request) {
-  var testMessage;
-  var response = new conformance.ConformanceResponse();
-
-  try {
-    if (request.getRequestedOutputFormat() == conformance.WireFormat.JSON) {
-      response.setSkipped("JSON not supported.");
-      return response;
-    }
-
-    if (request.getRequestedOutputFormat() ==
-        conformance.WireFormat.TEXT_FORMAT) {
-      response.setSkipped('Text format is not supported as output format.');
-      return response;
-    }
-
-    switch (request.getPayloadCase()) {
-      case conformance.ConformanceRequest.PayloadCase.PROTOBUF_PAYLOAD: {
-        if (request.getMessageType() == "protobuf_test_messages.proto3.TestAllTypesProto3") {
-          try {
-            testMessage = test_messages_proto3.TestAllTypesProto3.deserializeBinary(
-                request.getProtobufPayload());
-          } catch (err) {
-            response.setParseError(err.toString());
-            return response;
-          }
-        } else if (request.getMessageType() == "protobuf_test_messages.proto2.TestAllTypesProto2"){
-          try {
-            testMessage = test_messages_proto2.TestAllTypesProto2.deserializeBinary(
-                request.getProtobufPayload());
-          } catch (err) {
-            response.setParseError(err.toString());
-            return response;
-          }
-        } else {
-          throw "Protobuf request doesn\'t have specific payload type";
-        }
-      } break;
-
-      case conformance.ConformanceRequest.PayloadCase.JSON_PAYLOAD:
-        response.setSkipped("JSON not supported.");
-        return response;
-
-	  case conformance.ConformanceRequest.PayloadCase.TEXT_PAYLOAD:
-	    response.setSkipped("Text format not supported.");
-        return response;
-		
-      case conformance.ConformanceRequest.PayloadCase.PAYLOAD_NOT_SET:
-        response.setRuntimeError("Request didn't have payload");
-        return response;
-    }
-
-    switch (request.getRequestedOutputFormat()) {
-      case conformance.WireFormat.UNSPECIFIED:
-        response.setRuntimeError("Unspecified output format");
-        return response;
-
-      case conformance.WireFormat.PROTOBUF:
-        response.setProtobufPayload(testMessage.serializeBinary());
-
-      case conformance.WireFormat.JSON:
-        response.setSkipped("JSON not supported.");
-        return response;
-
-      default:
-        throw "Request didn't have requested output format";
-    }
-  } catch (err) {
-    response.setRuntimeError(err.toString());
-  }
-
-  return response;
-}
-
-function onEof(totalRead) {
-  if (totalRead == 0) {
-    return undefined;
-  } else {
-    throw "conformance_nodejs: premature EOF on stdin.";
-  }
-}
-
-// Utility function to read a buffer of N bytes.
-function readBuffer(bytes) {
-  var buf = new Buffer(bytes);
-  var totalRead = 0;
-  while (totalRead < bytes) {
-    var read = 0;
-    try {
-      read = fs.readSync(process.stdin.fd, buf, totalRead, bytes - totalRead);
-    } catch (e) {
-      if (e.code == 'EOF') {
-        return onEof(totalRead)
-      } else if (e.code == 'EAGAIN') {
-      } else {
-        throw "conformance_nodejs: Error reading from stdin." + e;
-      }
-    }
-
-    totalRead += read;
-  }
-
-  return buf;
-}
-
-function writeBuffer(buffer) {
-  var totalWritten = 0;
-  while (totalWritten < buffer.length) {
-    totalWritten += fs.writeSync(
-        process.stdout.fd, buffer, totalWritten, buffer.length - totalWritten);
-  }
-}
-
-// Returns true if the test ran successfully, false on legitimate EOF.
-// If EOF is encountered in an unexpected place, raises IOError.
-function doTestIo() {
-  var lengthBuf = readBuffer(4);
-  if (!lengthBuf) {
-    return false;
-  }
-
-  var length = lengthBuf.readInt32LE(0);
-  var serializedRequest = readBuffer(length);
-  if (!serializedRequest) {
-    throw "conformance_nodejs: Failed to read request.";
-  }
-
-  serializedRequest = new Uint8Array(serializedRequest);
-  var request =
-      conformance.ConformanceRequest.deserializeBinary(serializedRequest);
-  var response = doTest(request);
-
-  var serializedResponse = response.serializeBinary();
-
-  lengthBuf = new Buffer(4);
-  lengthBuf.writeInt32LE(serializedResponse.length, 0);
-  writeBuffer(lengthBuf);
-  writeBuffer(new Buffer(serializedResponse));
-
-  testCount += 1
-
-  return true;
-}
-
-while (true) {
-  if (!doTestIo()) {
-    console.error('conformance_nodejs: received EOF from test runner ' +
-                  "after " + testCount + " tests, exiting")
-    break;
-  }
-}
diff --git a/libs/protobuf/conformance/conformance_objc.m b/libs/protobuf/conformance/conformance_objc.m
deleted file mode 100644
index ab751c8..0000000
--- a/libs/protobuf/conformance/conformance_objc.m
+++ /dev/null
@@ -1,215 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#import <Foundation/Foundation.h>
-
-#import "Conformance.pbobjc.h"
-#import "google/protobuf/TestMessagesProto2.pbobjc.h"
-#import "google/protobuf/TestMessagesProto3.pbobjc.h"
-
-static void Die(NSString *format, ...) __dead2;
-
-static BOOL verbose = NO;
-static int32_t testCount = 0;
-
-static void Die(NSString *format, ...) {
-  va_list args;
-  va_start(args, format);
-  NSString *msg = [[NSString alloc] initWithFormat:format arguments:args];
-  NSLog(@"%@", msg);
-  va_end(args);
-  [msg release];
-  exit(66);
-}
-
-static NSData *CheckedReadDataOfLength(NSFileHandle *handle, NSUInteger numBytes) {
-  NSData *data = [handle readDataOfLength:numBytes];
-  NSUInteger dataLen = data.length;
-  if (dataLen == 0) {
-    return nil;  // EOF.
-  }
-  if (dataLen != numBytes) {
-    Die(@"Failed to read the request length (%d), only got: %@",
-        numBytes, data);
-  }
-  return data;
-}
-
-static ConformanceResponse *DoTest(ConformanceRequest *request) {
-  ConformanceResponse *response = [ConformanceResponse message];
-  GPBMessage *testMessage = nil;
-
-  switch (request.payloadOneOfCase) {
-    case ConformanceRequest_Payload_OneOfCase_GPBUnsetOneOfCase:
-      response.runtimeError =
-          [NSString stringWithFormat:@"Request didn't have a payload: %@", request];
-      break;
-
-    case ConformanceRequest_Payload_OneOfCase_ProtobufPayload: {
-      Class msgClass = nil;
-      if ([request.messageType isEqual:@"protobuf_test_messages.proto3.TestAllTypesProto3"]) {
-        msgClass = [Proto3TestAllTypesProto3 class];
-      } else if ([request.messageType isEqual:@"protobuf_test_messages.proto2.TestAllTypesProto2"]) {
-        msgClass = [TestAllTypesProto2 class];
-      } else {
-        response.runtimeError =
-            [NSString stringWithFormat:@"Protobuf request had an unknown message_type: %@",
-                                       request.messageType];
-        break;
-      }
-      NSError *error = nil;
-      testMessage = [msgClass parseFromData:request.protobufPayload error:&error];
-      if (!testMessage) {
-        response.parseError =
-            [NSString stringWithFormat:@"Parse error: %@", error];
-      }
-      break;
-    }
-
-    case ConformanceRequest_Payload_OneOfCase_JsonPayload:
-      response.skipped = @"ObjC doesn't support parsing JSON";
-      break;
-
-    case ConformanceRequest_Payload_OneOfCase_JspbPayload:
-      response.skipped =
-          @"ConformanceRequest had a jspb_payload ConformanceRequest.payload;"
-          " those aren't supposed to happen with opensource.";
-      break;
-
-    case ConformanceRequest_Payload_OneOfCase_TextPayload:
-      response.skipped = @"ObjC doesn't support parsing TextFormat";
-      break;
-  }
-
-  if (testMessage) {
-    switch (request.requestedOutputFormat) {
-      case WireFormat_GPBUnrecognizedEnumeratorValue:
-      case WireFormat_Unspecified:
-        response.runtimeError =
-            [NSString stringWithFormat:@"Unrecognized/unspecified output format: %@", request];
-        break;
-
-      case WireFormat_Protobuf:
-        response.protobufPayload = testMessage.data;
-        if (!response.protobufPayload) {
-          response.serializeError =
-            [NSString stringWithFormat:@"Failed to make data from: %@", testMessage];
-        }
-        break;
-
-      case WireFormat_Json:
-        response.skipped = @"ObjC doesn't support generating JSON";
-        break;
-
-      case WireFormat_Jspb:
-        response.skipped =
-            @"ConformanceRequest had a requested_output_format of JSPB WireFormat; that"
-            " isn't supposed to happen with opensource.";
-        break;
-
-      case WireFormat_TextFormat:
-        // ObjC only has partial objc generation, so don't attempt any tests that need
-        // support.
-        response.skipped = @"ObjC doesn't support generating TextFormat";
-        break;
-    }
-  }
-
-  return response;
-}
-
-static uint32_t UInt32FromLittleEndianData(NSData *data) {
-  if (data.length != sizeof(uint32_t)) {
-    Die(@"Data not the right size for uint32_t: %@", data);
-  }
-  uint32_t value;
-  memcpy(&value, data.bytes, sizeof(uint32_t));
-  return CFSwapInt32LittleToHost(value);
-}
-
-static NSData *UInt32ToLittleEndianData(uint32_t num) {
-  uint32_t value = CFSwapInt32HostToLittle(num);
-  return [NSData dataWithBytes:&value length:sizeof(uint32_t)];
-}
-
-static BOOL DoTestIo(NSFileHandle *input, NSFileHandle *output) {
-  // See conformance_test_runner.cc for the wire format.
-  NSData *data = CheckedReadDataOfLength(input, sizeof(uint32_t));
-  if (!data) {
-    // EOF.
-    return NO;
-  }
-  uint32_t numBytes = UInt32FromLittleEndianData(data);
-  data = CheckedReadDataOfLength(input, numBytes);
-  if (!data) {
-    Die(@"Failed to read request");
-  }
-
-  NSError *error = nil;
-  ConformanceRequest *request = [ConformanceRequest parseFromData:data
-                                                            error:&error];
-  if (!request) {
-    Die(@"Failed to parse the message data: %@", error);
-  }
-
-  ConformanceResponse *response = DoTest(request);
-  if (!response) {
-    Die(@"Failed to make a reply from %@", request);
-  }
-
-  data = response.data;
-  [output writeData:UInt32ToLittleEndianData((int32_t)data.length)];
-  [output writeData:data];
-
-  if (verbose) {
-    NSLog(@"Request: %@", request);
-    NSLog(@"Response: %@", response);
-  }
-
-  ++testCount;
-  return YES;
-}
-
-int main(int argc, const char *argv[]) {
-  @autoreleasepool {
-    NSFileHandle *input = [[NSFileHandle fileHandleWithStandardInput] retain];
-    NSFileHandle *output = [[NSFileHandle fileHandleWithStandardOutput] retain];
-
-    BOOL notDone = YES;
-    while (notDone) {
-      @autoreleasepool {
-        notDone = DoTestIo(input, output);
-      }
-    }
-
-    NSLog(@"Received EOF from test runner after %d tests, exiting.", testCount);
-  }
-  return 0;
-}
diff --git a/libs/protobuf/conformance/conformance_php.php b/libs/protobuf/conformance/conformance_php.php
deleted file mode 100644
index 9eef0c5..0000000
--- a/libs/protobuf/conformance/conformance_php.php
+++ /dev/null
@@ -1,120 +0,0 @@
-<?php
-
-require_once("Conformance/WireFormat.php");
-require_once("Conformance/ConformanceResponse.php");
-require_once("Conformance/ConformanceRequest.php");
-require_once("Conformance/FailureSet.php");
-require_once("Conformance/JspbEncodingConfig.php");
-require_once("Conformance/TestCategory.php");
-require_once("Protobuf_test_messages/Proto3/ForeignMessage.php");
-require_once("Protobuf_test_messages/Proto3/ForeignEnum.php");
-require_once("Protobuf_test_messages/Proto3/TestAllTypesProto3.php");
-require_once("Protobuf_test_messages/Proto3/TestAllTypesProto3/AliasedEnum.php");
-require_once("Protobuf_test_messages/Proto3/TestAllTypesProto3/NestedMessage.php");
-require_once("Protobuf_test_messages/Proto3/TestAllTypesProto3/NestedEnum.php");
-
-require_once("GPBMetadata/Conformance.php");
-require_once("GPBMetadata/Google/Protobuf/TestMessagesProto3.php");
-
-use  \Conformance\TestCategory;
-use  \Conformance\WireFormat;
-
-if (!ini_get("date.timezone")) {
-  ini_set("date.timezone", "UTC");
-}
-
-$test_count = 0;
-
-function doTest($request)
-{
-    $test_message = new \Protobuf_test_messages\Proto3\TestAllTypesProto3();
-    $response = new \Conformance\ConformanceResponse();
-    if ($request->getPayload() == "protobuf_payload") {
-      if ($request->getMessageType() == "conformance.FailureSet") {
-        $response->setProtobufPayload("");
-        return $response;
-      } elseif ($request->getMessageType() == "protobuf_test_messages.proto3.TestAllTypesProto3") {
-        try {
-          $test_message->mergeFromString($request->getProtobufPayload());
-        } catch (Exception $e) {
-          $response->setParseError($e->getMessage());
-          return $response;
-        }
-      } elseif ($request->getMessageType() == "protobuf_test_messages.proto2.TestAllTypesProto2") {
-        $response->setSkipped("PHP doesn't support proto2");
-        return $response;
-      } else {
-        trigger_error("Protobuf request doesn't have specific payload type", E_USER_ERROR);
-      }
-    } elseif ($request->getPayload() == "json_payload") {
-      $ignore_json_unknown =
-          ($request->getTestCategory() ==
-              TestCategory::JSON_IGNORE_UNKNOWN_PARSING_TEST);
-      try {
-          $test_message->mergeFromJsonString($request->getJsonPayload(),
-                                             $ignore_json_unknown);
-      } catch (Exception $e) {
-          $response->setParseError($e->getMessage());
-          return $response;
-      }
-	} elseif ($request->getPayload() == "text_payload") {
-		$response->setSkipped("PHP doesn't support text format yet");
-        return $response;
-	} else {
-      trigger_error("Request didn't have payload.", E_USER_ERROR);
-    }
-
-    if ($request->getRequestedOutputFormat() == WireFormat::UNSPECIFIED) {
-      trigger_error("Unspecified output format.", E_USER_ERROR);
-    } elseif ($request->getRequestedOutputFormat() == WireFormat::PROTOBUF) {
-      $response->setProtobufPayload($test_message->serializeToString());
-    } elseif ($request->getRequestedOutputFormat() == WireFormat::JSON) {
-      try {
-          $response->setJsonPayload($test_message->serializeToJsonString());
-      } catch (Exception $e) {
-          $response->setSerializeError($e->getMessage());
-          return $response;
-      }
-    }
-
-    return $response;
-}
-
-function doTestIO()
-{
-    $length_bytes = fread(STDIN, 4);
-    if (strlen($length_bytes) == 0) {
-      return false;   # EOF
-    } elseif (strlen($length_bytes) != 4) {
-      fwrite(STDERR, "I/O error\n");
-      return false;
-    }
-
-    $length = unpack("V", $length_bytes)[1];
-    $serialized_request = fread(STDIN, $length);
-    if (strlen($serialized_request) != $length) {
-      trigger_error("I/O error", E_USER_ERROR);
-    }
-
-    $request = new \Conformance\ConformanceRequest();
-    $request->mergeFromString($serialized_request);
-
-    $response = doTest($request);
-
-    $serialized_response = $response->serializeToString();
-    fwrite(STDOUT, pack("V", strlen($serialized_response)));
-    fwrite(STDOUT, $serialized_response);
-
-    $GLOBALS['test_count'] += 1;
-
-    return true;
-}
-
-while(true){
-  if (!doTestIO()) {
-      fprintf(STDERR,
-             "conformance_php: received EOF from test runner " +
-             "after %d tests, exiting\n", $test_count);
-      exit;
-  }
-}
diff --git a/libs/protobuf/conformance/conformance_python.py b/libs/protobuf/conformance/conformance_python.py
deleted file mode 100755
index 37ee36e..0000000
--- a/libs/protobuf/conformance/conformance_python.py
+++ /dev/null
@@ -1,213 +0,0 @@
-#!/usr/bin/env python
-# Protocol Buffers - Google's data interchange format
-# Copyright 2008 Google Inc.  All rights reserved.
-# https://developers.google.com/protocol-buffers/
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-"""A conformance test implementation for the Python protobuf library.
-
-See conformance.proto for more information.
-"""
-
-import struct
-import sys
-import os
-from google.protobuf import json_format
-from google.protobuf import message
-from google.protobuf import test_messages_proto3_pb2
-from google.protobuf import test_messages_proto2_pb2
-from google.protobuf import text_format
-import conformance_pb2
-
-sys.stdout = os.fdopen(sys.stdout.fileno(), 'wb', 0)
-sys.stdin = os.fdopen(sys.stdin.fileno(), 'rb', 0)
-
-test_count = 0
-verbose = False
-
-class ProtocolError(Exception):
-  pass
-
-def do_test(request):
-  response = conformance_pb2.ConformanceResponse()
-
-  if request.message_type == "conformance.FailureSet":
-    failure_set = conformance_pb2.FailureSet()
-    failures = []
-    # TODO(gerbens): Remove, this is a hack to detect if the old vs new
-    # parser is used by the cpp code. Relying on a bug in the old parser.
-    hack_proto = test_messages_proto2_pb2.TestAllTypesProto2()
-    old_parser = True
-    try:
-      hack_proto.ParseFromString(b"\322\002\001")
-    except message.DecodeError as e:
-      old_parser = False
-    if old_parser:
-      # the string above is one of the failing conformance test strings of the
-      # old parser. If we succeed the c++ implementation is using the old
-      # parser so we add the list of failing conformance tests.
-      failures = [
-          "Required.Proto3.ProtobufInput.PrematureEofInDelimitedDataForKnownNonRepeatedValue.MESSAGE",
-          "Required.Proto3.ProtobufInput.PrematureEofInDelimitedDataForKnownRepeatedValue.MESSAGE",
-          "Required.Proto3.ProtobufInput.PrematureEofInPackedField.BOOL",
-          "Required.Proto3.ProtobufInput.PrematureEofInPackedField.DOUBLE",
-          "Required.Proto3.ProtobufInput.PrematureEofInPackedField.ENUM",
-          "Required.Proto3.ProtobufInput.PrematureEofInPackedField.FIXED32",
-          "Required.Proto3.ProtobufInput.PrematureEofInPackedField.FIXED64",
-          "Required.Proto3.ProtobufInput.PrematureEofInPackedField.FLOAT",
-          "Required.Proto3.ProtobufInput.PrematureEofInPackedField.INT32",
-          "Required.Proto3.ProtobufInput.PrematureEofInPackedField.INT64",
-          "Required.Proto3.ProtobufInput.PrematureEofInPackedField.SFIXED32",
-          "Required.Proto3.ProtobufInput.PrematureEofInPackedField.SFIXED64",
-          "Required.Proto3.ProtobufInput.PrematureEofInPackedField.SINT32",
-          "Required.Proto3.ProtobufInput.PrematureEofInPackedField.SINT64",
-          "Required.Proto3.ProtobufInput.PrematureEofInPackedField.UINT32",
-          "Required.Proto3.ProtobufInput.PrematureEofInPackedField.UINT64",
-          "Required.Proto2.ProtobufInput.PrematureEofInDelimitedDataForKnownNonRepeatedValue.MESSAGE",
-          "Required.Proto2.ProtobufInput.PrematureEofInDelimitedDataForKnownRepeatedValue.MESSAGE",
-          "Required.Proto2.ProtobufInput.PrematureEofInPackedField.BOOL",
-          "Required.Proto2.ProtobufInput.PrematureEofInPackedField.DOUBLE",
-          "Required.Proto2.ProtobufInput.PrematureEofInPackedField.ENUM",
-          "Required.Proto2.ProtobufInput.PrematureEofInPackedField.FIXED32",
-          "Required.Proto2.ProtobufInput.PrematureEofInPackedField.FIXED64",
-          "Required.Proto2.ProtobufInput.PrematureEofInPackedField.FLOAT",
-          "Required.Proto2.ProtobufInput.PrematureEofInPackedField.INT32",
-          "Required.Proto2.ProtobufInput.PrematureEofInPackedField.INT64",
-          "Required.Proto2.ProtobufInput.PrematureEofInPackedField.SFIXED32",
-          "Required.Proto2.ProtobufInput.PrematureEofInPackedField.SFIXED64",
-          "Required.Proto2.ProtobufInput.PrematureEofInPackedField.SINT32",
-          "Required.Proto2.ProtobufInput.PrematureEofInPackedField.SINT64",
-          "Required.Proto2.ProtobufInput.PrematureEofInPackedField.UINT32",
-          "Required.Proto2.ProtobufInput.PrematureEofInPackedField.UINT64",
-      ]
-    for x in failures:
-      failure_set.failure.append(x)
-    response.protobuf_payload = failure_set.SerializeToString()
-    return response
-
-  isProto3 = (request.message_type == "protobuf_test_messages.proto3.TestAllTypesProto3")
-  isJson = (request.WhichOneof('payload') == 'json_payload')
-  isProto2 = (request.message_type == "protobuf_test_messages.proto2.TestAllTypesProto2")
-
-  if (not isProto3) and (not isJson) and (not isProto2):
-    raise ProtocolError("Protobuf request doesn't have specific payload type")
-
-  test_message = test_messages_proto2_pb2.TestAllTypesProto2() if isProto2 else \
-    test_messages_proto3_pb2.TestAllTypesProto3()
-
-  try:
-    if request.WhichOneof('payload') == 'protobuf_payload':
-      try:
-        test_message.ParseFromString(request.protobuf_payload)
-      except message.DecodeError as e:
-        response.parse_error = str(e)
-        return response
-
-    elif request.WhichOneof('payload') == 'json_payload':
-      try:
-        ignore_unknown_fields = \
-            request.test_category == \
-                conformance_pb2.JSON_IGNORE_UNKNOWN_PARSING_TEST
-        json_format.Parse(request.json_payload, test_message,
-                          ignore_unknown_fields)
-      except Exception as e:
-        response.parse_error = str(e)
-        return response
-
-    elif request.WhichOneof('payload') == 'text_payload':
-      try:
-        text_format.Parse(request.text_payload, test_message)
-      except Exception as e:
-        response.parse_error = str(e)
-        return response
-
-    else:
-      raise ProtocolError("Request didn't have payload.")
-
-    if request.requested_output_format == conformance_pb2.UNSPECIFIED:
-      raise ProtocolError("Unspecified output format")
-
-    elif request.requested_output_format == conformance_pb2.PROTOBUF:
-      response.protobuf_payload = test_message.SerializeToString()
-
-    elif request.requested_output_format == conformance_pb2.JSON:
-      try:
-        response.json_payload = json_format.MessageToJson(test_message)
-      except Exception as e:
-        response.serialize_error = str(e)
-        return response
-
-    elif request.requested_output_format == conformance_pb2.TEXT_FORMAT:
-      response.text_payload = text_format.MessageToString(
-          test_message, print_unknown_fields=request.print_unknown_fields)
-
-  except Exception as e:
-    response.runtime_error = str(e)
-
-  return response
-
-def do_test_io():
-  length_bytes = sys.stdin.read(4)
-  if len(length_bytes) == 0:
-    return False   # EOF
-  elif len(length_bytes) != 4:
-    raise IOError("I/O error")
-
-  # "I" is "unsigned int", so this depends on running on a platform with
-  # 32-bit "unsigned int" type.  The Python struct module unfortunately
-  # has no format specifier for uint32_t.
-  length = struct.unpack("<I", length_bytes)[0]
-  serialized_request = sys.stdin.read(length)
-  if len(serialized_request) != length:
-    raise IOError("I/O error")
-
-  request = conformance_pb2.ConformanceRequest()
-  request.ParseFromString(serialized_request)
-
-  response = do_test(request)
-
-  serialized_response = response.SerializeToString()
-  sys.stdout.write(struct.pack("<I", len(serialized_response)))
-  sys.stdout.write(serialized_response)
-  sys.stdout.flush()
-
-  if verbose:
-    sys.stderr.write("conformance_python: request=%s, response=%s\n" % (
-                       request.ShortDebugString().c_str(),
-                       response.ShortDebugString().c_str()))
-
-  global test_count
-  test_count += 1
-
-  return True
-
-while True:
-  if not do_test_io():
-    sys.stderr.write("conformance_python: received EOF from test runner " +
-                     "after %s tests, exiting\n" % (test_count))
-    sys.exit(0)
diff --git a/libs/protobuf/conformance/conformance_ruby.rb b/libs/protobuf/conformance/conformance_ruby.rb
deleted file mode 100755
index 4af7659..0000000
--- a/libs/protobuf/conformance/conformance_ruby.rb
+++ /dev/null
@@ -1,146 +0,0 @@
-#!/usr/bin/env ruby
-#
-# Protocol Buffers - Google's data interchange format
-# Copyright 2008 Google Inc.  All rights reserved.
-# https://developers.google.com/protocol-buffers/
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-require 'conformance_pb'
-require 'google/protobuf/test_messages_proto3_pb'
-require 'google/protobuf/test_messages_proto2_pb'
-
-$test_count = 0
-$verbose = false
-
-def do_test(request)
-  test_message = ProtobufTestMessages::Proto3::TestAllTypesProto3.new
-  response = Conformance::ConformanceResponse.new
-  descriptor = Google::Protobuf::DescriptorPool.generated_pool.lookup(request.message_type)
-
-  unless descriptor
-    response.skipped = "Unknown message type: " + request.message_type
-  end
-
-  begin
-    case request.payload
-    when :protobuf_payload
-      begin
-        test_message = descriptor.msgclass.decode(request.protobuf_payload)
-      rescue Google::Protobuf::ParseError => err
-        response.parse_error = err.message.encode('utf-8')
-        return response
-      end
-
-    when :json_payload
-      begin
-        options = {}
-        if request.test_category == :JSON_IGNORE_UNKNOWN_PARSING_TEST
-          options[:ignore_unknown_fields] = true
-        end
-        test_message = descriptor.msgclass.decode_json(request.json_payload, options)
-      rescue Google::Protobuf::ParseError => err
-        response.parse_error = err.message.encode('utf-8')
-        return response
-      end
-
-    when :text_payload
-      begin
-        response.skipped = "Ruby doesn't support text format"
-        return response
-      end
-
-    when nil
-      fail "Request didn't have payload"
-    end
-
-    case request.requested_output_format
-    when :UNSPECIFIED
-      fail 'Unspecified output format'
-
-    when :PROTOBUF
-      begin
-        response.protobuf_payload = test_message.to_proto
-      rescue Google::Protobuf::ParseError => err
-        response.serialize_error = err.message.encode('utf-8')
-      end
-
-    when :JSON
-      begin
-        response.json_payload = test_message.to_json
-      rescue Google::Protobuf::ParseError => err
-        response.serialize_error = err.message.encode('utf-8')
-      end
-
-    when nil
-      fail "Request didn't have requested output format"
-    end
-  rescue StandardError => err
-    response.runtime_error = err.message.encode('utf-8')
-  end
-
-  response
-end
-
-# Returns true if the test ran successfully, false on legitimate EOF.
-# If EOF is encountered in an unexpected place, raises IOError.
-def do_test_io
-  length_bytes = STDIN.read(4)
-  return false if length_bytes.nil?
-
-  length = length_bytes.unpack('V').first
-  serialized_request = STDIN.read(length)
-  if serialized_request.nil? || serialized_request.length != length
-    fail IOError
-  end
-
-  request = Conformance::ConformanceRequest.decode(serialized_request)
-
-  response = do_test(request)
-
-  serialized_response = Conformance::ConformanceResponse.encode(response)
-  STDOUT.write([serialized_response.length].pack('V'))
-  STDOUT.write(serialized_response)
-  STDOUT.flush
-
-  if $verbose
-    STDERR.puts("conformance_ruby: request=#{request.to_json}, " \
-                                 "response=#{response.to_json}\n")
-  end
-
-  $test_count += 1
-
-  true
-end
-
-loop do
-  unless do_test_io
-    STDERR.puts('conformance_ruby: received EOF from test runner ' \
-                "after #{$test_count} tests, exiting")
-    break
-  end
-end
diff --git a/libs/protobuf/conformance/conformance_test.cc b/libs/protobuf/conformance/conformance_test.cc
deleted file mode 100644
index 2c856f5..0000000
--- a/libs/protobuf/conformance/conformance_test.cc
+++ /dev/null
@@ -1,468 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include "conformance_test.h"
-
-#include <stdarg.h>
-
-#include <fstream>
-#include <set>
-#include <string>
-
-#include <google/protobuf/stubs/stringprintf.h>
-#include <google/protobuf/message.h>
-#include <google/protobuf/text_format.h>
-#include <google/protobuf/util/field_comparator.h>
-#include <google/protobuf/util/json_util.h>
-#include <google/protobuf/util/message_differencer.h>
-#include "conformance.pb.h"
-
-using conformance::ConformanceRequest;
-using conformance::ConformanceResponse;
-using conformance::WireFormat;
-using google::protobuf::TextFormat;
-using google::protobuf::util::DefaultFieldComparator;
-using google::protobuf::util::MessageDifferencer;
-using std::string;
-
-namespace {
-
-static string ToOctString(const string& binary_string) {
-  string oct_string;
-  for (size_t i = 0; i < binary_string.size(); i++) {
-    uint8_t c = binary_string.at(i);
-    uint8_t high = c / 64;
-    uint8_t mid = (c % 64) / 8;
-    uint8_t low = c % 8;
-    oct_string.push_back('\\');
-    oct_string.push_back('0' + high);
-    oct_string.push_back('0' + mid);
-    oct_string.push_back('0' + low);
-  }
-  return oct_string;
-}
-
-}  // namespace
-
-namespace google {
-namespace protobuf {
-
-ConformanceTestSuite::ConformanceRequestSetting::ConformanceRequestSetting(
-    ConformanceLevel level,
-    conformance::WireFormat input_format,
-    conformance::WireFormat output_format,
-    conformance::TestCategory test_category,
-    const Message& prototype_message,
-    const string& test_name, const string& input)
-    : level_(level),
-      input_format_(input_format),
-      output_format_(output_format),
-      prototype_message_(prototype_message),
-      prototype_message_for_compare_(prototype_message.New()),
-      test_name_(test_name) {
-  switch (input_format) {
-    case conformance::PROTOBUF: {
-      request_.set_protobuf_payload(input);
-      break;
-    }
-
-    case conformance::JSON: {
-      request_.set_json_payload(input);
-      break;
-    }
-
-    case conformance::JSPB: {
-      request_.set_jspb_payload(input);
-      break;
-    }
-
-    case conformance::TEXT_FORMAT: {
-      request_.set_text_payload(input);
-      break;
-    }
-
-    default:
-      GOOGLE_LOG(FATAL) << "Unspecified input format";
-  }
-
-  request_.set_test_category(test_category);
-
-  request_.set_message_type(prototype_message.GetDescriptor()->full_name());
-  request_.set_requested_output_format(output_format);
-}
-
-std::unique_ptr<Message>
-ConformanceTestSuite::ConformanceRequestSetting::NewTestMessage() const {
-  return std::unique_ptr<Message>(prototype_message_for_compare_->New());
-}
-
-string ConformanceTestSuite::ConformanceRequestSetting::
-    GetTestName() const {
-  string rname =
-      prototype_message_.GetDescriptor()->file()->syntax() ==
-        FileDescriptor::SYNTAX_PROTO3 ? "Proto3" : "Proto2";
-
-  return StrCat(ConformanceLevelToString(level_), ".", rname, ".",
-                      InputFormatString(input_format_), ".", test_name_, ".",
-                      OutputFormatString(output_format_));
-}
-
-string ConformanceTestSuite::ConformanceRequestSetting::
-    ConformanceLevelToString(
-        ConformanceLevel level) const {
-  switch (level) {
-    case REQUIRED: return "Required";
-    case RECOMMENDED: return "Recommended";
-  }
-  GOOGLE_LOG(FATAL) << "Unknown value: " << level;
-  return "";
-}
-
-string ConformanceTestSuite::ConformanceRequestSetting::
-    InputFormatString(conformance::WireFormat format) const {
-  switch (format) {
-    case conformance::PROTOBUF:
-      return "ProtobufInput";
-    case conformance::JSON:
-      return "JsonInput";
-    case conformance::TEXT_FORMAT:
-      return "TextFormatInput";
-    default:
-      GOOGLE_LOG(FATAL) << "Unspecified output format";
-  }
-  return "";
-}
-
-string ConformanceTestSuite::ConformanceRequestSetting::
-    OutputFormatString(conformance::WireFormat format) const {
-  switch (format) {
-    case conformance::PROTOBUF:
-      return "ProtobufOutput";
-    case conformance::JSON:
-      return "JsonOutput";
-    case conformance::TEXT_FORMAT:
-      return "TextFormatOutput";
-    default:
-      GOOGLE_LOG(FATAL) << "Unspecified output format";
-  }
-  return "";
-}
-
-void ConformanceTestSuite::ReportSuccess(const string& test_name) {
-  if (expected_to_fail_.erase(test_name) != 0) {
-    StringAppendF(&output_,
-                  "ERROR: test %s is in the failure list, but test succeeded.  "
-                  "Remove it from the failure list.\n",
-                  test_name.c_str());
-    unexpected_succeeding_tests_.insert(test_name);
-  }
-  successes_++;
-}
-
-void ConformanceTestSuite::ReportFailure(const string& test_name,
-                                         ConformanceLevel level,
-                                         const ConformanceRequest& request,
-                                         const ConformanceResponse& response,
-                                         const char* fmt, ...) {
-  if (expected_to_fail_.erase(test_name) == 1) {
-    expected_failures_++;
-    if (!verbose_)
-      return;
-  } else if (level == RECOMMENDED && !enforce_recommended_) {
-    StringAppendF(&output_, "WARNING, test=%s: ", test_name.c_str());
-  } else {
-    StringAppendF(&output_, "ERROR, test=%s: ", test_name.c_str());
-    unexpected_failing_tests_.insert(test_name);
-  }
-  va_list args;
-  va_start(args, fmt);
-  StringAppendV(&output_, fmt, args);
-  va_end(args);
-  StringAppendF(&output_, " request=%s, response=%s\n",
-                request.ShortDebugString().c_str(),
-                response.ShortDebugString().c_str());
-}
-
-void ConformanceTestSuite::ReportSkip(const string& test_name,
-                                      const ConformanceRequest& request,
-                                      const ConformanceResponse& response) {
-  if (verbose_) {
-    StringAppendF(&output_, "SKIPPED, test=%s request=%s, response=%s\n",
-                  test_name.c_str(), request.ShortDebugString().c_str(),
-                  response.ShortDebugString().c_str());
-  }
-  skipped_.insert(test_name);
-}
-
-void ConformanceTestSuite::RunValidInputTest(
-    const ConformanceRequestSetting& setting,
-    const string& equivalent_text_format) {
-  std::unique_ptr<Message> reference_message(setting.NewTestMessage());
-  GOOGLE_CHECK(TextFormat::ParseFromString(equivalent_text_format,
-                                    reference_message.get()))
-      << "Failed to parse data for test case: " << setting.GetTestName()
-      << ", data: " << equivalent_text_format;
-  const string equivalent_wire_format = reference_message->SerializeAsString();
-  RunValidBinaryInputTest(setting, equivalent_wire_format);
-}
-
-void ConformanceTestSuite::RunValidBinaryInputTest(
-    const ConformanceRequestSetting& setting,
-    const string& equivalent_wire_format, bool require_same_wire_format) {
-  const ConformanceRequest& request = setting.GetRequest();
-  ConformanceResponse response;
-  RunTest(setting.GetTestName(), request, &response);
-  VerifyResponse(setting, equivalent_wire_format, response, true,
-                 require_same_wire_format);
-}
-
-void ConformanceTestSuite::VerifyResponse(
-    const ConformanceRequestSetting& setting,
-    const string& equivalent_wire_format, const ConformanceResponse& response,
-    bool need_report_success, bool require_same_wire_format) {
-  std::unique_ptr<Message> test_message(setting.NewTestMessage());
-  const ConformanceRequest& request = setting.GetRequest();
-  const string& test_name = setting.GetTestName();
-  ConformanceLevel level = setting.GetLevel();
-  std::unique_ptr<Message> reference_message = setting.NewTestMessage();
-
-  GOOGLE_CHECK(reference_message->ParseFromString(equivalent_wire_format))
-      << "Failed to parse wire data for test case: " << test_name;
-
-  switch (response.result_case()) {
-    case ConformanceResponse::RESULT_NOT_SET:
-      ReportFailure(test_name, level, request, response,
-                    "Response didn't have any field in the Response.");
-      return;
-
-    case ConformanceResponse::kParseError:
-    case ConformanceResponse::kRuntimeError:
-    case ConformanceResponse::kSerializeError:
-      ReportFailure(test_name, level, request, response,
-                    "Failed to parse input or produce output.");
-      return;
-
-    case ConformanceResponse::kSkipped:
-      ReportSkip(test_name, request, response);
-      return;
-
-    default:
-      if (!ParseResponse(response, setting, test_message.get())) return;
-  }
-
-  MessageDifferencer differencer;
-  DefaultFieldComparator field_comparator;
-  field_comparator.set_treat_nan_as_equal(true);
-  differencer.set_field_comparator(&field_comparator);
-  string differences;
-  differencer.ReportDifferencesToString(&differences);
-
-  bool check = false;
-
-  if (require_same_wire_format) {
-    GOOGLE_DCHECK_EQ(response.result_case(), ConformanceResponse::kProtobufPayload);
-    const string& protobuf_payload = response.protobuf_payload();
-    check = equivalent_wire_format == protobuf_payload;
-    differences = StrCat("Expect: ", ToOctString(equivalent_wire_format),
-                               ", but got: ", ToOctString(protobuf_payload));
-  } else {
-    check = differencer.Compare(*reference_message, *test_message);
-  }
-
-  if (check) {
-    if (need_report_success) {
-      ReportSuccess(test_name);
-    }
-  } else {
-    ReportFailure(test_name, level, request, response,
-                  "Output was not equivalent to reference message: %s.",
-                  differences.c_str());
-  }
-}
-
-void ConformanceTestSuite::RunTest(const string& test_name,
-                                   const ConformanceRequest& request,
-                                   ConformanceResponse* response) {
-  if (test_names_.insert(test_name).second == false) {
-    GOOGLE_LOG(FATAL) << "Duplicated test name: " << test_name;
-  }
-
-  string serialized_request;
-  string serialized_response;
-  request.SerializeToString(&serialized_request);
-
-  runner_->RunTest(test_name, serialized_request, &serialized_response);
-
-  if (!response->ParseFromString(serialized_response)) {
-    response->Clear();
-    response->set_runtime_error("response proto could not be parsed.");
-  }
-
-  if (verbose_) {
-    StringAppendF(&output_,
-                  "conformance test: name=%s, request=%s, response=%s\n",
-                  test_name.c_str(),
-                  request.ShortDebugString().c_str(),
-                  response->ShortDebugString().c_str());
-  }
-}
-
-bool ConformanceTestSuite::CheckSetEmpty(
-    const std::set<string>& set_to_check,
-    const std::string& write_to_file,
-    const std::string& msg) {
-  if (set_to_check.empty()) {
-    return true;
-  } else {
-    StringAppendF(&output_, "\n");
-    StringAppendF(&output_, "%s\n\n", msg.c_str());
-    for (std::set<string>::const_iterator iter = set_to_check.begin();
-         iter != set_to_check.end(); ++iter) {
-      StringAppendF(&output_, "  %s\n", iter->c_str());
-    }
-    StringAppendF(&output_, "\n");
-
-    if (!write_to_file.empty()) {
-      std::string full_filename;
-      const std::string* filename = &write_to_file;
-      if (!output_dir_.empty()) {
-        full_filename = output_dir_;
-        if (*output_dir_.rbegin() != '/') {
-          full_filename.push_back('/');
-        }
-        full_filename += write_to_file;
-        filename = &full_filename;
-      }
-      std::ofstream os(*filename);
-      if (os) {
-        for (std::set<string>::const_iterator iter = set_to_check.begin();
-             iter != set_to_check.end(); ++iter) {
-          os << *iter << "\n";
-        }
-      } else {
-        StringAppendF(&output_, "Failed to open file: %s\n",
-                      filename->c_str());
-      }
-    }
-
-    return false;
-  }
-}
-
-string ConformanceTestSuite::WireFormatToString(
-    WireFormat wire_format) {
-  switch (wire_format) {
-    case conformance::PROTOBUF:
-      return "PROTOBUF";
-    case conformance::JSON:
-      return "JSON";
-    case conformance::JSPB:
-      return "JSPB";
-    case conformance::TEXT_FORMAT:
-      return "TEXT_FORMAT";
-    case conformance::UNSPECIFIED:
-      return "UNSPECIFIED";
-    default:
-      GOOGLE_LOG(FATAL) << "unknown wire type: " << wire_format;
-  }
-  return "";
-}
-
-void ConformanceTestSuite::AddExpectedFailedTest(const std::string& test_name) {
-  expected_to_fail_.insert(test_name);
-}
-
-bool ConformanceTestSuite::RunSuite(ConformanceTestRunner* runner,
-                                    std::string* output, const string& filename,
-                                    conformance::FailureSet* failure_list) {
-  runner_ = runner;
-  successes_ = 0;
-  expected_failures_ = 0;
-  skipped_.clear();
-  test_names_.clear();
-  unexpected_failing_tests_.clear();
-  unexpected_succeeding_tests_.clear();
-
-  output_ = "\nCONFORMANCE TEST BEGIN ====================================\n\n";
-
-  failure_list_filename_ = filename;
-  expected_to_fail_.clear();
-  for (const string& failure : failure_list->failure()) {
-    AddExpectedFailedTest(failure);
-  }
-  RunSuiteImpl();
-
-  bool ok = true;
-  if (!CheckSetEmpty(expected_to_fail_, "nonexistent_tests.txt",
-                     "These tests were listed in the failure list, but they "
-                     "don't exist.  Remove them from the failure list by "
-                     "running:\n"
-                     "  ./update_failure_list.py " + failure_list_filename_ +
-                     " --remove nonexistent_tests.txt")) {
-    ok = false;
-  }
-  if (!CheckSetEmpty(unexpected_failing_tests_, "failing_tests.txt",
-                     "These tests failed.  If they can't be fixed right now, "
-                     "you can add them to the failure list so the overall "
-                     "suite can succeed.  Add them to the failure list by "
-                     "running:\n"
-                     "  ./update_failure_list.py " + failure_list_filename_ +
-                     " --add failing_tests.txt")) {
-    ok = false;
-  }
-  if (!CheckSetEmpty(unexpected_succeeding_tests_, "succeeding_tests.txt",
-                     "These tests succeeded, even though they were listed in "
-                     "the failure list.  Remove them from the failure list "
-                     "by running:\n"
-                     "  ./update_failure_list.py " + failure_list_filename_ +
-                     " --remove succeeding_tests.txt")) {
-    ok = false;
-  }
-
-  if (verbose_) {
-    CheckSetEmpty(skipped_, "",
-                  "These tests were skipped (probably because support for some "
-                  "features is not implemented)");
-  }
-
-  StringAppendF(&output_,
-                "CONFORMANCE SUITE %s: %d successes, %zu skipped, "
-                "%d expected failures, %zu unexpected failures.\n",
-                ok ? "PASSED" : "FAILED", successes_, skipped_.size(),
-                expected_failures_, unexpected_failing_tests_.size());
-  StringAppendF(&output_, "\n");
-
-  output->assign(output_);
-
-  return ok;
-}
-
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/conformance/conformance_test.h b/libs/protobuf/conformance/conformance_test.h
deleted file mode 100644
index 83d94f8..0000000
--- a/libs/protobuf/conformance/conformance_test.h
+++ /dev/null
@@ -1,329 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-// This file defines a protocol for running the conformance test suite
-// in-process.  In other words, the suite itself will run in the same process as
-// the code under test.
-//
-// For pros and cons of this approach, please see conformance.proto.
-
-#ifndef CONFORMANCE_CONFORMANCE_TEST_H
-#define CONFORMANCE_CONFORMANCE_TEST_H
-
-#include <functional>
-#include <string>
-#include <vector>
-
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/wire_format_lite.h>
-#include <google/protobuf/util/type_resolver.h>
-#include "conformance.pb.h"
-
-namespace conformance {
-class ConformanceRequest;
-class ConformanceResponse;
-}  // namespace conformance
-
-namespace protobuf_test_messages {
-namespace proto3 {
-class TestAllTypesProto3;
-}  // namespace proto3
-}  // namespace protobuf_test_messages
-
-namespace google {
-namespace protobuf {
-
-class ConformanceTestSuite;
-
-class ConformanceTestRunner {
- public:
-  virtual ~ConformanceTestRunner() {}
-
-  // Call to run a single conformance test.
-  //
-  // "input" is a serialized conformance.ConformanceRequest.
-  // "output" should be set to a serialized conformance.ConformanceResponse.
-  //
-  // If there is any error in running the test itself, set "runtime_error" in
-  // the response.
-  virtual void RunTest(const std::string& test_name,
-                       const std::string& input,
-                       std::string* output) = 0;
-};
-
-// Test runner that spawns the process being tested and communicates with it
-// over a pipe.
-class ForkPipeRunner : public ConformanceTestRunner {
- public:
-  // Note: Run() doesn't take ownership of the pointers inside suites.
-  static int Run(int argc, char *argv[],
-                 const std::vector<ConformanceTestSuite*>& suites);
-
-  ForkPipeRunner(const std::string& executable,
-                 const std::vector<std::string>& executable_args)
-      : child_pid_(-1),
-        executable_(executable),
-        executable_args_(executable_args) {}
-
-  explicit ForkPipeRunner(const std::string& executable)
-      : child_pid_(-1), executable_(executable) {}
-
-  virtual ~ForkPipeRunner() {}
-
-  void RunTest(const std::string& test_name,
-               const std::string& request,
-               std::string* response);
-
- private:
-  void SpawnTestProgram();
-
-  void CheckedWrite(int fd, const void *buf, size_t len);
-  bool TryRead(int fd, void *buf, size_t len);
-  void CheckedRead(int fd, void *buf, size_t len);
-
-  int write_fd_;
-  int read_fd_;
-  pid_t child_pid_;
-  std::string executable_;
-  const std::vector<std::string> executable_args_;
-  std::string current_test_name_;
-};
-
-// Class representing the test suite itself.  To run it, implement your own
-// class derived from ConformanceTestRunner, class derived from
-// ConformanceTestSuite and then write code like:
-//
-//    class MyConformanceTestSuite : public ConformanceTestSuite {
-//     public:
-//      void RunSuiteImpl() {
-//        // INSERT ACTUAL TESTS.
-//      }
-//    };
-//
-//    class MyConformanceTestRunner : public ConformanceTestRunner {
-//     public:
-//      static int Run(int argc, char *argv[],
-//                 ConformanceTestSuite* suite);
-//
-//     private:
-//      virtual void RunTest(...) {
-//        // INSERT YOUR FRAMEWORK-SPECIFIC CODE HERE.
-//      }
-//    };
-//
-//    int main() {
-//      MyConformanceTestSuite suite;
-//      MyConformanceTestRunner::Run(argc, argv, &suite);
-//    }
-//
-class ConformanceTestSuite {
- public:
-  ConformanceTestSuite()
-      : verbose_(false),
-        enforce_recommended_(false),
-        failure_list_flag_name_("--failure_list") {}
-  virtual ~ConformanceTestSuite() {}
-
-  void SetVerbose(bool verbose) { verbose_ = verbose; }
-
-  // Whether to require the testee to pass RECOMMENDED tests. By default failing
-  // a RECOMMENDED test case will not fail the entire suite but will only
-  // generated a warning. If this flag is set to true, RECOMMENDED tests will
-  // be treated the same way as REQUIRED tests and failing a RECOMMENDED test
-  // case will cause the entire test suite to fail as well. An implementation
-  // can enable this if it wants to be strictly conforming to protobuf spec.
-  // See the comments about ConformanceLevel below to learn more about the
-  // difference between REQUIRED and RECOMMENDED test cases.
-  void SetEnforceRecommended(bool value) {
-    enforce_recommended_ = value;
-  }
-
-  // Gets the flag name to the failure list file.
-  // By default, this would return --failure_list
-  std::string GetFailureListFlagName() { return failure_list_flag_name_; }
-
-  void SetFailureListFlagName(const std::string& failure_list_flag_name) {
-    failure_list_flag_name_ = failure_list_flag_name;
-  }
-
-  // Sets the path of the output directory.
-  void SetOutputDir(const char* output_dir) {
-    output_dir_ = output_dir;
-  }
-
-  // Run all the conformance tests against the given test runner.
-  // Test output will be stored in "output".
-  //
-  // Returns true if the set of failing tests was exactly the same as the
-  // failure list.
-  // The filename here is *only* used to create/format useful error messages for
-  // how to update the failure list.  We do NOT read this file at all.
-  bool RunSuite(ConformanceTestRunner* runner, std::string* output,
-                const std::string& filename,
-                conformance::FailureSet* failure_list);
-
- protected:
-  // Test cases are classified into a few categories:
-  //   REQUIRED: the test case must be passed for an implementation to be
-  //             interoperable with other implementations. For example, a
-  //             parser implementation must accept both packed and unpacked
-  //             form of repeated primitive fields.
-  //   RECOMMENDED: the test case is not required for the implementation to
-  //                be interoperable with other implementations, but is
-  //                recommended for best performance and compatibility. For
-  //                example, a proto3 serializer should serialize repeated
-  //                primitive fields in packed form, but an implementation
-  //                failing to do so will still be able to communicate with
-  //                other implementations.
-  enum ConformanceLevel {
-    REQUIRED = 0,
-    RECOMMENDED = 1,
-  };
-
-  class ConformanceRequestSetting {
-   public:
-    ConformanceRequestSetting(ConformanceLevel level,
-                              conformance::WireFormat input_format,
-                              conformance::WireFormat output_format,
-                              conformance::TestCategory test_category,
-                              const Message& prototype_message,
-                              const std::string& test_name,
-                              const std::string& input);
-    virtual ~ConformanceRequestSetting() {}
-
-    std::unique_ptr<Message> NewTestMessage() const;
-
-    std::string GetTestName() const;
-
-    const conformance::ConformanceRequest& GetRequest() const {
-      return request_;
-    }
-
-    const ConformanceLevel GetLevel() const {
-      return level_;
-    }
-
-    std::string ConformanceLevelToString(ConformanceLevel level) const;
-
-    void SetPrintUnknownFields(bool print_unknown_fields) {
-      request_.set_print_unknown_fields(true);
-    }
-
-    void SetPrototypeMessageForCompare(const Message& message) {
-      prototype_message_for_compare_.reset(message.New());
-    }
-
-   protected:
-    virtual std::string InputFormatString(conformance::WireFormat format) const;
-    virtual std::string OutputFormatString(
-        conformance::WireFormat format) const;
-    conformance::ConformanceRequest request_;
-
-   private:
-    ConformanceLevel level_;
-    ::conformance::WireFormat input_format_;
-    ::conformance::WireFormat output_format_;
-    const Message& prototype_message_;
-    std::unique_ptr<Message> prototype_message_for_compare_;
-    std::string test_name_;
-  };
-
-  bool CheckSetEmpty(const std::set<std::string>& set_to_check,
-                     const std::string& write_to_file, const std::string& msg);
-  std::string WireFormatToString(conformance::WireFormat wire_format);
-
-  // Parse payload in the response to the given message. Returns true on
-  // success.
-  virtual bool ParseResponse(
-      const conformance::ConformanceResponse& response,
-      const ConformanceRequestSetting& setting,
-      Message* test_message) = 0;
-
-  void VerifyResponse(const ConformanceRequestSetting& setting,
-                      const std::string& equivalent_wire_format,
-                      const conformance::ConformanceResponse& response,
-                      bool need_report_success, bool require_same_wire_format);
-
-  void ReportSuccess(const std::string& test_name);
-  void ReportFailure(const std::string& test_name, ConformanceLevel level,
-                     const conformance::ConformanceRequest& request,
-                     const conformance::ConformanceResponse& response,
-                     const char* fmt, ...);
-  void ReportSkip(const std::string& test_name,
-                  const conformance::ConformanceRequest& request,
-                  const conformance::ConformanceResponse& response);
-
-  void RunValidInputTest(const ConformanceRequestSetting& setting,
-                         const std::string& equivalent_text_format);
-  void RunValidBinaryInputTest(const ConformanceRequestSetting& setting,
-                               const std::string& equivalent_wire_format,
-                               bool require_same_wire_format = false);
-
-  void RunTest(const std::string& test_name,
-               const conformance::ConformanceRequest& request,
-               conformance::ConformanceResponse* response);
-
-  void AddExpectedFailedTest(const std::string& test_name);
-
-  virtual void RunSuiteImpl() = 0;
-
-  ConformanceTestRunner* runner_;
-  int successes_;
-  int expected_failures_;
-  bool verbose_;
-  bool enforce_recommended_;
-  std::string output_;
-  std::string output_dir_;
-  std::string failure_list_flag_name_;
-  std::string failure_list_filename_;
-
-  // The set of test names that are expected to fail in this run, but haven't
-  // failed yet.
-  std::set<std::string> expected_to_fail_;
-
-  // The set of test names that have been run.  Used to ensure that there are no
-  // duplicate names in the suite.
-  std::set<std::string> test_names_;
-
-  // The set of tests that failed, but weren't expected to.
-  std::set<std::string> unexpected_failing_tests_;
-
-  // The set of tests that succeeded, but weren't expected to.
-  std::set<std::string> unexpected_succeeding_tests_;
-
-  // The set of tests that the testee opted out of;
-  std::set<std::string> skipped_;
-};
-
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // CONFORMANCE_CONFORMANCE_TEST_H
diff --git a/libs/protobuf/conformance/conformance_test_main.cc b/libs/protobuf/conformance/conformance_test_main.cc
deleted file mode 100644
index c7ac9fc..0000000
--- a/libs/protobuf/conformance/conformance_test_main.cc
+++ /dev/null
@@ -1,40 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include "binary_json_conformance_suite.h"
-#include "conformance_test.h"
-#include "text_format_conformance_suite.h"
-
-int main(int argc, char *argv[]) {
-  google::protobuf::BinaryAndJsonConformanceSuite binary_and_json_suite;
-  google::protobuf::TextFormatConformanceTestSuite text_format_suite;
-  return google::protobuf::ForkPipeRunner::Run(
-      argc, argv, {&binary_and_json_suite, &text_format_suite});
-}
diff --git a/libs/protobuf/conformance/conformance_test_runner.cc b/libs/protobuf/conformance/conformance_test_runner.cc
deleted file mode 100644
index 2aac35c..0000000
--- a/libs/protobuf/conformance/conformance_test_runner.cc
+++ /dev/null
@@ -1,351 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// This file contains a program for running the test suite in a separate
-// process.  The other alternative is to run the suite in-process.  See
-// conformance.proto for pros/cons of these two options.
-//
-// This program will fork the process under test and communicate with it over
-// its stdin/stdout:
-//
-//     +--------+   pipe   +----------+
-//     | tester | <------> | testee   |
-//     |        |          |          |
-//     |  C++   |          | any lang |
-//     +--------+          +----------+
-//
-// The tester contains all of the test cases and their expected output.
-// The testee is a simple program written in the target language that reads
-// each test case and attempts to produce acceptable output for it.
-//
-// Every test consists of a ConformanceRequest/ConformanceResponse
-// request/reply pair.  The protocol on the pipe is simply:
-//
-//   1. tester sends 4-byte length N (little endian)
-//   2. tester sends N bytes representing a ConformanceRequest proto
-//   3. testee sends 4-byte length M (little endian)
-//   4. testee sends M bytes representing a ConformanceResponse proto
-
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <unistd.h>
-
-#include <algorithm>
-#include <fstream>
-#include <vector>
-
-#include <google/protobuf/stubs/stringprintf.h>
-#include "conformance.pb.h"
-#include "conformance_test.h"
-
-using conformance::ConformanceResponse;
-using google::protobuf::ConformanceTestSuite;
-using std::string;
-using std::vector;
-
-#define STRINGIFY(x) #x
-#define TOSTRING(x) STRINGIFY(x)
-#define GOOGLE_CHECK_SYSCALL(call) \
-  if (call < 0) { \
-    perror(#call " " __FILE__ ":" TOSTRING(__LINE__)); \
-    exit(1); \
-  }
-
-namespace google {
-namespace protobuf {
-
-void ParseFailureList(const char *filename,
-                      conformance::FailureSet *failure_list) {
-  std::ifstream infile(filename);
-
-  if (!infile.is_open()) {
-    fprintf(stderr, "Couldn't open failure list file: %s\n", filename);
-    exit(1);
-  }
-
-  for (string line; getline(infile, line);) {
-    // Remove whitespace.
-    line.erase(std::remove_if(line.begin(), line.end(), ::isspace),
-               line.end());
-
-    // Remove comments.
-    line = line.substr(0, line.find("#"));
-
-    if (!line.empty()) {
-      failure_list->add_failure(line);
-    }
-  }
-}
-
-void UsageError() {
-  fprintf(stderr,
-          "Usage: conformance-test-runner [options] <test-program>\n");
-  fprintf(stderr, "\n");
-  fprintf(stderr, "Options:\n");
-  fprintf(stderr,
-          "  --failure_list <filename>   Use to specify list of tests\n");
-  fprintf(stderr,
-          "                              that are expected to fail.  File\n");
-  fprintf(stderr,
-          "                              should contain one test name per\n");
-  fprintf(stderr,
-          "                              line.  Use '#' for comments.\n");
-  fprintf(stderr,
-          "  --text_format_failure_list <filename>   Use to specify list \n");
-  fprintf(stderr,
-          "                              of tests that are expected to \n");
-  fprintf(stderr,
-          "                              fail in the \n");
-  fprintf(stderr,
-          "                              text_format_conformance_suite.  \n");
-  fprintf(stderr,
-          "                              File should contain one test name \n");
-  fprintf(stderr,
-          "                              per line.  Use '#' for comments.\n");
-
-  fprintf(stderr,
-          "  --enforce_recommended       Enforce that recommended test\n");
-  fprintf(stderr,
-          "                              cases are also passing. Specify\n");
-  fprintf(stderr,
-          "                              this flag if you want to be\n");
-  fprintf(stderr,
-          "                              strictly conforming to protobuf\n");
-  fprintf(stderr,
-          "                              spec.\n");
-  fprintf(stderr,
-          "  --output_dir                <dirname> Directory to write\n"
-          "                              output files.\n");
-  exit(1);
-}
-
-void ForkPipeRunner::RunTest(
-    const std::string& test_name,
-    const std::string& request,
-    std::string* response) {
-  if (child_pid_ < 0) {
-    SpawnTestProgram();
-  }
-
-  current_test_name_ = test_name;
-
-  uint32_t len = request.size();
-  CheckedWrite(write_fd_, &len, sizeof(uint32_t));
-  CheckedWrite(write_fd_, request.c_str(), request.size());
-
-  if (!TryRead(read_fd_, &len, sizeof(uint32_t))) {
-    // We failed to read from the child, assume a crash and try to reap.
-    GOOGLE_LOG(INFO) << "Trying to reap child, pid=" << child_pid_;
-
-    int status = 0;
-    waitpid(child_pid_, &status, WEXITED);
-
-    string error_msg;
-    if (WIFEXITED(status)) {
-      StringAppendF(&error_msg,
-                    "child exited, status=%d", WEXITSTATUS(status));
-    } else if (WIFSIGNALED(status)) {
-      StringAppendF(&error_msg,
-                    "child killed by signal %d", WTERMSIG(status));
-    }
-    GOOGLE_LOG(INFO) << error_msg;
-    child_pid_ = -1;
-
-    conformance::ConformanceResponse response_obj;
-    response_obj.set_runtime_error(error_msg);
-    response_obj.SerializeToString(response);
-    return;
-  }
-
-  response->resize(len);
-  CheckedRead(read_fd_, (void*)response->c_str(), len);
-}
-
-int ForkPipeRunner::Run(
-    int argc, char *argv[], const std::vector<ConformanceTestSuite*>& suites) {
-  if (suites.empty()) {
-    fprintf(stderr, "No test suites found.\n");
-    return EXIT_FAILURE;
-  }
-  bool all_ok = true;
-  for (ConformanceTestSuite* suite : suites) {
-    string program;
-    std::vector<string> program_args;
-    string failure_list_filename;
-    conformance::FailureSet failure_list;
-
-    for (int arg = 1; arg < argc; ++arg) {
-      if (strcmp(argv[arg], suite->GetFailureListFlagName().c_str()) == 0) {
-        if (++arg == argc) UsageError();
-        failure_list_filename = argv[arg];
-        ParseFailureList(argv[arg], &failure_list);
-      } else if (strcmp(argv[arg], "--verbose") == 0) {
-        suite->SetVerbose(true);
-      } else if (strcmp(argv[arg], "--enforce_recommended") == 0) {
-        suite->SetEnforceRecommended(true);
-      } else if (strcmp(argv[arg], "--output_dir") == 0) {
-        if (++arg == argc) UsageError();
-        suite->SetOutputDir(argv[arg]);
-      } else if (argv[arg][0] == '-') {
-        bool recognized_flag = false;
-        for (ConformanceTestSuite* suite : suites) {
-          if (strcmp(argv[arg], suite->GetFailureListFlagName().c_str()) == 0) {
-            if (++arg == argc) UsageError();
-            recognized_flag = true;
-          }
-        }
-        if (!recognized_flag) {
-          fprintf(stderr, "Unknown option: %s\n", argv[arg]);
-          UsageError();
-        }
-      } else {
-        program += argv[arg];
-        while (arg < argc) {
-          program_args.push_back(argv[arg]);
-          arg++;
-        }
-      }
-    }
-
-    ForkPipeRunner runner(program, program_args);
-
-    std::string output;
-    all_ok = all_ok &&
-        suite->RunSuite(&runner, &output, failure_list_filename, &failure_list);
-
-    fwrite(output.c_str(), 1, output.size(), stderr);
-  }
-  return all_ok ? EXIT_SUCCESS : EXIT_FAILURE;
-}
-
-// TODO(haberman): make this work on Windows, instead of using these
-// UNIX-specific APIs.
-//
-// There is a platform-agnostic API in
-//    src/google/protobuf/compiler/subprocess.h
-//
-// However that API only supports sending a single message to the subprocess.
-// We really want to be able to send messages and receive responses one at a
-// time:
-//
-// 1. Spawning a new process for each test would take way too long for thousands
-//    of tests and subprocesses like java that can take 100ms or more to start
-//    up.
-//
-// 2. Sending all the tests in one big message and receiving all results in one
-//    big message would take away our visibility about which test(s) caused a
-//    crash or other fatal error.  It would also give us only a single failure
-//    instead of all of them.
-void ForkPipeRunner::SpawnTestProgram() {
-  int toproc_pipe_fd[2];
-  int fromproc_pipe_fd[2];
-  if (pipe(toproc_pipe_fd) < 0 || pipe(fromproc_pipe_fd) < 0) {
-    perror("pipe");
-    exit(1);
-  }
-
-  pid_t pid = fork();
-  if (pid < 0) {
-    perror("fork");
-    exit(1);
-  }
-
-  if (pid) {
-    // Parent.
-    GOOGLE_CHECK_SYSCALL(close(toproc_pipe_fd[0]));
-    GOOGLE_CHECK_SYSCALL(close(fromproc_pipe_fd[1]));
-    write_fd_ = toproc_pipe_fd[1];
-    read_fd_ = fromproc_pipe_fd[0];
-    child_pid_ = pid;
-  } else {
-    // Child.
-    GOOGLE_CHECK_SYSCALL(close(STDIN_FILENO));
-    GOOGLE_CHECK_SYSCALL(close(STDOUT_FILENO));
-    GOOGLE_CHECK_SYSCALL(dup2(toproc_pipe_fd[0], STDIN_FILENO));
-    GOOGLE_CHECK_SYSCALL(dup2(fromproc_pipe_fd[1], STDOUT_FILENO));
-
-    GOOGLE_CHECK_SYSCALL(close(toproc_pipe_fd[0]));
-    GOOGLE_CHECK_SYSCALL(close(fromproc_pipe_fd[1]));
-    GOOGLE_CHECK_SYSCALL(close(toproc_pipe_fd[1]));
-    GOOGLE_CHECK_SYSCALL(close(fromproc_pipe_fd[0]));
-
-    std::unique_ptr<char[]> executable(new char[executable_.size() + 1]);
-    memcpy(executable.get(), executable_.c_str(), executable_.size());
-    executable[executable_.size()] = '\0';
-
-    std::vector<const char *> argv;
-    argv.push_back(executable.get());
-    for (size_t i = 0; i < executable_args_.size(); ++i) {
-      argv.push_back(executable_args_[i].c_str());
-    }
-    argv.push_back(nullptr);
-    // Never returns.
-    GOOGLE_CHECK_SYSCALL(execv(executable.get(), const_cast<char **>(argv.data())));
-  }
-}
-
-void ForkPipeRunner::CheckedWrite(int fd, const void *buf, size_t len) {
-  if (static_cast<size_t>(write(fd, buf, len)) != len) {
-    GOOGLE_LOG(FATAL) << current_test_name_
-               << ": error writing to test program: " << strerror(errno);
-  }
-}
-
-bool ForkPipeRunner::TryRead(int fd, void *buf, size_t len) {
-  size_t ofs = 0;
-  while (len > 0) {
-    ssize_t bytes_read = read(fd, (char*)buf + ofs, len);
-
-    if (bytes_read == 0) {
-      GOOGLE_LOG(ERROR) << current_test_name_ << ": unexpected EOF from test program";
-      return false;
-    } else if (bytes_read < 0) {
-      GOOGLE_LOG(ERROR) << current_test_name_
-                 << ": error reading from test program: " << strerror(errno);
-      return false;
-    }
-
-    len -= bytes_read;
-    ofs += bytes_read;
-  }
-
-  return true;
-}
-
-void ForkPipeRunner::CheckedRead(int fd, void *buf, size_t len) {
-  if (!TryRead(fd, buf, len)) {
-    GOOGLE_LOG(FATAL) << current_test_name_
-               << ": error reading from test program: " << strerror(errno);
-  }
-}
-
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/conformance/conformance_test_runner.sh b/libs/protobuf/conformance/conformance_test_runner.sh
deleted file mode 100755
index 3149f82..0000000
--- a/libs/protobuf/conformance/conformance_test_runner.sh
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/bash
-
-set -x
-echo $@
-
-set -euo pipefail
-# --- begin runfiles.bash initialization ---
-if [[ ! -d "${RUNFILES_DIR:-/dev/null}" && ! -f "${RUNFILES_MANIFEST_FILE:-/dev/null}" ]]; then
-    if [[ -f "$0.runfiles_manifest" ]]; then
-      export RUNFILES_MANIFEST_FILE="$0.runfiles_manifest"
-    elif [[ -f "$0.runfiles/MANIFEST" ]]; then
-      export RUNFILES_MANIFEST_FILE="$0.runfiles/MANIFEST"
-    elif [[ -f "$0.runfiles/bazel_tools/tools/bash/runfiles/runfiles.bash" ]]; then
-      export RUNFILES_DIR="$0.runfiles"
-    fi
-fi
-if [[ -f "${RUNFILES_DIR:-/dev/null}/bazel_tools/tools/bash/runfiles/runfiles.bash" ]]; then
-  source "${RUNFILES_DIR}/bazel_tools/tools/bash/runfiles/runfiles.bash"
-elif [[ -f "${RUNFILES_MANIFEST_FILE:-/dev/null}" ]]; then
-  source "$(grep -m1 "^bazel_tools/tools/bash/runfiles/runfiles.bash " \
-            "$RUNFILES_MANIFEST_FILE" | cut -d ' ' -f 2-)"
-else
-  echo >&2 "ERROR: cannot find @bazel_tools//tools/bash/runfiles:runfiles.bash"
-  exit 1
-fi
-# --- end runfiles.bash initialization ---
-
-TESTEE=unset
-FAILURE_LIST=unset
-TEXT_FORMAT_FAILURE_LIST=unset
-
-while [[ -n "$@" ]]; do
-  arg="$1"; shift
-  val="$1"; shift
-  case "$arg" in
-    "--testee") TESTEE="$val" ;;
-    "--failure_list") FAILURE_LIST="$val" ;;
-    "--text_format_failure_list") TEXT_FORMAT_FAILURE_LIST="$val" ;;
-    *) echo "Flag $arg is not recognized." && exit 1 ;;
-  esac
-done
-
-conformance_test_runner=$(rlocation com_google_protobuf/conformance/conformance_test_runner)
-conformance_testee=$(rlocation $TESTEE)
-args=(--enforce_recommended)
-
-failure_list=$(rlocation $FAILURE_LIST)
-if [ "$failure_list" != "1" ] ; then
-  args+=(--failure_list $failure_list)
-fi
-
-text_format_failure_list=$(rlocation $TEXT_FORMAT_FAILURE_LIST)
-if [ "$text_format_failure_list" != "1" ]; then
-  args+=(--text_format_failure_list $text_format_failure_list)
-fi
-
-$conformance_test_runner "${args[@]}" $conformance_testee
diff --git a/libs/protobuf/conformance/defs.bzl b/libs/protobuf/conformance/defs.bzl
deleted file mode 100644
index 905953a..0000000
--- a/libs/protobuf/conformance/defs.bzl
+++ /dev/null
@@ -1,28 +0,0 @@
-# PLEASE DO NOT DEPEND ON THE CONTENTS OF THIS FILE, IT IS UNSTABLE.
-
-def conformance_test(name, testee, failure_list = None, text_format_failure_list = None):
-    args = ["--testee %s" % _strip_bazel(testee)]
-    failure_lists = []
-    if failure_list:
-        args = args + ["--failure_list %s" % _strip_bazel(failure_list)]
-        failure_lists = failure_lists + [failure_list]
-    if text_format_failure_list:
-        args = args + ["--text_format_failure_list %s" % _strip_bazel(text_format_failure_list)]
-        failure_lists = failure_lists + [text_format_failure_list]
-
-    native.sh_test(
-        name = name,
-        srcs = ["//conformance:conformance_test_runner.sh"],
-        data = [testee] + failure_lists + [
-            "//conformance:conformance_test_runner",
-        ],
-        args = args,
-        deps = [
-            "@bazel_tools//tools/bash/runfiles",
-        ],
-    )
-
-def _strip_bazel(testee):
-    if testee.startswith("//"):
-        testee = testee.replace("//", "com_google_protobuf/")
-    return testee.replace(":", "/")
diff --git a/libs/protobuf/conformance/failure_list_cpp.txt b/libs/protobuf/conformance/failure_list_cpp.txt
deleted file mode 100644
index d55fa9f..0000000
--- a/libs/protobuf/conformance/failure_list_cpp.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-# This is the list of conformance tests that are known to fail for the C++
-# implementation right now.  These should be fixed.
-#
-# By listing them here we can keep tabs on which ones are failing and be sure
-# that we don't introduce regressions in other tests.
-#
-# TODO(haberman): insert links to corresponding bugs tracking the issue.
-# Should we use GitHub issues or the Google-internal bug tracker?
-
-Recommended.FieldMaskNumbersDontRoundTrip.JsonOutput
-Recommended.FieldMaskPathsDontRoundTrip.JsonOutput
-Recommended.FieldMaskTooManyUnderscore.JsonOutput
-Recommended.Proto3.JsonInput.BoolFieldDoubleQuotedFalse
-Recommended.Proto3.JsonInput.BoolFieldDoubleQuotedTrue
-Recommended.Proto3.JsonInput.BytesFieldBase64Url.JsonOutput
-Recommended.Proto3.JsonInput.BytesFieldBase64Url.ProtobufOutput
-Recommended.Proto3.JsonInput.FieldMaskInvalidCharacter
-Recommended.Proto3.JsonInput.FieldNameDuplicate
-Recommended.Proto3.JsonInput.FieldNameDuplicateDifferentCasing1
-Recommended.Proto3.JsonInput.FieldNameDuplicateDifferentCasing2
-Recommended.Proto3.JsonInput.FieldNameNotQuoted
-Recommended.Proto3.JsonInput.MapFieldValueIsNull
-Recommended.Proto3.JsonInput.RepeatedFieldMessageElementIsNull
-Recommended.Proto3.JsonInput.RepeatedFieldPrimitiveElementIsNull
-Recommended.Proto3.JsonInput.RepeatedFieldTrailingComma
-Recommended.Proto3.JsonInput.RepeatedFieldTrailingCommaWithNewlines
-Recommended.Proto3.JsonInput.RepeatedFieldTrailingCommaWithSpace
-Recommended.Proto3.JsonInput.RepeatedFieldTrailingCommaWithSpaceCommaSpace
-Recommended.Proto3.JsonInput.StringFieldSingleQuoteBoth
-Recommended.Proto3.JsonInput.StringFieldSingleQuoteKey
-Recommended.Proto3.JsonInput.StringFieldSingleQuoteValue
-Recommended.Proto3.JsonInput.StringFieldUppercaseEscapeLetter
-Recommended.Proto3.JsonInput.TrailingCommaInAnObject
-Recommended.Proto3.JsonInput.TrailingCommaInAnObjectWithNewlines
-Recommended.Proto3.JsonInput.TrailingCommaInAnObjectWithSpace
-Recommended.Proto3.JsonInput.TrailingCommaInAnObjectWithSpaceCommaSpace
-Recommended.Proto2.JsonInput.FieldNameExtension.Validator
diff --git a/libs/protobuf/conformance/failure_list_csharp.txt b/libs/protobuf/conformance/failure_list_csharp.txt
deleted file mode 100644
index bba295e..0000000
--- a/libs/protobuf/conformance/failure_list_csharp.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-Recommended.Proto2.JsonInput.FieldNameExtension.Validator
-Recommended.Proto3.JsonInput.BytesFieldBase64Url.JsonOutput
-Recommended.Proto3.JsonInput.BytesFieldBase64Url.ProtobufOutput
-Required.Proto3.JsonInput.OneofFieldNullFirst.JsonOutput
-Required.Proto3.JsonInput.OneofFieldNullFirst.ProtobufOutput
-Required.Proto3.JsonInput.OneofFieldNullSecond.JsonOutput
-Required.Proto3.JsonInput.OneofFieldNullSecond.ProtobufOutput
diff --git a/libs/protobuf/conformance/failure_list_java.txt b/libs/protobuf/conformance/failure_list_java.txt
deleted file mode 100644
index 808e230..0000000
--- a/libs/protobuf/conformance/failure_list_java.txt
+++ /dev/null
@@ -1,44 +0,0 @@
-# This is the list of conformance tests that are known to fail for the Java
-# implementation right now.  These should be fixed.
-#
-# By listing them here we can keep tabs on which ones are failing and be sure
-# that we don't introduce regressions in other tests.
-
-Recommended.FieldMaskNumbersDontRoundTrip.JsonOutput
-Recommended.FieldMaskPathsDontRoundTrip.JsonOutput
-Recommended.FieldMaskTooManyUnderscore.JsonOutput
-Recommended.Proto3.JsonInput.BoolFieldAllCapitalFalse
-Recommended.Proto3.JsonInput.BoolFieldAllCapitalTrue
-Recommended.Proto3.JsonInput.BoolFieldCamelCaseFalse
-Recommended.Proto3.JsonInput.BoolFieldCamelCaseTrue
-Recommended.Proto3.JsonInput.BoolFieldDoubleQuotedFalse
-Recommended.Proto3.JsonInput.BoolFieldDoubleQuotedTrue
-Recommended.Proto3.JsonInput.BoolMapFieldKeyNotQuoted
-Recommended.Proto3.JsonInput.DoubleFieldInfinityNotQuoted
-Recommended.Proto3.JsonInput.DoubleFieldNanNotQuoted
-Recommended.Proto3.JsonInput.DoubleFieldNegativeInfinityNotQuoted
-Recommended.Proto3.JsonInput.FieldMaskInvalidCharacter
-Recommended.Proto3.JsonInput.FieldNameDuplicate
-Recommended.Proto3.JsonInput.FieldNameNotQuoted
-Recommended.Proto3.JsonInput.FloatFieldInfinityNotQuoted
-Recommended.Proto3.JsonInput.FloatFieldNanNotQuoted
-Recommended.Proto3.JsonInput.FloatFieldNegativeInfinityNotQuoted
-Recommended.Proto3.JsonInput.Int32MapFieldKeyNotQuoted
-Recommended.Proto3.JsonInput.Int64MapFieldKeyNotQuoted
-Recommended.Proto3.JsonInput.JsonWithComments
-Recommended.Proto3.JsonInput.StringFieldSingleQuoteBoth
-Recommended.Proto3.JsonInput.StringFieldSingleQuoteKey
-Recommended.Proto3.JsonInput.StringFieldSingleQuoteValue
-Recommended.Proto3.JsonInput.StringFieldSurrogateInWrongOrder
-Recommended.Proto3.JsonInput.StringFieldUnpairedHighSurrogate
-Recommended.Proto3.JsonInput.StringFieldUnpairedLowSurrogate
-Recommended.Proto3.JsonInput.Uint32MapFieldKeyNotQuoted
-Recommended.Proto3.JsonInput.Uint64MapFieldKeyNotQuoted
-Recommended.Proto2.JsonInput.FieldNameExtension.Validator
-Required.Proto3.JsonInput.EnumFieldNotQuoted
-Required.Proto3.JsonInput.Int32FieldLeadingZero
-Required.Proto3.JsonInput.Int32FieldNegativeWithLeadingZero
-Required.Proto3.JsonInput.Int32FieldPlusSign
-Required.Proto3.JsonInput.RepeatedFieldWrongElementTypeExpectingStringsGotBool
-Required.Proto3.JsonInput.RepeatedFieldWrongElementTypeExpectingStringsGotInt
-Required.Proto3.JsonInput.StringFieldNotAString
diff --git a/libs/protobuf/conformance/failure_list_java_lite.txt b/libs/protobuf/conformance/failure_list_java_lite.txt
deleted file mode 100644
index 57a082e..0000000
--- a/libs/protobuf/conformance/failure_list_java_lite.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-# This is the list of conformance tests that are known to fail for the Java
-# implementation right now. These should be fixed.
-#
-# By listing them here we can keep tabs on which ones are failing and be sure
-# that we don't introduce regressions in other tests.
-
-Required.Proto3.ProtobufInput.PrematureEofInDelimitedDataForKnownNonRepeatedValue.MESSAGE
-Required.Proto3.ProtobufInput.PrematureEofInDelimitedDataForKnownRepeatedValue.MESSAGE
-Required.Proto2.ProtobufInput.PrematureEofInDelimitedDataForKnownNonRepeatedValue.MESSAGE
-Required.Proto2.ProtobufInput.PrematureEofInDelimitedDataForKnownRepeatedValue.MESSAGE
diff --git a/libs/protobuf/conformance/failure_list_jruby.txt b/libs/protobuf/conformance/failure_list_jruby.txt
deleted file mode 100644
index 516192e..0000000
--- a/libs/protobuf/conformance/failure_list_jruby.txt
+++ /dev/null
@@ -1,95 +0,0 @@
-Recommended.FieldMaskNumbersDontRoundTrip.JsonOutput
-Recommended.FieldMaskPathsDontRoundTrip.JsonOutput
-Recommended.FieldMaskTooManyUnderscore.JsonOutput
-Recommended.Proto2.JsonInput.FieldNameExtension.Validator
-Recommended.Proto2.ProtobufInput.ValidDataRepeated.BOOL.PackedInput.PackedOutput.ProtobufOutput
-Recommended.Proto2.ProtobufInput.ValidDataRepeated.BOOL.UnpackedInput.PackedOutput.ProtobufOutput
-Recommended.Proto2.ProtobufInput.ValidDataRepeated.DOUBLE.PackedInput.PackedOutput.ProtobufOutput
-Recommended.Proto2.ProtobufInput.ValidDataRepeated.DOUBLE.UnpackedInput.PackedOutput.ProtobufOutput
-Recommended.Proto2.ProtobufInput.ValidDataRepeated.ENUM.PackedInput.PackedOutput.ProtobufOutput
-Recommended.Proto2.ProtobufInput.ValidDataRepeated.ENUM.UnpackedInput.PackedOutput.ProtobufOutput
-Recommended.Proto2.ProtobufInput.ValidDataRepeated.FIXED32.PackedInput.PackedOutput.ProtobufOutput
-Recommended.Proto2.ProtobufInput.ValidDataRepeated.FIXED32.UnpackedInput.PackedOutput.ProtobufOutput
-Recommended.Proto2.ProtobufInput.ValidDataRepeated.FIXED64.PackedInput.PackedOutput.ProtobufOutput
-Recommended.Proto2.ProtobufInput.ValidDataRepeated.FIXED64.UnpackedInput.PackedOutput.ProtobufOutput
-Recommended.Proto2.ProtobufInput.ValidDataRepeated.FLOAT.PackedInput.PackedOutput.ProtobufOutput
-Recommended.Proto2.ProtobufInput.ValidDataRepeated.FLOAT.UnpackedInput.PackedOutput.ProtobufOutput
-Recommended.Proto2.ProtobufInput.ValidDataRepeated.INT32.PackedInput.PackedOutput.ProtobufOutput
-Recommended.Proto2.ProtobufInput.ValidDataRepeated.INT32.UnpackedInput.PackedOutput.ProtobufOutput
-Recommended.Proto2.ProtobufInput.ValidDataRepeated.INT64.PackedInput.PackedOutput.ProtobufOutput
-Recommended.Proto2.ProtobufInput.ValidDataRepeated.INT64.UnpackedInput.PackedOutput.ProtobufOutput
-Recommended.Proto2.ProtobufInput.ValidDataRepeated.SFIXED32.PackedInput.PackedOutput.ProtobufOutput
-Recommended.Proto2.ProtobufInput.ValidDataRepeated.SFIXED32.UnpackedInput.PackedOutput.ProtobufOutput
-Recommended.Proto2.ProtobufInput.ValidDataRepeated.SFIXED64.PackedInput.PackedOutput.ProtobufOutput
-Recommended.Proto2.ProtobufInput.ValidDataRepeated.SFIXED64.UnpackedInput.PackedOutput.ProtobufOutput
-Recommended.Proto2.ProtobufInput.ValidDataRepeated.SINT32.PackedInput.PackedOutput.ProtobufOutput
-Recommended.Proto2.ProtobufInput.ValidDataRepeated.SINT32.UnpackedInput.PackedOutput.ProtobufOutput
-Recommended.Proto2.ProtobufInput.ValidDataRepeated.SINT64.PackedInput.PackedOutput.ProtobufOutput
-Recommended.Proto2.ProtobufInput.ValidDataRepeated.SINT64.UnpackedInput.PackedOutput.ProtobufOutput
-Recommended.Proto2.ProtobufInput.ValidDataRepeated.UINT32.PackedInput.PackedOutput.ProtobufOutput
-Recommended.Proto2.ProtobufInput.ValidDataRepeated.UINT32.UnpackedInput.PackedOutput.ProtobufOutput
-Recommended.Proto2.ProtobufInput.ValidDataRepeated.UINT64.PackedInput.PackedOutput.ProtobufOutput
-Recommended.Proto2.ProtobufInput.ValidDataRepeated.UINT64.UnpackedInput.PackedOutput.ProtobufOutput
-Recommended.Proto3.JsonInput.BoolFieldAllCapitalFalse
-Recommended.Proto3.JsonInput.BoolFieldAllCapitalTrue
-Recommended.Proto3.JsonInput.BoolFieldCamelCaseFalse
-Recommended.Proto3.JsonInput.BoolFieldCamelCaseTrue
-Recommended.Proto3.JsonInput.BoolFieldDoubleQuotedFalse
-Recommended.Proto3.JsonInput.BoolFieldDoubleQuotedTrue
-Recommended.Proto3.JsonInput.BoolMapFieldKeyNotQuoted
-Recommended.Proto3.JsonInput.DoubleFieldInfinityNotQuoted
-Recommended.Proto3.JsonInput.DoubleFieldNanNotQuoted
-Recommended.Proto3.JsonInput.DoubleFieldNegativeInfinityNotQuoted
-Recommended.Proto3.JsonInput.FieldMaskInvalidCharacter
-Recommended.Proto3.JsonInput.FieldNameDuplicate
-Recommended.Proto3.JsonInput.FieldNameNotQuoted
-Recommended.Proto3.JsonInput.FloatFieldInfinityNotQuoted
-Recommended.Proto3.JsonInput.FloatFieldNanNotQuoted
-Recommended.Proto3.JsonInput.FloatFieldNegativeInfinityNotQuoted
-Recommended.Proto3.JsonInput.Int32MapFieldKeyNotQuoted
-Recommended.Proto3.JsonInput.Int64MapFieldKeyNotQuoted
-Recommended.Proto3.JsonInput.JsonWithComments
-Recommended.Proto3.JsonInput.StringFieldSingleQuoteBoth
-Recommended.Proto3.JsonInput.StringFieldSingleQuoteKey
-Recommended.Proto3.JsonInput.StringFieldSingleQuoteValue
-Recommended.Proto3.JsonInput.StringFieldSurrogateInWrongOrder
-Recommended.Proto3.JsonInput.StringFieldUnpairedHighSurrogate
-Recommended.Proto3.JsonInput.StringFieldUnpairedLowSurrogate
-Recommended.Proto3.JsonInput.Uint32MapFieldKeyNotQuoted
-Recommended.Proto3.JsonInput.Uint64MapFieldKeyNotQuoted
-Recommended.Proto3.ProtobufInput.ValidDataOneofBinary.MESSAGE.Merge.ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataRepeated.BOOL.PackedInput.UnpackedOutput.ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataRepeated.BOOL.UnpackedInput.UnpackedOutput.ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataRepeated.DOUBLE.PackedInput.UnpackedOutput.ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataRepeated.DOUBLE.UnpackedInput.UnpackedOutput.ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataRepeated.ENUM.PackedInput.UnpackedOutput.ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataRepeated.ENUM.UnpackedInput.UnpackedOutput.ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataRepeated.FIXED32.PackedInput.UnpackedOutput.ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataRepeated.FIXED32.UnpackedInput.UnpackedOutput.ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataRepeated.FIXED64.PackedInput.UnpackedOutput.ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataRepeated.FIXED64.UnpackedInput.UnpackedOutput.ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataRepeated.FLOAT.PackedInput.UnpackedOutput.ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataRepeated.FLOAT.UnpackedInput.UnpackedOutput.ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataRepeated.INT32.PackedInput.UnpackedOutput.ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataRepeated.INT32.UnpackedInput.UnpackedOutput.ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataRepeated.INT64.PackedInput.UnpackedOutput.ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataRepeated.INT64.UnpackedInput.UnpackedOutput.ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataRepeated.SFIXED32.PackedInput.UnpackedOutput.ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataRepeated.SFIXED32.UnpackedInput.UnpackedOutput.ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataRepeated.SFIXED64.PackedInput.UnpackedOutput.ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataRepeated.SFIXED64.UnpackedInput.UnpackedOutput.ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataRepeated.SINT32.PackedInput.UnpackedOutput.ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataRepeated.SINT32.UnpackedInput.UnpackedOutput.ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataRepeated.SINT64.PackedInput.UnpackedOutput.ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataRepeated.SINT64.UnpackedInput.UnpackedOutput.ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataRepeated.UINT32.PackedInput.UnpackedOutput.ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataRepeated.UINT32.UnpackedInput.UnpackedOutput.ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataRepeated.UINT64.PackedInput.UnpackedOutput.ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataRepeated.UINT64.UnpackedInput.UnpackedOutput.ProtobufOutput
-Required.Proto3.JsonInput.EnumFieldNotQuoted
-Required.Proto3.JsonInput.Int32FieldLeadingZero
-Required.Proto3.JsonInput.Int32FieldNegativeWithLeadingZero
-Required.Proto3.JsonInput.Int32FieldPlusSign
-Required.Proto3.JsonInput.RepeatedFieldWrongElementTypeExpectingStringsGotBool
-Required.Proto3.JsonInput.RepeatedFieldWrongElementTypeExpectingStringsGotInt
-Required.Proto3.JsonInput.StringFieldNotAString
diff --git a/libs/protobuf/conformance/failure_list_js.txt b/libs/protobuf/conformance/failure_list_js.txt
deleted file mode 100644
index b7d36b6..0000000
--- a/libs/protobuf/conformance/failure_list_js.txt
+++ /dev/null
@@ -1,162 +0,0 @@
-Recommended.Proto2.ProtobufInput.ValidDataRepeated.ENUM.UnpackedInput.DefaultOutput.ProtobufOutput
-Recommended.Proto2.ProtobufInput.ValidDataRepeated.ENUM.UnpackedInput.PackedOutput.ProtobufOutput
-Recommended.Proto2.ProtobufInput.ValidDataRepeated.ENUM.UnpackedInput.UnpackedOutput.ProtobufOutput
-Recommended.Proto2.ProtobufInput.ValidDataRepeated.FIXED64.PackedInput.DefaultOutput.ProtobufOutput
-Recommended.Proto2.ProtobufInput.ValidDataRepeated.FIXED64.PackedInput.PackedOutput.ProtobufOutput
-Recommended.Proto2.ProtobufInput.ValidDataRepeated.FIXED64.PackedInput.UnpackedOutput.ProtobufOutput
-Recommended.Proto2.ProtobufInput.ValidDataRepeated.FIXED64.UnpackedInput.DefaultOutput.ProtobufOutput
-Recommended.Proto2.ProtobufInput.ValidDataRepeated.FIXED64.UnpackedInput.PackedOutput.ProtobufOutput
-Recommended.Proto2.ProtobufInput.ValidDataRepeated.FIXED64.UnpackedInput.UnpackedOutput.ProtobufOutput
-Recommended.Proto2.ProtobufInput.ValidDataRepeated.INT32.PackedInput.DefaultOutput.ProtobufOutput
-Recommended.Proto2.ProtobufInput.ValidDataRepeated.INT32.PackedInput.PackedOutput.ProtobufOutput
-Recommended.Proto2.ProtobufInput.ValidDataRepeated.INT32.PackedInput.UnpackedOutput.ProtobufOutput
-Recommended.Proto2.ProtobufInput.ValidDataRepeated.INT32.UnpackedInput.DefaultOutput.ProtobufOutput
-Recommended.Proto2.ProtobufInput.ValidDataRepeated.INT32.UnpackedInput.PackedOutput.ProtobufOutput
-Recommended.Proto2.ProtobufInput.ValidDataRepeated.INT32.UnpackedInput.UnpackedOutput.ProtobufOutput
-Recommended.Proto2.ProtobufInput.ValidDataRepeated.INT64.PackedInput.DefaultOutput.ProtobufOutput
-Recommended.Proto2.ProtobufInput.ValidDataRepeated.INT64.PackedInput.PackedOutput.ProtobufOutput
-Recommended.Proto2.ProtobufInput.ValidDataRepeated.INT64.PackedInput.UnpackedOutput.ProtobufOutput
-Recommended.Proto2.ProtobufInput.ValidDataRepeated.INT64.UnpackedInput.DefaultOutput.ProtobufOutput
-Recommended.Proto2.ProtobufInput.ValidDataRepeated.INT64.UnpackedInput.PackedOutput.ProtobufOutput
-Recommended.Proto2.ProtobufInput.ValidDataRepeated.INT64.UnpackedInput.UnpackedOutput.ProtobufOutput
-Recommended.Proto2.ProtobufInput.ValidDataRepeated.SFIXED64.PackedInput.DefaultOutput.ProtobufOutput
-Recommended.Proto2.ProtobufInput.ValidDataRepeated.SFIXED64.PackedInput.PackedOutput.ProtobufOutput
-Recommended.Proto2.ProtobufInput.ValidDataRepeated.SFIXED64.PackedInput.UnpackedOutput.ProtobufOutput
-Recommended.Proto2.ProtobufInput.ValidDataRepeated.SFIXED64.UnpackedInput.DefaultOutput.ProtobufOutput
-Recommended.Proto2.ProtobufInput.ValidDataRepeated.SFIXED64.UnpackedInput.PackedOutput.ProtobufOutput
-Recommended.Proto2.ProtobufInput.ValidDataRepeated.SFIXED64.UnpackedInput.UnpackedOutput.ProtobufOutput
-Recommended.Proto2.ProtobufInput.ValidDataRepeated.SINT64.PackedInput.DefaultOutput.ProtobufOutput
-Recommended.Proto2.ProtobufInput.ValidDataRepeated.SINT64.PackedInput.PackedOutput.ProtobufOutput
-Recommended.Proto2.ProtobufInput.ValidDataRepeated.SINT64.PackedInput.UnpackedOutput.ProtobufOutput
-Recommended.Proto2.ProtobufInput.ValidDataRepeated.SINT64.UnpackedInput.DefaultOutput.ProtobufOutput
-Recommended.Proto2.ProtobufInput.ValidDataRepeated.SINT64.UnpackedInput.PackedOutput.ProtobufOutput
-Recommended.Proto2.ProtobufInput.ValidDataRepeated.SINT64.UnpackedInput.UnpackedOutput.ProtobufOutput
-Recommended.Proto2.ProtobufInput.ValidDataRepeated.UINT32.PackedInput.DefaultOutput.ProtobufOutput
-Recommended.Proto2.ProtobufInput.ValidDataRepeated.UINT32.PackedInput.PackedOutput.ProtobufOutput
-Recommended.Proto2.ProtobufInput.ValidDataRepeated.UINT32.PackedInput.UnpackedOutput.ProtobufOutput
-Recommended.Proto2.ProtobufInput.ValidDataRepeated.UINT32.UnpackedInput.DefaultOutput.ProtobufOutput
-Recommended.Proto2.ProtobufInput.ValidDataRepeated.UINT32.UnpackedInput.PackedOutput.ProtobufOutput
-Recommended.Proto2.ProtobufInput.ValidDataRepeated.UINT32.UnpackedInput.UnpackedOutput.ProtobufOutput
-Recommended.Proto2.ProtobufInput.ValidDataRepeated.UINT64.PackedInput.DefaultOutput.ProtobufOutput
-Recommended.Proto2.ProtobufInput.ValidDataRepeated.UINT64.PackedInput.PackedOutput.ProtobufOutput
-Recommended.Proto2.ProtobufInput.ValidDataRepeated.UINT64.PackedInput.UnpackedOutput.ProtobufOutput
-Recommended.Proto2.ProtobufInput.ValidDataRepeated.UINT64.UnpackedInput.DefaultOutput.ProtobufOutput
-Recommended.Proto2.ProtobufInput.ValidDataRepeated.UINT64.UnpackedInput.PackedOutput.ProtobufOutput
-Recommended.Proto2.ProtobufInput.ValidDataRepeated.UINT64.UnpackedInput.UnpackedOutput.ProtobufOutput
-Recommended.Proto2.ProtobufInput.ValidDataScalarBinary.ENUM[4].ProtobufOutput
-Recommended.Proto2.ProtobufInput.ValidDataScalarBinary.ENUM[5].ProtobufOutput
-Recommended.Proto2.ProtobufInput.ValidDataScalarBinary.FIXED64[2].ProtobufOutput
-Recommended.Proto2.ProtobufInput.ValidDataScalarBinary.INT32[7].ProtobufOutput
-Recommended.Proto2.ProtobufInput.ValidDataScalarBinary.INT64[2].ProtobufOutput
-Recommended.Proto2.ProtobufInput.ValidDataScalarBinary.SFIXED64[2].ProtobufOutput
-Recommended.Proto2.ProtobufInput.ValidDataScalarBinary.SINT64[2].ProtobufOutput
-Recommended.Proto2.ProtobufInput.ValidDataScalarBinary.UINT32[8].ProtobufOutput
-Recommended.Proto2.ProtobufInput.ValidDataScalarBinary.UINT64[2].ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataRepeated.ENUM.UnpackedInput.DefaultOutput.ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataRepeated.ENUM.UnpackedInput.PackedOutput.ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataRepeated.ENUM.UnpackedInput.UnpackedOutput.ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataRepeated.FIXED64.PackedInput.DefaultOutput.ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataRepeated.FIXED64.PackedInput.PackedOutput.ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataRepeated.FIXED64.PackedInput.UnpackedOutput.ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataRepeated.FIXED64.UnpackedInput.DefaultOutput.ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataRepeated.FIXED64.UnpackedInput.PackedOutput.ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataRepeated.FIXED64.UnpackedInput.UnpackedOutput.ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataRepeated.INT32.PackedInput.DefaultOutput.ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataRepeated.INT32.PackedInput.PackedOutput.ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataRepeated.INT32.PackedInput.UnpackedOutput.ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataRepeated.INT32.UnpackedInput.DefaultOutput.ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataRepeated.INT32.UnpackedInput.PackedOutput.ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataRepeated.INT32.UnpackedInput.UnpackedOutput.ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataRepeated.INT64.PackedInput.DefaultOutput.ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataRepeated.INT64.PackedInput.PackedOutput.ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataRepeated.INT64.PackedInput.UnpackedOutput.ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataRepeated.INT64.UnpackedInput.DefaultOutput.ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataRepeated.INT64.UnpackedInput.PackedOutput.ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataRepeated.INT64.UnpackedInput.UnpackedOutput.ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataRepeated.SFIXED64.PackedInput.DefaultOutput.ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataRepeated.SFIXED64.PackedInput.PackedOutput.ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataRepeated.SFIXED64.PackedInput.UnpackedOutput.ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataRepeated.SFIXED64.UnpackedInput.DefaultOutput.ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataRepeated.SFIXED64.UnpackedInput.PackedOutput.ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataRepeated.SFIXED64.UnpackedInput.UnpackedOutput.ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataRepeated.SINT64.PackedInput.DefaultOutput.ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataRepeated.SINT64.PackedInput.PackedOutput.ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataRepeated.SINT64.PackedInput.UnpackedOutput.ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataRepeated.SINT64.UnpackedInput.DefaultOutput.ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataRepeated.SINT64.UnpackedInput.PackedOutput.ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataRepeated.SINT64.UnpackedInput.UnpackedOutput.ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataRepeated.UINT32.PackedInput.DefaultOutput.ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataRepeated.UINT32.PackedInput.PackedOutput.ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataRepeated.UINT32.PackedInput.UnpackedOutput.ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataRepeated.UINT32.UnpackedInput.DefaultOutput.ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataRepeated.UINT32.UnpackedInput.PackedOutput.ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataRepeated.UINT32.UnpackedInput.UnpackedOutput.ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataRepeated.UINT64.PackedInput.DefaultOutput.ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataRepeated.UINT64.PackedInput.PackedOutput.ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataRepeated.UINT64.PackedInput.UnpackedOutput.ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataRepeated.UINT64.UnpackedInput.DefaultOutput.ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataRepeated.UINT64.UnpackedInput.PackedOutput.ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataRepeated.UINT64.UnpackedInput.UnpackedOutput.ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataScalarBinary.ENUM[4].ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataScalarBinary.ENUM[5].ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataScalarBinary.FIXED64[2].ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataScalarBinary.INT32[7].ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataScalarBinary.INT64[2].ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataScalarBinary.SFIXED64[2].ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataScalarBinary.SINT64[2].ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataScalarBinary.UINT32[8].ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataScalarBinary.UINT64[2].ProtobufOutput
-Required.Proto2.ProtobufInput.RepeatedScalarSelectsLast.ENUM.ProtobufOutput
-Required.Proto2.ProtobufInput.RepeatedScalarSelectsLast.FIXED64.ProtobufOutput
-Required.Proto2.ProtobufInput.RepeatedScalarSelectsLast.UINT64.ProtobufOutput
-Required.Proto2.ProtobufInput.ValidDataRepeated.ENUM.UnpackedInput.ProtobufOutput
-Required.Proto2.ProtobufInput.ValidDataRepeated.FIXED64.PackedInput.ProtobufOutput
-Required.Proto2.ProtobufInput.ValidDataRepeated.FIXED64.UnpackedInput.ProtobufOutput
-Required.Proto2.ProtobufInput.ValidDataRepeated.INT32.PackedInput.ProtobufOutput
-Required.Proto2.ProtobufInput.ValidDataRepeated.INT32.UnpackedInput.ProtobufOutput
-Required.Proto2.ProtobufInput.ValidDataRepeated.INT64.PackedInput.ProtobufOutput
-Required.Proto2.ProtobufInput.ValidDataRepeated.INT64.UnpackedInput.ProtobufOutput
-Required.Proto2.ProtobufInput.ValidDataRepeated.SFIXED64.PackedInput.ProtobufOutput
-Required.Proto2.ProtobufInput.ValidDataRepeated.SFIXED64.UnpackedInput.ProtobufOutput
-Required.Proto2.ProtobufInput.ValidDataRepeated.SINT64.PackedInput.ProtobufOutput
-Required.Proto2.ProtobufInput.ValidDataRepeated.SINT64.UnpackedInput.ProtobufOutput
-Required.Proto2.ProtobufInput.ValidDataRepeated.UINT32.PackedInput.ProtobufOutput
-Required.Proto2.ProtobufInput.ValidDataRepeated.UINT32.UnpackedInput.ProtobufOutput
-Required.Proto2.ProtobufInput.ValidDataRepeated.UINT64.PackedInput.ProtobufOutput
-Required.Proto2.ProtobufInput.ValidDataRepeated.UINT64.UnpackedInput.ProtobufOutput
-Required.Proto2.ProtobufInput.ValidDataScalar.ENUM[4].ProtobufOutput
-Required.Proto2.ProtobufInput.ValidDataScalar.ENUM[5].ProtobufOutput
-Required.Proto2.ProtobufInput.ValidDataScalar.FIXED64[2].ProtobufOutput
-Required.Proto2.ProtobufInput.ValidDataScalar.INT32[7].ProtobufOutput
-Required.Proto2.ProtobufInput.ValidDataScalar.INT64[2].ProtobufOutput
-Required.Proto2.ProtobufInput.ValidDataScalar.SFIXED64[2].ProtobufOutput
-Required.Proto2.ProtobufInput.ValidDataScalar.SINT64[2].ProtobufOutput
-Required.Proto2.ProtobufInput.ValidDataScalar.UINT32[8].ProtobufOutput
-Required.Proto2.ProtobufInput.ValidDataScalar.UINT64[2].ProtobufOutput
-Required.Proto3.ProtobufInput.RepeatedScalarSelectsLast.ENUM.ProtobufOutput
-Required.Proto3.ProtobufInput.RepeatedScalarSelectsLast.FIXED64.ProtobufOutput
-Required.Proto3.ProtobufInput.RepeatedScalarSelectsLast.UINT64.ProtobufOutput
-Required.Proto3.ProtobufInput.ValidDataRepeated.ENUM.UnpackedInput.ProtobufOutput
-Required.Proto3.ProtobufInput.ValidDataRepeated.FIXED64.PackedInput.ProtobufOutput
-Required.Proto3.ProtobufInput.ValidDataRepeated.FIXED64.UnpackedInput.ProtobufOutput
-Required.Proto3.ProtobufInput.ValidDataRepeated.INT32.PackedInput.ProtobufOutput
-Required.Proto3.ProtobufInput.ValidDataRepeated.INT32.UnpackedInput.ProtobufOutput
-Required.Proto3.ProtobufInput.ValidDataRepeated.INT64.PackedInput.ProtobufOutput
-Required.Proto3.ProtobufInput.ValidDataRepeated.INT64.UnpackedInput.ProtobufOutput
-Required.Proto3.ProtobufInput.ValidDataRepeated.SFIXED64.PackedInput.ProtobufOutput
-Required.Proto3.ProtobufInput.ValidDataRepeated.SFIXED64.UnpackedInput.ProtobufOutput
-Required.Proto3.ProtobufInput.ValidDataRepeated.SINT64.PackedInput.ProtobufOutput
-Required.Proto3.ProtobufInput.ValidDataRepeated.SINT64.UnpackedInput.ProtobufOutput
-Required.Proto3.ProtobufInput.ValidDataRepeated.UINT32.PackedInput.ProtobufOutput
-Required.Proto3.ProtobufInput.ValidDataRepeated.UINT32.UnpackedInput.ProtobufOutput
-Required.Proto3.ProtobufInput.ValidDataRepeated.UINT64.PackedInput.ProtobufOutput
-Required.Proto3.ProtobufInput.ValidDataRepeated.UINT64.UnpackedInput.ProtobufOutput
-Required.Proto3.ProtobufInput.ValidDataScalar.ENUM[4].ProtobufOutput
-Required.Proto3.ProtobufInput.ValidDataScalar.ENUM[5].ProtobufOutput
-Required.Proto3.ProtobufInput.ValidDataScalar.FIXED64[2].ProtobufOutput
-Required.Proto3.ProtobufInput.ValidDataScalar.INT32[7].ProtobufOutput
-Required.Proto3.ProtobufInput.ValidDataScalar.INT64[2].ProtobufOutput
-Required.Proto3.ProtobufInput.ValidDataScalar.SFIXED64[2].ProtobufOutput
-Required.Proto3.ProtobufInput.ValidDataScalar.SINT64[2].ProtobufOutput
-Required.Proto3.ProtobufInput.ValidDataScalar.UINT32[8].ProtobufOutput
-Required.Proto3.ProtobufInput.ValidDataScalar.UINT64[2].ProtobufOutput
diff --git a/libs/protobuf/conformance/failure_list_objc.txt b/libs/protobuf/conformance/failure_list_objc.txt
deleted file mode 100644
index e34501e..0000000
--- a/libs/protobuf/conformance/failure_list_objc.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-# JSON input or output tests are skipped (in conformance_objc.m) as mobile
-# platforms don't support JSON wire format to avoid code bloat.
diff --git a/libs/protobuf/conformance/failure_list_php.txt b/libs/protobuf/conformance/failure_list_php.txt
deleted file mode 100644
index 667f80c..0000000
--- a/libs/protobuf/conformance/failure_list_php.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-Recommended.FieldMaskNumbersDontRoundTrip.JsonOutput
-Recommended.FieldMaskPathsDontRoundTrip.JsonOutput
-Recommended.FieldMaskTooManyUnderscore.JsonOutput
-Recommended.Proto2.JsonInput.FieldNameExtension.Validator
-Recommended.Proto3.JsonInput.BytesFieldBase64Url.JsonOutput
-Recommended.Proto3.JsonInput.BytesFieldBase64Url.ProtobufOutput
-Recommended.Proto3.JsonInput.FieldMaskInvalidCharacter
-Recommended.Proto3.ProtobufInput.ValidDataOneofBinary.MESSAGE.Merge.ProtobufOutput
-Required.Proto2.JsonInput.StoresDefaultPrimitive.Validator
-Required.Proto3.JsonInput.DoubleFieldTooSmall
-Required.Proto3.JsonInput.FloatFieldTooLarge
-Required.Proto3.JsonInput.FloatFieldTooSmall
-Required.Proto3.JsonInput.Int32FieldNotInteger
-Required.Proto3.JsonInput.Int64FieldNotInteger
-Required.Proto3.JsonInput.OneofFieldDuplicate
-Required.Proto3.JsonInput.OneofFieldNullSecond.JsonOutput
-Required.Proto3.JsonInput.OneofFieldNullSecond.ProtobufOutput
-Required.Proto3.JsonInput.RepeatedFieldWrongElementTypeExpectingStringsGotInt
-Required.Proto3.JsonInput.RepeatedListValue.JsonOutput
-Required.Proto3.JsonInput.RepeatedListValue.ProtobufOutput
-Required.Proto3.JsonInput.StringFieldNotAString
-Required.Proto3.JsonInput.Uint32FieldNotInteger
-Required.Proto3.JsonInput.Uint64FieldNotInteger
-Required.Proto3.ProtobufInput.RepeatedScalarMessageMerge.JsonOutput
-Required.Proto3.ProtobufInput.RepeatedScalarMessageMerge.ProtobufOutput
-Required.Proto3.ProtobufInput.ValidDataOneof.MESSAGE.Merge.JsonOutput
-Required.Proto3.ProtobufInput.ValidDataOneof.MESSAGE.Merge.ProtobufOutput
-Required.Proto3.ProtobufInput.ValidDataRepeated.FLOAT.PackedInput.JsonOutput
-Required.Proto3.ProtobufInput.ValidDataRepeated.FLOAT.UnpackedInput.JsonOutput
-Required.Proto3.ProtobufInput.ValidDataScalar.FLOAT[2].JsonOutput
diff --git a/libs/protobuf/conformance/failure_list_php_c.txt b/libs/protobuf/conformance/failure_list_php_c.txt
deleted file mode 100644
index 63c7e8a..0000000
--- a/libs/protobuf/conformance/failure_list_php_c.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Recommended.Proto2.JsonInput.FieldNameExtension.Validator
-Required.Proto2.JsonInput.StoresDefaultPrimitive.Validator
diff --git a/libs/protobuf/conformance/failure_list_python-post26.txt b/libs/protobuf/conformance/failure_list_python-post26.txt
deleted file mode 100644
index 19d99b0..0000000
--- a/libs/protobuf/conformance/failure_list_python-post26.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-JsonInput.StringFieldSurrogateInWrongOrder
-JsonInput.StringFieldUnpairedHighSurrogate
diff --git a/libs/protobuf/conformance/failure_list_python.txt b/libs/protobuf/conformance/failure_list_python.txt
deleted file mode 100644
index e69de29..0000000
diff --git a/libs/protobuf/conformance/failure_list_python_cpp.txt b/libs/protobuf/conformance/failure_list_python_cpp.txt
deleted file mode 100644
index 9efb6cf..0000000
--- a/libs/protobuf/conformance/failure_list_python_cpp.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-# This is the list of conformance tests that are known to fail for the
-# Python/C++ implementation right now.  These should be fixed.
-#
-# By listing them here we can keep tabs on which ones are failing and be sure
-# that we don't introduce regressions in other tests.
-#
-# TODO(haberman): insert links to corresponding bugs tracking the issue.
-# Should we use GitHub issues or the Google-internal bug tracker?
diff --git a/libs/protobuf/conformance/failure_list_ruby.txt b/libs/protobuf/conformance/failure_list_ruby.txt
deleted file mode 100644
index 4938202..0000000
--- a/libs/protobuf/conformance/failure_list_ruby.txt
+++ /dev/null
@@ -1,58 +0,0 @@
-Recommended.Proto2.JsonInput.FieldNameExtension.Validator
-Recommended.Proto2.ProtobufInput.ValidDataRepeated.BOOL.PackedInput.PackedOutput.ProtobufOutput
-Recommended.Proto2.ProtobufInput.ValidDataRepeated.BOOL.UnpackedInput.PackedOutput.ProtobufOutput
-Recommended.Proto2.ProtobufInput.ValidDataRepeated.DOUBLE.PackedInput.PackedOutput.ProtobufOutput
-Recommended.Proto2.ProtobufInput.ValidDataRepeated.DOUBLE.UnpackedInput.PackedOutput.ProtobufOutput
-Recommended.Proto2.ProtobufInput.ValidDataRepeated.ENUM.PackedInput.PackedOutput.ProtobufOutput
-Recommended.Proto2.ProtobufInput.ValidDataRepeated.ENUM.UnpackedInput.PackedOutput.ProtobufOutput
-Recommended.Proto2.ProtobufInput.ValidDataRepeated.FIXED32.PackedInput.PackedOutput.ProtobufOutput
-Recommended.Proto2.ProtobufInput.ValidDataRepeated.FIXED32.UnpackedInput.PackedOutput.ProtobufOutput
-Recommended.Proto2.ProtobufInput.ValidDataRepeated.FIXED64.PackedInput.PackedOutput.ProtobufOutput
-Recommended.Proto2.ProtobufInput.ValidDataRepeated.FIXED64.UnpackedInput.PackedOutput.ProtobufOutput
-Recommended.Proto2.ProtobufInput.ValidDataRepeated.FLOAT.PackedInput.PackedOutput.ProtobufOutput
-Recommended.Proto2.ProtobufInput.ValidDataRepeated.FLOAT.UnpackedInput.PackedOutput.ProtobufOutput
-Recommended.Proto2.ProtobufInput.ValidDataRepeated.INT32.PackedInput.PackedOutput.ProtobufOutput
-Recommended.Proto2.ProtobufInput.ValidDataRepeated.INT32.UnpackedInput.PackedOutput.ProtobufOutput
-Recommended.Proto2.ProtobufInput.ValidDataRepeated.INT64.PackedInput.PackedOutput.ProtobufOutput
-Recommended.Proto2.ProtobufInput.ValidDataRepeated.INT64.UnpackedInput.PackedOutput.ProtobufOutput
-Recommended.Proto2.ProtobufInput.ValidDataRepeated.SFIXED32.PackedInput.PackedOutput.ProtobufOutput
-Recommended.Proto2.ProtobufInput.ValidDataRepeated.SFIXED32.UnpackedInput.PackedOutput.ProtobufOutput
-Recommended.Proto2.ProtobufInput.ValidDataRepeated.SFIXED64.PackedInput.PackedOutput.ProtobufOutput
-Recommended.Proto2.ProtobufInput.ValidDataRepeated.SFIXED64.UnpackedInput.PackedOutput.ProtobufOutput
-Recommended.Proto2.ProtobufInput.ValidDataRepeated.SINT32.PackedInput.PackedOutput.ProtobufOutput
-Recommended.Proto2.ProtobufInput.ValidDataRepeated.SINT32.UnpackedInput.PackedOutput.ProtobufOutput
-Recommended.Proto2.ProtobufInput.ValidDataRepeated.SINT64.PackedInput.PackedOutput.ProtobufOutput
-Recommended.Proto2.ProtobufInput.ValidDataRepeated.SINT64.UnpackedInput.PackedOutput.ProtobufOutput
-Recommended.Proto2.ProtobufInput.ValidDataRepeated.UINT32.PackedInput.PackedOutput.ProtobufOutput
-Recommended.Proto2.ProtobufInput.ValidDataRepeated.UINT32.UnpackedInput.PackedOutput.ProtobufOutput
-Recommended.Proto2.ProtobufInput.ValidDataRepeated.UINT64.PackedInput.PackedOutput.ProtobufOutput
-Recommended.Proto2.ProtobufInput.ValidDataRepeated.UINT64.UnpackedInput.PackedOutput.ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataOneofBinary.MESSAGE.Merge.ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataRepeated.BOOL.PackedInput.UnpackedOutput.ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataRepeated.BOOL.UnpackedInput.UnpackedOutput.ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataRepeated.DOUBLE.PackedInput.UnpackedOutput.ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataRepeated.DOUBLE.UnpackedInput.UnpackedOutput.ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataRepeated.ENUM.PackedInput.UnpackedOutput.ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataRepeated.ENUM.UnpackedInput.UnpackedOutput.ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataRepeated.FIXED32.PackedInput.UnpackedOutput.ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataRepeated.FIXED32.UnpackedInput.UnpackedOutput.ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataRepeated.FIXED64.PackedInput.UnpackedOutput.ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataRepeated.FIXED64.UnpackedInput.UnpackedOutput.ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataRepeated.FLOAT.PackedInput.UnpackedOutput.ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataRepeated.FLOAT.UnpackedInput.UnpackedOutput.ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataRepeated.INT32.PackedInput.UnpackedOutput.ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataRepeated.INT32.UnpackedInput.UnpackedOutput.ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataRepeated.INT64.PackedInput.UnpackedOutput.ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataRepeated.INT64.UnpackedInput.UnpackedOutput.ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataRepeated.SFIXED32.PackedInput.UnpackedOutput.ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataRepeated.SFIXED32.UnpackedInput.UnpackedOutput.ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataRepeated.SFIXED64.PackedInput.UnpackedOutput.ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataRepeated.SFIXED64.UnpackedInput.UnpackedOutput.ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataRepeated.SINT32.PackedInput.UnpackedOutput.ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataRepeated.SINT32.UnpackedInput.UnpackedOutput.ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataRepeated.SINT64.PackedInput.UnpackedOutput.ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataRepeated.SINT64.UnpackedInput.UnpackedOutput.ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataRepeated.UINT32.PackedInput.UnpackedOutput.ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataRepeated.UINT32.UnpackedInput.UnpackedOutput.ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataRepeated.UINT64.PackedInput.UnpackedOutput.ProtobufOutput
-Recommended.Proto3.ProtobufInput.ValidDataRepeated.UINT64.UnpackedInput.UnpackedOutput.ProtobufOutput
diff --git a/libs/protobuf/conformance/text_format_conformance_suite.cc b/libs/protobuf/conformance/text_format_conformance_suite.cc
deleted file mode 100644
index 460bc24..0000000
--- a/libs/protobuf/conformance/text_format_conformance_suite.cc
+++ /dev/null
@@ -1,478 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include "text_format_conformance_suite.h"
-
-#include <google/protobuf/any.pb.h>
-#include <google/protobuf/text_format.h>
-#include "conformance_test.h"
-#include <google/protobuf/test_messages_proto2.pb.h>
-#include <google/protobuf/test_messages_proto3.pb.h>
-
-namespace proto2_messages = protobuf_test_messages::proto2;
-
-using conformance::ConformanceRequest;
-using conformance::ConformanceResponse;
-using conformance::WireFormat;
-using google::protobuf::Message;
-using google::protobuf::TextFormat;
-using proto2_messages::TestAllTypesProto2;
-using proto2_messages::UnknownToTestAllTypes;
-using protobuf_test_messages::proto3::TestAllTypesProto3;
-using std::string;
-
-namespace google {
-namespace protobuf {
-
-TextFormatConformanceTestSuite::TextFormatConformanceTestSuite() {
-  SetFailureListFlagName("--text_format_failure_list");
-}
-
-bool TextFormatConformanceTestSuite::ParseTextFormatResponse(
-    const ConformanceResponse& response,
-    const ConformanceRequestSetting& setting, Message* test_message) {
-  TextFormat::Parser parser;
-  const ConformanceRequest& request = setting.GetRequest();
-  if (request.print_unknown_fields()) {
-    parser.AllowFieldNumber(true);
-  }
-  if (!parser.ParseFromString(response.text_payload(), test_message)) {
-    GOOGLE_LOG(ERROR) << "INTERNAL ERROR: internal text->protobuf transcode "
-               << "yielded unparseable proto. Text payload: "
-               << response.text_payload();
-    return false;
-  }
-
-  return true;
-}
-
-bool TextFormatConformanceTestSuite::ParseResponse(
-    const ConformanceResponse& response,
-    const ConformanceRequestSetting& setting, Message* test_message) {
-  const ConformanceRequest& request = setting.GetRequest();
-  WireFormat requested_output = request.requested_output_format();
-  const string& test_name = setting.GetTestName();
-  ConformanceLevel level = setting.GetLevel();
-
-  switch (response.result_case()) {
-    case ConformanceResponse::kProtobufPayload: {
-      if (requested_output != conformance::PROTOBUF) {
-        ReportFailure(test_name, level, request, response,
-                      StrCat("Test was asked for ",
-                                   WireFormatToString(requested_output),
-                                   " output but provided PROTOBUF instead.")
-                          .c_str());
-        return false;
-      }
-
-      if (!test_message->ParseFromString(response.protobuf_payload())) {
-        ReportFailure(test_name, level, request, response,
-                      "Protobuf output we received from test was unparseable.");
-        return false;
-      }
-
-      break;
-    }
-
-    case ConformanceResponse::kTextPayload: {
-      if (requested_output != conformance::TEXT_FORMAT) {
-        ReportFailure(test_name, level, request, response,
-                      StrCat("Test was asked for ",
-                                   WireFormatToString(requested_output),
-                                   " output but provided TEXT_FORMAT instead.")
-                          .c_str());
-        return false;
-      }
-
-      if (!ParseTextFormatResponse(response, setting, test_message)) {
-        ReportFailure(
-            test_name, level, request, response,
-            "TEXT_FORMAT output we received from test was unparseable.");
-        return false;
-      }
-
-      break;
-    }
-
-    default:
-      GOOGLE_LOG(FATAL) << test_name
-                 << ": unknown payload type: " << response.result_case();
-  }
-
-  return true;
-}
-
-void TextFormatConformanceTestSuite::ExpectParseFailure(const string& test_name,
-                                                        ConformanceLevel level,
-                                                        const string& input) {
-  TestAllTypesProto3 prototype;
-  // We don't expect output, but if the program erroneously accepts the protobuf
-  // we let it send its response as this.  We must not leave it unspecified.
-  ConformanceRequestSetting setting(
-      level, conformance::TEXT_FORMAT, conformance::TEXT_FORMAT,
-      conformance::TEXT_FORMAT_TEST, prototype, test_name, input);
-  const ConformanceRequest& request = setting.GetRequest();
-  ConformanceResponse response;
-  string effective_test_name =
-      StrCat(setting.ConformanceLevelToString(level),
-                   ".Proto3.TextFormatInput.", test_name);
-
-  RunTest(effective_test_name, request, &response);
-  if (response.result_case() == ConformanceResponse::kParseError) {
-    ReportSuccess(effective_test_name);
-  } else if (response.result_case() == ConformanceResponse::kSkipped) {
-    ReportSkip(effective_test_name, request, response);
-  } else {
-    ReportFailure(effective_test_name, level, request, response,
-                  "Should have failed to parse, but didn't.");
-  }
-}
-
-void TextFormatConformanceTestSuite::RunValidTextFormatTest(
-    const string& test_name, ConformanceLevel level, const string& input_text) {
-  TestAllTypesProto3 prototype;
-  RunValidTextFormatTestWithMessage(test_name, level, input_text, prototype);
-}
-
-void TextFormatConformanceTestSuite::RunValidTextFormatTestProto2(
-    const string& test_name, ConformanceLevel level, const string& input_text) {
-  TestAllTypesProto2 prototype;
-  RunValidTextFormatTestWithMessage(test_name, level, input_text, prototype);
-}
-
-void TextFormatConformanceTestSuite::RunValidTextFormatTestWithMessage(
-    const string& test_name, ConformanceLevel level, const string& input_text,
-    const Message& prototype) {
-  ConformanceRequestSetting setting1(
-      level, conformance::TEXT_FORMAT, conformance::PROTOBUF,
-      conformance::TEXT_FORMAT_TEST, prototype, test_name, input_text);
-  RunValidInputTest(setting1, input_text);
-  ConformanceRequestSetting setting2(
-      level, conformance::TEXT_FORMAT, conformance::TEXT_FORMAT,
-      conformance::TEXT_FORMAT_TEST, prototype, test_name, input_text);
-  RunValidInputTest(setting2, input_text);
-}
-
-void TextFormatConformanceTestSuite::RunValidUnknownTextFormatTest(
-    const string& test_name, const Message& message) {
-  string serialized_input;
-  message.SerializeToString(&serialized_input);
-  TestAllTypesProto3 prototype;
-  ConformanceRequestSetting setting1(
-      RECOMMENDED, conformance::PROTOBUF, conformance::TEXT_FORMAT,
-      conformance::TEXT_FORMAT_TEST, prototype, test_name + "_Drop",
-      serialized_input);
-  setting1.SetPrototypeMessageForCompare(message);
-  RunValidBinaryInputTest(setting1, "");
-
-  ConformanceRequestSetting setting2(
-      RECOMMENDED, conformance::PROTOBUF, conformance::TEXT_FORMAT,
-      conformance::TEXT_FORMAT_TEST, prototype, test_name + "_Print",
-      serialized_input);
-  setting2.SetPrototypeMessageForCompare(message);
-  setting2.SetPrintUnknownFields(true);
-  RunValidBinaryInputTest(setting2, serialized_input);
-}
-
-void TextFormatConformanceTestSuite::RunSuiteImpl() {
-  RunValidTextFormatTest("HelloWorld", REQUIRED,
-                         "optional_string: 'Hello, World!'");
-  // Integer fields.
-  RunValidTextFormatTest("Int32FieldMaxValue", REQUIRED,
-                         "optional_int32: 2147483647");
-  RunValidTextFormatTest("Int32FieldMinValue", REQUIRED,
-                         "optional_int32: -2147483648");
-  RunValidTextFormatTest("Uint32FieldMaxValue", REQUIRED,
-                         "optional_uint32: 4294967295");
-  RunValidTextFormatTest("Int64FieldMaxValue", REQUIRED,
-                         "optional_int64: 9223372036854775807");
-  RunValidTextFormatTest("Int64FieldMinValue", REQUIRED,
-                         "optional_int64: -9223372036854775808");
-  RunValidTextFormatTest("Uint64FieldMaxValue", REQUIRED,
-                         "optional_uint64: 18446744073709551615");
-
-  // Parsers reject out-of-bound integer values.
-  ExpectParseFailure("Int32FieldTooLarge", REQUIRED,
-                     "optional_int32: 2147483648");
-  ExpectParseFailure("Int32FieldTooSmall", REQUIRED,
-                     "optional_int32: -2147483649");
-  ExpectParseFailure("Uint32FieldTooLarge", REQUIRED,
-                     "optional_uint32: 4294967296");
-  ExpectParseFailure("Int64FieldTooLarge", REQUIRED,
-                     "optional_int64: 9223372036854775808");
-  ExpectParseFailure("Int64FieldTooSmall", REQUIRED,
-                     "optional_int64: -9223372036854775809");
-  ExpectParseFailure("Uint64FieldTooLarge", REQUIRED,
-                     "optional_uint64: 18446744073709551616");
-
-  // Floating point fields
-  RunValidTextFormatTest("FloatField", REQUIRED,
-                         "optional_float: 3.192837");
-  RunValidTextFormatTest("FloatFieldWithVeryPreciseNumber", REQUIRED,
-                         "optional_float: 3.123456789123456789");
-  RunValidTextFormatTest("FloatFieldMaxValue", REQUIRED,
-                         "optional_float: 3.4028235e+38");
-  RunValidTextFormatTest("FloatFieldMinValue", REQUIRED,
-                         "optional_float: 1.17549e-38");
-  RunValidTextFormatTest("FloatFieldNaNValue", REQUIRED,
-                         "optional_float: NaN");
-  RunValidTextFormatTest("FloatFieldPosInfValue", REQUIRED,
-                         "optional_float: inf");
-  RunValidTextFormatTest("FloatFieldNegInfValue", REQUIRED,
-                         "optional_float: -inf");
-  RunValidTextFormatTest("FloatFieldWithInt32Max", REQUIRED,
-                         "optional_float: 4294967296");
-  RunValidTextFormatTest("FloatFieldLargerThanInt64", REQUIRED,
-                         "optional_float: 9223372036854775808");
-  RunValidTextFormatTest("FloatFieldTooLarge", REQUIRED,
-                         "optional_float: 3.4028235e+39");
-  RunValidTextFormatTest("FloatFieldTooSmall", REQUIRED,
-                         "optional_float: 1.17549e-39");
-  RunValidTextFormatTest("FloatFieldLargerThanUint64", REQUIRED,
-                         "optional_float: 18446744073709551616");
-
-  // String literals x {Strings, Bytes}
-  for (const auto& field_type : std::vector<std::string>{"String", "Bytes"}) {
-    const std::string field_name =
-        field_type == "String" ? "optional_string" : "optional_bytes";
-    RunValidTextFormatTest(
-        StrCat("StringLiteralConcat", field_type), REQUIRED,
-        StrCat(field_name, ": 'first' \"second\"\n'third'"));
-    RunValidTextFormatTest(
-        StrCat("StringLiteralBasicEscapes", field_type), REQUIRED,
-        StrCat(field_name, ": '\\a\\b\\f\\n\\r\\t\\v\\?\\\\\\'\\\"'"));
-    RunValidTextFormatTest(
-        StrCat("StringLiteralOctalEscapes", field_type), REQUIRED,
-        StrCat(field_name, ": '\\341\\210\\264'"));
-    RunValidTextFormatTest(StrCat("StringLiteralHexEscapes", field_type),
-                           REQUIRED,
-                           StrCat(field_name, ": '\\xe1\\x88\\xb4'"));
-    RunValidTextFormatTest(
-        StrCat("StringLiteralShortUnicodeEscape", field_type),
-        RECOMMENDED, StrCat(field_name, ": '\\u1234'"));
-    RunValidTextFormatTest(
-        StrCat("StringLiteralLongUnicodeEscapes", field_type),
-        RECOMMENDED, StrCat(field_name, ": '\\U00001234\\U00010437'"));
-    // String literals don't include line feeds.
-    ExpectParseFailure(StrCat("StringLiteralIncludesLF", field_type),
-                       REQUIRED,
-                       StrCat(field_name, ": 'first line\nsecond line'"));
-    // Unicode escapes don't include code points that lie beyond the planes
-    // (> 0x10ffff).
-    ExpectParseFailure(
-        StrCat("StringLiteralLongUnicodeEscapeTooLarge", field_type),
-        REQUIRED, StrCat(field_name, ": '\\U00110000'"));
-    // Unicode escapes don't include surrogates.
-    ExpectParseFailure(
-        StrCat("StringLiteralShortUnicodeEscapeSurrogatePair",
-                     field_type),
-        RECOMMENDED, StrCat(field_name, ": '\\ud801\\udc37'"));
-    ExpectParseFailure(
-        StrCat("StringLiteralShortUnicodeEscapeSurrogateFirstOnly",
-                     field_type),
-        RECOMMENDED, StrCat(field_name, ": '\\ud800'"));
-    ExpectParseFailure(
-        StrCat("StringLiteralShortUnicodeEscapeSurrogateSecondOnly",
-                     field_type),
-        RECOMMENDED, StrCat(field_name, ": '\\udc00'"));
-    ExpectParseFailure(
-        StrCat("StringLiteralLongUnicodeEscapeSurrogateFirstOnly",
-                     field_type),
-        RECOMMENDED, StrCat(field_name, ": '\\U0000d800'"));
-    ExpectParseFailure(
-        StrCat("StringLiteralLongUnicodeEscapeSurrogateSecondOnly",
-                     field_type),
-        RECOMMENDED, StrCat(field_name, ": '\\U0000dc00'"));
-    ExpectParseFailure(
-        StrCat("StringLiteralLongUnicodeEscapeSurrogatePair", field_type),
-        RECOMMENDED, StrCat(field_name, ": '\\U0000d801\\U00000dc37'"));
-    ExpectParseFailure(
-        StrCat("StringLiteralUnicodeEscapeSurrogatePairLongShort",
-                     field_type),
-        RECOMMENDED, StrCat(field_name, ": '\\U0000d801\\udc37'"));
-    ExpectParseFailure(
-        StrCat("StringLiteralUnicodeEscapeSurrogatePairShortLong",
-                     field_type),
-        RECOMMENDED, StrCat(field_name, ": '\\ud801\\U0000dc37'"));
-
-    // The following method depend on the type of field, as strings have extra
-    // validation.
-    const auto test_method =
-        field_type == "String"
-            ? &TextFormatConformanceTestSuite::ExpectParseFailure
-            : &TextFormatConformanceTestSuite::RunValidTextFormatTest;
-
-    // String fields reject invalid UTF-8 byte sequences; bytes fields don't.
-    (this->*test_method)(StrCat(field_type, "FieldBadUTF8Octal"),
-                         REQUIRED, StrCat(field_name, ": '\\300'"));
-    (this->*test_method)(StrCat(field_type, "FieldBadUTF8Hex"), REQUIRED,
-                         StrCat(field_name, ": '\\xc0'"));
-  }
-
-  // Group fields
-  RunValidTextFormatTestProto2("GroupFieldNoColon", REQUIRED,
-                               "Data { group_int32: 1 }");
-  RunValidTextFormatTestProto2("GroupFieldWithColon", REQUIRED,
-                               "Data: { group_int32: 1 }");
-  RunValidTextFormatTestProto2("GroupFieldEmpty", REQUIRED,
-                               "Data {}");
-
-
-  // Unknown Fields
-  UnknownToTestAllTypes message;
-  // Unable to print unknown Fixed32/Fixed64 fields as if they are known.
-  // Fixed32/Fixed64 fields are not added in the tests.
-  message.set_optional_int32(123);
-  message.set_optional_string("hello");
-  message.set_optional_bool(true);
-  RunValidUnknownTextFormatTest("ScalarUnknownFields", message);
-
-  message.Clear();
-  message.mutable_nested_message()->set_c(111);
-  RunValidUnknownTextFormatTest("MessageUnknownFields", message);
-
-  message.Clear();
-  message.mutable_optionalgroup()->set_a(321);
-  RunValidUnknownTextFormatTest("GroupUnknownFields", message);
-
-  message.add_repeated_int32(1);
-  message.add_repeated_int32(2);
-  message.add_repeated_int32(3);
-  RunValidUnknownTextFormatTest("RepeatedUnknownFields", message);
-
-  // Any fields
-  RunValidTextFormatTest("AnyField", REQUIRED,
-                         R"(
-      optional_any: {
-        [type.googleapis.com/protobuf_test_messages.proto3.TestAllTypesProto3] {
-          optional_int32: 12345
-        }
-      }
-      )");
-  RunValidTextFormatTest("AnyFieldWithRawBytes", REQUIRED,
-                         R"(
-      optional_any: {
-        type_url: "type.googleapis.com/protobuf_test_messages.proto3.TestAllTypesProto3"
-        value: "\b\271`"
-      }
-      )");
-  ExpectParseFailure("AnyFieldWithInvalidType", REQUIRED,
-                     R"(
-      optional_any: {
-        [type.googleapis.com/unknown] {
-          optional_int32: 12345
-        }
-      }
-      )");
-
-  // Map fields
-  TestAllTypesProto3 prototype;
-  (*prototype.mutable_map_string_string())["c"] = "value";
-  (*prototype.mutable_map_string_string())["b"] = "value";
-  (*prototype.mutable_map_string_string())["a"] = "value";
-  RunValidTextFormatTestWithMessage("AlphabeticallySortedMapStringKeys",
-                                    REQUIRED,
-                                    R"(
-      map_string_string {
-        key: "a"
-        value: "value"
-      }
-      map_string_string {
-        key: "b"
-        value: "value"
-      }
-      map_string_string {
-        key: "c"
-        value: "value"
-      }
-      )",
-                                    prototype);
-
-  prototype.Clear();
-  (*prototype.mutable_map_int32_int32())[3] = 0;
-  (*prototype.mutable_map_int32_int32())[2] = 0;
-  (*prototype.mutable_map_int32_int32())[1] = 0;
-  RunValidTextFormatTestWithMessage("AlphabeticallySortedMapIntKeys", REQUIRED,
-                                    R"(
-      map_int32_int32 {
-        key: 1
-        value: 0
-      }
-      map_int32_int32 {
-        key: 2
-        value: 0
-      }
-      map_int32_int32 {
-        key: 3
-        value: 0
-      }
-      )",
-                                    prototype);
-
-  prototype.Clear();
-  (*prototype.mutable_map_bool_bool())[true] = false;
-  (*prototype.mutable_map_bool_bool())[false] = false;
-  RunValidTextFormatTestWithMessage("AlphabeticallySortedMapBoolKeys", REQUIRED,
-                                    R"(
-      map_bool_bool {
-        key: false
-        value: false
-      }
-      map_bool_bool {
-        key: true
-        value: false
-      }
-      )",
-                                    prototype);
-
-  prototype.Clear();
-  ConformanceRequestSetting setting_map(
-      REQUIRED, conformance::TEXT_FORMAT, conformance::PROTOBUF,
-      conformance::TEXT_FORMAT_TEST, prototype, "DuplicateMapKey", R"(
-      map_string_nested_message {
-        key: "duplicate"
-        value: { a: 123 }
-      }
-      map_string_nested_message {
-        key: "duplicate"
-        value: { corecursive: {} }
-      }
-      )");
-  // The last-specified value will be retained in a parsed map
-  RunValidInputTest(setting_map, R"(
-      map_string_nested_message {
-        key: "duplicate"
-        value: { corecursive: {} }
-      }
-      )");
-}
-
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/conformance/text_format_conformance_suite.h b/libs/protobuf/conformance/text_format_conformance_suite.h
deleted file mode 100644
index e875f31..0000000
--- a/libs/protobuf/conformance/text_format_conformance_suite.h
+++ /dev/null
@@ -1,69 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef TEXT_FORMAT_CONFORMANCE_SUITE_H_
-#define TEXT_FORMAT_CONFORMANCE_SUITE_H_
-
-#include "conformance_test.h"
-
-namespace google {
-namespace protobuf {
-
-class TextFormatConformanceTestSuite : public ConformanceTestSuite {
- public:
-  TextFormatConformanceTestSuite();
-
- private:
-  void RunSuiteImpl() override;
-  void RunValidTextFormatTest(const std::string& test_name,
-                              ConformanceLevel level, const std::string& input);
-  void RunValidTextFormatTestProto2(const std::string& test_name,
-                                    ConformanceLevel level,
-                                    const std::string& input);
-  void RunValidTextFormatTestWithMessage(const std::string& test_name,
-                                         ConformanceLevel level,
-                                         const std::string& input_text,
-                                         const Message& prototype);
-  void RunValidUnknownTextFormatTest(const std::string& test_name,
-                                     const Message& message);
-  void ExpectParseFailure(const std::string& test_name, ConformanceLevel level,
-                          const std::string& input);
-  bool ParseTextFormatResponse(const conformance::ConformanceResponse& response,
-                               const ConformanceRequestSetting& setting,
-                               Message* test_message);
-  bool ParseResponse(const conformance::ConformanceResponse& response,
-                     const ConformanceRequestSetting& setting,
-                     Message* test_message) override;
-};
-
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // TEXT_FORMAT_CONFORMANCE_SUITE_H_
diff --git a/libs/protobuf/conformance/text_format_failure_list_cpp.txt b/libs/protobuf/conformance/text_format_failure_list_cpp.txt
deleted file mode 100644
index a25f04f..0000000
--- a/libs/protobuf/conformance/text_format_failure_list_cpp.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-Recommended.Proto3.TextFormatInput.StringLiteralLongUnicodeEscapeSurrogateFirstOnlyBytes
-Recommended.Proto3.TextFormatInput.StringLiteralLongUnicodeEscapeSurrogateFirstOnlyString
-Recommended.Proto3.TextFormatInput.StringLiteralLongUnicodeEscapeSurrogatePairBytes
-Recommended.Proto3.TextFormatInput.StringLiteralLongUnicodeEscapeSurrogatePairString
-Recommended.Proto3.TextFormatInput.StringLiteralLongUnicodeEscapeSurrogateSecondOnlyBytes
-Recommended.Proto3.TextFormatInput.StringLiteralLongUnicodeEscapeSurrogateSecondOnlyString
-Recommended.Proto3.TextFormatInput.StringLiteralShortUnicodeEscapeSurrogateFirstOnlyBytes
-Recommended.Proto3.TextFormatInput.StringLiteralShortUnicodeEscapeSurrogateFirstOnlyString
-Recommended.Proto3.TextFormatInput.StringLiteralShortUnicodeEscapeSurrogatePairBytes
-Recommended.Proto3.TextFormatInput.StringLiteralShortUnicodeEscapeSurrogatePairString
-Recommended.Proto3.TextFormatInput.StringLiteralShortUnicodeEscapeSurrogateSecondOnlyBytes
-Recommended.Proto3.TextFormatInput.StringLiteralShortUnicodeEscapeSurrogateSecondOnlyString
-Recommended.Proto3.TextFormatInput.StringLiteralUnicodeEscapeSurrogatePairLongShortBytes
-Recommended.Proto3.TextFormatInput.StringLiteralUnicodeEscapeSurrogatePairLongShortString
-Recommended.Proto3.TextFormatInput.StringLiteralUnicodeEscapeSurrogatePairShortLongBytes
-Recommended.Proto3.TextFormatInput.StringLiteralUnicodeEscapeSurrogatePairShortLongString
-Required.Proto3.TextFormatInput.StringFieldBadUTF8Hex
-Required.Proto3.TextFormatInput.StringFieldBadUTF8Octal
-Required.Proto3.TextFormatInput.StringLiteralLongUnicodeEscapeTooLargeBytes
-Required.Proto3.TextFormatInput.StringLiteralLongUnicodeEscapeTooLargeString
diff --git a/libs/protobuf/conformance/text_format_failure_list_csharp.txt b/libs/protobuf/conformance/text_format_failure_list_csharp.txt
deleted file mode 100644
index 404b64a..0000000
--- a/libs/protobuf/conformance/text_format_failure_list_csharp.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Recommended.Proto3.ProtobufInput.GroupUnknownFields_Drop.TextFormatOutput
-Recommended.Proto3.ProtobufInput.GroupUnknownFields_Print.TextFormatOutput
-Recommended.Proto3.ProtobufInput.MessageUnknownFields_Drop.TextFormatOutput
-Recommended.Proto3.ProtobufInput.MessageUnknownFields_Print.TextFormatOutput
-Recommended.Proto3.ProtobufInput.RepeatedUnknownFields_Drop.TextFormatOutput
-Recommended.Proto3.ProtobufInput.RepeatedUnknownFields_Print.TextFormatOutput
-Recommended.Proto3.ProtobufInput.ScalarUnknownFields_Drop.TextFormatOutput
-Recommended.Proto3.ProtobufInput.ScalarUnknownFields_Print.TextFormatOutput
diff --git a/libs/protobuf/conformance/text_format_failure_list_java.txt b/libs/protobuf/conformance/text_format_failure_list_java.txt
deleted file mode 100644
index 793aae1..0000000
--- a/libs/protobuf/conformance/text_format_failure_list_java.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-Recommended.Proto3.ProtobufInput.GroupUnknownFields_Drop.TextFormatOutput
-Recommended.Proto3.ProtobufInput.MessageUnknownFields_Drop.TextFormatOutput
-Recommended.Proto3.ProtobufInput.RepeatedUnknownFields_Drop.TextFormatOutput
-Recommended.Proto3.ProtobufInput.ScalarUnknownFields_Drop.TextFormatOutput
-Required.Proto3.TextFormatInput.AnyField.ProtobufOutput
-Required.Proto3.TextFormatInput.AnyField.TextFormatOutput
-
-Required.Proto3.TextFormatInput.StringFieldBadUTF8Hex
-Required.Proto3.TextFormatInput.StringFieldBadUTF8Octal
diff --git a/libs/protobuf/conformance/text_format_failure_list_java_lite.txt b/libs/protobuf/conformance/text_format_failure_list_java_lite.txt
deleted file mode 100644
index 61f1a96..0000000
--- a/libs/protobuf/conformance/text_format_failure_list_java_lite.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-# This is the list of conformance tests that are known to fail for the Java
-# Lite TextFormat implementation right now. These should be fixed.
-#
-# By listing them here we can keep tabs on which ones are failing and be sure
-# that we don't introduce regressions in other tests.
diff --git a/libs/protobuf/conformance/text_format_failure_list_jruby.txt b/libs/protobuf/conformance/text_format_failure_list_jruby.txt
deleted file mode 100644
index 404b64a..0000000
--- a/libs/protobuf/conformance/text_format_failure_list_jruby.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Recommended.Proto3.ProtobufInput.GroupUnknownFields_Drop.TextFormatOutput
-Recommended.Proto3.ProtobufInput.GroupUnknownFields_Print.TextFormatOutput
-Recommended.Proto3.ProtobufInput.MessageUnknownFields_Drop.TextFormatOutput
-Recommended.Proto3.ProtobufInput.MessageUnknownFields_Print.TextFormatOutput
-Recommended.Proto3.ProtobufInput.RepeatedUnknownFields_Drop.TextFormatOutput
-Recommended.Proto3.ProtobufInput.RepeatedUnknownFields_Print.TextFormatOutput
-Recommended.Proto3.ProtobufInput.ScalarUnknownFields_Drop.TextFormatOutput
-Recommended.Proto3.ProtobufInput.ScalarUnknownFields_Print.TextFormatOutput
diff --git a/libs/protobuf/conformance/text_format_failure_list_php.txt b/libs/protobuf/conformance/text_format_failure_list_php.txt
deleted file mode 100644
index 404b64a..0000000
--- a/libs/protobuf/conformance/text_format_failure_list_php.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Recommended.Proto3.ProtobufInput.GroupUnknownFields_Drop.TextFormatOutput
-Recommended.Proto3.ProtobufInput.GroupUnknownFields_Print.TextFormatOutput
-Recommended.Proto3.ProtobufInput.MessageUnknownFields_Drop.TextFormatOutput
-Recommended.Proto3.ProtobufInput.MessageUnknownFields_Print.TextFormatOutput
-Recommended.Proto3.ProtobufInput.RepeatedUnknownFields_Drop.TextFormatOutput
-Recommended.Proto3.ProtobufInput.RepeatedUnknownFields_Print.TextFormatOutput
-Recommended.Proto3.ProtobufInput.ScalarUnknownFields_Drop.TextFormatOutput
-Recommended.Proto3.ProtobufInput.ScalarUnknownFields_Print.TextFormatOutput
diff --git a/libs/protobuf/conformance/text_format_failure_list_python.txt b/libs/protobuf/conformance/text_format_failure_list_python.txt
deleted file mode 100644
index 6bf7c1a..0000000
--- a/libs/protobuf/conformance/text_format_failure_list_python.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-# This is the list of text format conformance tests that are known to fail right
-# now.
-# TODO: These should be fixed.
-Required.Proto3.TextFormatInput.FloatFieldMaxValue.ProtobufOutput
-Required.Proto3.TextFormatInput.FloatFieldMaxValue.TextFormatOutput
-
-Recommended.Proto3.TextFormatInput.StringLiteralLongUnicodeEscapeSurrogateFirstOnlyBytes
-Recommended.Proto3.TextFormatInput.StringLiteralLongUnicodeEscapeSurrogateFirstOnlyString
-Recommended.Proto3.TextFormatInput.StringLiteralLongUnicodeEscapeSurrogatePairBytes
-Recommended.Proto3.TextFormatInput.StringLiteralLongUnicodeEscapeSurrogatePairString
-Recommended.Proto3.TextFormatInput.StringLiteralLongUnicodeEscapeSurrogateSecondOnlyBytes
-Recommended.Proto3.TextFormatInput.StringLiteralLongUnicodeEscapeSurrogateSecondOnlyString
-Recommended.Proto3.TextFormatInput.StringLiteralLongUnicodeEscapesBytes.ProtobufOutput
-Recommended.Proto3.TextFormatInput.StringLiteralLongUnicodeEscapesBytes.TextFormatOutput
-Recommended.Proto3.TextFormatInput.StringLiteralLongUnicodeEscapesString.ProtobufOutput
-Recommended.Proto3.TextFormatInput.StringLiteralLongUnicodeEscapesString.TextFormatOutput
-Recommended.Proto3.TextFormatInput.StringLiteralShortUnicodeEscapeBytes.ProtobufOutput
-Recommended.Proto3.TextFormatInput.StringLiteralShortUnicodeEscapeBytes.TextFormatOutput
-Recommended.Proto3.TextFormatInput.StringLiteralShortUnicodeEscapeString.ProtobufOutput
-Recommended.Proto3.TextFormatInput.StringLiteralShortUnicodeEscapeString.TextFormatOutput
-Recommended.Proto3.TextFormatInput.StringLiteralShortUnicodeEscapeSurrogateFirstOnlyBytes
-Recommended.Proto3.TextFormatInput.StringLiteralShortUnicodeEscapeSurrogateFirstOnlyString
-Recommended.Proto3.TextFormatInput.StringLiteralShortUnicodeEscapeSurrogatePairBytes
-Recommended.Proto3.TextFormatInput.StringLiteralShortUnicodeEscapeSurrogatePairString
-Recommended.Proto3.TextFormatInput.StringLiteralShortUnicodeEscapeSurrogateSecondOnlyBytes
-Recommended.Proto3.TextFormatInput.StringLiteralShortUnicodeEscapeSurrogateSecondOnlyString
-Recommended.Proto3.TextFormatInput.StringLiteralUnicodeEscapeSurrogatePairLongShortBytes
-Recommended.Proto3.TextFormatInput.StringLiteralUnicodeEscapeSurrogatePairLongShortString
-Recommended.Proto3.TextFormatInput.StringLiteralUnicodeEscapeSurrogatePairShortLongBytes
-Recommended.Proto3.TextFormatInput.StringLiteralUnicodeEscapeSurrogatePairShortLongString
-Required.Proto3.TextFormatInput.StringLiteralBasicEscapesBytes.ProtobufOutput
-Required.Proto3.TextFormatInput.StringLiteralBasicEscapesBytes.TextFormatOutput
-Required.Proto3.TextFormatInput.StringLiteralBasicEscapesString.ProtobufOutput
-Required.Proto3.TextFormatInput.StringLiteralBasicEscapesString.TextFormatOutput
diff --git a/libs/protobuf/conformance/text_format_failure_list_python_cpp.txt b/libs/protobuf/conformance/text_format_failure_list_python_cpp.txt
deleted file mode 100644
index 91fc2ea..0000000
--- a/libs/protobuf/conformance/text_format_failure_list_python_cpp.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-Recommended.Proto3.TextFormatInput.StringLiteralLongUnicodeEscapeSurrogateFirstOnlyBytes
-Recommended.Proto3.TextFormatInput.StringLiteralLongUnicodeEscapeSurrogateFirstOnlyString
-Recommended.Proto3.TextFormatInput.StringLiteralLongUnicodeEscapeSurrogatePairBytes
-Recommended.Proto3.TextFormatInput.StringLiteralLongUnicodeEscapeSurrogatePairString
-Recommended.Proto3.TextFormatInput.StringLiteralLongUnicodeEscapeSurrogateSecondOnlyBytes
-Recommended.Proto3.TextFormatInput.StringLiteralLongUnicodeEscapeSurrogateSecondOnlyString
-Recommended.Proto3.TextFormatInput.StringLiteralLongUnicodeEscapesBytes.ProtobufOutput
-Recommended.Proto3.TextFormatInput.StringLiteralLongUnicodeEscapesBytes.TextFormatOutput
-Recommended.Proto3.TextFormatInput.StringLiteralLongUnicodeEscapesString.ProtobufOutput
-Recommended.Proto3.TextFormatInput.StringLiteralLongUnicodeEscapesString.TextFormatOutput
-Recommended.Proto3.TextFormatInput.StringLiteralShortUnicodeEscapeBytes.ProtobufOutput
-Recommended.Proto3.TextFormatInput.StringLiteralShortUnicodeEscapeBytes.TextFormatOutput
-Recommended.Proto3.TextFormatInput.StringLiteralShortUnicodeEscapeString.ProtobufOutput
-Recommended.Proto3.TextFormatInput.StringLiteralShortUnicodeEscapeString.TextFormatOutput
-Recommended.Proto3.TextFormatInput.StringLiteralShortUnicodeEscapeSurrogateFirstOnlyBytes
-Recommended.Proto3.TextFormatInput.StringLiteralShortUnicodeEscapeSurrogateFirstOnlyString
-Recommended.Proto3.TextFormatInput.StringLiteralShortUnicodeEscapeSurrogatePairBytes
-Recommended.Proto3.TextFormatInput.StringLiteralShortUnicodeEscapeSurrogatePairString
-Recommended.Proto3.TextFormatInput.StringLiteralShortUnicodeEscapeSurrogateSecondOnlyBytes
-Recommended.Proto3.TextFormatInput.StringLiteralShortUnicodeEscapeSurrogateSecondOnlyString
-Recommended.Proto3.TextFormatInput.StringLiteralUnicodeEscapeSurrogatePairLongShortBytes
-Recommended.Proto3.TextFormatInput.StringLiteralUnicodeEscapeSurrogatePairLongShortString
-Recommended.Proto3.TextFormatInput.StringLiteralUnicodeEscapeSurrogatePairShortLongBytes
-Recommended.Proto3.TextFormatInput.StringLiteralUnicodeEscapeSurrogatePairShortLongString
-Required.Proto3.TextFormatInput.StringLiteralBasicEscapesBytes.ProtobufOutput
-Required.Proto3.TextFormatInput.StringLiteralBasicEscapesBytes.TextFormatOutput
-Required.Proto3.TextFormatInput.StringLiteralBasicEscapesString.ProtobufOutput
-Required.Proto3.TextFormatInput.StringLiteralBasicEscapesString.TextFormatOutput
diff --git a/libs/protobuf/conformance/text_format_failure_list_ruby.txt b/libs/protobuf/conformance/text_format_failure_list_ruby.txt
deleted file mode 100644
index 404b64a..0000000
--- a/libs/protobuf/conformance/text_format_failure_list_ruby.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Recommended.Proto3.ProtobufInput.GroupUnknownFields_Drop.TextFormatOutput
-Recommended.Proto3.ProtobufInput.GroupUnknownFields_Print.TextFormatOutput
-Recommended.Proto3.ProtobufInput.MessageUnknownFields_Drop.TextFormatOutput
-Recommended.Proto3.ProtobufInput.MessageUnknownFields_Print.TextFormatOutput
-Recommended.Proto3.ProtobufInput.RepeatedUnknownFields_Drop.TextFormatOutput
-Recommended.Proto3.ProtobufInput.RepeatedUnknownFields_Print.TextFormatOutput
-Recommended.Proto3.ProtobufInput.ScalarUnknownFields_Drop.TextFormatOutput
-Recommended.Proto3.ProtobufInput.ScalarUnknownFields_Print.TextFormatOutput
diff --git a/libs/protobuf/conformance/third_party/jsoncpp/json.h b/libs/protobuf/conformance/third_party/jsoncpp/json.h
deleted file mode 100644
index 373ec98..0000000
--- a/libs/protobuf/conformance/third_party/jsoncpp/json.h
+++ /dev/null
@@ -1,2075 +0,0 @@
-/// Json-cpp amalgated header (http://jsoncpp.sourceforge.net/).
-/// It is intended to be used with #include "json/json.h"
-
-// //////////////////////////////////////////////////////////////////////
-// Beginning of content of file: LICENSE
-// //////////////////////////////////////////////////////////////////////
-
-/*
-The JsonCpp library's source code, including accompanying documentation,
-tests and demonstration applications, are licensed under the following
-conditions...
-
-The author (Baptiste Lepilleur) explicitly disclaims copyright in all
-jurisdictions which recognize such a disclaimer. In such jurisdictions,
-this software is released into the Public Domain.
-
-In jurisdictions which do not recognize Public Domain property (e.g. Germany as of
-2010), this software is Copyright (c) 2007-2010 by Baptiste Lepilleur, and is
-released under the terms of the MIT License (see below).
-
-In jurisdictions which recognize Public Domain property, the user of this
-software may choose to accept it either as 1) Public Domain, 2) under the
-conditions of the MIT License (see below), or 3) under the terms of dual
-Public Domain/MIT License conditions described here, as they choose.
-
-The MIT License is about as close to Public Domain as a license can get, and is
-described in clear, concise terms at:
-
-   http://en.wikipedia.org/wiki/MIT_License
-
-The full text of the MIT License follows:
-
-========================================================================
-Copyright (c) 2007-2010 Baptiste Lepilleur
-
-Permission is hereby granted, free of charge, to any person
-obtaining a copy of this software and associated documentation
-files (the "Software"), to deal in the Software without
-restriction, including without limitation the rights to use, copy,
-modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
-BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-========================================================================
-(END LICENSE TEXT)
-
-The MIT license is compatible with both the GPL and commercial
-software, affording one all of the rights of Public Domain with the
-minor nuisance of being required to keep the above copyright notice
-and license text in the source code. Note also that by accepting the
-Public Domain "license" you can re-license your copy using whatever
-license you like.
-
-*/
-
-// //////////////////////////////////////////////////////////////////////
-// End of content of file: LICENSE
-// //////////////////////////////////////////////////////////////////////
-
-
-
-
-
-#ifndef JSON_AMALGATED_H_INCLUDED
-# define JSON_AMALGATED_H_INCLUDED
-/// If defined, indicates that the source file is amalgated
-/// to prevent private header inclusion.
-#define JSON_IS_AMALGAMATION
-
-// //////////////////////////////////////////////////////////////////////
-// Beginning of content of file: include/json/version.h
-// //////////////////////////////////////////////////////////////////////
-
-// DO NOT EDIT. This file (and "version") is generated by CMake.
-// Run CMake configure step to update it.
-#ifndef JSON_VERSION_H_INCLUDED
-# define JSON_VERSION_H_INCLUDED
-
-# define JSONCPP_VERSION_STRING "1.6.5"
-# define JSONCPP_VERSION_MAJOR 1
-# define JSONCPP_VERSION_MINOR 6
-# define JSONCPP_VERSION_PATCH 5
-# define JSONCPP_VERSION_QUALIFIER
-# define JSONCPP_VERSION_HEXA ((JSONCPP_VERSION_MAJOR << 24) | (JSONCPP_VERSION_MINOR << 16) | (JSONCPP_VERSION_PATCH << 8))
-
-#endif // JSON_VERSION_H_INCLUDED
-
-// //////////////////////////////////////////////////////////////////////
-// End of content of file: include/json/version.h
-// //////////////////////////////////////////////////////////////////////
-
-
-
-
-
-
-// //////////////////////////////////////////////////////////////////////
-// Beginning of content of file: include/json/config.h
-// //////////////////////////////////////////////////////////////////////
-
-// Copyright 2007-2010 Baptiste Lepilleur
-// Distributed under MIT license, or public domain if desired and
-// recognized in your jurisdiction.
-// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
-
-#ifndef JSON_CONFIG_H_INCLUDED
-#define JSON_CONFIG_H_INCLUDED
-
-/// If defined, indicates that json library is embedded in CppTL library.
-//# define JSON_IN_CPPTL 1
-
-/// If defined, indicates that json may leverage CppTL library
-//#  define JSON_USE_CPPTL 1
-/// If defined, indicates that cpptl vector based map should be used instead of
-/// std::map
-/// as Value container.
-//#  define JSON_USE_CPPTL_SMALLMAP 1
-
-// If non-zero, the library uses exceptions to report bad input instead of C
-// assertion macros. The default is to use exceptions.
-#ifndef JSON_USE_EXCEPTION
-#define JSON_USE_EXCEPTION 1
-#endif
-
-/// If defined, indicates that the source file is amalgated
-/// to prevent private header inclusion.
-/// Remarks: it is automatically defined in the generated amalgated header.
-// #define JSON_IS_AMALGAMATION
-
-#ifdef JSON_IN_CPPTL
-#include <cpptl/config.h>
-#ifndef JSON_USE_CPPTL
-#define JSON_USE_CPPTL 1
-#endif
-#endif
-
-#ifdef JSON_IN_CPPTL
-#define JSON_API CPPTL_API
-#elif defined(JSON_DLL_BUILD)
-#if defined(_MSC_VER)
-#define JSON_API __declspec(dllexport)
-#define JSONCPP_DISABLE_DLL_INTERFACE_WARNING
-#endif // if defined(_MSC_VER)
-#elif defined(JSON_DLL)
-#if defined(_MSC_VER)
-#define JSON_API __declspec(dllimport)
-#define JSONCPP_DISABLE_DLL_INTERFACE_WARNING
-#endif // if defined(_MSC_VER)
-#endif // ifdef JSON_IN_CPPTL
-#if !defined(JSON_API)
-#define JSON_API
-#endif
-
-// If JSON_NO_INT64 is defined, then Json only support C++ "int" type for
-// integer
-// Storages, and 64 bits integer support is disabled.
-// #define JSON_NO_INT64 1
-
-#if defined(_MSC_VER) // MSVC
-#  if _MSC_VER <= 1200 // MSVC 6
-    // Microsoft Visual Studio 6 only support conversion from __int64 to double
-    // (no conversion from unsigned __int64).
-#    define JSON_USE_INT64_DOUBLE_CONVERSION 1
-    // Disable warning 4786 for VS6 caused by STL (identifier was truncated to '255'
-    // characters in the debug information)
-    // All projects I've ever seen with VS6 were using this globally (not bothering
-    // with pragma push/pop).
-#    pragma warning(disable : 4786)
-#  endif // MSVC 6
-
-#  if _MSC_VER >= 1500 // MSVC 2008
-    /// Indicates that the following function is deprecated.
-#    define JSONCPP_DEPRECATED(message) __declspec(deprecated(message))
-#  endif
-
-#endif // defined(_MSC_VER)
-
-
-#ifndef JSON_HAS_RVALUE_REFERENCES
-
-#if defined(_MSC_VER) && _MSC_VER >= 1600 // MSVC >= 2010
-#define JSON_HAS_RVALUE_REFERENCES 1
-#endif // MSVC >= 2010
-
-#ifdef __clang__
-#if __has_feature(cxx_rvalue_references)
-#define JSON_HAS_RVALUE_REFERENCES 1
-#endif  // has_feature
-
-#elif defined __GNUC__ // not clang (gcc comes later since clang emulates gcc)
-#if defined(__GXX_EXPERIMENTAL_CXX0X__) || (__cplusplus >= 201103L)
-#define JSON_HAS_RVALUE_REFERENCES 1
-#endif  // GXX_EXPERIMENTAL
-
-#endif // __clang__ || __GNUC__
-
-#endif // not defined JSON_HAS_RVALUE_REFERENCES
-
-#ifndef JSON_HAS_RVALUE_REFERENCES
-#define JSON_HAS_RVALUE_REFERENCES 0
-#endif
-
-#ifdef __clang__
-#elif defined __GNUC__ // not clang (gcc comes later since clang emulates gcc)
-#  if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5))
-#    define JSONCPP_DEPRECATED(message)  __attribute__ ((deprecated(message)))
-#  elif (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1))
-#    define JSONCPP_DEPRECATED(message)  __attribute__((__deprecated__))
-#  endif  // GNUC version
-#endif // __clang__ || __GNUC__
-
-#if !defined(JSONCPP_DEPRECATED)
-#define JSONCPP_DEPRECATED(message)
-#endif // if !defined(JSONCPP_DEPRECATED)
-
-namespace Json {
-typedef int Int;
-typedef unsigned int UInt;
-#if defined(JSON_NO_INT64)
-typedef int LargestInt;
-typedef unsigned int LargestUInt;
-#undef JSON_HAS_INT64
-#else                 // if defined(JSON_NO_INT64)
-// For Microsoft Visual use specific types as long long is not supported
-#if defined(_MSC_VER) // Microsoft Visual Studio
-typedef __int64 Int64;
-typedef unsigned __int64 UInt64;
-#else                 // if defined(_MSC_VER) // Other platforms, use long long
-typedef long long int Int64;
-typedef unsigned long long int UInt64;
-#endif // if defined(_MSC_VER)
-typedef Int64 LargestInt;
-typedef UInt64 LargestUInt;
-#define JSON_HAS_INT64
-#endif // if defined(JSON_NO_INT64)
-} // end namespace Json
-
-#endif // JSON_CONFIG_H_INCLUDED
-
-// //////////////////////////////////////////////////////////////////////
-// End of content of file: include/json/config.h
-// //////////////////////////////////////////////////////////////////////
-
-
-
-
-
-
-// //////////////////////////////////////////////////////////////////////
-// Beginning of content of file: include/json/forwards.h
-// //////////////////////////////////////////////////////////////////////
-
-// Copyright 2007-2010 Baptiste Lepilleur
-// Distributed under MIT license, or public domain if desired and
-// recognized in your jurisdiction.
-// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
-
-#ifndef JSON_FORWARDS_H_INCLUDED
-#define JSON_FORWARDS_H_INCLUDED
-
-#if !defined(JSON_IS_AMALGAMATION)
-#include "config.h"
-#endif // if !defined(JSON_IS_AMALGAMATION)
-
-namespace Json {
-
-// writer.h
-class FastWriter;
-class StyledWriter;
-
-// reader.h
-class Reader;
-
-// features.h
-class Features;
-
-// value.h
-typedef unsigned int ArrayIndex;
-class StaticString;
-class Path;
-class PathArgument;
-class Value;
-class ValueIteratorBase;
-class ValueIterator;
-class ValueConstIterator;
-
-} // namespace Json
-
-#endif // JSON_FORWARDS_H_INCLUDED
-
-// //////////////////////////////////////////////////////////////////////
-// End of content of file: include/json/forwards.h
-// //////////////////////////////////////////////////////////////////////
-
-
-
-
-
-
-// //////////////////////////////////////////////////////////////////////
-// Beginning of content of file: include/json/features.h
-// //////////////////////////////////////////////////////////////////////
-
-// Copyright 2007-2010 Baptiste Lepilleur
-// Distributed under MIT license, or public domain if desired and
-// recognized in your jurisdiction.
-// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
-
-#ifndef CPPTL_JSON_FEATURES_H_INCLUDED
-#define CPPTL_JSON_FEATURES_H_INCLUDED
-
-#if !defined(JSON_IS_AMALGAMATION)
-#include "forwards.h"
-#endif // if !defined(JSON_IS_AMALGAMATION)
-
-namespace Json {
-
-/** \brief Configuration passed to reader and writer.
- * This configuration object can be used to force the Reader or Writer
- * to behave in a standard conforming way.
- */
-class JSON_API Features {
-public:
-  /** \brief A configuration that allows all features and assumes all strings
-   * are UTF-8.
-   * - C & C++ comments are allowed
-   * - Root object can be any JSON value
-   * - Assumes Value strings are encoded in UTF-8
-   */
-  static Features all();
-
-  /** \brief A configuration that is strictly compatible with the JSON
-   * specification.
-   * - Comments are forbidden.
-   * - Root object must be either an array or an object value.
-   * - Assumes Value strings are encoded in UTF-8
-   */
-  static Features strictMode();
-
-  /** \brief Initialize the configuration like JsonConfig::allFeatures;
-   */
-  Features();
-
-  /// \c true if comments are allowed. Default: \c true.
-  bool allowComments_;
-
-  /// \c true if root must be either an array or an object value. Default: \c
-  /// false.
-  bool strictRoot_;
-
-  /// \c true if dropped null placeholders are allowed. Default: \c false.
-  bool allowDroppedNullPlaceholders_;
-
-  /// \c true if numeric object key are allowed. Default: \c false.
-  bool allowNumericKeys_;
-};
-
-} // namespace Json
-
-#endif // CPPTL_JSON_FEATURES_H_INCLUDED
-
-// //////////////////////////////////////////////////////////////////////
-// End of content of file: include/json/features.h
-// //////////////////////////////////////////////////////////////////////
-
-
-
-
-
-
-// //////////////////////////////////////////////////////////////////////
-// Beginning of content of file: include/json/value.h
-// //////////////////////////////////////////////////////////////////////
-
-// Copyright 2007-2010 Baptiste Lepilleur
-// Distributed under MIT license, or public domain if desired and
-// recognized in your jurisdiction.
-// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
-
-#ifndef CPPTL_JSON_H_INCLUDED
-#define CPPTL_JSON_H_INCLUDED
-
-#if !defined(JSON_IS_AMALGAMATION)
-#include "forwards.h"
-#endif // if !defined(JSON_IS_AMALGAMATION)
-#include <string>
-#include <vector>
-#include <exception>
-
-#ifndef JSON_USE_CPPTL_SMALLMAP
-#include <map>
-#else
-#include <cpptl/smallmap.h>
-#endif
-#ifdef JSON_USE_CPPTL
-#include <cpptl/forwards.h>
-#endif
-
-// Disable warning C4251: <data member>: <type> needs to have dll-interface to
-// be used by...
-#if defined(JSONCPP_DISABLE_DLL_INTERFACE_WARNING)
-#pragma warning(push)
-#pragma warning(disable : 4251)
-#endif // if defined(JSONCPP_DISABLE_DLL_INTERFACE_WARNING)
-
-/** \brief JSON (JavaScript Object Notation).
- */
-namespace Json {
-
-/** Base class for all exceptions we throw.
- *
- * We use nothing but these internally. Of course, STL can throw others.
- */
-class JSON_API Exception : public std::exception {
-public:
-  Exception(std::string const& msg);
-  ~Exception() throw() override;
-  char const* what() const throw() override;
-protected:
-  std::string msg_;
-};
-
-/** Exceptions which the user cannot easily avoid.
- *
- * E.g. out-of-memory (when we use malloc), stack-overflow, malicious input
- *
- * \remark derived from Json::Exception
- */
-class JSON_API RuntimeError : public Exception {
-public:
-  RuntimeError(std::string const& msg);
-};
-
-/** Exceptions thrown by JSON_ASSERT/JSON_FAIL macros.
- *
- * These are precondition-violations (user bugs) and internal errors (our bugs).
- *
- * \remark derived from Json::Exception
- */
-class JSON_API LogicError : public Exception {
-public:
-  LogicError(std::string const& msg);
-};
-
-/// used internally
-void throwRuntimeError(std::string const& msg);
-/// used internally
-void throwLogicError(std::string const& msg);
-
-/** \brief Type of the value held by a Value object.
- */
-enum ValueType {
-  nullValue = 0, ///< 'null' value
-  intValue,      ///< signed integer value
-  uintValue,     ///< unsigned integer value
-  realValue,     ///< double value
-  stringValue,   ///< UTF-8 string value
-  booleanValue,  ///< bool value
-  arrayValue,    ///< array value (ordered list)
-  objectValue    ///< object value (collection of name/value pairs).
-};
-
-enum CommentPlacement {
-  commentBefore = 0,      ///< a comment placed on the line before a value
-  commentAfterOnSameLine, ///< a comment just after a value on the same line
-  commentAfter, ///< a comment on the line after a value (only make sense for
-  /// root value)
-  numberOfCommentPlacement
-};
-
-//# ifdef JSON_USE_CPPTL
-//   typedef CppTL::AnyEnumerator<const char *> EnumMemberNames;
-//   typedef CppTL::AnyEnumerator<const Value &> EnumValues;
-//# endif
-
-/** \brief Lightweight wrapper to tag static string.
- *
- * Value constructor and objectValue member assignement takes advantage of the
- * StaticString and avoid the cost of string duplication when storing the
- * string or the member name.
- *
- * Example of usage:
- * \code
- * Json::Value aValue( StaticString("some text") );
- * Json::Value object;
- * static const StaticString code("code");
- * object[code] = 1234;
- * \endcode
- */
-class JSON_API StaticString {
-public:
-  explicit StaticString(const char* czstring) : c_str_(czstring) {}
-
-  operator const char*() const { return c_str_; }
-
-  const char* c_str() const { return c_str_; }
-
-private:
-  const char* c_str_;
-};
-
-/** \brief Represents a <a HREF="http://www.json.org">JSON</a> value.
- *
- * This class is a discriminated union wrapper that can represents a:
- * - signed integer [range: Value::minInt - Value::maxInt]
- * - unsigned integer (range: 0 - Value::maxUInt)
- * - double
- * - UTF-8 string
- * - boolean
- * - 'null'
- * - an ordered list of Value
- * - collection of name/value pairs (javascript object)
- *
- * The type of the held value is represented by a #ValueType and
- * can be obtained using type().
- *
- * Values of an #objectValue or #arrayValue can be accessed using operator[]()
- * methods.
- * Non-const methods will automatically create the a #nullValue element
- * if it does not exist.
- * The sequence of an #arrayValue will be automatically resized and initialized
- * with #nullValue. resize() can be used to enlarge or truncate an #arrayValue.
- *
- * The get() methods can be used to obtain default value in the case the
- * required element does not exist.
- *
- * It is possible to iterate over the list of a #objectValue values using
- * the getMemberNames() method.
- *
- * \note #Value string-length fit in size_t, but keys must be < 2^30.
- * (The reason is an implementation detail.) A #CharReader will raise an
- * exception if a bound is exceeded to avoid security holes in your app,
- * but the Value API does *not* check bounds. That is the responsibility
- * of the caller.
- */
-class JSON_API Value {
-  friend class ValueIteratorBase;
-public:
-  typedef std::vector<std::string> Members;
-  typedef ValueIterator iterator;
-  typedef ValueConstIterator const_iterator;
-  typedef Json::UInt UInt;
-  typedef Json::Int Int;
-#if defined(JSON_HAS_INT64)
-  typedef Json::UInt64 UInt64;
-  typedef Json::Int64 Int64;
-#endif // defined(JSON_HAS_INT64)
-  typedef Json::LargestInt LargestInt;
-  typedef Json::LargestUInt LargestUInt;
-  typedef Json::ArrayIndex ArrayIndex;
-
-  static const Value& null;  ///< We regret this reference to a global instance; prefer the simpler Value().
-  static const Value& nullRef;  ///< just a kludge for binary-compatibility; same as null
-  /// Minimum signed integer value that can be stored in a Json::Value.
-  static const LargestInt minLargestInt;
-  /// Maximum signed integer value that can be stored in a Json::Value.
-  static const LargestInt maxLargestInt;
-  /// Maximum unsigned integer value that can be stored in a Json::Value.
-  static const LargestUInt maxLargestUInt;
-
-  /// Minimum signed int value that can be stored in a Json::Value.
-  static const Int minInt;
-  /// Maximum signed int value that can be stored in a Json::Value.
-  static const Int maxInt;
-  /// Maximum unsigned int value that can be stored in a Json::Value.
-  static const UInt maxUInt;
-
-#if defined(JSON_HAS_INT64)
-  /// Minimum signed 64 bits int value that can be stored in a Json::Value.
-  static const Int64 minInt64;
-  /// Maximum signed 64 bits int value that can be stored in a Json::Value.
-  static const Int64 maxInt64;
-  /// Maximum unsigned 64 bits int value that can be stored in a Json::Value.
-  static const UInt64 maxUInt64;
-#endif // defined(JSON_HAS_INT64)
-
-private:
-#ifndef JSONCPP_DOC_EXCLUDE_IMPLEMENTATION
-  class CZString {
-  public:
-    enum DuplicationPolicy {
-      noDuplication = 0,
-      duplicate,
-      duplicateOnCopy
-    };
-    CZString(ArrayIndex index);
-    CZString(char const* str, unsigned length, DuplicationPolicy allocate);
-    CZString(CZString const& other);
-#if JSON_HAS_RVALUE_REFERENCES
-    CZString(CZString&& other);
-#endif
-    ~CZString();
-    CZString& operator=(CZString other);
-    bool operator<(CZString const& other) const;
-    bool operator==(CZString const& other) const;
-    ArrayIndex index() const;
-    //const char* c_str() const; ///< \deprecated
-    char const* data() const;
-    unsigned length() const;
-    bool isStaticString() const;
-
-  private:
-    void swap(CZString& other);
-
-    struct StringStorage {
-      unsigned policy_: 2;
-      unsigned length_: 30; // 1GB max
-    };
-
-    char const* cstr_;  // actually, a prefixed string, unless policy is noDup
-    union {
-      ArrayIndex index_;
-      StringStorage storage_;
-    };
-  };
-
-public:
-#ifndef JSON_USE_CPPTL_SMALLMAP
-  typedef std::map<CZString, Value> ObjectValues;
-#else
-  typedef CppTL::SmallMap<CZString, Value> ObjectValues;
-#endif // ifndef JSON_USE_CPPTL_SMALLMAP
-#endif // ifndef JSONCPP_DOC_EXCLUDE_IMPLEMENTATION
-
-public:
-  /** \brief Create a default Value of the given type.
-
-    This is a very useful constructor.
-    To create an empty array, pass arrayValue.
-    To create an empty object, pass objectValue.
-    Another Value can then be set to this one by assignment.
-This is useful since clear() and resize() will not alter types.
-
-    Examples:
-\code
-Json::Value null_value; // null
-Json::Value arr_value(Json::arrayValue); // []
-Json::Value obj_value(Json::objectValue); // {}
-\endcode
-  */
-  Value(ValueType type = nullValue);
-  Value(Int value);
-  Value(UInt value);
-#if defined(JSON_HAS_INT64)
-  Value(Int64 value);
-  Value(UInt64 value);
-#endif // if defined(JSON_HAS_INT64)
-  Value(double value);
-  Value(const char* value); ///< Copy til first 0. (NULL causes to seg-fault.)
-  Value(const char* begin, const char* end); ///< Copy all, incl zeroes.
-  /** \brief Constructs a value from a static string.
-
-   * Like other value string constructor but do not duplicate the string for
-   * internal storage. The given string must remain alive after the call to this
-   * constructor.
-   * \note This works only for null-terminated strings. (We cannot change the
-   *   size of this class, so we have nowhere to store the length,
-   *   which might be computed later for various operations.)
-   *
-   * Example of usage:
-   * \code
-   * static StaticString foo("some text");
-   * Json::Value aValue(foo);
-   * \endcode
-   */
-  Value(const StaticString& value);
-  Value(const std::string& value); ///< Copy data() til size(). Embedded zeroes too.
-#ifdef JSON_USE_CPPTL
-  Value(const CppTL::ConstString& value);
-#endif
-  Value(bool value);
-  /// Deep copy.
-  Value(const Value& other);
-#if JSON_HAS_RVALUE_REFERENCES
-  /// Move constructor
-  Value(Value&& other);
-#endif
-  ~Value();
-
-  /// Deep copy, then swap(other).
-  /// \note Over-write existing comments. To preserve comments, use #swapPayload().
-  Value& operator=(Value other);
-  /// Swap everything.
-  void swap(Value& other);
-  /// Swap values but leave comments and source offsets in place.
-  void swapPayload(Value& other);
-
-  ValueType type() const;
-
-  /// Compare payload only, not comments etc.
-  bool operator<(const Value& other) const;
-  bool operator<=(const Value& other) const;
-  bool operator>=(const Value& other) const;
-  bool operator>(const Value& other) const;
-  bool operator==(const Value& other) const;
-  bool operator!=(const Value& other) const;
-  int compare(const Value& other) const;
-
-  const char* asCString() const; ///< Embedded zeroes could cause you trouble!
-  std::string asString() const; ///< Embedded zeroes are possible.
-  /** Get raw char* of string-value.
-   *  \return false if !string. (Seg-fault if str or end are NULL.)
-   */
-  bool getString(
-      char const** begin, char const** end) const;
-#ifdef JSON_USE_CPPTL
-  CppTL::ConstString asConstString() const;
-#endif
-  Int asInt() const;
-  UInt asUInt() const;
-#if defined(JSON_HAS_INT64)
-  Int64 asInt64() const;
-  UInt64 asUInt64() const;
-#endif // if defined(JSON_HAS_INT64)
-  LargestInt asLargestInt() const;
-  LargestUInt asLargestUInt() const;
-  float asFloat() const;
-  double asDouble() const;
-  bool asBool() const;
-
-  bool isNull() const;
-  bool isBool() const;
-  bool isInt() const;
-  bool isInt64() const;
-  bool isUInt() const;
-  bool isUInt64() const;
-  bool isIntegral() const;
-  bool isDouble() const;
-  bool isNumeric() const;
-  bool isString() const;
-  bool isArray() const;
-  bool isObject() const;
-
-  bool isConvertibleTo(ValueType other) const;
-
-  /// Number of values in array or object
-  ArrayIndex size() const;
-
-  /// \brief Return true if empty array, empty object, or null;
-  /// otherwise, false.
-  bool empty() const;
-
-  /// Return isNull()
-  bool operator!() const;
-
-  /// Remove all object members and array elements.
-  /// \pre type() is arrayValue, objectValue, or nullValue
-  /// \post type() is unchanged
-  void clear();
-
-  /// Resize the array to size elements.
-  /// New elements are initialized to null.
-  /// May only be called on nullValue or arrayValue.
-  /// \pre type() is arrayValue or nullValue
-  /// \post type() is arrayValue
-  void resize(ArrayIndex size);
-
-  /// Access an array element (zero based index ).
-  /// If the array contains less than index element, then null value are
-  /// inserted
-  /// in the array so that its size is index+1.
-  /// (You may need to say 'value[0u]' to get your compiler to distinguish
-  ///  this from the operator[] which takes a string.)
-  Value& operator[](ArrayIndex index);
-
-  /// Access an array element (zero based index ).
-  /// If the array contains less than index element, then null value are
-  /// inserted
-  /// in the array so that its size is index+1.
-  /// (You may need to say 'value[0u]' to get your compiler to distinguish
-  ///  this from the operator[] which takes a string.)
-  Value& operator[](int index);
-
-  /// Access an array element (zero based index )
-  /// (You may need to say 'value[0u]' to get your compiler to distinguish
-  ///  this from the operator[] which takes a string.)
-  const Value& operator[](ArrayIndex index) const;
-
-  /// Access an array element (zero based index )
-  /// (You may need to say 'value[0u]' to get your compiler to distinguish
-  ///  this from the operator[] which takes a string.)
-  const Value& operator[](int index) const;
-
-  /// If the array contains at least index+1 elements, returns the element
-  /// value,
-  /// otherwise returns defaultValue.
-  Value get(ArrayIndex index, const Value& defaultValue) const;
-  /// Return true if index < size().
-  bool isValidIndex(ArrayIndex index) const;
-  /// \brief Append value to array at the end.
-  ///
-  /// Equivalent to jsonvalue[jsonvalue.size()] = value;
-  Value& append(const Value& value);
-
-  /// Access an object value by name, create a null member if it does not exist.
-  /// \note Because of our implementation, keys are limited to 2^30 -1 chars.
-  ///  Exceeding that will cause an exception.
-  Value& operator[](const char* key);
-  /// Access an object value by name, returns null if there is no member with
-  /// that name.
-  const Value& operator[](const char* key) const;
-  /// Access an object value by name, create a null member if it does not exist.
-  /// \param key may contain embedded nulls.
-  Value& operator[](const std::string& key);
-  /// Access an object value by name, returns null if there is no member with
-  /// that name.
-  /// \param key may contain embedded nulls.
-  const Value& operator[](const std::string& key) const;
-  /** \brief Access an object value by name, create a null member if it does not
-   exist.
-
-   * If the object has no entry for that name, then the member name used to store
-   * the new entry is not duplicated.
-   * Example of use:
-   * \code
-   * Json::Value object;
-   * static const StaticString code("code");
-   * object[code] = 1234;
-   * \endcode
-   */
-  Value& operator[](const StaticString& key);
-#ifdef JSON_USE_CPPTL
-  /// Access an object value by name, create a null member if it does not exist.
-  Value& operator[](const CppTL::ConstString& key);
-  /// Access an object value by name, returns null if there is no member with
-  /// that name.
-  const Value& operator[](const CppTL::ConstString& key) const;
-#endif
-  /// Return the member named key if it exist, defaultValue otherwise.
-  /// \note deep copy
-  Value get(const char* key, const Value& defaultValue) const;
-  /// Return the member named key if it exist, defaultValue otherwise.
-  /// \note deep copy
-  /// \note key may contain embedded nulls.
-  Value get(const char* begin, const char* end, const Value& defaultValue) const;
-  /// Return the member named key if it exist, defaultValue otherwise.
-  /// \note deep copy
-  /// \param key may contain embedded nulls.
-  Value get(const std::string& key, const Value& defaultValue) const;
-#ifdef JSON_USE_CPPTL
-  /// Return the member named key if it exist, defaultValue otherwise.
-  /// \note deep copy
-  Value get(const CppTL::ConstString& key, const Value& defaultValue) const;
-#endif
-  /// Most general and efficient version of isMember()const, get()const,
-  /// and operator[]const
-  /// \note As stated elsewhere, behavior is undefined if (end-begin) >= 2^30
-  Value const* find(char const* begin, char const* end) const;
-  /// Most general and efficient version of object-mutators.
-  /// \note As stated elsewhere, behavior is undefined if (end-begin) >= 2^30
-  /// \return non-zero, but JSON_ASSERT if this is neither object nor nullValue.
-  Value const* demand(char const* begin, char const* end);
-  /// \brief Remove and return the named member.
-  ///
-  /// Do nothing if it did not exist.
-  /// \return the removed Value, or null.
-  /// \pre type() is objectValue or nullValue
-  /// \post type() is unchanged
-  /// \deprecated
-  Value removeMember(const char* key);
-  /// Same as removeMember(const char*)
-  /// \param key may contain embedded nulls.
-  /// \deprecated
-  Value removeMember(const std::string& key);
-  /// Same as removeMember(const char* begin, const char* end, Value* removed),
-  /// but 'key' is null-terminated.
-  bool removeMember(const char* key, Value* removed);
-  /** \brief Remove the named map member.
-
-      Update 'removed' iff removed.
-      \param key may contain embedded nulls.
-      \return true iff removed (no exceptions)
-  */
-  bool removeMember(std::string const& key, Value* removed);
-  /// Same as removeMember(std::string const& key, Value* removed)
-  bool removeMember(const char* begin, const char* end, Value* removed);
-  /** \brief Remove the indexed array element.
-
-      O(n) expensive operations.
-      Update 'removed' iff removed.
-      \return true iff removed (no exceptions)
-  */
-  bool removeIndex(ArrayIndex i, Value* removed);
-
-  /// Return true if the object has a member named key.
-  /// \note 'key' must be null-terminated.
-  bool isMember(const char* key) const;
-  /// Return true if the object has a member named key.
-  /// \param key may contain embedded nulls.
-  bool isMember(const std::string& key) const;
-  /// Same as isMember(std::string const& key)const
-  bool isMember(const char* begin, const char* end) const;
-#ifdef JSON_USE_CPPTL
-  /// Return true if the object has a member named key.
-  bool isMember(const CppTL::ConstString& key) const;
-#endif
-
-  /// \brief Return a list of the member names.
-  ///
-  /// If null, return an empty list.
-  /// \pre type() is objectValue or nullValue
-  /// \post if type() was nullValue, it remains nullValue
-  Members getMemberNames() const;
-
-  //# ifdef JSON_USE_CPPTL
-  //      EnumMemberNames enumMemberNames() const;
-  //      EnumValues enumValues() const;
-  //# endif
-
-  /// \deprecated Always pass len.
-  JSONCPP_DEPRECATED("Use setComment(std::string const&) instead.")
-  void setComment(const char* comment, CommentPlacement placement);
-  /// Comments must be //... or /* ... */
-  void setComment(const char* comment, size_t len, CommentPlacement placement);
-  /// Comments must be //... or /* ... */
-  void setComment(const std::string& comment, CommentPlacement placement);
-  bool hasComment(CommentPlacement placement) const;
-  /// Include delimiters and embedded newlines.
-  std::string getComment(CommentPlacement placement) const;
-
-  std::string toStyledString() const;
-
-  const_iterator begin() const;
-  const_iterator end() const;
-
-  iterator begin();
-  iterator end();
-
-  // Accessors for the [start, limit) range of bytes within the JSON text from
-  // which this value was parsed, if any.
-  void setOffsetStart(size_t start);
-  void setOffsetLimit(size_t limit);
-  size_t getOffsetStart() const;
-  size_t getOffsetLimit() const;
-
-private:
-  void initBasic(ValueType type, bool allocated = false);
-
-  Value& resolveReference(const char* key);
-  Value& resolveReference(const char* key, const char* end);
-
-  struct CommentInfo {
-    CommentInfo();
-    ~CommentInfo();
-
-    void setComment(const char* text, size_t len);
-
-    char* comment_;
-  };
-
-  // struct MemberNamesTransform
-  //{
-  //   typedef const char *result_type;
-  //   const char *operator()( const CZString &name ) const
-  //   {
-  //      return name.c_str();
-  //   }
-  //};
-
-  union ValueHolder {
-    LargestInt int_;
-    LargestUInt uint_;
-    double real_;
-    bool bool_;
-    char* string_;  // actually ptr to unsigned, followed by str, unless !allocated_
-    ObjectValues* map_;
-  } value_;
-  ValueType type_ : 8;
-  unsigned int allocated_ : 1; // Notes: if declared as bool, bitfield is useless.
-                               // If not allocated_, string_ must be null-terminated.
-  CommentInfo* comments_;
-
-  // [start, limit) byte offsets in the source JSON text from which this Value
-  // was extracted.
-  size_t start_;
-  size_t limit_;
-};
-
-/** \brief Experimental and untested: represents an element of the "path" to
- * access a node.
- */
-class JSON_API PathArgument {
-public:
-  friend class Path;
-
-  PathArgument();
-  PathArgument(ArrayIndex index);
-  PathArgument(const char* key);
-  PathArgument(const std::string& key);
-
-private:
-  enum Kind {
-    kindNone = 0,
-    kindIndex,
-    kindKey
-  };
-  std::string key_;
-  ArrayIndex index_;
-  Kind kind_;
-};
-
-/** \brief Experimental and untested: represents a "path" to access a node.
- *
- * Syntax:
- * - "." => root node
- * - ".[n]" => elements at index 'n' of root node (an array value)
- * - ".name" => member named 'name' of root node (an object value)
- * - ".name1.name2.name3"
- * - ".[0][1][2].name1[3]"
- * - ".%" => member name is provided as parameter
- * - ".[%]" => index is provided as parameter
- */
-class JSON_API Path {
-public:
-  Path(const std::string& path,
-       const PathArgument& a1 = PathArgument(),
-       const PathArgument& a2 = PathArgument(),
-       const PathArgument& a3 = PathArgument(),
-       const PathArgument& a4 = PathArgument(),
-       const PathArgument& a5 = PathArgument());
-
-  const Value& resolve(const Value& root) const;
-  Value resolve(const Value& root, const Value& defaultValue) const;
-  /// Creates the "path" to access the specified node and returns a reference on
-  /// the node.
-  Value& make(Value& root) const;
-
-private:
-  typedef std::vector<const PathArgument*> InArgs;
-  typedef std::vector<PathArgument> Args;
-
-  void makePath(const std::string& path, const InArgs& in);
-  void addPathInArg(const std::string& path,
-                    const InArgs& in,
-                    InArgs::const_iterator& itInArg,
-                    PathArgument::Kind kind);
-  void invalidPath(const std::string& path, int location);
-
-  Args args_;
-};
-
-/** \brief base class for Value iterators.
- *
- */
-class JSON_API ValueIteratorBase {
-public:
-  typedef std::bidirectional_iterator_tag iterator_category;
-  typedef unsigned int size_t;
-  typedef int difference_type;
-  typedef ValueIteratorBase SelfType;
-
-  bool operator==(const SelfType& other) const { return isEqual(other); }
-
-  bool operator!=(const SelfType& other) const { return !isEqual(other); }
-
-  difference_type operator-(const SelfType& other) const {
-    return other.computeDistance(*this);
-  }
-
-  /// Return either the index or the member name of the referenced value as a
-  /// Value.
-  Value key() const;
-
-  /// Return the index of the referenced Value, or -1 if it is not an arrayValue.
-  UInt index() const;
-
-  /// Return the member name of the referenced Value, or "" if it is not an
-  /// objectValue.
-  /// \note Avoid `c_str()` on result, as embedded zeroes are possible.
-  std::string name() const;
-
-  /// Return the member name of the referenced Value. "" if it is not an
-  /// objectValue.
-  /// \deprecated This cannot be used for UTF-8 strings, since there can be embedded nulls.
-  JSONCPP_DEPRECATED("Use `key = name();` instead.")
-  char const* memberName() const;
-  /// Return the member name of the referenced Value, or NULL if it is not an
-  /// objectValue.
-  /// \note Better version than memberName(). Allows embedded nulls.
-  char const* memberName(char const** end) const;
-
-protected:
-  Value& deref() const;
-
-  void increment();
-
-  void decrement();
-
-  difference_type computeDistance(const SelfType& other) const;
-
-  bool isEqual(const SelfType& other) const;
-
-  void copy(const SelfType& other);
-
-private:
-  Value::ObjectValues::iterator current_;
-  // Indicates that iterator is for a null value.
-  bool isNull_;
-
-public:
-  // For some reason, BORLAND needs these at the end, rather
-  // than earlier. No idea why.
-  ValueIteratorBase();
-  explicit ValueIteratorBase(const Value::ObjectValues::iterator& current);
-};
-
-/** \brief const iterator for object and array value.
- *
- */
-class JSON_API ValueConstIterator : public ValueIteratorBase {
-  friend class Value;
-
-public:
-  typedef const Value value_type;
-  //typedef unsigned int size_t;
-  //typedef int difference_type;
-  typedef const Value& reference;
-  typedef const Value* pointer;
-  typedef ValueConstIterator SelfType;
-
-  ValueConstIterator();
-  ValueConstIterator(ValueIterator const& other);
-
-private:
-/*! \internal Use by Value to create an iterator.
- */
-  explicit ValueConstIterator(const Value::ObjectValues::iterator& current);
-public:
-  SelfType& operator=(const ValueIteratorBase& other);
-
-  SelfType operator++(int) {
-    SelfType temp(*this);
-    ++*this;
-    return temp;
-  }
-
-  SelfType operator--(int) {
-    SelfType temp(*this);
-    --*this;
-    return temp;
-  }
-
-  SelfType& operator--() {
-    decrement();
-    return *this;
-  }
-
-  SelfType& operator++() {
-    increment();
-    return *this;
-  }
-
-  reference operator*() const { return deref(); }
-
-  pointer operator->() const { return &deref(); }
-};
-
-/** \brief Iterator for object and array value.
- */
-class JSON_API ValueIterator : public ValueIteratorBase {
-  friend class Value;
-
-public:
-  typedef Value value_type;
-  typedef unsigned int size_t;
-  typedef int difference_type;
-  typedef Value& reference;
-  typedef Value* pointer;
-  typedef ValueIterator SelfType;
-
-  ValueIterator();
-  explicit ValueIterator(const ValueConstIterator& other);
-  ValueIterator(const ValueIterator& other);
-
-private:
-/*! \internal Use by Value to create an iterator.
- */
-  explicit ValueIterator(const Value::ObjectValues::iterator& current);
-public:
-  SelfType& operator=(const SelfType& other);
-
-  SelfType operator++(int) {
-    SelfType temp(*this);
-    ++*this;
-    return temp;
-  }
-
-  SelfType operator--(int) {
-    SelfType temp(*this);
-    --*this;
-    return temp;
-  }
-
-  SelfType& operator--() {
-    decrement();
-    return *this;
-  }
-
-  SelfType& operator++() {
-    increment();
-    return *this;
-  }
-
-  reference operator*() const { return deref(); }
-
-  pointer operator->() const { return &deref(); }
-};
-
-} // namespace Json
-
-
-namespace std {
-/// Specialize std::swap() for Json::Value.
-template<>
-inline void swap(Json::Value& a, Json::Value& b) { a.swap(b); }
-}
-
-
-#if defined(JSONCPP_DISABLE_DLL_INTERFACE_WARNING)
-#pragma warning(pop)
-#endif // if defined(JSONCPP_DISABLE_DLL_INTERFACE_WARNING)
-
-#endif // CPPTL_JSON_H_INCLUDED
-
-// //////////////////////////////////////////////////////////////////////
-// End of content of file: include/json/value.h
-// //////////////////////////////////////////////////////////////////////
-
-
-
-
-
-
-// //////////////////////////////////////////////////////////////////////
-// Beginning of content of file: include/json/reader.h
-// //////////////////////////////////////////////////////////////////////
-
-// Copyright 2007-2010 Baptiste Lepilleur
-// Distributed under MIT license, or public domain if desired and
-// recognized in your jurisdiction.
-// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
-
-#ifndef CPPTL_JSON_READER_H_INCLUDED
-#define CPPTL_JSON_READER_H_INCLUDED
-
-#if !defined(JSON_IS_AMALGAMATION)
-#include "features.h"
-#include "value.h"
-#endif // if !defined(JSON_IS_AMALGAMATION)
-#include <deque>
-#include <iosfwd>
-#include <stack>
-#include <string>
-#include <istream>
-
-// Disable warning C4251: <data member>: <type> needs to have dll-interface to
-// be used by...
-#if defined(JSONCPP_DISABLE_DLL_INTERFACE_WARNING)
-#pragma warning(push)
-#pragma warning(disable : 4251)
-#endif // if defined(JSONCPP_DISABLE_DLL_INTERFACE_WARNING)
-
-namespace Json {
-
-/** \brief Unserialize a <a HREF="http://www.json.org">JSON</a> document into a
- *Value.
- *
- * \deprecated Use CharReader and CharReaderBuilder.
- */
-class JSON_API Reader {
-public:
-  typedef char Char;
-  typedef const Char* Location;
-
-  /** \brief An error tagged with where in the JSON text it was encountered.
-   *
-   * The offsets give the [start, limit) range of bytes within the text. Note
-   * that this is bytes, not codepoints.
-   *
-   */
-  struct StructuredError {
-    size_t offset_start;
-    size_t offset_limit;
-    std::string message;
-  };
-
-  /** \brief Constructs a Reader allowing all features
-   * for parsing.
-   */
-  Reader();
-
-  /** \brief Constructs a Reader allowing the specified feature set
-   * for parsing.
-   */
-  Reader(const Features& features);
-
-  /** \brief Read a Value from a <a HREF="http://www.json.org">JSON</a>
-   * document.
-   * \param document UTF-8 encoded string containing the document to read.
-   * \param root [out] Contains the root value of the document if it was
-   *             successfully parsed.
-   * \param collectComments \c true to collect comment and allow writing them
-   * back during
-   *                        serialization, \c false to discard comments.
-   *                        This parameter is ignored if
-   * Features::allowComments_
-   *                        is \c false.
-   * \return \c true if the document was successfully parsed, \c false if an
-   * error occurred.
-   */
-  bool
-  parse(const std::string& document, Value& root, bool collectComments = true);
-
-  /** \brief Read a Value from a <a HREF="http://www.json.org">JSON</a>
-   document.
-   * \param beginDoc Pointer on the beginning of the UTF-8 encoded string of the
-   document to read.
-   * \param endDoc Pointer on the end of the UTF-8 encoded string of the
-   document to read.
-   *               Must be >= beginDoc.
-   * \param root [out] Contains the root value of the document if it was
-   *             successfully parsed.
-   * \param collectComments \c true to collect comment and allow writing them
-   back during
-   *                        serialization, \c false to discard comments.
-   *                        This parameter is ignored if
-   Features::allowComments_
-   *                        is \c false.
-   * \return \c true if the document was successfully parsed, \c false if an
-   error occurred.
-   */
-  bool parse(const char* beginDoc,
-             const char* endDoc,
-             Value& root,
-             bool collectComments = true);
-
-  /// \brief Parse from input stream.
-  /// \see Json::operator>>(std::istream&, Json::Value&).
-  bool parse(std::istream& is, Value& root, bool collectComments = true);
-
-  /** \brief Returns a user friendly string that list errors in the parsed
-   * document.
-   * \return Formatted error message with the list of errors with their location
-   * in
-   *         the parsed document. An empty string is returned if no error
-   * occurred
-   *         during parsing.
-   * \deprecated Use getFormattedErrorMessages() instead (typo fix).
-   */
-  JSONCPP_DEPRECATED("Use getFormattedErrorMessages() instead.")
-  std::string getFormatedErrorMessages() const;
-
-  /** \brief Returns a user friendly string that list errors in the parsed
-   * document.
-   * \return Formatted error message with the list of errors with their location
-   * in
-   *         the parsed document. An empty string is returned if no error
-   * occurred
-   *         during parsing.
-   */
-  std::string getFormattedErrorMessages() const;
-
-  /** \brief Returns a vector of structured errors encountered while parsing.
-   * \return A (possibly empty) vector of StructuredError objects. Currently
-   *         only one error can be returned, but the caller should tolerate
-   * multiple
-   *         errors.  This can occur if the parser recovers from a non-fatal
-   *         parse error and then encounters additional errors.
-   */
-  std::vector<StructuredError> getStructuredErrors() const;
-
-  /** \brief Add a semantic error message.
-   * \param value JSON Value location associated with the error
-   * \param message The error message.
-   * \return \c true if the error was successfully added, \c false if the
-   * Value offset exceeds the document size.
-   */
-  bool pushError(const Value& value, const std::string& message);
-
-  /** \brief Add a semantic error message with extra context.
-   * \param value JSON Value location associated with the error
-   * \param message The error message.
-   * \param extra Additional JSON Value location to contextualize the error
-   * \return \c true if the error was successfully added, \c false if either
-   * Value offset exceeds the document size.
-   */
-  bool pushError(const Value& value, const std::string& message, const Value& extra);
-
-  /** \brief Return whether there are any errors.
-   * \return \c true if there are no errors to report \c false if
-   * errors have occurred.
-   */
-  bool good() const;
-
-private:
-  enum TokenType {
-    tokenEndOfStream = 0,
-    tokenObjectBegin,
-    tokenObjectEnd,
-    tokenArrayBegin,
-    tokenArrayEnd,
-    tokenString,
-    tokenNumber,
-    tokenTrue,
-    tokenFalse,
-    tokenNull,
-    tokenArraySeparator,
-    tokenMemberSeparator,
-    tokenComment,
-    tokenError
-  };
-
-  class Token {
-  public:
-    TokenType type_;
-    Location start_;
-    Location end_;
-  };
-
-  class ErrorInfo {
-  public:
-    Token token_;
-    std::string message_;
-    Location extra_;
-  };
-
-  typedef std::deque<ErrorInfo> Errors;
-
-  bool readToken(Token& token);
-  void skipSpaces();
-  bool match(Location pattern, int patternLength);
-  bool readComment();
-  bool readCStyleComment();
-  bool readCppStyleComment();
-  bool readString();
-  void readNumber();
-  bool readValue();
-  bool readObject(Token& token);
-  bool readArray(Token& token);
-  bool decodeNumber(Token& token);
-  bool decodeNumber(Token& token, Value& decoded);
-  bool decodeString(Token& token);
-  bool decodeString(Token& token, std::string& decoded);
-  bool decodeDouble(Token& token);
-  bool decodeDouble(Token& token, Value& decoded);
-  bool decodeUnicodeCodePoint(Token& token,
-                              Location& current,
-                              Location end,
-                              unsigned int& unicode);
-  bool decodeUnicodeEscapeSequence(Token& token,
-                                   Location& current,
-                                   Location end,
-                                   unsigned int& unicode);
-  bool addError(const std::string& message, Token& token, Location extra = 0);
-  bool recoverFromError(TokenType skipUntilToken);
-  bool addErrorAndRecover(const std::string& message,
-                          Token& token,
-                          TokenType skipUntilToken);
-  void skipUntilSpace();
-  Value& currentValue();
-  Char getNextChar();
-  void
-  getLocationLineAndColumn(Location location, int& line, int& column) const;
-  std::string getLocationLineAndColumn(Location location) const;
-  void addComment(Location begin, Location end, CommentPlacement placement);
-  void skipCommentTokens(Token& token);
-
-  typedef std::stack<Value*> Nodes;
-  Nodes nodes_;
-  Errors errors_;
-  std::string document_;
-  Location begin_;
-  Location end_;
-  Location current_;
-  Location lastValueEnd_;
-  Value* lastValue_;
-  std::string commentsBefore_;
-  Features features_;
-  bool collectComments_;
-};  // Reader
-
-/** Interface for reading JSON from a char array.
- */
-class JSON_API CharReader {
-public:
-  virtual ~CharReader() {}
-  /** \brief Read a Value from a <a HREF="http://www.json.org">JSON</a>
-   document.
-   * The document must be a UTF-8 encoded string containing the document to read.
-   *
-   * \param beginDoc Pointer on the beginning of the UTF-8 encoded string of the
-   document to read.
-   * \param endDoc Pointer on the end of the UTF-8 encoded string of the
-   document to read.
-   *        Must be >= beginDoc.
-   * \param root [out] Contains the root value of the document if it was
-   *             successfully parsed.
-   * \param errs [out] Formatted error messages (if not NULL)
-   *        a user friendly string that lists errors in the parsed
-   * document.
-   * \return \c true if the document was successfully parsed, \c false if an
-   error occurred.
-   */
-  virtual bool parse(
-      char const* beginDoc, char const* endDoc,
-      Value* root, std::string* errs) = 0;
-
-  class JSON_API Factory {
-  public:
-    virtual ~Factory() {}
-    /** \brief Allocate a CharReader via operator new().
-     * \throw std::exception if something goes wrong (e.g. invalid settings)
-     */
-    virtual CharReader* newCharReader() const = 0;
-  };  // Factory
-};  // CharReader
-
-/** \brief Build a CharReader implementation.
-
-Usage:
-\code
-  using namespace Json;
-  CharReaderBuilder builder;
-  builder["collectComments"] = false;
-  Value value;
-  std::string errs;
-  bool ok = parseFromStream(builder, std::cin, &value, &errs);
-\endcode
-*/
-class JSON_API CharReaderBuilder : public CharReader::Factory {
-public:
-  // Note: We use a Json::Value so that we can add data-members to this class
-  // without a major version bump.
-  /** Configuration of this builder.
-    These are case-sensitive.
-    Available settings (case-sensitive):
-    - `"collectComments": false or true`
-      - true to collect comment and allow writing them
-        back during serialization, false to discard comments.
-        This parameter is ignored if allowComments is false.
-    - `"allowComments": false or true`
-      - true if comments are allowed.
-    - `"strictRoot": false or true`
-      - true if root must be either an array or an object value
-    - `"allowDroppedNullPlaceholders": false or true`
-      - true if dropped null placeholders are allowed. (See StreamWriterBuilder.)
-    - `"allowNumericKeys": false or true`
-      - true if numeric object keys are allowed.
-    - `"allowSingleQuotes": false or true`
-      - true if '' are allowed for strings (both keys and values)
-    - `"stackLimit": integer`
-      - Exceeding stackLimit (recursive depth of `readValue()`) will
-        cause an exception.
-      - This is a security issue (seg-faults caused by deeply nested JSON),
-        so the default is low.
-    - `"failIfExtra": false or true`
-      - If true, `parse()` returns false when extra non-whitespace trails
-        the JSON value in the input string.
-    - `"rejectDupKeys": false or true`
-      - If true, `parse()` returns false when a key is duplicated within an object.
-    - `"allowSpecialFloats": false or true`
-      - If true, special float values (NaNs and infinities) are allowed
-        and their values are lossfree restorable.
-
-    You can examine 'settings_` yourself
-    to see the defaults. You can also write and read them just like any
-    JSON Value.
-    \sa setDefaults()
-    */
-  Json::Value settings_;
-
-  CharReaderBuilder();
-  ~CharReaderBuilder() override;
-
-  CharReader* newCharReader() const override;
-
-  /** \return true if 'settings' are legal and consistent;
-   *   otherwise, indicate bad settings via 'invalid'.
-   */
-  bool validate(Json::Value* invalid) const;
-
-  /** A simple way to update a specific setting.
-   */
-  Value& operator[](std::string key);
-
-  /** Called by ctor, but you can use this to reset settings_.
-   * \pre 'settings' != NULL (but Json::null is fine)
-   * \remark Defaults:
-   * \snippet src/lib_json/json_reader.cpp CharReaderBuilderDefaults
-   */
-  static void setDefaults(Json::Value* settings);
-  /** Same as old Features::strictMode().
-   * \pre 'settings' != NULL (but Json::null is fine)
-   * \remark Defaults:
-   * \snippet src/lib_json/json_reader.cpp CharReaderBuilderStrictMode
-   */
-  static void strictMode(Json::Value* settings);
-};
-
-/** Consume entire stream and use its begin/end.
-  * Someday we might have a real StreamReader, but for now this
-  * is convenient.
-  */
-bool JSON_API parseFromStream(
-    CharReader::Factory const&,
-    std::istream&,
-    Value* root, std::string* errs);
-
-/** \brief Read from 'sin' into 'root'.
-
- Always keep comments from the input JSON.
-
- This can be used to read a file into a particular sub-object.
- For example:
- \code
- Json::Value root;
- cin >> root["dir"]["file"];
- cout << root;
- \endcode
- Result:
- \verbatim
- {
- "dir": {
-     "file": {
-     // The input stream JSON would be nested here.
-     }
- }
- }
- \endverbatim
- \throw std::exception on parse error.
- \see Json::operator<<()
-*/
-JSON_API std::istream& operator>>(std::istream&, Value&);
-
-} // namespace Json
-
-#if defined(JSONCPP_DISABLE_DLL_INTERFACE_WARNING)
-#pragma warning(pop)
-#endif // if defined(JSONCPP_DISABLE_DLL_INTERFACE_WARNING)
-
-#endif // CPPTL_JSON_READER_H_INCLUDED
-
-// //////////////////////////////////////////////////////////////////////
-// End of content of file: include/json/reader.h
-// //////////////////////////////////////////////////////////////////////
-
-
-
-
-
-
-// //////////////////////////////////////////////////////////////////////
-// Beginning of content of file: include/json/writer.h
-// //////////////////////////////////////////////////////////////////////
-
-// Copyright 2007-2010 Baptiste Lepilleur
-// Distributed under MIT license, or public domain if desired and
-// recognized in your jurisdiction.
-// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
-
-#ifndef JSON_WRITER_H_INCLUDED
-#define JSON_WRITER_H_INCLUDED
-
-#if !defined(JSON_IS_AMALGAMATION)
-#include "value.h"
-#endif // if !defined(JSON_IS_AMALGAMATION)
-#include <vector>
-#include <string>
-#include <ostream>
-
-// Disable warning C4251: <data member>: <type> needs to have dll-interface to
-// be used by...
-#if defined(JSONCPP_DISABLE_DLL_INTERFACE_WARNING)
-#pragma warning(push)
-#pragma warning(disable : 4251)
-#endif // if defined(JSONCPP_DISABLE_DLL_INTERFACE_WARNING)
-
-namespace Json {
-
-class Value;
-
-/**
-
-Usage:
-\code
-  using namespace Json;
-  void writeToStdout(StreamWriter::Factory const& factory, Value const& value) {
-    std::unique_ptr<StreamWriter> const writer(
-      factory.newStreamWriter());
-    writer->write(value, &std::cout);
-    std::cout << std::endl;  // add lf and flush
-  }
-\endcode
-*/
-class JSON_API StreamWriter {
-protected:
-  std::ostream* sout_;  // not owned; will not delete
-public:
-  StreamWriter();
-  virtual ~StreamWriter();
-  /** Write Value into document as configured in sub-class.
-      Do not take ownership of sout, but maintain a reference during function.
-      \pre sout != NULL
-      \return zero on success (For now, we always return zero, so check the stream instead.)
-      \throw std::exception possibly, depending on configuration
-   */
-  virtual int write(Value const& root, std::ostream* sout) = 0;
-
-  /** \brief A simple abstract factory.
-   */
-  class JSON_API Factory {
-  public:
-    virtual ~Factory();
-    /** \brief Allocate a CharReader via operator new().
-     * \throw std::exception if something goes wrong (e.g. invalid settings)
-     */
-    virtual StreamWriter* newStreamWriter() const = 0;
-  };  // Factory
-};  // StreamWriter
-
-/** \brief Write into stringstream, then return string, for convenience.
- * A StreamWriter will be created from the factory, used, and then deleted.
- */
-std::string JSON_API writeString(StreamWriter::Factory const& factory, Value const& root);
-
-
-/** \brief Build a StreamWriter implementation.
-
-Usage:
-\code
-  using namespace Json;
-  Value value = ...;
-  StreamWriterBuilder builder;
-  builder["commentStyle"] = "None";
-  builder["indentation"] = "   ";  // or whatever you like
-  std::unique_ptr<Json::StreamWriter> writer(
-      builder.newStreamWriter());
-  writer->write(value, &std::cout);
-  std::cout << std::endl;  // add lf and flush
-\endcode
-*/
-class JSON_API StreamWriterBuilder : public StreamWriter::Factory {
-public:
-  // Note: We use a Json::Value so that we can add data-members to this class
-  // without a major version bump.
-  /** Configuration of this builder.
-    Available settings (case-sensitive):
-    - "commentStyle": "None" or "All"
-    - "indentation":  "<anything>"
-    - "enableYAMLCompatibility": false or true
-      - slightly change the whitespace around colons
-    - "dropNullPlaceholders": false or true
-      - Drop the "null" string from the writer's output for nullValues.
-        Strictly speaking, this is not valid JSON. But when the output is being
-        fed to a browser's Javascript, it makes for smaller output and the
-        browser can handle the output just fine.
-    - "useSpecialFloats": false or true
-      - If true, outputs non-finite floating point values in the following way:
-        NaN values as "NaN", positive infinity as "Infinity", and negative infinity
-        as "-Infinity".
-
-    You can examine 'settings_` yourself
-    to see the defaults. You can also write and read them just like any
-    JSON Value.
-    \sa setDefaults()
-    */
-  Json::Value settings_;
-
-  StreamWriterBuilder();
-  ~StreamWriterBuilder() override;
-
-  /**
-   * \throw std::exception if something goes wrong (e.g. invalid settings)
-   */
-  StreamWriter* newStreamWriter() const override;
-
-  /** \return true if 'settings' are legal and consistent;
-   *   otherwise, indicate bad settings via 'invalid'.
-   */
-  bool validate(Json::Value* invalid) const;
-  /** A simple way to update a specific setting.
-   */
-  Value& operator[](std::string key);
-
-  /** Called by ctor, but you can use this to reset settings_.
-   * \pre 'settings' != NULL (but Json::null is fine)
-   * \remark Defaults:
-   * \snippet src/lib_json/json_writer.cpp StreamWriterBuilderDefaults
-   */
-  static void setDefaults(Json::Value* settings);
-};
-
-/** \brief Abstract class for writers.
- * \deprecated Use StreamWriter. (And really, this is an implementation detail.)
- */
-class JSON_API Writer {
-public:
-  virtual ~Writer();
-
-  virtual std::string write(const Value& root) = 0;
-};
-
-/** \brief Outputs a Value in <a HREF="http://www.json.org">JSON</a> format
- *without formatting (not human friendly).
- *
- * The JSON document is written in a single line. It is not intended for 'human'
- *consumption,
- * but may be useful to support feature such as RPC where bandwidth is limited.
- * \sa Reader, Value
- * \deprecated Use StreamWriterBuilder.
- */
-class JSON_API FastWriter : public Writer {
-
-public:
-  FastWriter();
-  ~FastWriter() override {}
-
-  void enableYAMLCompatibility();
-
-  /** \brief Drop the "null" string from the writer's output for nullValues.
-   * Strictly speaking, this is not valid JSON. But when the output is being
-   * fed to a browser's Javascript, it makes for smaller output and the
-   * browser can handle the output just fine.
-   */
-  void dropNullPlaceholders();
-
-  void omitEndingLineFeed();
-
-public: // overridden from Writer
-  std::string write(const Value& root) override;
-
-private:
-  void writeValue(const Value& value);
-
-  std::string document_;
-  bool yamlCompatiblityEnabled_;
-  bool dropNullPlaceholders_;
-  bool omitEndingLineFeed_;
-};
-
-/** \brief Writes a Value in <a HREF="http://www.json.org">JSON</a> format in a
- *human friendly way.
- *
- * The rules for line break and indent are as follow:
- * - Object value:
- *     - if empty then print {} without indent and line break
- *     - if not empty the print '{', line break & indent, print one value per
- *line
- *       and then unindent and line break and print '}'.
- * - Array value:
- *     - if empty then print [] without indent and line break
- *     - if the array contains no object value, empty array or some other value
- *types,
- *       and all the values fit on one lines, then print the array on a single
- *line.
- *     - otherwise, it the values do not fit on one line, or the array contains
- *       object or non empty array, then print one value per line.
- *
- * If the Value have comments then they are outputted according to their
- *#CommentPlacement.
- *
- * \sa Reader, Value, Value::setComment()
- * \deprecated Use StreamWriterBuilder.
- */
-class JSON_API StyledWriter : public Writer {
-public:
-  StyledWriter();
-  ~StyledWriter() override {}
-
-public: // overridden from Writer
-  /** \brief Serialize a Value in <a HREF="http://www.json.org">JSON</a> format.
-   * \param root Value to serialize.
-   * \return String containing the JSON document that represents the root value.
-   */
-  std::string write(const Value& root) override;
-
-private:
-  void writeValue(const Value& value);
-  void writeArrayValue(const Value& value);
-  bool isMultineArray(const Value& value);
-  void pushValue(const std::string& value);
-  void writeIndent();
-  void writeWithIndent(const std::string& value);
-  void indent();
-  void unindent();
-  void writeCommentBeforeValue(const Value& root);
-  void writeCommentAfterValueOnSameLine(const Value& root);
-  bool hasCommentForValue(const Value& value);
-  static std::string normalizeEOL(const std::string& text);
-
-  typedef std::vector<std::string> ChildValues;
-
-  ChildValues childValues_;
-  std::string document_;
-  std::string indentString_;
-  int rightMargin_;
-  int indentSize_;
-  bool addChildValues_;
-};
-
-/** \brief Writes a Value in <a HREF="http://www.json.org">JSON</a> format in a
- human friendly way,
-     to a stream rather than to a string.
- *
- * The rules for line break and indent are as follow:
- * - Object value:
- *     - if empty then print {} without indent and line break
- *     - if not empty the print '{', line break & indent, print one value per
- line
- *       and then unindent and line break and print '}'.
- * - Array value:
- *     - if empty then print [] without indent and line break
- *     - if the array contains no object value, empty array or some other value
- types,
- *       and all the values fit on one lines, then print the array on a single
- line.
- *     - otherwise, it the values do not fit on one line, or the array contains
- *       object or non empty array, then print one value per line.
- *
- * If the Value have comments then they are outputted according to their
- #CommentPlacement.
- *
- * \param indentation Each level will be indented by this amount extra.
- * \sa Reader, Value, Value::setComment()
- * \deprecated Use StreamWriterBuilder.
- */
-class JSON_API StyledStreamWriter {
-public:
-  StyledStreamWriter(std::string indentation = "\t");
-  ~StyledStreamWriter() {}
-
-public:
-  /** \brief Serialize a Value in <a HREF="http://www.json.org">JSON</a> format.
-   * \param out Stream to write to. (Can be ostringstream, e.g.)
-   * \param root Value to serialize.
-   * \note There is no point in deriving from Writer, since write() should not
-   * return a value.
-   */
-  void write(std::ostream& out, const Value& root);
-
-private:
-  void writeValue(const Value& value);
-  void writeArrayValue(const Value& value);
-  bool isMultineArray(const Value& value);
-  void pushValue(const std::string& value);
-  void writeIndent();
-  void writeWithIndent(const std::string& value);
-  void indent();
-  void unindent();
-  void writeCommentBeforeValue(const Value& root);
-  void writeCommentAfterValueOnSameLine(const Value& root);
-  bool hasCommentForValue(const Value& value);
-  static std::string normalizeEOL(const std::string& text);
-
-  typedef std::vector<std::string> ChildValues;
-
-  ChildValues childValues_;
-  std::ostream* document_;
-  std::string indentString_;
-  int rightMargin_;
-  std::string indentation_;
-  bool addChildValues_ : 1;
-  bool indented_ : 1;
-};
-
-#if defined(JSON_HAS_INT64)
-std::string JSON_API valueToString(Int value);
-std::string JSON_API valueToString(UInt value);
-#endif // if defined(JSON_HAS_INT64)
-std::string JSON_API valueToString(LargestInt value);
-std::string JSON_API valueToString(LargestUInt value);
-std::string JSON_API valueToString(double value);
-std::string JSON_API valueToString(bool value);
-std::string JSON_API valueToQuotedString(const char* value);
-
-/// \brief Output using the StyledStreamWriter.
-/// \see Json::operator>>()
-JSON_API std::ostream& operator<<(std::ostream&, const Value& root);
-
-} // namespace Json
-
-#if defined(JSONCPP_DISABLE_DLL_INTERFACE_WARNING)
-#pragma warning(pop)
-#endif // if defined(JSONCPP_DISABLE_DLL_INTERFACE_WARNING)
-
-#endif // JSON_WRITER_H_INCLUDED
-
-// //////////////////////////////////////////////////////////////////////
-// End of content of file: include/json/writer.h
-// //////////////////////////////////////////////////////////////////////
-
-
-
-
-
-
-// //////////////////////////////////////////////////////////////////////
-// Beginning of content of file: include/json/assertions.h
-// //////////////////////////////////////////////////////////////////////
-
-// Copyright 2007-2010 Baptiste Lepilleur
-// Distributed under MIT license, or public domain if desired and
-// recognized in your jurisdiction.
-// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
-
-#ifndef CPPTL_JSON_ASSERTIONS_H_INCLUDED
-#define CPPTL_JSON_ASSERTIONS_H_INCLUDED
-
-#include <stdlib.h>
-#include <sstream>
-
-#if !defined(JSON_IS_AMALGAMATION)
-#include "config.h"
-#endif // if !defined(JSON_IS_AMALGAMATION)
-
-/** It should not be possible for a maliciously designed file to
- *  cause an abort() or seg-fault, so these macros are used only
- *  for pre-condition violations and internal logic errors.
- */
-#if JSON_USE_EXCEPTION
-
-// @todo <= add detail about condition in exception
-# define JSON_ASSERT(condition)                                                \
-  {if (!(condition)) {Json::throwLogicError( "assert json failed" );}}
-
-# define JSON_FAIL_MESSAGE(message)                                            \
-  {                                                                            \
-    std::ostringstream oss; oss << message;                                    \
-    Json::throwLogicError(oss.str());                                          \
-    abort();                                                                   \
-  }
-
-#else // JSON_USE_EXCEPTION
-
-# define JSON_ASSERT(condition) assert(condition)
-
-// The call to assert() will show the failure message in debug builds. In
-// release builds we abort, for a core-dump or debugger.
-# define JSON_FAIL_MESSAGE(message)                                            \
-  {                                                                            \
-    std::ostringstream oss; oss << message;                                    \
-    assert(false && oss.str().c_str());                                        \
-    abort();                                                                   \
-  }
-
-
-#endif
-
-#define JSON_ASSERT_MESSAGE(condition, message)                                \
-  if (!(condition)) {                                                          \
-    JSON_FAIL_MESSAGE(message);                                                \
-  }
-
-#endif // CPPTL_JSON_ASSERTIONS_H_INCLUDED
-
-// //////////////////////////////////////////////////////////////////////
-// End of content of file: include/json/assertions.h
-// //////////////////////////////////////////////////////////////////////
-
-
-
-
-
-#endif //ifndef JSON_AMALGATED_H_INCLUDED
diff --git a/libs/protobuf/conformance/third_party/jsoncpp/jsoncpp.cpp b/libs/protobuf/conformance/third_party/jsoncpp/jsoncpp.cpp
deleted file mode 100644
index 78919ea..0000000
--- a/libs/protobuf/conformance/third_party/jsoncpp/jsoncpp.cpp
+++ /dev/null
@@ -1,5192 +0,0 @@
-/// Json-cpp amalgated source (http://jsoncpp.sourceforge.net/).
-/// It is intended to be used with #include "json/json.h"
-
-// //////////////////////////////////////////////////////////////////////
-// Beginning of content of file: LICENSE
-// //////////////////////////////////////////////////////////////////////
-
-/*
-The JsonCpp library's source code, including accompanying documentation,
-tests and demonstration applications, are licensed under the following
-conditions...
-
-The author (Baptiste Lepilleur) explicitly disclaims copyright in all
-jurisdictions which recognize such a disclaimer. In such jurisdictions,
-this software is released into the Public Domain.
-
-In jurisdictions which do not recognize Public Domain property (e.g. Germany as of
-2010), this software is Copyright (c) 2007-2010 by Baptiste Lepilleur, and is
-released under the terms of the MIT License (see below).
-
-In jurisdictions which recognize Public Domain property, the user of this
-software may choose to accept it either as 1) Public Domain, 2) under the
-conditions of the MIT License (see below), or 3) under the terms of dual
-Public Domain/MIT License conditions described here, as they choose.
-
-The MIT License is about as close to Public Domain as a license can get, and is
-described in clear, concise terms at:
-
-   http://en.wikipedia.org/wiki/MIT_License
-
-The full text of the MIT License follows:
-
-========================================================================
-Copyright (c) 2007-2010 Baptiste Lepilleur
-
-Permission is hereby granted, free of charge, to any person
-obtaining a copy of this software and associated documentation
-files (the "Software"), to deal in the Software without
-restriction, including without limitation the rights to use, copy,
-modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
-BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-========================================================================
-(END LICENSE TEXT)
-
-The MIT license is compatible with both the GPL and commercial
-software, affording one all of the rights of Public Domain with the
-minor nuisance of being required to keep the above copyright notice
-and license text in the source code. Note also that by accepting the
-Public Domain "license" you can re-license your copy using whatever
-license you like.
-
-*/
-
-// //////////////////////////////////////////////////////////////////////
-// End of content of file: LICENSE
-// //////////////////////////////////////////////////////////////////////
-
-
-
-
-
-
-#include "third_party/jsoncpp/json.h"
-
-#ifndef JSON_IS_AMALGAMATION
-#error "Compile with -I PATH_TO_JSON_DIRECTORY"
-#endif
-
-
-// //////////////////////////////////////////////////////////////////////
-// Beginning of content of file: src/lib_json/json_tool.h
-// //////////////////////////////////////////////////////////////////////
-
-// Copyright 2007-2010 Baptiste Lepilleur
-// Distributed under MIT license, or public domain if desired and
-// recognized in your jurisdiction.
-// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
-
-#ifndef LIB_JSONCPP_JSON_TOOL_H_INCLUDED
-#define LIB_JSONCPP_JSON_TOOL_H_INCLUDED
-
-/* This header provides common string manipulation support, such as UTF-8,
- * portable conversion from/to string...
- *
- * It is an internal header that must not be exposed.
- */
-
-namespace Json {
-
-/// Converts a unicode code-point to UTF-8.
-static inline std::string codePointToUTF8(unsigned int cp) {
-  std::string result;
-
-  // based on description from http://en.wikipedia.org/wiki/UTF-8
-
-  if (cp <= 0x7f) {
-    result.resize(1);
-    result[0] = static_cast<char>(cp);
-  } else if (cp <= 0x7FF) {
-    result.resize(2);
-    result[1] = static_cast<char>(0x80 | (0x3f & cp));
-    result[0] = static_cast<char>(0xC0 | (0x1f & (cp >> 6)));
-  } else if (cp <= 0xFFFF) {
-    result.resize(3);
-    result[2] = static_cast<char>(0x80 | (0x3f & cp));
-    result[1] = static_cast<char>(0x80 | (0x3f & (cp >> 6)));
-    result[0] = static_cast<char>(0xE0 | (0xf & (cp >> 12)));
-  } else if (cp <= 0x10FFFF) {
-    result.resize(4);
-    result[3] = static_cast<char>(0x80 | (0x3f & cp));
-    result[2] = static_cast<char>(0x80 | (0x3f & (cp >> 6)));
-    result[1] = static_cast<char>(0x80 | (0x3f & (cp >> 12)));
-    result[0] = static_cast<char>(0xF0 | (0x7 & (cp >> 18)));
-  }
-
-  return result;
-}
-
-/// Returns true if ch is a control character (in range [1,31]).
-static inline bool isControlCharacter(char ch) { return ch > 0 && ch <= 0x1F; }
-
-enum {
-  /// Constant that specify the size of the buffer that must be passed to
-  /// uintToString.
-  uintToStringBufferSize = 3 * sizeof(LargestUInt) + 1
-};
-
-// Defines a char buffer for use with uintToString().
-typedef char UIntToStringBuffer[uintToStringBufferSize];
-
-/** Converts an unsigned integer to string.
- * @param value Unsigned integer to convert to string
- * @param current Input/Output string buffer.
- *        Must have at least uintToStringBufferSize chars free.
- */
-static inline void uintToString(LargestUInt value, char*& current) {
-  *--current = 0;
-  do {
-    *--current = static_cast<signed char>(value % 10U + static_cast<unsigned>('0'));
-    value /= 10;
-  } while (value != 0);
-}
-
-/** Change ',' to '.' everywhere in buffer.
- *
- * We had a sophisticated way, but it did not work in WinCE.
- * @see https://github.com/open-source-parsers/jsoncpp/pull/9
- */
-static inline void fixNumericLocale(char* begin, char* end) {
-  while (begin < end) {
-    if (*begin == ',') {
-      *begin = '.';
-    }
-    ++begin;
-  }
-}
-
-} // namespace Json {
-
-#endif // LIB_JSONCPP_JSON_TOOL_H_INCLUDED
-
-// //////////////////////////////////////////////////////////////////////
-// End of content of file: src/lib_json/json_tool.h
-// //////////////////////////////////////////////////////////////////////
-
-
-
-
-
-
-// //////////////////////////////////////////////////////////////////////
-// Beginning of content of file: src/lib_json/json_reader.cpp
-// //////////////////////////////////////////////////////////////////////
-
-// Copyright 2007-2011 Baptiste Lepilleur
-// Distributed under MIT license, or public domain if desired and
-// recognized in your jurisdiction.
-// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
-
-#if !defined(JSON_IS_AMALGAMATION)
-#include <json/assertions.h>
-#include <json/reader.h>
-#include <json/value.h>
-#include "json_tool.h"
-#endif // if !defined(JSON_IS_AMALGAMATION)
-#include <utility>
-#include <cstdio>
-#include <cassert>
-#include <cstring>
-#include <istream>
-#include <sstream>
-#include <memory>
-#include <set>
-#include <limits>
-
-#if defined(_MSC_VER)
-#if !defined(WINCE) && defined(__STDC_SECURE_LIB__) && _MSC_VER >= 1500 // VC++ 9.0 and above
-#define snprintf sprintf_s
-#elif _MSC_VER >= 1900 // VC++ 14.0 and above
-#define snprintf std::snprintf
-#else
-#define snprintf _snprintf
-#endif
-#elif defined(__ANDROID__) || defined(__QNXNTO__)
-#define snprintf snprintf
-#elif __cplusplus >= 201103L
-#define snprintf std::snprintf
-#endif
-
-#if defined(__QNXNTO__)
-#define sscanf std::sscanf
-#endif
-
-#if defined(_MSC_VER) && _MSC_VER >= 1400 // VC++ 8.0
-// Disable warning about strdup being deprecated.
-#pragma warning(disable : 4996)
-#endif
-
-static int const stackLimit_g = 1000;
-static int       stackDepth_g = 0;  // see readValue()
-
-namespace Json {
-
-#if __cplusplus >= 201103L || (defined(_CPPLIB_VER) && _CPPLIB_VER >= 520)
-typedef std::unique_ptr<CharReader> CharReaderPtr;
-#else
-typedef std::auto_ptr<CharReader>   CharReaderPtr;
-#endif
-
-// Implementation of class Features
-// ////////////////////////////////
-
-Features::Features()
-    : allowComments_(true), strictRoot_(false),
-      allowDroppedNullPlaceholders_(false), allowNumericKeys_(false) {}
-
-Features Features::all() { return Features(); }
-
-Features Features::strictMode() {
-  Features features;
-  features.allowComments_ = false;
-  features.strictRoot_ = true;
-  features.allowDroppedNullPlaceholders_ = false;
-  features.allowNumericKeys_ = false;
-  return features;
-}
-
-// Implementation of class Reader
-// ////////////////////////////////
-
-static bool containsNewLine(Reader::Location begin, Reader::Location end) {
-  for (; begin < end; ++begin)
-    if (*begin == '\n' || *begin == '\r')
-      return true;
-  return false;
-}
-
-// Class Reader
-// //////////////////////////////////////////////////////////////////
-
-Reader::Reader()
-    : errors_(), document_(), begin_(), end_(), current_(), lastValueEnd_(),
-      lastValue_(), commentsBefore_(), features_(Features::all()),
-      collectComments_() {}
-
-Reader::Reader(const Features& features)
-    : errors_(), document_(), begin_(), end_(), current_(), lastValueEnd_(),
-      lastValue_(), commentsBefore_(), features_(features), collectComments_() {
-}
-
-bool
-Reader::parse(const std::string& document, Value& root, bool collectComments) {
-  document_ = document;
-  const char* begin = document_.c_str();
-  const char* end = begin + document_.length();
-  return parse(begin, end, root, collectComments);
-}
-
-bool Reader::parse(std::istream& sin, Value& root, bool collectComments) {
-  // std::istream_iterator<char> begin(sin);
-  // std::istream_iterator<char> end;
-  // Those would allow streamed input from a file, if parse() were a
-  // template function.
-
-  // Since std::string is reference-counted, this at least does not
-  // create an extra copy.
-  std::string doc;
-  std::getline(sin, doc, (char)EOF);
-  return parse(doc, root, collectComments);
-}
-
-bool Reader::parse(const char* beginDoc,
-                   const char* endDoc,
-                   Value& root,
-                   bool collectComments) {
-  if (!features_.allowComments_) {
-    collectComments = false;
-  }
-
-  begin_ = beginDoc;
-  end_ = endDoc;
-  collectComments_ = collectComments;
-  current_ = begin_;
-  lastValueEnd_ = 0;
-  lastValue_ = 0;
-  commentsBefore_ = "";
-  errors_.clear();
-  while (!nodes_.empty())
-    nodes_.pop();
-  nodes_.push(&root);
-
-  stackDepth_g = 0;  // Yes, this is bad coding, but options are limited.
-  bool successful = readValue();
-  Token token;
-  skipCommentTokens(token);
-  if (collectComments_ && !commentsBefore_.empty())
-    root.setComment(commentsBefore_, commentAfter);
-  if (features_.strictRoot_) {
-    if (!root.isArray() && !root.isObject()) {
-      // Set error location to start of doc, ideally should be first token found
-      // in doc
-      token.type_ = tokenError;
-      token.start_ = beginDoc;
-      token.end_ = endDoc;
-      addError(
-          "A valid JSON document must be either an array or an object value.",
-          token);
-      return false;
-    }
-  }
-  return successful;
-}
-
-bool Reader::readValue() {
-  // This is a non-reentrant way to support a stackLimit. Terrible!
-  // But this deprecated class has a security problem: Bad input can
-  // cause a seg-fault. This seems like a fair, binary-compatible way
-  // to prevent the problem.
-  if (stackDepth_g >= stackLimit_g) throwRuntimeError("Exceeded stackLimit in readValue().");
-  ++stackDepth_g;
-
-  Token token;
-  skipCommentTokens(token);
-  bool successful = true;
-
-  if (collectComments_ && !commentsBefore_.empty()) {
-    currentValue().setComment(commentsBefore_, commentBefore);
-    commentsBefore_ = "";
-  }
-
-  switch (token.type_) {
-  case tokenObjectBegin:
-    successful = readObject(token);
-    currentValue().setOffsetLimit(current_ - begin_);
-    break;
-  case tokenArrayBegin:
-    successful = readArray(token);
-    currentValue().setOffsetLimit(current_ - begin_);
-    break;
-  case tokenNumber:
-    successful = decodeNumber(token);
-    break;
-  case tokenString:
-    successful = decodeString(token);
-    break;
-  case tokenTrue:
-    {
-    Value v(true);
-    currentValue().swapPayload(v);
-    currentValue().setOffsetStart(token.start_ - begin_);
-    currentValue().setOffsetLimit(token.end_ - begin_);
-    }
-    break;
-  case tokenFalse:
-    {
-    Value v(false);
-    currentValue().swapPayload(v);
-    currentValue().setOffsetStart(token.start_ - begin_);
-    currentValue().setOffsetLimit(token.end_ - begin_);
-    }
-    break;
-  case tokenNull:
-    {
-    Value v;
-    currentValue().swapPayload(v);
-    currentValue().setOffsetStart(token.start_ - begin_);
-    currentValue().setOffsetLimit(token.end_ - begin_);
-    }
-    break;
-  case tokenArraySeparator:
-  case tokenObjectEnd:
-  case tokenArrayEnd:
-    if (features_.allowDroppedNullPlaceholders_) {
-      // "Un-read" the current token and mark the current value as a null
-      // token.
-      current_--;
-      Value v;
-      currentValue().swapPayload(v);
-      currentValue().setOffsetStart(current_ - begin_ - 1);
-      currentValue().setOffsetLimit(current_ - begin_);
-      break;
-    } // Else, fall through...
-  default:
-    currentValue().setOffsetStart(token.start_ - begin_);
-    currentValue().setOffsetLimit(token.end_ - begin_);
-    return addError("Syntax error: value, object or array expected.", token);
-  }
-
-  if (collectComments_) {
-    lastValueEnd_ = current_;
-    lastValue_ = &currentValue();
-  }
-
-  --stackDepth_g;
-  return successful;
-}
-
-void Reader::skipCommentTokens(Token& token) {
-  if (features_.allowComments_) {
-    do {
-      readToken(token);
-    } while (token.type_ == tokenComment);
-  } else {
-    readToken(token);
-  }
-}
-
-bool Reader::readToken(Token& token) {
-  skipSpaces();
-  token.start_ = current_;
-  Char c = getNextChar();
-  bool ok = true;
-  switch (c) {
-  case '{':
-    token.type_ = tokenObjectBegin;
-    break;
-  case '}':
-    token.type_ = tokenObjectEnd;
-    break;
-  case '[':
-    token.type_ = tokenArrayBegin;
-    break;
-  case ']':
-    token.type_ = tokenArrayEnd;
-    break;
-  case '"':
-    token.type_ = tokenString;
-    ok = readString();
-    break;
-  case '/':
-    token.type_ = tokenComment;
-    ok = readComment();
-    break;
-  case '0':
-  case '1':
-  case '2':
-  case '3':
-  case '4':
-  case '5':
-  case '6':
-  case '7':
-  case '8':
-  case '9':
-  case '-':
-    token.type_ = tokenNumber;
-    readNumber();
-    break;
-  case 't':
-    token.type_ = tokenTrue;
-    ok = match("rue", 3);
-    break;
-  case 'f':
-    token.type_ = tokenFalse;
-    ok = match("alse", 4);
-    break;
-  case 'n':
-    token.type_ = tokenNull;
-    ok = match("ull", 3);
-    break;
-  case ',':
-    token.type_ = tokenArraySeparator;
-    break;
-  case ':':
-    token.type_ = tokenMemberSeparator;
-    break;
-  case 0:
-    token.type_ = tokenEndOfStream;
-    break;
-  default:
-    ok = false;
-    break;
-  }
-  if (!ok)
-    token.type_ = tokenError;
-  token.end_ = current_;
-  return true;
-}
-
-void Reader::skipSpaces() {
-  while (current_ != end_) {
-    Char c = *current_;
-    if (c == ' ' || c == '\t' || c == '\r' || c == '\n')
-      ++current_;
-    else
-      break;
-  }
-}
-
-bool Reader::match(Location pattern, int patternLength) {
-  if (end_ - current_ < patternLength)
-    return false;
-  int index = patternLength;
-  while (index--)
-    if (current_[index] != pattern[index])
-      return false;
-  current_ += patternLength;
-  return true;
-}
-
-bool Reader::readComment() {
-  Location commentBegin = current_ - 1;
-  Char c = getNextChar();
-  bool successful = false;
-  if (c == '*')
-    successful = readCStyleComment();
-  else if (c == '/')
-    successful = readCppStyleComment();
-  if (!successful)
-    return false;
-
-  if (collectComments_) {
-    CommentPlacement placement = commentBefore;
-    if (lastValueEnd_ && !containsNewLine(lastValueEnd_, commentBegin)) {
-      if (c != '*' || !containsNewLine(commentBegin, current_))
-        placement = commentAfterOnSameLine;
-    }
-
-    addComment(commentBegin, current_, placement);
-  }
-  return true;
-}
-
-static std::string normalizeEOL(Reader::Location begin, Reader::Location end) {
-  std::string normalized;
-  normalized.reserve(end - begin);
-  Reader::Location current = begin;
-  while (current != end) {
-    char c = *current++;
-    if (c == '\r') {
-      if (current != end && *current == '\n')
-         // convert dos EOL
-         ++current;
-      // convert Mac EOL
-      normalized += '\n';
-    } else {
-      normalized += c;
-    }
-  }
-  return normalized;
-}
-
-void
-Reader::addComment(Location begin, Location end, CommentPlacement placement) {
-  assert(collectComments_);
-  const std::string& normalized = normalizeEOL(begin, end);
-  if (placement == commentAfterOnSameLine) {
-    assert(lastValue_ != 0);
-    lastValue_->setComment(normalized, placement);
-  } else {
-    commentsBefore_ += normalized;
-  }
-}
-
-bool Reader::readCStyleComment() {
-  while (current_ != end_) {
-    Char c = getNextChar();
-    if (c == '*' && *current_ == '/')
-      break;
-  }
-  return getNextChar() == '/';
-}
-
-bool Reader::readCppStyleComment() {
-  while (current_ != end_) {
-    Char c = getNextChar();
-    if (c == '\n')
-      break;
-    if (c == '\r') {
-      // Consume DOS EOL. It will be normalized in addComment.
-      if (current_ != end_ && *current_ == '\n')
-        getNextChar();
-      // Break on Moc OS 9 EOL.
-      break;
-    }
-  }
-  return true;
-}
-
-void Reader::readNumber() {
-  const char *p = current_;
-  char c = '0'; // stopgap for already consumed character
-  // integral part
-  while (c >= '0' && c <= '9')
-    c = (current_ = p) < end_ ? *p++ : 0;
-  // fractional part
-  if (c == '.') {
-    c = (current_ = p) < end_ ? *p++ : 0;
-    while (c >= '0' && c <= '9')
-      c = (current_ = p) < end_ ? *p++ : 0;
-  }
-  // exponential part
-  if (c == 'e' || c == 'E') {
-    c = (current_ = p) < end_ ? *p++ : 0;
-    if (c == '+' || c == '-')
-      c = (current_ = p) < end_ ? *p++ : 0;
-    while (c >= '0' && c <= '9')
-      c = (current_ = p) < end_ ? *p++ : 0;
-  }
-}
-
-bool Reader::readString() {
-  Char c = 0;
-  while (current_ != end_) {
-    c = getNextChar();
-    if (c == '\\')
-      getNextChar();
-    else if (c == '"')
-      break;
-  }
-  return c == '"';
-}
-
-bool Reader::readObject(Token& tokenStart) {
-  Token tokenName;
-  std::string name;
-  Value init(objectValue);
-  currentValue().swapPayload(init);
-  currentValue().setOffsetStart(tokenStart.start_ - begin_);
-  while (readToken(tokenName)) {
-    bool initialTokenOk = true;
-    while (tokenName.type_ == tokenComment && initialTokenOk)
-      initialTokenOk = readToken(tokenName);
-    if (!initialTokenOk)
-      break;
-    if (tokenName.type_ == tokenObjectEnd && name.empty()) // empty object
-      return true;
-    name = "";
-    if (tokenName.type_ == tokenString) {
-      if (!decodeString(tokenName, name))
-        return recoverFromError(tokenObjectEnd);
-    } else if (tokenName.type_ == tokenNumber && features_.allowNumericKeys_) {
-      Value numberName;
-      if (!decodeNumber(tokenName, numberName))
-        return recoverFromError(tokenObjectEnd);
-      name = numberName.asString();
-    } else {
-      break;
-    }
-
-    Token colon;
-    if (!readToken(colon) || colon.type_ != tokenMemberSeparator) {
-      return addErrorAndRecover(
-          "Missing ':' after object member name", colon, tokenObjectEnd);
-    }
-    Value& value = currentValue()[name];
-    nodes_.push(&value);
-    bool ok = readValue();
-    nodes_.pop();
-    if (!ok) // error already set
-      return recoverFromError(tokenObjectEnd);
-
-    Token comma;
-    if (!readToken(comma) ||
-        (comma.type_ != tokenObjectEnd && comma.type_ != tokenArraySeparator &&
-         comma.type_ != tokenComment)) {
-      return addErrorAndRecover(
-          "Missing ',' or '}' in object declaration", comma, tokenObjectEnd);
-    }
-    bool finalizeTokenOk = true;
-    while (comma.type_ == tokenComment && finalizeTokenOk)
-      finalizeTokenOk = readToken(comma);
-    if (comma.type_ == tokenObjectEnd)
-      return true;
-  }
-  return addErrorAndRecover(
-      "Missing '}' or object member name", tokenName, tokenObjectEnd);
-}
-
-bool Reader::readArray(Token& tokenStart) {
-  Value init(arrayValue);
-  currentValue().swapPayload(init);
-  currentValue().setOffsetStart(tokenStart.start_ - begin_);
-  skipSpaces();
-  if (*current_ == ']') // empty array
-  {
-    Token endArray;
-    readToken(endArray);
-    return true;
-  }
-  int index = 0;
-  for (;;) {
-    Value& value = currentValue()[index++];
-    nodes_.push(&value);
-    bool ok = readValue();
-    nodes_.pop();
-    if (!ok) // error already set
-      return recoverFromError(tokenArrayEnd);
-
-    Token token;
-    // Accept Comment after last item in the array.
-    ok = readToken(token);
-    while (token.type_ == tokenComment && ok) {
-      ok = readToken(token);
-    }
-    bool badTokenType =
-        (token.type_ != tokenArraySeparator && token.type_ != tokenArrayEnd);
-    if (!ok || badTokenType) {
-      return addErrorAndRecover(
-          "Missing ',' or ']' in array declaration", token, tokenArrayEnd);
-    }
-    if (token.type_ == tokenArrayEnd)
-      break;
-  }
-  return true;
-}
-
-bool Reader::decodeNumber(Token& token) {
-  Value decoded;
-  if (!decodeNumber(token, decoded))
-    return false;
-  currentValue().swapPayload(decoded);
-  currentValue().setOffsetStart(token.start_ - begin_);
-  currentValue().setOffsetLimit(token.end_ - begin_);
-  return true;
-}
-
-bool Reader::decodeNumber(Token& token, Value& decoded) {
-  // Attempts to parse the number as an integer. If the number is
-  // larger than the maximum supported value of an integer then
-  // we decode the number as a double.
-  Location current = token.start_;
-  bool isNegative = *current == '-';
-  if (isNegative)
-    ++current;
-  // TODO: Help the compiler do the div and mod at compile time or get rid of them.
-  Value::LargestUInt maxIntegerValue =
-      isNegative ? Value::LargestUInt(Value::maxLargestInt) + 1
-                 : Value::maxLargestUInt;
-  Value::LargestUInt threshold = maxIntegerValue / 10;
-  Value::LargestUInt value = 0;
-  while (current < token.end_) {
-    Char c = *current++;
-    if (c < '0' || c > '9')
-      return decodeDouble(token, decoded);
-    Value::UInt digit(c - '0');
-    if (value >= threshold) {
-      // We've hit or exceeded the max value divided by 10 (rounded down). If
-      // a) we've only just touched the limit, b) this is the last digit, and
-      // c) it's small enough to fit in that rounding delta, we're okay.
-      // Otherwise treat this number as a double to avoid overflow.
-      if (value > threshold || current != token.end_ ||
-          digit > maxIntegerValue % 10) {
-        return decodeDouble(token, decoded);
-      }
-    }
-    value = value * 10 + digit;
-  }
-  if (isNegative && value == maxIntegerValue)
-    decoded = Value::minLargestInt;
-  else if (isNegative)
-    decoded = -Value::LargestInt(value);
-  else if (value <= Value::LargestUInt(Value::maxInt))
-    decoded = Value::LargestInt(value);
-  else
-    decoded = value;
-  return true;
-}
-
-bool Reader::decodeDouble(Token& token) {
-  Value decoded;
-  if (!decodeDouble(token, decoded))
-    return false;
-  currentValue().swapPayload(decoded);
-  currentValue().setOffsetStart(token.start_ - begin_);
-  currentValue().setOffsetLimit(token.end_ - begin_);
-  return true;
-}
-
-bool Reader::decodeDouble(Token& token, Value& decoded) {
-  double value = 0;
-  std::string buffer(token.start_, token.end_);
-  std::istringstream is(buffer);
-  if (!(is >> value))
-    return addError("'" + std::string(token.start_, token.end_) +
-                        "' is not a number.",
-                    token);
-  decoded = value;
-  return true;
-}
-
-bool Reader::decodeString(Token& token) {
-  std::string decoded_string;
-  if (!decodeString(token, decoded_string))
-    return false;
-  Value decoded(decoded_string);
-  currentValue().swapPayload(decoded);
-  currentValue().setOffsetStart(token.start_ - begin_);
-  currentValue().setOffsetLimit(token.end_ - begin_);
-  return true;
-}
-
-bool Reader::decodeString(Token& token, std::string& decoded) {
-  decoded.reserve(token.end_ - token.start_ - 2);
-  Location current = token.start_ + 1; // skip '"'
-  Location end = token.end_ - 1;       // do not include '"'
-  while (current != end) {
-    Char c = *current++;
-    if (c == '"')
-      break;
-    else if (c == '\\') {
-      if (current == end)
-        return addError("Empty escape sequence in string", token, current);
-      Char escape = *current++;
-      switch (escape) {
-      case '"':
-        decoded += '"';
-        break;
-      case '/':
-        decoded += '/';
-        break;
-      case '\\':
-        decoded += '\\';
-        break;
-      case 'b':
-        decoded += '\b';
-        break;
-      case 'f':
-        decoded += '\f';
-        break;
-      case 'n':
-        decoded += '\n';
-        break;
-      case 'r':
-        decoded += '\r';
-        break;
-      case 't':
-        decoded += '\t';
-        break;
-      case 'u': {
-        unsigned int unicode;
-        if (!decodeUnicodeCodePoint(token, current, end, unicode))
-          return false;
-        decoded += codePointToUTF8(unicode);
-      } break;
-      default:
-        return addError("Bad escape sequence in string", token, current);
-      }
-    } else {
-      decoded += c;
-    }
-  }
-  return true;
-}
-
-bool Reader::decodeUnicodeCodePoint(Token& token,
-                                    Location& current,
-                                    Location end,
-                                    unsigned int& unicode) {
-
-  if (!decodeUnicodeEscapeSequence(token, current, end, unicode))
-    return false;
-  if (unicode >= 0xD800 && unicode <= 0xDBFF) {
-    // surrogate pairs
-    if (end - current < 6)
-      return addError(
-          "additional six characters expected to parse unicode surrogate pair.",
-          token,
-          current);
-    unsigned int surrogatePair;
-    if (*(current++) == '\\' && *(current++) == 'u') {
-      if (decodeUnicodeEscapeSequence(token, current, end, surrogatePair)) {
-        unicode = 0x10000 + ((unicode & 0x3FF) << 10) + (surrogatePair & 0x3FF);
-      } else
-        return false;
-    } else
-      return addError("expecting another \\u token to begin the second half of "
-                      "a unicode surrogate pair",
-                      token,
-                      current);
-  }
-  return true;
-}
-
-bool Reader::decodeUnicodeEscapeSequence(Token& token,
-                                         Location& current,
-                                         Location end,
-                                         unsigned int& unicode) {
-  if (end - current < 4)
-    return addError(
-        "Bad unicode escape sequence in string: four digits expected.",
-        token,
-        current);
-  unicode = 0;
-  for (int index = 0; index < 4; ++index) {
-    Char c = *current++;
-    unicode *= 16;
-    if (c >= '0' && c <= '9')
-      unicode += c - '0';
-    else if (c >= 'a' && c <= 'f')
-      unicode += c - 'a' + 10;
-    else if (c >= 'A' && c <= 'F')
-      unicode += c - 'A' + 10;
-    else
-      return addError(
-          "Bad unicode escape sequence in string: hexadecimal digit expected.",
-          token,
-          current);
-  }
-  return true;
-}
-
-bool
-Reader::addError(const std::string& message, Token& token, Location extra) {
-  ErrorInfo info;
-  info.token_ = token;
-  info.message_ = message;
-  info.extra_ = extra;
-  errors_.push_back(info);
-  return false;
-}
-
-bool Reader::recoverFromError(TokenType skipUntilToken) {
-  int errorCount = int(errors_.size());
-  Token skip;
-  for (;;) {
-    if (!readToken(skip))
-      errors_.resize(errorCount); // discard errors caused by recovery
-    if (skip.type_ == skipUntilToken || skip.type_ == tokenEndOfStream)
-      break;
-  }
-  errors_.resize(errorCount);
-  return false;
-}
-
-bool Reader::addErrorAndRecover(const std::string& message,
-                                Token& token,
-                                TokenType skipUntilToken) {
-  addError(message, token);
-  return recoverFromError(skipUntilToken);
-}
-
-Value& Reader::currentValue() { return *(nodes_.top()); }
-
-Reader::Char Reader::getNextChar() {
-  if (current_ == end_)
-    return 0;
-  return *current_++;
-}
-
-void Reader::getLocationLineAndColumn(Location location,
-                                      int& line,
-                                      int& column) const {
-  Location current = begin_;
-  Location lastLineStart = current;
-  line = 0;
-  while (current < location && current != end_) {
-    Char c = *current++;
-    if (c == '\r') {
-      if (*current == '\n')
-        ++current;
-      lastLineStart = current;
-      ++line;
-    } else if (c == '\n') {
-      lastLineStart = current;
-      ++line;
-    }
-  }
-  // column & line start at 1
-  column = int(location - lastLineStart) + 1;
-  ++line;
-}
-
-std::string Reader::getLocationLineAndColumn(Location location) const {
-  int line, column;
-  getLocationLineAndColumn(location, line, column);
-  char buffer[18 + 16 + 16 + 1];
-  snprintf(buffer, sizeof(buffer), "Line %d, Column %d", line, column);
-  return buffer;
-}
-
-// Deprecated. Preserved for backward compatibility
-std::string Reader::getFormatedErrorMessages() const {
-  return getFormattedErrorMessages();
-}
-
-std::string Reader::getFormattedErrorMessages() const {
-  std::string formattedMessage;
-  for (Errors::const_iterator itError = errors_.begin();
-       itError != errors_.end();
-       ++itError) {
-    const ErrorInfo& error = *itError;
-    formattedMessage +=
-        "* " + getLocationLineAndColumn(error.token_.start_) + "\n";
-    formattedMessage += "  " + error.message_ + "\n";
-    if (error.extra_)
-      formattedMessage +=
-          "See " + getLocationLineAndColumn(error.extra_) + " for detail.\n";
-  }
-  return formattedMessage;
-}
-
-std::vector<Reader::StructuredError> Reader::getStructuredErrors() const {
-  std::vector<Reader::StructuredError> allErrors;
-  for (Errors::const_iterator itError = errors_.begin();
-       itError != errors_.end();
-       ++itError) {
-    const ErrorInfo& error = *itError;
-    Reader::StructuredError structured;
-    structured.offset_start = error.token_.start_ - begin_;
-    structured.offset_limit = error.token_.end_ - begin_;
-    structured.message = error.message_;
-    allErrors.push_back(structured);
-  }
-  return allErrors;
-}
-
-bool Reader::pushError(const Value& value, const std::string& message) {
-  size_t length = end_ - begin_;
-  if(value.getOffsetStart() > length
-    || value.getOffsetLimit() > length)
-    return false;
-  Token token;
-  token.type_ = tokenError;
-  token.start_ = begin_ + value.getOffsetStart();
-  token.end_ = end_ + value.getOffsetLimit();
-  ErrorInfo info;
-  info.token_ = token;
-  info.message_ = message;
-  info.extra_ = 0;
-  errors_.push_back(info);
-  return true;
-}
-
-bool Reader::pushError(const Value& value, const std::string& message, const Value& extra) {
-  size_t length = end_ - begin_;
-  if(value.getOffsetStart() > length
-    || value.getOffsetLimit() > length
-    || extra.getOffsetLimit() > length)
-    return false;
-  Token token;
-  token.type_ = tokenError;
-  token.start_ = begin_ + value.getOffsetStart();
-  token.end_ = begin_ + value.getOffsetLimit();
-  ErrorInfo info;
-  info.token_ = token;
-  info.message_ = message;
-  info.extra_ = begin_ + extra.getOffsetStart();
-  errors_.push_back(info);
-  return true;
-}
-
-bool Reader::good() const {
-  return !errors_.size();
-}
-
-// exact copy of Features
-class OurFeatures {
-public:
-  static OurFeatures all();
-  bool allowComments_;
-  bool strictRoot_;
-  bool allowDroppedNullPlaceholders_;
-  bool allowNumericKeys_;
-  bool allowSingleQuotes_;
-  bool failIfExtra_;
-  bool rejectDupKeys_;
-  bool allowSpecialFloats_;
-  int stackLimit_;
-};  // OurFeatures
-
-// exact copy of Implementation of class Features
-// ////////////////////////////////
-
-OurFeatures OurFeatures::all() { return OurFeatures(); }
-
-// Implementation of class Reader
-// ////////////////////////////////
-
-// exact copy of Reader, renamed to OurReader
-class OurReader {
-public:
-  typedef char Char;
-  typedef const Char* Location;
-  struct StructuredError {
-    size_t offset_start;
-    size_t offset_limit;
-    std::string message;
-  };
-
-  OurReader(OurFeatures const& features);
-  bool parse(const char* beginDoc,
-             const char* endDoc,
-             Value& root,
-             bool collectComments = true);
-  std::string getFormattedErrorMessages() const;
-  std::vector<StructuredError> getStructuredErrors() const;
-  bool pushError(const Value& value, const std::string& message);
-  bool pushError(const Value& value, const std::string& message, const Value& extra);
-  bool good() const;
-
-private:
-  OurReader(OurReader const&);  // no impl
-  void operator=(OurReader const&);  // no impl
-
-  enum TokenType {
-    tokenEndOfStream = 0,
-    tokenObjectBegin,
-    tokenObjectEnd,
-    tokenArrayBegin,
-    tokenArrayEnd,
-    tokenString,
-    tokenNumber,
-    tokenTrue,
-    tokenFalse,
-    tokenNull,
-    tokenNaN,
-    tokenPosInf,
-    tokenNegInf,
-    tokenArraySeparator,
-    tokenMemberSeparator,
-    tokenComment,
-    tokenError
-  };
-
-  class Token {
-  public:
-    TokenType type_;
-    Location start_;
-    Location end_;
-  };
-
-  class ErrorInfo {
-  public:
-    Token token_;
-    std::string message_;
-    Location extra_;
-  };
-
-  typedef std::deque<ErrorInfo> Errors;
-
-  bool readToken(Token& token);
-  void skipSpaces();
-  bool match(Location pattern, int patternLength);
-  bool readComment();
-  bool readCStyleComment();
-  bool readCppStyleComment();
-  bool readString();
-  bool readStringSingleQuote();
-  bool readNumber(bool checkInf);
-  bool readValue();
-  bool readObject(Token& token);
-  bool readArray(Token& token);
-  bool decodeNumber(Token& token);
-  bool decodeNumber(Token& token, Value& decoded);
-  bool decodeString(Token& token);
-  bool decodeString(Token& token, std::string& decoded);
-  bool decodeDouble(Token& token);
-  bool decodeDouble(Token& token, Value& decoded);
-  bool decodeUnicodeCodePoint(Token& token,
-                              Location& current,
-                              Location end,
-                              unsigned int& unicode);
-  bool decodeUnicodeEscapeSequence(Token& token,
-                                   Location& current,
-                                   Location end,
-                                   unsigned int& unicode);
-  bool addError(const std::string& message, Token& token, Location extra = 0);
-  bool recoverFromError(TokenType skipUntilToken);
-  bool addErrorAndRecover(const std::string& message,
-                          Token& token,
-                          TokenType skipUntilToken);
-  void skipUntilSpace();
-  Value& currentValue();
-  Char getNextChar();
-  void
-  getLocationLineAndColumn(Location location, int& line, int& column) const;
-  std::string getLocationLineAndColumn(Location location) const;
-  void addComment(Location begin, Location end, CommentPlacement placement);
-  void skipCommentTokens(Token& token);
-
-  typedef std::stack<Value*> Nodes;
-  Nodes nodes_;
-  Errors errors_;
-  std::string document_;
-  Location begin_;
-  Location end_;
-  Location current_;
-  Location lastValueEnd_;
-  Value* lastValue_;
-  std::string commentsBefore_;
-  int stackDepth_;
-
-  OurFeatures const features_;
-  bool collectComments_;
-};  // OurReader
-
-// complete copy of Read impl, for OurReader
-
-OurReader::OurReader(OurFeatures const& features)
-    : errors_(), document_(), begin_(), end_(), current_(), lastValueEnd_(),
-      lastValue_(), commentsBefore_(),
-      stackDepth_(0),
-      features_(features), collectComments_() {
-}
-
-bool OurReader::parse(const char* beginDoc,
-                   const char* endDoc,
-                   Value& root,
-                   bool collectComments) {
-  if (!features_.allowComments_) {
-    collectComments = false;
-  }
-
-  begin_ = beginDoc;
-  end_ = endDoc;
-  collectComments_ = collectComments;
-  current_ = begin_;
-  lastValueEnd_ = 0;
-  lastValue_ = 0;
-  commentsBefore_ = "";
-  errors_.clear();
-  while (!nodes_.empty())
-    nodes_.pop();
-  nodes_.push(&root);
-
-  stackDepth_ = 0;
-  bool successful = readValue();
-  Token token;
-  skipCommentTokens(token);
-  if (features_.failIfExtra_) {
-    if (token.type_ != tokenError && token.type_ != tokenEndOfStream) {
-      addError("Extra non-whitespace after JSON value.", token);
-      return false;
-    }
-  }
-  if (collectComments_ && !commentsBefore_.empty())
-    root.setComment(commentsBefore_, commentAfter);
-  if (features_.strictRoot_) {
-    if (!root.isArray() && !root.isObject()) {
-      // Set error location to start of doc, ideally should be first token found
-      // in doc
-      token.type_ = tokenError;
-      token.start_ = beginDoc;
-      token.end_ = endDoc;
-      addError(
-          "A valid JSON document must be either an array or an object value.",
-          token);
-      return false;
-    }
-  }
-  return successful;
-}
-
-bool OurReader::readValue() {
-  if (stackDepth_ >= features_.stackLimit_) throwRuntimeError("Exceeded stackLimit in readValue().");
-  ++stackDepth_;
-  Token token;
-  skipCommentTokens(token);
-  bool successful = true;
-
-  if (collectComments_ && !commentsBefore_.empty()) {
-    currentValue().setComment(commentsBefore_, commentBefore);
-    commentsBefore_ = "";
-  }
-
-  switch (token.type_) {
-  case tokenObjectBegin:
-    successful = readObject(token);
-    currentValue().setOffsetLimit(current_ - begin_);
-    break;
-  case tokenArrayBegin:
-    successful = readArray(token);
-    currentValue().setOffsetLimit(current_ - begin_);
-    break;
-  case tokenNumber:
-    successful = decodeNumber(token);
-    break;
-  case tokenString:
-    successful = decodeString(token);
-    break;
-  case tokenTrue:
-    {
-    Value v(true);
-    currentValue().swapPayload(v);
-    currentValue().setOffsetStart(token.start_ - begin_);
-    currentValue().setOffsetLimit(token.end_ - begin_);
-    }
-    break;
-  case tokenFalse:
-    {
-    Value v(false);
-    currentValue().swapPayload(v);
-    currentValue().setOffsetStart(token.start_ - begin_);
-    currentValue().setOffsetLimit(token.end_ - begin_);
-    }
-    break;
-  case tokenNull:
-    {
-    Value v;
-    currentValue().swapPayload(v);
-    currentValue().setOffsetStart(token.start_ - begin_);
-    currentValue().setOffsetLimit(token.end_ - begin_);
-    }
-    break;
-  case tokenNaN:
-    {
-    Value v(std::numeric_limits<double>::quiet_NaN());
-    currentValue().swapPayload(v);
-    currentValue().setOffsetStart(token.start_ - begin_);
-    currentValue().setOffsetLimit(token.end_ - begin_);
-    }
-    break;
-  case tokenPosInf:
-    {
-    Value v(std::numeric_limits<double>::infinity());
-    currentValue().swapPayload(v);
-    currentValue().setOffsetStart(token.start_ - begin_);
-    currentValue().setOffsetLimit(token.end_ - begin_);
-    }
-    break;
-  case tokenNegInf:
-    {
-    Value v(-std::numeric_limits<double>::infinity());
-    currentValue().swapPayload(v);
-    currentValue().setOffsetStart(token.start_ - begin_);
-    currentValue().setOffsetLimit(token.end_ - begin_);
-    }
-    break;
-  case tokenArraySeparator:
-  case tokenObjectEnd:
-  case tokenArrayEnd:
-    if (features_.allowDroppedNullPlaceholders_) {
-      // "Un-read" the current token and mark the current value as a null
-      // token.
-      current_--;
-      Value v;
-      currentValue().swapPayload(v);
-      currentValue().setOffsetStart(current_ - begin_ - 1);
-      currentValue().setOffsetLimit(current_ - begin_);
-      break;
-    } // else, fall through ...
-  default:
-    currentValue().setOffsetStart(token.start_ - begin_);
-    currentValue().setOffsetLimit(token.end_ - begin_);
-    return addError("Syntax error: value, object or array expected.", token);
-  }
-
-  if (collectComments_) {
-    lastValueEnd_ = current_;
-    lastValue_ = &currentValue();
-  }
-
-  --stackDepth_;
-  return successful;
-}
-
-void OurReader::skipCommentTokens(Token& token) {
-  if (features_.allowComments_) {
-    do {
-      readToken(token);
-    } while (token.type_ == tokenComment);
-  } else {
-    readToken(token);
-  }
-}
-
-bool OurReader::readToken(Token& token) {
-  skipSpaces();
-  token.start_ = current_;
-  Char c = getNextChar();
-  bool ok = true;
-  switch (c) {
-  case '{':
-    token.type_ = tokenObjectBegin;
-    break;
-  case '}':
-    token.type_ = tokenObjectEnd;
-    break;
-  case '[':
-    token.type_ = tokenArrayBegin;
-    break;
-  case ']':
-    token.type_ = tokenArrayEnd;
-    break;
-  case '"':
-    token.type_ = tokenString;
-    ok = readString();
-    break;
-  case '\'':
-    if (features_.allowSingleQuotes_) {
-    token.type_ = tokenString;
-    ok = readStringSingleQuote();
-    break;
-    } // else continue
-  case '/':
-    token.type_ = tokenComment;
-    ok = readComment();
-    break;
-  case '0':
-  case '1':
-  case '2':
-  case '3':
-  case '4':
-  case '5':
-  case '6':
-  case '7':
-  case '8':
-  case '9':
-    token.type_ = tokenNumber;
-    readNumber(false);
-    break;
-  case '-':
-    if (readNumber(true)) {
-      token.type_ = tokenNumber;
-    } else {
-      token.type_ = tokenNegInf;
-      ok = features_.allowSpecialFloats_ && match("nfinity", 7);
-    }
-    break;
-  case 't':
-    token.type_ = tokenTrue;
-    ok = match("rue", 3);
-    break;
-  case 'f':
-    token.type_ = tokenFalse;
-    ok = match("alse", 4);
-    break;
-  case 'n':
-    token.type_ = tokenNull;
-    ok = match("ull", 3);
-    break;
-  case 'N':
-    if (features_.allowSpecialFloats_) {
-      token.type_ = tokenNaN;
-      ok = match("aN", 2);
-    } else {
-      ok = false;
-    }
-    break;
-  case 'I':
-    if (features_.allowSpecialFloats_) {
-      token.type_ = tokenPosInf;
-      ok = match("nfinity", 7);
-    } else {
-      ok = false;
-    }
-    break;
-  case ',':
-    token.type_ = tokenArraySeparator;
-    break;
-  case ':':
-    token.type_ = tokenMemberSeparator;
-    break;
-  case 0:
-    token.type_ = tokenEndOfStream;
-    break;
-  default:
-    ok = false;
-    break;
-  }
-  if (!ok)
-    token.type_ = tokenError;
-  token.end_ = current_;
-  return true;
-}
-
-void OurReader::skipSpaces() {
-  while (current_ != end_) {
-    Char c = *current_;
-    if (c == ' ' || c == '\t' || c == '\r' || c == '\n')
-      ++current_;
-    else
-      break;
-  }
-}
-
-bool OurReader::match(Location pattern, int patternLength) {
-  if (end_ - current_ < patternLength)
-    return false;
-  int index = patternLength;
-  while (index--)
-    if (current_[index] != pattern[index])
-      return false;
-  current_ += patternLength;
-  return true;
-}
-
-bool OurReader::readComment() {
-  Location commentBegin = current_ - 1;
-  Char c = getNextChar();
-  bool successful = false;
-  if (c == '*')
-    successful = readCStyleComment();
-  else if (c == '/')
-    successful = readCppStyleComment();
-  if (!successful)
-    return false;
-
-  if (collectComments_) {
-    CommentPlacement placement = commentBefore;
-    if (lastValueEnd_ && !containsNewLine(lastValueEnd_, commentBegin)) {
-      if (c != '*' || !containsNewLine(commentBegin, current_))
-        placement = commentAfterOnSameLine;
-    }
-
-    addComment(commentBegin, current_, placement);
-  }
-  return true;
-}
-
-void
-OurReader::addComment(Location begin, Location end, CommentPlacement placement) {
-  assert(collectComments_);
-  const std::string& normalized = normalizeEOL(begin, end);
-  if (placement == commentAfterOnSameLine) {
-    assert(lastValue_ != 0);
-    lastValue_->setComment(normalized, placement);
-  } else {
-    commentsBefore_ += normalized;
-  }
-}
-
-bool OurReader::readCStyleComment() {
-  while (current_ != end_) {
-    Char c = getNextChar();
-    if (c == '*' && *current_ == '/')
-      break;
-  }
-  return getNextChar() == '/';
-}
-
-bool OurReader::readCppStyleComment() {
-  while (current_ != end_) {
-    Char c = getNextChar();
-    if (c == '\n')
-      break;
-    if (c == '\r') {
-      // Consume DOS EOL. It will be normalized in addComment.
-      if (current_ != end_ && *current_ == '\n')
-        getNextChar();
-      // Break on Moc OS 9 EOL.
-      break;
-    }
-  }
-  return true;
-}
-
-bool OurReader::readNumber(bool checkInf) {
-  const char *p = current_;
-  if (checkInf && p != end_ && *p == 'I') {
-    current_ = ++p;
-    return false;
-  }
-  char c = '0'; // stopgap for already consumed character
-  // integral part
-  while (c >= '0' && c <= '9')
-    c = (current_ = p) < end_ ? *p++ : 0;
-  // fractional part
-  if (c == '.') {
-    c = (current_ = p) < end_ ? *p++ : 0;
-    while (c >= '0' && c <= '9')
-      c = (current_ = p) < end_ ? *p++ : 0;
-  }
-  // exponential part
-  if (c == 'e' || c == 'E') {
-    c = (current_ = p) < end_ ? *p++ : 0;
-    if (c == '+' || c == '-')
-      c = (current_ = p) < end_ ? *p++ : 0;
-    while (c >= '0' && c <= '9')
-      c = (current_ = p) < end_ ? *p++ : 0;
-  }
-  return true;
-}
-bool OurReader::readString() {
-  Char c = 0;
-  while (current_ != end_) {
-    c = getNextChar();
-    if (c == '\\')
-      getNextChar();
-    else if (c == '"')
-      break;
-  }
-  return c == '"';
-}
-
-
-bool OurReader::readStringSingleQuote() {
-  Char c = 0;
-  while (current_ != end_) {
-    c = getNextChar();
-    if (c == '\\')
-      getNextChar();
-    else if (c == '\'')
-      break;
-  }
-  return c == '\'';
-}
-
-bool OurReader::readObject(Token& tokenStart) {
-  Token tokenName;
-  std::string name;
-  Value init(objectValue);
-  currentValue().swapPayload(init);
-  currentValue().setOffsetStart(tokenStart.start_ - begin_);
-  while (readToken(tokenName)) {
-    bool initialTokenOk = true;
-    while (tokenName.type_ == tokenComment && initialTokenOk)
-      initialTokenOk = readToken(tokenName);
-    if (!initialTokenOk)
-      break;
-    if (tokenName.type_ == tokenObjectEnd && name.empty()) // empty object
-      return true;
-    name = "";
-    if (tokenName.type_ == tokenString) {
-      if (!decodeString(tokenName, name))
-        return recoverFromError(tokenObjectEnd);
-    } else if (tokenName.type_ == tokenNumber && features_.allowNumericKeys_) {
-      Value numberName;
-      if (!decodeNumber(tokenName, numberName))
-        return recoverFromError(tokenObjectEnd);
-      name = numberName.asString();
-    } else {
-      break;
-    }
-
-    Token colon;
-    if (!readToken(colon) || colon.type_ != tokenMemberSeparator) {
-      return addErrorAndRecover(
-          "Missing ':' after object member name", colon, tokenObjectEnd);
-    }
-    if (name.length() >= (1U<<30)) throwRuntimeError("keylength >= 2^30");
-    if (features_.rejectDupKeys_ && currentValue().isMember(name)) {
-      std::string msg = "Duplicate key: '" + name + "'";
-      return addErrorAndRecover(
-          msg, tokenName, tokenObjectEnd);
-    }
-    Value& value = currentValue()[name];
-    nodes_.push(&value);
-    bool ok = readValue();
-    nodes_.pop();
-    if (!ok) // error already set
-      return recoverFromError(tokenObjectEnd);
-
-    Token comma;
-    if (!readToken(comma) ||
-        (comma.type_ != tokenObjectEnd && comma.type_ != tokenArraySeparator &&
-         comma.type_ != tokenComment)) {
-      return addErrorAndRecover(
-          "Missing ',' or '}' in object declaration", comma, tokenObjectEnd);
-    }
-    bool finalizeTokenOk = true;
-    while (comma.type_ == tokenComment && finalizeTokenOk)
-      finalizeTokenOk = readToken(comma);
-    if (comma.type_ == tokenObjectEnd)
-      return true;
-  }
-  return addErrorAndRecover(
-      "Missing '}' or object member name", tokenName, tokenObjectEnd);
-}
-
-bool OurReader::readArray(Token& tokenStart) {
-  Value init(arrayValue);
-  currentValue().swapPayload(init);
-  currentValue().setOffsetStart(tokenStart.start_ - begin_);
-  skipSpaces();
-  if (*current_ == ']') // empty array
-  {
-    Token endArray;
-    readToken(endArray);
-    return true;
-  }
-  int index = 0;
-  for (;;) {
-    Value& value = currentValue()[index++];
-    nodes_.push(&value);
-    bool ok = readValue();
-    nodes_.pop();
-    if (!ok) // error already set
-      return recoverFromError(tokenArrayEnd);
-
-    Token token;
-    // Accept Comment after last item in the array.
-    ok = readToken(token);
-    while (token.type_ == tokenComment && ok) {
-      ok = readToken(token);
-    }
-    bool badTokenType =
-        (token.type_ != tokenArraySeparator && token.type_ != tokenArrayEnd);
-    if (!ok || badTokenType) {
-      return addErrorAndRecover(
-          "Missing ',' or ']' in array declaration", token, tokenArrayEnd);
-    }
-    if (token.type_ == tokenArrayEnd)
-      break;
-  }
-  return true;
-}
-
-bool OurReader::decodeNumber(Token& token) {
-  Value decoded;
-  if (!decodeNumber(token, decoded))
-    return false;
-  currentValue().swapPayload(decoded);
-  currentValue().setOffsetStart(token.start_ - begin_);
-  currentValue().setOffsetLimit(token.end_ - begin_);
-  return true;
-}
-
-bool OurReader::decodeNumber(Token& token, Value& decoded) {
-  // Attempts to parse the number as an integer. If the number is
-  // larger than the maximum supported value of an integer then
-  // we decode the number as a double.
-  Location current = token.start_;
-  bool isNegative = *current == '-';
-  if (isNegative)
-    ++current;
-  // TODO: Help the compiler do the div and mod at compile time or get rid of them.
-  Value::LargestUInt maxIntegerValue =
-      isNegative ? Value::LargestUInt(-Value::minLargestInt)
-                 : Value::maxLargestUInt;
-  Value::LargestUInt threshold = maxIntegerValue / 10;
-  Value::LargestUInt value = 0;
-  while (current < token.end_) {
-    Char c = *current++;
-    if (c < '0' || c > '9')
-      return decodeDouble(token, decoded);
-    Value::UInt digit(c - '0');
-    if (value >= threshold) {
-      // We've hit or exceeded the max value divided by 10 (rounded down). If
-      // a) we've only just touched the limit, b) this is the last digit, and
-      // c) it's small enough to fit in that rounding delta, we're okay.
-      // Otherwise treat this number as a double to avoid overflow.
-      if (value > threshold || current != token.end_ ||
-          digit > maxIntegerValue % 10) {
-        return decodeDouble(token, decoded);
-      }
-    }
-    value = value * 10 + digit;
-  }
-  if (isNegative)
-    decoded = -Value::LargestInt(value);
-  else if (value <= Value::LargestUInt(Value::maxInt))
-    decoded = Value::LargestInt(value);
-  else
-    decoded = value;
-  return true;
-}
-
-bool OurReader::decodeDouble(Token& token) {
-  Value decoded;
-  if (!decodeDouble(token, decoded))
-    return false;
-  currentValue().swapPayload(decoded);
-  currentValue().setOffsetStart(token.start_ - begin_);
-  currentValue().setOffsetLimit(token.end_ - begin_);
-  return true;
-}
-
-bool OurReader::decodeDouble(Token& token, Value& decoded) {
-  double value = 0;
-  const int bufferSize = 32;
-  int count;
-  int length = int(token.end_ - token.start_);
-
-  // Sanity check to avoid buffer overflow exploits.
-  if (length < 0) {
-    return addError("Unable to parse token length", token);
-  }
-
-  // Avoid using a string constant for the format control string given to
-  // sscanf, as this can cause hard to debug crashes on OS X. See here for more
-  // info:
-  //
-  //     http://developer.apple.com/library/mac/#DOCUMENTATION/DeveloperTools/gcc-4.0.1/gcc/Incompatibilities.html
-  char format[] = "%lf";
-
-  if (length <= bufferSize) {
-    Char buffer[bufferSize + 1];
-    memcpy(buffer, token.start_, length);
-    buffer[length] = 0;
-    count = sscanf(buffer, format, &value);
-  } else {
-    std::string buffer(token.start_, token.end_);
-    count = sscanf(buffer.c_str(), format, &value);
-  }
-
-  if (count != 1)
-    return addError("'" + std::string(token.start_, token.end_) +
-                        "' is not a number.",
-                    token);
-  decoded = value;
-  return true;
-}
-
-bool OurReader::decodeString(Token& token) {
-  std::string decoded_string;
-  if (!decodeString(token, decoded_string))
-    return false;
-  Value decoded(decoded_string);
-  currentValue().swapPayload(decoded);
-  currentValue().setOffsetStart(token.start_ - begin_);
-  currentValue().setOffsetLimit(token.end_ - begin_);
-  return true;
-}
-
-bool OurReader::decodeString(Token& token, std::string& decoded) {
-  decoded.reserve(token.end_ - token.start_ - 2);
-  Location current = token.start_ + 1; // skip '"'
-  Location end = token.end_ - 1;       // do not include '"'
-  while (current != end) {
-    Char c = *current++;
-    if (c == '"')
-      break;
-    else if (c == '\\') {
-      if (current == end)
-        return addError("Empty escape sequence in string", token, current);
-      Char escape = *current++;
-      switch (escape) {
-      case '"':
-        decoded += '"';
-        break;
-      case '/':
-        decoded += '/';
-        break;
-      case '\\':
-        decoded += '\\';
-        break;
-      case 'b':
-        decoded += '\b';
-        break;
-      case 'f':
-        decoded += '\f';
-        break;
-      case 'n':
-        decoded += '\n';
-        break;
-      case 'r':
-        decoded += '\r';
-        break;
-      case 't':
-        decoded += '\t';
-        break;
-      case 'u': {
-        unsigned int unicode;
-        if (!decodeUnicodeCodePoint(token, current, end, unicode))
-          return false;
-        decoded += codePointToUTF8(unicode);
-      } break;
-      default:
-        return addError("Bad escape sequence in string", token, current);
-      }
-    } else {
-      decoded += c;
-    }
-  }
-  return true;
-}
-
-bool OurReader::decodeUnicodeCodePoint(Token& token,
-                                    Location& current,
-                                    Location end,
-                                    unsigned int& unicode) {
-
-  if (!decodeUnicodeEscapeSequence(token, current, end, unicode))
-    return false;
-  if (unicode >= 0xD800 && unicode <= 0xDBFF) {
-    // surrogate pairs
-    if (end - current < 6)
-      return addError(
-          "additional six characters expected to parse unicode surrogate pair.",
-          token,
-          current);
-    unsigned int surrogatePair;
-    if (*(current++) == '\\' && *(current++) == 'u') {
-      if (decodeUnicodeEscapeSequence(token, current, end, surrogatePair)) {
-        unicode = 0x10000 + ((unicode & 0x3FF) << 10) + (surrogatePair & 0x3FF);
-      } else
-        return false;
-    } else
-      return addError("expecting another \\u token to begin the second half of "
-                      "a unicode surrogate pair",
-                      token,
-                      current);
-  }
-  return true;
-}
-
-bool OurReader::decodeUnicodeEscapeSequence(Token& token,
-                                         Location& current,
-                                         Location end,
-                                         unsigned int& unicode) {
-  if (end - current < 4)
-    return addError(
-        "Bad unicode escape sequence in string: four digits expected.",
-        token,
-        current);
-  unicode = 0;
-  for (int index = 0; index < 4; ++index) {
-    Char c = *current++;
-    unicode *= 16;
-    if (c >= '0' && c <= '9')
-      unicode += c - '0';
-    else if (c >= 'a' && c <= 'f')
-      unicode += c - 'a' + 10;
-    else if (c >= 'A' && c <= 'F')
-      unicode += c - 'A' + 10;
-    else
-      return addError(
-          "Bad unicode escape sequence in string: hexadecimal digit expected.",
-          token,
-          current);
-  }
-  return true;
-}
-
-bool
-OurReader::addError(const std::string& message, Token& token, Location extra) {
-  ErrorInfo info;
-  info.token_ = token;
-  info.message_ = message;
-  info.extra_ = extra;
-  errors_.push_back(info);
-  return false;
-}
-
-bool OurReader::recoverFromError(TokenType skipUntilToken) {
-  int errorCount = int(errors_.size());
-  Token skip;
-  for (;;) {
-    if (!readToken(skip))
-      errors_.resize(errorCount); // discard errors caused by recovery
-    if (skip.type_ == skipUntilToken || skip.type_ == tokenEndOfStream)
-      break;
-  }
-  errors_.resize(errorCount);
-  return false;
-}
-
-bool OurReader::addErrorAndRecover(const std::string& message,
-                                Token& token,
-                                TokenType skipUntilToken) {
-  addError(message, token);
-  return recoverFromError(skipUntilToken);
-}
-
-Value& OurReader::currentValue() { return *(nodes_.top()); }
-
-OurReader::Char OurReader::getNextChar() {
-  if (current_ == end_)
-    return 0;
-  return *current_++;
-}
-
-void OurReader::getLocationLineAndColumn(Location location,
-                                      int& line,
-                                      int& column) const {
-  Location current = begin_;
-  Location lastLineStart = current;
-  line = 0;
-  while (current < location && current != end_) {
-    Char c = *current++;
-    if (c == '\r') {
-      if (*current == '\n')
-        ++current;
-      lastLineStart = current;
-      ++line;
-    } else if (c == '\n') {
-      lastLineStart = current;
-      ++line;
-    }
-  }
-  // column & line start at 1
-  column = int(location - lastLineStart) + 1;
-  ++line;
-}
-
-std::string OurReader::getLocationLineAndColumn(Location location) const {
-  int line, column;
-  getLocationLineAndColumn(location, line, column);
-  char buffer[18 + 16 + 16 + 1];
-  snprintf(buffer, sizeof(buffer), "Line %d, Column %d", line, column);
-  return buffer;
-}
-
-std::string OurReader::getFormattedErrorMessages() const {
-  std::string formattedMessage;
-  for (Errors::const_iterator itError = errors_.begin();
-       itError != errors_.end();
-       ++itError) {
-    const ErrorInfo& error = *itError;
-    formattedMessage +=
-        "* " + getLocationLineAndColumn(error.token_.start_) + "\n";
-    formattedMessage += "  " + error.message_ + "\n";
-    if (error.extra_)
-      formattedMessage +=
-          "See " + getLocationLineAndColumn(error.extra_) + " for detail.\n";
-  }
-  return formattedMessage;
-}
-
-std::vector<OurReader::StructuredError> OurReader::getStructuredErrors() const {
-  std::vector<OurReader::StructuredError> allErrors;
-  for (Errors::const_iterator itError = errors_.begin();
-       itError != errors_.end();
-       ++itError) {
-    const ErrorInfo& error = *itError;
-    OurReader::StructuredError structured;
-    structured.offset_start = error.token_.start_ - begin_;
-    structured.offset_limit = error.token_.end_ - begin_;
-    structured.message = error.message_;
-    allErrors.push_back(structured);
-  }
-  return allErrors;
-}
-
-bool OurReader::pushError(const Value& value, const std::string& message) {
-  size_t length = end_ - begin_;
-  if(value.getOffsetStart() > length
-    || value.getOffsetLimit() > length)
-    return false;
-  Token token;
-  token.type_ = tokenError;
-  token.start_ = begin_ + value.getOffsetStart();
-  token.end_ = end_ + value.getOffsetLimit();
-  ErrorInfo info;
-  info.token_ = token;
-  info.message_ = message;
-  info.extra_ = 0;
-  errors_.push_back(info);
-  return true;
-}
-
-bool OurReader::pushError(const Value& value, const std::string& message, const Value& extra) {
-  size_t length = end_ - begin_;
-  if(value.getOffsetStart() > length
-    || value.getOffsetLimit() > length
-    || extra.getOffsetLimit() > length)
-    return false;
-  Token token;
-  token.type_ = tokenError;
-  token.start_ = begin_ + value.getOffsetStart();
-  token.end_ = begin_ + value.getOffsetLimit();
-  ErrorInfo info;
-  info.token_ = token;
-  info.message_ = message;
-  info.extra_ = begin_ + extra.getOffsetStart();
-  errors_.push_back(info);
-  return true;
-}
-
-bool OurReader::good() const {
-  return !errors_.size();
-}
-
-
-class OurCharReader : public CharReader {
-  bool const collectComments_;
-  OurReader reader_;
-public:
-  OurCharReader(
-    bool collectComments,
-    OurFeatures const& features)
-  : collectComments_(collectComments)
-  , reader_(features)
-  {}
-  bool parse(
-      char const* beginDoc, char const* endDoc,
-      Value* root, std::string* errs) override {
-    bool ok = reader_.parse(beginDoc, endDoc, *root, collectComments_);
-    if (errs) {
-      *errs = reader_.getFormattedErrorMessages();
-    }
-    return ok;
-  }
-};
-
-CharReaderBuilder::CharReaderBuilder()
-{
-  setDefaults(&settings_);
-}
-CharReaderBuilder::~CharReaderBuilder()
-{}
-CharReader* CharReaderBuilder::newCharReader() const
-{
-  bool collectComments = settings_["collectComments"].asBool();
-  OurFeatures features = OurFeatures::all();
-  features.allowComments_ = settings_["allowComments"].asBool();
-  features.strictRoot_ = settings_["strictRoot"].asBool();
-  features.allowDroppedNullPlaceholders_ = settings_["allowDroppedNullPlaceholders"].asBool();
-  features.allowNumericKeys_ = settings_["allowNumericKeys"].asBool();
-  features.allowSingleQuotes_ = settings_["allowSingleQuotes"].asBool();
-  features.stackLimit_ = settings_["stackLimit"].asInt();
-  features.failIfExtra_ = settings_["failIfExtra"].asBool();
-  features.rejectDupKeys_ = settings_["rejectDupKeys"].asBool();
-  features.allowSpecialFloats_ = settings_["allowSpecialFloats"].asBool();
-  return new OurCharReader(collectComments, features);
-}
-static void getValidReaderKeys(std::set<std::string>* valid_keys)
-{
-  valid_keys->clear();
-  valid_keys->insert("collectComments");
-  valid_keys->insert("allowComments");
-  valid_keys->insert("strictRoot");
-  valid_keys->insert("allowDroppedNullPlaceholders");
-  valid_keys->insert("allowNumericKeys");
-  valid_keys->insert("allowSingleQuotes");
-  valid_keys->insert("stackLimit");
-  valid_keys->insert("failIfExtra");
-  valid_keys->insert("rejectDupKeys");
-  valid_keys->insert("allowSpecialFloats");
-}
-bool CharReaderBuilder::validate(Json::Value* invalid) const
-{
-  Json::Value my_invalid;
-  if (!invalid) invalid = &my_invalid;  // so we do not need to test for NULL
-  Json::Value& inv = *invalid;
-  std::set<std::string> valid_keys;
-  getValidReaderKeys(&valid_keys);
-  Value::Members keys = settings_.getMemberNames();
-  size_t n = keys.size();
-  for (size_t i = 0; i < n; ++i) {
-    std::string const& key = keys[i];
-    if (valid_keys.find(key) == valid_keys.end()) {
-      inv[key] = settings_[key];
-    }
-  }
-  return 0u == inv.size();
-}
-Value& CharReaderBuilder::operator[](std::string key)
-{
-  return settings_[key];
-}
-// static
-void CharReaderBuilder::strictMode(Json::Value* settings)
-{
-//! [CharReaderBuilderStrictMode]
-  (*settings)["allowComments"] = false;
-  (*settings)["strictRoot"] = true;
-  (*settings)["allowDroppedNullPlaceholders"] = false;
-  (*settings)["allowNumericKeys"] = false;
-  (*settings)["allowSingleQuotes"] = false;
-  (*settings)["stackLimit"] = 1000;
-  (*settings)["failIfExtra"] = true;
-  (*settings)["rejectDupKeys"] = true;
-  (*settings)["allowSpecialFloats"] = false;
-//! [CharReaderBuilderStrictMode]
-}
-// static
-void CharReaderBuilder::setDefaults(Json::Value* settings)
-{
-//! [CharReaderBuilderDefaults]
-  (*settings)["collectComments"] = true;
-  (*settings)["allowComments"] = true;
-  (*settings)["strictRoot"] = false;
-  (*settings)["allowDroppedNullPlaceholders"] = false;
-  (*settings)["allowNumericKeys"] = false;
-  (*settings)["allowSingleQuotes"] = false;
-  (*settings)["stackLimit"] = 1000;
-  (*settings)["failIfExtra"] = false;
-  (*settings)["rejectDupKeys"] = false;
-  (*settings)["allowSpecialFloats"] = false;
-//! [CharReaderBuilderDefaults]
-}
-
-//////////////////////////////////
-// global functions
-
-bool parseFromStream(
-    CharReader::Factory const& fact, std::istream& sin,
-    Value* root, std::string* errs)
-{
-  std::ostringstream ssin;
-  ssin << sin.rdbuf();
-  std::string doc = ssin.str();
-  char const* begin = doc.data();
-  char const* end = begin + doc.size();
-  // Note that we do not actually need a null-terminator.
-  CharReaderPtr const reader(fact.newCharReader());
-  return reader->parse(begin, end, root, errs);
-}
-
-std::istream& operator>>(std::istream& sin, Value& root) {
-  CharReaderBuilder b;
-  std::string errs;
-  bool ok = parseFromStream(b, sin, &root, &errs);
-  if (!ok) {
-    fprintf(stderr,
-            "Error from reader: %s",
-            errs.c_str());
-
-    throwRuntimeError(errs);
-  }
-  return sin;
-}
-
-} // namespace Json
-
-// //////////////////////////////////////////////////////////////////////
-// End of content of file: src/lib_json/json_reader.cpp
-// //////////////////////////////////////////////////////////////////////
-
-
-
-
-
-
-// //////////////////////////////////////////////////////////////////////
-// Beginning of content of file: src/lib_json/json_valueiterator.inl
-// //////////////////////////////////////////////////////////////////////
-
-// Copyright 2007-2010 Baptiste Lepilleur
-// Distributed under MIT license, or public domain if desired and
-// recognized in your jurisdiction.
-// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
-
-// included by json_value.cpp
-
-namespace Json {
-
-// //////////////////////////////////////////////////////////////////
-// //////////////////////////////////////////////////////////////////
-// //////////////////////////////////////////////////////////////////
-// class ValueIteratorBase
-// //////////////////////////////////////////////////////////////////
-// //////////////////////////////////////////////////////////////////
-// //////////////////////////////////////////////////////////////////
-
-ValueIteratorBase::ValueIteratorBase()
-    : current_(), isNull_(true) {
-}
-
-ValueIteratorBase::ValueIteratorBase(
-    const Value::ObjectValues::iterator& current)
-    : current_(current), isNull_(false) {}
-
-Value& ValueIteratorBase::deref() const {
-  return current_->second;
-}
-
-void ValueIteratorBase::increment() {
-  ++current_;
-}
-
-void ValueIteratorBase::decrement() {
-  --current_;
-}
-
-ValueIteratorBase::difference_type
-ValueIteratorBase::computeDistance(const SelfType& other) const {
-#ifdef JSON_USE_CPPTL_SMALLMAP
-  return other.current_ - current_;
-#else
-  // Iterator for null value are initialized using the default
-  // constructor, which initialize current_ to the default
-  // std::map::iterator. As begin() and end() are two instance
-  // of the default std::map::iterator, they can not be compared.
-  // To allow this, we handle this comparison specifically.
-  if (isNull_ && other.isNull_) {
-    return 0;
-  }
-
-  // Usage of std::distance is not portable (does not compile with Sun Studio 12
-  // RogueWave STL,
-  // which is the one used by default).
-  // Using a portable hand-made version for non random iterator instead:
-  //   return difference_type( std::distance( current_, other.current_ ) );
-  difference_type myDistance = 0;
-  for (Value::ObjectValues::iterator it = current_; it != other.current_;
-       ++it) {
-    ++myDistance;
-  }
-  return myDistance;
-#endif
-}
-
-bool ValueIteratorBase::isEqual(const SelfType& other) const {
-  if (isNull_) {
-    return other.isNull_;
-  }
-  return current_ == other.current_;
-}
-
-void ValueIteratorBase::copy(const SelfType& other) {
-  current_ = other.current_;
-  isNull_ = other.isNull_;
-}
-
-Value ValueIteratorBase::key() const {
-  const Value::CZString czstring = (*current_).first;
-  if (czstring.data()) {
-    if (czstring.isStaticString())
-      return Value(StaticString(czstring.data()));
-    return Value(czstring.data(), czstring.data() + czstring.length());
-  }
-  return Value(czstring.index());
-}
-
-UInt ValueIteratorBase::index() const {
-  const Value::CZString czstring = (*current_).first;
-  if (!czstring.data())
-    return czstring.index();
-  return Value::UInt(-1);
-}
-
-std::string ValueIteratorBase::name() const {
-  char const* keey;
-  char const* end;
-  keey = memberName(&end);
-  if (!keey) return std::string();
-  return std::string(keey, end);
-}
-
-char const* ValueIteratorBase::memberName() const {
-  const char* cname = (*current_).first.data();
-  return cname ? cname : "";
-}
-
-char const* ValueIteratorBase::memberName(char const** end) const {
-  const char* cname = (*current_).first.data();
-  if (!cname) {
-    *end = NULL;
-    return NULL;
-  }
-  *end = cname + (*current_).first.length();
-  return cname;
-}
-
-// //////////////////////////////////////////////////////////////////
-// //////////////////////////////////////////////////////////////////
-// //////////////////////////////////////////////////////////////////
-// class ValueConstIterator
-// //////////////////////////////////////////////////////////////////
-// //////////////////////////////////////////////////////////////////
-// //////////////////////////////////////////////////////////////////
-
-ValueConstIterator::ValueConstIterator() {}
-
-ValueConstIterator::ValueConstIterator(
-    const Value::ObjectValues::iterator& current)
-    : ValueIteratorBase(current) {}
-
-ValueConstIterator::ValueConstIterator(ValueIterator const& other)
-    : ValueIteratorBase(other) {}
-
-ValueConstIterator& ValueConstIterator::
-operator=(const ValueIteratorBase& other) {
-  copy(other);
-  return *this;
-}
-
-// //////////////////////////////////////////////////////////////////
-// //////////////////////////////////////////////////////////////////
-// //////////////////////////////////////////////////////////////////
-// class ValueIterator
-// //////////////////////////////////////////////////////////////////
-// //////////////////////////////////////////////////////////////////
-// //////////////////////////////////////////////////////////////////
-
-ValueIterator::ValueIterator() {}
-
-ValueIterator::ValueIterator(const Value::ObjectValues::iterator& current)
-    : ValueIteratorBase(current) {}
-
-ValueIterator::ValueIterator(const ValueConstIterator& other)
-    : ValueIteratorBase(other) {
-  throwRuntimeError("ConstIterator to Iterator should never be allowed.");
-}
-
-ValueIterator::ValueIterator(const ValueIterator& other)
-    : ValueIteratorBase(other) {}
-
-ValueIterator& ValueIterator::operator=(const SelfType& other) {
-  copy(other);
-  return *this;
-}
-
-} // namespace Json
-
-// //////////////////////////////////////////////////////////////////////
-// End of content of file: src/lib_json/json_valueiterator.inl
-// //////////////////////////////////////////////////////////////////////
-
-
-
-
-
-
-// //////////////////////////////////////////////////////////////////////
-// Beginning of content of file: src/lib_json/json_value.cpp
-// //////////////////////////////////////////////////////////////////////
-
-// Copyright 2011 Baptiste Lepilleur
-// Distributed under MIT license, or public domain if desired and
-// recognized in your jurisdiction.
-// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
-
-#if !defined(JSON_IS_AMALGAMATION)
-#include <json/assertions.h>
-#include <json/value.h>
-#include <json/writer.h>
-#endif // if !defined(JSON_IS_AMALGAMATION)
-#include <math.h>
-#include <sstream>
-#include <utility>
-#include <cstring>
-#include <cassert>
-#ifdef JSON_USE_CPPTL
-#include <cpptl/conststring.h>
-#endif
-#include <cstddef> // size_t
-#include <algorithm> // min()
-
-#define JSON_ASSERT_UNREACHABLE assert(false)
-
-namespace Json {
-
-// This is a walkaround to avoid the static initialization of Value::null.
-// kNull must be word-aligned to avoid crashing on ARM.  We use an alignment of
-// 8 (instead of 4) as a bit of future-proofing.
-#if defined(__ARMEL__)
-#define ALIGNAS(byte_alignment) __attribute__((aligned(byte_alignment)))
-#else
-#define ALIGNAS(byte_alignment)
-#endif
-static const unsigned char ALIGNAS(8) kNull[sizeof(Value)] = { 0 };
-const unsigned char& kNullRef = kNull[0];
-const Value& Value::null = reinterpret_cast<const Value&>(kNullRef);
-const Value& Value::nullRef = null;
-
-const Int Value::minInt = Int(~(UInt(-1) / 2));
-const Int Value::maxInt = Int(UInt(-1) / 2);
-const UInt Value::maxUInt = UInt(-1);
-#if defined(JSON_HAS_INT64)
-const Int64 Value::minInt64 = Int64(~(UInt64(-1) / 2));
-const Int64 Value::maxInt64 = Int64(UInt64(-1) / 2);
-const UInt64 Value::maxUInt64 = UInt64(-1);
-// The constant is hard-coded because some compiler have trouble
-// converting Value::maxUInt64 to a double correctly (AIX/xlC).
-// Assumes that UInt64 is a 64 bits integer.
-static const double maxUInt64AsDouble = 18446744073709551615.0;
-#endif // defined(JSON_HAS_INT64)
-const LargestInt Value::minLargestInt = LargestInt(~(LargestUInt(-1) / 2));
-const LargestInt Value::maxLargestInt = LargestInt(LargestUInt(-1) / 2);
-const LargestUInt Value::maxLargestUInt = LargestUInt(-1);
-
-#if !defined(JSON_USE_INT64_DOUBLE_CONVERSION)
-template <typename T, typename U>
-static inline bool InRange(double d, T min, U max) {
-  return d >= min && d <= max;
-}
-#else  // if !defined(JSON_USE_INT64_DOUBLE_CONVERSION)
-static inline double integerToDouble(Json::UInt64 value) {
-  return static_cast<double>(Int64(value / 2)) * 2.0 + Int64(value & 1);
-}
-
-template <typename T> static inline double integerToDouble(T value) {
-  return static_cast<double>(value);
-}
-
-template <typename T, typename U>
-static inline bool InRange(double d, T min, U max) {
-  return d >= integerToDouble(min) && d <= integerToDouble(max);
-}
-#endif // if !defined(JSON_USE_INT64_DOUBLE_CONVERSION)
-
-/** Duplicates the specified string value.
- * @param value Pointer to the string to duplicate. Must be zero-terminated if
- *              length is "unknown".
- * @param length Length of the value. if equals to unknown, then it will be
- *               computed using strlen(value).
- * @return Pointer on the duplicate instance of string.
- */
-static inline char* duplicateStringValue(const char* value,
-                                         size_t length) {
-  // Avoid an integer overflow in the call to malloc below by limiting length
-  // to a sane value.
-  if (length >= (size_t)Value::maxInt)
-    length = Value::maxInt - 1;
-
-  char* newString = static_cast<char*>(malloc(length + 1));
-  if (newString == NULL) {
-    throwRuntimeError(
-        "in Json::Value::duplicateStringValue(): "
-        "Failed to allocate string value buffer");
-  }
-  memcpy(newString, value, length);
-  newString[length] = 0;
-  return newString;
-}
-
-/* Record the length as a prefix.
- */
-static inline char* duplicateAndPrefixStringValue(
-    const char* value,
-    unsigned int length)
-{
-  // Avoid an integer overflow in the call to malloc below by limiting length
-  // to a sane value.
-  JSON_ASSERT_MESSAGE(length <= (unsigned)Value::maxInt - sizeof(unsigned) - 1U,
-                      "in Json::Value::duplicateAndPrefixStringValue(): "
-                      "length too big for prefixing");
-  unsigned actualLength = length + static_cast<unsigned>(sizeof(unsigned)) + 1U;
-  char* newString = static_cast<char*>(malloc(actualLength));
-  if (newString == 0) {
-    throwRuntimeError(
-        "in Json::Value::duplicateAndPrefixStringValue(): "
-        "Failed to allocate string value buffer");
-  }
-  *reinterpret_cast<unsigned*>(newString) = length;
-  memcpy(newString + sizeof(unsigned), value, length);
-  newString[actualLength - 1U] = 0; // to avoid buffer over-run accidents by users later
-  return newString;
-}
-inline static void decodePrefixedString(
-    bool isPrefixed, char const* prefixed,
-    unsigned* length, char const** value)
-{
-  if (!isPrefixed) {
-    *length = static_cast<unsigned>(strlen(prefixed));
-    *value = prefixed;
-  } else {
-    *length = *reinterpret_cast<unsigned const*>(prefixed);
-    *value = prefixed + sizeof(unsigned);
-  }
-}
-/** Free the string duplicated by duplicateStringValue()/duplicateAndPrefixStringValue().
- */
-static inline void releaseStringValue(char* value) { free(value); }
-
-} // namespace Json
-
-// //////////////////////////////////////////////////////////////////
-// //////////////////////////////////////////////////////////////////
-// //////////////////////////////////////////////////////////////////
-// ValueInternals...
-// //////////////////////////////////////////////////////////////////
-// //////////////////////////////////////////////////////////////////
-// //////////////////////////////////////////////////////////////////
-#if !defined(JSON_IS_AMALGAMATION)
-
-#include "json_valueiterator.inl"
-#endif // if !defined(JSON_IS_AMALGAMATION)
-
-namespace Json {
-
-Exception::Exception(std::string const& msg)
-  : msg_(msg)
-{}
-Exception::~Exception() throw()
-{}
-char const* Exception::what() const throw()
-{
-  return msg_.c_str();
-}
-RuntimeError::RuntimeError(std::string const& msg)
-  : Exception(msg)
-{}
-LogicError::LogicError(std::string const& msg)
-  : Exception(msg)
-{}
-void throwRuntimeError(std::string const& msg)
-{
-  throw RuntimeError(msg);
-}
-void throwLogicError(std::string const& msg)
-{
-  throw LogicError(msg);
-}
-
-// //////////////////////////////////////////////////////////////////
-// //////////////////////////////////////////////////////////////////
-// //////////////////////////////////////////////////////////////////
-// class Value::CommentInfo
-// //////////////////////////////////////////////////////////////////
-// //////////////////////////////////////////////////////////////////
-// //////////////////////////////////////////////////////////////////
-
-Value::CommentInfo::CommentInfo() : comment_(0) {}
-
-Value::CommentInfo::~CommentInfo() {
-  if (comment_)
-    releaseStringValue(comment_);
-}
-
-void Value::CommentInfo::setComment(const char* text, size_t len) {
-  if (comment_) {
-    releaseStringValue(comment_);
-    comment_ = 0;
-  }
-  JSON_ASSERT(text != 0);
-  JSON_ASSERT_MESSAGE(
-      text[0] == '\0' || text[0] == '/',
-      "in Json::Value::setComment(): Comments must start with /");
-  // It seems that /**/ style comments are acceptable as well.
-  comment_ = duplicateStringValue(text, len);
-}
-
-// //////////////////////////////////////////////////////////////////
-// //////////////////////////////////////////////////////////////////
-// //////////////////////////////////////////////////////////////////
-// class Value::CZString
-// //////////////////////////////////////////////////////////////////
-// //////////////////////////////////////////////////////////////////
-// //////////////////////////////////////////////////////////////////
-
-// Notes: policy_ indicates if the string was allocated when
-// a string is stored.
-
-Value::CZString::CZString(ArrayIndex aindex) : cstr_(0), index_(aindex) {}
-
-Value::CZString::CZString(char const* str, unsigned ulength, DuplicationPolicy allocate)
-    : cstr_(str) {
-  // allocate != duplicate
-  storage_.policy_ = allocate & 0x3;
-  storage_.length_ = ulength & 0x3FFFFFFF;
-}
-
-Value::CZString::CZString(const CZString& other)
-    : cstr_(other.storage_.policy_ != noDuplication && other.cstr_ != 0
-                ? duplicateStringValue(other.cstr_, other.storage_.length_)
-                : other.cstr_) {
-  storage_.policy_ = (other.cstr_
-                 ? (static_cast<DuplicationPolicy>(other.storage_.policy_) == noDuplication
-                     ? noDuplication : duplicate)
-                 : static_cast<DuplicationPolicy>(other.storage_.policy_));
-  storage_.length_ = other.storage_.length_;
-}
-
-#if JSON_HAS_RVALUE_REFERENCES
-Value::CZString::CZString(CZString&& other)
-  : cstr_(other.cstr_), index_(other.index_) {
-  other.cstr_ = nullptr;
-}
-#endif
-
-Value::CZString::~CZString() {
-  if (cstr_ && storage_.policy_ == duplicate)
-    releaseStringValue(const_cast<char*>(cstr_));
-}
-
-void Value::CZString::swap(CZString& other) {
-  std::swap(cstr_, other.cstr_);
-  std::swap(index_, other.index_);
-}
-
-Value::CZString& Value::CZString::operator=(CZString other) {
-  swap(other);
-  return *this;
-}
-
-bool Value::CZString::operator<(const CZString& other) const {
-  if (!cstr_) return index_ < other.index_;
-  //return strcmp(cstr_, other.cstr_) < 0;
-  // Assume both are strings.
-  unsigned this_len = this->storage_.length_;
-  unsigned other_len = other.storage_.length_;
-  unsigned min_len = std::min(this_len, other_len);
-  int comp = memcmp(this->cstr_, other.cstr_, min_len);
-  if (comp < 0) return true;
-  if (comp > 0) return false;
-  return (this_len < other_len);
-}
-
-bool Value::CZString::operator==(const CZString& other) const {
-  if (!cstr_) return index_ == other.index_;
-  //return strcmp(cstr_, other.cstr_) == 0;
-  // Assume both are strings.
-  unsigned this_len = this->storage_.length_;
-  unsigned other_len = other.storage_.length_;
-  if (this_len != other_len) return false;
-  int comp = memcmp(this->cstr_, other.cstr_, this_len);
-  return comp == 0;
-}
-
-ArrayIndex Value::CZString::index() const { return index_; }
-
-//const char* Value::CZString::c_str() const { return cstr_; }
-const char* Value::CZString::data() const { return cstr_; }
-unsigned Value::CZString::length() const { return storage_.length_; }
-bool Value::CZString::isStaticString() const { return storage_.policy_ == noDuplication; }
-
-// //////////////////////////////////////////////////////////////////
-// //////////////////////////////////////////////////////////////////
-// //////////////////////////////////////////////////////////////////
-// class Value::Value
-// //////////////////////////////////////////////////////////////////
-// //////////////////////////////////////////////////////////////////
-// //////////////////////////////////////////////////////////////////
-
-/*! \internal Default constructor initialization must be equivalent to:
- * memset( this, 0, sizeof(Value) )
- * This optimization is used in ValueInternalMap fast allocator.
- */
-Value::Value(ValueType vtype) {
-  initBasic(vtype);
-  switch (vtype) {
-  case nullValue:
-    break;
-  case intValue:
-  case uintValue:
-    value_.int_ = 0;
-    break;
-  case realValue:
-    value_.real_ = 0.0;
-    break;
-  case stringValue:
-    value_.string_ = 0;
-    break;
-  case arrayValue:
-  case objectValue:
-    value_.map_ = new ObjectValues();
-    break;
-  case booleanValue:
-    value_.bool_ = false;
-    break;
-  default:
-    JSON_ASSERT_UNREACHABLE;
-  }
-}
-
-Value::Value(Int value) {
-  initBasic(intValue);
-  value_.int_ = value;
-}
-
-Value::Value(UInt value) {
-  initBasic(uintValue);
-  value_.uint_ = value;
-}
-#if defined(JSON_HAS_INT64)
-Value::Value(Int64 value) {
-  initBasic(intValue);
-  value_.int_ = value;
-}
-Value::Value(UInt64 value) {
-  initBasic(uintValue);
-  value_.uint_ = value;
-}
-#endif // defined(JSON_HAS_INT64)
-
-Value::Value(double value) {
-  initBasic(realValue);
-  value_.real_ = value;
-}
-
-Value::Value(const char* value) {
-  initBasic(stringValue, true);
-  value_.string_ = duplicateAndPrefixStringValue(value, static_cast<unsigned>(strlen(value)));
-}
-
-Value::Value(const char* beginValue, const char* endValue) {
-  initBasic(stringValue, true);
-  value_.string_ =
-      duplicateAndPrefixStringValue(beginValue, static_cast<unsigned>(endValue - beginValue));
-}
-
-Value::Value(const std::string& value) {
-  initBasic(stringValue, true);
-  value_.string_ =
-      duplicateAndPrefixStringValue(value.data(), static_cast<unsigned>(value.length()));
-}
-
-Value::Value(const StaticString& value) {
-  initBasic(stringValue);
-  value_.string_ = const_cast<char*>(value.c_str());
-}
-
-#ifdef JSON_USE_CPPTL
-Value::Value(const CppTL::ConstString& value) {
-  initBasic(stringValue, true);
-  value_.string_ = duplicateAndPrefixStringValue(value, static_cast<unsigned>(value.length()));
-}
-#endif
-
-Value::Value(bool value) {
-  initBasic(booleanValue);
-  value_.bool_ = value;
-}
-
-Value::Value(Value const& other)
-    : type_(other.type_), allocated_(false)
-      ,
-      comments_(0), start_(other.start_), limit_(other.limit_)
-{
-  switch (type_) {
-  case nullValue:
-  case intValue:
-  case uintValue:
-  case realValue:
-  case booleanValue:
-    value_ = other.value_;
-    break;
-  case stringValue:
-    if (other.value_.string_ && other.allocated_) {
-      unsigned len;
-      char const* str;
-      decodePrefixedString(other.allocated_, other.value_.string_,
-          &len, &str);
-      value_.string_ = duplicateAndPrefixStringValue(str, len);
-      allocated_ = true;
-    } else {
-      value_.string_ = other.value_.string_;
-      allocated_ = false;
-    }
-    break;
-  case arrayValue:
-  case objectValue:
-    value_.map_ = new ObjectValues(*other.value_.map_);
-    break;
-  default:
-    JSON_ASSERT_UNREACHABLE;
-  }
-  if (other.comments_) {
-    comments_ = new CommentInfo[numberOfCommentPlacement];
-    for (int comment = 0; comment < numberOfCommentPlacement; ++comment) {
-      const CommentInfo& otherComment = other.comments_[comment];
-      if (otherComment.comment_)
-        comments_[comment].setComment(
-            otherComment.comment_, strlen(otherComment.comment_));
-    }
-  }
-}
-
-#if JSON_HAS_RVALUE_REFERENCES
-// Move constructor
-Value::Value(Value&& other) {
-  initBasic(nullValue);
-  swap(other);
-}
-#endif
-
-Value::~Value() {
-  switch (type_) {
-  case nullValue:
-  case intValue:
-  case uintValue:
-  case realValue:
-  case booleanValue:
-    break;
-  case stringValue:
-    if (allocated_)
-      releaseStringValue(value_.string_);
-    break;
-  case arrayValue:
-  case objectValue:
-    delete value_.map_;
-    break;
-  default:
-    JSON_ASSERT_UNREACHABLE;
-  }
-
-  if (comments_)
-    delete[] comments_;
-}
-
-Value& Value::operator=(Value other) {
-  swap(other);
-  return *this;
-}
-
-void Value::swapPayload(Value& other) {
-  ValueType temp = type_;
-  type_ = other.type_;
-  other.type_ = temp;
-  std::swap(value_, other.value_);
-  int temp2 = allocated_;
-  allocated_ = other.allocated_;
-  other.allocated_ = temp2 & 0x1;
-}
-
-void Value::swap(Value& other) {
-  swapPayload(other);
-  std::swap(comments_, other.comments_);
-  std::swap(start_, other.start_);
-  std::swap(limit_, other.limit_);
-}
-
-ValueType Value::type() const { return type_; }
-
-int Value::compare(const Value& other) const {
-  if (*this < other)
-    return -1;
-  if (*this > other)
-    return 1;
-  return 0;
-}
-
-bool Value::operator<(const Value& other) const {
-  int typeDelta = type_ - other.type_;
-  if (typeDelta)
-    return typeDelta < 0 ? true : false;
-  switch (type_) {
-  case nullValue:
-    return false;
-  case intValue:
-    return value_.int_ < other.value_.int_;
-  case uintValue:
-    return value_.uint_ < other.value_.uint_;
-  case realValue:
-    return value_.real_ < other.value_.real_;
-  case booleanValue:
-    return value_.bool_ < other.value_.bool_;
-  case stringValue:
-  {
-    if ((value_.string_ == 0) || (other.value_.string_ == 0)) {
-      if (other.value_.string_) return true;
-      else return false;
-    }
-    unsigned this_len;
-    unsigned other_len;
-    char const* this_str;
-    char const* other_str;
-    decodePrefixedString(this->allocated_, this->value_.string_, &this_len, &this_str);
-    decodePrefixedString(other.allocated_, other.value_.string_, &other_len, &other_str);
-    unsigned min_len = std::min(this_len, other_len);
-    int comp = memcmp(this_str, other_str, min_len);
-    if (comp < 0) return true;
-    if (comp > 0) return false;
-    return (this_len < other_len);
-  }
-  case arrayValue:
-  case objectValue: {
-    int delta = int(value_.map_->size() - other.value_.map_->size());
-    if (delta)
-      return delta < 0;
-    return (*value_.map_) < (*other.value_.map_);
-  }
-  default:
-    JSON_ASSERT_UNREACHABLE;
-  }
-  return false; // unreachable
-}
-
-bool Value::operator<=(const Value& other) const { return !(other < *this); }
-
-bool Value::operator>=(const Value& other) const { return !(*this < other); }
-
-bool Value::operator>(const Value& other) const { return other < *this; }
-
-bool Value::operator==(const Value& other) const {
-  // if ( type_ != other.type_ )
-  // GCC 2.95.3 says:
-  // attempt to take address of bit-field structure member `Json::Value::type_'
-  // Beats me, but a temp solves the problem.
-  int temp = other.type_;
-  if (type_ != temp)
-    return false;
-  switch (type_) {
-  case nullValue:
-    return true;
-  case intValue:
-    return value_.int_ == other.value_.int_;
-  case uintValue:
-    return value_.uint_ == other.value_.uint_;
-  case realValue:
-    return value_.real_ == other.value_.real_;
-  case booleanValue:
-    return value_.bool_ == other.value_.bool_;
-  case stringValue:
-  {
-    if ((value_.string_ == 0) || (other.value_.string_ == 0)) {
-      return (value_.string_ == other.value_.string_);
-    }
-    unsigned this_len;
-    unsigned other_len;
-    char const* this_str;
-    char const* other_str;
-    decodePrefixedString(this->allocated_, this->value_.string_, &this_len, &this_str);
-    decodePrefixedString(other.allocated_, other.value_.string_, &other_len, &other_str);
-    if (this_len != other_len) return false;
-    int comp = memcmp(this_str, other_str, this_len);
-    return comp == 0;
-  }
-  case arrayValue:
-  case objectValue:
-    return value_.map_->size() == other.value_.map_->size() &&
-           (*value_.map_) == (*other.value_.map_);
-  default:
-    JSON_ASSERT_UNREACHABLE;
-  }
-  return false; // unreachable
-}
-
-bool Value::operator!=(const Value& other) const { return !(*this == other); }
-
-const char* Value::asCString() const {
-  JSON_ASSERT_MESSAGE(type_ == stringValue,
-                      "in Json::Value::asCString(): requires stringValue");
-  if (value_.string_ == 0) return 0;
-  unsigned this_len;
-  char const* this_str;
-  decodePrefixedString(this->allocated_, this->value_.string_, &this_len, &this_str);
-  return this_str;
-}
-
-bool Value::getString(char const** str, char const** cend) const {
-  if (type_ != stringValue) return false;
-  if (value_.string_ == 0) return false;
-  unsigned length;
-  decodePrefixedString(this->allocated_, this->value_.string_, &length, str);
-  *cend = *str + length;
-  return true;
-}
-
-std::string Value::asString() const {
-  switch (type_) {
-  case nullValue:
-    return "";
-  case stringValue:
-  {
-    if (value_.string_ == 0) return "";
-    unsigned this_len;
-    char const* this_str;
-    decodePrefixedString(this->allocated_, this->value_.string_, &this_len, &this_str);
-    return std::string(this_str, this_len);
-  }
-  case booleanValue:
-    return value_.bool_ ? "true" : "false";
-  case intValue:
-    return valueToString(value_.int_);
-  case uintValue:
-    return valueToString(value_.uint_);
-  case realValue:
-    return valueToString(value_.real_);
-  default:
-    JSON_FAIL_MESSAGE("Type is not convertible to string");
-  }
-}
-
-#ifdef JSON_USE_CPPTL
-CppTL::ConstString Value::asConstString() const {
-  unsigned len;
-  char const* str;
-  decodePrefixedString(allocated_, value_.string_,
-      &len, &str);
-  return CppTL::ConstString(str, len);
-}
-#endif
-
-Value::Int Value::asInt() const {
-  switch (type_) {
-  case intValue:
-    JSON_ASSERT_MESSAGE(isInt(), "LargestInt out of Int range");
-    return Int(value_.int_);
-  case uintValue:
-    JSON_ASSERT_MESSAGE(isInt(), "LargestUInt out of Int range");
-    return Int(value_.uint_);
-  case realValue:
-    JSON_ASSERT_MESSAGE(InRange(value_.real_, minInt, maxInt),
-                        "double out of Int range");
-    return Int(value_.real_);
-  case nullValue:
-    return 0;
-  case booleanValue:
-    return value_.bool_ ? 1 : 0;
-  default:
-    break;
-  }
-  JSON_FAIL_MESSAGE("Value is not convertible to Int.");
-}
-
-Value::UInt Value::asUInt() const {
-  switch (type_) {
-  case intValue:
-    JSON_ASSERT_MESSAGE(isUInt(), "LargestInt out of UInt range");
-    return UInt(value_.int_);
-  case uintValue:
-    JSON_ASSERT_MESSAGE(isUInt(), "LargestUInt out of UInt range");
-    return UInt(value_.uint_);
-  case realValue:
-    JSON_ASSERT_MESSAGE(InRange(value_.real_, 0, maxUInt),
-                        "double out of UInt range");
-    return UInt(value_.real_);
-  case nullValue:
-    return 0;
-  case booleanValue:
-    return value_.bool_ ? 1 : 0;
-  default:
-    break;
-  }
-  JSON_FAIL_MESSAGE("Value is not convertible to UInt.");
-}
-
-#if defined(JSON_HAS_INT64)
-
-Value::Int64 Value::asInt64() const {
-  switch (type_) {
-  case intValue:
-    return Int64(value_.int_);
-  case uintValue:
-    JSON_ASSERT_MESSAGE(isInt64(), "LargestUInt out of Int64 range");
-    return Int64(value_.uint_);
-  case realValue:
-    JSON_ASSERT_MESSAGE(InRange(value_.real_, minInt64, maxInt64),
-                        "double out of Int64 range");
-    return Int64(value_.real_);
-  case nullValue:
-    return 0;
-  case booleanValue:
-    return value_.bool_ ? 1 : 0;
-  default:
-    break;
-  }
-  JSON_FAIL_MESSAGE("Value is not convertible to Int64.");
-}
-
-Value::UInt64 Value::asUInt64() const {
-  switch (type_) {
-  case intValue:
-    JSON_ASSERT_MESSAGE(isUInt64(), "LargestInt out of UInt64 range");
-    return UInt64(value_.int_);
-  case uintValue:
-    return UInt64(value_.uint_);
-  case realValue:
-    JSON_ASSERT_MESSAGE(InRange(value_.real_, 0, maxUInt64),
-                        "double out of UInt64 range");
-    return UInt64(value_.real_);
-  case nullValue:
-    return 0;
-  case booleanValue:
-    return value_.bool_ ? 1 : 0;
-  default:
-    break;
-  }
-  JSON_FAIL_MESSAGE("Value is not convertible to UInt64.");
-}
-#endif // if defined(JSON_HAS_INT64)
-
-LargestInt Value::asLargestInt() const {
-#if defined(JSON_NO_INT64)
-  return asInt();
-#else
-  return asInt64();
-#endif
-}
-
-LargestUInt Value::asLargestUInt() const {
-#if defined(JSON_NO_INT64)
-  return asUInt();
-#else
-  return asUInt64();
-#endif
-}
-
-double Value::asDouble() const {
-  switch (type_) {
-  case intValue:
-    return static_cast<double>(value_.int_);
-  case uintValue:
-#if !defined(JSON_USE_INT64_DOUBLE_CONVERSION)
-    return static_cast<double>(value_.uint_);
-#else  // if !defined(JSON_USE_INT64_DOUBLE_CONVERSION)
-    return integerToDouble(value_.uint_);
-#endif // if !defined(JSON_USE_INT64_DOUBLE_CONVERSION)
-  case realValue:
-    return value_.real_;
-  case nullValue:
-    return 0.0;
-  case booleanValue:
-    return value_.bool_ ? 1.0 : 0.0;
-  default:
-    break;
-  }
-  JSON_FAIL_MESSAGE("Value is not convertible to double.");
-}
-
-float Value::asFloat() const {
-  switch (type_) {
-  case intValue:
-    return static_cast<float>(value_.int_);
-  case uintValue:
-#if !defined(JSON_USE_INT64_DOUBLE_CONVERSION)
-    return static_cast<float>(value_.uint_);
-#else  // if !defined(JSON_USE_INT64_DOUBLE_CONVERSION)
-    return integerToDouble(value_.uint_);
-#endif // if !defined(JSON_USE_INT64_DOUBLE_CONVERSION)
-  case realValue:
-    return static_cast<float>(value_.real_);
-  case nullValue:
-    return 0.0;
-  case booleanValue:
-    return value_.bool_ ? 1.0f : 0.0f;
-  default:
-    break;
-  }
-  JSON_FAIL_MESSAGE("Value is not convertible to float.");
-}
-
-bool Value::asBool() const {
-  switch (type_) {
-  case booleanValue:
-    return value_.bool_;
-  case nullValue:
-    return false;
-  case intValue:
-    return value_.int_ ? true : false;
-  case uintValue:
-    return value_.uint_ ? true : false;
-  case realValue:
-    // This is kind of strange. Not recommended.
-    return (value_.real_ != 0.0) ? true : false;
-  default:
-    break;
-  }
-  JSON_FAIL_MESSAGE("Value is not convertible to bool.");
-}
-
-bool Value::isConvertibleTo(ValueType other) const {
-  switch (other) {
-  case nullValue:
-    return (isNumeric() && asDouble() == 0.0) ||
-           (type_ == booleanValue && value_.bool_ == false) ||
-           (type_ == stringValue && asString() == "") ||
-           (type_ == arrayValue && value_.map_->size() == 0) ||
-           (type_ == objectValue && value_.map_->size() == 0) ||
-           type_ == nullValue;
-  case intValue:
-    return isInt() ||
-           (type_ == realValue && InRange(value_.real_, minInt, maxInt)) ||
-           type_ == booleanValue || type_ == nullValue;
-  case uintValue:
-    return isUInt() ||
-           (type_ == realValue && InRange(value_.real_, 0, maxUInt)) ||
-           type_ == booleanValue || type_ == nullValue;
-  case realValue:
-    return isNumeric() || type_ == booleanValue || type_ == nullValue;
-  case booleanValue:
-    return isNumeric() || type_ == booleanValue || type_ == nullValue;
-  case stringValue:
-    return isNumeric() || type_ == booleanValue || type_ == stringValue ||
-           type_ == nullValue;
-  case arrayValue:
-    return type_ == arrayValue || type_ == nullValue;
-  case objectValue:
-    return type_ == objectValue || type_ == nullValue;
-  }
-  JSON_ASSERT_UNREACHABLE;
-  return false;
-}
-
-/// Number of values in array or object
-ArrayIndex Value::size() const {
-  switch (type_) {
-  case nullValue:
-  case intValue:
-  case uintValue:
-  case realValue:
-  case booleanValue:
-  case stringValue:
-    return 0;
-  case arrayValue: // size of the array is highest index + 1
-    if (!value_.map_->empty()) {
-      ObjectValues::const_iterator itLast = value_.map_->end();
-      --itLast;
-      return (*itLast).first.index() + 1;
-    }
-    return 0;
-  case objectValue:
-    return ArrayIndex(value_.map_->size());
-  }
-  JSON_ASSERT_UNREACHABLE;
-  return 0; // unreachable;
-}
-
-bool Value::empty() const {
-  if (isNull() || isArray() || isObject())
-    return size() == 0u;
-  else
-    return false;
-}
-
-bool Value::operator!() const { return isNull(); }
-
-void Value::clear() {
-  JSON_ASSERT_MESSAGE(type_ == nullValue || type_ == arrayValue ||
-                          type_ == objectValue,
-                      "in Json::Value::clear(): requires complex value");
-  start_ = 0;
-  limit_ = 0;
-  switch (type_) {
-  case arrayValue:
-  case objectValue:
-    value_.map_->clear();
-    break;
-  default:
-    break;
-  }
-}
-
-void Value::resize(ArrayIndex newSize) {
-  JSON_ASSERT_MESSAGE(type_ == nullValue || type_ == arrayValue,
-                      "in Json::Value::resize(): requires arrayValue");
-  if (type_ == nullValue)
-    *this = Value(arrayValue);
-  ArrayIndex oldSize = size();
-  if (newSize == 0)
-    clear();
-  else if (newSize > oldSize)
-    (*this)[newSize - 1];
-  else {
-    for (ArrayIndex index = newSize; index < oldSize; ++index) {
-      value_.map_->erase(index);
-    }
-    assert(size() == newSize);
-  }
-}
-
-Value& Value::operator[](ArrayIndex index) {
-  JSON_ASSERT_MESSAGE(
-      type_ == nullValue || type_ == arrayValue,
-      "in Json::Value::operator[](ArrayIndex): requires arrayValue");
-  if (type_ == nullValue)
-    *this = Value(arrayValue);
-  CZString key(index);
-  ObjectValues::iterator it = value_.map_->lower_bound(key);
-  if (it != value_.map_->end() && (*it).first == key)
-    return (*it).second;
-
-  ObjectValues::value_type defaultValue(key, nullRef);
-  it = value_.map_->insert(it, defaultValue);
-  return (*it).second;
-}
-
-Value& Value::operator[](int index) {
-  JSON_ASSERT_MESSAGE(
-      index >= 0,
-      "in Json::Value::operator[](int index): index cannot be negative");
-  return (*this)[ArrayIndex(index)];
-}
-
-const Value& Value::operator[](ArrayIndex index) const {
-  JSON_ASSERT_MESSAGE(
-      type_ == nullValue || type_ == arrayValue,
-      "in Json::Value::operator[](ArrayIndex)const: requires arrayValue");
-  if (type_ == nullValue)
-    return nullRef;
-  CZString key(index);
-  ObjectValues::const_iterator it = value_.map_->find(key);
-  if (it == value_.map_->end())
-    return nullRef;
-  return (*it).second;
-}
-
-const Value& Value::operator[](int index) const {
-  JSON_ASSERT_MESSAGE(
-      index >= 0,
-      "in Json::Value::operator[](int index) const: index cannot be negative");
-  return (*this)[ArrayIndex(index)];
-}
-
-void Value::initBasic(ValueType vtype, bool allocated) {
-  type_ = vtype;
-  allocated_ = allocated;
-  comments_ = 0;
-  start_ = 0;
-  limit_ = 0;
-}
-
-// Access an object value by name, create a null member if it does not exist.
-// @pre Type of '*this' is object or null.
-// @param key is null-terminated.
-Value& Value::resolveReference(const char* key) {
-  JSON_ASSERT_MESSAGE(
-      type_ == nullValue || type_ == objectValue,
-      "in Json::Value::resolveReference(): requires objectValue");
-  if (type_ == nullValue)
-    *this = Value(objectValue);
-  CZString actualKey(
-      key, static_cast<unsigned>(strlen(key)), CZString::noDuplication); // NOTE!
-  ObjectValues::iterator it = value_.map_->lower_bound(actualKey);
-  if (it != value_.map_->end() && (*it).first == actualKey)
-    return (*it).second;
-
-  ObjectValues::value_type defaultValue(actualKey, nullRef);
-  it = value_.map_->insert(it, defaultValue);
-  Value& value = (*it).second;
-  return value;
-}
-
-// @param key is not null-terminated.
-Value& Value::resolveReference(char const* key, char const* cend)
-{
-  JSON_ASSERT_MESSAGE(
-      type_ == nullValue || type_ == objectValue,
-      "in Json::Value::resolveReference(key, end): requires objectValue");
-  if (type_ == nullValue)
-    *this = Value(objectValue);
-  CZString actualKey(
-      key, static_cast<unsigned>(cend-key), CZString::duplicateOnCopy);
-  ObjectValues::iterator it = value_.map_->lower_bound(actualKey);
-  if (it != value_.map_->end() && (*it).first == actualKey)
-    return (*it).second;
-
-  ObjectValues::value_type defaultValue(actualKey, nullRef);
-  it = value_.map_->insert(it, defaultValue);
-  Value& value = (*it).second;
-  return value;
-}
-
-Value Value::get(ArrayIndex index, const Value& defaultValue) const {
-  const Value* value = &((*this)[index]);
-  return value == &nullRef ? defaultValue : *value;
-}
-
-bool Value::isValidIndex(ArrayIndex index) const { return index < size(); }
-
-Value const* Value::find(char const* key, char const* cend) const
-{
-  JSON_ASSERT_MESSAGE(
-      type_ == nullValue || type_ == objectValue,
-      "in Json::Value::find(key, end, found): requires objectValue or nullValue");
-  if (type_ == nullValue) return NULL;
-  CZString actualKey(key, static_cast<unsigned>(cend-key), CZString::noDuplication);
-  ObjectValues::const_iterator it = value_.map_->find(actualKey);
-  if (it == value_.map_->end()) return NULL;
-  return &(*it).second;
-}
-const Value& Value::operator[](const char* key) const
-{
-  Value const* found = find(key, key + strlen(key));
-  if (!found) return nullRef;
-  return *found;
-}
-Value const& Value::operator[](std::string const& key) const
-{
-  Value const* found = find(key.data(), key.data() + key.length());
-  if (!found) return nullRef;
-  return *found;
-}
-
-Value& Value::operator[](const char* key) {
-  return resolveReference(key, key + strlen(key));
-}
-
-Value& Value::operator[](const std::string& key) {
-  return resolveReference(key.data(), key.data() + key.length());
-}
-
-Value& Value::operator[](const StaticString& key) {
-  return resolveReference(key.c_str());
-}
-
-#ifdef JSON_USE_CPPTL
-Value& Value::operator[](const CppTL::ConstString& key) {
-  return resolveReference(key.c_str(), key.end_c_str());
-}
-Value const& Value::operator[](CppTL::ConstString const& key) const
-{
-  Value const* found = find(key.c_str(), key.end_c_str());
-  if (!found) return nullRef;
-  return *found;
-}
-#endif
-
-Value& Value::append(const Value& value) { return (*this)[size()] = value; }
-
-Value Value::get(char const* key, char const* cend, Value const& defaultValue) const
-{
-  Value const* found = find(key, cend);
-  return !found ? defaultValue : *found;
-}
-Value Value::get(char const* key, Value const& defaultValue) const
-{
-  return get(key, key + strlen(key), defaultValue);
-}
-Value Value::get(std::string const& key, Value const& defaultValue) const
-{
-  return get(key.data(), key.data() + key.length(), defaultValue);
-}
-
-
-bool Value::removeMember(const char* key, const char* cend, Value* removed)
-{
-  if (type_ != objectValue) {
-    return false;
-  }
-  CZString actualKey(key, static_cast<unsigned>(cend-key), CZString::noDuplication);
-  ObjectValues::iterator it = value_.map_->find(actualKey);
-  if (it == value_.map_->end())
-    return false;
-  *removed = it->second;
-  value_.map_->erase(it);
-  return true;
-}
-bool Value::removeMember(const char* key, Value* removed)
-{
-  return removeMember(key, key + strlen(key), removed);
-}
-bool Value::removeMember(std::string const& key, Value* removed)
-{
-  return removeMember(key.data(), key.data() + key.length(), removed);
-}
-Value Value::removeMember(const char* key)
-{
-  JSON_ASSERT_MESSAGE(type_ == nullValue || type_ == objectValue,
-                      "in Json::Value::removeMember(): requires objectValue");
-  if (type_ == nullValue)
-    return nullRef;
-
-  Value removed;  // null
-  removeMember(key, key + strlen(key), &removed);
-  return removed; // still null if removeMember() did nothing
-}
-Value Value::removeMember(const std::string& key)
-{
-  return removeMember(key.c_str());
-}
-
-bool Value::removeIndex(ArrayIndex index, Value* removed) {
-  if (type_ != arrayValue) {
-    return false;
-  }
-  CZString key(index);
-  ObjectValues::iterator it = value_.map_->find(key);
-  if (it == value_.map_->end()) {
-    return false;
-  }
-  *removed = it->second;
-  ArrayIndex oldSize = size();
-  // shift left all items left, into the place of the "removed"
-  for (ArrayIndex i = index; i < (oldSize - 1); ++i){
-    CZString keey(i);
-    (*value_.map_)[keey] = (*this)[i + 1];
-  }
-  // erase the last one ("leftover")
-  CZString keyLast(oldSize - 1);
-  ObjectValues::iterator itLast = value_.map_->find(keyLast);
-  value_.map_->erase(itLast);
-  return true;
-}
-
-#ifdef JSON_USE_CPPTL
-Value Value::get(const CppTL::ConstString& key,
-                 const Value& defaultValue) const {
-  return get(key.c_str(), key.end_c_str(), defaultValue);
-}
-#endif
-
-bool Value::isMember(char const* key, char const* cend) const
-{
-  Value const* value = find(key, cend);
-  return NULL != value;
-}
-bool Value::isMember(char const* key) const
-{
-  return isMember(key, key + strlen(key));
-}
-bool Value::isMember(std::string const& key) const
-{
-  return isMember(key.data(), key.data() + key.length());
-}
-
-#ifdef JSON_USE_CPPTL
-bool Value::isMember(const CppTL::ConstString& key) const {
-  return isMember(key.c_str(), key.end_c_str());
-}
-#endif
-
-Value::Members Value::getMemberNames() const {
-  JSON_ASSERT_MESSAGE(
-      type_ == nullValue || type_ == objectValue,
-      "in Json::Value::getMemberNames(), value must be objectValue");
-  if (type_ == nullValue)
-    return Value::Members();
-  Members members;
-  members.reserve(value_.map_->size());
-  ObjectValues::const_iterator it = value_.map_->begin();
-  ObjectValues::const_iterator itEnd = value_.map_->end();
-  for (; it != itEnd; ++it) {
-    members.push_back(std::string((*it).first.data(),
-                                  (*it).first.length()));
-  }
-  return members;
-}
-//
-//# ifdef JSON_USE_CPPTL
-// EnumMemberNames
-// Value::enumMemberNames() const
-//{
-//   if ( type_ == objectValue )
-//   {
-//      return CppTL::Enum::any(  CppTL::Enum::transform(
-//         CppTL::Enum::keys( *(value_.map_), CppTL::Type<const CZString &>() ),
-//         MemberNamesTransform() ) );
-//   }
-//   return EnumMemberNames();
-//}
-//
-//
-// EnumValues
-// Value::enumValues() const
-//{
-//   if ( type_ == objectValue  ||  type_ == arrayValue )
-//      return CppTL::Enum::anyValues( *(value_.map_),
-//                                     CppTL::Type<const Value &>() );
-//   return EnumValues();
-//}
-//
-//# endif
-
-static bool IsIntegral(double d) {
-  double integral_part;
-  return modf(d, &integral_part) == 0.0;
-}
-
-bool Value::isNull() const { return type_ == nullValue; }
-
-bool Value::isBool() const { return type_ == booleanValue; }
-
-bool Value::isInt() const {
-  switch (type_) {
-  case intValue:
-    return value_.int_ >= minInt && value_.int_ <= maxInt;
-  case uintValue:
-    return value_.uint_ <= UInt(maxInt);
-  case realValue:
-    return value_.real_ >= minInt && value_.real_ <= maxInt &&
-           IsIntegral(value_.real_);
-  default:
-    break;
-  }
-  return false;
-}
-
-bool Value::isUInt() const {
-  switch (type_) {
-  case intValue:
-    return value_.int_ >= 0 && LargestUInt(value_.int_) <= LargestUInt(maxUInt);
-  case uintValue:
-    return value_.uint_ <= maxUInt;
-  case realValue:
-    return value_.real_ >= 0 && value_.real_ <= maxUInt &&
-           IsIntegral(value_.real_);
-  default:
-    break;
-  }
-  return false;
-}
-
-bool Value::isInt64() const {
-#if defined(JSON_HAS_INT64)
-  switch (type_) {
-  case intValue:
-    return true;
-  case uintValue:
-    return value_.uint_ <= UInt64(maxInt64);
-  case realValue:
-    // Note that maxInt64 (= 2^63 - 1) is not exactly representable as a
-    // double, so double(maxInt64) will be rounded up to 2^63. Therefore we
-    // require the value to be strictly less than the limit.
-    return value_.real_ >= double(minInt64) &&
-           value_.real_ < double(maxInt64) && IsIntegral(value_.real_);
-  default:
-    break;
-  }
-#endif // JSON_HAS_INT64
-  return false;
-}
-
-bool Value::isUInt64() const {
-#if defined(JSON_HAS_INT64)
-  switch (type_) {
-  case intValue:
-    return value_.int_ >= 0;
-  case uintValue:
-    return true;
-  case realValue:
-    // Note that maxUInt64 (= 2^64 - 1) is not exactly representable as a
-    // double, so double(maxUInt64) will be rounded up to 2^64. Therefore we
-    // require the value to be strictly less than the limit.
-    return value_.real_ >= 0 && value_.real_ < maxUInt64AsDouble &&
-           IsIntegral(value_.real_);
-  default:
-    break;
-  }
-#endif // JSON_HAS_INT64
-  return false;
-}
-
-bool Value::isIntegral() const {
-#if defined(JSON_HAS_INT64)
-  return isInt64() || isUInt64();
-#else
-  return isInt() || isUInt();
-#endif
-}
-
-bool Value::isDouble() const { return type_ == realValue || isIntegral(); }
-
-bool Value::isNumeric() const { return isIntegral() || isDouble(); }
-
-bool Value::isString() const { return type_ == stringValue; }
-
-bool Value::isArray() const { return type_ == arrayValue; }
-
-bool Value::isObject() const { return type_ == objectValue; }
-
-void Value::setComment(const char* comment, size_t len, CommentPlacement placement) {
-  if (!comments_)
-    comments_ = new CommentInfo[numberOfCommentPlacement];
-  if ((len > 0) && (comment[len-1] == '\n')) {
-    // Always discard trailing newline, to aid indentation.
-    len -= 1;
-  }
-  comments_[placement].setComment(comment, len);
-}
-
-void Value::setComment(const char* comment, CommentPlacement placement) {
-  setComment(comment, strlen(comment), placement);
-}
-
-void Value::setComment(const std::string& comment, CommentPlacement placement) {
-  setComment(comment.c_str(), comment.length(), placement);
-}
-
-bool Value::hasComment(CommentPlacement placement) const {
-  return comments_ != 0 && comments_[placement].comment_ != 0;
-}
-
-std::string Value::getComment(CommentPlacement placement) const {
-  if (hasComment(placement))
-    return comments_[placement].comment_;
-  return "";
-}
-
-void Value::setOffsetStart(size_t start) { start_ = start; }
-
-void Value::setOffsetLimit(size_t limit) { limit_ = limit; }
-
-size_t Value::getOffsetStart() const { return start_; }
-
-size_t Value::getOffsetLimit() const { return limit_; }
-
-std::string Value::toStyledString() const {
-  StyledWriter writer;
-  return writer.write(*this);
-}
-
-Value::const_iterator Value::begin() const {
-  switch (type_) {
-  case arrayValue:
-  case objectValue:
-    if (value_.map_)
-      return const_iterator(value_.map_->begin());
-    break;
-  default:
-    break;
-  }
-  return const_iterator();
-}
-
-Value::const_iterator Value::end() const {
-  switch (type_) {
-  case arrayValue:
-  case objectValue:
-    if (value_.map_)
-      return const_iterator(value_.map_->end());
-    break;
-  default:
-    break;
-  }
-  return const_iterator();
-}
-
-Value::iterator Value::begin() {
-  switch (type_) {
-  case arrayValue:
-  case objectValue:
-    if (value_.map_)
-      return iterator(value_.map_->begin());
-    break;
-  default:
-    break;
-  }
-  return iterator();
-}
-
-Value::iterator Value::end() {
-  switch (type_) {
-  case arrayValue:
-  case objectValue:
-    if (value_.map_)
-      return iterator(value_.map_->end());
-    break;
-  default:
-    break;
-  }
-  return iterator();
-}
-
-// class PathArgument
-// //////////////////////////////////////////////////////////////////
-
-PathArgument::PathArgument() : key_(), index_(), kind_(kindNone) {}
-
-PathArgument::PathArgument(ArrayIndex index)
-    : key_(), index_(index), kind_(kindIndex) {}
-
-PathArgument::PathArgument(const char* key)
-    : key_(key), index_(), kind_(kindKey) {}
-
-PathArgument::PathArgument(const std::string& key)
-    : key_(key.c_str()), index_(), kind_(kindKey) {}
-
-// class Path
-// //////////////////////////////////////////////////////////////////
-
-Path::Path(const std::string& path,
-           const PathArgument& a1,
-           const PathArgument& a2,
-           const PathArgument& a3,
-           const PathArgument& a4,
-           const PathArgument& a5) {
-  InArgs in;
-  in.push_back(&a1);
-  in.push_back(&a2);
-  in.push_back(&a3);
-  in.push_back(&a4);
-  in.push_back(&a5);
-  makePath(path, in);
-}
-
-void Path::makePath(const std::string& path, const InArgs& in) {
-  const char* current = path.c_str();
-  const char* end = current + path.length();
-  InArgs::const_iterator itInArg = in.begin();
-  while (current != end) {
-    if (*current == '[') {
-      ++current;
-      if (*current == '%')
-        addPathInArg(path, in, itInArg, PathArgument::kindIndex);
-      else {
-        ArrayIndex index = 0;
-        for (; current != end && *current >= '0' && *current <= '9'; ++current)
-          index = index * 10 + ArrayIndex(*current - '0');
-        args_.push_back(index);
-      }
-      if (current == end || *current++ != ']')
-        invalidPath(path, int(current - path.c_str()));
-    } else if (*current == '%') {
-      addPathInArg(path, in, itInArg, PathArgument::kindKey);
-      ++current;
-    } else if (*current == '.') {
-      ++current;
-    } else {
-      const char* beginName = current;
-      while (current != end && !strchr("[.", *current))
-        ++current;
-      args_.push_back(std::string(beginName, current));
-    }
-  }
-}
-
-void Path::addPathInArg(const std::string& /*path*/,
-                        const InArgs& in,
-                        InArgs::const_iterator& itInArg,
-                        PathArgument::Kind kind) {
-  if (itInArg == in.end()) {
-    // Error: missing argument %d
-  } else if ((*itInArg)->kind_ != kind) {
-    // Error: bad argument type
-  } else {
-    args_.push_back(**itInArg);
-  }
-}
-
-void Path::invalidPath(const std::string& /*path*/, int /*location*/) {
-  // Error: invalid path.
-}
-
-const Value& Path::resolve(const Value& root) const {
-  const Value* node = &root;
-  for (Args::const_iterator it = args_.begin(); it != args_.end(); ++it) {
-    const PathArgument& arg = *it;
-    if (arg.kind_ == PathArgument::kindIndex) {
-      if (!node->isArray() || !node->isValidIndex(arg.index_)) {
-        // Error: unable to resolve path (array value expected at position...
-      }
-      node = &((*node)[arg.index_]);
-    } else if (arg.kind_ == PathArgument::kindKey) {
-      if (!node->isObject()) {
-        // Error: unable to resolve path (object value expected at position...)
-      }
-      node = &((*node)[arg.key_]);
-      if (node == &Value::nullRef) {
-        // Error: unable to resolve path (object has no member named '' at
-        // position...)
-      }
-    }
-  }
-  return *node;
-}
-
-Value Path::resolve(const Value& root, const Value& defaultValue) const {
-  const Value* node = &root;
-  for (Args::const_iterator it = args_.begin(); it != args_.end(); ++it) {
-    const PathArgument& arg = *it;
-    if (arg.kind_ == PathArgument::kindIndex) {
-      if (!node->isArray() || !node->isValidIndex(arg.index_))
-        return defaultValue;
-      node = &((*node)[arg.index_]);
-    } else if (arg.kind_ == PathArgument::kindKey) {
-      if (!node->isObject())
-        return defaultValue;
-      node = &((*node)[arg.key_]);
-      if (node == &Value::nullRef)
-        return defaultValue;
-    }
-  }
-  return *node;
-}
-
-Value& Path::make(Value& root) const {
-  Value* node = &root;
-  for (Args::const_iterator it = args_.begin(); it != args_.end(); ++it) {
-    const PathArgument& arg = *it;
-    if (arg.kind_ == PathArgument::kindIndex) {
-      if (!node->isArray()) {
-        // Error: node is not an array at position ...
-      }
-      node = &((*node)[arg.index_]);
-    } else if (arg.kind_ == PathArgument::kindKey) {
-      if (!node->isObject()) {
-        // Error: node is not an object at position...
-      }
-      node = &((*node)[arg.key_]);
-    }
-  }
-  return *node;
-}
-
-} // namespace Json
-
-// //////////////////////////////////////////////////////////////////////
-// End of content of file: src/lib_json/json_value.cpp
-// //////////////////////////////////////////////////////////////////////
-
-
-
-
-
-
-// //////////////////////////////////////////////////////////////////////
-// Beginning of content of file: src/lib_json/json_writer.cpp
-// //////////////////////////////////////////////////////////////////////
-
-// Copyright 2011 Baptiste Lepilleur
-// Distributed under MIT license, or public domain if desired and
-// recognized in your jurisdiction.
-// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE
-
-#if !defined(JSON_IS_AMALGAMATION)
-#include <json/writer.h>
-#include "json_tool.h"
-#endif // if !defined(JSON_IS_AMALGAMATION)
-#include <iomanip>
-#include <memory>
-#include <sstream>
-#include <utility>
-#include <set>
-#include <cassert>
-#include <cstring>
-#include <cstdio>
-
-#if defined(_MSC_VER) && _MSC_VER >= 1200 && _MSC_VER < 1800 // Between VC++ 6.0 and VC++ 11.0
-#include <float.h>
-#define isfinite _finite
-#elif defined(__sun) && defined(__SVR4) //Solaris
-#if !defined(isfinite)
-#include <ieeefp.h>
-#define isfinite finite
-#endif
-#elif defined(_AIX)
-#if !defined(isfinite)
-#include <math.h>
-#define isfinite finite
-#endif
-#elif defined(__hpux)
-#if !defined(isfinite)
-#if defined(__ia64) && !defined(finite)
-#define isfinite(x) ((sizeof(x) == sizeof(float) ? \
-                     _Isfinitef(x) : _IsFinite(x)))
-#else
-#include <math.h>
-#define isfinite finite
-#endif
-#endif
-#else
-#include <cmath>
-#if !(defined(__QNXNTO__)) // QNX already defines isfinite
-#define isfinite std::isfinite
-#endif
-#endif
-
-#if defined(_MSC_VER)
-#if !defined(WINCE) && defined(__STDC_SECURE_LIB__) && _MSC_VER >= 1500 // VC++ 9.0 and above
-#define snprintf sprintf_s
-#elif _MSC_VER >= 1900 // VC++ 14.0 and above
-#define snprintf std::snprintf
-#else
-#define snprintf _snprintf
-#endif
-#elif defined(__ANDROID__) || defined(__QNXNTO__)
-#define snprintf snprintf
-#elif __cplusplus >= 201103L
-#define snprintf std::snprintf
-#endif
-
-#if defined(__BORLANDC__)
-#include <float.h>
-#define isfinite _finite
-#define snprintf _snprintf
-#endif
-
-#if defined(_MSC_VER) && _MSC_VER >= 1400 // VC++ 8.0
-// Disable warning about strdup being deprecated.
-#pragma warning(disable : 4996)
-#endif
-
-namespace Json {
-
-#if __cplusplus >= 201103L || (defined(_CPPLIB_VER) && _CPPLIB_VER >= 520)
-typedef std::unique_ptr<StreamWriter> StreamWriterPtr;
-#else
-typedef std::auto_ptr<StreamWriter>   StreamWriterPtr;
-#endif
-
-static bool containsControlCharacter(const char* str) {
-  while (*str) {
-    if (isControlCharacter(*(str++)))
-      return true;
-  }
-  return false;
-}
-
-static bool containsControlCharacter0(const char* str, unsigned len) {
-  char const* end = str + len;
-  while (end != str) {
-    if (isControlCharacter(*str) || 0==*str)
-      return true;
-    ++str;
-  }
-  return false;
-}
-
-std::string valueToString(LargestInt value) {
-  UIntToStringBuffer buffer;
-  char* current = buffer + sizeof(buffer);
-  if (value == Value::minLargestInt) {
-    uintToString(LargestUInt(Value::maxLargestInt) + 1, current);
-    *--current = '-';
-  } else if (value < 0) {
-    uintToString(LargestUInt(-value), current);
-    *--current = '-';
-  } else {
-    uintToString(LargestUInt(value), current);
-  }
-  assert(current >= buffer);
-  return current;
-}
-
-std::string valueToString(LargestUInt value) {
-  UIntToStringBuffer buffer;
-  char* current = buffer + sizeof(buffer);
-  uintToString(value, current);
-  assert(current >= buffer);
-  return current;
-}
-
-#if defined(JSON_HAS_INT64)
-
-std::string valueToString(Int value) {
-  return valueToString(LargestInt(value));
-}
-
-std::string valueToString(UInt value) {
-  return valueToString(LargestUInt(value));
-}
-
-#endif // # if defined(JSON_HAS_INT64)
-
-std::string valueToString(double value, bool useSpecialFloats, unsigned int precision) {
-  // Allocate a buffer that is more than large enough to store the 16 digits of
-  // precision requested below.
-  char buffer[32];
-  int len = -1;
-
-  char formatString[6];
-  sprintf(formatString, "%%.%dg", precision);
-
-  // Print into the buffer. We need not request the alternative representation
-  // that always has a decimal point because JSON doesn't distinguish the
-  // concepts of reals and integers.
-  if (isfinite(value)) {
-    len = snprintf(buffer, sizeof(buffer), formatString, value);
-  } else {
-    // IEEE standard states that NaN values will not compare to themselves
-    if (value != value) {
-      len = snprintf(buffer, sizeof(buffer), useSpecialFloats ? "NaN" : "null");
-    } else if (value < 0) {
-      len = snprintf(buffer, sizeof(buffer), useSpecialFloats ? "-Infinity" : "-1e+9999");
-    } else {
-      len = snprintf(buffer, sizeof(buffer), useSpecialFloats ? "Infinity" : "1e+9999");
-    }
-    // For those, we do not need to call fixNumLoc, but it is fast.
-  }
-  assert(len >= 0);
-  fixNumericLocale(buffer, buffer + len);
-  return buffer;
-}
-
-std::string valueToString(double value) { return valueToString(value, false, 17); }
-
-std::string valueToString(bool value) { return value ? "true" : "false"; }
-
-std::string valueToQuotedString(const char* value) {
-  if (value == NULL)
-    return "";
-  // Not sure how to handle unicode...
-  if (strpbrk(value, "\"\\\b\f\n\r\t") == NULL &&
-      !containsControlCharacter(value))
-    return std::string("\"") + value + "\"";
-  // We have to walk value and escape any special characters.
-  // Appending to std::string is not efficient, but this should be rare.
-  // (Note: forward slashes are *not* rare, but I am not escaping them.)
-  std::string::size_type maxsize =
-      strlen(value) * 2 + 3; // allescaped+quotes+NULL
-  std::string result;
-  result.reserve(maxsize); // to avoid lots of mallocs
-  result += "\"";
-  for (const char* c = value; *c != 0; ++c) {
-    switch (*c) {
-    case '\"':
-      result += "\\\"";
-      break;
-    case '\\':
-      result += "\\\\";
-      break;
-    case '\b':
-      result += "\\b";
-      break;
-    case '\f':
-      result += "\\f";
-      break;
-    case '\n':
-      result += "\\n";
-      break;
-    case '\r':
-      result += "\\r";
-      break;
-    case '\t':
-      result += "\\t";
-      break;
-    // case '/':
-    // Even though \/ is considered a legal escape in JSON, a bare
-    // slash is also legal, so I see no reason to escape it.
-    // (I hope I am not misunderstanding something.
-    // blep notes: actually escaping \/ may be useful in javascript to avoid </
-    // sequence.
-    // Should add a flag to allow this compatibility mode and prevent this
-    // sequence from occurring.
-    default:
-      if (isControlCharacter(*c)) {
-        std::ostringstream oss;
-        oss << "\\u" << std::hex << std::uppercase << std::setfill('0')
-            << std::setw(4) << static_cast<int>(*c);
-        result += oss.str();
-      } else {
-        result += *c;
-      }
-      break;
-    }
-  }
-  result += "\"";
-  return result;
-}
-
-// https://github.com/upcaste/upcaste/blob/master/src/upcore/src/cstring/strnpbrk.cpp
-static char const* strnpbrk(char const* s, char const* accept, size_t n) {
-  assert((s || !n) && accept);
-
-  char const* const end = s + n;
-  for (char const* cur = s; cur < end; ++cur) {
-    int const c = *cur;
-    for (char const* a = accept; *a; ++a) {
-      if (*a == c) {
-        return cur;
-      }
-    }
-  }
-  return NULL;
-}
-static std::string valueToQuotedStringN(const char* value, unsigned length) {
-  if (value == NULL)
-    return "";
-  // Not sure how to handle unicode...
-  if (strnpbrk(value, "\"\\\b\f\n\r\t", length) == NULL &&
-      !containsControlCharacter0(value, length))
-    return std::string("\"") + value + "\"";
-  // We have to walk value and escape any special characters.
-  // Appending to std::string is not efficient, but this should be rare.
-  // (Note: forward slashes are *not* rare, but I am not escaping them.)
-  std::string::size_type maxsize =
-      length * 2 + 3; // allescaped+quotes+NULL
-  std::string result;
-  result.reserve(maxsize); // to avoid lots of mallocs
-  result += "\"";
-  char const* end = value + length;
-  for (const char* c = value; c != end; ++c) {
-    switch (*c) {
-    case '\"':
-      result += "\\\"";
-      break;
-    case '\\':
-      result += "\\\\";
-      break;
-    case '\b':
-      result += "\\b";
-      break;
-    case '\f':
-      result += "\\f";
-      break;
-    case '\n':
-      result += "\\n";
-      break;
-    case '\r':
-      result += "\\r";
-      break;
-    case '\t':
-      result += "\\t";
-      break;
-    // case '/':
-    // Even though \/ is considered a legal escape in JSON, a bare
-    // slash is also legal, so I see no reason to escape it.
-    // (I hope I am not misunderstanding something.)
-    // blep notes: actually escaping \/ may be useful in javascript to avoid </
-    // sequence.
-    // Should add a flag to allow this compatibility mode and prevent this
-    // sequence from occurring.
-    default:
-      if ((isControlCharacter(*c)) || (*c == 0)) {
-        std::ostringstream oss;
-        oss << "\\u" << std::hex << std::uppercase << std::setfill('0')
-            << std::setw(4) << static_cast<int>(*c);
-        result += oss.str();
-      } else {
-        result += *c;
-      }
-      break;
-    }
-  }
-  result += "\"";
-  return result;
-}
-
-// Class Writer
-// //////////////////////////////////////////////////////////////////
-Writer::~Writer() {}
-
-// Class FastWriter
-// //////////////////////////////////////////////////////////////////
-
-FastWriter::FastWriter()
-    : yamlCompatiblityEnabled_(false), dropNullPlaceholders_(false),
-      omitEndingLineFeed_(false) {}
-
-void FastWriter::enableYAMLCompatibility() { yamlCompatiblityEnabled_ = true; }
-
-void FastWriter::dropNullPlaceholders() { dropNullPlaceholders_ = true; }
-
-void FastWriter::omitEndingLineFeed() { omitEndingLineFeed_ = true; }
-
-std::string FastWriter::write(const Value& root) {
-  document_ = "";
-  writeValue(root);
-  if (!omitEndingLineFeed_)
-    document_ += "\n";
-  return document_;
-}
-
-void FastWriter::writeValue(const Value& value) {
-  switch (value.type()) {
-  case nullValue:
-    if (!dropNullPlaceholders_)
-      document_ += "null";
-    break;
-  case intValue:
-    document_ += valueToString(value.asLargestInt());
-    break;
-  case uintValue:
-    document_ += valueToString(value.asLargestUInt());
-    break;
-  case realValue:
-    document_ += valueToString(value.asDouble());
-    break;
-  case stringValue:
-  {
-    // Is NULL possible for value.string_?
-    char const* str;
-    char const* end;
-    bool ok = value.getString(&str, &end);
-    if (ok) document_ += valueToQuotedStringN(str, static_cast<unsigned>(end-str));
-    break;
-  }
-  case booleanValue:
-    document_ += valueToString(value.asBool());
-    break;
-  case arrayValue: {
-    document_ += '[';
-    int size = value.size();
-    for (int index = 0; index < size; ++index) {
-      if (index > 0)
-        document_ += ',';
-      writeValue(value[index]);
-    }
-    document_ += ']';
-  } break;
-  case objectValue: {
-    Value::Members members(value.getMemberNames());
-    document_ += '{';
-    for (Value::Members::iterator it = members.begin(); it != members.end();
-         ++it) {
-      const std::string& name = *it;
-      if (it != members.begin())
-        document_ += ',';
-      document_ += valueToQuotedStringN(name.data(), static_cast<unsigned>(name.length()));
-      document_ += yamlCompatiblityEnabled_ ? ": " : ":";
-      writeValue(value[name]);
-    }
-    document_ += '}';
-  } break;
-  }
-}
-
-// Class StyledWriter
-// //////////////////////////////////////////////////////////////////
-
-StyledWriter::StyledWriter()
-    : rightMargin_(74), indentSize_(3), addChildValues_() {}
-
-std::string StyledWriter::write(const Value& root) {
-  document_ = "";
-  addChildValues_ = false;
-  indentString_ = "";
-  writeCommentBeforeValue(root);
-  writeValue(root);
-  writeCommentAfterValueOnSameLine(root);
-  document_ += "\n";
-  return document_;
-}
-
-void StyledWriter::writeValue(const Value& value) {
-  switch (value.type()) {
-  case nullValue:
-    pushValue("null");
-    break;
-  case intValue:
-    pushValue(valueToString(value.asLargestInt()));
-    break;
-  case uintValue:
-    pushValue(valueToString(value.asLargestUInt()));
-    break;
-  case realValue:
-    pushValue(valueToString(value.asDouble()));
-    break;
-  case stringValue:
-  {
-    // Is NULL possible for value.string_?
-    char const* str;
-    char const* end;
-    bool ok = value.getString(&str, &end);
-    if (ok) pushValue(valueToQuotedStringN(str, static_cast<unsigned>(end-str)));
-    else pushValue("");
-    break;
-  }
-  case booleanValue:
-    pushValue(valueToString(value.asBool()));
-    break;
-  case arrayValue:
-    writeArrayValue(value);
-    break;
-  case objectValue: {
-    Value::Members members(value.getMemberNames());
-    if (members.empty())
-      pushValue("{}");
-    else {
-      writeWithIndent("{");
-      indent();
-      Value::Members::iterator it = members.begin();
-      for (;;) {
-        const std::string& name = *it;
-        const Value& childValue = value[name];
-        writeCommentBeforeValue(childValue);
-        writeWithIndent(valueToQuotedString(name.c_str()));
-        document_ += " : ";
-        writeValue(childValue);
-        if (++it == members.end()) {
-          writeCommentAfterValueOnSameLine(childValue);
-          break;
-        }
-        document_ += ',';
-        writeCommentAfterValueOnSameLine(childValue);
-      }
-      unindent();
-      writeWithIndent("}");
-    }
-  } break;
-  }
-}
-
-void StyledWriter::writeArrayValue(const Value& value) {
-  unsigned size = value.size();
-  if (size == 0)
-    pushValue("[]");
-  else {
-    bool isArrayMultiLine = isMultineArray(value);
-    if (isArrayMultiLine) {
-      writeWithIndent("[");
-      indent();
-      bool hasChildValue = !childValues_.empty();
-      unsigned index = 0;
-      for (;;) {
-        const Value& childValue = value[index];
-        writeCommentBeforeValue(childValue);
-        if (hasChildValue)
-          writeWithIndent(childValues_[index]);
-        else {
-          writeIndent();
-          writeValue(childValue);
-        }
-        if (++index == size) {
-          writeCommentAfterValueOnSameLine(childValue);
-          break;
-        }
-        document_ += ',';
-        writeCommentAfterValueOnSameLine(childValue);
-      }
-      unindent();
-      writeWithIndent("]");
-    } else // output on a single line
-    {
-      assert(childValues_.size() == size);
-      document_ += "[ ";
-      for (unsigned index = 0; index < size; ++index) {
-        if (index > 0)
-          document_ += ", ";
-        document_ += childValues_[index];
-      }
-      document_ += " ]";
-    }
-  }
-}
-
-bool StyledWriter::isMultineArray(const Value& value) {
-  int size = value.size();
-  bool isMultiLine = size * 3 >= rightMargin_;
-  childValues_.clear();
-  for (int index = 0; index < size && !isMultiLine; ++index) {
-    const Value& childValue = value[index];
-    isMultiLine = ((childValue.isArray() || childValue.isObject()) &&
-                        childValue.size() > 0);
-  }
-  if (!isMultiLine) // check if line length > max line length
-  {
-    childValues_.reserve(size);
-    addChildValues_ = true;
-    int lineLength = 4 + (size - 1) * 2; // '[ ' + ', '*n + ' ]'
-    for (int index = 0; index < size; ++index) {
-      if (hasCommentForValue(value[index])) {
-        isMultiLine = true;
-      }
-      writeValue(value[index]);
-      lineLength += int(childValues_[index].length());
-    }
-    addChildValues_ = false;
-    isMultiLine = isMultiLine || lineLength >= rightMargin_;
-  }
-  return isMultiLine;
-}
-
-void StyledWriter::pushValue(const std::string& value) {
-  if (addChildValues_)
-    childValues_.push_back(value);
-  else
-    document_ += value;
-}
-
-void StyledWriter::writeIndent() {
-  if (!document_.empty()) {
-    char last = document_[document_.length() - 1];
-    if (last == ' ') // already indented
-      return;
-    if (last != '\n') // Comments may add new-line
-      document_ += '\n';
-  }
-  document_ += indentString_;
-}
-
-void StyledWriter::writeWithIndent(const std::string& value) {
-  writeIndent();
-  document_ += value;
-}
-
-void StyledWriter::indent() { indentString_ += std::string(indentSize_, ' '); }
-
-void StyledWriter::unindent() {
-  assert(int(indentString_.size()) >= indentSize_);
-  indentString_.resize(indentString_.size() - indentSize_);
-}
-
-void StyledWriter::writeCommentBeforeValue(const Value& root) {
-  if (!root.hasComment(commentBefore))
-    return;
-
-  document_ += "\n";
-  writeIndent();
-  const std::string& comment = root.getComment(commentBefore);
-  std::string::const_iterator iter = comment.begin();
-  while (iter != comment.end()) {
-    document_ += *iter;
-    if (*iter == '\n' &&
-       (iter != comment.end() && *(iter + 1) == '/'))
-      writeIndent();
-    ++iter;
-  }
-
-  // Comments are stripped of trailing newlines, so add one here
-  document_ += "\n";
-}
-
-void StyledWriter::writeCommentAfterValueOnSameLine(const Value& root) {
-  if (root.hasComment(commentAfterOnSameLine))
-    document_ += " " + root.getComment(commentAfterOnSameLine);
-
-  if (root.hasComment(commentAfter)) {
-    document_ += "\n";
-    document_ += root.getComment(commentAfter);
-    document_ += "\n";
-  }
-}
-
-bool StyledWriter::hasCommentForValue(const Value& value) {
-  return value.hasComment(commentBefore) ||
-         value.hasComment(commentAfterOnSameLine) ||
-         value.hasComment(commentAfter);
-}
-
-// Class StyledStreamWriter
-// //////////////////////////////////////////////////////////////////
-
-StyledStreamWriter::StyledStreamWriter(std::string indentation)
-    : document_(NULL), rightMargin_(74), indentation_(indentation),
-      addChildValues_() {}
-
-void StyledStreamWriter::write(std::ostream& out, const Value& root) {
-  document_ = &out;
-  addChildValues_ = false;
-  indentString_ = "";
-  indented_ = true;
-  writeCommentBeforeValue(root);
-  if (!indented_) writeIndent();
-  indented_ = true;
-  writeValue(root);
-  writeCommentAfterValueOnSameLine(root);
-  *document_ << "\n";
-  document_ = NULL; // Forget the stream, for safety.
-}
-
-void StyledStreamWriter::writeValue(const Value& value) {
-  switch (value.type()) {
-  case nullValue:
-    pushValue("null");
-    break;
-  case intValue:
-    pushValue(valueToString(value.asLargestInt()));
-    break;
-  case uintValue:
-    pushValue(valueToString(value.asLargestUInt()));
-    break;
-  case realValue:
-    pushValue(valueToString(value.asDouble()));
-    break;
-  case stringValue:
-  {
-    // Is NULL possible for value.string_?
-    char const* str;
-    char const* end;
-    bool ok = value.getString(&str, &end);
-    if (ok) pushValue(valueToQuotedStringN(str, static_cast<unsigned>(end-str)));
-    else pushValue("");
-    break;
-  }
-  case booleanValue:
-    pushValue(valueToString(value.asBool()));
-    break;
-  case arrayValue:
-    writeArrayValue(value);
-    break;
-  case objectValue: {
-    Value::Members members(value.getMemberNames());
-    if (members.empty())
-      pushValue("{}");
-    else {
-      writeWithIndent("{");
-      indent();
-      Value::Members::iterator it = members.begin();
-      for (;;) {
-        const std::string& name = *it;
-        const Value& childValue = value[name];
-        writeCommentBeforeValue(childValue);
-        writeWithIndent(valueToQuotedString(name.c_str()));
-        *document_ << " : ";
-        writeValue(childValue);
-        if (++it == members.end()) {
-          writeCommentAfterValueOnSameLine(childValue);
-          break;
-        }
-        *document_ << ",";
-        writeCommentAfterValueOnSameLine(childValue);
-      }
-      unindent();
-      writeWithIndent("}");
-    }
-  } break;
-  }
-}
-
-void StyledStreamWriter::writeArrayValue(const Value& value) {
-  unsigned size = value.size();
-  if (size == 0)
-    pushValue("[]");
-  else {
-    bool isArrayMultiLine = isMultineArray(value);
-    if (isArrayMultiLine) {
-      writeWithIndent("[");
-      indent();
-      bool hasChildValue = !childValues_.empty();
-      unsigned index = 0;
-      for (;;) {
-        const Value& childValue = value[index];
-        writeCommentBeforeValue(childValue);
-        if (hasChildValue)
-          writeWithIndent(childValues_[index]);
-        else {
-          if (!indented_) writeIndent();
-          indented_ = true;
-          writeValue(childValue);
-          indented_ = false;
-        }
-        if (++index == size) {
-          writeCommentAfterValueOnSameLine(childValue);
-          break;
-        }
-        *document_ << ",";
-        writeCommentAfterValueOnSameLine(childValue);
-      }
-      unindent();
-      writeWithIndent("]");
-    } else // output on a single line
-    {
-      assert(childValues_.size() == size);
-      *document_ << "[ ";
-      for (unsigned index = 0; index < size; ++index) {
-        if (index > 0)
-          *document_ << ", ";
-        *document_ << childValues_[index];
-      }
-      *document_ << " ]";
-    }
-  }
-}
-
-bool StyledStreamWriter::isMultineArray(const Value& value) {
-  int size = value.size();
-  bool isMultiLine = size * 3 >= rightMargin_;
-  childValues_.clear();
-  for (int index = 0; index < size && !isMultiLine; ++index) {
-    const Value& childValue = value[index];
-    isMultiLine = ((childValue.isArray() || childValue.isObject()) &&
-                        childValue.size() > 0);
-  }
-  if (!isMultiLine) // check if line length > max line length
-  {
-    childValues_.reserve(size);
-    addChildValues_ = true;
-    int lineLength = 4 + (size - 1) * 2; // '[ ' + ', '*n + ' ]'
-    for (int index = 0; index < size; ++index) {
-      if (hasCommentForValue(value[index])) {
-        isMultiLine = true;
-      }
-      writeValue(value[index]);
-      lineLength += int(childValues_[index].length());
-    }
-    addChildValues_ = false;
-    isMultiLine = isMultiLine || lineLength >= rightMargin_;
-  }
-  return isMultiLine;
-}
-
-void StyledStreamWriter::pushValue(const std::string& value) {
-  if (addChildValues_)
-    childValues_.push_back(value);
-  else
-    *document_ << value;
-}
-
-void StyledStreamWriter::writeIndent() {
-  // blep intended this to look at the so-far-written string
-  // to determine whether we are already indented, but
-  // with a stream we cannot do that. So we rely on some saved state.
-  // The caller checks indented_.
-  *document_ << '\n' << indentString_;
-}
-
-void StyledStreamWriter::writeWithIndent(const std::string& value) {
-  if (!indented_) writeIndent();
-  *document_ << value;
-  indented_ = false;
-}
-
-void StyledStreamWriter::indent() { indentString_ += indentation_; }
-
-void StyledStreamWriter::unindent() {
-  assert(indentString_.size() >= indentation_.size());
-  indentString_.resize(indentString_.size() - indentation_.size());
-}
-
-void StyledStreamWriter::writeCommentBeforeValue(const Value& root) {
-  if (!root.hasComment(commentBefore))
-    return;
-
-  if (!indented_) writeIndent();
-  const std::string& comment = root.getComment(commentBefore);
-  std::string::const_iterator iter = comment.begin();
-  while (iter != comment.end()) {
-    *document_ << *iter;
-    if (*iter == '\n' &&
-       (iter != comment.end() && *(iter + 1) == '/'))
-      // writeIndent();  // would include newline
-      *document_ << indentString_;
-    ++iter;
-  }
-  indented_ = false;
-}
-
-void StyledStreamWriter::writeCommentAfterValueOnSameLine(const Value& root) {
-  if (root.hasComment(commentAfterOnSameLine))
-    *document_ << ' ' << root.getComment(commentAfterOnSameLine);
-
-  if (root.hasComment(commentAfter)) {
-    writeIndent();
-    *document_ << root.getComment(commentAfter);
-  }
-  indented_ = false;
-}
-
-bool StyledStreamWriter::hasCommentForValue(const Value& value) {
-  return value.hasComment(commentBefore) ||
-         value.hasComment(commentAfterOnSameLine) ||
-         value.hasComment(commentAfter);
-}
-
-//////////////////////////
-// BuiltStyledStreamWriter
-
-/// Scoped enums are not available until C++11.
-struct CommentStyle {
-  /// Decide whether to write comments.
-  enum Enum {
-    None,  ///< Drop all comments.
-    Most,  ///< Recover odd behavior of previous versions (not implemented yet).
-    All  ///< Keep all comments.
-  };
-};
-
-struct BuiltStyledStreamWriter : public StreamWriter
-{
-  BuiltStyledStreamWriter(
-      std::string const& indentation,
-      CommentStyle::Enum cs,
-      std::string const& colonSymbol,
-      std::string const& nullSymbol,
-      std::string const& endingLineFeedSymbol,
-      bool useSpecialFloats,
-      unsigned int precision);
-  int write(Value const& root, std::ostream* sout) override;
-private:
-  void writeValue(Value const& value);
-  void writeArrayValue(Value const& value);
-  bool isMultineArray(Value const& value);
-  void pushValue(std::string const& value);
-  void writeIndent();
-  void writeWithIndent(std::string const& value);
-  void indent();
-  void unindent();
-  void writeCommentBeforeValue(Value const& root);
-  void writeCommentAfterValueOnSameLine(Value const& root);
-  static bool hasCommentForValue(const Value& value);
-
-  typedef std::vector<std::string> ChildValues;
-
-  ChildValues childValues_;
-  std::string indentString_;
-  int rightMargin_;
-  std::string indentation_;
-  CommentStyle::Enum cs_;
-  std::string colonSymbol_;
-  std::string nullSymbol_;
-  std::string endingLineFeedSymbol_;
-  bool addChildValues_ : 1;
-  bool indented_ : 1;
-  bool useSpecialFloats_ : 1;
-  unsigned int precision_;
-};
-BuiltStyledStreamWriter::BuiltStyledStreamWriter(
-      std::string const& indentation,
-      CommentStyle::Enum cs,
-      std::string const& colonSymbol,
-      std::string const& nullSymbol,
-      std::string const& endingLineFeedSymbol,
-      bool useSpecialFloats,
-      unsigned int precision)
-  : rightMargin_(74)
-  , indentation_(indentation)
-  , cs_(cs)
-  , colonSymbol_(colonSymbol)
-  , nullSymbol_(nullSymbol)
-  , endingLineFeedSymbol_(endingLineFeedSymbol)
-  , addChildValues_(false)
-  , indented_(false)
-  , useSpecialFloats_(useSpecialFloats)
-  , precision_(precision)
-{
-}
-int BuiltStyledStreamWriter::write(Value const& root, std::ostream* sout)
-{
-  sout_ = sout;
-  addChildValues_ = false;
-  indented_ = true;
-  indentString_ = "";
-  writeCommentBeforeValue(root);
-  if (!indented_) writeIndent();
-  indented_ = true;
-  writeValue(root);
-  writeCommentAfterValueOnSameLine(root);
-  *sout_ << endingLineFeedSymbol_;
-  sout_ = NULL;
-  return 0;
-}
-void BuiltStyledStreamWriter::writeValue(Value const& value) {
-  switch (value.type()) {
-  case nullValue:
-    pushValue(nullSymbol_);
-    break;
-  case intValue:
-    pushValue(valueToString(value.asLargestInt()));
-    break;
-  case uintValue:
-    pushValue(valueToString(value.asLargestUInt()));
-    break;
-  case realValue:
-    pushValue(valueToString(value.asDouble(), useSpecialFloats_, precision_));
-    break;
-  case stringValue:
-  {
-    // Is NULL is possible for value.string_?
-    char const* str;
-    char const* end;
-    bool ok = value.getString(&str, &end);
-    if (ok) pushValue(valueToQuotedStringN(str, static_cast<unsigned>(end-str)));
-    else pushValue("");
-    break;
-  }
-  case booleanValue:
-    pushValue(valueToString(value.asBool()));
-    break;
-  case arrayValue:
-    writeArrayValue(value);
-    break;
-  case objectValue: {
-    Value::Members members(value.getMemberNames());
-    if (members.empty())
-      pushValue("{}");
-    else {
-      writeWithIndent("{");
-      indent();
-      Value::Members::iterator it = members.begin();
-      for (;;) {
-        std::string const& name = *it;
-        Value const& childValue = value[name];
-        writeCommentBeforeValue(childValue);
-        writeWithIndent(valueToQuotedStringN(name.data(), static_cast<unsigned>(name.length())));
-        *sout_ << colonSymbol_;
-        writeValue(childValue);
-        if (++it == members.end()) {
-          writeCommentAfterValueOnSameLine(childValue);
-          break;
-        }
-        *sout_ << ",";
-        writeCommentAfterValueOnSameLine(childValue);
-      }
-      unindent();
-      writeWithIndent("}");
-    }
-  } break;
-  }
-}
-
-void BuiltStyledStreamWriter::writeArrayValue(Value const& value) {
-  unsigned size = value.size();
-  if (size == 0)
-    pushValue("[]");
-  else {
-    bool isMultiLine = (cs_ == CommentStyle::All) || isMultineArray(value);
-    if (isMultiLine) {
-      writeWithIndent("[");
-      indent();
-      bool hasChildValue = !childValues_.empty();
-      unsigned index = 0;
-      for (;;) {
-        Value const& childValue = value[index];
-        writeCommentBeforeValue(childValue);
-        if (hasChildValue)
-          writeWithIndent(childValues_[index]);
-        else {
-          if (!indented_) writeIndent();
-          indented_ = true;
-          writeValue(childValue);
-          indented_ = false;
-        }
-        if (++index == size) {
-          writeCommentAfterValueOnSameLine(childValue);
-          break;
-        }
-        *sout_ << ",";
-        writeCommentAfterValueOnSameLine(childValue);
-      }
-      unindent();
-      writeWithIndent("]");
-    } else // output on a single line
-    {
-      assert(childValues_.size() == size);
-      *sout_ << "[";
-      if (!indentation_.empty()) *sout_ << " ";
-      for (unsigned index = 0; index < size; ++index) {
-        if (index > 0)
-          *sout_ << ", ";
-        *sout_ << childValues_[index];
-      }
-      if (!indentation_.empty()) *sout_ << " ";
-      *sout_ << "]";
-    }
-  }
-}
-
-bool BuiltStyledStreamWriter::isMultineArray(Value const& value) {
-  int size = value.size();
-  bool isMultiLine = size * 3 >= rightMargin_;
-  childValues_.clear();
-  for (int index = 0; index < size && !isMultiLine; ++index) {
-    Value const& childValue = value[index];
-    isMultiLine = ((childValue.isArray() || childValue.isObject()) &&
-                        childValue.size() > 0);
-  }
-  if (!isMultiLine) // check if line length > max line length
-  {
-    childValues_.reserve(size);
-    addChildValues_ = true;
-    int lineLength = 4 + (size - 1) * 2; // '[ ' + ', '*n + ' ]'
-    for (int index = 0; index < size; ++index) {
-      if (hasCommentForValue(value[index])) {
-        isMultiLine = true;
-      }
-      writeValue(value[index]);
-      lineLength += int(childValues_[index].length());
-    }
-    addChildValues_ = false;
-    isMultiLine = isMultiLine || lineLength >= rightMargin_;
-  }
-  return isMultiLine;
-}
-
-void BuiltStyledStreamWriter::pushValue(std::string const& value) {
-  if (addChildValues_)
-    childValues_.push_back(value);
-  else
-    *sout_ << value;
-}
-
-void BuiltStyledStreamWriter::writeIndent() {
-  // blep intended this to look at the so-far-written string
-  // to determine whether we are already indented, but
-  // with a stream we cannot do that. So we rely on some saved state.
-  // The caller checks indented_.
-
-  if (!indentation_.empty()) {
-    // In this case, drop newlines too.
-    *sout_ << '\n' << indentString_;
-  }
-}
-
-void BuiltStyledStreamWriter::writeWithIndent(std::string const& value) {
-  if (!indented_) writeIndent();
-  *sout_ << value;
-  indented_ = false;
-}
-
-void BuiltStyledStreamWriter::indent() { indentString_ += indentation_; }
-
-void BuiltStyledStreamWriter::unindent() {
-  assert(indentString_.size() >= indentation_.size());
-  indentString_.resize(indentString_.size() - indentation_.size());
-}
-
-void BuiltStyledStreamWriter::writeCommentBeforeValue(Value const& root) {
-  if (cs_ == CommentStyle::None) return;
-  if (!root.hasComment(commentBefore))
-    return;
-
-  if (!indented_) writeIndent();
-  const std::string& comment = root.getComment(commentBefore);
-  std::string::const_iterator iter = comment.begin();
-  while (iter != comment.end()) {
-    *sout_ << *iter;
-    if (*iter == '\n' &&
-       (iter != comment.end() && *(iter + 1) == '/'))
-      // writeIndent();  // would write extra newline
-      *sout_ << indentString_;
-    ++iter;
-  }
-  indented_ = false;
-}
-
-void BuiltStyledStreamWriter::writeCommentAfterValueOnSameLine(Value const& root) {
-  if (cs_ == CommentStyle::None) return;
-  if (root.hasComment(commentAfterOnSameLine))
-    *sout_ << " " + root.getComment(commentAfterOnSameLine);
-
-  if (root.hasComment(commentAfter)) {
-    writeIndent();
-    *sout_ << root.getComment(commentAfter);
-  }
-}
-
-// static
-bool BuiltStyledStreamWriter::hasCommentForValue(const Value& value) {
-  return value.hasComment(commentBefore) ||
-         value.hasComment(commentAfterOnSameLine) ||
-         value.hasComment(commentAfter);
-}
-
-///////////////
-// StreamWriter
-
-StreamWriter::StreamWriter()
-    : sout_(NULL)
-{
-}
-StreamWriter::~StreamWriter()
-{
-}
-StreamWriter::Factory::~Factory()
-{}
-StreamWriterBuilder::StreamWriterBuilder()
-{
-  setDefaults(&settings_);
-}
-StreamWriterBuilder::~StreamWriterBuilder()
-{}
-StreamWriter* StreamWriterBuilder::newStreamWriter() const
-{
-  std::string indentation = settings_["indentation"].asString();
-  std::string cs_str = settings_["commentStyle"].asString();
-  bool eyc = settings_["enableYAMLCompatibility"].asBool();
-  bool dnp = settings_["dropNullPlaceholders"].asBool();
-  bool usf = settings_["useSpecialFloats"].asBool();
-  unsigned int pre = settings_["precision"].asUInt();
-  CommentStyle::Enum cs = CommentStyle::All;
-  if (cs_str == "All") {
-    cs = CommentStyle::All;
-  } else if (cs_str == "None") {
-    cs = CommentStyle::None;
-  } else {
-    throwRuntimeError("commentStyle must be 'All' or 'None'");
-  }
-  std::string colonSymbol = " : ";
-  if (eyc) {
-    colonSymbol = ": ";
-  } else if (indentation.empty()) {
-    colonSymbol = ":";
-  }
-  std::string nullSymbol = "null";
-  if (dnp) {
-    nullSymbol = "";
-  }
-  if (pre > 17) pre = 17;
-  std::string endingLineFeedSymbol = "";
-  return new BuiltStyledStreamWriter(
-      indentation, cs,
-      colonSymbol, nullSymbol, endingLineFeedSymbol, usf, pre);
-}
-static void getValidWriterKeys(std::set<std::string>* valid_keys)
-{
-  valid_keys->clear();
-  valid_keys->insert("indentation");
-  valid_keys->insert("commentStyle");
-  valid_keys->insert("enableYAMLCompatibility");
-  valid_keys->insert("dropNullPlaceholders");
-  valid_keys->insert("useSpecialFloats");
-  valid_keys->insert("precision");
-}
-bool StreamWriterBuilder::validate(Json::Value* invalid) const
-{
-  Json::Value my_invalid;
-  if (!invalid) invalid = &my_invalid;  // so we do not need to test for NULL
-  Json::Value& inv = *invalid;
-  std::set<std::string> valid_keys;
-  getValidWriterKeys(&valid_keys);
-  Value::Members keys = settings_.getMemberNames();
-  size_t n = keys.size();
-  for (size_t i = 0; i < n; ++i) {
-    std::string const& key = keys[i];
-    if (valid_keys.find(key) == valid_keys.end()) {
-      inv[key] = settings_[key];
-    }
-  }
-  return 0u == inv.size();
-}
-Value& StreamWriterBuilder::operator[](std::string key)
-{
-  return settings_[key];
-}
-// static
-void StreamWriterBuilder::setDefaults(Json::Value* settings)
-{
-  //! [StreamWriterBuilderDefaults]
-  (*settings)["commentStyle"] = "All";
-  (*settings)["indentation"] = "\t";
-  (*settings)["enableYAMLCompatibility"] = false;
-  (*settings)["dropNullPlaceholders"] = false;
-  (*settings)["useSpecialFloats"] = false;
-  (*settings)["precision"] = 17;
-  //! [StreamWriterBuilderDefaults]
-}
-
-std::string writeString(StreamWriter::Factory const& builder, Value const& root) {
-  std::ostringstream sout;
-  StreamWriterPtr const writer(builder.newStreamWriter());
-  writer->write(root, &sout);
-  return sout.str();
-}
-
-std::ostream& operator<<(std::ostream& sout, Value const& root) {
-  StreamWriterBuilder builder;
-  StreamWriterPtr const writer(builder.newStreamWriter());
-  writer->write(root, &sout);
-  return sout;
-}
-
-} // namespace Json
-
-// //////////////////////////////////////////////////////////////////////
-// End of content of file: src/lib_json/json_writer.cpp
-// //////////////////////////////////////////////////////////////////////
-
-
-
-
-
diff --git a/libs/protobuf/conformance/update_failure_list.py b/libs/protobuf/conformance/update_failure_list.py
deleted file mode 100755
index ad42ed3..0000000
--- a/libs/protobuf/conformance/update_failure_list.py
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/usr/bin/env python
-# Protocol Buffers - Google's data interchange format
-# Copyright 2008 Google Inc.  All rights reserved.
-# https://developers.google.com/protocol-buffers/
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-"""Script to update a failure list file to add/remove failures.
-
-This is sort of like comm(1), except it recognizes comments and ignores them.
-"""
-
-import argparse
-
-parser = argparse.ArgumentParser(
-    description='Adds/removes failures from the failure list.')
-parser.add_argument('filename', type=str, help='failure list file to update')
-parser.add_argument('--add', dest='add_list', action='append')
-parser.add_argument('--remove', dest='remove_list', action='append')
-
-args = parser.parse_args()
-
-add_set = set()
-remove_set = set()
-
-for add_file in (args.add_list or []):
-  with open(add_file) as f:
-    for line in f:
-      add_set.add(line)
-
-for remove_file in (args.remove_list or []):
-  with open(remove_file) as f:
-    for line in f:
-      if line in add_set:
-        raise Exception("Asked to both add and remove test: " + line)
-      remove_set.add(line.strip())
-
-add_list = sorted(add_set, reverse=True)
-
-with open(args.filename) as in_file:
-    existing_list = in_file.read()
-
-with open(args.filename, "w") as f:
-  for line in existing_list.splitlines(True):
-    test = line.split("#")[0].strip()
-    while len(add_list) > 0 and test > add_list[-1]:
-      f.write(add_list.pop())
-    if test not in remove_set:
-      f.write(line)
diff --git a/libs/protobuf/csharp/.editorconfig b/libs/protobuf/csharp/.editorconfig
deleted file mode 100644
index 5e2afd0..0000000
--- a/libs/protobuf/csharp/.editorconfig
+++ /dev/null
@@ -1,17 +0,0 @@
-# Remove the line below if you want to inherit .editorconfig settings from higher directories
-root = true
-
-# C# files
-[*.cs]
-
-#### Core EditorConfig Options ####
-
-# Indentation and spacing
-indent_size = 4
-indent_style = space
-tab_width = 4
-
-# New line preferences
-end_of_line = lf
-insert_final_newline = false
-trim_trailing_whitespace = true
\ No newline at end of file
diff --git a/libs/protobuf/csharp/.gitignore b/libs/protobuf/csharp/.gitignore
deleted file mode 100644
index d0d7ae0..0000000
--- a/libs/protobuf/csharp/.gitignore
+++ /dev/null
@@ -1,34 +0,0 @@
-# Output
-bin
-obj
-project.lock.json
-TestResult.xml
-
-# Possibly legacy now?
-mono/bin
-mono/tmp
-mono/protoc
-build_output
-build_temp
-build/msbuild*.log
-lib/Microsoft.Silverlight.Testing
-lib/NUnit
-
-#
-# 	Untracked files
-#
-.vs
-*.user
-*.suo
-*.nupkg
-_ReSharper.*
-*.sln.cache
-mono/TestResult.xml
-mono/.libs
-mono/*.exe
-mono/*.dll
-lib/protoc.exe
-*.ncrunch*
-
-# Benchmark output
-BenchmarkDotNet.Artifacts/
diff --git a/libs/protobuf/csharp/BUILD.bazel b/libs/protobuf/csharp/BUILD.bazel
deleted file mode 100644
index 2c15084..0000000
--- a/libs/protobuf/csharp/BUILD.bazel
+++ /dev/null
@@ -1,34 +0,0 @@
-# Protobuf C# runtime
-#
-# See also code generation logic under /src/google/protobuf/compiler/csharp.
-
-load("@rules_pkg//:mappings.bzl", "pkg_files", "strip_prefix")
-
-pkg_files(
-    name = "dist_files",
-    srcs = glob([
-        "keys/*",
-        "protos/*",
-        "src/**/*.cs*",  # .cs and .csproj
-    ]) + [
-        ".editorconfig",
-        ".gitignore",
-        "BUILD.bazel",
-        "CHANGES.txt",
-        "Google.Protobuf.Tools.nuspec",
-        "Google.Protobuf.Tools.targets",
-        "NuGet.Config",
-        "README.md",
-        "build_packages.bat",
-        "build_tools.sh",
-        "buildall.bat",
-        "buildall.sh",
-        "generate_protos.sh",
-        "install_dotnet_sdk.ps1",
-        "src/Google.Protobuf.Benchmarks/wrapper_benchmark_messages.proto",
-        "src/Google.Protobuf.Test/testprotos.pb",
-        "src/Google.Protobuf.sln",
-    ],
-    strip_prefix = strip_prefix.from_root(""),
-    visibility = ["//pkg:__pkg__"],
-)
diff --git a/libs/protobuf/csharp/CHANGES.txt b/libs/protobuf/csharp/CHANGES.txt
deleted file mode 100644
index 8574b7c..0000000
--- a/libs/protobuf/csharp/CHANGES.txt
+++ /dev/null
@@ -1,148 +0,0 @@
-===============================================================================
-Welcome to the C# port of Google Protocol Buffers, written by Jon Skeet
-(skeet@pobox.com) based on the work of many talented people.
-
-===============================================================================
-RELEASE NOTES - Code imported into Google's main protobuf repository
-===============================================================================
-
-Everything below note this represents history of protobuf-csharp-port project
-before the code was merged into csharp/ subtree of GitHub google/protobuf
-repository.
-Frozen legacy version of the original project is available in
-https://github.com/jskeet/protobuf-csharp-port.
-
-===============================================================================
-RELEASE NOTES - Version 2.4.1.555
-===============================================================================
-
-Changes:
-- Upgrade solution format to Visual Studio 2012.
-- Add the ability to print a builder (not just a message)
-- TextGenerator introduces a new overload of PrintTo
-- Munge protoc's error format into a VS-C#-compatible output format.
-- Work to make ProtoGen clone that acts as a protoc.exe plugin.
-- Added the AllowPartiallyTrustedCallers attribute
-- Optimized enum parsing.
-
-Fixes:
-- Fix for bug in limited input stream's Position, Introduced Position on
-  output stream
-- Fix for writing a character to a JSON output overflows allocated buffer
-- Optimize FromBase64String to return Empty when presented with empty string.
-- Use string.Concat instead of operator to avoid potential import problems
-- Issue 81: quoting for NUnit parameters.
-- Issue 56: NuGet package is noisy
-- Issue 70: Portable library project has some invalid Nunit-based code.
-- Issue 71: CodedInputStream.ReadBytes go to slow path unnecessarily
-- Issue 84: warning CS0219: The variable `size' is assigned but never used
-
-===============================================================================
-RELEASE NOTES - Version 2.4.1.521
-===============================================================================
-
-Changes:
-- Add generated_code_attributes option, defaulted to false
-- Added support for Portable library
-- Added 'Unsafe' static type in ByteString to allow direct buffer access
-
-Fixes:
-- Issue 50: The XML serializer will fail to deserialize a message with empty
-  child message
-- Issue 45: Use of 'item' as a field name causes AmbiguousMatchException
-- Issue 49: Generated nested static Types class should be partial
-- Issue 38: Disable CLSCompliant warnings (3021)
-- Issue 40: proto_path does not work for command-line file names
-- Issue 54: should retire all bytes in buffer (bufferSize)
-- Issue 43: Fix to correct identical 'umbrella_classname' options from trying
-  to write to the same filename.
-
-===============================================================================
-RELEASE NOTES - Version 2.4.1.473
-===============================================================================
-
-Features:
-- Added option service_generator_type to control service generation with
-  NONE, GENERIC, INTERFACE, or IRPCDISPATCH
-- Added interfaces IRpcDispatch and IRpcServerStub to provide for blocking
-  services and implementations.
-- Added ProtoGen.exe command-line argument "--protoc_dir=" to specify the
-  location of protoc.exe.
-- Extracted interfaces for ICodedInputStream and ICodedOutputStream to allow
-  custom implementation of writers with both speed and size optimizations.
-- Addition of the "Google.ProtoBuffers.Serialization" assembly to support
-  reading and writing messages to/from XML, JSON, IDictionary<,> and others.
-- Several performance related fixes and tweeks
-- Issue 3:	Add option to mark generated code with attribute
-- Issue 20:	Support for decorating classes [Serializable]
-- Issue 21:	Decorate fields with [deprecated=true] as [System.Obsolete]
-- Issue 22:	Reusable Builder classes
-- Issue 24:	Support for using Json/Xml formats with ICodedInputStream
-- Issue 25: Added support for NuGet packages
-- Issue 31: Upgraded protoc.exe and descriptor to 2.4.1
-
-Fixes:
-- Issue 13:	Message with Field same name as message causes uncompilable .cs
-- Issue 16:	Does not integrate well with other tooling
-- Issue 19:	Support for negative enum values
-- Issue 26:	AddRange in GeneratedBuilder iterates twice.
-- Issue 27:	Remove XML documentation output from test projects to clear
-  warnings/errors.
-- Issue 28: Circular message dependencies result in null default values for
-  Message fields.
-- Issue 29: Message classes generated have a public default constructor.  You
-  can disable private ctor generation with the option generate_private_ctor.
-- Issue 35: Fixed a bug in ProtoGen handling of arguments with trailing \
-- Big-endian support for float, and double on Silverlight
-- Packed and Unpacked parsing allow for all repeated, as per version 2.3
-- Fix for leaving Builder a public ctor on internal classes for use with
-  generic "where T: new()" constraints.
-
-Other:
-- Changed the code signing key to a privately held key
-- Reformatted all code and line-endings to C# defaults
-- Reworking of performance benchmarks to produce reliable results, option /v2
-- Issue 34: Silverlight assemblies are now unit tested
-
-===============================================================================
-RELEASE NOTES - Version 2.3.0.277
-===============================================================================
-
-Features:
-- Added cls_compliance option to generate attributes indicating
-  non-CLS-compliance.
-- Added file_extension option to control the generated output file's extension.
-- Added umbrella_namespace option to place the umbrella class into a nested
-  namespace to address issues with proto files having the same name as a
-  message it contains.
-- Added output_directory option to set the output path for the source file(s).
-- Added ignore_google_protobuf option to avoid generating code for includes
-  from the google.protobuf package.
-- Added the LITE framework (Google.ProtoBuffersLite.dll) and the ability to
-  generate code with "option optimize_for = LITE_RUNTIME;".
-- Added ability to invoke protoc.exe from within ProtoGen.exe.
-- Upgraded to protoc.exe (2.3) compiler.
-
-Fixes:
-- Issue 9:	Class cannot be static and sealed error
-- Issue 12:	default value for enumerate fields must be filled out
-
-Other:
-- Rewrite of build using MSbuild instead of NAnt
-- Moved to NUnit Version 2.2.8.0
-- Changed to using secure .snk for releases
-
-===============================================================================
-RELEASE NOTES - Version 0.9.1
-===============================================================================
-
-Fixes:
-- issue 10:	Incorrect encoding of packed fields when serialized
-
-===============================================================================
-RELEASE NOTES - Version 0.9.0
-===============================================================================
-
-- Initial release
-
-===============================================================================
\ No newline at end of file
diff --git a/libs/protobuf/csharp/Google.Protobuf.Tools.nuspec b/libs/protobuf/csharp/Google.Protobuf.Tools.nuspec
deleted file mode 100644
index d74008a..0000000
--- a/libs/protobuf/csharp/Google.Protobuf.Tools.nuspec
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<package>
-  <metadata>
-    <id>Google.Protobuf.Tools</id>
-    <title>Google Protocol Buffers tools</title>
-    <summary>Tools for Protocol Buffers - Google's data interchange format.</summary>
-    <description>See project site for more info.</description>
-    <version>3.21.12</version>
-    <authors>Google Inc.</authors>
-    <owners>protobuf-packages</owners>
-    <licenseUrl>https://github.com/protocolbuffers/protobuf/blob/main/LICENSE</licenseUrl>
-    <projectUrl>https://github.com/protocolbuffers/protobuf</projectUrl>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <releaseNotes>Tools for Protocol Buffers</releaseNotes>
-    <copyright>Copyright 2015, Google Inc.</copyright>
-    <tags>Protocol Buffers Binary Serialization Format Google proto proto3</tags>
-  </metadata>
-  <files>
-    <file src="protoc\windows_x86\protoc.exe" target="tools\windows_x86\protoc.exe"/>
-    <file src="protoc\windows_x64\protoc.exe" target="tools\windows_x64\protoc.exe"/>
-    <file src="protoc\linux_x86\protoc" target="tools\linux_x86\protoc"/>
-    <file src="protoc\linux_x64\protoc" target="tools\linux_x64\protoc"/>
-    <file src="protoc\macosx_x64\protoc" target="tools\macosx_x64\protoc"/>
-    <file src="..\src\google\protobuf\any.proto" target="tools\google\protobuf"/>
-    <file src="..\src\google\protobuf\api.proto" target="tools\google\protobuf"/>
-    <file src="..\src\google\protobuf\descriptor.proto" target="tools\google\protobuf"/>
-    <file src="..\src\google\protobuf\duration.proto" target="tools\google\protobuf"/>
-    <file src="..\src\google\protobuf\empty.proto" target="tools\google\protobuf"/>
-    <file src="..\src\google\protobuf\field_mask.proto" target="tools\google\protobuf"/>
-    <file src="..\src\google\protobuf\source_context.proto" target="tools\google\protobuf"/>
-    <file src="..\src\google\protobuf\struct.proto" target="tools\google\protobuf"/>
-    <file src="..\src\google\protobuf\timestamp.proto" target="tools\google\protobuf"/>
-    <file src="..\src\google\protobuf\type.proto" target="tools\google\protobuf"/>
-    <file src="..\src\google\protobuf\wrappers.proto" target="tools\google\protobuf"/>
-    <file src="Google.Protobuf.Tools.targets" target="buildCrossTargeting"/>
-    <file src="Google.Protobuf.Tools.targets" target="build"/>
-  </files>
-</package>
diff --git a/libs/protobuf/csharp/Google.Protobuf.Tools.targets b/libs/protobuf/csharp/Google.Protobuf.Tools.targets
deleted file mode 100644
index 682e11b..0000000
--- a/libs/protobuf/csharp/Google.Protobuf.Tools.targets
+++ /dev/null
@@ -1,11 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-    <PropertyGroup>
-        <protoc_tools>$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)/../tools/'))</protoc_tools>
-        <protoc_linux64>$([System.IO.Path]::GetFullPath('$(protoc_tools)/linux_x64/protoc'))</protoc_linux64>
-        <protoc_linux86>$([System.IO.Path]::GetFullPath('$(protoc_tools)/linux_x86/protoc'))</protoc_linux86>
-        <protoc_macosx64>$([System.IO.Path]::GetFullPath('$(protoc_tools)/macosx_x64/protoc'))</protoc_macosx64>
-        <protoc_macosx86>$([System.IO.Path]::GetFullPath('$(protoc_tools)/macosx_x86/protoc'))</protoc_macosx86>
-        <protoc_windows64>$([System.IO.Path]::GetFullPath('$(protoc_tools)/windows_x64/protoc.exe'))</protoc_windows64>
-        <protoc_windows86>$([System.IO.Path]::GetFullPath('$(protoc_tools)/windows_x86/protoc.exe'))</protoc_windows86>
-    </PropertyGroup>
-</Project>
diff --git a/libs/protobuf/csharp/NuGet.Config b/libs/protobuf/csharp/NuGet.Config
deleted file mode 100644
index b04b006..0000000
--- a/libs/protobuf/csharp/NuGet.Config
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <packageSources>
-    <!--To inherit the global NuGet package sources remove the <clear/> line below -->
-    <clear />
-    <add key="NuGet.org (v3)" value="https://api.nuget.org/v3/index.json" />
-  </packageSources>
-</configuration>
\ No newline at end of file
diff --git a/libs/protobuf/csharp/README.md b/libs/protobuf/csharp/README.md
deleted file mode 100644
index 9aab782..0000000
--- a/libs/protobuf/csharp/README.md
+++ /dev/null
@@ -1,96 +0,0 @@
-This directory contains the C# Protocol Buffers runtime library.
-
-Usage
-=====
-
-The easiest way how to use C# protobufs is via the `Google.Protobuf`
-NuGet package. Just add the NuGet package to your VS project.
-
-You will also want to install the `Google.Protobuf.Tools` NuGet package, which
-contains precompiled version of `protoc.exe` and a copy of well known `.proto`
-files under the package's `tools` directory.
-
-To generate C# files from your `.proto` files, invoke `protoc` with the
-`--csharp_out` option.
-
-Supported platforms
-===================
-
-The runtime library is built as a portable class library, supporting:
-
-- .NET 4.5
-- Windows 8
-- Windows Phone Silverlight 8
-- Windows Phone 8.1
-- .NET Core
-
-You should be able to use Protocol Buffers in Visual Studio 2012 and
-all later versions. This includes all code generated by `protoc`,
-which only uses features from C# 3 and earlier.
-
-Building
-========
-
-Open the `src/Google.Protobuf.sln` solution in Visual Studio 2017 or
-later.
-
-Although *users* of this project are only expected to have Visual
-Studio 2012 or later, *developers* of the library are required to
-have Visual Studio 2017 or later, as the library uses C# 6 features
-in its implementation, as well as the new Visual Studio 2017 csproj
-format. These features have no impact when using the compiled code -
-they're only relevant when building the `Google.Protobuf` assembly.
-
-In order to run and debug the AddressBook example in the IDE, you must
-install the optional component, ".Net Core 1.0 - 1.1 development tools
-for Web" (as it's labelled in current versions of the VS2017
-installer), above and beyond the main .NET Core cross-platform
-development feature.
-
-Testing
-=======
-
-The unit tests use [NUnit 3](https://github.com/nunit/nunit). Tests can be
-run using the Visual Studio Test Explorer or `dotnet test`.
-
-.NET 3.5
-========
-
-We don't officially support .NET 3.5. However, there has been some effort
-to make enabling .NET 3.5 support relatively painless in case you require it.
-There's no guarantee that this will continue in the future, so rely on .NET
-3.5 support at your peril.
-
-To enable .NET 3.5 support, you must edit the `TargetFrameworks` elements of
-[src/Google.Protobuf/Google.Protobuf.csproj](src/Google.Protobuf/Google.Protobuf.csproj)
-(and [src/Google.Protobuf.Test/Google.Protobuf.Test.csproj](src/Google.Protobuf.Test/Google.Protobuf.Test.csproj)
-if you want to run the unit tests):
-
-Open the .csproj file in a text editor and simply add `net35` to the list of
-target frameworks, noting that the `TargetFrameworks` element appears twice in
-the file (once in the first `PropertyGroup` element, and again in the second
-`PropertyGroup` element, i.e., the one with the conditional).
-
-History of C# protobufs
-=======================
-
-This subtree was originally imported from https://github.com/jskeet/protobuf-csharp-port
-and represents the latest development version of C# protobufs, that will now be developed
-and maintained by Google. All the development will be done in open, under this repository
-(https://github.com/protocolbuffers/protobuf).
-
-The previous project differs from this project in a number of ways:
-
-- The old code only supported proto2; the new code only supports
-proto3 (so no unknown fields, no required/optional distinction, no
-extensions)
-- The old code was based on immutable message types and builders for
-them
-- The old code did not support maps or `oneof`
-- The old code had its own JSON representation, whereas the new code
-uses the standard protobuf JSON representation
-- The old code had no notion of the "well-known types" which have
-special support in the new code
-- The old project supported some older platforms (such as older
-versions of Silverlight) which are not currently supported in the
-new project
diff --git a/libs/protobuf/csharp/build_packages.bat b/libs/protobuf/csharp/build_packages.bat
deleted file mode 100644
index 9e68229..0000000
--- a/libs/protobuf/csharp/build_packages.bat
+++ /dev/null
@@ -1,10 +0,0 @@
-@rem Builds Google.Protobuf NuGet packages
-
-dotnet restore src/Google.Protobuf.sln
-dotnet pack -c Release src/Google.Protobuf.sln -p:ContinuousIntegrationBuild=true || goto :error
-
-goto :EOF
-
-:error
-echo Failed!
-exit /b %errorlevel%
diff --git a/libs/protobuf/csharp/build_tools.sh b/libs/protobuf/csharp/build_tools.sh
deleted file mode 100755
index 771affd..0000000
--- a/libs/protobuf/csharp/build_tools.sh
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/bash
-
-if [ $# -ne 1 ]; then
-  cat <<EOF
-Usage: $0 <VERSION_NUMBER>
-
-Example:
-  $ $0 3.0.0
-
-This script will download pre-built protoc binaries from maven repository and
-create the Google.Protobuf.Tools package. Well-known type .proto files will also
-be included.
-EOF
-  exit 1
-fi
-
-VERSION_NUMBER=$1
-# <directory name> <binary file name> pairs.
-declare -a FILE_NAMES=(          \
-  windows_x86 windows-x86_32.exe \
-  windows_x64 windows-x86_64.exe \
-  macosx_x64  osx-x86_64.exe     \
-  linux_x86   linux-x86_32.exe   \
-  linux_x64   linux-x86_64.exe   \
-)
-
-set -e
-
-mkdir -p protoc
-# Create a zip file for each binary.
-for((i=0;i<${#FILE_NAMES[@]};i+=2));do
-  DIR_NAME=${FILE_NAMES[$i]}
-  mkdir -p protoc/$DIR_NAME
-
-  if [ ${DIR_NAME:0:3} = "win" ]; then
-    TARGET_BINARY="protoc.exe"
-  else
-    TARGET_BINARY="protoc"
-  fi
-
-  BINARY_NAME=${FILE_NAMES[$(($i+1))]}
-  BINARY_URL=http://repo1.maven.org/maven2/com/google/protobuf/protoc/${VERSION_NUMBER}/protoc-${VERSION_NUMBER}-${BINARY_NAME}
-
-  if ! wget ${BINARY_URL} -O protoc/$DIR_NAME/$TARGET_BINARY &> /dev/null; then
-    echo "[ERROR] Failed to download ${BINARY_URL}" >&2
-    echo "[ERROR] Skipped $protoc-${VERSION_NAME}-${DIR_NAME}" >&2
-    continue
-  fi
-done
-
-nuget pack Google.Protobuf.Tools.nuspec
diff --git a/libs/protobuf/csharp/buildall.bat b/libs/protobuf/csharp/buildall.bat
deleted file mode 100644
index 821ffb3..0000000
--- a/libs/protobuf/csharp/buildall.bat
+++ /dev/null
@@ -1,13 +0,0 @@
-@rem Builds Google.Protobuf and runs the tests
-
-dotnet build src/Google.Protobuf.sln || goto :error
-
-echo Running tests.
-
-dotnet test src/Google.Protobuf.Test/Google.Protobuf.Test.csproj || goto :error
-
-goto :EOF
-
-:error
-echo Failed!
-exit /b %errorlevel%
diff --git a/libs/protobuf/csharp/buildall.sh b/libs/protobuf/csharp/buildall.sh
deleted file mode 100755
index ab1a6c4..0000000
--- a/libs/protobuf/csharp/buildall.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-CONFIG=Release
-SRC=$(dirname $0)/src
-
-set -ex
-
-echo Building relevant projects.
-dotnet restore $SRC/Google.Protobuf.sln
-dotnet build -c $CONFIG $SRC/Google.Protobuf.sln
-
-echo Running tests.
-# Only test netcoreapp3.1, which uses the .NET Core runtime.
-# If we want to test the .NET 4.5 version separately, we could
-# run Mono explicitly. However, we don't have any differences between
-# the .NET 4.5 and netstandard2.1 assemblies.
-dotnet test -c $CONFIG -f netcoreapp3.1 $SRC/Google.Protobuf.Test/Google.Protobuf.Test.csproj
diff --git a/libs/protobuf/csharp/compatibility_tests/v3.0.0/protos/csharp/protos/unittest_issues.proto b/libs/protobuf/csharp/compatibility_tests/v3.0.0/protos/csharp/protos/unittest_issues.proto
deleted file mode 100644
index b6178bf..0000000
--- a/libs/protobuf/csharp/compatibility_tests/v3.0.0/protos/csharp/protos/unittest_issues.proto
+++ /dev/null
@@ -1,126 +0,0 @@
-syntax = "proto3";
-
-// These proto descriptors have at one time been reported as an issue or defect.
-// They are kept here to replicate the issue, and continue to verify the fix.
-
-// Issue: Non-"Google.Protobuffers" namespace will ensure that protobuffer library types are qualified
-option csharp_namespace = "UnitTest.Issues.TestProtos";
-
-package unittest_issues;
-option optimize_for = SPEED;
-
-// Issue 307: when generating doubly-nested types, any references
-// should be of the form A.Types.B.Types.C.
-message Issue307 {
-  message NestedOnce {
-    message NestedTwice {
-    }
-  }
-}
-
-// Old issue 13: http://code.google.com/p/protobuf-csharp-port/issues/detail?id=13
-// New issue 309: https://github.com/protocolbuffers/protobuf/issues/309
-
-// message A {
-//    optional int32 _A = 1;
-// }
-
-// message B {
-//    optional int32 B_ = 1;
-// }
-
-//message AB {
-//    optional int32 a_b = 1;
-//}
-
-// Similar issue with numeric names
-// Java code failed too, so probably best for this to be a restriction.
-// See https://github.com/protocolbuffers/protobuf/issues/308
-// message NumberField {
-//    optional int32 _01 = 1;
-// }
-
-// issue 19 - negative enum values
-
-enum NegativeEnum {
-    NEGATIVE_ENUM_ZERO = 0;
-    FiveBelow = -5;
-    MinusOne = -1;
-}
-
-message NegativeEnumMessage {
-    NegativeEnum value = 1;
-    repeated NegativeEnum values = 2 [packed = false];
-    repeated NegativeEnum packed_values = 3 [packed=true];
-}
-
-// Issue 21: http://code.google.com/p/protobuf-csharp-port/issues/detail?id=21
-// Decorate fields with [deprecated=true] as [System.Obsolete]
-
-message DeprecatedChild {
-}
-
-enum DeprecatedEnum {
-    DEPRECATED_ZERO = 0;
-    one = 1;
-}
-
-message DeprecatedFieldsMessage {
-    int32 PrimitiveValue = 1 [deprecated = true];
-    repeated int32 PrimitiveArray = 2 [deprecated = true];
-
-    DeprecatedChild MessageValue = 3 [deprecated = true];
-    repeated DeprecatedChild MessageArray = 4 [deprecated = true];
-
-    DeprecatedEnum EnumValue = 5 [deprecated = true];
-    repeated DeprecatedEnum EnumArray = 6 [deprecated = true];
-}
-
-// Issue 45: http://code.google.com/p/protobuf-csharp-port/issues/detail?id=45
-message ItemField {
-  int32 item = 1;
-}
-
-message ReservedNames {
-  // Force a nested type called Types
-  message SomeNestedType {
-  }
-
-  int32 types = 1;
-  int32 descriptor = 2;
-}
-
-message TestJsonFieldOrdering {
-  // These fields are deliberately not declared in numeric
-  // order, and the oneof fields aren't contiguous either.
-  // This allows for reasonably robust tests of JSON output
-  // ordering.
-  // TestFieldOrderings in unittest_proto3.proto is similar,
-  // but doesn't include oneofs.
-  // TODO: Consider adding oneofs to TestFieldOrderings, although
-  // that will require fixing other tests in multiple platforms.
-  // Alternatively, consider just adding this to
-  // unittest_proto3.proto if multiple platforms want it.
-
-  int32 plain_int32 = 4;
-
-  oneof o1 {
-    string o1_string = 2;
-    int32 o1_int32 = 5;
-  }
-
-  string plain_string = 1;
-
-  oneof o2 {
-    int32 o2_int32 = 6;
-    string o2_string = 3;
-  }
-
-}
-
-message TestJsonName {
-  // Message for testing the effects for of the json_name option
-  string name = 1;
-  string description = 2 [json_name = "desc"];
-  string guid = 3 [json_name = "exid"];
-}
diff --git a/libs/protobuf/csharp/compatibility_tests/v3.0.0/protos/src/google/protobuf/map_unittest_proto3.proto b/libs/protobuf/csharp/compatibility_tests/v3.0.0/protos/src/google/protobuf/map_unittest_proto3.proto
deleted file mode 100644
index 16be277..0000000
--- a/libs/protobuf/csharp/compatibility_tests/v3.0.0/protos/src/google/protobuf/map_unittest_proto3.proto
+++ /dev/null
@@ -1,120 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// This file is mostly equivalent to map_unittest.proto, but imports
-// unittest_proto3.proto instead of unittest.proto, so that it only
-// uses proto3 messages. This makes it suitable for testing
-// implementations which only support proto3.
-// The TestRequiredMessageMap message has been removed as there are no
-// required fields in proto3.
-syntax = "proto3";
-
-option cc_enable_arenas = true;
-option csharp_namespace = "Google.Protobuf.TestProtos";
-
-import "google/protobuf/unittest_proto3.proto";
-
-// We don't put this in a package within proto2 because we need to make sure
-// that the generated code doesn't depend on being in the proto2 namespace.
-// In map_test_util.h we do "using namespace unittest = protobuf_unittest".
-package protobuf_unittest;
-
-// Tests maps.
-message TestMap {
-  map<int32   , int32   > map_int32_int32       = 1;
-  map<int64   , int64   > map_int64_int64       = 2;
-  map<uint32  , uint32  > map_uint32_uint32     = 3;
-  map<uint64  , uint64  > map_uint64_uint64     = 4;
-  map<sint32  , sint32  > map_sint32_sint32     = 5;
-  map<sint64  , sint64  > map_sint64_sint64     = 6;
-  map<fixed32 , fixed32 > map_fixed32_fixed32   = 7;
-  map<fixed64 , fixed64 > map_fixed64_fixed64   = 8;
-  map<sfixed32, sfixed32> map_sfixed32_sfixed32 = 9;
-  map<sfixed64, sfixed64> map_sfixed64_sfixed64 = 10;
-  map<int32   , float   > map_int32_float       = 11;
-  map<int32   , double  > map_int32_double      = 12;
-  map<bool    , bool    > map_bool_bool         = 13;
-  map<string  , string  > map_string_string     = 14;
-  map<int32   , bytes   > map_int32_bytes       = 15;
-  map<int32   , MapEnum > map_int32_enum        = 16;
-  map<int32   , ForeignMessage> map_int32_foreign_message = 17;
-}
-
-message TestMapSubmessage {
-  TestMap test_map = 1;
-}
-
-message TestMessageMap {
-  map<int32, TestAllTypes> map_int32_message = 1;
-}
-
-// Two map fields share the same entry default instance.
-message TestSameTypeMap {
-  map<int32, int32> map1 = 1;
-  map<int32, int32> map2 = 2;
-}
-
-enum MapEnum {
-  MAP_ENUM_FOO = 0;
-  MAP_ENUM_BAR = 1;
-  MAP_ENUM_BAZ = 2;
-}
-
-message TestArenaMap {
-  map<int32   , int32   > map_int32_int32       = 1;
-  map<int64   , int64   > map_int64_int64       = 2;
-  map<uint32  , uint32  > map_uint32_uint32     = 3;
-  map<uint64  , uint64  > map_uint64_uint64     = 4;
-  map<sint32  , sint32  > map_sint32_sint32     = 5;
-  map<sint64  , sint64  > map_sint64_sint64     = 6;
-  map<fixed32 , fixed32 > map_fixed32_fixed32   = 7;
-  map<fixed64 , fixed64 > map_fixed64_fixed64   = 8;
-  map<sfixed32, sfixed32> map_sfixed32_sfixed32 = 9;
-  map<sfixed64, sfixed64> map_sfixed64_sfixed64 = 10;
-  map<int32   , float   > map_int32_float       = 11;
-  map<int32   , double  > map_int32_double      = 12;
-  map<bool    , bool    > map_bool_bool         = 13;
-  map<int32   , MapEnum > map_int32_enum        = 14;
-  map<int32   , ForeignMessage> map_int32_foreign_message = 15;
-}
-
-// Previously, message containing enum called Type cannot be used as value of
-// map field.
-message MessageContainingEnumCalledType {
-  enum Type {
-    TYPE_FOO = 0;
-  }
-  map<int32, MessageContainingEnumCalledType> type = 1;
-}
-
-// Previously, message cannot contain map field called "entry".
-message MessageContainingMapCalledEntry {
-  map<int32, int32> entry = 1;
-}
diff --git a/libs/protobuf/csharp/compatibility_tests/v3.0.0/protos/src/google/protobuf/unittest_import_proto3.proto b/libs/protobuf/csharp/compatibility_tests/v3.0.0/protos/src/google/protobuf/unittest_import_proto3.proto
deleted file mode 100644
index 59673ea..0000000
--- a/libs/protobuf/csharp/compatibility_tests/v3.0.0/protos/src/google/protobuf/unittest_import_proto3.proto
+++ /dev/null
@@ -1,68 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-//
-// A proto file which is imported by unittest_proto3.proto to test importing.
-
-syntax = "proto3";
-
-// We don't put this in a package within proto2 because we need to make sure
-// that the generated code doesn't depend on being in the proto2 namespace.
-// In test_util.h we do
-// "using namespace unittest_import = protobuf_unittest_import".
-package protobuf_unittest_import;
-
-option optimize_for = SPEED;
-option cc_enable_arenas = true;
-
-// Exercise the java_package option.
-option java_package = "com.google.protobuf.test";
-option csharp_namespace = "Google.Protobuf.TestProtos";
-
-// Do not set a java_outer_classname here to verify that Proto2 works without
-// one.
-
-// Test public import
-import public "google/protobuf/unittest_import_public_proto3.proto";
-
-message ImportMessage {
-  int32 d = 1;
-}
-
-enum ImportEnum {
-  IMPORT_ENUM_UNSPECIFIED = 0;
-  IMPORT_FOO = 7;
-  IMPORT_BAR = 8;
-  IMPORT_BAZ = 9;
-}
-
diff --git a/libs/protobuf/csharp/compatibility_tests/v3.0.0/protos/src/google/protobuf/unittest_import_public_proto3.proto b/libs/protobuf/csharp/compatibility_tests/v3.0.0/protos/src/google/protobuf/unittest_import_public_proto3.proto
deleted file mode 100644
index d6f11e2..0000000
--- a/libs/protobuf/csharp/compatibility_tests/v3.0.0/protos/src/google/protobuf/unittest_import_public_proto3.proto
+++ /dev/null
@@ -1,42 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: liujisi@google.com (Pherl Liu)
-
-syntax = "proto3";
-
-package protobuf_unittest_import;
-
-option java_package = "com.google.protobuf.test";
-option csharp_namespace = "Google.Protobuf.TestProtos";
-
-message PublicImportMessage {
- int32 e = 1;
-}
diff --git a/libs/protobuf/csharp/compatibility_tests/v3.0.0/protos/src/google/protobuf/unittest_proto3.proto b/libs/protobuf/csharp/compatibility_tests/v3.0.0/protos/src/google/protobuf/unittest_proto3.proto
deleted file mode 100644
index 6235d3d..0000000
--- a/libs/protobuf/csharp/compatibility_tests/v3.0.0/protos/src/google/protobuf/unittest_proto3.proto
+++ /dev/null
@@ -1,388 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-//
-// A proto file we will use for unit testing.
-
-syntax = "proto3";
-
-// Some generic_services option(s) added automatically.
-// See:  http://go/proto2-generic-services-default
-option cc_generic_services = true;     // auto-added
-option java_generic_services = true;   // auto-added
-option py_generic_services = true;     // auto-added
-option cc_enable_arenas = true;
-option csharp_namespace = "Google.Protobuf.TestProtos";
-
-import "google/protobuf/unittest_import_proto3.proto";
-
-// We don't put this in a package within proto2 because we need to make sure
-// that the generated code doesn't depend on being in the proto2 namespace.
-// In test_util.h we do "using namespace unittest = protobuf_unittest".
-package protobuf_unittest;
-
-// Protos optimized for SPEED use a strict superset of the generated code
-// of equivalent ones optimized for CODE_SIZE, so we should optimize all our
-// tests for speed unless explicitly testing code size optimization.
-option optimize_for = SPEED;
-
-option java_outer_classname = "UnittestProto";
-
-// This proto includes every type of field in both singular and repeated
-// forms.
-message TestAllTypes {
-  message NestedMessage {
-    // The field name "b" fails to compile in proto1 because it conflicts with
-    // a local variable named "b" in one of the generated methods.  Doh.
-    // This file needs to compile in proto1 to test backwards-compatibility.
-    int32 bb = 1;
-  }
-
-  enum NestedEnum {
-    NESTED_ENUM_UNSPECIFIED = 0;
-    FOO = 1;
-    BAR = 2;
-    BAZ = 3;
-    NEG = -1;  // Intentionally negative.
-  }
-
-  // Singular
-  int32 single_int32 = 1;
-  int64 single_int64 = 2;
-  uint32 single_uint32 = 3;
-  uint64 single_uint64 = 4;
-  sint32 single_sint32 = 5;
-  sint64 single_sint64 = 6;
-  fixed32 single_fixed32 = 7;
-  fixed64 single_fixed64 = 8;
-  sfixed32 single_sfixed32 = 9;
-  sfixed64 single_sfixed64 = 10;
-  float single_float = 11;
-  double single_double = 12;
-  bool single_bool = 13;
-  string single_string = 14;
-  bytes single_bytes = 15;
-
-  NestedMessage single_nested_message = 18;
-  ForeignMessage single_foreign_message = 19;
-  protobuf_unittest_import.ImportMessage single_import_message = 20;
-
-  NestedEnum single_nested_enum = 21;
-  ForeignEnum single_foreign_enum = 22;
-  protobuf_unittest_import.ImportEnum single_import_enum = 23;
-
-  // Defined in unittest_import_public.proto
-  protobuf_unittest_import.PublicImportMessage
-      single_public_import_message = 26;
-
-  // Repeated
-  repeated    int32 repeated_int32    = 31;
-  repeated    int64 repeated_int64    = 32;
-  repeated   uint32 repeated_uint32   = 33;
-  repeated   uint64 repeated_uint64   = 34;
-  repeated   sint32 repeated_sint32   = 35;
-  repeated   sint64 repeated_sint64   = 36;
-  repeated  fixed32 repeated_fixed32  = 37;
-  repeated  fixed64 repeated_fixed64  = 38;
-  repeated sfixed32 repeated_sfixed32 = 39;
-  repeated sfixed64 repeated_sfixed64 = 40;
-  repeated    float repeated_float    = 41;
-  repeated   double repeated_double   = 42;
-  repeated     bool repeated_bool     = 43;
-  repeated   string repeated_string   = 44;
-  repeated    bytes repeated_bytes    = 45;
-
-  repeated NestedMessage                        repeated_nested_message  = 48;
-  repeated ForeignMessage                       repeated_foreign_message = 49;
-  repeated protobuf_unittest_import.ImportMessage repeated_import_message  = 50;
-
-  repeated NestedEnum                           repeated_nested_enum     = 51;
-  repeated ForeignEnum                          repeated_foreign_enum    = 52;
-  repeated protobuf_unittest_import.ImportEnum    repeated_import_enum     = 53;
-  // Defined in unittest_import_public.proto
-  repeated protobuf_unittest_import.PublicImportMessage
-      repeated_public_import_message = 54;
-
-  // For oneof test
-  oneof oneof_field {
-    uint32 oneof_uint32 = 111;
-    NestedMessage oneof_nested_message = 112;
-    string oneof_string = 113;
-    bytes oneof_bytes = 114;
-  }
-}
-
-// This proto includes a recursively nested message.
-message NestedTestAllTypes {
-  NestedTestAllTypes child = 1;
-  TestAllTypes payload = 2;
-  repeated NestedTestAllTypes repeated_child = 3;
-}
-
-message TestDeprecatedFields {
-  int32 deprecated_int32 = 1 [deprecated=true];
-}
-
-// Define these after TestAllTypes to make sure the compiler can handle
-// that.
-message ForeignMessage {
-  int32 c = 1;
-}
-
-enum ForeignEnum {
-  FOREIGN_UNSPECIFIED = 0;
-  FOREIGN_FOO = 4;
-  FOREIGN_BAR = 5;
-  FOREIGN_BAZ = 6;
-}
-
-message TestReservedFields {
-  reserved 2, 15, 9 to 11;
-  reserved "bar", "baz";
-}
-
-
-// Test that we can use NestedMessage from outside TestAllTypes.
-message TestForeignNested {
-  TestAllTypes.NestedMessage foreign_nested = 1;
-}
-
-// Test that really large tag numbers don't break anything.
-message TestReallyLargeTagNumber {
-  // The largest possible tag number is 2^28 - 1, since the wire format uses
-  // three bits to communicate wire type.
-  int32 a = 1;
-  int32 bb = 268435455;
-}
-
-message TestRecursiveMessage {
-  TestRecursiveMessage a = 1;
-  int32 i = 2;
-}
-
-// Test that mutual recursion works.
-message TestMutualRecursionA {
-  TestMutualRecursionB bb = 1;
-}
-
-message TestMutualRecursionB {
-  TestMutualRecursionA a = 1;
-  int32 optional_int32 = 2;
-}
-
-
-// Test an enum that has multiple values with the same number.
-enum TestEnumWithDupValue {
-  TEST_ENUM_WITH_DUP_VALUE_UNSPECIFIED = 0;
-  option allow_alias = true;
-
-  FOO1 = 1;
-  BAR1 = 2;
-  BAZ = 3;
-  FOO2 = 1;
-  BAR2 = 2;
-}
-
-// Test an enum with large, unordered values.
-enum TestSparseEnum {
-  TEST_SPARSE_ENUM_UNSPECIFIED = 0;
-  SPARSE_A = 123;
-  SPARSE_B = 62374;
-  SPARSE_C = 12589234;
-  SPARSE_D = -15;
-  SPARSE_E = -53452;
-  // In proto3, value 0 must be the first one specified
-  // SPARSE_F = 0;
-  SPARSE_G = 2;
-}
-
-// Test message with CamelCase field names.  This violates Protocol Buffer
-// standard style.
-message TestCamelCaseFieldNames {
-  int32 PrimitiveField = 1;
-  string StringField = 2;
-  ForeignEnum EnumField = 3;
-  ForeignMessage MessageField = 4;
-
-  repeated int32 RepeatedPrimitiveField = 7;
-  repeated string RepeatedStringField = 8;
-  repeated ForeignEnum RepeatedEnumField = 9;
-  repeated ForeignMessage RepeatedMessageField = 10;
-}
-
-
-// We list fields out of order, to ensure that we're using field number and not
-// field index to determine serialization order.
-message TestFieldOrderings {
-  string my_string = 11;
-  int64 my_int = 1;
-  float my_float = 101;
-  message NestedMessage {
-    int64 oo = 2;
-    // The field name "b" fails to compile in proto1 because it conflicts with
-    // a local variable named "b" in one of the generated methods.  Doh.
-    // This file needs to compile in proto1 to test backwards-compatibility.
-    int32 bb = 1;
-  }
-
-  NestedMessage single_nested_message  = 200;
-}
-
-message SparseEnumMessage {
-  TestSparseEnum sparse_enum = 1;
-}
-
-// Test String and Bytes: string is for valid UTF-8 strings
-message OneString {
-  string data = 1;
-}
-
-message MoreString {
-  repeated string data = 1;
-}
-
-message OneBytes {
-  bytes data = 1;
-}
-
-message MoreBytes {
-  bytes data = 1;
-}
-
-// Test int32, uint32, int64, uint64, and bool are all compatible
-message Int32Message {
-  int32 data = 1;
-}
-
-message Uint32Message {
-  uint32 data = 1;
-}
-
-message Int64Message {
-  int64 data = 1;
-}
-
-message Uint64Message {
-  uint64 data = 1;
-}
-
-message BoolMessage {
-  bool data = 1;
-}
-
-// Test oneofs.
-message TestOneof {
-  oneof foo {
-    int32 foo_int = 1;
-    string foo_string = 2;
-    TestAllTypes foo_message = 3;
-  }
-}
-
-// Test messages for packed fields
-
-message TestPackedTypes {
-  repeated    int32 packed_int32    =  90 [packed = true];
-  repeated    int64 packed_int64    =  91 [packed = true];
-  repeated   uint32 packed_uint32   =  92 [packed = true];
-  repeated   uint64 packed_uint64   =  93 [packed = true];
-  repeated   sint32 packed_sint32   =  94 [packed = true];
-  repeated   sint64 packed_sint64   =  95 [packed = true];
-  repeated  fixed32 packed_fixed32  =  96 [packed = true];
-  repeated  fixed64 packed_fixed64  =  97 [packed = true];
-  repeated sfixed32 packed_sfixed32 =  98 [packed = true];
-  repeated sfixed64 packed_sfixed64 =  99 [packed = true];
-  repeated    float packed_float    = 100 [packed = true];
-  repeated   double packed_double   = 101 [packed = true];
-  repeated     bool packed_bool     = 102 [packed = true];
-  repeated ForeignEnum packed_enum  = 103 [packed = true];
-}
-
-// A message with the same fields as TestPackedTypes, but without packing. Used
-// to test packed <-> unpacked wire compatibility.
-message TestUnpackedTypes {
-  repeated    int32 unpacked_int32    =  90 [packed = false];
-  repeated    int64 unpacked_int64    =  91 [packed = false];
-  repeated   uint32 unpacked_uint32   =  92 [packed = false];
-  repeated   uint64 unpacked_uint64   =  93 [packed = false];
-  repeated   sint32 unpacked_sint32   =  94 [packed = false];
-  repeated   sint64 unpacked_sint64   =  95 [packed = false];
-  repeated  fixed32 unpacked_fixed32  =  96 [packed = false];
-  repeated  fixed64 unpacked_fixed64  =  97 [packed = false];
-  repeated sfixed32 unpacked_sfixed32 =  98 [packed = false];
-  repeated sfixed64 unpacked_sfixed64 =  99 [packed = false];
-  repeated    float unpacked_float    = 100 [packed = false];
-  repeated   double unpacked_double   = 101 [packed = false];
-  repeated     bool unpacked_bool     = 102 [packed = false];
-  repeated ForeignEnum unpacked_enum  = 103 [packed = false];
-}
-
-message TestRepeatedScalarDifferentTagSizes {
-  // Parsing repeated fixed size values used to fail. This message needs to be
-  // used in order to get a tag of the right size; all of the repeated fields
-  // in TestAllTypes didn't trigger the check.
-  repeated fixed32 repeated_fixed32 = 12;
-  // Check for a varint type, just for good measure.
-  repeated int32   repeated_int32   = 13;
-
-  // These have two-byte tags.
-  repeated fixed64 repeated_fixed64 = 2046;
-  repeated int64   repeated_int64   = 2047;
-
-  // Three byte tags.
-  repeated float   repeated_float   = 262142;
-  repeated uint64  repeated_uint64  = 262143;
-}
-
-message TestCommentInjectionMessage {
-  // */ <- This should not close the generated doc comment
-  string a = 1;
-}
-
-
-// Test that RPC services work.
-message FooRequest  {}
-message FooResponse {}
-
-message FooClientMessage {}
-message FooServerMessage{}
-
-service TestService {
-  rpc Foo(FooRequest) returns (FooResponse);
-  rpc Bar(BarRequest) returns (BarResponse);
-}
-
-
-message BarRequest  {}
-message BarResponse {}
-
diff --git a/libs/protobuf/csharp/compatibility_tests/v3.0.0/protos/src/google/protobuf/unittest_well_known_types.proto b/libs/protobuf/csharp/compatibility_tests/v3.0.0/protos/src/google/protobuf/unittest_well_known_types.proto
deleted file mode 100644
index c907524..0000000
--- a/libs/protobuf/csharp/compatibility_tests/v3.0.0/protos/src/google/protobuf/unittest_well_known_types.proto
+++ /dev/null
@@ -1,114 +0,0 @@
-syntax = "proto3";
-
-package protobuf_unittest;
-
-option csharp_namespace = "Google.Protobuf.TestProtos";
-option java_multiple_files = true;
-option java_package = "com.google.protobuf.test";
-
-import "google/protobuf/any.proto";
-import "google/protobuf/api.proto";
-import "google/protobuf/duration.proto";
-import "google/protobuf/empty.proto";
-import "google/protobuf/field_mask.proto";
-import "google/protobuf/source_context.proto";
-import "google/protobuf/struct.proto";
-import "google/protobuf/timestamp.proto";
-import "google/protobuf/type.proto";
-import "google/protobuf/wrappers.proto";
-
-// Test that we can include all well-known types.
-// Each wrapper type is included separately, as languages
-// map handle different wrappers in different ways.
-message TestWellKnownTypes {
-  google.protobuf.Any any_field = 1;
-  google.protobuf.Api api_field = 2;
-  google.protobuf.Duration duration_field = 3;
-  google.protobuf.Empty empty_field = 4;
-  google.protobuf.FieldMask field_mask_field = 5;
-  google.protobuf.SourceContext source_context_field = 6;
-  google.protobuf.Struct struct_field = 7;
-  google.protobuf.Timestamp timestamp_field = 8;
-  google.protobuf.Type type_field = 9;
-  google.protobuf.DoubleValue double_field = 10;
-  google.protobuf.FloatValue float_field = 11;
-  google.protobuf.Int64Value int64_field = 12;
-  google.protobuf.UInt64Value uint64_field = 13;
-  google.protobuf.Int32Value int32_field = 14;
-  google.protobuf.UInt32Value uint32_field = 15;
-  google.protobuf.BoolValue bool_field = 16;
-  google.protobuf.StringValue string_field = 17;
-  google.protobuf.BytesValue bytes_field = 18;
-  // Part of struct, but useful to be able to test separately
-  google.protobuf.Value value_field = 19;
-}
-
-// A repeated field for each well-known type.
-message RepeatedWellKnownTypes {
-  repeated google.protobuf.Any any_field = 1;
-  repeated google.protobuf.Api api_field = 2;
-  repeated google.protobuf.Duration duration_field = 3;
-  repeated google.protobuf.Empty empty_field = 4;
-  repeated google.protobuf.FieldMask field_mask_field = 5;
-  repeated google.protobuf.SourceContext source_context_field = 6;
-  repeated google.protobuf.Struct struct_field = 7;
-  repeated google.protobuf.Timestamp timestamp_field = 8;
-  repeated google.protobuf.Type type_field = 9;
-  // These don't actually make a lot of sense, but they're not prohibited...
-  repeated google.protobuf.DoubleValue double_field = 10;
-  repeated google.protobuf.FloatValue float_field = 11;
-  repeated google.protobuf.Int64Value int64_field = 12;
-  repeated google.protobuf.UInt64Value uint64_field = 13;
-  repeated google.protobuf.Int32Value int32_field = 14;
-  repeated google.protobuf.UInt32Value uint32_field = 15;
-  repeated google.protobuf.BoolValue bool_field = 16;
-  repeated google.protobuf.StringValue string_field = 17;
-  repeated google.protobuf.BytesValue bytes_field = 18;
-}
-
-message OneofWellKnownTypes {
-  oneof oneof_field {
-    google.protobuf.Any any_field = 1;
-    google.protobuf.Api api_field = 2;
-    google.protobuf.Duration duration_field = 3;
-    google.protobuf.Empty empty_field = 4;
-    google.protobuf.FieldMask field_mask_field = 5;
-    google.protobuf.SourceContext source_context_field = 6;
-    google.protobuf.Struct struct_field = 7;
-    google.protobuf.Timestamp timestamp_field = 8;
-    google.protobuf.Type type_field = 9;
-    google.protobuf.DoubleValue double_field = 10;
-    google.protobuf.FloatValue float_field = 11;
-    google.protobuf.Int64Value int64_field = 12;
-    google.protobuf.UInt64Value uint64_field = 13;
-    google.protobuf.Int32Value int32_field = 14;
-    google.protobuf.UInt32Value uint32_field = 15;
-    google.protobuf.BoolValue bool_field = 16;
-    google.protobuf.StringValue string_field = 17;
-    google.protobuf.BytesValue bytes_field = 18;
-  }
-}
-
-// A map field for each well-known type. We only
-// need to worry about the value part of the map being the
-// well-known types, as messages can't be map keys.
-message MapWellKnownTypes {
-  map<int32,google.protobuf.Any> any_field = 1;
-  map<int32,google.protobuf.Api> api_field = 2;
-  map<int32,google.protobuf.Duration> duration_field = 3;
-  map<int32,google.protobuf.Empty> empty_field = 4;
-  map<int32,google.protobuf.FieldMask> field_mask_field = 5;
-  map<int32,google.protobuf.SourceContext> source_context_field = 6;
-  map<int32,google.protobuf.Struct> struct_field = 7;
-  map<int32,google.protobuf.Timestamp> timestamp_field = 8;
-  map<int32,google.protobuf.Type> type_field = 9;
-  map<int32,google.protobuf.DoubleValue> double_field = 10;
-  map<int32,google.protobuf.FloatValue> float_field = 11;
-  map<int32,google.protobuf.Int64Value> int64_field = 12;
-  map<int32,google.protobuf.UInt64Value> uint64_field = 13;
-  map<int32,google.protobuf.Int32Value> int32_field = 14;
-  map<int32,google.protobuf.UInt32Value> uint32_field = 15;
-  map<int32,google.protobuf.BoolValue> bool_field = 16;
-  map<int32,google.protobuf.StringValue> string_field = 17;
-  map<int32,google.protobuf.BytesValue> bytes_field = 18;
-}
diff --git a/libs/protobuf/csharp/compatibility_tests/v3.0.0/src/Google.Protobuf.Test/ByteStringTest.cs b/libs/protobuf/csharp/compatibility_tests/v3.0.0/src/Google.Protobuf.Test/ByteStringTest.cs
deleted file mode 100644
index 8935b78..0000000
--- a/libs/protobuf/csharp/compatibility_tests/v3.0.0/src/Google.Protobuf.Test/ByteStringTest.cs
+++ /dev/null
@@ -1,171 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-using System.Text;
-using NUnit.Framework;
-
-namespace Google.Protobuf
-{
-    public class ByteStringTest
-    {
-        [Test]
-        public void Equality()
-        {
-            ByteString b1 = ByteString.CopyFrom(1, 2, 3);
-            ByteString b2 = ByteString.CopyFrom(1, 2, 3);
-            ByteString b3 = ByteString.CopyFrom(1, 2, 4);
-            ByteString b4 = ByteString.CopyFrom(1, 2, 3, 4);
-            EqualityTester.AssertEquality(b1, b1);
-            EqualityTester.AssertEquality(b1, b2);
-            EqualityTester.AssertInequality(b1, b3);
-            EqualityTester.AssertInequality(b1, b4);
-            EqualityTester.AssertInequality(b1, null);
-#pragma warning disable 1718 // Deliberately calling ==(b1, b1) and !=(b1, b1)
-            Assert.IsTrue(b1 == b1);
-            Assert.IsTrue(b1 == b2);
-            Assert.IsFalse(b1 == b3);
-            Assert.IsFalse(b1 == b4);
-            Assert.IsFalse(b1 == null);
-            Assert.IsTrue((ByteString) null == null);
-            Assert.IsFalse(b1 != b1);
-            Assert.IsFalse(b1 != b2);
-#pragma warning disable 1718
-            Assert.IsTrue(b1 != b3);
-            Assert.IsTrue(b1 != b4);
-            Assert.IsTrue(b1 != null);
-            Assert.IsFalse((ByteString) null != null);
-        }
-
-        [Test]
-        public void EmptyByteStringHasZeroSize()
-        {
-            Assert.AreEqual(0, ByteString.Empty.Length);
-        }
-
-        [Test]
-        public void CopyFromStringWithExplicitEncoding()
-        {
-            ByteString bs = ByteString.CopyFrom("AB", Encoding.Unicode);
-            Assert.AreEqual(4, bs.Length);
-            Assert.AreEqual(65, bs[0]);
-            Assert.AreEqual(0, bs[1]);
-            Assert.AreEqual(66, bs[2]);
-            Assert.AreEqual(0, bs[3]);
-        }
-
-        [Test]
-        public void IsEmptyWhenEmpty()
-        {
-            Assert.IsTrue(ByteString.CopyFromUtf8("").IsEmpty);
-        }
-
-        [Test]
-        public void IsEmptyWhenNotEmpty()
-        {
-            Assert.IsFalse(ByteString.CopyFromUtf8("X").IsEmpty);
-        }
-
-        [Test]
-        public void CopyFromByteArrayCopiesContents()
-        {
-            byte[] data = new byte[1];
-            data[0] = 10;
-            ByteString bs = ByteString.CopyFrom(data);
-            Assert.AreEqual(10, bs[0]);
-            data[0] = 5;
-            Assert.AreEqual(10, bs[0]);
-        }
-
-        [Test]
-        public void ToByteArrayCopiesContents()
-        {
-            ByteString bs = ByteString.CopyFromUtf8("Hello");
-            byte[] data = bs.ToByteArray();
-            Assert.AreEqual((byte)'H', data[0]);
-            Assert.AreEqual((byte)'H', bs[0]);
-            data[0] = 0;
-            Assert.AreEqual(0, data[0]);
-            Assert.AreEqual((byte)'H', bs[0]);
-        }
-
-        [Test]
-        public void CopyFromUtf8UsesUtf8()
-        {
-            ByteString bs = ByteString.CopyFromUtf8("\u20ac");
-            Assert.AreEqual(3, bs.Length);
-            Assert.AreEqual(0xe2, bs[0]);
-            Assert.AreEqual(0x82, bs[1]);
-            Assert.AreEqual(0xac, bs[2]);
-        }
-
-        [Test]
-        public void CopyFromPortion()
-        {
-            byte[] data = new byte[] {0, 1, 2, 3, 4, 5, 6};
-            ByteString bs = ByteString.CopyFrom(data, 2, 3);
-            Assert.AreEqual(3, bs.Length);
-            Assert.AreEqual(2, bs[0]);
-            Assert.AreEqual(3, bs[1]);
-        }
-
-        [Test]
-        public void ToStringUtf8()
-        {
-            ByteString bs = ByteString.CopyFromUtf8("\u20ac");
-            Assert.AreEqual("\u20ac", bs.ToStringUtf8());
-        }
-
-        [Test]
-        public void ToStringWithExplicitEncoding()
-        {
-            ByteString bs = ByteString.CopyFrom("\u20ac", Encoding.Unicode);
-            Assert.AreEqual("\u20ac", bs.ToString(Encoding.Unicode));
-        }
-
-        [Test]
-        public void FromBase64_WithText()
-        {
-            byte[] data = new byte[] {0, 1, 2, 3, 4, 5, 6};
-            string base64 = Convert.ToBase64String(data);
-            ByteString bs = ByteString.FromBase64(base64);
-            Assert.AreEqual(data, bs.ToByteArray());
-        }
-
-        [Test]
-        public void FromBase64_Empty()
-        {
-            // Optimization which also fixes issue 61.
-            Assert.AreSame(ByteString.Empty, ByteString.FromBase64(""));
-        }
-    }
-}
\ No newline at end of file
diff --git a/libs/protobuf/csharp/compatibility_tests/v3.0.0/src/Google.Protobuf.Test/CodedInputStreamExtensions.cs b/libs/protobuf/csharp/compatibility_tests/v3.0.0/src/Google.Protobuf.Test/CodedInputStreamExtensions.cs
deleted file mode 100644
index 23af288..0000000
--- a/libs/protobuf/csharp/compatibility_tests/v3.0.0/src/Google.Protobuf.Test/CodedInputStreamExtensions.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using NUnit.Framework;
-
-namespace Google.Protobuf
-{
-    internal static class CodedInputStreamExtensions
-    {
-        public static void AssertNextTag(this CodedInputStream input, uint expectedTag)
-        {
-            uint tag = input.ReadTag();
-            Assert.AreEqual(expectedTag, tag);
-        }
-
-        public static T ReadMessage<T>(this CodedInputStream stream, MessageParser<T> parser)
-            where T : IMessage<T>
-        {
-            var message = parser.CreateTemplate();
-            stream.ReadMessage(message);
-            return message;
-        }
-    }
-}
diff --git a/libs/protobuf/csharp/compatibility_tests/v3.0.0/src/Google.Protobuf.Test/CodedInputStreamTest.cs b/libs/protobuf/csharp/compatibility_tests/v3.0.0/src/Google.Protobuf.Test/CodedInputStreamTest.cs
deleted file mode 100644
index 5ac8c71..0000000
--- a/libs/protobuf/csharp/compatibility_tests/v3.0.0/src/Google.Protobuf.Test/CodedInputStreamTest.cs
+++ /dev/null
@@ -1,598 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-using System.IO;
-using Google.Protobuf.TestProtos;
-using NUnit.Framework;
-
-namespace Google.Protobuf
-{
-    public class CodedInputStreamTest
-    {
-        /// <summary>
-        /// Helper to construct a byte array from a bunch of bytes.  The inputs are
-        /// actually ints so that I can use hex notation and not get stupid errors
-        /// about precision.
-        /// </summary>
-        private static byte[] Bytes(params int[] bytesAsInts)
-        {
-            byte[] bytes = new byte[bytesAsInts.Length];
-            for (int i = 0; i < bytesAsInts.Length; i++)
-            {
-                bytes[i] = (byte) bytesAsInts[i];
-            }
-            return bytes;
-        }
-
-        /// <summary>
-        /// Parses the given bytes using ReadRawVarint32() and ReadRawVarint64()
-        /// </summary>
-        private static void AssertReadVarint(byte[] data, ulong value)
-        {
-            CodedInputStream input = new CodedInputStream(data);
-            Assert.AreEqual((uint) value, input.ReadRawVarint32());
-
-            input = new CodedInputStream(data);
-            Assert.AreEqual(value, input.ReadRawVarint64());
-            Assert.IsTrue(input.IsAtEnd);
-
-            // Try different block sizes.
-            for (int bufferSize = 1; bufferSize <= 16; bufferSize *= 2)
-            {
-                input = new CodedInputStream(new SmallBlockInputStream(data, bufferSize));
-                Assert.AreEqual((uint) value, input.ReadRawVarint32());
-
-                input = new CodedInputStream(new SmallBlockInputStream(data, bufferSize));
-                Assert.AreEqual(value, input.ReadRawVarint64());
-                Assert.IsTrue(input.IsAtEnd);
-            }
-
-            // Try reading directly from a MemoryStream. We want to verify that it
-            // doesn't read past the end of the input, so write an extra byte - this
-            // lets us test the position at the end.
-            MemoryStream memoryStream = new MemoryStream();
-            memoryStream.Write(data, 0, data.Length);
-            memoryStream.WriteByte(0);
-            memoryStream.Position = 0;
-            Assert.AreEqual((uint) value, CodedInputStream.ReadRawVarint32(memoryStream));
-            Assert.AreEqual(data.Length, memoryStream.Position);
-        }
-
-        /// <summary>
-        /// Parses the given bytes using ReadRawVarint32() and ReadRawVarint64() and
-        /// expects them to fail with an InvalidProtocolBufferException whose
-        /// description matches the given one.
-        /// </summary>
-        private static void AssertReadVarintFailure(InvalidProtocolBufferException expected, byte[] data)
-        {
-            CodedInputStream input = new CodedInputStream(data);
-            var exception = Assert.Throws<InvalidProtocolBufferException>(() => input.ReadRawVarint32());
-            Assert.AreEqual(expected.Message, exception.Message);
-
-            input = new CodedInputStream(data);
-            exception = Assert.Throws<InvalidProtocolBufferException>(() => input.ReadRawVarint64());
-            Assert.AreEqual(expected.Message, exception.Message);
-
-            // Make sure we get the same error when reading directly from a Stream.
-            exception = Assert.Throws<InvalidProtocolBufferException>(() => CodedInputStream.ReadRawVarint32(new MemoryStream(data)));
-            Assert.AreEqual(expected.Message, exception.Message);
-        }
-
-        [Test]
-        public void ReadVarint()
-        {
-            AssertReadVarint(Bytes(0x00), 0);
-            AssertReadVarint(Bytes(0x01), 1);
-            AssertReadVarint(Bytes(0x7f), 127);
-            // 14882
-            AssertReadVarint(Bytes(0xa2, 0x74), (0x22 << 0) | (0x74 << 7));
-            // 2961488830
-            AssertReadVarint(Bytes(0xbe, 0xf7, 0x92, 0x84, 0x0b),
-                             (0x3e << 0) | (0x77 << 7) | (0x12 << 14) | (0x04 << 21) |
-                             (0x0bL << 28));
-
-            // 64-bit
-            // 7256456126
-            AssertReadVarint(Bytes(0xbe, 0xf7, 0x92, 0x84, 0x1b),
-                             (0x3e << 0) | (0x77 << 7) | (0x12 << 14) | (0x04 << 21) |
-                             (0x1bL << 28));
-            // 41256202580718336
-            AssertReadVarint(Bytes(0x80, 0xe6, 0xeb, 0x9c, 0xc3, 0xc9, 0xa4, 0x49),
-                             (0x00 << 0) | (0x66 << 7) | (0x6b << 14) | (0x1c << 21) |
-                             (0x43L << 28) | (0x49L << 35) | (0x24L << 42) | (0x49L << 49));
-            // 11964378330978735131
-            AssertReadVarint(Bytes(0x9b, 0xa8, 0xf9, 0xc2, 0xbb, 0xd6, 0x80, 0x85, 0xa6, 0x01),
-                             (0x1b << 0) | (0x28 << 7) | (0x79 << 14) | (0x42 << 21) |
-                             (0x3bUL << 28) | (0x56UL << 35) | (0x00UL << 42) |
-                             (0x05UL << 49) | (0x26UL << 56) | (0x01UL << 63));
-
-            // Failures
-            AssertReadVarintFailure(
-                InvalidProtocolBufferException.MalformedVarint(),
-                Bytes(0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-                      0x00));
-            AssertReadVarintFailure(
-                InvalidProtocolBufferException.TruncatedMessage(),
-                Bytes(0x80));
-        }
-
-        /// <summary>
-        /// Parses the given bytes using ReadRawLittleEndian32() and checks
-        /// that the result matches the given value.
-        /// </summary>
-        private static void AssertReadLittleEndian32(byte[] data, uint value)
-        {
-            CodedInputStream input = new CodedInputStream(data);
-            Assert.AreEqual(value, input.ReadRawLittleEndian32());
-            Assert.IsTrue(input.IsAtEnd);
-
-            // Try different block sizes.
-            for (int blockSize = 1; blockSize <= 16; blockSize *= 2)
-            {
-                input = new CodedInputStream(
-                    new SmallBlockInputStream(data, blockSize));
-                Assert.AreEqual(value, input.ReadRawLittleEndian32());
-                Assert.IsTrue(input.IsAtEnd);
-            }
-        }
-
-        /// <summary>
-        /// Parses the given bytes using ReadRawLittleEndian64() and checks
-        /// that the result matches the given value.
-        /// </summary>
-        private static void AssertReadLittleEndian64(byte[] data, ulong value)
-        {
-            CodedInputStream input = new CodedInputStream(data);
-            Assert.AreEqual(value, input.ReadRawLittleEndian64());
-            Assert.IsTrue(input.IsAtEnd);
-
-            // Try different block sizes.
-            for (int blockSize = 1; blockSize <= 16; blockSize *= 2)
-            {
-                input = new CodedInputStream(
-                    new SmallBlockInputStream(data, blockSize));
-                Assert.AreEqual(value, input.ReadRawLittleEndian64());
-                Assert.IsTrue(input.IsAtEnd);
-            }
-        }
-
-        [Test]
-        public void ReadLittleEndian()
-        {
-            AssertReadLittleEndian32(Bytes(0x78, 0x56, 0x34, 0x12), 0x12345678);
-            AssertReadLittleEndian32(Bytes(0xf0, 0xde, 0xbc, 0x9a), 0x9abcdef0);
-
-            AssertReadLittleEndian64(Bytes(0xf0, 0xde, 0xbc, 0x9a, 0x78, 0x56, 0x34, 0x12),
-                                     0x123456789abcdef0L);
-            AssertReadLittleEndian64(
-                Bytes(0x78, 0x56, 0x34, 0x12, 0xf0, 0xde, 0xbc, 0x9a), 0x9abcdef012345678UL);
-        }
-
-        [Test]
-        public void DecodeZigZag32()
-        {
-            Assert.AreEqual(0, ParsingPrimitives.DecodeZigZag32(0));
-            Assert.AreEqual(-1, ParsingPrimitives.DecodeZigZag32(1));
-            Assert.AreEqual(1, ParsingPrimitives.DecodeZigZag32(2));
-            Assert.AreEqual(-2, ParsingPrimitives.DecodeZigZag32(3));
-            Assert.AreEqual(0x3FFFFFFF, ParsingPrimitives.DecodeZigZag32(0x7FFFFFFE));
-            Assert.AreEqual(unchecked((int) 0xC0000000), ParsingPrimitives.DecodeZigZag32(0x7FFFFFFF));
-            Assert.AreEqual(0x7FFFFFFF, ParsingPrimitives.DecodeZigZag32(0xFFFFFFFE));
-            Assert.AreEqual(unchecked((int) 0x80000000), ParsingPrimitives.DecodeZigZag32(0xFFFFFFFF));
-        }
-
-        [Test]
-        public void DecodeZigZag64()
-        {
-            Assert.AreEqual(0, ParsingPrimitives.DecodeZigZag64(0));
-            Assert.AreEqual(-1, ParsingPrimitives.DecodeZigZag64(1));
-            Assert.AreEqual(1, ParsingPrimitives.DecodeZigZag64(2));
-            Assert.AreEqual(-2, ParsingPrimitives.DecodeZigZag64(3));
-            Assert.AreEqual(0x000000003FFFFFFFL, ParsingPrimitives.DecodeZigZag64(0x000000007FFFFFFEL));
-            Assert.AreEqual(unchecked((long) 0xFFFFFFFFC0000000L), ParsingPrimitives.DecodeZigZag64(0x000000007FFFFFFFL));
-            Assert.AreEqual(0x000000007FFFFFFFL, ParsingPrimitives.DecodeZigZag64(0x00000000FFFFFFFEL));
-            Assert.AreEqual(unchecked((long) 0xFFFFFFFF80000000L), ParsingPrimitives.DecodeZigZag64(0x00000000FFFFFFFFL));
-            Assert.AreEqual(0x7FFFFFFFFFFFFFFFL, ParsingPrimitives.DecodeZigZag64(0xFFFFFFFFFFFFFFFEL));
-            Assert.AreEqual(unchecked((long) 0x8000000000000000L), ParsingPrimitives.DecodeZigZag64(0xFFFFFFFFFFFFFFFFL));
-        }
-        
-        [Test]
-        public void ReadWholeMessage_VaryingBlockSizes()
-        {
-            TestAllTypes message = SampleMessages.CreateFullTestAllTypes();
-
-            byte[] rawBytes = message.ToByteArray();
-            Assert.AreEqual(rawBytes.Length, message.CalculateSize());
-            TestAllTypes message2 = TestAllTypes.Parser.ParseFrom(rawBytes);
-            Assert.AreEqual(message, message2);
-
-            // Try different block sizes.
-            for (int blockSize = 1; blockSize < 256; blockSize *= 2)
-            {
-                message2 = TestAllTypes.Parser.ParseFrom(new SmallBlockInputStream(rawBytes, blockSize));
-                Assert.AreEqual(message, message2);
-            }
-        }
-                
-        [Test]
-        public void ReadHugeBlob()
-        {
-            // Allocate and initialize a 1MB blob.
-            byte[] blob = new byte[1 << 20];
-            for (int i = 0; i < blob.Length; i++)
-            {
-                blob[i] = (byte) i;
-            }
-
-            // Make a message containing it.
-            var message = new TestAllTypes { SingleBytes = ByteString.CopyFrom(blob) };
-
-            // Serialize and parse it.  Make sure to parse from an InputStream, not
-            // directly from a ByteString, so that CodedInputStream uses buffered
-            // reading.
-            TestAllTypes message2 = TestAllTypes.Parser.ParseFrom(message.ToByteString());
-
-            Assert.AreEqual(message, message2);
-        }
-
-        [Test]
-        public void ReadMaliciouslyLargeBlob()
-        {
-            MemoryStream ms = new MemoryStream();
-            CodedOutputStream output = new CodedOutputStream(ms);
-
-            uint tag = WireFormat.MakeTag(1, WireFormat.WireType.LengthDelimited);
-            output.WriteRawVarint32(tag);
-            output.WriteRawVarint32(0x7FFFFFFF);
-            output.WriteRawBytes(new byte[32]); // Pad with a few random bytes.
-            output.Flush();
-            ms.Position = 0;
-
-            CodedInputStream input = new CodedInputStream(ms);
-            Assert.AreEqual(tag, input.ReadTag());
-
-            Assert.Throws<InvalidProtocolBufferException>(() => input.ReadBytes());
-        }
-
-        internal static TestRecursiveMessage MakeRecursiveMessage(int depth)
-        {
-            if (depth == 0)
-            {
-                return new TestRecursiveMessage { I = 5 };
-            }
-            else
-            {
-                return new TestRecursiveMessage { A = MakeRecursiveMessage(depth - 1) };
-            }
-        }
-
-        internal static void AssertMessageDepth(TestRecursiveMessage message, int depth)
-        {
-            if (depth == 0)
-            {
-                Assert.IsNull(message.A);
-                Assert.AreEqual(5, message.I);
-            }
-            else
-            {
-                Assert.IsNotNull(message.A);
-                AssertMessageDepth(message.A, depth - 1);
-            }
-        }
-
-        [Test]
-        public void MaliciousRecursion()
-        {
-            ByteString atRecursiveLimit = MakeRecursiveMessage(CodedInputStream.DefaultRecursionLimit).ToByteString();
-            ByteString beyondRecursiveLimit = MakeRecursiveMessage(CodedInputStream.DefaultRecursionLimit + 1).ToByteString();
-
-            AssertMessageDepth(TestRecursiveMessage.Parser.ParseFrom(atRecursiveLimit), CodedInputStream.DefaultRecursionLimit);
-
-            Assert.Throws<InvalidProtocolBufferException>(() => TestRecursiveMessage.Parser.ParseFrom(beyondRecursiveLimit));
-
-            CodedInputStream input = CodedInputStream.CreateWithLimits(new MemoryStream(atRecursiveLimit.ToByteArray()), 1000000, CodedInputStream.DefaultRecursionLimit - 1);
-            Assert.Throws<InvalidProtocolBufferException>(() => TestRecursiveMessage.Parser.ParseFrom(input));
-        }
-
-        [Test]
-        public void SizeLimit()
-        {
-            // Have to use a Stream rather than ByteString.CreateCodedInput as SizeLimit doesn't
-            // apply to the latter case.
-            MemoryStream ms = new MemoryStream(SampleMessages.CreateFullTestAllTypes().ToByteArray());
-            CodedInputStream input = CodedInputStream.CreateWithLimits(ms, 16, 100);
-            Assert.Throws<InvalidProtocolBufferException>(() => TestAllTypes.Parser.ParseFrom(input));
-        }
-
-        /// <summary>
-        /// Tests that if we read an string that contains invalid UTF-8, no exception
-        /// is thrown.  Instead, the invalid bytes are replaced with the Unicode
-        /// "replacement character" U+FFFD.
-        /// </summary>
-        [Test]
-        public void ReadInvalidUtf8()
-        {
-            MemoryStream ms = new MemoryStream();
-            CodedOutputStream output = new CodedOutputStream(ms);
-
-            uint tag = WireFormat.MakeTag(1, WireFormat.WireType.LengthDelimited);
-            output.WriteRawVarint32(tag);
-            output.WriteRawVarint32(1);
-            output.WriteRawBytes(new byte[] {0x80});
-            output.Flush();
-            ms.Position = 0;
-
-            CodedInputStream input = new CodedInputStream(ms);
-
-            Assert.AreEqual(tag, input.ReadTag());
-            string text = input.ReadString();
-            Assert.AreEqual('\ufffd', text[0]);
-        }
-
-        /// <summary>
-        /// A stream which limits the number of bytes it reads at a time.
-        /// We use this to make sure that CodedInputStream doesn't screw up when
-        /// reading in small blocks.
-        /// </summary>
-        private sealed class SmallBlockInputStream : MemoryStream
-        {
-            private readonly int blockSize;
-
-            public SmallBlockInputStream(byte[] data, int blockSize)
-                : base(data)
-            {
-                this.blockSize = blockSize;
-            }
-
-            public override int Read(byte[] buffer, int offset, int count)
-            {
-                return base.Read(buffer, offset, Math.Min(count, blockSize));
-            }
-        }
-
-        [Test]
-        public void TestNegativeEnum()
-        {
-            byte[] bytes = { 0xFE, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x01 };
-            CodedInputStream input = new CodedInputStream(bytes);
-            Assert.AreEqual((int)SampleEnum.NegativeValue, input.ReadEnum());
-            Assert.IsTrue(input.IsAtEnd);
-        }
-
-        //Issue 71:	CodedInputStream.ReadBytes go to slow path unnecessarily
-        [Test]
-        public void TestSlowPathAvoidance()
-        {
-            using (var ms = new MemoryStream())
-            {
-                CodedOutputStream output = new CodedOutputStream(ms);
-                output.WriteTag(1, WireFormat.WireType.LengthDelimited);
-                output.WriteBytes(ByteString.CopyFrom(new byte[100]));
-                output.WriteTag(2, WireFormat.WireType.LengthDelimited);
-                output.WriteBytes(ByteString.CopyFrom(new byte[100]));
-                output.Flush();
-
-                ms.Position = 0;
-                CodedInputStream input = new CodedInputStream(ms, new byte[ms.Length / 2], 0, 0, false);
-
-                uint tag = input.ReadTag();
-                Assert.AreEqual(1, WireFormat.GetTagFieldNumber(tag));
-                Assert.AreEqual(100, input.ReadBytes().Length);
-
-                tag = input.ReadTag();
-                Assert.AreEqual(2, WireFormat.GetTagFieldNumber(tag));
-                Assert.AreEqual(100, input.ReadBytes().Length);
-            }
-        }
-
-        [Test]
-        public void Tag0Throws()
-        {
-            var input = new CodedInputStream(new byte[] { 0 });
-            Assert.Throws<InvalidProtocolBufferException>(() => input.ReadTag());
-        }
-
-        [Test]
-        public void SkipGroup()
-        {
-            // Create an output stream with a group in:
-            // Field 1: string "field 1"
-            // Field 2: group containing:
-            //   Field 1: fixed int32 value 100
-            //   Field 2: string "ignore me"
-            //   Field 3: nested group containing
-            //      Field 1: fixed int64 value 1000
-            // Field 3: string "field 3"
-            var stream = new MemoryStream();
-            var output = new CodedOutputStream(stream);
-            output.WriteTag(1, WireFormat.WireType.LengthDelimited);
-            output.WriteString("field 1");
-            
-            // The outer group...
-            output.WriteTag(2, WireFormat.WireType.StartGroup);
-            output.WriteTag(1, WireFormat.WireType.Fixed32);
-            output.WriteFixed32(100);
-            output.WriteTag(2, WireFormat.WireType.LengthDelimited);
-            output.WriteString("ignore me");
-            // The nested group...
-            output.WriteTag(3, WireFormat.WireType.StartGroup);
-            output.WriteTag(1, WireFormat.WireType.Fixed64);
-            output.WriteFixed64(1000);
-            // Note: Not sure the field number is relevant for end group...
-            output.WriteTag(3, WireFormat.WireType.EndGroup);
-
-            // End the outer group
-            output.WriteTag(2, WireFormat.WireType.EndGroup);
-
-            output.WriteTag(3, WireFormat.WireType.LengthDelimited);
-            output.WriteString("field 3");
-            output.Flush();
-            stream.Position = 0;
-
-            // Now act like a generated client
-            var input = new CodedInputStream(stream);
-            Assert.AreEqual(WireFormat.MakeTag(1, WireFormat.WireType.LengthDelimited), input.ReadTag());
-            Assert.AreEqual("field 1", input.ReadString());
-            Assert.AreEqual(WireFormat.MakeTag(2, WireFormat.WireType.StartGroup), input.ReadTag());
-            input.SkipLastField(); // Should consume the whole group, including the nested one.
-            Assert.AreEqual(WireFormat.MakeTag(3, WireFormat.WireType.LengthDelimited), input.ReadTag());
-            Assert.AreEqual("field 3", input.ReadString());
-        }
-
-        [Test]
-        public void SkipGroup_WrongEndGroupTag()
-        {
-            // Create an output stream with:
-            // Field 1: string "field 1"
-            // Start group 2
-            //   Field 3: fixed int32
-            // End group 4 (should give an error)
-            var stream = new MemoryStream();
-            var output = new CodedOutputStream(stream);
-            output.WriteTag(1, WireFormat.WireType.LengthDelimited);
-            output.WriteString("field 1");
-
-            // The outer group...
-            output.WriteTag(2, WireFormat.WireType.StartGroup);
-            output.WriteTag(3, WireFormat.WireType.Fixed32);
-            output.WriteFixed32(100);
-            output.WriteTag(4, WireFormat.WireType.EndGroup);
-            output.Flush();
-            stream.Position = 0;
-
-            // Now act like a generated client
-            var input = new CodedInputStream(stream);
-            Assert.AreEqual(WireFormat.MakeTag(1, WireFormat.WireType.LengthDelimited), input.ReadTag());
-            Assert.AreEqual("field 1", input.ReadString());
-            Assert.AreEqual(WireFormat.MakeTag(2, WireFormat.WireType.StartGroup), input.ReadTag());
-            Assert.Throws<InvalidProtocolBufferException>(input.SkipLastField);
-        }
-
-        [Test]
-        public void RogueEndGroupTag()
-        {
-            // If we have an end-group tag without a leading start-group tag, generated
-            // code will just call SkipLastField... so that should fail.
-
-            var stream = new MemoryStream();
-            var output = new CodedOutputStream(stream);
-            output.WriteTag(1, WireFormat.WireType.EndGroup);
-            output.Flush();
-            stream.Position = 0;
-
-            var input = new CodedInputStream(stream);
-            Assert.AreEqual(WireFormat.MakeTag(1, WireFormat.WireType.EndGroup), input.ReadTag());
-            Assert.Throws<InvalidProtocolBufferException>(input.SkipLastField);
-        }
-
-        [Test]
-        public void EndOfStreamReachedWhileSkippingGroup()
-        {
-            var stream = new MemoryStream();
-            var output = new CodedOutputStream(stream);
-            output.WriteTag(1, WireFormat.WireType.StartGroup);
-            output.WriteTag(2, WireFormat.WireType.StartGroup);
-            output.WriteTag(2, WireFormat.WireType.EndGroup);
-
-            output.Flush();
-            stream.Position = 0;
-
-            // Now act like a generated client
-            var input = new CodedInputStream(stream);
-            input.ReadTag();
-            Assert.Throws<InvalidProtocolBufferException>(input.SkipLastField);
-        }
-
-        [Test]
-        public void RecursionLimitAppliedWhileSkippingGroup()
-        {
-            var stream = new MemoryStream();
-            var output = new CodedOutputStream(stream);
-            for (int i = 0; i < CodedInputStream.DefaultRecursionLimit + 1; i++)
-            {
-                output.WriteTag(1, WireFormat.WireType.StartGroup);
-            }
-            for (int i = 0; i < CodedInputStream.DefaultRecursionLimit + 1; i++)
-            {
-                output.WriteTag(1, WireFormat.WireType.EndGroup);
-            }
-            output.Flush();
-            stream.Position = 0;
-
-            // Now act like a generated client
-            var input = new CodedInputStream(stream);
-            Assert.AreEqual(WireFormat.MakeTag(1, WireFormat.WireType.StartGroup), input.ReadTag());
-            Assert.Throws<InvalidProtocolBufferException>(input.SkipLastField);
-        }
-
-        [Test]
-        public void Construction_Invalid()
-        {
-            Assert.Throws<ArgumentNullException>(() => new CodedInputStream((byte[]) null));
-            Assert.Throws<ArgumentNullException>(() => new CodedInputStream(null, 0, 0));
-            Assert.Throws<ArgumentNullException>(() => new CodedInputStream((Stream) null));
-            Assert.Throws<ArgumentOutOfRangeException>(() => new CodedInputStream(new byte[10], 100, 0));
-            Assert.Throws<ArgumentOutOfRangeException>(() => new CodedInputStream(new byte[10], 5, 10));
-        }
-
-        [Test]
-        public void CreateWithLimits_InvalidLimits()
-        {
-            var stream = new MemoryStream();
-            Assert.Throws<ArgumentOutOfRangeException>(() => CodedInputStream.CreateWithLimits(stream, 0, 1));
-            Assert.Throws<ArgumentOutOfRangeException>(() => CodedInputStream.CreateWithLimits(stream, 1, 0));
-        }
-
-        [Test]
-        public void Dispose_DisposesUnderlyingStream()
-        {
-            var memoryStream = new MemoryStream();
-            Assert.IsTrue(memoryStream.CanRead);
-            using (var cis = new CodedInputStream(memoryStream))
-            {
-            }
-            Assert.IsFalse(memoryStream.CanRead); // Disposed
-        }
-
-        [Test]
-        public void Dispose_WithLeaveOpen()
-        {
-            var memoryStream = new MemoryStream();
-            Assert.IsTrue(memoryStream.CanRead);
-            using (var cis = new CodedInputStream(memoryStream, true))
-            {
-            }
-            Assert.IsTrue(memoryStream.CanRead); // We left the stream open
-        }
-    }
-}
\ No newline at end of file
diff --git a/libs/protobuf/csharp/compatibility_tests/v3.0.0/src/Google.Protobuf.Test/CodedOutputStreamTest.cs b/libs/protobuf/csharp/compatibility_tests/v3.0.0/src/Google.Protobuf.Test/CodedOutputStreamTest.cs
deleted file mode 100644
index 4890417..0000000
--- a/libs/protobuf/csharp/compatibility_tests/v3.0.0/src/Google.Protobuf.Test/CodedOutputStreamTest.cs
+++ /dev/null
@@ -1,419 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-using System.IO;
-using Google.Protobuf.TestProtos;
-using NUnit.Framework;
-
-namespace Google.Protobuf
-{
-    public class CodedOutputStreamTest
-    {
-        /// <summary>
-        /// Writes the given value using WriteRawVarint32() and WriteRawVarint64() and
-        /// checks that the result matches the given bytes
-        /// </summary>
-        private static void AssertWriteVarint(byte[] data, ulong value)
-        {
-            // Only do 32-bit write if the value fits in 32 bits.
-            if ((value >> 32) == 0)
-            {
-                MemoryStream rawOutput = new MemoryStream();
-                CodedOutputStream output = new CodedOutputStream(rawOutput);
-                output.WriteRawVarint32((uint) value);
-                output.Flush();
-                Assert.AreEqual(data, rawOutput.ToArray());
-                // Also try computing size.
-                Assert.AreEqual(data.Length, CodedOutputStream.ComputeRawVarint32Size((uint) value));
-            }
-
-            {
-                MemoryStream rawOutput = new MemoryStream();
-                CodedOutputStream output = new CodedOutputStream(rawOutput);
-                output.WriteRawVarint64(value);
-                output.Flush();
-                Assert.AreEqual(data, rawOutput.ToArray());
-
-                // Also try computing size.
-                Assert.AreEqual(data.Length, CodedOutputStream.ComputeRawVarint64Size(value));
-            }
-
-            // Try different buffer sizes.
-            for (int bufferSize = 1; bufferSize <= 16; bufferSize *= 2)
-            {
-                // Only do 32-bit write if the value fits in 32 bits.
-                if ((value >> 32) == 0)
-                {
-                    MemoryStream rawOutput = new MemoryStream();
-                    CodedOutputStream output =
-                        new CodedOutputStream(rawOutput, bufferSize);
-                    output.WriteRawVarint32((uint) value);
-                    output.Flush();
-                    Assert.AreEqual(data, rawOutput.ToArray());
-                }
-
-                {
-                    MemoryStream rawOutput = new MemoryStream();
-                    CodedOutputStream output = new CodedOutputStream(rawOutput, bufferSize);
-                    output.WriteRawVarint64(value);
-                    output.Flush();
-                    Assert.AreEqual(data, rawOutput.ToArray());
-                }
-            }
-        }
-
-        /// <summary>
-        /// Tests WriteRawVarint32() and WriteRawVarint64()
-        /// </summary>
-        [Test]
-        public void WriteVarint()
-        {
-            AssertWriteVarint(new byte[] {0x00}, 0);
-            AssertWriteVarint(new byte[] {0x01}, 1);
-            AssertWriteVarint(new byte[] {0x7f}, 127);
-            // 14882
-            AssertWriteVarint(new byte[] {0xa2, 0x74}, (0x22 << 0) | (0x74 << 7));
-            // 2961488830
-            AssertWriteVarint(new byte[] {0xbe, 0xf7, 0x92, 0x84, 0x0b},
-                              (0x3e << 0) | (0x77 << 7) | (0x12 << 14) | (0x04 << 21) |
-                              (0x0bL << 28));
-
-            // 64-bit
-            // 7256456126
-            AssertWriteVarint(new byte[] {0xbe, 0xf7, 0x92, 0x84, 0x1b},
-                              (0x3e << 0) | (0x77 << 7) | (0x12 << 14) | (0x04 << 21) |
-                              (0x1bL << 28));
-            // 41256202580718336
-            AssertWriteVarint(
-                new byte[] {0x80, 0xe6, 0xeb, 0x9c, 0xc3, 0xc9, 0xa4, 0x49},
-                (0x00 << 0) | (0x66 << 7) | (0x6b << 14) | (0x1c << 21) |
-                (0x43UL << 28) | (0x49L << 35) | (0x24UL << 42) | (0x49UL << 49));
-            // 11964378330978735131
-            AssertWriteVarint(
-                new byte[] {0x9b, 0xa8, 0xf9, 0xc2, 0xbb, 0xd6, 0x80, 0x85, 0xa6, 0x01},
-                unchecked((ulong)
-                          ((0x1b << 0) | (0x28 << 7) | (0x79 << 14) | (0x42 << 21) |
-                           (0x3bL << 28) | (0x56L << 35) | (0x00L << 42) |
-                           (0x05L << 49) | (0x26L << 56) | (0x01L << 63))));
-        }
-
-        /// <summary>
-        /// Parses the given bytes using WriteRawLittleEndian32() and checks
-        /// that the result matches the given value.
-        /// </summary>
-        private static void AssertWriteLittleEndian32(byte[] data, uint value)
-        {
-            MemoryStream rawOutput = new MemoryStream();
-            CodedOutputStream output = new CodedOutputStream(rawOutput);
-            output.WriteRawLittleEndian32(value);
-            output.Flush();
-            Assert.AreEqual(data, rawOutput.ToArray());
-
-            // Try different buffer sizes.
-            for (int bufferSize = 1; bufferSize <= 16; bufferSize *= 2)
-            {
-                rawOutput = new MemoryStream();
-                output = new CodedOutputStream(rawOutput, bufferSize);
-                output.WriteRawLittleEndian32(value);
-                output.Flush();
-                Assert.AreEqual(data, rawOutput.ToArray());
-            }
-        }
-
-        /// <summary>
-        /// Parses the given bytes using WriteRawLittleEndian64() and checks
-        /// that the result matches the given value.
-        /// </summary>
-        private static void AssertWriteLittleEndian64(byte[] data, ulong value)
-        {
-            MemoryStream rawOutput = new MemoryStream();
-            CodedOutputStream output = new CodedOutputStream(rawOutput);
-            output.WriteRawLittleEndian64(value);
-            output.Flush();
-            Assert.AreEqual(data, rawOutput.ToArray());
-
-            // Try different block sizes.
-            for (int blockSize = 1; blockSize <= 16; blockSize *= 2)
-            {
-                rawOutput = new MemoryStream();
-                output = new CodedOutputStream(rawOutput, blockSize);
-                output.WriteRawLittleEndian64(value);
-                output.Flush();
-                Assert.AreEqual(data, rawOutput.ToArray());
-            }
-        }
-
-        /// <summary>
-        /// Tests writeRawLittleEndian32() and writeRawLittleEndian64().
-        /// </summary>
-        [Test]
-        public void WriteLittleEndian()
-        {
-            AssertWriteLittleEndian32(new byte[] {0x78, 0x56, 0x34, 0x12}, 0x12345678);
-            AssertWriteLittleEndian32(new byte[] {0xf0, 0xde, 0xbc, 0x9a}, 0x9abcdef0);
-
-            AssertWriteLittleEndian64(
-                new byte[] {0xf0, 0xde, 0xbc, 0x9a, 0x78, 0x56, 0x34, 0x12},
-                0x123456789abcdef0L);
-            AssertWriteLittleEndian64(
-                new byte[] {0x78, 0x56, 0x34, 0x12, 0xf0, 0xde, 0xbc, 0x9a},
-                0x9abcdef012345678UL);
-        }
-
-        [Test]
-        public void WriteWholeMessage_VaryingBlockSizes()
-        {
-            TestAllTypes message = SampleMessages.CreateFullTestAllTypes();
-
-            byte[] rawBytes = message.ToByteArray();
-
-            // Try different block sizes.
-            for (int blockSize = 1; blockSize < 256; blockSize *= 2)
-            {
-                MemoryStream rawOutput = new MemoryStream();
-                CodedOutputStream output = new CodedOutputStream(rawOutput, blockSize);
-                message.WriteTo(output);
-                output.Flush();
-                Assert.AreEqual(rawBytes, rawOutput.ToArray());
-            }
-        }
-        
-        [Test]
-        public void EncodeZigZag32()
-        {
-            Assert.AreEqual(0u, WritingPrimitives.EncodeZigZag32(0));
-            Assert.AreEqual(1u, WritingPrimitives.EncodeZigZag32(-1));
-            Assert.AreEqual(2u, WritingPrimitives.EncodeZigZag32(1));
-            Assert.AreEqual(3u, WritingPrimitives.EncodeZigZag32(-2));
-            Assert.AreEqual(0x7FFFFFFEu, WritingPrimitives.EncodeZigZag32(0x3FFFFFFF));
-            Assert.AreEqual(0x7FFFFFFFu, WritingPrimitives.EncodeZigZag32(unchecked((int) 0xC0000000)));
-            Assert.AreEqual(0xFFFFFFFEu, WritingPrimitives.EncodeZigZag32(0x7FFFFFFF));
-            Assert.AreEqual(0xFFFFFFFFu, WritingPrimitives.EncodeZigZag32(unchecked((int) 0x80000000)));
-        }
-
-        [Test]
-        public void EncodeZigZag64()
-        {
-            Assert.AreEqual(0u, WritingPrimitives.EncodeZigZag64(0));
-            Assert.AreEqual(1u, WritingPrimitives.EncodeZigZag64(-1));
-            Assert.AreEqual(2u, WritingPrimitives.EncodeZigZag64(1));
-            Assert.AreEqual(3u, WritingPrimitives.EncodeZigZag64(-2));
-            Assert.AreEqual(0x000000007FFFFFFEuL,
-                            WritingPrimitives.EncodeZigZag64(unchecked((long) 0x000000003FFFFFFFUL)));
-            Assert.AreEqual(0x000000007FFFFFFFuL,
-                            WritingPrimitives.EncodeZigZag64(unchecked((long) 0xFFFFFFFFC0000000UL)));
-            Assert.AreEqual(0x00000000FFFFFFFEuL,
-                            WritingPrimitives.EncodeZigZag64(unchecked((long) 0x000000007FFFFFFFUL)));
-            Assert.AreEqual(0x00000000FFFFFFFFuL,
-                            WritingPrimitives.EncodeZigZag64(unchecked((long) 0xFFFFFFFF80000000UL)));
-            Assert.AreEqual(0xFFFFFFFFFFFFFFFEL,
-                            WritingPrimitives.EncodeZigZag64(unchecked((long) 0x7FFFFFFFFFFFFFFFUL)));
-            Assert.AreEqual(0xFFFFFFFFFFFFFFFFL,
-                            WritingPrimitives.EncodeZigZag64(unchecked((long) 0x8000000000000000UL)));
-        }
-
-        [Test]
-        public void RoundTripZigZag32()
-        {
-            // Some easier-to-verify round-trip tests.  The inputs (other than 0, 1, -1)
-            // were chosen semi-randomly via keyboard bashing.
-            Assert.AreEqual(0, ParsingPrimitives.DecodeZigZag32(WritingPrimitives.EncodeZigZag32(0)));
-            Assert.AreEqual(1, ParsingPrimitives.DecodeZigZag32(WritingPrimitives.EncodeZigZag32(1)));
-            Assert.AreEqual(-1, ParsingPrimitives.DecodeZigZag32(WritingPrimitives.EncodeZigZag32(-1)));
-            Assert.AreEqual(14927, ParsingPrimitives.DecodeZigZag32(WritingPrimitives.EncodeZigZag32(14927)));
-            Assert.AreEqual(-3612, ParsingPrimitives.DecodeZigZag32(WritingPrimitives.EncodeZigZag32(-3612)));
-        }
-
-        [Test]
-        public void RoundTripZigZag64()
-        {
-            Assert.AreEqual(0, ParsingPrimitives.DecodeZigZag64(WritingPrimitives.EncodeZigZag64(0)));
-            Assert.AreEqual(1, ParsingPrimitives.DecodeZigZag64(WritingPrimitives.EncodeZigZag64(1)));
-            Assert.AreEqual(-1, ParsingPrimitives.DecodeZigZag64(WritingPrimitives.EncodeZigZag64(-1)));
-            Assert.AreEqual(14927, ParsingPrimitives.DecodeZigZag64(WritingPrimitives.EncodeZigZag64(14927)));
-            Assert.AreEqual(-3612, ParsingPrimitives.DecodeZigZag64(WritingPrimitives.EncodeZigZag64(-3612)));
-
-            Assert.AreEqual(856912304801416L,
-                            ParsingPrimitives.DecodeZigZag64(WritingPrimitives.EncodeZigZag64(856912304801416L)));
-            Assert.AreEqual(-75123905439571256L,
-                            ParsingPrimitives.DecodeZigZag64(WritingPrimitives.EncodeZigZag64(-75123905439571256L)));
-        }
-
-        [Test]
-        public void TestNegativeEnumNoTag()
-        {
-            Assert.AreEqual(10, CodedOutputStream.ComputeInt32Size(-2));
-            Assert.AreEqual(10, CodedOutputStream.ComputeEnumSize((int) SampleEnum.NegativeValue));
-
-            byte[] bytes = new byte[10];
-            CodedOutputStream output = new CodedOutputStream(bytes);
-            output.WriteEnum((int) SampleEnum.NegativeValue);
-
-            Assert.AreEqual(0, output.SpaceLeft);
-            Assert.AreEqual("FE-FF-FF-FF-FF-FF-FF-FF-FF-01", BitConverter.ToString(bytes));
-        }
-
-        [Test]
-        public void TestCodedInputOutputPosition()
-        {
-            byte[] content = new byte[110];
-            for (int i = 0; i < content.Length; i++)
-                content[i] = (byte)i;
-
-            byte[] child = new byte[120];
-            {
-                MemoryStream ms = new MemoryStream(child);
-                CodedOutputStream cout = new CodedOutputStream(ms, 20);
-                // Field 11: numeric value: 500
-                cout.WriteTag(11, WireFormat.WireType.Varint);
-                Assert.AreEqual(1, cout.Position);
-                cout.WriteInt32(500);
-                Assert.AreEqual(3, cout.Position);
-                //Field 12: length delimited 120 bytes
-                cout.WriteTag(12, WireFormat.WireType.LengthDelimited);
-                Assert.AreEqual(4, cout.Position);
-                cout.WriteBytes(ByteString.CopyFrom(content));
-                Assert.AreEqual(115, cout.Position);
-                // Field 13: fixed numeric value: 501
-                cout.WriteTag(13, WireFormat.WireType.Fixed32);
-                Assert.AreEqual(116, cout.Position);
-                cout.WriteSFixed32(501);
-                Assert.AreEqual(120, cout.Position);
-                cout.Flush();
-            }
-
-            byte[] bytes = new byte[130];
-            {
-                CodedOutputStream cout = new CodedOutputStream(bytes);
-                // Field 1: numeric value: 500
-                cout.WriteTag(1, WireFormat.WireType.Varint);
-                Assert.AreEqual(1, cout.Position);
-                cout.WriteInt32(500);
-                Assert.AreEqual(3, cout.Position);
-                //Field 2: length delimited 120 bytes
-                cout.WriteTag(2, WireFormat.WireType.LengthDelimited);
-                Assert.AreEqual(4, cout.Position);
-                cout.WriteBytes(ByteString.CopyFrom(child));
-                Assert.AreEqual(125, cout.Position);
-                // Field 3: fixed numeric value: 500
-                cout.WriteTag(3, WireFormat.WireType.Fixed32);
-                Assert.AreEqual(126, cout.Position);
-                cout.WriteSFixed32(501);
-                Assert.AreEqual(130, cout.Position);
-                cout.Flush();
-            }
-            // Now test Input stream:
-            {
-                CodedInputStream cin = new CodedInputStream(new MemoryStream(bytes), new byte[50], 0, 0, false);
-                Assert.AreEqual(0, cin.Position);
-                // Field 1:
-                uint tag = cin.ReadTag();
-                Assert.AreEqual(1, tag >> 3);
-                Assert.AreEqual(1, cin.Position);
-                Assert.AreEqual(500, cin.ReadInt32());
-                Assert.AreEqual(3, cin.Position);
-                //Field 2:
-                tag = cin.ReadTag();
-                Assert.AreEqual(2, tag >> 3);
-                Assert.AreEqual(4, cin.Position);
-                int childlen = cin.ReadLength();
-                Assert.AreEqual(120, childlen);
-                Assert.AreEqual(5, cin.Position);
-                int oldlimit = cin.PushLimit((int)childlen);
-                Assert.AreEqual(5, cin.Position);
-                // Now we are reading child message
-                {
-                    // Field 11: numeric value: 500
-                    tag = cin.ReadTag();
-                    Assert.AreEqual(11, tag >> 3);
-                    Assert.AreEqual(6, cin.Position);
-                    Assert.AreEqual(500, cin.ReadInt32());
-                    Assert.AreEqual(8, cin.Position);
-                    //Field 12: length delimited 120 bytes
-                    tag = cin.ReadTag();
-                    Assert.AreEqual(12, tag >> 3);
-                    Assert.AreEqual(9, cin.Position);
-                    ByteString bstr = cin.ReadBytes();
-                    Assert.AreEqual(110, bstr.Length);
-                    Assert.AreEqual((byte) 109, bstr[109]);
-                    Assert.AreEqual(120, cin.Position);
-                    // Field 13: fixed numeric value: 501
-                    tag = cin.ReadTag();
-                    Assert.AreEqual(13, tag >> 3);
-                    // ROK - Previously broken here, this returned 126 failing to account for bufferSizeAfterLimit
-                    Assert.AreEqual(121, cin.Position);
-                    Assert.AreEqual(501, cin.ReadSFixed32());
-                    Assert.AreEqual(125, cin.Position);
-                    Assert.IsTrue(cin.IsAtEnd);
-                }
-                cin.PopLimit(oldlimit);
-                Assert.AreEqual(125, cin.Position);
-                // Field 3: fixed numeric value: 501
-                tag = cin.ReadTag();
-                Assert.AreEqual(3, tag >> 3);
-                Assert.AreEqual(126, cin.Position);
-                Assert.AreEqual(501, cin.ReadSFixed32());
-                Assert.AreEqual(130, cin.Position);
-                Assert.IsTrue(cin.IsAtEnd);
-            }
-        }
-
-        [Test]
-        public void Dispose_DisposesUnderlyingStream()
-        {
-            var memoryStream = new MemoryStream();
-            Assert.IsTrue(memoryStream.CanWrite);
-            using (var cos = new CodedOutputStream(memoryStream))
-            {
-                cos.WriteRawBytes(new byte[] {0});
-                Assert.AreEqual(0, memoryStream.Position); // Not flushed yet
-            }
-            Assert.AreEqual(1, memoryStream.ToArray().Length); // Flushed data from CodedOutputStream to MemoryStream
-            Assert.IsFalse(memoryStream.CanWrite); // Disposed
-        }
-
-        [Test]
-        public void Dispose_WithLeaveOpen()
-        {
-            var memoryStream = new MemoryStream();
-            Assert.IsTrue(memoryStream.CanWrite);
-            using (var cos = new CodedOutputStream(memoryStream, true))
-            {
-                cos.WriteRawBytes(new byte[] {0});
-                Assert.AreEqual(0, memoryStream.Position); // Not flushed yet
-            }
-            Assert.AreEqual(1, memoryStream.Position); // Flushed data from CodedOutputStream to MemoryStream
-            Assert.IsTrue(memoryStream.CanWrite); // We left the stream open
-        }
-    }
-}
\ No newline at end of file
diff --git a/libs/protobuf/csharp/compatibility_tests/v3.0.0/src/Google.Protobuf.Test/Collections/MapFieldTest.cs b/libs/protobuf/csharp/compatibility_tests/v3.0.0/src/Google.Protobuf.Test/Collections/MapFieldTest.cs
deleted file mode 100644
index 3b4e1d3..0000000
--- a/libs/protobuf/csharp/compatibility_tests/v3.0.0/src/Google.Protobuf.Test/Collections/MapFieldTest.cs
+++ /dev/null
@@ -1,532 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-using System.Collections.Generic;
-using Google.Protobuf.TestProtos;
-using NUnit.Framework;
-using System.Collections;
-using System.Linq;
-
-namespace Google.Protobuf.Collections
-{
-    /// <summary>
-    /// Tests for MapField which aren't reliant on the encoded format -
-    /// tests for serialization/deserialization are part of GeneratedMessageTest.
-    /// </summary>
-    public class MapFieldTest
-    {
-        [Test]
-        public void Clone_ClonesMessages()
-        {
-            var message = new ForeignMessage { C = 20 };
-            var map = new MapField<string, ForeignMessage> { { "x", message } };
-            var clone = map.Clone();
-            map["x"].C = 30;
-            Assert.AreEqual(20, clone["x"].C);
-        }
-
-        [Test]
-        public void NullValuesProhibited()
-        {
-            TestNullValues<int?>(0);
-            TestNullValues("");
-            TestNullValues(new TestAllTypes());
-        }
-
-        private void TestNullValues<T>(T nonNullValue)
-        {
-            var map = new MapField<int, T>();
-            var nullValue = (T) (object) null;
-            Assert.Throws<ArgumentNullException>(() => map.Add(0, nullValue));
-            Assert.Throws<ArgumentNullException>(() => map[0] = nullValue);
-            map.Add(1, nonNullValue);
-            map[1] = nonNullValue;
-        }
-
-        [Test]
-        public void Add_ForbidsNullKeys()
-        {
-            var map = new MapField<string, ForeignMessage>();
-            Assert.Throws<ArgumentNullException>(() => map.Add(null, new ForeignMessage()));
-        }
-
-        [Test]
-        public void Indexer_ForbidsNullKeys()
-        {
-            var map = new MapField<string, ForeignMessage>();
-            Assert.Throws<ArgumentNullException>(() => map[null] = new ForeignMessage());
-        }
-
-        [Test]
-        public void AddPreservesInsertionOrder()
-        {
-            var map = new MapField<string, string>();
-            map.Add("a", "v1");
-            map.Add("b", "v2");
-            map.Add("c", "v3");
-            map.Remove("b");
-            map.Add("d", "v4");
-            CollectionAssert.AreEqual(new[] { "a", "c", "d" }, map.Keys);
-            CollectionAssert.AreEqual(new[] { "v1", "v3", "v4" }, map.Values);
-        }
-
-        [Test]
-        public void EqualityIsOrderInsensitive()
-        {
-            var map1 = new MapField<string, string>();
-            map1.Add("a", "v1");
-            map1.Add("b", "v2");
-
-            var map2 = new MapField<string, string>();
-            map2.Add("b", "v2");
-            map2.Add("a", "v1");
-
-            EqualityTester.AssertEquality(map1, map2);
-        }
-
-        [Test]
-        public void EqualityIsKeySensitive()
-        {
-            var map1 = new MapField<string, string>();
-            map1.Add("first key", "v1");
-            map1.Add("second key", "v2");
-
-            var map2 = new MapField<string, string>();
-            map2.Add("third key", "v1");
-            map2.Add("fourth key", "v2");
-
-            EqualityTester.AssertInequality(map1, map2);
-        }
-
-        [Test]
-        public void Equality_Simple()
-        {
-            var map = new MapField<string, string>();
-            EqualityTester.AssertEquality(map, map);
-            EqualityTester.AssertInequality(map, null);
-            Assert.IsFalse(map.Equals(new object()));
-        }
-
-        [Test]
-        public void EqualityIsValueSensitive()
-        {
-            // Note: Without some care, it's a little easier than one might
-            // hope to see hash collisions, but only in some environments...
-            var map1 = new MapField<string, string>();
-            map1.Add("a", "first value");
-            map1.Add("b", "second value");
-
-            var map2 = new MapField<string, string>();
-            map2.Add("a", "third value");
-            map2.Add("b", "fourth value");
-
-            EqualityTester.AssertInequality(map1, map2);
-        }
-
-        [Test]
-        public void Add_Dictionary()
-        {
-            var map1 = new MapField<string, string>
-            {
-                { "x", "y" },
-                { "a", "b" }
-            };
-            var map2 = new MapField<string, string>
-            {
-                { "before", "" },
-                map1,
-                { "after", "" }
-            };
-            var expected = new MapField<string, string>
-            {
-                { "before", "" },
-                { "x", "y" },
-                { "a", "b" },
-                { "after", "" }
-            };
-            Assert.AreEqual(expected, map2);
-            CollectionAssert.AreEqual(new[] { "before", "x", "a", "after" }, map2.Keys);
-        }
-
-        // General IDictionary<TKey, TValue> behavior tests
-        [Test]
-        public void Add_KeyAlreadyExists()
-        {
-            var map = new MapField<string, string>();
-            map.Add("foo", "bar");
-            Assert.Throws<ArgumentException>(() => map.Add("foo", "baz"));
-        }
-
-        [Test]
-        public void Add_Pair()
-        {
-            var map = new MapField<string, string>();
-            ICollection<KeyValuePair<string, string>> collection = map;
-            collection.Add(NewKeyValuePair("x", "y"));
-            Assert.AreEqual("y", map["x"]);
-            Assert.Throws<ArgumentException>(() => collection.Add(NewKeyValuePair("x", "z")));
-        }
-
-        [Test]
-        public void Contains_Pair()
-        {
-            var map = new MapField<string, string> { { "x", "y" } };
-            ICollection<KeyValuePair<string, string>> collection = map;
-            Assert.IsTrue(collection.Contains(NewKeyValuePair("x", "y")));
-            Assert.IsFalse(collection.Contains(NewKeyValuePair("x", "z")));
-            Assert.IsFalse(collection.Contains(NewKeyValuePair("z", "y")));
-        }
-
-        [Test]
-        public void Remove_Key()
-        {
-            var map = new MapField<string, string>();
-            map.Add("foo", "bar");
-            Assert.AreEqual(1, map.Count);
-            Assert.IsFalse(map.Remove("missing"));
-            Assert.AreEqual(1, map.Count);
-            Assert.IsTrue(map.Remove("foo"));
-            Assert.AreEqual(0, map.Count);
-            Assert.Throws<ArgumentNullException>(() => map.Remove(null));
-        }
-
-        [Test]
-        public void Remove_Pair()
-        {
-            var map = new MapField<string, string>();
-            map.Add("foo", "bar");
-            ICollection<KeyValuePair<string, string>> collection = map;
-            Assert.AreEqual(1, map.Count);
-            Assert.IsFalse(collection.Remove(NewKeyValuePair("wrong key", "bar")));
-            Assert.AreEqual(1, map.Count);
-            Assert.IsFalse(collection.Remove(NewKeyValuePair("foo", "wrong value")));
-            Assert.AreEqual(1, map.Count);
-            Assert.IsTrue(collection.Remove(NewKeyValuePair("foo", "bar")));
-            Assert.AreEqual(0, map.Count);
-            Assert.Throws<ArgumentException>(() => collection.Remove(new KeyValuePair<string, string>(null, "")));
-        }
-
-        [Test]
-        public void CopyTo_Pair()
-        {
-            var map = new MapField<string, string>();
-            map.Add("foo", "bar");
-            ICollection<KeyValuePair<string, string>> collection = map;
-            KeyValuePair<string, string>[] array = new KeyValuePair<string, string>[3];
-            collection.CopyTo(array, 1);
-            Assert.AreEqual(NewKeyValuePair("foo", "bar"), array[1]);
-        }
-
-        [Test]
-        public void Clear()
-        {
-            var map = new MapField<string, string> { { "x", "y" } };
-            Assert.AreEqual(1, map.Count);
-            map.Clear();
-            Assert.AreEqual(0, map.Count);
-            map.Add("x", "y");
-            Assert.AreEqual(1, map.Count);
-        }
-
-        [Test]
-        public void Indexer_Get()
-        {
-            var map = new MapField<string, string> { { "x", "y" } };
-            Assert.AreEqual("y", map["x"]);
-            Assert.Throws<KeyNotFoundException>(() => { var ignored = map["z"]; });
-        }
-
-        [Test]
-        public void Indexer_Set()
-        {
-            var map = new MapField<string, string>();
-            map["x"] = "y";
-            Assert.AreEqual("y", map["x"]);
-            map["x"] = "z"; // This won't throw, unlike Add.
-            Assert.AreEqual("z", map["x"]);
-        }
-
-        [Test]
-        public void GetEnumerator_NonGeneric()
-        {
-            IEnumerable map = new MapField<string, string> { { "x", "y" } };
-            CollectionAssert.AreEqual(new[] { new KeyValuePair<string, string>("x", "y") },
-                map.Cast<object>().ToList());
-        }
-
-        // Test for the explicitly-implemented non-generic IDictionary interface
-        [Test]
-        public void IDictionary_GetEnumerator()
-        {
-            IDictionary map = new MapField<string, string> { { "x", "y" } };
-            var enumerator = map.GetEnumerator();
-
-            // Commented assertions show an ideal situation - it looks like
-            // the LinkedList enumerator doesn't throw when you ask for the current entry
-            // at an inappropriate time; fixing this would be more work than it's worth.
-            // Assert.Throws<InvalidOperationException>(() => enumerator.Current.GetHashCode());
-            Assert.IsTrue(enumerator.MoveNext());
-            Assert.AreEqual("x", enumerator.Key);
-            Assert.AreEqual("y", enumerator.Value);
-            Assert.AreEqual(new DictionaryEntry("x", "y"), enumerator.Current);
-            Assert.AreEqual(new DictionaryEntry("x", "y"), enumerator.Entry);
-            Assert.IsFalse(enumerator.MoveNext());
-            // Assert.Throws<InvalidOperationException>(() => enumerator.Current.GetHashCode());
-            enumerator.Reset();
-            // Assert.Throws<InvalidOperationException>(() => enumerator.Current.GetHashCode());
-            Assert.IsTrue(enumerator.MoveNext());
-            Assert.AreEqual("x", enumerator.Key); // Assume the rest are okay
-        }
-
-        [Test]
-        public void IDictionary_Add()
-        {
-            var map = new MapField<string, string> { { "x", "y" } };
-            IDictionary dictionary = map;
-            dictionary.Add("a", "b");
-            Assert.AreEqual("b", map["a"]);
-            Assert.Throws<ArgumentException>(() => dictionary.Add("a", "duplicate"));
-            Assert.Throws<InvalidCastException>(() => dictionary.Add(new object(), "key is bad"));
-            Assert.Throws<InvalidCastException>(() => dictionary.Add("value is bad", new object()));
-        }
-
-        [Test]
-        public void IDictionary_Contains()
-        {
-            var map = new MapField<string, string> { { "x", "y" } };
-            IDictionary dictionary = map;
-
-            Assert.IsFalse(dictionary.Contains("a"));
-            Assert.IsFalse(dictionary.Contains(5));
-            // Surprising, but IDictionary.Contains is only about keys.
-            Assert.IsFalse(dictionary.Contains(new DictionaryEntry("x", "y")));
-            Assert.IsTrue(dictionary.Contains("x"));
-        }
-
-        [Test]
-        public void IDictionary_Remove()
-        {
-            var map = new MapField<string, string> { { "x", "y" } };
-            IDictionary dictionary = map;
-            dictionary.Remove("a");
-            Assert.AreEqual(1, dictionary.Count);
-            dictionary.Remove(5);
-            Assert.AreEqual(1, dictionary.Count);
-            dictionary.Remove(new DictionaryEntry("x", "y"));
-            Assert.AreEqual(1, dictionary.Count);
-            dictionary.Remove("x");
-            Assert.AreEqual(0, dictionary.Count);
-            Assert.Throws<ArgumentNullException>(() => dictionary.Remove(null));
-        }
-
-        [Test]
-        public void IDictionary_CopyTo()
-        {
-            var map = new MapField<string, string> { { "x", "y" } };
-            IDictionary dictionary = map;
-            var array = new DictionaryEntry[3];
-            dictionary.CopyTo(array, 1);
-            CollectionAssert.AreEqual(new[] { default(DictionaryEntry), new DictionaryEntry("x", "y"), default(DictionaryEntry) },
-                array);
-            var objectArray = new object[3];
-            dictionary.CopyTo(objectArray, 1);
-            CollectionAssert.AreEqual(new object[] { null, new DictionaryEntry("x", "y"), null },
-                objectArray);
-        }
-
-        [Test]
-        public void IDictionary_IsFixedSize()
-        {
-            var map = new MapField<string, string> { { "x", "y" } };
-            IDictionary dictionary = map;
-            Assert.IsFalse(dictionary.IsFixedSize);
-        }
-
-        [Test]
-        public void IDictionary_Keys()
-        {
-            IDictionary dictionary = new MapField<string, string> { { "x", "y" } };
-            CollectionAssert.AreEqual(new[] { "x" }, dictionary.Keys);
-        }
-
-        [Test]
-        public void IDictionary_Values()
-        {
-            IDictionary dictionary = new MapField<string, string> { { "x", "y" } };
-            CollectionAssert.AreEqual(new[] { "y" }, dictionary.Values);
-        }
-
-        [Test]
-        public void IDictionary_IsSynchronized()
-        {
-            IDictionary dictionary = new MapField<string, string> { { "x", "y" } };
-            Assert.IsFalse(dictionary.IsSynchronized);
-        }
-
-        [Test]
-        public void IDictionary_SyncRoot()
-        {
-            IDictionary dictionary = new MapField<string, string> { { "x", "y" } };
-            Assert.AreSame(dictionary, dictionary.SyncRoot);
-        }
-
-        [Test]
-        public void IDictionary_Indexer_Get()
-        {
-            IDictionary dictionary = new MapField<string, string> { { "x", "y" } };
-            Assert.AreEqual("y", dictionary["x"]);
-            Assert.IsNull(dictionary["a"]);
-            Assert.IsNull(dictionary[5]);
-            Assert.Throws<ArgumentNullException>(() => dictionary[null].GetHashCode());
-        }
-
-        [Test]
-        public void IDictionary_Indexer_Set()
-        {
-            var map = new MapField<string, string> { { "x", "y" } };
-            IDictionary dictionary = map;
-            map["a"] = "b";
-            Assert.AreEqual("b", map["a"]);
-            map["a"] = "c";
-            Assert.AreEqual("c", map["a"]);
-            Assert.Throws<InvalidCastException>(() => dictionary[5] = "x");
-            Assert.Throws<InvalidCastException>(() => dictionary["x"] = 5);
-            Assert.Throws<ArgumentNullException>(() => dictionary[null] = "z");
-            Assert.Throws<ArgumentNullException>(() => dictionary["x"] = null);
-        }
-
-        [Test]
-        public void KeysReturnsLiveView()
-        {
-            var map = new MapField<string, string>();
-            var keys = map.Keys;
-            CollectionAssert.AreEqual(new string[0], keys);
-            map["foo"] = "bar";
-            map["x"] = "y";
-            CollectionAssert.AreEqual(new[] { "foo", "x" }, keys);
-        }
-
-        [Test]
-        public void ValuesReturnsLiveView()
-        {
-            var map = new MapField<string, string>();
-            var values = map.Values;
-            CollectionAssert.AreEqual(new string[0], values);
-            map["foo"] = "bar";
-            map["x"] = "y";
-            CollectionAssert.AreEqual(new[] { "bar", "y" }, values);
-        }
-
-        // Just test keys - we know the implementation is the same for values
-        [Test]
-        public void ViewsAreReadOnly()
-        {
-            var map = new MapField<string, string>();
-            var keys = map.Keys;
-            Assert.IsTrue(keys.IsReadOnly);
-            Assert.Throws<NotSupportedException>(() => keys.Clear());
-            Assert.Throws<NotSupportedException>(() => keys.Remove("a"));
-            Assert.Throws<NotSupportedException>(() => keys.Add("a"));
-        }
-
-        // Just test keys - we know the implementation is the same for values
-        [Test]
-        public void ViewCopyTo()
-        {
-            var map = new MapField<string, string> { { "foo", "bar" }, { "x", "y" } };
-            var keys = map.Keys;
-            var array = new string[4];
-            Assert.Throws<ArgumentException>(() => keys.CopyTo(array, 3));
-            Assert.Throws<ArgumentOutOfRangeException>(() => keys.CopyTo(array, -1));
-            keys.CopyTo(array, 1);
-            CollectionAssert.AreEqual(new[] { null, "foo", "x", null }, array);
-        }
-
-        // Just test keys - we know the implementation is the same for values
-        [Test]
-        public void NonGenericViewCopyTo()
-        {
-            IDictionary map = new MapField<string, string> { { "foo", "bar" }, { "x", "y" } };
-            ICollection keys = map.Keys;
-            // Note the use of the Array type here rather than string[]
-            Array array = new string[4];
-            Assert.Throws<ArgumentException>(() => keys.CopyTo(array, 3));
-            Assert.Throws<ArgumentOutOfRangeException>(() => keys.CopyTo(array, -1));
-            keys.CopyTo(array, 1);
-            CollectionAssert.AreEqual(new[] { null, "foo", "x", null }, array);
-        }
-
-        [Test]
-        public void KeysContains()
-        {
-            var map = new MapField<string, string> { { "foo", "bar" }, { "x", "y" } };
-            var keys = map.Keys;
-            Assert.IsTrue(keys.Contains("foo"));
-            Assert.IsFalse(keys.Contains("bar")); // It's a value!
-            Assert.IsFalse(keys.Contains("1"));
-            // Keys can't be null, so we should prevent contains check
-            Assert.Throws<ArgumentNullException>(() => keys.Contains(null));
-        }
-
-        [Test]
-        public void ValuesContains()
-        {
-            var map = new MapField<string, string> { { "foo", "bar" }, { "x", "y" } };
-            var values = map.Values;
-            Assert.IsTrue(values.Contains("bar"));
-            Assert.IsFalse(values.Contains("foo")); // It's a key!
-            Assert.IsFalse(values.Contains("1"));
-            // Values can be null, so this makes sense
-            Assert.IsFalse(values.Contains(null));
-        }
-
-        [Test]
-        public void ToString_StringToString()
-        {
-            var map = new MapField<string, string> { { "foo", "bar" }, { "x", "y" } };
-            Assert.AreEqual("{ \"foo\": \"bar\", \"x\": \"y\" }", map.ToString());
-        }
-
-        [Test]
-        public void ToString_UnsupportedKeyType()
-        {
-            var map = new MapField<byte, string> { { 10, "foo" } };
-            Assert.Throws<ArgumentException>(() => map.ToString());
-        }
-
-        private static KeyValuePair<TKey, TValue> NewKeyValuePair<TKey, TValue>(TKey key, TValue value)
-        {
-            return new KeyValuePair<TKey, TValue>(key, value);
-        }
-    }
-}
diff --git a/libs/protobuf/csharp/compatibility_tests/v3.0.0/src/Google.Protobuf.Test/Collections/RepeatedFieldTest.cs b/libs/protobuf/csharp/compatibility_tests/v3.0.0/src/Google.Protobuf.Test/Collections/RepeatedFieldTest.cs
deleted file mode 100644
index 6852f75..0000000
--- a/libs/protobuf/csharp/compatibility_tests/v3.0.0/src/Google.Protobuf.Test/Collections/RepeatedFieldTest.cs
+++ /dev/null
@@ -1,746 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using Google.Protobuf.TestProtos;
-using Google.Protobuf.WellKnownTypes;
-using NUnit.Framework;
-
-namespace Google.Protobuf.Collections
-{
-    public class RepeatedFieldTest
-    {
-        [Test]
-        public void NullValuesRejected()
-        {
-            var list = new RepeatedField<string>();
-            Assert.Throws<ArgumentNullException>(() => list.Add((string)null));
-            Assert.Throws<ArgumentNullException>(() => list.Add((IEnumerable<string>)null));
-            Assert.Throws<ArgumentNullException>(() => list.Add((RepeatedField<string>)null));
-            Assert.Throws<ArgumentNullException>(() => list.Contains(null));
-            Assert.Throws<ArgumentNullException>(() => list.IndexOf(null));
-        }
-
-        [Test]
-        public void Add_SingleItem()
-        {
-            var list = new RepeatedField<string>();
-            list.Add("foo");
-            Assert.AreEqual(1, list.Count);
-            Assert.AreEqual("foo", list[0]);
-        }
-
-        [Test]
-        public void Add_Sequence()
-        {
-            var list = new RepeatedField<string>();
-            list.Add(new[] { "foo", "bar" });
-            Assert.AreEqual(2, list.Count);
-            Assert.AreEqual("foo", list[0]);
-            Assert.AreEqual("bar", list[1]);
-        }
-
-        [Test]
-        public void AddRange_SlowPath()
-        {
-            var list = new RepeatedField<string>();
-            list.AddRange(new[] { "foo", "bar" }.Select(x => x));
-            Assert.AreEqual(2, list.Count);
-            Assert.AreEqual("foo", list[0]);
-            Assert.AreEqual("bar", list[1]);
-        }
-
-        [Test]
-        public void AddRange_SlowPath_NullsProhibited_ReferenceType()
-        {
-            var list = new RepeatedField<string>();
-            // It's okay for this to throw ArgumentNullException if necessary.
-            // It's not ideal, but not awful.
-            Assert.Catch<ArgumentException>(() => list.AddRange(new[] { "foo", null }.Select(x => x)));
-        }
-
-        [Test]
-        public void AddRange_SlowPath_NullsProhibited_NullableValueType()
-        {
-            var list = new RepeatedField<int?>();
-            // It's okay for this to throw ArgumentNullException if necessary.
-            // It's not ideal, but not awful.
-            Assert.Catch<ArgumentException>(() => list.AddRange(new[] { 20, (int?)null }.Select(x => x)));
-        }
-
-        [Test]
-        public void AddRange_Optimized_NonNullableValueType()
-        {
-            var list = new RepeatedField<int>();
-            list.AddRange(new List<int> { 20, 30 });
-            Assert.AreEqual(2, list.Count);
-            Assert.AreEqual(20, list[0]);
-            Assert.AreEqual(30, list[1]);
-        }
-
-        [Test]
-        public void AddRange_Optimized_ReferenceType()
-        {
-            var list = new RepeatedField<string>();
-            list.AddRange(new List<string> { "foo", "bar" });
-            Assert.AreEqual(2, list.Count);
-            Assert.AreEqual("foo", list[0]);
-            Assert.AreEqual("bar", list[1]);
-        }
-
-        [Test]
-        public void AddRange_Optimized_NullableValueType()
-        {
-            var list = new RepeatedField<int?>();
-            list.AddRange(new List<int?> { 20, 30 });
-            Assert.AreEqual(2, list.Count);
-            Assert.AreEqual((int?) 20, list[0]);
-            Assert.AreEqual((int?) 30, list[1]);
-        }
-
-        [Test]
-        public void AddRange_Optimized_NullsProhibited_ReferenceType()
-        {
-            // We don't just trust that a collection with a nullable element type doesn't contain nulls
-            var list = new RepeatedField<string>();
-            // It's okay for this to throw ArgumentNullException if necessary.
-            // It's not ideal, but not awful.
-            Assert.Catch<ArgumentException>(() => list.AddRange(new List<string> { "foo", null }));
-        }
-
-        [Test]
-        public void AddRange_Optimized_NullsProhibited_NullableValueType()
-        {
-            // We don't just trust that a collection with a nullable element type doesn't contain nulls
-            var list = new RepeatedField<int?>();
-            // It's okay for this to throw ArgumentNullException if necessary.
-            // It's not ideal, but not awful.
-            Assert.Catch<ArgumentException>(() => list.AddRange(new List<int?> { 20, null }));
-        }
-
-        [Test]
-        public void AddRange_AlreadyNotEmpty()
-        {
-            var list = new RepeatedField<int> { 1, 2, 3 };
-            list.AddRange(new List<int> { 4, 5, 6 });
-            CollectionAssert.AreEqual(new[] { 1, 2, 3, 4, 5, 6 }, list);
-        }
-
-        [Test]
-        public void AddRange_RepeatedField()
-        {
-            var list = new RepeatedField<string> { "original" };
-            list.AddRange(new RepeatedField<string> { "foo", "bar" });
-            Assert.AreEqual(3, list.Count);
-            Assert.AreEqual("original", list[0]);
-            Assert.AreEqual("foo", list[1]);
-            Assert.AreEqual("bar", list[2]);
-        }
-
-        [Test]
-        public void RemoveAt_Valid()
-        {
-            var list = new RepeatedField<string> { "first", "second", "third" };
-            list.RemoveAt(1);
-            CollectionAssert.AreEqual(new[] { "first", "third" }, list);
-            // Just check that these don't throw...
-            list.RemoveAt(list.Count - 1); // Now the count will be 1...
-            list.RemoveAt(0);
-            Assert.AreEqual(0, list.Count);
-        }
-
-        [Test]
-        public void RemoveAt_Invalid()
-        {
-            var list = new RepeatedField<string> { "first", "second", "third" };
-            Assert.Throws<ArgumentOutOfRangeException>(() => list.RemoveAt(-1));
-            Assert.Throws<ArgumentOutOfRangeException>(() => list.RemoveAt(3));
-        }
-
-        [Test]
-        public void Insert_Valid()
-        {
-            var list = new RepeatedField<string> { "first", "second" };
-            list.Insert(1, "middle");
-            CollectionAssert.AreEqual(new[] { "first", "middle", "second" }, list);
-            list.Insert(3, "end");
-            CollectionAssert.AreEqual(new[] { "first", "middle", "second", "end" }, list);
-            list.Insert(0, "start");
-            CollectionAssert.AreEqual(new[] { "start", "first", "middle", "second", "end" }, list);
-        }
-
-        [Test]
-        public void Insert_Invalid()
-        {
-            var list = new RepeatedField<string> { "first", "second" };
-            Assert.Throws<ArgumentOutOfRangeException>(() => list.Insert(-1, "foo"));
-            Assert.Throws<ArgumentOutOfRangeException>(() => list.Insert(3, "foo"));
-            Assert.Throws<ArgumentNullException>(() => list.Insert(0, null));
-        }
-
-        [Test]
-        public void Equals_RepeatedField()
-        {
-            var list = new RepeatedField<string> { "first", "second" };
-            Assert.IsFalse(list.Equals((RepeatedField<string>) null));
-            Assert.IsTrue(list.Equals(list));
-            Assert.IsFalse(list.Equals(new RepeatedField<string> { "first", "third" }));
-            Assert.IsFalse(list.Equals(new RepeatedField<string> { "first" }));
-            Assert.IsTrue(list.Equals(new RepeatedField<string> { "first", "second" }));
-        }
-
-        [Test]
-        public void Equals_Object()
-        {
-            var list = new RepeatedField<string> { "first", "second" };
-            Assert.IsFalse(list.Equals((object) null));
-            Assert.IsTrue(list.Equals((object) list));
-            Assert.IsFalse(list.Equals((object) new RepeatedField<string> { "first", "third" }));
-            Assert.IsFalse(list.Equals((object) new RepeatedField<string> { "first" }));
-            Assert.IsTrue(list.Equals((object) new RepeatedField<string> { "first", "second" }));
-            Assert.IsFalse(list.Equals(new object()));
-        }
-
-        [Test]
-        public void GetEnumerator_GenericInterface()
-        {
-            IEnumerable<string> list = new RepeatedField<string> { "first", "second" };
-            // Select gets rid of the optimizations in ToList...
-            CollectionAssert.AreEqual(new[] { "first", "second" }, list.Select(x => x).ToList());
-        }
-
-        [Test]
-        public void GetEnumerator_NonGenericInterface()
-        {
-            IEnumerable list = new RepeatedField<string> { "first", "second" };
-            CollectionAssert.AreEqual(new[] { "first", "second" }, list.Cast<object>().ToList());
-        }
-
-        [Test]
-        public void CopyTo()
-        {
-            var list = new RepeatedField<string> { "first", "second" };
-            string[] stringArray = new string[4];
-            list.CopyTo(stringArray, 1);
-            CollectionAssert.AreEqual(new[] { null, "first", "second", null }, stringArray);
-        }
-
-        [Test]
-        public void Indexer_Get()
-        {
-            var list = new RepeatedField<string> { "first", "second" };
-            Assert.AreEqual("first", list[0]);
-            Assert.AreEqual("second", list[1]);
-            Assert.Throws<ArgumentOutOfRangeException>(() => list[-1].GetHashCode());
-            Assert.Throws<ArgumentOutOfRangeException>(() => list[2].GetHashCode());
-        }
-
-        [Test]
-        public void Indexer_Set()
-        {
-            var list = new RepeatedField<string> { "first", "second" };
-            list[0] = "changed";
-            Assert.AreEqual("changed", list[0]);
-            Assert.Throws<ArgumentNullException>(() => list[0] = null);
-            Assert.Throws<ArgumentOutOfRangeException>(() => list[-1] = "bad");
-            Assert.Throws<ArgumentOutOfRangeException>(() => list[2] = "bad");
-        }
-
-        [Test]
-        public void Clone_ReturnsMutable()
-        {
-            var list = new RepeatedField<int> { 0 };
-            var clone = list.Clone();
-            clone[0] = 1;
-        }
-
-        [Test]
-        public void Enumerator()
-        {
-            var list = new RepeatedField<string> { "first", "second" };
-            using (var enumerator = list.GetEnumerator())
-            {
-                Assert.IsTrue(enumerator.MoveNext());
-                Assert.AreEqual("first", enumerator.Current);
-                Assert.IsTrue(enumerator.MoveNext());
-                Assert.AreEqual("second", enumerator.Current);
-                Assert.IsFalse(enumerator.MoveNext());
-                Assert.IsFalse(enumerator.MoveNext());
-            }
-        }
-
-        [Test]
-        public void AddEntriesFrom_PackedInt32()
-        {
-            uint packedTag = WireFormat.MakeTag(10, WireFormat.WireType.LengthDelimited);
-            var stream = new MemoryStream();
-            var output = new CodedOutputStream(stream);
-            var length = CodedOutputStream.ComputeInt32Size(10)
-                + CodedOutputStream.ComputeInt32Size(999)
-                + CodedOutputStream.ComputeInt32Size(-1000);
-            output.WriteTag(packedTag);
-            output.WriteRawVarint32((uint) length);
-            output.WriteInt32(10);
-            output.WriteInt32(999);
-            output.WriteInt32(-1000);
-            output.Flush();
-            stream.Position = 0;
-
-            // Deliberately "expecting" a non-packed tag, but we detect that the data is
-            // actually packed.
-            uint nonPackedTag = WireFormat.MakeTag(10, WireFormat.WireType.LengthDelimited);
-            var field = new RepeatedField<int>();
-            var input = new CodedInputStream(stream);
-            input.AssertNextTag(packedTag);
-            field.AddEntriesFrom(input, FieldCodec.ForInt32(nonPackedTag));
-            CollectionAssert.AreEqual(new[] { 10, 999, -1000 }, field);
-            Assert.IsTrue(input.IsAtEnd);
-        }
-
-        [Test]
-        public void AddEntriesFrom_NonPackedInt32()
-        {
-            uint nonPackedTag = WireFormat.MakeTag(10, WireFormat.WireType.Varint);
-            var stream = new MemoryStream();
-            var output = new CodedOutputStream(stream);
-            output.WriteTag(nonPackedTag);
-            output.WriteInt32(10);
-            output.WriteTag(nonPackedTag);
-            output.WriteInt32(999);
-            output.WriteTag(nonPackedTag);
-            output.WriteInt32(-1000); // Just for variety...
-            output.Flush();
-            stream.Position = 0;
-
-            // Deliberately "expecting" a packed tag, but we detect that the data is
-            // actually not packed.
-            uint packedTag = WireFormat.MakeTag(10, WireFormat.WireType.LengthDelimited);
-            var field = new RepeatedField<int>();
-            var input = new CodedInputStream(stream);
-            input.AssertNextTag(nonPackedTag);
-            field.AddEntriesFrom(input, FieldCodec.ForInt32(packedTag));
-            CollectionAssert.AreEqual(new[] { 10, 999, -1000 }, field);
-            Assert.IsTrue(input.IsAtEnd);
-        }
-
-        [Test]
-        public void AddEntriesFrom_String()
-        {
-            uint tag = WireFormat.MakeTag(10, WireFormat.WireType.LengthDelimited);
-            var stream = new MemoryStream();
-            var output = new CodedOutputStream(stream);
-            output.WriteTag(tag);
-            output.WriteString("Foo");
-            output.WriteTag(tag);
-            output.WriteString("");
-            output.WriteTag(tag);
-            output.WriteString("Bar");
-            output.Flush();
-            stream.Position = 0;
-
-            var field = new RepeatedField<string>();
-            var input = new CodedInputStream(stream);
-            input.AssertNextTag(tag);
-            field.AddEntriesFrom(input, FieldCodec.ForString(tag));
-            CollectionAssert.AreEqual(new[] { "Foo", "", "Bar" }, field);
-            Assert.IsTrue(input.IsAtEnd);
-        }
-
-        [Test]
-        public void AddEntriesFrom_Message()
-        {
-            var message1 = new ForeignMessage { C = 2000 };
-            var message2 = new ForeignMessage { C = -250 };
-
-            uint tag = WireFormat.MakeTag(10, WireFormat.WireType.LengthDelimited);
-            var stream = new MemoryStream();
-            var output = new CodedOutputStream(stream);
-            output.WriteTag(tag);
-            output.WriteMessage(message1);
-            output.WriteTag(tag);
-            output.WriteMessage(message2);
-            output.Flush();
-            stream.Position = 0;
-
-            var field = new RepeatedField<ForeignMessage>();
-            var input = new CodedInputStream(stream);
-            input.AssertNextTag(tag);
-            field.AddEntriesFrom(input, FieldCodec.ForMessage(tag, ForeignMessage.Parser));
-            CollectionAssert.AreEqual(new[] { message1, message2}, field);
-            Assert.IsTrue(input.IsAtEnd);
-        }
-
-        [Test]
-        public void WriteTo_PackedInt32()
-        {
-            uint tag = WireFormat.MakeTag(10, WireFormat.WireType.LengthDelimited);
-            var field = new RepeatedField<int> { 10, 1000, 1000000 };
-            var stream = new MemoryStream();
-            var output = new CodedOutputStream(stream);
-            field.WriteTo(output, FieldCodec.ForInt32(tag));
-            output.Flush();
-            stream.Position = 0;
-
-            var input = new CodedInputStream(stream);
-            input.AssertNextTag(tag);
-            var length = input.ReadLength();
-            Assert.AreEqual(10, input.ReadInt32());
-            Assert.AreEqual(1000, input.ReadInt32());
-            Assert.AreEqual(1000000, input.ReadInt32());
-            Assert.IsTrue(input.IsAtEnd);
-            Assert.AreEqual(1 + CodedOutputStream.ComputeLengthSize(length) + length, stream.Length);
-        }
-
-        [Test]
-        public void WriteTo_NonPackedInt32()
-        {
-            uint tag = WireFormat.MakeTag(10, WireFormat.WireType.Varint);
-            var field = new RepeatedField<int> { 10, 1000, 1000000};
-            var stream = new MemoryStream();
-            var output = new CodedOutputStream(stream);
-            field.WriteTo(output, FieldCodec.ForInt32(tag));
-            output.Flush();
-            stream.Position = 0;
-
-            var input = new CodedInputStream(stream);
-            input.AssertNextTag(tag);
-            Assert.AreEqual(10, input.ReadInt32());
-            input.AssertNextTag(tag);
-            Assert.AreEqual(1000, input.ReadInt32());
-            input.AssertNextTag(tag);
-            Assert.AreEqual(1000000, input.ReadInt32());
-            Assert.IsTrue(input.IsAtEnd);
-        }
-
-        [Test]
-        public void WriteTo_String()
-        {
-            uint tag = WireFormat.MakeTag(10, WireFormat.WireType.LengthDelimited);
-            var field = new RepeatedField<string> { "Foo", "", "Bar" };
-            var stream = new MemoryStream();
-            var output = new CodedOutputStream(stream);
-            field.WriteTo(output, FieldCodec.ForString(tag));
-            output.Flush();
-            stream.Position = 0;
-
-            var input = new CodedInputStream(stream);
-            input.AssertNextTag(tag);
-            Assert.AreEqual("Foo", input.ReadString());
-            input.AssertNextTag(tag);
-            Assert.AreEqual("", input.ReadString());
-            input.AssertNextTag(tag);
-            Assert.AreEqual("Bar", input.ReadString());
-            Assert.IsTrue(input.IsAtEnd);
-        }
-
-        [Test]
-        public void WriteTo_Message()
-        {
-            var message1 = new ForeignMessage { C = 20 };
-            var message2 = new ForeignMessage { C = 25 };
-            uint tag = WireFormat.MakeTag(10, WireFormat.WireType.LengthDelimited);
-            var field = new RepeatedField<ForeignMessage> { message1, message2 };
-            var stream = new MemoryStream();
-            var output = new CodedOutputStream(stream);
-            field.WriteTo(output, FieldCodec.ForMessage(tag, ForeignMessage.Parser));
-            output.Flush();
-            stream.Position = 0;
-
-            var input = new CodedInputStream(stream);
-            input.AssertNextTag(tag);
-            Assert.AreEqual(message1, input.ReadMessage(ForeignMessage.Parser));
-            input.AssertNextTag(tag);
-            Assert.AreEqual(message2, input.ReadMessage(ForeignMessage.Parser));
-            Assert.IsTrue(input.IsAtEnd);
-        }
-
-        [Test]
-        public void CalculateSize_VariableSizeNonPacked()
-        {
-            var list = new RepeatedField<int> { 1, 500, 1 };
-            var tag = WireFormat.MakeTag(1, WireFormat.WireType.Varint);
-            // 2 bytes for the first entry, 3 bytes for the second, 2 bytes for the third
-            Assert.AreEqual(7, list.CalculateSize(FieldCodec.ForInt32(tag)));
-        }
-
-        [Test]
-        public void CalculateSize_FixedSizeNonPacked()
-        {
-            var list = new RepeatedField<int> { 1, 500, 1 };
-            var tag = WireFormat.MakeTag(1, WireFormat.WireType.Fixed32);
-            // 5 bytes for the each entry
-            Assert.AreEqual(15, list.CalculateSize(FieldCodec.ForSFixed32(tag)));
-        }
-
-        [Test]
-        public void CalculateSize_VariableSizePacked()
-        {
-            var list = new RepeatedField<int> { 1, 500, 1};
-            var tag = WireFormat.MakeTag(1, WireFormat.WireType.LengthDelimited);
-            // 1 byte for the tag, 1 byte for the length,
-            // 1 byte for the first entry, 2 bytes for the second, 1 byte for the third
-            Assert.AreEqual(6, list.CalculateSize(FieldCodec.ForInt32(tag)));
-        }
-
-        [Test]
-        public void CalculateSize_FixedSizePacked()
-        {
-            var list = new RepeatedField<int> { 1, 500, 1 };
-            var tag = WireFormat.MakeTag(1, WireFormat.WireType.LengthDelimited);
-            // 1 byte for the tag, 1 byte for the length, 4 bytes per entry
-            Assert.AreEqual(14, list.CalculateSize(FieldCodec.ForSFixed32(tag)));
-        }
-
-        [Test]
-        public void TestNegativeEnumArray()
-        {
-            int arraySize = 1 + 1 + (11 * 5);
-            int msgSize = arraySize;
-            byte[] bytes = new byte[msgSize];
-            CodedOutputStream output = new CodedOutputStream(bytes);
-            uint tag = WireFormat.MakeTag(8, WireFormat.WireType.Varint);
-            for (int i = 0; i >= -5; i--)
-            {
-                output.WriteTag(tag);
-                output.WriteEnum(i);
-            }
-
-            Assert.AreEqual(0, output.SpaceLeft);
-
-            CodedInputStream input = new CodedInputStream(bytes);
-            tag = input.ReadTag();
-
-            RepeatedField<SampleEnum> values = new RepeatedField<SampleEnum>();
-            values.AddEntriesFrom(input, FieldCodec.ForEnum(tag, x => (int)x, x => (SampleEnum)x));
-
-            Assert.AreEqual(6, values.Count);
-            Assert.AreEqual(SampleEnum.None, values[0]);
-            Assert.AreEqual(((SampleEnum)(-1)), values[1]);
-            Assert.AreEqual(SampleEnum.NegativeValue, values[2]);
-            Assert.AreEqual(((SampleEnum)(-3)), values[3]);
-            Assert.AreEqual(((SampleEnum)(-4)), values[4]);
-            Assert.AreEqual(((SampleEnum)(-5)), values[5]);
-        }
-
-
-        [Test]
-        public void TestNegativeEnumPackedArray()
-        {
-            int arraySize = 1 + (10 * 5);
-            int msgSize = 1 + 1 + arraySize;
-            byte[] bytes = new byte[msgSize];
-            CodedOutputStream output = new CodedOutputStream(bytes);
-            // Length-delimited to show we want the packed representation
-            uint tag = WireFormat.MakeTag(8, WireFormat.WireType.LengthDelimited);
-            output.WriteTag(tag);
-            int size = 0;
-            for (int i = 0; i >= -5; i--)
-            {
-                size += CodedOutputStream.ComputeEnumSize(i);
-            }
-            output.WriteRawVarint32((uint)size);
-            for (int i = 0; i >= -5; i--)
-            {
-                output.WriteEnum(i);
-            }
-            Assert.AreEqual(0, output.SpaceLeft);
-
-            CodedInputStream input = new CodedInputStream(bytes);
-            tag = input.ReadTag();
-
-            RepeatedField<SampleEnum> values = new RepeatedField<SampleEnum>();
-            values.AddEntriesFrom(input, FieldCodec.ForEnum(tag, x => (int)x, x => (SampleEnum)x));
-
-            Assert.AreEqual(6, values.Count);
-            Assert.AreEqual(SampleEnum.None, values[0]);
-            Assert.AreEqual(((SampleEnum)(-1)), values[1]);
-            Assert.AreEqual(SampleEnum.NegativeValue, values[2]);
-            Assert.AreEqual(((SampleEnum)(-3)), values[3]);
-            Assert.AreEqual(((SampleEnum)(-4)), values[4]);
-            Assert.AreEqual(((SampleEnum)(-5)), values[5]);
-        }
-
-        // Fairly perfunctory tests for the non-generic IList implementation
-        [Test]
-        public void IList_Indexer()
-        {
-            var field = new RepeatedField<string> { "first", "second" };
-            IList list = field;
-            Assert.AreEqual("first", list[0]);
-            list[1] = "changed";
-            Assert.AreEqual("changed", field[1]);
-        }
-
-        [Test]
-        public void IList_Contains()
-        {
-            IList list = new RepeatedField<string> { "first", "second" };
-            Assert.IsTrue(list.Contains("second"));
-            Assert.IsFalse(list.Contains("third"));
-            Assert.IsFalse(list.Contains(new object()));
-        }
-
-        [Test]
-        public void IList_Add()
-        {
-            IList list = new RepeatedField<string> { "first", "second" };
-            list.Add("third");
-            CollectionAssert.AreEqual(new[] { "first", "second", "third" }, list);
-        }
-
-        [Test]
-        public void IList_Remove()
-        {
-            IList list = new RepeatedField<string> { "first", "second" };
-            list.Remove("third"); // No-op, no exception
-            list.Remove(new object()); // No-op, no exception
-            list.Remove("first");
-            CollectionAssert.AreEqual(new[] { "second" }, list);
-        }
-
-        [Test]
-        public void IList_IsFixedSize()
-        {
-            var field = new RepeatedField<string> { "first", "second" };
-            IList list = field;
-            Assert.IsFalse(list.IsFixedSize);
-        }
-
-        [Test]
-        public void IList_IndexOf()
-        {
-            IList list = new RepeatedField<string> { "first", "second" };
-            Assert.AreEqual(1, list.IndexOf("second"));
-            Assert.AreEqual(-1, list.IndexOf("third"));
-            Assert.AreEqual(-1, list.IndexOf(new object()));
-        }
-
-        [Test]
-        public void IList_SyncRoot()
-        {
-            IList list = new RepeatedField<string> { "first", "second" };
-            Assert.AreSame(list, list.SyncRoot);
-        }
-
-        [Test]
-        public void IList_CopyTo()
-        {
-            IList list = new RepeatedField<string> { "first", "second" };
-            string[] stringArray = new string[4];
-            list.CopyTo(stringArray, 1);
-            CollectionAssert.AreEqual(new[] { null, "first",  "second", null }, stringArray);
-
-            object[] objectArray = new object[4];
-            list.CopyTo(objectArray, 1);
-            CollectionAssert.AreEqual(new[] { null, "first", "second", null }, objectArray);
-
-            Assert.Throws<ArrayTypeMismatchException>(() => list.CopyTo(new StringBuilder[4], 1));
-            Assert.Throws<ArrayTypeMismatchException>(() => list.CopyTo(new int[4], 1));
-        }
-
-        [Test]
-        public void IList_IsSynchronized()
-        {
-            IList list = new RepeatedField<string> { "first", "second" };
-            Assert.IsFalse(list.IsSynchronized);
-        }
-
-        [Test]
-        public void IList_Insert()
-        {
-            IList list = new RepeatedField<string> { "first", "second" };
-            list.Insert(1, "middle");
-            CollectionAssert.AreEqual(new[] { "first", "middle", "second" }, list);
-        }
-
-        [Test]
-        public void ToString_Integers()
-        {
-            var list = new RepeatedField<int> { 5, 10, 20 };
-            var text = list.ToString();
-            Assert.AreEqual("[ 5, 10, 20 ]", text);
-        }
-
-        [Test]
-        public void ToString_Strings()
-        {
-            var list = new RepeatedField<string> { "x", "y", "z" };
-            var text = list.ToString();
-            Assert.AreEqual("[ \"x\", \"y\", \"z\" ]", text);
-        }
-
-        [Test]
-        public void ToString_Messages()
-        {
-            var list = new RepeatedField<TestAllTypes> { new TestAllTypes { SingleDouble = 1.5 }, new TestAllTypes { SingleInt32 = 10 } };
-            var text = list.ToString();
-            Assert.AreEqual("[ { \"singleDouble\": 1.5 }, { \"singleInt32\": 10 } ]", text);
-        }
-
-        [Test]
-        public void ToString_Empty()
-        {
-            var list = new RepeatedField<TestAllTypes> { };
-            var text = list.ToString();
-            Assert.AreEqual("[ ]", text);
-        }
-
-        [Test]
-        public void ToString_InvalidElementType()
-        {
-            var list = new RepeatedField<decimal> { 15m };
-            Assert.Throws<ArgumentException>(() => list.ToString());
-        }
-
-        [Test]
-        public void ToString_Timestamp()
-        {
-            var list = new RepeatedField<Timestamp> { Timestamp.FromDateTime(new DateTime(2015, 10, 1, 12, 34, 56, DateTimeKind.Utc)) };
-            var text = list.ToString();
-            Assert.AreEqual("[ \"2015-10-01T12:34:56Z\" ]", text);
-        }
-
-        [Test]
-        public void ToString_Struct()
-        {
-            var message = new Struct { Fields = { { "foo", new Value { NumberValue = 20 } } } };
-            var list = new RepeatedField<Struct> { message };
-            var text = list.ToString();
-            Assert.AreEqual(text, "[ { \"foo\": 20 } ]", message.ToString());
-        }
-    }
-}
diff --git a/libs/protobuf/csharp/compatibility_tests/v3.0.0/src/Google.Protobuf.Test/Compatibility/PropertyInfoExtensionsTest.cs b/libs/protobuf/csharp/compatibility_tests/v3.0.0/src/Google.Protobuf.Test/Compatibility/PropertyInfoExtensionsTest.cs
deleted file mode 100644
index df23a09..0000000
--- a/libs/protobuf/csharp/compatibility_tests/v3.0.0/src/Google.Protobuf.Test/Compatibility/PropertyInfoExtensionsTest.cs
+++ /dev/null
@@ -1,98 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using NUnit.Framework;
-using System.Reflection;
-
-namespace Google.Protobuf.Compatibility
-{
-    public class PropertyInfoExtensionsTest
-    {
-        public string PublicReadWrite { get; set; }
-        private string PrivateReadWrite { get; set; }
-        public string PublicReadPrivateWrite { get; private set; }
-        public string PrivateReadPublicWrite { private get; set; }
-        public string PublicReadOnly { get { return null; } }
-        private string PrivateReadOnly { get { return null; } }
-        public string PublicWriteOnly { set { } }
-        private string PrivateWriteOnly { set {  } }
-
-        [Test]
-        [TestCase("PublicReadWrite")]
-        [TestCase("PublicReadPrivateWrite")]
-        [TestCase("PublicReadOnly")]
-        public void GetGetMethod_Success(string name)
-        {
-            var propertyInfo = typeof(PropertyInfoExtensionsTest)
-                .GetProperty(name, BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public);
-            Assert.IsNotNull(PropertyInfoExtensions.GetGetMethod(propertyInfo));
-        }
-
-        [Test]
-        [TestCase("PrivateReadWrite")]
-        [TestCase("PrivateReadPublicWrite")]
-        [TestCase("PrivateReadOnly")]
-        [TestCase("PublicWriteOnly")]
-        [TestCase("PrivateWriteOnly")]
-        public void GetGetMethod_NoAccessibleGetter(string name)
-        {
-            var propertyInfo = typeof(PropertyInfoExtensionsTest)
-                .GetProperty(name, BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public);
-            Assert.IsNull(PropertyInfoExtensions.GetGetMethod(propertyInfo));
-        }
-
-        [Test]
-        [TestCase("PublicReadWrite")]
-        [TestCase("PrivateReadPublicWrite")]
-        [TestCase("PublicWriteOnly")]
-        public void GetSetMethod_Success(string name)
-        {
-            var propertyInfo = typeof(PropertyInfoExtensionsTest)
-                .GetProperty(name, BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public);
-            Assert.IsNotNull(PropertyInfoExtensions.GetSetMethod(propertyInfo));
-        }
-
-        [Test]
-        [TestCase("PublicReadPrivateWrite")]
-        [TestCase("PrivateReadWrite")]
-        [TestCase("PrivateReadOnly")]
-        [TestCase("PublicReadOnly")]
-        [TestCase("PrivateWriteOnly")]
-        public void GetSetMethod_NoAccessibleGetter(string name)
-        {
-            var propertyInfo = typeof(PropertyInfoExtensionsTest)
-                .GetProperty(name, BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public);
-            Assert.IsNull(PropertyInfoExtensions.GetSetMethod(propertyInfo));
-        }
-    }
-
-}
diff --git a/libs/protobuf/csharp/compatibility_tests/v3.0.0/src/Google.Protobuf.Test/Compatibility/TypeExtensionsTest.cs b/libs/protobuf/csharp/compatibility_tests/v3.0.0/src/Google.Protobuf.Test/Compatibility/TypeExtensionsTest.cs
deleted file mode 100644
index e8a3d36..0000000
--- a/libs/protobuf/csharp/compatibility_tests/v3.0.0/src/Google.Protobuf.Test/Compatibility/TypeExtensionsTest.cs
+++ /dev/null
@@ -1,117 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-using NUnit.Framework;
-using System;
-using System.Collections.Generic;
-using System.Reflection;
-
-#if !DOTNET35
-namespace Google.Protobuf.Compatibility
-{
-    public class TypeExtensionsTest
-    {
-        public class DerivedList : List<string> { }
-        public string PublicProperty { get; set; }
-        private string PrivateProperty { get; set; }
-
-        public void PublicMethod()
-        {
-        }
-
-        private void PrivateMethod()
-        {
-        }
-
-        [Test]
-        [TestCase(typeof(object), typeof(string), true)]
-        [TestCase(typeof(object), typeof(int), true)]
-        [TestCase(typeof(string), typeof(string), true)]
-        [TestCase(typeof(string), typeof(object), false)]
-        [TestCase(typeof(string), typeof(int), false)]
-        [TestCase(typeof(int), typeof(int), true)]
-        [TestCase(typeof(ValueType), typeof(int), true)]
-        [TestCase(typeof(long), typeof(int), false)] //
-        public void IsAssignableFrom(Type target, Type argument, bool expected)
-        {
-            Assert.AreEqual(expected, TypeExtensions.IsAssignableFrom(target, argument));
-        }
-
-        [Test]
-        [TestCase(typeof(DerivedList), "Count")] // Go up the type hierarchy
-        [TestCase(typeof(List<string>), "Count")]
-        [TestCase(typeof(List<>), "Count")]
-        [TestCase(typeof(TypeExtensionsTest), "PublicProperty")]
-        public void GetProperty_Success(Type type, string name)
-        {
-            var property = TypeExtensions.GetProperty(type, name);
-            Assert.IsNotNull(property);
-            Assert.AreEqual(name, property.Name);
-        }
-
-        [Test]
-        [TestCase(typeof(TypeExtensionsTest), "PrivateProperty")]
-        [TestCase(typeof(TypeExtensionsTest), "Garbage")]
-        public void GetProperty_NoSuchProperty(Type type, string name)
-        {
-            var property = TypeExtensions.GetProperty(type, name);
-            Assert.IsNull(property);
-        }
-
-        [Test]
-        [TestCase(typeof(DerivedList), "RemoveAt")] // Go up the type hierarchy
-        [TestCase(typeof(List<>), "RemoveAt")]
-        [TestCase(typeof(TypeExtensionsTest), "PublicMethod")]
-        public void GetMethod_Success(Type type, string name)
-        {
-            var method = TypeExtensions.GetMethod(type, name);
-            Assert.IsNotNull(method);
-            Assert.AreEqual(name, method.Name);
-        }
-
-        [Test]
-        [TestCase(typeof(TypeExtensionsTest), "PrivateMethod")]
-        [TestCase(typeof(TypeExtensionsTest), "GarbageMethod")]
-        public void GetMethod_NoSuchMethod(Type type, string name)
-        {
-            var method = TypeExtensions.GetMethod(type, name);
-            Assert.IsNull(method);
-        }
-
-        [Test]
-        [TestCase(typeof(List<string>), "IndexOf")]
-        public void GetMethod_Ambiguous(Type type, string name)
-        {
-            Assert.Throws<AmbiguousMatchException>(() => TypeExtensions.GetMethod(type, name));
-        }
-    }
-}
-#endif
diff --git a/libs/protobuf/csharp/compatibility_tests/v3.0.0/src/Google.Protobuf.Test/DeprecatedMemberTest.cs b/libs/protobuf/csharp/compatibility_tests/v3.0.0/src/Google.Protobuf.Test/DeprecatedMemberTest.cs
deleted file mode 100644
index fd041e0..0000000
--- a/libs/protobuf/csharp/compatibility_tests/v3.0.0/src/Google.Protobuf.Test/DeprecatedMemberTest.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-    
-using System;
-using System.Reflection;
-using Google.Protobuf.TestProtos;
-using NUnit.Framework;
-
-namespace Google.Protobuf
-{
-    public class DeprecatedMemberTest
-    {
-        private static void AssertIsDeprecated(MemberInfo member)
-        {
-            Assert.NotNull(member);
-            Assert.IsTrue(member.IsDefined(typeof(ObsoleteAttribute), false), "Member not obsolete: " + member);
-        }
-
-        [Test]
-        public void TestDepreatedPrimitiveValue()
-        {
-            AssertIsDeprecated(typeof(TestDeprecatedFields).GetProperty("DeprecatedInt32"));
-        }
-
-    }
-}
diff --git a/libs/protobuf/csharp/compatibility_tests/v3.0.0/src/Google.Protobuf.Test/EqualityTester.cs b/libs/protobuf/csharp/compatibility_tests/v3.0.0/src/Google.Protobuf.Test/EqualityTester.cs
deleted file mode 100644
index a669bab..0000000
--- a/libs/protobuf/csharp/compatibility_tests/v3.0.0/src/Google.Protobuf.Test/EqualityTester.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-using NUnit.Framework;
-
-namespace Google.Protobuf
-{
-    /// <summary>
-    /// Helper methods when testing equality. NUnit's Assert.AreEqual and
-    /// Assert.AreNotEqual methods try to be clever with collections, which can
-    /// be annoying...
-    /// </summary>
-    internal static class EqualityTester
-    {
-        public static void AssertEquality<T>(T first, T second) where T : IEquatable<T>
-        {
-            Assert.IsTrue(first.Equals(second));
-            Assert.IsTrue(first.Equals((object) second));
-            Assert.AreEqual(first.GetHashCode(), second.GetHashCode());
-        }
-
-        public static void AssertInequality<T>(T first, T second) where T : IEquatable<T>
-        {
-            Assert.IsFalse(first.Equals(second));
-            Assert.IsFalse(first.Equals((object) second));
-            // While this isn't a requirement, the chances of this test failing due to
-            // coincidence rather than a bug are very small.
-            if (first != null && second != null)
-            {
-                Assert.AreNotEqual(first.GetHashCode(), second.GetHashCode());
-            }
-        }
-    }
-}
diff --git a/libs/protobuf/csharp/compatibility_tests/v3.0.0/src/Google.Protobuf.Test/FieldCodecTest.cs b/libs/protobuf/csharp/compatibility_tests/v3.0.0/src/Google.Protobuf.Test/FieldCodecTest.cs
deleted file mode 100644
index 18e8767..0000000
--- a/libs/protobuf/csharp/compatibility_tests/v3.0.0/src/Google.Protobuf.Test/FieldCodecTest.cs
+++ /dev/null
@@ -1,214 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System.Collections.Generic;
-using System.IO;
-using System.Reflection;
-using Google.Protobuf.TestProtos;
-using NUnit.Framework;
-
-namespace Google.Protobuf
-{
-    public class FieldCodecTest
-    {
-#pragma warning disable 0414 // Used by tests via reflection - do not remove!
-        private static readonly List<ICodecTestData> Codecs = new List<ICodecTestData>
-        {
-            new FieldCodecTestData<bool>(FieldCodec.ForBool(100), true, "FixedBool"),
-            new FieldCodecTestData<string>(FieldCodec.ForString(100), "sample", "String"),
-            new FieldCodecTestData<ByteString>(FieldCodec.ForBytes(100), ByteString.CopyFrom(1, 2, 3), "Bytes"),
-            new FieldCodecTestData<int>(FieldCodec.ForInt32(100), -1000, "Int32"),
-            new FieldCodecTestData<int>(FieldCodec.ForSInt32(100), -1000, "SInt32"),
-            new FieldCodecTestData<int>(FieldCodec.ForSFixed32(100), -1000, "SFixed32"),
-            new FieldCodecTestData<uint>(FieldCodec.ForUInt32(100), 1234, "UInt32"),
-            new FieldCodecTestData<uint>(FieldCodec.ForFixed32(100), 1234, "Fixed32"),
-            new FieldCodecTestData<long>(FieldCodec.ForInt64(100), -1000, "Int64"),
-            new FieldCodecTestData<long>(FieldCodec.ForSInt64(100), -1000, "SInt64"),
-            new FieldCodecTestData<long>(FieldCodec.ForSFixed64(100), -1000, "SFixed64"),
-            new FieldCodecTestData<ulong>(FieldCodec.ForUInt64(100), 1234, "UInt64"),
-            new FieldCodecTestData<ulong>(FieldCodec.ForFixed64(100), 1234, "Fixed64"),
-            new FieldCodecTestData<float>(FieldCodec.ForFloat(100), 1234.5f, "FixedFloat"),
-            new FieldCodecTestData<double>(FieldCodec.ForDouble(100), 1234567890.5d, "FixedDouble"),
-            new FieldCodecTestData<ForeignEnum>(
-                FieldCodec.ForEnum(100, t => (int) t, t => (ForeignEnum) t), ForeignEnum.ForeignBaz, "Enum"),
-            new FieldCodecTestData<ForeignMessage>(
-                FieldCodec.ForMessage(100, ForeignMessage.Parser), new ForeignMessage { C = 10 }, "Message"),
-        };
-#pragma warning restore 0414
-
-        [Test, TestCaseSource("Codecs")]
-        public void RoundTripWithTag(ICodecTestData codec)
-        {
-            codec.TestRoundTripWithTag();
-        }
-
-        [Test, TestCaseSource("Codecs")]
-        public void RoundTripRaw(ICodecTestData codec)
-        {
-            codec.TestRoundTripRaw();
-        }
-
-        [Test, TestCaseSource("Codecs")]
-        public void CalculateSize(ICodecTestData codec)
-        {
-            codec.TestCalculateSizeWithTag();
-        }
-
-        [Test, TestCaseSource("Codecs")]
-        public void DefaultValue(ICodecTestData codec)
-        {
-            codec.TestDefaultValue();
-        }
-
-        [Test, TestCaseSource("Codecs")]
-        public void FixedSize(ICodecTestData codec)
-        {
-            codec.TestFixedSize();
-        }
-
-        // This is ugly, but it means we can have a non-generic interface.
-        // It feels like NUnit should support this better, but I don't know
-        // of any better ways right now.
-        public interface ICodecTestData
-        {
-            void TestRoundTripRaw();
-            void TestRoundTripWithTag();
-            void TestCalculateSizeWithTag();
-            void TestDefaultValue();
-            void TestFixedSize();
-        }
-
-        public class FieldCodecTestData<T> : ICodecTestData
-        {
-            private readonly FieldCodec<T> codec;
-            private readonly T sampleValue;
-            private readonly string name;
-
-            public FieldCodecTestData(FieldCodec<T> codec, T sampleValue, string name)
-            {
-                this.codec = codec;
-                this.sampleValue = sampleValue;
-                this.name = name;
-            }
-
-            public void TestRoundTripRaw()
-            {
-                var stream = new MemoryStream();
-                var codedOutput = new CodedOutputStream(stream);
-                WriteContext.Initialize(codedOutput, out WriteContext ctx);
-                try
-                {
-                    // only write the value using the codec
-                    codec.ValueWriter(ref ctx, sampleValue);
-                }
-                finally
-                {
-                    ctx.CopyStateTo(codedOutput);
-                }
-                codedOutput.Flush();
-                stream.Position = 0;
-                var codedInput = new CodedInputStream(stream);
-                Assert.AreEqual(sampleValue, codec.Read(codedInput));
-                Assert.IsTrue(codedInput.IsAtEnd);
-            }
-
-            public void TestRoundTripWithTag()
-            {
-                var stream = new MemoryStream();
-                var codedOutput = new CodedOutputStream(stream);
-                codec.WriteTagAndValue(codedOutput, sampleValue);
-                codedOutput.Flush();
-                stream.Position = 0;
-                var codedInput = new CodedInputStream(stream);
-                codedInput.AssertNextTag(codec.Tag);
-                Assert.AreEqual(sampleValue, codec.Read(codedInput));
-                Assert.IsTrue(codedInput.IsAtEnd);
-            }
-
-            public void TestCalculateSizeWithTag()
-            {
-                var stream = new MemoryStream();
-                var codedOutput = new CodedOutputStream(stream);
-                codec.WriteTagAndValue(codedOutput, sampleValue);
-                codedOutput.Flush();
-                Assert.AreEqual(stream.Position, codec.CalculateSizeWithTag(sampleValue));
-            }
-
-            public void TestDefaultValue()
-            {
-                // WriteTagAndValue ignores default values
-                var stream = new MemoryStream();
-                var codedOutput = new CodedOutputStream(stream);
-                codec.WriteTagAndValue(codedOutput, codec.DefaultValue);
-                codedOutput.Flush();
-                Assert.AreEqual(0, stream.Position);
-                Assert.AreEqual(0, codec.CalculateSizeWithTag(codec.DefaultValue));
-                if (typeof(T).GetTypeInfo().IsValueType)
-                {
-                    Assert.AreEqual(default(T), codec.DefaultValue);
-                }
-
-                // The plain ValueWriter/ValueReader delegates don't.
-                if (codec.DefaultValue != null) // This part isn't appropriate for message types.
-                {
-                    codedOutput = new CodedOutputStream(stream);
-                    WriteContext.Initialize(codedOutput, out WriteContext ctx);
-                    try
-                    {
-                        // only write the value using the codec
-                        codec.ValueWriter(ref ctx, codec.DefaultValue);
-                    }
-                    finally
-                    {
-                        ctx.CopyStateTo(codedOutput);
-                    }
-                    codedOutput.Flush();
-                    Assert.AreNotEqual(0, stream.Position);
-                    Assert.AreEqual(stream.Position, codec.ValueSizeCalculator(codec.DefaultValue));
-                    stream.Position = 0;
-                    var codedInput = new CodedInputStream(stream);
-                    Assert.AreEqual(codec.DefaultValue, codec.Read(codedInput));
-                }
-            }
-
-            public void TestFixedSize()
-            {
-                Assert.AreEqual(name.Contains("Fixed"), codec.FixedSize != 0);
-            }
-
-            public override string ToString()
-            {
-                return name;
-            }
-        }
-    }
-}
diff --git a/libs/protobuf/csharp/compatibility_tests/v3.0.0/src/Google.Protobuf.Test/GeneratedMessageTest.cs b/libs/protobuf/csharp/compatibility_tests/v3.0.0/src/Google.Protobuf.Test/GeneratedMessageTest.cs
deleted file mode 100644
index 61f3abb..0000000
--- a/libs/protobuf/csharp/compatibility_tests/v3.0.0/src/Google.Protobuf.Test/GeneratedMessageTest.cs
+++ /dev/null
@@ -1,725 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-using System.IO;
-using Google.Protobuf.TestProtos;
-using NUnit.Framework;
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-using Google.Protobuf.WellKnownTypes;
-
-namespace Google.Protobuf
-{
-    /// <summary>
-    /// Tests around the generated TestAllTypes message.
-    /// </summary>
-    public class GeneratedMessageTest
-    {
-        [Test]
-        public void EmptyMessageFieldDistinctFromMissingMessageField()
-        {
-            // This demonstrates what we're really interested in...
-            var message1 = new TestAllTypes { SingleForeignMessage = new ForeignMessage() };
-            var message2 = new TestAllTypes(); // SingleForeignMessage is null
-            EqualityTester.AssertInequality(message1, message2);
-        }
-
-        [Test]
-        public void DefaultValues()
-        {
-            // Single fields
-            var message = new TestAllTypes();
-            Assert.AreEqual(false, message.SingleBool);
-            Assert.AreEqual(ByteString.Empty, message.SingleBytes);
-            Assert.AreEqual(0.0, message.SingleDouble);
-            Assert.AreEqual(0, message.SingleFixed32);
-            Assert.AreEqual(0L, message.SingleFixed64);
-            Assert.AreEqual(0.0f, message.SingleFloat);
-            Assert.AreEqual(ForeignEnum.ForeignUnspecified, message.SingleForeignEnum);
-            Assert.IsNull(message.SingleForeignMessage);
-            Assert.AreEqual(ImportEnum.Unspecified, message.SingleImportEnum);
-            Assert.IsNull(message.SingleImportMessage);
-            Assert.AreEqual(0, message.SingleInt32);
-            Assert.AreEqual(0L, message.SingleInt64);
-            Assert.AreEqual(TestAllTypes.Types.NestedEnum.Unspecified, message.SingleNestedEnum);
-            Assert.IsNull(message.SingleNestedMessage);
-            Assert.IsNull(message.SinglePublicImportMessage);
-            Assert.AreEqual(0, message.SingleSfixed32);
-            Assert.AreEqual(0L, message.SingleSfixed64);
-            Assert.AreEqual(0, message.SingleSint32);
-            Assert.AreEqual(0L, message.SingleSint64);
-            Assert.AreEqual("", message.SingleString);
-            Assert.AreEqual(0U, message.SingleUint32);
-            Assert.AreEqual(0UL, message.SingleUint64);
-
-            // Repeated fields
-            Assert.AreEqual(0, message.RepeatedBool.Count);
-            Assert.AreEqual(0, message.RepeatedBytes.Count);
-            Assert.AreEqual(0, message.RepeatedDouble.Count);
-            Assert.AreEqual(0, message.RepeatedFixed32.Count);
-            Assert.AreEqual(0, message.RepeatedFixed64.Count);
-            Assert.AreEqual(0, message.RepeatedFloat.Count);
-            Assert.AreEqual(0, message.RepeatedForeignEnum.Count);
-            Assert.AreEqual(0, message.RepeatedForeignMessage.Count);
-            Assert.AreEqual(0, message.RepeatedImportEnum.Count);
-            Assert.AreEqual(0, message.RepeatedImportMessage.Count);
-            Assert.AreEqual(0, message.RepeatedNestedEnum.Count);
-            Assert.AreEqual(0, message.RepeatedNestedMessage.Count);
-            Assert.AreEqual(0, message.RepeatedPublicImportMessage.Count);
-            Assert.AreEqual(0, message.RepeatedSfixed32.Count);
-            Assert.AreEqual(0, message.RepeatedSfixed64.Count);
-            Assert.AreEqual(0, message.RepeatedSint32.Count);
-            Assert.AreEqual(0, message.RepeatedSint64.Count);
-            Assert.AreEqual(0, message.RepeatedString.Count);
-            Assert.AreEqual(0, message.RepeatedUint32.Count);
-            Assert.AreEqual(0, message.RepeatedUint64.Count);
-
-            // Oneof fields
-            Assert.AreEqual(TestAllTypes.OneofFieldOneofCase.None, message.OneofFieldCase);
-            Assert.AreEqual(0, message.OneofUint32);
-            Assert.AreEqual("", message.OneofString);
-            Assert.AreEqual(ByteString.Empty, message.OneofBytes);
-            Assert.IsNull(message.OneofNestedMessage);
-        }
-
-        [Test]
-        public void NullStringAndBytesRejected()
-        {
-            var message = new TestAllTypes();
-            Assert.Throws<ArgumentNullException>(() => message.SingleString = null);
-            Assert.Throws<ArgumentNullException>(() => message.OneofString = null);
-            Assert.Throws<ArgumentNullException>(() => message.SingleBytes = null);
-            Assert.Throws<ArgumentNullException>(() => message.OneofBytes = null);
-        }
-
-        [Test]
-        public void RoundTrip_Empty()
-        {
-            var message = new TestAllTypes();
-            // Without setting any values, there's nothing to write.
-            byte[] bytes = message.ToByteArray();
-            Assert.AreEqual(0, bytes.Length);
-            TestAllTypes parsed = TestAllTypes.Parser.ParseFrom(bytes);
-            Assert.AreEqual(message, parsed);
-        }
-
-        [Test]
-        public void RoundTrip_SingleValues()
-        {
-            var message = new TestAllTypes
-            {
-                SingleBool = true,
-                SingleBytes = ByteString.CopyFrom(1, 2, 3, 4),
-                SingleDouble = 23.5,
-                SingleFixed32 = 23,
-                SingleFixed64 = 1234567890123,
-                SingleFloat = 12.25f,
-                SingleForeignEnum = ForeignEnum.ForeignBar,
-                SingleForeignMessage = new ForeignMessage { C = 10 },
-                SingleImportEnum = ImportEnum.ImportBaz,
-                SingleImportMessage = new ImportMessage { D = 20 },
-                SingleInt32 = 100,
-                SingleInt64 = 3210987654321,
-                SingleNestedEnum = TestAllTypes.Types.NestedEnum.Foo,
-                SingleNestedMessage = new TestAllTypes.Types.NestedMessage { Bb = 35 },
-                SinglePublicImportMessage = new PublicImportMessage { E = 54 },
-                SingleSfixed32 = -123,
-                SingleSfixed64 = -12345678901234,
-                SingleSint32 = -456,
-                SingleSint64 = -12345678901235,
-                SingleString = "test",
-                SingleUint32 = uint.MaxValue,
-                SingleUint64 = ulong.MaxValue
-            };
-
-            byte[] bytes = message.ToByteArray();
-            TestAllTypes parsed = TestAllTypes.Parser.ParseFrom(bytes);
-            Assert.AreEqual(message, parsed);
-        }
-
-        [Test]
-        public void RoundTrip_RepeatedValues()
-        {
-            var message = new TestAllTypes
-            {
-                RepeatedBool = { true, false },
-                RepeatedBytes = { ByteString.CopyFrom(1, 2, 3, 4), ByteString.CopyFrom(5, 6) },
-                RepeatedDouble = { -12.25, 23.5 },
-                RepeatedFixed32 = { uint.MaxValue, 23 },
-                RepeatedFixed64 = { ulong.MaxValue, 1234567890123 },
-                RepeatedFloat = { 100f, 12.25f },
-                RepeatedForeignEnum = { ForeignEnum.ForeignFoo, ForeignEnum.ForeignBar },
-                RepeatedForeignMessage = { new ForeignMessage(), new ForeignMessage { C = 10 } },
-                RepeatedImportEnum = { ImportEnum.ImportBaz, ImportEnum.Unspecified },
-                RepeatedImportMessage = { new ImportMessage { D = 20 }, new ImportMessage { D = 25 } },
-                RepeatedInt32 = { 100, 200 },
-                RepeatedInt64 = { 3210987654321, long.MaxValue },
-                RepeatedNestedEnum = { TestAllTypes.Types.NestedEnum.Foo, TestAllTypes.Types.NestedEnum.Neg },
-                RepeatedNestedMessage = { new TestAllTypes.Types.NestedMessage { Bb = 35 }, new TestAllTypes.Types.NestedMessage { Bb = 10 } },
-                RepeatedPublicImportMessage = { new PublicImportMessage { E = 54 }, new PublicImportMessage { E = -1 } },
-                RepeatedSfixed32 = { -123, 123 },
-                RepeatedSfixed64 = { -12345678901234, 12345678901234 },
-                RepeatedSint32 = { -456, 100 },
-                RepeatedSint64 = { -12345678901235, 123 },
-                RepeatedString = { "foo", "bar" },
-                RepeatedUint32 = { uint.MaxValue, uint.MinValue },
-                RepeatedUint64 = { ulong.MaxValue, uint.MinValue }
-            };
-
-            byte[] bytes = message.ToByteArray();
-            TestAllTypes parsed = TestAllTypes.Parser.ParseFrom(bytes);
-            Assert.AreEqual(message, parsed);
-        }
-
-        // Note that not every map within map_unittest_proto3 is used. They all go through very
-        // similar code paths. The fact that all maps are present is validation that we have codecs
-        // for every type.
-        [Test]
-        public void RoundTrip_Maps()
-        {
-            var message = new TestMap
-            {
-                MapBoolBool = {
-                    { false, true },
-                    { true, false }
-                },
-                MapInt32Bytes = {
-                    { 5, ByteString.CopyFrom(6, 7, 8) },
-                    { 25, ByteString.CopyFrom(1, 2, 3, 4, 5) },
-                    { 10, ByteString.Empty }
-                },
-                MapInt32ForeignMessage = {
-                    { 0, new ForeignMessage { C = 10 } },
-                    { 5, new ForeignMessage() },
-                },
-                MapInt32Enum = {
-                    { 1, MapEnum.Bar },
-                    { 2000, MapEnum.Foo }
-                }
-            };
-
-            byte[] bytes = message.ToByteArray();
-            TestMap parsed = TestMap.Parser.ParseFrom(bytes);
-            Assert.AreEqual(message, parsed);
-        }
-
-        [Test]
-        public void MapWithEmptyEntry()
-        {
-            var message = new TestMap
-            {
-                MapInt32Bytes = { { 0, ByteString.Empty } }
-            };
-
-            byte[] bytes = message.ToByteArray();
-            Assert.AreEqual(2, bytes.Length); // Tag for field entry (1 byte), length of entry (0; 1 byte)
-
-            var parsed = TestMap.Parser.ParseFrom(bytes);
-            Assert.AreEqual(1, parsed.MapInt32Bytes.Count);
-            Assert.AreEqual(ByteString.Empty, parsed.MapInt32Bytes[0]);
-        }
-
-        [Test]
-        public void MapWithOnlyValue()
-        {
-            // Hand-craft the stream to contain a single entry with just a value.
-            var memoryStream = new MemoryStream();
-            var output = new CodedOutputStream(memoryStream);
-            output.WriteTag(TestMap.MapInt32ForeignMessageFieldNumber, WireFormat.WireType.LengthDelimited);
-            var nestedMessage = new ForeignMessage { C = 20 };
-            // Size of the entry (tag, size written by WriteMessage, data written by WriteMessage)
-            output.WriteLength(2 + nestedMessage.CalculateSize());
-            output.WriteTag(2, WireFormat.WireType.LengthDelimited);
-            output.WriteMessage(nestedMessage);
-            output.Flush();
-
-            var parsed = TestMap.Parser.ParseFrom(memoryStream.ToArray());
-            Assert.AreEqual(nestedMessage, parsed.MapInt32ForeignMessage[0]);
-        }
-
-        [Test]
-        public void MapWithOnlyKey_PrimitiveValue()
-        {
-            // Hand-craft the stream to contain a single entry with just a key.
-            var memoryStream = new MemoryStream();
-            var output = new CodedOutputStream(memoryStream);
-            output.WriteTag(TestMap.MapInt32DoubleFieldNumber, WireFormat.WireType.LengthDelimited);
-            int key = 10;
-            output.WriteLength(1 + CodedOutputStream.ComputeInt32Size(key));
-            output.WriteTag(1, WireFormat.WireType.Varint);
-            output.WriteInt32(key);
-            output.Flush();
-
-            var parsed = TestMap.Parser.ParseFrom(memoryStream.ToArray());
-            Assert.AreEqual(0.0, parsed.MapInt32Double[key]);
-        }
-
-        [Test]
-        public void MapWithOnlyKey_MessageValue()
-        {
-            // Hand-craft the stream to contain a single entry with just a key.
-            var memoryStream = new MemoryStream();
-            var output = new CodedOutputStream(memoryStream);
-            output.WriteTag(TestMap.MapInt32ForeignMessageFieldNumber, WireFormat.WireType.LengthDelimited);
-            int key = 10;
-            output.WriteLength(1 + CodedOutputStream.ComputeInt32Size(key));
-            output.WriteTag(1, WireFormat.WireType.Varint);
-            output.WriteInt32(key);
-            output.Flush();
-
-            var parsed = TestMap.Parser.ParseFrom(memoryStream.ToArray());
-            Assert.AreEqual(new ForeignMessage(), parsed.MapInt32ForeignMessage[key]);
-        }
-
-        [Test]
-        public void MapIgnoresExtraFieldsWithinEntryMessages()
-        {
-            // Hand-craft the stream to contain a single entry with three fields
-            var memoryStream = new MemoryStream();
-            var output = new CodedOutputStream(memoryStream);
-
-            output.WriteTag(TestMap.MapInt32Int32FieldNumber, WireFormat.WireType.LengthDelimited);
-
-            var key = 10; // Field 1 
-            var value = 20; // Field 2
-            var extra = 30; // Field 3
-
-            // Each field can be represented in a single byte, with a single byte tag.
-            // Total message size: 6 bytes.
-            output.WriteLength(6);
-            output.WriteTag(1, WireFormat.WireType.Varint);
-            output.WriteInt32(key);
-            output.WriteTag(2, WireFormat.WireType.Varint);
-            output.WriteInt32(value);
-            output.WriteTag(3, WireFormat.WireType.Varint);
-            output.WriteInt32(extra);
-            output.Flush();
-
-            var parsed = TestMap.Parser.ParseFrom(memoryStream.ToArray());
-            Assert.AreEqual(value, parsed.MapInt32Int32[key]);
-        }
-
-        [Test]
-        public void MapFieldOrderIsIrrelevant()
-        {
-            var memoryStream = new MemoryStream();
-            var output = new CodedOutputStream(memoryStream);
-
-            output.WriteTag(TestMap.MapInt32Int32FieldNumber, WireFormat.WireType.LengthDelimited);
-
-            var key = 10;
-            var value = 20;
-
-            // Each field can be represented in a single byte, with a single byte tag.
-            // Total message size: 4 bytes.
-            output.WriteLength(4);
-            output.WriteTag(2, WireFormat.WireType.Varint);
-            output.WriteInt32(value);
-            output.WriteTag(1, WireFormat.WireType.Varint);
-            output.WriteInt32(key);
-            output.Flush();
-
-            var parsed = TestMap.Parser.ParseFrom(memoryStream.ToArray());
-            Assert.AreEqual(value, parsed.MapInt32Int32[key]);
-        }
-
-        [Test]
-        public void MapNonContiguousEntries()
-        {
-            var memoryStream = new MemoryStream();
-            var output = new CodedOutputStream(memoryStream);
-
-            // Message structure:
-            // Entry for MapInt32Int32
-            // Entry for MapStringString
-            // Entry for MapInt32Int32
-
-            // First entry
-            var key1 = 10;
-            var value1 = 20;
-            output.WriteTag(TestMap.MapInt32Int32FieldNumber, WireFormat.WireType.LengthDelimited);
-            output.WriteLength(4);
-            output.WriteTag(1, WireFormat.WireType.Varint);
-            output.WriteInt32(key1);
-            output.WriteTag(2, WireFormat.WireType.Varint);
-            output.WriteInt32(value1);
-
-            // Second entry
-            var key2 = "a";
-            var value2 = "b";
-            output.WriteTag(TestMap.MapStringStringFieldNumber, WireFormat.WireType.LengthDelimited);
-            output.WriteLength(6); // 3 bytes per entry: tag, size, character
-            output.WriteTag(1, WireFormat.WireType.LengthDelimited);
-            output.WriteString(key2);
-            output.WriteTag(2, WireFormat.WireType.LengthDelimited);
-            output.WriteString(value2);
-
-            // Third entry
-            var key3 = 15;
-            var value3 = 25;
-            output.WriteTag(TestMap.MapInt32Int32FieldNumber, WireFormat.WireType.LengthDelimited);
-            output.WriteLength(4);
-            output.WriteTag(1, WireFormat.WireType.Varint);
-            output.WriteInt32(key3);
-            output.WriteTag(2, WireFormat.WireType.Varint);
-            output.WriteInt32(value3);
-
-            output.Flush();
-            var parsed = TestMap.Parser.ParseFrom(memoryStream.ToArray());
-            var expected = new TestMap
-            {
-                MapInt32Int32 = { { key1, value1 }, { key3, value3 } },
-                MapStringString = { { key2, value2 } }
-            };
-            Assert.AreEqual(expected, parsed);
-        }
-
-        [Test]
-        public void DuplicateKeys_LastEntryWins()
-        {
-            var memoryStream = new MemoryStream();
-            var output = new CodedOutputStream(memoryStream);
-
-            var key = 10;
-            var value1 = 20;
-            var value2 = 30;
-
-            // First entry
-            output.WriteTag(TestMap.MapInt32Int32FieldNumber, WireFormat.WireType.LengthDelimited);
-            output.WriteLength(4);
-            output.WriteTag(1, WireFormat.WireType.Varint);
-            output.WriteInt32(key);
-            output.WriteTag(2, WireFormat.WireType.Varint);
-            output.WriteInt32(value1);
-
-            // Second entry - same key, different value
-            output.WriteTag(TestMap.MapInt32Int32FieldNumber, WireFormat.WireType.LengthDelimited);
-            output.WriteLength(4);
-            output.WriteTag(1, WireFormat.WireType.Varint);
-            output.WriteInt32(key);
-            output.WriteTag(2, WireFormat.WireType.Varint);
-            output.WriteInt32(value2);
-            output.Flush();
-
-            var parsed = TestMap.Parser.ParseFrom(memoryStream.ToArray());
-            Assert.AreEqual(value2, parsed.MapInt32Int32[key]);
-        }
-
-        [Test]
-        public void CloneSingleNonMessageValues()
-        {
-            var original = new TestAllTypes
-            {
-                SingleBool = true,
-                SingleBytes = ByteString.CopyFrom(1, 2, 3, 4),
-                SingleDouble = 23.5,
-                SingleFixed32 = 23,
-                SingleFixed64 = 1234567890123,
-                SingleFloat = 12.25f,
-                SingleInt32 = 100,
-                SingleInt64 = 3210987654321,
-                SingleNestedEnum = TestAllTypes.Types.NestedEnum.Foo,
-                SingleSfixed32 = -123,
-                SingleSfixed64 = -12345678901234,
-                SingleSint32 = -456,
-                SingleSint64 = -12345678901235,
-                SingleString = "test",
-                SingleUint32 = uint.MaxValue,
-                SingleUint64 = ulong.MaxValue
-            };
-            var clone = original.Clone();
-            Assert.AreNotSame(original, clone);
-            Assert.AreEqual(original, clone);
-            // Just as a single example
-            clone.SingleInt32 = 150;
-            Assert.AreNotEqual(original, clone);
-        }
-
-        [Test]
-        public void CloneRepeatedNonMessageValues()
-        {
-            var original = new TestAllTypes
-            {
-                RepeatedBool = { true, false },
-                RepeatedBytes = { ByteString.CopyFrom(1, 2, 3, 4), ByteString.CopyFrom(5, 6) },
-                RepeatedDouble = { -12.25, 23.5 },
-                RepeatedFixed32 = { uint.MaxValue, 23 },
-                RepeatedFixed64 = { ulong.MaxValue, 1234567890123 },
-                RepeatedFloat = { 100f, 12.25f },
-                RepeatedInt32 = { 100, 200 },
-                RepeatedInt64 = { 3210987654321, long.MaxValue },
-                RepeatedNestedEnum = { TestAllTypes.Types.NestedEnum.Foo, TestAllTypes.Types.NestedEnum.Neg },
-                RepeatedSfixed32 = { -123, 123 },
-                RepeatedSfixed64 = { -12345678901234, 12345678901234 },
-                RepeatedSint32 = { -456, 100 },
-                RepeatedSint64 = { -12345678901235, 123 },
-                RepeatedString = { "foo", "bar" },
-                RepeatedUint32 = { uint.MaxValue, uint.MinValue },
-                RepeatedUint64 = { ulong.MaxValue, uint.MinValue }
-            };
-
-            var clone = original.Clone();
-            Assert.AreNotSame(original, clone);
-            Assert.AreEqual(original, clone);
-            // Just as a single example
-            clone.RepeatedDouble.Add(25.5);
-            Assert.AreNotEqual(original, clone);
-        }
-
-        [Test]
-        public void CloneSingleMessageField()
-        {
-            var original = new TestAllTypes
-            {
-                SingleNestedMessage = new TestAllTypes.Types.NestedMessage { Bb = 20 }
-            };
-
-            var clone = original.Clone();
-            Assert.AreNotSame(original, clone);
-            Assert.AreNotSame(original.SingleNestedMessage, clone.SingleNestedMessage);
-            Assert.AreEqual(original, clone);
-
-            clone.SingleNestedMessage.Bb = 30;
-            Assert.AreNotEqual(original, clone);
-        }
-
-        [Test]
-        public void CloneRepeatedMessageField()
-        {
-            var original = new TestAllTypes
-            {
-                RepeatedNestedMessage = { new TestAllTypes.Types.NestedMessage { Bb = 20 } }
-            };
-
-            var clone = original.Clone();
-            Assert.AreNotSame(original, clone);
-            Assert.AreNotSame(original.RepeatedNestedMessage, clone.RepeatedNestedMessage);
-            Assert.AreNotSame(original.RepeatedNestedMessage[0], clone.RepeatedNestedMessage[0]);
-            Assert.AreEqual(original, clone);
-
-            clone.RepeatedNestedMessage[0].Bb = 30;
-            Assert.AreNotEqual(original, clone);
-        }
-
-        [Test]
-        public void CloneOneofField()
-        {
-            var original = new TestAllTypes
-            {
-                OneofNestedMessage = new TestAllTypes.Types.NestedMessage { Bb = 20 }
-            };
-
-            var clone = original.Clone();
-            Assert.AreNotSame(original, clone);
-            Assert.AreEqual(original, clone);
-
-            // We should have cloned the message
-            original.OneofNestedMessage.Bb = 30;
-            Assert.AreNotEqual(original, clone);
-        }
-
-        [Test]
-        public void OneofProperties()
-        {
-            // Switch the oneof case between each of the different options, and check everything behaves
-            // as expected in each case.
-            var message = new TestAllTypes();
-            Assert.AreEqual("", message.OneofString);
-            Assert.AreEqual(0, message.OneofUint32);
-            Assert.AreEqual(ByteString.Empty, message.OneofBytes);
-            Assert.IsNull(message.OneofNestedMessage);
-            Assert.AreEqual(TestAllTypes.OneofFieldOneofCase.None, message.OneofFieldCase);
-
-            message.OneofString = "sample";
-            Assert.AreEqual("sample", message.OneofString);
-            Assert.AreEqual(0, message.OneofUint32);
-            Assert.AreEqual(ByteString.Empty, message.OneofBytes);
-            Assert.IsNull(message.OneofNestedMessage);
-            Assert.AreEqual(TestAllTypes.OneofFieldOneofCase.OneofString, message.OneofFieldCase);
-
-            var bytes = ByteString.CopyFrom(1, 2, 3);
-            message.OneofBytes = bytes;
-            Assert.AreEqual("", message.OneofString);
-            Assert.AreEqual(0, message.OneofUint32);
-            Assert.AreEqual(bytes, message.OneofBytes);
-            Assert.IsNull(message.OneofNestedMessage);
-            Assert.AreEqual(TestAllTypes.OneofFieldOneofCase.OneofBytes, message.OneofFieldCase);
-
-            message.OneofUint32 = 20;
-            Assert.AreEqual("", message.OneofString);
-            Assert.AreEqual(20, message.OneofUint32);
-            Assert.AreEqual(ByteString.Empty, message.OneofBytes);
-            Assert.IsNull(message.OneofNestedMessage);
-            Assert.AreEqual(TestAllTypes.OneofFieldOneofCase.OneofUint32, message.OneofFieldCase);
-
-            var nestedMessage = new TestAllTypes.Types.NestedMessage { Bb = 25 };
-            message.OneofNestedMessage = nestedMessage;
-            Assert.AreEqual("", message.OneofString);
-            Assert.AreEqual(0, message.OneofUint32);
-            Assert.AreEqual(ByteString.Empty, message.OneofBytes);
-            Assert.AreEqual(nestedMessage, message.OneofNestedMessage);
-            Assert.AreEqual(TestAllTypes.OneofFieldOneofCase.OneofNestedMessage, message.OneofFieldCase);
-
-            message.ClearOneofField();
-            Assert.AreEqual("", message.OneofString);
-            Assert.AreEqual(0, message.OneofUint32);
-            Assert.AreEqual(ByteString.Empty, message.OneofBytes);
-            Assert.IsNull(message.OneofNestedMessage);
-            Assert.AreEqual(TestAllTypes.OneofFieldOneofCase.None, message.OneofFieldCase);
-        }
-
-        [Test]
-        public void Oneof_DefaultValuesNotEqual()
-        {
-            var message1 = new TestAllTypes { OneofString = "" };
-            var message2 = new TestAllTypes { OneofUint32 = 0 };
-            Assert.AreEqual(TestAllTypes.OneofFieldOneofCase.OneofString, message1.OneofFieldCase);
-            Assert.AreEqual(TestAllTypes.OneofFieldOneofCase.OneofUint32, message2.OneofFieldCase);
-            Assert.AreNotEqual(message1, message2);
-        }
-
-        [Test]
-        public void OneofSerialization_NonDefaultValue()
-        {
-            var message = new TestAllTypes();
-            message.OneofString = "this would take a bit of space";
-            message.OneofUint32 = 10;
-            var bytes = message.ToByteArray();
-            Assert.AreEqual(3, bytes.Length); // 2 bytes for the tag + 1 for the value - no string!
-
-            var message2 = TestAllTypes.Parser.ParseFrom(bytes);
-            Assert.AreEqual(message, message2);
-            Assert.AreEqual(TestAllTypes.OneofFieldOneofCase.OneofUint32, message2.OneofFieldCase);
-        }
-
-        [Test]
-        public void OneofSerialization_DefaultValue()
-        {
-            var message = new TestAllTypes();
-            message.OneofString = "this would take a bit of space";
-            message.OneofUint32 = 0; // This is the default value for UInt32; normally wouldn't be serialized
-            var bytes = message.ToByteArray();
-            Assert.AreEqual(3, bytes.Length); // 2 bytes for the tag + 1 for the value - it's still serialized
-
-            var message2 = TestAllTypes.Parser.ParseFrom(bytes);
-            Assert.AreEqual(message, message2);
-            Assert.AreEqual(TestAllTypes.OneofFieldOneofCase.OneofUint32, message2.OneofFieldCase);
-        }
-
-        [Test]
-        public void DiscardUnknownFields_RealDataStillRead()
-        {
-            var message = SampleMessages.CreateFullTestAllTypes();
-            var stream = new MemoryStream();
-            var output = new CodedOutputStream(stream);
-            var unusedFieldNumber = 23456;
-            Assert.IsFalse(TestAllTypes.Descriptor.Fields.InDeclarationOrder().Select(x => x.FieldNumber).Contains(unusedFieldNumber));
-            output.WriteTag(unusedFieldNumber, WireFormat.WireType.LengthDelimited);
-            output.WriteString("ignore me");
-            message.WriteTo(output);
-            output.Flush();
-
-            stream.Position = 0;
-            var parsed = TestAllTypes.Parser.ParseFrom(stream);
-	    // TODO(jieluo): Add test back after DiscardUnknownFields is supported
-            // Assert.AreEqual(message, parsed);
-        }
-
-        [Test]
-        public void DiscardUnknownFields_AllTypes()
-        {
-            // Simple way of ensuring we can skip all kinds of fields.
-            var data = SampleMessages.CreateFullTestAllTypes().ToByteArray();
-            var empty = Empty.Parser.ParseFrom(data);
-	    // TODO(jieluo): Add test back after DiscardUnknownField is supported.
-            // Assert.AreEqual(new Empty(), empty);
-        }
-
-        // This was originally seen as a conformance test failure.
-        [Test]
-        public void TruncatedMessageFieldThrows()
-        {
-            // 130, 3 is the message tag
-            // 1 is the data length - but there's no data.
-            var data = new byte[] { 130, 3, 1 };
-            Assert.Throws<InvalidProtocolBufferException>(() => TestAllTypes.Parser.ParseFrom(data));
-        }
-
-        /// <summary>
-        /// Demonstrates current behaviour with an extraneous end group tag - see issue 688
-        /// for details; we may want to change this.
-        /// </summary>
-        [Test]
-        public void ExtraEndGroupThrows()
-        {
-            var message = SampleMessages.CreateFullTestAllTypes();
-            var stream = new MemoryStream();
-            var output = new CodedOutputStream(stream);
-
-            output.WriteTag(TestAllTypes.SingleFixed32FieldNumber, WireFormat.WireType.Fixed32);
-            output.WriteFixed32(123);
-            output.WriteTag(100, WireFormat.WireType.EndGroup);
-
-            output.Flush();
-
-            stream.Position = 0;
-            Assert.Throws<InvalidProtocolBufferException>(() => TestAllTypes.Parser.ParseFrom(stream));
-        }
-
-        [Test]
-        public void CustomDiagnosticMessage_DirectToStringCall()
-        {
-            var message = new ForeignMessage { C = 31 };
-            Assert.AreEqual("{ \"c\": 31, \"@cInHex\": \"1f\" }", message.ToString());
-            Assert.AreEqual("{ \"c\": 31 }", JsonFormatter.Default.Format(message));
-        }
-
-        [Test]
-        public void CustomDiagnosticMessage_Nested()
-        {
-            var message = new TestAllTypes { SingleForeignMessage = new ForeignMessage { C = 16 } };
-            Assert.AreEqual("{ \"singleForeignMessage\": { \"c\": 16, \"@cInHex\": \"10\" } }", message.ToString());
-            Assert.AreEqual("{ \"singleForeignMessage\": { \"c\": 16 } }", JsonFormatter.Default.Format(message));
-        }
-
-        [Test]
-        public void CustomDiagnosticMessage_DirectToTextWriterCall()
-        {
-            var message = new ForeignMessage { C = 31 };
-            var writer = new StringWriter();
-            JsonFormatter.Default.Format(message, writer);
-            Assert.AreEqual("{ \"c\": 31 }", writer.ToString());
-        }
-    }
-}
diff --git a/libs/protobuf/csharp/compatibility_tests/v3.0.0/src/Google.Protobuf.Test/Google.Protobuf.Test.csproj b/libs/protobuf/csharp/compatibility_tests/v3.0.0/src/Google.Protobuf.Test/Google.Protobuf.Test.csproj
deleted file mode 100644
index 0ecdf37..0000000
--- a/libs/protobuf/csharp/compatibility_tests/v3.0.0/src/Google.Protobuf.Test/Google.Protobuf.Test.csproj
+++ /dev/null
@@ -1,25 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFrameworks>net451;netcoreapp3.1</TargetFrameworks>
-    <AssemblyOriginatorKeyFile>../../keys/Google.Protobuf.snk</AssemblyOriginatorKeyFile>
-    <SignAssembly>true</SignAssembly>
-    <IsPackable>False</IsPackable>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\Google.Protobuf\Google.Protobuf.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="NUnit" Version="3.6.1" />
-    <PackageReference Include="NUnitLite" Version="3.6.1" />
-  </ItemGroup>
-
-  <!-- Needed for the net45 build to work on Unix. See https://github.com/dotnet/designs/pull/33 -->
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0-preview.2" PrivateAssets="All" />
-  </ItemGroup>
-
-</Project>
diff --git a/libs/protobuf/csharp/compatibility_tests/v3.0.0/src/Google.Protobuf.Test/IssuesTest.cs b/libs/protobuf/csharp/compatibility_tests/v3.0.0/src/Google.Protobuf.Test/IssuesTest.cs
deleted file mode 100644
index b4022a2..0000000
--- a/libs/protobuf/csharp/compatibility_tests/v3.0.0/src/Google.Protobuf.Test/IssuesTest.cs
+++ /dev/null
@@ -1,82 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using Google.Protobuf.Reflection;
-using UnitTest.Issues.TestProtos;
-using NUnit.Framework;
-
-
-namespace Google.Protobuf
-{
-    /// <summary>
-    /// Tests for issues which aren't easily compartmentalized into other unit tests.
-    /// </summary>
-    public class IssuesTest
-    {
-        // Issue 45
-        [Test]
-        public void FieldCalledItem()
-        {
-            ItemField message = new ItemField { Item = 3 };
-            FieldDescriptor field = ItemField.Descriptor.FindFieldByName("item");
-            Assert.NotNull(field);
-            Assert.AreEqual(3, (int)field.Accessor.GetValue(message));
-        }
-
-        [Test]
-        public void ReservedNames()
-        {
-            var message = new ReservedNames { Types_ = 10, Descriptor_ = 20 };
-            // Underscores aren't reflected in the JSON.
-            Assert.AreEqual("{ \"types\": 10, \"descriptor\": 20 }", message.ToString());
-        }
-
-        [Test]
-        public void JsonNameParseTest()
-        {
-            var settings = new JsonParser.Settings(10, TypeRegistry.FromFiles(UnittestIssuesReflection.Descriptor));
-            var parser = new JsonParser(settings);
-
-            // It is safe to use either original field name or explicitly specified json_name
-            Assert.AreEqual(new TestJsonName { Name = "test", Description = "test2", Guid = "test3" },
-                parser.Parse<TestJsonName>("{ \"name\": \"test\", \"desc\": \"test2\", \"guid\": \"test3\" }"));
-        }
-
-        [Test]
-        public void JsonNameFormatTest()
-        {
-            var message = new TestJsonName { Name = "test", Description = "test2", Guid = "test3" };
-            Assert.AreEqual("{ \"name\": \"test\", \"desc\": \"test2\", \"exid\": \"test3\" }",
-                JsonFormatter.Default.Format(message));
-        }
-    }
-}
diff --git a/libs/protobuf/csharp/compatibility_tests/v3.0.0/src/Google.Protobuf.Test/JsonParserTest.cs b/libs/protobuf/csharp/compatibility_tests/v3.0.0/src/Google.Protobuf.Test/JsonParserTest.cs
deleted file mode 100644
index f595455..0000000
--- a/libs/protobuf/csharp/compatibility_tests/v3.0.0/src/Google.Protobuf.Test/JsonParserTest.cs
+++ /dev/null
@@ -1,939 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using Google.Protobuf.Reflection;
-using Google.Protobuf.TestProtos;
-using Google.Protobuf.WellKnownTypes;
-using NUnit.Framework;
-using System;
-
-namespace Google.Protobuf
-{
-    /// <summary>
-    /// Unit tests for JSON parsing.
-    /// </summary>
-    public class JsonParserTest
-    {
-        // Sanity smoke test
-        [Test]
-        public void AllTypesRoundtrip()
-        {
-            AssertRoundtrip(SampleMessages.CreateFullTestAllTypes());
-        }
-
-        [Test]
-        public void Maps()
-        {
-            AssertRoundtrip(new TestMap { MapStringString = { { "with spaces", "bar" }, { "a", "b" } } });
-            AssertRoundtrip(new TestMap { MapInt32Int32 = { { 0, 1 }, { 2, 3 } } });
-            AssertRoundtrip(new TestMap { MapBoolBool = { { false, true }, { true, false } } });
-        }
-
-        [Test]
-        [TestCase(" 1 ")]
-        [TestCase("+1")]
-        [TestCase("1,000")]
-        [TestCase("1.5")]
-        public void IntegerMapKeysAreStrict(string keyText)
-        {
-            // Test that integer parsing is strict. We assume that if this is correct for int32,
-            // it's correct for other numeric key types.
-            var json = "{ \"mapInt32Int32\": { \"" + keyText + "\" : \"1\" } }";
-            Assert.Throws<InvalidProtocolBufferException>(() => JsonParser.Default.Parse<TestMap>(json));
-        }
-
-        [Test]
-        public void OriginalFieldNameAccepted()
-        {
-            var json = "{ \"single_int32\": 10 }";
-            var expected = new TestAllTypes { SingleInt32 = 10 };
-            Assert.AreEqual(expected, TestAllTypes.Parser.ParseJson(json));
-        }
-
-        [Test]
-        public void SourceContextRoundtrip()
-        {
-            AssertRoundtrip(new SourceContext { FileName = "foo.proto" });
-        }
-
-        [Test]
-        public void SingularWrappers_DefaultNonNullValues()
-        {
-            var message = new TestWellKnownTypes
-            {
-                StringField = "",
-                BytesField = ByteString.Empty,
-                BoolField = false,
-                FloatField = 0f,
-                DoubleField = 0d,
-                Int32Field = 0,
-                Int64Field = 0,
-                Uint32Field = 0,
-                Uint64Field = 0
-            };
-            AssertRoundtrip(message);
-        }
-
-        [Test]
-        public void SingularWrappers_NonDefaultValues()
-        {
-            var message = new TestWellKnownTypes
-            {
-                StringField = "x",
-                BytesField = ByteString.CopyFrom(1, 2, 3),
-                BoolField = true,
-                FloatField = 12.5f,
-                DoubleField = 12.25d,
-                Int32Field = 1,
-                Int64Field = 2,
-                Uint32Field = 3,
-                Uint64Field = 4
-            };
-            AssertRoundtrip(message);
-        }
-
-        [Test]
-        public void SingularWrappers_ExplicitNulls()
-        {
-            // When we parse the "valueField": null part, we remember it... basically, it's one case
-            // where explicit default values don't fully roundtrip.
-            var message = new TestWellKnownTypes { ValueField = Value.ForNull() };
-            var json = new JsonFormatter(new JsonFormatter.Settings(true)).Format(message);
-            var parsed = JsonParser.Default.Parse<TestWellKnownTypes>(json);
-            Assert.AreEqual(message, parsed);
-        }
-
-        [Test]
-        [TestCase(typeof(BoolValue), "true", true)]
-        [TestCase(typeof(Int32Value), "32", 32)]
-        [TestCase(typeof(Int64Value), "32", 32L)]
-        [TestCase(typeof(Int64Value), "\"32\"", 32L)]
-        [TestCase(typeof(UInt32Value), "32", 32U)]
-        [TestCase(typeof(UInt64Value), "\"32\"", 32UL)]
-        [TestCase(typeof(UInt64Value), "32", 32UL)]
-        [TestCase(typeof(StringValue), "\"foo\"", "foo")]
-        [TestCase(typeof(FloatValue), "1.5", 1.5f)]
-        [TestCase(typeof(DoubleValue), "1.5", 1.5d)]
-        public void Wrappers_Standalone(System.Type wrapperType, string json, object expectedValue)
-        {
-            IMessage parsed = (IMessage)Activator.CreateInstance(wrapperType);
-            IMessage expected = (IMessage)Activator.CreateInstance(wrapperType);
-            JsonParser.Default.Merge(parsed, "null");
-            Assert.AreEqual(expected, parsed);
-
-            JsonParser.Default.Merge(parsed, json);
-            expected.Descriptor.Fields[WrappersReflection.WrapperValueFieldNumber].Accessor.SetValue(expected, expectedValue);
-            Assert.AreEqual(expected, parsed);
-        }
-
-        [Test]
-        public void ExplicitNullValue()
-        {
-            string json = "{\"valueField\": null}";
-            var message = JsonParser.Default.Parse<TestWellKnownTypes>(json);
-            Assert.AreEqual(new TestWellKnownTypes { ValueField = Value.ForNull() }, message);
-        }
-
-        [Test]
-        public void BytesWrapper_Standalone()
-        {
-            ByteString data = ByteString.CopyFrom(1, 2, 3);
-            // Can't do this with attributes...
-            var parsed = JsonParser.Default.Parse<BytesValue>(WrapInQuotes(data.ToBase64()));
-            var expected = new BytesValue { Value = data };
-            Assert.AreEqual(expected, parsed);
-        }
-
-        [Test]
-        public void RepeatedWrappers()
-        {
-            var message = new RepeatedWellKnownTypes
-            {
-                BoolField = { true, false },
-                BytesField = { ByteString.CopyFrom(1, 2, 3), ByteString.CopyFrom(4, 5, 6), ByteString.Empty },
-                DoubleField = { 12.5, -1.5, 0d },
-                FloatField = { 123.25f, -20f, 0f },
-                Int32Field = { int.MaxValue, int.MinValue, 0 },
-                Int64Field = { long.MaxValue, long.MinValue, 0L },
-                StringField = { "First", "Second", "" },
-                Uint32Field = { uint.MaxValue, uint.MinValue, 0U },
-                Uint64Field = { ulong.MaxValue, ulong.MinValue, 0UL },
-            };
-            AssertRoundtrip(message);
-        }
-
-        [Test]
-        public void RepeatedField_NullElementProhibited()
-        {
-            string json = "{ \"repeated_foreign_message\": [null] }";
-            Assert.Throws<InvalidProtocolBufferException>(() => TestAllTypes.Parser.ParseJson(json));
-        }
-
-        [Test]
-        public void RepeatedField_NullOverallValueAllowed()
-        {
-            string json = "{ \"repeated_foreign_message\": null }";
-            Assert.AreEqual(new TestAllTypes(), TestAllTypes.Parser.ParseJson(json));
-        }
-
-        [Test]
-        [TestCase("{ \"mapInt32Int32\": { \"10\": null }")]
-        [TestCase("{ \"mapStringString\": { \"abc\": null }")]
-        [TestCase("{ \"mapInt32ForeignMessage\": { \"10\": null }")]
-        public void MapField_NullValueProhibited(string json)
-        {
-            Assert.Throws<InvalidProtocolBufferException>(() => TestMap.Parser.ParseJson(json));
-        }
-
-        [Test]
-        public void MapField_NullOverallValueAllowed()
-        {
-            string json = "{ \"mapInt32Int32\": null }";
-            Assert.AreEqual(new TestMap(), TestMap.Parser.ParseJson(json));
-        }
-
-        [Test]
-        public void IndividualWrapperTypes()
-        {
-            Assert.AreEqual(new StringValue { Value = "foo" }, StringValue.Parser.ParseJson("\"foo\""));
-            Assert.AreEqual(new Int32Value { Value = 1 }, Int32Value.Parser.ParseJson("1"));
-            // Can parse strings directly too
-            Assert.AreEqual(new Int32Value { Value = 1 }, Int32Value.Parser.ParseJson("\"1\""));
-        }
-
-        private static void AssertRoundtrip<T>(T message) where T : IMessage<T>, new()
-        {
-            var clone = message.Clone();
-            var json = JsonFormatter.Default.Format(message);
-            var parsed = JsonParser.Default.Parse<T>(json);
-            Assert.AreEqual(clone, parsed);
-        }
-
-        [Test]
-        [TestCase("0", 0)]
-        [TestCase("-0", 0)] // Not entirely clear whether we intend to allow this...
-        [TestCase("1", 1)]
-        [TestCase("-1", -1)]
-        [TestCase("2147483647", 2147483647)]
-        [TestCase("-2147483648", -2147483648)]
-        public void StringToInt32_Valid(string jsonValue, int expectedParsedValue)
-        {
-            string json = "{ \"singleInt32\": \"" + jsonValue + "\"}";
-            var parsed = TestAllTypes.Parser.ParseJson(json);
-            Assert.AreEqual(expectedParsedValue, parsed.SingleInt32);
-        }
-
-        [Test]
-        [TestCase("+0")]
-        [TestCase(" 1")]
-        [TestCase("1 ")]
-        [TestCase("00")]
-        [TestCase("-00")]
-        [TestCase("--1")]
-        [TestCase("+1")]
-        [TestCase("1.5")]
-        [TestCase("1e10")]
-        [TestCase("2147483648")]
-        [TestCase("-2147483649")]
-        public void StringToInt32_Invalid(string jsonValue)
-        {
-            string json = "{ \"singleInt32\": \"" + jsonValue + "\"}";
-            Assert.Throws<InvalidProtocolBufferException>(() => TestAllTypes.Parser.ParseJson(json));
-        }
-
-        [Test]
-        [TestCase("0", 0U)]
-        [TestCase("1", 1U)]
-        [TestCase("4294967295", 4294967295U)]
-        public void StringToUInt32_Valid(string jsonValue, uint expectedParsedValue)
-        {
-            string json = "{ \"singleUint32\": \"" + jsonValue + "\"}";
-            var parsed = TestAllTypes.Parser.ParseJson(json);
-            Assert.AreEqual(expectedParsedValue, parsed.SingleUint32);
-        }
-
-        // Assume that anything non-bounds-related is covered in the Int32 case
-        [Test]
-        [TestCase("-1")]
-        [TestCase("4294967296")]
-        public void StringToUInt32_Invalid(string jsonValue)
-        {
-            string json = "{ \"singleUint32\": \"" + jsonValue + "\"}";
-            Assert.Throws<InvalidProtocolBufferException>(() => TestAllTypes.Parser.ParseJson(json));
-        }
-
-        [Test]
-        [TestCase("0", 0L)]
-        [TestCase("1", 1L)]
-        [TestCase("-1", -1L)]
-        [TestCase("9223372036854775807", 9223372036854775807)]
-        [TestCase("-9223372036854775808", -9223372036854775808)]
-        public void StringToInt64_Valid(string jsonValue, long expectedParsedValue)
-        {
-            string json = "{ \"singleInt64\": \"" + jsonValue + "\"}";
-            var parsed = TestAllTypes.Parser.ParseJson(json);
-            Assert.AreEqual(expectedParsedValue, parsed.SingleInt64);
-        }
-
-        // Assume that anything non-bounds-related is covered in the Int32 case
-        [Test]
-        [TestCase("-9223372036854775809")]
-        [TestCase("9223372036854775808")]
-        public void StringToInt64_Invalid(string jsonValue)
-        {
-            string json = "{ \"singleInt64\": \"" + jsonValue + "\"}";
-            Assert.Throws<InvalidProtocolBufferException>(() => TestAllTypes.Parser.ParseJson(json));
-        }
-
-        [Test]
-        [TestCase("0", 0UL)]
-        [TestCase("1", 1UL)]
-        [TestCase("18446744073709551615", 18446744073709551615)]
-        public void StringToUInt64_Valid(string jsonValue, ulong expectedParsedValue)
-        {
-            string json = "{ \"singleUint64\": \"" + jsonValue + "\"}";
-            var parsed = TestAllTypes.Parser.ParseJson(json);
-            Assert.AreEqual(expectedParsedValue, parsed.SingleUint64);
-        }
-
-        // Assume that anything non-bounds-related is covered in the Int32 case
-        [Test]
-        [TestCase("-1")]
-        [TestCase("18446744073709551616")]
-        public void StringToUInt64_Invalid(string jsonValue)
-        {
-            string json = "{ \"singleUint64\": \"" + jsonValue + "\"}";
-            Assert.Throws<InvalidProtocolBufferException>(() => TestAllTypes.Parser.ParseJson(json));
-        }
-
-        [Test]
-        [TestCase("0", 0d)]
-        [TestCase("1", 1d)]
-        [TestCase("1.000000", 1d)]
-        [TestCase("1.0000000000000000000000001", 1d)] // We don't notice that we haven't preserved the exact value
-        [TestCase("-1", -1d)]
-        [TestCase("1e1", 10d)]
-        [TestCase("1e01", 10d)] // Leading decimals are allowed in exponents
-        [TestCase("1E1", 10d)] // Either case is fine
-        [TestCase("-1e1", -10d)]
-        [TestCase("1.5e1", 15d)]
-        [TestCase("-1.5e1", -15d)]
-        [TestCase("15e-1", 1.5d)]
-        [TestCase("-15e-1", -1.5d)]
-        [TestCase("1.79769e308", 1.79769e308)]
-        [TestCase("-1.79769e308", -1.79769e308)]
-        [TestCase("Infinity", double.PositiveInfinity)]
-        [TestCase("-Infinity", double.NegativeInfinity)]
-        [TestCase("NaN", double.NaN)]
-        public void StringToDouble_Valid(string jsonValue, double expectedParsedValue)
-        {
-            string json = "{ \"singleDouble\": \"" + jsonValue + "\"}";
-            var parsed = TestAllTypes.Parser.ParseJson(json);
-            Assert.AreEqual(expectedParsedValue, parsed.SingleDouble);
-        }
-
-        [Test]
-        [TestCase("1.7977e308")]
-        [TestCase("-1.7977e308")]
-        [TestCase("1e309")]
-        [TestCase("1,0")]
-        [TestCase("1.0.0")]
-        [TestCase("+1")]
-        [TestCase("00")]
-        [TestCase("01")]
-        [TestCase("-00")]
-        [TestCase("-01")]
-        [TestCase("--1")]
-        [TestCase(" Infinity")]
-        [TestCase(" -Infinity")]
-        [TestCase("NaN ")]
-        [TestCase("Infinity ")]
-        [TestCase("-Infinity ")]
-        [TestCase(" NaN")]
-        [TestCase("INFINITY")]
-        [TestCase("nan")]
-        [TestCase("\u00BD")] // 1/2 as a single Unicode character. Just sanity checking...
-        public void StringToDouble_Invalid(string jsonValue)
-        {
-            string json = "{ \"singleDouble\": \"" + jsonValue + "\"}";
-            Assert.Throws<InvalidProtocolBufferException>(() => TestAllTypes.Parser.ParseJson(json));
-        }
-
-        [Test]
-        [TestCase("0", 0f)]
-        [TestCase("1", 1f)]
-        [TestCase("1.000000", 1f)]
-        [TestCase("-1", -1f)]
-        [TestCase("3.402823e38", 3.402823e38f)]
-        [TestCase("-3.402823e38", -3.402823e38f)]
-        [TestCase("1.5e1", 15f)]
-        [TestCase("15e-1", 1.5f)]
-        public void StringToFloat_Valid(string jsonValue, float expectedParsedValue)
-        {
-            string json = "{ \"singleFloat\": \"" + jsonValue + "\"}";
-            var parsed = TestAllTypes.Parser.ParseJson(json);
-            Assert.AreEqual(expectedParsedValue, parsed.SingleFloat);
-        }
-
-        [Test]
-        [TestCase("3.402824e38")]
-        [TestCase("-3.402824e38")]
-        [TestCase("1,0")]
-        [TestCase("1.0.0")]
-        [TestCase("+1")]
-        [TestCase("00")]
-        [TestCase("--1")]
-        public void StringToFloat_Invalid(string jsonValue)
-        {
-            string json = "{ \"singleFloat\": \"" + jsonValue + "\"}";
-            Assert.Throws<InvalidProtocolBufferException>(() => TestAllTypes.Parser.ParseJson(json));
-        }
-
-        [Test]
-        [TestCase("0", 0)]
-        [TestCase("-0", 0)] // Not entirely clear whether we intend to allow this...
-        [TestCase("1", 1)]
-        [TestCase("-1", -1)]
-        [TestCase("2147483647", 2147483647)]
-        [TestCase("-2147483648", -2147483648)]
-        [TestCase("1e1", 10)]
-        [TestCase("-1e1", -10)]
-        [TestCase("10.00", 10)]
-        [TestCase("-10.00", -10)]
-        public void NumberToInt32_Valid(string jsonValue, int expectedParsedValue)
-        {
-            string json = "{ \"singleInt32\": " + jsonValue + "}";
-            var parsed = TestAllTypes.Parser.ParseJson(json);
-            Assert.AreEqual(expectedParsedValue, parsed.SingleInt32);
-        }
-
-        [Test]
-        [TestCase("+0", typeof(InvalidJsonException))]
-        [TestCase("00", typeof(InvalidJsonException))]
-        [TestCase("-00", typeof(InvalidJsonException))]
-        [TestCase("--1", typeof(InvalidJsonException))]
-        [TestCase("+1", typeof(InvalidJsonException))]
-        [TestCase("1.5", typeof(InvalidProtocolBufferException))]
-        // Value is out of range
-        [TestCase("1e10", typeof(InvalidProtocolBufferException))]
-        [TestCase("2147483648", typeof(InvalidProtocolBufferException))]
-        [TestCase("-2147483649", typeof(InvalidProtocolBufferException))]
-        public void NumberToInt32_Invalid(string jsonValue, System.Type expectedExceptionType)
-        {
-            string json = "{ \"singleInt32\": " + jsonValue + "}";
-            Assert.Throws(expectedExceptionType, () => TestAllTypes.Parser.ParseJson(json));
-        }
-
-        [Test]
-        [TestCase("0", 0U)]
-        [TestCase("1", 1U)]
-        [TestCase("4294967295", 4294967295U)]
-        public void NumberToUInt32_Valid(string jsonValue, uint expectedParsedValue)
-        {
-            string json = "{ \"singleUint32\": " + jsonValue + "}";
-            var parsed = TestAllTypes.Parser.ParseJson(json);
-            Assert.AreEqual(expectedParsedValue, parsed.SingleUint32);
-        }
-
-        // Assume that anything non-bounds-related is covered in the Int32 case
-        [Test]
-        [TestCase("-1")]
-        [TestCase("4294967296")]
-        public void NumberToUInt32_Invalid(string jsonValue)
-        {
-            string json = "{ \"singleUint32\": " + jsonValue + "}";
-            Assert.Throws<InvalidProtocolBufferException>(() => TestAllTypes.Parser.ParseJson(json));
-        }
-
-        [Test]
-        [TestCase("0", 0L)]
-        [TestCase("1", 1L)]
-        [TestCase("-1", -1L)]
-        // long.MaxValue isn't actually representable as a double. This string value is the highest
-        // representable value which isn't greater than long.MaxValue.
-        [TestCase("9223372036854774784", 9223372036854774784)]
-        [TestCase("-9223372036854775808", -9223372036854775808)]
-        public void NumberToInt64_Valid(string jsonValue, long expectedParsedValue)
-        {
-            string json = "{ \"singleInt64\": " + jsonValue + "}";
-            var parsed = TestAllTypes.Parser.ParseJson(json);
-            Assert.AreEqual(expectedParsedValue, parsed.SingleInt64);
-        }
-
-        // Assume that anything non-bounds-related is covered in the Int32 case
-        [Test]
-        [TestCase("9223372036854775808")]
-        // Theoretical bound would be -9223372036854775809, but when that is parsed to a double
-        // we end up with the exact value of long.MinValue due to lack of precision. The value here
-        // is the "next double down".
-        [TestCase("-9223372036854780000")]
-        public void NumberToInt64_Invalid(string jsonValue)
-        {
-            string json = "{ \"singleInt64\": " + jsonValue + "}";
-            Assert.Throws<InvalidProtocolBufferException>(() => TestAllTypes.Parser.ParseJson(json));
-        }
-
-        [Test]
-        [TestCase("0", 0UL)]
-        [TestCase("1", 1UL)]
-        // ulong.MaxValue isn't representable as a double. This value is the largest double within
-        // the range of ulong.
-        [TestCase("18446744073709549568", 18446744073709549568UL)]
-        public void NumberToUInt64_Valid(string jsonValue, ulong expectedParsedValue)
-        {
-            string json = "{ \"singleUint64\": " + jsonValue + "}";
-            var parsed = TestAllTypes.Parser.ParseJson(json);
-            Assert.AreEqual(expectedParsedValue, parsed.SingleUint64);
-        }
-
-        // Assume that anything non-bounds-related is covered in the Int32 case
-        [Test]
-        [TestCase("-1")]
-        [TestCase("18446744073709551616")]
-        public void NumberToUInt64_Invalid(string jsonValue)
-        {
-            string json = "{ \"singleUint64\": " + jsonValue + "}";
-            Assert.Throws<InvalidProtocolBufferException>(() => TestAllTypes.Parser.ParseJson(json));
-        }
-
-        [Test]
-        [TestCase("0", 0d)]
-        [TestCase("1", 1d)]
-        [TestCase("1.000000", 1d)]
-        [TestCase("1.0000000000000000000000001", 1d)] // We don't notice that we haven't preserved the exact value
-        [TestCase("-1", -1d)]
-        [TestCase("1e1", 10d)]
-        [TestCase("1e01", 10d)] // Leading decimals are allowed in exponents
-        [TestCase("1E1", 10d)] // Either case is fine
-        [TestCase("-1e1", -10d)]
-        [TestCase("1.5e1", 15d)]
-        [TestCase("-1.5e1", -15d)]
-        [TestCase("15e-1", 1.5d)]
-        [TestCase("-15e-1", -1.5d)]
-        [TestCase("1.79769e308", 1.79769e308)]
-        [TestCase("-1.79769e308", -1.79769e308)]
-        public void NumberToDouble_Valid(string jsonValue, double expectedParsedValue)
-        {
-            string json = "{ \"singleDouble\": " + jsonValue + "}";
-            var parsed = TestAllTypes.Parser.ParseJson(json);
-            Assert.AreEqual(expectedParsedValue, parsed.SingleDouble);
-        }
-
-        [Test]
-        [TestCase("1.7977e308")]
-        [TestCase("-1.7977e308")]
-        [TestCase("1e309")]
-        [TestCase("1,0")]
-        [TestCase("1.0.0")]
-        [TestCase("+1")]
-        [TestCase("00")]
-        [TestCase("--1")]
-        [TestCase("\u00BD")] // 1/2 as a single Unicode character. Just sanity checking...
-        public void NumberToDouble_Invalid(string jsonValue)
-        {
-            string json = "{ \"singleDouble\": " + jsonValue + "}";
-            Assert.Throws<InvalidJsonException>(() => TestAllTypes.Parser.ParseJson(json));
-        }
-
-        [Test]
-        [TestCase("0", 0f)]
-        [TestCase("1", 1f)]
-        [TestCase("1.000000", 1f)]
-        [TestCase("-1", -1f)]
-        [TestCase("3.402823e38", 3.402823e38f)]
-        [TestCase("-3.402823e38", -3.402823e38f)]
-        [TestCase("1.5e1", 15f)]
-        [TestCase("15e-1", 1.5f)]
-        public void NumberToFloat_Valid(string jsonValue, float expectedParsedValue)
-        {
-            string json = "{ \"singleFloat\": " + jsonValue + "}";
-            var parsed = TestAllTypes.Parser.ParseJson(json);
-            Assert.AreEqual(expectedParsedValue, parsed.SingleFloat);
-        }
-
-        [Test]
-        [TestCase("3.402824e38", typeof(InvalidProtocolBufferException))]
-        [TestCase("-3.402824e38", typeof(InvalidProtocolBufferException))]
-        [TestCase("1,0", typeof(InvalidJsonException))]
-        [TestCase("1.0.0", typeof(InvalidJsonException))]
-        [TestCase("+1", typeof(InvalidJsonException))]
-        [TestCase("00", typeof(InvalidJsonException))]
-        [TestCase("--1", typeof(InvalidJsonException))]
-        public void NumberToFloat_Invalid(string jsonValue, System.Type expectedExceptionType)
-        {
-            string json = "{ \"singleFloat\": " + jsonValue + "}";
-            Assert.Throws(expectedExceptionType, () => TestAllTypes.Parser.ParseJson(json));
-        }
-
-        // The simplest way of testing that the value has parsed correctly is to reformat it,
-        // as we trust the formatting. In many cases that will give the same result as the input,
-        // so in those cases we accept an expectedFormatted value of null. Sometimes the results
-        // will be different though, due to a different number of digits being provided.
-        [Test]
-        // Z offset
-        [TestCase("2015-10-09T14:46:23.123456789Z", null)]
-        [TestCase("2015-10-09T14:46:23.123456Z", null)]
-        [TestCase("2015-10-09T14:46:23.123Z", null)]
-        [TestCase("2015-10-09T14:46:23Z", null)]
-        [TestCase("2015-10-09T14:46:23.123456000Z", "2015-10-09T14:46:23.123456Z")]
-        [TestCase("2015-10-09T14:46:23.1234560Z", "2015-10-09T14:46:23.123456Z")]
-        [TestCase("2015-10-09T14:46:23.123000000Z", "2015-10-09T14:46:23.123Z")]
-        [TestCase("2015-10-09T14:46:23.1230Z", "2015-10-09T14:46:23.123Z")]
-        [TestCase("2015-10-09T14:46:23.00Z", "2015-10-09T14:46:23Z")]
-
-        // +00:00 offset
-        [TestCase("2015-10-09T14:46:23.123456789+00:00", "2015-10-09T14:46:23.123456789Z")]
-        [TestCase("2015-10-09T14:46:23.123456+00:00", "2015-10-09T14:46:23.123456Z")]
-        [TestCase("2015-10-09T14:46:23.123+00:00", "2015-10-09T14:46:23.123Z")]
-        [TestCase("2015-10-09T14:46:23+00:00", "2015-10-09T14:46:23Z")]
-        [TestCase("2015-10-09T14:46:23.123456000+00:00", "2015-10-09T14:46:23.123456Z")]
-        [TestCase("2015-10-09T14:46:23.1234560+00:00", "2015-10-09T14:46:23.123456Z")]
-        [TestCase("2015-10-09T14:46:23.123000000+00:00", "2015-10-09T14:46:23.123Z")]
-        [TestCase("2015-10-09T14:46:23.1230+00:00", "2015-10-09T14:46:23.123Z")]
-        [TestCase("2015-10-09T14:46:23.00+00:00", "2015-10-09T14:46:23Z")]
-
-        // Other offsets (assume by now that the subsecond handling is okay)
-        [TestCase("2015-10-09T15:46:23.123456789+01:00", "2015-10-09T14:46:23.123456789Z")]
-        [TestCase("2015-10-09T13:46:23.123456789-01:00", "2015-10-09T14:46:23.123456789Z")]
-        [TestCase("2015-10-09T15:16:23.123456789+00:30", "2015-10-09T14:46:23.123456789Z")]
-        [TestCase("2015-10-09T14:16:23.123456789-00:30", "2015-10-09T14:46:23.123456789Z")]
-        [TestCase("2015-10-09T16:31:23.123456789+01:45", "2015-10-09T14:46:23.123456789Z")]
-        [TestCase("2015-10-09T13:01:23.123456789-01:45", "2015-10-09T14:46:23.123456789Z")]
-        [TestCase("2015-10-10T08:46:23.123456789+18:00", "2015-10-09T14:46:23.123456789Z")]
-        [TestCase("2015-10-08T20:46:23.123456789-18:00", "2015-10-09T14:46:23.123456789Z")]
-
-        // Leap years and min/max
-        [TestCase("2016-02-29T14:46:23.123456789Z", null)]
-        [TestCase("2000-02-29T14:46:23.123456789Z", null)]
-        [TestCase("0001-01-01T00:00:00Z", null)]
-        [TestCase("9999-12-31T23:59:59.999999999Z", null)]
-        public void Timestamp_Valid(string jsonValue, string expectedFormatted)
-        {
-            expectedFormatted = expectedFormatted ?? jsonValue;
-            string json = WrapInQuotes(jsonValue);
-            var parsed = Timestamp.Parser.ParseJson(json);
-            Assert.AreEqual(WrapInQuotes(expectedFormatted), parsed.ToString());
-        }
-
-        [Test]
-        [TestCase("2015-10-09 14:46:23.123456789Z", Description = "No T between date and time")]
-        [TestCase("2015/10/09T14:46:23.123456789Z", Description = "Wrong date separators")]
-        [TestCase("2015-10-09T14.46.23.123456789Z", Description = "Wrong time separators")]
-        [TestCase("2015-10-09T14:46:23,123456789Z", Description = "Wrong fractional second separators (valid ISO-8601 though)")]
-        [TestCase(" 2015-10-09T14:46:23.123456789Z", Description = "Whitespace at start")]
-        [TestCase("2015-10-09T14:46:23.123456789Z ", Description = "Whitespace at end")]
-        [TestCase("2015-10-09T14:46:23.1234567890", Description = "Too many digits")]
-        [TestCase("2015-10-09T14:46:23.123456789", Description = "No offset")]
-        [TestCase("2015-13-09T14:46:23.123456789Z", Description = "Invalid month")]
-        [TestCase("2015-10-32T14:46:23.123456789Z", Description = "Invalid day")]
-        [TestCase("2015-10-09T24:00:00.000000000Z", Description = "Invalid hour (valid ISO-8601 though)")]
-        [TestCase("2015-10-09T14:60:23.123456789Z", Description = "Invalid minutes")]
-        [TestCase("2015-10-09T14:46:60.123456789Z", Description = "Invalid seconds")]
-        [TestCase("2015-10-09T14:46:23.123456789+18:01", Description = "Offset too large (positive)")]
-        [TestCase("2015-10-09T14:46:23.123456789-18:01", Description = "Offset too large (negative)")]
-        [TestCase("2015-10-09T14:46:23.123456789-00:00", Description = "Local offset (-00:00) makes no sense here")]
-        [TestCase("0001-01-01T00:00:00+00:01", Description = "Value before earliest when offset applied")]
-        [TestCase("9999-12-31T23:59:59.999999999-00:01", Description = "Value after latest when offset applied")]
-        [TestCase("2100-02-29T14:46:23.123456789Z", Description = "Feb 29th on a non-leap-year")]
-        public void Timestamp_Invalid(string jsonValue)
-        {
-            string json = WrapInQuotes(jsonValue);
-            Assert.Throws<InvalidProtocolBufferException>(() => Timestamp.Parser.ParseJson(json));
-        }
-
-        [Test]
-        public void StructValue_Null()
-        {
-            Assert.AreEqual(new Value { NullValue = 0 }, Value.Parser.ParseJson("null"));
-        }
-
-        [Test]
-        public void StructValue_String()
-        {
-            Assert.AreEqual(new Value { StringValue = "hi" }, Value.Parser.ParseJson("\"hi\""));
-        }
-
-        [Test]
-        public void StructValue_Bool()
-        {
-            Assert.AreEqual(new Value { BoolValue = true }, Value.Parser.ParseJson("true"));
-            Assert.AreEqual(new Value { BoolValue = false }, Value.Parser.ParseJson("false"));
-        }
-
-        [Test]
-        public void StructValue_List()
-        {
-            Assert.AreEqual(Value.ForList(Value.ForNumber(1), Value.ForString("x")), Value.Parser.ParseJson("[1, \"x\"]"));
-        }
-
-        [Test]
-        public void ParseListValue()
-        {
-            Assert.AreEqual(new ListValue { Values = { Value.ForNumber(1), Value.ForString("x") } }, ListValue.Parser.ParseJson("[1, \"x\"]"));
-        }
-
-        [Test]
-        public void StructValue_Struct()
-        {
-            Assert.AreEqual(
-                Value.ForStruct(new Struct { Fields = { { "x", Value.ForNumber(1) }, { "y", Value.ForString("z") } } }),
-                Value.Parser.ParseJson("{ \"x\": 1, \"y\": \"z\" }"));
-        }
-
-        [Test]
-        public void ParseStruct()
-        {
-            Assert.AreEqual(new Struct { Fields = { { "x", Value.ForNumber(1) }, { "y", Value.ForString("z") } } },
-                Struct.Parser.ParseJson("{ \"x\": 1, \"y\": \"z\" }"));
-        }
-
-        // TODO for duration parsing: upper and lower bounds.
-        // +/- 315576000000 seconds
-
-        [Test]
-        [TestCase("1.123456789s", null)]
-        [TestCase("1.123456s", null)]
-        [TestCase("1.123s", null)]
-        [TestCase("1.12300s", "1.123s")]
-        [TestCase("1.12345s", "1.123450s")]
-        [TestCase("1s", null)]
-        [TestCase("-1.123456789s", null)]
-        [TestCase("-1.123456s", null)]
-        [TestCase("-1.123s", null)]
-        [TestCase("-1s", null)]
-        [TestCase("0.123s", null)]
-        [TestCase("-0.123s", null)]
-        [TestCase("123456.123s", null)]
-        [TestCase("-123456.123s", null)]
-        // Upper and lower bounds
-        [TestCase("315576000000s", null)]
-        [TestCase("-315576000000s", null)]
-        public void Duration_Valid(string jsonValue, string expectedFormatted)
-        {
-            expectedFormatted = expectedFormatted ?? jsonValue;
-            string json = WrapInQuotes(jsonValue);
-            var parsed = Duration.Parser.ParseJson(json);
-            Assert.AreEqual(WrapInQuotes(expectedFormatted), parsed.ToString());
-        }
-
-        // The simplest way of testing that the value has parsed correctly is to reformat it,
-        // as we trust the formatting. In many cases that will give the same result as the input,
-        // so in those cases we accept an expectedFormatted value of null. Sometimes the results
-        // will be different though, due to a different number of digits being provided.
-        [Test]
-        [TestCase("1.1234567890s", Description = "Too many digits")]
-        [TestCase("1.123456789", Description = "No suffix")]
-        [TestCase("1.123456789ss", Description = "Too much suffix")]
-        [TestCase("1.123456789S", Description = "Upper case suffix")]
-        [TestCase("+1.123456789s", Description = "Leading +")]
-        [TestCase(".123456789s", Description = "No integer before the fraction")]
-        [TestCase("1,123456789s", Description = "Comma as decimal separator")]
-        [TestCase("1x1.123456789s", Description = "Non-digit in integer part")]
-        [TestCase("1.1x3456789s", Description = "Non-digit in fractional part")]
-        [TestCase(" 1.123456789s", Description = "Whitespace before fraction")]
-        [TestCase("1.123456789s ", Description = "Whitespace after value")]
-        [TestCase("01.123456789s", Description = "Leading zero (positive)")]
-        [TestCase("-01.123456789s", Description = "Leading zero (negative)")]
-        [TestCase("--0.123456789s", Description = "Double minus sign")]
-        // Violate upper/lower bounds in various ways
-        [TestCase("315576000001s", Description = "Integer part too large")]
-        [TestCase("3155760000000s", Description = "Integer part too long (positive)")]
-        [TestCase("-3155760000000s", Description = "Integer part too long (negative)")]
-        public void Duration_Invalid(string jsonValue)
-        {
-            string json = WrapInQuotes(jsonValue);
-            Assert.Throws<InvalidProtocolBufferException>(() => Duration.Parser.ParseJson(json));
-        }
-
-        // Not as many tests for field masks as I'd like; more to be added when we have more
-        // detailed specifications.
-
-        [Test]
-        [TestCase("")]
-        [TestCase("foo", "foo")]
-        [TestCase("foo,bar", "foo", "bar")]
-        [TestCase("foo.bar", "foo.bar")]
-        [TestCase("fooBar", "foo_bar")]
-        [TestCase("fooBar.bazQux", "foo_bar.baz_qux")]
-        public void FieldMask_Valid(string jsonValue, params string[] expectedPaths)
-        {
-            string json = WrapInQuotes(jsonValue);
-            var parsed = FieldMask.Parser.ParseJson(json);
-            CollectionAssert.AreEqual(expectedPaths, parsed.Paths);
-        }
-
-        [Test]
-        [TestCase("foo_bar")]
-        public void FieldMask_Invalid(string jsonValue)
-        {
-            string json = WrapInQuotes(jsonValue);
-            Assert.Throws<InvalidProtocolBufferException>(() => FieldMask.Parser.ParseJson(json));
-        }
-
-        [Test]
-        public void Any_RegularMessage()
-        {
-            var registry = TypeRegistry.FromMessages(TestAllTypes.Descriptor);
-            var formatter = new JsonFormatter(new JsonFormatter.Settings(false, TypeRegistry.FromMessages(TestAllTypes.Descriptor)));
-            var message = new TestAllTypes { SingleInt32 = 10, SingleNestedMessage = new TestAllTypes.Types.NestedMessage { Bb = 20 } };
-            var original = Any.Pack(message);
-            var json = formatter.Format(original); // This is tested in JsonFormatterTest
-            var parser = new JsonParser(new JsonParser.Settings(10, registry));
-            Assert.AreEqual(original, parser.Parse<Any>(json));
-            string valueFirstJson = "{ \"singleInt32\": 10, \"singleNestedMessage\": { \"bb\": 20 }, \"@type\": \"type.googleapis.com/protobuf_unittest.TestAllTypes\" }";
-            Assert.AreEqual(original, parser.Parse<Any>(valueFirstJson));
-        }
-
-        [Test]
-        public void Any_CustomPrefix()
-        {
-            var registry = TypeRegistry.FromMessages(TestAllTypes.Descriptor);
-            var message = new TestAllTypes { SingleInt32 = 10 };
-            var original = Any.Pack(message, "custom.prefix/middle-part");
-            var parser = new JsonParser(new JsonParser.Settings(10, registry));
-            string json = "{ \"@type\": \"custom.prefix/middle-part/protobuf_unittest.TestAllTypes\", \"singleInt32\": 10 }";
-            Assert.AreEqual(original, parser.Parse<Any>(json));
-        }
-
-        [Test]
-        public void Any_UnknownType()
-        {
-            string json = "{ \"@type\": \"type.googleapis.com/bogus\" }";
-            Assert.Throws<InvalidOperationException>(() => Any.Parser.ParseJson(json));
-        }
-
-        [Test]
-        public void Any_NoTypeUrl()
-        {
-            string json = "{ \"foo\": \"bar\" }";
-            Assert.Throws<InvalidProtocolBufferException>(() => Any.Parser.ParseJson(json));
-        }
-
-        [Test]
-        public void Any_WellKnownType()
-        {
-            var registry = TypeRegistry.FromMessages(Timestamp.Descriptor);
-            var formatter = new JsonFormatter(new JsonFormatter.Settings(false, registry));
-            var timestamp = new DateTime(1673, 6, 19, 12, 34, 56, DateTimeKind.Utc).ToTimestamp();
-            var original = Any.Pack(timestamp);
-            var json = formatter.Format(original); // This is tested in JsonFormatterTest
-            var parser = new JsonParser(new JsonParser.Settings(10, registry));
-            Assert.AreEqual(original, parser.Parse<Any>(json));
-            string valueFirstJson = "{ \"value\": \"1673-06-19T12:34:56Z\", \"@type\": \"type.googleapis.com/google.protobuf.Timestamp\" }";
-            Assert.AreEqual(original, parser.Parse<Any>(valueFirstJson));
-        }
-
-        [Test]
-        public void Any_Nested()
-        {
-            var registry = TypeRegistry.FromMessages(TestWellKnownTypes.Descriptor, TestAllTypes.Descriptor);
-            var formatter = new JsonFormatter(new JsonFormatter.Settings(false, registry));
-            var parser = new JsonParser(new JsonParser.Settings(10, registry));
-            var doubleNestedMessage = new TestAllTypes { SingleInt32 = 20 };
-            var nestedMessage = Any.Pack(doubleNestedMessage);
-            var message = new TestWellKnownTypes { AnyField = Any.Pack(nestedMessage) };
-            var json = formatter.Format(message);
-            // Use the descriptor-based parser just for a change.
-            Assert.AreEqual(message, parser.Parse(json, TestWellKnownTypes.Descriptor));
-        }
-
-        [Test]
-        public void DataAfterObject()
-        {
-            string json = "{} 10";
-            Assert.Throws<InvalidJsonException>(() => TestAllTypes.Parser.ParseJson(json));
-        }
-
-        /// <summary>
-        /// JSON equivalent to <see cref="CodedInputStreamTest.MaliciousRecursion"/>
-        /// </summary>
-        [Test]
-        public void MaliciousRecursion()
-        {
-            string data64 = CodedInputStreamTest.MakeRecursiveMessage(64).ToString();
-            string data65 = CodedInputStreamTest.MakeRecursiveMessage(65).ToString();
-
-            var parser64 = new JsonParser(new JsonParser.Settings(64));
-            CodedInputStreamTest.AssertMessageDepth(parser64.Parse<TestRecursiveMessage>(data64), 64);
-            Assert.Throws<InvalidProtocolBufferException>(() => parser64.Parse<TestRecursiveMessage>(data65));
-
-            var parser63 = new JsonParser(new JsonParser.Settings(63));
-            Assert.Throws<InvalidProtocolBufferException>(() => parser63.Parse<TestRecursiveMessage>(data64));
-        }
-
-        [Test]
-        [TestCase("AQI")]
-        [TestCase("_-==")]
-        public void Bytes_InvalidBase64(string badBase64)
-        {
-            string json = "{ \"singleBytes\": \"" + badBase64 + "\" }";
-            Assert.Throws<InvalidProtocolBufferException>(() => TestAllTypes.Parser.ParseJson(json));
-        }
-
-        [Test]
-        [TestCase("\"FOREIGN_BAR\"", ForeignEnum.ForeignBar)]
-        [TestCase("5", ForeignEnum.ForeignBar)]
-        [TestCase("100", (ForeignEnum)100)]
-        public void EnumValid(string value, ForeignEnum expectedValue)
-        {
-            string json = "{ \"singleForeignEnum\": " + value + " }";
-            var parsed = TestAllTypes.Parser.ParseJson(json);
-            Assert.AreEqual(new TestAllTypes { SingleForeignEnum = expectedValue }, parsed);
-        }
-
-        [Test]
-        [TestCase("\"NOT_A_VALID_VALUE\"")]
-        [TestCase("5.5")]
-        public void Enum_Invalid(string value)
-        {
-            string json = "{ \"singleForeignEnum\": " + value + " }";
-            Assert.Throws<InvalidProtocolBufferException>(() => TestAllTypes.Parser.ParseJson(json));
-        }
-
-        [Test]
-        public void OneofDuplicate_Invalid()
-        {
-            string json = "{ \"oneofString\": \"x\", \"oneofUint32\": 10 }";
-            Assert.Throws<InvalidProtocolBufferException>(() => TestAllTypes.Parser.ParseJson(json));
-        }
-
-        /// <summary>
-        /// Various tests use strings which have quotes round them for parsing or as the result
-        /// of formatting, but without those quotes being specified in the tests (for the sake of readability).
-        /// This method simply returns the input, wrapped in double quotes.
-        /// </summary>
-        internal static string WrapInQuotes(string text)
-        {
-            return '"' + text + '"';
-        }
-    }
-}
\ No newline at end of file
diff --git a/libs/protobuf/csharp/compatibility_tests/v3.0.0/src/Google.Protobuf.Test/JsonTokenizerTest.cs b/libs/protobuf/csharp/compatibility_tests/v3.0.0/src/Google.Protobuf.Test/JsonTokenizerTest.cs
deleted file mode 100644
index 2e690c1..0000000
--- a/libs/protobuf/csharp/compatibility_tests/v3.0.0/src/Google.Protobuf.Test/JsonTokenizerTest.cs
+++ /dev/null
@@ -1,408 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-using NUnit.Framework;
-using System;
-using System.IO;
-
-namespace Google.Protobuf
-{
-    public class JsonTokenizerTest
-    {
-        [Test]
-        public void EmptyObjectValue()
-        {
-            AssertTokens("{}", JsonToken.StartObject, JsonToken.EndObject);
-        }
-
-        [Test]
-        public void EmptyArrayValue()
-        {
-            AssertTokens("[]", JsonToken.StartArray, JsonToken.EndArray);
-        }
-
-        [Test]
-        [TestCase("foo", "foo")]
-        [TestCase("tab\\t", "tab\t")]
-        [TestCase("line\\nfeed", "line\nfeed")]
-        [TestCase("carriage\\rreturn", "carriage\rreturn")]
-        [TestCase("back\\bspace", "back\bspace")]
-        [TestCase("form\\ffeed", "form\ffeed")]
-        [TestCase("escaped\\/slash", "escaped/slash")]
-        [TestCase("escaped\\\\backslash", "escaped\\backslash")]
-        [TestCase("escaped\\\"quote", "escaped\"quote")]
-        [TestCase("foo {}[] bar", "foo {}[] bar")]
-        [TestCase("foo\\u09aFbar", "foo\u09afbar")] // Digits, upper hex, lower hex
-        [TestCase("ab\ud800\udc00cd", "ab\ud800\udc00cd")]
-        [TestCase("ab\\ud800\\udc00cd", "ab\ud800\udc00cd")]
-        public void StringValue(string json, string expectedValue)
-        {
-            AssertTokensNoReplacement("\"" + json + "\"", JsonToken.Value(expectedValue));
-        }
-
-        // Valid surrogate pairs, with mixed escaping. These test cases can't be expressed
-        // using TestCase as they have no valid UTF-8 representation.
-        // It's unclear exactly how we should handle a mixture of escaped or not: that can't
-        // come from UTF-8 text, but could come from a .NET string. For the moment,
-        // treat it as valid in the obvious way.
-        [Test]
-        public void MixedSurrogatePairs()
-        {
-            string expected = "\ud800\udc00";
-            AssertTokens("'\\ud800\udc00'", JsonToken.Value(expected));
-            AssertTokens("'\ud800\\udc00'", JsonToken.Value(expected));
-        }
-
-        [Test]
-        public void ObjectDepth()
-        {
-            string json = "{ \"foo\": { \"x\": 1, \"y\": [ 0 ] } }";
-            var tokenizer = JsonTokenizer.FromTextReader(new StringReader(json));
-            // If we had more tests like this, I'd introduce a helper method... but for one test, it's not worth it.
-            Assert.AreEqual(0, tokenizer.ObjectDepth);
-            Assert.AreEqual(JsonToken.StartObject, tokenizer.Next());
-            Assert.AreEqual(1, tokenizer.ObjectDepth);
-            Assert.AreEqual(JsonToken.Name("foo"), tokenizer.Next());
-            Assert.AreEqual(1, tokenizer.ObjectDepth);
-            Assert.AreEqual(JsonToken.StartObject, tokenizer.Next());
-            Assert.AreEqual(2, tokenizer.ObjectDepth);
-            Assert.AreEqual(JsonToken.Name("x"), tokenizer.Next());
-            Assert.AreEqual(2, tokenizer.ObjectDepth);
-            Assert.AreEqual(JsonToken.Value(1), tokenizer.Next());
-            Assert.AreEqual(2, tokenizer.ObjectDepth);
-            Assert.AreEqual(JsonToken.Name("y"), tokenizer.Next());
-            Assert.AreEqual(2, tokenizer.ObjectDepth);
-            Assert.AreEqual(JsonToken.StartArray, tokenizer.Next());
-            Assert.AreEqual(2, tokenizer.ObjectDepth); // Depth hasn't changed in array
-            Assert.AreEqual(JsonToken.Value(0), tokenizer.Next());
-            Assert.AreEqual(2, tokenizer.ObjectDepth);
-            Assert.AreEqual(JsonToken.EndArray, tokenizer.Next());
-            Assert.AreEqual(2, tokenizer.ObjectDepth);
-            Assert.AreEqual(JsonToken.EndObject, tokenizer.Next());
-            Assert.AreEqual(1, tokenizer.ObjectDepth);
-            Assert.AreEqual(JsonToken.EndObject, tokenizer.Next());
-            Assert.AreEqual(0, tokenizer.ObjectDepth);
-            Assert.AreEqual(JsonToken.EndDocument, tokenizer.Next());
-            Assert.AreEqual(0, tokenizer.ObjectDepth);
-        }
-
-        [Test]
-        public void ObjectDepth_WithPushBack()
-        {
-            string json = "{}";
-            var tokenizer = JsonTokenizer.FromTextReader(new StringReader(json));
-            Assert.AreEqual(0, tokenizer.ObjectDepth);
-            var token = tokenizer.Next();
-            Assert.AreEqual(1, tokenizer.ObjectDepth);
-            // When we push back a "start object", we should effectively be back to the previous depth.
-            tokenizer.PushBack(token);
-            Assert.AreEqual(0, tokenizer.ObjectDepth);
-            // Read the same token again, and get back to depth 1
-            token = tokenizer.Next();
-            Assert.AreEqual(1, tokenizer.ObjectDepth);
-
-            // Now the same in reverse, with EndObject
-            token = tokenizer.Next();
-            Assert.AreEqual(0, tokenizer.ObjectDepth);
-            tokenizer.PushBack(token);
-            Assert.AreEqual(1, tokenizer.ObjectDepth);
-            tokenizer.Next();
-            Assert.AreEqual(0, tokenizer.ObjectDepth);
-        }
-
-        [Test]
-        [TestCase("embedded tab\t")]
-        [TestCase("embedded CR\r")]
-        [TestCase("embedded LF\n")]
-        [TestCase("embedded bell\u0007")]
-        [TestCase("bad escape\\a")]
-        [TestCase("incomplete escape\\")]
-        [TestCase("incomplete Unicode escape\\u000")]
-        [TestCase("invalid Unicode escape\\u000H")]
-        // Surrogate pair handling, both in raw .NET strings and escaped. We only need
-        // to detect this in strings, as non-ASCII characters anywhere other than in strings
-        // will already lead to parsing errors.
-        [TestCase("\\ud800")]
-        [TestCase("\\udc00")]
-        [TestCase("\\ud800x")]
-        [TestCase("\\udc00x")]
-        [TestCase("\\udc00\\ud800y")]
-        public void InvalidStringValue(string json)
-        {
-            AssertThrowsAfter("\"" + json + "\"");
-        }
-
-        // Tests for invalid strings that can't be expressed in attributes,
-        // as the constants can't be expressed as UTF-8 strings.
-        [Test]
-        public void InvalidSurrogatePairs()
-        {
-            AssertThrowsAfter("\"\ud800x\"");
-            AssertThrowsAfter("\"\udc00y\"");
-            AssertThrowsAfter("\"\udc00\ud800y\"");
-        }
-
-        [Test]
-        [TestCase("0", 0)]
-        [TestCase("-0", 0)] // We don't distinguish between positive and negative 0
-        [TestCase("1", 1)]
-        [TestCase("-1", -1)]
-        // From here on, assume leading sign is okay...
-        [TestCase("1.125", 1.125)]
-        [TestCase("1.0", 1)]
-        [TestCase("1e5", 100000)]
-        [TestCase("1e000000", 1)] // Weird, but not prohibited by the spec
-        [TestCase("1E5", 100000)]
-        [TestCase("1e+5", 100000)]
-        [TestCase("1E-5", 0.00001)]
-        [TestCase("123E-2", 1.23)]
-        [TestCase("123.45E3", 123450)]
-        [TestCase("   1   ", 1)]
-        public void NumberValue(string json, double expectedValue)
-        {
-            AssertTokens(json, JsonToken.Value(expectedValue));
-        }
-
-        [Test]
-        [TestCase("00")]
-        [TestCase(".5")]
-        [TestCase("1.")]
-        [TestCase("1e")]
-        [TestCase("1e-")]
-        [TestCase("--")]
-        [TestCase("--1")]
-        [TestCase("-1.7977e308")]
-        [TestCase("1.7977e308")]
-        public void InvalidNumberValue(string json)
-        {
-            AssertThrowsAfter(json);
-        }
-
-        [Test]
-        [TestCase("nul")]
-        [TestCase("nothing")]
-        [TestCase("truth")]
-        [TestCase("fALSEhood")]
-        public void InvalidLiterals(string json)
-        {
-            AssertThrowsAfter(json);
-        }
-
-        [Test]
-        public void NullValue()
-        {
-            AssertTokens("null", JsonToken.Null);
-        }
-
-        [Test]
-        public void TrueValue()
-        {
-            AssertTokens("true", JsonToken.True);
-        }
-
-        [Test]
-        public void FalseValue()
-        {
-            AssertTokens("false", JsonToken.False);
-        }
-
-        [Test]
-        public void SimpleObject()
-        {
-            AssertTokens("{'x': 'y'}",
-                JsonToken.StartObject, JsonToken.Name("x"), JsonToken.Value("y"), JsonToken.EndObject);
-        }
-
-        [Test]
-        [TestCase("[10, 20", 3)]
-        [TestCase("[10,", 2)]
-        [TestCase("[10:20]", 2)]
-        [TestCase("[", 1)]
-        [TestCase("[,", 1)]
-        [TestCase("{", 1)]
-        [TestCase("{,", 1)]
-        [TestCase("{[", 1)]
-        [TestCase("{{", 1)]
-        [TestCase("{0", 1)]
-        [TestCase("{null", 1)]
-        [TestCase("{false", 1)]
-        [TestCase("{true", 1)]
-        [TestCase("}", 0)]
-        [TestCase("]", 0)]
-        [TestCase(",", 0)]
-        [TestCase("'foo' 'bar'", 1)]
-        [TestCase(":", 0)]
-        [TestCase("'foo", 0)] // Incomplete string
-        [TestCase("{ 'foo' }", 2)]
-        [TestCase("{ x:1", 1)] // Property names must be quoted
-        [TestCase("{]", 1)]
-        [TestCase("[}", 1)]
-        [TestCase("[1,", 2)]
-        [TestCase("{'x':0]", 3)]
-        [TestCase("{ 'foo': }", 2)]
-        [TestCase("{ 'foo':'bar', }", 3)]
-        public void InvalidStructure(string json, int expectedValidTokens)
-        {
-            // Note: we don't test that the earlier tokens are exactly as expected,
-            // partly because that's hard to parameterize.
-            var reader = new StringReader(json.Replace('\'', '"'));
-            var tokenizer = JsonTokenizer.FromTextReader(reader);
-            for (int i = 0; i < expectedValidTokens; i++)
-            {
-                Assert.IsNotNull(tokenizer.Next());
-            }
-            Assert.Throws<InvalidJsonException>(() => tokenizer.Next());
-        }
-
-        [Test]
-        public void ArrayMixedType()
-        {
-            AssertTokens("[1, 'foo', null, false, true, [2], {'x':'y' }]",
-                JsonToken.StartArray,
-                JsonToken.Value(1),
-                JsonToken.Value("foo"),
-                JsonToken.Null,
-                JsonToken.False,
-                JsonToken.True,
-                JsonToken.StartArray,
-                JsonToken.Value(2),
-                JsonToken.EndArray,
-                JsonToken.StartObject,
-                JsonToken.Name("x"),
-                JsonToken.Value("y"),
-                JsonToken.EndObject,
-                JsonToken.EndArray);
-        }
-
-        [Test]
-        public void ObjectMixedType()
-        {
-            AssertTokens(@"{'a': 1, 'b': 'bar', 'c': null, 'd': false, 'e': true,
-                           'f': [2], 'g': {'x':'y' }}",
-                JsonToken.StartObject,
-                JsonToken.Name("a"),
-                JsonToken.Value(1),
-                JsonToken.Name("b"),
-                JsonToken.Value("bar"),
-                JsonToken.Name("c"),
-                JsonToken.Null,
-                JsonToken.Name("d"),
-                JsonToken.False,
-                JsonToken.Name("e"),
-                JsonToken.True,
-                JsonToken.Name("f"),
-                JsonToken.StartArray,
-                JsonToken.Value(2),
-                JsonToken.EndArray,
-                JsonToken.Name("g"),
-                JsonToken.StartObject,
-                JsonToken.Name("x"),
-                JsonToken.Value("y"),
-                JsonToken.EndObject,
-                JsonToken.EndObject);
-        }
-
-        [Test]
-        public void NextAfterEndDocumentThrows()
-        {
-            var tokenizer = JsonTokenizer.FromTextReader(new StringReader("null"));
-            Assert.AreEqual(JsonToken.Null, tokenizer.Next());
-            Assert.AreEqual(JsonToken.EndDocument, tokenizer.Next());
-            Assert.Throws<InvalidOperationException>(() => tokenizer.Next());
-        }
-
-        [Test]
-        public void CanPushBackEndDocument()
-        {
-            var tokenizer = JsonTokenizer.FromTextReader(new StringReader("null"));
-            Assert.AreEqual(JsonToken.Null, tokenizer.Next());
-            Assert.AreEqual(JsonToken.EndDocument, tokenizer.Next());
-            tokenizer.PushBack(JsonToken.EndDocument);
-            Assert.AreEqual(JsonToken.EndDocument, tokenizer.Next());
-            Assert.Throws<InvalidOperationException>(() => tokenizer.Next());
-        }
-
-        /// <summary>
-        /// Asserts that the specified JSON is tokenized into the given sequence of tokens.
-        /// All apostrophes are first converted to double quotes, allowing any tests
-        /// that don't need to check actual apostrophe handling to use apostrophes in the JSON, avoiding
-        /// messy string literal escaping. The "end document" token is not specified in the list of
-        /// expected tokens, but is implicit.
-        /// </summary>
-        private static void AssertTokens(string json, params JsonToken[] expectedTokens)
-        {
-            AssertTokensNoReplacement(json.Replace('\'', '"'), expectedTokens);
-        }
-
-        /// <summary>
-        /// Asserts that the specified JSON is tokenized into the given sequence of tokens.
-        /// Unlike <see cref="AssertTokens(string, JsonToken[])"/>, this does not perform any character
-        /// replacement on the specified JSON, and should be used when the text contains apostrophes which
-        /// are expected to be used *as* apostrophes. The "end document" token is not specified in the list of
-        /// expected tokens, but is implicit.
-        /// </summary>
-        private static void AssertTokensNoReplacement(string json, params JsonToken[] expectedTokens)
-        {
-            var reader = new StringReader(json);
-            var tokenizer = JsonTokenizer.FromTextReader(reader);
-            for (int i = 0; i < expectedTokens.Length; i++)
-            {
-                var actualToken = tokenizer.Next();
-                if (actualToken == JsonToken.EndDocument)
-                {
-                    Assert.Fail("Expected {0} but reached end of token stream", expectedTokens[i]);
-                }
-                Assert.AreEqual(expectedTokens[i], actualToken);
-            }
-            var finalToken = tokenizer.Next();
-            if (finalToken != JsonToken.EndDocument)
-            {
-                Assert.Fail("Expected token stream to be exhausted; received {0}", finalToken);
-            }
-        }
-
-        private static void AssertThrowsAfter(string json, params JsonToken[] expectedTokens)
-        {
-            var reader = new StringReader(json);
-            var tokenizer = JsonTokenizer.FromTextReader(reader);
-            for (int i = 0; i < expectedTokens.Length; i++)
-            {
-                var actualToken = tokenizer.Next();
-                if (actualToken == JsonToken.EndDocument)
-                {
-                    Assert.Fail("Expected {0} but reached end of document", expectedTokens[i]);
-                }
-                Assert.AreEqual(expectedTokens[i], actualToken);
-            }
-            Assert.Throws<InvalidJsonException>(() => tokenizer.Next());
-        }
-    }
-}
diff --git a/libs/protobuf/csharp/compatibility_tests/v3.0.0/src/Google.Protobuf.Test/Program.cs b/libs/protobuf/csharp/compatibility_tests/v3.0.0/src/Google.Protobuf.Test/Program.cs
deleted file mode 100644
index 9078e59..0000000
--- a/libs/protobuf/csharp/compatibility_tests/v3.0.0/src/Google.Protobuf.Test/Program.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2017 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-using NUnitLite;
-using System.Reflection;
-
-// Note: this file wasn't in the actual 3.0, but is required due to build
-// system changes
-
-namespace Google.Protobuf.Test
-{
-    class Program
-    {
-        public static int Main(string[] args)
-        {
-            return new AutoRun(typeof(Program).GetTypeInfo().Assembly).Execute(args);
-        }
-    }
-}
\ No newline at end of file
diff --git a/libs/protobuf/csharp/compatibility_tests/v3.0.0/src/Google.Protobuf.Test/Reflection/DescriptorsTest.cs b/libs/protobuf/csharp/compatibility_tests/v3.0.0/src/Google.Protobuf.Test/Reflection/DescriptorsTest.cs
deleted file mode 100644
index 0520ada..0000000
--- a/libs/protobuf/csharp/compatibility_tests/v3.0.0/src/Google.Protobuf.Test/Reflection/DescriptorsTest.cs
+++ /dev/null
@@ -1,259 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System.Linq;
-using Google.Protobuf.TestProtos;
-using NUnit.Framework;
-using UnitTest.Issues.TestProtos;
-
-namespace Google.Protobuf.Reflection
-{
-    /// <summary>
-    /// Tests for descriptors. (Not in its own namespace or broken up into individual classes as the
-    /// size doesn't warrant it. On the other hand, this makes me feel a bit dirty...)
-    /// </summary>
-    public class DescriptorsTest
-    {
-        [Test]
-        public void FileDescriptor()
-        {
-            FileDescriptor file = UnittestProto3Reflection.Descriptor;
-
-            Assert.AreEqual("google/protobuf/unittest_proto3.proto", file.Name);
-            Assert.AreEqual("protobuf_unittest", file.Package);
-
-            Assert.AreEqual("UnittestProto", file.Proto.Options.JavaOuterClassname);
-            Assert.AreEqual("google/protobuf/unittest_proto3.proto", file.Proto.Name);
-
-            // unittest.proto doesn't have any public imports, but unittest_import.proto does.
-            Assert.AreEqual(0, file.PublicDependencies.Count);
-            Assert.AreEqual(1, UnittestImportProto3Reflection.Descriptor.PublicDependencies.Count);
-            Assert.AreEqual(UnittestImportPublicProto3Reflection.Descriptor, UnittestImportProto3Reflection.Descriptor.PublicDependencies[0]);
-
-            Assert.AreEqual(1, file.Dependencies.Count);
-            Assert.AreEqual(UnittestImportProto3Reflection.Descriptor, file.Dependencies[0]);
-
-            MessageDescriptor messageType = TestAllTypes.Descriptor;
-            Assert.AreSame(typeof(TestAllTypes), messageType.ClrType);
-            Assert.AreSame(TestAllTypes.Parser, messageType.Parser);
-            Assert.AreEqual(messageType, file.MessageTypes[0]);
-            Assert.AreEqual(messageType, file.FindTypeByName<MessageDescriptor>("TestAllTypes"));
-            Assert.Null(file.FindTypeByName<MessageDescriptor>("NoSuchType"));
-            Assert.Null(file.FindTypeByName<MessageDescriptor>("protobuf_unittest.TestAllTypes"));
-            for (int i = 0; i < file.MessageTypes.Count; i++)
-            {
-                Assert.AreEqual(i, file.MessageTypes[i].Index);
-            }
-
-            Assert.AreEqual(file.EnumTypes[0], file.FindTypeByName<EnumDescriptor>("ForeignEnum"));
-            Assert.Null(file.FindTypeByName<EnumDescriptor>("NoSuchType"));
-            Assert.Null(file.FindTypeByName<EnumDescriptor>("protobuf_unittest.ForeignEnum"));
-            Assert.AreEqual(1, UnittestImportProto3Reflection.Descriptor.EnumTypes.Count);
-            Assert.AreEqual("ImportEnum", UnittestImportProto3Reflection.Descriptor.EnumTypes[0].Name);
-            for (int i = 0; i < file.EnumTypes.Count; i++)
-            {
-                Assert.AreEqual(i, file.EnumTypes[i].Index);
-            }
-
-            Assert.AreEqual(10, file.SerializedData[0]);
-        }
-
-        [Test]
-        public void MessageDescriptor()
-        {
-            MessageDescriptor messageType = TestAllTypes.Descriptor;
-            MessageDescriptor nestedType = TestAllTypes.Types.NestedMessage.Descriptor;
-
-            Assert.AreEqual("TestAllTypes", messageType.Name);
-            Assert.AreEqual("protobuf_unittest.TestAllTypes", messageType.FullName);
-            Assert.AreEqual(UnittestProto3Reflection.Descriptor, messageType.File);
-            Assert.IsNull(messageType.ContainingType);
-            Assert.IsNull(messageType.Proto.Options);
-
-            Assert.AreEqual("TestAllTypes", messageType.Name);
-
-            Assert.AreEqual("NestedMessage", nestedType.Name);
-            Assert.AreEqual("protobuf_unittest.TestAllTypes.NestedMessage", nestedType.FullName);
-            Assert.AreEqual(UnittestProto3Reflection.Descriptor, nestedType.File);
-            Assert.AreEqual(messageType, nestedType.ContainingType);
-
-            FieldDescriptor field = messageType.Fields.InDeclarationOrder()[0];
-            Assert.AreEqual("single_int32", field.Name);
-            Assert.AreEqual(field, messageType.FindDescriptor<FieldDescriptor>("single_int32"));
-            Assert.Null(messageType.FindDescriptor<FieldDescriptor>("no_such_field"));
-            Assert.AreEqual(field, messageType.FindFieldByNumber(1));
-            Assert.Null(messageType.FindFieldByNumber(571283));
-            var fieldsInDeclarationOrder = messageType.Fields.InDeclarationOrder();
-            for (int i = 0; i < fieldsInDeclarationOrder.Count; i++)
-            {
-                Assert.AreEqual(i, fieldsInDeclarationOrder[i].Index);
-            }
-
-            Assert.AreEqual(nestedType, messageType.NestedTypes[0]);
-            Assert.AreEqual(nestedType, messageType.FindDescriptor<MessageDescriptor>("NestedMessage"));
-            Assert.Null(messageType.FindDescriptor<MessageDescriptor>("NoSuchType"));
-            for (int i = 0; i < messageType.NestedTypes.Count; i++)
-            {
-                Assert.AreEqual(i, messageType.NestedTypes[i].Index);
-            }
-
-            Assert.AreEqual(messageType.EnumTypes[0], messageType.FindDescriptor<EnumDescriptor>("NestedEnum"));
-            Assert.Null(messageType.FindDescriptor<EnumDescriptor>("NoSuchType"));
-            for (int i = 0; i < messageType.EnumTypes.Count; i++)
-            {
-                Assert.AreEqual(i, messageType.EnumTypes[i].Index);
-            }
-        }
-
-        [Test]
-        public void FieldDescriptor()
-        {
-            MessageDescriptor messageType = TestAllTypes.Descriptor;
-            FieldDescriptor primitiveField = messageType.FindDescriptor<FieldDescriptor>("single_int32");
-            FieldDescriptor enumField = messageType.FindDescriptor<FieldDescriptor>("single_nested_enum");
-            FieldDescriptor messageField = messageType.FindDescriptor<FieldDescriptor>("single_foreign_message");
-
-            Assert.AreEqual("single_int32", primitiveField.Name);
-            Assert.AreEqual("protobuf_unittest.TestAllTypes.single_int32",
-                            primitiveField.FullName);
-            Assert.AreEqual(1, primitiveField.FieldNumber);
-            Assert.AreEqual(messageType, primitiveField.ContainingType);
-            Assert.AreEqual(UnittestProto3Reflection.Descriptor, primitiveField.File);
-            Assert.AreEqual(FieldType.Int32, primitiveField.FieldType);
-            Assert.IsNull(primitiveField.Proto.Options);
-
-            Assert.AreEqual("single_nested_enum", enumField.Name);
-            Assert.AreEqual(FieldType.Enum, enumField.FieldType);
-            // Assert.AreEqual(TestAllTypes.Types.NestedEnum.DescriptorProtoFile, enumField.EnumType);
-
-            Assert.AreEqual("single_foreign_message", messageField.Name);
-            Assert.AreEqual(FieldType.Message, messageField.FieldType);
-            Assert.AreEqual(ForeignMessage.Descriptor, messageField.MessageType);
-        }
-
-        [Test]
-        public void FieldDescriptorLabel()
-        {
-            FieldDescriptor singleField =
-                TestAllTypes.Descriptor.FindDescriptor<FieldDescriptor>("single_int32");
-            FieldDescriptor repeatedField =
-                TestAllTypes.Descriptor.FindDescriptor<FieldDescriptor>("repeated_int32");
-
-            Assert.IsFalse(singleField.IsRepeated);
-            Assert.IsTrue(repeatedField.IsRepeated);
-        }
-
-        [Test]
-        public void EnumDescriptor()
-        {
-            // Note: this test is a bit different to the Java version because there's no static way of getting to the descriptor
-            EnumDescriptor enumType = UnittestProto3Reflection.Descriptor.FindTypeByName<EnumDescriptor>("ForeignEnum");
-            EnumDescriptor nestedType = TestAllTypes.Descriptor.FindDescriptor<EnumDescriptor>("NestedEnum");
-
-            Assert.AreEqual("ForeignEnum", enumType.Name);
-            Assert.AreEqual("protobuf_unittest.ForeignEnum", enumType.FullName);
-            Assert.AreEqual(UnittestProto3Reflection.Descriptor, enumType.File);
-            Assert.Null(enumType.ContainingType);
-            Assert.Null(enumType.Proto.Options);
-
-            Assert.AreEqual("NestedEnum", nestedType.Name);
-            Assert.AreEqual("protobuf_unittest.TestAllTypes.NestedEnum",
-                            nestedType.FullName);
-            Assert.AreEqual(UnittestProto3Reflection.Descriptor, nestedType.File);
-            Assert.AreEqual(TestAllTypes.Descriptor, nestedType.ContainingType);
-
-            EnumValueDescriptor value = enumType.FindValueByName("FOREIGN_FOO");
-            Assert.AreEqual(value, enumType.Values[1]);
-            Assert.AreEqual("FOREIGN_FOO", value.Name);
-            Assert.AreEqual(4, value.Number);
-            Assert.AreEqual((int) ForeignEnum.ForeignFoo, value.Number);
-            Assert.AreEqual(value, enumType.FindValueByNumber(4));
-            Assert.Null(enumType.FindValueByName("NO_SUCH_VALUE"));
-            for (int i = 0; i < enumType.Values.Count; i++)
-            {
-                Assert.AreEqual(i, enumType.Values[i].Index);
-            }
-        }
-
-        [Test]
-        public void OneofDescriptor()
-        {
-            OneofDescriptor descriptor = TestAllTypes.Descriptor.FindDescriptor<OneofDescriptor>("oneof_field");
-            Assert.AreEqual("oneof_field", descriptor.Name);
-            Assert.AreEqual("protobuf_unittest.TestAllTypes.oneof_field", descriptor.FullName);
-
-            var expectedFields = new[] {
-                TestAllTypes.OneofBytesFieldNumber,
-                TestAllTypes.OneofNestedMessageFieldNumber,
-                TestAllTypes.OneofStringFieldNumber,
-                TestAllTypes.OneofUint32FieldNumber }
-                .Select(fieldNumber => TestAllTypes.Descriptor.FindFieldByNumber(fieldNumber))
-                .ToList();
-            foreach (var field in expectedFields)
-            {
-                Assert.AreSame(descriptor, field.ContainingOneof);
-            }
-
-            CollectionAssert.AreEquivalent(expectedFields, descriptor.Fields);
-        }
-
-        [Test]
-        public void MapEntryMessageDescriptor()
-        {
-            var descriptor = MapWellKnownTypes.Descriptor.NestedTypes[0];
-            Assert.IsNull(descriptor.Parser);
-            Assert.IsNull(descriptor.ClrType);
-            Assert.IsNull(descriptor.Fields[1].Accessor);
-        }
-
-        // From TestFieldOrdering:
-        // string my_string = 11;
-        // int64 my_int = 1;
-        // float my_float = 101;
-        // NestedMessage single_nested_message = 200;
-        [Test]
-        public void FieldListOrderings()
-        {
-            var fields = TestFieldOrderings.Descriptor.Fields;
-            Assert.AreEqual(new[] { 11, 1, 101, 200 }, fields.InDeclarationOrder().Select(x => x.FieldNumber));
-            Assert.AreEqual(new[] { 1, 11, 101, 200 }, fields.InFieldNumberOrder().Select(x => x.FieldNumber));
-        }
-
-
-        [Test]
-        public void DescriptorProtoFileDescriptor()
-        {
-            var descriptor = Google.Protobuf.Reflection.FileDescriptor.DescriptorProtoFileDescriptor;
-            Assert.AreEqual("google/protobuf/descriptor.proto", descriptor.Name);
-        }
-    }
-}
diff --git a/libs/protobuf/csharp/compatibility_tests/v3.0.0/src/Google.Protobuf.Test/Reflection/FieldAccessTest.cs b/libs/protobuf/csharp/compatibility_tests/v3.0.0/src/Google.Protobuf.Test/Reflection/FieldAccessTest.cs
deleted file mode 100644
index 46cb1af..0000000
--- a/libs/protobuf/csharp/compatibility_tests/v3.0.0/src/Google.Protobuf.Test/Reflection/FieldAccessTest.cs
+++ /dev/null
@@ -1,218 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using Google.Protobuf.TestProtos;
-using NUnit.Framework;
-using System;
-using System.Collections;
-using System.Collections.Generic;
-
-namespace Google.Protobuf.Reflection
-{
-    public class FieldAccessTest
-    {
-        [Test]
-        public void GetValue()
-        {
-            var message = SampleMessages.CreateFullTestAllTypes();
-            var fields = TestAllTypes.Descriptor.Fields;
-            Assert.AreEqual(message.SingleBool, fields[TestAllTypes.SingleBoolFieldNumber].Accessor.GetValue(message));
-            Assert.AreEqual(message.SingleBytes, fields[TestAllTypes.SingleBytesFieldNumber].Accessor.GetValue(message));
-            Assert.AreEqual(message.SingleDouble, fields[TestAllTypes.SingleDoubleFieldNumber].Accessor.GetValue(message));
-            Assert.AreEqual(message.SingleFixed32, fields[TestAllTypes.SingleFixed32FieldNumber].Accessor.GetValue(message));
-            Assert.AreEqual(message.SingleFixed64, fields[TestAllTypes.SingleFixed64FieldNumber].Accessor.GetValue(message));
-            Assert.AreEqual(message.SingleFloat, fields[TestAllTypes.SingleFloatFieldNumber].Accessor.GetValue(message));
-            Assert.AreEqual(message.SingleForeignEnum, fields[TestAllTypes.SingleForeignEnumFieldNumber].Accessor.GetValue(message));
-            Assert.AreEqual(message.SingleForeignMessage, fields[TestAllTypes.SingleForeignMessageFieldNumber].Accessor.GetValue(message));
-            Assert.AreEqual(message.SingleImportEnum, fields[TestAllTypes.SingleImportEnumFieldNumber].Accessor.GetValue(message));
-            Assert.AreEqual(message.SingleImportMessage, fields[TestAllTypes.SingleImportMessageFieldNumber].Accessor.GetValue(message));
-            Assert.AreEqual(message.SingleInt32, fields[TestAllTypes.SingleInt32FieldNumber].Accessor.GetValue(message));
-            Assert.AreEqual(message.SingleInt64, fields[TestAllTypes.SingleInt64FieldNumber].Accessor.GetValue(message));
-            Assert.AreEqual(message.SingleNestedEnum, fields[TestAllTypes.SingleNestedEnumFieldNumber].Accessor.GetValue(message));
-            Assert.AreEqual(message.SingleNestedMessage, fields[TestAllTypes.SingleNestedMessageFieldNumber].Accessor.GetValue(message));
-            Assert.AreEqual(message.SinglePublicImportMessage, fields[TestAllTypes.SinglePublicImportMessageFieldNumber].Accessor.GetValue(message));
-            Assert.AreEqual(message.SingleSint32, fields[TestAllTypes.SingleSint32FieldNumber].Accessor.GetValue(message));
-            Assert.AreEqual(message.SingleSint64, fields[TestAllTypes.SingleSint64FieldNumber].Accessor.GetValue(message));
-            Assert.AreEqual(message.SingleString, fields[TestAllTypes.SingleStringFieldNumber].Accessor.GetValue(message));
-            Assert.AreEqual(message.SingleSfixed32, fields[TestAllTypes.SingleSfixed32FieldNumber].Accessor.GetValue(message));
-            Assert.AreEqual(message.SingleSfixed64, fields[TestAllTypes.SingleSfixed64FieldNumber].Accessor.GetValue(message));
-            Assert.AreEqual(message.SingleUint32, fields[TestAllTypes.SingleUint32FieldNumber].Accessor.GetValue(message));
-            Assert.AreEqual(message.SingleUint64, fields[TestAllTypes.SingleUint64FieldNumber].Accessor.GetValue(message));
-            Assert.AreEqual(message.OneofBytes, fields[TestAllTypes.OneofBytesFieldNumber].Accessor.GetValue(message));
-            Assert.AreEqual(message.OneofString, fields[TestAllTypes.OneofStringFieldNumber].Accessor.GetValue(message));
-            Assert.AreEqual(message.OneofNestedMessage, fields[TestAllTypes.OneofNestedMessageFieldNumber].Accessor.GetValue(message));
-            Assert.AreEqual(message.OneofUint32, fields[TestAllTypes.OneofUint32FieldNumber].Accessor.GetValue(message));
-
-            // Just one example for repeated fields - they're all just returning the list
-            var list = (IList) fields[TestAllTypes.RepeatedInt32FieldNumber].Accessor.GetValue(message);
-            Assert.AreEqual(message.RepeatedInt32, list);
-            Assert.AreEqual(message.RepeatedInt32[0], list[0]); // Just in case there was any doubt...
-
-            // Just a single map field, for the same reason
-            var mapMessage = new TestMap { MapStringString = { { "key1", "value1" }, { "key2", "value2" } } };
-            fields = TestMap.Descriptor.Fields;
-            var dictionary = (IDictionary) fields[TestMap.MapStringStringFieldNumber].Accessor.GetValue(mapMessage);
-            Assert.AreEqual(mapMessage.MapStringString, dictionary);
-            Assert.AreEqual("value1", dictionary["key1"]);
-        }
-
-        [Test]
-        public void Clear()
-        {
-            var message = SampleMessages.CreateFullTestAllTypes();
-            var fields = TestAllTypes.Descriptor.Fields;
-            fields[TestAllTypes.SingleBoolFieldNumber].Accessor.Clear(message);
-            fields[TestAllTypes.SingleInt32FieldNumber].Accessor.Clear(message);
-            fields[TestAllTypes.SingleStringFieldNumber].Accessor.Clear(message);
-            fields[TestAllTypes.SingleBytesFieldNumber].Accessor.Clear(message);
-            fields[TestAllTypes.SingleForeignEnumFieldNumber].Accessor.Clear(message);
-            fields[TestAllTypes.SingleForeignMessageFieldNumber].Accessor.Clear(message);
-            fields[TestAllTypes.RepeatedDoubleFieldNumber].Accessor.Clear(message);
-
-            var expected = new TestAllTypes(SampleMessages.CreateFullTestAllTypes())
-            {
-                SingleBool = false,
-                SingleInt32 = 0,
-                SingleString = "",
-                SingleBytes = ByteString.Empty,
-                SingleForeignEnum = 0,
-                SingleForeignMessage = null,
-            };
-            expected.RepeatedDouble.Clear();
-
-            Assert.AreEqual(expected, message);
-
-            // Separately, maps.
-            var mapMessage = new TestMap { MapStringString = { { "key1", "value1" }, { "key2", "value2" } } };
-            fields = TestMap.Descriptor.Fields;
-            fields[TestMap.MapStringStringFieldNumber].Accessor.Clear(mapMessage);
-            Assert.AreEqual(0, mapMessage.MapStringString.Count);
-        }
-
-        [Test]
-        public void SetValue_SingleFields()
-        {
-            // Just a sample (primitives, messages, enums, strings, byte strings)
-            var message = SampleMessages.CreateFullTestAllTypes();
-            var fields = TestAllTypes.Descriptor.Fields;
-            fields[TestAllTypes.SingleBoolFieldNumber].Accessor.SetValue(message, false);
-            fields[TestAllTypes.SingleInt32FieldNumber].Accessor.SetValue(message, 500);
-            fields[TestAllTypes.SingleStringFieldNumber].Accessor.SetValue(message, "It's a string");
-            fields[TestAllTypes.SingleBytesFieldNumber].Accessor.SetValue(message, ByteString.CopyFrom(99, 98, 97));
-            fields[TestAllTypes.SingleForeignEnumFieldNumber].Accessor.SetValue(message, ForeignEnum.ForeignFoo);
-            fields[TestAllTypes.SingleForeignMessageFieldNumber].Accessor.SetValue(message, new ForeignMessage { C = 12345 });
-            fields[TestAllTypes.SingleDoubleFieldNumber].Accessor.SetValue(message, 20150701.5);
-
-            var expected = new TestAllTypes(SampleMessages.CreateFullTestAllTypes())
-            {
-                SingleBool = false,
-                SingleInt32 = 500,
-                SingleString = "It's a string",
-                SingleBytes = ByteString.CopyFrom(99, 98, 97),
-                SingleForeignEnum = ForeignEnum.ForeignFoo,
-                SingleForeignMessage = new ForeignMessage { C = 12345 },
-                SingleDouble = 20150701.5
-            };
-
-            Assert.AreEqual(expected, message);
-        }
-
-        [Test]
-        public void SetValue_SingleFields_WrongType()
-        {
-            IMessage message = SampleMessages.CreateFullTestAllTypes();
-            var fields = message.Descriptor.Fields;
-            Assert.Throws<InvalidCastException>(() => fields[TestAllTypes.SingleBoolFieldNumber].Accessor.SetValue(message, "This isn't a bool"));
-        }
-
-        [Test]
-        public void SetValue_MapFields()
-        {
-            IMessage message = new TestMap();
-            var fields = message.Descriptor.Fields;
-            Assert.Throws<InvalidOperationException>(() => fields[TestMap.MapStringStringFieldNumber].Accessor.SetValue(message, new Dictionary<string, string>()));
-        }
-
-        [Test]
-        public void SetValue_RepeatedFields()
-        {
-            IMessage message = SampleMessages.CreateFullTestAllTypes();
-            var fields = message.Descriptor.Fields;
-            Assert.Throws<InvalidOperationException>(() => fields[TestAllTypes.RepeatedDoubleFieldNumber].Accessor.SetValue(message, new double[10]));
-        }
-
-        [Test]
-        public void GetValue_IncorrectType()
-        {
-            IMessage message = SampleMessages.CreateFullTestAllTypes();
-            var fields = message.Descriptor.Fields;
-            Assert.Throws<InvalidCastException>(() => fields[TestAllTypes.SingleBoolFieldNumber].Accessor.GetValue(new TestMap()));
-        }
-
-        [Test]
-        public void Oneof()
-        {
-            var message = new TestAllTypes();
-            var descriptor = TestAllTypes.Descriptor;
-            Assert.AreEqual(1, descriptor.Oneofs.Count);
-            var oneof = descriptor.Oneofs[0];
-            Assert.AreEqual("oneof_field", oneof.Name);
-            Assert.IsNull(oneof.Accessor.GetCaseFieldDescriptor(message));
-
-            message.OneofString = "foo";
-            Assert.AreSame(descriptor.Fields[TestAllTypes.OneofStringFieldNumber], oneof.Accessor.GetCaseFieldDescriptor(message));
-
-            message.OneofUint32 = 10;
-            Assert.AreSame(descriptor.Fields[TestAllTypes.OneofUint32FieldNumber], oneof.Accessor.GetCaseFieldDescriptor(message));
-
-            oneof.Accessor.Clear(message);
-            Assert.AreEqual(TestAllTypes.OneofFieldOneofCase.None, message.OneofFieldCase);
-        }
-
-        [Test]
-        public void FieldDescriptor_ByName()
-        {
-            var descriptor = TestAllTypes.Descriptor;
-            Assert.AreSame(
-                descriptor.Fields[TestAllTypes.SingleBoolFieldNumber],
-                descriptor.Fields["single_bool"]);
-        }
-
-        [Test]
-        public void FieldDescriptor_NotFound()
-        {
-            var descriptor = TestAllTypes.Descriptor;
-            Assert.Throws<KeyNotFoundException>(() => descriptor.Fields[999999].ToString());
-            Assert.Throws<KeyNotFoundException>(() => descriptor.Fields["not found"].ToString());
-        }
-    }
-}
diff --git a/libs/protobuf/csharp/compatibility_tests/v3.0.0/src/Google.Protobuf.Test/Reflection/TypeRegistryTest.cs b/libs/protobuf/csharp/compatibility_tests/v3.0.0/src/Google.Protobuf.Test/Reflection/TypeRegistryTest.cs
deleted file mode 100644
index 5be7ca2..0000000
--- a/libs/protobuf/csharp/compatibility_tests/v3.0.0/src/Google.Protobuf.Test/Reflection/TypeRegistryTest.cs
+++ /dev/null
@@ -1,94 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using Google.Protobuf.TestProtos;
-using Google.Protobuf.WellKnownTypes;
-using NUnit.Framework;
-
-namespace Google.Protobuf.Reflection
-{
-    public class TypeRegistryTest
-    {
-        // Most of our tests use messages. Simple test that we really can use files...
-        [Test]
-        public void CreateWithFileDescriptor()
-        {
-            var registry = TypeRegistry.FromFiles(DurationReflection.Descriptor, StructReflection.Descriptor);
-            AssertDescriptorPresent(registry, Duration.Descriptor);
-            AssertDescriptorPresent(registry, ListValue.Descriptor);
-            AssertDescriptorAbsent(registry, Timestamp.Descriptor);
-        }
-
-        [Test]
-        public void TypesFromSameFile()
-        {
-            // Just for kicks, let's start with a nested type
-            var registry = TypeRegistry.FromMessages(TestAllTypes.Types.NestedMessage.Descriptor);
-            // Top-level...
-            AssertDescriptorPresent(registry, TestFieldOrderings.Descriptor);
-            // ... and nested (not the same as the original NestedMessage!)
-            AssertDescriptorPresent(registry, TestFieldOrderings.Types.NestedMessage.Descriptor);
-        }
-
-        [Test]
-        public void DependenciesAreIncluded()
-        {
-            var registry = TypeRegistry.FromMessages(TestAllTypes.Descriptor);
-            // Direct dependencies
-            AssertDescriptorPresent(registry, ImportMessage.Descriptor);
-            // Public dependencies
-            AssertDescriptorPresent(registry, PublicImportMessage.Descriptor);
-        }
-
-        [Test]
-        public void DuplicateFiles()
-        {
-            // Duplicates via dependencies and simply via repetition
-            var registry = TypeRegistry.FromFiles(
-                UnittestProto3Reflection.Descriptor, UnittestImportProto3Reflection.Descriptor,
-                TimestampReflection.Descriptor, TimestampReflection.Descriptor);
-            AssertDescriptorPresent(registry, TestAllTypes.Descriptor);
-            AssertDescriptorPresent(registry, ImportMessage.Descriptor);
-            AssertDescriptorPresent(registry, Timestamp.Descriptor);
-        }
-
-        private static void AssertDescriptorPresent(TypeRegistry registry, MessageDescriptor descriptor)
-        {
-            Assert.AreSame(descriptor, registry.Find(descriptor.FullName));
-        }
-
-        private static void AssertDescriptorAbsent(TypeRegistry registry, MessageDescriptor descriptor)
-        {
-            Assert.IsNull(registry.Find(descriptor.FullName));
-        }
-    }
-}
diff --git a/libs/protobuf/csharp/compatibility_tests/v3.0.0/src/Google.Protobuf.Test/SampleEnum.cs b/libs/protobuf/csharp/compatibility_tests/v3.0.0/src/Google.Protobuf.Test/SampleEnum.cs
deleted file mode 100644
index 44f232a..0000000
--- a/libs/protobuf/csharp/compatibility_tests/v3.0.0/src/Google.Protobuf.Test/SampleEnum.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-namespace Google.Protobuf
-{
-    // Just a sample enum with positive and negative values to be used in tests.
-    internal enum SampleEnum
-    {
-        NegativeValue = -2,
-        None = 0,
-        PositiveValue = 3
-    }
-}
diff --git a/libs/protobuf/csharp/compatibility_tests/v3.0.0/src/Google.Protobuf.Test/SampleMessages.cs b/libs/protobuf/csharp/compatibility_tests/v3.0.0/src/Google.Protobuf.Test/SampleMessages.cs
deleted file mode 100644
index ffa4e2a..0000000
--- a/libs/protobuf/csharp/compatibility_tests/v3.0.0/src/Google.Protobuf.Test/SampleMessages.cs
+++ /dev/null
@@ -1,99 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-using Google.Protobuf.TestProtos;
-
-namespace Google.Protobuf
-{
-    /// <summary>
-    /// Helper methods to create sample instances of types generated from unit test messages.
-    /// </summary>
-    public class SampleMessages
-    {
-        /// <summary>
-        /// Creates a new sample TestAllTypes message with all fields populated.
-        /// The "oneof" field is populated with the string property (OneofString).
-        /// </summary>
-        public static TestAllTypes CreateFullTestAllTypes()
-        {
-            return new TestAllTypes
-            {
-                SingleBool = true,
-                SingleBytes = ByteString.CopyFrom(1, 2, 3, 4),
-                SingleDouble = 23.5,
-                SingleFixed32 = 23,
-                SingleFixed64 = 1234567890123,
-                SingleFloat = 12.25f,
-                SingleForeignEnum = ForeignEnum.ForeignBar,
-                SingleForeignMessage = new ForeignMessage { C = 10 },
-                SingleImportEnum = ImportEnum.ImportBaz,
-                SingleImportMessage = new ImportMessage { D = 20 },
-                SingleInt32 = 100,
-                SingleInt64 = 3210987654321,
-                SingleNestedEnum = TestAllTypes.Types.NestedEnum.Foo,
-                SingleNestedMessage = new TestAllTypes.Types.NestedMessage { Bb = 35 },
-                SinglePublicImportMessage = new PublicImportMessage { E = 54 },
-                SingleSfixed32 = -123,
-                SingleSfixed64 = -12345678901234,
-                SingleSint32 = -456,
-                SingleSint64 = -12345678901235,
-                SingleString = "test",
-                SingleUint32 = UInt32.MaxValue,
-                SingleUint64 = UInt64.MaxValue,
-                RepeatedBool = { true, false },
-                RepeatedBytes = { ByteString.CopyFrom(1, 2, 3, 4), ByteString.CopyFrom(5, 6), ByteString.CopyFrom(new byte[1000]) },
-                RepeatedDouble = { -12.25, 23.5 },
-                RepeatedFixed32 = { UInt32.MaxValue, 23 },
-                RepeatedFixed64 = { UInt64.MaxValue, 1234567890123 },
-                RepeatedFloat = { 100f, 12.25f },
-                RepeatedForeignEnum = { ForeignEnum.ForeignFoo, ForeignEnum.ForeignBar },
-                RepeatedForeignMessage = { new ForeignMessage(), new ForeignMessage { C = 10 } },
-                RepeatedImportEnum = { ImportEnum.ImportBaz, ImportEnum.Unspecified },
-                RepeatedImportMessage = { new ImportMessage { D = 20 }, new ImportMessage { D = 25 } },
-                RepeatedInt32 = { 100, 200 },
-                RepeatedInt64 = { 3210987654321, Int64.MaxValue },
-                RepeatedNestedEnum = { TestAllTypes.Types.NestedEnum.Foo, TestAllTypes.Types.NestedEnum.Neg },
-                RepeatedNestedMessage = { new TestAllTypes.Types.NestedMessage { Bb = 35 }, new TestAllTypes.Types.NestedMessage { Bb = 10 } },
-                RepeatedPublicImportMessage = { new PublicImportMessage { E = 54 }, new PublicImportMessage { E = -1 } },
-                RepeatedSfixed32 = { -123, 123 },
-                RepeatedSfixed64 = { -12345678901234, 12345678901234 },
-                RepeatedSint32 = { -456, 100 },
-                RepeatedSint64 = { -12345678901235, 123 },
-                RepeatedString = { "foo", "bar" },
-                RepeatedUint32 = { UInt32.MaxValue, UInt32.MinValue },
-                RepeatedUint64 = { UInt64.MaxValue, UInt32.MinValue },
-                OneofString = "Oneof string"
-            };
-        }
-    }
-}
\ No newline at end of file
diff --git a/libs/protobuf/csharp/compatibility_tests/v3.0.0/src/Google.Protobuf.Test/TestCornerCases.cs b/libs/protobuf/csharp/compatibility_tests/v3.0.0/src/Google.Protobuf.Test/TestCornerCases.cs
deleted file mode 100644
index 859b49c..0000000
--- a/libs/protobuf/csharp/compatibility_tests/v3.0.0/src/Google.Protobuf.Test/TestCornerCases.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-    
-using UnitTest.Issues.TestProtos;
-using NUnit.Framework;
-
-namespace Google.Protobuf
-{
-    public class TestCornerCases
-    {
-        [Test]
-        public void TestRoundTripNegativeEnums()
-        {
-            NegativeEnumMessage msg = new NegativeEnumMessage
-            {
-                Value = NegativeEnum.MinusOne,
-                Values = { NegativeEnum.Zero, NegativeEnum.MinusOne, NegativeEnum.FiveBelow },
-                PackedValues = { NegativeEnum.Zero, NegativeEnum.MinusOne, NegativeEnum.FiveBelow }
-            };
-
-            Assert.AreEqual(58, msg.CalculateSize());
-
-            byte[] bytes = new byte[58];
-            CodedOutputStream output = new CodedOutputStream(bytes);
-
-            msg.WriteTo(output);
-            Assert.AreEqual(0, output.SpaceLeft);
-
-            NegativeEnumMessage copy = NegativeEnumMessage.Parser.ParseFrom(bytes);
-            Assert.AreEqual(msg, copy);
-        }
-    }
-}
diff --git a/libs/protobuf/csharp/compatibility_tests/v3.0.0/src/Google.Protobuf.Test/TestProtos/ForeignMessagePartial.cs b/libs/protobuf/csharp/compatibility_tests/v3.0.0/src/Google.Protobuf.Test/TestProtos/ForeignMessagePartial.cs
deleted file mode 100644
index 5663a69..0000000
--- a/libs/protobuf/csharp/compatibility_tests/v3.0.0/src/Google.Protobuf.Test/TestProtos/ForeignMessagePartial.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2016 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-namespace Google.Protobuf.TestProtos
-{
-    /// <summary>
-    /// A message with custom diagnostics (to test that they work).
-    /// </summary>
-    public partial class ForeignMessage : ICustomDiagnosticMessage
-    {
-        public string ToDiagnosticString()
-        {
-            return $"{{ \"c\": {C}, \"@cInHex\": \"{C:x}\" }}";
-        }
-    }
-}
diff --git a/libs/protobuf/csharp/compatibility_tests/v3.0.0/src/Google.Protobuf.Test/WellKnownTypes/AnyTest.cs b/libs/protobuf/csharp/compatibility_tests/v3.0.0/src/Google.Protobuf.Test/WellKnownTypes/AnyTest.cs
deleted file mode 100644
index 4aecc99..0000000
--- a/libs/protobuf/csharp/compatibility_tests/v3.0.0/src/Google.Protobuf.Test/WellKnownTypes/AnyTest.cs
+++ /dev/null
@@ -1,116 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using Google.Protobuf.TestProtos;
-using NUnit.Framework;
-
-namespace Google.Protobuf.WellKnownTypes
-{
-    public class AnyTest
-    {
-        [Test]
-        public void Pack()
-        {
-            var message = SampleMessages.CreateFullTestAllTypes();
-            var any = Any.Pack(message);
-            Assert.AreEqual("type.googleapis.com/protobuf_unittest.TestAllTypes", any.TypeUrl);
-            Assert.AreEqual(message.CalculateSize(), any.Value.Length);
-        }
-
-        [Test]
-        public void Pack_WithCustomPrefix()
-        {
-            var message = SampleMessages.CreateFullTestAllTypes();
-            var any = Any.Pack(message, "foo.bar/baz");
-            Assert.AreEqual("foo.bar/baz/protobuf_unittest.TestAllTypes", any.TypeUrl);
-            Assert.AreEqual(message.CalculateSize(), any.Value.Length);
-        }
-
-        [Test]
-        public void Pack_WithCustomPrefixTrailingSlash()
-        {
-            var message = SampleMessages.CreateFullTestAllTypes();
-            var any = Any.Pack(message, "foo.bar/baz/");
-            Assert.AreEqual("foo.bar/baz/protobuf_unittest.TestAllTypes", any.TypeUrl);
-            Assert.AreEqual(message.CalculateSize(), any.Value.Length);
-        }
-
-        [Test]
-        public void Unpack_WrongType()
-        {
-            var message = SampleMessages.CreateFullTestAllTypes();
-            var any = Any.Pack(message);
-            Assert.Throws<InvalidProtocolBufferException>(() => any.Unpack<TestOneof>());
-        }
-
-        [Test]
-        public void Unpack_Success()
-        {
-            var message = SampleMessages.CreateFullTestAllTypes();
-            var any = Any.Pack(message);
-            var unpacked = any.Unpack<TestAllTypes>();
-            Assert.AreEqual(message, unpacked);
-        }
-
-        [Test]
-        public void Unpack_CustomPrefix_Success()
-        {
-            var message = SampleMessages.CreateFullTestAllTypes();
-            var any = Any.Pack(message, "foo.bar/baz");
-            var unpacked = any.Unpack<TestAllTypes>();
-            Assert.AreEqual(message, unpacked);
-        }
-
-        [Test]
-        public void ToString_WithValues()
-        {
-            var message = SampleMessages.CreateFullTestAllTypes();
-            var any = Any.Pack(message);
-            var text = any.ToString();
-            Assert.That(text, Does.Contain("\"@value\": \"" + message.ToByteString().ToBase64() + "\""));
-        }
-
-        [Test]
-        public void ToString_Empty()
-        {
-            var any = new Any();
-            Assert.AreEqual("{ \"@type\": \"\", \"@value\": \"\" }", any.ToString());
-        }
-
-        [Test]
-        public void ToString_MessageContainingAny()
-        {
-            var message = new TestWellKnownTypes { AnyField = new Any() };
-            Assert.AreEqual("{ \"anyField\": { \"@type\": \"\", \"@value\": \"\" } }", message.ToString());
-        }
-    }
-}
diff --git a/libs/protobuf/csharp/compatibility_tests/v3.0.0/src/Google.Protobuf.Test/WellKnownTypes/DurationTest.cs b/libs/protobuf/csharp/compatibility_tests/v3.0.0/src/Google.Protobuf.Test/WellKnownTypes/DurationTest.cs
deleted file mode 100644
index 141faf8..0000000
--- a/libs/protobuf/csharp/compatibility_tests/v3.0.0/src/Google.Protobuf.Test/WellKnownTypes/DurationTest.cs
+++ /dev/null
@@ -1,132 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using NUnit.Framework;
-using System;
-
-namespace Google.Protobuf.WellKnownTypes
-{
-    public class DurationTest
-    {
-        [Test]
-        public void ToTimeSpan()
-        {
-            Assert.AreEqual(TimeSpan.FromSeconds(1), new Duration { Seconds = 1 }.ToTimeSpan());
-            Assert.AreEqual(TimeSpan.FromSeconds(-1), new Duration { Seconds = -1 }.ToTimeSpan());
-            Assert.AreEqual(TimeSpan.FromMilliseconds(1), new Duration { Nanos = 1000000 }.ToTimeSpan());
-            Assert.AreEqual(TimeSpan.FromMilliseconds(-1), new Duration { Nanos = -1000000 }.ToTimeSpan());
-            Assert.AreEqual(TimeSpan.FromTicks(1), new Duration { Nanos = 100 }.ToTimeSpan());
-            Assert.AreEqual(TimeSpan.FromTicks(-1), new Duration { Nanos = -100 }.ToTimeSpan());
-
-            // Rounding is towards 0
-            Assert.AreEqual(TimeSpan.FromTicks(2), new Duration { Nanos = 250 }.ToTimeSpan());
-            Assert.AreEqual(TimeSpan.FromTicks(-2), new Duration { Nanos = -250 }.ToTimeSpan());
-        }
-
-        [Test]
-        public void Addition()
-        {
-            Assert.AreEqual(new Duration { Seconds = 2, Nanos = 100000000 },
-                new Duration { Seconds = 1, Nanos = 600000000 } + new Duration { Nanos = 500000000 });
-            Assert.AreEqual(new Duration { Seconds = -2, Nanos = -100000000 },
-                new Duration { Seconds = -1, Nanos = -600000000 } + new Duration { Nanos = -500000000 });
-            Assert.AreEqual(new Duration { Seconds = 1, Nanos = 100000000 },
-                new Duration { Seconds = 1, Nanos = 600000000 } + new Duration { Nanos = -500000000 });
-
-            // Non-normalized durations, or non-normalized intermediate results
-            Assert.AreEqual(new Duration { Seconds = 1 },
-                new Duration { Seconds = 1, Nanos = -500000000 } + new Duration { Nanos = 500000000 });
-
-            Assert.AreEqual(new Duration { Nanos = -900000000 },
-                new Duration { Seconds = -1, Nanos = -100000000 } + new Duration { Nanos = 200000000 });
-            Assert.AreEqual(new Duration { Nanos = 900000000 },
-                new Duration { Seconds = 1, Nanos = 100000000 } + new Duration { Nanos = -200000000 });
-        }
-
-        [Test]
-        public void Subtraction()
-        {
-            Assert.AreEqual(new Duration { Seconds = 1, Nanos = 100000000 },
-                new Duration { Seconds = 1, Nanos = 600000000 } - new Duration { Nanos = 500000000 });
-            Assert.AreEqual(new Duration { Seconds = -1, Nanos = -100000000 },
-                new Duration { Seconds = -1, Nanos = -600000000 } - new Duration { Nanos = -500000000 });
-            Assert.AreEqual(new Duration { Seconds = 2, Nanos = 100000000 },
-                new Duration { Seconds = 1, Nanos = 600000000 } - new Duration { Nanos = -500000000 });
-
-            // Non-normalized durations
-            Assert.AreEqual(new Duration(),
-                new Duration { Seconds = 1, Nanos = -500000000 } - new Duration { Nanos = 500000000 });
-            Assert.AreEqual(new Duration { Seconds = 1 },
-                new Duration { Nanos = 2000000000 } - new Duration { Nanos = 1000000000 });
-        }
-
-        [Test]
-        public void FromTimeSpan()
-        {
-            Assert.AreEqual(new Duration { Seconds = 1 }, Duration.FromTimeSpan(TimeSpan.FromSeconds(1)));
-            Assert.AreEqual(new Duration { Nanos = Duration.NanosecondsPerTick }, Duration.FromTimeSpan(TimeSpan.FromTicks(1)));
-        }
-
-        [Test]
-        [TestCase(0, Duration.MaxNanoseconds + 1)]
-        [TestCase(0, Duration.MinNanoseconds - 1)]
-        [TestCase(Duration.MinSeconds - 1, 0)]
-        [TestCase(Duration.MaxSeconds + 1, 0)]
-        [TestCase(1, -1)]
-        [TestCase(-1, 1)]
-        public void ToTimeSpan_Invalid(long seconds, int nanoseconds)
-        {
-            var duration = new Duration { Seconds = seconds, Nanos = nanoseconds };
-            Assert.Throws<InvalidOperationException>(() => duration.ToTimeSpan());
-        }
-
-        [Test]
-        [TestCase(0, Duration.MaxNanoseconds)]
-        [TestCase(0, Duration.MinNanoseconds)]
-        [TestCase(Duration.MinSeconds, Duration.MinNanoseconds)]
-        [TestCase(Duration.MaxSeconds, Duration.MaxNanoseconds)]
-        public void ToTimeSpan_Valid(long seconds, int nanoseconds)
-        {
-            // Only testing that these values don't throw, unlike their similar tests in ToTimeSpan_Invalid
-            var duration = new Duration { Seconds = seconds, Nanos = nanoseconds };
-            duration.ToTimeSpan();
-        }
-
-        [Test]
-        public void ToString_NonNormalized()
-        {
-            // Just a single example should be sufficient...
-            var duration = new Duration { Seconds = 1, Nanos = -1 };
-            Assert.AreEqual("{ \"@warning\": \"Invalid Duration\", \"seconds\": \"1\", \"nanos\": -1 }", duration.ToString());
-        }
-    }
-}
diff --git a/libs/protobuf/csharp/compatibility_tests/v3.0.0/src/Google.Protobuf.Test/WellKnownTypes/FieldMaskTest.cs b/libs/protobuf/csharp/compatibility_tests/v3.0.0/src/Google.Protobuf.Test/WellKnownTypes/FieldMaskTest.cs
deleted file mode 100644
index 1d9908b..0000000
--- a/libs/protobuf/csharp/compatibility_tests/v3.0.0/src/Google.Protobuf.Test/WellKnownTypes/FieldMaskTest.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2016 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-
-using NUnit.Framework;
-
-namespace Google.Protobuf.WellKnownTypes
-{
-    public class FieldMaskTest
-    {
-        [Test]
-        [TestCase("foo__bar")]
-        [TestCase("foo_3_ar")]
-        [TestCase("fooBar")]
-        public void ToString_Invalid(string input)
-        {
-            var mask = new FieldMask { Paths = { input } };
-            var text = mask.ToString();
-            // More specific test below
-            Assert.That(text, Does.Contain("@warning"));
-            Assert.That(text, Does.Contain(input));
-        }
-
-        [Test]
-        public void ToString_Invalid_Precise()
-        {
-            var mask = new FieldMask { Paths = { "x", "foo__bar", @"x\y" } };
-            Assert.AreEqual(
-                "{ \"@warning\": \"Invalid FieldMask\", \"paths\": [ \"x\", \"foo__bar\", \"x\\\\y\" ] }",
-                mask.ToString());
-        }
-    }
-}
diff --git a/libs/protobuf/csharp/compatibility_tests/v3.0.0/src/Google.Protobuf.Test/WellKnownTypes/TimestampTest.cs b/libs/protobuf/csharp/compatibility_tests/v3.0.0/src/Google.Protobuf.Test/WellKnownTypes/TimestampTest.cs
deleted file mode 100644
index 548c585..0000000
--- a/libs/protobuf/csharp/compatibility_tests/v3.0.0/src/Google.Protobuf.Test/WellKnownTypes/TimestampTest.cs
+++ /dev/null
@@ -1,115 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using NUnit.Framework;
-using System;
-
-namespace Google.Protobuf.WellKnownTypes
-{
-    public class TimestampTest
-    {
-        [Test]
-        public void FromAndToDateTime()
-        {
-            DateTime utcMin = DateTime.SpecifyKind(DateTime.MinValue, DateTimeKind.Utc);
-            DateTime utcMax = DateTime.SpecifyKind(DateTime.MaxValue, DateTimeKind.Utc);
-            AssertRoundtrip(new Timestamp { Seconds = -62135596800 }, utcMin);
-            AssertRoundtrip(new Timestamp { Seconds = 253402300799, Nanos = 999999900 }, utcMax);
-            AssertRoundtrip(new Timestamp(), new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc));
-            AssertRoundtrip(new Timestamp { Nanos = 1000000}, new DateTime(1970, 1, 1, 0, 0, 0, 1, DateTimeKind.Utc));
-            AssertRoundtrip(new Timestamp { Seconds = -1, Nanos = 999000000 }, new DateTime(1969, 12, 31, 23, 59, 59, 999, DateTimeKind.Utc));
-            AssertRoundtrip(new Timestamp { Seconds = 3600 }, new DateTime(1970, 1, 1, 1, 0, 0, DateTimeKind.Utc));
-            AssertRoundtrip(new Timestamp { Seconds = -3600 }, new DateTime(1969, 12, 31, 23, 0, 0, DateTimeKind.Utc));
-        }
-
-        [Test]
-        public void ToDateTimeTruncation()
-        {
-            var t1 = new Timestamp { Seconds = 1, Nanos = 1000000 + Duration.NanosecondsPerTick - 1 };
-            Assert.AreEqual(new DateTime(1970, 1, 1, 0, 0, 1, DateTimeKind.Utc).AddMilliseconds(1), t1.ToDateTime());
-
-            var t2 = new Timestamp { Seconds = -1, Nanos = 1000000 + Duration.NanosecondsPerTick - 1 };
-            Assert.AreEqual(new DateTime(1969, 12, 31, 23, 59, 59).AddMilliseconds(1), t2.ToDateTime());
-        }
-
-        [Test]
-        [TestCase(Timestamp.UnixSecondsAtBclMinValue - 1, Timestamp.MaxNanos)]
-        [TestCase(Timestamp.UnixSecondsAtBclMaxValue + 1, 0)]
-        [TestCase(0, -1)]
-        [TestCase(0, Timestamp.MaxNanos + 1)]
-        public void ToDateTime_OutOfRange(long seconds, int nanoseconds)
-        {
-            var value = new Timestamp { Seconds = seconds, Nanos = nanoseconds };
-            Assert.Throws<InvalidOperationException>(() => value.ToDateTime());
-        }
-
-        // 1ns larger or smaller than the above values
-        [Test]
-        [TestCase(Timestamp.UnixSecondsAtBclMinValue, 0)]
-        [TestCase(Timestamp.UnixSecondsAtBclMaxValue, Timestamp.MaxNanos)]
-        [TestCase(0, 0)]
-        [TestCase(0, Timestamp.MaxNanos)]
-        public void ToDateTime_ValidBoundaries(long seconds, int nanoseconds)
-        {
-            var value = new Timestamp { Seconds = seconds, Nanos = nanoseconds };
-            value.ToDateTime();
-        }
-
-        private static void AssertRoundtrip(Timestamp timestamp, DateTime dateTime)
-        {
-            Assert.AreEqual(timestamp, Timestamp.FromDateTime(dateTime));
-            Assert.AreEqual(dateTime, timestamp.ToDateTime());
-            Assert.AreEqual(DateTimeKind.Utc, timestamp.ToDateTime().Kind);
-        }
-
-        [Test]
-        public void Arithmetic()
-        {
-            Timestamp t1 = new Timestamp { Seconds = 10000, Nanos = 5000 };
-            Timestamp t2 = new Timestamp { Seconds = 8000, Nanos = 10000 };
-            Duration difference = new Duration { Seconds = 1999, Nanos = Duration.NanosecondsPerSecond - 5000 };
-            Assert.AreEqual(difference, t1 - t2);
-            Assert.AreEqual(-difference, t2 - t1);
-
-            Assert.AreEqual(t1, t2 + difference);
-            Assert.AreEqual(t2, t1 - difference);
-        }
-
-        [Test]
-        public void ToString_NonNormalized()
-        {
-            // Just a single example should be sufficient...
-            var duration = new Timestamp { Seconds = 1, Nanos = -1 };
-            Assert.AreEqual("{ \"@warning\": \"Invalid Timestamp\", \"seconds\": \"1\", \"nanos\": -1 }", duration.ToString());
-        }
-    }
-}
diff --git a/libs/protobuf/csharp/compatibility_tests/v3.0.0/src/Google.Protobuf.Test/WellKnownTypes/WrappersTest.cs b/libs/protobuf/csharp/compatibility_tests/v3.0.0/src/Google.Protobuf.Test/WellKnownTypes/WrappersTest.cs
deleted file mode 100644
index 0df4ac4..0000000
--- a/libs/protobuf/csharp/compatibility_tests/v3.0.0/src/Google.Protobuf.Test/WellKnownTypes/WrappersTest.cs
+++ /dev/null
@@ -1,421 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-using Google.Protobuf.TestProtos;
-using NUnit.Framework;
-using System.Collections;
-using System.IO;
-
-namespace Google.Protobuf.WellKnownTypes
-{
-    public class WrappersTest
-    {
-        [Test]
-        public void NullIsDefault()
-        {
-            var message = new TestWellKnownTypes();
-            Assert.IsNull(message.StringField);
-            Assert.IsNull(message.BytesField);
-            Assert.IsNull(message.BoolField);
-            Assert.IsNull(message.FloatField);
-            Assert.IsNull(message.DoubleField);
-            Assert.IsNull(message.Int32Field);
-            Assert.IsNull(message.Int64Field);
-            Assert.IsNull(message.Uint32Field);
-            Assert.IsNull(message.Uint64Field);
-        }
-
-        [Test]
-        public void NonDefaultSingleValues()
-        {
-            var message = new TestWellKnownTypes
-            {
-                StringField = "x",
-                BytesField = ByteString.CopyFrom(1, 2, 3),
-                BoolField = true,
-                FloatField = 12.5f,
-                DoubleField = 12.25d,
-                Int32Field = 1,
-                Int64Field = 2,
-                Uint32Field = 3,
-                Uint64Field = 4
-            };
-
-            var bytes = message.ToByteArray();
-            var parsed = TestWellKnownTypes.Parser.ParseFrom(bytes);
-
-            Assert.AreEqual("x", parsed.StringField);
-            Assert.AreEqual(ByteString.CopyFrom(1, 2, 3), parsed.BytesField);
-            Assert.AreEqual(true, parsed.BoolField);
-            Assert.AreEqual(12.5f, parsed.FloatField);
-            Assert.AreEqual(12.25d, parsed.DoubleField);
-            Assert.AreEqual(1, parsed.Int32Field);
-            Assert.AreEqual(2L, parsed.Int64Field);
-            Assert.AreEqual(3U, parsed.Uint32Field);
-            Assert.AreEqual(4UL, parsed.Uint64Field);
-        }
-
-        [Test]
-        public void NonNullDefaultIsPreservedThroughSerialization()
-        {
-            var message = new TestWellKnownTypes
-            {
-                StringField = "",
-                BytesField = ByteString.Empty,
-                BoolField = false,
-                FloatField = 0f,
-                DoubleField = 0d,
-                Int32Field = 0,
-                Int64Field = 0,
-                Uint32Field = 0,
-                Uint64Field = 0
-            };
-
-            var bytes = message.ToByteArray();
-            var parsed = TestWellKnownTypes.Parser.ParseFrom(bytes);
-
-            Assert.AreEqual("", parsed.StringField);
-            Assert.AreEqual(ByteString.Empty, parsed.BytesField);
-            Assert.AreEqual(false, parsed.BoolField);
-            Assert.AreEqual(0f, parsed.FloatField);
-            Assert.AreEqual(0d, parsed.DoubleField);
-            Assert.AreEqual(0, parsed.Int32Field);
-            Assert.AreEqual(0L, parsed.Int64Field);
-            Assert.AreEqual(0U, parsed.Uint32Field);
-            Assert.AreEqual(0UL, parsed.Uint64Field);
-        }
-
-        [Test]
-        public void RepeatedWrappersProhibitNullItems()
-        {
-            var message = new RepeatedWellKnownTypes();
-            Assert.Throws<ArgumentNullException>(() => message.BoolField.Add((bool?) null));
-            Assert.Throws<ArgumentNullException>(() => message.Int32Field.Add((int?) null));
-            Assert.Throws<ArgumentNullException>(() => message.StringField.Add((string) null));
-            Assert.Throws<ArgumentNullException>(() => message.BytesField.Add((ByteString) null));
-        }
-
-        [Test]
-        public void RepeatedWrappersSerializeDeserialize()
-        {
-            var message = new RepeatedWellKnownTypes
-            {
-                BoolField = { true, false },
-                BytesField = { ByteString.CopyFrom(1, 2, 3), ByteString.CopyFrom(4, 5, 6), ByteString.Empty },
-                DoubleField = { 12.5, -1.5, 0d },
-                FloatField = { 123.25f, -20f, 0f },
-                Int32Field = { int.MaxValue, int.MinValue, 0 },
-                Int64Field = { long.MaxValue, long.MinValue, 0L },
-                StringField = { "First", "Second", "" },
-                Uint32Field = { uint.MaxValue, uint.MinValue, 0U },
-                Uint64Field = { ulong.MaxValue, ulong.MinValue, 0UL },
-            };
-            var bytes = message.ToByteArray();
-            var parsed = RepeatedWellKnownTypes.Parser.ParseFrom(bytes);
-
-            Assert.AreEqual(message, parsed);
-            // Just to test a single value for sanity...
-            Assert.AreEqual("Second", message.StringField[1]);
-        }
-
-        [Test]
-        public void RepeatedWrappersBinaryFormat()
-        {
-            // At one point we accidentally used a packed format for repeated wrappers, which is wrong (and weird).
-            // This test is just to prove that we use the right format.
-
-            var rawOutput = new MemoryStream();
-            var output = new CodedOutputStream(rawOutput);
-            // Write a value of 5
-            output.WriteTag(RepeatedWellKnownTypes.Int32FieldFieldNumber, WireFormat.WireType.LengthDelimited);
-            output.WriteLength(2);
-            output.WriteTag(WrappersReflection.WrapperValueFieldNumber, WireFormat.WireType.Varint);
-            output.WriteInt32(5);
-            // Write a value of 0 (empty message)
-            output.WriteTag(RepeatedWellKnownTypes.Int32FieldFieldNumber, WireFormat.WireType.LengthDelimited);
-            output.WriteLength(0);
-            output.Flush();
-            var expectedBytes = rawOutput.ToArray();
-
-            var message = new RepeatedWellKnownTypes { Int32Field = { 5, 0 } };
-            var actualBytes = message.ToByteArray();
-            Assert.AreEqual(expectedBytes, actualBytes);
-        }
-
-        [Test]
-        public void MapWrappersSerializeDeserialize()
-        {
-            // Note: no null values here, as they are prohibited in map fields
-            // (despite being representable).
-            var message = new MapWellKnownTypes
-            {
-                BoolField = { { 10, false }, { 20, true } },
-                BytesField = {
-                    { -1, ByteString.CopyFrom(1, 2, 3) },
-                    { 10, ByteString.CopyFrom(4, 5, 6) },
-                    { 1000, ByteString.Empty },
-                },
-                DoubleField = { { 1, 12.5 }, { 10, -1.5 }, { 20, 0d } },
-                FloatField = { { 2, 123.25f }, { 3, -20f }, { 4, 0f } },
-                Int32Field = { { 5, int.MaxValue }, { 6, int.MinValue }, { 7, 0 } },
-                Int64Field = { { 8, long.MaxValue }, { 9, long.MinValue }, { 10, 0L } },
-                StringField = { { 11, "First" }, { 12, "Second" }, { 13, "" } },
-                Uint32Field = { { 15, uint.MaxValue }, { 16, uint.MinValue }, { 17, 0U } },
-                Uint64Field = { { 18, ulong.MaxValue }, { 19, ulong.MinValue }, { 20, 0UL } },
-            };
-
-            var bytes = message.ToByteArray();
-            var parsed = MapWellKnownTypes.Parser.ParseFrom(bytes);
-
-            Assert.AreEqual(message, parsed);
-            // Just to test a single value for sanity...
-            Assert.AreEqual("Second", message.StringField[12]);
-        }
-
-        [Test]
-        public void Reflection_SingleValues()
-        {
-            var message = new TestWellKnownTypes
-            {
-                StringField = "x",
-                BytesField = ByteString.CopyFrom(1, 2, 3),
-                BoolField = true,
-                FloatField = 12.5f,
-                DoubleField = 12.25d,
-                Int32Field = 1,
-                Int64Field = 2,
-                Uint32Field = 3,
-                Uint64Field = 4
-            };
-            var fields = TestWellKnownTypes.Descriptor.Fields;
-
-            Assert.AreEqual("x", fields[TestWellKnownTypes.StringFieldFieldNumber].Accessor.GetValue(message));
-            Assert.AreEqual(ByteString.CopyFrom(1, 2, 3), fields[TestWellKnownTypes.BytesFieldFieldNumber].Accessor.GetValue(message));
-            Assert.AreEqual(true, fields[TestWellKnownTypes.BoolFieldFieldNumber].Accessor.GetValue(message));
-            Assert.AreEqual(12.5f, fields[TestWellKnownTypes.FloatFieldFieldNumber].Accessor.GetValue(message));
-            Assert.AreEqual(12.25d, fields[TestWellKnownTypes.DoubleFieldFieldNumber].Accessor.GetValue(message));
-            Assert.AreEqual(1, fields[TestWellKnownTypes.Int32FieldFieldNumber].Accessor.GetValue(message));
-            Assert.AreEqual(2L, fields[TestWellKnownTypes.Int64FieldFieldNumber].Accessor.GetValue(message));
-            Assert.AreEqual(3U, fields[TestWellKnownTypes.Uint32FieldFieldNumber].Accessor.GetValue(message));
-            Assert.AreEqual(4UL, fields[TestWellKnownTypes.Uint64FieldFieldNumber].Accessor.GetValue(message));
-
-            // And a couple of null fields...
-            message.StringField = null;
-            message.FloatField = null;
-            Assert.IsNull(fields[TestWellKnownTypes.StringFieldFieldNumber].Accessor.GetValue(message));
-            Assert.IsNull(fields[TestWellKnownTypes.FloatFieldFieldNumber].Accessor.GetValue(message));
-        }
-
-        [Test]
-        public void Reflection_RepeatedFields()
-        {
-            // Just a single example... note that we can't have a null value here
-            var message = new RepeatedWellKnownTypes { Int32Field = { 1, 2 } };
-            var fields = RepeatedWellKnownTypes.Descriptor.Fields;
-            var list = (IList) fields[RepeatedWellKnownTypes.Int32FieldFieldNumber].Accessor.GetValue(message);
-            CollectionAssert.AreEqual(new[] { 1, 2 }, list);
-        }
-
-        [Test]
-        public void Reflection_MapFields()
-        {
-            // Just a single example... note that we can't have a null value here despite the value type being int?
-            var message = new MapWellKnownTypes { Int32Field = { { 1, 2 } } };
-            var fields = MapWellKnownTypes.Descriptor.Fields;
-            var dictionary = (IDictionary) fields[MapWellKnownTypes.Int32FieldFieldNumber].Accessor.GetValue(message);
-            Assert.AreEqual(2, dictionary[1]);
-        }
-
-        [Test]
-        public void Oneof()
-        {
-            var message = new OneofWellKnownTypes { EmptyField = new Empty() };
-            // Start off with a non-wrapper
-            Assert.AreEqual(OneofWellKnownTypes.OneofFieldOneofCase.EmptyField, message.OneofFieldCase);
-            AssertOneofRoundTrip(message);
-
-            message.StringField = "foo";
-            Assert.AreEqual(OneofWellKnownTypes.OneofFieldOneofCase.StringField, message.OneofFieldCase);
-            AssertOneofRoundTrip(message);
-
-            message.StringField = "foo";
-            Assert.AreEqual(OneofWellKnownTypes.OneofFieldOneofCase.StringField, message.OneofFieldCase);
-            AssertOneofRoundTrip(message);
-
-            message.DoubleField = 0.0f;
-            Assert.AreEqual(OneofWellKnownTypes.OneofFieldOneofCase.DoubleField, message.OneofFieldCase);
-            AssertOneofRoundTrip(message);
-
-            message.DoubleField = 1.0f;
-            Assert.AreEqual(OneofWellKnownTypes.OneofFieldOneofCase.DoubleField, message.OneofFieldCase);
-            AssertOneofRoundTrip(message);
-
-            message.ClearOneofField();
-            Assert.AreEqual(OneofWellKnownTypes.OneofFieldOneofCase.None, message.OneofFieldCase);
-            AssertOneofRoundTrip(message);
-        }
-
-        private void AssertOneofRoundTrip(OneofWellKnownTypes message)
-        {
-            // Normal roundtrip, but explicitly checking the case...
-            var bytes = message.ToByteArray();
-            var parsed = OneofWellKnownTypes.Parser.ParseFrom(bytes);
-            Assert.AreEqual(message, parsed);
-            Assert.AreEqual(message.OneofFieldCase, parsed.OneofFieldCase);
-        }
-
-        [Test]
-        [TestCase("x", "y", "y")]
-        [TestCase("x", "", "x")]
-        [TestCase("x", null, "x")]
-        [TestCase("", "y", "y")]
-        [TestCase("", "", "")]
-        [TestCase("", null, "")]
-        [TestCase(null, "y", "y")]
-        [TestCase(null, "", "")]
-        [TestCase(null, null, null)]
-        public void Merging(string original, string merged, string expected)
-        {
-            var originalMessage = new TestWellKnownTypes { StringField = original };
-            var mergingMessage = new TestWellKnownTypes { StringField = merged };
-            originalMessage.MergeFrom(mergingMessage);
-            Assert.AreEqual(expected, originalMessage.StringField);
-
-            // Try it using MergeFrom(CodedInputStream) too...
-            originalMessage = new TestWellKnownTypes { StringField = original };
-            originalMessage.MergeFrom(mergingMessage.ToByteArray());
-            Assert.AreEqual(expected, originalMessage.StringField);
-        }
-
-        // Merging is odd with wrapper types, due to the way that default values aren't emitted in
-        // the binary stream. In fact we cheat a little bit - a message with an explicitly present default
-        // value will have that default value ignored. See issue 615. Fixing this would require significant upheaval to
-        // the FieldCodec side of things.
-        [Test]
-        public void MergingStreamExplicitValue()
-        {
-            var message = new TestWellKnownTypes { Int32Field = 5 };
-
-            // Create a byte array which has the data of an Int32Value explicitly containing a value of 0.
-            // This wouldn't normally happen.
-            byte[] bytes;
-            var wrapperTag = WireFormat.MakeTag(TestWellKnownTypes.Int32FieldFieldNumber, WireFormat.WireType.LengthDelimited);
-            var valueTag = WireFormat.MakeTag(Int32Value.ValueFieldNumber, WireFormat.WireType.Varint);
-            using (var stream = new MemoryStream())
-            {
-                var coded = new CodedOutputStream(stream);
-                coded.WriteTag(wrapperTag);
-                coded.WriteLength(2); // valueTag + a value 0, each one byte
-                coded.WriteTag(valueTag);
-                coded.WriteInt32(0);
-                coded.Flush();
-                bytes = stream.ToArray();
-            }
-
-            message.MergeFrom(bytes);
-            // A normal implementation would have 0 now, as the explicit default would have been overwritten the 5.
-            // With the FieldCodec for Nullable<int>, we can't tell the difference between an implicit 0 and an explicit 0.
-            Assert.AreEqual(5, message.Int32Field);
-        }
-
-        [Test]
-        public void MergingStreamNoValue()
-        {
-            var message = new TestWellKnownTypes { Int32Field = 5 };
-
-            // Create a byte array which an Int32 field, but with no value.
-            var bytes = new TestWellKnownTypes { Int32Field = 0 }.ToByteArray();
-            Assert.AreEqual(2, bytes.Length); // The tag for Int32Field is a single byte, then a byte indicating a 0-length message.
-            message.MergeFrom(bytes);
-
-            // The "implicit" 0 did *not* overwrite the value.
-            // (This is the correct behaviour.)
-            Assert.AreEqual(5, message.Int32Field);
-        }
-
-        // All permutations of origin/merging value being null, zero (default) or non-default.
-        // As this is the in-memory version, we don't need to worry about the difference between implicit and explicit 0.
-        [Test]
-        [TestCase(null, null, null)]
-        [TestCase(null, 0, 0)]
-        [TestCase(null, 5, 5)]
-        [TestCase(0, null, 0)]
-        [TestCase(0, 0, 0)]
-        [TestCase(0, 5, 5)]
-        [TestCase(5, null, 5)]
-        [TestCase(5, 0, 5)]
-        [TestCase(5, 10, 10)]
-        public void MergingMessageWithZero(int? originValue, int? mergingValue, int? expectedResult)
-        {
-            // This differs from the MergingStreamCornerCase because when we merge message *objects*,
-            // we ignore default values from the "source".
-            var message1 = new TestWellKnownTypes { Int32Field = originValue };
-            var message2 = new TestWellKnownTypes { Int32Field = mergingValue };
-            message1.MergeFrom(message2);
-            Assert.AreEqual(expectedResult, message1.Int32Field);
-        }
-
-        [Test]
-        public void UnknownFieldInWrapper()
-        {
-            var stream = new MemoryStream();
-            var output = new CodedOutputStream(stream);
-            var wrapperTag = WireFormat.MakeTag(TestWellKnownTypes.Int32FieldFieldNumber, WireFormat.WireType.LengthDelimited);
-            var unknownTag = WireFormat.MakeTag(15, WireFormat.WireType.Varint);
-            var valueTag = WireFormat.MakeTag(Int32Value.ValueFieldNumber, WireFormat.WireType.Varint);
-
-            output.WriteTag(wrapperTag);
-            output.WriteLength(4); // unknownTag + value 5 + valueType + value 6, each 1 byte
-            output.WriteTag(unknownTag);
-            output.WriteInt32((int) valueTag); // Sneakily "pretend" it's a tag when it's really a value
-            output.WriteTag(valueTag);
-            output.WriteInt32(6);
-
-            output.Flush();
-            stream.Position = 0;
-
-            var message = TestWellKnownTypes.Parser.ParseFrom(stream);
-            Assert.AreEqual(6, message.Int32Field);
-        }
-
-        [Test]
-        public void ClearWithReflection()
-        {
-            // String and Bytes are the tricky ones here, as the CLR type of the property
-            // is the same between the wrapper and non-wrapper types.
-            var message = new TestWellKnownTypes { StringField = "foo" };
-            TestWellKnownTypes.Descriptor.Fields[TestWellKnownTypes.StringFieldFieldNumber].Accessor.Clear(message);
-            Assert.IsNull(message.StringField);
-        }
-    }
-}
diff --git a/libs/protobuf/csharp/compatibility_tests/v3.0.0/test.sh b/libs/protobuf/csharp/compatibility_tests/v3.0.0/test.sh
deleted file mode 100755
index 459c079..0000000
--- a/libs/protobuf/csharp/compatibility_tests/v3.0.0/test.sh
+++ /dev/null
@@ -1,80 +0,0 @@
-#!/bin/bash
-
-function run_test() {
-  # Generate test proto files.
-  $1 -Iprotos/src -I../../../src/ --csharp_out=src/Google.Protobuf.Test \
-    --csharp_opt=base_namespace=Google.Protobuf \
-    protos/src/google/protobuf/unittest_import_proto3.proto \
-    protos/src/google/protobuf/unittest_import_public_proto3.proto \
-    protos/src/google/protobuf/unittest_well_known_types.proto
-
-  $1 -Iprotos/csharp --csharp_out=src/Google.Protobuf.Test \
-    --csharp_opt=base_namespace=UnitTest.Issues \
-    protos/csharp/protos/unittest_issues.proto
-
-  $2 -Iprotos/src --csharp_out=src/Google.Protobuf.Test \
-    --csharp_opt=base_namespace=Google.Protobuf \
-    protos/src/google/protobuf/unittest_proto3.proto \
-    protos/src/google/protobuf/map_unittest_proto3.proto
-
-  # Build and test.
-  dotnet restore src/Google.Protobuf/Google.Protobuf.csproj
-  dotnet restore src/Google.Protobuf.Test/Google.Protobuf.Test.csproj
-  dotnet build -c Release src/Google.Protobuf/Google.Protobuf.csproj
-  dotnet build -c Release src/Google.Protobuf.Test/Google.Protobuf.Test.csproj
-  dotnet run -c Release -f netcoreapp3.1 -p src/Google.Protobuf.Test/Google.Protobuf.Test.csproj
-}
-
-set -ex
-
-# Change to the script's directory.
-cd $(dirname $0)
-
-# Version of the tests (i.e., the version of protobuf from where we extracted
-# these tests).
-TEST_VERSION=3.0.0
-
-# The old version of protobuf that we are testing compatibility against. This
-# is usually the same as TEST_VERSION (i.e., we use the tests extracted from
-# that version to test compatibility of the newest runtime against it), but it
-# is also possible to use this same test set to test the compatibility of the
-# latest version against other versions.
-OLD_VERSION=$1
-OLD_VERSION_PROTOC=https://repo1.maven.org/maven2/com/google/protobuf/protoc/$OLD_VERSION/protoc-$OLD_VERSION-linux-x86_64.exe
-
-echo "Running compatibility tests with $OLD_VERSION"
-
-# Check protoc
-[ -f ../../../src/protoc ] || {
-  echo "[ERROR]: Please build protoc first."
-  exit 1
-}
-
-# Download old version protoc compiler (for linux).
-wget $OLD_VERSION_PROTOC -O old_protoc
-chmod +x old_protoc
-
-# Test source compatibility. In these tests we recompile everything against
-# the new runtime (including old version generated code).
-# Copy the new runtime and keys.
-cp ../../src/Google.Protobuf src/Google.Protobuf -r
-cp ../../keys . -r
-
-# Test A.1:
-#   proto set 1: use old version
-#   proto set 2 which may import protos in set 1: use old version
-run_test "./old_protoc" "./old_protoc"
-
-# Test A.2:
-#   proto set 1: use new version
-#   proto set 2 which may import protos in set 1: use old version
-run_test "../../../src/protoc" "./old_protoc"
-
-# Test A.3:
-#   proto set 1: use old version
-#   proto set 2 which may import protos in set 1: use new version
-run_test "./old_protoc" "../../../src/protoc"
-
-rm old_protoc
-rm keys -r
-rm src/Google.Protobuf -r
diff --git a/libs/protobuf/csharp/generate_protos.sh b/libs/protobuf/csharp/generate_protos.sh
deleted file mode 100755
index b021de2..0000000
--- a/libs/protobuf/csharp/generate_protos.sh
+++ /dev/null
@@ -1,89 +0,0 @@
-#!/bin/bash
-# Generates C# source files from .proto files.
-# You first need to make sure protoc has been built (see instructions on
-# building protoc in root of this repository)
-
-set -e
-
-# cd to repository root
-pushd $(dirname $0)/..
-
-# Protocol buffer compiler to use. If the PROTOC variable is set,
-# use that. Otherwise, probe for expected locations under both
-# Windows and Unix.
-if [ -z "$PROTOC" ]; then
-  # TODO(jonskeet): Use an array and a for loop instead?
-  if [ -x solution/Debug/protoc.exe ]; then
-    PROTOC=solution/Debug/protoc.exe
-  elif [ -x cmake/build/Debug/protoc.exe ]; then
-    PROTOC=cmake/build/Debug/protoc.exe
-  elif [ -x cmake/build/Release/protoc.exe ]; then
-    PROTOC=cmake/build/Release/protoc.exe
-  elif [ -x src/protoc ]; then
-    PROTOC=src/protoc
-  else
-    echo "Unable to find protocol buffer compiler."
-    exit 1
-  fi
-fi
-
-# descriptor.proto and well-known types
-$PROTOC -Isrc --csharp_out=csharp/src/Google.Protobuf \
-    --csharp_opt=base_namespace=Google.Protobuf \
-    src/google/protobuf/descriptor.proto \
-    src/google/protobuf/any.proto \
-    src/google/protobuf/api.proto \
-    src/google/protobuf/duration.proto \
-    src/google/protobuf/empty.proto \
-    src/google/protobuf/field_mask.proto \
-    src/google/protobuf/source_context.proto \
-    src/google/protobuf/struct.proto \
-    src/google/protobuf/timestamp.proto \
-    src/google/protobuf/type.proto \
-    src/google/protobuf/wrappers.proto
-
-# Test protos
-# Note that this deliberately does *not* include old_extensions1.proto
-# and old_extensions2.proto, which are generated with an older version
-# of protoc.
-$PROTOC -Isrc -Icsharp/protos \
-    --experimental_allow_proto3_optional \
-    --csharp_out=csharp/src/Google.Protobuf.Test.TestProtos \
-    --descriptor_set_out=csharp/src/Google.Protobuf.Test/testprotos.pb \
-    --include_source_info \
-    --include_imports \
-    csharp/protos/map_unittest_proto3.proto \
-    csharp/protos/unittest_issues.proto \
-    csharp/protos/unittest_custom_options_proto3.proto \
-    csharp/protos/unittest_proto3.proto \
-    csharp/protos/unittest_import_proto3.proto \
-    csharp/protos/unittest_import_public_proto3.proto \
-    csharp/protos/unittest.proto \
-    csharp/protos/unittest_import.proto \
-    csharp/protos/unittest_import_public.proto \
-    csharp/protos/unittest_issue6936_a.proto \
-    csharp/protos/unittest_issue6936_b.proto \
-    csharp/protos/unittest_issue6936_c.proto \
-    csharp/protos/unittest_selfreferential_options.proto \
-    src/google/protobuf/unittest_well_known_types.proto \
-    src/google/protobuf/test_messages_proto3.proto \
-    src/google/protobuf/test_messages_proto2.proto \
-    src/google/protobuf/unittest_proto3_optional.proto
-
-# AddressBook sample protos
-$PROTOC -Iexamples -Isrc --csharp_out=csharp/src/AddressBook \
-    examples/addressbook.proto
-
-$PROTOC -Iconformance -Isrc --csharp_out=csharp/src/Google.Protobuf.Conformance \
-    conformance/conformance.proto
-
-# Benchmark protos
-$PROTOC -Ibenchmarks \
-  benchmarks/datasets/google_message1/proto3/*.proto \
-  benchmarks/benchmarks.proto \
-  --csharp_out=csharp/src/Google.Protobuf.Benchmarks
-
-# C# only benchmark protos
-$PROTOC -Isrc -Icsharp/src/Google.Protobuf.Benchmarks \
-  csharp/src/Google.Protobuf.Benchmarks/*.proto \
-  --csharp_out=csharp/src/Google.Protobuf.Benchmarks
diff --git a/libs/protobuf/csharp/install_dotnet_sdk.ps1 b/libs/protobuf/csharp/install_dotnet_sdk.ps1
deleted file mode 100755
index f9dc0d9..0000000
--- a/libs/protobuf/csharp/install_dotnet_sdk.ps1
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env powershell
-# Install dotnet SDK using the official dotnet-install.ps1 script
-
-Set-StrictMode -Version 2
-$ErrorActionPreference = 'Stop'
-
-# avoid "Unknown error on a send" in Invoke-WebRequest
-[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
-
-$InstallScriptUrl = 'https://dot.net/v1/dotnet-install.ps1'
-$InstallScriptPath = Join-Path  "$env:TEMP" 'dotnet-install.ps1'
-
-# Download install script
-Write-Host "Downloading install script: $InstallScriptUrl => $InstallScriptPath"
-Invoke-WebRequest -Uri $InstallScriptUrl -OutFile $InstallScriptPath
-
-# The SDK versions to install should be kept in sync with versions
-# installed by kokoro/linux/dockerfile/test/csharp/Dockerfile
-&$InstallScriptPath -Version 3.1.415
-&$InstallScriptPath -Version 6.0.100
diff --git a/libs/protobuf/csharp/keys/Google.Protobuf.public.snk b/libs/protobuf/csharp/keys/Google.Protobuf.public.snk
deleted file mode 100644
index 59cd369..0000000
Binary files a/libs/protobuf/csharp/keys/Google.Protobuf.public.snk and /dev/null differ
diff --git a/libs/protobuf/csharp/keys/Google.Protobuf.snk b/libs/protobuf/csharp/keys/Google.Protobuf.snk
deleted file mode 100644
index 7515443..0000000
Binary files a/libs/protobuf/csharp/keys/Google.Protobuf.snk and /dev/null differ
diff --git a/libs/protobuf/csharp/keys/README.md b/libs/protobuf/csharp/keys/README.md
deleted file mode 100644
index ede6735..0000000
--- a/libs/protobuf/csharp/keys/README.md
+++ /dev/null
@@ -1,9 +0,0 @@
-Contents
---------
-
-- Google.Protobuf.public.snk:
-  Public key to verify strong name of Google.Protobuf assemblies.
-- Google.Protobuf.snk:
-  Signing key to provide strong name of Google.Protobuf assemblies.
-  As per [Microsoft guidance](https://msdn.microsoft.com/en-us/library/wd40t7ad(v=vs.110).aspx)
-  signing key should be checked into the repository.
diff --git a/libs/protobuf/csharp/protos/README.md b/libs/protobuf/csharp/protos/README.md
deleted file mode 100644
index bdd66fc..0000000
--- a/libs/protobuf/csharp/protos/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-This directory contains unit test protos adapted from those in
-src/google/protobuf, and C#-specific test protos for regression
-tests against bugs found in the C# codegen or library.
diff --git a/libs/protobuf/csharp/protos/map_unittest_proto3.proto b/libs/protobuf/csharp/protos/map_unittest_proto3.proto
deleted file mode 100644
index e43e858..0000000
--- a/libs/protobuf/csharp/protos/map_unittest_proto3.proto
+++ /dev/null
@@ -1,116 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// This file is mostly equivalent to map_unittest.proto, but imports
-// unittest_proto3.proto instead of unittest.proto, so that it only
-// uses proto3 messages. This makes it suitable for testing
-// implementations which only support proto3.
-// The TestRequiredMessageMap message has been removed as there are no
-// required fields in proto3.
-syntax = "proto3";
-
-option csharp_namespace = "Google.Protobuf.TestProtos";
-
-import "unittest_proto3.proto";
-
-package protobuf_unittest3;
-
-// Tests maps.
-message TestMap {
-  map<int32   , int32   > map_int32_int32       = 1;
-  map<int64   , int64   > map_int64_int64       = 2;
-  map<uint32  , uint32  > map_uint32_uint32     = 3;
-  map<uint64  , uint64  > map_uint64_uint64     = 4;
-  map<sint32  , sint32  > map_sint32_sint32     = 5;
-  map<sint64  , sint64  > map_sint64_sint64     = 6;
-  map<fixed32 , fixed32 > map_fixed32_fixed32   = 7;
-  map<fixed64 , fixed64 > map_fixed64_fixed64   = 8;
-  map<sfixed32, sfixed32> map_sfixed32_sfixed32 = 9;
-  map<sfixed64, sfixed64> map_sfixed64_sfixed64 = 10;
-  map<int32   , float   > map_int32_float       = 11;
-  map<int32   , double  > map_int32_double      = 12;
-  map<bool    , bool    > map_bool_bool         = 13;
-  map<string  , string  > map_string_string     = 14;
-  map<int32   , bytes   > map_int32_bytes       = 15;
-  map<int32   , MapEnum > map_int32_enum        = 16;
-  map<int32   , ForeignMessage> map_int32_foreign_message = 17;
-}
-
-message TestMapSubmessage {
-  TestMap test_map = 1;
-}
-
-message TestMessageMap {
-  map<int32, TestAllTypes> map_int32_message = 1;
-}
-
-// Two map fields share the same entry default instance.
-message TestSameTypeMap {
-  map<int32, int32> map1 = 1;
-  map<int32, int32> map2 = 2;
-}
-
-enum MapEnum {
-  MAP_ENUM_FOO = 0;
-  MAP_ENUM_BAR = 1;
-  MAP_ENUM_BAZ = 2;
-}
-
-message TestArenaMap {
-  map<int32   , int32   > map_int32_int32       = 1;
-  map<int64   , int64   > map_int64_int64       = 2;
-  map<uint32  , uint32  > map_uint32_uint32     = 3;
-  map<uint64  , uint64  > map_uint64_uint64     = 4;
-  map<sint32  , sint32  > map_sint32_sint32     = 5;
-  map<sint64  , sint64  > map_sint64_sint64     = 6;
-  map<fixed32 , fixed32 > map_fixed32_fixed32   = 7;
-  map<fixed64 , fixed64 > map_fixed64_fixed64   = 8;
-  map<sfixed32, sfixed32> map_sfixed32_sfixed32 = 9;
-  map<sfixed64, sfixed64> map_sfixed64_sfixed64 = 10;
-  map<int32   , float   > map_int32_float       = 11;
-  map<int32   , double  > map_int32_double      = 12;
-  map<bool    , bool    > map_bool_bool         = 13;
-  map<int32   , MapEnum > map_int32_enum        = 14;
-  map<int32   , ForeignMessage> map_int32_foreign_message = 15;
-}
-
-// Previously, message containing enum called Type cannot be used as value of
-// map field.
-message MessageContainingEnumCalledType {
-  enum Type {
-    TYPE_FOO = 0;
-  }
-  map<int32, MessageContainingEnumCalledType> type = 1;
-}
-
-// Previously, message cannot contain map field called "entry".
-message MessageContainingMapCalledEntry {
-  map<int32, int32> entry = 1;
-}
diff --git a/libs/protobuf/csharp/protos/old_extensions1.proto b/libs/protobuf/csharp/protos/old_extensions1.proto
deleted file mode 100644
index 58f6eb5..0000000
--- a/libs/protobuf/csharp/protos/old_extensions1.proto
+++ /dev/null
@@ -1,52 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-//
-// A proto file we will use for unit testing.
-//
-// LINT: ALLOW_GROUPS, LEGACY_NAMES
-
-// This file is part of the unit test for issue #6822. It is
-// generated with protoc from version 3.10.1.
-
-syntax = "proto3";
-
-// Import the proto file containing the extension. We don't use it,
-// but the import is what caused the issue.
-import "old_extensions2.proto";
-
-option csharp_namespace = "Google.Protobuf.TestProtos.OldGenerator";
-
-// We don't use this message other than to get its descriptor.
-message TestMessage {
-}
diff --git a/libs/protobuf/csharp/protos/old_extensions2.proto b/libs/protobuf/csharp/protos/old_extensions2.proto
deleted file mode 100644
index 78f732a..0000000
--- a/libs/protobuf/csharp/protos/old_extensions2.proto
+++ /dev/null
@@ -1,50 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-//
-// A proto file we will use for unit testing.
-//
-// LINT: ALLOW_GROUPS, LEGACY_NAMES
-
-// This file is part of the unit test for issue #6822. It is
-// generated with protoc from version 3.10.1.
-
-syntax = "proto3";
-
-import "google/protobuf/descriptor.proto";
-
-option csharp_namespace = "Google.Protobuf.TestProtos.OldGenerator";
-
-extend google.protobuf.MethodOptions {
-  string method_ext = 1234567;
-}
\ No newline at end of file
diff --git a/libs/protobuf/csharp/protos/unittest.proto b/libs/protobuf/csharp/protos/unittest.proto
deleted file mode 100644
index 9628b9e..0000000
--- a/libs/protobuf/csharp/protos/unittest.proto
+++ /dev/null
@@ -1,1113 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-//
-// A proto file we will use for unit testing.
-//
-// LINT: ALLOW_GROUPS, LEGACY_NAMES
-
-syntax = "proto2";
-
-// Some generic_services option(s) added automatically.
-// See:  http://go/proto2-generic-services-default
-option cc_generic_services = true;     // auto-added
-option java_generic_services = true;   // auto-added
-option py_generic_services = true;     // auto-added
-option cc_enable_arenas = true;
-
-import "unittest_import.proto";
-
-// We don't put this in a package within proto2 because we need to make sure
-// that the generated code doesn't depend on being in the proto2 namespace.
-// In test_util.h we do "using namespace unittest = protobuf_unittest".
-package protobuf_unittest_proto2;
-
-// Protos optimized for SPEED use a strict superset of the generated code
-// of equivalent ones optimized for CODE_SIZE, so we should optimize all our
-// tests for speed unless explicitly testing code size optimization.
-option optimize_for = SPEED;
-
-option csharp_namespace = "Google.Protobuf.TestProtos.Proto2";
-
-// This proto includes every type of field in both singular and repeated
-// forms.
-message TestAllTypes {
-  message NestedMessage {
-    // The field name "b" fails to compile in proto1 because it conflicts with
-    // a local variable named "b" in one of the generated methods.  Doh.
-    // This file needs to compile in proto1 to test backwards-compatibility.
-    optional int32 bb = 1;
-  }
-
-  enum NestedEnum {
-    FOO = 1;
-    BAR = 2;
-    BAZ = 3;
-    NEG = -1;  // Intentionally negative.
-  }
-
-  // Singular
-  optional    int32 optional_int32    =  1;
-  optional    int64 optional_int64    =  2;
-  optional   uint32 optional_uint32   =  3;
-  optional   uint64 optional_uint64   =  4;
-  optional   sint32 optional_sint32   =  5;
-  optional   sint64 optional_sint64   =  6;
-  optional  fixed32 optional_fixed32  =  7;
-  optional  fixed64 optional_fixed64  =  8;
-  optional sfixed32 optional_sfixed32 =  9;
-  optional sfixed64 optional_sfixed64 = 10;
-  optional    float optional_float    = 11;
-  optional   double optional_double   = 12;
-  optional     bool optional_bool     = 13;
-  optional   string optional_string   = 14;
-  optional    bytes optional_bytes    = 15;
-
-  optional group OptionalGroup = 16 {
-    optional int32 a = 17;
-  }
-
-  optional NestedMessage                        optional_nested_message  = 18;
-  optional ForeignMessage                       optional_foreign_message = 19;
-  optional protobuf_unittest_import_proto2.ImportMessage optional_import_message  = 20;
-
-  optional NestedEnum                           optional_nested_enum     = 21;
-  optional ForeignEnum                          optional_foreign_enum    = 22;
-  optional protobuf_unittest_import_proto2.ImportEnum    optional_import_enum     = 23;
-
-  optional string optional_string_piece = 24 [ctype=STRING_PIECE];
-  optional string optional_cord = 25 [ctype=CORD];
-
-  // Defined in unittest_import_public.proto
-  optional protobuf_unittest_import_proto2.PublicImportMessage
-      optional_public_import_message = 26;
-
-  optional NestedMessage optional_lazy_message = 27 [lazy=true];
-
-  // Repeated
-  repeated    int32 repeated_int32    = 31;
-  repeated    int64 repeated_int64    = 32;
-  repeated   uint32 repeated_uint32   = 33;
-  repeated   uint64 repeated_uint64   = 34;
-  repeated   sint32 repeated_sint32   = 35;
-  repeated   sint64 repeated_sint64   = 36;
-  repeated  fixed32 repeated_fixed32  = 37;
-  repeated  fixed64 repeated_fixed64  = 38;
-  repeated sfixed32 repeated_sfixed32 = 39;
-  repeated sfixed64 repeated_sfixed64 = 40;
-  repeated    float repeated_float    = 41;
-  repeated   double repeated_double   = 42;
-  repeated     bool repeated_bool     = 43;
-  repeated   string repeated_string   = 44;
-  repeated    bytes repeated_bytes    = 45;
-
-  repeated group RepeatedGroup = 46 {
-    optional int32 a = 47;
-  }
-
-  repeated NestedMessage                        repeated_nested_message  = 48;
-  repeated ForeignMessage                       repeated_foreign_message = 49;
-  repeated protobuf_unittest_import_proto2.ImportMessage repeated_import_message  = 50;
-
-  repeated NestedEnum                           repeated_nested_enum     = 51;
-  repeated ForeignEnum                          repeated_foreign_enum    = 52;
-  repeated protobuf_unittest_import_proto2.ImportEnum    repeated_import_enum     = 53;
-
-  repeated string repeated_string_piece = 54 [ctype=STRING_PIECE];
-  repeated string repeated_cord = 55 [ctype=CORD];
-
-  repeated NestedMessage repeated_lazy_message = 57 [lazy=true];
-
-  // Singular with defaults
-  optional    int32 default_int32    = 61 [default =  41    ];
-  optional    int64 default_int64    = 62 [default =  42    ];
-  optional   uint32 default_uint32   = 63 [default =  43    ];
-  optional   uint64 default_uint64   = 64 [default =  44    ];
-  optional   sint32 default_sint32   = 65 [default = -45    ];
-  optional   sint64 default_sint64   = 66 [default =  46    ];
-  optional  fixed32 default_fixed32  = 67 [default =  47    ];
-  optional  fixed64 default_fixed64  = 68 [default =  48    ];
-  optional sfixed32 default_sfixed32 = 69 [default =  49    ];
-  optional sfixed64 default_sfixed64 = 70 [default = -50    ];
-  optional    float default_float    = 71 [default =  51.5  ];
-  optional   double default_double   = 72 [default =  52e3  ];
-  optional     bool default_bool     = 73 [default = true   ];
-  optional   string default_string   = 74 [default = "hello"];
-  optional    bytes default_bytes    = 75 [default = "world"];
-
-  optional NestedEnum  default_nested_enum  = 81 [default = BAR        ];
-  optional ForeignEnum default_foreign_enum = 82 [default = FOREIGN_BAR];
-  optional protobuf_unittest_import_proto2.ImportEnum
-      default_import_enum = 83 [default = IMPORT_BAR];
-
-  optional string default_string_piece = 84 [ctype=STRING_PIECE,default="abc"];
-  optional string default_cord = 85 [ctype=CORD,default="123"];
-
-  // For oneof test
-  oneof oneof_field {
-    uint32 oneof_uint32 = 111;
-    NestedMessage oneof_nested_message = 112;
-    string oneof_string = 113;
-    bytes oneof_bytes = 114;
-  }
-}
-
-// This proto includes a recursively nested message.
-message NestedTestAllTypes {
-  optional NestedTestAllTypes child = 1;
-  optional TestAllTypes payload = 2;
-  repeated NestedTestAllTypes repeated_child = 3;
-}
-
-message TestDeprecatedFields {
-  optional int32 deprecated_int32 = 1 [deprecated=true];
-  oneof oneof_fields {
-    int32 deprecated_int32_in_oneof = 2 [deprecated=true];
-  }
-}
-
-message TestDeprecatedMessage {
-  option deprecated = true;
-}
-
-// Define these after TestAllTypes to make sure the compiler can handle
-// that.
-message ForeignMessage {
-  optional int32 c = 1;
-  optional int32 d = 2;
-}
-
-enum ForeignEnum {
-  FOREIGN_FOO = 4;
-  FOREIGN_BAR = 5;
-  FOREIGN_BAZ = 6;
-}
-
-message TestReservedFields {
-  reserved 2, 15, 9 to 11;
-  reserved "bar", "baz";
-}
-
-message TestAllExtensions {
-  extensions 1 to max;
-}
-
-extend TestAllExtensions {
-  // Singular
-  optional    int32 optional_int32_extension    =  1;
-  optional    int64 optional_int64_extension    =  2;
-  optional   uint32 optional_uint32_extension   =  3;
-  optional   uint64 optional_uint64_extension   =  4;
-  optional   sint32 optional_sint32_extension   =  5;
-  optional   sint64 optional_sint64_extension   =  6;
-  optional  fixed32 optional_fixed32_extension  =  7;
-  optional  fixed64 optional_fixed64_extension  =  8;
-  optional sfixed32 optional_sfixed32_extension =  9;
-  optional sfixed64 optional_sfixed64_extension = 10;
-  optional    float optional_float_extension    = 11;
-  optional   double optional_double_extension   = 12;
-  optional     bool optional_bool_extension     = 13;
-  optional   string optional_string_extension   = 14;
-  optional    bytes optional_bytes_extension    = 15;
-
-  optional group OptionalGroup_extension = 16 {
-    optional int32 a = 17;
-  }
-
-  optional TestAllTypes.NestedMessage optional_nested_message_extension = 18;
-  optional ForeignMessage optional_foreign_message_extension = 19;
-  optional protobuf_unittest_import_proto2.ImportMessage
-    optional_import_message_extension = 20;
-
-  optional TestAllTypes.NestedEnum optional_nested_enum_extension = 21;
-  optional ForeignEnum optional_foreign_enum_extension = 22;
-  optional protobuf_unittest_import_proto2.ImportEnum
-    optional_import_enum_extension = 23;
-
-  optional string optional_string_piece_extension = 24 [ctype=STRING_PIECE];
-  optional string optional_cord_extension = 25 [ctype=CORD];
-
-  optional protobuf_unittest_import_proto2.PublicImportMessage
-    optional_public_import_message_extension = 26;
-
-  optional TestAllTypes.NestedMessage
-    optional_lazy_message_extension = 27 [lazy=true];
-
-  // Repeated
-  repeated    int32 repeated_int32_extension    = 31;
-  repeated    int64 repeated_int64_extension    = 32;
-  repeated   uint32 repeated_uint32_extension   = 33;
-  repeated   uint64 repeated_uint64_extension   = 34;
-  repeated   sint32 repeated_sint32_extension   = 35;
-  repeated   sint64 repeated_sint64_extension   = 36;
-  repeated  fixed32 repeated_fixed32_extension  = 37;
-  repeated  fixed64 repeated_fixed64_extension  = 38;
-  repeated sfixed32 repeated_sfixed32_extension = 39;
-  repeated sfixed64 repeated_sfixed64_extension = 40;
-  repeated    float repeated_float_extension    = 41;
-  repeated   double repeated_double_extension   = 42;
-  repeated     bool repeated_bool_extension     = 43;
-  repeated   string repeated_string_extension   = 44;
-  repeated    bytes repeated_bytes_extension    = 45;
-
-  repeated group RepeatedGroup_extension = 46 {
-    optional int32 a = 47;
-  }
-
-  repeated TestAllTypes.NestedMessage repeated_nested_message_extension = 48;
-  repeated ForeignMessage repeated_foreign_message_extension = 49;
-  repeated protobuf_unittest_import_proto2.ImportMessage
-    repeated_import_message_extension = 50;
-
-  repeated TestAllTypes.NestedEnum repeated_nested_enum_extension = 51;
-  repeated ForeignEnum repeated_foreign_enum_extension = 52;
-  repeated protobuf_unittest_import_proto2.ImportEnum
-    repeated_import_enum_extension = 53;
-
-  repeated string repeated_string_piece_extension = 54 [ctype=STRING_PIECE];
-  repeated string repeated_cord_extension = 55 [ctype=CORD];
-
-  repeated TestAllTypes.NestedMessage
-    repeated_lazy_message_extension = 57 [lazy=true];
-
-  // Singular with defaults
-  optional    int32 default_int32_extension    = 61 [default =  41    ];
-  optional    int64 default_int64_extension    = 62 [default =  42    ];
-  optional   uint32 default_uint32_extension   = 63 [default =  43    ];
-  optional   uint64 default_uint64_extension   = 64 [default =  44    ];
-  optional   sint32 default_sint32_extension   = 65 [default = -45    ];
-  optional   sint64 default_sint64_extension   = 66 [default =  46    ];
-  optional  fixed32 default_fixed32_extension  = 67 [default =  47    ];
-  optional  fixed64 default_fixed64_extension  = 68 [default =  48    ];
-  optional sfixed32 default_sfixed32_extension = 69 [default =  49    ];
-  optional sfixed64 default_sfixed64_extension = 70 [default = -50    ];
-  optional    float default_float_extension    = 71 [default =  51.5  ];
-  optional   double default_double_extension   = 72 [default =  52e3  ];
-  optional     bool default_bool_extension     = 73 [default = true   ];
-  optional   string default_string_extension   = 74 [default = "hello"];
-  optional    bytes default_bytes_extension    = 75 [default = "world"];
-
-  optional TestAllTypes.NestedEnum
-    default_nested_enum_extension = 81 [default = BAR];
-  optional ForeignEnum
-    default_foreign_enum_extension = 82 [default = FOREIGN_BAR];
-  optional protobuf_unittest_import_proto2.ImportEnum
-    default_import_enum_extension = 83 [default = IMPORT_BAR];
-
-  optional string default_string_piece_extension = 84 [ctype=STRING_PIECE,
-                                                       default="abc"];
-  optional string default_cord_extension = 85 [ctype=CORD, default="123"];
-
-  // For oneof test
-  optional uint32 oneof_uint32_extension = 111;
-  optional TestAllTypes.NestedMessage oneof_nested_message_extension = 112;
-  optional string oneof_string_extension = 113;
-  optional bytes oneof_bytes_extension = 114;
-}
-
-message TestGroup {
-  optional group OptionalGroup = 16 {
-    optional int32 a = 17;
-  }
-  optional ForeignEnum optional_foreign_enum = 22;
-}
-
-message TestGroupExtension {
-  extensions 1 to max;
-}
-
-message TestNestedExtension {
-  extend TestAllExtensions {
-    // Check for bug where string extensions declared in tested scope did not
-    // compile.
-    optional string test = 1002 [default="test"];
-    // Used to test if generated extension name is correct when there are
-    // underscores.
-    optional string nested_string_extension = 1003;
-  }
-
-  extend TestGroupExtension {
-    optional group OptionalGroup_extension = 16 {
-      optional int32 a = 17;
-    }
-    optional ForeignEnum optional_foreign_enum_extension = 22;
-  }
-}
-
-// We have separate messages for testing required fields because it's
-// annoying to have to fill in required fields in TestProto in order to
-// do anything with it.  Note that we don't need to test every type of
-// required filed because the code output is basically identical to
-// optional fields for all types.
-message TestRequired {
-  required int32 a = 1;
-  optional int32 dummy2 = 2;
-  required int32 b = 3;
-
-  extend TestAllExtensions {
-    optional TestRequired single = 1000;
-    repeated TestRequired multi  = 1001;
-  }
-
-  // Pad the field count to 32 so that we can test that IsInitialized()
-  // properly checks multiple elements of has_bits_.
-  optional int32 dummy4  =  4;
-  optional int32 dummy5  =  5;
-  optional int32 dummy6  =  6;
-  optional int32 dummy7  =  7;
-  optional int32 dummy8  =  8;
-  optional int32 dummy9  =  9;
-  optional int32 dummy10 = 10;
-  optional int32 dummy11 = 11;
-  optional int32 dummy12 = 12;
-  optional int32 dummy13 = 13;
-  optional int32 dummy14 = 14;
-  optional int32 dummy15 = 15;
-  optional int32 dummy16 = 16;
-  optional int32 dummy17 = 17;
-  optional int32 dummy18 = 18;
-  optional int32 dummy19 = 19;
-  optional int32 dummy20 = 20;
-  optional int32 dummy21 = 21;
-  optional int32 dummy22 = 22;
-  optional int32 dummy23 = 23;
-  optional int32 dummy24 = 24;
-  optional int32 dummy25 = 25;
-  optional int32 dummy26 = 26;
-  optional int32 dummy27 = 27;
-  optional int32 dummy28 = 28;
-  optional int32 dummy29 = 29;
-  optional int32 dummy30 = 30;
-  optional int32 dummy31 = 31;
-  optional int32 dummy32 = 32;
-
-  required int32 c = 33;
-}
-
-message TestRequiredForeign {
-  optional TestRequired optional_message = 1;
-  repeated TestRequired repeated_message = 2;
-  optional int32 dummy = 3;
-}
-
-message TestRequiredMessage {
-  optional TestRequired optional_message = 1;
-  repeated TestRequired repeated_message = 2;
-  required TestRequired required_message = 3;
-}
-
-// Test that we can use NestedMessage from outside TestAllTypes.
-message TestForeignNested {
-  optional TestAllTypes.NestedMessage foreign_nested = 1;
-}
-
-// TestEmptyMessage is used to test unknown field support.
-message TestEmptyMessage {
-}
-
-// Like above, but declare all field numbers as potential extensions.  No
-// actual extensions should ever be defined for this type.
-message TestEmptyMessageWithExtensions {
-  extensions 1 to max;
-}
-
-message TestMultipleExtensionRanges {
-  extensions 42;
-  extensions 4143 to 4243;
-  extensions 65536 to max;
-}
-
-// Test that really large tag numbers don't break anything.
-message TestReallyLargeTagNumber {
-  // The largest possible tag number is 2^28 - 1, since the wire format uses
-  // three bits to communicate wire type.
-  optional int32 a = 1;
-  optional int32 bb = 268435455;
-}
-
-message TestRecursiveMessage {
-  optional TestRecursiveMessage a = 1;
-  optional int32 i = 2;
-}
-
-// Test that mutual recursion works.
-message TestMutualRecursionA {
-  message SubMessage {
-    optional TestMutualRecursionB b = 1;
-  }
-  optional TestMutualRecursionB bb = 1;
-  optional group SubGroup = 2 {
-    optional SubMessage sub_message = 3;  // Needed because of bug in javatest
-    optional TestAllTypes not_in_this_scc = 4;
-  }
-}
-
-message TestMutualRecursionB {
-  optional TestMutualRecursionA a = 1;
-  optional int32 optional_int32 = 2;
-}
-
-message TestIsInitialized {
-  message SubMessage {
-    optional group SubGroup = 1 {
-      required int32 i = 2;
-    }
-  }
-  optional SubMessage sub_message = 1;
-}
-
-// Test that groups have disjoint field numbers from their siblings and
-// parents.  This is NOT possible in proto1; only google.protobuf.  When attempting
-// to compile with proto1, this will emit an error; so we only include it
-// in protobuf_unittest_proto.
-message TestDupFieldNumber {                        // NO_PROTO1
-  optional int32 a = 1;                             // NO_PROTO1
-  optional group Foo = 2 { optional int32 a = 1; }  // NO_PROTO1
-  optional group Bar = 3 { optional int32 a = 1; }  // NO_PROTO1
-}                                                   // NO_PROTO1
-
-// Additional messages for testing lazy fields.
-message TestEagerMessage {
-  optional TestAllTypes sub_message = 1 [lazy=false];
-}
-message TestLazyMessage {
-  optional TestAllTypes sub_message = 1 [lazy=true];
-}
-
-// Needed for a Python test.
-message TestNestedMessageHasBits {
-  message NestedMessage {
-    repeated int32 nestedmessage_repeated_int32 = 1;
-    repeated ForeignMessage nestedmessage_repeated_foreignmessage = 2;
-  }
-  optional NestedMessage optional_nested_message = 1;
-}
-
-
-// Test an enum that has multiple values with the same number.
-enum TestEnumWithDupValue {
-  option allow_alias = true;
-
-  FOO1 = 1;
-  BAR1 = 2;
-  BAZ = 3;
-  FOO2 = 1;
-  BAR2 = 2;
-}
-
-// Test an enum with large, unordered values.
-enum TestSparseEnum {
-  SPARSE_A = 123;
-  SPARSE_B = 62374;
-  SPARSE_C = 12589234;
-  SPARSE_D = -15;
-  SPARSE_E = -53452;
-  SPARSE_F = 0;
-  SPARSE_G = 2;
-}
-
-// Test message with CamelCase field names.  This violates Protocol Buffer
-// standard style.
-message TestCamelCaseFieldNames {
-  optional int32 PrimitiveField = 1;
-  optional string StringField = 2;
-  optional ForeignEnum EnumField = 3;
-  optional ForeignMessage MessageField = 4;
-  optional string StringPieceField = 5 [ctype=STRING_PIECE];
-  optional string CordField = 6 [ctype=CORD];
-
-  repeated int32 RepeatedPrimitiveField = 7;
-  repeated string RepeatedStringField = 8;
-  repeated ForeignEnum RepeatedEnumField = 9;
-  repeated ForeignMessage RepeatedMessageField = 10;
-  repeated string RepeatedStringPieceField = 11 [ctype=STRING_PIECE];
-  repeated string RepeatedCordField = 12 [ctype=CORD];
-}
-
-
-// We list fields out of order, to ensure that we're using field number and not
-// field index to determine serialization order.
-message TestFieldOrderings {
-  optional string my_string = 11;
-  extensions 2 to 10;
-  optional int64 my_int = 1;
-  extensions 12 to 100;
-  optional float my_float = 101;
-  message NestedMessage {
-    optional int64 oo = 2;
-    // The field name "b" fails to compile in proto1 because it conflicts with
-    // a local variable named "b" in one of the generated methods.  Doh.
-    // This file needs to compile in proto1 to test backwards-compatibility.
-    optional int32 bb = 1;
-  }
-
-  optional NestedMessage optional_nested_message  = 200;
-}
-
-extend TestFieldOrderings {
-  optional string my_extension_string = 50;
-  optional int32 my_extension_int = 5;
-}
-
-message TestExtensionOrderings1 {
-  extend TestFieldOrderings {
-    optional TestExtensionOrderings1 test_ext_orderings1 = 13;
-  }
-  optional string my_string = 1;
-}
-
-message TestExtensionOrderings2 {
-  extend TestFieldOrderings {
-    optional TestExtensionOrderings2 test_ext_orderings2 = 12;
-  }
-  message TestExtensionOrderings3 {
-    extend TestFieldOrderings {
-      optional TestExtensionOrderings3 test_ext_orderings3 = 14;
-    }
-    optional string my_string = 1;
-  }
-  optional string my_string = 1;
-}
-
-message TestExtremeDefaultValues {
-  optional bytes escaped_bytes = 1 [default = "\0\001\a\b\f\n\r\t\v\\\'\"\xfe"];
-  optional uint32 large_uint32 = 2 [default = 0xFFFFFFFF];
-  optional uint64 large_uint64 = 3 [default = 0xFFFFFFFFFFFFFFFF];
-  optional  int32 small_int32  = 4 [default = -0x7FFFFFFF];
-  optional  int64 small_int64  = 5 [default = -0x7FFFFFFFFFFFFFFF];
-  optional  int32 really_small_int32 = 21 [default = -0x80000000];
-  optional  int64 really_small_int64 = 22 [default = -0x8000000000000000];
-
-  // The default value here is UTF-8 for "\u1234".  (We could also just type
-  // the UTF-8 text directly into this text file rather than escape it, but
-  // lots of people use editors that would be confused by this.)
-  optional string utf8_string = 6 [default = "\341\210\264"];
-
-  // Tests for single-precision floating-point values.
-  optional float zero_float = 7 [default = 0];
-  optional float one_float = 8 [default = 1];
-  optional float small_float = 9 [default = 1.5];
-  optional float negative_one_float = 10 [default = -1];
-  optional float negative_float = 11 [default = -1.5];
-  // Using exponents
-  optional float large_float = 12 [default = 2E8];
-  optional float small_negative_float = 13 [default = -8e-28];
-
-  // Text for nonfinite floating-point values.
-  optional double inf_double = 14 [default = inf];
-  optional double neg_inf_double = 15 [default = -inf];
-  optional double nan_double = 16 [default = nan];
-  optional float inf_float = 17 [default = inf];
-  optional float neg_inf_float = 18 [default = -inf];
-  optional float nan_float = 19 [default = nan];
-
-  // Tests for C++ trigraphs.
-  // Trigraphs should be escaped in C++ generated files, but they should not be
-  // escaped for other languages.
-  // Note that in .proto file, "\?" is a valid way to escape ? in string
-  // literals.
-  optional string cpp_trigraph = 20 [default = "? \? ?? \?? \??? ??/ ?\?-"];
-
-  // String defaults containing the character '\000'
-  optional string string_with_zero       = 23 [default = "hel\000lo"];
-  optional  bytes bytes_with_zero        = 24 [default = "wor\000ld"];
-  optional string string_piece_with_zero = 25 [ctype=STRING_PIECE,
-                                               default="ab\000c"];
-  optional string cord_with_zero         = 26 [ctype=CORD,
-                                               default="12\0003"];
-  optional string replacement_string     = 27 [default="${unknown}"];
-}
-
-message SparseEnumMessage {
-  optional TestSparseEnum sparse_enum = 1;
-}
-
-// Test String and Bytes: string is for valid UTF-8 strings
-message OneString {
-  optional string data = 1;
-}
-
-message MoreString {
-  repeated string data = 1;
-}
-
-message OneBytes {
-  optional bytes data = 1;
-}
-
-message MoreBytes {
-  repeated bytes data = 1;
-}
-
-// Test int32, uint32, int64, uint64, and bool are all compatible
-message Int32Message {
-  optional int32 data = 1;
-}
-
-message Uint32Message {
-  optional uint32 data = 1;
-}
-
-message Int64Message {
-  optional int64 data = 1;
-}
-
-message Uint64Message {
-  optional uint64 data = 1;
-}
-
-message BoolMessage {
-  optional bool data = 1;
-}
-
-// Test oneofs.
-message TestOneof {
-  oneof foo {
-    int32 foo_int = 1;
-    string foo_string = 2;
-    TestAllTypes foo_message = 3;
-    group FooGroup = 4 {
-      optional int32 a = 5;
-      optional string b = 6;
-    }
-  }
-}
-
-message TestOneofBackwardsCompatible {
-  optional int32 foo_int = 1;
-  optional string foo_string = 2;
-  optional TestAllTypes foo_message = 3;
-  optional group FooGroup = 4 {
-    optional int32 a = 5;
-    optional string b = 6;
-  }
-}
-
-message TestOneof2 {
-  oneof foo {
-    int32 foo_int = 1;
-    string foo_string = 2;
-    string foo_cord = 3 [ctype=CORD];
-    string foo_string_piece = 4 [ctype=STRING_PIECE];
-    bytes foo_bytes = 5;
-    NestedEnum foo_enum = 6;
-    NestedMessage foo_message = 7;
-    group FooGroup = 8 {
-      optional int32 a = 9;
-      optional string b = 10;
-    }
-    NestedMessage foo_lazy_message = 11 [lazy=true];
-  }
-
-  oneof bar {
-    int32 bar_int = 12 [default = 5];
-    string bar_string = 13 [default = "STRING"];
-    string bar_cord = 14 [ctype=CORD, default = "CORD"];
-    string bar_string_piece = 15 [ctype=STRING_PIECE, default = "SPIECE"];
-    bytes bar_bytes = 16 [default = "BYTES"];
-    NestedEnum bar_enum = 17 [default = BAR];
-  }
-
-  optional int32 baz_int = 18;
-  optional string baz_string = 19 [default = "BAZ"];
-
-  message NestedMessage {
-    optional int64 qux_int = 1;
-    repeated int32 corge_int = 2;
-  }
-
-  enum NestedEnum {
-    FOO = 1;
-    BAR = 2;
-    BAZ = 3;
-  }
-}
-
-message TestRequiredOneof {
-  oneof foo {
-    int32 foo_int = 1;
-    string foo_string = 2;
-    NestedMessage foo_message = 3;
-  }
-  message NestedMessage {
-    required double required_double = 1;
-  }
-}
-
-message TestRequiredMap {
-  map<int32, NestedMessage> foo = 1;
-  message NestedMessage {
-    required int32 required_int32 = 1;
-  }
-}
-
-// Test messages for packed fields
-
-message TestPackedTypes {
-  repeated    int32 packed_int32    =  90 [packed = true];
-  repeated    int64 packed_int64    =  91 [packed = true];
-  repeated   uint32 packed_uint32   =  92 [packed = true];
-  repeated   uint64 packed_uint64   =  93 [packed = true];
-  repeated   sint32 packed_sint32   =  94 [packed = true];
-  repeated   sint64 packed_sint64   =  95 [packed = true];
-  repeated  fixed32 packed_fixed32  =  96 [packed = true];
-  repeated  fixed64 packed_fixed64  =  97 [packed = true];
-  repeated sfixed32 packed_sfixed32 =  98 [packed = true];
-  repeated sfixed64 packed_sfixed64 =  99 [packed = true];
-  repeated    float packed_float    = 100 [packed = true];
-  repeated   double packed_double   = 101 [packed = true];
-  repeated     bool packed_bool     = 102 [packed = true];
-  repeated ForeignEnum packed_enum  = 103 [packed = true];
-}
-
-// A message with the same fields as TestPackedTypes, but without packing. Used
-// to test packed <-> unpacked wire compatibility.
-message TestUnpackedTypes {
-  repeated    int32 unpacked_int32    =  90 [packed = false];
-  repeated    int64 unpacked_int64    =  91 [packed = false];
-  repeated   uint32 unpacked_uint32   =  92 [packed = false];
-  repeated   uint64 unpacked_uint64   =  93 [packed = false];
-  repeated   sint32 unpacked_sint32   =  94 [packed = false];
-  repeated   sint64 unpacked_sint64   =  95 [packed = false];
-  repeated  fixed32 unpacked_fixed32  =  96 [packed = false];
-  repeated  fixed64 unpacked_fixed64  =  97 [packed = false];
-  repeated sfixed32 unpacked_sfixed32 =  98 [packed = false];
-  repeated sfixed64 unpacked_sfixed64 =  99 [packed = false];
-  repeated    float unpacked_float    = 100 [packed = false];
-  repeated   double unpacked_double   = 101 [packed = false];
-  repeated     bool unpacked_bool     = 102 [packed = false];
-  repeated ForeignEnum unpacked_enum  = 103 [packed = false];
-}
-
-message TestPackedExtensions {
-  extensions 1 to max;
-}
-
-extend TestPackedExtensions {
-  repeated    int32 packed_int32_extension    =  90 [packed = true];
-  repeated    int64 packed_int64_extension    =  91 [packed = true];
-  repeated   uint32 packed_uint32_extension   =  92 [packed = true];
-  repeated   uint64 packed_uint64_extension   =  93 [packed = true];
-  repeated   sint32 packed_sint32_extension   =  94 [packed = true];
-  repeated   sint64 packed_sint64_extension   =  95 [packed = true];
-  repeated  fixed32 packed_fixed32_extension  =  96 [packed = true];
-  repeated  fixed64 packed_fixed64_extension  =  97 [packed = true];
-  repeated sfixed32 packed_sfixed32_extension =  98 [packed = true];
-  repeated sfixed64 packed_sfixed64_extension =  99 [packed = true];
-  repeated    float packed_float_extension    = 100 [packed = true];
-  repeated   double packed_double_extension   = 101 [packed = true];
-  repeated     bool packed_bool_extension     = 102 [packed = true];
-  repeated ForeignEnum packed_enum_extension  = 103 [packed = true];
-}
-
-message TestUnpackedExtensions {
-  extensions 1 to max;
-}
-
-extend TestUnpackedExtensions {
-  repeated    int32 unpacked_int32_extension    =  90 [packed = false];
-  repeated    int64 unpacked_int64_extension    =  91 [packed = false];
-  repeated   uint32 unpacked_uint32_extension   =  92 [packed = false];
-  repeated   uint64 unpacked_uint64_extension   =  93 [packed = false];
-  repeated   sint32 unpacked_sint32_extension   =  94 [packed = false];
-  repeated   sint64 unpacked_sint64_extension   =  95 [packed = false];
-  repeated  fixed32 unpacked_fixed32_extension  =  96 [packed = false];
-  repeated  fixed64 unpacked_fixed64_extension  =  97 [packed = false];
-  repeated sfixed32 unpacked_sfixed32_extension =  98 [packed = false];
-  repeated sfixed64 unpacked_sfixed64_extension =  99 [packed = false];
-  repeated    float unpacked_float_extension    = 100 [packed = false];
-  repeated   double unpacked_double_extension   = 101 [packed = false];
-  repeated     bool unpacked_bool_extension     = 102 [packed = false];
-  repeated ForeignEnum unpacked_enum_extension  = 103 [packed = false];
-}
-
-// Used by ExtensionSetTest/DynamicExtensions.  The test actually builds
-// a set of extensions to TestAllExtensions dynamically, based on the fields
-// of this message type.
-message TestDynamicExtensions {
-  enum DynamicEnumType {
-    DYNAMIC_FOO = 2200;
-    DYNAMIC_BAR = 2201;
-    DYNAMIC_BAZ = 2202;
-  }
-  message DynamicMessageType {
-    optional int32 dynamic_field = 2100;
-  }
-
-  optional fixed32 scalar_extension = 2000;
-  optional ForeignEnum enum_extension = 2001;
-  optional DynamicEnumType dynamic_enum_extension = 2002;
-
-  optional ForeignMessage message_extension = 2003;
-  optional DynamicMessageType dynamic_message_extension = 2004;
-
-  repeated string repeated_extension = 2005;
-  repeated sint32 packed_extension = 2006 [packed = true];
-}
-
-message TestRepeatedScalarDifferentTagSizes {
-  // Parsing repeated fixed size values used to fail. This message needs to be
-  // used in order to get a tag of the right size; all of the repeated fields
-  // in TestAllTypes didn't trigger the check.
-  repeated fixed32 repeated_fixed32 = 12;
-  // Check for a varint type, just for good measure.
-  repeated int32   repeated_int32   = 13;
-
-  // These have two-byte tags.
-  repeated fixed64 repeated_fixed64 = 2046;
-  repeated int64   repeated_int64   = 2047;
-
-  // Three byte tags.
-  repeated float   repeated_float   = 262142;
-  repeated uint64  repeated_uint64  = 262143;
-}
-
-// Test that if an optional or required message/group field appears multiple
-// times in the input, they need to be merged.
-message TestParsingMerge {
-  // RepeatedFieldsGenerator defines matching field types as TestParsingMerge,
-  // except that all fields are repeated. In the tests, we will serialize the
-  // RepeatedFieldsGenerator to bytes, and parse the bytes to TestParsingMerge.
-  // Repeated fields in RepeatedFieldsGenerator are expected to be merged into
-  // the corresponding required/optional fields in TestParsingMerge.
-  message RepeatedFieldsGenerator {
-    repeated TestAllTypes field1 = 1;
-    repeated TestAllTypes field2 = 2;
-    repeated TestAllTypes field3 = 3;
-    repeated group Group1 = 10 {
-      optional TestAllTypes field1 = 11;
-    }
-    repeated group Group2 = 20 {
-      optional TestAllTypes field1 = 21;
-    }
-    repeated TestAllTypes ext1 = 1000;
-    repeated TestAllTypes ext2 = 1001;
-  }
-  required TestAllTypes required_all_types = 1;
-  optional TestAllTypes optional_all_types = 2;
-  repeated TestAllTypes repeated_all_types = 3;
-  optional group OptionalGroup = 10 {
-    optional TestAllTypes optional_group_all_types = 11;
-  }
-  repeated group RepeatedGroup = 20 {
-    optional TestAllTypes repeated_group_all_types = 21;
-  }
-  extensions 1000 to max;
-  extend TestParsingMerge {
-    optional TestAllTypes optional_ext = 1000;
-    repeated TestAllTypes repeated_ext = 1001;
-  }
-}
-
-message TestCommentInjectionMessage {
-  // */ <- This should not close the generated doc comment
-  optional string a = 1 [default="*/ <- Neither should this."];
-}
-
-
-// Test that RPC services work.
-message FooRequest  {}
-message FooResponse {}
-
-message FooClientMessage {}
-message FooServerMessage{}
-
-service TestService {
-  rpc Foo(FooRequest) returns (FooResponse);
-  rpc Bar(BarRequest) returns (BarResponse);
-}
-
-
-message BarRequest  {}
-message BarResponse {}
-
-message TestJsonName {
-  optional int32 field_name1 = 1;
-  optional int32 fieldName2 = 2;
-  optional int32 FieldName3 = 3;
-  optional int32 _field_name4 = 4;
-  optional int32 FIELD_NAME5 = 5;
-  optional int32 field_name6 = 6 [json_name = "@type"];
-}
-
-message TestHugeFieldNumbers {
-  optional int32 optional_int32 = 536870000;
-  optional int32 fixed_32 = 536870001;
-  repeated int32 repeated_int32 = 536870002 [packed = false];
-  repeated int32 packed_int32 = 536870003 [packed = true];
-
-  optional ForeignEnum optional_enum = 536870004;
-  optional string optional_string = 536870005;
-  optional bytes optional_bytes = 536870006;
-  optional ForeignMessage optional_message = 536870007;
-
-  optional group OptionalGroup = 536870008 {
-    optional int32 group_a = 536870009;
-  }
-
-  map<string, string> string_string_map = 536870010;
-
-  oneof oneof_field {
-    uint32 oneof_uint32 = 536870011;
-    TestAllTypes oneof_test_all_types = 536870012;
-    string oneof_string = 536870013;
-    bytes oneof_bytes = 536870014;
-  }
-
-  extensions  536860000 to 536869999;
-}
-
-extend TestHugeFieldNumbers {
-  optional TestAllTypes test_all_types = 536860000;
-}
-
-message TestExtensionInsideTable {
-  optional int32 field1 = 1;
-  optional int32 field2 = 2;
-  optional int32 field3 = 3;
-  optional int32 field4 = 4;
-  extensions 5 to 5;
-  optional int32 field6 = 6;
-  optional int32 field7 = 7;
-  optional int32 field8 = 8;
-  optional int32 field9 = 9;
-  optional int32 field10 = 10;
-}
-
-extend TestExtensionInsideTable {
-  optional int32 test_extension_inside_table_extension = 5;
-}
-
-enum VeryLargeEnum {
-  ENUM_LABEL_DEFAULT = 0;
-  ENUM_LABEL_1 = 1;
-  ENUM_LABEL_2 = 2;
-  ENUM_LABEL_3 = 3;
-  ENUM_LABEL_4 = 4;
-  ENUM_LABEL_5 = 5;
-  ENUM_LABEL_6 = 6;
-  ENUM_LABEL_7 = 7;
-  ENUM_LABEL_8 = 8;
-  ENUM_LABEL_9 = 9;
-  ENUM_LABEL_10 = 10;
-  ENUM_LABEL_11 = 11;
-  ENUM_LABEL_12 = 12;
-  ENUM_LABEL_13 = 13;
-  ENUM_LABEL_14 = 14;
-  ENUM_LABEL_15 = 15;
-  ENUM_LABEL_16 = 16;
-  ENUM_LABEL_17 = 17;
-  ENUM_LABEL_18 = 18;
-  ENUM_LABEL_19 = 19;
-  ENUM_LABEL_20 = 20;
-  ENUM_LABEL_21 = 21;
-  ENUM_LABEL_22 = 22;
-  ENUM_LABEL_23 = 23;
-  ENUM_LABEL_24 = 24;
-  ENUM_LABEL_25 = 25;
-  ENUM_LABEL_26 = 26;
-  ENUM_LABEL_27 = 27;
-  ENUM_LABEL_28 = 28;
-  ENUM_LABEL_29 = 29;
-  ENUM_LABEL_30 = 30;
-  ENUM_LABEL_31 = 31;
-  ENUM_LABEL_32 = 32;
-  ENUM_LABEL_33 = 33;
-  ENUM_LABEL_34 = 34;
-  ENUM_LABEL_35 = 35;
-  ENUM_LABEL_36 = 36;
-  ENUM_LABEL_37 = 37;
-  ENUM_LABEL_38 = 38;
-  ENUM_LABEL_39 = 39;
-  ENUM_LABEL_40 = 40;
-  ENUM_LABEL_41 = 41;
-  ENUM_LABEL_42 = 42;
-  ENUM_LABEL_43 = 43;
-  ENUM_LABEL_44 = 44;
-  ENUM_LABEL_45 = 45;
-  ENUM_LABEL_46 = 46;
-  ENUM_LABEL_47 = 47;
-  ENUM_LABEL_48 = 48;
-  ENUM_LABEL_49 = 49;
-  ENUM_LABEL_50 = 50;
-  ENUM_LABEL_51 = 51;
-  ENUM_LABEL_52 = 52;
-  ENUM_LABEL_53 = 53;
-  ENUM_LABEL_54 = 54;
-  ENUM_LABEL_55 = 55;
-  ENUM_LABEL_56 = 56;
-  ENUM_LABEL_57 = 57;
-  ENUM_LABEL_58 = 58;
-  ENUM_LABEL_59 = 59;
-  ENUM_LABEL_60 = 60;
-  ENUM_LABEL_61 = 61;
-  ENUM_LABEL_62 = 62;
-  ENUM_LABEL_63 = 63;
-  ENUM_LABEL_64 = 64;
-  ENUM_LABEL_65 = 65;
-  ENUM_LABEL_66 = 66;
-  ENUM_LABEL_67 = 67;
-  ENUM_LABEL_68 = 68;
-  ENUM_LABEL_69 = 69;
-  ENUM_LABEL_70 = 70;
-  ENUM_LABEL_71 = 71;
-  ENUM_LABEL_72 = 72;
-  ENUM_LABEL_73 = 73;
-  ENUM_LABEL_74 = 74;
-  ENUM_LABEL_75 = 75;
-  ENUM_LABEL_76 = 76;
-  ENUM_LABEL_77 = 77;
-  ENUM_LABEL_78 = 78;
-  ENUM_LABEL_79 = 79;
-  ENUM_LABEL_80 = 80;
-  ENUM_LABEL_81 = 81;
-  ENUM_LABEL_82 = 82;
-  ENUM_LABEL_83 = 83;
-  ENUM_LABEL_84 = 84;
-  ENUM_LABEL_85 = 85;
-  ENUM_LABEL_86 = 86;
-  ENUM_LABEL_87 = 87;
-  ENUM_LABEL_88 = 88;
-  ENUM_LABEL_89 = 89;
-  ENUM_LABEL_90 = 90;
-  ENUM_LABEL_91 = 91;
-  ENUM_LABEL_92 = 92;
-  ENUM_LABEL_93 = 93;
-  ENUM_LABEL_94 = 94;
-  ENUM_LABEL_95 = 95;
-  ENUM_LABEL_96 = 96;
-  ENUM_LABEL_97 = 97;
-  ENUM_LABEL_98 = 98;
-  ENUM_LABEL_99 = 99;
-  ENUM_LABEL_100 = 100;
-};
diff --git a/libs/protobuf/csharp/protos/unittest_custom_options_proto3.proto b/libs/protobuf/csharp/protos/unittest_custom_options_proto3.proto
deleted file mode 100644
index 0e7c2e2..0000000
--- a/libs/protobuf/csharp/protos/unittest_custom_options_proto3.proto
+++ /dev/null
@@ -1,336 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: benjy@google.com (Benjy Weinberger)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-//
-// A proto file used to test the "custom options" feature of google.protobuf.
-
-// This file is based on unittest_custom_options.proto in
-// src/google/protobuf, but is modified for proto3. It could
-// potentially be moved into src/google/protobuf, but currently C#
-// is the only language that really needs it, as we don't support
-// proto2 syntax. It's cut down significantly as proto3 only supports
-// extensions for options.
-
-
-syntax = "proto3";
-
-// A custom file option (defined below).
-option (file_opt1) = 9876543210;
-
-import "google/protobuf/descriptor.proto";
-
-// We don't put this in a package within proto2 because we need to make sure
-// that the generated code doesn't depend on being in the proto2 namespace.
-package protobuf_unittest;
-option csharp_namespace = "UnitTest.Issues.TestProtos";
-
-// Some simple test custom options of various types.
-
-extend google.protobuf.FileOptions {
-  uint64 file_opt1 = 7736974;
-}
-
-extend google.protobuf.MessageOptions {
-  int32 message_opt1 = 7739036;
-}
-
-extend google.protobuf.FieldOptions {
-  fixed64 field_opt1 = 7740936;
-}
-
-extend google.protobuf.OneofOptions {
-  int32 oneof_opt1 = 7740111;
-}
-
-extend google.protobuf.EnumOptions {
-  sfixed32 enum_opt1 = 7753576;
-}
-
-extend google.protobuf.EnumValueOptions {
-  int32 enum_value_opt1 = 1560678;
-}
-
-extend google.protobuf.ServiceOptions {
-  sint64 service_opt1 = 7887650;
-}
-
-enum MethodOpt1 {
-  METHODOPT1_UNSPECIFIED = 0;
-  METHODOPT1_VAL1 = 1;
-  METHODOPT1_VAL2 = 2;
-}
-
-extend google.protobuf.MethodOptions {
-  MethodOpt1 method_opt1 = 7890860;
-}
-
-// A test message with custom options at all possible locations (and also some
-// regular options, to make sure they interact nicely).
-message TestMessageWithCustomOptions {
-  option message_set_wire_format = false;
-
-  option (message_opt1) = -56;
-
-  string field1 = 1 [ctype=CORD,
-                              (field_opt1)=8765432109];
-
-  oneof AnOneof {
-    option (oneof_opt1) = -99;
-    int32 oneof_field = 2;
-  }
-
-  enum AnEnum {
-    option (enum_opt1) = -789;
-    ANENUM_UNSPECIFIED = 0;
-    ANENUM_VAL1 = 1;
-    ANENUM_VAL2 = 2 [(enum_value_opt1) = 123];
-  }
-}
-
-
-// A test RPC service with custom options at all possible locations (and also
-// some regular options, to make sure they interact nicely).
-message CustomOptionFooRequest {
-}
-
-message CustomOptionFooResponse {
-}
-
-message CustomOptionFooClientMessage {
-}
-
-message CustomOptionFooServerMessage {
-}
-
-service TestServiceWithCustomOptions {
-  option (service_opt1) = -9876543210;
-
-  rpc Foo(CustomOptionFooRequest) returns (CustomOptionFooResponse) {
-    option (method_opt1) = METHODOPT1_VAL2;
-  }
-}
-
-
-
-// Options of every possible field type, so we can test them all exhaustively.
-
-message DummyMessageContainingEnum {
-  enum TestEnumType {
-    TEST_OPTION_ENUM_UNSPECIFIED = 0;
-    TEST_OPTION_ENUM_TYPE1 = 22;
-    TEST_OPTION_ENUM_TYPE2 = -23;
-  }
-}
-
-message DummyMessageInvalidAsOptionType {
-}
-
-extend google.protobuf.MessageOptions {
-          bool     bool_opt = 7706090;
-         int32    int32_opt = 7705709;
-         int64    int64_opt = 7705542;
-        uint32   uint32_opt = 7704880;
-        uint64   uint64_opt = 7702367;
-        sint32   sint32_opt = 7701568;
-        sint64   sint64_opt = 7700863;
-       fixed32  fixed32_opt = 7700307;
-       fixed64  fixed64_opt = 7700194;
-      sfixed32 sfixed32_opt = 7698645;
-      sfixed64 sfixed64_opt = 7685475;
-         float    float_opt = 7675390;
-        double   double_opt = 7673293;
-        string   string_opt = 7673285;
-         bytes    bytes_opt = 7673238;
-  DummyMessageContainingEnum.TestEnumType enum_opt = 7673233;
-  DummyMessageInvalidAsOptionType message_type_opt = 7665967;
-}
-
-message CustomOptionMinIntegerValues {
-  option     (bool_opt) = false;
-  option    (int32_opt) = -0x80000000;
-  option    (int64_opt) = -0x8000000000000000;
-  option   (uint32_opt) = 0;
-  option   (uint64_opt) = 0;
-  option   (sint32_opt) = -0x80000000;
-  option   (sint64_opt) = -0x8000000000000000;
-  option  (fixed32_opt) = 0;
-  option  (fixed64_opt) = 0;
-  option (sfixed32_opt) = -0x80000000;
-  option (sfixed64_opt) = -0x8000000000000000;
-}
-
-message CustomOptionMaxIntegerValues {
-  option     (bool_opt) = true;
-  option    (int32_opt) = 0x7FFFFFFF;
-  option    (int64_opt) = 0x7FFFFFFFFFFFFFFF;
-  option   (uint32_opt) = 0xFFFFFFFF;
-  option   (uint64_opt) = 0xFFFFFFFFFFFFFFFF;
-  option   (sint32_opt) = 0x7FFFFFFF;
-  option   (sint64_opt) = 0x7FFFFFFFFFFFFFFF;
-  option  (fixed32_opt) = 0xFFFFFFFF;
-  option  (fixed64_opt) = 0xFFFFFFFFFFFFFFFF;
-  option (sfixed32_opt) = 0x7FFFFFFF;
-  option (sfixed64_opt) = 0x7FFFFFFFFFFFFFFF;
-}
-
-message CustomOptionOtherValues {
-  option  (int32_opt) = -100;  // To test sign-extension.
-  option  (float_opt) = 12.3456789;
-  option (double_opt) = 1.234567890123456789;
-  option (string_opt) = "Hello, \"World\"";
-  option  (bytes_opt) = "Hello\0World";
-  option   (enum_opt) = TEST_OPTION_ENUM_TYPE2;
-}
-
-message SettingRealsFromPositiveInts {
-  option  (float_opt) = 12;
-  option (double_opt) = 154;
-}
-
-message SettingRealsFromNegativeInts {
-  option  (float_opt) = -12;
-  option  (double_opt) = -154;
-}
-
-// Options of complex message types, themselves combined and extended in
-// various ways.
-
-message ComplexOptionType1 {
-  int32 foo = 1;
-  int32 foo2 = 2;
-  int32 foo3 = 3;
-  repeated int32 foo4 = 4;
-}
-
-message ComplexOptionType2 {
-  ComplexOptionType1 bar = 1;
-  int32 baz = 2;
-
-  message ComplexOptionType4 {
-    int32 waldo = 1;
-
-    extend google.protobuf.MessageOptions {
-      ComplexOptionType4 complex_opt4 = 7633546;
-    }
-  }
-
-  ComplexOptionType4 fred = 3;
-  repeated ComplexOptionType4 barney = 4;
-}
-
-message ComplexOptionType3 {
-  int32 qux = 1;
-}
-
-extend google.protobuf.MessageOptions {
-  protobuf_unittest.ComplexOptionType1 complex_opt1 = 7646756;
-  ComplexOptionType2 complex_opt2 = 7636949;
-  ComplexOptionType3 complex_opt3 = 7636463;
-}
-
-// Note that we try various different ways of naming the same extension.
-message VariousComplexOptions {
-  option (.protobuf_unittest.complex_opt1).foo = 42;
-  option (protobuf_unittest.complex_opt1).foo4 = 99;
-  option (protobuf_unittest.complex_opt1).foo4 = 88;
-  option (complex_opt2).baz = 987;
-  option (complex_opt2).bar.foo = 743;
-  option (ComplexOptionType2.ComplexOptionType4.complex_opt4).waldo = 1971;
-  option (complex_opt2).fred.waldo = 321;
-  option (complex_opt2).barney = { waldo: 101 };
-  option (complex_opt2).barney = { waldo: 212 };
-  option (protobuf_unittest.complex_opt3).qux = 9;
-}
-
-// ------------------------------------------------------
-// Definitions for testing aggregate option parsing.
-// See descriptor_unittest.cc.
-
-// A helper type used to test aggregate option parsing
-message Aggregate {
-  int32 i = 1;
-  string s = 2;
-
-  // A nested object
-  Aggregate sub = 3;
-}
-
-// Allow Aggregate to be used as an option at all possible locations
-// in the .proto grammar.
-extend google.protobuf.FileOptions      { Aggregate fileopt    = 15478479; }
-extend google.protobuf.MessageOptions   { Aggregate msgopt     = 15480088; }
-extend google.protobuf.FieldOptions     { Aggregate fieldopt   = 15481374; }
-extend google.protobuf.EnumOptions      { Aggregate enumopt    = 15483218; }
-extend google.protobuf.EnumValueOptions { Aggregate enumvalopt = 15486921; }
-extend google.protobuf.ServiceOptions   { Aggregate serviceopt = 15497145; }
-extend google.protobuf.MethodOptions    { Aggregate methodopt  = 15512713; }
-
-// Try using AggregateOption at different points in the proto grammar
-option (fileopt) = {
-  s: 'FileAnnotation'
-  // Also test the handling of comments
-  /* of both types */ i: 100
-
-  sub { s: 'NestedFileAnnotation' }
-};
-
-message AggregateMessage {
-  option (msgopt) = { i:101 s:'MessageAnnotation' };
-  int32 fieldname = 1 [(fieldopt) = { s:'FieldAnnotation' }];
-}
-
-service AggregateService {
-  option (serviceopt) = { s:'ServiceAnnotation' };
-  rpc Method (AggregateMessage) returns (AggregateMessage) {
-    option (methodopt) = { s:'MethodAnnotation' };
-  }
-}
-
-enum AggregateEnum {
-  option (enumopt) = { s:'EnumAnnotation' };
-  UNSPECIFIED = 0;
-  VALUE = 1 [(enumvalopt) = { s:'EnumValueAnnotation' }];
-}
-
-// Test custom options for nested type.
-message NestedOptionType {
-  message NestedMessage {
-    option (message_opt1) = 1001;
-    int32 nested_field = 1 [(field_opt1) = 1002];
-  }
-  enum NestedEnum {
-    UNSPECIFIED = 0;
-    option (enum_opt1) = 1003;
-    NESTED_ENUM_VALUE = 1 [(enum_value_opt1) = 1004];
-  }
-}
diff --git a/libs/protobuf/csharp/protos/unittest_import.proto b/libs/protobuf/csharp/protos/unittest_import.proto
deleted file mode 100644
index a0198c3..0000000
--- a/libs/protobuf/csharp/protos/unittest_import.proto
+++ /dev/null
@@ -1,69 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-//
-// A proto file which is imported by unittest.proto to test importing.
-
-syntax = "proto2";
-
-// We don't put this in a package within proto2 because we need to make sure
-// that the generated code doesn't depend on being in the proto2 namespace.
-// In test_util.h we do
-// "using namespace unittest_import = protobuf_unittest_import".
-package protobuf_unittest_import_proto2;
-
-option optimize_for = SPEED;
-option cc_enable_arenas = true;
-
-option csharp_namespace = "Google.Protobuf.TestProtos.Proto2";
-
-// Test public import
-import public "unittest_import_public.proto";
-
-message ImportMessage {
-  optional int32 d = 1;
-}
-
-enum ImportEnum {
-  IMPORT_FOO = 7;
-  IMPORT_BAR = 8;
-  IMPORT_BAZ = 9;
-}
-
-
-// To use an enum in a map, it must has the first value as 0.
-enum ImportEnumForMap {
-  UNKNOWN = 0;
-  FOO = 1;
-  BAR = 2;
-}
diff --git a/libs/protobuf/csharp/protos/unittest_import_proto3.proto b/libs/protobuf/csharp/protos/unittest_import_proto3.proto
deleted file mode 100644
index 2e66682..0000000
--- a/libs/protobuf/csharp/protos/unittest_import_proto3.proto
+++ /dev/null
@@ -1,56 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-//
-// A proto file which is imported by unittest_proto3.proto to test importing.
-
-syntax = "proto3";
-
-package protobuf_unittest_import;
-
-option csharp_namespace = "Google.Protobuf.TestProtos";
-
-// Test public import
-import public "unittest_import_public_proto3.proto";
-
-message ImportMessage {
-  int32 d = 1;
-}
-
-enum ImportEnum {
-  IMPORT_ENUM_UNSPECIFIED = 0;
-  IMPORT_FOO = 7;
-  IMPORT_BAR = 8;
-  IMPORT_BAZ = 9;
-}
-
diff --git a/libs/protobuf/csharp/protos/unittest_import_public.proto b/libs/protobuf/csharp/protos/unittest_import_public.proto
deleted file mode 100644
index 6ae34ef..0000000
--- a/libs/protobuf/csharp/protos/unittest_import_public.proto
+++ /dev/null
@@ -1,41 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: liujisi@google.com (Pherl Liu)
-
-syntax = "proto2";
-
-package protobuf_unittest_import_proto2;
-
-option csharp_namespace = "Google.Protobuf.TestProtos.Proto2";
-
-message PublicImportMessage {
-  optional int32 e = 1;
-}
diff --git a/libs/protobuf/csharp/protos/unittest_import_public_proto3.proto b/libs/protobuf/csharp/protos/unittest_import_public_proto3.proto
deleted file mode 100644
index 88c2079..0000000
--- a/libs/protobuf/csharp/protos/unittest_import_public_proto3.proto
+++ /dev/null
@@ -1,41 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: liujisi@google.com (Pherl Liu)
-
-syntax = "proto3";
-
-package protobuf_unittest_import;
-
-option csharp_namespace = "Google.Protobuf.TestProtos";
-
-message PublicImportMessage {
- int32 e = 1;
-}
diff --git a/libs/protobuf/csharp/protos/unittest_issue6936_a.proto b/libs/protobuf/csharp/protos/unittest_issue6936_a.proto
deleted file mode 100644
index 097d083..0000000
--- a/libs/protobuf/csharp/protos/unittest_issue6936_a.proto
+++ /dev/null
@@ -1,15 +0,0 @@
-syntax = "proto3";
-
-package unittest_issues;
-
-option csharp_namespace = "UnitTest.Issues.TestProtos";
-
-// This file is used as part of a unit test for issue 6936
-// We don't need to use it, we just have to import it in both 
-// "extensions_issue6936_b.proto" and "extensions_issue6936_c.proto"
-
-import "google/protobuf/descriptor.proto";
-
-extend google.protobuf.MessageOptions {
-    string opt = 50000;
-}
\ No newline at end of file
diff --git a/libs/protobuf/csharp/protos/unittest_issue6936_b.proto b/libs/protobuf/csharp/protos/unittest_issue6936_b.proto
deleted file mode 100644
index 8f71683..0000000
--- a/libs/protobuf/csharp/protos/unittest_issue6936_b.proto
+++ /dev/null
@@ -1,14 +0,0 @@
-syntax = "proto3";
-
-import "unittest_issue6936_a.proto";
-
-package unittest_issues;
-
-option csharp_namespace = "UnitTest.Issues.TestProtos";
-
-// This file is used as part of a unit test for issue 6936
-// We don't need to use it, we just have to import it in "unittest_issue6936_c.proto"
-
-message Foo {
-    option (opt) = "foo";
-}
\ No newline at end of file
diff --git a/libs/protobuf/csharp/protos/unittest_issue6936_c.proto b/libs/protobuf/csharp/protos/unittest_issue6936_c.proto
deleted file mode 100644
index 40004ec..0000000
--- a/libs/protobuf/csharp/protos/unittest_issue6936_c.proto
+++ /dev/null
@@ -1,16 +0,0 @@
-syntax = "proto3";
-
-import "unittest_issue6936_a.proto";
-import "unittest_issue6936_b.proto";
-
-package unittest_issues;
-
-option csharp_namespace = "UnitTest.Issues.TestProtos";
-
-// This file is used as part of a unit test for issue 6936
-// We don't need to use it, we just have to load it at runtime
-
-message Bar {
-    option (opt) = "bar";
-    Foo foo = 1;
-}
\ No newline at end of file
diff --git a/libs/protobuf/csharp/protos/unittest_issues.proto b/libs/protobuf/csharp/protos/unittest_issues.proto
deleted file mode 100644
index f46c20e..0000000
--- a/libs/protobuf/csharp/protos/unittest_issues.proto
+++ /dev/null
@@ -1,172 +0,0 @@
-syntax = "proto3";
-
-// These proto descriptors have at one time been reported as an issue or defect.
-// They are kept here to replicate the issue, and continue to verify the fix.
-
-// Issue: Non-"Google.Protobuffers" namespace will ensure that protobuffer library types are qualified
-option csharp_namespace = "UnitTest.Issues.TestProtos";
-
-package unittest_issues;
-
-import "google/protobuf/struct.proto";
-
-// Issue 307: when generating doubly-nested types, any references
-// should be of the form A.Types.B.Types.C.
-message Issue307 {
-  message NestedOnce {
-    message NestedTwice {
-    }
-  }
-}
-
-// Old issue 13: http://code.google.com/p/protobuf-csharp-port/issues/detail?id=13
-// New issue 309: https://github.com/protocolbuffers/protobuf/issues/309
-
-// message A {
-//    optional int32 _A = 1;
-// }
-
-// message B {
-//    optional int32 B_ = 1;
-// }
-
-//message AB {
-//    optional int32 a_b = 1;
-//}
-
-// Similar issue with numeric names
-// Java code failed too, so probably best for this to be a restriction.
-// See https://github.com/protocolbuffers/protobuf/issues/308
-// message NumberField {
-//    optional int32 _01 = 1;
-// }
-
-// issue 19 - negative enum values
-
-enum NegativeEnum {
-    NEGATIVE_ENUM_ZERO = 0;
-    FiveBelow = -5;
-    MinusOne = -1;
-}
-
-message NegativeEnumMessage {
-    NegativeEnum value = 1;
-    repeated NegativeEnum values = 2 [packed = false];
-    repeated NegativeEnum packed_values = 3 [packed=true];
-}
-
-// Issue 21: http://code.google.com/p/protobuf-csharp-port/issues/detail?id=21
-// Decorate fields with [deprecated=true] as [System.Obsolete]
-
-message DeprecatedChild {
-}
-
-enum DeprecatedEnum {
-    DEPRECATED_ZERO = 0;
-    one = 1;
-}
-
-message DeprecatedFieldsMessage {
-    int32 PrimitiveValue = 1 [deprecated = true];
-    repeated int32 PrimitiveArray = 2 [deprecated = true];
-
-    DeprecatedChild MessageValue = 3 [deprecated = true];
-    repeated DeprecatedChild MessageArray = 4 [deprecated = true];
-
-    DeprecatedEnum EnumValue = 5 [deprecated = true];
-    repeated DeprecatedEnum EnumArray = 6 [deprecated = true];
-}
-
-// Issue 45: http://code.google.com/p/protobuf-csharp-port/issues/detail?id=45
-message ItemField {
-  int32 item = 1;
-}
-
-message ReservedNames {
-  // Force a nested type called Types
-  message SomeNestedType {
-  }
-
-  int32 types = 1;
-  int32 descriptor = 2;
-}
-
-message TestJsonFieldOrdering {
-  // These fields are deliberately not declared in numeric
-  // order, and the oneof fields aren't contiguous either.
-  // This allows for reasonably robust tests of JSON output
-  // ordering.
-  // TestFieldOrderings in unittest_proto3.proto is similar,
-  // but doesn't include oneofs.
-  // TODO: Consider adding oneofs to TestFieldOrderings, although
-  // that will require fixing other tests in multiple platforms.
-  // Alternatively, consider just adding this to
-  // unittest_proto3.proto if multiple platforms want it.
-
-  int32 plain_int32 = 4;
-
-  oneof o1 {
-    string o1_string = 2;
-    int32 o1_int32 = 5;
-  }
-
-  string plain_string = 1;
-
-  oneof o2 {
-    int32 o2_int32 = 6;
-    string o2_string = 3;
-  }
-
-}
-
-message TestJsonName {
-  // Message for testing the effects for of the json_name option
-  string name = 1;
-  string description = 2 [json_name = "desc"];
-  string guid = 3 [json_name = "exid"];
-}
-
-// Issue 3200: When merging two messages which use the same
-// oneof case, which is itself a message type, the submessages should
-// be merged.
-message OneofMerging {
-  message Nested {
-    int32 x = 1;
-    int32 y = 2;
-  }
-
-  oneof value {
-    string text = 1;
-    Nested nested = 2;
-  }
-}
-
-message NullValueOutsideStruct {
-  oneof value {
-    string string_value = 1;
-    google.protobuf.NullValue null_value = 2;
-  }
-}
-
-message NullValueNotInOneof {
-  google.protobuf.NullValue null_value = 2;
-}
-
-message MixedRegularAndOptional {
-  string regular_field = 1;
-  optional string optional_field = 2;
-}
-
-message OneofWithNoneField {
-  oneof test {
-    string x = 1;
-    string none = 2;
-  }
-}
-
-message OneofWithNoneName {
-  oneof none {
-    string x = 1;
-    string y = 2;
-  }
-}
\ No newline at end of file
diff --git a/libs/protobuf/csharp/protos/unittest_proto3.proto b/libs/protobuf/csharp/protos/unittest_proto3.proto
deleted file mode 100644
index 8c2f2c9..0000000
--- a/libs/protobuf/csharp/protos/unittest_proto3.proto
+++ /dev/null
@@ -1,410 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-//
-// A proto file we will use for unit testing.
-
-syntax = "proto3";
-
-option csharp_namespace = "Google.Protobuf.TestProtos";
-
-// Only present so we can test that we can read it (as an example
-// of a non-C# option)
-option java_outer_classname = "UnittestProto";
-
-import "unittest_import_proto3.proto";
-
-package protobuf_unittest3;
-
-// This proto includes every type of field in both singular and repeated
-// forms.
-message TestAllTypes {
-  message NestedMessage {
-    // The field name "b" fails to compile in proto1 because it conflicts with
-    // a local variable named "b" in one of the generated methods.  Doh.
-    // This file needs to compile in proto1 to test backwards-compatibility.
-    int32 bb = 1;
-  }
-
-  enum NestedEnum {
-    NESTED_ENUM_UNSPECIFIED = 0;
-    FOO = 1;
-    BAR = 2;
-    BAZ = 3;
-    NEG = -1;  // Intentionally negative.
-  }
-
-  // Singular
-  int32 single_int32 = 1;
-  int64 single_int64 = 2;
-  uint32 single_uint32 = 3;
-  uint64 single_uint64 = 4;
-  sint32 single_sint32 = 5;
-  sint64 single_sint64 = 6;
-  fixed32 single_fixed32 = 7;
-  fixed64 single_fixed64 = 8;
-  sfixed32 single_sfixed32 = 9;
-  sfixed64 single_sfixed64 = 10;
-  float single_float = 11;
-  double single_double = 12;
-  bool single_bool = 13;
-  string single_string = 14;
-  bytes single_bytes = 15;
-
-  NestedMessage single_nested_message = 18;
-  ForeignMessage single_foreign_message = 19;
-  protobuf_unittest_import.ImportMessage single_import_message = 20;
-
-  NestedEnum single_nested_enum = 21;
-  ForeignEnum single_foreign_enum = 22;
-  protobuf_unittest_import.ImportEnum single_import_enum = 23;
-
-  // Defined in unittest_import_public.proto
-  protobuf_unittest_import.PublicImportMessage
-      single_public_import_message = 26;
-
-  // Repeated
-  repeated    int32 repeated_int32    = 31;
-  repeated    int64 repeated_int64    = 32;
-  repeated   uint32 repeated_uint32   = 33;
-  repeated   uint64 repeated_uint64   = 34;
-  repeated   sint32 repeated_sint32   = 35;
-  repeated   sint64 repeated_sint64   = 36;
-  repeated  fixed32 repeated_fixed32  = 37;
-  repeated  fixed64 repeated_fixed64  = 38;
-  repeated sfixed32 repeated_sfixed32 = 39;
-  repeated sfixed64 repeated_sfixed64 = 40;
-  repeated    float repeated_float    = 41;
-  repeated   double repeated_double   = 42;
-  repeated     bool repeated_bool     = 43;
-  repeated   string repeated_string   = 44;
-  repeated    bytes repeated_bytes    = 45;
-
-  repeated NestedMessage                        repeated_nested_message  = 48;
-  repeated ForeignMessage                       repeated_foreign_message = 49;
-  repeated protobuf_unittest_import.ImportMessage repeated_import_message  = 50;
-
-  repeated NestedEnum                           repeated_nested_enum     = 51;
-  repeated ForeignEnum                          repeated_foreign_enum    = 52;
-  repeated protobuf_unittest_import.ImportEnum    repeated_import_enum     = 53;
-  // Defined in unittest_import_public.proto
-  repeated protobuf_unittest_import.PublicImportMessage
-      repeated_public_import_message = 54;
-
-  // For oneof test
-  oneof oneof_field {
-    uint32 oneof_uint32 = 111;
-    NestedMessage oneof_nested_message = 112;
-    string oneof_string = 113;
-    bytes oneof_bytes = 114;
-  }
-}
-
-// This proto includes a recursively nested message.
-message NestedTestAllTypes {
-  NestedTestAllTypes child = 1;
-  TestAllTypes payload = 2;
-  repeated NestedTestAllTypes repeated_child = 3;
-}
-
-message TestDeprecatedFields {
-  int32 deprecated_int32 = 1 [deprecated=true];
-}
-
-// Define these after TestAllTypes to make sure the compiler can handle
-// that.
-message ForeignMessage {
-  int32 c = 1;
-}
-
-enum ForeignEnum {
-  FOREIGN_UNSPECIFIED = 0;
-  FOREIGN_FOO = 4;
-  FOREIGN_BAR = 5;
-  FOREIGN_BAZ = 6;
-}
-
-message TestReservedFields {
-  reserved 2, 15, 9 to 11;
-  reserved "bar", "baz";
-}
-
-
-// Test that we can use NestedMessage from outside TestAllTypes.
-message TestForeignNested {
-  TestAllTypes.NestedMessage foreign_nested = 1;
-}
-
-// Test that really large tag numbers don't break anything.
-message TestReallyLargeTagNumber {
-  // The largest possible tag number is 2^28 - 1, since the wire format uses
-  // three bits to communicate wire type.
-  int32 a = 1;
-  int32 bb = 268435455;
-}
-
-message TestRecursiveMessage {
-  TestRecursiveMessage a = 1;
-  int32 i = 2;
-}
-
-// Test that mutual recursion works.
-message TestMutualRecursionA {
-  TestMutualRecursionB bb = 1;
-}
-
-message TestMutualRecursionB {
-  TestMutualRecursionA a = 1;
-  int32 optional_int32 = 2;
-}
-
-message TestEnumAllowAlias {
-  TestEnumWithDupValue value = 1;
-}
-
-// Test an enum that has multiple values with the same number.
-enum TestEnumWithDupValue {
-  TEST_ENUM_WITH_DUP_VALUE_UNSPECIFIED = 0;
-  option allow_alias = true;
-
-  FOO1 = 1;
-  BAR1 = 2;
-  BAZ = 3;
-  FOO2 = 1;
-  BAR2 = 2;
-}
-
-// Test an enum with large, unordered values.
-enum TestSparseEnum {
-  TEST_SPARSE_ENUM_UNSPECIFIED = 0;
-  SPARSE_A = 123;
-  SPARSE_B = 62374;
-  SPARSE_C = 12589234;
-  SPARSE_D = -15;
-  SPARSE_E = -53452;
-  // In proto3, value 0 must be the first one specified
-  // SPARSE_F = 0;
-  SPARSE_G = 2;
-}
-
-// Test message with CamelCase field names.  This violates Protocol Buffer
-// standard style.
-message TestCamelCaseFieldNames {
-  int32 PrimitiveField = 1;
-  string StringField = 2;
-  ForeignEnum EnumField = 3;
-  ForeignMessage MessageField = 4;
-
-  repeated int32 RepeatedPrimitiveField = 7;
-  repeated string RepeatedStringField = 8;
-  repeated ForeignEnum RepeatedEnumField = 9;
-  repeated ForeignMessage RepeatedMessageField = 10;
-}
-
-
-// We list fields out of order, to ensure that we're using field number and not
-// field index to determine serialization order.
-message TestFieldOrderings {
-  string my_string = 11;
-  int64 my_int = 1;
-  float my_float = 101;
-  message NestedMessage {
-    int64 oo = 2;
-    // The field name "b" fails to compile in proto1 because it conflicts with
-    // a local variable named "b" in one of the generated methods.  Doh.
-    // This file needs to compile in proto1 to test backwards-compatibility.
-    int32 bb = 1;
-  }
-
-  NestedMessage single_nested_message  = 200;
-}
-
-message SparseEnumMessage {
-  TestSparseEnum sparse_enum = 1;
-}
-
-// Test String and Bytes: string is for valid UTF-8 strings
-message OneString {
-  string data = 1;
-}
-
-message MoreString {
-  repeated string data = 1;
-}
-
-message OneBytes {
-  bytes data = 1;
-}
-
-message MoreBytes {
-  bytes data = 1;
-}
-
-// Test int32, uint32, int64, uint64, and bool are all compatible
-message Int32Message {
-  int32 data = 1;
-}
-
-message Uint32Message {
-  uint32 data = 1;
-}
-
-message Int64Message {
-  int64 data = 1;
-}
-
-message Uint64Message {
-  uint64 data = 1;
-}
-
-message BoolMessage {
-  bool data = 1;
-}
-
-// Test oneofs.
-message TestOneof {
-  oneof foo {
-    int32 foo_int = 1;
-    string foo_string = 2;
-    TestAllTypes foo_message = 3;
-  }
-}
-
-// Test messages for packed fields
-
-message TestPackedTypes {
-  repeated    int32 packed_int32    =  90 [packed = true];
-  repeated    int64 packed_int64    =  91 [packed = true];
-  repeated   uint32 packed_uint32   =  92 [packed = true];
-  repeated   uint64 packed_uint64   =  93 [packed = true];
-  repeated   sint32 packed_sint32   =  94 [packed = true];
-  repeated   sint64 packed_sint64   =  95 [packed = true];
-  repeated  fixed32 packed_fixed32  =  96 [packed = true];
-  repeated  fixed64 packed_fixed64  =  97 [packed = true];
-  repeated sfixed32 packed_sfixed32 =  98 [packed = true];
-  repeated sfixed64 packed_sfixed64 =  99 [packed = true];
-  repeated    float packed_float    = 100 [packed = true];
-  repeated   double packed_double   = 101 [packed = true];
-  repeated     bool packed_bool     = 102 [packed = true];
-  repeated ForeignEnum packed_enum  = 103 [packed = true];
-}
-
-// A message with the same fields as TestPackedTypes, but without packing. Used
-// to test packed <-> unpacked wire compatibility.
-message TestUnpackedTypes {
-  repeated    int32 unpacked_int32    =  90 [packed = false];
-  repeated    int64 unpacked_int64    =  91 [packed = false];
-  repeated   uint32 unpacked_uint32   =  92 [packed = false];
-  repeated   uint64 unpacked_uint64   =  93 [packed = false];
-  repeated   sint32 unpacked_sint32   =  94 [packed = false];
-  repeated   sint64 unpacked_sint64   =  95 [packed = false];
-  repeated  fixed32 unpacked_fixed32  =  96 [packed = false];
-  repeated  fixed64 unpacked_fixed64  =  97 [packed = false];
-  repeated sfixed32 unpacked_sfixed32 =  98 [packed = false];
-  repeated sfixed64 unpacked_sfixed64 =  99 [packed = false];
-  repeated    float unpacked_float    = 100 [packed = false];
-  repeated   double unpacked_double   = 101 [packed = false];
-  repeated     bool unpacked_bool     = 102 [packed = false];
-  repeated ForeignEnum unpacked_enum  = 103 [packed = false];
-}
-
-message TestRepeatedScalarDifferentTagSizes {
-  // Parsing repeated fixed size values used to fail. This message needs to be
-  // used in order to get a tag of the right size; all of the repeated fields
-  // in TestAllTypes didn't trigger the check.
-  repeated fixed32 repeated_fixed32 = 12;
-  // Check for a varint type, just for good measure.
-  repeated int32   repeated_int32   = 13;
-
-  // These have two-byte tags.
-  repeated fixed64 repeated_fixed64 = 2046;
-  repeated int64   repeated_int64   = 2047;
-
-  // Three byte tags.
-  repeated float   repeated_float   = 262142;
-  repeated uint64  repeated_uint64  = 262143;
-}
-
-message TestCommentInjectionMessage {
-  // */ <- This should not close the generated doc comment
-  string a = 1;
-}
-
-
-// Test that RPC services work.
-message FooRequest  {}
-message FooResponse {}
-
-message FooClientMessage {}
-message FooServerMessage{}
-
-// This is a test service
-service TestService {
-  // This is a test method
-  rpc Foo(FooRequest) returns (FooResponse);
-  rpc Bar(BarRequest) returns (BarResponse);
-}
-
-
-message BarRequest  {}
-message BarResponse {}
-
-message TestEmptyMessage {}
-
-// This is leading detached comment 1
-
-// This is leading detached comment 2
-
-// This is a leading comment
-message CommentMessage {
-  // Leading nested message comment
-  message NestedCommentMessage {
-    // Leading nested message field comment
-    string nested_text = 1;
-  }
-
-  // Leading nested enum comment
-  enum NestedCommentEnum {
-    // Zero value comment
-    ZERO_VALUE = 0;
-  }
-
-  // Leading field comment
-  string text = 1; // Trailing field comment
-}
-
-// Leading enum comment
-enum CommentEnum {
-  // Zero value comment
-  ZERO_VALUE = 0;
-}
diff --git a/libs/protobuf/csharp/protos/unittest_selfreferential_options.proto b/libs/protobuf/csharp/protos/unittest_selfreferential_options.proto
deleted file mode 100644
index 22f16cf..0000000
--- a/libs/protobuf/csharp/protos/unittest_selfreferential_options.proto
+++ /dev/null
@@ -1,64 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto2";
-
-package protobuf_unittest_selfreferential_options;
-option csharp_namespace = "UnitTest.Issues.TestProtos.SelfreferentialOptions";
-
-import "google/protobuf/descriptor.proto";
-
-message FooOptions {
-  // Custom field option used in definition of the extension message.
-  optional int32 int_opt = 1 [(foo_options) = {
-    int_opt: 1
-    [foo_int_opt]: 2
-    [foo_foo_opt]: {
-      int_opt: 3
-    }
-  }];
-
-  // Custom field option used in definition of the custom option's message.
-  optional int32 foo = 2 [(foo_options) = {foo: 1234}];
-
-  extensions 1000 to max;
-}
-
-extend google.protobuf.FieldOptions {
-  // Custom field option used on the definition of that field option.
-  optional int32 bar_options = 1000 [(bar_options) = 1234];
-
-  optional FooOptions foo_options = 1001;
-}
-
-extend FooOptions {
-   optional int32 foo_int_opt = 1000;
-   optional FooOptions foo_foo_opt = 1001;
-}
diff --git a/libs/protobuf/csharp/src/AddressBook/AddPerson.cs b/libs/protobuf/csharp/src/AddressBook/AddPerson.cs
deleted file mode 100644
index 889d1d0..0000000
--- a/libs/protobuf/csharp/src/AddressBook/AddPerson.cs
+++ /dev/null
@@ -1,132 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-using System.IO;
-
-namespace Google.Protobuf.Examples.AddressBook
-{
-    internal class AddPerson
-    {
-        /// <summary>
-        /// Builds a person based on user input
-        /// </summary>
-        private static Person PromptForAddress(TextReader input, TextWriter output)
-        {
-            Person person = new Person();
-
-            output.Write("Enter person ID: ");
-            person.Id = int.Parse(input.ReadLine());
-
-            output.Write("Enter name: ");
-            person.Name = input.ReadLine();
-
-            output.Write("Enter email address (blank for none): ");
-            string email = input.ReadLine();
-            if (email.Length > 0)
-            {
-                person.Email = email;
-            }
-
-            while (true)
-            {
-                output.Write("Enter a phone number (or leave blank to finish): ");
-                string number = input.ReadLine();
-                if (number.Length == 0)
-                {
-                    break;
-                }
-
-                Person.Types.PhoneNumber phoneNumber = new Person.Types.PhoneNumber { Number = number };
-
-                output.Write("Is this a mobile, home, or work phone? ");
-                String type = input.ReadLine();
-                switch (type)
-                {
-                    case "mobile":
-                        phoneNumber.Type = Person.Types.PhoneType.Mobile;
-                        break;
-                    case "home":
-                        phoneNumber.Type = Person.Types.PhoneType.Home;
-                        break;
-                    case "work":
-                        phoneNumber.Type = Person.Types.PhoneType.Work;
-                        break;
-                    default:
-                        output.Write("Unknown phone type. Using default.");
-                        break;
-                }
-
-                person.Phones.Add(phoneNumber);
-            }
-            return person;
-        }
-
-        /// <summary>
-        /// Entry point - loads an existing addressbook or creates a new one,
-        /// then writes it back to the file.
-        /// </summary>
-        public static int Main(string[] args)
-        {
-            if (args.Length != 1)
-            {
-                Console.Error.WriteLine("Usage:  AddPerson ADDRESS_BOOK_FILE");
-                return -1;
-            }
-
-            AddressBook addressBook;
-
-            if (File.Exists(args[0]))
-            {
-                using (Stream file = File.OpenRead(args[0]))
-                {
-                    addressBook = AddressBook.Parser.ParseFrom(file);
-                }
-            }
-            else
-            {
-                Console.WriteLine("{0}: File not found. Creating a new file.", args[0]);
-                addressBook = new AddressBook();
-            }
-
-            // Add an address.
-            addressBook.People.Add(PromptForAddress(Console.In, Console.Out));
-
-            // Write the new address book back to disk.
-            using (Stream output = File.OpenWrite(args[0]))
-            {
-                addressBook.WriteTo(output);
-            }
-            return 0;
-        }
-    }
-}
\ No newline at end of file
diff --git a/libs/protobuf/csharp/src/AddressBook/AddressBook.csproj b/libs/protobuf/csharp/src/AddressBook/AddressBook.csproj
deleted file mode 100644
index 9a52787..0000000
--- a/libs/protobuf/csharp/src/AddressBook/AddressBook.csproj
+++ /dev/null
@@ -1,14 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-    <OutputType>Exe</OutputType>
-    <StartupObject>Google.Protobuf.Examples.AddressBook.Program</StartupObject>
-    <IsPackable>False</IsPackable>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\Google.Protobuf\Google.Protobuf.csproj" />
-  </ItemGroup>
-
-</Project>
diff --git a/libs/protobuf/csharp/src/AddressBook/Addressbook.cs b/libs/protobuf/csharp/src/AddressBook/Addressbook.cs
deleted file mode 100644
index 1ff0f3b..0000000
--- a/libs/protobuf/csharp/src/AddressBook/Addressbook.cs
+++ /dev/null
@@ -1,816 +0,0 @@
-// <auto-generated>
-//     Generated by the protocol buffer compiler.  DO NOT EDIT!
-//     source: addressbook.proto
-// </auto-generated>
-#pragma warning disable 1591, 0612, 3021, 8981
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-namespace Google.Protobuf.Examples.AddressBook {
-
-  /// <summary>Holder for reflection information generated from addressbook.proto</summary>
-  public static partial class AddressbookReflection {
-
-    #region Descriptor
-    /// <summary>File descriptor for addressbook.proto</summary>
-    public static pbr::FileDescriptor Descriptor {
-      get { return descriptor; }
-    }
-    private static pbr::FileDescriptor descriptor;
-
-    static AddressbookReflection() {
-      byte[] descriptorData = global::System.Convert.FromBase64String(
-          string.Concat(
-            "ChFhZGRyZXNzYm9vay5wcm90bxIIdHV0b3JpYWwaH2dvb2dsZS9wcm90b2J1",
-            "Zi90aW1lc3RhbXAucHJvdG8ihwIKBlBlcnNvbhIMCgRuYW1lGAEgASgJEgoK",
-            "AmlkGAIgASgFEg0KBWVtYWlsGAMgASgJEiwKBnBob25lcxgEIAMoCzIcLnR1",
-            "dG9yaWFsLlBlcnNvbi5QaG9uZU51bWJlchIwCgxsYXN0X3VwZGF0ZWQYBSAB",
-            "KAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wGkcKC1Bob25lTnVtYmVy",
-            "Eg4KBm51bWJlchgBIAEoCRIoCgR0eXBlGAIgASgOMhoudHV0b3JpYWwuUGVy",
-            "c29uLlBob25lVHlwZSIrCglQaG9uZVR5cGUSCgoGTU9CSUxFEAASCAoESE9N",
-            "RRABEggKBFdPUksQAiIvCgtBZGRyZXNzQm9vaxIgCgZwZW9wbGUYASADKAsy",
-            "EC50dXRvcmlhbC5QZXJzb25ClQEKG2NvbS5leGFtcGxlLnR1dG9yaWFsLnBy",
-            "b3Rvc0IRQWRkcmVzc0Jvb2tQcm90b3NQAVo6Z2l0aHViLmNvbS9wcm90b2Nv",
-            "bGJ1ZmZlcnMvcHJvdG9idWYvZXhhbXBsZXMvZ28vdHV0b3JpYWxwYqoCJEdv",
-            "b2dsZS5Qcm90b2J1Zi5FeGFtcGxlcy5BZGRyZXNzQm9va2IGcHJvdG8z"));
-      descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-          new pbr::FileDescriptor[] { global::Google.Protobuf.WellKnownTypes.TimestampReflection.Descriptor, },
-          new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.Examples.AddressBook.Person), global::Google.Protobuf.Examples.AddressBook.Person.Parser, new[]{ "Name", "Id", "Email", "Phones", "LastUpdated" }, null, new[]{ typeof(global::Google.Protobuf.Examples.AddressBook.Person.Types.PhoneType) }, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.Examples.AddressBook.Person.Types.PhoneNumber), global::Google.Protobuf.Examples.AddressBook.Person.Types.PhoneNumber.Parser, new[]{ "Number", "Type" }, null, null, null, null)}),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.Examples.AddressBook.AddressBook), global::Google.Protobuf.Examples.AddressBook.AddressBook.Parser, new[]{ "People" }, null, null, null, null)
-          }));
-    }
-    #endregion
-
-  }
-  #region Messages
-  /// <summary>
-  /// [START messages]
-  /// </summary>
-  public sealed partial class Person : pb::IMessage<Person>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<Person> _parser = new pb::MessageParser<Person>(() => new Person());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<Person> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.Examples.AddressBook.AddressbookReflection.Descriptor.MessageTypes[0]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Person() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Person(Person other) : this() {
-      name_ = other.name_;
-      id_ = other.id_;
-      email_ = other.email_;
-      phones_ = other.phones_.Clone();
-      lastUpdated_ = other.lastUpdated_ != null ? other.lastUpdated_.Clone() : null;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Person Clone() {
-      return new Person(this);
-    }
-
-    /// <summary>Field number for the "name" field.</summary>
-    public const int NameFieldNumber = 1;
-    private string name_ = "";
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string Name {
-      get { return name_; }
-      set {
-        name_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-
-    /// <summary>Field number for the "id" field.</summary>
-    public const int IdFieldNumber = 2;
-    private int id_;
-    /// <summary>
-    /// Unique ID number for this person.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int Id {
-      get { return id_; }
-      set {
-        id_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "email" field.</summary>
-    public const int EmailFieldNumber = 3;
-    private string email_ = "";
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string Email {
-      get { return email_; }
-      set {
-        email_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-
-    /// <summary>Field number for the "phones" field.</summary>
-    public const int PhonesFieldNumber = 4;
-    private static readonly pb::FieldCodec<global::Google.Protobuf.Examples.AddressBook.Person.Types.PhoneNumber> _repeated_phones_codec
-        = pb::FieldCodec.ForMessage(34, global::Google.Protobuf.Examples.AddressBook.Person.Types.PhoneNumber.Parser);
-    private readonly pbc::RepeatedField<global::Google.Protobuf.Examples.AddressBook.Person.Types.PhoneNumber> phones_ = new pbc::RepeatedField<global::Google.Protobuf.Examples.AddressBook.Person.Types.PhoneNumber>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Google.Protobuf.Examples.AddressBook.Person.Types.PhoneNumber> Phones {
-      get { return phones_; }
-    }
-
-    /// <summary>Field number for the "last_updated" field.</summary>
-    public const int LastUpdatedFieldNumber = 5;
-    private global::Google.Protobuf.WellKnownTypes.Timestamp lastUpdated_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.WellKnownTypes.Timestamp LastUpdated {
-      get { return lastUpdated_; }
-      set {
-        lastUpdated_ = value;
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as Person);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(Person other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (Name != other.Name) return false;
-      if (Id != other.Id) return false;
-      if (Email != other.Email) return false;
-      if(!phones_.Equals(other.phones_)) return false;
-      if (!object.Equals(LastUpdated, other.LastUpdated)) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (Name.Length != 0) hash ^= Name.GetHashCode();
-      if (Id != 0) hash ^= Id.GetHashCode();
-      if (Email.Length != 0) hash ^= Email.GetHashCode();
-      hash ^= phones_.GetHashCode();
-      if (lastUpdated_ != null) hash ^= LastUpdated.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (Name.Length != 0) {
-        output.WriteRawTag(10);
-        output.WriteString(Name);
-      }
-      if (Id != 0) {
-        output.WriteRawTag(16);
-        output.WriteInt32(Id);
-      }
-      if (Email.Length != 0) {
-        output.WriteRawTag(26);
-        output.WriteString(Email);
-      }
-      phones_.WriteTo(output, _repeated_phones_codec);
-      if (lastUpdated_ != null) {
-        output.WriteRawTag(42);
-        output.WriteMessage(LastUpdated);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (Name.Length != 0) {
-        output.WriteRawTag(10);
-        output.WriteString(Name);
-      }
-      if (Id != 0) {
-        output.WriteRawTag(16);
-        output.WriteInt32(Id);
-      }
-      if (Email.Length != 0) {
-        output.WriteRawTag(26);
-        output.WriteString(Email);
-      }
-      phones_.WriteTo(ref output, _repeated_phones_codec);
-      if (lastUpdated_ != null) {
-        output.WriteRawTag(42);
-        output.WriteMessage(LastUpdated);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (Name.Length != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(Name);
-      }
-      if (Id != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(Id);
-      }
-      if (Email.Length != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(Email);
-      }
-      size += phones_.CalculateSize(_repeated_phones_codec);
-      if (lastUpdated_ != null) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(LastUpdated);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(Person other) {
-      if (other == null) {
-        return;
-      }
-      if (other.Name.Length != 0) {
-        Name = other.Name;
-      }
-      if (other.Id != 0) {
-        Id = other.Id;
-      }
-      if (other.Email.Length != 0) {
-        Email = other.Email;
-      }
-      phones_.Add(other.phones_);
-      if (other.lastUpdated_ != null) {
-        if (lastUpdated_ == null) {
-          LastUpdated = new global::Google.Protobuf.WellKnownTypes.Timestamp();
-        }
-        LastUpdated.MergeFrom(other.LastUpdated);
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 10: {
-            Name = input.ReadString();
-            break;
-          }
-          case 16: {
-            Id = input.ReadInt32();
-            break;
-          }
-          case 26: {
-            Email = input.ReadString();
-            break;
-          }
-          case 34: {
-            phones_.AddEntriesFrom(input, _repeated_phones_codec);
-            break;
-          }
-          case 42: {
-            if (lastUpdated_ == null) {
-              LastUpdated = new global::Google.Protobuf.WellKnownTypes.Timestamp();
-            }
-            input.ReadMessage(LastUpdated);
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 10: {
-            Name = input.ReadString();
-            break;
-          }
-          case 16: {
-            Id = input.ReadInt32();
-            break;
-          }
-          case 26: {
-            Email = input.ReadString();
-            break;
-          }
-          case 34: {
-            phones_.AddEntriesFrom(ref input, _repeated_phones_codec);
-            break;
-          }
-          case 42: {
-            if (lastUpdated_ == null) {
-              LastUpdated = new global::Google.Protobuf.WellKnownTypes.Timestamp();
-            }
-            input.ReadMessage(LastUpdated);
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-    #region Nested types
-    /// <summary>Container for nested types declared in the Person message type.</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static partial class Types {
-      public enum PhoneType {
-        [pbr::OriginalName("MOBILE")] Mobile = 0,
-        [pbr::OriginalName("HOME")] Home = 1,
-        [pbr::OriginalName("WORK")] Work = 2,
-      }
-
-      public sealed partial class PhoneNumber : pb::IMessage<PhoneNumber>
-      #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          , pb::IBufferMessage
-      #endif
-      {
-        private static readonly pb::MessageParser<PhoneNumber> _parser = new pb::MessageParser<PhoneNumber>(() => new PhoneNumber());
-        private pb::UnknownFieldSet _unknownFields;
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static pb::MessageParser<PhoneNumber> Parser { get { return _parser; } }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static pbr::MessageDescriptor Descriptor {
-          get { return global::Google.Protobuf.Examples.AddressBook.Person.Descriptor.NestedTypes[0]; }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        pbr::MessageDescriptor pb::IMessage.Descriptor {
-          get { return Descriptor; }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public PhoneNumber() {
-          OnConstruction();
-        }
-
-        partial void OnConstruction();
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public PhoneNumber(PhoneNumber other) : this() {
-          number_ = other.number_;
-          type_ = other.type_;
-          _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public PhoneNumber Clone() {
-          return new PhoneNumber(this);
-        }
-
-        /// <summary>Field number for the "number" field.</summary>
-        public const int NumberFieldNumber = 1;
-        private string number_ = "";
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public string Number {
-          get { return number_; }
-          set {
-            number_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-          }
-        }
-
-        /// <summary>Field number for the "type" field.</summary>
-        public const int TypeFieldNumber = 2;
-        private global::Google.Protobuf.Examples.AddressBook.Person.Types.PhoneType type_ = global::Google.Protobuf.Examples.AddressBook.Person.Types.PhoneType.Mobile;
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public global::Google.Protobuf.Examples.AddressBook.Person.Types.PhoneType Type {
-          get { return type_; }
-          set {
-            type_ = value;
-          }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override bool Equals(object other) {
-          return Equals(other as PhoneNumber);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool Equals(PhoneNumber other) {
-          if (ReferenceEquals(other, null)) {
-            return false;
-          }
-          if (ReferenceEquals(other, this)) {
-            return true;
-          }
-          if (Number != other.Number) return false;
-          if (Type != other.Type) return false;
-          return Equals(_unknownFields, other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override int GetHashCode() {
-          int hash = 1;
-          if (Number.Length != 0) hash ^= Number.GetHashCode();
-          if (Type != global::Google.Protobuf.Examples.AddressBook.Person.Types.PhoneType.Mobile) hash ^= Type.GetHashCode();
-          if (_unknownFields != null) {
-            hash ^= _unknownFields.GetHashCode();
-          }
-          return hash;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override string ToString() {
-          return pb::JsonFormatter.ToDiagnosticString(this);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void WriteTo(pb::CodedOutputStream output) {
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          output.WriteRawMessage(this);
-        #else
-          if (Number.Length != 0) {
-            output.WriteRawTag(10);
-            output.WriteString(Number);
-          }
-          if (Type != global::Google.Protobuf.Examples.AddressBook.Person.Types.PhoneType.Mobile) {
-            output.WriteRawTag(16);
-            output.WriteEnum((int) Type);
-          }
-          if (_unknownFields != null) {
-            _unknownFields.WriteTo(output);
-          }
-        #endif
-        }
-
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-          if (Number.Length != 0) {
-            output.WriteRawTag(10);
-            output.WriteString(Number);
-          }
-          if (Type != global::Google.Protobuf.Examples.AddressBook.Person.Types.PhoneType.Mobile) {
-            output.WriteRawTag(16);
-            output.WriteEnum((int) Type);
-          }
-          if (_unknownFields != null) {
-            _unknownFields.WriteTo(ref output);
-          }
-        }
-        #endif
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public int CalculateSize() {
-          int size = 0;
-          if (Number.Length != 0) {
-            size += 1 + pb::CodedOutputStream.ComputeStringSize(Number);
-          }
-          if (Type != global::Google.Protobuf.Examples.AddressBook.Person.Types.PhoneType.Mobile) {
-            size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Type);
-          }
-          if (_unknownFields != null) {
-            size += _unknownFields.CalculateSize();
-          }
-          return size;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(PhoneNumber other) {
-          if (other == null) {
-            return;
-          }
-          if (other.Number.Length != 0) {
-            Number = other.Number;
-          }
-          if (other.Type != global::Google.Protobuf.Examples.AddressBook.Person.Types.PhoneType.Mobile) {
-            Type = other.Type;
-          }
-          _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(pb::CodedInputStream input) {
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          input.ReadRawMessage(this);
-        #else
-          uint tag;
-          while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
-              default:
-                _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-                break;
-              case 10: {
-                Number = input.ReadString();
-                break;
-              }
-              case 16: {
-                Type = (global::Google.Protobuf.Examples.AddressBook.Person.Types.PhoneType) input.ReadEnum();
-                break;
-              }
-            }
-          }
-        #endif
-        }
-
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-          uint tag;
-          while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
-              default:
-                _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-                break;
-              case 10: {
-                Number = input.ReadString();
-                break;
-              }
-              case 16: {
-                Type = (global::Google.Protobuf.Examples.AddressBook.Person.Types.PhoneType) input.ReadEnum();
-                break;
-              }
-            }
-          }
-        }
-        #endif
-
-      }
-
-    }
-    #endregion
-
-  }
-
-  /// <summary>
-  /// Our address book file is just one of these.
-  /// </summary>
-  public sealed partial class AddressBook : pb::IMessage<AddressBook>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<AddressBook> _parser = new pb::MessageParser<AddressBook>(() => new AddressBook());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<AddressBook> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.Examples.AddressBook.AddressbookReflection.Descriptor.MessageTypes[1]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public AddressBook() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public AddressBook(AddressBook other) : this() {
-      people_ = other.people_.Clone();
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public AddressBook Clone() {
-      return new AddressBook(this);
-    }
-
-    /// <summary>Field number for the "people" field.</summary>
-    public const int PeopleFieldNumber = 1;
-    private static readonly pb::FieldCodec<global::Google.Protobuf.Examples.AddressBook.Person> _repeated_people_codec
-        = pb::FieldCodec.ForMessage(10, global::Google.Protobuf.Examples.AddressBook.Person.Parser);
-    private readonly pbc::RepeatedField<global::Google.Protobuf.Examples.AddressBook.Person> people_ = new pbc::RepeatedField<global::Google.Protobuf.Examples.AddressBook.Person>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Google.Protobuf.Examples.AddressBook.Person> People {
-      get { return people_; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as AddressBook);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(AddressBook other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if(!people_.Equals(other.people_)) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      hash ^= people_.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      people_.WriteTo(output, _repeated_people_codec);
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      people_.WriteTo(ref output, _repeated_people_codec);
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      size += people_.CalculateSize(_repeated_people_codec);
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(AddressBook other) {
-      if (other == null) {
-        return;
-      }
-      people_.Add(other.people_);
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 10: {
-            people_.AddEntriesFrom(input, _repeated_people_codec);
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 10: {
-            people_.AddEntriesFrom(ref input, _repeated_people_codec);
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  #endregion
-
-}
-
-#endregion Designer generated code
diff --git a/libs/protobuf/csharp/src/AddressBook/ListPeople.cs b/libs/protobuf/csharp/src/AddressBook/ListPeople.cs
deleted file mode 100644
index fdcd64d..0000000
--- a/libs/protobuf/csharp/src/AddressBook/ListPeople.cs
+++ /dev/null
@@ -1,99 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-using System.IO;
-
-namespace Google.Protobuf.Examples.AddressBook
-{
-    internal class ListPeople
-    {
-        /// <summary>
-        /// Iterates though all people in the AddressBook and prints info about them.
-        /// </summary>
-        private static void Print(AddressBook addressBook)
-        {
-            foreach (Person person in addressBook.People)
-            {
-                Console.WriteLine("Person ID: {0}", person.Id);
-                Console.WriteLine("  Name: {0}", person.Name);
-                if (person.Email != "")
-                {
-                    Console.WriteLine("  E-mail address: {0}", person.Email);
-                }
-
-                foreach (Person.Types.PhoneNumber phoneNumber in person.Phones)
-                {
-                    switch (phoneNumber.Type)
-                    {
-                        case Person.Types.PhoneType.Mobile:
-                            Console.Write("  Mobile phone #: ");
-                            break;
-                        case Person.Types.PhoneType.Home:
-                            Console.Write("  Home phone #: ");
-                            break;
-                        case Person.Types.PhoneType.Work:
-                            Console.Write("  Work phone #: ");
-                            break;
-                    }
-                    Console.WriteLine(phoneNumber.Number);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Entry point - loads the addressbook and then displays it.
-        /// </summary>
-        public static int Main(string[] args)
-        {
-            if (args.Length != 1)
-            {
-                Console.Error.WriteLine("Usage:  ListPeople ADDRESS_BOOK_FILE");
-                return 1;
-            }
-
-            if (!File.Exists(args[0]))
-            {
-                Console.WriteLine("{0} doesn't exist. Add a person to create the file first.", args[0]);
-                return 0;
-            }
-
-            // Read the existing address book.
-            using (Stream stream = File.OpenRead(args[0]))
-            {
-                AddressBook addressBook = AddressBook.Parser.ParseFrom(stream);
-                Print(addressBook);
-            }
-            return 0;
-        }
-    }
-}
\ No newline at end of file
diff --git a/libs/protobuf/csharp/src/AddressBook/Program.cs b/libs/protobuf/csharp/src/AddressBook/Program.cs
deleted file mode 100644
index 5bbe84c..0000000
--- a/libs/protobuf/csharp/src/AddressBook/Program.cs
+++ /dev/null
@@ -1,95 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-
-namespace Google.Protobuf.Examples.AddressBook
-{
-    /// <summary>
-    /// Entry point. Repeatedly prompts user for an action to take, delegating actual behaviour
-    /// to individual actions. Each action has its own Main method, so that it can be used as an
-    /// individual complete program.
-    /// </summary>
-    internal class Program
-    {
-        private static int Main(string[] args)
-        {
-            if (args.Length > 1)
-            {
-                Console.Error.WriteLine("Usage: AddressBook [file]");
-                Console.Error.WriteLine("If the filename isn't specified, \"addressbook.data\" is used instead.");
-                return 1;
-            }
-            string addressBookFile = args.Length > 0 ? args[0] : "addressbook.data";
-
-            bool stopping = false;
-            while (!stopping)
-            {
-                Console.WriteLine("Options:");
-                Console.WriteLine("  L: List contents");
-                Console.WriteLine("  A: Add new person");
-                Console.WriteLine("  Q: Quit");
-                Console.Write("Action? ");
-                Console.Out.Flush();
-                char choice = Console.ReadKey().KeyChar;
-                Console.WriteLine();
-                try
-                {
-                    switch (choice)
-                    {
-                        case 'A':
-                        case 'a':
-                            AddPerson.Main(new string[] {addressBookFile});
-                            break;
-                        case 'L':
-                        case 'l':
-                            ListPeople.Main(new string[] {addressBookFile});
-                            break;
-                        case 'Q':
-                        case 'q':
-                            stopping = true;
-                            break;
-                        default:
-                            Console.WriteLine("Unknown option: {0}", choice);
-                            break;
-                    }
-                }
-                catch (Exception e)
-                {
-                    Console.WriteLine("Exception executing action: {0}", e);
-                }
-                Console.WriteLine();
-            }
-            return 0;
-        }
-    }
-}
\ No newline at end of file
diff --git a/libs/protobuf/csharp/src/AddressBook/SampleUsage.cs b/libs/protobuf/csharp/src/AddressBook/SampleUsage.cs
deleted file mode 100644
index 8f08f0f..0000000
--- a/libs/protobuf/csharp/src/AddressBook/SampleUsage.cs
+++ /dev/null
@@ -1,73 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-    
-using System;
-using System.IO;
-
-namespace Google.Protobuf.Examples.AddressBook
-{
-    internal class SampleUsage
-    {
-        private static void Main()
-        {
-            byte[] bytes;
-            // Create a new person
-            Person person = new Person
-            {
-                Id = 1,
-                Name = "Foo",
-                Email = "foo@bar",
-                Phones = { new Person.Types.PhoneNumber { Number = "555-1212" } }
-            };
-            using (MemoryStream stream = new MemoryStream())
-            {
-                // Save the person to a stream
-                person.WriteTo(stream);
-                bytes = stream.ToArray();
-            }
-            Person copy = Person.Parser.ParseFrom(bytes);
-
-            AddressBook book = new AddressBook
-            {
-                People = { copy }
-            };
-            bytes = book.ToByteArray();
-            // And read the address book back again
-            AddressBook restored = AddressBook.Parser.ParseFrom(bytes);
-            // The message performs a deep-comparison on equality:
-            if (restored.People.Count != 1 || !person.Equals(restored.People[0]))
-            {
-                throw new Exception("There is a bad person in here!");
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/libs/protobuf/csharp/src/Google.Protobuf.Benchmarks/BenchmarkDatasetConfig.cs b/libs/protobuf/csharp/src/Google.Protobuf.Benchmarks/BenchmarkDatasetConfig.cs
deleted file mode 100644
index c075419..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf.Benchmarks/BenchmarkDatasetConfig.cs
+++ /dev/null
@@ -1,89 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2019 Google Inc.  All rights reserved.
-// https://github.com/protocolbuffers/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using Benchmarks;
-using Google.Protobuf.Reflection;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Reflection;
-
-namespace Google.Protobuf.Benchmarks
-{
-    /// <summary>
-    /// The configuration for a single serialization test, loaded from a dataset.
-    /// </summary>
-    public class BenchmarkDatasetConfig
-    {
-        private static readonly Dictionary<string, MessageParser> parsersByMessageName = 
-            typeof(GoogleMessageBenchmark).Assembly.GetTypes()
-                .Where(t => typeof(IMessage).IsAssignableFrom(t))
-                .ToDictionary(
-                    t => ((MessageDescriptor) t.GetProperty("Descriptor", BindingFlags.Static | BindingFlags.Public).GetValue(null)).FullName,
-                    t => ((MessageParser) t.GetProperty("Parser", BindingFlags.Static | BindingFlags.Public).GetValue(null)));
-
-        public MessageParser Parser { get; }
-        public List<byte[]> Payloads { get; }
-        public string Name { get; }
-
-        public BenchmarkDatasetConfig(string resource, string shortName = null)
-        {
-            var data = LoadData(resource);
-            var dataset = BenchmarkDataset.Parser.ParseFrom(data);
-
-            if (!parsersByMessageName.TryGetValue(dataset.MessageName, out var parser))
-            {
-                throw new ArgumentException($"No parser for message {dataset.MessageName} in this assembly");
-            }
-            Parser = parser;
-            Payloads = new List<byte[]>(dataset.Payload.Select(p => p.ToByteArray()));
-            Name = shortName ?? dataset.Name;
-        }
-
-        private static byte[] LoadData(string resource)
-        {
-            using (var stream = typeof(GoogleMessageBenchmark).Assembly.GetManifestResourceStream($"Google.Protobuf.Benchmarks.{resource}"))
-            {
-                if (stream == null)
-                {
-                    throw new ArgumentException($"Unable to load embedded resource {resource}");
-                }
-                var copy = new MemoryStream();
-                stream.CopyTo(copy);
-                return copy.ToArray();
-            }
-        }
-
-        public override string ToString() => Name;
-    }
-}
diff --git a/libs/protobuf/csharp/src/Google.Protobuf.Benchmarks/BenchmarkMessage1Proto3.cs b/libs/protobuf/csharp/src/Google.Protobuf.Benchmarks/BenchmarkMessage1Proto3.cs
deleted file mode 100644
index fe21d0c..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf.Benchmarks/BenchmarkMessage1Proto3.cs
+++ /dev/null
@@ -1,2632 +0,0 @@
-// <auto-generated>
-//     Generated by the protocol buffer compiler.  DO NOT EDIT!
-//     source: datasets/google_message1/proto3/benchmark_message1_proto3.proto
-// </auto-generated>
-#pragma warning disable 1591, 0612, 3021, 8981
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-namespace Benchmarks.Proto3 {
-
-  /// <summary>Holder for reflection information generated from datasets/google_message1/proto3/benchmark_message1_proto3.proto</summary>
-  public static partial class BenchmarkMessage1Proto3Reflection {
-
-    #region Descriptor
-    /// <summary>File descriptor for datasets/google_message1/proto3/benchmark_message1_proto3.proto</summary>
-    public static pbr::FileDescriptor Descriptor {
-      get { return descriptor; }
-    }
-    private static pbr::FileDescriptor descriptor;
-
-    static BenchmarkMessage1Proto3Reflection() {
-      byte[] descriptorData = global::System.Convert.FromBase64String(
-          string.Concat(
-            "Cj9kYXRhc2V0cy9nb29nbGVfbWVzc2FnZTEvcHJvdG8zL2JlbmNobWFya19t",
-            "ZXNzYWdlMV9wcm90bzMucHJvdG8SEWJlbmNobWFya3MucHJvdG8zIoMGCg5H",
-            "b29nbGVNZXNzYWdlMRIOCgZmaWVsZDEYASABKAkSDgoGZmllbGQ5GAkgASgJ",
-            "Eg8KB2ZpZWxkMTgYEiABKAkSDwoHZmllbGQ4MBhQIAEoCBIPCgdmaWVsZDgx",
-            "GFEgASgIEg4KBmZpZWxkMhgCIAEoBRIOCgZmaWVsZDMYAyABKAUSEQoIZmll",
-            "bGQyODAYmAIgASgFEg4KBmZpZWxkNhgGIAEoBRIPCgdmaWVsZDIyGBYgASgD",
-            "Eg4KBmZpZWxkNBgEIAEoCRIOCgZmaWVsZDUYBSADKAYSDwoHZmllbGQ1ORg7",
-            "IAEoCBIOCgZmaWVsZDcYByABKAkSDwoHZmllbGQxNhgQIAEoBRIRCghmaWVs",
-            "ZDEzMBiCASABKAUSDwoHZmllbGQxMhgMIAEoCBIPCgdmaWVsZDE3GBEgASgI",
-            "Eg8KB2ZpZWxkMTMYDSABKAgSDwoHZmllbGQxNBgOIAEoCBIQCghmaWVsZDEw",
-            "NBhoIAEoBRIQCghmaWVsZDEwMBhkIAEoBRIQCghmaWVsZDEwMRhlIAEoBRIQ",
-            "CghmaWVsZDEwMhhmIAEoCRIQCghmaWVsZDEwMxhnIAEoCRIPCgdmaWVsZDI5",
-            "GB0gASgFEg8KB2ZpZWxkMzAYHiABKAgSDwoHZmllbGQ2MBg8IAEoBRIRCghm",
-            "aWVsZDI3MRiPAiABKAUSEQoIZmllbGQyNzIYkAIgASgFEhEKCGZpZWxkMTUw",
-            "GJYBIAEoBRIPCgdmaWVsZDIzGBcgASgFEg8KB2ZpZWxkMjQYGCABKAgSDwoH",
-            "ZmllbGQyNRgZIAEoBRI8CgdmaWVsZDE1GA8gASgLMisuYmVuY2htYXJrcy5w",
-            "cm90bzMuR29vZ2xlTWVzc2FnZTFTdWJNZXNzYWdlEg8KB2ZpZWxkNzgYTiAB",
-            "KAgSDwoHZmllbGQ2NxhDIAEoBRIPCgdmaWVsZDY4GEQgASgFEhEKCGZpZWxk",
-            "MTI4GIABIAEoBRIRCghmaWVsZDEyORiBASABKAkSEQoIZmllbGQxMzEYgwEg",
-            "ASgFIvcCChhHb29nbGVNZXNzYWdlMVN1Yk1lc3NhZ2USDgoGZmllbGQxGAEg",
-            "ASgFEg4KBmZpZWxkMhgCIAEoBRIOCgZmaWVsZDMYAyABKAUSDwoHZmllbGQx",
-            "NRgPIAEoCRIPCgdmaWVsZDEyGAwgASgIEg8KB2ZpZWxkMTMYDSABKAMSDwoH",
-            "ZmllbGQxNBgOIAEoAxIPCgdmaWVsZDE2GBAgASgFEg8KB2ZpZWxkMTkYEyAB",
-            "KAUSDwoHZmllbGQyMBgUIAEoCBIPCgdmaWVsZDI4GBwgASgIEg8KB2ZpZWxk",
-            "MjEYFSABKAYSDwoHZmllbGQyMhgWIAEoBRIPCgdmaWVsZDIzGBcgASgIEhEK",
-            "CGZpZWxkMjA2GM4BIAEoCBIRCghmaWVsZDIwMxjLASABKAcSEQoIZmllbGQy",
-            "MDQYzAEgASgFEhEKCGZpZWxkMjA1GM0BIAEoCRIRCghmaWVsZDIwNxjPASAB",
-            "KAQSEQoIZmllbGQzMDAYrAIgASgEQiUKHmNvbS5nb29nbGUucHJvdG9idWYu",
-            "YmVuY2htYXJrc0gB+AEBYgZwcm90bzM="));
-      descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-          new pbr::FileDescriptor[] { },
-          new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::Benchmarks.Proto3.GoogleMessage1), global::Benchmarks.Proto3.GoogleMessage1.Parser, new[]{ "Field1", "Field9", "Field18", "Field80", "Field81", "Field2", "Field3", "Field280", "Field6", "Field22", "Field4", "Field5", "Field59", "Field7", "Field16", "Field130", "Field12", "Field17", "Field13", "Field14", "Field104", "Field100", "Field101", "Field102", "Field103", "Field29", "Field30", "Field60", "Field271", "Field272", "Field150", "Field23", "Field24", "Field25", "Field15", "Field78", "Field67", "Field68", "Field128", "Field129", "Field131" }, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Benchmarks.Proto3.GoogleMessage1SubMessage), global::Benchmarks.Proto3.GoogleMessage1SubMessage.Parser, new[]{ "Field1", "Field2", "Field3", "Field15", "Field12", "Field13", "Field14", "Field16", "Field19", "Field20", "Field28", "Field21", "Field22", "Field23", "Field206", "Field203", "Field204", "Field205", "Field207", "Field300" }, null, null, null, null)
-          }));
-    }
-    #endregion
-
-  }
-  #region Messages
-  public sealed partial class GoogleMessage1 : pb::IMessage<GoogleMessage1>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<GoogleMessage1> _parser = new pb::MessageParser<GoogleMessage1>(() => new GoogleMessage1());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<GoogleMessage1> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Benchmarks.Proto3.BenchmarkMessage1Proto3Reflection.Descriptor.MessageTypes[0]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public GoogleMessage1() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public GoogleMessage1(GoogleMessage1 other) : this() {
-      field1_ = other.field1_;
-      field9_ = other.field9_;
-      field18_ = other.field18_;
-      field80_ = other.field80_;
-      field81_ = other.field81_;
-      field2_ = other.field2_;
-      field3_ = other.field3_;
-      field280_ = other.field280_;
-      field6_ = other.field6_;
-      field22_ = other.field22_;
-      field4_ = other.field4_;
-      field5_ = other.field5_.Clone();
-      field59_ = other.field59_;
-      field7_ = other.field7_;
-      field16_ = other.field16_;
-      field130_ = other.field130_;
-      field12_ = other.field12_;
-      field17_ = other.field17_;
-      field13_ = other.field13_;
-      field14_ = other.field14_;
-      field104_ = other.field104_;
-      field100_ = other.field100_;
-      field101_ = other.field101_;
-      field102_ = other.field102_;
-      field103_ = other.field103_;
-      field29_ = other.field29_;
-      field30_ = other.field30_;
-      field60_ = other.field60_;
-      field271_ = other.field271_;
-      field272_ = other.field272_;
-      field150_ = other.field150_;
-      field23_ = other.field23_;
-      field24_ = other.field24_;
-      field25_ = other.field25_;
-      field15_ = other.field15_ != null ? other.field15_.Clone() : null;
-      field78_ = other.field78_;
-      field67_ = other.field67_;
-      field68_ = other.field68_;
-      field128_ = other.field128_;
-      field129_ = other.field129_;
-      field131_ = other.field131_;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public GoogleMessage1 Clone() {
-      return new GoogleMessage1(this);
-    }
-
-    /// <summary>Field number for the "field1" field.</summary>
-    public const int Field1FieldNumber = 1;
-    private string field1_ = "";
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string Field1 {
-      get { return field1_; }
-      set {
-        field1_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-
-    /// <summary>Field number for the "field9" field.</summary>
-    public const int Field9FieldNumber = 9;
-    private string field9_ = "";
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string Field9 {
-      get { return field9_; }
-      set {
-        field9_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-
-    /// <summary>Field number for the "field18" field.</summary>
-    public const int Field18FieldNumber = 18;
-    private string field18_ = "";
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string Field18 {
-      get { return field18_; }
-      set {
-        field18_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-
-    /// <summary>Field number for the "field80" field.</summary>
-    public const int Field80FieldNumber = 80;
-    private bool field80_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Field80 {
-      get { return field80_; }
-      set {
-        field80_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "field81" field.</summary>
-    public const int Field81FieldNumber = 81;
-    private bool field81_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Field81 {
-      get { return field81_; }
-      set {
-        field81_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "field2" field.</summary>
-    public const int Field2FieldNumber = 2;
-    private int field2_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int Field2 {
-      get { return field2_; }
-      set {
-        field2_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "field3" field.</summary>
-    public const int Field3FieldNumber = 3;
-    private int field3_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int Field3 {
-      get { return field3_; }
-      set {
-        field3_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "field280" field.</summary>
-    public const int Field280FieldNumber = 280;
-    private int field280_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int Field280 {
-      get { return field280_; }
-      set {
-        field280_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "field6" field.</summary>
-    public const int Field6FieldNumber = 6;
-    private int field6_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int Field6 {
-      get { return field6_; }
-      set {
-        field6_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "field22" field.</summary>
-    public const int Field22FieldNumber = 22;
-    private long field22_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public long Field22 {
-      get { return field22_; }
-      set {
-        field22_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "field4" field.</summary>
-    public const int Field4FieldNumber = 4;
-    private string field4_ = "";
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string Field4 {
-      get { return field4_; }
-      set {
-        field4_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-
-    /// <summary>Field number for the "field5" field.</summary>
-    public const int Field5FieldNumber = 5;
-    private static readonly pb::FieldCodec<ulong> _repeated_field5_codec
-        = pb::FieldCodec.ForFixed64(42);
-    private readonly pbc::RepeatedField<ulong> field5_ = new pbc::RepeatedField<ulong>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<ulong> Field5 {
-      get { return field5_; }
-    }
-
-    /// <summary>Field number for the "field59" field.</summary>
-    public const int Field59FieldNumber = 59;
-    private bool field59_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Field59 {
-      get { return field59_; }
-      set {
-        field59_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "field7" field.</summary>
-    public const int Field7FieldNumber = 7;
-    private string field7_ = "";
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string Field7 {
-      get { return field7_; }
-      set {
-        field7_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-
-    /// <summary>Field number for the "field16" field.</summary>
-    public const int Field16FieldNumber = 16;
-    private int field16_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int Field16 {
-      get { return field16_; }
-      set {
-        field16_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "field130" field.</summary>
-    public const int Field130FieldNumber = 130;
-    private int field130_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int Field130 {
-      get { return field130_; }
-      set {
-        field130_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "field12" field.</summary>
-    public const int Field12FieldNumber = 12;
-    private bool field12_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Field12 {
-      get { return field12_; }
-      set {
-        field12_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "field17" field.</summary>
-    public const int Field17FieldNumber = 17;
-    private bool field17_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Field17 {
-      get { return field17_; }
-      set {
-        field17_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "field13" field.</summary>
-    public const int Field13FieldNumber = 13;
-    private bool field13_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Field13 {
-      get { return field13_; }
-      set {
-        field13_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "field14" field.</summary>
-    public const int Field14FieldNumber = 14;
-    private bool field14_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Field14 {
-      get { return field14_; }
-      set {
-        field14_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "field104" field.</summary>
-    public const int Field104FieldNumber = 104;
-    private int field104_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int Field104 {
-      get { return field104_; }
-      set {
-        field104_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "field100" field.</summary>
-    public const int Field100FieldNumber = 100;
-    private int field100_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int Field100 {
-      get { return field100_; }
-      set {
-        field100_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "field101" field.</summary>
-    public const int Field101FieldNumber = 101;
-    private int field101_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int Field101 {
-      get { return field101_; }
-      set {
-        field101_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "field102" field.</summary>
-    public const int Field102FieldNumber = 102;
-    private string field102_ = "";
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string Field102 {
-      get { return field102_; }
-      set {
-        field102_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-
-    /// <summary>Field number for the "field103" field.</summary>
-    public const int Field103FieldNumber = 103;
-    private string field103_ = "";
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string Field103 {
-      get { return field103_; }
-      set {
-        field103_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-
-    /// <summary>Field number for the "field29" field.</summary>
-    public const int Field29FieldNumber = 29;
-    private int field29_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int Field29 {
-      get { return field29_; }
-      set {
-        field29_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "field30" field.</summary>
-    public const int Field30FieldNumber = 30;
-    private bool field30_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Field30 {
-      get { return field30_; }
-      set {
-        field30_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "field60" field.</summary>
-    public const int Field60FieldNumber = 60;
-    private int field60_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int Field60 {
-      get { return field60_; }
-      set {
-        field60_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "field271" field.</summary>
-    public const int Field271FieldNumber = 271;
-    private int field271_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int Field271 {
-      get { return field271_; }
-      set {
-        field271_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "field272" field.</summary>
-    public const int Field272FieldNumber = 272;
-    private int field272_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int Field272 {
-      get { return field272_; }
-      set {
-        field272_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "field150" field.</summary>
-    public const int Field150FieldNumber = 150;
-    private int field150_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int Field150 {
-      get { return field150_; }
-      set {
-        field150_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "field23" field.</summary>
-    public const int Field23FieldNumber = 23;
-    private int field23_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int Field23 {
-      get { return field23_; }
-      set {
-        field23_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "field24" field.</summary>
-    public const int Field24FieldNumber = 24;
-    private bool field24_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Field24 {
-      get { return field24_; }
-      set {
-        field24_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "field25" field.</summary>
-    public const int Field25FieldNumber = 25;
-    private int field25_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int Field25 {
-      get { return field25_; }
-      set {
-        field25_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "field15" field.</summary>
-    public const int Field15FieldNumber = 15;
-    private global::Benchmarks.Proto3.GoogleMessage1SubMessage field15_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Benchmarks.Proto3.GoogleMessage1SubMessage Field15 {
-      get { return field15_; }
-      set {
-        field15_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "field78" field.</summary>
-    public const int Field78FieldNumber = 78;
-    private bool field78_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Field78 {
-      get { return field78_; }
-      set {
-        field78_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "field67" field.</summary>
-    public const int Field67FieldNumber = 67;
-    private int field67_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int Field67 {
-      get { return field67_; }
-      set {
-        field67_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "field68" field.</summary>
-    public const int Field68FieldNumber = 68;
-    private int field68_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int Field68 {
-      get { return field68_; }
-      set {
-        field68_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "field128" field.</summary>
-    public const int Field128FieldNumber = 128;
-    private int field128_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int Field128 {
-      get { return field128_; }
-      set {
-        field128_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "field129" field.</summary>
-    public const int Field129FieldNumber = 129;
-    private string field129_ = "";
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string Field129 {
-      get { return field129_; }
-      set {
-        field129_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-
-    /// <summary>Field number for the "field131" field.</summary>
-    public const int Field131FieldNumber = 131;
-    private int field131_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int Field131 {
-      get { return field131_; }
-      set {
-        field131_ = value;
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as GoogleMessage1);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(GoogleMessage1 other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (Field1 != other.Field1) return false;
-      if (Field9 != other.Field9) return false;
-      if (Field18 != other.Field18) return false;
-      if (Field80 != other.Field80) return false;
-      if (Field81 != other.Field81) return false;
-      if (Field2 != other.Field2) return false;
-      if (Field3 != other.Field3) return false;
-      if (Field280 != other.Field280) return false;
-      if (Field6 != other.Field6) return false;
-      if (Field22 != other.Field22) return false;
-      if (Field4 != other.Field4) return false;
-      if(!field5_.Equals(other.field5_)) return false;
-      if (Field59 != other.Field59) return false;
-      if (Field7 != other.Field7) return false;
-      if (Field16 != other.Field16) return false;
-      if (Field130 != other.Field130) return false;
-      if (Field12 != other.Field12) return false;
-      if (Field17 != other.Field17) return false;
-      if (Field13 != other.Field13) return false;
-      if (Field14 != other.Field14) return false;
-      if (Field104 != other.Field104) return false;
-      if (Field100 != other.Field100) return false;
-      if (Field101 != other.Field101) return false;
-      if (Field102 != other.Field102) return false;
-      if (Field103 != other.Field103) return false;
-      if (Field29 != other.Field29) return false;
-      if (Field30 != other.Field30) return false;
-      if (Field60 != other.Field60) return false;
-      if (Field271 != other.Field271) return false;
-      if (Field272 != other.Field272) return false;
-      if (Field150 != other.Field150) return false;
-      if (Field23 != other.Field23) return false;
-      if (Field24 != other.Field24) return false;
-      if (Field25 != other.Field25) return false;
-      if (!object.Equals(Field15, other.Field15)) return false;
-      if (Field78 != other.Field78) return false;
-      if (Field67 != other.Field67) return false;
-      if (Field68 != other.Field68) return false;
-      if (Field128 != other.Field128) return false;
-      if (Field129 != other.Field129) return false;
-      if (Field131 != other.Field131) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (Field1.Length != 0) hash ^= Field1.GetHashCode();
-      if (Field9.Length != 0) hash ^= Field9.GetHashCode();
-      if (Field18.Length != 0) hash ^= Field18.GetHashCode();
-      if (Field80 != false) hash ^= Field80.GetHashCode();
-      if (Field81 != false) hash ^= Field81.GetHashCode();
-      if (Field2 != 0) hash ^= Field2.GetHashCode();
-      if (Field3 != 0) hash ^= Field3.GetHashCode();
-      if (Field280 != 0) hash ^= Field280.GetHashCode();
-      if (Field6 != 0) hash ^= Field6.GetHashCode();
-      if (Field22 != 0L) hash ^= Field22.GetHashCode();
-      if (Field4.Length != 0) hash ^= Field4.GetHashCode();
-      hash ^= field5_.GetHashCode();
-      if (Field59 != false) hash ^= Field59.GetHashCode();
-      if (Field7.Length != 0) hash ^= Field7.GetHashCode();
-      if (Field16 != 0) hash ^= Field16.GetHashCode();
-      if (Field130 != 0) hash ^= Field130.GetHashCode();
-      if (Field12 != false) hash ^= Field12.GetHashCode();
-      if (Field17 != false) hash ^= Field17.GetHashCode();
-      if (Field13 != false) hash ^= Field13.GetHashCode();
-      if (Field14 != false) hash ^= Field14.GetHashCode();
-      if (Field104 != 0) hash ^= Field104.GetHashCode();
-      if (Field100 != 0) hash ^= Field100.GetHashCode();
-      if (Field101 != 0) hash ^= Field101.GetHashCode();
-      if (Field102.Length != 0) hash ^= Field102.GetHashCode();
-      if (Field103.Length != 0) hash ^= Field103.GetHashCode();
-      if (Field29 != 0) hash ^= Field29.GetHashCode();
-      if (Field30 != false) hash ^= Field30.GetHashCode();
-      if (Field60 != 0) hash ^= Field60.GetHashCode();
-      if (Field271 != 0) hash ^= Field271.GetHashCode();
-      if (Field272 != 0) hash ^= Field272.GetHashCode();
-      if (Field150 != 0) hash ^= Field150.GetHashCode();
-      if (Field23 != 0) hash ^= Field23.GetHashCode();
-      if (Field24 != false) hash ^= Field24.GetHashCode();
-      if (Field25 != 0) hash ^= Field25.GetHashCode();
-      if (field15_ != null) hash ^= Field15.GetHashCode();
-      if (Field78 != false) hash ^= Field78.GetHashCode();
-      if (Field67 != 0) hash ^= Field67.GetHashCode();
-      if (Field68 != 0) hash ^= Field68.GetHashCode();
-      if (Field128 != 0) hash ^= Field128.GetHashCode();
-      if (Field129.Length != 0) hash ^= Field129.GetHashCode();
-      if (Field131 != 0) hash ^= Field131.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (Field1.Length != 0) {
-        output.WriteRawTag(10);
-        output.WriteString(Field1);
-      }
-      if (Field2 != 0) {
-        output.WriteRawTag(16);
-        output.WriteInt32(Field2);
-      }
-      if (Field3 != 0) {
-        output.WriteRawTag(24);
-        output.WriteInt32(Field3);
-      }
-      if (Field4.Length != 0) {
-        output.WriteRawTag(34);
-        output.WriteString(Field4);
-      }
-      field5_.WriteTo(output, _repeated_field5_codec);
-      if (Field6 != 0) {
-        output.WriteRawTag(48);
-        output.WriteInt32(Field6);
-      }
-      if (Field7.Length != 0) {
-        output.WriteRawTag(58);
-        output.WriteString(Field7);
-      }
-      if (Field9.Length != 0) {
-        output.WriteRawTag(74);
-        output.WriteString(Field9);
-      }
-      if (Field12 != false) {
-        output.WriteRawTag(96);
-        output.WriteBool(Field12);
-      }
-      if (Field13 != false) {
-        output.WriteRawTag(104);
-        output.WriteBool(Field13);
-      }
-      if (Field14 != false) {
-        output.WriteRawTag(112);
-        output.WriteBool(Field14);
-      }
-      if (field15_ != null) {
-        output.WriteRawTag(122);
-        output.WriteMessage(Field15);
-      }
-      if (Field16 != 0) {
-        output.WriteRawTag(128, 1);
-        output.WriteInt32(Field16);
-      }
-      if (Field17 != false) {
-        output.WriteRawTag(136, 1);
-        output.WriteBool(Field17);
-      }
-      if (Field18.Length != 0) {
-        output.WriteRawTag(146, 1);
-        output.WriteString(Field18);
-      }
-      if (Field22 != 0L) {
-        output.WriteRawTag(176, 1);
-        output.WriteInt64(Field22);
-      }
-      if (Field23 != 0) {
-        output.WriteRawTag(184, 1);
-        output.WriteInt32(Field23);
-      }
-      if (Field24 != false) {
-        output.WriteRawTag(192, 1);
-        output.WriteBool(Field24);
-      }
-      if (Field25 != 0) {
-        output.WriteRawTag(200, 1);
-        output.WriteInt32(Field25);
-      }
-      if (Field29 != 0) {
-        output.WriteRawTag(232, 1);
-        output.WriteInt32(Field29);
-      }
-      if (Field30 != false) {
-        output.WriteRawTag(240, 1);
-        output.WriteBool(Field30);
-      }
-      if (Field59 != false) {
-        output.WriteRawTag(216, 3);
-        output.WriteBool(Field59);
-      }
-      if (Field60 != 0) {
-        output.WriteRawTag(224, 3);
-        output.WriteInt32(Field60);
-      }
-      if (Field67 != 0) {
-        output.WriteRawTag(152, 4);
-        output.WriteInt32(Field67);
-      }
-      if (Field68 != 0) {
-        output.WriteRawTag(160, 4);
-        output.WriteInt32(Field68);
-      }
-      if (Field78 != false) {
-        output.WriteRawTag(240, 4);
-        output.WriteBool(Field78);
-      }
-      if (Field80 != false) {
-        output.WriteRawTag(128, 5);
-        output.WriteBool(Field80);
-      }
-      if (Field81 != false) {
-        output.WriteRawTag(136, 5);
-        output.WriteBool(Field81);
-      }
-      if (Field100 != 0) {
-        output.WriteRawTag(160, 6);
-        output.WriteInt32(Field100);
-      }
-      if (Field101 != 0) {
-        output.WriteRawTag(168, 6);
-        output.WriteInt32(Field101);
-      }
-      if (Field102.Length != 0) {
-        output.WriteRawTag(178, 6);
-        output.WriteString(Field102);
-      }
-      if (Field103.Length != 0) {
-        output.WriteRawTag(186, 6);
-        output.WriteString(Field103);
-      }
-      if (Field104 != 0) {
-        output.WriteRawTag(192, 6);
-        output.WriteInt32(Field104);
-      }
-      if (Field128 != 0) {
-        output.WriteRawTag(128, 8);
-        output.WriteInt32(Field128);
-      }
-      if (Field129.Length != 0) {
-        output.WriteRawTag(138, 8);
-        output.WriteString(Field129);
-      }
-      if (Field130 != 0) {
-        output.WriteRawTag(144, 8);
-        output.WriteInt32(Field130);
-      }
-      if (Field131 != 0) {
-        output.WriteRawTag(152, 8);
-        output.WriteInt32(Field131);
-      }
-      if (Field150 != 0) {
-        output.WriteRawTag(176, 9);
-        output.WriteInt32(Field150);
-      }
-      if (Field271 != 0) {
-        output.WriteRawTag(248, 16);
-        output.WriteInt32(Field271);
-      }
-      if (Field272 != 0) {
-        output.WriteRawTag(128, 17);
-        output.WriteInt32(Field272);
-      }
-      if (Field280 != 0) {
-        output.WriteRawTag(192, 17);
-        output.WriteInt32(Field280);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (Field1.Length != 0) {
-        output.WriteRawTag(10);
-        output.WriteString(Field1);
-      }
-      if (Field2 != 0) {
-        output.WriteRawTag(16);
-        output.WriteInt32(Field2);
-      }
-      if (Field3 != 0) {
-        output.WriteRawTag(24);
-        output.WriteInt32(Field3);
-      }
-      if (Field4.Length != 0) {
-        output.WriteRawTag(34);
-        output.WriteString(Field4);
-      }
-      field5_.WriteTo(ref output, _repeated_field5_codec);
-      if (Field6 != 0) {
-        output.WriteRawTag(48);
-        output.WriteInt32(Field6);
-      }
-      if (Field7.Length != 0) {
-        output.WriteRawTag(58);
-        output.WriteString(Field7);
-      }
-      if (Field9.Length != 0) {
-        output.WriteRawTag(74);
-        output.WriteString(Field9);
-      }
-      if (Field12 != false) {
-        output.WriteRawTag(96);
-        output.WriteBool(Field12);
-      }
-      if (Field13 != false) {
-        output.WriteRawTag(104);
-        output.WriteBool(Field13);
-      }
-      if (Field14 != false) {
-        output.WriteRawTag(112);
-        output.WriteBool(Field14);
-      }
-      if (field15_ != null) {
-        output.WriteRawTag(122);
-        output.WriteMessage(Field15);
-      }
-      if (Field16 != 0) {
-        output.WriteRawTag(128, 1);
-        output.WriteInt32(Field16);
-      }
-      if (Field17 != false) {
-        output.WriteRawTag(136, 1);
-        output.WriteBool(Field17);
-      }
-      if (Field18.Length != 0) {
-        output.WriteRawTag(146, 1);
-        output.WriteString(Field18);
-      }
-      if (Field22 != 0L) {
-        output.WriteRawTag(176, 1);
-        output.WriteInt64(Field22);
-      }
-      if (Field23 != 0) {
-        output.WriteRawTag(184, 1);
-        output.WriteInt32(Field23);
-      }
-      if (Field24 != false) {
-        output.WriteRawTag(192, 1);
-        output.WriteBool(Field24);
-      }
-      if (Field25 != 0) {
-        output.WriteRawTag(200, 1);
-        output.WriteInt32(Field25);
-      }
-      if (Field29 != 0) {
-        output.WriteRawTag(232, 1);
-        output.WriteInt32(Field29);
-      }
-      if (Field30 != false) {
-        output.WriteRawTag(240, 1);
-        output.WriteBool(Field30);
-      }
-      if (Field59 != false) {
-        output.WriteRawTag(216, 3);
-        output.WriteBool(Field59);
-      }
-      if (Field60 != 0) {
-        output.WriteRawTag(224, 3);
-        output.WriteInt32(Field60);
-      }
-      if (Field67 != 0) {
-        output.WriteRawTag(152, 4);
-        output.WriteInt32(Field67);
-      }
-      if (Field68 != 0) {
-        output.WriteRawTag(160, 4);
-        output.WriteInt32(Field68);
-      }
-      if (Field78 != false) {
-        output.WriteRawTag(240, 4);
-        output.WriteBool(Field78);
-      }
-      if (Field80 != false) {
-        output.WriteRawTag(128, 5);
-        output.WriteBool(Field80);
-      }
-      if (Field81 != false) {
-        output.WriteRawTag(136, 5);
-        output.WriteBool(Field81);
-      }
-      if (Field100 != 0) {
-        output.WriteRawTag(160, 6);
-        output.WriteInt32(Field100);
-      }
-      if (Field101 != 0) {
-        output.WriteRawTag(168, 6);
-        output.WriteInt32(Field101);
-      }
-      if (Field102.Length != 0) {
-        output.WriteRawTag(178, 6);
-        output.WriteString(Field102);
-      }
-      if (Field103.Length != 0) {
-        output.WriteRawTag(186, 6);
-        output.WriteString(Field103);
-      }
-      if (Field104 != 0) {
-        output.WriteRawTag(192, 6);
-        output.WriteInt32(Field104);
-      }
-      if (Field128 != 0) {
-        output.WriteRawTag(128, 8);
-        output.WriteInt32(Field128);
-      }
-      if (Field129.Length != 0) {
-        output.WriteRawTag(138, 8);
-        output.WriteString(Field129);
-      }
-      if (Field130 != 0) {
-        output.WriteRawTag(144, 8);
-        output.WriteInt32(Field130);
-      }
-      if (Field131 != 0) {
-        output.WriteRawTag(152, 8);
-        output.WriteInt32(Field131);
-      }
-      if (Field150 != 0) {
-        output.WriteRawTag(176, 9);
-        output.WriteInt32(Field150);
-      }
-      if (Field271 != 0) {
-        output.WriteRawTag(248, 16);
-        output.WriteInt32(Field271);
-      }
-      if (Field272 != 0) {
-        output.WriteRawTag(128, 17);
-        output.WriteInt32(Field272);
-      }
-      if (Field280 != 0) {
-        output.WriteRawTag(192, 17);
-        output.WriteInt32(Field280);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (Field1.Length != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(Field1);
-      }
-      if (Field9.Length != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(Field9);
-      }
-      if (Field18.Length != 0) {
-        size += 2 + pb::CodedOutputStream.ComputeStringSize(Field18);
-      }
-      if (Field80 != false) {
-        size += 2 + 1;
-      }
-      if (Field81 != false) {
-        size += 2 + 1;
-      }
-      if (Field2 != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(Field2);
-      }
-      if (Field3 != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(Field3);
-      }
-      if (Field280 != 0) {
-        size += 2 + pb::CodedOutputStream.ComputeInt32Size(Field280);
-      }
-      if (Field6 != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(Field6);
-      }
-      if (Field22 != 0L) {
-        size += 2 + pb::CodedOutputStream.ComputeInt64Size(Field22);
-      }
-      if (Field4.Length != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(Field4);
-      }
-      size += field5_.CalculateSize(_repeated_field5_codec);
-      if (Field59 != false) {
-        size += 2 + 1;
-      }
-      if (Field7.Length != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(Field7);
-      }
-      if (Field16 != 0) {
-        size += 2 + pb::CodedOutputStream.ComputeInt32Size(Field16);
-      }
-      if (Field130 != 0) {
-        size += 2 + pb::CodedOutputStream.ComputeInt32Size(Field130);
-      }
-      if (Field12 != false) {
-        size += 1 + 1;
-      }
-      if (Field17 != false) {
-        size += 2 + 1;
-      }
-      if (Field13 != false) {
-        size += 1 + 1;
-      }
-      if (Field14 != false) {
-        size += 1 + 1;
-      }
-      if (Field104 != 0) {
-        size += 2 + pb::CodedOutputStream.ComputeInt32Size(Field104);
-      }
-      if (Field100 != 0) {
-        size += 2 + pb::CodedOutputStream.ComputeInt32Size(Field100);
-      }
-      if (Field101 != 0) {
-        size += 2 + pb::CodedOutputStream.ComputeInt32Size(Field101);
-      }
-      if (Field102.Length != 0) {
-        size += 2 + pb::CodedOutputStream.ComputeStringSize(Field102);
-      }
-      if (Field103.Length != 0) {
-        size += 2 + pb::CodedOutputStream.ComputeStringSize(Field103);
-      }
-      if (Field29 != 0) {
-        size += 2 + pb::CodedOutputStream.ComputeInt32Size(Field29);
-      }
-      if (Field30 != false) {
-        size += 2 + 1;
-      }
-      if (Field60 != 0) {
-        size += 2 + pb::CodedOutputStream.ComputeInt32Size(Field60);
-      }
-      if (Field271 != 0) {
-        size += 2 + pb::CodedOutputStream.ComputeInt32Size(Field271);
-      }
-      if (Field272 != 0) {
-        size += 2 + pb::CodedOutputStream.ComputeInt32Size(Field272);
-      }
-      if (Field150 != 0) {
-        size += 2 + pb::CodedOutputStream.ComputeInt32Size(Field150);
-      }
-      if (Field23 != 0) {
-        size += 2 + pb::CodedOutputStream.ComputeInt32Size(Field23);
-      }
-      if (Field24 != false) {
-        size += 2 + 1;
-      }
-      if (Field25 != 0) {
-        size += 2 + pb::CodedOutputStream.ComputeInt32Size(Field25);
-      }
-      if (field15_ != null) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(Field15);
-      }
-      if (Field78 != false) {
-        size += 2 + 1;
-      }
-      if (Field67 != 0) {
-        size += 2 + pb::CodedOutputStream.ComputeInt32Size(Field67);
-      }
-      if (Field68 != 0) {
-        size += 2 + pb::CodedOutputStream.ComputeInt32Size(Field68);
-      }
-      if (Field128 != 0) {
-        size += 2 + pb::CodedOutputStream.ComputeInt32Size(Field128);
-      }
-      if (Field129.Length != 0) {
-        size += 2 + pb::CodedOutputStream.ComputeStringSize(Field129);
-      }
-      if (Field131 != 0) {
-        size += 2 + pb::CodedOutputStream.ComputeInt32Size(Field131);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(GoogleMessage1 other) {
-      if (other == null) {
-        return;
-      }
-      if (other.Field1.Length != 0) {
-        Field1 = other.Field1;
-      }
-      if (other.Field9.Length != 0) {
-        Field9 = other.Field9;
-      }
-      if (other.Field18.Length != 0) {
-        Field18 = other.Field18;
-      }
-      if (other.Field80 != false) {
-        Field80 = other.Field80;
-      }
-      if (other.Field81 != false) {
-        Field81 = other.Field81;
-      }
-      if (other.Field2 != 0) {
-        Field2 = other.Field2;
-      }
-      if (other.Field3 != 0) {
-        Field3 = other.Field3;
-      }
-      if (other.Field280 != 0) {
-        Field280 = other.Field280;
-      }
-      if (other.Field6 != 0) {
-        Field6 = other.Field6;
-      }
-      if (other.Field22 != 0L) {
-        Field22 = other.Field22;
-      }
-      if (other.Field4.Length != 0) {
-        Field4 = other.Field4;
-      }
-      field5_.Add(other.field5_);
-      if (other.Field59 != false) {
-        Field59 = other.Field59;
-      }
-      if (other.Field7.Length != 0) {
-        Field7 = other.Field7;
-      }
-      if (other.Field16 != 0) {
-        Field16 = other.Field16;
-      }
-      if (other.Field130 != 0) {
-        Field130 = other.Field130;
-      }
-      if (other.Field12 != false) {
-        Field12 = other.Field12;
-      }
-      if (other.Field17 != false) {
-        Field17 = other.Field17;
-      }
-      if (other.Field13 != false) {
-        Field13 = other.Field13;
-      }
-      if (other.Field14 != false) {
-        Field14 = other.Field14;
-      }
-      if (other.Field104 != 0) {
-        Field104 = other.Field104;
-      }
-      if (other.Field100 != 0) {
-        Field100 = other.Field100;
-      }
-      if (other.Field101 != 0) {
-        Field101 = other.Field101;
-      }
-      if (other.Field102.Length != 0) {
-        Field102 = other.Field102;
-      }
-      if (other.Field103.Length != 0) {
-        Field103 = other.Field103;
-      }
-      if (other.Field29 != 0) {
-        Field29 = other.Field29;
-      }
-      if (other.Field30 != false) {
-        Field30 = other.Field30;
-      }
-      if (other.Field60 != 0) {
-        Field60 = other.Field60;
-      }
-      if (other.Field271 != 0) {
-        Field271 = other.Field271;
-      }
-      if (other.Field272 != 0) {
-        Field272 = other.Field272;
-      }
-      if (other.Field150 != 0) {
-        Field150 = other.Field150;
-      }
-      if (other.Field23 != 0) {
-        Field23 = other.Field23;
-      }
-      if (other.Field24 != false) {
-        Field24 = other.Field24;
-      }
-      if (other.Field25 != 0) {
-        Field25 = other.Field25;
-      }
-      if (other.field15_ != null) {
-        if (field15_ == null) {
-          Field15 = new global::Benchmarks.Proto3.GoogleMessage1SubMessage();
-        }
-        Field15.MergeFrom(other.Field15);
-      }
-      if (other.Field78 != false) {
-        Field78 = other.Field78;
-      }
-      if (other.Field67 != 0) {
-        Field67 = other.Field67;
-      }
-      if (other.Field68 != 0) {
-        Field68 = other.Field68;
-      }
-      if (other.Field128 != 0) {
-        Field128 = other.Field128;
-      }
-      if (other.Field129.Length != 0) {
-        Field129 = other.Field129;
-      }
-      if (other.Field131 != 0) {
-        Field131 = other.Field131;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 10: {
-            Field1 = input.ReadString();
-            break;
-          }
-          case 16: {
-            Field2 = input.ReadInt32();
-            break;
-          }
-          case 24: {
-            Field3 = input.ReadInt32();
-            break;
-          }
-          case 34: {
-            Field4 = input.ReadString();
-            break;
-          }
-          case 42:
-          case 41: {
-            field5_.AddEntriesFrom(input, _repeated_field5_codec);
-            break;
-          }
-          case 48: {
-            Field6 = input.ReadInt32();
-            break;
-          }
-          case 58: {
-            Field7 = input.ReadString();
-            break;
-          }
-          case 74: {
-            Field9 = input.ReadString();
-            break;
-          }
-          case 96: {
-            Field12 = input.ReadBool();
-            break;
-          }
-          case 104: {
-            Field13 = input.ReadBool();
-            break;
-          }
-          case 112: {
-            Field14 = input.ReadBool();
-            break;
-          }
-          case 122: {
-            if (field15_ == null) {
-              Field15 = new global::Benchmarks.Proto3.GoogleMessage1SubMessage();
-            }
-            input.ReadMessage(Field15);
-            break;
-          }
-          case 128: {
-            Field16 = input.ReadInt32();
-            break;
-          }
-          case 136: {
-            Field17 = input.ReadBool();
-            break;
-          }
-          case 146: {
-            Field18 = input.ReadString();
-            break;
-          }
-          case 176: {
-            Field22 = input.ReadInt64();
-            break;
-          }
-          case 184: {
-            Field23 = input.ReadInt32();
-            break;
-          }
-          case 192: {
-            Field24 = input.ReadBool();
-            break;
-          }
-          case 200: {
-            Field25 = input.ReadInt32();
-            break;
-          }
-          case 232: {
-            Field29 = input.ReadInt32();
-            break;
-          }
-          case 240: {
-            Field30 = input.ReadBool();
-            break;
-          }
-          case 472: {
-            Field59 = input.ReadBool();
-            break;
-          }
-          case 480: {
-            Field60 = input.ReadInt32();
-            break;
-          }
-          case 536: {
-            Field67 = input.ReadInt32();
-            break;
-          }
-          case 544: {
-            Field68 = input.ReadInt32();
-            break;
-          }
-          case 624: {
-            Field78 = input.ReadBool();
-            break;
-          }
-          case 640: {
-            Field80 = input.ReadBool();
-            break;
-          }
-          case 648: {
-            Field81 = input.ReadBool();
-            break;
-          }
-          case 800: {
-            Field100 = input.ReadInt32();
-            break;
-          }
-          case 808: {
-            Field101 = input.ReadInt32();
-            break;
-          }
-          case 818: {
-            Field102 = input.ReadString();
-            break;
-          }
-          case 826: {
-            Field103 = input.ReadString();
-            break;
-          }
-          case 832: {
-            Field104 = input.ReadInt32();
-            break;
-          }
-          case 1024: {
-            Field128 = input.ReadInt32();
-            break;
-          }
-          case 1034: {
-            Field129 = input.ReadString();
-            break;
-          }
-          case 1040: {
-            Field130 = input.ReadInt32();
-            break;
-          }
-          case 1048: {
-            Field131 = input.ReadInt32();
-            break;
-          }
-          case 1200: {
-            Field150 = input.ReadInt32();
-            break;
-          }
-          case 2168: {
-            Field271 = input.ReadInt32();
-            break;
-          }
-          case 2176: {
-            Field272 = input.ReadInt32();
-            break;
-          }
-          case 2240: {
-            Field280 = input.ReadInt32();
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 10: {
-            Field1 = input.ReadString();
-            break;
-          }
-          case 16: {
-            Field2 = input.ReadInt32();
-            break;
-          }
-          case 24: {
-            Field3 = input.ReadInt32();
-            break;
-          }
-          case 34: {
-            Field4 = input.ReadString();
-            break;
-          }
-          case 42:
-          case 41: {
-            field5_.AddEntriesFrom(ref input, _repeated_field5_codec);
-            break;
-          }
-          case 48: {
-            Field6 = input.ReadInt32();
-            break;
-          }
-          case 58: {
-            Field7 = input.ReadString();
-            break;
-          }
-          case 74: {
-            Field9 = input.ReadString();
-            break;
-          }
-          case 96: {
-            Field12 = input.ReadBool();
-            break;
-          }
-          case 104: {
-            Field13 = input.ReadBool();
-            break;
-          }
-          case 112: {
-            Field14 = input.ReadBool();
-            break;
-          }
-          case 122: {
-            if (field15_ == null) {
-              Field15 = new global::Benchmarks.Proto3.GoogleMessage1SubMessage();
-            }
-            input.ReadMessage(Field15);
-            break;
-          }
-          case 128: {
-            Field16 = input.ReadInt32();
-            break;
-          }
-          case 136: {
-            Field17 = input.ReadBool();
-            break;
-          }
-          case 146: {
-            Field18 = input.ReadString();
-            break;
-          }
-          case 176: {
-            Field22 = input.ReadInt64();
-            break;
-          }
-          case 184: {
-            Field23 = input.ReadInt32();
-            break;
-          }
-          case 192: {
-            Field24 = input.ReadBool();
-            break;
-          }
-          case 200: {
-            Field25 = input.ReadInt32();
-            break;
-          }
-          case 232: {
-            Field29 = input.ReadInt32();
-            break;
-          }
-          case 240: {
-            Field30 = input.ReadBool();
-            break;
-          }
-          case 472: {
-            Field59 = input.ReadBool();
-            break;
-          }
-          case 480: {
-            Field60 = input.ReadInt32();
-            break;
-          }
-          case 536: {
-            Field67 = input.ReadInt32();
-            break;
-          }
-          case 544: {
-            Field68 = input.ReadInt32();
-            break;
-          }
-          case 624: {
-            Field78 = input.ReadBool();
-            break;
-          }
-          case 640: {
-            Field80 = input.ReadBool();
-            break;
-          }
-          case 648: {
-            Field81 = input.ReadBool();
-            break;
-          }
-          case 800: {
-            Field100 = input.ReadInt32();
-            break;
-          }
-          case 808: {
-            Field101 = input.ReadInt32();
-            break;
-          }
-          case 818: {
-            Field102 = input.ReadString();
-            break;
-          }
-          case 826: {
-            Field103 = input.ReadString();
-            break;
-          }
-          case 832: {
-            Field104 = input.ReadInt32();
-            break;
-          }
-          case 1024: {
-            Field128 = input.ReadInt32();
-            break;
-          }
-          case 1034: {
-            Field129 = input.ReadString();
-            break;
-          }
-          case 1040: {
-            Field130 = input.ReadInt32();
-            break;
-          }
-          case 1048: {
-            Field131 = input.ReadInt32();
-            break;
-          }
-          case 1200: {
-            Field150 = input.ReadInt32();
-            break;
-          }
-          case 2168: {
-            Field271 = input.ReadInt32();
-            break;
-          }
-          case 2176: {
-            Field272 = input.ReadInt32();
-            break;
-          }
-          case 2240: {
-            Field280 = input.ReadInt32();
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  public sealed partial class GoogleMessage1SubMessage : pb::IMessage<GoogleMessage1SubMessage>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<GoogleMessage1SubMessage> _parser = new pb::MessageParser<GoogleMessage1SubMessage>(() => new GoogleMessage1SubMessage());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<GoogleMessage1SubMessage> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Benchmarks.Proto3.BenchmarkMessage1Proto3Reflection.Descriptor.MessageTypes[1]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public GoogleMessage1SubMessage() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public GoogleMessage1SubMessage(GoogleMessage1SubMessage other) : this() {
-      field1_ = other.field1_;
-      field2_ = other.field2_;
-      field3_ = other.field3_;
-      field15_ = other.field15_;
-      field12_ = other.field12_;
-      field13_ = other.field13_;
-      field14_ = other.field14_;
-      field16_ = other.field16_;
-      field19_ = other.field19_;
-      field20_ = other.field20_;
-      field28_ = other.field28_;
-      field21_ = other.field21_;
-      field22_ = other.field22_;
-      field23_ = other.field23_;
-      field206_ = other.field206_;
-      field203_ = other.field203_;
-      field204_ = other.field204_;
-      field205_ = other.field205_;
-      field207_ = other.field207_;
-      field300_ = other.field300_;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public GoogleMessage1SubMessage Clone() {
-      return new GoogleMessage1SubMessage(this);
-    }
-
-    /// <summary>Field number for the "field1" field.</summary>
-    public const int Field1FieldNumber = 1;
-    private int field1_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int Field1 {
-      get { return field1_; }
-      set {
-        field1_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "field2" field.</summary>
-    public const int Field2FieldNumber = 2;
-    private int field2_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int Field2 {
-      get { return field2_; }
-      set {
-        field2_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "field3" field.</summary>
-    public const int Field3FieldNumber = 3;
-    private int field3_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int Field3 {
-      get { return field3_; }
-      set {
-        field3_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "field15" field.</summary>
-    public const int Field15FieldNumber = 15;
-    private string field15_ = "";
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string Field15 {
-      get { return field15_; }
-      set {
-        field15_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-
-    /// <summary>Field number for the "field12" field.</summary>
-    public const int Field12FieldNumber = 12;
-    private bool field12_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Field12 {
-      get { return field12_; }
-      set {
-        field12_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "field13" field.</summary>
-    public const int Field13FieldNumber = 13;
-    private long field13_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public long Field13 {
-      get { return field13_; }
-      set {
-        field13_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "field14" field.</summary>
-    public const int Field14FieldNumber = 14;
-    private long field14_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public long Field14 {
-      get { return field14_; }
-      set {
-        field14_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "field16" field.</summary>
-    public const int Field16FieldNumber = 16;
-    private int field16_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int Field16 {
-      get { return field16_; }
-      set {
-        field16_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "field19" field.</summary>
-    public const int Field19FieldNumber = 19;
-    private int field19_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int Field19 {
-      get { return field19_; }
-      set {
-        field19_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "field20" field.</summary>
-    public const int Field20FieldNumber = 20;
-    private bool field20_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Field20 {
-      get { return field20_; }
-      set {
-        field20_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "field28" field.</summary>
-    public const int Field28FieldNumber = 28;
-    private bool field28_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Field28 {
-      get { return field28_; }
-      set {
-        field28_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "field21" field.</summary>
-    public const int Field21FieldNumber = 21;
-    private ulong field21_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ulong Field21 {
-      get { return field21_; }
-      set {
-        field21_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "field22" field.</summary>
-    public const int Field22FieldNumber = 22;
-    private int field22_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int Field22 {
-      get { return field22_; }
-      set {
-        field22_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "field23" field.</summary>
-    public const int Field23FieldNumber = 23;
-    private bool field23_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Field23 {
-      get { return field23_; }
-      set {
-        field23_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "field206" field.</summary>
-    public const int Field206FieldNumber = 206;
-    private bool field206_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Field206 {
-      get { return field206_; }
-      set {
-        field206_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "field203" field.</summary>
-    public const int Field203FieldNumber = 203;
-    private uint field203_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public uint Field203 {
-      get { return field203_; }
-      set {
-        field203_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "field204" field.</summary>
-    public const int Field204FieldNumber = 204;
-    private int field204_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int Field204 {
-      get { return field204_; }
-      set {
-        field204_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "field205" field.</summary>
-    public const int Field205FieldNumber = 205;
-    private string field205_ = "";
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string Field205 {
-      get { return field205_; }
-      set {
-        field205_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-
-    /// <summary>Field number for the "field207" field.</summary>
-    public const int Field207FieldNumber = 207;
-    private ulong field207_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ulong Field207 {
-      get { return field207_; }
-      set {
-        field207_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "field300" field.</summary>
-    public const int Field300FieldNumber = 300;
-    private ulong field300_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ulong Field300 {
-      get { return field300_; }
-      set {
-        field300_ = value;
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as GoogleMessage1SubMessage);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(GoogleMessage1SubMessage other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (Field1 != other.Field1) return false;
-      if (Field2 != other.Field2) return false;
-      if (Field3 != other.Field3) return false;
-      if (Field15 != other.Field15) return false;
-      if (Field12 != other.Field12) return false;
-      if (Field13 != other.Field13) return false;
-      if (Field14 != other.Field14) return false;
-      if (Field16 != other.Field16) return false;
-      if (Field19 != other.Field19) return false;
-      if (Field20 != other.Field20) return false;
-      if (Field28 != other.Field28) return false;
-      if (Field21 != other.Field21) return false;
-      if (Field22 != other.Field22) return false;
-      if (Field23 != other.Field23) return false;
-      if (Field206 != other.Field206) return false;
-      if (Field203 != other.Field203) return false;
-      if (Field204 != other.Field204) return false;
-      if (Field205 != other.Field205) return false;
-      if (Field207 != other.Field207) return false;
-      if (Field300 != other.Field300) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (Field1 != 0) hash ^= Field1.GetHashCode();
-      if (Field2 != 0) hash ^= Field2.GetHashCode();
-      if (Field3 != 0) hash ^= Field3.GetHashCode();
-      if (Field15.Length != 0) hash ^= Field15.GetHashCode();
-      if (Field12 != false) hash ^= Field12.GetHashCode();
-      if (Field13 != 0L) hash ^= Field13.GetHashCode();
-      if (Field14 != 0L) hash ^= Field14.GetHashCode();
-      if (Field16 != 0) hash ^= Field16.GetHashCode();
-      if (Field19 != 0) hash ^= Field19.GetHashCode();
-      if (Field20 != false) hash ^= Field20.GetHashCode();
-      if (Field28 != false) hash ^= Field28.GetHashCode();
-      if (Field21 != 0UL) hash ^= Field21.GetHashCode();
-      if (Field22 != 0) hash ^= Field22.GetHashCode();
-      if (Field23 != false) hash ^= Field23.GetHashCode();
-      if (Field206 != false) hash ^= Field206.GetHashCode();
-      if (Field203 != 0) hash ^= Field203.GetHashCode();
-      if (Field204 != 0) hash ^= Field204.GetHashCode();
-      if (Field205.Length != 0) hash ^= Field205.GetHashCode();
-      if (Field207 != 0UL) hash ^= Field207.GetHashCode();
-      if (Field300 != 0UL) hash ^= Field300.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (Field1 != 0) {
-        output.WriteRawTag(8);
-        output.WriteInt32(Field1);
-      }
-      if (Field2 != 0) {
-        output.WriteRawTag(16);
-        output.WriteInt32(Field2);
-      }
-      if (Field3 != 0) {
-        output.WriteRawTag(24);
-        output.WriteInt32(Field3);
-      }
-      if (Field12 != false) {
-        output.WriteRawTag(96);
-        output.WriteBool(Field12);
-      }
-      if (Field13 != 0L) {
-        output.WriteRawTag(104);
-        output.WriteInt64(Field13);
-      }
-      if (Field14 != 0L) {
-        output.WriteRawTag(112);
-        output.WriteInt64(Field14);
-      }
-      if (Field15.Length != 0) {
-        output.WriteRawTag(122);
-        output.WriteString(Field15);
-      }
-      if (Field16 != 0) {
-        output.WriteRawTag(128, 1);
-        output.WriteInt32(Field16);
-      }
-      if (Field19 != 0) {
-        output.WriteRawTag(152, 1);
-        output.WriteInt32(Field19);
-      }
-      if (Field20 != false) {
-        output.WriteRawTag(160, 1);
-        output.WriteBool(Field20);
-      }
-      if (Field21 != 0UL) {
-        output.WriteRawTag(169, 1);
-        output.WriteFixed64(Field21);
-      }
-      if (Field22 != 0) {
-        output.WriteRawTag(176, 1);
-        output.WriteInt32(Field22);
-      }
-      if (Field23 != false) {
-        output.WriteRawTag(184, 1);
-        output.WriteBool(Field23);
-      }
-      if (Field28 != false) {
-        output.WriteRawTag(224, 1);
-        output.WriteBool(Field28);
-      }
-      if (Field203 != 0) {
-        output.WriteRawTag(221, 12);
-        output.WriteFixed32(Field203);
-      }
-      if (Field204 != 0) {
-        output.WriteRawTag(224, 12);
-        output.WriteInt32(Field204);
-      }
-      if (Field205.Length != 0) {
-        output.WriteRawTag(234, 12);
-        output.WriteString(Field205);
-      }
-      if (Field206 != false) {
-        output.WriteRawTag(240, 12);
-        output.WriteBool(Field206);
-      }
-      if (Field207 != 0UL) {
-        output.WriteRawTag(248, 12);
-        output.WriteUInt64(Field207);
-      }
-      if (Field300 != 0UL) {
-        output.WriteRawTag(224, 18);
-        output.WriteUInt64(Field300);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (Field1 != 0) {
-        output.WriteRawTag(8);
-        output.WriteInt32(Field1);
-      }
-      if (Field2 != 0) {
-        output.WriteRawTag(16);
-        output.WriteInt32(Field2);
-      }
-      if (Field3 != 0) {
-        output.WriteRawTag(24);
-        output.WriteInt32(Field3);
-      }
-      if (Field12 != false) {
-        output.WriteRawTag(96);
-        output.WriteBool(Field12);
-      }
-      if (Field13 != 0L) {
-        output.WriteRawTag(104);
-        output.WriteInt64(Field13);
-      }
-      if (Field14 != 0L) {
-        output.WriteRawTag(112);
-        output.WriteInt64(Field14);
-      }
-      if (Field15.Length != 0) {
-        output.WriteRawTag(122);
-        output.WriteString(Field15);
-      }
-      if (Field16 != 0) {
-        output.WriteRawTag(128, 1);
-        output.WriteInt32(Field16);
-      }
-      if (Field19 != 0) {
-        output.WriteRawTag(152, 1);
-        output.WriteInt32(Field19);
-      }
-      if (Field20 != false) {
-        output.WriteRawTag(160, 1);
-        output.WriteBool(Field20);
-      }
-      if (Field21 != 0UL) {
-        output.WriteRawTag(169, 1);
-        output.WriteFixed64(Field21);
-      }
-      if (Field22 != 0) {
-        output.WriteRawTag(176, 1);
-        output.WriteInt32(Field22);
-      }
-      if (Field23 != false) {
-        output.WriteRawTag(184, 1);
-        output.WriteBool(Field23);
-      }
-      if (Field28 != false) {
-        output.WriteRawTag(224, 1);
-        output.WriteBool(Field28);
-      }
-      if (Field203 != 0) {
-        output.WriteRawTag(221, 12);
-        output.WriteFixed32(Field203);
-      }
-      if (Field204 != 0) {
-        output.WriteRawTag(224, 12);
-        output.WriteInt32(Field204);
-      }
-      if (Field205.Length != 0) {
-        output.WriteRawTag(234, 12);
-        output.WriteString(Field205);
-      }
-      if (Field206 != false) {
-        output.WriteRawTag(240, 12);
-        output.WriteBool(Field206);
-      }
-      if (Field207 != 0UL) {
-        output.WriteRawTag(248, 12);
-        output.WriteUInt64(Field207);
-      }
-      if (Field300 != 0UL) {
-        output.WriteRawTag(224, 18);
-        output.WriteUInt64(Field300);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (Field1 != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(Field1);
-      }
-      if (Field2 != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(Field2);
-      }
-      if (Field3 != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(Field3);
-      }
-      if (Field15.Length != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(Field15);
-      }
-      if (Field12 != false) {
-        size += 1 + 1;
-      }
-      if (Field13 != 0L) {
-        size += 1 + pb::CodedOutputStream.ComputeInt64Size(Field13);
-      }
-      if (Field14 != 0L) {
-        size += 1 + pb::CodedOutputStream.ComputeInt64Size(Field14);
-      }
-      if (Field16 != 0) {
-        size += 2 + pb::CodedOutputStream.ComputeInt32Size(Field16);
-      }
-      if (Field19 != 0) {
-        size += 2 + pb::CodedOutputStream.ComputeInt32Size(Field19);
-      }
-      if (Field20 != false) {
-        size += 2 + 1;
-      }
-      if (Field28 != false) {
-        size += 2 + 1;
-      }
-      if (Field21 != 0UL) {
-        size += 2 + 8;
-      }
-      if (Field22 != 0) {
-        size += 2 + pb::CodedOutputStream.ComputeInt32Size(Field22);
-      }
-      if (Field23 != false) {
-        size += 2 + 1;
-      }
-      if (Field206 != false) {
-        size += 2 + 1;
-      }
-      if (Field203 != 0) {
-        size += 2 + 4;
-      }
-      if (Field204 != 0) {
-        size += 2 + pb::CodedOutputStream.ComputeInt32Size(Field204);
-      }
-      if (Field205.Length != 0) {
-        size += 2 + pb::CodedOutputStream.ComputeStringSize(Field205);
-      }
-      if (Field207 != 0UL) {
-        size += 2 + pb::CodedOutputStream.ComputeUInt64Size(Field207);
-      }
-      if (Field300 != 0UL) {
-        size += 2 + pb::CodedOutputStream.ComputeUInt64Size(Field300);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(GoogleMessage1SubMessage other) {
-      if (other == null) {
-        return;
-      }
-      if (other.Field1 != 0) {
-        Field1 = other.Field1;
-      }
-      if (other.Field2 != 0) {
-        Field2 = other.Field2;
-      }
-      if (other.Field3 != 0) {
-        Field3 = other.Field3;
-      }
-      if (other.Field15.Length != 0) {
-        Field15 = other.Field15;
-      }
-      if (other.Field12 != false) {
-        Field12 = other.Field12;
-      }
-      if (other.Field13 != 0L) {
-        Field13 = other.Field13;
-      }
-      if (other.Field14 != 0L) {
-        Field14 = other.Field14;
-      }
-      if (other.Field16 != 0) {
-        Field16 = other.Field16;
-      }
-      if (other.Field19 != 0) {
-        Field19 = other.Field19;
-      }
-      if (other.Field20 != false) {
-        Field20 = other.Field20;
-      }
-      if (other.Field28 != false) {
-        Field28 = other.Field28;
-      }
-      if (other.Field21 != 0UL) {
-        Field21 = other.Field21;
-      }
-      if (other.Field22 != 0) {
-        Field22 = other.Field22;
-      }
-      if (other.Field23 != false) {
-        Field23 = other.Field23;
-      }
-      if (other.Field206 != false) {
-        Field206 = other.Field206;
-      }
-      if (other.Field203 != 0) {
-        Field203 = other.Field203;
-      }
-      if (other.Field204 != 0) {
-        Field204 = other.Field204;
-      }
-      if (other.Field205.Length != 0) {
-        Field205 = other.Field205;
-      }
-      if (other.Field207 != 0UL) {
-        Field207 = other.Field207;
-      }
-      if (other.Field300 != 0UL) {
-        Field300 = other.Field300;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 8: {
-            Field1 = input.ReadInt32();
-            break;
-          }
-          case 16: {
-            Field2 = input.ReadInt32();
-            break;
-          }
-          case 24: {
-            Field3 = input.ReadInt32();
-            break;
-          }
-          case 96: {
-            Field12 = input.ReadBool();
-            break;
-          }
-          case 104: {
-            Field13 = input.ReadInt64();
-            break;
-          }
-          case 112: {
-            Field14 = input.ReadInt64();
-            break;
-          }
-          case 122: {
-            Field15 = input.ReadString();
-            break;
-          }
-          case 128: {
-            Field16 = input.ReadInt32();
-            break;
-          }
-          case 152: {
-            Field19 = input.ReadInt32();
-            break;
-          }
-          case 160: {
-            Field20 = input.ReadBool();
-            break;
-          }
-          case 169: {
-            Field21 = input.ReadFixed64();
-            break;
-          }
-          case 176: {
-            Field22 = input.ReadInt32();
-            break;
-          }
-          case 184: {
-            Field23 = input.ReadBool();
-            break;
-          }
-          case 224: {
-            Field28 = input.ReadBool();
-            break;
-          }
-          case 1629: {
-            Field203 = input.ReadFixed32();
-            break;
-          }
-          case 1632: {
-            Field204 = input.ReadInt32();
-            break;
-          }
-          case 1642: {
-            Field205 = input.ReadString();
-            break;
-          }
-          case 1648: {
-            Field206 = input.ReadBool();
-            break;
-          }
-          case 1656: {
-            Field207 = input.ReadUInt64();
-            break;
-          }
-          case 2400: {
-            Field300 = input.ReadUInt64();
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 8: {
-            Field1 = input.ReadInt32();
-            break;
-          }
-          case 16: {
-            Field2 = input.ReadInt32();
-            break;
-          }
-          case 24: {
-            Field3 = input.ReadInt32();
-            break;
-          }
-          case 96: {
-            Field12 = input.ReadBool();
-            break;
-          }
-          case 104: {
-            Field13 = input.ReadInt64();
-            break;
-          }
-          case 112: {
-            Field14 = input.ReadInt64();
-            break;
-          }
-          case 122: {
-            Field15 = input.ReadString();
-            break;
-          }
-          case 128: {
-            Field16 = input.ReadInt32();
-            break;
-          }
-          case 152: {
-            Field19 = input.ReadInt32();
-            break;
-          }
-          case 160: {
-            Field20 = input.ReadBool();
-            break;
-          }
-          case 169: {
-            Field21 = input.ReadFixed64();
-            break;
-          }
-          case 176: {
-            Field22 = input.ReadInt32();
-            break;
-          }
-          case 184: {
-            Field23 = input.ReadBool();
-            break;
-          }
-          case 224: {
-            Field28 = input.ReadBool();
-            break;
-          }
-          case 1629: {
-            Field203 = input.ReadFixed32();
-            break;
-          }
-          case 1632: {
-            Field204 = input.ReadInt32();
-            break;
-          }
-          case 1642: {
-            Field205 = input.ReadString();
-            break;
-          }
-          case 1648: {
-            Field206 = input.ReadBool();
-            break;
-          }
-          case 1656: {
-            Field207 = input.ReadUInt64();
-            break;
-          }
-          case 2400: {
-            Field300 = input.ReadUInt64();
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  #endregion
-
-}
-
-#endregion Designer generated code
diff --git a/libs/protobuf/csharp/src/Google.Protobuf.Benchmarks/Benchmarks.cs b/libs/protobuf/csharp/src/Google.Protobuf.Benchmarks/Benchmarks.cs
deleted file mode 100644
index a05802d..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf.Benchmarks/Benchmarks.cs
+++ /dev/null
@@ -1,325 +0,0 @@
-// <auto-generated>
-//     Generated by the protocol buffer compiler.  DO NOT EDIT!
-//     source: benchmarks.proto
-// </auto-generated>
-#pragma warning disable 1591, 0612, 3021, 8981
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-namespace Benchmarks {
-
-  /// <summary>Holder for reflection information generated from benchmarks.proto</summary>
-  public static partial class BenchmarksReflection {
-
-    #region Descriptor
-    /// <summary>File descriptor for benchmarks.proto</summary>
-    public static pbr::FileDescriptor Descriptor {
-      get { return descriptor; }
-    }
-    private static pbr::FileDescriptor descriptor;
-
-    static BenchmarksReflection() {
-      byte[] descriptorData = global::System.Convert.FromBase64String(
-          string.Concat(
-            "ChBiZW5jaG1hcmtzLnByb3RvEgpiZW5jaG1hcmtzIkcKEEJlbmNobWFya0Rh",
-            "dGFzZXQSDAoEbmFtZRgBIAEoCRIUCgxtZXNzYWdlX25hbWUYAiABKAkSDwoH",
-            "cGF5bG9hZBgDIAMoDEIgCh5jb20uZ29vZ2xlLnByb3RvYnVmLmJlbmNobWFy",
-            "a3NiBnByb3RvMw=="));
-      descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-          new pbr::FileDescriptor[] { },
-          new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::Benchmarks.BenchmarkDataset), global::Benchmarks.BenchmarkDataset.Parser, new[]{ "Name", "MessageName", "Payload" }, null, null, null, null)
-          }));
-    }
-    #endregion
-
-  }
-  #region Messages
-  public sealed partial class BenchmarkDataset : pb::IMessage<BenchmarkDataset>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<BenchmarkDataset> _parser = new pb::MessageParser<BenchmarkDataset>(() => new BenchmarkDataset());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<BenchmarkDataset> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Benchmarks.BenchmarksReflection.Descriptor.MessageTypes[0]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public BenchmarkDataset() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public BenchmarkDataset(BenchmarkDataset other) : this() {
-      name_ = other.name_;
-      messageName_ = other.messageName_;
-      payload_ = other.payload_.Clone();
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public BenchmarkDataset Clone() {
-      return new BenchmarkDataset(this);
-    }
-
-    /// <summary>Field number for the "name" field.</summary>
-    public const int NameFieldNumber = 1;
-    private string name_ = "";
-    /// <summary>
-    /// Name of the benchmark dataset.  This should be unique across all datasets.
-    /// Should only contain word characters: [a-zA-Z0-9_]
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string Name {
-      get { return name_; }
-      set {
-        name_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-
-    /// <summary>Field number for the "message_name" field.</summary>
-    public const int MessageNameFieldNumber = 2;
-    private string messageName_ = "";
-    /// <summary>
-    /// Fully-qualified name of the protobuf message for this dataset.
-    /// It will be one of the messages defined benchmark_messages_proto2.proto
-    /// or benchmark_messages_proto3.proto.
-    ///
-    /// Implementations that do not support reflection can implement this with
-    /// an explicit "if/else" chain that lists every known message defined
-    /// in those files.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string MessageName {
-      get { return messageName_; }
-      set {
-        messageName_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-
-    /// <summary>Field number for the "payload" field.</summary>
-    public const int PayloadFieldNumber = 3;
-    private static readonly pb::FieldCodec<pb::ByteString> _repeated_payload_codec
-        = pb::FieldCodec.ForBytes(26);
-    private readonly pbc::RepeatedField<pb::ByteString> payload_ = new pbc::RepeatedField<pb::ByteString>();
-    /// <summary>
-    /// The payload(s) for this dataset.  They should be parsed or serialized
-    /// in sequence, in a loop, ie.
-    ///
-    ///  while (!benchmarkDone) {  // Benchmark runner decides when to exit.
-    ///    for (i = 0; i &lt; benchmark.payload.length; i++) {
-    ///      parse(benchmark.payload[i])
-    ///    }
-    ///  }
-    ///
-    /// This is intended to let datasets include a variety of data to provide
-    /// potentially more realistic results than just parsing the same message
-    /// over and over.  A single message parsed repeatedly could yield unusually
-    /// good branch prediction performance.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<pb::ByteString> Payload {
-      get { return payload_; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as BenchmarkDataset);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(BenchmarkDataset other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (Name != other.Name) return false;
-      if (MessageName != other.MessageName) return false;
-      if(!payload_.Equals(other.payload_)) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (Name.Length != 0) hash ^= Name.GetHashCode();
-      if (MessageName.Length != 0) hash ^= MessageName.GetHashCode();
-      hash ^= payload_.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (Name.Length != 0) {
-        output.WriteRawTag(10);
-        output.WriteString(Name);
-      }
-      if (MessageName.Length != 0) {
-        output.WriteRawTag(18);
-        output.WriteString(MessageName);
-      }
-      payload_.WriteTo(output, _repeated_payload_codec);
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (Name.Length != 0) {
-        output.WriteRawTag(10);
-        output.WriteString(Name);
-      }
-      if (MessageName.Length != 0) {
-        output.WriteRawTag(18);
-        output.WriteString(MessageName);
-      }
-      payload_.WriteTo(ref output, _repeated_payload_codec);
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (Name.Length != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(Name);
-      }
-      if (MessageName.Length != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(MessageName);
-      }
-      size += payload_.CalculateSize(_repeated_payload_codec);
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(BenchmarkDataset other) {
-      if (other == null) {
-        return;
-      }
-      if (other.Name.Length != 0) {
-        Name = other.Name;
-      }
-      if (other.MessageName.Length != 0) {
-        MessageName = other.MessageName;
-      }
-      payload_.Add(other.payload_);
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 10: {
-            Name = input.ReadString();
-            break;
-          }
-          case 18: {
-            MessageName = input.ReadString();
-            break;
-          }
-          case 26: {
-            payload_.AddEntriesFrom(input, _repeated_payload_codec);
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 10: {
-            Name = input.ReadString();
-            break;
-          }
-          case 18: {
-            MessageName = input.ReadString();
-            break;
-          }
-          case 26: {
-            payload_.AddEntriesFrom(ref input, _repeated_payload_codec);
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  #endregion
-
-}
-
-#endregion Designer generated code
diff --git a/libs/protobuf/csharp/src/Google.Protobuf.Benchmarks/ByteStringBenchmark.cs b/libs/protobuf/csharp/src/Google.Protobuf.Benchmarks/ByteStringBenchmark.cs
deleted file mode 100644
index a755850..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf.Benchmarks/ByteStringBenchmark.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2019 Google Inc.  All rights reserved.
-// https://github.com/protocolbuffers/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using BenchmarkDotNet.Attributes;
-
-namespace Google.Protobuf.Benchmarks
-{
-    /// <summary>
-    /// Benchmarks using ByteString.
-    /// </summary>
-    [MemoryDiagnoser]
-    public class ByteStringBenchmark
-    {
-        private const int Zero = 0;
-        private const int Kilobyte = 1024;
-        private const int _128Kilobytes = 1024 * 128;
-        private const int Megabyte = 1024 * 1024;
-        private const int _10Megabytes = 1024 * 1024 * 10;
-
-        byte[] byteBuffer;
-
-        [GlobalSetup]
-        public void GlobalSetup()
-        {
-            byteBuffer = new byte[PayloadSize];
-        }
-
-        [Params(Zero, Kilobyte, _128Kilobytes, Megabyte, _10Megabytes)]
-        public int PayloadSize { get; set; }
-
-        [Benchmark]
-        public ByteString CopyFrom()
-        {
-            return ByteString.CopyFrom(byteBuffer);
-        }
-
-        [Benchmark]
-        public ByteString UnsafeWrap()
-        {
-            return UnsafeByteOperations.UnsafeWrap(byteBuffer);
-        }
-    }
-}
diff --git a/libs/protobuf/csharp/src/Google.Protobuf.Benchmarks/Google.Protobuf.Benchmarks.csproj b/libs/protobuf/csharp/src/Google.Protobuf.Benchmarks/Google.Protobuf.Benchmarks.csproj
deleted file mode 100644
index fee5f65..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf.Benchmarks/Google.Protobuf.Benchmarks.csproj
+++ /dev/null
@@ -1,26 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
-    <AssemblyOriginatorKeyFile>../../keys/Google.Protobuf.snk</AssemblyOriginatorKeyFile>
-    <SignAssembly>true</SignAssembly>
-    <IsPackable>False</IsPackable>
-    <DebugType>pdbonly</DebugType>
-    <DebugSymbols>true</DebugSymbols>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Include="..\Google.Protobuf.Test\ReadOnlySequenceFactory.cs" Link="ReadOnlySequenceFactory.cs" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" Version="0.13.1" />
-    <ProjectReference Include="..\Google.Protobuf\Google.Protobuf.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <EmbeddedResource Include="..\..\..\benchmarks\datasets\google_message1\proto3\dataset.google_message1_proto3.pb" />
-  </ItemGroup>
-
-</Project>
diff --git a/libs/protobuf/csharp/src/Google.Protobuf.Benchmarks/GoogleMessageBenchmark.cs b/libs/protobuf/csharp/src/Google.Protobuf.Benchmarks/GoogleMessageBenchmark.cs
deleted file mode 100644
index 40fb3ba..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf.Benchmarks/GoogleMessageBenchmark.cs
+++ /dev/null
@@ -1,124 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2019 Google Inc.  All rights reserved.
-// https://github.com/protocolbuffers/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using BenchmarkDotNet.Attributes;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-
-namespace Google.Protobuf.Benchmarks
-{
-    /// <summary>
-    /// Benchmark for serializing and deserializing of standard datasets that are also
-    /// measured by benchmarks in other languages.
-    /// Over time we may wish to test the various different approaches to serialization and deserialization separately.
-    /// See https://github.com/protocolbuffers/protobuf/blob/main/benchmarks/README.md
-    /// See https://github.com/protocolbuffers/protobuf/blob/main/docs/performance.md
-    /// </summary>
-    [MemoryDiagnoser]
-    public class GoogleMessageBenchmark
-    {
-        /// <summary>
-        /// All the datasets to be tested. Add more datasets to the array as they're available.
-        /// (When C# supports proto2, this will increase significantly.)
-        /// </summary>
-        public static BenchmarkDatasetConfig[] DatasetConfigurations => new[]
-        {
-            // short name is specified to make results table more readable
-            new BenchmarkDatasetConfig("dataset.google_message1_proto3.pb", "goog_msg1_proto3")
-        };
-
-        [ParamsSource(nameof(DatasetConfigurations))]
-        public BenchmarkDatasetConfig Dataset { get; set; }
-
-        private MessageParser parser;
-        /// <summary>
-        /// Each data set can contain multiple messages in a single file.
-        /// Each "write" operation should write each message in turn, and each "parse"
-        /// operation should parse each message in turn.
-        /// </summary>
-        private List<SubTest> subTests;
-
-        [GlobalSetup]
-        public void GlobalSetup()
-        {
-            parser = Dataset.Parser;
-            subTests = Dataset.Payloads.Select(p => new SubTest(p, parser.ParseFrom(p))).ToList();
-        }
-
-        [Benchmark]
-        public void WriteToStream() => subTests.ForEach(item => item.WriteToStream());
-
-        [Benchmark]
-        public void ToByteArray() => subTests.ForEach(item => item.ToByteArray());
-
-        [Benchmark]
-        public void ParseFromByteArray() => subTests.ForEach(item => item.ParseFromByteArray(parser));
-
-        [Benchmark]
-        public void ParseFromStream() => subTests.ForEach(item => item.ParseFromStream(parser));
-
-        private class SubTest
-        {
-            private readonly Stream destinationStream;
-            private readonly Stream sourceStream;
-            private readonly byte[] data;
-            private readonly IMessage message;
-
-            public SubTest(byte[] data, IMessage message)
-            {
-                destinationStream = new MemoryStream(data.Length);
-                sourceStream = new MemoryStream(data);
-                this.data = data;
-                this.message = message;
-            }
-
-            public void Reset() => destinationStream.Position = 0;
-
-            public void WriteToStream()
-            {
-                destinationStream.Position = 0;
-                message.WriteTo(destinationStream);
-            }
-
-            public void ToByteArray() => message.ToByteArray();
-
-            public void ParseFromByteArray(MessageParser parser) => parser.ParseFrom(data);
-
-            public void ParseFromStream(MessageParser parser)
-            {
-                sourceStream.Position = 0;
-                parser.ParseFrom(sourceStream);
-            }
-        }
-    }
-}
diff --git a/libs/protobuf/csharp/src/Google.Protobuf.Benchmarks/ParseMessagesBenchmark.cs b/libs/protobuf/csharp/src/Google.Protobuf.Benchmarks/ParseMessagesBenchmark.cs
deleted file mode 100644
index 8e6710b..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf.Benchmarks/ParseMessagesBenchmark.cs
+++ /dev/null
@@ -1,258 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2019 Google Inc.  All rights reserved.
-// https://github.com/protocolbuffers/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using BenchmarkDotNet.Attributes;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Buffers;
-using Google.Protobuf.WellKnownTypes;
-using Benchmarks.Proto3;
-
-namespace Google.Protobuf.Benchmarks
-{
-    /// <summary>
-    /// Benchmark that tests parsing performance for various messages.
-    /// </summary>
-    [MemoryDiagnoser]
-    public class ParseMessagesBenchmark
-    {
-        const int MaxMessages = 100;
-
-        SubTest manyWrapperFieldsTest = new SubTest(CreateManyWrapperFieldsMessage(), ManyWrapperFieldsMessage.Parser, () => new ManyWrapperFieldsMessage(), MaxMessages);
-        SubTest manyPrimitiveFieldsTest = new SubTest(CreateManyPrimitiveFieldsMessage(), ManyPrimitiveFieldsMessage.Parser, () => new ManyPrimitiveFieldsMessage(), MaxMessages);
-        SubTest repeatedFieldTest = new SubTest(CreateRepeatedFieldMessage(), GoogleMessage1.Parser, () => new GoogleMessage1(), MaxMessages);
-        SubTest emptyMessageTest = new SubTest(new Empty(), Empty.Parser, () => new Empty(), MaxMessages);
-
-        public IEnumerable<int> MessageCountValues => new[] { 10, 100 };
-
-        [GlobalSetup]
-        public void GlobalSetup()
-        {
-        }
-
-        [Benchmark]
-        public IMessage ManyWrapperFieldsMessage_ParseFromByteArray()
-        {
-            return manyWrapperFieldsTest.ParseFromByteArray();
-        }
-
-        [Benchmark]
-        public IMessage ManyWrapperFieldsMessage_ParseFromReadOnlySequence()
-        {
-            return manyWrapperFieldsTest.ParseFromReadOnlySequence();
-        }
-
-        [Benchmark]
-        public IMessage ManyPrimitiveFieldsMessage_ParseFromByteArray()
-        {
-            return manyPrimitiveFieldsTest.ParseFromByteArray();
-        }
-
-        [Benchmark]
-        public IMessage ManyPrimitiveFieldsMessage_ParseFromReadOnlySequence()
-        {
-            return manyPrimitiveFieldsTest.ParseFromReadOnlySequence();
-        }
-
-        [Benchmark]
-        public IMessage RepeatedFieldMessage_ParseFromByteArray()
-        {
-            return repeatedFieldTest.ParseFromByteArray();
-        }
-
-        [Benchmark]
-        public IMessage RepeatedFieldMessage_ParseFromReadOnlySequence()
-        {
-            return repeatedFieldTest.ParseFromReadOnlySequence();
-        }
-
-        [Benchmark]
-        public IMessage EmptyMessage_ParseFromByteArray()
-        {
-            return emptyMessageTest.ParseFromByteArray();
-        }
-
-        [Benchmark]
-        public IMessage EmptyMessage_ParseFromReadOnlySequence()
-        {
-            return emptyMessageTest.ParseFromReadOnlySequence();
-        }
-
-        [Benchmark]
-        [ArgumentsSource(nameof(MessageCountValues))]
-        public void ManyWrapperFieldsMessage_ParseDelimitedMessagesFromByteArray(int messageCount)
-        {
-            manyWrapperFieldsTest.ParseDelimitedMessagesFromByteArray(messageCount);
-        }
-
-        [Benchmark]
-        [ArgumentsSource(nameof(MessageCountValues))]
-        public void ManyWrapperFieldsMessage_ParseDelimitedMessagesFromReadOnlySequence(int messageCount)
-        {
-            manyWrapperFieldsTest.ParseDelimitedMessagesFromReadOnlySequence(messageCount);
-        }
-
-        [Benchmark]
-        [ArgumentsSource(nameof(MessageCountValues))]
-        public void ManyPrimitiveFieldsMessage_ParseDelimitedMessagesFromByteArray(int messageCount)
-        {
-            manyPrimitiveFieldsTest.ParseDelimitedMessagesFromByteArray(messageCount);
-        }
-
-        [Benchmark]
-        [ArgumentsSource(nameof(MessageCountValues))]
-        public void ManyPrimitiveFieldsMessage_ParseDelimitedMessagesFromReadOnlySequence(int messageCount)
-        {
-            manyPrimitiveFieldsTest.ParseDelimitedMessagesFromReadOnlySequence(messageCount);
-        }
-
-        [Benchmark]
-        [ArgumentsSource(nameof(MessageCountValues))]
-        public void RepeatedFieldMessage_ParseDelimitedMessagesFromByteArray(int messageCount)
-        {
-            repeatedFieldTest.ParseDelimitedMessagesFromByteArray(messageCount);
-        }
-
-        [Benchmark]
-        [ArgumentsSource(nameof(MessageCountValues))]
-        public void RepeatedFieldMessage_ParseDelimitedMessagesFromReadOnlySequence(int messageCount)
-        {
-            repeatedFieldTest.ParseDelimitedMessagesFromReadOnlySequence(messageCount);
-        }
-
-        public static ManyWrapperFieldsMessage CreateManyWrapperFieldsMessage()
-        {
-            // Example data match data of an internal benchmarks
-            return new ManyWrapperFieldsMessage()
-            {
-                Int64Field19 = 123,
-                Int64Field37 = 1000032,
-                Int64Field26 = 3453524500,
-                DoubleField79 = 1.2,
-                DoubleField25 = 234,
-                DoubleField9 = 123.3,
-                DoubleField28 = 23,
-                DoubleField7 = 234,
-                DoubleField50 = 2.45
-            };
-        }
-
-        public static ManyPrimitiveFieldsMessage CreateManyPrimitiveFieldsMessage()
-        {
-            // Example data match data of an internal benchmarks
-            return new ManyPrimitiveFieldsMessage()
-            {
-                Int64Field19 = 123,
-                Int64Field37 = 1000032,
-                Int64Field26 = 3453524500,
-                DoubleField79 = 1.2,
-                DoubleField25 = 234,
-                DoubleField9 = 123.3,
-                DoubleField28 = 23,
-                DoubleField7 = 234,
-                DoubleField50 = 2.45
-            };
-        }
-
-        public static GoogleMessage1 CreateRepeatedFieldMessage()
-        {
-            // Message with a repeated fixed length item collection
-            var message = new GoogleMessage1();
-            for (ulong i = 0; i < 1000; i++)
-            {
-                message.Field5.Add(i);
-            }
-            return message;
-        }
-
-        private class SubTest
-        {
-            private readonly IMessage message;
-            private readonly MessageParser parser;
-            private readonly Func<IMessage> factory;
-            private readonly byte[] data;
-            private readonly byte[] multipleMessagesData;
-
-            private ReadOnlySequence<byte> dataSequence;
-            private ReadOnlySequence<byte> multipleMessagesDataSequence;
-
-            public SubTest(IMessage message, MessageParser parser, Func<IMessage> factory, int maxMessageCount)
-            {
-                this.message = message;
-                this.parser = parser;
-                this.factory = factory;
-                this.data = message.ToByteArray();
-                this.multipleMessagesData = CreateBufferWithMultipleMessages(message, maxMessageCount);
-                this.dataSequence = new ReadOnlySequence<byte>(this.data);
-                this.multipleMessagesDataSequence = new ReadOnlySequence<byte>(this.multipleMessagesData);
-            }
-
-            public IMessage ParseFromByteArray() => parser.ParseFrom(data);
-
-            public IMessage ParseFromReadOnlySequence() => parser.ParseFrom(dataSequence);
-
-            public void ParseDelimitedMessagesFromByteArray(int messageCount)
-            {
-                var input = new CodedInputStream(multipleMessagesData);
-                for (int i = 0; i < messageCount; i++)
-                {
-                    var msg = factory();
-                    input.ReadMessage(msg);
-                }
-            }
-
-            public void ParseDelimitedMessagesFromReadOnlySequence(int messageCount)
-            {
-                ParseContext.Initialize(multipleMessagesDataSequence, out ParseContext ctx);
-                for (int i = 0; i < messageCount; i++)
-                {
-                    var msg = factory();
-                    ctx.ReadMessage(msg);
-                }
-            }
-
-            private static byte[] CreateBufferWithMultipleMessages(IMessage msg, int msgCount)
-            {
-                var ms = new MemoryStream();
-                var cos = new CodedOutputStream(ms);
-                for (int i = 0; i < msgCount; i++)
-                {
-                    cos.WriteMessage(msg);
-                }
-                cos.Flush();
-                return ms.ToArray();
-            }
-        }
-    }
-}
diff --git a/libs/protobuf/csharp/src/Google.Protobuf.Benchmarks/ParseRawPrimitivesBenchmark.cs b/libs/protobuf/csharp/src/Google.Protobuf.Benchmarks/ParseRawPrimitivesBenchmark.cs
deleted file mode 100644
index 6df1c87..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf.Benchmarks/ParseRawPrimitivesBenchmark.cs
+++ /dev/null
@@ -1,536 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2019 Google Inc.  All rights reserved.
-// https://github.com/protocolbuffers/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using BenchmarkDotNet.Attributes;
-using System;
-using System.Buffers.Binary;
-using System.Collections.Generic;
-using System.IO;
-using System.Buffers;
-
-namespace Google.Protobuf.Benchmarks
-{
-    /// <summary>
-    /// Benchmarks throughput when parsing raw primitives.
-    /// </summary>
-    [MemoryDiagnoser]
-    public class ParseRawPrimitivesBenchmark
-    {
-        // key is the encodedSize of varint values
-        Dictionary<int, byte[]> varintInputBuffers;
-
-        byte[] doubleInputBuffer;
-        byte[] floatInputBuffer;
-        byte[] fixedIntInputBuffer;
-
-        // key is the encodedSize of string values
-        Dictionary<int, byte[]> stringInputBuffers;
-        Dictionary<int, ReadOnlySequence<byte>> stringInputBuffersSegmented;
-
-        Random random = new Random(417384220);  // random but deterministic seed
-
-        public IEnumerable<int> StringEncodedSizes => new[] { 1, 4, 10, 105, 10080 };
-        public IEnumerable<int> StringSegmentedEncodedSizes => new[] { 105, 10080 };
-
-        [GlobalSetup]
-        public void GlobalSetup()
-        {
-            // add some extra values that we won't read just to make sure we are far enough from the end of the buffer
-            // which allows the parser fastpath to always kick in.
-            const int paddingValueCount = 100;
-
-            varintInputBuffers = new Dictionary<int, byte[]>();
-            for (int encodedSize = 1; encodedSize <= 10; encodedSize++)
-            {
-                byte[] buffer = CreateBufferWithRandomVarints(random, BytesToParse / encodedSize, encodedSize, paddingValueCount);
-                varintInputBuffers.Add(encodedSize, buffer);
-            }
-
-            doubleInputBuffer = CreateBufferWithRandomDoubles(random, BytesToParse / sizeof(double), paddingValueCount);
-            floatInputBuffer = CreateBufferWithRandomFloats(random, BytesToParse / sizeof(float), paddingValueCount);
-            fixedIntInputBuffer = CreateBufferWithRandomData(random, BytesToParse / sizeof(long), sizeof(long), paddingValueCount);
-
-            stringInputBuffers = new Dictionary<int, byte[]>();
-            foreach (var encodedSize in StringEncodedSizes)
-            {
-                byte[] buffer = CreateBufferWithStrings(BytesToParse / encodedSize, encodedSize, encodedSize < 10 ? 10 : 1 );
-                stringInputBuffers.Add(encodedSize, buffer);
-            }
-
-            stringInputBuffersSegmented = new Dictionary<int, ReadOnlySequence<byte>>();
-            foreach (var encodedSize in StringSegmentedEncodedSizes)
-            {
-                byte[] buffer = CreateBufferWithStrings(BytesToParse / encodedSize, encodedSize, encodedSize < 10 ? 10 : 1);
-                stringInputBuffersSegmented.Add(encodedSize, ReadOnlySequenceFactory.CreateWithContent(buffer, segmentSize: 128, addEmptySegmentDelimiters: false));
-            }
-        }
-
-        // Total number of bytes that each benchmark will parse.
-        // Measuring the time taken to parse buffer of given size makes it easier to compare parsing speed for different
-        // types and makes it easy to calculate the througput (in MB/s)
-        // 10800 bytes is chosen because it is divisible by all possible encoded sizes for all primitive types {1..10}
-        [Params(10080)]
-        public int BytesToParse { get; set; }
-
-        [Benchmark]
-        [Arguments(1)]
-        [Arguments(2)]
-        [Arguments(3)]
-        [Arguments(4)]
-        [Arguments(5)]
-        public int ParseRawVarint32_CodedInputStream(int encodedSize)
-        {
-            CodedInputStream cis = new CodedInputStream(varintInputBuffers[encodedSize]);
-            int sum = 0;
-            for (int i = 0; i < BytesToParse / encodedSize; i++)
-            {
-                sum += cis.ReadInt32();
-            }
-            return sum;
-        }
-
-        [Benchmark]
-        [Arguments(1)]
-        [Arguments(2)]
-        [Arguments(3)]
-        [Arguments(4)]
-        [Arguments(5)]
-        public int ParseRawVarint32_ParseContext(int encodedSize)
-        {
-            InitializeParseContext(varintInputBuffers[encodedSize], out ParseContext ctx);
-            int sum = 0;
-            for (int i = 0; i < BytesToParse / encodedSize; i++)
-            {
-                sum += ctx.ReadInt32();
-            }
-            return sum;
-        }
-
-        [Benchmark]
-        [Arguments(1)]
-        [Arguments(2)]
-        [Arguments(3)]
-        [Arguments(4)]
-        [Arguments(5)]
-        [Arguments(6)]
-        [Arguments(7)]
-        [Arguments(8)]
-        [Arguments(9)]
-        [Arguments(10)]
-        public long ParseRawVarint64_CodedInputStream(int encodedSize)
-        {
-            CodedInputStream cis = new CodedInputStream(varintInputBuffers[encodedSize]);
-            long sum = 0;
-            for (int i = 0; i < BytesToParse / encodedSize; i++)
-            {
-                sum += cis.ReadInt64();
-            }
-            return sum;
-        }
-
-        [Benchmark]
-        [Arguments(1)]
-        [Arguments(2)]
-        [Arguments(3)]
-        [Arguments(4)]
-        [Arguments(5)]
-        [Arguments(6)]
-        [Arguments(7)]
-        [Arguments(8)]
-        [Arguments(9)]
-        [Arguments(10)]
-        public long ParseRawVarint64_ParseContext(int encodedSize)
-        {
-            InitializeParseContext(varintInputBuffers[encodedSize], out ParseContext ctx);
-            long sum = 0;
-            for (int i = 0; i < BytesToParse / encodedSize; i++)
-            {
-                sum += ctx.ReadInt64();
-            }
-            return sum;
-        }
-
-        [Benchmark]
-        public uint ParseFixed32_CodedInputStream()
-        {
-            const int encodedSize = sizeof(uint);
-            CodedInputStream cis = new CodedInputStream(fixedIntInputBuffer);
-            uint sum = 0;
-            for (uint i = 0; i < BytesToParse / encodedSize; i++)
-            {
-                sum += cis.ReadFixed32();
-            }
-            return sum;
-        }
-
-        [Benchmark]
-        public uint ParseFixed32_ParseContext()
-        {
-            const int encodedSize = sizeof(uint);
-            InitializeParseContext(fixedIntInputBuffer, out ParseContext ctx);
-            uint sum = 0;
-            for (uint i = 0; i < BytesToParse / encodedSize; i++)
-            {
-                sum += ctx.ReadFixed32();
-            }
-            return sum;
-        }
-
-        [Benchmark]
-        public ulong ParseFixed64_CodedInputStream()
-        {
-            const int encodedSize = sizeof(ulong);
-            CodedInputStream cis = new CodedInputStream(fixedIntInputBuffer);
-            ulong sum = 0;
-            for (int i = 0; i < BytesToParse / encodedSize; i++)
-            {
-                sum += cis.ReadFixed64();
-            }
-            return sum;
-        }
-
-        [Benchmark]
-        public ulong ParseFixed64_ParseContext()
-        {
-            const int encodedSize = sizeof(ulong);
-            InitializeParseContext(fixedIntInputBuffer, out ParseContext ctx);
-            ulong sum = 0;
-            for (int i = 0; i < BytesToParse / encodedSize; i++)
-            {
-                sum += ctx.ReadFixed64();
-            }
-            return sum;
-        }
-
-        [Benchmark]
-        public float ParseRawFloat_CodedInputStream()
-        {
-            const int encodedSize = sizeof(float);
-            CodedInputStream cis = new CodedInputStream(floatInputBuffer);
-            float sum = 0;
-            for (int i = 0; i < BytesToParse / encodedSize; i++)
-            {
-               sum += cis.ReadFloat();
-            }
-            return sum;
-        }
-
-        [Benchmark]
-        public float ParseRawFloat_ParseContext()
-        {
-            const int encodedSize = sizeof(float);
-            InitializeParseContext(floatInputBuffer, out ParseContext ctx);
-            float sum = 0;
-            for (int i = 0; i < BytesToParse / encodedSize; i++)
-            {
-               sum += ctx.ReadFloat();
-            }
-            return sum;
-        }
-
-        [Benchmark]
-        public double ParseRawDouble_CodedInputStream()
-        {
-            const int encodedSize = sizeof(double);
-            CodedInputStream cis = new CodedInputStream(doubleInputBuffer);
-            double sum = 0;
-            for (int i = 0; i < BytesToParse / encodedSize; i++)
-            {
-                sum += cis.ReadDouble();
-            }
-            return sum;
-        }
-
-        [Benchmark]
-        public double ParseRawDouble_ParseContext()
-        {
-            const int encodedSize = sizeof(double);
-            InitializeParseContext(doubleInputBuffer, out ParseContext ctx);
-            double sum = 0;
-            for (int i = 0; i < BytesToParse / encodedSize; i++)
-            {
-                sum += ctx.ReadDouble();
-            }
-            return sum;
-        }
-
-        [Benchmark]
-        [ArgumentsSource(nameof(StringEncodedSizes))]
-        public int ParseString_CodedInputStream(int encodedSize)
-        {
-            CodedInputStream cis = new CodedInputStream(stringInputBuffers[encodedSize]);
-            int sum = 0;
-            for (int i = 0; i < BytesToParse / encodedSize; i++)
-            {
-                sum += cis.ReadString().Length;
-            }
-            return sum;
-        }
-
-        [Benchmark]
-        [ArgumentsSource(nameof(StringEncodedSizes))]
-        public int ParseString_ParseContext(int encodedSize)
-        {
-            InitializeParseContext(stringInputBuffers[encodedSize], out ParseContext ctx);
-            int sum = 0;
-            for (int i = 0; i < BytesToParse / encodedSize; i++)
-            {
-                sum += ctx.ReadString().Length;
-            }
-            return sum;
-        }
-
-        [Benchmark]
-        [ArgumentsSource(nameof(StringSegmentedEncodedSizes))]
-        public int ParseString_ParseContext_MultipleSegments(int encodedSize)
-        {
-            InitializeParseContext(stringInputBuffersSegmented[encodedSize], out ParseContext ctx);
-            int sum = 0;
-            for (int i = 0; i < BytesToParse / encodedSize; i++)
-            {
-                sum += ctx.ReadString().Length;
-            }
-            return sum;
-        }
-
-        [Benchmark]
-        [ArgumentsSource(nameof(StringEncodedSizes))]
-        public int ParseBytes_CodedInputStream(int encodedSize)
-        {
-            CodedInputStream cis = new CodedInputStream(stringInputBuffers[encodedSize]);
-            int sum = 0;
-            for (int i = 0; i < BytesToParse / encodedSize; i++)
-            {
-                sum += cis.ReadBytes().Length;
-            }
-            return sum;
-        }
-
-        [Benchmark]
-        [ArgumentsSource(nameof(StringEncodedSizes))]
-        public int ParseBytes_ParseContext(int encodedSize)
-        {
-            InitializeParseContext(stringInputBuffers[encodedSize], out ParseContext ctx);
-            int sum = 0;
-            for (int i = 0; i < BytesToParse / encodedSize; i++)
-            {
-                sum += ctx.ReadBytes().Length;
-            }
-            return sum;
-        }
-
-        [Benchmark]
-        [ArgumentsSource(nameof(StringSegmentedEncodedSizes))]
-        public int ParseBytes_ParseContext_MultipleSegments(int encodedSize)
-        {
-            InitializeParseContext(stringInputBuffersSegmented[encodedSize], out ParseContext ctx);
-            int sum = 0;
-            for (int i = 0; i < BytesToParse / encodedSize; i++)
-            {
-                sum += ctx.ReadBytes().Length;
-            }
-            return sum;
-        }
-
-        private static void InitializeParseContext(byte[] buffer, out ParseContext ctx)
-        {
-            ParseContext.Initialize(new ReadOnlySequence<byte>(buffer), out ctx);
-        }
-
-        private static void InitializeParseContext(ReadOnlySequence<byte> buffer, out ParseContext ctx)
-        {
-            ParseContext.Initialize(buffer, out ctx);
-        }
-
-        private static byte[] CreateBufferWithRandomVarints(Random random, int valueCount, int encodedSize, int paddingValueCount)
-        {
-            MemoryStream ms = new MemoryStream();
-            CodedOutputStream cos = new CodedOutputStream(ms);
-            for (int i = 0; i < valueCount + paddingValueCount; i++)
-            {
-                cos.WriteUInt64(RandomUnsignedVarint(random, encodedSize, false));
-            }
-            cos.Flush();
-            var buffer = ms.ToArray();
-            
-            if (buffer.Length != encodedSize * (valueCount + paddingValueCount))
-            {
-                throw new InvalidOperationException($"Unexpected output buffer length {buffer.Length}"); 
-            }
-            return buffer;
-        }
-
-        private static byte[] CreateBufferWithRandomFloats(Random random, int valueCount, int paddingValueCount)
-        {
-            MemoryStream ms = new MemoryStream();
-            CodedOutputStream cos = new CodedOutputStream(ms);
-            for (int i = 0; i < valueCount + paddingValueCount; i++)
-            {
-                cos.WriteFloat((float)random.NextDouble());
-            }
-            cos.Flush();
-            var buffer = ms.ToArray();
-            return buffer;
-        }
-
-        private static byte[] CreateBufferWithRandomDoubles(Random random, int valueCount, int paddingValueCount)
-        {
-            MemoryStream ms = new MemoryStream();
-            CodedOutputStream cos = new CodedOutputStream(ms);
-            for (int i = 0; i < valueCount + paddingValueCount; i++)
-            {
-                cos.WriteDouble(random.NextDouble());
-            }
-            cos.Flush();
-            var buffer = ms.ToArray();
-            return buffer;
-        }
-
-        private static byte[] CreateBufferWithRandomData(Random random, int valueCount, int encodedSize, int paddingValueCount)
-        {
-            int bufferSize = (valueCount + paddingValueCount) * encodedSize;
-            byte[] buffer = new byte[bufferSize];
-            random.NextBytes(buffer);
-            return buffer;
-        }
-
-        /// <summary>
-        /// Generate a random value that will take exactly "encodedSize" bytes when varint-encoded.
-        /// </summary>
-        public static ulong RandomUnsignedVarint(Random random, int encodedSize, bool fitsIn32Bits)
-        {
-            Span<byte> randomBytesBuffer = stackalloc byte[8];
-
-            if (encodedSize < 1 || encodedSize > 10 || (fitsIn32Bits && encodedSize > 5))
-            {
-                throw new ArgumentException("Illegal encodedSize value requested", nameof(encodedSize));
-            }
-            const int bitsPerByte = 7;
-            
-            ulong result = 0;
-            while (true)
-            {
-                random.NextBytes(randomBytesBuffer);
-                ulong randomValue = BinaryPrimitives.ReadUInt64LittleEndian(randomBytesBuffer);
-
-                // only use the number of random bits we need
-                ulong bitmask = encodedSize < 10 ? ((1UL << (encodedSize * bitsPerByte)) - 1) : ulong.MaxValue;
-                result = randomValue & bitmask;
-
-                if (fitsIn32Bits)
-                {
-                    // make sure the resulting value is representable by a uint.
-                    result &= uint.MaxValue;
-                }
-
-                if (encodedSize == 10)
-                {
-                    // for 10-byte values the highest bit always needs to be set (7*9=63)
-                    result |= ulong.MaxValue;
-                    break;
-                }
-
-                // some random values won't require the full "encodedSize" bytes, check that at least
-                // one of the top 7 bits is set. Retrying is fine since it only happens rarely
-                if (encodedSize == 1 || (result & (0x7FUL << ((encodedSize - 1) * bitsPerByte))) != 0)
-                {
-                    break;
-                }
-            }
-            return result;
-        }
-
-        private static byte[] CreateBufferWithStrings(int valueCount, int encodedSize, int paddingValueCount)
-        {
-            var str = CreateStringWithEncodedSize(encodedSize);
-
-            MemoryStream ms = new MemoryStream();
-            CodedOutputStream cos = new CodedOutputStream(ms);
-            for (int i = 0; i < valueCount + paddingValueCount; i++)
-            {
-                cos.WriteString(str);
-            }
-            cos.Flush();
-            var buffer = ms.ToArray();
-
-            if (buffer.Length != encodedSize * (valueCount + paddingValueCount))
-            {
-                throw new InvalidOperationException($"Unexpected output buffer length {buffer.Length}");
-            }
-            return buffer;
-        }
-
-        public static string CreateStringWithEncodedSize(int encodedSize)
-        {
-            var str = new string('a', encodedSize);
-            while (CodedOutputStream.ComputeStringSize(str) > encodedSize)
-            {
-                str = str.Substring(1);
-            }
-
-            if (CodedOutputStream.ComputeStringSize(str) != encodedSize)
-            {
-                throw new InvalidOperationException($"Generated string with wrong encodedSize");
-            }
-            return str;
-        }
-
-        public static string CreateNonAsciiStringWithEncodedSize(int encodedSize)
-        {
-            if (encodedSize < 3)
-            {
-                throw new ArgumentException("Illegal encoded size for a string with non-ascii chars.");
-            }
-            var twoByteChar = '\u00DC';  // U-umlaut, UTF8 encoding has 2 bytes
-            var str = new string(twoByteChar, encodedSize / 2);
-            while (CodedOutputStream.ComputeStringSize(str) > encodedSize)
-            {
-                str = str.Substring(1);
-            }
-
-            // add padding of ascii characters to reach the desired encoded size.
-            while (CodedOutputStream.ComputeStringSize(str) < encodedSize)
-            {
-                str += 'a';
-            }
-
-            // Note that for a few specific encodedSize values, it might be impossible to generate
-            // the string with the desired encodedSize using the algorithm above. For testing purposes, checking that
-            // the encoded size we got is actually correct is good enough.
-            if (CodedOutputStream.ComputeStringSize(str) != encodedSize)
-            {
-                throw new InvalidOperationException($"Generated string with wrong encodedSize");
-            }
-            return str;
-        }
-    }
-}
diff --git a/libs/protobuf/csharp/src/Google.Protobuf.Benchmarks/Program.cs b/libs/protobuf/csharp/src/Google.Protobuf.Benchmarks/Program.cs
deleted file mode 100644
index 037752f..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf.Benchmarks/Program.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2019 Google Inc.  All rights reserved.
-// https://github.com/protocolbuffers/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using BenchmarkDotNet.Running;
-
-namespace Google.Protobuf.Benchmarks
-{
-    class Program
-    {
-        // typical usage: dotnet run -c Release -f netcoreapp3.1
-        // (this can profile both .net core and .net framework; for some reason
-        // if you start from "-f net461", it goes horribly wrong)
-        public static void Main(string[] args)
-        {
-            BenchmarkSwitcher.FromAssembly(typeof(Program).Assembly).Run(args);
-        }
-    }
-
-    
-}
diff --git a/libs/protobuf/csharp/src/Google.Protobuf.Benchmarks/WrapperBenchmarkMessages.cs b/libs/protobuf/csharp/src/Google.Protobuf.Benchmarks/WrapperBenchmarkMessages.cs
deleted file mode 100644
index e2eb2e8..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf.Benchmarks/WrapperBenchmarkMessages.cs
+++ /dev/null
@@ -1,9604 +0,0 @@
-// <auto-generated>
-//     Generated by the protocol buffer compiler.  DO NOT EDIT!
-//     source: wrapper_benchmark_messages.proto
-// </auto-generated>
-#pragma warning disable 1591, 0612, 3021, 8981
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-namespace Google.Protobuf.Benchmarks {
-
-  /// <summary>Holder for reflection information generated from wrapper_benchmark_messages.proto</summary>
-  public static partial class WrapperBenchmarkMessagesReflection {
-
-    #region Descriptor
-    /// <summary>File descriptor for wrapper_benchmark_messages.proto</summary>
-    public static pbr::FileDescriptor Descriptor {
-      get { return descriptor; }
-    }
-    private static pbr::FileDescriptor descriptor;
-
-    static WrapperBenchmarkMessagesReflection() {
-      byte[] descriptorData = global::System.Convert.FromBase64String(
-          string.Concat(
-            "CiB3cmFwcGVyX2JlbmNobWFya19tZXNzYWdlcy5wcm90bxIaZ29vZ2xlLnBy",
-            "b3RvYnVmLmJlbmNobWFya3MaHmdvb2dsZS9wcm90b2J1Zi93cmFwcGVycy5w",
-            "cm90byLeLgoYTWFueVdyYXBwZXJGaWVsZHNNZXNzYWdlEjUKD2RvdWJsZV9m",
-            "aWVsZF85NRhfIAEoCzIcLmdvb2dsZS5wcm90b2J1Zi5Eb3VibGVWYWx1ZRI0",
-            "Cg5kb3VibGVfZmllbGRfMRgBIAEoCzIcLmdvb2dsZS5wcm90b2J1Zi5Eb3Vi",
-            "bGVWYWx1ZRI1Cg9kb3VibGVfZmllbGRfNzkYTyABKAsyHC5nb29nbGUucHJv",
-            "dG9idWYuRG91YmxlVmFsdWUSMgoNaW50NjRfZmllbGRfMhgCIAEoCzIbLmdv",
-            "b2dsZS5wcm90b2J1Zi5JbnQ2NFZhbHVlEjUKD2RvdWJsZV9maWVsZF85Nhhg",
-            "IAEoCzIcLmdvb2dsZS5wcm90b2J1Zi5Eb3VibGVWYWx1ZRIyCg1pbnQ2NF9m",
-            "aWVsZF8zGAMgASgLMhsuZ29vZ2xlLnByb3RvYnVmLkludDY0VmFsdWUSMgoN",
-            "aW50NjRfZmllbGRfNBgEIAEoCzIbLmdvb2dsZS5wcm90b2J1Zi5JbnQ2NFZh",
-            "bHVlEjUKD2RvdWJsZV9maWVsZF85NxhhIAEoCzIcLmdvb2dsZS5wcm90b2J1",
-            "Zi5Eb3VibGVWYWx1ZRI1Cg9kb3VibGVfZmllbGRfNjUYQSABKAsyHC5nb29n",
-            "bGUucHJvdG9idWYuRG91YmxlVmFsdWUSNQoPZG91YmxlX2ZpZWxkXzY2GEIg",
-            "ASgLMhwuZ29vZ2xlLnByb3RvYnVmLkRvdWJsZVZhbHVlEjQKDmRvdWJsZV9m",
-            "aWVsZF83GAcgASgLMhwuZ29vZ2xlLnByb3RvYnVmLkRvdWJsZVZhbHVlEjUK",
-            "D2RvdWJsZV9maWVsZF82Mhg+IAEoCzIcLmdvb2dsZS5wcm90b2J1Zi5Eb3Vi",
-            "bGVWYWx1ZRI2ChBkb3VibGVfZmllbGRfMTE4GHYgASgLMhwuZ29vZ2xlLnBy",
-            "b3RvYnVmLkRvdWJsZVZhbHVlEjYKEGRvdWJsZV9maWVsZF8xMTkYdyABKAsy",
-            "HC5nb29nbGUucHJvdG9idWYuRG91YmxlVmFsdWUSNQoPZG91YmxlX2ZpZWxk",
-            "XzY3GEMgASgLMhwuZ29vZ2xlLnByb3RvYnVmLkRvdWJsZVZhbHVlEjYKEGRv",
-            "dWJsZV9maWVsZF8xMjAYeCABKAsyHC5nb29nbGUucHJvdG9idWYuRG91Ymxl",
-            "VmFsdWUSNgoQZG91YmxlX2ZpZWxkXzEyMRh5IAEoCzIcLmdvb2dsZS5wcm90",
-            "b2J1Zi5Eb3VibGVWYWx1ZRI2ChBkb3VibGVfZmllbGRfMTIyGHogASgLMhwu",
-            "Z29vZ2xlLnByb3RvYnVmLkRvdWJsZVZhbHVlEjYKEGRvdWJsZV9maWVsZF8x",
-            "MjMYeyABKAsyHC5nb29nbGUucHJvdG9idWYuRG91YmxlVmFsdWUSNgoQZG91",
-            "YmxlX2ZpZWxkXzEyNBh8IAEoCzIcLmdvb2dsZS5wcm90b2J1Zi5Eb3VibGVW",
-            "YWx1ZRI0Cg5kb3VibGVfZmllbGRfOBgIIAEoCzIcLmdvb2dsZS5wcm90b2J1",
-            "Zi5Eb3VibGVWYWx1ZRI0Cg5kb3VibGVfZmllbGRfORgJIAEoCzIcLmdvb2ds",
-            "ZS5wcm90b2J1Zi5Eb3VibGVWYWx1ZRI1Cg9kb3VibGVfZmllbGRfOTgYYiAB",
-            "KAsyHC5nb29nbGUucHJvdG9idWYuRG91YmxlVmFsdWUSNQoPZG91YmxlX2Zp",
-            "ZWxkXzEwGAogASgLMhwuZ29vZ2xlLnByb3RvYnVmLkRvdWJsZVZhbHVlEjUK",
-            "D2RvdWJsZV9maWVsZF8xMRgLIAEoCzIcLmdvb2dsZS5wcm90b2J1Zi5Eb3Vi",
-            "bGVWYWx1ZRI1Cg9kb3VibGVfZmllbGRfOTkYYyABKAsyHC5nb29nbGUucHJv",
-            "dG9idWYuRG91YmxlVmFsdWUSNQoPZG91YmxlX2ZpZWxkXzg0GFQgASgLMhwu",
-            "Z29vZ2xlLnByb3RvYnVmLkRvdWJsZVZhbHVlEjUKD2RvdWJsZV9maWVsZF8x",
-            "NBgOIAEoCzIcLmdvb2dsZS5wcm90b2J1Zi5Eb3VibGVWYWx1ZRI1Cg9kb3Vi",
-            "bGVfZmllbGRfNzcYTSABKAsyHC5nb29nbGUucHJvdG9idWYuRG91YmxlVmFs",
-            "dWUSNQoPZG91YmxlX2ZpZWxkXzE1GA8gASgLMhwuZ29vZ2xlLnByb3RvYnVm",
-            "LkRvdWJsZVZhbHVlEjMKDmludDY0X2ZpZWxkXzE5GBMgASgLMhsuZ29vZ2xl",
-            "LnByb3RvYnVmLkludDY0VmFsdWUSNAoPaW50NjRfZmllbGRfMTE1GHMgASgL",
-            "MhsuZ29vZ2xlLnByb3RvYnVmLkludDY0VmFsdWUSNgoQZG91YmxlX2ZpZWxk",
-            "XzExNhh0IAEoCzIcLmdvb2dsZS5wcm90b2J1Zi5Eb3VibGVWYWx1ZRI0Cg9p",
-            "bnQ2NF9maWVsZF8xMTcYdSABKAsyGy5nb29nbGUucHJvdG9idWYuSW50NjRW",
-            "YWx1ZRI1Cg9kb3VibGVfZmllbGRfMjAYFCABKAsyHC5nb29nbGUucHJvdG9i",
-            "dWYuRG91YmxlVmFsdWUSNQoPZG91YmxlX2ZpZWxkXzIxGBUgASgLMhwuZ29v",
-            "Z2xlLnByb3RvYnVmLkRvdWJsZVZhbHVlEjUKD3N0cmluZ19maWVsZF83MxhJ",
-            "IAEoCzIcLmdvb2dsZS5wcm90b2J1Zi5TdHJpbmdWYWx1ZRI1Cg9zdHJpbmdf",
-            "ZmllbGRfNzQYSiABKAsyHC5nb29nbGUucHJvdG9idWYuU3RyaW5nVmFsdWUS",
-            "NQoPZG91YmxlX2ZpZWxkXzIyGBYgASgLMhwuZ29vZ2xlLnByb3RvYnVmLkRv",
-            "dWJsZVZhbHVlEjUKD2RvdWJsZV9maWVsZF82ORhFIAEoCzIcLmdvb2dsZS5w",
-            "cm90b2J1Zi5Eb3VibGVWYWx1ZRI1Cg9kb3VibGVfZmllbGRfNzAYRiABKAsy",
-            "HC5nb29nbGUucHJvdG9idWYuRG91YmxlVmFsdWUSNQoPZG91YmxlX2ZpZWxk",
-            "XzcxGEcgASgLMhwuZ29vZ2xlLnByb3RvYnVmLkRvdWJsZVZhbHVlEjUKD2Rv",
-            "dWJsZV9maWVsZF83MhhIIAEoCzIcLmdvb2dsZS5wcm90b2J1Zi5Eb3VibGVW",
-            "YWx1ZRI1Cg9kb3VibGVfZmllbGRfMjUYGSABKAsyHC5nb29nbGUucHJvdG9i",
-            "dWYuRG91YmxlVmFsdWUSMwoOaW50NjRfZmllbGRfMjYYGiABKAsyGy5nb29n",
-            "bGUucHJvdG9idWYuSW50NjRWYWx1ZRI1Cg9kb3VibGVfZmllbGRfNjgYRCAB",
-            "KAsyHC5nb29nbGUucHJvdG9idWYuRG91YmxlVmFsdWUSNQoPZG91YmxlX2Zp",
-            "ZWxkXzI4GBwgASgLMhwuZ29vZ2xlLnByb3RvYnVmLkRvdWJsZVZhbHVlEjYK",
-            "EGRvdWJsZV9maWVsZF8xMDYYaiABKAsyHC5nb29nbGUucHJvdG9idWYuRG91",
-            "YmxlVmFsdWUSNQoPZG91YmxlX2ZpZWxkXzI5GB0gASgLMhwuZ29vZ2xlLnBy",
-            "b3RvYnVmLkRvdWJsZVZhbHVlEjUKD2RvdWJsZV9maWVsZF8zMBgeIAEoCzIc",
-            "Lmdvb2dsZS5wcm90b2J1Zi5Eb3VibGVWYWx1ZRI2ChBkb3VibGVfZmllbGRf",
-            "MTAxGGUgASgLMhwuZ29vZ2xlLnByb3RvYnVmLkRvdWJsZVZhbHVlEjYKEGRv",
-            "dWJsZV9maWVsZF8xMDIYZiABKAsyHC5nb29nbGUucHJvdG9idWYuRG91Ymxl",
-            "VmFsdWUSNgoQZG91YmxlX2ZpZWxkXzEwMxhnIAEoCzIcLmdvb2dsZS5wcm90",
-            "b2J1Zi5Eb3VibGVWYWx1ZRI2ChBkb3VibGVfZmllbGRfMTA0GGggASgLMhwu",
-            "Z29vZ2xlLnByb3RvYnVmLkRvdWJsZVZhbHVlEjYKEGRvdWJsZV9maWVsZF8x",
-            "MDUYaSABKAsyHC5nb29nbGUucHJvdG9idWYuRG91YmxlVmFsdWUSNQoPZG91",
-            "YmxlX2ZpZWxkXzMxGB8gASgLMhwuZ29vZ2xlLnByb3RvYnVmLkRvdWJsZVZh",
-            "bHVlEjMKDmludDY0X2ZpZWxkXzMyGCAgASgLMhsuZ29vZ2xlLnByb3RvYnVm",
-            "LkludDY0VmFsdWUSNQoPZG91YmxlX2ZpZWxkXzc1GEsgASgLMhwuZ29vZ2xl",
-            "LnByb3RvYnVmLkRvdWJsZVZhbHVlEjcKEGRvdWJsZV9maWVsZF8xMjkYgQEg",
-            "ASgLMhwuZ29vZ2xlLnByb3RvYnVmLkRvdWJsZVZhbHVlEhUKDWVudW1fZmll",
-            "bGRfODAYUCABKAUSFQoNZW51bV9maWVsZF84MRhRIAEoBRIzCg5pbnQ2NF9m",
-            "aWVsZF84MhhSIAEoCzIbLmdvb2dsZS5wcm90b2J1Zi5JbnQ2NFZhbHVlEhUK",
-            "DWVudW1fZmllbGRfODMYUyABKAUSMwoOaW50NjRfZmllbGRfODUYVSABKAsy",
-            "Gy5nb29nbGUucHJvdG9idWYuSW50NjRWYWx1ZRIzCg5pbnQ2NF9maWVsZF84",
-            "NhhWIAEoCzIbLmdvb2dsZS5wcm90b2J1Zi5JbnQ2NFZhbHVlEjMKDmludDY0",
-            "X2ZpZWxkXzg3GFcgASgLMhsuZ29vZ2xlLnByb3RvYnVmLkludDY0VmFsdWUS",
-            "NAoPaW50NjRfZmllbGRfMTI1GH0gASgLMhsuZ29vZ2xlLnByb3RvYnVmLklu",
-            "dDY0VmFsdWUSMwoOaW50NjRfZmllbGRfMzcYJSABKAsyGy5nb29nbGUucHJv",
-            "dG9idWYuSW50NjRWYWx1ZRI1Cg9kb3VibGVfZmllbGRfMzgYJiABKAsyHC5n",
-            "b29nbGUucHJvdG9idWYuRG91YmxlVmFsdWUSMQoMaW50ZXJhY3Rpb25zGCcg",
-            "ASgLMhsuZ29vZ2xlLnByb3RvYnVmLkludDY0VmFsdWUSHgoWcmVwZWF0ZWRf",
-            "aW50X2ZpZWxkXzEwMBhkIAMoBRI1Cg9kb3VibGVfZmllbGRfNDAYKCABKAsy",
-            "HC5nb29nbGUucHJvdG9idWYuRG91YmxlVmFsdWUSMwoOaW50NjRfZmllbGRf",
-            "NDEYKSABKAsyGy5nb29nbGUucHJvdG9idWYuSW50NjRWYWx1ZRI0Cg9pbnQ2",
-            "NF9maWVsZF8xMjYYfiABKAsyGy5nb29nbGUucHJvdG9idWYuSW50NjRWYWx1",
-            "ZRI0Cg9pbnQ2NF9maWVsZF8xMjcYfyABKAsyGy5nb29nbGUucHJvdG9idWYu",
-            "SW50NjRWYWx1ZRI3ChBkb3VibGVfZmllbGRfMTI4GIABIAEoCzIcLmdvb2ds",
-            "ZS5wcm90b2J1Zi5Eb3VibGVWYWx1ZRI2ChBkb3VibGVfZmllbGRfMTA5GG0g",
-            "ASgLMhwuZ29vZ2xlLnByb3RvYnVmLkRvdWJsZVZhbHVlEjQKD2ludDY0X2Zp",
-            "ZWxkXzExMBhuIAEoCzIbLmdvb2dsZS5wcm90b2J1Zi5JbnQ2NFZhbHVlEjYK",
-            "EGRvdWJsZV9maWVsZF8xMTEYbyABKAsyHC5nb29nbGUucHJvdG9idWYuRG91",
-            "YmxlVmFsdWUSNAoPaW50NjRfZmllbGRfMTEyGHAgASgLMhsuZ29vZ2xlLnBy",
-            "b3RvYnVmLkludDY0VmFsdWUSNgoQZG91YmxlX2ZpZWxkXzExMxhxIAEoCzIc",
-            "Lmdvb2dsZS5wcm90b2J1Zi5Eb3VibGVWYWx1ZRI0Cg9pbnQ2NF9maWVsZF8x",
-            "MTQYciABKAsyGy5nb29nbGUucHJvdG9idWYuSW50NjRWYWx1ZRI1Cg9kb3Vi",
-            "bGVfZmllbGRfNDIYKiABKAsyHC5nb29nbGUucHJvdG9idWYuRG91YmxlVmFs",
-            "dWUSMwoOaW50NjRfZmllbGRfNDMYKyABKAsyGy5nb29nbGUucHJvdG9idWYu",
-            "SW50NjRWYWx1ZRIzCg5pbnQ2NF9maWVsZF80NBgsIAEoCzIbLmdvb2dsZS5w",
-            "cm90b2J1Zi5JbnQ2NFZhbHVlEjUKD2RvdWJsZV9maWVsZF80NRgtIAEoCzIc",
-            "Lmdvb2dsZS5wcm90b2J1Zi5Eb3VibGVWYWx1ZRI1Cg9kb3VibGVfZmllbGRf",
-            "NDYYLiABKAsyHC5nb29nbGUucHJvdG9idWYuRG91YmxlVmFsdWUSNQoPZG91",
-            "YmxlX2ZpZWxkXzc4GE4gASgLMhwuZ29vZ2xlLnByb3RvYnVmLkRvdWJsZVZh",
-            "bHVlEjUKD2RvdWJsZV9maWVsZF84OBhYIAEoCzIcLmdvb2dsZS5wcm90b2J1",
-            "Zi5Eb3VibGVWYWx1ZRI1Cg9kb3VibGVfZmllbGRfNDcYLyABKAsyHC5nb29n",
-            "bGUucHJvdG9idWYuRG91YmxlVmFsdWUSNQoPZG91YmxlX2ZpZWxkXzg5GFkg",
-            "ASgLMhwuZ29vZ2xlLnByb3RvYnVmLkRvdWJsZVZhbHVlEjUKD2RvdWJsZV9m",
-            "aWVsZF80OBgwIAEoCzIcLmdvb2dsZS5wcm90b2J1Zi5Eb3VibGVWYWx1ZRI1",
-            "Cg9kb3VibGVfZmllbGRfNDkYMSABKAsyHC5nb29nbGUucHJvdG9idWYuRG91",
-            "YmxlVmFsdWUSNQoPZG91YmxlX2ZpZWxkXzUwGDIgASgLMhwuZ29vZ2xlLnBy",
-            "b3RvYnVmLkRvdWJsZVZhbHVlEjUKD2RvdWJsZV9maWVsZF85MBhaIAEoCzIc",
-            "Lmdvb2dsZS5wcm90b2J1Zi5Eb3VibGVWYWx1ZRI1Cg9kb3VibGVfZmllbGRf",
-            "NTEYMyABKAsyHC5nb29nbGUucHJvdG9idWYuRG91YmxlVmFsdWUSNQoPZG91",
-            "YmxlX2ZpZWxkXzkxGFsgASgLMhwuZ29vZ2xlLnByb3RvYnVmLkRvdWJsZVZh",
-            "bHVlEjUKD2RvdWJsZV9maWVsZF85MhhcIAEoCzIcLmdvb2dsZS5wcm90b2J1",
-            "Zi5Eb3VibGVWYWx1ZRI0Cg9pbnQ2NF9maWVsZF8xMDcYayABKAsyGy5nb29n",
-            "bGUucHJvdG9idWYuSW50NjRWYWx1ZRI1Cg9kb3VibGVfZmllbGRfOTMYXSAB",
-            "KAsyHC5nb29nbGUucHJvdG9idWYuRG91YmxlVmFsdWUSNgoQZG91YmxlX2Zp",
-            "ZWxkXzEwOBhsIAEoCzIcLmdvb2dsZS5wcm90b2J1Zi5Eb3VibGVWYWx1ZRI1",
-            "Cg9kb3VibGVfZmllbGRfNTIYNCABKAsyHC5nb29nbGUucHJvdG9idWYuRG91",
-            "YmxlVmFsdWUSNQoPZG91YmxlX2ZpZWxkXzUzGDUgASgLMhwuZ29vZ2xlLnBy",
-            "b3RvYnVmLkRvdWJsZVZhbHVlEjUKD2RvdWJsZV9maWVsZF85NBheIAEoCzIc",
-            "Lmdvb2dsZS5wcm90b2J1Zi5Eb3VibGVWYWx1ZRI1Cg9kb3VibGVfZmllbGRf",
-            "NTQYNiABKAsyHC5nb29nbGUucHJvdG9idWYuRG91YmxlVmFsdWUSNQoPZG91",
-            "YmxlX2ZpZWxkXzU1GDcgASgLMhwuZ29vZ2xlLnByb3RvYnVmLkRvdWJsZVZh",
-            "bHVlEjUKD2RvdWJsZV9maWVsZF81Nhg4IAEoCzIcLmdvb2dsZS5wcm90b2J1",
-            "Zi5Eb3VibGVWYWx1ZRI1Cg9kb3VibGVfZmllbGRfNTcYOSABKAsyHC5nb29n",
-            "bGUucHJvdG9idWYuRG91YmxlVmFsdWUSNQoPZG91YmxlX2ZpZWxkXzU4GDog",
-            "ASgLMhwuZ29vZ2xlLnByb3RvYnVmLkRvdWJsZVZhbHVlEjMKDmludDY0X2Zp",
-            "ZWxkXzU5GDsgASgLMhsuZ29vZ2xlLnByb3RvYnVmLkludDY0VmFsdWUSMwoO",
-            "aW50NjRfZmllbGRfNjAYPCABKAsyGy5nb29nbGUucHJvdG9idWYuSW50NjRW",
-            "YWx1ZSLwFQoaTWFueVByaW1pdGl2ZUZpZWxkc01lc3NhZ2USFwoPZG91Ymxl",
-            "X2ZpZWxkXzk1GF8gASgBEhYKDmRvdWJsZV9maWVsZF8xGAEgASgBEhcKD2Rv",
-            "dWJsZV9maWVsZF83ORhPIAEoARIVCg1pbnQ2NF9maWVsZF8yGAIgASgDEhcK",
-            "D2RvdWJsZV9maWVsZF85NhhgIAEoARIVCg1pbnQ2NF9maWVsZF8zGAMgASgD",
-            "EhUKDWludDY0X2ZpZWxkXzQYBCABKAMSFwoPZG91YmxlX2ZpZWxkXzk3GGEg",
-            "ASgBEhcKD2RvdWJsZV9maWVsZF82NRhBIAEoARIXCg9kb3VibGVfZmllbGRf",
-            "NjYYQiABKAESFgoOZG91YmxlX2ZpZWxkXzcYByABKAESFwoPZG91YmxlX2Zp",
-            "ZWxkXzYyGD4gASgBEhgKEGRvdWJsZV9maWVsZF8xMTgYdiABKAESGAoQZG91",
-            "YmxlX2ZpZWxkXzExORh3IAEoARIXCg9kb3VibGVfZmllbGRfNjcYQyABKAES",
-            "GAoQZG91YmxlX2ZpZWxkXzEyMBh4IAEoARIYChBkb3VibGVfZmllbGRfMTIx",
-            "GHkgASgBEhgKEGRvdWJsZV9maWVsZF8xMjIYeiABKAESGAoQZG91YmxlX2Zp",
-            "ZWxkXzEyMxh7IAEoARIYChBkb3VibGVfZmllbGRfMTI0GHwgASgBEhYKDmRv",
-            "dWJsZV9maWVsZF84GAggASgBEhYKDmRvdWJsZV9maWVsZF85GAkgASgBEhcK",
-            "D2RvdWJsZV9maWVsZF85OBhiIAEoARIXCg9kb3VibGVfZmllbGRfMTAYCiAB",
-            "KAESFwoPZG91YmxlX2ZpZWxkXzExGAsgASgBEhcKD2RvdWJsZV9maWVsZF85",
-            "ORhjIAEoARIXCg9kb3VibGVfZmllbGRfODQYVCABKAESFwoPZG91YmxlX2Zp",
-            "ZWxkXzE0GA4gASgBEhcKD2RvdWJsZV9maWVsZF83NxhNIAEoARIXCg9kb3Vi",
-            "bGVfZmllbGRfMTUYDyABKAESFgoOaW50NjRfZmllbGRfMTkYEyABKAMSFwoP",
-            "aW50NjRfZmllbGRfMTE1GHMgASgDEhgKEGRvdWJsZV9maWVsZF8xMTYYdCAB",
-            "KAESFwoPaW50NjRfZmllbGRfMTE3GHUgASgDEhcKD2RvdWJsZV9maWVsZF8y",
-            "MBgUIAEoARIXCg9kb3VibGVfZmllbGRfMjEYFSABKAESFwoPc3RyaW5nX2Zp",
-            "ZWxkXzczGEkgASgJEhcKD3N0cmluZ19maWVsZF83NBhKIAEoCRIXCg9kb3Vi",
-            "bGVfZmllbGRfMjIYFiABKAESFwoPZG91YmxlX2ZpZWxkXzY5GEUgASgBEhcK",
-            "D2RvdWJsZV9maWVsZF83MBhGIAEoARIXCg9kb3VibGVfZmllbGRfNzEYRyAB",
-            "KAESFwoPZG91YmxlX2ZpZWxkXzcyGEggASgBEhcKD2RvdWJsZV9maWVsZF8y",
-            "NRgZIAEoARIWCg5pbnQ2NF9maWVsZF8yNhgaIAEoAxIXCg9kb3VibGVfZmll",
-            "bGRfNjgYRCABKAESFwoPZG91YmxlX2ZpZWxkXzI4GBwgASgBEhgKEGRvdWJs",
-            "ZV9maWVsZF8xMDYYaiABKAESFwoPZG91YmxlX2ZpZWxkXzI5GB0gASgBEhcK",
-            "D2RvdWJsZV9maWVsZF8zMBgeIAEoARIYChBkb3VibGVfZmllbGRfMTAxGGUg",
-            "ASgBEhgKEGRvdWJsZV9maWVsZF8xMDIYZiABKAESGAoQZG91YmxlX2ZpZWxk",
-            "XzEwMxhnIAEoARIYChBkb3VibGVfZmllbGRfMTA0GGggASgBEhgKEGRvdWJs",
-            "ZV9maWVsZF8xMDUYaSABKAESFwoPZG91YmxlX2ZpZWxkXzMxGB8gASgBEhYK",
-            "DmludDY0X2ZpZWxkXzMyGCAgASgDEhcKD2RvdWJsZV9maWVsZF83NRhLIAEo",
-            "ARIZChBkb3VibGVfZmllbGRfMTI5GIEBIAEoARIVCg1lbnVtX2ZpZWxkXzgw",
-            "GFAgASgFEhUKDWVudW1fZmllbGRfODEYUSABKAUSFgoOaW50NjRfZmllbGRf",
-            "ODIYUiABKAMSFQoNZW51bV9maWVsZF84MxhTIAEoBRIWCg5pbnQ2NF9maWVs",
-            "ZF84NRhVIAEoAxIWCg5pbnQ2NF9maWVsZF84NhhWIAEoAxIWCg5pbnQ2NF9m",
-            "aWVsZF84NxhXIAEoAxIXCg9pbnQ2NF9maWVsZF8xMjUYfSABKAMSFgoOaW50",
-            "NjRfZmllbGRfMzcYJSABKAMSFwoPZG91YmxlX2ZpZWxkXzM4GCYgASgBEhQK",
-            "DGludGVyYWN0aW9ucxgnIAEoAxIeChZyZXBlYXRlZF9pbnRfZmllbGRfMTAw",
-            "GGQgAygFEhcKD2RvdWJsZV9maWVsZF80MBgoIAEoARIWCg5pbnQ2NF9maWVs",
-            "ZF80MRgpIAEoAxIXCg9pbnQ2NF9maWVsZF8xMjYYfiABKAMSFwoPaW50NjRf",
-            "ZmllbGRfMTI3GH8gASgDEhkKEGRvdWJsZV9maWVsZF8xMjgYgAEgASgBEhgK",
-            "EGRvdWJsZV9maWVsZF8xMDkYbSABKAESFwoPaW50NjRfZmllbGRfMTEwGG4g",
-            "ASgDEhgKEGRvdWJsZV9maWVsZF8xMTEYbyABKAESFwoPaW50NjRfZmllbGRf",
-            "MTEyGHAgASgDEhgKEGRvdWJsZV9maWVsZF8xMTMYcSABKAESFwoPaW50NjRf",
-            "ZmllbGRfMTE0GHIgASgDEhcKD2RvdWJsZV9maWVsZF80MhgqIAEoARIWCg5p",
-            "bnQ2NF9maWVsZF80MxgrIAEoAxIWCg5pbnQ2NF9maWVsZF80NBgsIAEoAxIX",
-            "Cg9kb3VibGVfZmllbGRfNDUYLSABKAESFwoPZG91YmxlX2ZpZWxkXzQ2GC4g",
-            "ASgBEhcKD2RvdWJsZV9maWVsZF83OBhOIAEoARIXCg9kb3VibGVfZmllbGRf",
-            "ODgYWCABKAESFwoPZG91YmxlX2ZpZWxkXzQ3GC8gASgBEhcKD2RvdWJsZV9m",
-            "aWVsZF84ORhZIAEoARIXCg9kb3VibGVfZmllbGRfNDgYMCABKAESFwoPZG91",
-            "YmxlX2ZpZWxkXzQ5GDEgASgBEhcKD2RvdWJsZV9maWVsZF81MBgyIAEoARIX",
-            "Cg9kb3VibGVfZmllbGRfOTAYWiABKAESFwoPZG91YmxlX2ZpZWxkXzUxGDMg",
-            "ASgBEhcKD2RvdWJsZV9maWVsZF85MRhbIAEoARIXCg9kb3VibGVfZmllbGRf",
-            "OTIYXCABKAESFwoPaW50NjRfZmllbGRfMTA3GGsgASgDEhcKD2RvdWJsZV9m",
-            "aWVsZF85MxhdIAEoARIYChBkb3VibGVfZmllbGRfMTA4GGwgASgBEhcKD2Rv",
-            "dWJsZV9maWVsZF81Mhg0IAEoARIXCg9kb3VibGVfZmllbGRfNTMYNSABKAES",
-            "FwoPZG91YmxlX2ZpZWxkXzk0GF4gASgBEhcKD2RvdWJsZV9maWVsZF81NBg2",
-            "IAEoARIXCg9kb3VibGVfZmllbGRfNTUYNyABKAESFwoPZG91YmxlX2ZpZWxk",
-            "XzU2GDggASgBEhcKD2RvdWJsZV9maWVsZF81Nxg5IAEoARIXCg9kb3VibGVf",
-            "ZmllbGRfNTgYOiABKAESFgoOaW50NjRfZmllbGRfNTkYOyABKAMSFgoOaW50",
-            "NjRfZmllbGRfNjAYPCABKANiBnByb3RvMw=="));
-      descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-          new pbr::FileDescriptor[] { global::Google.Protobuf.WellKnownTypes.WrappersReflection.Descriptor, },
-          new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.Benchmarks.ManyWrapperFieldsMessage), global::Google.Protobuf.Benchmarks.ManyWrapperFieldsMessage.Parser, new[]{ "DoubleField95", "DoubleField1", "DoubleField79", "Int64Field2", "DoubleField96", "Int64Field3", "Int64Field4", "DoubleField97", "DoubleField65", "DoubleField66", "DoubleField7", "DoubleField62", "DoubleField118", "DoubleField119", "DoubleField67", "DoubleField120", "DoubleField121", "DoubleField122", "DoubleField123", "DoubleField124", "DoubleField8", "DoubleField9", "DoubleField98", "DoubleField10", "DoubleField11", "DoubleField99", "DoubleField84", "DoubleField14", "DoubleField77", "DoubleField15", "Int64Field19", "Int64Field115", "DoubleField116", "Int64Field117", "DoubleField20", "DoubleField21", "StringField73", "StringField74", "DoubleField22", "DoubleField69", "DoubleField70", "DoubleField71", "DoubleField72", "DoubleField25", "Int64Field26", "DoubleField68", "DoubleField28", "DoubleField106", "DoubleField29", "DoubleField30", "DoubleField101", "DoubleField102", "DoubleField103", "DoubleField104", "DoubleField105", "DoubleField31", "Int64Field32", "DoubleField75", "DoubleField129", "EnumField80", "EnumField81", "Int64Field82", "EnumField83", "Int64Field85", "Int64Field86", "Int64Field87", "Int64Field125", "Int64Field37", "DoubleField38", "Interactions", "RepeatedIntField100", "DoubleField40", "Int64Field41", "Int64Field126", "Int64Field127", "DoubleField128", "DoubleField109", "Int64Field110", "DoubleField111", "Int64Field112", "DoubleField113", "Int64Field114", "DoubleField42", "Int64Field43", "Int64Field44", "DoubleField45", "DoubleField46", "DoubleField78", "DoubleField88", "DoubleField47", "DoubleField89", "DoubleField48", "DoubleField49", "DoubleField50", "DoubleField90", "DoubleField51", "DoubleField91", "DoubleField92", "Int64Field107", "DoubleField93", "DoubleField108", "DoubleField52", "DoubleField53", "DoubleField94", "DoubleField54", "DoubleField55", "DoubleField56", "DoubleField57", "DoubleField58", "Int64Field59", "Int64Field60" }, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.Benchmarks.ManyPrimitiveFieldsMessage), global::Google.Protobuf.Benchmarks.ManyPrimitiveFieldsMessage.Parser, new[]{ "DoubleField95", "DoubleField1", "DoubleField79", "Int64Field2", "DoubleField96", "Int64Field3", "Int64Field4", "DoubleField97", "DoubleField65", "DoubleField66", "DoubleField7", "DoubleField62", "DoubleField118", "DoubleField119", "DoubleField67", "DoubleField120", "DoubleField121", "DoubleField122", "DoubleField123", "DoubleField124", "DoubleField8", "DoubleField9", "DoubleField98", "DoubleField10", "DoubleField11", "DoubleField99", "DoubleField84", "DoubleField14", "DoubleField77", "DoubleField15", "Int64Field19", "Int64Field115", "DoubleField116", "Int64Field117", "DoubleField20", "DoubleField21", "StringField73", "StringField74", "DoubleField22", "DoubleField69", "DoubleField70", "DoubleField71", "DoubleField72", "DoubleField25", "Int64Field26", "DoubleField68", "DoubleField28", "DoubleField106", "DoubleField29", "DoubleField30", "DoubleField101", "DoubleField102", "DoubleField103", "DoubleField104", "DoubleField105", "DoubleField31", "Int64Field32", "DoubleField75", "DoubleField129", "EnumField80", "EnumField81", "Int64Field82", "EnumField83", "Int64Field85", "Int64Field86", "Int64Field87", "Int64Field125", "Int64Field37", "DoubleField38", "Interactions", "RepeatedIntField100", "DoubleField40", "Int64Field41", "Int64Field126", "Int64Field127", "DoubleField128", "DoubleField109", "Int64Field110", "DoubleField111", "Int64Field112", "DoubleField113", "Int64Field114", "DoubleField42", "Int64Field43", "Int64Field44", "DoubleField45", "DoubleField46", "DoubleField78", "DoubleField88", "DoubleField47", "DoubleField89", "DoubleField48", "DoubleField49", "DoubleField50", "DoubleField90", "DoubleField51", "DoubleField91", "DoubleField92", "Int64Field107", "DoubleField93", "DoubleField108", "DoubleField52", "DoubleField53", "DoubleField94", "DoubleField54", "DoubleField55", "DoubleField56", "DoubleField57", "DoubleField58", "Int64Field59", "Int64Field60" }, null, null, null, null)
-          }));
-    }
-    #endregion
-
-  }
-  #region Messages
-  /// <summary>
-  /// a message that has a large number of wrapper fields
-  /// obfuscated version of an internal message
-  /// </summary>
-  public sealed partial class ManyWrapperFieldsMessage : pb::IMessage<ManyWrapperFieldsMessage>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<ManyWrapperFieldsMessage> _parser = new pb::MessageParser<ManyWrapperFieldsMessage>(() => new ManyWrapperFieldsMessage());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<ManyWrapperFieldsMessage> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.Benchmarks.WrapperBenchmarkMessagesReflection.Descriptor.MessageTypes[0]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ManyWrapperFieldsMessage() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ManyWrapperFieldsMessage(ManyWrapperFieldsMessage other) : this() {
-      DoubleField95 = other.DoubleField95;
-      DoubleField1 = other.DoubleField1;
-      DoubleField79 = other.DoubleField79;
-      Int64Field2 = other.Int64Field2;
-      DoubleField96 = other.DoubleField96;
-      Int64Field3 = other.Int64Field3;
-      Int64Field4 = other.Int64Field4;
-      DoubleField97 = other.DoubleField97;
-      DoubleField65 = other.DoubleField65;
-      DoubleField66 = other.DoubleField66;
-      DoubleField7 = other.DoubleField7;
-      DoubleField62 = other.DoubleField62;
-      DoubleField118 = other.DoubleField118;
-      DoubleField119 = other.DoubleField119;
-      DoubleField67 = other.DoubleField67;
-      DoubleField120 = other.DoubleField120;
-      DoubleField121 = other.DoubleField121;
-      DoubleField122 = other.DoubleField122;
-      DoubleField123 = other.DoubleField123;
-      DoubleField124 = other.DoubleField124;
-      DoubleField8 = other.DoubleField8;
-      DoubleField9 = other.DoubleField9;
-      DoubleField98 = other.DoubleField98;
-      DoubleField10 = other.DoubleField10;
-      DoubleField11 = other.DoubleField11;
-      DoubleField99 = other.DoubleField99;
-      DoubleField84 = other.DoubleField84;
-      DoubleField14 = other.DoubleField14;
-      DoubleField77 = other.DoubleField77;
-      DoubleField15 = other.DoubleField15;
-      Int64Field19 = other.Int64Field19;
-      Int64Field115 = other.Int64Field115;
-      DoubleField116 = other.DoubleField116;
-      Int64Field117 = other.Int64Field117;
-      DoubleField20 = other.DoubleField20;
-      DoubleField21 = other.DoubleField21;
-      StringField73 = other.StringField73;
-      StringField74 = other.StringField74;
-      DoubleField22 = other.DoubleField22;
-      DoubleField69 = other.DoubleField69;
-      DoubleField70 = other.DoubleField70;
-      DoubleField71 = other.DoubleField71;
-      DoubleField72 = other.DoubleField72;
-      DoubleField25 = other.DoubleField25;
-      Int64Field26 = other.Int64Field26;
-      DoubleField68 = other.DoubleField68;
-      DoubleField28 = other.DoubleField28;
-      DoubleField106 = other.DoubleField106;
-      DoubleField29 = other.DoubleField29;
-      DoubleField30 = other.DoubleField30;
-      DoubleField101 = other.DoubleField101;
-      DoubleField102 = other.DoubleField102;
-      DoubleField103 = other.DoubleField103;
-      DoubleField104 = other.DoubleField104;
-      DoubleField105 = other.DoubleField105;
-      DoubleField31 = other.DoubleField31;
-      Int64Field32 = other.Int64Field32;
-      DoubleField75 = other.DoubleField75;
-      DoubleField129 = other.DoubleField129;
-      enumField80_ = other.enumField80_;
-      enumField81_ = other.enumField81_;
-      Int64Field82 = other.Int64Field82;
-      enumField83_ = other.enumField83_;
-      Int64Field85 = other.Int64Field85;
-      Int64Field86 = other.Int64Field86;
-      Int64Field87 = other.Int64Field87;
-      Int64Field125 = other.Int64Field125;
-      Int64Field37 = other.Int64Field37;
-      DoubleField38 = other.DoubleField38;
-      Interactions = other.Interactions;
-      repeatedIntField100_ = other.repeatedIntField100_.Clone();
-      DoubleField40 = other.DoubleField40;
-      Int64Field41 = other.Int64Field41;
-      Int64Field126 = other.Int64Field126;
-      Int64Field127 = other.Int64Field127;
-      DoubleField128 = other.DoubleField128;
-      DoubleField109 = other.DoubleField109;
-      Int64Field110 = other.Int64Field110;
-      DoubleField111 = other.DoubleField111;
-      Int64Field112 = other.Int64Field112;
-      DoubleField113 = other.DoubleField113;
-      Int64Field114 = other.Int64Field114;
-      DoubleField42 = other.DoubleField42;
-      Int64Field43 = other.Int64Field43;
-      Int64Field44 = other.Int64Field44;
-      DoubleField45 = other.DoubleField45;
-      DoubleField46 = other.DoubleField46;
-      DoubleField78 = other.DoubleField78;
-      DoubleField88 = other.DoubleField88;
-      DoubleField47 = other.DoubleField47;
-      DoubleField89 = other.DoubleField89;
-      DoubleField48 = other.DoubleField48;
-      DoubleField49 = other.DoubleField49;
-      DoubleField50 = other.DoubleField50;
-      DoubleField90 = other.DoubleField90;
-      DoubleField51 = other.DoubleField51;
-      DoubleField91 = other.DoubleField91;
-      DoubleField92 = other.DoubleField92;
-      Int64Field107 = other.Int64Field107;
-      DoubleField93 = other.DoubleField93;
-      DoubleField108 = other.DoubleField108;
-      DoubleField52 = other.DoubleField52;
-      DoubleField53 = other.DoubleField53;
-      DoubleField94 = other.DoubleField94;
-      DoubleField54 = other.DoubleField54;
-      DoubleField55 = other.DoubleField55;
-      DoubleField56 = other.DoubleField56;
-      DoubleField57 = other.DoubleField57;
-      DoubleField58 = other.DoubleField58;
-      Int64Field59 = other.Int64Field59;
-      Int64Field60 = other.Int64Field60;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ManyWrapperFieldsMessage Clone() {
-      return new ManyWrapperFieldsMessage(this);
-    }
-
-    /// <summary>Field number for the "double_field_95" field.</summary>
-    public const int DoubleField95FieldNumber = 95;
-    private static readonly pb::FieldCodec<double?> _single_doubleField95_codec = pb::FieldCodec.ForStructWrapper<double>(762);
-    private double? doubleField95_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double? DoubleField95 {
-      get { return doubleField95_; }
-      set {
-        doubleField95_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "double_field_1" field.</summary>
-    public const int DoubleField1FieldNumber = 1;
-    private static readonly pb::FieldCodec<double?> _single_doubleField1_codec = pb::FieldCodec.ForStructWrapper<double>(10);
-    private double? doubleField1_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double? DoubleField1 {
-      get { return doubleField1_; }
-      set {
-        doubleField1_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "double_field_79" field.</summary>
-    public const int DoubleField79FieldNumber = 79;
-    private static readonly pb::FieldCodec<double?> _single_doubleField79_codec = pb::FieldCodec.ForStructWrapper<double>(634);
-    private double? doubleField79_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double? DoubleField79 {
-      get { return doubleField79_; }
-      set {
-        doubleField79_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "int64_field_2" field.</summary>
-    public const int Int64Field2FieldNumber = 2;
-    private static readonly pb::FieldCodec<long?> _single_int64Field2_codec = pb::FieldCodec.ForStructWrapper<long>(18);
-    private long? int64Field2_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public long? Int64Field2 {
-      get { return int64Field2_; }
-      set {
-        int64Field2_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "double_field_96" field.</summary>
-    public const int DoubleField96FieldNumber = 96;
-    private static readonly pb::FieldCodec<double?> _single_doubleField96_codec = pb::FieldCodec.ForStructWrapper<double>(770);
-    private double? doubleField96_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double? DoubleField96 {
-      get { return doubleField96_; }
-      set {
-        doubleField96_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "int64_field_3" field.</summary>
-    public const int Int64Field3FieldNumber = 3;
-    private static readonly pb::FieldCodec<long?> _single_int64Field3_codec = pb::FieldCodec.ForStructWrapper<long>(26);
-    private long? int64Field3_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public long? Int64Field3 {
-      get { return int64Field3_; }
-      set {
-        int64Field3_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "int64_field_4" field.</summary>
-    public const int Int64Field4FieldNumber = 4;
-    private static readonly pb::FieldCodec<long?> _single_int64Field4_codec = pb::FieldCodec.ForStructWrapper<long>(34);
-    private long? int64Field4_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public long? Int64Field4 {
-      get { return int64Field4_; }
-      set {
-        int64Field4_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "double_field_97" field.</summary>
-    public const int DoubleField97FieldNumber = 97;
-    private static readonly pb::FieldCodec<double?> _single_doubleField97_codec = pb::FieldCodec.ForStructWrapper<double>(778);
-    private double? doubleField97_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double? DoubleField97 {
-      get { return doubleField97_; }
-      set {
-        doubleField97_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "double_field_65" field.</summary>
-    public const int DoubleField65FieldNumber = 65;
-    private static readonly pb::FieldCodec<double?> _single_doubleField65_codec = pb::FieldCodec.ForStructWrapper<double>(522);
-    private double? doubleField65_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double? DoubleField65 {
-      get { return doubleField65_; }
-      set {
-        doubleField65_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "double_field_66" field.</summary>
-    public const int DoubleField66FieldNumber = 66;
-    private static readonly pb::FieldCodec<double?> _single_doubleField66_codec = pb::FieldCodec.ForStructWrapper<double>(530);
-    private double? doubleField66_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double? DoubleField66 {
-      get { return doubleField66_; }
-      set {
-        doubleField66_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "double_field_7" field.</summary>
-    public const int DoubleField7FieldNumber = 7;
-    private static readonly pb::FieldCodec<double?> _single_doubleField7_codec = pb::FieldCodec.ForStructWrapper<double>(58);
-    private double? doubleField7_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double? DoubleField7 {
-      get { return doubleField7_; }
-      set {
-        doubleField7_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "double_field_62" field.</summary>
-    public const int DoubleField62FieldNumber = 62;
-    private static readonly pb::FieldCodec<double?> _single_doubleField62_codec = pb::FieldCodec.ForStructWrapper<double>(498);
-    private double? doubleField62_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double? DoubleField62 {
-      get { return doubleField62_; }
-      set {
-        doubleField62_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "double_field_118" field.</summary>
-    public const int DoubleField118FieldNumber = 118;
-    private static readonly pb::FieldCodec<double?> _single_doubleField118_codec = pb::FieldCodec.ForStructWrapper<double>(946);
-    private double? doubleField118_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double? DoubleField118 {
-      get { return doubleField118_; }
-      set {
-        doubleField118_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "double_field_119" field.</summary>
-    public const int DoubleField119FieldNumber = 119;
-    private static readonly pb::FieldCodec<double?> _single_doubleField119_codec = pb::FieldCodec.ForStructWrapper<double>(954);
-    private double? doubleField119_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double? DoubleField119 {
-      get { return doubleField119_; }
-      set {
-        doubleField119_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "double_field_67" field.</summary>
-    public const int DoubleField67FieldNumber = 67;
-    private static readonly pb::FieldCodec<double?> _single_doubleField67_codec = pb::FieldCodec.ForStructWrapper<double>(538);
-    private double? doubleField67_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double? DoubleField67 {
-      get { return doubleField67_; }
-      set {
-        doubleField67_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "double_field_120" field.</summary>
-    public const int DoubleField120FieldNumber = 120;
-    private static readonly pb::FieldCodec<double?> _single_doubleField120_codec = pb::FieldCodec.ForStructWrapper<double>(962);
-    private double? doubleField120_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double? DoubleField120 {
-      get { return doubleField120_; }
-      set {
-        doubleField120_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "double_field_121" field.</summary>
-    public const int DoubleField121FieldNumber = 121;
-    private static readonly pb::FieldCodec<double?> _single_doubleField121_codec = pb::FieldCodec.ForStructWrapper<double>(970);
-    private double? doubleField121_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double? DoubleField121 {
-      get { return doubleField121_; }
-      set {
-        doubleField121_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "double_field_122" field.</summary>
-    public const int DoubleField122FieldNumber = 122;
-    private static readonly pb::FieldCodec<double?> _single_doubleField122_codec = pb::FieldCodec.ForStructWrapper<double>(978);
-    private double? doubleField122_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double? DoubleField122 {
-      get { return doubleField122_; }
-      set {
-        doubleField122_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "double_field_123" field.</summary>
-    public const int DoubleField123FieldNumber = 123;
-    private static readonly pb::FieldCodec<double?> _single_doubleField123_codec = pb::FieldCodec.ForStructWrapper<double>(986);
-    private double? doubleField123_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double? DoubleField123 {
-      get { return doubleField123_; }
-      set {
-        doubleField123_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "double_field_124" field.</summary>
-    public const int DoubleField124FieldNumber = 124;
-    private static readonly pb::FieldCodec<double?> _single_doubleField124_codec = pb::FieldCodec.ForStructWrapper<double>(994);
-    private double? doubleField124_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double? DoubleField124 {
-      get { return doubleField124_; }
-      set {
-        doubleField124_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "double_field_8" field.</summary>
-    public const int DoubleField8FieldNumber = 8;
-    private static readonly pb::FieldCodec<double?> _single_doubleField8_codec = pb::FieldCodec.ForStructWrapper<double>(66);
-    private double? doubleField8_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double? DoubleField8 {
-      get { return doubleField8_; }
-      set {
-        doubleField8_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "double_field_9" field.</summary>
-    public const int DoubleField9FieldNumber = 9;
-    private static readonly pb::FieldCodec<double?> _single_doubleField9_codec = pb::FieldCodec.ForStructWrapper<double>(74);
-    private double? doubleField9_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double? DoubleField9 {
-      get { return doubleField9_; }
-      set {
-        doubleField9_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "double_field_98" field.</summary>
-    public const int DoubleField98FieldNumber = 98;
-    private static readonly pb::FieldCodec<double?> _single_doubleField98_codec = pb::FieldCodec.ForStructWrapper<double>(786);
-    private double? doubleField98_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double? DoubleField98 {
-      get { return doubleField98_; }
-      set {
-        doubleField98_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "double_field_10" field.</summary>
-    public const int DoubleField10FieldNumber = 10;
-    private static readonly pb::FieldCodec<double?> _single_doubleField10_codec = pb::FieldCodec.ForStructWrapper<double>(82);
-    private double? doubleField10_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double? DoubleField10 {
-      get { return doubleField10_; }
-      set {
-        doubleField10_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "double_field_11" field.</summary>
-    public const int DoubleField11FieldNumber = 11;
-    private static readonly pb::FieldCodec<double?> _single_doubleField11_codec = pb::FieldCodec.ForStructWrapper<double>(90);
-    private double? doubleField11_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double? DoubleField11 {
-      get { return doubleField11_; }
-      set {
-        doubleField11_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "double_field_99" field.</summary>
-    public const int DoubleField99FieldNumber = 99;
-    private static readonly pb::FieldCodec<double?> _single_doubleField99_codec = pb::FieldCodec.ForStructWrapper<double>(794);
-    private double? doubleField99_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double? DoubleField99 {
-      get { return doubleField99_; }
-      set {
-        doubleField99_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "double_field_84" field.</summary>
-    public const int DoubleField84FieldNumber = 84;
-    private static readonly pb::FieldCodec<double?> _single_doubleField84_codec = pb::FieldCodec.ForStructWrapper<double>(674);
-    private double? doubleField84_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double? DoubleField84 {
-      get { return doubleField84_; }
-      set {
-        doubleField84_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "double_field_14" field.</summary>
-    public const int DoubleField14FieldNumber = 14;
-    private static readonly pb::FieldCodec<double?> _single_doubleField14_codec = pb::FieldCodec.ForStructWrapper<double>(114);
-    private double? doubleField14_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double? DoubleField14 {
-      get { return doubleField14_; }
-      set {
-        doubleField14_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "double_field_77" field.</summary>
-    public const int DoubleField77FieldNumber = 77;
-    private static readonly pb::FieldCodec<double?> _single_doubleField77_codec = pb::FieldCodec.ForStructWrapper<double>(618);
-    private double? doubleField77_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double? DoubleField77 {
-      get { return doubleField77_; }
-      set {
-        doubleField77_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "double_field_15" field.</summary>
-    public const int DoubleField15FieldNumber = 15;
-    private static readonly pb::FieldCodec<double?> _single_doubleField15_codec = pb::FieldCodec.ForStructWrapper<double>(122);
-    private double? doubleField15_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double? DoubleField15 {
-      get { return doubleField15_; }
-      set {
-        doubleField15_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "int64_field_19" field.</summary>
-    public const int Int64Field19FieldNumber = 19;
-    private static readonly pb::FieldCodec<long?> _single_int64Field19_codec = pb::FieldCodec.ForStructWrapper<long>(154);
-    private long? int64Field19_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public long? Int64Field19 {
-      get { return int64Field19_; }
-      set {
-        int64Field19_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "int64_field_115" field.</summary>
-    public const int Int64Field115FieldNumber = 115;
-    private static readonly pb::FieldCodec<long?> _single_int64Field115_codec = pb::FieldCodec.ForStructWrapper<long>(922);
-    private long? int64Field115_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public long? Int64Field115 {
-      get { return int64Field115_; }
-      set {
-        int64Field115_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "double_field_116" field.</summary>
-    public const int DoubleField116FieldNumber = 116;
-    private static readonly pb::FieldCodec<double?> _single_doubleField116_codec = pb::FieldCodec.ForStructWrapper<double>(930);
-    private double? doubleField116_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double? DoubleField116 {
-      get { return doubleField116_; }
-      set {
-        doubleField116_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "int64_field_117" field.</summary>
-    public const int Int64Field117FieldNumber = 117;
-    private static readonly pb::FieldCodec<long?> _single_int64Field117_codec = pb::FieldCodec.ForStructWrapper<long>(938);
-    private long? int64Field117_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public long? Int64Field117 {
-      get { return int64Field117_; }
-      set {
-        int64Field117_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "double_field_20" field.</summary>
-    public const int DoubleField20FieldNumber = 20;
-    private static readonly pb::FieldCodec<double?> _single_doubleField20_codec = pb::FieldCodec.ForStructWrapper<double>(162);
-    private double? doubleField20_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double? DoubleField20 {
-      get { return doubleField20_; }
-      set {
-        doubleField20_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "double_field_21" field.</summary>
-    public const int DoubleField21FieldNumber = 21;
-    private static readonly pb::FieldCodec<double?> _single_doubleField21_codec = pb::FieldCodec.ForStructWrapper<double>(170);
-    private double? doubleField21_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double? DoubleField21 {
-      get { return doubleField21_; }
-      set {
-        doubleField21_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "string_field_73" field.</summary>
-    public const int StringField73FieldNumber = 73;
-    private static readonly pb::FieldCodec<string> _single_stringField73_codec = pb::FieldCodec.ForClassWrapper<string>(586);
-    private string stringField73_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string StringField73 {
-      get { return stringField73_; }
-      set {
-        stringField73_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "string_field_74" field.</summary>
-    public const int StringField74FieldNumber = 74;
-    private static readonly pb::FieldCodec<string> _single_stringField74_codec = pb::FieldCodec.ForClassWrapper<string>(594);
-    private string stringField74_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string StringField74 {
-      get { return stringField74_; }
-      set {
-        stringField74_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "double_field_22" field.</summary>
-    public const int DoubleField22FieldNumber = 22;
-    private static readonly pb::FieldCodec<double?> _single_doubleField22_codec = pb::FieldCodec.ForStructWrapper<double>(178);
-    private double? doubleField22_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double? DoubleField22 {
-      get { return doubleField22_; }
-      set {
-        doubleField22_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "double_field_69" field.</summary>
-    public const int DoubleField69FieldNumber = 69;
-    private static readonly pb::FieldCodec<double?> _single_doubleField69_codec = pb::FieldCodec.ForStructWrapper<double>(554);
-    private double? doubleField69_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double? DoubleField69 {
-      get { return doubleField69_; }
-      set {
-        doubleField69_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "double_field_70" field.</summary>
-    public const int DoubleField70FieldNumber = 70;
-    private static readonly pb::FieldCodec<double?> _single_doubleField70_codec = pb::FieldCodec.ForStructWrapper<double>(562);
-    private double? doubleField70_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double? DoubleField70 {
-      get { return doubleField70_; }
-      set {
-        doubleField70_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "double_field_71" field.</summary>
-    public const int DoubleField71FieldNumber = 71;
-    private static readonly pb::FieldCodec<double?> _single_doubleField71_codec = pb::FieldCodec.ForStructWrapper<double>(570);
-    private double? doubleField71_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double? DoubleField71 {
-      get { return doubleField71_; }
-      set {
-        doubleField71_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "double_field_72" field.</summary>
-    public const int DoubleField72FieldNumber = 72;
-    private static readonly pb::FieldCodec<double?> _single_doubleField72_codec = pb::FieldCodec.ForStructWrapper<double>(578);
-    private double? doubleField72_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double? DoubleField72 {
-      get { return doubleField72_; }
-      set {
-        doubleField72_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "double_field_25" field.</summary>
-    public const int DoubleField25FieldNumber = 25;
-    private static readonly pb::FieldCodec<double?> _single_doubleField25_codec = pb::FieldCodec.ForStructWrapper<double>(202);
-    private double? doubleField25_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double? DoubleField25 {
-      get { return doubleField25_; }
-      set {
-        doubleField25_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "int64_field_26" field.</summary>
-    public const int Int64Field26FieldNumber = 26;
-    private static readonly pb::FieldCodec<long?> _single_int64Field26_codec = pb::FieldCodec.ForStructWrapper<long>(210);
-    private long? int64Field26_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public long? Int64Field26 {
-      get { return int64Field26_; }
-      set {
-        int64Field26_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "double_field_68" field.</summary>
-    public const int DoubleField68FieldNumber = 68;
-    private static readonly pb::FieldCodec<double?> _single_doubleField68_codec = pb::FieldCodec.ForStructWrapper<double>(546);
-    private double? doubleField68_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double? DoubleField68 {
-      get { return doubleField68_; }
-      set {
-        doubleField68_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "double_field_28" field.</summary>
-    public const int DoubleField28FieldNumber = 28;
-    private static readonly pb::FieldCodec<double?> _single_doubleField28_codec = pb::FieldCodec.ForStructWrapper<double>(226);
-    private double? doubleField28_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double? DoubleField28 {
-      get { return doubleField28_; }
-      set {
-        doubleField28_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "double_field_106" field.</summary>
-    public const int DoubleField106FieldNumber = 106;
-    private static readonly pb::FieldCodec<double?> _single_doubleField106_codec = pb::FieldCodec.ForStructWrapper<double>(850);
-    private double? doubleField106_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double? DoubleField106 {
-      get { return doubleField106_; }
-      set {
-        doubleField106_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "double_field_29" field.</summary>
-    public const int DoubleField29FieldNumber = 29;
-    private static readonly pb::FieldCodec<double?> _single_doubleField29_codec = pb::FieldCodec.ForStructWrapper<double>(234);
-    private double? doubleField29_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double? DoubleField29 {
-      get { return doubleField29_; }
-      set {
-        doubleField29_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "double_field_30" field.</summary>
-    public const int DoubleField30FieldNumber = 30;
-    private static readonly pb::FieldCodec<double?> _single_doubleField30_codec = pb::FieldCodec.ForStructWrapper<double>(242);
-    private double? doubleField30_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double? DoubleField30 {
-      get { return doubleField30_; }
-      set {
-        doubleField30_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "double_field_101" field.</summary>
-    public const int DoubleField101FieldNumber = 101;
-    private static readonly pb::FieldCodec<double?> _single_doubleField101_codec = pb::FieldCodec.ForStructWrapper<double>(810);
-    private double? doubleField101_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double? DoubleField101 {
-      get { return doubleField101_; }
-      set {
-        doubleField101_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "double_field_102" field.</summary>
-    public const int DoubleField102FieldNumber = 102;
-    private static readonly pb::FieldCodec<double?> _single_doubleField102_codec = pb::FieldCodec.ForStructWrapper<double>(818);
-    private double? doubleField102_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double? DoubleField102 {
-      get { return doubleField102_; }
-      set {
-        doubleField102_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "double_field_103" field.</summary>
-    public const int DoubleField103FieldNumber = 103;
-    private static readonly pb::FieldCodec<double?> _single_doubleField103_codec = pb::FieldCodec.ForStructWrapper<double>(826);
-    private double? doubleField103_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double? DoubleField103 {
-      get { return doubleField103_; }
-      set {
-        doubleField103_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "double_field_104" field.</summary>
-    public const int DoubleField104FieldNumber = 104;
-    private static readonly pb::FieldCodec<double?> _single_doubleField104_codec = pb::FieldCodec.ForStructWrapper<double>(834);
-    private double? doubleField104_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double? DoubleField104 {
-      get { return doubleField104_; }
-      set {
-        doubleField104_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "double_field_105" field.</summary>
-    public const int DoubleField105FieldNumber = 105;
-    private static readonly pb::FieldCodec<double?> _single_doubleField105_codec = pb::FieldCodec.ForStructWrapper<double>(842);
-    private double? doubleField105_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double? DoubleField105 {
-      get { return doubleField105_; }
-      set {
-        doubleField105_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "double_field_31" field.</summary>
-    public const int DoubleField31FieldNumber = 31;
-    private static readonly pb::FieldCodec<double?> _single_doubleField31_codec = pb::FieldCodec.ForStructWrapper<double>(250);
-    private double? doubleField31_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double? DoubleField31 {
-      get { return doubleField31_; }
-      set {
-        doubleField31_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "int64_field_32" field.</summary>
-    public const int Int64Field32FieldNumber = 32;
-    private static readonly pb::FieldCodec<long?> _single_int64Field32_codec = pb::FieldCodec.ForStructWrapper<long>(258);
-    private long? int64Field32_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public long? Int64Field32 {
-      get { return int64Field32_; }
-      set {
-        int64Field32_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "double_field_75" field.</summary>
-    public const int DoubleField75FieldNumber = 75;
-    private static readonly pb::FieldCodec<double?> _single_doubleField75_codec = pb::FieldCodec.ForStructWrapper<double>(602);
-    private double? doubleField75_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double? DoubleField75 {
-      get { return doubleField75_; }
-      set {
-        doubleField75_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "double_field_129" field.</summary>
-    public const int DoubleField129FieldNumber = 129;
-    private static readonly pb::FieldCodec<double?> _single_doubleField129_codec = pb::FieldCodec.ForStructWrapper<double>(1034);
-    private double? doubleField129_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double? DoubleField129 {
-      get { return doubleField129_; }
-      set {
-        doubleField129_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "enum_field_80" field.</summary>
-    public const int EnumField80FieldNumber = 80;
-    private int enumField80_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int EnumField80 {
-      get { return enumField80_; }
-      set {
-        enumField80_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "enum_field_81" field.</summary>
-    public const int EnumField81FieldNumber = 81;
-    private int enumField81_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int EnumField81 {
-      get { return enumField81_; }
-      set {
-        enumField81_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "int64_field_82" field.</summary>
-    public const int Int64Field82FieldNumber = 82;
-    private static readonly pb::FieldCodec<long?> _single_int64Field82_codec = pb::FieldCodec.ForStructWrapper<long>(658);
-    private long? int64Field82_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public long? Int64Field82 {
-      get { return int64Field82_; }
-      set {
-        int64Field82_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "enum_field_83" field.</summary>
-    public const int EnumField83FieldNumber = 83;
-    private int enumField83_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int EnumField83 {
-      get { return enumField83_; }
-      set {
-        enumField83_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "int64_field_85" field.</summary>
-    public const int Int64Field85FieldNumber = 85;
-    private static readonly pb::FieldCodec<long?> _single_int64Field85_codec = pb::FieldCodec.ForStructWrapper<long>(682);
-    private long? int64Field85_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public long? Int64Field85 {
-      get { return int64Field85_; }
-      set {
-        int64Field85_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "int64_field_86" field.</summary>
-    public const int Int64Field86FieldNumber = 86;
-    private static readonly pb::FieldCodec<long?> _single_int64Field86_codec = pb::FieldCodec.ForStructWrapper<long>(690);
-    private long? int64Field86_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public long? Int64Field86 {
-      get { return int64Field86_; }
-      set {
-        int64Field86_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "int64_field_87" field.</summary>
-    public const int Int64Field87FieldNumber = 87;
-    private static readonly pb::FieldCodec<long?> _single_int64Field87_codec = pb::FieldCodec.ForStructWrapper<long>(698);
-    private long? int64Field87_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public long? Int64Field87 {
-      get { return int64Field87_; }
-      set {
-        int64Field87_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "int64_field_125" field.</summary>
-    public const int Int64Field125FieldNumber = 125;
-    private static readonly pb::FieldCodec<long?> _single_int64Field125_codec = pb::FieldCodec.ForStructWrapper<long>(1002);
-    private long? int64Field125_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public long? Int64Field125 {
-      get { return int64Field125_; }
-      set {
-        int64Field125_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "int64_field_37" field.</summary>
-    public const int Int64Field37FieldNumber = 37;
-    private static readonly pb::FieldCodec<long?> _single_int64Field37_codec = pb::FieldCodec.ForStructWrapper<long>(298);
-    private long? int64Field37_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public long? Int64Field37 {
-      get { return int64Field37_; }
-      set {
-        int64Field37_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "double_field_38" field.</summary>
-    public const int DoubleField38FieldNumber = 38;
-    private static readonly pb::FieldCodec<double?> _single_doubleField38_codec = pb::FieldCodec.ForStructWrapper<double>(306);
-    private double? doubleField38_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double? DoubleField38 {
-      get { return doubleField38_; }
-      set {
-        doubleField38_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "interactions" field.</summary>
-    public const int InteractionsFieldNumber = 39;
-    private static readonly pb::FieldCodec<long?> _single_interactions_codec = pb::FieldCodec.ForStructWrapper<long>(314);
-    private long? interactions_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public long? Interactions {
-      get { return interactions_; }
-      set {
-        interactions_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "repeated_int_field_100" field.</summary>
-    public const int RepeatedIntField100FieldNumber = 100;
-    private static readonly pb::FieldCodec<int> _repeated_repeatedIntField100_codec
-        = pb::FieldCodec.ForInt32(802);
-    private readonly pbc::RepeatedField<int> repeatedIntField100_ = new pbc::RepeatedField<int>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<int> RepeatedIntField100 {
-      get { return repeatedIntField100_; }
-    }
-
-    /// <summary>Field number for the "double_field_40" field.</summary>
-    public const int DoubleField40FieldNumber = 40;
-    private static readonly pb::FieldCodec<double?> _single_doubleField40_codec = pb::FieldCodec.ForStructWrapper<double>(322);
-    private double? doubleField40_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double? DoubleField40 {
-      get { return doubleField40_; }
-      set {
-        doubleField40_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "int64_field_41" field.</summary>
-    public const int Int64Field41FieldNumber = 41;
-    private static readonly pb::FieldCodec<long?> _single_int64Field41_codec = pb::FieldCodec.ForStructWrapper<long>(330);
-    private long? int64Field41_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public long? Int64Field41 {
-      get { return int64Field41_; }
-      set {
-        int64Field41_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "int64_field_126" field.</summary>
-    public const int Int64Field126FieldNumber = 126;
-    private static readonly pb::FieldCodec<long?> _single_int64Field126_codec = pb::FieldCodec.ForStructWrapper<long>(1010);
-    private long? int64Field126_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public long? Int64Field126 {
-      get { return int64Field126_; }
-      set {
-        int64Field126_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "int64_field_127" field.</summary>
-    public const int Int64Field127FieldNumber = 127;
-    private static readonly pb::FieldCodec<long?> _single_int64Field127_codec = pb::FieldCodec.ForStructWrapper<long>(1018);
-    private long? int64Field127_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public long? Int64Field127 {
-      get { return int64Field127_; }
-      set {
-        int64Field127_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "double_field_128" field.</summary>
-    public const int DoubleField128FieldNumber = 128;
-    private static readonly pb::FieldCodec<double?> _single_doubleField128_codec = pb::FieldCodec.ForStructWrapper<double>(1026);
-    private double? doubleField128_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double? DoubleField128 {
-      get { return doubleField128_; }
-      set {
-        doubleField128_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "double_field_109" field.</summary>
-    public const int DoubleField109FieldNumber = 109;
-    private static readonly pb::FieldCodec<double?> _single_doubleField109_codec = pb::FieldCodec.ForStructWrapper<double>(874);
-    private double? doubleField109_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double? DoubleField109 {
-      get { return doubleField109_; }
-      set {
-        doubleField109_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "int64_field_110" field.</summary>
-    public const int Int64Field110FieldNumber = 110;
-    private static readonly pb::FieldCodec<long?> _single_int64Field110_codec = pb::FieldCodec.ForStructWrapper<long>(882);
-    private long? int64Field110_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public long? Int64Field110 {
-      get { return int64Field110_; }
-      set {
-        int64Field110_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "double_field_111" field.</summary>
-    public const int DoubleField111FieldNumber = 111;
-    private static readonly pb::FieldCodec<double?> _single_doubleField111_codec = pb::FieldCodec.ForStructWrapper<double>(890);
-    private double? doubleField111_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double? DoubleField111 {
-      get { return doubleField111_; }
-      set {
-        doubleField111_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "int64_field_112" field.</summary>
-    public const int Int64Field112FieldNumber = 112;
-    private static readonly pb::FieldCodec<long?> _single_int64Field112_codec = pb::FieldCodec.ForStructWrapper<long>(898);
-    private long? int64Field112_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public long? Int64Field112 {
-      get { return int64Field112_; }
-      set {
-        int64Field112_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "double_field_113" field.</summary>
-    public const int DoubleField113FieldNumber = 113;
-    private static readonly pb::FieldCodec<double?> _single_doubleField113_codec = pb::FieldCodec.ForStructWrapper<double>(906);
-    private double? doubleField113_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double? DoubleField113 {
-      get { return doubleField113_; }
-      set {
-        doubleField113_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "int64_field_114" field.</summary>
-    public const int Int64Field114FieldNumber = 114;
-    private static readonly pb::FieldCodec<long?> _single_int64Field114_codec = pb::FieldCodec.ForStructWrapper<long>(914);
-    private long? int64Field114_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public long? Int64Field114 {
-      get { return int64Field114_; }
-      set {
-        int64Field114_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "double_field_42" field.</summary>
-    public const int DoubleField42FieldNumber = 42;
-    private static readonly pb::FieldCodec<double?> _single_doubleField42_codec = pb::FieldCodec.ForStructWrapper<double>(338);
-    private double? doubleField42_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double? DoubleField42 {
-      get { return doubleField42_; }
-      set {
-        doubleField42_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "int64_field_43" field.</summary>
-    public const int Int64Field43FieldNumber = 43;
-    private static readonly pb::FieldCodec<long?> _single_int64Field43_codec = pb::FieldCodec.ForStructWrapper<long>(346);
-    private long? int64Field43_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public long? Int64Field43 {
-      get { return int64Field43_; }
-      set {
-        int64Field43_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "int64_field_44" field.</summary>
-    public const int Int64Field44FieldNumber = 44;
-    private static readonly pb::FieldCodec<long?> _single_int64Field44_codec = pb::FieldCodec.ForStructWrapper<long>(354);
-    private long? int64Field44_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public long? Int64Field44 {
-      get { return int64Field44_; }
-      set {
-        int64Field44_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "double_field_45" field.</summary>
-    public const int DoubleField45FieldNumber = 45;
-    private static readonly pb::FieldCodec<double?> _single_doubleField45_codec = pb::FieldCodec.ForStructWrapper<double>(362);
-    private double? doubleField45_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double? DoubleField45 {
-      get { return doubleField45_; }
-      set {
-        doubleField45_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "double_field_46" field.</summary>
-    public const int DoubleField46FieldNumber = 46;
-    private static readonly pb::FieldCodec<double?> _single_doubleField46_codec = pb::FieldCodec.ForStructWrapper<double>(370);
-    private double? doubleField46_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double? DoubleField46 {
-      get { return doubleField46_; }
-      set {
-        doubleField46_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "double_field_78" field.</summary>
-    public const int DoubleField78FieldNumber = 78;
-    private static readonly pb::FieldCodec<double?> _single_doubleField78_codec = pb::FieldCodec.ForStructWrapper<double>(626);
-    private double? doubleField78_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double? DoubleField78 {
-      get { return doubleField78_; }
-      set {
-        doubleField78_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "double_field_88" field.</summary>
-    public const int DoubleField88FieldNumber = 88;
-    private static readonly pb::FieldCodec<double?> _single_doubleField88_codec = pb::FieldCodec.ForStructWrapper<double>(706);
-    private double? doubleField88_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double? DoubleField88 {
-      get { return doubleField88_; }
-      set {
-        doubleField88_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "double_field_47" field.</summary>
-    public const int DoubleField47FieldNumber = 47;
-    private static readonly pb::FieldCodec<double?> _single_doubleField47_codec = pb::FieldCodec.ForStructWrapper<double>(378);
-    private double? doubleField47_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double? DoubleField47 {
-      get { return doubleField47_; }
-      set {
-        doubleField47_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "double_field_89" field.</summary>
-    public const int DoubleField89FieldNumber = 89;
-    private static readonly pb::FieldCodec<double?> _single_doubleField89_codec = pb::FieldCodec.ForStructWrapper<double>(714);
-    private double? doubleField89_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double? DoubleField89 {
-      get { return doubleField89_; }
-      set {
-        doubleField89_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "double_field_48" field.</summary>
-    public const int DoubleField48FieldNumber = 48;
-    private static readonly pb::FieldCodec<double?> _single_doubleField48_codec = pb::FieldCodec.ForStructWrapper<double>(386);
-    private double? doubleField48_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double? DoubleField48 {
-      get { return doubleField48_; }
-      set {
-        doubleField48_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "double_field_49" field.</summary>
-    public const int DoubleField49FieldNumber = 49;
-    private static readonly pb::FieldCodec<double?> _single_doubleField49_codec = pb::FieldCodec.ForStructWrapper<double>(394);
-    private double? doubleField49_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double? DoubleField49 {
-      get { return doubleField49_; }
-      set {
-        doubleField49_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "double_field_50" field.</summary>
-    public const int DoubleField50FieldNumber = 50;
-    private static readonly pb::FieldCodec<double?> _single_doubleField50_codec = pb::FieldCodec.ForStructWrapper<double>(402);
-    private double? doubleField50_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double? DoubleField50 {
-      get { return doubleField50_; }
-      set {
-        doubleField50_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "double_field_90" field.</summary>
-    public const int DoubleField90FieldNumber = 90;
-    private static readonly pb::FieldCodec<double?> _single_doubleField90_codec = pb::FieldCodec.ForStructWrapper<double>(722);
-    private double? doubleField90_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double? DoubleField90 {
-      get { return doubleField90_; }
-      set {
-        doubleField90_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "double_field_51" field.</summary>
-    public const int DoubleField51FieldNumber = 51;
-    private static readonly pb::FieldCodec<double?> _single_doubleField51_codec = pb::FieldCodec.ForStructWrapper<double>(410);
-    private double? doubleField51_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double? DoubleField51 {
-      get { return doubleField51_; }
-      set {
-        doubleField51_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "double_field_91" field.</summary>
-    public const int DoubleField91FieldNumber = 91;
-    private static readonly pb::FieldCodec<double?> _single_doubleField91_codec = pb::FieldCodec.ForStructWrapper<double>(730);
-    private double? doubleField91_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double? DoubleField91 {
-      get { return doubleField91_; }
-      set {
-        doubleField91_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "double_field_92" field.</summary>
-    public const int DoubleField92FieldNumber = 92;
-    private static readonly pb::FieldCodec<double?> _single_doubleField92_codec = pb::FieldCodec.ForStructWrapper<double>(738);
-    private double? doubleField92_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double? DoubleField92 {
-      get { return doubleField92_; }
-      set {
-        doubleField92_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "int64_field_107" field.</summary>
-    public const int Int64Field107FieldNumber = 107;
-    private static readonly pb::FieldCodec<long?> _single_int64Field107_codec = pb::FieldCodec.ForStructWrapper<long>(858);
-    private long? int64Field107_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public long? Int64Field107 {
-      get { return int64Field107_; }
-      set {
-        int64Field107_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "double_field_93" field.</summary>
-    public const int DoubleField93FieldNumber = 93;
-    private static readonly pb::FieldCodec<double?> _single_doubleField93_codec = pb::FieldCodec.ForStructWrapper<double>(746);
-    private double? doubleField93_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double? DoubleField93 {
-      get { return doubleField93_; }
-      set {
-        doubleField93_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "double_field_108" field.</summary>
-    public const int DoubleField108FieldNumber = 108;
-    private static readonly pb::FieldCodec<double?> _single_doubleField108_codec = pb::FieldCodec.ForStructWrapper<double>(866);
-    private double? doubleField108_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double? DoubleField108 {
-      get { return doubleField108_; }
-      set {
-        doubleField108_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "double_field_52" field.</summary>
-    public const int DoubleField52FieldNumber = 52;
-    private static readonly pb::FieldCodec<double?> _single_doubleField52_codec = pb::FieldCodec.ForStructWrapper<double>(418);
-    private double? doubleField52_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double? DoubleField52 {
-      get { return doubleField52_; }
-      set {
-        doubleField52_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "double_field_53" field.</summary>
-    public const int DoubleField53FieldNumber = 53;
-    private static readonly pb::FieldCodec<double?> _single_doubleField53_codec = pb::FieldCodec.ForStructWrapper<double>(426);
-    private double? doubleField53_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double? DoubleField53 {
-      get { return doubleField53_; }
-      set {
-        doubleField53_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "double_field_94" field.</summary>
-    public const int DoubleField94FieldNumber = 94;
-    private static readonly pb::FieldCodec<double?> _single_doubleField94_codec = pb::FieldCodec.ForStructWrapper<double>(754);
-    private double? doubleField94_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double? DoubleField94 {
-      get { return doubleField94_; }
-      set {
-        doubleField94_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "double_field_54" field.</summary>
-    public const int DoubleField54FieldNumber = 54;
-    private static readonly pb::FieldCodec<double?> _single_doubleField54_codec = pb::FieldCodec.ForStructWrapper<double>(434);
-    private double? doubleField54_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double? DoubleField54 {
-      get { return doubleField54_; }
-      set {
-        doubleField54_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "double_field_55" field.</summary>
-    public const int DoubleField55FieldNumber = 55;
-    private static readonly pb::FieldCodec<double?> _single_doubleField55_codec = pb::FieldCodec.ForStructWrapper<double>(442);
-    private double? doubleField55_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double? DoubleField55 {
-      get { return doubleField55_; }
-      set {
-        doubleField55_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "double_field_56" field.</summary>
-    public const int DoubleField56FieldNumber = 56;
-    private static readonly pb::FieldCodec<double?> _single_doubleField56_codec = pb::FieldCodec.ForStructWrapper<double>(450);
-    private double? doubleField56_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double? DoubleField56 {
-      get { return doubleField56_; }
-      set {
-        doubleField56_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "double_field_57" field.</summary>
-    public const int DoubleField57FieldNumber = 57;
-    private static readonly pb::FieldCodec<double?> _single_doubleField57_codec = pb::FieldCodec.ForStructWrapper<double>(458);
-    private double? doubleField57_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double? DoubleField57 {
-      get { return doubleField57_; }
-      set {
-        doubleField57_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "double_field_58" field.</summary>
-    public const int DoubleField58FieldNumber = 58;
-    private static readonly pb::FieldCodec<double?> _single_doubleField58_codec = pb::FieldCodec.ForStructWrapper<double>(466);
-    private double? doubleField58_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double? DoubleField58 {
-      get { return doubleField58_; }
-      set {
-        doubleField58_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "int64_field_59" field.</summary>
-    public const int Int64Field59FieldNumber = 59;
-    private static readonly pb::FieldCodec<long?> _single_int64Field59_codec = pb::FieldCodec.ForStructWrapper<long>(474);
-    private long? int64Field59_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public long? Int64Field59 {
-      get { return int64Field59_; }
-      set {
-        int64Field59_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "int64_field_60" field.</summary>
-    public const int Int64Field60FieldNumber = 60;
-    private static readonly pb::FieldCodec<long?> _single_int64Field60_codec = pb::FieldCodec.ForStructWrapper<long>(482);
-    private long? int64Field60_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public long? Int64Field60 {
-      get { return int64Field60_; }
-      set {
-        int64Field60_ = value;
-      }
-    }
-
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as ManyWrapperFieldsMessage);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(ManyWrapperFieldsMessage other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (!pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.Equals(DoubleField95, other.DoubleField95)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.Equals(DoubleField1, other.DoubleField1)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.Equals(DoubleField79, other.DoubleField79)) return false;
-      if (Int64Field2 != other.Int64Field2) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.Equals(DoubleField96, other.DoubleField96)) return false;
-      if (Int64Field3 != other.Int64Field3) return false;
-      if (Int64Field4 != other.Int64Field4) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.Equals(DoubleField97, other.DoubleField97)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.Equals(DoubleField65, other.DoubleField65)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.Equals(DoubleField66, other.DoubleField66)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.Equals(DoubleField7, other.DoubleField7)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.Equals(DoubleField62, other.DoubleField62)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.Equals(DoubleField118, other.DoubleField118)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.Equals(DoubleField119, other.DoubleField119)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.Equals(DoubleField67, other.DoubleField67)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.Equals(DoubleField120, other.DoubleField120)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.Equals(DoubleField121, other.DoubleField121)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.Equals(DoubleField122, other.DoubleField122)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.Equals(DoubleField123, other.DoubleField123)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.Equals(DoubleField124, other.DoubleField124)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.Equals(DoubleField8, other.DoubleField8)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.Equals(DoubleField9, other.DoubleField9)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.Equals(DoubleField98, other.DoubleField98)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.Equals(DoubleField10, other.DoubleField10)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.Equals(DoubleField11, other.DoubleField11)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.Equals(DoubleField99, other.DoubleField99)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.Equals(DoubleField84, other.DoubleField84)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.Equals(DoubleField14, other.DoubleField14)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.Equals(DoubleField77, other.DoubleField77)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.Equals(DoubleField15, other.DoubleField15)) return false;
-      if (Int64Field19 != other.Int64Field19) return false;
-      if (Int64Field115 != other.Int64Field115) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.Equals(DoubleField116, other.DoubleField116)) return false;
-      if (Int64Field117 != other.Int64Field117) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.Equals(DoubleField20, other.DoubleField20)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.Equals(DoubleField21, other.DoubleField21)) return false;
-      if (StringField73 != other.StringField73) return false;
-      if (StringField74 != other.StringField74) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.Equals(DoubleField22, other.DoubleField22)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.Equals(DoubleField69, other.DoubleField69)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.Equals(DoubleField70, other.DoubleField70)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.Equals(DoubleField71, other.DoubleField71)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.Equals(DoubleField72, other.DoubleField72)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.Equals(DoubleField25, other.DoubleField25)) return false;
-      if (Int64Field26 != other.Int64Field26) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.Equals(DoubleField68, other.DoubleField68)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.Equals(DoubleField28, other.DoubleField28)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.Equals(DoubleField106, other.DoubleField106)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.Equals(DoubleField29, other.DoubleField29)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.Equals(DoubleField30, other.DoubleField30)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.Equals(DoubleField101, other.DoubleField101)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.Equals(DoubleField102, other.DoubleField102)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.Equals(DoubleField103, other.DoubleField103)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.Equals(DoubleField104, other.DoubleField104)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.Equals(DoubleField105, other.DoubleField105)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.Equals(DoubleField31, other.DoubleField31)) return false;
-      if (Int64Field32 != other.Int64Field32) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.Equals(DoubleField75, other.DoubleField75)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.Equals(DoubleField129, other.DoubleField129)) return false;
-      if (EnumField80 != other.EnumField80) return false;
-      if (EnumField81 != other.EnumField81) return false;
-      if (Int64Field82 != other.Int64Field82) return false;
-      if (EnumField83 != other.EnumField83) return false;
-      if (Int64Field85 != other.Int64Field85) return false;
-      if (Int64Field86 != other.Int64Field86) return false;
-      if (Int64Field87 != other.Int64Field87) return false;
-      if (Int64Field125 != other.Int64Field125) return false;
-      if (Int64Field37 != other.Int64Field37) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.Equals(DoubleField38, other.DoubleField38)) return false;
-      if (Interactions != other.Interactions) return false;
-      if(!repeatedIntField100_.Equals(other.repeatedIntField100_)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.Equals(DoubleField40, other.DoubleField40)) return false;
-      if (Int64Field41 != other.Int64Field41) return false;
-      if (Int64Field126 != other.Int64Field126) return false;
-      if (Int64Field127 != other.Int64Field127) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.Equals(DoubleField128, other.DoubleField128)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.Equals(DoubleField109, other.DoubleField109)) return false;
-      if (Int64Field110 != other.Int64Field110) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.Equals(DoubleField111, other.DoubleField111)) return false;
-      if (Int64Field112 != other.Int64Field112) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.Equals(DoubleField113, other.DoubleField113)) return false;
-      if (Int64Field114 != other.Int64Field114) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.Equals(DoubleField42, other.DoubleField42)) return false;
-      if (Int64Field43 != other.Int64Field43) return false;
-      if (Int64Field44 != other.Int64Field44) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.Equals(DoubleField45, other.DoubleField45)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.Equals(DoubleField46, other.DoubleField46)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.Equals(DoubleField78, other.DoubleField78)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.Equals(DoubleField88, other.DoubleField88)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.Equals(DoubleField47, other.DoubleField47)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.Equals(DoubleField89, other.DoubleField89)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.Equals(DoubleField48, other.DoubleField48)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.Equals(DoubleField49, other.DoubleField49)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.Equals(DoubleField50, other.DoubleField50)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.Equals(DoubleField90, other.DoubleField90)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.Equals(DoubleField51, other.DoubleField51)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.Equals(DoubleField91, other.DoubleField91)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.Equals(DoubleField92, other.DoubleField92)) return false;
-      if (Int64Field107 != other.Int64Field107) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.Equals(DoubleField93, other.DoubleField93)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.Equals(DoubleField108, other.DoubleField108)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.Equals(DoubleField52, other.DoubleField52)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.Equals(DoubleField53, other.DoubleField53)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.Equals(DoubleField94, other.DoubleField94)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.Equals(DoubleField54, other.DoubleField54)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.Equals(DoubleField55, other.DoubleField55)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.Equals(DoubleField56, other.DoubleField56)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.Equals(DoubleField57, other.DoubleField57)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.Equals(DoubleField58, other.DoubleField58)) return false;
-      if (Int64Field59 != other.Int64Field59) return false;
-      if (Int64Field60 != other.Int64Field60) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (doubleField95_ != null) hash ^= pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.GetHashCode(DoubleField95);
-      if (doubleField1_ != null) hash ^= pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.GetHashCode(DoubleField1);
-      if (doubleField79_ != null) hash ^= pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.GetHashCode(DoubleField79);
-      if (int64Field2_ != null) hash ^= Int64Field2.GetHashCode();
-      if (doubleField96_ != null) hash ^= pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.GetHashCode(DoubleField96);
-      if (int64Field3_ != null) hash ^= Int64Field3.GetHashCode();
-      if (int64Field4_ != null) hash ^= Int64Field4.GetHashCode();
-      if (doubleField97_ != null) hash ^= pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.GetHashCode(DoubleField97);
-      if (doubleField65_ != null) hash ^= pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.GetHashCode(DoubleField65);
-      if (doubleField66_ != null) hash ^= pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.GetHashCode(DoubleField66);
-      if (doubleField7_ != null) hash ^= pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.GetHashCode(DoubleField7);
-      if (doubleField62_ != null) hash ^= pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.GetHashCode(DoubleField62);
-      if (doubleField118_ != null) hash ^= pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.GetHashCode(DoubleField118);
-      if (doubleField119_ != null) hash ^= pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.GetHashCode(DoubleField119);
-      if (doubleField67_ != null) hash ^= pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.GetHashCode(DoubleField67);
-      if (doubleField120_ != null) hash ^= pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.GetHashCode(DoubleField120);
-      if (doubleField121_ != null) hash ^= pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.GetHashCode(DoubleField121);
-      if (doubleField122_ != null) hash ^= pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.GetHashCode(DoubleField122);
-      if (doubleField123_ != null) hash ^= pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.GetHashCode(DoubleField123);
-      if (doubleField124_ != null) hash ^= pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.GetHashCode(DoubleField124);
-      if (doubleField8_ != null) hash ^= pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.GetHashCode(DoubleField8);
-      if (doubleField9_ != null) hash ^= pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.GetHashCode(DoubleField9);
-      if (doubleField98_ != null) hash ^= pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.GetHashCode(DoubleField98);
-      if (doubleField10_ != null) hash ^= pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.GetHashCode(DoubleField10);
-      if (doubleField11_ != null) hash ^= pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.GetHashCode(DoubleField11);
-      if (doubleField99_ != null) hash ^= pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.GetHashCode(DoubleField99);
-      if (doubleField84_ != null) hash ^= pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.GetHashCode(DoubleField84);
-      if (doubleField14_ != null) hash ^= pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.GetHashCode(DoubleField14);
-      if (doubleField77_ != null) hash ^= pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.GetHashCode(DoubleField77);
-      if (doubleField15_ != null) hash ^= pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.GetHashCode(DoubleField15);
-      if (int64Field19_ != null) hash ^= Int64Field19.GetHashCode();
-      if (int64Field115_ != null) hash ^= Int64Field115.GetHashCode();
-      if (doubleField116_ != null) hash ^= pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.GetHashCode(DoubleField116);
-      if (int64Field117_ != null) hash ^= Int64Field117.GetHashCode();
-      if (doubleField20_ != null) hash ^= pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.GetHashCode(DoubleField20);
-      if (doubleField21_ != null) hash ^= pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.GetHashCode(DoubleField21);
-      if (stringField73_ != null) hash ^= StringField73.GetHashCode();
-      if (stringField74_ != null) hash ^= StringField74.GetHashCode();
-      if (doubleField22_ != null) hash ^= pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.GetHashCode(DoubleField22);
-      if (doubleField69_ != null) hash ^= pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.GetHashCode(DoubleField69);
-      if (doubleField70_ != null) hash ^= pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.GetHashCode(DoubleField70);
-      if (doubleField71_ != null) hash ^= pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.GetHashCode(DoubleField71);
-      if (doubleField72_ != null) hash ^= pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.GetHashCode(DoubleField72);
-      if (doubleField25_ != null) hash ^= pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.GetHashCode(DoubleField25);
-      if (int64Field26_ != null) hash ^= Int64Field26.GetHashCode();
-      if (doubleField68_ != null) hash ^= pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.GetHashCode(DoubleField68);
-      if (doubleField28_ != null) hash ^= pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.GetHashCode(DoubleField28);
-      if (doubleField106_ != null) hash ^= pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.GetHashCode(DoubleField106);
-      if (doubleField29_ != null) hash ^= pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.GetHashCode(DoubleField29);
-      if (doubleField30_ != null) hash ^= pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.GetHashCode(DoubleField30);
-      if (doubleField101_ != null) hash ^= pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.GetHashCode(DoubleField101);
-      if (doubleField102_ != null) hash ^= pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.GetHashCode(DoubleField102);
-      if (doubleField103_ != null) hash ^= pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.GetHashCode(DoubleField103);
-      if (doubleField104_ != null) hash ^= pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.GetHashCode(DoubleField104);
-      if (doubleField105_ != null) hash ^= pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.GetHashCode(DoubleField105);
-      if (doubleField31_ != null) hash ^= pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.GetHashCode(DoubleField31);
-      if (int64Field32_ != null) hash ^= Int64Field32.GetHashCode();
-      if (doubleField75_ != null) hash ^= pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.GetHashCode(DoubleField75);
-      if (doubleField129_ != null) hash ^= pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.GetHashCode(DoubleField129);
-      if (EnumField80 != 0) hash ^= EnumField80.GetHashCode();
-      if (EnumField81 != 0) hash ^= EnumField81.GetHashCode();
-      if (int64Field82_ != null) hash ^= Int64Field82.GetHashCode();
-      if (EnumField83 != 0) hash ^= EnumField83.GetHashCode();
-      if (int64Field85_ != null) hash ^= Int64Field85.GetHashCode();
-      if (int64Field86_ != null) hash ^= Int64Field86.GetHashCode();
-      if (int64Field87_ != null) hash ^= Int64Field87.GetHashCode();
-      if (int64Field125_ != null) hash ^= Int64Field125.GetHashCode();
-      if (int64Field37_ != null) hash ^= Int64Field37.GetHashCode();
-      if (doubleField38_ != null) hash ^= pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.GetHashCode(DoubleField38);
-      if (interactions_ != null) hash ^= Interactions.GetHashCode();
-      hash ^= repeatedIntField100_.GetHashCode();
-      if (doubleField40_ != null) hash ^= pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.GetHashCode(DoubleField40);
-      if (int64Field41_ != null) hash ^= Int64Field41.GetHashCode();
-      if (int64Field126_ != null) hash ^= Int64Field126.GetHashCode();
-      if (int64Field127_ != null) hash ^= Int64Field127.GetHashCode();
-      if (doubleField128_ != null) hash ^= pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.GetHashCode(DoubleField128);
-      if (doubleField109_ != null) hash ^= pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.GetHashCode(DoubleField109);
-      if (int64Field110_ != null) hash ^= Int64Field110.GetHashCode();
-      if (doubleField111_ != null) hash ^= pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.GetHashCode(DoubleField111);
-      if (int64Field112_ != null) hash ^= Int64Field112.GetHashCode();
-      if (doubleField113_ != null) hash ^= pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.GetHashCode(DoubleField113);
-      if (int64Field114_ != null) hash ^= Int64Field114.GetHashCode();
-      if (doubleField42_ != null) hash ^= pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.GetHashCode(DoubleField42);
-      if (int64Field43_ != null) hash ^= Int64Field43.GetHashCode();
-      if (int64Field44_ != null) hash ^= Int64Field44.GetHashCode();
-      if (doubleField45_ != null) hash ^= pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.GetHashCode(DoubleField45);
-      if (doubleField46_ != null) hash ^= pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.GetHashCode(DoubleField46);
-      if (doubleField78_ != null) hash ^= pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.GetHashCode(DoubleField78);
-      if (doubleField88_ != null) hash ^= pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.GetHashCode(DoubleField88);
-      if (doubleField47_ != null) hash ^= pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.GetHashCode(DoubleField47);
-      if (doubleField89_ != null) hash ^= pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.GetHashCode(DoubleField89);
-      if (doubleField48_ != null) hash ^= pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.GetHashCode(DoubleField48);
-      if (doubleField49_ != null) hash ^= pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.GetHashCode(DoubleField49);
-      if (doubleField50_ != null) hash ^= pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.GetHashCode(DoubleField50);
-      if (doubleField90_ != null) hash ^= pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.GetHashCode(DoubleField90);
-      if (doubleField51_ != null) hash ^= pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.GetHashCode(DoubleField51);
-      if (doubleField91_ != null) hash ^= pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.GetHashCode(DoubleField91);
-      if (doubleField92_ != null) hash ^= pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.GetHashCode(DoubleField92);
-      if (int64Field107_ != null) hash ^= Int64Field107.GetHashCode();
-      if (doubleField93_ != null) hash ^= pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.GetHashCode(DoubleField93);
-      if (doubleField108_ != null) hash ^= pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.GetHashCode(DoubleField108);
-      if (doubleField52_ != null) hash ^= pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.GetHashCode(DoubleField52);
-      if (doubleField53_ != null) hash ^= pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.GetHashCode(DoubleField53);
-      if (doubleField94_ != null) hash ^= pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.GetHashCode(DoubleField94);
-      if (doubleField54_ != null) hash ^= pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.GetHashCode(DoubleField54);
-      if (doubleField55_ != null) hash ^= pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.GetHashCode(DoubleField55);
-      if (doubleField56_ != null) hash ^= pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.GetHashCode(DoubleField56);
-      if (doubleField57_ != null) hash ^= pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.GetHashCode(DoubleField57);
-      if (doubleField58_ != null) hash ^= pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.GetHashCode(DoubleField58);
-      if (int64Field59_ != null) hash ^= Int64Field59.GetHashCode();
-      if (int64Field60_ != null) hash ^= Int64Field60.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (doubleField1_ != null) {
-        _single_doubleField1_codec.WriteTagAndValue(output, DoubleField1);
-      }
-      if (int64Field2_ != null) {
-        _single_int64Field2_codec.WriteTagAndValue(output, Int64Field2);
-      }
-      if (int64Field3_ != null) {
-        _single_int64Field3_codec.WriteTagAndValue(output, Int64Field3);
-      }
-      if (int64Field4_ != null) {
-        _single_int64Field4_codec.WriteTagAndValue(output, Int64Field4);
-      }
-      if (doubleField7_ != null) {
-        _single_doubleField7_codec.WriteTagAndValue(output, DoubleField7);
-      }
-      if (doubleField8_ != null) {
-        _single_doubleField8_codec.WriteTagAndValue(output, DoubleField8);
-      }
-      if (doubleField9_ != null) {
-        _single_doubleField9_codec.WriteTagAndValue(output, DoubleField9);
-      }
-      if (doubleField10_ != null) {
-        _single_doubleField10_codec.WriteTagAndValue(output, DoubleField10);
-      }
-      if (doubleField11_ != null) {
-        _single_doubleField11_codec.WriteTagAndValue(output, DoubleField11);
-      }
-      if (doubleField14_ != null) {
-        _single_doubleField14_codec.WriteTagAndValue(output, DoubleField14);
-      }
-      if (doubleField15_ != null) {
-        _single_doubleField15_codec.WriteTagAndValue(output, DoubleField15);
-      }
-      if (int64Field19_ != null) {
-        _single_int64Field19_codec.WriteTagAndValue(output, Int64Field19);
-      }
-      if (doubleField20_ != null) {
-        _single_doubleField20_codec.WriteTagAndValue(output, DoubleField20);
-      }
-      if (doubleField21_ != null) {
-        _single_doubleField21_codec.WriteTagAndValue(output, DoubleField21);
-      }
-      if (doubleField22_ != null) {
-        _single_doubleField22_codec.WriteTagAndValue(output, DoubleField22);
-      }
-      if (doubleField25_ != null) {
-        _single_doubleField25_codec.WriteTagAndValue(output, DoubleField25);
-      }
-      if (int64Field26_ != null) {
-        _single_int64Field26_codec.WriteTagAndValue(output, Int64Field26);
-      }
-      if (doubleField28_ != null) {
-        _single_doubleField28_codec.WriteTagAndValue(output, DoubleField28);
-      }
-      if (doubleField29_ != null) {
-        _single_doubleField29_codec.WriteTagAndValue(output, DoubleField29);
-      }
-      if (doubleField30_ != null) {
-        _single_doubleField30_codec.WriteTagAndValue(output, DoubleField30);
-      }
-      if (doubleField31_ != null) {
-        _single_doubleField31_codec.WriteTagAndValue(output, DoubleField31);
-      }
-      if (int64Field32_ != null) {
-        _single_int64Field32_codec.WriteTagAndValue(output, Int64Field32);
-      }
-      if (int64Field37_ != null) {
-        _single_int64Field37_codec.WriteTagAndValue(output, Int64Field37);
-      }
-      if (doubleField38_ != null) {
-        _single_doubleField38_codec.WriteTagAndValue(output, DoubleField38);
-      }
-      if (interactions_ != null) {
-        _single_interactions_codec.WriteTagAndValue(output, Interactions);
-      }
-      if (doubleField40_ != null) {
-        _single_doubleField40_codec.WriteTagAndValue(output, DoubleField40);
-      }
-      if (int64Field41_ != null) {
-        _single_int64Field41_codec.WriteTagAndValue(output, Int64Field41);
-      }
-      if (doubleField42_ != null) {
-        _single_doubleField42_codec.WriteTagAndValue(output, DoubleField42);
-      }
-      if (int64Field43_ != null) {
-        _single_int64Field43_codec.WriteTagAndValue(output, Int64Field43);
-      }
-      if (int64Field44_ != null) {
-        _single_int64Field44_codec.WriteTagAndValue(output, Int64Field44);
-      }
-      if (doubleField45_ != null) {
-        _single_doubleField45_codec.WriteTagAndValue(output, DoubleField45);
-      }
-      if (doubleField46_ != null) {
-        _single_doubleField46_codec.WriteTagAndValue(output, DoubleField46);
-      }
-      if (doubleField47_ != null) {
-        _single_doubleField47_codec.WriteTagAndValue(output, DoubleField47);
-      }
-      if (doubleField48_ != null) {
-        _single_doubleField48_codec.WriteTagAndValue(output, DoubleField48);
-      }
-      if (doubleField49_ != null) {
-        _single_doubleField49_codec.WriteTagAndValue(output, DoubleField49);
-      }
-      if (doubleField50_ != null) {
-        _single_doubleField50_codec.WriteTagAndValue(output, DoubleField50);
-      }
-      if (doubleField51_ != null) {
-        _single_doubleField51_codec.WriteTagAndValue(output, DoubleField51);
-      }
-      if (doubleField52_ != null) {
-        _single_doubleField52_codec.WriteTagAndValue(output, DoubleField52);
-      }
-      if (doubleField53_ != null) {
-        _single_doubleField53_codec.WriteTagAndValue(output, DoubleField53);
-      }
-      if (doubleField54_ != null) {
-        _single_doubleField54_codec.WriteTagAndValue(output, DoubleField54);
-      }
-      if (doubleField55_ != null) {
-        _single_doubleField55_codec.WriteTagAndValue(output, DoubleField55);
-      }
-      if (doubleField56_ != null) {
-        _single_doubleField56_codec.WriteTagAndValue(output, DoubleField56);
-      }
-      if (doubleField57_ != null) {
-        _single_doubleField57_codec.WriteTagAndValue(output, DoubleField57);
-      }
-      if (doubleField58_ != null) {
-        _single_doubleField58_codec.WriteTagAndValue(output, DoubleField58);
-      }
-      if (int64Field59_ != null) {
-        _single_int64Field59_codec.WriteTagAndValue(output, Int64Field59);
-      }
-      if (int64Field60_ != null) {
-        _single_int64Field60_codec.WriteTagAndValue(output, Int64Field60);
-      }
-      if (doubleField62_ != null) {
-        _single_doubleField62_codec.WriteTagAndValue(output, DoubleField62);
-      }
-      if (doubleField65_ != null) {
-        _single_doubleField65_codec.WriteTagAndValue(output, DoubleField65);
-      }
-      if (doubleField66_ != null) {
-        _single_doubleField66_codec.WriteTagAndValue(output, DoubleField66);
-      }
-      if (doubleField67_ != null) {
-        _single_doubleField67_codec.WriteTagAndValue(output, DoubleField67);
-      }
-      if (doubleField68_ != null) {
-        _single_doubleField68_codec.WriteTagAndValue(output, DoubleField68);
-      }
-      if (doubleField69_ != null) {
-        _single_doubleField69_codec.WriteTagAndValue(output, DoubleField69);
-      }
-      if (doubleField70_ != null) {
-        _single_doubleField70_codec.WriteTagAndValue(output, DoubleField70);
-      }
-      if (doubleField71_ != null) {
-        _single_doubleField71_codec.WriteTagAndValue(output, DoubleField71);
-      }
-      if (doubleField72_ != null) {
-        _single_doubleField72_codec.WriteTagAndValue(output, DoubleField72);
-      }
-      if (stringField73_ != null) {
-        _single_stringField73_codec.WriteTagAndValue(output, StringField73);
-      }
-      if (stringField74_ != null) {
-        _single_stringField74_codec.WriteTagAndValue(output, StringField74);
-      }
-      if (doubleField75_ != null) {
-        _single_doubleField75_codec.WriteTagAndValue(output, DoubleField75);
-      }
-      if (doubleField77_ != null) {
-        _single_doubleField77_codec.WriteTagAndValue(output, DoubleField77);
-      }
-      if (doubleField78_ != null) {
-        _single_doubleField78_codec.WriteTagAndValue(output, DoubleField78);
-      }
-      if (doubleField79_ != null) {
-        _single_doubleField79_codec.WriteTagAndValue(output, DoubleField79);
-      }
-      if (EnumField80 != 0) {
-        output.WriteRawTag(128, 5);
-        output.WriteInt32(EnumField80);
-      }
-      if (EnumField81 != 0) {
-        output.WriteRawTag(136, 5);
-        output.WriteInt32(EnumField81);
-      }
-      if (int64Field82_ != null) {
-        _single_int64Field82_codec.WriteTagAndValue(output, Int64Field82);
-      }
-      if (EnumField83 != 0) {
-        output.WriteRawTag(152, 5);
-        output.WriteInt32(EnumField83);
-      }
-      if (doubleField84_ != null) {
-        _single_doubleField84_codec.WriteTagAndValue(output, DoubleField84);
-      }
-      if (int64Field85_ != null) {
-        _single_int64Field85_codec.WriteTagAndValue(output, Int64Field85);
-      }
-      if (int64Field86_ != null) {
-        _single_int64Field86_codec.WriteTagAndValue(output, Int64Field86);
-      }
-      if (int64Field87_ != null) {
-        _single_int64Field87_codec.WriteTagAndValue(output, Int64Field87);
-      }
-      if (doubleField88_ != null) {
-        _single_doubleField88_codec.WriteTagAndValue(output, DoubleField88);
-      }
-      if (doubleField89_ != null) {
-        _single_doubleField89_codec.WriteTagAndValue(output, DoubleField89);
-      }
-      if (doubleField90_ != null) {
-        _single_doubleField90_codec.WriteTagAndValue(output, DoubleField90);
-      }
-      if (doubleField91_ != null) {
-        _single_doubleField91_codec.WriteTagAndValue(output, DoubleField91);
-      }
-      if (doubleField92_ != null) {
-        _single_doubleField92_codec.WriteTagAndValue(output, DoubleField92);
-      }
-      if (doubleField93_ != null) {
-        _single_doubleField93_codec.WriteTagAndValue(output, DoubleField93);
-      }
-      if (doubleField94_ != null) {
-        _single_doubleField94_codec.WriteTagAndValue(output, DoubleField94);
-      }
-      if (doubleField95_ != null) {
-        _single_doubleField95_codec.WriteTagAndValue(output, DoubleField95);
-      }
-      if (doubleField96_ != null) {
-        _single_doubleField96_codec.WriteTagAndValue(output, DoubleField96);
-      }
-      if (doubleField97_ != null) {
-        _single_doubleField97_codec.WriteTagAndValue(output, DoubleField97);
-      }
-      if (doubleField98_ != null) {
-        _single_doubleField98_codec.WriteTagAndValue(output, DoubleField98);
-      }
-      if (doubleField99_ != null) {
-        _single_doubleField99_codec.WriteTagAndValue(output, DoubleField99);
-      }
-      repeatedIntField100_.WriteTo(output, _repeated_repeatedIntField100_codec);
-      if (doubleField101_ != null) {
-        _single_doubleField101_codec.WriteTagAndValue(output, DoubleField101);
-      }
-      if (doubleField102_ != null) {
-        _single_doubleField102_codec.WriteTagAndValue(output, DoubleField102);
-      }
-      if (doubleField103_ != null) {
-        _single_doubleField103_codec.WriteTagAndValue(output, DoubleField103);
-      }
-      if (doubleField104_ != null) {
-        _single_doubleField104_codec.WriteTagAndValue(output, DoubleField104);
-      }
-      if (doubleField105_ != null) {
-        _single_doubleField105_codec.WriteTagAndValue(output, DoubleField105);
-      }
-      if (doubleField106_ != null) {
-        _single_doubleField106_codec.WriteTagAndValue(output, DoubleField106);
-      }
-      if (int64Field107_ != null) {
-        _single_int64Field107_codec.WriteTagAndValue(output, Int64Field107);
-      }
-      if (doubleField108_ != null) {
-        _single_doubleField108_codec.WriteTagAndValue(output, DoubleField108);
-      }
-      if (doubleField109_ != null) {
-        _single_doubleField109_codec.WriteTagAndValue(output, DoubleField109);
-      }
-      if (int64Field110_ != null) {
-        _single_int64Field110_codec.WriteTagAndValue(output, Int64Field110);
-      }
-      if (doubleField111_ != null) {
-        _single_doubleField111_codec.WriteTagAndValue(output, DoubleField111);
-      }
-      if (int64Field112_ != null) {
-        _single_int64Field112_codec.WriteTagAndValue(output, Int64Field112);
-      }
-      if (doubleField113_ != null) {
-        _single_doubleField113_codec.WriteTagAndValue(output, DoubleField113);
-      }
-      if (int64Field114_ != null) {
-        _single_int64Field114_codec.WriteTagAndValue(output, Int64Field114);
-      }
-      if (int64Field115_ != null) {
-        _single_int64Field115_codec.WriteTagAndValue(output, Int64Field115);
-      }
-      if (doubleField116_ != null) {
-        _single_doubleField116_codec.WriteTagAndValue(output, DoubleField116);
-      }
-      if (int64Field117_ != null) {
-        _single_int64Field117_codec.WriteTagAndValue(output, Int64Field117);
-      }
-      if (doubleField118_ != null) {
-        _single_doubleField118_codec.WriteTagAndValue(output, DoubleField118);
-      }
-      if (doubleField119_ != null) {
-        _single_doubleField119_codec.WriteTagAndValue(output, DoubleField119);
-      }
-      if (doubleField120_ != null) {
-        _single_doubleField120_codec.WriteTagAndValue(output, DoubleField120);
-      }
-      if (doubleField121_ != null) {
-        _single_doubleField121_codec.WriteTagAndValue(output, DoubleField121);
-      }
-      if (doubleField122_ != null) {
-        _single_doubleField122_codec.WriteTagAndValue(output, DoubleField122);
-      }
-      if (doubleField123_ != null) {
-        _single_doubleField123_codec.WriteTagAndValue(output, DoubleField123);
-      }
-      if (doubleField124_ != null) {
-        _single_doubleField124_codec.WriteTagAndValue(output, DoubleField124);
-      }
-      if (int64Field125_ != null) {
-        _single_int64Field125_codec.WriteTagAndValue(output, Int64Field125);
-      }
-      if (int64Field126_ != null) {
-        _single_int64Field126_codec.WriteTagAndValue(output, Int64Field126);
-      }
-      if (int64Field127_ != null) {
-        _single_int64Field127_codec.WriteTagAndValue(output, Int64Field127);
-      }
-      if (doubleField128_ != null) {
-        _single_doubleField128_codec.WriteTagAndValue(output, DoubleField128);
-      }
-      if (doubleField129_ != null) {
-        _single_doubleField129_codec.WriteTagAndValue(output, DoubleField129);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (doubleField1_ != null) {
-        _single_doubleField1_codec.WriteTagAndValue(ref output, DoubleField1);
-      }
-      if (int64Field2_ != null) {
-        _single_int64Field2_codec.WriteTagAndValue(ref output, Int64Field2);
-      }
-      if (int64Field3_ != null) {
-        _single_int64Field3_codec.WriteTagAndValue(ref output, Int64Field3);
-      }
-      if (int64Field4_ != null) {
-        _single_int64Field4_codec.WriteTagAndValue(ref output, Int64Field4);
-      }
-      if (doubleField7_ != null) {
-        _single_doubleField7_codec.WriteTagAndValue(ref output, DoubleField7);
-      }
-      if (doubleField8_ != null) {
-        _single_doubleField8_codec.WriteTagAndValue(ref output, DoubleField8);
-      }
-      if (doubleField9_ != null) {
-        _single_doubleField9_codec.WriteTagAndValue(ref output, DoubleField9);
-      }
-      if (doubleField10_ != null) {
-        _single_doubleField10_codec.WriteTagAndValue(ref output, DoubleField10);
-      }
-      if (doubleField11_ != null) {
-        _single_doubleField11_codec.WriteTagAndValue(ref output, DoubleField11);
-      }
-      if (doubleField14_ != null) {
-        _single_doubleField14_codec.WriteTagAndValue(ref output, DoubleField14);
-      }
-      if (doubleField15_ != null) {
-        _single_doubleField15_codec.WriteTagAndValue(ref output, DoubleField15);
-      }
-      if (int64Field19_ != null) {
-        _single_int64Field19_codec.WriteTagAndValue(ref output, Int64Field19);
-      }
-      if (doubleField20_ != null) {
-        _single_doubleField20_codec.WriteTagAndValue(ref output, DoubleField20);
-      }
-      if (doubleField21_ != null) {
-        _single_doubleField21_codec.WriteTagAndValue(ref output, DoubleField21);
-      }
-      if (doubleField22_ != null) {
-        _single_doubleField22_codec.WriteTagAndValue(ref output, DoubleField22);
-      }
-      if (doubleField25_ != null) {
-        _single_doubleField25_codec.WriteTagAndValue(ref output, DoubleField25);
-      }
-      if (int64Field26_ != null) {
-        _single_int64Field26_codec.WriteTagAndValue(ref output, Int64Field26);
-      }
-      if (doubleField28_ != null) {
-        _single_doubleField28_codec.WriteTagAndValue(ref output, DoubleField28);
-      }
-      if (doubleField29_ != null) {
-        _single_doubleField29_codec.WriteTagAndValue(ref output, DoubleField29);
-      }
-      if (doubleField30_ != null) {
-        _single_doubleField30_codec.WriteTagAndValue(ref output, DoubleField30);
-      }
-      if (doubleField31_ != null) {
-        _single_doubleField31_codec.WriteTagAndValue(ref output, DoubleField31);
-      }
-      if (int64Field32_ != null) {
-        _single_int64Field32_codec.WriteTagAndValue(ref output, Int64Field32);
-      }
-      if (int64Field37_ != null) {
-        _single_int64Field37_codec.WriteTagAndValue(ref output, Int64Field37);
-      }
-      if (doubleField38_ != null) {
-        _single_doubleField38_codec.WriteTagAndValue(ref output, DoubleField38);
-      }
-      if (interactions_ != null) {
-        _single_interactions_codec.WriteTagAndValue(ref output, Interactions);
-      }
-      if (doubleField40_ != null) {
-        _single_doubleField40_codec.WriteTagAndValue(ref output, DoubleField40);
-      }
-      if (int64Field41_ != null) {
-        _single_int64Field41_codec.WriteTagAndValue(ref output, Int64Field41);
-      }
-      if (doubleField42_ != null) {
-        _single_doubleField42_codec.WriteTagAndValue(ref output, DoubleField42);
-      }
-      if (int64Field43_ != null) {
-        _single_int64Field43_codec.WriteTagAndValue(ref output, Int64Field43);
-      }
-      if (int64Field44_ != null) {
-        _single_int64Field44_codec.WriteTagAndValue(ref output, Int64Field44);
-      }
-      if (doubleField45_ != null) {
-        _single_doubleField45_codec.WriteTagAndValue(ref output, DoubleField45);
-      }
-      if (doubleField46_ != null) {
-        _single_doubleField46_codec.WriteTagAndValue(ref output, DoubleField46);
-      }
-      if (doubleField47_ != null) {
-        _single_doubleField47_codec.WriteTagAndValue(ref output, DoubleField47);
-      }
-      if (doubleField48_ != null) {
-        _single_doubleField48_codec.WriteTagAndValue(ref output, DoubleField48);
-      }
-      if (doubleField49_ != null) {
-        _single_doubleField49_codec.WriteTagAndValue(ref output, DoubleField49);
-      }
-      if (doubleField50_ != null) {
-        _single_doubleField50_codec.WriteTagAndValue(ref output, DoubleField50);
-      }
-      if (doubleField51_ != null) {
-        _single_doubleField51_codec.WriteTagAndValue(ref output, DoubleField51);
-      }
-      if (doubleField52_ != null) {
-        _single_doubleField52_codec.WriteTagAndValue(ref output, DoubleField52);
-      }
-      if (doubleField53_ != null) {
-        _single_doubleField53_codec.WriteTagAndValue(ref output, DoubleField53);
-      }
-      if (doubleField54_ != null) {
-        _single_doubleField54_codec.WriteTagAndValue(ref output, DoubleField54);
-      }
-      if (doubleField55_ != null) {
-        _single_doubleField55_codec.WriteTagAndValue(ref output, DoubleField55);
-      }
-      if (doubleField56_ != null) {
-        _single_doubleField56_codec.WriteTagAndValue(ref output, DoubleField56);
-      }
-      if (doubleField57_ != null) {
-        _single_doubleField57_codec.WriteTagAndValue(ref output, DoubleField57);
-      }
-      if (doubleField58_ != null) {
-        _single_doubleField58_codec.WriteTagAndValue(ref output, DoubleField58);
-      }
-      if (int64Field59_ != null) {
-        _single_int64Field59_codec.WriteTagAndValue(ref output, Int64Field59);
-      }
-      if (int64Field60_ != null) {
-        _single_int64Field60_codec.WriteTagAndValue(ref output, Int64Field60);
-      }
-      if (doubleField62_ != null) {
-        _single_doubleField62_codec.WriteTagAndValue(ref output, DoubleField62);
-      }
-      if (doubleField65_ != null) {
-        _single_doubleField65_codec.WriteTagAndValue(ref output, DoubleField65);
-      }
-      if (doubleField66_ != null) {
-        _single_doubleField66_codec.WriteTagAndValue(ref output, DoubleField66);
-      }
-      if (doubleField67_ != null) {
-        _single_doubleField67_codec.WriteTagAndValue(ref output, DoubleField67);
-      }
-      if (doubleField68_ != null) {
-        _single_doubleField68_codec.WriteTagAndValue(ref output, DoubleField68);
-      }
-      if (doubleField69_ != null) {
-        _single_doubleField69_codec.WriteTagAndValue(ref output, DoubleField69);
-      }
-      if (doubleField70_ != null) {
-        _single_doubleField70_codec.WriteTagAndValue(ref output, DoubleField70);
-      }
-      if (doubleField71_ != null) {
-        _single_doubleField71_codec.WriteTagAndValue(ref output, DoubleField71);
-      }
-      if (doubleField72_ != null) {
-        _single_doubleField72_codec.WriteTagAndValue(ref output, DoubleField72);
-      }
-      if (stringField73_ != null) {
-        _single_stringField73_codec.WriteTagAndValue(ref output, StringField73);
-      }
-      if (stringField74_ != null) {
-        _single_stringField74_codec.WriteTagAndValue(ref output, StringField74);
-      }
-      if (doubleField75_ != null) {
-        _single_doubleField75_codec.WriteTagAndValue(ref output, DoubleField75);
-      }
-      if (doubleField77_ != null) {
-        _single_doubleField77_codec.WriteTagAndValue(ref output, DoubleField77);
-      }
-      if (doubleField78_ != null) {
-        _single_doubleField78_codec.WriteTagAndValue(ref output, DoubleField78);
-      }
-      if (doubleField79_ != null) {
-        _single_doubleField79_codec.WriteTagAndValue(ref output, DoubleField79);
-      }
-      if (EnumField80 != 0) {
-        output.WriteRawTag(128, 5);
-        output.WriteInt32(EnumField80);
-      }
-      if (EnumField81 != 0) {
-        output.WriteRawTag(136, 5);
-        output.WriteInt32(EnumField81);
-      }
-      if (int64Field82_ != null) {
-        _single_int64Field82_codec.WriteTagAndValue(ref output, Int64Field82);
-      }
-      if (EnumField83 != 0) {
-        output.WriteRawTag(152, 5);
-        output.WriteInt32(EnumField83);
-      }
-      if (doubleField84_ != null) {
-        _single_doubleField84_codec.WriteTagAndValue(ref output, DoubleField84);
-      }
-      if (int64Field85_ != null) {
-        _single_int64Field85_codec.WriteTagAndValue(ref output, Int64Field85);
-      }
-      if (int64Field86_ != null) {
-        _single_int64Field86_codec.WriteTagAndValue(ref output, Int64Field86);
-      }
-      if (int64Field87_ != null) {
-        _single_int64Field87_codec.WriteTagAndValue(ref output, Int64Field87);
-      }
-      if (doubleField88_ != null) {
-        _single_doubleField88_codec.WriteTagAndValue(ref output, DoubleField88);
-      }
-      if (doubleField89_ != null) {
-        _single_doubleField89_codec.WriteTagAndValue(ref output, DoubleField89);
-      }
-      if (doubleField90_ != null) {
-        _single_doubleField90_codec.WriteTagAndValue(ref output, DoubleField90);
-      }
-      if (doubleField91_ != null) {
-        _single_doubleField91_codec.WriteTagAndValue(ref output, DoubleField91);
-      }
-      if (doubleField92_ != null) {
-        _single_doubleField92_codec.WriteTagAndValue(ref output, DoubleField92);
-      }
-      if (doubleField93_ != null) {
-        _single_doubleField93_codec.WriteTagAndValue(ref output, DoubleField93);
-      }
-      if (doubleField94_ != null) {
-        _single_doubleField94_codec.WriteTagAndValue(ref output, DoubleField94);
-      }
-      if (doubleField95_ != null) {
-        _single_doubleField95_codec.WriteTagAndValue(ref output, DoubleField95);
-      }
-      if (doubleField96_ != null) {
-        _single_doubleField96_codec.WriteTagAndValue(ref output, DoubleField96);
-      }
-      if (doubleField97_ != null) {
-        _single_doubleField97_codec.WriteTagAndValue(ref output, DoubleField97);
-      }
-      if (doubleField98_ != null) {
-        _single_doubleField98_codec.WriteTagAndValue(ref output, DoubleField98);
-      }
-      if (doubleField99_ != null) {
-        _single_doubleField99_codec.WriteTagAndValue(ref output, DoubleField99);
-      }
-      repeatedIntField100_.WriteTo(ref output, _repeated_repeatedIntField100_codec);
-      if (doubleField101_ != null) {
-        _single_doubleField101_codec.WriteTagAndValue(ref output, DoubleField101);
-      }
-      if (doubleField102_ != null) {
-        _single_doubleField102_codec.WriteTagAndValue(ref output, DoubleField102);
-      }
-      if (doubleField103_ != null) {
-        _single_doubleField103_codec.WriteTagAndValue(ref output, DoubleField103);
-      }
-      if (doubleField104_ != null) {
-        _single_doubleField104_codec.WriteTagAndValue(ref output, DoubleField104);
-      }
-      if (doubleField105_ != null) {
-        _single_doubleField105_codec.WriteTagAndValue(ref output, DoubleField105);
-      }
-      if (doubleField106_ != null) {
-        _single_doubleField106_codec.WriteTagAndValue(ref output, DoubleField106);
-      }
-      if (int64Field107_ != null) {
-        _single_int64Field107_codec.WriteTagAndValue(ref output, Int64Field107);
-      }
-      if (doubleField108_ != null) {
-        _single_doubleField108_codec.WriteTagAndValue(ref output, DoubleField108);
-      }
-      if (doubleField109_ != null) {
-        _single_doubleField109_codec.WriteTagAndValue(ref output, DoubleField109);
-      }
-      if (int64Field110_ != null) {
-        _single_int64Field110_codec.WriteTagAndValue(ref output, Int64Field110);
-      }
-      if (doubleField111_ != null) {
-        _single_doubleField111_codec.WriteTagAndValue(ref output, DoubleField111);
-      }
-      if (int64Field112_ != null) {
-        _single_int64Field112_codec.WriteTagAndValue(ref output, Int64Field112);
-      }
-      if (doubleField113_ != null) {
-        _single_doubleField113_codec.WriteTagAndValue(ref output, DoubleField113);
-      }
-      if (int64Field114_ != null) {
-        _single_int64Field114_codec.WriteTagAndValue(ref output, Int64Field114);
-      }
-      if (int64Field115_ != null) {
-        _single_int64Field115_codec.WriteTagAndValue(ref output, Int64Field115);
-      }
-      if (doubleField116_ != null) {
-        _single_doubleField116_codec.WriteTagAndValue(ref output, DoubleField116);
-      }
-      if (int64Field117_ != null) {
-        _single_int64Field117_codec.WriteTagAndValue(ref output, Int64Field117);
-      }
-      if (doubleField118_ != null) {
-        _single_doubleField118_codec.WriteTagAndValue(ref output, DoubleField118);
-      }
-      if (doubleField119_ != null) {
-        _single_doubleField119_codec.WriteTagAndValue(ref output, DoubleField119);
-      }
-      if (doubleField120_ != null) {
-        _single_doubleField120_codec.WriteTagAndValue(ref output, DoubleField120);
-      }
-      if (doubleField121_ != null) {
-        _single_doubleField121_codec.WriteTagAndValue(ref output, DoubleField121);
-      }
-      if (doubleField122_ != null) {
-        _single_doubleField122_codec.WriteTagAndValue(ref output, DoubleField122);
-      }
-      if (doubleField123_ != null) {
-        _single_doubleField123_codec.WriteTagAndValue(ref output, DoubleField123);
-      }
-      if (doubleField124_ != null) {
-        _single_doubleField124_codec.WriteTagAndValue(ref output, DoubleField124);
-      }
-      if (int64Field125_ != null) {
-        _single_int64Field125_codec.WriteTagAndValue(ref output, Int64Field125);
-      }
-      if (int64Field126_ != null) {
-        _single_int64Field126_codec.WriteTagAndValue(ref output, Int64Field126);
-      }
-      if (int64Field127_ != null) {
-        _single_int64Field127_codec.WriteTagAndValue(ref output, Int64Field127);
-      }
-      if (doubleField128_ != null) {
-        _single_doubleField128_codec.WriteTagAndValue(ref output, DoubleField128);
-      }
-      if (doubleField129_ != null) {
-        _single_doubleField129_codec.WriteTagAndValue(ref output, DoubleField129);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (doubleField95_ != null) {
-        size += _single_doubleField95_codec.CalculateSizeWithTag(DoubleField95);
-      }
-      if (doubleField1_ != null) {
-        size += _single_doubleField1_codec.CalculateSizeWithTag(DoubleField1);
-      }
-      if (doubleField79_ != null) {
-        size += _single_doubleField79_codec.CalculateSizeWithTag(DoubleField79);
-      }
-      if (int64Field2_ != null) {
-        size += _single_int64Field2_codec.CalculateSizeWithTag(Int64Field2);
-      }
-      if (doubleField96_ != null) {
-        size += _single_doubleField96_codec.CalculateSizeWithTag(DoubleField96);
-      }
-      if (int64Field3_ != null) {
-        size += _single_int64Field3_codec.CalculateSizeWithTag(Int64Field3);
-      }
-      if (int64Field4_ != null) {
-        size += _single_int64Field4_codec.CalculateSizeWithTag(Int64Field4);
-      }
-      if (doubleField97_ != null) {
-        size += _single_doubleField97_codec.CalculateSizeWithTag(DoubleField97);
-      }
-      if (doubleField65_ != null) {
-        size += _single_doubleField65_codec.CalculateSizeWithTag(DoubleField65);
-      }
-      if (doubleField66_ != null) {
-        size += _single_doubleField66_codec.CalculateSizeWithTag(DoubleField66);
-      }
-      if (doubleField7_ != null) {
-        size += _single_doubleField7_codec.CalculateSizeWithTag(DoubleField7);
-      }
-      if (doubleField62_ != null) {
-        size += _single_doubleField62_codec.CalculateSizeWithTag(DoubleField62);
-      }
-      if (doubleField118_ != null) {
-        size += _single_doubleField118_codec.CalculateSizeWithTag(DoubleField118);
-      }
-      if (doubleField119_ != null) {
-        size += _single_doubleField119_codec.CalculateSizeWithTag(DoubleField119);
-      }
-      if (doubleField67_ != null) {
-        size += _single_doubleField67_codec.CalculateSizeWithTag(DoubleField67);
-      }
-      if (doubleField120_ != null) {
-        size += _single_doubleField120_codec.CalculateSizeWithTag(DoubleField120);
-      }
-      if (doubleField121_ != null) {
-        size += _single_doubleField121_codec.CalculateSizeWithTag(DoubleField121);
-      }
-      if (doubleField122_ != null) {
-        size += _single_doubleField122_codec.CalculateSizeWithTag(DoubleField122);
-      }
-      if (doubleField123_ != null) {
-        size += _single_doubleField123_codec.CalculateSizeWithTag(DoubleField123);
-      }
-      if (doubleField124_ != null) {
-        size += _single_doubleField124_codec.CalculateSizeWithTag(DoubleField124);
-      }
-      if (doubleField8_ != null) {
-        size += _single_doubleField8_codec.CalculateSizeWithTag(DoubleField8);
-      }
-      if (doubleField9_ != null) {
-        size += _single_doubleField9_codec.CalculateSizeWithTag(DoubleField9);
-      }
-      if (doubleField98_ != null) {
-        size += _single_doubleField98_codec.CalculateSizeWithTag(DoubleField98);
-      }
-      if (doubleField10_ != null) {
-        size += _single_doubleField10_codec.CalculateSizeWithTag(DoubleField10);
-      }
-      if (doubleField11_ != null) {
-        size += _single_doubleField11_codec.CalculateSizeWithTag(DoubleField11);
-      }
-      if (doubleField99_ != null) {
-        size += _single_doubleField99_codec.CalculateSizeWithTag(DoubleField99);
-      }
-      if (doubleField84_ != null) {
-        size += _single_doubleField84_codec.CalculateSizeWithTag(DoubleField84);
-      }
-      if (doubleField14_ != null) {
-        size += _single_doubleField14_codec.CalculateSizeWithTag(DoubleField14);
-      }
-      if (doubleField77_ != null) {
-        size += _single_doubleField77_codec.CalculateSizeWithTag(DoubleField77);
-      }
-      if (doubleField15_ != null) {
-        size += _single_doubleField15_codec.CalculateSizeWithTag(DoubleField15);
-      }
-      if (int64Field19_ != null) {
-        size += _single_int64Field19_codec.CalculateSizeWithTag(Int64Field19);
-      }
-      if (int64Field115_ != null) {
-        size += _single_int64Field115_codec.CalculateSizeWithTag(Int64Field115);
-      }
-      if (doubleField116_ != null) {
-        size += _single_doubleField116_codec.CalculateSizeWithTag(DoubleField116);
-      }
-      if (int64Field117_ != null) {
-        size += _single_int64Field117_codec.CalculateSizeWithTag(Int64Field117);
-      }
-      if (doubleField20_ != null) {
-        size += _single_doubleField20_codec.CalculateSizeWithTag(DoubleField20);
-      }
-      if (doubleField21_ != null) {
-        size += _single_doubleField21_codec.CalculateSizeWithTag(DoubleField21);
-      }
-      if (stringField73_ != null) {
-        size += _single_stringField73_codec.CalculateSizeWithTag(StringField73);
-      }
-      if (stringField74_ != null) {
-        size += _single_stringField74_codec.CalculateSizeWithTag(StringField74);
-      }
-      if (doubleField22_ != null) {
-        size += _single_doubleField22_codec.CalculateSizeWithTag(DoubleField22);
-      }
-      if (doubleField69_ != null) {
-        size += _single_doubleField69_codec.CalculateSizeWithTag(DoubleField69);
-      }
-      if (doubleField70_ != null) {
-        size += _single_doubleField70_codec.CalculateSizeWithTag(DoubleField70);
-      }
-      if (doubleField71_ != null) {
-        size += _single_doubleField71_codec.CalculateSizeWithTag(DoubleField71);
-      }
-      if (doubleField72_ != null) {
-        size += _single_doubleField72_codec.CalculateSizeWithTag(DoubleField72);
-      }
-      if (doubleField25_ != null) {
-        size += _single_doubleField25_codec.CalculateSizeWithTag(DoubleField25);
-      }
-      if (int64Field26_ != null) {
-        size += _single_int64Field26_codec.CalculateSizeWithTag(Int64Field26);
-      }
-      if (doubleField68_ != null) {
-        size += _single_doubleField68_codec.CalculateSizeWithTag(DoubleField68);
-      }
-      if (doubleField28_ != null) {
-        size += _single_doubleField28_codec.CalculateSizeWithTag(DoubleField28);
-      }
-      if (doubleField106_ != null) {
-        size += _single_doubleField106_codec.CalculateSizeWithTag(DoubleField106);
-      }
-      if (doubleField29_ != null) {
-        size += _single_doubleField29_codec.CalculateSizeWithTag(DoubleField29);
-      }
-      if (doubleField30_ != null) {
-        size += _single_doubleField30_codec.CalculateSizeWithTag(DoubleField30);
-      }
-      if (doubleField101_ != null) {
-        size += _single_doubleField101_codec.CalculateSizeWithTag(DoubleField101);
-      }
-      if (doubleField102_ != null) {
-        size += _single_doubleField102_codec.CalculateSizeWithTag(DoubleField102);
-      }
-      if (doubleField103_ != null) {
-        size += _single_doubleField103_codec.CalculateSizeWithTag(DoubleField103);
-      }
-      if (doubleField104_ != null) {
-        size += _single_doubleField104_codec.CalculateSizeWithTag(DoubleField104);
-      }
-      if (doubleField105_ != null) {
-        size += _single_doubleField105_codec.CalculateSizeWithTag(DoubleField105);
-      }
-      if (doubleField31_ != null) {
-        size += _single_doubleField31_codec.CalculateSizeWithTag(DoubleField31);
-      }
-      if (int64Field32_ != null) {
-        size += _single_int64Field32_codec.CalculateSizeWithTag(Int64Field32);
-      }
-      if (doubleField75_ != null) {
-        size += _single_doubleField75_codec.CalculateSizeWithTag(DoubleField75);
-      }
-      if (doubleField129_ != null) {
-        size += _single_doubleField129_codec.CalculateSizeWithTag(DoubleField129);
-      }
-      if (EnumField80 != 0) {
-        size += 2 + pb::CodedOutputStream.ComputeInt32Size(EnumField80);
-      }
-      if (EnumField81 != 0) {
-        size += 2 + pb::CodedOutputStream.ComputeInt32Size(EnumField81);
-      }
-      if (int64Field82_ != null) {
-        size += _single_int64Field82_codec.CalculateSizeWithTag(Int64Field82);
-      }
-      if (EnumField83 != 0) {
-        size += 2 + pb::CodedOutputStream.ComputeInt32Size(EnumField83);
-      }
-      if (int64Field85_ != null) {
-        size += _single_int64Field85_codec.CalculateSizeWithTag(Int64Field85);
-      }
-      if (int64Field86_ != null) {
-        size += _single_int64Field86_codec.CalculateSizeWithTag(Int64Field86);
-      }
-      if (int64Field87_ != null) {
-        size += _single_int64Field87_codec.CalculateSizeWithTag(Int64Field87);
-      }
-      if (int64Field125_ != null) {
-        size += _single_int64Field125_codec.CalculateSizeWithTag(Int64Field125);
-      }
-      if (int64Field37_ != null) {
-        size += _single_int64Field37_codec.CalculateSizeWithTag(Int64Field37);
-      }
-      if (doubleField38_ != null) {
-        size += _single_doubleField38_codec.CalculateSizeWithTag(DoubleField38);
-      }
-      if (interactions_ != null) {
-        size += _single_interactions_codec.CalculateSizeWithTag(Interactions);
-      }
-      size += repeatedIntField100_.CalculateSize(_repeated_repeatedIntField100_codec);
-      if (doubleField40_ != null) {
-        size += _single_doubleField40_codec.CalculateSizeWithTag(DoubleField40);
-      }
-      if (int64Field41_ != null) {
-        size += _single_int64Field41_codec.CalculateSizeWithTag(Int64Field41);
-      }
-      if (int64Field126_ != null) {
-        size += _single_int64Field126_codec.CalculateSizeWithTag(Int64Field126);
-      }
-      if (int64Field127_ != null) {
-        size += _single_int64Field127_codec.CalculateSizeWithTag(Int64Field127);
-      }
-      if (doubleField128_ != null) {
-        size += _single_doubleField128_codec.CalculateSizeWithTag(DoubleField128);
-      }
-      if (doubleField109_ != null) {
-        size += _single_doubleField109_codec.CalculateSizeWithTag(DoubleField109);
-      }
-      if (int64Field110_ != null) {
-        size += _single_int64Field110_codec.CalculateSizeWithTag(Int64Field110);
-      }
-      if (doubleField111_ != null) {
-        size += _single_doubleField111_codec.CalculateSizeWithTag(DoubleField111);
-      }
-      if (int64Field112_ != null) {
-        size += _single_int64Field112_codec.CalculateSizeWithTag(Int64Field112);
-      }
-      if (doubleField113_ != null) {
-        size += _single_doubleField113_codec.CalculateSizeWithTag(DoubleField113);
-      }
-      if (int64Field114_ != null) {
-        size += _single_int64Field114_codec.CalculateSizeWithTag(Int64Field114);
-      }
-      if (doubleField42_ != null) {
-        size += _single_doubleField42_codec.CalculateSizeWithTag(DoubleField42);
-      }
-      if (int64Field43_ != null) {
-        size += _single_int64Field43_codec.CalculateSizeWithTag(Int64Field43);
-      }
-      if (int64Field44_ != null) {
-        size += _single_int64Field44_codec.CalculateSizeWithTag(Int64Field44);
-      }
-      if (doubleField45_ != null) {
-        size += _single_doubleField45_codec.CalculateSizeWithTag(DoubleField45);
-      }
-      if (doubleField46_ != null) {
-        size += _single_doubleField46_codec.CalculateSizeWithTag(DoubleField46);
-      }
-      if (doubleField78_ != null) {
-        size += _single_doubleField78_codec.CalculateSizeWithTag(DoubleField78);
-      }
-      if (doubleField88_ != null) {
-        size += _single_doubleField88_codec.CalculateSizeWithTag(DoubleField88);
-      }
-      if (doubleField47_ != null) {
-        size += _single_doubleField47_codec.CalculateSizeWithTag(DoubleField47);
-      }
-      if (doubleField89_ != null) {
-        size += _single_doubleField89_codec.CalculateSizeWithTag(DoubleField89);
-      }
-      if (doubleField48_ != null) {
-        size += _single_doubleField48_codec.CalculateSizeWithTag(DoubleField48);
-      }
-      if (doubleField49_ != null) {
-        size += _single_doubleField49_codec.CalculateSizeWithTag(DoubleField49);
-      }
-      if (doubleField50_ != null) {
-        size += _single_doubleField50_codec.CalculateSizeWithTag(DoubleField50);
-      }
-      if (doubleField90_ != null) {
-        size += _single_doubleField90_codec.CalculateSizeWithTag(DoubleField90);
-      }
-      if (doubleField51_ != null) {
-        size += _single_doubleField51_codec.CalculateSizeWithTag(DoubleField51);
-      }
-      if (doubleField91_ != null) {
-        size += _single_doubleField91_codec.CalculateSizeWithTag(DoubleField91);
-      }
-      if (doubleField92_ != null) {
-        size += _single_doubleField92_codec.CalculateSizeWithTag(DoubleField92);
-      }
-      if (int64Field107_ != null) {
-        size += _single_int64Field107_codec.CalculateSizeWithTag(Int64Field107);
-      }
-      if (doubleField93_ != null) {
-        size += _single_doubleField93_codec.CalculateSizeWithTag(DoubleField93);
-      }
-      if (doubleField108_ != null) {
-        size += _single_doubleField108_codec.CalculateSizeWithTag(DoubleField108);
-      }
-      if (doubleField52_ != null) {
-        size += _single_doubleField52_codec.CalculateSizeWithTag(DoubleField52);
-      }
-      if (doubleField53_ != null) {
-        size += _single_doubleField53_codec.CalculateSizeWithTag(DoubleField53);
-      }
-      if (doubleField94_ != null) {
-        size += _single_doubleField94_codec.CalculateSizeWithTag(DoubleField94);
-      }
-      if (doubleField54_ != null) {
-        size += _single_doubleField54_codec.CalculateSizeWithTag(DoubleField54);
-      }
-      if (doubleField55_ != null) {
-        size += _single_doubleField55_codec.CalculateSizeWithTag(DoubleField55);
-      }
-      if (doubleField56_ != null) {
-        size += _single_doubleField56_codec.CalculateSizeWithTag(DoubleField56);
-      }
-      if (doubleField57_ != null) {
-        size += _single_doubleField57_codec.CalculateSizeWithTag(DoubleField57);
-      }
-      if (doubleField58_ != null) {
-        size += _single_doubleField58_codec.CalculateSizeWithTag(DoubleField58);
-      }
-      if (int64Field59_ != null) {
-        size += _single_int64Field59_codec.CalculateSizeWithTag(Int64Field59);
-      }
-      if (int64Field60_ != null) {
-        size += _single_int64Field60_codec.CalculateSizeWithTag(Int64Field60);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(ManyWrapperFieldsMessage other) {
-      if (other == null) {
-        return;
-      }
-      if (other.doubleField95_ != null) {
-        if (doubleField95_ == null || other.DoubleField95 != 0D) {
-          DoubleField95 = other.DoubleField95;
-        }
-      }
-      if (other.doubleField1_ != null) {
-        if (doubleField1_ == null || other.DoubleField1 != 0D) {
-          DoubleField1 = other.DoubleField1;
-        }
-      }
-      if (other.doubleField79_ != null) {
-        if (doubleField79_ == null || other.DoubleField79 != 0D) {
-          DoubleField79 = other.DoubleField79;
-        }
-      }
-      if (other.int64Field2_ != null) {
-        if (int64Field2_ == null || other.Int64Field2 != 0L) {
-          Int64Field2 = other.Int64Field2;
-        }
-      }
-      if (other.doubleField96_ != null) {
-        if (doubleField96_ == null || other.DoubleField96 != 0D) {
-          DoubleField96 = other.DoubleField96;
-        }
-      }
-      if (other.int64Field3_ != null) {
-        if (int64Field3_ == null || other.Int64Field3 != 0L) {
-          Int64Field3 = other.Int64Field3;
-        }
-      }
-      if (other.int64Field4_ != null) {
-        if (int64Field4_ == null || other.Int64Field4 != 0L) {
-          Int64Field4 = other.Int64Field4;
-        }
-      }
-      if (other.doubleField97_ != null) {
-        if (doubleField97_ == null || other.DoubleField97 != 0D) {
-          DoubleField97 = other.DoubleField97;
-        }
-      }
-      if (other.doubleField65_ != null) {
-        if (doubleField65_ == null || other.DoubleField65 != 0D) {
-          DoubleField65 = other.DoubleField65;
-        }
-      }
-      if (other.doubleField66_ != null) {
-        if (doubleField66_ == null || other.DoubleField66 != 0D) {
-          DoubleField66 = other.DoubleField66;
-        }
-      }
-      if (other.doubleField7_ != null) {
-        if (doubleField7_ == null || other.DoubleField7 != 0D) {
-          DoubleField7 = other.DoubleField7;
-        }
-      }
-      if (other.doubleField62_ != null) {
-        if (doubleField62_ == null || other.DoubleField62 != 0D) {
-          DoubleField62 = other.DoubleField62;
-        }
-      }
-      if (other.doubleField118_ != null) {
-        if (doubleField118_ == null || other.DoubleField118 != 0D) {
-          DoubleField118 = other.DoubleField118;
-        }
-      }
-      if (other.doubleField119_ != null) {
-        if (doubleField119_ == null || other.DoubleField119 != 0D) {
-          DoubleField119 = other.DoubleField119;
-        }
-      }
-      if (other.doubleField67_ != null) {
-        if (doubleField67_ == null || other.DoubleField67 != 0D) {
-          DoubleField67 = other.DoubleField67;
-        }
-      }
-      if (other.doubleField120_ != null) {
-        if (doubleField120_ == null || other.DoubleField120 != 0D) {
-          DoubleField120 = other.DoubleField120;
-        }
-      }
-      if (other.doubleField121_ != null) {
-        if (doubleField121_ == null || other.DoubleField121 != 0D) {
-          DoubleField121 = other.DoubleField121;
-        }
-      }
-      if (other.doubleField122_ != null) {
-        if (doubleField122_ == null || other.DoubleField122 != 0D) {
-          DoubleField122 = other.DoubleField122;
-        }
-      }
-      if (other.doubleField123_ != null) {
-        if (doubleField123_ == null || other.DoubleField123 != 0D) {
-          DoubleField123 = other.DoubleField123;
-        }
-      }
-      if (other.doubleField124_ != null) {
-        if (doubleField124_ == null || other.DoubleField124 != 0D) {
-          DoubleField124 = other.DoubleField124;
-        }
-      }
-      if (other.doubleField8_ != null) {
-        if (doubleField8_ == null || other.DoubleField8 != 0D) {
-          DoubleField8 = other.DoubleField8;
-        }
-      }
-      if (other.doubleField9_ != null) {
-        if (doubleField9_ == null || other.DoubleField9 != 0D) {
-          DoubleField9 = other.DoubleField9;
-        }
-      }
-      if (other.doubleField98_ != null) {
-        if (doubleField98_ == null || other.DoubleField98 != 0D) {
-          DoubleField98 = other.DoubleField98;
-        }
-      }
-      if (other.doubleField10_ != null) {
-        if (doubleField10_ == null || other.DoubleField10 != 0D) {
-          DoubleField10 = other.DoubleField10;
-        }
-      }
-      if (other.doubleField11_ != null) {
-        if (doubleField11_ == null || other.DoubleField11 != 0D) {
-          DoubleField11 = other.DoubleField11;
-        }
-      }
-      if (other.doubleField99_ != null) {
-        if (doubleField99_ == null || other.DoubleField99 != 0D) {
-          DoubleField99 = other.DoubleField99;
-        }
-      }
-      if (other.doubleField84_ != null) {
-        if (doubleField84_ == null || other.DoubleField84 != 0D) {
-          DoubleField84 = other.DoubleField84;
-        }
-      }
-      if (other.doubleField14_ != null) {
-        if (doubleField14_ == null || other.DoubleField14 != 0D) {
-          DoubleField14 = other.DoubleField14;
-        }
-      }
-      if (other.doubleField77_ != null) {
-        if (doubleField77_ == null || other.DoubleField77 != 0D) {
-          DoubleField77 = other.DoubleField77;
-        }
-      }
-      if (other.doubleField15_ != null) {
-        if (doubleField15_ == null || other.DoubleField15 != 0D) {
-          DoubleField15 = other.DoubleField15;
-        }
-      }
-      if (other.int64Field19_ != null) {
-        if (int64Field19_ == null || other.Int64Field19 != 0L) {
-          Int64Field19 = other.Int64Field19;
-        }
-      }
-      if (other.int64Field115_ != null) {
-        if (int64Field115_ == null || other.Int64Field115 != 0L) {
-          Int64Field115 = other.Int64Field115;
-        }
-      }
-      if (other.doubleField116_ != null) {
-        if (doubleField116_ == null || other.DoubleField116 != 0D) {
-          DoubleField116 = other.DoubleField116;
-        }
-      }
-      if (other.int64Field117_ != null) {
-        if (int64Field117_ == null || other.Int64Field117 != 0L) {
-          Int64Field117 = other.Int64Field117;
-        }
-      }
-      if (other.doubleField20_ != null) {
-        if (doubleField20_ == null || other.DoubleField20 != 0D) {
-          DoubleField20 = other.DoubleField20;
-        }
-      }
-      if (other.doubleField21_ != null) {
-        if (doubleField21_ == null || other.DoubleField21 != 0D) {
-          DoubleField21 = other.DoubleField21;
-        }
-      }
-      if (other.stringField73_ != null) {
-        if (stringField73_ == null || other.StringField73 != "") {
-          StringField73 = other.StringField73;
-        }
-      }
-      if (other.stringField74_ != null) {
-        if (stringField74_ == null || other.StringField74 != "") {
-          StringField74 = other.StringField74;
-        }
-      }
-      if (other.doubleField22_ != null) {
-        if (doubleField22_ == null || other.DoubleField22 != 0D) {
-          DoubleField22 = other.DoubleField22;
-        }
-      }
-      if (other.doubleField69_ != null) {
-        if (doubleField69_ == null || other.DoubleField69 != 0D) {
-          DoubleField69 = other.DoubleField69;
-        }
-      }
-      if (other.doubleField70_ != null) {
-        if (doubleField70_ == null || other.DoubleField70 != 0D) {
-          DoubleField70 = other.DoubleField70;
-        }
-      }
-      if (other.doubleField71_ != null) {
-        if (doubleField71_ == null || other.DoubleField71 != 0D) {
-          DoubleField71 = other.DoubleField71;
-        }
-      }
-      if (other.doubleField72_ != null) {
-        if (doubleField72_ == null || other.DoubleField72 != 0D) {
-          DoubleField72 = other.DoubleField72;
-        }
-      }
-      if (other.doubleField25_ != null) {
-        if (doubleField25_ == null || other.DoubleField25 != 0D) {
-          DoubleField25 = other.DoubleField25;
-        }
-      }
-      if (other.int64Field26_ != null) {
-        if (int64Field26_ == null || other.Int64Field26 != 0L) {
-          Int64Field26 = other.Int64Field26;
-        }
-      }
-      if (other.doubleField68_ != null) {
-        if (doubleField68_ == null || other.DoubleField68 != 0D) {
-          DoubleField68 = other.DoubleField68;
-        }
-      }
-      if (other.doubleField28_ != null) {
-        if (doubleField28_ == null || other.DoubleField28 != 0D) {
-          DoubleField28 = other.DoubleField28;
-        }
-      }
-      if (other.doubleField106_ != null) {
-        if (doubleField106_ == null || other.DoubleField106 != 0D) {
-          DoubleField106 = other.DoubleField106;
-        }
-      }
-      if (other.doubleField29_ != null) {
-        if (doubleField29_ == null || other.DoubleField29 != 0D) {
-          DoubleField29 = other.DoubleField29;
-        }
-      }
-      if (other.doubleField30_ != null) {
-        if (doubleField30_ == null || other.DoubleField30 != 0D) {
-          DoubleField30 = other.DoubleField30;
-        }
-      }
-      if (other.doubleField101_ != null) {
-        if (doubleField101_ == null || other.DoubleField101 != 0D) {
-          DoubleField101 = other.DoubleField101;
-        }
-      }
-      if (other.doubleField102_ != null) {
-        if (doubleField102_ == null || other.DoubleField102 != 0D) {
-          DoubleField102 = other.DoubleField102;
-        }
-      }
-      if (other.doubleField103_ != null) {
-        if (doubleField103_ == null || other.DoubleField103 != 0D) {
-          DoubleField103 = other.DoubleField103;
-        }
-      }
-      if (other.doubleField104_ != null) {
-        if (doubleField104_ == null || other.DoubleField104 != 0D) {
-          DoubleField104 = other.DoubleField104;
-        }
-      }
-      if (other.doubleField105_ != null) {
-        if (doubleField105_ == null || other.DoubleField105 != 0D) {
-          DoubleField105 = other.DoubleField105;
-        }
-      }
-      if (other.doubleField31_ != null) {
-        if (doubleField31_ == null || other.DoubleField31 != 0D) {
-          DoubleField31 = other.DoubleField31;
-        }
-      }
-      if (other.int64Field32_ != null) {
-        if (int64Field32_ == null || other.Int64Field32 != 0L) {
-          Int64Field32 = other.Int64Field32;
-        }
-      }
-      if (other.doubleField75_ != null) {
-        if (doubleField75_ == null || other.DoubleField75 != 0D) {
-          DoubleField75 = other.DoubleField75;
-        }
-      }
-      if (other.doubleField129_ != null) {
-        if (doubleField129_ == null || other.DoubleField129 != 0D) {
-          DoubleField129 = other.DoubleField129;
-        }
-      }
-      if (other.EnumField80 != 0) {
-        EnumField80 = other.EnumField80;
-      }
-      if (other.EnumField81 != 0) {
-        EnumField81 = other.EnumField81;
-      }
-      if (other.int64Field82_ != null) {
-        if (int64Field82_ == null || other.Int64Field82 != 0L) {
-          Int64Field82 = other.Int64Field82;
-        }
-      }
-      if (other.EnumField83 != 0) {
-        EnumField83 = other.EnumField83;
-      }
-      if (other.int64Field85_ != null) {
-        if (int64Field85_ == null || other.Int64Field85 != 0L) {
-          Int64Field85 = other.Int64Field85;
-        }
-      }
-      if (other.int64Field86_ != null) {
-        if (int64Field86_ == null || other.Int64Field86 != 0L) {
-          Int64Field86 = other.Int64Field86;
-        }
-      }
-      if (other.int64Field87_ != null) {
-        if (int64Field87_ == null || other.Int64Field87 != 0L) {
-          Int64Field87 = other.Int64Field87;
-        }
-      }
-      if (other.int64Field125_ != null) {
-        if (int64Field125_ == null || other.Int64Field125 != 0L) {
-          Int64Field125 = other.Int64Field125;
-        }
-      }
-      if (other.int64Field37_ != null) {
-        if (int64Field37_ == null || other.Int64Field37 != 0L) {
-          Int64Field37 = other.Int64Field37;
-        }
-      }
-      if (other.doubleField38_ != null) {
-        if (doubleField38_ == null || other.DoubleField38 != 0D) {
-          DoubleField38 = other.DoubleField38;
-        }
-      }
-      if (other.interactions_ != null) {
-        if (interactions_ == null || other.Interactions != 0L) {
-          Interactions = other.Interactions;
-        }
-      }
-      repeatedIntField100_.Add(other.repeatedIntField100_);
-      if (other.doubleField40_ != null) {
-        if (doubleField40_ == null || other.DoubleField40 != 0D) {
-          DoubleField40 = other.DoubleField40;
-        }
-      }
-      if (other.int64Field41_ != null) {
-        if (int64Field41_ == null || other.Int64Field41 != 0L) {
-          Int64Field41 = other.Int64Field41;
-        }
-      }
-      if (other.int64Field126_ != null) {
-        if (int64Field126_ == null || other.Int64Field126 != 0L) {
-          Int64Field126 = other.Int64Field126;
-        }
-      }
-      if (other.int64Field127_ != null) {
-        if (int64Field127_ == null || other.Int64Field127 != 0L) {
-          Int64Field127 = other.Int64Field127;
-        }
-      }
-      if (other.doubleField128_ != null) {
-        if (doubleField128_ == null || other.DoubleField128 != 0D) {
-          DoubleField128 = other.DoubleField128;
-        }
-      }
-      if (other.doubleField109_ != null) {
-        if (doubleField109_ == null || other.DoubleField109 != 0D) {
-          DoubleField109 = other.DoubleField109;
-        }
-      }
-      if (other.int64Field110_ != null) {
-        if (int64Field110_ == null || other.Int64Field110 != 0L) {
-          Int64Field110 = other.Int64Field110;
-        }
-      }
-      if (other.doubleField111_ != null) {
-        if (doubleField111_ == null || other.DoubleField111 != 0D) {
-          DoubleField111 = other.DoubleField111;
-        }
-      }
-      if (other.int64Field112_ != null) {
-        if (int64Field112_ == null || other.Int64Field112 != 0L) {
-          Int64Field112 = other.Int64Field112;
-        }
-      }
-      if (other.doubleField113_ != null) {
-        if (doubleField113_ == null || other.DoubleField113 != 0D) {
-          DoubleField113 = other.DoubleField113;
-        }
-      }
-      if (other.int64Field114_ != null) {
-        if (int64Field114_ == null || other.Int64Field114 != 0L) {
-          Int64Field114 = other.Int64Field114;
-        }
-      }
-      if (other.doubleField42_ != null) {
-        if (doubleField42_ == null || other.DoubleField42 != 0D) {
-          DoubleField42 = other.DoubleField42;
-        }
-      }
-      if (other.int64Field43_ != null) {
-        if (int64Field43_ == null || other.Int64Field43 != 0L) {
-          Int64Field43 = other.Int64Field43;
-        }
-      }
-      if (other.int64Field44_ != null) {
-        if (int64Field44_ == null || other.Int64Field44 != 0L) {
-          Int64Field44 = other.Int64Field44;
-        }
-      }
-      if (other.doubleField45_ != null) {
-        if (doubleField45_ == null || other.DoubleField45 != 0D) {
-          DoubleField45 = other.DoubleField45;
-        }
-      }
-      if (other.doubleField46_ != null) {
-        if (doubleField46_ == null || other.DoubleField46 != 0D) {
-          DoubleField46 = other.DoubleField46;
-        }
-      }
-      if (other.doubleField78_ != null) {
-        if (doubleField78_ == null || other.DoubleField78 != 0D) {
-          DoubleField78 = other.DoubleField78;
-        }
-      }
-      if (other.doubleField88_ != null) {
-        if (doubleField88_ == null || other.DoubleField88 != 0D) {
-          DoubleField88 = other.DoubleField88;
-        }
-      }
-      if (other.doubleField47_ != null) {
-        if (doubleField47_ == null || other.DoubleField47 != 0D) {
-          DoubleField47 = other.DoubleField47;
-        }
-      }
-      if (other.doubleField89_ != null) {
-        if (doubleField89_ == null || other.DoubleField89 != 0D) {
-          DoubleField89 = other.DoubleField89;
-        }
-      }
-      if (other.doubleField48_ != null) {
-        if (doubleField48_ == null || other.DoubleField48 != 0D) {
-          DoubleField48 = other.DoubleField48;
-        }
-      }
-      if (other.doubleField49_ != null) {
-        if (doubleField49_ == null || other.DoubleField49 != 0D) {
-          DoubleField49 = other.DoubleField49;
-        }
-      }
-      if (other.doubleField50_ != null) {
-        if (doubleField50_ == null || other.DoubleField50 != 0D) {
-          DoubleField50 = other.DoubleField50;
-        }
-      }
-      if (other.doubleField90_ != null) {
-        if (doubleField90_ == null || other.DoubleField90 != 0D) {
-          DoubleField90 = other.DoubleField90;
-        }
-      }
-      if (other.doubleField51_ != null) {
-        if (doubleField51_ == null || other.DoubleField51 != 0D) {
-          DoubleField51 = other.DoubleField51;
-        }
-      }
-      if (other.doubleField91_ != null) {
-        if (doubleField91_ == null || other.DoubleField91 != 0D) {
-          DoubleField91 = other.DoubleField91;
-        }
-      }
-      if (other.doubleField92_ != null) {
-        if (doubleField92_ == null || other.DoubleField92 != 0D) {
-          DoubleField92 = other.DoubleField92;
-        }
-      }
-      if (other.int64Field107_ != null) {
-        if (int64Field107_ == null || other.Int64Field107 != 0L) {
-          Int64Field107 = other.Int64Field107;
-        }
-      }
-      if (other.doubleField93_ != null) {
-        if (doubleField93_ == null || other.DoubleField93 != 0D) {
-          DoubleField93 = other.DoubleField93;
-        }
-      }
-      if (other.doubleField108_ != null) {
-        if (doubleField108_ == null || other.DoubleField108 != 0D) {
-          DoubleField108 = other.DoubleField108;
-        }
-      }
-      if (other.doubleField52_ != null) {
-        if (doubleField52_ == null || other.DoubleField52 != 0D) {
-          DoubleField52 = other.DoubleField52;
-        }
-      }
-      if (other.doubleField53_ != null) {
-        if (doubleField53_ == null || other.DoubleField53 != 0D) {
-          DoubleField53 = other.DoubleField53;
-        }
-      }
-      if (other.doubleField94_ != null) {
-        if (doubleField94_ == null || other.DoubleField94 != 0D) {
-          DoubleField94 = other.DoubleField94;
-        }
-      }
-      if (other.doubleField54_ != null) {
-        if (doubleField54_ == null || other.DoubleField54 != 0D) {
-          DoubleField54 = other.DoubleField54;
-        }
-      }
-      if (other.doubleField55_ != null) {
-        if (doubleField55_ == null || other.DoubleField55 != 0D) {
-          DoubleField55 = other.DoubleField55;
-        }
-      }
-      if (other.doubleField56_ != null) {
-        if (doubleField56_ == null || other.DoubleField56 != 0D) {
-          DoubleField56 = other.DoubleField56;
-        }
-      }
-      if (other.doubleField57_ != null) {
-        if (doubleField57_ == null || other.DoubleField57 != 0D) {
-          DoubleField57 = other.DoubleField57;
-        }
-      }
-      if (other.doubleField58_ != null) {
-        if (doubleField58_ == null || other.DoubleField58 != 0D) {
-          DoubleField58 = other.DoubleField58;
-        }
-      }
-      if (other.int64Field59_ != null) {
-        if (int64Field59_ == null || other.Int64Field59 != 0L) {
-          Int64Field59 = other.Int64Field59;
-        }
-      }
-      if (other.int64Field60_ != null) {
-        if (int64Field60_ == null || other.Int64Field60 != 0L) {
-          Int64Field60 = other.Int64Field60;
-        }
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 10: {
-            double? value = _single_doubleField1_codec.Read(input);
-            if (doubleField1_ == null || value != 0D) {
-              DoubleField1 = value;
-            }
-            break;
-          }
-          case 18: {
-            long? value = _single_int64Field2_codec.Read(input);
-            if (int64Field2_ == null || value != 0L) {
-              Int64Field2 = value;
-            }
-            break;
-          }
-          case 26: {
-            long? value = _single_int64Field3_codec.Read(input);
-            if (int64Field3_ == null || value != 0L) {
-              Int64Field3 = value;
-            }
-            break;
-          }
-          case 34: {
-            long? value = _single_int64Field4_codec.Read(input);
-            if (int64Field4_ == null || value != 0L) {
-              Int64Field4 = value;
-            }
-            break;
-          }
-          case 58: {
-            double? value = _single_doubleField7_codec.Read(input);
-            if (doubleField7_ == null || value != 0D) {
-              DoubleField7 = value;
-            }
-            break;
-          }
-          case 66: {
-            double? value = _single_doubleField8_codec.Read(input);
-            if (doubleField8_ == null || value != 0D) {
-              DoubleField8 = value;
-            }
-            break;
-          }
-          case 74: {
-            double? value = _single_doubleField9_codec.Read(input);
-            if (doubleField9_ == null || value != 0D) {
-              DoubleField9 = value;
-            }
-            break;
-          }
-          case 82: {
-            double? value = _single_doubleField10_codec.Read(input);
-            if (doubleField10_ == null || value != 0D) {
-              DoubleField10 = value;
-            }
-            break;
-          }
-          case 90: {
-            double? value = _single_doubleField11_codec.Read(input);
-            if (doubleField11_ == null || value != 0D) {
-              DoubleField11 = value;
-            }
-            break;
-          }
-          case 114: {
-            double? value = _single_doubleField14_codec.Read(input);
-            if (doubleField14_ == null || value != 0D) {
-              DoubleField14 = value;
-            }
-            break;
-          }
-          case 122: {
-            double? value = _single_doubleField15_codec.Read(input);
-            if (doubleField15_ == null || value != 0D) {
-              DoubleField15 = value;
-            }
-            break;
-          }
-          case 154: {
-            long? value = _single_int64Field19_codec.Read(input);
-            if (int64Field19_ == null || value != 0L) {
-              Int64Field19 = value;
-            }
-            break;
-          }
-          case 162: {
-            double? value = _single_doubleField20_codec.Read(input);
-            if (doubleField20_ == null || value != 0D) {
-              DoubleField20 = value;
-            }
-            break;
-          }
-          case 170: {
-            double? value = _single_doubleField21_codec.Read(input);
-            if (doubleField21_ == null || value != 0D) {
-              DoubleField21 = value;
-            }
-            break;
-          }
-          case 178: {
-            double? value = _single_doubleField22_codec.Read(input);
-            if (doubleField22_ == null || value != 0D) {
-              DoubleField22 = value;
-            }
-            break;
-          }
-          case 202: {
-            double? value = _single_doubleField25_codec.Read(input);
-            if (doubleField25_ == null || value != 0D) {
-              DoubleField25 = value;
-            }
-            break;
-          }
-          case 210: {
-            long? value = _single_int64Field26_codec.Read(input);
-            if (int64Field26_ == null || value != 0L) {
-              Int64Field26 = value;
-            }
-            break;
-          }
-          case 226: {
-            double? value = _single_doubleField28_codec.Read(input);
-            if (doubleField28_ == null || value != 0D) {
-              DoubleField28 = value;
-            }
-            break;
-          }
-          case 234: {
-            double? value = _single_doubleField29_codec.Read(input);
-            if (doubleField29_ == null || value != 0D) {
-              DoubleField29 = value;
-            }
-            break;
-          }
-          case 242: {
-            double? value = _single_doubleField30_codec.Read(input);
-            if (doubleField30_ == null || value != 0D) {
-              DoubleField30 = value;
-            }
-            break;
-          }
-          case 250: {
-            double? value = _single_doubleField31_codec.Read(input);
-            if (doubleField31_ == null || value != 0D) {
-              DoubleField31 = value;
-            }
-            break;
-          }
-          case 258: {
-            long? value = _single_int64Field32_codec.Read(input);
-            if (int64Field32_ == null || value != 0L) {
-              Int64Field32 = value;
-            }
-            break;
-          }
-          case 298: {
-            long? value = _single_int64Field37_codec.Read(input);
-            if (int64Field37_ == null || value != 0L) {
-              Int64Field37 = value;
-            }
-            break;
-          }
-          case 306: {
-            double? value = _single_doubleField38_codec.Read(input);
-            if (doubleField38_ == null || value != 0D) {
-              DoubleField38 = value;
-            }
-            break;
-          }
-          case 314: {
-            long? value = _single_interactions_codec.Read(input);
-            if (interactions_ == null || value != 0L) {
-              Interactions = value;
-            }
-            break;
-          }
-          case 322: {
-            double? value = _single_doubleField40_codec.Read(input);
-            if (doubleField40_ == null || value != 0D) {
-              DoubleField40 = value;
-            }
-            break;
-          }
-          case 330: {
-            long? value = _single_int64Field41_codec.Read(input);
-            if (int64Field41_ == null || value != 0L) {
-              Int64Field41 = value;
-            }
-            break;
-          }
-          case 338: {
-            double? value = _single_doubleField42_codec.Read(input);
-            if (doubleField42_ == null || value != 0D) {
-              DoubleField42 = value;
-            }
-            break;
-          }
-          case 346: {
-            long? value = _single_int64Field43_codec.Read(input);
-            if (int64Field43_ == null || value != 0L) {
-              Int64Field43 = value;
-            }
-            break;
-          }
-          case 354: {
-            long? value = _single_int64Field44_codec.Read(input);
-            if (int64Field44_ == null || value != 0L) {
-              Int64Field44 = value;
-            }
-            break;
-          }
-          case 362: {
-            double? value = _single_doubleField45_codec.Read(input);
-            if (doubleField45_ == null || value != 0D) {
-              DoubleField45 = value;
-            }
-            break;
-          }
-          case 370: {
-            double? value = _single_doubleField46_codec.Read(input);
-            if (doubleField46_ == null || value != 0D) {
-              DoubleField46 = value;
-            }
-            break;
-          }
-          case 378: {
-            double? value = _single_doubleField47_codec.Read(input);
-            if (doubleField47_ == null || value != 0D) {
-              DoubleField47 = value;
-            }
-            break;
-          }
-          case 386: {
-            double? value = _single_doubleField48_codec.Read(input);
-            if (doubleField48_ == null || value != 0D) {
-              DoubleField48 = value;
-            }
-            break;
-          }
-          case 394: {
-            double? value = _single_doubleField49_codec.Read(input);
-            if (doubleField49_ == null || value != 0D) {
-              DoubleField49 = value;
-            }
-            break;
-          }
-          case 402: {
-            double? value = _single_doubleField50_codec.Read(input);
-            if (doubleField50_ == null || value != 0D) {
-              DoubleField50 = value;
-            }
-            break;
-          }
-          case 410: {
-            double? value = _single_doubleField51_codec.Read(input);
-            if (doubleField51_ == null || value != 0D) {
-              DoubleField51 = value;
-            }
-            break;
-          }
-          case 418: {
-            double? value = _single_doubleField52_codec.Read(input);
-            if (doubleField52_ == null || value != 0D) {
-              DoubleField52 = value;
-            }
-            break;
-          }
-          case 426: {
-            double? value = _single_doubleField53_codec.Read(input);
-            if (doubleField53_ == null || value != 0D) {
-              DoubleField53 = value;
-            }
-            break;
-          }
-          case 434: {
-            double? value = _single_doubleField54_codec.Read(input);
-            if (doubleField54_ == null || value != 0D) {
-              DoubleField54 = value;
-            }
-            break;
-          }
-          case 442: {
-            double? value = _single_doubleField55_codec.Read(input);
-            if (doubleField55_ == null || value != 0D) {
-              DoubleField55 = value;
-            }
-            break;
-          }
-          case 450: {
-            double? value = _single_doubleField56_codec.Read(input);
-            if (doubleField56_ == null || value != 0D) {
-              DoubleField56 = value;
-            }
-            break;
-          }
-          case 458: {
-            double? value = _single_doubleField57_codec.Read(input);
-            if (doubleField57_ == null || value != 0D) {
-              DoubleField57 = value;
-            }
-            break;
-          }
-          case 466: {
-            double? value = _single_doubleField58_codec.Read(input);
-            if (doubleField58_ == null || value != 0D) {
-              DoubleField58 = value;
-            }
-            break;
-          }
-          case 474: {
-            long? value = _single_int64Field59_codec.Read(input);
-            if (int64Field59_ == null || value != 0L) {
-              Int64Field59 = value;
-            }
-            break;
-          }
-          case 482: {
-            long? value = _single_int64Field60_codec.Read(input);
-            if (int64Field60_ == null || value != 0L) {
-              Int64Field60 = value;
-            }
-            break;
-          }
-          case 498: {
-            double? value = _single_doubleField62_codec.Read(input);
-            if (doubleField62_ == null || value != 0D) {
-              DoubleField62 = value;
-            }
-            break;
-          }
-          case 522: {
-            double? value = _single_doubleField65_codec.Read(input);
-            if (doubleField65_ == null || value != 0D) {
-              DoubleField65 = value;
-            }
-            break;
-          }
-          case 530: {
-            double? value = _single_doubleField66_codec.Read(input);
-            if (doubleField66_ == null || value != 0D) {
-              DoubleField66 = value;
-            }
-            break;
-          }
-          case 538: {
-            double? value = _single_doubleField67_codec.Read(input);
-            if (doubleField67_ == null || value != 0D) {
-              DoubleField67 = value;
-            }
-            break;
-          }
-          case 546: {
-            double? value = _single_doubleField68_codec.Read(input);
-            if (doubleField68_ == null || value != 0D) {
-              DoubleField68 = value;
-            }
-            break;
-          }
-          case 554: {
-            double? value = _single_doubleField69_codec.Read(input);
-            if (doubleField69_ == null || value != 0D) {
-              DoubleField69 = value;
-            }
-            break;
-          }
-          case 562: {
-            double? value = _single_doubleField70_codec.Read(input);
-            if (doubleField70_ == null || value != 0D) {
-              DoubleField70 = value;
-            }
-            break;
-          }
-          case 570: {
-            double? value = _single_doubleField71_codec.Read(input);
-            if (doubleField71_ == null || value != 0D) {
-              DoubleField71 = value;
-            }
-            break;
-          }
-          case 578: {
-            double? value = _single_doubleField72_codec.Read(input);
-            if (doubleField72_ == null || value != 0D) {
-              DoubleField72 = value;
-            }
-            break;
-          }
-          case 586: {
-            string value = _single_stringField73_codec.Read(input);
-            if (stringField73_ == null || value != "") {
-              StringField73 = value;
-            }
-            break;
-          }
-          case 594: {
-            string value = _single_stringField74_codec.Read(input);
-            if (stringField74_ == null || value != "") {
-              StringField74 = value;
-            }
-            break;
-          }
-          case 602: {
-            double? value = _single_doubleField75_codec.Read(input);
-            if (doubleField75_ == null || value != 0D) {
-              DoubleField75 = value;
-            }
-            break;
-          }
-          case 618: {
-            double? value = _single_doubleField77_codec.Read(input);
-            if (doubleField77_ == null || value != 0D) {
-              DoubleField77 = value;
-            }
-            break;
-          }
-          case 626: {
-            double? value = _single_doubleField78_codec.Read(input);
-            if (doubleField78_ == null || value != 0D) {
-              DoubleField78 = value;
-            }
-            break;
-          }
-          case 634: {
-            double? value = _single_doubleField79_codec.Read(input);
-            if (doubleField79_ == null || value != 0D) {
-              DoubleField79 = value;
-            }
-            break;
-          }
-          case 640: {
-            EnumField80 = input.ReadInt32();
-            break;
-          }
-          case 648: {
-            EnumField81 = input.ReadInt32();
-            break;
-          }
-          case 658: {
-            long? value = _single_int64Field82_codec.Read(input);
-            if (int64Field82_ == null || value != 0L) {
-              Int64Field82 = value;
-            }
-            break;
-          }
-          case 664: {
-            EnumField83 = input.ReadInt32();
-            break;
-          }
-          case 674: {
-            double? value = _single_doubleField84_codec.Read(input);
-            if (doubleField84_ == null || value != 0D) {
-              DoubleField84 = value;
-            }
-            break;
-          }
-          case 682: {
-            long? value = _single_int64Field85_codec.Read(input);
-            if (int64Field85_ == null || value != 0L) {
-              Int64Field85 = value;
-            }
-            break;
-          }
-          case 690: {
-            long? value = _single_int64Field86_codec.Read(input);
-            if (int64Field86_ == null || value != 0L) {
-              Int64Field86 = value;
-            }
-            break;
-          }
-          case 698: {
-            long? value = _single_int64Field87_codec.Read(input);
-            if (int64Field87_ == null || value != 0L) {
-              Int64Field87 = value;
-            }
-            break;
-          }
-          case 706: {
-            double? value = _single_doubleField88_codec.Read(input);
-            if (doubleField88_ == null || value != 0D) {
-              DoubleField88 = value;
-            }
-            break;
-          }
-          case 714: {
-            double? value = _single_doubleField89_codec.Read(input);
-            if (doubleField89_ == null || value != 0D) {
-              DoubleField89 = value;
-            }
-            break;
-          }
-          case 722: {
-            double? value = _single_doubleField90_codec.Read(input);
-            if (doubleField90_ == null || value != 0D) {
-              DoubleField90 = value;
-            }
-            break;
-          }
-          case 730: {
-            double? value = _single_doubleField91_codec.Read(input);
-            if (doubleField91_ == null || value != 0D) {
-              DoubleField91 = value;
-            }
-            break;
-          }
-          case 738: {
-            double? value = _single_doubleField92_codec.Read(input);
-            if (doubleField92_ == null || value != 0D) {
-              DoubleField92 = value;
-            }
-            break;
-          }
-          case 746: {
-            double? value = _single_doubleField93_codec.Read(input);
-            if (doubleField93_ == null || value != 0D) {
-              DoubleField93 = value;
-            }
-            break;
-          }
-          case 754: {
-            double? value = _single_doubleField94_codec.Read(input);
-            if (doubleField94_ == null || value != 0D) {
-              DoubleField94 = value;
-            }
-            break;
-          }
-          case 762: {
-            double? value = _single_doubleField95_codec.Read(input);
-            if (doubleField95_ == null || value != 0D) {
-              DoubleField95 = value;
-            }
-            break;
-          }
-          case 770: {
-            double? value = _single_doubleField96_codec.Read(input);
-            if (doubleField96_ == null || value != 0D) {
-              DoubleField96 = value;
-            }
-            break;
-          }
-          case 778: {
-            double? value = _single_doubleField97_codec.Read(input);
-            if (doubleField97_ == null || value != 0D) {
-              DoubleField97 = value;
-            }
-            break;
-          }
-          case 786: {
-            double? value = _single_doubleField98_codec.Read(input);
-            if (doubleField98_ == null || value != 0D) {
-              DoubleField98 = value;
-            }
-            break;
-          }
-          case 794: {
-            double? value = _single_doubleField99_codec.Read(input);
-            if (doubleField99_ == null || value != 0D) {
-              DoubleField99 = value;
-            }
-            break;
-          }
-          case 802:
-          case 800: {
-            repeatedIntField100_.AddEntriesFrom(input, _repeated_repeatedIntField100_codec);
-            break;
-          }
-          case 810: {
-            double? value = _single_doubleField101_codec.Read(input);
-            if (doubleField101_ == null || value != 0D) {
-              DoubleField101 = value;
-            }
-            break;
-          }
-          case 818: {
-            double? value = _single_doubleField102_codec.Read(input);
-            if (doubleField102_ == null || value != 0D) {
-              DoubleField102 = value;
-            }
-            break;
-          }
-          case 826: {
-            double? value = _single_doubleField103_codec.Read(input);
-            if (doubleField103_ == null || value != 0D) {
-              DoubleField103 = value;
-            }
-            break;
-          }
-          case 834: {
-            double? value = _single_doubleField104_codec.Read(input);
-            if (doubleField104_ == null || value != 0D) {
-              DoubleField104 = value;
-            }
-            break;
-          }
-          case 842: {
-            double? value = _single_doubleField105_codec.Read(input);
-            if (doubleField105_ == null || value != 0D) {
-              DoubleField105 = value;
-            }
-            break;
-          }
-          case 850: {
-            double? value = _single_doubleField106_codec.Read(input);
-            if (doubleField106_ == null || value != 0D) {
-              DoubleField106 = value;
-            }
-            break;
-          }
-          case 858: {
-            long? value = _single_int64Field107_codec.Read(input);
-            if (int64Field107_ == null || value != 0L) {
-              Int64Field107 = value;
-            }
-            break;
-          }
-          case 866: {
-            double? value = _single_doubleField108_codec.Read(input);
-            if (doubleField108_ == null || value != 0D) {
-              DoubleField108 = value;
-            }
-            break;
-          }
-          case 874: {
-            double? value = _single_doubleField109_codec.Read(input);
-            if (doubleField109_ == null || value != 0D) {
-              DoubleField109 = value;
-            }
-            break;
-          }
-          case 882: {
-            long? value = _single_int64Field110_codec.Read(input);
-            if (int64Field110_ == null || value != 0L) {
-              Int64Field110 = value;
-            }
-            break;
-          }
-          case 890: {
-            double? value = _single_doubleField111_codec.Read(input);
-            if (doubleField111_ == null || value != 0D) {
-              DoubleField111 = value;
-            }
-            break;
-          }
-          case 898: {
-            long? value = _single_int64Field112_codec.Read(input);
-            if (int64Field112_ == null || value != 0L) {
-              Int64Field112 = value;
-            }
-            break;
-          }
-          case 906: {
-            double? value = _single_doubleField113_codec.Read(input);
-            if (doubleField113_ == null || value != 0D) {
-              DoubleField113 = value;
-            }
-            break;
-          }
-          case 914: {
-            long? value = _single_int64Field114_codec.Read(input);
-            if (int64Field114_ == null || value != 0L) {
-              Int64Field114 = value;
-            }
-            break;
-          }
-          case 922: {
-            long? value = _single_int64Field115_codec.Read(input);
-            if (int64Field115_ == null || value != 0L) {
-              Int64Field115 = value;
-            }
-            break;
-          }
-          case 930: {
-            double? value = _single_doubleField116_codec.Read(input);
-            if (doubleField116_ == null || value != 0D) {
-              DoubleField116 = value;
-            }
-            break;
-          }
-          case 938: {
-            long? value = _single_int64Field117_codec.Read(input);
-            if (int64Field117_ == null || value != 0L) {
-              Int64Field117 = value;
-            }
-            break;
-          }
-          case 946: {
-            double? value = _single_doubleField118_codec.Read(input);
-            if (doubleField118_ == null || value != 0D) {
-              DoubleField118 = value;
-            }
-            break;
-          }
-          case 954: {
-            double? value = _single_doubleField119_codec.Read(input);
-            if (doubleField119_ == null || value != 0D) {
-              DoubleField119 = value;
-            }
-            break;
-          }
-          case 962: {
-            double? value = _single_doubleField120_codec.Read(input);
-            if (doubleField120_ == null || value != 0D) {
-              DoubleField120 = value;
-            }
-            break;
-          }
-          case 970: {
-            double? value = _single_doubleField121_codec.Read(input);
-            if (doubleField121_ == null || value != 0D) {
-              DoubleField121 = value;
-            }
-            break;
-          }
-          case 978: {
-            double? value = _single_doubleField122_codec.Read(input);
-            if (doubleField122_ == null || value != 0D) {
-              DoubleField122 = value;
-            }
-            break;
-          }
-          case 986: {
-            double? value = _single_doubleField123_codec.Read(input);
-            if (doubleField123_ == null || value != 0D) {
-              DoubleField123 = value;
-            }
-            break;
-          }
-          case 994: {
-            double? value = _single_doubleField124_codec.Read(input);
-            if (doubleField124_ == null || value != 0D) {
-              DoubleField124 = value;
-            }
-            break;
-          }
-          case 1002: {
-            long? value = _single_int64Field125_codec.Read(input);
-            if (int64Field125_ == null || value != 0L) {
-              Int64Field125 = value;
-            }
-            break;
-          }
-          case 1010: {
-            long? value = _single_int64Field126_codec.Read(input);
-            if (int64Field126_ == null || value != 0L) {
-              Int64Field126 = value;
-            }
-            break;
-          }
-          case 1018: {
-            long? value = _single_int64Field127_codec.Read(input);
-            if (int64Field127_ == null || value != 0L) {
-              Int64Field127 = value;
-            }
-            break;
-          }
-          case 1026: {
-            double? value = _single_doubleField128_codec.Read(input);
-            if (doubleField128_ == null || value != 0D) {
-              DoubleField128 = value;
-            }
-            break;
-          }
-          case 1034: {
-            double? value = _single_doubleField129_codec.Read(input);
-            if (doubleField129_ == null || value != 0D) {
-              DoubleField129 = value;
-            }
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 10: {
-            double? value = _single_doubleField1_codec.Read(ref input);
-            if (doubleField1_ == null || value != 0D) {
-              DoubleField1 = value;
-            }
-            break;
-          }
-          case 18: {
-            long? value = _single_int64Field2_codec.Read(ref input);
-            if (int64Field2_ == null || value != 0L) {
-              Int64Field2 = value;
-            }
-            break;
-          }
-          case 26: {
-            long? value = _single_int64Field3_codec.Read(ref input);
-            if (int64Field3_ == null || value != 0L) {
-              Int64Field3 = value;
-            }
-            break;
-          }
-          case 34: {
-            long? value = _single_int64Field4_codec.Read(ref input);
-            if (int64Field4_ == null || value != 0L) {
-              Int64Field4 = value;
-            }
-            break;
-          }
-          case 58: {
-            double? value = _single_doubleField7_codec.Read(ref input);
-            if (doubleField7_ == null || value != 0D) {
-              DoubleField7 = value;
-            }
-            break;
-          }
-          case 66: {
-            double? value = _single_doubleField8_codec.Read(ref input);
-            if (doubleField8_ == null || value != 0D) {
-              DoubleField8 = value;
-            }
-            break;
-          }
-          case 74: {
-            double? value = _single_doubleField9_codec.Read(ref input);
-            if (doubleField9_ == null || value != 0D) {
-              DoubleField9 = value;
-            }
-            break;
-          }
-          case 82: {
-            double? value = _single_doubleField10_codec.Read(ref input);
-            if (doubleField10_ == null || value != 0D) {
-              DoubleField10 = value;
-            }
-            break;
-          }
-          case 90: {
-            double? value = _single_doubleField11_codec.Read(ref input);
-            if (doubleField11_ == null || value != 0D) {
-              DoubleField11 = value;
-            }
-            break;
-          }
-          case 114: {
-            double? value = _single_doubleField14_codec.Read(ref input);
-            if (doubleField14_ == null || value != 0D) {
-              DoubleField14 = value;
-            }
-            break;
-          }
-          case 122: {
-            double? value = _single_doubleField15_codec.Read(ref input);
-            if (doubleField15_ == null || value != 0D) {
-              DoubleField15 = value;
-            }
-            break;
-          }
-          case 154: {
-            long? value = _single_int64Field19_codec.Read(ref input);
-            if (int64Field19_ == null || value != 0L) {
-              Int64Field19 = value;
-            }
-            break;
-          }
-          case 162: {
-            double? value = _single_doubleField20_codec.Read(ref input);
-            if (doubleField20_ == null || value != 0D) {
-              DoubleField20 = value;
-            }
-            break;
-          }
-          case 170: {
-            double? value = _single_doubleField21_codec.Read(ref input);
-            if (doubleField21_ == null || value != 0D) {
-              DoubleField21 = value;
-            }
-            break;
-          }
-          case 178: {
-            double? value = _single_doubleField22_codec.Read(ref input);
-            if (doubleField22_ == null || value != 0D) {
-              DoubleField22 = value;
-            }
-            break;
-          }
-          case 202: {
-            double? value = _single_doubleField25_codec.Read(ref input);
-            if (doubleField25_ == null || value != 0D) {
-              DoubleField25 = value;
-            }
-            break;
-          }
-          case 210: {
-            long? value = _single_int64Field26_codec.Read(ref input);
-            if (int64Field26_ == null || value != 0L) {
-              Int64Field26 = value;
-            }
-            break;
-          }
-          case 226: {
-            double? value = _single_doubleField28_codec.Read(ref input);
-            if (doubleField28_ == null || value != 0D) {
-              DoubleField28 = value;
-            }
-            break;
-          }
-          case 234: {
-            double? value = _single_doubleField29_codec.Read(ref input);
-            if (doubleField29_ == null || value != 0D) {
-              DoubleField29 = value;
-            }
-            break;
-          }
-          case 242: {
-            double? value = _single_doubleField30_codec.Read(ref input);
-            if (doubleField30_ == null || value != 0D) {
-              DoubleField30 = value;
-            }
-            break;
-          }
-          case 250: {
-            double? value = _single_doubleField31_codec.Read(ref input);
-            if (doubleField31_ == null || value != 0D) {
-              DoubleField31 = value;
-            }
-            break;
-          }
-          case 258: {
-            long? value = _single_int64Field32_codec.Read(ref input);
-            if (int64Field32_ == null || value != 0L) {
-              Int64Field32 = value;
-            }
-            break;
-          }
-          case 298: {
-            long? value = _single_int64Field37_codec.Read(ref input);
-            if (int64Field37_ == null || value != 0L) {
-              Int64Field37 = value;
-            }
-            break;
-          }
-          case 306: {
-            double? value = _single_doubleField38_codec.Read(ref input);
-            if (doubleField38_ == null || value != 0D) {
-              DoubleField38 = value;
-            }
-            break;
-          }
-          case 314: {
-            long? value = _single_interactions_codec.Read(ref input);
-            if (interactions_ == null || value != 0L) {
-              Interactions = value;
-            }
-            break;
-          }
-          case 322: {
-            double? value = _single_doubleField40_codec.Read(ref input);
-            if (doubleField40_ == null || value != 0D) {
-              DoubleField40 = value;
-            }
-            break;
-          }
-          case 330: {
-            long? value = _single_int64Field41_codec.Read(ref input);
-            if (int64Field41_ == null || value != 0L) {
-              Int64Field41 = value;
-            }
-            break;
-          }
-          case 338: {
-            double? value = _single_doubleField42_codec.Read(ref input);
-            if (doubleField42_ == null || value != 0D) {
-              DoubleField42 = value;
-            }
-            break;
-          }
-          case 346: {
-            long? value = _single_int64Field43_codec.Read(ref input);
-            if (int64Field43_ == null || value != 0L) {
-              Int64Field43 = value;
-            }
-            break;
-          }
-          case 354: {
-            long? value = _single_int64Field44_codec.Read(ref input);
-            if (int64Field44_ == null || value != 0L) {
-              Int64Field44 = value;
-            }
-            break;
-          }
-          case 362: {
-            double? value = _single_doubleField45_codec.Read(ref input);
-            if (doubleField45_ == null || value != 0D) {
-              DoubleField45 = value;
-            }
-            break;
-          }
-          case 370: {
-            double? value = _single_doubleField46_codec.Read(ref input);
-            if (doubleField46_ == null || value != 0D) {
-              DoubleField46 = value;
-            }
-            break;
-          }
-          case 378: {
-            double? value = _single_doubleField47_codec.Read(ref input);
-            if (doubleField47_ == null || value != 0D) {
-              DoubleField47 = value;
-            }
-            break;
-          }
-          case 386: {
-            double? value = _single_doubleField48_codec.Read(ref input);
-            if (doubleField48_ == null || value != 0D) {
-              DoubleField48 = value;
-            }
-            break;
-          }
-          case 394: {
-            double? value = _single_doubleField49_codec.Read(ref input);
-            if (doubleField49_ == null || value != 0D) {
-              DoubleField49 = value;
-            }
-            break;
-          }
-          case 402: {
-            double? value = _single_doubleField50_codec.Read(ref input);
-            if (doubleField50_ == null || value != 0D) {
-              DoubleField50 = value;
-            }
-            break;
-          }
-          case 410: {
-            double? value = _single_doubleField51_codec.Read(ref input);
-            if (doubleField51_ == null || value != 0D) {
-              DoubleField51 = value;
-            }
-            break;
-          }
-          case 418: {
-            double? value = _single_doubleField52_codec.Read(ref input);
-            if (doubleField52_ == null || value != 0D) {
-              DoubleField52 = value;
-            }
-            break;
-          }
-          case 426: {
-            double? value = _single_doubleField53_codec.Read(ref input);
-            if (doubleField53_ == null || value != 0D) {
-              DoubleField53 = value;
-            }
-            break;
-          }
-          case 434: {
-            double? value = _single_doubleField54_codec.Read(ref input);
-            if (doubleField54_ == null || value != 0D) {
-              DoubleField54 = value;
-            }
-            break;
-          }
-          case 442: {
-            double? value = _single_doubleField55_codec.Read(ref input);
-            if (doubleField55_ == null || value != 0D) {
-              DoubleField55 = value;
-            }
-            break;
-          }
-          case 450: {
-            double? value = _single_doubleField56_codec.Read(ref input);
-            if (doubleField56_ == null || value != 0D) {
-              DoubleField56 = value;
-            }
-            break;
-          }
-          case 458: {
-            double? value = _single_doubleField57_codec.Read(ref input);
-            if (doubleField57_ == null || value != 0D) {
-              DoubleField57 = value;
-            }
-            break;
-          }
-          case 466: {
-            double? value = _single_doubleField58_codec.Read(ref input);
-            if (doubleField58_ == null || value != 0D) {
-              DoubleField58 = value;
-            }
-            break;
-          }
-          case 474: {
-            long? value = _single_int64Field59_codec.Read(ref input);
-            if (int64Field59_ == null || value != 0L) {
-              Int64Field59 = value;
-            }
-            break;
-          }
-          case 482: {
-            long? value = _single_int64Field60_codec.Read(ref input);
-            if (int64Field60_ == null || value != 0L) {
-              Int64Field60 = value;
-            }
-            break;
-          }
-          case 498: {
-            double? value = _single_doubleField62_codec.Read(ref input);
-            if (doubleField62_ == null || value != 0D) {
-              DoubleField62 = value;
-            }
-            break;
-          }
-          case 522: {
-            double? value = _single_doubleField65_codec.Read(ref input);
-            if (doubleField65_ == null || value != 0D) {
-              DoubleField65 = value;
-            }
-            break;
-          }
-          case 530: {
-            double? value = _single_doubleField66_codec.Read(ref input);
-            if (doubleField66_ == null || value != 0D) {
-              DoubleField66 = value;
-            }
-            break;
-          }
-          case 538: {
-            double? value = _single_doubleField67_codec.Read(ref input);
-            if (doubleField67_ == null || value != 0D) {
-              DoubleField67 = value;
-            }
-            break;
-          }
-          case 546: {
-            double? value = _single_doubleField68_codec.Read(ref input);
-            if (doubleField68_ == null || value != 0D) {
-              DoubleField68 = value;
-            }
-            break;
-          }
-          case 554: {
-            double? value = _single_doubleField69_codec.Read(ref input);
-            if (doubleField69_ == null || value != 0D) {
-              DoubleField69 = value;
-            }
-            break;
-          }
-          case 562: {
-            double? value = _single_doubleField70_codec.Read(ref input);
-            if (doubleField70_ == null || value != 0D) {
-              DoubleField70 = value;
-            }
-            break;
-          }
-          case 570: {
-            double? value = _single_doubleField71_codec.Read(ref input);
-            if (doubleField71_ == null || value != 0D) {
-              DoubleField71 = value;
-            }
-            break;
-          }
-          case 578: {
-            double? value = _single_doubleField72_codec.Read(ref input);
-            if (doubleField72_ == null || value != 0D) {
-              DoubleField72 = value;
-            }
-            break;
-          }
-          case 586: {
-            string value = _single_stringField73_codec.Read(ref input);
-            if (stringField73_ == null || value != "") {
-              StringField73 = value;
-            }
-            break;
-          }
-          case 594: {
-            string value = _single_stringField74_codec.Read(ref input);
-            if (stringField74_ == null || value != "") {
-              StringField74 = value;
-            }
-            break;
-          }
-          case 602: {
-            double? value = _single_doubleField75_codec.Read(ref input);
-            if (doubleField75_ == null || value != 0D) {
-              DoubleField75 = value;
-            }
-            break;
-          }
-          case 618: {
-            double? value = _single_doubleField77_codec.Read(ref input);
-            if (doubleField77_ == null || value != 0D) {
-              DoubleField77 = value;
-            }
-            break;
-          }
-          case 626: {
-            double? value = _single_doubleField78_codec.Read(ref input);
-            if (doubleField78_ == null || value != 0D) {
-              DoubleField78 = value;
-            }
-            break;
-          }
-          case 634: {
-            double? value = _single_doubleField79_codec.Read(ref input);
-            if (doubleField79_ == null || value != 0D) {
-              DoubleField79 = value;
-            }
-            break;
-          }
-          case 640: {
-            EnumField80 = input.ReadInt32();
-            break;
-          }
-          case 648: {
-            EnumField81 = input.ReadInt32();
-            break;
-          }
-          case 658: {
-            long? value = _single_int64Field82_codec.Read(ref input);
-            if (int64Field82_ == null || value != 0L) {
-              Int64Field82 = value;
-            }
-            break;
-          }
-          case 664: {
-            EnumField83 = input.ReadInt32();
-            break;
-          }
-          case 674: {
-            double? value = _single_doubleField84_codec.Read(ref input);
-            if (doubleField84_ == null || value != 0D) {
-              DoubleField84 = value;
-            }
-            break;
-          }
-          case 682: {
-            long? value = _single_int64Field85_codec.Read(ref input);
-            if (int64Field85_ == null || value != 0L) {
-              Int64Field85 = value;
-            }
-            break;
-          }
-          case 690: {
-            long? value = _single_int64Field86_codec.Read(ref input);
-            if (int64Field86_ == null || value != 0L) {
-              Int64Field86 = value;
-            }
-            break;
-          }
-          case 698: {
-            long? value = _single_int64Field87_codec.Read(ref input);
-            if (int64Field87_ == null || value != 0L) {
-              Int64Field87 = value;
-            }
-            break;
-          }
-          case 706: {
-            double? value = _single_doubleField88_codec.Read(ref input);
-            if (doubleField88_ == null || value != 0D) {
-              DoubleField88 = value;
-            }
-            break;
-          }
-          case 714: {
-            double? value = _single_doubleField89_codec.Read(ref input);
-            if (doubleField89_ == null || value != 0D) {
-              DoubleField89 = value;
-            }
-            break;
-          }
-          case 722: {
-            double? value = _single_doubleField90_codec.Read(ref input);
-            if (doubleField90_ == null || value != 0D) {
-              DoubleField90 = value;
-            }
-            break;
-          }
-          case 730: {
-            double? value = _single_doubleField91_codec.Read(ref input);
-            if (doubleField91_ == null || value != 0D) {
-              DoubleField91 = value;
-            }
-            break;
-          }
-          case 738: {
-            double? value = _single_doubleField92_codec.Read(ref input);
-            if (doubleField92_ == null || value != 0D) {
-              DoubleField92 = value;
-            }
-            break;
-          }
-          case 746: {
-            double? value = _single_doubleField93_codec.Read(ref input);
-            if (doubleField93_ == null || value != 0D) {
-              DoubleField93 = value;
-            }
-            break;
-          }
-          case 754: {
-            double? value = _single_doubleField94_codec.Read(ref input);
-            if (doubleField94_ == null || value != 0D) {
-              DoubleField94 = value;
-            }
-            break;
-          }
-          case 762: {
-            double? value = _single_doubleField95_codec.Read(ref input);
-            if (doubleField95_ == null || value != 0D) {
-              DoubleField95 = value;
-            }
-            break;
-          }
-          case 770: {
-            double? value = _single_doubleField96_codec.Read(ref input);
-            if (doubleField96_ == null || value != 0D) {
-              DoubleField96 = value;
-            }
-            break;
-          }
-          case 778: {
-            double? value = _single_doubleField97_codec.Read(ref input);
-            if (doubleField97_ == null || value != 0D) {
-              DoubleField97 = value;
-            }
-            break;
-          }
-          case 786: {
-            double? value = _single_doubleField98_codec.Read(ref input);
-            if (doubleField98_ == null || value != 0D) {
-              DoubleField98 = value;
-            }
-            break;
-          }
-          case 794: {
-            double? value = _single_doubleField99_codec.Read(ref input);
-            if (doubleField99_ == null || value != 0D) {
-              DoubleField99 = value;
-            }
-            break;
-          }
-          case 802:
-          case 800: {
-            repeatedIntField100_.AddEntriesFrom(ref input, _repeated_repeatedIntField100_codec);
-            break;
-          }
-          case 810: {
-            double? value = _single_doubleField101_codec.Read(ref input);
-            if (doubleField101_ == null || value != 0D) {
-              DoubleField101 = value;
-            }
-            break;
-          }
-          case 818: {
-            double? value = _single_doubleField102_codec.Read(ref input);
-            if (doubleField102_ == null || value != 0D) {
-              DoubleField102 = value;
-            }
-            break;
-          }
-          case 826: {
-            double? value = _single_doubleField103_codec.Read(ref input);
-            if (doubleField103_ == null || value != 0D) {
-              DoubleField103 = value;
-            }
-            break;
-          }
-          case 834: {
-            double? value = _single_doubleField104_codec.Read(ref input);
-            if (doubleField104_ == null || value != 0D) {
-              DoubleField104 = value;
-            }
-            break;
-          }
-          case 842: {
-            double? value = _single_doubleField105_codec.Read(ref input);
-            if (doubleField105_ == null || value != 0D) {
-              DoubleField105 = value;
-            }
-            break;
-          }
-          case 850: {
-            double? value = _single_doubleField106_codec.Read(ref input);
-            if (doubleField106_ == null || value != 0D) {
-              DoubleField106 = value;
-            }
-            break;
-          }
-          case 858: {
-            long? value = _single_int64Field107_codec.Read(ref input);
-            if (int64Field107_ == null || value != 0L) {
-              Int64Field107 = value;
-            }
-            break;
-          }
-          case 866: {
-            double? value = _single_doubleField108_codec.Read(ref input);
-            if (doubleField108_ == null || value != 0D) {
-              DoubleField108 = value;
-            }
-            break;
-          }
-          case 874: {
-            double? value = _single_doubleField109_codec.Read(ref input);
-            if (doubleField109_ == null || value != 0D) {
-              DoubleField109 = value;
-            }
-            break;
-          }
-          case 882: {
-            long? value = _single_int64Field110_codec.Read(ref input);
-            if (int64Field110_ == null || value != 0L) {
-              Int64Field110 = value;
-            }
-            break;
-          }
-          case 890: {
-            double? value = _single_doubleField111_codec.Read(ref input);
-            if (doubleField111_ == null || value != 0D) {
-              DoubleField111 = value;
-            }
-            break;
-          }
-          case 898: {
-            long? value = _single_int64Field112_codec.Read(ref input);
-            if (int64Field112_ == null || value != 0L) {
-              Int64Field112 = value;
-            }
-            break;
-          }
-          case 906: {
-            double? value = _single_doubleField113_codec.Read(ref input);
-            if (doubleField113_ == null || value != 0D) {
-              DoubleField113 = value;
-            }
-            break;
-          }
-          case 914: {
-            long? value = _single_int64Field114_codec.Read(ref input);
-            if (int64Field114_ == null || value != 0L) {
-              Int64Field114 = value;
-            }
-            break;
-          }
-          case 922: {
-            long? value = _single_int64Field115_codec.Read(ref input);
-            if (int64Field115_ == null || value != 0L) {
-              Int64Field115 = value;
-            }
-            break;
-          }
-          case 930: {
-            double? value = _single_doubleField116_codec.Read(ref input);
-            if (doubleField116_ == null || value != 0D) {
-              DoubleField116 = value;
-            }
-            break;
-          }
-          case 938: {
-            long? value = _single_int64Field117_codec.Read(ref input);
-            if (int64Field117_ == null || value != 0L) {
-              Int64Field117 = value;
-            }
-            break;
-          }
-          case 946: {
-            double? value = _single_doubleField118_codec.Read(ref input);
-            if (doubleField118_ == null || value != 0D) {
-              DoubleField118 = value;
-            }
-            break;
-          }
-          case 954: {
-            double? value = _single_doubleField119_codec.Read(ref input);
-            if (doubleField119_ == null || value != 0D) {
-              DoubleField119 = value;
-            }
-            break;
-          }
-          case 962: {
-            double? value = _single_doubleField120_codec.Read(ref input);
-            if (doubleField120_ == null || value != 0D) {
-              DoubleField120 = value;
-            }
-            break;
-          }
-          case 970: {
-            double? value = _single_doubleField121_codec.Read(ref input);
-            if (doubleField121_ == null || value != 0D) {
-              DoubleField121 = value;
-            }
-            break;
-          }
-          case 978: {
-            double? value = _single_doubleField122_codec.Read(ref input);
-            if (doubleField122_ == null || value != 0D) {
-              DoubleField122 = value;
-            }
-            break;
-          }
-          case 986: {
-            double? value = _single_doubleField123_codec.Read(ref input);
-            if (doubleField123_ == null || value != 0D) {
-              DoubleField123 = value;
-            }
-            break;
-          }
-          case 994: {
-            double? value = _single_doubleField124_codec.Read(ref input);
-            if (doubleField124_ == null || value != 0D) {
-              DoubleField124 = value;
-            }
-            break;
-          }
-          case 1002: {
-            long? value = _single_int64Field125_codec.Read(ref input);
-            if (int64Field125_ == null || value != 0L) {
-              Int64Field125 = value;
-            }
-            break;
-          }
-          case 1010: {
-            long? value = _single_int64Field126_codec.Read(ref input);
-            if (int64Field126_ == null || value != 0L) {
-              Int64Field126 = value;
-            }
-            break;
-          }
-          case 1018: {
-            long? value = _single_int64Field127_codec.Read(ref input);
-            if (int64Field127_ == null || value != 0L) {
-              Int64Field127 = value;
-            }
-            break;
-          }
-          case 1026: {
-            double? value = _single_doubleField128_codec.Read(ref input);
-            if (doubleField128_ == null || value != 0D) {
-              DoubleField128 = value;
-            }
-            break;
-          }
-          case 1034: {
-            double? value = _single_doubleField129_codec.Read(ref input);
-            if (doubleField129_ == null || value != 0D) {
-              DoubleField129 = value;
-            }
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  /// <summary>
-  /// same as ManyWrapperFieldsMessages, but with primitive fields
-  /// for comparison.
-  /// </summary>
-  public sealed partial class ManyPrimitiveFieldsMessage : pb::IMessage<ManyPrimitiveFieldsMessage>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<ManyPrimitiveFieldsMessage> _parser = new pb::MessageParser<ManyPrimitiveFieldsMessage>(() => new ManyPrimitiveFieldsMessage());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<ManyPrimitiveFieldsMessage> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.Benchmarks.WrapperBenchmarkMessagesReflection.Descriptor.MessageTypes[1]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ManyPrimitiveFieldsMessage() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ManyPrimitiveFieldsMessage(ManyPrimitiveFieldsMessage other) : this() {
-      doubleField95_ = other.doubleField95_;
-      doubleField1_ = other.doubleField1_;
-      doubleField79_ = other.doubleField79_;
-      int64Field2_ = other.int64Field2_;
-      doubleField96_ = other.doubleField96_;
-      int64Field3_ = other.int64Field3_;
-      int64Field4_ = other.int64Field4_;
-      doubleField97_ = other.doubleField97_;
-      doubleField65_ = other.doubleField65_;
-      doubleField66_ = other.doubleField66_;
-      doubleField7_ = other.doubleField7_;
-      doubleField62_ = other.doubleField62_;
-      doubleField118_ = other.doubleField118_;
-      doubleField119_ = other.doubleField119_;
-      doubleField67_ = other.doubleField67_;
-      doubleField120_ = other.doubleField120_;
-      doubleField121_ = other.doubleField121_;
-      doubleField122_ = other.doubleField122_;
-      doubleField123_ = other.doubleField123_;
-      doubleField124_ = other.doubleField124_;
-      doubleField8_ = other.doubleField8_;
-      doubleField9_ = other.doubleField9_;
-      doubleField98_ = other.doubleField98_;
-      doubleField10_ = other.doubleField10_;
-      doubleField11_ = other.doubleField11_;
-      doubleField99_ = other.doubleField99_;
-      doubleField84_ = other.doubleField84_;
-      doubleField14_ = other.doubleField14_;
-      doubleField77_ = other.doubleField77_;
-      doubleField15_ = other.doubleField15_;
-      int64Field19_ = other.int64Field19_;
-      int64Field115_ = other.int64Field115_;
-      doubleField116_ = other.doubleField116_;
-      int64Field117_ = other.int64Field117_;
-      doubleField20_ = other.doubleField20_;
-      doubleField21_ = other.doubleField21_;
-      stringField73_ = other.stringField73_;
-      stringField74_ = other.stringField74_;
-      doubleField22_ = other.doubleField22_;
-      doubleField69_ = other.doubleField69_;
-      doubleField70_ = other.doubleField70_;
-      doubleField71_ = other.doubleField71_;
-      doubleField72_ = other.doubleField72_;
-      doubleField25_ = other.doubleField25_;
-      int64Field26_ = other.int64Field26_;
-      doubleField68_ = other.doubleField68_;
-      doubleField28_ = other.doubleField28_;
-      doubleField106_ = other.doubleField106_;
-      doubleField29_ = other.doubleField29_;
-      doubleField30_ = other.doubleField30_;
-      doubleField101_ = other.doubleField101_;
-      doubleField102_ = other.doubleField102_;
-      doubleField103_ = other.doubleField103_;
-      doubleField104_ = other.doubleField104_;
-      doubleField105_ = other.doubleField105_;
-      doubleField31_ = other.doubleField31_;
-      int64Field32_ = other.int64Field32_;
-      doubleField75_ = other.doubleField75_;
-      doubleField129_ = other.doubleField129_;
-      enumField80_ = other.enumField80_;
-      enumField81_ = other.enumField81_;
-      int64Field82_ = other.int64Field82_;
-      enumField83_ = other.enumField83_;
-      int64Field85_ = other.int64Field85_;
-      int64Field86_ = other.int64Field86_;
-      int64Field87_ = other.int64Field87_;
-      int64Field125_ = other.int64Field125_;
-      int64Field37_ = other.int64Field37_;
-      doubleField38_ = other.doubleField38_;
-      interactions_ = other.interactions_;
-      repeatedIntField100_ = other.repeatedIntField100_.Clone();
-      doubleField40_ = other.doubleField40_;
-      int64Field41_ = other.int64Field41_;
-      int64Field126_ = other.int64Field126_;
-      int64Field127_ = other.int64Field127_;
-      doubleField128_ = other.doubleField128_;
-      doubleField109_ = other.doubleField109_;
-      int64Field110_ = other.int64Field110_;
-      doubleField111_ = other.doubleField111_;
-      int64Field112_ = other.int64Field112_;
-      doubleField113_ = other.doubleField113_;
-      int64Field114_ = other.int64Field114_;
-      doubleField42_ = other.doubleField42_;
-      int64Field43_ = other.int64Field43_;
-      int64Field44_ = other.int64Field44_;
-      doubleField45_ = other.doubleField45_;
-      doubleField46_ = other.doubleField46_;
-      doubleField78_ = other.doubleField78_;
-      doubleField88_ = other.doubleField88_;
-      doubleField47_ = other.doubleField47_;
-      doubleField89_ = other.doubleField89_;
-      doubleField48_ = other.doubleField48_;
-      doubleField49_ = other.doubleField49_;
-      doubleField50_ = other.doubleField50_;
-      doubleField90_ = other.doubleField90_;
-      doubleField51_ = other.doubleField51_;
-      doubleField91_ = other.doubleField91_;
-      doubleField92_ = other.doubleField92_;
-      int64Field107_ = other.int64Field107_;
-      doubleField93_ = other.doubleField93_;
-      doubleField108_ = other.doubleField108_;
-      doubleField52_ = other.doubleField52_;
-      doubleField53_ = other.doubleField53_;
-      doubleField94_ = other.doubleField94_;
-      doubleField54_ = other.doubleField54_;
-      doubleField55_ = other.doubleField55_;
-      doubleField56_ = other.doubleField56_;
-      doubleField57_ = other.doubleField57_;
-      doubleField58_ = other.doubleField58_;
-      int64Field59_ = other.int64Field59_;
-      int64Field60_ = other.int64Field60_;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ManyPrimitiveFieldsMessage Clone() {
-      return new ManyPrimitiveFieldsMessage(this);
-    }
-
-    /// <summary>Field number for the "double_field_95" field.</summary>
-    public const int DoubleField95FieldNumber = 95;
-    private double doubleField95_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double DoubleField95 {
-      get { return doubleField95_; }
-      set {
-        doubleField95_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "double_field_1" field.</summary>
-    public const int DoubleField1FieldNumber = 1;
-    private double doubleField1_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double DoubleField1 {
-      get { return doubleField1_; }
-      set {
-        doubleField1_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "double_field_79" field.</summary>
-    public const int DoubleField79FieldNumber = 79;
-    private double doubleField79_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double DoubleField79 {
-      get { return doubleField79_; }
-      set {
-        doubleField79_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "int64_field_2" field.</summary>
-    public const int Int64Field2FieldNumber = 2;
-    private long int64Field2_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public long Int64Field2 {
-      get { return int64Field2_; }
-      set {
-        int64Field2_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "double_field_96" field.</summary>
-    public const int DoubleField96FieldNumber = 96;
-    private double doubleField96_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double DoubleField96 {
-      get { return doubleField96_; }
-      set {
-        doubleField96_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "int64_field_3" field.</summary>
-    public const int Int64Field3FieldNumber = 3;
-    private long int64Field3_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public long Int64Field3 {
-      get { return int64Field3_; }
-      set {
-        int64Field3_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "int64_field_4" field.</summary>
-    public const int Int64Field4FieldNumber = 4;
-    private long int64Field4_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public long Int64Field4 {
-      get { return int64Field4_; }
-      set {
-        int64Field4_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "double_field_97" field.</summary>
-    public const int DoubleField97FieldNumber = 97;
-    private double doubleField97_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double DoubleField97 {
-      get { return doubleField97_; }
-      set {
-        doubleField97_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "double_field_65" field.</summary>
-    public const int DoubleField65FieldNumber = 65;
-    private double doubleField65_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double DoubleField65 {
-      get { return doubleField65_; }
-      set {
-        doubleField65_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "double_field_66" field.</summary>
-    public const int DoubleField66FieldNumber = 66;
-    private double doubleField66_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double DoubleField66 {
-      get { return doubleField66_; }
-      set {
-        doubleField66_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "double_field_7" field.</summary>
-    public const int DoubleField7FieldNumber = 7;
-    private double doubleField7_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double DoubleField7 {
-      get { return doubleField7_; }
-      set {
-        doubleField7_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "double_field_62" field.</summary>
-    public const int DoubleField62FieldNumber = 62;
-    private double doubleField62_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double DoubleField62 {
-      get { return doubleField62_; }
-      set {
-        doubleField62_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "double_field_118" field.</summary>
-    public const int DoubleField118FieldNumber = 118;
-    private double doubleField118_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double DoubleField118 {
-      get { return doubleField118_; }
-      set {
-        doubleField118_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "double_field_119" field.</summary>
-    public const int DoubleField119FieldNumber = 119;
-    private double doubleField119_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double DoubleField119 {
-      get { return doubleField119_; }
-      set {
-        doubleField119_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "double_field_67" field.</summary>
-    public const int DoubleField67FieldNumber = 67;
-    private double doubleField67_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double DoubleField67 {
-      get { return doubleField67_; }
-      set {
-        doubleField67_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "double_field_120" field.</summary>
-    public const int DoubleField120FieldNumber = 120;
-    private double doubleField120_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double DoubleField120 {
-      get { return doubleField120_; }
-      set {
-        doubleField120_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "double_field_121" field.</summary>
-    public const int DoubleField121FieldNumber = 121;
-    private double doubleField121_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double DoubleField121 {
-      get { return doubleField121_; }
-      set {
-        doubleField121_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "double_field_122" field.</summary>
-    public const int DoubleField122FieldNumber = 122;
-    private double doubleField122_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double DoubleField122 {
-      get { return doubleField122_; }
-      set {
-        doubleField122_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "double_field_123" field.</summary>
-    public const int DoubleField123FieldNumber = 123;
-    private double doubleField123_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double DoubleField123 {
-      get { return doubleField123_; }
-      set {
-        doubleField123_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "double_field_124" field.</summary>
-    public const int DoubleField124FieldNumber = 124;
-    private double doubleField124_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double DoubleField124 {
-      get { return doubleField124_; }
-      set {
-        doubleField124_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "double_field_8" field.</summary>
-    public const int DoubleField8FieldNumber = 8;
-    private double doubleField8_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double DoubleField8 {
-      get { return doubleField8_; }
-      set {
-        doubleField8_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "double_field_9" field.</summary>
-    public const int DoubleField9FieldNumber = 9;
-    private double doubleField9_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double DoubleField9 {
-      get { return doubleField9_; }
-      set {
-        doubleField9_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "double_field_98" field.</summary>
-    public const int DoubleField98FieldNumber = 98;
-    private double doubleField98_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double DoubleField98 {
-      get { return doubleField98_; }
-      set {
-        doubleField98_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "double_field_10" field.</summary>
-    public const int DoubleField10FieldNumber = 10;
-    private double doubleField10_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double DoubleField10 {
-      get { return doubleField10_; }
-      set {
-        doubleField10_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "double_field_11" field.</summary>
-    public const int DoubleField11FieldNumber = 11;
-    private double doubleField11_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double DoubleField11 {
-      get { return doubleField11_; }
-      set {
-        doubleField11_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "double_field_99" field.</summary>
-    public const int DoubleField99FieldNumber = 99;
-    private double doubleField99_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double DoubleField99 {
-      get { return doubleField99_; }
-      set {
-        doubleField99_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "double_field_84" field.</summary>
-    public const int DoubleField84FieldNumber = 84;
-    private double doubleField84_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double DoubleField84 {
-      get { return doubleField84_; }
-      set {
-        doubleField84_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "double_field_14" field.</summary>
-    public const int DoubleField14FieldNumber = 14;
-    private double doubleField14_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double DoubleField14 {
-      get { return doubleField14_; }
-      set {
-        doubleField14_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "double_field_77" field.</summary>
-    public const int DoubleField77FieldNumber = 77;
-    private double doubleField77_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double DoubleField77 {
-      get { return doubleField77_; }
-      set {
-        doubleField77_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "double_field_15" field.</summary>
-    public const int DoubleField15FieldNumber = 15;
-    private double doubleField15_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double DoubleField15 {
-      get { return doubleField15_; }
-      set {
-        doubleField15_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "int64_field_19" field.</summary>
-    public const int Int64Field19FieldNumber = 19;
-    private long int64Field19_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public long Int64Field19 {
-      get { return int64Field19_; }
-      set {
-        int64Field19_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "int64_field_115" field.</summary>
-    public const int Int64Field115FieldNumber = 115;
-    private long int64Field115_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public long Int64Field115 {
-      get { return int64Field115_; }
-      set {
-        int64Field115_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "double_field_116" field.</summary>
-    public const int DoubleField116FieldNumber = 116;
-    private double doubleField116_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double DoubleField116 {
-      get { return doubleField116_; }
-      set {
-        doubleField116_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "int64_field_117" field.</summary>
-    public const int Int64Field117FieldNumber = 117;
-    private long int64Field117_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public long Int64Field117 {
-      get { return int64Field117_; }
-      set {
-        int64Field117_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "double_field_20" field.</summary>
-    public const int DoubleField20FieldNumber = 20;
-    private double doubleField20_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double DoubleField20 {
-      get { return doubleField20_; }
-      set {
-        doubleField20_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "double_field_21" field.</summary>
-    public const int DoubleField21FieldNumber = 21;
-    private double doubleField21_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double DoubleField21 {
-      get { return doubleField21_; }
-      set {
-        doubleField21_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "string_field_73" field.</summary>
-    public const int StringField73FieldNumber = 73;
-    private string stringField73_ = "";
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string StringField73 {
-      get { return stringField73_; }
-      set {
-        stringField73_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-
-    /// <summary>Field number for the "string_field_74" field.</summary>
-    public const int StringField74FieldNumber = 74;
-    private string stringField74_ = "";
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string StringField74 {
-      get { return stringField74_; }
-      set {
-        stringField74_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-
-    /// <summary>Field number for the "double_field_22" field.</summary>
-    public const int DoubleField22FieldNumber = 22;
-    private double doubleField22_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double DoubleField22 {
-      get { return doubleField22_; }
-      set {
-        doubleField22_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "double_field_69" field.</summary>
-    public const int DoubleField69FieldNumber = 69;
-    private double doubleField69_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double DoubleField69 {
-      get { return doubleField69_; }
-      set {
-        doubleField69_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "double_field_70" field.</summary>
-    public const int DoubleField70FieldNumber = 70;
-    private double doubleField70_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double DoubleField70 {
-      get { return doubleField70_; }
-      set {
-        doubleField70_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "double_field_71" field.</summary>
-    public const int DoubleField71FieldNumber = 71;
-    private double doubleField71_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double DoubleField71 {
-      get { return doubleField71_; }
-      set {
-        doubleField71_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "double_field_72" field.</summary>
-    public const int DoubleField72FieldNumber = 72;
-    private double doubleField72_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double DoubleField72 {
-      get { return doubleField72_; }
-      set {
-        doubleField72_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "double_field_25" field.</summary>
-    public const int DoubleField25FieldNumber = 25;
-    private double doubleField25_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double DoubleField25 {
-      get { return doubleField25_; }
-      set {
-        doubleField25_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "int64_field_26" field.</summary>
-    public const int Int64Field26FieldNumber = 26;
-    private long int64Field26_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public long Int64Field26 {
-      get { return int64Field26_; }
-      set {
-        int64Field26_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "double_field_68" field.</summary>
-    public const int DoubleField68FieldNumber = 68;
-    private double doubleField68_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double DoubleField68 {
-      get { return doubleField68_; }
-      set {
-        doubleField68_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "double_field_28" field.</summary>
-    public const int DoubleField28FieldNumber = 28;
-    private double doubleField28_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double DoubleField28 {
-      get { return doubleField28_; }
-      set {
-        doubleField28_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "double_field_106" field.</summary>
-    public const int DoubleField106FieldNumber = 106;
-    private double doubleField106_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double DoubleField106 {
-      get { return doubleField106_; }
-      set {
-        doubleField106_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "double_field_29" field.</summary>
-    public const int DoubleField29FieldNumber = 29;
-    private double doubleField29_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double DoubleField29 {
-      get { return doubleField29_; }
-      set {
-        doubleField29_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "double_field_30" field.</summary>
-    public const int DoubleField30FieldNumber = 30;
-    private double doubleField30_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double DoubleField30 {
-      get { return doubleField30_; }
-      set {
-        doubleField30_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "double_field_101" field.</summary>
-    public const int DoubleField101FieldNumber = 101;
-    private double doubleField101_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double DoubleField101 {
-      get { return doubleField101_; }
-      set {
-        doubleField101_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "double_field_102" field.</summary>
-    public const int DoubleField102FieldNumber = 102;
-    private double doubleField102_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double DoubleField102 {
-      get { return doubleField102_; }
-      set {
-        doubleField102_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "double_field_103" field.</summary>
-    public const int DoubleField103FieldNumber = 103;
-    private double doubleField103_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double DoubleField103 {
-      get { return doubleField103_; }
-      set {
-        doubleField103_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "double_field_104" field.</summary>
-    public const int DoubleField104FieldNumber = 104;
-    private double doubleField104_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double DoubleField104 {
-      get { return doubleField104_; }
-      set {
-        doubleField104_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "double_field_105" field.</summary>
-    public const int DoubleField105FieldNumber = 105;
-    private double doubleField105_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double DoubleField105 {
-      get { return doubleField105_; }
-      set {
-        doubleField105_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "double_field_31" field.</summary>
-    public const int DoubleField31FieldNumber = 31;
-    private double doubleField31_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double DoubleField31 {
-      get { return doubleField31_; }
-      set {
-        doubleField31_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "int64_field_32" field.</summary>
-    public const int Int64Field32FieldNumber = 32;
-    private long int64Field32_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public long Int64Field32 {
-      get { return int64Field32_; }
-      set {
-        int64Field32_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "double_field_75" field.</summary>
-    public const int DoubleField75FieldNumber = 75;
-    private double doubleField75_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double DoubleField75 {
-      get { return doubleField75_; }
-      set {
-        doubleField75_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "double_field_129" field.</summary>
-    public const int DoubleField129FieldNumber = 129;
-    private double doubleField129_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double DoubleField129 {
-      get { return doubleField129_; }
-      set {
-        doubleField129_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "enum_field_80" field.</summary>
-    public const int EnumField80FieldNumber = 80;
-    private int enumField80_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int EnumField80 {
-      get { return enumField80_; }
-      set {
-        enumField80_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "enum_field_81" field.</summary>
-    public const int EnumField81FieldNumber = 81;
-    private int enumField81_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int EnumField81 {
-      get { return enumField81_; }
-      set {
-        enumField81_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "int64_field_82" field.</summary>
-    public const int Int64Field82FieldNumber = 82;
-    private long int64Field82_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public long Int64Field82 {
-      get { return int64Field82_; }
-      set {
-        int64Field82_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "enum_field_83" field.</summary>
-    public const int EnumField83FieldNumber = 83;
-    private int enumField83_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int EnumField83 {
-      get { return enumField83_; }
-      set {
-        enumField83_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "int64_field_85" field.</summary>
-    public const int Int64Field85FieldNumber = 85;
-    private long int64Field85_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public long Int64Field85 {
-      get { return int64Field85_; }
-      set {
-        int64Field85_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "int64_field_86" field.</summary>
-    public const int Int64Field86FieldNumber = 86;
-    private long int64Field86_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public long Int64Field86 {
-      get { return int64Field86_; }
-      set {
-        int64Field86_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "int64_field_87" field.</summary>
-    public const int Int64Field87FieldNumber = 87;
-    private long int64Field87_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public long Int64Field87 {
-      get { return int64Field87_; }
-      set {
-        int64Field87_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "int64_field_125" field.</summary>
-    public const int Int64Field125FieldNumber = 125;
-    private long int64Field125_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public long Int64Field125 {
-      get { return int64Field125_; }
-      set {
-        int64Field125_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "int64_field_37" field.</summary>
-    public const int Int64Field37FieldNumber = 37;
-    private long int64Field37_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public long Int64Field37 {
-      get { return int64Field37_; }
-      set {
-        int64Field37_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "double_field_38" field.</summary>
-    public const int DoubleField38FieldNumber = 38;
-    private double doubleField38_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double DoubleField38 {
-      get { return doubleField38_; }
-      set {
-        doubleField38_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "interactions" field.</summary>
-    public const int InteractionsFieldNumber = 39;
-    private long interactions_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public long Interactions {
-      get { return interactions_; }
-      set {
-        interactions_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "repeated_int_field_100" field.</summary>
-    public const int RepeatedIntField100FieldNumber = 100;
-    private static readonly pb::FieldCodec<int> _repeated_repeatedIntField100_codec
-        = pb::FieldCodec.ForInt32(802);
-    private readonly pbc::RepeatedField<int> repeatedIntField100_ = new pbc::RepeatedField<int>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<int> RepeatedIntField100 {
-      get { return repeatedIntField100_; }
-    }
-
-    /// <summary>Field number for the "double_field_40" field.</summary>
-    public const int DoubleField40FieldNumber = 40;
-    private double doubleField40_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double DoubleField40 {
-      get { return doubleField40_; }
-      set {
-        doubleField40_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "int64_field_41" field.</summary>
-    public const int Int64Field41FieldNumber = 41;
-    private long int64Field41_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public long Int64Field41 {
-      get { return int64Field41_; }
-      set {
-        int64Field41_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "int64_field_126" field.</summary>
-    public const int Int64Field126FieldNumber = 126;
-    private long int64Field126_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public long Int64Field126 {
-      get { return int64Field126_; }
-      set {
-        int64Field126_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "int64_field_127" field.</summary>
-    public const int Int64Field127FieldNumber = 127;
-    private long int64Field127_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public long Int64Field127 {
-      get { return int64Field127_; }
-      set {
-        int64Field127_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "double_field_128" field.</summary>
-    public const int DoubleField128FieldNumber = 128;
-    private double doubleField128_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double DoubleField128 {
-      get { return doubleField128_; }
-      set {
-        doubleField128_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "double_field_109" field.</summary>
-    public const int DoubleField109FieldNumber = 109;
-    private double doubleField109_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double DoubleField109 {
-      get { return doubleField109_; }
-      set {
-        doubleField109_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "int64_field_110" field.</summary>
-    public const int Int64Field110FieldNumber = 110;
-    private long int64Field110_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public long Int64Field110 {
-      get { return int64Field110_; }
-      set {
-        int64Field110_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "double_field_111" field.</summary>
-    public const int DoubleField111FieldNumber = 111;
-    private double doubleField111_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double DoubleField111 {
-      get { return doubleField111_; }
-      set {
-        doubleField111_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "int64_field_112" field.</summary>
-    public const int Int64Field112FieldNumber = 112;
-    private long int64Field112_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public long Int64Field112 {
-      get { return int64Field112_; }
-      set {
-        int64Field112_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "double_field_113" field.</summary>
-    public const int DoubleField113FieldNumber = 113;
-    private double doubleField113_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double DoubleField113 {
-      get { return doubleField113_; }
-      set {
-        doubleField113_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "int64_field_114" field.</summary>
-    public const int Int64Field114FieldNumber = 114;
-    private long int64Field114_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public long Int64Field114 {
-      get { return int64Field114_; }
-      set {
-        int64Field114_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "double_field_42" field.</summary>
-    public const int DoubleField42FieldNumber = 42;
-    private double doubleField42_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double DoubleField42 {
-      get { return doubleField42_; }
-      set {
-        doubleField42_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "int64_field_43" field.</summary>
-    public const int Int64Field43FieldNumber = 43;
-    private long int64Field43_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public long Int64Field43 {
-      get { return int64Field43_; }
-      set {
-        int64Field43_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "int64_field_44" field.</summary>
-    public const int Int64Field44FieldNumber = 44;
-    private long int64Field44_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public long Int64Field44 {
-      get { return int64Field44_; }
-      set {
-        int64Field44_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "double_field_45" field.</summary>
-    public const int DoubleField45FieldNumber = 45;
-    private double doubleField45_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double DoubleField45 {
-      get { return doubleField45_; }
-      set {
-        doubleField45_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "double_field_46" field.</summary>
-    public const int DoubleField46FieldNumber = 46;
-    private double doubleField46_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double DoubleField46 {
-      get { return doubleField46_; }
-      set {
-        doubleField46_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "double_field_78" field.</summary>
-    public const int DoubleField78FieldNumber = 78;
-    private double doubleField78_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double DoubleField78 {
-      get { return doubleField78_; }
-      set {
-        doubleField78_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "double_field_88" field.</summary>
-    public const int DoubleField88FieldNumber = 88;
-    private double doubleField88_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double DoubleField88 {
-      get { return doubleField88_; }
-      set {
-        doubleField88_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "double_field_47" field.</summary>
-    public const int DoubleField47FieldNumber = 47;
-    private double doubleField47_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double DoubleField47 {
-      get { return doubleField47_; }
-      set {
-        doubleField47_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "double_field_89" field.</summary>
-    public const int DoubleField89FieldNumber = 89;
-    private double doubleField89_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double DoubleField89 {
-      get { return doubleField89_; }
-      set {
-        doubleField89_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "double_field_48" field.</summary>
-    public const int DoubleField48FieldNumber = 48;
-    private double doubleField48_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double DoubleField48 {
-      get { return doubleField48_; }
-      set {
-        doubleField48_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "double_field_49" field.</summary>
-    public const int DoubleField49FieldNumber = 49;
-    private double doubleField49_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double DoubleField49 {
-      get { return doubleField49_; }
-      set {
-        doubleField49_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "double_field_50" field.</summary>
-    public const int DoubleField50FieldNumber = 50;
-    private double doubleField50_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double DoubleField50 {
-      get { return doubleField50_; }
-      set {
-        doubleField50_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "double_field_90" field.</summary>
-    public const int DoubleField90FieldNumber = 90;
-    private double doubleField90_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double DoubleField90 {
-      get { return doubleField90_; }
-      set {
-        doubleField90_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "double_field_51" field.</summary>
-    public const int DoubleField51FieldNumber = 51;
-    private double doubleField51_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double DoubleField51 {
-      get { return doubleField51_; }
-      set {
-        doubleField51_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "double_field_91" field.</summary>
-    public const int DoubleField91FieldNumber = 91;
-    private double doubleField91_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double DoubleField91 {
-      get { return doubleField91_; }
-      set {
-        doubleField91_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "double_field_92" field.</summary>
-    public const int DoubleField92FieldNumber = 92;
-    private double doubleField92_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double DoubleField92 {
-      get { return doubleField92_; }
-      set {
-        doubleField92_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "int64_field_107" field.</summary>
-    public const int Int64Field107FieldNumber = 107;
-    private long int64Field107_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public long Int64Field107 {
-      get { return int64Field107_; }
-      set {
-        int64Field107_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "double_field_93" field.</summary>
-    public const int DoubleField93FieldNumber = 93;
-    private double doubleField93_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double DoubleField93 {
-      get { return doubleField93_; }
-      set {
-        doubleField93_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "double_field_108" field.</summary>
-    public const int DoubleField108FieldNumber = 108;
-    private double doubleField108_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double DoubleField108 {
-      get { return doubleField108_; }
-      set {
-        doubleField108_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "double_field_52" field.</summary>
-    public const int DoubleField52FieldNumber = 52;
-    private double doubleField52_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double DoubleField52 {
-      get { return doubleField52_; }
-      set {
-        doubleField52_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "double_field_53" field.</summary>
-    public const int DoubleField53FieldNumber = 53;
-    private double doubleField53_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double DoubleField53 {
-      get { return doubleField53_; }
-      set {
-        doubleField53_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "double_field_94" field.</summary>
-    public const int DoubleField94FieldNumber = 94;
-    private double doubleField94_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double DoubleField94 {
-      get { return doubleField94_; }
-      set {
-        doubleField94_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "double_field_54" field.</summary>
-    public const int DoubleField54FieldNumber = 54;
-    private double doubleField54_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double DoubleField54 {
-      get { return doubleField54_; }
-      set {
-        doubleField54_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "double_field_55" field.</summary>
-    public const int DoubleField55FieldNumber = 55;
-    private double doubleField55_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double DoubleField55 {
-      get { return doubleField55_; }
-      set {
-        doubleField55_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "double_field_56" field.</summary>
-    public const int DoubleField56FieldNumber = 56;
-    private double doubleField56_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double DoubleField56 {
-      get { return doubleField56_; }
-      set {
-        doubleField56_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "double_field_57" field.</summary>
-    public const int DoubleField57FieldNumber = 57;
-    private double doubleField57_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double DoubleField57 {
-      get { return doubleField57_; }
-      set {
-        doubleField57_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "double_field_58" field.</summary>
-    public const int DoubleField58FieldNumber = 58;
-    private double doubleField58_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double DoubleField58 {
-      get { return doubleField58_; }
-      set {
-        doubleField58_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "int64_field_59" field.</summary>
-    public const int Int64Field59FieldNumber = 59;
-    private long int64Field59_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public long Int64Field59 {
-      get { return int64Field59_; }
-      set {
-        int64Field59_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "int64_field_60" field.</summary>
-    public const int Int64Field60FieldNumber = 60;
-    private long int64Field60_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public long Int64Field60 {
-      get { return int64Field60_; }
-      set {
-        int64Field60_ = value;
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as ManyPrimitiveFieldsMessage);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(ManyPrimitiveFieldsMessage other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (!pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.Equals(DoubleField95, other.DoubleField95)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.Equals(DoubleField1, other.DoubleField1)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.Equals(DoubleField79, other.DoubleField79)) return false;
-      if (Int64Field2 != other.Int64Field2) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.Equals(DoubleField96, other.DoubleField96)) return false;
-      if (Int64Field3 != other.Int64Field3) return false;
-      if (Int64Field4 != other.Int64Field4) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.Equals(DoubleField97, other.DoubleField97)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.Equals(DoubleField65, other.DoubleField65)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.Equals(DoubleField66, other.DoubleField66)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.Equals(DoubleField7, other.DoubleField7)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.Equals(DoubleField62, other.DoubleField62)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.Equals(DoubleField118, other.DoubleField118)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.Equals(DoubleField119, other.DoubleField119)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.Equals(DoubleField67, other.DoubleField67)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.Equals(DoubleField120, other.DoubleField120)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.Equals(DoubleField121, other.DoubleField121)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.Equals(DoubleField122, other.DoubleField122)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.Equals(DoubleField123, other.DoubleField123)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.Equals(DoubleField124, other.DoubleField124)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.Equals(DoubleField8, other.DoubleField8)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.Equals(DoubleField9, other.DoubleField9)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.Equals(DoubleField98, other.DoubleField98)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.Equals(DoubleField10, other.DoubleField10)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.Equals(DoubleField11, other.DoubleField11)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.Equals(DoubleField99, other.DoubleField99)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.Equals(DoubleField84, other.DoubleField84)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.Equals(DoubleField14, other.DoubleField14)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.Equals(DoubleField77, other.DoubleField77)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.Equals(DoubleField15, other.DoubleField15)) return false;
-      if (Int64Field19 != other.Int64Field19) return false;
-      if (Int64Field115 != other.Int64Field115) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.Equals(DoubleField116, other.DoubleField116)) return false;
-      if (Int64Field117 != other.Int64Field117) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.Equals(DoubleField20, other.DoubleField20)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.Equals(DoubleField21, other.DoubleField21)) return false;
-      if (StringField73 != other.StringField73) return false;
-      if (StringField74 != other.StringField74) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.Equals(DoubleField22, other.DoubleField22)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.Equals(DoubleField69, other.DoubleField69)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.Equals(DoubleField70, other.DoubleField70)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.Equals(DoubleField71, other.DoubleField71)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.Equals(DoubleField72, other.DoubleField72)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.Equals(DoubleField25, other.DoubleField25)) return false;
-      if (Int64Field26 != other.Int64Field26) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.Equals(DoubleField68, other.DoubleField68)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.Equals(DoubleField28, other.DoubleField28)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.Equals(DoubleField106, other.DoubleField106)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.Equals(DoubleField29, other.DoubleField29)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.Equals(DoubleField30, other.DoubleField30)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.Equals(DoubleField101, other.DoubleField101)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.Equals(DoubleField102, other.DoubleField102)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.Equals(DoubleField103, other.DoubleField103)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.Equals(DoubleField104, other.DoubleField104)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.Equals(DoubleField105, other.DoubleField105)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.Equals(DoubleField31, other.DoubleField31)) return false;
-      if (Int64Field32 != other.Int64Field32) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.Equals(DoubleField75, other.DoubleField75)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.Equals(DoubleField129, other.DoubleField129)) return false;
-      if (EnumField80 != other.EnumField80) return false;
-      if (EnumField81 != other.EnumField81) return false;
-      if (Int64Field82 != other.Int64Field82) return false;
-      if (EnumField83 != other.EnumField83) return false;
-      if (Int64Field85 != other.Int64Field85) return false;
-      if (Int64Field86 != other.Int64Field86) return false;
-      if (Int64Field87 != other.Int64Field87) return false;
-      if (Int64Field125 != other.Int64Field125) return false;
-      if (Int64Field37 != other.Int64Field37) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.Equals(DoubleField38, other.DoubleField38)) return false;
-      if (Interactions != other.Interactions) return false;
-      if(!repeatedIntField100_.Equals(other.repeatedIntField100_)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.Equals(DoubleField40, other.DoubleField40)) return false;
-      if (Int64Field41 != other.Int64Field41) return false;
-      if (Int64Field126 != other.Int64Field126) return false;
-      if (Int64Field127 != other.Int64Field127) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.Equals(DoubleField128, other.DoubleField128)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.Equals(DoubleField109, other.DoubleField109)) return false;
-      if (Int64Field110 != other.Int64Field110) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.Equals(DoubleField111, other.DoubleField111)) return false;
-      if (Int64Field112 != other.Int64Field112) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.Equals(DoubleField113, other.DoubleField113)) return false;
-      if (Int64Field114 != other.Int64Field114) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.Equals(DoubleField42, other.DoubleField42)) return false;
-      if (Int64Field43 != other.Int64Field43) return false;
-      if (Int64Field44 != other.Int64Field44) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.Equals(DoubleField45, other.DoubleField45)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.Equals(DoubleField46, other.DoubleField46)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.Equals(DoubleField78, other.DoubleField78)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.Equals(DoubleField88, other.DoubleField88)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.Equals(DoubleField47, other.DoubleField47)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.Equals(DoubleField89, other.DoubleField89)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.Equals(DoubleField48, other.DoubleField48)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.Equals(DoubleField49, other.DoubleField49)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.Equals(DoubleField50, other.DoubleField50)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.Equals(DoubleField90, other.DoubleField90)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.Equals(DoubleField51, other.DoubleField51)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.Equals(DoubleField91, other.DoubleField91)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.Equals(DoubleField92, other.DoubleField92)) return false;
-      if (Int64Field107 != other.Int64Field107) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.Equals(DoubleField93, other.DoubleField93)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.Equals(DoubleField108, other.DoubleField108)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.Equals(DoubleField52, other.DoubleField52)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.Equals(DoubleField53, other.DoubleField53)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.Equals(DoubleField94, other.DoubleField94)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.Equals(DoubleField54, other.DoubleField54)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.Equals(DoubleField55, other.DoubleField55)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.Equals(DoubleField56, other.DoubleField56)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.Equals(DoubleField57, other.DoubleField57)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.Equals(DoubleField58, other.DoubleField58)) return false;
-      if (Int64Field59 != other.Int64Field59) return false;
-      if (Int64Field60 != other.Int64Field60) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (DoubleField95 != 0D) hash ^= pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.GetHashCode(DoubleField95);
-      if (DoubleField1 != 0D) hash ^= pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.GetHashCode(DoubleField1);
-      if (DoubleField79 != 0D) hash ^= pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.GetHashCode(DoubleField79);
-      if (Int64Field2 != 0L) hash ^= Int64Field2.GetHashCode();
-      if (DoubleField96 != 0D) hash ^= pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.GetHashCode(DoubleField96);
-      if (Int64Field3 != 0L) hash ^= Int64Field3.GetHashCode();
-      if (Int64Field4 != 0L) hash ^= Int64Field4.GetHashCode();
-      if (DoubleField97 != 0D) hash ^= pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.GetHashCode(DoubleField97);
-      if (DoubleField65 != 0D) hash ^= pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.GetHashCode(DoubleField65);
-      if (DoubleField66 != 0D) hash ^= pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.GetHashCode(DoubleField66);
-      if (DoubleField7 != 0D) hash ^= pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.GetHashCode(DoubleField7);
-      if (DoubleField62 != 0D) hash ^= pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.GetHashCode(DoubleField62);
-      if (DoubleField118 != 0D) hash ^= pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.GetHashCode(DoubleField118);
-      if (DoubleField119 != 0D) hash ^= pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.GetHashCode(DoubleField119);
-      if (DoubleField67 != 0D) hash ^= pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.GetHashCode(DoubleField67);
-      if (DoubleField120 != 0D) hash ^= pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.GetHashCode(DoubleField120);
-      if (DoubleField121 != 0D) hash ^= pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.GetHashCode(DoubleField121);
-      if (DoubleField122 != 0D) hash ^= pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.GetHashCode(DoubleField122);
-      if (DoubleField123 != 0D) hash ^= pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.GetHashCode(DoubleField123);
-      if (DoubleField124 != 0D) hash ^= pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.GetHashCode(DoubleField124);
-      if (DoubleField8 != 0D) hash ^= pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.GetHashCode(DoubleField8);
-      if (DoubleField9 != 0D) hash ^= pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.GetHashCode(DoubleField9);
-      if (DoubleField98 != 0D) hash ^= pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.GetHashCode(DoubleField98);
-      if (DoubleField10 != 0D) hash ^= pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.GetHashCode(DoubleField10);
-      if (DoubleField11 != 0D) hash ^= pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.GetHashCode(DoubleField11);
-      if (DoubleField99 != 0D) hash ^= pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.GetHashCode(DoubleField99);
-      if (DoubleField84 != 0D) hash ^= pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.GetHashCode(DoubleField84);
-      if (DoubleField14 != 0D) hash ^= pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.GetHashCode(DoubleField14);
-      if (DoubleField77 != 0D) hash ^= pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.GetHashCode(DoubleField77);
-      if (DoubleField15 != 0D) hash ^= pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.GetHashCode(DoubleField15);
-      if (Int64Field19 != 0L) hash ^= Int64Field19.GetHashCode();
-      if (Int64Field115 != 0L) hash ^= Int64Field115.GetHashCode();
-      if (DoubleField116 != 0D) hash ^= pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.GetHashCode(DoubleField116);
-      if (Int64Field117 != 0L) hash ^= Int64Field117.GetHashCode();
-      if (DoubleField20 != 0D) hash ^= pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.GetHashCode(DoubleField20);
-      if (DoubleField21 != 0D) hash ^= pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.GetHashCode(DoubleField21);
-      if (StringField73.Length != 0) hash ^= StringField73.GetHashCode();
-      if (StringField74.Length != 0) hash ^= StringField74.GetHashCode();
-      if (DoubleField22 != 0D) hash ^= pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.GetHashCode(DoubleField22);
-      if (DoubleField69 != 0D) hash ^= pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.GetHashCode(DoubleField69);
-      if (DoubleField70 != 0D) hash ^= pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.GetHashCode(DoubleField70);
-      if (DoubleField71 != 0D) hash ^= pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.GetHashCode(DoubleField71);
-      if (DoubleField72 != 0D) hash ^= pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.GetHashCode(DoubleField72);
-      if (DoubleField25 != 0D) hash ^= pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.GetHashCode(DoubleField25);
-      if (Int64Field26 != 0L) hash ^= Int64Field26.GetHashCode();
-      if (DoubleField68 != 0D) hash ^= pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.GetHashCode(DoubleField68);
-      if (DoubleField28 != 0D) hash ^= pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.GetHashCode(DoubleField28);
-      if (DoubleField106 != 0D) hash ^= pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.GetHashCode(DoubleField106);
-      if (DoubleField29 != 0D) hash ^= pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.GetHashCode(DoubleField29);
-      if (DoubleField30 != 0D) hash ^= pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.GetHashCode(DoubleField30);
-      if (DoubleField101 != 0D) hash ^= pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.GetHashCode(DoubleField101);
-      if (DoubleField102 != 0D) hash ^= pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.GetHashCode(DoubleField102);
-      if (DoubleField103 != 0D) hash ^= pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.GetHashCode(DoubleField103);
-      if (DoubleField104 != 0D) hash ^= pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.GetHashCode(DoubleField104);
-      if (DoubleField105 != 0D) hash ^= pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.GetHashCode(DoubleField105);
-      if (DoubleField31 != 0D) hash ^= pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.GetHashCode(DoubleField31);
-      if (Int64Field32 != 0L) hash ^= Int64Field32.GetHashCode();
-      if (DoubleField75 != 0D) hash ^= pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.GetHashCode(DoubleField75);
-      if (DoubleField129 != 0D) hash ^= pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.GetHashCode(DoubleField129);
-      if (EnumField80 != 0) hash ^= EnumField80.GetHashCode();
-      if (EnumField81 != 0) hash ^= EnumField81.GetHashCode();
-      if (Int64Field82 != 0L) hash ^= Int64Field82.GetHashCode();
-      if (EnumField83 != 0) hash ^= EnumField83.GetHashCode();
-      if (Int64Field85 != 0L) hash ^= Int64Field85.GetHashCode();
-      if (Int64Field86 != 0L) hash ^= Int64Field86.GetHashCode();
-      if (Int64Field87 != 0L) hash ^= Int64Field87.GetHashCode();
-      if (Int64Field125 != 0L) hash ^= Int64Field125.GetHashCode();
-      if (Int64Field37 != 0L) hash ^= Int64Field37.GetHashCode();
-      if (DoubleField38 != 0D) hash ^= pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.GetHashCode(DoubleField38);
-      if (Interactions != 0L) hash ^= Interactions.GetHashCode();
-      hash ^= repeatedIntField100_.GetHashCode();
-      if (DoubleField40 != 0D) hash ^= pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.GetHashCode(DoubleField40);
-      if (Int64Field41 != 0L) hash ^= Int64Field41.GetHashCode();
-      if (Int64Field126 != 0L) hash ^= Int64Field126.GetHashCode();
-      if (Int64Field127 != 0L) hash ^= Int64Field127.GetHashCode();
-      if (DoubleField128 != 0D) hash ^= pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.GetHashCode(DoubleField128);
-      if (DoubleField109 != 0D) hash ^= pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.GetHashCode(DoubleField109);
-      if (Int64Field110 != 0L) hash ^= Int64Field110.GetHashCode();
-      if (DoubleField111 != 0D) hash ^= pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.GetHashCode(DoubleField111);
-      if (Int64Field112 != 0L) hash ^= Int64Field112.GetHashCode();
-      if (DoubleField113 != 0D) hash ^= pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.GetHashCode(DoubleField113);
-      if (Int64Field114 != 0L) hash ^= Int64Field114.GetHashCode();
-      if (DoubleField42 != 0D) hash ^= pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.GetHashCode(DoubleField42);
-      if (Int64Field43 != 0L) hash ^= Int64Field43.GetHashCode();
-      if (Int64Field44 != 0L) hash ^= Int64Field44.GetHashCode();
-      if (DoubleField45 != 0D) hash ^= pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.GetHashCode(DoubleField45);
-      if (DoubleField46 != 0D) hash ^= pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.GetHashCode(DoubleField46);
-      if (DoubleField78 != 0D) hash ^= pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.GetHashCode(DoubleField78);
-      if (DoubleField88 != 0D) hash ^= pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.GetHashCode(DoubleField88);
-      if (DoubleField47 != 0D) hash ^= pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.GetHashCode(DoubleField47);
-      if (DoubleField89 != 0D) hash ^= pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.GetHashCode(DoubleField89);
-      if (DoubleField48 != 0D) hash ^= pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.GetHashCode(DoubleField48);
-      if (DoubleField49 != 0D) hash ^= pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.GetHashCode(DoubleField49);
-      if (DoubleField50 != 0D) hash ^= pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.GetHashCode(DoubleField50);
-      if (DoubleField90 != 0D) hash ^= pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.GetHashCode(DoubleField90);
-      if (DoubleField51 != 0D) hash ^= pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.GetHashCode(DoubleField51);
-      if (DoubleField91 != 0D) hash ^= pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.GetHashCode(DoubleField91);
-      if (DoubleField92 != 0D) hash ^= pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.GetHashCode(DoubleField92);
-      if (Int64Field107 != 0L) hash ^= Int64Field107.GetHashCode();
-      if (DoubleField93 != 0D) hash ^= pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.GetHashCode(DoubleField93);
-      if (DoubleField108 != 0D) hash ^= pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.GetHashCode(DoubleField108);
-      if (DoubleField52 != 0D) hash ^= pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.GetHashCode(DoubleField52);
-      if (DoubleField53 != 0D) hash ^= pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.GetHashCode(DoubleField53);
-      if (DoubleField94 != 0D) hash ^= pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.GetHashCode(DoubleField94);
-      if (DoubleField54 != 0D) hash ^= pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.GetHashCode(DoubleField54);
-      if (DoubleField55 != 0D) hash ^= pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.GetHashCode(DoubleField55);
-      if (DoubleField56 != 0D) hash ^= pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.GetHashCode(DoubleField56);
-      if (DoubleField57 != 0D) hash ^= pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.GetHashCode(DoubleField57);
-      if (DoubleField58 != 0D) hash ^= pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.GetHashCode(DoubleField58);
-      if (Int64Field59 != 0L) hash ^= Int64Field59.GetHashCode();
-      if (Int64Field60 != 0L) hash ^= Int64Field60.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (DoubleField1 != 0D) {
-        output.WriteRawTag(9);
-        output.WriteDouble(DoubleField1);
-      }
-      if (Int64Field2 != 0L) {
-        output.WriteRawTag(16);
-        output.WriteInt64(Int64Field2);
-      }
-      if (Int64Field3 != 0L) {
-        output.WriteRawTag(24);
-        output.WriteInt64(Int64Field3);
-      }
-      if (Int64Field4 != 0L) {
-        output.WriteRawTag(32);
-        output.WriteInt64(Int64Field4);
-      }
-      if (DoubleField7 != 0D) {
-        output.WriteRawTag(57);
-        output.WriteDouble(DoubleField7);
-      }
-      if (DoubleField8 != 0D) {
-        output.WriteRawTag(65);
-        output.WriteDouble(DoubleField8);
-      }
-      if (DoubleField9 != 0D) {
-        output.WriteRawTag(73);
-        output.WriteDouble(DoubleField9);
-      }
-      if (DoubleField10 != 0D) {
-        output.WriteRawTag(81);
-        output.WriteDouble(DoubleField10);
-      }
-      if (DoubleField11 != 0D) {
-        output.WriteRawTag(89);
-        output.WriteDouble(DoubleField11);
-      }
-      if (DoubleField14 != 0D) {
-        output.WriteRawTag(113);
-        output.WriteDouble(DoubleField14);
-      }
-      if (DoubleField15 != 0D) {
-        output.WriteRawTag(121);
-        output.WriteDouble(DoubleField15);
-      }
-      if (Int64Field19 != 0L) {
-        output.WriteRawTag(152, 1);
-        output.WriteInt64(Int64Field19);
-      }
-      if (DoubleField20 != 0D) {
-        output.WriteRawTag(161, 1);
-        output.WriteDouble(DoubleField20);
-      }
-      if (DoubleField21 != 0D) {
-        output.WriteRawTag(169, 1);
-        output.WriteDouble(DoubleField21);
-      }
-      if (DoubleField22 != 0D) {
-        output.WriteRawTag(177, 1);
-        output.WriteDouble(DoubleField22);
-      }
-      if (DoubleField25 != 0D) {
-        output.WriteRawTag(201, 1);
-        output.WriteDouble(DoubleField25);
-      }
-      if (Int64Field26 != 0L) {
-        output.WriteRawTag(208, 1);
-        output.WriteInt64(Int64Field26);
-      }
-      if (DoubleField28 != 0D) {
-        output.WriteRawTag(225, 1);
-        output.WriteDouble(DoubleField28);
-      }
-      if (DoubleField29 != 0D) {
-        output.WriteRawTag(233, 1);
-        output.WriteDouble(DoubleField29);
-      }
-      if (DoubleField30 != 0D) {
-        output.WriteRawTag(241, 1);
-        output.WriteDouble(DoubleField30);
-      }
-      if (DoubleField31 != 0D) {
-        output.WriteRawTag(249, 1);
-        output.WriteDouble(DoubleField31);
-      }
-      if (Int64Field32 != 0L) {
-        output.WriteRawTag(128, 2);
-        output.WriteInt64(Int64Field32);
-      }
-      if (Int64Field37 != 0L) {
-        output.WriteRawTag(168, 2);
-        output.WriteInt64(Int64Field37);
-      }
-      if (DoubleField38 != 0D) {
-        output.WriteRawTag(177, 2);
-        output.WriteDouble(DoubleField38);
-      }
-      if (Interactions != 0L) {
-        output.WriteRawTag(184, 2);
-        output.WriteInt64(Interactions);
-      }
-      if (DoubleField40 != 0D) {
-        output.WriteRawTag(193, 2);
-        output.WriteDouble(DoubleField40);
-      }
-      if (Int64Field41 != 0L) {
-        output.WriteRawTag(200, 2);
-        output.WriteInt64(Int64Field41);
-      }
-      if (DoubleField42 != 0D) {
-        output.WriteRawTag(209, 2);
-        output.WriteDouble(DoubleField42);
-      }
-      if (Int64Field43 != 0L) {
-        output.WriteRawTag(216, 2);
-        output.WriteInt64(Int64Field43);
-      }
-      if (Int64Field44 != 0L) {
-        output.WriteRawTag(224, 2);
-        output.WriteInt64(Int64Field44);
-      }
-      if (DoubleField45 != 0D) {
-        output.WriteRawTag(233, 2);
-        output.WriteDouble(DoubleField45);
-      }
-      if (DoubleField46 != 0D) {
-        output.WriteRawTag(241, 2);
-        output.WriteDouble(DoubleField46);
-      }
-      if (DoubleField47 != 0D) {
-        output.WriteRawTag(249, 2);
-        output.WriteDouble(DoubleField47);
-      }
-      if (DoubleField48 != 0D) {
-        output.WriteRawTag(129, 3);
-        output.WriteDouble(DoubleField48);
-      }
-      if (DoubleField49 != 0D) {
-        output.WriteRawTag(137, 3);
-        output.WriteDouble(DoubleField49);
-      }
-      if (DoubleField50 != 0D) {
-        output.WriteRawTag(145, 3);
-        output.WriteDouble(DoubleField50);
-      }
-      if (DoubleField51 != 0D) {
-        output.WriteRawTag(153, 3);
-        output.WriteDouble(DoubleField51);
-      }
-      if (DoubleField52 != 0D) {
-        output.WriteRawTag(161, 3);
-        output.WriteDouble(DoubleField52);
-      }
-      if (DoubleField53 != 0D) {
-        output.WriteRawTag(169, 3);
-        output.WriteDouble(DoubleField53);
-      }
-      if (DoubleField54 != 0D) {
-        output.WriteRawTag(177, 3);
-        output.WriteDouble(DoubleField54);
-      }
-      if (DoubleField55 != 0D) {
-        output.WriteRawTag(185, 3);
-        output.WriteDouble(DoubleField55);
-      }
-      if (DoubleField56 != 0D) {
-        output.WriteRawTag(193, 3);
-        output.WriteDouble(DoubleField56);
-      }
-      if (DoubleField57 != 0D) {
-        output.WriteRawTag(201, 3);
-        output.WriteDouble(DoubleField57);
-      }
-      if (DoubleField58 != 0D) {
-        output.WriteRawTag(209, 3);
-        output.WriteDouble(DoubleField58);
-      }
-      if (Int64Field59 != 0L) {
-        output.WriteRawTag(216, 3);
-        output.WriteInt64(Int64Field59);
-      }
-      if (Int64Field60 != 0L) {
-        output.WriteRawTag(224, 3);
-        output.WriteInt64(Int64Field60);
-      }
-      if (DoubleField62 != 0D) {
-        output.WriteRawTag(241, 3);
-        output.WriteDouble(DoubleField62);
-      }
-      if (DoubleField65 != 0D) {
-        output.WriteRawTag(137, 4);
-        output.WriteDouble(DoubleField65);
-      }
-      if (DoubleField66 != 0D) {
-        output.WriteRawTag(145, 4);
-        output.WriteDouble(DoubleField66);
-      }
-      if (DoubleField67 != 0D) {
-        output.WriteRawTag(153, 4);
-        output.WriteDouble(DoubleField67);
-      }
-      if (DoubleField68 != 0D) {
-        output.WriteRawTag(161, 4);
-        output.WriteDouble(DoubleField68);
-      }
-      if (DoubleField69 != 0D) {
-        output.WriteRawTag(169, 4);
-        output.WriteDouble(DoubleField69);
-      }
-      if (DoubleField70 != 0D) {
-        output.WriteRawTag(177, 4);
-        output.WriteDouble(DoubleField70);
-      }
-      if (DoubleField71 != 0D) {
-        output.WriteRawTag(185, 4);
-        output.WriteDouble(DoubleField71);
-      }
-      if (DoubleField72 != 0D) {
-        output.WriteRawTag(193, 4);
-        output.WriteDouble(DoubleField72);
-      }
-      if (StringField73.Length != 0) {
-        output.WriteRawTag(202, 4);
-        output.WriteString(StringField73);
-      }
-      if (StringField74.Length != 0) {
-        output.WriteRawTag(210, 4);
-        output.WriteString(StringField74);
-      }
-      if (DoubleField75 != 0D) {
-        output.WriteRawTag(217, 4);
-        output.WriteDouble(DoubleField75);
-      }
-      if (DoubleField77 != 0D) {
-        output.WriteRawTag(233, 4);
-        output.WriteDouble(DoubleField77);
-      }
-      if (DoubleField78 != 0D) {
-        output.WriteRawTag(241, 4);
-        output.WriteDouble(DoubleField78);
-      }
-      if (DoubleField79 != 0D) {
-        output.WriteRawTag(249, 4);
-        output.WriteDouble(DoubleField79);
-      }
-      if (EnumField80 != 0) {
-        output.WriteRawTag(128, 5);
-        output.WriteInt32(EnumField80);
-      }
-      if (EnumField81 != 0) {
-        output.WriteRawTag(136, 5);
-        output.WriteInt32(EnumField81);
-      }
-      if (Int64Field82 != 0L) {
-        output.WriteRawTag(144, 5);
-        output.WriteInt64(Int64Field82);
-      }
-      if (EnumField83 != 0) {
-        output.WriteRawTag(152, 5);
-        output.WriteInt32(EnumField83);
-      }
-      if (DoubleField84 != 0D) {
-        output.WriteRawTag(161, 5);
-        output.WriteDouble(DoubleField84);
-      }
-      if (Int64Field85 != 0L) {
-        output.WriteRawTag(168, 5);
-        output.WriteInt64(Int64Field85);
-      }
-      if (Int64Field86 != 0L) {
-        output.WriteRawTag(176, 5);
-        output.WriteInt64(Int64Field86);
-      }
-      if (Int64Field87 != 0L) {
-        output.WriteRawTag(184, 5);
-        output.WriteInt64(Int64Field87);
-      }
-      if (DoubleField88 != 0D) {
-        output.WriteRawTag(193, 5);
-        output.WriteDouble(DoubleField88);
-      }
-      if (DoubleField89 != 0D) {
-        output.WriteRawTag(201, 5);
-        output.WriteDouble(DoubleField89);
-      }
-      if (DoubleField90 != 0D) {
-        output.WriteRawTag(209, 5);
-        output.WriteDouble(DoubleField90);
-      }
-      if (DoubleField91 != 0D) {
-        output.WriteRawTag(217, 5);
-        output.WriteDouble(DoubleField91);
-      }
-      if (DoubleField92 != 0D) {
-        output.WriteRawTag(225, 5);
-        output.WriteDouble(DoubleField92);
-      }
-      if (DoubleField93 != 0D) {
-        output.WriteRawTag(233, 5);
-        output.WriteDouble(DoubleField93);
-      }
-      if (DoubleField94 != 0D) {
-        output.WriteRawTag(241, 5);
-        output.WriteDouble(DoubleField94);
-      }
-      if (DoubleField95 != 0D) {
-        output.WriteRawTag(249, 5);
-        output.WriteDouble(DoubleField95);
-      }
-      if (DoubleField96 != 0D) {
-        output.WriteRawTag(129, 6);
-        output.WriteDouble(DoubleField96);
-      }
-      if (DoubleField97 != 0D) {
-        output.WriteRawTag(137, 6);
-        output.WriteDouble(DoubleField97);
-      }
-      if (DoubleField98 != 0D) {
-        output.WriteRawTag(145, 6);
-        output.WriteDouble(DoubleField98);
-      }
-      if (DoubleField99 != 0D) {
-        output.WriteRawTag(153, 6);
-        output.WriteDouble(DoubleField99);
-      }
-      repeatedIntField100_.WriteTo(output, _repeated_repeatedIntField100_codec);
-      if (DoubleField101 != 0D) {
-        output.WriteRawTag(169, 6);
-        output.WriteDouble(DoubleField101);
-      }
-      if (DoubleField102 != 0D) {
-        output.WriteRawTag(177, 6);
-        output.WriteDouble(DoubleField102);
-      }
-      if (DoubleField103 != 0D) {
-        output.WriteRawTag(185, 6);
-        output.WriteDouble(DoubleField103);
-      }
-      if (DoubleField104 != 0D) {
-        output.WriteRawTag(193, 6);
-        output.WriteDouble(DoubleField104);
-      }
-      if (DoubleField105 != 0D) {
-        output.WriteRawTag(201, 6);
-        output.WriteDouble(DoubleField105);
-      }
-      if (DoubleField106 != 0D) {
-        output.WriteRawTag(209, 6);
-        output.WriteDouble(DoubleField106);
-      }
-      if (Int64Field107 != 0L) {
-        output.WriteRawTag(216, 6);
-        output.WriteInt64(Int64Field107);
-      }
-      if (DoubleField108 != 0D) {
-        output.WriteRawTag(225, 6);
-        output.WriteDouble(DoubleField108);
-      }
-      if (DoubleField109 != 0D) {
-        output.WriteRawTag(233, 6);
-        output.WriteDouble(DoubleField109);
-      }
-      if (Int64Field110 != 0L) {
-        output.WriteRawTag(240, 6);
-        output.WriteInt64(Int64Field110);
-      }
-      if (DoubleField111 != 0D) {
-        output.WriteRawTag(249, 6);
-        output.WriteDouble(DoubleField111);
-      }
-      if (Int64Field112 != 0L) {
-        output.WriteRawTag(128, 7);
-        output.WriteInt64(Int64Field112);
-      }
-      if (DoubleField113 != 0D) {
-        output.WriteRawTag(137, 7);
-        output.WriteDouble(DoubleField113);
-      }
-      if (Int64Field114 != 0L) {
-        output.WriteRawTag(144, 7);
-        output.WriteInt64(Int64Field114);
-      }
-      if (Int64Field115 != 0L) {
-        output.WriteRawTag(152, 7);
-        output.WriteInt64(Int64Field115);
-      }
-      if (DoubleField116 != 0D) {
-        output.WriteRawTag(161, 7);
-        output.WriteDouble(DoubleField116);
-      }
-      if (Int64Field117 != 0L) {
-        output.WriteRawTag(168, 7);
-        output.WriteInt64(Int64Field117);
-      }
-      if (DoubleField118 != 0D) {
-        output.WriteRawTag(177, 7);
-        output.WriteDouble(DoubleField118);
-      }
-      if (DoubleField119 != 0D) {
-        output.WriteRawTag(185, 7);
-        output.WriteDouble(DoubleField119);
-      }
-      if (DoubleField120 != 0D) {
-        output.WriteRawTag(193, 7);
-        output.WriteDouble(DoubleField120);
-      }
-      if (DoubleField121 != 0D) {
-        output.WriteRawTag(201, 7);
-        output.WriteDouble(DoubleField121);
-      }
-      if (DoubleField122 != 0D) {
-        output.WriteRawTag(209, 7);
-        output.WriteDouble(DoubleField122);
-      }
-      if (DoubleField123 != 0D) {
-        output.WriteRawTag(217, 7);
-        output.WriteDouble(DoubleField123);
-      }
-      if (DoubleField124 != 0D) {
-        output.WriteRawTag(225, 7);
-        output.WriteDouble(DoubleField124);
-      }
-      if (Int64Field125 != 0L) {
-        output.WriteRawTag(232, 7);
-        output.WriteInt64(Int64Field125);
-      }
-      if (Int64Field126 != 0L) {
-        output.WriteRawTag(240, 7);
-        output.WriteInt64(Int64Field126);
-      }
-      if (Int64Field127 != 0L) {
-        output.WriteRawTag(248, 7);
-        output.WriteInt64(Int64Field127);
-      }
-      if (DoubleField128 != 0D) {
-        output.WriteRawTag(129, 8);
-        output.WriteDouble(DoubleField128);
-      }
-      if (DoubleField129 != 0D) {
-        output.WriteRawTag(137, 8);
-        output.WriteDouble(DoubleField129);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (DoubleField1 != 0D) {
-        output.WriteRawTag(9);
-        output.WriteDouble(DoubleField1);
-      }
-      if (Int64Field2 != 0L) {
-        output.WriteRawTag(16);
-        output.WriteInt64(Int64Field2);
-      }
-      if (Int64Field3 != 0L) {
-        output.WriteRawTag(24);
-        output.WriteInt64(Int64Field3);
-      }
-      if (Int64Field4 != 0L) {
-        output.WriteRawTag(32);
-        output.WriteInt64(Int64Field4);
-      }
-      if (DoubleField7 != 0D) {
-        output.WriteRawTag(57);
-        output.WriteDouble(DoubleField7);
-      }
-      if (DoubleField8 != 0D) {
-        output.WriteRawTag(65);
-        output.WriteDouble(DoubleField8);
-      }
-      if (DoubleField9 != 0D) {
-        output.WriteRawTag(73);
-        output.WriteDouble(DoubleField9);
-      }
-      if (DoubleField10 != 0D) {
-        output.WriteRawTag(81);
-        output.WriteDouble(DoubleField10);
-      }
-      if (DoubleField11 != 0D) {
-        output.WriteRawTag(89);
-        output.WriteDouble(DoubleField11);
-      }
-      if (DoubleField14 != 0D) {
-        output.WriteRawTag(113);
-        output.WriteDouble(DoubleField14);
-      }
-      if (DoubleField15 != 0D) {
-        output.WriteRawTag(121);
-        output.WriteDouble(DoubleField15);
-      }
-      if (Int64Field19 != 0L) {
-        output.WriteRawTag(152, 1);
-        output.WriteInt64(Int64Field19);
-      }
-      if (DoubleField20 != 0D) {
-        output.WriteRawTag(161, 1);
-        output.WriteDouble(DoubleField20);
-      }
-      if (DoubleField21 != 0D) {
-        output.WriteRawTag(169, 1);
-        output.WriteDouble(DoubleField21);
-      }
-      if (DoubleField22 != 0D) {
-        output.WriteRawTag(177, 1);
-        output.WriteDouble(DoubleField22);
-      }
-      if (DoubleField25 != 0D) {
-        output.WriteRawTag(201, 1);
-        output.WriteDouble(DoubleField25);
-      }
-      if (Int64Field26 != 0L) {
-        output.WriteRawTag(208, 1);
-        output.WriteInt64(Int64Field26);
-      }
-      if (DoubleField28 != 0D) {
-        output.WriteRawTag(225, 1);
-        output.WriteDouble(DoubleField28);
-      }
-      if (DoubleField29 != 0D) {
-        output.WriteRawTag(233, 1);
-        output.WriteDouble(DoubleField29);
-      }
-      if (DoubleField30 != 0D) {
-        output.WriteRawTag(241, 1);
-        output.WriteDouble(DoubleField30);
-      }
-      if (DoubleField31 != 0D) {
-        output.WriteRawTag(249, 1);
-        output.WriteDouble(DoubleField31);
-      }
-      if (Int64Field32 != 0L) {
-        output.WriteRawTag(128, 2);
-        output.WriteInt64(Int64Field32);
-      }
-      if (Int64Field37 != 0L) {
-        output.WriteRawTag(168, 2);
-        output.WriteInt64(Int64Field37);
-      }
-      if (DoubleField38 != 0D) {
-        output.WriteRawTag(177, 2);
-        output.WriteDouble(DoubleField38);
-      }
-      if (Interactions != 0L) {
-        output.WriteRawTag(184, 2);
-        output.WriteInt64(Interactions);
-      }
-      if (DoubleField40 != 0D) {
-        output.WriteRawTag(193, 2);
-        output.WriteDouble(DoubleField40);
-      }
-      if (Int64Field41 != 0L) {
-        output.WriteRawTag(200, 2);
-        output.WriteInt64(Int64Field41);
-      }
-      if (DoubleField42 != 0D) {
-        output.WriteRawTag(209, 2);
-        output.WriteDouble(DoubleField42);
-      }
-      if (Int64Field43 != 0L) {
-        output.WriteRawTag(216, 2);
-        output.WriteInt64(Int64Field43);
-      }
-      if (Int64Field44 != 0L) {
-        output.WriteRawTag(224, 2);
-        output.WriteInt64(Int64Field44);
-      }
-      if (DoubleField45 != 0D) {
-        output.WriteRawTag(233, 2);
-        output.WriteDouble(DoubleField45);
-      }
-      if (DoubleField46 != 0D) {
-        output.WriteRawTag(241, 2);
-        output.WriteDouble(DoubleField46);
-      }
-      if (DoubleField47 != 0D) {
-        output.WriteRawTag(249, 2);
-        output.WriteDouble(DoubleField47);
-      }
-      if (DoubleField48 != 0D) {
-        output.WriteRawTag(129, 3);
-        output.WriteDouble(DoubleField48);
-      }
-      if (DoubleField49 != 0D) {
-        output.WriteRawTag(137, 3);
-        output.WriteDouble(DoubleField49);
-      }
-      if (DoubleField50 != 0D) {
-        output.WriteRawTag(145, 3);
-        output.WriteDouble(DoubleField50);
-      }
-      if (DoubleField51 != 0D) {
-        output.WriteRawTag(153, 3);
-        output.WriteDouble(DoubleField51);
-      }
-      if (DoubleField52 != 0D) {
-        output.WriteRawTag(161, 3);
-        output.WriteDouble(DoubleField52);
-      }
-      if (DoubleField53 != 0D) {
-        output.WriteRawTag(169, 3);
-        output.WriteDouble(DoubleField53);
-      }
-      if (DoubleField54 != 0D) {
-        output.WriteRawTag(177, 3);
-        output.WriteDouble(DoubleField54);
-      }
-      if (DoubleField55 != 0D) {
-        output.WriteRawTag(185, 3);
-        output.WriteDouble(DoubleField55);
-      }
-      if (DoubleField56 != 0D) {
-        output.WriteRawTag(193, 3);
-        output.WriteDouble(DoubleField56);
-      }
-      if (DoubleField57 != 0D) {
-        output.WriteRawTag(201, 3);
-        output.WriteDouble(DoubleField57);
-      }
-      if (DoubleField58 != 0D) {
-        output.WriteRawTag(209, 3);
-        output.WriteDouble(DoubleField58);
-      }
-      if (Int64Field59 != 0L) {
-        output.WriteRawTag(216, 3);
-        output.WriteInt64(Int64Field59);
-      }
-      if (Int64Field60 != 0L) {
-        output.WriteRawTag(224, 3);
-        output.WriteInt64(Int64Field60);
-      }
-      if (DoubleField62 != 0D) {
-        output.WriteRawTag(241, 3);
-        output.WriteDouble(DoubleField62);
-      }
-      if (DoubleField65 != 0D) {
-        output.WriteRawTag(137, 4);
-        output.WriteDouble(DoubleField65);
-      }
-      if (DoubleField66 != 0D) {
-        output.WriteRawTag(145, 4);
-        output.WriteDouble(DoubleField66);
-      }
-      if (DoubleField67 != 0D) {
-        output.WriteRawTag(153, 4);
-        output.WriteDouble(DoubleField67);
-      }
-      if (DoubleField68 != 0D) {
-        output.WriteRawTag(161, 4);
-        output.WriteDouble(DoubleField68);
-      }
-      if (DoubleField69 != 0D) {
-        output.WriteRawTag(169, 4);
-        output.WriteDouble(DoubleField69);
-      }
-      if (DoubleField70 != 0D) {
-        output.WriteRawTag(177, 4);
-        output.WriteDouble(DoubleField70);
-      }
-      if (DoubleField71 != 0D) {
-        output.WriteRawTag(185, 4);
-        output.WriteDouble(DoubleField71);
-      }
-      if (DoubleField72 != 0D) {
-        output.WriteRawTag(193, 4);
-        output.WriteDouble(DoubleField72);
-      }
-      if (StringField73.Length != 0) {
-        output.WriteRawTag(202, 4);
-        output.WriteString(StringField73);
-      }
-      if (StringField74.Length != 0) {
-        output.WriteRawTag(210, 4);
-        output.WriteString(StringField74);
-      }
-      if (DoubleField75 != 0D) {
-        output.WriteRawTag(217, 4);
-        output.WriteDouble(DoubleField75);
-      }
-      if (DoubleField77 != 0D) {
-        output.WriteRawTag(233, 4);
-        output.WriteDouble(DoubleField77);
-      }
-      if (DoubleField78 != 0D) {
-        output.WriteRawTag(241, 4);
-        output.WriteDouble(DoubleField78);
-      }
-      if (DoubleField79 != 0D) {
-        output.WriteRawTag(249, 4);
-        output.WriteDouble(DoubleField79);
-      }
-      if (EnumField80 != 0) {
-        output.WriteRawTag(128, 5);
-        output.WriteInt32(EnumField80);
-      }
-      if (EnumField81 != 0) {
-        output.WriteRawTag(136, 5);
-        output.WriteInt32(EnumField81);
-      }
-      if (Int64Field82 != 0L) {
-        output.WriteRawTag(144, 5);
-        output.WriteInt64(Int64Field82);
-      }
-      if (EnumField83 != 0) {
-        output.WriteRawTag(152, 5);
-        output.WriteInt32(EnumField83);
-      }
-      if (DoubleField84 != 0D) {
-        output.WriteRawTag(161, 5);
-        output.WriteDouble(DoubleField84);
-      }
-      if (Int64Field85 != 0L) {
-        output.WriteRawTag(168, 5);
-        output.WriteInt64(Int64Field85);
-      }
-      if (Int64Field86 != 0L) {
-        output.WriteRawTag(176, 5);
-        output.WriteInt64(Int64Field86);
-      }
-      if (Int64Field87 != 0L) {
-        output.WriteRawTag(184, 5);
-        output.WriteInt64(Int64Field87);
-      }
-      if (DoubleField88 != 0D) {
-        output.WriteRawTag(193, 5);
-        output.WriteDouble(DoubleField88);
-      }
-      if (DoubleField89 != 0D) {
-        output.WriteRawTag(201, 5);
-        output.WriteDouble(DoubleField89);
-      }
-      if (DoubleField90 != 0D) {
-        output.WriteRawTag(209, 5);
-        output.WriteDouble(DoubleField90);
-      }
-      if (DoubleField91 != 0D) {
-        output.WriteRawTag(217, 5);
-        output.WriteDouble(DoubleField91);
-      }
-      if (DoubleField92 != 0D) {
-        output.WriteRawTag(225, 5);
-        output.WriteDouble(DoubleField92);
-      }
-      if (DoubleField93 != 0D) {
-        output.WriteRawTag(233, 5);
-        output.WriteDouble(DoubleField93);
-      }
-      if (DoubleField94 != 0D) {
-        output.WriteRawTag(241, 5);
-        output.WriteDouble(DoubleField94);
-      }
-      if (DoubleField95 != 0D) {
-        output.WriteRawTag(249, 5);
-        output.WriteDouble(DoubleField95);
-      }
-      if (DoubleField96 != 0D) {
-        output.WriteRawTag(129, 6);
-        output.WriteDouble(DoubleField96);
-      }
-      if (DoubleField97 != 0D) {
-        output.WriteRawTag(137, 6);
-        output.WriteDouble(DoubleField97);
-      }
-      if (DoubleField98 != 0D) {
-        output.WriteRawTag(145, 6);
-        output.WriteDouble(DoubleField98);
-      }
-      if (DoubleField99 != 0D) {
-        output.WriteRawTag(153, 6);
-        output.WriteDouble(DoubleField99);
-      }
-      repeatedIntField100_.WriteTo(ref output, _repeated_repeatedIntField100_codec);
-      if (DoubleField101 != 0D) {
-        output.WriteRawTag(169, 6);
-        output.WriteDouble(DoubleField101);
-      }
-      if (DoubleField102 != 0D) {
-        output.WriteRawTag(177, 6);
-        output.WriteDouble(DoubleField102);
-      }
-      if (DoubleField103 != 0D) {
-        output.WriteRawTag(185, 6);
-        output.WriteDouble(DoubleField103);
-      }
-      if (DoubleField104 != 0D) {
-        output.WriteRawTag(193, 6);
-        output.WriteDouble(DoubleField104);
-      }
-      if (DoubleField105 != 0D) {
-        output.WriteRawTag(201, 6);
-        output.WriteDouble(DoubleField105);
-      }
-      if (DoubleField106 != 0D) {
-        output.WriteRawTag(209, 6);
-        output.WriteDouble(DoubleField106);
-      }
-      if (Int64Field107 != 0L) {
-        output.WriteRawTag(216, 6);
-        output.WriteInt64(Int64Field107);
-      }
-      if (DoubleField108 != 0D) {
-        output.WriteRawTag(225, 6);
-        output.WriteDouble(DoubleField108);
-      }
-      if (DoubleField109 != 0D) {
-        output.WriteRawTag(233, 6);
-        output.WriteDouble(DoubleField109);
-      }
-      if (Int64Field110 != 0L) {
-        output.WriteRawTag(240, 6);
-        output.WriteInt64(Int64Field110);
-      }
-      if (DoubleField111 != 0D) {
-        output.WriteRawTag(249, 6);
-        output.WriteDouble(DoubleField111);
-      }
-      if (Int64Field112 != 0L) {
-        output.WriteRawTag(128, 7);
-        output.WriteInt64(Int64Field112);
-      }
-      if (DoubleField113 != 0D) {
-        output.WriteRawTag(137, 7);
-        output.WriteDouble(DoubleField113);
-      }
-      if (Int64Field114 != 0L) {
-        output.WriteRawTag(144, 7);
-        output.WriteInt64(Int64Field114);
-      }
-      if (Int64Field115 != 0L) {
-        output.WriteRawTag(152, 7);
-        output.WriteInt64(Int64Field115);
-      }
-      if (DoubleField116 != 0D) {
-        output.WriteRawTag(161, 7);
-        output.WriteDouble(DoubleField116);
-      }
-      if (Int64Field117 != 0L) {
-        output.WriteRawTag(168, 7);
-        output.WriteInt64(Int64Field117);
-      }
-      if (DoubleField118 != 0D) {
-        output.WriteRawTag(177, 7);
-        output.WriteDouble(DoubleField118);
-      }
-      if (DoubleField119 != 0D) {
-        output.WriteRawTag(185, 7);
-        output.WriteDouble(DoubleField119);
-      }
-      if (DoubleField120 != 0D) {
-        output.WriteRawTag(193, 7);
-        output.WriteDouble(DoubleField120);
-      }
-      if (DoubleField121 != 0D) {
-        output.WriteRawTag(201, 7);
-        output.WriteDouble(DoubleField121);
-      }
-      if (DoubleField122 != 0D) {
-        output.WriteRawTag(209, 7);
-        output.WriteDouble(DoubleField122);
-      }
-      if (DoubleField123 != 0D) {
-        output.WriteRawTag(217, 7);
-        output.WriteDouble(DoubleField123);
-      }
-      if (DoubleField124 != 0D) {
-        output.WriteRawTag(225, 7);
-        output.WriteDouble(DoubleField124);
-      }
-      if (Int64Field125 != 0L) {
-        output.WriteRawTag(232, 7);
-        output.WriteInt64(Int64Field125);
-      }
-      if (Int64Field126 != 0L) {
-        output.WriteRawTag(240, 7);
-        output.WriteInt64(Int64Field126);
-      }
-      if (Int64Field127 != 0L) {
-        output.WriteRawTag(248, 7);
-        output.WriteInt64(Int64Field127);
-      }
-      if (DoubleField128 != 0D) {
-        output.WriteRawTag(129, 8);
-        output.WriteDouble(DoubleField128);
-      }
-      if (DoubleField129 != 0D) {
-        output.WriteRawTag(137, 8);
-        output.WriteDouble(DoubleField129);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (DoubleField95 != 0D) {
-        size += 2 + 8;
-      }
-      if (DoubleField1 != 0D) {
-        size += 1 + 8;
-      }
-      if (DoubleField79 != 0D) {
-        size += 2 + 8;
-      }
-      if (Int64Field2 != 0L) {
-        size += 1 + pb::CodedOutputStream.ComputeInt64Size(Int64Field2);
-      }
-      if (DoubleField96 != 0D) {
-        size += 2 + 8;
-      }
-      if (Int64Field3 != 0L) {
-        size += 1 + pb::CodedOutputStream.ComputeInt64Size(Int64Field3);
-      }
-      if (Int64Field4 != 0L) {
-        size += 1 + pb::CodedOutputStream.ComputeInt64Size(Int64Field4);
-      }
-      if (DoubleField97 != 0D) {
-        size += 2 + 8;
-      }
-      if (DoubleField65 != 0D) {
-        size += 2 + 8;
-      }
-      if (DoubleField66 != 0D) {
-        size += 2 + 8;
-      }
-      if (DoubleField7 != 0D) {
-        size += 1 + 8;
-      }
-      if (DoubleField62 != 0D) {
-        size += 2 + 8;
-      }
-      if (DoubleField118 != 0D) {
-        size += 2 + 8;
-      }
-      if (DoubleField119 != 0D) {
-        size += 2 + 8;
-      }
-      if (DoubleField67 != 0D) {
-        size += 2 + 8;
-      }
-      if (DoubleField120 != 0D) {
-        size += 2 + 8;
-      }
-      if (DoubleField121 != 0D) {
-        size += 2 + 8;
-      }
-      if (DoubleField122 != 0D) {
-        size += 2 + 8;
-      }
-      if (DoubleField123 != 0D) {
-        size += 2 + 8;
-      }
-      if (DoubleField124 != 0D) {
-        size += 2 + 8;
-      }
-      if (DoubleField8 != 0D) {
-        size += 1 + 8;
-      }
-      if (DoubleField9 != 0D) {
-        size += 1 + 8;
-      }
-      if (DoubleField98 != 0D) {
-        size += 2 + 8;
-      }
-      if (DoubleField10 != 0D) {
-        size += 1 + 8;
-      }
-      if (DoubleField11 != 0D) {
-        size += 1 + 8;
-      }
-      if (DoubleField99 != 0D) {
-        size += 2 + 8;
-      }
-      if (DoubleField84 != 0D) {
-        size += 2 + 8;
-      }
-      if (DoubleField14 != 0D) {
-        size += 1 + 8;
-      }
-      if (DoubleField77 != 0D) {
-        size += 2 + 8;
-      }
-      if (DoubleField15 != 0D) {
-        size += 1 + 8;
-      }
-      if (Int64Field19 != 0L) {
-        size += 2 + pb::CodedOutputStream.ComputeInt64Size(Int64Field19);
-      }
-      if (Int64Field115 != 0L) {
-        size += 2 + pb::CodedOutputStream.ComputeInt64Size(Int64Field115);
-      }
-      if (DoubleField116 != 0D) {
-        size += 2 + 8;
-      }
-      if (Int64Field117 != 0L) {
-        size += 2 + pb::CodedOutputStream.ComputeInt64Size(Int64Field117);
-      }
-      if (DoubleField20 != 0D) {
-        size += 2 + 8;
-      }
-      if (DoubleField21 != 0D) {
-        size += 2 + 8;
-      }
-      if (StringField73.Length != 0) {
-        size += 2 + pb::CodedOutputStream.ComputeStringSize(StringField73);
-      }
-      if (StringField74.Length != 0) {
-        size += 2 + pb::CodedOutputStream.ComputeStringSize(StringField74);
-      }
-      if (DoubleField22 != 0D) {
-        size += 2 + 8;
-      }
-      if (DoubleField69 != 0D) {
-        size += 2 + 8;
-      }
-      if (DoubleField70 != 0D) {
-        size += 2 + 8;
-      }
-      if (DoubleField71 != 0D) {
-        size += 2 + 8;
-      }
-      if (DoubleField72 != 0D) {
-        size += 2 + 8;
-      }
-      if (DoubleField25 != 0D) {
-        size += 2 + 8;
-      }
-      if (Int64Field26 != 0L) {
-        size += 2 + pb::CodedOutputStream.ComputeInt64Size(Int64Field26);
-      }
-      if (DoubleField68 != 0D) {
-        size += 2 + 8;
-      }
-      if (DoubleField28 != 0D) {
-        size += 2 + 8;
-      }
-      if (DoubleField106 != 0D) {
-        size += 2 + 8;
-      }
-      if (DoubleField29 != 0D) {
-        size += 2 + 8;
-      }
-      if (DoubleField30 != 0D) {
-        size += 2 + 8;
-      }
-      if (DoubleField101 != 0D) {
-        size += 2 + 8;
-      }
-      if (DoubleField102 != 0D) {
-        size += 2 + 8;
-      }
-      if (DoubleField103 != 0D) {
-        size += 2 + 8;
-      }
-      if (DoubleField104 != 0D) {
-        size += 2 + 8;
-      }
-      if (DoubleField105 != 0D) {
-        size += 2 + 8;
-      }
-      if (DoubleField31 != 0D) {
-        size += 2 + 8;
-      }
-      if (Int64Field32 != 0L) {
-        size += 2 + pb::CodedOutputStream.ComputeInt64Size(Int64Field32);
-      }
-      if (DoubleField75 != 0D) {
-        size += 2 + 8;
-      }
-      if (DoubleField129 != 0D) {
-        size += 2 + 8;
-      }
-      if (EnumField80 != 0) {
-        size += 2 + pb::CodedOutputStream.ComputeInt32Size(EnumField80);
-      }
-      if (EnumField81 != 0) {
-        size += 2 + pb::CodedOutputStream.ComputeInt32Size(EnumField81);
-      }
-      if (Int64Field82 != 0L) {
-        size += 2 + pb::CodedOutputStream.ComputeInt64Size(Int64Field82);
-      }
-      if (EnumField83 != 0) {
-        size += 2 + pb::CodedOutputStream.ComputeInt32Size(EnumField83);
-      }
-      if (Int64Field85 != 0L) {
-        size += 2 + pb::CodedOutputStream.ComputeInt64Size(Int64Field85);
-      }
-      if (Int64Field86 != 0L) {
-        size += 2 + pb::CodedOutputStream.ComputeInt64Size(Int64Field86);
-      }
-      if (Int64Field87 != 0L) {
-        size += 2 + pb::CodedOutputStream.ComputeInt64Size(Int64Field87);
-      }
-      if (Int64Field125 != 0L) {
-        size += 2 + pb::CodedOutputStream.ComputeInt64Size(Int64Field125);
-      }
-      if (Int64Field37 != 0L) {
-        size += 2 + pb::CodedOutputStream.ComputeInt64Size(Int64Field37);
-      }
-      if (DoubleField38 != 0D) {
-        size += 2 + 8;
-      }
-      if (Interactions != 0L) {
-        size += 2 + pb::CodedOutputStream.ComputeInt64Size(Interactions);
-      }
-      size += repeatedIntField100_.CalculateSize(_repeated_repeatedIntField100_codec);
-      if (DoubleField40 != 0D) {
-        size += 2 + 8;
-      }
-      if (Int64Field41 != 0L) {
-        size += 2 + pb::CodedOutputStream.ComputeInt64Size(Int64Field41);
-      }
-      if (Int64Field126 != 0L) {
-        size += 2 + pb::CodedOutputStream.ComputeInt64Size(Int64Field126);
-      }
-      if (Int64Field127 != 0L) {
-        size += 2 + pb::CodedOutputStream.ComputeInt64Size(Int64Field127);
-      }
-      if (DoubleField128 != 0D) {
-        size += 2 + 8;
-      }
-      if (DoubleField109 != 0D) {
-        size += 2 + 8;
-      }
-      if (Int64Field110 != 0L) {
-        size += 2 + pb::CodedOutputStream.ComputeInt64Size(Int64Field110);
-      }
-      if (DoubleField111 != 0D) {
-        size += 2 + 8;
-      }
-      if (Int64Field112 != 0L) {
-        size += 2 + pb::CodedOutputStream.ComputeInt64Size(Int64Field112);
-      }
-      if (DoubleField113 != 0D) {
-        size += 2 + 8;
-      }
-      if (Int64Field114 != 0L) {
-        size += 2 + pb::CodedOutputStream.ComputeInt64Size(Int64Field114);
-      }
-      if (DoubleField42 != 0D) {
-        size += 2 + 8;
-      }
-      if (Int64Field43 != 0L) {
-        size += 2 + pb::CodedOutputStream.ComputeInt64Size(Int64Field43);
-      }
-      if (Int64Field44 != 0L) {
-        size += 2 + pb::CodedOutputStream.ComputeInt64Size(Int64Field44);
-      }
-      if (DoubleField45 != 0D) {
-        size += 2 + 8;
-      }
-      if (DoubleField46 != 0D) {
-        size += 2 + 8;
-      }
-      if (DoubleField78 != 0D) {
-        size += 2 + 8;
-      }
-      if (DoubleField88 != 0D) {
-        size += 2 + 8;
-      }
-      if (DoubleField47 != 0D) {
-        size += 2 + 8;
-      }
-      if (DoubleField89 != 0D) {
-        size += 2 + 8;
-      }
-      if (DoubleField48 != 0D) {
-        size += 2 + 8;
-      }
-      if (DoubleField49 != 0D) {
-        size += 2 + 8;
-      }
-      if (DoubleField50 != 0D) {
-        size += 2 + 8;
-      }
-      if (DoubleField90 != 0D) {
-        size += 2 + 8;
-      }
-      if (DoubleField51 != 0D) {
-        size += 2 + 8;
-      }
-      if (DoubleField91 != 0D) {
-        size += 2 + 8;
-      }
-      if (DoubleField92 != 0D) {
-        size += 2 + 8;
-      }
-      if (Int64Field107 != 0L) {
-        size += 2 + pb::CodedOutputStream.ComputeInt64Size(Int64Field107);
-      }
-      if (DoubleField93 != 0D) {
-        size += 2 + 8;
-      }
-      if (DoubleField108 != 0D) {
-        size += 2 + 8;
-      }
-      if (DoubleField52 != 0D) {
-        size += 2 + 8;
-      }
-      if (DoubleField53 != 0D) {
-        size += 2 + 8;
-      }
-      if (DoubleField94 != 0D) {
-        size += 2 + 8;
-      }
-      if (DoubleField54 != 0D) {
-        size += 2 + 8;
-      }
-      if (DoubleField55 != 0D) {
-        size += 2 + 8;
-      }
-      if (DoubleField56 != 0D) {
-        size += 2 + 8;
-      }
-      if (DoubleField57 != 0D) {
-        size += 2 + 8;
-      }
-      if (DoubleField58 != 0D) {
-        size += 2 + 8;
-      }
-      if (Int64Field59 != 0L) {
-        size += 2 + pb::CodedOutputStream.ComputeInt64Size(Int64Field59);
-      }
-      if (Int64Field60 != 0L) {
-        size += 2 + pb::CodedOutputStream.ComputeInt64Size(Int64Field60);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(ManyPrimitiveFieldsMessage other) {
-      if (other == null) {
-        return;
-      }
-      if (other.DoubleField95 != 0D) {
-        DoubleField95 = other.DoubleField95;
-      }
-      if (other.DoubleField1 != 0D) {
-        DoubleField1 = other.DoubleField1;
-      }
-      if (other.DoubleField79 != 0D) {
-        DoubleField79 = other.DoubleField79;
-      }
-      if (other.Int64Field2 != 0L) {
-        Int64Field2 = other.Int64Field2;
-      }
-      if (other.DoubleField96 != 0D) {
-        DoubleField96 = other.DoubleField96;
-      }
-      if (other.Int64Field3 != 0L) {
-        Int64Field3 = other.Int64Field3;
-      }
-      if (other.Int64Field4 != 0L) {
-        Int64Field4 = other.Int64Field4;
-      }
-      if (other.DoubleField97 != 0D) {
-        DoubleField97 = other.DoubleField97;
-      }
-      if (other.DoubleField65 != 0D) {
-        DoubleField65 = other.DoubleField65;
-      }
-      if (other.DoubleField66 != 0D) {
-        DoubleField66 = other.DoubleField66;
-      }
-      if (other.DoubleField7 != 0D) {
-        DoubleField7 = other.DoubleField7;
-      }
-      if (other.DoubleField62 != 0D) {
-        DoubleField62 = other.DoubleField62;
-      }
-      if (other.DoubleField118 != 0D) {
-        DoubleField118 = other.DoubleField118;
-      }
-      if (other.DoubleField119 != 0D) {
-        DoubleField119 = other.DoubleField119;
-      }
-      if (other.DoubleField67 != 0D) {
-        DoubleField67 = other.DoubleField67;
-      }
-      if (other.DoubleField120 != 0D) {
-        DoubleField120 = other.DoubleField120;
-      }
-      if (other.DoubleField121 != 0D) {
-        DoubleField121 = other.DoubleField121;
-      }
-      if (other.DoubleField122 != 0D) {
-        DoubleField122 = other.DoubleField122;
-      }
-      if (other.DoubleField123 != 0D) {
-        DoubleField123 = other.DoubleField123;
-      }
-      if (other.DoubleField124 != 0D) {
-        DoubleField124 = other.DoubleField124;
-      }
-      if (other.DoubleField8 != 0D) {
-        DoubleField8 = other.DoubleField8;
-      }
-      if (other.DoubleField9 != 0D) {
-        DoubleField9 = other.DoubleField9;
-      }
-      if (other.DoubleField98 != 0D) {
-        DoubleField98 = other.DoubleField98;
-      }
-      if (other.DoubleField10 != 0D) {
-        DoubleField10 = other.DoubleField10;
-      }
-      if (other.DoubleField11 != 0D) {
-        DoubleField11 = other.DoubleField11;
-      }
-      if (other.DoubleField99 != 0D) {
-        DoubleField99 = other.DoubleField99;
-      }
-      if (other.DoubleField84 != 0D) {
-        DoubleField84 = other.DoubleField84;
-      }
-      if (other.DoubleField14 != 0D) {
-        DoubleField14 = other.DoubleField14;
-      }
-      if (other.DoubleField77 != 0D) {
-        DoubleField77 = other.DoubleField77;
-      }
-      if (other.DoubleField15 != 0D) {
-        DoubleField15 = other.DoubleField15;
-      }
-      if (other.Int64Field19 != 0L) {
-        Int64Field19 = other.Int64Field19;
-      }
-      if (other.Int64Field115 != 0L) {
-        Int64Field115 = other.Int64Field115;
-      }
-      if (other.DoubleField116 != 0D) {
-        DoubleField116 = other.DoubleField116;
-      }
-      if (other.Int64Field117 != 0L) {
-        Int64Field117 = other.Int64Field117;
-      }
-      if (other.DoubleField20 != 0D) {
-        DoubleField20 = other.DoubleField20;
-      }
-      if (other.DoubleField21 != 0D) {
-        DoubleField21 = other.DoubleField21;
-      }
-      if (other.StringField73.Length != 0) {
-        StringField73 = other.StringField73;
-      }
-      if (other.StringField74.Length != 0) {
-        StringField74 = other.StringField74;
-      }
-      if (other.DoubleField22 != 0D) {
-        DoubleField22 = other.DoubleField22;
-      }
-      if (other.DoubleField69 != 0D) {
-        DoubleField69 = other.DoubleField69;
-      }
-      if (other.DoubleField70 != 0D) {
-        DoubleField70 = other.DoubleField70;
-      }
-      if (other.DoubleField71 != 0D) {
-        DoubleField71 = other.DoubleField71;
-      }
-      if (other.DoubleField72 != 0D) {
-        DoubleField72 = other.DoubleField72;
-      }
-      if (other.DoubleField25 != 0D) {
-        DoubleField25 = other.DoubleField25;
-      }
-      if (other.Int64Field26 != 0L) {
-        Int64Field26 = other.Int64Field26;
-      }
-      if (other.DoubleField68 != 0D) {
-        DoubleField68 = other.DoubleField68;
-      }
-      if (other.DoubleField28 != 0D) {
-        DoubleField28 = other.DoubleField28;
-      }
-      if (other.DoubleField106 != 0D) {
-        DoubleField106 = other.DoubleField106;
-      }
-      if (other.DoubleField29 != 0D) {
-        DoubleField29 = other.DoubleField29;
-      }
-      if (other.DoubleField30 != 0D) {
-        DoubleField30 = other.DoubleField30;
-      }
-      if (other.DoubleField101 != 0D) {
-        DoubleField101 = other.DoubleField101;
-      }
-      if (other.DoubleField102 != 0D) {
-        DoubleField102 = other.DoubleField102;
-      }
-      if (other.DoubleField103 != 0D) {
-        DoubleField103 = other.DoubleField103;
-      }
-      if (other.DoubleField104 != 0D) {
-        DoubleField104 = other.DoubleField104;
-      }
-      if (other.DoubleField105 != 0D) {
-        DoubleField105 = other.DoubleField105;
-      }
-      if (other.DoubleField31 != 0D) {
-        DoubleField31 = other.DoubleField31;
-      }
-      if (other.Int64Field32 != 0L) {
-        Int64Field32 = other.Int64Field32;
-      }
-      if (other.DoubleField75 != 0D) {
-        DoubleField75 = other.DoubleField75;
-      }
-      if (other.DoubleField129 != 0D) {
-        DoubleField129 = other.DoubleField129;
-      }
-      if (other.EnumField80 != 0) {
-        EnumField80 = other.EnumField80;
-      }
-      if (other.EnumField81 != 0) {
-        EnumField81 = other.EnumField81;
-      }
-      if (other.Int64Field82 != 0L) {
-        Int64Field82 = other.Int64Field82;
-      }
-      if (other.EnumField83 != 0) {
-        EnumField83 = other.EnumField83;
-      }
-      if (other.Int64Field85 != 0L) {
-        Int64Field85 = other.Int64Field85;
-      }
-      if (other.Int64Field86 != 0L) {
-        Int64Field86 = other.Int64Field86;
-      }
-      if (other.Int64Field87 != 0L) {
-        Int64Field87 = other.Int64Field87;
-      }
-      if (other.Int64Field125 != 0L) {
-        Int64Field125 = other.Int64Field125;
-      }
-      if (other.Int64Field37 != 0L) {
-        Int64Field37 = other.Int64Field37;
-      }
-      if (other.DoubleField38 != 0D) {
-        DoubleField38 = other.DoubleField38;
-      }
-      if (other.Interactions != 0L) {
-        Interactions = other.Interactions;
-      }
-      repeatedIntField100_.Add(other.repeatedIntField100_);
-      if (other.DoubleField40 != 0D) {
-        DoubleField40 = other.DoubleField40;
-      }
-      if (other.Int64Field41 != 0L) {
-        Int64Field41 = other.Int64Field41;
-      }
-      if (other.Int64Field126 != 0L) {
-        Int64Field126 = other.Int64Field126;
-      }
-      if (other.Int64Field127 != 0L) {
-        Int64Field127 = other.Int64Field127;
-      }
-      if (other.DoubleField128 != 0D) {
-        DoubleField128 = other.DoubleField128;
-      }
-      if (other.DoubleField109 != 0D) {
-        DoubleField109 = other.DoubleField109;
-      }
-      if (other.Int64Field110 != 0L) {
-        Int64Field110 = other.Int64Field110;
-      }
-      if (other.DoubleField111 != 0D) {
-        DoubleField111 = other.DoubleField111;
-      }
-      if (other.Int64Field112 != 0L) {
-        Int64Field112 = other.Int64Field112;
-      }
-      if (other.DoubleField113 != 0D) {
-        DoubleField113 = other.DoubleField113;
-      }
-      if (other.Int64Field114 != 0L) {
-        Int64Field114 = other.Int64Field114;
-      }
-      if (other.DoubleField42 != 0D) {
-        DoubleField42 = other.DoubleField42;
-      }
-      if (other.Int64Field43 != 0L) {
-        Int64Field43 = other.Int64Field43;
-      }
-      if (other.Int64Field44 != 0L) {
-        Int64Field44 = other.Int64Field44;
-      }
-      if (other.DoubleField45 != 0D) {
-        DoubleField45 = other.DoubleField45;
-      }
-      if (other.DoubleField46 != 0D) {
-        DoubleField46 = other.DoubleField46;
-      }
-      if (other.DoubleField78 != 0D) {
-        DoubleField78 = other.DoubleField78;
-      }
-      if (other.DoubleField88 != 0D) {
-        DoubleField88 = other.DoubleField88;
-      }
-      if (other.DoubleField47 != 0D) {
-        DoubleField47 = other.DoubleField47;
-      }
-      if (other.DoubleField89 != 0D) {
-        DoubleField89 = other.DoubleField89;
-      }
-      if (other.DoubleField48 != 0D) {
-        DoubleField48 = other.DoubleField48;
-      }
-      if (other.DoubleField49 != 0D) {
-        DoubleField49 = other.DoubleField49;
-      }
-      if (other.DoubleField50 != 0D) {
-        DoubleField50 = other.DoubleField50;
-      }
-      if (other.DoubleField90 != 0D) {
-        DoubleField90 = other.DoubleField90;
-      }
-      if (other.DoubleField51 != 0D) {
-        DoubleField51 = other.DoubleField51;
-      }
-      if (other.DoubleField91 != 0D) {
-        DoubleField91 = other.DoubleField91;
-      }
-      if (other.DoubleField92 != 0D) {
-        DoubleField92 = other.DoubleField92;
-      }
-      if (other.Int64Field107 != 0L) {
-        Int64Field107 = other.Int64Field107;
-      }
-      if (other.DoubleField93 != 0D) {
-        DoubleField93 = other.DoubleField93;
-      }
-      if (other.DoubleField108 != 0D) {
-        DoubleField108 = other.DoubleField108;
-      }
-      if (other.DoubleField52 != 0D) {
-        DoubleField52 = other.DoubleField52;
-      }
-      if (other.DoubleField53 != 0D) {
-        DoubleField53 = other.DoubleField53;
-      }
-      if (other.DoubleField94 != 0D) {
-        DoubleField94 = other.DoubleField94;
-      }
-      if (other.DoubleField54 != 0D) {
-        DoubleField54 = other.DoubleField54;
-      }
-      if (other.DoubleField55 != 0D) {
-        DoubleField55 = other.DoubleField55;
-      }
-      if (other.DoubleField56 != 0D) {
-        DoubleField56 = other.DoubleField56;
-      }
-      if (other.DoubleField57 != 0D) {
-        DoubleField57 = other.DoubleField57;
-      }
-      if (other.DoubleField58 != 0D) {
-        DoubleField58 = other.DoubleField58;
-      }
-      if (other.Int64Field59 != 0L) {
-        Int64Field59 = other.Int64Field59;
-      }
-      if (other.Int64Field60 != 0L) {
-        Int64Field60 = other.Int64Field60;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 9: {
-            DoubleField1 = input.ReadDouble();
-            break;
-          }
-          case 16: {
-            Int64Field2 = input.ReadInt64();
-            break;
-          }
-          case 24: {
-            Int64Field3 = input.ReadInt64();
-            break;
-          }
-          case 32: {
-            Int64Field4 = input.ReadInt64();
-            break;
-          }
-          case 57: {
-            DoubleField7 = input.ReadDouble();
-            break;
-          }
-          case 65: {
-            DoubleField8 = input.ReadDouble();
-            break;
-          }
-          case 73: {
-            DoubleField9 = input.ReadDouble();
-            break;
-          }
-          case 81: {
-            DoubleField10 = input.ReadDouble();
-            break;
-          }
-          case 89: {
-            DoubleField11 = input.ReadDouble();
-            break;
-          }
-          case 113: {
-            DoubleField14 = input.ReadDouble();
-            break;
-          }
-          case 121: {
-            DoubleField15 = input.ReadDouble();
-            break;
-          }
-          case 152: {
-            Int64Field19 = input.ReadInt64();
-            break;
-          }
-          case 161: {
-            DoubleField20 = input.ReadDouble();
-            break;
-          }
-          case 169: {
-            DoubleField21 = input.ReadDouble();
-            break;
-          }
-          case 177: {
-            DoubleField22 = input.ReadDouble();
-            break;
-          }
-          case 201: {
-            DoubleField25 = input.ReadDouble();
-            break;
-          }
-          case 208: {
-            Int64Field26 = input.ReadInt64();
-            break;
-          }
-          case 225: {
-            DoubleField28 = input.ReadDouble();
-            break;
-          }
-          case 233: {
-            DoubleField29 = input.ReadDouble();
-            break;
-          }
-          case 241: {
-            DoubleField30 = input.ReadDouble();
-            break;
-          }
-          case 249: {
-            DoubleField31 = input.ReadDouble();
-            break;
-          }
-          case 256: {
-            Int64Field32 = input.ReadInt64();
-            break;
-          }
-          case 296: {
-            Int64Field37 = input.ReadInt64();
-            break;
-          }
-          case 305: {
-            DoubleField38 = input.ReadDouble();
-            break;
-          }
-          case 312: {
-            Interactions = input.ReadInt64();
-            break;
-          }
-          case 321: {
-            DoubleField40 = input.ReadDouble();
-            break;
-          }
-          case 328: {
-            Int64Field41 = input.ReadInt64();
-            break;
-          }
-          case 337: {
-            DoubleField42 = input.ReadDouble();
-            break;
-          }
-          case 344: {
-            Int64Field43 = input.ReadInt64();
-            break;
-          }
-          case 352: {
-            Int64Field44 = input.ReadInt64();
-            break;
-          }
-          case 361: {
-            DoubleField45 = input.ReadDouble();
-            break;
-          }
-          case 369: {
-            DoubleField46 = input.ReadDouble();
-            break;
-          }
-          case 377: {
-            DoubleField47 = input.ReadDouble();
-            break;
-          }
-          case 385: {
-            DoubleField48 = input.ReadDouble();
-            break;
-          }
-          case 393: {
-            DoubleField49 = input.ReadDouble();
-            break;
-          }
-          case 401: {
-            DoubleField50 = input.ReadDouble();
-            break;
-          }
-          case 409: {
-            DoubleField51 = input.ReadDouble();
-            break;
-          }
-          case 417: {
-            DoubleField52 = input.ReadDouble();
-            break;
-          }
-          case 425: {
-            DoubleField53 = input.ReadDouble();
-            break;
-          }
-          case 433: {
-            DoubleField54 = input.ReadDouble();
-            break;
-          }
-          case 441: {
-            DoubleField55 = input.ReadDouble();
-            break;
-          }
-          case 449: {
-            DoubleField56 = input.ReadDouble();
-            break;
-          }
-          case 457: {
-            DoubleField57 = input.ReadDouble();
-            break;
-          }
-          case 465: {
-            DoubleField58 = input.ReadDouble();
-            break;
-          }
-          case 472: {
-            Int64Field59 = input.ReadInt64();
-            break;
-          }
-          case 480: {
-            Int64Field60 = input.ReadInt64();
-            break;
-          }
-          case 497: {
-            DoubleField62 = input.ReadDouble();
-            break;
-          }
-          case 521: {
-            DoubleField65 = input.ReadDouble();
-            break;
-          }
-          case 529: {
-            DoubleField66 = input.ReadDouble();
-            break;
-          }
-          case 537: {
-            DoubleField67 = input.ReadDouble();
-            break;
-          }
-          case 545: {
-            DoubleField68 = input.ReadDouble();
-            break;
-          }
-          case 553: {
-            DoubleField69 = input.ReadDouble();
-            break;
-          }
-          case 561: {
-            DoubleField70 = input.ReadDouble();
-            break;
-          }
-          case 569: {
-            DoubleField71 = input.ReadDouble();
-            break;
-          }
-          case 577: {
-            DoubleField72 = input.ReadDouble();
-            break;
-          }
-          case 586: {
-            StringField73 = input.ReadString();
-            break;
-          }
-          case 594: {
-            StringField74 = input.ReadString();
-            break;
-          }
-          case 601: {
-            DoubleField75 = input.ReadDouble();
-            break;
-          }
-          case 617: {
-            DoubleField77 = input.ReadDouble();
-            break;
-          }
-          case 625: {
-            DoubleField78 = input.ReadDouble();
-            break;
-          }
-          case 633: {
-            DoubleField79 = input.ReadDouble();
-            break;
-          }
-          case 640: {
-            EnumField80 = input.ReadInt32();
-            break;
-          }
-          case 648: {
-            EnumField81 = input.ReadInt32();
-            break;
-          }
-          case 656: {
-            Int64Field82 = input.ReadInt64();
-            break;
-          }
-          case 664: {
-            EnumField83 = input.ReadInt32();
-            break;
-          }
-          case 673: {
-            DoubleField84 = input.ReadDouble();
-            break;
-          }
-          case 680: {
-            Int64Field85 = input.ReadInt64();
-            break;
-          }
-          case 688: {
-            Int64Field86 = input.ReadInt64();
-            break;
-          }
-          case 696: {
-            Int64Field87 = input.ReadInt64();
-            break;
-          }
-          case 705: {
-            DoubleField88 = input.ReadDouble();
-            break;
-          }
-          case 713: {
-            DoubleField89 = input.ReadDouble();
-            break;
-          }
-          case 721: {
-            DoubleField90 = input.ReadDouble();
-            break;
-          }
-          case 729: {
-            DoubleField91 = input.ReadDouble();
-            break;
-          }
-          case 737: {
-            DoubleField92 = input.ReadDouble();
-            break;
-          }
-          case 745: {
-            DoubleField93 = input.ReadDouble();
-            break;
-          }
-          case 753: {
-            DoubleField94 = input.ReadDouble();
-            break;
-          }
-          case 761: {
-            DoubleField95 = input.ReadDouble();
-            break;
-          }
-          case 769: {
-            DoubleField96 = input.ReadDouble();
-            break;
-          }
-          case 777: {
-            DoubleField97 = input.ReadDouble();
-            break;
-          }
-          case 785: {
-            DoubleField98 = input.ReadDouble();
-            break;
-          }
-          case 793: {
-            DoubleField99 = input.ReadDouble();
-            break;
-          }
-          case 802:
-          case 800: {
-            repeatedIntField100_.AddEntriesFrom(input, _repeated_repeatedIntField100_codec);
-            break;
-          }
-          case 809: {
-            DoubleField101 = input.ReadDouble();
-            break;
-          }
-          case 817: {
-            DoubleField102 = input.ReadDouble();
-            break;
-          }
-          case 825: {
-            DoubleField103 = input.ReadDouble();
-            break;
-          }
-          case 833: {
-            DoubleField104 = input.ReadDouble();
-            break;
-          }
-          case 841: {
-            DoubleField105 = input.ReadDouble();
-            break;
-          }
-          case 849: {
-            DoubleField106 = input.ReadDouble();
-            break;
-          }
-          case 856: {
-            Int64Field107 = input.ReadInt64();
-            break;
-          }
-          case 865: {
-            DoubleField108 = input.ReadDouble();
-            break;
-          }
-          case 873: {
-            DoubleField109 = input.ReadDouble();
-            break;
-          }
-          case 880: {
-            Int64Field110 = input.ReadInt64();
-            break;
-          }
-          case 889: {
-            DoubleField111 = input.ReadDouble();
-            break;
-          }
-          case 896: {
-            Int64Field112 = input.ReadInt64();
-            break;
-          }
-          case 905: {
-            DoubleField113 = input.ReadDouble();
-            break;
-          }
-          case 912: {
-            Int64Field114 = input.ReadInt64();
-            break;
-          }
-          case 920: {
-            Int64Field115 = input.ReadInt64();
-            break;
-          }
-          case 929: {
-            DoubleField116 = input.ReadDouble();
-            break;
-          }
-          case 936: {
-            Int64Field117 = input.ReadInt64();
-            break;
-          }
-          case 945: {
-            DoubleField118 = input.ReadDouble();
-            break;
-          }
-          case 953: {
-            DoubleField119 = input.ReadDouble();
-            break;
-          }
-          case 961: {
-            DoubleField120 = input.ReadDouble();
-            break;
-          }
-          case 969: {
-            DoubleField121 = input.ReadDouble();
-            break;
-          }
-          case 977: {
-            DoubleField122 = input.ReadDouble();
-            break;
-          }
-          case 985: {
-            DoubleField123 = input.ReadDouble();
-            break;
-          }
-          case 993: {
-            DoubleField124 = input.ReadDouble();
-            break;
-          }
-          case 1000: {
-            Int64Field125 = input.ReadInt64();
-            break;
-          }
-          case 1008: {
-            Int64Field126 = input.ReadInt64();
-            break;
-          }
-          case 1016: {
-            Int64Field127 = input.ReadInt64();
-            break;
-          }
-          case 1025: {
-            DoubleField128 = input.ReadDouble();
-            break;
-          }
-          case 1033: {
-            DoubleField129 = input.ReadDouble();
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 9: {
-            DoubleField1 = input.ReadDouble();
-            break;
-          }
-          case 16: {
-            Int64Field2 = input.ReadInt64();
-            break;
-          }
-          case 24: {
-            Int64Field3 = input.ReadInt64();
-            break;
-          }
-          case 32: {
-            Int64Field4 = input.ReadInt64();
-            break;
-          }
-          case 57: {
-            DoubleField7 = input.ReadDouble();
-            break;
-          }
-          case 65: {
-            DoubleField8 = input.ReadDouble();
-            break;
-          }
-          case 73: {
-            DoubleField9 = input.ReadDouble();
-            break;
-          }
-          case 81: {
-            DoubleField10 = input.ReadDouble();
-            break;
-          }
-          case 89: {
-            DoubleField11 = input.ReadDouble();
-            break;
-          }
-          case 113: {
-            DoubleField14 = input.ReadDouble();
-            break;
-          }
-          case 121: {
-            DoubleField15 = input.ReadDouble();
-            break;
-          }
-          case 152: {
-            Int64Field19 = input.ReadInt64();
-            break;
-          }
-          case 161: {
-            DoubleField20 = input.ReadDouble();
-            break;
-          }
-          case 169: {
-            DoubleField21 = input.ReadDouble();
-            break;
-          }
-          case 177: {
-            DoubleField22 = input.ReadDouble();
-            break;
-          }
-          case 201: {
-            DoubleField25 = input.ReadDouble();
-            break;
-          }
-          case 208: {
-            Int64Field26 = input.ReadInt64();
-            break;
-          }
-          case 225: {
-            DoubleField28 = input.ReadDouble();
-            break;
-          }
-          case 233: {
-            DoubleField29 = input.ReadDouble();
-            break;
-          }
-          case 241: {
-            DoubleField30 = input.ReadDouble();
-            break;
-          }
-          case 249: {
-            DoubleField31 = input.ReadDouble();
-            break;
-          }
-          case 256: {
-            Int64Field32 = input.ReadInt64();
-            break;
-          }
-          case 296: {
-            Int64Field37 = input.ReadInt64();
-            break;
-          }
-          case 305: {
-            DoubleField38 = input.ReadDouble();
-            break;
-          }
-          case 312: {
-            Interactions = input.ReadInt64();
-            break;
-          }
-          case 321: {
-            DoubleField40 = input.ReadDouble();
-            break;
-          }
-          case 328: {
-            Int64Field41 = input.ReadInt64();
-            break;
-          }
-          case 337: {
-            DoubleField42 = input.ReadDouble();
-            break;
-          }
-          case 344: {
-            Int64Field43 = input.ReadInt64();
-            break;
-          }
-          case 352: {
-            Int64Field44 = input.ReadInt64();
-            break;
-          }
-          case 361: {
-            DoubleField45 = input.ReadDouble();
-            break;
-          }
-          case 369: {
-            DoubleField46 = input.ReadDouble();
-            break;
-          }
-          case 377: {
-            DoubleField47 = input.ReadDouble();
-            break;
-          }
-          case 385: {
-            DoubleField48 = input.ReadDouble();
-            break;
-          }
-          case 393: {
-            DoubleField49 = input.ReadDouble();
-            break;
-          }
-          case 401: {
-            DoubleField50 = input.ReadDouble();
-            break;
-          }
-          case 409: {
-            DoubleField51 = input.ReadDouble();
-            break;
-          }
-          case 417: {
-            DoubleField52 = input.ReadDouble();
-            break;
-          }
-          case 425: {
-            DoubleField53 = input.ReadDouble();
-            break;
-          }
-          case 433: {
-            DoubleField54 = input.ReadDouble();
-            break;
-          }
-          case 441: {
-            DoubleField55 = input.ReadDouble();
-            break;
-          }
-          case 449: {
-            DoubleField56 = input.ReadDouble();
-            break;
-          }
-          case 457: {
-            DoubleField57 = input.ReadDouble();
-            break;
-          }
-          case 465: {
-            DoubleField58 = input.ReadDouble();
-            break;
-          }
-          case 472: {
-            Int64Field59 = input.ReadInt64();
-            break;
-          }
-          case 480: {
-            Int64Field60 = input.ReadInt64();
-            break;
-          }
-          case 497: {
-            DoubleField62 = input.ReadDouble();
-            break;
-          }
-          case 521: {
-            DoubleField65 = input.ReadDouble();
-            break;
-          }
-          case 529: {
-            DoubleField66 = input.ReadDouble();
-            break;
-          }
-          case 537: {
-            DoubleField67 = input.ReadDouble();
-            break;
-          }
-          case 545: {
-            DoubleField68 = input.ReadDouble();
-            break;
-          }
-          case 553: {
-            DoubleField69 = input.ReadDouble();
-            break;
-          }
-          case 561: {
-            DoubleField70 = input.ReadDouble();
-            break;
-          }
-          case 569: {
-            DoubleField71 = input.ReadDouble();
-            break;
-          }
-          case 577: {
-            DoubleField72 = input.ReadDouble();
-            break;
-          }
-          case 586: {
-            StringField73 = input.ReadString();
-            break;
-          }
-          case 594: {
-            StringField74 = input.ReadString();
-            break;
-          }
-          case 601: {
-            DoubleField75 = input.ReadDouble();
-            break;
-          }
-          case 617: {
-            DoubleField77 = input.ReadDouble();
-            break;
-          }
-          case 625: {
-            DoubleField78 = input.ReadDouble();
-            break;
-          }
-          case 633: {
-            DoubleField79 = input.ReadDouble();
-            break;
-          }
-          case 640: {
-            EnumField80 = input.ReadInt32();
-            break;
-          }
-          case 648: {
-            EnumField81 = input.ReadInt32();
-            break;
-          }
-          case 656: {
-            Int64Field82 = input.ReadInt64();
-            break;
-          }
-          case 664: {
-            EnumField83 = input.ReadInt32();
-            break;
-          }
-          case 673: {
-            DoubleField84 = input.ReadDouble();
-            break;
-          }
-          case 680: {
-            Int64Field85 = input.ReadInt64();
-            break;
-          }
-          case 688: {
-            Int64Field86 = input.ReadInt64();
-            break;
-          }
-          case 696: {
-            Int64Field87 = input.ReadInt64();
-            break;
-          }
-          case 705: {
-            DoubleField88 = input.ReadDouble();
-            break;
-          }
-          case 713: {
-            DoubleField89 = input.ReadDouble();
-            break;
-          }
-          case 721: {
-            DoubleField90 = input.ReadDouble();
-            break;
-          }
-          case 729: {
-            DoubleField91 = input.ReadDouble();
-            break;
-          }
-          case 737: {
-            DoubleField92 = input.ReadDouble();
-            break;
-          }
-          case 745: {
-            DoubleField93 = input.ReadDouble();
-            break;
-          }
-          case 753: {
-            DoubleField94 = input.ReadDouble();
-            break;
-          }
-          case 761: {
-            DoubleField95 = input.ReadDouble();
-            break;
-          }
-          case 769: {
-            DoubleField96 = input.ReadDouble();
-            break;
-          }
-          case 777: {
-            DoubleField97 = input.ReadDouble();
-            break;
-          }
-          case 785: {
-            DoubleField98 = input.ReadDouble();
-            break;
-          }
-          case 793: {
-            DoubleField99 = input.ReadDouble();
-            break;
-          }
-          case 802:
-          case 800: {
-            repeatedIntField100_.AddEntriesFrom(ref input, _repeated_repeatedIntField100_codec);
-            break;
-          }
-          case 809: {
-            DoubleField101 = input.ReadDouble();
-            break;
-          }
-          case 817: {
-            DoubleField102 = input.ReadDouble();
-            break;
-          }
-          case 825: {
-            DoubleField103 = input.ReadDouble();
-            break;
-          }
-          case 833: {
-            DoubleField104 = input.ReadDouble();
-            break;
-          }
-          case 841: {
-            DoubleField105 = input.ReadDouble();
-            break;
-          }
-          case 849: {
-            DoubleField106 = input.ReadDouble();
-            break;
-          }
-          case 856: {
-            Int64Field107 = input.ReadInt64();
-            break;
-          }
-          case 865: {
-            DoubleField108 = input.ReadDouble();
-            break;
-          }
-          case 873: {
-            DoubleField109 = input.ReadDouble();
-            break;
-          }
-          case 880: {
-            Int64Field110 = input.ReadInt64();
-            break;
-          }
-          case 889: {
-            DoubleField111 = input.ReadDouble();
-            break;
-          }
-          case 896: {
-            Int64Field112 = input.ReadInt64();
-            break;
-          }
-          case 905: {
-            DoubleField113 = input.ReadDouble();
-            break;
-          }
-          case 912: {
-            Int64Field114 = input.ReadInt64();
-            break;
-          }
-          case 920: {
-            Int64Field115 = input.ReadInt64();
-            break;
-          }
-          case 929: {
-            DoubleField116 = input.ReadDouble();
-            break;
-          }
-          case 936: {
-            Int64Field117 = input.ReadInt64();
-            break;
-          }
-          case 945: {
-            DoubleField118 = input.ReadDouble();
-            break;
-          }
-          case 953: {
-            DoubleField119 = input.ReadDouble();
-            break;
-          }
-          case 961: {
-            DoubleField120 = input.ReadDouble();
-            break;
-          }
-          case 969: {
-            DoubleField121 = input.ReadDouble();
-            break;
-          }
-          case 977: {
-            DoubleField122 = input.ReadDouble();
-            break;
-          }
-          case 985: {
-            DoubleField123 = input.ReadDouble();
-            break;
-          }
-          case 993: {
-            DoubleField124 = input.ReadDouble();
-            break;
-          }
-          case 1000: {
-            Int64Field125 = input.ReadInt64();
-            break;
-          }
-          case 1008: {
-            Int64Field126 = input.ReadInt64();
-            break;
-          }
-          case 1016: {
-            Int64Field127 = input.ReadInt64();
-            break;
-          }
-          case 1025: {
-            DoubleField128 = input.ReadDouble();
-            break;
-          }
-          case 1033: {
-            DoubleField129 = input.ReadDouble();
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  #endregion
-
-}
-
-#endregion Designer generated code
diff --git a/libs/protobuf/csharp/src/Google.Protobuf.Benchmarks/WriteMessagesBenchmark.cs b/libs/protobuf/csharp/src/Google.Protobuf.Benchmarks/WriteMessagesBenchmark.cs
deleted file mode 100644
index 5a3bba7..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf.Benchmarks/WriteMessagesBenchmark.cs
+++ /dev/null
@@ -1,198 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2019 Google Inc.  All rights reserved.
-// https://github.com/protocolbuffers/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using BenchmarkDotNet.Attributes;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Buffers;
-using Google.Protobuf.WellKnownTypes;
-
-namespace Google.Protobuf.Benchmarks
-{
-    /// <summary>
-    /// Benchmark that tests writing performance for various messages.
-    /// </summary>
-    [MemoryDiagnoser]
-    public class WriteMessagesBenchmark
-    {
-        const int MaxMessages = 100;
-
-        SubTest manyWrapperFieldsTest = new SubTest(ParseMessagesBenchmark.CreateManyWrapperFieldsMessage(), MaxMessages);
-        SubTest manyPrimitiveFieldsTest = new SubTest(ParseMessagesBenchmark.CreateManyPrimitiveFieldsMessage(), MaxMessages);
-        SubTest emptyMessageTest = new SubTest(new Empty(), MaxMessages);
-
-        public IEnumerable<int> MessageCountValues => new[] { 10, 100 };
-
-        [GlobalSetup]
-        public void GlobalSetup()
-        {
-        }
-
-        [Benchmark]
-        public byte[] ManyWrapperFieldsMessage_ToByteArray()
-        {
-            return manyWrapperFieldsTest.ToByteArray();
-        }
-
-        [Benchmark]
-        public byte[] ManyWrapperFieldsMessage_WriteToCodedOutputStream()
-        {
-            return manyWrapperFieldsTest.WriteToCodedOutputStream_PreAllocatedBuffer();
-        }
-
-        [Benchmark]
-        public byte[] ManyWrapperFieldsMessage_WriteToSpan()
-        {
-            return manyWrapperFieldsTest.WriteToSpan_PreAllocatedBuffer();
-        }
-
-
-        [Benchmark]
-        public byte[] ManyPrimitiveFieldsMessage_ToByteArray()
-        {
-            return manyPrimitiveFieldsTest.ToByteArray();
-        }
-
-        [Benchmark]
-        public byte[] ManyPrimitiveFieldsMessage_WriteToCodedOutputStream()
-        {
-            return manyPrimitiveFieldsTest.WriteToCodedOutputStream_PreAllocatedBuffer();
-        }
-
-        [Benchmark]
-        public byte[] ManyPrimitiveFieldsMessage_WriteToSpan()
-        {
-            return manyPrimitiveFieldsTest.WriteToSpan_PreAllocatedBuffer();
-        }
-
-        [Benchmark]
-        public byte[] EmptyMessage_ToByteArray()
-        {
-            return emptyMessageTest.ToByteArray();
-        }
-
-        [Benchmark]
-        public byte[] EmptyMessage_WriteToCodedOutputStream()
-        {
-            return emptyMessageTest.WriteToCodedOutputStream_PreAllocatedBuffer();
-        }
-
-        [Benchmark]
-        public byte[] EmptyMessage_WriteToSpan()
-        {
-            return emptyMessageTest.WriteToSpan_PreAllocatedBuffer();
-        }
-
-        [Benchmark]
-        [ArgumentsSource(nameof(MessageCountValues))]
-        public void ManyWrapperFieldsMessage_WriteDelimitedMessagesToCodedOutputStream(int messageCount)
-        {
-            manyWrapperFieldsTest.WriteDelimitedMessagesToCodedOutputStream_PreAllocatedBuffer(messageCount);
-        }
-
-        [Benchmark]
-        [ArgumentsSource(nameof(MessageCountValues))]
-        public void ManyWrapperFieldsMessage_WriteDelimitedMessagesToSpan(int messageCount)
-        {
-            manyWrapperFieldsTest.WriteDelimitedMessagesToSpan_PreAllocatedBuffer(messageCount);
-        }
-
-        [Benchmark]
-        [ArgumentsSource(nameof(MessageCountValues))]
-        public void ManyPrimitiveFieldsMessage_WriteDelimitedMessagesToCodedOutputStream(int messageCount)
-        {
-            manyPrimitiveFieldsTest.WriteDelimitedMessagesToCodedOutputStream_PreAllocatedBuffer(messageCount);
-        }
-
-        [Benchmark]
-        [ArgumentsSource(nameof(MessageCountValues))]
-        public void ManyPrimitiveFieldsMessage_WriteDelimitedMessagesToSpan(int messageCount)
-        {
-            manyPrimitiveFieldsTest.WriteDelimitedMessagesToSpan_PreAllocatedBuffer(messageCount);
-        }
-
-        private class SubTest
-        {
-            private readonly IMessage message;
-            private readonly byte[] outputBuffer;
-            private readonly byte[] multipleMessagesOutputBuffer;
-
-            public SubTest(IMessage message, int maxMessageCount)
-            {
-                this.message = message;
-
-                int messageSize = message.CalculateSize();
-                this.outputBuffer = new byte[messageSize];
-                this.multipleMessagesOutputBuffer = new byte[maxMessageCount * (messageSize + CodedOutputStream.ComputeLengthSize(messageSize))];
-            }
-
-            public byte[] ToByteArray() => message.ToByteArray();
-
-            public byte[] WriteToCodedOutputStream_PreAllocatedBuffer()
-            {
-                var cos = new CodedOutputStream(outputBuffer);  // use pre-existing output buffer
-                message.WriteTo(cos);
-                return outputBuffer;
-            }
-
-            public byte[] WriteToSpan_PreAllocatedBuffer()
-            {
-                var span = new Span<byte>(outputBuffer);  // use pre-existing output buffer
-                message.WriteTo(span);
-                return outputBuffer;
-            }
-
-            public byte[] WriteDelimitedMessagesToCodedOutputStream_PreAllocatedBuffer(int messageCount)
-            {
-                var cos = new CodedOutputStream(multipleMessagesOutputBuffer);  // use pre-existing output buffer
-                for (int i = 0; i < messageCount; i++)
-                {
-                    cos.WriteMessage(message);
-                }
-                return multipleMessagesOutputBuffer;
-            }
-
-            public byte[] WriteDelimitedMessagesToSpan_PreAllocatedBuffer(int messageCount)
-            {
-                var span = new Span<byte>(multipleMessagesOutputBuffer);  // use pre-existing output buffer
-                WriteContext.Initialize(ref span, out WriteContext ctx);
-                for (int i = 0; i < messageCount; i++)
-                {
-                    ctx.WriteMessage(message);
-                }
-                return multipleMessagesOutputBuffer;
-            }
-        }
-    }
-}
diff --git a/libs/protobuf/csharp/src/Google.Protobuf.Benchmarks/WriteRawPrimitivesBenchmark.cs b/libs/protobuf/csharp/src/Google.Protobuf.Benchmarks/WriteRawPrimitivesBenchmark.cs
deleted file mode 100644
index 66b6b4a..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf.Benchmarks/WriteRawPrimitivesBenchmark.cs
+++ /dev/null
@@ -1,519 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2019 Google Inc.  All rights reserved.
-// https://github.com/protocolbuffers/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using BenchmarkDotNet.Attributes;
-using System;
-using System.Buffers.Binary;
-using System.Collections.Generic;
-using System.IO;
-using System.Buffers;
-using System.Text;
-
-namespace Google.Protobuf.Benchmarks
-{
-    /// <summary>
-    /// Benchmarks throughput when writing raw primitives.
-    /// </summary>
-    [MemoryDiagnoser]
-    public class WriteRawPrimitivesBenchmark
-    {
-        // key is the encodedSize of varint values
-        Dictionary<int, uint[]> varint32Values;
-        Dictionary<int, ulong[]> varint64Values;
-
-        double[] doubleValues;
-        float[] floatValues;
-
-        // key is the encodedSize of string values
-        Dictionary<int, string[]> stringValues;
-
-        // key is the encodedSize of string values
-        Dictionary<int, string[]> nonAsciiStringValues;
-
-        // key is the encodedSize of string values
-        Dictionary<int, ByteString[]> byteStringValues;
-
-        // the buffer to which all the data will be written
-        byte[] outputBuffer;
-
-        Random random = new Random(417384220);  // random but deterministic seed
-
-        public IEnumerable<int> StringEncodedSizes => new[] { 1, 4, 10, 105, 10080 };
-
-        public IEnumerable<int> NonAsciiStringEncodedSizes => new[] { 4, 10, 105, 10080 };
-
-        [GlobalSetup]
-        public void GlobalSetup()
-        {
-            outputBuffer = new byte[BytesToWrite];
-
-            varint32Values = new Dictionary<int, uint[]>();
-            varint64Values = new Dictionary<int, ulong[]>();
-            for (int encodedSize = 1; encodedSize <= 10; encodedSize++)
-            {
-                if (encodedSize <= 5)
-                {
-                    varint32Values.Add(encodedSize, CreateRandomVarints32(random, BytesToWrite / encodedSize, encodedSize));
-                }
-                varint64Values.Add(encodedSize, CreateRandomVarints64(random, BytesToWrite / encodedSize, encodedSize));
-            }
-
-            doubleValues = CreateRandomDoubles(random, BytesToWrite / sizeof(double));
-            floatValues = CreateRandomFloats(random, BytesToWrite / sizeof(float));
-
-            stringValues = new Dictionary<int, string[]>();
-
-            byteStringValues = new Dictionary<int, ByteString[]>();
-            foreach(var encodedSize in StringEncodedSizes)
-            {
-                stringValues.Add(encodedSize, CreateStrings(BytesToWrite / encodedSize, encodedSize));
-                byteStringValues.Add(encodedSize, CreateByteStrings(BytesToWrite / encodedSize, encodedSize));
-            }
-
-            nonAsciiStringValues = new Dictionary<int, string[]>();
-            foreach(var encodedSize in NonAsciiStringEncodedSizes)
-            {
-                nonAsciiStringValues.Add(encodedSize, CreateNonAsciiStrings(BytesToWrite / encodedSize, encodedSize));
-            }
-        }
-
-        // Total number of bytes that each benchmark will write.
-        // Measuring the time taken to write buffer of given size makes it easier to compare parsing speed for different
-        // types and makes it easy to calculate the througput (in MB/s)
-        // 10800 bytes is chosen because it is divisible by all possible encoded sizes for all primitive types {1..10}
-        [Params(10080)]
-        public int BytesToWrite { get; set; }
-
-        [Benchmark]
-        [Arguments(1)]
-        [Arguments(2)]
-        [Arguments(3)]
-        [Arguments(4)]
-        [Arguments(5)]
-        public void WriteRawVarint32_CodedOutputStream(int encodedSize)
-        {
-            var values = varint32Values[encodedSize];
-            var cos = new CodedOutputStream(outputBuffer);
-            for (int i = 0; i < values.Length; i++)
-            {
-                cos.WriteRawVarint32(values[i]);
-            }
-            cos.Flush();
-            cos.CheckNoSpaceLeft();
-        }
-
-        [Benchmark]
-        [Arguments(1)]
-        [Arguments(2)]
-        [Arguments(3)]
-        [Arguments(4)]
-        [Arguments(5)]
-        public void WriteRawVarint32_WriteContext(int encodedSize)
-        {
-            var values = varint32Values[encodedSize];
-            var span = new Span<byte>(outputBuffer);
-            WriteContext.Initialize(ref span, out WriteContext ctx);
-            for (int i = 0; i < values.Length; i++)
-            {
-                ctx.WriteUInt32(values[i]);
-            }
-            ctx.Flush();
-            ctx.CheckNoSpaceLeft();
-        }
-
-        [Benchmark]
-        [Arguments(1)]
-        [Arguments(2)]
-        [Arguments(3)]
-        [Arguments(4)]
-        [Arguments(5)]
-        [Arguments(6)]
-        [Arguments(7)]
-        [Arguments(8)]
-        [Arguments(9)]
-        [Arguments(10)]
-        public void WriteRawVarint64_CodedOutputStream(int encodedSize)
-        {
-            var values = varint64Values[encodedSize];
-            var cos = new CodedOutputStream(outputBuffer);
-            for (int i = 0; i < values.Length; i++)
-            {
-                cos.WriteRawVarint64(values[i]);
-            }
-            cos.Flush();
-            cos.CheckNoSpaceLeft();
-        }
-
-        [Benchmark]
-        [Arguments(1)]
-        [Arguments(2)]
-        [Arguments(3)]
-        [Arguments(4)]
-        [Arguments(5)]
-        [Arguments(6)]
-        [Arguments(7)]
-        [Arguments(8)]
-        [Arguments(9)]
-        [Arguments(10)]
-        public void WriteRawVarint64_WriteContext(int encodedSize)
-        {
-            var values = varint64Values[encodedSize];
-            var span = new Span<byte>(outputBuffer);
-            WriteContext.Initialize(ref span, out WriteContext ctx);
-            for (int i = 0; i < values.Length; i++)
-            {
-                ctx.WriteUInt64(values[i]);
-            }
-            ctx.Flush();
-            ctx.CheckNoSpaceLeft();
-        }
-
-        [Benchmark]
-        public void WriteFixed32_CodedOutputStream()
-        {
-            const int encodedSize = sizeof(uint);
-            var cos = new CodedOutputStream(outputBuffer);
-            for (int i = 0; i < BytesToWrite / encodedSize; i++)
-            {
-                cos.WriteFixed32(12345);
-            }
-            cos.Flush();
-            cos.CheckNoSpaceLeft();
-        }
-
-        [Benchmark]
-        public void WriteFixed32_WriteContext()
-        {
-            const int encodedSize = sizeof(uint);
-            var span = new Span<byte>(outputBuffer);
-            WriteContext.Initialize(ref span, out WriteContext ctx);
-            for (uint i = 0; i < BytesToWrite / encodedSize; i++)
-            {
-                ctx.WriteFixed32(12345);
-            }
-            ctx.Flush();
-            ctx.CheckNoSpaceLeft();
-        }
-
-        [Benchmark]
-        public void WriteFixed64_CodedOutputStream()
-        {
-            const int encodedSize = sizeof(ulong);
-            var cos = new CodedOutputStream(outputBuffer);
-            for(int i = 0; i < BytesToWrite / encodedSize; i++)
-            {
-                cos.WriteFixed64(123456789);
-            }
-            cos.Flush();
-            cos.CheckNoSpaceLeft();
-        }
-
-        [Benchmark]
-        public void WriteFixed64_WriteContext()
-        {
-            const int encodedSize = sizeof(ulong);
-            var span = new Span<byte>(outputBuffer);
-            WriteContext.Initialize(ref span, out WriteContext ctx);
-            for (uint i = 0; i < BytesToWrite / encodedSize; i++)
-            {
-                ctx.WriteFixed64(123456789);
-            }
-            ctx.Flush();
-            ctx.CheckNoSpaceLeft();
-        }
-
-        [Benchmark]
-        public void WriteRawTag_OneByte_WriteContext()
-        {
-            const int encodedSize = 1;
-            var span = new Span<byte>(outputBuffer);
-            WriteContext.Initialize(ref span, out WriteContext ctx);
-            for (uint i = 0; i < BytesToWrite / encodedSize; i++)
-            {
-                ctx.WriteRawTag(16);
-            }
-            ctx.Flush();
-            ctx.CheckNoSpaceLeft();
-        }
-
-        [Benchmark]
-        public void WriteRawTag_TwoBytes_WriteContext()
-        {
-            const int encodedSize = 2;
-            var span = new Span<byte>(outputBuffer);
-            WriteContext.Initialize(ref span, out WriteContext ctx);
-            for (uint i = 0; i < BytesToWrite / encodedSize; i++)
-            {
-                ctx.WriteRawTag(137, 6);
-            }
-            ctx.Flush();
-            ctx.CheckNoSpaceLeft();
-        }
-
-        [Benchmark]
-        public void WriteRawTag_ThreeBytes_WriteContext()
-        {
-            const int encodedSize = 3;
-            var span = new Span<byte>(outputBuffer);
-            WriteContext.Initialize(ref span, out WriteContext ctx);
-            for (uint i = 0; i < BytesToWrite / encodedSize; i++)
-            {
-                ctx.WriteRawTag(160, 131, 1);
-            }
-            ctx.Flush();
-            ctx.CheckNoSpaceLeft();
-        }
-
-        [Benchmark]
-        public void Baseline_WriteContext()
-        {
-            var span = new Span<byte>(outputBuffer);
-            WriteContext.Initialize(ref span, out WriteContext ctx);
-            ctx.state.position = outputBuffer.Length;
-            ctx.Flush();
-            ctx.CheckNoSpaceLeft();
-        }
-
-        [Benchmark]
-        public void WriteRawFloat_CodedOutputStream()
-        {
-            var cos = new CodedOutputStream(outputBuffer);
-            foreach (var value in floatValues)
-            {
-                cos.WriteFloat(value);
-            }
-            cos.Flush();
-            cos.CheckNoSpaceLeft();
-        }
-
-        [Benchmark]
-        public void WriteRawFloat_WriteContext()
-        {
-            var span = new Span<byte>(outputBuffer);
-            WriteContext.Initialize(ref span, out WriteContext ctx);
-            foreach (var value in floatValues)
-            {
-                ctx.WriteFloat(value);
-            }
-            ctx.Flush();
-            ctx.CheckNoSpaceLeft();
-        }
-
-        [Benchmark]
-        public void WriteRawDouble_CodedOutputStream()
-        {
-            var cos = new CodedOutputStream(outputBuffer);
-            foreach (var value in doubleValues)
-            {
-                cos.WriteDouble(value);
-            }
-            cos.Flush();
-            cos.CheckNoSpaceLeft();
-        }
-
-        [Benchmark]
-        public void WriteRawDouble_WriteContext()
-        {
-            var span = new Span<byte>(outputBuffer);
-            WriteContext.Initialize(ref span, out WriteContext ctx);
-            foreach (var value in doubleValues)
-            {
-                ctx.WriteDouble(value);
-            }
-            ctx.Flush();
-            ctx.CheckNoSpaceLeft();
-        }
-
-        [Benchmark]
-        [ArgumentsSource(nameof(StringEncodedSizes))]
-        public void WriteString_CodedOutputStream(int encodedSize)
-        {
-            var values = stringValues[encodedSize];
-            var cos = new CodedOutputStream(outputBuffer);
-            foreach (var value in values)
-            {
-                cos.WriteString(value);
-            }
-            cos.Flush();
-            cos.CheckNoSpaceLeft();
-        }
-
-        [Benchmark]
-        [ArgumentsSource(nameof(StringEncodedSizes))]
-        public void WriteString_WriteContext(int encodedSize)
-        {
-            var values = stringValues[encodedSize];
-            var span = new Span<byte>(outputBuffer);
-            WriteContext.Initialize(ref span, out WriteContext ctx);
-            foreach (var value in values)
-            {
-                ctx.WriteString(value);
-            }
-            ctx.Flush();
-            ctx.CheckNoSpaceLeft();
-        }
-
-        [Benchmark]
-        [ArgumentsSource(nameof(NonAsciiStringEncodedSizes))]
-        public void WriteNonAsciiString_CodedOutputStream(int encodedSize)
-        {
-            var values = nonAsciiStringValues[encodedSize];
-            var cos = new CodedOutputStream(outputBuffer);
-            foreach (var value in values)
-            {
-                cos.WriteString(value);
-            }
-            cos.Flush();
-            cos.CheckNoSpaceLeft();
-        }
-
-        [Benchmark]
-        [ArgumentsSource(nameof(NonAsciiStringEncodedSizes))]
-        public void WriteNonAsciiString_WriteContext(int encodedSize)
-        {
-            var values = nonAsciiStringValues[encodedSize];
-            var span = new Span<byte>(outputBuffer);
-            WriteContext.Initialize(ref span, out WriteContext ctx);
-            foreach (var value in values)
-            {
-                ctx.WriteString(value);
-            }
-            ctx.Flush();
-            ctx.CheckNoSpaceLeft();
-        }
-
-        [Benchmark]
-        [ArgumentsSource(nameof(StringEncodedSizes))]
-        public void WriteBytes_CodedOutputStream(int encodedSize)
-        {
-            var values = byteStringValues[encodedSize];
-            var cos = new CodedOutputStream(outputBuffer);
-            foreach (var value in values)
-            {
-                cos.WriteBytes(value);
-            }
-            cos.Flush();
-            cos.CheckNoSpaceLeft();
-        }
-
-        [Benchmark]
-        [ArgumentsSource(nameof(StringEncodedSizes))]
-        public void WriteBytes_WriteContext(int encodedSize)
-        {
-            var values = byteStringValues[encodedSize];
-            var span = new Span<byte>(outputBuffer);
-            WriteContext.Initialize(ref span, out WriteContext ctx);
-            foreach (var value in values)
-            {
-                ctx.WriteBytes(value);
-            }
-            ctx.Flush();
-            ctx.CheckNoSpaceLeft();
-        }
-
-        private static uint[] CreateRandomVarints32(Random random, int valueCount, int encodedSize)
-        {
-            var result = new uint[valueCount];
-            for (int i = 0; i < valueCount; i++)
-            {
-                result[i] = (uint) ParseRawPrimitivesBenchmark.RandomUnsignedVarint(random, encodedSize, true);
-            }
-            return result;
-        }
-
-        private static ulong[] CreateRandomVarints64(Random random, int valueCount, int encodedSize)
-        {            
-            var result = new ulong[valueCount];
-            for (int i = 0; i < valueCount; i++)
-            {
-                result[i] = ParseRawPrimitivesBenchmark.RandomUnsignedVarint(random, encodedSize, false);
-            }
-            return result;
-        }
-
-        private static float[] CreateRandomFloats(Random random, int valueCount)
-        {
-            var result = new float[valueCount];
-            for (int i = 0; i < valueCount; i++)
-            {
-                result[i] = (float)random.NextDouble();
-            }
-            return result;
-        }
-
-        private static double[] CreateRandomDoubles(Random random, int valueCount)
-        {
-            var result = new double[valueCount];
-            for (int i = 0; i < valueCount; i++)
-            {
-                result[i] = random.NextDouble();
-            }
-            return result;
-        }
-
-        private static string[] CreateStrings(int valueCount, int encodedSize)
-        {
-            var str = ParseRawPrimitivesBenchmark.CreateStringWithEncodedSize(encodedSize);
-
-            var result = new string[valueCount];
-            for (int i = 0; i < valueCount; i++)
-            {
-                result[i] = str;
-            }
-            return result;
-        }
-
-        private static string[] CreateNonAsciiStrings(int valueCount, int encodedSize)
-        {
-            var str = ParseRawPrimitivesBenchmark.CreateNonAsciiStringWithEncodedSize(encodedSize);
-
-            var result = new string[valueCount];
-            for (int i = 0; i < valueCount; i++)
-            {
-                result[i] = str;
-            }
-            return result;
-        }
-
-        private static ByteString[] CreateByteStrings(int valueCount, int encodedSize)
-        {
-            var str = ParseRawPrimitivesBenchmark.CreateStringWithEncodedSize(encodedSize);
-
-            var result = new ByteString[valueCount];
-            for (int i = 0; i < valueCount; i++)
-            {
-                result[i] = ByteString.CopyFrom(Encoding.UTF8.GetBytes(str));
-            }
-            return result;
-        }
-    }
-}
diff --git a/libs/protobuf/csharp/src/Google.Protobuf.Benchmarks/wrapper_benchmark_messages.proto b/libs/protobuf/csharp/src/Google.Protobuf.Benchmarks/wrapper_benchmark_messages.proto
deleted file mode 100644
index 6802c25..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf.Benchmarks/wrapper_benchmark_messages.proto
+++ /dev/null
@@ -1,237 +0,0 @@
-syntax = "proto3";
-
-package google.protobuf.benchmarks;
-
-import "google/protobuf/wrappers.proto";
-
-// a message that has a large number of wrapper fields
-// obfuscated version of an internal message
-message ManyWrapperFieldsMessage {
-  google.protobuf.DoubleValue double_field_95 = 95;
-  google.protobuf.DoubleValue double_field_1 = 1;
-  google.protobuf.DoubleValue double_field_79 = 79;
-  google.protobuf.Int64Value int64_field_2 = 2;
-  google.protobuf.DoubleValue double_field_96 = 96;
-  google.protobuf.Int64Value int64_field_3 = 3;
-  google.protobuf.Int64Value int64_field_4 = 4;
-  google.protobuf.DoubleValue double_field_97 = 97;
-  google.protobuf.DoubleValue double_field_65 = 65;
-  google.protobuf.DoubleValue double_field_66 = 66;
-  google.protobuf.DoubleValue double_field_7 = 7;
-  google.protobuf.DoubleValue double_field_62 = 62;
-  google.protobuf.DoubleValue double_field_118 = 118;
-  google.protobuf.DoubleValue double_field_119 = 119;
-  google.protobuf.DoubleValue double_field_67 = 67;
-  google.protobuf.DoubleValue double_field_120 = 120;
-  google.protobuf.DoubleValue double_field_121 = 121;
-  google.protobuf.DoubleValue double_field_122 = 122;
-  google.protobuf.DoubleValue double_field_123 = 123;
-  google.protobuf.DoubleValue double_field_124 = 124;
-  google.protobuf.DoubleValue double_field_8 = 8;
-  google.protobuf.DoubleValue double_field_9 = 9;
-  google.protobuf.DoubleValue double_field_98 = 98;
-  google.protobuf.DoubleValue double_field_10 = 10;
-  google.protobuf.DoubleValue double_field_11 = 11;
-  google.protobuf.DoubleValue double_field_99 = 99;
-  google.protobuf.DoubleValue double_field_84 = 84;
-  google.protobuf.DoubleValue double_field_14 = 14;
-  google.protobuf.DoubleValue double_field_77 = 77;
-  google.protobuf.DoubleValue double_field_15 = 15;
-  google.protobuf.Int64Value int64_field_19 = 19;
-  google.protobuf.Int64Value int64_field_115 = 115;
-  google.protobuf.DoubleValue double_field_116 = 116;
-  google.protobuf.Int64Value int64_field_117 = 117;
-  google.protobuf.DoubleValue double_field_20 = 20;
-  google.protobuf.DoubleValue double_field_21 = 21;
-  google.protobuf.StringValue string_field_73 = 73;
-  google.protobuf.StringValue string_field_74 = 74;
-  google.protobuf.DoubleValue double_field_22 = 22;
-  google.protobuf.DoubleValue double_field_69 = 69;
-  google.protobuf.DoubleValue double_field_70 = 70;
-  google.protobuf.DoubleValue double_field_71 = 71;
-  google.protobuf.DoubleValue double_field_72 = 72;
-  google.protobuf.DoubleValue double_field_25 = 25;
-  google.protobuf.Int64Value int64_field_26 = 26;
-  google.protobuf.DoubleValue double_field_68 = 68;
-  google.protobuf.DoubleValue double_field_28 = 28;
-  google.protobuf.DoubleValue double_field_106 = 106;
-  google.protobuf.DoubleValue double_field_29 = 29;
-  google.protobuf.DoubleValue double_field_30 = 30;
-  google.protobuf.DoubleValue double_field_101 = 101;
-  google.protobuf.DoubleValue double_field_102 = 102;
-  google.protobuf.DoubleValue double_field_103 = 103;
-  google.protobuf.DoubleValue double_field_104 = 104;
-  google.protobuf.DoubleValue double_field_105 = 105;
-  google.protobuf.DoubleValue double_field_31 = 31;
-  google.protobuf.Int64Value int64_field_32 = 32;
-  google.protobuf.DoubleValue double_field_75 = 75;
-  google.protobuf.DoubleValue double_field_129 = 129;
-  int32 enum_field_80 = 80;
-  int32 enum_field_81 = 81;
-  google.protobuf.Int64Value int64_field_82 = 82;
-  int32 enum_field_83 = 83;
-  google.protobuf.Int64Value int64_field_85 = 85;
-  google.protobuf.Int64Value int64_field_86 = 86;
-  google.protobuf.Int64Value int64_field_87 = 87;
-  google.protobuf.Int64Value int64_field_125 = 125;
-  google.protobuf.Int64Value int64_field_37 = 37;
-  google.protobuf.DoubleValue double_field_38 = 38;
-  google.protobuf.Int64Value interactions = 39;
-  repeated int32 repeated_int_field_100 = 100;
-  google.protobuf.DoubleValue double_field_40 = 40;
-  google.protobuf.Int64Value int64_field_41 = 41;
-  google.protobuf.Int64Value int64_field_126 = 126;
-  google.protobuf.Int64Value int64_field_127 = 127;
-  google.protobuf.DoubleValue double_field_128 = 128;
-  google.protobuf.DoubleValue double_field_109 = 109;
-  google.protobuf.Int64Value int64_field_110 = 110;
-  google.protobuf.DoubleValue double_field_111 = 111;
-  google.protobuf.Int64Value int64_field_112 = 112;
-  google.protobuf.DoubleValue double_field_113 = 113;
-  google.protobuf.Int64Value int64_field_114 = 114;
-  google.protobuf.DoubleValue double_field_42 = 42;
-  google.protobuf.Int64Value int64_field_43 = 43;
-  google.protobuf.Int64Value int64_field_44 = 44;
-  google.protobuf.DoubleValue double_field_45 = 45;
-  google.protobuf.DoubleValue double_field_46 = 46;
-  google.protobuf.DoubleValue double_field_78 = 78;
-  google.protobuf.DoubleValue double_field_88 = 88;
-  google.protobuf.DoubleValue double_field_47 = 47;
-  google.protobuf.DoubleValue double_field_89 = 89;
-  google.protobuf.DoubleValue double_field_48 = 48;
-  google.protobuf.DoubleValue double_field_49 = 49;
-  google.protobuf.DoubleValue double_field_50 = 50;
-  google.protobuf.DoubleValue double_field_90 = 90;
-  google.protobuf.DoubleValue double_field_51 = 51;
-  google.protobuf.DoubleValue double_field_91 = 91;
-  google.protobuf.DoubleValue double_field_92 = 92;
-  google.protobuf.Int64Value int64_field_107 = 107;
-  google.protobuf.DoubleValue double_field_93 = 93;
-  google.protobuf.DoubleValue double_field_108 = 108;
-  google.protobuf.DoubleValue double_field_52 = 52;
-  google.protobuf.DoubleValue double_field_53 = 53;
-  google.protobuf.DoubleValue double_field_94 = 94;
-  google.protobuf.DoubleValue double_field_54 = 54;
-  google.protobuf.DoubleValue double_field_55 = 55;
-  google.protobuf.DoubleValue double_field_56 = 56;
-  google.protobuf.DoubleValue double_field_57 = 57;
-  google.protobuf.DoubleValue double_field_58 = 58;
-  google.protobuf.Int64Value int64_field_59 = 59;
-  google.protobuf.Int64Value int64_field_60 = 60;
-}
-
-// same as ManyWrapperFieldsMessages, but with primitive fields
-// for comparison.
-message ManyPrimitiveFieldsMessage {
-  double double_field_95 = 95;
-  double double_field_1 = 1;
-  double double_field_79 = 79;
-  int64 int64_field_2 = 2;
-  double double_field_96 = 96;
-  int64 int64_field_3 = 3;
-  int64 int64_field_4 = 4;
-  double double_field_97 = 97;
-  double double_field_65 = 65;
-  double double_field_66 = 66;
-  double double_field_7 = 7;
-  double double_field_62 = 62;
-  double double_field_118 = 118;
-  double double_field_119 = 119;
-  double double_field_67 = 67;
-  double double_field_120 = 120;
-  double double_field_121 = 121;
-  double double_field_122 = 122;
-  double double_field_123 = 123;
-  double double_field_124 = 124;
-  double double_field_8 = 8;
-  double double_field_9 = 9;
-  double double_field_98 = 98;
-  double double_field_10 = 10;
-  double double_field_11 = 11;
-  double double_field_99 = 99;
-  double double_field_84 = 84;
-  double double_field_14 = 14;
-  double double_field_77 = 77;
-  double double_field_15 = 15;
-  int64 int64_field_19 = 19;
-  int64 int64_field_115 = 115;
-  double double_field_116 = 116;
-  int64 int64_field_117 = 117;
-  double double_field_20 = 20;
-  double double_field_21 = 21;
-  string string_field_73 = 73;
-  string string_field_74 = 74;
-  double double_field_22 = 22;
-  double double_field_69 = 69;
-  double double_field_70 = 70;
-  double double_field_71 = 71;
-  double double_field_72 = 72;
-  double double_field_25 = 25;
-  int64 int64_field_26 = 26;
-  double double_field_68 = 68;
-  double double_field_28 = 28;
-  double double_field_106 = 106;
-  double double_field_29 = 29;
-  double double_field_30 = 30;
-  double double_field_101 = 101;
-  double double_field_102 = 102;
-  double double_field_103 = 103;
-  double double_field_104 = 104;
-  double double_field_105 = 105;
-  double double_field_31 = 31;
-  int64 int64_field_32 = 32;
-  double double_field_75 = 75;
-  double double_field_129 = 129;
-  int32 enum_field_80 = 80;
-  int32 enum_field_81 = 81;
-  int64 int64_field_82 = 82;
-  int32 enum_field_83 = 83;
-  int64 int64_field_85 = 85;
-  int64 int64_field_86 = 86;
-  int64 int64_field_87 = 87;
-  int64 int64_field_125 = 125;
-  int64 int64_field_37 = 37;
-  double double_field_38 = 38;
-  int64 interactions = 39;
-  repeated int32 repeated_int_field_100 = 100;
-  double double_field_40 = 40;
-  int64 int64_field_41 = 41;
-  int64 int64_field_126 = 126;
-  int64 int64_field_127 = 127;
-  double double_field_128 = 128;
-  double double_field_109 = 109;
-  int64 int64_field_110 = 110;
-  double double_field_111 = 111;
-  int64 int64_field_112 = 112;
-  double double_field_113 = 113;
-  int64 int64_field_114 = 114;
-  double double_field_42 = 42;
-  int64 int64_field_43 = 43;
-  int64 int64_field_44 = 44;
-  double double_field_45 = 45;
-  double double_field_46 = 46;
-  double double_field_78 = 78;
-  double double_field_88 = 88;
-  double double_field_47 = 47;
-  double double_field_89 = 89;
-  double double_field_48 = 48;
-  double double_field_49 = 49;
-  double double_field_50 = 50;
-  double double_field_90 = 90;
-  double double_field_51 = 51;
-  double double_field_91 = 91;
-  double double_field_92 = 92;
-  int64 int64_field_107 = 107;
-  double double_field_93 = 93;
-  double double_field_108 = 108;
-  double double_field_52 = 52;
-  double double_field_53 = 53;
-  double double_field_94 = 94;
-  double double_field_54 = 54;
-  double double_field_55 = 55;
-  double double_field_56 = 56;
-  double double_field_57 = 57;
-  double double_field_58 = 58;
-  int64 int64_field_59 = 59;
-  int64 int64_field_60 = 60;
-}
\ No newline at end of file
diff --git a/libs/protobuf/csharp/src/Google.Protobuf.Conformance/Conformance.cs b/libs/protobuf/csharp/src/Google.Protobuf.Conformance/Conformance.cs
deleted file mode 100644
index 79977a0..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf.Conformance/Conformance.cs
+++ /dev/null
@@ -1,1590 +0,0 @@
-// <auto-generated>
-//     Generated by the protocol buffer compiler.  DO NOT EDIT!
-//     source: conformance.proto
-// </auto-generated>
-#pragma warning disable 1591, 0612, 3021, 8981
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-namespace Conformance {
-
-  /// <summary>Holder for reflection information generated from conformance.proto</summary>
-  public static partial class ConformanceReflection {
-
-    #region Descriptor
-    /// <summary>File descriptor for conformance.proto</summary>
-    public static pbr::FileDescriptor Descriptor {
-      get { return descriptor; }
-    }
-    private static pbr::FileDescriptor descriptor;
-
-    static ConformanceReflection() {
-      byte[] descriptorData = global::System.Convert.FromBase64String(
-          string.Concat(
-            "ChFjb25mb3JtYW5jZS5wcm90bxILY29uZm9ybWFuY2UiHQoKRmFpbHVyZVNl",
-            "dBIPCgdmYWlsdXJlGAEgAygJIuMCChJDb25mb3JtYW5jZVJlcXVlc3QSGgoQ",
-            "cHJvdG9idWZfcGF5bG9hZBgBIAEoDEgAEhYKDGpzb25fcGF5bG9hZBgCIAEo",
-            "CUgAEhYKDGpzcGJfcGF5bG9hZBgHIAEoCUgAEhYKDHRleHRfcGF5bG9hZBgI",
-            "IAEoCUgAEjgKF3JlcXVlc3RlZF9vdXRwdXRfZm9ybWF0GAMgASgOMhcuY29u",
-            "Zm9ybWFuY2UuV2lyZUZvcm1hdBIUCgxtZXNzYWdlX3R5cGUYBCABKAkSMAoN",
-            "dGVzdF9jYXRlZ29yeRgFIAEoDjIZLmNvbmZvcm1hbmNlLlRlc3RDYXRlZ29y",
-            "eRI+ChVqc3BiX2VuY29kaW5nX29wdGlvbnMYBiABKAsyHy5jb25mb3JtYW5j",
-            "ZS5Kc3BiRW5jb2RpbmdDb25maWcSHAoUcHJpbnRfdW5rbm93bl9maWVsZHMY",
-            "CSABKAhCCQoHcGF5bG9hZCLhAQoTQ29uZm9ybWFuY2VSZXNwb25zZRIVCgtw",
-            "YXJzZV9lcnJvchgBIAEoCUgAEhkKD3NlcmlhbGl6ZV9lcnJvchgGIAEoCUgA",
-            "EhcKDXJ1bnRpbWVfZXJyb3IYAiABKAlIABIaChBwcm90b2J1Zl9wYXlsb2Fk",
-            "GAMgASgMSAASFgoManNvbl9wYXlsb2FkGAQgASgJSAASEQoHc2tpcHBlZBgF",
-            "IAEoCUgAEhYKDGpzcGJfcGF5bG9hZBgHIAEoCUgAEhYKDHRleHRfcGF5bG9h",
-            "ZBgIIAEoCUgAQggKBnJlc3VsdCI3ChJKc3BiRW5jb2RpbmdDb25maWcSIQoZ",
-            "dXNlX2pzcGJfYXJyYXlfYW55X2Zvcm1hdBgBIAEoCCpQCgpXaXJlRm9ybWF0",
-            "Eg8KC1VOU1BFQ0lGSUVEEAASDAoIUFJPVE9CVUYQARIICgRKU09OEAISCAoE",
-            "SlNQQhADEg8KC1RFWFRfRk9STUFUEAQqjwEKDFRlc3RDYXRlZ29yeRIUChBV",
-            "TlNQRUNJRklFRF9URVNUEAASDwoLQklOQVJZX1RFU1QQARINCglKU09OX1RF",
-            "U1QQAhIkCiBKU09OX0lHTk9SRV9VTktOT1dOX1BBUlNJTkdfVEVTVBADEg0K",
-            "CUpTUEJfVEVTVBAEEhQKEFRFWFRfRk9STUFUX1RFU1QQBUIhCh9jb20uZ29v",
-            "Z2xlLnByb3RvYnVmLmNvbmZvcm1hbmNlYgZwcm90bzM="));
-      descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-          new pbr::FileDescriptor[] { },
-          new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Conformance.WireFormat), typeof(global::Conformance.TestCategory), }, null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::Conformance.FailureSet), global::Conformance.FailureSet.Parser, new[]{ "Failure" }, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Conformance.ConformanceRequest), global::Conformance.ConformanceRequest.Parser, new[]{ "ProtobufPayload", "JsonPayload", "JspbPayload", "TextPayload", "RequestedOutputFormat", "MessageType", "TestCategory", "JspbEncodingOptions", "PrintUnknownFields" }, new[]{ "Payload" }, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Conformance.ConformanceResponse), global::Conformance.ConformanceResponse.Parser, new[]{ "ParseError", "SerializeError", "RuntimeError", "ProtobufPayload", "JsonPayload", "Skipped", "JspbPayload", "TextPayload" }, new[]{ "Result" }, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Conformance.JspbEncodingConfig), global::Conformance.JspbEncodingConfig.Parser, new[]{ "UseJspbArrayAnyFormat" }, null, null, null, null)
-          }));
-    }
-    #endregion
-
-  }
-  #region Enums
-  public enum WireFormat {
-    [pbr::OriginalName("UNSPECIFIED")] Unspecified = 0,
-    [pbr::OriginalName("PROTOBUF")] Protobuf = 1,
-    [pbr::OriginalName("JSON")] Json = 2,
-    /// <summary>
-    /// Google internal only. Opensource testees just skip it.
-    /// </summary>
-    [pbr::OriginalName("JSPB")] Jspb = 3,
-    [pbr::OriginalName("TEXT_FORMAT")] TextFormat = 4,
-  }
-
-  public enum TestCategory {
-    [pbr::OriginalName("UNSPECIFIED_TEST")] UnspecifiedTest = 0,
-    /// <summary>
-    /// Test binary wire format.
-    /// </summary>
-    [pbr::OriginalName("BINARY_TEST")] BinaryTest = 1,
-    /// <summary>
-    /// Test json wire format.
-    /// </summary>
-    [pbr::OriginalName("JSON_TEST")] JsonTest = 2,
-    /// <summary>
-    /// Similar to JSON_TEST. However, during parsing json, testee should ignore
-    /// unknown fields. This feature is optional. Each implementation can decide
-    /// whether to support it.  See
-    /// https://developers.google.com/protocol-buffers/docs/proto3#json_options
-    /// for more detail.
-    /// </summary>
-    [pbr::OriginalName("JSON_IGNORE_UNKNOWN_PARSING_TEST")] JsonIgnoreUnknownParsingTest = 3,
-    /// <summary>
-    /// Test jspb wire format. Google internal only. Opensource testees just skip it.
-    /// </summary>
-    [pbr::OriginalName("JSPB_TEST")] JspbTest = 4,
-    /// <summary>
-    /// Test text format. For cpp, java and python, testees can already deal with
-    /// this type. Testees of other languages can simply skip it.
-    /// </summary>
-    [pbr::OriginalName("TEXT_FORMAT_TEST")] TextFormatTest = 5,
-  }
-
-  #endregion
-
-  #region Messages
-  /// <summary>
-  /// The conformance runner will request a list of failures as the first request.
-  /// This will be known by message_type == "conformance.FailureSet", a conformance
-  /// test should return a serialized FailureSet in protobuf_payload.
-  /// </summary>
-  public sealed partial class FailureSet : pb::IMessage<FailureSet>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<FailureSet> _parser = new pb::MessageParser<FailureSet>(() => new FailureSet());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<FailureSet> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Conformance.ConformanceReflection.Descriptor.MessageTypes[0]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public FailureSet() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public FailureSet(FailureSet other) : this() {
-      failure_ = other.failure_.Clone();
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public FailureSet Clone() {
-      return new FailureSet(this);
-    }
-
-    /// <summary>Field number for the "failure" field.</summary>
-    public const int FailureFieldNumber = 1;
-    private static readonly pb::FieldCodec<string> _repeated_failure_codec
-        = pb::FieldCodec.ForString(10);
-    private readonly pbc::RepeatedField<string> failure_ = new pbc::RepeatedField<string>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<string> Failure {
-      get { return failure_; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as FailureSet);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(FailureSet other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if(!failure_.Equals(other.failure_)) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      hash ^= failure_.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      failure_.WriteTo(output, _repeated_failure_codec);
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      failure_.WriteTo(ref output, _repeated_failure_codec);
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      size += failure_.CalculateSize(_repeated_failure_codec);
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(FailureSet other) {
-      if (other == null) {
-        return;
-      }
-      failure_.Add(other.failure_);
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 10: {
-            failure_.AddEntriesFrom(input, _repeated_failure_codec);
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 10: {
-            failure_.AddEntriesFrom(ref input, _repeated_failure_codec);
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  /// <summary>
-  /// Represents a single test case's input.  The testee should:
-  ///
-  ///   1. parse this proto (which should always succeed)
-  ///   2. parse the protobuf or JSON payload in "payload" (which may fail)
-  ///   3. if the parse succeeded, serialize the message in the requested format.
-  /// </summary>
-  public sealed partial class ConformanceRequest : pb::IMessage<ConformanceRequest>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<ConformanceRequest> _parser = new pb::MessageParser<ConformanceRequest>(() => new ConformanceRequest());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<ConformanceRequest> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Conformance.ConformanceReflection.Descriptor.MessageTypes[1]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ConformanceRequest() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ConformanceRequest(ConformanceRequest other) : this() {
-      requestedOutputFormat_ = other.requestedOutputFormat_;
-      messageType_ = other.messageType_;
-      testCategory_ = other.testCategory_;
-      jspbEncodingOptions_ = other.jspbEncodingOptions_ != null ? other.jspbEncodingOptions_.Clone() : null;
-      printUnknownFields_ = other.printUnknownFields_;
-      switch (other.PayloadCase) {
-        case PayloadOneofCase.ProtobufPayload:
-          ProtobufPayload = other.ProtobufPayload;
-          break;
-        case PayloadOneofCase.JsonPayload:
-          JsonPayload = other.JsonPayload;
-          break;
-        case PayloadOneofCase.JspbPayload:
-          JspbPayload = other.JspbPayload;
-          break;
-        case PayloadOneofCase.TextPayload:
-          TextPayload = other.TextPayload;
-          break;
-      }
-
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ConformanceRequest Clone() {
-      return new ConformanceRequest(this);
-    }
-
-    /// <summary>Field number for the "protobuf_payload" field.</summary>
-    public const int ProtobufPayloadFieldNumber = 1;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pb::ByteString ProtobufPayload {
-      get { return payloadCase_ == PayloadOneofCase.ProtobufPayload ? (pb::ByteString) payload_ : pb::ByteString.Empty; }
-      set {
-        payload_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-        payloadCase_ = PayloadOneofCase.ProtobufPayload;
-      }
-    }
-
-    /// <summary>Field number for the "json_payload" field.</summary>
-    public const int JsonPayloadFieldNumber = 2;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string JsonPayload {
-      get { return payloadCase_ == PayloadOneofCase.JsonPayload ? (string) payload_ : ""; }
-      set {
-        payload_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-        payloadCase_ = PayloadOneofCase.JsonPayload;
-      }
-    }
-
-    /// <summary>Field number for the "jspb_payload" field.</summary>
-    public const int JspbPayloadFieldNumber = 7;
-    /// <summary>
-    /// Google internal only.  Opensource testees just skip it.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string JspbPayload {
-      get { return payloadCase_ == PayloadOneofCase.JspbPayload ? (string) payload_ : ""; }
-      set {
-        payload_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-        payloadCase_ = PayloadOneofCase.JspbPayload;
-      }
-    }
-
-    /// <summary>Field number for the "text_payload" field.</summary>
-    public const int TextPayloadFieldNumber = 8;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string TextPayload {
-      get { return payloadCase_ == PayloadOneofCase.TextPayload ? (string) payload_ : ""; }
-      set {
-        payload_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-        payloadCase_ = PayloadOneofCase.TextPayload;
-      }
-    }
-
-    /// <summary>Field number for the "requested_output_format" field.</summary>
-    public const int RequestedOutputFormatFieldNumber = 3;
-    private global::Conformance.WireFormat requestedOutputFormat_ = global::Conformance.WireFormat.Unspecified;
-    /// <summary>
-    /// Which format should the testee serialize its message to?
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Conformance.WireFormat RequestedOutputFormat {
-      get { return requestedOutputFormat_; }
-      set {
-        requestedOutputFormat_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "message_type" field.</summary>
-    public const int MessageTypeFieldNumber = 4;
-    private string messageType_ = "";
-    /// <summary>
-    /// The full name for the test message to use; for the moment, either:
-    /// protobuf_test_messages.proto3.TestAllTypesProto3 or
-    /// protobuf_test_messages.google.protobuf.TestAllTypesProto2.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string MessageType {
-      get { return messageType_; }
-      set {
-        messageType_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-
-    /// <summary>Field number for the "test_category" field.</summary>
-    public const int TestCategoryFieldNumber = 5;
-    private global::Conformance.TestCategory testCategory_ = global::Conformance.TestCategory.UnspecifiedTest;
-    /// <summary>
-    /// Each test is given a specific test category. Some category may need
-    /// specific support in testee programs. Refer to the definition of TestCategory
-    /// for more information.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Conformance.TestCategory TestCategory {
-      get { return testCategory_; }
-      set {
-        testCategory_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "jspb_encoding_options" field.</summary>
-    public const int JspbEncodingOptionsFieldNumber = 6;
-    private global::Conformance.JspbEncodingConfig jspbEncodingOptions_;
-    /// <summary>
-    /// Specify details for how to encode jspb.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Conformance.JspbEncodingConfig JspbEncodingOptions {
-      get { return jspbEncodingOptions_; }
-      set {
-        jspbEncodingOptions_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "print_unknown_fields" field.</summary>
-    public const int PrintUnknownFieldsFieldNumber = 9;
-    private bool printUnknownFields_;
-    /// <summary>
-    /// This can be used in json and text format. If true, testee should print
-    /// unknown fields instead of ignore. This feature is optional.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool PrintUnknownFields {
-      get { return printUnknownFields_; }
-      set {
-        printUnknownFields_ = value;
-      }
-    }
-
-    private object payload_;
-    /// <summary>Enum of possible cases for the "payload" oneof.</summary>
-    public enum PayloadOneofCase {
-      None = 0,
-      ProtobufPayload = 1,
-      JsonPayload = 2,
-      JspbPayload = 7,
-      TextPayload = 8,
-    }
-    private PayloadOneofCase payloadCase_ = PayloadOneofCase.None;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public PayloadOneofCase PayloadCase {
-      get { return payloadCase_; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearPayload() {
-      payloadCase_ = PayloadOneofCase.None;
-      payload_ = null;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as ConformanceRequest);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(ConformanceRequest other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (ProtobufPayload != other.ProtobufPayload) return false;
-      if (JsonPayload != other.JsonPayload) return false;
-      if (JspbPayload != other.JspbPayload) return false;
-      if (TextPayload != other.TextPayload) return false;
-      if (RequestedOutputFormat != other.RequestedOutputFormat) return false;
-      if (MessageType != other.MessageType) return false;
-      if (TestCategory != other.TestCategory) return false;
-      if (!object.Equals(JspbEncodingOptions, other.JspbEncodingOptions)) return false;
-      if (PrintUnknownFields != other.PrintUnknownFields) return false;
-      if (PayloadCase != other.PayloadCase) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (payloadCase_ == PayloadOneofCase.ProtobufPayload) hash ^= ProtobufPayload.GetHashCode();
-      if (payloadCase_ == PayloadOneofCase.JsonPayload) hash ^= JsonPayload.GetHashCode();
-      if (payloadCase_ == PayloadOneofCase.JspbPayload) hash ^= JspbPayload.GetHashCode();
-      if (payloadCase_ == PayloadOneofCase.TextPayload) hash ^= TextPayload.GetHashCode();
-      if (RequestedOutputFormat != global::Conformance.WireFormat.Unspecified) hash ^= RequestedOutputFormat.GetHashCode();
-      if (MessageType.Length != 0) hash ^= MessageType.GetHashCode();
-      if (TestCategory != global::Conformance.TestCategory.UnspecifiedTest) hash ^= TestCategory.GetHashCode();
-      if (jspbEncodingOptions_ != null) hash ^= JspbEncodingOptions.GetHashCode();
-      if (PrintUnknownFields != false) hash ^= PrintUnknownFields.GetHashCode();
-      hash ^= (int) payloadCase_;
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (payloadCase_ == PayloadOneofCase.ProtobufPayload) {
-        output.WriteRawTag(10);
-        output.WriteBytes(ProtobufPayload);
-      }
-      if (payloadCase_ == PayloadOneofCase.JsonPayload) {
-        output.WriteRawTag(18);
-        output.WriteString(JsonPayload);
-      }
-      if (RequestedOutputFormat != global::Conformance.WireFormat.Unspecified) {
-        output.WriteRawTag(24);
-        output.WriteEnum((int) RequestedOutputFormat);
-      }
-      if (MessageType.Length != 0) {
-        output.WriteRawTag(34);
-        output.WriteString(MessageType);
-      }
-      if (TestCategory != global::Conformance.TestCategory.UnspecifiedTest) {
-        output.WriteRawTag(40);
-        output.WriteEnum((int) TestCategory);
-      }
-      if (jspbEncodingOptions_ != null) {
-        output.WriteRawTag(50);
-        output.WriteMessage(JspbEncodingOptions);
-      }
-      if (payloadCase_ == PayloadOneofCase.JspbPayload) {
-        output.WriteRawTag(58);
-        output.WriteString(JspbPayload);
-      }
-      if (payloadCase_ == PayloadOneofCase.TextPayload) {
-        output.WriteRawTag(66);
-        output.WriteString(TextPayload);
-      }
-      if (PrintUnknownFields != false) {
-        output.WriteRawTag(72);
-        output.WriteBool(PrintUnknownFields);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (payloadCase_ == PayloadOneofCase.ProtobufPayload) {
-        output.WriteRawTag(10);
-        output.WriteBytes(ProtobufPayload);
-      }
-      if (payloadCase_ == PayloadOneofCase.JsonPayload) {
-        output.WriteRawTag(18);
-        output.WriteString(JsonPayload);
-      }
-      if (RequestedOutputFormat != global::Conformance.WireFormat.Unspecified) {
-        output.WriteRawTag(24);
-        output.WriteEnum((int) RequestedOutputFormat);
-      }
-      if (MessageType.Length != 0) {
-        output.WriteRawTag(34);
-        output.WriteString(MessageType);
-      }
-      if (TestCategory != global::Conformance.TestCategory.UnspecifiedTest) {
-        output.WriteRawTag(40);
-        output.WriteEnum((int) TestCategory);
-      }
-      if (jspbEncodingOptions_ != null) {
-        output.WriteRawTag(50);
-        output.WriteMessage(JspbEncodingOptions);
-      }
-      if (payloadCase_ == PayloadOneofCase.JspbPayload) {
-        output.WriteRawTag(58);
-        output.WriteString(JspbPayload);
-      }
-      if (payloadCase_ == PayloadOneofCase.TextPayload) {
-        output.WriteRawTag(66);
-        output.WriteString(TextPayload);
-      }
-      if (PrintUnknownFields != false) {
-        output.WriteRawTag(72);
-        output.WriteBool(PrintUnknownFields);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (payloadCase_ == PayloadOneofCase.ProtobufPayload) {
-        size += 1 + pb::CodedOutputStream.ComputeBytesSize(ProtobufPayload);
-      }
-      if (payloadCase_ == PayloadOneofCase.JsonPayload) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(JsonPayload);
-      }
-      if (payloadCase_ == PayloadOneofCase.JspbPayload) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(JspbPayload);
-      }
-      if (payloadCase_ == PayloadOneofCase.TextPayload) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(TextPayload);
-      }
-      if (RequestedOutputFormat != global::Conformance.WireFormat.Unspecified) {
-        size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) RequestedOutputFormat);
-      }
-      if (MessageType.Length != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(MessageType);
-      }
-      if (TestCategory != global::Conformance.TestCategory.UnspecifiedTest) {
-        size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) TestCategory);
-      }
-      if (jspbEncodingOptions_ != null) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(JspbEncodingOptions);
-      }
-      if (PrintUnknownFields != false) {
-        size += 1 + 1;
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(ConformanceRequest other) {
-      if (other == null) {
-        return;
-      }
-      if (other.RequestedOutputFormat != global::Conformance.WireFormat.Unspecified) {
-        RequestedOutputFormat = other.RequestedOutputFormat;
-      }
-      if (other.MessageType.Length != 0) {
-        MessageType = other.MessageType;
-      }
-      if (other.TestCategory != global::Conformance.TestCategory.UnspecifiedTest) {
-        TestCategory = other.TestCategory;
-      }
-      if (other.jspbEncodingOptions_ != null) {
-        if (jspbEncodingOptions_ == null) {
-          JspbEncodingOptions = new global::Conformance.JspbEncodingConfig();
-        }
-        JspbEncodingOptions.MergeFrom(other.JspbEncodingOptions);
-      }
-      if (other.PrintUnknownFields != false) {
-        PrintUnknownFields = other.PrintUnknownFields;
-      }
-      switch (other.PayloadCase) {
-        case PayloadOneofCase.ProtobufPayload:
-          ProtobufPayload = other.ProtobufPayload;
-          break;
-        case PayloadOneofCase.JsonPayload:
-          JsonPayload = other.JsonPayload;
-          break;
-        case PayloadOneofCase.JspbPayload:
-          JspbPayload = other.JspbPayload;
-          break;
-        case PayloadOneofCase.TextPayload:
-          TextPayload = other.TextPayload;
-          break;
-      }
-
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 10: {
-            ProtobufPayload = input.ReadBytes();
-            break;
-          }
-          case 18: {
-            JsonPayload = input.ReadString();
-            break;
-          }
-          case 24: {
-            RequestedOutputFormat = (global::Conformance.WireFormat) input.ReadEnum();
-            break;
-          }
-          case 34: {
-            MessageType = input.ReadString();
-            break;
-          }
-          case 40: {
-            TestCategory = (global::Conformance.TestCategory) input.ReadEnum();
-            break;
-          }
-          case 50: {
-            if (jspbEncodingOptions_ == null) {
-              JspbEncodingOptions = new global::Conformance.JspbEncodingConfig();
-            }
-            input.ReadMessage(JspbEncodingOptions);
-            break;
-          }
-          case 58: {
-            JspbPayload = input.ReadString();
-            break;
-          }
-          case 66: {
-            TextPayload = input.ReadString();
-            break;
-          }
-          case 72: {
-            PrintUnknownFields = input.ReadBool();
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 10: {
-            ProtobufPayload = input.ReadBytes();
-            break;
-          }
-          case 18: {
-            JsonPayload = input.ReadString();
-            break;
-          }
-          case 24: {
-            RequestedOutputFormat = (global::Conformance.WireFormat) input.ReadEnum();
-            break;
-          }
-          case 34: {
-            MessageType = input.ReadString();
-            break;
-          }
-          case 40: {
-            TestCategory = (global::Conformance.TestCategory) input.ReadEnum();
-            break;
-          }
-          case 50: {
-            if (jspbEncodingOptions_ == null) {
-              JspbEncodingOptions = new global::Conformance.JspbEncodingConfig();
-            }
-            input.ReadMessage(JspbEncodingOptions);
-            break;
-          }
-          case 58: {
-            JspbPayload = input.ReadString();
-            break;
-          }
-          case 66: {
-            TextPayload = input.ReadString();
-            break;
-          }
-          case 72: {
-            PrintUnknownFields = input.ReadBool();
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  /// <summary>
-  /// Represents a single test case's output.
-  /// </summary>
-  public sealed partial class ConformanceResponse : pb::IMessage<ConformanceResponse>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<ConformanceResponse> _parser = new pb::MessageParser<ConformanceResponse>(() => new ConformanceResponse());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<ConformanceResponse> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Conformance.ConformanceReflection.Descriptor.MessageTypes[2]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ConformanceResponse() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ConformanceResponse(ConformanceResponse other) : this() {
-      switch (other.ResultCase) {
-        case ResultOneofCase.ParseError:
-          ParseError = other.ParseError;
-          break;
-        case ResultOneofCase.SerializeError:
-          SerializeError = other.SerializeError;
-          break;
-        case ResultOneofCase.RuntimeError:
-          RuntimeError = other.RuntimeError;
-          break;
-        case ResultOneofCase.ProtobufPayload:
-          ProtobufPayload = other.ProtobufPayload;
-          break;
-        case ResultOneofCase.JsonPayload:
-          JsonPayload = other.JsonPayload;
-          break;
-        case ResultOneofCase.Skipped:
-          Skipped = other.Skipped;
-          break;
-        case ResultOneofCase.JspbPayload:
-          JspbPayload = other.JspbPayload;
-          break;
-        case ResultOneofCase.TextPayload:
-          TextPayload = other.TextPayload;
-          break;
-      }
-
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ConformanceResponse Clone() {
-      return new ConformanceResponse(this);
-    }
-
-    /// <summary>Field number for the "parse_error" field.</summary>
-    public const int ParseErrorFieldNumber = 1;
-    /// <summary>
-    /// This string should be set to indicate parsing failed.  The string can
-    /// provide more information about the parse error if it is available.
-    ///
-    /// Setting this string does not necessarily mean the testee failed the
-    /// test.  Some of the test cases are intentionally invalid input.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string ParseError {
-      get { return resultCase_ == ResultOneofCase.ParseError ? (string) result_ : ""; }
-      set {
-        result_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-        resultCase_ = ResultOneofCase.ParseError;
-      }
-    }
-
-    /// <summary>Field number for the "serialize_error" field.</summary>
-    public const int SerializeErrorFieldNumber = 6;
-    /// <summary>
-    /// If the input was successfully parsed but errors occurred when
-    /// serializing it to the requested output format, set the error message in
-    /// this field.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string SerializeError {
-      get { return resultCase_ == ResultOneofCase.SerializeError ? (string) result_ : ""; }
-      set {
-        result_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-        resultCase_ = ResultOneofCase.SerializeError;
-      }
-    }
-
-    /// <summary>Field number for the "runtime_error" field.</summary>
-    public const int RuntimeErrorFieldNumber = 2;
-    /// <summary>
-    /// This should be set if some other error occurred.  This will always
-    /// indicate that the test failed.  The string can provide more information
-    /// about the failure.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string RuntimeError {
-      get { return resultCase_ == ResultOneofCase.RuntimeError ? (string) result_ : ""; }
-      set {
-        result_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-        resultCase_ = ResultOneofCase.RuntimeError;
-      }
-    }
-
-    /// <summary>Field number for the "protobuf_payload" field.</summary>
-    public const int ProtobufPayloadFieldNumber = 3;
-    /// <summary>
-    /// If the input was successfully parsed and the requested output was
-    /// protobuf, serialize it to protobuf and set it in this field.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pb::ByteString ProtobufPayload {
-      get { return resultCase_ == ResultOneofCase.ProtobufPayload ? (pb::ByteString) result_ : pb::ByteString.Empty; }
-      set {
-        result_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-        resultCase_ = ResultOneofCase.ProtobufPayload;
-      }
-    }
-
-    /// <summary>Field number for the "json_payload" field.</summary>
-    public const int JsonPayloadFieldNumber = 4;
-    /// <summary>
-    /// If the input was successfully parsed and the requested output was JSON,
-    /// serialize to JSON and set it in this field.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string JsonPayload {
-      get { return resultCase_ == ResultOneofCase.JsonPayload ? (string) result_ : ""; }
-      set {
-        result_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-        resultCase_ = ResultOneofCase.JsonPayload;
-      }
-    }
-
-    /// <summary>Field number for the "skipped" field.</summary>
-    public const int SkippedFieldNumber = 5;
-    /// <summary>
-    /// For when the testee skipped the test, likely because a certain feature
-    /// wasn't supported, like JSON input/output.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string Skipped {
-      get { return resultCase_ == ResultOneofCase.Skipped ? (string) result_ : ""; }
-      set {
-        result_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-        resultCase_ = ResultOneofCase.Skipped;
-      }
-    }
-
-    /// <summary>Field number for the "jspb_payload" field.</summary>
-    public const int JspbPayloadFieldNumber = 7;
-    /// <summary>
-    /// If the input was successfully parsed and the requested output was JSPB,
-    /// serialize to JSPB and set it in this field. JSPB is google internal only
-    /// format. Opensource testees can just skip it.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string JspbPayload {
-      get { return resultCase_ == ResultOneofCase.JspbPayload ? (string) result_ : ""; }
-      set {
-        result_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-        resultCase_ = ResultOneofCase.JspbPayload;
-      }
-    }
-
-    /// <summary>Field number for the "text_payload" field.</summary>
-    public const int TextPayloadFieldNumber = 8;
-    /// <summary>
-    /// If the input was successfully parsed and the requested output was
-    /// TEXT_FORMAT, serialize to TEXT_FORMAT and set it in this field.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string TextPayload {
-      get { return resultCase_ == ResultOneofCase.TextPayload ? (string) result_ : ""; }
-      set {
-        result_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-        resultCase_ = ResultOneofCase.TextPayload;
-      }
-    }
-
-    private object result_;
-    /// <summary>Enum of possible cases for the "result" oneof.</summary>
-    public enum ResultOneofCase {
-      None = 0,
-      ParseError = 1,
-      SerializeError = 6,
-      RuntimeError = 2,
-      ProtobufPayload = 3,
-      JsonPayload = 4,
-      Skipped = 5,
-      JspbPayload = 7,
-      TextPayload = 8,
-    }
-    private ResultOneofCase resultCase_ = ResultOneofCase.None;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ResultOneofCase ResultCase {
-      get { return resultCase_; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearResult() {
-      resultCase_ = ResultOneofCase.None;
-      result_ = null;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as ConformanceResponse);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(ConformanceResponse other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (ParseError != other.ParseError) return false;
-      if (SerializeError != other.SerializeError) return false;
-      if (RuntimeError != other.RuntimeError) return false;
-      if (ProtobufPayload != other.ProtobufPayload) return false;
-      if (JsonPayload != other.JsonPayload) return false;
-      if (Skipped != other.Skipped) return false;
-      if (JspbPayload != other.JspbPayload) return false;
-      if (TextPayload != other.TextPayload) return false;
-      if (ResultCase != other.ResultCase) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (resultCase_ == ResultOneofCase.ParseError) hash ^= ParseError.GetHashCode();
-      if (resultCase_ == ResultOneofCase.SerializeError) hash ^= SerializeError.GetHashCode();
-      if (resultCase_ == ResultOneofCase.RuntimeError) hash ^= RuntimeError.GetHashCode();
-      if (resultCase_ == ResultOneofCase.ProtobufPayload) hash ^= ProtobufPayload.GetHashCode();
-      if (resultCase_ == ResultOneofCase.JsonPayload) hash ^= JsonPayload.GetHashCode();
-      if (resultCase_ == ResultOneofCase.Skipped) hash ^= Skipped.GetHashCode();
-      if (resultCase_ == ResultOneofCase.JspbPayload) hash ^= JspbPayload.GetHashCode();
-      if (resultCase_ == ResultOneofCase.TextPayload) hash ^= TextPayload.GetHashCode();
-      hash ^= (int) resultCase_;
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (resultCase_ == ResultOneofCase.ParseError) {
-        output.WriteRawTag(10);
-        output.WriteString(ParseError);
-      }
-      if (resultCase_ == ResultOneofCase.RuntimeError) {
-        output.WriteRawTag(18);
-        output.WriteString(RuntimeError);
-      }
-      if (resultCase_ == ResultOneofCase.ProtobufPayload) {
-        output.WriteRawTag(26);
-        output.WriteBytes(ProtobufPayload);
-      }
-      if (resultCase_ == ResultOneofCase.JsonPayload) {
-        output.WriteRawTag(34);
-        output.WriteString(JsonPayload);
-      }
-      if (resultCase_ == ResultOneofCase.Skipped) {
-        output.WriteRawTag(42);
-        output.WriteString(Skipped);
-      }
-      if (resultCase_ == ResultOneofCase.SerializeError) {
-        output.WriteRawTag(50);
-        output.WriteString(SerializeError);
-      }
-      if (resultCase_ == ResultOneofCase.JspbPayload) {
-        output.WriteRawTag(58);
-        output.WriteString(JspbPayload);
-      }
-      if (resultCase_ == ResultOneofCase.TextPayload) {
-        output.WriteRawTag(66);
-        output.WriteString(TextPayload);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (resultCase_ == ResultOneofCase.ParseError) {
-        output.WriteRawTag(10);
-        output.WriteString(ParseError);
-      }
-      if (resultCase_ == ResultOneofCase.RuntimeError) {
-        output.WriteRawTag(18);
-        output.WriteString(RuntimeError);
-      }
-      if (resultCase_ == ResultOneofCase.ProtobufPayload) {
-        output.WriteRawTag(26);
-        output.WriteBytes(ProtobufPayload);
-      }
-      if (resultCase_ == ResultOneofCase.JsonPayload) {
-        output.WriteRawTag(34);
-        output.WriteString(JsonPayload);
-      }
-      if (resultCase_ == ResultOneofCase.Skipped) {
-        output.WriteRawTag(42);
-        output.WriteString(Skipped);
-      }
-      if (resultCase_ == ResultOneofCase.SerializeError) {
-        output.WriteRawTag(50);
-        output.WriteString(SerializeError);
-      }
-      if (resultCase_ == ResultOneofCase.JspbPayload) {
-        output.WriteRawTag(58);
-        output.WriteString(JspbPayload);
-      }
-      if (resultCase_ == ResultOneofCase.TextPayload) {
-        output.WriteRawTag(66);
-        output.WriteString(TextPayload);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (resultCase_ == ResultOneofCase.ParseError) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(ParseError);
-      }
-      if (resultCase_ == ResultOneofCase.SerializeError) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(SerializeError);
-      }
-      if (resultCase_ == ResultOneofCase.RuntimeError) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(RuntimeError);
-      }
-      if (resultCase_ == ResultOneofCase.ProtobufPayload) {
-        size += 1 + pb::CodedOutputStream.ComputeBytesSize(ProtobufPayload);
-      }
-      if (resultCase_ == ResultOneofCase.JsonPayload) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(JsonPayload);
-      }
-      if (resultCase_ == ResultOneofCase.Skipped) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(Skipped);
-      }
-      if (resultCase_ == ResultOneofCase.JspbPayload) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(JspbPayload);
-      }
-      if (resultCase_ == ResultOneofCase.TextPayload) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(TextPayload);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(ConformanceResponse other) {
-      if (other == null) {
-        return;
-      }
-      switch (other.ResultCase) {
-        case ResultOneofCase.ParseError:
-          ParseError = other.ParseError;
-          break;
-        case ResultOneofCase.SerializeError:
-          SerializeError = other.SerializeError;
-          break;
-        case ResultOneofCase.RuntimeError:
-          RuntimeError = other.RuntimeError;
-          break;
-        case ResultOneofCase.ProtobufPayload:
-          ProtobufPayload = other.ProtobufPayload;
-          break;
-        case ResultOneofCase.JsonPayload:
-          JsonPayload = other.JsonPayload;
-          break;
-        case ResultOneofCase.Skipped:
-          Skipped = other.Skipped;
-          break;
-        case ResultOneofCase.JspbPayload:
-          JspbPayload = other.JspbPayload;
-          break;
-        case ResultOneofCase.TextPayload:
-          TextPayload = other.TextPayload;
-          break;
-      }
-
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 10: {
-            ParseError = input.ReadString();
-            break;
-          }
-          case 18: {
-            RuntimeError = input.ReadString();
-            break;
-          }
-          case 26: {
-            ProtobufPayload = input.ReadBytes();
-            break;
-          }
-          case 34: {
-            JsonPayload = input.ReadString();
-            break;
-          }
-          case 42: {
-            Skipped = input.ReadString();
-            break;
-          }
-          case 50: {
-            SerializeError = input.ReadString();
-            break;
-          }
-          case 58: {
-            JspbPayload = input.ReadString();
-            break;
-          }
-          case 66: {
-            TextPayload = input.ReadString();
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 10: {
-            ParseError = input.ReadString();
-            break;
-          }
-          case 18: {
-            RuntimeError = input.ReadString();
-            break;
-          }
-          case 26: {
-            ProtobufPayload = input.ReadBytes();
-            break;
-          }
-          case 34: {
-            JsonPayload = input.ReadString();
-            break;
-          }
-          case 42: {
-            Skipped = input.ReadString();
-            break;
-          }
-          case 50: {
-            SerializeError = input.ReadString();
-            break;
-          }
-          case 58: {
-            JspbPayload = input.ReadString();
-            break;
-          }
-          case 66: {
-            TextPayload = input.ReadString();
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  /// <summary>
-  /// Encoding options for jspb format.
-  /// </summary>
-  public sealed partial class JspbEncodingConfig : pb::IMessage<JspbEncodingConfig>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<JspbEncodingConfig> _parser = new pb::MessageParser<JspbEncodingConfig>(() => new JspbEncodingConfig());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<JspbEncodingConfig> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Conformance.ConformanceReflection.Descriptor.MessageTypes[3]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public JspbEncodingConfig() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public JspbEncodingConfig(JspbEncodingConfig other) : this() {
-      useJspbArrayAnyFormat_ = other.useJspbArrayAnyFormat_;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public JspbEncodingConfig Clone() {
-      return new JspbEncodingConfig(this);
-    }
-
-    /// <summary>Field number for the "use_jspb_array_any_format" field.</summary>
-    public const int UseJspbArrayAnyFormatFieldNumber = 1;
-    private bool useJspbArrayAnyFormat_;
-    /// <summary>
-    /// Encode the value field of Any as jspb array if true, otherwise binary.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool UseJspbArrayAnyFormat {
-      get { return useJspbArrayAnyFormat_; }
-      set {
-        useJspbArrayAnyFormat_ = value;
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as JspbEncodingConfig);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(JspbEncodingConfig other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (UseJspbArrayAnyFormat != other.UseJspbArrayAnyFormat) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (UseJspbArrayAnyFormat != false) hash ^= UseJspbArrayAnyFormat.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (UseJspbArrayAnyFormat != false) {
-        output.WriteRawTag(8);
-        output.WriteBool(UseJspbArrayAnyFormat);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (UseJspbArrayAnyFormat != false) {
-        output.WriteRawTag(8);
-        output.WriteBool(UseJspbArrayAnyFormat);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (UseJspbArrayAnyFormat != false) {
-        size += 1 + 1;
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(JspbEncodingConfig other) {
-      if (other == null) {
-        return;
-      }
-      if (other.UseJspbArrayAnyFormat != false) {
-        UseJspbArrayAnyFormat = other.UseJspbArrayAnyFormat;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 8: {
-            UseJspbArrayAnyFormat = input.ReadBool();
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 8: {
-            UseJspbArrayAnyFormat = input.ReadBool();
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  #endregion
-
-}
-
-#endregion Designer generated code
diff --git a/libs/protobuf/csharp/src/Google.Protobuf.Conformance/Google.Protobuf.Conformance.csproj b/libs/protobuf/csharp/src/Google.Protobuf.Conformance/Google.Protobuf.Conformance.csproj
deleted file mode 100644
index 6277e68..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf.Conformance/Google.Protobuf.Conformance.csproj
+++ /dev/null
@@ -1,14 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-    <OutputType>Exe</OutputType>
-    <IsPackable>False</IsPackable>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\Google.Protobuf\Google.Protobuf.csproj" />
-    <ProjectReference Include="..\Google.Protobuf.Test\Google.Protobuf.Test.csproj" />
-  </ItemGroup>
-
-</Project>
diff --git a/libs/protobuf/csharp/src/Google.Protobuf.Conformance/Program.cs b/libs/protobuf/csharp/src/Google.Protobuf.Conformance/Program.cs
deleted file mode 100644
index d721ecf..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf.Conformance/Program.cs
+++ /dev/null
@@ -1,178 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using Conformance;
-using Google.Protobuf.Reflection;
-using System;
-using System.IO;
-
-namespace Google.Protobuf.Conformance
-{
-    /// <summary>
-    /// Conformance tests. The test runner will provide JSON or proto data on stdin,
-    /// and this program will produce its output on stdout.
-    /// </summary>
-    class Program
-    {
-        private static void Main(string[] args)
-        {
-            // This way we get the binary streams instead of readers/writers.
-            var input = new BinaryReader(Console.OpenStandardInput());
-            var output = new BinaryWriter(Console.OpenStandardOutput());
-            var typeRegistry = TypeRegistry.FromMessages(
-                ProtobufTestMessages.Proto3.TestAllTypesProto3.Descriptor,
-                ProtobufTestMessages.Proto2.TestAllTypesProto2.Descriptor);
-
-            int count = 0;
-            while (RunTest(input, output, typeRegistry))
-            {
-                count++;
-            }
-            Console.Error.WriteLine("Received EOF after {0} tests", count);
-        }
-
-        private static bool RunTest(BinaryReader input, BinaryWriter output, TypeRegistry typeRegistry)
-        {
-            int? size = ReadInt32(input);
-            if (size == null)
-            {
-                return false;
-            }
-            byte[] inputData = input.ReadBytes(size.Value);
-            if (inputData.Length != size.Value)
-            {
-                throw new EndOfStreamException("Read " + inputData.Length + " bytes of data when expecting " + size);
-            }
-            ConformanceRequest request = ConformanceRequest.Parser.ParseFrom(inputData);
-            ConformanceResponse response = PerformRequest(request, typeRegistry);
-            byte[] outputData = response.ToByteArray();
-            output.Write(outputData.Length);
-            output.Write(outputData);
-            // Ready for another test...
-            return true;
-        }
-
-        private static ConformanceResponse PerformRequest(ConformanceRequest request, TypeRegistry typeRegistry)
-        {
-            ExtensionRegistry proto2ExtensionRegistry = new ExtensionRegistry
-            {
-                ProtobufTestMessages.Proto2.TestMessagesProto2Extensions.ExtensionInt32,
-                ProtobufTestMessages.Proto2.TestAllTypesProto2.Types.MessageSetCorrectExtension1.Extensions.MessageSetExtension,
-                ProtobufTestMessages.Proto2.TestAllTypesProto2.Types.MessageSetCorrectExtension2.Extensions.MessageSetExtension
-            };
-            IMessage message;
-            try
-            {
-                switch (request.PayloadCase)
-                {
-                    case ConformanceRequest.PayloadOneofCase.JsonPayload:
-                        if (request.TestCategory == global::Conformance.TestCategory.JsonIgnoreUnknownParsingTest)
-                        {
-                            return new ConformanceResponse { Skipped = "CSharp doesn't support skipping unknown fields in json parsing." };
-                        }
-                        var parser = new JsonParser(new JsonParser.Settings(20, typeRegistry));
-                        switch (request.MessageType)
-                        {
-                            case "protobuf_test_messages.proto3.TestAllTypesProto3":
-                                message = parser.Parse<ProtobufTestMessages.Proto3.TestAllTypesProto3>(request.JsonPayload);
-                                break;
-                            case "protobuf_test_messages.proto2.TestAllTypesProto2":
-                                message = parser.Parse<ProtobufTestMessages.Proto2.TestAllTypesProto2>(request.JsonPayload);
-                                break;
-                            default:
-                                throw new Exception($" Protobuf request doesn't have specific payload type ({request.MessageType})");
-                        }
-                        break;
-                    case ConformanceRequest.PayloadOneofCase.ProtobufPayload:
-                        switch (request.MessageType)
-                        {
-                            case "protobuf_test_messages.proto3.TestAllTypesProto3":
-                                message = ProtobufTestMessages.Proto3.TestAllTypesProto3.Parser.ParseFrom(request.ProtobufPayload);
-                                break;
-                            case "protobuf_test_messages.proto2.TestAllTypesProto2":
-                                message = ProtobufTestMessages.Proto2.TestAllTypesProto2.Parser
-                                    .WithExtensionRegistry(proto2ExtensionRegistry)
-                                    .ParseFrom(request.ProtobufPayload);
-                                break;
-                            default:
-                                throw new Exception($" Protobuf request doesn't have specific payload type ({request.MessageType})");
-                        }
-                        break;
-					case ConformanceRequest.PayloadOneofCase.TextPayload:
-						return new ConformanceResponse { Skipped = "CSharp doesn't support text format" };
-                    default:
-                        throw new Exception("Unsupported request payload: " + request.PayloadCase);
-                }
-            }
-            catch (InvalidProtocolBufferException e)
-            {
-                return new ConformanceResponse { ParseError = e.Message };
-            }
-            catch (InvalidJsonException e)
-            {
-                return new ConformanceResponse { ParseError = e.Message };
-            }
-            try
-            {
-                switch (request.RequestedOutputFormat)
-                {
-                    case global::Conformance.WireFormat.Json:
-                        var formatter = new JsonFormatter(new JsonFormatter.Settings(false, typeRegistry));
-                        return new ConformanceResponse { JsonPayload = formatter.Format(message) };
-                    case global::Conformance.WireFormat.Protobuf:
-                        return new ConformanceResponse { ProtobufPayload = message.ToByteString() };
-                    default:
-                        throw new Exception("Unsupported request output format: " + request.RequestedOutputFormat);
-                }
-            }
-            catch (InvalidOperationException e)
-            {
-                return new ConformanceResponse { SerializeError = e.Message };
-            }
-        }
-
-        private static int? ReadInt32(BinaryReader input)
-        {
-            byte[] bytes = input.ReadBytes(4);
-            if (bytes.Length == 0)
-            {
-                // Cleanly reached the end of the stream
-                return null;
-            }
-            if (bytes.Length != 4)
-            {
-                throw new EndOfStreamException("Read " + bytes.Length + " bytes of size when expecting 4");
-            }
-            return bytes[0] | (bytes[1] << 8) | (bytes[2] << 16) | (bytes[3] << 24);
-        }
-    }
-}
diff --git a/libs/protobuf/csharp/src/Google.Protobuf.JsonDump/Google.Protobuf.JsonDump.csproj b/libs/protobuf/csharp/src/Google.Protobuf.JsonDump/Google.Protobuf.JsonDump.csproj
deleted file mode 100644
index b2c4272..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf.JsonDump/Google.Protobuf.JsonDump.csproj
+++ /dev/null
@@ -1,13 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-    <OutputType>Exe</OutputType>
-    <IsPackable>False</IsPackable>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\Google.Protobuf\Google.Protobuf.csproj" />
-  </ItemGroup>
-
-</Project>
diff --git a/libs/protobuf/csharp/src/Google.Protobuf.JsonDump/Program.cs b/libs/protobuf/csharp/src/Google.Protobuf.JsonDump/Program.cs
deleted file mode 100644
index 56e32ad..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf.JsonDump/Program.cs
+++ /dev/null
@@ -1,73 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-using System.IO;
-using System.Reflection;
-
-namespace Google.Protobuf.ProtoDump
-{
-    /// <summary>
-    /// Small utility to load a binary message and dump it in JSON format.
-    /// </summary>
-    internal class Program
-    {
-        private static int Main(string[] args)
-        {
-            if (args.Length != 2)
-            {
-                Console.Error.WriteLine("Usage: Google.Protobuf.JsonDump <descriptor type name> <input data>");
-                Console.Error.WriteLine("The descriptor type name is the fully-qualified message name,");
-                Console.Error.WriteLine("including assembly e.g. ProjectNamespace.Message,Company.Project");
-                return 1;
-            }
-            Type type = Type.GetType(args[0]);
-            if (type == null)
-            {
-                Console.Error.WriteLine("Unable to load type {0}.", args[0]);
-                return 1;
-            }
-            if (!typeof(IMessage).GetTypeInfo().IsAssignableFrom(type))
-            {
-                Console.Error.WriteLine("Type {0} doesn't implement IMessage.", args[0]);
-                return 1;
-            }
-            IMessage message = (IMessage) Activator.CreateInstance(type);
-            using (var input = File.OpenRead(args[1]))
-            {
-                message.MergeFrom(input);
-            }
-            Console.WriteLine(message);
-            return 0;
-        }
-    }
-}
\ No newline at end of file
diff --git a/libs/protobuf/csharp/src/Google.Protobuf.Test.TestProtos/ForeignMessagePartial.cs b/libs/protobuf/csharp/src/Google.Protobuf.Test.TestProtos/ForeignMessagePartial.cs
deleted file mode 100644
index 909bcea..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf.Test.TestProtos/ForeignMessagePartial.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2016 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-namespace Google.Protobuf.TestProtos
-{
-    /// <summary>
-    /// A message with custom diagnostics (to test that they work).
-    /// </summary>
-    public partial class ForeignMessage : ICustomDiagnosticMessage
-    {
-        public string ToDiagnosticString()
-        {
-            return string.Format("{{ \"c\": {0}, \"@cInHex\": \"{0:x}\" }}", C);
-        }
-    }
-}
diff --git a/libs/protobuf/csharp/src/Google.Protobuf.Test.TestProtos/Google.Protobuf.Test.TestProtos.csproj b/libs/protobuf/csharp/src/Google.Protobuf.Test.TestProtos/Google.Protobuf.Test.TestProtos.csproj
deleted file mode 100644
index 8d9d64b..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf.Test.TestProtos/Google.Protobuf.Test.TestProtos.csproj
+++ /dev/null
@@ -1,25 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <!--
-    This TestProtos project is kept separate from the original test project for many reasons.
-    It allows us to make sure code can compile on a separate compiler version, different frameworks,
-    and without the internal visibility from the test project (all of which have caused issues in the past).
-  -->
-  <PropertyGroup>
-    <TargetFrameworks>net462;netstandard1.1;netstandard2.0</TargetFrameworks>
-    <LangVersion>3.0</LangVersion>
-    <AssemblyOriginatorKeyFile>../../keys/Google.Protobuf.snk</AssemblyOriginatorKeyFile>
-    <SignAssembly>true</SignAssembly>
-    <IsPackable>False</IsPackable>
-  </PropertyGroup>
-
-  <!-- Needed for the net45 build to work on Unix. See https://github.com/dotnet/designs/pull/33 -->
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2" PrivateAssets="All" />
-  </ItemGroup>
-  
-  <ItemGroup>
-    <ProjectReference Include="..\Google.Protobuf\Google.Protobuf.csproj" />
-  </ItemGroup>
-
-</Project>
diff --git a/libs/protobuf/csharp/src/Google.Protobuf.Test.TestProtos/MapUnittestProto3.cs b/libs/protobuf/csharp/src/Google.Protobuf.Test.TestProtos/MapUnittestProto3.cs
deleted file mode 100644
index 57e59a9..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf.Test.TestProtos/MapUnittestProto3.cs
+++ /dev/null
@@ -1,2277 +0,0 @@
-// <auto-generated>
-//     Generated by the protocol buffer compiler.  DO NOT EDIT!
-//     source: map_unittest_proto3.proto
-// </auto-generated>
-#pragma warning disable 1591, 0612, 3021, 8981
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-namespace Google.Protobuf.TestProtos {
-
-  /// <summary>Holder for reflection information generated from map_unittest_proto3.proto</summary>
-  public static partial class MapUnittestProto3Reflection {
-
-    #region Descriptor
-    /// <summary>File descriptor for map_unittest_proto3.proto</summary>
-    public static pbr::FileDescriptor Descriptor {
-      get { return descriptor; }
-    }
-    private static pbr::FileDescriptor descriptor;
-
-    static MapUnittestProto3Reflection() {
-      byte[] descriptorData = global::System.Convert.FromBase64String(
-          string.Concat(
-            "ChltYXBfdW5pdHRlc3RfcHJvdG8zLnByb3RvEhJwcm90b2J1Zl91bml0dGVz",
-            "dDMaFXVuaXR0ZXN0X3Byb3RvMy5wcm90byKpEgoHVGVzdE1hcBJHCg9tYXBf",
-            "aW50MzJfaW50MzIYASADKAsyLi5wcm90b2J1Zl91bml0dGVzdDMuVGVzdE1h",
-            "cC5NYXBJbnQzMkludDMyRW50cnkSRwoPbWFwX2ludDY0X2ludDY0GAIgAygL",
-            "Mi4ucHJvdG9idWZfdW5pdHRlc3QzLlRlc3RNYXAuTWFwSW50NjRJbnQ2NEVu",
-            "dHJ5EksKEW1hcF91aW50MzJfdWludDMyGAMgAygLMjAucHJvdG9idWZfdW5p",
-            "dHRlc3QzLlRlc3RNYXAuTWFwVWludDMyVWludDMyRW50cnkSSwoRbWFwX3Vp",
-            "bnQ2NF91aW50NjQYBCADKAsyMC5wcm90b2J1Zl91bml0dGVzdDMuVGVzdE1h",
-            "cC5NYXBVaW50NjRVaW50NjRFbnRyeRJLChFtYXBfc2ludDMyX3NpbnQzMhgF",
-            "IAMoCzIwLnByb3RvYnVmX3VuaXR0ZXN0My5UZXN0TWFwLk1hcFNpbnQzMlNp",
-            "bnQzMkVudHJ5EksKEW1hcF9zaW50NjRfc2ludDY0GAYgAygLMjAucHJvdG9i",
-            "dWZfdW5pdHRlc3QzLlRlc3RNYXAuTWFwU2ludDY0U2ludDY0RW50cnkSTwoT",
-            "bWFwX2ZpeGVkMzJfZml4ZWQzMhgHIAMoCzIyLnByb3RvYnVmX3VuaXR0ZXN0",
-            "My5UZXN0TWFwLk1hcEZpeGVkMzJGaXhlZDMyRW50cnkSTwoTbWFwX2ZpeGVk",
-            "NjRfZml4ZWQ2NBgIIAMoCzIyLnByb3RvYnVmX3VuaXR0ZXN0My5UZXN0TWFw",
-            "Lk1hcEZpeGVkNjRGaXhlZDY0RW50cnkSUwoVbWFwX3NmaXhlZDMyX3NmaXhl",
-            "ZDMyGAkgAygLMjQucHJvdG9idWZfdW5pdHRlc3QzLlRlc3RNYXAuTWFwU2Zp",
-            "eGVkMzJTZml4ZWQzMkVudHJ5ElMKFW1hcF9zZml4ZWQ2NF9zZml4ZWQ2NBgK",
-            "IAMoCzI0LnByb3RvYnVmX3VuaXR0ZXN0My5UZXN0TWFwLk1hcFNmaXhlZDY0",
-            "U2ZpeGVkNjRFbnRyeRJHCg9tYXBfaW50MzJfZmxvYXQYCyADKAsyLi5wcm90",
-            "b2J1Zl91bml0dGVzdDMuVGVzdE1hcC5NYXBJbnQzMkZsb2F0RW50cnkSSQoQ",
-            "bWFwX2ludDMyX2RvdWJsZRgMIAMoCzIvLnByb3RvYnVmX3VuaXR0ZXN0My5U",
-            "ZXN0TWFwLk1hcEludDMyRG91YmxlRW50cnkSQwoNbWFwX2Jvb2xfYm9vbBgN",
-            "IAMoCzIsLnByb3RvYnVmX3VuaXR0ZXN0My5UZXN0TWFwLk1hcEJvb2xCb29s",
-            "RW50cnkSSwoRbWFwX3N0cmluZ19zdHJpbmcYDiADKAsyMC5wcm90b2J1Zl91",
-            "bml0dGVzdDMuVGVzdE1hcC5NYXBTdHJpbmdTdHJpbmdFbnRyeRJHCg9tYXBf",
-            "aW50MzJfYnl0ZXMYDyADKAsyLi5wcm90b2J1Zl91bml0dGVzdDMuVGVzdE1h",
-            "cC5NYXBJbnQzMkJ5dGVzRW50cnkSRQoObWFwX2ludDMyX2VudW0YECADKAsy",
-            "LS5wcm90b2J1Zl91bml0dGVzdDMuVGVzdE1hcC5NYXBJbnQzMkVudW1FbnRy",
-            "eRJaChltYXBfaW50MzJfZm9yZWlnbl9tZXNzYWdlGBEgAygLMjcucHJvdG9i",
-            "dWZfdW5pdHRlc3QzLlRlc3RNYXAuTWFwSW50MzJGb3JlaWduTWVzc2FnZUVu",
-            "dHJ5GjQKEk1hcEludDMySW50MzJFbnRyeRILCgNrZXkYASABKAUSDQoFdmFs",
-            "dWUYAiABKAU6AjgBGjQKEk1hcEludDY0SW50NjRFbnRyeRILCgNrZXkYASAB",
-            "KAMSDQoFdmFsdWUYAiABKAM6AjgBGjYKFE1hcFVpbnQzMlVpbnQzMkVudHJ5",
-            "EgsKA2tleRgBIAEoDRINCgV2YWx1ZRgCIAEoDToCOAEaNgoUTWFwVWludDY0",
-            "VWludDY0RW50cnkSCwoDa2V5GAEgASgEEg0KBXZhbHVlGAIgASgEOgI4ARo2",
-            "ChRNYXBTaW50MzJTaW50MzJFbnRyeRILCgNrZXkYASABKBESDQoFdmFsdWUY",
-            "AiABKBE6AjgBGjYKFE1hcFNpbnQ2NFNpbnQ2NEVudHJ5EgsKA2tleRgBIAEo",
-            "EhINCgV2YWx1ZRgCIAEoEjoCOAEaOAoWTWFwRml4ZWQzMkZpeGVkMzJFbnRy",
-            "eRILCgNrZXkYASABKAcSDQoFdmFsdWUYAiABKAc6AjgBGjgKFk1hcEZpeGVk",
-            "NjRGaXhlZDY0RW50cnkSCwoDa2V5GAEgASgGEg0KBXZhbHVlGAIgASgGOgI4",
-            "ARo6ChhNYXBTZml4ZWQzMlNmaXhlZDMyRW50cnkSCwoDa2V5GAEgASgPEg0K",
-            "BXZhbHVlGAIgASgPOgI4ARo6ChhNYXBTZml4ZWQ2NFNmaXhlZDY0RW50cnkS",
-            "CwoDa2V5GAEgASgQEg0KBXZhbHVlGAIgASgQOgI4ARo0ChJNYXBJbnQzMkZs",
-            "b2F0RW50cnkSCwoDa2V5GAEgASgFEg0KBXZhbHVlGAIgASgCOgI4ARo1ChNN",
-            "YXBJbnQzMkRvdWJsZUVudHJ5EgsKA2tleRgBIAEoBRINCgV2YWx1ZRgCIAEo",
-            "AToCOAEaMgoQTWFwQm9vbEJvb2xFbnRyeRILCgNrZXkYASABKAgSDQoFdmFs",
-            "dWUYAiABKAg6AjgBGjYKFE1hcFN0cmluZ1N0cmluZ0VudHJ5EgsKA2tleRgB",
-            "IAEoCRINCgV2YWx1ZRgCIAEoCToCOAEaNAoSTWFwSW50MzJCeXRlc0VudHJ5",
-            "EgsKA2tleRgBIAEoBRINCgV2YWx1ZRgCIAEoDDoCOAEaUAoRTWFwSW50MzJF",
-            "bnVtRW50cnkSCwoDa2V5GAEgASgFEioKBXZhbHVlGAIgASgOMhsucHJvdG9i",
-            "dWZfdW5pdHRlc3QzLk1hcEVudW06AjgBGmEKG01hcEludDMyRm9yZWlnbk1l",
-            "c3NhZ2VFbnRyeRILCgNrZXkYASABKAUSMQoFdmFsdWUYAiABKAsyIi5wcm90",
-            "b2J1Zl91bml0dGVzdDMuRm9yZWlnbk1lc3NhZ2U6AjgBIkIKEVRlc3RNYXBT",
-            "dWJtZXNzYWdlEi0KCHRlc3RfbWFwGAEgASgLMhsucHJvdG9idWZfdW5pdHRl",
-            "c3QzLlRlc3RNYXAivgEKDlRlc3RNZXNzYWdlTWFwElIKEW1hcF9pbnQzMl9t",
-            "ZXNzYWdlGAEgAygLMjcucHJvdG9idWZfdW5pdHRlc3QzLlRlc3RNZXNzYWdl",
-            "TWFwLk1hcEludDMyTWVzc2FnZUVudHJ5GlgKFE1hcEludDMyTWVzc2FnZUVu",
-            "dHJ5EgsKA2tleRgBIAEoBRIvCgV2YWx1ZRgCIAEoCzIgLnByb3RvYnVmX3Vu",
-            "aXR0ZXN0My5UZXN0QWxsVHlwZXM6AjgBIuUBCg9UZXN0U2FtZVR5cGVNYXAS",
-            "OwoEbWFwMRgBIAMoCzItLnByb3RvYnVmX3VuaXR0ZXN0My5UZXN0U2FtZVR5",
-            "cGVNYXAuTWFwMUVudHJ5EjsKBG1hcDIYAiADKAsyLS5wcm90b2J1Zl91bml0",
-            "dGVzdDMuVGVzdFNhbWVUeXBlTWFwLk1hcDJFbnRyeRorCglNYXAxRW50cnkS",
-            "CwoDa2V5GAEgASgFEg0KBXZhbHVlGAIgASgFOgI4ARorCglNYXAyRW50cnkS",
-            "CwoDa2V5GAEgASgFEg0KBXZhbHVlGAIgASgFOgI4ASL1EAoMVGVzdEFyZW5h",
-            "TWFwEkwKD21hcF9pbnQzMl9pbnQzMhgBIAMoCzIzLnByb3RvYnVmX3VuaXR0",
-            "ZXN0My5UZXN0QXJlbmFNYXAuTWFwSW50MzJJbnQzMkVudHJ5EkwKD21hcF9p",
-            "bnQ2NF9pbnQ2NBgCIAMoCzIzLnByb3RvYnVmX3VuaXR0ZXN0My5UZXN0QXJl",
-            "bmFNYXAuTWFwSW50NjRJbnQ2NEVudHJ5ElAKEW1hcF91aW50MzJfdWludDMy",
-            "GAMgAygLMjUucHJvdG9idWZfdW5pdHRlc3QzLlRlc3RBcmVuYU1hcC5NYXBV",
-            "aW50MzJVaW50MzJFbnRyeRJQChFtYXBfdWludDY0X3VpbnQ2NBgEIAMoCzI1",
-            "LnByb3RvYnVmX3VuaXR0ZXN0My5UZXN0QXJlbmFNYXAuTWFwVWludDY0VWlu",
-            "dDY0RW50cnkSUAoRbWFwX3NpbnQzMl9zaW50MzIYBSADKAsyNS5wcm90b2J1",
-            "Zl91bml0dGVzdDMuVGVzdEFyZW5hTWFwLk1hcFNpbnQzMlNpbnQzMkVudHJ5",
-            "ElAKEW1hcF9zaW50NjRfc2ludDY0GAYgAygLMjUucHJvdG9idWZfdW5pdHRl",
-            "c3QzLlRlc3RBcmVuYU1hcC5NYXBTaW50NjRTaW50NjRFbnRyeRJUChNtYXBf",
-            "Zml4ZWQzMl9maXhlZDMyGAcgAygLMjcucHJvdG9idWZfdW5pdHRlc3QzLlRl",
-            "c3RBcmVuYU1hcC5NYXBGaXhlZDMyRml4ZWQzMkVudHJ5ElQKE21hcF9maXhl",
-            "ZDY0X2ZpeGVkNjQYCCADKAsyNy5wcm90b2J1Zl91bml0dGVzdDMuVGVzdEFy",
-            "ZW5hTWFwLk1hcEZpeGVkNjRGaXhlZDY0RW50cnkSWAoVbWFwX3NmaXhlZDMy",
-            "X3NmaXhlZDMyGAkgAygLMjkucHJvdG9idWZfdW5pdHRlc3QzLlRlc3RBcmVu",
-            "YU1hcC5NYXBTZml4ZWQzMlNmaXhlZDMyRW50cnkSWAoVbWFwX3NmaXhlZDY0",
-            "X3NmaXhlZDY0GAogAygLMjkucHJvdG9idWZfdW5pdHRlc3QzLlRlc3RBcmVu",
-            "YU1hcC5NYXBTZml4ZWQ2NFNmaXhlZDY0RW50cnkSTAoPbWFwX2ludDMyX2Zs",
-            "b2F0GAsgAygLMjMucHJvdG9idWZfdW5pdHRlc3QzLlRlc3RBcmVuYU1hcC5N",
-            "YXBJbnQzMkZsb2F0RW50cnkSTgoQbWFwX2ludDMyX2RvdWJsZRgMIAMoCzI0",
-            "LnByb3RvYnVmX3VuaXR0ZXN0My5UZXN0QXJlbmFNYXAuTWFwSW50MzJEb3Vi",
-            "bGVFbnRyeRJICg1tYXBfYm9vbF9ib29sGA0gAygLMjEucHJvdG9idWZfdW5p",
-            "dHRlc3QzLlRlc3RBcmVuYU1hcC5NYXBCb29sQm9vbEVudHJ5EkoKDm1hcF9p",
-            "bnQzMl9lbnVtGA4gAygLMjIucHJvdG9idWZfdW5pdHRlc3QzLlRlc3RBcmVu",
-            "YU1hcC5NYXBJbnQzMkVudW1FbnRyeRJfChltYXBfaW50MzJfZm9yZWlnbl9t",
-            "ZXNzYWdlGA8gAygLMjwucHJvdG9idWZfdW5pdHRlc3QzLlRlc3RBcmVuYU1h",
-            "cC5NYXBJbnQzMkZvcmVpZ25NZXNzYWdlRW50cnkaNAoSTWFwSW50MzJJbnQz",
-            "MkVudHJ5EgsKA2tleRgBIAEoBRINCgV2YWx1ZRgCIAEoBToCOAEaNAoSTWFw",
-            "SW50NjRJbnQ2NEVudHJ5EgsKA2tleRgBIAEoAxINCgV2YWx1ZRgCIAEoAzoC",
-            "OAEaNgoUTWFwVWludDMyVWludDMyRW50cnkSCwoDa2V5GAEgASgNEg0KBXZh",
-            "bHVlGAIgASgNOgI4ARo2ChRNYXBVaW50NjRVaW50NjRFbnRyeRILCgNrZXkY",
-            "ASABKAQSDQoFdmFsdWUYAiABKAQ6AjgBGjYKFE1hcFNpbnQzMlNpbnQzMkVu",
-            "dHJ5EgsKA2tleRgBIAEoERINCgV2YWx1ZRgCIAEoEToCOAEaNgoUTWFwU2lu",
-            "dDY0U2ludDY0RW50cnkSCwoDa2V5GAEgASgSEg0KBXZhbHVlGAIgASgSOgI4",
-            "ARo4ChZNYXBGaXhlZDMyRml4ZWQzMkVudHJ5EgsKA2tleRgBIAEoBxINCgV2",
-            "YWx1ZRgCIAEoBzoCOAEaOAoWTWFwRml4ZWQ2NEZpeGVkNjRFbnRyeRILCgNr",
-            "ZXkYASABKAYSDQoFdmFsdWUYAiABKAY6AjgBGjoKGE1hcFNmaXhlZDMyU2Zp",
-            "eGVkMzJFbnRyeRILCgNrZXkYASABKA8SDQoFdmFsdWUYAiABKA86AjgBGjoK",
-            "GE1hcFNmaXhlZDY0U2ZpeGVkNjRFbnRyeRILCgNrZXkYASABKBASDQoFdmFs",
-            "dWUYAiABKBA6AjgBGjQKEk1hcEludDMyRmxvYXRFbnRyeRILCgNrZXkYASAB",
-            "KAUSDQoFdmFsdWUYAiABKAI6AjgBGjUKE01hcEludDMyRG91YmxlRW50cnkS",
-            "CwoDa2V5GAEgASgFEg0KBXZhbHVlGAIgASgBOgI4ARoyChBNYXBCb29sQm9v",
-            "bEVudHJ5EgsKA2tleRgBIAEoCBINCgV2YWx1ZRgCIAEoCDoCOAEaUAoRTWFw",
-            "SW50MzJFbnVtRW50cnkSCwoDa2V5GAEgASgFEioKBXZhbHVlGAIgASgOMhsu",
-            "cHJvdG9idWZfdW5pdHRlc3QzLk1hcEVudW06AjgBGmEKG01hcEludDMyRm9y",
-            "ZWlnbk1lc3NhZ2VFbnRyeRILCgNrZXkYASABKAUSMQoFdmFsdWUYAiABKAsy",
-            "Ii5wcm90b2J1Zl91bml0dGVzdDMuRm9yZWlnbk1lc3NhZ2U6AjgBIuYBCh9N",
-            "ZXNzYWdlQ29udGFpbmluZ0VudW1DYWxsZWRUeXBlEksKBHR5cGUYASADKAsy",
-            "PS5wcm90b2J1Zl91bml0dGVzdDMuTWVzc2FnZUNvbnRhaW5pbmdFbnVtQ2Fs",
-            "bGVkVHlwZS5UeXBlRW50cnkaYAoJVHlwZUVudHJ5EgsKA2tleRgBIAEoBRJC",
-            "CgV2YWx1ZRgCIAEoCzIzLnByb3RvYnVmX3VuaXR0ZXN0My5NZXNzYWdlQ29u",
-            "dGFpbmluZ0VudW1DYWxsZWRUeXBlOgI4ASIUCgRUeXBlEgwKCFRZUEVfRk9P",
-            "EAAingEKH01lc3NhZ2VDb250YWluaW5nTWFwQ2FsbGVkRW50cnkSTQoFZW50",
-            "cnkYASADKAsyPi5wcm90b2J1Zl91bml0dGVzdDMuTWVzc2FnZUNvbnRhaW5p",
-            "bmdNYXBDYWxsZWRFbnRyeS5FbnRyeUVudHJ5GiwKCkVudHJ5RW50cnkSCwoD",
-            "a2V5GAEgASgFEg0KBXZhbHVlGAIgASgFOgI4ASo/CgdNYXBFbnVtEhAKDE1B",
-            "UF9FTlVNX0ZPTxAAEhAKDE1BUF9FTlVNX0JBUhABEhAKDE1BUF9FTlVNX0JB",
-            "WhACQh2qAhpHb29nbGUuUHJvdG9idWYuVGVzdFByb3Rvc2IGcHJvdG8z"));
-      descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-          new pbr::FileDescriptor[] { global::Google.Protobuf.TestProtos.UnittestProto3Reflection.Descriptor, },
-          new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Google.Protobuf.TestProtos.MapEnum), }, null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.TestMap), global::Google.Protobuf.TestProtos.TestMap.Parser, new[]{ "MapInt32Int32", "MapInt64Int64", "MapUint32Uint32", "MapUint64Uint64", "MapSint32Sint32", "MapSint64Sint64", "MapFixed32Fixed32", "MapFixed64Fixed64", "MapSfixed32Sfixed32", "MapSfixed64Sfixed64", "MapInt32Float", "MapInt32Double", "MapBoolBool", "MapStringString", "MapInt32Bytes", "MapInt32Enum", "MapInt32ForeignMessage" }, null, null, null, new pbr::GeneratedClrTypeInfo[] { null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, }),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.TestMapSubmessage), global::Google.Protobuf.TestProtos.TestMapSubmessage.Parser, new[]{ "TestMap" }, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.TestMessageMap), global::Google.Protobuf.TestProtos.TestMessageMap.Parser, new[]{ "MapInt32Message" }, null, null, null, new pbr::GeneratedClrTypeInfo[] { null, }),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.TestSameTypeMap), global::Google.Protobuf.TestProtos.TestSameTypeMap.Parser, new[]{ "Map1", "Map2" }, null, null, null, new pbr::GeneratedClrTypeInfo[] { null, null, }),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.TestArenaMap), global::Google.Protobuf.TestProtos.TestArenaMap.Parser, new[]{ "MapInt32Int32", "MapInt64Int64", "MapUint32Uint32", "MapUint64Uint64", "MapSint32Sint32", "MapSint64Sint64", "MapFixed32Fixed32", "MapFixed64Fixed64", "MapSfixed32Sfixed32", "MapSfixed64Sfixed64", "MapInt32Float", "MapInt32Double", "MapBoolBool", "MapInt32Enum", "MapInt32ForeignMessage" }, null, null, null, new pbr::GeneratedClrTypeInfo[] { null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, }),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.MessageContainingEnumCalledType), global::Google.Protobuf.TestProtos.MessageContainingEnumCalledType.Parser, new[]{ "Type" }, null, new[]{ typeof(global::Google.Protobuf.TestProtos.MessageContainingEnumCalledType.Types.Type) }, null, new pbr::GeneratedClrTypeInfo[] { null, }),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.MessageContainingMapCalledEntry), global::Google.Protobuf.TestProtos.MessageContainingMapCalledEntry.Parser, new[]{ "Entry" }, null, null, null, new pbr::GeneratedClrTypeInfo[] { null, })
-          }));
-    }
-    #endregion
-
-  }
-  #region Enums
-  public enum MapEnum {
-    [pbr::OriginalName("MAP_ENUM_FOO")] Foo = 0,
-    [pbr::OriginalName("MAP_ENUM_BAR")] Bar = 1,
-    [pbr::OriginalName("MAP_ENUM_BAZ")] Baz = 2,
-  }
-
-  #endregion
-
-  #region Messages
-  /// <summary>
-  /// Tests maps.
-  /// </summary>
-  public sealed partial class TestMap : pb::IMessage<TestMap>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<TestMap> _parser = new pb::MessageParser<TestMap>(() => new TestMap());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<TestMap> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.MapUnittestProto3Reflection.Descriptor.MessageTypes[0]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestMap() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestMap(TestMap other) : this() {
-      mapInt32Int32_ = other.mapInt32Int32_.Clone();
-      mapInt64Int64_ = other.mapInt64Int64_.Clone();
-      mapUint32Uint32_ = other.mapUint32Uint32_.Clone();
-      mapUint64Uint64_ = other.mapUint64Uint64_.Clone();
-      mapSint32Sint32_ = other.mapSint32Sint32_.Clone();
-      mapSint64Sint64_ = other.mapSint64Sint64_.Clone();
-      mapFixed32Fixed32_ = other.mapFixed32Fixed32_.Clone();
-      mapFixed64Fixed64_ = other.mapFixed64Fixed64_.Clone();
-      mapSfixed32Sfixed32_ = other.mapSfixed32Sfixed32_.Clone();
-      mapSfixed64Sfixed64_ = other.mapSfixed64Sfixed64_.Clone();
-      mapInt32Float_ = other.mapInt32Float_.Clone();
-      mapInt32Double_ = other.mapInt32Double_.Clone();
-      mapBoolBool_ = other.mapBoolBool_.Clone();
-      mapStringString_ = other.mapStringString_.Clone();
-      mapInt32Bytes_ = other.mapInt32Bytes_.Clone();
-      mapInt32Enum_ = other.mapInt32Enum_.Clone();
-      mapInt32ForeignMessage_ = other.mapInt32ForeignMessage_.Clone();
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestMap Clone() {
-      return new TestMap(this);
-    }
-
-    /// <summary>Field number for the "map_int32_int32" field.</summary>
-    public const int MapInt32Int32FieldNumber = 1;
-    private static readonly pbc::MapField<int, int>.Codec _map_mapInt32Int32_codec
-        = new pbc::MapField<int, int>.Codec(pb::FieldCodec.ForInt32(8, 0), pb::FieldCodec.ForInt32(16, 0), 10);
-    private readonly pbc::MapField<int, int> mapInt32Int32_ = new pbc::MapField<int, int>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::MapField<int, int> MapInt32Int32 {
-      get { return mapInt32Int32_; }
-    }
-
-    /// <summary>Field number for the "map_int64_int64" field.</summary>
-    public const int MapInt64Int64FieldNumber = 2;
-    private static readonly pbc::MapField<long, long>.Codec _map_mapInt64Int64_codec
-        = new pbc::MapField<long, long>.Codec(pb::FieldCodec.ForInt64(8, 0L), pb::FieldCodec.ForInt64(16, 0L), 18);
-    private readonly pbc::MapField<long, long> mapInt64Int64_ = new pbc::MapField<long, long>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::MapField<long, long> MapInt64Int64 {
-      get { return mapInt64Int64_; }
-    }
-
-    /// <summary>Field number for the "map_uint32_uint32" field.</summary>
-    public const int MapUint32Uint32FieldNumber = 3;
-    private static readonly pbc::MapField<uint, uint>.Codec _map_mapUint32Uint32_codec
-        = new pbc::MapField<uint, uint>.Codec(pb::FieldCodec.ForUInt32(8, 0), pb::FieldCodec.ForUInt32(16, 0), 26);
-    private readonly pbc::MapField<uint, uint> mapUint32Uint32_ = new pbc::MapField<uint, uint>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::MapField<uint, uint> MapUint32Uint32 {
-      get { return mapUint32Uint32_; }
-    }
-
-    /// <summary>Field number for the "map_uint64_uint64" field.</summary>
-    public const int MapUint64Uint64FieldNumber = 4;
-    private static readonly pbc::MapField<ulong, ulong>.Codec _map_mapUint64Uint64_codec
-        = new pbc::MapField<ulong, ulong>.Codec(pb::FieldCodec.ForUInt64(8, 0UL), pb::FieldCodec.ForUInt64(16, 0UL), 34);
-    private readonly pbc::MapField<ulong, ulong> mapUint64Uint64_ = new pbc::MapField<ulong, ulong>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::MapField<ulong, ulong> MapUint64Uint64 {
-      get { return mapUint64Uint64_; }
-    }
-
-    /// <summary>Field number for the "map_sint32_sint32" field.</summary>
-    public const int MapSint32Sint32FieldNumber = 5;
-    private static readonly pbc::MapField<int, int>.Codec _map_mapSint32Sint32_codec
-        = new pbc::MapField<int, int>.Codec(pb::FieldCodec.ForSInt32(8, 0), pb::FieldCodec.ForSInt32(16, 0), 42);
-    private readonly pbc::MapField<int, int> mapSint32Sint32_ = new pbc::MapField<int, int>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::MapField<int, int> MapSint32Sint32 {
-      get { return mapSint32Sint32_; }
-    }
-
-    /// <summary>Field number for the "map_sint64_sint64" field.</summary>
-    public const int MapSint64Sint64FieldNumber = 6;
-    private static readonly pbc::MapField<long, long>.Codec _map_mapSint64Sint64_codec
-        = new pbc::MapField<long, long>.Codec(pb::FieldCodec.ForSInt64(8, 0L), pb::FieldCodec.ForSInt64(16, 0L), 50);
-    private readonly pbc::MapField<long, long> mapSint64Sint64_ = new pbc::MapField<long, long>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::MapField<long, long> MapSint64Sint64 {
-      get { return mapSint64Sint64_; }
-    }
-
-    /// <summary>Field number for the "map_fixed32_fixed32" field.</summary>
-    public const int MapFixed32Fixed32FieldNumber = 7;
-    private static readonly pbc::MapField<uint, uint>.Codec _map_mapFixed32Fixed32_codec
-        = new pbc::MapField<uint, uint>.Codec(pb::FieldCodec.ForFixed32(13, 0), pb::FieldCodec.ForFixed32(21, 0), 58);
-    private readonly pbc::MapField<uint, uint> mapFixed32Fixed32_ = new pbc::MapField<uint, uint>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::MapField<uint, uint> MapFixed32Fixed32 {
-      get { return mapFixed32Fixed32_; }
-    }
-
-    /// <summary>Field number for the "map_fixed64_fixed64" field.</summary>
-    public const int MapFixed64Fixed64FieldNumber = 8;
-    private static readonly pbc::MapField<ulong, ulong>.Codec _map_mapFixed64Fixed64_codec
-        = new pbc::MapField<ulong, ulong>.Codec(pb::FieldCodec.ForFixed64(9, 0UL), pb::FieldCodec.ForFixed64(17, 0UL), 66);
-    private readonly pbc::MapField<ulong, ulong> mapFixed64Fixed64_ = new pbc::MapField<ulong, ulong>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::MapField<ulong, ulong> MapFixed64Fixed64 {
-      get { return mapFixed64Fixed64_; }
-    }
-
-    /// <summary>Field number for the "map_sfixed32_sfixed32" field.</summary>
-    public const int MapSfixed32Sfixed32FieldNumber = 9;
-    private static readonly pbc::MapField<int, int>.Codec _map_mapSfixed32Sfixed32_codec
-        = new pbc::MapField<int, int>.Codec(pb::FieldCodec.ForSFixed32(13, 0), pb::FieldCodec.ForSFixed32(21, 0), 74);
-    private readonly pbc::MapField<int, int> mapSfixed32Sfixed32_ = new pbc::MapField<int, int>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::MapField<int, int> MapSfixed32Sfixed32 {
-      get { return mapSfixed32Sfixed32_; }
-    }
-
-    /// <summary>Field number for the "map_sfixed64_sfixed64" field.</summary>
-    public const int MapSfixed64Sfixed64FieldNumber = 10;
-    private static readonly pbc::MapField<long, long>.Codec _map_mapSfixed64Sfixed64_codec
-        = new pbc::MapField<long, long>.Codec(pb::FieldCodec.ForSFixed64(9, 0L), pb::FieldCodec.ForSFixed64(17, 0L), 82);
-    private readonly pbc::MapField<long, long> mapSfixed64Sfixed64_ = new pbc::MapField<long, long>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::MapField<long, long> MapSfixed64Sfixed64 {
-      get { return mapSfixed64Sfixed64_; }
-    }
-
-    /// <summary>Field number for the "map_int32_float" field.</summary>
-    public const int MapInt32FloatFieldNumber = 11;
-    private static readonly pbc::MapField<int, float>.Codec _map_mapInt32Float_codec
-        = new pbc::MapField<int, float>.Codec(pb::FieldCodec.ForInt32(8, 0), pb::FieldCodec.ForFloat(21, 0F), 90);
-    private readonly pbc::MapField<int, float> mapInt32Float_ = new pbc::MapField<int, float>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::MapField<int, float> MapInt32Float {
-      get { return mapInt32Float_; }
-    }
-
-    /// <summary>Field number for the "map_int32_double" field.</summary>
-    public const int MapInt32DoubleFieldNumber = 12;
-    private static readonly pbc::MapField<int, double>.Codec _map_mapInt32Double_codec
-        = new pbc::MapField<int, double>.Codec(pb::FieldCodec.ForInt32(8, 0), pb::FieldCodec.ForDouble(17, 0D), 98);
-    private readonly pbc::MapField<int, double> mapInt32Double_ = new pbc::MapField<int, double>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::MapField<int, double> MapInt32Double {
-      get { return mapInt32Double_; }
-    }
-
-    /// <summary>Field number for the "map_bool_bool" field.</summary>
-    public const int MapBoolBoolFieldNumber = 13;
-    private static readonly pbc::MapField<bool, bool>.Codec _map_mapBoolBool_codec
-        = new pbc::MapField<bool, bool>.Codec(pb::FieldCodec.ForBool(8, false), pb::FieldCodec.ForBool(16, false), 106);
-    private readonly pbc::MapField<bool, bool> mapBoolBool_ = new pbc::MapField<bool, bool>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::MapField<bool, bool> MapBoolBool {
-      get { return mapBoolBool_; }
-    }
-
-    /// <summary>Field number for the "map_string_string" field.</summary>
-    public const int MapStringStringFieldNumber = 14;
-    private static readonly pbc::MapField<string, string>.Codec _map_mapStringString_codec
-        = new pbc::MapField<string, string>.Codec(pb::FieldCodec.ForString(10, ""), pb::FieldCodec.ForString(18, ""), 114);
-    private readonly pbc::MapField<string, string> mapStringString_ = new pbc::MapField<string, string>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::MapField<string, string> MapStringString {
-      get { return mapStringString_; }
-    }
-
-    /// <summary>Field number for the "map_int32_bytes" field.</summary>
-    public const int MapInt32BytesFieldNumber = 15;
-    private static readonly pbc::MapField<int, pb::ByteString>.Codec _map_mapInt32Bytes_codec
-        = new pbc::MapField<int, pb::ByteString>.Codec(pb::FieldCodec.ForInt32(8, 0), pb::FieldCodec.ForBytes(18, pb::ByteString.Empty), 122);
-    private readonly pbc::MapField<int, pb::ByteString> mapInt32Bytes_ = new pbc::MapField<int, pb::ByteString>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::MapField<int, pb::ByteString> MapInt32Bytes {
-      get { return mapInt32Bytes_; }
-    }
-
-    /// <summary>Field number for the "map_int32_enum" field.</summary>
-    public const int MapInt32EnumFieldNumber = 16;
-    private static readonly pbc::MapField<int, global::Google.Protobuf.TestProtos.MapEnum>.Codec _map_mapInt32Enum_codec
-        = new pbc::MapField<int, global::Google.Protobuf.TestProtos.MapEnum>.Codec(pb::FieldCodec.ForInt32(8, 0), pb::FieldCodec.ForEnum(16, x => (int) x, x => (global::Google.Protobuf.TestProtos.MapEnum) x, global::Google.Protobuf.TestProtos.MapEnum.Foo), 130);
-    private readonly pbc::MapField<int, global::Google.Protobuf.TestProtos.MapEnum> mapInt32Enum_ = new pbc::MapField<int, global::Google.Protobuf.TestProtos.MapEnum>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::MapField<int, global::Google.Protobuf.TestProtos.MapEnum> MapInt32Enum {
-      get { return mapInt32Enum_; }
-    }
-
-    /// <summary>Field number for the "map_int32_foreign_message" field.</summary>
-    public const int MapInt32ForeignMessageFieldNumber = 17;
-    private static readonly pbc::MapField<int, global::Google.Protobuf.TestProtos.ForeignMessage>.Codec _map_mapInt32ForeignMessage_codec
-        = new pbc::MapField<int, global::Google.Protobuf.TestProtos.ForeignMessage>.Codec(pb::FieldCodec.ForInt32(8, 0), pb::FieldCodec.ForMessage(18, global::Google.Protobuf.TestProtos.ForeignMessage.Parser), 138);
-    private readonly pbc::MapField<int, global::Google.Protobuf.TestProtos.ForeignMessage> mapInt32ForeignMessage_ = new pbc::MapField<int, global::Google.Protobuf.TestProtos.ForeignMessage>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::MapField<int, global::Google.Protobuf.TestProtos.ForeignMessage> MapInt32ForeignMessage {
-      get { return mapInt32ForeignMessage_; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as TestMap);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(TestMap other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (!MapInt32Int32.Equals(other.MapInt32Int32)) return false;
-      if (!MapInt64Int64.Equals(other.MapInt64Int64)) return false;
-      if (!MapUint32Uint32.Equals(other.MapUint32Uint32)) return false;
-      if (!MapUint64Uint64.Equals(other.MapUint64Uint64)) return false;
-      if (!MapSint32Sint32.Equals(other.MapSint32Sint32)) return false;
-      if (!MapSint64Sint64.Equals(other.MapSint64Sint64)) return false;
-      if (!MapFixed32Fixed32.Equals(other.MapFixed32Fixed32)) return false;
-      if (!MapFixed64Fixed64.Equals(other.MapFixed64Fixed64)) return false;
-      if (!MapSfixed32Sfixed32.Equals(other.MapSfixed32Sfixed32)) return false;
-      if (!MapSfixed64Sfixed64.Equals(other.MapSfixed64Sfixed64)) return false;
-      if (!MapInt32Float.Equals(other.MapInt32Float)) return false;
-      if (!MapInt32Double.Equals(other.MapInt32Double)) return false;
-      if (!MapBoolBool.Equals(other.MapBoolBool)) return false;
-      if (!MapStringString.Equals(other.MapStringString)) return false;
-      if (!MapInt32Bytes.Equals(other.MapInt32Bytes)) return false;
-      if (!MapInt32Enum.Equals(other.MapInt32Enum)) return false;
-      if (!MapInt32ForeignMessage.Equals(other.MapInt32ForeignMessage)) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      hash ^= MapInt32Int32.GetHashCode();
-      hash ^= MapInt64Int64.GetHashCode();
-      hash ^= MapUint32Uint32.GetHashCode();
-      hash ^= MapUint64Uint64.GetHashCode();
-      hash ^= MapSint32Sint32.GetHashCode();
-      hash ^= MapSint64Sint64.GetHashCode();
-      hash ^= MapFixed32Fixed32.GetHashCode();
-      hash ^= MapFixed64Fixed64.GetHashCode();
-      hash ^= MapSfixed32Sfixed32.GetHashCode();
-      hash ^= MapSfixed64Sfixed64.GetHashCode();
-      hash ^= MapInt32Float.GetHashCode();
-      hash ^= MapInt32Double.GetHashCode();
-      hash ^= MapBoolBool.GetHashCode();
-      hash ^= MapStringString.GetHashCode();
-      hash ^= MapInt32Bytes.GetHashCode();
-      hash ^= MapInt32Enum.GetHashCode();
-      hash ^= MapInt32ForeignMessage.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      mapInt32Int32_.WriteTo(output, _map_mapInt32Int32_codec);
-      mapInt64Int64_.WriteTo(output, _map_mapInt64Int64_codec);
-      mapUint32Uint32_.WriteTo(output, _map_mapUint32Uint32_codec);
-      mapUint64Uint64_.WriteTo(output, _map_mapUint64Uint64_codec);
-      mapSint32Sint32_.WriteTo(output, _map_mapSint32Sint32_codec);
-      mapSint64Sint64_.WriteTo(output, _map_mapSint64Sint64_codec);
-      mapFixed32Fixed32_.WriteTo(output, _map_mapFixed32Fixed32_codec);
-      mapFixed64Fixed64_.WriteTo(output, _map_mapFixed64Fixed64_codec);
-      mapSfixed32Sfixed32_.WriteTo(output, _map_mapSfixed32Sfixed32_codec);
-      mapSfixed64Sfixed64_.WriteTo(output, _map_mapSfixed64Sfixed64_codec);
-      mapInt32Float_.WriteTo(output, _map_mapInt32Float_codec);
-      mapInt32Double_.WriteTo(output, _map_mapInt32Double_codec);
-      mapBoolBool_.WriteTo(output, _map_mapBoolBool_codec);
-      mapStringString_.WriteTo(output, _map_mapStringString_codec);
-      mapInt32Bytes_.WriteTo(output, _map_mapInt32Bytes_codec);
-      mapInt32Enum_.WriteTo(output, _map_mapInt32Enum_codec);
-      mapInt32ForeignMessage_.WriteTo(output, _map_mapInt32ForeignMessage_codec);
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      mapInt32Int32_.WriteTo(ref output, _map_mapInt32Int32_codec);
-      mapInt64Int64_.WriteTo(ref output, _map_mapInt64Int64_codec);
-      mapUint32Uint32_.WriteTo(ref output, _map_mapUint32Uint32_codec);
-      mapUint64Uint64_.WriteTo(ref output, _map_mapUint64Uint64_codec);
-      mapSint32Sint32_.WriteTo(ref output, _map_mapSint32Sint32_codec);
-      mapSint64Sint64_.WriteTo(ref output, _map_mapSint64Sint64_codec);
-      mapFixed32Fixed32_.WriteTo(ref output, _map_mapFixed32Fixed32_codec);
-      mapFixed64Fixed64_.WriteTo(ref output, _map_mapFixed64Fixed64_codec);
-      mapSfixed32Sfixed32_.WriteTo(ref output, _map_mapSfixed32Sfixed32_codec);
-      mapSfixed64Sfixed64_.WriteTo(ref output, _map_mapSfixed64Sfixed64_codec);
-      mapInt32Float_.WriteTo(ref output, _map_mapInt32Float_codec);
-      mapInt32Double_.WriteTo(ref output, _map_mapInt32Double_codec);
-      mapBoolBool_.WriteTo(ref output, _map_mapBoolBool_codec);
-      mapStringString_.WriteTo(ref output, _map_mapStringString_codec);
-      mapInt32Bytes_.WriteTo(ref output, _map_mapInt32Bytes_codec);
-      mapInt32Enum_.WriteTo(ref output, _map_mapInt32Enum_codec);
-      mapInt32ForeignMessage_.WriteTo(ref output, _map_mapInt32ForeignMessage_codec);
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      size += mapInt32Int32_.CalculateSize(_map_mapInt32Int32_codec);
-      size += mapInt64Int64_.CalculateSize(_map_mapInt64Int64_codec);
-      size += mapUint32Uint32_.CalculateSize(_map_mapUint32Uint32_codec);
-      size += mapUint64Uint64_.CalculateSize(_map_mapUint64Uint64_codec);
-      size += mapSint32Sint32_.CalculateSize(_map_mapSint32Sint32_codec);
-      size += mapSint64Sint64_.CalculateSize(_map_mapSint64Sint64_codec);
-      size += mapFixed32Fixed32_.CalculateSize(_map_mapFixed32Fixed32_codec);
-      size += mapFixed64Fixed64_.CalculateSize(_map_mapFixed64Fixed64_codec);
-      size += mapSfixed32Sfixed32_.CalculateSize(_map_mapSfixed32Sfixed32_codec);
-      size += mapSfixed64Sfixed64_.CalculateSize(_map_mapSfixed64Sfixed64_codec);
-      size += mapInt32Float_.CalculateSize(_map_mapInt32Float_codec);
-      size += mapInt32Double_.CalculateSize(_map_mapInt32Double_codec);
-      size += mapBoolBool_.CalculateSize(_map_mapBoolBool_codec);
-      size += mapStringString_.CalculateSize(_map_mapStringString_codec);
-      size += mapInt32Bytes_.CalculateSize(_map_mapInt32Bytes_codec);
-      size += mapInt32Enum_.CalculateSize(_map_mapInt32Enum_codec);
-      size += mapInt32ForeignMessage_.CalculateSize(_map_mapInt32ForeignMessage_codec);
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(TestMap other) {
-      if (other == null) {
-        return;
-      }
-      mapInt32Int32_.Add(other.mapInt32Int32_);
-      mapInt64Int64_.Add(other.mapInt64Int64_);
-      mapUint32Uint32_.Add(other.mapUint32Uint32_);
-      mapUint64Uint64_.Add(other.mapUint64Uint64_);
-      mapSint32Sint32_.Add(other.mapSint32Sint32_);
-      mapSint64Sint64_.Add(other.mapSint64Sint64_);
-      mapFixed32Fixed32_.Add(other.mapFixed32Fixed32_);
-      mapFixed64Fixed64_.Add(other.mapFixed64Fixed64_);
-      mapSfixed32Sfixed32_.Add(other.mapSfixed32Sfixed32_);
-      mapSfixed64Sfixed64_.Add(other.mapSfixed64Sfixed64_);
-      mapInt32Float_.Add(other.mapInt32Float_);
-      mapInt32Double_.Add(other.mapInt32Double_);
-      mapBoolBool_.Add(other.mapBoolBool_);
-      mapStringString_.Add(other.mapStringString_);
-      mapInt32Bytes_.Add(other.mapInt32Bytes_);
-      mapInt32Enum_.Add(other.mapInt32Enum_);
-      mapInt32ForeignMessage_.Add(other.mapInt32ForeignMessage_);
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 10: {
-            mapInt32Int32_.AddEntriesFrom(input, _map_mapInt32Int32_codec);
-            break;
-          }
-          case 18: {
-            mapInt64Int64_.AddEntriesFrom(input, _map_mapInt64Int64_codec);
-            break;
-          }
-          case 26: {
-            mapUint32Uint32_.AddEntriesFrom(input, _map_mapUint32Uint32_codec);
-            break;
-          }
-          case 34: {
-            mapUint64Uint64_.AddEntriesFrom(input, _map_mapUint64Uint64_codec);
-            break;
-          }
-          case 42: {
-            mapSint32Sint32_.AddEntriesFrom(input, _map_mapSint32Sint32_codec);
-            break;
-          }
-          case 50: {
-            mapSint64Sint64_.AddEntriesFrom(input, _map_mapSint64Sint64_codec);
-            break;
-          }
-          case 58: {
-            mapFixed32Fixed32_.AddEntriesFrom(input, _map_mapFixed32Fixed32_codec);
-            break;
-          }
-          case 66: {
-            mapFixed64Fixed64_.AddEntriesFrom(input, _map_mapFixed64Fixed64_codec);
-            break;
-          }
-          case 74: {
-            mapSfixed32Sfixed32_.AddEntriesFrom(input, _map_mapSfixed32Sfixed32_codec);
-            break;
-          }
-          case 82: {
-            mapSfixed64Sfixed64_.AddEntriesFrom(input, _map_mapSfixed64Sfixed64_codec);
-            break;
-          }
-          case 90: {
-            mapInt32Float_.AddEntriesFrom(input, _map_mapInt32Float_codec);
-            break;
-          }
-          case 98: {
-            mapInt32Double_.AddEntriesFrom(input, _map_mapInt32Double_codec);
-            break;
-          }
-          case 106: {
-            mapBoolBool_.AddEntriesFrom(input, _map_mapBoolBool_codec);
-            break;
-          }
-          case 114: {
-            mapStringString_.AddEntriesFrom(input, _map_mapStringString_codec);
-            break;
-          }
-          case 122: {
-            mapInt32Bytes_.AddEntriesFrom(input, _map_mapInt32Bytes_codec);
-            break;
-          }
-          case 130: {
-            mapInt32Enum_.AddEntriesFrom(input, _map_mapInt32Enum_codec);
-            break;
-          }
-          case 138: {
-            mapInt32ForeignMessage_.AddEntriesFrom(input, _map_mapInt32ForeignMessage_codec);
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 10: {
-            mapInt32Int32_.AddEntriesFrom(ref input, _map_mapInt32Int32_codec);
-            break;
-          }
-          case 18: {
-            mapInt64Int64_.AddEntriesFrom(ref input, _map_mapInt64Int64_codec);
-            break;
-          }
-          case 26: {
-            mapUint32Uint32_.AddEntriesFrom(ref input, _map_mapUint32Uint32_codec);
-            break;
-          }
-          case 34: {
-            mapUint64Uint64_.AddEntriesFrom(ref input, _map_mapUint64Uint64_codec);
-            break;
-          }
-          case 42: {
-            mapSint32Sint32_.AddEntriesFrom(ref input, _map_mapSint32Sint32_codec);
-            break;
-          }
-          case 50: {
-            mapSint64Sint64_.AddEntriesFrom(ref input, _map_mapSint64Sint64_codec);
-            break;
-          }
-          case 58: {
-            mapFixed32Fixed32_.AddEntriesFrom(ref input, _map_mapFixed32Fixed32_codec);
-            break;
-          }
-          case 66: {
-            mapFixed64Fixed64_.AddEntriesFrom(ref input, _map_mapFixed64Fixed64_codec);
-            break;
-          }
-          case 74: {
-            mapSfixed32Sfixed32_.AddEntriesFrom(ref input, _map_mapSfixed32Sfixed32_codec);
-            break;
-          }
-          case 82: {
-            mapSfixed64Sfixed64_.AddEntriesFrom(ref input, _map_mapSfixed64Sfixed64_codec);
-            break;
-          }
-          case 90: {
-            mapInt32Float_.AddEntriesFrom(ref input, _map_mapInt32Float_codec);
-            break;
-          }
-          case 98: {
-            mapInt32Double_.AddEntriesFrom(ref input, _map_mapInt32Double_codec);
-            break;
-          }
-          case 106: {
-            mapBoolBool_.AddEntriesFrom(ref input, _map_mapBoolBool_codec);
-            break;
-          }
-          case 114: {
-            mapStringString_.AddEntriesFrom(ref input, _map_mapStringString_codec);
-            break;
-          }
-          case 122: {
-            mapInt32Bytes_.AddEntriesFrom(ref input, _map_mapInt32Bytes_codec);
-            break;
-          }
-          case 130: {
-            mapInt32Enum_.AddEntriesFrom(ref input, _map_mapInt32Enum_codec);
-            break;
-          }
-          case 138: {
-            mapInt32ForeignMessage_.AddEntriesFrom(ref input, _map_mapInt32ForeignMessage_codec);
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  public sealed partial class TestMapSubmessage : pb::IMessage<TestMapSubmessage>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<TestMapSubmessage> _parser = new pb::MessageParser<TestMapSubmessage>(() => new TestMapSubmessage());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<TestMapSubmessage> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.MapUnittestProto3Reflection.Descriptor.MessageTypes[1]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestMapSubmessage() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestMapSubmessage(TestMapSubmessage other) : this() {
-      testMap_ = other.testMap_ != null ? other.testMap_.Clone() : null;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestMapSubmessage Clone() {
-      return new TestMapSubmessage(this);
-    }
-
-    /// <summary>Field number for the "test_map" field.</summary>
-    public const int TestMapFieldNumber = 1;
-    private global::Google.Protobuf.TestProtos.TestMap testMap_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.TestProtos.TestMap TestMap {
-      get { return testMap_; }
-      set {
-        testMap_ = value;
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as TestMapSubmessage);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(TestMapSubmessage other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (!object.Equals(TestMap, other.TestMap)) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (testMap_ != null) hash ^= TestMap.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (testMap_ != null) {
-        output.WriteRawTag(10);
-        output.WriteMessage(TestMap);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (testMap_ != null) {
-        output.WriteRawTag(10);
-        output.WriteMessage(TestMap);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (testMap_ != null) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(TestMap);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(TestMapSubmessage other) {
-      if (other == null) {
-        return;
-      }
-      if (other.testMap_ != null) {
-        if (testMap_ == null) {
-          TestMap = new global::Google.Protobuf.TestProtos.TestMap();
-        }
-        TestMap.MergeFrom(other.TestMap);
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 10: {
-            if (testMap_ == null) {
-              TestMap = new global::Google.Protobuf.TestProtos.TestMap();
-            }
-            input.ReadMessage(TestMap);
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 10: {
-            if (testMap_ == null) {
-              TestMap = new global::Google.Protobuf.TestProtos.TestMap();
-            }
-            input.ReadMessage(TestMap);
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  public sealed partial class TestMessageMap : pb::IMessage<TestMessageMap>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<TestMessageMap> _parser = new pb::MessageParser<TestMessageMap>(() => new TestMessageMap());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<TestMessageMap> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.MapUnittestProto3Reflection.Descriptor.MessageTypes[2]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestMessageMap() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestMessageMap(TestMessageMap other) : this() {
-      mapInt32Message_ = other.mapInt32Message_.Clone();
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestMessageMap Clone() {
-      return new TestMessageMap(this);
-    }
-
-    /// <summary>Field number for the "map_int32_message" field.</summary>
-    public const int MapInt32MessageFieldNumber = 1;
-    private static readonly pbc::MapField<int, global::Google.Protobuf.TestProtos.TestAllTypes>.Codec _map_mapInt32Message_codec
-        = new pbc::MapField<int, global::Google.Protobuf.TestProtos.TestAllTypes>.Codec(pb::FieldCodec.ForInt32(8, 0), pb::FieldCodec.ForMessage(18, global::Google.Protobuf.TestProtos.TestAllTypes.Parser), 10);
-    private readonly pbc::MapField<int, global::Google.Protobuf.TestProtos.TestAllTypes> mapInt32Message_ = new pbc::MapField<int, global::Google.Protobuf.TestProtos.TestAllTypes>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::MapField<int, global::Google.Protobuf.TestProtos.TestAllTypes> MapInt32Message {
-      get { return mapInt32Message_; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as TestMessageMap);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(TestMessageMap other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (!MapInt32Message.Equals(other.MapInt32Message)) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      hash ^= MapInt32Message.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      mapInt32Message_.WriteTo(output, _map_mapInt32Message_codec);
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      mapInt32Message_.WriteTo(ref output, _map_mapInt32Message_codec);
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      size += mapInt32Message_.CalculateSize(_map_mapInt32Message_codec);
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(TestMessageMap other) {
-      if (other == null) {
-        return;
-      }
-      mapInt32Message_.Add(other.mapInt32Message_);
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 10: {
-            mapInt32Message_.AddEntriesFrom(input, _map_mapInt32Message_codec);
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 10: {
-            mapInt32Message_.AddEntriesFrom(ref input, _map_mapInt32Message_codec);
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  /// <summary>
-  /// Two map fields share the same entry default instance.
-  /// </summary>
-  public sealed partial class TestSameTypeMap : pb::IMessage<TestSameTypeMap>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<TestSameTypeMap> _parser = new pb::MessageParser<TestSameTypeMap>(() => new TestSameTypeMap());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<TestSameTypeMap> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.MapUnittestProto3Reflection.Descriptor.MessageTypes[3]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestSameTypeMap() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestSameTypeMap(TestSameTypeMap other) : this() {
-      map1_ = other.map1_.Clone();
-      map2_ = other.map2_.Clone();
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestSameTypeMap Clone() {
-      return new TestSameTypeMap(this);
-    }
-
-    /// <summary>Field number for the "map1" field.</summary>
-    public const int Map1FieldNumber = 1;
-    private static readonly pbc::MapField<int, int>.Codec _map_map1_codec
-        = new pbc::MapField<int, int>.Codec(pb::FieldCodec.ForInt32(8, 0), pb::FieldCodec.ForInt32(16, 0), 10);
-    private readonly pbc::MapField<int, int> map1_ = new pbc::MapField<int, int>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::MapField<int, int> Map1 {
-      get { return map1_; }
-    }
-
-    /// <summary>Field number for the "map2" field.</summary>
-    public const int Map2FieldNumber = 2;
-    private static readonly pbc::MapField<int, int>.Codec _map_map2_codec
-        = new pbc::MapField<int, int>.Codec(pb::FieldCodec.ForInt32(8, 0), pb::FieldCodec.ForInt32(16, 0), 18);
-    private readonly pbc::MapField<int, int> map2_ = new pbc::MapField<int, int>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::MapField<int, int> Map2 {
-      get { return map2_; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as TestSameTypeMap);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(TestSameTypeMap other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (!Map1.Equals(other.Map1)) return false;
-      if (!Map2.Equals(other.Map2)) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      hash ^= Map1.GetHashCode();
-      hash ^= Map2.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      map1_.WriteTo(output, _map_map1_codec);
-      map2_.WriteTo(output, _map_map2_codec);
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      map1_.WriteTo(ref output, _map_map1_codec);
-      map2_.WriteTo(ref output, _map_map2_codec);
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      size += map1_.CalculateSize(_map_map1_codec);
-      size += map2_.CalculateSize(_map_map2_codec);
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(TestSameTypeMap other) {
-      if (other == null) {
-        return;
-      }
-      map1_.Add(other.map1_);
-      map2_.Add(other.map2_);
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 10: {
-            map1_.AddEntriesFrom(input, _map_map1_codec);
-            break;
-          }
-          case 18: {
-            map2_.AddEntriesFrom(input, _map_map2_codec);
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 10: {
-            map1_.AddEntriesFrom(ref input, _map_map1_codec);
-            break;
-          }
-          case 18: {
-            map2_.AddEntriesFrom(ref input, _map_map2_codec);
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  public sealed partial class TestArenaMap : pb::IMessage<TestArenaMap>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<TestArenaMap> _parser = new pb::MessageParser<TestArenaMap>(() => new TestArenaMap());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<TestArenaMap> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.MapUnittestProto3Reflection.Descriptor.MessageTypes[4]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestArenaMap() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestArenaMap(TestArenaMap other) : this() {
-      mapInt32Int32_ = other.mapInt32Int32_.Clone();
-      mapInt64Int64_ = other.mapInt64Int64_.Clone();
-      mapUint32Uint32_ = other.mapUint32Uint32_.Clone();
-      mapUint64Uint64_ = other.mapUint64Uint64_.Clone();
-      mapSint32Sint32_ = other.mapSint32Sint32_.Clone();
-      mapSint64Sint64_ = other.mapSint64Sint64_.Clone();
-      mapFixed32Fixed32_ = other.mapFixed32Fixed32_.Clone();
-      mapFixed64Fixed64_ = other.mapFixed64Fixed64_.Clone();
-      mapSfixed32Sfixed32_ = other.mapSfixed32Sfixed32_.Clone();
-      mapSfixed64Sfixed64_ = other.mapSfixed64Sfixed64_.Clone();
-      mapInt32Float_ = other.mapInt32Float_.Clone();
-      mapInt32Double_ = other.mapInt32Double_.Clone();
-      mapBoolBool_ = other.mapBoolBool_.Clone();
-      mapInt32Enum_ = other.mapInt32Enum_.Clone();
-      mapInt32ForeignMessage_ = other.mapInt32ForeignMessage_.Clone();
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestArenaMap Clone() {
-      return new TestArenaMap(this);
-    }
-
-    /// <summary>Field number for the "map_int32_int32" field.</summary>
-    public const int MapInt32Int32FieldNumber = 1;
-    private static readonly pbc::MapField<int, int>.Codec _map_mapInt32Int32_codec
-        = new pbc::MapField<int, int>.Codec(pb::FieldCodec.ForInt32(8, 0), pb::FieldCodec.ForInt32(16, 0), 10);
-    private readonly pbc::MapField<int, int> mapInt32Int32_ = new pbc::MapField<int, int>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::MapField<int, int> MapInt32Int32 {
-      get { return mapInt32Int32_; }
-    }
-
-    /// <summary>Field number for the "map_int64_int64" field.</summary>
-    public const int MapInt64Int64FieldNumber = 2;
-    private static readonly pbc::MapField<long, long>.Codec _map_mapInt64Int64_codec
-        = new pbc::MapField<long, long>.Codec(pb::FieldCodec.ForInt64(8, 0L), pb::FieldCodec.ForInt64(16, 0L), 18);
-    private readonly pbc::MapField<long, long> mapInt64Int64_ = new pbc::MapField<long, long>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::MapField<long, long> MapInt64Int64 {
-      get { return mapInt64Int64_; }
-    }
-
-    /// <summary>Field number for the "map_uint32_uint32" field.</summary>
-    public const int MapUint32Uint32FieldNumber = 3;
-    private static readonly pbc::MapField<uint, uint>.Codec _map_mapUint32Uint32_codec
-        = new pbc::MapField<uint, uint>.Codec(pb::FieldCodec.ForUInt32(8, 0), pb::FieldCodec.ForUInt32(16, 0), 26);
-    private readonly pbc::MapField<uint, uint> mapUint32Uint32_ = new pbc::MapField<uint, uint>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::MapField<uint, uint> MapUint32Uint32 {
-      get { return mapUint32Uint32_; }
-    }
-
-    /// <summary>Field number for the "map_uint64_uint64" field.</summary>
-    public const int MapUint64Uint64FieldNumber = 4;
-    private static readonly pbc::MapField<ulong, ulong>.Codec _map_mapUint64Uint64_codec
-        = new pbc::MapField<ulong, ulong>.Codec(pb::FieldCodec.ForUInt64(8, 0UL), pb::FieldCodec.ForUInt64(16, 0UL), 34);
-    private readonly pbc::MapField<ulong, ulong> mapUint64Uint64_ = new pbc::MapField<ulong, ulong>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::MapField<ulong, ulong> MapUint64Uint64 {
-      get { return mapUint64Uint64_; }
-    }
-
-    /// <summary>Field number for the "map_sint32_sint32" field.</summary>
-    public const int MapSint32Sint32FieldNumber = 5;
-    private static readonly pbc::MapField<int, int>.Codec _map_mapSint32Sint32_codec
-        = new pbc::MapField<int, int>.Codec(pb::FieldCodec.ForSInt32(8, 0), pb::FieldCodec.ForSInt32(16, 0), 42);
-    private readonly pbc::MapField<int, int> mapSint32Sint32_ = new pbc::MapField<int, int>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::MapField<int, int> MapSint32Sint32 {
-      get { return mapSint32Sint32_; }
-    }
-
-    /// <summary>Field number for the "map_sint64_sint64" field.</summary>
-    public const int MapSint64Sint64FieldNumber = 6;
-    private static readonly pbc::MapField<long, long>.Codec _map_mapSint64Sint64_codec
-        = new pbc::MapField<long, long>.Codec(pb::FieldCodec.ForSInt64(8, 0L), pb::FieldCodec.ForSInt64(16, 0L), 50);
-    private readonly pbc::MapField<long, long> mapSint64Sint64_ = new pbc::MapField<long, long>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::MapField<long, long> MapSint64Sint64 {
-      get { return mapSint64Sint64_; }
-    }
-
-    /// <summary>Field number for the "map_fixed32_fixed32" field.</summary>
-    public const int MapFixed32Fixed32FieldNumber = 7;
-    private static readonly pbc::MapField<uint, uint>.Codec _map_mapFixed32Fixed32_codec
-        = new pbc::MapField<uint, uint>.Codec(pb::FieldCodec.ForFixed32(13, 0), pb::FieldCodec.ForFixed32(21, 0), 58);
-    private readonly pbc::MapField<uint, uint> mapFixed32Fixed32_ = new pbc::MapField<uint, uint>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::MapField<uint, uint> MapFixed32Fixed32 {
-      get { return mapFixed32Fixed32_; }
-    }
-
-    /// <summary>Field number for the "map_fixed64_fixed64" field.</summary>
-    public const int MapFixed64Fixed64FieldNumber = 8;
-    private static readonly pbc::MapField<ulong, ulong>.Codec _map_mapFixed64Fixed64_codec
-        = new pbc::MapField<ulong, ulong>.Codec(pb::FieldCodec.ForFixed64(9, 0UL), pb::FieldCodec.ForFixed64(17, 0UL), 66);
-    private readonly pbc::MapField<ulong, ulong> mapFixed64Fixed64_ = new pbc::MapField<ulong, ulong>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::MapField<ulong, ulong> MapFixed64Fixed64 {
-      get { return mapFixed64Fixed64_; }
-    }
-
-    /// <summary>Field number for the "map_sfixed32_sfixed32" field.</summary>
-    public const int MapSfixed32Sfixed32FieldNumber = 9;
-    private static readonly pbc::MapField<int, int>.Codec _map_mapSfixed32Sfixed32_codec
-        = new pbc::MapField<int, int>.Codec(pb::FieldCodec.ForSFixed32(13, 0), pb::FieldCodec.ForSFixed32(21, 0), 74);
-    private readonly pbc::MapField<int, int> mapSfixed32Sfixed32_ = new pbc::MapField<int, int>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::MapField<int, int> MapSfixed32Sfixed32 {
-      get { return mapSfixed32Sfixed32_; }
-    }
-
-    /// <summary>Field number for the "map_sfixed64_sfixed64" field.</summary>
-    public const int MapSfixed64Sfixed64FieldNumber = 10;
-    private static readonly pbc::MapField<long, long>.Codec _map_mapSfixed64Sfixed64_codec
-        = new pbc::MapField<long, long>.Codec(pb::FieldCodec.ForSFixed64(9, 0L), pb::FieldCodec.ForSFixed64(17, 0L), 82);
-    private readonly pbc::MapField<long, long> mapSfixed64Sfixed64_ = new pbc::MapField<long, long>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::MapField<long, long> MapSfixed64Sfixed64 {
-      get { return mapSfixed64Sfixed64_; }
-    }
-
-    /// <summary>Field number for the "map_int32_float" field.</summary>
-    public const int MapInt32FloatFieldNumber = 11;
-    private static readonly pbc::MapField<int, float>.Codec _map_mapInt32Float_codec
-        = new pbc::MapField<int, float>.Codec(pb::FieldCodec.ForInt32(8, 0), pb::FieldCodec.ForFloat(21, 0F), 90);
-    private readonly pbc::MapField<int, float> mapInt32Float_ = new pbc::MapField<int, float>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::MapField<int, float> MapInt32Float {
-      get { return mapInt32Float_; }
-    }
-
-    /// <summary>Field number for the "map_int32_double" field.</summary>
-    public const int MapInt32DoubleFieldNumber = 12;
-    private static readonly pbc::MapField<int, double>.Codec _map_mapInt32Double_codec
-        = new pbc::MapField<int, double>.Codec(pb::FieldCodec.ForInt32(8, 0), pb::FieldCodec.ForDouble(17, 0D), 98);
-    private readonly pbc::MapField<int, double> mapInt32Double_ = new pbc::MapField<int, double>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::MapField<int, double> MapInt32Double {
-      get { return mapInt32Double_; }
-    }
-
-    /// <summary>Field number for the "map_bool_bool" field.</summary>
-    public const int MapBoolBoolFieldNumber = 13;
-    private static readonly pbc::MapField<bool, bool>.Codec _map_mapBoolBool_codec
-        = new pbc::MapField<bool, bool>.Codec(pb::FieldCodec.ForBool(8, false), pb::FieldCodec.ForBool(16, false), 106);
-    private readonly pbc::MapField<bool, bool> mapBoolBool_ = new pbc::MapField<bool, bool>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::MapField<bool, bool> MapBoolBool {
-      get { return mapBoolBool_; }
-    }
-
-    /// <summary>Field number for the "map_int32_enum" field.</summary>
-    public const int MapInt32EnumFieldNumber = 14;
-    private static readonly pbc::MapField<int, global::Google.Protobuf.TestProtos.MapEnum>.Codec _map_mapInt32Enum_codec
-        = new pbc::MapField<int, global::Google.Protobuf.TestProtos.MapEnum>.Codec(pb::FieldCodec.ForInt32(8, 0), pb::FieldCodec.ForEnum(16, x => (int) x, x => (global::Google.Protobuf.TestProtos.MapEnum) x, global::Google.Protobuf.TestProtos.MapEnum.Foo), 114);
-    private readonly pbc::MapField<int, global::Google.Protobuf.TestProtos.MapEnum> mapInt32Enum_ = new pbc::MapField<int, global::Google.Protobuf.TestProtos.MapEnum>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::MapField<int, global::Google.Protobuf.TestProtos.MapEnum> MapInt32Enum {
-      get { return mapInt32Enum_; }
-    }
-
-    /// <summary>Field number for the "map_int32_foreign_message" field.</summary>
-    public const int MapInt32ForeignMessageFieldNumber = 15;
-    private static readonly pbc::MapField<int, global::Google.Protobuf.TestProtos.ForeignMessage>.Codec _map_mapInt32ForeignMessage_codec
-        = new pbc::MapField<int, global::Google.Protobuf.TestProtos.ForeignMessage>.Codec(pb::FieldCodec.ForInt32(8, 0), pb::FieldCodec.ForMessage(18, global::Google.Protobuf.TestProtos.ForeignMessage.Parser), 122);
-    private readonly pbc::MapField<int, global::Google.Protobuf.TestProtos.ForeignMessage> mapInt32ForeignMessage_ = new pbc::MapField<int, global::Google.Protobuf.TestProtos.ForeignMessage>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::MapField<int, global::Google.Protobuf.TestProtos.ForeignMessage> MapInt32ForeignMessage {
-      get { return mapInt32ForeignMessage_; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as TestArenaMap);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(TestArenaMap other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (!MapInt32Int32.Equals(other.MapInt32Int32)) return false;
-      if (!MapInt64Int64.Equals(other.MapInt64Int64)) return false;
-      if (!MapUint32Uint32.Equals(other.MapUint32Uint32)) return false;
-      if (!MapUint64Uint64.Equals(other.MapUint64Uint64)) return false;
-      if (!MapSint32Sint32.Equals(other.MapSint32Sint32)) return false;
-      if (!MapSint64Sint64.Equals(other.MapSint64Sint64)) return false;
-      if (!MapFixed32Fixed32.Equals(other.MapFixed32Fixed32)) return false;
-      if (!MapFixed64Fixed64.Equals(other.MapFixed64Fixed64)) return false;
-      if (!MapSfixed32Sfixed32.Equals(other.MapSfixed32Sfixed32)) return false;
-      if (!MapSfixed64Sfixed64.Equals(other.MapSfixed64Sfixed64)) return false;
-      if (!MapInt32Float.Equals(other.MapInt32Float)) return false;
-      if (!MapInt32Double.Equals(other.MapInt32Double)) return false;
-      if (!MapBoolBool.Equals(other.MapBoolBool)) return false;
-      if (!MapInt32Enum.Equals(other.MapInt32Enum)) return false;
-      if (!MapInt32ForeignMessage.Equals(other.MapInt32ForeignMessage)) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      hash ^= MapInt32Int32.GetHashCode();
-      hash ^= MapInt64Int64.GetHashCode();
-      hash ^= MapUint32Uint32.GetHashCode();
-      hash ^= MapUint64Uint64.GetHashCode();
-      hash ^= MapSint32Sint32.GetHashCode();
-      hash ^= MapSint64Sint64.GetHashCode();
-      hash ^= MapFixed32Fixed32.GetHashCode();
-      hash ^= MapFixed64Fixed64.GetHashCode();
-      hash ^= MapSfixed32Sfixed32.GetHashCode();
-      hash ^= MapSfixed64Sfixed64.GetHashCode();
-      hash ^= MapInt32Float.GetHashCode();
-      hash ^= MapInt32Double.GetHashCode();
-      hash ^= MapBoolBool.GetHashCode();
-      hash ^= MapInt32Enum.GetHashCode();
-      hash ^= MapInt32ForeignMessage.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      mapInt32Int32_.WriteTo(output, _map_mapInt32Int32_codec);
-      mapInt64Int64_.WriteTo(output, _map_mapInt64Int64_codec);
-      mapUint32Uint32_.WriteTo(output, _map_mapUint32Uint32_codec);
-      mapUint64Uint64_.WriteTo(output, _map_mapUint64Uint64_codec);
-      mapSint32Sint32_.WriteTo(output, _map_mapSint32Sint32_codec);
-      mapSint64Sint64_.WriteTo(output, _map_mapSint64Sint64_codec);
-      mapFixed32Fixed32_.WriteTo(output, _map_mapFixed32Fixed32_codec);
-      mapFixed64Fixed64_.WriteTo(output, _map_mapFixed64Fixed64_codec);
-      mapSfixed32Sfixed32_.WriteTo(output, _map_mapSfixed32Sfixed32_codec);
-      mapSfixed64Sfixed64_.WriteTo(output, _map_mapSfixed64Sfixed64_codec);
-      mapInt32Float_.WriteTo(output, _map_mapInt32Float_codec);
-      mapInt32Double_.WriteTo(output, _map_mapInt32Double_codec);
-      mapBoolBool_.WriteTo(output, _map_mapBoolBool_codec);
-      mapInt32Enum_.WriteTo(output, _map_mapInt32Enum_codec);
-      mapInt32ForeignMessage_.WriteTo(output, _map_mapInt32ForeignMessage_codec);
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      mapInt32Int32_.WriteTo(ref output, _map_mapInt32Int32_codec);
-      mapInt64Int64_.WriteTo(ref output, _map_mapInt64Int64_codec);
-      mapUint32Uint32_.WriteTo(ref output, _map_mapUint32Uint32_codec);
-      mapUint64Uint64_.WriteTo(ref output, _map_mapUint64Uint64_codec);
-      mapSint32Sint32_.WriteTo(ref output, _map_mapSint32Sint32_codec);
-      mapSint64Sint64_.WriteTo(ref output, _map_mapSint64Sint64_codec);
-      mapFixed32Fixed32_.WriteTo(ref output, _map_mapFixed32Fixed32_codec);
-      mapFixed64Fixed64_.WriteTo(ref output, _map_mapFixed64Fixed64_codec);
-      mapSfixed32Sfixed32_.WriteTo(ref output, _map_mapSfixed32Sfixed32_codec);
-      mapSfixed64Sfixed64_.WriteTo(ref output, _map_mapSfixed64Sfixed64_codec);
-      mapInt32Float_.WriteTo(ref output, _map_mapInt32Float_codec);
-      mapInt32Double_.WriteTo(ref output, _map_mapInt32Double_codec);
-      mapBoolBool_.WriteTo(ref output, _map_mapBoolBool_codec);
-      mapInt32Enum_.WriteTo(ref output, _map_mapInt32Enum_codec);
-      mapInt32ForeignMessage_.WriteTo(ref output, _map_mapInt32ForeignMessage_codec);
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      size += mapInt32Int32_.CalculateSize(_map_mapInt32Int32_codec);
-      size += mapInt64Int64_.CalculateSize(_map_mapInt64Int64_codec);
-      size += mapUint32Uint32_.CalculateSize(_map_mapUint32Uint32_codec);
-      size += mapUint64Uint64_.CalculateSize(_map_mapUint64Uint64_codec);
-      size += mapSint32Sint32_.CalculateSize(_map_mapSint32Sint32_codec);
-      size += mapSint64Sint64_.CalculateSize(_map_mapSint64Sint64_codec);
-      size += mapFixed32Fixed32_.CalculateSize(_map_mapFixed32Fixed32_codec);
-      size += mapFixed64Fixed64_.CalculateSize(_map_mapFixed64Fixed64_codec);
-      size += mapSfixed32Sfixed32_.CalculateSize(_map_mapSfixed32Sfixed32_codec);
-      size += mapSfixed64Sfixed64_.CalculateSize(_map_mapSfixed64Sfixed64_codec);
-      size += mapInt32Float_.CalculateSize(_map_mapInt32Float_codec);
-      size += mapInt32Double_.CalculateSize(_map_mapInt32Double_codec);
-      size += mapBoolBool_.CalculateSize(_map_mapBoolBool_codec);
-      size += mapInt32Enum_.CalculateSize(_map_mapInt32Enum_codec);
-      size += mapInt32ForeignMessage_.CalculateSize(_map_mapInt32ForeignMessage_codec);
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(TestArenaMap other) {
-      if (other == null) {
-        return;
-      }
-      mapInt32Int32_.Add(other.mapInt32Int32_);
-      mapInt64Int64_.Add(other.mapInt64Int64_);
-      mapUint32Uint32_.Add(other.mapUint32Uint32_);
-      mapUint64Uint64_.Add(other.mapUint64Uint64_);
-      mapSint32Sint32_.Add(other.mapSint32Sint32_);
-      mapSint64Sint64_.Add(other.mapSint64Sint64_);
-      mapFixed32Fixed32_.Add(other.mapFixed32Fixed32_);
-      mapFixed64Fixed64_.Add(other.mapFixed64Fixed64_);
-      mapSfixed32Sfixed32_.Add(other.mapSfixed32Sfixed32_);
-      mapSfixed64Sfixed64_.Add(other.mapSfixed64Sfixed64_);
-      mapInt32Float_.Add(other.mapInt32Float_);
-      mapInt32Double_.Add(other.mapInt32Double_);
-      mapBoolBool_.Add(other.mapBoolBool_);
-      mapInt32Enum_.Add(other.mapInt32Enum_);
-      mapInt32ForeignMessage_.Add(other.mapInt32ForeignMessage_);
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 10: {
-            mapInt32Int32_.AddEntriesFrom(input, _map_mapInt32Int32_codec);
-            break;
-          }
-          case 18: {
-            mapInt64Int64_.AddEntriesFrom(input, _map_mapInt64Int64_codec);
-            break;
-          }
-          case 26: {
-            mapUint32Uint32_.AddEntriesFrom(input, _map_mapUint32Uint32_codec);
-            break;
-          }
-          case 34: {
-            mapUint64Uint64_.AddEntriesFrom(input, _map_mapUint64Uint64_codec);
-            break;
-          }
-          case 42: {
-            mapSint32Sint32_.AddEntriesFrom(input, _map_mapSint32Sint32_codec);
-            break;
-          }
-          case 50: {
-            mapSint64Sint64_.AddEntriesFrom(input, _map_mapSint64Sint64_codec);
-            break;
-          }
-          case 58: {
-            mapFixed32Fixed32_.AddEntriesFrom(input, _map_mapFixed32Fixed32_codec);
-            break;
-          }
-          case 66: {
-            mapFixed64Fixed64_.AddEntriesFrom(input, _map_mapFixed64Fixed64_codec);
-            break;
-          }
-          case 74: {
-            mapSfixed32Sfixed32_.AddEntriesFrom(input, _map_mapSfixed32Sfixed32_codec);
-            break;
-          }
-          case 82: {
-            mapSfixed64Sfixed64_.AddEntriesFrom(input, _map_mapSfixed64Sfixed64_codec);
-            break;
-          }
-          case 90: {
-            mapInt32Float_.AddEntriesFrom(input, _map_mapInt32Float_codec);
-            break;
-          }
-          case 98: {
-            mapInt32Double_.AddEntriesFrom(input, _map_mapInt32Double_codec);
-            break;
-          }
-          case 106: {
-            mapBoolBool_.AddEntriesFrom(input, _map_mapBoolBool_codec);
-            break;
-          }
-          case 114: {
-            mapInt32Enum_.AddEntriesFrom(input, _map_mapInt32Enum_codec);
-            break;
-          }
-          case 122: {
-            mapInt32ForeignMessage_.AddEntriesFrom(input, _map_mapInt32ForeignMessage_codec);
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 10: {
-            mapInt32Int32_.AddEntriesFrom(ref input, _map_mapInt32Int32_codec);
-            break;
-          }
-          case 18: {
-            mapInt64Int64_.AddEntriesFrom(ref input, _map_mapInt64Int64_codec);
-            break;
-          }
-          case 26: {
-            mapUint32Uint32_.AddEntriesFrom(ref input, _map_mapUint32Uint32_codec);
-            break;
-          }
-          case 34: {
-            mapUint64Uint64_.AddEntriesFrom(ref input, _map_mapUint64Uint64_codec);
-            break;
-          }
-          case 42: {
-            mapSint32Sint32_.AddEntriesFrom(ref input, _map_mapSint32Sint32_codec);
-            break;
-          }
-          case 50: {
-            mapSint64Sint64_.AddEntriesFrom(ref input, _map_mapSint64Sint64_codec);
-            break;
-          }
-          case 58: {
-            mapFixed32Fixed32_.AddEntriesFrom(ref input, _map_mapFixed32Fixed32_codec);
-            break;
-          }
-          case 66: {
-            mapFixed64Fixed64_.AddEntriesFrom(ref input, _map_mapFixed64Fixed64_codec);
-            break;
-          }
-          case 74: {
-            mapSfixed32Sfixed32_.AddEntriesFrom(ref input, _map_mapSfixed32Sfixed32_codec);
-            break;
-          }
-          case 82: {
-            mapSfixed64Sfixed64_.AddEntriesFrom(ref input, _map_mapSfixed64Sfixed64_codec);
-            break;
-          }
-          case 90: {
-            mapInt32Float_.AddEntriesFrom(ref input, _map_mapInt32Float_codec);
-            break;
-          }
-          case 98: {
-            mapInt32Double_.AddEntriesFrom(ref input, _map_mapInt32Double_codec);
-            break;
-          }
-          case 106: {
-            mapBoolBool_.AddEntriesFrom(ref input, _map_mapBoolBool_codec);
-            break;
-          }
-          case 114: {
-            mapInt32Enum_.AddEntriesFrom(ref input, _map_mapInt32Enum_codec);
-            break;
-          }
-          case 122: {
-            mapInt32ForeignMessage_.AddEntriesFrom(ref input, _map_mapInt32ForeignMessage_codec);
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  /// <summary>
-  /// Previously, message containing enum called Type cannot be used as value of
-  /// map field.
-  /// </summary>
-  public sealed partial class MessageContainingEnumCalledType : pb::IMessage<MessageContainingEnumCalledType>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<MessageContainingEnumCalledType> _parser = new pb::MessageParser<MessageContainingEnumCalledType>(() => new MessageContainingEnumCalledType());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<MessageContainingEnumCalledType> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.MapUnittestProto3Reflection.Descriptor.MessageTypes[5]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public MessageContainingEnumCalledType() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public MessageContainingEnumCalledType(MessageContainingEnumCalledType other) : this() {
-      type_ = other.type_.Clone();
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public MessageContainingEnumCalledType Clone() {
-      return new MessageContainingEnumCalledType(this);
-    }
-
-    /// <summary>Field number for the "type" field.</summary>
-    public const int TypeFieldNumber = 1;
-    private static readonly pbc::MapField<int, global::Google.Protobuf.TestProtos.MessageContainingEnumCalledType>.Codec _map_type_codec
-        = new pbc::MapField<int, global::Google.Protobuf.TestProtos.MessageContainingEnumCalledType>.Codec(pb::FieldCodec.ForInt32(8, 0), pb::FieldCodec.ForMessage(18, global::Google.Protobuf.TestProtos.MessageContainingEnumCalledType.Parser), 10);
-    private readonly pbc::MapField<int, global::Google.Protobuf.TestProtos.MessageContainingEnumCalledType> type_ = new pbc::MapField<int, global::Google.Protobuf.TestProtos.MessageContainingEnumCalledType>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::MapField<int, global::Google.Protobuf.TestProtos.MessageContainingEnumCalledType> Type {
-      get { return type_; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as MessageContainingEnumCalledType);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(MessageContainingEnumCalledType other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (!Type.Equals(other.Type)) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      hash ^= Type.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      type_.WriteTo(output, _map_type_codec);
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      type_.WriteTo(ref output, _map_type_codec);
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      size += type_.CalculateSize(_map_type_codec);
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(MessageContainingEnumCalledType other) {
-      if (other == null) {
-        return;
-      }
-      type_.Add(other.type_);
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 10: {
-            type_.AddEntriesFrom(input, _map_type_codec);
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 10: {
-            type_.AddEntriesFrom(ref input, _map_type_codec);
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-    #region Nested types
-    /// <summary>Container for nested types declared in the MessageContainingEnumCalledType message type.</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static partial class Types {
-      public enum Type {
-        [pbr::OriginalName("TYPE_FOO")] Foo = 0,
-      }
-
-    }
-    #endregion
-
-  }
-
-  /// <summary>
-  /// Previously, message cannot contain map field called "entry".
-  /// </summary>
-  public sealed partial class MessageContainingMapCalledEntry : pb::IMessage<MessageContainingMapCalledEntry>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<MessageContainingMapCalledEntry> _parser = new pb::MessageParser<MessageContainingMapCalledEntry>(() => new MessageContainingMapCalledEntry());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<MessageContainingMapCalledEntry> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.MapUnittestProto3Reflection.Descriptor.MessageTypes[6]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public MessageContainingMapCalledEntry() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public MessageContainingMapCalledEntry(MessageContainingMapCalledEntry other) : this() {
-      entry_ = other.entry_.Clone();
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public MessageContainingMapCalledEntry Clone() {
-      return new MessageContainingMapCalledEntry(this);
-    }
-
-    /// <summary>Field number for the "entry" field.</summary>
-    public const int EntryFieldNumber = 1;
-    private static readonly pbc::MapField<int, int>.Codec _map_entry_codec
-        = new pbc::MapField<int, int>.Codec(pb::FieldCodec.ForInt32(8, 0), pb::FieldCodec.ForInt32(16, 0), 10);
-    private readonly pbc::MapField<int, int> entry_ = new pbc::MapField<int, int>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::MapField<int, int> Entry {
-      get { return entry_; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as MessageContainingMapCalledEntry);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(MessageContainingMapCalledEntry other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (!Entry.Equals(other.Entry)) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      hash ^= Entry.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      entry_.WriteTo(output, _map_entry_codec);
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      entry_.WriteTo(ref output, _map_entry_codec);
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      size += entry_.CalculateSize(_map_entry_codec);
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(MessageContainingMapCalledEntry other) {
-      if (other == null) {
-        return;
-      }
-      entry_.Add(other.entry_);
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 10: {
-            entry_.AddEntriesFrom(input, _map_entry_codec);
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 10: {
-            entry_.AddEntriesFrom(ref input, _map_entry_codec);
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  #endregion
-
-}
-
-#endregion Designer generated code
diff --git a/libs/protobuf/csharp/src/Google.Protobuf.Test.TestProtos/OldExtensions1.cs b/libs/protobuf/csharp/src/Google.Protobuf.Test.TestProtos/OldExtensions1.cs
deleted file mode 100644
index 3824f4c..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf.Test.TestProtos/OldExtensions1.cs
+++ /dev/null
@@ -1,148 +0,0 @@
-// <auto-generated>
-//     Generated by the protocol buffer compiler.  DO NOT EDIT!
-//     source: old_extensions1.proto
-// </auto-generated>
-#pragma warning disable 1591, 0612, 3021
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-namespace Google.Protobuf.TestProtos.OldGenerator {
-
-  /// <summary>Holder for reflection information generated from old_extensions1.proto</summary>
-  public static partial class OldExtensions1Reflection {
-
-    #region Descriptor
-    /// <summary>File descriptor for old_extensions1.proto</summary>
-    public static pbr::FileDescriptor Descriptor {
-      get { return descriptor; }
-    }
-    private static pbr::FileDescriptor descriptor;
-
-    static OldExtensions1Reflection() {
-      byte[] descriptorData = global::System.Convert.FromBase64String(
-          string.Concat(
-            "ChVvbGRfZXh0ZW5zaW9uczEucHJvdG8aFW9sZF9leHRlbnNpb25zMi5wcm90",
-            "byINCgtUZXN0TWVzc2FnZUIqqgInR29vZ2xlLlByb3RvYnVmLlRlc3RQcm90",
-            "b3MuT2xkR2VuZXJhdG9yYgZwcm90bzM="));
-      descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-          new pbr::FileDescriptor[] { global::Google.Protobuf.TestProtos.OldGenerator.OldExtensions2Reflection.Descriptor, },
-          new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.OldGenerator.TestMessage), global::Google.Protobuf.TestProtos.OldGenerator.TestMessage.Parser, null, null, null, null)
-          }));
-    }
-    #endregion
-
-  }
-  #region Messages
-  /// <summary>
-  /// We don't use this message other than to get its descriptor.
-  /// </summary>
-  public sealed partial class TestMessage : pb::IMessage<TestMessage> {
-    private static readonly pb::MessageParser<TestMessage> _parser = new pb::MessageParser<TestMessage>(() => new TestMessage());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public static pb::MessageParser<TestMessage> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.OldGenerator.OldExtensions1Reflection.Descriptor.MessageTypes[0]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public TestMessage() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public TestMessage(TestMessage other) : this() {
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public TestMessage Clone() {
-      return new TestMessage(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override bool Equals(object other) {
-      return Equals(other as TestMessage);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public bool Equals(TestMessage other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void WriteTo(pb::CodedOutputStream output) {
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public int CalculateSize() {
-      int size = 0;
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void MergeFrom(TestMessage other) {
-      if (other == null) {
-        return;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void MergeFrom(pb::CodedInputStream input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-        }
-      }
-    }
-
-  }
-
-  #endregion
-
-}
-
-#endregion Designer generated code
diff --git a/libs/protobuf/csharp/src/Google.Protobuf.Test.TestProtos/OldExtensions2.cs b/libs/protobuf/csharp/src/Google.Protobuf.Test.TestProtos/OldExtensions2.cs
deleted file mode 100644
index 265dd3b..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf.Test.TestProtos/OldExtensions2.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-// <auto-generated>
-//     Generated by the protocol buffer compiler.  DO NOT EDIT!
-//     source: old_extensions2.proto
-// </auto-generated>
-#pragma warning disable 1591, 0612, 3021
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-namespace Google.Protobuf.TestProtos.OldGenerator {
-
-  /// <summary>Holder for reflection information generated from old_extensions2.proto</summary>
-  public static partial class OldExtensions2Reflection {
-
-    #region Descriptor
-    /// <summary>File descriptor for old_extensions2.proto</summary>
-    public static pbr::FileDescriptor Descriptor {
-      get { return descriptor; }
-    }
-    private static pbr::FileDescriptor descriptor;
-
-    static OldExtensions2Reflection() {
-      byte[] descriptorData = global::System.Convert.FromBase64String(
-          string.Concat(
-            "ChVvbGRfZXh0ZW5zaW9uczIucHJvdG8aIGdvb2dsZS9wcm90b2J1Zi9kZXNj",
-            "cmlwdG9yLnByb3RvOjQKCm1ldGhvZF9leHQSHi5nb29nbGUucHJvdG9idWYu",
-            "TWV0aG9kT3B0aW9ucxiHrUsgASgJQiqqAidHb29nbGUuUHJvdG9idWYuVGVz",
-            "dFByb3Rvcy5PbGRHZW5lcmF0b3JiBnByb3RvMw=="));
-      descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-          new pbr::FileDescriptor[] { pbr::FileDescriptor.DescriptorProtoFileDescriptor, },
-          new pbr::GeneratedClrTypeInfo(null, null));
-    }
-    #endregion
-
-  }
-}
-
-#endregion Designer generated code
diff --git a/libs/protobuf/csharp/src/Google.Protobuf.Test.TestProtos/TestMessagesProto2.cs b/libs/protobuf/csharp/src/Google.Protobuf.Test.TestProtos/TestMessagesProto2.cs
deleted file mode 100644
index 35f2b8a..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf.Test.TestProtos/TestMessagesProto2.cs
+++ /dev/null
@@ -1,8307 +0,0 @@
-// <auto-generated>
-//     Generated by the protocol buffer compiler.  DO NOT EDIT!
-//     source: google/protobuf/test_messages_proto2.proto
-// </auto-generated>
-#pragma warning disable 1591, 0612, 3021, 8981
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-namespace ProtobufTestMessages.Proto2 {
-
-  /// <summary>Holder for reflection information generated from google/protobuf/test_messages_proto2.proto</summary>
-  public static partial class TestMessagesProto2Reflection {
-
-    #region Descriptor
-    /// <summary>File descriptor for google/protobuf/test_messages_proto2.proto</summary>
-    public static pbr::FileDescriptor Descriptor {
-      get { return descriptor; }
-    }
-    private static pbr::FileDescriptor descriptor;
-
-    static TestMessagesProto2Reflection() {
-      byte[] descriptorData = global::System.Convert.FromBase64String(
-          string.Concat(
-            "Cipnb29nbGUvcHJvdG9idWYvdGVzdF9tZXNzYWdlc19wcm90bzIucHJvdG8S",
-            "HXByb3RvYnVmX3Rlc3RfbWVzc2FnZXMucHJvdG8yIsQ+ChJUZXN0QWxsVHlw",
-            "ZXNQcm90bzISFgoOb3B0aW9uYWxfaW50MzIYASABKAUSFgoOb3B0aW9uYWxf",
-            "aW50NjQYAiABKAMSFwoPb3B0aW9uYWxfdWludDMyGAMgASgNEhcKD29wdGlv",
-            "bmFsX3VpbnQ2NBgEIAEoBBIXCg9vcHRpb25hbF9zaW50MzIYBSABKBESFwoP",
-            "b3B0aW9uYWxfc2ludDY0GAYgASgSEhgKEG9wdGlvbmFsX2ZpeGVkMzIYByAB",
-            "KAcSGAoQb3B0aW9uYWxfZml4ZWQ2NBgIIAEoBhIZChFvcHRpb25hbF9zZml4",
-            "ZWQzMhgJIAEoDxIZChFvcHRpb25hbF9zZml4ZWQ2NBgKIAEoEBIWCg5vcHRp",
-            "b25hbF9mbG9hdBgLIAEoAhIXCg9vcHRpb25hbF9kb3VibGUYDCABKAESFQoN",
-            "b3B0aW9uYWxfYm9vbBgNIAEoCBIXCg9vcHRpb25hbF9zdHJpbmcYDiABKAkS",
-            "FgoOb3B0aW9uYWxfYnl0ZXMYDyABKAwSYAoXb3B0aW9uYWxfbmVzdGVkX21l",
-            "c3NhZ2UYEiABKAsyPy5wcm90b2J1Zl90ZXN0X21lc3NhZ2VzLnByb3RvMi5U",
-            "ZXN0QWxsVHlwZXNQcm90bzIuTmVzdGVkTWVzc2FnZRJVChhvcHRpb25hbF9m",
-            "b3JlaWduX21lc3NhZ2UYEyABKAsyMy5wcm90b2J1Zl90ZXN0X21lc3NhZ2Vz",
-            "LnByb3RvMi5Gb3JlaWduTWVzc2FnZVByb3RvMhJaChRvcHRpb25hbF9uZXN0",
-            "ZWRfZW51bRgVIAEoDjI8LnByb3RvYnVmX3Rlc3RfbWVzc2FnZXMucHJvdG8y",
-            "LlRlc3RBbGxUeXBlc1Byb3RvMi5OZXN0ZWRFbnVtEk8KFW9wdGlvbmFsX2Zv",
-            "cmVpZ25fZW51bRgWIAEoDjIwLnByb3RvYnVmX3Rlc3RfbWVzc2FnZXMucHJv",
-            "dG8yLkZvcmVpZ25FbnVtUHJvdG8yEiEKFW9wdGlvbmFsX3N0cmluZ19waWVj",
-            "ZRgYIAEoCUICCAISGQoNb3B0aW9uYWxfY29yZBgZIAEoCUICCAESTAoRcmVj",
-            "dXJzaXZlX21lc3NhZ2UYGyABKAsyMS5wcm90b2J1Zl90ZXN0X21lc3NhZ2Vz",
-            "LnByb3RvMi5UZXN0QWxsVHlwZXNQcm90bzISFgoOcmVwZWF0ZWRfaW50MzIY",
-            "HyADKAUSFgoOcmVwZWF0ZWRfaW50NjQYICADKAMSFwoPcmVwZWF0ZWRfdWlu",
-            "dDMyGCEgAygNEhcKD3JlcGVhdGVkX3VpbnQ2NBgiIAMoBBIXCg9yZXBlYXRl",
-            "ZF9zaW50MzIYIyADKBESFwoPcmVwZWF0ZWRfc2ludDY0GCQgAygSEhgKEHJl",
-            "cGVhdGVkX2ZpeGVkMzIYJSADKAcSGAoQcmVwZWF0ZWRfZml4ZWQ2NBgmIAMo",
-            "BhIZChFyZXBlYXRlZF9zZml4ZWQzMhgnIAMoDxIZChFyZXBlYXRlZF9zZml4",
-            "ZWQ2NBgoIAMoEBIWCg5yZXBlYXRlZF9mbG9hdBgpIAMoAhIXCg9yZXBlYXRl",
-            "ZF9kb3VibGUYKiADKAESFQoNcmVwZWF0ZWRfYm9vbBgrIAMoCBIXCg9yZXBl",
-            "YXRlZF9zdHJpbmcYLCADKAkSFgoOcmVwZWF0ZWRfYnl0ZXMYLSADKAwSYAoX",
-            "cmVwZWF0ZWRfbmVzdGVkX21lc3NhZ2UYMCADKAsyPy5wcm90b2J1Zl90ZXN0",
-            "X21lc3NhZ2VzLnByb3RvMi5UZXN0QWxsVHlwZXNQcm90bzIuTmVzdGVkTWVz",
-            "c2FnZRJVChhyZXBlYXRlZF9mb3JlaWduX21lc3NhZ2UYMSADKAsyMy5wcm90",
-            "b2J1Zl90ZXN0X21lc3NhZ2VzLnByb3RvMi5Gb3JlaWduTWVzc2FnZVByb3Rv",
-            "MhJaChRyZXBlYXRlZF9uZXN0ZWRfZW51bRgzIAMoDjI8LnByb3RvYnVmX3Rl",
-            "c3RfbWVzc2FnZXMucHJvdG8yLlRlc3RBbGxUeXBlc1Byb3RvMi5OZXN0ZWRF",
-            "bnVtEk8KFXJlcGVhdGVkX2ZvcmVpZ25fZW51bRg0IAMoDjIwLnByb3RvYnVm",
-            "X3Rlc3RfbWVzc2FnZXMucHJvdG8yLkZvcmVpZ25FbnVtUHJvdG8yEiEKFXJl",
-            "cGVhdGVkX3N0cmluZ19waWVjZRg2IAMoCUICCAISGQoNcmVwZWF0ZWRfY29y",
-            "ZBg3IAMoCUICCAESGAoMcGFja2VkX2ludDMyGEsgAygFQgIQARIYCgxwYWNr",
-            "ZWRfaW50NjQYTCADKANCAhABEhkKDXBhY2tlZF91aW50MzIYTSADKA1CAhAB",
-            "EhkKDXBhY2tlZF91aW50NjQYTiADKARCAhABEhkKDXBhY2tlZF9zaW50MzIY",
-            "TyADKBFCAhABEhkKDXBhY2tlZF9zaW50NjQYUCADKBJCAhABEhoKDnBhY2tl",
-            "ZF9maXhlZDMyGFEgAygHQgIQARIaCg5wYWNrZWRfZml4ZWQ2NBhSIAMoBkIC",
-            "EAESGwoPcGFja2VkX3NmaXhlZDMyGFMgAygPQgIQARIbCg9wYWNrZWRfc2Zp",
-            "eGVkNjQYVCADKBBCAhABEhgKDHBhY2tlZF9mbG9hdBhVIAMoAkICEAESGQoN",
-            "cGFja2VkX2RvdWJsZRhWIAMoAUICEAESFwoLcGFja2VkX2Jvb2wYVyADKAhC",
-            "AhABElwKEnBhY2tlZF9uZXN0ZWRfZW51bRhYIAMoDjI8LnByb3RvYnVmX3Rl",
-            "c3RfbWVzc2FnZXMucHJvdG8yLlRlc3RBbGxUeXBlc1Byb3RvMi5OZXN0ZWRF",
-            "bnVtQgIQARIaCg51bnBhY2tlZF9pbnQzMhhZIAMoBUICEAASGgoOdW5wYWNr",
-            "ZWRfaW50NjQYWiADKANCAhAAEhsKD3VucGFja2VkX3VpbnQzMhhbIAMoDUIC",
-            "EAASGwoPdW5wYWNrZWRfdWludDY0GFwgAygEQgIQABIbCg91bnBhY2tlZF9z",
-            "aW50MzIYXSADKBFCAhAAEhsKD3VucGFja2VkX3NpbnQ2NBheIAMoEkICEAAS",
-            "HAoQdW5wYWNrZWRfZml4ZWQzMhhfIAMoB0ICEAASHAoQdW5wYWNrZWRfZml4",
-            "ZWQ2NBhgIAMoBkICEAASHQoRdW5wYWNrZWRfc2ZpeGVkMzIYYSADKA9CAhAA",
-            "Eh0KEXVucGFja2VkX3NmaXhlZDY0GGIgAygQQgIQABIaCg51bnBhY2tlZF9m",
-            "bG9hdBhjIAMoAkICEAASGwoPdW5wYWNrZWRfZG91YmxlGGQgAygBQgIQABIZ",
-            "Cg11bnBhY2tlZF9ib29sGGUgAygIQgIQABJeChR1bnBhY2tlZF9uZXN0ZWRf",
-            "ZW51bRhmIAMoDjI8LnByb3RvYnVmX3Rlc3RfbWVzc2FnZXMucHJvdG8yLlRl",
-            "c3RBbGxUeXBlc1Byb3RvMi5OZXN0ZWRFbnVtQgIQABJdCg9tYXBfaW50MzJf",
-            "aW50MzIYOCADKAsyRC5wcm90b2J1Zl90ZXN0X21lc3NhZ2VzLnByb3RvMi5U",
-            "ZXN0QWxsVHlwZXNQcm90bzIuTWFwSW50MzJJbnQzMkVudHJ5El0KD21hcF9p",
-            "bnQ2NF9pbnQ2NBg5IAMoCzJELnByb3RvYnVmX3Rlc3RfbWVzc2FnZXMucHJv",
-            "dG8yLlRlc3RBbGxUeXBlc1Byb3RvMi5NYXBJbnQ2NEludDY0RW50cnkSYQoR",
-            "bWFwX3VpbnQzMl91aW50MzIYOiADKAsyRi5wcm90b2J1Zl90ZXN0X21lc3Nh",
-            "Z2VzLnByb3RvMi5UZXN0QWxsVHlwZXNQcm90bzIuTWFwVWludDMyVWludDMy",
-            "RW50cnkSYQoRbWFwX3VpbnQ2NF91aW50NjQYOyADKAsyRi5wcm90b2J1Zl90",
-            "ZXN0X21lc3NhZ2VzLnByb3RvMi5UZXN0QWxsVHlwZXNQcm90bzIuTWFwVWlu",
-            "dDY0VWludDY0RW50cnkSYQoRbWFwX3NpbnQzMl9zaW50MzIYPCADKAsyRi5w",
-            "cm90b2J1Zl90ZXN0X21lc3NhZ2VzLnByb3RvMi5UZXN0QWxsVHlwZXNQcm90",
-            "bzIuTWFwU2ludDMyU2ludDMyRW50cnkSYQoRbWFwX3NpbnQ2NF9zaW50NjQY",
-            "PSADKAsyRi5wcm90b2J1Zl90ZXN0X21lc3NhZ2VzLnByb3RvMi5UZXN0QWxs",
-            "VHlwZXNQcm90bzIuTWFwU2ludDY0U2ludDY0RW50cnkSZQoTbWFwX2ZpeGVk",
-            "MzJfZml4ZWQzMhg+IAMoCzJILnByb3RvYnVmX3Rlc3RfbWVzc2FnZXMucHJv",
-            "dG8yLlRlc3RBbGxUeXBlc1Byb3RvMi5NYXBGaXhlZDMyRml4ZWQzMkVudHJ5",
-            "EmUKE21hcF9maXhlZDY0X2ZpeGVkNjQYPyADKAsySC5wcm90b2J1Zl90ZXN0",
-            "X21lc3NhZ2VzLnByb3RvMi5UZXN0QWxsVHlwZXNQcm90bzIuTWFwRml4ZWQ2",
-            "NEZpeGVkNjRFbnRyeRJpChVtYXBfc2ZpeGVkMzJfc2ZpeGVkMzIYQCADKAsy",
-            "Si5wcm90b2J1Zl90ZXN0X21lc3NhZ2VzLnByb3RvMi5UZXN0QWxsVHlwZXNQ",
-            "cm90bzIuTWFwU2ZpeGVkMzJTZml4ZWQzMkVudHJ5EmkKFW1hcF9zZml4ZWQ2",
-            "NF9zZml4ZWQ2NBhBIAMoCzJKLnByb3RvYnVmX3Rlc3RfbWVzc2FnZXMucHJv",
-            "dG8yLlRlc3RBbGxUeXBlc1Byb3RvMi5NYXBTZml4ZWQ2NFNmaXhlZDY0RW50",
-            "cnkSXQoPbWFwX2ludDMyX2Zsb2F0GEIgAygLMkQucHJvdG9idWZfdGVzdF9t",
-            "ZXNzYWdlcy5wcm90bzIuVGVzdEFsbFR5cGVzUHJvdG8yLk1hcEludDMyRmxv",
-            "YXRFbnRyeRJfChBtYXBfaW50MzJfZG91YmxlGEMgAygLMkUucHJvdG9idWZf",
-            "dGVzdF9tZXNzYWdlcy5wcm90bzIuVGVzdEFsbFR5cGVzUHJvdG8yLk1hcElu",
-            "dDMyRG91YmxlRW50cnkSWQoNbWFwX2Jvb2xfYm9vbBhEIAMoCzJCLnByb3Rv",
-            "YnVmX3Rlc3RfbWVzc2FnZXMucHJvdG8yLlRlc3RBbGxUeXBlc1Byb3RvMi5N",
-            "YXBCb29sQm9vbEVudHJ5EmEKEW1hcF9zdHJpbmdfc3RyaW5nGEUgAygLMkYu",
-            "cHJvdG9idWZfdGVzdF9tZXNzYWdlcy5wcm90bzIuVGVzdEFsbFR5cGVzUHJv",
-            "dG8yLk1hcFN0cmluZ1N0cmluZ0VudHJ5El8KEG1hcF9zdHJpbmdfYnl0ZXMY",
-            "RiADKAsyRS5wcm90b2J1Zl90ZXN0X21lc3NhZ2VzLnByb3RvMi5UZXN0QWxs",
-            "VHlwZXNQcm90bzIuTWFwU3RyaW5nQnl0ZXNFbnRyeRJwChltYXBfc3RyaW5n",
-            "X25lc3RlZF9tZXNzYWdlGEcgAygLMk0ucHJvdG9idWZfdGVzdF9tZXNzYWdl",
-            "cy5wcm90bzIuVGVzdEFsbFR5cGVzUHJvdG8yLk1hcFN0cmluZ05lc3RlZE1l",
-            "c3NhZ2VFbnRyeRJyChptYXBfc3RyaW5nX2ZvcmVpZ25fbWVzc2FnZRhIIAMo",
-            "CzJOLnByb3RvYnVmX3Rlc3RfbWVzc2FnZXMucHJvdG8yLlRlc3RBbGxUeXBl",
-            "c1Byb3RvMi5NYXBTdHJpbmdGb3JlaWduTWVzc2FnZUVudHJ5EmoKFm1hcF9z",
-            "dHJpbmdfbmVzdGVkX2VudW0YSSADKAsySi5wcm90b2J1Zl90ZXN0X21lc3Nh",
-            "Z2VzLnByb3RvMi5UZXN0QWxsVHlwZXNQcm90bzIuTWFwU3RyaW5nTmVzdGVk",
-            "RW51bUVudHJ5EmwKF21hcF9zdHJpbmdfZm9yZWlnbl9lbnVtGEogAygLMksu",
-            "cHJvdG9idWZfdGVzdF9tZXNzYWdlcy5wcm90bzIuVGVzdEFsbFR5cGVzUHJv",
-            "dG8yLk1hcFN0cmluZ0ZvcmVpZ25FbnVtRW50cnkSFgoMb25lb2ZfdWludDMy",
-            "GG8gASgNSAASXwoUb25lb2ZfbmVzdGVkX21lc3NhZ2UYcCABKAsyPy5wcm90",
-            "b2J1Zl90ZXN0X21lc3NhZ2VzLnByb3RvMi5UZXN0QWxsVHlwZXNQcm90bzIu",
-            "TmVzdGVkTWVzc2FnZUgAEhYKDG9uZW9mX3N0cmluZxhxIAEoCUgAEhUKC29u",
-            "ZW9mX2J5dGVzGHIgASgMSAASFAoKb25lb2ZfYm9vbBhzIAEoCEgAEhYKDG9u",
-            "ZW9mX3VpbnQ2NBh0IAEoBEgAEhUKC29uZW9mX2Zsb2F0GHUgASgCSAASFgoM",
-            "b25lb2ZfZG91YmxlGHYgASgBSAASUgoKb25lb2ZfZW51bRh3IAEoDjI8LnBy",
-            "b3RvYnVmX3Rlc3RfbWVzc2FnZXMucHJvdG8yLlRlc3RBbGxUeXBlc1Byb3Rv",
-            "Mi5OZXN0ZWRFbnVtSAASRQoEZGF0YRjJASABKAoyNi5wcm90b2J1Zl90ZXN0",
-            "X21lc3NhZ2VzLnByb3RvMi5UZXN0QWxsVHlwZXNQcm90bzIuRGF0YRIiCg1k",
-            "ZWZhdWx0X2ludDMyGPEBIAEoBToKLTEyMzQ1Njc4ORIsCg1kZWZhdWx0X2lu",
-            "dDY0GPIBIAEoAzoULTkxMjM0NTY3ODkxMjM0NTY3ODkSIwoOZGVmYXVsdF91",
-            "aW50MzIY8wEgASgNOgoyMTIzNDU2Nzg5Ei0KDmRlZmF1bHRfdWludDY0GPQB",
-            "IAEoBDoUMTAxMjM0NTY3ODkxMjM0NTY3ODkSIwoOZGVmYXVsdF9zaW50MzIY",
-            "9QEgASgROgotMTIzNDU2Nzg5Ei0KDmRlZmF1bHRfc2ludDY0GPYBIAEoEjoU",
-            "LTkxMjM0NTY3ODkxMjM0NTY3ODkSJAoPZGVmYXVsdF9maXhlZDMyGPcBIAEo",
-            "BzoKMjEyMzQ1Njc4ORIuCg9kZWZhdWx0X2ZpeGVkNjQY+AEgASgGOhQxMDEy",
-            "MzQ1Njc4OTEyMzQ1Njc4ORIlChBkZWZhdWx0X3NmaXhlZDMyGPkBIAEoDzoK",
-            "LTEyMzQ1Njc4ORIvChBkZWZhdWx0X3NmaXhlZDY0GPoBIAEoEDoULTkxMjM0",
-            "NTY3ODkxMjM0NTY3ODkSHQoNZGVmYXVsdF9mbG9hdBj7ASABKAI6BTllKzA5",
-            "Eh4KDmRlZmF1bHRfZG91YmxlGPwBIAEoAToFN2UrMjISGwoMZGVmYXVsdF9i",
-            "b29sGP0BIAEoCDoEdHJ1ZRIgCg5kZWZhdWx0X3N0cmluZxj+ASABKAk6B1Jv",
-            "c2VidWQSHgoNZGVmYXVsdF9ieXRlcxj/ASABKAw6Bmpvc2h1YRITCgpmaWVs",
-            "ZG5hbWUxGJEDIAEoBRIUCgtmaWVsZF9uYW1lMhiSAyABKAUSFQoMX2ZpZWxk",
-            "X25hbWUzGJMDIAEoBRIWCg1maWVsZF9fbmFtZTRfGJQDIAEoBRIUCgtmaWVs",
-            "ZDBuYW1lNRiVAyABKAUSFgoNZmllbGRfMF9uYW1lNhiWAyABKAUSEwoKZmll",
-            "bGROYW1lNxiXAyABKAUSEwoKRmllbGROYW1lOBiYAyABKAUSFAoLZmllbGRf",
-            "TmFtZTkYmQMgASgFEhUKDEZpZWxkX05hbWUxMBiaAyABKAUSFQoMRklFTERf",
-            "TkFNRTExGJsDIAEoBRIVCgxGSUVMRF9uYW1lMTIYnAMgASgFEhcKDl9fZmll",
-            "bGRfbmFtZTEzGJ0DIAEoBRIXCg5fX0ZpZWxkX25hbWUxNBieAyABKAUSFgoN",
-            "ZmllbGRfX25hbWUxNRifAyABKAUSFgoNZmllbGRfX05hbWUxNhigAyABKAUS",
-            "FwoOZmllbGRfbmFtZTE3X18YoQMgASgFEhcKDkZpZWxkX25hbWUxOF9fGKID",
-            "IAEoBRpiCg1OZXN0ZWRNZXNzYWdlEgkKAWEYASABKAUSRgoLY29yZWN1cnNp",
-            "dmUYAiABKAsyMS5wcm90b2J1Zl90ZXN0X21lc3NhZ2VzLnByb3RvMi5UZXN0",
-            "QWxsVHlwZXNQcm90bzIaNAoSTWFwSW50MzJJbnQzMkVudHJ5EgsKA2tleRgB",
-            "IAEoBRINCgV2YWx1ZRgCIAEoBToCOAEaNAoSTWFwSW50NjRJbnQ2NEVudHJ5",
-            "EgsKA2tleRgBIAEoAxINCgV2YWx1ZRgCIAEoAzoCOAEaNgoUTWFwVWludDMy",
-            "VWludDMyRW50cnkSCwoDa2V5GAEgASgNEg0KBXZhbHVlGAIgASgNOgI4ARo2",
-            "ChRNYXBVaW50NjRVaW50NjRFbnRyeRILCgNrZXkYASABKAQSDQoFdmFsdWUY",
-            "AiABKAQ6AjgBGjYKFE1hcFNpbnQzMlNpbnQzMkVudHJ5EgsKA2tleRgBIAEo",
-            "ERINCgV2YWx1ZRgCIAEoEToCOAEaNgoUTWFwU2ludDY0U2ludDY0RW50cnkS",
-            "CwoDa2V5GAEgASgSEg0KBXZhbHVlGAIgASgSOgI4ARo4ChZNYXBGaXhlZDMy",
-            "Rml4ZWQzMkVudHJ5EgsKA2tleRgBIAEoBxINCgV2YWx1ZRgCIAEoBzoCOAEa",
-            "OAoWTWFwRml4ZWQ2NEZpeGVkNjRFbnRyeRILCgNrZXkYASABKAYSDQoFdmFs",
-            "dWUYAiABKAY6AjgBGjoKGE1hcFNmaXhlZDMyU2ZpeGVkMzJFbnRyeRILCgNr",
-            "ZXkYASABKA8SDQoFdmFsdWUYAiABKA86AjgBGjoKGE1hcFNmaXhlZDY0U2Zp",
-            "eGVkNjRFbnRyeRILCgNrZXkYASABKBASDQoFdmFsdWUYAiABKBA6AjgBGjQK",
-            "Ek1hcEludDMyRmxvYXRFbnRyeRILCgNrZXkYASABKAUSDQoFdmFsdWUYAiAB",
-            "KAI6AjgBGjUKE01hcEludDMyRG91YmxlRW50cnkSCwoDa2V5GAEgASgFEg0K",
-            "BXZhbHVlGAIgASgBOgI4ARoyChBNYXBCb29sQm9vbEVudHJ5EgsKA2tleRgB",
-            "IAEoCBINCgV2YWx1ZRgCIAEoCDoCOAEaNgoUTWFwU3RyaW5nU3RyaW5nRW50",
-            "cnkSCwoDa2V5GAEgASgJEg0KBXZhbHVlGAIgASgJOgI4ARo1ChNNYXBTdHJp",
-            "bmdCeXRlc0VudHJ5EgsKA2tleRgBIAEoCRINCgV2YWx1ZRgCIAEoDDoCOAEa",
-            "fgobTWFwU3RyaW5nTmVzdGVkTWVzc2FnZUVudHJ5EgsKA2tleRgBIAEoCRJO",
-            "CgV2YWx1ZRgCIAEoCzI/LnByb3RvYnVmX3Rlc3RfbWVzc2FnZXMucHJvdG8y",
-            "LlRlc3RBbGxUeXBlc1Byb3RvMi5OZXN0ZWRNZXNzYWdlOgI4ARpzChxNYXBT",
-            "dHJpbmdGb3JlaWduTWVzc2FnZUVudHJ5EgsKA2tleRgBIAEoCRJCCgV2YWx1",
-            "ZRgCIAEoCzIzLnByb3RvYnVmX3Rlc3RfbWVzc2FnZXMucHJvdG8yLkZvcmVp",
-            "Z25NZXNzYWdlUHJvdG8yOgI4ARp4ChhNYXBTdHJpbmdOZXN0ZWRFbnVtRW50",
-            "cnkSCwoDa2V5GAEgASgJEksKBXZhbHVlGAIgASgOMjwucHJvdG9idWZfdGVz",
-            "dF9tZXNzYWdlcy5wcm90bzIuVGVzdEFsbFR5cGVzUHJvdG8yLk5lc3RlZEVu",
-            "dW06AjgBGm0KGU1hcFN0cmluZ0ZvcmVpZ25FbnVtRW50cnkSCwoDa2V5GAEg",
-            "ASgJEj8KBXZhbHVlGAIgASgOMjAucHJvdG9idWZfdGVzdF9tZXNzYWdlcy5w",
-            "cm90bzIuRm9yZWlnbkVudW1Qcm90bzI6AjgBGjMKBERhdGESFAoLZ3JvdXBf",
-            "aW50MzIYygEgASgFEhUKDGdyb3VwX3VpbnQzMhjLASABKA0aIQoRTWVzc2Fn",
-            "ZVNldENvcnJlY3QqCAgEEP////8HOgIIARrgAQobTWVzc2FnZVNldENvcnJl",
-            "Y3RFeHRlbnNpb24xEgsKA3N0chgZIAEoCTKzAQoVbWVzc2FnZV9zZXRfZXh0",
-            "ZW5zaW9uEkMucHJvdG9idWZfdGVzdF9tZXNzYWdlcy5wcm90bzIuVGVzdEFs",
-            "bFR5cGVzUHJvdG8yLk1lc3NhZ2VTZXRDb3JyZWN0GPm7XiABKAsyTS5wcm90",
-            "b2J1Zl90ZXN0X21lc3NhZ2VzLnByb3RvMi5UZXN0QWxsVHlwZXNQcm90bzIu",
-            "TWVzc2FnZVNldENvcnJlY3RFeHRlbnNpb24xGt8BChtNZXNzYWdlU2V0Q29y",
-            "cmVjdEV4dGVuc2lvbjISCQoBaRgJIAEoBTK0AQoVbWVzc2FnZV9zZXRfZXh0",
-            "ZW5zaW9uEkMucHJvdG9idWZfdGVzdF9tZXNzYWdlcy5wcm90bzIuVGVzdEFs",
-            "bFR5cGVzUHJvdG8yLk1lc3NhZ2VTZXRDb3JyZWN0GJCz/AEgASgLMk0ucHJv",
-            "dG9idWZfdGVzdF9tZXNzYWdlcy5wcm90bzIuVGVzdEFsbFR5cGVzUHJvdG8y",
-            "Lk1lc3NhZ2VTZXRDb3JyZWN0RXh0ZW5zaW9uMiI5CgpOZXN0ZWRFbnVtEgcK",
-            "A0ZPTxAAEgcKA0JBUhABEgcKA0JBWhACEhAKA05FRxD///////////8BKgUI",
-            "eBDJAUINCgtvbmVvZl9maWVsZEoGCOgHEJBOIiEKFEZvcmVpZ25NZXNzYWdl",
-            "UHJvdG8yEgkKAWMYASABKAUiwQIKFVVua25vd25Ub1Rlc3RBbGxUeXBlcxIX",
-            "Cg5vcHRpb25hbF9pbnQzMhjpByABKAUSGAoPb3B0aW9uYWxfc3RyaW5nGOoH",
-            "IAEoCRJMCg5uZXN0ZWRfbWVzc2FnZRjrByABKAsyMy5wcm90b2J1Zl90ZXN0",
-            "X21lc3NhZ2VzLnByb3RvMi5Gb3JlaWduTWVzc2FnZVByb3RvMhJaCg1vcHRp",
-            "b25hbGdyb3VwGOwHIAEoCjJCLnByb3RvYnVmX3Rlc3RfbWVzc2FnZXMucHJv",
-            "dG8yLlVua25vd25Ub1Rlc3RBbGxUeXBlcy5PcHRpb25hbEdyb3VwEhYKDW9w",
-            "dGlvbmFsX2Jvb2wY7gcgASgIEhcKDnJlcGVhdGVkX2ludDMyGPMHIAMoBRoa",
-            "Cg1PcHRpb25hbEdyb3VwEgkKAWEYASABKAUiFgoUTnVsbEh5cG90aGVzaXNQ",
-            "cm90bzIiLwoORW51bU9ubHlQcm90bzIiHQoEQm9vbBIKCgZrRmFsc2UQABIJ",
-            "CgVrVHJ1ZRABIh8KD09uZVN0cmluZ1Byb3RvMhIMCgRkYXRhGAEgASgJKkYK",
-            "EUZvcmVpZ25FbnVtUHJvdG8yEg8KC0ZPUkVJR05fRk9PEAASDwoLRk9SRUlH",
-            "Tl9CQVIQARIPCgtGT1JFSUdOX0JBWhACOkoKD2V4dGVuc2lvbl9pbnQzMhIx",
-            "LnByb3RvYnVmX3Rlc3RfbWVzc2FnZXMucHJvdG8yLlRlc3RBbGxUeXBlc1By",
-            "b3RvMhh4IAEoBUIvCihjb20uZ29vZ2xlLnByb3RvYnVmX3Rlc3RfbWVzc2Fn",
-            "ZXMucHJvdG8ySAH4AQE="));
-      descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-          new pbr::FileDescriptor[] { },
-          new pbr::GeneratedClrTypeInfo(new[] {typeof(global::ProtobufTestMessages.Proto2.ForeignEnumProto2), }, new pb::Extension[] { TestMessagesProto2Extensions.ExtensionInt32 }, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::ProtobufTestMessages.Proto2.TestAllTypesProto2), global::ProtobufTestMessages.Proto2.TestAllTypesProto2.Parser, new[]{ "OptionalInt32", "OptionalInt64", "OptionalUint32", "OptionalUint64", "OptionalSint32", "OptionalSint64", "OptionalFixed32", "OptionalFixed64", "OptionalSfixed32", "OptionalSfixed64", "OptionalFloat", "OptionalDouble", "OptionalBool", "OptionalString", "OptionalBytes", "OptionalNestedMessage", "OptionalForeignMessage", "OptionalNestedEnum", "OptionalForeignEnum", "OptionalStringPiece", "OptionalCord", "RecursiveMessage", "RepeatedInt32", "RepeatedInt64", "RepeatedUint32", "RepeatedUint64", "RepeatedSint32", "RepeatedSint64", "RepeatedFixed32", "RepeatedFixed64", "RepeatedSfixed32", "RepeatedSfixed64", "RepeatedFloat", "RepeatedDouble", "RepeatedBool", "RepeatedString", "RepeatedBytes", "RepeatedNestedMessage", "RepeatedForeignMessage", "RepeatedNestedEnum", "RepeatedForeignEnum", "RepeatedStringPiece", "RepeatedCord", "PackedInt32", "PackedInt64", "PackedUint32", "PackedUint64", "PackedSint32", "PackedSint64", "PackedFixed32", "PackedFixed64", "PackedSfixed32", "PackedSfixed64", "PackedFloat", "PackedDouble", "PackedBool", "PackedNestedEnum", "UnpackedInt32", "UnpackedInt64", "UnpackedUint32", "UnpackedUint64", "UnpackedSint32", "UnpackedSint64", "UnpackedFixed32", "UnpackedFixed64", "UnpackedSfixed32", "UnpackedSfixed64", "UnpackedFloat", "UnpackedDouble", "UnpackedBool", "UnpackedNestedEnum", "MapInt32Int32", "MapInt64Int64", "MapUint32Uint32", "MapUint64Uint64", "MapSint32Sint32", "MapSint64Sint64", "MapFixed32Fixed32", "MapFixed64Fixed64", "MapSfixed32Sfixed32", "MapSfixed64Sfixed64", "MapInt32Float", "MapInt32Double", "MapBoolBool", "MapStringString", "MapStringBytes", "MapStringNestedMessage", "MapStringForeignMessage", "MapStringNestedEnum", "MapStringForeignEnum", "OneofUint32", "OneofNestedMessage", "OneofString", "OneofBytes", "OneofBool", "OneofUint64", "OneofFloat", "OneofDouble", "OneofEnum", "Data", "DefaultInt32", "DefaultInt64", "DefaultUint32", "DefaultUint64", "DefaultSint32", "DefaultSint64", "DefaultFixed32", "DefaultFixed64", "DefaultSfixed32", "DefaultSfixed64", "DefaultFloat", "DefaultDouble", "DefaultBool", "DefaultString", "DefaultBytes", "Fieldname1", "FieldName2", "FieldName3", "FieldName4", "Field0Name5", "Field0Name6", "FieldName7", "FieldName8", "FieldName9", "FieldName10", "FIELDNAME11", "FIELDName12", "FieldName13", "FieldName14", "FieldName15", "FieldName16", "FieldName17", "FieldName18" }, new[]{ "OneofField" }, new[]{ typeof(global::ProtobufTestMessages.Proto2.TestAllTypesProto2.Types.NestedEnum) }, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::ProtobufTestMessages.Proto2.TestAllTypesProto2.Types.NestedMessage), global::ProtobufTestMessages.Proto2.TestAllTypesProto2.Types.NestedMessage.Parser, new[]{ "A", "Corecursive" }, null, null, null, null),
-            null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, new pbr::GeneratedClrTypeInfo(typeof(global::ProtobufTestMessages.Proto2.TestAllTypesProto2.Types.Data), global::ProtobufTestMessages.Proto2.TestAllTypesProto2.Types.Data.Parser, new[]{ "GroupInt32", "GroupUint32" }, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::ProtobufTestMessages.Proto2.TestAllTypesProto2.Types.MessageSetCorrect), global::ProtobufTestMessages.Proto2.TestAllTypesProto2.Types.MessageSetCorrect.Parser, null, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::ProtobufTestMessages.Proto2.TestAllTypesProto2.Types.MessageSetCorrectExtension1), global::ProtobufTestMessages.Proto2.TestAllTypesProto2.Types.MessageSetCorrectExtension1.Parser, new[]{ "Str" }, null, null, new pb::Extension[] { global::ProtobufTestMessages.Proto2.TestAllTypesProto2.Types.MessageSetCorrectExtension1.Extensions.MessageSetExtension }, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::ProtobufTestMessages.Proto2.TestAllTypesProto2.Types.MessageSetCorrectExtension2), global::ProtobufTestMessages.Proto2.TestAllTypesProto2.Types.MessageSetCorrectExtension2.Parser, new[]{ "I" }, null, null, new pb::Extension[] { global::ProtobufTestMessages.Proto2.TestAllTypesProto2.Types.MessageSetCorrectExtension2.Extensions.MessageSetExtension }, null)}),
-            new pbr::GeneratedClrTypeInfo(typeof(global::ProtobufTestMessages.Proto2.ForeignMessageProto2), global::ProtobufTestMessages.Proto2.ForeignMessageProto2.Parser, new[]{ "C" }, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::ProtobufTestMessages.Proto2.UnknownToTestAllTypes), global::ProtobufTestMessages.Proto2.UnknownToTestAllTypes.Parser, new[]{ "OptionalInt32", "OptionalString", "NestedMessage", "OptionalGroup", "OptionalBool", "RepeatedInt32" }, null, null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::ProtobufTestMessages.Proto2.UnknownToTestAllTypes.Types.OptionalGroup), global::ProtobufTestMessages.Proto2.UnknownToTestAllTypes.Types.OptionalGroup.Parser, new[]{ "A" }, null, null, null, null)}),
-            new pbr::GeneratedClrTypeInfo(typeof(global::ProtobufTestMessages.Proto2.NullHypothesisProto2), global::ProtobufTestMessages.Proto2.NullHypothesisProto2.Parser, null, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::ProtobufTestMessages.Proto2.EnumOnlyProto2), global::ProtobufTestMessages.Proto2.EnumOnlyProto2.Parser, null, null, new[]{ typeof(global::ProtobufTestMessages.Proto2.EnumOnlyProto2.Types.Bool) }, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::ProtobufTestMessages.Proto2.OneStringProto2), global::ProtobufTestMessages.Proto2.OneStringProto2.Parser, new[]{ "Data" }, null, null, null, null)
-          }));
-    }
-    #endregion
-
-  }
-  /// <summary>Holder for extension identifiers generated from the top level of google/protobuf/test_messages_proto2.proto</summary>
-  public static partial class TestMessagesProto2Extensions {
-    public static readonly pb::Extension<global::ProtobufTestMessages.Proto2.TestAllTypesProto2, int> ExtensionInt32 =
-      new pb::Extension<global::ProtobufTestMessages.Proto2.TestAllTypesProto2, int>(120, pb::FieldCodec.ForInt32(960, 0));
-  }
-
-  #region Enums
-  public enum ForeignEnumProto2 {
-    [pbr::OriginalName("FOREIGN_FOO")] ForeignFoo = 0,
-    [pbr::OriginalName("FOREIGN_BAR")] ForeignBar = 1,
-    [pbr::OriginalName("FOREIGN_BAZ")] ForeignBaz = 2,
-  }
-
-  #endregion
-
-  #region Messages
-  /// <summary>
-  /// This proto includes every type of field in both singular and repeated
-  /// forms.
-  ///
-  /// Also, crucially, all messages and enums in this file are eventually
-  /// submessages of this message.  So for example, a fuzz test of TestAllTypes
-  /// could trigger bugs that occur in any message type in this file.  We verify
-  /// this stays true in a unit test.
-  /// </summary>
-  public sealed partial class TestAllTypesProto2 : pb::IExtendableMessage<TestAllTypesProto2>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<TestAllTypesProto2> _parser = new pb::MessageParser<TestAllTypesProto2>(() => new TestAllTypesProto2());
-    private pb::UnknownFieldSet _unknownFields;
-    private pb::ExtensionSet<TestAllTypesProto2> _extensions;
-    private pb::ExtensionSet<TestAllTypesProto2> _Extensions { get { return _extensions; } }
-    private int _hasBits0;
-    private int _hasBits1;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<TestAllTypesProto2> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::ProtobufTestMessages.Proto2.TestMessagesProto2Reflection.Descriptor.MessageTypes[0]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestAllTypesProto2() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestAllTypesProto2(TestAllTypesProto2 other) : this() {
-      _hasBits0 = other._hasBits0;
-      _hasBits1 = other._hasBits1;
-      optionalInt32_ = other.optionalInt32_;
-      optionalInt64_ = other.optionalInt64_;
-      optionalUint32_ = other.optionalUint32_;
-      optionalUint64_ = other.optionalUint64_;
-      optionalSint32_ = other.optionalSint32_;
-      optionalSint64_ = other.optionalSint64_;
-      optionalFixed32_ = other.optionalFixed32_;
-      optionalFixed64_ = other.optionalFixed64_;
-      optionalSfixed32_ = other.optionalSfixed32_;
-      optionalSfixed64_ = other.optionalSfixed64_;
-      optionalFloat_ = other.optionalFloat_;
-      optionalDouble_ = other.optionalDouble_;
-      optionalBool_ = other.optionalBool_;
-      optionalString_ = other.optionalString_;
-      optionalBytes_ = other.optionalBytes_;
-      optionalNestedMessage_ = other.optionalNestedMessage_ != null ? other.optionalNestedMessage_.Clone() : null;
-      optionalForeignMessage_ = other.optionalForeignMessage_ != null ? other.optionalForeignMessage_.Clone() : null;
-      optionalNestedEnum_ = other.optionalNestedEnum_;
-      optionalForeignEnum_ = other.optionalForeignEnum_;
-      optionalStringPiece_ = other.optionalStringPiece_;
-      optionalCord_ = other.optionalCord_;
-      recursiveMessage_ = other.recursiveMessage_ != null ? other.recursiveMessage_.Clone() : null;
-      repeatedInt32_ = other.repeatedInt32_.Clone();
-      repeatedInt64_ = other.repeatedInt64_.Clone();
-      repeatedUint32_ = other.repeatedUint32_.Clone();
-      repeatedUint64_ = other.repeatedUint64_.Clone();
-      repeatedSint32_ = other.repeatedSint32_.Clone();
-      repeatedSint64_ = other.repeatedSint64_.Clone();
-      repeatedFixed32_ = other.repeatedFixed32_.Clone();
-      repeatedFixed64_ = other.repeatedFixed64_.Clone();
-      repeatedSfixed32_ = other.repeatedSfixed32_.Clone();
-      repeatedSfixed64_ = other.repeatedSfixed64_.Clone();
-      repeatedFloat_ = other.repeatedFloat_.Clone();
-      repeatedDouble_ = other.repeatedDouble_.Clone();
-      repeatedBool_ = other.repeatedBool_.Clone();
-      repeatedString_ = other.repeatedString_.Clone();
-      repeatedBytes_ = other.repeatedBytes_.Clone();
-      repeatedNestedMessage_ = other.repeatedNestedMessage_.Clone();
-      repeatedForeignMessage_ = other.repeatedForeignMessage_.Clone();
-      repeatedNestedEnum_ = other.repeatedNestedEnum_.Clone();
-      repeatedForeignEnum_ = other.repeatedForeignEnum_.Clone();
-      repeatedStringPiece_ = other.repeatedStringPiece_.Clone();
-      repeatedCord_ = other.repeatedCord_.Clone();
-      packedInt32_ = other.packedInt32_.Clone();
-      packedInt64_ = other.packedInt64_.Clone();
-      packedUint32_ = other.packedUint32_.Clone();
-      packedUint64_ = other.packedUint64_.Clone();
-      packedSint32_ = other.packedSint32_.Clone();
-      packedSint64_ = other.packedSint64_.Clone();
-      packedFixed32_ = other.packedFixed32_.Clone();
-      packedFixed64_ = other.packedFixed64_.Clone();
-      packedSfixed32_ = other.packedSfixed32_.Clone();
-      packedSfixed64_ = other.packedSfixed64_.Clone();
-      packedFloat_ = other.packedFloat_.Clone();
-      packedDouble_ = other.packedDouble_.Clone();
-      packedBool_ = other.packedBool_.Clone();
-      packedNestedEnum_ = other.packedNestedEnum_.Clone();
-      unpackedInt32_ = other.unpackedInt32_.Clone();
-      unpackedInt64_ = other.unpackedInt64_.Clone();
-      unpackedUint32_ = other.unpackedUint32_.Clone();
-      unpackedUint64_ = other.unpackedUint64_.Clone();
-      unpackedSint32_ = other.unpackedSint32_.Clone();
-      unpackedSint64_ = other.unpackedSint64_.Clone();
-      unpackedFixed32_ = other.unpackedFixed32_.Clone();
-      unpackedFixed64_ = other.unpackedFixed64_.Clone();
-      unpackedSfixed32_ = other.unpackedSfixed32_.Clone();
-      unpackedSfixed64_ = other.unpackedSfixed64_.Clone();
-      unpackedFloat_ = other.unpackedFloat_.Clone();
-      unpackedDouble_ = other.unpackedDouble_.Clone();
-      unpackedBool_ = other.unpackedBool_.Clone();
-      unpackedNestedEnum_ = other.unpackedNestedEnum_.Clone();
-      mapInt32Int32_ = other.mapInt32Int32_.Clone();
-      mapInt64Int64_ = other.mapInt64Int64_.Clone();
-      mapUint32Uint32_ = other.mapUint32Uint32_.Clone();
-      mapUint64Uint64_ = other.mapUint64Uint64_.Clone();
-      mapSint32Sint32_ = other.mapSint32Sint32_.Clone();
-      mapSint64Sint64_ = other.mapSint64Sint64_.Clone();
-      mapFixed32Fixed32_ = other.mapFixed32Fixed32_.Clone();
-      mapFixed64Fixed64_ = other.mapFixed64Fixed64_.Clone();
-      mapSfixed32Sfixed32_ = other.mapSfixed32Sfixed32_.Clone();
-      mapSfixed64Sfixed64_ = other.mapSfixed64Sfixed64_.Clone();
-      mapInt32Float_ = other.mapInt32Float_.Clone();
-      mapInt32Double_ = other.mapInt32Double_.Clone();
-      mapBoolBool_ = other.mapBoolBool_.Clone();
-      mapStringString_ = other.mapStringString_.Clone();
-      mapStringBytes_ = other.mapStringBytes_.Clone();
-      mapStringNestedMessage_ = other.mapStringNestedMessage_.Clone();
-      mapStringForeignMessage_ = other.mapStringForeignMessage_.Clone();
-      mapStringNestedEnum_ = other.mapStringNestedEnum_.Clone();
-      mapStringForeignEnum_ = other.mapStringForeignEnum_.Clone();
-      data_ = other.HasData ? other.data_.Clone() : null;
-      defaultInt32_ = other.defaultInt32_;
-      defaultInt64_ = other.defaultInt64_;
-      defaultUint32_ = other.defaultUint32_;
-      defaultUint64_ = other.defaultUint64_;
-      defaultSint32_ = other.defaultSint32_;
-      defaultSint64_ = other.defaultSint64_;
-      defaultFixed32_ = other.defaultFixed32_;
-      defaultFixed64_ = other.defaultFixed64_;
-      defaultSfixed32_ = other.defaultSfixed32_;
-      defaultSfixed64_ = other.defaultSfixed64_;
-      defaultFloat_ = other.defaultFloat_;
-      defaultDouble_ = other.defaultDouble_;
-      defaultBool_ = other.defaultBool_;
-      defaultString_ = other.defaultString_;
-      defaultBytes_ = other.defaultBytes_;
-      fieldname1_ = other.fieldname1_;
-      fieldName2_ = other.fieldName2_;
-      FieldName3_ = other.FieldName3_;
-      fieldName4_ = other.fieldName4_;
-      field0Name5_ = other.field0Name5_;
-      field0Name6_ = other.field0Name6_;
-      fieldName7_ = other.fieldName7_;
-      fieldName8_ = other.fieldName8_;
-      fieldName9_ = other.fieldName9_;
-      fieldName10_ = other.fieldName10_;
-      fIELDNAME11_ = other.fIELDNAME11_;
-      fIELDName12_ = other.fIELDName12_;
-      FieldName13_ = other.FieldName13_;
-      FieldName14_ = other.FieldName14_;
-      fieldName15_ = other.fieldName15_;
-      fieldName16_ = other.fieldName16_;
-      fieldName17_ = other.fieldName17_;
-      fieldName18_ = other.fieldName18_;
-      switch (other.OneofFieldCase) {
-        case OneofFieldOneofCase.OneofUint32:
-          OneofUint32 = other.OneofUint32;
-          break;
-        case OneofFieldOneofCase.OneofNestedMessage:
-          OneofNestedMessage = other.OneofNestedMessage.Clone();
-          break;
-        case OneofFieldOneofCase.OneofString:
-          OneofString = other.OneofString;
-          break;
-        case OneofFieldOneofCase.OneofBytes:
-          OneofBytes = other.OneofBytes;
-          break;
-        case OneofFieldOneofCase.OneofBool:
-          OneofBool = other.OneofBool;
-          break;
-        case OneofFieldOneofCase.OneofUint64:
-          OneofUint64 = other.OneofUint64;
-          break;
-        case OneofFieldOneofCase.OneofFloat:
-          OneofFloat = other.OneofFloat;
-          break;
-        case OneofFieldOneofCase.OneofDouble:
-          OneofDouble = other.OneofDouble;
-          break;
-        case OneofFieldOneofCase.OneofEnum:
-          OneofEnum = other.OneofEnum;
-          break;
-      }
-
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-      _extensions = pb::ExtensionSet.Clone(other._extensions);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestAllTypesProto2 Clone() {
-      return new TestAllTypesProto2(this);
-    }
-
-    /// <summary>Field number for the "optional_int32" field.</summary>
-    public const int OptionalInt32FieldNumber = 1;
-    private readonly static int OptionalInt32DefaultValue = 0;
-
-    private int optionalInt32_;
-    /// <summary>
-    /// Singular
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int OptionalInt32 {
-      get { if ((_hasBits0 & 1) != 0) { return optionalInt32_; } else { return OptionalInt32DefaultValue; } }
-      set {
-        _hasBits0 |= 1;
-        optionalInt32_ = value;
-      }
-    }
-    /// <summary>Gets whether the "optional_int32" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasOptionalInt32 {
-      get { return (_hasBits0 & 1) != 0; }
-    }
-    /// <summary>Clears the value of the "optional_int32" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearOptionalInt32() {
-      _hasBits0 &= ~1;
-    }
-
-    /// <summary>Field number for the "optional_int64" field.</summary>
-    public const int OptionalInt64FieldNumber = 2;
-    private readonly static long OptionalInt64DefaultValue = 0L;
-
-    private long optionalInt64_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public long OptionalInt64 {
-      get { if ((_hasBits0 & 2) != 0) { return optionalInt64_; } else { return OptionalInt64DefaultValue; } }
-      set {
-        _hasBits0 |= 2;
-        optionalInt64_ = value;
-      }
-    }
-    /// <summary>Gets whether the "optional_int64" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasOptionalInt64 {
-      get { return (_hasBits0 & 2) != 0; }
-    }
-    /// <summary>Clears the value of the "optional_int64" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearOptionalInt64() {
-      _hasBits0 &= ~2;
-    }
-
-    /// <summary>Field number for the "optional_uint32" field.</summary>
-    public const int OptionalUint32FieldNumber = 3;
-    private readonly static uint OptionalUint32DefaultValue = 0;
-
-    private uint optionalUint32_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public uint OptionalUint32 {
-      get { if ((_hasBits0 & 4) != 0) { return optionalUint32_; } else { return OptionalUint32DefaultValue; } }
-      set {
-        _hasBits0 |= 4;
-        optionalUint32_ = value;
-      }
-    }
-    /// <summary>Gets whether the "optional_uint32" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasOptionalUint32 {
-      get { return (_hasBits0 & 4) != 0; }
-    }
-    /// <summary>Clears the value of the "optional_uint32" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearOptionalUint32() {
-      _hasBits0 &= ~4;
-    }
-
-    /// <summary>Field number for the "optional_uint64" field.</summary>
-    public const int OptionalUint64FieldNumber = 4;
-    private readonly static ulong OptionalUint64DefaultValue = 0UL;
-
-    private ulong optionalUint64_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ulong OptionalUint64 {
-      get { if ((_hasBits0 & 8) != 0) { return optionalUint64_; } else { return OptionalUint64DefaultValue; } }
-      set {
-        _hasBits0 |= 8;
-        optionalUint64_ = value;
-      }
-    }
-    /// <summary>Gets whether the "optional_uint64" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasOptionalUint64 {
-      get { return (_hasBits0 & 8) != 0; }
-    }
-    /// <summary>Clears the value of the "optional_uint64" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearOptionalUint64() {
-      _hasBits0 &= ~8;
-    }
-
-    /// <summary>Field number for the "optional_sint32" field.</summary>
-    public const int OptionalSint32FieldNumber = 5;
-    private readonly static int OptionalSint32DefaultValue = 0;
-
-    private int optionalSint32_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int OptionalSint32 {
-      get { if ((_hasBits0 & 16) != 0) { return optionalSint32_; } else { return OptionalSint32DefaultValue; } }
-      set {
-        _hasBits0 |= 16;
-        optionalSint32_ = value;
-      }
-    }
-    /// <summary>Gets whether the "optional_sint32" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasOptionalSint32 {
-      get { return (_hasBits0 & 16) != 0; }
-    }
-    /// <summary>Clears the value of the "optional_sint32" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearOptionalSint32() {
-      _hasBits0 &= ~16;
-    }
-
-    /// <summary>Field number for the "optional_sint64" field.</summary>
-    public const int OptionalSint64FieldNumber = 6;
-    private readonly static long OptionalSint64DefaultValue = 0L;
-
-    private long optionalSint64_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public long OptionalSint64 {
-      get { if ((_hasBits0 & 32) != 0) { return optionalSint64_; } else { return OptionalSint64DefaultValue; } }
-      set {
-        _hasBits0 |= 32;
-        optionalSint64_ = value;
-      }
-    }
-    /// <summary>Gets whether the "optional_sint64" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasOptionalSint64 {
-      get { return (_hasBits0 & 32) != 0; }
-    }
-    /// <summary>Clears the value of the "optional_sint64" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearOptionalSint64() {
-      _hasBits0 &= ~32;
-    }
-
-    /// <summary>Field number for the "optional_fixed32" field.</summary>
-    public const int OptionalFixed32FieldNumber = 7;
-    private readonly static uint OptionalFixed32DefaultValue = 0;
-
-    private uint optionalFixed32_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public uint OptionalFixed32 {
-      get { if ((_hasBits0 & 64) != 0) { return optionalFixed32_; } else { return OptionalFixed32DefaultValue; } }
-      set {
-        _hasBits0 |= 64;
-        optionalFixed32_ = value;
-      }
-    }
-    /// <summary>Gets whether the "optional_fixed32" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasOptionalFixed32 {
-      get { return (_hasBits0 & 64) != 0; }
-    }
-    /// <summary>Clears the value of the "optional_fixed32" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearOptionalFixed32() {
-      _hasBits0 &= ~64;
-    }
-
-    /// <summary>Field number for the "optional_fixed64" field.</summary>
-    public const int OptionalFixed64FieldNumber = 8;
-    private readonly static ulong OptionalFixed64DefaultValue = 0UL;
-
-    private ulong optionalFixed64_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ulong OptionalFixed64 {
-      get { if ((_hasBits0 & 128) != 0) { return optionalFixed64_; } else { return OptionalFixed64DefaultValue; } }
-      set {
-        _hasBits0 |= 128;
-        optionalFixed64_ = value;
-      }
-    }
-    /// <summary>Gets whether the "optional_fixed64" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasOptionalFixed64 {
-      get { return (_hasBits0 & 128) != 0; }
-    }
-    /// <summary>Clears the value of the "optional_fixed64" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearOptionalFixed64() {
-      _hasBits0 &= ~128;
-    }
-
-    /// <summary>Field number for the "optional_sfixed32" field.</summary>
-    public const int OptionalSfixed32FieldNumber = 9;
-    private readonly static int OptionalSfixed32DefaultValue = 0;
-
-    private int optionalSfixed32_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int OptionalSfixed32 {
-      get { if ((_hasBits0 & 256) != 0) { return optionalSfixed32_; } else { return OptionalSfixed32DefaultValue; } }
-      set {
-        _hasBits0 |= 256;
-        optionalSfixed32_ = value;
-      }
-    }
-    /// <summary>Gets whether the "optional_sfixed32" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasOptionalSfixed32 {
-      get { return (_hasBits0 & 256) != 0; }
-    }
-    /// <summary>Clears the value of the "optional_sfixed32" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearOptionalSfixed32() {
-      _hasBits0 &= ~256;
-    }
-
-    /// <summary>Field number for the "optional_sfixed64" field.</summary>
-    public const int OptionalSfixed64FieldNumber = 10;
-    private readonly static long OptionalSfixed64DefaultValue = 0L;
-
-    private long optionalSfixed64_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public long OptionalSfixed64 {
-      get { if ((_hasBits0 & 512) != 0) { return optionalSfixed64_; } else { return OptionalSfixed64DefaultValue; } }
-      set {
-        _hasBits0 |= 512;
-        optionalSfixed64_ = value;
-      }
-    }
-    /// <summary>Gets whether the "optional_sfixed64" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasOptionalSfixed64 {
-      get { return (_hasBits0 & 512) != 0; }
-    }
-    /// <summary>Clears the value of the "optional_sfixed64" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearOptionalSfixed64() {
-      _hasBits0 &= ~512;
-    }
-
-    /// <summary>Field number for the "optional_float" field.</summary>
-    public const int OptionalFloatFieldNumber = 11;
-    private readonly static float OptionalFloatDefaultValue = 0F;
-
-    private float optionalFloat_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public float OptionalFloat {
-      get { if ((_hasBits0 & 1024) != 0) { return optionalFloat_; } else { return OptionalFloatDefaultValue; } }
-      set {
-        _hasBits0 |= 1024;
-        optionalFloat_ = value;
-      }
-    }
-    /// <summary>Gets whether the "optional_float" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasOptionalFloat {
-      get { return (_hasBits0 & 1024) != 0; }
-    }
-    /// <summary>Clears the value of the "optional_float" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearOptionalFloat() {
-      _hasBits0 &= ~1024;
-    }
-
-    /// <summary>Field number for the "optional_double" field.</summary>
-    public const int OptionalDoubleFieldNumber = 12;
-    private readonly static double OptionalDoubleDefaultValue = 0D;
-
-    private double optionalDouble_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double OptionalDouble {
-      get { if ((_hasBits0 & 2048) != 0) { return optionalDouble_; } else { return OptionalDoubleDefaultValue; } }
-      set {
-        _hasBits0 |= 2048;
-        optionalDouble_ = value;
-      }
-    }
-    /// <summary>Gets whether the "optional_double" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasOptionalDouble {
-      get { return (_hasBits0 & 2048) != 0; }
-    }
-    /// <summary>Clears the value of the "optional_double" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearOptionalDouble() {
-      _hasBits0 &= ~2048;
-    }
-
-    /// <summary>Field number for the "optional_bool" field.</summary>
-    public const int OptionalBoolFieldNumber = 13;
-    private readonly static bool OptionalBoolDefaultValue = false;
-
-    private bool optionalBool_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool OptionalBool {
-      get { if ((_hasBits0 & 4096) != 0) { return optionalBool_; } else { return OptionalBoolDefaultValue; } }
-      set {
-        _hasBits0 |= 4096;
-        optionalBool_ = value;
-      }
-    }
-    /// <summary>Gets whether the "optional_bool" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasOptionalBool {
-      get { return (_hasBits0 & 4096) != 0; }
-    }
-    /// <summary>Clears the value of the "optional_bool" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearOptionalBool() {
-      _hasBits0 &= ~4096;
-    }
-
-    /// <summary>Field number for the "optional_string" field.</summary>
-    public const int OptionalStringFieldNumber = 14;
-    private readonly static string OptionalStringDefaultValue = "";
-
-    private string optionalString_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string OptionalString {
-      get { return optionalString_ ?? OptionalStringDefaultValue; }
-      set {
-        optionalString_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-    /// <summary>Gets whether the "optional_string" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasOptionalString {
-      get { return optionalString_ != null; }
-    }
-    /// <summary>Clears the value of the "optional_string" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearOptionalString() {
-      optionalString_ = null;
-    }
-
-    /// <summary>Field number for the "optional_bytes" field.</summary>
-    public const int OptionalBytesFieldNumber = 15;
-    private readonly static pb::ByteString OptionalBytesDefaultValue = pb::ByteString.Empty;
-
-    private pb::ByteString optionalBytes_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pb::ByteString OptionalBytes {
-      get { return optionalBytes_ ?? OptionalBytesDefaultValue; }
-      set {
-        optionalBytes_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-    /// <summary>Gets whether the "optional_bytes" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasOptionalBytes {
-      get { return optionalBytes_ != null; }
-    }
-    /// <summary>Clears the value of the "optional_bytes" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearOptionalBytes() {
-      optionalBytes_ = null;
-    }
-
-    /// <summary>Field number for the "optional_nested_message" field.</summary>
-    public const int OptionalNestedMessageFieldNumber = 18;
-    private global::ProtobufTestMessages.Proto2.TestAllTypesProto2.Types.NestedMessage optionalNestedMessage_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::ProtobufTestMessages.Proto2.TestAllTypesProto2.Types.NestedMessage OptionalNestedMessage {
-      get { return optionalNestedMessage_; }
-      set {
-        optionalNestedMessage_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "optional_foreign_message" field.</summary>
-    public const int OptionalForeignMessageFieldNumber = 19;
-    private global::ProtobufTestMessages.Proto2.ForeignMessageProto2 optionalForeignMessage_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::ProtobufTestMessages.Proto2.ForeignMessageProto2 OptionalForeignMessage {
-      get { return optionalForeignMessage_; }
-      set {
-        optionalForeignMessage_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "optional_nested_enum" field.</summary>
-    public const int OptionalNestedEnumFieldNumber = 21;
-    private readonly static global::ProtobufTestMessages.Proto2.TestAllTypesProto2.Types.NestedEnum OptionalNestedEnumDefaultValue = global::ProtobufTestMessages.Proto2.TestAllTypesProto2.Types.NestedEnum.Foo;
-
-    private global::ProtobufTestMessages.Proto2.TestAllTypesProto2.Types.NestedEnum optionalNestedEnum_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::ProtobufTestMessages.Proto2.TestAllTypesProto2.Types.NestedEnum OptionalNestedEnum {
-      get { if ((_hasBits0 & 8192) != 0) { return optionalNestedEnum_; } else { return OptionalNestedEnumDefaultValue; } }
-      set {
-        _hasBits0 |= 8192;
-        optionalNestedEnum_ = value;
-      }
-    }
-    /// <summary>Gets whether the "optional_nested_enum" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasOptionalNestedEnum {
-      get { return (_hasBits0 & 8192) != 0; }
-    }
-    /// <summary>Clears the value of the "optional_nested_enum" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearOptionalNestedEnum() {
-      _hasBits0 &= ~8192;
-    }
-
-    /// <summary>Field number for the "optional_foreign_enum" field.</summary>
-    public const int OptionalForeignEnumFieldNumber = 22;
-    private readonly static global::ProtobufTestMessages.Proto2.ForeignEnumProto2 OptionalForeignEnumDefaultValue = global::ProtobufTestMessages.Proto2.ForeignEnumProto2.ForeignFoo;
-
-    private global::ProtobufTestMessages.Proto2.ForeignEnumProto2 optionalForeignEnum_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::ProtobufTestMessages.Proto2.ForeignEnumProto2 OptionalForeignEnum {
-      get { if ((_hasBits0 & 16384) != 0) { return optionalForeignEnum_; } else { return OptionalForeignEnumDefaultValue; } }
-      set {
-        _hasBits0 |= 16384;
-        optionalForeignEnum_ = value;
-      }
-    }
-    /// <summary>Gets whether the "optional_foreign_enum" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasOptionalForeignEnum {
-      get { return (_hasBits0 & 16384) != 0; }
-    }
-    /// <summary>Clears the value of the "optional_foreign_enum" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearOptionalForeignEnum() {
-      _hasBits0 &= ~16384;
-    }
-
-    /// <summary>Field number for the "optional_string_piece" field.</summary>
-    public const int OptionalStringPieceFieldNumber = 24;
-    private readonly static string OptionalStringPieceDefaultValue = "";
-
-    private string optionalStringPiece_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string OptionalStringPiece {
-      get { return optionalStringPiece_ ?? OptionalStringPieceDefaultValue; }
-      set {
-        optionalStringPiece_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-    /// <summary>Gets whether the "optional_string_piece" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasOptionalStringPiece {
-      get { return optionalStringPiece_ != null; }
-    }
-    /// <summary>Clears the value of the "optional_string_piece" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearOptionalStringPiece() {
-      optionalStringPiece_ = null;
-    }
-
-    /// <summary>Field number for the "optional_cord" field.</summary>
-    public const int OptionalCordFieldNumber = 25;
-    private readonly static string OptionalCordDefaultValue = "";
-
-    private string optionalCord_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string OptionalCord {
-      get { return optionalCord_ ?? OptionalCordDefaultValue; }
-      set {
-        optionalCord_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-    /// <summary>Gets whether the "optional_cord" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasOptionalCord {
-      get { return optionalCord_ != null; }
-    }
-    /// <summary>Clears the value of the "optional_cord" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearOptionalCord() {
-      optionalCord_ = null;
-    }
-
-    /// <summary>Field number for the "recursive_message" field.</summary>
-    public const int RecursiveMessageFieldNumber = 27;
-    private global::ProtobufTestMessages.Proto2.TestAllTypesProto2 recursiveMessage_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::ProtobufTestMessages.Proto2.TestAllTypesProto2 RecursiveMessage {
-      get { return recursiveMessage_; }
-      set {
-        recursiveMessage_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "repeated_int32" field.</summary>
-    public const int RepeatedInt32FieldNumber = 31;
-    private static readonly pb::FieldCodec<int> _repeated_repeatedInt32_codec
-        = pb::FieldCodec.ForInt32(248);
-    private readonly pbc::RepeatedField<int> repeatedInt32_ = new pbc::RepeatedField<int>();
-    /// <summary>
-    /// Repeated
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<int> RepeatedInt32 {
-      get { return repeatedInt32_; }
-    }
-
-    /// <summary>Field number for the "repeated_int64" field.</summary>
-    public const int RepeatedInt64FieldNumber = 32;
-    private static readonly pb::FieldCodec<long> _repeated_repeatedInt64_codec
-        = pb::FieldCodec.ForInt64(256);
-    private readonly pbc::RepeatedField<long> repeatedInt64_ = new pbc::RepeatedField<long>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<long> RepeatedInt64 {
-      get { return repeatedInt64_; }
-    }
-
-    /// <summary>Field number for the "repeated_uint32" field.</summary>
-    public const int RepeatedUint32FieldNumber = 33;
-    private static readonly pb::FieldCodec<uint> _repeated_repeatedUint32_codec
-        = pb::FieldCodec.ForUInt32(264);
-    private readonly pbc::RepeatedField<uint> repeatedUint32_ = new pbc::RepeatedField<uint>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<uint> RepeatedUint32 {
-      get { return repeatedUint32_; }
-    }
-
-    /// <summary>Field number for the "repeated_uint64" field.</summary>
-    public const int RepeatedUint64FieldNumber = 34;
-    private static readonly pb::FieldCodec<ulong> _repeated_repeatedUint64_codec
-        = pb::FieldCodec.ForUInt64(272);
-    private readonly pbc::RepeatedField<ulong> repeatedUint64_ = new pbc::RepeatedField<ulong>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<ulong> RepeatedUint64 {
-      get { return repeatedUint64_; }
-    }
-
-    /// <summary>Field number for the "repeated_sint32" field.</summary>
-    public const int RepeatedSint32FieldNumber = 35;
-    private static readonly pb::FieldCodec<int> _repeated_repeatedSint32_codec
-        = pb::FieldCodec.ForSInt32(280);
-    private readonly pbc::RepeatedField<int> repeatedSint32_ = new pbc::RepeatedField<int>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<int> RepeatedSint32 {
-      get { return repeatedSint32_; }
-    }
-
-    /// <summary>Field number for the "repeated_sint64" field.</summary>
-    public const int RepeatedSint64FieldNumber = 36;
-    private static readonly pb::FieldCodec<long> _repeated_repeatedSint64_codec
-        = pb::FieldCodec.ForSInt64(288);
-    private readonly pbc::RepeatedField<long> repeatedSint64_ = new pbc::RepeatedField<long>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<long> RepeatedSint64 {
-      get { return repeatedSint64_; }
-    }
-
-    /// <summary>Field number for the "repeated_fixed32" field.</summary>
-    public const int RepeatedFixed32FieldNumber = 37;
-    private static readonly pb::FieldCodec<uint> _repeated_repeatedFixed32_codec
-        = pb::FieldCodec.ForFixed32(301);
-    private readonly pbc::RepeatedField<uint> repeatedFixed32_ = new pbc::RepeatedField<uint>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<uint> RepeatedFixed32 {
-      get { return repeatedFixed32_; }
-    }
-
-    /// <summary>Field number for the "repeated_fixed64" field.</summary>
-    public const int RepeatedFixed64FieldNumber = 38;
-    private static readonly pb::FieldCodec<ulong> _repeated_repeatedFixed64_codec
-        = pb::FieldCodec.ForFixed64(305);
-    private readonly pbc::RepeatedField<ulong> repeatedFixed64_ = new pbc::RepeatedField<ulong>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<ulong> RepeatedFixed64 {
-      get { return repeatedFixed64_; }
-    }
-
-    /// <summary>Field number for the "repeated_sfixed32" field.</summary>
-    public const int RepeatedSfixed32FieldNumber = 39;
-    private static readonly pb::FieldCodec<int> _repeated_repeatedSfixed32_codec
-        = pb::FieldCodec.ForSFixed32(317);
-    private readonly pbc::RepeatedField<int> repeatedSfixed32_ = new pbc::RepeatedField<int>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<int> RepeatedSfixed32 {
-      get { return repeatedSfixed32_; }
-    }
-
-    /// <summary>Field number for the "repeated_sfixed64" field.</summary>
-    public const int RepeatedSfixed64FieldNumber = 40;
-    private static readonly pb::FieldCodec<long> _repeated_repeatedSfixed64_codec
-        = pb::FieldCodec.ForSFixed64(321);
-    private readonly pbc::RepeatedField<long> repeatedSfixed64_ = new pbc::RepeatedField<long>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<long> RepeatedSfixed64 {
-      get { return repeatedSfixed64_; }
-    }
-
-    /// <summary>Field number for the "repeated_float" field.</summary>
-    public const int RepeatedFloatFieldNumber = 41;
-    private static readonly pb::FieldCodec<float> _repeated_repeatedFloat_codec
-        = pb::FieldCodec.ForFloat(333);
-    private readonly pbc::RepeatedField<float> repeatedFloat_ = new pbc::RepeatedField<float>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<float> RepeatedFloat {
-      get { return repeatedFloat_; }
-    }
-
-    /// <summary>Field number for the "repeated_double" field.</summary>
-    public const int RepeatedDoubleFieldNumber = 42;
-    private static readonly pb::FieldCodec<double> _repeated_repeatedDouble_codec
-        = pb::FieldCodec.ForDouble(337);
-    private readonly pbc::RepeatedField<double> repeatedDouble_ = new pbc::RepeatedField<double>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<double> RepeatedDouble {
-      get { return repeatedDouble_; }
-    }
-
-    /// <summary>Field number for the "repeated_bool" field.</summary>
-    public const int RepeatedBoolFieldNumber = 43;
-    private static readonly pb::FieldCodec<bool> _repeated_repeatedBool_codec
-        = pb::FieldCodec.ForBool(344);
-    private readonly pbc::RepeatedField<bool> repeatedBool_ = new pbc::RepeatedField<bool>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<bool> RepeatedBool {
-      get { return repeatedBool_; }
-    }
-
-    /// <summary>Field number for the "repeated_string" field.</summary>
-    public const int RepeatedStringFieldNumber = 44;
-    private static readonly pb::FieldCodec<string> _repeated_repeatedString_codec
-        = pb::FieldCodec.ForString(354);
-    private readonly pbc::RepeatedField<string> repeatedString_ = new pbc::RepeatedField<string>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<string> RepeatedString {
-      get { return repeatedString_; }
-    }
-
-    /// <summary>Field number for the "repeated_bytes" field.</summary>
-    public const int RepeatedBytesFieldNumber = 45;
-    private static readonly pb::FieldCodec<pb::ByteString> _repeated_repeatedBytes_codec
-        = pb::FieldCodec.ForBytes(362);
-    private readonly pbc::RepeatedField<pb::ByteString> repeatedBytes_ = new pbc::RepeatedField<pb::ByteString>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<pb::ByteString> RepeatedBytes {
-      get { return repeatedBytes_; }
-    }
-
-    /// <summary>Field number for the "repeated_nested_message" field.</summary>
-    public const int RepeatedNestedMessageFieldNumber = 48;
-    private static readonly pb::FieldCodec<global::ProtobufTestMessages.Proto2.TestAllTypesProto2.Types.NestedMessage> _repeated_repeatedNestedMessage_codec
-        = pb::FieldCodec.ForMessage(386, global::ProtobufTestMessages.Proto2.TestAllTypesProto2.Types.NestedMessage.Parser);
-    private readonly pbc::RepeatedField<global::ProtobufTestMessages.Proto2.TestAllTypesProto2.Types.NestedMessage> repeatedNestedMessage_ = new pbc::RepeatedField<global::ProtobufTestMessages.Proto2.TestAllTypesProto2.Types.NestedMessage>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::ProtobufTestMessages.Proto2.TestAllTypesProto2.Types.NestedMessage> RepeatedNestedMessage {
-      get { return repeatedNestedMessage_; }
-    }
-
-    /// <summary>Field number for the "repeated_foreign_message" field.</summary>
-    public const int RepeatedForeignMessageFieldNumber = 49;
-    private static readonly pb::FieldCodec<global::ProtobufTestMessages.Proto2.ForeignMessageProto2> _repeated_repeatedForeignMessage_codec
-        = pb::FieldCodec.ForMessage(394, global::ProtobufTestMessages.Proto2.ForeignMessageProto2.Parser);
-    private readonly pbc::RepeatedField<global::ProtobufTestMessages.Proto2.ForeignMessageProto2> repeatedForeignMessage_ = new pbc::RepeatedField<global::ProtobufTestMessages.Proto2.ForeignMessageProto2>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::ProtobufTestMessages.Proto2.ForeignMessageProto2> RepeatedForeignMessage {
-      get { return repeatedForeignMessage_; }
-    }
-
-    /// <summary>Field number for the "repeated_nested_enum" field.</summary>
-    public const int RepeatedNestedEnumFieldNumber = 51;
-    private static readonly pb::FieldCodec<global::ProtobufTestMessages.Proto2.TestAllTypesProto2.Types.NestedEnum> _repeated_repeatedNestedEnum_codec
-        = pb::FieldCodec.ForEnum(408, x => (int) x, x => (global::ProtobufTestMessages.Proto2.TestAllTypesProto2.Types.NestedEnum) x);
-    private readonly pbc::RepeatedField<global::ProtobufTestMessages.Proto2.TestAllTypesProto2.Types.NestedEnum> repeatedNestedEnum_ = new pbc::RepeatedField<global::ProtobufTestMessages.Proto2.TestAllTypesProto2.Types.NestedEnum>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::ProtobufTestMessages.Proto2.TestAllTypesProto2.Types.NestedEnum> RepeatedNestedEnum {
-      get { return repeatedNestedEnum_; }
-    }
-
-    /// <summary>Field number for the "repeated_foreign_enum" field.</summary>
-    public const int RepeatedForeignEnumFieldNumber = 52;
-    private static readonly pb::FieldCodec<global::ProtobufTestMessages.Proto2.ForeignEnumProto2> _repeated_repeatedForeignEnum_codec
-        = pb::FieldCodec.ForEnum(416, x => (int) x, x => (global::ProtobufTestMessages.Proto2.ForeignEnumProto2) x);
-    private readonly pbc::RepeatedField<global::ProtobufTestMessages.Proto2.ForeignEnumProto2> repeatedForeignEnum_ = new pbc::RepeatedField<global::ProtobufTestMessages.Proto2.ForeignEnumProto2>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::ProtobufTestMessages.Proto2.ForeignEnumProto2> RepeatedForeignEnum {
-      get { return repeatedForeignEnum_; }
-    }
-
-    /// <summary>Field number for the "repeated_string_piece" field.</summary>
-    public const int RepeatedStringPieceFieldNumber = 54;
-    private static readonly pb::FieldCodec<string> _repeated_repeatedStringPiece_codec
-        = pb::FieldCodec.ForString(434);
-    private readonly pbc::RepeatedField<string> repeatedStringPiece_ = new pbc::RepeatedField<string>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<string> RepeatedStringPiece {
-      get { return repeatedStringPiece_; }
-    }
-
-    /// <summary>Field number for the "repeated_cord" field.</summary>
-    public const int RepeatedCordFieldNumber = 55;
-    private static readonly pb::FieldCodec<string> _repeated_repeatedCord_codec
-        = pb::FieldCodec.ForString(442);
-    private readonly pbc::RepeatedField<string> repeatedCord_ = new pbc::RepeatedField<string>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<string> RepeatedCord {
-      get { return repeatedCord_; }
-    }
-
-    /// <summary>Field number for the "packed_int32" field.</summary>
-    public const int PackedInt32FieldNumber = 75;
-    private static readonly pb::FieldCodec<int> _repeated_packedInt32_codec
-        = pb::FieldCodec.ForInt32(602);
-    private readonly pbc::RepeatedField<int> packedInt32_ = new pbc::RepeatedField<int>();
-    /// <summary>
-    /// Packed
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<int> PackedInt32 {
-      get { return packedInt32_; }
-    }
-
-    /// <summary>Field number for the "packed_int64" field.</summary>
-    public const int PackedInt64FieldNumber = 76;
-    private static readonly pb::FieldCodec<long> _repeated_packedInt64_codec
-        = pb::FieldCodec.ForInt64(610);
-    private readonly pbc::RepeatedField<long> packedInt64_ = new pbc::RepeatedField<long>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<long> PackedInt64 {
-      get { return packedInt64_; }
-    }
-
-    /// <summary>Field number for the "packed_uint32" field.</summary>
-    public const int PackedUint32FieldNumber = 77;
-    private static readonly pb::FieldCodec<uint> _repeated_packedUint32_codec
-        = pb::FieldCodec.ForUInt32(618);
-    private readonly pbc::RepeatedField<uint> packedUint32_ = new pbc::RepeatedField<uint>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<uint> PackedUint32 {
-      get { return packedUint32_; }
-    }
-
-    /// <summary>Field number for the "packed_uint64" field.</summary>
-    public const int PackedUint64FieldNumber = 78;
-    private static readonly pb::FieldCodec<ulong> _repeated_packedUint64_codec
-        = pb::FieldCodec.ForUInt64(626);
-    private readonly pbc::RepeatedField<ulong> packedUint64_ = new pbc::RepeatedField<ulong>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<ulong> PackedUint64 {
-      get { return packedUint64_; }
-    }
-
-    /// <summary>Field number for the "packed_sint32" field.</summary>
-    public const int PackedSint32FieldNumber = 79;
-    private static readonly pb::FieldCodec<int> _repeated_packedSint32_codec
-        = pb::FieldCodec.ForSInt32(634);
-    private readonly pbc::RepeatedField<int> packedSint32_ = new pbc::RepeatedField<int>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<int> PackedSint32 {
-      get { return packedSint32_; }
-    }
-
-    /// <summary>Field number for the "packed_sint64" field.</summary>
-    public const int PackedSint64FieldNumber = 80;
-    private static readonly pb::FieldCodec<long> _repeated_packedSint64_codec
-        = pb::FieldCodec.ForSInt64(642);
-    private readonly pbc::RepeatedField<long> packedSint64_ = new pbc::RepeatedField<long>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<long> PackedSint64 {
-      get { return packedSint64_; }
-    }
-
-    /// <summary>Field number for the "packed_fixed32" field.</summary>
-    public const int PackedFixed32FieldNumber = 81;
-    private static readonly pb::FieldCodec<uint> _repeated_packedFixed32_codec
-        = pb::FieldCodec.ForFixed32(650);
-    private readonly pbc::RepeatedField<uint> packedFixed32_ = new pbc::RepeatedField<uint>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<uint> PackedFixed32 {
-      get { return packedFixed32_; }
-    }
-
-    /// <summary>Field number for the "packed_fixed64" field.</summary>
-    public const int PackedFixed64FieldNumber = 82;
-    private static readonly pb::FieldCodec<ulong> _repeated_packedFixed64_codec
-        = pb::FieldCodec.ForFixed64(658);
-    private readonly pbc::RepeatedField<ulong> packedFixed64_ = new pbc::RepeatedField<ulong>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<ulong> PackedFixed64 {
-      get { return packedFixed64_; }
-    }
-
-    /// <summary>Field number for the "packed_sfixed32" field.</summary>
-    public const int PackedSfixed32FieldNumber = 83;
-    private static readonly pb::FieldCodec<int> _repeated_packedSfixed32_codec
-        = pb::FieldCodec.ForSFixed32(666);
-    private readonly pbc::RepeatedField<int> packedSfixed32_ = new pbc::RepeatedField<int>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<int> PackedSfixed32 {
-      get { return packedSfixed32_; }
-    }
-
-    /// <summary>Field number for the "packed_sfixed64" field.</summary>
-    public const int PackedSfixed64FieldNumber = 84;
-    private static readonly pb::FieldCodec<long> _repeated_packedSfixed64_codec
-        = pb::FieldCodec.ForSFixed64(674);
-    private readonly pbc::RepeatedField<long> packedSfixed64_ = new pbc::RepeatedField<long>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<long> PackedSfixed64 {
-      get { return packedSfixed64_; }
-    }
-
-    /// <summary>Field number for the "packed_float" field.</summary>
-    public const int PackedFloatFieldNumber = 85;
-    private static readonly pb::FieldCodec<float> _repeated_packedFloat_codec
-        = pb::FieldCodec.ForFloat(682);
-    private readonly pbc::RepeatedField<float> packedFloat_ = new pbc::RepeatedField<float>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<float> PackedFloat {
-      get { return packedFloat_; }
-    }
-
-    /// <summary>Field number for the "packed_double" field.</summary>
-    public const int PackedDoubleFieldNumber = 86;
-    private static readonly pb::FieldCodec<double> _repeated_packedDouble_codec
-        = pb::FieldCodec.ForDouble(690);
-    private readonly pbc::RepeatedField<double> packedDouble_ = new pbc::RepeatedField<double>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<double> PackedDouble {
-      get { return packedDouble_; }
-    }
-
-    /// <summary>Field number for the "packed_bool" field.</summary>
-    public const int PackedBoolFieldNumber = 87;
-    private static readonly pb::FieldCodec<bool> _repeated_packedBool_codec
-        = pb::FieldCodec.ForBool(698);
-    private readonly pbc::RepeatedField<bool> packedBool_ = new pbc::RepeatedField<bool>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<bool> PackedBool {
-      get { return packedBool_; }
-    }
-
-    /// <summary>Field number for the "packed_nested_enum" field.</summary>
-    public const int PackedNestedEnumFieldNumber = 88;
-    private static readonly pb::FieldCodec<global::ProtobufTestMessages.Proto2.TestAllTypesProto2.Types.NestedEnum> _repeated_packedNestedEnum_codec
-        = pb::FieldCodec.ForEnum(706, x => (int) x, x => (global::ProtobufTestMessages.Proto2.TestAllTypesProto2.Types.NestedEnum) x);
-    private readonly pbc::RepeatedField<global::ProtobufTestMessages.Proto2.TestAllTypesProto2.Types.NestedEnum> packedNestedEnum_ = new pbc::RepeatedField<global::ProtobufTestMessages.Proto2.TestAllTypesProto2.Types.NestedEnum>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::ProtobufTestMessages.Proto2.TestAllTypesProto2.Types.NestedEnum> PackedNestedEnum {
-      get { return packedNestedEnum_; }
-    }
-
-    /// <summary>Field number for the "unpacked_int32" field.</summary>
-    public const int UnpackedInt32FieldNumber = 89;
-    private static readonly pb::FieldCodec<int> _repeated_unpackedInt32_codec
-        = pb::FieldCodec.ForInt32(712);
-    private readonly pbc::RepeatedField<int> unpackedInt32_ = new pbc::RepeatedField<int>();
-    /// <summary>
-    /// Unpacked
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<int> UnpackedInt32 {
-      get { return unpackedInt32_; }
-    }
-
-    /// <summary>Field number for the "unpacked_int64" field.</summary>
-    public const int UnpackedInt64FieldNumber = 90;
-    private static readonly pb::FieldCodec<long> _repeated_unpackedInt64_codec
-        = pb::FieldCodec.ForInt64(720);
-    private readonly pbc::RepeatedField<long> unpackedInt64_ = new pbc::RepeatedField<long>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<long> UnpackedInt64 {
-      get { return unpackedInt64_; }
-    }
-
-    /// <summary>Field number for the "unpacked_uint32" field.</summary>
-    public const int UnpackedUint32FieldNumber = 91;
-    private static readonly pb::FieldCodec<uint> _repeated_unpackedUint32_codec
-        = pb::FieldCodec.ForUInt32(728);
-    private readonly pbc::RepeatedField<uint> unpackedUint32_ = new pbc::RepeatedField<uint>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<uint> UnpackedUint32 {
-      get { return unpackedUint32_; }
-    }
-
-    /// <summary>Field number for the "unpacked_uint64" field.</summary>
-    public const int UnpackedUint64FieldNumber = 92;
-    private static readonly pb::FieldCodec<ulong> _repeated_unpackedUint64_codec
-        = pb::FieldCodec.ForUInt64(736);
-    private readonly pbc::RepeatedField<ulong> unpackedUint64_ = new pbc::RepeatedField<ulong>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<ulong> UnpackedUint64 {
-      get { return unpackedUint64_; }
-    }
-
-    /// <summary>Field number for the "unpacked_sint32" field.</summary>
-    public const int UnpackedSint32FieldNumber = 93;
-    private static readonly pb::FieldCodec<int> _repeated_unpackedSint32_codec
-        = pb::FieldCodec.ForSInt32(744);
-    private readonly pbc::RepeatedField<int> unpackedSint32_ = new pbc::RepeatedField<int>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<int> UnpackedSint32 {
-      get { return unpackedSint32_; }
-    }
-
-    /// <summary>Field number for the "unpacked_sint64" field.</summary>
-    public const int UnpackedSint64FieldNumber = 94;
-    private static readonly pb::FieldCodec<long> _repeated_unpackedSint64_codec
-        = pb::FieldCodec.ForSInt64(752);
-    private readonly pbc::RepeatedField<long> unpackedSint64_ = new pbc::RepeatedField<long>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<long> UnpackedSint64 {
-      get { return unpackedSint64_; }
-    }
-
-    /// <summary>Field number for the "unpacked_fixed32" field.</summary>
-    public const int UnpackedFixed32FieldNumber = 95;
-    private static readonly pb::FieldCodec<uint> _repeated_unpackedFixed32_codec
-        = pb::FieldCodec.ForFixed32(765);
-    private readonly pbc::RepeatedField<uint> unpackedFixed32_ = new pbc::RepeatedField<uint>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<uint> UnpackedFixed32 {
-      get { return unpackedFixed32_; }
-    }
-
-    /// <summary>Field number for the "unpacked_fixed64" field.</summary>
-    public const int UnpackedFixed64FieldNumber = 96;
-    private static readonly pb::FieldCodec<ulong> _repeated_unpackedFixed64_codec
-        = pb::FieldCodec.ForFixed64(769);
-    private readonly pbc::RepeatedField<ulong> unpackedFixed64_ = new pbc::RepeatedField<ulong>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<ulong> UnpackedFixed64 {
-      get { return unpackedFixed64_; }
-    }
-
-    /// <summary>Field number for the "unpacked_sfixed32" field.</summary>
-    public const int UnpackedSfixed32FieldNumber = 97;
-    private static readonly pb::FieldCodec<int> _repeated_unpackedSfixed32_codec
-        = pb::FieldCodec.ForSFixed32(781);
-    private readonly pbc::RepeatedField<int> unpackedSfixed32_ = new pbc::RepeatedField<int>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<int> UnpackedSfixed32 {
-      get { return unpackedSfixed32_; }
-    }
-
-    /// <summary>Field number for the "unpacked_sfixed64" field.</summary>
-    public const int UnpackedSfixed64FieldNumber = 98;
-    private static readonly pb::FieldCodec<long> _repeated_unpackedSfixed64_codec
-        = pb::FieldCodec.ForSFixed64(785);
-    private readonly pbc::RepeatedField<long> unpackedSfixed64_ = new pbc::RepeatedField<long>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<long> UnpackedSfixed64 {
-      get { return unpackedSfixed64_; }
-    }
-
-    /// <summary>Field number for the "unpacked_float" field.</summary>
-    public const int UnpackedFloatFieldNumber = 99;
-    private static readonly pb::FieldCodec<float> _repeated_unpackedFloat_codec
-        = pb::FieldCodec.ForFloat(797);
-    private readonly pbc::RepeatedField<float> unpackedFloat_ = new pbc::RepeatedField<float>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<float> UnpackedFloat {
-      get { return unpackedFloat_; }
-    }
-
-    /// <summary>Field number for the "unpacked_double" field.</summary>
-    public const int UnpackedDoubleFieldNumber = 100;
-    private static readonly pb::FieldCodec<double> _repeated_unpackedDouble_codec
-        = pb::FieldCodec.ForDouble(801);
-    private readonly pbc::RepeatedField<double> unpackedDouble_ = new pbc::RepeatedField<double>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<double> UnpackedDouble {
-      get { return unpackedDouble_; }
-    }
-
-    /// <summary>Field number for the "unpacked_bool" field.</summary>
-    public const int UnpackedBoolFieldNumber = 101;
-    private static readonly pb::FieldCodec<bool> _repeated_unpackedBool_codec
-        = pb::FieldCodec.ForBool(808);
-    private readonly pbc::RepeatedField<bool> unpackedBool_ = new pbc::RepeatedField<bool>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<bool> UnpackedBool {
-      get { return unpackedBool_; }
-    }
-
-    /// <summary>Field number for the "unpacked_nested_enum" field.</summary>
-    public const int UnpackedNestedEnumFieldNumber = 102;
-    private static readonly pb::FieldCodec<global::ProtobufTestMessages.Proto2.TestAllTypesProto2.Types.NestedEnum> _repeated_unpackedNestedEnum_codec
-        = pb::FieldCodec.ForEnum(816, x => (int) x, x => (global::ProtobufTestMessages.Proto2.TestAllTypesProto2.Types.NestedEnum) x);
-    private readonly pbc::RepeatedField<global::ProtobufTestMessages.Proto2.TestAllTypesProto2.Types.NestedEnum> unpackedNestedEnum_ = new pbc::RepeatedField<global::ProtobufTestMessages.Proto2.TestAllTypesProto2.Types.NestedEnum>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::ProtobufTestMessages.Proto2.TestAllTypesProto2.Types.NestedEnum> UnpackedNestedEnum {
-      get { return unpackedNestedEnum_; }
-    }
-
-    /// <summary>Field number for the "map_int32_int32" field.</summary>
-    public const int MapInt32Int32FieldNumber = 56;
-    private static readonly pbc::MapField<int, int>.Codec _map_mapInt32Int32_codec
-        = new pbc::MapField<int, int>.Codec(pb::FieldCodec.ForInt32(8, 0), pb::FieldCodec.ForInt32(16, 0), 450);
-    private readonly pbc::MapField<int, int> mapInt32Int32_ = new pbc::MapField<int, int>();
-    /// <summary>
-    /// Map
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::MapField<int, int> MapInt32Int32 {
-      get { return mapInt32Int32_; }
-    }
-
-    /// <summary>Field number for the "map_int64_int64" field.</summary>
-    public const int MapInt64Int64FieldNumber = 57;
-    private static readonly pbc::MapField<long, long>.Codec _map_mapInt64Int64_codec
-        = new pbc::MapField<long, long>.Codec(pb::FieldCodec.ForInt64(8, 0L), pb::FieldCodec.ForInt64(16, 0L), 458);
-    private readonly pbc::MapField<long, long> mapInt64Int64_ = new pbc::MapField<long, long>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::MapField<long, long> MapInt64Int64 {
-      get { return mapInt64Int64_; }
-    }
-
-    /// <summary>Field number for the "map_uint32_uint32" field.</summary>
-    public const int MapUint32Uint32FieldNumber = 58;
-    private static readonly pbc::MapField<uint, uint>.Codec _map_mapUint32Uint32_codec
-        = new pbc::MapField<uint, uint>.Codec(pb::FieldCodec.ForUInt32(8, 0), pb::FieldCodec.ForUInt32(16, 0), 466);
-    private readonly pbc::MapField<uint, uint> mapUint32Uint32_ = new pbc::MapField<uint, uint>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::MapField<uint, uint> MapUint32Uint32 {
-      get { return mapUint32Uint32_; }
-    }
-
-    /// <summary>Field number for the "map_uint64_uint64" field.</summary>
-    public const int MapUint64Uint64FieldNumber = 59;
-    private static readonly pbc::MapField<ulong, ulong>.Codec _map_mapUint64Uint64_codec
-        = new pbc::MapField<ulong, ulong>.Codec(pb::FieldCodec.ForUInt64(8, 0UL), pb::FieldCodec.ForUInt64(16, 0UL), 474);
-    private readonly pbc::MapField<ulong, ulong> mapUint64Uint64_ = new pbc::MapField<ulong, ulong>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::MapField<ulong, ulong> MapUint64Uint64 {
-      get { return mapUint64Uint64_; }
-    }
-
-    /// <summary>Field number for the "map_sint32_sint32" field.</summary>
-    public const int MapSint32Sint32FieldNumber = 60;
-    private static readonly pbc::MapField<int, int>.Codec _map_mapSint32Sint32_codec
-        = new pbc::MapField<int, int>.Codec(pb::FieldCodec.ForSInt32(8, 0), pb::FieldCodec.ForSInt32(16, 0), 482);
-    private readonly pbc::MapField<int, int> mapSint32Sint32_ = new pbc::MapField<int, int>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::MapField<int, int> MapSint32Sint32 {
-      get { return mapSint32Sint32_; }
-    }
-
-    /// <summary>Field number for the "map_sint64_sint64" field.</summary>
-    public const int MapSint64Sint64FieldNumber = 61;
-    private static readonly pbc::MapField<long, long>.Codec _map_mapSint64Sint64_codec
-        = new pbc::MapField<long, long>.Codec(pb::FieldCodec.ForSInt64(8, 0L), pb::FieldCodec.ForSInt64(16, 0L), 490);
-    private readonly pbc::MapField<long, long> mapSint64Sint64_ = new pbc::MapField<long, long>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::MapField<long, long> MapSint64Sint64 {
-      get { return mapSint64Sint64_; }
-    }
-
-    /// <summary>Field number for the "map_fixed32_fixed32" field.</summary>
-    public const int MapFixed32Fixed32FieldNumber = 62;
-    private static readonly pbc::MapField<uint, uint>.Codec _map_mapFixed32Fixed32_codec
-        = new pbc::MapField<uint, uint>.Codec(pb::FieldCodec.ForFixed32(13, 0), pb::FieldCodec.ForFixed32(21, 0), 498);
-    private readonly pbc::MapField<uint, uint> mapFixed32Fixed32_ = new pbc::MapField<uint, uint>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::MapField<uint, uint> MapFixed32Fixed32 {
-      get { return mapFixed32Fixed32_; }
-    }
-
-    /// <summary>Field number for the "map_fixed64_fixed64" field.</summary>
-    public const int MapFixed64Fixed64FieldNumber = 63;
-    private static readonly pbc::MapField<ulong, ulong>.Codec _map_mapFixed64Fixed64_codec
-        = new pbc::MapField<ulong, ulong>.Codec(pb::FieldCodec.ForFixed64(9, 0UL), pb::FieldCodec.ForFixed64(17, 0UL), 506);
-    private readonly pbc::MapField<ulong, ulong> mapFixed64Fixed64_ = new pbc::MapField<ulong, ulong>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::MapField<ulong, ulong> MapFixed64Fixed64 {
-      get { return mapFixed64Fixed64_; }
-    }
-
-    /// <summary>Field number for the "map_sfixed32_sfixed32" field.</summary>
-    public const int MapSfixed32Sfixed32FieldNumber = 64;
-    private static readonly pbc::MapField<int, int>.Codec _map_mapSfixed32Sfixed32_codec
-        = new pbc::MapField<int, int>.Codec(pb::FieldCodec.ForSFixed32(13, 0), pb::FieldCodec.ForSFixed32(21, 0), 514);
-    private readonly pbc::MapField<int, int> mapSfixed32Sfixed32_ = new pbc::MapField<int, int>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::MapField<int, int> MapSfixed32Sfixed32 {
-      get { return mapSfixed32Sfixed32_; }
-    }
-
-    /// <summary>Field number for the "map_sfixed64_sfixed64" field.</summary>
-    public const int MapSfixed64Sfixed64FieldNumber = 65;
-    private static readonly pbc::MapField<long, long>.Codec _map_mapSfixed64Sfixed64_codec
-        = new pbc::MapField<long, long>.Codec(pb::FieldCodec.ForSFixed64(9, 0L), pb::FieldCodec.ForSFixed64(17, 0L), 522);
-    private readonly pbc::MapField<long, long> mapSfixed64Sfixed64_ = new pbc::MapField<long, long>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::MapField<long, long> MapSfixed64Sfixed64 {
-      get { return mapSfixed64Sfixed64_; }
-    }
-
-    /// <summary>Field number for the "map_int32_float" field.</summary>
-    public const int MapInt32FloatFieldNumber = 66;
-    private static readonly pbc::MapField<int, float>.Codec _map_mapInt32Float_codec
-        = new pbc::MapField<int, float>.Codec(pb::FieldCodec.ForInt32(8, 0), pb::FieldCodec.ForFloat(21, 0F), 530);
-    private readonly pbc::MapField<int, float> mapInt32Float_ = new pbc::MapField<int, float>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::MapField<int, float> MapInt32Float {
-      get { return mapInt32Float_; }
-    }
-
-    /// <summary>Field number for the "map_int32_double" field.</summary>
-    public const int MapInt32DoubleFieldNumber = 67;
-    private static readonly pbc::MapField<int, double>.Codec _map_mapInt32Double_codec
-        = new pbc::MapField<int, double>.Codec(pb::FieldCodec.ForInt32(8, 0), pb::FieldCodec.ForDouble(17, 0D), 538);
-    private readonly pbc::MapField<int, double> mapInt32Double_ = new pbc::MapField<int, double>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::MapField<int, double> MapInt32Double {
-      get { return mapInt32Double_; }
-    }
-
-    /// <summary>Field number for the "map_bool_bool" field.</summary>
-    public const int MapBoolBoolFieldNumber = 68;
-    private static readonly pbc::MapField<bool, bool>.Codec _map_mapBoolBool_codec
-        = new pbc::MapField<bool, bool>.Codec(pb::FieldCodec.ForBool(8, false), pb::FieldCodec.ForBool(16, false), 546);
-    private readonly pbc::MapField<bool, bool> mapBoolBool_ = new pbc::MapField<bool, bool>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::MapField<bool, bool> MapBoolBool {
-      get { return mapBoolBool_; }
-    }
-
-    /// <summary>Field number for the "map_string_string" field.</summary>
-    public const int MapStringStringFieldNumber = 69;
-    private static readonly pbc::MapField<string, string>.Codec _map_mapStringString_codec
-        = new pbc::MapField<string, string>.Codec(pb::FieldCodec.ForString(10, ""), pb::FieldCodec.ForString(18, ""), 554);
-    private readonly pbc::MapField<string, string> mapStringString_ = new pbc::MapField<string, string>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::MapField<string, string> MapStringString {
-      get { return mapStringString_; }
-    }
-
-    /// <summary>Field number for the "map_string_bytes" field.</summary>
-    public const int MapStringBytesFieldNumber = 70;
-    private static readonly pbc::MapField<string, pb::ByteString>.Codec _map_mapStringBytes_codec
-        = new pbc::MapField<string, pb::ByteString>.Codec(pb::FieldCodec.ForString(10, ""), pb::FieldCodec.ForBytes(18, pb::ByteString.Empty), 562);
-    private readonly pbc::MapField<string, pb::ByteString> mapStringBytes_ = new pbc::MapField<string, pb::ByteString>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::MapField<string, pb::ByteString> MapStringBytes {
-      get { return mapStringBytes_; }
-    }
-
-    /// <summary>Field number for the "map_string_nested_message" field.</summary>
-    public const int MapStringNestedMessageFieldNumber = 71;
-    private static readonly pbc::MapField<string, global::ProtobufTestMessages.Proto2.TestAllTypesProto2.Types.NestedMessage>.Codec _map_mapStringNestedMessage_codec
-        = new pbc::MapField<string, global::ProtobufTestMessages.Proto2.TestAllTypesProto2.Types.NestedMessage>.Codec(pb::FieldCodec.ForString(10, ""), pb::FieldCodec.ForMessage(18, global::ProtobufTestMessages.Proto2.TestAllTypesProto2.Types.NestedMessage.Parser), 570);
-    private readonly pbc::MapField<string, global::ProtobufTestMessages.Proto2.TestAllTypesProto2.Types.NestedMessage> mapStringNestedMessage_ = new pbc::MapField<string, global::ProtobufTestMessages.Proto2.TestAllTypesProto2.Types.NestedMessage>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::MapField<string, global::ProtobufTestMessages.Proto2.TestAllTypesProto2.Types.NestedMessage> MapStringNestedMessage {
-      get { return mapStringNestedMessage_; }
-    }
-
-    /// <summary>Field number for the "map_string_foreign_message" field.</summary>
-    public const int MapStringForeignMessageFieldNumber = 72;
-    private static readonly pbc::MapField<string, global::ProtobufTestMessages.Proto2.ForeignMessageProto2>.Codec _map_mapStringForeignMessage_codec
-        = new pbc::MapField<string, global::ProtobufTestMessages.Proto2.ForeignMessageProto2>.Codec(pb::FieldCodec.ForString(10, ""), pb::FieldCodec.ForMessage(18, global::ProtobufTestMessages.Proto2.ForeignMessageProto2.Parser), 578);
-    private readonly pbc::MapField<string, global::ProtobufTestMessages.Proto2.ForeignMessageProto2> mapStringForeignMessage_ = new pbc::MapField<string, global::ProtobufTestMessages.Proto2.ForeignMessageProto2>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::MapField<string, global::ProtobufTestMessages.Proto2.ForeignMessageProto2> MapStringForeignMessage {
-      get { return mapStringForeignMessage_; }
-    }
-
-    /// <summary>Field number for the "map_string_nested_enum" field.</summary>
-    public const int MapStringNestedEnumFieldNumber = 73;
-    private static readonly pbc::MapField<string, global::ProtobufTestMessages.Proto2.TestAllTypesProto2.Types.NestedEnum>.Codec _map_mapStringNestedEnum_codec
-        = new pbc::MapField<string, global::ProtobufTestMessages.Proto2.TestAllTypesProto2.Types.NestedEnum>.Codec(pb::FieldCodec.ForString(10, ""), pb::FieldCodec.ForEnum(16, x => (int) x, x => (global::ProtobufTestMessages.Proto2.TestAllTypesProto2.Types.NestedEnum) x, global::ProtobufTestMessages.Proto2.TestAllTypesProto2.Types.NestedEnum.Foo), 586);
-    private readonly pbc::MapField<string, global::ProtobufTestMessages.Proto2.TestAllTypesProto2.Types.NestedEnum> mapStringNestedEnum_ = new pbc::MapField<string, global::ProtobufTestMessages.Proto2.TestAllTypesProto2.Types.NestedEnum>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::MapField<string, global::ProtobufTestMessages.Proto2.TestAllTypesProto2.Types.NestedEnum> MapStringNestedEnum {
-      get { return mapStringNestedEnum_; }
-    }
-
-    /// <summary>Field number for the "map_string_foreign_enum" field.</summary>
-    public const int MapStringForeignEnumFieldNumber = 74;
-    private static readonly pbc::MapField<string, global::ProtobufTestMessages.Proto2.ForeignEnumProto2>.Codec _map_mapStringForeignEnum_codec
-        = new pbc::MapField<string, global::ProtobufTestMessages.Proto2.ForeignEnumProto2>.Codec(pb::FieldCodec.ForString(10, ""), pb::FieldCodec.ForEnum(16, x => (int) x, x => (global::ProtobufTestMessages.Proto2.ForeignEnumProto2) x, global::ProtobufTestMessages.Proto2.ForeignEnumProto2.ForeignFoo), 594);
-    private readonly pbc::MapField<string, global::ProtobufTestMessages.Proto2.ForeignEnumProto2> mapStringForeignEnum_ = new pbc::MapField<string, global::ProtobufTestMessages.Proto2.ForeignEnumProto2>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::MapField<string, global::ProtobufTestMessages.Proto2.ForeignEnumProto2> MapStringForeignEnum {
-      get { return mapStringForeignEnum_; }
-    }
-
-    /// <summary>Field number for the "oneof_uint32" field.</summary>
-    public const int OneofUint32FieldNumber = 111;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public uint OneofUint32 {
-      get { return HasOneofUint32 ? (uint) oneofField_ : 0; }
-      set {
-        oneofField_ = value;
-        oneofFieldCase_ = OneofFieldOneofCase.OneofUint32;
-      }
-    }
-    /// <summary>Gets whether the "oneof_uint32" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasOneofUint32 {
-      get { return oneofFieldCase_ == OneofFieldOneofCase.OneofUint32; }
-    }
-    /// <summary> Clears the value of the oneof if it's currently set to "oneof_uint32" </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearOneofUint32() {
-      if (HasOneofUint32) {
-        ClearOneofField();
-      }
-    }
-
-    /// <summary>Field number for the "oneof_nested_message" field.</summary>
-    public const int OneofNestedMessageFieldNumber = 112;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::ProtobufTestMessages.Proto2.TestAllTypesProto2.Types.NestedMessage OneofNestedMessage {
-      get { return oneofFieldCase_ == OneofFieldOneofCase.OneofNestedMessage ? (global::ProtobufTestMessages.Proto2.TestAllTypesProto2.Types.NestedMessage) oneofField_ : null; }
-      set {
-        oneofField_ = value;
-        oneofFieldCase_ = value == null ? OneofFieldOneofCase.None : OneofFieldOneofCase.OneofNestedMessage;
-      }
-    }
-
-    /// <summary>Field number for the "oneof_string" field.</summary>
-    public const int OneofStringFieldNumber = 113;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string OneofString {
-      get { return HasOneofString ? (string) oneofField_ : ""; }
-      set {
-        oneofField_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-        oneofFieldCase_ = OneofFieldOneofCase.OneofString;
-      }
-    }
-    /// <summary>Gets whether the "oneof_string" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasOneofString {
-      get { return oneofFieldCase_ == OneofFieldOneofCase.OneofString; }
-    }
-    /// <summary> Clears the value of the oneof if it's currently set to "oneof_string" </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearOneofString() {
-      if (HasOneofString) {
-        ClearOneofField();
-      }
-    }
-
-    /// <summary>Field number for the "oneof_bytes" field.</summary>
-    public const int OneofBytesFieldNumber = 114;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pb::ByteString OneofBytes {
-      get { return HasOneofBytes ? (pb::ByteString) oneofField_ : pb::ByteString.Empty; }
-      set {
-        oneofField_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-        oneofFieldCase_ = OneofFieldOneofCase.OneofBytes;
-      }
-    }
-    /// <summary>Gets whether the "oneof_bytes" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasOneofBytes {
-      get { return oneofFieldCase_ == OneofFieldOneofCase.OneofBytes; }
-    }
-    /// <summary> Clears the value of the oneof if it's currently set to "oneof_bytes" </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearOneofBytes() {
-      if (HasOneofBytes) {
-        ClearOneofField();
-      }
-    }
-
-    /// <summary>Field number for the "oneof_bool" field.</summary>
-    public const int OneofBoolFieldNumber = 115;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool OneofBool {
-      get { return HasOneofBool ? (bool) oneofField_ : false; }
-      set {
-        oneofField_ = value;
-        oneofFieldCase_ = OneofFieldOneofCase.OneofBool;
-      }
-    }
-    /// <summary>Gets whether the "oneof_bool" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasOneofBool {
-      get { return oneofFieldCase_ == OneofFieldOneofCase.OneofBool; }
-    }
-    /// <summary> Clears the value of the oneof if it's currently set to "oneof_bool" </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearOneofBool() {
-      if (HasOneofBool) {
-        ClearOneofField();
-      }
-    }
-
-    /// <summary>Field number for the "oneof_uint64" field.</summary>
-    public const int OneofUint64FieldNumber = 116;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ulong OneofUint64 {
-      get { return HasOneofUint64 ? (ulong) oneofField_ : 0UL; }
-      set {
-        oneofField_ = value;
-        oneofFieldCase_ = OneofFieldOneofCase.OneofUint64;
-      }
-    }
-    /// <summary>Gets whether the "oneof_uint64" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasOneofUint64 {
-      get { return oneofFieldCase_ == OneofFieldOneofCase.OneofUint64; }
-    }
-    /// <summary> Clears the value of the oneof if it's currently set to "oneof_uint64" </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearOneofUint64() {
-      if (HasOneofUint64) {
-        ClearOneofField();
-      }
-    }
-
-    /// <summary>Field number for the "oneof_float" field.</summary>
-    public const int OneofFloatFieldNumber = 117;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public float OneofFloat {
-      get { return HasOneofFloat ? (float) oneofField_ : 0F; }
-      set {
-        oneofField_ = value;
-        oneofFieldCase_ = OneofFieldOneofCase.OneofFloat;
-      }
-    }
-    /// <summary>Gets whether the "oneof_float" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasOneofFloat {
-      get { return oneofFieldCase_ == OneofFieldOneofCase.OneofFloat; }
-    }
-    /// <summary> Clears the value of the oneof if it's currently set to "oneof_float" </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearOneofFloat() {
-      if (HasOneofFloat) {
-        ClearOneofField();
-      }
-    }
-
-    /// <summary>Field number for the "oneof_double" field.</summary>
-    public const int OneofDoubleFieldNumber = 118;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double OneofDouble {
-      get { return HasOneofDouble ? (double) oneofField_ : 0D; }
-      set {
-        oneofField_ = value;
-        oneofFieldCase_ = OneofFieldOneofCase.OneofDouble;
-      }
-    }
-    /// <summary>Gets whether the "oneof_double" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasOneofDouble {
-      get { return oneofFieldCase_ == OneofFieldOneofCase.OneofDouble; }
-    }
-    /// <summary> Clears the value of the oneof if it's currently set to "oneof_double" </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearOneofDouble() {
-      if (HasOneofDouble) {
-        ClearOneofField();
-      }
-    }
-
-    /// <summary>Field number for the "oneof_enum" field.</summary>
-    public const int OneofEnumFieldNumber = 119;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::ProtobufTestMessages.Proto2.TestAllTypesProto2.Types.NestedEnum OneofEnum {
-      get { return HasOneofEnum ? (global::ProtobufTestMessages.Proto2.TestAllTypesProto2.Types.NestedEnum) oneofField_ : global::ProtobufTestMessages.Proto2.TestAllTypesProto2.Types.NestedEnum.Foo; }
-      set {
-        oneofField_ = value;
-        oneofFieldCase_ = OneofFieldOneofCase.OneofEnum;
-      }
-    }
-    /// <summary>Gets whether the "oneof_enum" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasOneofEnum {
-      get { return oneofFieldCase_ == OneofFieldOneofCase.OneofEnum; }
-    }
-    /// <summary> Clears the value of the oneof if it's currently set to "oneof_enum" </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearOneofEnum() {
-      if (HasOneofEnum) {
-        ClearOneofField();
-      }
-    }
-
-    /// <summary>Field number for the "data" field.</summary>
-    public const int DataFieldNumber = 201;
-    private global::ProtobufTestMessages.Proto2.TestAllTypesProto2.Types.Data data_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::ProtobufTestMessages.Proto2.TestAllTypesProto2.Types.Data Data {
-      get { return data_; }
-      set {
-        data_ = value;
-      }
-    }
-    /// <summary>Gets whether the data field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasData {
-      get { return data_ != null; }
-    }
-    /// <summary>Clears the value of the data field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearData() {
-      data_ = null;
-    }
-
-    /// <summary>Field number for the "default_int32" field.</summary>
-    public const int DefaultInt32FieldNumber = 241;
-    private readonly static int DefaultInt32DefaultValue = -123456789;
-
-    private int defaultInt32_;
-    /// <summary>
-    /// default values
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int DefaultInt32 {
-      get { if ((_hasBits0 & 32768) != 0) { return defaultInt32_; } else { return DefaultInt32DefaultValue; } }
-      set {
-        _hasBits0 |= 32768;
-        defaultInt32_ = value;
-      }
-    }
-    /// <summary>Gets whether the "default_int32" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasDefaultInt32 {
-      get { return (_hasBits0 & 32768) != 0; }
-    }
-    /// <summary>Clears the value of the "default_int32" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearDefaultInt32() {
-      _hasBits0 &= ~32768;
-    }
-
-    /// <summary>Field number for the "default_int64" field.</summary>
-    public const int DefaultInt64FieldNumber = 242;
-    private readonly static long DefaultInt64DefaultValue = -9123456789123456789L;
-
-    private long defaultInt64_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public long DefaultInt64 {
-      get { if ((_hasBits0 & 65536) != 0) { return defaultInt64_; } else { return DefaultInt64DefaultValue; } }
-      set {
-        _hasBits0 |= 65536;
-        defaultInt64_ = value;
-      }
-    }
-    /// <summary>Gets whether the "default_int64" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasDefaultInt64 {
-      get { return (_hasBits0 & 65536) != 0; }
-    }
-    /// <summary>Clears the value of the "default_int64" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearDefaultInt64() {
-      _hasBits0 &= ~65536;
-    }
-
-    /// <summary>Field number for the "default_uint32" field.</summary>
-    public const int DefaultUint32FieldNumber = 243;
-    private readonly static uint DefaultUint32DefaultValue = 2123456789;
-
-    private uint defaultUint32_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public uint DefaultUint32 {
-      get { if ((_hasBits0 & 131072) != 0) { return defaultUint32_; } else { return DefaultUint32DefaultValue; } }
-      set {
-        _hasBits0 |= 131072;
-        defaultUint32_ = value;
-      }
-    }
-    /// <summary>Gets whether the "default_uint32" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasDefaultUint32 {
-      get { return (_hasBits0 & 131072) != 0; }
-    }
-    /// <summary>Clears the value of the "default_uint32" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearDefaultUint32() {
-      _hasBits0 &= ~131072;
-    }
-
-    /// <summary>Field number for the "default_uint64" field.</summary>
-    public const int DefaultUint64FieldNumber = 244;
-    private readonly static ulong DefaultUint64DefaultValue = 10123456789123456789UL;
-
-    private ulong defaultUint64_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ulong DefaultUint64 {
-      get { if ((_hasBits0 & 262144) != 0) { return defaultUint64_; } else { return DefaultUint64DefaultValue; } }
-      set {
-        _hasBits0 |= 262144;
-        defaultUint64_ = value;
-      }
-    }
-    /// <summary>Gets whether the "default_uint64" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasDefaultUint64 {
-      get { return (_hasBits0 & 262144) != 0; }
-    }
-    /// <summary>Clears the value of the "default_uint64" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearDefaultUint64() {
-      _hasBits0 &= ~262144;
-    }
-
-    /// <summary>Field number for the "default_sint32" field.</summary>
-    public const int DefaultSint32FieldNumber = 245;
-    private readonly static int DefaultSint32DefaultValue = -123456789;
-
-    private int defaultSint32_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int DefaultSint32 {
-      get { if ((_hasBits0 & 524288) != 0) { return defaultSint32_; } else { return DefaultSint32DefaultValue; } }
-      set {
-        _hasBits0 |= 524288;
-        defaultSint32_ = value;
-      }
-    }
-    /// <summary>Gets whether the "default_sint32" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasDefaultSint32 {
-      get { return (_hasBits0 & 524288) != 0; }
-    }
-    /// <summary>Clears the value of the "default_sint32" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearDefaultSint32() {
-      _hasBits0 &= ~524288;
-    }
-
-    /// <summary>Field number for the "default_sint64" field.</summary>
-    public const int DefaultSint64FieldNumber = 246;
-    private readonly static long DefaultSint64DefaultValue = -9123456789123456789L;
-
-    private long defaultSint64_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public long DefaultSint64 {
-      get { if ((_hasBits0 & 1048576) != 0) { return defaultSint64_; } else { return DefaultSint64DefaultValue; } }
-      set {
-        _hasBits0 |= 1048576;
-        defaultSint64_ = value;
-      }
-    }
-    /// <summary>Gets whether the "default_sint64" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasDefaultSint64 {
-      get { return (_hasBits0 & 1048576) != 0; }
-    }
-    /// <summary>Clears the value of the "default_sint64" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearDefaultSint64() {
-      _hasBits0 &= ~1048576;
-    }
-
-    /// <summary>Field number for the "default_fixed32" field.</summary>
-    public const int DefaultFixed32FieldNumber = 247;
-    private readonly static uint DefaultFixed32DefaultValue = 2123456789;
-
-    private uint defaultFixed32_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public uint DefaultFixed32 {
-      get { if ((_hasBits0 & 2097152) != 0) { return defaultFixed32_; } else { return DefaultFixed32DefaultValue; } }
-      set {
-        _hasBits0 |= 2097152;
-        defaultFixed32_ = value;
-      }
-    }
-    /// <summary>Gets whether the "default_fixed32" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasDefaultFixed32 {
-      get { return (_hasBits0 & 2097152) != 0; }
-    }
-    /// <summary>Clears the value of the "default_fixed32" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearDefaultFixed32() {
-      _hasBits0 &= ~2097152;
-    }
-
-    /// <summary>Field number for the "default_fixed64" field.</summary>
-    public const int DefaultFixed64FieldNumber = 248;
-    private readonly static ulong DefaultFixed64DefaultValue = 10123456789123456789UL;
-
-    private ulong defaultFixed64_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ulong DefaultFixed64 {
-      get { if ((_hasBits0 & 4194304) != 0) { return defaultFixed64_; } else { return DefaultFixed64DefaultValue; } }
-      set {
-        _hasBits0 |= 4194304;
-        defaultFixed64_ = value;
-      }
-    }
-    /// <summary>Gets whether the "default_fixed64" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasDefaultFixed64 {
-      get { return (_hasBits0 & 4194304) != 0; }
-    }
-    /// <summary>Clears the value of the "default_fixed64" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearDefaultFixed64() {
-      _hasBits0 &= ~4194304;
-    }
-
-    /// <summary>Field number for the "default_sfixed32" field.</summary>
-    public const int DefaultSfixed32FieldNumber = 249;
-    private readonly static int DefaultSfixed32DefaultValue = -123456789;
-
-    private int defaultSfixed32_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int DefaultSfixed32 {
-      get { if ((_hasBits0 & 8388608) != 0) { return defaultSfixed32_; } else { return DefaultSfixed32DefaultValue; } }
-      set {
-        _hasBits0 |= 8388608;
-        defaultSfixed32_ = value;
-      }
-    }
-    /// <summary>Gets whether the "default_sfixed32" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasDefaultSfixed32 {
-      get { return (_hasBits0 & 8388608) != 0; }
-    }
-    /// <summary>Clears the value of the "default_sfixed32" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearDefaultSfixed32() {
-      _hasBits0 &= ~8388608;
-    }
-
-    /// <summary>Field number for the "default_sfixed64" field.</summary>
-    public const int DefaultSfixed64FieldNumber = 250;
-    private readonly static long DefaultSfixed64DefaultValue = -9123456789123456789L;
-
-    private long defaultSfixed64_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public long DefaultSfixed64 {
-      get { if ((_hasBits0 & 16777216) != 0) { return defaultSfixed64_; } else { return DefaultSfixed64DefaultValue; } }
-      set {
-        _hasBits0 |= 16777216;
-        defaultSfixed64_ = value;
-      }
-    }
-    /// <summary>Gets whether the "default_sfixed64" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasDefaultSfixed64 {
-      get { return (_hasBits0 & 16777216) != 0; }
-    }
-    /// <summary>Clears the value of the "default_sfixed64" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearDefaultSfixed64() {
-      _hasBits0 &= ~16777216;
-    }
-
-    /// <summary>Field number for the "default_float" field.</summary>
-    public const int DefaultFloatFieldNumber = 251;
-    private readonly static float DefaultFloatDefaultValue = 9e+09F;
-
-    private float defaultFloat_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public float DefaultFloat {
-      get { if ((_hasBits0 & 33554432) != 0) { return defaultFloat_; } else { return DefaultFloatDefaultValue; } }
-      set {
-        _hasBits0 |= 33554432;
-        defaultFloat_ = value;
-      }
-    }
-    /// <summary>Gets whether the "default_float" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasDefaultFloat {
-      get { return (_hasBits0 & 33554432) != 0; }
-    }
-    /// <summary>Clears the value of the "default_float" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearDefaultFloat() {
-      _hasBits0 &= ~33554432;
-    }
-
-    /// <summary>Field number for the "default_double" field.</summary>
-    public const int DefaultDoubleFieldNumber = 252;
-    private readonly static double DefaultDoubleDefaultValue = 7e+22D;
-
-    private double defaultDouble_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double DefaultDouble {
-      get { if ((_hasBits0 & 67108864) != 0) { return defaultDouble_; } else { return DefaultDoubleDefaultValue; } }
-      set {
-        _hasBits0 |= 67108864;
-        defaultDouble_ = value;
-      }
-    }
-    /// <summary>Gets whether the "default_double" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasDefaultDouble {
-      get { return (_hasBits0 & 67108864) != 0; }
-    }
-    /// <summary>Clears the value of the "default_double" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearDefaultDouble() {
-      _hasBits0 &= ~67108864;
-    }
-
-    /// <summary>Field number for the "default_bool" field.</summary>
-    public const int DefaultBoolFieldNumber = 253;
-    private readonly static bool DefaultBoolDefaultValue = true;
-
-    private bool defaultBool_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool DefaultBool {
-      get { if ((_hasBits0 & 134217728) != 0) { return defaultBool_; } else { return DefaultBoolDefaultValue; } }
-      set {
-        _hasBits0 |= 134217728;
-        defaultBool_ = value;
-      }
-    }
-    /// <summary>Gets whether the "default_bool" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasDefaultBool {
-      get { return (_hasBits0 & 134217728) != 0; }
-    }
-    /// <summary>Clears the value of the "default_bool" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearDefaultBool() {
-      _hasBits0 &= ~134217728;
-    }
-
-    /// <summary>Field number for the "default_string" field.</summary>
-    public const int DefaultStringFieldNumber = 254;
-    private readonly static string DefaultStringDefaultValue = global::System.Text.Encoding.UTF8.GetString(global::System.Convert.FromBase64String("Um9zZWJ1ZA=="), 0, 7);
-
-    private string defaultString_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string DefaultString {
-      get { return defaultString_ ?? DefaultStringDefaultValue; }
-      set {
-        defaultString_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-    /// <summary>Gets whether the "default_string" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasDefaultString {
-      get { return defaultString_ != null; }
-    }
-    /// <summary>Clears the value of the "default_string" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearDefaultString() {
-      defaultString_ = null;
-    }
-
-    /// <summary>Field number for the "default_bytes" field.</summary>
-    public const int DefaultBytesFieldNumber = 255;
-    private readonly static pb::ByteString DefaultBytesDefaultValue = pb::ByteString.FromBase64("am9zaHVh");
-
-    private pb::ByteString defaultBytes_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pb::ByteString DefaultBytes {
-      get { return defaultBytes_ ?? DefaultBytesDefaultValue; }
-      set {
-        defaultBytes_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-    /// <summary>Gets whether the "default_bytes" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasDefaultBytes {
-      get { return defaultBytes_ != null; }
-    }
-    /// <summary>Clears the value of the "default_bytes" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearDefaultBytes() {
-      defaultBytes_ = null;
-    }
-
-    /// <summary>Field number for the "fieldname1" field.</summary>
-    public const int Fieldname1FieldNumber = 401;
-    private readonly static int Fieldname1DefaultValue = 0;
-
-    private int fieldname1_;
-    /// <summary>
-    /// Test field-name-to-JSON-name convention.
-    /// (protobuf says names can be any valid C/C++ identifier.)
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int Fieldname1 {
-      get { if ((_hasBits0 & 268435456) != 0) { return fieldname1_; } else { return Fieldname1DefaultValue; } }
-      set {
-        _hasBits0 |= 268435456;
-        fieldname1_ = value;
-      }
-    }
-    /// <summary>Gets whether the "fieldname1" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasFieldname1 {
-      get { return (_hasBits0 & 268435456) != 0; }
-    }
-    /// <summary>Clears the value of the "fieldname1" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearFieldname1() {
-      _hasBits0 &= ~268435456;
-    }
-
-    /// <summary>Field number for the "field_name2" field.</summary>
-    public const int FieldName2FieldNumber = 402;
-    private readonly static int FieldName2DefaultValue = 0;
-
-    private int fieldName2_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int FieldName2 {
-      get { if ((_hasBits0 & 536870912) != 0) { return fieldName2_; } else { return FieldName2DefaultValue; } }
-      set {
-        _hasBits0 |= 536870912;
-        fieldName2_ = value;
-      }
-    }
-    /// <summary>Gets whether the "field_name2" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasFieldName2 {
-      get { return (_hasBits0 & 536870912) != 0; }
-    }
-    /// <summary>Clears the value of the "field_name2" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearFieldName2() {
-      _hasBits0 &= ~536870912;
-    }
-
-    /// <summary>Field number for the "_field_name3" field.</summary>
-    public const int FieldName3FieldNumber = 403;
-    private readonly static int FieldName3DefaultValue = 0;
-
-    private int FieldName3_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int FieldName3 {
-      get { if ((_hasBits0 & 1073741824) != 0) { return FieldName3_; } else { return FieldName3DefaultValue; } }
-      set {
-        _hasBits0 |= 1073741824;
-        FieldName3_ = value;
-      }
-    }
-    /// <summary>Gets whether the "_field_name3" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasFieldName3 {
-      get { return (_hasBits0 & 1073741824) != 0; }
-    }
-    /// <summary>Clears the value of the "_field_name3" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearFieldName3() {
-      _hasBits0 &= ~1073741824;
-    }
-
-    /// <summary>Field number for the "field__name4_" field.</summary>
-    public const int FieldName4FieldNumber = 404;
-    private readonly static int FieldName4DefaultValue = 0;
-
-    private int fieldName4_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int FieldName4 {
-      get { if ((_hasBits0 & -2147483648) != 0) { return fieldName4_; } else { return FieldName4DefaultValue; } }
-      set {
-        _hasBits0 |= -2147483648;
-        fieldName4_ = value;
-      }
-    }
-    /// <summary>Gets whether the "field__name4_" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasFieldName4 {
-      get { return (_hasBits0 & -2147483648) != 0; }
-    }
-    /// <summary>Clears the value of the "field__name4_" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearFieldName4() {
-      _hasBits0 &= ~-2147483648;
-    }
-
-    /// <summary>Field number for the "field0name5" field.</summary>
-    public const int Field0Name5FieldNumber = 405;
-    private readonly static int Field0Name5DefaultValue = 0;
-
-    private int field0Name5_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int Field0Name5 {
-      get { if ((_hasBits1 & 1) != 0) { return field0Name5_; } else { return Field0Name5DefaultValue; } }
-      set {
-        _hasBits1 |= 1;
-        field0Name5_ = value;
-      }
-    }
-    /// <summary>Gets whether the "field0name5" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasField0Name5 {
-      get { return (_hasBits1 & 1) != 0; }
-    }
-    /// <summary>Clears the value of the "field0name5" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearField0Name5() {
-      _hasBits1 &= ~1;
-    }
-
-    /// <summary>Field number for the "field_0_name6" field.</summary>
-    public const int Field0Name6FieldNumber = 406;
-    private readonly static int Field0Name6DefaultValue = 0;
-
-    private int field0Name6_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int Field0Name6 {
-      get { if ((_hasBits1 & 2) != 0) { return field0Name6_; } else { return Field0Name6DefaultValue; } }
-      set {
-        _hasBits1 |= 2;
-        field0Name6_ = value;
-      }
-    }
-    /// <summary>Gets whether the "field_0_name6" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasField0Name6 {
-      get { return (_hasBits1 & 2) != 0; }
-    }
-    /// <summary>Clears the value of the "field_0_name6" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearField0Name6() {
-      _hasBits1 &= ~2;
-    }
-
-    /// <summary>Field number for the "fieldName7" field.</summary>
-    public const int FieldName7FieldNumber = 407;
-    private readonly static int FieldName7DefaultValue = 0;
-
-    private int fieldName7_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int FieldName7 {
-      get { if ((_hasBits1 & 4) != 0) { return fieldName7_; } else { return FieldName7DefaultValue; } }
-      set {
-        _hasBits1 |= 4;
-        fieldName7_ = value;
-      }
-    }
-    /// <summary>Gets whether the "fieldName7" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasFieldName7 {
-      get { return (_hasBits1 & 4) != 0; }
-    }
-    /// <summary>Clears the value of the "fieldName7" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearFieldName7() {
-      _hasBits1 &= ~4;
-    }
-
-    /// <summary>Field number for the "FieldName8" field.</summary>
-    public const int FieldName8FieldNumber = 408;
-    private readonly static int FieldName8DefaultValue = 0;
-
-    private int fieldName8_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int FieldName8 {
-      get { if ((_hasBits1 & 8) != 0) { return fieldName8_; } else { return FieldName8DefaultValue; } }
-      set {
-        _hasBits1 |= 8;
-        fieldName8_ = value;
-      }
-    }
-    /// <summary>Gets whether the "FieldName8" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasFieldName8 {
-      get { return (_hasBits1 & 8) != 0; }
-    }
-    /// <summary>Clears the value of the "FieldName8" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearFieldName8() {
-      _hasBits1 &= ~8;
-    }
-
-    /// <summary>Field number for the "field_Name9" field.</summary>
-    public const int FieldName9FieldNumber = 409;
-    private readonly static int FieldName9DefaultValue = 0;
-
-    private int fieldName9_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int FieldName9 {
-      get { if ((_hasBits1 & 16) != 0) { return fieldName9_; } else { return FieldName9DefaultValue; } }
-      set {
-        _hasBits1 |= 16;
-        fieldName9_ = value;
-      }
-    }
-    /// <summary>Gets whether the "field_Name9" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasFieldName9 {
-      get { return (_hasBits1 & 16) != 0; }
-    }
-    /// <summary>Clears the value of the "field_Name9" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearFieldName9() {
-      _hasBits1 &= ~16;
-    }
-
-    /// <summary>Field number for the "Field_Name10" field.</summary>
-    public const int FieldName10FieldNumber = 410;
-    private readonly static int FieldName10DefaultValue = 0;
-
-    private int fieldName10_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int FieldName10 {
-      get { if ((_hasBits1 & 32) != 0) { return fieldName10_; } else { return FieldName10DefaultValue; } }
-      set {
-        _hasBits1 |= 32;
-        fieldName10_ = value;
-      }
-    }
-    /// <summary>Gets whether the "Field_Name10" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasFieldName10 {
-      get { return (_hasBits1 & 32) != 0; }
-    }
-    /// <summary>Clears the value of the "Field_Name10" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearFieldName10() {
-      _hasBits1 &= ~32;
-    }
-
-    /// <summary>Field number for the "FIELD_NAME11" field.</summary>
-    public const int FIELDNAME11FieldNumber = 411;
-    private readonly static int FIELDNAME11DefaultValue = 0;
-
-    private int fIELDNAME11_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int FIELDNAME11 {
-      get { if ((_hasBits1 & 64) != 0) { return fIELDNAME11_; } else { return FIELDNAME11DefaultValue; } }
-      set {
-        _hasBits1 |= 64;
-        fIELDNAME11_ = value;
-      }
-    }
-    /// <summary>Gets whether the "FIELD_NAME11" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasFIELDNAME11 {
-      get { return (_hasBits1 & 64) != 0; }
-    }
-    /// <summary>Clears the value of the "FIELD_NAME11" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearFIELDNAME11() {
-      _hasBits1 &= ~64;
-    }
-
-    /// <summary>Field number for the "FIELD_name12" field.</summary>
-    public const int FIELDName12FieldNumber = 412;
-    private readonly static int FIELDName12DefaultValue = 0;
-
-    private int fIELDName12_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int FIELDName12 {
-      get { if ((_hasBits1 & 128) != 0) { return fIELDName12_; } else { return FIELDName12DefaultValue; } }
-      set {
-        _hasBits1 |= 128;
-        fIELDName12_ = value;
-      }
-    }
-    /// <summary>Gets whether the "FIELD_name12" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasFIELDName12 {
-      get { return (_hasBits1 & 128) != 0; }
-    }
-    /// <summary>Clears the value of the "FIELD_name12" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearFIELDName12() {
-      _hasBits1 &= ~128;
-    }
-
-    /// <summary>Field number for the "__field_name13" field.</summary>
-    public const int FieldName13FieldNumber = 413;
-    private readonly static int FieldName13DefaultValue = 0;
-
-    private int FieldName13_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int FieldName13 {
-      get { if ((_hasBits1 & 256) != 0) { return FieldName13_; } else { return FieldName13DefaultValue; } }
-      set {
-        _hasBits1 |= 256;
-        FieldName13_ = value;
-      }
-    }
-    /// <summary>Gets whether the "__field_name13" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasFieldName13 {
-      get { return (_hasBits1 & 256) != 0; }
-    }
-    /// <summary>Clears the value of the "__field_name13" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearFieldName13() {
-      _hasBits1 &= ~256;
-    }
-
-    /// <summary>Field number for the "__Field_name14" field.</summary>
-    public const int FieldName14FieldNumber = 414;
-    private readonly static int FieldName14DefaultValue = 0;
-
-    private int FieldName14_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int FieldName14 {
-      get { if ((_hasBits1 & 512) != 0) { return FieldName14_; } else { return FieldName14DefaultValue; } }
-      set {
-        _hasBits1 |= 512;
-        FieldName14_ = value;
-      }
-    }
-    /// <summary>Gets whether the "__Field_name14" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasFieldName14 {
-      get { return (_hasBits1 & 512) != 0; }
-    }
-    /// <summary>Clears the value of the "__Field_name14" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearFieldName14() {
-      _hasBits1 &= ~512;
-    }
-
-    /// <summary>Field number for the "field__name15" field.</summary>
-    public const int FieldName15FieldNumber = 415;
-    private readonly static int FieldName15DefaultValue = 0;
-
-    private int fieldName15_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int FieldName15 {
-      get { if ((_hasBits1 & 1024) != 0) { return fieldName15_; } else { return FieldName15DefaultValue; } }
-      set {
-        _hasBits1 |= 1024;
-        fieldName15_ = value;
-      }
-    }
-    /// <summary>Gets whether the "field__name15" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasFieldName15 {
-      get { return (_hasBits1 & 1024) != 0; }
-    }
-    /// <summary>Clears the value of the "field__name15" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearFieldName15() {
-      _hasBits1 &= ~1024;
-    }
-
-    /// <summary>Field number for the "field__Name16" field.</summary>
-    public const int FieldName16FieldNumber = 416;
-    private readonly static int FieldName16DefaultValue = 0;
-
-    private int fieldName16_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int FieldName16 {
-      get { if ((_hasBits1 & 2048) != 0) { return fieldName16_; } else { return FieldName16DefaultValue; } }
-      set {
-        _hasBits1 |= 2048;
-        fieldName16_ = value;
-      }
-    }
-    /// <summary>Gets whether the "field__Name16" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasFieldName16 {
-      get { return (_hasBits1 & 2048) != 0; }
-    }
-    /// <summary>Clears the value of the "field__Name16" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearFieldName16() {
-      _hasBits1 &= ~2048;
-    }
-
-    /// <summary>Field number for the "field_name17__" field.</summary>
-    public const int FieldName17FieldNumber = 417;
-    private readonly static int FieldName17DefaultValue = 0;
-
-    private int fieldName17_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int FieldName17 {
-      get { if ((_hasBits1 & 4096) != 0) { return fieldName17_; } else { return FieldName17DefaultValue; } }
-      set {
-        _hasBits1 |= 4096;
-        fieldName17_ = value;
-      }
-    }
-    /// <summary>Gets whether the "field_name17__" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasFieldName17 {
-      get { return (_hasBits1 & 4096) != 0; }
-    }
-    /// <summary>Clears the value of the "field_name17__" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearFieldName17() {
-      _hasBits1 &= ~4096;
-    }
-
-    /// <summary>Field number for the "Field_name18__" field.</summary>
-    public const int FieldName18FieldNumber = 418;
-    private readonly static int FieldName18DefaultValue = 0;
-
-    private int fieldName18_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int FieldName18 {
-      get { if ((_hasBits1 & 8192) != 0) { return fieldName18_; } else { return FieldName18DefaultValue; } }
-      set {
-        _hasBits1 |= 8192;
-        fieldName18_ = value;
-      }
-    }
-    /// <summary>Gets whether the "Field_name18__" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasFieldName18 {
-      get { return (_hasBits1 & 8192) != 0; }
-    }
-    /// <summary>Clears the value of the "Field_name18__" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearFieldName18() {
-      _hasBits1 &= ~8192;
-    }
-
-    private object oneofField_;
-    /// <summary>Enum of possible cases for the "oneof_field" oneof.</summary>
-    public enum OneofFieldOneofCase {
-      None = 0,
-      OneofUint32 = 111,
-      OneofNestedMessage = 112,
-      OneofString = 113,
-      OneofBytes = 114,
-      OneofBool = 115,
-      OneofUint64 = 116,
-      OneofFloat = 117,
-      OneofDouble = 118,
-      OneofEnum = 119,
-    }
-    private OneofFieldOneofCase oneofFieldCase_ = OneofFieldOneofCase.None;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public OneofFieldOneofCase OneofFieldCase {
-      get { return oneofFieldCase_; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearOneofField() {
-      oneofFieldCase_ = OneofFieldOneofCase.None;
-      oneofField_ = null;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as TestAllTypesProto2);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(TestAllTypesProto2 other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (OptionalInt32 != other.OptionalInt32) return false;
-      if (OptionalInt64 != other.OptionalInt64) return false;
-      if (OptionalUint32 != other.OptionalUint32) return false;
-      if (OptionalUint64 != other.OptionalUint64) return false;
-      if (OptionalSint32 != other.OptionalSint32) return false;
-      if (OptionalSint64 != other.OptionalSint64) return false;
-      if (OptionalFixed32 != other.OptionalFixed32) return false;
-      if (OptionalFixed64 != other.OptionalFixed64) return false;
-      if (OptionalSfixed32 != other.OptionalSfixed32) return false;
-      if (OptionalSfixed64 != other.OptionalSfixed64) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.Equals(OptionalFloat, other.OptionalFloat)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.Equals(OptionalDouble, other.OptionalDouble)) return false;
-      if (OptionalBool != other.OptionalBool) return false;
-      if (OptionalString != other.OptionalString) return false;
-      if (OptionalBytes != other.OptionalBytes) return false;
-      if (!object.Equals(OptionalNestedMessage, other.OptionalNestedMessage)) return false;
-      if (!object.Equals(OptionalForeignMessage, other.OptionalForeignMessage)) return false;
-      if (OptionalNestedEnum != other.OptionalNestedEnum) return false;
-      if (OptionalForeignEnum != other.OptionalForeignEnum) return false;
-      if (OptionalStringPiece != other.OptionalStringPiece) return false;
-      if (OptionalCord != other.OptionalCord) return false;
-      if (!object.Equals(RecursiveMessage, other.RecursiveMessage)) return false;
-      if(!repeatedInt32_.Equals(other.repeatedInt32_)) return false;
-      if(!repeatedInt64_.Equals(other.repeatedInt64_)) return false;
-      if(!repeatedUint32_.Equals(other.repeatedUint32_)) return false;
-      if(!repeatedUint64_.Equals(other.repeatedUint64_)) return false;
-      if(!repeatedSint32_.Equals(other.repeatedSint32_)) return false;
-      if(!repeatedSint64_.Equals(other.repeatedSint64_)) return false;
-      if(!repeatedFixed32_.Equals(other.repeatedFixed32_)) return false;
-      if(!repeatedFixed64_.Equals(other.repeatedFixed64_)) return false;
-      if(!repeatedSfixed32_.Equals(other.repeatedSfixed32_)) return false;
-      if(!repeatedSfixed64_.Equals(other.repeatedSfixed64_)) return false;
-      if(!repeatedFloat_.Equals(other.repeatedFloat_)) return false;
-      if(!repeatedDouble_.Equals(other.repeatedDouble_)) return false;
-      if(!repeatedBool_.Equals(other.repeatedBool_)) return false;
-      if(!repeatedString_.Equals(other.repeatedString_)) return false;
-      if(!repeatedBytes_.Equals(other.repeatedBytes_)) return false;
-      if(!repeatedNestedMessage_.Equals(other.repeatedNestedMessage_)) return false;
-      if(!repeatedForeignMessage_.Equals(other.repeatedForeignMessage_)) return false;
-      if(!repeatedNestedEnum_.Equals(other.repeatedNestedEnum_)) return false;
-      if(!repeatedForeignEnum_.Equals(other.repeatedForeignEnum_)) return false;
-      if(!repeatedStringPiece_.Equals(other.repeatedStringPiece_)) return false;
-      if(!repeatedCord_.Equals(other.repeatedCord_)) return false;
-      if(!packedInt32_.Equals(other.packedInt32_)) return false;
-      if(!packedInt64_.Equals(other.packedInt64_)) return false;
-      if(!packedUint32_.Equals(other.packedUint32_)) return false;
-      if(!packedUint64_.Equals(other.packedUint64_)) return false;
-      if(!packedSint32_.Equals(other.packedSint32_)) return false;
-      if(!packedSint64_.Equals(other.packedSint64_)) return false;
-      if(!packedFixed32_.Equals(other.packedFixed32_)) return false;
-      if(!packedFixed64_.Equals(other.packedFixed64_)) return false;
-      if(!packedSfixed32_.Equals(other.packedSfixed32_)) return false;
-      if(!packedSfixed64_.Equals(other.packedSfixed64_)) return false;
-      if(!packedFloat_.Equals(other.packedFloat_)) return false;
-      if(!packedDouble_.Equals(other.packedDouble_)) return false;
-      if(!packedBool_.Equals(other.packedBool_)) return false;
-      if(!packedNestedEnum_.Equals(other.packedNestedEnum_)) return false;
-      if(!unpackedInt32_.Equals(other.unpackedInt32_)) return false;
-      if(!unpackedInt64_.Equals(other.unpackedInt64_)) return false;
-      if(!unpackedUint32_.Equals(other.unpackedUint32_)) return false;
-      if(!unpackedUint64_.Equals(other.unpackedUint64_)) return false;
-      if(!unpackedSint32_.Equals(other.unpackedSint32_)) return false;
-      if(!unpackedSint64_.Equals(other.unpackedSint64_)) return false;
-      if(!unpackedFixed32_.Equals(other.unpackedFixed32_)) return false;
-      if(!unpackedFixed64_.Equals(other.unpackedFixed64_)) return false;
-      if(!unpackedSfixed32_.Equals(other.unpackedSfixed32_)) return false;
-      if(!unpackedSfixed64_.Equals(other.unpackedSfixed64_)) return false;
-      if(!unpackedFloat_.Equals(other.unpackedFloat_)) return false;
-      if(!unpackedDouble_.Equals(other.unpackedDouble_)) return false;
-      if(!unpackedBool_.Equals(other.unpackedBool_)) return false;
-      if(!unpackedNestedEnum_.Equals(other.unpackedNestedEnum_)) return false;
-      if (!MapInt32Int32.Equals(other.MapInt32Int32)) return false;
-      if (!MapInt64Int64.Equals(other.MapInt64Int64)) return false;
-      if (!MapUint32Uint32.Equals(other.MapUint32Uint32)) return false;
-      if (!MapUint64Uint64.Equals(other.MapUint64Uint64)) return false;
-      if (!MapSint32Sint32.Equals(other.MapSint32Sint32)) return false;
-      if (!MapSint64Sint64.Equals(other.MapSint64Sint64)) return false;
-      if (!MapFixed32Fixed32.Equals(other.MapFixed32Fixed32)) return false;
-      if (!MapFixed64Fixed64.Equals(other.MapFixed64Fixed64)) return false;
-      if (!MapSfixed32Sfixed32.Equals(other.MapSfixed32Sfixed32)) return false;
-      if (!MapSfixed64Sfixed64.Equals(other.MapSfixed64Sfixed64)) return false;
-      if (!MapInt32Float.Equals(other.MapInt32Float)) return false;
-      if (!MapInt32Double.Equals(other.MapInt32Double)) return false;
-      if (!MapBoolBool.Equals(other.MapBoolBool)) return false;
-      if (!MapStringString.Equals(other.MapStringString)) return false;
-      if (!MapStringBytes.Equals(other.MapStringBytes)) return false;
-      if (!MapStringNestedMessage.Equals(other.MapStringNestedMessage)) return false;
-      if (!MapStringForeignMessage.Equals(other.MapStringForeignMessage)) return false;
-      if (!MapStringNestedEnum.Equals(other.MapStringNestedEnum)) return false;
-      if (!MapStringForeignEnum.Equals(other.MapStringForeignEnum)) return false;
-      if (OneofUint32 != other.OneofUint32) return false;
-      if (!object.Equals(OneofNestedMessage, other.OneofNestedMessage)) return false;
-      if (OneofString != other.OneofString) return false;
-      if (OneofBytes != other.OneofBytes) return false;
-      if (OneofBool != other.OneofBool) return false;
-      if (OneofUint64 != other.OneofUint64) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.Equals(OneofFloat, other.OneofFloat)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.Equals(OneofDouble, other.OneofDouble)) return false;
-      if (OneofEnum != other.OneofEnum) return false;
-      if (!object.Equals(Data, other.Data)) return false;
-      if (DefaultInt32 != other.DefaultInt32) return false;
-      if (DefaultInt64 != other.DefaultInt64) return false;
-      if (DefaultUint32 != other.DefaultUint32) return false;
-      if (DefaultUint64 != other.DefaultUint64) return false;
-      if (DefaultSint32 != other.DefaultSint32) return false;
-      if (DefaultSint64 != other.DefaultSint64) return false;
-      if (DefaultFixed32 != other.DefaultFixed32) return false;
-      if (DefaultFixed64 != other.DefaultFixed64) return false;
-      if (DefaultSfixed32 != other.DefaultSfixed32) return false;
-      if (DefaultSfixed64 != other.DefaultSfixed64) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.Equals(DefaultFloat, other.DefaultFloat)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.Equals(DefaultDouble, other.DefaultDouble)) return false;
-      if (DefaultBool != other.DefaultBool) return false;
-      if (DefaultString != other.DefaultString) return false;
-      if (DefaultBytes != other.DefaultBytes) return false;
-      if (Fieldname1 != other.Fieldname1) return false;
-      if (FieldName2 != other.FieldName2) return false;
-      if (FieldName3 != other.FieldName3) return false;
-      if (FieldName4 != other.FieldName4) return false;
-      if (Field0Name5 != other.Field0Name5) return false;
-      if (Field0Name6 != other.Field0Name6) return false;
-      if (FieldName7 != other.FieldName7) return false;
-      if (FieldName8 != other.FieldName8) return false;
-      if (FieldName9 != other.FieldName9) return false;
-      if (FieldName10 != other.FieldName10) return false;
-      if (FIELDNAME11 != other.FIELDNAME11) return false;
-      if (FIELDName12 != other.FIELDName12) return false;
-      if (FieldName13 != other.FieldName13) return false;
-      if (FieldName14 != other.FieldName14) return false;
-      if (FieldName15 != other.FieldName15) return false;
-      if (FieldName16 != other.FieldName16) return false;
-      if (FieldName17 != other.FieldName17) return false;
-      if (FieldName18 != other.FieldName18) return false;
-      if (OneofFieldCase != other.OneofFieldCase) return false;
-      if (!Equals(_extensions, other._extensions)) {
-        return false;
-      }
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (HasOptionalInt32) hash ^= OptionalInt32.GetHashCode();
-      if (HasOptionalInt64) hash ^= OptionalInt64.GetHashCode();
-      if (HasOptionalUint32) hash ^= OptionalUint32.GetHashCode();
-      if (HasOptionalUint64) hash ^= OptionalUint64.GetHashCode();
-      if (HasOptionalSint32) hash ^= OptionalSint32.GetHashCode();
-      if (HasOptionalSint64) hash ^= OptionalSint64.GetHashCode();
-      if (HasOptionalFixed32) hash ^= OptionalFixed32.GetHashCode();
-      if (HasOptionalFixed64) hash ^= OptionalFixed64.GetHashCode();
-      if (HasOptionalSfixed32) hash ^= OptionalSfixed32.GetHashCode();
-      if (HasOptionalSfixed64) hash ^= OptionalSfixed64.GetHashCode();
-      if (HasOptionalFloat) hash ^= pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.GetHashCode(OptionalFloat);
-      if (HasOptionalDouble) hash ^= pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.GetHashCode(OptionalDouble);
-      if (HasOptionalBool) hash ^= OptionalBool.GetHashCode();
-      if (HasOptionalString) hash ^= OptionalString.GetHashCode();
-      if (HasOptionalBytes) hash ^= OptionalBytes.GetHashCode();
-      if (optionalNestedMessage_ != null) hash ^= OptionalNestedMessage.GetHashCode();
-      if (optionalForeignMessage_ != null) hash ^= OptionalForeignMessage.GetHashCode();
-      if (HasOptionalNestedEnum) hash ^= OptionalNestedEnum.GetHashCode();
-      if (HasOptionalForeignEnum) hash ^= OptionalForeignEnum.GetHashCode();
-      if (HasOptionalStringPiece) hash ^= OptionalStringPiece.GetHashCode();
-      if (HasOptionalCord) hash ^= OptionalCord.GetHashCode();
-      if (recursiveMessage_ != null) hash ^= RecursiveMessage.GetHashCode();
-      hash ^= repeatedInt32_.GetHashCode();
-      hash ^= repeatedInt64_.GetHashCode();
-      hash ^= repeatedUint32_.GetHashCode();
-      hash ^= repeatedUint64_.GetHashCode();
-      hash ^= repeatedSint32_.GetHashCode();
-      hash ^= repeatedSint64_.GetHashCode();
-      hash ^= repeatedFixed32_.GetHashCode();
-      hash ^= repeatedFixed64_.GetHashCode();
-      hash ^= repeatedSfixed32_.GetHashCode();
-      hash ^= repeatedSfixed64_.GetHashCode();
-      hash ^= repeatedFloat_.GetHashCode();
-      hash ^= repeatedDouble_.GetHashCode();
-      hash ^= repeatedBool_.GetHashCode();
-      hash ^= repeatedString_.GetHashCode();
-      hash ^= repeatedBytes_.GetHashCode();
-      hash ^= repeatedNestedMessage_.GetHashCode();
-      hash ^= repeatedForeignMessage_.GetHashCode();
-      hash ^= repeatedNestedEnum_.GetHashCode();
-      hash ^= repeatedForeignEnum_.GetHashCode();
-      hash ^= repeatedStringPiece_.GetHashCode();
-      hash ^= repeatedCord_.GetHashCode();
-      hash ^= packedInt32_.GetHashCode();
-      hash ^= packedInt64_.GetHashCode();
-      hash ^= packedUint32_.GetHashCode();
-      hash ^= packedUint64_.GetHashCode();
-      hash ^= packedSint32_.GetHashCode();
-      hash ^= packedSint64_.GetHashCode();
-      hash ^= packedFixed32_.GetHashCode();
-      hash ^= packedFixed64_.GetHashCode();
-      hash ^= packedSfixed32_.GetHashCode();
-      hash ^= packedSfixed64_.GetHashCode();
-      hash ^= packedFloat_.GetHashCode();
-      hash ^= packedDouble_.GetHashCode();
-      hash ^= packedBool_.GetHashCode();
-      hash ^= packedNestedEnum_.GetHashCode();
-      hash ^= unpackedInt32_.GetHashCode();
-      hash ^= unpackedInt64_.GetHashCode();
-      hash ^= unpackedUint32_.GetHashCode();
-      hash ^= unpackedUint64_.GetHashCode();
-      hash ^= unpackedSint32_.GetHashCode();
-      hash ^= unpackedSint64_.GetHashCode();
-      hash ^= unpackedFixed32_.GetHashCode();
-      hash ^= unpackedFixed64_.GetHashCode();
-      hash ^= unpackedSfixed32_.GetHashCode();
-      hash ^= unpackedSfixed64_.GetHashCode();
-      hash ^= unpackedFloat_.GetHashCode();
-      hash ^= unpackedDouble_.GetHashCode();
-      hash ^= unpackedBool_.GetHashCode();
-      hash ^= unpackedNestedEnum_.GetHashCode();
-      hash ^= MapInt32Int32.GetHashCode();
-      hash ^= MapInt64Int64.GetHashCode();
-      hash ^= MapUint32Uint32.GetHashCode();
-      hash ^= MapUint64Uint64.GetHashCode();
-      hash ^= MapSint32Sint32.GetHashCode();
-      hash ^= MapSint64Sint64.GetHashCode();
-      hash ^= MapFixed32Fixed32.GetHashCode();
-      hash ^= MapFixed64Fixed64.GetHashCode();
-      hash ^= MapSfixed32Sfixed32.GetHashCode();
-      hash ^= MapSfixed64Sfixed64.GetHashCode();
-      hash ^= MapInt32Float.GetHashCode();
-      hash ^= MapInt32Double.GetHashCode();
-      hash ^= MapBoolBool.GetHashCode();
-      hash ^= MapStringString.GetHashCode();
-      hash ^= MapStringBytes.GetHashCode();
-      hash ^= MapStringNestedMessage.GetHashCode();
-      hash ^= MapStringForeignMessage.GetHashCode();
-      hash ^= MapStringNestedEnum.GetHashCode();
-      hash ^= MapStringForeignEnum.GetHashCode();
-      if (HasOneofUint32) hash ^= OneofUint32.GetHashCode();
-      if (oneofFieldCase_ == OneofFieldOneofCase.OneofNestedMessage) hash ^= OneofNestedMessage.GetHashCode();
-      if (HasOneofString) hash ^= OneofString.GetHashCode();
-      if (HasOneofBytes) hash ^= OneofBytes.GetHashCode();
-      if (HasOneofBool) hash ^= OneofBool.GetHashCode();
-      if (HasOneofUint64) hash ^= OneofUint64.GetHashCode();
-      if (HasOneofFloat) hash ^= pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.GetHashCode(OneofFloat);
-      if (HasOneofDouble) hash ^= pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.GetHashCode(OneofDouble);
-      if (HasOneofEnum) hash ^= OneofEnum.GetHashCode();
-      if (HasData) hash ^= Data.GetHashCode();
-      if (HasDefaultInt32) hash ^= DefaultInt32.GetHashCode();
-      if (HasDefaultInt64) hash ^= DefaultInt64.GetHashCode();
-      if (HasDefaultUint32) hash ^= DefaultUint32.GetHashCode();
-      if (HasDefaultUint64) hash ^= DefaultUint64.GetHashCode();
-      if (HasDefaultSint32) hash ^= DefaultSint32.GetHashCode();
-      if (HasDefaultSint64) hash ^= DefaultSint64.GetHashCode();
-      if (HasDefaultFixed32) hash ^= DefaultFixed32.GetHashCode();
-      if (HasDefaultFixed64) hash ^= DefaultFixed64.GetHashCode();
-      if (HasDefaultSfixed32) hash ^= DefaultSfixed32.GetHashCode();
-      if (HasDefaultSfixed64) hash ^= DefaultSfixed64.GetHashCode();
-      if (HasDefaultFloat) hash ^= pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.GetHashCode(DefaultFloat);
-      if (HasDefaultDouble) hash ^= pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.GetHashCode(DefaultDouble);
-      if (HasDefaultBool) hash ^= DefaultBool.GetHashCode();
-      if (HasDefaultString) hash ^= DefaultString.GetHashCode();
-      if (HasDefaultBytes) hash ^= DefaultBytes.GetHashCode();
-      if (HasFieldname1) hash ^= Fieldname1.GetHashCode();
-      if (HasFieldName2) hash ^= FieldName2.GetHashCode();
-      if (HasFieldName3) hash ^= FieldName3.GetHashCode();
-      if (HasFieldName4) hash ^= FieldName4.GetHashCode();
-      if (HasField0Name5) hash ^= Field0Name5.GetHashCode();
-      if (HasField0Name6) hash ^= Field0Name6.GetHashCode();
-      if (HasFieldName7) hash ^= FieldName7.GetHashCode();
-      if (HasFieldName8) hash ^= FieldName8.GetHashCode();
-      if (HasFieldName9) hash ^= FieldName9.GetHashCode();
-      if (HasFieldName10) hash ^= FieldName10.GetHashCode();
-      if (HasFIELDNAME11) hash ^= FIELDNAME11.GetHashCode();
-      if (HasFIELDName12) hash ^= FIELDName12.GetHashCode();
-      if (HasFieldName13) hash ^= FieldName13.GetHashCode();
-      if (HasFieldName14) hash ^= FieldName14.GetHashCode();
-      if (HasFieldName15) hash ^= FieldName15.GetHashCode();
-      if (HasFieldName16) hash ^= FieldName16.GetHashCode();
-      if (HasFieldName17) hash ^= FieldName17.GetHashCode();
-      if (HasFieldName18) hash ^= FieldName18.GetHashCode();
-      hash ^= (int) oneofFieldCase_;
-      if (_extensions != null) {
-        hash ^= _extensions.GetHashCode();
-      }
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (HasOptionalInt32) {
-        output.WriteRawTag(8);
-        output.WriteInt32(OptionalInt32);
-      }
-      if (HasOptionalInt64) {
-        output.WriteRawTag(16);
-        output.WriteInt64(OptionalInt64);
-      }
-      if (HasOptionalUint32) {
-        output.WriteRawTag(24);
-        output.WriteUInt32(OptionalUint32);
-      }
-      if (HasOptionalUint64) {
-        output.WriteRawTag(32);
-        output.WriteUInt64(OptionalUint64);
-      }
-      if (HasOptionalSint32) {
-        output.WriteRawTag(40);
-        output.WriteSInt32(OptionalSint32);
-      }
-      if (HasOptionalSint64) {
-        output.WriteRawTag(48);
-        output.WriteSInt64(OptionalSint64);
-      }
-      if (HasOptionalFixed32) {
-        output.WriteRawTag(61);
-        output.WriteFixed32(OptionalFixed32);
-      }
-      if (HasOptionalFixed64) {
-        output.WriteRawTag(65);
-        output.WriteFixed64(OptionalFixed64);
-      }
-      if (HasOptionalSfixed32) {
-        output.WriteRawTag(77);
-        output.WriteSFixed32(OptionalSfixed32);
-      }
-      if (HasOptionalSfixed64) {
-        output.WriteRawTag(81);
-        output.WriteSFixed64(OptionalSfixed64);
-      }
-      if (HasOptionalFloat) {
-        output.WriteRawTag(93);
-        output.WriteFloat(OptionalFloat);
-      }
-      if (HasOptionalDouble) {
-        output.WriteRawTag(97);
-        output.WriteDouble(OptionalDouble);
-      }
-      if (HasOptionalBool) {
-        output.WriteRawTag(104);
-        output.WriteBool(OptionalBool);
-      }
-      if (HasOptionalString) {
-        output.WriteRawTag(114);
-        output.WriteString(OptionalString);
-      }
-      if (HasOptionalBytes) {
-        output.WriteRawTag(122);
-        output.WriteBytes(OptionalBytes);
-      }
-      if (optionalNestedMessage_ != null) {
-        output.WriteRawTag(146, 1);
-        output.WriteMessage(OptionalNestedMessage);
-      }
-      if (optionalForeignMessage_ != null) {
-        output.WriteRawTag(154, 1);
-        output.WriteMessage(OptionalForeignMessage);
-      }
-      if (HasOptionalNestedEnum) {
-        output.WriteRawTag(168, 1);
-        output.WriteEnum((int) OptionalNestedEnum);
-      }
-      if (HasOptionalForeignEnum) {
-        output.WriteRawTag(176, 1);
-        output.WriteEnum((int) OptionalForeignEnum);
-      }
-      if (HasOptionalStringPiece) {
-        output.WriteRawTag(194, 1);
-        output.WriteString(OptionalStringPiece);
-      }
-      if (HasOptionalCord) {
-        output.WriteRawTag(202, 1);
-        output.WriteString(OptionalCord);
-      }
-      if (recursiveMessage_ != null) {
-        output.WriteRawTag(218, 1);
-        output.WriteMessage(RecursiveMessage);
-      }
-      repeatedInt32_.WriteTo(output, _repeated_repeatedInt32_codec);
-      repeatedInt64_.WriteTo(output, _repeated_repeatedInt64_codec);
-      repeatedUint32_.WriteTo(output, _repeated_repeatedUint32_codec);
-      repeatedUint64_.WriteTo(output, _repeated_repeatedUint64_codec);
-      repeatedSint32_.WriteTo(output, _repeated_repeatedSint32_codec);
-      repeatedSint64_.WriteTo(output, _repeated_repeatedSint64_codec);
-      repeatedFixed32_.WriteTo(output, _repeated_repeatedFixed32_codec);
-      repeatedFixed64_.WriteTo(output, _repeated_repeatedFixed64_codec);
-      repeatedSfixed32_.WriteTo(output, _repeated_repeatedSfixed32_codec);
-      repeatedSfixed64_.WriteTo(output, _repeated_repeatedSfixed64_codec);
-      repeatedFloat_.WriteTo(output, _repeated_repeatedFloat_codec);
-      repeatedDouble_.WriteTo(output, _repeated_repeatedDouble_codec);
-      repeatedBool_.WriteTo(output, _repeated_repeatedBool_codec);
-      repeatedString_.WriteTo(output, _repeated_repeatedString_codec);
-      repeatedBytes_.WriteTo(output, _repeated_repeatedBytes_codec);
-      repeatedNestedMessage_.WriteTo(output, _repeated_repeatedNestedMessage_codec);
-      repeatedForeignMessage_.WriteTo(output, _repeated_repeatedForeignMessage_codec);
-      repeatedNestedEnum_.WriteTo(output, _repeated_repeatedNestedEnum_codec);
-      repeatedForeignEnum_.WriteTo(output, _repeated_repeatedForeignEnum_codec);
-      repeatedStringPiece_.WriteTo(output, _repeated_repeatedStringPiece_codec);
-      repeatedCord_.WriteTo(output, _repeated_repeatedCord_codec);
-      mapInt32Int32_.WriteTo(output, _map_mapInt32Int32_codec);
-      mapInt64Int64_.WriteTo(output, _map_mapInt64Int64_codec);
-      mapUint32Uint32_.WriteTo(output, _map_mapUint32Uint32_codec);
-      mapUint64Uint64_.WriteTo(output, _map_mapUint64Uint64_codec);
-      mapSint32Sint32_.WriteTo(output, _map_mapSint32Sint32_codec);
-      mapSint64Sint64_.WriteTo(output, _map_mapSint64Sint64_codec);
-      mapFixed32Fixed32_.WriteTo(output, _map_mapFixed32Fixed32_codec);
-      mapFixed64Fixed64_.WriteTo(output, _map_mapFixed64Fixed64_codec);
-      mapSfixed32Sfixed32_.WriteTo(output, _map_mapSfixed32Sfixed32_codec);
-      mapSfixed64Sfixed64_.WriteTo(output, _map_mapSfixed64Sfixed64_codec);
-      mapInt32Float_.WriteTo(output, _map_mapInt32Float_codec);
-      mapInt32Double_.WriteTo(output, _map_mapInt32Double_codec);
-      mapBoolBool_.WriteTo(output, _map_mapBoolBool_codec);
-      mapStringString_.WriteTo(output, _map_mapStringString_codec);
-      mapStringBytes_.WriteTo(output, _map_mapStringBytes_codec);
-      mapStringNestedMessage_.WriteTo(output, _map_mapStringNestedMessage_codec);
-      mapStringForeignMessage_.WriteTo(output, _map_mapStringForeignMessage_codec);
-      mapStringNestedEnum_.WriteTo(output, _map_mapStringNestedEnum_codec);
-      mapStringForeignEnum_.WriteTo(output, _map_mapStringForeignEnum_codec);
-      packedInt32_.WriteTo(output, _repeated_packedInt32_codec);
-      packedInt64_.WriteTo(output, _repeated_packedInt64_codec);
-      packedUint32_.WriteTo(output, _repeated_packedUint32_codec);
-      packedUint64_.WriteTo(output, _repeated_packedUint64_codec);
-      packedSint32_.WriteTo(output, _repeated_packedSint32_codec);
-      packedSint64_.WriteTo(output, _repeated_packedSint64_codec);
-      packedFixed32_.WriteTo(output, _repeated_packedFixed32_codec);
-      packedFixed64_.WriteTo(output, _repeated_packedFixed64_codec);
-      packedSfixed32_.WriteTo(output, _repeated_packedSfixed32_codec);
-      packedSfixed64_.WriteTo(output, _repeated_packedSfixed64_codec);
-      packedFloat_.WriteTo(output, _repeated_packedFloat_codec);
-      packedDouble_.WriteTo(output, _repeated_packedDouble_codec);
-      packedBool_.WriteTo(output, _repeated_packedBool_codec);
-      packedNestedEnum_.WriteTo(output, _repeated_packedNestedEnum_codec);
-      unpackedInt32_.WriteTo(output, _repeated_unpackedInt32_codec);
-      unpackedInt64_.WriteTo(output, _repeated_unpackedInt64_codec);
-      unpackedUint32_.WriteTo(output, _repeated_unpackedUint32_codec);
-      unpackedUint64_.WriteTo(output, _repeated_unpackedUint64_codec);
-      unpackedSint32_.WriteTo(output, _repeated_unpackedSint32_codec);
-      unpackedSint64_.WriteTo(output, _repeated_unpackedSint64_codec);
-      unpackedFixed32_.WriteTo(output, _repeated_unpackedFixed32_codec);
-      unpackedFixed64_.WriteTo(output, _repeated_unpackedFixed64_codec);
-      unpackedSfixed32_.WriteTo(output, _repeated_unpackedSfixed32_codec);
-      unpackedSfixed64_.WriteTo(output, _repeated_unpackedSfixed64_codec);
-      unpackedFloat_.WriteTo(output, _repeated_unpackedFloat_codec);
-      unpackedDouble_.WriteTo(output, _repeated_unpackedDouble_codec);
-      unpackedBool_.WriteTo(output, _repeated_unpackedBool_codec);
-      unpackedNestedEnum_.WriteTo(output, _repeated_unpackedNestedEnum_codec);
-      if (HasOneofUint32) {
-        output.WriteRawTag(248, 6);
-        output.WriteUInt32(OneofUint32);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.OneofNestedMessage) {
-        output.WriteRawTag(130, 7);
-        output.WriteMessage(OneofNestedMessage);
-      }
-      if (HasOneofString) {
-        output.WriteRawTag(138, 7);
-        output.WriteString(OneofString);
-      }
-      if (HasOneofBytes) {
-        output.WriteRawTag(146, 7);
-        output.WriteBytes(OneofBytes);
-      }
-      if (HasOneofBool) {
-        output.WriteRawTag(152, 7);
-        output.WriteBool(OneofBool);
-      }
-      if (HasOneofUint64) {
-        output.WriteRawTag(160, 7);
-        output.WriteUInt64(OneofUint64);
-      }
-      if (HasOneofFloat) {
-        output.WriteRawTag(173, 7);
-        output.WriteFloat(OneofFloat);
-      }
-      if (HasOneofDouble) {
-        output.WriteRawTag(177, 7);
-        output.WriteDouble(OneofDouble);
-      }
-      if (HasOneofEnum) {
-        output.WriteRawTag(184, 7);
-        output.WriteEnum((int) OneofEnum);
-      }
-      if (HasData) {
-        output.WriteRawTag(203, 12);
-        output.WriteGroup(Data);
-        output.WriteRawTag(204, 12);
-      }
-      if (HasDefaultInt32) {
-        output.WriteRawTag(136, 15);
-        output.WriteInt32(DefaultInt32);
-      }
-      if (HasDefaultInt64) {
-        output.WriteRawTag(144, 15);
-        output.WriteInt64(DefaultInt64);
-      }
-      if (HasDefaultUint32) {
-        output.WriteRawTag(152, 15);
-        output.WriteUInt32(DefaultUint32);
-      }
-      if (HasDefaultUint64) {
-        output.WriteRawTag(160, 15);
-        output.WriteUInt64(DefaultUint64);
-      }
-      if (HasDefaultSint32) {
-        output.WriteRawTag(168, 15);
-        output.WriteSInt32(DefaultSint32);
-      }
-      if (HasDefaultSint64) {
-        output.WriteRawTag(176, 15);
-        output.WriteSInt64(DefaultSint64);
-      }
-      if (HasDefaultFixed32) {
-        output.WriteRawTag(189, 15);
-        output.WriteFixed32(DefaultFixed32);
-      }
-      if (HasDefaultFixed64) {
-        output.WriteRawTag(193, 15);
-        output.WriteFixed64(DefaultFixed64);
-      }
-      if (HasDefaultSfixed32) {
-        output.WriteRawTag(205, 15);
-        output.WriteSFixed32(DefaultSfixed32);
-      }
-      if (HasDefaultSfixed64) {
-        output.WriteRawTag(209, 15);
-        output.WriteSFixed64(DefaultSfixed64);
-      }
-      if (HasDefaultFloat) {
-        output.WriteRawTag(221, 15);
-        output.WriteFloat(DefaultFloat);
-      }
-      if (HasDefaultDouble) {
-        output.WriteRawTag(225, 15);
-        output.WriteDouble(DefaultDouble);
-      }
-      if (HasDefaultBool) {
-        output.WriteRawTag(232, 15);
-        output.WriteBool(DefaultBool);
-      }
-      if (HasDefaultString) {
-        output.WriteRawTag(242, 15);
-        output.WriteString(DefaultString);
-      }
-      if (HasDefaultBytes) {
-        output.WriteRawTag(250, 15);
-        output.WriteBytes(DefaultBytes);
-      }
-      if (HasFieldname1) {
-        output.WriteRawTag(136, 25);
-        output.WriteInt32(Fieldname1);
-      }
-      if (HasFieldName2) {
-        output.WriteRawTag(144, 25);
-        output.WriteInt32(FieldName2);
-      }
-      if (HasFieldName3) {
-        output.WriteRawTag(152, 25);
-        output.WriteInt32(FieldName3);
-      }
-      if (HasFieldName4) {
-        output.WriteRawTag(160, 25);
-        output.WriteInt32(FieldName4);
-      }
-      if (HasField0Name5) {
-        output.WriteRawTag(168, 25);
-        output.WriteInt32(Field0Name5);
-      }
-      if (HasField0Name6) {
-        output.WriteRawTag(176, 25);
-        output.WriteInt32(Field0Name6);
-      }
-      if (HasFieldName7) {
-        output.WriteRawTag(184, 25);
-        output.WriteInt32(FieldName7);
-      }
-      if (HasFieldName8) {
-        output.WriteRawTag(192, 25);
-        output.WriteInt32(FieldName8);
-      }
-      if (HasFieldName9) {
-        output.WriteRawTag(200, 25);
-        output.WriteInt32(FieldName9);
-      }
-      if (HasFieldName10) {
-        output.WriteRawTag(208, 25);
-        output.WriteInt32(FieldName10);
-      }
-      if (HasFIELDNAME11) {
-        output.WriteRawTag(216, 25);
-        output.WriteInt32(FIELDNAME11);
-      }
-      if (HasFIELDName12) {
-        output.WriteRawTag(224, 25);
-        output.WriteInt32(FIELDName12);
-      }
-      if (HasFieldName13) {
-        output.WriteRawTag(232, 25);
-        output.WriteInt32(FieldName13);
-      }
-      if (HasFieldName14) {
-        output.WriteRawTag(240, 25);
-        output.WriteInt32(FieldName14);
-      }
-      if (HasFieldName15) {
-        output.WriteRawTag(248, 25);
-        output.WriteInt32(FieldName15);
-      }
-      if (HasFieldName16) {
-        output.WriteRawTag(128, 26);
-        output.WriteInt32(FieldName16);
-      }
-      if (HasFieldName17) {
-        output.WriteRawTag(136, 26);
-        output.WriteInt32(FieldName17);
-      }
-      if (HasFieldName18) {
-        output.WriteRawTag(144, 26);
-        output.WriteInt32(FieldName18);
-      }
-      if (_extensions != null) {
-        _extensions.WriteTo(output);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (HasOptionalInt32) {
-        output.WriteRawTag(8);
-        output.WriteInt32(OptionalInt32);
-      }
-      if (HasOptionalInt64) {
-        output.WriteRawTag(16);
-        output.WriteInt64(OptionalInt64);
-      }
-      if (HasOptionalUint32) {
-        output.WriteRawTag(24);
-        output.WriteUInt32(OptionalUint32);
-      }
-      if (HasOptionalUint64) {
-        output.WriteRawTag(32);
-        output.WriteUInt64(OptionalUint64);
-      }
-      if (HasOptionalSint32) {
-        output.WriteRawTag(40);
-        output.WriteSInt32(OptionalSint32);
-      }
-      if (HasOptionalSint64) {
-        output.WriteRawTag(48);
-        output.WriteSInt64(OptionalSint64);
-      }
-      if (HasOptionalFixed32) {
-        output.WriteRawTag(61);
-        output.WriteFixed32(OptionalFixed32);
-      }
-      if (HasOptionalFixed64) {
-        output.WriteRawTag(65);
-        output.WriteFixed64(OptionalFixed64);
-      }
-      if (HasOptionalSfixed32) {
-        output.WriteRawTag(77);
-        output.WriteSFixed32(OptionalSfixed32);
-      }
-      if (HasOptionalSfixed64) {
-        output.WriteRawTag(81);
-        output.WriteSFixed64(OptionalSfixed64);
-      }
-      if (HasOptionalFloat) {
-        output.WriteRawTag(93);
-        output.WriteFloat(OptionalFloat);
-      }
-      if (HasOptionalDouble) {
-        output.WriteRawTag(97);
-        output.WriteDouble(OptionalDouble);
-      }
-      if (HasOptionalBool) {
-        output.WriteRawTag(104);
-        output.WriteBool(OptionalBool);
-      }
-      if (HasOptionalString) {
-        output.WriteRawTag(114);
-        output.WriteString(OptionalString);
-      }
-      if (HasOptionalBytes) {
-        output.WriteRawTag(122);
-        output.WriteBytes(OptionalBytes);
-      }
-      if (optionalNestedMessage_ != null) {
-        output.WriteRawTag(146, 1);
-        output.WriteMessage(OptionalNestedMessage);
-      }
-      if (optionalForeignMessage_ != null) {
-        output.WriteRawTag(154, 1);
-        output.WriteMessage(OptionalForeignMessage);
-      }
-      if (HasOptionalNestedEnum) {
-        output.WriteRawTag(168, 1);
-        output.WriteEnum((int) OptionalNestedEnum);
-      }
-      if (HasOptionalForeignEnum) {
-        output.WriteRawTag(176, 1);
-        output.WriteEnum((int) OptionalForeignEnum);
-      }
-      if (HasOptionalStringPiece) {
-        output.WriteRawTag(194, 1);
-        output.WriteString(OptionalStringPiece);
-      }
-      if (HasOptionalCord) {
-        output.WriteRawTag(202, 1);
-        output.WriteString(OptionalCord);
-      }
-      if (recursiveMessage_ != null) {
-        output.WriteRawTag(218, 1);
-        output.WriteMessage(RecursiveMessage);
-      }
-      repeatedInt32_.WriteTo(ref output, _repeated_repeatedInt32_codec);
-      repeatedInt64_.WriteTo(ref output, _repeated_repeatedInt64_codec);
-      repeatedUint32_.WriteTo(ref output, _repeated_repeatedUint32_codec);
-      repeatedUint64_.WriteTo(ref output, _repeated_repeatedUint64_codec);
-      repeatedSint32_.WriteTo(ref output, _repeated_repeatedSint32_codec);
-      repeatedSint64_.WriteTo(ref output, _repeated_repeatedSint64_codec);
-      repeatedFixed32_.WriteTo(ref output, _repeated_repeatedFixed32_codec);
-      repeatedFixed64_.WriteTo(ref output, _repeated_repeatedFixed64_codec);
-      repeatedSfixed32_.WriteTo(ref output, _repeated_repeatedSfixed32_codec);
-      repeatedSfixed64_.WriteTo(ref output, _repeated_repeatedSfixed64_codec);
-      repeatedFloat_.WriteTo(ref output, _repeated_repeatedFloat_codec);
-      repeatedDouble_.WriteTo(ref output, _repeated_repeatedDouble_codec);
-      repeatedBool_.WriteTo(ref output, _repeated_repeatedBool_codec);
-      repeatedString_.WriteTo(ref output, _repeated_repeatedString_codec);
-      repeatedBytes_.WriteTo(ref output, _repeated_repeatedBytes_codec);
-      repeatedNestedMessage_.WriteTo(ref output, _repeated_repeatedNestedMessage_codec);
-      repeatedForeignMessage_.WriteTo(ref output, _repeated_repeatedForeignMessage_codec);
-      repeatedNestedEnum_.WriteTo(ref output, _repeated_repeatedNestedEnum_codec);
-      repeatedForeignEnum_.WriteTo(ref output, _repeated_repeatedForeignEnum_codec);
-      repeatedStringPiece_.WriteTo(ref output, _repeated_repeatedStringPiece_codec);
-      repeatedCord_.WriteTo(ref output, _repeated_repeatedCord_codec);
-      mapInt32Int32_.WriteTo(ref output, _map_mapInt32Int32_codec);
-      mapInt64Int64_.WriteTo(ref output, _map_mapInt64Int64_codec);
-      mapUint32Uint32_.WriteTo(ref output, _map_mapUint32Uint32_codec);
-      mapUint64Uint64_.WriteTo(ref output, _map_mapUint64Uint64_codec);
-      mapSint32Sint32_.WriteTo(ref output, _map_mapSint32Sint32_codec);
-      mapSint64Sint64_.WriteTo(ref output, _map_mapSint64Sint64_codec);
-      mapFixed32Fixed32_.WriteTo(ref output, _map_mapFixed32Fixed32_codec);
-      mapFixed64Fixed64_.WriteTo(ref output, _map_mapFixed64Fixed64_codec);
-      mapSfixed32Sfixed32_.WriteTo(ref output, _map_mapSfixed32Sfixed32_codec);
-      mapSfixed64Sfixed64_.WriteTo(ref output, _map_mapSfixed64Sfixed64_codec);
-      mapInt32Float_.WriteTo(ref output, _map_mapInt32Float_codec);
-      mapInt32Double_.WriteTo(ref output, _map_mapInt32Double_codec);
-      mapBoolBool_.WriteTo(ref output, _map_mapBoolBool_codec);
-      mapStringString_.WriteTo(ref output, _map_mapStringString_codec);
-      mapStringBytes_.WriteTo(ref output, _map_mapStringBytes_codec);
-      mapStringNestedMessage_.WriteTo(ref output, _map_mapStringNestedMessage_codec);
-      mapStringForeignMessage_.WriteTo(ref output, _map_mapStringForeignMessage_codec);
-      mapStringNestedEnum_.WriteTo(ref output, _map_mapStringNestedEnum_codec);
-      mapStringForeignEnum_.WriteTo(ref output, _map_mapStringForeignEnum_codec);
-      packedInt32_.WriteTo(ref output, _repeated_packedInt32_codec);
-      packedInt64_.WriteTo(ref output, _repeated_packedInt64_codec);
-      packedUint32_.WriteTo(ref output, _repeated_packedUint32_codec);
-      packedUint64_.WriteTo(ref output, _repeated_packedUint64_codec);
-      packedSint32_.WriteTo(ref output, _repeated_packedSint32_codec);
-      packedSint64_.WriteTo(ref output, _repeated_packedSint64_codec);
-      packedFixed32_.WriteTo(ref output, _repeated_packedFixed32_codec);
-      packedFixed64_.WriteTo(ref output, _repeated_packedFixed64_codec);
-      packedSfixed32_.WriteTo(ref output, _repeated_packedSfixed32_codec);
-      packedSfixed64_.WriteTo(ref output, _repeated_packedSfixed64_codec);
-      packedFloat_.WriteTo(ref output, _repeated_packedFloat_codec);
-      packedDouble_.WriteTo(ref output, _repeated_packedDouble_codec);
-      packedBool_.WriteTo(ref output, _repeated_packedBool_codec);
-      packedNestedEnum_.WriteTo(ref output, _repeated_packedNestedEnum_codec);
-      unpackedInt32_.WriteTo(ref output, _repeated_unpackedInt32_codec);
-      unpackedInt64_.WriteTo(ref output, _repeated_unpackedInt64_codec);
-      unpackedUint32_.WriteTo(ref output, _repeated_unpackedUint32_codec);
-      unpackedUint64_.WriteTo(ref output, _repeated_unpackedUint64_codec);
-      unpackedSint32_.WriteTo(ref output, _repeated_unpackedSint32_codec);
-      unpackedSint64_.WriteTo(ref output, _repeated_unpackedSint64_codec);
-      unpackedFixed32_.WriteTo(ref output, _repeated_unpackedFixed32_codec);
-      unpackedFixed64_.WriteTo(ref output, _repeated_unpackedFixed64_codec);
-      unpackedSfixed32_.WriteTo(ref output, _repeated_unpackedSfixed32_codec);
-      unpackedSfixed64_.WriteTo(ref output, _repeated_unpackedSfixed64_codec);
-      unpackedFloat_.WriteTo(ref output, _repeated_unpackedFloat_codec);
-      unpackedDouble_.WriteTo(ref output, _repeated_unpackedDouble_codec);
-      unpackedBool_.WriteTo(ref output, _repeated_unpackedBool_codec);
-      unpackedNestedEnum_.WriteTo(ref output, _repeated_unpackedNestedEnum_codec);
-      if (HasOneofUint32) {
-        output.WriteRawTag(248, 6);
-        output.WriteUInt32(OneofUint32);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.OneofNestedMessage) {
-        output.WriteRawTag(130, 7);
-        output.WriteMessage(OneofNestedMessage);
-      }
-      if (HasOneofString) {
-        output.WriteRawTag(138, 7);
-        output.WriteString(OneofString);
-      }
-      if (HasOneofBytes) {
-        output.WriteRawTag(146, 7);
-        output.WriteBytes(OneofBytes);
-      }
-      if (HasOneofBool) {
-        output.WriteRawTag(152, 7);
-        output.WriteBool(OneofBool);
-      }
-      if (HasOneofUint64) {
-        output.WriteRawTag(160, 7);
-        output.WriteUInt64(OneofUint64);
-      }
-      if (HasOneofFloat) {
-        output.WriteRawTag(173, 7);
-        output.WriteFloat(OneofFloat);
-      }
-      if (HasOneofDouble) {
-        output.WriteRawTag(177, 7);
-        output.WriteDouble(OneofDouble);
-      }
-      if (HasOneofEnum) {
-        output.WriteRawTag(184, 7);
-        output.WriteEnum((int) OneofEnum);
-      }
-      if (HasData) {
-        output.WriteRawTag(203, 12);
-        output.WriteGroup(Data);
-        output.WriteRawTag(204, 12);
-      }
-      if (HasDefaultInt32) {
-        output.WriteRawTag(136, 15);
-        output.WriteInt32(DefaultInt32);
-      }
-      if (HasDefaultInt64) {
-        output.WriteRawTag(144, 15);
-        output.WriteInt64(DefaultInt64);
-      }
-      if (HasDefaultUint32) {
-        output.WriteRawTag(152, 15);
-        output.WriteUInt32(DefaultUint32);
-      }
-      if (HasDefaultUint64) {
-        output.WriteRawTag(160, 15);
-        output.WriteUInt64(DefaultUint64);
-      }
-      if (HasDefaultSint32) {
-        output.WriteRawTag(168, 15);
-        output.WriteSInt32(DefaultSint32);
-      }
-      if (HasDefaultSint64) {
-        output.WriteRawTag(176, 15);
-        output.WriteSInt64(DefaultSint64);
-      }
-      if (HasDefaultFixed32) {
-        output.WriteRawTag(189, 15);
-        output.WriteFixed32(DefaultFixed32);
-      }
-      if (HasDefaultFixed64) {
-        output.WriteRawTag(193, 15);
-        output.WriteFixed64(DefaultFixed64);
-      }
-      if (HasDefaultSfixed32) {
-        output.WriteRawTag(205, 15);
-        output.WriteSFixed32(DefaultSfixed32);
-      }
-      if (HasDefaultSfixed64) {
-        output.WriteRawTag(209, 15);
-        output.WriteSFixed64(DefaultSfixed64);
-      }
-      if (HasDefaultFloat) {
-        output.WriteRawTag(221, 15);
-        output.WriteFloat(DefaultFloat);
-      }
-      if (HasDefaultDouble) {
-        output.WriteRawTag(225, 15);
-        output.WriteDouble(DefaultDouble);
-      }
-      if (HasDefaultBool) {
-        output.WriteRawTag(232, 15);
-        output.WriteBool(DefaultBool);
-      }
-      if (HasDefaultString) {
-        output.WriteRawTag(242, 15);
-        output.WriteString(DefaultString);
-      }
-      if (HasDefaultBytes) {
-        output.WriteRawTag(250, 15);
-        output.WriteBytes(DefaultBytes);
-      }
-      if (HasFieldname1) {
-        output.WriteRawTag(136, 25);
-        output.WriteInt32(Fieldname1);
-      }
-      if (HasFieldName2) {
-        output.WriteRawTag(144, 25);
-        output.WriteInt32(FieldName2);
-      }
-      if (HasFieldName3) {
-        output.WriteRawTag(152, 25);
-        output.WriteInt32(FieldName3);
-      }
-      if (HasFieldName4) {
-        output.WriteRawTag(160, 25);
-        output.WriteInt32(FieldName4);
-      }
-      if (HasField0Name5) {
-        output.WriteRawTag(168, 25);
-        output.WriteInt32(Field0Name5);
-      }
-      if (HasField0Name6) {
-        output.WriteRawTag(176, 25);
-        output.WriteInt32(Field0Name6);
-      }
-      if (HasFieldName7) {
-        output.WriteRawTag(184, 25);
-        output.WriteInt32(FieldName7);
-      }
-      if (HasFieldName8) {
-        output.WriteRawTag(192, 25);
-        output.WriteInt32(FieldName8);
-      }
-      if (HasFieldName9) {
-        output.WriteRawTag(200, 25);
-        output.WriteInt32(FieldName9);
-      }
-      if (HasFieldName10) {
-        output.WriteRawTag(208, 25);
-        output.WriteInt32(FieldName10);
-      }
-      if (HasFIELDNAME11) {
-        output.WriteRawTag(216, 25);
-        output.WriteInt32(FIELDNAME11);
-      }
-      if (HasFIELDName12) {
-        output.WriteRawTag(224, 25);
-        output.WriteInt32(FIELDName12);
-      }
-      if (HasFieldName13) {
-        output.WriteRawTag(232, 25);
-        output.WriteInt32(FieldName13);
-      }
-      if (HasFieldName14) {
-        output.WriteRawTag(240, 25);
-        output.WriteInt32(FieldName14);
-      }
-      if (HasFieldName15) {
-        output.WriteRawTag(248, 25);
-        output.WriteInt32(FieldName15);
-      }
-      if (HasFieldName16) {
-        output.WriteRawTag(128, 26);
-        output.WriteInt32(FieldName16);
-      }
-      if (HasFieldName17) {
-        output.WriteRawTag(136, 26);
-        output.WriteInt32(FieldName17);
-      }
-      if (HasFieldName18) {
-        output.WriteRawTag(144, 26);
-        output.WriteInt32(FieldName18);
-      }
-      if (_extensions != null) {
-        _extensions.WriteTo(ref output);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (HasOptionalInt32) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(OptionalInt32);
-      }
-      if (HasOptionalInt64) {
-        size += 1 + pb::CodedOutputStream.ComputeInt64Size(OptionalInt64);
-      }
-      if (HasOptionalUint32) {
-        size += 1 + pb::CodedOutputStream.ComputeUInt32Size(OptionalUint32);
-      }
-      if (HasOptionalUint64) {
-        size += 1 + pb::CodedOutputStream.ComputeUInt64Size(OptionalUint64);
-      }
-      if (HasOptionalSint32) {
-        size += 1 + pb::CodedOutputStream.ComputeSInt32Size(OptionalSint32);
-      }
-      if (HasOptionalSint64) {
-        size += 1 + pb::CodedOutputStream.ComputeSInt64Size(OptionalSint64);
-      }
-      if (HasOptionalFixed32) {
-        size += 1 + 4;
-      }
-      if (HasOptionalFixed64) {
-        size += 1 + 8;
-      }
-      if (HasOptionalSfixed32) {
-        size += 1 + 4;
-      }
-      if (HasOptionalSfixed64) {
-        size += 1 + 8;
-      }
-      if (HasOptionalFloat) {
-        size += 1 + 4;
-      }
-      if (HasOptionalDouble) {
-        size += 1 + 8;
-      }
-      if (HasOptionalBool) {
-        size += 1 + 1;
-      }
-      if (HasOptionalString) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(OptionalString);
-      }
-      if (HasOptionalBytes) {
-        size += 1 + pb::CodedOutputStream.ComputeBytesSize(OptionalBytes);
-      }
-      if (optionalNestedMessage_ != null) {
-        size += 2 + pb::CodedOutputStream.ComputeMessageSize(OptionalNestedMessage);
-      }
-      if (optionalForeignMessage_ != null) {
-        size += 2 + pb::CodedOutputStream.ComputeMessageSize(OptionalForeignMessage);
-      }
-      if (HasOptionalNestedEnum) {
-        size += 2 + pb::CodedOutputStream.ComputeEnumSize((int) OptionalNestedEnum);
-      }
-      if (HasOptionalForeignEnum) {
-        size += 2 + pb::CodedOutputStream.ComputeEnumSize((int) OptionalForeignEnum);
-      }
-      if (HasOptionalStringPiece) {
-        size += 2 + pb::CodedOutputStream.ComputeStringSize(OptionalStringPiece);
-      }
-      if (HasOptionalCord) {
-        size += 2 + pb::CodedOutputStream.ComputeStringSize(OptionalCord);
-      }
-      if (recursiveMessage_ != null) {
-        size += 2 + pb::CodedOutputStream.ComputeMessageSize(RecursiveMessage);
-      }
-      size += repeatedInt32_.CalculateSize(_repeated_repeatedInt32_codec);
-      size += repeatedInt64_.CalculateSize(_repeated_repeatedInt64_codec);
-      size += repeatedUint32_.CalculateSize(_repeated_repeatedUint32_codec);
-      size += repeatedUint64_.CalculateSize(_repeated_repeatedUint64_codec);
-      size += repeatedSint32_.CalculateSize(_repeated_repeatedSint32_codec);
-      size += repeatedSint64_.CalculateSize(_repeated_repeatedSint64_codec);
-      size += repeatedFixed32_.CalculateSize(_repeated_repeatedFixed32_codec);
-      size += repeatedFixed64_.CalculateSize(_repeated_repeatedFixed64_codec);
-      size += repeatedSfixed32_.CalculateSize(_repeated_repeatedSfixed32_codec);
-      size += repeatedSfixed64_.CalculateSize(_repeated_repeatedSfixed64_codec);
-      size += repeatedFloat_.CalculateSize(_repeated_repeatedFloat_codec);
-      size += repeatedDouble_.CalculateSize(_repeated_repeatedDouble_codec);
-      size += repeatedBool_.CalculateSize(_repeated_repeatedBool_codec);
-      size += repeatedString_.CalculateSize(_repeated_repeatedString_codec);
-      size += repeatedBytes_.CalculateSize(_repeated_repeatedBytes_codec);
-      size += repeatedNestedMessage_.CalculateSize(_repeated_repeatedNestedMessage_codec);
-      size += repeatedForeignMessage_.CalculateSize(_repeated_repeatedForeignMessage_codec);
-      size += repeatedNestedEnum_.CalculateSize(_repeated_repeatedNestedEnum_codec);
-      size += repeatedForeignEnum_.CalculateSize(_repeated_repeatedForeignEnum_codec);
-      size += repeatedStringPiece_.CalculateSize(_repeated_repeatedStringPiece_codec);
-      size += repeatedCord_.CalculateSize(_repeated_repeatedCord_codec);
-      size += packedInt32_.CalculateSize(_repeated_packedInt32_codec);
-      size += packedInt64_.CalculateSize(_repeated_packedInt64_codec);
-      size += packedUint32_.CalculateSize(_repeated_packedUint32_codec);
-      size += packedUint64_.CalculateSize(_repeated_packedUint64_codec);
-      size += packedSint32_.CalculateSize(_repeated_packedSint32_codec);
-      size += packedSint64_.CalculateSize(_repeated_packedSint64_codec);
-      size += packedFixed32_.CalculateSize(_repeated_packedFixed32_codec);
-      size += packedFixed64_.CalculateSize(_repeated_packedFixed64_codec);
-      size += packedSfixed32_.CalculateSize(_repeated_packedSfixed32_codec);
-      size += packedSfixed64_.CalculateSize(_repeated_packedSfixed64_codec);
-      size += packedFloat_.CalculateSize(_repeated_packedFloat_codec);
-      size += packedDouble_.CalculateSize(_repeated_packedDouble_codec);
-      size += packedBool_.CalculateSize(_repeated_packedBool_codec);
-      size += packedNestedEnum_.CalculateSize(_repeated_packedNestedEnum_codec);
-      size += unpackedInt32_.CalculateSize(_repeated_unpackedInt32_codec);
-      size += unpackedInt64_.CalculateSize(_repeated_unpackedInt64_codec);
-      size += unpackedUint32_.CalculateSize(_repeated_unpackedUint32_codec);
-      size += unpackedUint64_.CalculateSize(_repeated_unpackedUint64_codec);
-      size += unpackedSint32_.CalculateSize(_repeated_unpackedSint32_codec);
-      size += unpackedSint64_.CalculateSize(_repeated_unpackedSint64_codec);
-      size += unpackedFixed32_.CalculateSize(_repeated_unpackedFixed32_codec);
-      size += unpackedFixed64_.CalculateSize(_repeated_unpackedFixed64_codec);
-      size += unpackedSfixed32_.CalculateSize(_repeated_unpackedSfixed32_codec);
-      size += unpackedSfixed64_.CalculateSize(_repeated_unpackedSfixed64_codec);
-      size += unpackedFloat_.CalculateSize(_repeated_unpackedFloat_codec);
-      size += unpackedDouble_.CalculateSize(_repeated_unpackedDouble_codec);
-      size += unpackedBool_.CalculateSize(_repeated_unpackedBool_codec);
-      size += unpackedNestedEnum_.CalculateSize(_repeated_unpackedNestedEnum_codec);
-      size += mapInt32Int32_.CalculateSize(_map_mapInt32Int32_codec);
-      size += mapInt64Int64_.CalculateSize(_map_mapInt64Int64_codec);
-      size += mapUint32Uint32_.CalculateSize(_map_mapUint32Uint32_codec);
-      size += mapUint64Uint64_.CalculateSize(_map_mapUint64Uint64_codec);
-      size += mapSint32Sint32_.CalculateSize(_map_mapSint32Sint32_codec);
-      size += mapSint64Sint64_.CalculateSize(_map_mapSint64Sint64_codec);
-      size += mapFixed32Fixed32_.CalculateSize(_map_mapFixed32Fixed32_codec);
-      size += mapFixed64Fixed64_.CalculateSize(_map_mapFixed64Fixed64_codec);
-      size += mapSfixed32Sfixed32_.CalculateSize(_map_mapSfixed32Sfixed32_codec);
-      size += mapSfixed64Sfixed64_.CalculateSize(_map_mapSfixed64Sfixed64_codec);
-      size += mapInt32Float_.CalculateSize(_map_mapInt32Float_codec);
-      size += mapInt32Double_.CalculateSize(_map_mapInt32Double_codec);
-      size += mapBoolBool_.CalculateSize(_map_mapBoolBool_codec);
-      size += mapStringString_.CalculateSize(_map_mapStringString_codec);
-      size += mapStringBytes_.CalculateSize(_map_mapStringBytes_codec);
-      size += mapStringNestedMessage_.CalculateSize(_map_mapStringNestedMessage_codec);
-      size += mapStringForeignMessage_.CalculateSize(_map_mapStringForeignMessage_codec);
-      size += mapStringNestedEnum_.CalculateSize(_map_mapStringNestedEnum_codec);
-      size += mapStringForeignEnum_.CalculateSize(_map_mapStringForeignEnum_codec);
-      if (HasOneofUint32) {
-        size += 2 + pb::CodedOutputStream.ComputeUInt32Size(OneofUint32);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.OneofNestedMessage) {
-        size += 2 + pb::CodedOutputStream.ComputeMessageSize(OneofNestedMessage);
-      }
-      if (HasOneofString) {
-        size += 2 + pb::CodedOutputStream.ComputeStringSize(OneofString);
-      }
-      if (HasOneofBytes) {
-        size += 2 + pb::CodedOutputStream.ComputeBytesSize(OneofBytes);
-      }
-      if (HasOneofBool) {
-        size += 2 + 1;
-      }
-      if (HasOneofUint64) {
-        size += 2 + pb::CodedOutputStream.ComputeUInt64Size(OneofUint64);
-      }
-      if (HasOneofFloat) {
-        size += 2 + 4;
-      }
-      if (HasOneofDouble) {
-        size += 2 + 8;
-      }
-      if (HasOneofEnum) {
-        size += 2 + pb::CodedOutputStream.ComputeEnumSize((int) OneofEnum);
-      }
-      if (HasData) {
-        size += 4 + pb::CodedOutputStream.ComputeGroupSize(Data);
-      }
-      if (HasDefaultInt32) {
-        size += 2 + pb::CodedOutputStream.ComputeInt32Size(DefaultInt32);
-      }
-      if (HasDefaultInt64) {
-        size += 2 + pb::CodedOutputStream.ComputeInt64Size(DefaultInt64);
-      }
-      if (HasDefaultUint32) {
-        size += 2 + pb::CodedOutputStream.ComputeUInt32Size(DefaultUint32);
-      }
-      if (HasDefaultUint64) {
-        size += 2 + pb::CodedOutputStream.ComputeUInt64Size(DefaultUint64);
-      }
-      if (HasDefaultSint32) {
-        size += 2 + pb::CodedOutputStream.ComputeSInt32Size(DefaultSint32);
-      }
-      if (HasDefaultSint64) {
-        size += 2 + pb::CodedOutputStream.ComputeSInt64Size(DefaultSint64);
-      }
-      if (HasDefaultFixed32) {
-        size += 2 + 4;
-      }
-      if (HasDefaultFixed64) {
-        size += 2 + 8;
-      }
-      if (HasDefaultSfixed32) {
-        size += 2 + 4;
-      }
-      if (HasDefaultSfixed64) {
-        size += 2 + 8;
-      }
-      if (HasDefaultFloat) {
-        size += 2 + 4;
-      }
-      if (HasDefaultDouble) {
-        size += 2 + 8;
-      }
-      if (HasDefaultBool) {
-        size += 2 + 1;
-      }
-      if (HasDefaultString) {
-        size += 2 + pb::CodedOutputStream.ComputeStringSize(DefaultString);
-      }
-      if (HasDefaultBytes) {
-        size += 2 + pb::CodedOutputStream.ComputeBytesSize(DefaultBytes);
-      }
-      if (HasFieldname1) {
-        size += 2 + pb::CodedOutputStream.ComputeInt32Size(Fieldname1);
-      }
-      if (HasFieldName2) {
-        size += 2 + pb::CodedOutputStream.ComputeInt32Size(FieldName2);
-      }
-      if (HasFieldName3) {
-        size += 2 + pb::CodedOutputStream.ComputeInt32Size(FieldName3);
-      }
-      if (HasFieldName4) {
-        size += 2 + pb::CodedOutputStream.ComputeInt32Size(FieldName4);
-      }
-      if (HasField0Name5) {
-        size += 2 + pb::CodedOutputStream.ComputeInt32Size(Field0Name5);
-      }
-      if (HasField0Name6) {
-        size += 2 + pb::CodedOutputStream.ComputeInt32Size(Field0Name6);
-      }
-      if (HasFieldName7) {
-        size += 2 + pb::CodedOutputStream.ComputeInt32Size(FieldName7);
-      }
-      if (HasFieldName8) {
-        size += 2 + pb::CodedOutputStream.ComputeInt32Size(FieldName8);
-      }
-      if (HasFieldName9) {
-        size += 2 + pb::CodedOutputStream.ComputeInt32Size(FieldName9);
-      }
-      if (HasFieldName10) {
-        size += 2 + pb::CodedOutputStream.ComputeInt32Size(FieldName10);
-      }
-      if (HasFIELDNAME11) {
-        size += 2 + pb::CodedOutputStream.ComputeInt32Size(FIELDNAME11);
-      }
-      if (HasFIELDName12) {
-        size += 2 + pb::CodedOutputStream.ComputeInt32Size(FIELDName12);
-      }
-      if (HasFieldName13) {
-        size += 2 + pb::CodedOutputStream.ComputeInt32Size(FieldName13);
-      }
-      if (HasFieldName14) {
-        size += 2 + pb::CodedOutputStream.ComputeInt32Size(FieldName14);
-      }
-      if (HasFieldName15) {
-        size += 2 + pb::CodedOutputStream.ComputeInt32Size(FieldName15);
-      }
-      if (HasFieldName16) {
-        size += 2 + pb::CodedOutputStream.ComputeInt32Size(FieldName16);
-      }
-      if (HasFieldName17) {
-        size += 2 + pb::CodedOutputStream.ComputeInt32Size(FieldName17);
-      }
-      if (HasFieldName18) {
-        size += 2 + pb::CodedOutputStream.ComputeInt32Size(FieldName18);
-      }
-      if (_extensions != null) {
-        size += _extensions.CalculateSize();
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(TestAllTypesProto2 other) {
-      if (other == null) {
-        return;
-      }
-      if (other.HasOptionalInt32) {
-        OptionalInt32 = other.OptionalInt32;
-      }
-      if (other.HasOptionalInt64) {
-        OptionalInt64 = other.OptionalInt64;
-      }
-      if (other.HasOptionalUint32) {
-        OptionalUint32 = other.OptionalUint32;
-      }
-      if (other.HasOptionalUint64) {
-        OptionalUint64 = other.OptionalUint64;
-      }
-      if (other.HasOptionalSint32) {
-        OptionalSint32 = other.OptionalSint32;
-      }
-      if (other.HasOptionalSint64) {
-        OptionalSint64 = other.OptionalSint64;
-      }
-      if (other.HasOptionalFixed32) {
-        OptionalFixed32 = other.OptionalFixed32;
-      }
-      if (other.HasOptionalFixed64) {
-        OptionalFixed64 = other.OptionalFixed64;
-      }
-      if (other.HasOptionalSfixed32) {
-        OptionalSfixed32 = other.OptionalSfixed32;
-      }
-      if (other.HasOptionalSfixed64) {
-        OptionalSfixed64 = other.OptionalSfixed64;
-      }
-      if (other.HasOptionalFloat) {
-        OptionalFloat = other.OptionalFloat;
-      }
-      if (other.HasOptionalDouble) {
-        OptionalDouble = other.OptionalDouble;
-      }
-      if (other.HasOptionalBool) {
-        OptionalBool = other.OptionalBool;
-      }
-      if (other.HasOptionalString) {
-        OptionalString = other.OptionalString;
-      }
-      if (other.HasOptionalBytes) {
-        OptionalBytes = other.OptionalBytes;
-      }
-      if (other.optionalNestedMessage_ != null) {
-        if (optionalNestedMessage_ == null) {
-          OptionalNestedMessage = new global::ProtobufTestMessages.Proto2.TestAllTypesProto2.Types.NestedMessage();
-        }
-        OptionalNestedMessage.MergeFrom(other.OptionalNestedMessage);
-      }
-      if (other.optionalForeignMessage_ != null) {
-        if (optionalForeignMessage_ == null) {
-          OptionalForeignMessage = new global::ProtobufTestMessages.Proto2.ForeignMessageProto2();
-        }
-        OptionalForeignMessage.MergeFrom(other.OptionalForeignMessage);
-      }
-      if (other.HasOptionalNestedEnum) {
-        OptionalNestedEnum = other.OptionalNestedEnum;
-      }
-      if (other.HasOptionalForeignEnum) {
-        OptionalForeignEnum = other.OptionalForeignEnum;
-      }
-      if (other.HasOptionalStringPiece) {
-        OptionalStringPiece = other.OptionalStringPiece;
-      }
-      if (other.HasOptionalCord) {
-        OptionalCord = other.OptionalCord;
-      }
-      if (other.recursiveMessage_ != null) {
-        if (recursiveMessage_ == null) {
-          RecursiveMessage = new global::ProtobufTestMessages.Proto2.TestAllTypesProto2();
-        }
-        RecursiveMessage.MergeFrom(other.RecursiveMessage);
-      }
-      repeatedInt32_.Add(other.repeatedInt32_);
-      repeatedInt64_.Add(other.repeatedInt64_);
-      repeatedUint32_.Add(other.repeatedUint32_);
-      repeatedUint64_.Add(other.repeatedUint64_);
-      repeatedSint32_.Add(other.repeatedSint32_);
-      repeatedSint64_.Add(other.repeatedSint64_);
-      repeatedFixed32_.Add(other.repeatedFixed32_);
-      repeatedFixed64_.Add(other.repeatedFixed64_);
-      repeatedSfixed32_.Add(other.repeatedSfixed32_);
-      repeatedSfixed64_.Add(other.repeatedSfixed64_);
-      repeatedFloat_.Add(other.repeatedFloat_);
-      repeatedDouble_.Add(other.repeatedDouble_);
-      repeatedBool_.Add(other.repeatedBool_);
-      repeatedString_.Add(other.repeatedString_);
-      repeatedBytes_.Add(other.repeatedBytes_);
-      repeatedNestedMessage_.Add(other.repeatedNestedMessage_);
-      repeatedForeignMessage_.Add(other.repeatedForeignMessage_);
-      repeatedNestedEnum_.Add(other.repeatedNestedEnum_);
-      repeatedForeignEnum_.Add(other.repeatedForeignEnum_);
-      repeatedStringPiece_.Add(other.repeatedStringPiece_);
-      repeatedCord_.Add(other.repeatedCord_);
-      packedInt32_.Add(other.packedInt32_);
-      packedInt64_.Add(other.packedInt64_);
-      packedUint32_.Add(other.packedUint32_);
-      packedUint64_.Add(other.packedUint64_);
-      packedSint32_.Add(other.packedSint32_);
-      packedSint64_.Add(other.packedSint64_);
-      packedFixed32_.Add(other.packedFixed32_);
-      packedFixed64_.Add(other.packedFixed64_);
-      packedSfixed32_.Add(other.packedSfixed32_);
-      packedSfixed64_.Add(other.packedSfixed64_);
-      packedFloat_.Add(other.packedFloat_);
-      packedDouble_.Add(other.packedDouble_);
-      packedBool_.Add(other.packedBool_);
-      packedNestedEnum_.Add(other.packedNestedEnum_);
-      unpackedInt32_.Add(other.unpackedInt32_);
-      unpackedInt64_.Add(other.unpackedInt64_);
-      unpackedUint32_.Add(other.unpackedUint32_);
-      unpackedUint64_.Add(other.unpackedUint64_);
-      unpackedSint32_.Add(other.unpackedSint32_);
-      unpackedSint64_.Add(other.unpackedSint64_);
-      unpackedFixed32_.Add(other.unpackedFixed32_);
-      unpackedFixed64_.Add(other.unpackedFixed64_);
-      unpackedSfixed32_.Add(other.unpackedSfixed32_);
-      unpackedSfixed64_.Add(other.unpackedSfixed64_);
-      unpackedFloat_.Add(other.unpackedFloat_);
-      unpackedDouble_.Add(other.unpackedDouble_);
-      unpackedBool_.Add(other.unpackedBool_);
-      unpackedNestedEnum_.Add(other.unpackedNestedEnum_);
-      mapInt32Int32_.Add(other.mapInt32Int32_);
-      mapInt64Int64_.Add(other.mapInt64Int64_);
-      mapUint32Uint32_.Add(other.mapUint32Uint32_);
-      mapUint64Uint64_.Add(other.mapUint64Uint64_);
-      mapSint32Sint32_.Add(other.mapSint32Sint32_);
-      mapSint64Sint64_.Add(other.mapSint64Sint64_);
-      mapFixed32Fixed32_.Add(other.mapFixed32Fixed32_);
-      mapFixed64Fixed64_.Add(other.mapFixed64Fixed64_);
-      mapSfixed32Sfixed32_.Add(other.mapSfixed32Sfixed32_);
-      mapSfixed64Sfixed64_.Add(other.mapSfixed64Sfixed64_);
-      mapInt32Float_.Add(other.mapInt32Float_);
-      mapInt32Double_.Add(other.mapInt32Double_);
-      mapBoolBool_.Add(other.mapBoolBool_);
-      mapStringString_.Add(other.mapStringString_);
-      mapStringBytes_.Add(other.mapStringBytes_);
-      mapStringNestedMessage_.Add(other.mapStringNestedMessage_);
-      mapStringForeignMessage_.Add(other.mapStringForeignMessage_);
-      mapStringNestedEnum_.Add(other.mapStringNestedEnum_);
-      mapStringForeignEnum_.Add(other.mapStringForeignEnum_);
-      if (other.HasData) {
-        if (!HasData) {
-          Data = new global::ProtobufTestMessages.Proto2.TestAllTypesProto2.Types.Data();
-        }
-        Data.MergeFrom(other.Data);
-      }
-      if (other.HasDefaultInt32) {
-        DefaultInt32 = other.DefaultInt32;
-      }
-      if (other.HasDefaultInt64) {
-        DefaultInt64 = other.DefaultInt64;
-      }
-      if (other.HasDefaultUint32) {
-        DefaultUint32 = other.DefaultUint32;
-      }
-      if (other.HasDefaultUint64) {
-        DefaultUint64 = other.DefaultUint64;
-      }
-      if (other.HasDefaultSint32) {
-        DefaultSint32 = other.DefaultSint32;
-      }
-      if (other.HasDefaultSint64) {
-        DefaultSint64 = other.DefaultSint64;
-      }
-      if (other.HasDefaultFixed32) {
-        DefaultFixed32 = other.DefaultFixed32;
-      }
-      if (other.HasDefaultFixed64) {
-        DefaultFixed64 = other.DefaultFixed64;
-      }
-      if (other.HasDefaultSfixed32) {
-        DefaultSfixed32 = other.DefaultSfixed32;
-      }
-      if (other.HasDefaultSfixed64) {
-        DefaultSfixed64 = other.DefaultSfixed64;
-      }
-      if (other.HasDefaultFloat) {
-        DefaultFloat = other.DefaultFloat;
-      }
-      if (other.HasDefaultDouble) {
-        DefaultDouble = other.DefaultDouble;
-      }
-      if (other.HasDefaultBool) {
-        DefaultBool = other.DefaultBool;
-      }
-      if (other.HasDefaultString) {
-        DefaultString = other.DefaultString;
-      }
-      if (other.HasDefaultBytes) {
-        DefaultBytes = other.DefaultBytes;
-      }
-      if (other.HasFieldname1) {
-        Fieldname1 = other.Fieldname1;
-      }
-      if (other.HasFieldName2) {
-        FieldName2 = other.FieldName2;
-      }
-      if (other.HasFieldName3) {
-        FieldName3 = other.FieldName3;
-      }
-      if (other.HasFieldName4) {
-        FieldName4 = other.FieldName4;
-      }
-      if (other.HasField0Name5) {
-        Field0Name5 = other.Field0Name5;
-      }
-      if (other.HasField0Name6) {
-        Field0Name6 = other.Field0Name6;
-      }
-      if (other.HasFieldName7) {
-        FieldName7 = other.FieldName7;
-      }
-      if (other.HasFieldName8) {
-        FieldName8 = other.FieldName8;
-      }
-      if (other.HasFieldName9) {
-        FieldName9 = other.FieldName9;
-      }
-      if (other.HasFieldName10) {
-        FieldName10 = other.FieldName10;
-      }
-      if (other.HasFIELDNAME11) {
-        FIELDNAME11 = other.FIELDNAME11;
-      }
-      if (other.HasFIELDName12) {
-        FIELDName12 = other.FIELDName12;
-      }
-      if (other.HasFieldName13) {
-        FieldName13 = other.FieldName13;
-      }
-      if (other.HasFieldName14) {
-        FieldName14 = other.FieldName14;
-      }
-      if (other.HasFieldName15) {
-        FieldName15 = other.FieldName15;
-      }
-      if (other.HasFieldName16) {
-        FieldName16 = other.FieldName16;
-      }
-      if (other.HasFieldName17) {
-        FieldName17 = other.FieldName17;
-      }
-      if (other.HasFieldName18) {
-        FieldName18 = other.FieldName18;
-      }
-      switch (other.OneofFieldCase) {
-        case OneofFieldOneofCase.OneofUint32:
-          OneofUint32 = other.OneofUint32;
-          break;
-        case OneofFieldOneofCase.OneofNestedMessage:
-          if (OneofNestedMessage == null) {
-            OneofNestedMessage = new global::ProtobufTestMessages.Proto2.TestAllTypesProto2.Types.NestedMessage();
-          }
-          OneofNestedMessage.MergeFrom(other.OneofNestedMessage);
-          break;
-        case OneofFieldOneofCase.OneofString:
-          OneofString = other.OneofString;
-          break;
-        case OneofFieldOneofCase.OneofBytes:
-          OneofBytes = other.OneofBytes;
-          break;
-        case OneofFieldOneofCase.OneofBool:
-          OneofBool = other.OneofBool;
-          break;
-        case OneofFieldOneofCase.OneofUint64:
-          OneofUint64 = other.OneofUint64;
-          break;
-        case OneofFieldOneofCase.OneofFloat:
-          OneofFloat = other.OneofFloat;
-          break;
-        case OneofFieldOneofCase.OneofDouble:
-          OneofDouble = other.OneofDouble;
-          break;
-        case OneofFieldOneofCase.OneofEnum:
-          OneofEnum = other.OneofEnum;
-          break;
-      }
-
-      pb::ExtensionSet.MergeFrom(ref _extensions, other._extensions);
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            if (!pb::ExtensionSet.TryMergeFieldFrom(ref _extensions, input)) {
-              _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            }
-            break;
-          case 8: {
-            OptionalInt32 = input.ReadInt32();
-            break;
-          }
-          case 16: {
-            OptionalInt64 = input.ReadInt64();
-            break;
-          }
-          case 24: {
-            OptionalUint32 = input.ReadUInt32();
-            break;
-          }
-          case 32: {
-            OptionalUint64 = input.ReadUInt64();
-            break;
-          }
-          case 40: {
-            OptionalSint32 = input.ReadSInt32();
-            break;
-          }
-          case 48: {
-            OptionalSint64 = input.ReadSInt64();
-            break;
-          }
-          case 61: {
-            OptionalFixed32 = input.ReadFixed32();
-            break;
-          }
-          case 65: {
-            OptionalFixed64 = input.ReadFixed64();
-            break;
-          }
-          case 77: {
-            OptionalSfixed32 = input.ReadSFixed32();
-            break;
-          }
-          case 81: {
-            OptionalSfixed64 = input.ReadSFixed64();
-            break;
-          }
-          case 93: {
-            OptionalFloat = input.ReadFloat();
-            break;
-          }
-          case 97: {
-            OptionalDouble = input.ReadDouble();
-            break;
-          }
-          case 104: {
-            OptionalBool = input.ReadBool();
-            break;
-          }
-          case 114: {
-            OptionalString = input.ReadString();
-            break;
-          }
-          case 122: {
-            OptionalBytes = input.ReadBytes();
-            break;
-          }
-          case 146: {
-            if (optionalNestedMessage_ == null) {
-              OptionalNestedMessage = new global::ProtobufTestMessages.Proto2.TestAllTypesProto2.Types.NestedMessage();
-            }
-            input.ReadMessage(OptionalNestedMessage);
-            break;
-          }
-          case 154: {
-            if (optionalForeignMessage_ == null) {
-              OptionalForeignMessage = new global::ProtobufTestMessages.Proto2.ForeignMessageProto2();
-            }
-            input.ReadMessage(OptionalForeignMessage);
-            break;
-          }
-          case 168: {
-            OptionalNestedEnum = (global::ProtobufTestMessages.Proto2.TestAllTypesProto2.Types.NestedEnum) input.ReadEnum();
-            break;
-          }
-          case 176: {
-            OptionalForeignEnum = (global::ProtobufTestMessages.Proto2.ForeignEnumProto2) input.ReadEnum();
-            break;
-          }
-          case 194: {
-            OptionalStringPiece = input.ReadString();
-            break;
-          }
-          case 202: {
-            OptionalCord = input.ReadString();
-            break;
-          }
-          case 218: {
-            if (recursiveMessage_ == null) {
-              RecursiveMessage = new global::ProtobufTestMessages.Proto2.TestAllTypesProto2();
-            }
-            input.ReadMessage(RecursiveMessage);
-            break;
-          }
-          case 250:
-          case 248: {
-            repeatedInt32_.AddEntriesFrom(input, _repeated_repeatedInt32_codec);
-            break;
-          }
-          case 258:
-          case 256: {
-            repeatedInt64_.AddEntriesFrom(input, _repeated_repeatedInt64_codec);
-            break;
-          }
-          case 266:
-          case 264: {
-            repeatedUint32_.AddEntriesFrom(input, _repeated_repeatedUint32_codec);
-            break;
-          }
-          case 274:
-          case 272: {
-            repeatedUint64_.AddEntriesFrom(input, _repeated_repeatedUint64_codec);
-            break;
-          }
-          case 282:
-          case 280: {
-            repeatedSint32_.AddEntriesFrom(input, _repeated_repeatedSint32_codec);
-            break;
-          }
-          case 290:
-          case 288: {
-            repeatedSint64_.AddEntriesFrom(input, _repeated_repeatedSint64_codec);
-            break;
-          }
-          case 298:
-          case 301: {
-            repeatedFixed32_.AddEntriesFrom(input, _repeated_repeatedFixed32_codec);
-            break;
-          }
-          case 306:
-          case 305: {
-            repeatedFixed64_.AddEntriesFrom(input, _repeated_repeatedFixed64_codec);
-            break;
-          }
-          case 314:
-          case 317: {
-            repeatedSfixed32_.AddEntriesFrom(input, _repeated_repeatedSfixed32_codec);
-            break;
-          }
-          case 322:
-          case 321: {
-            repeatedSfixed64_.AddEntriesFrom(input, _repeated_repeatedSfixed64_codec);
-            break;
-          }
-          case 330:
-          case 333: {
-            repeatedFloat_.AddEntriesFrom(input, _repeated_repeatedFloat_codec);
-            break;
-          }
-          case 338:
-          case 337: {
-            repeatedDouble_.AddEntriesFrom(input, _repeated_repeatedDouble_codec);
-            break;
-          }
-          case 346:
-          case 344: {
-            repeatedBool_.AddEntriesFrom(input, _repeated_repeatedBool_codec);
-            break;
-          }
-          case 354: {
-            repeatedString_.AddEntriesFrom(input, _repeated_repeatedString_codec);
-            break;
-          }
-          case 362: {
-            repeatedBytes_.AddEntriesFrom(input, _repeated_repeatedBytes_codec);
-            break;
-          }
-          case 386: {
-            repeatedNestedMessage_.AddEntriesFrom(input, _repeated_repeatedNestedMessage_codec);
-            break;
-          }
-          case 394: {
-            repeatedForeignMessage_.AddEntriesFrom(input, _repeated_repeatedForeignMessage_codec);
-            break;
-          }
-          case 410:
-          case 408: {
-            repeatedNestedEnum_.AddEntriesFrom(input, _repeated_repeatedNestedEnum_codec);
-            break;
-          }
-          case 418:
-          case 416: {
-            repeatedForeignEnum_.AddEntriesFrom(input, _repeated_repeatedForeignEnum_codec);
-            break;
-          }
-          case 434: {
-            repeatedStringPiece_.AddEntriesFrom(input, _repeated_repeatedStringPiece_codec);
-            break;
-          }
-          case 442: {
-            repeatedCord_.AddEntriesFrom(input, _repeated_repeatedCord_codec);
-            break;
-          }
-          case 450: {
-            mapInt32Int32_.AddEntriesFrom(input, _map_mapInt32Int32_codec);
-            break;
-          }
-          case 458: {
-            mapInt64Int64_.AddEntriesFrom(input, _map_mapInt64Int64_codec);
-            break;
-          }
-          case 466: {
-            mapUint32Uint32_.AddEntriesFrom(input, _map_mapUint32Uint32_codec);
-            break;
-          }
-          case 474: {
-            mapUint64Uint64_.AddEntriesFrom(input, _map_mapUint64Uint64_codec);
-            break;
-          }
-          case 482: {
-            mapSint32Sint32_.AddEntriesFrom(input, _map_mapSint32Sint32_codec);
-            break;
-          }
-          case 490: {
-            mapSint64Sint64_.AddEntriesFrom(input, _map_mapSint64Sint64_codec);
-            break;
-          }
-          case 498: {
-            mapFixed32Fixed32_.AddEntriesFrom(input, _map_mapFixed32Fixed32_codec);
-            break;
-          }
-          case 506: {
-            mapFixed64Fixed64_.AddEntriesFrom(input, _map_mapFixed64Fixed64_codec);
-            break;
-          }
-          case 514: {
-            mapSfixed32Sfixed32_.AddEntriesFrom(input, _map_mapSfixed32Sfixed32_codec);
-            break;
-          }
-          case 522: {
-            mapSfixed64Sfixed64_.AddEntriesFrom(input, _map_mapSfixed64Sfixed64_codec);
-            break;
-          }
-          case 530: {
-            mapInt32Float_.AddEntriesFrom(input, _map_mapInt32Float_codec);
-            break;
-          }
-          case 538: {
-            mapInt32Double_.AddEntriesFrom(input, _map_mapInt32Double_codec);
-            break;
-          }
-          case 546: {
-            mapBoolBool_.AddEntriesFrom(input, _map_mapBoolBool_codec);
-            break;
-          }
-          case 554: {
-            mapStringString_.AddEntriesFrom(input, _map_mapStringString_codec);
-            break;
-          }
-          case 562: {
-            mapStringBytes_.AddEntriesFrom(input, _map_mapStringBytes_codec);
-            break;
-          }
-          case 570: {
-            mapStringNestedMessage_.AddEntriesFrom(input, _map_mapStringNestedMessage_codec);
-            break;
-          }
-          case 578: {
-            mapStringForeignMessage_.AddEntriesFrom(input, _map_mapStringForeignMessage_codec);
-            break;
-          }
-          case 586: {
-            mapStringNestedEnum_.AddEntriesFrom(input, _map_mapStringNestedEnum_codec);
-            break;
-          }
-          case 594: {
-            mapStringForeignEnum_.AddEntriesFrom(input, _map_mapStringForeignEnum_codec);
-            break;
-          }
-          case 602:
-          case 600: {
-            packedInt32_.AddEntriesFrom(input, _repeated_packedInt32_codec);
-            break;
-          }
-          case 610:
-          case 608: {
-            packedInt64_.AddEntriesFrom(input, _repeated_packedInt64_codec);
-            break;
-          }
-          case 618:
-          case 616: {
-            packedUint32_.AddEntriesFrom(input, _repeated_packedUint32_codec);
-            break;
-          }
-          case 626:
-          case 624: {
-            packedUint64_.AddEntriesFrom(input, _repeated_packedUint64_codec);
-            break;
-          }
-          case 634:
-          case 632: {
-            packedSint32_.AddEntriesFrom(input, _repeated_packedSint32_codec);
-            break;
-          }
-          case 642:
-          case 640: {
-            packedSint64_.AddEntriesFrom(input, _repeated_packedSint64_codec);
-            break;
-          }
-          case 650:
-          case 653: {
-            packedFixed32_.AddEntriesFrom(input, _repeated_packedFixed32_codec);
-            break;
-          }
-          case 658:
-          case 657: {
-            packedFixed64_.AddEntriesFrom(input, _repeated_packedFixed64_codec);
-            break;
-          }
-          case 666:
-          case 669: {
-            packedSfixed32_.AddEntriesFrom(input, _repeated_packedSfixed32_codec);
-            break;
-          }
-          case 674:
-          case 673: {
-            packedSfixed64_.AddEntriesFrom(input, _repeated_packedSfixed64_codec);
-            break;
-          }
-          case 682:
-          case 685: {
-            packedFloat_.AddEntriesFrom(input, _repeated_packedFloat_codec);
-            break;
-          }
-          case 690:
-          case 689: {
-            packedDouble_.AddEntriesFrom(input, _repeated_packedDouble_codec);
-            break;
-          }
-          case 698:
-          case 696: {
-            packedBool_.AddEntriesFrom(input, _repeated_packedBool_codec);
-            break;
-          }
-          case 706:
-          case 704: {
-            packedNestedEnum_.AddEntriesFrom(input, _repeated_packedNestedEnum_codec);
-            break;
-          }
-          case 714:
-          case 712: {
-            unpackedInt32_.AddEntriesFrom(input, _repeated_unpackedInt32_codec);
-            break;
-          }
-          case 722:
-          case 720: {
-            unpackedInt64_.AddEntriesFrom(input, _repeated_unpackedInt64_codec);
-            break;
-          }
-          case 730:
-          case 728: {
-            unpackedUint32_.AddEntriesFrom(input, _repeated_unpackedUint32_codec);
-            break;
-          }
-          case 738:
-          case 736: {
-            unpackedUint64_.AddEntriesFrom(input, _repeated_unpackedUint64_codec);
-            break;
-          }
-          case 746:
-          case 744: {
-            unpackedSint32_.AddEntriesFrom(input, _repeated_unpackedSint32_codec);
-            break;
-          }
-          case 754:
-          case 752: {
-            unpackedSint64_.AddEntriesFrom(input, _repeated_unpackedSint64_codec);
-            break;
-          }
-          case 762:
-          case 765: {
-            unpackedFixed32_.AddEntriesFrom(input, _repeated_unpackedFixed32_codec);
-            break;
-          }
-          case 770:
-          case 769: {
-            unpackedFixed64_.AddEntriesFrom(input, _repeated_unpackedFixed64_codec);
-            break;
-          }
-          case 778:
-          case 781: {
-            unpackedSfixed32_.AddEntriesFrom(input, _repeated_unpackedSfixed32_codec);
-            break;
-          }
-          case 786:
-          case 785: {
-            unpackedSfixed64_.AddEntriesFrom(input, _repeated_unpackedSfixed64_codec);
-            break;
-          }
-          case 794:
-          case 797: {
-            unpackedFloat_.AddEntriesFrom(input, _repeated_unpackedFloat_codec);
-            break;
-          }
-          case 802:
-          case 801: {
-            unpackedDouble_.AddEntriesFrom(input, _repeated_unpackedDouble_codec);
-            break;
-          }
-          case 810:
-          case 808: {
-            unpackedBool_.AddEntriesFrom(input, _repeated_unpackedBool_codec);
-            break;
-          }
-          case 818:
-          case 816: {
-            unpackedNestedEnum_.AddEntriesFrom(input, _repeated_unpackedNestedEnum_codec);
-            break;
-          }
-          case 888: {
-            OneofUint32 = input.ReadUInt32();
-            break;
-          }
-          case 898: {
-            global::ProtobufTestMessages.Proto2.TestAllTypesProto2.Types.NestedMessage subBuilder = new global::ProtobufTestMessages.Proto2.TestAllTypesProto2.Types.NestedMessage();
-            if (oneofFieldCase_ == OneofFieldOneofCase.OneofNestedMessage) {
-              subBuilder.MergeFrom(OneofNestedMessage);
-            }
-            input.ReadMessage(subBuilder);
-            OneofNestedMessage = subBuilder;
-            break;
-          }
-          case 906: {
-            OneofString = input.ReadString();
-            break;
-          }
-          case 914: {
-            OneofBytes = input.ReadBytes();
-            break;
-          }
-          case 920: {
-            OneofBool = input.ReadBool();
-            break;
-          }
-          case 928: {
-            OneofUint64 = input.ReadUInt64();
-            break;
-          }
-          case 941: {
-            OneofFloat = input.ReadFloat();
-            break;
-          }
-          case 945: {
-            OneofDouble = input.ReadDouble();
-            break;
-          }
-          case 952: {
-            oneofField_ = input.ReadEnum();
-            oneofFieldCase_ = OneofFieldOneofCase.OneofEnum;
-            break;
-          }
-          case 1611: {
-            if (!HasData) {
-              Data = new global::ProtobufTestMessages.Proto2.TestAllTypesProto2.Types.Data();
-            }
-            input.ReadGroup(Data);
-            break;
-          }
-          case 1928: {
-            DefaultInt32 = input.ReadInt32();
-            break;
-          }
-          case 1936: {
-            DefaultInt64 = input.ReadInt64();
-            break;
-          }
-          case 1944: {
-            DefaultUint32 = input.ReadUInt32();
-            break;
-          }
-          case 1952: {
-            DefaultUint64 = input.ReadUInt64();
-            break;
-          }
-          case 1960: {
-            DefaultSint32 = input.ReadSInt32();
-            break;
-          }
-          case 1968: {
-            DefaultSint64 = input.ReadSInt64();
-            break;
-          }
-          case 1981: {
-            DefaultFixed32 = input.ReadFixed32();
-            break;
-          }
-          case 1985: {
-            DefaultFixed64 = input.ReadFixed64();
-            break;
-          }
-          case 1997: {
-            DefaultSfixed32 = input.ReadSFixed32();
-            break;
-          }
-          case 2001: {
-            DefaultSfixed64 = input.ReadSFixed64();
-            break;
-          }
-          case 2013: {
-            DefaultFloat = input.ReadFloat();
-            break;
-          }
-          case 2017: {
-            DefaultDouble = input.ReadDouble();
-            break;
-          }
-          case 2024: {
-            DefaultBool = input.ReadBool();
-            break;
-          }
-          case 2034: {
-            DefaultString = input.ReadString();
-            break;
-          }
-          case 2042: {
-            DefaultBytes = input.ReadBytes();
-            break;
-          }
-          case 3208: {
-            Fieldname1 = input.ReadInt32();
-            break;
-          }
-          case 3216: {
-            FieldName2 = input.ReadInt32();
-            break;
-          }
-          case 3224: {
-            FieldName3 = input.ReadInt32();
-            break;
-          }
-          case 3232: {
-            FieldName4 = input.ReadInt32();
-            break;
-          }
-          case 3240: {
-            Field0Name5 = input.ReadInt32();
-            break;
-          }
-          case 3248: {
-            Field0Name6 = input.ReadInt32();
-            break;
-          }
-          case 3256: {
-            FieldName7 = input.ReadInt32();
-            break;
-          }
-          case 3264: {
-            FieldName8 = input.ReadInt32();
-            break;
-          }
-          case 3272: {
-            FieldName9 = input.ReadInt32();
-            break;
-          }
-          case 3280: {
-            FieldName10 = input.ReadInt32();
-            break;
-          }
-          case 3288: {
-            FIELDNAME11 = input.ReadInt32();
-            break;
-          }
-          case 3296: {
-            FIELDName12 = input.ReadInt32();
-            break;
-          }
-          case 3304: {
-            FieldName13 = input.ReadInt32();
-            break;
-          }
-          case 3312: {
-            FieldName14 = input.ReadInt32();
-            break;
-          }
-          case 3320: {
-            FieldName15 = input.ReadInt32();
-            break;
-          }
-          case 3328: {
-            FieldName16 = input.ReadInt32();
-            break;
-          }
-          case 3336: {
-            FieldName17 = input.ReadInt32();
-            break;
-          }
-          case 3344: {
-            FieldName18 = input.ReadInt32();
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            if (!pb::ExtensionSet.TryMergeFieldFrom(ref _extensions, ref input)) {
-              _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            }
-            break;
-          case 8: {
-            OptionalInt32 = input.ReadInt32();
-            break;
-          }
-          case 16: {
-            OptionalInt64 = input.ReadInt64();
-            break;
-          }
-          case 24: {
-            OptionalUint32 = input.ReadUInt32();
-            break;
-          }
-          case 32: {
-            OptionalUint64 = input.ReadUInt64();
-            break;
-          }
-          case 40: {
-            OptionalSint32 = input.ReadSInt32();
-            break;
-          }
-          case 48: {
-            OptionalSint64 = input.ReadSInt64();
-            break;
-          }
-          case 61: {
-            OptionalFixed32 = input.ReadFixed32();
-            break;
-          }
-          case 65: {
-            OptionalFixed64 = input.ReadFixed64();
-            break;
-          }
-          case 77: {
-            OptionalSfixed32 = input.ReadSFixed32();
-            break;
-          }
-          case 81: {
-            OptionalSfixed64 = input.ReadSFixed64();
-            break;
-          }
-          case 93: {
-            OptionalFloat = input.ReadFloat();
-            break;
-          }
-          case 97: {
-            OptionalDouble = input.ReadDouble();
-            break;
-          }
-          case 104: {
-            OptionalBool = input.ReadBool();
-            break;
-          }
-          case 114: {
-            OptionalString = input.ReadString();
-            break;
-          }
-          case 122: {
-            OptionalBytes = input.ReadBytes();
-            break;
-          }
-          case 146: {
-            if (optionalNestedMessage_ == null) {
-              OptionalNestedMessage = new global::ProtobufTestMessages.Proto2.TestAllTypesProto2.Types.NestedMessage();
-            }
-            input.ReadMessage(OptionalNestedMessage);
-            break;
-          }
-          case 154: {
-            if (optionalForeignMessage_ == null) {
-              OptionalForeignMessage = new global::ProtobufTestMessages.Proto2.ForeignMessageProto2();
-            }
-            input.ReadMessage(OptionalForeignMessage);
-            break;
-          }
-          case 168: {
-            OptionalNestedEnum = (global::ProtobufTestMessages.Proto2.TestAllTypesProto2.Types.NestedEnum) input.ReadEnum();
-            break;
-          }
-          case 176: {
-            OptionalForeignEnum = (global::ProtobufTestMessages.Proto2.ForeignEnumProto2) input.ReadEnum();
-            break;
-          }
-          case 194: {
-            OptionalStringPiece = input.ReadString();
-            break;
-          }
-          case 202: {
-            OptionalCord = input.ReadString();
-            break;
-          }
-          case 218: {
-            if (recursiveMessage_ == null) {
-              RecursiveMessage = new global::ProtobufTestMessages.Proto2.TestAllTypesProto2();
-            }
-            input.ReadMessage(RecursiveMessage);
-            break;
-          }
-          case 250:
-          case 248: {
-            repeatedInt32_.AddEntriesFrom(ref input, _repeated_repeatedInt32_codec);
-            break;
-          }
-          case 258:
-          case 256: {
-            repeatedInt64_.AddEntriesFrom(ref input, _repeated_repeatedInt64_codec);
-            break;
-          }
-          case 266:
-          case 264: {
-            repeatedUint32_.AddEntriesFrom(ref input, _repeated_repeatedUint32_codec);
-            break;
-          }
-          case 274:
-          case 272: {
-            repeatedUint64_.AddEntriesFrom(ref input, _repeated_repeatedUint64_codec);
-            break;
-          }
-          case 282:
-          case 280: {
-            repeatedSint32_.AddEntriesFrom(ref input, _repeated_repeatedSint32_codec);
-            break;
-          }
-          case 290:
-          case 288: {
-            repeatedSint64_.AddEntriesFrom(ref input, _repeated_repeatedSint64_codec);
-            break;
-          }
-          case 298:
-          case 301: {
-            repeatedFixed32_.AddEntriesFrom(ref input, _repeated_repeatedFixed32_codec);
-            break;
-          }
-          case 306:
-          case 305: {
-            repeatedFixed64_.AddEntriesFrom(ref input, _repeated_repeatedFixed64_codec);
-            break;
-          }
-          case 314:
-          case 317: {
-            repeatedSfixed32_.AddEntriesFrom(ref input, _repeated_repeatedSfixed32_codec);
-            break;
-          }
-          case 322:
-          case 321: {
-            repeatedSfixed64_.AddEntriesFrom(ref input, _repeated_repeatedSfixed64_codec);
-            break;
-          }
-          case 330:
-          case 333: {
-            repeatedFloat_.AddEntriesFrom(ref input, _repeated_repeatedFloat_codec);
-            break;
-          }
-          case 338:
-          case 337: {
-            repeatedDouble_.AddEntriesFrom(ref input, _repeated_repeatedDouble_codec);
-            break;
-          }
-          case 346:
-          case 344: {
-            repeatedBool_.AddEntriesFrom(ref input, _repeated_repeatedBool_codec);
-            break;
-          }
-          case 354: {
-            repeatedString_.AddEntriesFrom(ref input, _repeated_repeatedString_codec);
-            break;
-          }
-          case 362: {
-            repeatedBytes_.AddEntriesFrom(ref input, _repeated_repeatedBytes_codec);
-            break;
-          }
-          case 386: {
-            repeatedNestedMessage_.AddEntriesFrom(ref input, _repeated_repeatedNestedMessage_codec);
-            break;
-          }
-          case 394: {
-            repeatedForeignMessage_.AddEntriesFrom(ref input, _repeated_repeatedForeignMessage_codec);
-            break;
-          }
-          case 410:
-          case 408: {
-            repeatedNestedEnum_.AddEntriesFrom(ref input, _repeated_repeatedNestedEnum_codec);
-            break;
-          }
-          case 418:
-          case 416: {
-            repeatedForeignEnum_.AddEntriesFrom(ref input, _repeated_repeatedForeignEnum_codec);
-            break;
-          }
-          case 434: {
-            repeatedStringPiece_.AddEntriesFrom(ref input, _repeated_repeatedStringPiece_codec);
-            break;
-          }
-          case 442: {
-            repeatedCord_.AddEntriesFrom(ref input, _repeated_repeatedCord_codec);
-            break;
-          }
-          case 450: {
-            mapInt32Int32_.AddEntriesFrom(ref input, _map_mapInt32Int32_codec);
-            break;
-          }
-          case 458: {
-            mapInt64Int64_.AddEntriesFrom(ref input, _map_mapInt64Int64_codec);
-            break;
-          }
-          case 466: {
-            mapUint32Uint32_.AddEntriesFrom(ref input, _map_mapUint32Uint32_codec);
-            break;
-          }
-          case 474: {
-            mapUint64Uint64_.AddEntriesFrom(ref input, _map_mapUint64Uint64_codec);
-            break;
-          }
-          case 482: {
-            mapSint32Sint32_.AddEntriesFrom(ref input, _map_mapSint32Sint32_codec);
-            break;
-          }
-          case 490: {
-            mapSint64Sint64_.AddEntriesFrom(ref input, _map_mapSint64Sint64_codec);
-            break;
-          }
-          case 498: {
-            mapFixed32Fixed32_.AddEntriesFrom(ref input, _map_mapFixed32Fixed32_codec);
-            break;
-          }
-          case 506: {
-            mapFixed64Fixed64_.AddEntriesFrom(ref input, _map_mapFixed64Fixed64_codec);
-            break;
-          }
-          case 514: {
-            mapSfixed32Sfixed32_.AddEntriesFrom(ref input, _map_mapSfixed32Sfixed32_codec);
-            break;
-          }
-          case 522: {
-            mapSfixed64Sfixed64_.AddEntriesFrom(ref input, _map_mapSfixed64Sfixed64_codec);
-            break;
-          }
-          case 530: {
-            mapInt32Float_.AddEntriesFrom(ref input, _map_mapInt32Float_codec);
-            break;
-          }
-          case 538: {
-            mapInt32Double_.AddEntriesFrom(ref input, _map_mapInt32Double_codec);
-            break;
-          }
-          case 546: {
-            mapBoolBool_.AddEntriesFrom(ref input, _map_mapBoolBool_codec);
-            break;
-          }
-          case 554: {
-            mapStringString_.AddEntriesFrom(ref input, _map_mapStringString_codec);
-            break;
-          }
-          case 562: {
-            mapStringBytes_.AddEntriesFrom(ref input, _map_mapStringBytes_codec);
-            break;
-          }
-          case 570: {
-            mapStringNestedMessage_.AddEntriesFrom(ref input, _map_mapStringNestedMessage_codec);
-            break;
-          }
-          case 578: {
-            mapStringForeignMessage_.AddEntriesFrom(ref input, _map_mapStringForeignMessage_codec);
-            break;
-          }
-          case 586: {
-            mapStringNestedEnum_.AddEntriesFrom(ref input, _map_mapStringNestedEnum_codec);
-            break;
-          }
-          case 594: {
-            mapStringForeignEnum_.AddEntriesFrom(ref input, _map_mapStringForeignEnum_codec);
-            break;
-          }
-          case 602:
-          case 600: {
-            packedInt32_.AddEntriesFrom(ref input, _repeated_packedInt32_codec);
-            break;
-          }
-          case 610:
-          case 608: {
-            packedInt64_.AddEntriesFrom(ref input, _repeated_packedInt64_codec);
-            break;
-          }
-          case 618:
-          case 616: {
-            packedUint32_.AddEntriesFrom(ref input, _repeated_packedUint32_codec);
-            break;
-          }
-          case 626:
-          case 624: {
-            packedUint64_.AddEntriesFrom(ref input, _repeated_packedUint64_codec);
-            break;
-          }
-          case 634:
-          case 632: {
-            packedSint32_.AddEntriesFrom(ref input, _repeated_packedSint32_codec);
-            break;
-          }
-          case 642:
-          case 640: {
-            packedSint64_.AddEntriesFrom(ref input, _repeated_packedSint64_codec);
-            break;
-          }
-          case 650:
-          case 653: {
-            packedFixed32_.AddEntriesFrom(ref input, _repeated_packedFixed32_codec);
-            break;
-          }
-          case 658:
-          case 657: {
-            packedFixed64_.AddEntriesFrom(ref input, _repeated_packedFixed64_codec);
-            break;
-          }
-          case 666:
-          case 669: {
-            packedSfixed32_.AddEntriesFrom(ref input, _repeated_packedSfixed32_codec);
-            break;
-          }
-          case 674:
-          case 673: {
-            packedSfixed64_.AddEntriesFrom(ref input, _repeated_packedSfixed64_codec);
-            break;
-          }
-          case 682:
-          case 685: {
-            packedFloat_.AddEntriesFrom(ref input, _repeated_packedFloat_codec);
-            break;
-          }
-          case 690:
-          case 689: {
-            packedDouble_.AddEntriesFrom(ref input, _repeated_packedDouble_codec);
-            break;
-          }
-          case 698:
-          case 696: {
-            packedBool_.AddEntriesFrom(ref input, _repeated_packedBool_codec);
-            break;
-          }
-          case 706:
-          case 704: {
-            packedNestedEnum_.AddEntriesFrom(ref input, _repeated_packedNestedEnum_codec);
-            break;
-          }
-          case 714:
-          case 712: {
-            unpackedInt32_.AddEntriesFrom(ref input, _repeated_unpackedInt32_codec);
-            break;
-          }
-          case 722:
-          case 720: {
-            unpackedInt64_.AddEntriesFrom(ref input, _repeated_unpackedInt64_codec);
-            break;
-          }
-          case 730:
-          case 728: {
-            unpackedUint32_.AddEntriesFrom(ref input, _repeated_unpackedUint32_codec);
-            break;
-          }
-          case 738:
-          case 736: {
-            unpackedUint64_.AddEntriesFrom(ref input, _repeated_unpackedUint64_codec);
-            break;
-          }
-          case 746:
-          case 744: {
-            unpackedSint32_.AddEntriesFrom(ref input, _repeated_unpackedSint32_codec);
-            break;
-          }
-          case 754:
-          case 752: {
-            unpackedSint64_.AddEntriesFrom(ref input, _repeated_unpackedSint64_codec);
-            break;
-          }
-          case 762:
-          case 765: {
-            unpackedFixed32_.AddEntriesFrom(ref input, _repeated_unpackedFixed32_codec);
-            break;
-          }
-          case 770:
-          case 769: {
-            unpackedFixed64_.AddEntriesFrom(ref input, _repeated_unpackedFixed64_codec);
-            break;
-          }
-          case 778:
-          case 781: {
-            unpackedSfixed32_.AddEntriesFrom(ref input, _repeated_unpackedSfixed32_codec);
-            break;
-          }
-          case 786:
-          case 785: {
-            unpackedSfixed64_.AddEntriesFrom(ref input, _repeated_unpackedSfixed64_codec);
-            break;
-          }
-          case 794:
-          case 797: {
-            unpackedFloat_.AddEntriesFrom(ref input, _repeated_unpackedFloat_codec);
-            break;
-          }
-          case 802:
-          case 801: {
-            unpackedDouble_.AddEntriesFrom(ref input, _repeated_unpackedDouble_codec);
-            break;
-          }
-          case 810:
-          case 808: {
-            unpackedBool_.AddEntriesFrom(ref input, _repeated_unpackedBool_codec);
-            break;
-          }
-          case 818:
-          case 816: {
-            unpackedNestedEnum_.AddEntriesFrom(ref input, _repeated_unpackedNestedEnum_codec);
-            break;
-          }
-          case 888: {
-            OneofUint32 = input.ReadUInt32();
-            break;
-          }
-          case 898: {
-            global::ProtobufTestMessages.Proto2.TestAllTypesProto2.Types.NestedMessage subBuilder = new global::ProtobufTestMessages.Proto2.TestAllTypesProto2.Types.NestedMessage();
-            if (oneofFieldCase_ == OneofFieldOneofCase.OneofNestedMessage) {
-              subBuilder.MergeFrom(OneofNestedMessage);
-            }
-            input.ReadMessage(subBuilder);
-            OneofNestedMessage = subBuilder;
-            break;
-          }
-          case 906: {
-            OneofString = input.ReadString();
-            break;
-          }
-          case 914: {
-            OneofBytes = input.ReadBytes();
-            break;
-          }
-          case 920: {
-            OneofBool = input.ReadBool();
-            break;
-          }
-          case 928: {
-            OneofUint64 = input.ReadUInt64();
-            break;
-          }
-          case 941: {
-            OneofFloat = input.ReadFloat();
-            break;
-          }
-          case 945: {
-            OneofDouble = input.ReadDouble();
-            break;
-          }
-          case 952: {
-            oneofField_ = input.ReadEnum();
-            oneofFieldCase_ = OneofFieldOneofCase.OneofEnum;
-            break;
-          }
-          case 1611: {
-            if (!HasData) {
-              Data = new global::ProtobufTestMessages.Proto2.TestAllTypesProto2.Types.Data();
-            }
-            input.ReadGroup(Data);
-            break;
-          }
-          case 1928: {
-            DefaultInt32 = input.ReadInt32();
-            break;
-          }
-          case 1936: {
-            DefaultInt64 = input.ReadInt64();
-            break;
-          }
-          case 1944: {
-            DefaultUint32 = input.ReadUInt32();
-            break;
-          }
-          case 1952: {
-            DefaultUint64 = input.ReadUInt64();
-            break;
-          }
-          case 1960: {
-            DefaultSint32 = input.ReadSInt32();
-            break;
-          }
-          case 1968: {
-            DefaultSint64 = input.ReadSInt64();
-            break;
-          }
-          case 1981: {
-            DefaultFixed32 = input.ReadFixed32();
-            break;
-          }
-          case 1985: {
-            DefaultFixed64 = input.ReadFixed64();
-            break;
-          }
-          case 1997: {
-            DefaultSfixed32 = input.ReadSFixed32();
-            break;
-          }
-          case 2001: {
-            DefaultSfixed64 = input.ReadSFixed64();
-            break;
-          }
-          case 2013: {
-            DefaultFloat = input.ReadFloat();
-            break;
-          }
-          case 2017: {
-            DefaultDouble = input.ReadDouble();
-            break;
-          }
-          case 2024: {
-            DefaultBool = input.ReadBool();
-            break;
-          }
-          case 2034: {
-            DefaultString = input.ReadString();
-            break;
-          }
-          case 2042: {
-            DefaultBytes = input.ReadBytes();
-            break;
-          }
-          case 3208: {
-            Fieldname1 = input.ReadInt32();
-            break;
-          }
-          case 3216: {
-            FieldName2 = input.ReadInt32();
-            break;
-          }
-          case 3224: {
-            FieldName3 = input.ReadInt32();
-            break;
-          }
-          case 3232: {
-            FieldName4 = input.ReadInt32();
-            break;
-          }
-          case 3240: {
-            Field0Name5 = input.ReadInt32();
-            break;
-          }
-          case 3248: {
-            Field0Name6 = input.ReadInt32();
-            break;
-          }
-          case 3256: {
-            FieldName7 = input.ReadInt32();
-            break;
-          }
-          case 3264: {
-            FieldName8 = input.ReadInt32();
-            break;
-          }
-          case 3272: {
-            FieldName9 = input.ReadInt32();
-            break;
-          }
-          case 3280: {
-            FieldName10 = input.ReadInt32();
-            break;
-          }
-          case 3288: {
-            FIELDNAME11 = input.ReadInt32();
-            break;
-          }
-          case 3296: {
-            FIELDName12 = input.ReadInt32();
-            break;
-          }
-          case 3304: {
-            FieldName13 = input.ReadInt32();
-            break;
-          }
-          case 3312: {
-            FieldName14 = input.ReadInt32();
-            break;
-          }
-          case 3320: {
-            FieldName15 = input.ReadInt32();
-            break;
-          }
-          case 3328: {
-            FieldName16 = input.ReadInt32();
-            break;
-          }
-          case 3336: {
-            FieldName17 = input.ReadInt32();
-            break;
-          }
-          case 3344: {
-            FieldName18 = input.ReadInt32();
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-    public TValue GetExtension<TValue>(pb::Extension<TestAllTypesProto2, TValue> extension) {
-      return pb::ExtensionSet.Get(ref _extensions, extension);
-    }
-    public pbc::RepeatedField<TValue> GetExtension<TValue>(pb::RepeatedExtension<TestAllTypesProto2, TValue> extension) {
-      return pb::ExtensionSet.Get(ref _extensions, extension);
-    }
-    public pbc::RepeatedField<TValue> GetOrInitializeExtension<TValue>(pb::RepeatedExtension<TestAllTypesProto2, TValue> extension) {
-      return pb::ExtensionSet.GetOrInitialize(ref _extensions, extension);
-    }
-    public void SetExtension<TValue>(pb::Extension<TestAllTypesProto2, TValue> extension, TValue value) {
-      pb::ExtensionSet.Set(ref _extensions, extension, value);
-    }
-    public bool HasExtension<TValue>(pb::Extension<TestAllTypesProto2, TValue> extension) {
-      return pb::ExtensionSet.Has(ref _extensions, extension);
-    }
-    public void ClearExtension<TValue>(pb::Extension<TestAllTypesProto2, TValue> extension) {
-      pb::ExtensionSet.Clear(ref _extensions, extension);
-    }
-    public void ClearExtension<TValue>(pb::RepeatedExtension<TestAllTypesProto2, TValue> extension) {
-      pb::ExtensionSet.Clear(ref _extensions, extension);
-    }
-
-    #region Nested types
-    /// <summary>Container for nested types declared in the TestAllTypesProto2 message type.</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static partial class Types {
-      public enum NestedEnum {
-        [pbr::OriginalName("FOO")] Foo = 0,
-        [pbr::OriginalName("BAR")] Bar = 1,
-        [pbr::OriginalName("BAZ")] Baz = 2,
-        /// <summary>
-        /// Intentionally negative.
-        /// </summary>
-        [pbr::OriginalName("NEG")] Neg = -1,
-      }
-
-      public sealed partial class NestedMessage : pb::IMessage<NestedMessage>
-      #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          , pb::IBufferMessage
-      #endif
-      {
-        private static readonly pb::MessageParser<NestedMessage> _parser = new pb::MessageParser<NestedMessage>(() => new NestedMessage());
-        private pb::UnknownFieldSet _unknownFields;
-        private int _hasBits0;
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static pb::MessageParser<NestedMessage> Parser { get { return _parser; } }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static pbr::MessageDescriptor Descriptor {
-          get { return global::ProtobufTestMessages.Proto2.TestAllTypesProto2.Descriptor.NestedTypes[0]; }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        pbr::MessageDescriptor pb::IMessage.Descriptor {
-          get { return Descriptor; }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public NestedMessage() {
-          OnConstruction();
-        }
-
-        partial void OnConstruction();
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public NestedMessage(NestedMessage other) : this() {
-          _hasBits0 = other._hasBits0;
-          a_ = other.a_;
-          corecursive_ = other.corecursive_ != null ? other.corecursive_.Clone() : null;
-          _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public NestedMessage Clone() {
-          return new NestedMessage(this);
-        }
-
-        /// <summary>Field number for the "a" field.</summary>
-        public const int AFieldNumber = 1;
-        private readonly static int ADefaultValue = 0;
-
-        private int a_;
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public int A {
-          get { if ((_hasBits0 & 1) != 0) { return a_; } else { return ADefaultValue; } }
-          set {
-            _hasBits0 |= 1;
-            a_ = value;
-          }
-        }
-        /// <summary>Gets whether the "a" field is set</summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool HasA {
-          get { return (_hasBits0 & 1) != 0; }
-        }
-        /// <summary>Clears the value of the "a" field</summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void ClearA() {
-          _hasBits0 &= ~1;
-        }
-
-        /// <summary>Field number for the "corecursive" field.</summary>
-        public const int CorecursiveFieldNumber = 2;
-        private global::ProtobufTestMessages.Proto2.TestAllTypesProto2 corecursive_;
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public global::ProtobufTestMessages.Proto2.TestAllTypesProto2 Corecursive {
-          get { return corecursive_; }
-          set {
-            corecursive_ = value;
-          }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override bool Equals(object other) {
-          return Equals(other as NestedMessage);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool Equals(NestedMessage other) {
-          if (ReferenceEquals(other, null)) {
-            return false;
-          }
-          if (ReferenceEquals(other, this)) {
-            return true;
-          }
-          if (A != other.A) return false;
-          if (!object.Equals(Corecursive, other.Corecursive)) return false;
-          return Equals(_unknownFields, other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override int GetHashCode() {
-          int hash = 1;
-          if (HasA) hash ^= A.GetHashCode();
-          if (corecursive_ != null) hash ^= Corecursive.GetHashCode();
-          if (_unknownFields != null) {
-            hash ^= _unknownFields.GetHashCode();
-          }
-          return hash;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override string ToString() {
-          return pb::JsonFormatter.ToDiagnosticString(this);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void WriteTo(pb::CodedOutputStream output) {
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          output.WriteRawMessage(this);
-        #else
-          if (HasA) {
-            output.WriteRawTag(8);
-            output.WriteInt32(A);
-          }
-          if (corecursive_ != null) {
-            output.WriteRawTag(18);
-            output.WriteMessage(Corecursive);
-          }
-          if (_unknownFields != null) {
-            _unknownFields.WriteTo(output);
-          }
-        #endif
-        }
-
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-          if (HasA) {
-            output.WriteRawTag(8);
-            output.WriteInt32(A);
-          }
-          if (corecursive_ != null) {
-            output.WriteRawTag(18);
-            output.WriteMessage(Corecursive);
-          }
-          if (_unknownFields != null) {
-            _unknownFields.WriteTo(ref output);
-          }
-        }
-        #endif
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public int CalculateSize() {
-          int size = 0;
-          if (HasA) {
-            size += 1 + pb::CodedOutputStream.ComputeInt32Size(A);
-          }
-          if (corecursive_ != null) {
-            size += 1 + pb::CodedOutputStream.ComputeMessageSize(Corecursive);
-          }
-          if (_unknownFields != null) {
-            size += _unknownFields.CalculateSize();
-          }
-          return size;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(NestedMessage other) {
-          if (other == null) {
-            return;
-          }
-          if (other.HasA) {
-            A = other.A;
-          }
-          if (other.corecursive_ != null) {
-            if (corecursive_ == null) {
-              Corecursive = new global::ProtobufTestMessages.Proto2.TestAllTypesProto2();
-            }
-            Corecursive.MergeFrom(other.Corecursive);
-          }
-          _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(pb::CodedInputStream input) {
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          input.ReadRawMessage(this);
-        #else
-          uint tag;
-          while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
-              default:
-                _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-                break;
-              case 8: {
-                A = input.ReadInt32();
-                break;
-              }
-              case 18: {
-                if (corecursive_ == null) {
-                  Corecursive = new global::ProtobufTestMessages.Proto2.TestAllTypesProto2();
-                }
-                input.ReadMessage(Corecursive);
-                break;
-              }
-            }
-          }
-        #endif
-        }
-
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-          uint tag;
-          while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
-              default:
-                _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-                break;
-              case 8: {
-                A = input.ReadInt32();
-                break;
-              }
-              case 18: {
-                if (corecursive_ == null) {
-                  Corecursive = new global::ProtobufTestMessages.Proto2.TestAllTypesProto2();
-                }
-                input.ReadMessage(Corecursive);
-                break;
-              }
-            }
-          }
-        }
-        #endif
-
-      }
-
-      /// <summary>
-      /// groups
-      /// </summary>
-      public sealed partial class Data : pb::IMessage<Data>
-      #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          , pb::IBufferMessage
-      #endif
-      {
-        private static readonly pb::MessageParser<Data> _parser = new pb::MessageParser<Data>(() => new Data());
-        private pb::UnknownFieldSet _unknownFields;
-        private int _hasBits0;
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static pb::MessageParser<Data> Parser { get { return _parser; } }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static pbr::MessageDescriptor Descriptor {
-          get { return global::ProtobufTestMessages.Proto2.TestAllTypesProto2.Descriptor.NestedTypes[20]; }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        pbr::MessageDescriptor pb::IMessage.Descriptor {
-          get { return Descriptor; }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public Data() {
-          OnConstruction();
-        }
-
-        partial void OnConstruction();
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public Data(Data other) : this() {
-          _hasBits0 = other._hasBits0;
-          groupInt32_ = other.groupInt32_;
-          groupUint32_ = other.groupUint32_;
-          _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public Data Clone() {
-          return new Data(this);
-        }
-
-        /// <summary>Field number for the "group_int32" field.</summary>
-        public const int GroupInt32FieldNumber = 202;
-        private readonly static int GroupInt32DefaultValue = 0;
-
-        private int groupInt32_;
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public int GroupInt32 {
-          get { if ((_hasBits0 & 1) != 0) { return groupInt32_; } else { return GroupInt32DefaultValue; } }
-          set {
-            _hasBits0 |= 1;
-            groupInt32_ = value;
-          }
-        }
-        /// <summary>Gets whether the "group_int32" field is set</summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool HasGroupInt32 {
-          get { return (_hasBits0 & 1) != 0; }
-        }
-        /// <summary>Clears the value of the "group_int32" field</summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void ClearGroupInt32() {
-          _hasBits0 &= ~1;
-        }
-
-        /// <summary>Field number for the "group_uint32" field.</summary>
-        public const int GroupUint32FieldNumber = 203;
-        private readonly static uint GroupUint32DefaultValue = 0;
-
-        private uint groupUint32_;
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public uint GroupUint32 {
-          get { if ((_hasBits0 & 2) != 0) { return groupUint32_; } else { return GroupUint32DefaultValue; } }
-          set {
-            _hasBits0 |= 2;
-            groupUint32_ = value;
-          }
-        }
-        /// <summary>Gets whether the "group_uint32" field is set</summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool HasGroupUint32 {
-          get { return (_hasBits0 & 2) != 0; }
-        }
-        /// <summary>Clears the value of the "group_uint32" field</summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void ClearGroupUint32() {
-          _hasBits0 &= ~2;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override bool Equals(object other) {
-          return Equals(other as Data);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool Equals(Data other) {
-          if (ReferenceEquals(other, null)) {
-            return false;
-          }
-          if (ReferenceEquals(other, this)) {
-            return true;
-          }
-          if (GroupInt32 != other.GroupInt32) return false;
-          if (GroupUint32 != other.GroupUint32) return false;
-          return Equals(_unknownFields, other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override int GetHashCode() {
-          int hash = 1;
-          if (HasGroupInt32) hash ^= GroupInt32.GetHashCode();
-          if (HasGroupUint32) hash ^= GroupUint32.GetHashCode();
-          if (_unknownFields != null) {
-            hash ^= _unknownFields.GetHashCode();
-          }
-          return hash;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override string ToString() {
-          return pb::JsonFormatter.ToDiagnosticString(this);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void WriteTo(pb::CodedOutputStream output) {
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          output.WriteRawMessage(this);
-        #else
-          if (HasGroupInt32) {
-            output.WriteRawTag(208, 12);
-            output.WriteInt32(GroupInt32);
-          }
-          if (HasGroupUint32) {
-            output.WriteRawTag(216, 12);
-            output.WriteUInt32(GroupUint32);
-          }
-          if (_unknownFields != null) {
-            _unknownFields.WriteTo(output);
-          }
-        #endif
-        }
-
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-          if (HasGroupInt32) {
-            output.WriteRawTag(208, 12);
-            output.WriteInt32(GroupInt32);
-          }
-          if (HasGroupUint32) {
-            output.WriteRawTag(216, 12);
-            output.WriteUInt32(GroupUint32);
-          }
-          if (_unknownFields != null) {
-            _unknownFields.WriteTo(ref output);
-          }
-        }
-        #endif
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public int CalculateSize() {
-          int size = 0;
-          if (HasGroupInt32) {
-            size += 2 + pb::CodedOutputStream.ComputeInt32Size(GroupInt32);
-          }
-          if (HasGroupUint32) {
-            size += 2 + pb::CodedOutputStream.ComputeUInt32Size(GroupUint32);
-          }
-          if (_unknownFields != null) {
-            size += _unknownFields.CalculateSize();
-          }
-          return size;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(Data other) {
-          if (other == null) {
-            return;
-          }
-          if (other.HasGroupInt32) {
-            GroupInt32 = other.GroupInt32;
-          }
-          if (other.HasGroupUint32) {
-            GroupUint32 = other.GroupUint32;
-          }
-          _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(pb::CodedInputStream input) {
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          input.ReadRawMessage(this);
-        #else
-          uint tag;
-          while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
-              case 1612:
-                return;
-              default:
-                _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-                break;
-              case 1616: {
-                GroupInt32 = input.ReadInt32();
-                break;
-              }
-              case 1624: {
-                GroupUint32 = input.ReadUInt32();
-                break;
-              }
-            }
-          }
-        #endif
-        }
-
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-          uint tag;
-          while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
-              case 1612:
-                return;
-              default:
-                _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-                break;
-              case 1616: {
-                GroupInt32 = input.ReadInt32();
-                break;
-              }
-              case 1624: {
-                GroupUint32 = input.ReadUInt32();
-                break;
-              }
-            }
-          }
-        }
-        #endif
-
-      }
-
-      /// <summary>
-      /// message_set test case.
-      /// </summary>
-      public sealed partial class MessageSetCorrect : pb::IExtendableMessage<MessageSetCorrect>
-      #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          , pb::IBufferMessage
-      #endif
-      {
-        private static readonly pb::MessageParser<MessageSetCorrect> _parser = new pb::MessageParser<MessageSetCorrect>(() => new MessageSetCorrect());
-        private pb::UnknownFieldSet _unknownFields;
-        private pb::ExtensionSet<MessageSetCorrect> _extensions;
-        private pb::ExtensionSet<MessageSetCorrect> _Extensions { get { return _extensions; } }
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static pb::MessageParser<MessageSetCorrect> Parser { get { return _parser; } }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static pbr::MessageDescriptor Descriptor {
-          get { return global::ProtobufTestMessages.Proto2.TestAllTypesProto2.Descriptor.NestedTypes[21]; }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        pbr::MessageDescriptor pb::IMessage.Descriptor {
-          get { return Descriptor; }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public MessageSetCorrect() {
-          OnConstruction();
-        }
-
-        partial void OnConstruction();
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public MessageSetCorrect(MessageSetCorrect other) : this() {
-          _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-          _extensions = pb::ExtensionSet.Clone(other._extensions);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public MessageSetCorrect Clone() {
-          return new MessageSetCorrect(this);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override bool Equals(object other) {
-          return Equals(other as MessageSetCorrect);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool Equals(MessageSetCorrect other) {
-          if (ReferenceEquals(other, null)) {
-            return false;
-          }
-          if (ReferenceEquals(other, this)) {
-            return true;
-          }
-          if (!Equals(_extensions, other._extensions)) {
-            return false;
-          }
-          return Equals(_unknownFields, other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override int GetHashCode() {
-          int hash = 1;
-          if (_extensions != null) {
-            hash ^= _extensions.GetHashCode();
-          }
-          if (_unknownFields != null) {
-            hash ^= _unknownFields.GetHashCode();
-          }
-          return hash;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override string ToString() {
-          return pb::JsonFormatter.ToDiagnosticString(this);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void WriteTo(pb::CodedOutputStream output) {
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          output.WriteRawMessage(this);
-        #else
-          if (_extensions != null) {
-            _extensions.WriteTo(output);
-          }
-          if (_unknownFields != null) {
-            _unknownFields.WriteTo(output);
-          }
-        #endif
-        }
-
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-          if (_extensions != null) {
-            _extensions.WriteTo(ref output);
-          }
-          if (_unknownFields != null) {
-            _unknownFields.WriteTo(ref output);
-          }
-        }
-        #endif
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public int CalculateSize() {
-          int size = 0;
-          if (_extensions != null) {
-            size += _extensions.CalculateSize();
-          }
-          if (_unknownFields != null) {
-            size += _unknownFields.CalculateSize();
-          }
-          return size;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(MessageSetCorrect other) {
-          if (other == null) {
-            return;
-          }
-          pb::ExtensionSet.MergeFrom(ref _extensions, other._extensions);
-          _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(pb::CodedInputStream input) {
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          input.ReadRawMessage(this);
-        #else
-          uint tag;
-          while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
-              default:
-                if (!pb::ExtensionSet.TryMergeFieldFrom(ref _extensions, input)) {
-                  _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-                }
-                break;
-            }
-          }
-        #endif
-        }
-
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-          uint tag;
-          while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
-              default:
-                if (!pb::ExtensionSet.TryMergeFieldFrom(ref _extensions, ref input)) {
-                  _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-                }
-                break;
-            }
-          }
-        }
-        #endif
-
-        public TValue GetExtension<TValue>(pb::Extension<MessageSetCorrect, TValue> extension) {
-          return pb::ExtensionSet.Get(ref _extensions, extension);
-        }
-        public pbc::RepeatedField<TValue> GetExtension<TValue>(pb::RepeatedExtension<MessageSetCorrect, TValue> extension) {
-          return pb::ExtensionSet.Get(ref _extensions, extension);
-        }
-        public pbc::RepeatedField<TValue> GetOrInitializeExtension<TValue>(pb::RepeatedExtension<MessageSetCorrect, TValue> extension) {
-          return pb::ExtensionSet.GetOrInitialize(ref _extensions, extension);
-        }
-        public void SetExtension<TValue>(pb::Extension<MessageSetCorrect, TValue> extension, TValue value) {
-          pb::ExtensionSet.Set(ref _extensions, extension, value);
-        }
-        public bool HasExtension<TValue>(pb::Extension<MessageSetCorrect, TValue> extension) {
-          return pb::ExtensionSet.Has(ref _extensions, extension);
-        }
-        public void ClearExtension<TValue>(pb::Extension<MessageSetCorrect, TValue> extension) {
-          pb::ExtensionSet.Clear(ref _extensions, extension);
-        }
-        public void ClearExtension<TValue>(pb::RepeatedExtension<MessageSetCorrect, TValue> extension) {
-          pb::ExtensionSet.Clear(ref _extensions, extension);
-        }
-
-      }
-
-      public sealed partial class MessageSetCorrectExtension1 : pb::IMessage<MessageSetCorrectExtension1>
-      #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          , pb::IBufferMessage
-      #endif
-      {
-        private static readonly pb::MessageParser<MessageSetCorrectExtension1> _parser = new pb::MessageParser<MessageSetCorrectExtension1>(() => new MessageSetCorrectExtension1());
-        private pb::UnknownFieldSet _unknownFields;
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static pb::MessageParser<MessageSetCorrectExtension1> Parser { get { return _parser; } }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static pbr::MessageDescriptor Descriptor {
-          get { return global::ProtobufTestMessages.Proto2.TestAllTypesProto2.Descriptor.NestedTypes[22]; }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        pbr::MessageDescriptor pb::IMessage.Descriptor {
-          get { return Descriptor; }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public MessageSetCorrectExtension1() {
-          OnConstruction();
-        }
-
-        partial void OnConstruction();
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public MessageSetCorrectExtension1(MessageSetCorrectExtension1 other) : this() {
-          str_ = other.str_;
-          _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public MessageSetCorrectExtension1 Clone() {
-          return new MessageSetCorrectExtension1(this);
-        }
-
-        /// <summary>Field number for the "str" field.</summary>
-        public const int StrFieldNumber = 25;
-        private readonly static string StrDefaultValue = "";
-
-        private string str_;
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public string Str {
-          get { return str_ ?? StrDefaultValue; }
-          set {
-            str_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-          }
-        }
-        /// <summary>Gets whether the "str" field is set</summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool HasStr {
-          get { return str_ != null; }
-        }
-        /// <summary>Clears the value of the "str" field</summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void ClearStr() {
-          str_ = null;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override bool Equals(object other) {
-          return Equals(other as MessageSetCorrectExtension1);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool Equals(MessageSetCorrectExtension1 other) {
-          if (ReferenceEquals(other, null)) {
-            return false;
-          }
-          if (ReferenceEquals(other, this)) {
-            return true;
-          }
-          if (Str != other.Str) return false;
-          return Equals(_unknownFields, other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override int GetHashCode() {
-          int hash = 1;
-          if (HasStr) hash ^= Str.GetHashCode();
-          if (_unknownFields != null) {
-            hash ^= _unknownFields.GetHashCode();
-          }
-          return hash;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override string ToString() {
-          return pb::JsonFormatter.ToDiagnosticString(this);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void WriteTo(pb::CodedOutputStream output) {
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          output.WriteRawMessage(this);
-        #else
-          if (HasStr) {
-            output.WriteRawTag(202, 1);
-            output.WriteString(Str);
-          }
-          if (_unknownFields != null) {
-            _unknownFields.WriteTo(output);
-          }
-        #endif
-        }
-
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-          if (HasStr) {
-            output.WriteRawTag(202, 1);
-            output.WriteString(Str);
-          }
-          if (_unknownFields != null) {
-            _unknownFields.WriteTo(ref output);
-          }
-        }
-        #endif
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public int CalculateSize() {
-          int size = 0;
-          if (HasStr) {
-            size += 2 + pb::CodedOutputStream.ComputeStringSize(Str);
-          }
-          if (_unknownFields != null) {
-            size += _unknownFields.CalculateSize();
-          }
-          return size;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(MessageSetCorrectExtension1 other) {
-          if (other == null) {
-            return;
-          }
-          if (other.HasStr) {
-            Str = other.Str;
-          }
-          _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(pb::CodedInputStream input) {
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          input.ReadRawMessage(this);
-        #else
-          uint tag;
-          while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
-              default:
-                _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-                break;
-              case 202: {
-                Str = input.ReadString();
-                break;
-              }
-            }
-          }
-        #endif
-        }
-
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-          uint tag;
-          while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
-              default:
-                _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-                break;
-              case 202: {
-                Str = input.ReadString();
-                break;
-              }
-            }
-          }
-        }
-        #endif
-
-        #region Extensions
-        /// <summary>Container for extensions for other messages declared in the MessageSetCorrectExtension1 message type.</summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static partial class Extensions {
-          public static readonly pb::Extension<global::ProtobufTestMessages.Proto2.TestAllTypesProto2.Types.MessageSetCorrect, global::ProtobufTestMessages.Proto2.TestAllTypesProto2.Types.MessageSetCorrectExtension1> MessageSetExtension =
-            new pb::Extension<global::ProtobufTestMessages.Proto2.TestAllTypesProto2.Types.MessageSetCorrect, global::ProtobufTestMessages.Proto2.TestAllTypesProto2.Types.MessageSetCorrectExtension1>(1547769, pb::FieldCodec.ForMessage(12382154, global::ProtobufTestMessages.Proto2.TestAllTypesProto2.Types.MessageSetCorrectExtension1.Parser));
-        }
-        #endregion
-
-      }
-
-      public sealed partial class MessageSetCorrectExtension2 : pb::IMessage<MessageSetCorrectExtension2>
-      #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          , pb::IBufferMessage
-      #endif
-      {
-        private static readonly pb::MessageParser<MessageSetCorrectExtension2> _parser = new pb::MessageParser<MessageSetCorrectExtension2>(() => new MessageSetCorrectExtension2());
-        private pb::UnknownFieldSet _unknownFields;
-        private int _hasBits0;
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static pb::MessageParser<MessageSetCorrectExtension2> Parser { get { return _parser; } }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static pbr::MessageDescriptor Descriptor {
-          get { return global::ProtobufTestMessages.Proto2.TestAllTypesProto2.Descriptor.NestedTypes[23]; }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        pbr::MessageDescriptor pb::IMessage.Descriptor {
-          get { return Descriptor; }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public MessageSetCorrectExtension2() {
-          OnConstruction();
-        }
-
-        partial void OnConstruction();
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public MessageSetCorrectExtension2(MessageSetCorrectExtension2 other) : this() {
-          _hasBits0 = other._hasBits0;
-          i_ = other.i_;
-          _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public MessageSetCorrectExtension2 Clone() {
-          return new MessageSetCorrectExtension2(this);
-        }
-
-        /// <summary>Field number for the "i" field.</summary>
-        public const int IFieldNumber = 9;
-        private readonly static int IDefaultValue = 0;
-
-        private int i_;
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public int I {
-          get { if ((_hasBits0 & 1) != 0) { return i_; } else { return IDefaultValue; } }
-          set {
-            _hasBits0 |= 1;
-            i_ = value;
-          }
-        }
-        /// <summary>Gets whether the "i" field is set</summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool HasI {
-          get { return (_hasBits0 & 1) != 0; }
-        }
-        /// <summary>Clears the value of the "i" field</summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void ClearI() {
-          _hasBits0 &= ~1;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override bool Equals(object other) {
-          return Equals(other as MessageSetCorrectExtension2);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool Equals(MessageSetCorrectExtension2 other) {
-          if (ReferenceEquals(other, null)) {
-            return false;
-          }
-          if (ReferenceEquals(other, this)) {
-            return true;
-          }
-          if (I != other.I) return false;
-          return Equals(_unknownFields, other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override int GetHashCode() {
-          int hash = 1;
-          if (HasI) hash ^= I.GetHashCode();
-          if (_unknownFields != null) {
-            hash ^= _unknownFields.GetHashCode();
-          }
-          return hash;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override string ToString() {
-          return pb::JsonFormatter.ToDiagnosticString(this);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void WriteTo(pb::CodedOutputStream output) {
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          output.WriteRawMessage(this);
-        #else
-          if (HasI) {
-            output.WriteRawTag(72);
-            output.WriteInt32(I);
-          }
-          if (_unknownFields != null) {
-            _unknownFields.WriteTo(output);
-          }
-        #endif
-        }
-
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-          if (HasI) {
-            output.WriteRawTag(72);
-            output.WriteInt32(I);
-          }
-          if (_unknownFields != null) {
-            _unknownFields.WriteTo(ref output);
-          }
-        }
-        #endif
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public int CalculateSize() {
-          int size = 0;
-          if (HasI) {
-            size += 1 + pb::CodedOutputStream.ComputeInt32Size(I);
-          }
-          if (_unknownFields != null) {
-            size += _unknownFields.CalculateSize();
-          }
-          return size;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(MessageSetCorrectExtension2 other) {
-          if (other == null) {
-            return;
-          }
-          if (other.HasI) {
-            I = other.I;
-          }
-          _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(pb::CodedInputStream input) {
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          input.ReadRawMessage(this);
-        #else
-          uint tag;
-          while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
-              default:
-                _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-                break;
-              case 72: {
-                I = input.ReadInt32();
-                break;
-              }
-            }
-          }
-        #endif
-        }
-
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-          uint tag;
-          while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
-              default:
-                _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-                break;
-              case 72: {
-                I = input.ReadInt32();
-                break;
-              }
-            }
-          }
-        }
-        #endif
-
-        #region Extensions
-        /// <summary>Container for extensions for other messages declared in the MessageSetCorrectExtension2 message type.</summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static partial class Extensions {
-          public static readonly pb::Extension<global::ProtobufTestMessages.Proto2.TestAllTypesProto2.Types.MessageSetCorrect, global::ProtobufTestMessages.Proto2.TestAllTypesProto2.Types.MessageSetCorrectExtension2> MessageSetExtension =
-            new pb::Extension<global::ProtobufTestMessages.Proto2.TestAllTypesProto2.Types.MessageSetCorrect, global::ProtobufTestMessages.Proto2.TestAllTypesProto2.Types.MessageSetCorrectExtension2>(4135312, pb::FieldCodec.ForMessage(33082498, global::ProtobufTestMessages.Proto2.TestAllTypesProto2.Types.MessageSetCorrectExtension2.Parser));
-        }
-        #endregion
-
-      }
-
-    }
-    #endregion
-
-  }
-
-  public sealed partial class ForeignMessageProto2 : pb::IMessage<ForeignMessageProto2>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<ForeignMessageProto2> _parser = new pb::MessageParser<ForeignMessageProto2>(() => new ForeignMessageProto2());
-    private pb::UnknownFieldSet _unknownFields;
-    private int _hasBits0;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<ForeignMessageProto2> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::ProtobufTestMessages.Proto2.TestMessagesProto2Reflection.Descriptor.MessageTypes[1]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ForeignMessageProto2() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ForeignMessageProto2(ForeignMessageProto2 other) : this() {
-      _hasBits0 = other._hasBits0;
-      c_ = other.c_;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ForeignMessageProto2 Clone() {
-      return new ForeignMessageProto2(this);
-    }
-
-    /// <summary>Field number for the "c" field.</summary>
-    public const int CFieldNumber = 1;
-    private readonly static int CDefaultValue = 0;
-
-    private int c_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int C {
-      get { if ((_hasBits0 & 1) != 0) { return c_; } else { return CDefaultValue; } }
-      set {
-        _hasBits0 |= 1;
-        c_ = value;
-      }
-    }
-    /// <summary>Gets whether the "c" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasC {
-      get { return (_hasBits0 & 1) != 0; }
-    }
-    /// <summary>Clears the value of the "c" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearC() {
-      _hasBits0 &= ~1;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as ForeignMessageProto2);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(ForeignMessageProto2 other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (C != other.C) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (HasC) hash ^= C.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (HasC) {
-        output.WriteRawTag(8);
-        output.WriteInt32(C);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (HasC) {
-        output.WriteRawTag(8);
-        output.WriteInt32(C);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (HasC) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(C);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(ForeignMessageProto2 other) {
-      if (other == null) {
-        return;
-      }
-      if (other.HasC) {
-        C = other.C;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 8: {
-            C = input.ReadInt32();
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 8: {
-            C = input.ReadInt32();
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  public sealed partial class UnknownToTestAllTypes : pb::IMessage<UnknownToTestAllTypes>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<UnknownToTestAllTypes> _parser = new pb::MessageParser<UnknownToTestAllTypes>(() => new UnknownToTestAllTypes());
-    private pb::UnknownFieldSet _unknownFields;
-    private int _hasBits0;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<UnknownToTestAllTypes> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::ProtobufTestMessages.Proto2.TestMessagesProto2Reflection.Descriptor.MessageTypes[2]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public UnknownToTestAllTypes() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public UnknownToTestAllTypes(UnknownToTestAllTypes other) : this() {
-      _hasBits0 = other._hasBits0;
-      optionalInt32_ = other.optionalInt32_;
-      optionalString_ = other.optionalString_;
-      nestedMessage_ = other.nestedMessage_ != null ? other.nestedMessage_.Clone() : null;
-      optionalGroup_ = other.HasOptionalGroup ? other.optionalGroup_.Clone() : null;
-      optionalBool_ = other.optionalBool_;
-      repeatedInt32_ = other.repeatedInt32_.Clone();
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public UnknownToTestAllTypes Clone() {
-      return new UnknownToTestAllTypes(this);
-    }
-
-    /// <summary>Field number for the "optional_int32" field.</summary>
-    public const int OptionalInt32FieldNumber = 1001;
-    private readonly static int OptionalInt32DefaultValue = 0;
-
-    private int optionalInt32_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int OptionalInt32 {
-      get { if ((_hasBits0 & 1) != 0) { return optionalInt32_; } else { return OptionalInt32DefaultValue; } }
-      set {
-        _hasBits0 |= 1;
-        optionalInt32_ = value;
-      }
-    }
-    /// <summary>Gets whether the "optional_int32" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasOptionalInt32 {
-      get { return (_hasBits0 & 1) != 0; }
-    }
-    /// <summary>Clears the value of the "optional_int32" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearOptionalInt32() {
-      _hasBits0 &= ~1;
-    }
-
-    /// <summary>Field number for the "optional_string" field.</summary>
-    public const int OptionalStringFieldNumber = 1002;
-    private readonly static string OptionalStringDefaultValue = "";
-
-    private string optionalString_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string OptionalString {
-      get { return optionalString_ ?? OptionalStringDefaultValue; }
-      set {
-        optionalString_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-    /// <summary>Gets whether the "optional_string" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasOptionalString {
-      get { return optionalString_ != null; }
-    }
-    /// <summary>Clears the value of the "optional_string" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearOptionalString() {
-      optionalString_ = null;
-    }
-
-    /// <summary>Field number for the "nested_message" field.</summary>
-    public const int NestedMessageFieldNumber = 1003;
-    private global::ProtobufTestMessages.Proto2.ForeignMessageProto2 nestedMessage_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::ProtobufTestMessages.Proto2.ForeignMessageProto2 NestedMessage {
-      get { return nestedMessage_; }
-      set {
-        nestedMessage_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "optionalgroup" field.</summary>
-    public const int OptionalGroupFieldNumber = 1004;
-    private global::ProtobufTestMessages.Proto2.UnknownToTestAllTypes.Types.OptionalGroup optionalGroup_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::ProtobufTestMessages.Proto2.UnknownToTestAllTypes.Types.OptionalGroup OptionalGroup {
-      get { return optionalGroup_; }
-      set {
-        optionalGroup_ = value;
-      }
-    }
-    /// <summary>Gets whether the optionalgroup field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasOptionalGroup {
-      get { return optionalGroup_ != null; }
-    }
-    /// <summary>Clears the value of the optionalgroup field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearOptionalGroup() {
-      optionalGroup_ = null;
-    }
-
-    /// <summary>Field number for the "optional_bool" field.</summary>
-    public const int OptionalBoolFieldNumber = 1006;
-    private readonly static bool OptionalBoolDefaultValue = false;
-
-    private bool optionalBool_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool OptionalBool {
-      get { if ((_hasBits0 & 2) != 0) { return optionalBool_; } else { return OptionalBoolDefaultValue; } }
-      set {
-        _hasBits0 |= 2;
-        optionalBool_ = value;
-      }
-    }
-    /// <summary>Gets whether the "optional_bool" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasOptionalBool {
-      get { return (_hasBits0 & 2) != 0; }
-    }
-    /// <summary>Clears the value of the "optional_bool" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearOptionalBool() {
-      _hasBits0 &= ~2;
-    }
-
-    /// <summary>Field number for the "repeated_int32" field.</summary>
-    public const int RepeatedInt32FieldNumber = 1011;
-    private static readonly pb::FieldCodec<int> _repeated_repeatedInt32_codec
-        = pb::FieldCodec.ForInt32(8088);
-    private readonly pbc::RepeatedField<int> repeatedInt32_ = new pbc::RepeatedField<int>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<int> RepeatedInt32 {
-      get { return repeatedInt32_; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as UnknownToTestAllTypes);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(UnknownToTestAllTypes other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (OptionalInt32 != other.OptionalInt32) return false;
-      if (OptionalString != other.OptionalString) return false;
-      if (!object.Equals(NestedMessage, other.NestedMessage)) return false;
-      if (!object.Equals(OptionalGroup, other.OptionalGroup)) return false;
-      if (OptionalBool != other.OptionalBool) return false;
-      if(!repeatedInt32_.Equals(other.repeatedInt32_)) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (HasOptionalInt32) hash ^= OptionalInt32.GetHashCode();
-      if (HasOptionalString) hash ^= OptionalString.GetHashCode();
-      if (nestedMessage_ != null) hash ^= NestedMessage.GetHashCode();
-      if (HasOptionalGroup) hash ^= OptionalGroup.GetHashCode();
-      if (HasOptionalBool) hash ^= OptionalBool.GetHashCode();
-      hash ^= repeatedInt32_.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (HasOptionalInt32) {
-        output.WriteRawTag(200, 62);
-        output.WriteInt32(OptionalInt32);
-      }
-      if (HasOptionalString) {
-        output.WriteRawTag(210, 62);
-        output.WriteString(OptionalString);
-      }
-      if (nestedMessage_ != null) {
-        output.WriteRawTag(218, 62);
-        output.WriteMessage(NestedMessage);
-      }
-      if (HasOptionalGroup) {
-        output.WriteRawTag(227, 62);
-        output.WriteGroup(OptionalGroup);
-        output.WriteRawTag(228, 62);
-      }
-      if (HasOptionalBool) {
-        output.WriteRawTag(240, 62);
-        output.WriteBool(OptionalBool);
-      }
-      repeatedInt32_.WriteTo(output, _repeated_repeatedInt32_codec);
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (HasOptionalInt32) {
-        output.WriteRawTag(200, 62);
-        output.WriteInt32(OptionalInt32);
-      }
-      if (HasOptionalString) {
-        output.WriteRawTag(210, 62);
-        output.WriteString(OptionalString);
-      }
-      if (nestedMessage_ != null) {
-        output.WriteRawTag(218, 62);
-        output.WriteMessage(NestedMessage);
-      }
-      if (HasOptionalGroup) {
-        output.WriteRawTag(227, 62);
-        output.WriteGroup(OptionalGroup);
-        output.WriteRawTag(228, 62);
-      }
-      if (HasOptionalBool) {
-        output.WriteRawTag(240, 62);
-        output.WriteBool(OptionalBool);
-      }
-      repeatedInt32_.WriteTo(ref output, _repeated_repeatedInt32_codec);
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (HasOptionalInt32) {
-        size += 2 + pb::CodedOutputStream.ComputeInt32Size(OptionalInt32);
-      }
-      if (HasOptionalString) {
-        size += 2 + pb::CodedOutputStream.ComputeStringSize(OptionalString);
-      }
-      if (nestedMessage_ != null) {
-        size += 2 + pb::CodedOutputStream.ComputeMessageSize(NestedMessage);
-      }
-      if (HasOptionalGroup) {
-        size += 4 + pb::CodedOutputStream.ComputeGroupSize(OptionalGroup);
-      }
-      if (HasOptionalBool) {
-        size += 2 + 1;
-      }
-      size += repeatedInt32_.CalculateSize(_repeated_repeatedInt32_codec);
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(UnknownToTestAllTypes other) {
-      if (other == null) {
-        return;
-      }
-      if (other.HasOptionalInt32) {
-        OptionalInt32 = other.OptionalInt32;
-      }
-      if (other.HasOptionalString) {
-        OptionalString = other.OptionalString;
-      }
-      if (other.nestedMessage_ != null) {
-        if (nestedMessage_ == null) {
-          NestedMessage = new global::ProtobufTestMessages.Proto2.ForeignMessageProto2();
-        }
-        NestedMessage.MergeFrom(other.NestedMessage);
-      }
-      if (other.HasOptionalGroup) {
-        if (!HasOptionalGroup) {
-          OptionalGroup = new global::ProtobufTestMessages.Proto2.UnknownToTestAllTypes.Types.OptionalGroup();
-        }
-        OptionalGroup.MergeFrom(other.OptionalGroup);
-      }
-      if (other.HasOptionalBool) {
-        OptionalBool = other.OptionalBool;
-      }
-      repeatedInt32_.Add(other.repeatedInt32_);
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 8008: {
-            OptionalInt32 = input.ReadInt32();
-            break;
-          }
-          case 8018: {
-            OptionalString = input.ReadString();
-            break;
-          }
-          case 8026: {
-            if (nestedMessage_ == null) {
-              NestedMessage = new global::ProtobufTestMessages.Proto2.ForeignMessageProto2();
-            }
-            input.ReadMessage(NestedMessage);
-            break;
-          }
-          case 8035: {
-            if (!HasOptionalGroup) {
-              OptionalGroup = new global::ProtobufTestMessages.Proto2.UnknownToTestAllTypes.Types.OptionalGroup();
-            }
-            input.ReadGroup(OptionalGroup);
-            break;
-          }
-          case 8048: {
-            OptionalBool = input.ReadBool();
-            break;
-          }
-          case 8090:
-          case 8088: {
-            repeatedInt32_.AddEntriesFrom(input, _repeated_repeatedInt32_codec);
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 8008: {
-            OptionalInt32 = input.ReadInt32();
-            break;
-          }
-          case 8018: {
-            OptionalString = input.ReadString();
-            break;
-          }
-          case 8026: {
-            if (nestedMessage_ == null) {
-              NestedMessage = new global::ProtobufTestMessages.Proto2.ForeignMessageProto2();
-            }
-            input.ReadMessage(NestedMessage);
-            break;
-          }
-          case 8035: {
-            if (!HasOptionalGroup) {
-              OptionalGroup = new global::ProtobufTestMessages.Proto2.UnknownToTestAllTypes.Types.OptionalGroup();
-            }
-            input.ReadGroup(OptionalGroup);
-            break;
-          }
-          case 8048: {
-            OptionalBool = input.ReadBool();
-            break;
-          }
-          case 8090:
-          case 8088: {
-            repeatedInt32_.AddEntriesFrom(ref input, _repeated_repeatedInt32_codec);
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-    #region Nested types
-    /// <summary>Container for nested types declared in the UnknownToTestAllTypes message type.</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static partial class Types {
-      public sealed partial class OptionalGroup : pb::IMessage<OptionalGroup>
-      #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          , pb::IBufferMessage
-      #endif
-      {
-        private static readonly pb::MessageParser<OptionalGroup> _parser = new pb::MessageParser<OptionalGroup>(() => new OptionalGroup());
-        private pb::UnknownFieldSet _unknownFields;
-        private int _hasBits0;
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static pb::MessageParser<OptionalGroup> Parser { get { return _parser; } }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static pbr::MessageDescriptor Descriptor {
-          get { return global::ProtobufTestMessages.Proto2.UnknownToTestAllTypes.Descriptor.NestedTypes[0]; }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        pbr::MessageDescriptor pb::IMessage.Descriptor {
-          get { return Descriptor; }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public OptionalGroup() {
-          OnConstruction();
-        }
-
-        partial void OnConstruction();
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public OptionalGroup(OptionalGroup other) : this() {
-          _hasBits0 = other._hasBits0;
-          a_ = other.a_;
-          _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public OptionalGroup Clone() {
-          return new OptionalGroup(this);
-        }
-
-        /// <summary>Field number for the "a" field.</summary>
-        public const int AFieldNumber = 1;
-        private readonly static int ADefaultValue = 0;
-
-        private int a_;
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public int A {
-          get { if ((_hasBits0 & 1) != 0) { return a_; } else { return ADefaultValue; } }
-          set {
-            _hasBits0 |= 1;
-            a_ = value;
-          }
-        }
-        /// <summary>Gets whether the "a" field is set</summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool HasA {
-          get { return (_hasBits0 & 1) != 0; }
-        }
-        /// <summary>Clears the value of the "a" field</summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void ClearA() {
-          _hasBits0 &= ~1;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override bool Equals(object other) {
-          return Equals(other as OptionalGroup);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool Equals(OptionalGroup other) {
-          if (ReferenceEquals(other, null)) {
-            return false;
-          }
-          if (ReferenceEquals(other, this)) {
-            return true;
-          }
-          if (A != other.A) return false;
-          return Equals(_unknownFields, other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override int GetHashCode() {
-          int hash = 1;
-          if (HasA) hash ^= A.GetHashCode();
-          if (_unknownFields != null) {
-            hash ^= _unknownFields.GetHashCode();
-          }
-          return hash;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override string ToString() {
-          return pb::JsonFormatter.ToDiagnosticString(this);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void WriteTo(pb::CodedOutputStream output) {
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          output.WriteRawMessage(this);
-        #else
-          if (HasA) {
-            output.WriteRawTag(8);
-            output.WriteInt32(A);
-          }
-          if (_unknownFields != null) {
-            _unknownFields.WriteTo(output);
-          }
-        #endif
-        }
-
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-          if (HasA) {
-            output.WriteRawTag(8);
-            output.WriteInt32(A);
-          }
-          if (_unknownFields != null) {
-            _unknownFields.WriteTo(ref output);
-          }
-        }
-        #endif
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public int CalculateSize() {
-          int size = 0;
-          if (HasA) {
-            size += 1 + pb::CodedOutputStream.ComputeInt32Size(A);
-          }
-          if (_unknownFields != null) {
-            size += _unknownFields.CalculateSize();
-          }
-          return size;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(OptionalGroup other) {
-          if (other == null) {
-            return;
-          }
-          if (other.HasA) {
-            A = other.A;
-          }
-          _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(pb::CodedInputStream input) {
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          input.ReadRawMessage(this);
-        #else
-          uint tag;
-          while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
-              case 8036:
-                return;
-              default:
-                _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-                break;
-              case 8: {
-                A = input.ReadInt32();
-                break;
-              }
-            }
-          }
-        #endif
-        }
-
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-          uint tag;
-          while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
-              case 8036:
-                return;
-              default:
-                _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-                break;
-              case 8: {
-                A = input.ReadInt32();
-                break;
-              }
-            }
-          }
-        }
-        #endif
-
-      }
-
-    }
-    #endregion
-
-  }
-
-  public sealed partial class NullHypothesisProto2 : pb::IMessage<NullHypothesisProto2>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<NullHypothesisProto2> _parser = new pb::MessageParser<NullHypothesisProto2>(() => new NullHypothesisProto2());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<NullHypothesisProto2> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::ProtobufTestMessages.Proto2.TestMessagesProto2Reflection.Descriptor.MessageTypes[3]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public NullHypothesisProto2() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public NullHypothesisProto2(NullHypothesisProto2 other) : this() {
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public NullHypothesisProto2 Clone() {
-      return new NullHypothesisProto2(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as NullHypothesisProto2);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(NullHypothesisProto2 other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(NullHypothesisProto2 other) {
-      if (other == null) {
-        return;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-        }
-      }
-    }
-    #endif
-
-  }
-
-  public sealed partial class EnumOnlyProto2 : pb::IMessage<EnumOnlyProto2>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<EnumOnlyProto2> _parser = new pb::MessageParser<EnumOnlyProto2>(() => new EnumOnlyProto2());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<EnumOnlyProto2> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::ProtobufTestMessages.Proto2.TestMessagesProto2Reflection.Descriptor.MessageTypes[4]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public EnumOnlyProto2() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public EnumOnlyProto2(EnumOnlyProto2 other) : this() {
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public EnumOnlyProto2 Clone() {
-      return new EnumOnlyProto2(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as EnumOnlyProto2);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(EnumOnlyProto2 other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(EnumOnlyProto2 other) {
-      if (other == null) {
-        return;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-        }
-      }
-    }
-    #endif
-
-    #region Nested types
-    /// <summary>Container for nested types declared in the EnumOnlyProto2 message type.</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static partial class Types {
-      public enum Bool {
-        [pbr::OriginalName("kFalse")] KFalse = 0,
-        [pbr::OriginalName("kTrue")] KTrue = 1,
-      }
-
-    }
-    #endregion
-
-  }
-
-  public sealed partial class OneStringProto2 : pb::IMessage<OneStringProto2>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<OneStringProto2> _parser = new pb::MessageParser<OneStringProto2>(() => new OneStringProto2());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<OneStringProto2> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::ProtobufTestMessages.Proto2.TestMessagesProto2Reflection.Descriptor.MessageTypes[5]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public OneStringProto2() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public OneStringProto2(OneStringProto2 other) : this() {
-      data_ = other.data_;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public OneStringProto2 Clone() {
-      return new OneStringProto2(this);
-    }
-
-    /// <summary>Field number for the "data" field.</summary>
-    public const int DataFieldNumber = 1;
-    private readonly static string DataDefaultValue = "";
-
-    private string data_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string Data {
-      get { return data_ ?? DataDefaultValue; }
-      set {
-        data_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-    /// <summary>Gets whether the "data" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasData {
-      get { return data_ != null; }
-    }
-    /// <summary>Clears the value of the "data" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearData() {
-      data_ = null;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as OneStringProto2);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(OneStringProto2 other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (Data != other.Data) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (HasData) hash ^= Data.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (HasData) {
-        output.WriteRawTag(10);
-        output.WriteString(Data);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (HasData) {
-        output.WriteRawTag(10);
-        output.WriteString(Data);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (HasData) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(Data);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(OneStringProto2 other) {
-      if (other == null) {
-        return;
-      }
-      if (other.HasData) {
-        Data = other.Data;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 10: {
-            Data = input.ReadString();
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 10: {
-            Data = input.ReadString();
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  #endregion
-
-}
-
-#endregion Designer generated code
diff --git a/libs/protobuf/csharp/src/Google.Protobuf.Test.TestProtos/TestMessagesProto3.cs b/libs/protobuf/csharp/src/Google.Protobuf.Test.TestProtos/TestMessagesProto3.cs
deleted file mode 100644
index 520216f..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf.Test.TestProtos/TestMessagesProto3.cs
+++ /dev/null
@@ -1,6190 +0,0 @@
-// <auto-generated>
-//     Generated by the protocol buffer compiler.  DO NOT EDIT!
-//     source: google/protobuf/test_messages_proto3.proto
-// </auto-generated>
-#pragma warning disable 1591, 0612, 3021, 8981
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-namespace ProtobufTestMessages.Proto3 {
-
-  /// <summary>Holder for reflection information generated from google/protobuf/test_messages_proto3.proto</summary>
-  public static partial class TestMessagesProto3Reflection {
-
-    #region Descriptor
-    /// <summary>File descriptor for google/protobuf/test_messages_proto3.proto</summary>
-    public static pbr::FileDescriptor Descriptor {
-      get { return descriptor; }
-    }
-    private static pbr::FileDescriptor descriptor;
-
-    static TestMessagesProto3Reflection() {
-      byte[] descriptorData = global::System.Convert.FromBase64String(
-          string.Concat(
-            "Cipnb29nbGUvcHJvdG9idWYvdGVzdF9tZXNzYWdlc19wcm90bzMucHJvdG8S",
-            "HXByb3RvYnVmX3Rlc3RfbWVzc2FnZXMucHJvdG8zGhlnb29nbGUvcHJvdG9i",
-            "dWYvYW55LnByb3RvGh5nb29nbGUvcHJvdG9idWYvZHVyYXRpb24ucHJvdG8a",
-            "IGdvb2dsZS9wcm90b2J1Zi9maWVsZF9tYXNrLnByb3RvGhxnb29nbGUvcHJv",
-            "dG9idWYvc3RydWN0LnByb3RvGh9nb29nbGUvcHJvdG9idWYvdGltZXN0YW1w",
-            "LnByb3RvGh5nb29nbGUvcHJvdG9idWYvd3JhcHBlcnMucHJvdG8isUUKElRl",
-            "c3RBbGxUeXBlc1Byb3RvMxIWCg5vcHRpb25hbF9pbnQzMhgBIAEoBRIWCg5v",
-            "cHRpb25hbF9pbnQ2NBgCIAEoAxIXCg9vcHRpb25hbF91aW50MzIYAyABKA0S",
-            "FwoPb3B0aW9uYWxfdWludDY0GAQgASgEEhcKD29wdGlvbmFsX3NpbnQzMhgF",
-            "IAEoERIXCg9vcHRpb25hbF9zaW50NjQYBiABKBISGAoQb3B0aW9uYWxfZml4",
-            "ZWQzMhgHIAEoBxIYChBvcHRpb25hbF9maXhlZDY0GAggASgGEhkKEW9wdGlv",
-            "bmFsX3NmaXhlZDMyGAkgASgPEhkKEW9wdGlvbmFsX3NmaXhlZDY0GAogASgQ",
-            "EhYKDm9wdGlvbmFsX2Zsb2F0GAsgASgCEhcKD29wdGlvbmFsX2RvdWJsZRgM",
-            "IAEoARIVCg1vcHRpb25hbF9ib29sGA0gASgIEhcKD29wdGlvbmFsX3N0cmlu",
-            "ZxgOIAEoCRIWCg5vcHRpb25hbF9ieXRlcxgPIAEoDBJgChdvcHRpb25hbF9u",
-            "ZXN0ZWRfbWVzc2FnZRgSIAEoCzI/LnByb3RvYnVmX3Rlc3RfbWVzc2FnZXMu",
-            "cHJvdG8zLlRlc3RBbGxUeXBlc1Byb3RvMy5OZXN0ZWRNZXNzYWdlEk8KGG9w",
-            "dGlvbmFsX2ZvcmVpZ25fbWVzc2FnZRgTIAEoCzItLnByb3RvYnVmX3Rlc3Rf",
-            "bWVzc2FnZXMucHJvdG8zLkZvcmVpZ25NZXNzYWdlEloKFG9wdGlvbmFsX25l",
-            "c3RlZF9lbnVtGBUgASgOMjwucHJvdG9idWZfdGVzdF9tZXNzYWdlcy5wcm90",
-            "bzMuVGVzdEFsbFR5cGVzUHJvdG8zLk5lc3RlZEVudW0SSQoVb3B0aW9uYWxf",
-            "Zm9yZWlnbl9lbnVtGBYgASgOMioucHJvdG9idWZfdGVzdF9tZXNzYWdlcy5w",
-            "cm90bzMuRm9yZWlnbkVudW0SXAoVb3B0aW9uYWxfYWxpYXNlZF9lbnVtGBcg",
-            "ASgOMj0ucHJvdG9idWZfdGVzdF9tZXNzYWdlcy5wcm90bzMuVGVzdEFsbFR5",
-            "cGVzUHJvdG8zLkFsaWFzZWRFbnVtEiEKFW9wdGlvbmFsX3N0cmluZ19waWVj",
-            "ZRgYIAEoCUICCAISGQoNb3B0aW9uYWxfY29yZBgZIAEoCUICCAESTAoRcmVj",
-            "dXJzaXZlX21lc3NhZ2UYGyABKAsyMS5wcm90b2J1Zl90ZXN0X21lc3NhZ2Vz",
-            "LnByb3RvMy5UZXN0QWxsVHlwZXNQcm90bzMSFgoOcmVwZWF0ZWRfaW50MzIY",
-            "HyADKAUSFgoOcmVwZWF0ZWRfaW50NjQYICADKAMSFwoPcmVwZWF0ZWRfdWlu",
-            "dDMyGCEgAygNEhcKD3JlcGVhdGVkX3VpbnQ2NBgiIAMoBBIXCg9yZXBlYXRl",
-            "ZF9zaW50MzIYIyADKBESFwoPcmVwZWF0ZWRfc2ludDY0GCQgAygSEhgKEHJl",
-            "cGVhdGVkX2ZpeGVkMzIYJSADKAcSGAoQcmVwZWF0ZWRfZml4ZWQ2NBgmIAMo",
-            "BhIZChFyZXBlYXRlZF9zZml4ZWQzMhgnIAMoDxIZChFyZXBlYXRlZF9zZml4",
-            "ZWQ2NBgoIAMoEBIWCg5yZXBlYXRlZF9mbG9hdBgpIAMoAhIXCg9yZXBlYXRl",
-            "ZF9kb3VibGUYKiADKAESFQoNcmVwZWF0ZWRfYm9vbBgrIAMoCBIXCg9yZXBl",
-            "YXRlZF9zdHJpbmcYLCADKAkSFgoOcmVwZWF0ZWRfYnl0ZXMYLSADKAwSYAoX",
-            "cmVwZWF0ZWRfbmVzdGVkX21lc3NhZ2UYMCADKAsyPy5wcm90b2J1Zl90ZXN0",
-            "X21lc3NhZ2VzLnByb3RvMy5UZXN0QWxsVHlwZXNQcm90bzMuTmVzdGVkTWVz",
-            "c2FnZRJPChhyZXBlYXRlZF9mb3JlaWduX21lc3NhZ2UYMSADKAsyLS5wcm90",
-            "b2J1Zl90ZXN0X21lc3NhZ2VzLnByb3RvMy5Gb3JlaWduTWVzc2FnZRJaChRy",
-            "ZXBlYXRlZF9uZXN0ZWRfZW51bRgzIAMoDjI8LnByb3RvYnVmX3Rlc3RfbWVz",
-            "c2FnZXMucHJvdG8zLlRlc3RBbGxUeXBlc1Byb3RvMy5OZXN0ZWRFbnVtEkkK",
-            "FXJlcGVhdGVkX2ZvcmVpZ25fZW51bRg0IAMoDjIqLnByb3RvYnVmX3Rlc3Rf",
-            "bWVzc2FnZXMucHJvdG8zLkZvcmVpZ25FbnVtEiEKFXJlcGVhdGVkX3N0cmlu",
-            "Z19waWVjZRg2IAMoCUICCAISGQoNcmVwZWF0ZWRfY29yZBg3IAMoCUICCAES",
-            "GAoMcGFja2VkX2ludDMyGEsgAygFQgIQARIYCgxwYWNrZWRfaW50NjQYTCAD",
-            "KANCAhABEhkKDXBhY2tlZF91aW50MzIYTSADKA1CAhABEhkKDXBhY2tlZF91",
-            "aW50NjQYTiADKARCAhABEhkKDXBhY2tlZF9zaW50MzIYTyADKBFCAhABEhkK",
-            "DXBhY2tlZF9zaW50NjQYUCADKBJCAhABEhoKDnBhY2tlZF9maXhlZDMyGFEg",
-            "AygHQgIQARIaCg5wYWNrZWRfZml4ZWQ2NBhSIAMoBkICEAESGwoPcGFja2Vk",
-            "X3NmaXhlZDMyGFMgAygPQgIQARIbCg9wYWNrZWRfc2ZpeGVkNjQYVCADKBBC",
-            "AhABEhgKDHBhY2tlZF9mbG9hdBhVIAMoAkICEAESGQoNcGFja2VkX2RvdWJs",
-            "ZRhWIAMoAUICEAESFwoLcGFja2VkX2Jvb2wYVyADKAhCAhABElwKEnBhY2tl",
-            "ZF9uZXN0ZWRfZW51bRhYIAMoDjI8LnByb3RvYnVmX3Rlc3RfbWVzc2FnZXMu",
-            "cHJvdG8zLlRlc3RBbGxUeXBlc1Byb3RvMy5OZXN0ZWRFbnVtQgIQARIaCg51",
-            "bnBhY2tlZF9pbnQzMhhZIAMoBUICEAASGgoOdW5wYWNrZWRfaW50NjQYWiAD",
-            "KANCAhAAEhsKD3VucGFja2VkX3VpbnQzMhhbIAMoDUICEAASGwoPdW5wYWNr",
-            "ZWRfdWludDY0GFwgAygEQgIQABIbCg91bnBhY2tlZF9zaW50MzIYXSADKBFC",
-            "AhAAEhsKD3VucGFja2VkX3NpbnQ2NBheIAMoEkICEAASHAoQdW5wYWNrZWRf",
-            "Zml4ZWQzMhhfIAMoB0ICEAASHAoQdW5wYWNrZWRfZml4ZWQ2NBhgIAMoBkIC",
-            "EAASHQoRdW5wYWNrZWRfc2ZpeGVkMzIYYSADKA9CAhAAEh0KEXVucGFja2Vk",
-            "X3NmaXhlZDY0GGIgAygQQgIQABIaCg51bnBhY2tlZF9mbG9hdBhjIAMoAkIC",
-            "EAASGwoPdW5wYWNrZWRfZG91YmxlGGQgAygBQgIQABIZCg11bnBhY2tlZF9i",
-            "b29sGGUgAygIQgIQABJeChR1bnBhY2tlZF9uZXN0ZWRfZW51bRhmIAMoDjI8",
-            "LnByb3RvYnVmX3Rlc3RfbWVzc2FnZXMucHJvdG8zLlRlc3RBbGxUeXBlc1By",
-            "b3RvMy5OZXN0ZWRFbnVtQgIQABJdCg9tYXBfaW50MzJfaW50MzIYOCADKAsy",
-            "RC5wcm90b2J1Zl90ZXN0X21lc3NhZ2VzLnByb3RvMy5UZXN0QWxsVHlwZXNQ",
-            "cm90bzMuTWFwSW50MzJJbnQzMkVudHJ5El0KD21hcF9pbnQ2NF9pbnQ2NBg5",
-            "IAMoCzJELnByb3RvYnVmX3Rlc3RfbWVzc2FnZXMucHJvdG8zLlRlc3RBbGxU",
-            "eXBlc1Byb3RvMy5NYXBJbnQ2NEludDY0RW50cnkSYQoRbWFwX3VpbnQzMl91",
-            "aW50MzIYOiADKAsyRi5wcm90b2J1Zl90ZXN0X21lc3NhZ2VzLnByb3RvMy5U",
-            "ZXN0QWxsVHlwZXNQcm90bzMuTWFwVWludDMyVWludDMyRW50cnkSYQoRbWFw",
-            "X3VpbnQ2NF91aW50NjQYOyADKAsyRi5wcm90b2J1Zl90ZXN0X21lc3NhZ2Vz",
-            "LnByb3RvMy5UZXN0QWxsVHlwZXNQcm90bzMuTWFwVWludDY0VWludDY0RW50",
-            "cnkSYQoRbWFwX3NpbnQzMl9zaW50MzIYPCADKAsyRi5wcm90b2J1Zl90ZXN0",
-            "X21lc3NhZ2VzLnByb3RvMy5UZXN0QWxsVHlwZXNQcm90bzMuTWFwU2ludDMy",
-            "U2ludDMyRW50cnkSYQoRbWFwX3NpbnQ2NF9zaW50NjQYPSADKAsyRi5wcm90",
-            "b2J1Zl90ZXN0X21lc3NhZ2VzLnByb3RvMy5UZXN0QWxsVHlwZXNQcm90bzMu",
-            "TWFwU2ludDY0U2ludDY0RW50cnkSZQoTbWFwX2ZpeGVkMzJfZml4ZWQzMhg+",
-            "IAMoCzJILnByb3RvYnVmX3Rlc3RfbWVzc2FnZXMucHJvdG8zLlRlc3RBbGxU",
-            "eXBlc1Byb3RvMy5NYXBGaXhlZDMyRml4ZWQzMkVudHJ5EmUKE21hcF9maXhl",
-            "ZDY0X2ZpeGVkNjQYPyADKAsySC5wcm90b2J1Zl90ZXN0X21lc3NhZ2VzLnBy",
-            "b3RvMy5UZXN0QWxsVHlwZXNQcm90bzMuTWFwRml4ZWQ2NEZpeGVkNjRFbnRy",
-            "eRJpChVtYXBfc2ZpeGVkMzJfc2ZpeGVkMzIYQCADKAsySi5wcm90b2J1Zl90",
-            "ZXN0X21lc3NhZ2VzLnByb3RvMy5UZXN0QWxsVHlwZXNQcm90bzMuTWFwU2Zp",
-            "eGVkMzJTZml4ZWQzMkVudHJ5EmkKFW1hcF9zZml4ZWQ2NF9zZml4ZWQ2NBhB",
-            "IAMoCzJKLnByb3RvYnVmX3Rlc3RfbWVzc2FnZXMucHJvdG8zLlRlc3RBbGxU",
-            "eXBlc1Byb3RvMy5NYXBTZml4ZWQ2NFNmaXhlZDY0RW50cnkSXQoPbWFwX2lu",
-            "dDMyX2Zsb2F0GEIgAygLMkQucHJvdG9idWZfdGVzdF9tZXNzYWdlcy5wcm90",
-            "bzMuVGVzdEFsbFR5cGVzUHJvdG8zLk1hcEludDMyRmxvYXRFbnRyeRJfChBt",
-            "YXBfaW50MzJfZG91YmxlGEMgAygLMkUucHJvdG9idWZfdGVzdF9tZXNzYWdl",
-            "cy5wcm90bzMuVGVzdEFsbFR5cGVzUHJvdG8zLk1hcEludDMyRG91YmxlRW50",
-            "cnkSWQoNbWFwX2Jvb2xfYm9vbBhEIAMoCzJCLnByb3RvYnVmX3Rlc3RfbWVz",
-            "c2FnZXMucHJvdG8zLlRlc3RBbGxUeXBlc1Byb3RvMy5NYXBCb29sQm9vbEVu",
-            "dHJ5EmEKEW1hcF9zdHJpbmdfc3RyaW5nGEUgAygLMkYucHJvdG9idWZfdGVz",
-            "dF9tZXNzYWdlcy5wcm90bzMuVGVzdEFsbFR5cGVzUHJvdG8zLk1hcFN0cmlu",
-            "Z1N0cmluZ0VudHJ5El8KEG1hcF9zdHJpbmdfYnl0ZXMYRiADKAsyRS5wcm90",
-            "b2J1Zl90ZXN0X21lc3NhZ2VzLnByb3RvMy5UZXN0QWxsVHlwZXNQcm90bzMu",
-            "TWFwU3RyaW5nQnl0ZXNFbnRyeRJwChltYXBfc3RyaW5nX25lc3RlZF9tZXNz",
-            "YWdlGEcgAygLMk0ucHJvdG9idWZfdGVzdF9tZXNzYWdlcy5wcm90bzMuVGVz",
-            "dEFsbFR5cGVzUHJvdG8zLk1hcFN0cmluZ05lc3RlZE1lc3NhZ2VFbnRyeRJy",
-            "ChptYXBfc3RyaW5nX2ZvcmVpZ25fbWVzc2FnZRhIIAMoCzJOLnByb3RvYnVm",
-            "X3Rlc3RfbWVzc2FnZXMucHJvdG8zLlRlc3RBbGxUeXBlc1Byb3RvMy5NYXBT",
-            "dHJpbmdGb3JlaWduTWVzc2FnZUVudHJ5EmoKFm1hcF9zdHJpbmdfbmVzdGVk",
-            "X2VudW0YSSADKAsySi5wcm90b2J1Zl90ZXN0X21lc3NhZ2VzLnByb3RvMy5U",
-            "ZXN0QWxsVHlwZXNQcm90bzMuTWFwU3RyaW5nTmVzdGVkRW51bUVudHJ5EmwK",
-            "F21hcF9zdHJpbmdfZm9yZWlnbl9lbnVtGEogAygLMksucHJvdG9idWZfdGVz",
-            "dF9tZXNzYWdlcy5wcm90bzMuVGVzdEFsbFR5cGVzUHJvdG8zLk1hcFN0cmlu",
-            "Z0ZvcmVpZ25FbnVtRW50cnkSFgoMb25lb2ZfdWludDMyGG8gASgNSAASXwoU",
-            "b25lb2ZfbmVzdGVkX21lc3NhZ2UYcCABKAsyPy5wcm90b2J1Zl90ZXN0X21l",
-            "c3NhZ2VzLnByb3RvMy5UZXN0QWxsVHlwZXNQcm90bzMuTmVzdGVkTWVzc2Fn",
-            "ZUgAEhYKDG9uZW9mX3N0cmluZxhxIAEoCUgAEhUKC29uZW9mX2J5dGVzGHIg",
-            "ASgMSAASFAoKb25lb2ZfYm9vbBhzIAEoCEgAEhYKDG9uZW9mX3VpbnQ2NBh0",
-            "IAEoBEgAEhUKC29uZW9mX2Zsb2F0GHUgASgCSAASFgoMb25lb2ZfZG91Ymxl",
-            "GHYgASgBSAASUgoKb25lb2ZfZW51bRh3IAEoDjI8LnByb3RvYnVmX3Rlc3Rf",
-            "bWVzc2FnZXMucHJvdG8zLlRlc3RBbGxUeXBlc1Byb3RvMy5OZXN0ZWRFbnVt",
-            "SAASNgoQb25lb2ZfbnVsbF92YWx1ZRh4IAEoDjIaLmdvb2dsZS5wcm90b2J1",
-            "Zi5OdWxsVmFsdWVIABI6ChVvcHRpb25hbF9ib29sX3dyYXBwZXIYyQEgASgL",
-            "MhouZ29vZ2xlLnByb3RvYnVmLkJvb2xWYWx1ZRI8ChZvcHRpb25hbF9pbnQz",
-            "Ml93cmFwcGVyGMoBIAEoCzIbLmdvb2dsZS5wcm90b2J1Zi5JbnQzMlZhbHVl",
-            "EjwKFm9wdGlvbmFsX2ludDY0X3dyYXBwZXIYywEgASgLMhsuZ29vZ2xlLnBy",
-            "b3RvYnVmLkludDY0VmFsdWUSPgoXb3B0aW9uYWxfdWludDMyX3dyYXBwZXIY",
-            "zAEgASgLMhwuZ29vZ2xlLnByb3RvYnVmLlVJbnQzMlZhbHVlEj4KF29wdGlv",
-            "bmFsX3VpbnQ2NF93cmFwcGVyGM0BIAEoCzIcLmdvb2dsZS5wcm90b2J1Zi5V",
-            "SW50NjRWYWx1ZRI8ChZvcHRpb25hbF9mbG9hdF93cmFwcGVyGM4BIAEoCzIb",
-            "Lmdvb2dsZS5wcm90b2J1Zi5GbG9hdFZhbHVlEj4KF29wdGlvbmFsX2RvdWJs",
-            "ZV93cmFwcGVyGM8BIAEoCzIcLmdvb2dsZS5wcm90b2J1Zi5Eb3VibGVWYWx1",
-            "ZRI+ChdvcHRpb25hbF9zdHJpbmdfd3JhcHBlchjQASABKAsyHC5nb29nbGUu",
-            "cHJvdG9idWYuU3RyaW5nVmFsdWUSPAoWb3B0aW9uYWxfYnl0ZXNfd3JhcHBl",
-            "chjRASABKAsyGy5nb29nbGUucHJvdG9idWYuQnl0ZXNWYWx1ZRI6ChVyZXBl",
-            "YXRlZF9ib29sX3dyYXBwZXIY0wEgAygLMhouZ29vZ2xlLnByb3RvYnVmLkJv",
-            "b2xWYWx1ZRI8ChZyZXBlYXRlZF9pbnQzMl93cmFwcGVyGNQBIAMoCzIbLmdv",
-            "b2dsZS5wcm90b2J1Zi5JbnQzMlZhbHVlEjwKFnJlcGVhdGVkX2ludDY0X3dy",
-            "YXBwZXIY1QEgAygLMhsuZ29vZ2xlLnByb3RvYnVmLkludDY0VmFsdWUSPgoX",
-            "cmVwZWF0ZWRfdWludDMyX3dyYXBwZXIY1gEgAygLMhwuZ29vZ2xlLnByb3Rv",
-            "YnVmLlVJbnQzMlZhbHVlEj4KF3JlcGVhdGVkX3VpbnQ2NF93cmFwcGVyGNcB",
-            "IAMoCzIcLmdvb2dsZS5wcm90b2J1Zi5VSW50NjRWYWx1ZRI8ChZyZXBlYXRl",
-            "ZF9mbG9hdF93cmFwcGVyGNgBIAMoCzIbLmdvb2dsZS5wcm90b2J1Zi5GbG9h",
-            "dFZhbHVlEj4KF3JlcGVhdGVkX2RvdWJsZV93cmFwcGVyGNkBIAMoCzIcLmdv",
-            "b2dsZS5wcm90b2J1Zi5Eb3VibGVWYWx1ZRI+ChdyZXBlYXRlZF9zdHJpbmdf",
-            "d3JhcHBlchjaASADKAsyHC5nb29nbGUucHJvdG9idWYuU3RyaW5nVmFsdWUS",
-            "PAoWcmVwZWF0ZWRfYnl0ZXNfd3JhcHBlchjbASADKAsyGy5nb29nbGUucHJv",
-            "dG9idWYuQnl0ZXNWYWx1ZRI1ChFvcHRpb25hbF9kdXJhdGlvbhitAiABKAsy",
-            "GS5nb29nbGUucHJvdG9idWYuRHVyYXRpb24SNwoSb3B0aW9uYWxfdGltZXN0",
-            "YW1wGK4CIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXASOAoTb3B0",
-            "aW9uYWxfZmllbGRfbWFzaxivAiABKAsyGi5nb29nbGUucHJvdG9idWYuRmll",
-            "bGRNYXNrEjEKD29wdGlvbmFsX3N0cnVjdBiwAiABKAsyFy5nb29nbGUucHJv",
-            "dG9idWYuU3RydWN0EisKDG9wdGlvbmFsX2FueRixAiABKAsyFC5nb29nbGUu",
-            "cHJvdG9idWYuQW55Ei8KDm9wdGlvbmFsX3ZhbHVlGLICIAEoCzIWLmdvb2ds",
-            "ZS5wcm90b2J1Zi5WYWx1ZRI4ChNvcHRpb25hbF9udWxsX3ZhbHVlGLMCIAEo",
-            "DjIaLmdvb2dsZS5wcm90b2J1Zi5OdWxsVmFsdWUSNQoRcmVwZWF0ZWRfZHVy",
-            "YXRpb24YtwIgAygLMhkuZ29vZ2xlLnByb3RvYnVmLkR1cmF0aW9uEjcKEnJl",
-            "cGVhdGVkX3RpbWVzdGFtcBi4AiADKAsyGi5nb29nbGUucHJvdG9idWYuVGlt",
-            "ZXN0YW1wEjcKEnJlcGVhdGVkX2ZpZWxkbWFzaxi5AiADKAsyGi5nb29nbGUu",
-            "cHJvdG9idWYuRmllbGRNYXNrEjEKD3JlcGVhdGVkX3N0cnVjdBjEAiADKAsy",
-            "Fy5nb29nbGUucHJvdG9idWYuU3RydWN0EisKDHJlcGVhdGVkX2FueRi7AiAD",
-            "KAsyFC5nb29nbGUucHJvdG9idWYuQW55Ei8KDnJlcGVhdGVkX3ZhbHVlGLwC",
-            "IAMoCzIWLmdvb2dsZS5wcm90b2J1Zi5WYWx1ZRI4ChNyZXBlYXRlZF9saXN0",
-            "X3ZhbHVlGL0CIAMoCzIaLmdvb2dsZS5wcm90b2J1Zi5MaXN0VmFsdWUSEwoK",
-            "ZmllbGRuYW1lMRiRAyABKAUSFAoLZmllbGRfbmFtZTIYkgMgASgFEhUKDF9m",
-            "aWVsZF9uYW1lMxiTAyABKAUSFgoNZmllbGRfX25hbWU0XxiUAyABKAUSFAoL",
-            "ZmllbGQwbmFtZTUYlQMgASgFEhYKDWZpZWxkXzBfbmFtZTYYlgMgASgFEhMK",
-            "CmZpZWxkTmFtZTcYlwMgASgFEhMKCkZpZWxkTmFtZTgYmAMgASgFEhQKC2Zp",
-            "ZWxkX05hbWU5GJkDIAEoBRIVCgxGaWVsZF9OYW1lMTAYmgMgASgFEhUKDEZJ",
-            "RUxEX05BTUUxMRibAyABKAUSFQoMRklFTERfbmFtZTEyGJwDIAEoBRIXCg5f",
-            "X2ZpZWxkX25hbWUxMxidAyABKAUSFwoOX19GaWVsZF9uYW1lMTQYngMgASgF",
-            "EhYKDWZpZWxkX19uYW1lMTUYnwMgASgFEhYKDWZpZWxkX19OYW1lMTYYoAMg",
-            "ASgFEhcKDmZpZWxkX25hbWUxN19fGKEDIAEoBRIXCg5GaWVsZF9uYW1lMThf",
-            "XxiiAyABKAUaYgoNTmVzdGVkTWVzc2FnZRIJCgFhGAEgASgFEkYKC2NvcmVj",
-            "dXJzaXZlGAIgASgLMjEucHJvdG9idWZfdGVzdF9tZXNzYWdlcy5wcm90bzMu",
-            "VGVzdEFsbFR5cGVzUHJvdG8zGjQKEk1hcEludDMySW50MzJFbnRyeRILCgNr",
-            "ZXkYASABKAUSDQoFdmFsdWUYAiABKAU6AjgBGjQKEk1hcEludDY0SW50NjRF",
-            "bnRyeRILCgNrZXkYASABKAMSDQoFdmFsdWUYAiABKAM6AjgBGjYKFE1hcFVp",
-            "bnQzMlVpbnQzMkVudHJ5EgsKA2tleRgBIAEoDRINCgV2YWx1ZRgCIAEoDToC",
-            "OAEaNgoUTWFwVWludDY0VWludDY0RW50cnkSCwoDa2V5GAEgASgEEg0KBXZh",
-            "bHVlGAIgASgEOgI4ARo2ChRNYXBTaW50MzJTaW50MzJFbnRyeRILCgNrZXkY",
-            "ASABKBESDQoFdmFsdWUYAiABKBE6AjgBGjYKFE1hcFNpbnQ2NFNpbnQ2NEVu",
-            "dHJ5EgsKA2tleRgBIAEoEhINCgV2YWx1ZRgCIAEoEjoCOAEaOAoWTWFwRml4",
-            "ZWQzMkZpeGVkMzJFbnRyeRILCgNrZXkYASABKAcSDQoFdmFsdWUYAiABKAc6",
-            "AjgBGjgKFk1hcEZpeGVkNjRGaXhlZDY0RW50cnkSCwoDa2V5GAEgASgGEg0K",
-            "BXZhbHVlGAIgASgGOgI4ARo6ChhNYXBTZml4ZWQzMlNmaXhlZDMyRW50cnkS",
-            "CwoDa2V5GAEgASgPEg0KBXZhbHVlGAIgASgPOgI4ARo6ChhNYXBTZml4ZWQ2",
-            "NFNmaXhlZDY0RW50cnkSCwoDa2V5GAEgASgQEg0KBXZhbHVlGAIgASgQOgI4",
-            "ARo0ChJNYXBJbnQzMkZsb2F0RW50cnkSCwoDa2V5GAEgASgFEg0KBXZhbHVl",
-            "GAIgASgCOgI4ARo1ChNNYXBJbnQzMkRvdWJsZUVudHJ5EgsKA2tleRgBIAEo",
-            "BRINCgV2YWx1ZRgCIAEoAToCOAEaMgoQTWFwQm9vbEJvb2xFbnRyeRILCgNr",
-            "ZXkYASABKAgSDQoFdmFsdWUYAiABKAg6AjgBGjYKFE1hcFN0cmluZ1N0cmlu",
-            "Z0VudHJ5EgsKA2tleRgBIAEoCRINCgV2YWx1ZRgCIAEoCToCOAEaNQoTTWFw",
-            "U3RyaW5nQnl0ZXNFbnRyeRILCgNrZXkYASABKAkSDQoFdmFsdWUYAiABKAw6",
-            "AjgBGn4KG01hcFN0cmluZ05lc3RlZE1lc3NhZ2VFbnRyeRILCgNrZXkYASAB",
-            "KAkSTgoFdmFsdWUYAiABKAsyPy5wcm90b2J1Zl90ZXN0X21lc3NhZ2VzLnBy",
-            "b3RvMy5UZXN0QWxsVHlwZXNQcm90bzMuTmVzdGVkTWVzc2FnZToCOAEabQoc",
-            "TWFwU3RyaW5nRm9yZWlnbk1lc3NhZ2VFbnRyeRILCgNrZXkYASABKAkSPAoF",
-            "dmFsdWUYAiABKAsyLS5wcm90b2J1Zl90ZXN0X21lc3NhZ2VzLnByb3RvMy5G",
-            "b3JlaWduTWVzc2FnZToCOAEaeAoYTWFwU3RyaW5nTmVzdGVkRW51bUVudHJ5",
-            "EgsKA2tleRgBIAEoCRJLCgV2YWx1ZRgCIAEoDjI8LnByb3RvYnVmX3Rlc3Rf",
-            "bWVzc2FnZXMucHJvdG8zLlRlc3RBbGxUeXBlc1Byb3RvMy5OZXN0ZWRFbnVt",
-            "OgI4ARpnChlNYXBTdHJpbmdGb3JlaWduRW51bUVudHJ5EgsKA2tleRgBIAEo",
-            "CRI5CgV2YWx1ZRgCIAEoDjIqLnByb3RvYnVmX3Rlc3RfbWVzc2FnZXMucHJv",
-            "dG8zLkZvcmVpZ25FbnVtOgI4ASI5CgpOZXN0ZWRFbnVtEgcKA0ZPTxAAEgcK",
-            "A0JBUhABEgcKA0JBWhACEhAKA05FRxD///////////8BIlkKC0FsaWFzZWRF",
-            "bnVtEg0KCUFMSUFTX0ZPTxAAEg0KCUFMSUFTX0JBUhABEg0KCUFMSUFTX0JB",
-            "WhACEgcKA01PTxACEgcKA21vbxACEgcKA2JBehACGgIQAUINCgtvbmVvZl9m",
-            "aWVsZEoGCPUDEP8DIhsKDkZvcmVpZ25NZXNzYWdlEgkKAWMYASABKAUiFgoU",
-            "TnVsbEh5cG90aGVzaXNQcm90bzMiLwoORW51bU9ubHlQcm90bzMiHQoEQm9v",
-            "bBIKCgZrRmFsc2UQABIJCgVrVHJ1ZRABKkAKC0ZvcmVpZ25FbnVtEg8KC0ZP",
-            "UkVJR05fRk9PEAASDwoLRk9SRUlHTl9CQVIQARIPCgtGT1JFSUdOX0JBWhAC",
-            "QjgKKGNvbS5nb29nbGUucHJvdG9idWZfdGVzdF9tZXNzYWdlcy5wcm90bzNI",
-            "AfgBAaICBlByb3RvM2IGcHJvdG8z"));
-      descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-          new pbr::FileDescriptor[] { global::Google.Protobuf.WellKnownTypes.AnyReflection.Descriptor, global::Google.Protobuf.WellKnownTypes.DurationReflection.Descriptor, global::Google.Protobuf.WellKnownTypes.FieldMaskReflection.Descriptor, global::Google.Protobuf.WellKnownTypes.StructReflection.Descriptor, global::Google.Protobuf.WellKnownTypes.TimestampReflection.Descriptor, global::Google.Protobuf.WellKnownTypes.WrappersReflection.Descriptor, },
-          new pbr::GeneratedClrTypeInfo(new[] {typeof(global::ProtobufTestMessages.Proto3.ForeignEnum), }, null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::ProtobufTestMessages.Proto3.TestAllTypesProto3), global::ProtobufTestMessages.Proto3.TestAllTypesProto3.Parser, new[]{ "OptionalInt32", "OptionalInt64", "OptionalUint32", "OptionalUint64", "OptionalSint32", "OptionalSint64", "OptionalFixed32", "OptionalFixed64", "OptionalSfixed32", "OptionalSfixed64", "OptionalFloat", "OptionalDouble", "OptionalBool", "OptionalString", "OptionalBytes", "OptionalNestedMessage", "OptionalForeignMessage", "OptionalNestedEnum", "OptionalForeignEnum", "OptionalAliasedEnum", "OptionalStringPiece", "OptionalCord", "RecursiveMessage", "RepeatedInt32", "RepeatedInt64", "RepeatedUint32", "RepeatedUint64", "RepeatedSint32", "RepeatedSint64", "RepeatedFixed32", "RepeatedFixed64", "RepeatedSfixed32", "RepeatedSfixed64", "RepeatedFloat", "RepeatedDouble", "RepeatedBool", "RepeatedString", "RepeatedBytes", "RepeatedNestedMessage", "RepeatedForeignMessage", "RepeatedNestedEnum", "RepeatedForeignEnum", "RepeatedStringPiece", "RepeatedCord", "PackedInt32", "PackedInt64", "PackedUint32", "PackedUint64", "PackedSint32", "PackedSint64", "PackedFixed32", "PackedFixed64", "PackedSfixed32", "PackedSfixed64", "PackedFloat", "PackedDouble", "PackedBool", "PackedNestedEnum", "UnpackedInt32", "UnpackedInt64", "UnpackedUint32", "UnpackedUint64", "UnpackedSint32", "UnpackedSint64", "UnpackedFixed32", "UnpackedFixed64", "UnpackedSfixed32", "UnpackedSfixed64", "UnpackedFloat", "UnpackedDouble", "UnpackedBool", "UnpackedNestedEnum", "MapInt32Int32", "MapInt64Int64", "MapUint32Uint32", "MapUint64Uint64", "MapSint32Sint32", "MapSint64Sint64", "MapFixed32Fixed32", "MapFixed64Fixed64", "MapSfixed32Sfixed32", "MapSfixed64Sfixed64", "MapInt32Float", "MapInt32Double", "MapBoolBool", "MapStringString", "MapStringBytes", "MapStringNestedMessage", "MapStringForeignMessage", "MapStringNestedEnum", "MapStringForeignEnum", "OneofUint32", "OneofNestedMessage", "OneofString", "OneofBytes", "OneofBool", "OneofUint64", "OneofFloat", "OneofDouble", "OneofEnum", "OneofNullValue", "OptionalBoolWrapper", "OptionalInt32Wrapper", "OptionalInt64Wrapper", "OptionalUint32Wrapper", "OptionalUint64Wrapper", "OptionalFloatWrapper", "OptionalDoubleWrapper", "OptionalStringWrapper", "OptionalBytesWrapper", "RepeatedBoolWrapper", "RepeatedInt32Wrapper", "RepeatedInt64Wrapper", "RepeatedUint32Wrapper", "RepeatedUint64Wrapper", "RepeatedFloatWrapper", "RepeatedDoubleWrapper", "RepeatedStringWrapper", "RepeatedBytesWrapper", "OptionalDuration", "OptionalTimestamp", "OptionalFieldMask", "OptionalStruct", "OptionalAny", "OptionalValue", "OptionalNullValue", "RepeatedDuration", "RepeatedTimestamp", "RepeatedFieldmask", "RepeatedStruct", "RepeatedAny", "RepeatedValue", "RepeatedListValue", "Fieldname1", "FieldName2", "FieldName3", "FieldName4", "Field0Name5", "Field0Name6", "FieldName7", "FieldName8", "FieldName9", "FieldName10", "FIELDNAME11", "FIELDName12", "FieldName13", "FieldName14", "FieldName15", "FieldName16", "FieldName17", "FieldName18" }, new[]{ "OneofField" }, new[]{ typeof(global::ProtobufTestMessages.Proto3.TestAllTypesProto3.Types.NestedEnum), typeof(global::ProtobufTestMessages.Proto3.TestAllTypesProto3.Types.AliasedEnum) }, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::ProtobufTestMessages.Proto3.TestAllTypesProto3.Types.NestedMessage), global::ProtobufTestMessages.Proto3.TestAllTypesProto3.Types.NestedMessage.Parser, new[]{ "A", "Corecursive" }, null, null, null, null),
-            null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, }),
-            new pbr::GeneratedClrTypeInfo(typeof(global::ProtobufTestMessages.Proto3.ForeignMessage), global::ProtobufTestMessages.Proto3.ForeignMessage.Parser, new[]{ "C" }, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::ProtobufTestMessages.Proto3.NullHypothesisProto3), global::ProtobufTestMessages.Proto3.NullHypothesisProto3.Parser, null, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::ProtobufTestMessages.Proto3.EnumOnlyProto3), global::ProtobufTestMessages.Proto3.EnumOnlyProto3.Parser, null, null, new[]{ typeof(global::ProtobufTestMessages.Proto3.EnumOnlyProto3.Types.Bool) }, null, null)
-          }));
-    }
-    #endregion
-
-  }
-  #region Enums
-  public enum ForeignEnum {
-    [pbr::OriginalName("FOREIGN_FOO")] ForeignFoo = 0,
-    [pbr::OriginalName("FOREIGN_BAR")] ForeignBar = 1,
-    [pbr::OriginalName("FOREIGN_BAZ")] ForeignBaz = 2,
-  }
-
-  #endregion
-
-  #region Messages
-  /// <summary>
-  /// This proto includes every type of field in both singular and repeated
-  /// forms.
-  ///
-  /// Also, crucially, all messages and enums in this file are eventually
-  /// submessages of this message.  So for example, a fuzz test of TestAllTypes
-  /// could trigger bugs that occur in any message type in this file.  We verify
-  /// this stays true in a unit test.
-  /// </summary>
-  public sealed partial class TestAllTypesProto3 : pb::IMessage<TestAllTypesProto3>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<TestAllTypesProto3> _parser = new pb::MessageParser<TestAllTypesProto3>(() => new TestAllTypesProto3());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<TestAllTypesProto3> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::ProtobufTestMessages.Proto3.TestMessagesProto3Reflection.Descriptor.MessageTypes[0]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestAllTypesProto3() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestAllTypesProto3(TestAllTypesProto3 other) : this() {
-      optionalInt32_ = other.optionalInt32_;
-      optionalInt64_ = other.optionalInt64_;
-      optionalUint32_ = other.optionalUint32_;
-      optionalUint64_ = other.optionalUint64_;
-      optionalSint32_ = other.optionalSint32_;
-      optionalSint64_ = other.optionalSint64_;
-      optionalFixed32_ = other.optionalFixed32_;
-      optionalFixed64_ = other.optionalFixed64_;
-      optionalSfixed32_ = other.optionalSfixed32_;
-      optionalSfixed64_ = other.optionalSfixed64_;
-      optionalFloat_ = other.optionalFloat_;
-      optionalDouble_ = other.optionalDouble_;
-      optionalBool_ = other.optionalBool_;
-      optionalString_ = other.optionalString_;
-      optionalBytes_ = other.optionalBytes_;
-      optionalNestedMessage_ = other.optionalNestedMessage_ != null ? other.optionalNestedMessage_.Clone() : null;
-      optionalForeignMessage_ = other.optionalForeignMessage_ != null ? other.optionalForeignMessage_.Clone() : null;
-      optionalNestedEnum_ = other.optionalNestedEnum_;
-      optionalForeignEnum_ = other.optionalForeignEnum_;
-      optionalAliasedEnum_ = other.optionalAliasedEnum_;
-      optionalStringPiece_ = other.optionalStringPiece_;
-      optionalCord_ = other.optionalCord_;
-      recursiveMessage_ = other.recursiveMessage_ != null ? other.recursiveMessage_.Clone() : null;
-      repeatedInt32_ = other.repeatedInt32_.Clone();
-      repeatedInt64_ = other.repeatedInt64_.Clone();
-      repeatedUint32_ = other.repeatedUint32_.Clone();
-      repeatedUint64_ = other.repeatedUint64_.Clone();
-      repeatedSint32_ = other.repeatedSint32_.Clone();
-      repeatedSint64_ = other.repeatedSint64_.Clone();
-      repeatedFixed32_ = other.repeatedFixed32_.Clone();
-      repeatedFixed64_ = other.repeatedFixed64_.Clone();
-      repeatedSfixed32_ = other.repeatedSfixed32_.Clone();
-      repeatedSfixed64_ = other.repeatedSfixed64_.Clone();
-      repeatedFloat_ = other.repeatedFloat_.Clone();
-      repeatedDouble_ = other.repeatedDouble_.Clone();
-      repeatedBool_ = other.repeatedBool_.Clone();
-      repeatedString_ = other.repeatedString_.Clone();
-      repeatedBytes_ = other.repeatedBytes_.Clone();
-      repeatedNestedMessage_ = other.repeatedNestedMessage_.Clone();
-      repeatedForeignMessage_ = other.repeatedForeignMessage_.Clone();
-      repeatedNestedEnum_ = other.repeatedNestedEnum_.Clone();
-      repeatedForeignEnum_ = other.repeatedForeignEnum_.Clone();
-      repeatedStringPiece_ = other.repeatedStringPiece_.Clone();
-      repeatedCord_ = other.repeatedCord_.Clone();
-      packedInt32_ = other.packedInt32_.Clone();
-      packedInt64_ = other.packedInt64_.Clone();
-      packedUint32_ = other.packedUint32_.Clone();
-      packedUint64_ = other.packedUint64_.Clone();
-      packedSint32_ = other.packedSint32_.Clone();
-      packedSint64_ = other.packedSint64_.Clone();
-      packedFixed32_ = other.packedFixed32_.Clone();
-      packedFixed64_ = other.packedFixed64_.Clone();
-      packedSfixed32_ = other.packedSfixed32_.Clone();
-      packedSfixed64_ = other.packedSfixed64_.Clone();
-      packedFloat_ = other.packedFloat_.Clone();
-      packedDouble_ = other.packedDouble_.Clone();
-      packedBool_ = other.packedBool_.Clone();
-      packedNestedEnum_ = other.packedNestedEnum_.Clone();
-      unpackedInt32_ = other.unpackedInt32_.Clone();
-      unpackedInt64_ = other.unpackedInt64_.Clone();
-      unpackedUint32_ = other.unpackedUint32_.Clone();
-      unpackedUint64_ = other.unpackedUint64_.Clone();
-      unpackedSint32_ = other.unpackedSint32_.Clone();
-      unpackedSint64_ = other.unpackedSint64_.Clone();
-      unpackedFixed32_ = other.unpackedFixed32_.Clone();
-      unpackedFixed64_ = other.unpackedFixed64_.Clone();
-      unpackedSfixed32_ = other.unpackedSfixed32_.Clone();
-      unpackedSfixed64_ = other.unpackedSfixed64_.Clone();
-      unpackedFloat_ = other.unpackedFloat_.Clone();
-      unpackedDouble_ = other.unpackedDouble_.Clone();
-      unpackedBool_ = other.unpackedBool_.Clone();
-      unpackedNestedEnum_ = other.unpackedNestedEnum_.Clone();
-      mapInt32Int32_ = other.mapInt32Int32_.Clone();
-      mapInt64Int64_ = other.mapInt64Int64_.Clone();
-      mapUint32Uint32_ = other.mapUint32Uint32_.Clone();
-      mapUint64Uint64_ = other.mapUint64Uint64_.Clone();
-      mapSint32Sint32_ = other.mapSint32Sint32_.Clone();
-      mapSint64Sint64_ = other.mapSint64Sint64_.Clone();
-      mapFixed32Fixed32_ = other.mapFixed32Fixed32_.Clone();
-      mapFixed64Fixed64_ = other.mapFixed64Fixed64_.Clone();
-      mapSfixed32Sfixed32_ = other.mapSfixed32Sfixed32_.Clone();
-      mapSfixed64Sfixed64_ = other.mapSfixed64Sfixed64_.Clone();
-      mapInt32Float_ = other.mapInt32Float_.Clone();
-      mapInt32Double_ = other.mapInt32Double_.Clone();
-      mapBoolBool_ = other.mapBoolBool_.Clone();
-      mapStringString_ = other.mapStringString_.Clone();
-      mapStringBytes_ = other.mapStringBytes_.Clone();
-      mapStringNestedMessage_ = other.mapStringNestedMessage_.Clone();
-      mapStringForeignMessage_ = other.mapStringForeignMessage_.Clone();
-      mapStringNestedEnum_ = other.mapStringNestedEnum_.Clone();
-      mapStringForeignEnum_ = other.mapStringForeignEnum_.Clone();
-      OptionalBoolWrapper = other.OptionalBoolWrapper;
-      OptionalInt32Wrapper = other.OptionalInt32Wrapper;
-      OptionalInt64Wrapper = other.OptionalInt64Wrapper;
-      OptionalUint32Wrapper = other.OptionalUint32Wrapper;
-      OptionalUint64Wrapper = other.OptionalUint64Wrapper;
-      OptionalFloatWrapper = other.OptionalFloatWrapper;
-      OptionalDoubleWrapper = other.OptionalDoubleWrapper;
-      OptionalStringWrapper = other.OptionalStringWrapper;
-      OptionalBytesWrapper = other.OptionalBytesWrapper;
-      repeatedBoolWrapper_ = other.repeatedBoolWrapper_.Clone();
-      repeatedInt32Wrapper_ = other.repeatedInt32Wrapper_.Clone();
-      repeatedInt64Wrapper_ = other.repeatedInt64Wrapper_.Clone();
-      repeatedUint32Wrapper_ = other.repeatedUint32Wrapper_.Clone();
-      repeatedUint64Wrapper_ = other.repeatedUint64Wrapper_.Clone();
-      repeatedFloatWrapper_ = other.repeatedFloatWrapper_.Clone();
-      repeatedDoubleWrapper_ = other.repeatedDoubleWrapper_.Clone();
-      repeatedStringWrapper_ = other.repeatedStringWrapper_.Clone();
-      repeatedBytesWrapper_ = other.repeatedBytesWrapper_.Clone();
-      optionalDuration_ = other.optionalDuration_ != null ? other.optionalDuration_.Clone() : null;
-      optionalTimestamp_ = other.optionalTimestamp_ != null ? other.optionalTimestamp_.Clone() : null;
-      optionalFieldMask_ = other.optionalFieldMask_ != null ? other.optionalFieldMask_.Clone() : null;
-      optionalStruct_ = other.optionalStruct_ != null ? other.optionalStruct_.Clone() : null;
-      optionalAny_ = other.optionalAny_ != null ? other.optionalAny_.Clone() : null;
-      optionalValue_ = other.optionalValue_ != null ? other.optionalValue_.Clone() : null;
-      optionalNullValue_ = other.optionalNullValue_;
-      repeatedDuration_ = other.repeatedDuration_.Clone();
-      repeatedTimestamp_ = other.repeatedTimestamp_.Clone();
-      repeatedFieldmask_ = other.repeatedFieldmask_.Clone();
-      repeatedStruct_ = other.repeatedStruct_.Clone();
-      repeatedAny_ = other.repeatedAny_.Clone();
-      repeatedValue_ = other.repeatedValue_.Clone();
-      repeatedListValue_ = other.repeatedListValue_.Clone();
-      fieldname1_ = other.fieldname1_;
-      fieldName2_ = other.fieldName2_;
-      FieldName3_ = other.FieldName3_;
-      fieldName4_ = other.fieldName4_;
-      field0Name5_ = other.field0Name5_;
-      field0Name6_ = other.field0Name6_;
-      fieldName7_ = other.fieldName7_;
-      fieldName8_ = other.fieldName8_;
-      fieldName9_ = other.fieldName9_;
-      fieldName10_ = other.fieldName10_;
-      fIELDNAME11_ = other.fIELDNAME11_;
-      fIELDName12_ = other.fIELDName12_;
-      FieldName13_ = other.FieldName13_;
-      FieldName14_ = other.FieldName14_;
-      fieldName15_ = other.fieldName15_;
-      fieldName16_ = other.fieldName16_;
-      fieldName17_ = other.fieldName17_;
-      fieldName18_ = other.fieldName18_;
-      switch (other.OneofFieldCase) {
-        case OneofFieldOneofCase.OneofUint32:
-          OneofUint32 = other.OneofUint32;
-          break;
-        case OneofFieldOneofCase.OneofNestedMessage:
-          OneofNestedMessage = other.OneofNestedMessage.Clone();
-          break;
-        case OneofFieldOneofCase.OneofString:
-          OneofString = other.OneofString;
-          break;
-        case OneofFieldOneofCase.OneofBytes:
-          OneofBytes = other.OneofBytes;
-          break;
-        case OneofFieldOneofCase.OneofBool:
-          OneofBool = other.OneofBool;
-          break;
-        case OneofFieldOneofCase.OneofUint64:
-          OneofUint64 = other.OneofUint64;
-          break;
-        case OneofFieldOneofCase.OneofFloat:
-          OneofFloat = other.OneofFloat;
-          break;
-        case OneofFieldOneofCase.OneofDouble:
-          OneofDouble = other.OneofDouble;
-          break;
-        case OneofFieldOneofCase.OneofEnum:
-          OneofEnum = other.OneofEnum;
-          break;
-        case OneofFieldOneofCase.OneofNullValue:
-          OneofNullValue = other.OneofNullValue;
-          break;
-      }
-
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestAllTypesProto3 Clone() {
-      return new TestAllTypesProto3(this);
-    }
-
-    /// <summary>Field number for the "optional_int32" field.</summary>
-    public const int OptionalInt32FieldNumber = 1;
-    private int optionalInt32_;
-    /// <summary>
-    /// Singular
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int OptionalInt32 {
-      get { return optionalInt32_; }
-      set {
-        optionalInt32_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "optional_int64" field.</summary>
-    public const int OptionalInt64FieldNumber = 2;
-    private long optionalInt64_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public long OptionalInt64 {
-      get { return optionalInt64_; }
-      set {
-        optionalInt64_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "optional_uint32" field.</summary>
-    public const int OptionalUint32FieldNumber = 3;
-    private uint optionalUint32_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public uint OptionalUint32 {
-      get { return optionalUint32_; }
-      set {
-        optionalUint32_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "optional_uint64" field.</summary>
-    public const int OptionalUint64FieldNumber = 4;
-    private ulong optionalUint64_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ulong OptionalUint64 {
-      get { return optionalUint64_; }
-      set {
-        optionalUint64_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "optional_sint32" field.</summary>
-    public const int OptionalSint32FieldNumber = 5;
-    private int optionalSint32_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int OptionalSint32 {
-      get { return optionalSint32_; }
-      set {
-        optionalSint32_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "optional_sint64" field.</summary>
-    public const int OptionalSint64FieldNumber = 6;
-    private long optionalSint64_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public long OptionalSint64 {
-      get { return optionalSint64_; }
-      set {
-        optionalSint64_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "optional_fixed32" field.</summary>
-    public const int OptionalFixed32FieldNumber = 7;
-    private uint optionalFixed32_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public uint OptionalFixed32 {
-      get { return optionalFixed32_; }
-      set {
-        optionalFixed32_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "optional_fixed64" field.</summary>
-    public const int OptionalFixed64FieldNumber = 8;
-    private ulong optionalFixed64_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ulong OptionalFixed64 {
-      get { return optionalFixed64_; }
-      set {
-        optionalFixed64_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "optional_sfixed32" field.</summary>
-    public const int OptionalSfixed32FieldNumber = 9;
-    private int optionalSfixed32_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int OptionalSfixed32 {
-      get { return optionalSfixed32_; }
-      set {
-        optionalSfixed32_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "optional_sfixed64" field.</summary>
-    public const int OptionalSfixed64FieldNumber = 10;
-    private long optionalSfixed64_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public long OptionalSfixed64 {
-      get { return optionalSfixed64_; }
-      set {
-        optionalSfixed64_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "optional_float" field.</summary>
-    public const int OptionalFloatFieldNumber = 11;
-    private float optionalFloat_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public float OptionalFloat {
-      get { return optionalFloat_; }
-      set {
-        optionalFloat_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "optional_double" field.</summary>
-    public const int OptionalDoubleFieldNumber = 12;
-    private double optionalDouble_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double OptionalDouble {
-      get { return optionalDouble_; }
-      set {
-        optionalDouble_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "optional_bool" field.</summary>
-    public const int OptionalBoolFieldNumber = 13;
-    private bool optionalBool_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool OptionalBool {
-      get { return optionalBool_; }
-      set {
-        optionalBool_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "optional_string" field.</summary>
-    public const int OptionalStringFieldNumber = 14;
-    private string optionalString_ = "";
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string OptionalString {
-      get { return optionalString_; }
-      set {
-        optionalString_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-
-    /// <summary>Field number for the "optional_bytes" field.</summary>
-    public const int OptionalBytesFieldNumber = 15;
-    private pb::ByteString optionalBytes_ = pb::ByteString.Empty;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pb::ByteString OptionalBytes {
-      get { return optionalBytes_; }
-      set {
-        optionalBytes_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-
-    /// <summary>Field number for the "optional_nested_message" field.</summary>
-    public const int OptionalNestedMessageFieldNumber = 18;
-    private global::ProtobufTestMessages.Proto3.TestAllTypesProto3.Types.NestedMessage optionalNestedMessage_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::ProtobufTestMessages.Proto3.TestAllTypesProto3.Types.NestedMessage OptionalNestedMessage {
-      get { return optionalNestedMessage_; }
-      set {
-        optionalNestedMessage_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "optional_foreign_message" field.</summary>
-    public const int OptionalForeignMessageFieldNumber = 19;
-    private global::ProtobufTestMessages.Proto3.ForeignMessage optionalForeignMessage_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::ProtobufTestMessages.Proto3.ForeignMessage OptionalForeignMessage {
-      get { return optionalForeignMessage_; }
-      set {
-        optionalForeignMessage_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "optional_nested_enum" field.</summary>
-    public const int OptionalNestedEnumFieldNumber = 21;
-    private global::ProtobufTestMessages.Proto3.TestAllTypesProto3.Types.NestedEnum optionalNestedEnum_ = global::ProtobufTestMessages.Proto3.TestAllTypesProto3.Types.NestedEnum.Foo;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::ProtobufTestMessages.Proto3.TestAllTypesProto3.Types.NestedEnum OptionalNestedEnum {
-      get { return optionalNestedEnum_; }
-      set {
-        optionalNestedEnum_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "optional_foreign_enum" field.</summary>
-    public const int OptionalForeignEnumFieldNumber = 22;
-    private global::ProtobufTestMessages.Proto3.ForeignEnum optionalForeignEnum_ = global::ProtobufTestMessages.Proto3.ForeignEnum.ForeignFoo;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::ProtobufTestMessages.Proto3.ForeignEnum OptionalForeignEnum {
-      get { return optionalForeignEnum_; }
-      set {
-        optionalForeignEnum_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "optional_aliased_enum" field.</summary>
-    public const int OptionalAliasedEnumFieldNumber = 23;
-    private global::ProtobufTestMessages.Proto3.TestAllTypesProto3.Types.AliasedEnum optionalAliasedEnum_ = global::ProtobufTestMessages.Proto3.TestAllTypesProto3.Types.AliasedEnum.AliasFoo;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::ProtobufTestMessages.Proto3.TestAllTypesProto3.Types.AliasedEnum OptionalAliasedEnum {
-      get { return optionalAliasedEnum_; }
-      set {
-        optionalAliasedEnum_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "optional_string_piece" field.</summary>
-    public const int OptionalStringPieceFieldNumber = 24;
-    private string optionalStringPiece_ = "";
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string OptionalStringPiece {
-      get { return optionalStringPiece_; }
-      set {
-        optionalStringPiece_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-
-    /// <summary>Field number for the "optional_cord" field.</summary>
-    public const int OptionalCordFieldNumber = 25;
-    private string optionalCord_ = "";
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string OptionalCord {
-      get { return optionalCord_; }
-      set {
-        optionalCord_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-
-    /// <summary>Field number for the "recursive_message" field.</summary>
-    public const int RecursiveMessageFieldNumber = 27;
-    private global::ProtobufTestMessages.Proto3.TestAllTypesProto3 recursiveMessage_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::ProtobufTestMessages.Proto3.TestAllTypesProto3 RecursiveMessage {
-      get { return recursiveMessage_; }
-      set {
-        recursiveMessage_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "repeated_int32" field.</summary>
-    public const int RepeatedInt32FieldNumber = 31;
-    private static readonly pb::FieldCodec<int> _repeated_repeatedInt32_codec
-        = pb::FieldCodec.ForInt32(250);
-    private readonly pbc::RepeatedField<int> repeatedInt32_ = new pbc::RepeatedField<int>();
-    /// <summary>
-    /// Repeated
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<int> RepeatedInt32 {
-      get { return repeatedInt32_; }
-    }
-
-    /// <summary>Field number for the "repeated_int64" field.</summary>
-    public const int RepeatedInt64FieldNumber = 32;
-    private static readonly pb::FieldCodec<long> _repeated_repeatedInt64_codec
-        = pb::FieldCodec.ForInt64(258);
-    private readonly pbc::RepeatedField<long> repeatedInt64_ = new pbc::RepeatedField<long>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<long> RepeatedInt64 {
-      get { return repeatedInt64_; }
-    }
-
-    /// <summary>Field number for the "repeated_uint32" field.</summary>
-    public const int RepeatedUint32FieldNumber = 33;
-    private static readonly pb::FieldCodec<uint> _repeated_repeatedUint32_codec
-        = pb::FieldCodec.ForUInt32(266);
-    private readonly pbc::RepeatedField<uint> repeatedUint32_ = new pbc::RepeatedField<uint>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<uint> RepeatedUint32 {
-      get { return repeatedUint32_; }
-    }
-
-    /// <summary>Field number for the "repeated_uint64" field.</summary>
-    public const int RepeatedUint64FieldNumber = 34;
-    private static readonly pb::FieldCodec<ulong> _repeated_repeatedUint64_codec
-        = pb::FieldCodec.ForUInt64(274);
-    private readonly pbc::RepeatedField<ulong> repeatedUint64_ = new pbc::RepeatedField<ulong>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<ulong> RepeatedUint64 {
-      get { return repeatedUint64_; }
-    }
-
-    /// <summary>Field number for the "repeated_sint32" field.</summary>
-    public const int RepeatedSint32FieldNumber = 35;
-    private static readonly pb::FieldCodec<int> _repeated_repeatedSint32_codec
-        = pb::FieldCodec.ForSInt32(282);
-    private readonly pbc::RepeatedField<int> repeatedSint32_ = new pbc::RepeatedField<int>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<int> RepeatedSint32 {
-      get { return repeatedSint32_; }
-    }
-
-    /// <summary>Field number for the "repeated_sint64" field.</summary>
-    public const int RepeatedSint64FieldNumber = 36;
-    private static readonly pb::FieldCodec<long> _repeated_repeatedSint64_codec
-        = pb::FieldCodec.ForSInt64(290);
-    private readonly pbc::RepeatedField<long> repeatedSint64_ = new pbc::RepeatedField<long>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<long> RepeatedSint64 {
-      get { return repeatedSint64_; }
-    }
-
-    /// <summary>Field number for the "repeated_fixed32" field.</summary>
-    public const int RepeatedFixed32FieldNumber = 37;
-    private static readonly pb::FieldCodec<uint> _repeated_repeatedFixed32_codec
-        = pb::FieldCodec.ForFixed32(298);
-    private readonly pbc::RepeatedField<uint> repeatedFixed32_ = new pbc::RepeatedField<uint>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<uint> RepeatedFixed32 {
-      get { return repeatedFixed32_; }
-    }
-
-    /// <summary>Field number for the "repeated_fixed64" field.</summary>
-    public const int RepeatedFixed64FieldNumber = 38;
-    private static readonly pb::FieldCodec<ulong> _repeated_repeatedFixed64_codec
-        = pb::FieldCodec.ForFixed64(306);
-    private readonly pbc::RepeatedField<ulong> repeatedFixed64_ = new pbc::RepeatedField<ulong>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<ulong> RepeatedFixed64 {
-      get { return repeatedFixed64_; }
-    }
-
-    /// <summary>Field number for the "repeated_sfixed32" field.</summary>
-    public const int RepeatedSfixed32FieldNumber = 39;
-    private static readonly pb::FieldCodec<int> _repeated_repeatedSfixed32_codec
-        = pb::FieldCodec.ForSFixed32(314);
-    private readonly pbc::RepeatedField<int> repeatedSfixed32_ = new pbc::RepeatedField<int>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<int> RepeatedSfixed32 {
-      get { return repeatedSfixed32_; }
-    }
-
-    /// <summary>Field number for the "repeated_sfixed64" field.</summary>
-    public const int RepeatedSfixed64FieldNumber = 40;
-    private static readonly pb::FieldCodec<long> _repeated_repeatedSfixed64_codec
-        = pb::FieldCodec.ForSFixed64(322);
-    private readonly pbc::RepeatedField<long> repeatedSfixed64_ = new pbc::RepeatedField<long>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<long> RepeatedSfixed64 {
-      get { return repeatedSfixed64_; }
-    }
-
-    /// <summary>Field number for the "repeated_float" field.</summary>
-    public const int RepeatedFloatFieldNumber = 41;
-    private static readonly pb::FieldCodec<float> _repeated_repeatedFloat_codec
-        = pb::FieldCodec.ForFloat(330);
-    private readonly pbc::RepeatedField<float> repeatedFloat_ = new pbc::RepeatedField<float>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<float> RepeatedFloat {
-      get { return repeatedFloat_; }
-    }
-
-    /// <summary>Field number for the "repeated_double" field.</summary>
-    public const int RepeatedDoubleFieldNumber = 42;
-    private static readonly pb::FieldCodec<double> _repeated_repeatedDouble_codec
-        = pb::FieldCodec.ForDouble(338);
-    private readonly pbc::RepeatedField<double> repeatedDouble_ = new pbc::RepeatedField<double>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<double> RepeatedDouble {
-      get { return repeatedDouble_; }
-    }
-
-    /// <summary>Field number for the "repeated_bool" field.</summary>
-    public const int RepeatedBoolFieldNumber = 43;
-    private static readonly pb::FieldCodec<bool> _repeated_repeatedBool_codec
-        = pb::FieldCodec.ForBool(346);
-    private readonly pbc::RepeatedField<bool> repeatedBool_ = new pbc::RepeatedField<bool>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<bool> RepeatedBool {
-      get { return repeatedBool_; }
-    }
-
-    /// <summary>Field number for the "repeated_string" field.</summary>
-    public const int RepeatedStringFieldNumber = 44;
-    private static readonly pb::FieldCodec<string> _repeated_repeatedString_codec
-        = pb::FieldCodec.ForString(354);
-    private readonly pbc::RepeatedField<string> repeatedString_ = new pbc::RepeatedField<string>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<string> RepeatedString {
-      get { return repeatedString_; }
-    }
-
-    /// <summary>Field number for the "repeated_bytes" field.</summary>
-    public const int RepeatedBytesFieldNumber = 45;
-    private static readonly pb::FieldCodec<pb::ByteString> _repeated_repeatedBytes_codec
-        = pb::FieldCodec.ForBytes(362);
-    private readonly pbc::RepeatedField<pb::ByteString> repeatedBytes_ = new pbc::RepeatedField<pb::ByteString>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<pb::ByteString> RepeatedBytes {
-      get { return repeatedBytes_; }
-    }
-
-    /// <summary>Field number for the "repeated_nested_message" field.</summary>
-    public const int RepeatedNestedMessageFieldNumber = 48;
-    private static readonly pb::FieldCodec<global::ProtobufTestMessages.Proto3.TestAllTypesProto3.Types.NestedMessage> _repeated_repeatedNestedMessage_codec
-        = pb::FieldCodec.ForMessage(386, global::ProtobufTestMessages.Proto3.TestAllTypesProto3.Types.NestedMessage.Parser);
-    private readonly pbc::RepeatedField<global::ProtobufTestMessages.Proto3.TestAllTypesProto3.Types.NestedMessage> repeatedNestedMessage_ = new pbc::RepeatedField<global::ProtobufTestMessages.Proto3.TestAllTypesProto3.Types.NestedMessage>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::ProtobufTestMessages.Proto3.TestAllTypesProto3.Types.NestedMessage> RepeatedNestedMessage {
-      get { return repeatedNestedMessage_; }
-    }
-
-    /// <summary>Field number for the "repeated_foreign_message" field.</summary>
-    public const int RepeatedForeignMessageFieldNumber = 49;
-    private static readonly pb::FieldCodec<global::ProtobufTestMessages.Proto3.ForeignMessage> _repeated_repeatedForeignMessage_codec
-        = pb::FieldCodec.ForMessage(394, global::ProtobufTestMessages.Proto3.ForeignMessage.Parser);
-    private readonly pbc::RepeatedField<global::ProtobufTestMessages.Proto3.ForeignMessage> repeatedForeignMessage_ = new pbc::RepeatedField<global::ProtobufTestMessages.Proto3.ForeignMessage>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::ProtobufTestMessages.Proto3.ForeignMessage> RepeatedForeignMessage {
-      get { return repeatedForeignMessage_; }
-    }
-
-    /// <summary>Field number for the "repeated_nested_enum" field.</summary>
-    public const int RepeatedNestedEnumFieldNumber = 51;
-    private static readonly pb::FieldCodec<global::ProtobufTestMessages.Proto3.TestAllTypesProto3.Types.NestedEnum> _repeated_repeatedNestedEnum_codec
-        = pb::FieldCodec.ForEnum(410, x => (int) x, x => (global::ProtobufTestMessages.Proto3.TestAllTypesProto3.Types.NestedEnum) x);
-    private readonly pbc::RepeatedField<global::ProtobufTestMessages.Proto3.TestAllTypesProto3.Types.NestedEnum> repeatedNestedEnum_ = new pbc::RepeatedField<global::ProtobufTestMessages.Proto3.TestAllTypesProto3.Types.NestedEnum>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::ProtobufTestMessages.Proto3.TestAllTypesProto3.Types.NestedEnum> RepeatedNestedEnum {
-      get { return repeatedNestedEnum_; }
-    }
-
-    /// <summary>Field number for the "repeated_foreign_enum" field.</summary>
-    public const int RepeatedForeignEnumFieldNumber = 52;
-    private static readonly pb::FieldCodec<global::ProtobufTestMessages.Proto3.ForeignEnum> _repeated_repeatedForeignEnum_codec
-        = pb::FieldCodec.ForEnum(418, x => (int) x, x => (global::ProtobufTestMessages.Proto3.ForeignEnum) x);
-    private readonly pbc::RepeatedField<global::ProtobufTestMessages.Proto3.ForeignEnum> repeatedForeignEnum_ = new pbc::RepeatedField<global::ProtobufTestMessages.Proto3.ForeignEnum>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::ProtobufTestMessages.Proto3.ForeignEnum> RepeatedForeignEnum {
-      get { return repeatedForeignEnum_; }
-    }
-
-    /// <summary>Field number for the "repeated_string_piece" field.</summary>
-    public const int RepeatedStringPieceFieldNumber = 54;
-    private static readonly pb::FieldCodec<string> _repeated_repeatedStringPiece_codec
-        = pb::FieldCodec.ForString(434);
-    private readonly pbc::RepeatedField<string> repeatedStringPiece_ = new pbc::RepeatedField<string>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<string> RepeatedStringPiece {
-      get { return repeatedStringPiece_; }
-    }
-
-    /// <summary>Field number for the "repeated_cord" field.</summary>
-    public const int RepeatedCordFieldNumber = 55;
-    private static readonly pb::FieldCodec<string> _repeated_repeatedCord_codec
-        = pb::FieldCodec.ForString(442);
-    private readonly pbc::RepeatedField<string> repeatedCord_ = new pbc::RepeatedField<string>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<string> RepeatedCord {
-      get { return repeatedCord_; }
-    }
-
-    /// <summary>Field number for the "packed_int32" field.</summary>
-    public const int PackedInt32FieldNumber = 75;
-    private static readonly pb::FieldCodec<int> _repeated_packedInt32_codec
-        = pb::FieldCodec.ForInt32(602);
-    private readonly pbc::RepeatedField<int> packedInt32_ = new pbc::RepeatedField<int>();
-    /// <summary>
-    /// Packed
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<int> PackedInt32 {
-      get { return packedInt32_; }
-    }
-
-    /// <summary>Field number for the "packed_int64" field.</summary>
-    public const int PackedInt64FieldNumber = 76;
-    private static readonly pb::FieldCodec<long> _repeated_packedInt64_codec
-        = pb::FieldCodec.ForInt64(610);
-    private readonly pbc::RepeatedField<long> packedInt64_ = new pbc::RepeatedField<long>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<long> PackedInt64 {
-      get { return packedInt64_; }
-    }
-
-    /// <summary>Field number for the "packed_uint32" field.</summary>
-    public const int PackedUint32FieldNumber = 77;
-    private static readonly pb::FieldCodec<uint> _repeated_packedUint32_codec
-        = pb::FieldCodec.ForUInt32(618);
-    private readonly pbc::RepeatedField<uint> packedUint32_ = new pbc::RepeatedField<uint>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<uint> PackedUint32 {
-      get { return packedUint32_; }
-    }
-
-    /// <summary>Field number for the "packed_uint64" field.</summary>
-    public const int PackedUint64FieldNumber = 78;
-    private static readonly pb::FieldCodec<ulong> _repeated_packedUint64_codec
-        = pb::FieldCodec.ForUInt64(626);
-    private readonly pbc::RepeatedField<ulong> packedUint64_ = new pbc::RepeatedField<ulong>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<ulong> PackedUint64 {
-      get { return packedUint64_; }
-    }
-
-    /// <summary>Field number for the "packed_sint32" field.</summary>
-    public const int PackedSint32FieldNumber = 79;
-    private static readonly pb::FieldCodec<int> _repeated_packedSint32_codec
-        = pb::FieldCodec.ForSInt32(634);
-    private readonly pbc::RepeatedField<int> packedSint32_ = new pbc::RepeatedField<int>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<int> PackedSint32 {
-      get { return packedSint32_; }
-    }
-
-    /// <summary>Field number for the "packed_sint64" field.</summary>
-    public const int PackedSint64FieldNumber = 80;
-    private static readonly pb::FieldCodec<long> _repeated_packedSint64_codec
-        = pb::FieldCodec.ForSInt64(642);
-    private readonly pbc::RepeatedField<long> packedSint64_ = new pbc::RepeatedField<long>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<long> PackedSint64 {
-      get { return packedSint64_; }
-    }
-
-    /// <summary>Field number for the "packed_fixed32" field.</summary>
-    public const int PackedFixed32FieldNumber = 81;
-    private static readonly pb::FieldCodec<uint> _repeated_packedFixed32_codec
-        = pb::FieldCodec.ForFixed32(650);
-    private readonly pbc::RepeatedField<uint> packedFixed32_ = new pbc::RepeatedField<uint>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<uint> PackedFixed32 {
-      get { return packedFixed32_; }
-    }
-
-    /// <summary>Field number for the "packed_fixed64" field.</summary>
-    public const int PackedFixed64FieldNumber = 82;
-    private static readonly pb::FieldCodec<ulong> _repeated_packedFixed64_codec
-        = pb::FieldCodec.ForFixed64(658);
-    private readonly pbc::RepeatedField<ulong> packedFixed64_ = new pbc::RepeatedField<ulong>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<ulong> PackedFixed64 {
-      get { return packedFixed64_; }
-    }
-
-    /// <summary>Field number for the "packed_sfixed32" field.</summary>
-    public const int PackedSfixed32FieldNumber = 83;
-    private static readonly pb::FieldCodec<int> _repeated_packedSfixed32_codec
-        = pb::FieldCodec.ForSFixed32(666);
-    private readonly pbc::RepeatedField<int> packedSfixed32_ = new pbc::RepeatedField<int>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<int> PackedSfixed32 {
-      get { return packedSfixed32_; }
-    }
-
-    /// <summary>Field number for the "packed_sfixed64" field.</summary>
-    public const int PackedSfixed64FieldNumber = 84;
-    private static readonly pb::FieldCodec<long> _repeated_packedSfixed64_codec
-        = pb::FieldCodec.ForSFixed64(674);
-    private readonly pbc::RepeatedField<long> packedSfixed64_ = new pbc::RepeatedField<long>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<long> PackedSfixed64 {
-      get { return packedSfixed64_; }
-    }
-
-    /// <summary>Field number for the "packed_float" field.</summary>
-    public const int PackedFloatFieldNumber = 85;
-    private static readonly pb::FieldCodec<float> _repeated_packedFloat_codec
-        = pb::FieldCodec.ForFloat(682);
-    private readonly pbc::RepeatedField<float> packedFloat_ = new pbc::RepeatedField<float>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<float> PackedFloat {
-      get { return packedFloat_; }
-    }
-
-    /// <summary>Field number for the "packed_double" field.</summary>
-    public const int PackedDoubleFieldNumber = 86;
-    private static readonly pb::FieldCodec<double> _repeated_packedDouble_codec
-        = pb::FieldCodec.ForDouble(690);
-    private readonly pbc::RepeatedField<double> packedDouble_ = new pbc::RepeatedField<double>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<double> PackedDouble {
-      get { return packedDouble_; }
-    }
-
-    /// <summary>Field number for the "packed_bool" field.</summary>
-    public const int PackedBoolFieldNumber = 87;
-    private static readonly pb::FieldCodec<bool> _repeated_packedBool_codec
-        = pb::FieldCodec.ForBool(698);
-    private readonly pbc::RepeatedField<bool> packedBool_ = new pbc::RepeatedField<bool>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<bool> PackedBool {
-      get { return packedBool_; }
-    }
-
-    /// <summary>Field number for the "packed_nested_enum" field.</summary>
-    public const int PackedNestedEnumFieldNumber = 88;
-    private static readonly pb::FieldCodec<global::ProtobufTestMessages.Proto3.TestAllTypesProto3.Types.NestedEnum> _repeated_packedNestedEnum_codec
-        = pb::FieldCodec.ForEnum(706, x => (int) x, x => (global::ProtobufTestMessages.Proto3.TestAllTypesProto3.Types.NestedEnum) x);
-    private readonly pbc::RepeatedField<global::ProtobufTestMessages.Proto3.TestAllTypesProto3.Types.NestedEnum> packedNestedEnum_ = new pbc::RepeatedField<global::ProtobufTestMessages.Proto3.TestAllTypesProto3.Types.NestedEnum>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::ProtobufTestMessages.Proto3.TestAllTypesProto3.Types.NestedEnum> PackedNestedEnum {
-      get { return packedNestedEnum_; }
-    }
-
-    /// <summary>Field number for the "unpacked_int32" field.</summary>
-    public const int UnpackedInt32FieldNumber = 89;
-    private static readonly pb::FieldCodec<int> _repeated_unpackedInt32_codec
-        = pb::FieldCodec.ForInt32(712);
-    private readonly pbc::RepeatedField<int> unpackedInt32_ = new pbc::RepeatedField<int>();
-    /// <summary>
-    /// Unpacked
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<int> UnpackedInt32 {
-      get { return unpackedInt32_; }
-    }
-
-    /// <summary>Field number for the "unpacked_int64" field.</summary>
-    public const int UnpackedInt64FieldNumber = 90;
-    private static readonly pb::FieldCodec<long> _repeated_unpackedInt64_codec
-        = pb::FieldCodec.ForInt64(720);
-    private readonly pbc::RepeatedField<long> unpackedInt64_ = new pbc::RepeatedField<long>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<long> UnpackedInt64 {
-      get { return unpackedInt64_; }
-    }
-
-    /// <summary>Field number for the "unpacked_uint32" field.</summary>
-    public const int UnpackedUint32FieldNumber = 91;
-    private static readonly pb::FieldCodec<uint> _repeated_unpackedUint32_codec
-        = pb::FieldCodec.ForUInt32(728);
-    private readonly pbc::RepeatedField<uint> unpackedUint32_ = new pbc::RepeatedField<uint>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<uint> UnpackedUint32 {
-      get { return unpackedUint32_; }
-    }
-
-    /// <summary>Field number for the "unpacked_uint64" field.</summary>
-    public const int UnpackedUint64FieldNumber = 92;
-    private static readonly pb::FieldCodec<ulong> _repeated_unpackedUint64_codec
-        = pb::FieldCodec.ForUInt64(736);
-    private readonly pbc::RepeatedField<ulong> unpackedUint64_ = new pbc::RepeatedField<ulong>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<ulong> UnpackedUint64 {
-      get { return unpackedUint64_; }
-    }
-
-    /// <summary>Field number for the "unpacked_sint32" field.</summary>
-    public const int UnpackedSint32FieldNumber = 93;
-    private static readonly pb::FieldCodec<int> _repeated_unpackedSint32_codec
-        = pb::FieldCodec.ForSInt32(744);
-    private readonly pbc::RepeatedField<int> unpackedSint32_ = new pbc::RepeatedField<int>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<int> UnpackedSint32 {
-      get { return unpackedSint32_; }
-    }
-
-    /// <summary>Field number for the "unpacked_sint64" field.</summary>
-    public const int UnpackedSint64FieldNumber = 94;
-    private static readonly pb::FieldCodec<long> _repeated_unpackedSint64_codec
-        = pb::FieldCodec.ForSInt64(752);
-    private readonly pbc::RepeatedField<long> unpackedSint64_ = new pbc::RepeatedField<long>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<long> UnpackedSint64 {
-      get { return unpackedSint64_; }
-    }
-
-    /// <summary>Field number for the "unpacked_fixed32" field.</summary>
-    public const int UnpackedFixed32FieldNumber = 95;
-    private static readonly pb::FieldCodec<uint> _repeated_unpackedFixed32_codec
-        = pb::FieldCodec.ForFixed32(765);
-    private readonly pbc::RepeatedField<uint> unpackedFixed32_ = new pbc::RepeatedField<uint>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<uint> UnpackedFixed32 {
-      get { return unpackedFixed32_; }
-    }
-
-    /// <summary>Field number for the "unpacked_fixed64" field.</summary>
-    public const int UnpackedFixed64FieldNumber = 96;
-    private static readonly pb::FieldCodec<ulong> _repeated_unpackedFixed64_codec
-        = pb::FieldCodec.ForFixed64(769);
-    private readonly pbc::RepeatedField<ulong> unpackedFixed64_ = new pbc::RepeatedField<ulong>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<ulong> UnpackedFixed64 {
-      get { return unpackedFixed64_; }
-    }
-
-    /// <summary>Field number for the "unpacked_sfixed32" field.</summary>
-    public const int UnpackedSfixed32FieldNumber = 97;
-    private static readonly pb::FieldCodec<int> _repeated_unpackedSfixed32_codec
-        = pb::FieldCodec.ForSFixed32(781);
-    private readonly pbc::RepeatedField<int> unpackedSfixed32_ = new pbc::RepeatedField<int>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<int> UnpackedSfixed32 {
-      get { return unpackedSfixed32_; }
-    }
-
-    /// <summary>Field number for the "unpacked_sfixed64" field.</summary>
-    public const int UnpackedSfixed64FieldNumber = 98;
-    private static readonly pb::FieldCodec<long> _repeated_unpackedSfixed64_codec
-        = pb::FieldCodec.ForSFixed64(785);
-    private readonly pbc::RepeatedField<long> unpackedSfixed64_ = new pbc::RepeatedField<long>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<long> UnpackedSfixed64 {
-      get { return unpackedSfixed64_; }
-    }
-
-    /// <summary>Field number for the "unpacked_float" field.</summary>
-    public const int UnpackedFloatFieldNumber = 99;
-    private static readonly pb::FieldCodec<float> _repeated_unpackedFloat_codec
-        = pb::FieldCodec.ForFloat(797);
-    private readonly pbc::RepeatedField<float> unpackedFloat_ = new pbc::RepeatedField<float>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<float> UnpackedFloat {
-      get { return unpackedFloat_; }
-    }
-
-    /// <summary>Field number for the "unpacked_double" field.</summary>
-    public const int UnpackedDoubleFieldNumber = 100;
-    private static readonly pb::FieldCodec<double> _repeated_unpackedDouble_codec
-        = pb::FieldCodec.ForDouble(801);
-    private readonly pbc::RepeatedField<double> unpackedDouble_ = new pbc::RepeatedField<double>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<double> UnpackedDouble {
-      get { return unpackedDouble_; }
-    }
-
-    /// <summary>Field number for the "unpacked_bool" field.</summary>
-    public const int UnpackedBoolFieldNumber = 101;
-    private static readonly pb::FieldCodec<bool> _repeated_unpackedBool_codec
-        = pb::FieldCodec.ForBool(808);
-    private readonly pbc::RepeatedField<bool> unpackedBool_ = new pbc::RepeatedField<bool>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<bool> UnpackedBool {
-      get { return unpackedBool_; }
-    }
-
-    /// <summary>Field number for the "unpacked_nested_enum" field.</summary>
-    public const int UnpackedNestedEnumFieldNumber = 102;
-    private static readonly pb::FieldCodec<global::ProtobufTestMessages.Proto3.TestAllTypesProto3.Types.NestedEnum> _repeated_unpackedNestedEnum_codec
-        = pb::FieldCodec.ForEnum(816, x => (int) x, x => (global::ProtobufTestMessages.Proto3.TestAllTypesProto3.Types.NestedEnum) x);
-    private readonly pbc::RepeatedField<global::ProtobufTestMessages.Proto3.TestAllTypesProto3.Types.NestedEnum> unpackedNestedEnum_ = new pbc::RepeatedField<global::ProtobufTestMessages.Proto3.TestAllTypesProto3.Types.NestedEnum>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::ProtobufTestMessages.Proto3.TestAllTypesProto3.Types.NestedEnum> UnpackedNestedEnum {
-      get { return unpackedNestedEnum_; }
-    }
-
-    /// <summary>Field number for the "map_int32_int32" field.</summary>
-    public const int MapInt32Int32FieldNumber = 56;
-    private static readonly pbc::MapField<int, int>.Codec _map_mapInt32Int32_codec
-        = new pbc::MapField<int, int>.Codec(pb::FieldCodec.ForInt32(8, 0), pb::FieldCodec.ForInt32(16, 0), 450);
-    private readonly pbc::MapField<int, int> mapInt32Int32_ = new pbc::MapField<int, int>();
-    /// <summary>
-    /// Map
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::MapField<int, int> MapInt32Int32 {
-      get { return mapInt32Int32_; }
-    }
-
-    /// <summary>Field number for the "map_int64_int64" field.</summary>
-    public const int MapInt64Int64FieldNumber = 57;
-    private static readonly pbc::MapField<long, long>.Codec _map_mapInt64Int64_codec
-        = new pbc::MapField<long, long>.Codec(pb::FieldCodec.ForInt64(8, 0L), pb::FieldCodec.ForInt64(16, 0L), 458);
-    private readonly pbc::MapField<long, long> mapInt64Int64_ = new pbc::MapField<long, long>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::MapField<long, long> MapInt64Int64 {
-      get { return mapInt64Int64_; }
-    }
-
-    /// <summary>Field number for the "map_uint32_uint32" field.</summary>
-    public const int MapUint32Uint32FieldNumber = 58;
-    private static readonly pbc::MapField<uint, uint>.Codec _map_mapUint32Uint32_codec
-        = new pbc::MapField<uint, uint>.Codec(pb::FieldCodec.ForUInt32(8, 0), pb::FieldCodec.ForUInt32(16, 0), 466);
-    private readonly pbc::MapField<uint, uint> mapUint32Uint32_ = new pbc::MapField<uint, uint>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::MapField<uint, uint> MapUint32Uint32 {
-      get { return mapUint32Uint32_; }
-    }
-
-    /// <summary>Field number for the "map_uint64_uint64" field.</summary>
-    public const int MapUint64Uint64FieldNumber = 59;
-    private static readonly pbc::MapField<ulong, ulong>.Codec _map_mapUint64Uint64_codec
-        = new pbc::MapField<ulong, ulong>.Codec(pb::FieldCodec.ForUInt64(8, 0UL), pb::FieldCodec.ForUInt64(16, 0UL), 474);
-    private readonly pbc::MapField<ulong, ulong> mapUint64Uint64_ = new pbc::MapField<ulong, ulong>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::MapField<ulong, ulong> MapUint64Uint64 {
-      get { return mapUint64Uint64_; }
-    }
-
-    /// <summary>Field number for the "map_sint32_sint32" field.</summary>
-    public const int MapSint32Sint32FieldNumber = 60;
-    private static readonly pbc::MapField<int, int>.Codec _map_mapSint32Sint32_codec
-        = new pbc::MapField<int, int>.Codec(pb::FieldCodec.ForSInt32(8, 0), pb::FieldCodec.ForSInt32(16, 0), 482);
-    private readonly pbc::MapField<int, int> mapSint32Sint32_ = new pbc::MapField<int, int>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::MapField<int, int> MapSint32Sint32 {
-      get { return mapSint32Sint32_; }
-    }
-
-    /// <summary>Field number for the "map_sint64_sint64" field.</summary>
-    public const int MapSint64Sint64FieldNumber = 61;
-    private static readonly pbc::MapField<long, long>.Codec _map_mapSint64Sint64_codec
-        = new pbc::MapField<long, long>.Codec(pb::FieldCodec.ForSInt64(8, 0L), pb::FieldCodec.ForSInt64(16, 0L), 490);
-    private readonly pbc::MapField<long, long> mapSint64Sint64_ = new pbc::MapField<long, long>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::MapField<long, long> MapSint64Sint64 {
-      get { return mapSint64Sint64_; }
-    }
-
-    /// <summary>Field number for the "map_fixed32_fixed32" field.</summary>
-    public const int MapFixed32Fixed32FieldNumber = 62;
-    private static readonly pbc::MapField<uint, uint>.Codec _map_mapFixed32Fixed32_codec
-        = new pbc::MapField<uint, uint>.Codec(pb::FieldCodec.ForFixed32(13, 0), pb::FieldCodec.ForFixed32(21, 0), 498);
-    private readonly pbc::MapField<uint, uint> mapFixed32Fixed32_ = new pbc::MapField<uint, uint>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::MapField<uint, uint> MapFixed32Fixed32 {
-      get { return mapFixed32Fixed32_; }
-    }
-
-    /// <summary>Field number for the "map_fixed64_fixed64" field.</summary>
-    public const int MapFixed64Fixed64FieldNumber = 63;
-    private static readonly pbc::MapField<ulong, ulong>.Codec _map_mapFixed64Fixed64_codec
-        = new pbc::MapField<ulong, ulong>.Codec(pb::FieldCodec.ForFixed64(9, 0UL), pb::FieldCodec.ForFixed64(17, 0UL), 506);
-    private readonly pbc::MapField<ulong, ulong> mapFixed64Fixed64_ = new pbc::MapField<ulong, ulong>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::MapField<ulong, ulong> MapFixed64Fixed64 {
-      get { return mapFixed64Fixed64_; }
-    }
-
-    /// <summary>Field number for the "map_sfixed32_sfixed32" field.</summary>
-    public const int MapSfixed32Sfixed32FieldNumber = 64;
-    private static readonly pbc::MapField<int, int>.Codec _map_mapSfixed32Sfixed32_codec
-        = new pbc::MapField<int, int>.Codec(pb::FieldCodec.ForSFixed32(13, 0), pb::FieldCodec.ForSFixed32(21, 0), 514);
-    private readonly pbc::MapField<int, int> mapSfixed32Sfixed32_ = new pbc::MapField<int, int>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::MapField<int, int> MapSfixed32Sfixed32 {
-      get { return mapSfixed32Sfixed32_; }
-    }
-
-    /// <summary>Field number for the "map_sfixed64_sfixed64" field.</summary>
-    public const int MapSfixed64Sfixed64FieldNumber = 65;
-    private static readonly pbc::MapField<long, long>.Codec _map_mapSfixed64Sfixed64_codec
-        = new pbc::MapField<long, long>.Codec(pb::FieldCodec.ForSFixed64(9, 0L), pb::FieldCodec.ForSFixed64(17, 0L), 522);
-    private readonly pbc::MapField<long, long> mapSfixed64Sfixed64_ = new pbc::MapField<long, long>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::MapField<long, long> MapSfixed64Sfixed64 {
-      get { return mapSfixed64Sfixed64_; }
-    }
-
-    /// <summary>Field number for the "map_int32_float" field.</summary>
-    public const int MapInt32FloatFieldNumber = 66;
-    private static readonly pbc::MapField<int, float>.Codec _map_mapInt32Float_codec
-        = new pbc::MapField<int, float>.Codec(pb::FieldCodec.ForInt32(8, 0), pb::FieldCodec.ForFloat(21, 0F), 530);
-    private readonly pbc::MapField<int, float> mapInt32Float_ = new pbc::MapField<int, float>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::MapField<int, float> MapInt32Float {
-      get { return mapInt32Float_; }
-    }
-
-    /// <summary>Field number for the "map_int32_double" field.</summary>
-    public const int MapInt32DoubleFieldNumber = 67;
-    private static readonly pbc::MapField<int, double>.Codec _map_mapInt32Double_codec
-        = new pbc::MapField<int, double>.Codec(pb::FieldCodec.ForInt32(8, 0), pb::FieldCodec.ForDouble(17, 0D), 538);
-    private readonly pbc::MapField<int, double> mapInt32Double_ = new pbc::MapField<int, double>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::MapField<int, double> MapInt32Double {
-      get { return mapInt32Double_; }
-    }
-
-    /// <summary>Field number for the "map_bool_bool" field.</summary>
-    public const int MapBoolBoolFieldNumber = 68;
-    private static readonly pbc::MapField<bool, bool>.Codec _map_mapBoolBool_codec
-        = new pbc::MapField<bool, bool>.Codec(pb::FieldCodec.ForBool(8, false), pb::FieldCodec.ForBool(16, false), 546);
-    private readonly pbc::MapField<bool, bool> mapBoolBool_ = new pbc::MapField<bool, bool>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::MapField<bool, bool> MapBoolBool {
-      get { return mapBoolBool_; }
-    }
-
-    /// <summary>Field number for the "map_string_string" field.</summary>
-    public const int MapStringStringFieldNumber = 69;
-    private static readonly pbc::MapField<string, string>.Codec _map_mapStringString_codec
-        = new pbc::MapField<string, string>.Codec(pb::FieldCodec.ForString(10, ""), pb::FieldCodec.ForString(18, ""), 554);
-    private readonly pbc::MapField<string, string> mapStringString_ = new pbc::MapField<string, string>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::MapField<string, string> MapStringString {
-      get { return mapStringString_; }
-    }
-
-    /// <summary>Field number for the "map_string_bytes" field.</summary>
-    public const int MapStringBytesFieldNumber = 70;
-    private static readonly pbc::MapField<string, pb::ByteString>.Codec _map_mapStringBytes_codec
-        = new pbc::MapField<string, pb::ByteString>.Codec(pb::FieldCodec.ForString(10, ""), pb::FieldCodec.ForBytes(18, pb::ByteString.Empty), 562);
-    private readonly pbc::MapField<string, pb::ByteString> mapStringBytes_ = new pbc::MapField<string, pb::ByteString>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::MapField<string, pb::ByteString> MapStringBytes {
-      get { return mapStringBytes_; }
-    }
-
-    /// <summary>Field number for the "map_string_nested_message" field.</summary>
-    public const int MapStringNestedMessageFieldNumber = 71;
-    private static readonly pbc::MapField<string, global::ProtobufTestMessages.Proto3.TestAllTypesProto3.Types.NestedMessage>.Codec _map_mapStringNestedMessage_codec
-        = new pbc::MapField<string, global::ProtobufTestMessages.Proto3.TestAllTypesProto3.Types.NestedMessage>.Codec(pb::FieldCodec.ForString(10, ""), pb::FieldCodec.ForMessage(18, global::ProtobufTestMessages.Proto3.TestAllTypesProto3.Types.NestedMessage.Parser), 570);
-    private readonly pbc::MapField<string, global::ProtobufTestMessages.Proto3.TestAllTypesProto3.Types.NestedMessage> mapStringNestedMessage_ = new pbc::MapField<string, global::ProtobufTestMessages.Proto3.TestAllTypesProto3.Types.NestedMessage>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::MapField<string, global::ProtobufTestMessages.Proto3.TestAllTypesProto3.Types.NestedMessage> MapStringNestedMessage {
-      get { return mapStringNestedMessage_; }
-    }
-
-    /// <summary>Field number for the "map_string_foreign_message" field.</summary>
-    public const int MapStringForeignMessageFieldNumber = 72;
-    private static readonly pbc::MapField<string, global::ProtobufTestMessages.Proto3.ForeignMessage>.Codec _map_mapStringForeignMessage_codec
-        = new pbc::MapField<string, global::ProtobufTestMessages.Proto3.ForeignMessage>.Codec(pb::FieldCodec.ForString(10, ""), pb::FieldCodec.ForMessage(18, global::ProtobufTestMessages.Proto3.ForeignMessage.Parser), 578);
-    private readonly pbc::MapField<string, global::ProtobufTestMessages.Proto3.ForeignMessage> mapStringForeignMessage_ = new pbc::MapField<string, global::ProtobufTestMessages.Proto3.ForeignMessage>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::MapField<string, global::ProtobufTestMessages.Proto3.ForeignMessage> MapStringForeignMessage {
-      get { return mapStringForeignMessage_; }
-    }
-
-    /// <summary>Field number for the "map_string_nested_enum" field.</summary>
-    public const int MapStringNestedEnumFieldNumber = 73;
-    private static readonly pbc::MapField<string, global::ProtobufTestMessages.Proto3.TestAllTypesProto3.Types.NestedEnum>.Codec _map_mapStringNestedEnum_codec
-        = new pbc::MapField<string, global::ProtobufTestMessages.Proto3.TestAllTypesProto3.Types.NestedEnum>.Codec(pb::FieldCodec.ForString(10, ""), pb::FieldCodec.ForEnum(16, x => (int) x, x => (global::ProtobufTestMessages.Proto3.TestAllTypesProto3.Types.NestedEnum) x, global::ProtobufTestMessages.Proto3.TestAllTypesProto3.Types.NestedEnum.Foo), 586);
-    private readonly pbc::MapField<string, global::ProtobufTestMessages.Proto3.TestAllTypesProto3.Types.NestedEnum> mapStringNestedEnum_ = new pbc::MapField<string, global::ProtobufTestMessages.Proto3.TestAllTypesProto3.Types.NestedEnum>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::MapField<string, global::ProtobufTestMessages.Proto3.TestAllTypesProto3.Types.NestedEnum> MapStringNestedEnum {
-      get { return mapStringNestedEnum_; }
-    }
-
-    /// <summary>Field number for the "map_string_foreign_enum" field.</summary>
-    public const int MapStringForeignEnumFieldNumber = 74;
-    private static readonly pbc::MapField<string, global::ProtobufTestMessages.Proto3.ForeignEnum>.Codec _map_mapStringForeignEnum_codec
-        = new pbc::MapField<string, global::ProtobufTestMessages.Proto3.ForeignEnum>.Codec(pb::FieldCodec.ForString(10, ""), pb::FieldCodec.ForEnum(16, x => (int) x, x => (global::ProtobufTestMessages.Proto3.ForeignEnum) x, global::ProtobufTestMessages.Proto3.ForeignEnum.ForeignFoo), 594);
-    private readonly pbc::MapField<string, global::ProtobufTestMessages.Proto3.ForeignEnum> mapStringForeignEnum_ = new pbc::MapField<string, global::ProtobufTestMessages.Proto3.ForeignEnum>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::MapField<string, global::ProtobufTestMessages.Proto3.ForeignEnum> MapStringForeignEnum {
-      get { return mapStringForeignEnum_; }
-    }
-
-    /// <summary>Field number for the "oneof_uint32" field.</summary>
-    public const int OneofUint32FieldNumber = 111;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public uint OneofUint32 {
-      get { return oneofFieldCase_ == OneofFieldOneofCase.OneofUint32 ? (uint) oneofField_ : 0; }
-      set {
-        oneofField_ = value;
-        oneofFieldCase_ = OneofFieldOneofCase.OneofUint32;
-      }
-    }
-
-    /// <summary>Field number for the "oneof_nested_message" field.</summary>
-    public const int OneofNestedMessageFieldNumber = 112;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::ProtobufTestMessages.Proto3.TestAllTypesProto3.Types.NestedMessage OneofNestedMessage {
-      get { return oneofFieldCase_ == OneofFieldOneofCase.OneofNestedMessage ? (global::ProtobufTestMessages.Proto3.TestAllTypesProto3.Types.NestedMessage) oneofField_ : null; }
-      set {
-        oneofField_ = value;
-        oneofFieldCase_ = value == null ? OneofFieldOneofCase.None : OneofFieldOneofCase.OneofNestedMessage;
-      }
-    }
-
-    /// <summary>Field number for the "oneof_string" field.</summary>
-    public const int OneofStringFieldNumber = 113;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string OneofString {
-      get { return oneofFieldCase_ == OneofFieldOneofCase.OneofString ? (string) oneofField_ : ""; }
-      set {
-        oneofField_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-        oneofFieldCase_ = OneofFieldOneofCase.OneofString;
-      }
-    }
-
-    /// <summary>Field number for the "oneof_bytes" field.</summary>
-    public const int OneofBytesFieldNumber = 114;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pb::ByteString OneofBytes {
-      get { return oneofFieldCase_ == OneofFieldOneofCase.OneofBytes ? (pb::ByteString) oneofField_ : pb::ByteString.Empty; }
-      set {
-        oneofField_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-        oneofFieldCase_ = OneofFieldOneofCase.OneofBytes;
-      }
-    }
-
-    /// <summary>Field number for the "oneof_bool" field.</summary>
-    public const int OneofBoolFieldNumber = 115;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool OneofBool {
-      get { return oneofFieldCase_ == OneofFieldOneofCase.OneofBool ? (bool) oneofField_ : false; }
-      set {
-        oneofField_ = value;
-        oneofFieldCase_ = OneofFieldOneofCase.OneofBool;
-      }
-    }
-
-    /// <summary>Field number for the "oneof_uint64" field.</summary>
-    public const int OneofUint64FieldNumber = 116;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ulong OneofUint64 {
-      get { return oneofFieldCase_ == OneofFieldOneofCase.OneofUint64 ? (ulong) oneofField_ : 0UL; }
-      set {
-        oneofField_ = value;
-        oneofFieldCase_ = OneofFieldOneofCase.OneofUint64;
-      }
-    }
-
-    /// <summary>Field number for the "oneof_float" field.</summary>
-    public const int OneofFloatFieldNumber = 117;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public float OneofFloat {
-      get { return oneofFieldCase_ == OneofFieldOneofCase.OneofFloat ? (float) oneofField_ : 0F; }
-      set {
-        oneofField_ = value;
-        oneofFieldCase_ = OneofFieldOneofCase.OneofFloat;
-      }
-    }
-
-    /// <summary>Field number for the "oneof_double" field.</summary>
-    public const int OneofDoubleFieldNumber = 118;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double OneofDouble {
-      get { return oneofFieldCase_ == OneofFieldOneofCase.OneofDouble ? (double) oneofField_ : 0D; }
-      set {
-        oneofField_ = value;
-        oneofFieldCase_ = OneofFieldOneofCase.OneofDouble;
-      }
-    }
-
-    /// <summary>Field number for the "oneof_enum" field.</summary>
-    public const int OneofEnumFieldNumber = 119;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::ProtobufTestMessages.Proto3.TestAllTypesProto3.Types.NestedEnum OneofEnum {
-      get { return oneofFieldCase_ == OneofFieldOneofCase.OneofEnum ? (global::ProtobufTestMessages.Proto3.TestAllTypesProto3.Types.NestedEnum) oneofField_ : global::ProtobufTestMessages.Proto3.TestAllTypesProto3.Types.NestedEnum.Foo; }
-      set {
-        oneofField_ = value;
-        oneofFieldCase_ = OneofFieldOneofCase.OneofEnum;
-      }
-    }
-
-    /// <summary>Field number for the "oneof_null_value" field.</summary>
-    public const int OneofNullValueFieldNumber = 120;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.WellKnownTypes.NullValue OneofNullValue {
-      get { return oneofFieldCase_ == OneofFieldOneofCase.OneofNullValue ? (global::Google.Protobuf.WellKnownTypes.NullValue) oneofField_ : global::Google.Protobuf.WellKnownTypes.NullValue.NullValue; }
-      set {
-        oneofField_ = value;
-        oneofFieldCase_ = OneofFieldOneofCase.OneofNullValue;
-      }
-    }
-
-    /// <summary>Field number for the "optional_bool_wrapper" field.</summary>
-    public const int OptionalBoolWrapperFieldNumber = 201;
-    private static readonly pb::FieldCodec<bool?> _single_optionalBoolWrapper_codec = pb::FieldCodec.ForStructWrapper<bool>(1610);
-    private bool? optionalBoolWrapper_;
-    /// <summary>
-    /// Well-known types
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool? OptionalBoolWrapper {
-      get { return optionalBoolWrapper_; }
-      set {
-        optionalBoolWrapper_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "optional_int32_wrapper" field.</summary>
-    public const int OptionalInt32WrapperFieldNumber = 202;
-    private static readonly pb::FieldCodec<int?> _single_optionalInt32Wrapper_codec = pb::FieldCodec.ForStructWrapper<int>(1618);
-    private int? optionalInt32Wrapper_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int? OptionalInt32Wrapper {
-      get { return optionalInt32Wrapper_; }
-      set {
-        optionalInt32Wrapper_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "optional_int64_wrapper" field.</summary>
-    public const int OptionalInt64WrapperFieldNumber = 203;
-    private static readonly pb::FieldCodec<long?> _single_optionalInt64Wrapper_codec = pb::FieldCodec.ForStructWrapper<long>(1626);
-    private long? optionalInt64Wrapper_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public long? OptionalInt64Wrapper {
-      get { return optionalInt64Wrapper_; }
-      set {
-        optionalInt64Wrapper_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "optional_uint32_wrapper" field.</summary>
-    public const int OptionalUint32WrapperFieldNumber = 204;
-    private static readonly pb::FieldCodec<uint?> _single_optionalUint32Wrapper_codec = pb::FieldCodec.ForStructWrapper<uint>(1634);
-    private uint? optionalUint32Wrapper_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public uint? OptionalUint32Wrapper {
-      get { return optionalUint32Wrapper_; }
-      set {
-        optionalUint32Wrapper_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "optional_uint64_wrapper" field.</summary>
-    public const int OptionalUint64WrapperFieldNumber = 205;
-    private static readonly pb::FieldCodec<ulong?> _single_optionalUint64Wrapper_codec = pb::FieldCodec.ForStructWrapper<ulong>(1642);
-    private ulong? optionalUint64Wrapper_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ulong? OptionalUint64Wrapper {
-      get { return optionalUint64Wrapper_; }
-      set {
-        optionalUint64Wrapper_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "optional_float_wrapper" field.</summary>
-    public const int OptionalFloatWrapperFieldNumber = 206;
-    private static readonly pb::FieldCodec<float?> _single_optionalFloatWrapper_codec = pb::FieldCodec.ForStructWrapper<float>(1650);
-    private float? optionalFloatWrapper_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public float? OptionalFloatWrapper {
-      get { return optionalFloatWrapper_; }
-      set {
-        optionalFloatWrapper_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "optional_double_wrapper" field.</summary>
-    public const int OptionalDoubleWrapperFieldNumber = 207;
-    private static readonly pb::FieldCodec<double?> _single_optionalDoubleWrapper_codec = pb::FieldCodec.ForStructWrapper<double>(1658);
-    private double? optionalDoubleWrapper_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double? OptionalDoubleWrapper {
-      get { return optionalDoubleWrapper_; }
-      set {
-        optionalDoubleWrapper_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "optional_string_wrapper" field.</summary>
-    public const int OptionalStringWrapperFieldNumber = 208;
-    private static readonly pb::FieldCodec<string> _single_optionalStringWrapper_codec = pb::FieldCodec.ForClassWrapper<string>(1666);
-    private string optionalStringWrapper_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string OptionalStringWrapper {
-      get { return optionalStringWrapper_; }
-      set {
-        optionalStringWrapper_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "optional_bytes_wrapper" field.</summary>
-    public const int OptionalBytesWrapperFieldNumber = 209;
-    private static readonly pb::FieldCodec<pb::ByteString> _single_optionalBytesWrapper_codec = pb::FieldCodec.ForClassWrapper<pb::ByteString>(1674);
-    private pb::ByteString optionalBytesWrapper_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pb::ByteString OptionalBytesWrapper {
-      get { return optionalBytesWrapper_; }
-      set {
-        optionalBytesWrapper_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "repeated_bool_wrapper" field.</summary>
-    public const int RepeatedBoolWrapperFieldNumber = 211;
-    private static readonly pb::FieldCodec<bool?> _repeated_repeatedBoolWrapper_codec
-        = pb::FieldCodec.ForStructWrapper<bool>(1690);
-    private readonly pbc::RepeatedField<bool?> repeatedBoolWrapper_ = new pbc::RepeatedField<bool?>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<bool?> RepeatedBoolWrapper {
-      get { return repeatedBoolWrapper_; }
-    }
-
-    /// <summary>Field number for the "repeated_int32_wrapper" field.</summary>
-    public const int RepeatedInt32WrapperFieldNumber = 212;
-    private static readonly pb::FieldCodec<int?> _repeated_repeatedInt32Wrapper_codec
-        = pb::FieldCodec.ForStructWrapper<int>(1698);
-    private readonly pbc::RepeatedField<int?> repeatedInt32Wrapper_ = new pbc::RepeatedField<int?>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<int?> RepeatedInt32Wrapper {
-      get { return repeatedInt32Wrapper_; }
-    }
-
-    /// <summary>Field number for the "repeated_int64_wrapper" field.</summary>
-    public const int RepeatedInt64WrapperFieldNumber = 213;
-    private static readonly pb::FieldCodec<long?> _repeated_repeatedInt64Wrapper_codec
-        = pb::FieldCodec.ForStructWrapper<long>(1706);
-    private readonly pbc::RepeatedField<long?> repeatedInt64Wrapper_ = new pbc::RepeatedField<long?>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<long?> RepeatedInt64Wrapper {
-      get { return repeatedInt64Wrapper_; }
-    }
-
-    /// <summary>Field number for the "repeated_uint32_wrapper" field.</summary>
-    public const int RepeatedUint32WrapperFieldNumber = 214;
-    private static readonly pb::FieldCodec<uint?> _repeated_repeatedUint32Wrapper_codec
-        = pb::FieldCodec.ForStructWrapper<uint>(1714);
-    private readonly pbc::RepeatedField<uint?> repeatedUint32Wrapper_ = new pbc::RepeatedField<uint?>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<uint?> RepeatedUint32Wrapper {
-      get { return repeatedUint32Wrapper_; }
-    }
-
-    /// <summary>Field number for the "repeated_uint64_wrapper" field.</summary>
-    public const int RepeatedUint64WrapperFieldNumber = 215;
-    private static readonly pb::FieldCodec<ulong?> _repeated_repeatedUint64Wrapper_codec
-        = pb::FieldCodec.ForStructWrapper<ulong>(1722);
-    private readonly pbc::RepeatedField<ulong?> repeatedUint64Wrapper_ = new pbc::RepeatedField<ulong?>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<ulong?> RepeatedUint64Wrapper {
-      get { return repeatedUint64Wrapper_; }
-    }
-
-    /// <summary>Field number for the "repeated_float_wrapper" field.</summary>
-    public const int RepeatedFloatWrapperFieldNumber = 216;
-    private static readonly pb::FieldCodec<float?> _repeated_repeatedFloatWrapper_codec
-        = pb::FieldCodec.ForStructWrapper<float>(1730);
-    private readonly pbc::RepeatedField<float?> repeatedFloatWrapper_ = new pbc::RepeatedField<float?>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<float?> RepeatedFloatWrapper {
-      get { return repeatedFloatWrapper_; }
-    }
-
-    /// <summary>Field number for the "repeated_double_wrapper" field.</summary>
-    public const int RepeatedDoubleWrapperFieldNumber = 217;
-    private static readonly pb::FieldCodec<double?> _repeated_repeatedDoubleWrapper_codec
-        = pb::FieldCodec.ForStructWrapper<double>(1738);
-    private readonly pbc::RepeatedField<double?> repeatedDoubleWrapper_ = new pbc::RepeatedField<double?>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<double?> RepeatedDoubleWrapper {
-      get { return repeatedDoubleWrapper_; }
-    }
-
-    /// <summary>Field number for the "repeated_string_wrapper" field.</summary>
-    public const int RepeatedStringWrapperFieldNumber = 218;
-    private static readonly pb::FieldCodec<string> _repeated_repeatedStringWrapper_codec
-        = pb::FieldCodec.ForClassWrapper<string>(1746);
-    private readonly pbc::RepeatedField<string> repeatedStringWrapper_ = new pbc::RepeatedField<string>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<string> RepeatedStringWrapper {
-      get { return repeatedStringWrapper_; }
-    }
-
-    /// <summary>Field number for the "repeated_bytes_wrapper" field.</summary>
-    public const int RepeatedBytesWrapperFieldNumber = 219;
-    private static readonly pb::FieldCodec<pb::ByteString> _repeated_repeatedBytesWrapper_codec
-        = pb::FieldCodec.ForClassWrapper<pb::ByteString>(1754);
-    private readonly pbc::RepeatedField<pb::ByteString> repeatedBytesWrapper_ = new pbc::RepeatedField<pb::ByteString>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<pb::ByteString> RepeatedBytesWrapper {
-      get { return repeatedBytesWrapper_; }
-    }
-
-    /// <summary>Field number for the "optional_duration" field.</summary>
-    public const int OptionalDurationFieldNumber = 301;
-    private global::Google.Protobuf.WellKnownTypes.Duration optionalDuration_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.WellKnownTypes.Duration OptionalDuration {
-      get { return optionalDuration_; }
-      set {
-        optionalDuration_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "optional_timestamp" field.</summary>
-    public const int OptionalTimestampFieldNumber = 302;
-    private global::Google.Protobuf.WellKnownTypes.Timestamp optionalTimestamp_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.WellKnownTypes.Timestamp OptionalTimestamp {
-      get { return optionalTimestamp_; }
-      set {
-        optionalTimestamp_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "optional_field_mask" field.</summary>
-    public const int OptionalFieldMaskFieldNumber = 303;
-    private global::Google.Protobuf.WellKnownTypes.FieldMask optionalFieldMask_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.WellKnownTypes.FieldMask OptionalFieldMask {
-      get { return optionalFieldMask_; }
-      set {
-        optionalFieldMask_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "optional_struct" field.</summary>
-    public const int OptionalStructFieldNumber = 304;
-    private global::Google.Protobuf.WellKnownTypes.Struct optionalStruct_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.WellKnownTypes.Struct OptionalStruct {
-      get { return optionalStruct_; }
-      set {
-        optionalStruct_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "optional_any" field.</summary>
-    public const int OptionalAnyFieldNumber = 305;
-    private global::Google.Protobuf.WellKnownTypes.Any optionalAny_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.WellKnownTypes.Any OptionalAny {
-      get { return optionalAny_; }
-      set {
-        optionalAny_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "optional_value" field.</summary>
-    public const int OptionalValueFieldNumber = 306;
-    private global::Google.Protobuf.WellKnownTypes.Value optionalValue_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.WellKnownTypes.Value OptionalValue {
-      get { return optionalValue_; }
-      set {
-        optionalValue_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "optional_null_value" field.</summary>
-    public const int OptionalNullValueFieldNumber = 307;
-    private global::Google.Protobuf.WellKnownTypes.NullValue optionalNullValue_ = global::Google.Protobuf.WellKnownTypes.NullValue.NullValue;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.WellKnownTypes.NullValue OptionalNullValue {
-      get { return optionalNullValue_; }
-      set {
-        optionalNullValue_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "repeated_duration" field.</summary>
-    public const int RepeatedDurationFieldNumber = 311;
-    private static readonly pb::FieldCodec<global::Google.Protobuf.WellKnownTypes.Duration> _repeated_repeatedDuration_codec
-        = pb::FieldCodec.ForMessage(2490, global::Google.Protobuf.WellKnownTypes.Duration.Parser);
-    private readonly pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Duration> repeatedDuration_ = new pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Duration>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Duration> RepeatedDuration {
-      get { return repeatedDuration_; }
-    }
-
-    /// <summary>Field number for the "repeated_timestamp" field.</summary>
-    public const int RepeatedTimestampFieldNumber = 312;
-    private static readonly pb::FieldCodec<global::Google.Protobuf.WellKnownTypes.Timestamp> _repeated_repeatedTimestamp_codec
-        = pb::FieldCodec.ForMessage(2498, global::Google.Protobuf.WellKnownTypes.Timestamp.Parser);
-    private readonly pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Timestamp> repeatedTimestamp_ = new pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Timestamp>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Timestamp> RepeatedTimestamp {
-      get { return repeatedTimestamp_; }
-    }
-
-    /// <summary>Field number for the "repeated_fieldmask" field.</summary>
-    public const int RepeatedFieldmaskFieldNumber = 313;
-    private static readonly pb::FieldCodec<global::Google.Protobuf.WellKnownTypes.FieldMask> _repeated_repeatedFieldmask_codec
-        = pb::FieldCodec.ForMessage(2506, global::Google.Protobuf.WellKnownTypes.FieldMask.Parser);
-    private readonly pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.FieldMask> repeatedFieldmask_ = new pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.FieldMask>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.FieldMask> RepeatedFieldmask {
-      get { return repeatedFieldmask_; }
-    }
-
-    /// <summary>Field number for the "repeated_struct" field.</summary>
-    public const int RepeatedStructFieldNumber = 324;
-    private static readonly pb::FieldCodec<global::Google.Protobuf.WellKnownTypes.Struct> _repeated_repeatedStruct_codec
-        = pb::FieldCodec.ForMessage(2594, global::Google.Protobuf.WellKnownTypes.Struct.Parser);
-    private readonly pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Struct> repeatedStruct_ = new pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Struct>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Struct> RepeatedStruct {
-      get { return repeatedStruct_; }
-    }
-
-    /// <summary>Field number for the "repeated_any" field.</summary>
-    public const int RepeatedAnyFieldNumber = 315;
-    private static readonly pb::FieldCodec<global::Google.Protobuf.WellKnownTypes.Any> _repeated_repeatedAny_codec
-        = pb::FieldCodec.ForMessage(2522, global::Google.Protobuf.WellKnownTypes.Any.Parser);
-    private readonly pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Any> repeatedAny_ = new pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Any>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Any> RepeatedAny {
-      get { return repeatedAny_; }
-    }
-
-    /// <summary>Field number for the "repeated_value" field.</summary>
-    public const int RepeatedValueFieldNumber = 316;
-    private static readonly pb::FieldCodec<global::Google.Protobuf.WellKnownTypes.Value> _repeated_repeatedValue_codec
-        = pb::FieldCodec.ForMessage(2530, global::Google.Protobuf.WellKnownTypes.Value.Parser);
-    private readonly pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Value> repeatedValue_ = new pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Value>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Value> RepeatedValue {
-      get { return repeatedValue_; }
-    }
-
-    /// <summary>Field number for the "repeated_list_value" field.</summary>
-    public const int RepeatedListValueFieldNumber = 317;
-    private static readonly pb::FieldCodec<global::Google.Protobuf.WellKnownTypes.ListValue> _repeated_repeatedListValue_codec
-        = pb::FieldCodec.ForMessage(2538, global::Google.Protobuf.WellKnownTypes.ListValue.Parser);
-    private readonly pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.ListValue> repeatedListValue_ = new pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.ListValue>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.ListValue> RepeatedListValue {
-      get { return repeatedListValue_; }
-    }
-
-    /// <summary>Field number for the "fieldname1" field.</summary>
-    public const int Fieldname1FieldNumber = 401;
-    private int fieldname1_;
-    /// <summary>
-    /// Test field-name-to-JSON-name convention.
-    /// (protobuf says names can be any valid C/C++ identifier.)
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int Fieldname1 {
-      get { return fieldname1_; }
-      set {
-        fieldname1_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "field_name2" field.</summary>
-    public const int FieldName2FieldNumber = 402;
-    private int fieldName2_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int FieldName2 {
-      get { return fieldName2_; }
-      set {
-        fieldName2_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "_field_name3" field.</summary>
-    public const int FieldName3FieldNumber = 403;
-    private int FieldName3_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int FieldName3 {
-      get { return FieldName3_; }
-      set {
-        FieldName3_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "field__name4_" field.</summary>
-    public const int FieldName4FieldNumber = 404;
-    private int fieldName4_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int FieldName4 {
-      get { return fieldName4_; }
-      set {
-        fieldName4_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "field0name5" field.</summary>
-    public const int Field0Name5FieldNumber = 405;
-    private int field0Name5_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int Field0Name5 {
-      get { return field0Name5_; }
-      set {
-        field0Name5_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "field_0_name6" field.</summary>
-    public const int Field0Name6FieldNumber = 406;
-    private int field0Name6_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int Field0Name6 {
-      get { return field0Name6_; }
-      set {
-        field0Name6_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "fieldName7" field.</summary>
-    public const int FieldName7FieldNumber = 407;
-    private int fieldName7_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int FieldName7 {
-      get { return fieldName7_; }
-      set {
-        fieldName7_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "FieldName8" field.</summary>
-    public const int FieldName8FieldNumber = 408;
-    private int fieldName8_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int FieldName8 {
-      get { return fieldName8_; }
-      set {
-        fieldName8_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "field_Name9" field.</summary>
-    public const int FieldName9FieldNumber = 409;
-    private int fieldName9_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int FieldName9 {
-      get { return fieldName9_; }
-      set {
-        fieldName9_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "Field_Name10" field.</summary>
-    public const int FieldName10FieldNumber = 410;
-    private int fieldName10_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int FieldName10 {
-      get { return fieldName10_; }
-      set {
-        fieldName10_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "FIELD_NAME11" field.</summary>
-    public const int FIELDNAME11FieldNumber = 411;
-    private int fIELDNAME11_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int FIELDNAME11 {
-      get { return fIELDNAME11_; }
-      set {
-        fIELDNAME11_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "FIELD_name12" field.</summary>
-    public const int FIELDName12FieldNumber = 412;
-    private int fIELDName12_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int FIELDName12 {
-      get { return fIELDName12_; }
-      set {
-        fIELDName12_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "__field_name13" field.</summary>
-    public const int FieldName13FieldNumber = 413;
-    private int FieldName13_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int FieldName13 {
-      get { return FieldName13_; }
-      set {
-        FieldName13_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "__Field_name14" field.</summary>
-    public const int FieldName14FieldNumber = 414;
-    private int FieldName14_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int FieldName14 {
-      get { return FieldName14_; }
-      set {
-        FieldName14_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "field__name15" field.</summary>
-    public const int FieldName15FieldNumber = 415;
-    private int fieldName15_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int FieldName15 {
-      get { return fieldName15_; }
-      set {
-        fieldName15_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "field__Name16" field.</summary>
-    public const int FieldName16FieldNumber = 416;
-    private int fieldName16_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int FieldName16 {
-      get { return fieldName16_; }
-      set {
-        fieldName16_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "field_name17__" field.</summary>
-    public const int FieldName17FieldNumber = 417;
-    private int fieldName17_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int FieldName17 {
-      get { return fieldName17_; }
-      set {
-        fieldName17_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "Field_name18__" field.</summary>
-    public const int FieldName18FieldNumber = 418;
-    private int fieldName18_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int FieldName18 {
-      get { return fieldName18_; }
-      set {
-        fieldName18_ = value;
-      }
-    }
-
-    private object oneofField_;
-    /// <summary>Enum of possible cases for the "oneof_field" oneof.</summary>
-    public enum OneofFieldOneofCase {
-      None = 0,
-      OneofUint32 = 111,
-      OneofNestedMessage = 112,
-      OneofString = 113,
-      OneofBytes = 114,
-      OneofBool = 115,
-      OneofUint64 = 116,
-      OneofFloat = 117,
-      OneofDouble = 118,
-      OneofEnum = 119,
-      OneofNullValue = 120,
-    }
-    private OneofFieldOneofCase oneofFieldCase_ = OneofFieldOneofCase.None;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public OneofFieldOneofCase OneofFieldCase {
-      get { return oneofFieldCase_; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearOneofField() {
-      oneofFieldCase_ = OneofFieldOneofCase.None;
-      oneofField_ = null;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as TestAllTypesProto3);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(TestAllTypesProto3 other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (OptionalInt32 != other.OptionalInt32) return false;
-      if (OptionalInt64 != other.OptionalInt64) return false;
-      if (OptionalUint32 != other.OptionalUint32) return false;
-      if (OptionalUint64 != other.OptionalUint64) return false;
-      if (OptionalSint32 != other.OptionalSint32) return false;
-      if (OptionalSint64 != other.OptionalSint64) return false;
-      if (OptionalFixed32 != other.OptionalFixed32) return false;
-      if (OptionalFixed64 != other.OptionalFixed64) return false;
-      if (OptionalSfixed32 != other.OptionalSfixed32) return false;
-      if (OptionalSfixed64 != other.OptionalSfixed64) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.Equals(OptionalFloat, other.OptionalFloat)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.Equals(OptionalDouble, other.OptionalDouble)) return false;
-      if (OptionalBool != other.OptionalBool) return false;
-      if (OptionalString != other.OptionalString) return false;
-      if (OptionalBytes != other.OptionalBytes) return false;
-      if (!object.Equals(OptionalNestedMessage, other.OptionalNestedMessage)) return false;
-      if (!object.Equals(OptionalForeignMessage, other.OptionalForeignMessage)) return false;
-      if (OptionalNestedEnum != other.OptionalNestedEnum) return false;
-      if (OptionalForeignEnum != other.OptionalForeignEnum) return false;
-      if (OptionalAliasedEnum != other.OptionalAliasedEnum) return false;
-      if (OptionalStringPiece != other.OptionalStringPiece) return false;
-      if (OptionalCord != other.OptionalCord) return false;
-      if (!object.Equals(RecursiveMessage, other.RecursiveMessage)) return false;
-      if(!repeatedInt32_.Equals(other.repeatedInt32_)) return false;
-      if(!repeatedInt64_.Equals(other.repeatedInt64_)) return false;
-      if(!repeatedUint32_.Equals(other.repeatedUint32_)) return false;
-      if(!repeatedUint64_.Equals(other.repeatedUint64_)) return false;
-      if(!repeatedSint32_.Equals(other.repeatedSint32_)) return false;
-      if(!repeatedSint64_.Equals(other.repeatedSint64_)) return false;
-      if(!repeatedFixed32_.Equals(other.repeatedFixed32_)) return false;
-      if(!repeatedFixed64_.Equals(other.repeatedFixed64_)) return false;
-      if(!repeatedSfixed32_.Equals(other.repeatedSfixed32_)) return false;
-      if(!repeatedSfixed64_.Equals(other.repeatedSfixed64_)) return false;
-      if(!repeatedFloat_.Equals(other.repeatedFloat_)) return false;
-      if(!repeatedDouble_.Equals(other.repeatedDouble_)) return false;
-      if(!repeatedBool_.Equals(other.repeatedBool_)) return false;
-      if(!repeatedString_.Equals(other.repeatedString_)) return false;
-      if(!repeatedBytes_.Equals(other.repeatedBytes_)) return false;
-      if(!repeatedNestedMessage_.Equals(other.repeatedNestedMessage_)) return false;
-      if(!repeatedForeignMessage_.Equals(other.repeatedForeignMessage_)) return false;
-      if(!repeatedNestedEnum_.Equals(other.repeatedNestedEnum_)) return false;
-      if(!repeatedForeignEnum_.Equals(other.repeatedForeignEnum_)) return false;
-      if(!repeatedStringPiece_.Equals(other.repeatedStringPiece_)) return false;
-      if(!repeatedCord_.Equals(other.repeatedCord_)) return false;
-      if(!packedInt32_.Equals(other.packedInt32_)) return false;
-      if(!packedInt64_.Equals(other.packedInt64_)) return false;
-      if(!packedUint32_.Equals(other.packedUint32_)) return false;
-      if(!packedUint64_.Equals(other.packedUint64_)) return false;
-      if(!packedSint32_.Equals(other.packedSint32_)) return false;
-      if(!packedSint64_.Equals(other.packedSint64_)) return false;
-      if(!packedFixed32_.Equals(other.packedFixed32_)) return false;
-      if(!packedFixed64_.Equals(other.packedFixed64_)) return false;
-      if(!packedSfixed32_.Equals(other.packedSfixed32_)) return false;
-      if(!packedSfixed64_.Equals(other.packedSfixed64_)) return false;
-      if(!packedFloat_.Equals(other.packedFloat_)) return false;
-      if(!packedDouble_.Equals(other.packedDouble_)) return false;
-      if(!packedBool_.Equals(other.packedBool_)) return false;
-      if(!packedNestedEnum_.Equals(other.packedNestedEnum_)) return false;
-      if(!unpackedInt32_.Equals(other.unpackedInt32_)) return false;
-      if(!unpackedInt64_.Equals(other.unpackedInt64_)) return false;
-      if(!unpackedUint32_.Equals(other.unpackedUint32_)) return false;
-      if(!unpackedUint64_.Equals(other.unpackedUint64_)) return false;
-      if(!unpackedSint32_.Equals(other.unpackedSint32_)) return false;
-      if(!unpackedSint64_.Equals(other.unpackedSint64_)) return false;
-      if(!unpackedFixed32_.Equals(other.unpackedFixed32_)) return false;
-      if(!unpackedFixed64_.Equals(other.unpackedFixed64_)) return false;
-      if(!unpackedSfixed32_.Equals(other.unpackedSfixed32_)) return false;
-      if(!unpackedSfixed64_.Equals(other.unpackedSfixed64_)) return false;
-      if(!unpackedFloat_.Equals(other.unpackedFloat_)) return false;
-      if(!unpackedDouble_.Equals(other.unpackedDouble_)) return false;
-      if(!unpackedBool_.Equals(other.unpackedBool_)) return false;
-      if(!unpackedNestedEnum_.Equals(other.unpackedNestedEnum_)) return false;
-      if (!MapInt32Int32.Equals(other.MapInt32Int32)) return false;
-      if (!MapInt64Int64.Equals(other.MapInt64Int64)) return false;
-      if (!MapUint32Uint32.Equals(other.MapUint32Uint32)) return false;
-      if (!MapUint64Uint64.Equals(other.MapUint64Uint64)) return false;
-      if (!MapSint32Sint32.Equals(other.MapSint32Sint32)) return false;
-      if (!MapSint64Sint64.Equals(other.MapSint64Sint64)) return false;
-      if (!MapFixed32Fixed32.Equals(other.MapFixed32Fixed32)) return false;
-      if (!MapFixed64Fixed64.Equals(other.MapFixed64Fixed64)) return false;
-      if (!MapSfixed32Sfixed32.Equals(other.MapSfixed32Sfixed32)) return false;
-      if (!MapSfixed64Sfixed64.Equals(other.MapSfixed64Sfixed64)) return false;
-      if (!MapInt32Float.Equals(other.MapInt32Float)) return false;
-      if (!MapInt32Double.Equals(other.MapInt32Double)) return false;
-      if (!MapBoolBool.Equals(other.MapBoolBool)) return false;
-      if (!MapStringString.Equals(other.MapStringString)) return false;
-      if (!MapStringBytes.Equals(other.MapStringBytes)) return false;
-      if (!MapStringNestedMessage.Equals(other.MapStringNestedMessage)) return false;
-      if (!MapStringForeignMessage.Equals(other.MapStringForeignMessage)) return false;
-      if (!MapStringNestedEnum.Equals(other.MapStringNestedEnum)) return false;
-      if (!MapStringForeignEnum.Equals(other.MapStringForeignEnum)) return false;
-      if (OneofUint32 != other.OneofUint32) return false;
-      if (!object.Equals(OneofNestedMessage, other.OneofNestedMessage)) return false;
-      if (OneofString != other.OneofString) return false;
-      if (OneofBytes != other.OneofBytes) return false;
-      if (OneofBool != other.OneofBool) return false;
-      if (OneofUint64 != other.OneofUint64) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.Equals(OneofFloat, other.OneofFloat)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.Equals(OneofDouble, other.OneofDouble)) return false;
-      if (OneofEnum != other.OneofEnum) return false;
-      if (OneofNullValue != other.OneofNullValue) return false;
-      if (OptionalBoolWrapper != other.OptionalBoolWrapper) return false;
-      if (OptionalInt32Wrapper != other.OptionalInt32Wrapper) return false;
-      if (OptionalInt64Wrapper != other.OptionalInt64Wrapper) return false;
-      if (OptionalUint32Wrapper != other.OptionalUint32Wrapper) return false;
-      if (OptionalUint64Wrapper != other.OptionalUint64Wrapper) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseNullableSingleEqualityComparer.Equals(OptionalFloatWrapper, other.OptionalFloatWrapper)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.Equals(OptionalDoubleWrapper, other.OptionalDoubleWrapper)) return false;
-      if (OptionalStringWrapper != other.OptionalStringWrapper) return false;
-      if (OptionalBytesWrapper != other.OptionalBytesWrapper) return false;
-      if(!repeatedBoolWrapper_.Equals(other.repeatedBoolWrapper_)) return false;
-      if(!repeatedInt32Wrapper_.Equals(other.repeatedInt32Wrapper_)) return false;
-      if(!repeatedInt64Wrapper_.Equals(other.repeatedInt64Wrapper_)) return false;
-      if(!repeatedUint32Wrapper_.Equals(other.repeatedUint32Wrapper_)) return false;
-      if(!repeatedUint64Wrapper_.Equals(other.repeatedUint64Wrapper_)) return false;
-      if(!repeatedFloatWrapper_.Equals(other.repeatedFloatWrapper_)) return false;
-      if(!repeatedDoubleWrapper_.Equals(other.repeatedDoubleWrapper_)) return false;
-      if(!repeatedStringWrapper_.Equals(other.repeatedStringWrapper_)) return false;
-      if(!repeatedBytesWrapper_.Equals(other.repeatedBytesWrapper_)) return false;
-      if (!object.Equals(OptionalDuration, other.OptionalDuration)) return false;
-      if (!object.Equals(OptionalTimestamp, other.OptionalTimestamp)) return false;
-      if (!object.Equals(OptionalFieldMask, other.OptionalFieldMask)) return false;
-      if (!object.Equals(OptionalStruct, other.OptionalStruct)) return false;
-      if (!object.Equals(OptionalAny, other.OptionalAny)) return false;
-      if (!object.Equals(OptionalValue, other.OptionalValue)) return false;
-      if (OptionalNullValue != other.OptionalNullValue) return false;
-      if(!repeatedDuration_.Equals(other.repeatedDuration_)) return false;
-      if(!repeatedTimestamp_.Equals(other.repeatedTimestamp_)) return false;
-      if(!repeatedFieldmask_.Equals(other.repeatedFieldmask_)) return false;
-      if(!repeatedStruct_.Equals(other.repeatedStruct_)) return false;
-      if(!repeatedAny_.Equals(other.repeatedAny_)) return false;
-      if(!repeatedValue_.Equals(other.repeatedValue_)) return false;
-      if(!repeatedListValue_.Equals(other.repeatedListValue_)) return false;
-      if (Fieldname1 != other.Fieldname1) return false;
-      if (FieldName2 != other.FieldName2) return false;
-      if (FieldName3 != other.FieldName3) return false;
-      if (FieldName4 != other.FieldName4) return false;
-      if (Field0Name5 != other.Field0Name5) return false;
-      if (Field0Name6 != other.Field0Name6) return false;
-      if (FieldName7 != other.FieldName7) return false;
-      if (FieldName8 != other.FieldName8) return false;
-      if (FieldName9 != other.FieldName9) return false;
-      if (FieldName10 != other.FieldName10) return false;
-      if (FIELDNAME11 != other.FIELDNAME11) return false;
-      if (FIELDName12 != other.FIELDName12) return false;
-      if (FieldName13 != other.FieldName13) return false;
-      if (FieldName14 != other.FieldName14) return false;
-      if (FieldName15 != other.FieldName15) return false;
-      if (FieldName16 != other.FieldName16) return false;
-      if (FieldName17 != other.FieldName17) return false;
-      if (FieldName18 != other.FieldName18) return false;
-      if (OneofFieldCase != other.OneofFieldCase) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (OptionalInt32 != 0) hash ^= OptionalInt32.GetHashCode();
-      if (OptionalInt64 != 0L) hash ^= OptionalInt64.GetHashCode();
-      if (OptionalUint32 != 0) hash ^= OptionalUint32.GetHashCode();
-      if (OptionalUint64 != 0UL) hash ^= OptionalUint64.GetHashCode();
-      if (OptionalSint32 != 0) hash ^= OptionalSint32.GetHashCode();
-      if (OptionalSint64 != 0L) hash ^= OptionalSint64.GetHashCode();
-      if (OptionalFixed32 != 0) hash ^= OptionalFixed32.GetHashCode();
-      if (OptionalFixed64 != 0UL) hash ^= OptionalFixed64.GetHashCode();
-      if (OptionalSfixed32 != 0) hash ^= OptionalSfixed32.GetHashCode();
-      if (OptionalSfixed64 != 0L) hash ^= OptionalSfixed64.GetHashCode();
-      if (OptionalFloat != 0F) hash ^= pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.GetHashCode(OptionalFloat);
-      if (OptionalDouble != 0D) hash ^= pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.GetHashCode(OptionalDouble);
-      if (OptionalBool != false) hash ^= OptionalBool.GetHashCode();
-      if (OptionalString.Length != 0) hash ^= OptionalString.GetHashCode();
-      if (OptionalBytes.Length != 0) hash ^= OptionalBytes.GetHashCode();
-      if (optionalNestedMessage_ != null) hash ^= OptionalNestedMessage.GetHashCode();
-      if (optionalForeignMessage_ != null) hash ^= OptionalForeignMessage.GetHashCode();
-      if (OptionalNestedEnum != global::ProtobufTestMessages.Proto3.TestAllTypesProto3.Types.NestedEnum.Foo) hash ^= OptionalNestedEnum.GetHashCode();
-      if (OptionalForeignEnum != global::ProtobufTestMessages.Proto3.ForeignEnum.ForeignFoo) hash ^= OptionalForeignEnum.GetHashCode();
-      if (OptionalAliasedEnum != global::ProtobufTestMessages.Proto3.TestAllTypesProto3.Types.AliasedEnum.AliasFoo) hash ^= OptionalAliasedEnum.GetHashCode();
-      if (OptionalStringPiece.Length != 0) hash ^= OptionalStringPiece.GetHashCode();
-      if (OptionalCord.Length != 0) hash ^= OptionalCord.GetHashCode();
-      if (recursiveMessage_ != null) hash ^= RecursiveMessage.GetHashCode();
-      hash ^= repeatedInt32_.GetHashCode();
-      hash ^= repeatedInt64_.GetHashCode();
-      hash ^= repeatedUint32_.GetHashCode();
-      hash ^= repeatedUint64_.GetHashCode();
-      hash ^= repeatedSint32_.GetHashCode();
-      hash ^= repeatedSint64_.GetHashCode();
-      hash ^= repeatedFixed32_.GetHashCode();
-      hash ^= repeatedFixed64_.GetHashCode();
-      hash ^= repeatedSfixed32_.GetHashCode();
-      hash ^= repeatedSfixed64_.GetHashCode();
-      hash ^= repeatedFloat_.GetHashCode();
-      hash ^= repeatedDouble_.GetHashCode();
-      hash ^= repeatedBool_.GetHashCode();
-      hash ^= repeatedString_.GetHashCode();
-      hash ^= repeatedBytes_.GetHashCode();
-      hash ^= repeatedNestedMessage_.GetHashCode();
-      hash ^= repeatedForeignMessage_.GetHashCode();
-      hash ^= repeatedNestedEnum_.GetHashCode();
-      hash ^= repeatedForeignEnum_.GetHashCode();
-      hash ^= repeatedStringPiece_.GetHashCode();
-      hash ^= repeatedCord_.GetHashCode();
-      hash ^= packedInt32_.GetHashCode();
-      hash ^= packedInt64_.GetHashCode();
-      hash ^= packedUint32_.GetHashCode();
-      hash ^= packedUint64_.GetHashCode();
-      hash ^= packedSint32_.GetHashCode();
-      hash ^= packedSint64_.GetHashCode();
-      hash ^= packedFixed32_.GetHashCode();
-      hash ^= packedFixed64_.GetHashCode();
-      hash ^= packedSfixed32_.GetHashCode();
-      hash ^= packedSfixed64_.GetHashCode();
-      hash ^= packedFloat_.GetHashCode();
-      hash ^= packedDouble_.GetHashCode();
-      hash ^= packedBool_.GetHashCode();
-      hash ^= packedNestedEnum_.GetHashCode();
-      hash ^= unpackedInt32_.GetHashCode();
-      hash ^= unpackedInt64_.GetHashCode();
-      hash ^= unpackedUint32_.GetHashCode();
-      hash ^= unpackedUint64_.GetHashCode();
-      hash ^= unpackedSint32_.GetHashCode();
-      hash ^= unpackedSint64_.GetHashCode();
-      hash ^= unpackedFixed32_.GetHashCode();
-      hash ^= unpackedFixed64_.GetHashCode();
-      hash ^= unpackedSfixed32_.GetHashCode();
-      hash ^= unpackedSfixed64_.GetHashCode();
-      hash ^= unpackedFloat_.GetHashCode();
-      hash ^= unpackedDouble_.GetHashCode();
-      hash ^= unpackedBool_.GetHashCode();
-      hash ^= unpackedNestedEnum_.GetHashCode();
-      hash ^= MapInt32Int32.GetHashCode();
-      hash ^= MapInt64Int64.GetHashCode();
-      hash ^= MapUint32Uint32.GetHashCode();
-      hash ^= MapUint64Uint64.GetHashCode();
-      hash ^= MapSint32Sint32.GetHashCode();
-      hash ^= MapSint64Sint64.GetHashCode();
-      hash ^= MapFixed32Fixed32.GetHashCode();
-      hash ^= MapFixed64Fixed64.GetHashCode();
-      hash ^= MapSfixed32Sfixed32.GetHashCode();
-      hash ^= MapSfixed64Sfixed64.GetHashCode();
-      hash ^= MapInt32Float.GetHashCode();
-      hash ^= MapInt32Double.GetHashCode();
-      hash ^= MapBoolBool.GetHashCode();
-      hash ^= MapStringString.GetHashCode();
-      hash ^= MapStringBytes.GetHashCode();
-      hash ^= MapStringNestedMessage.GetHashCode();
-      hash ^= MapStringForeignMessage.GetHashCode();
-      hash ^= MapStringNestedEnum.GetHashCode();
-      hash ^= MapStringForeignEnum.GetHashCode();
-      if (oneofFieldCase_ == OneofFieldOneofCase.OneofUint32) hash ^= OneofUint32.GetHashCode();
-      if (oneofFieldCase_ == OneofFieldOneofCase.OneofNestedMessage) hash ^= OneofNestedMessage.GetHashCode();
-      if (oneofFieldCase_ == OneofFieldOneofCase.OneofString) hash ^= OneofString.GetHashCode();
-      if (oneofFieldCase_ == OneofFieldOneofCase.OneofBytes) hash ^= OneofBytes.GetHashCode();
-      if (oneofFieldCase_ == OneofFieldOneofCase.OneofBool) hash ^= OneofBool.GetHashCode();
-      if (oneofFieldCase_ == OneofFieldOneofCase.OneofUint64) hash ^= OneofUint64.GetHashCode();
-      if (oneofFieldCase_ == OneofFieldOneofCase.OneofFloat) hash ^= pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.GetHashCode(OneofFloat);
-      if (oneofFieldCase_ == OneofFieldOneofCase.OneofDouble) hash ^= pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.GetHashCode(OneofDouble);
-      if (oneofFieldCase_ == OneofFieldOneofCase.OneofEnum) hash ^= OneofEnum.GetHashCode();
-      if (oneofFieldCase_ == OneofFieldOneofCase.OneofNullValue) hash ^= OneofNullValue.GetHashCode();
-      if (optionalBoolWrapper_ != null) hash ^= OptionalBoolWrapper.GetHashCode();
-      if (optionalInt32Wrapper_ != null) hash ^= OptionalInt32Wrapper.GetHashCode();
-      if (optionalInt64Wrapper_ != null) hash ^= OptionalInt64Wrapper.GetHashCode();
-      if (optionalUint32Wrapper_ != null) hash ^= OptionalUint32Wrapper.GetHashCode();
-      if (optionalUint64Wrapper_ != null) hash ^= OptionalUint64Wrapper.GetHashCode();
-      if (optionalFloatWrapper_ != null) hash ^= pbc::ProtobufEqualityComparers.BitwiseNullableSingleEqualityComparer.GetHashCode(OptionalFloatWrapper);
-      if (optionalDoubleWrapper_ != null) hash ^= pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.GetHashCode(OptionalDoubleWrapper);
-      if (optionalStringWrapper_ != null) hash ^= OptionalStringWrapper.GetHashCode();
-      if (optionalBytesWrapper_ != null) hash ^= OptionalBytesWrapper.GetHashCode();
-      hash ^= repeatedBoolWrapper_.GetHashCode();
-      hash ^= repeatedInt32Wrapper_.GetHashCode();
-      hash ^= repeatedInt64Wrapper_.GetHashCode();
-      hash ^= repeatedUint32Wrapper_.GetHashCode();
-      hash ^= repeatedUint64Wrapper_.GetHashCode();
-      hash ^= repeatedFloatWrapper_.GetHashCode();
-      hash ^= repeatedDoubleWrapper_.GetHashCode();
-      hash ^= repeatedStringWrapper_.GetHashCode();
-      hash ^= repeatedBytesWrapper_.GetHashCode();
-      if (optionalDuration_ != null) hash ^= OptionalDuration.GetHashCode();
-      if (optionalTimestamp_ != null) hash ^= OptionalTimestamp.GetHashCode();
-      if (optionalFieldMask_ != null) hash ^= OptionalFieldMask.GetHashCode();
-      if (optionalStruct_ != null) hash ^= OptionalStruct.GetHashCode();
-      if (optionalAny_ != null) hash ^= OptionalAny.GetHashCode();
-      if (optionalValue_ != null) hash ^= OptionalValue.GetHashCode();
-      if (OptionalNullValue != global::Google.Protobuf.WellKnownTypes.NullValue.NullValue) hash ^= OptionalNullValue.GetHashCode();
-      hash ^= repeatedDuration_.GetHashCode();
-      hash ^= repeatedTimestamp_.GetHashCode();
-      hash ^= repeatedFieldmask_.GetHashCode();
-      hash ^= repeatedStruct_.GetHashCode();
-      hash ^= repeatedAny_.GetHashCode();
-      hash ^= repeatedValue_.GetHashCode();
-      hash ^= repeatedListValue_.GetHashCode();
-      if (Fieldname1 != 0) hash ^= Fieldname1.GetHashCode();
-      if (FieldName2 != 0) hash ^= FieldName2.GetHashCode();
-      if (FieldName3 != 0) hash ^= FieldName3.GetHashCode();
-      if (FieldName4 != 0) hash ^= FieldName4.GetHashCode();
-      if (Field0Name5 != 0) hash ^= Field0Name5.GetHashCode();
-      if (Field0Name6 != 0) hash ^= Field0Name6.GetHashCode();
-      if (FieldName7 != 0) hash ^= FieldName7.GetHashCode();
-      if (FieldName8 != 0) hash ^= FieldName8.GetHashCode();
-      if (FieldName9 != 0) hash ^= FieldName9.GetHashCode();
-      if (FieldName10 != 0) hash ^= FieldName10.GetHashCode();
-      if (FIELDNAME11 != 0) hash ^= FIELDNAME11.GetHashCode();
-      if (FIELDName12 != 0) hash ^= FIELDName12.GetHashCode();
-      if (FieldName13 != 0) hash ^= FieldName13.GetHashCode();
-      if (FieldName14 != 0) hash ^= FieldName14.GetHashCode();
-      if (FieldName15 != 0) hash ^= FieldName15.GetHashCode();
-      if (FieldName16 != 0) hash ^= FieldName16.GetHashCode();
-      if (FieldName17 != 0) hash ^= FieldName17.GetHashCode();
-      if (FieldName18 != 0) hash ^= FieldName18.GetHashCode();
-      hash ^= (int) oneofFieldCase_;
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (OptionalInt32 != 0) {
-        output.WriteRawTag(8);
-        output.WriteInt32(OptionalInt32);
-      }
-      if (OptionalInt64 != 0L) {
-        output.WriteRawTag(16);
-        output.WriteInt64(OptionalInt64);
-      }
-      if (OptionalUint32 != 0) {
-        output.WriteRawTag(24);
-        output.WriteUInt32(OptionalUint32);
-      }
-      if (OptionalUint64 != 0UL) {
-        output.WriteRawTag(32);
-        output.WriteUInt64(OptionalUint64);
-      }
-      if (OptionalSint32 != 0) {
-        output.WriteRawTag(40);
-        output.WriteSInt32(OptionalSint32);
-      }
-      if (OptionalSint64 != 0L) {
-        output.WriteRawTag(48);
-        output.WriteSInt64(OptionalSint64);
-      }
-      if (OptionalFixed32 != 0) {
-        output.WriteRawTag(61);
-        output.WriteFixed32(OptionalFixed32);
-      }
-      if (OptionalFixed64 != 0UL) {
-        output.WriteRawTag(65);
-        output.WriteFixed64(OptionalFixed64);
-      }
-      if (OptionalSfixed32 != 0) {
-        output.WriteRawTag(77);
-        output.WriteSFixed32(OptionalSfixed32);
-      }
-      if (OptionalSfixed64 != 0L) {
-        output.WriteRawTag(81);
-        output.WriteSFixed64(OptionalSfixed64);
-      }
-      if (OptionalFloat != 0F) {
-        output.WriteRawTag(93);
-        output.WriteFloat(OptionalFloat);
-      }
-      if (OptionalDouble != 0D) {
-        output.WriteRawTag(97);
-        output.WriteDouble(OptionalDouble);
-      }
-      if (OptionalBool != false) {
-        output.WriteRawTag(104);
-        output.WriteBool(OptionalBool);
-      }
-      if (OptionalString.Length != 0) {
-        output.WriteRawTag(114);
-        output.WriteString(OptionalString);
-      }
-      if (OptionalBytes.Length != 0) {
-        output.WriteRawTag(122);
-        output.WriteBytes(OptionalBytes);
-      }
-      if (optionalNestedMessage_ != null) {
-        output.WriteRawTag(146, 1);
-        output.WriteMessage(OptionalNestedMessage);
-      }
-      if (optionalForeignMessage_ != null) {
-        output.WriteRawTag(154, 1);
-        output.WriteMessage(OptionalForeignMessage);
-      }
-      if (OptionalNestedEnum != global::ProtobufTestMessages.Proto3.TestAllTypesProto3.Types.NestedEnum.Foo) {
-        output.WriteRawTag(168, 1);
-        output.WriteEnum((int) OptionalNestedEnum);
-      }
-      if (OptionalForeignEnum != global::ProtobufTestMessages.Proto3.ForeignEnum.ForeignFoo) {
-        output.WriteRawTag(176, 1);
-        output.WriteEnum((int) OptionalForeignEnum);
-      }
-      if (OptionalAliasedEnum != global::ProtobufTestMessages.Proto3.TestAllTypesProto3.Types.AliasedEnum.AliasFoo) {
-        output.WriteRawTag(184, 1);
-        output.WriteEnum((int) OptionalAliasedEnum);
-      }
-      if (OptionalStringPiece.Length != 0) {
-        output.WriteRawTag(194, 1);
-        output.WriteString(OptionalStringPiece);
-      }
-      if (OptionalCord.Length != 0) {
-        output.WriteRawTag(202, 1);
-        output.WriteString(OptionalCord);
-      }
-      if (recursiveMessage_ != null) {
-        output.WriteRawTag(218, 1);
-        output.WriteMessage(RecursiveMessage);
-      }
-      repeatedInt32_.WriteTo(output, _repeated_repeatedInt32_codec);
-      repeatedInt64_.WriteTo(output, _repeated_repeatedInt64_codec);
-      repeatedUint32_.WriteTo(output, _repeated_repeatedUint32_codec);
-      repeatedUint64_.WriteTo(output, _repeated_repeatedUint64_codec);
-      repeatedSint32_.WriteTo(output, _repeated_repeatedSint32_codec);
-      repeatedSint64_.WriteTo(output, _repeated_repeatedSint64_codec);
-      repeatedFixed32_.WriteTo(output, _repeated_repeatedFixed32_codec);
-      repeatedFixed64_.WriteTo(output, _repeated_repeatedFixed64_codec);
-      repeatedSfixed32_.WriteTo(output, _repeated_repeatedSfixed32_codec);
-      repeatedSfixed64_.WriteTo(output, _repeated_repeatedSfixed64_codec);
-      repeatedFloat_.WriteTo(output, _repeated_repeatedFloat_codec);
-      repeatedDouble_.WriteTo(output, _repeated_repeatedDouble_codec);
-      repeatedBool_.WriteTo(output, _repeated_repeatedBool_codec);
-      repeatedString_.WriteTo(output, _repeated_repeatedString_codec);
-      repeatedBytes_.WriteTo(output, _repeated_repeatedBytes_codec);
-      repeatedNestedMessage_.WriteTo(output, _repeated_repeatedNestedMessage_codec);
-      repeatedForeignMessage_.WriteTo(output, _repeated_repeatedForeignMessage_codec);
-      repeatedNestedEnum_.WriteTo(output, _repeated_repeatedNestedEnum_codec);
-      repeatedForeignEnum_.WriteTo(output, _repeated_repeatedForeignEnum_codec);
-      repeatedStringPiece_.WriteTo(output, _repeated_repeatedStringPiece_codec);
-      repeatedCord_.WriteTo(output, _repeated_repeatedCord_codec);
-      mapInt32Int32_.WriteTo(output, _map_mapInt32Int32_codec);
-      mapInt64Int64_.WriteTo(output, _map_mapInt64Int64_codec);
-      mapUint32Uint32_.WriteTo(output, _map_mapUint32Uint32_codec);
-      mapUint64Uint64_.WriteTo(output, _map_mapUint64Uint64_codec);
-      mapSint32Sint32_.WriteTo(output, _map_mapSint32Sint32_codec);
-      mapSint64Sint64_.WriteTo(output, _map_mapSint64Sint64_codec);
-      mapFixed32Fixed32_.WriteTo(output, _map_mapFixed32Fixed32_codec);
-      mapFixed64Fixed64_.WriteTo(output, _map_mapFixed64Fixed64_codec);
-      mapSfixed32Sfixed32_.WriteTo(output, _map_mapSfixed32Sfixed32_codec);
-      mapSfixed64Sfixed64_.WriteTo(output, _map_mapSfixed64Sfixed64_codec);
-      mapInt32Float_.WriteTo(output, _map_mapInt32Float_codec);
-      mapInt32Double_.WriteTo(output, _map_mapInt32Double_codec);
-      mapBoolBool_.WriteTo(output, _map_mapBoolBool_codec);
-      mapStringString_.WriteTo(output, _map_mapStringString_codec);
-      mapStringBytes_.WriteTo(output, _map_mapStringBytes_codec);
-      mapStringNestedMessage_.WriteTo(output, _map_mapStringNestedMessage_codec);
-      mapStringForeignMessage_.WriteTo(output, _map_mapStringForeignMessage_codec);
-      mapStringNestedEnum_.WriteTo(output, _map_mapStringNestedEnum_codec);
-      mapStringForeignEnum_.WriteTo(output, _map_mapStringForeignEnum_codec);
-      packedInt32_.WriteTo(output, _repeated_packedInt32_codec);
-      packedInt64_.WriteTo(output, _repeated_packedInt64_codec);
-      packedUint32_.WriteTo(output, _repeated_packedUint32_codec);
-      packedUint64_.WriteTo(output, _repeated_packedUint64_codec);
-      packedSint32_.WriteTo(output, _repeated_packedSint32_codec);
-      packedSint64_.WriteTo(output, _repeated_packedSint64_codec);
-      packedFixed32_.WriteTo(output, _repeated_packedFixed32_codec);
-      packedFixed64_.WriteTo(output, _repeated_packedFixed64_codec);
-      packedSfixed32_.WriteTo(output, _repeated_packedSfixed32_codec);
-      packedSfixed64_.WriteTo(output, _repeated_packedSfixed64_codec);
-      packedFloat_.WriteTo(output, _repeated_packedFloat_codec);
-      packedDouble_.WriteTo(output, _repeated_packedDouble_codec);
-      packedBool_.WriteTo(output, _repeated_packedBool_codec);
-      packedNestedEnum_.WriteTo(output, _repeated_packedNestedEnum_codec);
-      unpackedInt32_.WriteTo(output, _repeated_unpackedInt32_codec);
-      unpackedInt64_.WriteTo(output, _repeated_unpackedInt64_codec);
-      unpackedUint32_.WriteTo(output, _repeated_unpackedUint32_codec);
-      unpackedUint64_.WriteTo(output, _repeated_unpackedUint64_codec);
-      unpackedSint32_.WriteTo(output, _repeated_unpackedSint32_codec);
-      unpackedSint64_.WriteTo(output, _repeated_unpackedSint64_codec);
-      unpackedFixed32_.WriteTo(output, _repeated_unpackedFixed32_codec);
-      unpackedFixed64_.WriteTo(output, _repeated_unpackedFixed64_codec);
-      unpackedSfixed32_.WriteTo(output, _repeated_unpackedSfixed32_codec);
-      unpackedSfixed64_.WriteTo(output, _repeated_unpackedSfixed64_codec);
-      unpackedFloat_.WriteTo(output, _repeated_unpackedFloat_codec);
-      unpackedDouble_.WriteTo(output, _repeated_unpackedDouble_codec);
-      unpackedBool_.WriteTo(output, _repeated_unpackedBool_codec);
-      unpackedNestedEnum_.WriteTo(output, _repeated_unpackedNestedEnum_codec);
-      if (oneofFieldCase_ == OneofFieldOneofCase.OneofUint32) {
-        output.WriteRawTag(248, 6);
-        output.WriteUInt32(OneofUint32);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.OneofNestedMessage) {
-        output.WriteRawTag(130, 7);
-        output.WriteMessage(OneofNestedMessage);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.OneofString) {
-        output.WriteRawTag(138, 7);
-        output.WriteString(OneofString);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.OneofBytes) {
-        output.WriteRawTag(146, 7);
-        output.WriteBytes(OneofBytes);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.OneofBool) {
-        output.WriteRawTag(152, 7);
-        output.WriteBool(OneofBool);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.OneofUint64) {
-        output.WriteRawTag(160, 7);
-        output.WriteUInt64(OneofUint64);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.OneofFloat) {
-        output.WriteRawTag(173, 7);
-        output.WriteFloat(OneofFloat);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.OneofDouble) {
-        output.WriteRawTag(177, 7);
-        output.WriteDouble(OneofDouble);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.OneofEnum) {
-        output.WriteRawTag(184, 7);
-        output.WriteEnum((int) OneofEnum);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.OneofNullValue) {
-        output.WriteRawTag(192, 7);
-        output.WriteEnum((int) OneofNullValue);
-      }
-      if (optionalBoolWrapper_ != null) {
-        _single_optionalBoolWrapper_codec.WriteTagAndValue(output, OptionalBoolWrapper);
-      }
-      if (optionalInt32Wrapper_ != null) {
-        _single_optionalInt32Wrapper_codec.WriteTagAndValue(output, OptionalInt32Wrapper);
-      }
-      if (optionalInt64Wrapper_ != null) {
-        _single_optionalInt64Wrapper_codec.WriteTagAndValue(output, OptionalInt64Wrapper);
-      }
-      if (optionalUint32Wrapper_ != null) {
-        _single_optionalUint32Wrapper_codec.WriteTagAndValue(output, OptionalUint32Wrapper);
-      }
-      if (optionalUint64Wrapper_ != null) {
-        _single_optionalUint64Wrapper_codec.WriteTagAndValue(output, OptionalUint64Wrapper);
-      }
-      if (optionalFloatWrapper_ != null) {
-        _single_optionalFloatWrapper_codec.WriteTagAndValue(output, OptionalFloatWrapper);
-      }
-      if (optionalDoubleWrapper_ != null) {
-        _single_optionalDoubleWrapper_codec.WriteTagAndValue(output, OptionalDoubleWrapper);
-      }
-      if (optionalStringWrapper_ != null) {
-        _single_optionalStringWrapper_codec.WriteTagAndValue(output, OptionalStringWrapper);
-      }
-      if (optionalBytesWrapper_ != null) {
-        _single_optionalBytesWrapper_codec.WriteTagAndValue(output, OptionalBytesWrapper);
-      }
-      repeatedBoolWrapper_.WriteTo(output, _repeated_repeatedBoolWrapper_codec);
-      repeatedInt32Wrapper_.WriteTo(output, _repeated_repeatedInt32Wrapper_codec);
-      repeatedInt64Wrapper_.WriteTo(output, _repeated_repeatedInt64Wrapper_codec);
-      repeatedUint32Wrapper_.WriteTo(output, _repeated_repeatedUint32Wrapper_codec);
-      repeatedUint64Wrapper_.WriteTo(output, _repeated_repeatedUint64Wrapper_codec);
-      repeatedFloatWrapper_.WriteTo(output, _repeated_repeatedFloatWrapper_codec);
-      repeatedDoubleWrapper_.WriteTo(output, _repeated_repeatedDoubleWrapper_codec);
-      repeatedStringWrapper_.WriteTo(output, _repeated_repeatedStringWrapper_codec);
-      repeatedBytesWrapper_.WriteTo(output, _repeated_repeatedBytesWrapper_codec);
-      if (optionalDuration_ != null) {
-        output.WriteRawTag(234, 18);
-        output.WriteMessage(OptionalDuration);
-      }
-      if (optionalTimestamp_ != null) {
-        output.WriteRawTag(242, 18);
-        output.WriteMessage(OptionalTimestamp);
-      }
-      if (optionalFieldMask_ != null) {
-        output.WriteRawTag(250, 18);
-        output.WriteMessage(OptionalFieldMask);
-      }
-      if (optionalStruct_ != null) {
-        output.WriteRawTag(130, 19);
-        output.WriteMessage(OptionalStruct);
-      }
-      if (optionalAny_ != null) {
-        output.WriteRawTag(138, 19);
-        output.WriteMessage(OptionalAny);
-      }
-      if (optionalValue_ != null) {
-        output.WriteRawTag(146, 19);
-        output.WriteMessage(OptionalValue);
-      }
-      if (OptionalNullValue != global::Google.Protobuf.WellKnownTypes.NullValue.NullValue) {
-        output.WriteRawTag(152, 19);
-        output.WriteEnum((int) OptionalNullValue);
-      }
-      repeatedDuration_.WriteTo(output, _repeated_repeatedDuration_codec);
-      repeatedTimestamp_.WriteTo(output, _repeated_repeatedTimestamp_codec);
-      repeatedFieldmask_.WriteTo(output, _repeated_repeatedFieldmask_codec);
-      repeatedAny_.WriteTo(output, _repeated_repeatedAny_codec);
-      repeatedValue_.WriteTo(output, _repeated_repeatedValue_codec);
-      repeatedListValue_.WriteTo(output, _repeated_repeatedListValue_codec);
-      repeatedStruct_.WriteTo(output, _repeated_repeatedStruct_codec);
-      if (Fieldname1 != 0) {
-        output.WriteRawTag(136, 25);
-        output.WriteInt32(Fieldname1);
-      }
-      if (FieldName2 != 0) {
-        output.WriteRawTag(144, 25);
-        output.WriteInt32(FieldName2);
-      }
-      if (FieldName3 != 0) {
-        output.WriteRawTag(152, 25);
-        output.WriteInt32(FieldName3);
-      }
-      if (FieldName4 != 0) {
-        output.WriteRawTag(160, 25);
-        output.WriteInt32(FieldName4);
-      }
-      if (Field0Name5 != 0) {
-        output.WriteRawTag(168, 25);
-        output.WriteInt32(Field0Name5);
-      }
-      if (Field0Name6 != 0) {
-        output.WriteRawTag(176, 25);
-        output.WriteInt32(Field0Name6);
-      }
-      if (FieldName7 != 0) {
-        output.WriteRawTag(184, 25);
-        output.WriteInt32(FieldName7);
-      }
-      if (FieldName8 != 0) {
-        output.WriteRawTag(192, 25);
-        output.WriteInt32(FieldName8);
-      }
-      if (FieldName9 != 0) {
-        output.WriteRawTag(200, 25);
-        output.WriteInt32(FieldName9);
-      }
-      if (FieldName10 != 0) {
-        output.WriteRawTag(208, 25);
-        output.WriteInt32(FieldName10);
-      }
-      if (FIELDNAME11 != 0) {
-        output.WriteRawTag(216, 25);
-        output.WriteInt32(FIELDNAME11);
-      }
-      if (FIELDName12 != 0) {
-        output.WriteRawTag(224, 25);
-        output.WriteInt32(FIELDName12);
-      }
-      if (FieldName13 != 0) {
-        output.WriteRawTag(232, 25);
-        output.WriteInt32(FieldName13);
-      }
-      if (FieldName14 != 0) {
-        output.WriteRawTag(240, 25);
-        output.WriteInt32(FieldName14);
-      }
-      if (FieldName15 != 0) {
-        output.WriteRawTag(248, 25);
-        output.WriteInt32(FieldName15);
-      }
-      if (FieldName16 != 0) {
-        output.WriteRawTag(128, 26);
-        output.WriteInt32(FieldName16);
-      }
-      if (FieldName17 != 0) {
-        output.WriteRawTag(136, 26);
-        output.WriteInt32(FieldName17);
-      }
-      if (FieldName18 != 0) {
-        output.WriteRawTag(144, 26);
-        output.WriteInt32(FieldName18);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (OptionalInt32 != 0) {
-        output.WriteRawTag(8);
-        output.WriteInt32(OptionalInt32);
-      }
-      if (OptionalInt64 != 0L) {
-        output.WriteRawTag(16);
-        output.WriteInt64(OptionalInt64);
-      }
-      if (OptionalUint32 != 0) {
-        output.WriteRawTag(24);
-        output.WriteUInt32(OptionalUint32);
-      }
-      if (OptionalUint64 != 0UL) {
-        output.WriteRawTag(32);
-        output.WriteUInt64(OptionalUint64);
-      }
-      if (OptionalSint32 != 0) {
-        output.WriteRawTag(40);
-        output.WriteSInt32(OptionalSint32);
-      }
-      if (OptionalSint64 != 0L) {
-        output.WriteRawTag(48);
-        output.WriteSInt64(OptionalSint64);
-      }
-      if (OptionalFixed32 != 0) {
-        output.WriteRawTag(61);
-        output.WriteFixed32(OptionalFixed32);
-      }
-      if (OptionalFixed64 != 0UL) {
-        output.WriteRawTag(65);
-        output.WriteFixed64(OptionalFixed64);
-      }
-      if (OptionalSfixed32 != 0) {
-        output.WriteRawTag(77);
-        output.WriteSFixed32(OptionalSfixed32);
-      }
-      if (OptionalSfixed64 != 0L) {
-        output.WriteRawTag(81);
-        output.WriteSFixed64(OptionalSfixed64);
-      }
-      if (OptionalFloat != 0F) {
-        output.WriteRawTag(93);
-        output.WriteFloat(OptionalFloat);
-      }
-      if (OptionalDouble != 0D) {
-        output.WriteRawTag(97);
-        output.WriteDouble(OptionalDouble);
-      }
-      if (OptionalBool != false) {
-        output.WriteRawTag(104);
-        output.WriteBool(OptionalBool);
-      }
-      if (OptionalString.Length != 0) {
-        output.WriteRawTag(114);
-        output.WriteString(OptionalString);
-      }
-      if (OptionalBytes.Length != 0) {
-        output.WriteRawTag(122);
-        output.WriteBytes(OptionalBytes);
-      }
-      if (optionalNestedMessage_ != null) {
-        output.WriteRawTag(146, 1);
-        output.WriteMessage(OptionalNestedMessage);
-      }
-      if (optionalForeignMessage_ != null) {
-        output.WriteRawTag(154, 1);
-        output.WriteMessage(OptionalForeignMessage);
-      }
-      if (OptionalNestedEnum != global::ProtobufTestMessages.Proto3.TestAllTypesProto3.Types.NestedEnum.Foo) {
-        output.WriteRawTag(168, 1);
-        output.WriteEnum((int) OptionalNestedEnum);
-      }
-      if (OptionalForeignEnum != global::ProtobufTestMessages.Proto3.ForeignEnum.ForeignFoo) {
-        output.WriteRawTag(176, 1);
-        output.WriteEnum((int) OptionalForeignEnum);
-      }
-      if (OptionalAliasedEnum != global::ProtobufTestMessages.Proto3.TestAllTypesProto3.Types.AliasedEnum.AliasFoo) {
-        output.WriteRawTag(184, 1);
-        output.WriteEnum((int) OptionalAliasedEnum);
-      }
-      if (OptionalStringPiece.Length != 0) {
-        output.WriteRawTag(194, 1);
-        output.WriteString(OptionalStringPiece);
-      }
-      if (OptionalCord.Length != 0) {
-        output.WriteRawTag(202, 1);
-        output.WriteString(OptionalCord);
-      }
-      if (recursiveMessage_ != null) {
-        output.WriteRawTag(218, 1);
-        output.WriteMessage(RecursiveMessage);
-      }
-      repeatedInt32_.WriteTo(ref output, _repeated_repeatedInt32_codec);
-      repeatedInt64_.WriteTo(ref output, _repeated_repeatedInt64_codec);
-      repeatedUint32_.WriteTo(ref output, _repeated_repeatedUint32_codec);
-      repeatedUint64_.WriteTo(ref output, _repeated_repeatedUint64_codec);
-      repeatedSint32_.WriteTo(ref output, _repeated_repeatedSint32_codec);
-      repeatedSint64_.WriteTo(ref output, _repeated_repeatedSint64_codec);
-      repeatedFixed32_.WriteTo(ref output, _repeated_repeatedFixed32_codec);
-      repeatedFixed64_.WriteTo(ref output, _repeated_repeatedFixed64_codec);
-      repeatedSfixed32_.WriteTo(ref output, _repeated_repeatedSfixed32_codec);
-      repeatedSfixed64_.WriteTo(ref output, _repeated_repeatedSfixed64_codec);
-      repeatedFloat_.WriteTo(ref output, _repeated_repeatedFloat_codec);
-      repeatedDouble_.WriteTo(ref output, _repeated_repeatedDouble_codec);
-      repeatedBool_.WriteTo(ref output, _repeated_repeatedBool_codec);
-      repeatedString_.WriteTo(ref output, _repeated_repeatedString_codec);
-      repeatedBytes_.WriteTo(ref output, _repeated_repeatedBytes_codec);
-      repeatedNestedMessage_.WriteTo(ref output, _repeated_repeatedNestedMessage_codec);
-      repeatedForeignMessage_.WriteTo(ref output, _repeated_repeatedForeignMessage_codec);
-      repeatedNestedEnum_.WriteTo(ref output, _repeated_repeatedNestedEnum_codec);
-      repeatedForeignEnum_.WriteTo(ref output, _repeated_repeatedForeignEnum_codec);
-      repeatedStringPiece_.WriteTo(ref output, _repeated_repeatedStringPiece_codec);
-      repeatedCord_.WriteTo(ref output, _repeated_repeatedCord_codec);
-      mapInt32Int32_.WriteTo(ref output, _map_mapInt32Int32_codec);
-      mapInt64Int64_.WriteTo(ref output, _map_mapInt64Int64_codec);
-      mapUint32Uint32_.WriteTo(ref output, _map_mapUint32Uint32_codec);
-      mapUint64Uint64_.WriteTo(ref output, _map_mapUint64Uint64_codec);
-      mapSint32Sint32_.WriteTo(ref output, _map_mapSint32Sint32_codec);
-      mapSint64Sint64_.WriteTo(ref output, _map_mapSint64Sint64_codec);
-      mapFixed32Fixed32_.WriteTo(ref output, _map_mapFixed32Fixed32_codec);
-      mapFixed64Fixed64_.WriteTo(ref output, _map_mapFixed64Fixed64_codec);
-      mapSfixed32Sfixed32_.WriteTo(ref output, _map_mapSfixed32Sfixed32_codec);
-      mapSfixed64Sfixed64_.WriteTo(ref output, _map_mapSfixed64Sfixed64_codec);
-      mapInt32Float_.WriteTo(ref output, _map_mapInt32Float_codec);
-      mapInt32Double_.WriteTo(ref output, _map_mapInt32Double_codec);
-      mapBoolBool_.WriteTo(ref output, _map_mapBoolBool_codec);
-      mapStringString_.WriteTo(ref output, _map_mapStringString_codec);
-      mapStringBytes_.WriteTo(ref output, _map_mapStringBytes_codec);
-      mapStringNestedMessage_.WriteTo(ref output, _map_mapStringNestedMessage_codec);
-      mapStringForeignMessage_.WriteTo(ref output, _map_mapStringForeignMessage_codec);
-      mapStringNestedEnum_.WriteTo(ref output, _map_mapStringNestedEnum_codec);
-      mapStringForeignEnum_.WriteTo(ref output, _map_mapStringForeignEnum_codec);
-      packedInt32_.WriteTo(ref output, _repeated_packedInt32_codec);
-      packedInt64_.WriteTo(ref output, _repeated_packedInt64_codec);
-      packedUint32_.WriteTo(ref output, _repeated_packedUint32_codec);
-      packedUint64_.WriteTo(ref output, _repeated_packedUint64_codec);
-      packedSint32_.WriteTo(ref output, _repeated_packedSint32_codec);
-      packedSint64_.WriteTo(ref output, _repeated_packedSint64_codec);
-      packedFixed32_.WriteTo(ref output, _repeated_packedFixed32_codec);
-      packedFixed64_.WriteTo(ref output, _repeated_packedFixed64_codec);
-      packedSfixed32_.WriteTo(ref output, _repeated_packedSfixed32_codec);
-      packedSfixed64_.WriteTo(ref output, _repeated_packedSfixed64_codec);
-      packedFloat_.WriteTo(ref output, _repeated_packedFloat_codec);
-      packedDouble_.WriteTo(ref output, _repeated_packedDouble_codec);
-      packedBool_.WriteTo(ref output, _repeated_packedBool_codec);
-      packedNestedEnum_.WriteTo(ref output, _repeated_packedNestedEnum_codec);
-      unpackedInt32_.WriteTo(ref output, _repeated_unpackedInt32_codec);
-      unpackedInt64_.WriteTo(ref output, _repeated_unpackedInt64_codec);
-      unpackedUint32_.WriteTo(ref output, _repeated_unpackedUint32_codec);
-      unpackedUint64_.WriteTo(ref output, _repeated_unpackedUint64_codec);
-      unpackedSint32_.WriteTo(ref output, _repeated_unpackedSint32_codec);
-      unpackedSint64_.WriteTo(ref output, _repeated_unpackedSint64_codec);
-      unpackedFixed32_.WriteTo(ref output, _repeated_unpackedFixed32_codec);
-      unpackedFixed64_.WriteTo(ref output, _repeated_unpackedFixed64_codec);
-      unpackedSfixed32_.WriteTo(ref output, _repeated_unpackedSfixed32_codec);
-      unpackedSfixed64_.WriteTo(ref output, _repeated_unpackedSfixed64_codec);
-      unpackedFloat_.WriteTo(ref output, _repeated_unpackedFloat_codec);
-      unpackedDouble_.WriteTo(ref output, _repeated_unpackedDouble_codec);
-      unpackedBool_.WriteTo(ref output, _repeated_unpackedBool_codec);
-      unpackedNestedEnum_.WriteTo(ref output, _repeated_unpackedNestedEnum_codec);
-      if (oneofFieldCase_ == OneofFieldOneofCase.OneofUint32) {
-        output.WriteRawTag(248, 6);
-        output.WriteUInt32(OneofUint32);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.OneofNestedMessage) {
-        output.WriteRawTag(130, 7);
-        output.WriteMessage(OneofNestedMessage);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.OneofString) {
-        output.WriteRawTag(138, 7);
-        output.WriteString(OneofString);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.OneofBytes) {
-        output.WriteRawTag(146, 7);
-        output.WriteBytes(OneofBytes);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.OneofBool) {
-        output.WriteRawTag(152, 7);
-        output.WriteBool(OneofBool);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.OneofUint64) {
-        output.WriteRawTag(160, 7);
-        output.WriteUInt64(OneofUint64);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.OneofFloat) {
-        output.WriteRawTag(173, 7);
-        output.WriteFloat(OneofFloat);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.OneofDouble) {
-        output.WriteRawTag(177, 7);
-        output.WriteDouble(OneofDouble);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.OneofEnum) {
-        output.WriteRawTag(184, 7);
-        output.WriteEnum((int) OneofEnum);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.OneofNullValue) {
-        output.WriteRawTag(192, 7);
-        output.WriteEnum((int) OneofNullValue);
-      }
-      if (optionalBoolWrapper_ != null) {
-        _single_optionalBoolWrapper_codec.WriteTagAndValue(ref output, OptionalBoolWrapper);
-      }
-      if (optionalInt32Wrapper_ != null) {
-        _single_optionalInt32Wrapper_codec.WriteTagAndValue(ref output, OptionalInt32Wrapper);
-      }
-      if (optionalInt64Wrapper_ != null) {
-        _single_optionalInt64Wrapper_codec.WriteTagAndValue(ref output, OptionalInt64Wrapper);
-      }
-      if (optionalUint32Wrapper_ != null) {
-        _single_optionalUint32Wrapper_codec.WriteTagAndValue(ref output, OptionalUint32Wrapper);
-      }
-      if (optionalUint64Wrapper_ != null) {
-        _single_optionalUint64Wrapper_codec.WriteTagAndValue(ref output, OptionalUint64Wrapper);
-      }
-      if (optionalFloatWrapper_ != null) {
-        _single_optionalFloatWrapper_codec.WriteTagAndValue(ref output, OptionalFloatWrapper);
-      }
-      if (optionalDoubleWrapper_ != null) {
-        _single_optionalDoubleWrapper_codec.WriteTagAndValue(ref output, OptionalDoubleWrapper);
-      }
-      if (optionalStringWrapper_ != null) {
-        _single_optionalStringWrapper_codec.WriteTagAndValue(ref output, OptionalStringWrapper);
-      }
-      if (optionalBytesWrapper_ != null) {
-        _single_optionalBytesWrapper_codec.WriteTagAndValue(ref output, OptionalBytesWrapper);
-      }
-      repeatedBoolWrapper_.WriteTo(ref output, _repeated_repeatedBoolWrapper_codec);
-      repeatedInt32Wrapper_.WriteTo(ref output, _repeated_repeatedInt32Wrapper_codec);
-      repeatedInt64Wrapper_.WriteTo(ref output, _repeated_repeatedInt64Wrapper_codec);
-      repeatedUint32Wrapper_.WriteTo(ref output, _repeated_repeatedUint32Wrapper_codec);
-      repeatedUint64Wrapper_.WriteTo(ref output, _repeated_repeatedUint64Wrapper_codec);
-      repeatedFloatWrapper_.WriteTo(ref output, _repeated_repeatedFloatWrapper_codec);
-      repeatedDoubleWrapper_.WriteTo(ref output, _repeated_repeatedDoubleWrapper_codec);
-      repeatedStringWrapper_.WriteTo(ref output, _repeated_repeatedStringWrapper_codec);
-      repeatedBytesWrapper_.WriteTo(ref output, _repeated_repeatedBytesWrapper_codec);
-      if (optionalDuration_ != null) {
-        output.WriteRawTag(234, 18);
-        output.WriteMessage(OptionalDuration);
-      }
-      if (optionalTimestamp_ != null) {
-        output.WriteRawTag(242, 18);
-        output.WriteMessage(OptionalTimestamp);
-      }
-      if (optionalFieldMask_ != null) {
-        output.WriteRawTag(250, 18);
-        output.WriteMessage(OptionalFieldMask);
-      }
-      if (optionalStruct_ != null) {
-        output.WriteRawTag(130, 19);
-        output.WriteMessage(OptionalStruct);
-      }
-      if (optionalAny_ != null) {
-        output.WriteRawTag(138, 19);
-        output.WriteMessage(OptionalAny);
-      }
-      if (optionalValue_ != null) {
-        output.WriteRawTag(146, 19);
-        output.WriteMessage(OptionalValue);
-      }
-      if (OptionalNullValue != global::Google.Protobuf.WellKnownTypes.NullValue.NullValue) {
-        output.WriteRawTag(152, 19);
-        output.WriteEnum((int) OptionalNullValue);
-      }
-      repeatedDuration_.WriteTo(ref output, _repeated_repeatedDuration_codec);
-      repeatedTimestamp_.WriteTo(ref output, _repeated_repeatedTimestamp_codec);
-      repeatedFieldmask_.WriteTo(ref output, _repeated_repeatedFieldmask_codec);
-      repeatedAny_.WriteTo(ref output, _repeated_repeatedAny_codec);
-      repeatedValue_.WriteTo(ref output, _repeated_repeatedValue_codec);
-      repeatedListValue_.WriteTo(ref output, _repeated_repeatedListValue_codec);
-      repeatedStruct_.WriteTo(ref output, _repeated_repeatedStruct_codec);
-      if (Fieldname1 != 0) {
-        output.WriteRawTag(136, 25);
-        output.WriteInt32(Fieldname1);
-      }
-      if (FieldName2 != 0) {
-        output.WriteRawTag(144, 25);
-        output.WriteInt32(FieldName2);
-      }
-      if (FieldName3 != 0) {
-        output.WriteRawTag(152, 25);
-        output.WriteInt32(FieldName3);
-      }
-      if (FieldName4 != 0) {
-        output.WriteRawTag(160, 25);
-        output.WriteInt32(FieldName4);
-      }
-      if (Field0Name5 != 0) {
-        output.WriteRawTag(168, 25);
-        output.WriteInt32(Field0Name5);
-      }
-      if (Field0Name6 != 0) {
-        output.WriteRawTag(176, 25);
-        output.WriteInt32(Field0Name6);
-      }
-      if (FieldName7 != 0) {
-        output.WriteRawTag(184, 25);
-        output.WriteInt32(FieldName7);
-      }
-      if (FieldName8 != 0) {
-        output.WriteRawTag(192, 25);
-        output.WriteInt32(FieldName8);
-      }
-      if (FieldName9 != 0) {
-        output.WriteRawTag(200, 25);
-        output.WriteInt32(FieldName9);
-      }
-      if (FieldName10 != 0) {
-        output.WriteRawTag(208, 25);
-        output.WriteInt32(FieldName10);
-      }
-      if (FIELDNAME11 != 0) {
-        output.WriteRawTag(216, 25);
-        output.WriteInt32(FIELDNAME11);
-      }
-      if (FIELDName12 != 0) {
-        output.WriteRawTag(224, 25);
-        output.WriteInt32(FIELDName12);
-      }
-      if (FieldName13 != 0) {
-        output.WriteRawTag(232, 25);
-        output.WriteInt32(FieldName13);
-      }
-      if (FieldName14 != 0) {
-        output.WriteRawTag(240, 25);
-        output.WriteInt32(FieldName14);
-      }
-      if (FieldName15 != 0) {
-        output.WriteRawTag(248, 25);
-        output.WriteInt32(FieldName15);
-      }
-      if (FieldName16 != 0) {
-        output.WriteRawTag(128, 26);
-        output.WriteInt32(FieldName16);
-      }
-      if (FieldName17 != 0) {
-        output.WriteRawTag(136, 26);
-        output.WriteInt32(FieldName17);
-      }
-      if (FieldName18 != 0) {
-        output.WriteRawTag(144, 26);
-        output.WriteInt32(FieldName18);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (OptionalInt32 != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(OptionalInt32);
-      }
-      if (OptionalInt64 != 0L) {
-        size += 1 + pb::CodedOutputStream.ComputeInt64Size(OptionalInt64);
-      }
-      if (OptionalUint32 != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeUInt32Size(OptionalUint32);
-      }
-      if (OptionalUint64 != 0UL) {
-        size += 1 + pb::CodedOutputStream.ComputeUInt64Size(OptionalUint64);
-      }
-      if (OptionalSint32 != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeSInt32Size(OptionalSint32);
-      }
-      if (OptionalSint64 != 0L) {
-        size += 1 + pb::CodedOutputStream.ComputeSInt64Size(OptionalSint64);
-      }
-      if (OptionalFixed32 != 0) {
-        size += 1 + 4;
-      }
-      if (OptionalFixed64 != 0UL) {
-        size += 1 + 8;
-      }
-      if (OptionalSfixed32 != 0) {
-        size += 1 + 4;
-      }
-      if (OptionalSfixed64 != 0L) {
-        size += 1 + 8;
-      }
-      if (OptionalFloat != 0F) {
-        size += 1 + 4;
-      }
-      if (OptionalDouble != 0D) {
-        size += 1 + 8;
-      }
-      if (OptionalBool != false) {
-        size += 1 + 1;
-      }
-      if (OptionalString.Length != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(OptionalString);
-      }
-      if (OptionalBytes.Length != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeBytesSize(OptionalBytes);
-      }
-      if (optionalNestedMessage_ != null) {
-        size += 2 + pb::CodedOutputStream.ComputeMessageSize(OptionalNestedMessage);
-      }
-      if (optionalForeignMessage_ != null) {
-        size += 2 + pb::CodedOutputStream.ComputeMessageSize(OptionalForeignMessage);
-      }
-      if (OptionalNestedEnum != global::ProtobufTestMessages.Proto3.TestAllTypesProto3.Types.NestedEnum.Foo) {
-        size += 2 + pb::CodedOutputStream.ComputeEnumSize((int) OptionalNestedEnum);
-      }
-      if (OptionalForeignEnum != global::ProtobufTestMessages.Proto3.ForeignEnum.ForeignFoo) {
-        size += 2 + pb::CodedOutputStream.ComputeEnumSize((int) OptionalForeignEnum);
-      }
-      if (OptionalAliasedEnum != global::ProtobufTestMessages.Proto3.TestAllTypesProto3.Types.AliasedEnum.AliasFoo) {
-        size += 2 + pb::CodedOutputStream.ComputeEnumSize((int) OptionalAliasedEnum);
-      }
-      if (OptionalStringPiece.Length != 0) {
-        size += 2 + pb::CodedOutputStream.ComputeStringSize(OptionalStringPiece);
-      }
-      if (OptionalCord.Length != 0) {
-        size += 2 + pb::CodedOutputStream.ComputeStringSize(OptionalCord);
-      }
-      if (recursiveMessage_ != null) {
-        size += 2 + pb::CodedOutputStream.ComputeMessageSize(RecursiveMessage);
-      }
-      size += repeatedInt32_.CalculateSize(_repeated_repeatedInt32_codec);
-      size += repeatedInt64_.CalculateSize(_repeated_repeatedInt64_codec);
-      size += repeatedUint32_.CalculateSize(_repeated_repeatedUint32_codec);
-      size += repeatedUint64_.CalculateSize(_repeated_repeatedUint64_codec);
-      size += repeatedSint32_.CalculateSize(_repeated_repeatedSint32_codec);
-      size += repeatedSint64_.CalculateSize(_repeated_repeatedSint64_codec);
-      size += repeatedFixed32_.CalculateSize(_repeated_repeatedFixed32_codec);
-      size += repeatedFixed64_.CalculateSize(_repeated_repeatedFixed64_codec);
-      size += repeatedSfixed32_.CalculateSize(_repeated_repeatedSfixed32_codec);
-      size += repeatedSfixed64_.CalculateSize(_repeated_repeatedSfixed64_codec);
-      size += repeatedFloat_.CalculateSize(_repeated_repeatedFloat_codec);
-      size += repeatedDouble_.CalculateSize(_repeated_repeatedDouble_codec);
-      size += repeatedBool_.CalculateSize(_repeated_repeatedBool_codec);
-      size += repeatedString_.CalculateSize(_repeated_repeatedString_codec);
-      size += repeatedBytes_.CalculateSize(_repeated_repeatedBytes_codec);
-      size += repeatedNestedMessage_.CalculateSize(_repeated_repeatedNestedMessage_codec);
-      size += repeatedForeignMessage_.CalculateSize(_repeated_repeatedForeignMessage_codec);
-      size += repeatedNestedEnum_.CalculateSize(_repeated_repeatedNestedEnum_codec);
-      size += repeatedForeignEnum_.CalculateSize(_repeated_repeatedForeignEnum_codec);
-      size += repeatedStringPiece_.CalculateSize(_repeated_repeatedStringPiece_codec);
-      size += repeatedCord_.CalculateSize(_repeated_repeatedCord_codec);
-      size += packedInt32_.CalculateSize(_repeated_packedInt32_codec);
-      size += packedInt64_.CalculateSize(_repeated_packedInt64_codec);
-      size += packedUint32_.CalculateSize(_repeated_packedUint32_codec);
-      size += packedUint64_.CalculateSize(_repeated_packedUint64_codec);
-      size += packedSint32_.CalculateSize(_repeated_packedSint32_codec);
-      size += packedSint64_.CalculateSize(_repeated_packedSint64_codec);
-      size += packedFixed32_.CalculateSize(_repeated_packedFixed32_codec);
-      size += packedFixed64_.CalculateSize(_repeated_packedFixed64_codec);
-      size += packedSfixed32_.CalculateSize(_repeated_packedSfixed32_codec);
-      size += packedSfixed64_.CalculateSize(_repeated_packedSfixed64_codec);
-      size += packedFloat_.CalculateSize(_repeated_packedFloat_codec);
-      size += packedDouble_.CalculateSize(_repeated_packedDouble_codec);
-      size += packedBool_.CalculateSize(_repeated_packedBool_codec);
-      size += packedNestedEnum_.CalculateSize(_repeated_packedNestedEnum_codec);
-      size += unpackedInt32_.CalculateSize(_repeated_unpackedInt32_codec);
-      size += unpackedInt64_.CalculateSize(_repeated_unpackedInt64_codec);
-      size += unpackedUint32_.CalculateSize(_repeated_unpackedUint32_codec);
-      size += unpackedUint64_.CalculateSize(_repeated_unpackedUint64_codec);
-      size += unpackedSint32_.CalculateSize(_repeated_unpackedSint32_codec);
-      size += unpackedSint64_.CalculateSize(_repeated_unpackedSint64_codec);
-      size += unpackedFixed32_.CalculateSize(_repeated_unpackedFixed32_codec);
-      size += unpackedFixed64_.CalculateSize(_repeated_unpackedFixed64_codec);
-      size += unpackedSfixed32_.CalculateSize(_repeated_unpackedSfixed32_codec);
-      size += unpackedSfixed64_.CalculateSize(_repeated_unpackedSfixed64_codec);
-      size += unpackedFloat_.CalculateSize(_repeated_unpackedFloat_codec);
-      size += unpackedDouble_.CalculateSize(_repeated_unpackedDouble_codec);
-      size += unpackedBool_.CalculateSize(_repeated_unpackedBool_codec);
-      size += unpackedNestedEnum_.CalculateSize(_repeated_unpackedNestedEnum_codec);
-      size += mapInt32Int32_.CalculateSize(_map_mapInt32Int32_codec);
-      size += mapInt64Int64_.CalculateSize(_map_mapInt64Int64_codec);
-      size += mapUint32Uint32_.CalculateSize(_map_mapUint32Uint32_codec);
-      size += mapUint64Uint64_.CalculateSize(_map_mapUint64Uint64_codec);
-      size += mapSint32Sint32_.CalculateSize(_map_mapSint32Sint32_codec);
-      size += mapSint64Sint64_.CalculateSize(_map_mapSint64Sint64_codec);
-      size += mapFixed32Fixed32_.CalculateSize(_map_mapFixed32Fixed32_codec);
-      size += mapFixed64Fixed64_.CalculateSize(_map_mapFixed64Fixed64_codec);
-      size += mapSfixed32Sfixed32_.CalculateSize(_map_mapSfixed32Sfixed32_codec);
-      size += mapSfixed64Sfixed64_.CalculateSize(_map_mapSfixed64Sfixed64_codec);
-      size += mapInt32Float_.CalculateSize(_map_mapInt32Float_codec);
-      size += mapInt32Double_.CalculateSize(_map_mapInt32Double_codec);
-      size += mapBoolBool_.CalculateSize(_map_mapBoolBool_codec);
-      size += mapStringString_.CalculateSize(_map_mapStringString_codec);
-      size += mapStringBytes_.CalculateSize(_map_mapStringBytes_codec);
-      size += mapStringNestedMessage_.CalculateSize(_map_mapStringNestedMessage_codec);
-      size += mapStringForeignMessage_.CalculateSize(_map_mapStringForeignMessage_codec);
-      size += mapStringNestedEnum_.CalculateSize(_map_mapStringNestedEnum_codec);
-      size += mapStringForeignEnum_.CalculateSize(_map_mapStringForeignEnum_codec);
-      if (oneofFieldCase_ == OneofFieldOneofCase.OneofUint32) {
-        size += 2 + pb::CodedOutputStream.ComputeUInt32Size(OneofUint32);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.OneofNestedMessage) {
-        size += 2 + pb::CodedOutputStream.ComputeMessageSize(OneofNestedMessage);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.OneofString) {
-        size += 2 + pb::CodedOutputStream.ComputeStringSize(OneofString);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.OneofBytes) {
-        size += 2 + pb::CodedOutputStream.ComputeBytesSize(OneofBytes);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.OneofBool) {
-        size += 2 + 1;
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.OneofUint64) {
-        size += 2 + pb::CodedOutputStream.ComputeUInt64Size(OneofUint64);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.OneofFloat) {
-        size += 2 + 4;
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.OneofDouble) {
-        size += 2 + 8;
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.OneofEnum) {
-        size += 2 + pb::CodedOutputStream.ComputeEnumSize((int) OneofEnum);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.OneofNullValue) {
-        size += 2 + pb::CodedOutputStream.ComputeEnumSize((int) OneofNullValue);
-      }
-      if (optionalBoolWrapper_ != null) {
-        size += _single_optionalBoolWrapper_codec.CalculateSizeWithTag(OptionalBoolWrapper);
-      }
-      if (optionalInt32Wrapper_ != null) {
-        size += _single_optionalInt32Wrapper_codec.CalculateSizeWithTag(OptionalInt32Wrapper);
-      }
-      if (optionalInt64Wrapper_ != null) {
-        size += _single_optionalInt64Wrapper_codec.CalculateSizeWithTag(OptionalInt64Wrapper);
-      }
-      if (optionalUint32Wrapper_ != null) {
-        size += _single_optionalUint32Wrapper_codec.CalculateSizeWithTag(OptionalUint32Wrapper);
-      }
-      if (optionalUint64Wrapper_ != null) {
-        size += _single_optionalUint64Wrapper_codec.CalculateSizeWithTag(OptionalUint64Wrapper);
-      }
-      if (optionalFloatWrapper_ != null) {
-        size += _single_optionalFloatWrapper_codec.CalculateSizeWithTag(OptionalFloatWrapper);
-      }
-      if (optionalDoubleWrapper_ != null) {
-        size += _single_optionalDoubleWrapper_codec.CalculateSizeWithTag(OptionalDoubleWrapper);
-      }
-      if (optionalStringWrapper_ != null) {
-        size += _single_optionalStringWrapper_codec.CalculateSizeWithTag(OptionalStringWrapper);
-      }
-      if (optionalBytesWrapper_ != null) {
-        size += _single_optionalBytesWrapper_codec.CalculateSizeWithTag(OptionalBytesWrapper);
-      }
-      size += repeatedBoolWrapper_.CalculateSize(_repeated_repeatedBoolWrapper_codec);
-      size += repeatedInt32Wrapper_.CalculateSize(_repeated_repeatedInt32Wrapper_codec);
-      size += repeatedInt64Wrapper_.CalculateSize(_repeated_repeatedInt64Wrapper_codec);
-      size += repeatedUint32Wrapper_.CalculateSize(_repeated_repeatedUint32Wrapper_codec);
-      size += repeatedUint64Wrapper_.CalculateSize(_repeated_repeatedUint64Wrapper_codec);
-      size += repeatedFloatWrapper_.CalculateSize(_repeated_repeatedFloatWrapper_codec);
-      size += repeatedDoubleWrapper_.CalculateSize(_repeated_repeatedDoubleWrapper_codec);
-      size += repeatedStringWrapper_.CalculateSize(_repeated_repeatedStringWrapper_codec);
-      size += repeatedBytesWrapper_.CalculateSize(_repeated_repeatedBytesWrapper_codec);
-      if (optionalDuration_ != null) {
-        size += 2 + pb::CodedOutputStream.ComputeMessageSize(OptionalDuration);
-      }
-      if (optionalTimestamp_ != null) {
-        size += 2 + pb::CodedOutputStream.ComputeMessageSize(OptionalTimestamp);
-      }
-      if (optionalFieldMask_ != null) {
-        size += 2 + pb::CodedOutputStream.ComputeMessageSize(OptionalFieldMask);
-      }
-      if (optionalStruct_ != null) {
-        size += 2 + pb::CodedOutputStream.ComputeMessageSize(OptionalStruct);
-      }
-      if (optionalAny_ != null) {
-        size += 2 + pb::CodedOutputStream.ComputeMessageSize(OptionalAny);
-      }
-      if (optionalValue_ != null) {
-        size += 2 + pb::CodedOutputStream.ComputeMessageSize(OptionalValue);
-      }
-      if (OptionalNullValue != global::Google.Protobuf.WellKnownTypes.NullValue.NullValue) {
-        size += 2 + pb::CodedOutputStream.ComputeEnumSize((int) OptionalNullValue);
-      }
-      size += repeatedDuration_.CalculateSize(_repeated_repeatedDuration_codec);
-      size += repeatedTimestamp_.CalculateSize(_repeated_repeatedTimestamp_codec);
-      size += repeatedFieldmask_.CalculateSize(_repeated_repeatedFieldmask_codec);
-      size += repeatedStruct_.CalculateSize(_repeated_repeatedStruct_codec);
-      size += repeatedAny_.CalculateSize(_repeated_repeatedAny_codec);
-      size += repeatedValue_.CalculateSize(_repeated_repeatedValue_codec);
-      size += repeatedListValue_.CalculateSize(_repeated_repeatedListValue_codec);
-      if (Fieldname1 != 0) {
-        size += 2 + pb::CodedOutputStream.ComputeInt32Size(Fieldname1);
-      }
-      if (FieldName2 != 0) {
-        size += 2 + pb::CodedOutputStream.ComputeInt32Size(FieldName2);
-      }
-      if (FieldName3 != 0) {
-        size += 2 + pb::CodedOutputStream.ComputeInt32Size(FieldName3);
-      }
-      if (FieldName4 != 0) {
-        size += 2 + pb::CodedOutputStream.ComputeInt32Size(FieldName4);
-      }
-      if (Field0Name5 != 0) {
-        size += 2 + pb::CodedOutputStream.ComputeInt32Size(Field0Name5);
-      }
-      if (Field0Name6 != 0) {
-        size += 2 + pb::CodedOutputStream.ComputeInt32Size(Field0Name6);
-      }
-      if (FieldName7 != 0) {
-        size += 2 + pb::CodedOutputStream.ComputeInt32Size(FieldName7);
-      }
-      if (FieldName8 != 0) {
-        size += 2 + pb::CodedOutputStream.ComputeInt32Size(FieldName8);
-      }
-      if (FieldName9 != 0) {
-        size += 2 + pb::CodedOutputStream.ComputeInt32Size(FieldName9);
-      }
-      if (FieldName10 != 0) {
-        size += 2 + pb::CodedOutputStream.ComputeInt32Size(FieldName10);
-      }
-      if (FIELDNAME11 != 0) {
-        size += 2 + pb::CodedOutputStream.ComputeInt32Size(FIELDNAME11);
-      }
-      if (FIELDName12 != 0) {
-        size += 2 + pb::CodedOutputStream.ComputeInt32Size(FIELDName12);
-      }
-      if (FieldName13 != 0) {
-        size += 2 + pb::CodedOutputStream.ComputeInt32Size(FieldName13);
-      }
-      if (FieldName14 != 0) {
-        size += 2 + pb::CodedOutputStream.ComputeInt32Size(FieldName14);
-      }
-      if (FieldName15 != 0) {
-        size += 2 + pb::CodedOutputStream.ComputeInt32Size(FieldName15);
-      }
-      if (FieldName16 != 0) {
-        size += 2 + pb::CodedOutputStream.ComputeInt32Size(FieldName16);
-      }
-      if (FieldName17 != 0) {
-        size += 2 + pb::CodedOutputStream.ComputeInt32Size(FieldName17);
-      }
-      if (FieldName18 != 0) {
-        size += 2 + pb::CodedOutputStream.ComputeInt32Size(FieldName18);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(TestAllTypesProto3 other) {
-      if (other == null) {
-        return;
-      }
-      if (other.OptionalInt32 != 0) {
-        OptionalInt32 = other.OptionalInt32;
-      }
-      if (other.OptionalInt64 != 0L) {
-        OptionalInt64 = other.OptionalInt64;
-      }
-      if (other.OptionalUint32 != 0) {
-        OptionalUint32 = other.OptionalUint32;
-      }
-      if (other.OptionalUint64 != 0UL) {
-        OptionalUint64 = other.OptionalUint64;
-      }
-      if (other.OptionalSint32 != 0) {
-        OptionalSint32 = other.OptionalSint32;
-      }
-      if (other.OptionalSint64 != 0L) {
-        OptionalSint64 = other.OptionalSint64;
-      }
-      if (other.OptionalFixed32 != 0) {
-        OptionalFixed32 = other.OptionalFixed32;
-      }
-      if (other.OptionalFixed64 != 0UL) {
-        OptionalFixed64 = other.OptionalFixed64;
-      }
-      if (other.OptionalSfixed32 != 0) {
-        OptionalSfixed32 = other.OptionalSfixed32;
-      }
-      if (other.OptionalSfixed64 != 0L) {
-        OptionalSfixed64 = other.OptionalSfixed64;
-      }
-      if (other.OptionalFloat != 0F) {
-        OptionalFloat = other.OptionalFloat;
-      }
-      if (other.OptionalDouble != 0D) {
-        OptionalDouble = other.OptionalDouble;
-      }
-      if (other.OptionalBool != false) {
-        OptionalBool = other.OptionalBool;
-      }
-      if (other.OptionalString.Length != 0) {
-        OptionalString = other.OptionalString;
-      }
-      if (other.OptionalBytes.Length != 0) {
-        OptionalBytes = other.OptionalBytes;
-      }
-      if (other.optionalNestedMessage_ != null) {
-        if (optionalNestedMessage_ == null) {
-          OptionalNestedMessage = new global::ProtobufTestMessages.Proto3.TestAllTypesProto3.Types.NestedMessage();
-        }
-        OptionalNestedMessage.MergeFrom(other.OptionalNestedMessage);
-      }
-      if (other.optionalForeignMessage_ != null) {
-        if (optionalForeignMessage_ == null) {
-          OptionalForeignMessage = new global::ProtobufTestMessages.Proto3.ForeignMessage();
-        }
-        OptionalForeignMessage.MergeFrom(other.OptionalForeignMessage);
-      }
-      if (other.OptionalNestedEnum != global::ProtobufTestMessages.Proto3.TestAllTypesProto3.Types.NestedEnum.Foo) {
-        OptionalNestedEnum = other.OptionalNestedEnum;
-      }
-      if (other.OptionalForeignEnum != global::ProtobufTestMessages.Proto3.ForeignEnum.ForeignFoo) {
-        OptionalForeignEnum = other.OptionalForeignEnum;
-      }
-      if (other.OptionalAliasedEnum != global::ProtobufTestMessages.Proto3.TestAllTypesProto3.Types.AliasedEnum.AliasFoo) {
-        OptionalAliasedEnum = other.OptionalAliasedEnum;
-      }
-      if (other.OptionalStringPiece.Length != 0) {
-        OptionalStringPiece = other.OptionalStringPiece;
-      }
-      if (other.OptionalCord.Length != 0) {
-        OptionalCord = other.OptionalCord;
-      }
-      if (other.recursiveMessage_ != null) {
-        if (recursiveMessage_ == null) {
-          RecursiveMessage = new global::ProtobufTestMessages.Proto3.TestAllTypesProto3();
-        }
-        RecursiveMessage.MergeFrom(other.RecursiveMessage);
-      }
-      repeatedInt32_.Add(other.repeatedInt32_);
-      repeatedInt64_.Add(other.repeatedInt64_);
-      repeatedUint32_.Add(other.repeatedUint32_);
-      repeatedUint64_.Add(other.repeatedUint64_);
-      repeatedSint32_.Add(other.repeatedSint32_);
-      repeatedSint64_.Add(other.repeatedSint64_);
-      repeatedFixed32_.Add(other.repeatedFixed32_);
-      repeatedFixed64_.Add(other.repeatedFixed64_);
-      repeatedSfixed32_.Add(other.repeatedSfixed32_);
-      repeatedSfixed64_.Add(other.repeatedSfixed64_);
-      repeatedFloat_.Add(other.repeatedFloat_);
-      repeatedDouble_.Add(other.repeatedDouble_);
-      repeatedBool_.Add(other.repeatedBool_);
-      repeatedString_.Add(other.repeatedString_);
-      repeatedBytes_.Add(other.repeatedBytes_);
-      repeatedNestedMessage_.Add(other.repeatedNestedMessage_);
-      repeatedForeignMessage_.Add(other.repeatedForeignMessage_);
-      repeatedNestedEnum_.Add(other.repeatedNestedEnum_);
-      repeatedForeignEnum_.Add(other.repeatedForeignEnum_);
-      repeatedStringPiece_.Add(other.repeatedStringPiece_);
-      repeatedCord_.Add(other.repeatedCord_);
-      packedInt32_.Add(other.packedInt32_);
-      packedInt64_.Add(other.packedInt64_);
-      packedUint32_.Add(other.packedUint32_);
-      packedUint64_.Add(other.packedUint64_);
-      packedSint32_.Add(other.packedSint32_);
-      packedSint64_.Add(other.packedSint64_);
-      packedFixed32_.Add(other.packedFixed32_);
-      packedFixed64_.Add(other.packedFixed64_);
-      packedSfixed32_.Add(other.packedSfixed32_);
-      packedSfixed64_.Add(other.packedSfixed64_);
-      packedFloat_.Add(other.packedFloat_);
-      packedDouble_.Add(other.packedDouble_);
-      packedBool_.Add(other.packedBool_);
-      packedNestedEnum_.Add(other.packedNestedEnum_);
-      unpackedInt32_.Add(other.unpackedInt32_);
-      unpackedInt64_.Add(other.unpackedInt64_);
-      unpackedUint32_.Add(other.unpackedUint32_);
-      unpackedUint64_.Add(other.unpackedUint64_);
-      unpackedSint32_.Add(other.unpackedSint32_);
-      unpackedSint64_.Add(other.unpackedSint64_);
-      unpackedFixed32_.Add(other.unpackedFixed32_);
-      unpackedFixed64_.Add(other.unpackedFixed64_);
-      unpackedSfixed32_.Add(other.unpackedSfixed32_);
-      unpackedSfixed64_.Add(other.unpackedSfixed64_);
-      unpackedFloat_.Add(other.unpackedFloat_);
-      unpackedDouble_.Add(other.unpackedDouble_);
-      unpackedBool_.Add(other.unpackedBool_);
-      unpackedNestedEnum_.Add(other.unpackedNestedEnum_);
-      mapInt32Int32_.Add(other.mapInt32Int32_);
-      mapInt64Int64_.Add(other.mapInt64Int64_);
-      mapUint32Uint32_.Add(other.mapUint32Uint32_);
-      mapUint64Uint64_.Add(other.mapUint64Uint64_);
-      mapSint32Sint32_.Add(other.mapSint32Sint32_);
-      mapSint64Sint64_.Add(other.mapSint64Sint64_);
-      mapFixed32Fixed32_.Add(other.mapFixed32Fixed32_);
-      mapFixed64Fixed64_.Add(other.mapFixed64Fixed64_);
-      mapSfixed32Sfixed32_.Add(other.mapSfixed32Sfixed32_);
-      mapSfixed64Sfixed64_.Add(other.mapSfixed64Sfixed64_);
-      mapInt32Float_.Add(other.mapInt32Float_);
-      mapInt32Double_.Add(other.mapInt32Double_);
-      mapBoolBool_.Add(other.mapBoolBool_);
-      mapStringString_.Add(other.mapStringString_);
-      mapStringBytes_.Add(other.mapStringBytes_);
-      mapStringNestedMessage_.Add(other.mapStringNestedMessage_);
-      mapStringForeignMessage_.Add(other.mapStringForeignMessage_);
-      mapStringNestedEnum_.Add(other.mapStringNestedEnum_);
-      mapStringForeignEnum_.Add(other.mapStringForeignEnum_);
-      if (other.optionalBoolWrapper_ != null) {
-        if (optionalBoolWrapper_ == null || other.OptionalBoolWrapper != false) {
-          OptionalBoolWrapper = other.OptionalBoolWrapper;
-        }
-      }
-      if (other.optionalInt32Wrapper_ != null) {
-        if (optionalInt32Wrapper_ == null || other.OptionalInt32Wrapper != 0) {
-          OptionalInt32Wrapper = other.OptionalInt32Wrapper;
-        }
-      }
-      if (other.optionalInt64Wrapper_ != null) {
-        if (optionalInt64Wrapper_ == null || other.OptionalInt64Wrapper != 0L) {
-          OptionalInt64Wrapper = other.OptionalInt64Wrapper;
-        }
-      }
-      if (other.optionalUint32Wrapper_ != null) {
-        if (optionalUint32Wrapper_ == null || other.OptionalUint32Wrapper != 0) {
-          OptionalUint32Wrapper = other.OptionalUint32Wrapper;
-        }
-      }
-      if (other.optionalUint64Wrapper_ != null) {
-        if (optionalUint64Wrapper_ == null || other.OptionalUint64Wrapper != 0UL) {
-          OptionalUint64Wrapper = other.OptionalUint64Wrapper;
-        }
-      }
-      if (other.optionalFloatWrapper_ != null) {
-        if (optionalFloatWrapper_ == null || other.OptionalFloatWrapper != 0F) {
-          OptionalFloatWrapper = other.OptionalFloatWrapper;
-        }
-      }
-      if (other.optionalDoubleWrapper_ != null) {
-        if (optionalDoubleWrapper_ == null || other.OptionalDoubleWrapper != 0D) {
-          OptionalDoubleWrapper = other.OptionalDoubleWrapper;
-        }
-      }
-      if (other.optionalStringWrapper_ != null) {
-        if (optionalStringWrapper_ == null || other.OptionalStringWrapper != "") {
-          OptionalStringWrapper = other.OptionalStringWrapper;
-        }
-      }
-      if (other.optionalBytesWrapper_ != null) {
-        if (optionalBytesWrapper_ == null || other.OptionalBytesWrapper != pb::ByteString.Empty) {
-          OptionalBytesWrapper = other.OptionalBytesWrapper;
-        }
-      }
-      repeatedBoolWrapper_.Add(other.repeatedBoolWrapper_);
-      repeatedInt32Wrapper_.Add(other.repeatedInt32Wrapper_);
-      repeatedInt64Wrapper_.Add(other.repeatedInt64Wrapper_);
-      repeatedUint32Wrapper_.Add(other.repeatedUint32Wrapper_);
-      repeatedUint64Wrapper_.Add(other.repeatedUint64Wrapper_);
-      repeatedFloatWrapper_.Add(other.repeatedFloatWrapper_);
-      repeatedDoubleWrapper_.Add(other.repeatedDoubleWrapper_);
-      repeatedStringWrapper_.Add(other.repeatedStringWrapper_);
-      repeatedBytesWrapper_.Add(other.repeatedBytesWrapper_);
-      if (other.optionalDuration_ != null) {
-        if (optionalDuration_ == null) {
-          OptionalDuration = new global::Google.Protobuf.WellKnownTypes.Duration();
-        }
-        OptionalDuration.MergeFrom(other.OptionalDuration);
-      }
-      if (other.optionalTimestamp_ != null) {
-        if (optionalTimestamp_ == null) {
-          OptionalTimestamp = new global::Google.Protobuf.WellKnownTypes.Timestamp();
-        }
-        OptionalTimestamp.MergeFrom(other.OptionalTimestamp);
-      }
-      if (other.optionalFieldMask_ != null) {
-        if (optionalFieldMask_ == null) {
-          OptionalFieldMask = new global::Google.Protobuf.WellKnownTypes.FieldMask();
-        }
-        OptionalFieldMask.MergeFrom(other.OptionalFieldMask);
-      }
-      if (other.optionalStruct_ != null) {
-        if (optionalStruct_ == null) {
-          OptionalStruct = new global::Google.Protobuf.WellKnownTypes.Struct();
-        }
-        OptionalStruct.MergeFrom(other.OptionalStruct);
-      }
-      if (other.optionalAny_ != null) {
-        if (optionalAny_ == null) {
-          OptionalAny = new global::Google.Protobuf.WellKnownTypes.Any();
-        }
-        OptionalAny.MergeFrom(other.OptionalAny);
-      }
-      if (other.optionalValue_ != null) {
-        if (optionalValue_ == null) {
-          OptionalValue = new global::Google.Protobuf.WellKnownTypes.Value();
-        }
-        OptionalValue.MergeFrom(other.OptionalValue);
-      }
-      if (other.OptionalNullValue != global::Google.Protobuf.WellKnownTypes.NullValue.NullValue) {
-        OptionalNullValue = other.OptionalNullValue;
-      }
-      repeatedDuration_.Add(other.repeatedDuration_);
-      repeatedTimestamp_.Add(other.repeatedTimestamp_);
-      repeatedFieldmask_.Add(other.repeatedFieldmask_);
-      repeatedStruct_.Add(other.repeatedStruct_);
-      repeatedAny_.Add(other.repeatedAny_);
-      repeatedValue_.Add(other.repeatedValue_);
-      repeatedListValue_.Add(other.repeatedListValue_);
-      if (other.Fieldname1 != 0) {
-        Fieldname1 = other.Fieldname1;
-      }
-      if (other.FieldName2 != 0) {
-        FieldName2 = other.FieldName2;
-      }
-      if (other.FieldName3 != 0) {
-        FieldName3 = other.FieldName3;
-      }
-      if (other.FieldName4 != 0) {
-        FieldName4 = other.FieldName4;
-      }
-      if (other.Field0Name5 != 0) {
-        Field0Name5 = other.Field0Name5;
-      }
-      if (other.Field0Name6 != 0) {
-        Field0Name6 = other.Field0Name6;
-      }
-      if (other.FieldName7 != 0) {
-        FieldName7 = other.FieldName7;
-      }
-      if (other.FieldName8 != 0) {
-        FieldName8 = other.FieldName8;
-      }
-      if (other.FieldName9 != 0) {
-        FieldName9 = other.FieldName9;
-      }
-      if (other.FieldName10 != 0) {
-        FieldName10 = other.FieldName10;
-      }
-      if (other.FIELDNAME11 != 0) {
-        FIELDNAME11 = other.FIELDNAME11;
-      }
-      if (other.FIELDName12 != 0) {
-        FIELDName12 = other.FIELDName12;
-      }
-      if (other.FieldName13 != 0) {
-        FieldName13 = other.FieldName13;
-      }
-      if (other.FieldName14 != 0) {
-        FieldName14 = other.FieldName14;
-      }
-      if (other.FieldName15 != 0) {
-        FieldName15 = other.FieldName15;
-      }
-      if (other.FieldName16 != 0) {
-        FieldName16 = other.FieldName16;
-      }
-      if (other.FieldName17 != 0) {
-        FieldName17 = other.FieldName17;
-      }
-      if (other.FieldName18 != 0) {
-        FieldName18 = other.FieldName18;
-      }
-      switch (other.OneofFieldCase) {
-        case OneofFieldOneofCase.OneofUint32:
-          OneofUint32 = other.OneofUint32;
-          break;
-        case OneofFieldOneofCase.OneofNestedMessage:
-          if (OneofNestedMessage == null) {
-            OneofNestedMessage = new global::ProtobufTestMessages.Proto3.TestAllTypesProto3.Types.NestedMessage();
-          }
-          OneofNestedMessage.MergeFrom(other.OneofNestedMessage);
-          break;
-        case OneofFieldOneofCase.OneofString:
-          OneofString = other.OneofString;
-          break;
-        case OneofFieldOneofCase.OneofBytes:
-          OneofBytes = other.OneofBytes;
-          break;
-        case OneofFieldOneofCase.OneofBool:
-          OneofBool = other.OneofBool;
-          break;
-        case OneofFieldOneofCase.OneofUint64:
-          OneofUint64 = other.OneofUint64;
-          break;
-        case OneofFieldOneofCase.OneofFloat:
-          OneofFloat = other.OneofFloat;
-          break;
-        case OneofFieldOneofCase.OneofDouble:
-          OneofDouble = other.OneofDouble;
-          break;
-        case OneofFieldOneofCase.OneofEnum:
-          OneofEnum = other.OneofEnum;
-          break;
-        case OneofFieldOneofCase.OneofNullValue:
-          OneofNullValue = other.OneofNullValue;
-          break;
-      }
-
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 8: {
-            OptionalInt32 = input.ReadInt32();
-            break;
-          }
-          case 16: {
-            OptionalInt64 = input.ReadInt64();
-            break;
-          }
-          case 24: {
-            OptionalUint32 = input.ReadUInt32();
-            break;
-          }
-          case 32: {
-            OptionalUint64 = input.ReadUInt64();
-            break;
-          }
-          case 40: {
-            OptionalSint32 = input.ReadSInt32();
-            break;
-          }
-          case 48: {
-            OptionalSint64 = input.ReadSInt64();
-            break;
-          }
-          case 61: {
-            OptionalFixed32 = input.ReadFixed32();
-            break;
-          }
-          case 65: {
-            OptionalFixed64 = input.ReadFixed64();
-            break;
-          }
-          case 77: {
-            OptionalSfixed32 = input.ReadSFixed32();
-            break;
-          }
-          case 81: {
-            OptionalSfixed64 = input.ReadSFixed64();
-            break;
-          }
-          case 93: {
-            OptionalFloat = input.ReadFloat();
-            break;
-          }
-          case 97: {
-            OptionalDouble = input.ReadDouble();
-            break;
-          }
-          case 104: {
-            OptionalBool = input.ReadBool();
-            break;
-          }
-          case 114: {
-            OptionalString = input.ReadString();
-            break;
-          }
-          case 122: {
-            OptionalBytes = input.ReadBytes();
-            break;
-          }
-          case 146: {
-            if (optionalNestedMessage_ == null) {
-              OptionalNestedMessage = new global::ProtobufTestMessages.Proto3.TestAllTypesProto3.Types.NestedMessage();
-            }
-            input.ReadMessage(OptionalNestedMessage);
-            break;
-          }
-          case 154: {
-            if (optionalForeignMessage_ == null) {
-              OptionalForeignMessage = new global::ProtobufTestMessages.Proto3.ForeignMessage();
-            }
-            input.ReadMessage(OptionalForeignMessage);
-            break;
-          }
-          case 168: {
-            OptionalNestedEnum = (global::ProtobufTestMessages.Proto3.TestAllTypesProto3.Types.NestedEnum) input.ReadEnum();
-            break;
-          }
-          case 176: {
-            OptionalForeignEnum = (global::ProtobufTestMessages.Proto3.ForeignEnum) input.ReadEnum();
-            break;
-          }
-          case 184: {
-            OptionalAliasedEnum = (global::ProtobufTestMessages.Proto3.TestAllTypesProto3.Types.AliasedEnum) input.ReadEnum();
-            break;
-          }
-          case 194: {
-            OptionalStringPiece = input.ReadString();
-            break;
-          }
-          case 202: {
-            OptionalCord = input.ReadString();
-            break;
-          }
-          case 218: {
-            if (recursiveMessage_ == null) {
-              RecursiveMessage = new global::ProtobufTestMessages.Proto3.TestAllTypesProto3();
-            }
-            input.ReadMessage(RecursiveMessage);
-            break;
-          }
-          case 250:
-          case 248: {
-            repeatedInt32_.AddEntriesFrom(input, _repeated_repeatedInt32_codec);
-            break;
-          }
-          case 258:
-          case 256: {
-            repeatedInt64_.AddEntriesFrom(input, _repeated_repeatedInt64_codec);
-            break;
-          }
-          case 266:
-          case 264: {
-            repeatedUint32_.AddEntriesFrom(input, _repeated_repeatedUint32_codec);
-            break;
-          }
-          case 274:
-          case 272: {
-            repeatedUint64_.AddEntriesFrom(input, _repeated_repeatedUint64_codec);
-            break;
-          }
-          case 282:
-          case 280: {
-            repeatedSint32_.AddEntriesFrom(input, _repeated_repeatedSint32_codec);
-            break;
-          }
-          case 290:
-          case 288: {
-            repeatedSint64_.AddEntriesFrom(input, _repeated_repeatedSint64_codec);
-            break;
-          }
-          case 298:
-          case 301: {
-            repeatedFixed32_.AddEntriesFrom(input, _repeated_repeatedFixed32_codec);
-            break;
-          }
-          case 306:
-          case 305: {
-            repeatedFixed64_.AddEntriesFrom(input, _repeated_repeatedFixed64_codec);
-            break;
-          }
-          case 314:
-          case 317: {
-            repeatedSfixed32_.AddEntriesFrom(input, _repeated_repeatedSfixed32_codec);
-            break;
-          }
-          case 322:
-          case 321: {
-            repeatedSfixed64_.AddEntriesFrom(input, _repeated_repeatedSfixed64_codec);
-            break;
-          }
-          case 330:
-          case 333: {
-            repeatedFloat_.AddEntriesFrom(input, _repeated_repeatedFloat_codec);
-            break;
-          }
-          case 338:
-          case 337: {
-            repeatedDouble_.AddEntriesFrom(input, _repeated_repeatedDouble_codec);
-            break;
-          }
-          case 346:
-          case 344: {
-            repeatedBool_.AddEntriesFrom(input, _repeated_repeatedBool_codec);
-            break;
-          }
-          case 354: {
-            repeatedString_.AddEntriesFrom(input, _repeated_repeatedString_codec);
-            break;
-          }
-          case 362: {
-            repeatedBytes_.AddEntriesFrom(input, _repeated_repeatedBytes_codec);
-            break;
-          }
-          case 386: {
-            repeatedNestedMessage_.AddEntriesFrom(input, _repeated_repeatedNestedMessage_codec);
-            break;
-          }
-          case 394: {
-            repeatedForeignMessage_.AddEntriesFrom(input, _repeated_repeatedForeignMessage_codec);
-            break;
-          }
-          case 410:
-          case 408: {
-            repeatedNestedEnum_.AddEntriesFrom(input, _repeated_repeatedNestedEnum_codec);
-            break;
-          }
-          case 418:
-          case 416: {
-            repeatedForeignEnum_.AddEntriesFrom(input, _repeated_repeatedForeignEnum_codec);
-            break;
-          }
-          case 434: {
-            repeatedStringPiece_.AddEntriesFrom(input, _repeated_repeatedStringPiece_codec);
-            break;
-          }
-          case 442: {
-            repeatedCord_.AddEntriesFrom(input, _repeated_repeatedCord_codec);
-            break;
-          }
-          case 450: {
-            mapInt32Int32_.AddEntriesFrom(input, _map_mapInt32Int32_codec);
-            break;
-          }
-          case 458: {
-            mapInt64Int64_.AddEntriesFrom(input, _map_mapInt64Int64_codec);
-            break;
-          }
-          case 466: {
-            mapUint32Uint32_.AddEntriesFrom(input, _map_mapUint32Uint32_codec);
-            break;
-          }
-          case 474: {
-            mapUint64Uint64_.AddEntriesFrom(input, _map_mapUint64Uint64_codec);
-            break;
-          }
-          case 482: {
-            mapSint32Sint32_.AddEntriesFrom(input, _map_mapSint32Sint32_codec);
-            break;
-          }
-          case 490: {
-            mapSint64Sint64_.AddEntriesFrom(input, _map_mapSint64Sint64_codec);
-            break;
-          }
-          case 498: {
-            mapFixed32Fixed32_.AddEntriesFrom(input, _map_mapFixed32Fixed32_codec);
-            break;
-          }
-          case 506: {
-            mapFixed64Fixed64_.AddEntriesFrom(input, _map_mapFixed64Fixed64_codec);
-            break;
-          }
-          case 514: {
-            mapSfixed32Sfixed32_.AddEntriesFrom(input, _map_mapSfixed32Sfixed32_codec);
-            break;
-          }
-          case 522: {
-            mapSfixed64Sfixed64_.AddEntriesFrom(input, _map_mapSfixed64Sfixed64_codec);
-            break;
-          }
-          case 530: {
-            mapInt32Float_.AddEntriesFrom(input, _map_mapInt32Float_codec);
-            break;
-          }
-          case 538: {
-            mapInt32Double_.AddEntriesFrom(input, _map_mapInt32Double_codec);
-            break;
-          }
-          case 546: {
-            mapBoolBool_.AddEntriesFrom(input, _map_mapBoolBool_codec);
-            break;
-          }
-          case 554: {
-            mapStringString_.AddEntriesFrom(input, _map_mapStringString_codec);
-            break;
-          }
-          case 562: {
-            mapStringBytes_.AddEntriesFrom(input, _map_mapStringBytes_codec);
-            break;
-          }
-          case 570: {
-            mapStringNestedMessage_.AddEntriesFrom(input, _map_mapStringNestedMessage_codec);
-            break;
-          }
-          case 578: {
-            mapStringForeignMessage_.AddEntriesFrom(input, _map_mapStringForeignMessage_codec);
-            break;
-          }
-          case 586: {
-            mapStringNestedEnum_.AddEntriesFrom(input, _map_mapStringNestedEnum_codec);
-            break;
-          }
-          case 594: {
-            mapStringForeignEnum_.AddEntriesFrom(input, _map_mapStringForeignEnum_codec);
-            break;
-          }
-          case 602:
-          case 600: {
-            packedInt32_.AddEntriesFrom(input, _repeated_packedInt32_codec);
-            break;
-          }
-          case 610:
-          case 608: {
-            packedInt64_.AddEntriesFrom(input, _repeated_packedInt64_codec);
-            break;
-          }
-          case 618:
-          case 616: {
-            packedUint32_.AddEntriesFrom(input, _repeated_packedUint32_codec);
-            break;
-          }
-          case 626:
-          case 624: {
-            packedUint64_.AddEntriesFrom(input, _repeated_packedUint64_codec);
-            break;
-          }
-          case 634:
-          case 632: {
-            packedSint32_.AddEntriesFrom(input, _repeated_packedSint32_codec);
-            break;
-          }
-          case 642:
-          case 640: {
-            packedSint64_.AddEntriesFrom(input, _repeated_packedSint64_codec);
-            break;
-          }
-          case 650:
-          case 653: {
-            packedFixed32_.AddEntriesFrom(input, _repeated_packedFixed32_codec);
-            break;
-          }
-          case 658:
-          case 657: {
-            packedFixed64_.AddEntriesFrom(input, _repeated_packedFixed64_codec);
-            break;
-          }
-          case 666:
-          case 669: {
-            packedSfixed32_.AddEntriesFrom(input, _repeated_packedSfixed32_codec);
-            break;
-          }
-          case 674:
-          case 673: {
-            packedSfixed64_.AddEntriesFrom(input, _repeated_packedSfixed64_codec);
-            break;
-          }
-          case 682:
-          case 685: {
-            packedFloat_.AddEntriesFrom(input, _repeated_packedFloat_codec);
-            break;
-          }
-          case 690:
-          case 689: {
-            packedDouble_.AddEntriesFrom(input, _repeated_packedDouble_codec);
-            break;
-          }
-          case 698:
-          case 696: {
-            packedBool_.AddEntriesFrom(input, _repeated_packedBool_codec);
-            break;
-          }
-          case 706:
-          case 704: {
-            packedNestedEnum_.AddEntriesFrom(input, _repeated_packedNestedEnum_codec);
-            break;
-          }
-          case 714:
-          case 712: {
-            unpackedInt32_.AddEntriesFrom(input, _repeated_unpackedInt32_codec);
-            break;
-          }
-          case 722:
-          case 720: {
-            unpackedInt64_.AddEntriesFrom(input, _repeated_unpackedInt64_codec);
-            break;
-          }
-          case 730:
-          case 728: {
-            unpackedUint32_.AddEntriesFrom(input, _repeated_unpackedUint32_codec);
-            break;
-          }
-          case 738:
-          case 736: {
-            unpackedUint64_.AddEntriesFrom(input, _repeated_unpackedUint64_codec);
-            break;
-          }
-          case 746:
-          case 744: {
-            unpackedSint32_.AddEntriesFrom(input, _repeated_unpackedSint32_codec);
-            break;
-          }
-          case 754:
-          case 752: {
-            unpackedSint64_.AddEntriesFrom(input, _repeated_unpackedSint64_codec);
-            break;
-          }
-          case 762:
-          case 765: {
-            unpackedFixed32_.AddEntriesFrom(input, _repeated_unpackedFixed32_codec);
-            break;
-          }
-          case 770:
-          case 769: {
-            unpackedFixed64_.AddEntriesFrom(input, _repeated_unpackedFixed64_codec);
-            break;
-          }
-          case 778:
-          case 781: {
-            unpackedSfixed32_.AddEntriesFrom(input, _repeated_unpackedSfixed32_codec);
-            break;
-          }
-          case 786:
-          case 785: {
-            unpackedSfixed64_.AddEntriesFrom(input, _repeated_unpackedSfixed64_codec);
-            break;
-          }
-          case 794:
-          case 797: {
-            unpackedFloat_.AddEntriesFrom(input, _repeated_unpackedFloat_codec);
-            break;
-          }
-          case 802:
-          case 801: {
-            unpackedDouble_.AddEntriesFrom(input, _repeated_unpackedDouble_codec);
-            break;
-          }
-          case 810:
-          case 808: {
-            unpackedBool_.AddEntriesFrom(input, _repeated_unpackedBool_codec);
-            break;
-          }
-          case 818:
-          case 816: {
-            unpackedNestedEnum_.AddEntriesFrom(input, _repeated_unpackedNestedEnum_codec);
-            break;
-          }
-          case 888: {
-            OneofUint32 = input.ReadUInt32();
-            break;
-          }
-          case 898: {
-            global::ProtobufTestMessages.Proto3.TestAllTypesProto3.Types.NestedMessage subBuilder = new global::ProtobufTestMessages.Proto3.TestAllTypesProto3.Types.NestedMessage();
-            if (oneofFieldCase_ == OneofFieldOneofCase.OneofNestedMessage) {
-              subBuilder.MergeFrom(OneofNestedMessage);
-            }
-            input.ReadMessage(subBuilder);
-            OneofNestedMessage = subBuilder;
-            break;
-          }
-          case 906: {
-            OneofString = input.ReadString();
-            break;
-          }
-          case 914: {
-            OneofBytes = input.ReadBytes();
-            break;
-          }
-          case 920: {
-            OneofBool = input.ReadBool();
-            break;
-          }
-          case 928: {
-            OneofUint64 = input.ReadUInt64();
-            break;
-          }
-          case 941: {
-            OneofFloat = input.ReadFloat();
-            break;
-          }
-          case 945: {
-            OneofDouble = input.ReadDouble();
-            break;
-          }
-          case 952: {
-            oneofField_ = input.ReadEnum();
-            oneofFieldCase_ = OneofFieldOneofCase.OneofEnum;
-            break;
-          }
-          case 960: {
-            oneofField_ = input.ReadEnum();
-            oneofFieldCase_ = OneofFieldOneofCase.OneofNullValue;
-            break;
-          }
-          case 1610: {
-            bool? value = _single_optionalBoolWrapper_codec.Read(input);
-            if (optionalBoolWrapper_ == null || value != false) {
-              OptionalBoolWrapper = value;
-            }
-            break;
-          }
-          case 1618: {
-            int? value = _single_optionalInt32Wrapper_codec.Read(input);
-            if (optionalInt32Wrapper_ == null || value != 0) {
-              OptionalInt32Wrapper = value;
-            }
-            break;
-          }
-          case 1626: {
-            long? value = _single_optionalInt64Wrapper_codec.Read(input);
-            if (optionalInt64Wrapper_ == null || value != 0L) {
-              OptionalInt64Wrapper = value;
-            }
-            break;
-          }
-          case 1634: {
-            uint? value = _single_optionalUint32Wrapper_codec.Read(input);
-            if (optionalUint32Wrapper_ == null || value != 0) {
-              OptionalUint32Wrapper = value;
-            }
-            break;
-          }
-          case 1642: {
-            ulong? value = _single_optionalUint64Wrapper_codec.Read(input);
-            if (optionalUint64Wrapper_ == null || value != 0UL) {
-              OptionalUint64Wrapper = value;
-            }
-            break;
-          }
-          case 1650: {
-            float? value = _single_optionalFloatWrapper_codec.Read(input);
-            if (optionalFloatWrapper_ == null || value != 0F) {
-              OptionalFloatWrapper = value;
-            }
-            break;
-          }
-          case 1658: {
-            double? value = _single_optionalDoubleWrapper_codec.Read(input);
-            if (optionalDoubleWrapper_ == null || value != 0D) {
-              OptionalDoubleWrapper = value;
-            }
-            break;
-          }
-          case 1666: {
-            string value = _single_optionalStringWrapper_codec.Read(input);
-            if (optionalStringWrapper_ == null || value != "") {
-              OptionalStringWrapper = value;
-            }
-            break;
-          }
-          case 1674: {
-            pb::ByteString value = _single_optionalBytesWrapper_codec.Read(input);
-            if (optionalBytesWrapper_ == null || value != pb::ByteString.Empty) {
-              OptionalBytesWrapper = value;
-            }
-            break;
-          }
-          case 1690: {
-            repeatedBoolWrapper_.AddEntriesFrom(input, _repeated_repeatedBoolWrapper_codec);
-            break;
-          }
-          case 1698: {
-            repeatedInt32Wrapper_.AddEntriesFrom(input, _repeated_repeatedInt32Wrapper_codec);
-            break;
-          }
-          case 1706: {
-            repeatedInt64Wrapper_.AddEntriesFrom(input, _repeated_repeatedInt64Wrapper_codec);
-            break;
-          }
-          case 1714: {
-            repeatedUint32Wrapper_.AddEntriesFrom(input, _repeated_repeatedUint32Wrapper_codec);
-            break;
-          }
-          case 1722: {
-            repeatedUint64Wrapper_.AddEntriesFrom(input, _repeated_repeatedUint64Wrapper_codec);
-            break;
-          }
-          case 1730: {
-            repeatedFloatWrapper_.AddEntriesFrom(input, _repeated_repeatedFloatWrapper_codec);
-            break;
-          }
-          case 1738: {
-            repeatedDoubleWrapper_.AddEntriesFrom(input, _repeated_repeatedDoubleWrapper_codec);
-            break;
-          }
-          case 1746: {
-            repeatedStringWrapper_.AddEntriesFrom(input, _repeated_repeatedStringWrapper_codec);
-            break;
-          }
-          case 1754: {
-            repeatedBytesWrapper_.AddEntriesFrom(input, _repeated_repeatedBytesWrapper_codec);
-            break;
-          }
-          case 2410: {
-            if (optionalDuration_ == null) {
-              OptionalDuration = new global::Google.Protobuf.WellKnownTypes.Duration();
-            }
-            input.ReadMessage(OptionalDuration);
-            break;
-          }
-          case 2418: {
-            if (optionalTimestamp_ == null) {
-              OptionalTimestamp = new global::Google.Protobuf.WellKnownTypes.Timestamp();
-            }
-            input.ReadMessage(OptionalTimestamp);
-            break;
-          }
-          case 2426: {
-            if (optionalFieldMask_ == null) {
-              OptionalFieldMask = new global::Google.Protobuf.WellKnownTypes.FieldMask();
-            }
-            input.ReadMessage(OptionalFieldMask);
-            break;
-          }
-          case 2434: {
-            if (optionalStruct_ == null) {
-              OptionalStruct = new global::Google.Protobuf.WellKnownTypes.Struct();
-            }
-            input.ReadMessage(OptionalStruct);
-            break;
-          }
-          case 2442: {
-            if (optionalAny_ == null) {
-              OptionalAny = new global::Google.Protobuf.WellKnownTypes.Any();
-            }
-            input.ReadMessage(OptionalAny);
-            break;
-          }
-          case 2450: {
-            if (optionalValue_ == null) {
-              OptionalValue = new global::Google.Protobuf.WellKnownTypes.Value();
-            }
-            input.ReadMessage(OptionalValue);
-            break;
-          }
-          case 2456: {
-            OptionalNullValue = (global::Google.Protobuf.WellKnownTypes.NullValue) input.ReadEnum();
-            break;
-          }
-          case 2490: {
-            repeatedDuration_.AddEntriesFrom(input, _repeated_repeatedDuration_codec);
-            break;
-          }
-          case 2498: {
-            repeatedTimestamp_.AddEntriesFrom(input, _repeated_repeatedTimestamp_codec);
-            break;
-          }
-          case 2506: {
-            repeatedFieldmask_.AddEntriesFrom(input, _repeated_repeatedFieldmask_codec);
-            break;
-          }
-          case 2522: {
-            repeatedAny_.AddEntriesFrom(input, _repeated_repeatedAny_codec);
-            break;
-          }
-          case 2530: {
-            repeatedValue_.AddEntriesFrom(input, _repeated_repeatedValue_codec);
-            break;
-          }
-          case 2538: {
-            repeatedListValue_.AddEntriesFrom(input, _repeated_repeatedListValue_codec);
-            break;
-          }
-          case 2594: {
-            repeatedStruct_.AddEntriesFrom(input, _repeated_repeatedStruct_codec);
-            break;
-          }
-          case 3208: {
-            Fieldname1 = input.ReadInt32();
-            break;
-          }
-          case 3216: {
-            FieldName2 = input.ReadInt32();
-            break;
-          }
-          case 3224: {
-            FieldName3 = input.ReadInt32();
-            break;
-          }
-          case 3232: {
-            FieldName4 = input.ReadInt32();
-            break;
-          }
-          case 3240: {
-            Field0Name5 = input.ReadInt32();
-            break;
-          }
-          case 3248: {
-            Field0Name6 = input.ReadInt32();
-            break;
-          }
-          case 3256: {
-            FieldName7 = input.ReadInt32();
-            break;
-          }
-          case 3264: {
-            FieldName8 = input.ReadInt32();
-            break;
-          }
-          case 3272: {
-            FieldName9 = input.ReadInt32();
-            break;
-          }
-          case 3280: {
-            FieldName10 = input.ReadInt32();
-            break;
-          }
-          case 3288: {
-            FIELDNAME11 = input.ReadInt32();
-            break;
-          }
-          case 3296: {
-            FIELDName12 = input.ReadInt32();
-            break;
-          }
-          case 3304: {
-            FieldName13 = input.ReadInt32();
-            break;
-          }
-          case 3312: {
-            FieldName14 = input.ReadInt32();
-            break;
-          }
-          case 3320: {
-            FieldName15 = input.ReadInt32();
-            break;
-          }
-          case 3328: {
-            FieldName16 = input.ReadInt32();
-            break;
-          }
-          case 3336: {
-            FieldName17 = input.ReadInt32();
-            break;
-          }
-          case 3344: {
-            FieldName18 = input.ReadInt32();
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 8: {
-            OptionalInt32 = input.ReadInt32();
-            break;
-          }
-          case 16: {
-            OptionalInt64 = input.ReadInt64();
-            break;
-          }
-          case 24: {
-            OptionalUint32 = input.ReadUInt32();
-            break;
-          }
-          case 32: {
-            OptionalUint64 = input.ReadUInt64();
-            break;
-          }
-          case 40: {
-            OptionalSint32 = input.ReadSInt32();
-            break;
-          }
-          case 48: {
-            OptionalSint64 = input.ReadSInt64();
-            break;
-          }
-          case 61: {
-            OptionalFixed32 = input.ReadFixed32();
-            break;
-          }
-          case 65: {
-            OptionalFixed64 = input.ReadFixed64();
-            break;
-          }
-          case 77: {
-            OptionalSfixed32 = input.ReadSFixed32();
-            break;
-          }
-          case 81: {
-            OptionalSfixed64 = input.ReadSFixed64();
-            break;
-          }
-          case 93: {
-            OptionalFloat = input.ReadFloat();
-            break;
-          }
-          case 97: {
-            OptionalDouble = input.ReadDouble();
-            break;
-          }
-          case 104: {
-            OptionalBool = input.ReadBool();
-            break;
-          }
-          case 114: {
-            OptionalString = input.ReadString();
-            break;
-          }
-          case 122: {
-            OptionalBytes = input.ReadBytes();
-            break;
-          }
-          case 146: {
-            if (optionalNestedMessage_ == null) {
-              OptionalNestedMessage = new global::ProtobufTestMessages.Proto3.TestAllTypesProto3.Types.NestedMessage();
-            }
-            input.ReadMessage(OptionalNestedMessage);
-            break;
-          }
-          case 154: {
-            if (optionalForeignMessage_ == null) {
-              OptionalForeignMessage = new global::ProtobufTestMessages.Proto3.ForeignMessage();
-            }
-            input.ReadMessage(OptionalForeignMessage);
-            break;
-          }
-          case 168: {
-            OptionalNestedEnum = (global::ProtobufTestMessages.Proto3.TestAllTypesProto3.Types.NestedEnum) input.ReadEnum();
-            break;
-          }
-          case 176: {
-            OptionalForeignEnum = (global::ProtobufTestMessages.Proto3.ForeignEnum) input.ReadEnum();
-            break;
-          }
-          case 184: {
-            OptionalAliasedEnum = (global::ProtobufTestMessages.Proto3.TestAllTypesProto3.Types.AliasedEnum) input.ReadEnum();
-            break;
-          }
-          case 194: {
-            OptionalStringPiece = input.ReadString();
-            break;
-          }
-          case 202: {
-            OptionalCord = input.ReadString();
-            break;
-          }
-          case 218: {
-            if (recursiveMessage_ == null) {
-              RecursiveMessage = new global::ProtobufTestMessages.Proto3.TestAllTypesProto3();
-            }
-            input.ReadMessage(RecursiveMessage);
-            break;
-          }
-          case 250:
-          case 248: {
-            repeatedInt32_.AddEntriesFrom(ref input, _repeated_repeatedInt32_codec);
-            break;
-          }
-          case 258:
-          case 256: {
-            repeatedInt64_.AddEntriesFrom(ref input, _repeated_repeatedInt64_codec);
-            break;
-          }
-          case 266:
-          case 264: {
-            repeatedUint32_.AddEntriesFrom(ref input, _repeated_repeatedUint32_codec);
-            break;
-          }
-          case 274:
-          case 272: {
-            repeatedUint64_.AddEntriesFrom(ref input, _repeated_repeatedUint64_codec);
-            break;
-          }
-          case 282:
-          case 280: {
-            repeatedSint32_.AddEntriesFrom(ref input, _repeated_repeatedSint32_codec);
-            break;
-          }
-          case 290:
-          case 288: {
-            repeatedSint64_.AddEntriesFrom(ref input, _repeated_repeatedSint64_codec);
-            break;
-          }
-          case 298:
-          case 301: {
-            repeatedFixed32_.AddEntriesFrom(ref input, _repeated_repeatedFixed32_codec);
-            break;
-          }
-          case 306:
-          case 305: {
-            repeatedFixed64_.AddEntriesFrom(ref input, _repeated_repeatedFixed64_codec);
-            break;
-          }
-          case 314:
-          case 317: {
-            repeatedSfixed32_.AddEntriesFrom(ref input, _repeated_repeatedSfixed32_codec);
-            break;
-          }
-          case 322:
-          case 321: {
-            repeatedSfixed64_.AddEntriesFrom(ref input, _repeated_repeatedSfixed64_codec);
-            break;
-          }
-          case 330:
-          case 333: {
-            repeatedFloat_.AddEntriesFrom(ref input, _repeated_repeatedFloat_codec);
-            break;
-          }
-          case 338:
-          case 337: {
-            repeatedDouble_.AddEntriesFrom(ref input, _repeated_repeatedDouble_codec);
-            break;
-          }
-          case 346:
-          case 344: {
-            repeatedBool_.AddEntriesFrom(ref input, _repeated_repeatedBool_codec);
-            break;
-          }
-          case 354: {
-            repeatedString_.AddEntriesFrom(ref input, _repeated_repeatedString_codec);
-            break;
-          }
-          case 362: {
-            repeatedBytes_.AddEntriesFrom(ref input, _repeated_repeatedBytes_codec);
-            break;
-          }
-          case 386: {
-            repeatedNestedMessage_.AddEntriesFrom(ref input, _repeated_repeatedNestedMessage_codec);
-            break;
-          }
-          case 394: {
-            repeatedForeignMessage_.AddEntriesFrom(ref input, _repeated_repeatedForeignMessage_codec);
-            break;
-          }
-          case 410:
-          case 408: {
-            repeatedNestedEnum_.AddEntriesFrom(ref input, _repeated_repeatedNestedEnum_codec);
-            break;
-          }
-          case 418:
-          case 416: {
-            repeatedForeignEnum_.AddEntriesFrom(ref input, _repeated_repeatedForeignEnum_codec);
-            break;
-          }
-          case 434: {
-            repeatedStringPiece_.AddEntriesFrom(ref input, _repeated_repeatedStringPiece_codec);
-            break;
-          }
-          case 442: {
-            repeatedCord_.AddEntriesFrom(ref input, _repeated_repeatedCord_codec);
-            break;
-          }
-          case 450: {
-            mapInt32Int32_.AddEntriesFrom(ref input, _map_mapInt32Int32_codec);
-            break;
-          }
-          case 458: {
-            mapInt64Int64_.AddEntriesFrom(ref input, _map_mapInt64Int64_codec);
-            break;
-          }
-          case 466: {
-            mapUint32Uint32_.AddEntriesFrom(ref input, _map_mapUint32Uint32_codec);
-            break;
-          }
-          case 474: {
-            mapUint64Uint64_.AddEntriesFrom(ref input, _map_mapUint64Uint64_codec);
-            break;
-          }
-          case 482: {
-            mapSint32Sint32_.AddEntriesFrom(ref input, _map_mapSint32Sint32_codec);
-            break;
-          }
-          case 490: {
-            mapSint64Sint64_.AddEntriesFrom(ref input, _map_mapSint64Sint64_codec);
-            break;
-          }
-          case 498: {
-            mapFixed32Fixed32_.AddEntriesFrom(ref input, _map_mapFixed32Fixed32_codec);
-            break;
-          }
-          case 506: {
-            mapFixed64Fixed64_.AddEntriesFrom(ref input, _map_mapFixed64Fixed64_codec);
-            break;
-          }
-          case 514: {
-            mapSfixed32Sfixed32_.AddEntriesFrom(ref input, _map_mapSfixed32Sfixed32_codec);
-            break;
-          }
-          case 522: {
-            mapSfixed64Sfixed64_.AddEntriesFrom(ref input, _map_mapSfixed64Sfixed64_codec);
-            break;
-          }
-          case 530: {
-            mapInt32Float_.AddEntriesFrom(ref input, _map_mapInt32Float_codec);
-            break;
-          }
-          case 538: {
-            mapInt32Double_.AddEntriesFrom(ref input, _map_mapInt32Double_codec);
-            break;
-          }
-          case 546: {
-            mapBoolBool_.AddEntriesFrom(ref input, _map_mapBoolBool_codec);
-            break;
-          }
-          case 554: {
-            mapStringString_.AddEntriesFrom(ref input, _map_mapStringString_codec);
-            break;
-          }
-          case 562: {
-            mapStringBytes_.AddEntriesFrom(ref input, _map_mapStringBytes_codec);
-            break;
-          }
-          case 570: {
-            mapStringNestedMessage_.AddEntriesFrom(ref input, _map_mapStringNestedMessage_codec);
-            break;
-          }
-          case 578: {
-            mapStringForeignMessage_.AddEntriesFrom(ref input, _map_mapStringForeignMessage_codec);
-            break;
-          }
-          case 586: {
-            mapStringNestedEnum_.AddEntriesFrom(ref input, _map_mapStringNestedEnum_codec);
-            break;
-          }
-          case 594: {
-            mapStringForeignEnum_.AddEntriesFrom(ref input, _map_mapStringForeignEnum_codec);
-            break;
-          }
-          case 602:
-          case 600: {
-            packedInt32_.AddEntriesFrom(ref input, _repeated_packedInt32_codec);
-            break;
-          }
-          case 610:
-          case 608: {
-            packedInt64_.AddEntriesFrom(ref input, _repeated_packedInt64_codec);
-            break;
-          }
-          case 618:
-          case 616: {
-            packedUint32_.AddEntriesFrom(ref input, _repeated_packedUint32_codec);
-            break;
-          }
-          case 626:
-          case 624: {
-            packedUint64_.AddEntriesFrom(ref input, _repeated_packedUint64_codec);
-            break;
-          }
-          case 634:
-          case 632: {
-            packedSint32_.AddEntriesFrom(ref input, _repeated_packedSint32_codec);
-            break;
-          }
-          case 642:
-          case 640: {
-            packedSint64_.AddEntriesFrom(ref input, _repeated_packedSint64_codec);
-            break;
-          }
-          case 650:
-          case 653: {
-            packedFixed32_.AddEntriesFrom(ref input, _repeated_packedFixed32_codec);
-            break;
-          }
-          case 658:
-          case 657: {
-            packedFixed64_.AddEntriesFrom(ref input, _repeated_packedFixed64_codec);
-            break;
-          }
-          case 666:
-          case 669: {
-            packedSfixed32_.AddEntriesFrom(ref input, _repeated_packedSfixed32_codec);
-            break;
-          }
-          case 674:
-          case 673: {
-            packedSfixed64_.AddEntriesFrom(ref input, _repeated_packedSfixed64_codec);
-            break;
-          }
-          case 682:
-          case 685: {
-            packedFloat_.AddEntriesFrom(ref input, _repeated_packedFloat_codec);
-            break;
-          }
-          case 690:
-          case 689: {
-            packedDouble_.AddEntriesFrom(ref input, _repeated_packedDouble_codec);
-            break;
-          }
-          case 698:
-          case 696: {
-            packedBool_.AddEntriesFrom(ref input, _repeated_packedBool_codec);
-            break;
-          }
-          case 706:
-          case 704: {
-            packedNestedEnum_.AddEntriesFrom(ref input, _repeated_packedNestedEnum_codec);
-            break;
-          }
-          case 714:
-          case 712: {
-            unpackedInt32_.AddEntriesFrom(ref input, _repeated_unpackedInt32_codec);
-            break;
-          }
-          case 722:
-          case 720: {
-            unpackedInt64_.AddEntriesFrom(ref input, _repeated_unpackedInt64_codec);
-            break;
-          }
-          case 730:
-          case 728: {
-            unpackedUint32_.AddEntriesFrom(ref input, _repeated_unpackedUint32_codec);
-            break;
-          }
-          case 738:
-          case 736: {
-            unpackedUint64_.AddEntriesFrom(ref input, _repeated_unpackedUint64_codec);
-            break;
-          }
-          case 746:
-          case 744: {
-            unpackedSint32_.AddEntriesFrom(ref input, _repeated_unpackedSint32_codec);
-            break;
-          }
-          case 754:
-          case 752: {
-            unpackedSint64_.AddEntriesFrom(ref input, _repeated_unpackedSint64_codec);
-            break;
-          }
-          case 762:
-          case 765: {
-            unpackedFixed32_.AddEntriesFrom(ref input, _repeated_unpackedFixed32_codec);
-            break;
-          }
-          case 770:
-          case 769: {
-            unpackedFixed64_.AddEntriesFrom(ref input, _repeated_unpackedFixed64_codec);
-            break;
-          }
-          case 778:
-          case 781: {
-            unpackedSfixed32_.AddEntriesFrom(ref input, _repeated_unpackedSfixed32_codec);
-            break;
-          }
-          case 786:
-          case 785: {
-            unpackedSfixed64_.AddEntriesFrom(ref input, _repeated_unpackedSfixed64_codec);
-            break;
-          }
-          case 794:
-          case 797: {
-            unpackedFloat_.AddEntriesFrom(ref input, _repeated_unpackedFloat_codec);
-            break;
-          }
-          case 802:
-          case 801: {
-            unpackedDouble_.AddEntriesFrom(ref input, _repeated_unpackedDouble_codec);
-            break;
-          }
-          case 810:
-          case 808: {
-            unpackedBool_.AddEntriesFrom(ref input, _repeated_unpackedBool_codec);
-            break;
-          }
-          case 818:
-          case 816: {
-            unpackedNestedEnum_.AddEntriesFrom(ref input, _repeated_unpackedNestedEnum_codec);
-            break;
-          }
-          case 888: {
-            OneofUint32 = input.ReadUInt32();
-            break;
-          }
-          case 898: {
-            global::ProtobufTestMessages.Proto3.TestAllTypesProto3.Types.NestedMessage subBuilder = new global::ProtobufTestMessages.Proto3.TestAllTypesProto3.Types.NestedMessage();
-            if (oneofFieldCase_ == OneofFieldOneofCase.OneofNestedMessage) {
-              subBuilder.MergeFrom(OneofNestedMessage);
-            }
-            input.ReadMessage(subBuilder);
-            OneofNestedMessage = subBuilder;
-            break;
-          }
-          case 906: {
-            OneofString = input.ReadString();
-            break;
-          }
-          case 914: {
-            OneofBytes = input.ReadBytes();
-            break;
-          }
-          case 920: {
-            OneofBool = input.ReadBool();
-            break;
-          }
-          case 928: {
-            OneofUint64 = input.ReadUInt64();
-            break;
-          }
-          case 941: {
-            OneofFloat = input.ReadFloat();
-            break;
-          }
-          case 945: {
-            OneofDouble = input.ReadDouble();
-            break;
-          }
-          case 952: {
-            oneofField_ = input.ReadEnum();
-            oneofFieldCase_ = OneofFieldOneofCase.OneofEnum;
-            break;
-          }
-          case 960: {
-            oneofField_ = input.ReadEnum();
-            oneofFieldCase_ = OneofFieldOneofCase.OneofNullValue;
-            break;
-          }
-          case 1610: {
-            bool? value = _single_optionalBoolWrapper_codec.Read(ref input);
-            if (optionalBoolWrapper_ == null || value != false) {
-              OptionalBoolWrapper = value;
-            }
-            break;
-          }
-          case 1618: {
-            int? value = _single_optionalInt32Wrapper_codec.Read(ref input);
-            if (optionalInt32Wrapper_ == null || value != 0) {
-              OptionalInt32Wrapper = value;
-            }
-            break;
-          }
-          case 1626: {
-            long? value = _single_optionalInt64Wrapper_codec.Read(ref input);
-            if (optionalInt64Wrapper_ == null || value != 0L) {
-              OptionalInt64Wrapper = value;
-            }
-            break;
-          }
-          case 1634: {
-            uint? value = _single_optionalUint32Wrapper_codec.Read(ref input);
-            if (optionalUint32Wrapper_ == null || value != 0) {
-              OptionalUint32Wrapper = value;
-            }
-            break;
-          }
-          case 1642: {
-            ulong? value = _single_optionalUint64Wrapper_codec.Read(ref input);
-            if (optionalUint64Wrapper_ == null || value != 0UL) {
-              OptionalUint64Wrapper = value;
-            }
-            break;
-          }
-          case 1650: {
-            float? value = _single_optionalFloatWrapper_codec.Read(ref input);
-            if (optionalFloatWrapper_ == null || value != 0F) {
-              OptionalFloatWrapper = value;
-            }
-            break;
-          }
-          case 1658: {
-            double? value = _single_optionalDoubleWrapper_codec.Read(ref input);
-            if (optionalDoubleWrapper_ == null || value != 0D) {
-              OptionalDoubleWrapper = value;
-            }
-            break;
-          }
-          case 1666: {
-            string value = _single_optionalStringWrapper_codec.Read(ref input);
-            if (optionalStringWrapper_ == null || value != "") {
-              OptionalStringWrapper = value;
-            }
-            break;
-          }
-          case 1674: {
-            pb::ByteString value = _single_optionalBytesWrapper_codec.Read(ref input);
-            if (optionalBytesWrapper_ == null || value != pb::ByteString.Empty) {
-              OptionalBytesWrapper = value;
-            }
-            break;
-          }
-          case 1690: {
-            repeatedBoolWrapper_.AddEntriesFrom(ref input, _repeated_repeatedBoolWrapper_codec);
-            break;
-          }
-          case 1698: {
-            repeatedInt32Wrapper_.AddEntriesFrom(ref input, _repeated_repeatedInt32Wrapper_codec);
-            break;
-          }
-          case 1706: {
-            repeatedInt64Wrapper_.AddEntriesFrom(ref input, _repeated_repeatedInt64Wrapper_codec);
-            break;
-          }
-          case 1714: {
-            repeatedUint32Wrapper_.AddEntriesFrom(ref input, _repeated_repeatedUint32Wrapper_codec);
-            break;
-          }
-          case 1722: {
-            repeatedUint64Wrapper_.AddEntriesFrom(ref input, _repeated_repeatedUint64Wrapper_codec);
-            break;
-          }
-          case 1730: {
-            repeatedFloatWrapper_.AddEntriesFrom(ref input, _repeated_repeatedFloatWrapper_codec);
-            break;
-          }
-          case 1738: {
-            repeatedDoubleWrapper_.AddEntriesFrom(ref input, _repeated_repeatedDoubleWrapper_codec);
-            break;
-          }
-          case 1746: {
-            repeatedStringWrapper_.AddEntriesFrom(ref input, _repeated_repeatedStringWrapper_codec);
-            break;
-          }
-          case 1754: {
-            repeatedBytesWrapper_.AddEntriesFrom(ref input, _repeated_repeatedBytesWrapper_codec);
-            break;
-          }
-          case 2410: {
-            if (optionalDuration_ == null) {
-              OptionalDuration = new global::Google.Protobuf.WellKnownTypes.Duration();
-            }
-            input.ReadMessage(OptionalDuration);
-            break;
-          }
-          case 2418: {
-            if (optionalTimestamp_ == null) {
-              OptionalTimestamp = new global::Google.Protobuf.WellKnownTypes.Timestamp();
-            }
-            input.ReadMessage(OptionalTimestamp);
-            break;
-          }
-          case 2426: {
-            if (optionalFieldMask_ == null) {
-              OptionalFieldMask = new global::Google.Protobuf.WellKnownTypes.FieldMask();
-            }
-            input.ReadMessage(OptionalFieldMask);
-            break;
-          }
-          case 2434: {
-            if (optionalStruct_ == null) {
-              OptionalStruct = new global::Google.Protobuf.WellKnownTypes.Struct();
-            }
-            input.ReadMessage(OptionalStruct);
-            break;
-          }
-          case 2442: {
-            if (optionalAny_ == null) {
-              OptionalAny = new global::Google.Protobuf.WellKnownTypes.Any();
-            }
-            input.ReadMessage(OptionalAny);
-            break;
-          }
-          case 2450: {
-            if (optionalValue_ == null) {
-              OptionalValue = new global::Google.Protobuf.WellKnownTypes.Value();
-            }
-            input.ReadMessage(OptionalValue);
-            break;
-          }
-          case 2456: {
-            OptionalNullValue = (global::Google.Protobuf.WellKnownTypes.NullValue) input.ReadEnum();
-            break;
-          }
-          case 2490: {
-            repeatedDuration_.AddEntriesFrom(ref input, _repeated_repeatedDuration_codec);
-            break;
-          }
-          case 2498: {
-            repeatedTimestamp_.AddEntriesFrom(ref input, _repeated_repeatedTimestamp_codec);
-            break;
-          }
-          case 2506: {
-            repeatedFieldmask_.AddEntriesFrom(ref input, _repeated_repeatedFieldmask_codec);
-            break;
-          }
-          case 2522: {
-            repeatedAny_.AddEntriesFrom(ref input, _repeated_repeatedAny_codec);
-            break;
-          }
-          case 2530: {
-            repeatedValue_.AddEntriesFrom(ref input, _repeated_repeatedValue_codec);
-            break;
-          }
-          case 2538: {
-            repeatedListValue_.AddEntriesFrom(ref input, _repeated_repeatedListValue_codec);
-            break;
-          }
-          case 2594: {
-            repeatedStruct_.AddEntriesFrom(ref input, _repeated_repeatedStruct_codec);
-            break;
-          }
-          case 3208: {
-            Fieldname1 = input.ReadInt32();
-            break;
-          }
-          case 3216: {
-            FieldName2 = input.ReadInt32();
-            break;
-          }
-          case 3224: {
-            FieldName3 = input.ReadInt32();
-            break;
-          }
-          case 3232: {
-            FieldName4 = input.ReadInt32();
-            break;
-          }
-          case 3240: {
-            Field0Name5 = input.ReadInt32();
-            break;
-          }
-          case 3248: {
-            Field0Name6 = input.ReadInt32();
-            break;
-          }
-          case 3256: {
-            FieldName7 = input.ReadInt32();
-            break;
-          }
-          case 3264: {
-            FieldName8 = input.ReadInt32();
-            break;
-          }
-          case 3272: {
-            FieldName9 = input.ReadInt32();
-            break;
-          }
-          case 3280: {
-            FieldName10 = input.ReadInt32();
-            break;
-          }
-          case 3288: {
-            FIELDNAME11 = input.ReadInt32();
-            break;
-          }
-          case 3296: {
-            FIELDName12 = input.ReadInt32();
-            break;
-          }
-          case 3304: {
-            FieldName13 = input.ReadInt32();
-            break;
-          }
-          case 3312: {
-            FieldName14 = input.ReadInt32();
-            break;
-          }
-          case 3320: {
-            FieldName15 = input.ReadInt32();
-            break;
-          }
-          case 3328: {
-            FieldName16 = input.ReadInt32();
-            break;
-          }
-          case 3336: {
-            FieldName17 = input.ReadInt32();
-            break;
-          }
-          case 3344: {
-            FieldName18 = input.ReadInt32();
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-    #region Nested types
-    /// <summary>Container for nested types declared in the TestAllTypesProto3 message type.</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static partial class Types {
-      public enum NestedEnum {
-        [pbr::OriginalName("FOO")] Foo = 0,
-        [pbr::OriginalName("BAR")] Bar = 1,
-        [pbr::OriginalName("BAZ")] Baz = 2,
-        /// <summary>
-        /// Intentionally negative.
-        /// </summary>
-        [pbr::OriginalName("NEG")] Neg = -1,
-      }
-
-      public enum AliasedEnum {
-        [pbr::OriginalName("ALIAS_FOO")] AliasFoo = 0,
-        [pbr::OriginalName("ALIAS_BAR")] AliasBar = 1,
-        [pbr::OriginalName("ALIAS_BAZ")] AliasBaz = 2,
-        [pbr::OriginalName("MOO", PreferredAlias = false)] Moo = 2,
-        [pbr::OriginalName("moo", PreferredAlias = false)] Moo_ = 2,
-        [pbr::OriginalName("bAz", PreferredAlias = false)] BAz = 2,
-      }
-
-      public sealed partial class NestedMessage : pb::IMessage<NestedMessage>
-      #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          , pb::IBufferMessage
-      #endif
-      {
-        private static readonly pb::MessageParser<NestedMessage> _parser = new pb::MessageParser<NestedMessage>(() => new NestedMessage());
-        private pb::UnknownFieldSet _unknownFields;
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static pb::MessageParser<NestedMessage> Parser { get { return _parser; } }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static pbr::MessageDescriptor Descriptor {
-          get { return global::ProtobufTestMessages.Proto3.TestAllTypesProto3.Descriptor.NestedTypes[0]; }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        pbr::MessageDescriptor pb::IMessage.Descriptor {
-          get { return Descriptor; }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public NestedMessage() {
-          OnConstruction();
-        }
-
-        partial void OnConstruction();
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public NestedMessage(NestedMessage other) : this() {
-          a_ = other.a_;
-          corecursive_ = other.corecursive_ != null ? other.corecursive_.Clone() : null;
-          _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public NestedMessage Clone() {
-          return new NestedMessage(this);
-        }
-
-        /// <summary>Field number for the "a" field.</summary>
-        public const int AFieldNumber = 1;
-        private int a_;
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public int A {
-          get { return a_; }
-          set {
-            a_ = value;
-          }
-        }
-
-        /// <summary>Field number for the "corecursive" field.</summary>
-        public const int CorecursiveFieldNumber = 2;
-        private global::ProtobufTestMessages.Proto3.TestAllTypesProto3 corecursive_;
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public global::ProtobufTestMessages.Proto3.TestAllTypesProto3 Corecursive {
-          get { return corecursive_; }
-          set {
-            corecursive_ = value;
-          }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override bool Equals(object other) {
-          return Equals(other as NestedMessage);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool Equals(NestedMessage other) {
-          if (ReferenceEquals(other, null)) {
-            return false;
-          }
-          if (ReferenceEquals(other, this)) {
-            return true;
-          }
-          if (A != other.A) return false;
-          if (!object.Equals(Corecursive, other.Corecursive)) return false;
-          return Equals(_unknownFields, other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override int GetHashCode() {
-          int hash = 1;
-          if (A != 0) hash ^= A.GetHashCode();
-          if (corecursive_ != null) hash ^= Corecursive.GetHashCode();
-          if (_unknownFields != null) {
-            hash ^= _unknownFields.GetHashCode();
-          }
-          return hash;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override string ToString() {
-          return pb::JsonFormatter.ToDiagnosticString(this);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void WriteTo(pb::CodedOutputStream output) {
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          output.WriteRawMessage(this);
-        #else
-          if (A != 0) {
-            output.WriteRawTag(8);
-            output.WriteInt32(A);
-          }
-          if (corecursive_ != null) {
-            output.WriteRawTag(18);
-            output.WriteMessage(Corecursive);
-          }
-          if (_unknownFields != null) {
-            _unknownFields.WriteTo(output);
-          }
-        #endif
-        }
-
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-          if (A != 0) {
-            output.WriteRawTag(8);
-            output.WriteInt32(A);
-          }
-          if (corecursive_ != null) {
-            output.WriteRawTag(18);
-            output.WriteMessage(Corecursive);
-          }
-          if (_unknownFields != null) {
-            _unknownFields.WriteTo(ref output);
-          }
-        }
-        #endif
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public int CalculateSize() {
-          int size = 0;
-          if (A != 0) {
-            size += 1 + pb::CodedOutputStream.ComputeInt32Size(A);
-          }
-          if (corecursive_ != null) {
-            size += 1 + pb::CodedOutputStream.ComputeMessageSize(Corecursive);
-          }
-          if (_unknownFields != null) {
-            size += _unknownFields.CalculateSize();
-          }
-          return size;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(NestedMessage other) {
-          if (other == null) {
-            return;
-          }
-          if (other.A != 0) {
-            A = other.A;
-          }
-          if (other.corecursive_ != null) {
-            if (corecursive_ == null) {
-              Corecursive = new global::ProtobufTestMessages.Proto3.TestAllTypesProto3();
-            }
-            Corecursive.MergeFrom(other.Corecursive);
-          }
-          _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(pb::CodedInputStream input) {
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          input.ReadRawMessage(this);
-        #else
-          uint tag;
-          while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
-              default:
-                _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-                break;
-              case 8: {
-                A = input.ReadInt32();
-                break;
-              }
-              case 18: {
-                if (corecursive_ == null) {
-                  Corecursive = new global::ProtobufTestMessages.Proto3.TestAllTypesProto3();
-                }
-                input.ReadMessage(Corecursive);
-                break;
-              }
-            }
-          }
-        #endif
-        }
-
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-          uint tag;
-          while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
-              default:
-                _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-                break;
-              case 8: {
-                A = input.ReadInt32();
-                break;
-              }
-              case 18: {
-                if (corecursive_ == null) {
-                  Corecursive = new global::ProtobufTestMessages.Proto3.TestAllTypesProto3();
-                }
-                input.ReadMessage(Corecursive);
-                break;
-              }
-            }
-          }
-        }
-        #endif
-
-      }
-
-    }
-    #endregion
-
-  }
-
-  public sealed partial class ForeignMessage : pb::IMessage<ForeignMessage>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<ForeignMessage> _parser = new pb::MessageParser<ForeignMessage>(() => new ForeignMessage());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<ForeignMessage> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::ProtobufTestMessages.Proto3.TestMessagesProto3Reflection.Descriptor.MessageTypes[1]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ForeignMessage() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ForeignMessage(ForeignMessage other) : this() {
-      c_ = other.c_;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ForeignMessage Clone() {
-      return new ForeignMessage(this);
-    }
-
-    /// <summary>Field number for the "c" field.</summary>
-    public const int CFieldNumber = 1;
-    private int c_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int C {
-      get { return c_; }
-      set {
-        c_ = value;
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as ForeignMessage);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(ForeignMessage other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (C != other.C) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (C != 0) hash ^= C.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (C != 0) {
-        output.WriteRawTag(8);
-        output.WriteInt32(C);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (C != 0) {
-        output.WriteRawTag(8);
-        output.WriteInt32(C);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (C != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(C);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(ForeignMessage other) {
-      if (other == null) {
-        return;
-      }
-      if (other.C != 0) {
-        C = other.C;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 8: {
-            C = input.ReadInt32();
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 8: {
-            C = input.ReadInt32();
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  public sealed partial class NullHypothesisProto3 : pb::IMessage<NullHypothesisProto3>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<NullHypothesisProto3> _parser = new pb::MessageParser<NullHypothesisProto3>(() => new NullHypothesisProto3());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<NullHypothesisProto3> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::ProtobufTestMessages.Proto3.TestMessagesProto3Reflection.Descriptor.MessageTypes[2]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public NullHypothesisProto3() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public NullHypothesisProto3(NullHypothesisProto3 other) : this() {
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public NullHypothesisProto3 Clone() {
-      return new NullHypothesisProto3(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as NullHypothesisProto3);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(NullHypothesisProto3 other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(NullHypothesisProto3 other) {
-      if (other == null) {
-        return;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-        }
-      }
-    }
-    #endif
-
-  }
-
-  public sealed partial class EnumOnlyProto3 : pb::IMessage<EnumOnlyProto3>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<EnumOnlyProto3> _parser = new pb::MessageParser<EnumOnlyProto3>(() => new EnumOnlyProto3());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<EnumOnlyProto3> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::ProtobufTestMessages.Proto3.TestMessagesProto3Reflection.Descriptor.MessageTypes[3]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public EnumOnlyProto3() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public EnumOnlyProto3(EnumOnlyProto3 other) : this() {
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public EnumOnlyProto3 Clone() {
-      return new EnumOnlyProto3(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as EnumOnlyProto3);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(EnumOnlyProto3 other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(EnumOnlyProto3 other) {
-      if (other == null) {
-        return;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-        }
-      }
-    }
-    #endif
-
-    #region Nested types
-    /// <summary>Container for nested types declared in the EnumOnlyProto3 message type.</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static partial class Types {
-      public enum Bool {
-        [pbr::OriginalName("kFalse")] KFalse = 0,
-        [pbr::OriginalName("kTrue")] KTrue = 1,
-      }
-
-    }
-    #endregion
-
-  }
-
-  #endregion
-
-}
-
-#endregion Designer generated code
diff --git a/libs/protobuf/csharp/src/Google.Protobuf.Test.TestProtos/Unittest.cs b/libs/protobuf/csharp/src/Google.Protobuf.Test.TestProtos/Unittest.cs
deleted file mode 100644
index c1f43ce..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf.Test.TestProtos/Unittest.cs
+++ /dev/null
@@ -1,31821 +0,0 @@
-// <auto-generated>
-//     Generated by the protocol buffer compiler.  DO NOT EDIT!
-//     source: unittest.proto
-// </auto-generated>
-#pragma warning disable 1591, 0612, 3021, 8981
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-namespace Google.Protobuf.TestProtos.Proto2 {
-
-  /// <summary>Holder for reflection information generated from unittest.proto</summary>
-  public static partial class UnittestReflection {
-
-    #region Descriptor
-    /// <summary>File descriptor for unittest.proto</summary>
-    public static pbr::FileDescriptor Descriptor {
-      get { return descriptor; }
-    }
-    private static pbr::FileDescriptor descriptor;
-
-    static UnittestReflection() {
-      byte[] descriptorData = global::System.Convert.FromBase64String(
-          string.Concat(
-            "Cg51bml0dGVzdC5wcm90bxIYcHJvdG9idWZfdW5pdHRlc3RfcHJvdG8yGhV1",
-            "bml0dGVzdF9pbXBvcnQucHJvdG8igBoKDFRlc3RBbGxUeXBlcxIWCg5vcHRp",
-            "b25hbF9pbnQzMhgBIAEoBRIWCg5vcHRpb25hbF9pbnQ2NBgCIAEoAxIXCg9v",
-            "cHRpb25hbF91aW50MzIYAyABKA0SFwoPb3B0aW9uYWxfdWludDY0GAQgASgE",
-            "EhcKD29wdGlvbmFsX3NpbnQzMhgFIAEoERIXCg9vcHRpb25hbF9zaW50NjQY",
-            "BiABKBISGAoQb3B0aW9uYWxfZml4ZWQzMhgHIAEoBxIYChBvcHRpb25hbF9m",
-            "aXhlZDY0GAggASgGEhkKEW9wdGlvbmFsX3NmaXhlZDMyGAkgASgPEhkKEW9w",
-            "dGlvbmFsX3NmaXhlZDY0GAogASgQEhYKDm9wdGlvbmFsX2Zsb2F0GAsgASgC",
-            "EhcKD29wdGlvbmFsX2RvdWJsZRgMIAEoARIVCg1vcHRpb25hbF9ib29sGA0g",
-            "ASgIEhcKD29wdGlvbmFsX3N0cmluZxgOIAEoCRIWCg5vcHRpb25hbF9ieXRl",
-            "cxgPIAEoDBJLCg1vcHRpb25hbGdyb3VwGBAgASgKMjQucHJvdG9idWZfdW5p",
-            "dHRlc3RfcHJvdG8yLlRlc3RBbGxUeXBlcy5PcHRpb25hbEdyb3VwElUKF29w",
-            "dGlvbmFsX25lc3RlZF9tZXNzYWdlGBIgASgLMjQucHJvdG9idWZfdW5pdHRl",
-            "c3RfcHJvdG8yLlRlc3RBbGxUeXBlcy5OZXN0ZWRNZXNzYWdlEkoKGG9wdGlv",
-            "bmFsX2ZvcmVpZ25fbWVzc2FnZRgTIAEoCzIoLnByb3RvYnVmX3VuaXR0ZXN0",
-            "X3Byb3RvMi5Gb3JlaWduTWVzc2FnZRJPChdvcHRpb25hbF9pbXBvcnRfbWVz",
-            "c2FnZRgUIAEoCzIuLnByb3RvYnVmX3VuaXR0ZXN0X2ltcG9ydF9wcm90bzIu",
-            "SW1wb3J0TWVzc2FnZRJPChRvcHRpb25hbF9uZXN0ZWRfZW51bRgVIAEoDjIx",
-            "LnByb3RvYnVmX3VuaXR0ZXN0X3Byb3RvMi5UZXN0QWxsVHlwZXMuTmVzdGVk",
-            "RW51bRJEChVvcHRpb25hbF9mb3JlaWduX2VudW0YFiABKA4yJS5wcm90b2J1",
-            "Zl91bml0dGVzdF9wcm90bzIuRm9yZWlnbkVudW0SSQoUb3B0aW9uYWxfaW1w",
-            "b3J0X2VudW0YFyABKA4yKy5wcm90b2J1Zl91bml0dGVzdF9pbXBvcnRfcHJv",
-            "dG8yLkltcG9ydEVudW0SIQoVb3B0aW9uYWxfc3RyaW5nX3BpZWNlGBggASgJ",
-            "QgIIAhIZCg1vcHRpb25hbF9jb3JkGBkgASgJQgIIARJcCh5vcHRpb25hbF9w",
-            "dWJsaWNfaW1wb3J0X21lc3NhZ2UYGiABKAsyNC5wcm90b2J1Zl91bml0dGVz",
-            "dF9pbXBvcnRfcHJvdG8yLlB1YmxpY0ltcG9ydE1lc3NhZ2USVwoVb3B0aW9u",
-            "YWxfbGF6eV9tZXNzYWdlGBsgASgLMjQucHJvdG9idWZfdW5pdHRlc3RfcHJv",
-            "dG8yLlRlc3RBbGxUeXBlcy5OZXN0ZWRNZXNzYWdlQgIoARIWCg5yZXBlYXRl",
-            "ZF9pbnQzMhgfIAMoBRIWCg5yZXBlYXRlZF9pbnQ2NBggIAMoAxIXCg9yZXBl",
-            "YXRlZF91aW50MzIYISADKA0SFwoPcmVwZWF0ZWRfdWludDY0GCIgAygEEhcK",
-            "D3JlcGVhdGVkX3NpbnQzMhgjIAMoERIXCg9yZXBlYXRlZF9zaW50NjQYJCAD",
-            "KBISGAoQcmVwZWF0ZWRfZml4ZWQzMhglIAMoBxIYChByZXBlYXRlZF9maXhl",
-            "ZDY0GCYgAygGEhkKEXJlcGVhdGVkX3NmaXhlZDMyGCcgAygPEhkKEXJlcGVh",
-            "dGVkX3NmaXhlZDY0GCggAygQEhYKDnJlcGVhdGVkX2Zsb2F0GCkgAygCEhcK",
-            "D3JlcGVhdGVkX2RvdWJsZRgqIAMoARIVCg1yZXBlYXRlZF9ib29sGCsgAygI",
-            "EhcKD3JlcGVhdGVkX3N0cmluZxgsIAMoCRIWCg5yZXBlYXRlZF9ieXRlcxgt",
-            "IAMoDBJLCg1yZXBlYXRlZGdyb3VwGC4gAygKMjQucHJvdG9idWZfdW5pdHRl",
-            "c3RfcHJvdG8yLlRlc3RBbGxUeXBlcy5SZXBlYXRlZEdyb3VwElUKF3JlcGVh",
-            "dGVkX25lc3RlZF9tZXNzYWdlGDAgAygLMjQucHJvdG9idWZfdW5pdHRlc3Rf",
-            "cHJvdG8yLlRlc3RBbGxUeXBlcy5OZXN0ZWRNZXNzYWdlEkoKGHJlcGVhdGVk",
-            "X2ZvcmVpZ25fbWVzc2FnZRgxIAMoCzIoLnByb3RvYnVmX3VuaXR0ZXN0X3By",
-            "b3RvMi5Gb3JlaWduTWVzc2FnZRJPChdyZXBlYXRlZF9pbXBvcnRfbWVzc2Fn",
-            "ZRgyIAMoCzIuLnByb3RvYnVmX3VuaXR0ZXN0X2ltcG9ydF9wcm90bzIuSW1w",
-            "b3J0TWVzc2FnZRJPChRyZXBlYXRlZF9uZXN0ZWRfZW51bRgzIAMoDjIxLnBy",
-            "b3RvYnVmX3VuaXR0ZXN0X3Byb3RvMi5UZXN0QWxsVHlwZXMuTmVzdGVkRW51",
-            "bRJEChVyZXBlYXRlZF9mb3JlaWduX2VudW0YNCADKA4yJS5wcm90b2J1Zl91",
-            "bml0dGVzdF9wcm90bzIuRm9yZWlnbkVudW0SSQoUcmVwZWF0ZWRfaW1wb3J0",
-            "X2VudW0YNSADKA4yKy5wcm90b2J1Zl91bml0dGVzdF9pbXBvcnRfcHJvdG8y",
-            "LkltcG9ydEVudW0SIQoVcmVwZWF0ZWRfc3RyaW5nX3BpZWNlGDYgAygJQgII",
-            "AhIZCg1yZXBlYXRlZF9jb3JkGDcgAygJQgIIARJXChVyZXBlYXRlZF9sYXp5",
-            "X21lc3NhZ2UYOSADKAsyNC5wcm90b2J1Zl91bml0dGVzdF9wcm90bzIuVGVz",
-            "dEFsbFR5cGVzLk5lc3RlZE1lc3NhZ2VCAigBEhkKDWRlZmF1bHRfaW50MzIY",
-            "PSABKAU6AjQxEhkKDWRlZmF1bHRfaW50NjQYPiABKAM6AjQyEhoKDmRlZmF1",
-            "bHRfdWludDMyGD8gASgNOgI0MxIaCg5kZWZhdWx0X3VpbnQ2NBhAIAEoBDoC",
-            "NDQSGwoOZGVmYXVsdF9zaW50MzIYQSABKBE6Ay00NRIaCg5kZWZhdWx0X3Np",
-            "bnQ2NBhCIAEoEjoCNDYSGwoPZGVmYXVsdF9maXhlZDMyGEMgASgHOgI0NxIb",
-            "Cg9kZWZhdWx0X2ZpeGVkNjQYRCABKAY6AjQ4EhwKEGRlZmF1bHRfc2ZpeGVk",
-            "MzIYRSABKA86AjQ5Eh0KEGRlZmF1bHRfc2ZpeGVkNjQYRiABKBA6Ay01MBIb",
-            "Cg1kZWZhdWx0X2Zsb2F0GEcgASgCOgQ1MS41Eh0KDmRlZmF1bHRfZG91Ymxl",
-            "GEggASgBOgU1MjAwMBIaCgxkZWZhdWx0X2Jvb2wYSSABKAg6BHRydWUSHQoO",
-            "ZGVmYXVsdF9zdHJpbmcYSiABKAk6BWhlbGxvEhwKDWRlZmF1bHRfYnl0ZXMY",
-            "SyABKAw6BXdvcmxkElMKE2RlZmF1bHRfbmVzdGVkX2VudW0YUSABKA4yMS5w",
-            "cm90b2J1Zl91bml0dGVzdF9wcm90bzIuVGVzdEFsbFR5cGVzLk5lc3RlZEVu",
-            "dW06A0JBUhJQChRkZWZhdWx0X2ZvcmVpZ25fZW51bRhSIAEoDjIlLnByb3Rv",
-            "YnVmX3VuaXR0ZXN0X3Byb3RvMi5Gb3JlaWduRW51bToLRk9SRUlHTl9CQVIS",
-            "VAoTZGVmYXVsdF9pbXBvcnRfZW51bRhTIAEoDjIrLnByb3RvYnVmX3VuaXR0",
-            "ZXN0X2ltcG9ydF9wcm90bzIuSW1wb3J0RW51bToKSU1QT1JUX0JBUhIlChRk",
-            "ZWZhdWx0X3N0cmluZ19waWVjZRhUIAEoCToDYWJjQgIIAhIdCgxkZWZhdWx0",
-            "X2NvcmQYVSABKAk6AzEyM0ICCAESFgoMb25lb2ZfdWludDMyGG8gASgNSAAS",
-            "VAoUb25lb2ZfbmVzdGVkX21lc3NhZ2UYcCABKAsyNC5wcm90b2J1Zl91bml0",
-            "dGVzdF9wcm90bzIuVGVzdEFsbFR5cGVzLk5lc3RlZE1lc3NhZ2VIABIWCgxv",
-            "bmVvZl9zdHJpbmcYcSABKAlIABIVCgtvbmVvZl9ieXRlcxhyIAEoDEgAGhsK",
-            "DU5lc3RlZE1lc3NhZ2USCgoCYmIYASABKAUaGgoNT3B0aW9uYWxHcm91cBIJ",
-            "CgFhGBEgASgFGhoKDVJlcGVhdGVkR3JvdXASCQoBYRgvIAEoBSI5CgpOZXN0",
-            "ZWRFbnVtEgcKA0ZPTxABEgcKA0JBUhACEgcKA0JBWhADEhAKA05FRxD/////",
-            "//////8BQg0KC29uZW9mX2ZpZWxkItABChJOZXN0ZWRUZXN0QWxsVHlwZXMS",
-            "OwoFY2hpbGQYASABKAsyLC5wcm90b2J1Zl91bml0dGVzdF9wcm90bzIuTmVz",
-            "dGVkVGVzdEFsbFR5cGVzEjcKB3BheWxvYWQYAiABKAsyJi5wcm90b2J1Zl91",
-            "bml0dGVzdF9wcm90bzIuVGVzdEFsbFR5cGVzEkQKDnJlcGVhdGVkX2NoaWxk",
-            "GAMgAygLMiwucHJvdG9idWZfdW5pdHRlc3RfcHJvdG8yLk5lc3RlZFRlc3RB",
-            "bGxUeXBlcyJtChRUZXN0RGVwcmVjYXRlZEZpZWxkcxIcChBkZXByZWNhdGVk",
-            "X2ludDMyGAEgASgFQgIYARInChlkZXByZWNhdGVkX2ludDMyX2luX29uZW9m",
-            "GAIgASgFQgIYAUgAQg4KDG9uZW9mX2ZpZWxkcyIbChVUZXN0RGVwcmVjYXRl",
-            "ZE1lc3NhZ2U6AhgBIiYKDkZvcmVpZ25NZXNzYWdlEgkKAWMYASABKAUSCQoB",
-            "ZBgCIAEoBSIwChJUZXN0UmVzZXJ2ZWRGaWVsZHNKBAgCEANKBAgPEBBKBAgJ",
-            "EAxSA2JhclIDYmF6Ih0KEVRlc3RBbGxFeHRlbnNpb25zKggIARCAgICAAiIk",
-            "ChdPcHRpb25hbEdyb3VwX2V4dGVuc2lvbhIJCgFhGBEgASgFIiQKF1JlcGVh",
-            "dGVkR3JvdXBfZXh0ZW5zaW9uEgkKAWEYLyABKAUitwEKCVRlc3RHcm91cBJI",
-            "Cg1vcHRpb25hbGdyb3VwGBAgASgKMjEucHJvdG9idWZfdW5pdHRlc3RfcHJv",
-            "dG8yLlRlc3RHcm91cC5PcHRpb25hbEdyb3VwEkQKFW9wdGlvbmFsX2ZvcmVp",
-            "Z25fZW51bRgWIAEoDjIlLnByb3RvYnVmX3VuaXR0ZXN0X3Byb3RvMi5Gb3Jl",
-            "aWduRW51bRoaCg1PcHRpb25hbEdyb3VwEgkKAWEYESABKAUiHgoSVGVzdEdy",
-            "b3VwRXh0ZW5zaW9uKggIARCAgICAAiLhAwoTVGVzdE5lc3RlZEV4dGVuc2lv",
-            "bhokChdPcHRpb25hbEdyb3VwX2V4dGVuc2lvbhIJCgFhGBEgASgFMkAKBHRl",
-            "c3QSKy5wcm90b2J1Zl91bml0dGVzdF9wcm90bzIuVGVzdEFsbEV4dGVuc2lv",
-            "bnMY6gcgASgJOgR0ZXN0Mk0KF25lc3RlZF9zdHJpbmdfZXh0ZW5zaW9uEisu",
-            "cHJvdG9idWZfdW5pdHRlc3RfcHJvdG8yLlRlc3RBbGxFeHRlbnNpb25zGOsH",
-            "IAEoCTKUAQoXb3B0aW9uYWxncm91cF9leHRlbnNpb24SLC5wcm90b2J1Zl91",
-            "bml0dGVzdF9wcm90bzIuVGVzdEdyb3VwRXh0ZW5zaW9uGBAgASgKMkUucHJv",
-            "dG9idWZfdW5pdHRlc3RfcHJvdG8yLlRlc3ROZXN0ZWRFeHRlbnNpb24uT3B0",
-            "aW9uYWxHcm91cF9leHRlbnNpb24yfAofb3B0aW9uYWxfZm9yZWlnbl9lbnVt",
-            "X2V4dGVuc2lvbhIsLnByb3RvYnVmX3VuaXR0ZXN0X3Byb3RvMi5UZXN0R3Jv",
-            "dXBFeHRlbnNpb24YFiABKA4yJS5wcm90b2J1Zl91bml0dGVzdF9wcm90bzIu",
-            "Rm9yZWlnbkVudW0i8QUKDFRlc3RSZXF1aXJlZBIJCgFhGAEgAigFEg4KBmR1",
-            "bW15MhgCIAEoBRIJCgFiGAMgAigFEg4KBmR1bW15NBgEIAEoBRIOCgZkdW1t",
-            "eTUYBSABKAUSDgoGZHVtbXk2GAYgASgFEg4KBmR1bW15NxgHIAEoBRIOCgZk",
-            "dW1teTgYCCABKAUSDgoGZHVtbXk5GAkgASgFEg8KB2R1bW15MTAYCiABKAUS",
-            "DwoHZHVtbXkxMRgLIAEoBRIPCgdkdW1teTEyGAwgASgFEg8KB2R1bW15MTMY",
-            "DSABKAUSDwoHZHVtbXkxNBgOIAEoBRIPCgdkdW1teTE1GA8gASgFEg8KB2R1",
-            "bW15MTYYECABKAUSDwoHZHVtbXkxNxgRIAEoBRIPCgdkdW1teTE4GBIgASgF",
-            "Eg8KB2R1bW15MTkYEyABKAUSDwoHZHVtbXkyMBgUIAEoBRIPCgdkdW1teTIx",
-            "GBUgASgFEg8KB2R1bW15MjIYFiABKAUSDwoHZHVtbXkyMxgXIAEoBRIPCgdk",
-            "dW1teTI0GBggASgFEg8KB2R1bW15MjUYGSABKAUSDwoHZHVtbXkyNhgaIAEo",
-            "BRIPCgdkdW1teTI3GBsgASgFEg8KB2R1bW15MjgYHCABKAUSDwoHZHVtbXky",
-            "ORgdIAEoBRIPCgdkdW1teTMwGB4gASgFEg8KB2R1bW15MzEYHyABKAUSDwoH",
-            "ZHVtbXkzMhggIAEoBRIJCgFjGCEgAigFMmQKBnNpbmdsZRIrLnByb3RvYnVm",
-            "X3VuaXR0ZXN0X3Byb3RvMi5UZXN0QWxsRXh0ZW5zaW9ucxjoByABKAsyJi5w",
-            "cm90b2J1Zl91bml0dGVzdF9wcm90bzIuVGVzdFJlcXVpcmVkMmMKBW11bHRp",
-            "EisucHJvdG9idWZfdW5pdHRlc3RfcHJvdG8yLlRlc3RBbGxFeHRlbnNpb25z",
-            "GOkHIAMoCzImLnByb3RvYnVmX3VuaXR0ZXN0X3Byb3RvMi5UZXN0UmVxdWly",
-            "ZWQiqAEKE1Rlc3RSZXF1aXJlZEZvcmVpZ24SQAoQb3B0aW9uYWxfbWVzc2Fn",
-            "ZRgBIAEoCzImLnByb3RvYnVmX3VuaXR0ZXN0X3Byb3RvMi5UZXN0UmVxdWly",
-            "ZWQSQAoQcmVwZWF0ZWRfbWVzc2FnZRgCIAMoCzImLnByb3RvYnVmX3VuaXR0",
-            "ZXN0X3Byb3RvMi5UZXN0UmVxdWlyZWQSDQoFZHVtbXkYAyABKAUi2wEKE1Rl",
-            "c3RSZXF1aXJlZE1lc3NhZ2USQAoQb3B0aW9uYWxfbWVzc2FnZRgBIAEoCzIm",
-            "LnByb3RvYnVmX3VuaXR0ZXN0X3Byb3RvMi5UZXN0UmVxdWlyZWQSQAoQcmVw",
-            "ZWF0ZWRfbWVzc2FnZRgCIAMoCzImLnByb3RvYnVmX3VuaXR0ZXN0X3Byb3Rv",
-            "Mi5UZXN0UmVxdWlyZWQSQAoQcmVxdWlyZWRfbWVzc2FnZRgDIAIoCzImLnBy",
-            "b3RvYnVmX3VuaXR0ZXN0X3Byb3RvMi5UZXN0UmVxdWlyZWQiYQoRVGVzdEZv",
-            "cmVpZ25OZXN0ZWQSTAoOZm9yZWlnbl9uZXN0ZWQYASABKAsyNC5wcm90b2J1",
-            "Zl91bml0dGVzdF9wcm90bzIuVGVzdEFsbFR5cGVzLk5lc3RlZE1lc3NhZ2Ui",
-            "EgoQVGVzdEVtcHR5TWVzc2FnZSIqCh5UZXN0RW1wdHlNZXNzYWdlV2l0aEV4",
-            "dGVuc2lvbnMqCAgBEICAgIACIjcKG1Rlc3RNdWx0aXBsZUV4dGVuc2lvblJh",
-            "bmdlcyoECCoQKyoGCK8gEJQhKgoIgIAEEICAgIACIjQKGFRlc3RSZWFsbHlM",
-            "YXJnZVRhZ051bWJlchIJCgFhGAEgASgFEg0KAmJiGP///38gASgFIlwKFFRl",
-            "c3RSZWN1cnNpdmVNZXNzYWdlEjkKAWEYASABKAsyLi5wcm90b2J1Zl91bml0",
-            "dGVzdF9wcm90bzIuVGVzdFJlY3Vyc2l2ZU1lc3NhZ2USCQoBaRgCIAEoBSKE",
-            "AwoUVGVzdE11dHVhbFJlY3Vyc2lvbkESOgoCYmIYASABKAsyLi5wcm90b2J1",
-            "Zl91bml0dGVzdF9wcm90bzIuVGVzdE11dHVhbFJlY3Vyc2lvbkISSQoIc3Vi",
-            "Z3JvdXAYAiABKAoyNy5wcm90b2J1Zl91bml0dGVzdF9wcm90bzIuVGVzdE11",
-            "dHVhbFJlY3Vyc2lvbkEuU3ViR3JvdXAaRwoKU3ViTWVzc2FnZRI5CgFiGAEg",
-            "ASgLMi4ucHJvdG9idWZfdW5pdHRlc3RfcHJvdG8yLlRlc3RNdXR1YWxSZWN1",
-            "cnNpb25CGpsBCghTdWJHcm91cBJOCgtzdWJfbWVzc2FnZRgDIAEoCzI5LnBy",
-            "b3RvYnVmX3VuaXR0ZXN0X3Byb3RvMi5UZXN0TXV0dWFsUmVjdXJzaW9uQS5T",
-            "dWJNZXNzYWdlEj8KD25vdF9pbl90aGlzX3NjYxgEIAEoCzImLnByb3RvYnVm",
-            "X3VuaXR0ZXN0X3Byb3RvMi5UZXN0QWxsVHlwZXMiaQoUVGVzdE11dHVhbFJl",
-            "Y3Vyc2lvbkISOQoBYRgBIAEoCzIuLnByb3RvYnVmX3VuaXR0ZXN0X3Byb3Rv",
-            "Mi5UZXN0TXV0dWFsUmVjdXJzaW9uQRIWCg5vcHRpb25hbF9pbnQzMhgCIAEo",
-            "BSLYAQoRVGVzdElzSW5pdGlhbGl6ZWQSSwoLc3ViX21lc3NhZ2UYASABKAsy",
-            "Ni5wcm90b2J1Zl91bml0dGVzdF9wcm90bzIuVGVzdElzSW5pdGlhbGl6ZWQu",
-            "U3ViTWVzc2FnZRp2CgpTdWJNZXNzYWdlElEKCHN1Ymdyb3VwGAEgASgKMj8u",
-            "cHJvdG9idWZfdW5pdHRlc3RfcHJvdG8yLlRlc3RJc0luaXRpYWxpemVkLlN1",
-            "Yk1lc3NhZ2UuU3ViR3JvdXAaFQoIU3ViR3JvdXASCQoBaRgCIAIoBSLBAQoS",
-            "VGVzdER1cEZpZWxkTnVtYmVyEgkKAWEYASABKAUSPQoDZm9vGAIgASgKMjAu",
-            "cHJvdG9idWZfdW5pdHRlc3RfcHJvdG8yLlRlc3REdXBGaWVsZE51bWJlci5G",
-            "b28SPQoDYmFyGAMgASgKMjAucHJvdG9idWZfdW5pdHRlc3RfcHJvdG8yLlRl",
-            "c3REdXBGaWVsZE51bWJlci5CYXIaEAoDRm9vEgkKAWEYASABKAUaEAoDQmFy",
-            "EgkKAWEYASABKAUiUwoQVGVzdEVhZ2VyTWVzc2FnZRI/CgtzdWJfbWVzc2Fn",
-            "ZRgBIAEoCzImLnByb3RvYnVmX3VuaXR0ZXN0X3Byb3RvMi5UZXN0QWxsVHlw",
-            "ZXNCAigAIlIKD1Rlc3RMYXp5TWVzc2FnZRI/CgtzdWJfbWVzc2FnZRgBIAEo",
-            "CzImLnByb3RvYnVmX3VuaXR0ZXN0X3Byb3RvMi5UZXN0QWxsVHlwZXNCAigB",
-            "Io4CChhUZXN0TmVzdGVkTWVzc2FnZUhhc0JpdHMSYQoXb3B0aW9uYWxfbmVz",
-            "dGVkX21lc3NhZ2UYASABKAsyQC5wcm90b2J1Zl91bml0dGVzdF9wcm90bzIu",
-            "VGVzdE5lc3RlZE1lc3NhZ2VIYXNCaXRzLk5lc3RlZE1lc3NhZ2UajgEKDU5l",
-            "c3RlZE1lc3NhZ2USJAocbmVzdGVkbWVzc2FnZV9yZXBlYXRlZF9pbnQzMhgB",
-            "IAMoBRJXCiVuZXN0ZWRtZXNzYWdlX3JlcGVhdGVkX2ZvcmVpZ25tZXNzYWdl",
-            "GAIgAygLMigucHJvdG9idWZfdW5pdHRlc3RfcHJvdG8yLkZvcmVpZ25NZXNz",
-            "YWdlIoEEChdUZXN0Q2FtZWxDYXNlRmllbGROYW1lcxIWCg5QcmltaXRpdmVG",
-            "aWVsZBgBIAEoBRITCgtTdHJpbmdGaWVsZBgCIAEoCRI4CglFbnVtRmllbGQY",
-            "AyABKA4yJS5wcm90b2J1Zl91bml0dGVzdF9wcm90bzIuRm9yZWlnbkVudW0S",
-            "PgoMTWVzc2FnZUZpZWxkGAQgASgLMigucHJvdG9idWZfdW5pdHRlc3RfcHJv",
-            "dG8yLkZvcmVpZ25NZXNzYWdlEhwKEFN0cmluZ1BpZWNlRmllbGQYBSABKAlC",
-            "AggCEhUKCUNvcmRGaWVsZBgGIAEoCUICCAESHgoWUmVwZWF0ZWRQcmltaXRp",
-            "dmVGaWVsZBgHIAMoBRIbChNSZXBlYXRlZFN0cmluZ0ZpZWxkGAggAygJEkAK",
-            "EVJlcGVhdGVkRW51bUZpZWxkGAkgAygOMiUucHJvdG9idWZfdW5pdHRlc3Rf",
-            "cHJvdG8yLkZvcmVpZ25FbnVtEkYKFFJlcGVhdGVkTWVzc2FnZUZpZWxkGAog",
-            "AygLMigucHJvdG9idWZfdW5pdHRlc3RfcHJvdG8yLkZvcmVpZ25NZXNzYWdl",
-            "EiQKGFJlcGVhdGVkU3RyaW5nUGllY2VGaWVsZBgLIAMoCUICCAISHQoRUmVw",
-            "ZWF0ZWRDb3JkRmllbGQYDCADKAlCAggBItwBChJUZXN0RmllbGRPcmRlcmlu",
-            "Z3MSEQoJbXlfc3RyaW5nGAsgASgJEg4KBm15X2ludBgBIAEoAxIQCghteV9m",
-            "bG9hdBhlIAEoAhJcChdvcHRpb25hbF9uZXN0ZWRfbWVzc2FnZRjIASABKAsy",
-            "Oi5wcm90b2J1Zl91bml0dGVzdF9wcm90bzIuVGVzdEZpZWxkT3JkZXJpbmdz",
-            "Lk5lc3RlZE1lc3NhZ2UaJwoNTmVzdGVkTWVzc2FnZRIKCgJvbxgCIAEoAxIK",
-            "CgJiYhgBIAEoBSoECAIQCyoECAwQZSKqAQoXVGVzdEV4dGVuc2lvbk9yZGVy",
-            "aW5nczESEQoJbXlfc3RyaW5nGAEgASgJMnwKE3Rlc3RfZXh0X29yZGVyaW5n",
-            "czESLC5wcm90b2J1Zl91bml0dGVzdF9wcm90bzIuVGVzdEZpZWxkT3JkZXJp",
-            "bmdzGA0gASgLMjEucHJvdG9idWZfdW5pdHRlc3RfcHJvdG8yLlRlc3RFeHRl",
-            "bnNpb25PcmRlcmluZ3MxIvACChdUZXN0RXh0ZW5zaW9uT3JkZXJpbmdzMhIR",
-            "CglteV9zdHJpbmcYASABKAkawwEKF1Rlc3RFeHRlbnNpb25PcmRlcmluZ3Mz",
-            "EhEKCW15X3N0cmluZxgBIAEoCTKUAQoTdGVzdF9leHRfb3JkZXJpbmdzMxIs",
-            "LnByb3RvYnVmX3VuaXR0ZXN0X3Byb3RvMi5UZXN0RmllbGRPcmRlcmluZ3MY",
-            "DiABKAsySS5wcm90b2J1Zl91bml0dGVzdF9wcm90bzIuVGVzdEV4dGVuc2lv",
-            "bk9yZGVyaW5nczIuVGVzdEV4dGVuc2lvbk9yZGVyaW5nczMyfAoTdGVzdF9l",
-            "eHRfb3JkZXJpbmdzMhIsLnByb3RvYnVmX3VuaXR0ZXN0X3Byb3RvMi5UZXN0",
-            "RmllbGRPcmRlcmluZ3MYDCABKAsyMS5wcm90b2J1Zl91bml0dGVzdF9wcm90",
-            "bzIuVGVzdEV4dGVuc2lvbk9yZGVyaW5nczIitgcKGFRlc3RFeHRyZW1lRGVm",
-            "YXVsdFZhbHVlcxI/Cg1lc2NhcGVkX2J5dGVzGAEgASgMOihcMDAwXDAwMVww",
-            "MDdcMDEwXDAxNFxuXHJcdFwwMTNcXFwnXCJcMzc2EiAKDGxhcmdlX3VpbnQz",
-            "MhgCIAEoDToKNDI5NDk2NzI5NRIqCgxsYXJnZV91aW50NjQYAyABKAQ6FDE4",
-            "NDQ2NzQ0MDczNzA5NTUxNjE1EiAKC3NtYWxsX2ludDMyGAQgASgFOgstMjE0",
-            "NzQ4MzY0NxIpCgtzbWFsbF9pbnQ2NBgFIAEoAzoULTkyMjMzNzIwMzY4NTQ3",
-            "NzU4MDcSJwoScmVhbGx5X3NtYWxsX2ludDMyGBUgASgFOgstMjE0NzQ4MzY0",
-            "OBIwChJyZWFsbHlfc21hbGxfaW50NjQYFiABKAM6FC05MjIzMzcyMDM2ODU0",
-            "Nzc1ODA4EhgKC3V0Zjhfc3RyaW5nGAYgASgJOgPhiLQSFQoKemVyb19mbG9h",
-            "dBgHIAEoAjoBMBIUCglvbmVfZmxvYXQYCCABKAI6ATESGAoLc21hbGxfZmxv",
-            "YXQYCSABKAI6AzEuNRIeChJuZWdhdGl2ZV9vbmVfZmxvYXQYCiABKAI6Ai0x",
-            "EhwKDm5lZ2F0aXZlX2Zsb2F0GAsgASgCOgQtMS41EhoKC2xhcmdlX2Zsb2F0",
-            "GAwgASgCOgUyZSswOBIkChRzbWFsbF9uZWdhdGl2ZV9mbG9hdBgNIAEoAjoG",
-            "LThlLTI4EhcKCmluZl9kb3VibGUYDiABKAE6A2luZhIcCg5uZWdfaW5mX2Rv",
-            "dWJsZRgPIAEoAToELWluZhIXCgpuYW5fZG91YmxlGBAgASgBOgNuYW4SFgoJ",
-            "aW5mX2Zsb2F0GBEgASgCOgNpbmYSGwoNbmVnX2luZl9mbG9hdBgSIAEoAjoE",
-            "LWluZhIWCgluYW5fZmxvYXQYEyABKAI6A25hbhIrCgxjcHBfdHJpZ3JhcGgY",
-            "FCABKAk6FT8gPyA/PyA/PyA/Pz8gPz8vID8/LRIgChBzdHJpbmdfd2l0aF96",
-            "ZXJvGBcgASgJOgZoZWwAbG8SIgoPYnl0ZXNfd2l0aF96ZXJvGBggASgMOgl3",
-            "b3JcMDAwbGQSKAoWc3RyaW5nX3BpZWNlX3dpdGhfemVybxgZIAEoCToEYWIA",
-            "Y0ICCAISIAoOY29yZF93aXRoX3plcm8YGiABKAk6BDEyADNCAggBEiYKEnJl",
-            "cGxhY2VtZW50X3N0cmluZxgbIAEoCToKJHt1bmtub3dufSJSChFTcGFyc2VF",
-            "bnVtTWVzc2FnZRI9CgtzcGFyc2VfZW51bRgBIAEoDjIoLnByb3RvYnVmX3Vu",
-            "aXR0ZXN0X3Byb3RvMi5UZXN0U3BhcnNlRW51bSIZCglPbmVTdHJpbmcSDAoE",
-            "ZGF0YRgBIAEoCSIaCgpNb3JlU3RyaW5nEgwKBGRhdGEYASADKAkiGAoIT25l",
-            "Qnl0ZXMSDAoEZGF0YRgBIAEoDCIZCglNb3JlQnl0ZXMSDAoEZGF0YRgBIAMo",
-            "DCIcCgxJbnQzMk1lc3NhZ2USDAoEZGF0YRgBIAEoBSIdCg1VaW50MzJNZXNz",
-            "YWdlEgwKBGRhdGEYASABKA0iHAoMSW50NjRNZXNzYWdlEgwKBGRhdGEYASAB",
-            "KAMiHQoNVWludDY0TWVzc2FnZRIMCgRkYXRhGAEgASgEIhsKC0Jvb2xNZXNz",
-            "YWdlEgwKBGRhdGEYASABKAgi3gEKCVRlc3RPbmVvZhIRCgdmb29faW50GAEg",
-            "ASgFSAASFAoKZm9vX3N0cmluZxgCIAEoCUgAEj0KC2Zvb19tZXNzYWdlGAMg",
-            "ASgLMiYucHJvdG9idWZfdW5pdHRlc3RfcHJvdG8yLlRlc3RBbGxUeXBlc0gA",
-            "EkAKCGZvb2dyb3VwGAQgASgKMiwucHJvdG9idWZfdW5pdHRlc3RfcHJvdG8y",
-            "LlRlc3RPbmVvZi5Gb29Hcm91cEgAGiAKCEZvb0dyb3VwEgkKAWEYBSABKAUS",
-            "CQoBYhgGIAEoCUIFCgNmb28i9QEKHFRlc3RPbmVvZkJhY2t3YXJkc0NvbXBh",
-            "dGlibGUSDwoHZm9vX2ludBgBIAEoBRISCgpmb29fc3RyaW5nGAIgASgJEjsK",
-            "C2Zvb19tZXNzYWdlGAMgASgLMiYucHJvdG9idWZfdW5pdHRlc3RfcHJvdG8y",
-            "LlRlc3RBbGxUeXBlcxJRCghmb29ncm91cBgEIAEoCjI/LnByb3RvYnVmX3Vu",
-            "aXR0ZXN0X3Byb3RvMi5UZXN0T25lb2ZCYWNrd2FyZHNDb21wYXRpYmxlLkZv",
-            "b0dyb3VwGiAKCEZvb0dyb3VwEgkKAWEYBSABKAUSCQoBYhgGIAEoCSLBBgoK",
-            "VGVzdE9uZW9mMhIRCgdmb29faW50GAEgASgFSAASFAoKZm9vX3N0cmluZxgC",
-            "IAEoCUgAEhYKCGZvb19jb3JkGAMgASgJQgIIAUgAEh4KEGZvb19zdHJpbmdf",
-            "cGllY2UYBCABKAlCAggCSAASEwoJZm9vX2J5dGVzGAUgASgMSAASQwoIZm9v",
-            "X2VudW0YBiABKA4yLy5wcm90b2J1Zl91bml0dGVzdF9wcm90bzIuVGVzdE9u",
-            "ZW9mMi5OZXN0ZWRFbnVtSAASSQoLZm9vX21lc3NhZ2UYByABKAsyMi5wcm90",
-            "b2J1Zl91bml0dGVzdF9wcm90bzIuVGVzdE9uZW9mMi5OZXN0ZWRNZXNzYWdl",
-            "SAASQQoIZm9vZ3JvdXAYCCABKAoyLS5wcm90b2J1Zl91bml0dGVzdF9wcm90",
-            "bzIuVGVzdE9uZW9mMi5Gb29Hcm91cEgAElIKEGZvb19sYXp5X21lc3NhZ2UY",
-            "CyABKAsyMi5wcm90b2J1Zl91bml0dGVzdF9wcm90bzIuVGVzdE9uZW9mMi5O",
-            "ZXN0ZWRNZXNzYWdlQgIoAUgAEhQKB2Jhcl9pbnQYDCABKAU6ATVIARIcCgpi",
-            "YXJfc3RyaW5nGA0gASgJOgZTVFJJTkdIARIcCghiYXJfY29yZBgOIAEoCToE",
-            "Q09SREICCAFIARImChBiYXJfc3RyaW5nX3BpZWNlGA8gASgJOgZTUElFQ0VC",
-            "AggCSAESGgoJYmFyX2J5dGVzGBAgASgMOgVCWVRFU0gBEkgKCGJhcl9lbnVt",
-            "GBEgASgOMi8ucHJvdG9idWZfdW5pdHRlc3RfcHJvdG8yLlRlc3RPbmVvZjIu",
-            "TmVzdGVkRW51bToDQkFSSAESDwoHYmF6X2ludBgSIAEoBRIXCgpiYXpfc3Ry",
-            "aW5nGBMgASgJOgNCQVoaIAoIRm9vR3JvdXASCQoBYRgJIAEoBRIJCgFiGAog",
-            "ASgJGjMKDU5lc3RlZE1lc3NhZ2USDwoHcXV4X2ludBgBIAEoAxIRCgljb3Jn",
-            "ZV9pbnQYAiADKAUiJwoKTmVzdGVkRW51bRIHCgNGT08QARIHCgNCQVIQAhIH",
-            "CgNCQVoQA0IFCgNmb29CBQoDYmFyIr8BChFUZXN0UmVxdWlyZWRPbmVvZhIR",
-            "Cgdmb29faW50GAEgASgFSAASFAoKZm9vX3N0cmluZxgCIAEoCUgAElAKC2Zv",
-            "b19tZXNzYWdlGAMgASgLMjkucHJvdG9idWZfdW5pdHRlc3RfcHJvdG8yLlRl",
-            "c3RSZXF1aXJlZE9uZW9mLk5lc3RlZE1lc3NhZ2VIABooCg1OZXN0ZWRNZXNz",
-            "YWdlEhcKD3JlcXVpcmVkX2RvdWJsZRgBIAIoAUIFCgNmb28i4AEKD1Rlc3RS",
-            "ZXF1aXJlZE1hcBI/CgNmb28YASADKAsyMi5wcm90b2J1Zl91bml0dGVzdF9w",
-            "cm90bzIuVGVzdFJlcXVpcmVkTWFwLkZvb0VudHJ5GmMKCEZvb0VudHJ5EgsK",
-            "A2tleRgBIAEoBRJGCgV2YWx1ZRgCIAEoCzI3LnByb3RvYnVmX3VuaXR0ZXN0",
-            "X3Byb3RvMi5UZXN0UmVxdWlyZWRNYXAuTmVzdGVkTWVzc2FnZToCOAEaJwoN",
-            "TmVzdGVkTWVzc2FnZRIWCg5yZXF1aXJlZF9pbnQzMhgBIAIoBSKxAwoPVGVz",
-            "dFBhY2tlZFR5cGVzEhgKDHBhY2tlZF9pbnQzMhhaIAMoBUICEAESGAoMcGFj",
-            "a2VkX2ludDY0GFsgAygDQgIQARIZCg1wYWNrZWRfdWludDMyGFwgAygNQgIQ",
-            "ARIZCg1wYWNrZWRfdWludDY0GF0gAygEQgIQARIZCg1wYWNrZWRfc2ludDMy",
-            "GF4gAygRQgIQARIZCg1wYWNrZWRfc2ludDY0GF8gAygSQgIQARIaCg5wYWNr",
-            "ZWRfZml4ZWQzMhhgIAMoB0ICEAESGgoOcGFja2VkX2ZpeGVkNjQYYSADKAZC",
-            "AhABEhsKD3BhY2tlZF9zZml4ZWQzMhhiIAMoD0ICEAESGwoPcGFja2VkX3Nm",
-            "aXhlZDY0GGMgAygQQgIQARIYCgxwYWNrZWRfZmxvYXQYZCADKAJCAhABEhkK",
-            "DXBhY2tlZF9kb3VibGUYZSADKAFCAhABEhcKC3BhY2tlZF9ib29sGGYgAygI",
-            "QgIQARI+CgtwYWNrZWRfZW51bRhnIAMoDjIlLnByb3RvYnVmX3VuaXR0ZXN0",
-            "X3Byb3RvMi5Gb3JlaWduRW51bUICEAEizwMKEVRlc3RVbnBhY2tlZFR5cGVz",
-            "EhoKDnVucGFja2VkX2ludDMyGFogAygFQgIQABIaCg51bnBhY2tlZF9pbnQ2",
-            "NBhbIAMoA0ICEAASGwoPdW5wYWNrZWRfdWludDMyGFwgAygNQgIQABIbCg91",
-            "bnBhY2tlZF91aW50NjQYXSADKARCAhAAEhsKD3VucGFja2VkX3NpbnQzMhhe",
-            "IAMoEUICEAASGwoPdW5wYWNrZWRfc2ludDY0GF8gAygSQgIQABIcChB1bnBh",
-            "Y2tlZF9maXhlZDMyGGAgAygHQgIQABIcChB1bnBhY2tlZF9maXhlZDY0GGEg",
-            "AygGQgIQABIdChF1bnBhY2tlZF9zZml4ZWQzMhhiIAMoD0ICEAASHQoRdW5w",
-            "YWNrZWRfc2ZpeGVkNjQYYyADKBBCAhAAEhoKDnVucGFja2VkX2Zsb2F0GGQg",
-            "AygCQgIQABIbCg91bnBhY2tlZF9kb3VibGUYZSADKAFCAhAAEhkKDXVucGFj",
-            "a2VkX2Jvb2wYZiADKAhCAhAAEkAKDXVucGFja2VkX2VudW0YZyADKA4yJS5w",
-            "cm90b2J1Zl91bml0dGVzdF9wcm90bzIuRm9yZWlnbkVudW1CAhAAIiAKFFRl",
-            "c3RQYWNrZWRFeHRlbnNpb25zKggIARCAgICAAiIiChZUZXN0VW5wYWNrZWRF",
-            "eHRlbnNpb25zKggIARCAgICAAiK1BAoVVGVzdER5bmFtaWNFeHRlbnNpb25z",
-            "EhkKEHNjYWxhcl9leHRlbnNpb24Y0A8gASgHEj4KDmVudW1fZXh0ZW5zaW9u",
-            "GNEPIAEoDjIlLnByb3RvYnVmX3VuaXR0ZXN0X3Byb3RvMi5Gb3JlaWduRW51",
-            "bRJgChZkeW5hbWljX2VudW1fZXh0ZW5zaW9uGNIPIAEoDjI/LnByb3RvYnVm",
-            "X3VuaXR0ZXN0X3Byb3RvMi5UZXN0RHluYW1pY0V4dGVuc2lvbnMuRHluYW1p",
-            "Y0VudW1UeXBlEkQKEW1lc3NhZ2VfZXh0ZW5zaW9uGNMPIAEoCzIoLnByb3Rv",
-            "YnVmX3VuaXR0ZXN0X3Byb3RvMi5Gb3JlaWduTWVzc2FnZRJmChlkeW5hbWlj",
-            "X21lc3NhZ2VfZXh0ZW5zaW9uGNQPIAEoCzJCLnByb3RvYnVmX3VuaXR0ZXN0",
-            "X3Byb3RvMi5UZXN0RHluYW1pY0V4dGVuc2lvbnMuRHluYW1pY01lc3NhZ2VU",
-            "eXBlEhsKEnJlcGVhdGVkX2V4dGVuc2lvbhjVDyADKAkSHQoQcGFja2VkX2V4",
-            "dGVuc2lvbhjWDyADKBFCAhABGiwKEkR5bmFtaWNNZXNzYWdlVHlwZRIWCg1k",
-            "eW5hbWljX2ZpZWxkGLQQIAEoBSJHCg9EeW5hbWljRW51bVR5cGUSEAoLRFlO",
-            "QU1JQ19GT08QmBESEAoLRFlOQU1JQ19CQVIQmRESEAoLRFlOQU1JQ19CQVoQ",
-            "mhEiwAEKI1Rlc3RSZXBlYXRlZFNjYWxhckRpZmZlcmVudFRhZ1NpemVzEhgK",
-            "EHJlcGVhdGVkX2ZpeGVkMzIYDCADKAcSFgoOcmVwZWF0ZWRfaW50MzIYDSAD",
-            "KAUSGQoQcmVwZWF0ZWRfZml4ZWQ2NBj+DyADKAYSFwoOcmVwZWF0ZWRfaW50",
-            "NjQY/w8gAygDEhgKDnJlcGVhdGVkX2Zsb2F0GP7/DyADKAISGQoPcmVwZWF0",
-            "ZWRfdWludDY0GP//DyADKAQigwsKEFRlc3RQYXJzaW5nTWVyZ2USQgoScmVx",
-            "dWlyZWRfYWxsX3R5cGVzGAEgAigLMiYucHJvdG9idWZfdW5pdHRlc3RfcHJv",
-            "dG8yLlRlc3RBbGxUeXBlcxJCChJvcHRpb25hbF9hbGxfdHlwZXMYAiABKAsy",
-            "Ji5wcm90b2J1Zl91bml0dGVzdF9wcm90bzIuVGVzdEFsbFR5cGVzEkIKEnJl",
-            "cGVhdGVkX2FsbF90eXBlcxgDIAMoCzImLnByb3RvYnVmX3VuaXR0ZXN0X3By",
-            "b3RvMi5UZXN0QWxsVHlwZXMSTwoNb3B0aW9uYWxncm91cBgKIAEoCjI4LnBy",
-            "b3RvYnVmX3VuaXR0ZXN0X3Byb3RvMi5UZXN0UGFyc2luZ01lcmdlLk9wdGlv",
-            "bmFsR3JvdXASTwoNcmVwZWF0ZWRncm91cBgUIAMoCjI4LnByb3RvYnVmX3Vu",
-            "aXR0ZXN0X3Byb3RvMi5UZXN0UGFyc2luZ01lcmdlLlJlcGVhdGVkR3JvdXAa",
-            "6QQKF1JlcGVhdGVkRmllbGRzR2VuZXJhdG9yEjYKBmZpZWxkMRgBIAMoCzIm",
-            "LnByb3RvYnVmX3VuaXR0ZXN0X3Byb3RvMi5UZXN0QWxsVHlwZXMSNgoGZmll",
-            "bGQyGAIgAygLMiYucHJvdG9idWZfdW5pdHRlc3RfcHJvdG8yLlRlc3RBbGxU",
-            "eXBlcxI2CgZmaWVsZDMYAyADKAsyJi5wcm90b2J1Zl91bml0dGVzdF9wcm90",
-            "bzIuVGVzdEFsbFR5cGVzElkKBmdyb3VwMRgKIAMoCjJJLnByb3RvYnVmX3Vu",
-            "aXR0ZXN0X3Byb3RvMi5UZXN0UGFyc2luZ01lcmdlLlJlcGVhdGVkRmllbGRz",
-            "R2VuZXJhdG9yLkdyb3VwMRJZCgZncm91cDIYFCADKAoySS5wcm90b2J1Zl91",
-            "bml0dGVzdF9wcm90bzIuVGVzdFBhcnNpbmdNZXJnZS5SZXBlYXRlZEZpZWxk",
-            "c0dlbmVyYXRvci5Hcm91cDISNQoEZXh0MRjoByADKAsyJi5wcm90b2J1Zl91",
-            "bml0dGVzdF9wcm90bzIuVGVzdEFsbFR5cGVzEjUKBGV4dDIY6QcgAygLMiYu",
-            "cHJvdG9idWZfdW5pdHRlc3RfcHJvdG8yLlRlc3RBbGxUeXBlcxpACgZHcm91",
-            "cDESNgoGZmllbGQxGAsgASgLMiYucHJvdG9idWZfdW5pdHRlc3RfcHJvdG8y",
-            "LlRlc3RBbGxUeXBlcxpACgZHcm91cDISNgoGZmllbGQxGBUgASgLMiYucHJv",
-            "dG9idWZfdW5pdHRlc3RfcHJvdG8yLlRlc3RBbGxUeXBlcxpZCg1PcHRpb25h",
-            "bEdyb3VwEkgKGG9wdGlvbmFsX2dyb3VwX2FsbF90eXBlcxgLIAEoCzImLnBy",
-            "b3RvYnVmX3VuaXR0ZXN0X3Byb3RvMi5UZXN0QWxsVHlwZXMaWQoNUmVwZWF0",
-            "ZWRHcm91cBJIChhyZXBlYXRlZF9ncm91cF9hbGxfdHlwZXMYFSABKAsyJi5w",
-            "cm90b2J1Zl91bml0dGVzdF9wcm90bzIuVGVzdEFsbFR5cGVzKgkI6AcQgICA",
-            "gAIyaQoMb3B0aW9uYWxfZXh0EioucHJvdG9idWZfdW5pdHRlc3RfcHJvdG8y",
-            "LlRlc3RQYXJzaW5nTWVyZ2UY6AcgASgLMiYucHJvdG9idWZfdW5pdHRlc3Rf",
-            "cHJvdG8yLlRlc3RBbGxUeXBlczJpCgxyZXBlYXRlZF9leHQSKi5wcm90b2J1",
-            "Zl91bml0dGVzdF9wcm90bzIuVGVzdFBhcnNpbmdNZXJnZRjpByADKAsyJi5w",
-            "cm90b2J1Zl91bml0dGVzdF9wcm90bzIuVGVzdEFsbFR5cGVzIkQKG1Rlc3RD",
-            "b21tZW50SW5qZWN0aW9uTWVzc2FnZRIlCgFhGAEgASgJOhoqLyA8LSBOZWl0",
-            "aGVyIHNob3VsZCB0aGlzLiIMCgpGb29SZXF1ZXN0Ig0KC0Zvb1Jlc3BvbnNl",
-            "IhIKEEZvb0NsaWVudE1lc3NhZ2UiEgoQRm9vU2VydmVyTWVzc2FnZSIMCgpC",
-            "YXJSZXF1ZXN0Ig0KC0JhclJlc3BvbnNlIpIBCgxUZXN0SnNvbk5hbWUSEwoL",
-            "ZmllbGRfbmFtZTEYASABKAUSEgoKZmllbGROYW1lMhgCIAEoBRISCgpGaWVs",
-            "ZE5hbWUzGAMgASgFEhQKDF9maWVsZF9uYW1lNBgEIAEoBRITCgtGSUVMRF9O",
-            "QU1FNRgFIAEoBRIaCgtmaWVsZF9uYW1lNhgGIAEoBVIFQHR5cGUioAYKFFRl",
-            "c3RIdWdlRmllbGROdW1iZXJzEhoKDm9wdGlvbmFsX2ludDMyGPD4//8BIAEo",
-            "BRIUCghmaXhlZF8zMhjx+P//ASABKAUSHgoOcmVwZWF0ZWRfaW50MzIY8vj/",
-            "/wEgAygFQgIQABIcCgxwYWNrZWRfaW50MzIY8/j//wEgAygFQgIQARJACg1v",
-            "cHRpb25hbF9lbnVtGPT4//8BIAEoDjIlLnByb3RvYnVmX3VuaXR0ZXN0X3By",
-            "b3RvMi5Gb3JlaWduRW51bRIbCg9vcHRpb25hbF9zdHJpbmcY9fj//wEgASgJ",
-            "EhoKDm9wdGlvbmFsX2J5dGVzGPb4//8BIAEoDBJGChBvcHRpb25hbF9tZXNz",
-            "YWdlGPf4//8BIAEoCzIoLnByb3RvYnVmX3VuaXR0ZXN0X3Byb3RvMi5Gb3Jl",
-            "aWduTWVzc2FnZRJXCg1vcHRpb25hbGdyb3VwGPj4//8BIAEoCjI8LnByb3Rv",
-            "YnVmX3VuaXR0ZXN0X3Byb3RvMi5UZXN0SHVnZUZpZWxkTnVtYmVycy5PcHRp",
-            "b25hbEdyb3VwEmIKEXN0cmluZ19zdHJpbmdfbWFwGPr4//8BIAMoCzJDLnBy",
-            "b3RvYnVmX3VuaXR0ZXN0X3Byb3RvMi5UZXN0SHVnZUZpZWxkTnVtYmVycy5T",
-            "dHJpbmdTdHJpbmdNYXBFbnRyeRIaCgxvbmVvZl91aW50MzIY+/j//wEgASgN",
-            "SAASSgoUb25lb2ZfdGVzdF9hbGxfdHlwZXMY/Pj//wEgASgLMiYucHJvdG9i",
-            "dWZfdW5pdHRlc3RfcHJvdG8yLlRlc3RBbGxUeXBlc0gAEhoKDG9uZW9mX3N0",
-            "cmluZxj9+P//ASABKAlIABIZCgtvbmVvZl9ieXRlcxj++P//ASABKAxIABok",
-            "Cg1PcHRpb25hbEdyb3VwEhMKB2dyb3VwX2EY+fj//wEgASgFGjYKFFN0cmlu",
-            "Z1N0cmluZ01hcEVudHJ5EgsKA2tleRgBIAEoCRINCgV2YWx1ZRgCIAEoCToC",
-            "OAEqDAjgqv//ARDw+P//AUINCgtvbmVvZl9maWVsZCKxAQoYVGVzdEV4dGVu",
-            "c2lvbkluc2lkZVRhYmxlEg4KBmZpZWxkMRgBIAEoBRIOCgZmaWVsZDIYAiAB",
-            "KAUSDgoGZmllbGQzGAMgASgFEg4KBmZpZWxkNBgEIAEoBRIOCgZmaWVsZDYY",
-            "BiABKAUSDgoGZmllbGQ3GAcgASgFEg4KBmZpZWxkOBgIIAEoBRIOCgZmaWVs",
-            "ZDkYCSABKAUSDwoHZmllbGQxMBgKIAEoBSoECAUQBipACgtGb3JlaWduRW51",
-            "bRIPCgtGT1JFSUdOX0ZPTxAEEg8KC0ZPUkVJR05fQkFSEAUSDwoLRk9SRUlH",
-            "Tl9CQVoQBipLChRUZXN0RW51bVdpdGhEdXBWYWx1ZRIICgRGT08xEAESCAoE",
-            "QkFSMRACEgcKA0JBWhADEggKBEZPTzIQARIICgRCQVIyEAIaAhABKokBCg5U",
-            "ZXN0U3BhcnNlRW51bRIMCghTUEFSU0VfQRB7Eg4KCFNQQVJTRV9CEKbnAxIP",
-            "CghTUEFSU0VfQxCysYAGEhUKCFNQQVJTRV9EEPH//////////wESFQoIU1BB",
-            "UlNFX0UQtN78////////ARIMCghTUEFSU0VfRhAAEgwKCFNQQVJTRV9HEAIq",
-            "iw8KDVZlcnlMYXJnZUVudW0SFgoSRU5VTV9MQUJFTF9ERUZBVUxUEAASEAoM",
-            "RU5VTV9MQUJFTF8xEAESEAoMRU5VTV9MQUJFTF8yEAISEAoMRU5VTV9MQUJF",
-            "TF8zEAMSEAoMRU5VTV9MQUJFTF80EAQSEAoMRU5VTV9MQUJFTF81EAUSEAoM",
-            "RU5VTV9MQUJFTF82EAYSEAoMRU5VTV9MQUJFTF83EAcSEAoMRU5VTV9MQUJF",
-            "TF84EAgSEAoMRU5VTV9MQUJFTF85EAkSEQoNRU5VTV9MQUJFTF8xMBAKEhEK",
-            "DUVOVU1fTEFCRUxfMTEQCxIRCg1FTlVNX0xBQkVMXzEyEAwSEQoNRU5VTV9M",
-            "QUJFTF8xMxANEhEKDUVOVU1fTEFCRUxfMTQQDhIRCg1FTlVNX0xBQkVMXzE1",
-            "EA8SEQoNRU5VTV9MQUJFTF8xNhAQEhEKDUVOVU1fTEFCRUxfMTcQERIRCg1F",
-            "TlVNX0xBQkVMXzE4EBISEQoNRU5VTV9MQUJFTF8xORATEhEKDUVOVU1fTEFC",
-            "RUxfMjAQFBIRCg1FTlVNX0xBQkVMXzIxEBUSEQoNRU5VTV9MQUJFTF8yMhAW",
-            "EhEKDUVOVU1fTEFCRUxfMjMQFxIRCg1FTlVNX0xBQkVMXzI0EBgSEQoNRU5V",
-            "TV9MQUJFTF8yNRAZEhEKDUVOVU1fTEFCRUxfMjYQGhIRCg1FTlVNX0xBQkVM",
-            "XzI3EBsSEQoNRU5VTV9MQUJFTF8yOBAcEhEKDUVOVU1fTEFCRUxfMjkQHRIR",
-            "Cg1FTlVNX0xBQkVMXzMwEB4SEQoNRU5VTV9MQUJFTF8zMRAfEhEKDUVOVU1f",
-            "TEFCRUxfMzIQIBIRCg1FTlVNX0xBQkVMXzMzECESEQoNRU5VTV9MQUJFTF8z",
-            "NBAiEhEKDUVOVU1fTEFCRUxfMzUQIxIRCg1FTlVNX0xBQkVMXzM2ECQSEQoN",
-            "RU5VTV9MQUJFTF8zNxAlEhEKDUVOVU1fTEFCRUxfMzgQJhIRCg1FTlVNX0xB",
-            "QkVMXzM5ECcSEQoNRU5VTV9MQUJFTF80MBAoEhEKDUVOVU1fTEFCRUxfNDEQ",
-            "KRIRCg1FTlVNX0xBQkVMXzQyECoSEQoNRU5VTV9MQUJFTF80MxArEhEKDUVO",
-            "VU1fTEFCRUxfNDQQLBIRCg1FTlVNX0xBQkVMXzQ1EC0SEQoNRU5VTV9MQUJF",
-            "TF80NhAuEhEKDUVOVU1fTEFCRUxfNDcQLxIRCg1FTlVNX0xBQkVMXzQ4EDAS",
-            "EQoNRU5VTV9MQUJFTF80ORAxEhEKDUVOVU1fTEFCRUxfNTAQMhIRCg1FTlVN",
-            "X0xBQkVMXzUxEDMSEQoNRU5VTV9MQUJFTF81MhA0EhEKDUVOVU1fTEFCRUxf",
-            "NTMQNRIRCg1FTlVNX0xBQkVMXzU0EDYSEQoNRU5VTV9MQUJFTF81NRA3EhEK",
-            "DUVOVU1fTEFCRUxfNTYQOBIRCg1FTlVNX0xBQkVMXzU3EDkSEQoNRU5VTV9M",
-            "QUJFTF81OBA6EhEKDUVOVU1fTEFCRUxfNTkQOxIRCg1FTlVNX0xBQkVMXzYw",
-            "EDwSEQoNRU5VTV9MQUJFTF82MRA9EhEKDUVOVU1fTEFCRUxfNjIQPhIRCg1F",
-            "TlVNX0xBQkVMXzYzED8SEQoNRU5VTV9MQUJFTF82NBBAEhEKDUVOVU1fTEFC",
-            "RUxfNjUQQRIRCg1FTlVNX0xBQkVMXzY2EEISEQoNRU5VTV9MQUJFTF82NxBD",
-            "EhEKDUVOVU1fTEFCRUxfNjgQRBIRCg1FTlVNX0xBQkVMXzY5EEUSEQoNRU5V",
-            "TV9MQUJFTF83MBBGEhEKDUVOVU1fTEFCRUxfNzEQRxIRCg1FTlVNX0xBQkVM",
-            "XzcyEEgSEQoNRU5VTV9MQUJFTF83MxBJEhEKDUVOVU1fTEFCRUxfNzQQShIR",
-            "Cg1FTlVNX0xBQkVMXzc1EEsSEQoNRU5VTV9MQUJFTF83NhBMEhEKDUVOVU1f",
-            "TEFCRUxfNzcQTRIRCg1FTlVNX0xBQkVMXzc4EE4SEQoNRU5VTV9MQUJFTF83",
-            "ORBPEhEKDUVOVU1fTEFCRUxfODAQUBIRCg1FTlVNX0xBQkVMXzgxEFESEQoN",
-            "RU5VTV9MQUJFTF84MhBSEhEKDUVOVU1fTEFCRUxfODMQUxIRCg1FTlVNX0xB",
-            "QkVMXzg0EFQSEQoNRU5VTV9MQUJFTF84NRBVEhEKDUVOVU1fTEFCRUxfODYQ",
-            "VhIRCg1FTlVNX0xBQkVMXzg3EFcSEQoNRU5VTV9MQUJFTF84OBBYEhEKDUVO",
-            "VU1fTEFCRUxfODkQWRIRCg1FTlVNX0xBQkVMXzkwEFoSEQoNRU5VTV9MQUJF",
-            "TF85MRBbEhEKDUVOVU1fTEFCRUxfOTIQXBIRCg1FTlVNX0xBQkVMXzkzEF0S",
-            "EQoNRU5VTV9MQUJFTF85NBBeEhEKDUVOVU1fTEFCRUxfOTUQXxIRCg1FTlVN",
-            "X0xBQkVMXzk2EGASEQoNRU5VTV9MQUJFTF85NxBhEhEKDUVOVU1fTEFCRUxf",
-            "OTgQYhIRCg1FTlVNX0xBQkVMXzk5EGMSEgoORU5VTV9MQUJFTF8xMDAQZDK1",
-            "AQoLVGVzdFNlcnZpY2USUgoDRm9vEiQucHJvdG9idWZfdW5pdHRlc3RfcHJv",
-            "dG8yLkZvb1JlcXVlc3QaJS5wcm90b2J1Zl91bml0dGVzdF9wcm90bzIuRm9v",
-            "UmVzcG9uc2USUgoDQmFyEiQucHJvdG9idWZfdW5pdHRlc3RfcHJvdG8yLkJh",
-            "clJlcXVlc3QaJS5wcm90b2J1Zl91bml0dGVzdF9wcm90bzIuQmFyUmVzcG9u",
-            "c2U6TQoYb3B0aW9uYWxfaW50MzJfZXh0ZW5zaW9uEisucHJvdG9idWZfdW5p",
-            "dHRlc3RfcHJvdG8yLlRlc3RBbGxFeHRlbnNpb25zGAEgASgFOk0KGG9wdGlv",
-            "bmFsX2ludDY0X2V4dGVuc2lvbhIrLnByb3RvYnVmX3VuaXR0ZXN0X3Byb3Rv",
-            "Mi5UZXN0QWxsRXh0ZW5zaW9ucxgCIAEoAzpOChlvcHRpb25hbF91aW50MzJf",
-            "ZXh0ZW5zaW9uEisucHJvdG9idWZfdW5pdHRlc3RfcHJvdG8yLlRlc3RBbGxF",
-            "eHRlbnNpb25zGAMgASgNOk4KGW9wdGlvbmFsX3VpbnQ2NF9leHRlbnNpb24S",
-            "Ky5wcm90b2J1Zl91bml0dGVzdF9wcm90bzIuVGVzdEFsbEV4dGVuc2lvbnMY",
-            "BCABKAQ6TgoZb3B0aW9uYWxfc2ludDMyX2V4dGVuc2lvbhIrLnByb3RvYnVm",
-            "X3VuaXR0ZXN0X3Byb3RvMi5UZXN0QWxsRXh0ZW5zaW9ucxgFIAEoETpOChlv",
-            "cHRpb25hbF9zaW50NjRfZXh0ZW5zaW9uEisucHJvdG9idWZfdW5pdHRlc3Rf",
-            "cHJvdG8yLlRlc3RBbGxFeHRlbnNpb25zGAYgASgSOk8KGm9wdGlvbmFsX2Zp",
-            "eGVkMzJfZXh0ZW5zaW9uEisucHJvdG9idWZfdW5pdHRlc3RfcHJvdG8yLlRl",
-            "c3RBbGxFeHRlbnNpb25zGAcgASgHOk8KGm9wdGlvbmFsX2ZpeGVkNjRfZXh0",
-            "ZW5zaW9uEisucHJvdG9idWZfdW5pdHRlc3RfcHJvdG8yLlRlc3RBbGxFeHRl",
-            "bnNpb25zGAggASgGOlAKG29wdGlvbmFsX3NmaXhlZDMyX2V4dGVuc2lvbhIr",
-            "LnByb3RvYnVmX3VuaXR0ZXN0X3Byb3RvMi5UZXN0QWxsRXh0ZW5zaW9ucxgJ",
-            "IAEoDzpQChtvcHRpb25hbF9zZml4ZWQ2NF9leHRlbnNpb24SKy5wcm90b2J1",
-            "Zl91bml0dGVzdF9wcm90bzIuVGVzdEFsbEV4dGVuc2lvbnMYCiABKBA6TQoY",
-            "b3B0aW9uYWxfZmxvYXRfZXh0ZW5zaW9uEisucHJvdG9idWZfdW5pdHRlc3Rf",
-            "cHJvdG8yLlRlc3RBbGxFeHRlbnNpb25zGAsgASgCOk4KGW9wdGlvbmFsX2Rv",
-            "dWJsZV9leHRlbnNpb24SKy5wcm90b2J1Zl91bml0dGVzdF9wcm90bzIuVGVz",
-            "dEFsbEV4dGVuc2lvbnMYDCABKAE6TAoXb3B0aW9uYWxfYm9vbF9leHRlbnNp",
-            "b24SKy5wcm90b2J1Zl91bml0dGVzdF9wcm90bzIuVGVzdEFsbEV4dGVuc2lv",
-            "bnMYDSABKAg6TgoZb3B0aW9uYWxfc3RyaW5nX2V4dGVuc2lvbhIrLnByb3Rv",
-            "YnVmX3VuaXR0ZXN0X3Byb3RvMi5UZXN0QWxsRXh0ZW5zaW9ucxgOIAEoCTpN",
-            "ChhvcHRpb25hbF9ieXRlc19leHRlbnNpb24SKy5wcm90b2J1Zl91bml0dGVz",
-            "dF9wcm90bzIuVGVzdEFsbEV4dGVuc2lvbnMYDyABKAw6fwoXb3B0aW9uYWxn",
-            "cm91cF9leHRlbnNpb24SKy5wcm90b2J1Zl91bml0dGVzdF9wcm90bzIuVGVz",
-            "dEFsbEV4dGVuc2lvbnMYECABKAoyMS5wcm90b2J1Zl91bml0dGVzdF9wcm90",
-            "bzIuT3B0aW9uYWxHcm91cF9leHRlbnNpb246jAEKIW9wdGlvbmFsX25lc3Rl",
-            "ZF9tZXNzYWdlX2V4dGVuc2lvbhIrLnByb3RvYnVmX3VuaXR0ZXN0X3Byb3Rv",
-            "Mi5UZXN0QWxsRXh0ZW5zaW9ucxgSIAEoCzI0LnByb3RvYnVmX3VuaXR0ZXN0",
-            "X3Byb3RvMi5UZXN0QWxsVHlwZXMuTmVzdGVkTWVzc2FnZTqBAQoib3B0aW9u",
-            "YWxfZm9yZWlnbl9tZXNzYWdlX2V4dGVuc2lvbhIrLnByb3RvYnVmX3VuaXR0",
-            "ZXN0X3Byb3RvMi5UZXN0QWxsRXh0ZW5zaW9ucxgTIAEoCzIoLnByb3RvYnVm",
-            "X3VuaXR0ZXN0X3Byb3RvMi5Gb3JlaWduTWVzc2FnZTqGAQohb3B0aW9uYWxf",
-            "aW1wb3J0X21lc3NhZ2VfZXh0ZW5zaW9uEisucHJvdG9idWZfdW5pdHRlc3Rf",
-            "cHJvdG8yLlRlc3RBbGxFeHRlbnNpb25zGBQgASgLMi4ucHJvdG9idWZfdW5p",
-            "dHRlc3RfaW1wb3J0X3Byb3RvMi5JbXBvcnRNZXNzYWdlOoYBCh5vcHRpb25h",
-            "bF9uZXN0ZWRfZW51bV9leHRlbnNpb24SKy5wcm90b2J1Zl91bml0dGVzdF9w",
-            "cm90bzIuVGVzdEFsbEV4dGVuc2lvbnMYFSABKA4yMS5wcm90b2J1Zl91bml0",
-            "dGVzdF9wcm90bzIuVGVzdEFsbFR5cGVzLk5lc3RlZEVudW06ewofb3B0aW9u",
-            "YWxfZm9yZWlnbl9lbnVtX2V4dGVuc2lvbhIrLnByb3RvYnVmX3VuaXR0ZXN0",
-            "X3Byb3RvMi5UZXN0QWxsRXh0ZW5zaW9ucxgWIAEoDjIlLnByb3RvYnVmX3Vu",
-            "aXR0ZXN0X3Byb3RvMi5Gb3JlaWduRW51bTqAAQoeb3B0aW9uYWxfaW1wb3J0",
-            "X2VudW1fZXh0ZW5zaW9uEisucHJvdG9idWZfdW5pdHRlc3RfcHJvdG8yLlRl",
-            "c3RBbGxFeHRlbnNpb25zGBcgASgOMisucHJvdG9idWZfdW5pdHRlc3RfaW1w",
-            "b3J0X3Byb3RvMi5JbXBvcnRFbnVtOlgKH29wdGlvbmFsX3N0cmluZ19waWVj",
-            "ZV9leHRlbnNpb24SKy5wcm90b2J1Zl91bml0dGVzdF9wcm90bzIuVGVzdEFs",
-            "bEV4dGVuc2lvbnMYGCABKAlCAggCOlAKF29wdGlvbmFsX2NvcmRfZXh0ZW5z",
-            "aW9uEisucHJvdG9idWZfdW5pdHRlc3RfcHJvdG8yLlRlc3RBbGxFeHRlbnNp",
-            "b25zGBkgASgJQgIIATqTAQoob3B0aW9uYWxfcHVibGljX2ltcG9ydF9tZXNz",
-            "YWdlX2V4dGVuc2lvbhIrLnByb3RvYnVmX3VuaXR0ZXN0X3Byb3RvMi5UZXN0",
-            "QWxsRXh0ZW5zaW9ucxgaIAEoCzI0LnByb3RvYnVmX3VuaXR0ZXN0X2ltcG9y",
-            "dF9wcm90bzIuUHVibGljSW1wb3J0TWVzc2FnZTqOAQofb3B0aW9uYWxfbGF6",
-            "eV9tZXNzYWdlX2V4dGVuc2lvbhIrLnByb3RvYnVmX3VuaXR0ZXN0X3Byb3Rv",
-            "Mi5UZXN0QWxsRXh0ZW5zaW9ucxgbIAEoCzI0LnByb3RvYnVmX3VuaXR0ZXN0",
-            "X3Byb3RvMi5UZXN0QWxsVHlwZXMuTmVzdGVkTWVzc2FnZUICKAE6TQoYcmVw",
-            "ZWF0ZWRfaW50MzJfZXh0ZW5zaW9uEisucHJvdG9idWZfdW5pdHRlc3RfcHJv",
-            "dG8yLlRlc3RBbGxFeHRlbnNpb25zGB8gAygFOk0KGHJlcGVhdGVkX2ludDY0",
-            "X2V4dGVuc2lvbhIrLnByb3RvYnVmX3VuaXR0ZXN0X3Byb3RvMi5UZXN0QWxs",
-            "RXh0ZW5zaW9ucxggIAMoAzpOChlyZXBlYXRlZF91aW50MzJfZXh0ZW5zaW9u",
-            "EisucHJvdG9idWZfdW5pdHRlc3RfcHJvdG8yLlRlc3RBbGxFeHRlbnNpb25z",
-            "GCEgAygNOk4KGXJlcGVhdGVkX3VpbnQ2NF9leHRlbnNpb24SKy5wcm90b2J1",
-            "Zl91bml0dGVzdF9wcm90bzIuVGVzdEFsbEV4dGVuc2lvbnMYIiADKAQ6TgoZ",
-            "cmVwZWF0ZWRfc2ludDMyX2V4dGVuc2lvbhIrLnByb3RvYnVmX3VuaXR0ZXN0",
-            "X3Byb3RvMi5UZXN0QWxsRXh0ZW5zaW9ucxgjIAMoETpOChlyZXBlYXRlZF9z",
-            "aW50NjRfZXh0ZW5zaW9uEisucHJvdG9idWZfdW5pdHRlc3RfcHJvdG8yLlRl",
-            "c3RBbGxFeHRlbnNpb25zGCQgAygSOk8KGnJlcGVhdGVkX2ZpeGVkMzJfZXh0",
-            "ZW5zaW9uEisucHJvdG9idWZfdW5pdHRlc3RfcHJvdG8yLlRlc3RBbGxFeHRl",
-            "bnNpb25zGCUgAygHOk8KGnJlcGVhdGVkX2ZpeGVkNjRfZXh0ZW5zaW9uEisu",
-            "cHJvdG9idWZfdW5pdHRlc3RfcHJvdG8yLlRlc3RBbGxFeHRlbnNpb25zGCYg",
-            "AygGOlAKG3JlcGVhdGVkX3NmaXhlZDMyX2V4dGVuc2lvbhIrLnByb3RvYnVm",
-            "X3VuaXR0ZXN0X3Byb3RvMi5UZXN0QWxsRXh0ZW5zaW9ucxgnIAMoDzpQChty",
-            "ZXBlYXRlZF9zZml4ZWQ2NF9leHRlbnNpb24SKy5wcm90b2J1Zl91bml0dGVz",
-            "dF9wcm90bzIuVGVzdEFsbEV4dGVuc2lvbnMYKCADKBA6TQoYcmVwZWF0ZWRf",
-            "ZmxvYXRfZXh0ZW5zaW9uEisucHJvdG9idWZfdW5pdHRlc3RfcHJvdG8yLlRl",
-            "c3RBbGxFeHRlbnNpb25zGCkgAygCOk4KGXJlcGVhdGVkX2RvdWJsZV9leHRl",
-            "bnNpb24SKy5wcm90b2J1Zl91bml0dGVzdF9wcm90bzIuVGVzdEFsbEV4dGVu",
-            "c2lvbnMYKiADKAE6TAoXcmVwZWF0ZWRfYm9vbF9leHRlbnNpb24SKy5wcm90",
-            "b2J1Zl91bml0dGVzdF9wcm90bzIuVGVzdEFsbEV4dGVuc2lvbnMYKyADKAg6",
-            "TgoZcmVwZWF0ZWRfc3RyaW5nX2V4dGVuc2lvbhIrLnByb3RvYnVmX3VuaXR0",
-            "ZXN0X3Byb3RvMi5UZXN0QWxsRXh0ZW5zaW9ucxgsIAMoCTpNChhyZXBlYXRl",
-            "ZF9ieXRlc19leHRlbnNpb24SKy5wcm90b2J1Zl91bml0dGVzdF9wcm90bzIu",
-            "VGVzdEFsbEV4dGVuc2lvbnMYLSADKAw6fwoXcmVwZWF0ZWRncm91cF9leHRl",
-            "bnNpb24SKy5wcm90b2J1Zl91bml0dGVzdF9wcm90bzIuVGVzdEFsbEV4dGVu",
-            "c2lvbnMYLiADKAoyMS5wcm90b2J1Zl91bml0dGVzdF9wcm90bzIuUmVwZWF0",
-            "ZWRHcm91cF9leHRlbnNpb246jAEKIXJlcGVhdGVkX25lc3RlZF9tZXNzYWdl",
-            "X2V4dGVuc2lvbhIrLnByb3RvYnVmX3VuaXR0ZXN0X3Byb3RvMi5UZXN0QWxs",
-            "RXh0ZW5zaW9ucxgwIAMoCzI0LnByb3RvYnVmX3VuaXR0ZXN0X3Byb3RvMi5U",
-            "ZXN0QWxsVHlwZXMuTmVzdGVkTWVzc2FnZTqBAQoicmVwZWF0ZWRfZm9yZWln",
-            "bl9tZXNzYWdlX2V4dGVuc2lvbhIrLnByb3RvYnVmX3VuaXR0ZXN0X3Byb3Rv",
-            "Mi5UZXN0QWxsRXh0ZW5zaW9ucxgxIAMoCzIoLnByb3RvYnVmX3VuaXR0ZXN0",
-            "X3Byb3RvMi5Gb3JlaWduTWVzc2FnZTqGAQohcmVwZWF0ZWRfaW1wb3J0X21l",
-            "c3NhZ2VfZXh0ZW5zaW9uEisucHJvdG9idWZfdW5pdHRlc3RfcHJvdG8yLlRl",
-            "c3RBbGxFeHRlbnNpb25zGDIgAygLMi4ucHJvdG9idWZfdW5pdHRlc3RfaW1w",
-            "b3J0X3Byb3RvMi5JbXBvcnRNZXNzYWdlOoYBCh5yZXBlYXRlZF9uZXN0ZWRf",
-            "ZW51bV9leHRlbnNpb24SKy5wcm90b2J1Zl91bml0dGVzdF9wcm90bzIuVGVz",
-            "dEFsbEV4dGVuc2lvbnMYMyADKA4yMS5wcm90b2J1Zl91bml0dGVzdF9wcm90",
-            "bzIuVGVzdEFsbFR5cGVzLk5lc3RlZEVudW06ewofcmVwZWF0ZWRfZm9yZWln",
-            "bl9lbnVtX2V4dGVuc2lvbhIrLnByb3RvYnVmX3VuaXR0ZXN0X3Byb3RvMi5U",
-            "ZXN0QWxsRXh0ZW5zaW9ucxg0IAMoDjIlLnByb3RvYnVmX3VuaXR0ZXN0X3By",
-            "b3RvMi5Gb3JlaWduRW51bTqAAQoecmVwZWF0ZWRfaW1wb3J0X2VudW1fZXh0",
-            "ZW5zaW9uEisucHJvdG9idWZfdW5pdHRlc3RfcHJvdG8yLlRlc3RBbGxFeHRl",
-            "bnNpb25zGDUgAygOMisucHJvdG9idWZfdW5pdHRlc3RfaW1wb3J0X3Byb3Rv",
-            "Mi5JbXBvcnRFbnVtOlgKH3JlcGVhdGVkX3N0cmluZ19waWVjZV9leHRlbnNp",
-            "b24SKy5wcm90b2J1Zl91bml0dGVzdF9wcm90bzIuVGVzdEFsbEV4dGVuc2lv",
-            "bnMYNiADKAlCAggCOlAKF3JlcGVhdGVkX2NvcmRfZXh0ZW5zaW9uEisucHJv",
-            "dG9idWZfdW5pdHRlc3RfcHJvdG8yLlRlc3RBbGxFeHRlbnNpb25zGDcgAygJ",
-            "QgIIATqOAQofcmVwZWF0ZWRfbGF6eV9tZXNzYWdlX2V4dGVuc2lvbhIrLnBy",
-            "b3RvYnVmX3VuaXR0ZXN0X3Byb3RvMi5UZXN0QWxsRXh0ZW5zaW9ucxg5IAMo",
-            "CzI0LnByb3RvYnVmX3VuaXR0ZXN0X3Byb3RvMi5UZXN0QWxsVHlwZXMuTmVz",
-            "dGVkTWVzc2FnZUICKAE6UAoXZGVmYXVsdF9pbnQzMl9leHRlbnNpb24SKy5w",
-            "cm90b2J1Zl91bml0dGVzdF9wcm90bzIuVGVzdEFsbEV4dGVuc2lvbnMYPSAB",
-            "KAU6AjQxOlAKF2RlZmF1bHRfaW50NjRfZXh0ZW5zaW9uEisucHJvdG9idWZf",
-            "dW5pdHRlc3RfcHJvdG8yLlRlc3RBbGxFeHRlbnNpb25zGD4gASgDOgI0MjpR",
-            "ChhkZWZhdWx0X3VpbnQzMl9leHRlbnNpb24SKy5wcm90b2J1Zl91bml0dGVz",
-            "dF9wcm90bzIuVGVzdEFsbEV4dGVuc2lvbnMYPyABKA06AjQzOlEKGGRlZmF1",
-            "bHRfdWludDY0X2V4dGVuc2lvbhIrLnByb3RvYnVmX3VuaXR0ZXN0X3Byb3Rv",
-            "Mi5UZXN0QWxsRXh0ZW5zaW9ucxhAIAEoBDoCNDQ6UgoYZGVmYXVsdF9zaW50",
-            "MzJfZXh0ZW5zaW9uEisucHJvdG9idWZfdW5pdHRlc3RfcHJvdG8yLlRlc3RB",
-            "bGxFeHRlbnNpb25zGEEgASgROgMtNDU6UQoYZGVmYXVsdF9zaW50NjRfZXh0",
-            "ZW5zaW9uEisucHJvdG9idWZfdW5pdHRlc3RfcHJvdG8yLlRlc3RBbGxFeHRl",
-            "bnNpb25zGEIgASgSOgI0NjpSChlkZWZhdWx0X2ZpeGVkMzJfZXh0ZW5zaW9u",
-            "EisucHJvdG9idWZfdW5pdHRlc3RfcHJvdG8yLlRlc3RBbGxFeHRlbnNpb25z",
-            "GEMgASgHOgI0NzpSChlkZWZhdWx0X2ZpeGVkNjRfZXh0ZW5zaW9uEisucHJv",
-            "dG9idWZfdW5pdHRlc3RfcHJvdG8yLlRlc3RBbGxFeHRlbnNpb25zGEQgASgG",
-            "OgI0ODpTChpkZWZhdWx0X3NmaXhlZDMyX2V4dGVuc2lvbhIrLnByb3RvYnVm",
-            "X3VuaXR0ZXN0X3Byb3RvMi5UZXN0QWxsRXh0ZW5zaW9ucxhFIAEoDzoCNDk6",
-            "VAoaZGVmYXVsdF9zZml4ZWQ2NF9leHRlbnNpb24SKy5wcm90b2J1Zl91bml0",
-            "dGVzdF9wcm90bzIuVGVzdEFsbEV4dGVuc2lvbnMYRiABKBA6Ay01MDpSChdk",
-            "ZWZhdWx0X2Zsb2F0X2V4dGVuc2lvbhIrLnByb3RvYnVmX3VuaXR0ZXN0X3By",
-            "b3RvMi5UZXN0QWxsRXh0ZW5zaW9ucxhHIAEoAjoENTEuNTpUChhkZWZhdWx0",
-            "X2RvdWJsZV9leHRlbnNpb24SKy5wcm90b2J1Zl91bml0dGVzdF9wcm90bzIu",
-            "VGVzdEFsbEV4dGVuc2lvbnMYSCABKAE6BTUyMDAwOlEKFmRlZmF1bHRfYm9v",
-            "bF9leHRlbnNpb24SKy5wcm90b2J1Zl91bml0dGVzdF9wcm90bzIuVGVzdEFs",
-            "bEV4dGVuc2lvbnMYSSABKAg6BHRydWU6VAoYZGVmYXVsdF9zdHJpbmdfZXh0",
-            "ZW5zaW9uEisucHJvdG9idWZfdW5pdHRlc3RfcHJvdG8yLlRlc3RBbGxFeHRl",
-            "bnNpb25zGEogASgJOgVoZWxsbzpTChdkZWZhdWx0X2J5dGVzX2V4dGVuc2lv",
-            "bhIrLnByb3RvYnVmX3VuaXR0ZXN0X3Byb3RvMi5UZXN0QWxsRXh0ZW5zaW9u",
-            "cxhLIAEoDDoFd29ybGQ6igEKHWRlZmF1bHRfbmVzdGVkX2VudW1fZXh0ZW5z",
-            "aW9uEisucHJvdG9idWZfdW5pdHRlc3RfcHJvdG8yLlRlc3RBbGxFeHRlbnNp",
-            "b25zGFEgASgOMjEucHJvdG9idWZfdW5pdHRlc3RfcHJvdG8yLlRlc3RBbGxU",
-            "eXBlcy5OZXN0ZWRFbnVtOgNCQVI6hwEKHmRlZmF1bHRfZm9yZWlnbl9lbnVt",
-            "X2V4dGVuc2lvbhIrLnByb3RvYnVmX3VuaXR0ZXN0X3Byb3RvMi5UZXN0QWxs",
-            "RXh0ZW5zaW9ucxhSIAEoDjIlLnByb3RvYnVmX3VuaXR0ZXN0X3Byb3RvMi5G",
-            "b3JlaWduRW51bToLRk9SRUlHTl9CQVI6iwEKHWRlZmF1bHRfaW1wb3J0X2Vu",
-            "dW1fZXh0ZW5zaW9uEisucHJvdG9idWZfdW5pdHRlc3RfcHJvdG8yLlRlc3RB",
-            "bGxFeHRlbnNpb25zGFMgASgOMisucHJvdG9idWZfdW5pdHRlc3RfaW1wb3J0",
-            "X3Byb3RvMi5JbXBvcnRFbnVtOgpJTVBPUlRfQkFSOlwKHmRlZmF1bHRfc3Ry",
-            "aW5nX3BpZWNlX2V4dGVuc2lvbhIrLnByb3RvYnVmX3VuaXR0ZXN0X3Byb3Rv",
-            "Mi5UZXN0QWxsRXh0ZW5zaW9ucxhUIAEoCToDYWJjQgIIAjpUChZkZWZhdWx0",
-            "X2NvcmRfZXh0ZW5zaW9uEisucHJvdG9idWZfdW5pdHRlc3RfcHJvdG8yLlRl",
-            "c3RBbGxFeHRlbnNpb25zGFUgASgJOgMxMjNCAggBOksKFm9uZW9mX3VpbnQz",
-            "Ml9leHRlbnNpb24SKy5wcm90b2J1Zl91bml0dGVzdF9wcm90bzIuVGVzdEFs",
-            "bEV4dGVuc2lvbnMYbyABKA06iQEKHm9uZW9mX25lc3RlZF9tZXNzYWdlX2V4",
-            "dGVuc2lvbhIrLnByb3RvYnVmX3VuaXR0ZXN0X3Byb3RvMi5UZXN0QWxsRXh0",
-            "ZW5zaW9ucxhwIAEoCzI0LnByb3RvYnVmX3VuaXR0ZXN0X3Byb3RvMi5UZXN0",
-            "QWxsVHlwZXMuTmVzdGVkTWVzc2FnZTpLChZvbmVvZl9zdHJpbmdfZXh0ZW5z",
-            "aW9uEisucHJvdG9idWZfdW5pdHRlc3RfcHJvdG8yLlRlc3RBbGxFeHRlbnNp",
-            "b25zGHEgASgJOkoKFW9uZW9mX2J5dGVzX2V4dGVuc2lvbhIrLnByb3RvYnVm",
-            "X3VuaXR0ZXN0X3Byb3RvMi5UZXN0QWxsRXh0ZW5zaW9ucxhyIAEoDDpJChNt",
-            "eV9leHRlbnNpb25fc3RyaW5nEiwucHJvdG9idWZfdW5pdHRlc3RfcHJvdG8y",
-            "LlRlc3RGaWVsZE9yZGVyaW5ncxgyIAEoCTpGChBteV9leHRlbnNpb25faW50",
-            "EiwucHJvdG9idWZfdW5pdHRlc3RfcHJvdG8yLlRlc3RGaWVsZE9yZGVyaW5n",
-            "cxgFIAEoBTpSChZwYWNrZWRfaW50MzJfZXh0ZW5zaW9uEi4ucHJvdG9idWZf",
-            "dW5pdHRlc3RfcHJvdG8yLlRlc3RQYWNrZWRFeHRlbnNpb25zGFogAygFQgIQ",
-            "ATpSChZwYWNrZWRfaW50NjRfZXh0ZW5zaW9uEi4ucHJvdG9idWZfdW5pdHRl",
-            "c3RfcHJvdG8yLlRlc3RQYWNrZWRFeHRlbnNpb25zGFsgAygDQgIQATpTChdw",
-            "YWNrZWRfdWludDMyX2V4dGVuc2lvbhIuLnByb3RvYnVmX3VuaXR0ZXN0X3By",
-            "b3RvMi5UZXN0UGFja2VkRXh0ZW5zaW9ucxhcIAMoDUICEAE6UwoXcGFja2Vk",
-            "X3VpbnQ2NF9leHRlbnNpb24SLi5wcm90b2J1Zl91bml0dGVzdF9wcm90bzIu",
-            "VGVzdFBhY2tlZEV4dGVuc2lvbnMYXSADKARCAhABOlMKF3BhY2tlZF9zaW50",
-            "MzJfZXh0ZW5zaW9uEi4ucHJvdG9idWZfdW5pdHRlc3RfcHJvdG8yLlRlc3RQ",
-            "YWNrZWRFeHRlbnNpb25zGF4gAygRQgIQATpTChdwYWNrZWRfc2ludDY0X2V4",
-            "dGVuc2lvbhIuLnByb3RvYnVmX3VuaXR0ZXN0X3Byb3RvMi5UZXN0UGFja2Vk",
-            "RXh0ZW5zaW9ucxhfIAMoEkICEAE6VAoYcGFja2VkX2ZpeGVkMzJfZXh0ZW5z",
-            "aW9uEi4ucHJvdG9idWZfdW5pdHRlc3RfcHJvdG8yLlRlc3RQYWNrZWRFeHRl",
-            "bnNpb25zGGAgAygHQgIQATpUChhwYWNrZWRfZml4ZWQ2NF9leHRlbnNpb24S",
-            "Li5wcm90b2J1Zl91bml0dGVzdF9wcm90bzIuVGVzdFBhY2tlZEV4dGVuc2lv",
-            "bnMYYSADKAZCAhABOlUKGXBhY2tlZF9zZml4ZWQzMl9leHRlbnNpb24SLi5w",
-            "cm90b2J1Zl91bml0dGVzdF9wcm90bzIuVGVzdFBhY2tlZEV4dGVuc2lvbnMY",
-            "YiADKA9CAhABOlUKGXBhY2tlZF9zZml4ZWQ2NF9leHRlbnNpb24SLi5wcm90",
-            "b2J1Zl91bml0dGVzdF9wcm90bzIuVGVzdFBhY2tlZEV4dGVuc2lvbnMYYyAD",
-            "KBBCAhABOlIKFnBhY2tlZF9mbG9hdF9leHRlbnNpb24SLi5wcm90b2J1Zl91",
-            "bml0dGVzdF9wcm90bzIuVGVzdFBhY2tlZEV4dGVuc2lvbnMYZCADKAJCAhAB",
-            "OlMKF3BhY2tlZF9kb3VibGVfZXh0ZW5zaW9uEi4ucHJvdG9idWZfdW5pdHRl",
-            "c3RfcHJvdG8yLlRlc3RQYWNrZWRFeHRlbnNpb25zGGUgAygBQgIQATpRChVw",
-            "YWNrZWRfYm9vbF9leHRlbnNpb24SLi5wcm90b2J1Zl91bml0dGVzdF9wcm90",
-            "bzIuVGVzdFBhY2tlZEV4dGVuc2lvbnMYZiADKAhCAhABOngKFXBhY2tlZF9l",
-            "bnVtX2V4dGVuc2lvbhIuLnByb3RvYnVmX3VuaXR0ZXN0X3Byb3RvMi5UZXN0",
-            "UGFja2VkRXh0ZW5zaW9ucxhnIAMoDjIlLnByb3RvYnVmX3VuaXR0ZXN0X3By",
-            "b3RvMi5Gb3JlaWduRW51bUICEAE6VgoYdW5wYWNrZWRfaW50MzJfZXh0ZW5z",
-            "aW9uEjAucHJvdG9idWZfdW5pdHRlc3RfcHJvdG8yLlRlc3RVbnBhY2tlZEV4",
-            "dGVuc2lvbnMYWiADKAVCAhAAOlYKGHVucGFja2VkX2ludDY0X2V4dGVuc2lv",
-            "bhIwLnByb3RvYnVmX3VuaXR0ZXN0X3Byb3RvMi5UZXN0VW5wYWNrZWRFeHRl",
-            "bnNpb25zGFsgAygDQgIQADpXChl1bnBhY2tlZF91aW50MzJfZXh0ZW5zaW9u",
-            "EjAucHJvdG9idWZfdW5pdHRlc3RfcHJvdG8yLlRlc3RVbnBhY2tlZEV4dGVu",
-            "c2lvbnMYXCADKA1CAhAAOlcKGXVucGFja2VkX3VpbnQ2NF9leHRlbnNpb24S",
-            "MC5wcm90b2J1Zl91bml0dGVzdF9wcm90bzIuVGVzdFVucGFja2VkRXh0ZW5z",
-            "aW9ucxhdIAMoBEICEAA6VwoZdW5wYWNrZWRfc2ludDMyX2V4dGVuc2lvbhIw",
-            "LnByb3RvYnVmX3VuaXR0ZXN0X3Byb3RvMi5UZXN0VW5wYWNrZWRFeHRlbnNp",
-            "b25zGF4gAygRQgIQADpXChl1bnBhY2tlZF9zaW50NjRfZXh0ZW5zaW9uEjAu",
-            "cHJvdG9idWZfdW5pdHRlc3RfcHJvdG8yLlRlc3RVbnBhY2tlZEV4dGVuc2lv",
-            "bnMYXyADKBJCAhAAOlgKGnVucGFja2VkX2ZpeGVkMzJfZXh0ZW5zaW9uEjAu",
-            "cHJvdG9idWZfdW5pdHRlc3RfcHJvdG8yLlRlc3RVbnBhY2tlZEV4dGVuc2lv",
-            "bnMYYCADKAdCAhAAOlgKGnVucGFja2VkX2ZpeGVkNjRfZXh0ZW5zaW9uEjAu",
-            "cHJvdG9idWZfdW5pdHRlc3RfcHJvdG8yLlRlc3RVbnBhY2tlZEV4dGVuc2lv",
-            "bnMYYSADKAZCAhAAOlkKG3VucGFja2VkX3NmaXhlZDMyX2V4dGVuc2lvbhIw",
-            "LnByb3RvYnVmX3VuaXR0ZXN0X3Byb3RvMi5UZXN0VW5wYWNrZWRFeHRlbnNp",
-            "b25zGGIgAygPQgIQADpZCht1bnBhY2tlZF9zZml4ZWQ2NF9leHRlbnNpb24S",
-            "MC5wcm90b2J1Zl91bml0dGVzdF9wcm90bzIuVGVzdFVucGFja2VkRXh0ZW5z",
-            "aW9ucxhjIAMoEEICEAA6VgoYdW5wYWNrZWRfZmxvYXRfZXh0ZW5zaW9uEjAu",
-            "cHJvdG9idWZfdW5pdHRlc3RfcHJvdG8yLlRlc3RVbnBhY2tlZEV4dGVuc2lv",
-            "bnMYZCADKAJCAhAAOlcKGXVucGFja2VkX2RvdWJsZV9leHRlbnNpb24SMC5w",
-            "cm90b2J1Zl91bml0dGVzdF9wcm90bzIuVGVzdFVucGFja2VkRXh0ZW5zaW9u",
-            "cxhlIAMoAUICEAA6VQoXdW5wYWNrZWRfYm9vbF9leHRlbnNpb24SMC5wcm90",
-            "b2J1Zl91bml0dGVzdF9wcm90bzIuVGVzdFVucGFja2VkRXh0ZW5zaW9ucxhm",
-            "IAMoCEICEAA6fAoXdW5wYWNrZWRfZW51bV9leHRlbnNpb24SMC5wcm90b2J1",
-            "Zl91bml0dGVzdF9wcm90bzIuVGVzdFVucGFja2VkRXh0ZW5zaW9ucxhnIAMo",
-            "DjIlLnByb3RvYnVmX3VuaXR0ZXN0X3Byb3RvMi5Gb3JlaWduRW51bUICEAA6",
-            "cgoOdGVzdF9hbGxfdHlwZXMSLi5wcm90b2J1Zl91bml0dGVzdF9wcm90bzIu",
-            "VGVzdEh1Z2VGaWVsZE51bWJlcnMY4Kr//wEgASgLMiYucHJvdG9idWZfdW5p",
-            "dHRlc3RfcHJvdG8yLlRlc3RBbGxUeXBlczphCiV0ZXN0X2V4dGVuc2lvbl9p",
-            "bnNpZGVfdGFibGVfZXh0ZW5zaW9uEjIucHJvdG9idWZfdW5pdHRlc3RfcHJv",
-            "dG8yLlRlc3RFeHRlbnNpb25JbnNpZGVUYWJsZRgFIAEoBUIySAGAAQGIAQGQ",
-            "AQH4AQGqAiFHb29nbGUuUHJvdG9idWYuVGVzdFByb3Rvcy5Qcm90bzI="));
-      descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-          new pbr::FileDescriptor[] { global::Google.Protobuf.TestProtos.Proto2.UnittestImportReflection.Descriptor, },
-          new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Google.Protobuf.TestProtos.Proto2.ForeignEnum), typeof(global::Google.Protobuf.TestProtos.Proto2.TestEnumWithDupValue), typeof(global::Google.Protobuf.TestProtos.Proto2.TestSparseEnum), typeof(global::Google.Protobuf.TestProtos.Proto2.VeryLargeEnum), }, new pb::Extension[] { UnittestExtensions.OptionalInt32Extension, UnittestExtensions.OptionalInt64Extension, UnittestExtensions.OptionalUint32Extension, UnittestExtensions.OptionalUint64Extension, UnittestExtensions.OptionalSint32Extension, UnittestExtensions.OptionalSint64Extension, UnittestExtensions.OptionalFixed32Extension, UnittestExtensions.OptionalFixed64Extension, UnittestExtensions.OptionalSfixed32Extension, UnittestExtensions.OptionalSfixed64Extension, UnittestExtensions.OptionalFloatExtension, UnittestExtensions.OptionalDoubleExtension, UnittestExtensions.OptionalBoolExtension, UnittestExtensions.OptionalStringExtension, UnittestExtensions.OptionalBytesExtension, UnittestExtensions.OptionalGroupExtension, UnittestExtensions.OptionalNestedMessageExtension, UnittestExtensions.OptionalForeignMessageExtension, UnittestExtensions.OptionalImportMessageExtension, UnittestExtensions.OptionalNestedEnumExtension, UnittestExtensions.OptionalForeignEnumExtension, UnittestExtensions.OptionalImportEnumExtension, UnittestExtensions.OptionalStringPieceExtension, UnittestExtensions.OptionalCordExtension, UnittestExtensions.OptionalPublicImportMessageExtension, UnittestExtensions.OptionalLazyMessageExtension, UnittestExtensions.RepeatedInt32Extension, UnittestExtensions.RepeatedInt64Extension, UnittestExtensions.RepeatedUint32Extension, UnittestExtensions.RepeatedUint64Extension, UnittestExtensions.RepeatedSint32Extension, UnittestExtensions.RepeatedSint64Extension, UnittestExtensions.RepeatedFixed32Extension, UnittestExtensions.RepeatedFixed64Extension, UnittestExtensions.RepeatedSfixed32Extension, UnittestExtensions.RepeatedSfixed64Extension, UnittestExtensions.RepeatedFloatExtension, UnittestExtensions.RepeatedDoubleExtension, UnittestExtensions.RepeatedBoolExtension, UnittestExtensions.RepeatedStringExtension, UnittestExtensions.RepeatedBytesExtension, UnittestExtensions.RepeatedGroupExtension, UnittestExtensions.RepeatedNestedMessageExtension, UnittestExtensions.RepeatedForeignMessageExtension, UnittestExtensions.RepeatedImportMessageExtension, UnittestExtensions.RepeatedNestedEnumExtension, UnittestExtensions.RepeatedForeignEnumExtension, UnittestExtensions.RepeatedImportEnumExtension, UnittestExtensions.RepeatedStringPieceExtension, UnittestExtensions.RepeatedCordExtension, UnittestExtensions.RepeatedLazyMessageExtension, UnittestExtensions.DefaultInt32Extension, UnittestExtensions.DefaultInt64Extension, UnittestExtensions.DefaultUint32Extension, UnittestExtensions.DefaultUint64Extension, UnittestExtensions.DefaultSint32Extension, UnittestExtensions.DefaultSint64Extension, UnittestExtensions.DefaultFixed32Extension, UnittestExtensions.DefaultFixed64Extension, UnittestExtensions.DefaultSfixed32Extension, UnittestExtensions.DefaultSfixed64Extension, UnittestExtensions.DefaultFloatExtension, UnittestExtensions.DefaultDoubleExtension, UnittestExtensions.DefaultBoolExtension, UnittestExtensions.DefaultStringExtension, UnittestExtensions.DefaultBytesExtension, UnittestExtensions.DefaultNestedEnumExtension, UnittestExtensions.DefaultForeignEnumExtension, UnittestExtensions.DefaultImportEnumExtension, UnittestExtensions.DefaultStringPieceExtension, UnittestExtensions.DefaultCordExtension, UnittestExtensions.OneofUint32Extension, UnittestExtensions.OneofNestedMessageExtension, UnittestExtensions.OneofStringExtension, UnittestExtensions.OneofBytesExtension, UnittestExtensions.MyExtensionString, UnittestExtensions.MyExtensionInt, UnittestExtensions.PackedInt32Extension, UnittestExtensions.PackedInt64Extension, UnittestExtensions.PackedUint32Extension, UnittestExtensions.PackedUint64Extension, UnittestExtensions.PackedSint32Extension, UnittestExtensions.PackedSint64Extension, UnittestExtensions.PackedFixed32Extension, UnittestExtensions.PackedFixed64Extension, UnittestExtensions.PackedSfixed32Extension, UnittestExtensions.PackedSfixed64Extension, UnittestExtensions.PackedFloatExtension, UnittestExtensions.PackedDoubleExtension, UnittestExtensions.PackedBoolExtension, UnittestExtensions.PackedEnumExtension, UnittestExtensions.UnpackedInt32Extension, UnittestExtensions.UnpackedInt64Extension, UnittestExtensions.UnpackedUint32Extension, UnittestExtensions.UnpackedUint64Extension, UnittestExtensions.UnpackedSint32Extension, UnittestExtensions.UnpackedSint64Extension, UnittestExtensions.UnpackedFixed32Extension, UnittestExtensions.UnpackedFixed64Extension, UnittestExtensions.UnpackedSfixed32Extension, UnittestExtensions.UnpackedSfixed64Extension, UnittestExtensions.UnpackedFloatExtension, UnittestExtensions.UnpackedDoubleExtension, UnittestExtensions.UnpackedBoolExtension, UnittestExtensions.UnpackedEnumExtension, UnittestExtensions.TestAllTypes, UnittestExtensions.TestExtensionInsideTableExtension }, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.Proto2.TestAllTypes), global::Google.Protobuf.TestProtos.Proto2.TestAllTypes.Parser, new[]{ "OptionalInt32", "OptionalInt64", "OptionalUint32", "OptionalUint64", "OptionalSint32", "OptionalSint64", "OptionalFixed32", "OptionalFixed64", "OptionalSfixed32", "OptionalSfixed64", "OptionalFloat", "OptionalDouble", "OptionalBool", "OptionalString", "OptionalBytes", "OptionalGroup", "OptionalNestedMessage", "OptionalForeignMessage", "OptionalImportMessage", "OptionalNestedEnum", "OptionalForeignEnum", "OptionalImportEnum", "OptionalStringPiece", "OptionalCord", "OptionalPublicImportMessage", "OptionalLazyMessage", "RepeatedInt32", "RepeatedInt64", "RepeatedUint32", "RepeatedUint64", "RepeatedSint32", "RepeatedSint64", "RepeatedFixed32", "RepeatedFixed64", "RepeatedSfixed32", "RepeatedSfixed64", "RepeatedFloat", "RepeatedDouble", "RepeatedBool", "RepeatedString", "RepeatedBytes", "RepeatedGroup", "RepeatedNestedMessage", "RepeatedForeignMessage", "RepeatedImportMessage", "RepeatedNestedEnum", "RepeatedForeignEnum", "RepeatedImportEnum", "RepeatedStringPiece", "RepeatedCord", "RepeatedLazyMessage", "DefaultInt32", "DefaultInt64", "DefaultUint32", "DefaultUint64", "DefaultSint32", "DefaultSint64", "DefaultFixed32", "DefaultFixed64", "DefaultSfixed32", "DefaultSfixed64", "DefaultFloat", "DefaultDouble", "DefaultBool", "DefaultString", "DefaultBytes", "DefaultNestedEnum", "DefaultForeignEnum", "DefaultImportEnum", "DefaultStringPiece", "DefaultCord", "OneofUint32", "OneofNestedMessage", "OneofString", "OneofBytes" }, new[]{ "OneofField" }, new[]{ typeof(global::Google.Protobuf.TestProtos.Proto2.TestAllTypes.Types.NestedEnum) }, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.Proto2.TestAllTypes.Types.NestedMessage), global::Google.Protobuf.TestProtos.Proto2.TestAllTypes.Types.NestedMessage.Parser, new[]{ "Bb" }, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.Proto2.TestAllTypes.Types.OptionalGroup), global::Google.Protobuf.TestProtos.Proto2.TestAllTypes.Types.OptionalGroup.Parser, new[]{ "A" }, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.Proto2.TestAllTypes.Types.RepeatedGroup), global::Google.Protobuf.TestProtos.Proto2.TestAllTypes.Types.RepeatedGroup.Parser, new[]{ "A" }, null, null, null, null)}),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.Proto2.NestedTestAllTypes), global::Google.Protobuf.TestProtos.Proto2.NestedTestAllTypes.Parser, new[]{ "Child", "Payload", "RepeatedChild" }, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.Proto2.TestDeprecatedFields), global::Google.Protobuf.TestProtos.Proto2.TestDeprecatedFields.Parser, new[]{ "DeprecatedInt32", "DeprecatedInt32InOneof" }, new[]{ "OneofFields" }, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.Proto2.TestDeprecatedMessage), global::Google.Protobuf.TestProtos.Proto2.TestDeprecatedMessage.Parser, null, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.Proto2.ForeignMessage), global::Google.Protobuf.TestProtos.Proto2.ForeignMessage.Parser, new[]{ "C", "D" }, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.Proto2.TestReservedFields), global::Google.Protobuf.TestProtos.Proto2.TestReservedFields.Parser, null, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions), global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions.Parser, null, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.Proto2.OptionalGroup_extension), global::Google.Protobuf.TestProtos.Proto2.OptionalGroup_extension.Parser, new[]{ "A" }, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.Proto2.RepeatedGroup_extension), global::Google.Protobuf.TestProtos.Proto2.RepeatedGroup_extension.Parser, new[]{ "A" }, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.Proto2.TestGroup), global::Google.Protobuf.TestProtos.Proto2.TestGroup.Parser, new[]{ "OptionalGroup", "OptionalForeignEnum" }, null, null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.Proto2.TestGroup.Types.OptionalGroup), global::Google.Protobuf.TestProtos.Proto2.TestGroup.Types.OptionalGroup.Parser, new[]{ "A" }, null, null, null, null)}),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.Proto2.TestGroupExtension), global::Google.Protobuf.TestProtos.Proto2.TestGroupExtension.Parser, null, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.Proto2.TestNestedExtension), global::Google.Protobuf.TestProtos.Proto2.TestNestedExtension.Parser, null, null, null, new pb::Extension[] { global::Google.Protobuf.TestProtos.Proto2.TestNestedExtension.Extensions.Test, global::Google.Protobuf.TestProtos.Proto2.TestNestedExtension.Extensions.NestedStringExtension, global::Google.Protobuf.TestProtos.Proto2.TestNestedExtension.Extensions.OptionalGroupExtension, global::Google.Protobuf.TestProtos.Proto2.TestNestedExtension.Extensions.OptionalForeignEnumExtension }, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.Proto2.TestNestedExtension.Types.OptionalGroup_extension), global::Google.Protobuf.TestProtos.Proto2.TestNestedExtension.Types.OptionalGroup_extension.Parser, new[]{ "A" }, null, null, null, null)}),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.Proto2.TestRequired), global::Google.Protobuf.TestProtos.Proto2.TestRequired.Parser, new[]{ "A", "Dummy2", "B", "Dummy4", "Dummy5", "Dummy6", "Dummy7", "Dummy8", "Dummy9", "Dummy10", "Dummy11", "Dummy12", "Dummy13", "Dummy14", "Dummy15", "Dummy16", "Dummy17", "Dummy18", "Dummy19", "Dummy20", "Dummy21", "Dummy22", "Dummy23", "Dummy24", "Dummy25", "Dummy26", "Dummy27", "Dummy28", "Dummy29", "Dummy30", "Dummy31", "Dummy32", "C" }, null, null, new pb::Extension[] { global::Google.Protobuf.TestProtos.Proto2.TestRequired.Extensions.Single, global::Google.Protobuf.TestProtos.Proto2.TestRequired.Extensions.Multi }, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.Proto2.TestRequiredForeign), global::Google.Protobuf.TestProtos.Proto2.TestRequiredForeign.Parser, new[]{ "OptionalMessage", "RepeatedMessage", "Dummy" }, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.Proto2.TestRequiredMessage), global::Google.Protobuf.TestProtos.Proto2.TestRequiredMessage.Parser, new[]{ "OptionalMessage", "RepeatedMessage", "RequiredMessage" }, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.Proto2.TestForeignNested), global::Google.Protobuf.TestProtos.Proto2.TestForeignNested.Parser, new[]{ "ForeignNested" }, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.Proto2.TestEmptyMessage), global::Google.Protobuf.TestProtos.Proto2.TestEmptyMessage.Parser, null, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.Proto2.TestEmptyMessageWithExtensions), global::Google.Protobuf.TestProtos.Proto2.TestEmptyMessageWithExtensions.Parser, null, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.Proto2.TestMultipleExtensionRanges), global::Google.Protobuf.TestProtos.Proto2.TestMultipleExtensionRanges.Parser, null, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.Proto2.TestReallyLargeTagNumber), global::Google.Protobuf.TestProtos.Proto2.TestReallyLargeTagNumber.Parser, new[]{ "A", "Bb" }, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.Proto2.TestRecursiveMessage), global::Google.Protobuf.TestProtos.Proto2.TestRecursiveMessage.Parser, new[]{ "A", "I" }, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.Proto2.TestMutualRecursionA), global::Google.Protobuf.TestProtos.Proto2.TestMutualRecursionA.Parser, new[]{ "Bb", "SubGroup" }, null, null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.Proto2.TestMutualRecursionA.Types.SubMessage), global::Google.Protobuf.TestProtos.Proto2.TestMutualRecursionA.Types.SubMessage.Parser, new[]{ "B" }, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.Proto2.TestMutualRecursionA.Types.SubGroup), global::Google.Protobuf.TestProtos.Proto2.TestMutualRecursionA.Types.SubGroup.Parser, new[]{ "SubMessage", "NotInThisScc" }, null, null, null, null)}),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.Proto2.TestMutualRecursionB), global::Google.Protobuf.TestProtos.Proto2.TestMutualRecursionB.Parser, new[]{ "A", "OptionalInt32" }, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.Proto2.TestIsInitialized), global::Google.Protobuf.TestProtos.Proto2.TestIsInitialized.Parser, new[]{ "SubMessage" }, null, null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.Proto2.TestIsInitialized.Types.SubMessage), global::Google.Protobuf.TestProtos.Proto2.TestIsInitialized.Types.SubMessage.Parser, new[]{ "SubGroup" }, null, null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.Proto2.TestIsInitialized.Types.SubMessage.Types.SubGroup), global::Google.Protobuf.TestProtos.Proto2.TestIsInitialized.Types.SubMessage.Types.SubGroup.Parser, new[]{ "I" }, null, null, null, null)})}),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.Proto2.TestDupFieldNumber), global::Google.Protobuf.TestProtos.Proto2.TestDupFieldNumber.Parser, new[]{ "A", "Foo", "Bar" }, null, null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.Proto2.TestDupFieldNumber.Types.Foo), global::Google.Protobuf.TestProtos.Proto2.TestDupFieldNumber.Types.Foo.Parser, new[]{ "A" }, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.Proto2.TestDupFieldNumber.Types.Bar), global::Google.Protobuf.TestProtos.Proto2.TestDupFieldNumber.Types.Bar.Parser, new[]{ "A" }, null, null, null, null)}),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.Proto2.TestEagerMessage), global::Google.Protobuf.TestProtos.Proto2.TestEagerMessage.Parser, new[]{ "SubMessage" }, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.Proto2.TestLazyMessage), global::Google.Protobuf.TestProtos.Proto2.TestLazyMessage.Parser, new[]{ "SubMessage" }, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.Proto2.TestNestedMessageHasBits), global::Google.Protobuf.TestProtos.Proto2.TestNestedMessageHasBits.Parser, new[]{ "OptionalNestedMessage" }, null, null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.Proto2.TestNestedMessageHasBits.Types.NestedMessage), global::Google.Protobuf.TestProtos.Proto2.TestNestedMessageHasBits.Types.NestedMessage.Parser, new[]{ "NestedmessageRepeatedInt32", "NestedmessageRepeatedForeignmessage" }, null, null, null, null)}),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.Proto2.TestCamelCaseFieldNames), global::Google.Protobuf.TestProtos.Proto2.TestCamelCaseFieldNames.Parser, new[]{ "PrimitiveField", "StringField", "EnumField", "MessageField", "StringPieceField", "CordField", "RepeatedPrimitiveField", "RepeatedStringField", "RepeatedEnumField", "RepeatedMessageField", "RepeatedStringPieceField", "RepeatedCordField" }, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.Proto2.TestFieldOrderings), global::Google.Protobuf.TestProtos.Proto2.TestFieldOrderings.Parser, new[]{ "MyString", "MyInt", "MyFloat", "OptionalNestedMessage" }, null, null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.Proto2.TestFieldOrderings.Types.NestedMessage), global::Google.Protobuf.TestProtos.Proto2.TestFieldOrderings.Types.NestedMessage.Parser, new[]{ "Oo", "Bb" }, null, null, null, null)}),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.Proto2.TestExtensionOrderings1), global::Google.Protobuf.TestProtos.Proto2.TestExtensionOrderings1.Parser, new[]{ "MyString" }, null, null, new pb::Extension[] { global::Google.Protobuf.TestProtos.Proto2.TestExtensionOrderings1.Extensions.TestExtOrderings1 }, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.Proto2.TestExtensionOrderings2), global::Google.Protobuf.TestProtos.Proto2.TestExtensionOrderings2.Parser, new[]{ "MyString" }, null, null, new pb::Extension[] { global::Google.Protobuf.TestProtos.Proto2.TestExtensionOrderings2.Extensions.TestExtOrderings2 }, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.Proto2.TestExtensionOrderings2.Types.TestExtensionOrderings3), global::Google.Protobuf.TestProtos.Proto2.TestExtensionOrderings2.Types.TestExtensionOrderings3.Parser, new[]{ "MyString" }, null, null, new pb::Extension[] { global::Google.Protobuf.TestProtos.Proto2.TestExtensionOrderings2.Types.TestExtensionOrderings3.Extensions.TestExtOrderings3 }, null)}),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.Proto2.TestExtremeDefaultValues), global::Google.Protobuf.TestProtos.Proto2.TestExtremeDefaultValues.Parser, new[]{ "EscapedBytes", "LargeUint32", "LargeUint64", "SmallInt32", "SmallInt64", "ReallySmallInt32", "ReallySmallInt64", "Utf8String", "ZeroFloat", "OneFloat", "SmallFloat", "NegativeOneFloat", "NegativeFloat", "LargeFloat", "SmallNegativeFloat", "InfDouble", "NegInfDouble", "NanDouble", "InfFloat", "NegInfFloat", "NanFloat", "CppTrigraph", "StringWithZero", "BytesWithZero", "StringPieceWithZero", "CordWithZero", "ReplacementString" }, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.Proto2.SparseEnumMessage), global::Google.Protobuf.TestProtos.Proto2.SparseEnumMessage.Parser, new[]{ "SparseEnum" }, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.Proto2.OneString), global::Google.Protobuf.TestProtos.Proto2.OneString.Parser, new[]{ "Data" }, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.Proto2.MoreString), global::Google.Protobuf.TestProtos.Proto2.MoreString.Parser, new[]{ "Data" }, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.Proto2.OneBytes), global::Google.Protobuf.TestProtos.Proto2.OneBytes.Parser, new[]{ "Data" }, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.Proto2.MoreBytes), global::Google.Protobuf.TestProtos.Proto2.MoreBytes.Parser, new[]{ "Data" }, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.Proto2.Int32Message), global::Google.Protobuf.TestProtos.Proto2.Int32Message.Parser, new[]{ "Data" }, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.Proto2.Uint32Message), global::Google.Protobuf.TestProtos.Proto2.Uint32Message.Parser, new[]{ "Data" }, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.Proto2.Int64Message), global::Google.Protobuf.TestProtos.Proto2.Int64Message.Parser, new[]{ "Data" }, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.Proto2.Uint64Message), global::Google.Protobuf.TestProtos.Proto2.Uint64Message.Parser, new[]{ "Data" }, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.Proto2.BoolMessage), global::Google.Protobuf.TestProtos.Proto2.BoolMessage.Parser, new[]{ "Data" }, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.Proto2.TestOneof), global::Google.Protobuf.TestProtos.Proto2.TestOneof.Parser, new[]{ "FooInt", "FooString", "FooMessage", "FooGroup" }, new[]{ "Foo" }, null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.Proto2.TestOneof.Types.FooGroup), global::Google.Protobuf.TestProtos.Proto2.TestOneof.Types.FooGroup.Parser, new[]{ "A", "B" }, null, null, null, null)}),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.Proto2.TestOneofBackwardsCompatible), global::Google.Protobuf.TestProtos.Proto2.TestOneofBackwardsCompatible.Parser, new[]{ "FooInt", "FooString", "FooMessage", "FooGroup" }, null, null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.Proto2.TestOneofBackwardsCompatible.Types.FooGroup), global::Google.Protobuf.TestProtos.Proto2.TestOneofBackwardsCompatible.Types.FooGroup.Parser, new[]{ "A", "B" }, null, null, null, null)}),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.Proto2.TestOneof2), global::Google.Protobuf.TestProtos.Proto2.TestOneof2.Parser, new[]{ "FooInt", "FooString", "FooCord", "FooStringPiece", "FooBytes", "FooEnum", "FooMessage", "FooGroup", "FooLazyMessage", "BarInt", "BarString", "BarCord", "BarStringPiece", "BarBytes", "BarEnum", "BazInt", "BazString" }, new[]{ "Foo", "Bar" }, new[]{ typeof(global::Google.Protobuf.TestProtos.Proto2.TestOneof2.Types.NestedEnum) }, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.Proto2.TestOneof2.Types.FooGroup), global::Google.Protobuf.TestProtos.Proto2.TestOneof2.Types.FooGroup.Parser, new[]{ "A", "B" }, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.Proto2.TestOneof2.Types.NestedMessage), global::Google.Protobuf.TestProtos.Proto2.TestOneof2.Types.NestedMessage.Parser, new[]{ "QuxInt", "CorgeInt" }, null, null, null, null)}),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.Proto2.TestRequiredOneof), global::Google.Protobuf.TestProtos.Proto2.TestRequiredOneof.Parser, new[]{ "FooInt", "FooString", "FooMessage" }, new[]{ "Foo" }, null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.Proto2.TestRequiredOneof.Types.NestedMessage), global::Google.Protobuf.TestProtos.Proto2.TestRequiredOneof.Types.NestedMessage.Parser, new[]{ "RequiredDouble" }, null, null, null, null)}),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.Proto2.TestRequiredMap), global::Google.Protobuf.TestProtos.Proto2.TestRequiredMap.Parser, new[]{ "Foo" }, null, null, null, new pbr::GeneratedClrTypeInfo[] { null, new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.Proto2.TestRequiredMap.Types.NestedMessage), global::Google.Protobuf.TestProtos.Proto2.TestRequiredMap.Types.NestedMessage.Parser, new[]{ "RequiredInt32" }, null, null, null, null)}),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.Proto2.TestPackedTypes), global::Google.Protobuf.TestProtos.Proto2.TestPackedTypes.Parser, new[]{ "PackedInt32", "PackedInt64", "PackedUint32", "PackedUint64", "PackedSint32", "PackedSint64", "PackedFixed32", "PackedFixed64", "PackedSfixed32", "PackedSfixed64", "PackedFloat", "PackedDouble", "PackedBool", "PackedEnum" }, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.Proto2.TestUnpackedTypes), global::Google.Protobuf.TestProtos.Proto2.TestUnpackedTypes.Parser, new[]{ "UnpackedInt32", "UnpackedInt64", "UnpackedUint32", "UnpackedUint64", "UnpackedSint32", "UnpackedSint64", "UnpackedFixed32", "UnpackedFixed64", "UnpackedSfixed32", "UnpackedSfixed64", "UnpackedFloat", "UnpackedDouble", "UnpackedBool", "UnpackedEnum" }, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.Proto2.TestPackedExtensions), global::Google.Protobuf.TestProtos.Proto2.TestPackedExtensions.Parser, null, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.Proto2.TestUnpackedExtensions), global::Google.Protobuf.TestProtos.Proto2.TestUnpackedExtensions.Parser, null, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.Proto2.TestDynamicExtensions), global::Google.Protobuf.TestProtos.Proto2.TestDynamicExtensions.Parser, new[]{ "ScalarExtension", "EnumExtension", "DynamicEnumExtension", "MessageExtension", "DynamicMessageExtension", "RepeatedExtension", "PackedExtension" }, null, new[]{ typeof(global::Google.Protobuf.TestProtos.Proto2.TestDynamicExtensions.Types.DynamicEnumType) }, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.Proto2.TestDynamicExtensions.Types.DynamicMessageType), global::Google.Protobuf.TestProtos.Proto2.TestDynamicExtensions.Types.DynamicMessageType.Parser, new[]{ "DynamicField" }, null, null, null, null)}),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.Proto2.TestRepeatedScalarDifferentTagSizes), global::Google.Protobuf.TestProtos.Proto2.TestRepeatedScalarDifferentTagSizes.Parser, new[]{ "RepeatedFixed32", "RepeatedInt32", "RepeatedFixed64", "RepeatedInt64", "RepeatedFloat", "RepeatedUint64" }, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.Proto2.TestParsingMerge), global::Google.Protobuf.TestProtos.Proto2.TestParsingMerge.Parser, new[]{ "RequiredAllTypes", "OptionalAllTypes", "RepeatedAllTypes", "OptionalGroup", "RepeatedGroup" }, null, null, new pb::Extension[] { global::Google.Protobuf.TestProtos.Proto2.TestParsingMerge.Extensions.OptionalExt, global::Google.Protobuf.TestProtos.Proto2.TestParsingMerge.Extensions.RepeatedExt }, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.Proto2.TestParsingMerge.Types.RepeatedFieldsGenerator), global::Google.Protobuf.TestProtos.Proto2.TestParsingMerge.Types.RepeatedFieldsGenerator.Parser, new[]{ "Field1", "Field2", "Field3", "Group1", "Group2", "Ext1", "Ext2" }, null, null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.Proto2.TestParsingMerge.Types.RepeatedFieldsGenerator.Types.Group1), global::Google.Protobuf.TestProtos.Proto2.TestParsingMerge.Types.RepeatedFieldsGenerator.Types.Group1.Parser, new[]{ "Field1" }, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.Proto2.TestParsingMerge.Types.RepeatedFieldsGenerator.Types.Group2), global::Google.Protobuf.TestProtos.Proto2.TestParsingMerge.Types.RepeatedFieldsGenerator.Types.Group2.Parser, new[]{ "Field1" }, null, null, null, null)}),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.Proto2.TestParsingMerge.Types.OptionalGroup), global::Google.Protobuf.TestProtos.Proto2.TestParsingMerge.Types.OptionalGroup.Parser, new[]{ "OptionalGroupAllTypes" }, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.Proto2.TestParsingMerge.Types.RepeatedGroup), global::Google.Protobuf.TestProtos.Proto2.TestParsingMerge.Types.RepeatedGroup.Parser, new[]{ "RepeatedGroupAllTypes" }, null, null, null, null)}),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.Proto2.TestCommentInjectionMessage), global::Google.Protobuf.TestProtos.Proto2.TestCommentInjectionMessage.Parser, new[]{ "A" }, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.Proto2.FooRequest), global::Google.Protobuf.TestProtos.Proto2.FooRequest.Parser, null, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.Proto2.FooResponse), global::Google.Protobuf.TestProtos.Proto2.FooResponse.Parser, null, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.Proto2.FooClientMessage), global::Google.Protobuf.TestProtos.Proto2.FooClientMessage.Parser, null, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.Proto2.FooServerMessage), global::Google.Protobuf.TestProtos.Proto2.FooServerMessage.Parser, null, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.Proto2.BarRequest), global::Google.Protobuf.TestProtos.Proto2.BarRequest.Parser, null, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.Proto2.BarResponse), global::Google.Protobuf.TestProtos.Proto2.BarResponse.Parser, null, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.Proto2.TestJsonName), global::Google.Protobuf.TestProtos.Proto2.TestJsonName.Parser, new[]{ "FieldName1", "FieldName2", "FieldName3", "FieldName4", "FIELDNAME5", "FieldName6" }, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.Proto2.TestHugeFieldNumbers), global::Google.Protobuf.TestProtos.Proto2.TestHugeFieldNumbers.Parser, new[]{ "OptionalInt32", "Fixed32", "RepeatedInt32", "PackedInt32", "OptionalEnum", "OptionalString", "OptionalBytes", "OptionalMessage", "OptionalGroup", "StringStringMap", "OneofUint32", "OneofTestAllTypes", "OneofString", "OneofBytes" }, new[]{ "OneofField" }, null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.Proto2.TestHugeFieldNumbers.Types.OptionalGroup), global::Google.Protobuf.TestProtos.Proto2.TestHugeFieldNumbers.Types.OptionalGroup.Parser, new[]{ "GroupA" }, null, null, null, null),
-            null, }),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.Proto2.TestExtensionInsideTable), global::Google.Protobuf.TestProtos.Proto2.TestExtensionInsideTable.Parser, new[]{ "Field1", "Field2", "Field3", "Field4", "Field6", "Field7", "Field8", "Field9", "Field10" }, null, null, null, null)
-          }));
-    }
-    #endregion
-
-  }
-  /// <summary>Holder for extension identifiers generated from the top level of unittest.proto</summary>
-  public static partial class UnittestExtensions {
-    /// <summary>
-    /// Singular
-    /// </summary>
-    public static readonly pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, int> OptionalInt32Extension =
-      new pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, int>(1, pb::FieldCodec.ForInt32(8, 0));
-    public static readonly pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, long> OptionalInt64Extension =
-      new pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, long>(2, pb::FieldCodec.ForInt64(16, 0L));
-    public static readonly pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, uint> OptionalUint32Extension =
-      new pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, uint>(3, pb::FieldCodec.ForUInt32(24, 0));
-    public static readonly pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, ulong> OptionalUint64Extension =
-      new pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, ulong>(4, pb::FieldCodec.ForUInt64(32, 0UL));
-    public static readonly pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, int> OptionalSint32Extension =
-      new pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, int>(5, pb::FieldCodec.ForSInt32(40, 0));
-    public static readonly pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, long> OptionalSint64Extension =
-      new pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, long>(6, pb::FieldCodec.ForSInt64(48, 0L));
-    public static readonly pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, uint> OptionalFixed32Extension =
-      new pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, uint>(7, pb::FieldCodec.ForFixed32(61, 0));
-    public static readonly pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, ulong> OptionalFixed64Extension =
-      new pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, ulong>(8, pb::FieldCodec.ForFixed64(65, 0UL));
-    public static readonly pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, int> OptionalSfixed32Extension =
-      new pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, int>(9, pb::FieldCodec.ForSFixed32(77, 0));
-    public static readonly pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, long> OptionalSfixed64Extension =
-      new pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, long>(10, pb::FieldCodec.ForSFixed64(81, 0L));
-    public static readonly pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, float> OptionalFloatExtension =
-      new pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, float>(11, pb::FieldCodec.ForFloat(93, 0F));
-    public static readonly pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, double> OptionalDoubleExtension =
-      new pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, double>(12, pb::FieldCodec.ForDouble(97, 0D));
-    public static readonly pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, bool> OptionalBoolExtension =
-      new pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, bool>(13, pb::FieldCodec.ForBool(104, false));
-    public static readonly pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, string> OptionalStringExtension =
-      new pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, string>(14, pb::FieldCodec.ForString(114, ""));
-    public static readonly pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, pb::ByteString> OptionalBytesExtension =
-      new pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, pb::ByteString>(15, pb::FieldCodec.ForBytes(122, pb::ByteString.Empty));
-    public static readonly pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, global::Google.Protobuf.TestProtos.Proto2.OptionalGroup_extension> OptionalGroupExtension =
-      new pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, global::Google.Protobuf.TestProtos.Proto2.OptionalGroup_extension>(16, pb::FieldCodec.ForGroup(131, 132, global::Google.Protobuf.TestProtos.Proto2.OptionalGroup_extension.Parser));
-    public static readonly pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, global::Google.Protobuf.TestProtos.Proto2.TestAllTypes.Types.NestedMessage> OptionalNestedMessageExtension =
-      new pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, global::Google.Protobuf.TestProtos.Proto2.TestAllTypes.Types.NestedMessage>(18, pb::FieldCodec.ForMessage(146, global::Google.Protobuf.TestProtos.Proto2.TestAllTypes.Types.NestedMessage.Parser));
-    public static readonly pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, global::Google.Protobuf.TestProtos.Proto2.ForeignMessage> OptionalForeignMessageExtension =
-      new pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, global::Google.Protobuf.TestProtos.Proto2.ForeignMessage>(19, pb::FieldCodec.ForMessage(154, global::Google.Protobuf.TestProtos.Proto2.ForeignMessage.Parser));
-    public static readonly pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, global::Google.Protobuf.TestProtos.Proto2.ImportMessage> OptionalImportMessageExtension =
-      new pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, global::Google.Protobuf.TestProtos.Proto2.ImportMessage>(20, pb::FieldCodec.ForMessage(162, global::Google.Protobuf.TestProtos.Proto2.ImportMessage.Parser));
-    public static readonly pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, global::Google.Protobuf.TestProtos.Proto2.TestAllTypes.Types.NestedEnum> OptionalNestedEnumExtension =
-      new pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, global::Google.Protobuf.TestProtos.Proto2.TestAllTypes.Types.NestedEnum>(21, pb::FieldCodec.ForEnum(168, x => (int) x, x => (global::Google.Protobuf.TestProtos.Proto2.TestAllTypes.Types.NestedEnum) x, global::Google.Protobuf.TestProtos.Proto2.TestAllTypes.Types.NestedEnum.Foo));
-    public static readonly pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, global::Google.Protobuf.TestProtos.Proto2.ForeignEnum> OptionalForeignEnumExtension =
-      new pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, global::Google.Protobuf.TestProtos.Proto2.ForeignEnum>(22, pb::FieldCodec.ForEnum(176, x => (int) x, x => (global::Google.Protobuf.TestProtos.Proto2.ForeignEnum) x, global::Google.Protobuf.TestProtos.Proto2.ForeignEnum.ForeignFoo));
-    public static readonly pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, global::Google.Protobuf.TestProtos.Proto2.ImportEnum> OptionalImportEnumExtension =
-      new pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, global::Google.Protobuf.TestProtos.Proto2.ImportEnum>(23, pb::FieldCodec.ForEnum(184, x => (int) x, x => (global::Google.Protobuf.TestProtos.Proto2.ImportEnum) x, global::Google.Protobuf.TestProtos.Proto2.ImportEnum.ImportFoo));
-    public static readonly pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, string> OptionalStringPieceExtension =
-      new pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, string>(24, pb::FieldCodec.ForString(194, ""));
-    public static readonly pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, string> OptionalCordExtension =
-      new pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, string>(25, pb::FieldCodec.ForString(202, ""));
-    public static readonly pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, global::Google.Protobuf.TestProtos.Proto2.PublicImportMessage> OptionalPublicImportMessageExtension =
-      new pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, global::Google.Protobuf.TestProtos.Proto2.PublicImportMessage>(26, pb::FieldCodec.ForMessage(210, global::Google.Protobuf.TestProtos.Proto2.PublicImportMessage.Parser));
-    public static readonly pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, global::Google.Protobuf.TestProtos.Proto2.TestAllTypes.Types.NestedMessage> OptionalLazyMessageExtension =
-      new pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, global::Google.Protobuf.TestProtos.Proto2.TestAllTypes.Types.NestedMessage>(27, pb::FieldCodec.ForMessage(218, global::Google.Protobuf.TestProtos.Proto2.TestAllTypes.Types.NestedMessage.Parser));
-    /// <summary>
-    /// Repeated
-    /// </summary>
-    public static readonly pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, int> RepeatedInt32Extension =
-      new pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, int>(31, pb::FieldCodec.ForInt32(248));
-    public static readonly pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, long> RepeatedInt64Extension =
-      new pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, long>(32, pb::FieldCodec.ForInt64(256));
-    public static readonly pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, uint> RepeatedUint32Extension =
-      new pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, uint>(33, pb::FieldCodec.ForUInt32(264));
-    public static readonly pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, ulong> RepeatedUint64Extension =
-      new pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, ulong>(34, pb::FieldCodec.ForUInt64(272));
-    public static readonly pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, int> RepeatedSint32Extension =
-      new pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, int>(35, pb::FieldCodec.ForSInt32(280));
-    public static readonly pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, long> RepeatedSint64Extension =
-      new pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, long>(36, pb::FieldCodec.ForSInt64(288));
-    public static readonly pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, uint> RepeatedFixed32Extension =
-      new pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, uint>(37, pb::FieldCodec.ForFixed32(301));
-    public static readonly pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, ulong> RepeatedFixed64Extension =
-      new pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, ulong>(38, pb::FieldCodec.ForFixed64(305));
-    public static readonly pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, int> RepeatedSfixed32Extension =
-      new pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, int>(39, pb::FieldCodec.ForSFixed32(317));
-    public static readonly pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, long> RepeatedSfixed64Extension =
-      new pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, long>(40, pb::FieldCodec.ForSFixed64(321));
-    public static readonly pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, float> RepeatedFloatExtension =
-      new pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, float>(41, pb::FieldCodec.ForFloat(333));
-    public static readonly pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, double> RepeatedDoubleExtension =
-      new pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, double>(42, pb::FieldCodec.ForDouble(337));
-    public static readonly pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, bool> RepeatedBoolExtension =
-      new pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, bool>(43, pb::FieldCodec.ForBool(344));
-    public static readonly pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, string> RepeatedStringExtension =
-      new pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, string>(44, pb::FieldCodec.ForString(354));
-    public static readonly pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, pb::ByteString> RepeatedBytesExtension =
-      new pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, pb::ByteString>(45, pb::FieldCodec.ForBytes(362));
-    public static readonly pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, global::Google.Protobuf.TestProtos.Proto2.RepeatedGroup_extension> RepeatedGroupExtension =
-      new pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, global::Google.Protobuf.TestProtos.Proto2.RepeatedGroup_extension>(46, pb::FieldCodec.ForGroup(371, 372, global::Google.Protobuf.TestProtos.Proto2.RepeatedGroup_extension.Parser));
-    public static readonly pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, global::Google.Protobuf.TestProtos.Proto2.TestAllTypes.Types.NestedMessage> RepeatedNestedMessageExtension =
-      new pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, global::Google.Protobuf.TestProtos.Proto2.TestAllTypes.Types.NestedMessage>(48, pb::FieldCodec.ForMessage(386, global::Google.Protobuf.TestProtos.Proto2.TestAllTypes.Types.NestedMessage.Parser));
-    public static readonly pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, global::Google.Protobuf.TestProtos.Proto2.ForeignMessage> RepeatedForeignMessageExtension =
-      new pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, global::Google.Protobuf.TestProtos.Proto2.ForeignMessage>(49, pb::FieldCodec.ForMessage(394, global::Google.Protobuf.TestProtos.Proto2.ForeignMessage.Parser));
-    public static readonly pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, global::Google.Protobuf.TestProtos.Proto2.ImportMessage> RepeatedImportMessageExtension =
-      new pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, global::Google.Protobuf.TestProtos.Proto2.ImportMessage>(50, pb::FieldCodec.ForMessage(402, global::Google.Protobuf.TestProtos.Proto2.ImportMessage.Parser));
-    public static readonly pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, global::Google.Protobuf.TestProtos.Proto2.TestAllTypes.Types.NestedEnum> RepeatedNestedEnumExtension =
-      new pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, global::Google.Protobuf.TestProtos.Proto2.TestAllTypes.Types.NestedEnum>(51, pb::FieldCodec.ForEnum(408, x => (int) x, x => (global::Google.Protobuf.TestProtos.Proto2.TestAllTypes.Types.NestedEnum) x));
-    public static readonly pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, global::Google.Protobuf.TestProtos.Proto2.ForeignEnum> RepeatedForeignEnumExtension =
-      new pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, global::Google.Protobuf.TestProtos.Proto2.ForeignEnum>(52, pb::FieldCodec.ForEnum(416, x => (int) x, x => (global::Google.Protobuf.TestProtos.Proto2.ForeignEnum) x));
-    public static readonly pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, global::Google.Protobuf.TestProtos.Proto2.ImportEnum> RepeatedImportEnumExtension =
-      new pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, global::Google.Protobuf.TestProtos.Proto2.ImportEnum>(53, pb::FieldCodec.ForEnum(424, x => (int) x, x => (global::Google.Protobuf.TestProtos.Proto2.ImportEnum) x));
-    public static readonly pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, string> RepeatedStringPieceExtension =
-      new pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, string>(54, pb::FieldCodec.ForString(434));
-    public static readonly pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, string> RepeatedCordExtension =
-      new pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, string>(55, pb::FieldCodec.ForString(442));
-    public static readonly pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, global::Google.Protobuf.TestProtos.Proto2.TestAllTypes.Types.NestedMessage> RepeatedLazyMessageExtension =
-      new pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, global::Google.Protobuf.TestProtos.Proto2.TestAllTypes.Types.NestedMessage>(57, pb::FieldCodec.ForMessage(458, global::Google.Protobuf.TestProtos.Proto2.TestAllTypes.Types.NestedMessage.Parser));
-    /// <summary>
-    /// Singular with defaults
-    /// </summary>
-    public static readonly pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, int> DefaultInt32Extension =
-      new pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, int>(61, pb::FieldCodec.ForInt32(488, 41));
-    public static readonly pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, long> DefaultInt64Extension =
-      new pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, long>(62, pb::FieldCodec.ForInt64(496, 42L));
-    public static readonly pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, uint> DefaultUint32Extension =
-      new pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, uint>(63, pb::FieldCodec.ForUInt32(504, 43));
-    public static readonly pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, ulong> DefaultUint64Extension =
-      new pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, ulong>(64, pb::FieldCodec.ForUInt64(512, 44UL));
-    public static readonly pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, int> DefaultSint32Extension =
-      new pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, int>(65, pb::FieldCodec.ForSInt32(520, -45));
-    public static readonly pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, long> DefaultSint64Extension =
-      new pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, long>(66, pb::FieldCodec.ForSInt64(528, 46L));
-    public static readonly pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, uint> DefaultFixed32Extension =
-      new pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, uint>(67, pb::FieldCodec.ForFixed32(541, 47));
-    public static readonly pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, ulong> DefaultFixed64Extension =
-      new pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, ulong>(68, pb::FieldCodec.ForFixed64(545, 48UL));
-    public static readonly pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, int> DefaultSfixed32Extension =
-      new pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, int>(69, pb::FieldCodec.ForSFixed32(557, 49));
-    public static readonly pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, long> DefaultSfixed64Extension =
-      new pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, long>(70, pb::FieldCodec.ForSFixed64(561, -50L));
-    public static readonly pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, float> DefaultFloatExtension =
-      new pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, float>(71, pb::FieldCodec.ForFloat(573, 51.5F));
-    public static readonly pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, double> DefaultDoubleExtension =
-      new pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, double>(72, pb::FieldCodec.ForDouble(577, 52000D));
-    public static readonly pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, bool> DefaultBoolExtension =
-      new pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, bool>(73, pb::FieldCodec.ForBool(584, true));
-    public static readonly pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, string> DefaultStringExtension =
-      new pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, string>(74, pb::FieldCodec.ForString(594, global::System.Text.Encoding.UTF8.GetString(global::System.Convert.FromBase64String("aGVsbG8="), 0, 5)));
-    public static readonly pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, pb::ByteString> DefaultBytesExtension =
-      new pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, pb::ByteString>(75, pb::FieldCodec.ForBytes(602, pb::ByteString.FromBase64("d29ybGQ=")));
-    public static readonly pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, global::Google.Protobuf.TestProtos.Proto2.TestAllTypes.Types.NestedEnum> DefaultNestedEnumExtension =
-      new pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, global::Google.Protobuf.TestProtos.Proto2.TestAllTypes.Types.NestedEnum>(81, pb::FieldCodec.ForEnum(648, x => (int) x, x => (global::Google.Protobuf.TestProtos.Proto2.TestAllTypes.Types.NestedEnum) x, global::Google.Protobuf.TestProtos.Proto2.TestAllTypes.Types.NestedEnum.Bar));
-    public static readonly pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, global::Google.Protobuf.TestProtos.Proto2.ForeignEnum> DefaultForeignEnumExtension =
-      new pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, global::Google.Protobuf.TestProtos.Proto2.ForeignEnum>(82, pb::FieldCodec.ForEnum(656, x => (int) x, x => (global::Google.Protobuf.TestProtos.Proto2.ForeignEnum) x, global::Google.Protobuf.TestProtos.Proto2.ForeignEnum.ForeignBar));
-    public static readonly pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, global::Google.Protobuf.TestProtos.Proto2.ImportEnum> DefaultImportEnumExtension =
-      new pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, global::Google.Protobuf.TestProtos.Proto2.ImportEnum>(83, pb::FieldCodec.ForEnum(664, x => (int) x, x => (global::Google.Protobuf.TestProtos.Proto2.ImportEnum) x, global::Google.Protobuf.TestProtos.Proto2.ImportEnum.ImportBar));
-    public static readonly pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, string> DefaultStringPieceExtension =
-      new pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, string>(84, pb::FieldCodec.ForString(674, global::System.Text.Encoding.UTF8.GetString(global::System.Convert.FromBase64String("YWJj"), 0, 3)));
-    public static readonly pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, string> DefaultCordExtension =
-      new pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, string>(85, pb::FieldCodec.ForString(682, global::System.Text.Encoding.UTF8.GetString(global::System.Convert.FromBase64String("MTIz"), 0, 3)));
-    /// <summary>
-    /// For oneof test
-    /// </summary>
-    public static readonly pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, uint> OneofUint32Extension =
-      new pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, uint>(111, pb::FieldCodec.ForUInt32(888, 0));
-    public static readonly pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, global::Google.Protobuf.TestProtos.Proto2.TestAllTypes.Types.NestedMessage> OneofNestedMessageExtension =
-      new pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, global::Google.Protobuf.TestProtos.Proto2.TestAllTypes.Types.NestedMessage>(112, pb::FieldCodec.ForMessage(898, global::Google.Protobuf.TestProtos.Proto2.TestAllTypes.Types.NestedMessage.Parser));
-    public static readonly pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, string> OneofStringExtension =
-      new pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, string>(113, pb::FieldCodec.ForString(906, ""));
-    public static readonly pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, pb::ByteString> OneofBytesExtension =
-      new pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, pb::ByteString>(114, pb::FieldCodec.ForBytes(914, pb::ByteString.Empty));
-    public static readonly pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestFieldOrderings, string> MyExtensionString =
-      new pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestFieldOrderings, string>(50, pb::FieldCodec.ForString(402, ""));
-    public static readonly pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestFieldOrderings, int> MyExtensionInt =
-      new pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestFieldOrderings, int>(5, pb::FieldCodec.ForInt32(40, 0));
-    public static readonly pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestPackedExtensions, int> PackedInt32Extension =
-      new pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestPackedExtensions, int>(90, pb::FieldCodec.ForInt32(722));
-    public static readonly pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestPackedExtensions, long> PackedInt64Extension =
-      new pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestPackedExtensions, long>(91, pb::FieldCodec.ForInt64(730));
-    public static readonly pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestPackedExtensions, uint> PackedUint32Extension =
-      new pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestPackedExtensions, uint>(92, pb::FieldCodec.ForUInt32(738));
-    public static readonly pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestPackedExtensions, ulong> PackedUint64Extension =
-      new pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestPackedExtensions, ulong>(93, pb::FieldCodec.ForUInt64(746));
-    public static readonly pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestPackedExtensions, int> PackedSint32Extension =
-      new pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestPackedExtensions, int>(94, pb::FieldCodec.ForSInt32(754));
-    public static readonly pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestPackedExtensions, long> PackedSint64Extension =
-      new pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestPackedExtensions, long>(95, pb::FieldCodec.ForSInt64(762));
-    public static readonly pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestPackedExtensions, uint> PackedFixed32Extension =
-      new pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestPackedExtensions, uint>(96, pb::FieldCodec.ForFixed32(770));
-    public static readonly pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestPackedExtensions, ulong> PackedFixed64Extension =
-      new pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestPackedExtensions, ulong>(97, pb::FieldCodec.ForFixed64(778));
-    public static readonly pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestPackedExtensions, int> PackedSfixed32Extension =
-      new pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestPackedExtensions, int>(98, pb::FieldCodec.ForSFixed32(786));
-    public static readonly pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestPackedExtensions, long> PackedSfixed64Extension =
-      new pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestPackedExtensions, long>(99, pb::FieldCodec.ForSFixed64(794));
-    public static readonly pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestPackedExtensions, float> PackedFloatExtension =
-      new pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestPackedExtensions, float>(100, pb::FieldCodec.ForFloat(802));
-    public static readonly pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestPackedExtensions, double> PackedDoubleExtension =
-      new pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestPackedExtensions, double>(101, pb::FieldCodec.ForDouble(810));
-    public static readonly pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestPackedExtensions, bool> PackedBoolExtension =
-      new pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestPackedExtensions, bool>(102, pb::FieldCodec.ForBool(818));
-    public static readonly pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestPackedExtensions, global::Google.Protobuf.TestProtos.Proto2.ForeignEnum> PackedEnumExtension =
-      new pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestPackedExtensions, global::Google.Protobuf.TestProtos.Proto2.ForeignEnum>(103, pb::FieldCodec.ForEnum(826, x => (int) x, x => (global::Google.Protobuf.TestProtos.Proto2.ForeignEnum) x));
-    public static readonly pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestUnpackedExtensions, int> UnpackedInt32Extension =
-      new pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestUnpackedExtensions, int>(90, pb::FieldCodec.ForInt32(720));
-    public static readonly pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestUnpackedExtensions, long> UnpackedInt64Extension =
-      new pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestUnpackedExtensions, long>(91, pb::FieldCodec.ForInt64(728));
-    public static readonly pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestUnpackedExtensions, uint> UnpackedUint32Extension =
-      new pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestUnpackedExtensions, uint>(92, pb::FieldCodec.ForUInt32(736));
-    public static readonly pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestUnpackedExtensions, ulong> UnpackedUint64Extension =
-      new pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestUnpackedExtensions, ulong>(93, pb::FieldCodec.ForUInt64(744));
-    public static readonly pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestUnpackedExtensions, int> UnpackedSint32Extension =
-      new pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestUnpackedExtensions, int>(94, pb::FieldCodec.ForSInt32(752));
-    public static readonly pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestUnpackedExtensions, long> UnpackedSint64Extension =
-      new pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestUnpackedExtensions, long>(95, pb::FieldCodec.ForSInt64(760));
-    public static readonly pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestUnpackedExtensions, uint> UnpackedFixed32Extension =
-      new pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestUnpackedExtensions, uint>(96, pb::FieldCodec.ForFixed32(773));
-    public static readonly pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestUnpackedExtensions, ulong> UnpackedFixed64Extension =
-      new pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestUnpackedExtensions, ulong>(97, pb::FieldCodec.ForFixed64(777));
-    public static readonly pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestUnpackedExtensions, int> UnpackedSfixed32Extension =
-      new pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestUnpackedExtensions, int>(98, pb::FieldCodec.ForSFixed32(789));
-    public static readonly pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestUnpackedExtensions, long> UnpackedSfixed64Extension =
-      new pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestUnpackedExtensions, long>(99, pb::FieldCodec.ForSFixed64(793));
-    public static readonly pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestUnpackedExtensions, float> UnpackedFloatExtension =
-      new pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestUnpackedExtensions, float>(100, pb::FieldCodec.ForFloat(805));
-    public static readonly pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestUnpackedExtensions, double> UnpackedDoubleExtension =
-      new pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestUnpackedExtensions, double>(101, pb::FieldCodec.ForDouble(809));
-    public static readonly pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestUnpackedExtensions, bool> UnpackedBoolExtension =
-      new pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestUnpackedExtensions, bool>(102, pb::FieldCodec.ForBool(816));
-    public static readonly pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestUnpackedExtensions, global::Google.Protobuf.TestProtos.Proto2.ForeignEnum> UnpackedEnumExtension =
-      new pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestUnpackedExtensions, global::Google.Protobuf.TestProtos.Proto2.ForeignEnum>(103, pb::FieldCodec.ForEnum(824, x => (int) x, x => (global::Google.Protobuf.TestProtos.Proto2.ForeignEnum) x));
-    public static readonly pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestHugeFieldNumbers, global::Google.Protobuf.TestProtos.Proto2.TestAllTypes> TestAllTypes =
-      new pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestHugeFieldNumbers, global::Google.Protobuf.TestProtos.Proto2.TestAllTypes>(536860000, pb::FieldCodec.ForMessage(4294880002, global::Google.Protobuf.TestProtos.Proto2.TestAllTypes.Parser));
-    public static readonly pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestExtensionInsideTable, int> TestExtensionInsideTableExtension =
-      new pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestExtensionInsideTable, int>(5, pb::FieldCodec.ForInt32(40, 0));
-  }
-
-  #region Enums
-  public enum ForeignEnum {
-    [pbr::OriginalName("FOREIGN_FOO")] ForeignFoo = 4,
-    [pbr::OriginalName("FOREIGN_BAR")] ForeignBar = 5,
-    [pbr::OriginalName("FOREIGN_BAZ")] ForeignBaz = 6,
-  }
-
-  /// <summary>
-  /// Test an enum that has multiple values with the same number.
-  /// </summary>
-  public enum TestEnumWithDupValue {
-    [pbr::OriginalName("FOO1")] Foo1 = 1,
-    [pbr::OriginalName("BAR1")] Bar1 = 2,
-    [pbr::OriginalName("BAZ")] Baz = 3,
-    [pbr::OriginalName("FOO2", PreferredAlias = false)] Foo2 = 1,
-    [pbr::OriginalName("BAR2", PreferredAlias = false)] Bar2 = 2,
-  }
-
-  /// <summary>
-  /// Test an enum with large, unordered values.
-  /// </summary>
-  public enum TestSparseEnum {
-    [pbr::OriginalName("SPARSE_A")] SparseA = 123,
-    [pbr::OriginalName("SPARSE_B")] SparseB = 62374,
-    [pbr::OriginalName("SPARSE_C")] SparseC = 12589234,
-    [pbr::OriginalName("SPARSE_D")] SparseD = -15,
-    [pbr::OriginalName("SPARSE_E")] SparseE = -53452,
-    [pbr::OriginalName("SPARSE_F")] SparseF = 0,
-    [pbr::OriginalName("SPARSE_G")] SparseG = 2,
-  }
-
-  public enum VeryLargeEnum {
-    [pbr::OriginalName("ENUM_LABEL_DEFAULT")] EnumLabelDefault = 0,
-    [pbr::OriginalName("ENUM_LABEL_1")] EnumLabel1 = 1,
-    [pbr::OriginalName("ENUM_LABEL_2")] EnumLabel2 = 2,
-    [pbr::OriginalName("ENUM_LABEL_3")] EnumLabel3 = 3,
-    [pbr::OriginalName("ENUM_LABEL_4")] EnumLabel4 = 4,
-    [pbr::OriginalName("ENUM_LABEL_5")] EnumLabel5 = 5,
-    [pbr::OriginalName("ENUM_LABEL_6")] EnumLabel6 = 6,
-    [pbr::OriginalName("ENUM_LABEL_7")] EnumLabel7 = 7,
-    [pbr::OriginalName("ENUM_LABEL_8")] EnumLabel8 = 8,
-    [pbr::OriginalName("ENUM_LABEL_9")] EnumLabel9 = 9,
-    [pbr::OriginalName("ENUM_LABEL_10")] EnumLabel10 = 10,
-    [pbr::OriginalName("ENUM_LABEL_11")] EnumLabel11 = 11,
-    [pbr::OriginalName("ENUM_LABEL_12")] EnumLabel12 = 12,
-    [pbr::OriginalName("ENUM_LABEL_13")] EnumLabel13 = 13,
-    [pbr::OriginalName("ENUM_LABEL_14")] EnumLabel14 = 14,
-    [pbr::OriginalName("ENUM_LABEL_15")] EnumLabel15 = 15,
-    [pbr::OriginalName("ENUM_LABEL_16")] EnumLabel16 = 16,
-    [pbr::OriginalName("ENUM_LABEL_17")] EnumLabel17 = 17,
-    [pbr::OriginalName("ENUM_LABEL_18")] EnumLabel18 = 18,
-    [pbr::OriginalName("ENUM_LABEL_19")] EnumLabel19 = 19,
-    [pbr::OriginalName("ENUM_LABEL_20")] EnumLabel20 = 20,
-    [pbr::OriginalName("ENUM_LABEL_21")] EnumLabel21 = 21,
-    [pbr::OriginalName("ENUM_LABEL_22")] EnumLabel22 = 22,
-    [pbr::OriginalName("ENUM_LABEL_23")] EnumLabel23 = 23,
-    [pbr::OriginalName("ENUM_LABEL_24")] EnumLabel24 = 24,
-    [pbr::OriginalName("ENUM_LABEL_25")] EnumLabel25 = 25,
-    [pbr::OriginalName("ENUM_LABEL_26")] EnumLabel26 = 26,
-    [pbr::OriginalName("ENUM_LABEL_27")] EnumLabel27 = 27,
-    [pbr::OriginalName("ENUM_LABEL_28")] EnumLabel28 = 28,
-    [pbr::OriginalName("ENUM_LABEL_29")] EnumLabel29 = 29,
-    [pbr::OriginalName("ENUM_LABEL_30")] EnumLabel30 = 30,
-    [pbr::OriginalName("ENUM_LABEL_31")] EnumLabel31 = 31,
-    [pbr::OriginalName("ENUM_LABEL_32")] EnumLabel32 = 32,
-    [pbr::OriginalName("ENUM_LABEL_33")] EnumLabel33 = 33,
-    [pbr::OriginalName("ENUM_LABEL_34")] EnumLabel34 = 34,
-    [pbr::OriginalName("ENUM_LABEL_35")] EnumLabel35 = 35,
-    [pbr::OriginalName("ENUM_LABEL_36")] EnumLabel36 = 36,
-    [pbr::OriginalName("ENUM_LABEL_37")] EnumLabel37 = 37,
-    [pbr::OriginalName("ENUM_LABEL_38")] EnumLabel38 = 38,
-    [pbr::OriginalName("ENUM_LABEL_39")] EnumLabel39 = 39,
-    [pbr::OriginalName("ENUM_LABEL_40")] EnumLabel40 = 40,
-    [pbr::OriginalName("ENUM_LABEL_41")] EnumLabel41 = 41,
-    [pbr::OriginalName("ENUM_LABEL_42")] EnumLabel42 = 42,
-    [pbr::OriginalName("ENUM_LABEL_43")] EnumLabel43 = 43,
-    [pbr::OriginalName("ENUM_LABEL_44")] EnumLabel44 = 44,
-    [pbr::OriginalName("ENUM_LABEL_45")] EnumLabel45 = 45,
-    [pbr::OriginalName("ENUM_LABEL_46")] EnumLabel46 = 46,
-    [pbr::OriginalName("ENUM_LABEL_47")] EnumLabel47 = 47,
-    [pbr::OriginalName("ENUM_LABEL_48")] EnumLabel48 = 48,
-    [pbr::OriginalName("ENUM_LABEL_49")] EnumLabel49 = 49,
-    [pbr::OriginalName("ENUM_LABEL_50")] EnumLabel50 = 50,
-    [pbr::OriginalName("ENUM_LABEL_51")] EnumLabel51 = 51,
-    [pbr::OriginalName("ENUM_LABEL_52")] EnumLabel52 = 52,
-    [pbr::OriginalName("ENUM_LABEL_53")] EnumLabel53 = 53,
-    [pbr::OriginalName("ENUM_LABEL_54")] EnumLabel54 = 54,
-    [pbr::OriginalName("ENUM_LABEL_55")] EnumLabel55 = 55,
-    [pbr::OriginalName("ENUM_LABEL_56")] EnumLabel56 = 56,
-    [pbr::OriginalName("ENUM_LABEL_57")] EnumLabel57 = 57,
-    [pbr::OriginalName("ENUM_LABEL_58")] EnumLabel58 = 58,
-    [pbr::OriginalName("ENUM_LABEL_59")] EnumLabel59 = 59,
-    [pbr::OriginalName("ENUM_LABEL_60")] EnumLabel60 = 60,
-    [pbr::OriginalName("ENUM_LABEL_61")] EnumLabel61 = 61,
-    [pbr::OriginalName("ENUM_LABEL_62")] EnumLabel62 = 62,
-    [pbr::OriginalName("ENUM_LABEL_63")] EnumLabel63 = 63,
-    [pbr::OriginalName("ENUM_LABEL_64")] EnumLabel64 = 64,
-    [pbr::OriginalName("ENUM_LABEL_65")] EnumLabel65 = 65,
-    [pbr::OriginalName("ENUM_LABEL_66")] EnumLabel66 = 66,
-    [pbr::OriginalName("ENUM_LABEL_67")] EnumLabel67 = 67,
-    [pbr::OriginalName("ENUM_LABEL_68")] EnumLabel68 = 68,
-    [pbr::OriginalName("ENUM_LABEL_69")] EnumLabel69 = 69,
-    [pbr::OriginalName("ENUM_LABEL_70")] EnumLabel70 = 70,
-    [pbr::OriginalName("ENUM_LABEL_71")] EnumLabel71 = 71,
-    [pbr::OriginalName("ENUM_LABEL_72")] EnumLabel72 = 72,
-    [pbr::OriginalName("ENUM_LABEL_73")] EnumLabel73 = 73,
-    [pbr::OriginalName("ENUM_LABEL_74")] EnumLabel74 = 74,
-    [pbr::OriginalName("ENUM_LABEL_75")] EnumLabel75 = 75,
-    [pbr::OriginalName("ENUM_LABEL_76")] EnumLabel76 = 76,
-    [pbr::OriginalName("ENUM_LABEL_77")] EnumLabel77 = 77,
-    [pbr::OriginalName("ENUM_LABEL_78")] EnumLabel78 = 78,
-    [pbr::OriginalName("ENUM_LABEL_79")] EnumLabel79 = 79,
-    [pbr::OriginalName("ENUM_LABEL_80")] EnumLabel80 = 80,
-    [pbr::OriginalName("ENUM_LABEL_81")] EnumLabel81 = 81,
-    [pbr::OriginalName("ENUM_LABEL_82")] EnumLabel82 = 82,
-    [pbr::OriginalName("ENUM_LABEL_83")] EnumLabel83 = 83,
-    [pbr::OriginalName("ENUM_LABEL_84")] EnumLabel84 = 84,
-    [pbr::OriginalName("ENUM_LABEL_85")] EnumLabel85 = 85,
-    [pbr::OriginalName("ENUM_LABEL_86")] EnumLabel86 = 86,
-    [pbr::OriginalName("ENUM_LABEL_87")] EnumLabel87 = 87,
-    [pbr::OriginalName("ENUM_LABEL_88")] EnumLabel88 = 88,
-    [pbr::OriginalName("ENUM_LABEL_89")] EnumLabel89 = 89,
-    [pbr::OriginalName("ENUM_LABEL_90")] EnumLabel90 = 90,
-    [pbr::OriginalName("ENUM_LABEL_91")] EnumLabel91 = 91,
-    [pbr::OriginalName("ENUM_LABEL_92")] EnumLabel92 = 92,
-    [pbr::OriginalName("ENUM_LABEL_93")] EnumLabel93 = 93,
-    [pbr::OriginalName("ENUM_LABEL_94")] EnumLabel94 = 94,
-    [pbr::OriginalName("ENUM_LABEL_95")] EnumLabel95 = 95,
-    [pbr::OriginalName("ENUM_LABEL_96")] EnumLabel96 = 96,
-    [pbr::OriginalName("ENUM_LABEL_97")] EnumLabel97 = 97,
-    [pbr::OriginalName("ENUM_LABEL_98")] EnumLabel98 = 98,
-    [pbr::OriginalName("ENUM_LABEL_99")] EnumLabel99 = 99,
-    [pbr::OriginalName("ENUM_LABEL_100")] EnumLabel100 = 100,
-  }
-
-  #endregion
-
-  #region Messages
-  /// <summary>
-  /// This proto includes every type of field in both singular and repeated
-  /// forms.
-  /// </summary>
-  public sealed partial class TestAllTypes : pb::IMessage<TestAllTypes>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<TestAllTypes> _parser = new pb::MessageParser<TestAllTypes>(() => new TestAllTypes());
-    private pb::UnknownFieldSet _unknownFields;
-    private int _hasBits0;
-    private int _hasBits1;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<TestAllTypes> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.Proto2.UnittestReflection.Descriptor.MessageTypes[0]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestAllTypes() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestAllTypes(TestAllTypes other) : this() {
-      _hasBits0 = other._hasBits0;
-      _hasBits1 = other._hasBits1;
-      optionalInt32_ = other.optionalInt32_;
-      optionalInt64_ = other.optionalInt64_;
-      optionalUint32_ = other.optionalUint32_;
-      optionalUint64_ = other.optionalUint64_;
-      optionalSint32_ = other.optionalSint32_;
-      optionalSint64_ = other.optionalSint64_;
-      optionalFixed32_ = other.optionalFixed32_;
-      optionalFixed64_ = other.optionalFixed64_;
-      optionalSfixed32_ = other.optionalSfixed32_;
-      optionalSfixed64_ = other.optionalSfixed64_;
-      optionalFloat_ = other.optionalFloat_;
-      optionalDouble_ = other.optionalDouble_;
-      optionalBool_ = other.optionalBool_;
-      optionalString_ = other.optionalString_;
-      optionalBytes_ = other.optionalBytes_;
-      optionalGroup_ = other.HasOptionalGroup ? other.optionalGroup_.Clone() : null;
-      optionalNestedMessage_ = other.optionalNestedMessage_ != null ? other.optionalNestedMessage_.Clone() : null;
-      optionalForeignMessage_ = other.optionalForeignMessage_ != null ? other.optionalForeignMessage_.Clone() : null;
-      optionalImportMessage_ = other.optionalImportMessage_ != null ? other.optionalImportMessage_.Clone() : null;
-      optionalNestedEnum_ = other.optionalNestedEnum_;
-      optionalForeignEnum_ = other.optionalForeignEnum_;
-      optionalImportEnum_ = other.optionalImportEnum_;
-      optionalStringPiece_ = other.optionalStringPiece_;
-      optionalCord_ = other.optionalCord_;
-      optionalPublicImportMessage_ = other.optionalPublicImportMessage_ != null ? other.optionalPublicImportMessage_.Clone() : null;
-      optionalLazyMessage_ = other.optionalLazyMessage_ != null ? other.optionalLazyMessage_.Clone() : null;
-      repeatedInt32_ = other.repeatedInt32_.Clone();
-      repeatedInt64_ = other.repeatedInt64_.Clone();
-      repeatedUint32_ = other.repeatedUint32_.Clone();
-      repeatedUint64_ = other.repeatedUint64_.Clone();
-      repeatedSint32_ = other.repeatedSint32_.Clone();
-      repeatedSint64_ = other.repeatedSint64_.Clone();
-      repeatedFixed32_ = other.repeatedFixed32_.Clone();
-      repeatedFixed64_ = other.repeatedFixed64_.Clone();
-      repeatedSfixed32_ = other.repeatedSfixed32_.Clone();
-      repeatedSfixed64_ = other.repeatedSfixed64_.Clone();
-      repeatedFloat_ = other.repeatedFloat_.Clone();
-      repeatedDouble_ = other.repeatedDouble_.Clone();
-      repeatedBool_ = other.repeatedBool_.Clone();
-      repeatedString_ = other.repeatedString_.Clone();
-      repeatedBytes_ = other.repeatedBytes_.Clone();
-      repeatedGroup_ = other.repeatedGroup_.Clone();
-      repeatedNestedMessage_ = other.repeatedNestedMessage_.Clone();
-      repeatedForeignMessage_ = other.repeatedForeignMessage_.Clone();
-      repeatedImportMessage_ = other.repeatedImportMessage_.Clone();
-      repeatedNestedEnum_ = other.repeatedNestedEnum_.Clone();
-      repeatedForeignEnum_ = other.repeatedForeignEnum_.Clone();
-      repeatedImportEnum_ = other.repeatedImportEnum_.Clone();
-      repeatedStringPiece_ = other.repeatedStringPiece_.Clone();
-      repeatedCord_ = other.repeatedCord_.Clone();
-      repeatedLazyMessage_ = other.repeatedLazyMessage_.Clone();
-      defaultInt32_ = other.defaultInt32_;
-      defaultInt64_ = other.defaultInt64_;
-      defaultUint32_ = other.defaultUint32_;
-      defaultUint64_ = other.defaultUint64_;
-      defaultSint32_ = other.defaultSint32_;
-      defaultSint64_ = other.defaultSint64_;
-      defaultFixed32_ = other.defaultFixed32_;
-      defaultFixed64_ = other.defaultFixed64_;
-      defaultSfixed32_ = other.defaultSfixed32_;
-      defaultSfixed64_ = other.defaultSfixed64_;
-      defaultFloat_ = other.defaultFloat_;
-      defaultDouble_ = other.defaultDouble_;
-      defaultBool_ = other.defaultBool_;
-      defaultString_ = other.defaultString_;
-      defaultBytes_ = other.defaultBytes_;
-      defaultNestedEnum_ = other.defaultNestedEnum_;
-      defaultForeignEnum_ = other.defaultForeignEnum_;
-      defaultImportEnum_ = other.defaultImportEnum_;
-      defaultStringPiece_ = other.defaultStringPiece_;
-      defaultCord_ = other.defaultCord_;
-      switch (other.OneofFieldCase) {
-        case OneofFieldOneofCase.OneofUint32:
-          OneofUint32 = other.OneofUint32;
-          break;
-        case OneofFieldOneofCase.OneofNestedMessage:
-          OneofNestedMessage = other.OneofNestedMessage.Clone();
-          break;
-        case OneofFieldOneofCase.OneofString:
-          OneofString = other.OneofString;
-          break;
-        case OneofFieldOneofCase.OneofBytes:
-          OneofBytes = other.OneofBytes;
-          break;
-      }
-
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestAllTypes Clone() {
-      return new TestAllTypes(this);
-    }
-
-    /// <summary>Field number for the "optional_int32" field.</summary>
-    public const int OptionalInt32FieldNumber = 1;
-    private readonly static int OptionalInt32DefaultValue = 0;
-
-    private int optionalInt32_;
-    /// <summary>
-    /// Singular
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int OptionalInt32 {
-      get { if ((_hasBits0 & 1) != 0) { return optionalInt32_; } else { return OptionalInt32DefaultValue; } }
-      set {
-        _hasBits0 |= 1;
-        optionalInt32_ = value;
-      }
-    }
-    /// <summary>Gets whether the "optional_int32" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasOptionalInt32 {
-      get { return (_hasBits0 & 1) != 0; }
-    }
-    /// <summary>Clears the value of the "optional_int32" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearOptionalInt32() {
-      _hasBits0 &= ~1;
-    }
-
-    /// <summary>Field number for the "optional_int64" field.</summary>
-    public const int OptionalInt64FieldNumber = 2;
-    private readonly static long OptionalInt64DefaultValue = 0L;
-
-    private long optionalInt64_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public long OptionalInt64 {
-      get { if ((_hasBits0 & 2) != 0) { return optionalInt64_; } else { return OptionalInt64DefaultValue; } }
-      set {
-        _hasBits0 |= 2;
-        optionalInt64_ = value;
-      }
-    }
-    /// <summary>Gets whether the "optional_int64" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasOptionalInt64 {
-      get { return (_hasBits0 & 2) != 0; }
-    }
-    /// <summary>Clears the value of the "optional_int64" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearOptionalInt64() {
-      _hasBits0 &= ~2;
-    }
-
-    /// <summary>Field number for the "optional_uint32" field.</summary>
-    public const int OptionalUint32FieldNumber = 3;
-    private readonly static uint OptionalUint32DefaultValue = 0;
-
-    private uint optionalUint32_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public uint OptionalUint32 {
-      get { if ((_hasBits0 & 4) != 0) { return optionalUint32_; } else { return OptionalUint32DefaultValue; } }
-      set {
-        _hasBits0 |= 4;
-        optionalUint32_ = value;
-      }
-    }
-    /// <summary>Gets whether the "optional_uint32" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasOptionalUint32 {
-      get { return (_hasBits0 & 4) != 0; }
-    }
-    /// <summary>Clears the value of the "optional_uint32" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearOptionalUint32() {
-      _hasBits0 &= ~4;
-    }
-
-    /// <summary>Field number for the "optional_uint64" field.</summary>
-    public const int OptionalUint64FieldNumber = 4;
-    private readonly static ulong OptionalUint64DefaultValue = 0UL;
-
-    private ulong optionalUint64_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ulong OptionalUint64 {
-      get { if ((_hasBits0 & 8) != 0) { return optionalUint64_; } else { return OptionalUint64DefaultValue; } }
-      set {
-        _hasBits0 |= 8;
-        optionalUint64_ = value;
-      }
-    }
-    /// <summary>Gets whether the "optional_uint64" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasOptionalUint64 {
-      get { return (_hasBits0 & 8) != 0; }
-    }
-    /// <summary>Clears the value of the "optional_uint64" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearOptionalUint64() {
-      _hasBits0 &= ~8;
-    }
-
-    /// <summary>Field number for the "optional_sint32" field.</summary>
-    public const int OptionalSint32FieldNumber = 5;
-    private readonly static int OptionalSint32DefaultValue = 0;
-
-    private int optionalSint32_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int OptionalSint32 {
-      get { if ((_hasBits0 & 16) != 0) { return optionalSint32_; } else { return OptionalSint32DefaultValue; } }
-      set {
-        _hasBits0 |= 16;
-        optionalSint32_ = value;
-      }
-    }
-    /// <summary>Gets whether the "optional_sint32" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasOptionalSint32 {
-      get { return (_hasBits0 & 16) != 0; }
-    }
-    /// <summary>Clears the value of the "optional_sint32" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearOptionalSint32() {
-      _hasBits0 &= ~16;
-    }
-
-    /// <summary>Field number for the "optional_sint64" field.</summary>
-    public const int OptionalSint64FieldNumber = 6;
-    private readonly static long OptionalSint64DefaultValue = 0L;
-
-    private long optionalSint64_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public long OptionalSint64 {
-      get { if ((_hasBits0 & 32) != 0) { return optionalSint64_; } else { return OptionalSint64DefaultValue; } }
-      set {
-        _hasBits0 |= 32;
-        optionalSint64_ = value;
-      }
-    }
-    /// <summary>Gets whether the "optional_sint64" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasOptionalSint64 {
-      get { return (_hasBits0 & 32) != 0; }
-    }
-    /// <summary>Clears the value of the "optional_sint64" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearOptionalSint64() {
-      _hasBits0 &= ~32;
-    }
-
-    /// <summary>Field number for the "optional_fixed32" field.</summary>
-    public const int OptionalFixed32FieldNumber = 7;
-    private readonly static uint OptionalFixed32DefaultValue = 0;
-
-    private uint optionalFixed32_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public uint OptionalFixed32 {
-      get { if ((_hasBits0 & 64) != 0) { return optionalFixed32_; } else { return OptionalFixed32DefaultValue; } }
-      set {
-        _hasBits0 |= 64;
-        optionalFixed32_ = value;
-      }
-    }
-    /// <summary>Gets whether the "optional_fixed32" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasOptionalFixed32 {
-      get { return (_hasBits0 & 64) != 0; }
-    }
-    /// <summary>Clears the value of the "optional_fixed32" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearOptionalFixed32() {
-      _hasBits0 &= ~64;
-    }
-
-    /// <summary>Field number for the "optional_fixed64" field.</summary>
-    public const int OptionalFixed64FieldNumber = 8;
-    private readonly static ulong OptionalFixed64DefaultValue = 0UL;
-
-    private ulong optionalFixed64_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ulong OptionalFixed64 {
-      get { if ((_hasBits0 & 128) != 0) { return optionalFixed64_; } else { return OptionalFixed64DefaultValue; } }
-      set {
-        _hasBits0 |= 128;
-        optionalFixed64_ = value;
-      }
-    }
-    /// <summary>Gets whether the "optional_fixed64" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasOptionalFixed64 {
-      get { return (_hasBits0 & 128) != 0; }
-    }
-    /// <summary>Clears the value of the "optional_fixed64" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearOptionalFixed64() {
-      _hasBits0 &= ~128;
-    }
-
-    /// <summary>Field number for the "optional_sfixed32" field.</summary>
-    public const int OptionalSfixed32FieldNumber = 9;
-    private readonly static int OptionalSfixed32DefaultValue = 0;
-
-    private int optionalSfixed32_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int OptionalSfixed32 {
-      get { if ((_hasBits0 & 256) != 0) { return optionalSfixed32_; } else { return OptionalSfixed32DefaultValue; } }
-      set {
-        _hasBits0 |= 256;
-        optionalSfixed32_ = value;
-      }
-    }
-    /// <summary>Gets whether the "optional_sfixed32" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasOptionalSfixed32 {
-      get { return (_hasBits0 & 256) != 0; }
-    }
-    /// <summary>Clears the value of the "optional_sfixed32" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearOptionalSfixed32() {
-      _hasBits0 &= ~256;
-    }
-
-    /// <summary>Field number for the "optional_sfixed64" field.</summary>
-    public const int OptionalSfixed64FieldNumber = 10;
-    private readonly static long OptionalSfixed64DefaultValue = 0L;
-
-    private long optionalSfixed64_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public long OptionalSfixed64 {
-      get { if ((_hasBits0 & 512) != 0) { return optionalSfixed64_; } else { return OptionalSfixed64DefaultValue; } }
-      set {
-        _hasBits0 |= 512;
-        optionalSfixed64_ = value;
-      }
-    }
-    /// <summary>Gets whether the "optional_sfixed64" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasOptionalSfixed64 {
-      get { return (_hasBits0 & 512) != 0; }
-    }
-    /// <summary>Clears the value of the "optional_sfixed64" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearOptionalSfixed64() {
-      _hasBits0 &= ~512;
-    }
-
-    /// <summary>Field number for the "optional_float" field.</summary>
-    public const int OptionalFloatFieldNumber = 11;
-    private readonly static float OptionalFloatDefaultValue = 0F;
-
-    private float optionalFloat_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public float OptionalFloat {
-      get { if ((_hasBits0 & 1024) != 0) { return optionalFloat_; } else { return OptionalFloatDefaultValue; } }
-      set {
-        _hasBits0 |= 1024;
-        optionalFloat_ = value;
-      }
-    }
-    /// <summary>Gets whether the "optional_float" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasOptionalFloat {
-      get { return (_hasBits0 & 1024) != 0; }
-    }
-    /// <summary>Clears the value of the "optional_float" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearOptionalFloat() {
-      _hasBits0 &= ~1024;
-    }
-
-    /// <summary>Field number for the "optional_double" field.</summary>
-    public const int OptionalDoubleFieldNumber = 12;
-    private readonly static double OptionalDoubleDefaultValue = 0D;
-
-    private double optionalDouble_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double OptionalDouble {
-      get { if ((_hasBits0 & 2048) != 0) { return optionalDouble_; } else { return OptionalDoubleDefaultValue; } }
-      set {
-        _hasBits0 |= 2048;
-        optionalDouble_ = value;
-      }
-    }
-    /// <summary>Gets whether the "optional_double" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasOptionalDouble {
-      get { return (_hasBits0 & 2048) != 0; }
-    }
-    /// <summary>Clears the value of the "optional_double" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearOptionalDouble() {
-      _hasBits0 &= ~2048;
-    }
-
-    /// <summary>Field number for the "optional_bool" field.</summary>
-    public const int OptionalBoolFieldNumber = 13;
-    private readonly static bool OptionalBoolDefaultValue = false;
-
-    private bool optionalBool_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool OptionalBool {
-      get { if ((_hasBits0 & 4096) != 0) { return optionalBool_; } else { return OptionalBoolDefaultValue; } }
-      set {
-        _hasBits0 |= 4096;
-        optionalBool_ = value;
-      }
-    }
-    /// <summary>Gets whether the "optional_bool" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasOptionalBool {
-      get { return (_hasBits0 & 4096) != 0; }
-    }
-    /// <summary>Clears the value of the "optional_bool" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearOptionalBool() {
-      _hasBits0 &= ~4096;
-    }
-
-    /// <summary>Field number for the "optional_string" field.</summary>
-    public const int OptionalStringFieldNumber = 14;
-    private readonly static string OptionalStringDefaultValue = "";
-
-    private string optionalString_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string OptionalString {
-      get { return optionalString_ ?? OptionalStringDefaultValue; }
-      set {
-        optionalString_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-    /// <summary>Gets whether the "optional_string" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasOptionalString {
-      get { return optionalString_ != null; }
-    }
-    /// <summary>Clears the value of the "optional_string" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearOptionalString() {
-      optionalString_ = null;
-    }
-
-    /// <summary>Field number for the "optional_bytes" field.</summary>
-    public const int OptionalBytesFieldNumber = 15;
-    private readonly static pb::ByteString OptionalBytesDefaultValue = pb::ByteString.Empty;
-
-    private pb::ByteString optionalBytes_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pb::ByteString OptionalBytes {
-      get { return optionalBytes_ ?? OptionalBytesDefaultValue; }
-      set {
-        optionalBytes_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-    /// <summary>Gets whether the "optional_bytes" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasOptionalBytes {
-      get { return optionalBytes_ != null; }
-    }
-    /// <summary>Clears the value of the "optional_bytes" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearOptionalBytes() {
-      optionalBytes_ = null;
-    }
-
-    /// <summary>Field number for the "optionalgroup" field.</summary>
-    public const int OptionalGroupFieldNumber = 16;
-    private global::Google.Protobuf.TestProtos.Proto2.TestAllTypes.Types.OptionalGroup optionalGroup_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.TestProtos.Proto2.TestAllTypes.Types.OptionalGroup OptionalGroup {
-      get { return optionalGroup_; }
-      set {
-        optionalGroup_ = value;
-      }
-    }
-    /// <summary>Gets whether the optionalgroup field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasOptionalGroup {
-      get { return optionalGroup_ != null; }
-    }
-    /// <summary>Clears the value of the optionalgroup field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearOptionalGroup() {
-      optionalGroup_ = null;
-    }
-
-    /// <summary>Field number for the "optional_nested_message" field.</summary>
-    public const int OptionalNestedMessageFieldNumber = 18;
-    private global::Google.Protobuf.TestProtos.Proto2.TestAllTypes.Types.NestedMessage optionalNestedMessage_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.TestProtos.Proto2.TestAllTypes.Types.NestedMessage OptionalNestedMessage {
-      get { return optionalNestedMessage_; }
-      set {
-        optionalNestedMessage_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "optional_foreign_message" field.</summary>
-    public const int OptionalForeignMessageFieldNumber = 19;
-    private global::Google.Protobuf.TestProtos.Proto2.ForeignMessage optionalForeignMessage_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.TestProtos.Proto2.ForeignMessage OptionalForeignMessage {
-      get { return optionalForeignMessage_; }
-      set {
-        optionalForeignMessage_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "optional_import_message" field.</summary>
-    public const int OptionalImportMessageFieldNumber = 20;
-    private global::Google.Protobuf.TestProtos.Proto2.ImportMessage optionalImportMessage_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.TestProtos.Proto2.ImportMessage OptionalImportMessage {
-      get { return optionalImportMessage_; }
-      set {
-        optionalImportMessage_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "optional_nested_enum" field.</summary>
-    public const int OptionalNestedEnumFieldNumber = 21;
-    private readonly static global::Google.Protobuf.TestProtos.Proto2.TestAllTypes.Types.NestedEnum OptionalNestedEnumDefaultValue = global::Google.Protobuf.TestProtos.Proto2.TestAllTypes.Types.NestedEnum.Foo;
-
-    private global::Google.Protobuf.TestProtos.Proto2.TestAllTypes.Types.NestedEnum optionalNestedEnum_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.TestProtos.Proto2.TestAllTypes.Types.NestedEnum OptionalNestedEnum {
-      get { if ((_hasBits0 & 8192) != 0) { return optionalNestedEnum_; } else { return OptionalNestedEnumDefaultValue; } }
-      set {
-        _hasBits0 |= 8192;
-        optionalNestedEnum_ = value;
-      }
-    }
-    /// <summary>Gets whether the "optional_nested_enum" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasOptionalNestedEnum {
-      get { return (_hasBits0 & 8192) != 0; }
-    }
-    /// <summary>Clears the value of the "optional_nested_enum" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearOptionalNestedEnum() {
-      _hasBits0 &= ~8192;
-    }
-
-    /// <summary>Field number for the "optional_foreign_enum" field.</summary>
-    public const int OptionalForeignEnumFieldNumber = 22;
-    private readonly static global::Google.Protobuf.TestProtos.Proto2.ForeignEnum OptionalForeignEnumDefaultValue = global::Google.Protobuf.TestProtos.Proto2.ForeignEnum.ForeignFoo;
-
-    private global::Google.Protobuf.TestProtos.Proto2.ForeignEnum optionalForeignEnum_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.TestProtos.Proto2.ForeignEnum OptionalForeignEnum {
-      get { if ((_hasBits0 & 16384) != 0) { return optionalForeignEnum_; } else { return OptionalForeignEnumDefaultValue; } }
-      set {
-        _hasBits0 |= 16384;
-        optionalForeignEnum_ = value;
-      }
-    }
-    /// <summary>Gets whether the "optional_foreign_enum" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasOptionalForeignEnum {
-      get { return (_hasBits0 & 16384) != 0; }
-    }
-    /// <summary>Clears the value of the "optional_foreign_enum" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearOptionalForeignEnum() {
-      _hasBits0 &= ~16384;
-    }
-
-    /// <summary>Field number for the "optional_import_enum" field.</summary>
-    public const int OptionalImportEnumFieldNumber = 23;
-    private readonly static global::Google.Protobuf.TestProtos.Proto2.ImportEnum OptionalImportEnumDefaultValue = global::Google.Protobuf.TestProtos.Proto2.ImportEnum.ImportFoo;
-
-    private global::Google.Protobuf.TestProtos.Proto2.ImportEnum optionalImportEnum_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.TestProtos.Proto2.ImportEnum OptionalImportEnum {
-      get { if ((_hasBits0 & 32768) != 0) { return optionalImportEnum_; } else { return OptionalImportEnumDefaultValue; } }
-      set {
-        _hasBits0 |= 32768;
-        optionalImportEnum_ = value;
-      }
-    }
-    /// <summary>Gets whether the "optional_import_enum" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasOptionalImportEnum {
-      get { return (_hasBits0 & 32768) != 0; }
-    }
-    /// <summary>Clears the value of the "optional_import_enum" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearOptionalImportEnum() {
-      _hasBits0 &= ~32768;
-    }
-
-    /// <summary>Field number for the "optional_string_piece" field.</summary>
-    public const int OptionalStringPieceFieldNumber = 24;
-    private readonly static string OptionalStringPieceDefaultValue = "";
-
-    private string optionalStringPiece_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string OptionalStringPiece {
-      get { return optionalStringPiece_ ?? OptionalStringPieceDefaultValue; }
-      set {
-        optionalStringPiece_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-    /// <summary>Gets whether the "optional_string_piece" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasOptionalStringPiece {
-      get { return optionalStringPiece_ != null; }
-    }
-    /// <summary>Clears the value of the "optional_string_piece" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearOptionalStringPiece() {
-      optionalStringPiece_ = null;
-    }
-
-    /// <summary>Field number for the "optional_cord" field.</summary>
-    public const int OptionalCordFieldNumber = 25;
-    private readonly static string OptionalCordDefaultValue = "";
-
-    private string optionalCord_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string OptionalCord {
-      get { return optionalCord_ ?? OptionalCordDefaultValue; }
-      set {
-        optionalCord_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-    /// <summary>Gets whether the "optional_cord" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasOptionalCord {
-      get { return optionalCord_ != null; }
-    }
-    /// <summary>Clears the value of the "optional_cord" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearOptionalCord() {
-      optionalCord_ = null;
-    }
-
-    /// <summary>Field number for the "optional_public_import_message" field.</summary>
-    public const int OptionalPublicImportMessageFieldNumber = 26;
-    private global::Google.Protobuf.TestProtos.Proto2.PublicImportMessage optionalPublicImportMessage_;
-    /// <summary>
-    /// Defined in unittest_import_public.proto
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.TestProtos.Proto2.PublicImportMessage OptionalPublicImportMessage {
-      get { return optionalPublicImportMessage_; }
-      set {
-        optionalPublicImportMessage_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "optional_lazy_message" field.</summary>
-    public const int OptionalLazyMessageFieldNumber = 27;
-    private global::Google.Protobuf.TestProtos.Proto2.TestAllTypes.Types.NestedMessage optionalLazyMessage_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.TestProtos.Proto2.TestAllTypes.Types.NestedMessage OptionalLazyMessage {
-      get { return optionalLazyMessage_; }
-      set {
-        optionalLazyMessage_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "repeated_int32" field.</summary>
-    public const int RepeatedInt32FieldNumber = 31;
-    private static readonly pb::FieldCodec<int> _repeated_repeatedInt32_codec
-        = pb::FieldCodec.ForInt32(248);
-    private readonly pbc::RepeatedField<int> repeatedInt32_ = new pbc::RepeatedField<int>();
-    /// <summary>
-    /// Repeated
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<int> RepeatedInt32 {
-      get { return repeatedInt32_; }
-    }
-
-    /// <summary>Field number for the "repeated_int64" field.</summary>
-    public const int RepeatedInt64FieldNumber = 32;
-    private static readonly pb::FieldCodec<long> _repeated_repeatedInt64_codec
-        = pb::FieldCodec.ForInt64(256);
-    private readonly pbc::RepeatedField<long> repeatedInt64_ = new pbc::RepeatedField<long>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<long> RepeatedInt64 {
-      get { return repeatedInt64_; }
-    }
-
-    /// <summary>Field number for the "repeated_uint32" field.</summary>
-    public const int RepeatedUint32FieldNumber = 33;
-    private static readonly pb::FieldCodec<uint> _repeated_repeatedUint32_codec
-        = pb::FieldCodec.ForUInt32(264);
-    private readonly pbc::RepeatedField<uint> repeatedUint32_ = new pbc::RepeatedField<uint>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<uint> RepeatedUint32 {
-      get { return repeatedUint32_; }
-    }
-
-    /// <summary>Field number for the "repeated_uint64" field.</summary>
-    public const int RepeatedUint64FieldNumber = 34;
-    private static readonly pb::FieldCodec<ulong> _repeated_repeatedUint64_codec
-        = pb::FieldCodec.ForUInt64(272);
-    private readonly pbc::RepeatedField<ulong> repeatedUint64_ = new pbc::RepeatedField<ulong>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<ulong> RepeatedUint64 {
-      get { return repeatedUint64_; }
-    }
-
-    /// <summary>Field number for the "repeated_sint32" field.</summary>
-    public const int RepeatedSint32FieldNumber = 35;
-    private static readonly pb::FieldCodec<int> _repeated_repeatedSint32_codec
-        = pb::FieldCodec.ForSInt32(280);
-    private readonly pbc::RepeatedField<int> repeatedSint32_ = new pbc::RepeatedField<int>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<int> RepeatedSint32 {
-      get { return repeatedSint32_; }
-    }
-
-    /// <summary>Field number for the "repeated_sint64" field.</summary>
-    public const int RepeatedSint64FieldNumber = 36;
-    private static readonly pb::FieldCodec<long> _repeated_repeatedSint64_codec
-        = pb::FieldCodec.ForSInt64(288);
-    private readonly pbc::RepeatedField<long> repeatedSint64_ = new pbc::RepeatedField<long>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<long> RepeatedSint64 {
-      get { return repeatedSint64_; }
-    }
-
-    /// <summary>Field number for the "repeated_fixed32" field.</summary>
-    public const int RepeatedFixed32FieldNumber = 37;
-    private static readonly pb::FieldCodec<uint> _repeated_repeatedFixed32_codec
-        = pb::FieldCodec.ForFixed32(301);
-    private readonly pbc::RepeatedField<uint> repeatedFixed32_ = new pbc::RepeatedField<uint>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<uint> RepeatedFixed32 {
-      get { return repeatedFixed32_; }
-    }
-
-    /// <summary>Field number for the "repeated_fixed64" field.</summary>
-    public const int RepeatedFixed64FieldNumber = 38;
-    private static readonly pb::FieldCodec<ulong> _repeated_repeatedFixed64_codec
-        = pb::FieldCodec.ForFixed64(305);
-    private readonly pbc::RepeatedField<ulong> repeatedFixed64_ = new pbc::RepeatedField<ulong>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<ulong> RepeatedFixed64 {
-      get { return repeatedFixed64_; }
-    }
-
-    /// <summary>Field number for the "repeated_sfixed32" field.</summary>
-    public const int RepeatedSfixed32FieldNumber = 39;
-    private static readonly pb::FieldCodec<int> _repeated_repeatedSfixed32_codec
-        = pb::FieldCodec.ForSFixed32(317);
-    private readonly pbc::RepeatedField<int> repeatedSfixed32_ = new pbc::RepeatedField<int>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<int> RepeatedSfixed32 {
-      get { return repeatedSfixed32_; }
-    }
-
-    /// <summary>Field number for the "repeated_sfixed64" field.</summary>
-    public const int RepeatedSfixed64FieldNumber = 40;
-    private static readonly pb::FieldCodec<long> _repeated_repeatedSfixed64_codec
-        = pb::FieldCodec.ForSFixed64(321);
-    private readonly pbc::RepeatedField<long> repeatedSfixed64_ = new pbc::RepeatedField<long>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<long> RepeatedSfixed64 {
-      get { return repeatedSfixed64_; }
-    }
-
-    /// <summary>Field number for the "repeated_float" field.</summary>
-    public const int RepeatedFloatFieldNumber = 41;
-    private static readonly pb::FieldCodec<float> _repeated_repeatedFloat_codec
-        = pb::FieldCodec.ForFloat(333);
-    private readonly pbc::RepeatedField<float> repeatedFloat_ = new pbc::RepeatedField<float>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<float> RepeatedFloat {
-      get { return repeatedFloat_; }
-    }
-
-    /// <summary>Field number for the "repeated_double" field.</summary>
-    public const int RepeatedDoubleFieldNumber = 42;
-    private static readonly pb::FieldCodec<double> _repeated_repeatedDouble_codec
-        = pb::FieldCodec.ForDouble(337);
-    private readonly pbc::RepeatedField<double> repeatedDouble_ = new pbc::RepeatedField<double>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<double> RepeatedDouble {
-      get { return repeatedDouble_; }
-    }
-
-    /// <summary>Field number for the "repeated_bool" field.</summary>
-    public const int RepeatedBoolFieldNumber = 43;
-    private static readonly pb::FieldCodec<bool> _repeated_repeatedBool_codec
-        = pb::FieldCodec.ForBool(344);
-    private readonly pbc::RepeatedField<bool> repeatedBool_ = new pbc::RepeatedField<bool>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<bool> RepeatedBool {
-      get { return repeatedBool_; }
-    }
-
-    /// <summary>Field number for the "repeated_string" field.</summary>
-    public const int RepeatedStringFieldNumber = 44;
-    private static readonly pb::FieldCodec<string> _repeated_repeatedString_codec
-        = pb::FieldCodec.ForString(354);
-    private readonly pbc::RepeatedField<string> repeatedString_ = new pbc::RepeatedField<string>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<string> RepeatedString {
-      get { return repeatedString_; }
-    }
-
-    /// <summary>Field number for the "repeated_bytes" field.</summary>
-    public const int RepeatedBytesFieldNumber = 45;
-    private static readonly pb::FieldCodec<pb::ByteString> _repeated_repeatedBytes_codec
-        = pb::FieldCodec.ForBytes(362);
-    private readonly pbc::RepeatedField<pb::ByteString> repeatedBytes_ = new pbc::RepeatedField<pb::ByteString>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<pb::ByteString> RepeatedBytes {
-      get { return repeatedBytes_; }
-    }
-
-    /// <summary>Field number for the "repeatedgroup" field.</summary>
-    public const int RepeatedGroupFieldNumber = 46;
-    private static readonly pb::FieldCodec<global::Google.Protobuf.TestProtos.Proto2.TestAllTypes.Types.RepeatedGroup> _repeated_repeatedGroup_codec
-        = pb::FieldCodec.ForGroup(371, 372, global::Google.Protobuf.TestProtos.Proto2.TestAllTypes.Types.RepeatedGroup.Parser);
-    private readonly pbc::RepeatedField<global::Google.Protobuf.TestProtos.Proto2.TestAllTypes.Types.RepeatedGroup> repeatedGroup_ = new pbc::RepeatedField<global::Google.Protobuf.TestProtos.Proto2.TestAllTypes.Types.RepeatedGroup>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Google.Protobuf.TestProtos.Proto2.TestAllTypes.Types.RepeatedGroup> RepeatedGroup {
-      get { return repeatedGroup_; }
-    }
-
-    /// <summary>Field number for the "repeated_nested_message" field.</summary>
-    public const int RepeatedNestedMessageFieldNumber = 48;
-    private static readonly pb::FieldCodec<global::Google.Protobuf.TestProtos.Proto2.TestAllTypes.Types.NestedMessage> _repeated_repeatedNestedMessage_codec
-        = pb::FieldCodec.ForMessage(386, global::Google.Protobuf.TestProtos.Proto2.TestAllTypes.Types.NestedMessage.Parser);
-    private readonly pbc::RepeatedField<global::Google.Protobuf.TestProtos.Proto2.TestAllTypes.Types.NestedMessage> repeatedNestedMessage_ = new pbc::RepeatedField<global::Google.Protobuf.TestProtos.Proto2.TestAllTypes.Types.NestedMessage>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Google.Protobuf.TestProtos.Proto2.TestAllTypes.Types.NestedMessage> RepeatedNestedMessage {
-      get { return repeatedNestedMessage_; }
-    }
-
-    /// <summary>Field number for the "repeated_foreign_message" field.</summary>
-    public const int RepeatedForeignMessageFieldNumber = 49;
-    private static readonly pb::FieldCodec<global::Google.Protobuf.TestProtos.Proto2.ForeignMessage> _repeated_repeatedForeignMessage_codec
-        = pb::FieldCodec.ForMessage(394, global::Google.Protobuf.TestProtos.Proto2.ForeignMessage.Parser);
-    private readonly pbc::RepeatedField<global::Google.Protobuf.TestProtos.Proto2.ForeignMessage> repeatedForeignMessage_ = new pbc::RepeatedField<global::Google.Protobuf.TestProtos.Proto2.ForeignMessage>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Google.Protobuf.TestProtos.Proto2.ForeignMessage> RepeatedForeignMessage {
-      get { return repeatedForeignMessage_; }
-    }
-
-    /// <summary>Field number for the "repeated_import_message" field.</summary>
-    public const int RepeatedImportMessageFieldNumber = 50;
-    private static readonly pb::FieldCodec<global::Google.Protobuf.TestProtos.Proto2.ImportMessage> _repeated_repeatedImportMessage_codec
-        = pb::FieldCodec.ForMessage(402, global::Google.Protobuf.TestProtos.Proto2.ImportMessage.Parser);
-    private readonly pbc::RepeatedField<global::Google.Protobuf.TestProtos.Proto2.ImportMessage> repeatedImportMessage_ = new pbc::RepeatedField<global::Google.Protobuf.TestProtos.Proto2.ImportMessage>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Google.Protobuf.TestProtos.Proto2.ImportMessage> RepeatedImportMessage {
-      get { return repeatedImportMessage_; }
-    }
-
-    /// <summary>Field number for the "repeated_nested_enum" field.</summary>
-    public const int RepeatedNestedEnumFieldNumber = 51;
-    private static readonly pb::FieldCodec<global::Google.Protobuf.TestProtos.Proto2.TestAllTypes.Types.NestedEnum> _repeated_repeatedNestedEnum_codec
-        = pb::FieldCodec.ForEnum(408, x => (int) x, x => (global::Google.Protobuf.TestProtos.Proto2.TestAllTypes.Types.NestedEnum) x);
-    private readonly pbc::RepeatedField<global::Google.Protobuf.TestProtos.Proto2.TestAllTypes.Types.NestedEnum> repeatedNestedEnum_ = new pbc::RepeatedField<global::Google.Protobuf.TestProtos.Proto2.TestAllTypes.Types.NestedEnum>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Google.Protobuf.TestProtos.Proto2.TestAllTypes.Types.NestedEnum> RepeatedNestedEnum {
-      get { return repeatedNestedEnum_; }
-    }
-
-    /// <summary>Field number for the "repeated_foreign_enum" field.</summary>
-    public const int RepeatedForeignEnumFieldNumber = 52;
-    private static readonly pb::FieldCodec<global::Google.Protobuf.TestProtos.Proto2.ForeignEnum> _repeated_repeatedForeignEnum_codec
-        = pb::FieldCodec.ForEnum(416, x => (int) x, x => (global::Google.Protobuf.TestProtos.Proto2.ForeignEnum) x);
-    private readonly pbc::RepeatedField<global::Google.Protobuf.TestProtos.Proto2.ForeignEnum> repeatedForeignEnum_ = new pbc::RepeatedField<global::Google.Protobuf.TestProtos.Proto2.ForeignEnum>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Google.Protobuf.TestProtos.Proto2.ForeignEnum> RepeatedForeignEnum {
-      get { return repeatedForeignEnum_; }
-    }
-
-    /// <summary>Field number for the "repeated_import_enum" field.</summary>
-    public const int RepeatedImportEnumFieldNumber = 53;
-    private static readonly pb::FieldCodec<global::Google.Protobuf.TestProtos.Proto2.ImportEnum> _repeated_repeatedImportEnum_codec
-        = pb::FieldCodec.ForEnum(424, x => (int) x, x => (global::Google.Protobuf.TestProtos.Proto2.ImportEnum) x);
-    private readonly pbc::RepeatedField<global::Google.Protobuf.TestProtos.Proto2.ImportEnum> repeatedImportEnum_ = new pbc::RepeatedField<global::Google.Protobuf.TestProtos.Proto2.ImportEnum>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Google.Protobuf.TestProtos.Proto2.ImportEnum> RepeatedImportEnum {
-      get { return repeatedImportEnum_; }
-    }
-
-    /// <summary>Field number for the "repeated_string_piece" field.</summary>
-    public const int RepeatedStringPieceFieldNumber = 54;
-    private static readonly pb::FieldCodec<string> _repeated_repeatedStringPiece_codec
-        = pb::FieldCodec.ForString(434);
-    private readonly pbc::RepeatedField<string> repeatedStringPiece_ = new pbc::RepeatedField<string>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<string> RepeatedStringPiece {
-      get { return repeatedStringPiece_; }
-    }
-
-    /// <summary>Field number for the "repeated_cord" field.</summary>
-    public const int RepeatedCordFieldNumber = 55;
-    private static readonly pb::FieldCodec<string> _repeated_repeatedCord_codec
-        = pb::FieldCodec.ForString(442);
-    private readonly pbc::RepeatedField<string> repeatedCord_ = new pbc::RepeatedField<string>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<string> RepeatedCord {
-      get { return repeatedCord_; }
-    }
-
-    /// <summary>Field number for the "repeated_lazy_message" field.</summary>
-    public const int RepeatedLazyMessageFieldNumber = 57;
-    private static readonly pb::FieldCodec<global::Google.Protobuf.TestProtos.Proto2.TestAllTypes.Types.NestedMessage> _repeated_repeatedLazyMessage_codec
-        = pb::FieldCodec.ForMessage(458, global::Google.Protobuf.TestProtos.Proto2.TestAllTypes.Types.NestedMessage.Parser);
-    private readonly pbc::RepeatedField<global::Google.Protobuf.TestProtos.Proto2.TestAllTypes.Types.NestedMessage> repeatedLazyMessage_ = new pbc::RepeatedField<global::Google.Protobuf.TestProtos.Proto2.TestAllTypes.Types.NestedMessage>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Google.Protobuf.TestProtos.Proto2.TestAllTypes.Types.NestedMessage> RepeatedLazyMessage {
-      get { return repeatedLazyMessage_; }
-    }
-
-    /// <summary>Field number for the "default_int32" field.</summary>
-    public const int DefaultInt32FieldNumber = 61;
-    private readonly static int DefaultInt32DefaultValue = 41;
-
-    private int defaultInt32_;
-    /// <summary>
-    /// Singular with defaults
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int DefaultInt32 {
-      get { if ((_hasBits0 & 65536) != 0) { return defaultInt32_; } else { return DefaultInt32DefaultValue; } }
-      set {
-        _hasBits0 |= 65536;
-        defaultInt32_ = value;
-      }
-    }
-    /// <summary>Gets whether the "default_int32" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasDefaultInt32 {
-      get { return (_hasBits0 & 65536) != 0; }
-    }
-    /// <summary>Clears the value of the "default_int32" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearDefaultInt32() {
-      _hasBits0 &= ~65536;
-    }
-
-    /// <summary>Field number for the "default_int64" field.</summary>
-    public const int DefaultInt64FieldNumber = 62;
-    private readonly static long DefaultInt64DefaultValue = 42L;
-
-    private long defaultInt64_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public long DefaultInt64 {
-      get { if ((_hasBits0 & 131072) != 0) { return defaultInt64_; } else { return DefaultInt64DefaultValue; } }
-      set {
-        _hasBits0 |= 131072;
-        defaultInt64_ = value;
-      }
-    }
-    /// <summary>Gets whether the "default_int64" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasDefaultInt64 {
-      get { return (_hasBits0 & 131072) != 0; }
-    }
-    /// <summary>Clears the value of the "default_int64" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearDefaultInt64() {
-      _hasBits0 &= ~131072;
-    }
-
-    /// <summary>Field number for the "default_uint32" field.</summary>
-    public const int DefaultUint32FieldNumber = 63;
-    private readonly static uint DefaultUint32DefaultValue = 43;
-
-    private uint defaultUint32_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public uint DefaultUint32 {
-      get { if ((_hasBits0 & 262144) != 0) { return defaultUint32_; } else { return DefaultUint32DefaultValue; } }
-      set {
-        _hasBits0 |= 262144;
-        defaultUint32_ = value;
-      }
-    }
-    /// <summary>Gets whether the "default_uint32" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasDefaultUint32 {
-      get { return (_hasBits0 & 262144) != 0; }
-    }
-    /// <summary>Clears the value of the "default_uint32" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearDefaultUint32() {
-      _hasBits0 &= ~262144;
-    }
-
-    /// <summary>Field number for the "default_uint64" field.</summary>
-    public const int DefaultUint64FieldNumber = 64;
-    private readonly static ulong DefaultUint64DefaultValue = 44UL;
-
-    private ulong defaultUint64_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ulong DefaultUint64 {
-      get { if ((_hasBits0 & 524288) != 0) { return defaultUint64_; } else { return DefaultUint64DefaultValue; } }
-      set {
-        _hasBits0 |= 524288;
-        defaultUint64_ = value;
-      }
-    }
-    /// <summary>Gets whether the "default_uint64" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasDefaultUint64 {
-      get { return (_hasBits0 & 524288) != 0; }
-    }
-    /// <summary>Clears the value of the "default_uint64" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearDefaultUint64() {
-      _hasBits0 &= ~524288;
-    }
-
-    /// <summary>Field number for the "default_sint32" field.</summary>
-    public const int DefaultSint32FieldNumber = 65;
-    private readonly static int DefaultSint32DefaultValue = -45;
-
-    private int defaultSint32_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int DefaultSint32 {
-      get { if ((_hasBits0 & 1048576) != 0) { return defaultSint32_; } else { return DefaultSint32DefaultValue; } }
-      set {
-        _hasBits0 |= 1048576;
-        defaultSint32_ = value;
-      }
-    }
-    /// <summary>Gets whether the "default_sint32" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasDefaultSint32 {
-      get { return (_hasBits0 & 1048576) != 0; }
-    }
-    /// <summary>Clears the value of the "default_sint32" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearDefaultSint32() {
-      _hasBits0 &= ~1048576;
-    }
-
-    /// <summary>Field number for the "default_sint64" field.</summary>
-    public const int DefaultSint64FieldNumber = 66;
-    private readonly static long DefaultSint64DefaultValue = 46L;
-
-    private long defaultSint64_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public long DefaultSint64 {
-      get { if ((_hasBits0 & 2097152) != 0) { return defaultSint64_; } else { return DefaultSint64DefaultValue; } }
-      set {
-        _hasBits0 |= 2097152;
-        defaultSint64_ = value;
-      }
-    }
-    /// <summary>Gets whether the "default_sint64" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasDefaultSint64 {
-      get { return (_hasBits0 & 2097152) != 0; }
-    }
-    /// <summary>Clears the value of the "default_sint64" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearDefaultSint64() {
-      _hasBits0 &= ~2097152;
-    }
-
-    /// <summary>Field number for the "default_fixed32" field.</summary>
-    public const int DefaultFixed32FieldNumber = 67;
-    private readonly static uint DefaultFixed32DefaultValue = 47;
-
-    private uint defaultFixed32_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public uint DefaultFixed32 {
-      get { if ((_hasBits0 & 4194304) != 0) { return defaultFixed32_; } else { return DefaultFixed32DefaultValue; } }
-      set {
-        _hasBits0 |= 4194304;
-        defaultFixed32_ = value;
-      }
-    }
-    /// <summary>Gets whether the "default_fixed32" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasDefaultFixed32 {
-      get { return (_hasBits0 & 4194304) != 0; }
-    }
-    /// <summary>Clears the value of the "default_fixed32" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearDefaultFixed32() {
-      _hasBits0 &= ~4194304;
-    }
-
-    /// <summary>Field number for the "default_fixed64" field.</summary>
-    public const int DefaultFixed64FieldNumber = 68;
-    private readonly static ulong DefaultFixed64DefaultValue = 48UL;
-
-    private ulong defaultFixed64_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ulong DefaultFixed64 {
-      get { if ((_hasBits0 & 8388608) != 0) { return defaultFixed64_; } else { return DefaultFixed64DefaultValue; } }
-      set {
-        _hasBits0 |= 8388608;
-        defaultFixed64_ = value;
-      }
-    }
-    /// <summary>Gets whether the "default_fixed64" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasDefaultFixed64 {
-      get { return (_hasBits0 & 8388608) != 0; }
-    }
-    /// <summary>Clears the value of the "default_fixed64" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearDefaultFixed64() {
-      _hasBits0 &= ~8388608;
-    }
-
-    /// <summary>Field number for the "default_sfixed32" field.</summary>
-    public const int DefaultSfixed32FieldNumber = 69;
-    private readonly static int DefaultSfixed32DefaultValue = 49;
-
-    private int defaultSfixed32_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int DefaultSfixed32 {
-      get { if ((_hasBits0 & 16777216) != 0) { return defaultSfixed32_; } else { return DefaultSfixed32DefaultValue; } }
-      set {
-        _hasBits0 |= 16777216;
-        defaultSfixed32_ = value;
-      }
-    }
-    /// <summary>Gets whether the "default_sfixed32" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasDefaultSfixed32 {
-      get { return (_hasBits0 & 16777216) != 0; }
-    }
-    /// <summary>Clears the value of the "default_sfixed32" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearDefaultSfixed32() {
-      _hasBits0 &= ~16777216;
-    }
-
-    /// <summary>Field number for the "default_sfixed64" field.</summary>
-    public const int DefaultSfixed64FieldNumber = 70;
-    private readonly static long DefaultSfixed64DefaultValue = -50L;
-
-    private long defaultSfixed64_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public long DefaultSfixed64 {
-      get { if ((_hasBits0 & 33554432) != 0) { return defaultSfixed64_; } else { return DefaultSfixed64DefaultValue; } }
-      set {
-        _hasBits0 |= 33554432;
-        defaultSfixed64_ = value;
-      }
-    }
-    /// <summary>Gets whether the "default_sfixed64" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasDefaultSfixed64 {
-      get { return (_hasBits0 & 33554432) != 0; }
-    }
-    /// <summary>Clears the value of the "default_sfixed64" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearDefaultSfixed64() {
-      _hasBits0 &= ~33554432;
-    }
-
-    /// <summary>Field number for the "default_float" field.</summary>
-    public const int DefaultFloatFieldNumber = 71;
-    private readonly static float DefaultFloatDefaultValue = 51.5F;
-
-    private float defaultFloat_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public float DefaultFloat {
-      get { if ((_hasBits0 & 67108864) != 0) { return defaultFloat_; } else { return DefaultFloatDefaultValue; } }
-      set {
-        _hasBits0 |= 67108864;
-        defaultFloat_ = value;
-      }
-    }
-    /// <summary>Gets whether the "default_float" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasDefaultFloat {
-      get { return (_hasBits0 & 67108864) != 0; }
-    }
-    /// <summary>Clears the value of the "default_float" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearDefaultFloat() {
-      _hasBits0 &= ~67108864;
-    }
-
-    /// <summary>Field number for the "default_double" field.</summary>
-    public const int DefaultDoubleFieldNumber = 72;
-    private readonly static double DefaultDoubleDefaultValue = 52000D;
-
-    private double defaultDouble_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double DefaultDouble {
-      get { if ((_hasBits0 & 134217728) != 0) { return defaultDouble_; } else { return DefaultDoubleDefaultValue; } }
-      set {
-        _hasBits0 |= 134217728;
-        defaultDouble_ = value;
-      }
-    }
-    /// <summary>Gets whether the "default_double" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasDefaultDouble {
-      get { return (_hasBits0 & 134217728) != 0; }
-    }
-    /// <summary>Clears the value of the "default_double" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearDefaultDouble() {
-      _hasBits0 &= ~134217728;
-    }
-
-    /// <summary>Field number for the "default_bool" field.</summary>
-    public const int DefaultBoolFieldNumber = 73;
-    private readonly static bool DefaultBoolDefaultValue = true;
-
-    private bool defaultBool_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool DefaultBool {
-      get { if ((_hasBits0 & 268435456) != 0) { return defaultBool_; } else { return DefaultBoolDefaultValue; } }
-      set {
-        _hasBits0 |= 268435456;
-        defaultBool_ = value;
-      }
-    }
-    /// <summary>Gets whether the "default_bool" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasDefaultBool {
-      get { return (_hasBits0 & 268435456) != 0; }
-    }
-    /// <summary>Clears the value of the "default_bool" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearDefaultBool() {
-      _hasBits0 &= ~268435456;
-    }
-
-    /// <summary>Field number for the "default_string" field.</summary>
-    public const int DefaultStringFieldNumber = 74;
-    private readonly static string DefaultStringDefaultValue = global::System.Text.Encoding.UTF8.GetString(global::System.Convert.FromBase64String("aGVsbG8="), 0, 5);
-
-    private string defaultString_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string DefaultString {
-      get { return defaultString_ ?? DefaultStringDefaultValue; }
-      set {
-        defaultString_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-    /// <summary>Gets whether the "default_string" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasDefaultString {
-      get { return defaultString_ != null; }
-    }
-    /// <summary>Clears the value of the "default_string" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearDefaultString() {
-      defaultString_ = null;
-    }
-
-    /// <summary>Field number for the "default_bytes" field.</summary>
-    public const int DefaultBytesFieldNumber = 75;
-    private readonly static pb::ByteString DefaultBytesDefaultValue = pb::ByteString.FromBase64("d29ybGQ=");
-
-    private pb::ByteString defaultBytes_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pb::ByteString DefaultBytes {
-      get { return defaultBytes_ ?? DefaultBytesDefaultValue; }
-      set {
-        defaultBytes_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-    /// <summary>Gets whether the "default_bytes" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasDefaultBytes {
-      get { return defaultBytes_ != null; }
-    }
-    /// <summary>Clears the value of the "default_bytes" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearDefaultBytes() {
-      defaultBytes_ = null;
-    }
-
-    /// <summary>Field number for the "default_nested_enum" field.</summary>
-    public const int DefaultNestedEnumFieldNumber = 81;
-    private readonly static global::Google.Protobuf.TestProtos.Proto2.TestAllTypes.Types.NestedEnum DefaultNestedEnumDefaultValue = global::Google.Protobuf.TestProtos.Proto2.TestAllTypes.Types.NestedEnum.Bar;
-
-    private global::Google.Protobuf.TestProtos.Proto2.TestAllTypes.Types.NestedEnum defaultNestedEnum_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.TestProtos.Proto2.TestAllTypes.Types.NestedEnum DefaultNestedEnum {
-      get { if ((_hasBits0 & 536870912) != 0) { return defaultNestedEnum_; } else { return DefaultNestedEnumDefaultValue; } }
-      set {
-        _hasBits0 |= 536870912;
-        defaultNestedEnum_ = value;
-      }
-    }
-    /// <summary>Gets whether the "default_nested_enum" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasDefaultNestedEnum {
-      get { return (_hasBits0 & 536870912) != 0; }
-    }
-    /// <summary>Clears the value of the "default_nested_enum" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearDefaultNestedEnum() {
-      _hasBits0 &= ~536870912;
-    }
-
-    /// <summary>Field number for the "default_foreign_enum" field.</summary>
-    public const int DefaultForeignEnumFieldNumber = 82;
-    private readonly static global::Google.Protobuf.TestProtos.Proto2.ForeignEnum DefaultForeignEnumDefaultValue = global::Google.Protobuf.TestProtos.Proto2.ForeignEnum.ForeignBar;
-
-    private global::Google.Protobuf.TestProtos.Proto2.ForeignEnum defaultForeignEnum_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.TestProtos.Proto2.ForeignEnum DefaultForeignEnum {
-      get { if ((_hasBits0 & 1073741824) != 0) { return defaultForeignEnum_; } else { return DefaultForeignEnumDefaultValue; } }
-      set {
-        _hasBits0 |= 1073741824;
-        defaultForeignEnum_ = value;
-      }
-    }
-    /// <summary>Gets whether the "default_foreign_enum" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasDefaultForeignEnum {
-      get { return (_hasBits0 & 1073741824) != 0; }
-    }
-    /// <summary>Clears the value of the "default_foreign_enum" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearDefaultForeignEnum() {
-      _hasBits0 &= ~1073741824;
-    }
-
-    /// <summary>Field number for the "default_import_enum" field.</summary>
-    public const int DefaultImportEnumFieldNumber = 83;
-    private readonly static global::Google.Protobuf.TestProtos.Proto2.ImportEnum DefaultImportEnumDefaultValue = global::Google.Protobuf.TestProtos.Proto2.ImportEnum.ImportBar;
-
-    private global::Google.Protobuf.TestProtos.Proto2.ImportEnum defaultImportEnum_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.TestProtos.Proto2.ImportEnum DefaultImportEnum {
-      get { if ((_hasBits0 & -2147483648) != 0) { return defaultImportEnum_; } else { return DefaultImportEnumDefaultValue; } }
-      set {
-        _hasBits0 |= -2147483648;
-        defaultImportEnum_ = value;
-      }
-    }
-    /// <summary>Gets whether the "default_import_enum" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasDefaultImportEnum {
-      get { return (_hasBits0 & -2147483648) != 0; }
-    }
-    /// <summary>Clears the value of the "default_import_enum" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearDefaultImportEnum() {
-      _hasBits0 &= ~-2147483648;
-    }
-
-    /// <summary>Field number for the "default_string_piece" field.</summary>
-    public const int DefaultStringPieceFieldNumber = 84;
-    private readonly static string DefaultStringPieceDefaultValue = global::System.Text.Encoding.UTF8.GetString(global::System.Convert.FromBase64String("YWJj"), 0, 3);
-
-    private string defaultStringPiece_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string DefaultStringPiece {
-      get { return defaultStringPiece_ ?? DefaultStringPieceDefaultValue; }
-      set {
-        defaultStringPiece_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-    /// <summary>Gets whether the "default_string_piece" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasDefaultStringPiece {
-      get { return defaultStringPiece_ != null; }
-    }
-    /// <summary>Clears the value of the "default_string_piece" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearDefaultStringPiece() {
-      defaultStringPiece_ = null;
-    }
-
-    /// <summary>Field number for the "default_cord" field.</summary>
-    public const int DefaultCordFieldNumber = 85;
-    private readonly static string DefaultCordDefaultValue = global::System.Text.Encoding.UTF8.GetString(global::System.Convert.FromBase64String("MTIz"), 0, 3);
-
-    private string defaultCord_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string DefaultCord {
-      get { return defaultCord_ ?? DefaultCordDefaultValue; }
-      set {
-        defaultCord_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-    /// <summary>Gets whether the "default_cord" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasDefaultCord {
-      get { return defaultCord_ != null; }
-    }
-    /// <summary>Clears the value of the "default_cord" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearDefaultCord() {
-      defaultCord_ = null;
-    }
-
-    /// <summary>Field number for the "oneof_uint32" field.</summary>
-    public const int OneofUint32FieldNumber = 111;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public uint OneofUint32 {
-      get { return HasOneofUint32 ? (uint) oneofField_ : 0; }
-      set {
-        oneofField_ = value;
-        oneofFieldCase_ = OneofFieldOneofCase.OneofUint32;
-      }
-    }
-    /// <summary>Gets whether the "oneof_uint32" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasOneofUint32 {
-      get { return oneofFieldCase_ == OneofFieldOneofCase.OneofUint32; }
-    }
-    /// <summary> Clears the value of the oneof if it's currently set to "oneof_uint32" </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearOneofUint32() {
-      if (HasOneofUint32) {
-        ClearOneofField();
-      }
-    }
-
-    /// <summary>Field number for the "oneof_nested_message" field.</summary>
-    public const int OneofNestedMessageFieldNumber = 112;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.TestProtos.Proto2.TestAllTypes.Types.NestedMessage OneofNestedMessage {
-      get { return oneofFieldCase_ == OneofFieldOneofCase.OneofNestedMessage ? (global::Google.Protobuf.TestProtos.Proto2.TestAllTypes.Types.NestedMessage) oneofField_ : null; }
-      set {
-        oneofField_ = value;
-        oneofFieldCase_ = value == null ? OneofFieldOneofCase.None : OneofFieldOneofCase.OneofNestedMessage;
-      }
-    }
-
-    /// <summary>Field number for the "oneof_string" field.</summary>
-    public const int OneofStringFieldNumber = 113;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string OneofString {
-      get { return HasOneofString ? (string) oneofField_ : ""; }
-      set {
-        oneofField_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-        oneofFieldCase_ = OneofFieldOneofCase.OneofString;
-      }
-    }
-    /// <summary>Gets whether the "oneof_string" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasOneofString {
-      get { return oneofFieldCase_ == OneofFieldOneofCase.OneofString; }
-    }
-    /// <summary> Clears the value of the oneof if it's currently set to "oneof_string" </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearOneofString() {
-      if (HasOneofString) {
-        ClearOneofField();
-      }
-    }
-
-    /// <summary>Field number for the "oneof_bytes" field.</summary>
-    public const int OneofBytesFieldNumber = 114;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pb::ByteString OneofBytes {
-      get { return HasOneofBytes ? (pb::ByteString) oneofField_ : pb::ByteString.Empty; }
-      set {
-        oneofField_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-        oneofFieldCase_ = OneofFieldOneofCase.OneofBytes;
-      }
-    }
-    /// <summary>Gets whether the "oneof_bytes" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasOneofBytes {
-      get { return oneofFieldCase_ == OneofFieldOneofCase.OneofBytes; }
-    }
-    /// <summary> Clears the value of the oneof if it's currently set to "oneof_bytes" </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearOneofBytes() {
-      if (HasOneofBytes) {
-        ClearOneofField();
-      }
-    }
-
-    private object oneofField_;
-    /// <summary>Enum of possible cases for the "oneof_field" oneof.</summary>
-    public enum OneofFieldOneofCase {
-      None = 0,
-      OneofUint32 = 111,
-      OneofNestedMessage = 112,
-      OneofString = 113,
-      OneofBytes = 114,
-    }
-    private OneofFieldOneofCase oneofFieldCase_ = OneofFieldOneofCase.None;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public OneofFieldOneofCase OneofFieldCase {
-      get { return oneofFieldCase_; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearOneofField() {
-      oneofFieldCase_ = OneofFieldOneofCase.None;
-      oneofField_ = null;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as TestAllTypes);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(TestAllTypes other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (OptionalInt32 != other.OptionalInt32) return false;
-      if (OptionalInt64 != other.OptionalInt64) return false;
-      if (OptionalUint32 != other.OptionalUint32) return false;
-      if (OptionalUint64 != other.OptionalUint64) return false;
-      if (OptionalSint32 != other.OptionalSint32) return false;
-      if (OptionalSint64 != other.OptionalSint64) return false;
-      if (OptionalFixed32 != other.OptionalFixed32) return false;
-      if (OptionalFixed64 != other.OptionalFixed64) return false;
-      if (OptionalSfixed32 != other.OptionalSfixed32) return false;
-      if (OptionalSfixed64 != other.OptionalSfixed64) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.Equals(OptionalFloat, other.OptionalFloat)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.Equals(OptionalDouble, other.OptionalDouble)) return false;
-      if (OptionalBool != other.OptionalBool) return false;
-      if (OptionalString != other.OptionalString) return false;
-      if (OptionalBytes != other.OptionalBytes) return false;
-      if (!object.Equals(OptionalGroup, other.OptionalGroup)) return false;
-      if (!object.Equals(OptionalNestedMessage, other.OptionalNestedMessage)) return false;
-      if (!object.Equals(OptionalForeignMessage, other.OptionalForeignMessage)) return false;
-      if (!object.Equals(OptionalImportMessage, other.OptionalImportMessage)) return false;
-      if (OptionalNestedEnum != other.OptionalNestedEnum) return false;
-      if (OptionalForeignEnum != other.OptionalForeignEnum) return false;
-      if (OptionalImportEnum != other.OptionalImportEnum) return false;
-      if (OptionalStringPiece != other.OptionalStringPiece) return false;
-      if (OptionalCord != other.OptionalCord) return false;
-      if (!object.Equals(OptionalPublicImportMessage, other.OptionalPublicImportMessage)) return false;
-      if (!object.Equals(OptionalLazyMessage, other.OptionalLazyMessage)) return false;
-      if(!repeatedInt32_.Equals(other.repeatedInt32_)) return false;
-      if(!repeatedInt64_.Equals(other.repeatedInt64_)) return false;
-      if(!repeatedUint32_.Equals(other.repeatedUint32_)) return false;
-      if(!repeatedUint64_.Equals(other.repeatedUint64_)) return false;
-      if(!repeatedSint32_.Equals(other.repeatedSint32_)) return false;
-      if(!repeatedSint64_.Equals(other.repeatedSint64_)) return false;
-      if(!repeatedFixed32_.Equals(other.repeatedFixed32_)) return false;
-      if(!repeatedFixed64_.Equals(other.repeatedFixed64_)) return false;
-      if(!repeatedSfixed32_.Equals(other.repeatedSfixed32_)) return false;
-      if(!repeatedSfixed64_.Equals(other.repeatedSfixed64_)) return false;
-      if(!repeatedFloat_.Equals(other.repeatedFloat_)) return false;
-      if(!repeatedDouble_.Equals(other.repeatedDouble_)) return false;
-      if(!repeatedBool_.Equals(other.repeatedBool_)) return false;
-      if(!repeatedString_.Equals(other.repeatedString_)) return false;
-      if(!repeatedBytes_.Equals(other.repeatedBytes_)) return false;
-      if(!repeatedGroup_.Equals(other.repeatedGroup_)) return false;
-      if(!repeatedNestedMessage_.Equals(other.repeatedNestedMessage_)) return false;
-      if(!repeatedForeignMessage_.Equals(other.repeatedForeignMessage_)) return false;
-      if(!repeatedImportMessage_.Equals(other.repeatedImportMessage_)) return false;
-      if(!repeatedNestedEnum_.Equals(other.repeatedNestedEnum_)) return false;
-      if(!repeatedForeignEnum_.Equals(other.repeatedForeignEnum_)) return false;
-      if(!repeatedImportEnum_.Equals(other.repeatedImportEnum_)) return false;
-      if(!repeatedStringPiece_.Equals(other.repeatedStringPiece_)) return false;
-      if(!repeatedCord_.Equals(other.repeatedCord_)) return false;
-      if(!repeatedLazyMessage_.Equals(other.repeatedLazyMessage_)) return false;
-      if (DefaultInt32 != other.DefaultInt32) return false;
-      if (DefaultInt64 != other.DefaultInt64) return false;
-      if (DefaultUint32 != other.DefaultUint32) return false;
-      if (DefaultUint64 != other.DefaultUint64) return false;
-      if (DefaultSint32 != other.DefaultSint32) return false;
-      if (DefaultSint64 != other.DefaultSint64) return false;
-      if (DefaultFixed32 != other.DefaultFixed32) return false;
-      if (DefaultFixed64 != other.DefaultFixed64) return false;
-      if (DefaultSfixed32 != other.DefaultSfixed32) return false;
-      if (DefaultSfixed64 != other.DefaultSfixed64) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.Equals(DefaultFloat, other.DefaultFloat)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.Equals(DefaultDouble, other.DefaultDouble)) return false;
-      if (DefaultBool != other.DefaultBool) return false;
-      if (DefaultString != other.DefaultString) return false;
-      if (DefaultBytes != other.DefaultBytes) return false;
-      if (DefaultNestedEnum != other.DefaultNestedEnum) return false;
-      if (DefaultForeignEnum != other.DefaultForeignEnum) return false;
-      if (DefaultImportEnum != other.DefaultImportEnum) return false;
-      if (DefaultStringPiece != other.DefaultStringPiece) return false;
-      if (DefaultCord != other.DefaultCord) return false;
-      if (OneofUint32 != other.OneofUint32) return false;
-      if (!object.Equals(OneofNestedMessage, other.OneofNestedMessage)) return false;
-      if (OneofString != other.OneofString) return false;
-      if (OneofBytes != other.OneofBytes) return false;
-      if (OneofFieldCase != other.OneofFieldCase) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (HasOptionalInt32) hash ^= OptionalInt32.GetHashCode();
-      if (HasOptionalInt64) hash ^= OptionalInt64.GetHashCode();
-      if (HasOptionalUint32) hash ^= OptionalUint32.GetHashCode();
-      if (HasOptionalUint64) hash ^= OptionalUint64.GetHashCode();
-      if (HasOptionalSint32) hash ^= OptionalSint32.GetHashCode();
-      if (HasOptionalSint64) hash ^= OptionalSint64.GetHashCode();
-      if (HasOptionalFixed32) hash ^= OptionalFixed32.GetHashCode();
-      if (HasOptionalFixed64) hash ^= OptionalFixed64.GetHashCode();
-      if (HasOptionalSfixed32) hash ^= OptionalSfixed32.GetHashCode();
-      if (HasOptionalSfixed64) hash ^= OptionalSfixed64.GetHashCode();
-      if (HasOptionalFloat) hash ^= pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.GetHashCode(OptionalFloat);
-      if (HasOptionalDouble) hash ^= pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.GetHashCode(OptionalDouble);
-      if (HasOptionalBool) hash ^= OptionalBool.GetHashCode();
-      if (HasOptionalString) hash ^= OptionalString.GetHashCode();
-      if (HasOptionalBytes) hash ^= OptionalBytes.GetHashCode();
-      if (HasOptionalGroup) hash ^= OptionalGroup.GetHashCode();
-      if (optionalNestedMessage_ != null) hash ^= OptionalNestedMessage.GetHashCode();
-      if (optionalForeignMessage_ != null) hash ^= OptionalForeignMessage.GetHashCode();
-      if (optionalImportMessage_ != null) hash ^= OptionalImportMessage.GetHashCode();
-      if (HasOptionalNestedEnum) hash ^= OptionalNestedEnum.GetHashCode();
-      if (HasOptionalForeignEnum) hash ^= OptionalForeignEnum.GetHashCode();
-      if (HasOptionalImportEnum) hash ^= OptionalImportEnum.GetHashCode();
-      if (HasOptionalStringPiece) hash ^= OptionalStringPiece.GetHashCode();
-      if (HasOptionalCord) hash ^= OptionalCord.GetHashCode();
-      if (optionalPublicImportMessage_ != null) hash ^= OptionalPublicImportMessage.GetHashCode();
-      if (optionalLazyMessage_ != null) hash ^= OptionalLazyMessage.GetHashCode();
-      hash ^= repeatedInt32_.GetHashCode();
-      hash ^= repeatedInt64_.GetHashCode();
-      hash ^= repeatedUint32_.GetHashCode();
-      hash ^= repeatedUint64_.GetHashCode();
-      hash ^= repeatedSint32_.GetHashCode();
-      hash ^= repeatedSint64_.GetHashCode();
-      hash ^= repeatedFixed32_.GetHashCode();
-      hash ^= repeatedFixed64_.GetHashCode();
-      hash ^= repeatedSfixed32_.GetHashCode();
-      hash ^= repeatedSfixed64_.GetHashCode();
-      hash ^= repeatedFloat_.GetHashCode();
-      hash ^= repeatedDouble_.GetHashCode();
-      hash ^= repeatedBool_.GetHashCode();
-      hash ^= repeatedString_.GetHashCode();
-      hash ^= repeatedBytes_.GetHashCode();
-      hash ^= repeatedGroup_.GetHashCode();
-      hash ^= repeatedNestedMessage_.GetHashCode();
-      hash ^= repeatedForeignMessage_.GetHashCode();
-      hash ^= repeatedImportMessage_.GetHashCode();
-      hash ^= repeatedNestedEnum_.GetHashCode();
-      hash ^= repeatedForeignEnum_.GetHashCode();
-      hash ^= repeatedImportEnum_.GetHashCode();
-      hash ^= repeatedStringPiece_.GetHashCode();
-      hash ^= repeatedCord_.GetHashCode();
-      hash ^= repeatedLazyMessage_.GetHashCode();
-      if (HasDefaultInt32) hash ^= DefaultInt32.GetHashCode();
-      if (HasDefaultInt64) hash ^= DefaultInt64.GetHashCode();
-      if (HasDefaultUint32) hash ^= DefaultUint32.GetHashCode();
-      if (HasDefaultUint64) hash ^= DefaultUint64.GetHashCode();
-      if (HasDefaultSint32) hash ^= DefaultSint32.GetHashCode();
-      if (HasDefaultSint64) hash ^= DefaultSint64.GetHashCode();
-      if (HasDefaultFixed32) hash ^= DefaultFixed32.GetHashCode();
-      if (HasDefaultFixed64) hash ^= DefaultFixed64.GetHashCode();
-      if (HasDefaultSfixed32) hash ^= DefaultSfixed32.GetHashCode();
-      if (HasDefaultSfixed64) hash ^= DefaultSfixed64.GetHashCode();
-      if (HasDefaultFloat) hash ^= pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.GetHashCode(DefaultFloat);
-      if (HasDefaultDouble) hash ^= pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.GetHashCode(DefaultDouble);
-      if (HasDefaultBool) hash ^= DefaultBool.GetHashCode();
-      if (HasDefaultString) hash ^= DefaultString.GetHashCode();
-      if (HasDefaultBytes) hash ^= DefaultBytes.GetHashCode();
-      if (HasDefaultNestedEnum) hash ^= DefaultNestedEnum.GetHashCode();
-      if (HasDefaultForeignEnum) hash ^= DefaultForeignEnum.GetHashCode();
-      if (HasDefaultImportEnum) hash ^= DefaultImportEnum.GetHashCode();
-      if (HasDefaultStringPiece) hash ^= DefaultStringPiece.GetHashCode();
-      if (HasDefaultCord) hash ^= DefaultCord.GetHashCode();
-      if (HasOneofUint32) hash ^= OneofUint32.GetHashCode();
-      if (oneofFieldCase_ == OneofFieldOneofCase.OneofNestedMessage) hash ^= OneofNestedMessage.GetHashCode();
-      if (HasOneofString) hash ^= OneofString.GetHashCode();
-      if (HasOneofBytes) hash ^= OneofBytes.GetHashCode();
-      hash ^= (int) oneofFieldCase_;
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (HasOptionalInt32) {
-        output.WriteRawTag(8);
-        output.WriteInt32(OptionalInt32);
-      }
-      if (HasOptionalInt64) {
-        output.WriteRawTag(16);
-        output.WriteInt64(OptionalInt64);
-      }
-      if (HasOptionalUint32) {
-        output.WriteRawTag(24);
-        output.WriteUInt32(OptionalUint32);
-      }
-      if (HasOptionalUint64) {
-        output.WriteRawTag(32);
-        output.WriteUInt64(OptionalUint64);
-      }
-      if (HasOptionalSint32) {
-        output.WriteRawTag(40);
-        output.WriteSInt32(OptionalSint32);
-      }
-      if (HasOptionalSint64) {
-        output.WriteRawTag(48);
-        output.WriteSInt64(OptionalSint64);
-      }
-      if (HasOptionalFixed32) {
-        output.WriteRawTag(61);
-        output.WriteFixed32(OptionalFixed32);
-      }
-      if (HasOptionalFixed64) {
-        output.WriteRawTag(65);
-        output.WriteFixed64(OptionalFixed64);
-      }
-      if (HasOptionalSfixed32) {
-        output.WriteRawTag(77);
-        output.WriteSFixed32(OptionalSfixed32);
-      }
-      if (HasOptionalSfixed64) {
-        output.WriteRawTag(81);
-        output.WriteSFixed64(OptionalSfixed64);
-      }
-      if (HasOptionalFloat) {
-        output.WriteRawTag(93);
-        output.WriteFloat(OptionalFloat);
-      }
-      if (HasOptionalDouble) {
-        output.WriteRawTag(97);
-        output.WriteDouble(OptionalDouble);
-      }
-      if (HasOptionalBool) {
-        output.WriteRawTag(104);
-        output.WriteBool(OptionalBool);
-      }
-      if (HasOptionalString) {
-        output.WriteRawTag(114);
-        output.WriteString(OptionalString);
-      }
-      if (HasOptionalBytes) {
-        output.WriteRawTag(122);
-        output.WriteBytes(OptionalBytes);
-      }
-      if (HasOptionalGroup) {
-        output.WriteRawTag(131, 1);
-        output.WriteGroup(OptionalGroup);
-        output.WriteRawTag(132, 1);
-      }
-      if (optionalNestedMessage_ != null) {
-        output.WriteRawTag(146, 1);
-        output.WriteMessage(OptionalNestedMessage);
-      }
-      if (optionalForeignMessage_ != null) {
-        output.WriteRawTag(154, 1);
-        output.WriteMessage(OptionalForeignMessage);
-      }
-      if (optionalImportMessage_ != null) {
-        output.WriteRawTag(162, 1);
-        output.WriteMessage(OptionalImportMessage);
-      }
-      if (HasOptionalNestedEnum) {
-        output.WriteRawTag(168, 1);
-        output.WriteEnum((int) OptionalNestedEnum);
-      }
-      if (HasOptionalForeignEnum) {
-        output.WriteRawTag(176, 1);
-        output.WriteEnum((int) OptionalForeignEnum);
-      }
-      if (HasOptionalImportEnum) {
-        output.WriteRawTag(184, 1);
-        output.WriteEnum((int) OptionalImportEnum);
-      }
-      if (HasOptionalStringPiece) {
-        output.WriteRawTag(194, 1);
-        output.WriteString(OptionalStringPiece);
-      }
-      if (HasOptionalCord) {
-        output.WriteRawTag(202, 1);
-        output.WriteString(OptionalCord);
-      }
-      if (optionalPublicImportMessage_ != null) {
-        output.WriteRawTag(210, 1);
-        output.WriteMessage(OptionalPublicImportMessage);
-      }
-      if (optionalLazyMessage_ != null) {
-        output.WriteRawTag(218, 1);
-        output.WriteMessage(OptionalLazyMessage);
-      }
-      repeatedInt32_.WriteTo(output, _repeated_repeatedInt32_codec);
-      repeatedInt64_.WriteTo(output, _repeated_repeatedInt64_codec);
-      repeatedUint32_.WriteTo(output, _repeated_repeatedUint32_codec);
-      repeatedUint64_.WriteTo(output, _repeated_repeatedUint64_codec);
-      repeatedSint32_.WriteTo(output, _repeated_repeatedSint32_codec);
-      repeatedSint64_.WriteTo(output, _repeated_repeatedSint64_codec);
-      repeatedFixed32_.WriteTo(output, _repeated_repeatedFixed32_codec);
-      repeatedFixed64_.WriteTo(output, _repeated_repeatedFixed64_codec);
-      repeatedSfixed32_.WriteTo(output, _repeated_repeatedSfixed32_codec);
-      repeatedSfixed64_.WriteTo(output, _repeated_repeatedSfixed64_codec);
-      repeatedFloat_.WriteTo(output, _repeated_repeatedFloat_codec);
-      repeatedDouble_.WriteTo(output, _repeated_repeatedDouble_codec);
-      repeatedBool_.WriteTo(output, _repeated_repeatedBool_codec);
-      repeatedString_.WriteTo(output, _repeated_repeatedString_codec);
-      repeatedBytes_.WriteTo(output, _repeated_repeatedBytes_codec);
-      repeatedGroup_.WriteTo(output, _repeated_repeatedGroup_codec);
-      repeatedNestedMessage_.WriteTo(output, _repeated_repeatedNestedMessage_codec);
-      repeatedForeignMessage_.WriteTo(output, _repeated_repeatedForeignMessage_codec);
-      repeatedImportMessage_.WriteTo(output, _repeated_repeatedImportMessage_codec);
-      repeatedNestedEnum_.WriteTo(output, _repeated_repeatedNestedEnum_codec);
-      repeatedForeignEnum_.WriteTo(output, _repeated_repeatedForeignEnum_codec);
-      repeatedImportEnum_.WriteTo(output, _repeated_repeatedImportEnum_codec);
-      repeatedStringPiece_.WriteTo(output, _repeated_repeatedStringPiece_codec);
-      repeatedCord_.WriteTo(output, _repeated_repeatedCord_codec);
-      repeatedLazyMessage_.WriteTo(output, _repeated_repeatedLazyMessage_codec);
-      if (HasDefaultInt32) {
-        output.WriteRawTag(232, 3);
-        output.WriteInt32(DefaultInt32);
-      }
-      if (HasDefaultInt64) {
-        output.WriteRawTag(240, 3);
-        output.WriteInt64(DefaultInt64);
-      }
-      if (HasDefaultUint32) {
-        output.WriteRawTag(248, 3);
-        output.WriteUInt32(DefaultUint32);
-      }
-      if (HasDefaultUint64) {
-        output.WriteRawTag(128, 4);
-        output.WriteUInt64(DefaultUint64);
-      }
-      if (HasDefaultSint32) {
-        output.WriteRawTag(136, 4);
-        output.WriteSInt32(DefaultSint32);
-      }
-      if (HasDefaultSint64) {
-        output.WriteRawTag(144, 4);
-        output.WriteSInt64(DefaultSint64);
-      }
-      if (HasDefaultFixed32) {
-        output.WriteRawTag(157, 4);
-        output.WriteFixed32(DefaultFixed32);
-      }
-      if (HasDefaultFixed64) {
-        output.WriteRawTag(161, 4);
-        output.WriteFixed64(DefaultFixed64);
-      }
-      if (HasDefaultSfixed32) {
-        output.WriteRawTag(173, 4);
-        output.WriteSFixed32(DefaultSfixed32);
-      }
-      if (HasDefaultSfixed64) {
-        output.WriteRawTag(177, 4);
-        output.WriteSFixed64(DefaultSfixed64);
-      }
-      if (HasDefaultFloat) {
-        output.WriteRawTag(189, 4);
-        output.WriteFloat(DefaultFloat);
-      }
-      if (HasDefaultDouble) {
-        output.WriteRawTag(193, 4);
-        output.WriteDouble(DefaultDouble);
-      }
-      if (HasDefaultBool) {
-        output.WriteRawTag(200, 4);
-        output.WriteBool(DefaultBool);
-      }
-      if (HasDefaultString) {
-        output.WriteRawTag(210, 4);
-        output.WriteString(DefaultString);
-      }
-      if (HasDefaultBytes) {
-        output.WriteRawTag(218, 4);
-        output.WriteBytes(DefaultBytes);
-      }
-      if (HasDefaultNestedEnum) {
-        output.WriteRawTag(136, 5);
-        output.WriteEnum((int) DefaultNestedEnum);
-      }
-      if (HasDefaultForeignEnum) {
-        output.WriteRawTag(144, 5);
-        output.WriteEnum((int) DefaultForeignEnum);
-      }
-      if (HasDefaultImportEnum) {
-        output.WriteRawTag(152, 5);
-        output.WriteEnum((int) DefaultImportEnum);
-      }
-      if (HasDefaultStringPiece) {
-        output.WriteRawTag(162, 5);
-        output.WriteString(DefaultStringPiece);
-      }
-      if (HasDefaultCord) {
-        output.WriteRawTag(170, 5);
-        output.WriteString(DefaultCord);
-      }
-      if (HasOneofUint32) {
-        output.WriteRawTag(248, 6);
-        output.WriteUInt32(OneofUint32);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.OneofNestedMessage) {
-        output.WriteRawTag(130, 7);
-        output.WriteMessage(OneofNestedMessage);
-      }
-      if (HasOneofString) {
-        output.WriteRawTag(138, 7);
-        output.WriteString(OneofString);
-      }
-      if (HasOneofBytes) {
-        output.WriteRawTag(146, 7);
-        output.WriteBytes(OneofBytes);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (HasOptionalInt32) {
-        output.WriteRawTag(8);
-        output.WriteInt32(OptionalInt32);
-      }
-      if (HasOptionalInt64) {
-        output.WriteRawTag(16);
-        output.WriteInt64(OptionalInt64);
-      }
-      if (HasOptionalUint32) {
-        output.WriteRawTag(24);
-        output.WriteUInt32(OptionalUint32);
-      }
-      if (HasOptionalUint64) {
-        output.WriteRawTag(32);
-        output.WriteUInt64(OptionalUint64);
-      }
-      if (HasOptionalSint32) {
-        output.WriteRawTag(40);
-        output.WriteSInt32(OptionalSint32);
-      }
-      if (HasOptionalSint64) {
-        output.WriteRawTag(48);
-        output.WriteSInt64(OptionalSint64);
-      }
-      if (HasOptionalFixed32) {
-        output.WriteRawTag(61);
-        output.WriteFixed32(OptionalFixed32);
-      }
-      if (HasOptionalFixed64) {
-        output.WriteRawTag(65);
-        output.WriteFixed64(OptionalFixed64);
-      }
-      if (HasOptionalSfixed32) {
-        output.WriteRawTag(77);
-        output.WriteSFixed32(OptionalSfixed32);
-      }
-      if (HasOptionalSfixed64) {
-        output.WriteRawTag(81);
-        output.WriteSFixed64(OptionalSfixed64);
-      }
-      if (HasOptionalFloat) {
-        output.WriteRawTag(93);
-        output.WriteFloat(OptionalFloat);
-      }
-      if (HasOptionalDouble) {
-        output.WriteRawTag(97);
-        output.WriteDouble(OptionalDouble);
-      }
-      if (HasOptionalBool) {
-        output.WriteRawTag(104);
-        output.WriteBool(OptionalBool);
-      }
-      if (HasOptionalString) {
-        output.WriteRawTag(114);
-        output.WriteString(OptionalString);
-      }
-      if (HasOptionalBytes) {
-        output.WriteRawTag(122);
-        output.WriteBytes(OptionalBytes);
-      }
-      if (HasOptionalGroup) {
-        output.WriteRawTag(131, 1);
-        output.WriteGroup(OptionalGroup);
-        output.WriteRawTag(132, 1);
-      }
-      if (optionalNestedMessage_ != null) {
-        output.WriteRawTag(146, 1);
-        output.WriteMessage(OptionalNestedMessage);
-      }
-      if (optionalForeignMessage_ != null) {
-        output.WriteRawTag(154, 1);
-        output.WriteMessage(OptionalForeignMessage);
-      }
-      if (optionalImportMessage_ != null) {
-        output.WriteRawTag(162, 1);
-        output.WriteMessage(OptionalImportMessage);
-      }
-      if (HasOptionalNestedEnum) {
-        output.WriteRawTag(168, 1);
-        output.WriteEnum((int) OptionalNestedEnum);
-      }
-      if (HasOptionalForeignEnum) {
-        output.WriteRawTag(176, 1);
-        output.WriteEnum((int) OptionalForeignEnum);
-      }
-      if (HasOptionalImportEnum) {
-        output.WriteRawTag(184, 1);
-        output.WriteEnum((int) OptionalImportEnum);
-      }
-      if (HasOptionalStringPiece) {
-        output.WriteRawTag(194, 1);
-        output.WriteString(OptionalStringPiece);
-      }
-      if (HasOptionalCord) {
-        output.WriteRawTag(202, 1);
-        output.WriteString(OptionalCord);
-      }
-      if (optionalPublicImportMessage_ != null) {
-        output.WriteRawTag(210, 1);
-        output.WriteMessage(OptionalPublicImportMessage);
-      }
-      if (optionalLazyMessage_ != null) {
-        output.WriteRawTag(218, 1);
-        output.WriteMessage(OptionalLazyMessage);
-      }
-      repeatedInt32_.WriteTo(ref output, _repeated_repeatedInt32_codec);
-      repeatedInt64_.WriteTo(ref output, _repeated_repeatedInt64_codec);
-      repeatedUint32_.WriteTo(ref output, _repeated_repeatedUint32_codec);
-      repeatedUint64_.WriteTo(ref output, _repeated_repeatedUint64_codec);
-      repeatedSint32_.WriteTo(ref output, _repeated_repeatedSint32_codec);
-      repeatedSint64_.WriteTo(ref output, _repeated_repeatedSint64_codec);
-      repeatedFixed32_.WriteTo(ref output, _repeated_repeatedFixed32_codec);
-      repeatedFixed64_.WriteTo(ref output, _repeated_repeatedFixed64_codec);
-      repeatedSfixed32_.WriteTo(ref output, _repeated_repeatedSfixed32_codec);
-      repeatedSfixed64_.WriteTo(ref output, _repeated_repeatedSfixed64_codec);
-      repeatedFloat_.WriteTo(ref output, _repeated_repeatedFloat_codec);
-      repeatedDouble_.WriteTo(ref output, _repeated_repeatedDouble_codec);
-      repeatedBool_.WriteTo(ref output, _repeated_repeatedBool_codec);
-      repeatedString_.WriteTo(ref output, _repeated_repeatedString_codec);
-      repeatedBytes_.WriteTo(ref output, _repeated_repeatedBytes_codec);
-      repeatedGroup_.WriteTo(ref output, _repeated_repeatedGroup_codec);
-      repeatedNestedMessage_.WriteTo(ref output, _repeated_repeatedNestedMessage_codec);
-      repeatedForeignMessage_.WriteTo(ref output, _repeated_repeatedForeignMessage_codec);
-      repeatedImportMessage_.WriteTo(ref output, _repeated_repeatedImportMessage_codec);
-      repeatedNestedEnum_.WriteTo(ref output, _repeated_repeatedNestedEnum_codec);
-      repeatedForeignEnum_.WriteTo(ref output, _repeated_repeatedForeignEnum_codec);
-      repeatedImportEnum_.WriteTo(ref output, _repeated_repeatedImportEnum_codec);
-      repeatedStringPiece_.WriteTo(ref output, _repeated_repeatedStringPiece_codec);
-      repeatedCord_.WriteTo(ref output, _repeated_repeatedCord_codec);
-      repeatedLazyMessage_.WriteTo(ref output, _repeated_repeatedLazyMessage_codec);
-      if (HasDefaultInt32) {
-        output.WriteRawTag(232, 3);
-        output.WriteInt32(DefaultInt32);
-      }
-      if (HasDefaultInt64) {
-        output.WriteRawTag(240, 3);
-        output.WriteInt64(DefaultInt64);
-      }
-      if (HasDefaultUint32) {
-        output.WriteRawTag(248, 3);
-        output.WriteUInt32(DefaultUint32);
-      }
-      if (HasDefaultUint64) {
-        output.WriteRawTag(128, 4);
-        output.WriteUInt64(DefaultUint64);
-      }
-      if (HasDefaultSint32) {
-        output.WriteRawTag(136, 4);
-        output.WriteSInt32(DefaultSint32);
-      }
-      if (HasDefaultSint64) {
-        output.WriteRawTag(144, 4);
-        output.WriteSInt64(DefaultSint64);
-      }
-      if (HasDefaultFixed32) {
-        output.WriteRawTag(157, 4);
-        output.WriteFixed32(DefaultFixed32);
-      }
-      if (HasDefaultFixed64) {
-        output.WriteRawTag(161, 4);
-        output.WriteFixed64(DefaultFixed64);
-      }
-      if (HasDefaultSfixed32) {
-        output.WriteRawTag(173, 4);
-        output.WriteSFixed32(DefaultSfixed32);
-      }
-      if (HasDefaultSfixed64) {
-        output.WriteRawTag(177, 4);
-        output.WriteSFixed64(DefaultSfixed64);
-      }
-      if (HasDefaultFloat) {
-        output.WriteRawTag(189, 4);
-        output.WriteFloat(DefaultFloat);
-      }
-      if (HasDefaultDouble) {
-        output.WriteRawTag(193, 4);
-        output.WriteDouble(DefaultDouble);
-      }
-      if (HasDefaultBool) {
-        output.WriteRawTag(200, 4);
-        output.WriteBool(DefaultBool);
-      }
-      if (HasDefaultString) {
-        output.WriteRawTag(210, 4);
-        output.WriteString(DefaultString);
-      }
-      if (HasDefaultBytes) {
-        output.WriteRawTag(218, 4);
-        output.WriteBytes(DefaultBytes);
-      }
-      if (HasDefaultNestedEnum) {
-        output.WriteRawTag(136, 5);
-        output.WriteEnum((int) DefaultNestedEnum);
-      }
-      if (HasDefaultForeignEnum) {
-        output.WriteRawTag(144, 5);
-        output.WriteEnum((int) DefaultForeignEnum);
-      }
-      if (HasDefaultImportEnum) {
-        output.WriteRawTag(152, 5);
-        output.WriteEnum((int) DefaultImportEnum);
-      }
-      if (HasDefaultStringPiece) {
-        output.WriteRawTag(162, 5);
-        output.WriteString(DefaultStringPiece);
-      }
-      if (HasDefaultCord) {
-        output.WriteRawTag(170, 5);
-        output.WriteString(DefaultCord);
-      }
-      if (HasOneofUint32) {
-        output.WriteRawTag(248, 6);
-        output.WriteUInt32(OneofUint32);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.OneofNestedMessage) {
-        output.WriteRawTag(130, 7);
-        output.WriteMessage(OneofNestedMessage);
-      }
-      if (HasOneofString) {
-        output.WriteRawTag(138, 7);
-        output.WriteString(OneofString);
-      }
-      if (HasOneofBytes) {
-        output.WriteRawTag(146, 7);
-        output.WriteBytes(OneofBytes);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (HasOptionalInt32) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(OptionalInt32);
-      }
-      if (HasOptionalInt64) {
-        size += 1 + pb::CodedOutputStream.ComputeInt64Size(OptionalInt64);
-      }
-      if (HasOptionalUint32) {
-        size += 1 + pb::CodedOutputStream.ComputeUInt32Size(OptionalUint32);
-      }
-      if (HasOptionalUint64) {
-        size += 1 + pb::CodedOutputStream.ComputeUInt64Size(OptionalUint64);
-      }
-      if (HasOptionalSint32) {
-        size += 1 + pb::CodedOutputStream.ComputeSInt32Size(OptionalSint32);
-      }
-      if (HasOptionalSint64) {
-        size += 1 + pb::CodedOutputStream.ComputeSInt64Size(OptionalSint64);
-      }
-      if (HasOptionalFixed32) {
-        size += 1 + 4;
-      }
-      if (HasOptionalFixed64) {
-        size += 1 + 8;
-      }
-      if (HasOptionalSfixed32) {
-        size += 1 + 4;
-      }
-      if (HasOptionalSfixed64) {
-        size += 1 + 8;
-      }
-      if (HasOptionalFloat) {
-        size += 1 + 4;
-      }
-      if (HasOptionalDouble) {
-        size += 1 + 8;
-      }
-      if (HasOptionalBool) {
-        size += 1 + 1;
-      }
-      if (HasOptionalString) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(OptionalString);
-      }
-      if (HasOptionalBytes) {
-        size += 1 + pb::CodedOutputStream.ComputeBytesSize(OptionalBytes);
-      }
-      if (HasOptionalGroup) {
-        size += 4 + pb::CodedOutputStream.ComputeGroupSize(OptionalGroup);
-      }
-      if (optionalNestedMessage_ != null) {
-        size += 2 + pb::CodedOutputStream.ComputeMessageSize(OptionalNestedMessage);
-      }
-      if (optionalForeignMessage_ != null) {
-        size += 2 + pb::CodedOutputStream.ComputeMessageSize(OptionalForeignMessage);
-      }
-      if (optionalImportMessage_ != null) {
-        size += 2 + pb::CodedOutputStream.ComputeMessageSize(OptionalImportMessage);
-      }
-      if (HasOptionalNestedEnum) {
-        size += 2 + pb::CodedOutputStream.ComputeEnumSize((int) OptionalNestedEnum);
-      }
-      if (HasOptionalForeignEnum) {
-        size += 2 + pb::CodedOutputStream.ComputeEnumSize((int) OptionalForeignEnum);
-      }
-      if (HasOptionalImportEnum) {
-        size += 2 + pb::CodedOutputStream.ComputeEnumSize((int) OptionalImportEnum);
-      }
-      if (HasOptionalStringPiece) {
-        size += 2 + pb::CodedOutputStream.ComputeStringSize(OptionalStringPiece);
-      }
-      if (HasOptionalCord) {
-        size += 2 + pb::CodedOutputStream.ComputeStringSize(OptionalCord);
-      }
-      if (optionalPublicImportMessage_ != null) {
-        size += 2 + pb::CodedOutputStream.ComputeMessageSize(OptionalPublicImportMessage);
-      }
-      if (optionalLazyMessage_ != null) {
-        size += 2 + pb::CodedOutputStream.ComputeMessageSize(OptionalLazyMessage);
-      }
-      size += repeatedInt32_.CalculateSize(_repeated_repeatedInt32_codec);
-      size += repeatedInt64_.CalculateSize(_repeated_repeatedInt64_codec);
-      size += repeatedUint32_.CalculateSize(_repeated_repeatedUint32_codec);
-      size += repeatedUint64_.CalculateSize(_repeated_repeatedUint64_codec);
-      size += repeatedSint32_.CalculateSize(_repeated_repeatedSint32_codec);
-      size += repeatedSint64_.CalculateSize(_repeated_repeatedSint64_codec);
-      size += repeatedFixed32_.CalculateSize(_repeated_repeatedFixed32_codec);
-      size += repeatedFixed64_.CalculateSize(_repeated_repeatedFixed64_codec);
-      size += repeatedSfixed32_.CalculateSize(_repeated_repeatedSfixed32_codec);
-      size += repeatedSfixed64_.CalculateSize(_repeated_repeatedSfixed64_codec);
-      size += repeatedFloat_.CalculateSize(_repeated_repeatedFloat_codec);
-      size += repeatedDouble_.CalculateSize(_repeated_repeatedDouble_codec);
-      size += repeatedBool_.CalculateSize(_repeated_repeatedBool_codec);
-      size += repeatedString_.CalculateSize(_repeated_repeatedString_codec);
-      size += repeatedBytes_.CalculateSize(_repeated_repeatedBytes_codec);
-      size += repeatedGroup_.CalculateSize(_repeated_repeatedGroup_codec);
-      size += repeatedNestedMessage_.CalculateSize(_repeated_repeatedNestedMessage_codec);
-      size += repeatedForeignMessage_.CalculateSize(_repeated_repeatedForeignMessage_codec);
-      size += repeatedImportMessage_.CalculateSize(_repeated_repeatedImportMessage_codec);
-      size += repeatedNestedEnum_.CalculateSize(_repeated_repeatedNestedEnum_codec);
-      size += repeatedForeignEnum_.CalculateSize(_repeated_repeatedForeignEnum_codec);
-      size += repeatedImportEnum_.CalculateSize(_repeated_repeatedImportEnum_codec);
-      size += repeatedStringPiece_.CalculateSize(_repeated_repeatedStringPiece_codec);
-      size += repeatedCord_.CalculateSize(_repeated_repeatedCord_codec);
-      size += repeatedLazyMessage_.CalculateSize(_repeated_repeatedLazyMessage_codec);
-      if (HasDefaultInt32) {
-        size += 2 + pb::CodedOutputStream.ComputeInt32Size(DefaultInt32);
-      }
-      if (HasDefaultInt64) {
-        size += 2 + pb::CodedOutputStream.ComputeInt64Size(DefaultInt64);
-      }
-      if (HasDefaultUint32) {
-        size += 2 + pb::CodedOutputStream.ComputeUInt32Size(DefaultUint32);
-      }
-      if (HasDefaultUint64) {
-        size += 2 + pb::CodedOutputStream.ComputeUInt64Size(DefaultUint64);
-      }
-      if (HasDefaultSint32) {
-        size += 2 + pb::CodedOutputStream.ComputeSInt32Size(DefaultSint32);
-      }
-      if (HasDefaultSint64) {
-        size += 2 + pb::CodedOutputStream.ComputeSInt64Size(DefaultSint64);
-      }
-      if (HasDefaultFixed32) {
-        size += 2 + 4;
-      }
-      if (HasDefaultFixed64) {
-        size += 2 + 8;
-      }
-      if (HasDefaultSfixed32) {
-        size += 2 + 4;
-      }
-      if (HasDefaultSfixed64) {
-        size += 2 + 8;
-      }
-      if (HasDefaultFloat) {
-        size += 2 + 4;
-      }
-      if (HasDefaultDouble) {
-        size += 2 + 8;
-      }
-      if (HasDefaultBool) {
-        size += 2 + 1;
-      }
-      if (HasDefaultString) {
-        size += 2 + pb::CodedOutputStream.ComputeStringSize(DefaultString);
-      }
-      if (HasDefaultBytes) {
-        size += 2 + pb::CodedOutputStream.ComputeBytesSize(DefaultBytes);
-      }
-      if (HasDefaultNestedEnum) {
-        size += 2 + pb::CodedOutputStream.ComputeEnumSize((int) DefaultNestedEnum);
-      }
-      if (HasDefaultForeignEnum) {
-        size += 2 + pb::CodedOutputStream.ComputeEnumSize((int) DefaultForeignEnum);
-      }
-      if (HasDefaultImportEnum) {
-        size += 2 + pb::CodedOutputStream.ComputeEnumSize((int) DefaultImportEnum);
-      }
-      if (HasDefaultStringPiece) {
-        size += 2 + pb::CodedOutputStream.ComputeStringSize(DefaultStringPiece);
-      }
-      if (HasDefaultCord) {
-        size += 2 + pb::CodedOutputStream.ComputeStringSize(DefaultCord);
-      }
-      if (HasOneofUint32) {
-        size += 2 + pb::CodedOutputStream.ComputeUInt32Size(OneofUint32);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.OneofNestedMessage) {
-        size += 2 + pb::CodedOutputStream.ComputeMessageSize(OneofNestedMessage);
-      }
-      if (HasOneofString) {
-        size += 2 + pb::CodedOutputStream.ComputeStringSize(OneofString);
-      }
-      if (HasOneofBytes) {
-        size += 2 + pb::CodedOutputStream.ComputeBytesSize(OneofBytes);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(TestAllTypes other) {
-      if (other == null) {
-        return;
-      }
-      if (other.HasOptionalInt32) {
-        OptionalInt32 = other.OptionalInt32;
-      }
-      if (other.HasOptionalInt64) {
-        OptionalInt64 = other.OptionalInt64;
-      }
-      if (other.HasOptionalUint32) {
-        OptionalUint32 = other.OptionalUint32;
-      }
-      if (other.HasOptionalUint64) {
-        OptionalUint64 = other.OptionalUint64;
-      }
-      if (other.HasOptionalSint32) {
-        OptionalSint32 = other.OptionalSint32;
-      }
-      if (other.HasOptionalSint64) {
-        OptionalSint64 = other.OptionalSint64;
-      }
-      if (other.HasOptionalFixed32) {
-        OptionalFixed32 = other.OptionalFixed32;
-      }
-      if (other.HasOptionalFixed64) {
-        OptionalFixed64 = other.OptionalFixed64;
-      }
-      if (other.HasOptionalSfixed32) {
-        OptionalSfixed32 = other.OptionalSfixed32;
-      }
-      if (other.HasOptionalSfixed64) {
-        OptionalSfixed64 = other.OptionalSfixed64;
-      }
-      if (other.HasOptionalFloat) {
-        OptionalFloat = other.OptionalFloat;
-      }
-      if (other.HasOptionalDouble) {
-        OptionalDouble = other.OptionalDouble;
-      }
-      if (other.HasOptionalBool) {
-        OptionalBool = other.OptionalBool;
-      }
-      if (other.HasOptionalString) {
-        OptionalString = other.OptionalString;
-      }
-      if (other.HasOptionalBytes) {
-        OptionalBytes = other.OptionalBytes;
-      }
-      if (other.HasOptionalGroup) {
-        if (!HasOptionalGroup) {
-          OptionalGroup = new global::Google.Protobuf.TestProtos.Proto2.TestAllTypes.Types.OptionalGroup();
-        }
-        OptionalGroup.MergeFrom(other.OptionalGroup);
-      }
-      if (other.optionalNestedMessage_ != null) {
-        if (optionalNestedMessage_ == null) {
-          OptionalNestedMessage = new global::Google.Protobuf.TestProtos.Proto2.TestAllTypes.Types.NestedMessage();
-        }
-        OptionalNestedMessage.MergeFrom(other.OptionalNestedMessage);
-      }
-      if (other.optionalForeignMessage_ != null) {
-        if (optionalForeignMessage_ == null) {
-          OptionalForeignMessage = new global::Google.Protobuf.TestProtos.Proto2.ForeignMessage();
-        }
-        OptionalForeignMessage.MergeFrom(other.OptionalForeignMessage);
-      }
-      if (other.optionalImportMessage_ != null) {
-        if (optionalImportMessage_ == null) {
-          OptionalImportMessage = new global::Google.Protobuf.TestProtos.Proto2.ImportMessage();
-        }
-        OptionalImportMessage.MergeFrom(other.OptionalImportMessage);
-      }
-      if (other.HasOptionalNestedEnum) {
-        OptionalNestedEnum = other.OptionalNestedEnum;
-      }
-      if (other.HasOptionalForeignEnum) {
-        OptionalForeignEnum = other.OptionalForeignEnum;
-      }
-      if (other.HasOptionalImportEnum) {
-        OptionalImportEnum = other.OptionalImportEnum;
-      }
-      if (other.HasOptionalStringPiece) {
-        OptionalStringPiece = other.OptionalStringPiece;
-      }
-      if (other.HasOptionalCord) {
-        OptionalCord = other.OptionalCord;
-      }
-      if (other.optionalPublicImportMessage_ != null) {
-        if (optionalPublicImportMessage_ == null) {
-          OptionalPublicImportMessage = new global::Google.Protobuf.TestProtos.Proto2.PublicImportMessage();
-        }
-        OptionalPublicImportMessage.MergeFrom(other.OptionalPublicImportMessage);
-      }
-      if (other.optionalLazyMessage_ != null) {
-        if (optionalLazyMessage_ == null) {
-          OptionalLazyMessage = new global::Google.Protobuf.TestProtos.Proto2.TestAllTypes.Types.NestedMessage();
-        }
-        OptionalLazyMessage.MergeFrom(other.OptionalLazyMessage);
-      }
-      repeatedInt32_.Add(other.repeatedInt32_);
-      repeatedInt64_.Add(other.repeatedInt64_);
-      repeatedUint32_.Add(other.repeatedUint32_);
-      repeatedUint64_.Add(other.repeatedUint64_);
-      repeatedSint32_.Add(other.repeatedSint32_);
-      repeatedSint64_.Add(other.repeatedSint64_);
-      repeatedFixed32_.Add(other.repeatedFixed32_);
-      repeatedFixed64_.Add(other.repeatedFixed64_);
-      repeatedSfixed32_.Add(other.repeatedSfixed32_);
-      repeatedSfixed64_.Add(other.repeatedSfixed64_);
-      repeatedFloat_.Add(other.repeatedFloat_);
-      repeatedDouble_.Add(other.repeatedDouble_);
-      repeatedBool_.Add(other.repeatedBool_);
-      repeatedString_.Add(other.repeatedString_);
-      repeatedBytes_.Add(other.repeatedBytes_);
-      repeatedGroup_.Add(other.repeatedGroup_);
-      repeatedNestedMessage_.Add(other.repeatedNestedMessage_);
-      repeatedForeignMessage_.Add(other.repeatedForeignMessage_);
-      repeatedImportMessage_.Add(other.repeatedImportMessage_);
-      repeatedNestedEnum_.Add(other.repeatedNestedEnum_);
-      repeatedForeignEnum_.Add(other.repeatedForeignEnum_);
-      repeatedImportEnum_.Add(other.repeatedImportEnum_);
-      repeatedStringPiece_.Add(other.repeatedStringPiece_);
-      repeatedCord_.Add(other.repeatedCord_);
-      repeatedLazyMessage_.Add(other.repeatedLazyMessage_);
-      if (other.HasDefaultInt32) {
-        DefaultInt32 = other.DefaultInt32;
-      }
-      if (other.HasDefaultInt64) {
-        DefaultInt64 = other.DefaultInt64;
-      }
-      if (other.HasDefaultUint32) {
-        DefaultUint32 = other.DefaultUint32;
-      }
-      if (other.HasDefaultUint64) {
-        DefaultUint64 = other.DefaultUint64;
-      }
-      if (other.HasDefaultSint32) {
-        DefaultSint32 = other.DefaultSint32;
-      }
-      if (other.HasDefaultSint64) {
-        DefaultSint64 = other.DefaultSint64;
-      }
-      if (other.HasDefaultFixed32) {
-        DefaultFixed32 = other.DefaultFixed32;
-      }
-      if (other.HasDefaultFixed64) {
-        DefaultFixed64 = other.DefaultFixed64;
-      }
-      if (other.HasDefaultSfixed32) {
-        DefaultSfixed32 = other.DefaultSfixed32;
-      }
-      if (other.HasDefaultSfixed64) {
-        DefaultSfixed64 = other.DefaultSfixed64;
-      }
-      if (other.HasDefaultFloat) {
-        DefaultFloat = other.DefaultFloat;
-      }
-      if (other.HasDefaultDouble) {
-        DefaultDouble = other.DefaultDouble;
-      }
-      if (other.HasDefaultBool) {
-        DefaultBool = other.DefaultBool;
-      }
-      if (other.HasDefaultString) {
-        DefaultString = other.DefaultString;
-      }
-      if (other.HasDefaultBytes) {
-        DefaultBytes = other.DefaultBytes;
-      }
-      if (other.HasDefaultNestedEnum) {
-        DefaultNestedEnum = other.DefaultNestedEnum;
-      }
-      if (other.HasDefaultForeignEnum) {
-        DefaultForeignEnum = other.DefaultForeignEnum;
-      }
-      if (other.HasDefaultImportEnum) {
-        DefaultImportEnum = other.DefaultImportEnum;
-      }
-      if (other.HasDefaultStringPiece) {
-        DefaultStringPiece = other.DefaultStringPiece;
-      }
-      if (other.HasDefaultCord) {
-        DefaultCord = other.DefaultCord;
-      }
-      switch (other.OneofFieldCase) {
-        case OneofFieldOneofCase.OneofUint32:
-          OneofUint32 = other.OneofUint32;
-          break;
-        case OneofFieldOneofCase.OneofNestedMessage:
-          if (OneofNestedMessage == null) {
-            OneofNestedMessage = new global::Google.Protobuf.TestProtos.Proto2.TestAllTypes.Types.NestedMessage();
-          }
-          OneofNestedMessage.MergeFrom(other.OneofNestedMessage);
-          break;
-        case OneofFieldOneofCase.OneofString:
-          OneofString = other.OneofString;
-          break;
-        case OneofFieldOneofCase.OneofBytes:
-          OneofBytes = other.OneofBytes;
-          break;
-      }
-
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 8: {
-            OptionalInt32 = input.ReadInt32();
-            break;
-          }
-          case 16: {
-            OptionalInt64 = input.ReadInt64();
-            break;
-          }
-          case 24: {
-            OptionalUint32 = input.ReadUInt32();
-            break;
-          }
-          case 32: {
-            OptionalUint64 = input.ReadUInt64();
-            break;
-          }
-          case 40: {
-            OptionalSint32 = input.ReadSInt32();
-            break;
-          }
-          case 48: {
-            OptionalSint64 = input.ReadSInt64();
-            break;
-          }
-          case 61: {
-            OptionalFixed32 = input.ReadFixed32();
-            break;
-          }
-          case 65: {
-            OptionalFixed64 = input.ReadFixed64();
-            break;
-          }
-          case 77: {
-            OptionalSfixed32 = input.ReadSFixed32();
-            break;
-          }
-          case 81: {
-            OptionalSfixed64 = input.ReadSFixed64();
-            break;
-          }
-          case 93: {
-            OptionalFloat = input.ReadFloat();
-            break;
-          }
-          case 97: {
-            OptionalDouble = input.ReadDouble();
-            break;
-          }
-          case 104: {
-            OptionalBool = input.ReadBool();
-            break;
-          }
-          case 114: {
-            OptionalString = input.ReadString();
-            break;
-          }
-          case 122: {
-            OptionalBytes = input.ReadBytes();
-            break;
-          }
-          case 131: {
-            if (!HasOptionalGroup) {
-              OptionalGroup = new global::Google.Protobuf.TestProtos.Proto2.TestAllTypes.Types.OptionalGroup();
-            }
-            input.ReadGroup(OptionalGroup);
-            break;
-          }
-          case 146: {
-            if (optionalNestedMessage_ == null) {
-              OptionalNestedMessage = new global::Google.Protobuf.TestProtos.Proto2.TestAllTypes.Types.NestedMessage();
-            }
-            input.ReadMessage(OptionalNestedMessage);
-            break;
-          }
-          case 154: {
-            if (optionalForeignMessage_ == null) {
-              OptionalForeignMessage = new global::Google.Protobuf.TestProtos.Proto2.ForeignMessage();
-            }
-            input.ReadMessage(OptionalForeignMessage);
-            break;
-          }
-          case 162: {
-            if (optionalImportMessage_ == null) {
-              OptionalImportMessage = new global::Google.Protobuf.TestProtos.Proto2.ImportMessage();
-            }
-            input.ReadMessage(OptionalImportMessage);
-            break;
-          }
-          case 168: {
-            OptionalNestedEnum = (global::Google.Protobuf.TestProtos.Proto2.TestAllTypes.Types.NestedEnum) input.ReadEnum();
-            break;
-          }
-          case 176: {
-            OptionalForeignEnum = (global::Google.Protobuf.TestProtos.Proto2.ForeignEnum) input.ReadEnum();
-            break;
-          }
-          case 184: {
-            OptionalImportEnum = (global::Google.Protobuf.TestProtos.Proto2.ImportEnum) input.ReadEnum();
-            break;
-          }
-          case 194: {
-            OptionalStringPiece = input.ReadString();
-            break;
-          }
-          case 202: {
-            OptionalCord = input.ReadString();
-            break;
-          }
-          case 210: {
-            if (optionalPublicImportMessage_ == null) {
-              OptionalPublicImportMessage = new global::Google.Protobuf.TestProtos.Proto2.PublicImportMessage();
-            }
-            input.ReadMessage(OptionalPublicImportMessage);
-            break;
-          }
-          case 218: {
-            if (optionalLazyMessage_ == null) {
-              OptionalLazyMessage = new global::Google.Protobuf.TestProtos.Proto2.TestAllTypes.Types.NestedMessage();
-            }
-            input.ReadMessage(OptionalLazyMessage);
-            break;
-          }
-          case 250:
-          case 248: {
-            repeatedInt32_.AddEntriesFrom(input, _repeated_repeatedInt32_codec);
-            break;
-          }
-          case 258:
-          case 256: {
-            repeatedInt64_.AddEntriesFrom(input, _repeated_repeatedInt64_codec);
-            break;
-          }
-          case 266:
-          case 264: {
-            repeatedUint32_.AddEntriesFrom(input, _repeated_repeatedUint32_codec);
-            break;
-          }
-          case 274:
-          case 272: {
-            repeatedUint64_.AddEntriesFrom(input, _repeated_repeatedUint64_codec);
-            break;
-          }
-          case 282:
-          case 280: {
-            repeatedSint32_.AddEntriesFrom(input, _repeated_repeatedSint32_codec);
-            break;
-          }
-          case 290:
-          case 288: {
-            repeatedSint64_.AddEntriesFrom(input, _repeated_repeatedSint64_codec);
-            break;
-          }
-          case 298:
-          case 301: {
-            repeatedFixed32_.AddEntriesFrom(input, _repeated_repeatedFixed32_codec);
-            break;
-          }
-          case 306:
-          case 305: {
-            repeatedFixed64_.AddEntriesFrom(input, _repeated_repeatedFixed64_codec);
-            break;
-          }
-          case 314:
-          case 317: {
-            repeatedSfixed32_.AddEntriesFrom(input, _repeated_repeatedSfixed32_codec);
-            break;
-          }
-          case 322:
-          case 321: {
-            repeatedSfixed64_.AddEntriesFrom(input, _repeated_repeatedSfixed64_codec);
-            break;
-          }
-          case 330:
-          case 333: {
-            repeatedFloat_.AddEntriesFrom(input, _repeated_repeatedFloat_codec);
-            break;
-          }
-          case 338:
-          case 337: {
-            repeatedDouble_.AddEntriesFrom(input, _repeated_repeatedDouble_codec);
-            break;
-          }
-          case 346:
-          case 344: {
-            repeatedBool_.AddEntriesFrom(input, _repeated_repeatedBool_codec);
-            break;
-          }
-          case 354: {
-            repeatedString_.AddEntriesFrom(input, _repeated_repeatedString_codec);
-            break;
-          }
-          case 362: {
-            repeatedBytes_.AddEntriesFrom(input, _repeated_repeatedBytes_codec);
-            break;
-          }
-          case 371: {
-            repeatedGroup_.AddEntriesFrom(input, _repeated_repeatedGroup_codec);
-            break;
-          }
-          case 386: {
-            repeatedNestedMessage_.AddEntriesFrom(input, _repeated_repeatedNestedMessage_codec);
-            break;
-          }
-          case 394: {
-            repeatedForeignMessage_.AddEntriesFrom(input, _repeated_repeatedForeignMessage_codec);
-            break;
-          }
-          case 402: {
-            repeatedImportMessage_.AddEntriesFrom(input, _repeated_repeatedImportMessage_codec);
-            break;
-          }
-          case 410:
-          case 408: {
-            repeatedNestedEnum_.AddEntriesFrom(input, _repeated_repeatedNestedEnum_codec);
-            break;
-          }
-          case 418:
-          case 416: {
-            repeatedForeignEnum_.AddEntriesFrom(input, _repeated_repeatedForeignEnum_codec);
-            break;
-          }
-          case 426:
-          case 424: {
-            repeatedImportEnum_.AddEntriesFrom(input, _repeated_repeatedImportEnum_codec);
-            break;
-          }
-          case 434: {
-            repeatedStringPiece_.AddEntriesFrom(input, _repeated_repeatedStringPiece_codec);
-            break;
-          }
-          case 442: {
-            repeatedCord_.AddEntriesFrom(input, _repeated_repeatedCord_codec);
-            break;
-          }
-          case 458: {
-            repeatedLazyMessage_.AddEntriesFrom(input, _repeated_repeatedLazyMessage_codec);
-            break;
-          }
-          case 488: {
-            DefaultInt32 = input.ReadInt32();
-            break;
-          }
-          case 496: {
-            DefaultInt64 = input.ReadInt64();
-            break;
-          }
-          case 504: {
-            DefaultUint32 = input.ReadUInt32();
-            break;
-          }
-          case 512: {
-            DefaultUint64 = input.ReadUInt64();
-            break;
-          }
-          case 520: {
-            DefaultSint32 = input.ReadSInt32();
-            break;
-          }
-          case 528: {
-            DefaultSint64 = input.ReadSInt64();
-            break;
-          }
-          case 541: {
-            DefaultFixed32 = input.ReadFixed32();
-            break;
-          }
-          case 545: {
-            DefaultFixed64 = input.ReadFixed64();
-            break;
-          }
-          case 557: {
-            DefaultSfixed32 = input.ReadSFixed32();
-            break;
-          }
-          case 561: {
-            DefaultSfixed64 = input.ReadSFixed64();
-            break;
-          }
-          case 573: {
-            DefaultFloat = input.ReadFloat();
-            break;
-          }
-          case 577: {
-            DefaultDouble = input.ReadDouble();
-            break;
-          }
-          case 584: {
-            DefaultBool = input.ReadBool();
-            break;
-          }
-          case 594: {
-            DefaultString = input.ReadString();
-            break;
-          }
-          case 602: {
-            DefaultBytes = input.ReadBytes();
-            break;
-          }
-          case 648: {
-            DefaultNestedEnum = (global::Google.Protobuf.TestProtos.Proto2.TestAllTypes.Types.NestedEnum) input.ReadEnum();
-            break;
-          }
-          case 656: {
-            DefaultForeignEnum = (global::Google.Protobuf.TestProtos.Proto2.ForeignEnum) input.ReadEnum();
-            break;
-          }
-          case 664: {
-            DefaultImportEnum = (global::Google.Protobuf.TestProtos.Proto2.ImportEnum) input.ReadEnum();
-            break;
-          }
-          case 674: {
-            DefaultStringPiece = input.ReadString();
-            break;
-          }
-          case 682: {
-            DefaultCord = input.ReadString();
-            break;
-          }
-          case 888: {
-            OneofUint32 = input.ReadUInt32();
-            break;
-          }
-          case 898: {
-            global::Google.Protobuf.TestProtos.Proto2.TestAllTypes.Types.NestedMessage subBuilder = new global::Google.Protobuf.TestProtos.Proto2.TestAllTypes.Types.NestedMessage();
-            if (oneofFieldCase_ == OneofFieldOneofCase.OneofNestedMessage) {
-              subBuilder.MergeFrom(OneofNestedMessage);
-            }
-            input.ReadMessage(subBuilder);
-            OneofNestedMessage = subBuilder;
-            break;
-          }
-          case 906: {
-            OneofString = input.ReadString();
-            break;
-          }
-          case 914: {
-            OneofBytes = input.ReadBytes();
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 8: {
-            OptionalInt32 = input.ReadInt32();
-            break;
-          }
-          case 16: {
-            OptionalInt64 = input.ReadInt64();
-            break;
-          }
-          case 24: {
-            OptionalUint32 = input.ReadUInt32();
-            break;
-          }
-          case 32: {
-            OptionalUint64 = input.ReadUInt64();
-            break;
-          }
-          case 40: {
-            OptionalSint32 = input.ReadSInt32();
-            break;
-          }
-          case 48: {
-            OptionalSint64 = input.ReadSInt64();
-            break;
-          }
-          case 61: {
-            OptionalFixed32 = input.ReadFixed32();
-            break;
-          }
-          case 65: {
-            OptionalFixed64 = input.ReadFixed64();
-            break;
-          }
-          case 77: {
-            OptionalSfixed32 = input.ReadSFixed32();
-            break;
-          }
-          case 81: {
-            OptionalSfixed64 = input.ReadSFixed64();
-            break;
-          }
-          case 93: {
-            OptionalFloat = input.ReadFloat();
-            break;
-          }
-          case 97: {
-            OptionalDouble = input.ReadDouble();
-            break;
-          }
-          case 104: {
-            OptionalBool = input.ReadBool();
-            break;
-          }
-          case 114: {
-            OptionalString = input.ReadString();
-            break;
-          }
-          case 122: {
-            OptionalBytes = input.ReadBytes();
-            break;
-          }
-          case 131: {
-            if (!HasOptionalGroup) {
-              OptionalGroup = new global::Google.Protobuf.TestProtos.Proto2.TestAllTypes.Types.OptionalGroup();
-            }
-            input.ReadGroup(OptionalGroup);
-            break;
-          }
-          case 146: {
-            if (optionalNestedMessage_ == null) {
-              OptionalNestedMessage = new global::Google.Protobuf.TestProtos.Proto2.TestAllTypes.Types.NestedMessage();
-            }
-            input.ReadMessage(OptionalNestedMessage);
-            break;
-          }
-          case 154: {
-            if (optionalForeignMessage_ == null) {
-              OptionalForeignMessage = new global::Google.Protobuf.TestProtos.Proto2.ForeignMessage();
-            }
-            input.ReadMessage(OptionalForeignMessage);
-            break;
-          }
-          case 162: {
-            if (optionalImportMessage_ == null) {
-              OptionalImportMessage = new global::Google.Protobuf.TestProtos.Proto2.ImportMessage();
-            }
-            input.ReadMessage(OptionalImportMessage);
-            break;
-          }
-          case 168: {
-            OptionalNestedEnum = (global::Google.Protobuf.TestProtos.Proto2.TestAllTypes.Types.NestedEnum) input.ReadEnum();
-            break;
-          }
-          case 176: {
-            OptionalForeignEnum = (global::Google.Protobuf.TestProtos.Proto2.ForeignEnum) input.ReadEnum();
-            break;
-          }
-          case 184: {
-            OptionalImportEnum = (global::Google.Protobuf.TestProtos.Proto2.ImportEnum) input.ReadEnum();
-            break;
-          }
-          case 194: {
-            OptionalStringPiece = input.ReadString();
-            break;
-          }
-          case 202: {
-            OptionalCord = input.ReadString();
-            break;
-          }
-          case 210: {
-            if (optionalPublicImportMessage_ == null) {
-              OptionalPublicImportMessage = new global::Google.Protobuf.TestProtos.Proto2.PublicImportMessage();
-            }
-            input.ReadMessage(OptionalPublicImportMessage);
-            break;
-          }
-          case 218: {
-            if (optionalLazyMessage_ == null) {
-              OptionalLazyMessage = new global::Google.Protobuf.TestProtos.Proto2.TestAllTypes.Types.NestedMessage();
-            }
-            input.ReadMessage(OptionalLazyMessage);
-            break;
-          }
-          case 250:
-          case 248: {
-            repeatedInt32_.AddEntriesFrom(ref input, _repeated_repeatedInt32_codec);
-            break;
-          }
-          case 258:
-          case 256: {
-            repeatedInt64_.AddEntriesFrom(ref input, _repeated_repeatedInt64_codec);
-            break;
-          }
-          case 266:
-          case 264: {
-            repeatedUint32_.AddEntriesFrom(ref input, _repeated_repeatedUint32_codec);
-            break;
-          }
-          case 274:
-          case 272: {
-            repeatedUint64_.AddEntriesFrom(ref input, _repeated_repeatedUint64_codec);
-            break;
-          }
-          case 282:
-          case 280: {
-            repeatedSint32_.AddEntriesFrom(ref input, _repeated_repeatedSint32_codec);
-            break;
-          }
-          case 290:
-          case 288: {
-            repeatedSint64_.AddEntriesFrom(ref input, _repeated_repeatedSint64_codec);
-            break;
-          }
-          case 298:
-          case 301: {
-            repeatedFixed32_.AddEntriesFrom(ref input, _repeated_repeatedFixed32_codec);
-            break;
-          }
-          case 306:
-          case 305: {
-            repeatedFixed64_.AddEntriesFrom(ref input, _repeated_repeatedFixed64_codec);
-            break;
-          }
-          case 314:
-          case 317: {
-            repeatedSfixed32_.AddEntriesFrom(ref input, _repeated_repeatedSfixed32_codec);
-            break;
-          }
-          case 322:
-          case 321: {
-            repeatedSfixed64_.AddEntriesFrom(ref input, _repeated_repeatedSfixed64_codec);
-            break;
-          }
-          case 330:
-          case 333: {
-            repeatedFloat_.AddEntriesFrom(ref input, _repeated_repeatedFloat_codec);
-            break;
-          }
-          case 338:
-          case 337: {
-            repeatedDouble_.AddEntriesFrom(ref input, _repeated_repeatedDouble_codec);
-            break;
-          }
-          case 346:
-          case 344: {
-            repeatedBool_.AddEntriesFrom(ref input, _repeated_repeatedBool_codec);
-            break;
-          }
-          case 354: {
-            repeatedString_.AddEntriesFrom(ref input, _repeated_repeatedString_codec);
-            break;
-          }
-          case 362: {
-            repeatedBytes_.AddEntriesFrom(ref input, _repeated_repeatedBytes_codec);
-            break;
-          }
-          case 371: {
-            repeatedGroup_.AddEntriesFrom(ref input, _repeated_repeatedGroup_codec);
-            break;
-          }
-          case 386: {
-            repeatedNestedMessage_.AddEntriesFrom(ref input, _repeated_repeatedNestedMessage_codec);
-            break;
-          }
-          case 394: {
-            repeatedForeignMessage_.AddEntriesFrom(ref input, _repeated_repeatedForeignMessage_codec);
-            break;
-          }
-          case 402: {
-            repeatedImportMessage_.AddEntriesFrom(ref input, _repeated_repeatedImportMessage_codec);
-            break;
-          }
-          case 410:
-          case 408: {
-            repeatedNestedEnum_.AddEntriesFrom(ref input, _repeated_repeatedNestedEnum_codec);
-            break;
-          }
-          case 418:
-          case 416: {
-            repeatedForeignEnum_.AddEntriesFrom(ref input, _repeated_repeatedForeignEnum_codec);
-            break;
-          }
-          case 426:
-          case 424: {
-            repeatedImportEnum_.AddEntriesFrom(ref input, _repeated_repeatedImportEnum_codec);
-            break;
-          }
-          case 434: {
-            repeatedStringPiece_.AddEntriesFrom(ref input, _repeated_repeatedStringPiece_codec);
-            break;
-          }
-          case 442: {
-            repeatedCord_.AddEntriesFrom(ref input, _repeated_repeatedCord_codec);
-            break;
-          }
-          case 458: {
-            repeatedLazyMessage_.AddEntriesFrom(ref input, _repeated_repeatedLazyMessage_codec);
-            break;
-          }
-          case 488: {
-            DefaultInt32 = input.ReadInt32();
-            break;
-          }
-          case 496: {
-            DefaultInt64 = input.ReadInt64();
-            break;
-          }
-          case 504: {
-            DefaultUint32 = input.ReadUInt32();
-            break;
-          }
-          case 512: {
-            DefaultUint64 = input.ReadUInt64();
-            break;
-          }
-          case 520: {
-            DefaultSint32 = input.ReadSInt32();
-            break;
-          }
-          case 528: {
-            DefaultSint64 = input.ReadSInt64();
-            break;
-          }
-          case 541: {
-            DefaultFixed32 = input.ReadFixed32();
-            break;
-          }
-          case 545: {
-            DefaultFixed64 = input.ReadFixed64();
-            break;
-          }
-          case 557: {
-            DefaultSfixed32 = input.ReadSFixed32();
-            break;
-          }
-          case 561: {
-            DefaultSfixed64 = input.ReadSFixed64();
-            break;
-          }
-          case 573: {
-            DefaultFloat = input.ReadFloat();
-            break;
-          }
-          case 577: {
-            DefaultDouble = input.ReadDouble();
-            break;
-          }
-          case 584: {
-            DefaultBool = input.ReadBool();
-            break;
-          }
-          case 594: {
-            DefaultString = input.ReadString();
-            break;
-          }
-          case 602: {
-            DefaultBytes = input.ReadBytes();
-            break;
-          }
-          case 648: {
-            DefaultNestedEnum = (global::Google.Protobuf.TestProtos.Proto2.TestAllTypes.Types.NestedEnum) input.ReadEnum();
-            break;
-          }
-          case 656: {
-            DefaultForeignEnum = (global::Google.Protobuf.TestProtos.Proto2.ForeignEnum) input.ReadEnum();
-            break;
-          }
-          case 664: {
-            DefaultImportEnum = (global::Google.Protobuf.TestProtos.Proto2.ImportEnum) input.ReadEnum();
-            break;
-          }
-          case 674: {
-            DefaultStringPiece = input.ReadString();
-            break;
-          }
-          case 682: {
-            DefaultCord = input.ReadString();
-            break;
-          }
-          case 888: {
-            OneofUint32 = input.ReadUInt32();
-            break;
-          }
-          case 898: {
-            global::Google.Protobuf.TestProtos.Proto2.TestAllTypes.Types.NestedMessage subBuilder = new global::Google.Protobuf.TestProtos.Proto2.TestAllTypes.Types.NestedMessage();
-            if (oneofFieldCase_ == OneofFieldOneofCase.OneofNestedMessage) {
-              subBuilder.MergeFrom(OneofNestedMessage);
-            }
-            input.ReadMessage(subBuilder);
-            OneofNestedMessage = subBuilder;
-            break;
-          }
-          case 906: {
-            OneofString = input.ReadString();
-            break;
-          }
-          case 914: {
-            OneofBytes = input.ReadBytes();
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-    #region Nested types
-    /// <summary>Container for nested types declared in the TestAllTypes message type.</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static partial class Types {
-      public enum NestedEnum {
-        [pbr::OriginalName("FOO")] Foo = 1,
-        [pbr::OriginalName("BAR")] Bar = 2,
-        [pbr::OriginalName("BAZ")] Baz = 3,
-        /// <summary>
-        /// Intentionally negative.
-        /// </summary>
-        [pbr::OriginalName("NEG")] Neg = -1,
-      }
-
-      public sealed partial class NestedMessage : pb::IMessage<NestedMessage>
-      #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          , pb::IBufferMessage
-      #endif
-      {
-        private static readonly pb::MessageParser<NestedMessage> _parser = new pb::MessageParser<NestedMessage>(() => new NestedMessage());
-        private pb::UnknownFieldSet _unknownFields;
-        private int _hasBits0;
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static pb::MessageParser<NestedMessage> Parser { get { return _parser; } }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static pbr::MessageDescriptor Descriptor {
-          get { return global::Google.Protobuf.TestProtos.Proto2.TestAllTypes.Descriptor.NestedTypes[0]; }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        pbr::MessageDescriptor pb::IMessage.Descriptor {
-          get { return Descriptor; }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public NestedMessage() {
-          OnConstruction();
-        }
-
-        partial void OnConstruction();
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public NestedMessage(NestedMessage other) : this() {
-          _hasBits0 = other._hasBits0;
-          bb_ = other.bb_;
-          _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public NestedMessage Clone() {
-          return new NestedMessage(this);
-        }
-
-        /// <summary>Field number for the "bb" field.</summary>
-        public const int BbFieldNumber = 1;
-        private readonly static int BbDefaultValue = 0;
-
-        private int bb_;
-        /// <summary>
-        /// The field name "b" fails to compile in proto1 because it conflicts with
-        /// a local variable named "b" in one of the generated methods.  Doh.
-        /// This file needs to compile in proto1 to test backwards-compatibility.
-        /// </summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public int Bb {
-          get { if ((_hasBits0 & 1) != 0) { return bb_; } else { return BbDefaultValue; } }
-          set {
-            _hasBits0 |= 1;
-            bb_ = value;
-          }
-        }
-        /// <summary>Gets whether the "bb" field is set</summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool HasBb {
-          get { return (_hasBits0 & 1) != 0; }
-        }
-        /// <summary>Clears the value of the "bb" field</summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void ClearBb() {
-          _hasBits0 &= ~1;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override bool Equals(object other) {
-          return Equals(other as NestedMessage);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool Equals(NestedMessage other) {
-          if (ReferenceEquals(other, null)) {
-            return false;
-          }
-          if (ReferenceEquals(other, this)) {
-            return true;
-          }
-          if (Bb != other.Bb) return false;
-          return Equals(_unknownFields, other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override int GetHashCode() {
-          int hash = 1;
-          if (HasBb) hash ^= Bb.GetHashCode();
-          if (_unknownFields != null) {
-            hash ^= _unknownFields.GetHashCode();
-          }
-          return hash;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override string ToString() {
-          return pb::JsonFormatter.ToDiagnosticString(this);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void WriteTo(pb::CodedOutputStream output) {
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          output.WriteRawMessage(this);
-        #else
-          if (HasBb) {
-            output.WriteRawTag(8);
-            output.WriteInt32(Bb);
-          }
-          if (_unknownFields != null) {
-            _unknownFields.WriteTo(output);
-          }
-        #endif
-        }
-
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-          if (HasBb) {
-            output.WriteRawTag(8);
-            output.WriteInt32(Bb);
-          }
-          if (_unknownFields != null) {
-            _unknownFields.WriteTo(ref output);
-          }
-        }
-        #endif
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public int CalculateSize() {
-          int size = 0;
-          if (HasBb) {
-            size += 1 + pb::CodedOutputStream.ComputeInt32Size(Bb);
-          }
-          if (_unknownFields != null) {
-            size += _unknownFields.CalculateSize();
-          }
-          return size;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(NestedMessage other) {
-          if (other == null) {
-            return;
-          }
-          if (other.HasBb) {
-            Bb = other.Bb;
-          }
-          _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(pb::CodedInputStream input) {
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          input.ReadRawMessage(this);
-        #else
-          uint tag;
-          while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
-              default:
-                _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-                break;
-              case 8: {
-                Bb = input.ReadInt32();
-                break;
-              }
-            }
-          }
-        #endif
-        }
-
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-          uint tag;
-          while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
-              default:
-                _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-                break;
-              case 8: {
-                Bb = input.ReadInt32();
-                break;
-              }
-            }
-          }
-        }
-        #endif
-
-      }
-
-      public sealed partial class OptionalGroup : pb::IMessage<OptionalGroup>
-      #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          , pb::IBufferMessage
-      #endif
-      {
-        private static readonly pb::MessageParser<OptionalGroup> _parser = new pb::MessageParser<OptionalGroup>(() => new OptionalGroup());
-        private pb::UnknownFieldSet _unknownFields;
-        private int _hasBits0;
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static pb::MessageParser<OptionalGroup> Parser { get { return _parser; } }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static pbr::MessageDescriptor Descriptor {
-          get { return global::Google.Protobuf.TestProtos.Proto2.TestAllTypes.Descriptor.NestedTypes[1]; }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        pbr::MessageDescriptor pb::IMessage.Descriptor {
-          get { return Descriptor; }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public OptionalGroup() {
-          OnConstruction();
-        }
-
-        partial void OnConstruction();
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public OptionalGroup(OptionalGroup other) : this() {
-          _hasBits0 = other._hasBits0;
-          a_ = other.a_;
-          _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public OptionalGroup Clone() {
-          return new OptionalGroup(this);
-        }
-
-        /// <summary>Field number for the "a" field.</summary>
-        public const int AFieldNumber = 17;
-        private readonly static int ADefaultValue = 0;
-
-        private int a_;
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public int A {
-          get { if ((_hasBits0 & 1) != 0) { return a_; } else { return ADefaultValue; } }
-          set {
-            _hasBits0 |= 1;
-            a_ = value;
-          }
-        }
-        /// <summary>Gets whether the "a" field is set</summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool HasA {
-          get { return (_hasBits0 & 1) != 0; }
-        }
-        /// <summary>Clears the value of the "a" field</summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void ClearA() {
-          _hasBits0 &= ~1;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override bool Equals(object other) {
-          return Equals(other as OptionalGroup);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool Equals(OptionalGroup other) {
-          if (ReferenceEquals(other, null)) {
-            return false;
-          }
-          if (ReferenceEquals(other, this)) {
-            return true;
-          }
-          if (A != other.A) return false;
-          return Equals(_unknownFields, other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override int GetHashCode() {
-          int hash = 1;
-          if (HasA) hash ^= A.GetHashCode();
-          if (_unknownFields != null) {
-            hash ^= _unknownFields.GetHashCode();
-          }
-          return hash;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override string ToString() {
-          return pb::JsonFormatter.ToDiagnosticString(this);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void WriteTo(pb::CodedOutputStream output) {
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          output.WriteRawMessage(this);
-        #else
-          if (HasA) {
-            output.WriteRawTag(136, 1);
-            output.WriteInt32(A);
-          }
-          if (_unknownFields != null) {
-            _unknownFields.WriteTo(output);
-          }
-        #endif
-        }
-
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-          if (HasA) {
-            output.WriteRawTag(136, 1);
-            output.WriteInt32(A);
-          }
-          if (_unknownFields != null) {
-            _unknownFields.WriteTo(ref output);
-          }
-        }
-        #endif
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public int CalculateSize() {
-          int size = 0;
-          if (HasA) {
-            size += 2 + pb::CodedOutputStream.ComputeInt32Size(A);
-          }
-          if (_unknownFields != null) {
-            size += _unknownFields.CalculateSize();
-          }
-          return size;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(OptionalGroup other) {
-          if (other == null) {
-            return;
-          }
-          if (other.HasA) {
-            A = other.A;
-          }
-          _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(pb::CodedInputStream input) {
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          input.ReadRawMessage(this);
-        #else
-          uint tag;
-          while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
-              case 132:
-                return;
-              default:
-                _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-                break;
-              case 136: {
-                A = input.ReadInt32();
-                break;
-              }
-            }
-          }
-        #endif
-        }
-
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-          uint tag;
-          while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
-              case 132:
-                return;
-              default:
-                _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-                break;
-              case 136: {
-                A = input.ReadInt32();
-                break;
-              }
-            }
-          }
-        }
-        #endif
-
-      }
-
-      public sealed partial class RepeatedGroup : pb::IMessage<RepeatedGroup>
-      #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          , pb::IBufferMessage
-      #endif
-      {
-        private static readonly pb::MessageParser<RepeatedGroup> _parser = new pb::MessageParser<RepeatedGroup>(() => new RepeatedGroup());
-        private pb::UnknownFieldSet _unknownFields;
-        private int _hasBits0;
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static pb::MessageParser<RepeatedGroup> Parser { get { return _parser; } }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static pbr::MessageDescriptor Descriptor {
-          get { return global::Google.Protobuf.TestProtos.Proto2.TestAllTypes.Descriptor.NestedTypes[2]; }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        pbr::MessageDescriptor pb::IMessage.Descriptor {
-          get { return Descriptor; }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public RepeatedGroup() {
-          OnConstruction();
-        }
-
-        partial void OnConstruction();
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public RepeatedGroup(RepeatedGroup other) : this() {
-          _hasBits0 = other._hasBits0;
-          a_ = other.a_;
-          _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public RepeatedGroup Clone() {
-          return new RepeatedGroup(this);
-        }
-
-        /// <summary>Field number for the "a" field.</summary>
-        public const int AFieldNumber = 47;
-        private readonly static int ADefaultValue = 0;
-
-        private int a_;
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public int A {
-          get { if ((_hasBits0 & 1) != 0) { return a_; } else { return ADefaultValue; } }
-          set {
-            _hasBits0 |= 1;
-            a_ = value;
-          }
-        }
-        /// <summary>Gets whether the "a" field is set</summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool HasA {
-          get { return (_hasBits0 & 1) != 0; }
-        }
-        /// <summary>Clears the value of the "a" field</summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void ClearA() {
-          _hasBits0 &= ~1;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override bool Equals(object other) {
-          return Equals(other as RepeatedGroup);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool Equals(RepeatedGroup other) {
-          if (ReferenceEquals(other, null)) {
-            return false;
-          }
-          if (ReferenceEquals(other, this)) {
-            return true;
-          }
-          if (A != other.A) return false;
-          return Equals(_unknownFields, other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override int GetHashCode() {
-          int hash = 1;
-          if (HasA) hash ^= A.GetHashCode();
-          if (_unknownFields != null) {
-            hash ^= _unknownFields.GetHashCode();
-          }
-          return hash;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override string ToString() {
-          return pb::JsonFormatter.ToDiagnosticString(this);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void WriteTo(pb::CodedOutputStream output) {
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          output.WriteRawMessage(this);
-        #else
-          if (HasA) {
-            output.WriteRawTag(248, 2);
-            output.WriteInt32(A);
-          }
-          if (_unknownFields != null) {
-            _unknownFields.WriteTo(output);
-          }
-        #endif
-        }
-
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-          if (HasA) {
-            output.WriteRawTag(248, 2);
-            output.WriteInt32(A);
-          }
-          if (_unknownFields != null) {
-            _unknownFields.WriteTo(ref output);
-          }
-        }
-        #endif
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public int CalculateSize() {
-          int size = 0;
-          if (HasA) {
-            size += 2 + pb::CodedOutputStream.ComputeInt32Size(A);
-          }
-          if (_unknownFields != null) {
-            size += _unknownFields.CalculateSize();
-          }
-          return size;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(RepeatedGroup other) {
-          if (other == null) {
-            return;
-          }
-          if (other.HasA) {
-            A = other.A;
-          }
-          _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(pb::CodedInputStream input) {
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          input.ReadRawMessage(this);
-        #else
-          uint tag;
-          while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
-              case 372:
-                return;
-              default:
-                _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-                break;
-              case 376: {
-                A = input.ReadInt32();
-                break;
-              }
-            }
-          }
-        #endif
-        }
-
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-          uint tag;
-          while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
-              case 372:
-                return;
-              default:
-                _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-                break;
-              case 376: {
-                A = input.ReadInt32();
-                break;
-              }
-            }
-          }
-        }
-        #endif
-
-      }
-
-    }
-    #endregion
-
-  }
-
-  /// <summary>
-  /// This proto includes a recursively nested message.
-  /// </summary>
-  public sealed partial class NestedTestAllTypes : pb::IMessage<NestedTestAllTypes>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<NestedTestAllTypes> _parser = new pb::MessageParser<NestedTestAllTypes>(() => new NestedTestAllTypes());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<NestedTestAllTypes> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.Proto2.UnittestReflection.Descriptor.MessageTypes[1]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public NestedTestAllTypes() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public NestedTestAllTypes(NestedTestAllTypes other) : this() {
-      child_ = other.child_ != null ? other.child_.Clone() : null;
-      payload_ = other.payload_ != null ? other.payload_.Clone() : null;
-      repeatedChild_ = other.repeatedChild_.Clone();
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public NestedTestAllTypes Clone() {
-      return new NestedTestAllTypes(this);
-    }
-
-    /// <summary>Field number for the "child" field.</summary>
-    public const int ChildFieldNumber = 1;
-    private global::Google.Protobuf.TestProtos.Proto2.NestedTestAllTypes child_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.TestProtos.Proto2.NestedTestAllTypes Child {
-      get { return child_; }
-      set {
-        child_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "payload" field.</summary>
-    public const int PayloadFieldNumber = 2;
-    private global::Google.Protobuf.TestProtos.Proto2.TestAllTypes payload_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.TestProtos.Proto2.TestAllTypes Payload {
-      get { return payload_; }
-      set {
-        payload_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "repeated_child" field.</summary>
-    public const int RepeatedChildFieldNumber = 3;
-    private static readonly pb::FieldCodec<global::Google.Protobuf.TestProtos.Proto2.NestedTestAllTypes> _repeated_repeatedChild_codec
-        = pb::FieldCodec.ForMessage(26, global::Google.Protobuf.TestProtos.Proto2.NestedTestAllTypes.Parser);
-    private readonly pbc::RepeatedField<global::Google.Protobuf.TestProtos.Proto2.NestedTestAllTypes> repeatedChild_ = new pbc::RepeatedField<global::Google.Protobuf.TestProtos.Proto2.NestedTestAllTypes>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Google.Protobuf.TestProtos.Proto2.NestedTestAllTypes> RepeatedChild {
-      get { return repeatedChild_; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as NestedTestAllTypes);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(NestedTestAllTypes other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (!object.Equals(Child, other.Child)) return false;
-      if (!object.Equals(Payload, other.Payload)) return false;
-      if(!repeatedChild_.Equals(other.repeatedChild_)) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (child_ != null) hash ^= Child.GetHashCode();
-      if (payload_ != null) hash ^= Payload.GetHashCode();
-      hash ^= repeatedChild_.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (child_ != null) {
-        output.WriteRawTag(10);
-        output.WriteMessage(Child);
-      }
-      if (payload_ != null) {
-        output.WriteRawTag(18);
-        output.WriteMessage(Payload);
-      }
-      repeatedChild_.WriteTo(output, _repeated_repeatedChild_codec);
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (child_ != null) {
-        output.WriteRawTag(10);
-        output.WriteMessage(Child);
-      }
-      if (payload_ != null) {
-        output.WriteRawTag(18);
-        output.WriteMessage(Payload);
-      }
-      repeatedChild_.WriteTo(ref output, _repeated_repeatedChild_codec);
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (child_ != null) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(Child);
-      }
-      if (payload_ != null) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(Payload);
-      }
-      size += repeatedChild_.CalculateSize(_repeated_repeatedChild_codec);
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(NestedTestAllTypes other) {
-      if (other == null) {
-        return;
-      }
-      if (other.child_ != null) {
-        if (child_ == null) {
-          Child = new global::Google.Protobuf.TestProtos.Proto2.NestedTestAllTypes();
-        }
-        Child.MergeFrom(other.Child);
-      }
-      if (other.payload_ != null) {
-        if (payload_ == null) {
-          Payload = new global::Google.Protobuf.TestProtos.Proto2.TestAllTypes();
-        }
-        Payload.MergeFrom(other.Payload);
-      }
-      repeatedChild_.Add(other.repeatedChild_);
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 10: {
-            if (child_ == null) {
-              Child = new global::Google.Protobuf.TestProtos.Proto2.NestedTestAllTypes();
-            }
-            input.ReadMessage(Child);
-            break;
-          }
-          case 18: {
-            if (payload_ == null) {
-              Payload = new global::Google.Protobuf.TestProtos.Proto2.TestAllTypes();
-            }
-            input.ReadMessage(Payload);
-            break;
-          }
-          case 26: {
-            repeatedChild_.AddEntriesFrom(input, _repeated_repeatedChild_codec);
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 10: {
-            if (child_ == null) {
-              Child = new global::Google.Protobuf.TestProtos.Proto2.NestedTestAllTypes();
-            }
-            input.ReadMessage(Child);
-            break;
-          }
-          case 18: {
-            if (payload_ == null) {
-              Payload = new global::Google.Protobuf.TestProtos.Proto2.TestAllTypes();
-            }
-            input.ReadMessage(Payload);
-            break;
-          }
-          case 26: {
-            repeatedChild_.AddEntriesFrom(ref input, _repeated_repeatedChild_codec);
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  public sealed partial class TestDeprecatedFields : pb::IMessage<TestDeprecatedFields>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<TestDeprecatedFields> _parser = new pb::MessageParser<TestDeprecatedFields>(() => new TestDeprecatedFields());
-    private pb::UnknownFieldSet _unknownFields;
-    private int _hasBits0;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<TestDeprecatedFields> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.Proto2.UnittestReflection.Descriptor.MessageTypes[2]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestDeprecatedFields() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestDeprecatedFields(TestDeprecatedFields other) : this() {
-      _hasBits0 = other._hasBits0;
-      deprecatedInt32_ = other.deprecatedInt32_;
-      switch (other.OneofFieldsCase) {
-        case OneofFieldsOneofCase.DeprecatedInt32InOneof:
-          DeprecatedInt32InOneof = other.DeprecatedInt32InOneof;
-          break;
-      }
-
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestDeprecatedFields Clone() {
-      return new TestDeprecatedFields(this);
-    }
-
-    /// <summary>Field number for the "deprecated_int32" field.</summary>
-    public const int DeprecatedInt32FieldNumber = 1;
-    private readonly static int DeprecatedInt32DefaultValue = 0;
-
-    private int deprecatedInt32_;
-    [global::System.ObsoleteAttribute]
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int DeprecatedInt32 {
-      get { if ((_hasBits0 & 1) != 0) { return deprecatedInt32_; } else { return DeprecatedInt32DefaultValue; } }
-      set {
-        _hasBits0 |= 1;
-        deprecatedInt32_ = value;
-      }
-    }
-    /// <summary>Gets whether the "deprecated_int32" field is set</summary>
-    [global::System.ObsoleteAttribute]
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasDeprecatedInt32 {
-      get { return (_hasBits0 & 1) != 0; }
-    }
-    /// <summary>Clears the value of the "deprecated_int32" field</summary>
-    [global::System.ObsoleteAttribute]
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearDeprecatedInt32() {
-      _hasBits0 &= ~1;
-    }
-
-    /// <summary>Field number for the "deprecated_int32_in_oneof" field.</summary>
-    public const int DeprecatedInt32InOneofFieldNumber = 2;
-    [global::System.ObsoleteAttribute]
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int DeprecatedInt32InOneof {
-      get { return HasDeprecatedInt32InOneof ? (int) oneofFields_ : 0; }
-      set {
-        oneofFields_ = value;
-        oneofFieldsCase_ = OneofFieldsOneofCase.DeprecatedInt32InOneof;
-      }
-    }
-    /// <summary>Gets whether the "deprecated_int32_in_oneof" field is set</summary>
-    [global::System.ObsoleteAttribute]
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasDeprecatedInt32InOneof {
-      get { return oneofFieldsCase_ == OneofFieldsOneofCase.DeprecatedInt32InOneof; }
-    }
-    /// <summary> Clears the value of the oneof if it's currently set to "deprecated_int32_in_oneof" </summary>
-    [global::System.ObsoleteAttribute]
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearDeprecatedInt32InOneof() {
-      if (HasDeprecatedInt32InOneof) {
-        ClearOneofFields();
-      }
-    }
-
-    private object oneofFields_;
-    /// <summary>Enum of possible cases for the "oneof_fields" oneof.</summary>
-    public enum OneofFieldsOneofCase {
-      None = 0,
-      DeprecatedInt32InOneof = 2,
-    }
-    private OneofFieldsOneofCase oneofFieldsCase_ = OneofFieldsOneofCase.None;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public OneofFieldsOneofCase OneofFieldsCase {
-      get { return oneofFieldsCase_; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearOneofFields() {
-      oneofFieldsCase_ = OneofFieldsOneofCase.None;
-      oneofFields_ = null;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as TestDeprecatedFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(TestDeprecatedFields other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (DeprecatedInt32 != other.DeprecatedInt32) return false;
-      if (DeprecatedInt32InOneof != other.DeprecatedInt32InOneof) return false;
-      if (OneofFieldsCase != other.OneofFieldsCase) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (HasDeprecatedInt32) hash ^= DeprecatedInt32.GetHashCode();
-      if (HasDeprecatedInt32InOneof) hash ^= DeprecatedInt32InOneof.GetHashCode();
-      hash ^= (int) oneofFieldsCase_;
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (HasDeprecatedInt32) {
-        output.WriteRawTag(8);
-        output.WriteInt32(DeprecatedInt32);
-      }
-      if (HasDeprecatedInt32InOneof) {
-        output.WriteRawTag(16);
-        output.WriteInt32(DeprecatedInt32InOneof);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (HasDeprecatedInt32) {
-        output.WriteRawTag(8);
-        output.WriteInt32(DeprecatedInt32);
-      }
-      if (HasDeprecatedInt32InOneof) {
-        output.WriteRawTag(16);
-        output.WriteInt32(DeprecatedInt32InOneof);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (HasDeprecatedInt32) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(DeprecatedInt32);
-      }
-      if (HasDeprecatedInt32InOneof) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(DeprecatedInt32InOneof);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(TestDeprecatedFields other) {
-      if (other == null) {
-        return;
-      }
-      if (other.HasDeprecatedInt32) {
-        DeprecatedInt32 = other.DeprecatedInt32;
-      }
-      switch (other.OneofFieldsCase) {
-        case OneofFieldsOneofCase.DeprecatedInt32InOneof:
-          DeprecatedInt32InOneof = other.DeprecatedInt32InOneof;
-          break;
-      }
-
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 8: {
-            DeprecatedInt32 = input.ReadInt32();
-            break;
-          }
-          case 16: {
-            DeprecatedInt32InOneof = input.ReadInt32();
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 8: {
-            DeprecatedInt32 = input.ReadInt32();
-            break;
-          }
-          case 16: {
-            DeprecatedInt32InOneof = input.ReadInt32();
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  [global::System.ObsoleteAttribute]
-  public sealed partial class TestDeprecatedMessage : pb::IMessage<TestDeprecatedMessage>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<TestDeprecatedMessage> _parser = new pb::MessageParser<TestDeprecatedMessage>(() => new TestDeprecatedMessage());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<TestDeprecatedMessage> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.Proto2.UnittestReflection.Descriptor.MessageTypes[3]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestDeprecatedMessage() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestDeprecatedMessage(TestDeprecatedMessage other) : this() {
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestDeprecatedMessage Clone() {
-      return new TestDeprecatedMessage(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as TestDeprecatedMessage);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(TestDeprecatedMessage other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(TestDeprecatedMessage other) {
-      if (other == null) {
-        return;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-        }
-      }
-    }
-    #endif
-
-  }
-
-  /// <summary>
-  /// Define these after TestAllTypes to make sure the compiler can handle
-  /// that.
-  /// </summary>
-  public sealed partial class ForeignMessage : pb::IMessage<ForeignMessage>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<ForeignMessage> _parser = new pb::MessageParser<ForeignMessage>(() => new ForeignMessage());
-    private pb::UnknownFieldSet _unknownFields;
-    private int _hasBits0;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<ForeignMessage> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.Proto2.UnittestReflection.Descriptor.MessageTypes[4]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ForeignMessage() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ForeignMessage(ForeignMessage other) : this() {
-      _hasBits0 = other._hasBits0;
-      c_ = other.c_;
-      d_ = other.d_;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ForeignMessage Clone() {
-      return new ForeignMessage(this);
-    }
-
-    /// <summary>Field number for the "c" field.</summary>
-    public const int CFieldNumber = 1;
-    private readonly static int CDefaultValue = 0;
-
-    private int c_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int C {
-      get { if ((_hasBits0 & 1) != 0) { return c_; } else { return CDefaultValue; } }
-      set {
-        _hasBits0 |= 1;
-        c_ = value;
-      }
-    }
-    /// <summary>Gets whether the "c" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasC {
-      get { return (_hasBits0 & 1) != 0; }
-    }
-    /// <summary>Clears the value of the "c" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearC() {
-      _hasBits0 &= ~1;
-    }
-
-    /// <summary>Field number for the "d" field.</summary>
-    public const int DFieldNumber = 2;
-    private readonly static int DDefaultValue = 0;
-
-    private int d_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int D {
-      get { if ((_hasBits0 & 2) != 0) { return d_; } else { return DDefaultValue; } }
-      set {
-        _hasBits0 |= 2;
-        d_ = value;
-      }
-    }
-    /// <summary>Gets whether the "d" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasD {
-      get { return (_hasBits0 & 2) != 0; }
-    }
-    /// <summary>Clears the value of the "d" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearD() {
-      _hasBits0 &= ~2;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as ForeignMessage);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(ForeignMessage other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (C != other.C) return false;
-      if (D != other.D) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (HasC) hash ^= C.GetHashCode();
-      if (HasD) hash ^= D.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (HasC) {
-        output.WriteRawTag(8);
-        output.WriteInt32(C);
-      }
-      if (HasD) {
-        output.WriteRawTag(16);
-        output.WriteInt32(D);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (HasC) {
-        output.WriteRawTag(8);
-        output.WriteInt32(C);
-      }
-      if (HasD) {
-        output.WriteRawTag(16);
-        output.WriteInt32(D);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (HasC) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(C);
-      }
-      if (HasD) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(D);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(ForeignMessage other) {
-      if (other == null) {
-        return;
-      }
-      if (other.HasC) {
-        C = other.C;
-      }
-      if (other.HasD) {
-        D = other.D;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 8: {
-            C = input.ReadInt32();
-            break;
-          }
-          case 16: {
-            D = input.ReadInt32();
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 8: {
-            C = input.ReadInt32();
-            break;
-          }
-          case 16: {
-            D = input.ReadInt32();
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  public sealed partial class TestReservedFields : pb::IMessage<TestReservedFields>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<TestReservedFields> _parser = new pb::MessageParser<TestReservedFields>(() => new TestReservedFields());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<TestReservedFields> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.Proto2.UnittestReflection.Descriptor.MessageTypes[5]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestReservedFields() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestReservedFields(TestReservedFields other) : this() {
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestReservedFields Clone() {
-      return new TestReservedFields(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as TestReservedFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(TestReservedFields other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(TestReservedFields other) {
-      if (other == null) {
-        return;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-        }
-      }
-    }
-    #endif
-
-  }
-
-  public sealed partial class TestAllExtensions : pb::IExtendableMessage<TestAllExtensions>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<TestAllExtensions> _parser = new pb::MessageParser<TestAllExtensions>(() => new TestAllExtensions());
-    private pb::UnknownFieldSet _unknownFields;
-    private pb::ExtensionSet<TestAllExtensions> _extensions;
-    private pb::ExtensionSet<TestAllExtensions> _Extensions { get { return _extensions; } }
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<TestAllExtensions> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.Proto2.UnittestReflection.Descriptor.MessageTypes[6]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestAllExtensions() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestAllExtensions(TestAllExtensions other) : this() {
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-      _extensions = pb::ExtensionSet.Clone(other._extensions);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestAllExtensions Clone() {
-      return new TestAllExtensions(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as TestAllExtensions);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(TestAllExtensions other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (!Equals(_extensions, other._extensions)) {
-        return false;
-      }
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (_extensions != null) {
-        hash ^= _extensions.GetHashCode();
-      }
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (_extensions != null) {
-        _extensions.WriteTo(output);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (_extensions != null) {
-        _extensions.WriteTo(ref output);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (_extensions != null) {
-        size += _extensions.CalculateSize();
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(TestAllExtensions other) {
-      if (other == null) {
-        return;
-      }
-      pb::ExtensionSet.MergeFrom(ref _extensions, other._extensions);
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            if (!pb::ExtensionSet.TryMergeFieldFrom(ref _extensions, input)) {
-              _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            }
-            break;
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            if (!pb::ExtensionSet.TryMergeFieldFrom(ref _extensions, ref input)) {
-              _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            }
-            break;
-        }
-      }
-    }
-    #endif
-
-    public TValue GetExtension<TValue>(pb::Extension<TestAllExtensions, TValue> extension) {
-      return pb::ExtensionSet.Get(ref _extensions, extension);
-    }
-    public pbc::RepeatedField<TValue> GetExtension<TValue>(pb::RepeatedExtension<TestAllExtensions, TValue> extension) {
-      return pb::ExtensionSet.Get(ref _extensions, extension);
-    }
-    public pbc::RepeatedField<TValue> GetOrInitializeExtension<TValue>(pb::RepeatedExtension<TestAllExtensions, TValue> extension) {
-      return pb::ExtensionSet.GetOrInitialize(ref _extensions, extension);
-    }
-    public void SetExtension<TValue>(pb::Extension<TestAllExtensions, TValue> extension, TValue value) {
-      pb::ExtensionSet.Set(ref _extensions, extension, value);
-    }
-    public bool HasExtension<TValue>(pb::Extension<TestAllExtensions, TValue> extension) {
-      return pb::ExtensionSet.Has(ref _extensions, extension);
-    }
-    public void ClearExtension<TValue>(pb::Extension<TestAllExtensions, TValue> extension) {
-      pb::ExtensionSet.Clear(ref _extensions, extension);
-    }
-    public void ClearExtension<TValue>(pb::RepeatedExtension<TestAllExtensions, TValue> extension) {
-      pb::ExtensionSet.Clear(ref _extensions, extension);
-    }
-
-  }
-
-  public sealed partial class OptionalGroup_extension : pb::IMessage<OptionalGroup_extension>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<OptionalGroup_extension> _parser = new pb::MessageParser<OptionalGroup_extension>(() => new OptionalGroup_extension());
-    private pb::UnknownFieldSet _unknownFields;
-    private int _hasBits0;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<OptionalGroup_extension> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.Proto2.UnittestReflection.Descriptor.MessageTypes[7]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public OptionalGroup_extension() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public OptionalGroup_extension(OptionalGroup_extension other) : this() {
-      _hasBits0 = other._hasBits0;
-      a_ = other.a_;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public OptionalGroup_extension Clone() {
-      return new OptionalGroup_extension(this);
-    }
-
-    /// <summary>Field number for the "a" field.</summary>
-    public const int AFieldNumber = 17;
-    private readonly static int ADefaultValue = 0;
-
-    private int a_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int A {
-      get { if ((_hasBits0 & 1) != 0) { return a_; } else { return ADefaultValue; } }
-      set {
-        _hasBits0 |= 1;
-        a_ = value;
-      }
-    }
-    /// <summary>Gets whether the "a" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasA {
-      get { return (_hasBits0 & 1) != 0; }
-    }
-    /// <summary>Clears the value of the "a" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearA() {
-      _hasBits0 &= ~1;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as OptionalGroup_extension);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(OptionalGroup_extension other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (A != other.A) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (HasA) hash ^= A.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (HasA) {
-        output.WriteRawTag(136, 1);
-        output.WriteInt32(A);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (HasA) {
-        output.WriteRawTag(136, 1);
-        output.WriteInt32(A);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (HasA) {
-        size += 2 + pb::CodedOutputStream.ComputeInt32Size(A);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(OptionalGroup_extension other) {
-      if (other == null) {
-        return;
-      }
-      if (other.HasA) {
-        A = other.A;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          case 132:
-            return;
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 136: {
-            A = input.ReadInt32();
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          case 132:
-            return;
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 136: {
-            A = input.ReadInt32();
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  public sealed partial class RepeatedGroup_extension : pb::IMessage<RepeatedGroup_extension>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<RepeatedGroup_extension> _parser = new pb::MessageParser<RepeatedGroup_extension>(() => new RepeatedGroup_extension());
-    private pb::UnknownFieldSet _unknownFields;
-    private int _hasBits0;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<RepeatedGroup_extension> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.Proto2.UnittestReflection.Descriptor.MessageTypes[8]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public RepeatedGroup_extension() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public RepeatedGroup_extension(RepeatedGroup_extension other) : this() {
-      _hasBits0 = other._hasBits0;
-      a_ = other.a_;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public RepeatedGroup_extension Clone() {
-      return new RepeatedGroup_extension(this);
-    }
-
-    /// <summary>Field number for the "a" field.</summary>
-    public const int AFieldNumber = 47;
-    private readonly static int ADefaultValue = 0;
-
-    private int a_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int A {
-      get { if ((_hasBits0 & 1) != 0) { return a_; } else { return ADefaultValue; } }
-      set {
-        _hasBits0 |= 1;
-        a_ = value;
-      }
-    }
-    /// <summary>Gets whether the "a" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasA {
-      get { return (_hasBits0 & 1) != 0; }
-    }
-    /// <summary>Clears the value of the "a" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearA() {
-      _hasBits0 &= ~1;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as RepeatedGroup_extension);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(RepeatedGroup_extension other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (A != other.A) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (HasA) hash ^= A.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (HasA) {
-        output.WriteRawTag(248, 2);
-        output.WriteInt32(A);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (HasA) {
-        output.WriteRawTag(248, 2);
-        output.WriteInt32(A);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (HasA) {
-        size += 2 + pb::CodedOutputStream.ComputeInt32Size(A);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(RepeatedGroup_extension other) {
-      if (other == null) {
-        return;
-      }
-      if (other.HasA) {
-        A = other.A;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          case 372:
-            return;
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 376: {
-            A = input.ReadInt32();
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          case 372:
-            return;
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 376: {
-            A = input.ReadInt32();
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  public sealed partial class TestGroup : pb::IMessage<TestGroup>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<TestGroup> _parser = new pb::MessageParser<TestGroup>(() => new TestGroup());
-    private pb::UnknownFieldSet _unknownFields;
-    private int _hasBits0;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<TestGroup> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.Proto2.UnittestReflection.Descriptor.MessageTypes[9]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestGroup() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestGroup(TestGroup other) : this() {
-      _hasBits0 = other._hasBits0;
-      optionalGroup_ = other.HasOptionalGroup ? other.optionalGroup_.Clone() : null;
-      optionalForeignEnum_ = other.optionalForeignEnum_;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestGroup Clone() {
-      return new TestGroup(this);
-    }
-
-    /// <summary>Field number for the "optionalgroup" field.</summary>
-    public const int OptionalGroupFieldNumber = 16;
-    private global::Google.Protobuf.TestProtos.Proto2.TestGroup.Types.OptionalGroup optionalGroup_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.TestProtos.Proto2.TestGroup.Types.OptionalGroup OptionalGroup {
-      get { return optionalGroup_; }
-      set {
-        optionalGroup_ = value;
-      }
-    }
-    /// <summary>Gets whether the optionalgroup field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasOptionalGroup {
-      get { return optionalGroup_ != null; }
-    }
-    /// <summary>Clears the value of the optionalgroup field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearOptionalGroup() {
-      optionalGroup_ = null;
-    }
-
-    /// <summary>Field number for the "optional_foreign_enum" field.</summary>
-    public const int OptionalForeignEnumFieldNumber = 22;
-    private readonly static global::Google.Protobuf.TestProtos.Proto2.ForeignEnum OptionalForeignEnumDefaultValue = global::Google.Protobuf.TestProtos.Proto2.ForeignEnum.ForeignFoo;
-
-    private global::Google.Protobuf.TestProtos.Proto2.ForeignEnum optionalForeignEnum_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.TestProtos.Proto2.ForeignEnum OptionalForeignEnum {
-      get { if ((_hasBits0 & 1) != 0) { return optionalForeignEnum_; } else { return OptionalForeignEnumDefaultValue; } }
-      set {
-        _hasBits0 |= 1;
-        optionalForeignEnum_ = value;
-      }
-    }
-    /// <summary>Gets whether the "optional_foreign_enum" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasOptionalForeignEnum {
-      get { return (_hasBits0 & 1) != 0; }
-    }
-    /// <summary>Clears the value of the "optional_foreign_enum" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearOptionalForeignEnum() {
-      _hasBits0 &= ~1;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as TestGroup);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(TestGroup other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (!object.Equals(OptionalGroup, other.OptionalGroup)) return false;
-      if (OptionalForeignEnum != other.OptionalForeignEnum) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (HasOptionalGroup) hash ^= OptionalGroup.GetHashCode();
-      if (HasOptionalForeignEnum) hash ^= OptionalForeignEnum.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (HasOptionalGroup) {
-        output.WriteRawTag(131, 1);
-        output.WriteGroup(OptionalGroup);
-        output.WriteRawTag(132, 1);
-      }
-      if (HasOptionalForeignEnum) {
-        output.WriteRawTag(176, 1);
-        output.WriteEnum((int) OptionalForeignEnum);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (HasOptionalGroup) {
-        output.WriteRawTag(131, 1);
-        output.WriteGroup(OptionalGroup);
-        output.WriteRawTag(132, 1);
-      }
-      if (HasOptionalForeignEnum) {
-        output.WriteRawTag(176, 1);
-        output.WriteEnum((int) OptionalForeignEnum);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (HasOptionalGroup) {
-        size += 4 + pb::CodedOutputStream.ComputeGroupSize(OptionalGroup);
-      }
-      if (HasOptionalForeignEnum) {
-        size += 2 + pb::CodedOutputStream.ComputeEnumSize((int) OptionalForeignEnum);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(TestGroup other) {
-      if (other == null) {
-        return;
-      }
-      if (other.HasOptionalGroup) {
-        if (!HasOptionalGroup) {
-          OptionalGroup = new global::Google.Protobuf.TestProtos.Proto2.TestGroup.Types.OptionalGroup();
-        }
-        OptionalGroup.MergeFrom(other.OptionalGroup);
-      }
-      if (other.HasOptionalForeignEnum) {
-        OptionalForeignEnum = other.OptionalForeignEnum;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 131: {
-            if (!HasOptionalGroup) {
-              OptionalGroup = new global::Google.Protobuf.TestProtos.Proto2.TestGroup.Types.OptionalGroup();
-            }
-            input.ReadGroup(OptionalGroup);
-            break;
-          }
-          case 176: {
-            OptionalForeignEnum = (global::Google.Protobuf.TestProtos.Proto2.ForeignEnum) input.ReadEnum();
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 131: {
-            if (!HasOptionalGroup) {
-              OptionalGroup = new global::Google.Protobuf.TestProtos.Proto2.TestGroup.Types.OptionalGroup();
-            }
-            input.ReadGroup(OptionalGroup);
-            break;
-          }
-          case 176: {
-            OptionalForeignEnum = (global::Google.Protobuf.TestProtos.Proto2.ForeignEnum) input.ReadEnum();
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-    #region Nested types
-    /// <summary>Container for nested types declared in the TestGroup message type.</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static partial class Types {
-      public sealed partial class OptionalGroup : pb::IMessage<OptionalGroup>
-      #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          , pb::IBufferMessage
-      #endif
-      {
-        private static readonly pb::MessageParser<OptionalGroup> _parser = new pb::MessageParser<OptionalGroup>(() => new OptionalGroup());
-        private pb::UnknownFieldSet _unknownFields;
-        private int _hasBits0;
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static pb::MessageParser<OptionalGroup> Parser { get { return _parser; } }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static pbr::MessageDescriptor Descriptor {
-          get { return global::Google.Protobuf.TestProtos.Proto2.TestGroup.Descriptor.NestedTypes[0]; }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        pbr::MessageDescriptor pb::IMessage.Descriptor {
-          get { return Descriptor; }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public OptionalGroup() {
-          OnConstruction();
-        }
-
-        partial void OnConstruction();
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public OptionalGroup(OptionalGroup other) : this() {
-          _hasBits0 = other._hasBits0;
-          a_ = other.a_;
-          _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public OptionalGroup Clone() {
-          return new OptionalGroup(this);
-        }
-
-        /// <summary>Field number for the "a" field.</summary>
-        public const int AFieldNumber = 17;
-        private readonly static int ADefaultValue = 0;
-
-        private int a_;
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public int A {
-          get { if ((_hasBits0 & 1) != 0) { return a_; } else { return ADefaultValue; } }
-          set {
-            _hasBits0 |= 1;
-            a_ = value;
-          }
-        }
-        /// <summary>Gets whether the "a" field is set</summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool HasA {
-          get { return (_hasBits0 & 1) != 0; }
-        }
-        /// <summary>Clears the value of the "a" field</summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void ClearA() {
-          _hasBits0 &= ~1;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override bool Equals(object other) {
-          return Equals(other as OptionalGroup);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool Equals(OptionalGroup other) {
-          if (ReferenceEquals(other, null)) {
-            return false;
-          }
-          if (ReferenceEquals(other, this)) {
-            return true;
-          }
-          if (A != other.A) return false;
-          return Equals(_unknownFields, other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override int GetHashCode() {
-          int hash = 1;
-          if (HasA) hash ^= A.GetHashCode();
-          if (_unknownFields != null) {
-            hash ^= _unknownFields.GetHashCode();
-          }
-          return hash;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override string ToString() {
-          return pb::JsonFormatter.ToDiagnosticString(this);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void WriteTo(pb::CodedOutputStream output) {
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          output.WriteRawMessage(this);
-        #else
-          if (HasA) {
-            output.WriteRawTag(136, 1);
-            output.WriteInt32(A);
-          }
-          if (_unknownFields != null) {
-            _unknownFields.WriteTo(output);
-          }
-        #endif
-        }
-
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-          if (HasA) {
-            output.WriteRawTag(136, 1);
-            output.WriteInt32(A);
-          }
-          if (_unknownFields != null) {
-            _unknownFields.WriteTo(ref output);
-          }
-        }
-        #endif
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public int CalculateSize() {
-          int size = 0;
-          if (HasA) {
-            size += 2 + pb::CodedOutputStream.ComputeInt32Size(A);
-          }
-          if (_unknownFields != null) {
-            size += _unknownFields.CalculateSize();
-          }
-          return size;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(OptionalGroup other) {
-          if (other == null) {
-            return;
-          }
-          if (other.HasA) {
-            A = other.A;
-          }
-          _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(pb::CodedInputStream input) {
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          input.ReadRawMessage(this);
-        #else
-          uint tag;
-          while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
-              case 132:
-                return;
-              default:
-                _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-                break;
-              case 136: {
-                A = input.ReadInt32();
-                break;
-              }
-            }
-          }
-        #endif
-        }
-
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-          uint tag;
-          while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
-              case 132:
-                return;
-              default:
-                _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-                break;
-              case 136: {
-                A = input.ReadInt32();
-                break;
-              }
-            }
-          }
-        }
-        #endif
-
-      }
-
-    }
-    #endregion
-
-  }
-
-  public sealed partial class TestGroupExtension : pb::IExtendableMessage<TestGroupExtension>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<TestGroupExtension> _parser = new pb::MessageParser<TestGroupExtension>(() => new TestGroupExtension());
-    private pb::UnknownFieldSet _unknownFields;
-    private pb::ExtensionSet<TestGroupExtension> _extensions;
-    private pb::ExtensionSet<TestGroupExtension> _Extensions { get { return _extensions; } }
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<TestGroupExtension> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.Proto2.UnittestReflection.Descriptor.MessageTypes[10]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestGroupExtension() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestGroupExtension(TestGroupExtension other) : this() {
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-      _extensions = pb::ExtensionSet.Clone(other._extensions);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestGroupExtension Clone() {
-      return new TestGroupExtension(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as TestGroupExtension);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(TestGroupExtension other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (!Equals(_extensions, other._extensions)) {
-        return false;
-      }
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (_extensions != null) {
-        hash ^= _extensions.GetHashCode();
-      }
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (_extensions != null) {
-        _extensions.WriteTo(output);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (_extensions != null) {
-        _extensions.WriteTo(ref output);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (_extensions != null) {
-        size += _extensions.CalculateSize();
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(TestGroupExtension other) {
-      if (other == null) {
-        return;
-      }
-      pb::ExtensionSet.MergeFrom(ref _extensions, other._extensions);
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            if (!pb::ExtensionSet.TryMergeFieldFrom(ref _extensions, input)) {
-              _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            }
-            break;
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            if (!pb::ExtensionSet.TryMergeFieldFrom(ref _extensions, ref input)) {
-              _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            }
-            break;
-        }
-      }
-    }
-    #endif
-
-    public TValue GetExtension<TValue>(pb::Extension<TestGroupExtension, TValue> extension) {
-      return pb::ExtensionSet.Get(ref _extensions, extension);
-    }
-    public pbc::RepeatedField<TValue> GetExtension<TValue>(pb::RepeatedExtension<TestGroupExtension, TValue> extension) {
-      return pb::ExtensionSet.Get(ref _extensions, extension);
-    }
-    public pbc::RepeatedField<TValue> GetOrInitializeExtension<TValue>(pb::RepeatedExtension<TestGroupExtension, TValue> extension) {
-      return pb::ExtensionSet.GetOrInitialize(ref _extensions, extension);
-    }
-    public void SetExtension<TValue>(pb::Extension<TestGroupExtension, TValue> extension, TValue value) {
-      pb::ExtensionSet.Set(ref _extensions, extension, value);
-    }
-    public bool HasExtension<TValue>(pb::Extension<TestGroupExtension, TValue> extension) {
-      return pb::ExtensionSet.Has(ref _extensions, extension);
-    }
-    public void ClearExtension<TValue>(pb::Extension<TestGroupExtension, TValue> extension) {
-      pb::ExtensionSet.Clear(ref _extensions, extension);
-    }
-    public void ClearExtension<TValue>(pb::RepeatedExtension<TestGroupExtension, TValue> extension) {
-      pb::ExtensionSet.Clear(ref _extensions, extension);
-    }
-
-  }
-
-  public sealed partial class TestNestedExtension : pb::IMessage<TestNestedExtension>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<TestNestedExtension> _parser = new pb::MessageParser<TestNestedExtension>(() => new TestNestedExtension());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<TestNestedExtension> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.Proto2.UnittestReflection.Descriptor.MessageTypes[11]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestNestedExtension() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestNestedExtension(TestNestedExtension other) : this() {
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestNestedExtension Clone() {
-      return new TestNestedExtension(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as TestNestedExtension);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(TestNestedExtension other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(TestNestedExtension other) {
-      if (other == null) {
-        return;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-        }
-      }
-    }
-    #endif
-
-    #region Nested types
-    /// <summary>Container for nested types declared in the TestNestedExtension message type.</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static partial class Types {
-      public sealed partial class OptionalGroup_extension : pb::IMessage<OptionalGroup_extension>
-      #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          , pb::IBufferMessage
-      #endif
-      {
-        private static readonly pb::MessageParser<OptionalGroup_extension> _parser = new pb::MessageParser<OptionalGroup_extension>(() => new OptionalGroup_extension());
-        private pb::UnknownFieldSet _unknownFields;
-        private int _hasBits0;
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static pb::MessageParser<OptionalGroup_extension> Parser { get { return _parser; } }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static pbr::MessageDescriptor Descriptor {
-          get { return global::Google.Protobuf.TestProtos.Proto2.TestNestedExtension.Descriptor.NestedTypes[0]; }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        pbr::MessageDescriptor pb::IMessage.Descriptor {
-          get { return Descriptor; }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public OptionalGroup_extension() {
-          OnConstruction();
-        }
-
-        partial void OnConstruction();
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public OptionalGroup_extension(OptionalGroup_extension other) : this() {
-          _hasBits0 = other._hasBits0;
-          a_ = other.a_;
-          _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public OptionalGroup_extension Clone() {
-          return new OptionalGroup_extension(this);
-        }
-
-        /// <summary>Field number for the "a" field.</summary>
-        public const int AFieldNumber = 17;
-        private readonly static int ADefaultValue = 0;
-
-        private int a_;
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public int A {
-          get { if ((_hasBits0 & 1) != 0) { return a_; } else { return ADefaultValue; } }
-          set {
-            _hasBits0 |= 1;
-            a_ = value;
-          }
-        }
-        /// <summary>Gets whether the "a" field is set</summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool HasA {
-          get { return (_hasBits0 & 1) != 0; }
-        }
-        /// <summary>Clears the value of the "a" field</summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void ClearA() {
-          _hasBits0 &= ~1;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override bool Equals(object other) {
-          return Equals(other as OptionalGroup_extension);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool Equals(OptionalGroup_extension other) {
-          if (ReferenceEquals(other, null)) {
-            return false;
-          }
-          if (ReferenceEquals(other, this)) {
-            return true;
-          }
-          if (A != other.A) return false;
-          return Equals(_unknownFields, other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override int GetHashCode() {
-          int hash = 1;
-          if (HasA) hash ^= A.GetHashCode();
-          if (_unknownFields != null) {
-            hash ^= _unknownFields.GetHashCode();
-          }
-          return hash;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override string ToString() {
-          return pb::JsonFormatter.ToDiagnosticString(this);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void WriteTo(pb::CodedOutputStream output) {
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          output.WriteRawMessage(this);
-        #else
-          if (HasA) {
-            output.WriteRawTag(136, 1);
-            output.WriteInt32(A);
-          }
-          if (_unknownFields != null) {
-            _unknownFields.WriteTo(output);
-          }
-        #endif
-        }
-
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-          if (HasA) {
-            output.WriteRawTag(136, 1);
-            output.WriteInt32(A);
-          }
-          if (_unknownFields != null) {
-            _unknownFields.WriteTo(ref output);
-          }
-        }
-        #endif
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public int CalculateSize() {
-          int size = 0;
-          if (HasA) {
-            size += 2 + pb::CodedOutputStream.ComputeInt32Size(A);
-          }
-          if (_unknownFields != null) {
-            size += _unknownFields.CalculateSize();
-          }
-          return size;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(OptionalGroup_extension other) {
-          if (other == null) {
-            return;
-          }
-          if (other.HasA) {
-            A = other.A;
-          }
-          _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(pb::CodedInputStream input) {
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          input.ReadRawMessage(this);
-        #else
-          uint tag;
-          while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
-              case 132:
-                return;
-              default:
-                _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-                break;
-              case 136: {
-                A = input.ReadInt32();
-                break;
-              }
-            }
-          }
-        #endif
-        }
-
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-          uint tag;
-          while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
-              case 132:
-                return;
-              default:
-                _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-                break;
-              case 136: {
-                A = input.ReadInt32();
-                break;
-              }
-            }
-          }
-        }
-        #endif
-
-      }
-
-    }
-    #endregion
-
-    #region Extensions
-    /// <summary>Container for extensions for other messages declared in the TestNestedExtension message type.</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static partial class Extensions {
-      /// <summary>
-      /// Check for bug where string extensions declared in tested scope did not
-      /// compile.
-      /// </summary>
-      public static readonly pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, string> Test =
-        new pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, string>(1002, pb::FieldCodec.ForString(8018, global::System.Text.Encoding.UTF8.GetString(global::System.Convert.FromBase64String("dGVzdA=="), 0, 4)));
-      /// <summary>
-      /// Used to test if generated extension name is correct when there are
-      /// underscores.
-      /// </summary>
-      public static readonly pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, string> NestedStringExtension =
-        new pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, string>(1003, pb::FieldCodec.ForString(8026, ""));
-      public static readonly pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestGroupExtension, global::Google.Protobuf.TestProtos.Proto2.TestNestedExtension.Types.OptionalGroup_extension> OptionalGroupExtension =
-        new pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestGroupExtension, global::Google.Protobuf.TestProtos.Proto2.TestNestedExtension.Types.OptionalGroup_extension>(16, pb::FieldCodec.ForGroup(131, 132, global::Google.Protobuf.TestProtos.Proto2.TestNestedExtension.Types.OptionalGroup_extension.Parser));
-      public static readonly pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestGroupExtension, global::Google.Protobuf.TestProtos.Proto2.ForeignEnum> OptionalForeignEnumExtension =
-        new pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestGroupExtension, global::Google.Protobuf.TestProtos.Proto2.ForeignEnum>(22, pb::FieldCodec.ForEnum(176, x => (int) x, x => (global::Google.Protobuf.TestProtos.Proto2.ForeignEnum) x, global::Google.Protobuf.TestProtos.Proto2.ForeignEnum.ForeignFoo));
-    }
-    #endregion
-
-  }
-
-  /// <summary>
-  /// We have separate messages for testing required fields because it's
-  /// annoying to have to fill in required fields in TestProto in order to
-  /// do anything with it.  Note that we don't need to test every type of
-  /// required filed because the code output is basically identical to
-  /// optional fields for all types.
-  /// </summary>
-  public sealed partial class TestRequired : pb::IMessage<TestRequired>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<TestRequired> _parser = new pb::MessageParser<TestRequired>(() => new TestRequired());
-    private pb::UnknownFieldSet _unknownFields;
-    private int _hasBits0;
-    private int _hasBits1;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<TestRequired> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.Proto2.UnittestReflection.Descriptor.MessageTypes[12]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestRequired() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestRequired(TestRequired other) : this() {
-      _hasBits0 = other._hasBits0;
-      _hasBits1 = other._hasBits1;
-      a_ = other.a_;
-      dummy2_ = other.dummy2_;
-      b_ = other.b_;
-      dummy4_ = other.dummy4_;
-      dummy5_ = other.dummy5_;
-      dummy6_ = other.dummy6_;
-      dummy7_ = other.dummy7_;
-      dummy8_ = other.dummy8_;
-      dummy9_ = other.dummy9_;
-      dummy10_ = other.dummy10_;
-      dummy11_ = other.dummy11_;
-      dummy12_ = other.dummy12_;
-      dummy13_ = other.dummy13_;
-      dummy14_ = other.dummy14_;
-      dummy15_ = other.dummy15_;
-      dummy16_ = other.dummy16_;
-      dummy17_ = other.dummy17_;
-      dummy18_ = other.dummy18_;
-      dummy19_ = other.dummy19_;
-      dummy20_ = other.dummy20_;
-      dummy21_ = other.dummy21_;
-      dummy22_ = other.dummy22_;
-      dummy23_ = other.dummy23_;
-      dummy24_ = other.dummy24_;
-      dummy25_ = other.dummy25_;
-      dummy26_ = other.dummy26_;
-      dummy27_ = other.dummy27_;
-      dummy28_ = other.dummy28_;
-      dummy29_ = other.dummy29_;
-      dummy30_ = other.dummy30_;
-      dummy31_ = other.dummy31_;
-      dummy32_ = other.dummy32_;
-      c_ = other.c_;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestRequired Clone() {
-      return new TestRequired(this);
-    }
-
-    /// <summary>Field number for the "a" field.</summary>
-    public const int AFieldNumber = 1;
-    private readonly static int ADefaultValue = 0;
-
-    private int a_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int A {
-      get { if ((_hasBits0 & 1) != 0) { return a_; } else { return ADefaultValue; } }
-      set {
-        _hasBits0 |= 1;
-        a_ = value;
-      }
-    }
-    /// <summary>Gets whether the "a" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasA {
-      get { return (_hasBits0 & 1) != 0; }
-    }
-    /// <summary>Clears the value of the "a" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearA() {
-      _hasBits0 &= ~1;
-    }
-
-    /// <summary>Field number for the "dummy2" field.</summary>
-    public const int Dummy2FieldNumber = 2;
-    private readonly static int Dummy2DefaultValue = 0;
-
-    private int dummy2_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int Dummy2 {
-      get { if ((_hasBits0 & 2) != 0) { return dummy2_; } else { return Dummy2DefaultValue; } }
-      set {
-        _hasBits0 |= 2;
-        dummy2_ = value;
-      }
-    }
-    /// <summary>Gets whether the "dummy2" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasDummy2 {
-      get { return (_hasBits0 & 2) != 0; }
-    }
-    /// <summary>Clears the value of the "dummy2" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearDummy2() {
-      _hasBits0 &= ~2;
-    }
-
-    /// <summary>Field number for the "b" field.</summary>
-    public const int BFieldNumber = 3;
-    private readonly static int BDefaultValue = 0;
-
-    private int b_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int B {
-      get { if ((_hasBits0 & 4) != 0) { return b_; } else { return BDefaultValue; } }
-      set {
-        _hasBits0 |= 4;
-        b_ = value;
-      }
-    }
-    /// <summary>Gets whether the "b" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasB {
-      get { return (_hasBits0 & 4) != 0; }
-    }
-    /// <summary>Clears the value of the "b" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearB() {
-      _hasBits0 &= ~4;
-    }
-
-    /// <summary>Field number for the "dummy4" field.</summary>
-    public const int Dummy4FieldNumber = 4;
-    private readonly static int Dummy4DefaultValue = 0;
-
-    private int dummy4_;
-    /// <summary>
-    /// Pad the field count to 32 so that we can test that IsInitialized()
-    /// properly checks multiple elements of has_bits_.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int Dummy4 {
-      get { if ((_hasBits0 & 8) != 0) { return dummy4_; } else { return Dummy4DefaultValue; } }
-      set {
-        _hasBits0 |= 8;
-        dummy4_ = value;
-      }
-    }
-    /// <summary>Gets whether the "dummy4" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasDummy4 {
-      get { return (_hasBits0 & 8) != 0; }
-    }
-    /// <summary>Clears the value of the "dummy4" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearDummy4() {
-      _hasBits0 &= ~8;
-    }
-
-    /// <summary>Field number for the "dummy5" field.</summary>
-    public const int Dummy5FieldNumber = 5;
-    private readonly static int Dummy5DefaultValue = 0;
-
-    private int dummy5_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int Dummy5 {
-      get { if ((_hasBits0 & 16) != 0) { return dummy5_; } else { return Dummy5DefaultValue; } }
-      set {
-        _hasBits0 |= 16;
-        dummy5_ = value;
-      }
-    }
-    /// <summary>Gets whether the "dummy5" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasDummy5 {
-      get { return (_hasBits0 & 16) != 0; }
-    }
-    /// <summary>Clears the value of the "dummy5" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearDummy5() {
-      _hasBits0 &= ~16;
-    }
-
-    /// <summary>Field number for the "dummy6" field.</summary>
-    public const int Dummy6FieldNumber = 6;
-    private readonly static int Dummy6DefaultValue = 0;
-
-    private int dummy6_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int Dummy6 {
-      get { if ((_hasBits0 & 32) != 0) { return dummy6_; } else { return Dummy6DefaultValue; } }
-      set {
-        _hasBits0 |= 32;
-        dummy6_ = value;
-      }
-    }
-    /// <summary>Gets whether the "dummy6" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasDummy6 {
-      get { return (_hasBits0 & 32) != 0; }
-    }
-    /// <summary>Clears the value of the "dummy6" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearDummy6() {
-      _hasBits0 &= ~32;
-    }
-
-    /// <summary>Field number for the "dummy7" field.</summary>
-    public const int Dummy7FieldNumber = 7;
-    private readonly static int Dummy7DefaultValue = 0;
-
-    private int dummy7_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int Dummy7 {
-      get { if ((_hasBits0 & 64) != 0) { return dummy7_; } else { return Dummy7DefaultValue; } }
-      set {
-        _hasBits0 |= 64;
-        dummy7_ = value;
-      }
-    }
-    /// <summary>Gets whether the "dummy7" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasDummy7 {
-      get { return (_hasBits0 & 64) != 0; }
-    }
-    /// <summary>Clears the value of the "dummy7" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearDummy7() {
-      _hasBits0 &= ~64;
-    }
-
-    /// <summary>Field number for the "dummy8" field.</summary>
-    public const int Dummy8FieldNumber = 8;
-    private readonly static int Dummy8DefaultValue = 0;
-
-    private int dummy8_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int Dummy8 {
-      get { if ((_hasBits0 & 128) != 0) { return dummy8_; } else { return Dummy8DefaultValue; } }
-      set {
-        _hasBits0 |= 128;
-        dummy8_ = value;
-      }
-    }
-    /// <summary>Gets whether the "dummy8" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasDummy8 {
-      get { return (_hasBits0 & 128) != 0; }
-    }
-    /// <summary>Clears the value of the "dummy8" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearDummy8() {
-      _hasBits0 &= ~128;
-    }
-
-    /// <summary>Field number for the "dummy9" field.</summary>
-    public const int Dummy9FieldNumber = 9;
-    private readonly static int Dummy9DefaultValue = 0;
-
-    private int dummy9_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int Dummy9 {
-      get { if ((_hasBits0 & 256) != 0) { return dummy9_; } else { return Dummy9DefaultValue; } }
-      set {
-        _hasBits0 |= 256;
-        dummy9_ = value;
-      }
-    }
-    /// <summary>Gets whether the "dummy9" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasDummy9 {
-      get { return (_hasBits0 & 256) != 0; }
-    }
-    /// <summary>Clears the value of the "dummy9" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearDummy9() {
-      _hasBits0 &= ~256;
-    }
-
-    /// <summary>Field number for the "dummy10" field.</summary>
-    public const int Dummy10FieldNumber = 10;
-    private readonly static int Dummy10DefaultValue = 0;
-
-    private int dummy10_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int Dummy10 {
-      get { if ((_hasBits0 & 512) != 0) { return dummy10_; } else { return Dummy10DefaultValue; } }
-      set {
-        _hasBits0 |= 512;
-        dummy10_ = value;
-      }
-    }
-    /// <summary>Gets whether the "dummy10" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasDummy10 {
-      get { return (_hasBits0 & 512) != 0; }
-    }
-    /// <summary>Clears the value of the "dummy10" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearDummy10() {
-      _hasBits0 &= ~512;
-    }
-
-    /// <summary>Field number for the "dummy11" field.</summary>
-    public const int Dummy11FieldNumber = 11;
-    private readonly static int Dummy11DefaultValue = 0;
-
-    private int dummy11_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int Dummy11 {
-      get { if ((_hasBits0 & 1024) != 0) { return dummy11_; } else { return Dummy11DefaultValue; } }
-      set {
-        _hasBits0 |= 1024;
-        dummy11_ = value;
-      }
-    }
-    /// <summary>Gets whether the "dummy11" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasDummy11 {
-      get { return (_hasBits0 & 1024) != 0; }
-    }
-    /// <summary>Clears the value of the "dummy11" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearDummy11() {
-      _hasBits0 &= ~1024;
-    }
-
-    /// <summary>Field number for the "dummy12" field.</summary>
-    public const int Dummy12FieldNumber = 12;
-    private readonly static int Dummy12DefaultValue = 0;
-
-    private int dummy12_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int Dummy12 {
-      get { if ((_hasBits0 & 2048) != 0) { return dummy12_; } else { return Dummy12DefaultValue; } }
-      set {
-        _hasBits0 |= 2048;
-        dummy12_ = value;
-      }
-    }
-    /// <summary>Gets whether the "dummy12" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasDummy12 {
-      get { return (_hasBits0 & 2048) != 0; }
-    }
-    /// <summary>Clears the value of the "dummy12" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearDummy12() {
-      _hasBits0 &= ~2048;
-    }
-
-    /// <summary>Field number for the "dummy13" field.</summary>
-    public const int Dummy13FieldNumber = 13;
-    private readonly static int Dummy13DefaultValue = 0;
-
-    private int dummy13_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int Dummy13 {
-      get { if ((_hasBits0 & 4096) != 0) { return dummy13_; } else { return Dummy13DefaultValue; } }
-      set {
-        _hasBits0 |= 4096;
-        dummy13_ = value;
-      }
-    }
-    /// <summary>Gets whether the "dummy13" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasDummy13 {
-      get { return (_hasBits0 & 4096) != 0; }
-    }
-    /// <summary>Clears the value of the "dummy13" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearDummy13() {
-      _hasBits0 &= ~4096;
-    }
-
-    /// <summary>Field number for the "dummy14" field.</summary>
-    public const int Dummy14FieldNumber = 14;
-    private readonly static int Dummy14DefaultValue = 0;
-
-    private int dummy14_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int Dummy14 {
-      get { if ((_hasBits0 & 8192) != 0) { return dummy14_; } else { return Dummy14DefaultValue; } }
-      set {
-        _hasBits0 |= 8192;
-        dummy14_ = value;
-      }
-    }
-    /// <summary>Gets whether the "dummy14" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasDummy14 {
-      get { return (_hasBits0 & 8192) != 0; }
-    }
-    /// <summary>Clears the value of the "dummy14" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearDummy14() {
-      _hasBits0 &= ~8192;
-    }
-
-    /// <summary>Field number for the "dummy15" field.</summary>
-    public const int Dummy15FieldNumber = 15;
-    private readonly static int Dummy15DefaultValue = 0;
-
-    private int dummy15_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int Dummy15 {
-      get { if ((_hasBits0 & 16384) != 0) { return dummy15_; } else { return Dummy15DefaultValue; } }
-      set {
-        _hasBits0 |= 16384;
-        dummy15_ = value;
-      }
-    }
-    /// <summary>Gets whether the "dummy15" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasDummy15 {
-      get { return (_hasBits0 & 16384) != 0; }
-    }
-    /// <summary>Clears the value of the "dummy15" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearDummy15() {
-      _hasBits0 &= ~16384;
-    }
-
-    /// <summary>Field number for the "dummy16" field.</summary>
-    public const int Dummy16FieldNumber = 16;
-    private readonly static int Dummy16DefaultValue = 0;
-
-    private int dummy16_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int Dummy16 {
-      get { if ((_hasBits0 & 32768) != 0) { return dummy16_; } else { return Dummy16DefaultValue; } }
-      set {
-        _hasBits0 |= 32768;
-        dummy16_ = value;
-      }
-    }
-    /// <summary>Gets whether the "dummy16" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasDummy16 {
-      get { return (_hasBits0 & 32768) != 0; }
-    }
-    /// <summary>Clears the value of the "dummy16" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearDummy16() {
-      _hasBits0 &= ~32768;
-    }
-
-    /// <summary>Field number for the "dummy17" field.</summary>
-    public const int Dummy17FieldNumber = 17;
-    private readonly static int Dummy17DefaultValue = 0;
-
-    private int dummy17_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int Dummy17 {
-      get { if ((_hasBits0 & 65536) != 0) { return dummy17_; } else { return Dummy17DefaultValue; } }
-      set {
-        _hasBits0 |= 65536;
-        dummy17_ = value;
-      }
-    }
-    /// <summary>Gets whether the "dummy17" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasDummy17 {
-      get { return (_hasBits0 & 65536) != 0; }
-    }
-    /// <summary>Clears the value of the "dummy17" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearDummy17() {
-      _hasBits0 &= ~65536;
-    }
-
-    /// <summary>Field number for the "dummy18" field.</summary>
-    public const int Dummy18FieldNumber = 18;
-    private readonly static int Dummy18DefaultValue = 0;
-
-    private int dummy18_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int Dummy18 {
-      get { if ((_hasBits0 & 131072) != 0) { return dummy18_; } else { return Dummy18DefaultValue; } }
-      set {
-        _hasBits0 |= 131072;
-        dummy18_ = value;
-      }
-    }
-    /// <summary>Gets whether the "dummy18" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasDummy18 {
-      get { return (_hasBits0 & 131072) != 0; }
-    }
-    /// <summary>Clears the value of the "dummy18" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearDummy18() {
-      _hasBits0 &= ~131072;
-    }
-
-    /// <summary>Field number for the "dummy19" field.</summary>
-    public const int Dummy19FieldNumber = 19;
-    private readonly static int Dummy19DefaultValue = 0;
-
-    private int dummy19_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int Dummy19 {
-      get { if ((_hasBits0 & 262144) != 0) { return dummy19_; } else { return Dummy19DefaultValue; } }
-      set {
-        _hasBits0 |= 262144;
-        dummy19_ = value;
-      }
-    }
-    /// <summary>Gets whether the "dummy19" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasDummy19 {
-      get { return (_hasBits0 & 262144) != 0; }
-    }
-    /// <summary>Clears the value of the "dummy19" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearDummy19() {
-      _hasBits0 &= ~262144;
-    }
-
-    /// <summary>Field number for the "dummy20" field.</summary>
-    public const int Dummy20FieldNumber = 20;
-    private readonly static int Dummy20DefaultValue = 0;
-
-    private int dummy20_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int Dummy20 {
-      get { if ((_hasBits0 & 524288) != 0) { return dummy20_; } else { return Dummy20DefaultValue; } }
-      set {
-        _hasBits0 |= 524288;
-        dummy20_ = value;
-      }
-    }
-    /// <summary>Gets whether the "dummy20" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasDummy20 {
-      get { return (_hasBits0 & 524288) != 0; }
-    }
-    /// <summary>Clears the value of the "dummy20" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearDummy20() {
-      _hasBits0 &= ~524288;
-    }
-
-    /// <summary>Field number for the "dummy21" field.</summary>
-    public const int Dummy21FieldNumber = 21;
-    private readonly static int Dummy21DefaultValue = 0;
-
-    private int dummy21_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int Dummy21 {
-      get { if ((_hasBits0 & 1048576) != 0) { return dummy21_; } else { return Dummy21DefaultValue; } }
-      set {
-        _hasBits0 |= 1048576;
-        dummy21_ = value;
-      }
-    }
-    /// <summary>Gets whether the "dummy21" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasDummy21 {
-      get { return (_hasBits0 & 1048576) != 0; }
-    }
-    /// <summary>Clears the value of the "dummy21" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearDummy21() {
-      _hasBits0 &= ~1048576;
-    }
-
-    /// <summary>Field number for the "dummy22" field.</summary>
-    public const int Dummy22FieldNumber = 22;
-    private readonly static int Dummy22DefaultValue = 0;
-
-    private int dummy22_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int Dummy22 {
-      get { if ((_hasBits0 & 2097152) != 0) { return dummy22_; } else { return Dummy22DefaultValue; } }
-      set {
-        _hasBits0 |= 2097152;
-        dummy22_ = value;
-      }
-    }
-    /// <summary>Gets whether the "dummy22" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasDummy22 {
-      get { return (_hasBits0 & 2097152) != 0; }
-    }
-    /// <summary>Clears the value of the "dummy22" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearDummy22() {
-      _hasBits0 &= ~2097152;
-    }
-
-    /// <summary>Field number for the "dummy23" field.</summary>
-    public const int Dummy23FieldNumber = 23;
-    private readonly static int Dummy23DefaultValue = 0;
-
-    private int dummy23_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int Dummy23 {
-      get { if ((_hasBits0 & 4194304) != 0) { return dummy23_; } else { return Dummy23DefaultValue; } }
-      set {
-        _hasBits0 |= 4194304;
-        dummy23_ = value;
-      }
-    }
-    /// <summary>Gets whether the "dummy23" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasDummy23 {
-      get { return (_hasBits0 & 4194304) != 0; }
-    }
-    /// <summary>Clears the value of the "dummy23" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearDummy23() {
-      _hasBits0 &= ~4194304;
-    }
-
-    /// <summary>Field number for the "dummy24" field.</summary>
-    public const int Dummy24FieldNumber = 24;
-    private readonly static int Dummy24DefaultValue = 0;
-
-    private int dummy24_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int Dummy24 {
-      get { if ((_hasBits0 & 8388608) != 0) { return dummy24_; } else { return Dummy24DefaultValue; } }
-      set {
-        _hasBits0 |= 8388608;
-        dummy24_ = value;
-      }
-    }
-    /// <summary>Gets whether the "dummy24" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasDummy24 {
-      get { return (_hasBits0 & 8388608) != 0; }
-    }
-    /// <summary>Clears the value of the "dummy24" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearDummy24() {
-      _hasBits0 &= ~8388608;
-    }
-
-    /// <summary>Field number for the "dummy25" field.</summary>
-    public const int Dummy25FieldNumber = 25;
-    private readonly static int Dummy25DefaultValue = 0;
-
-    private int dummy25_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int Dummy25 {
-      get { if ((_hasBits0 & 16777216) != 0) { return dummy25_; } else { return Dummy25DefaultValue; } }
-      set {
-        _hasBits0 |= 16777216;
-        dummy25_ = value;
-      }
-    }
-    /// <summary>Gets whether the "dummy25" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasDummy25 {
-      get { return (_hasBits0 & 16777216) != 0; }
-    }
-    /// <summary>Clears the value of the "dummy25" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearDummy25() {
-      _hasBits0 &= ~16777216;
-    }
-
-    /// <summary>Field number for the "dummy26" field.</summary>
-    public const int Dummy26FieldNumber = 26;
-    private readonly static int Dummy26DefaultValue = 0;
-
-    private int dummy26_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int Dummy26 {
-      get { if ((_hasBits0 & 33554432) != 0) { return dummy26_; } else { return Dummy26DefaultValue; } }
-      set {
-        _hasBits0 |= 33554432;
-        dummy26_ = value;
-      }
-    }
-    /// <summary>Gets whether the "dummy26" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasDummy26 {
-      get { return (_hasBits0 & 33554432) != 0; }
-    }
-    /// <summary>Clears the value of the "dummy26" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearDummy26() {
-      _hasBits0 &= ~33554432;
-    }
-
-    /// <summary>Field number for the "dummy27" field.</summary>
-    public const int Dummy27FieldNumber = 27;
-    private readonly static int Dummy27DefaultValue = 0;
-
-    private int dummy27_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int Dummy27 {
-      get { if ((_hasBits0 & 67108864) != 0) { return dummy27_; } else { return Dummy27DefaultValue; } }
-      set {
-        _hasBits0 |= 67108864;
-        dummy27_ = value;
-      }
-    }
-    /// <summary>Gets whether the "dummy27" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasDummy27 {
-      get { return (_hasBits0 & 67108864) != 0; }
-    }
-    /// <summary>Clears the value of the "dummy27" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearDummy27() {
-      _hasBits0 &= ~67108864;
-    }
-
-    /// <summary>Field number for the "dummy28" field.</summary>
-    public const int Dummy28FieldNumber = 28;
-    private readonly static int Dummy28DefaultValue = 0;
-
-    private int dummy28_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int Dummy28 {
-      get { if ((_hasBits0 & 134217728) != 0) { return dummy28_; } else { return Dummy28DefaultValue; } }
-      set {
-        _hasBits0 |= 134217728;
-        dummy28_ = value;
-      }
-    }
-    /// <summary>Gets whether the "dummy28" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasDummy28 {
-      get { return (_hasBits0 & 134217728) != 0; }
-    }
-    /// <summary>Clears the value of the "dummy28" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearDummy28() {
-      _hasBits0 &= ~134217728;
-    }
-
-    /// <summary>Field number for the "dummy29" field.</summary>
-    public const int Dummy29FieldNumber = 29;
-    private readonly static int Dummy29DefaultValue = 0;
-
-    private int dummy29_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int Dummy29 {
-      get { if ((_hasBits0 & 268435456) != 0) { return dummy29_; } else { return Dummy29DefaultValue; } }
-      set {
-        _hasBits0 |= 268435456;
-        dummy29_ = value;
-      }
-    }
-    /// <summary>Gets whether the "dummy29" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasDummy29 {
-      get { return (_hasBits0 & 268435456) != 0; }
-    }
-    /// <summary>Clears the value of the "dummy29" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearDummy29() {
-      _hasBits0 &= ~268435456;
-    }
-
-    /// <summary>Field number for the "dummy30" field.</summary>
-    public const int Dummy30FieldNumber = 30;
-    private readonly static int Dummy30DefaultValue = 0;
-
-    private int dummy30_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int Dummy30 {
-      get { if ((_hasBits0 & 536870912) != 0) { return dummy30_; } else { return Dummy30DefaultValue; } }
-      set {
-        _hasBits0 |= 536870912;
-        dummy30_ = value;
-      }
-    }
-    /// <summary>Gets whether the "dummy30" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasDummy30 {
-      get { return (_hasBits0 & 536870912) != 0; }
-    }
-    /// <summary>Clears the value of the "dummy30" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearDummy30() {
-      _hasBits0 &= ~536870912;
-    }
-
-    /// <summary>Field number for the "dummy31" field.</summary>
-    public const int Dummy31FieldNumber = 31;
-    private readonly static int Dummy31DefaultValue = 0;
-
-    private int dummy31_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int Dummy31 {
-      get { if ((_hasBits0 & 1073741824) != 0) { return dummy31_; } else { return Dummy31DefaultValue; } }
-      set {
-        _hasBits0 |= 1073741824;
-        dummy31_ = value;
-      }
-    }
-    /// <summary>Gets whether the "dummy31" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasDummy31 {
-      get { return (_hasBits0 & 1073741824) != 0; }
-    }
-    /// <summary>Clears the value of the "dummy31" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearDummy31() {
-      _hasBits0 &= ~1073741824;
-    }
-
-    /// <summary>Field number for the "dummy32" field.</summary>
-    public const int Dummy32FieldNumber = 32;
-    private readonly static int Dummy32DefaultValue = 0;
-
-    private int dummy32_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int Dummy32 {
-      get { if ((_hasBits0 & -2147483648) != 0) { return dummy32_; } else { return Dummy32DefaultValue; } }
-      set {
-        _hasBits0 |= -2147483648;
-        dummy32_ = value;
-      }
-    }
-    /// <summary>Gets whether the "dummy32" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasDummy32 {
-      get { return (_hasBits0 & -2147483648) != 0; }
-    }
-    /// <summary>Clears the value of the "dummy32" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearDummy32() {
-      _hasBits0 &= ~-2147483648;
-    }
-
-    /// <summary>Field number for the "c" field.</summary>
-    public const int CFieldNumber = 33;
-    private readonly static int CDefaultValue = 0;
-
-    private int c_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int C {
-      get { if ((_hasBits1 & 1) != 0) { return c_; } else { return CDefaultValue; } }
-      set {
-        _hasBits1 |= 1;
-        c_ = value;
-      }
-    }
-    /// <summary>Gets whether the "c" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasC {
-      get { return (_hasBits1 & 1) != 0; }
-    }
-    /// <summary>Clears the value of the "c" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearC() {
-      _hasBits1 &= ~1;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as TestRequired);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(TestRequired other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (A != other.A) return false;
-      if (Dummy2 != other.Dummy2) return false;
-      if (B != other.B) return false;
-      if (Dummy4 != other.Dummy4) return false;
-      if (Dummy5 != other.Dummy5) return false;
-      if (Dummy6 != other.Dummy6) return false;
-      if (Dummy7 != other.Dummy7) return false;
-      if (Dummy8 != other.Dummy8) return false;
-      if (Dummy9 != other.Dummy9) return false;
-      if (Dummy10 != other.Dummy10) return false;
-      if (Dummy11 != other.Dummy11) return false;
-      if (Dummy12 != other.Dummy12) return false;
-      if (Dummy13 != other.Dummy13) return false;
-      if (Dummy14 != other.Dummy14) return false;
-      if (Dummy15 != other.Dummy15) return false;
-      if (Dummy16 != other.Dummy16) return false;
-      if (Dummy17 != other.Dummy17) return false;
-      if (Dummy18 != other.Dummy18) return false;
-      if (Dummy19 != other.Dummy19) return false;
-      if (Dummy20 != other.Dummy20) return false;
-      if (Dummy21 != other.Dummy21) return false;
-      if (Dummy22 != other.Dummy22) return false;
-      if (Dummy23 != other.Dummy23) return false;
-      if (Dummy24 != other.Dummy24) return false;
-      if (Dummy25 != other.Dummy25) return false;
-      if (Dummy26 != other.Dummy26) return false;
-      if (Dummy27 != other.Dummy27) return false;
-      if (Dummy28 != other.Dummy28) return false;
-      if (Dummy29 != other.Dummy29) return false;
-      if (Dummy30 != other.Dummy30) return false;
-      if (Dummy31 != other.Dummy31) return false;
-      if (Dummy32 != other.Dummy32) return false;
-      if (C != other.C) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (HasA) hash ^= A.GetHashCode();
-      if (HasDummy2) hash ^= Dummy2.GetHashCode();
-      if (HasB) hash ^= B.GetHashCode();
-      if (HasDummy4) hash ^= Dummy4.GetHashCode();
-      if (HasDummy5) hash ^= Dummy5.GetHashCode();
-      if (HasDummy6) hash ^= Dummy6.GetHashCode();
-      if (HasDummy7) hash ^= Dummy7.GetHashCode();
-      if (HasDummy8) hash ^= Dummy8.GetHashCode();
-      if (HasDummy9) hash ^= Dummy9.GetHashCode();
-      if (HasDummy10) hash ^= Dummy10.GetHashCode();
-      if (HasDummy11) hash ^= Dummy11.GetHashCode();
-      if (HasDummy12) hash ^= Dummy12.GetHashCode();
-      if (HasDummy13) hash ^= Dummy13.GetHashCode();
-      if (HasDummy14) hash ^= Dummy14.GetHashCode();
-      if (HasDummy15) hash ^= Dummy15.GetHashCode();
-      if (HasDummy16) hash ^= Dummy16.GetHashCode();
-      if (HasDummy17) hash ^= Dummy17.GetHashCode();
-      if (HasDummy18) hash ^= Dummy18.GetHashCode();
-      if (HasDummy19) hash ^= Dummy19.GetHashCode();
-      if (HasDummy20) hash ^= Dummy20.GetHashCode();
-      if (HasDummy21) hash ^= Dummy21.GetHashCode();
-      if (HasDummy22) hash ^= Dummy22.GetHashCode();
-      if (HasDummy23) hash ^= Dummy23.GetHashCode();
-      if (HasDummy24) hash ^= Dummy24.GetHashCode();
-      if (HasDummy25) hash ^= Dummy25.GetHashCode();
-      if (HasDummy26) hash ^= Dummy26.GetHashCode();
-      if (HasDummy27) hash ^= Dummy27.GetHashCode();
-      if (HasDummy28) hash ^= Dummy28.GetHashCode();
-      if (HasDummy29) hash ^= Dummy29.GetHashCode();
-      if (HasDummy30) hash ^= Dummy30.GetHashCode();
-      if (HasDummy31) hash ^= Dummy31.GetHashCode();
-      if (HasDummy32) hash ^= Dummy32.GetHashCode();
-      if (HasC) hash ^= C.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (HasA) {
-        output.WriteRawTag(8);
-        output.WriteInt32(A);
-      }
-      if (HasDummy2) {
-        output.WriteRawTag(16);
-        output.WriteInt32(Dummy2);
-      }
-      if (HasB) {
-        output.WriteRawTag(24);
-        output.WriteInt32(B);
-      }
-      if (HasDummy4) {
-        output.WriteRawTag(32);
-        output.WriteInt32(Dummy4);
-      }
-      if (HasDummy5) {
-        output.WriteRawTag(40);
-        output.WriteInt32(Dummy5);
-      }
-      if (HasDummy6) {
-        output.WriteRawTag(48);
-        output.WriteInt32(Dummy6);
-      }
-      if (HasDummy7) {
-        output.WriteRawTag(56);
-        output.WriteInt32(Dummy7);
-      }
-      if (HasDummy8) {
-        output.WriteRawTag(64);
-        output.WriteInt32(Dummy8);
-      }
-      if (HasDummy9) {
-        output.WriteRawTag(72);
-        output.WriteInt32(Dummy9);
-      }
-      if (HasDummy10) {
-        output.WriteRawTag(80);
-        output.WriteInt32(Dummy10);
-      }
-      if (HasDummy11) {
-        output.WriteRawTag(88);
-        output.WriteInt32(Dummy11);
-      }
-      if (HasDummy12) {
-        output.WriteRawTag(96);
-        output.WriteInt32(Dummy12);
-      }
-      if (HasDummy13) {
-        output.WriteRawTag(104);
-        output.WriteInt32(Dummy13);
-      }
-      if (HasDummy14) {
-        output.WriteRawTag(112);
-        output.WriteInt32(Dummy14);
-      }
-      if (HasDummy15) {
-        output.WriteRawTag(120);
-        output.WriteInt32(Dummy15);
-      }
-      if (HasDummy16) {
-        output.WriteRawTag(128, 1);
-        output.WriteInt32(Dummy16);
-      }
-      if (HasDummy17) {
-        output.WriteRawTag(136, 1);
-        output.WriteInt32(Dummy17);
-      }
-      if (HasDummy18) {
-        output.WriteRawTag(144, 1);
-        output.WriteInt32(Dummy18);
-      }
-      if (HasDummy19) {
-        output.WriteRawTag(152, 1);
-        output.WriteInt32(Dummy19);
-      }
-      if (HasDummy20) {
-        output.WriteRawTag(160, 1);
-        output.WriteInt32(Dummy20);
-      }
-      if (HasDummy21) {
-        output.WriteRawTag(168, 1);
-        output.WriteInt32(Dummy21);
-      }
-      if (HasDummy22) {
-        output.WriteRawTag(176, 1);
-        output.WriteInt32(Dummy22);
-      }
-      if (HasDummy23) {
-        output.WriteRawTag(184, 1);
-        output.WriteInt32(Dummy23);
-      }
-      if (HasDummy24) {
-        output.WriteRawTag(192, 1);
-        output.WriteInt32(Dummy24);
-      }
-      if (HasDummy25) {
-        output.WriteRawTag(200, 1);
-        output.WriteInt32(Dummy25);
-      }
-      if (HasDummy26) {
-        output.WriteRawTag(208, 1);
-        output.WriteInt32(Dummy26);
-      }
-      if (HasDummy27) {
-        output.WriteRawTag(216, 1);
-        output.WriteInt32(Dummy27);
-      }
-      if (HasDummy28) {
-        output.WriteRawTag(224, 1);
-        output.WriteInt32(Dummy28);
-      }
-      if (HasDummy29) {
-        output.WriteRawTag(232, 1);
-        output.WriteInt32(Dummy29);
-      }
-      if (HasDummy30) {
-        output.WriteRawTag(240, 1);
-        output.WriteInt32(Dummy30);
-      }
-      if (HasDummy31) {
-        output.WriteRawTag(248, 1);
-        output.WriteInt32(Dummy31);
-      }
-      if (HasDummy32) {
-        output.WriteRawTag(128, 2);
-        output.WriteInt32(Dummy32);
-      }
-      if (HasC) {
-        output.WriteRawTag(136, 2);
-        output.WriteInt32(C);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (HasA) {
-        output.WriteRawTag(8);
-        output.WriteInt32(A);
-      }
-      if (HasDummy2) {
-        output.WriteRawTag(16);
-        output.WriteInt32(Dummy2);
-      }
-      if (HasB) {
-        output.WriteRawTag(24);
-        output.WriteInt32(B);
-      }
-      if (HasDummy4) {
-        output.WriteRawTag(32);
-        output.WriteInt32(Dummy4);
-      }
-      if (HasDummy5) {
-        output.WriteRawTag(40);
-        output.WriteInt32(Dummy5);
-      }
-      if (HasDummy6) {
-        output.WriteRawTag(48);
-        output.WriteInt32(Dummy6);
-      }
-      if (HasDummy7) {
-        output.WriteRawTag(56);
-        output.WriteInt32(Dummy7);
-      }
-      if (HasDummy8) {
-        output.WriteRawTag(64);
-        output.WriteInt32(Dummy8);
-      }
-      if (HasDummy9) {
-        output.WriteRawTag(72);
-        output.WriteInt32(Dummy9);
-      }
-      if (HasDummy10) {
-        output.WriteRawTag(80);
-        output.WriteInt32(Dummy10);
-      }
-      if (HasDummy11) {
-        output.WriteRawTag(88);
-        output.WriteInt32(Dummy11);
-      }
-      if (HasDummy12) {
-        output.WriteRawTag(96);
-        output.WriteInt32(Dummy12);
-      }
-      if (HasDummy13) {
-        output.WriteRawTag(104);
-        output.WriteInt32(Dummy13);
-      }
-      if (HasDummy14) {
-        output.WriteRawTag(112);
-        output.WriteInt32(Dummy14);
-      }
-      if (HasDummy15) {
-        output.WriteRawTag(120);
-        output.WriteInt32(Dummy15);
-      }
-      if (HasDummy16) {
-        output.WriteRawTag(128, 1);
-        output.WriteInt32(Dummy16);
-      }
-      if (HasDummy17) {
-        output.WriteRawTag(136, 1);
-        output.WriteInt32(Dummy17);
-      }
-      if (HasDummy18) {
-        output.WriteRawTag(144, 1);
-        output.WriteInt32(Dummy18);
-      }
-      if (HasDummy19) {
-        output.WriteRawTag(152, 1);
-        output.WriteInt32(Dummy19);
-      }
-      if (HasDummy20) {
-        output.WriteRawTag(160, 1);
-        output.WriteInt32(Dummy20);
-      }
-      if (HasDummy21) {
-        output.WriteRawTag(168, 1);
-        output.WriteInt32(Dummy21);
-      }
-      if (HasDummy22) {
-        output.WriteRawTag(176, 1);
-        output.WriteInt32(Dummy22);
-      }
-      if (HasDummy23) {
-        output.WriteRawTag(184, 1);
-        output.WriteInt32(Dummy23);
-      }
-      if (HasDummy24) {
-        output.WriteRawTag(192, 1);
-        output.WriteInt32(Dummy24);
-      }
-      if (HasDummy25) {
-        output.WriteRawTag(200, 1);
-        output.WriteInt32(Dummy25);
-      }
-      if (HasDummy26) {
-        output.WriteRawTag(208, 1);
-        output.WriteInt32(Dummy26);
-      }
-      if (HasDummy27) {
-        output.WriteRawTag(216, 1);
-        output.WriteInt32(Dummy27);
-      }
-      if (HasDummy28) {
-        output.WriteRawTag(224, 1);
-        output.WriteInt32(Dummy28);
-      }
-      if (HasDummy29) {
-        output.WriteRawTag(232, 1);
-        output.WriteInt32(Dummy29);
-      }
-      if (HasDummy30) {
-        output.WriteRawTag(240, 1);
-        output.WriteInt32(Dummy30);
-      }
-      if (HasDummy31) {
-        output.WriteRawTag(248, 1);
-        output.WriteInt32(Dummy31);
-      }
-      if (HasDummy32) {
-        output.WriteRawTag(128, 2);
-        output.WriteInt32(Dummy32);
-      }
-      if (HasC) {
-        output.WriteRawTag(136, 2);
-        output.WriteInt32(C);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (HasA) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(A);
-      }
-      if (HasDummy2) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(Dummy2);
-      }
-      if (HasB) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(B);
-      }
-      if (HasDummy4) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(Dummy4);
-      }
-      if (HasDummy5) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(Dummy5);
-      }
-      if (HasDummy6) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(Dummy6);
-      }
-      if (HasDummy7) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(Dummy7);
-      }
-      if (HasDummy8) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(Dummy8);
-      }
-      if (HasDummy9) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(Dummy9);
-      }
-      if (HasDummy10) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(Dummy10);
-      }
-      if (HasDummy11) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(Dummy11);
-      }
-      if (HasDummy12) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(Dummy12);
-      }
-      if (HasDummy13) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(Dummy13);
-      }
-      if (HasDummy14) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(Dummy14);
-      }
-      if (HasDummy15) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(Dummy15);
-      }
-      if (HasDummy16) {
-        size += 2 + pb::CodedOutputStream.ComputeInt32Size(Dummy16);
-      }
-      if (HasDummy17) {
-        size += 2 + pb::CodedOutputStream.ComputeInt32Size(Dummy17);
-      }
-      if (HasDummy18) {
-        size += 2 + pb::CodedOutputStream.ComputeInt32Size(Dummy18);
-      }
-      if (HasDummy19) {
-        size += 2 + pb::CodedOutputStream.ComputeInt32Size(Dummy19);
-      }
-      if (HasDummy20) {
-        size += 2 + pb::CodedOutputStream.ComputeInt32Size(Dummy20);
-      }
-      if (HasDummy21) {
-        size += 2 + pb::CodedOutputStream.ComputeInt32Size(Dummy21);
-      }
-      if (HasDummy22) {
-        size += 2 + pb::CodedOutputStream.ComputeInt32Size(Dummy22);
-      }
-      if (HasDummy23) {
-        size += 2 + pb::CodedOutputStream.ComputeInt32Size(Dummy23);
-      }
-      if (HasDummy24) {
-        size += 2 + pb::CodedOutputStream.ComputeInt32Size(Dummy24);
-      }
-      if (HasDummy25) {
-        size += 2 + pb::CodedOutputStream.ComputeInt32Size(Dummy25);
-      }
-      if (HasDummy26) {
-        size += 2 + pb::CodedOutputStream.ComputeInt32Size(Dummy26);
-      }
-      if (HasDummy27) {
-        size += 2 + pb::CodedOutputStream.ComputeInt32Size(Dummy27);
-      }
-      if (HasDummy28) {
-        size += 2 + pb::CodedOutputStream.ComputeInt32Size(Dummy28);
-      }
-      if (HasDummy29) {
-        size += 2 + pb::CodedOutputStream.ComputeInt32Size(Dummy29);
-      }
-      if (HasDummy30) {
-        size += 2 + pb::CodedOutputStream.ComputeInt32Size(Dummy30);
-      }
-      if (HasDummy31) {
-        size += 2 + pb::CodedOutputStream.ComputeInt32Size(Dummy31);
-      }
-      if (HasDummy32) {
-        size += 2 + pb::CodedOutputStream.ComputeInt32Size(Dummy32);
-      }
-      if (HasC) {
-        size += 2 + pb::CodedOutputStream.ComputeInt32Size(C);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(TestRequired other) {
-      if (other == null) {
-        return;
-      }
-      if (other.HasA) {
-        A = other.A;
-      }
-      if (other.HasDummy2) {
-        Dummy2 = other.Dummy2;
-      }
-      if (other.HasB) {
-        B = other.B;
-      }
-      if (other.HasDummy4) {
-        Dummy4 = other.Dummy4;
-      }
-      if (other.HasDummy5) {
-        Dummy5 = other.Dummy5;
-      }
-      if (other.HasDummy6) {
-        Dummy6 = other.Dummy6;
-      }
-      if (other.HasDummy7) {
-        Dummy7 = other.Dummy7;
-      }
-      if (other.HasDummy8) {
-        Dummy8 = other.Dummy8;
-      }
-      if (other.HasDummy9) {
-        Dummy9 = other.Dummy9;
-      }
-      if (other.HasDummy10) {
-        Dummy10 = other.Dummy10;
-      }
-      if (other.HasDummy11) {
-        Dummy11 = other.Dummy11;
-      }
-      if (other.HasDummy12) {
-        Dummy12 = other.Dummy12;
-      }
-      if (other.HasDummy13) {
-        Dummy13 = other.Dummy13;
-      }
-      if (other.HasDummy14) {
-        Dummy14 = other.Dummy14;
-      }
-      if (other.HasDummy15) {
-        Dummy15 = other.Dummy15;
-      }
-      if (other.HasDummy16) {
-        Dummy16 = other.Dummy16;
-      }
-      if (other.HasDummy17) {
-        Dummy17 = other.Dummy17;
-      }
-      if (other.HasDummy18) {
-        Dummy18 = other.Dummy18;
-      }
-      if (other.HasDummy19) {
-        Dummy19 = other.Dummy19;
-      }
-      if (other.HasDummy20) {
-        Dummy20 = other.Dummy20;
-      }
-      if (other.HasDummy21) {
-        Dummy21 = other.Dummy21;
-      }
-      if (other.HasDummy22) {
-        Dummy22 = other.Dummy22;
-      }
-      if (other.HasDummy23) {
-        Dummy23 = other.Dummy23;
-      }
-      if (other.HasDummy24) {
-        Dummy24 = other.Dummy24;
-      }
-      if (other.HasDummy25) {
-        Dummy25 = other.Dummy25;
-      }
-      if (other.HasDummy26) {
-        Dummy26 = other.Dummy26;
-      }
-      if (other.HasDummy27) {
-        Dummy27 = other.Dummy27;
-      }
-      if (other.HasDummy28) {
-        Dummy28 = other.Dummy28;
-      }
-      if (other.HasDummy29) {
-        Dummy29 = other.Dummy29;
-      }
-      if (other.HasDummy30) {
-        Dummy30 = other.Dummy30;
-      }
-      if (other.HasDummy31) {
-        Dummy31 = other.Dummy31;
-      }
-      if (other.HasDummy32) {
-        Dummy32 = other.Dummy32;
-      }
-      if (other.HasC) {
-        C = other.C;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 8: {
-            A = input.ReadInt32();
-            break;
-          }
-          case 16: {
-            Dummy2 = input.ReadInt32();
-            break;
-          }
-          case 24: {
-            B = input.ReadInt32();
-            break;
-          }
-          case 32: {
-            Dummy4 = input.ReadInt32();
-            break;
-          }
-          case 40: {
-            Dummy5 = input.ReadInt32();
-            break;
-          }
-          case 48: {
-            Dummy6 = input.ReadInt32();
-            break;
-          }
-          case 56: {
-            Dummy7 = input.ReadInt32();
-            break;
-          }
-          case 64: {
-            Dummy8 = input.ReadInt32();
-            break;
-          }
-          case 72: {
-            Dummy9 = input.ReadInt32();
-            break;
-          }
-          case 80: {
-            Dummy10 = input.ReadInt32();
-            break;
-          }
-          case 88: {
-            Dummy11 = input.ReadInt32();
-            break;
-          }
-          case 96: {
-            Dummy12 = input.ReadInt32();
-            break;
-          }
-          case 104: {
-            Dummy13 = input.ReadInt32();
-            break;
-          }
-          case 112: {
-            Dummy14 = input.ReadInt32();
-            break;
-          }
-          case 120: {
-            Dummy15 = input.ReadInt32();
-            break;
-          }
-          case 128: {
-            Dummy16 = input.ReadInt32();
-            break;
-          }
-          case 136: {
-            Dummy17 = input.ReadInt32();
-            break;
-          }
-          case 144: {
-            Dummy18 = input.ReadInt32();
-            break;
-          }
-          case 152: {
-            Dummy19 = input.ReadInt32();
-            break;
-          }
-          case 160: {
-            Dummy20 = input.ReadInt32();
-            break;
-          }
-          case 168: {
-            Dummy21 = input.ReadInt32();
-            break;
-          }
-          case 176: {
-            Dummy22 = input.ReadInt32();
-            break;
-          }
-          case 184: {
-            Dummy23 = input.ReadInt32();
-            break;
-          }
-          case 192: {
-            Dummy24 = input.ReadInt32();
-            break;
-          }
-          case 200: {
-            Dummy25 = input.ReadInt32();
-            break;
-          }
-          case 208: {
-            Dummy26 = input.ReadInt32();
-            break;
-          }
-          case 216: {
-            Dummy27 = input.ReadInt32();
-            break;
-          }
-          case 224: {
-            Dummy28 = input.ReadInt32();
-            break;
-          }
-          case 232: {
-            Dummy29 = input.ReadInt32();
-            break;
-          }
-          case 240: {
-            Dummy30 = input.ReadInt32();
-            break;
-          }
-          case 248: {
-            Dummy31 = input.ReadInt32();
-            break;
-          }
-          case 256: {
-            Dummy32 = input.ReadInt32();
-            break;
-          }
-          case 264: {
-            C = input.ReadInt32();
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 8: {
-            A = input.ReadInt32();
-            break;
-          }
-          case 16: {
-            Dummy2 = input.ReadInt32();
-            break;
-          }
-          case 24: {
-            B = input.ReadInt32();
-            break;
-          }
-          case 32: {
-            Dummy4 = input.ReadInt32();
-            break;
-          }
-          case 40: {
-            Dummy5 = input.ReadInt32();
-            break;
-          }
-          case 48: {
-            Dummy6 = input.ReadInt32();
-            break;
-          }
-          case 56: {
-            Dummy7 = input.ReadInt32();
-            break;
-          }
-          case 64: {
-            Dummy8 = input.ReadInt32();
-            break;
-          }
-          case 72: {
-            Dummy9 = input.ReadInt32();
-            break;
-          }
-          case 80: {
-            Dummy10 = input.ReadInt32();
-            break;
-          }
-          case 88: {
-            Dummy11 = input.ReadInt32();
-            break;
-          }
-          case 96: {
-            Dummy12 = input.ReadInt32();
-            break;
-          }
-          case 104: {
-            Dummy13 = input.ReadInt32();
-            break;
-          }
-          case 112: {
-            Dummy14 = input.ReadInt32();
-            break;
-          }
-          case 120: {
-            Dummy15 = input.ReadInt32();
-            break;
-          }
-          case 128: {
-            Dummy16 = input.ReadInt32();
-            break;
-          }
-          case 136: {
-            Dummy17 = input.ReadInt32();
-            break;
-          }
-          case 144: {
-            Dummy18 = input.ReadInt32();
-            break;
-          }
-          case 152: {
-            Dummy19 = input.ReadInt32();
-            break;
-          }
-          case 160: {
-            Dummy20 = input.ReadInt32();
-            break;
-          }
-          case 168: {
-            Dummy21 = input.ReadInt32();
-            break;
-          }
-          case 176: {
-            Dummy22 = input.ReadInt32();
-            break;
-          }
-          case 184: {
-            Dummy23 = input.ReadInt32();
-            break;
-          }
-          case 192: {
-            Dummy24 = input.ReadInt32();
-            break;
-          }
-          case 200: {
-            Dummy25 = input.ReadInt32();
-            break;
-          }
-          case 208: {
-            Dummy26 = input.ReadInt32();
-            break;
-          }
-          case 216: {
-            Dummy27 = input.ReadInt32();
-            break;
-          }
-          case 224: {
-            Dummy28 = input.ReadInt32();
-            break;
-          }
-          case 232: {
-            Dummy29 = input.ReadInt32();
-            break;
-          }
-          case 240: {
-            Dummy30 = input.ReadInt32();
-            break;
-          }
-          case 248: {
-            Dummy31 = input.ReadInt32();
-            break;
-          }
-          case 256: {
-            Dummy32 = input.ReadInt32();
-            break;
-          }
-          case 264: {
-            C = input.ReadInt32();
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-    #region Extensions
-    /// <summary>Container for extensions for other messages declared in the TestRequired message type.</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static partial class Extensions {
-      public static readonly pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, global::Google.Protobuf.TestProtos.Proto2.TestRequired> Single =
-        new pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, global::Google.Protobuf.TestProtos.Proto2.TestRequired>(1000, pb::FieldCodec.ForMessage(8002, global::Google.Protobuf.TestProtos.Proto2.TestRequired.Parser));
-      public static readonly pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, global::Google.Protobuf.TestProtos.Proto2.TestRequired> Multi =
-        new pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestAllExtensions, global::Google.Protobuf.TestProtos.Proto2.TestRequired>(1001, pb::FieldCodec.ForMessage(8010, global::Google.Protobuf.TestProtos.Proto2.TestRequired.Parser));
-    }
-    #endregion
-
-  }
-
-  public sealed partial class TestRequiredForeign : pb::IMessage<TestRequiredForeign>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<TestRequiredForeign> _parser = new pb::MessageParser<TestRequiredForeign>(() => new TestRequiredForeign());
-    private pb::UnknownFieldSet _unknownFields;
-    private int _hasBits0;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<TestRequiredForeign> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.Proto2.UnittestReflection.Descriptor.MessageTypes[13]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestRequiredForeign() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestRequiredForeign(TestRequiredForeign other) : this() {
-      _hasBits0 = other._hasBits0;
-      optionalMessage_ = other.optionalMessage_ != null ? other.optionalMessage_.Clone() : null;
-      repeatedMessage_ = other.repeatedMessage_.Clone();
-      dummy_ = other.dummy_;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestRequiredForeign Clone() {
-      return new TestRequiredForeign(this);
-    }
-
-    /// <summary>Field number for the "optional_message" field.</summary>
-    public const int OptionalMessageFieldNumber = 1;
-    private global::Google.Protobuf.TestProtos.Proto2.TestRequired optionalMessage_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.TestProtos.Proto2.TestRequired OptionalMessage {
-      get { return optionalMessage_; }
-      set {
-        optionalMessage_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "repeated_message" field.</summary>
-    public const int RepeatedMessageFieldNumber = 2;
-    private static readonly pb::FieldCodec<global::Google.Protobuf.TestProtos.Proto2.TestRequired> _repeated_repeatedMessage_codec
-        = pb::FieldCodec.ForMessage(18, global::Google.Protobuf.TestProtos.Proto2.TestRequired.Parser);
-    private readonly pbc::RepeatedField<global::Google.Protobuf.TestProtos.Proto2.TestRequired> repeatedMessage_ = new pbc::RepeatedField<global::Google.Protobuf.TestProtos.Proto2.TestRequired>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Google.Protobuf.TestProtos.Proto2.TestRequired> RepeatedMessage {
-      get { return repeatedMessage_; }
-    }
-
-    /// <summary>Field number for the "dummy" field.</summary>
-    public const int DummyFieldNumber = 3;
-    private readonly static int DummyDefaultValue = 0;
-
-    private int dummy_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int Dummy {
-      get { if ((_hasBits0 & 1) != 0) { return dummy_; } else { return DummyDefaultValue; } }
-      set {
-        _hasBits0 |= 1;
-        dummy_ = value;
-      }
-    }
-    /// <summary>Gets whether the "dummy" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasDummy {
-      get { return (_hasBits0 & 1) != 0; }
-    }
-    /// <summary>Clears the value of the "dummy" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearDummy() {
-      _hasBits0 &= ~1;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as TestRequiredForeign);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(TestRequiredForeign other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (!object.Equals(OptionalMessage, other.OptionalMessage)) return false;
-      if(!repeatedMessage_.Equals(other.repeatedMessage_)) return false;
-      if (Dummy != other.Dummy) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (optionalMessage_ != null) hash ^= OptionalMessage.GetHashCode();
-      hash ^= repeatedMessage_.GetHashCode();
-      if (HasDummy) hash ^= Dummy.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (optionalMessage_ != null) {
-        output.WriteRawTag(10);
-        output.WriteMessage(OptionalMessage);
-      }
-      repeatedMessage_.WriteTo(output, _repeated_repeatedMessage_codec);
-      if (HasDummy) {
-        output.WriteRawTag(24);
-        output.WriteInt32(Dummy);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (optionalMessage_ != null) {
-        output.WriteRawTag(10);
-        output.WriteMessage(OptionalMessage);
-      }
-      repeatedMessage_.WriteTo(ref output, _repeated_repeatedMessage_codec);
-      if (HasDummy) {
-        output.WriteRawTag(24);
-        output.WriteInt32(Dummy);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (optionalMessage_ != null) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(OptionalMessage);
-      }
-      size += repeatedMessage_.CalculateSize(_repeated_repeatedMessage_codec);
-      if (HasDummy) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(Dummy);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(TestRequiredForeign other) {
-      if (other == null) {
-        return;
-      }
-      if (other.optionalMessage_ != null) {
-        if (optionalMessage_ == null) {
-          OptionalMessage = new global::Google.Protobuf.TestProtos.Proto2.TestRequired();
-        }
-        OptionalMessage.MergeFrom(other.OptionalMessage);
-      }
-      repeatedMessage_.Add(other.repeatedMessage_);
-      if (other.HasDummy) {
-        Dummy = other.Dummy;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 10: {
-            if (optionalMessage_ == null) {
-              OptionalMessage = new global::Google.Protobuf.TestProtos.Proto2.TestRequired();
-            }
-            input.ReadMessage(OptionalMessage);
-            break;
-          }
-          case 18: {
-            repeatedMessage_.AddEntriesFrom(input, _repeated_repeatedMessage_codec);
-            break;
-          }
-          case 24: {
-            Dummy = input.ReadInt32();
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 10: {
-            if (optionalMessage_ == null) {
-              OptionalMessage = new global::Google.Protobuf.TestProtos.Proto2.TestRequired();
-            }
-            input.ReadMessage(OptionalMessage);
-            break;
-          }
-          case 18: {
-            repeatedMessage_.AddEntriesFrom(ref input, _repeated_repeatedMessage_codec);
-            break;
-          }
-          case 24: {
-            Dummy = input.ReadInt32();
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  public sealed partial class TestRequiredMessage : pb::IMessage<TestRequiredMessage>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<TestRequiredMessage> _parser = new pb::MessageParser<TestRequiredMessage>(() => new TestRequiredMessage());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<TestRequiredMessage> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.Proto2.UnittestReflection.Descriptor.MessageTypes[14]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestRequiredMessage() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestRequiredMessage(TestRequiredMessage other) : this() {
-      optionalMessage_ = other.optionalMessage_ != null ? other.optionalMessage_.Clone() : null;
-      repeatedMessage_ = other.repeatedMessage_.Clone();
-      requiredMessage_ = other.requiredMessage_ != null ? other.requiredMessage_.Clone() : null;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestRequiredMessage Clone() {
-      return new TestRequiredMessage(this);
-    }
-
-    /// <summary>Field number for the "optional_message" field.</summary>
-    public const int OptionalMessageFieldNumber = 1;
-    private global::Google.Protobuf.TestProtos.Proto2.TestRequired optionalMessage_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.TestProtos.Proto2.TestRequired OptionalMessage {
-      get { return optionalMessage_; }
-      set {
-        optionalMessage_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "repeated_message" field.</summary>
-    public const int RepeatedMessageFieldNumber = 2;
-    private static readonly pb::FieldCodec<global::Google.Protobuf.TestProtos.Proto2.TestRequired> _repeated_repeatedMessage_codec
-        = pb::FieldCodec.ForMessage(18, global::Google.Protobuf.TestProtos.Proto2.TestRequired.Parser);
-    private readonly pbc::RepeatedField<global::Google.Protobuf.TestProtos.Proto2.TestRequired> repeatedMessage_ = new pbc::RepeatedField<global::Google.Protobuf.TestProtos.Proto2.TestRequired>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Google.Protobuf.TestProtos.Proto2.TestRequired> RepeatedMessage {
-      get { return repeatedMessage_; }
-    }
-
-    /// <summary>Field number for the "required_message" field.</summary>
-    public const int RequiredMessageFieldNumber = 3;
-    private global::Google.Protobuf.TestProtos.Proto2.TestRequired requiredMessage_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.TestProtos.Proto2.TestRequired RequiredMessage {
-      get { return requiredMessage_; }
-      set {
-        requiredMessage_ = value;
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as TestRequiredMessage);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(TestRequiredMessage other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (!object.Equals(OptionalMessage, other.OptionalMessage)) return false;
-      if(!repeatedMessage_.Equals(other.repeatedMessage_)) return false;
-      if (!object.Equals(RequiredMessage, other.RequiredMessage)) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (optionalMessage_ != null) hash ^= OptionalMessage.GetHashCode();
-      hash ^= repeatedMessage_.GetHashCode();
-      if (requiredMessage_ != null) hash ^= RequiredMessage.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (optionalMessage_ != null) {
-        output.WriteRawTag(10);
-        output.WriteMessage(OptionalMessage);
-      }
-      repeatedMessage_.WriteTo(output, _repeated_repeatedMessage_codec);
-      if (requiredMessage_ != null) {
-        output.WriteRawTag(26);
-        output.WriteMessage(RequiredMessage);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (optionalMessage_ != null) {
-        output.WriteRawTag(10);
-        output.WriteMessage(OptionalMessage);
-      }
-      repeatedMessage_.WriteTo(ref output, _repeated_repeatedMessage_codec);
-      if (requiredMessage_ != null) {
-        output.WriteRawTag(26);
-        output.WriteMessage(RequiredMessage);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (optionalMessage_ != null) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(OptionalMessage);
-      }
-      size += repeatedMessage_.CalculateSize(_repeated_repeatedMessage_codec);
-      if (requiredMessage_ != null) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(RequiredMessage);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(TestRequiredMessage other) {
-      if (other == null) {
-        return;
-      }
-      if (other.optionalMessage_ != null) {
-        if (optionalMessage_ == null) {
-          OptionalMessage = new global::Google.Protobuf.TestProtos.Proto2.TestRequired();
-        }
-        OptionalMessage.MergeFrom(other.OptionalMessage);
-      }
-      repeatedMessage_.Add(other.repeatedMessage_);
-      if (other.requiredMessage_ != null) {
-        if (requiredMessage_ == null) {
-          RequiredMessage = new global::Google.Protobuf.TestProtos.Proto2.TestRequired();
-        }
-        RequiredMessage.MergeFrom(other.RequiredMessage);
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 10: {
-            if (optionalMessage_ == null) {
-              OptionalMessage = new global::Google.Protobuf.TestProtos.Proto2.TestRequired();
-            }
-            input.ReadMessage(OptionalMessage);
-            break;
-          }
-          case 18: {
-            repeatedMessage_.AddEntriesFrom(input, _repeated_repeatedMessage_codec);
-            break;
-          }
-          case 26: {
-            if (requiredMessage_ == null) {
-              RequiredMessage = new global::Google.Protobuf.TestProtos.Proto2.TestRequired();
-            }
-            input.ReadMessage(RequiredMessage);
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 10: {
-            if (optionalMessage_ == null) {
-              OptionalMessage = new global::Google.Protobuf.TestProtos.Proto2.TestRequired();
-            }
-            input.ReadMessage(OptionalMessage);
-            break;
-          }
-          case 18: {
-            repeatedMessage_.AddEntriesFrom(ref input, _repeated_repeatedMessage_codec);
-            break;
-          }
-          case 26: {
-            if (requiredMessage_ == null) {
-              RequiredMessage = new global::Google.Protobuf.TestProtos.Proto2.TestRequired();
-            }
-            input.ReadMessage(RequiredMessage);
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  /// <summary>
-  /// Test that we can use NestedMessage from outside TestAllTypes.
-  /// </summary>
-  public sealed partial class TestForeignNested : pb::IMessage<TestForeignNested>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<TestForeignNested> _parser = new pb::MessageParser<TestForeignNested>(() => new TestForeignNested());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<TestForeignNested> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.Proto2.UnittestReflection.Descriptor.MessageTypes[15]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestForeignNested() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestForeignNested(TestForeignNested other) : this() {
-      foreignNested_ = other.foreignNested_ != null ? other.foreignNested_.Clone() : null;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestForeignNested Clone() {
-      return new TestForeignNested(this);
-    }
-
-    /// <summary>Field number for the "foreign_nested" field.</summary>
-    public const int ForeignNestedFieldNumber = 1;
-    private global::Google.Protobuf.TestProtos.Proto2.TestAllTypes.Types.NestedMessage foreignNested_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.TestProtos.Proto2.TestAllTypes.Types.NestedMessage ForeignNested {
-      get { return foreignNested_; }
-      set {
-        foreignNested_ = value;
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as TestForeignNested);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(TestForeignNested other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (!object.Equals(ForeignNested, other.ForeignNested)) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (foreignNested_ != null) hash ^= ForeignNested.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (foreignNested_ != null) {
-        output.WriteRawTag(10);
-        output.WriteMessage(ForeignNested);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (foreignNested_ != null) {
-        output.WriteRawTag(10);
-        output.WriteMessage(ForeignNested);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (foreignNested_ != null) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(ForeignNested);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(TestForeignNested other) {
-      if (other == null) {
-        return;
-      }
-      if (other.foreignNested_ != null) {
-        if (foreignNested_ == null) {
-          ForeignNested = new global::Google.Protobuf.TestProtos.Proto2.TestAllTypes.Types.NestedMessage();
-        }
-        ForeignNested.MergeFrom(other.ForeignNested);
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 10: {
-            if (foreignNested_ == null) {
-              ForeignNested = new global::Google.Protobuf.TestProtos.Proto2.TestAllTypes.Types.NestedMessage();
-            }
-            input.ReadMessage(ForeignNested);
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 10: {
-            if (foreignNested_ == null) {
-              ForeignNested = new global::Google.Protobuf.TestProtos.Proto2.TestAllTypes.Types.NestedMessage();
-            }
-            input.ReadMessage(ForeignNested);
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  /// <summary>
-  /// TestEmptyMessage is used to test unknown field support.
-  /// </summary>
-  public sealed partial class TestEmptyMessage : pb::IMessage<TestEmptyMessage>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<TestEmptyMessage> _parser = new pb::MessageParser<TestEmptyMessage>(() => new TestEmptyMessage());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<TestEmptyMessage> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.Proto2.UnittestReflection.Descriptor.MessageTypes[16]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestEmptyMessage() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestEmptyMessage(TestEmptyMessage other) : this() {
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestEmptyMessage Clone() {
-      return new TestEmptyMessage(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as TestEmptyMessage);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(TestEmptyMessage other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(TestEmptyMessage other) {
-      if (other == null) {
-        return;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-        }
-      }
-    }
-    #endif
-
-  }
-
-  /// <summary>
-  /// Like above, but declare all field numbers as potential extensions.  No
-  /// actual extensions should ever be defined for this type.
-  /// </summary>
-  public sealed partial class TestEmptyMessageWithExtensions : pb::IExtendableMessage<TestEmptyMessageWithExtensions>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<TestEmptyMessageWithExtensions> _parser = new pb::MessageParser<TestEmptyMessageWithExtensions>(() => new TestEmptyMessageWithExtensions());
-    private pb::UnknownFieldSet _unknownFields;
-    private pb::ExtensionSet<TestEmptyMessageWithExtensions> _extensions;
-    private pb::ExtensionSet<TestEmptyMessageWithExtensions> _Extensions { get { return _extensions; } }
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<TestEmptyMessageWithExtensions> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.Proto2.UnittestReflection.Descriptor.MessageTypes[17]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestEmptyMessageWithExtensions() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestEmptyMessageWithExtensions(TestEmptyMessageWithExtensions other) : this() {
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-      _extensions = pb::ExtensionSet.Clone(other._extensions);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestEmptyMessageWithExtensions Clone() {
-      return new TestEmptyMessageWithExtensions(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as TestEmptyMessageWithExtensions);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(TestEmptyMessageWithExtensions other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (!Equals(_extensions, other._extensions)) {
-        return false;
-      }
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (_extensions != null) {
-        hash ^= _extensions.GetHashCode();
-      }
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (_extensions != null) {
-        _extensions.WriteTo(output);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (_extensions != null) {
-        _extensions.WriteTo(ref output);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (_extensions != null) {
-        size += _extensions.CalculateSize();
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(TestEmptyMessageWithExtensions other) {
-      if (other == null) {
-        return;
-      }
-      pb::ExtensionSet.MergeFrom(ref _extensions, other._extensions);
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            if (!pb::ExtensionSet.TryMergeFieldFrom(ref _extensions, input)) {
-              _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            }
-            break;
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            if (!pb::ExtensionSet.TryMergeFieldFrom(ref _extensions, ref input)) {
-              _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            }
-            break;
-        }
-      }
-    }
-    #endif
-
-    public TValue GetExtension<TValue>(pb::Extension<TestEmptyMessageWithExtensions, TValue> extension) {
-      return pb::ExtensionSet.Get(ref _extensions, extension);
-    }
-    public pbc::RepeatedField<TValue> GetExtension<TValue>(pb::RepeatedExtension<TestEmptyMessageWithExtensions, TValue> extension) {
-      return pb::ExtensionSet.Get(ref _extensions, extension);
-    }
-    public pbc::RepeatedField<TValue> GetOrInitializeExtension<TValue>(pb::RepeatedExtension<TestEmptyMessageWithExtensions, TValue> extension) {
-      return pb::ExtensionSet.GetOrInitialize(ref _extensions, extension);
-    }
-    public void SetExtension<TValue>(pb::Extension<TestEmptyMessageWithExtensions, TValue> extension, TValue value) {
-      pb::ExtensionSet.Set(ref _extensions, extension, value);
-    }
-    public bool HasExtension<TValue>(pb::Extension<TestEmptyMessageWithExtensions, TValue> extension) {
-      return pb::ExtensionSet.Has(ref _extensions, extension);
-    }
-    public void ClearExtension<TValue>(pb::Extension<TestEmptyMessageWithExtensions, TValue> extension) {
-      pb::ExtensionSet.Clear(ref _extensions, extension);
-    }
-    public void ClearExtension<TValue>(pb::RepeatedExtension<TestEmptyMessageWithExtensions, TValue> extension) {
-      pb::ExtensionSet.Clear(ref _extensions, extension);
-    }
-
-  }
-
-  public sealed partial class TestMultipleExtensionRanges : pb::IExtendableMessage<TestMultipleExtensionRanges>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<TestMultipleExtensionRanges> _parser = new pb::MessageParser<TestMultipleExtensionRanges>(() => new TestMultipleExtensionRanges());
-    private pb::UnknownFieldSet _unknownFields;
-    private pb::ExtensionSet<TestMultipleExtensionRanges> _extensions;
-    private pb::ExtensionSet<TestMultipleExtensionRanges> _Extensions { get { return _extensions; } }
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<TestMultipleExtensionRanges> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.Proto2.UnittestReflection.Descriptor.MessageTypes[18]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestMultipleExtensionRanges() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestMultipleExtensionRanges(TestMultipleExtensionRanges other) : this() {
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-      _extensions = pb::ExtensionSet.Clone(other._extensions);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestMultipleExtensionRanges Clone() {
-      return new TestMultipleExtensionRanges(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as TestMultipleExtensionRanges);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(TestMultipleExtensionRanges other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (!Equals(_extensions, other._extensions)) {
-        return false;
-      }
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (_extensions != null) {
-        hash ^= _extensions.GetHashCode();
-      }
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (_extensions != null) {
-        _extensions.WriteTo(output);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (_extensions != null) {
-        _extensions.WriteTo(ref output);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (_extensions != null) {
-        size += _extensions.CalculateSize();
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(TestMultipleExtensionRanges other) {
-      if (other == null) {
-        return;
-      }
-      pb::ExtensionSet.MergeFrom(ref _extensions, other._extensions);
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            if (!pb::ExtensionSet.TryMergeFieldFrom(ref _extensions, input)) {
-              _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            }
-            break;
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            if (!pb::ExtensionSet.TryMergeFieldFrom(ref _extensions, ref input)) {
-              _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            }
-            break;
-        }
-      }
-    }
-    #endif
-
-    public TValue GetExtension<TValue>(pb::Extension<TestMultipleExtensionRanges, TValue> extension) {
-      return pb::ExtensionSet.Get(ref _extensions, extension);
-    }
-    public pbc::RepeatedField<TValue> GetExtension<TValue>(pb::RepeatedExtension<TestMultipleExtensionRanges, TValue> extension) {
-      return pb::ExtensionSet.Get(ref _extensions, extension);
-    }
-    public pbc::RepeatedField<TValue> GetOrInitializeExtension<TValue>(pb::RepeatedExtension<TestMultipleExtensionRanges, TValue> extension) {
-      return pb::ExtensionSet.GetOrInitialize(ref _extensions, extension);
-    }
-    public void SetExtension<TValue>(pb::Extension<TestMultipleExtensionRanges, TValue> extension, TValue value) {
-      pb::ExtensionSet.Set(ref _extensions, extension, value);
-    }
-    public bool HasExtension<TValue>(pb::Extension<TestMultipleExtensionRanges, TValue> extension) {
-      return pb::ExtensionSet.Has(ref _extensions, extension);
-    }
-    public void ClearExtension<TValue>(pb::Extension<TestMultipleExtensionRanges, TValue> extension) {
-      pb::ExtensionSet.Clear(ref _extensions, extension);
-    }
-    public void ClearExtension<TValue>(pb::RepeatedExtension<TestMultipleExtensionRanges, TValue> extension) {
-      pb::ExtensionSet.Clear(ref _extensions, extension);
-    }
-
-  }
-
-  /// <summary>
-  /// Test that really large tag numbers don't break anything.
-  /// </summary>
-  public sealed partial class TestReallyLargeTagNumber : pb::IMessage<TestReallyLargeTagNumber>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<TestReallyLargeTagNumber> _parser = new pb::MessageParser<TestReallyLargeTagNumber>(() => new TestReallyLargeTagNumber());
-    private pb::UnknownFieldSet _unknownFields;
-    private int _hasBits0;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<TestReallyLargeTagNumber> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.Proto2.UnittestReflection.Descriptor.MessageTypes[19]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestReallyLargeTagNumber() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestReallyLargeTagNumber(TestReallyLargeTagNumber other) : this() {
-      _hasBits0 = other._hasBits0;
-      a_ = other.a_;
-      bb_ = other.bb_;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestReallyLargeTagNumber Clone() {
-      return new TestReallyLargeTagNumber(this);
-    }
-
-    /// <summary>Field number for the "a" field.</summary>
-    public const int AFieldNumber = 1;
-    private readonly static int ADefaultValue = 0;
-
-    private int a_;
-    /// <summary>
-    /// The largest possible tag number is 2^28 - 1, since the wire format uses
-    /// three bits to communicate wire type.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int A {
-      get { if ((_hasBits0 & 1) != 0) { return a_; } else { return ADefaultValue; } }
-      set {
-        _hasBits0 |= 1;
-        a_ = value;
-      }
-    }
-    /// <summary>Gets whether the "a" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasA {
-      get { return (_hasBits0 & 1) != 0; }
-    }
-    /// <summary>Clears the value of the "a" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearA() {
-      _hasBits0 &= ~1;
-    }
-
-    /// <summary>Field number for the "bb" field.</summary>
-    public const int BbFieldNumber = 268435455;
-    private readonly static int BbDefaultValue = 0;
-
-    private int bb_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int Bb {
-      get { if ((_hasBits0 & 2) != 0) { return bb_; } else { return BbDefaultValue; } }
-      set {
-        _hasBits0 |= 2;
-        bb_ = value;
-      }
-    }
-    /// <summary>Gets whether the "bb" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasBb {
-      get { return (_hasBits0 & 2) != 0; }
-    }
-    /// <summary>Clears the value of the "bb" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearBb() {
-      _hasBits0 &= ~2;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as TestReallyLargeTagNumber);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(TestReallyLargeTagNumber other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (A != other.A) return false;
-      if (Bb != other.Bb) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (HasA) hash ^= A.GetHashCode();
-      if (HasBb) hash ^= Bb.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (HasA) {
-        output.WriteRawTag(8);
-        output.WriteInt32(A);
-      }
-      if (HasBb) {
-        output.WriteRawTag(248, 255, 255, 255, 7);
-        output.WriteInt32(Bb);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (HasA) {
-        output.WriteRawTag(8);
-        output.WriteInt32(A);
-      }
-      if (HasBb) {
-        output.WriteRawTag(248, 255, 255, 255, 7);
-        output.WriteInt32(Bb);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (HasA) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(A);
-      }
-      if (HasBb) {
-        size += 5 + pb::CodedOutputStream.ComputeInt32Size(Bb);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(TestReallyLargeTagNumber other) {
-      if (other == null) {
-        return;
-      }
-      if (other.HasA) {
-        A = other.A;
-      }
-      if (other.HasBb) {
-        Bb = other.Bb;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 8: {
-            A = input.ReadInt32();
-            break;
-          }
-          case 2147483640: {
-            Bb = input.ReadInt32();
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 8: {
-            A = input.ReadInt32();
-            break;
-          }
-          case 2147483640: {
-            Bb = input.ReadInt32();
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  public sealed partial class TestRecursiveMessage : pb::IMessage<TestRecursiveMessage>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<TestRecursiveMessage> _parser = new pb::MessageParser<TestRecursiveMessage>(() => new TestRecursiveMessage());
-    private pb::UnknownFieldSet _unknownFields;
-    private int _hasBits0;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<TestRecursiveMessage> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.Proto2.UnittestReflection.Descriptor.MessageTypes[20]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestRecursiveMessage() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestRecursiveMessage(TestRecursiveMessage other) : this() {
-      _hasBits0 = other._hasBits0;
-      a_ = other.a_ != null ? other.a_.Clone() : null;
-      i_ = other.i_;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestRecursiveMessage Clone() {
-      return new TestRecursiveMessage(this);
-    }
-
-    /// <summary>Field number for the "a" field.</summary>
-    public const int AFieldNumber = 1;
-    private global::Google.Protobuf.TestProtos.Proto2.TestRecursiveMessage a_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.TestProtos.Proto2.TestRecursiveMessage A {
-      get { return a_; }
-      set {
-        a_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "i" field.</summary>
-    public const int IFieldNumber = 2;
-    private readonly static int IDefaultValue = 0;
-
-    private int i_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int I {
-      get { if ((_hasBits0 & 1) != 0) { return i_; } else { return IDefaultValue; } }
-      set {
-        _hasBits0 |= 1;
-        i_ = value;
-      }
-    }
-    /// <summary>Gets whether the "i" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasI {
-      get { return (_hasBits0 & 1) != 0; }
-    }
-    /// <summary>Clears the value of the "i" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearI() {
-      _hasBits0 &= ~1;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as TestRecursiveMessage);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(TestRecursiveMessage other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (!object.Equals(A, other.A)) return false;
-      if (I != other.I) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (a_ != null) hash ^= A.GetHashCode();
-      if (HasI) hash ^= I.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (a_ != null) {
-        output.WriteRawTag(10);
-        output.WriteMessage(A);
-      }
-      if (HasI) {
-        output.WriteRawTag(16);
-        output.WriteInt32(I);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (a_ != null) {
-        output.WriteRawTag(10);
-        output.WriteMessage(A);
-      }
-      if (HasI) {
-        output.WriteRawTag(16);
-        output.WriteInt32(I);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (a_ != null) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(A);
-      }
-      if (HasI) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(I);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(TestRecursiveMessage other) {
-      if (other == null) {
-        return;
-      }
-      if (other.a_ != null) {
-        if (a_ == null) {
-          A = new global::Google.Protobuf.TestProtos.Proto2.TestRecursiveMessage();
-        }
-        A.MergeFrom(other.A);
-      }
-      if (other.HasI) {
-        I = other.I;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 10: {
-            if (a_ == null) {
-              A = new global::Google.Protobuf.TestProtos.Proto2.TestRecursiveMessage();
-            }
-            input.ReadMessage(A);
-            break;
-          }
-          case 16: {
-            I = input.ReadInt32();
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 10: {
-            if (a_ == null) {
-              A = new global::Google.Protobuf.TestProtos.Proto2.TestRecursiveMessage();
-            }
-            input.ReadMessage(A);
-            break;
-          }
-          case 16: {
-            I = input.ReadInt32();
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  /// <summary>
-  /// Test that mutual recursion works.
-  /// </summary>
-  public sealed partial class TestMutualRecursionA : pb::IMessage<TestMutualRecursionA>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<TestMutualRecursionA> _parser = new pb::MessageParser<TestMutualRecursionA>(() => new TestMutualRecursionA());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<TestMutualRecursionA> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.Proto2.UnittestReflection.Descriptor.MessageTypes[21]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestMutualRecursionA() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestMutualRecursionA(TestMutualRecursionA other) : this() {
-      bb_ = other.bb_ != null ? other.bb_.Clone() : null;
-      subGroup_ = other.HasSubGroup ? other.subGroup_.Clone() : null;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestMutualRecursionA Clone() {
-      return new TestMutualRecursionA(this);
-    }
-
-    /// <summary>Field number for the "bb" field.</summary>
-    public const int BbFieldNumber = 1;
-    private global::Google.Protobuf.TestProtos.Proto2.TestMutualRecursionB bb_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.TestProtos.Proto2.TestMutualRecursionB Bb {
-      get { return bb_; }
-      set {
-        bb_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "subgroup" field.</summary>
-    public const int SubGroupFieldNumber = 2;
-    private global::Google.Protobuf.TestProtos.Proto2.TestMutualRecursionA.Types.SubGroup subGroup_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.TestProtos.Proto2.TestMutualRecursionA.Types.SubGroup SubGroup {
-      get { return subGroup_; }
-      set {
-        subGroup_ = value;
-      }
-    }
-    /// <summary>Gets whether the subgroup field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasSubGroup {
-      get { return subGroup_ != null; }
-    }
-    /// <summary>Clears the value of the subgroup field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearSubGroup() {
-      subGroup_ = null;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as TestMutualRecursionA);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(TestMutualRecursionA other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (!object.Equals(Bb, other.Bb)) return false;
-      if (!object.Equals(SubGroup, other.SubGroup)) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (bb_ != null) hash ^= Bb.GetHashCode();
-      if (HasSubGroup) hash ^= SubGroup.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (bb_ != null) {
-        output.WriteRawTag(10);
-        output.WriteMessage(Bb);
-      }
-      if (HasSubGroup) {
-        output.WriteRawTag(19);
-        output.WriteGroup(SubGroup);
-        output.WriteRawTag(20);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (bb_ != null) {
-        output.WriteRawTag(10);
-        output.WriteMessage(Bb);
-      }
-      if (HasSubGroup) {
-        output.WriteRawTag(19);
-        output.WriteGroup(SubGroup);
-        output.WriteRawTag(20);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (bb_ != null) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(Bb);
-      }
-      if (HasSubGroup) {
-        size += 2 + pb::CodedOutputStream.ComputeGroupSize(SubGroup);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(TestMutualRecursionA other) {
-      if (other == null) {
-        return;
-      }
-      if (other.bb_ != null) {
-        if (bb_ == null) {
-          Bb = new global::Google.Protobuf.TestProtos.Proto2.TestMutualRecursionB();
-        }
-        Bb.MergeFrom(other.Bb);
-      }
-      if (other.HasSubGroup) {
-        if (!HasSubGroup) {
-          SubGroup = new global::Google.Protobuf.TestProtos.Proto2.TestMutualRecursionA.Types.SubGroup();
-        }
-        SubGroup.MergeFrom(other.SubGroup);
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 10: {
-            if (bb_ == null) {
-              Bb = new global::Google.Protobuf.TestProtos.Proto2.TestMutualRecursionB();
-            }
-            input.ReadMessage(Bb);
-            break;
-          }
-          case 19: {
-            if (!HasSubGroup) {
-              SubGroup = new global::Google.Protobuf.TestProtos.Proto2.TestMutualRecursionA.Types.SubGroup();
-            }
-            input.ReadGroup(SubGroup);
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 10: {
-            if (bb_ == null) {
-              Bb = new global::Google.Protobuf.TestProtos.Proto2.TestMutualRecursionB();
-            }
-            input.ReadMessage(Bb);
-            break;
-          }
-          case 19: {
-            if (!HasSubGroup) {
-              SubGroup = new global::Google.Protobuf.TestProtos.Proto2.TestMutualRecursionA.Types.SubGroup();
-            }
-            input.ReadGroup(SubGroup);
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-    #region Nested types
-    /// <summary>Container for nested types declared in the TestMutualRecursionA message type.</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static partial class Types {
-      public sealed partial class SubMessage : pb::IMessage<SubMessage>
-      #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          , pb::IBufferMessage
-      #endif
-      {
-        private static readonly pb::MessageParser<SubMessage> _parser = new pb::MessageParser<SubMessage>(() => new SubMessage());
-        private pb::UnknownFieldSet _unknownFields;
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static pb::MessageParser<SubMessage> Parser { get { return _parser; } }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static pbr::MessageDescriptor Descriptor {
-          get { return global::Google.Protobuf.TestProtos.Proto2.TestMutualRecursionA.Descriptor.NestedTypes[0]; }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        pbr::MessageDescriptor pb::IMessage.Descriptor {
-          get { return Descriptor; }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public SubMessage() {
-          OnConstruction();
-        }
-
-        partial void OnConstruction();
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public SubMessage(SubMessage other) : this() {
-          b_ = other.b_ != null ? other.b_.Clone() : null;
-          _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public SubMessage Clone() {
-          return new SubMessage(this);
-        }
-
-        /// <summary>Field number for the "b" field.</summary>
-        public const int BFieldNumber = 1;
-        private global::Google.Protobuf.TestProtos.Proto2.TestMutualRecursionB b_;
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public global::Google.Protobuf.TestProtos.Proto2.TestMutualRecursionB B {
-          get { return b_; }
-          set {
-            b_ = value;
-          }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override bool Equals(object other) {
-          return Equals(other as SubMessage);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool Equals(SubMessage other) {
-          if (ReferenceEquals(other, null)) {
-            return false;
-          }
-          if (ReferenceEquals(other, this)) {
-            return true;
-          }
-          if (!object.Equals(B, other.B)) return false;
-          return Equals(_unknownFields, other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override int GetHashCode() {
-          int hash = 1;
-          if (b_ != null) hash ^= B.GetHashCode();
-          if (_unknownFields != null) {
-            hash ^= _unknownFields.GetHashCode();
-          }
-          return hash;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override string ToString() {
-          return pb::JsonFormatter.ToDiagnosticString(this);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void WriteTo(pb::CodedOutputStream output) {
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          output.WriteRawMessage(this);
-        #else
-          if (b_ != null) {
-            output.WriteRawTag(10);
-            output.WriteMessage(B);
-          }
-          if (_unknownFields != null) {
-            _unknownFields.WriteTo(output);
-          }
-        #endif
-        }
-
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-          if (b_ != null) {
-            output.WriteRawTag(10);
-            output.WriteMessage(B);
-          }
-          if (_unknownFields != null) {
-            _unknownFields.WriteTo(ref output);
-          }
-        }
-        #endif
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public int CalculateSize() {
-          int size = 0;
-          if (b_ != null) {
-            size += 1 + pb::CodedOutputStream.ComputeMessageSize(B);
-          }
-          if (_unknownFields != null) {
-            size += _unknownFields.CalculateSize();
-          }
-          return size;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(SubMessage other) {
-          if (other == null) {
-            return;
-          }
-          if (other.b_ != null) {
-            if (b_ == null) {
-              B = new global::Google.Protobuf.TestProtos.Proto2.TestMutualRecursionB();
-            }
-            B.MergeFrom(other.B);
-          }
-          _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(pb::CodedInputStream input) {
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          input.ReadRawMessage(this);
-        #else
-          uint tag;
-          while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
-              default:
-                _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-                break;
-              case 10: {
-                if (b_ == null) {
-                  B = new global::Google.Protobuf.TestProtos.Proto2.TestMutualRecursionB();
-                }
-                input.ReadMessage(B);
-                break;
-              }
-            }
-          }
-        #endif
-        }
-
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-          uint tag;
-          while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
-              default:
-                _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-                break;
-              case 10: {
-                if (b_ == null) {
-                  B = new global::Google.Protobuf.TestProtos.Proto2.TestMutualRecursionB();
-                }
-                input.ReadMessage(B);
-                break;
-              }
-            }
-          }
-        }
-        #endif
-
-      }
-
-      public sealed partial class SubGroup : pb::IMessage<SubGroup>
-      #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          , pb::IBufferMessage
-      #endif
-      {
-        private static readonly pb::MessageParser<SubGroup> _parser = new pb::MessageParser<SubGroup>(() => new SubGroup());
-        private pb::UnknownFieldSet _unknownFields;
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static pb::MessageParser<SubGroup> Parser { get { return _parser; } }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static pbr::MessageDescriptor Descriptor {
-          get { return global::Google.Protobuf.TestProtos.Proto2.TestMutualRecursionA.Descriptor.NestedTypes[1]; }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        pbr::MessageDescriptor pb::IMessage.Descriptor {
-          get { return Descriptor; }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public SubGroup() {
-          OnConstruction();
-        }
-
-        partial void OnConstruction();
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public SubGroup(SubGroup other) : this() {
-          subMessage_ = other.subMessage_ != null ? other.subMessage_.Clone() : null;
-          notInThisScc_ = other.notInThisScc_ != null ? other.notInThisScc_.Clone() : null;
-          _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public SubGroup Clone() {
-          return new SubGroup(this);
-        }
-
-        /// <summary>Field number for the "sub_message" field.</summary>
-        public const int SubMessageFieldNumber = 3;
-        private global::Google.Protobuf.TestProtos.Proto2.TestMutualRecursionA.Types.SubMessage subMessage_;
-        /// <summary>
-        /// Needed because of bug in javatest
-        /// </summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public global::Google.Protobuf.TestProtos.Proto2.TestMutualRecursionA.Types.SubMessage SubMessage {
-          get { return subMessage_; }
-          set {
-            subMessage_ = value;
-          }
-        }
-
-        /// <summary>Field number for the "not_in_this_scc" field.</summary>
-        public const int NotInThisSccFieldNumber = 4;
-        private global::Google.Protobuf.TestProtos.Proto2.TestAllTypes notInThisScc_;
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public global::Google.Protobuf.TestProtos.Proto2.TestAllTypes NotInThisScc {
-          get { return notInThisScc_; }
-          set {
-            notInThisScc_ = value;
-          }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override bool Equals(object other) {
-          return Equals(other as SubGroup);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool Equals(SubGroup other) {
-          if (ReferenceEquals(other, null)) {
-            return false;
-          }
-          if (ReferenceEquals(other, this)) {
-            return true;
-          }
-          if (!object.Equals(SubMessage, other.SubMessage)) return false;
-          if (!object.Equals(NotInThisScc, other.NotInThisScc)) return false;
-          return Equals(_unknownFields, other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override int GetHashCode() {
-          int hash = 1;
-          if (subMessage_ != null) hash ^= SubMessage.GetHashCode();
-          if (notInThisScc_ != null) hash ^= NotInThisScc.GetHashCode();
-          if (_unknownFields != null) {
-            hash ^= _unknownFields.GetHashCode();
-          }
-          return hash;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override string ToString() {
-          return pb::JsonFormatter.ToDiagnosticString(this);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void WriteTo(pb::CodedOutputStream output) {
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          output.WriteRawMessage(this);
-        #else
-          if (subMessage_ != null) {
-            output.WriteRawTag(26);
-            output.WriteMessage(SubMessage);
-          }
-          if (notInThisScc_ != null) {
-            output.WriteRawTag(34);
-            output.WriteMessage(NotInThisScc);
-          }
-          if (_unknownFields != null) {
-            _unknownFields.WriteTo(output);
-          }
-        #endif
-        }
-
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-          if (subMessage_ != null) {
-            output.WriteRawTag(26);
-            output.WriteMessage(SubMessage);
-          }
-          if (notInThisScc_ != null) {
-            output.WriteRawTag(34);
-            output.WriteMessage(NotInThisScc);
-          }
-          if (_unknownFields != null) {
-            _unknownFields.WriteTo(ref output);
-          }
-        }
-        #endif
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public int CalculateSize() {
-          int size = 0;
-          if (subMessage_ != null) {
-            size += 1 + pb::CodedOutputStream.ComputeMessageSize(SubMessage);
-          }
-          if (notInThisScc_ != null) {
-            size += 1 + pb::CodedOutputStream.ComputeMessageSize(NotInThisScc);
-          }
-          if (_unknownFields != null) {
-            size += _unknownFields.CalculateSize();
-          }
-          return size;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(SubGroup other) {
-          if (other == null) {
-            return;
-          }
-          if (other.subMessage_ != null) {
-            if (subMessage_ == null) {
-              SubMessage = new global::Google.Protobuf.TestProtos.Proto2.TestMutualRecursionA.Types.SubMessage();
-            }
-            SubMessage.MergeFrom(other.SubMessage);
-          }
-          if (other.notInThisScc_ != null) {
-            if (notInThisScc_ == null) {
-              NotInThisScc = new global::Google.Protobuf.TestProtos.Proto2.TestAllTypes();
-            }
-            NotInThisScc.MergeFrom(other.NotInThisScc);
-          }
-          _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(pb::CodedInputStream input) {
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          input.ReadRawMessage(this);
-        #else
-          uint tag;
-          while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
-              case 20:
-                return;
-              default:
-                _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-                break;
-              case 26: {
-                if (subMessage_ == null) {
-                  SubMessage = new global::Google.Protobuf.TestProtos.Proto2.TestMutualRecursionA.Types.SubMessage();
-                }
-                input.ReadMessage(SubMessage);
-                break;
-              }
-              case 34: {
-                if (notInThisScc_ == null) {
-                  NotInThisScc = new global::Google.Protobuf.TestProtos.Proto2.TestAllTypes();
-                }
-                input.ReadMessage(NotInThisScc);
-                break;
-              }
-            }
-          }
-        #endif
-        }
-
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-          uint tag;
-          while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
-              case 20:
-                return;
-              default:
-                _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-                break;
-              case 26: {
-                if (subMessage_ == null) {
-                  SubMessage = new global::Google.Protobuf.TestProtos.Proto2.TestMutualRecursionA.Types.SubMessage();
-                }
-                input.ReadMessage(SubMessage);
-                break;
-              }
-              case 34: {
-                if (notInThisScc_ == null) {
-                  NotInThisScc = new global::Google.Protobuf.TestProtos.Proto2.TestAllTypes();
-                }
-                input.ReadMessage(NotInThisScc);
-                break;
-              }
-            }
-          }
-        }
-        #endif
-
-      }
-
-    }
-    #endregion
-
-  }
-
-  public sealed partial class TestMutualRecursionB : pb::IMessage<TestMutualRecursionB>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<TestMutualRecursionB> _parser = new pb::MessageParser<TestMutualRecursionB>(() => new TestMutualRecursionB());
-    private pb::UnknownFieldSet _unknownFields;
-    private int _hasBits0;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<TestMutualRecursionB> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.Proto2.UnittestReflection.Descriptor.MessageTypes[22]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestMutualRecursionB() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestMutualRecursionB(TestMutualRecursionB other) : this() {
-      _hasBits0 = other._hasBits0;
-      a_ = other.a_ != null ? other.a_.Clone() : null;
-      optionalInt32_ = other.optionalInt32_;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestMutualRecursionB Clone() {
-      return new TestMutualRecursionB(this);
-    }
-
-    /// <summary>Field number for the "a" field.</summary>
-    public const int AFieldNumber = 1;
-    private global::Google.Protobuf.TestProtos.Proto2.TestMutualRecursionA a_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.TestProtos.Proto2.TestMutualRecursionA A {
-      get { return a_; }
-      set {
-        a_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "optional_int32" field.</summary>
-    public const int OptionalInt32FieldNumber = 2;
-    private readonly static int OptionalInt32DefaultValue = 0;
-
-    private int optionalInt32_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int OptionalInt32 {
-      get { if ((_hasBits0 & 1) != 0) { return optionalInt32_; } else { return OptionalInt32DefaultValue; } }
-      set {
-        _hasBits0 |= 1;
-        optionalInt32_ = value;
-      }
-    }
-    /// <summary>Gets whether the "optional_int32" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasOptionalInt32 {
-      get { return (_hasBits0 & 1) != 0; }
-    }
-    /// <summary>Clears the value of the "optional_int32" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearOptionalInt32() {
-      _hasBits0 &= ~1;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as TestMutualRecursionB);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(TestMutualRecursionB other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (!object.Equals(A, other.A)) return false;
-      if (OptionalInt32 != other.OptionalInt32) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (a_ != null) hash ^= A.GetHashCode();
-      if (HasOptionalInt32) hash ^= OptionalInt32.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (a_ != null) {
-        output.WriteRawTag(10);
-        output.WriteMessage(A);
-      }
-      if (HasOptionalInt32) {
-        output.WriteRawTag(16);
-        output.WriteInt32(OptionalInt32);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (a_ != null) {
-        output.WriteRawTag(10);
-        output.WriteMessage(A);
-      }
-      if (HasOptionalInt32) {
-        output.WriteRawTag(16);
-        output.WriteInt32(OptionalInt32);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (a_ != null) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(A);
-      }
-      if (HasOptionalInt32) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(OptionalInt32);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(TestMutualRecursionB other) {
-      if (other == null) {
-        return;
-      }
-      if (other.a_ != null) {
-        if (a_ == null) {
-          A = new global::Google.Protobuf.TestProtos.Proto2.TestMutualRecursionA();
-        }
-        A.MergeFrom(other.A);
-      }
-      if (other.HasOptionalInt32) {
-        OptionalInt32 = other.OptionalInt32;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 10: {
-            if (a_ == null) {
-              A = new global::Google.Protobuf.TestProtos.Proto2.TestMutualRecursionA();
-            }
-            input.ReadMessage(A);
-            break;
-          }
-          case 16: {
-            OptionalInt32 = input.ReadInt32();
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 10: {
-            if (a_ == null) {
-              A = new global::Google.Protobuf.TestProtos.Proto2.TestMutualRecursionA();
-            }
-            input.ReadMessage(A);
-            break;
-          }
-          case 16: {
-            OptionalInt32 = input.ReadInt32();
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  public sealed partial class TestIsInitialized : pb::IMessage<TestIsInitialized>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<TestIsInitialized> _parser = new pb::MessageParser<TestIsInitialized>(() => new TestIsInitialized());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<TestIsInitialized> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.Proto2.UnittestReflection.Descriptor.MessageTypes[23]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestIsInitialized() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestIsInitialized(TestIsInitialized other) : this() {
-      subMessage_ = other.subMessage_ != null ? other.subMessage_.Clone() : null;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestIsInitialized Clone() {
-      return new TestIsInitialized(this);
-    }
-
-    /// <summary>Field number for the "sub_message" field.</summary>
-    public const int SubMessageFieldNumber = 1;
-    private global::Google.Protobuf.TestProtos.Proto2.TestIsInitialized.Types.SubMessage subMessage_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.TestProtos.Proto2.TestIsInitialized.Types.SubMessage SubMessage {
-      get { return subMessage_; }
-      set {
-        subMessage_ = value;
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as TestIsInitialized);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(TestIsInitialized other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (!object.Equals(SubMessage, other.SubMessage)) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (subMessage_ != null) hash ^= SubMessage.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (subMessage_ != null) {
-        output.WriteRawTag(10);
-        output.WriteMessage(SubMessage);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (subMessage_ != null) {
-        output.WriteRawTag(10);
-        output.WriteMessage(SubMessage);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (subMessage_ != null) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(SubMessage);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(TestIsInitialized other) {
-      if (other == null) {
-        return;
-      }
-      if (other.subMessage_ != null) {
-        if (subMessage_ == null) {
-          SubMessage = new global::Google.Protobuf.TestProtos.Proto2.TestIsInitialized.Types.SubMessage();
-        }
-        SubMessage.MergeFrom(other.SubMessage);
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 10: {
-            if (subMessage_ == null) {
-              SubMessage = new global::Google.Protobuf.TestProtos.Proto2.TestIsInitialized.Types.SubMessage();
-            }
-            input.ReadMessage(SubMessage);
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 10: {
-            if (subMessage_ == null) {
-              SubMessage = new global::Google.Protobuf.TestProtos.Proto2.TestIsInitialized.Types.SubMessage();
-            }
-            input.ReadMessage(SubMessage);
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-    #region Nested types
-    /// <summary>Container for nested types declared in the TestIsInitialized message type.</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static partial class Types {
-      public sealed partial class SubMessage : pb::IMessage<SubMessage>
-      #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          , pb::IBufferMessage
-      #endif
-      {
-        private static readonly pb::MessageParser<SubMessage> _parser = new pb::MessageParser<SubMessage>(() => new SubMessage());
-        private pb::UnknownFieldSet _unknownFields;
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static pb::MessageParser<SubMessage> Parser { get { return _parser; } }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static pbr::MessageDescriptor Descriptor {
-          get { return global::Google.Protobuf.TestProtos.Proto2.TestIsInitialized.Descriptor.NestedTypes[0]; }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        pbr::MessageDescriptor pb::IMessage.Descriptor {
-          get { return Descriptor; }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public SubMessage() {
-          OnConstruction();
-        }
-
-        partial void OnConstruction();
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public SubMessage(SubMessage other) : this() {
-          subGroup_ = other.HasSubGroup ? other.subGroup_.Clone() : null;
-          _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public SubMessage Clone() {
-          return new SubMessage(this);
-        }
-
-        /// <summary>Field number for the "subgroup" field.</summary>
-        public const int SubGroupFieldNumber = 1;
-        private global::Google.Protobuf.TestProtos.Proto2.TestIsInitialized.Types.SubMessage.Types.SubGroup subGroup_;
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public global::Google.Protobuf.TestProtos.Proto2.TestIsInitialized.Types.SubMessage.Types.SubGroup SubGroup {
-          get { return subGroup_; }
-          set {
-            subGroup_ = value;
-          }
-        }
-        /// <summary>Gets whether the subgroup field is set</summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool HasSubGroup {
-          get { return subGroup_ != null; }
-        }
-        /// <summary>Clears the value of the subgroup field</summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void ClearSubGroup() {
-          subGroup_ = null;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override bool Equals(object other) {
-          return Equals(other as SubMessage);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool Equals(SubMessage other) {
-          if (ReferenceEquals(other, null)) {
-            return false;
-          }
-          if (ReferenceEquals(other, this)) {
-            return true;
-          }
-          if (!object.Equals(SubGroup, other.SubGroup)) return false;
-          return Equals(_unknownFields, other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override int GetHashCode() {
-          int hash = 1;
-          if (HasSubGroup) hash ^= SubGroup.GetHashCode();
-          if (_unknownFields != null) {
-            hash ^= _unknownFields.GetHashCode();
-          }
-          return hash;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override string ToString() {
-          return pb::JsonFormatter.ToDiagnosticString(this);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void WriteTo(pb::CodedOutputStream output) {
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          output.WriteRawMessage(this);
-        #else
-          if (HasSubGroup) {
-            output.WriteRawTag(11);
-            output.WriteGroup(SubGroup);
-            output.WriteRawTag(12);
-          }
-          if (_unknownFields != null) {
-            _unknownFields.WriteTo(output);
-          }
-        #endif
-        }
-
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-          if (HasSubGroup) {
-            output.WriteRawTag(11);
-            output.WriteGroup(SubGroup);
-            output.WriteRawTag(12);
-          }
-          if (_unknownFields != null) {
-            _unknownFields.WriteTo(ref output);
-          }
-        }
-        #endif
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public int CalculateSize() {
-          int size = 0;
-          if (HasSubGroup) {
-            size += 2 + pb::CodedOutputStream.ComputeGroupSize(SubGroup);
-          }
-          if (_unknownFields != null) {
-            size += _unknownFields.CalculateSize();
-          }
-          return size;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(SubMessage other) {
-          if (other == null) {
-            return;
-          }
-          if (other.HasSubGroup) {
-            if (!HasSubGroup) {
-              SubGroup = new global::Google.Protobuf.TestProtos.Proto2.TestIsInitialized.Types.SubMessage.Types.SubGroup();
-            }
-            SubGroup.MergeFrom(other.SubGroup);
-          }
-          _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(pb::CodedInputStream input) {
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          input.ReadRawMessage(this);
-        #else
-          uint tag;
-          while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
-              default:
-                _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-                break;
-              case 11: {
-                if (!HasSubGroup) {
-                  SubGroup = new global::Google.Protobuf.TestProtos.Proto2.TestIsInitialized.Types.SubMessage.Types.SubGroup();
-                }
-                input.ReadGroup(SubGroup);
-                break;
-              }
-            }
-          }
-        #endif
-        }
-
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-          uint tag;
-          while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
-              default:
-                _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-                break;
-              case 11: {
-                if (!HasSubGroup) {
-                  SubGroup = new global::Google.Protobuf.TestProtos.Proto2.TestIsInitialized.Types.SubMessage.Types.SubGroup();
-                }
-                input.ReadGroup(SubGroup);
-                break;
-              }
-            }
-          }
-        }
-        #endif
-
-        #region Nested types
-        /// <summary>Container for nested types declared in the SubMessage message type.</summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static partial class Types {
-          public sealed partial class SubGroup : pb::IMessage<SubGroup>
-          #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-              , pb::IBufferMessage
-          #endif
-          {
-            private static readonly pb::MessageParser<SubGroup> _parser = new pb::MessageParser<SubGroup>(() => new SubGroup());
-            private pb::UnknownFieldSet _unknownFields;
-            private int _hasBits0;
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-            [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-            public static pb::MessageParser<SubGroup> Parser { get { return _parser; } }
-
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-            [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-            public static pbr::MessageDescriptor Descriptor {
-              get { return global::Google.Protobuf.TestProtos.Proto2.TestIsInitialized.Types.SubMessage.Descriptor.NestedTypes[0]; }
-            }
-
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-            [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-            pbr::MessageDescriptor pb::IMessage.Descriptor {
-              get { return Descriptor; }
-            }
-
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-            [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-            public SubGroup() {
-              OnConstruction();
-            }
-
-            partial void OnConstruction();
-
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-            [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-            public SubGroup(SubGroup other) : this() {
-              _hasBits0 = other._hasBits0;
-              i_ = other.i_;
-              _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-            }
-
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-            [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-            public SubGroup Clone() {
-              return new SubGroup(this);
-            }
-
-            /// <summary>Field number for the "i" field.</summary>
-            public const int IFieldNumber = 2;
-            private readonly static int IDefaultValue = 0;
-
-            private int i_;
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-            [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-            public int I {
-              get { if ((_hasBits0 & 1) != 0) { return i_; } else { return IDefaultValue; } }
-              set {
-                _hasBits0 |= 1;
-                i_ = value;
-              }
-            }
-            /// <summary>Gets whether the "i" field is set</summary>
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-            [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-            public bool HasI {
-              get { return (_hasBits0 & 1) != 0; }
-            }
-            /// <summary>Clears the value of the "i" field</summary>
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-            [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-            public void ClearI() {
-              _hasBits0 &= ~1;
-            }
-
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-            [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-            public override bool Equals(object other) {
-              return Equals(other as SubGroup);
-            }
-
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-            [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-            public bool Equals(SubGroup other) {
-              if (ReferenceEquals(other, null)) {
-                return false;
-              }
-              if (ReferenceEquals(other, this)) {
-                return true;
-              }
-              if (I != other.I) return false;
-              return Equals(_unknownFields, other._unknownFields);
-            }
-
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-            [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-            public override int GetHashCode() {
-              int hash = 1;
-              if (HasI) hash ^= I.GetHashCode();
-              if (_unknownFields != null) {
-                hash ^= _unknownFields.GetHashCode();
-              }
-              return hash;
-            }
-
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-            [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-            public override string ToString() {
-              return pb::JsonFormatter.ToDiagnosticString(this);
-            }
-
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-            [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-            public void WriteTo(pb::CodedOutputStream output) {
-            #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-              output.WriteRawMessage(this);
-            #else
-              if (HasI) {
-                output.WriteRawTag(16);
-                output.WriteInt32(I);
-              }
-              if (_unknownFields != null) {
-                _unknownFields.WriteTo(output);
-              }
-            #endif
-            }
-
-            #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-            [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-            void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-              if (HasI) {
-                output.WriteRawTag(16);
-                output.WriteInt32(I);
-              }
-              if (_unknownFields != null) {
-                _unknownFields.WriteTo(ref output);
-              }
-            }
-            #endif
-
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-            [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-            public int CalculateSize() {
-              int size = 0;
-              if (HasI) {
-                size += 1 + pb::CodedOutputStream.ComputeInt32Size(I);
-              }
-              if (_unknownFields != null) {
-                size += _unknownFields.CalculateSize();
-              }
-              return size;
-            }
-
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-            [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-            public void MergeFrom(SubGroup other) {
-              if (other == null) {
-                return;
-              }
-              if (other.HasI) {
-                I = other.I;
-              }
-              _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-            }
-
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-            [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-            public void MergeFrom(pb::CodedInputStream input) {
-            #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-              input.ReadRawMessage(this);
-            #else
-              uint tag;
-              while ((tag = input.ReadTag()) != 0) {
-                switch(tag) {
-                  case 12:
-                    return;
-                  default:
-                    _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-                    break;
-                  case 16: {
-                    I = input.ReadInt32();
-                    break;
-                  }
-                }
-              }
-            #endif
-            }
-
-            #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-            [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-            void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-              uint tag;
-              while ((tag = input.ReadTag()) != 0) {
-                switch(tag) {
-                  case 12:
-                    return;
-                  default:
-                    _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-                    break;
-                  case 16: {
-                    I = input.ReadInt32();
-                    break;
-                  }
-                }
-              }
-            }
-            #endif
-
-          }
-
-        }
-        #endregion
-
-      }
-
-    }
-    #endregion
-
-  }
-
-  /// <summary>
-  /// Test that groups have disjoint field numbers from their siblings and
-  /// parents.  This is NOT possible in proto1; only google.protobuf.  When attempting
-  /// to compile with proto1, this will emit an error; so we only include it
-  /// in protobuf_unittest_proto.
-  /// </summary>
-  public sealed partial class TestDupFieldNumber : pb::IMessage<TestDupFieldNumber>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<TestDupFieldNumber> _parser = new pb::MessageParser<TestDupFieldNumber>(() => new TestDupFieldNumber());
-    private pb::UnknownFieldSet _unknownFields;
-    private int _hasBits0;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<TestDupFieldNumber> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.Proto2.UnittestReflection.Descriptor.MessageTypes[24]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestDupFieldNumber() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestDupFieldNumber(TestDupFieldNumber other) : this() {
-      _hasBits0 = other._hasBits0;
-      a_ = other.a_;
-      foo_ = other.HasFoo ? other.foo_.Clone() : null;
-      bar_ = other.HasBar ? other.bar_.Clone() : null;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestDupFieldNumber Clone() {
-      return new TestDupFieldNumber(this);
-    }
-
-    /// <summary>Field number for the "a" field.</summary>
-    public const int AFieldNumber = 1;
-    private readonly static int ADefaultValue = 0;
-
-    private int a_;
-    /// <summary>
-    /// NO_PROTO1
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int A {
-      get { if ((_hasBits0 & 1) != 0) { return a_; } else { return ADefaultValue; } }
-      set {
-        _hasBits0 |= 1;
-        a_ = value;
-      }
-    }
-    /// <summary>Gets whether the "a" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasA {
-      get { return (_hasBits0 & 1) != 0; }
-    }
-    /// <summary>Clears the value of the "a" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearA() {
-      _hasBits0 &= ~1;
-    }
-
-    /// <summary>Field number for the "foo" field.</summary>
-    public const int FooFieldNumber = 2;
-    private global::Google.Protobuf.TestProtos.Proto2.TestDupFieldNumber.Types.Foo foo_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.TestProtos.Proto2.TestDupFieldNumber.Types.Foo Foo {
-      get { return foo_; }
-      set {
-        foo_ = value;
-      }
-    }
-    /// <summary>Gets whether the foo field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasFoo {
-      get { return foo_ != null; }
-    }
-    /// <summary>Clears the value of the foo field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearFoo() {
-      foo_ = null;
-    }
-
-    /// <summary>Field number for the "bar" field.</summary>
-    public const int BarFieldNumber = 3;
-    private global::Google.Protobuf.TestProtos.Proto2.TestDupFieldNumber.Types.Bar bar_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.TestProtos.Proto2.TestDupFieldNumber.Types.Bar Bar {
-      get { return bar_; }
-      set {
-        bar_ = value;
-      }
-    }
-    /// <summary>Gets whether the bar field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasBar {
-      get { return bar_ != null; }
-    }
-    /// <summary>Clears the value of the bar field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearBar() {
-      bar_ = null;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as TestDupFieldNumber);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(TestDupFieldNumber other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (A != other.A) return false;
-      if (!object.Equals(Foo, other.Foo)) return false;
-      if (!object.Equals(Bar, other.Bar)) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (HasA) hash ^= A.GetHashCode();
-      if (HasFoo) hash ^= Foo.GetHashCode();
-      if (HasBar) hash ^= Bar.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (HasA) {
-        output.WriteRawTag(8);
-        output.WriteInt32(A);
-      }
-      if (HasFoo) {
-        output.WriteRawTag(19);
-        output.WriteGroup(Foo);
-        output.WriteRawTag(20);
-      }
-      if (HasBar) {
-        output.WriteRawTag(27);
-        output.WriteGroup(Bar);
-        output.WriteRawTag(28);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (HasA) {
-        output.WriteRawTag(8);
-        output.WriteInt32(A);
-      }
-      if (HasFoo) {
-        output.WriteRawTag(19);
-        output.WriteGroup(Foo);
-        output.WriteRawTag(20);
-      }
-      if (HasBar) {
-        output.WriteRawTag(27);
-        output.WriteGroup(Bar);
-        output.WriteRawTag(28);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (HasA) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(A);
-      }
-      if (HasFoo) {
-        size += 2 + pb::CodedOutputStream.ComputeGroupSize(Foo);
-      }
-      if (HasBar) {
-        size += 2 + pb::CodedOutputStream.ComputeGroupSize(Bar);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(TestDupFieldNumber other) {
-      if (other == null) {
-        return;
-      }
-      if (other.HasA) {
-        A = other.A;
-      }
-      if (other.HasFoo) {
-        if (!HasFoo) {
-          Foo = new global::Google.Protobuf.TestProtos.Proto2.TestDupFieldNumber.Types.Foo();
-        }
-        Foo.MergeFrom(other.Foo);
-      }
-      if (other.HasBar) {
-        if (!HasBar) {
-          Bar = new global::Google.Protobuf.TestProtos.Proto2.TestDupFieldNumber.Types.Bar();
-        }
-        Bar.MergeFrom(other.Bar);
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 8: {
-            A = input.ReadInt32();
-            break;
-          }
-          case 19: {
-            if (!HasFoo) {
-              Foo = new global::Google.Protobuf.TestProtos.Proto2.TestDupFieldNumber.Types.Foo();
-            }
-            input.ReadGroup(Foo);
-            break;
-          }
-          case 27: {
-            if (!HasBar) {
-              Bar = new global::Google.Protobuf.TestProtos.Proto2.TestDupFieldNumber.Types.Bar();
-            }
-            input.ReadGroup(Bar);
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 8: {
-            A = input.ReadInt32();
-            break;
-          }
-          case 19: {
-            if (!HasFoo) {
-              Foo = new global::Google.Protobuf.TestProtos.Proto2.TestDupFieldNumber.Types.Foo();
-            }
-            input.ReadGroup(Foo);
-            break;
-          }
-          case 27: {
-            if (!HasBar) {
-              Bar = new global::Google.Protobuf.TestProtos.Proto2.TestDupFieldNumber.Types.Bar();
-            }
-            input.ReadGroup(Bar);
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-    #region Nested types
-    /// <summary>Container for nested types declared in the TestDupFieldNumber message type.</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static partial class Types {
-      public sealed partial class Foo : pb::IMessage<Foo>
-      #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          , pb::IBufferMessage
-      #endif
-      {
-        private static readonly pb::MessageParser<Foo> _parser = new pb::MessageParser<Foo>(() => new Foo());
-        private pb::UnknownFieldSet _unknownFields;
-        private int _hasBits0;
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static pb::MessageParser<Foo> Parser { get { return _parser; } }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static pbr::MessageDescriptor Descriptor {
-          get { return global::Google.Protobuf.TestProtos.Proto2.TestDupFieldNumber.Descriptor.NestedTypes[0]; }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        pbr::MessageDescriptor pb::IMessage.Descriptor {
-          get { return Descriptor; }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public Foo() {
-          OnConstruction();
-        }
-
-        partial void OnConstruction();
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public Foo(Foo other) : this() {
-          _hasBits0 = other._hasBits0;
-          a_ = other.a_;
-          _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public Foo Clone() {
-          return new Foo(this);
-        }
-
-        /// <summary>Field number for the "a" field.</summary>
-        public const int AFieldNumber = 1;
-        private readonly static int ADefaultValue = 0;
-
-        private int a_;
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public int A {
-          get { if ((_hasBits0 & 1) != 0) { return a_; } else { return ADefaultValue; } }
-          set {
-            _hasBits0 |= 1;
-            a_ = value;
-          }
-        }
-        /// <summary>Gets whether the "a" field is set</summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool HasA {
-          get { return (_hasBits0 & 1) != 0; }
-        }
-        /// <summary>Clears the value of the "a" field</summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void ClearA() {
-          _hasBits0 &= ~1;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override bool Equals(object other) {
-          return Equals(other as Foo);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool Equals(Foo other) {
-          if (ReferenceEquals(other, null)) {
-            return false;
-          }
-          if (ReferenceEquals(other, this)) {
-            return true;
-          }
-          if (A != other.A) return false;
-          return Equals(_unknownFields, other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override int GetHashCode() {
-          int hash = 1;
-          if (HasA) hash ^= A.GetHashCode();
-          if (_unknownFields != null) {
-            hash ^= _unknownFields.GetHashCode();
-          }
-          return hash;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override string ToString() {
-          return pb::JsonFormatter.ToDiagnosticString(this);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void WriteTo(pb::CodedOutputStream output) {
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          output.WriteRawMessage(this);
-        #else
-          if (HasA) {
-            output.WriteRawTag(8);
-            output.WriteInt32(A);
-          }
-          if (_unknownFields != null) {
-            _unknownFields.WriteTo(output);
-          }
-        #endif
-        }
-
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-          if (HasA) {
-            output.WriteRawTag(8);
-            output.WriteInt32(A);
-          }
-          if (_unknownFields != null) {
-            _unknownFields.WriteTo(ref output);
-          }
-        }
-        #endif
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public int CalculateSize() {
-          int size = 0;
-          if (HasA) {
-            size += 1 + pb::CodedOutputStream.ComputeInt32Size(A);
-          }
-          if (_unknownFields != null) {
-            size += _unknownFields.CalculateSize();
-          }
-          return size;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(Foo other) {
-          if (other == null) {
-            return;
-          }
-          if (other.HasA) {
-            A = other.A;
-          }
-          _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(pb::CodedInputStream input) {
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          input.ReadRawMessage(this);
-        #else
-          uint tag;
-          while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
-              case 20:
-                return;
-              default:
-                _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-                break;
-              case 8: {
-                A = input.ReadInt32();
-                break;
-              }
-            }
-          }
-        #endif
-        }
-
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-          uint tag;
-          while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
-              case 20:
-                return;
-              default:
-                _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-                break;
-              case 8: {
-                A = input.ReadInt32();
-                break;
-              }
-            }
-          }
-        }
-        #endif
-
-      }
-
-      public sealed partial class Bar : pb::IMessage<Bar>
-      #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          , pb::IBufferMessage
-      #endif
-      {
-        private static readonly pb::MessageParser<Bar> _parser = new pb::MessageParser<Bar>(() => new Bar());
-        private pb::UnknownFieldSet _unknownFields;
-        private int _hasBits0;
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static pb::MessageParser<Bar> Parser { get { return _parser; } }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static pbr::MessageDescriptor Descriptor {
-          get { return global::Google.Protobuf.TestProtos.Proto2.TestDupFieldNumber.Descriptor.NestedTypes[1]; }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        pbr::MessageDescriptor pb::IMessage.Descriptor {
-          get { return Descriptor; }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public Bar() {
-          OnConstruction();
-        }
-
-        partial void OnConstruction();
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public Bar(Bar other) : this() {
-          _hasBits0 = other._hasBits0;
-          a_ = other.a_;
-          _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public Bar Clone() {
-          return new Bar(this);
-        }
-
-        /// <summary>Field number for the "a" field.</summary>
-        public const int AFieldNumber = 1;
-        private readonly static int ADefaultValue = 0;
-
-        private int a_;
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public int A {
-          get { if ((_hasBits0 & 1) != 0) { return a_; } else { return ADefaultValue; } }
-          set {
-            _hasBits0 |= 1;
-            a_ = value;
-          }
-        }
-        /// <summary>Gets whether the "a" field is set</summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool HasA {
-          get { return (_hasBits0 & 1) != 0; }
-        }
-        /// <summary>Clears the value of the "a" field</summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void ClearA() {
-          _hasBits0 &= ~1;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override bool Equals(object other) {
-          return Equals(other as Bar);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool Equals(Bar other) {
-          if (ReferenceEquals(other, null)) {
-            return false;
-          }
-          if (ReferenceEquals(other, this)) {
-            return true;
-          }
-          if (A != other.A) return false;
-          return Equals(_unknownFields, other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override int GetHashCode() {
-          int hash = 1;
-          if (HasA) hash ^= A.GetHashCode();
-          if (_unknownFields != null) {
-            hash ^= _unknownFields.GetHashCode();
-          }
-          return hash;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override string ToString() {
-          return pb::JsonFormatter.ToDiagnosticString(this);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void WriteTo(pb::CodedOutputStream output) {
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          output.WriteRawMessage(this);
-        #else
-          if (HasA) {
-            output.WriteRawTag(8);
-            output.WriteInt32(A);
-          }
-          if (_unknownFields != null) {
-            _unknownFields.WriteTo(output);
-          }
-        #endif
-        }
-
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-          if (HasA) {
-            output.WriteRawTag(8);
-            output.WriteInt32(A);
-          }
-          if (_unknownFields != null) {
-            _unknownFields.WriteTo(ref output);
-          }
-        }
-        #endif
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public int CalculateSize() {
-          int size = 0;
-          if (HasA) {
-            size += 1 + pb::CodedOutputStream.ComputeInt32Size(A);
-          }
-          if (_unknownFields != null) {
-            size += _unknownFields.CalculateSize();
-          }
-          return size;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(Bar other) {
-          if (other == null) {
-            return;
-          }
-          if (other.HasA) {
-            A = other.A;
-          }
-          _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(pb::CodedInputStream input) {
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          input.ReadRawMessage(this);
-        #else
-          uint tag;
-          while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
-              case 28:
-                return;
-              default:
-                _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-                break;
-              case 8: {
-                A = input.ReadInt32();
-                break;
-              }
-            }
-          }
-        #endif
-        }
-
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-          uint tag;
-          while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
-              case 28:
-                return;
-              default:
-                _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-                break;
-              case 8: {
-                A = input.ReadInt32();
-                break;
-              }
-            }
-          }
-        }
-        #endif
-
-      }
-
-    }
-    #endregion
-
-  }
-
-  /// <summary>
-  /// Additional messages for testing lazy fields.
-  /// </summary>
-  public sealed partial class TestEagerMessage : pb::IMessage<TestEagerMessage>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<TestEagerMessage> _parser = new pb::MessageParser<TestEagerMessage>(() => new TestEagerMessage());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<TestEagerMessage> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.Proto2.UnittestReflection.Descriptor.MessageTypes[25]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestEagerMessage() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestEagerMessage(TestEagerMessage other) : this() {
-      subMessage_ = other.subMessage_ != null ? other.subMessage_.Clone() : null;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestEagerMessage Clone() {
-      return new TestEagerMessage(this);
-    }
-
-    /// <summary>Field number for the "sub_message" field.</summary>
-    public const int SubMessageFieldNumber = 1;
-    private global::Google.Protobuf.TestProtos.Proto2.TestAllTypes subMessage_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.TestProtos.Proto2.TestAllTypes SubMessage {
-      get { return subMessage_; }
-      set {
-        subMessage_ = value;
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as TestEagerMessage);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(TestEagerMessage other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (!object.Equals(SubMessage, other.SubMessage)) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (subMessage_ != null) hash ^= SubMessage.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (subMessage_ != null) {
-        output.WriteRawTag(10);
-        output.WriteMessage(SubMessage);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (subMessage_ != null) {
-        output.WriteRawTag(10);
-        output.WriteMessage(SubMessage);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (subMessage_ != null) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(SubMessage);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(TestEagerMessage other) {
-      if (other == null) {
-        return;
-      }
-      if (other.subMessage_ != null) {
-        if (subMessage_ == null) {
-          SubMessage = new global::Google.Protobuf.TestProtos.Proto2.TestAllTypes();
-        }
-        SubMessage.MergeFrom(other.SubMessage);
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 10: {
-            if (subMessage_ == null) {
-              SubMessage = new global::Google.Protobuf.TestProtos.Proto2.TestAllTypes();
-            }
-            input.ReadMessage(SubMessage);
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 10: {
-            if (subMessage_ == null) {
-              SubMessage = new global::Google.Protobuf.TestProtos.Proto2.TestAllTypes();
-            }
-            input.ReadMessage(SubMessage);
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  public sealed partial class TestLazyMessage : pb::IMessage<TestLazyMessage>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<TestLazyMessage> _parser = new pb::MessageParser<TestLazyMessage>(() => new TestLazyMessage());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<TestLazyMessage> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.Proto2.UnittestReflection.Descriptor.MessageTypes[26]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestLazyMessage() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestLazyMessage(TestLazyMessage other) : this() {
-      subMessage_ = other.subMessage_ != null ? other.subMessage_.Clone() : null;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestLazyMessage Clone() {
-      return new TestLazyMessage(this);
-    }
-
-    /// <summary>Field number for the "sub_message" field.</summary>
-    public const int SubMessageFieldNumber = 1;
-    private global::Google.Protobuf.TestProtos.Proto2.TestAllTypes subMessage_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.TestProtos.Proto2.TestAllTypes SubMessage {
-      get { return subMessage_; }
-      set {
-        subMessage_ = value;
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as TestLazyMessage);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(TestLazyMessage other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (!object.Equals(SubMessage, other.SubMessage)) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (subMessage_ != null) hash ^= SubMessage.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (subMessage_ != null) {
-        output.WriteRawTag(10);
-        output.WriteMessage(SubMessage);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (subMessage_ != null) {
-        output.WriteRawTag(10);
-        output.WriteMessage(SubMessage);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (subMessage_ != null) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(SubMessage);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(TestLazyMessage other) {
-      if (other == null) {
-        return;
-      }
-      if (other.subMessage_ != null) {
-        if (subMessage_ == null) {
-          SubMessage = new global::Google.Protobuf.TestProtos.Proto2.TestAllTypes();
-        }
-        SubMessage.MergeFrom(other.SubMessage);
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 10: {
-            if (subMessage_ == null) {
-              SubMessage = new global::Google.Protobuf.TestProtos.Proto2.TestAllTypes();
-            }
-            input.ReadMessage(SubMessage);
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 10: {
-            if (subMessage_ == null) {
-              SubMessage = new global::Google.Protobuf.TestProtos.Proto2.TestAllTypes();
-            }
-            input.ReadMessage(SubMessage);
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  /// <summary>
-  /// Needed for a Python test.
-  /// </summary>
-  public sealed partial class TestNestedMessageHasBits : pb::IMessage<TestNestedMessageHasBits>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<TestNestedMessageHasBits> _parser = new pb::MessageParser<TestNestedMessageHasBits>(() => new TestNestedMessageHasBits());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<TestNestedMessageHasBits> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.Proto2.UnittestReflection.Descriptor.MessageTypes[27]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestNestedMessageHasBits() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestNestedMessageHasBits(TestNestedMessageHasBits other) : this() {
-      optionalNestedMessage_ = other.optionalNestedMessage_ != null ? other.optionalNestedMessage_.Clone() : null;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestNestedMessageHasBits Clone() {
-      return new TestNestedMessageHasBits(this);
-    }
-
-    /// <summary>Field number for the "optional_nested_message" field.</summary>
-    public const int OptionalNestedMessageFieldNumber = 1;
-    private global::Google.Protobuf.TestProtos.Proto2.TestNestedMessageHasBits.Types.NestedMessage optionalNestedMessage_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.TestProtos.Proto2.TestNestedMessageHasBits.Types.NestedMessage OptionalNestedMessage {
-      get { return optionalNestedMessage_; }
-      set {
-        optionalNestedMessage_ = value;
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as TestNestedMessageHasBits);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(TestNestedMessageHasBits other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (!object.Equals(OptionalNestedMessage, other.OptionalNestedMessage)) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (optionalNestedMessage_ != null) hash ^= OptionalNestedMessage.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (optionalNestedMessage_ != null) {
-        output.WriteRawTag(10);
-        output.WriteMessage(OptionalNestedMessage);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (optionalNestedMessage_ != null) {
-        output.WriteRawTag(10);
-        output.WriteMessage(OptionalNestedMessage);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (optionalNestedMessage_ != null) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(OptionalNestedMessage);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(TestNestedMessageHasBits other) {
-      if (other == null) {
-        return;
-      }
-      if (other.optionalNestedMessage_ != null) {
-        if (optionalNestedMessage_ == null) {
-          OptionalNestedMessage = new global::Google.Protobuf.TestProtos.Proto2.TestNestedMessageHasBits.Types.NestedMessage();
-        }
-        OptionalNestedMessage.MergeFrom(other.OptionalNestedMessage);
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 10: {
-            if (optionalNestedMessage_ == null) {
-              OptionalNestedMessage = new global::Google.Protobuf.TestProtos.Proto2.TestNestedMessageHasBits.Types.NestedMessage();
-            }
-            input.ReadMessage(OptionalNestedMessage);
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 10: {
-            if (optionalNestedMessage_ == null) {
-              OptionalNestedMessage = new global::Google.Protobuf.TestProtos.Proto2.TestNestedMessageHasBits.Types.NestedMessage();
-            }
-            input.ReadMessage(OptionalNestedMessage);
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-    #region Nested types
-    /// <summary>Container for nested types declared in the TestNestedMessageHasBits message type.</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static partial class Types {
-      public sealed partial class NestedMessage : pb::IMessage<NestedMessage>
-      #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          , pb::IBufferMessage
-      #endif
-      {
-        private static readonly pb::MessageParser<NestedMessage> _parser = new pb::MessageParser<NestedMessage>(() => new NestedMessage());
-        private pb::UnknownFieldSet _unknownFields;
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static pb::MessageParser<NestedMessage> Parser { get { return _parser; } }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static pbr::MessageDescriptor Descriptor {
-          get { return global::Google.Protobuf.TestProtos.Proto2.TestNestedMessageHasBits.Descriptor.NestedTypes[0]; }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        pbr::MessageDescriptor pb::IMessage.Descriptor {
-          get { return Descriptor; }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public NestedMessage() {
-          OnConstruction();
-        }
-
-        partial void OnConstruction();
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public NestedMessage(NestedMessage other) : this() {
-          nestedmessageRepeatedInt32_ = other.nestedmessageRepeatedInt32_.Clone();
-          nestedmessageRepeatedForeignmessage_ = other.nestedmessageRepeatedForeignmessage_.Clone();
-          _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public NestedMessage Clone() {
-          return new NestedMessage(this);
-        }
-
-        /// <summary>Field number for the "nestedmessage_repeated_int32" field.</summary>
-        public const int NestedmessageRepeatedInt32FieldNumber = 1;
-        private static readonly pb::FieldCodec<int> _repeated_nestedmessageRepeatedInt32_codec
-            = pb::FieldCodec.ForInt32(8);
-        private readonly pbc::RepeatedField<int> nestedmessageRepeatedInt32_ = new pbc::RepeatedField<int>();
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public pbc::RepeatedField<int> NestedmessageRepeatedInt32 {
-          get { return nestedmessageRepeatedInt32_; }
-        }
-
-        /// <summary>Field number for the "nestedmessage_repeated_foreignmessage" field.</summary>
-        public const int NestedmessageRepeatedForeignmessageFieldNumber = 2;
-        private static readonly pb::FieldCodec<global::Google.Protobuf.TestProtos.Proto2.ForeignMessage> _repeated_nestedmessageRepeatedForeignmessage_codec
-            = pb::FieldCodec.ForMessage(18, global::Google.Protobuf.TestProtos.Proto2.ForeignMessage.Parser);
-        private readonly pbc::RepeatedField<global::Google.Protobuf.TestProtos.Proto2.ForeignMessage> nestedmessageRepeatedForeignmessage_ = new pbc::RepeatedField<global::Google.Protobuf.TestProtos.Proto2.ForeignMessage>();
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public pbc::RepeatedField<global::Google.Protobuf.TestProtos.Proto2.ForeignMessage> NestedmessageRepeatedForeignmessage {
-          get { return nestedmessageRepeatedForeignmessage_; }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override bool Equals(object other) {
-          return Equals(other as NestedMessage);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool Equals(NestedMessage other) {
-          if (ReferenceEquals(other, null)) {
-            return false;
-          }
-          if (ReferenceEquals(other, this)) {
-            return true;
-          }
-          if(!nestedmessageRepeatedInt32_.Equals(other.nestedmessageRepeatedInt32_)) return false;
-          if(!nestedmessageRepeatedForeignmessage_.Equals(other.nestedmessageRepeatedForeignmessage_)) return false;
-          return Equals(_unknownFields, other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override int GetHashCode() {
-          int hash = 1;
-          hash ^= nestedmessageRepeatedInt32_.GetHashCode();
-          hash ^= nestedmessageRepeatedForeignmessage_.GetHashCode();
-          if (_unknownFields != null) {
-            hash ^= _unknownFields.GetHashCode();
-          }
-          return hash;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override string ToString() {
-          return pb::JsonFormatter.ToDiagnosticString(this);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void WriteTo(pb::CodedOutputStream output) {
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          output.WriteRawMessage(this);
-        #else
-          nestedmessageRepeatedInt32_.WriteTo(output, _repeated_nestedmessageRepeatedInt32_codec);
-          nestedmessageRepeatedForeignmessage_.WriteTo(output, _repeated_nestedmessageRepeatedForeignmessage_codec);
-          if (_unknownFields != null) {
-            _unknownFields.WriteTo(output);
-          }
-        #endif
-        }
-
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-          nestedmessageRepeatedInt32_.WriteTo(ref output, _repeated_nestedmessageRepeatedInt32_codec);
-          nestedmessageRepeatedForeignmessage_.WriteTo(ref output, _repeated_nestedmessageRepeatedForeignmessage_codec);
-          if (_unknownFields != null) {
-            _unknownFields.WriteTo(ref output);
-          }
-        }
-        #endif
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public int CalculateSize() {
-          int size = 0;
-          size += nestedmessageRepeatedInt32_.CalculateSize(_repeated_nestedmessageRepeatedInt32_codec);
-          size += nestedmessageRepeatedForeignmessage_.CalculateSize(_repeated_nestedmessageRepeatedForeignmessage_codec);
-          if (_unknownFields != null) {
-            size += _unknownFields.CalculateSize();
-          }
-          return size;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(NestedMessage other) {
-          if (other == null) {
-            return;
-          }
-          nestedmessageRepeatedInt32_.Add(other.nestedmessageRepeatedInt32_);
-          nestedmessageRepeatedForeignmessage_.Add(other.nestedmessageRepeatedForeignmessage_);
-          _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(pb::CodedInputStream input) {
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          input.ReadRawMessage(this);
-        #else
-          uint tag;
-          while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
-              default:
-                _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-                break;
-              case 10:
-              case 8: {
-                nestedmessageRepeatedInt32_.AddEntriesFrom(input, _repeated_nestedmessageRepeatedInt32_codec);
-                break;
-              }
-              case 18: {
-                nestedmessageRepeatedForeignmessage_.AddEntriesFrom(input, _repeated_nestedmessageRepeatedForeignmessage_codec);
-                break;
-              }
-            }
-          }
-        #endif
-        }
-
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-          uint tag;
-          while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
-              default:
-                _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-                break;
-              case 10:
-              case 8: {
-                nestedmessageRepeatedInt32_.AddEntriesFrom(ref input, _repeated_nestedmessageRepeatedInt32_codec);
-                break;
-              }
-              case 18: {
-                nestedmessageRepeatedForeignmessage_.AddEntriesFrom(ref input, _repeated_nestedmessageRepeatedForeignmessage_codec);
-                break;
-              }
-            }
-          }
-        }
-        #endif
-
-      }
-
-    }
-    #endregion
-
-  }
-
-  /// <summary>
-  /// Test message with CamelCase field names.  This violates Protocol Buffer
-  /// standard style.
-  /// </summary>
-  public sealed partial class TestCamelCaseFieldNames : pb::IMessage<TestCamelCaseFieldNames>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<TestCamelCaseFieldNames> _parser = new pb::MessageParser<TestCamelCaseFieldNames>(() => new TestCamelCaseFieldNames());
-    private pb::UnknownFieldSet _unknownFields;
-    private int _hasBits0;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<TestCamelCaseFieldNames> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.Proto2.UnittestReflection.Descriptor.MessageTypes[28]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestCamelCaseFieldNames() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestCamelCaseFieldNames(TestCamelCaseFieldNames other) : this() {
-      _hasBits0 = other._hasBits0;
-      primitiveField_ = other.primitiveField_;
-      stringField_ = other.stringField_;
-      enumField_ = other.enumField_;
-      messageField_ = other.messageField_ != null ? other.messageField_.Clone() : null;
-      stringPieceField_ = other.stringPieceField_;
-      cordField_ = other.cordField_;
-      repeatedPrimitiveField_ = other.repeatedPrimitiveField_.Clone();
-      repeatedStringField_ = other.repeatedStringField_.Clone();
-      repeatedEnumField_ = other.repeatedEnumField_.Clone();
-      repeatedMessageField_ = other.repeatedMessageField_.Clone();
-      repeatedStringPieceField_ = other.repeatedStringPieceField_.Clone();
-      repeatedCordField_ = other.repeatedCordField_.Clone();
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestCamelCaseFieldNames Clone() {
-      return new TestCamelCaseFieldNames(this);
-    }
-
-    /// <summary>Field number for the "PrimitiveField" field.</summary>
-    public const int PrimitiveFieldFieldNumber = 1;
-    private readonly static int PrimitiveFieldDefaultValue = 0;
-
-    private int primitiveField_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int PrimitiveField {
-      get { if ((_hasBits0 & 1) != 0) { return primitiveField_; } else { return PrimitiveFieldDefaultValue; } }
-      set {
-        _hasBits0 |= 1;
-        primitiveField_ = value;
-      }
-    }
-    /// <summary>Gets whether the "PrimitiveField" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasPrimitiveField {
-      get { return (_hasBits0 & 1) != 0; }
-    }
-    /// <summary>Clears the value of the "PrimitiveField" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearPrimitiveField() {
-      _hasBits0 &= ~1;
-    }
-
-    /// <summary>Field number for the "StringField" field.</summary>
-    public const int StringFieldFieldNumber = 2;
-    private readonly static string StringFieldDefaultValue = "";
-
-    private string stringField_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string StringField {
-      get { return stringField_ ?? StringFieldDefaultValue; }
-      set {
-        stringField_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-    /// <summary>Gets whether the "StringField" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasStringField {
-      get { return stringField_ != null; }
-    }
-    /// <summary>Clears the value of the "StringField" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearStringField() {
-      stringField_ = null;
-    }
-
-    /// <summary>Field number for the "EnumField" field.</summary>
-    public const int EnumFieldFieldNumber = 3;
-    private readonly static global::Google.Protobuf.TestProtos.Proto2.ForeignEnum EnumFieldDefaultValue = global::Google.Protobuf.TestProtos.Proto2.ForeignEnum.ForeignFoo;
-
-    private global::Google.Protobuf.TestProtos.Proto2.ForeignEnum enumField_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.TestProtos.Proto2.ForeignEnum EnumField {
-      get { if ((_hasBits0 & 2) != 0) { return enumField_; } else { return EnumFieldDefaultValue; } }
-      set {
-        _hasBits0 |= 2;
-        enumField_ = value;
-      }
-    }
-    /// <summary>Gets whether the "EnumField" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasEnumField {
-      get { return (_hasBits0 & 2) != 0; }
-    }
-    /// <summary>Clears the value of the "EnumField" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearEnumField() {
-      _hasBits0 &= ~2;
-    }
-
-    /// <summary>Field number for the "MessageField" field.</summary>
-    public const int MessageFieldFieldNumber = 4;
-    private global::Google.Protobuf.TestProtos.Proto2.ForeignMessage messageField_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.TestProtos.Proto2.ForeignMessage MessageField {
-      get { return messageField_; }
-      set {
-        messageField_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "StringPieceField" field.</summary>
-    public const int StringPieceFieldFieldNumber = 5;
-    private readonly static string StringPieceFieldDefaultValue = "";
-
-    private string stringPieceField_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string StringPieceField {
-      get { return stringPieceField_ ?? StringPieceFieldDefaultValue; }
-      set {
-        stringPieceField_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-    /// <summary>Gets whether the "StringPieceField" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasStringPieceField {
-      get { return stringPieceField_ != null; }
-    }
-    /// <summary>Clears the value of the "StringPieceField" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearStringPieceField() {
-      stringPieceField_ = null;
-    }
-
-    /// <summary>Field number for the "CordField" field.</summary>
-    public const int CordFieldFieldNumber = 6;
-    private readonly static string CordFieldDefaultValue = "";
-
-    private string cordField_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string CordField {
-      get { return cordField_ ?? CordFieldDefaultValue; }
-      set {
-        cordField_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-    /// <summary>Gets whether the "CordField" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasCordField {
-      get { return cordField_ != null; }
-    }
-    /// <summary>Clears the value of the "CordField" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearCordField() {
-      cordField_ = null;
-    }
-
-    /// <summary>Field number for the "RepeatedPrimitiveField" field.</summary>
-    public const int RepeatedPrimitiveFieldFieldNumber = 7;
-    private static readonly pb::FieldCodec<int> _repeated_repeatedPrimitiveField_codec
-        = pb::FieldCodec.ForInt32(56);
-    private readonly pbc::RepeatedField<int> repeatedPrimitiveField_ = new pbc::RepeatedField<int>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<int> RepeatedPrimitiveField {
-      get { return repeatedPrimitiveField_; }
-    }
-
-    /// <summary>Field number for the "RepeatedStringField" field.</summary>
-    public const int RepeatedStringFieldFieldNumber = 8;
-    private static readonly pb::FieldCodec<string> _repeated_repeatedStringField_codec
-        = pb::FieldCodec.ForString(66);
-    private readonly pbc::RepeatedField<string> repeatedStringField_ = new pbc::RepeatedField<string>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<string> RepeatedStringField {
-      get { return repeatedStringField_; }
-    }
-
-    /// <summary>Field number for the "RepeatedEnumField" field.</summary>
-    public const int RepeatedEnumFieldFieldNumber = 9;
-    private static readonly pb::FieldCodec<global::Google.Protobuf.TestProtos.Proto2.ForeignEnum> _repeated_repeatedEnumField_codec
-        = pb::FieldCodec.ForEnum(72, x => (int) x, x => (global::Google.Protobuf.TestProtos.Proto2.ForeignEnum) x);
-    private readonly pbc::RepeatedField<global::Google.Protobuf.TestProtos.Proto2.ForeignEnum> repeatedEnumField_ = new pbc::RepeatedField<global::Google.Protobuf.TestProtos.Proto2.ForeignEnum>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Google.Protobuf.TestProtos.Proto2.ForeignEnum> RepeatedEnumField {
-      get { return repeatedEnumField_; }
-    }
-
-    /// <summary>Field number for the "RepeatedMessageField" field.</summary>
-    public const int RepeatedMessageFieldFieldNumber = 10;
-    private static readonly pb::FieldCodec<global::Google.Protobuf.TestProtos.Proto2.ForeignMessage> _repeated_repeatedMessageField_codec
-        = pb::FieldCodec.ForMessage(82, global::Google.Protobuf.TestProtos.Proto2.ForeignMessage.Parser);
-    private readonly pbc::RepeatedField<global::Google.Protobuf.TestProtos.Proto2.ForeignMessage> repeatedMessageField_ = new pbc::RepeatedField<global::Google.Protobuf.TestProtos.Proto2.ForeignMessage>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Google.Protobuf.TestProtos.Proto2.ForeignMessage> RepeatedMessageField {
-      get { return repeatedMessageField_; }
-    }
-
-    /// <summary>Field number for the "RepeatedStringPieceField" field.</summary>
-    public const int RepeatedStringPieceFieldFieldNumber = 11;
-    private static readonly pb::FieldCodec<string> _repeated_repeatedStringPieceField_codec
-        = pb::FieldCodec.ForString(90);
-    private readonly pbc::RepeatedField<string> repeatedStringPieceField_ = new pbc::RepeatedField<string>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<string> RepeatedStringPieceField {
-      get { return repeatedStringPieceField_; }
-    }
-
-    /// <summary>Field number for the "RepeatedCordField" field.</summary>
-    public const int RepeatedCordFieldFieldNumber = 12;
-    private static readonly pb::FieldCodec<string> _repeated_repeatedCordField_codec
-        = pb::FieldCodec.ForString(98);
-    private readonly pbc::RepeatedField<string> repeatedCordField_ = new pbc::RepeatedField<string>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<string> RepeatedCordField {
-      get { return repeatedCordField_; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as TestCamelCaseFieldNames);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(TestCamelCaseFieldNames other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (PrimitiveField != other.PrimitiveField) return false;
-      if (StringField != other.StringField) return false;
-      if (EnumField != other.EnumField) return false;
-      if (!object.Equals(MessageField, other.MessageField)) return false;
-      if (StringPieceField != other.StringPieceField) return false;
-      if (CordField != other.CordField) return false;
-      if(!repeatedPrimitiveField_.Equals(other.repeatedPrimitiveField_)) return false;
-      if(!repeatedStringField_.Equals(other.repeatedStringField_)) return false;
-      if(!repeatedEnumField_.Equals(other.repeatedEnumField_)) return false;
-      if(!repeatedMessageField_.Equals(other.repeatedMessageField_)) return false;
-      if(!repeatedStringPieceField_.Equals(other.repeatedStringPieceField_)) return false;
-      if(!repeatedCordField_.Equals(other.repeatedCordField_)) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (HasPrimitiveField) hash ^= PrimitiveField.GetHashCode();
-      if (HasStringField) hash ^= StringField.GetHashCode();
-      if (HasEnumField) hash ^= EnumField.GetHashCode();
-      if (messageField_ != null) hash ^= MessageField.GetHashCode();
-      if (HasStringPieceField) hash ^= StringPieceField.GetHashCode();
-      if (HasCordField) hash ^= CordField.GetHashCode();
-      hash ^= repeatedPrimitiveField_.GetHashCode();
-      hash ^= repeatedStringField_.GetHashCode();
-      hash ^= repeatedEnumField_.GetHashCode();
-      hash ^= repeatedMessageField_.GetHashCode();
-      hash ^= repeatedStringPieceField_.GetHashCode();
-      hash ^= repeatedCordField_.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (HasPrimitiveField) {
-        output.WriteRawTag(8);
-        output.WriteInt32(PrimitiveField);
-      }
-      if (HasStringField) {
-        output.WriteRawTag(18);
-        output.WriteString(StringField);
-      }
-      if (HasEnumField) {
-        output.WriteRawTag(24);
-        output.WriteEnum((int) EnumField);
-      }
-      if (messageField_ != null) {
-        output.WriteRawTag(34);
-        output.WriteMessage(MessageField);
-      }
-      if (HasStringPieceField) {
-        output.WriteRawTag(42);
-        output.WriteString(StringPieceField);
-      }
-      if (HasCordField) {
-        output.WriteRawTag(50);
-        output.WriteString(CordField);
-      }
-      repeatedPrimitiveField_.WriteTo(output, _repeated_repeatedPrimitiveField_codec);
-      repeatedStringField_.WriteTo(output, _repeated_repeatedStringField_codec);
-      repeatedEnumField_.WriteTo(output, _repeated_repeatedEnumField_codec);
-      repeatedMessageField_.WriteTo(output, _repeated_repeatedMessageField_codec);
-      repeatedStringPieceField_.WriteTo(output, _repeated_repeatedStringPieceField_codec);
-      repeatedCordField_.WriteTo(output, _repeated_repeatedCordField_codec);
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (HasPrimitiveField) {
-        output.WriteRawTag(8);
-        output.WriteInt32(PrimitiveField);
-      }
-      if (HasStringField) {
-        output.WriteRawTag(18);
-        output.WriteString(StringField);
-      }
-      if (HasEnumField) {
-        output.WriteRawTag(24);
-        output.WriteEnum((int) EnumField);
-      }
-      if (messageField_ != null) {
-        output.WriteRawTag(34);
-        output.WriteMessage(MessageField);
-      }
-      if (HasStringPieceField) {
-        output.WriteRawTag(42);
-        output.WriteString(StringPieceField);
-      }
-      if (HasCordField) {
-        output.WriteRawTag(50);
-        output.WriteString(CordField);
-      }
-      repeatedPrimitiveField_.WriteTo(ref output, _repeated_repeatedPrimitiveField_codec);
-      repeatedStringField_.WriteTo(ref output, _repeated_repeatedStringField_codec);
-      repeatedEnumField_.WriteTo(ref output, _repeated_repeatedEnumField_codec);
-      repeatedMessageField_.WriteTo(ref output, _repeated_repeatedMessageField_codec);
-      repeatedStringPieceField_.WriteTo(ref output, _repeated_repeatedStringPieceField_codec);
-      repeatedCordField_.WriteTo(ref output, _repeated_repeatedCordField_codec);
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (HasPrimitiveField) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(PrimitiveField);
-      }
-      if (HasStringField) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(StringField);
-      }
-      if (HasEnumField) {
-        size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) EnumField);
-      }
-      if (messageField_ != null) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(MessageField);
-      }
-      if (HasStringPieceField) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(StringPieceField);
-      }
-      if (HasCordField) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(CordField);
-      }
-      size += repeatedPrimitiveField_.CalculateSize(_repeated_repeatedPrimitiveField_codec);
-      size += repeatedStringField_.CalculateSize(_repeated_repeatedStringField_codec);
-      size += repeatedEnumField_.CalculateSize(_repeated_repeatedEnumField_codec);
-      size += repeatedMessageField_.CalculateSize(_repeated_repeatedMessageField_codec);
-      size += repeatedStringPieceField_.CalculateSize(_repeated_repeatedStringPieceField_codec);
-      size += repeatedCordField_.CalculateSize(_repeated_repeatedCordField_codec);
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(TestCamelCaseFieldNames other) {
-      if (other == null) {
-        return;
-      }
-      if (other.HasPrimitiveField) {
-        PrimitiveField = other.PrimitiveField;
-      }
-      if (other.HasStringField) {
-        StringField = other.StringField;
-      }
-      if (other.HasEnumField) {
-        EnumField = other.EnumField;
-      }
-      if (other.messageField_ != null) {
-        if (messageField_ == null) {
-          MessageField = new global::Google.Protobuf.TestProtos.Proto2.ForeignMessage();
-        }
-        MessageField.MergeFrom(other.MessageField);
-      }
-      if (other.HasStringPieceField) {
-        StringPieceField = other.StringPieceField;
-      }
-      if (other.HasCordField) {
-        CordField = other.CordField;
-      }
-      repeatedPrimitiveField_.Add(other.repeatedPrimitiveField_);
-      repeatedStringField_.Add(other.repeatedStringField_);
-      repeatedEnumField_.Add(other.repeatedEnumField_);
-      repeatedMessageField_.Add(other.repeatedMessageField_);
-      repeatedStringPieceField_.Add(other.repeatedStringPieceField_);
-      repeatedCordField_.Add(other.repeatedCordField_);
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 8: {
-            PrimitiveField = input.ReadInt32();
-            break;
-          }
-          case 18: {
-            StringField = input.ReadString();
-            break;
-          }
-          case 24: {
-            EnumField = (global::Google.Protobuf.TestProtos.Proto2.ForeignEnum) input.ReadEnum();
-            break;
-          }
-          case 34: {
-            if (messageField_ == null) {
-              MessageField = new global::Google.Protobuf.TestProtos.Proto2.ForeignMessage();
-            }
-            input.ReadMessage(MessageField);
-            break;
-          }
-          case 42: {
-            StringPieceField = input.ReadString();
-            break;
-          }
-          case 50: {
-            CordField = input.ReadString();
-            break;
-          }
-          case 58:
-          case 56: {
-            repeatedPrimitiveField_.AddEntriesFrom(input, _repeated_repeatedPrimitiveField_codec);
-            break;
-          }
-          case 66: {
-            repeatedStringField_.AddEntriesFrom(input, _repeated_repeatedStringField_codec);
-            break;
-          }
-          case 74:
-          case 72: {
-            repeatedEnumField_.AddEntriesFrom(input, _repeated_repeatedEnumField_codec);
-            break;
-          }
-          case 82: {
-            repeatedMessageField_.AddEntriesFrom(input, _repeated_repeatedMessageField_codec);
-            break;
-          }
-          case 90: {
-            repeatedStringPieceField_.AddEntriesFrom(input, _repeated_repeatedStringPieceField_codec);
-            break;
-          }
-          case 98: {
-            repeatedCordField_.AddEntriesFrom(input, _repeated_repeatedCordField_codec);
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 8: {
-            PrimitiveField = input.ReadInt32();
-            break;
-          }
-          case 18: {
-            StringField = input.ReadString();
-            break;
-          }
-          case 24: {
-            EnumField = (global::Google.Protobuf.TestProtos.Proto2.ForeignEnum) input.ReadEnum();
-            break;
-          }
-          case 34: {
-            if (messageField_ == null) {
-              MessageField = new global::Google.Protobuf.TestProtos.Proto2.ForeignMessage();
-            }
-            input.ReadMessage(MessageField);
-            break;
-          }
-          case 42: {
-            StringPieceField = input.ReadString();
-            break;
-          }
-          case 50: {
-            CordField = input.ReadString();
-            break;
-          }
-          case 58:
-          case 56: {
-            repeatedPrimitiveField_.AddEntriesFrom(ref input, _repeated_repeatedPrimitiveField_codec);
-            break;
-          }
-          case 66: {
-            repeatedStringField_.AddEntriesFrom(ref input, _repeated_repeatedStringField_codec);
-            break;
-          }
-          case 74:
-          case 72: {
-            repeatedEnumField_.AddEntriesFrom(ref input, _repeated_repeatedEnumField_codec);
-            break;
-          }
-          case 82: {
-            repeatedMessageField_.AddEntriesFrom(ref input, _repeated_repeatedMessageField_codec);
-            break;
-          }
-          case 90: {
-            repeatedStringPieceField_.AddEntriesFrom(ref input, _repeated_repeatedStringPieceField_codec);
-            break;
-          }
-          case 98: {
-            repeatedCordField_.AddEntriesFrom(ref input, _repeated_repeatedCordField_codec);
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  /// <summary>
-  /// We list fields out of order, to ensure that we're using field number and not
-  /// field index to determine serialization order.
-  /// </summary>
-  public sealed partial class TestFieldOrderings : pb::IExtendableMessage<TestFieldOrderings>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<TestFieldOrderings> _parser = new pb::MessageParser<TestFieldOrderings>(() => new TestFieldOrderings());
-    private pb::UnknownFieldSet _unknownFields;
-    private pb::ExtensionSet<TestFieldOrderings> _extensions;
-    private pb::ExtensionSet<TestFieldOrderings> _Extensions { get { return _extensions; } }
-    private int _hasBits0;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<TestFieldOrderings> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.Proto2.UnittestReflection.Descriptor.MessageTypes[29]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestFieldOrderings() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestFieldOrderings(TestFieldOrderings other) : this() {
-      _hasBits0 = other._hasBits0;
-      myString_ = other.myString_;
-      myInt_ = other.myInt_;
-      myFloat_ = other.myFloat_;
-      optionalNestedMessage_ = other.optionalNestedMessage_ != null ? other.optionalNestedMessage_.Clone() : null;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-      _extensions = pb::ExtensionSet.Clone(other._extensions);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestFieldOrderings Clone() {
-      return new TestFieldOrderings(this);
-    }
-
-    /// <summary>Field number for the "my_string" field.</summary>
-    public const int MyStringFieldNumber = 11;
-    private readonly static string MyStringDefaultValue = "";
-
-    private string myString_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string MyString {
-      get { return myString_ ?? MyStringDefaultValue; }
-      set {
-        myString_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-    /// <summary>Gets whether the "my_string" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasMyString {
-      get { return myString_ != null; }
-    }
-    /// <summary>Clears the value of the "my_string" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearMyString() {
-      myString_ = null;
-    }
-
-    /// <summary>Field number for the "my_int" field.</summary>
-    public const int MyIntFieldNumber = 1;
-    private readonly static long MyIntDefaultValue = 0L;
-
-    private long myInt_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public long MyInt {
-      get { if ((_hasBits0 & 1) != 0) { return myInt_; } else { return MyIntDefaultValue; } }
-      set {
-        _hasBits0 |= 1;
-        myInt_ = value;
-      }
-    }
-    /// <summary>Gets whether the "my_int" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasMyInt {
-      get { return (_hasBits0 & 1) != 0; }
-    }
-    /// <summary>Clears the value of the "my_int" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearMyInt() {
-      _hasBits0 &= ~1;
-    }
-
-    /// <summary>Field number for the "my_float" field.</summary>
-    public const int MyFloatFieldNumber = 101;
-    private readonly static float MyFloatDefaultValue = 0F;
-
-    private float myFloat_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public float MyFloat {
-      get { if ((_hasBits0 & 2) != 0) { return myFloat_; } else { return MyFloatDefaultValue; } }
-      set {
-        _hasBits0 |= 2;
-        myFloat_ = value;
-      }
-    }
-    /// <summary>Gets whether the "my_float" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasMyFloat {
-      get { return (_hasBits0 & 2) != 0; }
-    }
-    /// <summary>Clears the value of the "my_float" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearMyFloat() {
-      _hasBits0 &= ~2;
-    }
-
-    /// <summary>Field number for the "optional_nested_message" field.</summary>
-    public const int OptionalNestedMessageFieldNumber = 200;
-    private global::Google.Protobuf.TestProtos.Proto2.TestFieldOrderings.Types.NestedMessage optionalNestedMessage_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.TestProtos.Proto2.TestFieldOrderings.Types.NestedMessage OptionalNestedMessage {
-      get { return optionalNestedMessage_; }
-      set {
-        optionalNestedMessage_ = value;
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as TestFieldOrderings);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(TestFieldOrderings other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (MyString != other.MyString) return false;
-      if (MyInt != other.MyInt) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.Equals(MyFloat, other.MyFloat)) return false;
-      if (!object.Equals(OptionalNestedMessage, other.OptionalNestedMessage)) return false;
-      if (!Equals(_extensions, other._extensions)) {
-        return false;
-      }
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (HasMyString) hash ^= MyString.GetHashCode();
-      if (HasMyInt) hash ^= MyInt.GetHashCode();
-      if (HasMyFloat) hash ^= pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.GetHashCode(MyFloat);
-      if (optionalNestedMessage_ != null) hash ^= OptionalNestedMessage.GetHashCode();
-      if (_extensions != null) {
-        hash ^= _extensions.GetHashCode();
-      }
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (HasMyInt) {
-        output.WriteRawTag(8);
-        output.WriteInt64(MyInt);
-      }
-      if (HasMyString) {
-        output.WriteRawTag(90);
-        output.WriteString(MyString);
-      }
-      if (HasMyFloat) {
-        output.WriteRawTag(173, 6);
-        output.WriteFloat(MyFloat);
-      }
-      if (optionalNestedMessage_ != null) {
-        output.WriteRawTag(194, 12);
-        output.WriteMessage(OptionalNestedMessage);
-      }
-      if (_extensions != null) {
-        _extensions.WriteTo(output);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (HasMyInt) {
-        output.WriteRawTag(8);
-        output.WriteInt64(MyInt);
-      }
-      if (HasMyString) {
-        output.WriteRawTag(90);
-        output.WriteString(MyString);
-      }
-      if (HasMyFloat) {
-        output.WriteRawTag(173, 6);
-        output.WriteFloat(MyFloat);
-      }
-      if (optionalNestedMessage_ != null) {
-        output.WriteRawTag(194, 12);
-        output.WriteMessage(OptionalNestedMessage);
-      }
-      if (_extensions != null) {
-        _extensions.WriteTo(ref output);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (HasMyString) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(MyString);
-      }
-      if (HasMyInt) {
-        size += 1 + pb::CodedOutputStream.ComputeInt64Size(MyInt);
-      }
-      if (HasMyFloat) {
-        size += 2 + 4;
-      }
-      if (optionalNestedMessage_ != null) {
-        size += 2 + pb::CodedOutputStream.ComputeMessageSize(OptionalNestedMessage);
-      }
-      if (_extensions != null) {
-        size += _extensions.CalculateSize();
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(TestFieldOrderings other) {
-      if (other == null) {
-        return;
-      }
-      if (other.HasMyString) {
-        MyString = other.MyString;
-      }
-      if (other.HasMyInt) {
-        MyInt = other.MyInt;
-      }
-      if (other.HasMyFloat) {
-        MyFloat = other.MyFloat;
-      }
-      if (other.optionalNestedMessage_ != null) {
-        if (optionalNestedMessage_ == null) {
-          OptionalNestedMessage = new global::Google.Protobuf.TestProtos.Proto2.TestFieldOrderings.Types.NestedMessage();
-        }
-        OptionalNestedMessage.MergeFrom(other.OptionalNestedMessage);
-      }
-      pb::ExtensionSet.MergeFrom(ref _extensions, other._extensions);
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            if (!pb::ExtensionSet.TryMergeFieldFrom(ref _extensions, input)) {
-              _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            }
-            break;
-          case 8: {
-            MyInt = input.ReadInt64();
-            break;
-          }
-          case 90: {
-            MyString = input.ReadString();
-            break;
-          }
-          case 813: {
-            MyFloat = input.ReadFloat();
-            break;
-          }
-          case 1602: {
-            if (optionalNestedMessage_ == null) {
-              OptionalNestedMessage = new global::Google.Protobuf.TestProtos.Proto2.TestFieldOrderings.Types.NestedMessage();
-            }
-            input.ReadMessage(OptionalNestedMessage);
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            if (!pb::ExtensionSet.TryMergeFieldFrom(ref _extensions, ref input)) {
-              _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            }
-            break;
-          case 8: {
-            MyInt = input.ReadInt64();
-            break;
-          }
-          case 90: {
-            MyString = input.ReadString();
-            break;
-          }
-          case 813: {
-            MyFloat = input.ReadFloat();
-            break;
-          }
-          case 1602: {
-            if (optionalNestedMessage_ == null) {
-              OptionalNestedMessage = new global::Google.Protobuf.TestProtos.Proto2.TestFieldOrderings.Types.NestedMessage();
-            }
-            input.ReadMessage(OptionalNestedMessage);
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-    public TValue GetExtension<TValue>(pb::Extension<TestFieldOrderings, TValue> extension) {
-      return pb::ExtensionSet.Get(ref _extensions, extension);
-    }
-    public pbc::RepeatedField<TValue> GetExtension<TValue>(pb::RepeatedExtension<TestFieldOrderings, TValue> extension) {
-      return pb::ExtensionSet.Get(ref _extensions, extension);
-    }
-    public pbc::RepeatedField<TValue> GetOrInitializeExtension<TValue>(pb::RepeatedExtension<TestFieldOrderings, TValue> extension) {
-      return pb::ExtensionSet.GetOrInitialize(ref _extensions, extension);
-    }
-    public void SetExtension<TValue>(pb::Extension<TestFieldOrderings, TValue> extension, TValue value) {
-      pb::ExtensionSet.Set(ref _extensions, extension, value);
-    }
-    public bool HasExtension<TValue>(pb::Extension<TestFieldOrderings, TValue> extension) {
-      return pb::ExtensionSet.Has(ref _extensions, extension);
-    }
-    public void ClearExtension<TValue>(pb::Extension<TestFieldOrderings, TValue> extension) {
-      pb::ExtensionSet.Clear(ref _extensions, extension);
-    }
-    public void ClearExtension<TValue>(pb::RepeatedExtension<TestFieldOrderings, TValue> extension) {
-      pb::ExtensionSet.Clear(ref _extensions, extension);
-    }
-
-    #region Nested types
-    /// <summary>Container for nested types declared in the TestFieldOrderings message type.</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static partial class Types {
-      public sealed partial class NestedMessage : pb::IMessage<NestedMessage>
-      #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          , pb::IBufferMessage
-      #endif
-      {
-        private static readonly pb::MessageParser<NestedMessage> _parser = new pb::MessageParser<NestedMessage>(() => new NestedMessage());
-        private pb::UnknownFieldSet _unknownFields;
-        private int _hasBits0;
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static pb::MessageParser<NestedMessage> Parser { get { return _parser; } }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static pbr::MessageDescriptor Descriptor {
-          get { return global::Google.Protobuf.TestProtos.Proto2.TestFieldOrderings.Descriptor.NestedTypes[0]; }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        pbr::MessageDescriptor pb::IMessage.Descriptor {
-          get { return Descriptor; }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public NestedMessage() {
-          OnConstruction();
-        }
-
-        partial void OnConstruction();
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public NestedMessage(NestedMessage other) : this() {
-          _hasBits0 = other._hasBits0;
-          oo_ = other.oo_;
-          bb_ = other.bb_;
-          _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public NestedMessage Clone() {
-          return new NestedMessage(this);
-        }
-
-        /// <summary>Field number for the "oo" field.</summary>
-        public const int OoFieldNumber = 2;
-        private readonly static long OoDefaultValue = 0L;
-
-        private long oo_;
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public long Oo {
-          get { if ((_hasBits0 & 2) != 0) { return oo_; } else { return OoDefaultValue; } }
-          set {
-            _hasBits0 |= 2;
-            oo_ = value;
-          }
-        }
-        /// <summary>Gets whether the "oo" field is set</summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool HasOo {
-          get { return (_hasBits0 & 2) != 0; }
-        }
-        /// <summary>Clears the value of the "oo" field</summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void ClearOo() {
-          _hasBits0 &= ~2;
-        }
-
-        /// <summary>Field number for the "bb" field.</summary>
-        public const int BbFieldNumber = 1;
-        private readonly static int BbDefaultValue = 0;
-
-        private int bb_;
-        /// <summary>
-        /// The field name "b" fails to compile in proto1 because it conflicts with
-        /// a local variable named "b" in one of the generated methods.  Doh.
-        /// This file needs to compile in proto1 to test backwards-compatibility.
-        /// </summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public int Bb {
-          get { if ((_hasBits0 & 1) != 0) { return bb_; } else { return BbDefaultValue; } }
-          set {
-            _hasBits0 |= 1;
-            bb_ = value;
-          }
-        }
-        /// <summary>Gets whether the "bb" field is set</summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool HasBb {
-          get { return (_hasBits0 & 1) != 0; }
-        }
-        /// <summary>Clears the value of the "bb" field</summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void ClearBb() {
-          _hasBits0 &= ~1;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override bool Equals(object other) {
-          return Equals(other as NestedMessage);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool Equals(NestedMessage other) {
-          if (ReferenceEquals(other, null)) {
-            return false;
-          }
-          if (ReferenceEquals(other, this)) {
-            return true;
-          }
-          if (Oo != other.Oo) return false;
-          if (Bb != other.Bb) return false;
-          return Equals(_unknownFields, other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override int GetHashCode() {
-          int hash = 1;
-          if (HasOo) hash ^= Oo.GetHashCode();
-          if (HasBb) hash ^= Bb.GetHashCode();
-          if (_unknownFields != null) {
-            hash ^= _unknownFields.GetHashCode();
-          }
-          return hash;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override string ToString() {
-          return pb::JsonFormatter.ToDiagnosticString(this);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void WriteTo(pb::CodedOutputStream output) {
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          output.WriteRawMessage(this);
-        #else
-          if (HasBb) {
-            output.WriteRawTag(8);
-            output.WriteInt32(Bb);
-          }
-          if (HasOo) {
-            output.WriteRawTag(16);
-            output.WriteInt64(Oo);
-          }
-          if (_unknownFields != null) {
-            _unknownFields.WriteTo(output);
-          }
-        #endif
-        }
-
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-          if (HasBb) {
-            output.WriteRawTag(8);
-            output.WriteInt32(Bb);
-          }
-          if (HasOo) {
-            output.WriteRawTag(16);
-            output.WriteInt64(Oo);
-          }
-          if (_unknownFields != null) {
-            _unknownFields.WriteTo(ref output);
-          }
-        }
-        #endif
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public int CalculateSize() {
-          int size = 0;
-          if (HasOo) {
-            size += 1 + pb::CodedOutputStream.ComputeInt64Size(Oo);
-          }
-          if (HasBb) {
-            size += 1 + pb::CodedOutputStream.ComputeInt32Size(Bb);
-          }
-          if (_unknownFields != null) {
-            size += _unknownFields.CalculateSize();
-          }
-          return size;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(NestedMessage other) {
-          if (other == null) {
-            return;
-          }
-          if (other.HasOo) {
-            Oo = other.Oo;
-          }
-          if (other.HasBb) {
-            Bb = other.Bb;
-          }
-          _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(pb::CodedInputStream input) {
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          input.ReadRawMessage(this);
-        #else
-          uint tag;
-          while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
-              default:
-                _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-                break;
-              case 8: {
-                Bb = input.ReadInt32();
-                break;
-              }
-              case 16: {
-                Oo = input.ReadInt64();
-                break;
-              }
-            }
-          }
-        #endif
-        }
-
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-          uint tag;
-          while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
-              default:
-                _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-                break;
-              case 8: {
-                Bb = input.ReadInt32();
-                break;
-              }
-              case 16: {
-                Oo = input.ReadInt64();
-                break;
-              }
-            }
-          }
-        }
-        #endif
-
-      }
-
-    }
-    #endregion
-
-  }
-
-  public sealed partial class TestExtensionOrderings1 : pb::IMessage<TestExtensionOrderings1>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<TestExtensionOrderings1> _parser = new pb::MessageParser<TestExtensionOrderings1>(() => new TestExtensionOrderings1());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<TestExtensionOrderings1> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.Proto2.UnittestReflection.Descriptor.MessageTypes[30]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestExtensionOrderings1() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestExtensionOrderings1(TestExtensionOrderings1 other) : this() {
-      myString_ = other.myString_;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestExtensionOrderings1 Clone() {
-      return new TestExtensionOrderings1(this);
-    }
-
-    /// <summary>Field number for the "my_string" field.</summary>
-    public const int MyStringFieldNumber = 1;
-    private readonly static string MyStringDefaultValue = "";
-
-    private string myString_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string MyString {
-      get { return myString_ ?? MyStringDefaultValue; }
-      set {
-        myString_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-    /// <summary>Gets whether the "my_string" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasMyString {
-      get { return myString_ != null; }
-    }
-    /// <summary>Clears the value of the "my_string" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearMyString() {
-      myString_ = null;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as TestExtensionOrderings1);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(TestExtensionOrderings1 other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (MyString != other.MyString) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (HasMyString) hash ^= MyString.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (HasMyString) {
-        output.WriteRawTag(10);
-        output.WriteString(MyString);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (HasMyString) {
-        output.WriteRawTag(10);
-        output.WriteString(MyString);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (HasMyString) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(MyString);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(TestExtensionOrderings1 other) {
-      if (other == null) {
-        return;
-      }
-      if (other.HasMyString) {
-        MyString = other.MyString;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 10: {
-            MyString = input.ReadString();
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 10: {
-            MyString = input.ReadString();
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-    #region Extensions
-    /// <summary>Container for extensions for other messages declared in the TestExtensionOrderings1 message type.</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static partial class Extensions {
-      public static readonly pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestFieldOrderings, global::Google.Protobuf.TestProtos.Proto2.TestExtensionOrderings1> TestExtOrderings1 =
-        new pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestFieldOrderings, global::Google.Protobuf.TestProtos.Proto2.TestExtensionOrderings1>(13, pb::FieldCodec.ForMessage(106, global::Google.Protobuf.TestProtos.Proto2.TestExtensionOrderings1.Parser));
-    }
-    #endregion
-
-  }
-
-  public sealed partial class TestExtensionOrderings2 : pb::IMessage<TestExtensionOrderings2>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<TestExtensionOrderings2> _parser = new pb::MessageParser<TestExtensionOrderings2>(() => new TestExtensionOrderings2());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<TestExtensionOrderings2> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.Proto2.UnittestReflection.Descriptor.MessageTypes[31]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestExtensionOrderings2() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestExtensionOrderings2(TestExtensionOrderings2 other) : this() {
-      myString_ = other.myString_;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestExtensionOrderings2 Clone() {
-      return new TestExtensionOrderings2(this);
-    }
-
-    /// <summary>Field number for the "my_string" field.</summary>
-    public const int MyStringFieldNumber = 1;
-    private readonly static string MyStringDefaultValue = "";
-
-    private string myString_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string MyString {
-      get { return myString_ ?? MyStringDefaultValue; }
-      set {
-        myString_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-    /// <summary>Gets whether the "my_string" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasMyString {
-      get { return myString_ != null; }
-    }
-    /// <summary>Clears the value of the "my_string" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearMyString() {
-      myString_ = null;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as TestExtensionOrderings2);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(TestExtensionOrderings2 other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (MyString != other.MyString) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (HasMyString) hash ^= MyString.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (HasMyString) {
-        output.WriteRawTag(10);
-        output.WriteString(MyString);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (HasMyString) {
-        output.WriteRawTag(10);
-        output.WriteString(MyString);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (HasMyString) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(MyString);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(TestExtensionOrderings2 other) {
-      if (other == null) {
-        return;
-      }
-      if (other.HasMyString) {
-        MyString = other.MyString;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 10: {
-            MyString = input.ReadString();
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 10: {
-            MyString = input.ReadString();
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-    #region Nested types
-    /// <summary>Container for nested types declared in the TestExtensionOrderings2 message type.</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static partial class Types {
-      public sealed partial class TestExtensionOrderings3 : pb::IMessage<TestExtensionOrderings3>
-      #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          , pb::IBufferMessage
-      #endif
-      {
-        private static readonly pb::MessageParser<TestExtensionOrderings3> _parser = new pb::MessageParser<TestExtensionOrderings3>(() => new TestExtensionOrderings3());
-        private pb::UnknownFieldSet _unknownFields;
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static pb::MessageParser<TestExtensionOrderings3> Parser { get { return _parser; } }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static pbr::MessageDescriptor Descriptor {
-          get { return global::Google.Protobuf.TestProtos.Proto2.TestExtensionOrderings2.Descriptor.NestedTypes[0]; }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        pbr::MessageDescriptor pb::IMessage.Descriptor {
-          get { return Descriptor; }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public TestExtensionOrderings3() {
-          OnConstruction();
-        }
-
-        partial void OnConstruction();
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public TestExtensionOrderings3(TestExtensionOrderings3 other) : this() {
-          myString_ = other.myString_;
-          _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public TestExtensionOrderings3 Clone() {
-          return new TestExtensionOrderings3(this);
-        }
-
-        /// <summary>Field number for the "my_string" field.</summary>
-        public const int MyStringFieldNumber = 1;
-        private readonly static string MyStringDefaultValue = "";
-
-        private string myString_;
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public string MyString {
-          get { return myString_ ?? MyStringDefaultValue; }
-          set {
-            myString_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-          }
-        }
-        /// <summary>Gets whether the "my_string" field is set</summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool HasMyString {
-          get { return myString_ != null; }
-        }
-        /// <summary>Clears the value of the "my_string" field</summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void ClearMyString() {
-          myString_ = null;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override bool Equals(object other) {
-          return Equals(other as TestExtensionOrderings3);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool Equals(TestExtensionOrderings3 other) {
-          if (ReferenceEquals(other, null)) {
-            return false;
-          }
-          if (ReferenceEquals(other, this)) {
-            return true;
-          }
-          if (MyString != other.MyString) return false;
-          return Equals(_unknownFields, other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override int GetHashCode() {
-          int hash = 1;
-          if (HasMyString) hash ^= MyString.GetHashCode();
-          if (_unknownFields != null) {
-            hash ^= _unknownFields.GetHashCode();
-          }
-          return hash;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override string ToString() {
-          return pb::JsonFormatter.ToDiagnosticString(this);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void WriteTo(pb::CodedOutputStream output) {
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          output.WriteRawMessage(this);
-        #else
-          if (HasMyString) {
-            output.WriteRawTag(10);
-            output.WriteString(MyString);
-          }
-          if (_unknownFields != null) {
-            _unknownFields.WriteTo(output);
-          }
-        #endif
-        }
-
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-          if (HasMyString) {
-            output.WriteRawTag(10);
-            output.WriteString(MyString);
-          }
-          if (_unknownFields != null) {
-            _unknownFields.WriteTo(ref output);
-          }
-        }
-        #endif
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public int CalculateSize() {
-          int size = 0;
-          if (HasMyString) {
-            size += 1 + pb::CodedOutputStream.ComputeStringSize(MyString);
-          }
-          if (_unknownFields != null) {
-            size += _unknownFields.CalculateSize();
-          }
-          return size;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(TestExtensionOrderings3 other) {
-          if (other == null) {
-            return;
-          }
-          if (other.HasMyString) {
-            MyString = other.MyString;
-          }
-          _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(pb::CodedInputStream input) {
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          input.ReadRawMessage(this);
-        #else
-          uint tag;
-          while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
-              default:
-                _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-                break;
-              case 10: {
-                MyString = input.ReadString();
-                break;
-              }
-            }
-          }
-        #endif
-        }
-
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-          uint tag;
-          while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
-              default:
-                _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-                break;
-              case 10: {
-                MyString = input.ReadString();
-                break;
-              }
-            }
-          }
-        }
-        #endif
-
-        #region Extensions
-        /// <summary>Container for extensions for other messages declared in the TestExtensionOrderings3 message type.</summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static partial class Extensions {
-          public static readonly pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestFieldOrderings, global::Google.Protobuf.TestProtos.Proto2.TestExtensionOrderings2.Types.TestExtensionOrderings3> TestExtOrderings3 =
-            new pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestFieldOrderings, global::Google.Protobuf.TestProtos.Proto2.TestExtensionOrderings2.Types.TestExtensionOrderings3>(14, pb::FieldCodec.ForMessage(114, global::Google.Protobuf.TestProtos.Proto2.TestExtensionOrderings2.Types.TestExtensionOrderings3.Parser));
-        }
-        #endregion
-
-      }
-
-    }
-    #endregion
-
-    #region Extensions
-    /// <summary>Container for extensions for other messages declared in the TestExtensionOrderings2 message type.</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static partial class Extensions {
-      public static readonly pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestFieldOrderings, global::Google.Protobuf.TestProtos.Proto2.TestExtensionOrderings2> TestExtOrderings2 =
-        new pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestFieldOrderings, global::Google.Protobuf.TestProtos.Proto2.TestExtensionOrderings2>(12, pb::FieldCodec.ForMessage(98, global::Google.Protobuf.TestProtos.Proto2.TestExtensionOrderings2.Parser));
-    }
-    #endregion
-
-  }
-
-  public sealed partial class TestExtremeDefaultValues : pb::IMessage<TestExtremeDefaultValues>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<TestExtremeDefaultValues> _parser = new pb::MessageParser<TestExtremeDefaultValues>(() => new TestExtremeDefaultValues());
-    private pb::UnknownFieldSet _unknownFields;
-    private int _hasBits0;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<TestExtremeDefaultValues> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.Proto2.UnittestReflection.Descriptor.MessageTypes[32]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestExtremeDefaultValues() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestExtremeDefaultValues(TestExtremeDefaultValues other) : this() {
-      _hasBits0 = other._hasBits0;
-      escapedBytes_ = other.escapedBytes_;
-      largeUint32_ = other.largeUint32_;
-      largeUint64_ = other.largeUint64_;
-      smallInt32_ = other.smallInt32_;
-      smallInt64_ = other.smallInt64_;
-      reallySmallInt32_ = other.reallySmallInt32_;
-      reallySmallInt64_ = other.reallySmallInt64_;
-      utf8String_ = other.utf8String_;
-      zeroFloat_ = other.zeroFloat_;
-      oneFloat_ = other.oneFloat_;
-      smallFloat_ = other.smallFloat_;
-      negativeOneFloat_ = other.negativeOneFloat_;
-      negativeFloat_ = other.negativeFloat_;
-      largeFloat_ = other.largeFloat_;
-      smallNegativeFloat_ = other.smallNegativeFloat_;
-      infDouble_ = other.infDouble_;
-      negInfDouble_ = other.negInfDouble_;
-      nanDouble_ = other.nanDouble_;
-      infFloat_ = other.infFloat_;
-      negInfFloat_ = other.negInfFloat_;
-      nanFloat_ = other.nanFloat_;
-      cppTrigraph_ = other.cppTrigraph_;
-      stringWithZero_ = other.stringWithZero_;
-      bytesWithZero_ = other.bytesWithZero_;
-      stringPieceWithZero_ = other.stringPieceWithZero_;
-      cordWithZero_ = other.cordWithZero_;
-      replacementString_ = other.replacementString_;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestExtremeDefaultValues Clone() {
-      return new TestExtremeDefaultValues(this);
-    }
-
-    /// <summary>Field number for the "escaped_bytes" field.</summary>
-    public const int EscapedBytesFieldNumber = 1;
-    private readonly static pb::ByteString EscapedBytesDefaultValue = pb::ByteString.FromBase64("AAEHCAwKDQkLXCci/g==");
-
-    private pb::ByteString escapedBytes_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pb::ByteString EscapedBytes {
-      get { return escapedBytes_ ?? EscapedBytesDefaultValue; }
-      set {
-        escapedBytes_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-    /// <summary>Gets whether the "escaped_bytes" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasEscapedBytes {
-      get { return escapedBytes_ != null; }
-    }
-    /// <summary>Clears the value of the "escaped_bytes" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearEscapedBytes() {
-      escapedBytes_ = null;
-    }
-
-    /// <summary>Field number for the "large_uint32" field.</summary>
-    public const int LargeUint32FieldNumber = 2;
-    private readonly static uint LargeUint32DefaultValue = 4294967295;
-
-    private uint largeUint32_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public uint LargeUint32 {
-      get { if ((_hasBits0 & 1) != 0) { return largeUint32_; } else { return LargeUint32DefaultValue; } }
-      set {
-        _hasBits0 |= 1;
-        largeUint32_ = value;
-      }
-    }
-    /// <summary>Gets whether the "large_uint32" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasLargeUint32 {
-      get { return (_hasBits0 & 1) != 0; }
-    }
-    /// <summary>Clears the value of the "large_uint32" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearLargeUint32() {
-      _hasBits0 &= ~1;
-    }
-
-    /// <summary>Field number for the "large_uint64" field.</summary>
-    public const int LargeUint64FieldNumber = 3;
-    private readonly static ulong LargeUint64DefaultValue = 18446744073709551615UL;
-
-    private ulong largeUint64_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ulong LargeUint64 {
-      get { if ((_hasBits0 & 2) != 0) { return largeUint64_; } else { return LargeUint64DefaultValue; } }
-      set {
-        _hasBits0 |= 2;
-        largeUint64_ = value;
-      }
-    }
-    /// <summary>Gets whether the "large_uint64" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasLargeUint64 {
-      get { return (_hasBits0 & 2) != 0; }
-    }
-    /// <summary>Clears the value of the "large_uint64" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearLargeUint64() {
-      _hasBits0 &= ~2;
-    }
-
-    /// <summary>Field number for the "small_int32" field.</summary>
-    public const int SmallInt32FieldNumber = 4;
-    private readonly static int SmallInt32DefaultValue = -2147483647;
-
-    private int smallInt32_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int SmallInt32 {
-      get { if ((_hasBits0 & 4) != 0) { return smallInt32_; } else { return SmallInt32DefaultValue; } }
-      set {
-        _hasBits0 |= 4;
-        smallInt32_ = value;
-      }
-    }
-    /// <summary>Gets whether the "small_int32" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasSmallInt32 {
-      get { return (_hasBits0 & 4) != 0; }
-    }
-    /// <summary>Clears the value of the "small_int32" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearSmallInt32() {
-      _hasBits0 &= ~4;
-    }
-
-    /// <summary>Field number for the "small_int64" field.</summary>
-    public const int SmallInt64FieldNumber = 5;
-    private readonly static long SmallInt64DefaultValue = -9223372036854775807L;
-
-    private long smallInt64_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public long SmallInt64 {
-      get { if ((_hasBits0 & 8) != 0) { return smallInt64_; } else { return SmallInt64DefaultValue; } }
-      set {
-        _hasBits0 |= 8;
-        smallInt64_ = value;
-      }
-    }
-    /// <summary>Gets whether the "small_int64" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasSmallInt64 {
-      get { return (_hasBits0 & 8) != 0; }
-    }
-    /// <summary>Clears the value of the "small_int64" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearSmallInt64() {
-      _hasBits0 &= ~8;
-    }
-
-    /// <summary>Field number for the "really_small_int32" field.</summary>
-    public const int ReallySmallInt32FieldNumber = 21;
-    private readonly static int ReallySmallInt32DefaultValue = -2147483648;
-
-    private int reallySmallInt32_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int ReallySmallInt32 {
-      get { if ((_hasBits0 & 131072) != 0) { return reallySmallInt32_; } else { return ReallySmallInt32DefaultValue; } }
-      set {
-        _hasBits0 |= 131072;
-        reallySmallInt32_ = value;
-      }
-    }
-    /// <summary>Gets whether the "really_small_int32" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasReallySmallInt32 {
-      get { return (_hasBits0 & 131072) != 0; }
-    }
-    /// <summary>Clears the value of the "really_small_int32" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearReallySmallInt32() {
-      _hasBits0 &= ~131072;
-    }
-
-    /// <summary>Field number for the "really_small_int64" field.</summary>
-    public const int ReallySmallInt64FieldNumber = 22;
-    private readonly static long ReallySmallInt64DefaultValue = -9223372036854775808L;
-
-    private long reallySmallInt64_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public long ReallySmallInt64 {
-      get { if ((_hasBits0 & 262144) != 0) { return reallySmallInt64_; } else { return ReallySmallInt64DefaultValue; } }
-      set {
-        _hasBits0 |= 262144;
-        reallySmallInt64_ = value;
-      }
-    }
-    /// <summary>Gets whether the "really_small_int64" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasReallySmallInt64 {
-      get { return (_hasBits0 & 262144) != 0; }
-    }
-    /// <summary>Clears the value of the "really_small_int64" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearReallySmallInt64() {
-      _hasBits0 &= ~262144;
-    }
-
-    /// <summary>Field number for the "utf8_string" field.</summary>
-    public const int Utf8StringFieldNumber = 6;
-    private readonly static string Utf8StringDefaultValue = global::System.Text.Encoding.UTF8.GetString(global::System.Convert.FromBase64String("4Yi0"), 0, 3);
-
-    private string utf8String_;
-    /// <summary>
-    /// The default value here is UTF-8 for "\u1234".  (We could also just type
-    /// the UTF-8 text directly into this text file rather than escape it, but
-    /// lots of people use editors that would be confused by this.)
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string Utf8String {
-      get { return utf8String_ ?? Utf8StringDefaultValue; }
-      set {
-        utf8String_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-    /// <summary>Gets whether the "utf8_string" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasUtf8String {
-      get { return utf8String_ != null; }
-    }
-    /// <summary>Clears the value of the "utf8_string" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearUtf8String() {
-      utf8String_ = null;
-    }
-
-    /// <summary>Field number for the "zero_float" field.</summary>
-    public const int ZeroFloatFieldNumber = 7;
-    private readonly static float ZeroFloatDefaultValue = 0F;
-
-    private float zeroFloat_;
-    /// <summary>
-    /// Tests for single-precision floating-point values.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public float ZeroFloat {
-      get { if ((_hasBits0 & 16) != 0) { return zeroFloat_; } else { return ZeroFloatDefaultValue; } }
-      set {
-        _hasBits0 |= 16;
-        zeroFloat_ = value;
-      }
-    }
-    /// <summary>Gets whether the "zero_float" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasZeroFloat {
-      get { return (_hasBits0 & 16) != 0; }
-    }
-    /// <summary>Clears the value of the "zero_float" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearZeroFloat() {
-      _hasBits0 &= ~16;
-    }
-
-    /// <summary>Field number for the "one_float" field.</summary>
-    public const int OneFloatFieldNumber = 8;
-    private readonly static float OneFloatDefaultValue = 1F;
-
-    private float oneFloat_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public float OneFloat {
-      get { if ((_hasBits0 & 32) != 0) { return oneFloat_; } else { return OneFloatDefaultValue; } }
-      set {
-        _hasBits0 |= 32;
-        oneFloat_ = value;
-      }
-    }
-    /// <summary>Gets whether the "one_float" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasOneFloat {
-      get { return (_hasBits0 & 32) != 0; }
-    }
-    /// <summary>Clears the value of the "one_float" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearOneFloat() {
-      _hasBits0 &= ~32;
-    }
-
-    /// <summary>Field number for the "small_float" field.</summary>
-    public const int SmallFloatFieldNumber = 9;
-    private readonly static float SmallFloatDefaultValue = 1.5F;
-
-    private float smallFloat_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public float SmallFloat {
-      get { if ((_hasBits0 & 64) != 0) { return smallFloat_; } else { return SmallFloatDefaultValue; } }
-      set {
-        _hasBits0 |= 64;
-        smallFloat_ = value;
-      }
-    }
-    /// <summary>Gets whether the "small_float" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasSmallFloat {
-      get { return (_hasBits0 & 64) != 0; }
-    }
-    /// <summary>Clears the value of the "small_float" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearSmallFloat() {
-      _hasBits0 &= ~64;
-    }
-
-    /// <summary>Field number for the "negative_one_float" field.</summary>
-    public const int NegativeOneFloatFieldNumber = 10;
-    private readonly static float NegativeOneFloatDefaultValue = -1F;
-
-    private float negativeOneFloat_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public float NegativeOneFloat {
-      get { if ((_hasBits0 & 128) != 0) { return negativeOneFloat_; } else { return NegativeOneFloatDefaultValue; } }
-      set {
-        _hasBits0 |= 128;
-        negativeOneFloat_ = value;
-      }
-    }
-    /// <summary>Gets whether the "negative_one_float" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasNegativeOneFloat {
-      get { return (_hasBits0 & 128) != 0; }
-    }
-    /// <summary>Clears the value of the "negative_one_float" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearNegativeOneFloat() {
-      _hasBits0 &= ~128;
-    }
-
-    /// <summary>Field number for the "negative_float" field.</summary>
-    public const int NegativeFloatFieldNumber = 11;
-    private readonly static float NegativeFloatDefaultValue = -1.5F;
-
-    private float negativeFloat_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public float NegativeFloat {
-      get { if ((_hasBits0 & 256) != 0) { return negativeFloat_; } else { return NegativeFloatDefaultValue; } }
-      set {
-        _hasBits0 |= 256;
-        negativeFloat_ = value;
-      }
-    }
-    /// <summary>Gets whether the "negative_float" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasNegativeFloat {
-      get { return (_hasBits0 & 256) != 0; }
-    }
-    /// <summary>Clears the value of the "negative_float" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearNegativeFloat() {
-      _hasBits0 &= ~256;
-    }
-
-    /// <summary>Field number for the "large_float" field.</summary>
-    public const int LargeFloatFieldNumber = 12;
-    private readonly static float LargeFloatDefaultValue = 2e+08F;
-
-    private float largeFloat_;
-    /// <summary>
-    /// Using exponents
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public float LargeFloat {
-      get { if ((_hasBits0 & 512) != 0) { return largeFloat_; } else { return LargeFloatDefaultValue; } }
-      set {
-        _hasBits0 |= 512;
-        largeFloat_ = value;
-      }
-    }
-    /// <summary>Gets whether the "large_float" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasLargeFloat {
-      get { return (_hasBits0 & 512) != 0; }
-    }
-    /// <summary>Clears the value of the "large_float" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearLargeFloat() {
-      _hasBits0 &= ~512;
-    }
-
-    /// <summary>Field number for the "small_negative_float" field.</summary>
-    public const int SmallNegativeFloatFieldNumber = 13;
-    private readonly static float SmallNegativeFloatDefaultValue = -8e-28F;
-
-    private float smallNegativeFloat_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public float SmallNegativeFloat {
-      get { if ((_hasBits0 & 1024) != 0) { return smallNegativeFloat_; } else { return SmallNegativeFloatDefaultValue; } }
-      set {
-        _hasBits0 |= 1024;
-        smallNegativeFloat_ = value;
-      }
-    }
-    /// <summary>Gets whether the "small_negative_float" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasSmallNegativeFloat {
-      get { return (_hasBits0 & 1024) != 0; }
-    }
-    /// <summary>Clears the value of the "small_negative_float" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearSmallNegativeFloat() {
-      _hasBits0 &= ~1024;
-    }
-
-    /// <summary>Field number for the "inf_double" field.</summary>
-    public const int InfDoubleFieldNumber = 14;
-    private readonly static double InfDoubleDefaultValue = double.PositiveInfinity;
-
-    private double infDouble_;
-    /// <summary>
-    /// Text for nonfinite floating-point values.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double InfDouble {
-      get { if ((_hasBits0 & 2048) != 0) { return infDouble_; } else { return InfDoubleDefaultValue; } }
-      set {
-        _hasBits0 |= 2048;
-        infDouble_ = value;
-      }
-    }
-    /// <summary>Gets whether the "inf_double" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasInfDouble {
-      get { return (_hasBits0 & 2048) != 0; }
-    }
-    /// <summary>Clears the value of the "inf_double" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearInfDouble() {
-      _hasBits0 &= ~2048;
-    }
-
-    /// <summary>Field number for the "neg_inf_double" field.</summary>
-    public const int NegInfDoubleFieldNumber = 15;
-    private readonly static double NegInfDoubleDefaultValue = double.NegativeInfinity;
-
-    private double negInfDouble_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double NegInfDouble {
-      get { if ((_hasBits0 & 4096) != 0) { return negInfDouble_; } else { return NegInfDoubleDefaultValue; } }
-      set {
-        _hasBits0 |= 4096;
-        negInfDouble_ = value;
-      }
-    }
-    /// <summary>Gets whether the "neg_inf_double" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasNegInfDouble {
-      get { return (_hasBits0 & 4096) != 0; }
-    }
-    /// <summary>Clears the value of the "neg_inf_double" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearNegInfDouble() {
-      _hasBits0 &= ~4096;
-    }
-
-    /// <summary>Field number for the "nan_double" field.</summary>
-    public const int NanDoubleFieldNumber = 16;
-    private readonly static double NanDoubleDefaultValue = double.NaN;
-
-    private double nanDouble_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double NanDouble {
-      get { if ((_hasBits0 & 8192) != 0) { return nanDouble_; } else { return NanDoubleDefaultValue; } }
-      set {
-        _hasBits0 |= 8192;
-        nanDouble_ = value;
-      }
-    }
-    /// <summary>Gets whether the "nan_double" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasNanDouble {
-      get { return (_hasBits0 & 8192) != 0; }
-    }
-    /// <summary>Clears the value of the "nan_double" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearNanDouble() {
-      _hasBits0 &= ~8192;
-    }
-
-    /// <summary>Field number for the "inf_float" field.</summary>
-    public const int InfFloatFieldNumber = 17;
-    private readonly static float InfFloatDefaultValue = float.PositiveInfinity;
-
-    private float infFloat_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public float InfFloat {
-      get { if ((_hasBits0 & 16384) != 0) { return infFloat_; } else { return InfFloatDefaultValue; } }
-      set {
-        _hasBits0 |= 16384;
-        infFloat_ = value;
-      }
-    }
-    /// <summary>Gets whether the "inf_float" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasInfFloat {
-      get { return (_hasBits0 & 16384) != 0; }
-    }
-    /// <summary>Clears the value of the "inf_float" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearInfFloat() {
-      _hasBits0 &= ~16384;
-    }
-
-    /// <summary>Field number for the "neg_inf_float" field.</summary>
-    public const int NegInfFloatFieldNumber = 18;
-    private readonly static float NegInfFloatDefaultValue = float.NegativeInfinity;
-
-    private float negInfFloat_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public float NegInfFloat {
-      get { if ((_hasBits0 & 32768) != 0) { return negInfFloat_; } else { return NegInfFloatDefaultValue; } }
-      set {
-        _hasBits0 |= 32768;
-        negInfFloat_ = value;
-      }
-    }
-    /// <summary>Gets whether the "neg_inf_float" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasNegInfFloat {
-      get { return (_hasBits0 & 32768) != 0; }
-    }
-    /// <summary>Clears the value of the "neg_inf_float" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearNegInfFloat() {
-      _hasBits0 &= ~32768;
-    }
-
-    /// <summary>Field number for the "nan_float" field.</summary>
-    public const int NanFloatFieldNumber = 19;
-    private readonly static float NanFloatDefaultValue = float.NaN;
-
-    private float nanFloat_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public float NanFloat {
-      get { if ((_hasBits0 & 65536) != 0) { return nanFloat_; } else { return NanFloatDefaultValue; } }
-      set {
-        _hasBits0 |= 65536;
-        nanFloat_ = value;
-      }
-    }
-    /// <summary>Gets whether the "nan_float" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasNanFloat {
-      get { return (_hasBits0 & 65536) != 0; }
-    }
-    /// <summary>Clears the value of the "nan_float" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearNanFloat() {
-      _hasBits0 &= ~65536;
-    }
-
-    /// <summary>Field number for the "cpp_trigraph" field.</summary>
-    public const int CppTrigraphFieldNumber = 20;
-    private readonly static string CppTrigraphDefaultValue = global::System.Text.Encoding.UTF8.GetString(global::System.Convert.FromBase64String("PyA/ID8/ID8/ID8/PyA/Py8gPz8t"), 0, 21);
-
-    private string cppTrigraph_;
-    /// <summary>
-    /// Tests for C++ trigraphs.
-    /// Trigraphs should be escaped in C++ generated files, but they should not be
-    /// escaped for other languages.
-    /// Note that in .proto file, "\?" is a valid way to escape ? in string
-    /// literals.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string CppTrigraph {
-      get { return cppTrigraph_ ?? CppTrigraphDefaultValue; }
-      set {
-        cppTrigraph_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-    /// <summary>Gets whether the "cpp_trigraph" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasCppTrigraph {
-      get { return cppTrigraph_ != null; }
-    }
-    /// <summary>Clears the value of the "cpp_trigraph" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearCppTrigraph() {
-      cppTrigraph_ = null;
-    }
-
-    /// <summary>Field number for the "string_with_zero" field.</summary>
-    public const int StringWithZeroFieldNumber = 23;
-    private readonly static string StringWithZeroDefaultValue = global::System.Text.Encoding.UTF8.GetString(global::System.Convert.FromBase64String("aGVsAGxv"), 0, 6);
-
-    private string stringWithZero_;
-    /// <summary>
-    /// String defaults containing the character '\000'
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string StringWithZero {
-      get { return stringWithZero_ ?? StringWithZeroDefaultValue; }
-      set {
-        stringWithZero_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-    /// <summary>Gets whether the "string_with_zero" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasStringWithZero {
-      get { return stringWithZero_ != null; }
-    }
-    /// <summary>Clears the value of the "string_with_zero" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearStringWithZero() {
-      stringWithZero_ = null;
-    }
-
-    /// <summary>Field number for the "bytes_with_zero" field.</summary>
-    public const int BytesWithZeroFieldNumber = 24;
-    private readonly static pb::ByteString BytesWithZeroDefaultValue = pb::ByteString.FromBase64("d29yAGxk");
-
-    private pb::ByteString bytesWithZero_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pb::ByteString BytesWithZero {
-      get { return bytesWithZero_ ?? BytesWithZeroDefaultValue; }
-      set {
-        bytesWithZero_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-    /// <summary>Gets whether the "bytes_with_zero" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasBytesWithZero {
-      get { return bytesWithZero_ != null; }
-    }
-    /// <summary>Clears the value of the "bytes_with_zero" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearBytesWithZero() {
-      bytesWithZero_ = null;
-    }
-
-    /// <summary>Field number for the "string_piece_with_zero" field.</summary>
-    public const int StringPieceWithZeroFieldNumber = 25;
-    private readonly static string StringPieceWithZeroDefaultValue = global::System.Text.Encoding.UTF8.GetString(global::System.Convert.FromBase64String("YWIAYw=="), 0, 4);
-
-    private string stringPieceWithZero_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string StringPieceWithZero {
-      get { return stringPieceWithZero_ ?? StringPieceWithZeroDefaultValue; }
-      set {
-        stringPieceWithZero_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-    /// <summary>Gets whether the "string_piece_with_zero" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasStringPieceWithZero {
-      get { return stringPieceWithZero_ != null; }
-    }
-    /// <summary>Clears the value of the "string_piece_with_zero" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearStringPieceWithZero() {
-      stringPieceWithZero_ = null;
-    }
-
-    /// <summary>Field number for the "cord_with_zero" field.</summary>
-    public const int CordWithZeroFieldNumber = 26;
-    private readonly static string CordWithZeroDefaultValue = global::System.Text.Encoding.UTF8.GetString(global::System.Convert.FromBase64String("MTIAMw=="), 0, 4);
-
-    private string cordWithZero_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string CordWithZero {
-      get { return cordWithZero_ ?? CordWithZeroDefaultValue; }
-      set {
-        cordWithZero_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-    /// <summary>Gets whether the "cord_with_zero" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasCordWithZero {
-      get { return cordWithZero_ != null; }
-    }
-    /// <summary>Clears the value of the "cord_with_zero" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearCordWithZero() {
-      cordWithZero_ = null;
-    }
-
-    /// <summary>Field number for the "replacement_string" field.</summary>
-    public const int ReplacementStringFieldNumber = 27;
-    private readonly static string ReplacementStringDefaultValue = global::System.Text.Encoding.UTF8.GetString(global::System.Convert.FromBase64String("JHt1bmtub3dufQ=="), 0, 10);
-
-    private string replacementString_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string ReplacementString {
-      get { return replacementString_ ?? ReplacementStringDefaultValue; }
-      set {
-        replacementString_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-    /// <summary>Gets whether the "replacement_string" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasReplacementString {
-      get { return replacementString_ != null; }
-    }
-    /// <summary>Clears the value of the "replacement_string" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearReplacementString() {
-      replacementString_ = null;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as TestExtremeDefaultValues);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(TestExtremeDefaultValues other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (EscapedBytes != other.EscapedBytes) return false;
-      if (LargeUint32 != other.LargeUint32) return false;
-      if (LargeUint64 != other.LargeUint64) return false;
-      if (SmallInt32 != other.SmallInt32) return false;
-      if (SmallInt64 != other.SmallInt64) return false;
-      if (ReallySmallInt32 != other.ReallySmallInt32) return false;
-      if (ReallySmallInt64 != other.ReallySmallInt64) return false;
-      if (Utf8String != other.Utf8String) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.Equals(ZeroFloat, other.ZeroFloat)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.Equals(OneFloat, other.OneFloat)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.Equals(SmallFloat, other.SmallFloat)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.Equals(NegativeOneFloat, other.NegativeOneFloat)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.Equals(NegativeFloat, other.NegativeFloat)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.Equals(LargeFloat, other.LargeFloat)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.Equals(SmallNegativeFloat, other.SmallNegativeFloat)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.Equals(InfDouble, other.InfDouble)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.Equals(NegInfDouble, other.NegInfDouble)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.Equals(NanDouble, other.NanDouble)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.Equals(InfFloat, other.InfFloat)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.Equals(NegInfFloat, other.NegInfFloat)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.Equals(NanFloat, other.NanFloat)) return false;
-      if (CppTrigraph != other.CppTrigraph) return false;
-      if (StringWithZero != other.StringWithZero) return false;
-      if (BytesWithZero != other.BytesWithZero) return false;
-      if (StringPieceWithZero != other.StringPieceWithZero) return false;
-      if (CordWithZero != other.CordWithZero) return false;
-      if (ReplacementString != other.ReplacementString) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (HasEscapedBytes) hash ^= EscapedBytes.GetHashCode();
-      if (HasLargeUint32) hash ^= LargeUint32.GetHashCode();
-      if (HasLargeUint64) hash ^= LargeUint64.GetHashCode();
-      if (HasSmallInt32) hash ^= SmallInt32.GetHashCode();
-      if (HasSmallInt64) hash ^= SmallInt64.GetHashCode();
-      if (HasReallySmallInt32) hash ^= ReallySmallInt32.GetHashCode();
-      if (HasReallySmallInt64) hash ^= ReallySmallInt64.GetHashCode();
-      if (HasUtf8String) hash ^= Utf8String.GetHashCode();
-      if (HasZeroFloat) hash ^= pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.GetHashCode(ZeroFloat);
-      if (HasOneFloat) hash ^= pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.GetHashCode(OneFloat);
-      if (HasSmallFloat) hash ^= pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.GetHashCode(SmallFloat);
-      if (HasNegativeOneFloat) hash ^= pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.GetHashCode(NegativeOneFloat);
-      if (HasNegativeFloat) hash ^= pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.GetHashCode(NegativeFloat);
-      if (HasLargeFloat) hash ^= pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.GetHashCode(LargeFloat);
-      if (HasSmallNegativeFloat) hash ^= pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.GetHashCode(SmallNegativeFloat);
-      if (HasInfDouble) hash ^= pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.GetHashCode(InfDouble);
-      if (HasNegInfDouble) hash ^= pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.GetHashCode(NegInfDouble);
-      if (HasNanDouble) hash ^= pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.GetHashCode(NanDouble);
-      if (HasInfFloat) hash ^= pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.GetHashCode(InfFloat);
-      if (HasNegInfFloat) hash ^= pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.GetHashCode(NegInfFloat);
-      if (HasNanFloat) hash ^= pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.GetHashCode(NanFloat);
-      if (HasCppTrigraph) hash ^= CppTrigraph.GetHashCode();
-      if (HasStringWithZero) hash ^= StringWithZero.GetHashCode();
-      if (HasBytesWithZero) hash ^= BytesWithZero.GetHashCode();
-      if (HasStringPieceWithZero) hash ^= StringPieceWithZero.GetHashCode();
-      if (HasCordWithZero) hash ^= CordWithZero.GetHashCode();
-      if (HasReplacementString) hash ^= ReplacementString.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (HasEscapedBytes) {
-        output.WriteRawTag(10);
-        output.WriteBytes(EscapedBytes);
-      }
-      if (HasLargeUint32) {
-        output.WriteRawTag(16);
-        output.WriteUInt32(LargeUint32);
-      }
-      if (HasLargeUint64) {
-        output.WriteRawTag(24);
-        output.WriteUInt64(LargeUint64);
-      }
-      if (HasSmallInt32) {
-        output.WriteRawTag(32);
-        output.WriteInt32(SmallInt32);
-      }
-      if (HasSmallInt64) {
-        output.WriteRawTag(40);
-        output.WriteInt64(SmallInt64);
-      }
-      if (HasUtf8String) {
-        output.WriteRawTag(50);
-        output.WriteString(Utf8String);
-      }
-      if (HasZeroFloat) {
-        output.WriteRawTag(61);
-        output.WriteFloat(ZeroFloat);
-      }
-      if (HasOneFloat) {
-        output.WriteRawTag(69);
-        output.WriteFloat(OneFloat);
-      }
-      if (HasSmallFloat) {
-        output.WriteRawTag(77);
-        output.WriteFloat(SmallFloat);
-      }
-      if (HasNegativeOneFloat) {
-        output.WriteRawTag(85);
-        output.WriteFloat(NegativeOneFloat);
-      }
-      if (HasNegativeFloat) {
-        output.WriteRawTag(93);
-        output.WriteFloat(NegativeFloat);
-      }
-      if (HasLargeFloat) {
-        output.WriteRawTag(101);
-        output.WriteFloat(LargeFloat);
-      }
-      if (HasSmallNegativeFloat) {
-        output.WriteRawTag(109);
-        output.WriteFloat(SmallNegativeFloat);
-      }
-      if (HasInfDouble) {
-        output.WriteRawTag(113);
-        output.WriteDouble(InfDouble);
-      }
-      if (HasNegInfDouble) {
-        output.WriteRawTag(121);
-        output.WriteDouble(NegInfDouble);
-      }
-      if (HasNanDouble) {
-        output.WriteRawTag(129, 1);
-        output.WriteDouble(NanDouble);
-      }
-      if (HasInfFloat) {
-        output.WriteRawTag(141, 1);
-        output.WriteFloat(InfFloat);
-      }
-      if (HasNegInfFloat) {
-        output.WriteRawTag(149, 1);
-        output.WriteFloat(NegInfFloat);
-      }
-      if (HasNanFloat) {
-        output.WriteRawTag(157, 1);
-        output.WriteFloat(NanFloat);
-      }
-      if (HasCppTrigraph) {
-        output.WriteRawTag(162, 1);
-        output.WriteString(CppTrigraph);
-      }
-      if (HasReallySmallInt32) {
-        output.WriteRawTag(168, 1);
-        output.WriteInt32(ReallySmallInt32);
-      }
-      if (HasReallySmallInt64) {
-        output.WriteRawTag(176, 1);
-        output.WriteInt64(ReallySmallInt64);
-      }
-      if (HasStringWithZero) {
-        output.WriteRawTag(186, 1);
-        output.WriteString(StringWithZero);
-      }
-      if (HasBytesWithZero) {
-        output.WriteRawTag(194, 1);
-        output.WriteBytes(BytesWithZero);
-      }
-      if (HasStringPieceWithZero) {
-        output.WriteRawTag(202, 1);
-        output.WriteString(StringPieceWithZero);
-      }
-      if (HasCordWithZero) {
-        output.WriteRawTag(210, 1);
-        output.WriteString(CordWithZero);
-      }
-      if (HasReplacementString) {
-        output.WriteRawTag(218, 1);
-        output.WriteString(ReplacementString);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (HasEscapedBytes) {
-        output.WriteRawTag(10);
-        output.WriteBytes(EscapedBytes);
-      }
-      if (HasLargeUint32) {
-        output.WriteRawTag(16);
-        output.WriteUInt32(LargeUint32);
-      }
-      if (HasLargeUint64) {
-        output.WriteRawTag(24);
-        output.WriteUInt64(LargeUint64);
-      }
-      if (HasSmallInt32) {
-        output.WriteRawTag(32);
-        output.WriteInt32(SmallInt32);
-      }
-      if (HasSmallInt64) {
-        output.WriteRawTag(40);
-        output.WriteInt64(SmallInt64);
-      }
-      if (HasUtf8String) {
-        output.WriteRawTag(50);
-        output.WriteString(Utf8String);
-      }
-      if (HasZeroFloat) {
-        output.WriteRawTag(61);
-        output.WriteFloat(ZeroFloat);
-      }
-      if (HasOneFloat) {
-        output.WriteRawTag(69);
-        output.WriteFloat(OneFloat);
-      }
-      if (HasSmallFloat) {
-        output.WriteRawTag(77);
-        output.WriteFloat(SmallFloat);
-      }
-      if (HasNegativeOneFloat) {
-        output.WriteRawTag(85);
-        output.WriteFloat(NegativeOneFloat);
-      }
-      if (HasNegativeFloat) {
-        output.WriteRawTag(93);
-        output.WriteFloat(NegativeFloat);
-      }
-      if (HasLargeFloat) {
-        output.WriteRawTag(101);
-        output.WriteFloat(LargeFloat);
-      }
-      if (HasSmallNegativeFloat) {
-        output.WriteRawTag(109);
-        output.WriteFloat(SmallNegativeFloat);
-      }
-      if (HasInfDouble) {
-        output.WriteRawTag(113);
-        output.WriteDouble(InfDouble);
-      }
-      if (HasNegInfDouble) {
-        output.WriteRawTag(121);
-        output.WriteDouble(NegInfDouble);
-      }
-      if (HasNanDouble) {
-        output.WriteRawTag(129, 1);
-        output.WriteDouble(NanDouble);
-      }
-      if (HasInfFloat) {
-        output.WriteRawTag(141, 1);
-        output.WriteFloat(InfFloat);
-      }
-      if (HasNegInfFloat) {
-        output.WriteRawTag(149, 1);
-        output.WriteFloat(NegInfFloat);
-      }
-      if (HasNanFloat) {
-        output.WriteRawTag(157, 1);
-        output.WriteFloat(NanFloat);
-      }
-      if (HasCppTrigraph) {
-        output.WriteRawTag(162, 1);
-        output.WriteString(CppTrigraph);
-      }
-      if (HasReallySmallInt32) {
-        output.WriteRawTag(168, 1);
-        output.WriteInt32(ReallySmallInt32);
-      }
-      if (HasReallySmallInt64) {
-        output.WriteRawTag(176, 1);
-        output.WriteInt64(ReallySmallInt64);
-      }
-      if (HasStringWithZero) {
-        output.WriteRawTag(186, 1);
-        output.WriteString(StringWithZero);
-      }
-      if (HasBytesWithZero) {
-        output.WriteRawTag(194, 1);
-        output.WriteBytes(BytesWithZero);
-      }
-      if (HasStringPieceWithZero) {
-        output.WriteRawTag(202, 1);
-        output.WriteString(StringPieceWithZero);
-      }
-      if (HasCordWithZero) {
-        output.WriteRawTag(210, 1);
-        output.WriteString(CordWithZero);
-      }
-      if (HasReplacementString) {
-        output.WriteRawTag(218, 1);
-        output.WriteString(ReplacementString);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (HasEscapedBytes) {
-        size += 1 + pb::CodedOutputStream.ComputeBytesSize(EscapedBytes);
-      }
-      if (HasLargeUint32) {
-        size += 1 + pb::CodedOutputStream.ComputeUInt32Size(LargeUint32);
-      }
-      if (HasLargeUint64) {
-        size += 1 + pb::CodedOutputStream.ComputeUInt64Size(LargeUint64);
-      }
-      if (HasSmallInt32) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(SmallInt32);
-      }
-      if (HasSmallInt64) {
-        size += 1 + pb::CodedOutputStream.ComputeInt64Size(SmallInt64);
-      }
-      if (HasReallySmallInt32) {
-        size += 2 + pb::CodedOutputStream.ComputeInt32Size(ReallySmallInt32);
-      }
-      if (HasReallySmallInt64) {
-        size += 2 + pb::CodedOutputStream.ComputeInt64Size(ReallySmallInt64);
-      }
-      if (HasUtf8String) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(Utf8String);
-      }
-      if (HasZeroFloat) {
-        size += 1 + 4;
-      }
-      if (HasOneFloat) {
-        size += 1 + 4;
-      }
-      if (HasSmallFloat) {
-        size += 1 + 4;
-      }
-      if (HasNegativeOneFloat) {
-        size += 1 + 4;
-      }
-      if (HasNegativeFloat) {
-        size += 1 + 4;
-      }
-      if (HasLargeFloat) {
-        size += 1 + 4;
-      }
-      if (HasSmallNegativeFloat) {
-        size += 1 + 4;
-      }
-      if (HasInfDouble) {
-        size += 1 + 8;
-      }
-      if (HasNegInfDouble) {
-        size += 1 + 8;
-      }
-      if (HasNanDouble) {
-        size += 2 + 8;
-      }
-      if (HasInfFloat) {
-        size += 2 + 4;
-      }
-      if (HasNegInfFloat) {
-        size += 2 + 4;
-      }
-      if (HasNanFloat) {
-        size += 2 + 4;
-      }
-      if (HasCppTrigraph) {
-        size += 2 + pb::CodedOutputStream.ComputeStringSize(CppTrigraph);
-      }
-      if (HasStringWithZero) {
-        size += 2 + pb::CodedOutputStream.ComputeStringSize(StringWithZero);
-      }
-      if (HasBytesWithZero) {
-        size += 2 + pb::CodedOutputStream.ComputeBytesSize(BytesWithZero);
-      }
-      if (HasStringPieceWithZero) {
-        size += 2 + pb::CodedOutputStream.ComputeStringSize(StringPieceWithZero);
-      }
-      if (HasCordWithZero) {
-        size += 2 + pb::CodedOutputStream.ComputeStringSize(CordWithZero);
-      }
-      if (HasReplacementString) {
-        size += 2 + pb::CodedOutputStream.ComputeStringSize(ReplacementString);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(TestExtremeDefaultValues other) {
-      if (other == null) {
-        return;
-      }
-      if (other.HasEscapedBytes) {
-        EscapedBytes = other.EscapedBytes;
-      }
-      if (other.HasLargeUint32) {
-        LargeUint32 = other.LargeUint32;
-      }
-      if (other.HasLargeUint64) {
-        LargeUint64 = other.LargeUint64;
-      }
-      if (other.HasSmallInt32) {
-        SmallInt32 = other.SmallInt32;
-      }
-      if (other.HasSmallInt64) {
-        SmallInt64 = other.SmallInt64;
-      }
-      if (other.HasReallySmallInt32) {
-        ReallySmallInt32 = other.ReallySmallInt32;
-      }
-      if (other.HasReallySmallInt64) {
-        ReallySmallInt64 = other.ReallySmallInt64;
-      }
-      if (other.HasUtf8String) {
-        Utf8String = other.Utf8String;
-      }
-      if (other.HasZeroFloat) {
-        ZeroFloat = other.ZeroFloat;
-      }
-      if (other.HasOneFloat) {
-        OneFloat = other.OneFloat;
-      }
-      if (other.HasSmallFloat) {
-        SmallFloat = other.SmallFloat;
-      }
-      if (other.HasNegativeOneFloat) {
-        NegativeOneFloat = other.NegativeOneFloat;
-      }
-      if (other.HasNegativeFloat) {
-        NegativeFloat = other.NegativeFloat;
-      }
-      if (other.HasLargeFloat) {
-        LargeFloat = other.LargeFloat;
-      }
-      if (other.HasSmallNegativeFloat) {
-        SmallNegativeFloat = other.SmallNegativeFloat;
-      }
-      if (other.HasInfDouble) {
-        InfDouble = other.InfDouble;
-      }
-      if (other.HasNegInfDouble) {
-        NegInfDouble = other.NegInfDouble;
-      }
-      if (other.HasNanDouble) {
-        NanDouble = other.NanDouble;
-      }
-      if (other.HasInfFloat) {
-        InfFloat = other.InfFloat;
-      }
-      if (other.HasNegInfFloat) {
-        NegInfFloat = other.NegInfFloat;
-      }
-      if (other.HasNanFloat) {
-        NanFloat = other.NanFloat;
-      }
-      if (other.HasCppTrigraph) {
-        CppTrigraph = other.CppTrigraph;
-      }
-      if (other.HasStringWithZero) {
-        StringWithZero = other.StringWithZero;
-      }
-      if (other.HasBytesWithZero) {
-        BytesWithZero = other.BytesWithZero;
-      }
-      if (other.HasStringPieceWithZero) {
-        StringPieceWithZero = other.StringPieceWithZero;
-      }
-      if (other.HasCordWithZero) {
-        CordWithZero = other.CordWithZero;
-      }
-      if (other.HasReplacementString) {
-        ReplacementString = other.ReplacementString;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 10: {
-            EscapedBytes = input.ReadBytes();
-            break;
-          }
-          case 16: {
-            LargeUint32 = input.ReadUInt32();
-            break;
-          }
-          case 24: {
-            LargeUint64 = input.ReadUInt64();
-            break;
-          }
-          case 32: {
-            SmallInt32 = input.ReadInt32();
-            break;
-          }
-          case 40: {
-            SmallInt64 = input.ReadInt64();
-            break;
-          }
-          case 50: {
-            Utf8String = input.ReadString();
-            break;
-          }
-          case 61: {
-            ZeroFloat = input.ReadFloat();
-            break;
-          }
-          case 69: {
-            OneFloat = input.ReadFloat();
-            break;
-          }
-          case 77: {
-            SmallFloat = input.ReadFloat();
-            break;
-          }
-          case 85: {
-            NegativeOneFloat = input.ReadFloat();
-            break;
-          }
-          case 93: {
-            NegativeFloat = input.ReadFloat();
-            break;
-          }
-          case 101: {
-            LargeFloat = input.ReadFloat();
-            break;
-          }
-          case 109: {
-            SmallNegativeFloat = input.ReadFloat();
-            break;
-          }
-          case 113: {
-            InfDouble = input.ReadDouble();
-            break;
-          }
-          case 121: {
-            NegInfDouble = input.ReadDouble();
-            break;
-          }
-          case 129: {
-            NanDouble = input.ReadDouble();
-            break;
-          }
-          case 141: {
-            InfFloat = input.ReadFloat();
-            break;
-          }
-          case 149: {
-            NegInfFloat = input.ReadFloat();
-            break;
-          }
-          case 157: {
-            NanFloat = input.ReadFloat();
-            break;
-          }
-          case 162: {
-            CppTrigraph = input.ReadString();
-            break;
-          }
-          case 168: {
-            ReallySmallInt32 = input.ReadInt32();
-            break;
-          }
-          case 176: {
-            ReallySmallInt64 = input.ReadInt64();
-            break;
-          }
-          case 186: {
-            StringWithZero = input.ReadString();
-            break;
-          }
-          case 194: {
-            BytesWithZero = input.ReadBytes();
-            break;
-          }
-          case 202: {
-            StringPieceWithZero = input.ReadString();
-            break;
-          }
-          case 210: {
-            CordWithZero = input.ReadString();
-            break;
-          }
-          case 218: {
-            ReplacementString = input.ReadString();
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 10: {
-            EscapedBytes = input.ReadBytes();
-            break;
-          }
-          case 16: {
-            LargeUint32 = input.ReadUInt32();
-            break;
-          }
-          case 24: {
-            LargeUint64 = input.ReadUInt64();
-            break;
-          }
-          case 32: {
-            SmallInt32 = input.ReadInt32();
-            break;
-          }
-          case 40: {
-            SmallInt64 = input.ReadInt64();
-            break;
-          }
-          case 50: {
-            Utf8String = input.ReadString();
-            break;
-          }
-          case 61: {
-            ZeroFloat = input.ReadFloat();
-            break;
-          }
-          case 69: {
-            OneFloat = input.ReadFloat();
-            break;
-          }
-          case 77: {
-            SmallFloat = input.ReadFloat();
-            break;
-          }
-          case 85: {
-            NegativeOneFloat = input.ReadFloat();
-            break;
-          }
-          case 93: {
-            NegativeFloat = input.ReadFloat();
-            break;
-          }
-          case 101: {
-            LargeFloat = input.ReadFloat();
-            break;
-          }
-          case 109: {
-            SmallNegativeFloat = input.ReadFloat();
-            break;
-          }
-          case 113: {
-            InfDouble = input.ReadDouble();
-            break;
-          }
-          case 121: {
-            NegInfDouble = input.ReadDouble();
-            break;
-          }
-          case 129: {
-            NanDouble = input.ReadDouble();
-            break;
-          }
-          case 141: {
-            InfFloat = input.ReadFloat();
-            break;
-          }
-          case 149: {
-            NegInfFloat = input.ReadFloat();
-            break;
-          }
-          case 157: {
-            NanFloat = input.ReadFloat();
-            break;
-          }
-          case 162: {
-            CppTrigraph = input.ReadString();
-            break;
-          }
-          case 168: {
-            ReallySmallInt32 = input.ReadInt32();
-            break;
-          }
-          case 176: {
-            ReallySmallInt64 = input.ReadInt64();
-            break;
-          }
-          case 186: {
-            StringWithZero = input.ReadString();
-            break;
-          }
-          case 194: {
-            BytesWithZero = input.ReadBytes();
-            break;
-          }
-          case 202: {
-            StringPieceWithZero = input.ReadString();
-            break;
-          }
-          case 210: {
-            CordWithZero = input.ReadString();
-            break;
-          }
-          case 218: {
-            ReplacementString = input.ReadString();
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  public sealed partial class SparseEnumMessage : pb::IMessage<SparseEnumMessage>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<SparseEnumMessage> _parser = new pb::MessageParser<SparseEnumMessage>(() => new SparseEnumMessage());
-    private pb::UnknownFieldSet _unknownFields;
-    private int _hasBits0;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<SparseEnumMessage> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.Proto2.UnittestReflection.Descriptor.MessageTypes[33]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public SparseEnumMessage() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public SparseEnumMessage(SparseEnumMessage other) : this() {
-      _hasBits0 = other._hasBits0;
-      sparseEnum_ = other.sparseEnum_;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public SparseEnumMessage Clone() {
-      return new SparseEnumMessage(this);
-    }
-
-    /// <summary>Field number for the "sparse_enum" field.</summary>
-    public const int SparseEnumFieldNumber = 1;
-    private readonly static global::Google.Protobuf.TestProtos.Proto2.TestSparseEnum SparseEnumDefaultValue = global::Google.Protobuf.TestProtos.Proto2.TestSparseEnum.SparseA;
-
-    private global::Google.Protobuf.TestProtos.Proto2.TestSparseEnum sparseEnum_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.TestProtos.Proto2.TestSparseEnum SparseEnum {
-      get { if ((_hasBits0 & 1) != 0) { return sparseEnum_; } else { return SparseEnumDefaultValue; } }
-      set {
-        _hasBits0 |= 1;
-        sparseEnum_ = value;
-      }
-    }
-    /// <summary>Gets whether the "sparse_enum" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasSparseEnum {
-      get { return (_hasBits0 & 1) != 0; }
-    }
-    /// <summary>Clears the value of the "sparse_enum" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearSparseEnum() {
-      _hasBits0 &= ~1;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as SparseEnumMessage);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(SparseEnumMessage other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (SparseEnum != other.SparseEnum) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (HasSparseEnum) hash ^= SparseEnum.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (HasSparseEnum) {
-        output.WriteRawTag(8);
-        output.WriteEnum((int) SparseEnum);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (HasSparseEnum) {
-        output.WriteRawTag(8);
-        output.WriteEnum((int) SparseEnum);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (HasSparseEnum) {
-        size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) SparseEnum);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(SparseEnumMessage other) {
-      if (other == null) {
-        return;
-      }
-      if (other.HasSparseEnum) {
-        SparseEnum = other.SparseEnum;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 8: {
-            SparseEnum = (global::Google.Protobuf.TestProtos.Proto2.TestSparseEnum) input.ReadEnum();
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 8: {
-            SparseEnum = (global::Google.Protobuf.TestProtos.Proto2.TestSparseEnum) input.ReadEnum();
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  /// <summary>
-  /// Test String and Bytes: string is for valid UTF-8 strings
-  /// </summary>
-  public sealed partial class OneString : pb::IMessage<OneString>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<OneString> _parser = new pb::MessageParser<OneString>(() => new OneString());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<OneString> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.Proto2.UnittestReflection.Descriptor.MessageTypes[34]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public OneString() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public OneString(OneString other) : this() {
-      data_ = other.data_;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public OneString Clone() {
-      return new OneString(this);
-    }
-
-    /// <summary>Field number for the "data" field.</summary>
-    public const int DataFieldNumber = 1;
-    private readonly static string DataDefaultValue = "";
-
-    private string data_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string Data {
-      get { return data_ ?? DataDefaultValue; }
-      set {
-        data_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-    /// <summary>Gets whether the "data" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasData {
-      get { return data_ != null; }
-    }
-    /// <summary>Clears the value of the "data" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearData() {
-      data_ = null;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as OneString);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(OneString other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (Data != other.Data) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (HasData) hash ^= Data.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (HasData) {
-        output.WriteRawTag(10);
-        output.WriteString(Data);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (HasData) {
-        output.WriteRawTag(10);
-        output.WriteString(Data);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (HasData) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(Data);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(OneString other) {
-      if (other == null) {
-        return;
-      }
-      if (other.HasData) {
-        Data = other.Data;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 10: {
-            Data = input.ReadString();
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 10: {
-            Data = input.ReadString();
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  public sealed partial class MoreString : pb::IMessage<MoreString>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<MoreString> _parser = new pb::MessageParser<MoreString>(() => new MoreString());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<MoreString> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.Proto2.UnittestReflection.Descriptor.MessageTypes[35]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public MoreString() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public MoreString(MoreString other) : this() {
-      data_ = other.data_.Clone();
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public MoreString Clone() {
-      return new MoreString(this);
-    }
-
-    /// <summary>Field number for the "data" field.</summary>
-    public const int DataFieldNumber = 1;
-    private static readonly pb::FieldCodec<string> _repeated_data_codec
-        = pb::FieldCodec.ForString(10);
-    private readonly pbc::RepeatedField<string> data_ = new pbc::RepeatedField<string>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<string> Data {
-      get { return data_; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as MoreString);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(MoreString other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if(!data_.Equals(other.data_)) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      hash ^= data_.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      data_.WriteTo(output, _repeated_data_codec);
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      data_.WriteTo(ref output, _repeated_data_codec);
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      size += data_.CalculateSize(_repeated_data_codec);
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(MoreString other) {
-      if (other == null) {
-        return;
-      }
-      data_.Add(other.data_);
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 10: {
-            data_.AddEntriesFrom(input, _repeated_data_codec);
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 10: {
-            data_.AddEntriesFrom(ref input, _repeated_data_codec);
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  public sealed partial class OneBytes : pb::IMessage<OneBytes>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<OneBytes> _parser = new pb::MessageParser<OneBytes>(() => new OneBytes());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<OneBytes> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.Proto2.UnittestReflection.Descriptor.MessageTypes[36]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public OneBytes() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public OneBytes(OneBytes other) : this() {
-      data_ = other.data_;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public OneBytes Clone() {
-      return new OneBytes(this);
-    }
-
-    /// <summary>Field number for the "data" field.</summary>
-    public const int DataFieldNumber = 1;
-    private readonly static pb::ByteString DataDefaultValue = pb::ByteString.Empty;
-
-    private pb::ByteString data_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pb::ByteString Data {
-      get { return data_ ?? DataDefaultValue; }
-      set {
-        data_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-    /// <summary>Gets whether the "data" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasData {
-      get { return data_ != null; }
-    }
-    /// <summary>Clears the value of the "data" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearData() {
-      data_ = null;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as OneBytes);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(OneBytes other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (Data != other.Data) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (HasData) hash ^= Data.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (HasData) {
-        output.WriteRawTag(10);
-        output.WriteBytes(Data);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (HasData) {
-        output.WriteRawTag(10);
-        output.WriteBytes(Data);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (HasData) {
-        size += 1 + pb::CodedOutputStream.ComputeBytesSize(Data);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(OneBytes other) {
-      if (other == null) {
-        return;
-      }
-      if (other.HasData) {
-        Data = other.Data;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 10: {
-            Data = input.ReadBytes();
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 10: {
-            Data = input.ReadBytes();
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  public sealed partial class MoreBytes : pb::IMessage<MoreBytes>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<MoreBytes> _parser = new pb::MessageParser<MoreBytes>(() => new MoreBytes());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<MoreBytes> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.Proto2.UnittestReflection.Descriptor.MessageTypes[37]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public MoreBytes() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public MoreBytes(MoreBytes other) : this() {
-      data_ = other.data_.Clone();
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public MoreBytes Clone() {
-      return new MoreBytes(this);
-    }
-
-    /// <summary>Field number for the "data" field.</summary>
-    public const int DataFieldNumber = 1;
-    private static readonly pb::FieldCodec<pb::ByteString> _repeated_data_codec
-        = pb::FieldCodec.ForBytes(10);
-    private readonly pbc::RepeatedField<pb::ByteString> data_ = new pbc::RepeatedField<pb::ByteString>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<pb::ByteString> Data {
-      get { return data_; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as MoreBytes);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(MoreBytes other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if(!data_.Equals(other.data_)) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      hash ^= data_.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      data_.WriteTo(output, _repeated_data_codec);
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      data_.WriteTo(ref output, _repeated_data_codec);
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      size += data_.CalculateSize(_repeated_data_codec);
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(MoreBytes other) {
-      if (other == null) {
-        return;
-      }
-      data_.Add(other.data_);
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 10: {
-            data_.AddEntriesFrom(input, _repeated_data_codec);
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 10: {
-            data_.AddEntriesFrom(ref input, _repeated_data_codec);
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  /// <summary>
-  /// Test int32, uint32, int64, uint64, and bool are all compatible
-  /// </summary>
-  public sealed partial class Int32Message : pb::IMessage<Int32Message>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<Int32Message> _parser = new pb::MessageParser<Int32Message>(() => new Int32Message());
-    private pb::UnknownFieldSet _unknownFields;
-    private int _hasBits0;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<Int32Message> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.Proto2.UnittestReflection.Descriptor.MessageTypes[38]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Int32Message() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Int32Message(Int32Message other) : this() {
-      _hasBits0 = other._hasBits0;
-      data_ = other.data_;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Int32Message Clone() {
-      return new Int32Message(this);
-    }
-
-    /// <summary>Field number for the "data" field.</summary>
-    public const int DataFieldNumber = 1;
-    private readonly static int DataDefaultValue = 0;
-
-    private int data_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int Data {
-      get { if ((_hasBits0 & 1) != 0) { return data_; } else { return DataDefaultValue; } }
-      set {
-        _hasBits0 |= 1;
-        data_ = value;
-      }
-    }
-    /// <summary>Gets whether the "data" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasData {
-      get { return (_hasBits0 & 1) != 0; }
-    }
-    /// <summary>Clears the value of the "data" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearData() {
-      _hasBits0 &= ~1;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as Int32Message);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(Int32Message other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (Data != other.Data) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (HasData) hash ^= Data.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (HasData) {
-        output.WriteRawTag(8);
-        output.WriteInt32(Data);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (HasData) {
-        output.WriteRawTag(8);
-        output.WriteInt32(Data);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (HasData) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(Data);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(Int32Message other) {
-      if (other == null) {
-        return;
-      }
-      if (other.HasData) {
-        Data = other.Data;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 8: {
-            Data = input.ReadInt32();
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 8: {
-            Data = input.ReadInt32();
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  public sealed partial class Uint32Message : pb::IMessage<Uint32Message>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<Uint32Message> _parser = new pb::MessageParser<Uint32Message>(() => new Uint32Message());
-    private pb::UnknownFieldSet _unknownFields;
-    private int _hasBits0;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<Uint32Message> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.Proto2.UnittestReflection.Descriptor.MessageTypes[39]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Uint32Message() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Uint32Message(Uint32Message other) : this() {
-      _hasBits0 = other._hasBits0;
-      data_ = other.data_;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Uint32Message Clone() {
-      return new Uint32Message(this);
-    }
-
-    /// <summary>Field number for the "data" field.</summary>
-    public const int DataFieldNumber = 1;
-    private readonly static uint DataDefaultValue = 0;
-
-    private uint data_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public uint Data {
-      get { if ((_hasBits0 & 1) != 0) { return data_; } else { return DataDefaultValue; } }
-      set {
-        _hasBits0 |= 1;
-        data_ = value;
-      }
-    }
-    /// <summary>Gets whether the "data" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasData {
-      get { return (_hasBits0 & 1) != 0; }
-    }
-    /// <summary>Clears the value of the "data" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearData() {
-      _hasBits0 &= ~1;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as Uint32Message);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(Uint32Message other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (Data != other.Data) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (HasData) hash ^= Data.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (HasData) {
-        output.WriteRawTag(8);
-        output.WriteUInt32(Data);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (HasData) {
-        output.WriteRawTag(8);
-        output.WriteUInt32(Data);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (HasData) {
-        size += 1 + pb::CodedOutputStream.ComputeUInt32Size(Data);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(Uint32Message other) {
-      if (other == null) {
-        return;
-      }
-      if (other.HasData) {
-        Data = other.Data;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 8: {
-            Data = input.ReadUInt32();
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 8: {
-            Data = input.ReadUInt32();
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  public sealed partial class Int64Message : pb::IMessage<Int64Message>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<Int64Message> _parser = new pb::MessageParser<Int64Message>(() => new Int64Message());
-    private pb::UnknownFieldSet _unknownFields;
-    private int _hasBits0;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<Int64Message> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.Proto2.UnittestReflection.Descriptor.MessageTypes[40]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Int64Message() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Int64Message(Int64Message other) : this() {
-      _hasBits0 = other._hasBits0;
-      data_ = other.data_;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Int64Message Clone() {
-      return new Int64Message(this);
-    }
-
-    /// <summary>Field number for the "data" field.</summary>
-    public const int DataFieldNumber = 1;
-    private readonly static long DataDefaultValue = 0L;
-
-    private long data_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public long Data {
-      get { if ((_hasBits0 & 1) != 0) { return data_; } else { return DataDefaultValue; } }
-      set {
-        _hasBits0 |= 1;
-        data_ = value;
-      }
-    }
-    /// <summary>Gets whether the "data" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasData {
-      get { return (_hasBits0 & 1) != 0; }
-    }
-    /// <summary>Clears the value of the "data" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearData() {
-      _hasBits0 &= ~1;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as Int64Message);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(Int64Message other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (Data != other.Data) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (HasData) hash ^= Data.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (HasData) {
-        output.WriteRawTag(8);
-        output.WriteInt64(Data);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (HasData) {
-        output.WriteRawTag(8);
-        output.WriteInt64(Data);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (HasData) {
-        size += 1 + pb::CodedOutputStream.ComputeInt64Size(Data);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(Int64Message other) {
-      if (other == null) {
-        return;
-      }
-      if (other.HasData) {
-        Data = other.Data;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 8: {
-            Data = input.ReadInt64();
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 8: {
-            Data = input.ReadInt64();
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  public sealed partial class Uint64Message : pb::IMessage<Uint64Message>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<Uint64Message> _parser = new pb::MessageParser<Uint64Message>(() => new Uint64Message());
-    private pb::UnknownFieldSet _unknownFields;
-    private int _hasBits0;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<Uint64Message> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.Proto2.UnittestReflection.Descriptor.MessageTypes[41]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Uint64Message() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Uint64Message(Uint64Message other) : this() {
-      _hasBits0 = other._hasBits0;
-      data_ = other.data_;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Uint64Message Clone() {
-      return new Uint64Message(this);
-    }
-
-    /// <summary>Field number for the "data" field.</summary>
-    public const int DataFieldNumber = 1;
-    private readonly static ulong DataDefaultValue = 0UL;
-
-    private ulong data_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ulong Data {
-      get { if ((_hasBits0 & 1) != 0) { return data_; } else { return DataDefaultValue; } }
-      set {
-        _hasBits0 |= 1;
-        data_ = value;
-      }
-    }
-    /// <summary>Gets whether the "data" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasData {
-      get { return (_hasBits0 & 1) != 0; }
-    }
-    /// <summary>Clears the value of the "data" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearData() {
-      _hasBits0 &= ~1;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as Uint64Message);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(Uint64Message other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (Data != other.Data) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (HasData) hash ^= Data.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (HasData) {
-        output.WriteRawTag(8);
-        output.WriteUInt64(Data);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (HasData) {
-        output.WriteRawTag(8);
-        output.WriteUInt64(Data);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (HasData) {
-        size += 1 + pb::CodedOutputStream.ComputeUInt64Size(Data);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(Uint64Message other) {
-      if (other == null) {
-        return;
-      }
-      if (other.HasData) {
-        Data = other.Data;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 8: {
-            Data = input.ReadUInt64();
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 8: {
-            Data = input.ReadUInt64();
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  public sealed partial class BoolMessage : pb::IMessage<BoolMessage>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<BoolMessage> _parser = new pb::MessageParser<BoolMessage>(() => new BoolMessage());
-    private pb::UnknownFieldSet _unknownFields;
-    private int _hasBits0;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<BoolMessage> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.Proto2.UnittestReflection.Descriptor.MessageTypes[42]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public BoolMessage() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public BoolMessage(BoolMessage other) : this() {
-      _hasBits0 = other._hasBits0;
-      data_ = other.data_;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public BoolMessage Clone() {
-      return new BoolMessage(this);
-    }
-
-    /// <summary>Field number for the "data" field.</summary>
-    public const int DataFieldNumber = 1;
-    private readonly static bool DataDefaultValue = false;
-
-    private bool data_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Data {
-      get { if ((_hasBits0 & 1) != 0) { return data_; } else { return DataDefaultValue; } }
-      set {
-        _hasBits0 |= 1;
-        data_ = value;
-      }
-    }
-    /// <summary>Gets whether the "data" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasData {
-      get { return (_hasBits0 & 1) != 0; }
-    }
-    /// <summary>Clears the value of the "data" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearData() {
-      _hasBits0 &= ~1;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as BoolMessage);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(BoolMessage other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (Data != other.Data) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (HasData) hash ^= Data.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (HasData) {
-        output.WriteRawTag(8);
-        output.WriteBool(Data);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (HasData) {
-        output.WriteRawTag(8);
-        output.WriteBool(Data);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (HasData) {
-        size += 1 + 1;
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(BoolMessage other) {
-      if (other == null) {
-        return;
-      }
-      if (other.HasData) {
-        Data = other.Data;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 8: {
-            Data = input.ReadBool();
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 8: {
-            Data = input.ReadBool();
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  /// <summary>
-  /// Test oneofs.
-  /// </summary>
-  public sealed partial class TestOneof : pb::IMessage<TestOneof>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<TestOneof> _parser = new pb::MessageParser<TestOneof>(() => new TestOneof());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<TestOneof> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.Proto2.UnittestReflection.Descriptor.MessageTypes[43]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestOneof() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestOneof(TestOneof other) : this() {
-      switch (other.FooCase) {
-        case FooOneofCase.FooInt:
-          FooInt = other.FooInt;
-          break;
-        case FooOneofCase.FooString:
-          FooString = other.FooString;
-          break;
-        case FooOneofCase.FooMessage:
-          FooMessage = other.FooMessage.Clone();
-          break;
-        case FooOneofCase.FooGroup:
-          FooGroup = other.FooGroup.Clone();
-          break;
-      }
-
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestOneof Clone() {
-      return new TestOneof(this);
-    }
-
-    /// <summary>Field number for the "foo_int" field.</summary>
-    public const int FooIntFieldNumber = 1;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int FooInt {
-      get { return HasFooInt ? (int) foo_ : 0; }
-      set {
-        foo_ = value;
-        fooCase_ = FooOneofCase.FooInt;
-      }
-    }
-    /// <summary>Gets whether the "foo_int" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasFooInt {
-      get { return fooCase_ == FooOneofCase.FooInt; }
-    }
-    /// <summary> Clears the value of the oneof if it's currently set to "foo_int" </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearFooInt() {
-      if (HasFooInt) {
-        ClearFoo();
-      }
-    }
-
-    /// <summary>Field number for the "foo_string" field.</summary>
-    public const int FooStringFieldNumber = 2;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string FooString {
-      get { return HasFooString ? (string) foo_ : ""; }
-      set {
-        foo_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-        fooCase_ = FooOneofCase.FooString;
-      }
-    }
-    /// <summary>Gets whether the "foo_string" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasFooString {
-      get { return fooCase_ == FooOneofCase.FooString; }
-    }
-    /// <summary> Clears the value of the oneof if it's currently set to "foo_string" </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearFooString() {
-      if (HasFooString) {
-        ClearFoo();
-      }
-    }
-
-    /// <summary>Field number for the "foo_message" field.</summary>
-    public const int FooMessageFieldNumber = 3;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.TestProtos.Proto2.TestAllTypes FooMessage {
-      get { return fooCase_ == FooOneofCase.FooMessage ? (global::Google.Protobuf.TestProtos.Proto2.TestAllTypes) foo_ : null; }
-      set {
-        foo_ = value;
-        fooCase_ = value == null ? FooOneofCase.None : FooOneofCase.FooMessage;
-      }
-    }
-
-    /// <summary>Field number for the "foogroup" field.</summary>
-    public const int FooGroupFieldNumber = 4;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.TestProtos.Proto2.TestOneof.Types.FooGroup FooGroup {
-      get { return HasFooGroup ? (global::Google.Protobuf.TestProtos.Proto2.TestOneof.Types.FooGroup) foo_ : null; }
-      set {
-        foo_ = value;
-        fooCase_ = value == null ? FooOneofCase.None : FooOneofCase.FooGroup;
-      }
-    }
-    /// <summary>Gets whether the "foogroup" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasFooGroup {
-      get { return fooCase_ == FooOneofCase.FooGroup; }
-    }
-    /// <summary> Clears the value of the oneof if it's currently set to "foogroup" </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearFooGroup() {
-      if (HasFooGroup) {
-        ClearFoo();
-      }
-    }
-
-    private object foo_;
-    /// <summary>Enum of possible cases for the "foo" oneof.</summary>
-    public enum FooOneofCase {
-      None = 0,
-      FooInt = 1,
-      FooString = 2,
-      FooMessage = 3,
-      FooGroup = 4,
-    }
-    private FooOneofCase fooCase_ = FooOneofCase.None;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public FooOneofCase FooCase {
-      get { return fooCase_; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearFoo() {
-      fooCase_ = FooOneofCase.None;
-      foo_ = null;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as TestOneof);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(TestOneof other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (FooInt != other.FooInt) return false;
-      if (FooString != other.FooString) return false;
-      if (!object.Equals(FooMessage, other.FooMessage)) return false;
-      if (!object.Equals(FooGroup, other.FooGroup)) return false;
-      if (FooCase != other.FooCase) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (HasFooInt) hash ^= FooInt.GetHashCode();
-      if (HasFooString) hash ^= FooString.GetHashCode();
-      if (fooCase_ == FooOneofCase.FooMessage) hash ^= FooMessage.GetHashCode();
-      if (HasFooGroup) hash ^= FooGroup.GetHashCode();
-      hash ^= (int) fooCase_;
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (HasFooInt) {
-        output.WriteRawTag(8);
-        output.WriteInt32(FooInt);
-      }
-      if (HasFooString) {
-        output.WriteRawTag(18);
-        output.WriteString(FooString);
-      }
-      if (fooCase_ == FooOneofCase.FooMessage) {
-        output.WriteRawTag(26);
-        output.WriteMessage(FooMessage);
-      }
-      if (HasFooGroup) {
-        output.WriteRawTag(35);
-        output.WriteGroup(FooGroup);
-        output.WriteRawTag(36);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (HasFooInt) {
-        output.WriteRawTag(8);
-        output.WriteInt32(FooInt);
-      }
-      if (HasFooString) {
-        output.WriteRawTag(18);
-        output.WriteString(FooString);
-      }
-      if (fooCase_ == FooOneofCase.FooMessage) {
-        output.WriteRawTag(26);
-        output.WriteMessage(FooMessage);
-      }
-      if (HasFooGroup) {
-        output.WriteRawTag(35);
-        output.WriteGroup(FooGroup);
-        output.WriteRawTag(36);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (HasFooInt) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(FooInt);
-      }
-      if (HasFooString) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(FooString);
-      }
-      if (fooCase_ == FooOneofCase.FooMessage) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(FooMessage);
-      }
-      if (HasFooGroup) {
-        size += 2 + pb::CodedOutputStream.ComputeGroupSize(FooGroup);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(TestOneof other) {
-      if (other == null) {
-        return;
-      }
-      switch (other.FooCase) {
-        case FooOneofCase.FooInt:
-          FooInt = other.FooInt;
-          break;
-        case FooOneofCase.FooString:
-          FooString = other.FooString;
-          break;
-        case FooOneofCase.FooMessage:
-          if (FooMessage == null) {
-            FooMessage = new global::Google.Protobuf.TestProtos.Proto2.TestAllTypes();
-          }
-          FooMessage.MergeFrom(other.FooMessage);
-          break;
-        case FooOneofCase.FooGroup:
-          if (FooGroup == null) {
-            FooGroup = new global::Google.Protobuf.TestProtos.Proto2.TestOneof.Types.FooGroup();
-          }
-          FooGroup.MergeFrom(other.FooGroup);
-          break;
-      }
-
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 8: {
-            FooInt = input.ReadInt32();
-            break;
-          }
-          case 18: {
-            FooString = input.ReadString();
-            break;
-          }
-          case 26: {
-            global::Google.Protobuf.TestProtos.Proto2.TestAllTypes subBuilder = new global::Google.Protobuf.TestProtos.Proto2.TestAllTypes();
-            if (fooCase_ == FooOneofCase.FooMessage) {
-              subBuilder.MergeFrom(FooMessage);
-            }
-            input.ReadMessage(subBuilder);
-            FooMessage = subBuilder;
-            break;
-          }
-          case 35: {
-            global::Google.Protobuf.TestProtos.Proto2.TestOneof.Types.FooGroup subBuilder = new global::Google.Protobuf.TestProtos.Proto2.TestOneof.Types.FooGroup();
-            if (HasFooGroup) {
-              subBuilder.MergeFrom(FooGroup);
-            }
-            input.ReadGroup(subBuilder);
-            FooGroup = subBuilder;
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 8: {
-            FooInt = input.ReadInt32();
-            break;
-          }
-          case 18: {
-            FooString = input.ReadString();
-            break;
-          }
-          case 26: {
-            global::Google.Protobuf.TestProtos.Proto2.TestAllTypes subBuilder = new global::Google.Protobuf.TestProtos.Proto2.TestAllTypes();
-            if (fooCase_ == FooOneofCase.FooMessage) {
-              subBuilder.MergeFrom(FooMessage);
-            }
-            input.ReadMessage(subBuilder);
-            FooMessage = subBuilder;
-            break;
-          }
-          case 35: {
-            global::Google.Protobuf.TestProtos.Proto2.TestOneof.Types.FooGroup subBuilder = new global::Google.Protobuf.TestProtos.Proto2.TestOneof.Types.FooGroup();
-            if (HasFooGroup) {
-              subBuilder.MergeFrom(FooGroup);
-            }
-            input.ReadGroup(subBuilder);
-            FooGroup = subBuilder;
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-    #region Nested types
-    /// <summary>Container for nested types declared in the TestOneof message type.</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static partial class Types {
-      public sealed partial class FooGroup : pb::IMessage<FooGroup>
-      #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          , pb::IBufferMessage
-      #endif
-      {
-        private static readonly pb::MessageParser<FooGroup> _parser = new pb::MessageParser<FooGroup>(() => new FooGroup());
-        private pb::UnknownFieldSet _unknownFields;
-        private int _hasBits0;
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static pb::MessageParser<FooGroup> Parser { get { return _parser; } }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static pbr::MessageDescriptor Descriptor {
-          get { return global::Google.Protobuf.TestProtos.Proto2.TestOneof.Descriptor.NestedTypes[0]; }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        pbr::MessageDescriptor pb::IMessage.Descriptor {
-          get { return Descriptor; }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public FooGroup() {
-          OnConstruction();
-        }
-
-        partial void OnConstruction();
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public FooGroup(FooGroup other) : this() {
-          _hasBits0 = other._hasBits0;
-          a_ = other.a_;
-          b_ = other.b_;
-          _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public FooGroup Clone() {
-          return new FooGroup(this);
-        }
-
-        /// <summary>Field number for the "a" field.</summary>
-        public const int AFieldNumber = 5;
-        private readonly static int ADefaultValue = 0;
-
-        private int a_;
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public int A {
-          get { if ((_hasBits0 & 1) != 0) { return a_; } else { return ADefaultValue; } }
-          set {
-            _hasBits0 |= 1;
-            a_ = value;
-          }
-        }
-        /// <summary>Gets whether the "a" field is set</summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool HasA {
-          get { return (_hasBits0 & 1) != 0; }
-        }
-        /// <summary>Clears the value of the "a" field</summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void ClearA() {
-          _hasBits0 &= ~1;
-        }
-
-        /// <summary>Field number for the "b" field.</summary>
-        public const int BFieldNumber = 6;
-        private readonly static string BDefaultValue = "";
-
-        private string b_;
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public string B {
-          get { return b_ ?? BDefaultValue; }
-          set {
-            b_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-          }
-        }
-        /// <summary>Gets whether the "b" field is set</summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool HasB {
-          get { return b_ != null; }
-        }
-        /// <summary>Clears the value of the "b" field</summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void ClearB() {
-          b_ = null;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override bool Equals(object other) {
-          return Equals(other as FooGroup);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool Equals(FooGroup other) {
-          if (ReferenceEquals(other, null)) {
-            return false;
-          }
-          if (ReferenceEquals(other, this)) {
-            return true;
-          }
-          if (A != other.A) return false;
-          if (B != other.B) return false;
-          return Equals(_unknownFields, other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override int GetHashCode() {
-          int hash = 1;
-          if (HasA) hash ^= A.GetHashCode();
-          if (HasB) hash ^= B.GetHashCode();
-          if (_unknownFields != null) {
-            hash ^= _unknownFields.GetHashCode();
-          }
-          return hash;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override string ToString() {
-          return pb::JsonFormatter.ToDiagnosticString(this);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void WriteTo(pb::CodedOutputStream output) {
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          output.WriteRawMessage(this);
-        #else
-          if (HasA) {
-            output.WriteRawTag(40);
-            output.WriteInt32(A);
-          }
-          if (HasB) {
-            output.WriteRawTag(50);
-            output.WriteString(B);
-          }
-          if (_unknownFields != null) {
-            _unknownFields.WriteTo(output);
-          }
-        #endif
-        }
-
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-          if (HasA) {
-            output.WriteRawTag(40);
-            output.WriteInt32(A);
-          }
-          if (HasB) {
-            output.WriteRawTag(50);
-            output.WriteString(B);
-          }
-          if (_unknownFields != null) {
-            _unknownFields.WriteTo(ref output);
-          }
-        }
-        #endif
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public int CalculateSize() {
-          int size = 0;
-          if (HasA) {
-            size += 1 + pb::CodedOutputStream.ComputeInt32Size(A);
-          }
-          if (HasB) {
-            size += 1 + pb::CodedOutputStream.ComputeStringSize(B);
-          }
-          if (_unknownFields != null) {
-            size += _unknownFields.CalculateSize();
-          }
-          return size;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(FooGroup other) {
-          if (other == null) {
-            return;
-          }
-          if (other.HasA) {
-            A = other.A;
-          }
-          if (other.HasB) {
-            B = other.B;
-          }
-          _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(pb::CodedInputStream input) {
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          input.ReadRawMessage(this);
-        #else
-          uint tag;
-          while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
-              case 36:
-                return;
-              default:
-                _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-                break;
-              case 40: {
-                A = input.ReadInt32();
-                break;
-              }
-              case 50: {
-                B = input.ReadString();
-                break;
-              }
-            }
-          }
-        #endif
-        }
-
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-          uint tag;
-          while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
-              case 36:
-                return;
-              default:
-                _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-                break;
-              case 40: {
-                A = input.ReadInt32();
-                break;
-              }
-              case 50: {
-                B = input.ReadString();
-                break;
-              }
-            }
-          }
-        }
-        #endif
-
-      }
-
-    }
-    #endregion
-
-  }
-
-  public sealed partial class TestOneofBackwardsCompatible : pb::IMessage<TestOneofBackwardsCompatible>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<TestOneofBackwardsCompatible> _parser = new pb::MessageParser<TestOneofBackwardsCompatible>(() => new TestOneofBackwardsCompatible());
-    private pb::UnknownFieldSet _unknownFields;
-    private int _hasBits0;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<TestOneofBackwardsCompatible> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.Proto2.UnittestReflection.Descriptor.MessageTypes[44]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestOneofBackwardsCompatible() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestOneofBackwardsCompatible(TestOneofBackwardsCompatible other) : this() {
-      _hasBits0 = other._hasBits0;
-      fooInt_ = other.fooInt_;
-      fooString_ = other.fooString_;
-      fooMessage_ = other.fooMessage_ != null ? other.fooMessage_.Clone() : null;
-      fooGroup_ = other.HasFooGroup ? other.fooGroup_.Clone() : null;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestOneofBackwardsCompatible Clone() {
-      return new TestOneofBackwardsCompatible(this);
-    }
-
-    /// <summary>Field number for the "foo_int" field.</summary>
-    public const int FooIntFieldNumber = 1;
-    private readonly static int FooIntDefaultValue = 0;
-
-    private int fooInt_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int FooInt {
-      get { if ((_hasBits0 & 1) != 0) { return fooInt_; } else { return FooIntDefaultValue; } }
-      set {
-        _hasBits0 |= 1;
-        fooInt_ = value;
-      }
-    }
-    /// <summary>Gets whether the "foo_int" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasFooInt {
-      get { return (_hasBits0 & 1) != 0; }
-    }
-    /// <summary>Clears the value of the "foo_int" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearFooInt() {
-      _hasBits0 &= ~1;
-    }
-
-    /// <summary>Field number for the "foo_string" field.</summary>
-    public const int FooStringFieldNumber = 2;
-    private readonly static string FooStringDefaultValue = "";
-
-    private string fooString_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string FooString {
-      get { return fooString_ ?? FooStringDefaultValue; }
-      set {
-        fooString_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-    /// <summary>Gets whether the "foo_string" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasFooString {
-      get { return fooString_ != null; }
-    }
-    /// <summary>Clears the value of the "foo_string" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearFooString() {
-      fooString_ = null;
-    }
-
-    /// <summary>Field number for the "foo_message" field.</summary>
-    public const int FooMessageFieldNumber = 3;
-    private global::Google.Protobuf.TestProtos.Proto2.TestAllTypes fooMessage_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.TestProtos.Proto2.TestAllTypes FooMessage {
-      get { return fooMessage_; }
-      set {
-        fooMessage_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "foogroup" field.</summary>
-    public const int FooGroupFieldNumber = 4;
-    private global::Google.Protobuf.TestProtos.Proto2.TestOneofBackwardsCompatible.Types.FooGroup fooGroup_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.TestProtos.Proto2.TestOneofBackwardsCompatible.Types.FooGroup FooGroup {
-      get { return fooGroup_; }
-      set {
-        fooGroup_ = value;
-      }
-    }
-    /// <summary>Gets whether the foogroup field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasFooGroup {
-      get { return fooGroup_ != null; }
-    }
-    /// <summary>Clears the value of the foogroup field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearFooGroup() {
-      fooGroup_ = null;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as TestOneofBackwardsCompatible);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(TestOneofBackwardsCompatible other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (FooInt != other.FooInt) return false;
-      if (FooString != other.FooString) return false;
-      if (!object.Equals(FooMessage, other.FooMessage)) return false;
-      if (!object.Equals(FooGroup, other.FooGroup)) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (HasFooInt) hash ^= FooInt.GetHashCode();
-      if (HasFooString) hash ^= FooString.GetHashCode();
-      if (fooMessage_ != null) hash ^= FooMessage.GetHashCode();
-      if (HasFooGroup) hash ^= FooGroup.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (HasFooInt) {
-        output.WriteRawTag(8);
-        output.WriteInt32(FooInt);
-      }
-      if (HasFooString) {
-        output.WriteRawTag(18);
-        output.WriteString(FooString);
-      }
-      if (fooMessage_ != null) {
-        output.WriteRawTag(26);
-        output.WriteMessage(FooMessage);
-      }
-      if (HasFooGroup) {
-        output.WriteRawTag(35);
-        output.WriteGroup(FooGroup);
-        output.WriteRawTag(36);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (HasFooInt) {
-        output.WriteRawTag(8);
-        output.WriteInt32(FooInt);
-      }
-      if (HasFooString) {
-        output.WriteRawTag(18);
-        output.WriteString(FooString);
-      }
-      if (fooMessage_ != null) {
-        output.WriteRawTag(26);
-        output.WriteMessage(FooMessage);
-      }
-      if (HasFooGroup) {
-        output.WriteRawTag(35);
-        output.WriteGroup(FooGroup);
-        output.WriteRawTag(36);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (HasFooInt) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(FooInt);
-      }
-      if (HasFooString) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(FooString);
-      }
-      if (fooMessage_ != null) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(FooMessage);
-      }
-      if (HasFooGroup) {
-        size += 2 + pb::CodedOutputStream.ComputeGroupSize(FooGroup);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(TestOneofBackwardsCompatible other) {
-      if (other == null) {
-        return;
-      }
-      if (other.HasFooInt) {
-        FooInt = other.FooInt;
-      }
-      if (other.HasFooString) {
-        FooString = other.FooString;
-      }
-      if (other.fooMessage_ != null) {
-        if (fooMessage_ == null) {
-          FooMessage = new global::Google.Protobuf.TestProtos.Proto2.TestAllTypes();
-        }
-        FooMessage.MergeFrom(other.FooMessage);
-      }
-      if (other.HasFooGroup) {
-        if (!HasFooGroup) {
-          FooGroup = new global::Google.Protobuf.TestProtos.Proto2.TestOneofBackwardsCompatible.Types.FooGroup();
-        }
-        FooGroup.MergeFrom(other.FooGroup);
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 8: {
-            FooInt = input.ReadInt32();
-            break;
-          }
-          case 18: {
-            FooString = input.ReadString();
-            break;
-          }
-          case 26: {
-            if (fooMessage_ == null) {
-              FooMessage = new global::Google.Protobuf.TestProtos.Proto2.TestAllTypes();
-            }
-            input.ReadMessage(FooMessage);
-            break;
-          }
-          case 35: {
-            if (!HasFooGroup) {
-              FooGroup = new global::Google.Protobuf.TestProtos.Proto2.TestOneofBackwardsCompatible.Types.FooGroup();
-            }
-            input.ReadGroup(FooGroup);
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 8: {
-            FooInt = input.ReadInt32();
-            break;
-          }
-          case 18: {
-            FooString = input.ReadString();
-            break;
-          }
-          case 26: {
-            if (fooMessage_ == null) {
-              FooMessage = new global::Google.Protobuf.TestProtos.Proto2.TestAllTypes();
-            }
-            input.ReadMessage(FooMessage);
-            break;
-          }
-          case 35: {
-            if (!HasFooGroup) {
-              FooGroup = new global::Google.Protobuf.TestProtos.Proto2.TestOneofBackwardsCompatible.Types.FooGroup();
-            }
-            input.ReadGroup(FooGroup);
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-    #region Nested types
-    /// <summary>Container for nested types declared in the TestOneofBackwardsCompatible message type.</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static partial class Types {
-      public sealed partial class FooGroup : pb::IMessage<FooGroup>
-      #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          , pb::IBufferMessage
-      #endif
-      {
-        private static readonly pb::MessageParser<FooGroup> _parser = new pb::MessageParser<FooGroup>(() => new FooGroup());
-        private pb::UnknownFieldSet _unknownFields;
-        private int _hasBits0;
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static pb::MessageParser<FooGroup> Parser { get { return _parser; } }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static pbr::MessageDescriptor Descriptor {
-          get { return global::Google.Protobuf.TestProtos.Proto2.TestOneofBackwardsCompatible.Descriptor.NestedTypes[0]; }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        pbr::MessageDescriptor pb::IMessage.Descriptor {
-          get { return Descriptor; }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public FooGroup() {
-          OnConstruction();
-        }
-
-        partial void OnConstruction();
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public FooGroup(FooGroup other) : this() {
-          _hasBits0 = other._hasBits0;
-          a_ = other.a_;
-          b_ = other.b_;
-          _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public FooGroup Clone() {
-          return new FooGroup(this);
-        }
-
-        /// <summary>Field number for the "a" field.</summary>
-        public const int AFieldNumber = 5;
-        private readonly static int ADefaultValue = 0;
-
-        private int a_;
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public int A {
-          get { if ((_hasBits0 & 1) != 0) { return a_; } else { return ADefaultValue; } }
-          set {
-            _hasBits0 |= 1;
-            a_ = value;
-          }
-        }
-        /// <summary>Gets whether the "a" field is set</summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool HasA {
-          get { return (_hasBits0 & 1) != 0; }
-        }
-        /// <summary>Clears the value of the "a" field</summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void ClearA() {
-          _hasBits0 &= ~1;
-        }
-
-        /// <summary>Field number for the "b" field.</summary>
-        public const int BFieldNumber = 6;
-        private readonly static string BDefaultValue = "";
-
-        private string b_;
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public string B {
-          get { return b_ ?? BDefaultValue; }
-          set {
-            b_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-          }
-        }
-        /// <summary>Gets whether the "b" field is set</summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool HasB {
-          get { return b_ != null; }
-        }
-        /// <summary>Clears the value of the "b" field</summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void ClearB() {
-          b_ = null;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override bool Equals(object other) {
-          return Equals(other as FooGroup);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool Equals(FooGroup other) {
-          if (ReferenceEquals(other, null)) {
-            return false;
-          }
-          if (ReferenceEquals(other, this)) {
-            return true;
-          }
-          if (A != other.A) return false;
-          if (B != other.B) return false;
-          return Equals(_unknownFields, other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override int GetHashCode() {
-          int hash = 1;
-          if (HasA) hash ^= A.GetHashCode();
-          if (HasB) hash ^= B.GetHashCode();
-          if (_unknownFields != null) {
-            hash ^= _unknownFields.GetHashCode();
-          }
-          return hash;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override string ToString() {
-          return pb::JsonFormatter.ToDiagnosticString(this);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void WriteTo(pb::CodedOutputStream output) {
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          output.WriteRawMessage(this);
-        #else
-          if (HasA) {
-            output.WriteRawTag(40);
-            output.WriteInt32(A);
-          }
-          if (HasB) {
-            output.WriteRawTag(50);
-            output.WriteString(B);
-          }
-          if (_unknownFields != null) {
-            _unknownFields.WriteTo(output);
-          }
-        #endif
-        }
-
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-          if (HasA) {
-            output.WriteRawTag(40);
-            output.WriteInt32(A);
-          }
-          if (HasB) {
-            output.WriteRawTag(50);
-            output.WriteString(B);
-          }
-          if (_unknownFields != null) {
-            _unknownFields.WriteTo(ref output);
-          }
-        }
-        #endif
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public int CalculateSize() {
-          int size = 0;
-          if (HasA) {
-            size += 1 + pb::CodedOutputStream.ComputeInt32Size(A);
-          }
-          if (HasB) {
-            size += 1 + pb::CodedOutputStream.ComputeStringSize(B);
-          }
-          if (_unknownFields != null) {
-            size += _unknownFields.CalculateSize();
-          }
-          return size;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(FooGroup other) {
-          if (other == null) {
-            return;
-          }
-          if (other.HasA) {
-            A = other.A;
-          }
-          if (other.HasB) {
-            B = other.B;
-          }
-          _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(pb::CodedInputStream input) {
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          input.ReadRawMessage(this);
-        #else
-          uint tag;
-          while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
-              case 36:
-                return;
-              default:
-                _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-                break;
-              case 40: {
-                A = input.ReadInt32();
-                break;
-              }
-              case 50: {
-                B = input.ReadString();
-                break;
-              }
-            }
-          }
-        #endif
-        }
-
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-          uint tag;
-          while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
-              case 36:
-                return;
-              default:
-                _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-                break;
-              case 40: {
-                A = input.ReadInt32();
-                break;
-              }
-              case 50: {
-                B = input.ReadString();
-                break;
-              }
-            }
-          }
-        }
-        #endif
-
-      }
-
-    }
-    #endregion
-
-  }
-
-  public sealed partial class TestOneof2 : pb::IMessage<TestOneof2>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<TestOneof2> _parser = new pb::MessageParser<TestOneof2>(() => new TestOneof2());
-    private pb::UnknownFieldSet _unknownFields;
-    private int _hasBits0;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<TestOneof2> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.Proto2.UnittestReflection.Descriptor.MessageTypes[45]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestOneof2() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestOneof2(TestOneof2 other) : this() {
-      _hasBits0 = other._hasBits0;
-      bazInt_ = other.bazInt_;
-      bazString_ = other.bazString_;
-      switch (other.FooCase) {
-        case FooOneofCase.FooInt:
-          FooInt = other.FooInt;
-          break;
-        case FooOneofCase.FooString:
-          FooString = other.FooString;
-          break;
-        case FooOneofCase.FooCord:
-          FooCord = other.FooCord;
-          break;
-        case FooOneofCase.FooStringPiece:
-          FooStringPiece = other.FooStringPiece;
-          break;
-        case FooOneofCase.FooBytes:
-          FooBytes = other.FooBytes;
-          break;
-        case FooOneofCase.FooEnum:
-          FooEnum = other.FooEnum;
-          break;
-        case FooOneofCase.FooMessage:
-          FooMessage = other.FooMessage.Clone();
-          break;
-        case FooOneofCase.FooGroup:
-          FooGroup = other.FooGroup.Clone();
-          break;
-        case FooOneofCase.FooLazyMessage:
-          FooLazyMessage = other.FooLazyMessage.Clone();
-          break;
-      }
-
-      switch (other.BarCase) {
-        case BarOneofCase.BarInt:
-          BarInt = other.BarInt;
-          break;
-        case BarOneofCase.BarString:
-          BarString = other.BarString;
-          break;
-        case BarOneofCase.BarCord:
-          BarCord = other.BarCord;
-          break;
-        case BarOneofCase.BarStringPiece:
-          BarStringPiece = other.BarStringPiece;
-          break;
-        case BarOneofCase.BarBytes:
-          BarBytes = other.BarBytes;
-          break;
-        case BarOneofCase.BarEnum:
-          BarEnum = other.BarEnum;
-          break;
-      }
-
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestOneof2 Clone() {
-      return new TestOneof2(this);
-    }
-
-    /// <summary>Field number for the "foo_int" field.</summary>
-    public const int FooIntFieldNumber = 1;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int FooInt {
-      get { return HasFooInt ? (int) foo_ : 0; }
-      set {
-        foo_ = value;
-        fooCase_ = FooOneofCase.FooInt;
-      }
-    }
-    /// <summary>Gets whether the "foo_int" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasFooInt {
-      get { return fooCase_ == FooOneofCase.FooInt; }
-    }
-    /// <summary> Clears the value of the oneof if it's currently set to "foo_int" </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearFooInt() {
-      if (HasFooInt) {
-        ClearFoo();
-      }
-    }
-
-    /// <summary>Field number for the "foo_string" field.</summary>
-    public const int FooStringFieldNumber = 2;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string FooString {
-      get { return HasFooString ? (string) foo_ : ""; }
-      set {
-        foo_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-        fooCase_ = FooOneofCase.FooString;
-      }
-    }
-    /// <summary>Gets whether the "foo_string" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasFooString {
-      get { return fooCase_ == FooOneofCase.FooString; }
-    }
-    /// <summary> Clears the value of the oneof if it's currently set to "foo_string" </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearFooString() {
-      if (HasFooString) {
-        ClearFoo();
-      }
-    }
-
-    /// <summary>Field number for the "foo_cord" field.</summary>
-    public const int FooCordFieldNumber = 3;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string FooCord {
-      get { return HasFooCord ? (string) foo_ : ""; }
-      set {
-        foo_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-        fooCase_ = FooOneofCase.FooCord;
-      }
-    }
-    /// <summary>Gets whether the "foo_cord" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasFooCord {
-      get { return fooCase_ == FooOneofCase.FooCord; }
-    }
-    /// <summary> Clears the value of the oneof if it's currently set to "foo_cord" </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearFooCord() {
-      if (HasFooCord) {
-        ClearFoo();
-      }
-    }
-
-    /// <summary>Field number for the "foo_string_piece" field.</summary>
-    public const int FooStringPieceFieldNumber = 4;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string FooStringPiece {
-      get { return HasFooStringPiece ? (string) foo_ : ""; }
-      set {
-        foo_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-        fooCase_ = FooOneofCase.FooStringPiece;
-      }
-    }
-    /// <summary>Gets whether the "foo_string_piece" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasFooStringPiece {
-      get { return fooCase_ == FooOneofCase.FooStringPiece; }
-    }
-    /// <summary> Clears the value of the oneof if it's currently set to "foo_string_piece" </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearFooStringPiece() {
-      if (HasFooStringPiece) {
-        ClearFoo();
-      }
-    }
-
-    /// <summary>Field number for the "foo_bytes" field.</summary>
-    public const int FooBytesFieldNumber = 5;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pb::ByteString FooBytes {
-      get { return HasFooBytes ? (pb::ByteString) foo_ : pb::ByteString.Empty; }
-      set {
-        foo_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-        fooCase_ = FooOneofCase.FooBytes;
-      }
-    }
-    /// <summary>Gets whether the "foo_bytes" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasFooBytes {
-      get { return fooCase_ == FooOneofCase.FooBytes; }
-    }
-    /// <summary> Clears the value of the oneof if it's currently set to "foo_bytes" </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearFooBytes() {
-      if (HasFooBytes) {
-        ClearFoo();
-      }
-    }
-
-    /// <summary>Field number for the "foo_enum" field.</summary>
-    public const int FooEnumFieldNumber = 6;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.TestProtos.Proto2.TestOneof2.Types.NestedEnum FooEnum {
-      get { return HasFooEnum ? (global::Google.Protobuf.TestProtos.Proto2.TestOneof2.Types.NestedEnum) foo_ : global::Google.Protobuf.TestProtos.Proto2.TestOneof2.Types.NestedEnum.Foo; }
-      set {
-        foo_ = value;
-        fooCase_ = FooOneofCase.FooEnum;
-      }
-    }
-    /// <summary>Gets whether the "foo_enum" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasFooEnum {
-      get { return fooCase_ == FooOneofCase.FooEnum; }
-    }
-    /// <summary> Clears the value of the oneof if it's currently set to "foo_enum" </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearFooEnum() {
-      if (HasFooEnum) {
-        ClearFoo();
-      }
-    }
-
-    /// <summary>Field number for the "foo_message" field.</summary>
-    public const int FooMessageFieldNumber = 7;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.TestProtos.Proto2.TestOneof2.Types.NestedMessage FooMessage {
-      get { return fooCase_ == FooOneofCase.FooMessage ? (global::Google.Protobuf.TestProtos.Proto2.TestOneof2.Types.NestedMessage) foo_ : null; }
-      set {
-        foo_ = value;
-        fooCase_ = value == null ? FooOneofCase.None : FooOneofCase.FooMessage;
-      }
-    }
-
-    /// <summary>Field number for the "foogroup" field.</summary>
-    public const int FooGroupFieldNumber = 8;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.TestProtos.Proto2.TestOneof2.Types.FooGroup FooGroup {
-      get { return HasFooGroup ? (global::Google.Protobuf.TestProtos.Proto2.TestOneof2.Types.FooGroup) foo_ : null; }
-      set {
-        foo_ = value;
-        fooCase_ = value == null ? FooOneofCase.None : FooOneofCase.FooGroup;
-      }
-    }
-    /// <summary>Gets whether the "foogroup" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasFooGroup {
-      get { return fooCase_ == FooOneofCase.FooGroup; }
-    }
-    /// <summary> Clears the value of the oneof if it's currently set to "foogroup" </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearFooGroup() {
-      if (HasFooGroup) {
-        ClearFoo();
-      }
-    }
-
-    /// <summary>Field number for the "foo_lazy_message" field.</summary>
-    public const int FooLazyMessageFieldNumber = 11;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.TestProtos.Proto2.TestOneof2.Types.NestedMessage FooLazyMessage {
-      get { return fooCase_ == FooOneofCase.FooLazyMessage ? (global::Google.Protobuf.TestProtos.Proto2.TestOneof2.Types.NestedMessage) foo_ : null; }
-      set {
-        foo_ = value;
-        fooCase_ = value == null ? FooOneofCase.None : FooOneofCase.FooLazyMessage;
-      }
-    }
-
-    /// <summary>Field number for the "bar_int" field.</summary>
-    public const int BarIntFieldNumber = 12;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int BarInt {
-      get { return HasBarInt ? (int) bar_ : 5; }
-      set {
-        bar_ = value;
-        barCase_ = BarOneofCase.BarInt;
-      }
-    }
-    /// <summary>Gets whether the "bar_int" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasBarInt {
-      get { return barCase_ == BarOneofCase.BarInt; }
-    }
-    /// <summary> Clears the value of the oneof if it's currently set to "bar_int" </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearBarInt() {
-      if (HasBarInt) {
-        ClearBar();
-      }
-    }
-
-    /// <summary>Field number for the "bar_string" field.</summary>
-    public const int BarStringFieldNumber = 13;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string BarString {
-      get { return HasBarString ? (string) bar_ : global::System.Text.Encoding.UTF8.GetString(global::System.Convert.FromBase64String("U1RSSU5H"), 0, 6); }
-      set {
-        bar_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-        barCase_ = BarOneofCase.BarString;
-      }
-    }
-    /// <summary>Gets whether the "bar_string" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasBarString {
-      get { return barCase_ == BarOneofCase.BarString; }
-    }
-    /// <summary> Clears the value of the oneof if it's currently set to "bar_string" </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearBarString() {
-      if (HasBarString) {
-        ClearBar();
-      }
-    }
-
-    /// <summary>Field number for the "bar_cord" field.</summary>
-    public const int BarCordFieldNumber = 14;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string BarCord {
-      get { return HasBarCord ? (string) bar_ : global::System.Text.Encoding.UTF8.GetString(global::System.Convert.FromBase64String("Q09SRA=="), 0, 4); }
-      set {
-        bar_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-        barCase_ = BarOneofCase.BarCord;
-      }
-    }
-    /// <summary>Gets whether the "bar_cord" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasBarCord {
-      get { return barCase_ == BarOneofCase.BarCord; }
-    }
-    /// <summary> Clears the value of the oneof if it's currently set to "bar_cord" </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearBarCord() {
-      if (HasBarCord) {
-        ClearBar();
-      }
-    }
-
-    /// <summary>Field number for the "bar_string_piece" field.</summary>
-    public const int BarStringPieceFieldNumber = 15;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string BarStringPiece {
-      get { return HasBarStringPiece ? (string) bar_ : global::System.Text.Encoding.UTF8.GetString(global::System.Convert.FromBase64String("U1BJRUNF"), 0, 6); }
-      set {
-        bar_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-        barCase_ = BarOneofCase.BarStringPiece;
-      }
-    }
-    /// <summary>Gets whether the "bar_string_piece" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasBarStringPiece {
-      get { return barCase_ == BarOneofCase.BarStringPiece; }
-    }
-    /// <summary> Clears the value of the oneof if it's currently set to "bar_string_piece" </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearBarStringPiece() {
-      if (HasBarStringPiece) {
-        ClearBar();
-      }
-    }
-
-    /// <summary>Field number for the "bar_bytes" field.</summary>
-    public const int BarBytesFieldNumber = 16;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pb::ByteString BarBytes {
-      get { return HasBarBytes ? (pb::ByteString) bar_ : pb::ByteString.FromBase64("QllURVM="); }
-      set {
-        bar_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-        barCase_ = BarOneofCase.BarBytes;
-      }
-    }
-    /// <summary>Gets whether the "bar_bytes" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasBarBytes {
-      get { return barCase_ == BarOneofCase.BarBytes; }
-    }
-    /// <summary> Clears the value of the oneof if it's currently set to "bar_bytes" </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearBarBytes() {
-      if (HasBarBytes) {
-        ClearBar();
-      }
-    }
-
-    /// <summary>Field number for the "bar_enum" field.</summary>
-    public const int BarEnumFieldNumber = 17;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.TestProtos.Proto2.TestOneof2.Types.NestedEnum BarEnum {
-      get { return HasBarEnum ? (global::Google.Protobuf.TestProtos.Proto2.TestOneof2.Types.NestedEnum) bar_ : global::Google.Protobuf.TestProtos.Proto2.TestOneof2.Types.NestedEnum.Bar; }
-      set {
-        bar_ = value;
-        barCase_ = BarOneofCase.BarEnum;
-      }
-    }
-    /// <summary>Gets whether the "bar_enum" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasBarEnum {
-      get { return barCase_ == BarOneofCase.BarEnum; }
-    }
-    /// <summary> Clears the value of the oneof if it's currently set to "bar_enum" </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearBarEnum() {
-      if (HasBarEnum) {
-        ClearBar();
-      }
-    }
-
-    /// <summary>Field number for the "baz_int" field.</summary>
-    public const int BazIntFieldNumber = 18;
-    private readonly static int BazIntDefaultValue = 0;
-
-    private int bazInt_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int BazInt {
-      get { if ((_hasBits0 & 1) != 0) { return bazInt_; } else { return BazIntDefaultValue; } }
-      set {
-        _hasBits0 |= 1;
-        bazInt_ = value;
-      }
-    }
-    /// <summary>Gets whether the "baz_int" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasBazInt {
-      get { return (_hasBits0 & 1) != 0; }
-    }
-    /// <summary>Clears the value of the "baz_int" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearBazInt() {
-      _hasBits0 &= ~1;
-    }
-
-    /// <summary>Field number for the "baz_string" field.</summary>
-    public const int BazStringFieldNumber = 19;
-    private readonly static string BazStringDefaultValue = global::System.Text.Encoding.UTF8.GetString(global::System.Convert.FromBase64String("QkFa"), 0, 3);
-
-    private string bazString_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string BazString {
-      get { return bazString_ ?? BazStringDefaultValue; }
-      set {
-        bazString_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-    /// <summary>Gets whether the "baz_string" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasBazString {
-      get { return bazString_ != null; }
-    }
-    /// <summary>Clears the value of the "baz_string" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearBazString() {
-      bazString_ = null;
-    }
-
-    private object foo_;
-    /// <summary>Enum of possible cases for the "foo" oneof.</summary>
-    public enum FooOneofCase {
-      None = 0,
-      FooInt = 1,
-      FooString = 2,
-      FooCord = 3,
-      FooStringPiece = 4,
-      FooBytes = 5,
-      FooEnum = 6,
-      FooMessage = 7,
-      FooGroup = 8,
-      FooLazyMessage = 11,
-    }
-    private FooOneofCase fooCase_ = FooOneofCase.None;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public FooOneofCase FooCase {
-      get { return fooCase_; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearFoo() {
-      fooCase_ = FooOneofCase.None;
-      foo_ = null;
-    }
-
-    private object bar_;
-    /// <summary>Enum of possible cases for the "bar" oneof.</summary>
-    public enum BarOneofCase {
-      None = 0,
-      BarInt = 12,
-      BarString = 13,
-      BarCord = 14,
-      BarStringPiece = 15,
-      BarBytes = 16,
-      BarEnum = 17,
-    }
-    private BarOneofCase barCase_ = BarOneofCase.None;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public BarOneofCase BarCase {
-      get { return barCase_; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearBar() {
-      barCase_ = BarOneofCase.None;
-      bar_ = null;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as TestOneof2);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(TestOneof2 other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (FooInt != other.FooInt) return false;
-      if (FooString != other.FooString) return false;
-      if (FooCord != other.FooCord) return false;
-      if (FooStringPiece != other.FooStringPiece) return false;
-      if (FooBytes != other.FooBytes) return false;
-      if (FooEnum != other.FooEnum) return false;
-      if (!object.Equals(FooMessage, other.FooMessage)) return false;
-      if (!object.Equals(FooGroup, other.FooGroup)) return false;
-      if (!object.Equals(FooLazyMessage, other.FooLazyMessage)) return false;
-      if (BarInt != other.BarInt) return false;
-      if (BarString != other.BarString) return false;
-      if (BarCord != other.BarCord) return false;
-      if (BarStringPiece != other.BarStringPiece) return false;
-      if (BarBytes != other.BarBytes) return false;
-      if (BarEnum != other.BarEnum) return false;
-      if (BazInt != other.BazInt) return false;
-      if (BazString != other.BazString) return false;
-      if (FooCase != other.FooCase) return false;
-      if (BarCase != other.BarCase) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (HasFooInt) hash ^= FooInt.GetHashCode();
-      if (HasFooString) hash ^= FooString.GetHashCode();
-      if (HasFooCord) hash ^= FooCord.GetHashCode();
-      if (HasFooStringPiece) hash ^= FooStringPiece.GetHashCode();
-      if (HasFooBytes) hash ^= FooBytes.GetHashCode();
-      if (HasFooEnum) hash ^= FooEnum.GetHashCode();
-      if (fooCase_ == FooOneofCase.FooMessage) hash ^= FooMessage.GetHashCode();
-      if (HasFooGroup) hash ^= FooGroup.GetHashCode();
-      if (fooCase_ == FooOneofCase.FooLazyMessage) hash ^= FooLazyMessage.GetHashCode();
-      if (HasBarInt) hash ^= BarInt.GetHashCode();
-      if (HasBarString) hash ^= BarString.GetHashCode();
-      if (HasBarCord) hash ^= BarCord.GetHashCode();
-      if (HasBarStringPiece) hash ^= BarStringPiece.GetHashCode();
-      if (HasBarBytes) hash ^= BarBytes.GetHashCode();
-      if (HasBarEnum) hash ^= BarEnum.GetHashCode();
-      if (HasBazInt) hash ^= BazInt.GetHashCode();
-      if (HasBazString) hash ^= BazString.GetHashCode();
-      hash ^= (int) fooCase_;
-      hash ^= (int) barCase_;
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (HasFooInt) {
-        output.WriteRawTag(8);
-        output.WriteInt32(FooInt);
-      }
-      if (HasFooString) {
-        output.WriteRawTag(18);
-        output.WriteString(FooString);
-      }
-      if (HasFooCord) {
-        output.WriteRawTag(26);
-        output.WriteString(FooCord);
-      }
-      if (HasFooStringPiece) {
-        output.WriteRawTag(34);
-        output.WriteString(FooStringPiece);
-      }
-      if (HasFooBytes) {
-        output.WriteRawTag(42);
-        output.WriteBytes(FooBytes);
-      }
-      if (HasFooEnum) {
-        output.WriteRawTag(48);
-        output.WriteEnum((int) FooEnum);
-      }
-      if (fooCase_ == FooOneofCase.FooMessage) {
-        output.WriteRawTag(58);
-        output.WriteMessage(FooMessage);
-      }
-      if (HasFooGroup) {
-        output.WriteRawTag(67);
-        output.WriteGroup(FooGroup);
-        output.WriteRawTag(68);
-      }
-      if (fooCase_ == FooOneofCase.FooLazyMessage) {
-        output.WriteRawTag(90);
-        output.WriteMessage(FooLazyMessage);
-      }
-      if (HasBarInt) {
-        output.WriteRawTag(96);
-        output.WriteInt32(BarInt);
-      }
-      if (HasBarString) {
-        output.WriteRawTag(106);
-        output.WriteString(BarString);
-      }
-      if (HasBarCord) {
-        output.WriteRawTag(114);
-        output.WriteString(BarCord);
-      }
-      if (HasBarStringPiece) {
-        output.WriteRawTag(122);
-        output.WriteString(BarStringPiece);
-      }
-      if (HasBarBytes) {
-        output.WriteRawTag(130, 1);
-        output.WriteBytes(BarBytes);
-      }
-      if (HasBarEnum) {
-        output.WriteRawTag(136, 1);
-        output.WriteEnum((int) BarEnum);
-      }
-      if (HasBazInt) {
-        output.WriteRawTag(144, 1);
-        output.WriteInt32(BazInt);
-      }
-      if (HasBazString) {
-        output.WriteRawTag(154, 1);
-        output.WriteString(BazString);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (HasFooInt) {
-        output.WriteRawTag(8);
-        output.WriteInt32(FooInt);
-      }
-      if (HasFooString) {
-        output.WriteRawTag(18);
-        output.WriteString(FooString);
-      }
-      if (HasFooCord) {
-        output.WriteRawTag(26);
-        output.WriteString(FooCord);
-      }
-      if (HasFooStringPiece) {
-        output.WriteRawTag(34);
-        output.WriteString(FooStringPiece);
-      }
-      if (HasFooBytes) {
-        output.WriteRawTag(42);
-        output.WriteBytes(FooBytes);
-      }
-      if (HasFooEnum) {
-        output.WriteRawTag(48);
-        output.WriteEnum((int) FooEnum);
-      }
-      if (fooCase_ == FooOneofCase.FooMessage) {
-        output.WriteRawTag(58);
-        output.WriteMessage(FooMessage);
-      }
-      if (HasFooGroup) {
-        output.WriteRawTag(67);
-        output.WriteGroup(FooGroup);
-        output.WriteRawTag(68);
-      }
-      if (fooCase_ == FooOneofCase.FooLazyMessage) {
-        output.WriteRawTag(90);
-        output.WriteMessage(FooLazyMessage);
-      }
-      if (HasBarInt) {
-        output.WriteRawTag(96);
-        output.WriteInt32(BarInt);
-      }
-      if (HasBarString) {
-        output.WriteRawTag(106);
-        output.WriteString(BarString);
-      }
-      if (HasBarCord) {
-        output.WriteRawTag(114);
-        output.WriteString(BarCord);
-      }
-      if (HasBarStringPiece) {
-        output.WriteRawTag(122);
-        output.WriteString(BarStringPiece);
-      }
-      if (HasBarBytes) {
-        output.WriteRawTag(130, 1);
-        output.WriteBytes(BarBytes);
-      }
-      if (HasBarEnum) {
-        output.WriteRawTag(136, 1);
-        output.WriteEnum((int) BarEnum);
-      }
-      if (HasBazInt) {
-        output.WriteRawTag(144, 1);
-        output.WriteInt32(BazInt);
-      }
-      if (HasBazString) {
-        output.WriteRawTag(154, 1);
-        output.WriteString(BazString);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (HasFooInt) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(FooInt);
-      }
-      if (HasFooString) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(FooString);
-      }
-      if (HasFooCord) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(FooCord);
-      }
-      if (HasFooStringPiece) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(FooStringPiece);
-      }
-      if (HasFooBytes) {
-        size += 1 + pb::CodedOutputStream.ComputeBytesSize(FooBytes);
-      }
-      if (HasFooEnum) {
-        size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) FooEnum);
-      }
-      if (fooCase_ == FooOneofCase.FooMessage) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(FooMessage);
-      }
-      if (HasFooGroup) {
-        size += 2 + pb::CodedOutputStream.ComputeGroupSize(FooGroup);
-      }
-      if (fooCase_ == FooOneofCase.FooLazyMessage) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(FooLazyMessage);
-      }
-      if (HasBarInt) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(BarInt);
-      }
-      if (HasBarString) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(BarString);
-      }
-      if (HasBarCord) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(BarCord);
-      }
-      if (HasBarStringPiece) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(BarStringPiece);
-      }
-      if (HasBarBytes) {
-        size += 2 + pb::CodedOutputStream.ComputeBytesSize(BarBytes);
-      }
-      if (HasBarEnum) {
-        size += 2 + pb::CodedOutputStream.ComputeEnumSize((int) BarEnum);
-      }
-      if (HasBazInt) {
-        size += 2 + pb::CodedOutputStream.ComputeInt32Size(BazInt);
-      }
-      if (HasBazString) {
-        size += 2 + pb::CodedOutputStream.ComputeStringSize(BazString);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(TestOneof2 other) {
-      if (other == null) {
-        return;
-      }
-      if (other.HasBazInt) {
-        BazInt = other.BazInt;
-      }
-      if (other.HasBazString) {
-        BazString = other.BazString;
-      }
-      switch (other.FooCase) {
-        case FooOneofCase.FooInt:
-          FooInt = other.FooInt;
-          break;
-        case FooOneofCase.FooString:
-          FooString = other.FooString;
-          break;
-        case FooOneofCase.FooCord:
-          FooCord = other.FooCord;
-          break;
-        case FooOneofCase.FooStringPiece:
-          FooStringPiece = other.FooStringPiece;
-          break;
-        case FooOneofCase.FooBytes:
-          FooBytes = other.FooBytes;
-          break;
-        case FooOneofCase.FooEnum:
-          FooEnum = other.FooEnum;
-          break;
-        case FooOneofCase.FooMessage:
-          if (FooMessage == null) {
-            FooMessage = new global::Google.Protobuf.TestProtos.Proto2.TestOneof2.Types.NestedMessage();
-          }
-          FooMessage.MergeFrom(other.FooMessage);
-          break;
-        case FooOneofCase.FooGroup:
-          if (FooGroup == null) {
-            FooGroup = new global::Google.Protobuf.TestProtos.Proto2.TestOneof2.Types.FooGroup();
-          }
-          FooGroup.MergeFrom(other.FooGroup);
-          break;
-        case FooOneofCase.FooLazyMessage:
-          if (FooLazyMessage == null) {
-            FooLazyMessage = new global::Google.Protobuf.TestProtos.Proto2.TestOneof2.Types.NestedMessage();
-          }
-          FooLazyMessage.MergeFrom(other.FooLazyMessage);
-          break;
-      }
-
-      switch (other.BarCase) {
-        case BarOneofCase.BarInt:
-          BarInt = other.BarInt;
-          break;
-        case BarOneofCase.BarString:
-          BarString = other.BarString;
-          break;
-        case BarOneofCase.BarCord:
-          BarCord = other.BarCord;
-          break;
-        case BarOneofCase.BarStringPiece:
-          BarStringPiece = other.BarStringPiece;
-          break;
-        case BarOneofCase.BarBytes:
-          BarBytes = other.BarBytes;
-          break;
-        case BarOneofCase.BarEnum:
-          BarEnum = other.BarEnum;
-          break;
-      }
-
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 8: {
-            FooInt = input.ReadInt32();
-            break;
-          }
-          case 18: {
-            FooString = input.ReadString();
-            break;
-          }
-          case 26: {
-            FooCord = input.ReadString();
-            break;
-          }
-          case 34: {
-            FooStringPiece = input.ReadString();
-            break;
-          }
-          case 42: {
-            FooBytes = input.ReadBytes();
-            break;
-          }
-          case 48: {
-            foo_ = input.ReadEnum();
-            fooCase_ = FooOneofCase.FooEnum;
-            break;
-          }
-          case 58: {
-            global::Google.Protobuf.TestProtos.Proto2.TestOneof2.Types.NestedMessage subBuilder = new global::Google.Protobuf.TestProtos.Proto2.TestOneof2.Types.NestedMessage();
-            if (fooCase_ == FooOneofCase.FooMessage) {
-              subBuilder.MergeFrom(FooMessage);
-            }
-            input.ReadMessage(subBuilder);
-            FooMessage = subBuilder;
-            break;
-          }
-          case 67: {
-            global::Google.Protobuf.TestProtos.Proto2.TestOneof2.Types.FooGroup subBuilder = new global::Google.Protobuf.TestProtos.Proto2.TestOneof2.Types.FooGroup();
-            if (HasFooGroup) {
-              subBuilder.MergeFrom(FooGroup);
-            }
-            input.ReadGroup(subBuilder);
-            FooGroup = subBuilder;
-            break;
-          }
-          case 90: {
-            global::Google.Protobuf.TestProtos.Proto2.TestOneof2.Types.NestedMessage subBuilder = new global::Google.Protobuf.TestProtos.Proto2.TestOneof2.Types.NestedMessage();
-            if (fooCase_ == FooOneofCase.FooLazyMessage) {
-              subBuilder.MergeFrom(FooLazyMessage);
-            }
-            input.ReadMessage(subBuilder);
-            FooLazyMessage = subBuilder;
-            break;
-          }
-          case 96: {
-            BarInt = input.ReadInt32();
-            break;
-          }
-          case 106: {
-            BarString = input.ReadString();
-            break;
-          }
-          case 114: {
-            BarCord = input.ReadString();
-            break;
-          }
-          case 122: {
-            BarStringPiece = input.ReadString();
-            break;
-          }
-          case 130: {
-            BarBytes = input.ReadBytes();
-            break;
-          }
-          case 136: {
-            bar_ = input.ReadEnum();
-            barCase_ = BarOneofCase.BarEnum;
-            break;
-          }
-          case 144: {
-            BazInt = input.ReadInt32();
-            break;
-          }
-          case 154: {
-            BazString = input.ReadString();
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 8: {
-            FooInt = input.ReadInt32();
-            break;
-          }
-          case 18: {
-            FooString = input.ReadString();
-            break;
-          }
-          case 26: {
-            FooCord = input.ReadString();
-            break;
-          }
-          case 34: {
-            FooStringPiece = input.ReadString();
-            break;
-          }
-          case 42: {
-            FooBytes = input.ReadBytes();
-            break;
-          }
-          case 48: {
-            foo_ = input.ReadEnum();
-            fooCase_ = FooOneofCase.FooEnum;
-            break;
-          }
-          case 58: {
-            global::Google.Protobuf.TestProtos.Proto2.TestOneof2.Types.NestedMessage subBuilder = new global::Google.Protobuf.TestProtos.Proto2.TestOneof2.Types.NestedMessage();
-            if (fooCase_ == FooOneofCase.FooMessage) {
-              subBuilder.MergeFrom(FooMessage);
-            }
-            input.ReadMessage(subBuilder);
-            FooMessage = subBuilder;
-            break;
-          }
-          case 67: {
-            global::Google.Protobuf.TestProtos.Proto2.TestOneof2.Types.FooGroup subBuilder = new global::Google.Protobuf.TestProtos.Proto2.TestOneof2.Types.FooGroup();
-            if (HasFooGroup) {
-              subBuilder.MergeFrom(FooGroup);
-            }
-            input.ReadGroup(subBuilder);
-            FooGroup = subBuilder;
-            break;
-          }
-          case 90: {
-            global::Google.Protobuf.TestProtos.Proto2.TestOneof2.Types.NestedMessage subBuilder = new global::Google.Protobuf.TestProtos.Proto2.TestOneof2.Types.NestedMessage();
-            if (fooCase_ == FooOneofCase.FooLazyMessage) {
-              subBuilder.MergeFrom(FooLazyMessage);
-            }
-            input.ReadMessage(subBuilder);
-            FooLazyMessage = subBuilder;
-            break;
-          }
-          case 96: {
-            BarInt = input.ReadInt32();
-            break;
-          }
-          case 106: {
-            BarString = input.ReadString();
-            break;
-          }
-          case 114: {
-            BarCord = input.ReadString();
-            break;
-          }
-          case 122: {
-            BarStringPiece = input.ReadString();
-            break;
-          }
-          case 130: {
-            BarBytes = input.ReadBytes();
-            break;
-          }
-          case 136: {
-            bar_ = input.ReadEnum();
-            barCase_ = BarOneofCase.BarEnum;
-            break;
-          }
-          case 144: {
-            BazInt = input.ReadInt32();
-            break;
-          }
-          case 154: {
-            BazString = input.ReadString();
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-    #region Nested types
-    /// <summary>Container for nested types declared in the TestOneof2 message type.</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static partial class Types {
-      public enum NestedEnum {
-        [pbr::OriginalName("FOO")] Foo = 1,
-        [pbr::OriginalName("BAR")] Bar = 2,
-        [pbr::OriginalName("BAZ")] Baz = 3,
-      }
-
-      public sealed partial class FooGroup : pb::IMessage<FooGroup>
-      #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          , pb::IBufferMessage
-      #endif
-      {
-        private static readonly pb::MessageParser<FooGroup> _parser = new pb::MessageParser<FooGroup>(() => new FooGroup());
-        private pb::UnknownFieldSet _unknownFields;
-        private int _hasBits0;
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static pb::MessageParser<FooGroup> Parser { get { return _parser; } }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static pbr::MessageDescriptor Descriptor {
-          get { return global::Google.Protobuf.TestProtos.Proto2.TestOneof2.Descriptor.NestedTypes[0]; }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        pbr::MessageDescriptor pb::IMessage.Descriptor {
-          get { return Descriptor; }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public FooGroup() {
-          OnConstruction();
-        }
-
-        partial void OnConstruction();
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public FooGroup(FooGroup other) : this() {
-          _hasBits0 = other._hasBits0;
-          a_ = other.a_;
-          b_ = other.b_;
-          _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public FooGroup Clone() {
-          return new FooGroup(this);
-        }
-
-        /// <summary>Field number for the "a" field.</summary>
-        public const int AFieldNumber = 9;
-        private readonly static int ADefaultValue = 0;
-
-        private int a_;
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public int A {
-          get { if ((_hasBits0 & 1) != 0) { return a_; } else { return ADefaultValue; } }
-          set {
-            _hasBits0 |= 1;
-            a_ = value;
-          }
-        }
-        /// <summary>Gets whether the "a" field is set</summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool HasA {
-          get { return (_hasBits0 & 1) != 0; }
-        }
-        /// <summary>Clears the value of the "a" field</summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void ClearA() {
-          _hasBits0 &= ~1;
-        }
-
-        /// <summary>Field number for the "b" field.</summary>
-        public const int BFieldNumber = 10;
-        private readonly static string BDefaultValue = "";
-
-        private string b_;
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public string B {
-          get { return b_ ?? BDefaultValue; }
-          set {
-            b_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-          }
-        }
-        /// <summary>Gets whether the "b" field is set</summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool HasB {
-          get { return b_ != null; }
-        }
-        /// <summary>Clears the value of the "b" field</summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void ClearB() {
-          b_ = null;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override bool Equals(object other) {
-          return Equals(other as FooGroup);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool Equals(FooGroup other) {
-          if (ReferenceEquals(other, null)) {
-            return false;
-          }
-          if (ReferenceEquals(other, this)) {
-            return true;
-          }
-          if (A != other.A) return false;
-          if (B != other.B) return false;
-          return Equals(_unknownFields, other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override int GetHashCode() {
-          int hash = 1;
-          if (HasA) hash ^= A.GetHashCode();
-          if (HasB) hash ^= B.GetHashCode();
-          if (_unknownFields != null) {
-            hash ^= _unknownFields.GetHashCode();
-          }
-          return hash;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override string ToString() {
-          return pb::JsonFormatter.ToDiagnosticString(this);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void WriteTo(pb::CodedOutputStream output) {
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          output.WriteRawMessage(this);
-        #else
-          if (HasA) {
-            output.WriteRawTag(72);
-            output.WriteInt32(A);
-          }
-          if (HasB) {
-            output.WriteRawTag(82);
-            output.WriteString(B);
-          }
-          if (_unknownFields != null) {
-            _unknownFields.WriteTo(output);
-          }
-        #endif
-        }
-
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-          if (HasA) {
-            output.WriteRawTag(72);
-            output.WriteInt32(A);
-          }
-          if (HasB) {
-            output.WriteRawTag(82);
-            output.WriteString(B);
-          }
-          if (_unknownFields != null) {
-            _unknownFields.WriteTo(ref output);
-          }
-        }
-        #endif
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public int CalculateSize() {
-          int size = 0;
-          if (HasA) {
-            size += 1 + pb::CodedOutputStream.ComputeInt32Size(A);
-          }
-          if (HasB) {
-            size += 1 + pb::CodedOutputStream.ComputeStringSize(B);
-          }
-          if (_unknownFields != null) {
-            size += _unknownFields.CalculateSize();
-          }
-          return size;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(FooGroup other) {
-          if (other == null) {
-            return;
-          }
-          if (other.HasA) {
-            A = other.A;
-          }
-          if (other.HasB) {
-            B = other.B;
-          }
-          _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(pb::CodedInputStream input) {
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          input.ReadRawMessage(this);
-        #else
-          uint tag;
-          while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
-              case 68:
-                return;
-              default:
-                _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-                break;
-              case 72: {
-                A = input.ReadInt32();
-                break;
-              }
-              case 82: {
-                B = input.ReadString();
-                break;
-              }
-            }
-          }
-        #endif
-        }
-
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-          uint tag;
-          while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
-              case 68:
-                return;
-              default:
-                _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-                break;
-              case 72: {
-                A = input.ReadInt32();
-                break;
-              }
-              case 82: {
-                B = input.ReadString();
-                break;
-              }
-            }
-          }
-        }
-        #endif
-
-      }
-
-      public sealed partial class NestedMessage : pb::IMessage<NestedMessage>
-      #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          , pb::IBufferMessage
-      #endif
-      {
-        private static readonly pb::MessageParser<NestedMessage> _parser = new pb::MessageParser<NestedMessage>(() => new NestedMessage());
-        private pb::UnknownFieldSet _unknownFields;
-        private int _hasBits0;
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static pb::MessageParser<NestedMessage> Parser { get { return _parser; } }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static pbr::MessageDescriptor Descriptor {
-          get { return global::Google.Protobuf.TestProtos.Proto2.TestOneof2.Descriptor.NestedTypes[1]; }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        pbr::MessageDescriptor pb::IMessage.Descriptor {
-          get { return Descriptor; }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public NestedMessage() {
-          OnConstruction();
-        }
-
-        partial void OnConstruction();
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public NestedMessage(NestedMessage other) : this() {
-          _hasBits0 = other._hasBits0;
-          quxInt_ = other.quxInt_;
-          corgeInt_ = other.corgeInt_.Clone();
-          _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public NestedMessage Clone() {
-          return new NestedMessage(this);
-        }
-
-        /// <summary>Field number for the "qux_int" field.</summary>
-        public const int QuxIntFieldNumber = 1;
-        private readonly static long QuxIntDefaultValue = 0L;
-
-        private long quxInt_;
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public long QuxInt {
-          get { if ((_hasBits0 & 1) != 0) { return quxInt_; } else { return QuxIntDefaultValue; } }
-          set {
-            _hasBits0 |= 1;
-            quxInt_ = value;
-          }
-        }
-        /// <summary>Gets whether the "qux_int" field is set</summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool HasQuxInt {
-          get { return (_hasBits0 & 1) != 0; }
-        }
-        /// <summary>Clears the value of the "qux_int" field</summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void ClearQuxInt() {
-          _hasBits0 &= ~1;
-        }
-
-        /// <summary>Field number for the "corge_int" field.</summary>
-        public const int CorgeIntFieldNumber = 2;
-        private static readonly pb::FieldCodec<int> _repeated_corgeInt_codec
-            = pb::FieldCodec.ForInt32(16);
-        private readonly pbc::RepeatedField<int> corgeInt_ = new pbc::RepeatedField<int>();
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public pbc::RepeatedField<int> CorgeInt {
-          get { return corgeInt_; }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override bool Equals(object other) {
-          return Equals(other as NestedMessage);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool Equals(NestedMessage other) {
-          if (ReferenceEquals(other, null)) {
-            return false;
-          }
-          if (ReferenceEquals(other, this)) {
-            return true;
-          }
-          if (QuxInt != other.QuxInt) return false;
-          if(!corgeInt_.Equals(other.corgeInt_)) return false;
-          return Equals(_unknownFields, other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override int GetHashCode() {
-          int hash = 1;
-          if (HasQuxInt) hash ^= QuxInt.GetHashCode();
-          hash ^= corgeInt_.GetHashCode();
-          if (_unknownFields != null) {
-            hash ^= _unknownFields.GetHashCode();
-          }
-          return hash;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override string ToString() {
-          return pb::JsonFormatter.ToDiagnosticString(this);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void WriteTo(pb::CodedOutputStream output) {
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          output.WriteRawMessage(this);
-        #else
-          if (HasQuxInt) {
-            output.WriteRawTag(8);
-            output.WriteInt64(QuxInt);
-          }
-          corgeInt_.WriteTo(output, _repeated_corgeInt_codec);
-          if (_unknownFields != null) {
-            _unknownFields.WriteTo(output);
-          }
-        #endif
-        }
-
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-          if (HasQuxInt) {
-            output.WriteRawTag(8);
-            output.WriteInt64(QuxInt);
-          }
-          corgeInt_.WriteTo(ref output, _repeated_corgeInt_codec);
-          if (_unknownFields != null) {
-            _unknownFields.WriteTo(ref output);
-          }
-        }
-        #endif
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public int CalculateSize() {
-          int size = 0;
-          if (HasQuxInt) {
-            size += 1 + pb::CodedOutputStream.ComputeInt64Size(QuxInt);
-          }
-          size += corgeInt_.CalculateSize(_repeated_corgeInt_codec);
-          if (_unknownFields != null) {
-            size += _unknownFields.CalculateSize();
-          }
-          return size;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(NestedMessage other) {
-          if (other == null) {
-            return;
-          }
-          if (other.HasQuxInt) {
-            QuxInt = other.QuxInt;
-          }
-          corgeInt_.Add(other.corgeInt_);
-          _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(pb::CodedInputStream input) {
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          input.ReadRawMessage(this);
-        #else
-          uint tag;
-          while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
-              default:
-                _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-                break;
-              case 8: {
-                QuxInt = input.ReadInt64();
-                break;
-              }
-              case 18:
-              case 16: {
-                corgeInt_.AddEntriesFrom(input, _repeated_corgeInt_codec);
-                break;
-              }
-            }
-          }
-        #endif
-        }
-
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-          uint tag;
-          while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
-              default:
-                _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-                break;
-              case 8: {
-                QuxInt = input.ReadInt64();
-                break;
-              }
-              case 18:
-              case 16: {
-                corgeInt_.AddEntriesFrom(ref input, _repeated_corgeInt_codec);
-                break;
-              }
-            }
-          }
-        }
-        #endif
-
-      }
-
-    }
-    #endregion
-
-  }
-
-  public sealed partial class TestRequiredOneof : pb::IMessage<TestRequiredOneof>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<TestRequiredOneof> _parser = new pb::MessageParser<TestRequiredOneof>(() => new TestRequiredOneof());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<TestRequiredOneof> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.Proto2.UnittestReflection.Descriptor.MessageTypes[46]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestRequiredOneof() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestRequiredOneof(TestRequiredOneof other) : this() {
-      switch (other.FooCase) {
-        case FooOneofCase.FooInt:
-          FooInt = other.FooInt;
-          break;
-        case FooOneofCase.FooString:
-          FooString = other.FooString;
-          break;
-        case FooOneofCase.FooMessage:
-          FooMessage = other.FooMessage.Clone();
-          break;
-      }
-
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestRequiredOneof Clone() {
-      return new TestRequiredOneof(this);
-    }
-
-    /// <summary>Field number for the "foo_int" field.</summary>
-    public const int FooIntFieldNumber = 1;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int FooInt {
-      get { return HasFooInt ? (int) foo_ : 0; }
-      set {
-        foo_ = value;
-        fooCase_ = FooOneofCase.FooInt;
-      }
-    }
-    /// <summary>Gets whether the "foo_int" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasFooInt {
-      get { return fooCase_ == FooOneofCase.FooInt; }
-    }
-    /// <summary> Clears the value of the oneof if it's currently set to "foo_int" </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearFooInt() {
-      if (HasFooInt) {
-        ClearFoo();
-      }
-    }
-
-    /// <summary>Field number for the "foo_string" field.</summary>
-    public const int FooStringFieldNumber = 2;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string FooString {
-      get { return HasFooString ? (string) foo_ : ""; }
-      set {
-        foo_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-        fooCase_ = FooOneofCase.FooString;
-      }
-    }
-    /// <summary>Gets whether the "foo_string" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasFooString {
-      get { return fooCase_ == FooOneofCase.FooString; }
-    }
-    /// <summary> Clears the value of the oneof if it's currently set to "foo_string" </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearFooString() {
-      if (HasFooString) {
-        ClearFoo();
-      }
-    }
-
-    /// <summary>Field number for the "foo_message" field.</summary>
-    public const int FooMessageFieldNumber = 3;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.TestProtos.Proto2.TestRequiredOneof.Types.NestedMessage FooMessage {
-      get { return fooCase_ == FooOneofCase.FooMessage ? (global::Google.Protobuf.TestProtos.Proto2.TestRequiredOneof.Types.NestedMessage) foo_ : null; }
-      set {
-        foo_ = value;
-        fooCase_ = value == null ? FooOneofCase.None : FooOneofCase.FooMessage;
-      }
-    }
-
-    private object foo_;
-    /// <summary>Enum of possible cases for the "foo" oneof.</summary>
-    public enum FooOneofCase {
-      None = 0,
-      FooInt = 1,
-      FooString = 2,
-      FooMessage = 3,
-    }
-    private FooOneofCase fooCase_ = FooOneofCase.None;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public FooOneofCase FooCase {
-      get { return fooCase_; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearFoo() {
-      fooCase_ = FooOneofCase.None;
-      foo_ = null;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as TestRequiredOneof);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(TestRequiredOneof other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (FooInt != other.FooInt) return false;
-      if (FooString != other.FooString) return false;
-      if (!object.Equals(FooMessage, other.FooMessage)) return false;
-      if (FooCase != other.FooCase) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (HasFooInt) hash ^= FooInt.GetHashCode();
-      if (HasFooString) hash ^= FooString.GetHashCode();
-      if (fooCase_ == FooOneofCase.FooMessage) hash ^= FooMessage.GetHashCode();
-      hash ^= (int) fooCase_;
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (HasFooInt) {
-        output.WriteRawTag(8);
-        output.WriteInt32(FooInt);
-      }
-      if (HasFooString) {
-        output.WriteRawTag(18);
-        output.WriteString(FooString);
-      }
-      if (fooCase_ == FooOneofCase.FooMessage) {
-        output.WriteRawTag(26);
-        output.WriteMessage(FooMessage);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (HasFooInt) {
-        output.WriteRawTag(8);
-        output.WriteInt32(FooInt);
-      }
-      if (HasFooString) {
-        output.WriteRawTag(18);
-        output.WriteString(FooString);
-      }
-      if (fooCase_ == FooOneofCase.FooMessage) {
-        output.WriteRawTag(26);
-        output.WriteMessage(FooMessage);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (HasFooInt) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(FooInt);
-      }
-      if (HasFooString) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(FooString);
-      }
-      if (fooCase_ == FooOneofCase.FooMessage) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(FooMessage);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(TestRequiredOneof other) {
-      if (other == null) {
-        return;
-      }
-      switch (other.FooCase) {
-        case FooOneofCase.FooInt:
-          FooInt = other.FooInt;
-          break;
-        case FooOneofCase.FooString:
-          FooString = other.FooString;
-          break;
-        case FooOneofCase.FooMessage:
-          if (FooMessage == null) {
-            FooMessage = new global::Google.Protobuf.TestProtos.Proto2.TestRequiredOneof.Types.NestedMessage();
-          }
-          FooMessage.MergeFrom(other.FooMessage);
-          break;
-      }
-
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 8: {
-            FooInt = input.ReadInt32();
-            break;
-          }
-          case 18: {
-            FooString = input.ReadString();
-            break;
-          }
-          case 26: {
-            global::Google.Protobuf.TestProtos.Proto2.TestRequiredOneof.Types.NestedMessage subBuilder = new global::Google.Protobuf.TestProtos.Proto2.TestRequiredOneof.Types.NestedMessage();
-            if (fooCase_ == FooOneofCase.FooMessage) {
-              subBuilder.MergeFrom(FooMessage);
-            }
-            input.ReadMessage(subBuilder);
-            FooMessage = subBuilder;
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 8: {
-            FooInt = input.ReadInt32();
-            break;
-          }
-          case 18: {
-            FooString = input.ReadString();
-            break;
-          }
-          case 26: {
-            global::Google.Protobuf.TestProtos.Proto2.TestRequiredOneof.Types.NestedMessage subBuilder = new global::Google.Protobuf.TestProtos.Proto2.TestRequiredOneof.Types.NestedMessage();
-            if (fooCase_ == FooOneofCase.FooMessage) {
-              subBuilder.MergeFrom(FooMessage);
-            }
-            input.ReadMessage(subBuilder);
-            FooMessage = subBuilder;
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-    #region Nested types
-    /// <summary>Container for nested types declared in the TestRequiredOneof message type.</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static partial class Types {
-      public sealed partial class NestedMessage : pb::IMessage<NestedMessage>
-      #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          , pb::IBufferMessage
-      #endif
-      {
-        private static readonly pb::MessageParser<NestedMessage> _parser = new pb::MessageParser<NestedMessage>(() => new NestedMessage());
-        private pb::UnknownFieldSet _unknownFields;
-        private int _hasBits0;
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static pb::MessageParser<NestedMessage> Parser { get { return _parser; } }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static pbr::MessageDescriptor Descriptor {
-          get { return global::Google.Protobuf.TestProtos.Proto2.TestRequiredOneof.Descriptor.NestedTypes[0]; }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        pbr::MessageDescriptor pb::IMessage.Descriptor {
-          get { return Descriptor; }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public NestedMessage() {
-          OnConstruction();
-        }
-
-        partial void OnConstruction();
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public NestedMessage(NestedMessage other) : this() {
-          _hasBits0 = other._hasBits0;
-          requiredDouble_ = other.requiredDouble_;
-          _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public NestedMessage Clone() {
-          return new NestedMessage(this);
-        }
-
-        /// <summary>Field number for the "required_double" field.</summary>
-        public const int RequiredDoubleFieldNumber = 1;
-        private readonly static double RequiredDoubleDefaultValue = 0D;
-
-        private double requiredDouble_;
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public double RequiredDouble {
-          get { if ((_hasBits0 & 1) != 0) { return requiredDouble_; } else { return RequiredDoubleDefaultValue; } }
-          set {
-            _hasBits0 |= 1;
-            requiredDouble_ = value;
-          }
-        }
-        /// <summary>Gets whether the "required_double" field is set</summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool HasRequiredDouble {
-          get { return (_hasBits0 & 1) != 0; }
-        }
-        /// <summary>Clears the value of the "required_double" field</summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void ClearRequiredDouble() {
-          _hasBits0 &= ~1;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override bool Equals(object other) {
-          return Equals(other as NestedMessage);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool Equals(NestedMessage other) {
-          if (ReferenceEquals(other, null)) {
-            return false;
-          }
-          if (ReferenceEquals(other, this)) {
-            return true;
-          }
-          if (!pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.Equals(RequiredDouble, other.RequiredDouble)) return false;
-          return Equals(_unknownFields, other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override int GetHashCode() {
-          int hash = 1;
-          if (HasRequiredDouble) hash ^= pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.GetHashCode(RequiredDouble);
-          if (_unknownFields != null) {
-            hash ^= _unknownFields.GetHashCode();
-          }
-          return hash;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override string ToString() {
-          return pb::JsonFormatter.ToDiagnosticString(this);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void WriteTo(pb::CodedOutputStream output) {
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          output.WriteRawMessage(this);
-        #else
-          if (HasRequiredDouble) {
-            output.WriteRawTag(9);
-            output.WriteDouble(RequiredDouble);
-          }
-          if (_unknownFields != null) {
-            _unknownFields.WriteTo(output);
-          }
-        #endif
-        }
-
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-          if (HasRequiredDouble) {
-            output.WriteRawTag(9);
-            output.WriteDouble(RequiredDouble);
-          }
-          if (_unknownFields != null) {
-            _unknownFields.WriteTo(ref output);
-          }
-        }
-        #endif
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public int CalculateSize() {
-          int size = 0;
-          if (HasRequiredDouble) {
-            size += 1 + 8;
-          }
-          if (_unknownFields != null) {
-            size += _unknownFields.CalculateSize();
-          }
-          return size;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(NestedMessage other) {
-          if (other == null) {
-            return;
-          }
-          if (other.HasRequiredDouble) {
-            RequiredDouble = other.RequiredDouble;
-          }
-          _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(pb::CodedInputStream input) {
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          input.ReadRawMessage(this);
-        #else
-          uint tag;
-          while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
-              default:
-                _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-                break;
-              case 9: {
-                RequiredDouble = input.ReadDouble();
-                break;
-              }
-            }
-          }
-        #endif
-        }
-
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-          uint tag;
-          while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
-              default:
-                _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-                break;
-              case 9: {
-                RequiredDouble = input.ReadDouble();
-                break;
-              }
-            }
-          }
-        }
-        #endif
-
-      }
-
-    }
-    #endregion
-
-  }
-
-  public sealed partial class TestRequiredMap : pb::IMessage<TestRequiredMap>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<TestRequiredMap> _parser = new pb::MessageParser<TestRequiredMap>(() => new TestRequiredMap());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<TestRequiredMap> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.Proto2.UnittestReflection.Descriptor.MessageTypes[47]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestRequiredMap() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestRequiredMap(TestRequiredMap other) : this() {
-      foo_ = other.foo_.Clone();
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestRequiredMap Clone() {
-      return new TestRequiredMap(this);
-    }
-
-    /// <summary>Field number for the "foo" field.</summary>
-    public const int FooFieldNumber = 1;
-    private static readonly pbc::MapField<int, global::Google.Protobuf.TestProtos.Proto2.TestRequiredMap.Types.NestedMessage>.Codec _map_foo_codec
-        = new pbc::MapField<int, global::Google.Protobuf.TestProtos.Proto2.TestRequiredMap.Types.NestedMessage>.Codec(pb::FieldCodec.ForInt32(8, 0), pb::FieldCodec.ForMessage(18, global::Google.Protobuf.TestProtos.Proto2.TestRequiredMap.Types.NestedMessage.Parser), 10);
-    private readonly pbc::MapField<int, global::Google.Protobuf.TestProtos.Proto2.TestRequiredMap.Types.NestedMessage> foo_ = new pbc::MapField<int, global::Google.Protobuf.TestProtos.Proto2.TestRequiredMap.Types.NestedMessage>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::MapField<int, global::Google.Protobuf.TestProtos.Proto2.TestRequiredMap.Types.NestedMessage> Foo {
-      get { return foo_; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as TestRequiredMap);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(TestRequiredMap other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (!Foo.Equals(other.Foo)) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      hash ^= Foo.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      foo_.WriteTo(output, _map_foo_codec);
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      foo_.WriteTo(ref output, _map_foo_codec);
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      size += foo_.CalculateSize(_map_foo_codec);
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(TestRequiredMap other) {
-      if (other == null) {
-        return;
-      }
-      foo_.Add(other.foo_);
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 10: {
-            foo_.AddEntriesFrom(input, _map_foo_codec);
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 10: {
-            foo_.AddEntriesFrom(ref input, _map_foo_codec);
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-    #region Nested types
-    /// <summary>Container for nested types declared in the TestRequiredMap message type.</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static partial class Types {
-      public sealed partial class NestedMessage : pb::IMessage<NestedMessage>
-      #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          , pb::IBufferMessage
-      #endif
-      {
-        private static readonly pb::MessageParser<NestedMessage> _parser = new pb::MessageParser<NestedMessage>(() => new NestedMessage());
-        private pb::UnknownFieldSet _unknownFields;
-        private int _hasBits0;
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static pb::MessageParser<NestedMessage> Parser { get { return _parser; } }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static pbr::MessageDescriptor Descriptor {
-          get { return global::Google.Protobuf.TestProtos.Proto2.TestRequiredMap.Descriptor.NestedTypes[1]; }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        pbr::MessageDescriptor pb::IMessage.Descriptor {
-          get { return Descriptor; }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public NestedMessage() {
-          OnConstruction();
-        }
-
-        partial void OnConstruction();
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public NestedMessage(NestedMessage other) : this() {
-          _hasBits0 = other._hasBits0;
-          requiredInt32_ = other.requiredInt32_;
-          _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public NestedMessage Clone() {
-          return new NestedMessage(this);
-        }
-
-        /// <summary>Field number for the "required_int32" field.</summary>
-        public const int RequiredInt32FieldNumber = 1;
-        private readonly static int RequiredInt32DefaultValue = 0;
-
-        private int requiredInt32_;
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public int RequiredInt32 {
-          get { if ((_hasBits0 & 1) != 0) { return requiredInt32_; } else { return RequiredInt32DefaultValue; } }
-          set {
-            _hasBits0 |= 1;
-            requiredInt32_ = value;
-          }
-        }
-        /// <summary>Gets whether the "required_int32" field is set</summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool HasRequiredInt32 {
-          get { return (_hasBits0 & 1) != 0; }
-        }
-        /// <summary>Clears the value of the "required_int32" field</summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void ClearRequiredInt32() {
-          _hasBits0 &= ~1;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override bool Equals(object other) {
-          return Equals(other as NestedMessage);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool Equals(NestedMessage other) {
-          if (ReferenceEquals(other, null)) {
-            return false;
-          }
-          if (ReferenceEquals(other, this)) {
-            return true;
-          }
-          if (RequiredInt32 != other.RequiredInt32) return false;
-          return Equals(_unknownFields, other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override int GetHashCode() {
-          int hash = 1;
-          if (HasRequiredInt32) hash ^= RequiredInt32.GetHashCode();
-          if (_unknownFields != null) {
-            hash ^= _unknownFields.GetHashCode();
-          }
-          return hash;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override string ToString() {
-          return pb::JsonFormatter.ToDiagnosticString(this);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void WriteTo(pb::CodedOutputStream output) {
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          output.WriteRawMessage(this);
-        #else
-          if (HasRequiredInt32) {
-            output.WriteRawTag(8);
-            output.WriteInt32(RequiredInt32);
-          }
-          if (_unknownFields != null) {
-            _unknownFields.WriteTo(output);
-          }
-        #endif
-        }
-
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-          if (HasRequiredInt32) {
-            output.WriteRawTag(8);
-            output.WriteInt32(RequiredInt32);
-          }
-          if (_unknownFields != null) {
-            _unknownFields.WriteTo(ref output);
-          }
-        }
-        #endif
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public int CalculateSize() {
-          int size = 0;
-          if (HasRequiredInt32) {
-            size += 1 + pb::CodedOutputStream.ComputeInt32Size(RequiredInt32);
-          }
-          if (_unknownFields != null) {
-            size += _unknownFields.CalculateSize();
-          }
-          return size;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(NestedMessage other) {
-          if (other == null) {
-            return;
-          }
-          if (other.HasRequiredInt32) {
-            RequiredInt32 = other.RequiredInt32;
-          }
-          _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(pb::CodedInputStream input) {
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          input.ReadRawMessage(this);
-        #else
-          uint tag;
-          while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
-              default:
-                _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-                break;
-              case 8: {
-                RequiredInt32 = input.ReadInt32();
-                break;
-              }
-            }
-          }
-        #endif
-        }
-
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-          uint tag;
-          while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
-              default:
-                _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-                break;
-              case 8: {
-                RequiredInt32 = input.ReadInt32();
-                break;
-              }
-            }
-          }
-        }
-        #endif
-
-      }
-
-    }
-    #endregion
-
-  }
-
-  public sealed partial class TestPackedTypes : pb::IMessage<TestPackedTypes>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<TestPackedTypes> _parser = new pb::MessageParser<TestPackedTypes>(() => new TestPackedTypes());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<TestPackedTypes> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.Proto2.UnittestReflection.Descriptor.MessageTypes[48]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestPackedTypes() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestPackedTypes(TestPackedTypes other) : this() {
-      packedInt32_ = other.packedInt32_.Clone();
-      packedInt64_ = other.packedInt64_.Clone();
-      packedUint32_ = other.packedUint32_.Clone();
-      packedUint64_ = other.packedUint64_.Clone();
-      packedSint32_ = other.packedSint32_.Clone();
-      packedSint64_ = other.packedSint64_.Clone();
-      packedFixed32_ = other.packedFixed32_.Clone();
-      packedFixed64_ = other.packedFixed64_.Clone();
-      packedSfixed32_ = other.packedSfixed32_.Clone();
-      packedSfixed64_ = other.packedSfixed64_.Clone();
-      packedFloat_ = other.packedFloat_.Clone();
-      packedDouble_ = other.packedDouble_.Clone();
-      packedBool_ = other.packedBool_.Clone();
-      packedEnum_ = other.packedEnum_.Clone();
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestPackedTypes Clone() {
-      return new TestPackedTypes(this);
-    }
-
-    /// <summary>Field number for the "packed_int32" field.</summary>
-    public const int PackedInt32FieldNumber = 90;
-    private static readonly pb::FieldCodec<int> _repeated_packedInt32_codec
-        = pb::FieldCodec.ForInt32(722);
-    private readonly pbc::RepeatedField<int> packedInt32_ = new pbc::RepeatedField<int>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<int> PackedInt32 {
-      get { return packedInt32_; }
-    }
-
-    /// <summary>Field number for the "packed_int64" field.</summary>
-    public const int PackedInt64FieldNumber = 91;
-    private static readonly pb::FieldCodec<long> _repeated_packedInt64_codec
-        = pb::FieldCodec.ForInt64(730);
-    private readonly pbc::RepeatedField<long> packedInt64_ = new pbc::RepeatedField<long>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<long> PackedInt64 {
-      get { return packedInt64_; }
-    }
-
-    /// <summary>Field number for the "packed_uint32" field.</summary>
-    public const int PackedUint32FieldNumber = 92;
-    private static readonly pb::FieldCodec<uint> _repeated_packedUint32_codec
-        = pb::FieldCodec.ForUInt32(738);
-    private readonly pbc::RepeatedField<uint> packedUint32_ = new pbc::RepeatedField<uint>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<uint> PackedUint32 {
-      get { return packedUint32_; }
-    }
-
-    /// <summary>Field number for the "packed_uint64" field.</summary>
-    public const int PackedUint64FieldNumber = 93;
-    private static readonly pb::FieldCodec<ulong> _repeated_packedUint64_codec
-        = pb::FieldCodec.ForUInt64(746);
-    private readonly pbc::RepeatedField<ulong> packedUint64_ = new pbc::RepeatedField<ulong>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<ulong> PackedUint64 {
-      get { return packedUint64_; }
-    }
-
-    /// <summary>Field number for the "packed_sint32" field.</summary>
-    public const int PackedSint32FieldNumber = 94;
-    private static readonly pb::FieldCodec<int> _repeated_packedSint32_codec
-        = pb::FieldCodec.ForSInt32(754);
-    private readonly pbc::RepeatedField<int> packedSint32_ = new pbc::RepeatedField<int>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<int> PackedSint32 {
-      get { return packedSint32_; }
-    }
-
-    /// <summary>Field number for the "packed_sint64" field.</summary>
-    public const int PackedSint64FieldNumber = 95;
-    private static readonly pb::FieldCodec<long> _repeated_packedSint64_codec
-        = pb::FieldCodec.ForSInt64(762);
-    private readonly pbc::RepeatedField<long> packedSint64_ = new pbc::RepeatedField<long>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<long> PackedSint64 {
-      get { return packedSint64_; }
-    }
-
-    /// <summary>Field number for the "packed_fixed32" field.</summary>
-    public const int PackedFixed32FieldNumber = 96;
-    private static readonly pb::FieldCodec<uint> _repeated_packedFixed32_codec
-        = pb::FieldCodec.ForFixed32(770);
-    private readonly pbc::RepeatedField<uint> packedFixed32_ = new pbc::RepeatedField<uint>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<uint> PackedFixed32 {
-      get { return packedFixed32_; }
-    }
-
-    /// <summary>Field number for the "packed_fixed64" field.</summary>
-    public const int PackedFixed64FieldNumber = 97;
-    private static readonly pb::FieldCodec<ulong> _repeated_packedFixed64_codec
-        = pb::FieldCodec.ForFixed64(778);
-    private readonly pbc::RepeatedField<ulong> packedFixed64_ = new pbc::RepeatedField<ulong>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<ulong> PackedFixed64 {
-      get { return packedFixed64_; }
-    }
-
-    /// <summary>Field number for the "packed_sfixed32" field.</summary>
-    public const int PackedSfixed32FieldNumber = 98;
-    private static readonly pb::FieldCodec<int> _repeated_packedSfixed32_codec
-        = pb::FieldCodec.ForSFixed32(786);
-    private readonly pbc::RepeatedField<int> packedSfixed32_ = new pbc::RepeatedField<int>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<int> PackedSfixed32 {
-      get { return packedSfixed32_; }
-    }
-
-    /// <summary>Field number for the "packed_sfixed64" field.</summary>
-    public const int PackedSfixed64FieldNumber = 99;
-    private static readonly pb::FieldCodec<long> _repeated_packedSfixed64_codec
-        = pb::FieldCodec.ForSFixed64(794);
-    private readonly pbc::RepeatedField<long> packedSfixed64_ = new pbc::RepeatedField<long>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<long> PackedSfixed64 {
-      get { return packedSfixed64_; }
-    }
-
-    /// <summary>Field number for the "packed_float" field.</summary>
-    public const int PackedFloatFieldNumber = 100;
-    private static readonly pb::FieldCodec<float> _repeated_packedFloat_codec
-        = pb::FieldCodec.ForFloat(802);
-    private readonly pbc::RepeatedField<float> packedFloat_ = new pbc::RepeatedField<float>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<float> PackedFloat {
-      get { return packedFloat_; }
-    }
-
-    /// <summary>Field number for the "packed_double" field.</summary>
-    public const int PackedDoubleFieldNumber = 101;
-    private static readonly pb::FieldCodec<double> _repeated_packedDouble_codec
-        = pb::FieldCodec.ForDouble(810);
-    private readonly pbc::RepeatedField<double> packedDouble_ = new pbc::RepeatedField<double>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<double> PackedDouble {
-      get { return packedDouble_; }
-    }
-
-    /// <summary>Field number for the "packed_bool" field.</summary>
-    public const int PackedBoolFieldNumber = 102;
-    private static readonly pb::FieldCodec<bool> _repeated_packedBool_codec
-        = pb::FieldCodec.ForBool(818);
-    private readonly pbc::RepeatedField<bool> packedBool_ = new pbc::RepeatedField<bool>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<bool> PackedBool {
-      get { return packedBool_; }
-    }
-
-    /// <summary>Field number for the "packed_enum" field.</summary>
-    public const int PackedEnumFieldNumber = 103;
-    private static readonly pb::FieldCodec<global::Google.Protobuf.TestProtos.Proto2.ForeignEnum> _repeated_packedEnum_codec
-        = pb::FieldCodec.ForEnum(826, x => (int) x, x => (global::Google.Protobuf.TestProtos.Proto2.ForeignEnum) x);
-    private readonly pbc::RepeatedField<global::Google.Protobuf.TestProtos.Proto2.ForeignEnum> packedEnum_ = new pbc::RepeatedField<global::Google.Protobuf.TestProtos.Proto2.ForeignEnum>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Google.Protobuf.TestProtos.Proto2.ForeignEnum> PackedEnum {
-      get { return packedEnum_; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as TestPackedTypes);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(TestPackedTypes other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if(!packedInt32_.Equals(other.packedInt32_)) return false;
-      if(!packedInt64_.Equals(other.packedInt64_)) return false;
-      if(!packedUint32_.Equals(other.packedUint32_)) return false;
-      if(!packedUint64_.Equals(other.packedUint64_)) return false;
-      if(!packedSint32_.Equals(other.packedSint32_)) return false;
-      if(!packedSint64_.Equals(other.packedSint64_)) return false;
-      if(!packedFixed32_.Equals(other.packedFixed32_)) return false;
-      if(!packedFixed64_.Equals(other.packedFixed64_)) return false;
-      if(!packedSfixed32_.Equals(other.packedSfixed32_)) return false;
-      if(!packedSfixed64_.Equals(other.packedSfixed64_)) return false;
-      if(!packedFloat_.Equals(other.packedFloat_)) return false;
-      if(!packedDouble_.Equals(other.packedDouble_)) return false;
-      if(!packedBool_.Equals(other.packedBool_)) return false;
-      if(!packedEnum_.Equals(other.packedEnum_)) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      hash ^= packedInt32_.GetHashCode();
-      hash ^= packedInt64_.GetHashCode();
-      hash ^= packedUint32_.GetHashCode();
-      hash ^= packedUint64_.GetHashCode();
-      hash ^= packedSint32_.GetHashCode();
-      hash ^= packedSint64_.GetHashCode();
-      hash ^= packedFixed32_.GetHashCode();
-      hash ^= packedFixed64_.GetHashCode();
-      hash ^= packedSfixed32_.GetHashCode();
-      hash ^= packedSfixed64_.GetHashCode();
-      hash ^= packedFloat_.GetHashCode();
-      hash ^= packedDouble_.GetHashCode();
-      hash ^= packedBool_.GetHashCode();
-      hash ^= packedEnum_.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      packedInt32_.WriteTo(output, _repeated_packedInt32_codec);
-      packedInt64_.WriteTo(output, _repeated_packedInt64_codec);
-      packedUint32_.WriteTo(output, _repeated_packedUint32_codec);
-      packedUint64_.WriteTo(output, _repeated_packedUint64_codec);
-      packedSint32_.WriteTo(output, _repeated_packedSint32_codec);
-      packedSint64_.WriteTo(output, _repeated_packedSint64_codec);
-      packedFixed32_.WriteTo(output, _repeated_packedFixed32_codec);
-      packedFixed64_.WriteTo(output, _repeated_packedFixed64_codec);
-      packedSfixed32_.WriteTo(output, _repeated_packedSfixed32_codec);
-      packedSfixed64_.WriteTo(output, _repeated_packedSfixed64_codec);
-      packedFloat_.WriteTo(output, _repeated_packedFloat_codec);
-      packedDouble_.WriteTo(output, _repeated_packedDouble_codec);
-      packedBool_.WriteTo(output, _repeated_packedBool_codec);
-      packedEnum_.WriteTo(output, _repeated_packedEnum_codec);
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      packedInt32_.WriteTo(ref output, _repeated_packedInt32_codec);
-      packedInt64_.WriteTo(ref output, _repeated_packedInt64_codec);
-      packedUint32_.WriteTo(ref output, _repeated_packedUint32_codec);
-      packedUint64_.WriteTo(ref output, _repeated_packedUint64_codec);
-      packedSint32_.WriteTo(ref output, _repeated_packedSint32_codec);
-      packedSint64_.WriteTo(ref output, _repeated_packedSint64_codec);
-      packedFixed32_.WriteTo(ref output, _repeated_packedFixed32_codec);
-      packedFixed64_.WriteTo(ref output, _repeated_packedFixed64_codec);
-      packedSfixed32_.WriteTo(ref output, _repeated_packedSfixed32_codec);
-      packedSfixed64_.WriteTo(ref output, _repeated_packedSfixed64_codec);
-      packedFloat_.WriteTo(ref output, _repeated_packedFloat_codec);
-      packedDouble_.WriteTo(ref output, _repeated_packedDouble_codec);
-      packedBool_.WriteTo(ref output, _repeated_packedBool_codec);
-      packedEnum_.WriteTo(ref output, _repeated_packedEnum_codec);
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      size += packedInt32_.CalculateSize(_repeated_packedInt32_codec);
-      size += packedInt64_.CalculateSize(_repeated_packedInt64_codec);
-      size += packedUint32_.CalculateSize(_repeated_packedUint32_codec);
-      size += packedUint64_.CalculateSize(_repeated_packedUint64_codec);
-      size += packedSint32_.CalculateSize(_repeated_packedSint32_codec);
-      size += packedSint64_.CalculateSize(_repeated_packedSint64_codec);
-      size += packedFixed32_.CalculateSize(_repeated_packedFixed32_codec);
-      size += packedFixed64_.CalculateSize(_repeated_packedFixed64_codec);
-      size += packedSfixed32_.CalculateSize(_repeated_packedSfixed32_codec);
-      size += packedSfixed64_.CalculateSize(_repeated_packedSfixed64_codec);
-      size += packedFloat_.CalculateSize(_repeated_packedFloat_codec);
-      size += packedDouble_.CalculateSize(_repeated_packedDouble_codec);
-      size += packedBool_.CalculateSize(_repeated_packedBool_codec);
-      size += packedEnum_.CalculateSize(_repeated_packedEnum_codec);
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(TestPackedTypes other) {
-      if (other == null) {
-        return;
-      }
-      packedInt32_.Add(other.packedInt32_);
-      packedInt64_.Add(other.packedInt64_);
-      packedUint32_.Add(other.packedUint32_);
-      packedUint64_.Add(other.packedUint64_);
-      packedSint32_.Add(other.packedSint32_);
-      packedSint64_.Add(other.packedSint64_);
-      packedFixed32_.Add(other.packedFixed32_);
-      packedFixed64_.Add(other.packedFixed64_);
-      packedSfixed32_.Add(other.packedSfixed32_);
-      packedSfixed64_.Add(other.packedSfixed64_);
-      packedFloat_.Add(other.packedFloat_);
-      packedDouble_.Add(other.packedDouble_);
-      packedBool_.Add(other.packedBool_);
-      packedEnum_.Add(other.packedEnum_);
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 722:
-          case 720: {
-            packedInt32_.AddEntriesFrom(input, _repeated_packedInt32_codec);
-            break;
-          }
-          case 730:
-          case 728: {
-            packedInt64_.AddEntriesFrom(input, _repeated_packedInt64_codec);
-            break;
-          }
-          case 738:
-          case 736: {
-            packedUint32_.AddEntriesFrom(input, _repeated_packedUint32_codec);
-            break;
-          }
-          case 746:
-          case 744: {
-            packedUint64_.AddEntriesFrom(input, _repeated_packedUint64_codec);
-            break;
-          }
-          case 754:
-          case 752: {
-            packedSint32_.AddEntriesFrom(input, _repeated_packedSint32_codec);
-            break;
-          }
-          case 762:
-          case 760: {
-            packedSint64_.AddEntriesFrom(input, _repeated_packedSint64_codec);
-            break;
-          }
-          case 770:
-          case 773: {
-            packedFixed32_.AddEntriesFrom(input, _repeated_packedFixed32_codec);
-            break;
-          }
-          case 778:
-          case 777: {
-            packedFixed64_.AddEntriesFrom(input, _repeated_packedFixed64_codec);
-            break;
-          }
-          case 786:
-          case 789: {
-            packedSfixed32_.AddEntriesFrom(input, _repeated_packedSfixed32_codec);
-            break;
-          }
-          case 794:
-          case 793: {
-            packedSfixed64_.AddEntriesFrom(input, _repeated_packedSfixed64_codec);
-            break;
-          }
-          case 802:
-          case 805: {
-            packedFloat_.AddEntriesFrom(input, _repeated_packedFloat_codec);
-            break;
-          }
-          case 810:
-          case 809: {
-            packedDouble_.AddEntriesFrom(input, _repeated_packedDouble_codec);
-            break;
-          }
-          case 818:
-          case 816: {
-            packedBool_.AddEntriesFrom(input, _repeated_packedBool_codec);
-            break;
-          }
-          case 826:
-          case 824: {
-            packedEnum_.AddEntriesFrom(input, _repeated_packedEnum_codec);
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 722:
-          case 720: {
-            packedInt32_.AddEntriesFrom(ref input, _repeated_packedInt32_codec);
-            break;
-          }
-          case 730:
-          case 728: {
-            packedInt64_.AddEntriesFrom(ref input, _repeated_packedInt64_codec);
-            break;
-          }
-          case 738:
-          case 736: {
-            packedUint32_.AddEntriesFrom(ref input, _repeated_packedUint32_codec);
-            break;
-          }
-          case 746:
-          case 744: {
-            packedUint64_.AddEntriesFrom(ref input, _repeated_packedUint64_codec);
-            break;
-          }
-          case 754:
-          case 752: {
-            packedSint32_.AddEntriesFrom(ref input, _repeated_packedSint32_codec);
-            break;
-          }
-          case 762:
-          case 760: {
-            packedSint64_.AddEntriesFrom(ref input, _repeated_packedSint64_codec);
-            break;
-          }
-          case 770:
-          case 773: {
-            packedFixed32_.AddEntriesFrom(ref input, _repeated_packedFixed32_codec);
-            break;
-          }
-          case 778:
-          case 777: {
-            packedFixed64_.AddEntriesFrom(ref input, _repeated_packedFixed64_codec);
-            break;
-          }
-          case 786:
-          case 789: {
-            packedSfixed32_.AddEntriesFrom(ref input, _repeated_packedSfixed32_codec);
-            break;
-          }
-          case 794:
-          case 793: {
-            packedSfixed64_.AddEntriesFrom(ref input, _repeated_packedSfixed64_codec);
-            break;
-          }
-          case 802:
-          case 805: {
-            packedFloat_.AddEntriesFrom(ref input, _repeated_packedFloat_codec);
-            break;
-          }
-          case 810:
-          case 809: {
-            packedDouble_.AddEntriesFrom(ref input, _repeated_packedDouble_codec);
-            break;
-          }
-          case 818:
-          case 816: {
-            packedBool_.AddEntriesFrom(ref input, _repeated_packedBool_codec);
-            break;
-          }
-          case 826:
-          case 824: {
-            packedEnum_.AddEntriesFrom(ref input, _repeated_packedEnum_codec);
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  /// <summary>
-  /// A message with the same fields as TestPackedTypes, but without packing. Used
-  /// to test packed &lt;-> unpacked wire compatibility.
-  /// </summary>
-  public sealed partial class TestUnpackedTypes : pb::IMessage<TestUnpackedTypes>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<TestUnpackedTypes> _parser = new pb::MessageParser<TestUnpackedTypes>(() => new TestUnpackedTypes());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<TestUnpackedTypes> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.Proto2.UnittestReflection.Descriptor.MessageTypes[49]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestUnpackedTypes() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestUnpackedTypes(TestUnpackedTypes other) : this() {
-      unpackedInt32_ = other.unpackedInt32_.Clone();
-      unpackedInt64_ = other.unpackedInt64_.Clone();
-      unpackedUint32_ = other.unpackedUint32_.Clone();
-      unpackedUint64_ = other.unpackedUint64_.Clone();
-      unpackedSint32_ = other.unpackedSint32_.Clone();
-      unpackedSint64_ = other.unpackedSint64_.Clone();
-      unpackedFixed32_ = other.unpackedFixed32_.Clone();
-      unpackedFixed64_ = other.unpackedFixed64_.Clone();
-      unpackedSfixed32_ = other.unpackedSfixed32_.Clone();
-      unpackedSfixed64_ = other.unpackedSfixed64_.Clone();
-      unpackedFloat_ = other.unpackedFloat_.Clone();
-      unpackedDouble_ = other.unpackedDouble_.Clone();
-      unpackedBool_ = other.unpackedBool_.Clone();
-      unpackedEnum_ = other.unpackedEnum_.Clone();
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestUnpackedTypes Clone() {
-      return new TestUnpackedTypes(this);
-    }
-
-    /// <summary>Field number for the "unpacked_int32" field.</summary>
-    public const int UnpackedInt32FieldNumber = 90;
-    private static readonly pb::FieldCodec<int> _repeated_unpackedInt32_codec
-        = pb::FieldCodec.ForInt32(720);
-    private readonly pbc::RepeatedField<int> unpackedInt32_ = new pbc::RepeatedField<int>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<int> UnpackedInt32 {
-      get { return unpackedInt32_; }
-    }
-
-    /// <summary>Field number for the "unpacked_int64" field.</summary>
-    public const int UnpackedInt64FieldNumber = 91;
-    private static readonly pb::FieldCodec<long> _repeated_unpackedInt64_codec
-        = pb::FieldCodec.ForInt64(728);
-    private readonly pbc::RepeatedField<long> unpackedInt64_ = new pbc::RepeatedField<long>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<long> UnpackedInt64 {
-      get { return unpackedInt64_; }
-    }
-
-    /// <summary>Field number for the "unpacked_uint32" field.</summary>
-    public const int UnpackedUint32FieldNumber = 92;
-    private static readonly pb::FieldCodec<uint> _repeated_unpackedUint32_codec
-        = pb::FieldCodec.ForUInt32(736);
-    private readonly pbc::RepeatedField<uint> unpackedUint32_ = new pbc::RepeatedField<uint>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<uint> UnpackedUint32 {
-      get { return unpackedUint32_; }
-    }
-
-    /// <summary>Field number for the "unpacked_uint64" field.</summary>
-    public const int UnpackedUint64FieldNumber = 93;
-    private static readonly pb::FieldCodec<ulong> _repeated_unpackedUint64_codec
-        = pb::FieldCodec.ForUInt64(744);
-    private readonly pbc::RepeatedField<ulong> unpackedUint64_ = new pbc::RepeatedField<ulong>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<ulong> UnpackedUint64 {
-      get { return unpackedUint64_; }
-    }
-
-    /// <summary>Field number for the "unpacked_sint32" field.</summary>
-    public const int UnpackedSint32FieldNumber = 94;
-    private static readonly pb::FieldCodec<int> _repeated_unpackedSint32_codec
-        = pb::FieldCodec.ForSInt32(752);
-    private readonly pbc::RepeatedField<int> unpackedSint32_ = new pbc::RepeatedField<int>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<int> UnpackedSint32 {
-      get { return unpackedSint32_; }
-    }
-
-    /// <summary>Field number for the "unpacked_sint64" field.</summary>
-    public const int UnpackedSint64FieldNumber = 95;
-    private static readonly pb::FieldCodec<long> _repeated_unpackedSint64_codec
-        = pb::FieldCodec.ForSInt64(760);
-    private readonly pbc::RepeatedField<long> unpackedSint64_ = new pbc::RepeatedField<long>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<long> UnpackedSint64 {
-      get { return unpackedSint64_; }
-    }
-
-    /// <summary>Field number for the "unpacked_fixed32" field.</summary>
-    public const int UnpackedFixed32FieldNumber = 96;
-    private static readonly pb::FieldCodec<uint> _repeated_unpackedFixed32_codec
-        = pb::FieldCodec.ForFixed32(773);
-    private readonly pbc::RepeatedField<uint> unpackedFixed32_ = new pbc::RepeatedField<uint>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<uint> UnpackedFixed32 {
-      get { return unpackedFixed32_; }
-    }
-
-    /// <summary>Field number for the "unpacked_fixed64" field.</summary>
-    public const int UnpackedFixed64FieldNumber = 97;
-    private static readonly pb::FieldCodec<ulong> _repeated_unpackedFixed64_codec
-        = pb::FieldCodec.ForFixed64(777);
-    private readonly pbc::RepeatedField<ulong> unpackedFixed64_ = new pbc::RepeatedField<ulong>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<ulong> UnpackedFixed64 {
-      get { return unpackedFixed64_; }
-    }
-
-    /// <summary>Field number for the "unpacked_sfixed32" field.</summary>
-    public const int UnpackedSfixed32FieldNumber = 98;
-    private static readonly pb::FieldCodec<int> _repeated_unpackedSfixed32_codec
-        = pb::FieldCodec.ForSFixed32(789);
-    private readonly pbc::RepeatedField<int> unpackedSfixed32_ = new pbc::RepeatedField<int>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<int> UnpackedSfixed32 {
-      get { return unpackedSfixed32_; }
-    }
-
-    /// <summary>Field number for the "unpacked_sfixed64" field.</summary>
-    public const int UnpackedSfixed64FieldNumber = 99;
-    private static readonly pb::FieldCodec<long> _repeated_unpackedSfixed64_codec
-        = pb::FieldCodec.ForSFixed64(793);
-    private readonly pbc::RepeatedField<long> unpackedSfixed64_ = new pbc::RepeatedField<long>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<long> UnpackedSfixed64 {
-      get { return unpackedSfixed64_; }
-    }
-
-    /// <summary>Field number for the "unpacked_float" field.</summary>
-    public const int UnpackedFloatFieldNumber = 100;
-    private static readonly pb::FieldCodec<float> _repeated_unpackedFloat_codec
-        = pb::FieldCodec.ForFloat(805);
-    private readonly pbc::RepeatedField<float> unpackedFloat_ = new pbc::RepeatedField<float>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<float> UnpackedFloat {
-      get { return unpackedFloat_; }
-    }
-
-    /// <summary>Field number for the "unpacked_double" field.</summary>
-    public const int UnpackedDoubleFieldNumber = 101;
-    private static readonly pb::FieldCodec<double> _repeated_unpackedDouble_codec
-        = pb::FieldCodec.ForDouble(809);
-    private readonly pbc::RepeatedField<double> unpackedDouble_ = new pbc::RepeatedField<double>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<double> UnpackedDouble {
-      get { return unpackedDouble_; }
-    }
-
-    /// <summary>Field number for the "unpacked_bool" field.</summary>
-    public const int UnpackedBoolFieldNumber = 102;
-    private static readonly pb::FieldCodec<bool> _repeated_unpackedBool_codec
-        = pb::FieldCodec.ForBool(816);
-    private readonly pbc::RepeatedField<bool> unpackedBool_ = new pbc::RepeatedField<bool>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<bool> UnpackedBool {
-      get { return unpackedBool_; }
-    }
-
-    /// <summary>Field number for the "unpacked_enum" field.</summary>
-    public const int UnpackedEnumFieldNumber = 103;
-    private static readonly pb::FieldCodec<global::Google.Protobuf.TestProtos.Proto2.ForeignEnum> _repeated_unpackedEnum_codec
-        = pb::FieldCodec.ForEnum(824, x => (int) x, x => (global::Google.Protobuf.TestProtos.Proto2.ForeignEnum) x);
-    private readonly pbc::RepeatedField<global::Google.Protobuf.TestProtos.Proto2.ForeignEnum> unpackedEnum_ = new pbc::RepeatedField<global::Google.Protobuf.TestProtos.Proto2.ForeignEnum>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Google.Protobuf.TestProtos.Proto2.ForeignEnum> UnpackedEnum {
-      get { return unpackedEnum_; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as TestUnpackedTypes);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(TestUnpackedTypes other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if(!unpackedInt32_.Equals(other.unpackedInt32_)) return false;
-      if(!unpackedInt64_.Equals(other.unpackedInt64_)) return false;
-      if(!unpackedUint32_.Equals(other.unpackedUint32_)) return false;
-      if(!unpackedUint64_.Equals(other.unpackedUint64_)) return false;
-      if(!unpackedSint32_.Equals(other.unpackedSint32_)) return false;
-      if(!unpackedSint64_.Equals(other.unpackedSint64_)) return false;
-      if(!unpackedFixed32_.Equals(other.unpackedFixed32_)) return false;
-      if(!unpackedFixed64_.Equals(other.unpackedFixed64_)) return false;
-      if(!unpackedSfixed32_.Equals(other.unpackedSfixed32_)) return false;
-      if(!unpackedSfixed64_.Equals(other.unpackedSfixed64_)) return false;
-      if(!unpackedFloat_.Equals(other.unpackedFloat_)) return false;
-      if(!unpackedDouble_.Equals(other.unpackedDouble_)) return false;
-      if(!unpackedBool_.Equals(other.unpackedBool_)) return false;
-      if(!unpackedEnum_.Equals(other.unpackedEnum_)) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      hash ^= unpackedInt32_.GetHashCode();
-      hash ^= unpackedInt64_.GetHashCode();
-      hash ^= unpackedUint32_.GetHashCode();
-      hash ^= unpackedUint64_.GetHashCode();
-      hash ^= unpackedSint32_.GetHashCode();
-      hash ^= unpackedSint64_.GetHashCode();
-      hash ^= unpackedFixed32_.GetHashCode();
-      hash ^= unpackedFixed64_.GetHashCode();
-      hash ^= unpackedSfixed32_.GetHashCode();
-      hash ^= unpackedSfixed64_.GetHashCode();
-      hash ^= unpackedFloat_.GetHashCode();
-      hash ^= unpackedDouble_.GetHashCode();
-      hash ^= unpackedBool_.GetHashCode();
-      hash ^= unpackedEnum_.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      unpackedInt32_.WriteTo(output, _repeated_unpackedInt32_codec);
-      unpackedInt64_.WriteTo(output, _repeated_unpackedInt64_codec);
-      unpackedUint32_.WriteTo(output, _repeated_unpackedUint32_codec);
-      unpackedUint64_.WriteTo(output, _repeated_unpackedUint64_codec);
-      unpackedSint32_.WriteTo(output, _repeated_unpackedSint32_codec);
-      unpackedSint64_.WriteTo(output, _repeated_unpackedSint64_codec);
-      unpackedFixed32_.WriteTo(output, _repeated_unpackedFixed32_codec);
-      unpackedFixed64_.WriteTo(output, _repeated_unpackedFixed64_codec);
-      unpackedSfixed32_.WriteTo(output, _repeated_unpackedSfixed32_codec);
-      unpackedSfixed64_.WriteTo(output, _repeated_unpackedSfixed64_codec);
-      unpackedFloat_.WriteTo(output, _repeated_unpackedFloat_codec);
-      unpackedDouble_.WriteTo(output, _repeated_unpackedDouble_codec);
-      unpackedBool_.WriteTo(output, _repeated_unpackedBool_codec);
-      unpackedEnum_.WriteTo(output, _repeated_unpackedEnum_codec);
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      unpackedInt32_.WriteTo(ref output, _repeated_unpackedInt32_codec);
-      unpackedInt64_.WriteTo(ref output, _repeated_unpackedInt64_codec);
-      unpackedUint32_.WriteTo(ref output, _repeated_unpackedUint32_codec);
-      unpackedUint64_.WriteTo(ref output, _repeated_unpackedUint64_codec);
-      unpackedSint32_.WriteTo(ref output, _repeated_unpackedSint32_codec);
-      unpackedSint64_.WriteTo(ref output, _repeated_unpackedSint64_codec);
-      unpackedFixed32_.WriteTo(ref output, _repeated_unpackedFixed32_codec);
-      unpackedFixed64_.WriteTo(ref output, _repeated_unpackedFixed64_codec);
-      unpackedSfixed32_.WriteTo(ref output, _repeated_unpackedSfixed32_codec);
-      unpackedSfixed64_.WriteTo(ref output, _repeated_unpackedSfixed64_codec);
-      unpackedFloat_.WriteTo(ref output, _repeated_unpackedFloat_codec);
-      unpackedDouble_.WriteTo(ref output, _repeated_unpackedDouble_codec);
-      unpackedBool_.WriteTo(ref output, _repeated_unpackedBool_codec);
-      unpackedEnum_.WriteTo(ref output, _repeated_unpackedEnum_codec);
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      size += unpackedInt32_.CalculateSize(_repeated_unpackedInt32_codec);
-      size += unpackedInt64_.CalculateSize(_repeated_unpackedInt64_codec);
-      size += unpackedUint32_.CalculateSize(_repeated_unpackedUint32_codec);
-      size += unpackedUint64_.CalculateSize(_repeated_unpackedUint64_codec);
-      size += unpackedSint32_.CalculateSize(_repeated_unpackedSint32_codec);
-      size += unpackedSint64_.CalculateSize(_repeated_unpackedSint64_codec);
-      size += unpackedFixed32_.CalculateSize(_repeated_unpackedFixed32_codec);
-      size += unpackedFixed64_.CalculateSize(_repeated_unpackedFixed64_codec);
-      size += unpackedSfixed32_.CalculateSize(_repeated_unpackedSfixed32_codec);
-      size += unpackedSfixed64_.CalculateSize(_repeated_unpackedSfixed64_codec);
-      size += unpackedFloat_.CalculateSize(_repeated_unpackedFloat_codec);
-      size += unpackedDouble_.CalculateSize(_repeated_unpackedDouble_codec);
-      size += unpackedBool_.CalculateSize(_repeated_unpackedBool_codec);
-      size += unpackedEnum_.CalculateSize(_repeated_unpackedEnum_codec);
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(TestUnpackedTypes other) {
-      if (other == null) {
-        return;
-      }
-      unpackedInt32_.Add(other.unpackedInt32_);
-      unpackedInt64_.Add(other.unpackedInt64_);
-      unpackedUint32_.Add(other.unpackedUint32_);
-      unpackedUint64_.Add(other.unpackedUint64_);
-      unpackedSint32_.Add(other.unpackedSint32_);
-      unpackedSint64_.Add(other.unpackedSint64_);
-      unpackedFixed32_.Add(other.unpackedFixed32_);
-      unpackedFixed64_.Add(other.unpackedFixed64_);
-      unpackedSfixed32_.Add(other.unpackedSfixed32_);
-      unpackedSfixed64_.Add(other.unpackedSfixed64_);
-      unpackedFloat_.Add(other.unpackedFloat_);
-      unpackedDouble_.Add(other.unpackedDouble_);
-      unpackedBool_.Add(other.unpackedBool_);
-      unpackedEnum_.Add(other.unpackedEnum_);
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 722:
-          case 720: {
-            unpackedInt32_.AddEntriesFrom(input, _repeated_unpackedInt32_codec);
-            break;
-          }
-          case 730:
-          case 728: {
-            unpackedInt64_.AddEntriesFrom(input, _repeated_unpackedInt64_codec);
-            break;
-          }
-          case 738:
-          case 736: {
-            unpackedUint32_.AddEntriesFrom(input, _repeated_unpackedUint32_codec);
-            break;
-          }
-          case 746:
-          case 744: {
-            unpackedUint64_.AddEntriesFrom(input, _repeated_unpackedUint64_codec);
-            break;
-          }
-          case 754:
-          case 752: {
-            unpackedSint32_.AddEntriesFrom(input, _repeated_unpackedSint32_codec);
-            break;
-          }
-          case 762:
-          case 760: {
-            unpackedSint64_.AddEntriesFrom(input, _repeated_unpackedSint64_codec);
-            break;
-          }
-          case 770:
-          case 773: {
-            unpackedFixed32_.AddEntriesFrom(input, _repeated_unpackedFixed32_codec);
-            break;
-          }
-          case 778:
-          case 777: {
-            unpackedFixed64_.AddEntriesFrom(input, _repeated_unpackedFixed64_codec);
-            break;
-          }
-          case 786:
-          case 789: {
-            unpackedSfixed32_.AddEntriesFrom(input, _repeated_unpackedSfixed32_codec);
-            break;
-          }
-          case 794:
-          case 793: {
-            unpackedSfixed64_.AddEntriesFrom(input, _repeated_unpackedSfixed64_codec);
-            break;
-          }
-          case 802:
-          case 805: {
-            unpackedFloat_.AddEntriesFrom(input, _repeated_unpackedFloat_codec);
-            break;
-          }
-          case 810:
-          case 809: {
-            unpackedDouble_.AddEntriesFrom(input, _repeated_unpackedDouble_codec);
-            break;
-          }
-          case 818:
-          case 816: {
-            unpackedBool_.AddEntriesFrom(input, _repeated_unpackedBool_codec);
-            break;
-          }
-          case 826:
-          case 824: {
-            unpackedEnum_.AddEntriesFrom(input, _repeated_unpackedEnum_codec);
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 722:
-          case 720: {
-            unpackedInt32_.AddEntriesFrom(ref input, _repeated_unpackedInt32_codec);
-            break;
-          }
-          case 730:
-          case 728: {
-            unpackedInt64_.AddEntriesFrom(ref input, _repeated_unpackedInt64_codec);
-            break;
-          }
-          case 738:
-          case 736: {
-            unpackedUint32_.AddEntriesFrom(ref input, _repeated_unpackedUint32_codec);
-            break;
-          }
-          case 746:
-          case 744: {
-            unpackedUint64_.AddEntriesFrom(ref input, _repeated_unpackedUint64_codec);
-            break;
-          }
-          case 754:
-          case 752: {
-            unpackedSint32_.AddEntriesFrom(ref input, _repeated_unpackedSint32_codec);
-            break;
-          }
-          case 762:
-          case 760: {
-            unpackedSint64_.AddEntriesFrom(ref input, _repeated_unpackedSint64_codec);
-            break;
-          }
-          case 770:
-          case 773: {
-            unpackedFixed32_.AddEntriesFrom(ref input, _repeated_unpackedFixed32_codec);
-            break;
-          }
-          case 778:
-          case 777: {
-            unpackedFixed64_.AddEntriesFrom(ref input, _repeated_unpackedFixed64_codec);
-            break;
-          }
-          case 786:
-          case 789: {
-            unpackedSfixed32_.AddEntriesFrom(ref input, _repeated_unpackedSfixed32_codec);
-            break;
-          }
-          case 794:
-          case 793: {
-            unpackedSfixed64_.AddEntriesFrom(ref input, _repeated_unpackedSfixed64_codec);
-            break;
-          }
-          case 802:
-          case 805: {
-            unpackedFloat_.AddEntriesFrom(ref input, _repeated_unpackedFloat_codec);
-            break;
-          }
-          case 810:
-          case 809: {
-            unpackedDouble_.AddEntriesFrom(ref input, _repeated_unpackedDouble_codec);
-            break;
-          }
-          case 818:
-          case 816: {
-            unpackedBool_.AddEntriesFrom(ref input, _repeated_unpackedBool_codec);
-            break;
-          }
-          case 826:
-          case 824: {
-            unpackedEnum_.AddEntriesFrom(ref input, _repeated_unpackedEnum_codec);
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  public sealed partial class TestPackedExtensions : pb::IExtendableMessage<TestPackedExtensions>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<TestPackedExtensions> _parser = new pb::MessageParser<TestPackedExtensions>(() => new TestPackedExtensions());
-    private pb::UnknownFieldSet _unknownFields;
-    private pb::ExtensionSet<TestPackedExtensions> _extensions;
-    private pb::ExtensionSet<TestPackedExtensions> _Extensions { get { return _extensions; } }
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<TestPackedExtensions> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.Proto2.UnittestReflection.Descriptor.MessageTypes[50]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestPackedExtensions() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestPackedExtensions(TestPackedExtensions other) : this() {
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-      _extensions = pb::ExtensionSet.Clone(other._extensions);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestPackedExtensions Clone() {
-      return new TestPackedExtensions(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as TestPackedExtensions);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(TestPackedExtensions other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (!Equals(_extensions, other._extensions)) {
-        return false;
-      }
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (_extensions != null) {
-        hash ^= _extensions.GetHashCode();
-      }
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (_extensions != null) {
-        _extensions.WriteTo(output);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (_extensions != null) {
-        _extensions.WriteTo(ref output);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (_extensions != null) {
-        size += _extensions.CalculateSize();
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(TestPackedExtensions other) {
-      if (other == null) {
-        return;
-      }
-      pb::ExtensionSet.MergeFrom(ref _extensions, other._extensions);
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            if (!pb::ExtensionSet.TryMergeFieldFrom(ref _extensions, input)) {
-              _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            }
-            break;
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            if (!pb::ExtensionSet.TryMergeFieldFrom(ref _extensions, ref input)) {
-              _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            }
-            break;
-        }
-      }
-    }
-    #endif
-
-    public TValue GetExtension<TValue>(pb::Extension<TestPackedExtensions, TValue> extension) {
-      return pb::ExtensionSet.Get(ref _extensions, extension);
-    }
-    public pbc::RepeatedField<TValue> GetExtension<TValue>(pb::RepeatedExtension<TestPackedExtensions, TValue> extension) {
-      return pb::ExtensionSet.Get(ref _extensions, extension);
-    }
-    public pbc::RepeatedField<TValue> GetOrInitializeExtension<TValue>(pb::RepeatedExtension<TestPackedExtensions, TValue> extension) {
-      return pb::ExtensionSet.GetOrInitialize(ref _extensions, extension);
-    }
-    public void SetExtension<TValue>(pb::Extension<TestPackedExtensions, TValue> extension, TValue value) {
-      pb::ExtensionSet.Set(ref _extensions, extension, value);
-    }
-    public bool HasExtension<TValue>(pb::Extension<TestPackedExtensions, TValue> extension) {
-      return pb::ExtensionSet.Has(ref _extensions, extension);
-    }
-    public void ClearExtension<TValue>(pb::Extension<TestPackedExtensions, TValue> extension) {
-      pb::ExtensionSet.Clear(ref _extensions, extension);
-    }
-    public void ClearExtension<TValue>(pb::RepeatedExtension<TestPackedExtensions, TValue> extension) {
-      pb::ExtensionSet.Clear(ref _extensions, extension);
-    }
-
-  }
-
-  public sealed partial class TestUnpackedExtensions : pb::IExtendableMessage<TestUnpackedExtensions>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<TestUnpackedExtensions> _parser = new pb::MessageParser<TestUnpackedExtensions>(() => new TestUnpackedExtensions());
-    private pb::UnknownFieldSet _unknownFields;
-    private pb::ExtensionSet<TestUnpackedExtensions> _extensions;
-    private pb::ExtensionSet<TestUnpackedExtensions> _Extensions { get { return _extensions; } }
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<TestUnpackedExtensions> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.Proto2.UnittestReflection.Descriptor.MessageTypes[51]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestUnpackedExtensions() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestUnpackedExtensions(TestUnpackedExtensions other) : this() {
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-      _extensions = pb::ExtensionSet.Clone(other._extensions);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestUnpackedExtensions Clone() {
-      return new TestUnpackedExtensions(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as TestUnpackedExtensions);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(TestUnpackedExtensions other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (!Equals(_extensions, other._extensions)) {
-        return false;
-      }
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (_extensions != null) {
-        hash ^= _extensions.GetHashCode();
-      }
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (_extensions != null) {
-        _extensions.WriteTo(output);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (_extensions != null) {
-        _extensions.WriteTo(ref output);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (_extensions != null) {
-        size += _extensions.CalculateSize();
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(TestUnpackedExtensions other) {
-      if (other == null) {
-        return;
-      }
-      pb::ExtensionSet.MergeFrom(ref _extensions, other._extensions);
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            if (!pb::ExtensionSet.TryMergeFieldFrom(ref _extensions, input)) {
-              _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            }
-            break;
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            if (!pb::ExtensionSet.TryMergeFieldFrom(ref _extensions, ref input)) {
-              _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            }
-            break;
-        }
-      }
-    }
-    #endif
-
-    public TValue GetExtension<TValue>(pb::Extension<TestUnpackedExtensions, TValue> extension) {
-      return pb::ExtensionSet.Get(ref _extensions, extension);
-    }
-    public pbc::RepeatedField<TValue> GetExtension<TValue>(pb::RepeatedExtension<TestUnpackedExtensions, TValue> extension) {
-      return pb::ExtensionSet.Get(ref _extensions, extension);
-    }
-    public pbc::RepeatedField<TValue> GetOrInitializeExtension<TValue>(pb::RepeatedExtension<TestUnpackedExtensions, TValue> extension) {
-      return pb::ExtensionSet.GetOrInitialize(ref _extensions, extension);
-    }
-    public void SetExtension<TValue>(pb::Extension<TestUnpackedExtensions, TValue> extension, TValue value) {
-      pb::ExtensionSet.Set(ref _extensions, extension, value);
-    }
-    public bool HasExtension<TValue>(pb::Extension<TestUnpackedExtensions, TValue> extension) {
-      return pb::ExtensionSet.Has(ref _extensions, extension);
-    }
-    public void ClearExtension<TValue>(pb::Extension<TestUnpackedExtensions, TValue> extension) {
-      pb::ExtensionSet.Clear(ref _extensions, extension);
-    }
-    public void ClearExtension<TValue>(pb::RepeatedExtension<TestUnpackedExtensions, TValue> extension) {
-      pb::ExtensionSet.Clear(ref _extensions, extension);
-    }
-
-  }
-
-  /// <summary>
-  /// Used by ExtensionSetTest/DynamicExtensions.  The test actually builds
-  /// a set of extensions to TestAllExtensions dynamically, based on the fields
-  /// of this message type.
-  /// </summary>
-  public sealed partial class TestDynamicExtensions : pb::IMessage<TestDynamicExtensions>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<TestDynamicExtensions> _parser = new pb::MessageParser<TestDynamicExtensions>(() => new TestDynamicExtensions());
-    private pb::UnknownFieldSet _unknownFields;
-    private int _hasBits0;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<TestDynamicExtensions> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.Proto2.UnittestReflection.Descriptor.MessageTypes[52]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestDynamicExtensions() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestDynamicExtensions(TestDynamicExtensions other) : this() {
-      _hasBits0 = other._hasBits0;
-      scalarExtension_ = other.scalarExtension_;
-      enumExtension_ = other.enumExtension_;
-      dynamicEnumExtension_ = other.dynamicEnumExtension_;
-      messageExtension_ = other.messageExtension_ != null ? other.messageExtension_.Clone() : null;
-      dynamicMessageExtension_ = other.dynamicMessageExtension_ != null ? other.dynamicMessageExtension_.Clone() : null;
-      repeatedExtension_ = other.repeatedExtension_.Clone();
-      packedExtension_ = other.packedExtension_.Clone();
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestDynamicExtensions Clone() {
-      return new TestDynamicExtensions(this);
-    }
-
-    /// <summary>Field number for the "scalar_extension" field.</summary>
-    public const int ScalarExtensionFieldNumber = 2000;
-    private readonly static uint ScalarExtensionDefaultValue = 0;
-
-    private uint scalarExtension_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public uint ScalarExtension {
-      get { if ((_hasBits0 & 1) != 0) { return scalarExtension_; } else { return ScalarExtensionDefaultValue; } }
-      set {
-        _hasBits0 |= 1;
-        scalarExtension_ = value;
-      }
-    }
-    /// <summary>Gets whether the "scalar_extension" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasScalarExtension {
-      get { return (_hasBits0 & 1) != 0; }
-    }
-    /// <summary>Clears the value of the "scalar_extension" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearScalarExtension() {
-      _hasBits0 &= ~1;
-    }
-
-    /// <summary>Field number for the "enum_extension" field.</summary>
-    public const int EnumExtensionFieldNumber = 2001;
-    private readonly static global::Google.Protobuf.TestProtos.Proto2.ForeignEnum EnumExtensionDefaultValue = global::Google.Protobuf.TestProtos.Proto2.ForeignEnum.ForeignFoo;
-
-    private global::Google.Protobuf.TestProtos.Proto2.ForeignEnum enumExtension_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.TestProtos.Proto2.ForeignEnum EnumExtension {
-      get { if ((_hasBits0 & 2) != 0) { return enumExtension_; } else { return EnumExtensionDefaultValue; } }
-      set {
-        _hasBits0 |= 2;
-        enumExtension_ = value;
-      }
-    }
-    /// <summary>Gets whether the "enum_extension" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasEnumExtension {
-      get { return (_hasBits0 & 2) != 0; }
-    }
-    /// <summary>Clears the value of the "enum_extension" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearEnumExtension() {
-      _hasBits0 &= ~2;
-    }
-
-    /// <summary>Field number for the "dynamic_enum_extension" field.</summary>
-    public const int DynamicEnumExtensionFieldNumber = 2002;
-    private readonly static global::Google.Protobuf.TestProtos.Proto2.TestDynamicExtensions.Types.DynamicEnumType DynamicEnumExtensionDefaultValue = global::Google.Protobuf.TestProtos.Proto2.TestDynamicExtensions.Types.DynamicEnumType.DynamicFoo;
-
-    private global::Google.Protobuf.TestProtos.Proto2.TestDynamicExtensions.Types.DynamicEnumType dynamicEnumExtension_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.TestProtos.Proto2.TestDynamicExtensions.Types.DynamicEnumType DynamicEnumExtension {
-      get { if ((_hasBits0 & 4) != 0) { return dynamicEnumExtension_; } else { return DynamicEnumExtensionDefaultValue; } }
-      set {
-        _hasBits0 |= 4;
-        dynamicEnumExtension_ = value;
-      }
-    }
-    /// <summary>Gets whether the "dynamic_enum_extension" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasDynamicEnumExtension {
-      get { return (_hasBits0 & 4) != 0; }
-    }
-    /// <summary>Clears the value of the "dynamic_enum_extension" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearDynamicEnumExtension() {
-      _hasBits0 &= ~4;
-    }
-
-    /// <summary>Field number for the "message_extension" field.</summary>
-    public const int MessageExtensionFieldNumber = 2003;
-    private global::Google.Protobuf.TestProtos.Proto2.ForeignMessage messageExtension_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.TestProtos.Proto2.ForeignMessage MessageExtension {
-      get { return messageExtension_; }
-      set {
-        messageExtension_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "dynamic_message_extension" field.</summary>
-    public const int DynamicMessageExtensionFieldNumber = 2004;
-    private global::Google.Protobuf.TestProtos.Proto2.TestDynamicExtensions.Types.DynamicMessageType dynamicMessageExtension_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.TestProtos.Proto2.TestDynamicExtensions.Types.DynamicMessageType DynamicMessageExtension {
-      get { return dynamicMessageExtension_; }
-      set {
-        dynamicMessageExtension_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "repeated_extension" field.</summary>
-    public const int RepeatedExtensionFieldNumber = 2005;
-    private static readonly pb::FieldCodec<string> _repeated_repeatedExtension_codec
-        = pb::FieldCodec.ForString(16042);
-    private readonly pbc::RepeatedField<string> repeatedExtension_ = new pbc::RepeatedField<string>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<string> RepeatedExtension {
-      get { return repeatedExtension_; }
-    }
-
-    /// <summary>Field number for the "packed_extension" field.</summary>
-    public const int PackedExtensionFieldNumber = 2006;
-    private static readonly pb::FieldCodec<int> _repeated_packedExtension_codec
-        = pb::FieldCodec.ForSInt32(16050);
-    private readonly pbc::RepeatedField<int> packedExtension_ = new pbc::RepeatedField<int>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<int> PackedExtension {
-      get { return packedExtension_; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as TestDynamicExtensions);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(TestDynamicExtensions other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (ScalarExtension != other.ScalarExtension) return false;
-      if (EnumExtension != other.EnumExtension) return false;
-      if (DynamicEnumExtension != other.DynamicEnumExtension) return false;
-      if (!object.Equals(MessageExtension, other.MessageExtension)) return false;
-      if (!object.Equals(DynamicMessageExtension, other.DynamicMessageExtension)) return false;
-      if(!repeatedExtension_.Equals(other.repeatedExtension_)) return false;
-      if(!packedExtension_.Equals(other.packedExtension_)) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (HasScalarExtension) hash ^= ScalarExtension.GetHashCode();
-      if (HasEnumExtension) hash ^= EnumExtension.GetHashCode();
-      if (HasDynamicEnumExtension) hash ^= DynamicEnumExtension.GetHashCode();
-      if (messageExtension_ != null) hash ^= MessageExtension.GetHashCode();
-      if (dynamicMessageExtension_ != null) hash ^= DynamicMessageExtension.GetHashCode();
-      hash ^= repeatedExtension_.GetHashCode();
-      hash ^= packedExtension_.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (HasScalarExtension) {
-        output.WriteRawTag(133, 125);
-        output.WriteFixed32(ScalarExtension);
-      }
-      if (HasEnumExtension) {
-        output.WriteRawTag(136, 125);
-        output.WriteEnum((int) EnumExtension);
-      }
-      if (HasDynamicEnumExtension) {
-        output.WriteRawTag(144, 125);
-        output.WriteEnum((int) DynamicEnumExtension);
-      }
-      if (messageExtension_ != null) {
-        output.WriteRawTag(154, 125);
-        output.WriteMessage(MessageExtension);
-      }
-      if (dynamicMessageExtension_ != null) {
-        output.WriteRawTag(162, 125);
-        output.WriteMessage(DynamicMessageExtension);
-      }
-      repeatedExtension_.WriteTo(output, _repeated_repeatedExtension_codec);
-      packedExtension_.WriteTo(output, _repeated_packedExtension_codec);
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (HasScalarExtension) {
-        output.WriteRawTag(133, 125);
-        output.WriteFixed32(ScalarExtension);
-      }
-      if (HasEnumExtension) {
-        output.WriteRawTag(136, 125);
-        output.WriteEnum((int) EnumExtension);
-      }
-      if (HasDynamicEnumExtension) {
-        output.WriteRawTag(144, 125);
-        output.WriteEnum((int) DynamicEnumExtension);
-      }
-      if (messageExtension_ != null) {
-        output.WriteRawTag(154, 125);
-        output.WriteMessage(MessageExtension);
-      }
-      if (dynamicMessageExtension_ != null) {
-        output.WriteRawTag(162, 125);
-        output.WriteMessage(DynamicMessageExtension);
-      }
-      repeatedExtension_.WriteTo(ref output, _repeated_repeatedExtension_codec);
-      packedExtension_.WriteTo(ref output, _repeated_packedExtension_codec);
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (HasScalarExtension) {
-        size += 2 + 4;
-      }
-      if (HasEnumExtension) {
-        size += 2 + pb::CodedOutputStream.ComputeEnumSize((int) EnumExtension);
-      }
-      if (HasDynamicEnumExtension) {
-        size += 2 + pb::CodedOutputStream.ComputeEnumSize((int) DynamicEnumExtension);
-      }
-      if (messageExtension_ != null) {
-        size += 2 + pb::CodedOutputStream.ComputeMessageSize(MessageExtension);
-      }
-      if (dynamicMessageExtension_ != null) {
-        size += 2 + pb::CodedOutputStream.ComputeMessageSize(DynamicMessageExtension);
-      }
-      size += repeatedExtension_.CalculateSize(_repeated_repeatedExtension_codec);
-      size += packedExtension_.CalculateSize(_repeated_packedExtension_codec);
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(TestDynamicExtensions other) {
-      if (other == null) {
-        return;
-      }
-      if (other.HasScalarExtension) {
-        ScalarExtension = other.ScalarExtension;
-      }
-      if (other.HasEnumExtension) {
-        EnumExtension = other.EnumExtension;
-      }
-      if (other.HasDynamicEnumExtension) {
-        DynamicEnumExtension = other.DynamicEnumExtension;
-      }
-      if (other.messageExtension_ != null) {
-        if (messageExtension_ == null) {
-          MessageExtension = new global::Google.Protobuf.TestProtos.Proto2.ForeignMessage();
-        }
-        MessageExtension.MergeFrom(other.MessageExtension);
-      }
-      if (other.dynamicMessageExtension_ != null) {
-        if (dynamicMessageExtension_ == null) {
-          DynamicMessageExtension = new global::Google.Protobuf.TestProtos.Proto2.TestDynamicExtensions.Types.DynamicMessageType();
-        }
-        DynamicMessageExtension.MergeFrom(other.DynamicMessageExtension);
-      }
-      repeatedExtension_.Add(other.repeatedExtension_);
-      packedExtension_.Add(other.packedExtension_);
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 16005: {
-            ScalarExtension = input.ReadFixed32();
-            break;
-          }
-          case 16008: {
-            EnumExtension = (global::Google.Protobuf.TestProtos.Proto2.ForeignEnum) input.ReadEnum();
-            break;
-          }
-          case 16016: {
-            DynamicEnumExtension = (global::Google.Protobuf.TestProtos.Proto2.TestDynamicExtensions.Types.DynamicEnumType) input.ReadEnum();
-            break;
-          }
-          case 16026: {
-            if (messageExtension_ == null) {
-              MessageExtension = new global::Google.Protobuf.TestProtos.Proto2.ForeignMessage();
-            }
-            input.ReadMessage(MessageExtension);
-            break;
-          }
-          case 16034: {
-            if (dynamicMessageExtension_ == null) {
-              DynamicMessageExtension = new global::Google.Protobuf.TestProtos.Proto2.TestDynamicExtensions.Types.DynamicMessageType();
-            }
-            input.ReadMessage(DynamicMessageExtension);
-            break;
-          }
-          case 16042: {
-            repeatedExtension_.AddEntriesFrom(input, _repeated_repeatedExtension_codec);
-            break;
-          }
-          case 16050:
-          case 16048: {
-            packedExtension_.AddEntriesFrom(input, _repeated_packedExtension_codec);
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 16005: {
-            ScalarExtension = input.ReadFixed32();
-            break;
-          }
-          case 16008: {
-            EnumExtension = (global::Google.Protobuf.TestProtos.Proto2.ForeignEnum) input.ReadEnum();
-            break;
-          }
-          case 16016: {
-            DynamicEnumExtension = (global::Google.Protobuf.TestProtos.Proto2.TestDynamicExtensions.Types.DynamicEnumType) input.ReadEnum();
-            break;
-          }
-          case 16026: {
-            if (messageExtension_ == null) {
-              MessageExtension = new global::Google.Protobuf.TestProtos.Proto2.ForeignMessage();
-            }
-            input.ReadMessage(MessageExtension);
-            break;
-          }
-          case 16034: {
-            if (dynamicMessageExtension_ == null) {
-              DynamicMessageExtension = new global::Google.Protobuf.TestProtos.Proto2.TestDynamicExtensions.Types.DynamicMessageType();
-            }
-            input.ReadMessage(DynamicMessageExtension);
-            break;
-          }
-          case 16042: {
-            repeatedExtension_.AddEntriesFrom(ref input, _repeated_repeatedExtension_codec);
-            break;
-          }
-          case 16050:
-          case 16048: {
-            packedExtension_.AddEntriesFrom(ref input, _repeated_packedExtension_codec);
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-    #region Nested types
-    /// <summary>Container for nested types declared in the TestDynamicExtensions message type.</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static partial class Types {
-      public enum DynamicEnumType {
-        [pbr::OriginalName("DYNAMIC_FOO")] DynamicFoo = 2200,
-        [pbr::OriginalName("DYNAMIC_BAR")] DynamicBar = 2201,
-        [pbr::OriginalName("DYNAMIC_BAZ")] DynamicBaz = 2202,
-      }
-
-      public sealed partial class DynamicMessageType : pb::IMessage<DynamicMessageType>
-      #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          , pb::IBufferMessage
-      #endif
-      {
-        private static readonly pb::MessageParser<DynamicMessageType> _parser = new pb::MessageParser<DynamicMessageType>(() => new DynamicMessageType());
-        private pb::UnknownFieldSet _unknownFields;
-        private int _hasBits0;
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static pb::MessageParser<DynamicMessageType> Parser { get { return _parser; } }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static pbr::MessageDescriptor Descriptor {
-          get { return global::Google.Protobuf.TestProtos.Proto2.TestDynamicExtensions.Descriptor.NestedTypes[0]; }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        pbr::MessageDescriptor pb::IMessage.Descriptor {
-          get { return Descriptor; }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public DynamicMessageType() {
-          OnConstruction();
-        }
-
-        partial void OnConstruction();
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public DynamicMessageType(DynamicMessageType other) : this() {
-          _hasBits0 = other._hasBits0;
-          dynamicField_ = other.dynamicField_;
-          _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public DynamicMessageType Clone() {
-          return new DynamicMessageType(this);
-        }
-
-        /// <summary>Field number for the "dynamic_field" field.</summary>
-        public const int DynamicFieldFieldNumber = 2100;
-        private readonly static int DynamicFieldDefaultValue = 0;
-
-        private int dynamicField_;
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public int DynamicField {
-          get { if ((_hasBits0 & 1) != 0) { return dynamicField_; } else { return DynamicFieldDefaultValue; } }
-          set {
-            _hasBits0 |= 1;
-            dynamicField_ = value;
-          }
-        }
-        /// <summary>Gets whether the "dynamic_field" field is set</summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool HasDynamicField {
-          get { return (_hasBits0 & 1) != 0; }
-        }
-        /// <summary>Clears the value of the "dynamic_field" field</summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void ClearDynamicField() {
-          _hasBits0 &= ~1;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override bool Equals(object other) {
-          return Equals(other as DynamicMessageType);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool Equals(DynamicMessageType other) {
-          if (ReferenceEquals(other, null)) {
-            return false;
-          }
-          if (ReferenceEquals(other, this)) {
-            return true;
-          }
-          if (DynamicField != other.DynamicField) return false;
-          return Equals(_unknownFields, other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override int GetHashCode() {
-          int hash = 1;
-          if (HasDynamicField) hash ^= DynamicField.GetHashCode();
-          if (_unknownFields != null) {
-            hash ^= _unknownFields.GetHashCode();
-          }
-          return hash;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override string ToString() {
-          return pb::JsonFormatter.ToDiagnosticString(this);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void WriteTo(pb::CodedOutputStream output) {
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          output.WriteRawMessage(this);
-        #else
-          if (HasDynamicField) {
-            output.WriteRawTag(160, 131, 1);
-            output.WriteInt32(DynamicField);
-          }
-          if (_unknownFields != null) {
-            _unknownFields.WriteTo(output);
-          }
-        #endif
-        }
-
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-          if (HasDynamicField) {
-            output.WriteRawTag(160, 131, 1);
-            output.WriteInt32(DynamicField);
-          }
-          if (_unknownFields != null) {
-            _unknownFields.WriteTo(ref output);
-          }
-        }
-        #endif
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public int CalculateSize() {
-          int size = 0;
-          if (HasDynamicField) {
-            size += 3 + pb::CodedOutputStream.ComputeInt32Size(DynamicField);
-          }
-          if (_unknownFields != null) {
-            size += _unknownFields.CalculateSize();
-          }
-          return size;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(DynamicMessageType other) {
-          if (other == null) {
-            return;
-          }
-          if (other.HasDynamicField) {
-            DynamicField = other.DynamicField;
-          }
-          _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(pb::CodedInputStream input) {
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          input.ReadRawMessage(this);
-        #else
-          uint tag;
-          while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
-              default:
-                _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-                break;
-              case 16800: {
-                DynamicField = input.ReadInt32();
-                break;
-              }
-            }
-          }
-        #endif
-        }
-
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-          uint tag;
-          while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
-              default:
-                _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-                break;
-              case 16800: {
-                DynamicField = input.ReadInt32();
-                break;
-              }
-            }
-          }
-        }
-        #endif
-
-      }
-
-    }
-    #endregion
-
-  }
-
-  public sealed partial class TestRepeatedScalarDifferentTagSizes : pb::IMessage<TestRepeatedScalarDifferentTagSizes>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<TestRepeatedScalarDifferentTagSizes> _parser = new pb::MessageParser<TestRepeatedScalarDifferentTagSizes>(() => new TestRepeatedScalarDifferentTagSizes());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<TestRepeatedScalarDifferentTagSizes> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.Proto2.UnittestReflection.Descriptor.MessageTypes[53]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestRepeatedScalarDifferentTagSizes() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestRepeatedScalarDifferentTagSizes(TestRepeatedScalarDifferentTagSizes other) : this() {
-      repeatedFixed32_ = other.repeatedFixed32_.Clone();
-      repeatedInt32_ = other.repeatedInt32_.Clone();
-      repeatedFixed64_ = other.repeatedFixed64_.Clone();
-      repeatedInt64_ = other.repeatedInt64_.Clone();
-      repeatedFloat_ = other.repeatedFloat_.Clone();
-      repeatedUint64_ = other.repeatedUint64_.Clone();
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestRepeatedScalarDifferentTagSizes Clone() {
-      return new TestRepeatedScalarDifferentTagSizes(this);
-    }
-
-    /// <summary>Field number for the "repeated_fixed32" field.</summary>
-    public const int RepeatedFixed32FieldNumber = 12;
-    private static readonly pb::FieldCodec<uint> _repeated_repeatedFixed32_codec
-        = pb::FieldCodec.ForFixed32(101);
-    private readonly pbc::RepeatedField<uint> repeatedFixed32_ = new pbc::RepeatedField<uint>();
-    /// <summary>
-    /// Parsing repeated fixed size values used to fail. This message needs to be
-    /// used in order to get a tag of the right size; all of the repeated fields
-    /// in TestAllTypes didn't trigger the check.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<uint> RepeatedFixed32 {
-      get { return repeatedFixed32_; }
-    }
-
-    /// <summary>Field number for the "repeated_int32" field.</summary>
-    public const int RepeatedInt32FieldNumber = 13;
-    private static readonly pb::FieldCodec<int> _repeated_repeatedInt32_codec
-        = pb::FieldCodec.ForInt32(104);
-    private readonly pbc::RepeatedField<int> repeatedInt32_ = new pbc::RepeatedField<int>();
-    /// <summary>
-    /// Check for a varint type, just for good measure.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<int> RepeatedInt32 {
-      get { return repeatedInt32_; }
-    }
-
-    /// <summary>Field number for the "repeated_fixed64" field.</summary>
-    public const int RepeatedFixed64FieldNumber = 2046;
-    private static readonly pb::FieldCodec<ulong> _repeated_repeatedFixed64_codec
-        = pb::FieldCodec.ForFixed64(16369);
-    private readonly pbc::RepeatedField<ulong> repeatedFixed64_ = new pbc::RepeatedField<ulong>();
-    /// <summary>
-    /// These have two-byte tags.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<ulong> RepeatedFixed64 {
-      get { return repeatedFixed64_; }
-    }
-
-    /// <summary>Field number for the "repeated_int64" field.</summary>
-    public const int RepeatedInt64FieldNumber = 2047;
-    private static readonly pb::FieldCodec<long> _repeated_repeatedInt64_codec
-        = pb::FieldCodec.ForInt64(16376);
-    private readonly pbc::RepeatedField<long> repeatedInt64_ = new pbc::RepeatedField<long>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<long> RepeatedInt64 {
-      get { return repeatedInt64_; }
-    }
-
-    /// <summary>Field number for the "repeated_float" field.</summary>
-    public const int RepeatedFloatFieldNumber = 262142;
-    private static readonly pb::FieldCodec<float> _repeated_repeatedFloat_codec
-        = pb::FieldCodec.ForFloat(2097141);
-    private readonly pbc::RepeatedField<float> repeatedFloat_ = new pbc::RepeatedField<float>();
-    /// <summary>
-    /// Three byte tags.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<float> RepeatedFloat {
-      get { return repeatedFloat_; }
-    }
-
-    /// <summary>Field number for the "repeated_uint64" field.</summary>
-    public const int RepeatedUint64FieldNumber = 262143;
-    private static readonly pb::FieldCodec<ulong> _repeated_repeatedUint64_codec
-        = pb::FieldCodec.ForUInt64(2097144);
-    private readonly pbc::RepeatedField<ulong> repeatedUint64_ = new pbc::RepeatedField<ulong>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<ulong> RepeatedUint64 {
-      get { return repeatedUint64_; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as TestRepeatedScalarDifferentTagSizes);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(TestRepeatedScalarDifferentTagSizes other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if(!repeatedFixed32_.Equals(other.repeatedFixed32_)) return false;
-      if(!repeatedInt32_.Equals(other.repeatedInt32_)) return false;
-      if(!repeatedFixed64_.Equals(other.repeatedFixed64_)) return false;
-      if(!repeatedInt64_.Equals(other.repeatedInt64_)) return false;
-      if(!repeatedFloat_.Equals(other.repeatedFloat_)) return false;
-      if(!repeatedUint64_.Equals(other.repeatedUint64_)) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      hash ^= repeatedFixed32_.GetHashCode();
-      hash ^= repeatedInt32_.GetHashCode();
-      hash ^= repeatedFixed64_.GetHashCode();
-      hash ^= repeatedInt64_.GetHashCode();
-      hash ^= repeatedFloat_.GetHashCode();
-      hash ^= repeatedUint64_.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      repeatedFixed32_.WriteTo(output, _repeated_repeatedFixed32_codec);
-      repeatedInt32_.WriteTo(output, _repeated_repeatedInt32_codec);
-      repeatedFixed64_.WriteTo(output, _repeated_repeatedFixed64_codec);
-      repeatedInt64_.WriteTo(output, _repeated_repeatedInt64_codec);
-      repeatedFloat_.WriteTo(output, _repeated_repeatedFloat_codec);
-      repeatedUint64_.WriteTo(output, _repeated_repeatedUint64_codec);
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      repeatedFixed32_.WriteTo(ref output, _repeated_repeatedFixed32_codec);
-      repeatedInt32_.WriteTo(ref output, _repeated_repeatedInt32_codec);
-      repeatedFixed64_.WriteTo(ref output, _repeated_repeatedFixed64_codec);
-      repeatedInt64_.WriteTo(ref output, _repeated_repeatedInt64_codec);
-      repeatedFloat_.WriteTo(ref output, _repeated_repeatedFloat_codec);
-      repeatedUint64_.WriteTo(ref output, _repeated_repeatedUint64_codec);
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      size += repeatedFixed32_.CalculateSize(_repeated_repeatedFixed32_codec);
-      size += repeatedInt32_.CalculateSize(_repeated_repeatedInt32_codec);
-      size += repeatedFixed64_.CalculateSize(_repeated_repeatedFixed64_codec);
-      size += repeatedInt64_.CalculateSize(_repeated_repeatedInt64_codec);
-      size += repeatedFloat_.CalculateSize(_repeated_repeatedFloat_codec);
-      size += repeatedUint64_.CalculateSize(_repeated_repeatedUint64_codec);
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(TestRepeatedScalarDifferentTagSizes other) {
-      if (other == null) {
-        return;
-      }
-      repeatedFixed32_.Add(other.repeatedFixed32_);
-      repeatedInt32_.Add(other.repeatedInt32_);
-      repeatedFixed64_.Add(other.repeatedFixed64_);
-      repeatedInt64_.Add(other.repeatedInt64_);
-      repeatedFloat_.Add(other.repeatedFloat_);
-      repeatedUint64_.Add(other.repeatedUint64_);
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 98:
-          case 101: {
-            repeatedFixed32_.AddEntriesFrom(input, _repeated_repeatedFixed32_codec);
-            break;
-          }
-          case 106:
-          case 104: {
-            repeatedInt32_.AddEntriesFrom(input, _repeated_repeatedInt32_codec);
-            break;
-          }
-          case 16370:
-          case 16369: {
-            repeatedFixed64_.AddEntriesFrom(input, _repeated_repeatedFixed64_codec);
-            break;
-          }
-          case 16378:
-          case 16376: {
-            repeatedInt64_.AddEntriesFrom(input, _repeated_repeatedInt64_codec);
-            break;
-          }
-          case 2097138:
-          case 2097141: {
-            repeatedFloat_.AddEntriesFrom(input, _repeated_repeatedFloat_codec);
-            break;
-          }
-          case 2097146:
-          case 2097144: {
-            repeatedUint64_.AddEntriesFrom(input, _repeated_repeatedUint64_codec);
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 98:
-          case 101: {
-            repeatedFixed32_.AddEntriesFrom(ref input, _repeated_repeatedFixed32_codec);
-            break;
-          }
-          case 106:
-          case 104: {
-            repeatedInt32_.AddEntriesFrom(ref input, _repeated_repeatedInt32_codec);
-            break;
-          }
-          case 16370:
-          case 16369: {
-            repeatedFixed64_.AddEntriesFrom(ref input, _repeated_repeatedFixed64_codec);
-            break;
-          }
-          case 16378:
-          case 16376: {
-            repeatedInt64_.AddEntriesFrom(ref input, _repeated_repeatedInt64_codec);
-            break;
-          }
-          case 2097138:
-          case 2097141: {
-            repeatedFloat_.AddEntriesFrom(ref input, _repeated_repeatedFloat_codec);
-            break;
-          }
-          case 2097146:
-          case 2097144: {
-            repeatedUint64_.AddEntriesFrom(ref input, _repeated_repeatedUint64_codec);
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  /// <summary>
-  /// Test that if an optional or required message/group field appears multiple
-  /// times in the input, they need to be merged.
-  /// </summary>
-  public sealed partial class TestParsingMerge : pb::IExtendableMessage<TestParsingMerge>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<TestParsingMerge> _parser = new pb::MessageParser<TestParsingMerge>(() => new TestParsingMerge());
-    private pb::UnknownFieldSet _unknownFields;
-    private pb::ExtensionSet<TestParsingMerge> _extensions;
-    private pb::ExtensionSet<TestParsingMerge> _Extensions { get { return _extensions; } }
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<TestParsingMerge> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.Proto2.UnittestReflection.Descriptor.MessageTypes[54]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestParsingMerge() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestParsingMerge(TestParsingMerge other) : this() {
-      requiredAllTypes_ = other.requiredAllTypes_ != null ? other.requiredAllTypes_.Clone() : null;
-      optionalAllTypes_ = other.optionalAllTypes_ != null ? other.optionalAllTypes_.Clone() : null;
-      repeatedAllTypes_ = other.repeatedAllTypes_.Clone();
-      optionalGroup_ = other.HasOptionalGroup ? other.optionalGroup_.Clone() : null;
-      repeatedGroup_ = other.repeatedGroup_.Clone();
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-      _extensions = pb::ExtensionSet.Clone(other._extensions);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestParsingMerge Clone() {
-      return new TestParsingMerge(this);
-    }
-
-    /// <summary>Field number for the "required_all_types" field.</summary>
-    public const int RequiredAllTypesFieldNumber = 1;
-    private global::Google.Protobuf.TestProtos.Proto2.TestAllTypes requiredAllTypes_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.TestProtos.Proto2.TestAllTypes RequiredAllTypes {
-      get { return requiredAllTypes_; }
-      set {
-        requiredAllTypes_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "optional_all_types" field.</summary>
-    public const int OptionalAllTypesFieldNumber = 2;
-    private global::Google.Protobuf.TestProtos.Proto2.TestAllTypes optionalAllTypes_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.TestProtos.Proto2.TestAllTypes OptionalAllTypes {
-      get { return optionalAllTypes_; }
-      set {
-        optionalAllTypes_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "repeated_all_types" field.</summary>
-    public const int RepeatedAllTypesFieldNumber = 3;
-    private static readonly pb::FieldCodec<global::Google.Protobuf.TestProtos.Proto2.TestAllTypes> _repeated_repeatedAllTypes_codec
-        = pb::FieldCodec.ForMessage(26, global::Google.Protobuf.TestProtos.Proto2.TestAllTypes.Parser);
-    private readonly pbc::RepeatedField<global::Google.Protobuf.TestProtos.Proto2.TestAllTypes> repeatedAllTypes_ = new pbc::RepeatedField<global::Google.Protobuf.TestProtos.Proto2.TestAllTypes>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Google.Protobuf.TestProtos.Proto2.TestAllTypes> RepeatedAllTypes {
-      get { return repeatedAllTypes_; }
-    }
-
-    /// <summary>Field number for the "optionalgroup" field.</summary>
-    public const int OptionalGroupFieldNumber = 10;
-    private global::Google.Protobuf.TestProtos.Proto2.TestParsingMerge.Types.OptionalGroup optionalGroup_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.TestProtos.Proto2.TestParsingMerge.Types.OptionalGroup OptionalGroup {
-      get { return optionalGroup_; }
-      set {
-        optionalGroup_ = value;
-      }
-    }
-    /// <summary>Gets whether the optionalgroup field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasOptionalGroup {
-      get { return optionalGroup_ != null; }
-    }
-    /// <summary>Clears the value of the optionalgroup field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearOptionalGroup() {
-      optionalGroup_ = null;
-    }
-
-    /// <summary>Field number for the "repeatedgroup" field.</summary>
-    public const int RepeatedGroupFieldNumber = 20;
-    private static readonly pb::FieldCodec<global::Google.Protobuf.TestProtos.Proto2.TestParsingMerge.Types.RepeatedGroup> _repeated_repeatedGroup_codec
-        = pb::FieldCodec.ForGroup(163, 164, global::Google.Protobuf.TestProtos.Proto2.TestParsingMerge.Types.RepeatedGroup.Parser);
-    private readonly pbc::RepeatedField<global::Google.Protobuf.TestProtos.Proto2.TestParsingMerge.Types.RepeatedGroup> repeatedGroup_ = new pbc::RepeatedField<global::Google.Protobuf.TestProtos.Proto2.TestParsingMerge.Types.RepeatedGroup>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Google.Protobuf.TestProtos.Proto2.TestParsingMerge.Types.RepeatedGroup> RepeatedGroup {
-      get { return repeatedGroup_; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as TestParsingMerge);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(TestParsingMerge other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (!object.Equals(RequiredAllTypes, other.RequiredAllTypes)) return false;
-      if (!object.Equals(OptionalAllTypes, other.OptionalAllTypes)) return false;
-      if(!repeatedAllTypes_.Equals(other.repeatedAllTypes_)) return false;
-      if (!object.Equals(OptionalGroup, other.OptionalGroup)) return false;
-      if(!repeatedGroup_.Equals(other.repeatedGroup_)) return false;
-      if (!Equals(_extensions, other._extensions)) {
-        return false;
-      }
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (requiredAllTypes_ != null) hash ^= RequiredAllTypes.GetHashCode();
-      if (optionalAllTypes_ != null) hash ^= OptionalAllTypes.GetHashCode();
-      hash ^= repeatedAllTypes_.GetHashCode();
-      if (HasOptionalGroup) hash ^= OptionalGroup.GetHashCode();
-      hash ^= repeatedGroup_.GetHashCode();
-      if (_extensions != null) {
-        hash ^= _extensions.GetHashCode();
-      }
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (requiredAllTypes_ != null) {
-        output.WriteRawTag(10);
-        output.WriteMessage(RequiredAllTypes);
-      }
-      if (optionalAllTypes_ != null) {
-        output.WriteRawTag(18);
-        output.WriteMessage(OptionalAllTypes);
-      }
-      repeatedAllTypes_.WriteTo(output, _repeated_repeatedAllTypes_codec);
-      if (HasOptionalGroup) {
-        output.WriteRawTag(83);
-        output.WriteGroup(OptionalGroup);
-        output.WriteRawTag(84);
-      }
-      repeatedGroup_.WriteTo(output, _repeated_repeatedGroup_codec);
-      if (_extensions != null) {
-        _extensions.WriteTo(output);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (requiredAllTypes_ != null) {
-        output.WriteRawTag(10);
-        output.WriteMessage(RequiredAllTypes);
-      }
-      if (optionalAllTypes_ != null) {
-        output.WriteRawTag(18);
-        output.WriteMessage(OptionalAllTypes);
-      }
-      repeatedAllTypes_.WriteTo(ref output, _repeated_repeatedAllTypes_codec);
-      if (HasOptionalGroup) {
-        output.WriteRawTag(83);
-        output.WriteGroup(OptionalGroup);
-        output.WriteRawTag(84);
-      }
-      repeatedGroup_.WriteTo(ref output, _repeated_repeatedGroup_codec);
-      if (_extensions != null) {
-        _extensions.WriteTo(ref output);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (requiredAllTypes_ != null) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(RequiredAllTypes);
-      }
-      if (optionalAllTypes_ != null) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(OptionalAllTypes);
-      }
-      size += repeatedAllTypes_.CalculateSize(_repeated_repeatedAllTypes_codec);
-      if (HasOptionalGroup) {
-        size += 2 + pb::CodedOutputStream.ComputeGroupSize(OptionalGroup);
-      }
-      size += repeatedGroup_.CalculateSize(_repeated_repeatedGroup_codec);
-      if (_extensions != null) {
-        size += _extensions.CalculateSize();
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(TestParsingMerge other) {
-      if (other == null) {
-        return;
-      }
-      if (other.requiredAllTypes_ != null) {
-        if (requiredAllTypes_ == null) {
-          RequiredAllTypes = new global::Google.Protobuf.TestProtos.Proto2.TestAllTypes();
-        }
-        RequiredAllTypes.MergeFrom(other.RequiredAllTypes);
-      }
-      if (other.optionalAllTypes_ != null) {
-        if (optionalAllTypes_ == null) {
-          OptionalAllTypes = new global::Google.Protobuf.TestProtos.Proto2.TestAllTypes();
-        }
-        OptionalAllTypes.MergeFrom(other.OptionalAllTypes);
-      }
-      repeatedAllTypes_.Add(other.repeatedAllTypes_);
-      if (other.HasOptionalGroup) {
-        if (!HasOptionalGroup) {
-          OptionalGroup = new global::Google.Protobuf.TestProtos.Proto2.TestParsingMerge.Types.OptionalGroup();
-        }
-        OptionalGroup.MergeFrom(other.OptionalGroup);
-      }
-      repeatedGroup_.Add(other.repeatedGroup_);
-      pb::ExtensionSet.MergeFrom(ref _extensions, other._extensions);
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            if (!pb::ExtensionSet.TryMergeFieldFrom(ref _extensions, input)) {
-              _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            }
-            break;
-          case 10: {
-            if (requiredAllTypes_ == null) {
-              RequiredAllTypes = new global::Google.Protobuf.TestProtos.Proto2.TestAllTypes();
-            }
-            input.ReadMessage(RequiredAllTypes);
-            break;
-          }
-          case 18: {
-            if (optionalAllTypes_ == null) {
-              OptionalAllTypes = new global::Google.Protobuf.TestProtos.Proto2.TestAllTypes();
-            }
-            input.ReadMessage(OptionalAllTypes);
-            break;
-          }
-          case 26: {
-            repeatedAllTypes_.AddEntriesFrom(input, _repeated_repeatedAllTypes_codec);
-            break;
-          }
-          case 83: {
-            if (!HasOptionalGroup) {
-              OptionalGroup = new global::Google.Protobuf.TestProtos.Proto2.TestParsingMerge.Types.OptionalGroup();
-            }
-            input.ReadGroup(OptionalGroup);
-            break;
-          }
-          case 163: {
-            repeatedGroup_.AddEntriesFrom(input, _repeated_repeatedGroup_codec);
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            if (!pb::ExtensionSet.TryMergeFieldFrom(ref _extensions, ref input)) {
-              _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            }
-            break;
-          case 10: {
-            if (requiredAllTypes_ == null) {
-              RequiredAllTypes = new global::Google.Protobuf.TestProtos.Proto2.TestAllTypes();
-            }
-            input.ReadMessage(RequiredAllTypes);
-            break;
-          }
-          case 18: {
-            if (optionalAllTypes_ == null) {
-              OptionalAllTypes = new global::Google.Protobuf.TestProtos.Proto2.TestAllTypes();
-            }
-            input.ReadMessage(OptionalAllTypes);
-            break;
-          }
-          case 26: {
-            repeatedAllTypes_.AddEntriesFrom(ref input, _repeated_repeatedAllTypes_codec);
-            break;
-          }
-          case 83: {
-            if (!HasOptionalGroup) {
-              OptionalGroup = new global::Google.Protobuf.TestProtos.Proto2.TestParsingMerge.Types.OptionalGroup();
-            }
-            input.ReadGroup(OptionalGroup);
-            break;
-          }
-          case 163: {
-            repeatedGroup_.AddEntriesFrom(ref input, _repeated_repeatedGroup_codec);
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-    public TValue GetExtension<TValue>(pb::Extension<TestParsingMerge, TValue> extension) {
-      return pb::ExtensionSet.Get(ref _extensions, extension);
-    }
-    public pbc::RepeatedField<TValue> GetExtension<TValue>(pb::RepeatedExtension<TestParsingMerge, TValue> extension) {
-      return pb::ExtensionSet.Get(ref _extensions, extension);
-    }
-    public pbc::RepeatedField<TValue> GetOrInitializeExtension<TValue>(pb::RepeatedExtension<TestParsingMerge, TValue> extension) {
-      return pb::ExtensionSet.GetOrInitialize(ref _extensions, extension);
-    }
-    public void SetExtension<TValue>(pb::Extension<TestParsingMerge, TValue> extension, TValue value) {
-      pb::ExtensionSet.Set(ref _extensions, extension, value);
-    }
-    public bool HasExtension<TValue>(pb::Extension<TestParsingMerge, TValue> extension) {
-      return pb::ExtensionSet.Has(ref _extensions, extension);
-    }
-    public void ClearExtension<TValue>(pb::Extension<TestParsingMerge, TValue> extension) {
-      pb::ExtensionSet.Clear(ref _extensions, extension);
-    }
-    public void ClearExtension<TValue>(pb::RepeatedExtension<TestParsingMerge, TValue> extension) {
-      pb::ExtensionSet.Clear(ref _extensions, extension);
-    }
-
-    #region Nested types
-    /// <summary>Container for nested types declared in the TestParsingMerge message type.</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static partial class Types {
-      /// <summary>
-      /// RepeatedFieldsGenerator defines matching field types as TestParsingMerge,
-      /// except that all fields are repeated. In the tests, we will serialize the
-      /// RepeatedFieldsGenerator to bytes, and parse the bytes to TestParsingMerge.
-      /// Repeated fields in RepeatedFieldsGenerator are expected to be merged into
-      /// the corresponding required/optional fields in TestParsingMerge.
-      /// </summary>
-      public sealed partial class RepeatedFieldsGenerator : pb::IMessage<RepeatedFieldsGenerator>
-      #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          , pb::IBufferMessage
-      #endif
-      {
-        private static readonly pb::MessageParser<RepeatedFieldsGenerator> _parser = new pb::MessageParser<RepeatedFieldsGenerator>(() => new RepeatedFieldsGenerator());
-        private pb::UnknownFieldSet _unknownFields;
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static pb::MessageParser<RepeatedFieldsGenerator> Parser { get { return _parser; } }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static pbr::MessageDescriptor Descriptor {
-          get { return global::Google.Protobuf.TestProtos.Proto2.TestParsingMerge.Descriptor.NestedTypes[0]; }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        pbr::MessageDescriptor pb::IMessage.Descriptor {
-          get { return Descriptor; }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public RepeatedFieldsGenerator() {
-          OnConstruction();
-        }
-
-        partial void OnConstruction();
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public RepeatedFieldsGenerator(RepeatedFieldsGenerator other) : this() {
-          field1_ = other.field1_.Clone();
-          field2_ = other.field2_.Clone();
-          field3_ = other.field3_.Clone();
-          group1_ = other.group1_.Clone();
-          group2_ = other.group2_.Clone();
-          ext1_ = other.ext1_.Clone();
-          ext2_ = other.ext2_.Clone();
-          _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public RepeatedFieldsGenerator Clone() {
-          return new RepeatedFieldsGenerator(this);
-        }
-
-        /// <summary>Field number for the "field1" field.</summary>
-        public const int Field1FieldNumber = 1;
-        private static readonly pb::FieldCodec<global::Google.Protobuf.TestProtos.Proto2.TestAllTypes> _repeated_field1_codec
-            = pb::FieldCodec.ForMessage(10, global::Google.Protobuf.TestProtos.Proto2.TestAllTypes.Parser);
-        private readonly pbc::RepeatedField<global::Google.Protobuf.TestProtos.Proto2.TestAllTypes> field1_ = new pbc::RepeatedField<global::Google.Protobuf.TestProtos.Proto2.TestAllTypes>();
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public pbc::RepeatedField<global::Google.Protobuf.TestProtos.Proto2.TestAllTypes> Field1 {
-          get { return field1_; }
-        }
-
-        /// <summary>Field number for the "field2" field.</summary>
-        public const int Field2FieldNumber = 2;
-        private static readonly pb::FieldCodec<global::Google.Protobuf.TestProtos.Proto2.TestAllTypes> _repeated_field2_codec
-            = pb::FieldCodec.ForMessage(18, global::Google.Protobuf.TestProtos.Proto2.TestAllTypes.Parser);
-        private readonly pbc::RepeatedField<global::Google.Protobuf.TestProtos.Proto2.TestAllTypes> field2_ = new pbc::RepeatedField<global::Google.Protobuf.TestProtos.Proto2.TestAllTypes>();
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public pbc::RepeatedField<global::Google.Protobuf.TestProtos.Proto2.TestAllTypes> Field2 {
-          get { return field2_; }
-        }
-
-        /// <summary>Field number for the "field3" field.</summary>
-        public const int Field3FieldNumber = 3;
-        private static readonly pb::FieldCodec<global::Google.Protobuf.TestProtos.Proto2.TestAllTypes> _repeated_field3_codec
-            = pb::FieldCodec.ForMessage(26, global::Google.Protobuf.TestProtos.Proto2.TestAllTypes.Parser);
-        private readonly pbc::RepeatedField<global::Google.Protobuf.TestProtos.Proto2.TestAllTypes> field3_ = new pbc::RepeatedField<global::Google.Protobuf.TestProtos.Proto2.TestAllTypes>();
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public pbc::RepeatedField<global::Google.Protobuf.TestProtos.Proto2.TestAllTypes> Field3 {
-          get { return field3_; }
-        }
-
-        /// <summary>Field number for the "group1" field.</summary>
-        public const int Group1FieldNumber = 10;
-        private static readonly pb::FieldCodec<global::Google.Protobuf.TestProtos.Proto2.TestParsingMerge.Types.RepeatedFieldsGenerator.Types.Group1> _repeated_group1_codec
-            = pb::FieldCodec.ForGroup(83, 84, global::Google.Protobuf.TestProtos.Proto2.TestParsingMerge.Types.RepeatedFieldsGenerator.Types.Group1.Parser);
-        private readonly pbc::RepeatedField<global::Google.Protobuf.TestProtos.Proto2.TestParsingMerge.Types.RepeatedFieldsGenerator.Types.Group1> group1_ = new pbc::RepeatedField<global::Google.Protobuf.TestProtos.Proto2.TestParsingMerge.Types.RepeatedFieldsGenerator.Types.Group1>();
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public pbc::RepeatedField<global::Google.Protobuf.TestProtos.Proto2.TestParsingMerge.Types.RepeatedFieldsGenerator.Types.Group1> Group1 {
-          get { return group1_; }
-        }
-
-        /// <summary>Field number for the "group2" field.</summary>
-        public const int Group2FieldNumber = 20;
-        private static readonly pb::FieldCodec<global::Google.Protobuf.TestProtos.Proto2.TestParsingMerge.Types.RepeatedFieldsGenerator.Types.Group2> _repeated_group2_codec
-            = pb::FieldCodec.ForGroup(163, 164, global::Google.Protobuf.TestProtos.Proto2.TestParsingMerge.Types.RepeatedFieldsGenerator.Types.Group2.Parser);
-        private readonly pbc::RepeatedField<global::Google.Protobuf.TestProtos.Proto2.TestParsingMerge.Types.RepeatedFieldsGenerator.Types.Group2> group2_ = new pbc::RepeatedField<global::Google.Protobuf.TestProtos.Proto2.TestParsingMerge.Types.RepeatedFieldsGenerator.Types.Group2>();
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public pbc::RepeatedField<global::Google.Protobuf.TestProtos.Proto2.TestParsingMerge.Types.RepeatedFieldsGenerator.Types.Group2> Group2 {
-          get { return group2_; }
-        }
-
-        /// <summary>Field number for the "ext1" field.</summary>
-        public const int Ext1FieldNumber = 1000;
-        private static readonly pb::FieldCodec<global::Google.Protobuf.TestProtos.Proto2.TestAllTypes> _repeated_ext1_codec
-            = pb::FieldCodec.ForMessage(8002, global::Google.Protobuf.TestProtos.Proto2.TestAllTypes.Parser);
-        private readonly pbc::RepeatedField<global::Google.Protobuf.TestProtos.Proto2.TestAllTypes> ext1_ = new pbc::RepeatedField<global::Google.Protobuf.TestProtos.Proto2.TestAllTypes>();
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public pbc::RepeatedField<global::Google.Protobuf.TestProtos.Proto2.TestAllTypes> Ext1 {
-          get { return ext1_; }
-        }
-
-        /// <summary>Field number for the "ext2" field.</summary>
-        public const int Ext2FieldNumber = 1001;
-        private static readonly pb::FieldCodec<global::Google.Protobuf.TestProtos.Proto2.TestAllTypes> _repeated_ext2_codec
-            = pb::FieldCodec.ForMessage(8010, global::Google.Protobuf.TestProtos.Proto2.TestAllTypes.Parser);
-        private readonly pbc::RepeatedField<global::Google.Protobuf.TestProtos.Proto2.TestAllTypes> ext2_ = new pbc::RepeatedField<global::Google.Protobuf.TestProtos.Proto2.TestAllTypes>();
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public pbc::RepeatedField<global::Google.Protobuf.TestProtos.Proto2.TestAllTypes> Ext2 {
-          get { return ext2_; }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override bool Equals(object other) {
-          return Equals(other as RepeatedFieldsGenerator);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool Equals(RepeatedFieldsGenerator other) {
-          if (ReferenceEquals(other, null)) {
-            return false;
-          }
-          if (ReferenceEquals(other, this)) {
-            return true;
-          }
-          if(!field1_.Equals(other.field1_)) return false;
-          if(!field2_.Equals(other.field2_)) return false;
-          if(!field3_.Equals(other.field3_)) return false;
-          if(!group1_.Equals(other.group1_)) return false;
-          if(!group2_.Equals(other.group2_)) return false;
-          if(!ext1_.Equals(other.ext1_)) return false;
-          if(!ext2_.Equals(other.ext2_)) return false;
-          return Equals(_unknownFields, other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override int GetHashCode() {
-          int hash = 1;
-          hash ^= field1_.GetHashCode();
-          hash ^= field2_.GetHashCode();
-          hash ^= field3_.GetHashCode();
-          hash ^= group1_.GetHashCode();
-          hash ^= group2_.GetHashCode();
-          hash ^= ext1_.GetHashCode();
-          hash ^= ext2_.GetHashCode();
-          if (_unknownFields != null) {
-            hash ^= _unknownFields.GetHashCode();
-          }
-          return hash;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override string ToString() {
-          return pb::JsonFormatter.ToDiagnosticString(this);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void WriteTo(pb::CodedOutputStream output) {
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          output.WriteRawMessage(this);
-        #else
-          field1_.WriteTo(output, _repeated_field1_codec);
-          field2_.WriteTo(output, _repeated_field2_codec);
-          field3_.WriteTo(output, _repeated_field3_codec);
-          group1_.WriteTo(output, _repeated_group1_codec);
-          group2_.WriteTo(output, _repeated_group2_codec);
-          ext1_.WriteTo(output, _repeated_ext1_codec);
-          ext2_.WriteTo(output, _repeated_ext2_codec);
-          if (_unknownFields != null) {
-            _unknownFields.WriteTo(output);
-          }
-        #endif
-        }
-
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-          field1_.WriteTo(ref output, _repeated_field1_codec);
-          field2_.WriteTo(ref output, _repeated_field2_codec);
-          field3_.WriteTo(ref output, _repeated_field3_codec);
-          group1_.WriteTo(ref output, _repeated_group1_codec);
-          group2_.WriteTo(ref output, _repeated_group2_codec);
-          ext1_.WriteTo(ref output, _repeated_ext1_codec);
-          ext2_.WriteTo(ref output, _repeated_ext2_codec);
-          if (_unknownFields != null) {
-            _unknownFields.WriteTo(ref output);
-          }
-        }
-        #endif
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public int CalculateSize() {
-          int size = 0;
-          size += field1_.CalculateSize(_repeated_field1_codec);
-          size += field2_.CalculateSize(_repeated_field2_codec);
-          size += field3_.CalculateSize(_repeated_field3_codec);
-          size += group1_.CalculateSize(_repeated_group1_codec);
-          size += group2_.CalculateSize(_repeated_group2_codec);
-          size += ext1_.CalculateSize(_repeated_ext1_codec);
-          size += ext2_.CalculateSize(_repeated_ext2_codec);
-          if (_unknownFields != null) {
-            size += _unknownFields.CalculateSize();
-          }
-          return size;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(RepeatedFieldsGenerator other) {
-          if (other == null) {
-            return;
-          }
-          field1_.Add(other.field1_);
-          field2_.Add(other.field2_);
-          field3_.Add(other.field3_);
-          group1_.Add(other.group1_);
-          group2_.Add(other.group2_);
-          ext1_.Add(other.ext1_);
-          ext2_.Add(other.ext2_);
-          _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(pb::CodedInputStream input) {
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          input.ReadRawMessage(this);
-        #else
-          uint tag;
-          while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
-              default:
-                _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-                break;
-              case 10: {
-                field1_.AddEntriesFrom(input, _repeated_field1_codec);
-                break;
-              }
-              case 18: {
-                field2_.AddEntriesFrom(input, _repeated_field2_codec);
-                break;
-              }
-              case 26: {
-                field3_.AddEntriesFrom(input, _repeated_field3_codec);
-                break;
-              }
-              case 83: {
-                group1_.AddEntriesFrom(input, _repeated_group1_codec);
-                break;
-              }
-              case 163: {
-                group2_.AddEntriesFrom(input, _repeated_group2_codec);
-                break;
-              }
-              case 8002: {
-                ext1_.AddEntriesFrom(input, _repeated_ext1_codec);
-                break;
-              }
-              case 8010: {
-                ext2_.AddEntriesFrom(input, _repeated_ext2_codec);
-                break;
-              }
-            }
-          }
-        #endif
-        }
-
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-          uint tag;
-          while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
-              default:
-                _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-                break;
-              case 10: {
-                field1_.AddEntriesFrom(ref input, _repeated_field1_codec);
-                break;
-              }
-              case 18: {
-                field2_.AddEntriesFrom(ref input, _repeated_field2_codec);
-                break;
-              }
-              case 26: {
-                field3_.AddEntriesFrom(ref input, _repeated_field3_codec);
-                break;
-              }
-              case 83: {
-                group1_.AddEntriesFrom(ref input, _repeated_group1_codec);
-                break;
-              }
-              case 163: {
-                group2_.AddEntriesFrom(ref input, _repeated_group2_codec);
-                break;
-              }
-              case 8002: {
-                ext1_.AddEntriesFrom(ref input, _repeated_ext1_codec);
-                break;
-              }
-              case 8010: {
-                ext2_.AddEntriesFrom(ref input, _repeated_ext2_codec);
-                break;
-              }
-            }
-          }
-        }
-        #endif
-
-        #region Nested types
-        /// <summary>Container for nested types declared in the RepeatedFieldsGenerator message type.</summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static partial class Types {
-          public sealed partial class Group1 : pb::IMessage<Group1>
-          #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-              , pb::IBufferMessage
-          #endif
-          {
-            private static readonly pb::MessageParser<Group1> _parser = new pb::MessageParser<Group1>(() => new Group1());
-            private pb::UnknownFieldSet _unknownFields;
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-            [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-            public static pb::MessageParser<Group1> Parser { get { return _parser; } }
-
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-            [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-            public static pbr::MessageDescriptor Descriptor {
-              get { return global::Google.Protobuf.TestProtos.Proto2.TestParsingMerge.Types.RepeatedFieldsGenerator.Descriptor.NestedTypes[0]; }
-            }
-
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-            [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-            pbr::MessageDescriptor pb::IMessage.Descriptor {
-              get { return Descriptor; }
-            }
-
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-            [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-            public Group1() {
-              OnConstruction();
-            }
-
-            partial void OnConstruction();
-
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-            [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-            public Group1(Group1 other) : this() {
-              field1_ = other.field1_ != null ? other.field1_.Clone() : null;
-              _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-            }
-
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-            [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-            public Group1 Clone() {
-              return new Group1(this);
-            }
-
-            /// <summary>Field number for the "field1" field.</summary>
-            public const int Field1FieldNumber = 11;
-            private global::Google.Protobuf.TestProtos.Proto2.TestAllTypes field1_;
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-            [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-            public global::Google.Protobuf.TestProtos.Proto2.TestAllTypes Field1 {
-              get { return field1_; }
-              set {
-                field1_ = value;
-              }
-            }
-
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-            [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-            public override bool Equals(object other) {
-              return Equals(other as Group1);
-            }
-
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-            [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-            public bool Equals(Group1 other) {
-              if (ReferenceEquals(other, null)) {
-                return false;
-              }
-              if (ReferenceEquals(other, this)) {
-                return true;
-              }
-              if (!object.Equals(Field1, other.Field1)) return false;
-              return Equals(_unknownFields, other._unknownFields);
-            }
-
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-            [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-            public override int GetHashCode() {
-              int hash = 1;
-              if (field1_ != null) hash ^= Field1.GetHashCode();
-              if (_unknownFields != null) {
-                hash ^= _unknownFields.GetHashCode();
-              }
-              return hash;
-            }
-
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-            [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-            public override string ToString() {
-              return pb::JsonFormatter.ToDiagnosticString(this);
-            }
-
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-            [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-            public void WriteTo(pb::CodedOutputStream output) {
-            #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-              output.WriteRawMessage(this);
-            #else
-              if (field1_ != null) {
-                output.WriteRawTag(90);
-                output.WriteMessage(Field1);
-              }
-              if (_unknownFields != null) {
-                _unknownFields.WriteTo(output);
-              }
-            #endif
-            }
-
-            #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-            [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-            void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-              if (field1_ != null) {
-                output.WriteRawTag(90);
-                output.WriteMessage(Field1);
-              }
-              if (_unknownFields != null) {
-                _unknownFields.WriteTo(ref output);
-              }
-            }
-            #endif
-
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-            [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-            public int CalculateSize() {
-              int size = 0;
-              if (field1_ != null) {
-                size += 1 + pb::CodedOutputStream.ComputeMessageSize(Field1);
-              }
-              if (_unknownFields != null) {
-                size += _unknownFields.CalculateSize();
-              }
-              return size;
-            }
-
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-            [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-            public void MergeFrom(Group1 other) {
-              if (other == null) {
-                return;
-              }
-              if (other.field1_ != null) {
-                if (field1_ == null) {
-                  Field1 = new global::Google.Protobuf.TestProtos.Proto2.TestAllTypes();
-                }
-                Field1.MergeFrom(other.Field1);
-              }
-              _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-            }
-
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-            [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-            public void MergeFrom(pb::CodedInputStream input) {
-            #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-              input.ReadRawMessage(this);
-            #else
-              uint tag;
-              while ((tag = input.ReadTag()) != 0) {
-                switch(tag) {
-                  case 84:
-                    return;
-                  default:
-                    _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-                    break;
-                  case 90: {
-                    if (field1_ == null) {
-                      Field1 = new global::Google.Protobuf.TestProtos.Proto2.TestAllTypes();
-                    }
-                    input.ReadMessage(Field1);
-                    break;
-                  }
-                }
-              }
-            #endif
-            }
-
-            #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-            [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-            void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-              uint tag;
-              while ((tag = input.ReadTag()) != 0) {
-                switch(tag) {
-                  case 84:
-                    return;
-                  default:
-                    _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-                    break;
-                  case 90: {
-                    if (field1_ == null) {
-                      Field1 = new global::Google.Protobuf.TestProtos.Proto2.TestAllTypes();
-                    }
-                    input.ReadMessage(Field1);
-                    break;
-                  }
-                }
-              }
-            }
-            #endif
-
-          }
-
-          public sealed partial class Group2 : pb::IMessage<Group2>
-          #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-              , pb::IBufferMessage
-          #endif
-          {
-            private static readonly pb::MessageParser<Group2> _parser = new pb::MessageParser<Group2>(() => new Group2());
-            private pb::UnknownFieldSet _unknownFields;
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-            [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-            public static pb::MessageParser<Group2> Parser { get { return _parser; } }
-
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-            [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-            public static pbr::MessageDescriptor Descriptor {
-              get { return global::Google.Protobuf.TestProtos.Proto2.TestParsingMerge.Types.RepeatedFieldsGenerator.Descriptor.NestedTypes[1]; }
-            }
-
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-            [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-            pbr::MessageDescriptor pb::IMessage.Descriptor {
-              get { return Descriptor; }
-            }
-
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-            [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-            public Group2() {
-              OnConstruction();
-            }
-
-            partial void OnConstruction();
-
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-            [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-            public Group2(Group2 other) : this() {
-              field1_ = other.field1_ != null ? other.field1_.Clone() : null;
-              _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-            }
-
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-            [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-            public Group2 Clone() {
-              return new Group2(this);
-            }
-
-            /// <summary>Field number for the "field1" field.</summary>
-            public const int Field1FieldNumber = 21;
-            private global::Google.Protobuf.TestProtos.Proto2.TestAllTypes field1_;
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-            [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-            public global::Google.Protobuf.TestProtos.Proto2.TestAllTypes Field1 {
-              get { return field1_; }
-              set {
-                field1_ = value;
-              }
-            }
-
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-            [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-            public override bool Equals(object other) {
-              return Equals(other as Group2);
-            }
-
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-            [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-            public bool Equals(Group2 other) {
-              if (ReferenceEquals(other, null)) {
-                return false;
-              }
-              if (ReferenceEquals(other, this)) {
-                return true;
-              }
-              if (!object.Equals(Field1, other.Field1)) return false;
-              return Equals(_unknownFields, other._unknownFields);
-            }
-
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-            [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-            public override int GetHashCode() {
-              int hash = 1;
-              if (field1_ != null) hash ^= Field1.GetHashCode();
-              if (_unknownFields != null) {
-                hash ^= _unknownFields.GetHashCode();
-              }
-              return hash;
-            }
-
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-            [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-            public override string ToString() {
-              return pb::JsonFormatter.ToDiagnosticString(this);
-            }
-
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-            [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-            public void WriteTo(pb::CodedOutputStream output) {
-            #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-              output.WriteRawMessage(this);
-            #else
-              if (field1_ != null) {
-                output.WriteRawTag(170, 1);
-                output.WriteMessage(Field1);
-              }
-              if (_unknownFields != null) {
-                _unknownFields.WriteTo(output);
-              }
-            #endif
-            }
-
-            #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-            [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-            void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-              if (field1_ != null) {
-                output.WriteRawTag(170, 1);
-                output.WriteMessage(Field1);
-              }
-              if (_unknownFields != null) {
-                _unknownFields.WriteTo(ref output);
-              }
-            }
-            #endif
-
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-            [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-            public int CalculateSize() {
-              int size = 0;
-              if (field1_ != null) {
-                size += 2 + pb::CodedOutputStream.ComputeMessageSize(Field1);
-              }
-              if (_unknownFields != null) {
-                size += _unknownFields.CalculateSize();
-              }
-              return size;
-            }
-
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-            [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-            public void MergeFrom(Group2 other) {
-              if (other == null) {
-                return;
-              }
-              if (other.field1_ != null) {
-                if (field1_ == null) {
-                  Field1 = new global::Google.Protobuf.TestProtos.Proto2.TestAllTypes();
-                }
-                Field1.MergeFrom(other.Field1);
-              }
-              _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-            }
-
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-            [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-            public void MergeFrom(pb::CodedInputStream input) {
-            #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-              input.ReadRawMessage(this);
-            #else
-              uint tag;
-              while ((tag = input.ReadTag()) != 0) {
-                switch(tag) {
-                  case 164:
-                    return;
-                  default:
-                    _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-                    break;
-                  case 170: {
-                    if (field1_ == null) {
-                      Field1 = new global::Google.Protobuf.TestProtos.Proto2.TestAllTypes();
-                    }
-                    input.ReadMessage(Field1);
-                    break;
-                  }
-                }
-              }
-            #endif
-            }
-
-            #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-            [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-            void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-              uint tag;
-              while ((tag = input.ReadTag()) != 0) {
-                switch(tag) {
-                  case 164:
-                    return;
-                  default:
-                    _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-                    break;
-                  case 170: {
-                    if (field1_ == null) {
-                      Field1 = new global::Google.Protobuf.TestProtos.Proto2.TestAllTypes();
-                    }
-                    input.ReadMessage(Field1);
-                    break;
-                  }
-                }
-              }
-            }
-            #endif
-
-          }
-
-        }
-        #endregion
-
-      }
-
-      public sealed partial class OptionalGroup : pb::IMessage<OptionalGroup>
-      #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          , pb::IBufferMessage
-      #endif
-      {
-        private static readonly pb::MessageParser<OptionalGroup> _parser = new pb::MessageParser<OptionalGroup>(() => new OptionalGroup());
-        private pb::UnknownFieldSet _unknownFields;
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static pb::MessageParser<OptionalGroup> Parser { get { return _parser; } }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static pbr::MessageDescriptor Descriptor {
-          get { return global::Google.Protobuf.TestProtos.Proto2.TestParsingMerge.Descriptor.NestedTypes[1]; }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        pbr::MessageDescriptor pb::IMessage.Descriptor {
-          get { return Descriptor; }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public OptionalGroup() {
-          OnConstruction();
-        }
-
-        partial void OnConstruction();
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public OptionalGroup(OptionalGroup other) : this() {
-          optionalGroupAllTypes_ = other.optionalGroupAllTypes_ != null ? other.optionalGroupAllTypes_.Clone() : null;
-          _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public OptionalGroup Clone() {
-          return new OptionalGroup(this);
-        }
-
-        /// <summary>Field number for the "optional_group_all_types" field.</summary>
-        public const int OptionalGroupAllTypesFieldNumber = 11;
-        private global::Google.Protobuf.TestProtos.Proto2.TestAllTypes optionalGroupAllTypes_;
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public global::Google.Protobuf.TestProtos.Proto2.TestAllTypes OptionalGroupAllTypes {
-          get { return optionalGroupAllTypes_; }
-          set {
-            optionalGroupAllTypes_ = value;
-          }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override bool Equals(object other) {
-          return Equals(other as OptionalGroup);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool Equals(OptionalGroup other) {
-          if (ReferenceEquals(other, null)) {
-            return false;
-          }
-          if (ReferenceEquals(other, this)) {
-            return true;
-          }
-          if (!object.Equals(OptionalGroupAllTypes, other.OptionalGroupAllTypes)) return false;
-          return Equals(_unknownFields, other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override int GetHashCode() {
-          int hash = 1;
-          if (optionalGroupAllTypes_ != null) hash ^= OptionalGroupAllTypes.GetHashCode();
-          if (_unknownFields != null) {
-            hash ^= _unknownFields.GetHashCode();
-          }
-          return hash;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override string ToString() {
-          return pb::JsonFormatter.ToDiagnosticString(this);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void WriteTo(pb::CodedOutputStream output) {
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          output.WriteRawMessage(this);
-        #else
-          if (optionalGroupAllTypes_ != null) {
-            output.WriteRawTag(90);
-            output.WriteMessage(OptionalGroupAllTypes);
-          }
-          if (_unknownFields != null) {
-            _unknownFields.WriteTo(output);
-          }
-        #endif
-        }
-
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-          if (optionalGroupAllTypes_ != null) {
-            output.WriteRawTag(90);
-            output.WriteMessage(OptionalGroupAllTypes);
-          }
-          if (_unknownFields != null) {
-            _unknownFields.WriteTo(ref output);
-          }
-        }
-        #endif
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public int CalculateSize() {
-          int size = 0;
-          if (optionalGroupAllTypes_ != null) {
-            size += 1 + pb::CodedOutputStream.ComputeMessageSize(OptionalGroupAllTypes);
-          }
-          if (_unknownFields != null) {
-            size += _unknownFields.CalculateSize();
-          }
-          return size;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(OptionalGroup other) {
-          if (other == null) {
-            return;
-          }
-          if (other.optionalGroupAllTypes_ != null) {
-            if (optionalGroupAllTypes_ == null) {
-              OptionalGroupAllTypes = new global::Google.Protobuf.TestProtos.Proto2.TestAllTypes();
-            }
-            OptionalGroupAllTypes.MergeFrom(other.OptionalGroupAllTypes);
-          }
-          _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(pb::CodedInputStream input) {
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          input.ReadRawMessage(this);
-        #else
-          uint tag;
-          while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
-              case 84:
-                return;
-              default:
-                _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-                break;
-              case 90: {
-                if (optionalGroupAllTypes_ == null) {
-                  OptionalGroupAllTypes = new global::Google.Protobuf.TestProtos.Proto2.TestAllTypes();
-                }
-                input.ReadMessage(OptionalGroupAllTypes);
-                break;
-              }
-            }
-          }
-        #endif
-        }
-
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-          uint tag;
-          while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
-              case 84:
-                return;
-              default:
-                _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-                break;
-              case 90: {
-                if (optionalGroupAllTypes_ == null) {
-                  OptionalGroupAllTypes = new global::Google.Protobuf.TestProtos.Proto2.TestAllTypes();
-                }
-                input.ReadMessage(OptionalGroupAllTypes);
-                break;
-              }
-            }
-          }
-        }
-        #endif
-
-      }
-
-      public sealed partial class RepeatedGroup : pb::IMessage<RepeatedGroup>
-      #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          , pb::IBufferMessage
-      #endif
-      {
-        private static readonly pb::MessageParser<RepeatedGroup> _parser = new pb::MessageParser<RepeatedGroup>(() => new RepeatedGroup());
-        private pb::UnknownFieldSet _unknownFields;
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static pb::MessageParser<RepeatedGroup> Parser { get { return _parser; } }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static pbr::MessageDescriptor Descriptor {
-          get { return global::Google.Protobuf.TestProtos.Proto2.TestParsingMerge.Descriptor.NestedTypes[2]; }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        pbr::MessageDescriptor pb::IMessage.Descriptor {
-          get { return Descriptor; }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public RepeatedGroup() {
-          OnConstruction();
-        }
-
-        partial void OnConstruction();
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public RepeatedGroup(RepeatedGroup other) : this() {
-          repeatedGroupAllTypes_ = other.repeatedGroupAllTypes_ != null ? other.repeatedGroupAllTypes_.Clone() : null;
-          _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public RepeatedGroup Clone() {
-          return new RepeatedGroup(this);
-        }
-
-        /// <summary>Field number for the "repeated_group_all_types" field.</summary>
-        public const int RepeatedGroupAllTypesFieldNumber = 21;
-        private global::Google.Protobuf.TestProtos.Proto2.TestAllTypes repeatedGroupAllTypes_;
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public global::Google.Protobuf.TestProtos.Proto2.TestAllTypes RepeatedGroupAllTypes {
-          get { return repeatedGroupAllTypes_; }
-          set {
-            repeatedGroupAllTypes_ = value;
-          }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override bool Equals(object other) {
-          return Equals(other as RepeatedGroup);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool Equals(RepeatedGroup other) {
-          if (ReferenceEquals(other, null)) {
-            return false;
-          }
-          if (ReferenceEquals(other, this)) {
-            return true;
-          }
-          if (!object.Equals(RepeatedGroupAllTypes, other.RepeatedGroupAllTypes)) return false;
-          return Equals(_unknownFields, other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override int GetHashCode() {
-          int hash = 1;
-          if (repeatedGroupAllTypes_ != null) hash ^= RepeatedGroupAllTypes.GetHashCode();
-          if (_unknownFields != null) {
-            hash ^= _unknownFields.GetHashCode();
-          }
-          return hash;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override string ToString() {
-          return pb::JsonFormatter.ToDiagnosticString(this);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void WriteTo(pb::CodedOutputStream output) {
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          output.WriteRawMessage(this);
-        #else
-          if (repeatedGroupAllTypes_ != null) {
-            output.WriteRawTag(170, 1);
-            output.WriteMessage(RepeatedGroupAllTypes);
-          }
-          if (_unknownFields != null) {
-            _unknownFields.WriteTo(output);
-          }
-        #endif
-        }
-
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-          if (repeatedGroupAllTypes_ != null) {
-            output.WriteRawTag(170, 1);
-            output.WriteMessage(RepeatedGroupAllTypes);
-          }
-          if (_unknownFields != null) {
-            _unknownFields.WriteTo(ref output);
-          }
-        }
-        #endif
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public int CalculateSize() {
-          int size = 0;
-          if (repeatedGroupAllTypes_ != null) {
-            size += 2 + pb::CodedOutputStream.ComputeMessageSize(RepeatedGroupAllTypes);
-          }
-          if (_unknownFields != null) {
-            size += _unknownFields.CalculateSize();
-          }
-          return size;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(RepeatedGroup other) {
-          if (other == null) {
-            return;
-          }
-          if (other.repeatedGroupAllTypes_ != null) {
-            if (repeatedGroupAllTypes_ == null) {
-              RepeatedGroupAllTypes = new global::Google.Protobuf.TestProtos.Proto2.TestAllTypes();
-            }
-            RepeatedGroupAllTypes.MergeFrom(other.RepeatedGroupAllTypes);
-          }
-          _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(pb::CodedInputStream input) {
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          input.ReadRawMessage(this);
-        #else
-          uint tag;
-          while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
-              case 164:
-                return;
-              default:
-                _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-                break;
-              case 170: {
-                if (repeatedGroupAllTypes_ == null) {
-                  RepeatedGroupAllTypes = new global::Google.Protobuf.TestProtos.Proto2.TestAllTypes();
-                }
-                input.ReadMessage(RepeatedGroupAllTypes);
-                break;
-              }
-            }
-          }
-        #endif
-        }
-
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-          uint tag;
-          while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
-              case 164:
-                return;
-              default:
-                _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-                break;
-              case 170: {
-                if (repeatedGroupAllTypes_ == null) {
-                  RepeatedGroupAllTypes = new global::Google.Protobuf.TestProtos.Proto2.TestAllTypes();
-                }
-                input.ReadMessage(RepeatedGroupAllTypes);
-                break;
-              }
-            }
-          }
-        }
-        #endif
-
-      }
-
-    }
-    #endregion
-
-    #region Extensions
-    /// <summary>Container for extensions for other messages declared in the TestParsingMerge message type.</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static partial class Extensions {
-      public static readonly pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestParsingMerge, global::Google.Protobuf.TestProtos.Proto2.TestAllTypes> OptionalExt =
-        new pb::Extension<global::Google.Protobuf.TestProtos.Proto2.TestParsingMerge, global::Google.Protobuf.TestProtos.Proto2.TestAllTypes>(1000, pb::FieldCodec.ForMessage(8002, global::Google.Protobuf.TestProtos.Proto2.TestAllTypes.Parser));
-      public static readonly pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestParsingMerge, global::Google.Protobuf.TestProtos.Proto2.TestAllTypes> RepeatedExt =
-        new pb::RepeatedExtension<global::Google.Protobuf.TestProtos.Proto2.TestParsingMerge, global::Google.Protobuf.TestProtos.Proto2.TestAllTypes>(1001, pb::FieldCodec.ForMessage(8010, global::Google.Protobuf.TestProtos.Proto2.TestAllTypes.Parser));
-    }
-    #endregion
-
-  }
-
-  public sealed partial class TestCommentInjectionMessage : pb::IMessage<TestCommentInjectionMessage>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<TestCommentInjectionMessage> _parser = new pb::MessageParser<TestCommentInjectionMessage>(() => new TestCommentInjectionMessage());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<TestCommentInjectionMessage> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.Proto2.UnittestReflection.Descriptor.MessageTypes[55]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestCommentInjectionMessage() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestCommentInjectionMessage(TestCommentInjectionMessage other) : this() {
-      a_ = other.a_;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestCommentInjectionMessage Clone() {
-      return new TestCommentInjectionMessage(this);
-    }
-
-    /// <summary>Field number for the "a" field.</summary>
-    public const int AFieldNumber = 1;
-    private readonly static string ADefaultValue = global::System.Text.Encoding.UTF8.GetString(global::System.Convert.FromBase64String("Ki8gPC0gTmVpdGhlciBzaG91bGQgdGhpcy4="), 0, 26);
-
-    private string a_;
-    /// <summary>
-    /// */ &lt;- This should not close the generated doc comment
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string A {
-      get { return a_ ?? ADefaultValue; }
-      set {
-        a_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-    /// <summary>Gets whether the "a" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasA {
-      get { return a_ != null; }
-    }
-    /// <summary>Clears the value of the "a" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearA() {
-      a_ = null;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as TestCommentInjectionMessage);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(TestCommentInjectionMessage other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (A != other.A) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (HasA) hash ^= A.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (HasA) {
-        output.WriteRawTag(10);
-        output.WriteString(A);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (HasA) {
-        output.WriteRawTag(10);
-        output.WriteString(A);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (HasA) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(A);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(TestCommentInjectionMessage other) {
-      if (other == null) {
-        return;
-      }
-      if (other.HasA) {
-        A = other.A;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 10: {
-            A = input.ReadString();
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 10: {
-            A = input.ReadString();
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  /// <summary>
-  /// Test that RPC services work.
-  /// </summary>
-  public sealed partial class FooRequest : pb::IMessage<FooRequest>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<FooRequest> _parser = new pb::MessageParser<FooRequest>(() => new FooRequest());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<FooRequest> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.Proto2.UnittestReflection.Descriptor.MessageTypes[56]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public FooRequest() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public FooRequest(FooRequest other) : this() {
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public FooRequest Clone() {
-      return new FooRequest(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as FooRequest);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(FooRequest other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(FooRequest other) {
-      if (other == null) {
-        return;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-        }
-      }
-    }
-    #endif
-
-  }
-
-  public sealed partial class FooResponse : pb::IMessage<FooResponse>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<FooResponse> _parser = new pb::MessageParser<FooResponse>(() => new FooResponse());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<FooResponse> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.Proto2.UnittestReflection.Descriptor.MessageTypes[57]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public FooResponse() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public FooResponse(FooResponse other) : this() {
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public FooResponse Clone() {
-      return new FooResponse(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as FooResponse);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(FooResponse other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(FooResponse other) {
-      if (other == null) {
-        return;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-        }
-      }
-    }
-    #endif
-
-  }
-
-  public sealed partial class FooClientMessage : pb::IMessage<FooClientMessage>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<FooClientMessage> _parser = new pb::MessageParser<FooClientMessage>(() => new FooClientMessage());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<FooClientMessage> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.Proto2.UnittestReflection.Descriptor.MessageTypes[58]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public FooClientMessage() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public FooClientMessage(FooClientMessage other) : this() {
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public FooClientMessage Clone() {
-      return new FooClientMessage(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as FooClientMessage);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(FooClientMessage other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(FooClientMessage other) {
-      if (other == null) {
-        return;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-        }
-      }
-    }
-    #endif
-
-  }
-
-  public sealed partial class FooServerMessage : pb::IMessage<FooServerMessage>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<FooServerMessage> _parser = new pb::MessageParser<FooServerMessage>(() => new FooServerMessage());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<FooServerMessage> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.Proto2.UnittestReflection.Descriptor.MessageTypes[59]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public FooServerMessage() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public FooServerMessage(FooServerMessage other) : this() {
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public FooServerMessage Clone() {
-      return new FooServerMessage(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as FooServerMessage);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(FooServerMessage other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(FooServerMessage other) {
-      if (other == null) {
-        return;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-        }
-      }
-    }
-    #endif
-
-  }
-
-  public sealed partial class BarRequest : pb::IMessage<BarRequest>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<BarRequest> _parser = new pb::MessageParser<BarRequest>(() => new BarRequest());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<BarRequest> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.Proto2.UnittestReflection.Descriptor.MessageTypes[60]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public BarRequest() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public BarRequest(BarRequest other) : this() {
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public BarRequest Clone() {
-      return new BarRequest(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as BarRequest);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(BarRequest other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(BarRequest other) {
-      if (other == null) {
-        return;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-        }
-      }
-    }
-    #endif
-
-  }
-
-  public sealed partial class BarResponse : pb::IMessage<BarResponse>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<BarResponse> _parser = new pb::MessageParser<BarResponse>(() => new BarResponse());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<BarResponse> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.Proto2.UnittestReflection.Descriptor.MessageTypes[61]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public BarResponse() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public BarResponse(BarResponse other) : this() {
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public BarResponse Clone() {
-      return new BarResponse(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as BarResponse);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(BarResponse other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(BarResponse other) {
-      if (other == null) {
-        return;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-        }
-      }
-    }
-    #endif
-
-  }
-
-  public sealed partial class TestJsonName : pb::IMessage<TestJsonName>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<TestJsonName> _parser = new pb::MessageParser<TestJsonName>(() => new TestJsonName());
-    private pb::UnknownFieldSet _unknownFields;
-    private int _hasBits0;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<TestJsonName> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.Proto2.UnittestReflection.Descriptor.MessageTypes[62]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestJsonName() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestJsonName(TestJsonName other) : this() {
-      _hasBits0 = other._hasBits0;
-      fieldName1_ = other.fieldName1_;
-      fieldName2_ = other.fieldName2_;
-      fieldName3_ = other.fieldName3_;
-      FieldName4_ = other.FieldName4_;
-      fIELDNAME5_ = other.fIELDNAME5_;
-      fieldName6_ = other.fieldName6_;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestJsonName Clone() {
-      return new TestJsonName(this);
-    }
-
-    /// <summary>Field number for the "field_name1" field.</summary>
-    public const int FieldName1FieldNumber = 1;
-    private readonly static int FieldName1DefaultValue = 0;
-
-    private int fieldName1_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int FieldName1 {
-      get { if ((_hasBits0 & 1) != 0) { return fieldName1_; } else { return FieldName1DefaultValue; } }
-      set {
-        _hasBits0 |= 1;
-        fieldName1_ = value;
-      }
-    }
-    /// <summary>Gets whether the "field_name1" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasFieldName1 {
-      get { return (_hasBits0 & 1) != 0; }
-    }
-    /// <summary>Clears the value of the "field_name1" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearFieldName1() {
-      _hasBits0 &= ~1;
-    }
-
-    /// <summary>Field number for the "fieldName2" field.</summary>
-    public const int FieldName2FieldNumber = 2;
-    private readonly static int FieldName2DefaultValue = 0;
-
-    private int fieldName2_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int FieldName2 {
-      get { if ((_hasBits0 & 2) != 0) { return fieldName2_; } else { return FieldName2DefaultValue; } }
-      set {
-        _hasBits0 |= 2;
-        fieldName2_ = value;
-      }
-    }
-    /// <summary>Gets whether the "fieldName2" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasFieldName2 {
-      get { return (_hasBits0 & 2) != 0; }
-    }
-    /// <summary>Clears the value of the "fieldName2" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearFieldName2() {
-      _hasBits0 &= ~2;
-    }
-
-    /// <summary>Field number for the "FieldName3" field.</summary>
-    public const int FieldName3FieldNumber = 3;
-    private readonly static int FieldName3DefaultValue = 0;
-
-    private int fieldName3_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int FieldName3 {
-      get { if ((_hasBits0 & 4) != 0) { return fieldName3_; } else { return FieldName3DefaultValue; } }
-      set {
-        _hasBits0 |= 4;
-        fieldName3_ = value;
-      }
-    }
-    /// <summary>Gets whether the "FieldName3" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasFieldName3 {
-      get { return (_hasBits0 & 4) != 0; }
-    }
-    /// <summary>Clears the value of the "FieldName3" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearFieldName3() {
-      _hasBits0 &= ~4;
-    }
-
-    /// <summary>Field number for the "_field_name4" field.</summary>
-    public const int FieldName4FieldNumber = 4;
-    private readonly static int FieldName4DefaultValue = 0;
-
-    private int FieldName4_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int FieldName4 {
-      get { if ((_hasBits0 & 8) != 0) { return FieldName4_; } else { return FieldName4DefaultValue; } }
-      set {
-        _hasBits0 |= 8;
-        FieldName4_ = value;
-      }
-    }
-    /// <summary>Gets whether the "_field_name4" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasFieldName4 {
-      get { return (_hasBits0 & 8) != 0; }
-    }
-    /// <summary>Clears the value of the "_field_name4" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearFieldName4() {
-      _hasBits0 &= ~8;
-    }
-
-    /// <summary>Field number for the "FIELD_NAME5" field.</summary>
-    public const int FIELDNAME5FieldNumber = 5;
-    private readonly static int FIELDNAME5DefaultValue = 0;
-
-    private int fIELDNAME5_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int FIELDNAME5 {
-      get { if ((_hasBits0 & 16) != 0) { return fIELDNAME5_; } else { return FIELDNAME5DefaultValue; } }
-      set {
-        _hasBits0 |= 16;
-        fIELDNAME5_ = value;
-      }
-    }
-    /// <summary>Gets whether the "FIELD_NAME5" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasFIELDNAME5 {
-      get { return (_hasBits0 & 16) != 0; }
-    }
-    /// <summary>Clears the value of the "FIELD_NAME5" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearFIELDNAME5() {
-      _hasBits0 &= ~16;
-    }
-
-    /// <summary>Field number for the "field_name6" field.</summary>
-    public const int FieldName6FieldNumber = 6;
-    private readonly static int FieldName6DefaultValue = 0;
-
-    private int fieldName6_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int FieldName6 {
-      get { if ((_hasBits0 & 32) != 0) { return fieldName6_; } else { return FieldName6DefaultValue; } }
-      set {
-        _hasBits0 |= 32;
-        fieldName6_ = value;
-      }
-    }
-    /// <summary>Gets whether the "field_name6" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasFieldName6 {
-      get { return (_hasBits0 & 32) != 0; }
-    }
-    /// <summary>Clears the value of the "field_name6" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearFieldName6() {
-      _hasBits0 &= ~32;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as TestJsonName);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(TestJsonName other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (FieldName1 != other.FieldName1) return false;
-      if (FieldName2 != other.FieldName2) return false;
-      if (FieldName3 != other.FieldName3) return false;
-      if (FieldName4 != other.FieldName4) return false;
-      if (FIELDNAME5 != other.FIELDNAME5) return false;
-      if (FieldName6 != other.FieldName6) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (HasFieldName1) hash ^= FieldName1.GetHashCode();
-      if (HasFieldName2) hash ^= FieldName2.GetHashCode();
-      if (HasFieldName3) hash ^= FieldName3.GetHashCode();
-      if (HasFieldName4) hash ^= FieldName4.GetHashCode();
-      if (HasFIELDNAME5) hash ^= FIELDNAME5.GetHashCode();
-      if (HasFieldName6) hash ^= FieldName6.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (HasFieldName1) {
-        output.WriteRawTag(8);
-        output.WriteInt32(FieldName1);
-      }
-      if (HasFieldName2) {
-        output.WriteRawTag(16);
-        output.WriteInt32(FieldName2);
-      }
-      if (HasFieldName3) {
-        output.WriteRawTag(24);
-        output.WriteInt32(FieldName3);
-      }
-      if (HasFieldName4) {
-        output.WriteRawTag(32);
-        output.WriteInt32(FieldName4);
-      }
-      if (HasFIELDNAME5) {
-        output.WriteRawTag(40);
-        output.WriteInt32(FIELDNAME5);
-      }
-      if (HasFieldName6) {
-        output.WriteRawTag(48);
-        output.WriteInt32(FieldName6);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (HasFieldName1) {
-        output.WriteRawTag(8);
-        output.WriteInt32(FieldName1);
-      }
-      if (HasFieldName2) {
-        output.WriteRawTag(16);
-        output.WriteInt32(FieldName2);
-      }
-      if (HasFieldName3) {
-        output.WriteRawTag(24);
-        output.WriteInt32(FieldName3);
-      }
-      if (HasFieldName4) {
-        output.WriteRawTag(32);
-        output.WriteInt32(FieldName4);
-      }
-      if (HasFIELDNAME5) {
-        output.WriteRawTag(40);
-        output.WriteInt32(FIELDNAME5);
-      }
-      if (HasFieldName6) {
-        output.WriteRawTag(48);
-        output.WriteInt32(FieldName6);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (HasFieldName1) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(FieldName1);
-      }
-      if (HasFieldName2) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(FieldName2);
-      }
-      if (HasFieldName3) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(FieldName3);
-      }
-      if (HasFieldName4) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(FieldName4);
-      }
-      if (HasFIELDNAME5) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(FIELDNAME5);
-      }
-      if (HasFieldName6) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(FieldName6);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(TestJsonName other) {
-      if (other == null) {
-        return;
-      }
-      if (other.HasFieldName1) {
-        FieldName1 = other.FieldName1;
-      }
-      if (other.HasFieldName2) {
-        FieldName2 = other.FieldName2;
-      }
-      if (other.HasFieldName3) {
-        FieldName3 = other.FieldName3;
-      }
-      if (other.HasFieldName4) {
-        FieldName4 = other.FieldName4;
-      }
-      if (other.HasFIELDNAME5) {
-        FIELDNAME5 = other.FIELDNAME5;
-      }
-      if (other.HasFieldName6) {
-        FieldName6 = other.FieldName6;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 8: {
-            FieldName1 = input.ReadInt32();
-            break;
-          }
-          case 16: {
-            FieldName2 = input.ReadInt32();
-            break;
-          }
-          case 24: {
-            FieldName3 = input.ReadInt32();
-            break;
-          }
-          case 32: {
-            FieldName4 = input.ReadInt32();
-            break;
-          }
-          case 40: {
-            FIELDNAME5 = input.ReadInt32();
-            break;
-          }
-          case 48: {
-            FieldName6 = input.ReadInt32();
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 8: {
-            FieldName1 = input.ReadInt32();
-            break;
-          }
-          case 16: {
-            FieldName2 = input.ReadInt32();
-            break;
-          }
-          case 24: {
-            FieldName3 = input.ReadInt32();
-            break;
-          }
-          case 32: {
-            FieldName4 = input.ReadInt32();
-            break;
-          }
-          case 40: {
-            FIELDNAME5 = input.ReadInt32();
-            break;
-          }
-          case 48: {
-            FieldName6 = input.ReadInt32();
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  public sealed partial class TestHugeFieldNumbers : pb::IExtendableMessage<TestHugeFieldNumbers>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<TestHugeFieldNumbers> _parser = new pb::MessageParser<TestHugeFieldNumbers>(() => new TestHugeFieldNumbers());
-    private pb::UnknownFieldSet _unknownFields;
-    private pb::ExtensionSet<TestHugeFieldNumbers> _extensions;
-    private pb::ExtensionSet<TestHugeFieldNumbers> _Extensions { get { return _extensions; } }
-    private int _hasBits0;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<TestHugeFieldNumbers> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.Proto2.UnittestReflection.Descriptor.MessageTypes[63]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestHugeFieldNumbers() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestHugeFieldNumbers(TestHugeFieldNumbers other) : this() {
-      _hasBits0 = other._hasBits0;
-      optionalInt32_ = other.optionalInt32_;
-      fixed32_ = other.fixed32_;
-      repeatedInt32_ = other.repeatedInt32_.Clone();
-      packedInt32_ = other.packedInt32_.Clone();
-      optionalEnum_ = other.optionalEnum_;
-      optionalString_ = other.optionalString_;
-      optionalBytes_ = other.optionalBytes_;
-      optionalMessage_ = other.optionalMessage_ != null ? other.optionalMessage_.Clone() : null;
-      optionalGroup_ = other.HasOptionalGroup ? other.optionalGroup_.Clone() : null;
-      stringStringMap_ = other.stringStringMap_.Clone();
-      switch (other.OneofFieldCase) {
-        case OneofFieldOneofCase.OneofUint32:
-          OneofUint32 = other.OneofUint32;
-          break;
-        case OneofFieldOneofCase.OneofTestAllTypes:
-          OneofTestAllTypes = other.OneofTestAllTypes.Clone();
-          break;
-        case OneofFieldOneofCase.OneofString:
-          OneofString = other.OneofString;
-          break;
-        case OneofFieldOneofCase.OneofBytes:
-          OneofBytes = other.OneofBytes;
-          break;
-      }
-
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-      _extensions = pb::ExtensionSet.Clone(other._extensions);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestHugeFieldNumbers Clone() {
-      return new TestHugeFieldNumbers(this);
-    }
-
-    /// <summary>Field number for the "optional_int32" field.</summary>
-    public const int OptionalInt32FieldNumber = 536870000;
-    private readonly static int OptionalInt32DefaultValue = 0;
-
-    private int optionalInt32_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int OptionalInt32 {
-      get { if ((_hasBits0 & 1) != 0) { return optionalInt32_; } else { return OptionalInt32DefaultValue; } }
-      set {
-        _hasBits0 |= 1;
-        optionalInt32_ = value;
-      }
-    }
-    /// <summary>Gets whether the "optional_int32" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasOptionalInt32 {
-      get { return (_hasBits0 & 1) != 0; }
-    }
-    /// <summary>Clears the value of the "optional_int32" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearOptionalInt32() {
-      _hasBits0 &= ~1;
-    }
-
-    /// <summary>Field number for the "fixed_32" field.</summary>
-    public const int Fixed32FieldNumber = 536870001;
-    private readonly static int Fixed32DefaultValue = 0;
-
-    private int fixed32_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int Fixed32 {
-      get { if ((_hasBits0 & 2) != 0) { return fixed32_; } else { return Fixed32DefaultValue; } }
-      set {
-        _hasBits0 |= 2;
-        fixed32_ = value;
-      }
-    }
-    /// <summary>Gets whether the "fixed_32" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasFixed32 {
-      get { return (_hasBits0 & 2) != 0; }
-    }
-    /// <summary>Clears the value of the "fixed_32" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearFixed32() {
-      _hasBits0 &= ~2;
-    }
-
-    /// <summary>Field number for the "repeated_int32" field.</summary>
-    public const int RepeatedInt32FieldNumber = 536870002;
-    private static readonly pb::FieldCodec<int> _repeated_repeatedInt32_codec
-        = pb::FieldCodec.ForInt32(4294960016);
-    private readonly pbc::RepeatedField<int> repeatedInt32_ = new pbc::RepeatedField<int>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<int> RepeatedInt32 {
-      get { return repeatedInt32_; }
-    }
-
-    /// <summary>Field number for the "packed_int32" field.</summary>
-    public const int PackedInt32FieldNumber = 536870003;
-    private static readonly pb::FieldCodec<int> _repeated_packedInt32_codec
-        = pb::FieldCodec.ForInt32(4294960026);
-    private readonly pbc::RepeatedField<int> packedInt32_ = new pbc::RepeatedField<int>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<int> PackedInt32 {
-      get { return packedInt32_; }
-    }
-
-    /// <summary>Field number for the "optional_enum" field.</summary>
-    public const int OptionalEnumFieldNumber = 536870004;
-    private readonly static global::Google.Protobuf.TestProtos.Proto2.ForeignEnum OptionalEnumDefaultValue = global::Google.Protobuf.TestProtos.Proto2.ForeignEnum.ForeignFoo;
-
-    private global::Google.Protobuf.TestProtos.Proto2.ForeignEnum optionalEnum_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.TestProtos.Proto2.ForeignEnum OptionalEnum {
-      get { if ((_hasBits0 & 4) != 0) { return optionalEnum_; } else { return OptionalEnumDefaultValue; } }
-      set {
-        _hasBits0 |= 4;
-        optionalEnum_ = value;
-      }
-    }
-    /// <summary>Gets whether the "optional_enum" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasOptionalEnum {
-      get { return (_hasBits0 & 4) != 0; }
-    }
-    /// <summary>Clears the value of the "optional_enum" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearOptionalEnum() {
-      _hasBits0 &= ~4;
-    }
-
-    /// <summary>Field number for the "optional_string" field.</summary>
-    public const int OptionalStringFieldNumber = 536870005;
-    private readonly static string OptionalStringDefaultValue = "";
-
-    private string optionalString_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string OptionalString {
-      get { return optionalString_ ?? OptionalStringDefaultValue; }
-      set {
-        optionalString_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-    /// <summary>Gets whether the "optional_string" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasOptionalString {
-      get { return optionalString_ != null; }
-    }
-    /// <summary>Clears the value of the "optional_string" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearOptionalString() {
-      optionalString_ = null;
-    }
-
-    /// <summary>Field number for the "optional_bytes" field.</summary>
-    public const int OptionalBytesFieldNumber = 536870006;
-    private readonly static pb::ByteString OptionalBytesDefaultValue = pb::ByteString.Empty;
-
-    private pb::ByteString optionalBytes_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pb::ByteString OptionalBytes {
-      get { return optionalBytes_ ?? OptionalBytesDefaultValue; }
-      set {
-        optionalBytes_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-    /// <summary>Gets whether the "optional_bytes" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasOptionalBytes {
-      get { return optionalBytes_ != null; }
-    }
-    /// <summary>Clears the value of the "optional_bytes" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearOptionalBytes() {
-      optionalBytes_ = null;
-    }
-
-    /// <summary>Field number for the "optional_message" field.</summary>
-    public const int OptionalMessageFieldNumber = 536870007;
-    private global::Google.Protobuf.TestProtos.Proto2.ForeignMessage optionalMessage_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.TestProtos.Proto2.ForeignMessage OptionalMessage {
-      get { return optionalMessage_; }
-      set {
-        optionalMessage_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "optionalgroup" field.</summary>
-    public const int OptionalGroupFieldNumber = 536870008;
-    private global::Google.Protobuf.TestProtos.Proto2.TestHugeFieldNumbers.Types.OptionalGroup optionalGroup_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.TestProtos.Proto2.TestHugeFieldNumbers.Types.OptionalGroup OptionalGroup {
-      get { return optionalGroup_; }
-      set {
-        optionalGroup_ = value;
-      }
-    }
-    /// <summary>Gets whether the optionalgroup field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasOptionalGroup {
-      get { return optionalGroup_ != null; }
-    }
-    /// <summary>Clears the value of the optionalgroup field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearOptionalGroup() {
-      optionalGroup_ = null;
-    }
-
-    /// <summary>Field number for the "string_string_map" field.</summary>
-    public const int StringStringMapFieldNumber = 536870010;
-    private static readonly pbc::MapField<string, string>.Codec _map_stringStringMap_codec
-        = new pbc::MapField<string, string>.Codec(pb::FieldCodec.ForString(10, ""), pb::FieldCodec.ForString(18, ""), 4294960082);
-    private readonly pbc::MapField<string, string> stringStringMap_ = new pbc::MapField<string, string>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::MapField<string, string> StringStringMap {
-      get { return stringStringMap_; }
-    }
-
-    /// <summary>Field number for the "oneof_uint32" field.</summary>
-    public const int OneofUint32FieldNumber = 536870011;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public uint OneofUint32 {
-      get { return HasOneofUint32 ? (uint) oneofField_ : 0; }
-      set {
-        oneofField_ = value;
-        oneofFieldCase_ = OneofFieldOneofCase.OneofUint32;
-      }
-    }
-    /// <summary>Gets whether the "oneof_uint32" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasOneofUint32 {
-      get { return oneofFieldCase_ == OneofFieldOneofCase.OneofUint32; }
-    }
-    /// <summary> Clears the value of the oneof if it's currently set to "oneof_uint32" </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearOneofUint32() {
-      if (HasOneofUint32) {
-        ClearOneofField();
-      }
-    }
-
-    /// <summary>Field number for the "oneof_test_all_types" field.</summary>
-    public const int OneofTestAllTypesFieldNumber = 536870012;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.TestProtos.Proto2.TestAllTypes OneofTestAllTypes {
-      get { return oneofFieldCase_ == OneofFieldOneofCase.OneofTestAllTypes ? (global::Google.Protobuf.TestProtos.Proto2.TestAllTypes) oneofField_ : null; }
-      set {
-        oneofField_ = value;
-        oneofFieldCase_ = value == null ? OneofFieldOneofCase.None : OneofFieldOneofCase.OneofTestAllTypes;
-      }
-    }
-
-    /// <summary>Field number for the "oneof_string" field.</summary>
-    public const int OneofStringFieldNumber = 536870013;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string OneofString {
-      get { return HasOneofString ? (string) oneofField_ : ""; }
-      set {
-        oneofField_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-        oneofFieldCase_ = OneofFieldOneofCase.OneofString;
-      }
-    }
-    /// <summary>Gets whether the "oneof_string" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasOneofString {
-      get { return oneofFieldCase_ == OneofFieldOneofCase.OneofString; }
-    }
-    /// <summary> Clears the value of the oneof if it's currently set to "oneof_string" </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearOneofString() {
-      if (HasOneofString) {
-        ClearOneofField();
-      }
-    }
-
-    /// <summary>Field number for the "oneof_bytes" field.</summary>
-    public const int OneofBytesFieldNumber = 536870014;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pb::ByteString OneofBytes {
-      get { return HasOneofBytes ? (pb::ByteString) oneofField_ : pb::ByteString.Empty; }
-      set {
-        oneofField_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-        oneofFieldCase_ = OneofFieldOneofCase.OneofBytes;
-      }
-    }
-    /// <summary>Gets whether the "oneof_bytes" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasOneofBytes {
-      get { return oneofFieldCase_ == OneofFieldOneofCase.OneofBytes; }
-    }
-    /// <summary> Clears the value of the oneof if it's currently set to "oneof_bytes" </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearOneofBytes() {
-      if (HasOneofBytes) {
-        ClearOneofField();
-      }
-    }
-
-    private object oneofField_;
-    /// <summary>Enum of possible cases for the "oneof_field" oneof.</summary>
-    public enum OneofFieldOneofCase {
-      None = 0,
-      OneofUint32 = 536870011,
-      OneofTestAllTypes = 536870012,
-      OneofString = 536870013,
-      OneofBytes = 536870014,
-    }
-    private OneofFieldOneofCase oneofFieldCase_ = OneofFieldOneofCase.None;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public OneofFieldOneofCase OneofFieldCase {
-      get { return oneofFieldCase_; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearOneofField() {
-      oneofFieldCase_ = OneofFieldOneofCase.None;
-      oneofField_ = null;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as TestHugeFieldNumbers);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(TestHugeFieldNumbers other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (OptionalInt32 != other.OptionalInt32) return false;
-      if (Fixed32 != other.Fixed32) return false;
-      if(!repeatedInt32_.Equals(other.repeatedInt32_)) return false;
-      if(!packedInt32_.Equals(other.packedInt32_)) return false;
-      if (OptionalEnum != other.OptionalEnum) return false;
-      if (OptionalString != other.OptionalString) return false;
-      if (OptionalBytes != other.OptionalBytes) return false;
-      if (!object.Equals(OptionalMessage, other.OptionalMessage)) return false;
-      if (!object.Equals(OptionalGroup, other.OptionalGroup)) return false;
-      if (!StringStringMap.Equals(other.StringStringMap)) return false;
-      if (OneofUint32 != other.OneofUint32) return false;
-      if (!object.Equals(OneofTestAllTypes, other.OneofTestAllTypes)) return false;
-      if (OneofString != other.OneofString) return false;
-      if (OneofBytes != other.OneofBytes) return false;
-      if (OneofFieldCase != other.OneofFieldCase) return false;
-      if (!Equals(_extensions, other._extensions)) {
-        return false;
-      }
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (HasOptionalInt32) hash ^= OptionalInt32.GetHashCode();
-      if (HasFixed32) hash ^= Fixed32.GetHashCode();
-      hash ^= repeatedInt32_.GetHashCode();
-      hash ^= packedInt32_.GetHashCode();
-      if (HasOptionalEnum) hash ^= OptionalEnum.GetHashCode();
-      if (HasOptionalString) hash ^= OptionalString.GetHashCode();
-      if (HasOptionalBytes) hash ^= OptionalBytes.GetHashCode();
-      if (optionalMessage_ != null) hash ^= OptionalMessage.GetHashCode();
-      if (HasOptionalGroup) hash ^= OptionalGroup.GetHashCode();
-      hash ^= StringStringMap.GetHashCode();
-      if (HasOneofUint32) hash ^= OneofUint32.GetHashCode();
-      if (oneofFieldCase_ == OneofFieldOneofCase.OneofTestAllTypes) hash ^= OneofTestAllTypes.GetHashCode();
-      if (HasOneofString) hash ^= OneofString.GetHashCode();
-      if (HasOneofBytes) hash ^= OneofBytes.GetHashCode();
-      hash ^= (int) oneofFieldCase_;
-      if (_extensions != null) {
-        hash ^= _extensions.GetHashCode();
-      }
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (HasOptionalInt32) {
-        output.WriteRawTag(128, 199, 255, 255, 15);
-        output.WriteInt32(OptionalInt32);
-      }
-      if (HasFixed32) {
-        output.WriteRawTag(136, 199, 255, 255, 15);
-        output.WriteInt32(Fixed32);
-      }
-      repeatedInt32_.WriteTo(output, _repeated_repeatedInt32_codec);
-      packedInt32_.WriteTo(output, _repeated_packedInt32_codec);
-      if (HasOptionalEnum) {
-        output.WriteRawTag(160, 199, 255, 255, 15);
-        output.WriteEnum((int) OptionalEnum);
-      }
-      if (HasOptionalString) {
-        output.WriteRawTag(170, 199, 255, 255, 15);
-        output.WriteString(OptionalString);
-      }
-      if (HasOptionalBytes) {
-        output.WriteRawTag(178, 199, 255, 255, 15);
-        output.WriteBytes(OptionalBytes);
-      }
-      if (optionalMessage_ != null) {
-        output.WriteRawTag(186, 199, 255, 255, 15);
-        output.WriteMessage(OptionalMessage);
-      }
-      if (HasOptionalGroup) {
-        output.WriteRawTag(195, 199, 255, 255, 15);
-        output.WriteGroup(OptionalGroup);
-        output.WriteRawTag(196, 199, 255, 255, 15);
-      }
-      stringStringMap_.WriteTo(output, _map_stringStringMap_codec);
-      if (HasOneofUint32) {
-        output.WriteRawTag(216, 199, 255, 255, 15);
-        output.WriteUInt32(OneofUint32);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.OneofTestAllTypes) {
-        output.WriteRawTag(226, 199, 255, 255, 15);
-        output.WriteMessage(OneofTestAllTypes);
-      }
-      if (HasOneofString) {
-        output.WriteRawTag(234, 199, 255, 255, 15);
-        output.WriteString(OneofString);
-      }
-      if (HasOneofBytes) {
-        output.WriteRawTag(242, 199, 255, 255, 15);
-        output.WriteBytes(OneofBytes);
-      }
-      if (_extensions != null) {
-        _extensions.WriteTo(output);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (HasOptionalInt32) {
-        output.WriteRawTag(128, 199, 255, 255, 15);
-        output.WriteInt32(OptionalInt32);
-      }
-      if (HasFixed32) {
-        output.WriteRawTag(136, 199, 255, 255, 15);
-        output.WriteInt32(Fixed32);
-      }
-      repeatedInt32_.WriteTo(ref output, _repeated_repeatedInt32_codec);
-      packedInt32_.WriteTo(ref output, _repeated_packedInt32_codec);
-      if (HasOptionalEnum) {
-        output.WriteRawTag(160, 199, 255, 255, 15);
-        output.WriteEnum((int) OptionalEnum);
-      }
-      if (HasOptionalString) {
-        output.WriteRawTag(170, 199, 255, 255, 15);
-        output.WriteString(OptionalString);
-      }
-      if (HasOptionalBytes) {
-        output.WriteRawTag(178, 199, 255, 255, 15);
-        output.WriteBytes(OptionalBytes);
-      }
-      if (optionalMessage_ != null) {
-        output.WriteRawTag(186, 199, 255, 255, 15);
-        output.WriteMessage(OptionalMessage);
-      }
-      if (HasOptionalGroup) {
-        output.WriteRawTag(195, 199, 255, 255, 15);
-        output.WriteGroup(OptionalGroup);
-        output.WriteRawTag(196, 199, 255, 255, 15);
-      }
-      stringStringMap_.WriteTo(ref output, _map_stringStringMap_codec);
-      if (HasOneofUint32) {
-        output.WriteRawTag(216, 199, 255, 255, 15);
-        output.WriteUInt32(OneofUint32);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.OneofTestAllTypes) {
-        output.WriteRawTag(226, 199, 255, 255, 15);
-        output.WriteMessage(OneofTestAllTypes);
-      }
-      if (HasOneofString) {
-        output.WriteRawTag(234, 199, 255, 255, 15);
-        output.WriteString(OneofString);
-      }
-      if (HasOneofBytes) {
-        output.WriteRawTag(242, 199, 255, 255, 15);
-        output.WriteBytes(OneofBytes);
-      }
-      if (_extensions != null) {
-        _extensions.WriteTo(ref output);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (HasOptionalInt32) {
-        size += 5 + pb::CodedOutputStream.ComputeInt32Size(OptionalInt32);
-      }
-      if (HasFixed32) {
-        size += 5 + pb::CodedOutputStream.ComputeInt32Size(Fixed32);
-      }
-      size += repeatedInt32_.CalculateSize(_repeated_repeatedInt32_codec);
-      size += packedInt32_.CalculateSize(_repeated_packedInt32_codec);
-      if (HasOptionalEnum) {
-        size += 5 + pb::CodedOutputStream.ComputeEnumSize((int) OptionalEnum);
-      }
-      if (HasOptionalString) {
-        size += 5 + pb::CodedOutputStream.ComputeStringSize(OptionalString);
-      }
-      if (HasOptionalBytes) {
-        size += 5 + pb::CodedOutputStream.ComputeBytesSize(OptionalBytes);
-      }
-      if (optionalMessage_ != null) {
-        size += 5 + pb::CodedOutputStream.ComputeMessageSize(OptionalMessage);
-      }
-      if (HasOptionalGroup) {
-        size += 10 + pb::CodedOutputStream.ComputeGroupSize(OptionalGroup);
-      }
-      size += stringStringMap_.CalculateSize(_map_stringStringMap_codec);
-      if (HasOneofUint32) {
-        size += 5 + pb::CodedOutputStream.ComputeUInt32Size(OneofUint32);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.OneofTestAllTypes) {
-        size += 5 + pb::CodedOutputStream.ComputeMessageSize(OneofTestAllTypes);
-      }
-      if (HasOneofString) {
-        size += 5 + pb::CodedOutputStream.ComputeStringSize(OneofString);
-      }
-      if (HasOneofBytes) {
-        size += 5 + pb::CodedOutputStream.ComputeBytesSize(OneofBytes);
-      }
-      if (_extensions != null) {
-        size += _extensions.CalculateSize();
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(TestHugeFieldNumbers other) {
-      if (other == null) {
-        return;
-      }
-      if (other.HasOptionalInt32) {
-        OptionalInt32 = other.OptionalInt32;
-      }
-      if (other.HasFixed32) {
-        Fixed32 = other.Fixed32;
-      }
-      repeatedInt32_.Add(other.repeatedInt32_);
-      packedInt32_.Add(other.packedInt32_);
-      if (other.HasOptionalEnum) {
-        OptionalEnum = other.OptionalEnum;
-      }
-      if (other.HasOptionalString) {
-        OptionalString = other.OptionalString;
-      }
-      if (other.HasOptionalBytes) {
-        OptionalBytes = other.OptionalBytes;
-      }
-      if (other.optionalMessage_ != null) {
-        if (optionalMessage_ == null) {
-          OptionalMessage = new global::Google.Protobuf.TestProtos.Proto2.ForeignMessage();
-        }
-        OptionalMessage.MergeFrom(other.OptionalMessage);
-      }
-      if (other.HasOptionalGroup) {
-        if (!HasOptionalGroup) {
-          OptionalGroup = new global::Google.Protobuf.TestProtos.Proto2.TestHugeFieldNumbers.Types.OptionalGroup();
-        }
-        OptionalGroup.MergeFrom(other.OptionalGroup);
-      }
-      stringStringMap_.Add(other.stringStringMap_);
-      switch (other.OneofFieldCase) {
-        case OneofFieldOneofCase.OneofUint32:
-          OneofUint32 = other.OneofUint32;
-          break;
-        case OneofFieldOneofCase.OneofTestAllTypes:
-          if (OneofTestAllTypes == null) {
-            OneofTestAllTypes = new global::Google.Protobuf.TestProtos.Proto2.TestAllTypes();
-          }
-          OneofTestAllTypes.MergeFrom(other.OneofTestAllTypes);
-          break;
-        case OneofFieldOneofCase.OneofString:
-          OneofString = other.OneofString;
-          break;
-        case OneofFieldOneofCase.OneofBytes:
-          OneofBytes = other.OneofBytes;
-          break;
-      }
-
-      pb::ExtensionSet.MergeFrom(ref _extensions, other._extensions);
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            if (!pb::ExtensionSet.TryMergeFieldFrom(ref _extensions, input)) {
-              _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            }
-            break;
-          case 4294960000: {
-            OptionalInt32 = input.ReadInt32();
-            break;
-          }
-          case 4294960008: {
-            Fixed32 = input.ReadInt32();
-            break;
-          }
-          case 4294960018:
-          case 4294960016: {
-            repeatedInt32_.AddEntriesFrom(input, _repeated_repeatedInt32_codec);
-            break;
-          }
-          case 4294960026:
-          case 4294960024: {
-            packedInt32_.AddEntriesFrom(input, _repeated_packedInt32_codec);
-            break;
-          }
-          case 4294960032: {
-            OptionalEnum = (global::Google.Protobuf.TestProtos.Proto2.ForeignEnum) input.ReadEnum();
-            break;
-          }
-          case 4294960042: {
-            OptionalString = input.ReadString();
-            break;
-          }
-          case 4294960050: {
-            OptionalBytes = input.ReadBytes();
-            break;
-          }
-          case 4294960058: {
-            if (optionalMessage_ == null) {
-              OptionalMessage = new global::Google.Protobuf.TestProtos.Proto2.ForeignMessage();
-            }
-            input.ReadMessage(OptionalMessage);
-            break;
-          }
-          case 4294960067: {
-            if (!HasOptionalGroup) {
-              OptionalGroup = new global::Google.Protobuf.TestProtos.Proto2.TestHugeFieldNumbers.Types.OptionalGroup();
-            }
-            input.ReadGroup(OptionalGroup);
-            break;
-          }
-          case 4294960082: {
-            stringStringMap_.AddEntriesFrom(input, _map_stringStringMap_codec);
-            break;
-          }
-          case 4294960088: {
-            OneofUint32 = input.ReadUInt32();
-            break;
-          }
-          case 4294960098: {
-            global::Google.Protobuf.TestProtos.Proto2.TestAllTypes subBuilder = new global::Google.Protobuf.TestProtos.Proto2.TestAllTypes();
-            if (oneofFieldCase_ == OneofFieldOneofCase.OneofTestAllTypes) {
-              subBuilder.MergeFrom(OneofTestAllTypes);
-            }
-            input.ReadMessage(subBuilder);
-            OneofTestAllTypes = subBuilder;
-            break;
-          }
-          case 4294960106: {
-            OneofString = input.ReadString();
-            break;
-          }
-          case 4294960114: {
-            OneofBytes = input.ReadBytes();
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            if (!pb::ExtensionSet.TryMergeFieldFrom(ref _extensions, ref input)) {
-              _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            }
-            break;
-          case 4294960000: {
-            OptionalInt32 = input.ReadInt32();
-            break;
-          }
-          case 4294960008: {
-            Fixed32 = input.ReadInt32();
-            break;
-          }
-          case 4294960018:
-          case 4294960016: {
-            repeatedInt32_.AddEntriesFrom(ref input, _repeated_repeatedInt32_codec);
-            break;
-          }
-          case 4294960026:
-          case 4294960024: {
-            packedInt32_.AddEntriesFrom(ref input, _repeated_packedInt32_codec);
-            break;
-          }
-          case 4294960032: {
-            OptionalEnum = (global::Google.Protobuf.TestProtos.Proto2.ForeignEnum) input.ReadEnum();
-            break;
-          }
-          case 4294960042: {
-            OptionalString = input.ReadString();
-            break;
-          }
-          case 4294960050: {
-            OptionalBytes = input.ReadBytes();
-            break;
-          }
-          case 4294960058: {
-            if (optionalMessage_ == null) {
-              OptionalMessage = new global::Google.Protobuf.TestProtos.Proto2.ForeignMessage();
-            }
-            input.ReadMessage(OptionalMessage);
-            break;
-          }
-          case 4294960067: {
-            if (!HasOptionalGroup) {
-              OptionalGroup = new global::Google.Protobuf.TestProtos.Proto2.TestHugeFieldNumbers.Types.OptionalGroup();
-            }
-            input.ReadGroup(OptionalGroup);
-            break;
-          }
-          case 4294960082: {
-            stringStringMap_.AddEntriesFrom(ref input, _map_stringStringMap_codec);
-            break;
-          }
-          case 4294960088: {
-            OneofUint32 = input.ReadUInt32();
-            break;
-          }
-          case 4294960098: {
-            global::Google.Protobuf.TestProtos.Proto2.TestAllTypes subBuilder = new global::Google.Protobuf.TestProtos.Proto2.TestAllTypes();
-            if (oneofFieldCase_ == OneofFieldOneofCase.OneofTestAllTypes) {
-              subBuilder.MergeFrom(OneofTestAllTypes);
-            }
-            input.ReadMessage(subBuilder);
-            OneofTestAllTypes = subBuilder;
-            break;
-          }
-          case 4294960106: {
-            OneofString = input.ReadString();
-            break;
-          }
-          case 4294960114: {
-            OneofBytes = input.ReadBytes();
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-    public TValue GetExtension<TValue>(pb::Extension<TestHugeFieldNumbers, TValue> extension) {
-      return pb::ExtensionSet.Get(ref _extensions, extension);
-    }
-    public pbc::RepeatedField<TValue> GetExtension<TValue>(pb::RepeatedExtension<TestHugeFieldNumbers, TValue> extension) {
-      return pb::ExtensionSet.Get(ref _extensions, extension);
-    }
-    public pbc::RepeatedField<TValue> GetOrInitializeExtension<TValue>(pb::RepeatedExtension<TestHugeFieldNumbers, TValue> extension) {
-      return pb::ExtensionSet.GetOrInitialize(ref _extensions, extension);
-    }
-    public void SetExtension<TValue>(pb::Extension<TestHugeFieldNumbers, TValue> extension, TValue value) {
-      pb::ExtensionSet.Set(ref _extensions, extension, value);
-    }
-    public bool HasExtension<TValue>(pb::Extension<TestHugeFieldNumbers, TValue> extension) {
-      return pb::ExtensionSet.Has(ref _extensions, extension);
-    }
-    public void ClearExtension<TValue>(pb::Extension<TestHugeFieldNumbers, TValue> extension) {
-      pb::ExtensionSet.Clear(ref _extensions, extension);
-    }
-    public void ClearExtension<TValue>(pb::RepeatedExtension<TestHugeFieldNumbers, TValue> extension) {
-      pb::ExtensionSet.Clear(ref _extensions, extension);
-    }
-
-    #region Nested types
-    /// <summary>Container for nested types declared in the TestHugeFieldNumbers message type.</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static partial class Types {
-      public sealed partial class OptionalGroup : pb::IMessage<OptionalGroup>
-      #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          , pb::IBufferMessage
-      #endif
-      {
-        private static readonly pb::MessageParser<OptionalGroup> _parser = new pb::MessageParser<OptionalGroup>(() => new OptionalGroup());
-        private pb::UnknownFieldSet _unknownFields;
-        private int _hasBits0;
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static pb::MessageParser<OptionalGroup> Parser { get { return _parser; } }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static pbr::MessageDescriptor Descriptor {
-          get { return global::Google.Protobuf.TestProtos.Proto2.TestHugeFieldNumbers.Descriptor.NestedTypes[0]; }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        pbr::MessageDescriptor pb::IMessage.Descriptor {
-          get { return Descriptor; }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public OptionalGroup() {
-          OnConstruction();
-        }
-
-        partial void OnConstruction();
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public OptionalGroup(OptionalGroup other) : this() {
-          _hasBits0 = other._hasBits0;
-          groupA_ = other.groupA_;
-          _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public OptionalGroup Clone() {
-          return new OptionalGroup(this);
-        }
-
-        /// <summary>Field number for the "group_a" field.</summary>
-        public const int GroupAFieldNumber = 536870009;
-        private readonly static int GroupADefaultValue = 0;
-
-        private int groupA_;
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public int GroupA {
-          get { if ((_hasBits0 & 1) != 0) { return groupA_; } else { return GroupADefaultValue; } }
-          set {
-            _hasBits0 |= 1;
-            groupA_ = value;
-          }
-        }
-        /// <summary>Gets whether the "group_a" field is set</summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool HasGroupA {
-          get { return (_hasBits0 & 1) != 0; }
-        }
-        /// <summary>Clears the value of the "group_a" field</summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void ClearGroupA() {
-          _hasBits0 &= ~1;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override bool Equals(object other) {
-          return Equals(other as OptionalGroup);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool Equals(OptionalGroup other) {
-          if (ReferenceEquals(other, null)) {
-            return false;
-          }
-          if (ReferenceEquals(other, this)) {
-            return true;
-          }
-          if (GroupA != other.GroupA) return false;
-          return Equals(_unknownFields, other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override int GetHashCode() {
-          int hash = 1;
-          if (HasGroupA) hash ^= GroupA.GetHashCode();
-          if (_unknownFields != null) {
-            hash ^= _unknownFields.GetHashCode();
-          }
-          return hash;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override string ToString() {
-          return pb::JsonFormatter.ToDiagnosticString(this);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void WriteTo(pb::CodedOutputStream output) {
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          output.WriteRawMessage(this);
-        #else
-          if (HasGroupA) {
-            output.WriteRawTag(200, 199, 255, 255, 15);
-            output.WriteInt32(GroupA);
-          }
-          if (_unknownFields != null) {
-            _unknownFields.WriteTo(output);
-          }
-        #endif
-        }
-
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-          if (HasGroupA) {
-            output.WriteRawTag(200, 199, 255, 255, 15);
-            output.WriteInt32(GroupA);
-          }
-          if (_unknownFields != null) {
-            _unknownFields.WriteTo(ref output);
-          }
-        }
-        #endif
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public int CalculateSize() {
-          int size = 0;
-          if (HasGroupA) {
-            size += 5 + pb::CodedOutputStream.ComputeInt32Size(GroupA);
-          }
-          if (_unknownFields != null) {
-            size += _unknownFields.CalculateSize();
-          }
-          return size;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(OptionalGroup other) {
-          if (other == null) {
-            return;
-          }
-          if (other.HasGroupA) {
-            GroupA = other.GroupA;
-          }
-          _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(pb::CodedInputStream input) {
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          input.ReadRawMessage(this);
-        #else
-          uint tag;
-          while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
-              case 4294960068:
-                return;
-              default:
-                _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-                break;
-              case 4294960072: {
-                GroupA = input.ReadInt32();
-                break;
-              }
-            }
-          }
-        #endif
-        }
-
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-          uint tag;
-          while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
-              case 4294960068:
-                return;
-              default:
-                _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-                break;
-              case 4294960072: {
-                GroupA = input.ReadInt32();
-                break;
-              }
-            }
-          }
-        }
-        #endif
-
-      }
-
-    }
-    #endregion
-
-  }
-
-  public sealed partial class TestExtensionInsideTable : pb::IExtendableMessage<TestExtensionInsideTable>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<TestExtensionInsideTable> _parser = new pb::MessageParser<TestExtensionInsideTable>(() => new TestExtensionInsideTable());
-    private pb::UnknownFieldSet _unknownFields;
-    private pb::ExtensionSet<TestExtensionInsideTable> _extensions;
-    private pb::ExtensionSet<TestExtensionInsideTable> _Extensions { get { return _extensions; } }
-    private int _hasBits0;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<TestExtensionInsideTable> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.Proto2.UnittestReflection.Descriptor.MessageTypes[64]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestExtensionInsideTable() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestExtensionInsideTable(TestExtensionInsideTable other) : this() {
-      _hasBits0 = other._hasBits0;
-      field1_ = other.field1_;
-      field2_ = other.field2_;
-      field3_ = other.field3_;
-      field4_ = other.field4_;
-      field6_ = other.field6_;
-      field7_ = other.field7_;
-      field8_ = other.field8_;
-      field9_ = other.field9_;
-      field10_ = other.field10_;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-      _extensions = pb::ExtensionSet.Clone(other._extensions);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestExtensionInsideTable Clone() {
-      return new TestExtensionInsideTable(this);
-    }
-
-    /// <summary>Field number for the "field1" field.</summary>
-    public const int Field1FieldNumber = 1;
-    private readonly static int Field1DefaultValue = 0;
-
-    private int field1_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int Field1 {
-      get { if ((_hasBits0 & 1) != 0) { return field1_; } else { return Field1DefaultValue; } }
-      set {
-        _hasBits0 |= 1;
-        field1_ = value;
-      }
-    }
-    /// <summary>Gets whether the "field1" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasField1 {
-      get { return (_hasBits0 & 1) != 0; }
-    }
-    /// <summary>Clears the value of the "field1" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearField1() {
-      _hasBits0 &= ~1;
-    }
-
-    /// <summary>Field number for the "field2" field.</summary>
-    public const int Field2FieldNumber = 2;
-    private readonly static int Field2DefaultValue = 0;
-
-    private int field2_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int Field2 {
-      get { if ((_hasBits0 & 2) != 0) { return field2_; } else { return Field2DefaultValue; } }
-      set {
-        _hasBits0 |= 2;
-        field2_ = value;
-      }
-    }
-    /// <summary>Gets whether the "field2" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasField2 {
-      get { return (_hasBits0 & 2) != 0; }
-    }
-    /// <summary>Clears the value of the "field2" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearField2() {
-      _hasBits0 &= ~2;
-    }
-
-    /// <summary>Field number for the "field3" field.</summary>
-    public const int Field3FieldNumber = 3;
-    private readonly static int Field3DefaultValue = 0;
-
-    private int field3_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int Field3 {
-      get { if ((_hasBits0 & 4) != 0) { return field3_; } else { return Field3DefaultValue; } }
-      set {
-        _hasBits0 |= 4;
-        field3_ = value;
-      }
-    }
-    /// <summary>Gets whether the "field3" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasField3 {
-      get { return (_hasBits0 & 4) != 0; }
-    }
-    /// <summary>Clears the value of the "field3" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearField3() {
-      _hasBits0 &= ~4;
-    }
-
-    /// <summary>Field number for the "field4" field.</summary>
-    public const int Field4FieldNumber = 4;
-    private readonly static int Field4DefaultValue = 0;
-
-    private int field4_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int Field4 {
-      get { if ((_hasBits0 & 8) != 0) { return field4_; } else { return Field4DefaultValue; } }
-      set {
-        _hasBits0 |= 8;
-        field4_ = value;
-      }
-    }
-    /// <summary>Gets whether the "field4" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasField4 {
-      get { return (_hasBits0 & 8) != 0; }
-    }
-    /// <summary>Clears the value of the "field4" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearField4() {
-      _hasBits0 &= ~8;
-    }
-
-    /// <summary>Field number for the "field6" field.</summary>
-    public const int Field6FieldNumber = 6;
-    private readonly static int Field6DefaultValue = 0;
-
-    private int field6_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int Field6 {
-      get { if ((_hasBits0 & 16) != 0) { return field6_; } else { return Field6DefaultValue; } }
-      set {
-        _hasBits0 |= 16;
-        field6_ = value;
-      }
-    }
-    /// <summary>Gets whether the "field6" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasField6 {
-      get { return (_hasBits0 & 16) != 0; }
-    }
-    /// <summary>Clears the value of the "field6" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearField6() {
-      _hasBits0 &= ~16;
-    }
-
-    /// <summary>Field number for the "field7" field.</summary>
-    public const int Field7FieldNumber = 7;
-    private readonly static int Field7DefaultValue = 0;
-
-    private int field7_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int Field7 {
-      get { if ((_hasBits0 & 32) != 0) { return field7_; } else { return Field7DefaultValue; } }
-      set {
-        _hasBits0 |= 32;
-        field7_ = value;
-      }
-    }
-    /// <summary>Gets whether the "field7" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasField7 {
-      get { return (_hasBits0 & 32) != 0; }
-    }
-    /// <summary>Clears the value of the "field7" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearField7() {
-      _hasBits0 &= ~32;
-    }
-
-    /// <summary>Field number for the "field8" field.</summary>
-    public const int Field8FieldNumber = 8;
-    private readonly static int Field8DefaultValue = 0;
-
-    private int field8_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int Field8 {
-      get { if ((_hasBits0 & 64) != 0) { return field8_; } else { return Field8DefaultValue; } }
-      set {
-        _hasBits0 |= 64;
-        field8_ = value;
-      }
-    }
-    /// <summary>Gets whether the "field8" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasField8 {
-      get { return (_hasBits0 & 64) != 0; }
-    }
-    /// <summary>Clears the value of the "field8" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearField8() {
-      _hasBits0 &= ~64;
-    }
-
-    /// <summary>Field number for the "field9" field.</summary>
-    public const int Field9FieldNumber = 9;
-    private readonly static int Field9DefaultValue = 0;
-
-    private int field9_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int Field9 {
-      get { if ((_hasBits0 & 128) != 0) { return field9_; } else { return Field9DefaultValue; } }
-      set {
-        _hasBits0 |= 128;
-        field9_ = value;
-      }
-    }
-    /// <summary>Gets whether the "field9" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasField9 {
-      get { return (_hasBits0 & 128) != 0; }
-    }
-    /// <summary>Clears the value of the "field9" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearField9() {
-      _hasBits0 &= ~128;
-    }
-
-    /// <summary>Field number for the "field10" field.</summary>
-    public const int Field10FieldNumber = 10;
-    private readonly static int Field10DefaultValue = 0;
-
-    private int field10_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int Field10 {
-      get { if ((_hasBits0 & 256) != 0) { return field10_; } else { return Field10DefaultValue; } }
-      set {
-        _hasBits0 |= 256;
-        field10_ = value;
-      }
-    }
-    /// <summary>Gets whether the "field10" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasField10 {
-      get { return (_hasBits0 & 256) != 0; }
-    }
-    /// <summary>Clears the value of the "field10" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearField10() {
-      _hasBits0 &= ~256;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as TestExtensionInsideTable);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(TestExtensionInsideTable other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (Field1 != other.Field1) return false;
-      if (Field2 != other.Field2) return false;
-      if (Field3 != other.Field3) return false;
-      if (Field4 != other.Field4) return false;
-      if (Field6 != other.Field6) return false;
-      if (Field7 != other.Field7) return false;
-      if (Field8 != other.Field8) return false;
-      if (Field9 != other.Field9) return false;
-      if (Field10 != other.Field10) return false;
-      if (!Equals(_extensions, other._extensions)) {
-        return false;
-      }
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (HasField1) hash ^= Field1.GetHashCode();
-      if (HasField2) hash ^= Field2.GetHashCode();
-      if (HasField3) hash ^= Field3.GetHashCode();
-      if (HasField4) hash ^= Field4.GetHashCode();
-      if (HasField6) hash ^= Field6.GetHashCode();
-      if (HasField7) hash ^= Field7.GetHashCode();
-      if (HasField8) hash ^= Field8.GetHashCode();
-      if (HasField9) hash ^= Field9.GetHashCode();
-      if (HasField10) hash ^= Field10.GetHashCode();
-      if (_extensions != null) {
-        hash ^= _extensions.GetHashCode();
-      }
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (HasField1) {
-        output.WriteRawTag(8);
-        output.WriteInt32(Field1);
-      }
-      if (HasField2) {
-        output.WriteRawTag(16);
-        output.WriteInt32(Field2);
-      }
-      if (HasField3) {
-        output.WriteRawTag(24);
-        output.WriteInt32(Field3);
-      }
-      if (HasField4) {
-        output.WriteRawTag(32);
-        output.WriteInt32(Field4);
-      }
-      if (HasField6) {
-        output.WriteRawTag(48);
-        output.WriteInt32(Field6);
-      }
-      if (HasField7) {
-        output.WriteRawTag(56);
-        output.WriteInt32(Field7);
-      }
-      if (HasField8) {
-        output.WriteRawTag(64);
-        output.WriteInt32(Field8);
-      }
-      if (HasField9) {
-        output.WriteRawTag(72);
-        output.WriteInt32(Field9);
-      }
-      if (HasField10) {
-        output.WriteRawTag(80);
-        output.WriteInt32(Field10);
-      }
-      if (_extensions != null) {
-        _extensions.WriteTo(output);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (HasField1) {
-        output.WriteRawTag(8);
-        output.WriteInt32(Field1);
-      }
-      if (HasField2) {
-        output.WriteRawTag(16);
-        output.WriteInt32(Field2);
-      }
-      if (HasField3) {
-        output.WriteRawTag(24);
-        output.WriteInt32(Field3);
-      }
-      if (HasField4) {
-        output.WriteRawTag(32);
-        output.WriteInt32(Field4);
-      }
-      if (HasField6) {
-        output.WriteRawTag(48);
-        output.WriteInt32(Field6);
-      }
-      if (HasField7) {
-        output.WriteRawTag(56);
-        output.WriteInt32(Field7);
-      }
-      if (HasField8) {
-        output.WriteRawTag(64);
-        output.WriteInt32(Field8);
-      }
-      if (HasField9) {
-        output.WriteRawTag(72);
-        output.WriteInt32(Field9);
-      }
-      if (HasField10) {
-        output.WriteRawTag(80);
-        output.WriteInt32(Field10);
-      }
-      if (_extensions != null) {
-        _extensions.WriteTo(ref output);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (HasField1) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(Field1);
-      }
-      if (HasField2) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(Field2);
-      }
-      if (HasField3) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(Field3);
-      }
-      if (HasField4) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(Field4);
-      }
-      if (HasField6) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(Field6);
-      }
-      if (HasField7) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(Field7);
-      }
-      if (HasField8) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(Field8);
-      }
-      if (HasField9) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(Field9);
-      }
-      if (HasField10) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(Field10);
-      }
-      if (_extensions != null) {
-        size += _extensions.CalculateSize();
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(TestExtensionInsideTable other) {
-      if (other == null) {
-        return;
-      }
-      if (other.HasField1) {
-        Field1 = other.Field1;
-      }
-      if (other.HasField2) {
-        Field2 = other.Field2;
-      }
-      if (other.HasField3) {
-        Field3 = other.Field3;
-      }
-      if (other.HasField4) {
-        Field4 = other.Field4;
-      }
-      if (other.HasField6) {
-        Field6 = other.Field6;
-      }
-      if (other.HasField7) {
-        Field7 = other.Field7;
-      }
-      if (other.HasField8) {
-        Field8 = other.Field8;
-      }
-      if (other.HasField9) {
-        Field9 = other.Field9;
-      }
-      if (other.HasField10) {
-        Field10 = other.Field10;
-      }
-      pb::ExtensionSet.MergeFrom(ref _extensions, other._extensions);
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            if (!pb::ExtensionSet.TryMergeFieldFrom(ref _extensions, input)) {
-              _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            }
-            break;
-          case 8: {
-            Field1 = input.ReadInt32();
-            break;
-          }
-          case 16: {
-            Field2 = input.ReadInt32();
-            break;
-          }
-          case 24: {
-            Field3 = input.ReadInt32();
-            break;
-          }
-          case 32: {
-            Field4 = input.ReadInt32();
-            break;
-          }
-          case 48: {
-            Field6 = input.ReadInt32();
-            break;
-          }
-          case 56: {
-            Field7 = input.ReadInt32();
-            break;
-          }
-          case 64: {
-            Field8 = input.ReadInt32();
-            break;
-          }
-          case 72: {
-            Field9 = input.ReadInt32();
-            break;
-          }
-          case 80: {
-            Field10 = input.ReadInt32();
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            if (!pb::ExtensionSet.TryMergeFieldFrom(ref _extensions, ref input)) {
-              _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            }
-            break;
-          case 8: {
-            Field1 = input.ReadInt32();
-            break;
-          }
-          case 16: {
-            Field2 = input.ReadInt32();
-            break;
-          }
-          case 24: {
-            Field3 = input.ReadInt32();
-            break;
-          }
-          case 32: {
-            Field4 = input.ReadInt32();
-            break;
-          }
-          case 48: {
-            Field6 = input.ReadInt32();
-            break;
-          }
-          case 56: {
-            Field7 = input.ReadInt32();
-            break;
-          }
-          case 64: {
-            Field8 = input.ReadInt32();
-            break;
-          }
-          case 72: {
-            Field9 = input.ReadInt32();
-            break;
-          }
-          case 80: {
-            Field10 = input.ReadInt32();
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-    public TValue GetExtension<TValue>(pb::Extension<TestExtensionInsideTable, TValue> extension) {
-      return pb::ExtensionSet.Get(ref _extensions, extension);
-    }
-    public pbc::RepeatedField<TValue> GetExtension<TValue>(pb::RepeatedExtension<TestExtensionInsideTable, TValue> extension) {
-      return pb::ExtensionSet.Get(ref _extensions, extension);
-    }
-    public pbc::RepeatedField<TValue> GetOrInitializeExtension<TValue>(pb::RepeatedExtension<TestExtensionInsideTable, TValue> extension) {
-      return pb::ExtensionSet.GetOrInitialize(ref _extensions, extension);
-    }
-    public void SetExtension<TValue>(pb::Extension<TestExtensionInsideTable, TValue> extension, TValue value) {
-      pb::ExtensionSet.Set(ref _extensions, extension, value);
-    }
-    public bool HasExtension<TValue>(pb::Extension<TestExtensionInsideTable, TValue> extension) {
-      return pb::ExtensionSet.Has(ref _extensions, extension);
-    }
-    public void ClearExtension<TValue>(pb::Extension<TestExtensionInsideTable, TValue> extension) {
-      pb::ExtensionSet.Clear(ref _extensions, extension);
-    }
-    public void ClearExtension<TValue>(pb::RepeatedExtension<TestExtensionInsideTable, TValue> extension) {
-      pb::ExtensionSet.Clear(ref _extensions, extension);
-    }
-
-  }
-
-  #endregion
-
-}
-
-#endregion Designer generated code
diff --git a/libs/protobuf/csharp/src/Google.Protobuf.Test.TestProtos/UnittestCustomOptionsProto3.cs b/libs/protobuf/csharp/src/Google.Protobuf.Test.TestProtos/UnittestCustomOptionsProto3.cs
deleted file mode 100644
index ea7a936..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf.Test.TestProtos/UnittestCustomOptionsProto3.cs
+++ /dev/null
@@ -1,4197 +0,0 @@
-// <auto-generated>
-//     Generated by the protocol buffer compiler.  DO NOT EDIT!
-//     source: unittest_custom_options_proto3.proto
-// </auto-generated>
-#pragma warning disable 1591, 0612, 3021, 8981
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-namespace UnitTest.Issues.TestProtos {
-
-  /// <summary>Holder for reflection information generated from unittest_custom_options_proto3.proto</summary>
-  public static partial class UnittestCustomOptionsProto3Reflection {
-
-    #region Descriptor
-    /// <summary>File descriptor for unittest_custom_options_proto3.proto</summary>
-    public static pbr::FileDescriptor Descriptor {
-      get { return descriptor; }
-    }
-    private static pbr::FileDescriptor descriptor;
-
-    static UnittestCustomOptionsProto3Reflection() {
-      byte[] descriptorData = global::System.Convert.FromBase64String(
-          string.Concat(
-            "CiR1bml0dGVzdF9jdXN0b21fb3B0aW9uc19wcm90bzMucHJvdG8SEXByb3Rv",
-            "YnVmX3VuaXR0ZXN0GiBnb29nbGUvcHJvdG9idWYvZGVzY3JpcHRvci5wcm90",
-            "byLXAQocVGVzdE1lc3NhZ2VXaXRoQ3VzdG9tT3B0aW9ucxIeCgZmaWVsZDEY",
-            "ASABKAlCDggBweDDHS3hdQoCAAAAEhUKC29uZW9mX2ZpZWxkGAIgASgFSAAi",
-            "UwoGQW5FbnVtEhYKEkFORU5VTV9VTlNQRUNJRklFRBAAEg8KC0FORU5VTV9W",
-            "QUwxEAESFgoLQU5FTlVNX1ZBTDIQAhoFsIb6BXsaCMX2yR3r/P//OhAIAODp",
-            "wh3I//////////8BQhkKB0FuT25lb2YSDviswx2d//////////8BIhgKFkN1",
-            "c3RvbU9wdGlvbkZvb1JlcXVlc3QiGQoXQ3VzdG9tT3B0aW9uRm9vUmVzcG9u",
-            "c2UiHgocQ3VzdG9tT3B0aW9uRm9vQ2xpZW50TWVzc2FnZSIeChxDdXN0b21P",
-            "cHRpb25Gb29TZXJ2ZXJNZXNzYWdlIo8BChpEdW1teU1lc3NhZ2VDb250YWlu",
-            "aW5nRW51bSJxCgxUZXN0RW51bVR5cGUSIAocVEVTVF9PUFRJT05fRU5VTV9V",
-            "TlNQRUNJRklFRBAAEhoKFlRFU1RfT1BUSU9OX0VOVU1fVFlQRTEQFhIjChZU",
-            "RVNUX09QVElPTl9FTlVNX1RZUEUyEOn//////////wEiIQofRHVtbXlNZXNz",
-            "YWdlSW52YWxpZEFzT3B0aW9uVHlwZSKKAQocQ3VzdG9tT3B0aW9uTWluSW50",
-            "ZWdlclZhbHVlczpq0N6yHQDoxrIdgICAgPj/////AbC8sh2AgICAgICAgIAB",
-            "gJOyHQD49bAdAIDEsB3/////D/iXsB3///////////8BnfWvHQAAAACR7q8d",
-            "AAAAAAAAAACtja8dAAAAgJnWqB0AAAAAAAAAgCKRAQocQ3VzdG9tT3B0aW9u",
-            "TWF4SW50ZWdlclZhbHVlczpx0N6yHQHoxrId/////wewvLId//////////9/",
-            "gJOyHf////8P+PWwHf///////////wGAxLAd/v///w/4l7Ad/v//////////",
-            "AZ31rx3/////ke6vHf//////////rY2vHf///3+Z1qgd/////////38ibgoX",
-            "Q3VzdG9tT3B0aW9uT3RoZXJWYWx1ZXM6U+jGsh2c//////////8B9d+jHeeH",
-            "RUHp3KId+1mMQsrA8z+q3KIdDkhlbGxvLCAiV29ybGQistmiHQtIZWxsbwBX",
-            "b3JsZIjZoh3p//////////8BIjQKHFNldHRpbmdSZWFsc0Zyb21Qb3NpdGl2",
-            "ZUludHM6FPXfox0AAEBB6dyiHQAAAAAAQGNAIjQKHFNldHRpbmdSZWFsc0Zy",
-            "b21OZWdhdGl2ZUludHM6FPXfox0AAEDB6dyiHQAAAAAAQGPAIksKEkNvbXBs",
-            "ZXhPcHRpb25UeXBlMRILCgNmb28YASABKAUSDAoEZm9vMhgCIAEoBRIMCgRm",
-            "b28zGAMgASgFEgwKBGZvbzQYBCADKAUigQMKEkNvbXBsZXhPcHRpb25UeXBl",
-            "MhIyCgNiYXIYASABKAsyJS5wcm90b2J1Zl91bml0dGVzdC5Db21wbGV4T3B0",
-            "aW9uVHlwZTESCwoDYmF6GAIgASgFEkYKBGZyZWQYAyABKAsyOC5wcm90b2J1",
-            "Zl91bml0dGVzdC5Db21wbGV4T3B0aW9uVHlwZTIuQ29tcGxleE9wdGlvblR5",
-            "cGU0EkgKBmJhcm5leRgEIAMoCzI4LnByb3RvYnVmX3VuaXR0ZXN0LkNvbXBs",
-            "ZXhPcHRpb25UeXBlMi5Db21wbGV4T3B0aW9uVHlwZTQalwEKEkNvbXBsZXhP",
-            "cHRpb25UeXBlNBINCgV3YWxkbxgBIAEoBTJyCgxjb21wbGV4X29wdDQSHy5n",
-            "b29nbGUucHJvdG9idWYuTWVzc2FnZU9wdGlvbnMYivXRAyABKAsyOC5wcm90",
-            "b2J1Zl91bml0dGVzdC5Db21wbGV4T3B0aW9uVHlwZTIuQ29tcGxleE9wdGlv",
-            "blR5cGU0IiEKEkNvbXBsZXhPcHRpb25UeXBlMxILCgNxdXgYASABKAUibAoV",
-            "VmFyaW91c0NvbXBsZXhPcHRpb25zOlOi4pUdAggqouKVHQIgY6LilR0CIFiq",
-            "/ZAdAxDbB6r9kB0FCgMI5wXSqI8dAwizD6r9kB0FGgMIwQKq/ZAdBCICCGWq",
-            "/ZAdBSIDCNQB+t6QHQIICSJMCglBZ2dyZWdhdGUSCQoBaRgBIAEoBRIJCgFz",
-            "GAIgASgJEikKA3N1YhgDIAEoCzIcLnByb3RvYnVmX3VuaXR0ZXN0LkFnZ3Jl",
-            "Z2F0ZSJZChBBZ2dyZWdhdGVNZXNzYWdlEikKCWZpZWxkbmFtZRgBIAEoBUIW",
-            "8qGHOxESD0ZpZWxkQW5ub3RhdGlvbjoawtGGOxUIZRIRTWVzc2FnZUFubm90",
-            "YXRpb24ilwEKEE5lc3RlZE9wdGlvblR5cGUaOwoNTmVzdGVkTWVzc2FnZRIi",
-            "CgxuZXN0ZWRfZmllbGQYASABKAVCDMHgwx3qAwAAAAAAADoG4OnCHekHIkYK",
-            "Ck5lc3RlZEVudW0SDwoLVU5TUEVDSUZJRUQQABIdChFORVNURURfRU5VTV9W",
-            "QUxVRRABGgawhvoF7AcaCMX2yR3rAwAAKlIKCk1ldGhvZE9wdDESGgoWTUVU",
-            "SE9ET1BUMV9VTlNQRUNJRklFRBAAEhMKD01FVEhPRE9QVDFfVkFMMRABEhMK",
-            "D01FVEhPRE9QVDFfVkFMMhACKl4KDUFnZ3JlZ2F0ZUVudW0SDwoLVU5TUEVD",
-            "SUZJRUQQABIlCgVWQUxVRRABGhrK/Ik7FRITRW51bVZhbHVlQW5ub3RhdGlv",
-            "bhoVkpWIOxASDkVudW1Bbm5vdGF0aW9uMo4BChxUZXN0U2VydmljZVdpdGhD",
-            "dXN0b21PcHRpb25zEmMKA0ZvbxIpLnByb3RvYnVmX3VuaXR0ZXN0LkN1c3Rv",
-            "bU9wdGlvbkZvb1JlcXVlc3QaKi5wcm90b2J1Zl91bml0dGVzdC5DdXN0b21P",
-            "cHRpb25Gb29SZXNwb25zZSIF4PqMHgIaCZCyix7T24DLSTKZAQoQQWdncmVn",
-            "YXRlU2VydmljZRJrCgZNZXRob2QSIy5wcm90b2J1Zl91bml0dGVzdC5BZ2dy",
-            "ZWdhdGVNZXNzYWdlGiMucHJvdG9idWZfdW5pdHRlc3QuQWdncmVnYXRlTWVz",
-            "c2FnZSIXysiWOxISEE1ldGhvZEFubm90YXRpb24aGMr7jjsTEhFTZXJ2aWNl",
-            "QW5ub3RhdGlvbjoyCglmaWxlX29wdDESHC5nb29nbGUucHJvdG9idWYuRmls",
-            "ZU9wdGlvbnMYjp3YAyABKAQ6OAoMbWVzc2FnZV9vcHQxEh8uZ29vZ2xlLnBy",
-            "b3RvYnVmLk1lc3NhZ2VPcHRpb25zGJyt2AMgASgFOjQKCmZpZWxkX29wdDES",
-            "HS5nb29nbGUucHJvdG9idWYuRmllbGRPcHRpb25zGIi82AMgASgGOjQKCm9u",
-            "ZW9mX29wdDESHS5nb29nbGUucHJvdG9idWYuT25lb2ZPcHRpb25zGM+12AMg",
-            "ASgFOjIKCWVudW1fb3B0MRIcLmdvb2dsZS5wcm90b2J1Zi5FbnVtT3B0aW9u",
-            "cxjontkDIAEoDzo8Cg9lbnVtX3ZhbHVlX29wdDESIS5nb29nbGUucHJvdG9i",
-            "dWYuRW51bVZhbHVlT3B0aW9ucxjmoF8gASgFOjgKDHNlcnZpY2Vfb3B0MRIf",
-            "Lmdvb2dsZS5wcm90b2J1Zi5TZXJ2aWNlT3B0aW9ucxiituEDIAEoEjpVCgtt",
-            "ZXRob2Rfb3B0MRIeLmdvb2dsZS5wcm90b2J1Zi5NZXRob2RPcHRpb25zGKzP",
-            "4QMgASgOMh0ucHJvdG9idWZfdW5pdHRlc3QuTWV0aG9kT3B0MTo0Cghib29s",
-            "X29wdBIfLmdvb2dsZS5wcm90b2J1Zi5NZXNzYWdlT3B0aW9ucxjqq9YDIAEo",
-            "CDo1CglpbnQzMl9vcHQSHy5nb29nbGUucHJvdG9idWYuTWVzc2FnZU9wdGlv",
-            "bnMY7ajWAyABKAU6NQoJaW50NjRfb3B0Eh8uZ29vZ2xlLnByb3RvYnVmLk1l",
-            "c3NhZ2VPcHRpb25zGMan1gMgASgDOjYKCnVpbnQzMl9vcHQSHy5nb29nbGUu",
-            "cHJvdG9idWYuTWVzc2FnZU9wdGlvbnMYsKLWAyABKA06NgoKdWludDY0X29w",
-            "dBIfLmdvb2dsZS5wcm90b2J1Zi5NZXNzYWdlT3B0aW9ucxjfjtYDIAEoBDo2",
-            "CgpzaW50MzJfb3B0Eh8uZ29vZ2xlLnByb3RvYnVmLk1lc3NhZ2VPcHRpb25z",
-            "GMCI1gMgASgROjYKCnNpbnQ2NF9vcHQSHy5nb29nbGUucHJvdG9idWYuTWVz",
-            "c2FnZU9wdGlvbnMY/4LWAyABKBI6NwoLZml4ZWQzMl9vcHQSHy5nb29nbGUu",
-            "cHJvdG9idWYuTWVzc2FnZU9wdGlvbnMY0/7VAyABKAc6NwoLZml4ZWQ2NF9v",
-            "cHQSHy5nb29nbGUucHJvdG9idWYuTWVzc2FnZU9wdGlvbnMY4v3VAyABKAY6",
-            "OAoMc2ZpeGVkMzJfb3B0Eh8uZ29vZ2xlLnByb3RvYnVmLk1lc3NhZ2VPcHRp",
-            "b25zGNXx1QMgASgPOjgKDHNmaXhlZDY0X29wdBIfLmdvb2dsZS5wcm90b2J1",
-            "Zi5NZXNzYWdlT3B0aW9ucxjjitUDIAEoEDo1CglmbG9hdF9vcHQSHy5nb29n",
-            "bGUucHJvdG9idWYuTWVzc2FnZU9wdGlvbnMY/rvUAyABKAI6NgoKZG91Ymxl",
-            "X29wdBIfLmdvb2dsZS5wcm90b2J1Zi5NZXNzYWdlT3B0aW9ucxjNq9QDIAEo",
-            "ATo2CgpzdHJpbmdfb3B0Eh8uZ29vZ2xlLnByb3RvYnVmLk1lc3NhZ2VPcHRp",
-            "b25zGMWr1AMgASgJOjUKCWJ5dGVzX29wdBIfLmdvb2dsZS5wcm90b2J1Zi5N",
-            "ZXNzYWdlT3B0aW9ucxiWq9QDIAEoDDpwCghlbnVtX29wdBIfLmdvb2dsZS5w",
-            "cm90b2J1Zi5NZXNzYWdlT3B0aW9ucxiRq9QDIAEoDjI6LnByb3RvYnVmX3Vu",
-            "aXR0ZXN0LkR1bW15TWVzc2FnZUNvbnRhaW5pbmdFbnVtLlRlc3RFbnVtVHlw",
-            "ZTpwChBtZXNzYWdlX3R5cGVfb3B0Eh8uZ29vZ2xlLnByb3RvYnVmLk1lc3Nh",
-            "Z2VPcHRpb25zGK/y0wMgASgLMjIucHJvdG9idWZfdW5pdHRlc3QuRHVtbXlN",
-            "ZXNzYWdlSW52YWxpZEFzT3B0aW9uVHlwZTpfCgxjb21wbGV4X29wdDESHy5n",
-            "b29nbGUucHJvdG9idWYuTWVzc2FnZU9wdGlvbnMYpNzSAyABKAsyJS5wcm90",
-            "b2J1Zl91bml0dGVzdC5Db21wbGV4T3B0aW9uVHlwZTE6XwoMY29tcGxleF9v",
-            "cHQyEh8uZ29vZ2xlLnByb3RvYnVmLk1lc3NhZ2VPcHRpb25zGNWP0gMgASgL",
-            "MiUucHJvdG9idWZfdW5pdHRlc3QuQ29tcGxleE9wdGlvblR5cGUyOl8KDGNv",
-            "bXBsZXhfb3B0MxIfLmdvb2dsZS5wcm90b2J1Zi5NZXNzYWdlT3B0aW9ucxjv",
-            "i9IDIAEoCzIlLnByb3RvYnVmX3VuaXR0ZXN0LkNvbXBsZXhPcHRpb25UeXBl",
-            "MzpOCgdmaWxlb3B0EhwuZ29vZ2xlLnByb3RvYnVmLkZpbGVPcHRpb25zGM/d",
-            "sAcgASgLMhwucHJvdG9idWZfdW5pdHRlc3QuQWdncmVnYXRlOlAKBm1zZ29w",
-            "dBIfLmdvb2dsZS5wcm90b2J1Zi5NZXNzYWdlT3B0aW9ucxiY6rAHIAEoCzIc",
-            "LnByb3RvYnVmX3VuaXR0ZXN0LkFnZ3JlZ2F0ZTpQCghmaWVsZG9wdBIdLmdv",
-            "b2dsZS5wcm90b2J1Zi5GaWVsZE9wdGlvbnMYnvSwByABKAsyHC5wcm90b2J1",
-            "Zl91bml0dGVzdC5BZ2dyZWdhdGU6TgoHZW51bW9wdBIcLmdvb2dsZS5wcm90",
-            "b2J1Zi5FbnVtT3B0aW9ucxjSgrEHIAEoCzIcLnByb3RvYnVmX3VuaXR0ZXN0",
-            "LkFnZ3JlZ2F0ZTpWCgplbnVtdmFsb3B0EiEuZ29vZ2xlLnByb3RvYnVmLkVu",
-            "dW1WYWx1ZU9wdGlvbnMYyZ+xByABKAsyHC5wcm90b2J1Zl91bml0dGVzdC5B",
-            "Z2dyZWdhdGU6VAoKc2VydmljZW9wdBIfLmdvb2dsZS5wcm90b2J1Zi5TZXJ2",
-            "aWNlT3B0aW9ucxi577EHIAEoCzIcLnByb3RvYnVmX3VuaXR0ZXN0LkFnZ3Jl",
-            "Z2F0ZTpSCgltZXRob2RvcHQSHi5nb29nbGUucHJvdG9idWYuTWV0aG9kT3B0",
-            "aW9ucxiJ6bIHIAEoCzIcLnByb3RvYnVmX3VuaXR0ZXN0LkFnZ3JlZ2F0ZUJV",
-            "qgIaVW5pdFRlc3QuSXNzdWVzLlRlc3RQcm90b3Pw6MEd6q3A5ST67IU7Kghk",
-            "Eg5GaWxlQW5ub3RhdGlvbhoWEhROZXN0ZWRGaWxlQW5ub3RhdGlvbmIGcHJv",
-            "dG8z"));
-      descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-          new pbr::FileDescriptor[] { global::Google.Protobuf.Reflection.DescriptorReflection.Descriptor, },
-          new pbr::GeneratedClrTypeInfo(new[] {typeof(global::UnitTest.Issues.TestProtos.MethodOpt1), typeof(global::UnitTest.Issues.TestProtos.AggregateEnum), }, new pb::Extension[] { UnittestCustomOptionsProto3Extensions.FileOpt1, UnittestCustomOptionsProto3Extensions.MessageOpt1, UnittestCustomOptionsProto3Extensions.FieldOpt1, UnittestCustomOptionsProto3Extensions.OneofOpt1, UnittestCustomOptionsProto3Extensions.EnumOpt1, UnittestCustomOptionsProto3Extensions.EnumValueOpt1, UnittestCustomOptionsProto3Extensions.ServiceOpt1, UnittestCustomOptionsProto3Extensions.MethodOpt1, UnittestCustomOptionsProto3Extensions.BoolOpt, UnittestCustomOptionsProto3Extensions.Int32Opt, UnittestCustomOptionsProto3Extensions.Int64Opt, UnittestCustomOptionsProto3Extensions.Uint32Opt, UnittestCustomOptionsProto3Extensions.Uint64Opt, UnittestCustomOptionsProto3Extensions.Sint32Opt, UnittestCustomOptionsProto3Extensions.Sint64Opt, UnittestCustomOptionsProto3Extensions.Fixed32Opt, UnittestCustomOptionsProto3Extensions.Fixed64Opt, UnittestCustomOptionsProto3Extensions.Sfixed32Opt, UnittestCustomOptionsProto3Extensions.Sfixed64Opt, UnittestCustomOptionsProto3Extensions.FloatOpt, UnittestCustomOptionsProto3Extensions.DoubleOpt, UnittestCustomOptionsProto3Extensions.StringOpt, UnittestCustomOptionsProto3Extensions.BytesOpt, UnittestCustomOptionsProto3Extensions.EnumOpt, UnittestCustomOptionsProto3Extensions.MessageTypeOpt, UnittestCustomOptionsProto3Extensions.ComplexOpt1, UnittestCustomOptionsProto3Extensions.ComplexOpt2, UnittestCustomOptionsProto3Extensions.ComplexOpt3, UnittestCustomOptionsProto3Extensions.Fileopt, UnittestCustomOptionsProto3Extensions.Msgopt, UnittestCustomOptionsProto3Extensions.Fieldopt, UnittestCustomOptionsProto3Extensions.Enumopt, UnittestCustomOptionsProto3Extensions.Enumvalopt, UnittestCustomOptionsProto3Extensions.Serviceopt, UnittestCustomOptionsProto3Extensions.Methodopt }, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::UnitTest.Issues.TestProtos.TestMessageWithCustomOptions), global::UnitTest.Issues.TestProtos.TestMessageWithCustomOptions.Parser, new[]{ "Field1", "OneofField" }, new[]{ "AnOneof" }, new[]{ typeof(global::UnitTest.Issues.TestProtos.TestMessageWithCustomOptions.Types.AnEnum) }, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::UnitTest.Issues.TestProtos.CustomOptionFooRequest), global::UnitTest.Issues.TestProtos.CustomOptionFooRequest.Parser, null, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::UnitTest.Issues.TestProtos.CustomOptionFooResponse), global::UnitTest.Issues.TestProtos.CustomOptionFooResponse.Parser, null, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::UnitTest.Issues.TestProtos.CustomOptionFooClientMessage), global::UnitTest.Issues.TestProtos.CustomOptionFooClientMessage.Parser, null, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::UnitTest.Issues.TestProtos.CustomOptionFooServerMessage), global::UnitTest.Issues.TestProtos.CustomOptionFooServerMessage.Parser, null, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::UnitTest.Issues.TestProtos.DummyMessageContainingEnum), global::UnitTest.Issues.TestProtos.DummyMessageContainingEnum.Parser, null, null, new[]{ typeof(global::UnitTest.Issues.TestProtos.DummyMessageContainingEnum.Types.TestEnumType) }, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::UnitTest.Issues.TestProtos.DummyMessageInvalidAsOptionType), global::UnitTest.Issues.TestProtos.DummyMessageInvalidAsOptionType.Parser, null, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::UnitTest.Issues.TestProtos.CustomOptionMinIntegerValues), global::UnitTest.Issues.TestProtos.CustomOptionMinIntegerValues.Parser, null, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::UnitTest.Issues.TestProtos.CustomOptionMaxIntegerValues), global::UnitTest.Issues.TestProtos.CustomOptionMaxIntegerValues.Parser, null, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::UnitTest.Issues.TestProtos.CustomOptionOtherValues), global::UnitTest.Issues.TestProtos.CustomOptionOtherValues.Parser, null, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::UnitTest.Issues.TestProtos.SettingRealsFromPositiveInts), global::UnitTest.Issues.TestProtos.SettingRealsFromPositiveInts.Parser, null, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::UnitTest.Issues.TestProtos.SettingRealsFromNegativeInts), global::UnitTest.Issues.TestProtos.SettingRealsFromNegativeInts.Parser, null, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::UnitTest.Issues.TestProtos.ComplexOptionType1), global::UnitTest.Issues.TestProtos.ComplexOptionType1.Parser, new[]{ "Foo", "Foo2", "Foo3", "Foo4" }, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::UnitTest.Issues.TestProtos.ComplexOptionType2), global::UnitTest.Issues.TestProtos.ComplexOptionType2.Parser, new[]{ "Bar", "Baz", "Fred", "Barney" }, null, null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::UnitTest.Issues.TestProtos.ComplexOptionType2.Types.ComplexOptionType4), global::UnitTest.Issues.TestProtos.ComplexOptionType2.Types.ComplexOptionType4.Parser, new[]{ "Waldo" }, null, null, new pb::Extension[] { global::UnitTest.Issues.TestProtos.ComplexOptionType2.Types.ComplexOptionType4.Extensions.ComplexOpt4 }, null)}),
-            new pbr::GeneratedClrTypeInfo(typeof(global::UnitTest.Issues.TestProtos.ComplexOptionType3), global::UnitTest.Issues.TestProtos.ComplexOptionType3.Parser, new[]{ "Qux" }, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::UnitTest.Issues.TestProtos.VariousComplexOptions), global::UnitTest.Issues.TestProtos.VariousComplexOptions.Parser, null, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::UnitTest.Issues.TestProtos.Aggregate), global::UnitTest.Issues.TestProtos.Aggregate.Parser, new[]{ "I", "S", "Sub" }, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::UnitTest.Issues.TestProtos.AggregateMessage), global::UnitTest.Issues.TestProtos.AggregateMessage.Parser, new[]{ "Fieldname" }, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::UnitTest.Issues.TestProtos.NestedOptionType), global::UnitTest.Issues.TestProtos.NestedOptionType.Parser, null, null, new[]{ typeof(global::UnitTest.Issues.TestProtos.NestedOptionType.Types.NestedEnum) }, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::UnitTest.Issues.TestProtos.NestedOptionType.Types.NestedMessage), global::UnitTest.Issues.TestProtos.NestedOptionType.Types.NestedMessage.Parser, new[]{ "NestedField" }, null, null, null, null)})
-          }));
-    }
-    #endregion
-
-  }
-  /// <summary>Holder for extension identifiers generated from the top level of unittest_custom_options_proto3.proto</summary>
-  public static partial class UnittestCustomOptionsProto3Extensions {
-    public static readonly pb::Extension<global::Google.Protobuf.Reflection.FileOptions, ulong> FileOpt1 =
-      new pb::Extension<global::Google.Protobuf.Reflection.FileOptions, ulong>(7736974, pb::FieldCodec.ForUInt64(61895792, 0UL));
-    public static readonly pb::Extension<global::Google.Protobuf.Reflection.MessageOptions, int> MessageOpt1 =
-      new pb::Extension<global::Google.Protobuf.Reflection.MessageOptions, int>(7739036, pb::FieldCodec.ForInt32(61912288, 0));
-    public static readonly pb::Extension<global::Google.Protobuf.Reflection.FieldOptions, ulong> FieldOpt1 =
-      new pb::Extension<global::Google.Protobuf.Reflection.FieldOptions, ulong>(7740936, pb::FieldCodec.ForFixed64(61927489, 0UL));
-    public static readonly pb::Extension<global::Google.Protobuf.Reflection.OneofOptions, int> OneofOpt1 =
-      new pb::Extension<global::Google.Protobuf.Reflection.OneofOptions, int>(7740111, pb::FieldCodec.ForInt32(61920888, 0));
-    public static readonly pb::Extension<global::Google.Protobuf.Reflection.EnumOptions, int> EnumOpt1 =
-      new pb::Extension<global::Google.Protobuf.Reflection.EnumOptions, int>(7753576, pb::FieldCodec.ForSFixed32(62028613, 0));
-    public static readonly pb::Extension<global::Google.Protobuf.Reflection.EnumValueOptions, int> EnumValueOpt1 =
-      new pb::Extension<global::Google.Protobuf.Reflection.EnumValueOptions, int>(1560678, pb::FieldCodec.ForInt32(12485424, 0));
-    public static readonly pb::Extension<global::Google.Protobuf.Reflection.ServiceOptions, long> ServiceOpt1 =
-      new pb::Extension<global::Google.Protobuf.Reflection.ServiceOptions, long>(7887650, pb::FieldCodec.ForSInt64(63101200, 0L));
-    public static readonly pb::Extension<global::Google.Protobuf.Reflection.MethodOptions, global::UnitTest.Issues.TestProtos.MethodOpt1> MethodOpt1 =
-      new pb::Extension<global::Google.Protobuf.Reflection.MethodOptions, global::UnitTest.Issues.TestProtos.MethodOpt1>(7890860, pb::FieldCodec.ForEnum(63126880, x => (int) x, x => (global::UnitTest.Issues.TestProtos.MethodOpt1) x, global::UnitTest.Issues.TestProtos.MethodOpt1.Unspecified));
-    public static readonly pb::Extension<global::Google.Protobuf.Reflection.MessageOptions, bool> BoolOpt =
-      new pb::Extension<global::Google.Protobuf.Reflection.MessageOptions, bool>(7706090, pb::FieldCodec.ForBool(61648720, false));
-    public static readonly pb::Extension<global::Google.Protobuf.Reflection.MessageOptions, int> Int32Opt =
-      new pb::Extension<global::Google.Protobuf.Reflection.MessageOptions, int>(7705709, pb::FieldCodec.ForInt32(61645672, 0));
-    public static readonly pb::Extension<global::Google.Protobuf.Reflection.MessageOptions, long> Int64Opt =
-      new pb::Extension<global::Google.Protobuf.Reflection.MessageOptions, long>(7705542, pb::FieldCodec.ForInt64(61644336, 0L));
-    public static readonly pb::Extension<global::Google.Protobuf.Reflection.MessageOptions, uint> Uint32Opt =
-      new pb::Extension<global::Google.Protobuf.Reflection.MessageOptions, uint>(7704880, pb::FieldCodec.ForUInt32(61639040, 0));
-    public static readonly pb::Extension<global::Google.Protobuf.Reflection.MessageOptions, ulong> Uint64Opt =
-      new pb::Extension<global::Google.Protobuf.Reflection.MessageOptions, ulong>(7702367, pb::FieldCodec.ForUInt64(61618936, 0UL));
-    public static readonly pb::Extension<global::Google.Protobuf.Reflection.MessageOptions, int> Sint32Opt =
-      new pb::Extension<global::Google.Protobuf.Reflection.MessageOptions, int>(7701568, pb::FieldCodec.ForSInt32(61612544, 0));
-    public static readonly pb::Extension<global::Google.Protobuf.Reflection.MessageOptions, long> Sint64Opt =
-      new pb::Extension<global::Google.Protobuf.Reflection.MessageOptions, long>(7700863, pb::FieldCodec.ForSInt64(61606904, 0L));
-    public static readonly pb::Extension<global::Google.Protobuf.Reflection.MessageOptions, uint> Fixed32Opt =
-      new pb::Extension<global::Google.Protobuf.Reflection.MessageOptions, uint>(7700307, pb::FieldCodec.ForFixed32(61602461, 0));
-    public static readonly pb::Extension<global::Google.Protobuf.Reflection.MessageOptions, ulong> Fixed64Opt =
-      new pb::Extension<global::Google.Protobuf.Reflection.MessageOptions, ulong>(7700194, pb::FieldCodec.ForFixed64(61601553, 0UL));
-    public static readonly pb::Extension<global::Google.Protobuf.Reflection.MessageOptions, int> Sfixed32Opt =
-      new pb::Extension<global::Google.Protobuf.Reflection.MessageOptions, int>(7698645, pb::FieldCodec.ForSFixed32(61589165, 0));
-    public static readonly pb::Extension<global::Google.Protobuf.Reflection.MessageOptions, long> Sfixed64Opt =
-      new pb::Extension<global::Google.Protobuf.Reflection.MessageOptions, long>(7685475, pb::FieldCodec.ForSFixed64(61483801, 0L));
-    public static readonly pb::Extension<global::Google.Protobuf.Reflection.MessageOptions, float> FloatOpt =
-      new pb::Extension<global::Google.Protobuf.Reflection.MessageOptions, float>(7675390, pb::FieldCodec.ForFloat(61403125, 0F));
-    public static readonly pb::Extension<global::Google.Protobuf.Reflection.MessageOptions, double> DoubleOpt =
-      new pb::Extension<global::Google.Protobuf.Reflection.MessageOptions, double>(7673293, pb::FieldCodec.ForDouble(61386345, 0D));
-    public static readonly pb::Extension<global::Google.Protobuf.Reflection.MessageOptions, string> StringOpt =
-      new pb::Extension<global::Google.Protobuf.Reflection.MessageOptions, string>(7673285, pb::FieldCodec.ForString(61386282, ""));
-    public static readonly pb::Extension<global::Google.Protobuf.Reflection.MessageOptions, pb::ByteString> BytesOpt =
-      new pb::Extension<global::Google.Protobuf.Reflection.MessageOptions, pb::ByteString>(7673238, pb::FieldCodec.ForBytes(61385906, pb::ByteString.Empty));
-    public static readonly pb::Extension<global::Google.Protobuf.Reflection.MessageOptions, global::UnitTest.Issues.TestProtos.DummyMessageContainingEnum.Types.TestEnumType> EnumOpt =
-      new pb::Extension<global::Google.Protobuf.Reflection.MessageOptions, global::UnitTest.Issues.TestProtos.DummyMessageContainingEnum.Types.TestEnumType>(7673233, pb::FieldCodec.ForEnum(61385864, x => (int) x, x => (global::UnitTest.Issues.TestProtos.DummyMessageContainingEnum.Types.TestEnumType) x, global::UnitTest.Issues.TestProtos.DummyMessageContainingEnum.Types.TestEnumType.TestOptionEnumUnspecified));
-    public static readonly pb::Extension<global::Google.Protobuf.Reflection.MessageOptions, global::UnitTest.Issues.TestProtos.DummyMessageInvalidAsOptionType> MessageTypeOpt =
-      new pb::Extension<global::Google.Protobuf.Reflection.MessageOptions, global::UnitTest.Issues.TestProtos.DummyMessageInvalidAsOptionType>(7665967, pb::FieldCodec.ForMessage(61327738, global::UnitTest.Issues.TestProtos.DummyMessageInvalidAsOptionType.Parser));
-    public static readonly pb::Extension<global::Google.Protobuf.Reflection.MessageOptions, global::UnitTest.Issues.TestProtos.ComplexOptionType1> ComplexOpt1 =
-      new pb::Extension<global::Google.Protobuf.Reflection.MessageOptions, global::UnitTest.Issues.TestProtos.ComplexOptionType1>(7646756, pb::FieldCodec.ForMessage(61174050, global::UnitTest.Issues.TestProtos.ComplexOptionType1.Parser));
-    public static readonly pb::Extension<global::Google.Protobuf.Reflection.MessageOptions, global::UnitTest.Issues.TestProtos.ComplexOptionType2> ComplexOpt2 =
-      new pb::Extension<global::Google.Protobuf.Reflection.MessageOptions, global::UnitTest.Issues.TestProtos.ComplexOptionType2>(7636949, pb::FieldCodec.ForMessage(61095594, global::UnitTest.Issues.TestProtos.ComplexOptionType2.Parser));
-    public static readonly pb::Extension<global::Google.Protobuf.Reflection.MessageOptions, global::UnitTest.Issues.TestProtos.ComplexOptionType3> ComplexOpt3 =
-      new pb::Extension<global::Google.Protobuf.Reflection.MessageOptions, global::UnitTest.Issues.TestProtos.ComplexOptionType3>(7636463, pb::FieldCodec.ForMessage(61091706, global::UnitTest.Issues.TestProtos.ComplexOptionType3.Parser));
-    public static readonly pb::Extension<global::Google.Protobuf.Reflection.FileOptions, global::UnitTest.Issues.TestProtos.Aggregate> Fileopt =
-      new pb::Extension<global::Google.Protobuf.Reflection.FileOptions, global::UnitTest.Issues.TestProtos.Aggregate>(15478479, pb::FieldCodec.ForMessage(123827834, global::UnitTest.Issues.TestProtos.Aggregate.Parser));
-    public static readonly pb::Extension<global::Google.Protobuf.Reflection.MessageOptions, global::UnitTest.Issues.TestProtos.Aggregate> Msgopt =
-      new pb::Extension<global::Google.Protobuf.Reflection.MessageOptions, global::UnitTest.Issues.TestProtos.Aggregate>(15480088, pb::FieldCodec.ForMessage(123840706, global::UnitTest.Issues.TestProtos.Aggregate.Parser));
-    public static readonly pb::Extension<global::Google.Protobuf.Reflection.FieldOptions, global::UnitTest.Issues.TestProtos.Aggregate> Fieldopt =
-      new pb::Extension<global::Google.Protobuf.Reflection.FieldOptions, global::UnitTest.Issues.TestProtos.Aggregate>(15481374, pb::FieldCodec.ForMessage(123850994, global::UnitTest.Issues.TestProtos.Aggregate.Parser));
-    public static readonly pb::Extension<global::Google.Protobuf.Reflection.EnumOptions, global::UnitTest.Issues.TestProtos.Aggregate> Enumopt =
-      new pb::Extension<global::Google.Protobuf.Reflection.EnumOptions, global::UnitTest.Issues.TestProtos.Aggregate>(15483218, pb::FieldCodec.ForMessage(123865746, global::UnitTest.Issues.TestProtos.Aggregate.Parser));
-    public static readonly pb::Extension<global::Google.Protobuf.Reflection.EnumValueOptions, global::UnitTest.Issues.TestProtos.Aggregate> Enumvalopt =
-      new pb::Extension<global::Google.Protobuf.Reflection.EnumValueOptions, global::UnitTest.Issues.TestProtos.Aggregate>(15486921, pb::FieldCodec.ForMessage(123895370, global::UnitTest.Issues.TestProtos.Aggregate.Parser));
-    public static readonly pb::Extension<global::Google.Protobuf.Reflection.ServiceOptions, global::UnitTest.Issues.TestProtos.Aggregate> Serviceopt =
-      new pb::Extension<global::Google.Protobuf.Reflection.ServiceOptions, global::UnitTest.Issues.TestProtos.Aggregate>(15497145, pb::FieldCodec.ForMessage(123977162, global::UnitTest.Issues.TestProtos.Aggregate.Parser));
-    public static readonly pb::Extension<global::Google.Protobuf.Reflection.MethodOptions, global::UnitTest.Issues.TestProtos.Aggregate> Methodopt =
-      new pb::Extension<global::Google.Protobuf.Reflection.MethodOptions, global::UnitTest.Issues.TestProtos.Aggregate>(15512713, pb::FieldCodec.ForMessage(124101706, global::UnitTest.Issues.TestProtos.Aggregate.Parser));
-  }
-
-  #region Enums
-  public enum MethodOpt1 {
-    [pbr::OriginalName("METHODOPT1_UNSPECIFIED")] Unspecified = 0,
-    [pbr::OriginalName("METHODOPT1_VAL1")] Val1 = 1,
-    [pbr::OriginalName("METHODOPT1_VAL2")] Val2 = 2,
-  }
-
-  public enum AggregateEnum {
-    [pbr::OriginalName("UNSPECIFIED")] Unspecified = 0,
-    [pbr::OriginalName("VALUE")] Value = 1,
-  }
-
-  #endregion
-
-  #region Messages
-  /// <summary>
-  /// A test message with custom options at all possible locations (and also some
-  /// regular options, to make sure they interact nicely).
-  /// </summary>
-  public sealed partial class TestMessageWithCustomOptions : pb::IMessage<TestMessageWithCustomOptions>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<TestMessageWithCustomOptions> _parser = new pb::MessageParser<TestMessageWithCustomOptions>(() => new TestMessageWithCustomOptions());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<TestMessageWithCustomOptions> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::UnitTest.Issues.TestProtos.UnittestCustomOptionsProto3Reflection.Descriptor.MessageTypes[0]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestMessageWithCustomOptions() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestMessageWithCustomOptions(TestMessageWithCustomOptions other) : this() {
-      field1_ = other.field1_;
-      switch (other.AnOneofCase) {
-        case AnOneofOneofCase.OneofField:
-          OneofField = other.OneofField;
-          break;
-      }
-
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestMessageWithCustomOptions Clone() {
-      return new TestMessageWithCustomOptions(this);
-    }
-
-    /// <summary>Field number for the "field1" field.</summary>
-    public const int Field1FieldNumber = 1;
-    private string field1_ = "";
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string Field1 {
-      get { return field1_; }
-      set {
-        field1_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-
-    /// <summary>Field number for the "oneof_field" field.</summary>
-    public const int OneofFieldFieldNumber = 2;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int OneofField {
-      get { return anOneofCase_ == AnOneofOneofCase.OneofField ? (int) anOneof_ : 0; }
-      set {
-        anOneof_ = value;
-        anOneofCase_ = AnOneofOneofCase.OneofField;
-      }
-    }
-
-    private object anOneof_;
-    /// <summary>Enum of possible cases for the "AnOneof" oneof.</summary>
-    public enum AnOneofOneofCase {
-      None = 0,
-      OneofField = 2,
-    }
-    private AnOneofOneofCase anOneofCase_ = AnOneofOneofCase.None;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public AnOneofOneofCase AnOneofCase {
-      get { return anOneofCase_; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearAnOneof() {
-      anOneofCase_ = AnOneofOneofCase.None;
-      anOneof_ = null;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as TestMessageWithCustomOptions);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(TestMessageWithCustomOptions other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (Field1 != other.Field1) return false;
-      if (OneofField != other.OneofField) return false;
-      if (AnOneofCase != other.AnOneofCase) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (Field1.Length != 0) hash ^= Field1.GetHashCode();
-      if (anOneofCase_ == AnOneofOneofCase.OneofField) hash ^= OneofField.GetHashCode();
-      hash ^= (int) anOneofCase_;
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (Field1.Length != 0) {
-        output.WriteRawTag(10);
-        output.WriteString(Field1);
-      }
-      if (anOneofCase_ == AnOneofOneofCase.OneofField) {
-        output.WriteRawTag(16);
-        output.WriteInt32(OneofField);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (Field1.Length != 0) {
-        output.WriteRawTag(10);
-        output.WriteString(Field1);
-      }
-      if (anOneofCase_ == AnOneofOneofCase.OneofField) {
-        output.WriteRawTag(16);
-        output.WriteInt32(OneofField);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (Field1.Length != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(Field1);
-      }
-      if (anOneofCase_ == AnOneofOneofCase.OneofField) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(OneofField);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(TestMessageWithCustomOptions other) {
-      if (other == null) {
-        return;
-      }
-      if (other.Field1.Length != 0) {
-        Field1 = other.Field1;
-      }
-      switch (other.AnOneofCase) {
-        case AnOneofOneofCase.OneofField:
-          OneofField = other.OneofField;
-          break;
-      }
-
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 10: {
-            Field1 = input.ReadString();
-            break;
-          }
-          case 16: {
-            OneofField = input.ReadInt32();
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 10: {
-            Field1 = input.ReadString();
-            break;
-          }
-          case 16: {
-            OneofField = input.ReadInt32();
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-    #region Nested types
-    /// <summary>Container for nested types declared in the TestMessageWithCustomOptions message type.</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static partial class Types {
-      public enum AnEnum {
-        [pbr::OriginalName("ANENUM_UNSPECIFIED")] Unspecified = 0,
-        [pbr::OriginalName("ANENUM_VAL1")] Val1 = 1,
-        [pbr::OriginalName("ANENUM_VAL2")] Val2 = 2,
-      }
-
-    }
-    #endregion
-
-  }
-
-  /// <summary>
-  /// A test RPC service with custom options at all possible locations (and also
-  /// some regular options, to make sure they interact nicely).
-  /// </summary>
-  public sealed partial class CustomOptionFooRequest : pb::IMessage<CustomOptionFooRequest>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<CustomOptionFooRequest> _parser = new pb::MessageParser<CustomOptionFooRequest>(() => new CustomOptionFooRequest());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<CustomOptionFooRequest> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::UnitTest.Issues.TestProtos.UnittestCustomOptionsProto3Reflection.Descriptor.MessageTypes[1]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public CustomOptionFooRequest() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public CustomOptionFooRequest(CustomOptionFooRequest other) : this() {
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public CustomOptionFooRequest Clone() {
-      return new CustomOptionFooRequest(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as CustomOptionFooRequest);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(CustomOptionFooRequest other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(CustomOptionFooRequest other) {
-      if (other == null) {
-        return;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-        }
-      }
-    }
-    #endif
-
-  }
-
-  public sealed partial class CustomOptionFooResponse : pb::IMessage<CustomOptionFooResponse>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<CustomOptionFooResponse> _parser = new pb::MessageParser<CustomOptionFooResponse>(() => new CustomOptionFooResponse());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<CustomOptionFooResponse> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::UnitTest.Issues.TestProtos.UnittestCustomOptionsProto3Reflection.Descriptor.MessageTypes[2]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public CustomOptionFooResponse() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public CustomOptionFooResponse(CustomOptionFooResponse other) : this() {
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public CustomOptionFooResponse Clone() {
-      return new CustomOptionFooResponse(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as CustomOptionFooResponse);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(CustomOptionFooResponse other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(CustomOptionFooResponse other) {
-      if (other == null) {
-        return;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-        }
-      }
-    }
-    #endif
-
-  }
-
-  public sealed partial class CustomOptionFooClientMessage : pb::IMessage<CustomOptionFooClientMessage>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<CustomOptionFooClientMessage> _parser = new pb::MessageParser<CustomOptionFooClientMessage>(() => new CustomOptionFooClientMessage());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<CustomOptionFooClientMessage> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::UnitTest.Issues.TestProtos.UnittestCustomOptionsProto3Reflection.Descriptor.MessageTypes[3]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public CustomOptionFooClientMessage() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public CustomOptionFooClientMessage(CustomOptionFooClientMessage other) : this() {
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public CustomOptionFooClientMessage Clone() {
-      return new CustomOptionFooClientMessage(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as CustomOptionFooClientMessage);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(CustomOptionFooClientMessage other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(CustomOptionFooClientMessage other) {
-      if (other == null) {
-        return;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-        }
-      }
-    }
-    #endif
-
-  }
-
-  public sealed partial class CustomOptionFooServerMessage : pb::IMessage<CustomOptionFooServerMessage>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<CustomOptionFooServerMessage> _parser = new pb::MessageParser<CustomOptionFooServerMessage>(() => new CustomOptionFooServerMessage());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<CustomOptionFooServerMessage> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::UnitTest.Issues.TestProtos.UnittestCustomOptionsProto3Reflection.Descriptor.MessageTypes[4]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public CustomOptionFooServerMessage() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public CustomOptionFooServerMessage(CustomOptionFooServerMessage other) : this() {
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public CustomOptionFooServerMessage Clone() {
-      return new CustomOptionFooServerMessage(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as CustomOptionFooServerMessage);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(CustomOptionFooServerMessage other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(CustomOptionFooServerMessage other) {
-      if (other == null) {
-        return;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-        }
-      }
-    }
-    #endif
-
-  }
-
-  public sealed partial class DummyMessageContainingEnum : pb::IMessage<DummyMessageContainingEnum>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<DummyMessageContainingEnum> _parser = new pb::MessageParser<DummyMessageContainingEnum>(() => new DummyMessageContainingEnum());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<DummyMessageContainingEnum> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::UnitTest.Issues.TestProtos.UnittestCustomOptionsProto3Reflection.Descriptor.MessageTypes[5]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public DummyMessageContainingEnum() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public DummyMessageContainingEnum(DummyMessageContainingEnum other) : this() {
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public DummyMessageContainingEnum Clone() {
-      return new DummyMessageContainingEnum(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as DummyMessageContainingEnum);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(DummyMessageContainingEnum other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(DummyMessageContainingEnum other) {
-      if (other == null) {
-        return;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-        }
-      }
-    }
-    #endif
-
-    #region Nested types
-    /// <summary>Container for nested types declared in the DummyMessageContainingEnum message type.</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static partial class Types {
-      public enum TestEnumType {
-        [pbr::OriginalName("TEST_OPTION_ENUM_UNSPECIFIED")] TestOptionEnumUnspecified = 0,
-        [pbr::OriginalName("TEST_OPTION_ENUM_TYPE1")] TestOptionEnumType1 = 22,
-        [pbr::OriginalName("TEST_OPTION_ENUM_TYPE2")] TestOptionEnumType2 = -23,
-      }
-
-    }
-    #endregion
-
-  }
-
-  public sealed partial class DummyMessageInvalidAsOptionType : pb::IMessage<DummyMessageInvalidAsOptionType>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<DummyMessageInvalidAsOptionType> _parser = new pb::MessageParser<DummyMessageInvalidAsOptionType>(() => new DummyMessageInvalidAsOptionType());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<DummyMessageInvalidAsOptionType> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::UnitTest.Issues.TestProtos.UnittestCustomOptionsProto3Reflection.Descriptor.MessageTypes[6]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public DummyMessageInvalidAsOptionType() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public DummyMessageInvalidAsOptionType(DummyMessageInvalidAsOptionType other) : this() {
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public DummyMessageInvalidAsOptionType Clone() {
-      return new DummyMessageInvalidAsOptionType(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as DummyMessageInvalidAsOptionType);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(DummyMessageInvalidAsOptionType other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(DummyMessageInvalidAsOptionType other) {
-      if (other == null) {
-        return;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-        }
-      }
-    }
-    #endif
-
-  }
-
-  public sealed partial class CustomOptionMinIntegerValues : pb::IMessage<CustomOptionMinIntegerValues>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<CustomOptionMinIntegerValues> _parser = new pb::MessageParser<CustomOptionMinIntegerValues>(() => new CustomOptionMinIntegerValues());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<CustomOptionMinIntegerValues> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::UnitTest.Issues.TestProtos.UnittestCustomOptionsProto3Reflection.Descriptor.MessageTypes[7]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public CustomOptionMinIntegerValues() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public CustomOptionMinIntegerValues(CustomOptionMinIntegerValues other) : this() {
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public CustomOptionMinIntegerValues Clone() {
-      return new CustomOptionMinIntegerValues(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as CustomOptionMinIntegerValues);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(CustomOptionMinIntegerValues other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(CustomOptionMinIntegerValues other) {
-      if (other == null) {
-        return;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-        }
-      }
-    }
-    #endif
-
-  }
-
-  public sealed partial class CustomOptionMaxIntegerValues : pb::IMessage<CustomOptionMaxIntegerValues>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<CustomOptionMaxIntegerValues> _parser = new pb::MessageParser<CustomOptionMaxIntegerValues>(() => new CustomOptionMaxIntegerValues());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<CustomOptionMaxIntegerValues> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::UnitTest.Issues.TestProtos.UnittestCustomOptionsProto3Reflection.Descriptor.MessageTypes[8]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public CustomOptionMaxIntegerValues() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public CustomOptionMaxIntegerValues(CustomOptionMaxIntegerValues other) : this() {
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public CustomOptionMaxIntegerValues Clone() {
-      return new CustomOptionMaxIntegerValues(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as CustomOptionMaxIntegerValues);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(CustomOptionMaxIntegerValues other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(CustomOptionMaxIntegerValues other) {
-      if (other == null) {
-        return;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-        }
-      }
-    }
-    #endif
-
-  }
-
-  public sealed partial class CustomOptionOtherValues : pb::IMessage<CustomOptionOtherValues>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<CustomOptionOtherValues> _parser = new pb::MessageParser<CustomOptionOtherValues>(() => new CustomOptionOtherValues());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<CustomOptionOtherValues> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::UnitTest.Issues.TestProtos.UnittestCustomOptionsProto3Reflection.Descriptor.MessageTypes[9]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public CustomOptionOtherValues() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public CustomOptionOtherValues(CustomOptionOtherValues other) : this() {
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public CustomOptionOtherValues Clone() {
-      return new CustomOptionOtherValues(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as CustomOptionOtherValues);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(CustomOptionOtherValues other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(CustomOptionOtherValues other) {
-      if (other == null) {
-        return;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-        }
-      }
-    }
-    #endif
-
-  }
-
-  public sealed partial class SettingRealsFromPositiveInts : pb::IMessage<SettingRealsFromPositiveInts>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<SettingRealsFromPositiveInts> _parser = new pb::MessageParser<SettingRealsFromPositiveInts>(() => new SettingRealsFromPositiveInts());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<SettingRealsFromPositiveInts> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::UnitTest.Issues.TestProtos.UnittestCustomOptionsProto3Reflection.Descriptor.MessageTypes[10]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public SettingRealsFromPositiveInts() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public SettingRealsFromPositiveInts(SettingRealsFromPositiveInts other) : this() {
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public SettingRealsFromPositiveInts Clone() {
-      return new SettingRealsFromPositiveInts(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as SettingRealsFromPositiveInts);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(SettingRealsFromPositiveInts other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(SettingRealsFromPositiveInts other) {
-      if (other == null) {
-        return;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-        }
-      }
-    }
-    #endif
-
-  }
-
-  public sealed partial class SettingRealsFromNegativeInts : pb::IMessage<SettingRealsFromNegativeInts>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<SettingRealsFromNegativeInts> _parser = new pb::MessageParser<SettingRealsFromNegativeInts>(() => new SettingRealsFromNegativeInts());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<SettingRealsFromNegativeInts> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::UnitTest.Issues.TestProtos.UnittestCustomOptionsProto3Reflection.Descriptor.MessageTypes[11]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public SettingRealsFromNegativeInts() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public SettingRealsFromNegativeInts(SettingRealsFromNegativeInts other) : this() {
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public SettingRealsFromNegativeInts Clone() {
-      return new SettingRealsFromNegativeInts(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as SettingRealsFromNegativeInts);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(SettingRealsFromNegativeInts other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(SettingRealsFromNegativeInts other) {
-      if (other == null) {
-        return;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-        }
-      }
-    }
-    #endif
-
-  }
-
-  public sealed partial class ComplexOptionType1 : pb::IMessage<ComplexOptionType1>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<ComplexOptionType1> _parser = new pb::MessageParser<ComplexOptionType1>(() => new ComplexOptionType1());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<ComplexOptionType1> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::UnitTest.Issues.TestProtos.UnittestCustomOptionsProto3Reflection.Descriptor.MessageTypes[12]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ComplexOptionType1() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ComplexOptionType1(ComplexOptionType1 other) : this() {
-      foo_ = other.foo_;
-      foo2_ = other.foo2_;
-      foo3_ = other.foo3_;
-      foo4_ = other.foo4_.Clone();
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ComplexOptionType1 Clone() {
-      return new ComplexOptionType1(this);
-    }
-
-    /// <summary>Field number for the "foo" field.</summary>
-    public const int FooFieldNumber = 1;
-    private int foo_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int Foo {
-      get { return foo_; }
-      set {
-        foo_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "foo2" field.</summary>
-    public const int Foo2FieldNumber = 2;
-    private int foo2_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int Foo2 {
-      get { return foo2_; }
-      set {
-        foo2_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "foo3" field.</summary>
-    public const int Foo3FieldNumber = 3;
-    private int foo3_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int Foo3 {
-      get { return foo3_; }
-      set {
-        foo3_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "foo4" field.</summary>
-    public const int Foo4FieldNumber = 4;
-    private static readonly pb::FieldCodec<int> _repeated_foo4_codec
-        = pb::FieldCodec.ForInt32(34);
-    private readonly pbc::RepeatedField<int> foo4_ = new pbc::RepeatedField<int>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<int> Foo4 {
-      get { return foo4_; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as ComplexOptionType1);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(ComplexOptionType1 other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (Foo != other.Foo) return false;
-      if (Foo2 != other.Foo2) return false;
-      if (Foo3 != other.Foo3) return false;
-      if(!foo4_.Equals(other.foo4_)) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (Foo != 0) hash ^= Foo.GetHashCode();
-      if (Foo2 != 0) hash ^= Foo2.GetHashCode();
-      if (Foo3 != 0) hash ^= Foo3.GetHashCode();
-      hash ^= foo4_.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (Foo != 0) {
-        output.WriteRawTag(8);
-        output.WriteInt32(Foo);
-      }
-      if (Foo2 != 0) {
-        output.WriteRawTag(16);
-        output.WriteInt32(Foo2);
-      }
-      if (Foo3 != 0) {
-        output.WriteRawTag(24);
-        output.WriteInt32(Foo3);
-      }
-      foo4_.WriteTo(output, _repeated_foo4_codec);
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (Foo != 0) {
-        output.WriteRawTag(8);
-        output.WriteInt32(Foo);
-      }
-      if (Foo2 != 0) {
-        output.WriteRawTag(16);
-        output.WriteInt32(Foo2);
-      }
-      if (Foo3 != 0) {
-        output.WriteRawTag(24);
-        output.WriteInt32(Foo3);
-      }
-      foo4_.WriteTo(ref output, _repeated_foo4_codec);
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (Foo != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(Foo);
-      }
-      if (Foo2 != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(Foo2);
-      }
-      if (Foo3 != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(Foo3);
-      }
-      size += foo4_.CalculateSize(_repeated_foo4_codec);
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(ComplexOptionType1 other) {
-      if (other == null) {
-        return;
-      }
-      if (other.Foo != 0) {
-        Foo = other.Foo;
-      }
-      if (other.Foo2 != 0) {
-        Foo2 = other.Foo2;
-      }
-      if (other.Foo3 != 0) {
-        Foo3 = other.Foo3;
-      }
-      foo4_.Add(other.foo4_);
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 8: {
-            Foo = input.ReadInt32();
-            break;
-          }
-          case 16: {
-            Foo2 = input.ReadInt32();
-            break;
-          }
-          case 24: {
-            Foo3 = input.ReadInt32();
-            break;
-          }
-          case 34:
-          case 32: {
-            foo4_.AddEntriesFrom(input, _repeated_foo4_codec);
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 8: {
-            Foo = input.ReadInt32();
-            break;
-          }
-          case 16: {
-            Foo2 = input.ReadInt32();
-            break;
-          }
-          case 24: {
-            Foo3 = input.ReadInt32();
-            break;
-          }
-          case 34:
-          case 32: {
-            foo4_.AddEntriesFrom(ref input, _repeated_foo4_codec);
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  public sealed partial class ComplexOptionType2 : pb::IMessage<ComplexOptionType2>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<ComplexOptionType2> _parser = new pb::MessageParser<ComplexOptionType2>(() => new ComplexOptionType2());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<ComplexOptionType2> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::UnitTest.Issues.TestProtos.UnittestCustomOptionsProto3Reflection.Descriptor.MessageTypes[13]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ComplexOptionType2() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ComplexOptionType2(ComplexOptionType2 other) : this() {
-      bar_ = other.bar_ != null ? other.bar_.Clone() : null;
-      baz_ = other.baz_;
-      fred_ = other.fred_ != null ? other.fred_.Clone() : null;
-      barney_ = other.barney_.Clone();
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ComplexOptionType2 Clone() {
-      return new ComplexOptionType2(this);
-    }
-
-    /// <summary>Field number for the "bar" field.</summary>
-    public const int BarFieldNumber = 1;
-    private global::UnitTest.Issues.TestProtos.ComplexOptionType1 bar_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::UnitTest.Issues.TestProtos.ComplexOptionType1 Bar {
-      get { return bar_; }
-      set {
-        bar_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "baz" field.</summary>
-    public const int BazFieldNumber = 2;
-    private int baz_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int Baz {
-      get { return baz_; }
-      set {
-        baz_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "fred" field.</summary>
-    public const int FredFieldNumber = 3;
-    private global::UnitTest.Issues.TestProtos.ComplexOptionType2.Types.ComplexOptionType4 fred_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::UnitTest.Issues.TestProtos.ComplexOptionType2.Types.ComplexOptionType4 Fred {
-      get { return fred_; }
-      set {
-        fred_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "barney" field.</summary>
-    public const int BarneyFieldNumber = 4;
-    private static readonly pb::FieldCodec<global::UnitTest.Issues.TestProtos.ComplexOptionType2.Types.ComplexOptionType4> _repeated_barney_codec
-        = pb::FieldCodec.ForMessage(34, global::UnitTest.Issues.TestProtos.ComplexOptionType2.Types.ComplexOptionType4.Parser);
-    private readonly pbc::RepeatedField<global::UnitTest.Issues.TestProtos.ComplexOptionType2.Types.ComplexOptionType4> barney_ = new pbc::RepeatedField<global::UnitTest.Issues.TestProtos.ComplexOptionType2.Types.ComplexOptionType4>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::UnitTest.Issues.TestProtos.ComplexOptionType2.Types.ComplexOptionType4> Barney {
-      get { return barney_; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as ComplexOptionType2);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(ComplexOptionType2 other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (!object.Equals(Bar, other.Bar)) return false;
-      if (Baz != other.Baz) return false;
-      if (!object.Equals(Fred, other.Fred)) return false;
-      if(!barney_.Equals(other.barney_)) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (bar_ != null) hash ^= Bar.GetHashCode();
-      if (Baz != 0) hash ^= Baz.GetHashCode();
-      if (fred_ != null) hash ^= Fred.GetHashCode();
-      hash ^= barney_.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (bar_ != null) {
-        output.WriteRawTag(10);
-        output.WriteMessage(Bar);
-      }
-      if (Baz != 0) {
-        output.WriteRawTag(16);
-        output.WriteInt32(Baz);
-      }
-      if (fred_ != null) {
-        output.WriteRawTag(26);
-        output.WriteMessage(Fred);
-      }
-      barney_.WriteTo(output, _repeated_barney_codec);
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (bar_ != null) {
-        output.WriteRawTag(10);
-        output.WriteMessage(Bar);
-      }
-      if (Baz != 0) {
-        output.WriteRawTag(16);
-        output.WriteInt32(Baz);
-      }
-      if (fred_ != null) {
-        output.WriteRawTag(26);
-        output.WriteMessage(Fred);
-      }
-      barney_.WriteTo(ref output, _repeated_barney_codec);
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (bar_ != null) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(Bar);
-      }
-      if (Baz != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(Baz);
-      }
-      if (fred_ != null) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(Fred);
-      }
-      size += barney_.CalculateSize(_repeated_barney_codec);
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(ComplexOptionType2 other) {
-      if (other == null) {
-        return;
-      }
-      if (other.bar_ != null) {
-        if (bar_ == null) {
-          Bar = new global::UnitTest.Issues.TestProtos.ComplexOptionType1();
-        }
-        Bar.MergeFrom(other.Bar);
-      }
-      if (other.Baz != 0) {
-        Baz = other.Baz;
-      }
-      if (other.fred_ != null) {
-        if (fred_ == null) {
-          Fred = new global::UnitTest.Issues.TestProtos.ComplexOptionType2.Types.ComplexOptionType4();
-        }
-        Fred.MergeFrom(other.Fred);
-      }
-      barney_.Add(other.barney_);
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 10: {
-            if (bar_ == null) {
-              Bar = new global::UnitTest.Issues.TestProtos.ComplexOptionType1();
-            }
-            input.ReadMessage(Bar);
-            break;
-          }
-          case 16: {
-            Baz = input.ReadInt32();
-            break;
-          }
-          case 26: {
-            if (fred_ == null) {
-              Fred = new global::UnitTest.Issues.TestProtos.ComplexOptionType2.Types.ComplexOptionType4();
-            }
-            input.ReadMessage(Fred);
-            break;
-          }
-          case 34: {
-            barney_.AddEntriesFrom(input, _repeated_barney_codec);
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 10: {
-            if (bar_ == null) {
-              Bar = new global::UnitTest.Issues.TestProtos.ComplexOptionType1();
-            }
-            input.ReadMessage(Bar);
-            break;
-          }
-          case 16: {
-            Baz = input.ReadInt32();
-            break;
-          }
-          case 26: {
-            if (fred_ == null) {
-              Fred = new global::UnitTest.Issues.TestProtos.ComplexOptionType2.Types.ComplexOptionType4();
-            }
-            input.ReadMessage(Fred);
-            break;
-          }
-          case 34: {
-            barney_.AddEntriesFrom(ref input, _repeated_barney_codec);
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-    #region Nested types
-    /// <summary>Container for nested types declared in the ComplexOptionType2 message type.</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static partial class Types {
-      public sealed partial class ComplexOptionType4 : pb::IMessage<ComplexOptionType4>
-      #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          , pb::IBufferMessage
-      #endif
-      {
-        private static readonly pb::MessageParser<ComplexOptionType4> _parser = new pb::MessageParser<ComplexOptionType4>(() => new ComplexOptionType4());
-        private pb::UnknownFieldSet _unknownFields;
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static pb::MessageParser<ComplexOptionType4> Parser { get { return _parser; } }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static pbr::MessageDescriptor Descriptor {
-          get { return global::UnitTest.Issues.TestProtos.ComplexOptionType2.Descriptor.NestedTypes[0]; }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        pbr::MessageDescriptor pb::IMessage.Descriptor {
-          get { return Descriptor; }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public ComplexOptionType4() {
-          OnConstruction();
-        }
-
-        partial void OnConstruction();
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public ComplexOptionType4(ComplexOptionType4 other) : this() {
-          waldo_ = other.waldo_;
-          _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public ComplexOptionType4 Clone() {
-          return new ComplexOptionType4(this);
-        }
-
-        /// <summary>Field number for the "waldo" field.</summary>
-        public const int WaldoFieldNumber = 1;
-        private int waldo_;
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public int Waldo {
-          get { return waldo_; }
-          set {
-            waldo_ = value;
-          }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override bool Equals(object other) {
-          return Equals(other as ComplexOptionType4);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool Equals(ComplexOptionType4 other) {
-          if (ReferenceEquals(other, null)) {
-            return false;
-          }
-          if (ReferenceEquals(other, this)) {
-            return true;
-          }
-          if (Waldo != other.Waldo) return false;
-          return Equals(_unknownFields, other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override int GetHashCode() {
-          int hash = 1;
-          if (Waldo != 0) hash ^= Waldo.GetHashCode();
-          if (_unknownFields != null) {
-            hash ^= _unknownFields.GetHashCode();
-          }
-          return hash;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override string ToString() {
-          return pb::JsonFormatter.ToDiagnosticString(this);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void WriteTo(pb::CodedOutputStream output) {
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          output.WriteRawMessage(this);
-        #else
-          if (Waldo != 0) {
-            output.WriteRawTag(8);
-            output.WriteInt32(Waldo);
-          }
-          if (_unknownFields != null) {
-            _unknownFields.WriteTo(output);
-          }
-        #endif
-        }
-
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-          if (Waldo != 0) {
-            output.WriteRawTag(8);
-            output.WriteInt32(Waldo);
-          }
-          if (_unknownFields != null) {
-            _unknownFields.WriteTo(ref output);
-          }
-        }
-        #endif
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public int CalculateSize() {
-          int size = 0;
-          if (Waldo != 0) {
-            size += 1 + pb::CodedOutputStream.ComputeInt32Size(Waldo);
-          }
-          if (_unknownFields != null) {
-            size += _unknownFields.CalculateSize();
-          }
-          return size;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(ComplexOptionType4 other) {
-          if (other == null) {
-            return;
-          }
-          if (other.Waldo != 0) {
-            Waldo = other.Waldo;
-          }
-          _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(pb::CodedInputStream input) {
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          input.ReadRawMessage(this);
-        #else
-          uint tag;
-          while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
-              default:
-                _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-                break;
-              case 8: {
-                Waldo = input.ReadInt32();
-                break;
-              }
-            }
-          }
-        #endif
-        }
-
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-          uint tag;
-          while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
-              default:
-                _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-                break;
-              case 8: {
-                Waldo = input.ReadInt32();
-                break;
-              }
-            }
-          }
-        }
-        #endif
-
-        #region Extensions
-        /// <summary>Container for extensions for other messages declared in the ComplexOptionType4 message type.</summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static partial class Extensions {
-          public static readonly pb::Extension<global::Google.Protobuf.Reflection.MessageOptions, global::UnitTest.Issues.TestProtos.ComplexOptionType2.Types.ComplexOptionType4> ComplexOpt4 =
-            new pb::Extension<global::Google.Protobuf.Reflection.MessageOptions, global::UnitTest.Issues.TestProtos.ComplexOptionType2.Types.ComplexOptionType4>(7633546, pb::FieldCodec.ForMessage(61068370, global::UnitTest.Issues.TestProtos.ComplexOptionType2.Types.ComplexOptionType4.Parser));
-        }
-        #endregion
-
-      }
-
-    }
-    #endregion
-
-  }
-
-  public sealed partial class ComplexOptionType3 : pb::IMessage<ComplexOptionType3>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<ComplexOptionType3> _parser = new pb::MessageParser<ComplexOptionType3>(() => new ComplexOptionType3());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<ComplexOptionType3> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::UnitTest.Issues.TestProtos.UnittestCustomOptionsProto3Reflection.Descriptor.MessageTypes[14]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ComplexOptionType3() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ComplexOptionType3(ComplexOptionType3 other) : this() {
-      qux_ = other.qux_;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ComplexOptionType3 Clone() {
-      return new ComplexOptionType3(this);
-    }
-
-    /// <summary>Field number for the "qux" field.</summary>
-    public const int QuxFieldNumber = 1;
-    private int qux_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int Qux {
-      get { return qux_; }
-      set {
-        qux_ = value;
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as ComplexOptionType3);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(ComplexOptionType3 other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (Qux != other.Qux) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (Qux != 0) hash ^= Qux.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (Qux != 0) {
-        output.WriteRawTag(8);
-        output.WriteInt32(Qux);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (Qux != 0) {
-        output.WriteRawTag(8);
-        output.WriteInt32(Qux);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (Qux != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(Qux);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(ComplexOptionType3 other) {
-      if (other == null) {
-        return;
-      }
-      if (other.Qux != 0) {
-        Qux = other.Qux;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 8: {
-            Qux = input.ReadInt32();
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 8: {
-            Qux = input.ReadInt32();
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  /// <summary>
-  /// Note that we try various different ways of naming the same extension.
-  /// </summary>
-  public sealed partial class VariousComplexOptions : pb::IMessage<VariousComplexOptions>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<VariousComplexOptions> _parser = new pb::MessageParser<VariousComplexOptions>(() => new VariousComplexOptions());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<VariousComplexOptions> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::UnitTest.Issues.TestProtos.UnittestCustomOptionsProto3Reflection.Descriptor.MessageTypes[15]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public VariousComplexOptions() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public VariousComplexOptions(VariousComplexOptions other) : this() {
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public VariousComplexOptions Clone() {
-      return new VariousComplexOptions(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as VariousComplexOptions);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(VariousComplexOptions other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(VariousComplexOptions other) {
-      if (other == null) {
-        return;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-        }
-      }
-    }
-    #endif
-
-  }
-
-  /// <summary>
-  /// A helper type used to test aggregate option parsing
-  /// </summary>
-  public sealed partial class Aggregate : pb::IMessage<Aggregate>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<Aggregate> _parser = new pb::MessageParser<Aggregate>(() => new Aggregate());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<Aggregate> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::UnitTest.Issues.TestProtos.UnittestCustomOptionsProto3Reflection.Descriptor.MessageTypes[16]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Aggregate() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Aggregate(Aggregate other) : this() {
-      i_ = other.i_;
-      s_ = other.s_;
-      sub_ = other.sub_ != null ? other.sub_.Clone() : null;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Aggregate Clone() {
-      return new Aggregate(this);
-    }
-
-    /// <summary>Field number for the "i" field.</summary>
-    public const int IFieldNumber = 1;
-    private int i_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int I {
-      get { return i_; }
-      set {
-        i_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "s" field.</summary>
-    public const int SFieldNumber = 2;
-    private string s_ = "";
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string S {
-      get { return s_; }
-      set {
-        s_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-
-    /// <summary>Field number for the "sub" field.</summary>
-    public const int SubFieldNumber = 3;
-    private global::UnitTest.Issues.TestProtos.Aggregate sub_;
-    /// <summary>
-    /// A nested object
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::UnitTest.Issues.TestProtos.Aggregate Sub {
-      get { return sub_; }
-      set {
-        sub_ = value;
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as Aggregate);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(Aggregate other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (I != other.I) return false;
-      if (S != other.S) return false;
-      if (!object.Equals(Sub, other.Sub)) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (I != 0) hash ^= I.GetHashCode();
-      if (S.Length != 0) hash ^= S.GetHashCode();
-      if (sub_ != null) hash ^= Sub.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (I != 0) {
-        output.WriteRawTag(8);
-        output.WriteInt32(I);
-      }
-      if (S.Length != 0) {
-        output.WriteRawTag(18);
-        output.WriteString(S);
-      }
-      if (sub_ != null) {
-        output.WriteRawTag(26);
-        output.WriteMessage(Sub);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (I != 0) {
-        output.WriteRawTag(8);
-        output.WriteInt32(I);
-      }
-      if (S.Length != 0) {
-        output.WriteRawTag(18);
-        output.WriteString(S);
-      }
-      if (sub_ != null) {
-        output.WriteRawTag(26);
-        output.WriteMessage(Sub);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (I != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(I);
-      }
-      if (S.Length != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(S);
-      }
-      if (sub_ != null) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(Sub);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(Aggregate other) {
-      if (other == null) {
-        return;
-      }
-      if (other.I != 0) {
-        I = other.I;
-      }
-      if (other.S.Length != 0) {
-        S = other.S;
-      }
-      if (other.sub_ != null) {
-        if (sub_ == null) {
-          Sub = new global::UnitTest.Issues.TestProtos.Aggregate();
-        }
-        Sub.MergeFrom(other.Sub);
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 8: {
-            I = input.ReadInt32();
-            break;
-          }
-          case 18: {
-            S = input.ReadString();
-            break;
-          }
-          case 26: {
-            if (sub_ == null) {
-              Sub = new global::UnitTest.Issues.TestProtos.Aggregate();
-            }
-            input.ReadMessage(Sub);
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 8: {
-            I = input.ReadInt32();
-            break;
-          }
-          case 18: {
-            S = input.ReadString();
-            break;
-          }
-          case 26: {
-            if (sub_ == null) {
-              Sub = new global::UnitTest.Issues.TestProtos.Aggregate();
-            }
-            input.ReadMessage(Sub);
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  public sealed partial class AggregateMessage : pb::IMessage<AggregateMessage>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<AggregateMessage> _parser = new pb::MessageParser<AggregateMessage>(() => new AggregateMessage());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<AggregateMessage> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::UnitTest.Issues.TestProtos.UnittestCustomOptionsProto3Reflection.Descriptor.MessageTypes[17]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public AggregateMessage() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public AggregateMessage(AggregateMessage other) : this() {
-      fieldname_ = other.fieldname_;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public AggregateMessage Clone() {
-      return new AggregateMessage(this);
-    }
-
-    /// <summary>Field number for the "fieldname" field.</summary>
-    public const int FieldnameFieldNumber = 1;
-    private int fieldname_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int Fieldname {
-      get { return fieldname_; }
-      set {
-        fieldname_ = value;
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as AggregateMessage);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(AggregateMessage other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (Fieldname != other.Fieldname) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (Fieldname != 0) hash ^= Fieldname.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (Fieldname != 0) {
-        output.WriteRawTag(8);
-        output.WriteInt32(Fieldname);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (Fieldname != 0) {
-        output.WriteRawTag(8);
-        output.WriteInt32(Fieldname);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (Fieldname != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(Fieldname);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(AggregateMessage other) {
-      if (other == null) {
-        return;
-      }
-      if (other.Fieldname != 0) {
-        Fieldname = other.Fieldname;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 8: {
-            Fieldname = input.ReadInt32();
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 8: {
-            Fieldname = input.ReadInt32();
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  /// <summary>
-  /// Test custom options for nested type.
-  /// </summary>
-  public sealed partial class NestedOptionType : pb::IMessage<NestedOptionType>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<NestedOptionType> _parser = new pb::MessageParser<NestedOptionType>(() => new NestedOptionType());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<NestedOptionType> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::UnitTest.Issues.TestProtos.UnittestCustomOptionsProto3Reflection.Descriptor.MessageTypes[18]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public NestedOptionType() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public NestedOptionType(NestedOptionType other) : this() {
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public NestedOptionType Clone() {
-      return new NestedOptionType(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as NestedOptionType);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(NestedOptionType other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(NestedOptionType other) {
-      if (other == null) {
-        return;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-        }
-      }
-    }
-    #endif
-
-    #region Nested types
-    /// <summary>Container for nested types declared in the NestedOptionType message type.</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static partial class Types {
-      public enum NestedEnum {
-        [pbr::OriginalName("UNSPECIFIED")] Unspecified = 0,
-        [pbr::OriginalName("NESTED_ENUM_VALUE")] Value = 1,
-      }
-
-      public sealed partial class NestedMessage : pb::IMessage<NestedMessage>
-      #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          , pb::IBufferMessage
-      #endif
-      {
-        private static readonly pb::MessageParser<NestedMessage> _parser = new pb::MessageParser<NestedMessage>(() => new NestedMessage());
-        private pb::UnknownFieldSet _unknownFields;
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static pb::MessageParser<NestedMessage> Parser { get { return _parser; } }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static pbr::MessageDescriptor Descriptor {
-          get { return global::UnitTest.Issues.TestProtos.NestedOptionType.Descriptor.NestedTypes[0]; }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        pbr::MessageDescriptor pb::IMessage.Descriptor {
-          get { return Descriptor; }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public NestedMessage() {
-          OnConstruction();
-        }
-
-        partial void OnConstruction();
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public NestedMessage(NestedMessage other) : this() {
-          nestedField_ = other.nestedField_;
-          _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public NestedMessage Clone() {
-          return new NestedMessage(this);
-        }
-
-        /// <summary>Field number for the "nested_field" field.</summary>
-        public const int NestedFieldFieldNumber = 1;
-        private int nestedField_;
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public int NestedField {
-          get { return nestedField_; }
-          set {
-            nestedField_ = value;
-          }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override bool Equals(object other) {
-          return Equals(other as NestedMessage);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool Equals(NestedMessage other) {
-          if (ReferenceEquals(other, null)) {
-            return false;
-          }
-          if (ReferenceEquals(other, this)) {
-            return true;
-          }
-          if (NestedField != other.NestedField) return false;
-          return Equals(_unknownFields, other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override int GetHashCode() {
-          int hash = 1;
-          if (NestedField != 0) hash ^= NestedField.GetHashCode();
-          if (_unknownFields != null) {
-            hash ^= _unknownFields.GetHashCode();
-          }
-          return hash;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override string ToString() {
-          return pb::JsonFormatter.ToDiagnosticString(this);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void WriteTo(pb::CodedOutputStream output) {
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          output.WriteRawMessage(this);
-        #else
-          if (NestedField != 0) {
-            output.WriteRawTag(8);
-            output.WriteInt32(NestedField);
-          }
-          if (_unknownFields != null) {
-            _unknownFields.WriteTo(output);
-          }
-        #endif
-        }
-
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-          if (NestedField != 0) {
-            output.WriteRawTag(8);
-            output.WriteInt32(NestedField);
-          }
-          if (_unknownFields != null) {
-            _unknownFields.WriteTo(ref output);
-          }
-        }
-        #endif
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public int CalculateSize() {
-          int size = 0;
-          if (NestedField != 0) {
-            size += 1 + pb::CodedOutputStream.ComputeInt32Size(NestedField);
-          }
-          if (_unknownFields != null) {
-            size += _unknownFields.CalculateSize();
-          }
-          return size;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(NestedMessage other) {
-          if (other == null) {
-            return;
-          }
-          if (other.NestedField != 0) {
-            NestedField = other.NestedField;
-          }
-          _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(pb::CodedInputStream input) {
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          input.ReadRawMessage(this);
-        #else
-          uint tag;
-          while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
-              default:
-                _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-                break;
-              case 8: {
-                NestedField = input.ReadInt32();
-                break;
-              }
-            }
-          }
-        #endif
-        }
-
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-          uint tag;
-          while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
-              default:
-                _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-                break;
-              case 8: {
-                NestedField = input.ReadInt32();
-                break;
-              }
-            }
-          }
-        }
-        #endif
-
-      }
-
-    }
-    #endregion
-
-  }
-
-  #endregion
-
-}
-
-#endregion Designer generated code
diff --git a/libs/protobuf/csharp/src/Google.Protobuf.Test.TestProtos/UnittestImport.cs b/libs/protobuf/csharp/src/Google.Protobuf.Test.TestProtos/UnittestImport.cs
deleted file mode 100644
index de5f0c2..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf.Test.TestProtos/UnittestImport.cs
+++ /dev/null
@@ -1,272 +0,0 @@
-// <auto-generated>
-//     Generated by the protocol buffer compiler.  DO NOT EDIT!
-//     source: unittest_import.proto
-// </auto-generated>
-#pragma warning disable 1591, 0612, 3021, 8981
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-namespace Google.Protobuf.TestProtos.Proto2 {
-
-  /// <summary>Holder for reflection information generated from unittest_import.proto</summary>
-  public static partial class UnittestImportReflection {
-
-    #region Descriptor
-    /// <summary>File descriptor for unittest_import.proto</summary>
-    public static pbr::FileDescriptor Descriptor {
-      get { return descriptor; }
-    }
-    private static pbr::FileDescriptor descriptor;
-
-    static UnittestImportReflection() {
-      byte[] descriptorData = global::System.Convert.FromBase64String(
-          string.Concat(
-            "ChV1bml0dGVzdF9pbXBvcnQucHJvdG8SH3Byb3RvYnVmX3VuaXR0ZXN0X2lt",
-            "cG9ydF9wcm90bzIaHHVuaXR0ZXN0X2ltcG9ydF9wdWJsaWMucHJvdG8iGgoN",
-            "SW1wb3J0TWVzc2FnZRIJCgFkGAEgASgFKjwKCkltcG9ydEVudW0SDgoKSU1Q",
-            "T1JUX0ZPTxAHEg4KCklNUE9SVF9CQVIQCBIOCgpJTVBPUlRfQkFaEAkqMQoQ",
-            "SW1wb3J0RW51bUZvck1hcBILCgdVTktOT1dOEAASBwoDRk9PEAESBwoDQkFS",
-            "EAJCKUgB+AEBqgIhR29vZ2xlLlByb3RvYnVmLlRlc3RQcm90b3MuUHJvdG8y",
-            "UAA="));
-      descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-          new pbr::FileDescriptor[] { global::Google.Protobuf.TestProtos.Proto2.UnittestImportPublicReflection.Descriptor, },
-          new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Google.Protobuf.TestProtos.Proto2.ImportEnum), typeof(global::Google.Protobuf.TestProtos.Proto2.ImportEnumForMap), }, null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.Proto2.ImportMessage), global::Google.Protobuf.TestProtos.Proto2.ImportMessage.Parser, new[]{ "D" }, null, null, null, null)
-          }));
-    }
-    #endregion
-
-  }
-  #region Enums
-  public enum ImportEnum {
-    [pbr::OriginalName("IMPORT_FOO")] ImportFoo = 7,
-    [pbr::OriginalName("IMPORT_BAR")] ImportBar = 8,
-    [pbr::OriginalName("IMPORT_BAZ")] ImportBaz = 9,
-  }
-
-  /// <summary>
-  /// To use an enum in a map, it must has the first value as 0.
-  /// </summary>
-  public enum ImportEnumForMap {
-    [pbr::OriginalName("UNKNOWN")] Unknown = 0,
-    [pbr::OriginalName("FOO")] Foo = 1,
-    [pbr::OriginalName("BAR")] Bar = 2,
-  }
-
-  #endregion
-
-  #region Messages
-  public sealed partial class ImportMessage : pb::IMessage<ImportMessage>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<ImportMessage> _parser = new pb::MessageParser<ImportMessage>(() => new ImportMessage());
-    private pb::UnknownFieldSet _unknownFields;
-    private int _hasBits0;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<ImportMessage> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.Proto2.UnittestImportReflection.Descriptor.MessageTypes[0]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ImportMessage() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ImportMessage(ImportMessage other) : this() {
-      _hasBits0 = other._hasBits0;
-      d_ = other.d_;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ImportMessage Clone() {
-      return new ImportMessage(this);
-    }
-
-    /// <summary>Field number for the "d" field.</summary>
-    public const int DFieldNumber = 1;
-    private readonly static int DDefaultValue = 0;
-
-    private int d_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int D {
-      get { if ((_hasBits0 & 1) != 0) { return d_; } else { return DDefaultValue; } }
-      set {
-        _hasBits0 |= 1;
-        d_ = value;
-      }
-    }
-    /// <summary>Gets whether the "d" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasD {
-      get { return (_hasBits0 & 1) != 0; }
-    }
-    /// <summary>Clears the value of the "d" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearD() {
-      _hasBits0 &= ~1;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as ImportMessage);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(ImportMessage other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (D != other.D) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (HasD) hash ^= D.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (HasD) {
-        output.WriteRawTag(8);
-        output.WriteInt32(D);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (HasD) {
-        output.WriteRawTag(8);
-        output.WriteInt32(D);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (HasD) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(D);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(ImportMessage other) {
-      if (other == null) {
-        return;
-      }
-      if (other.HasD) {
-        D = other.D;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 8: {
-            D = input.ReadInt32();
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 8: {
-            D = input.ReadInt32();
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  #endregion
-
-}
-
-#endregion Designer generated code
diff --git a/libs/protobuf/csharp/src/Google.Protobuf.Test.TestProtos/UnittestImportProto3.cs b/libs/protobuf/csharp/src/Google.Protobuf.Test.TestProtos/UnittestImportProto3.cs
deleted file mode 100644
index d661c2d..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf.Test.TestProtos/UnittestImportProto3.cs
+++ /dev/null
@@ -1,246 +0,0 @@
-// <auto-generated>
-//     Generated by the protocol buffer compiler.  DO NOT EDIT!
-//     source: unittest_import_proto3.proto
-// </auto-generated>
-#pragma warning disable 1591, 0612, 3021, 8981
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-namespace Google.Protobuf.TestProtos {
-
-  /// <summary>Holder for reflection information generated from unittest_import_proto3.proto</summary>
-  public static partial class UnittestImportProto3Reflection {
-
-    #region Descriptor
-    /// <summary>File descriptor for unittest_import_proto3.proto</summary>
-    public static pbr::FileDescriptor Descriptor {
-      get { return descriptor; }
-    }
-    private static pbr::FileDescriptor descriptor;
-
-    static UnittestImportProto3Reflection() {
-      byte[] descriptorData = global::System.Convert.FromBase64String(
-          string.Concat(
-            "Chx1bml0dGVzdF9pbXBvcnRfcHJvdG8zLnByb3RvEhhwcm90b2J1Zl91bml0",
-            "dGVzdF9pbXBvcnQaI3VuaXR0ZXN0X2ltcG9ydF9wdWJsaWNfcHJvdG8zLnBy",
-            "b3RvIhoKDUltcG9ydE1lc3NhZ2USCQoBZBgBIAEoBSpZCgpJbXBvcnRFbnVt",
-            "EhsKF0lNUE9SVF9FTlVNX1VOU1BFQ0lGSUVEEAASDgoKSU1QT1JUX0ZPTxAH",
-            "Eg4KCklNUE9SVF9CQVIQCBIOCgpJTVBPUlRfQkFaEAlCHaoCGkdvb2dsZS5Q",
-            "cm90b2J1Zi5UZXN0UHJvdG9zUABiBnByb3RvMw=="));
-      descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-          new pbr::FileDescriptor[] { global::Google.Protobuf.TestProtos.UnittestImportPublicProto3Reflection.Descriptor, },
-          new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Google.Protobuf.TestProtos.ImportEnum), }, null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.ImportMessage), global::Google.Protobuf.TestProtos.ImportMessage.Parser, new[]{ "D" }, null, null, null, null)
-          }));
-    }
-    #endregion
-
-  }
-  #region Enums
-  public enum ImportEnum {
-    [pbr::OriginalName("IMPORT_ENUM_UNSPECIFIED")] Unspecified = 0,
-    [pbr::OriginalName("IMPORT_FOO")] ImportFoo = 7,
-    [pbr::OriginalName("IMPORT_BAR")] ImportBar = 8,
-    [pbr::OriginalName("IMPORT_BAZ")] ImportBaz = 9,
-  }
-
-  #endregion
-
-  #region Messages
-  public sealed partial class ImportMessage : pb::IMessage<ImportMessage>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<ImportMessage> _parser = new pb::MessageParser<ImportMessage>(() => new ImportMessage());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<ImportMessage> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.UnittestImportProto3Reflection.Descriptor.MessageTypes[0]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ImportMessage() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ImportMessage(ImportMessage other) : this() {
-      d_ = other.d_;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ImportMessage Clone() {
-      return new ImportMessage(this);
-    }
-
-    /// <summary>Field number for the "d" field.</summary>
-    public const int DFieldNumber = 1;
-    private int d_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int D {
-      get { return d_; }
-      set {
-        d_ = value;
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as ImportMessage);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(ImportMessage other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (D != other.D) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (D != 0) hash ^= D.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (D != 0) {
-        output.WriteRawTag(8);
-        output.WriteInt32(D);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (D != 0) {
-        output.WriteRawTag(8);
-        output.WriteInt32(D);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (D != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(D);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(ImportMessage other) {
-      if (other == null) {
-        return;
-      }
-      if (other.D != 0) {
-        D = other.D;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 8: {
-            D = input.ReadInt32();
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 8: {
-            D = input.ReadInt32();
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  #endregion
-
-}
-
-#endregion Designer generated code
diff --git a/libs/protobuf/csharp/src/Google.Protobuf.Test.TestProtos/UnittestImportPublic.cs b/libs/protobuf/csharp/src/Google.Protobuf.Test.TestProtos/UnittestImportPublic.cs
deleted file mode 100644
index f8a0e55..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf.Test.TestProtos/UnittestImportPublic.cs
+++ /dev/null
@@ -1,250 +0,0 @@
-// <auto-generated>
-//     Generated by the protocol buffer compiler.  DO NOT EDIT!
-//     source: unittest_import_public.proto
-// </auto-generated>
-#pragma warning disable 1591, 0612, 3021, 8981
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-namespace Google.Protobuf.TestProtos.Proto2 {
-
-  /// <summary>Holder for reflection information generated from unittest_import_public.proto</summary>
-  public static partial class UnittestImportPublicReflection {
-
-    #region Descriptor
-    /// <summary>File descriptor for unittest_import_public.proto</summary>
-    public static pbr::FileDescriptor Descriptor {
-      get { return descriptor; }
-    }
-    private static pbr::FileDescriptor descriptor;
-
-    static UnittestImportPublicReflection() {
-      byte[] descriptorData = global::System.Convert.FromBase64String(
-          string.Concat(
-            "Chx1bml0dGVzdF9pbXBvcnRfcHVibGljLnByb3RvEh9wcm90b2J1Zl91bml0",
-            "dGVzdF9pbXBvcnRfcHJvdG8yIiAKE1B1YmxpY0ltcG9ydE1lc3NhZ2USCQoB",
-            "ZRgBIAEoBUIkqgIhR29vZ2xlLlByb3RvYnVmLlRlc3RQcm90b3MuUHJvdG8y"));
-      descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-          new pbr::FileDescriptor[] { },
-          new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.Proto2.PublicImportMessage), global::Google.Protobuf.TestProtos.Proto2.PublicImportMessage.Parser, new[]{ "E" }, null, null, null, null)
-          }));
-    }
-    #endregion
-
-  }
-  #region Messages
-  public sealed partial class PublicImportMessage : pb::IMessage<PublicImportMessage>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<PublicImportMessage> _parser = new pb::MessageParser<PublicImportMessage>(() => new PublicImportMessage());
-    private pb::UnknownFieldSet _unknownFields;
-    private int _hasBits0;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<PublicImportMessage> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.Proto2.UnittestImportPublicReflection.Descriptor.MessageTypes[0]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public PublicImportMessage() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public PublicImportMessage(PublicImportMessage other) : this() {
-      _hasBits0 = other._hasBits0;
-      e_ = other.e_;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public PublicImportMessage Clone() {
-      return new PublicImportMessage(this);
-    }
-
-    /// <summary>Field number for the "e" field.</summary>
-    public const int EFieldNumber = 1;
-    private readonly static int EDefaultValue = 0;
-
-    private int e_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int E {
-      get { if ((_hasBits0 & 1) != 0) { return e_; } else { return EDefaultValue; } }
-      set {
-        _hasBits0 |= 1;
-        e_ = value;
-      }
-    }
-    /// <summary>Gets whether the "e" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasE {
-      get { return (_hasBits0 & 1) != 0; }
-    }
-    /// <summary>Clears the value of the "e" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearE() {
-      _hasBits0 &= ~1;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as PublicImportMessage);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(PublicImportMessage other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (E != other.E) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (HasE) hash ^= E.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (HasE) {
-        output.WriteRawTag(8);
-        output.WriteInt32(E);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (HasE) {
-        output.WriteRawTag(8);
-        output.WriteInt32(E);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (HasE) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(E);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(PublicImportMessage other) {
-      if (other == null) {
-        return;
-      }
-      if (other.HasE) {
-        E = other.E;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 8: {
-            E = input.ReadInt32();
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 8: {
-            E = input.ReadInt32();
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  #endregion
-
-}
-
-#endregion Designer generated code
diff --git a/libs/protobuf/csharp/src/Google.Protobuf.Test.TestProtos/UnittestImportPublicProto3.cs b/libs/protobuf/csharp/src/Google.Protobuf.Test.TestProtos/UnittestImportPublicProto3.cs
deleted file mode 100644
index f664c7b..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf.Test.TestProtos/UnittestImportPublicProto3.cs
+++ /dev/null
@@ -1,234 +0,0 @@
-// <auto-generated>
-//     Generated by the protocol buffer compiler.  DO NOT EDIT!
-//     source: unittest_import_public_proto3.proto
-// </auto-generated>
-#pragma warning disable 1591, 0612, 3021, 8981
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-namespace Google.Protobuf.TestProtos {
-
-  /// <summary>Holder for reflection information generated from unittest_import_public_proto3.proto</summary>
-  public static partial class UnittestImportPublicProto3Reflection {
-
-    #region Descriptor
-    /// <summary>File descriptor for unittest_import_public_proto3.proto</summary>
-    public static pbr::FileDescriptor Descriptor {
-      get { return descriptor; }
-    }
-    private static pbr::FileDescriptor descriptor;
-
-    static UnittestImportPublicProto3Reflection() {
-      byte[] descriptorData = global::System.Convert.FromBase64String(
-          string.Concat(
-            "CiN1bml0dGVzdF9pbXBvcnRfcHVibGljX3Byb3RvMy5wcm90bxIYcHJvdG9i",
-            "dWZfdW5pdHRlc3RfaW1wb3J0IiAKE1B1YmxpY0ltcG9ydE1lc3NhZ2USCQoB",
-            "ZRgBIAEoBUIdqgIaR29vZ2xlLlByb3RvYnVmLlRlc3RQcm90b3NiBnByb3Rv",
-            "Mw=="));
-      descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-          new pbr::FileDescriptor[] { },
-          new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.PublicImportMessage), global::Google.Protobuf.TestProtos.PublicImportMessage.Parser, new[]{ "E" }, null, null, null, null)
-          }));
-    }
-    #endregion
-
-  }
-  #region Messages
-  public sealed partial class PublicImportMessage : pb::IMessage<PublicImportMessage>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<PublicImportMessage> _parser = new pb::MessageParser<PublicImportMessage>(() => new PublicImportMessage());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<PublicImportMessage> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.UnittestImportPublicProto3Reflection.Descriptor.MessageTypes[0]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public PublicImportMessage() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public PublicImportMessage(PublicImportMessage other) : this() {
-      e_ = other.e_;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public PublicImportMessage Clone() {
-      return new PublicImportMessage(this);
-    }
-
-    /// <summary>Field number for the "e" field.</summary>
-    public const int EFieldNumber = 1;
-    private int e_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int E {
-      get { return e_; }
-      set {
-        e_ = value;
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as PublicImportMessage);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(PublicImportMessage other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (E != other.E) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (E != 0) hash ^= E.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (E != 0) {
-        output.WriteRawTag(8);
-        output.WriteInt32(E);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (E != 0) {
-        output.WriteRawTag(8);
-        output.WriteInt32(E);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (E != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(E);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(PublicImportMessage other) {
-      if (other == null) {
-        return;
-      }
-      if (other.E != 0) {
-        E = other.E;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 8: {
-            E = input.ReadInt32();
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 8: {
-            E = input.ReadInt32();
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  #endregion
-
-}
-
-#endregion Designer generated code
diff --git a/libs/protobuf/csharp/src/Google.Protobuf.Test.TestProtos/UnittestIssue6936A.cs b/libs/protobuf/csharp/src/Google.Protobuf.Test.TestProtos/UnittestIssue6936A.cs
deleted file mode 100644
index e7e2b42..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf.Test.TestProtos/UnittestIssue6936A.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-// <auto-generated>
-//     Generated by the protocol buffer compiler.  DO NOT EDIT!
-//     source: unittest_issue6936_a.proto
-// </auto-generated>
-#pragma warning disable 1591, 0612, 3021, 8981
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-namespace UnitTest.Issues.TestProtos {
-
-  /// <summary>Holder for reflection information generated from unittest_issue6936_a.proto</summary>
-  public static partial class UnittestIssue6936AReflection {
-
-    #region Descriptor
-    /// <summary>File descriptor for unittest_issue6936_a.proto</summary>
-    public static pbr::FileDescriptor Descriptor {
-      get { return descriptor; }
-    }
-    private static pbr::FileDescriptor descriptor;
-
-    static UnittestIssue6936AReflection() {
-      byte[] descriptorData = global::System.Convert.FromBase64String(
-          string.Concat(
-            "Chp1bml0dGVzdF9pc3N1ZTY5MzZfYS5wcm90bxIPdW5pdHRlc3RfaXNzdWVz",
-            "GiBnb29nbGUvcHJvdG9idWYvZGVzY3JpcHRvci5wcm90bzouCgNvcHQSHy5n",
-            "b29nbGUucHJvdG9idWYuTWVzc2FnZU9wdGlvbnMY0IYDIAEoCUIdqgIaVW5p",
-            "dFRlc3QuSXNzdWVzLlRlc3RQcm90b3NiBnByb3RvMw=="));
-      descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-          new pbr::FileDescriptor[] { global::Google.Protobuf.Reflection.DescriptorReflection.Descriptor, },
-          new pbr::GeneratedClrTypeInfo(null, new pb::Extension[] { UnittestIssue6936AExtensions.Opt }, null));
-    }
-    #endregion
-
-  }
-  /// <summary>Holder for extension identifiers generated from the top level of unittest_issue6936_a.proto</summary>
-  public static partial class UnittestIssue6936AExtensions {
-    public static readonly pb::Extension<global::Google.Protobuf.Reflection.MessageOptions, string> Opt =
-      new pb::Extension<global::Google.Protobuf.Reflection.MessageOptions, string>(50000, pb::FieldCodec.ForString(400002, ""));
-  }
-
-}
-
-#endregion Designer generated code
diff --git a/libs/protobuf/csharp/src/Google.Protobuf.Test.TestProtos/UnittestIssue6936B.cs b/libs/protobuf/csharp/src/Google.Protobuf.Test.TestProtos/UnittestIssue6936B.cs
deleted file mode 100644
index 21232fb..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf.Test.TestProtos/UnittestIssue6936B.cs
+++ /dev/null
@@ -1,196 +0,0 @@
-// <auto-generated>
-//     Generated by the protocol buffer compiler.  DO NOT EDIT!
-//     source: unittest_issue6936_b.proto
-// </auto-generated>
-#pragma warning disable 1591, 0612, 3021, 8981
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-namespace UnitTest.Issues.TestProtos {
-
-  /// <summary>Holder for reflection information generated from unittest_issue6936_b.proto</summary>
-  public static partial class UnittestIssue6936BReflection {
-
-    #region Descriptor
-    /// <summary>File descriptor for unittest_issue6936_b.proto</summary>
-    public static pbr::FileDescriptor Descriptor {
-      get { return descriptor; }
-    }
-    private static pbr::FileDescriptor descriptor;
-
-    static UnittestIssue6936BReflection() {
-      byte[] descriptorData = global::System.Convert.FromBase64String(
-          string.Concat(
-            "Chp1bml0dGVzdF9pc3N1ZTY5MzZfYi5wcm90bxIPdW5pdHRlc3RfaXNzdWVz",
-            "Ghp1bml0dGVzdF9pc3N1ZTY5MzZfYS5wcm90byIOCgNGb286B4K1GANmb29C",
-            "HaoCGlVuaXRUZXN0Lklzc3Vlcy5UZXN0UHJvdG9zYgZwcm90bzM="));
-      descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-          new pbr::FileDescriptor[] { global::UnitTest.Issues.TestProtos.UnittestIssue6936AReflection.Descriptor, },
-          new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::UnitTest.Issues.TestProtos.Foo), global::UnitTest.Issues.TestProtos.Foo.Parser, null, null, null, null, null)
-          }));
-    }
-    #endregion
-
-  }
-  #region Messages
-  public sealed partial class Foo : pb::IMessage<Foo>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<Foo> _parser = new pb::MessageParser<Foo>(() => new Foo());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<Foo> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::UnitTest.Issues.TestProtos.UnittestIssue6936BReflection.Descriptor.MessageTypes[0]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Foo() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Foo(Foo other) : this() {
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Foo Clone() {
-      return new Foo(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as Foo);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(Foo other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(Foo other) {
-      if (other == null) {
-        return;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-        }
-      }
-    }
-    #endif
-
-  }
-
-  #endregion
-
-}
-
-#endregion Designer generated code
diff --git a/libs/protobuf/csharp/src/Google.Protobuf.Test.TestProtos/UnittestIssue6936C.cs b/libs/protobuf/csharp/src/Google.Protobuf.Test.TestProtos/UnittestIssue6936C.cs
deleted file mode 100644
index cb53b7a..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf.Test.TestProtos/UnittestIssue6936C.cs
+++ /dev/null
@@ -1,244 +0,0 @@
-// <auto-generated>
-//     Generated by the protocol buffer compiler.  DO NOT EDIT!
-//     source: unittest_issue6936_c.proto
-// </auto-generated>
-#pragma warning disable 1591, 0612, 3021, 8981
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-namespace UnitTest.Issues.TestProtos {
-
-  /// <summary>Holder for reflection information generated from unittest_issue6936_c.proto</summary>
-  public static partial class UnittestIssue6936CReflection {
-
-    #region Descriptor
-    /// <summary>File descriptor for unittest_issue6936_c.proto</summary>
-    public static pbr::FileDescriptor Descriptor {
-      get { return descriptor; }
-    }
-    private static pbr::FileDescriptor descriptor;
-
-    static UnittestIssue6936CReflection() {
-      byte[] descriptorData = global::System.Convert.FromBase64String(
-          string.Concat(
-            "Chp1bml0dGVzdF9pc3N1ZTY5MzZfYy5wcm90bxIPdW5pdHRlc3RfaXNzdWVz",
-            "Ghp1bml0dGVzdF9pc3N1ZTY5MzZfYS5wcm90bxoadW5pdHRlc3RfaXNzdWU2",
-            "OTM2X2IucHJvdG8iMQoDQmFyEiEKA2ZvbxgBIAEoCzIULnVuaXR0ZXN0X2lz",
-            "c3Vlcy5Gb286B4K1GANiYXJCHaoCGlVuaXRUZXN0Lklzc3Vlcy5UZXN0UHJv",
-            "dG9zYgZwcm90bzM="));
-      descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-          new pbr::FileDescriptor[] { global::UnitTest.Issues.TestProtos.UnittestIssue6936AReflection.Descriptor, global::UnitTest.Issues.TestProtos.UnittestIssue6936BReflection.Descriptor, },
-          new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::UnitTest.Issues.TestProtos.Bar), global::UnitTest.Issues.TestProtos.Bar.Parser, new[]{ "Foo" }, null, null, null, null)
-          }));
-    }
-    #endregion
-
-  }
-  #region Messages
-  public sealed partial class Bar : pb::IMessage<Bar>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<Bar> _parser = new pb::MessageParser<Bar>(() => new Bar());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<Bar> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::UnitTest.Issues.TestProtos.UnittestIssue6936CReflection.Descriptor.MessageTypes[0]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Bar() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Bar(Bar other) : this() {
-      foo_ = other.foo_ != null ? other.foo_.Clone() : null;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Bar Clone() {
-      return new Bar(this);
-    }
-
-    /// <summary>Field number for the "foo" field.</summary>
-    public const int FooFieldNumber = 1;
-    private global::UnitTest.Issues.TestProtos.Foo foo_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::UnitTest.Issues.TestProtos.Foo Foo {
-      get { return foo_; }
-      set {
-        foo_ = value;
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as Bar);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(Bar other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (!object.Equals(Foo, other.Foo)) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (foo_ != null) hash ^= Foo.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (foo_ != null) {
-        output.WriteRawTag(10);
-        output.WriteMessage(Foo);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (foo_ != null) {
-        output.WriteRawTag(10);
-        output.WriteMessage(Foo);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (foo_ != null) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(Foo);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(Bar other) {
-      if (other == null) {
-        return;
-      }
-      if (other.foo_ != null) {
-        if (foo_ == null) {
-          Foo = new global::UnitTest.Issues.TestProtos.Foo();
-        }
-        Foo.MergeFrom(other.Foo);
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 10: {
-            if (foo_ == null) {
-              Foo = new global::UnitTest.Issues.TestProtos.Foo();
-            }
-            input.ReadMessage(Foo);
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 10: {
-            if (foo_ == null) {
-              Foo = new global::UnitTest.Issues.TestProtos.Foo();
-            }
-            input.ReadMessage(Foo);
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  #endregion
-
-}
-
-#endregion Designer generated code
diff --git a/libs/protobuf/csharp/src/Google.Protobuf.Test.TestProtos/UnittestIssues.cs b/libs/protobuf/csharp/src/Google.Protobuf.Test.TestProtos/UnittestIssues.cs
deleted file mode 100644
index 3fe2dd6..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf.Test.TestProtos/UnittestIssues.cs
+++ /dev/null
@@ -1,4354 +0,0 @@
-// <auto-generated>
-//     Generated by the protocol buffer compiler.  DO NOT EDIT!
-//     source: unittest_issues.proto
-// </auto-generated>
-#pragma warning disable 1591, 0612, 3021, 8981
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-namespace UnitTest.Issues.TestProtos {
-
-  /// <summary>Holder for reflection information generated from unittest_issues.proto</summary>
-  public static partial class UnittestIssuesReflection {
-
-    #region Descriptor
-    /// <summary>File descriptor for unittest_issues.proto</summary>
-    public static pbr::FileDescriptor Descriptor {
-      get { return descriptor; }
-    }
-    private static pbr::FileDescriptor descriptor;
-
-    static UnittestIssuesReflection() {
-      byte[] descriptorData = global::System.Convert.FromBase64String(
-          string.Concat(
-            "ChV1bml0dGVzdF9pc3N1ZXMucHJvdG8SD3VuaXR0ZXN0X2lzc3VlcxocZ29v",
-            "Z2xlL3Byb3RvYnVmL3N0cnVjdC5wcm90byInCghJc3N1ZTMwNxobCgpOZXN0",
-            "ZWRPbmNlGg0KC05lc3RlZFR3aWNlIrABChNOZWdhdGl2ZUVudW1NZXNzYWdl",
-            "EiwKBXZhbHVlGAEgASgOMh0udW5pdHRlc3RfaXNzdWVzLk5lZ2F0aXZlRW51",
-            "bRIxCgZ2YWx1ZXMYAiADKA4yHS51bml0dGVzdF9pc3N1ZXMuTmVnYXRpdmVF",
-            "bnVtQgIQABI4Cg1wYWNrZWRfdmFsdWVzGAMgAygOMh0udW5pdHRlc3RfaXNz",
-            "dWVzLk5lZ2F0aXZlRW51bUICEAEiEQoPRGVwcmVjYXRlZENoaWxkIrkCChdE",
-            "ZXByZWNhdGVkRmllbGRzTWVzc2FnZRIaCg5QcmltaXRpdmVWYWx1ZRgBIAEo",
-            "BUICGAESGgoOUHJpbWl0aXZlQXJyYXkYAiADKAVCAhgBEjoKDE1lc3NhZ2VW",
-            "YWx1ZRgDIAEoCzIgLnVuaXR0ZXN0X2lzc3Vlcy5EZXByZWNhdGVkQ2hpbGRC",
-            "AhgBEjoKDE1lc3NhZ2VBcnJheRgEIAMoCzIgLnVuaXR0ZXN0X2lzc3Vlcy5E",
-            "ZXByZWNhdGVkQ2hpbGRCAhgBEjYKCUVudW1WYWx1ZRgFIAEoDjIfLnVuaXR0",
-            "ZXN0X2lzc3Vlcy5EZXByZWNhdGVkRW51bUICGAESNgoJRW51bUFycmF5GAYg",
-            "AygOMh8udW5pdHRlc3RfaXNzdWVzLkRlcHJlY2F0ZWRFbnVtQgIYASIZCglJ",
-            "dGVtRmllbGQSDAoEaXRlbRgBIAEoBSJECg1SZXNlcnZlZE5hbWVzEg0KBXR5",
-            "cGVzGAEgASgFEhIKCmRlc2NyaXB0b3IYAiABKAUaEAoOU29tZU5lc3RlZFR5",
-            "cGUioAEKFVRlc3RKc29uRmllbGRPcmRlcmluZxITCgtwbGFpbl9pbnQzMhgE",
-            "IAEoBRITCglvMV9zdHJpbmcYAiABKAlIABISCghvMV9pbnQzMhgFIAEoBUgA",
-            "EhQKDHBsYWluX3N0cmluZxgBIAEoCRISCghvMl9pbnQzMhgGIAEoBUgBEhMK",
-            "CW8yX3N0cmluZxgDIAEoCUgBQgQKAm8xQgQKAm8yIksKDFRlc3RKc29uTmFt",
-            "ZRIMCgRuYW1lGAEgASgJEhkKC2Rlc2NyaXB0aW9uGAIgASgJUgRkZXNjEhIK",
-            "BGd1aWQYAyABKAlSBGV4aWQifwoMT25lb2ZNZXJnaW5nEg4KBHRleHQYASAB",
-            "KAlIABI2CgZuZXN0ZWQYAiABKAsyJC51bml0dGVzdF9pc3N1ZXMuT25lb2ZN",
-            "ZXJnaW5nLk5lc3RlZEgAGh4KBk5lc3RlZBIJCgF4GAEgASgFEgkKAXkYAiAB",
-            "KAVCBwoFdmFsdWUiawoWTnVsbFZhbHVlT3V0c2lkZVN0cnVjdBIWCgxzdHJp",
-            "bmdfdmFsdWUYASABKAlIABIwCgpudWxsX3ZhbHVlGAIgASgOMhouZ29vZ2xl",
-            "LnByb3RvYnVmLk51bGxWYWx1ZUgAQgcKBXZhbHVlIkUKE051bGxWYWx1ZU5v",
-            "dEluT25lb2YSLgoKbnVsbF92YWx1ZRgCIAEoDjIaLmdvb2dsZS5wcm90b2J1",
-            "Zi5OdWxsVmFsdWUiYAoXTWl4ZWRSZWd1bGFyQW5kT3B0aW9uYWwSFQoNcmVn",
-            "dWxhcl9maWVsZBgBIAEoCRIbCg5vcHRpb25hbF9maWVsZBgCIAEoCUgAiAEB",
-            "QhEKD19vcHRpb25hbF9maWVsZCI5ChJPbmVvZldpdGhOb25lRmllbGQSCwoB",
-            "eBgBIAEoCUgAEg4KBG5vbmUYAiABKAlIAEIGCgR0ZXN0IjUKEU9uZW9mV2l0",
-            "aE5vbmVOYW1lEgsKAXgYASABKAlIABILCgF5GAIgASgJSABCBgoEbm9uZSpV",
-            "CgxOZWdhdGl2ZUVudW0SFgoSTkVHQVRJVkVfRU5VTV9aRVJPEAASFgoJRml2",
-            "ZUJlbG93EPv//////////wESFQoITWludXNPbmUQ////////////ASouCg5E",
-            "ZXByZWNhdGVkRW51bRITCg9ERVBSRUNBVEVEX1pFUk8QABIHCgNvbmUQAUId",
-            "qgIaVW5pdFRlc3QuSXNzdWVzLlRlc3RQcm90b3NiBnByb3RvMw=="));
-      descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-          new pbr::FileDescriptor[] { global::Google.Protobuf.WellKnownTypes.StructReflection.Descriptor, },
-          new pbr::GeneratedClrTypeInfo(new[] {typeof(global::UnitTest.Issues.TestProtos.NegativeEnum), typeof(global::UnitTest.Issues.TestProtos.DeprecatedEnum), }, null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::UnitTest.Issues.TestProtos.Issue307), global::UnitTest.Issues.TestProtos.Issue307.Parser, null, null, null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::UnitTest.Issues.TestProtos.Issue307.Types.NestedOnce), global::UnitTest.Issues.TestProtos.Issue307.Types.NestedOnce.Parser, null, null, null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::UnitTest.Issues.TestProtos.Issue307.Types.NestedOnce.Types.NestedTwice), global::UnitTest.Issues.TestProtos.Issue307.Types.NestedOnce.Types.NestedTwice.Parser, null, null, null, null, null)})}),
-            new pbr::GeneratedClrTypeInfo(typeof(global::UnitTest.Issues.TestProtos.NegativeEnumMessage), global::UnitTest.Issues.TestProtos.NegativeEnumMessage.Parser, new[]{ "Value", "Values", "PackedValues" }, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::UnitTest.Issues.TestProtos.DeprecatedChild), global::UnitTest.Issues.TestProtos.DeprecatedChild.Parser, null, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::UnitTest.Issues.TestProtos.DeprecatedFieldsMessage), global::UnitTest.Issues.TestProtos.DeprecatedFieldsMessage.Parser, new[]{ "PrimitiveValue", "PrimitiveArray", "MessageValue", "MessageArray", "EnumValue", "EnumArray" }, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::UnitTest.Issues.TestProtos.ItemField), global::UnitTest.Issues.TestProtos.ItemField.Parser, new[]{ "Item" }, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::UnitTest.Issues.TestProtos.ReservedNames), global::UnitTest.Issues.TestProtos.ReservedNames.Parser, new[]{ "Types_", "Descriptor_" }, null, null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::UnitTest.Issues.TestProtos.ReservedNames.Types.SomeNestedType), global::UnitTest.Issues.TestProtos.ReservedNames.Types.SomeNestedType.Parser, null, null, null, null, null)}),
-            new pbr::GeneratedClrTypeInfo(typeof(global::UnitTest.Issues.TestProtos.TestJsonFieldOrdering), global::UnitTest.Issues.TestProtos.TestJsonFieldOrdering.Parser, new[]{ "PlainInt32", "O1String", "O1Int32", "PlainString", "O2Int32", "O2String" }, new[]{ "O1", "O2" }, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::UnitTest.Issues.TestProtos.TestJsonName), global::UnitTest.Issues.TestProtos.TestJsonName.Parser, new[]{ "Name", "Description", "Guid" }, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::UnitTest.Issues.TestProtos.OneofMerging), global::UnitTest.Issues.TestProtos.OneofMerging.Parser, new[]{ "Text", "Nested" }, new[]{ "Value" }, null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::UnitTest.Issues.TestProtos.OneofMerging.Types.Nested), global::UnitTest.Issues.TestProtos.OneofMerging.Types.Nested.Parser, new[]{ "X", "Y" }, null, null, null, null)}),
-            new pbr::GeneratedClrTypeInfo(typeof(global::UnitTest.Issues.TestProtos.NullValueOutsideStruct), global::UnitTest.Issues.TestProtos.NullValueOutsideStruct.Parser, new[]{ "StringValue", "NullValue" }, new[]{ "Value" }, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::UnitTest.Issues.TestProtos.NullValueNotInOneof), global::UnitTest.Issues.TestProtos.NullValueNotInOneof.Parser, new[]{ "NullValue" }, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::UnitTest.Issues.TestProtos.MixedRegularAndOptional), global::UnitTest.Issues.TestProtos.MixedRegularAndOptional.Parser, new[]{ "RegularField", "OptionalField" }, new[]{ "OptionalField" }, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::UnitTest.Issues.TestProtos.OneofWithNoneField), global::UnitTest.Issues.TestProtos.OneofWithNoneField.Parser, new[]{ "X", "None" }, new[]{ "Test" }, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::UnitTest.Issues.TestProtos.OneofWithNoneName), global::UnitTest.Issues.TestProtos.OneofWithNoneName.Parser, new[]{ "X", "Y" }, new[]{ "None" }, null, null, null)
-          }));
-    }
-    #endregion
-
-  }
-  #region Enums
-  public enum NegativeEnum {
-    [pbr::OriginalName("NEGATIVE_ENUM_ZERO")] Zero = 0,
-    [pbr::OriginalName("FiveBelow")] FiveBelow = -5,
-    [pbr::OriginalName("MinusOne")] MinusOne = -1,
-  }
-
-  public enum DeprecatedEnum {
-    [pbr::OriginalName("DEPRECATED_ZERO")] DeprecatedZero = 0,
-    [pbr::OriginalName("one")] One = 1,
-  }
-
-  #endregion
-
-  #region Messages
-  /// <summary>
-  /// Issue 307: when generating doubly-nested types, any references
-  /// should be of the form A.Types.B.Types.C.
-  /// </summary>
-  public sealed partial class Issue307 : pb::IMessage<Issue307>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<Issue307> _parser = new pb::MessageParser<Issue307>(() => new Issue307());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<Issue307> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::UnitTest.Issues.TestProtos.UnittestIssuesReflection.Descriptor.MessageTypes[0]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Issue307() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Issue307(Issue307 other) : this() {
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Issue307 Clone() {
-      return new Issue307(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as Issue307);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(Issue307 other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(Issue307 other) {
-      if (other == null) {
-        return;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-        }
-      }
-    }
-    #endif
-
-    #region Nested types
-    /// <summary>Container for nested types declared in the Issue307 message type.</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static partial class Types {
-      public sealed partial class NestedOnce : pb::IMessage<NestedOnce>
-      #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          , pb::IBufferMessage
-      #endif
-      {
-        private static readonly pb::MessageParser<NestedOnce> _parser = new pb::MessageParser<NestedOnce>(() => new NestedOnce());
-        private pb::UnknownFieldSet _unknownFields;
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static pb::MessageParser<NestedOnce> Parser { get { return _parser; } }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static pbr::MessageDescriptor Descriptor {
-          get { return global::UnitTest.Issues.TestProtos.Issue307.Descriptor.NestedTypes[0]; }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        pbr::MessageDescriptor pb::IMessage.Descriptor {
-          get { return Descriptor; }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public NestedOnce() {
-          OnConstruction();
-        }
-
-        partial void OnConstruction();
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public NestedOnce(NestedOnce other) : this() {
-          _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public NestedOnce Clone() {
-          return new NestedOnce(this);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override bool Equals(object other) {
-          return Equals(other as NestedOnce);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool Equals(NestedOnce other) {
-          if (ReferenceEquals(other, null)) {
-            return false;
-          }
-          if (ReferenceEquals(other, this)) {
-            return true;
-          }
-          return Equals(_unknownFields, other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override int GetHashCode() {
-          int hash = 1;
-          if (_unknownFields != null) {
-            hash ^= _unknownFields.GetHashCode();
-          }
-          return hash;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override string ToString() {
-          return pb::JsonFormatter.ToDiagnosticString(this);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void WriteTo(pb::CodedOutputStream output) {
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          output.WriteRawMessage(this);
-        #else
-          if (_unknownFields != null) {
-            _unknownFields.WriteTo(output);
-          }
-        #endif
-        }
-
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-          if (_unknownFields != null) {
-            _unknownFields.WriteTo(ref output);
-          }
-        }
-        #endif
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public int CalculateSize() {
-          int size = 0;
-          if (_unknownFields != null) {
-            size += _unknownFields.CalculateSize();
-          }
-          return size;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(NestedOnce other) {
-          if (other == null) {
-            return;
-          }
-          _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(pb::CodedInputStream input) {
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          input.ReadRawMessage(this);
-        #else
-          uint tag;
-          while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
-              default:
-                _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-                break;
-            }
-          }
-        #endif
-        }
-
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-          uint tag;
-          while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
-              default:
-                _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-                break;
-            }
-          }
-        }
-        #endif
-
-        #region Nested types
-        /// <summary>Container for nested types declared in the NestedOnce message type.</summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static partial class Types {
-          public sealed partial class NestedTwice : pb::IMessage<NestedTwice>
-          #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-              , pb::IBufferMessage
-          #endif
-          {
-            private static readonly pb::MessageParser<NestedTwice> _parser = new pb::MessageParser<NestedTwice>(() => new NestedTwice());
-            private pb::UnknownFieldSet _unknownFields;
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-            [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-            public static pb::MessageParser<NestedTwice> Parser { get { return _parser; } }
-
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-            [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-            public static pbr::MessageDescriptor Descriptor {
-              get { return global::UnitTest.Issues.TestProtos.Issue307.Types.NestedOnce.Descriptor.NestedTypes[0]; }
-            }
-
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-            [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-            pbr::MessageDescriptor pb::IMessage.Descriptor {
-              get { return Descriptor; }
-            }
-
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-            [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-            public NestedTwice() {
-              OnConstruction();
-            }
-
-            partial void OnConstruction();
-
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-            [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-            public NestedTwice(NestedTwice other) : this() {
-              _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-            }
-
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-            [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-            public NestedTwice Clone() {
-              return new NestedTwice(this);
-            }
-
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-            [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-            public override bool Equals(object other) {
-              return Equals(other as NestedTwice);
-            }
-
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-            [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-            public bool Equals(NestedTwice other) {
-              if (ReferenceEquals(other, null)) {
-                return false;
-              }
-              if (ReferenceEquals(other, this)) {
-                return true;
-              }
-              return Equals(_unknownFields, other._unknownFields);
-            }
-
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-            [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-            public override int GetHashCode() {
-              int hash = 1;
-              if (_unknownFields != null) {
-                hash ^= _unknownFields.GetHashCode();
-              }
-              return hash;
-            }
-
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-            [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-            public override string ToString() {
-              return pb::JsonFormatter.ToDiagnosticString(this);
-            }
-
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-            [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-            public void WriteTo(pb::CodedOutputStream output) {
-            #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-              output.WriteRawMessage(this);
-            #else
-              if (_unknownFields != null) {
-                _unknownFields.WriteTo(output);
-              }
-            #endif
-            }
-
-            #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-            [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-            void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-              if (_unknownFields != null) {
-                _unknownFields.WriteTo(ref output);
-              }
-            }
-            #endif
-
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-            [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-            public int CalculateSize() {
-              int size = 0;
-              if (_unknownFields != null) {
-                size += _unknownFields.CalculateSize();
-              }
-              return size;
-            }
-
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-            [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-            public void MergeFrom(NestedTwice other) {
-              if (other == null) {
-                return;
-              }
-              _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-            }
-
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-            [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-            public void MergeFrom(pb::CodedInputStream input) {
-            #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-              input.ReadRawMessage(this);
-            #else
-              uint tag;
-              while ((tag = input.ReadTag()) != 0) {
-                switch(tag) {
-                  default:
-                    _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-                    break;
-                }
-              }
-            #endif
-            }
-
-            #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-            [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-            [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-            void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-              uint tag;
-              while ((tag = input.ReadTag()) != 0) {
-                switch(tag) {
-                  default:
-                    _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-                    break;
-                }
-              }
-            }
-            #endif
-
-          }
-
-        }
-        #endregion
-
-      }
-
-    }
-    #endregion
-
-  }
-
-  public sealed partial class NegativeEnumMessage : pb::IMessage<NegativeEnumMessage>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<NegativeEnumMessage> _parser = new pb::MessageParser<NegativeEnumMessage>(() => new NegativeEnumMessage());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<NegativeEnumMessage> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::UnitTest.Issues.TestProtos.UnittestIssuesReflection.Descriptor.MessageTypes[1]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public NegativeEnumMessage() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public NegativeEnumMessage(NegativeEnumMessage other) : this() {
-      value_ = other.value_;
-      values_ = other.values_.Clone();
-      packedValues_ = other.packedValues_.Clone();
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public NegativeEnumMessage Clone() {
-      return new NegativeEnumMessage(this);
-    }
-
-    /// <summary>Field number for the "value" field.</summary>
-    public const int ValueFieldNumber = 1;
-    private global::UnitTest.Issues.TestProtos.NegativeEnum value_ = global::UnitTest.Issues.TestProtos.NegativeEnum.Zero;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::UnitTest.Issues.TestProtos.NegativeEnum Value {
-      get { return value_; }
-      set {
-        value_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "values" field.</summary>
-    public const int ValuesFieldNumber = 2;
-    private static readonly pb::FieldCodec<global::UnitTest.Issues.TestProtos.NegativeEnum> _repeated_values_codec
-        = pb::FieldCodec.ForEnum(16, x => (int) x, x => (global::UnitTest.Issues.TestProtos.NegativeEnum) x);
-    private readonly pbc::RepeatedField<global::UnitTest.Issues.TestProtos.NegativeEnum> values_ = new pbc::RepeatedField<global::UnitTest.Issues.TestProtos.NegativeEnum>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::UnitTest.Issues.TestProtos.NegativeEnum> Values {
-      get { return values_; }
-    }
-
-    /// <summary>Field number for the "packed_values" field.</summary>
-    public const int PackedValuesFieldNumber = 3;
-    private static readonly pb::FieldCodec<global::UnitTest.Issues.TestProtos.NegativeEnum> _repeated_packedValues_codec
-        = pb::FieldCodec.ForEnum(26, x => (int) x, x => (global::UnitTest.Issues.TestProtos.NegativeEnum) x);
-    private readonly pbc::RepeatedField<global::UnitTest.Issues.TestProtos.NegativeEnum> packedValues_ = new pbc::RepeatedField<global::UnitTest.Issues.TestProtos.NegativeEnum>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::UnitTest.Issues.TestProtos.NegativeEnum> PackedValues {
-      get { return packedValues_; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as NegativeEnumMessage);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(NegativeEnumMessage other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (Value != other.Value) return false;
-      if(!values_.Equals(other.values_)) return false;
-      if(!packedValues_.Equals(other.packedValues_)) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (Value != global::UnitTest.Issues.TestProtos.NegativeEnum.Zero) hash ^= Value.GetHashCode();
-      hash ^= values_.GetHashCode();
-      hash ^= packedValues_.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (Value != global::UnitTest.Issues.TestProtos.NegativeEnum.Zero) {
-        output.WriteRawTag(8);
-        output.WriteEnum((int) Value);
-      }
-      values_.WriteTo(output, _repeated_values_codec);
-      packedValues_.WriteTo(output, _repeated_packedValues_codec);
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (Value != global::UnitTest.Issues.TestProtos.NegativeEnum.Zero) {
-        output.WriteRawTag(8);
-        output.WriteEnum((int) Value);
-      }
-      values_.WriteTo(ref output, _repeated_values_codec);
-      packedValues_.WriteTo(ref output, _repeated_packedValues_codec);
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (Value != global::UnitTest.Issues.TestProtos.NegativeEnum.Zero) {
-        size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Value);
-      }
-      size += values_.CalculateSize(_repeated_values_codec);
-      size += packedValues_.CalculateSize(_repeated_packedValues_codec);
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(NegativeEnumMessage other) {
-      if (other == null) {
-        return;
-      }
-      if (other.Value != global::UnitTest.Issues.TestProtos.NegativeEnum.Zero) {
-        Value = other.Value;
-      }
-      values_.Add(other.values_);
-      packedValues_.Add(other.packedValues_);
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 8: {
-            Value = (global::UnitTest.Issues.TestProtos.NegativeEnum) input.ReadEnum();
-            break;
-          }
-          case 18:
-          case 16: {
-            values_.AddEntriesFrom(input, _repeated_values_codec);
-            break;
-          }
-          case 26:
-          case 24: {
-            packedValues_.AddEntriesFrom(input, _repeated_packedValues_codec);
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 8: {
-            Value = (global::UnitTest.Issues.TestProtos.NegativeEnum) input.ReadEnum();
-            break;
-          }
-          case 18:
-          case 16: {
-            values_.AddEntriesFrom(ref input, _repeated_values_codec);
-            break;
-          }
-          case 26:
-          case 24: {
-            packedValues_.AddEntriesFrom(ref input, _repeated_packedValues_codec);
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  public sealed partial class DeprecatedChild : pb::IMessage<DeprecatedChild>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<DeprecatedChild> _parser = new pb::MessageParser<DeprecatedChild>(() => new DeprecatedChild());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<DeprecatedChild> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::UnitTest.Issues.TestProtos.UnittestIssuesReflection.Descriptor.MessageTypes[2]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public DeprecatedChild() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public DeprecatedChild(DeprecatedChild other) : this() {
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public DeprecatedChild Clone() {
-      return new DeprecatedChild(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as DeprecatedChild);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(DeprecatedChild other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(DeprecatedChild other) {
-      if (other == null) {
-        return;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-        }
-      }
-    }
-    #endif
-
-  }
-
-  public sealed partial class DeprecatedFieldsMessage : pb::IMessage<DeprecatedFieldsMessage>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<DeprecatedFieldsMessage> _parser = new pb::MessageParser<DeprecatedFieldsMessage>(() => new DeprecatedFieldsMessage());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<DeprecatedFieldsMessage> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::UnitTest.Issues.TestProtos.UnittestIssuesReflection.Descriptor.MessageTypes[3]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public DeprecatedFieldsMessage() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public DeprecatedFieldsMessage(DeprecatedFieldsMessage other) : this() {
-      primitiveValue_ = other.primitiveValue_;
-      primitiveArray_ = other.primitiveArray_.Clone();
-      messageValue_ = other.messageValue_ != null ? other.messageValue_.Clone() : null;
-      messageArray_ = other.messageArray_.Clone();
-      enumValue_ = other.enumValue_;
-      enumArray_ = other.enumArray_.Clone();
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public DeprecatedFieldsMessage Clone() {
-      return new DeprecatedFieldsMessage(this);
-    }
-
-    /// <summary>Field number for the "PrimitiveValue" field.</summary>
-    public const int PrimitiveValueFieldNumber = 1;
-    private int primitiveValue_;
-    [global::System.ObsoleteAttribute]
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int PrimitiveValue {
-      get { return primitiveValue_; }
-      set {
-        primitiveValue_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "PrimitiveArray" field.</summary>
-    public const int PrimitiveArrayFieldNumber = 2;
-    private static readonly pb::FieldCodec<int> _repeated_primitiveArray_codec
-        = pb::FieldCodec.ForInt32(18);
-    private readonly pbc::RepeatedField<int> primitiveArray_ = new pbc::RepeatedField<int>();
-    [global::System.ObsoleteAttribute]
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<int> PrimitiveArray {
-      get { return primitiveArray_; }
-    }
-
-    /// <summary>Field number for the "MessageValue" field.</summary>
-    public const int MessageValueFieldNumber = 3;
-    private global::UnitTest.Issues.TestProtos.DeprecatedChild messageValue_;
-    [global::System.ObsoleteAttribute]
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::UnitTest.Issues.TestProtos.DeprecatedChild MessageValue {
-      get { return messageValue_; }
-      set {
-        messageValue_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "MessageArray" field.</summary>
-    public const int MessageArrayFieldNumber = 4;
-    private static readonly pb::FieldCodec<global::UnitTest.Issues.TestProtos.DeprecatedChild> _repeated_messageArray_codec
-        = pb::FieldCodec.ForMessage(34, global::UnitTest.Issues.TestProtos.DeprecatedChild.Parser);
-    private readonly pbc::RepeatedField<global::UnitTest.Issues.TestProtos.DeprecatedChild> messageArray_ = new pbc::RepeatedField<global::UnitTest.Issues.TestProtos.DeprecatedChild>();
-    [global::System.ObsoleteAttribute]
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::UnitTest.Issues.TestProtos.DeprecatedChild> MessageArray {
-      get { return messageArray_; }
-    }
-
-    /// <summary>Field number for the "EnumValue" field.</summary>
-    public const int EnumValueFieldNumber = 5;
-    private global::UnitTest.Issues.TestProtos.DeprecatedEnum enumValue_ = global::UnitTest.Issues.TestProtos.DeprecatedEnum.DeprecatedZero;
-    [global::System.ObsoleteAttribute]
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::UnitTest.Issues.TestProtos.DeprecatedEnum EnumValue {
-      get { return enumValue_; }
-      set {
-        enumValue_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "EnumArray" field.</summary>
-    public const int EnumArrayFieldNumber = 6;
-    private static readonly pb::FieldCodec<global::UnitTest.Issues.TestProtos.DeprecatedEnum> _repeated_enumArray_codec
-        = pb::FieldCodec.ForEnum(50, x => (int) x, x => (global::UnitTest.Issues.TestProtos.DeprecatedEnum) x);
-    private readonly pbc::RepeatedField<global::UnitTest.Issues.TestProtos.DeprecatedEnum> enumArray_ = new pbc::RepeatedField<global::UnitTest.Issues.TestProtos.DeprecatedEnum>();
-    [global::System.ObsoleteAttribute]
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::UnitTest.Issues.TestProtos.DeprecatedEnum> EnumArray {
-      get { return enumArray_; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as DeprecatedFieldsMessage);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(DeprecatedFieldsMessage other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (PrimitiveValue != other.PrimitiveValue) return false;
-      if(!primitiveArray_.Equals(other.primitiveArray_)) return false;
-      if (!object.Equals(MessageValue, other.MessageValue)) return false;
-      if(!messageArray_.Equals(other.messageArray_)) return false;
-      if (EnumValue != other.EnumValue) return false;
-      if(!enumArray_.Equals(other.enumArray_)) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (PrimitiveValue != 0) hash ^= PrimitiveValue.GetHashCode();
-      hash ^= primitiveArray_.GetHashCode();
-      if (messageValue_ != null) hash ^= MessageValue.GetHashCode();
-      hash ^= messageArray_.GetHashCode();
-      if (EnumValue != global::UnitTest.Issues.TestProtos.DeprecatedEnum.DeprecatedZero) hash ^= EnumValue.GetHashCode();
-      hash ^= enumArray_.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (PrimitiveValue != 0) {
-        output.WriteRawTag(8);
-        output.WriteInt32(PrimitiveValue);
-      }
-      primitiveArray_.WriteTo(output, _repeated_primitiveArray_codec);
-      if (messageValue_ != null) {
-        output.WriteRawTag(26);
-        output.WriteMessage(MessageValue);
-      }
-      messageArray_.WriteTo(output, _repeated_messageArray_codec);
-      if (EnumValue != global::UnitTest.Issues.TestProtos.DeprecatedEnum.DeprecatedZero) {
-        output.WriteRawTag(40);
-        output.WriteEnum((int) EnumValue);
-      }
-      enumArray_.WriteTo(output, _repeated_enumArray_codec);
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (PrimitiveValue != 0) {
-        output.WriteRawTag(8);
-        output.WriteInt32(PrimitiveValue);
-      }
-      primitiveArray_.WriteTo(ref output, _repeated_primitiveArray_codec);
-      if (messageValue_ != null) {
-        output.WriteRawTag(26);
-        output.WriteMessage(MessageValue);
-      }
-      messageArray_.WriteTo(ref output, _repeated_messageArray_codec);
-      if (EnumValue != global::UnitTest.Issues.TestProtos.DeprecatedEnum.DeprecatedZero) {
-        output.WriteRawTag(40);
-        output.WriteEnum((int) EnumValue);
-      }
-      enumArray_.WriteTo(ref output, _repeated_enumArray_codec);
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (PrimitiveValue != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(PrimitiveValue);
-      }
-      size += primitiveArray_.CalculateSize(_repeated_primitiveArray_codec);
-      if (messageValue_ != null) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(MessageValue);
-      }
-      size += messageArray_.CalculateSize(_repeated_messageArray_codec);
-      if (EnumValue != global::UnitTest.Issues.TestProtos.DeprecatedEnum.DeprecatedZero) {
-        size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) EnumValue);
-      }
-      size += enumArray_.CalculateSize(_repeated_enumArray_codec);
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(DeprecatedFieldsMessage other) {
-      if (other == null) {
-        return;
-      }
-      if (other.PrimitiveValue != 0) {
-        PrimitiveValue = other.PrimitiveValue;
-      }
-      primitiveArray_.Add(other.primitiveArray_);
-      if (other.messageValue_ != null) {
-        if (messageValue_ == null) {
-          MessageValue = new global::UnitTest.Issues.TestProtos.DeprecatedChild();
-        }
-        MessageValue.MergeFrom(other.MessageValue);
-      }
-      messageArray_.Add(other.messageArray_);
-      if (other.EnumValue != global::UnitTest.Issues.TestProtos.DeprecatedEnum.DeprecatedZero) {
-        EnumValue = other.EnumValue;
-      }
-      enumArray_.Add(other.enumArray_);
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 8: {
-            PrimitiveValue = input.ReadInt32();
-            break;
-          }
-          case 18:
-          case 16: {
-            primitiveArray_.AddEntriesFrom(input, _repeated_primitiveArray_codec);
-            break;
-          }
-          case 26: {
-            if (messageValue_ == null) {
-              MessageValue = new global::UnitTest.Issues.TestProtos.DeprecatedChild();
-            }
-            input.ReadMessage(MessageValue);
-            break;
-          }
-          case 34: {
-            messageArray_.AddEntriesFrom(input, _repeated_messageArray_codec);
-            break;
-          }
-          case 40: {
-            EnumValue = (global::UnitTest.Issues.TestProtos.DeprecatedEnum) input.ReadEnum();
-            break;
-          }
-          case 50:
-          case 48: {
-            enumArray_.AddEntriesFrom(input, _repeated_enumArray_codec);
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 8: {
-            PrimitiveValue = input.ReadInt32();
-            break;
-          }
-          case 18:
-          case 16: {
-            primitiveArray_.AddEntriesFrom(ref input, _repeated_primitiveArray_codec);
-            break;
-          }
-          case 26: {
-            if (messageValue_ == null) {
-              MessageValue = new global::UnitTest.Issues.TestProtos.DeprecatedChild();
-            }
-            input.ReadMessage(MessageValue);
-            break;
-          }
-          case 34: {
-            messageArray_.AddEntriesFrom(ref input, _repeated_messageArray_codec);
-            break;
-          }
-          case 40: {
-            EnumValue = (global::UnitTest.Issues.TestProtos.DeprecatedEnum) input.ReadEnum();
-            break;
-          }
-          case 50:
-          case 48: {
-            enumArray_.AddEntriesFrom(ref input, _repeated_enumArray_codec);
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  /// <summary>
-  /// Issue 45: http://code.google.com/p/protobuf-csharp-port/issues/detail?id=45
-  /// </summary>
-  public sealed partial class ItemField : pb::IMessage<ItemField>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<ItemField> _parser = new pb::MessageParser<ItemField>(() => new ItemField());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<ItemField> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::UnitTest.Issues.TestProtos.UnittestIssuesReflection.Descriptor.MessageTypes[4]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ItemField() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ItemField(ItemField other) : this() {
-      item_ = other.item_;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ItemField Clone() {
-      return new ItemField(this);
-    }
-
-    /// <summary>Field number for the "item" field.</summary>
-    public const int ItemFieldNumber = 1;
-    private int item_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int Item {
-      get { return item_; }
-      set {
-        item_ = value;
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as ItemField);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(ItemField other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (Item != other.Item) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (Item != 0) hash ^= Item.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (Item != 0) {
-        output.WriteRawTag(8);
-        output.WriteInt32(Item);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (Item != 0) {
-        output.WriteRawTag(8);
-        output.WriteInt32(Item);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (Item != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(Item);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(ItemField other) {
-      if (other == null) {
-        return;
-      }
-      if (other.Item != 0) {
-        Item = other.Item;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 8: {
-            Item = input.ReadInt32();
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 8: {
-            Item = input.ReadInt32();
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  public sealed partial class ReservedNames : pb::IMessage<ReservedNames>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<ReservedNames> _parser = new pb::MessageParser<ReservedNames>(() => new ReservedNames());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<ReservedNames> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::UnitTest.Issues.TestProtos.UnittestIssuesReflection.Descriptor.MessageTypes[5]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ReservedNames() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ReservedNames(ReservedNames other) : this() {
-      types_ = other.types_;
-      descriptor_ = other.descriptor_;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ReservedNames Clone() {
-      return new ReservedNames(this);
-    }
-
-    /// <summary>Field number for the "types" field.</summary>
-    public const int Types_FieldNumber = 1;
-    private int types_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int Types_ {
-      get { return types_; }
-      set {
-        types_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "descriptor" field.</summary>
-    public const int Descriptor_FieldNumber = 2;
-    private int descriptor_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int Descriptor_ {
-      get { return descriptor_; }
-      set {
-        descriptor_ = value;
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as ReservedNames);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(ReservedNames other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (Types_ != other.Types_) return false;
-      if (Descriptor_ != other.Descriptor_) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (Types_ != 0) hash ^= Types_.GetHashCode();
-      if (Descriptor_ != 0) hash ^= Descriptor_.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (Types_ != 0) {
-        output.WriteRawTag(8);
-        output.WriteInt32(Types_);
-      }
-      if (Descriptor_ != 0) {
-        output.WriteRawTag(16);
-        output.WriteInt32(Descriptor_);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (Types_ != 0) {
-        output.WriteRawTag(8);
-        output.WriteInt32(Types_);
-      }
-      if (Descriptor_ != 0) {
-        output.WriteRawTag(16);
-        output.WriteInt32(Descriptor_);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (Types_ != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(Types_);
-      }
-      if (Descriptor_ != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(Descriptor_);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(ReservedNames other) {
-      if (other == null) {
-        return;
-      }
-      if (other.Types_ != 0) {
-        Types_ = other.Types_;
-      }
-      if (other.Descriptor_ != 0) {
-        Descriptor_ = other.Descriptor_;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 8: {
-            Types_ = input.ReadInt32();
-            break;
-          }
-          case 16: {
-            Descriptor_ = input.ReadInt32();
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 8: {
-            Types_ = input.ReadInt32();
-            break;
-          }
-          case 16: {
-            Descriptor_ = input.ReadInt32();
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-    #region Nested types
-    /// <summary>Container for nested types declared in the ReservedNames message type.</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static partial class Types {
-      /// <summary>
-      /// Force a nested type called Types
-      /// </summary>
-      public sealed partial class SomeNestedType : pb::IMessage<SomeNestedType>
-      #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          , pb::IBufferMessage
-      #endif
-      {
-        private static readonly pb::MessageParser<SomeNestedType> _parser = new pb::MessageParser<SomeNestedType>(() => new SomeNestedType());
-        private pb::UnknownFieldSet _unknownFields;
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static pb::MessageParser<SomeNestedType> Parser { get { return _parser; } }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static pbr::MessageDescriptor Descriptor {
-          get { return global::UnitTest.Issues.TestProtos.ReservedNames.Descriptor.NestedTypes[0]; }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        pbr::MessageDescriptor pb::IMessage.Descriptor {
-          get { return Descriptor; }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public SomeNestedType() {
-          OnConstruction();
-        }
-
-        partial void OnConstruction();
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public SomeNestedType(SomeNestedType other) : this() {
-          _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public SomeNestedType Clone() {
-          return new SomeNestedType(this);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override bool Equals(object other) {
-          return Equals(other as SomeNestedType);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool Equals(SomeNestedType other) {
-          if (ReferenceEquals(other, null)) {
-            return false;
-          }
-          if (ReferenceEquals(other, this)) {
-            return true;
-          }
-          return Equals(_unknownFields, other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override int GetHashCode() {
-          int hash = 1;
-          if (_unknownFields != null) {
-            hash ^= _unknownFields.GetHashCode();
-          }
-          return hash;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override string ToString() {
-          return pb::JsonFormatter.ToDiagnosticString(this);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void WriteTo(pb::CodedOutputStream output) {
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          output.WriteRawMessage(this);
-        #else
-          if (_unknownFields != null) {
-            _unknownFields.WriteTo(output);
-          }
-        #endif
-        }
-
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-          if (_unknownFields != null) {
-            _unknownFields.WriteTo(ref output);
-          }
-        }
-        #endif
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public int CalculateSize() {
-          int size = 0;
-          if (_unknownFields != null) {
-            size += _unknownFields.CalculateSize();
-          }
-          return size;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(SomeNestedType other) {
-          if (other == null) {
-            return;
-          }
-          _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(pb::CodedInputStream input) {
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          input.ReadRawMessage(this);
-        #else
-          uint tag;
-          while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
-              default:
-                _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-                break;
-            }
-          }
-        #endif
-        }
-
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-          uint tag;
-          while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
-              default:
-                _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-                break;
-            }
-          }
-        }
-        #endif
-
-      }
-
-    }
-    #endregion
-
-  }
-
-  /// <summary>
-  /// These fields are deliberately not declared in numeric
-  /// order, and the oneof fields aren't contiguous either.
-  /// This allows for reasonably robust tests of JSON output
-  /// ordering.
-  /// TestFieldOrderings in unittest_proto3.proto is similar,
-  /// but doesn't include oneofs.
-  /// TODO: Consider adding oneofs to TestFieldOrderings, although
-  /// that will require fixing other tests in multiple platforms.
-  /// Alternatively, consider just adding this to
-  /// unittest_proto3.proto if multiple platforms want it.
-  /// </summary>
-  public sealed partial class TestJsonFieldOrdering : pb::IMessage<TestJsonFieldOrdering>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<TestJsonFieldOrdering> _parser = new pb::MessageParser<TestJsonFieldOrdering>(() => new TestJsonFieldOrdering());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<TestJsonFieldOrdering> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::UnitTest.Issues.TestProtos.UnittestIssuesReflection.Descriptor.MessageTypes[6]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestJsonFieldOrdering() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestJsonFieldOrdering(TestJsonFieldOrdering other) : this() {
-      plainInt32_ = other.plainInt32_;
-      plainString_ = other.plainString_;
-      switch (other.O1Case) {
-        case O1OneofCase.O1String:
-          O1String = other.O1String;
-          break;
-        case O1OneofCase.O1Int32:
-          O1Int32 = other.O1Int32;
-          break;
-      }
-
-      switch (other.O2Case) {
-        case O2OneofCase.O2Int32:
-          O2Int32 = other.O2Int32;
-          break;
-        case O2OneofCase.O2String:
-          O2String = other.O2String;
-          break;
-      }
-
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestJsonFieldOrdering Clone() {
-      return new TestJsonFieldOrdering(this);
-    }
-
-    /// <summary>Field number for the "plain_int32" field.</summary>
-    public const int PlainInt32FieldNumber = 4;
-    private int plainInt32_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int PlainInt32 {
-      get { return plainInt32_; }
-      set {
-        plainInt32_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "o1_string" field.</summary>
-    public const int O1StringFieldNumber = 2;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string O1String {
-      get { return o1Case_ == O1OneofCase.O1String ? (string) o1_ : ""; }
-      set {
-        o1_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-        o1Case_ = O1OneofCase.O1String;
-      }
-    }
-
-    /// <summary>Field number for the "o1_int32" field.</summary>
-    public const int O1Int32FieldNumber = 5;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int O1Int32 {
-      get { return o1Case_ == O1OneofCase.O1Int32 ? (int) o1_ : 0; }
-      set {
-        o1_ = value;
-        o1Case_ = O1OneofCase.O1Int32;
-      }
-    }
-
-    /// <summary>Field number for the "plain_string" field.</summary>
-    public const int PlainStringFieldNumber = 1;
-    private string plainString_ = "";
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string PlainString {
-      get { return plainString_; }
-      set {
-        plainString_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-
-    /// <summary>Field number for the "o2_int32" field.</summary>
-    public const int O2Int32FieldNumber = 6;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int O2Int32 {
-      get { return o2Case_ == O2OneofCase.O2Int32 ? (int) o2_ : 0; }
-      set {
-        o2_ = value;
-        o2Case_ = O2OneofCase.O2Int32;
-      }
-    }
-
-    /// <summary>Field number for the "o2_string" field.</summary>
-    public const int O2StringFieldNumber = 3;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string O2String {
-      get { return o2Case_ == O2OneofCase.O2String ? (string) o2_ : ""; }
-      set {
-        o2_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-        o2Case_ = O2OneofCase.O2String;
-      }
-    }
-
-    private object o1_;
-    /// <summary>Enum of possible cases for the "o1" oneof.</summary>
-    public enum O1OneofCase {
-      None = 0,
-      O1String = 2,
-      O1Int32 = 5,
-    }
-    private O1OneofCase o1Case_ = O1OneofCase.None;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public O1OneofCase O1Case {
-      get { return o1Case_; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearO1() {
-      o1Case_ = O1OneofCase.None;
-      o1_ = null;
-    }
-
-    private object o2_;
-    /// <summary>Enum of possible cases for the "o2" oneof.</summary>
-    public enum O2OneofCase {
-      None = 0,
-      O2Int32 = 6,
-      O2String = 3,
-    }
-    private O2OneofCase o2Case_ = O2OneofCase.None;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public O2OneofCase O2Case {
-      get { return o2Case_; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearO2() {
-      o2Case_ = O2OneofCase.None;
-      o2_ = null;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as TestJsonFieldOrdering);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(TestJsonFieldOrdering other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (PlainInt32 != other.PlainInt32) return false;
-      if (O1String != other.O1String) return false;
-      if (O1Int32 != other.O1Int32) return false;
-      if (PlainString != other.PlainString) return false;
-      if (O2Int32 != other.O2Int32) return false;
-      if (O2String != other.O2String) return false;
-      if (O1Case != other.O1Case) return false;
-      if (O2Case != other.O2Case) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (PlainInt32 != 0) hash ^= PlainInt32.GetHashCode();
-      if (o1Case_ == O1OneofCase.O1String) hash ^= O1String.GetHashCode();
-      if (o1Case_ == O1OneofCase.O1Int32) hash ^= O1Int32.GetHashCode();
-      if (PlainString.Length != 0) hash ^= PlainString.GetHashCode();
-      if (o2Case_ == O2OneofCase.O2Int32) hash ^= O2Int32.GetHashCode();
-      if (o2Case_ == O2OneofCase.O2String) hash ^= O2String.GetHashCode();
-      hash ^= (int) o1Case_;
-      hash ^= (int) o2Case_;
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (PlainString.Length != 0) {
-        output.WriteRawTag(10);
-        output.WriteString(PlainString);
-      }
-      if (o1Case_ == O1OneofCase.O1String) {
-        output.WriteRawTag(18);
-        output.WriteString(O1String);
-      }
-      if (o2Case_ == O2OneofCase.O2String) {
-        output.WriteRawTag(26);
-        output.WriteString(O2String);
-      }
-      if (PlainInt32 != 0) {
-        output.WriteRawTag(32);
-        output.WriteInt32(PlainInt32);
-      }
-      if (o1Case_ == O1OneofCase.O1Int32) {
-        output.WriteRawTag(40);
-        output.WriteInt32(O1Int32);
-      }
-      if (o2Case_ == O2OneofCase.O2Int32) {
-        output.WriteRawTag(48);
-        output.WriteInt32(O2Int32);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (PlainString.Length != 0) {
-        output.WriteRawTag(10);
-        output.WriteString(PlainString);
-      }
-      if (o1Case_ == O1OneofCase.O1String) {
-        output.WriteRawTag(18);
-        output.WriteString(O1String);
-      }
-      if (o2Case_ == O2OneofCase.O2String) {
-        output.WriteRawTag(26);
-        output.WriteString(O2String);
-      }
-      if (PlainInt32 != 0) {
-        output.WriteRawTag(32);
-        output.WriteInt32(PlainInt32);
-      }
-      if (o1Case_ == O1OneofCase.O1Int32) {
-        output.WriteRawTag(40);
-        output.WriteInt32(O1Int32);
-      }
-      if (o2Case_ == O2OneofCase.O2Int32) {
-        output.WriteRawTag(48);
-        output.WriteInt32(O2Int32);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (PlainInt32 != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(PlainInt32);
-      }
-      if (o1Case_ == O1OneofCase.O1String) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(O1String);
-      }
-      if (o1Case_ == O1OneofCase.O1Int32) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(O1Int32);
-      }
-      if (PlainString.Length != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(PlainString);
-      }
-      if (o2Case_ == O2OneofCase.O2Int32) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(O2Int32);
-      }
-      if (o2Case_ == O2OneofCase.O2String) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(O2String);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(TestJsonFieldOrdering other) {
-      if (other == null) {
-        return;
-      }
-      if (other.PlainInt32 != 0) {
-        PlainInt32 = other.PlainInt32;
-      }
-      if (other.PlainString.Length != 0) {
-        PlainString = other.PlainString;
-      }
-      switch (other.O1Case) {
-        case O1OneofCase.O1String:
-          O1String = other.O1String;
-          break;
-        case O1OneofCase.O1Int32:
-          O1Int32 = other.O1Int32;
-          break;
-      }
-
-      switch (other.O2Case) {
-        case O2OneofCase.O2Int32:
-          O2Int32 = other.O2Int32;
-          break;
-        case O2OneofCase.O2String:
-          O2String = other.O2String;
-          break;
-      }
-
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 10: {
-            PlainString = input.ReadString();
-            break;
-          }
-          case 18: {
-            O1String = input.ReadString();
-            break;
-          }
-          case 26: {
-            O2String = input.ReadString();
-            break;
-          }
-          case 32: {
-            PlainInt32 = input.ReadInt32();
-            break;
-          }
-          case 40: {
-            O1Int32 = input.ReadInt32();
-            break;
-          }
-          case 48: {
-            O2Int32 = input.ReadInt32();
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 10: {
-            PlainString = input.ReadString();
-            break;
-          }
-          case 18: {
-            O1String = input.ReadString();
-            break;
-          }
-          case 26: {
-            O2String = input.ReadString();
-            break;
-          }
-          case 32: {
-            PlainInt32 = input.ReadInt32();
-            break;
-          }
-          case 40: {
-            O1Int32 = input.ReadInt32();
-            break;
-          }
-          case 48: {
-            O2Int32 = input.ReadInt32();
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  public sealed partial class TestJsonName : pb::IMessage<TestJsonName>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<TestJsonName> _parser = new pb::MessageParser<TestJsonName>(() => new TestJsonName());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<TestJsonName> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::UnitTest.Issues.TestProtos.UnittestIssuesReflection.Descriptor.MessageTypes[7]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestJsonName() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestJsonName(TestJsonName other) : this() {
-      name_ = other.name_;
-      description_ = other.description_;
-      guid_ = other.guid_;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestJsonName Clone() {
-      return new TestJsonName(this);
-    }
-
-    /// <summary>Field number for the "name" field.</summary>
-    public const int NameFieldNumber = 1;
-    private string name_ = "";
-    /// <summary>
-    /// Message for testing the effects for of the json_name option
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string Name {
-      get { return name_; }
-      set {
-        name_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-
-    /// <summary>Field number for the "description" field.</summary>
-    public const int DescriptionFieldNumber = 2;
-    private string description_ = "";
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string Description {
-      get { return description_; }
-      set {
-        description_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-
-    /// <summary>Field number for the "guid" field.</summary>
-    public const int GuidFieldNumber = 3;
-    private string guid_ = "";
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string Guid {
-      get { return guid_; }
-      set {
-        guid_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as TestJsonName);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(TestJsonName other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (Name != other.Name) return false;
-      if (Description != other.Description) return false;
-      if (Guid != other.Guid) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (Name.Length != 0) hash ^= Name.GetHashCode();
-      if (Description.Length != 0) hash ^= Description.GetHashCode();
-      if (Guid.Length != 0) hash ^= Guid.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (Name.Length != 0) {
-        output.WriteRawTag(10);
-        output.WriteString(Name);
-      }
-      if (Description.Length != 0) {
-        output.WriteRawTag(18);
-        output.WriteString(Description);
-      }
-      if (Guid.Length != 0) {
-        output.WriteRawTag(26);
-        output.WriteString(Guid);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (Name.Length != 0) {
-        output.WriteRawTag(10);
-        output.WriteString(Name);
-      }
-      if (Description.Length != 0) {
-        output.WriteRawTag(18);
-        output.WriteString(Description);
-      }
-      if (Guid.Length != 0) {
-        output.WriteRawTag(26);
-        output.WriteString(Guid);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (Name.Length != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(Name);
-      }
-      if (Description.Length != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(Description);
-      }
-      if (Guid.Length != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(Guid);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(TestJsonName other) {
-      if (other == null) {
-        return;
-      }
-      if (other.Name.Length != 0) {
-        Name = other.Name;
-      }
-      if (other.Description.Length != 0) {
-        Description = other.Description;
-      }
-      if (other.Guid.Length != 0) {
-        Guid = other.Guid;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 10: {
-            Name = input.ReadString();
-            break;
-          }
-          case 18: {
-            Description = input.ReadString();
-            break;
-          }
-          case 26: {
-            Guid = input.ReadString();
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 10: {
-            Name = input.ReadString();
-            break;
-          }
-          case 18: {
-            Description = input.ReadString();
-            break;
-          }
-          case 26: {
-            Guid = input.ReadString();
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  /// <summary>
-  /// Issue 3200: When merging two messages which use the same
-  /// oneof case, which is itself a message type, the submessages should
-  /// be merged.
-  /// </summary>
-  public sealed partial class OneofMerging : pb::IMessage<OneofMerging>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<OneofMerging> _parser = new pb::MessageParser<OneofMerging>(() => new OneofMerging());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<OneofMerging> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::UnitTest.Issues.TestProtos.UnittestIssuesReflection.Descriptor.MessageTypes[8]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public OneofMerging() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public OneofMerging(OneofMerging other) : this() {
-      switch (other.ValueCase) {
-        case ValueOneofCase.Text:
-          Text = other.Text;
-          break;
-        case ValueOneofCase.Nested:
-          Nested = other.Nested.Clone();
-          break;
-      }
-
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public OneofMerging Clone() {
-      return new OneofMerging(this);
-    }
-
-    /// <summary>Field number for the "text" field.</summary>
-    public const int TextFieldNumber = 1;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string Text {
-      get { return valueCase_ == ValueOneofCase.Text ? (string) value_ : ""; }
-      set {
-        value_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-        valueCase_ = ValueOneofCase.Text;
-      }
-    }
-
-    /// <summary>Field number for the "nested" field.</summary>
-    public const int NestedFieldNumber = 2;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::UnitTest.Issues.TestProtos.OneofMerging.Types.Nested Nested {
-      get { return valueCase_ == ValueOneofCase.Nested ? (global::UnitTest.Issues.TestProtos.OneofMerging.Types.Nested) value_ : null; }
-      set {
-        value_ = value;
-        valueCase_ = value == null ? ValueOneofCase.None : ValueOneofCase.Nested;
-      }
-    }
-
-    private object value_;
-    /// <summary>Enum of possible cases for the "value" oneof.</summary>
-    public enum ValueOneofCase {
-      None = 0,
-      Text = 1,
-      Nested = 2,
-    }
-    private ValueOneofCase valueCase_ = ValueOneofCase.None;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ValueOneofCase ValueCase {
-      get { return valueCase_; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearValue() {
-      valueCase_ = ValueOneofCase.None;
-      value_ = null;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as OneofMerging);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(OneofMerging other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (Text != other.Text) return false;
-      if (!object.Equals(Nested, other.Nested)) return false;
-      if (ValueCase != other.ValueCase) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (valueCase_ == ValueOneofCase.Text) hash ^= Text.GetHashCode();
-      if (valueCase_ == ValueOneofCase.Nested) hash ^= Nested.GetHashCode();
-      hash ^= (int) valueCase_;
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (valueCase_ == ValueOneofCase.Text) {
-        output.WriteRawTag(10);
-        output.WriteString(Text);
-      }
-      if (valueCase_ == ValueOneofCase.Nested) {
-        output.WriteRawTag(18);
-        output.WriteMessage(Nested);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (valueCase_ == ValueOneofCase.Text) {
-        output.WriteRawTag(10);
-        output.WriteString(Text);
-      }
-      if (valueCase_ == ValueOneofCase.Nested) {
-        output.WriteRawTag(18);
-        output.WriteMessage(Nested);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (valueCase_ == ValueOneofCase.Text) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(Text);
-      }
-      if (valueCase_ == ValueOneofCase.Nested) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(Nested);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(OneofMerging other) {
-      if (other == null) {
-        return;
-      }
-      switch (other.ValueCase) {
-        case ValueOneofCase.Text:
-          Text = other.Text;
-          break;
-        case ValueOneofCase.Nested:
-          if (Nested == null) {
-            Nested = new global::UnitTest.Issues.TestProtos.OneofMerging.Types.Nested();
-          }
-          Nested.MergeFrom(other.Nested);
-          break;
-      }
-
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 10: {
-            Text = input.ReadString();
-            break;
-          }
-          case 18: {
-            global::UnitTest.Issues.TestProtos.OneofMerging.Types.Nested subBuilder = new global::UnitTest.Issues.TestProtos.OneofMerging.Types.Nested();
-            if (valueCase_ == ValueOneofCase.Nested) {
-              subBuilder.MergeFrom(Nested);
-            }
-            input.ReadMessage(subBuilder);
-            Nested = subBuilder;
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 10: {
-            Text = input.ReadString();
-            break;
-          }
-          case 18: {
-            global::UnitTest.Issues.TestProtos.OneofMerging.Types.Nested subBuilder = new global::UnitTest.Issues.TestProtos.OneofMerging.Types.Nested();
-            if (valueCase_ == ValueOneofCase.Nested) {
-              subBuilder.MergeFrom(Nested);
-            }
-            input.ReadMessage(subBuilder);
-            Nested = subBuilder;
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-    #region Nested types
-    /// <summary>Container for nested types declared in the OneofMerging message type.</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static partial class Types {
-      public sealed partial class Nested : pb::IMessage<Nested>
-      #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          , pb::IBufferMessage
-      #endif
-      {
-        private static readonly pb::MessageParser<Nested> _parser = new pb::MessageParser<Nested>(() => new Nested());
-        private pb::UnknownFieldSet _unknownFields;
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static pb::MessageParser<Nested> Parser { get { return _parser; } }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static pbr::MessageDescriptor Descriptor {
-          get { return global::UnitTest.Issues.TestProtos.OneofMerging.Descriptor.NestedTypes[0]; }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        pbr::MessageDescriptor pb::IMessage.Descriptor {
-          get { return Descriptor; }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public Nested() {
-          OnConstruction();
-        }
-
-        partial void OnConstruction();
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public Nested(Nested other) : this() {
-          x_ = other.x_;
-          y_ = other.y_;
-          _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public Nested Clone() {
-          return new Nested(this);
-        }
-
-        /// <summary>Field number for the "x" field.</summary>
-        public const int XFieldNumber = 1;
-        private int x_;
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public int X {
-          get { return x_; }
-          set {
-            x_ = value;
-          }
-        }
-
-        /// <summary>Field number for the "y" field.</summary>
-        public const int YFieldNumber = 2;
-        private int y_;
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public int Y {
-          get { return y_; }
-          set {
-            y_ = value;
-          }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override bool Equals(object other) {
-          return Equals(other as Nested);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool Equals(Nested other) {
-          if (ReferenceEquals(other, null)) {
-            return false;
-          }
-          if (ReferenceEquals(other, this)) {
-            return true;
-          }
-          if (X != other.X) return false;
-          if (Y != other.Y) return false;
-          return Equals(_unknownFields, other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override int GetHashCode() {
-          int hash = 1;
-          if (X != 0) hash ^= X.GetHashCode();
-          if (Y != 0) hash ^= Y.GetHashCode();
-          if (_unknownFields != null) {
-            hash ^= _unknownFields.GetHashCode();
-          }
-          return hash;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override string ToString() {
-          return pb::JsonFormatter.ToDiagnosticString(this);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void WriteTo(pb::CodedOutputStream output) {
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          output.WriteRawMessage(this);
-        #else
-          if (X != 0) {
-            output.WriteRawTag(8);
-            output.WriteInt32(X);
-          }
-          if (Y != 0) {
-            output.WriteRawTag(16);
-            output.WriteInt32(Y);
-          }
-          if (_unknownFields != null) {
-            _unknownFields.WriteTo(output);
-          }
-        #endif
-        }
-
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-          if (X != 0) {
-            output.WriteRawTag(8);
-            output.WriteInt32(X);
-          }
-          if (Y != 0) {
-            output.WriteRawTag(16);
-            output.WriteInt32(Y);
-          }
-          if (_unknownFields != null) {
-            _unknownFields.WriteTo(ref output);
-          }
-        }
-        #endif
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public int CalculateSize() {
-          int size = 0;
-          if (X != 0) {
-            size += 1 + pb::CodedOutputStream.ComputeInt32Size(X);
-          }
-          if (Y != 0) {
-            size += 1 + pb::CodedOutputStream.ComputeInt32Size(Y);
-          }
-          if (_unknownFields != null) {
-            size += _unknownFields.CalculateSize();
-          }
-          return size;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(Nested other) {
-          if (other == null) {
-            return;
-          }
-          if (other.X != 0) {
-            X = other.X;
-          }
-          if (other.Y != 0) {
-            Y = other.Y;
-          }
-          _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(pb::CodedInputStream input) {
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          input.ReadRawMessage(this);
-        #else
-          uint tag;
-          while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
-              default:
-                _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-                break;
-              case 8: {
-                X = input.ReadInt32();
-                break;
-              }
-              case 16: {
-                Y = input.ReadInt32();
-                break;
-              }
-            }
-          }
-        #endif
-        }
-
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-          uint tag;
-          while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
-              default:
-                _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-                break;
-              case 8: {
-                X = input.ReadInt32();
-                break;
-              }
-              case 16: {
-                Y = input.ReadInt32();
-                break;
-              }
-            }
-          }
-        }
-        #endif
-
-      }
-
-    }
-    #endregion
-
-  }
-
-  public sealed partial class NullValueOutsideStruct : pb::IMessage<NullValueOutsideStruct>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<NullValueOutsideStruct> _parser = new pb::MessageParser<NullValueOutsideStruct>(() => new NullValueOutsideStruct());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<NullValueOutsideStruct> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::UnitTest.Issues.TestProtos.UnittestIssuesReflection.Descriptor.MessageTypes[9]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public NullValueOutsideStruct() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public NullValueOutsideStruct(NullValueOutsideStruct other) : this() {
-      switch (other.ValueCase) {
-        case ValueOneofCase.StringValue:
-          StringValue = other.StringValue;
-          break;
-        case ValueOneofCase.NullValue:
-          NullValue = other.NullValue;
-          break;
-      }
-
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public NullValueOutsideStruct Clone() {
-      return new NullValueOutsideStruct(this);
-    }
-
-    /// <summary>Field number for the "string_value" field.</summary>
-    public const int StringValueFieldNumber = 1;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string StringValue {
-      get { return valueCase_ == ValueOneofCase.StringValue ? (string) value_ : ""; }
-      set {
-        value_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-        valueCase_ = ValueOneofCase.StringValue;
-      }
-    }
-
-    /// <summary>Field number for the "null_value" field.</summary>
-    public const int NullValueFieldNumber = 2;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.WellKnownTypes.NullValue NullValue {
-      get { return valueCase_ == ValueOneofCase.NullValue ? (global::Google.Protobuf.WellKnownTypes.NullValue) value_ : global::Google.Protobuf.WellKnownTypes.NullValue.NullValue; }
-      set {
-        value_ = value;
-        valueCase_ = ValueOneofCase.NullValue;
-      }
-    }
-
-    private object value_;
-    /// <summary>Enum of possible cases for the "value" oneof.</summary>
-    public enum ValueOneofCase {
-      None = 0,
-      StringValue = 1,
-      NullValue = 2,
-    }
-    private ValueOneofCase valueCase_ = ValueOneofCase.None;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ValueOneofCase ValueCase {
-      get { return valueCase_; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearValue() {
-      valueCase_ = ValueOneofCase.None;
-      value_ = null;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as NullValueOutsideStruct);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(NullValueOutsideStruct other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (StringValue != other.StringValue) return false;
-      if (NullValue != other.NullValue) return false;
-      if (ValueCase != other.ValueCase) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (valueCase_ == ValueOneofCase.StringValue) hash ^= StringValue.GetHashCode();
-      if (valueCase_ == ValueOneofCase.NullValue) hash ^= NullValue.GetHashCode();
-      hash ^= (int) valueCase_;
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (valueCase_ == ValueOneofCase.StringValue) {
-        output.WriteRawTag(10);
-        output.WriteString(StringValue);
-      }
-      if (valueCase_ == ValueOneofCase.NullValue) {
-        output.WriteRawTag(16);
-        output.WriteEnum((int) NullValue);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (valueCase_ == ValueOneofCase.StringValue) {
-        output.WriteRawTag(10);
-        output.WriteString(StringValue);
-      }
-      if (valueCase_ == ValueOneofCase.NullValue) {
-        output.WriteRawTag(16);
-        output.WriteEnum((int) NullValue);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (valueCase_ == ValueOneofCase.StringValue) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(StringValue);
-      }
-      if (valueCase_ == ValueOneofCase.NullValue) {
-        size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) NullValue);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(NullValueOutsideStruct other) {
-      if (other == null) {
-        return;
-      }
-      switch (other.ValueCase) {
-        case ValueOneofCase.StringValue:
-          StringValue = other.StringValue;
-          break;
-        case ValueOneofCase.NullValue:
-          NullValue = other.NullValue;
-          break;
-      }
-
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 10: {
-            StringValue = input.ReadString();
-            break;
-          }
-          case 16: {
-            value_ = input.ReadEnum();
-            valueCase_ = ValueOneofCase.NullValue;
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 10: {
-            StringValue = input.ReadString();
-            break;
-          }
-          case 16: {
-            value_ = input.ReadEnum();
-            valueCase_ = ValueOneofCase.NullValue;
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  public sealed partial class NullValueNotInOneof : pb::IMessage<NullValueNotInOneof>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<NullValueNotInOneof> _parser = new pb::MessageParser<NullValueNotInOneof>(() => new NullValueNotInOneof());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<NullValueNotInOneof> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::UnitTest.Issues.TestProtos.UnittestIssuesReflection.Descriptor.MessageTypes[10]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public NullValueNotInOneof() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public NullValueNotInOneof(NullValueNotInOneof other) : this() {
-      nullValue_ = other.nullValue_;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public NullValueNotInOneof Clone() {
-      return new NullValueNotInOneof(this);
-    }
-
-    /// <summary>Field number for the "null_value" field.</summary>
-    public const int NullValueFieldNumber = 2;
-    private global::Google.Protobuf.WellKnownTypes.NullValue nullValue_ = global::Google.Protobuf.WellKnownTypes.NullValue.NullValue;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.WellKnownTypes.NullValue NullValue {
-      get { return nullValue_; }
-      set {
-        nullValue_ = value;
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as NullValueNotInOneof);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(NullValueNotInOneof other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (NullValue != other.NullValue) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (NullValue != global::Google.Protobuf.WellKnownTypes.NullValue.NullValue) hash ^= NullValue.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (NullValue != global::Google.Protobuf.WellKnownTypes.NullValue.NullValue) {
-        output.WriteRawTag(16);
-        output.WriteEnum((int) NullValue);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (NullValue != global::Google.Protobuf.WellKnownTypes.NullValue.NullValue) {
-        output.WriteRawTag(16);
-        output.WriteEnum((int) NullValue);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (NullValue != global::Google.Protobuf.WellKnownTypes.NullValue.NullValue) {
-        size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) NullValue);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(NullValueNotInOneof other) {
-      if (other == null) {
-        return;
-      }
-      if (other.NullValue != global::Google.Protobuf.WellKnownTypes.NullValue.NullValue) {
-        NullValue = other.NullValue;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 16: {
-            NullValue = (global::Google.Protobuf.WellKnownTypes.NullValue) input.ReadEnum();
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 16: {
-            NullValue = (global::Google.Protobuf.WellKnownTypes.NullValue) input.ReadEnum();
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  public sealed partial class MixedRegularAndOptional : pb::IMessage<MixedRegularAndOptional>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<MixedRegularAndOptional> _parser = new pb::MessageParser<MixedRegularAndOptional>(() => new MixedRegularAndOptional());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<MixedRegularAndOptional> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::UnitTest.Issues.TestProtos.UnittestIssuesReflection.Descriptor.MessageTypes[11]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public MixedRegularAndOptional() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public MixedRegularAndOptional(MixedRegularAndOptional other) : this() {
-      regularField_ = other.regularField_;
-      optionalField_ = other.optionalField_;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public MixedRegularAndOptional Clone() {
-      return new MixedRegularAndOptional(this);
-    }
-
-    /// <summary>Field number for the "regular_field" field.</summary>
-    public const int RegularFieldFieldNumber = 1;
-    private string regularField_ = "";
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string RegularField {
-      get { return regularField_; }
-      set {
-        regularField_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-
-    /// <summary>Field number for the "optional_field" field.</summary>
-    public const int OptionalFieldFieldNumber = 2;
-    private string optionalField_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string OptionalField {
-      get { return optionalField_ ?? ""; }
-      set {
-        optionalField_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-    /// <summary>Gets whether the "optional_field" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasOptionalField {
-      get { return optionalField_ != null; }
-    }
-    /// <summary>Clears the value of the "optional_field" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearOptionalField() {
-      optionalField_ = null;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as MixedRegularAndOptional);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(MixedRegularAndOptional other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (RegularField != other.RegularField) return false;
-      if (OptionalField != other.OptionalField) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (RegularField.Length != 0) hash ^= RegularField.GetHashCode();
-      if (HasOptionalField) hash ^= OptionalField.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (RegularField.Length != 0) {
-        output.WriteRawTag(10);
-        output.WriteString(RegularField);
-      }
-      if (HasOptionalField) {
-        output.WriteRawTag(18);
-        output.WriteString(OptionalField);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (RegularField.Length != 0) {
-        output.WriteRawTag(10);
-        output.WriteString(RegularField);
-      }
-      if (HasOptionalField) {
-        output.WriteRawTag(18);
-        output.WriteString(OptionalField);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (RegularField.Length != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(RegularField);
-      }
-      if (HasOptionalField) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(OptionalField);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(MixedRegularAndOptional other) {
-      if (other == null) {
-        return;
-      }
-      if (other.RegularField.Length != 0) {
-        RegularField = other.RegularField;
-      }
-      if (other.HasOptionalField) {
-        OptionalField = other.OptionalField;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 10: {
-            RegularField = input.ReadString();
-            break;
-          }
-          case 18: {
-            OptionalField = input.ReadString();
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 10: {
-            RegularField = input.ReadString();
-            break;
-          }
-          case 18: {
-            OptionalField = input.ReadString();
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  public sealed partial class OneofWithNoneField : pb::IMessage<OneofWithNoneField>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<OneofWithNoneField> _parser = new pb::MessageParser<OneofWithNoneField>(() => new OneofWithNoneField());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<OneofWithNoneField> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::UnitTest.Issues.TestProtos.UnittestIssuesReflection.Descriptor.MessageTypes[12]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public OneofWithNoneField() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public OneofWithNoneField(OneofWithNoneField other) : this() {
-      switch (other.TestCase) {
-        case TestOneofCase.X:
-          X = other.X;
-          break;
-        case TestOneofCase.None_:
-          None = other.None;
-          break;
-      }
-
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public OneofWithNoneField Clone() {
-      return new OneofWithNoneField(this);
-    }
-
-    /// <summary>Field number for the "x" field.</summary>
-    public const int XFieldNumber = 1;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string X {
-      get { return testCase_ == TestOneofCase.X ? (string) test_ : ""; }
-      set {
-        test_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-        testCase_ = TestOneofCase.X;
-      }
-    }
-
-    /// <summary>Field number for the "none" field.</summary>
-    public const int NoneFieldNumber = 2;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string None {
-      get { return testCase_ == TestOneofCase.None_ ? (string) test_ : ""; }
-      set {
-        test_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-        testCase_ = TestOneofCase.None_;
-      }
-    }
-
-    private object test_;
-    /// <summary>Enum of possible cases for the "test" oneof.</summary>
-    public enum TestOneofCase {
-      None = 0,
-      X = 1,
-      None_ = 2,
-    }
-    private TestOneofCase testCase_ = TestOneofCase.None;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestOneofCase TestCase {
-      get { return testCase_; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearTest() {
-      testCase_ = TestOneofCase.None;
-      test_ = null;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as OneofWithNoneField);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(OneofWithNoneField other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (X != other.X) return false;
-      if (None != other.None) return false;
-      if (TestCase != other.TestCase) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (testCase_ == TestOneofCase.X) hash ^= X.GetHashCode();
-      if (testCase_ == TestOneofCase.None_) hash ^= None.GetHashCode();
-      hash ^= (int) testCase_;
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (testCase_ == TestOneofCase.X) {
-        output.WriteRawTag(10);
-        output.WriteString(X);
-      }
-      if (testCase_ == TestOneofCase.None_) {
-        output.WriteRawTag(18);
-        output.WriteString(None);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (testCase_ == TestOneofCase.X) {
-        output.WriteRawTag(10);
-        output.WriteString(X);
-      }
-      if (testCase_ == TestOneofCase.None_) {
-        output.WriteRawTag(18);
-        output.WriteString(None);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (testCase_ == TestOneofCase.X) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(X);
-      }
-      if (testCase_ == TestOneofCase.None_) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(None);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(OneofWithNoneField other) {
-      if (other == null) {
-        return;
-      }
-      switch (other.TestCase) {
-        case TestOneofCase.X:
-          X = other.X;
-          break;
-        case TestOneofCase.None_:
-          None = other.None;
-          break;
-      }
-
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 10: {
-            X = input.ReadString();
-            break;
-          }
-          case 18: {
-            None = input.ReadString();
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 10: {
-            X = input.ReadString();
-            break;
-          }
-          case 18: {
-            None = input.ReadString();
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  public sealed partial class OneofWithNoneName : pb::IMessage<OneofWithNoneName>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<OneofWithNoneName> _parser = new pb::MessageParser<OneofWithNoneName>(() => new OneofWithNoneName());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<OneofWithNoneName> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::UnitTest.Issues.TestProtos.UnittestIssuesReflection.Descriptor.MessageTypes[13]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public OneofWithNoneName() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public OneofWithNoneName(OneofWithNoneName other) : this() {
-      switch (other.NoneCase) {
-        case NoneOneofCase.X:
-          X = other.X;
-          break;
-        case NoneOneofCase.Y:
-          Y = other.Y;
-          break;
-      }
-
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public OneofWithNoneName Clone() {
-      return new OneofWithNoneName(this);
-    }
-
-    /// <summary>Field number for the "x" field.</summary>
-    public const int XFieldNumber = 1;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string X {
-      get { return noneCase_ == NoneOneofCase.X ? (string) none_ : ""; }
-      set {
-        none_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-        noneCase_ = NoneOneofCase.X;
-      }
-    }
-
-    /// <summary>Field number for the "y" field.</summary>
-    public const int YFieldNumber = 2;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string Y {
-      get { return noneCase_ == NoneOneofCase.Y ? (string) none_ : ""; }
-      set {
-        none_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-        noneCase_ = NoneOneofCase.Y;
-      }
-    }
-
-    private object none_;
-    /// <summary>Enum of possible cases for the "none" oneof.</summary>
-    public enum NoneOneofCase {
-      None = 0,
-      X = 1,
-      Y = 2,
-    }
-    private NoneOneofCase noneCase_ = NoneOneofCase.None;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public NoneOneofCase NoneCase {
-      get { return noneCase_; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearNone() {
-      noneCase_ = NoneOneofCase.None;
-      none_ = null;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as OneofWithNoneName);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(OneofWithNoneName other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (X != other.X) return false;
-      if (Y != other.Y) return false;
-      if (NoneCase != other.NoneCase) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (noneCase_ == NoneOneofCase.X) hash ^= X.GetHashCode();
-      if (noneCase_ == NoneOneofCase.Y) hash ^= Y.GetHashCode();
-      hash ^= (int) noneCase_;
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (noneCase_ == NoneOneofCase.X) {
-        output.WriteRawTag(10);
-        output.WriteString(X);
-      }
-      if (noneCase_ == NoneOneofCase.Y) {
-        output.WriteRawTag(18);
-        output.WriteString(Y);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (noneCase_ == NoneOneofCase.X) {
-        output.WriteRawTag(10);
-        output.WriteString(X);
-      }
-      if (noneCase_ == NoneOneofCase.Y) {
-        output.WriteRawTag(18);
-        output.WriteString(Y);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (noneCase_ == NoneOneofCase.X) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(X);
-      }
-      if (noneCase_ == NoneOneofCase.Y) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(Y);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(OneofWithNoneName other) {
-      if (other == null) {
-        return;
-      }
-      switch (other.NoneCase) {
-        case NoneOneofCase.X:
-          X = other.X;
-          break;
-        case NoneOneofCase.Y:
-          Y = other.Y;
-          break;
-      }
-
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 10: {
-            X = input.ReadString();
-            break;
-          }
-          case 18: {
-            Y = input.ReadString();
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 10: {
-            X = input.ReadString();
-            break;
-          }
-          case 18: {
-            Y = input.ReadString();
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  #endregion
-
-}
-
-#endregion Designer generated code
diff --git a/libs/protobuf/csharp/src/Google.Protobuf.Test.TestProtos/UnittestProto3.cs b/libs/protobuf/csharp/src/Google.Protobuf.Test.TestProtos/UnittestProto3.cs
deleted file mode 100644
index ddb73d7..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf.Test.TestProtos/UnittestProto3.cs
+++ /dev/null
@@ -1,10660 +0,0 @@
-// <auto-generated>
-//     Generated by the protocol buffer compiler.  DO NOT EDIT!
-//     source: unittest_proto3.proto
-// </auto-generated>
-#pragma warning disable 1591, 0612, 3021, 8981
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-namespace Google.Protobuf.TestProtos {
-
-  /// <summary>Holder for reflection information generated from unittest_proto3.proto</summary>
-  public static partial class UnittestProto3Reflection {
-
-    #region Descriptor
-    /// <summary>File descriptor for unittest_proto3.proto</summary>
-    public static pbr::FileDescriptor Descriptor {
-      get { return descriptor; }
-    }
-    private static pbr::FileDescriptor descriptor;
-
-    static UnittestProto3Reflection() {
-      byte[] descriptorData = global::System.Convert.FromBase64String(
-          string.Concat(
-            "ChV1bml0dGVzdF9wcm90bzMucHJvdG8SEnByb3RvYnVmX3VuaXR0ZXN0Mxoc",
-            "dW5pdHRlc3RfaW1wb3J0X3Byb3RvMy5wcm90byL5DwoMVGVzdEFsbFR5cGVz",
-            "EhQKDHNpbmdsZV9pbnQzMhgBIAEoBRIUCgxzaW5nbGVfaW50NjQYAiABKAMS",
-            "FQoNc2luZ2xlX3VpbnQzMhgDIAEoDRIVCg1zaW5nbGVfdWludDY0GAQgASgE",
-            "EhUKDXNpbmdsZV9zaW50MzIYBSABKBESFQoNc2luZ2xlX3NpbnQ2NBgGIAEo",
-            "EhIWCg5zaW5nbGVfZml4ZWQzMhgHIAEoBxIWCg5zaW5nbGVfZml4ZWQ2NBgI",
-            "IAEoBhIXCg9zaW5nbGVfc2ZpeGVkMzIYCSABKA8SFwoPc2luZ2xlX3NmaXhl",
-            "ZDY0GAogASgQEhQKDHNpbmdsZV9mbG9hdBgLIAEoAhIVCg1zaW5nbGVfZG91",
-            "YmxlGAwgASgBEhMKC3NpbmdsZV9ib29sGA0gASgIEhUKDXNpbmdsZV9zdHJp",
-            "bmcYDiABKAkSFAoMc2luZ2xlX2J5dGVzGA8gASgMEk0KFXNpbmdsZV9uZXN0",
-            "ZWRfbWVzc2FnZRgSIAEoCzIuLnByb3RvYnVmX3VuaXR0ZXN0My5UZXN0QWxs",
-            "VHlwZXMuTmVzdGVkTWVzc2FnZRJCChZzaW5nbGVfZm9yZWlnbl9tZXNzYWdl",
-            "GBMgASgLMiIucHJvdG9idWZfdW5pdHRlc3QzLkZvcmVpZ25NZXNzYWdlEkYK",
-            "FXNpbmdsZV9pbXBvcnRfbWVzc2FnZRgUIAEoCzInLnByb3RvYnVmX3VuaXR0",
-            "ZXN0X2ltcG9ydC5JbXBvcnRNZXNzYWdlEkcKEnNpbmdsZV9uZXN0ZWRfZW51",
-            "bRgVIAEoDjIrLnByb3RvYnVmX3VuaXR0ZXN0My5UZXN0QWxsVHlwZXMuTmVz",
-            "dGVkRW51bRI8ChNzaW5nbGVfZm9yZWlnbl9lbnVtGBYgASgOMh8ucHJvdG9i",
-            "dWZfdW5pdHRlc3QzLkZvcmVpZ25FbnVtEkAKEnNpbmdsZV9pbXBvcnRfZW51",
-            "bRgXIAEoDjIkLnByb3RvYnVmX3VuaXR0ZXN0X2ltcG9ydC5JbXBvcnRFbnVt",
-            "ElMKHHNpbmdsZV9wdWJsaWNfaW1wb3J0X21lc3NhZ2UYGiABKAsyLS5wcm90",
-            "b2J1Zl91bml0dGVzdF9pbXBvcnQuUHVibGljSW1wb3J0TWVzc2FnZRIWCg5y",
-            "ZXBlYXRlZF9pbnQzMhgfIAMoBRIWCg5yZXBlYXRlZF9pbnQ2NBggIAMoAxIX",
-            "Cg9yZXBlYXRlZF91aW50MzIYISADKA0SFwoPcmVwZWF0ZWRfdWludDY0GCIg",
-            "AygEEhcKD3JlcGVhdGVkX3NpbnQzMhgjIAMoERIXCg9yZXBlYXRlZF9zaW50",
-            "NjQYJCADKBISGAoQcmVwZWF0ZWRfZml4ZWQzMhglIAMoBxIYChByZXBlYXRl",
-            "ZF9maXhlZDY0GCYgAygGEhkKEXJlcGVhdGVkX3NmaXhlZDMyGCcgAygPEhkK",
-            "EXJlcGVhdGVkX3NmaXhlZDY0GCggAygQEhYKDnJlcGVhdGVkX2Zsb2F0GCkg",
-            "AygCEhcKD3JlcGVhdGVkX2RvdWJsZRgqIAMoARIVCg1yZXBlYXRlZF9ib29s",
-            "GCsgAygIEhcKD3JlcGVhdGVkX3N0cmluZxgsIAMoCRIWCg5yZXBlYXRlZF9i",
-            "eXRlcxgtIAMoDBJPChdyZXBlYXRlZF9uZXN0ZWRfbWVzc2FnZRgwIAMoCzIu",
-            "LnByb3RvYnVmX3VuaXR0ZXN0My5UZXN0QWxsVHlwZXMuTmVzdGVkTWVzc2Fn",
-            "ZRJEChhyZXBlYXRlZF9mb3JlaWduX21lc3NhZ2UYMSADKAsyIi5wcm90b2J1",
-            "Zl91bml0dGVzdDMuRm9yZWlnbk1lc3NhZ2USSAoXcmVwZWF0ZWRfaW1wb3J0",
-            "X21lc3NhZ2UYMiADKAsyJy5wcm90b2J1Zl91bml0dGVzdF9pbXBvcnQuSW1w",
-            "b3J0TWVzc2FnZRJJChRyZXBlYXRlZF9uZXN0ZWRfZW51bRgzIAMoDjIrLnBy",
-            "b3RvYnVmX3VuaXR0ZXN0My5UZXN0QWxsVHlwZXMuTmVzdGVkRW51bRI+ChVy",
-            "ZXBlYXRlZF9mb3JlaWduX2VudW0YNCADKA4yHy5wcm90b2J1Zl91bml0dGVz",
-            "dDMuRm9yZWlnbkVudW0SQgoUcmVwZWF0ZWRfaW1wb3J0X2VudW0YNSADKA4y",
-            "JC5wcm90b2J1Zl91bml0dGVzdF9pbXBvcnQuSW1wb3J0RW51bRJVCh5yZXBl",
-            "YXRlZF9wdWJsaWNfaW1wb3J0X21lc3NhZ2UYNiADKAsyLS5wcm90b2J1Zl91",
-            "bml0dGVzdF9pbXBvcnQuUHVibGljSW1wb3J0TWVzc2FnZRIWCgxvbmVvZl91",
-            "aW50MzIYbyABKA1IABJOChRvbmVvZl9uZXN0ZWRfbWVzc2FnZRhwIAEoCzIu",
-            "LnByb3RvYnVmX3VuaXR0ZXN0My5UZXN0QWxsVHlwZXMuTmVzdGVkTWVzc2Fn",
-            "ZUgAEhYKDG9uZW9mX3N0cmluZxhxIAEoCUgAEhUKC29uZW9mX2J5dGVzGHIg",
-            "ASgMSAAaGwoNTmVzdGVkTWVzc2FnZRIKCgJiYhgBIAEoBSJWCgpOZXN0ZWRF",
-            "bnVtEhsKF05FU1RFRF9FTlVNX1VOU1BFQ0lGSUVEEAASBwoDRk9PEAESBwoD",
-            "QkFSEAISBwoDQkFaEAMSEAoDTkVHEP///////////wFCDQoLb25lb2ZfZmll",
-            "bGQivgEKEk5lc3RlZFRlc3RBbGxUeXBlcxI1CgVjaGlsZBgBIAEoCzImLnBy",
-            "b3RvYnVmX3VuaXR0ZXN0My5OZXN0ZWRUZXN0QWxsVHlwZXMSMQoHcGF5bG9h",
-            "ZBgCIAEoCzIgLnByb3RvYnVmX3VuaXR0ZXN0My5UZXN0QWxsVHlwZXMSPgoO",
-            "cmVwZWF0ZWRfY2hpbGQYAyADKAsyJi5wcm90b2J1Zl91bml0dGVzdDMuTmVz",
-            "dGVkVGVzdEFsbFR5cGVzIjQKFFRlc3REZXByZWNhdGVkRmllbGRzEhwKEGRl",
-            "cHJlY2F0ZWRfaW50MzIYASABKAVCAhgBIhsKDkZvcmVpZ25NZXNzYWdlEgkK",
-            "AWMYASABKAUiMAoSVGVzdFJlc2VydmVkRmllbGRzSgQIAhADSgQIDxAQSgQI",
-            "CRAMUgNiYXJSA2JheiJbChFUZXN0Rm9yZWlnbk5lc3RlZBJGCg5mb3JlaWdu",
-            "X25lc3RlZBgBIAEoCzIuLnByb3RvYnVmX3VuaXR0ZXN0My5UZXN0QWxsVHlw",
-            "ZXMuTmVzdGVkTWVzc2FnZSI0ChhUZXN0UmVhbGx5TGFyZ2VUYWdOdW1iZXIS",
-            "CQoBYRgBIAEoBRINCgJiYhj///9/IAEoBSJWChRUZXN0UmVjdXJzaXZlTWVz",
-            "c2FnZRIzCgFhGAEgASgLMigucHJvdG9idWZfdW5pdHRlc3QzLlRlc3RSZWN1",
-            "cnNpdmVNZXNzYWdlEgkKAWkYAiABKAUiTAoUVGVzdE11dHVhbFJlY3Vyc2lv",
-            "bkESNAoCYmIYASABKAsyKC5wcm90b2J1Zl91bml0dGVzdDMuVGVzdE11dHVh",
-            "bFJlY3Vyc2lvbkIiYwoUVGVzdE11dHVhbFJlY3Vyc2lvbkISMwoBYRgBIAEo",
-            "CzIoLnByb3RvYnVmX3VuaXR0ZXN0My5UZXN0TXV0dWFsUmVjdXJzaW9uQRIW",
-            "Cg5vcHRpb25hbF9pbnQzMhgCIAEoBSJNChJUZXN0RW51bUFsbG93QWxpYXMS",
-            "NwoFdmFsdWUYASABKA4yKC5wcm90b2J1Zl91bml0dGVzdDMuVGVzdEVudW1X",
-            "aXRoRHVwVmFsdWUi7wIKF1Rlc3RDYW1lbENhc2VGaWVsZE5hbWVzEhYKDlBy",
-            "aW1pdGl2ZUZpZWxkGAEgASgFEhMKC1N0cmluZ0ZpZWxkGAIgASgJEjIKCUVu",
-            "dW1GaWVsZBgDIAEoDjIfLnByb3RvYnVmX3VuaXR0ZXN0My5Gb3JlaWduRW51",
-            "bRI4CgxNZXNzYWdlRmllbGQYBCABKAsyIi5wcm90b2J1Zl91bml0dGVzdDMu",
-            "Rm9yZWlnbk1lc3NhZ2USHgoWUmVwZWF0ZWRQcmltaXRpdmVGaWVsZBgHIAMo",
-            "BRIbChNSZXBlYXRlZFN0cmluZ0ZpZWxkGAggAygJEjoKEVJlcGVhdGVkRW51",
-            "bUZpZWxkGAkgAygOMh8ucHJvdG9idWZfdW5pdHRlc3QzLkZvcmVpZ25FbnVt",
-            "EkAKFFJlcGVhdGVkTWVzc2FnZUZpZWxkGAogAygLMiIucHJvdG9idWZfdW5p",
-            "dHRlc3QzLkZvcmVpZ25NZXNzYWdlIsgBChJUZXN0RmllbGRPcmRlcmluZ3MS",
-            "EQoJbXlfc3RyaW5nGAsgASgJEg4KBm15X2ludBgBIAEoAxIQCghteV9mbG9h",
-            "dBhlIAEoAhJUChVzaW5nbGVfbmVzdGVkX21lc3NhZ2UYyAEgASgLMjQucHJv",
-            "dG9idWZfdW5pdHRlc3QzLlRlc3RGaWVsZE9yZGVyaW5ncy5OZXN0ZWRNZXNz",
-            "YWdlGicKDU5lc3RlZE1lc3NhZ2USCgoCb28YAiABKAMSCgoCYmIYASABKAUi",
-            "TAoRU3BhcnNlRW51bU1lc3NhZ2USNwoLc3BhcnNlX2VudW0YASABKA4yIi5w",
-            "cm90b2J1Zl91bml0dGVzdDMuVGVzdFNwYXJzZUVudW0iGQoJT25lU3RyaW5n",
-            "EgwKBGRhdGEYASABKAkiGgoKTW9yZVN0cmluZxIMCgRkYXRhGAEgAygJIhgK",
-            "CE9uZUJ5dGVzEgwKBGRhdGEYASABKAwiGQoJTW9yZUJ5dGVzEgwKBGRhdGEY",
-            "ASABKAwiHAoMSW50MzJNZXNzYWdlEgwKBGRhdGEYASABKAUiHQoNVWludDMy",
-            "TWVzc2FnZRIMCgRkYXRhGAEgASgNIhwKDEludDY0TWVzc2FnZRIMCgRkYXRh",
-            "GAEgASgDIh0KDVVpbnQ2NE1lc3NhZ2USDAoEZGF0YRgBIAEoBCIbCgtCb29s",
-            "TWVzc2FnZRIMCgRkYXRhGAEgASgIInQKCVRlc3RPbmVvZhIRCgdmb29faW50",
-            "GAEgASgFSAASFAoKZm9vX3N0cmluZxgCIAEoCUgAEjcKC2Zvb19tZXNzYWdl",
-            "GAMgASgLMiAucHJvdG9idWZfdW5pdHRlc3QzLlRlc3RBbGxUeXBlc0gAQgUK",
-            "A2ZvbyKrAwoPVGVzdFBhY2tlZFR5cGVzEhgKDHBhY2tlZF9pbnQzMhhaIAMo",
-            "BUICEAESGAoMcGFja2VkX2ludDY0GFsgAygDQgIQARIZCg1wYWNrZWRfdWlu",
-            "dDMyGFwgAygNQgIQARIZCg1wYWNrZWRfdWludDY0GF0gAygEQgIQARIZCg1w",
-            "YWNrZWRfc2ludDMyGF4gAygRQgIQARIZCg1wYWNrZWRfc2ludDY0GF8gAygS",
-            "QgIQARIaCg5wYWNrZWRfZml4ZWQzMhhgIAMoB0ICEAESGgoOcGFja2VkX2Zp",
-            "eGVkNjQYYSADKAZCAhABEhsKD3BhY2tlZF9zZml4ZWQzMhhiIAMoD0ICEAES",
-            "GwoPcGFja2VkX3NmaXhlZDY0GGMgAygQQgIQARIYCgxwYWNrZWRfZmxvYXQY",
-            "ZCADKAJCAhABEhkKDXBhY2tlZF9kb3VibGUYZSADKAFCAhABEhcKC3BhY2tl",
-            "ZF9ib29sGGYgAygIQgIQARI4CgtwYWNrZWRfZW51bRhnIAMoDjIfLnByb3Rv",
-            "YnVmX3VuaXR0ZXN0My5Gb3JlaWduRW51bUICEAEiyQMKEVRlc3RVbnBhY2tl",
-            "ZFR5cGVzEhoKDnVucGFja2VkX2ludDMyGFogAygFQgIQABIaCg51bnBhY2tl",
-            "ZF9pbnQ2NBhbIAMoA0ICEAASGwoPdW5wYWNrZWRfdWludDMyGFwgAygNQgIQ",
-            "ABIbCg91bnBhY2tlZF91aW50NjQYXSADKARCAhAAEhsKD3VucGFja2VkX3Np",
-            "bnQzMhheIAMoEUICEAASGwoPdW5wYWNrZWRfc2ludDY0GF8gAygSQgIQABIc",
-            "ChB1bnBhY2tlZF9maXhlZDMyGGAgAygHQgIQABIcChB1bnBhY2tlZF9maXhl",
-            "ZDY0GGEgAygGQgIQABIdChF1bnBhY2tlZF9zZml4ZWQzMhhiIAMoD0ICEAAS",
-            "HQoRdW5wYWNrZWRfc2ZpeGVkNjQYYyADKBBCAhAAEhoKDnVucGFja2VkX2Zs",
-            "b2F0GGQgAygCQgIQABIbCg91bnBhY2tlZF9kb3VibGUYZSADKAFCAhAAEhkK",
-            "DXVucGFja2VkX2Jvb2wYZiADKAhCAhAAEjoKDXVucGFja2VkX2VudW0YZyAD",
-            "KA4yHy5wcm90b2J1Zl91bml0dGVzdDMuRm9yZWlnbkVudW1CAhAAIsABCiNU",
-            "ZXN0UmVwZWF0ZWRTY2FsYXJEaWZmZXJlbnRUYWdTaXplcxIYChByZXBlYXRl",
-            "ZF9maXhlZDMyGAwgAygHEhYKDnJlcGVhdGVkX2ludDMyGA0gAygFEhkKEHJl",
-            "cGVhdGVkX2ZpeGVkNjQY/g8gAygGEhcKDnJlcGVhdGVkX2ludDY0GP8PIAMo",
-            "AxIYCg5yZXBlYXRlZF9mbG9hdBj+/w8gAygCEhkKD3JlcGVhdGVkX3VpbnQ2",
-            "NBj//w8gAygEIigKG1Rlc3RDb21tZW50SW5qZWN0aW9uTWVzc2FnZRIJCgFh",
-            "GAEgASgJIgwKCkZvb1JlcXVlc3QiDQoLRm9vUmVzcG9uc2UiEgoQRm9vQ2xp",
-            "ZW50TWVzc2FnZSISChBGb29TZXJ2ZXJNZXNzYWdlIgwKCkJhclJlcXVlc3Qi",
-            "DQoLQmFyUmVzcG9uc2UiEgoQVGVzdEVtcHR5TWVzc2FnZSJwCg5Db21tZW50",
-            "TWVzc2FnZRIMCgR0ZXh0GAEgASgJGisKFE5lc3RlZENvbW1lbnRNZXNzYWdl",
-            "EhMKC25lc3RlZF90ZXh0GAEgASgJIiMKEU5lc3RlZENvbW1lbnRFbnVtEg4K",
-            "ClpFUk9fVkFMVUUQACpZCgtGb3JlaWduRW51bRIXChNGT1JFSUdOX1VOU1BF",
-            "Q0lGSUVEEAASDwoLRk9SRUlHTl9GT08QBBIPCgtGT1JFSUdOX0JBUhAFEg8K",
-            "C0ZPUkVJR05fQkFaEAYqdQoUVGVzdEVudW1XaXRoRHVwVmFsdWUSKAokVEVT",
-            "VF9FTlVNX1dJVEhfRFVQX1ZBTFVFX1VOU1BFQ0lGSUVEEAASCAoERk9PMRAB",
-            "EggKBEJBUjEQAhIHCgNCQVoQAxIICgRGT08yEAESCAoEQkFSMhACGgIQASqd",
-            "AQoOVGVzdFNwYXJzZUVudW0SIAocVEVTVF9TUEFSU0VfRU5VTV9VTlNQRUNJ",
-            "RklFRBAAEgwKCFNQQVJTRV9BEHsSDgoIU1BBUlNFX0IQpucDEg8KCFNQQVJT",
-            "RV9DELKxgAYSFQoIU1BBUlNFX0QQ8f//////////ARIVCghTUEFSU0VfRRC0",
-            "3vz///////8BEgwKCFNQQVJTRV9HEAIqHQoLQ29tbWVudEVudW0SDgoKWkVS",
-            "T19WQUxVRRAAMp0BCgtUZXN0U2VydmljZRJGCgNGb28SHi5wcm90b2J1Zl91",
-            "bml0dGVzdDMuRm9vUmVxdWVzdBofLnByb3RvYnVmX3VuaXR0ZXN0My5Gb29S",
-            "ZXNwb25zZRJGCgNCYXISHi5wcm90b2J1Zl91bml0dGVzdDMuQmFyUmVxdWVz",
-            "dBofLnByb3RvYnVmX3VuaXR0ZXN0My5CYXJSZXNwb25zZUIsQg1Vbml0dGVz",
-            "dFByb3RvqgIaR29vZ2xlLlByb3RvYnVmLlRlc3RQcm90b3NiBnByb3RvMw=="));
-      descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-          new pbr::FileDescriptor[] { global::Google.Protobuf.TestProtos.UnittestImportProto3Reflection.Descriptor, },
-          new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Google.Protobuf.TestProtos.ForeignEnum), typeof(global::Google.Protobuf.TestProtos.TestEnumWithDupValue), typeof(global::Google.Protobuf.TestProtos.TestSparseEnum), typeof(global::Google.Protobuf.TestProtos.CommentEnum), }, null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.TestAllTypes), global::Google.Protobuf.TestProtos.TestAllTypes.Parser, new[]{ "SingleInt32", "SingleInt64", "SingleUint32", "SingleUint64", "SingleSint32", "SingleSint64", "SingleFixed32", "SingleFixed64", "SingleSfixed32", "SingleSfixed64", "SingleFloat", "SingleDouble", "SingleBool", "SingleString", "SingleBytes", "SingleNestedMessage", "SingleForeignMessage", "SingleImportMessage", "SingleNestedEnum", "SingleForeignEnum", "SingleImportEnum", "SinglePublicImportMessage", "RepeatedInt32", "RepeatedInt64", "RepeatedUint32", "RepeatedUint64", "RepeatedSint32", "RepeatedSint64", "RepeatedFixed32", "RepeatedFixed64", "RepeatedSfixed32", "RepeatedSfixed64", "RepeatedFloat", "RepeatedDouble", "RepeatedBool", "RepeatedString", "RepeatedBytes", "RepeatedNestedMessage", "RepeatedForeignMessage", "RepeatedImportMessage", "RepeatedNestedEnum", "RepeatedForeignEnum", "RepeatedImportEnum", "RepeatedPublicImportMessage", "OneofUint32", "OneofNestedMessage", "OneofString", "OneofBytes" }, new[]{ "OneofField" }, new[]{ typeof(global::Google.Protobuf.TestProtos.TestAllTypes.Types.NestedEnum) }, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.TestAllTypes.Types.NestedMessage), global::Google.Protobuf.TestProtos.TestAllTypes.Types.NestedMessage.Parser, new[]{ "Bb" }, null, null, null, null)}),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.NestedTestAllTypes), global::Google.Protobuf.TestProtos.NestedTestAllTypes.Parser, new[]{ "Child", "Payload", "RepeatedChild" }, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.TestDeprecatedFields), global::Google.Protobuf.TestProtos.TestDeprecatedFields.Parser, new[]{ "DeprecatedInt32" }, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.ForeignMessage), global::Google.Protobuf.TestProtos.ForeignMessage.Parser, new[]{ "C" }, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.TestReservedFields), global::Google.Protobuf.TestProtos.TestReservedFields.Parser, null, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.TestForeignNested), global::Google.Protobuf.TestProtos.TestForeignNested.Parser, new[]{ "ForeignNested" }, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.TestReallyLargeTagNumber), global::Google.Protobuf.TestProtos.TestReallyLargeTagNumber.Parser, new[]{ "A", "Bb" }, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.TestRecursiveMessage), global::Google.Protobuf.TestProtos.TestRecursiveMessage.Parser, new[]{ "A", "I" }, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.TestMutualRecursionA), global::Google.Protobuf.TestProtos.TestMutualRecursionA.Parser, new[]{ "Bb" }, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.TestMutualRecursionB), global::Google.Protobuf.TestProtos.TestMutualRecursionB.Parser, new[]{ "A", "OptionalInt32" }, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.TestEnumAllowAlias), global::Google.Protobuf.TestProtos.TestEnumAllowAlias.Parser, new[]{ "Value" }, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.TestCamelCaseFieldNames), global::Google.Protobuf.TestProtos.TestCamelCaseFieldNames.Parser, new[]{ "PrimitiveField", "StringField", "EnumField", "MessageField", "RepeatedPrimitiveField", "RepeatedStringField", "RepeatedEnumField", "RepeatedMessageField" }, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.TestFieldOrderings), global::Google.Protobuf.TestProtos.TestFieldOrderings.Parser, new[]{ "MyString", "MyInt", "MyFloat", "SingleNestedMessage" }, null, null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.TestFieldOrderings.Types.NestedMessage), global::Google.Protobuf.TestProtos.TestFieldOrderings.Types.NestedMessage.Parser, new[]{ "Oo", "Bb" }, null, null, null, null)}),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.SparseEnumMessage), global::Google.Protobuf.TestProtos.SparseEnumMessage.Parser, new[]{ "SparseEnum" }, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.OneString), global::Google.Protobuf.TestProtos.OneString.Parser, new[]{ "Data" }, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.MoreString), global::Google.Protobuf.TestProtos.MoreString.Parser, new[]{ "Data" }, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.OneBytes), global::Google.Protobuf.TestProtos.OneBytes.Parser, new[]{ "Data" }, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.MoreBytes), global::Google.Protobuf.TestProtos.MoreBytes.Parser, new[]{ "Data" }, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.Int32Message), global::Google.Protobuf.TestProtos.Int32Message.Parser, new[]{ "Data" }, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.Uint32Message), global::Google.Protobuf.TestProtos.Uint32Message.Parser, new[]{ "Data" }, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.Int64Message), global::Google.Protobuf.TestProtos.Int64Message.Parser, new[]{ "Data" }, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.Uint64Message), global::Google.Protobuf.TestProtos.Uint64Message.Parser, new[]{ "Data" }, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.BoolMessage), global::Google.Protobuf.TestProtos.BoolMessage.Parser, new[]{ "Data" }, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.TestOneof), global::Google.Protobuf.TestProtos.TestOneof.Parser, new[]{ "FooInt", "FooString", "FooMessage" }, new[]{ "Foo" }, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.TestPackedTypes), global::Google.Protobuf.TestProtos.TestPackedTypes.Parser, new[]{ "PackedInt32", "PackedInt64", "PackedUint32", "PackedUint64", "PackedSint32", "PackedSint64", "PackedFixed32", "PackedFixed64", "PackedSfixed32", "PackedSfixed64", "PackedFloat", "PackedDouble", "PackedBool", "PackedEnum" }, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.TestUnpackedTypes), global::Google.Protobuf.TestProtos.TestUnpackedTypes.Parser, new[]{ "UnpackedInt32", "UnpackedInt64", "UnpackedUint32", "UnpackedUint64", "UnpackedSint32", "UnpackedSint64", "UnpackedFixed32", "UnpackedFixed64", "UnpackedSfixed32", "UnpackedSfixed64", "UnpackedFloat", "UnpackedDouble", "UnpackedBool", "UnpackedEnum" }, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.TestRepeatedScalarDifferentTagSizes), global::Google.Protobuf.TestProtos.TestRepeatedScalarDifferentTagSizes.Parser, new[]{ "RepeatedFixed32", "RepeatedInt32", "RepeatedFixed64", "RepeatedInt64", "RepeatedFloat", "RepeatedUint64" }, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.TestCommentInjectionMessage), global::Google.Protobuf.TestProtos.TestCommentInjectionMessage.Parser, new[]{ "A" }, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.FooRequest), global::Google.Protobuf.TestProtos.FooRequest.Parser, null, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.FooResponse), global::Google.Protobuf.TestProtos.FooResponse.Parser, null, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.FooClientMessage), global::Google.Protobuf.TestProtos.FooClientMessage.Parser, null, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.FooServerMessage), global::Google.Protobuf.TestProtos.FooServerMessage.Parser, null, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.BarRequest), global::Google.Protobuf.TestProtos.BarRequest.Parser, null, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.BarResponse), global::Google.Protobuf.TestProtos.BarResponse.Parser, null, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.TestEmptyMessage), global::Google.Protobuf.TestProtos.TestEmptyMessage.Parser, null, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.CommentMessage), global::Google.Protobuf.TestProtos.CommentMessage.Parser, new[]{ "Text" }, null, new[]{ typeof(global::Google.Protobuf.TestProtos.CommentMessage.Types.NestedCommentEnum) }, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.CommentMessage.Types.NestedCommentMessage), global::Google.Protobuf.TestProtos.CommentMessage.Types.NestedCommentMessage.Parser, new[]{ "NestedText" }, null, null, null, null)})
-          }));
-    }
-    #endregion
-
-  }
-  #region Enums
-  public enum ForeignEnum {
-    [pbr::OriginalName("FOREIGN_UNSPECIFIED")] ForeignUnspecified = 0,
-    [pbr::OriginalName("FOREIGN_FOO")] ForeignFoo = 4,
-    [pbr::OriginalName("FOREIGN_BAR")] ForeignBar = 5,
-    [pbr::OriginalName("FOREIGN_BAZ")] ForeignBaz = 6,
-  }
-
-  /// <summary>
-  /// Test an enum that has multiple values with the same number.
-  /// </summary>
-  public enum TestEnumWithDupValue {
-    [pbr::OriginalName("TEST_ENUM_WITH_DUP_VALUE_UNSPECIFIED")] Unspecified = 0,
-    [pbr::OriginalName("FOO1")] Foo1 = 1,
-    [pbr::OriginalName("BAR1")] Bar1 = 2,
-    [pbr::OriginalName("BAZ")] Baz = 3,
-    [pbr::OriginalName("FOO2", PreferredAlias = false)] Foo2 = 1,
-    [pbr::OriginalName("BAR2", PreferredAlias = false)] Bar2 = 2,
-  }
-
-  /// <summary>
-  /// Test an enum with large, unordered values.
-  /// </summary>
-  public enum TestSparseEnum {
-    [pbr::OriginalName("TEST_SPARSE_ENUM_UNSPECIFIED")] Unspecified = 0,
-    [pbr::OriginalName("SPARSE_A")] SparseA = 123,
-    [pbr::OriginalName("SPARSE_B")] SparseB = 62374,
-    [pbr::OriginalName("SPARSE_C")] SparseC = 12589234,
-    [pbr::OriginalName("SPARSE_D")] SparseD = -15,
-    [pbr::OriginalName("SPARSE_E")] SparseE = -53452,
-    /// <summary>
-    /// In proto3, value 0 must be the first one specified
-    /// SPARSE_F = 0;
-    /// </summary>
-    [pbr::OriginalName("SPARSE_G")] SparseG = 2,
-  }
-
-  /// <summary>
-  /// Leading enum comment
-  /// </summary>
-  public enum CommentEnum {
-    /// <summary>
-    /// Zero value comment
-    /// </summary>
-    [pbr::OriginalName("ZERO_VALUE")] ZeroValue = 0,
-  }
-
-  #endregion
-
-  #region Messages
-  /// <summary>
-  /// This proto includes every type of field in both singular and repeated
-  /// forms.
-  /// </summary>
-  public sealed partial class TestAllTypes : pb::IMessage<TestAllTypes>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<TestAllTypes> _parser = new pb::MessageParser<TestAllTypes>(() => new TestAllTypes());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<TestAllTypes> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.UnittestProto3Reflection.Descriptor.MessageTypes[0]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestAllTypes() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestAllTypes(TestAllTypes other) : this() {
-      singleInt32_ = other.singleInt32_;
-      singleInt64_ = other.singleInt64_;
-      singleUint32_ = other.singleUint32_;
-      singleUint64_ = other.singleUint64_;
-      singleSint32_ = other.singleSint32_;
-      singleSint64_ = other.singleSint64_;
-      singleFixed32_ = other.singleFixed32_;
-      singleFixed64_ = other.singleFixed64_;
-      singleSfixed32_ = other.singleSfixed32_;
-      singleSfixed64_ = other.singleSfixed64_;
-      singleFloat_ = other.singleFloat_;
-      singleDouble_ = other.singleDouble_;
-      singleBool_ = other.singleBool_;
-      singleString_ = other.singleString_;
-      singleBytes_ = other.singleBytes_;
-      singleNestedMessage_ = other.singleNestedMessage_ != null ? other.singleNestedMessage_.Clone() : null;
-      singleForeignMessage_ = other.singleForeignMessage_ != null ? other.singleForeignMessage_.Clone() : null;
-      singleImportMessage_ = other.singleImportMessage_ != null ? other.singleImportMessage_.Clone() : null;
-      singleNestedEnum_ = other.singleNestedEnum_;
-      singleForeignEnum_ = other.singleForeignEnum_;
-      singleImportEnum_ = other.singleImportEnum_;
-      singlePublicImportMessage_ = other.singlePublicImportMessage_ != null ? other.singlePublicImportMessage_.Clone() : null;
-      repeatedInt32_ = other.repeatedInt32_.Clone();
-      repeatedInt64_ = other.repeatedInt64_.Clone();
-      repeatedUint32_ = other.repeatedUint32_.Clone();
-      repeatedUint64_ = other.repeatedUint64_.Clone();
-      repeatedSint32_ = other.repeatedSint32_.Clone();
-      repeatedSint64_ = other.repeatedSint64_.Clone();
-      repeatedFixed32_ = other.repeatedFixed32_.Clone();
-      repeatedFixed64_ = other.repeatedFixed64_.Clone();
-      repeatedSfixed32_ = other.repeatedSfixed32_.Clone();
-      repeatedSfixed64_ = other.repeatedSfixed64_.Clone();
-      repeatedFloat_ = other.repeatedFloat_.Clone();
-      repeatedDouble_ = other.repeatedDouble_.Clone();
-      repeatedBool_ = other.repeatedBool_.Clone();
-      repeatedString_ = other.repeatedString_.Clone();
-      repeatedBytes_ = other.repeatedBytes_.Clone();
-      repeatedNestedMessage_ = other.repeatedNestedMessage_.Clone();
-      repeatedForeignMessage_ = other.repeatedForeignMessage_.Clone();
-      repeatedImportMessage_ = other.repeatedImportMessage_.Clone();
-      repeatedNestedEnum_ = other.repeatedNestedEnum_.Clone();
-      repeatedForeignEnum_ = other.repeatedForeignEnum_.Clone();
-      repeatedImportEnum_ = other.repeatedImportEnum_.Clone();
-      repeatedPublicImportMessage_ = other.repeatedPublicImportMessage_.Clone();
-      switch (other.OneofFieldCase) {
-        case OneofFieldOneofCase.OneofUint32:
-          OneofUint32 = other.OneofUint32;
-          break;
-        case OneofFieldOneofCase.OneofNestedMessage:
-          OneofNestedMessage = other.OneofNestedMessage.Clone();
-          break;
-        case OneofFieldOneofCase.OneofString:
-          OneofString = other.OneofString;
-          break;
-        case OneofFieldOneofCase.OneofBytes:
-          OneofBytes = other.OneofBytes;
-          break;
-      }
-
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestAllTypes Clone() {
-      return new TestAllTypes(this);
-    }
-
-    /// <summary>Field number for the "single_int32" field.</summary>
-    public const int SingleInt32FieldNumber = 1;
-    private int singleInt32_;
-    /// <summary>
-    /// Singular
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int SingleInt32 {
-      get { return singleInt32_; }
-      set {
-        singleInt32_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "single_int64" field.</summary>
-    public const int SingleInt64FieldNumber = 2;
-    private long singleInt64_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public long SingleInt64 {
-      get { return singleInt64_; }
-      set {
-        singleInt64_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "single_uint32" field.</summary>
-    public const int SingleUint32FieldNumber = 3;
-    private uint singleUint32_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public uint SingleUint32 {
-      get { return singleUint32_; }
-      set {
-        singleUint32_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "single_uint64" field.</summary>
-    public const int SingleUint64FieldNumber = 4;
-    private ulong singleUint64_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ulong SingleUint64 {
-      get { return singleUint64_; }
-      set {
-        singleUint64_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "single_sint32" field.</summary>
-    public const int SingleSint32FieldNumber = 5;
-    private int singleSint32_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int SingleSint32 {
-      get { return singleSint32_; }
-      set {
-        singleSint32_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "single_sint64" field.</summary>
-    public const int SingleSint64FieldNumber = 6;
-    private long singleSint64_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public long SingleSint64 {
-      get { return singleSint64_; }
-      set {
-        singleSint64_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "single_fixed32" field.</summary>
-    public const int SingleFixed32FieldNumber = 7;
-    private uint singleFixed32_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public uint SingleFixed32 {
-      get { return singleFixed32_; }
-      set {
-        singleFixed32_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "single_fixed64" field.</summary>
-    public const int SingleFixed64FieldNumber = 8;
-    private ulong singleFixed64_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ulong SingleFixed64 {
-      get { return singleFixed64_; }
-      set {
-        singleFixed64_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "single_sfixed32" field.</summary>
-    public const int SingleSfixed32FieldNumber = 9;
-    private int singleSfixed32_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int SingleSfixed32 {
-      get { return singleSfixed32_; }
-      set {
-        singleSfixed32_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "single_sfixed64" field.</summary>
-    public const int SingleSfixed64FieldNumber = 10;
-    private long singleSfixed64_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public long SingleSfixed64 {
-      get { return singleSfixed64_; }
-      set {
-        singleSfixed64_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "single_float" field.</summary>
-    public const int SingleFloatFieldNumber = 11;
-    private float singleFloat_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public float SingleFloat {
-      get { return singleFloat_; }
-      set {
-        singleFloat_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "single_double" field.</summary>
-    public const int SingleDoubleFieldNumber = 12;
-    private double singleDouble_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double SingleDouble {
-      get { return singleDouble_; }
-      set {
-        singleDouble_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "single_bool" field.</summary>
-    public const int SingleBoolFieldNumber = 13;
-    private bool singleBool_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool SingleBool {
-      get { return singleBool_; }
-      set {
-        singleBool_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "single_string" field.</summary>
-    public const int SingleStringFieldNumber = 14;
-    private string singleString_ = "";
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string SingleString {
-      get { return singleString_; }
-      set {
-        singleString_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-
-    /// <summary>Field number for the "single_bytes" field.</summary>
-    public const int SingleBytesFieldNumber = 15;
-    private pb::ByteString singleBytes_ = pb::ByteString.Empty;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pb::ByteString SingleBytes {
-      get { return singleBytes_; }
-      set {
-        singleBytes_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-
-    /// <summary>Field number for the "single_nested_message" field.</summary>
-    public const int SingleNestedMessageFieldNumber = 18;
-    private global::Google.Protobuf.TestProtos.TestAllTypes.Types.NestedMessage singleNestedMessage_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.TestProtos.TestAllTypes.Types.NestedMessage SingleNestedMessage {
-      get { return singleNestedMessage_; }
-      set {
-        singleNestedMessage_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "single_foreign_message" field.</summary>
-    public const int SingleForeignMessageFieldNumber = 19;
-    private global::Google.Protobuf.TestProtos.ForeignMessage singleForeignMessage_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.TestProtos.ForeignMessage SingleForeignMessage {
-      get { return singleForeignMessage_; }
-      set {
-        singleForeignMessage_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "single_import_message" field.</summary>
-    public const int SingleImportMessageFieldNumber = 20;
-    private global::Google.Protobuf.TestProtos.ImportMessage singleImportMessage_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.TestProtos.ImportMessage SingleImportMessage {
-      get { return singleImportMessage_; }
-      set {
-        singleImportMessage_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "single_nested_enum" field.</summary>
-    public const int SingleNestedEnumFieldNumber = 21;
-    private global::Google.Protobuf.TestProtos.TestAllTypes.Types.NestedEnum singleNestedEnum_ = global::Google.Protobuf.TestProtos.TestAllTypes.Types.NestedEnum.Unspecified;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.TestProtos.TestAllTypes.Types.NestedEnum SingleNestedEnum {
-      get { return singleNestedEnum_; }
-      set {
-        singleNestedEnum_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "single_foreign_enum" field.</summary>
-    public const int SingleForeignEnumFieldNumber = 22;
-    private global::Google.Protobuf.TestProtos.ForeignEnum singleForeignEnum_ = global::Google.Protobuf.TestProtos.ForeignEnum.ForeignUnspecified;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.TestProtos.ForeignEnum SingleForeignEnum {
-      get { return singleForeignEnum_; }
-      set {
-        singleForeignEnum_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "single_import_enum" field.</summary>
-    public const int SingleImportEnumFieldNumber = 23;
-    private global::Google.Protobuf.TestProtos.ImportEnum singleImportEnum_ = global::Google.Protobuf.TestProtos.ImportEnum.Unspecified;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.TestProtos.ImportEnum SingleImportEnum {
-      get { return singleImportEnum_; }
-      set {
-        singleImportEnum_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "single_public_import_message" field.</summary>
-    public const int SinglePublicImportMessageFieldNumber = 26;
-    private global::Google.Protobuf.TestProtos.PublicImportMessage singlePublicImportMessage_;
-    /// <summary>
-    /// Defined in unittest_import_public.proto
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.TestProtos.PublicImportMessage SinglePublicImportMessage {
-      get { return singlePublicImportMessage_; }
-      set {
-        singlePublicImportMessage_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "repeated_int32" field.</summary>
-    public const int RepeatedInt32FieldNumber = 31;
-    private static readonly pb::FieldCodec<int> _repeated_repeatedInt32_codec
-        = pb::FieldCodec.ForInt32(250);
-    private readonly pbc::RepeatedField<int> repeatedInt32_ = new pbc::RepeatedField<int>();
-    /// <summary>
-    /// Repeated
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<int> RepeatedInt32 {
-      get { return repeatedInt32_; }
-    }
-
-    /// <summary>Field number for the "repeated_int64" field.</summary>
-    public const int RepeatedInt64FieldNumber = 32;
-    private static readonly pb::FieldCodec<long> _repeated_repeatedInt64_codec
-        = pb::FieldCodec.ForInt64(258);
-    private readonly pbc::RepeatedField<long> repeatedInt64_ = new pbc::RepeatedField<long>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<long> RepeatedInt64 {
-      get { return repeatedInt64_; }
-    }
-
-    /// <summary>Field number for the "repeated_uint32" field.</summary>
-    public const int RepeatedUint32FieldNumber = 33;
-    private static readonly pb::FieldCodec<uint> _repeated_repeatedUint32_codec
-        = pb::FieldCodec.ForUInt32(266);
-    private readonly pbc::RepeatedField<uint> repeatedUint32_ = new pbc::RepeatedField<uint>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<uint> RepeatedUint32 {
-      get { return repeatedUint32_; }
-    }
-
-    /// <summary>Field number for the "repeated_uint64" field.</summary>
-    public const int RepeatedUint64FieldNumber = 34;
-    private static readonly pb::FieldCodec<ulong> _repeated_repeatedUint64_codec
-        = pb::FieldCodec.ForUInt64(274);
-    private readonly pbc::RepeatedField<ulong> repeatedUint64_ = new pbc::RepeatedField<ulong>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<ulong> RepeatedUint64 {
-      get { return repeatedUint64_; }
-    }
-
-    /// <summary>Field number for the "repeated_sint32" field.</summary>
-    public const int RepeatedSint32FieldNumber = 35;
-    private static readonly pb::FieldCodec<int> _repeated_repeatedSint32_codec
-        = pb::FieldCodec.ForSInt32(282);
-    private readonly pbc::RepeatedField<int> repeatedSint32_ = new pbc::RepeatedField<int>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<int> RepeatedSint32 {
-      get { return repeatedSint32_; }
-    }
-
-    /// <summary>Field number for the "repeated_sint64" field.</summary>
-    public const int RepeatedSint64FieldNumber = 36;
-    private static readonly pb::FieldCodec<long> _repeated_repeatedSint64_codec
-        = pb::FieldCodec.ForSInt64(290);
-    private readonly pbc::RepeatedField<long> repeatedSint64_ = new pbc::RepeatedField<long>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<long> RepeatedSint64 {
-      get { return repeatedSint64_; }
-    }
-
-    /// <summary>Field number for the "repeated_fixed32" field.</summary>
-    public const int RepeatedFixed32FieldNumber = 37;
-    private static readonly pb::FieldCodec<uint> _repeated_repeatedFixed32_codec
-        = pb::FieldCodec.ForFixed32(298);
-    private readonly pbc::RepeatedField<uint> repeatedFixed32_ = new pbc::RepeatedField<uint>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<uint> RepeatedFixed32 {
-      get { return repeatedFixed32_; }
-    }
-
-    /// <summary>Field number for the "repeated_fixed64" field.</summary>
-    public const int RepeatedFixed64FieldNumber = 38;
-    private static readonly pb::FieldCodec<ulong> _repeated_repeatedFixed64_codec
-        = pb::FieldCodec.ForFixed64(306);
-    private readonly pbc::RepeatedField<ulong> repeatedFixed64_ = new pbc::RepeatedField<ulong>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<ulong> RepeatedFixed64 {
-      get { return repeatedFixed64_; }
-    }
-
-    /// <summary>Field number for the "repeated_sfixed32" field.</summary>
-    public const int RepeatedSfixed32FieldNumber = 39;
-    private static readonly pb::FieldCodec<int> _repeated_repeatedSfixed32_codec
-        = pb::FieldCodec.ForSFixed32(314);
-    private readonly pbc::RepeatedField<int> repeatedSfixed32_ = new pbc::RepeatedField<int>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<int> RepeatedSfixed32 {
-      get { return repeatedSfixed32_; }
-    }
-
-    /// <summary>Field number for the "repeated_sfixed64" field.</summary>
-    public const int RepeatedSfixed64FieldNumber = 40;
-    private static readonly pb::FieldCodec<long> _repeated_repeatedSfixed64_codec
-        = pb::FieldCodec.ForSFixed64(322);
-    private readonly pbc::RepeatedField<long> repeatedSfixed64_ = new pbc::RepeatedField<long>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<long> RepeatedSfixed64 {
-      get { return repeatedSfixed64_; }
-    }
-
-    /// <summary>Field number for the "repeated_float" field.</summary>
-    public const int RepeatedFloatFieldNumber = 41;
-    private static readonly pb::FieldCodec<float> _repeated_repeatedFloat_codec
-        = pb::FieldCodec.ForFloat(330);
-    private readonly pbc::RepeatedField<float> repeatedFloat_ = new pbc::RepeatedField<float>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<float> RepeatedFloat {
-      get { return repeatedFloat_; }
-    }
-
-    /// <summary>Field number for the "repeated_double" field.</summary>
-    public const int RepeatedDoubleFieldNumber = 42;
-    private static readonly pb::FieldCodec<double> _repeated_repeatedDouble_codec
-        = pb::FieldCodec.ForDouble(338);
-    private readonly pbc::RepeatedField<double> repeatedDouble_ = new pbc::RepeatedField<double>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<double> RepeatedDouble {
-      get { return repeatedDouble_; }
-    }
-
-    /// <summary>Field number for the "repeated_bool" field.</summary>
-    public const int RepeatedBoolFieldNumber = 43;
-    private static readonly pb::FieldCodec<bool> _repeated_repeatedBool_codec
-        = pb::FieldCodec.ForBool(346);
-    private readonly pbc::RepeatedField<bool> repeatedBool_ = new pbc::RepeatedField<bool>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<bool> RepeatedBool {
-      get { return repeatedBool_; }
-    }
-
-    /// <summary>Field number for the "repeated_string" field.</summary>
-    public const int RepeatedStringFieldNumber = 44;
-    private static readonly pb::FieldCodec<string> _repeated_repeatedString_codec
-        = pb::FieldCodec.ForString(354);
-    private readonly pbc::RepeatedField<string> repeatedString_ = new pbc::RepeatedField<string>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<string> RepeatedString {
-      get { return repeatedString_; }
-    }
-
-    /// <summary>Field number for the "repeated_bytes" field.</summary>
-    public const int RepeatedBytesFieldNumber = 45;
-    private static readonly pb::FieldCodec<pb::ByteString> _repeated_repeatedBytes_codec
-        = pb::FieldCodec.ForBytes(362);
-    private readonly pbc::RepeatedField<pb::ByteString> repeatedBytes_ = new pbc::RepeatedField<pb::ByteString>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<pb::ByteString> RepeatedBytes {
-      get { return repeatedBytes_; }
-    }
-
-    /// <summary>Field number for the "repeated_nested_message" field.</summary>
-    public const int RepeatedNestedMessageFieldNumber = 48;
-    private static readonly pb::FieldCodec<global::Google.Protobuf.TestProtos.TestAllTypes.Types.NestedMessage> _repeated_repeatedNestedMessage_codec
-        = pb::FieldCodec.ForMessage(386, global::Google.Protobuf.TestProtos.TestAllTypes.Types.NestedMessage.Parser);
-    private readonly pbc::RepeatedField<global::Google.Protobuf.TestProtos.TestAllTypes.Types.NestedMessage> repeatedNestedMessage_ = new pbc::RepeatedField<global::Google.Protobuf.TestProtos.TestAllTypes.Types.NestedMessage>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Google.Protobuf.TestProtos.TestAllTypes.Types.NestedMessage> RepeatedNestedMessage {
-      get { return repeatedNestedMessage_; }
-    }
-
-    /// <summary>Field number for the "repeated_foreign_message" field.</summary>
-    public const int RepeatedForeignMessageFieldNumber = 49;
-    private static readonly pb::FieldCodec<global::Google.Protobuf.TestProtos.ForeignMessage> _repeated_repeatedForeignMessage_codec
-        = pb::FieldCodec.ForMessage(394, global::Google.Protobuf.TestProtos.ForeignMessage.Parser);
-    private readonly pbc::RepeatedField<global::Google.Protobuf.TestProtos.ForeignMessage> repeatedForeignMessage_ = new pbc::RepeatedField<global::Google.Protobuf.TestProtos.ForeignMessage>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Google.Protobuf.TestProtos.ForeignMessage> RepeatedForeignMessage {
-      get { return repeatedForeignMessage_; }
-    }
-
-    /// <summary>Field number for the "repeated_import_message" field.</summary>
-    public const int RepeatedImportMessageFieldNumber = 50;
-    private static readonly pb::FieldCodec<global::Google.Protobuf.TestProtos.ImportMessage> _repeated_repeatedImportMessage_codec
-        = pb::FieldCodec.ForMessage(402, global::Google.Protobuf.TestProtos.ImportMessage.Parser);
-    private readonly pbc::RepeatedField<global::Google.Protobuf.TestProtos.ImportMessage> repeatedImportMessage_ = new pbc::RepeatedField<global::Google.Protobuf.TestProtos.ImportMessage>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Google.Protobuf.TestProtos.ImportMessage> RepeatedImportMessage {
-      get { return repeatedImportMessage_; }
-    }
-
-    /// <summary>Field number for the "repeated_nested_enum" field.</summary>
-    public const int RepeatedNestedEnumFieldNumber = 51;
-    private static readonly pb::FieldCodec<global::Google.Protobuf.TestProtos.TestAllTypes.Types.NestedEnum> _repeated_repeatedNestedEnum_codec
-        = pb::FieldCodec.ForEnum(410, x => (int) x, x => (global::Google.Protobuf.TestProtos.TestAllTypes.Types.NestedEnum) x);
-    private readonly pbc::RepeatedField<global::Google.Protobuf.TestProtos.TestAllTypes.Types.NestedEnum> repeatedNestedEnum_ = new pbc::RepeatedField<global::Google.Protobuf.TestProtos.TestAllTypes.Types.NestedEnum>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Google.Protobuf.TestProtos.TestAllTypes.Types.NestedEnum> RepeatedNestedEnum {
-      get { return repeatedNestedEnum_; }
-    }
-
-    /// <summary>Field number for the "repeated_foreign_enum" field.</summary>
-    public const int RepeatedForeignEnumFieldNumber = 52;
-    private static readonly pb::FieldCodec<global::Google.Protobuf.TestProtos.ForeignEnum> _repeated_repeatedForeignEnum_codec
-        = pb::FieldCodec.ForEnum(418, x => (int) x, x => (global::Google.Protobuf.TestProtos.ForeignEnum) x);
-    private readonly pbc::RepeatedField<global::Google.Protobuf.TestProtos.ForeignEnum> repeatedForeignEnum_ = new pbc::RepeatedField<global::Google.Protobuf.TestProtos.ForeignEnum>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Google.Protobuf.TestProtos.ForeignEnum> RepeatedForeignEnum {
-      get { return repeatedForeignEnum_; }
-    }
-
-    /// <summary>Field number for the "repeated_import_enum" field.</summary>
-    public const int RepeatedImportEnumFieldNumber = 53;
-    private static readonly pb::FieldCodec<global::Google.Protobuf.TestProtos.ImportEnum> _repeated_repeatedImportEnum_codec
-        = pb::FieldCodec.ForEnum(426, x => (int) x, x => (global::Google.Protobuf.TestProtos.ImportEnum) x);
-    private readonly pbc::RepeatedField<global::Google.Protobuf.TestProtos.ImportEnum> repeatedImportEnum_ = new pbc::RepeatedField<global::Google.Protobuf.TestProtos.ImportEnum>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Google.Protobuf.TestProtos.ImportEnum> RepeatedImportEnum {
-      get { return repeatedImportEnum_; }
-    }
-
-    /// <summary>Field number for the "repeated_public_import_message" field.</summary>
-    public const int RepeatedPublicImportMessageFieldNumber = 54;
-    private static readonly pb::FieldCodec<global::Google.Protobuf.TestProtos.PublicImportMessage> _repeated_repeatedPublicImportMessage_codec
-        = pb::FieldCodec.ForMessage(434, global::Google.Protobuf.TestProtos.PublicImportMessage.Parser);
-    private readonly pbc::RepeatedField<global::Google.Protobuf.TestProtos.PublicImportMessage> repeatedPublicImportMessage_ = new pbc::RepeatedField<global::Google.Protobuf.TestProtos.PublicImportMessage>();
-    /// <summary>
-    /// Defined in unittest_import_public.proto
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Google.Protobuf.TestProtos.PublicImportMessage> RepeatedPublicImportMessage {
-      get { return repeatedPublicImportMessage_; }
-    }
-
-    /// <summary>Field number for the "oneof_uint32" field.</summary>
-    public const int OneofUint32FieldNumber = 111;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public uint OneofUint32 {
-      get { return oneofFieldCase_ == OneofFieldOneofCase.OneofUint32 ? (uint) oneofField_ : 0; }
-      set {
-        oneofField_ = value;
-        oneofFieldCase_ = OneofFieldOneofCase.OneofUint32;
-      }
-    }
-
-    /// <summary>Field number for the "oneof_nested_message" field.</summary>
-    public const int OneofNestedMessageFieldNumber = 112;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.TestProtos.TestAllTypes.Types.NestedMessage OneofNestedMessage {
-      get { return oneofFieldCase_ == OneofFieldOneofCase.OneofNestedMessage ? (global::Google.Protobuf.TestProtos.TestAllTypes.Types.NestedMessage) oneofField_ : null; }
-      set {
-        oneofField_ = value;
-        oneofFieldCase_ = value == null ? OneofFieldOneofCase.None : OneofFieldOneofCase.OneofNestedMessage;
-      }
-    }
-
-    /// <summary>Field number for the "oneof_string" field.</summary>
-    public const int OneofStringFieldNumber = 113;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string OneofString {
-      get { return oneofFieldCase_ == OneofFieldOneofCase.OneofString ? (string) oneofField_ : ""; }
-      set {
-        oneofField_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-        oneofFieldCase_ = OneofFieldOneofCase.OneofString;
-      }
-    }
-
-    /// <summary>Field number for the "oneof_bytes" field.</summary>
-    public const int OneofBytesFieldNumber = 114;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pb::ByteString OneofBytes {
-      get { return oneofFieldCase_ == OneofFieldOneofCase.OneofBytes ? (pb::ByteString) oneofField_ : pb::ByteString.Empty; }
-      set {
-        oneofField_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-        oneofFieldCase_ = OneofFieldOneofCase.OneofBytes;
-      }
-    }
-
-    private object oneofField_;
-    /// <summary>Enum of possible cases for the "oneof_field" oneof.</summary>
-    public enum OneofFieldOneofCase {
-      None = 0,
-      OneofUint32 = 111,
-      OneofNestedMessage = 112,
-      OneofString = 113,
-      OneofBytes = 114,
-    }
-    private OneofFieldOneofCase oneofFieldCase_ = OneofFieldOneofCase.None;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public OneofFieldOneofCase OneofFieldCase {
-      get { return oneofFieldCase_; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearOneofField() {
-      oneofFieldCase_ = OneofFieldOneofCase.None;
-      oneofField_ = null;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as TestAllTypes);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(TestAllTypes other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (SingleInt32 != other.SingleInt32) return false;
-      if (SingleInt64 != other.SingleInt64) return false;
-      if (SingleUint32 != other.SingleUint32) return false;
-      if (SingleUint64 != other.SingleUint64) return false;
-      if (SingleSint32 != other.SingleSint32) return false;
-      if (SingleSint64 != other.SingleSint64) return false;
-      if (SingleFixed32 != other.SingleFixed32) return false;
-      if (SingleFixed64 != other.SingleFixed64) return false;
-      if (SingleSfixed32 != other.SingleSfixed32) return false;
-      if (SingleSfixed64 != other.SingleSfixed64) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.Equals(SingleFloat, other.SingleFloat)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.Equals(SingleDouble, other.SingleDouble)) return false;
-      if (SingleBool != other.SingleBool) return false;
-      if (SingleString != other.SingleString) return false;
-      if (SingleBytes != other.SingleBytes) return false;
-      if (!object.Equals(SingleNestedMessage, other.SingleNestedMessage)) return false;
-      if (!object.Equals(SingleForeignMessage, other.SingleForeignMessage)) return false;
-      if (!object.Equals(SingleImportMessage, other.SingleImportMessage)) return false;
-      if (SingleNestedEnum != other.SingleNestedEnum) return false;
-      if (SingleForeignEnum != other.SingleForeignEnum) return false;
-      if (SingleImportEnum != other.SingleImportEnum) return false;
-      if (!object.Equals(SinglePublicImportMessage, other.SinglePublicImportMessage)) return false;
-      if(!repeatedInt32_.Equals(other.repeatedInt32_)) return false;
-      if(!repeatedInt64_.Equals(other.repeatedInt64_)) return false;
-      if(!repeatedUint32_.Equals(other.repeatedUint32_)) return false;
-      if(!repeatedUint64_.Equals(other.repeatedUint64_)) return false;
-      if(!repeatedSint32_.Equals(other.repeatedSint32_)) return false;
-      if(!repeatedSint64_.Equals(other.repeatedSint64_)) return false;
-      if(!repeatedFixed32_.Equals(other.repeatedFixed32_)) return false;
-      if(!repeatedFixed64_.Equals(other.repeatedFixed64_)) return false;
-      if(!repeatedSfixed32_.Equals(other.repeatedSfixed32_)) return false;
-      if(!repeatedSfixed64_.Equals(other.repeatedSfixed64_)) return false;
-      if(!repeatedFloat_.Equals(other.repeatedFloat_)) return false;
-      if(!repeatedDouble_.Equals(other.repeatedDouble_)) return false;
-      if(!repeatedBool_.Equals(other.repeatedBool_)) return false;
-      if(!repeatedString_.Equals(other.repeatedString_)) return false;
-      if(!repeatedBytes_.Equals(other.repeatedBytes_)) return false;
-      if(!repeatedNestedMessage_.Equals(other.repeatedNestedMessage_)) return false;
-      if(!repeatedForeignMessage_.Equals(other.repeatedForeignMessage_)) return false;
-      if(!repeatedImportMessage_.Equals(other.repeatedImportMessage_)) return false;
-      if(!repeatedNestedEnum_.Equals(other.repeatedNestedEnum_)) return false;
-      if(!repeatedForeignEnum_.Equals(other.repeatedForeignEnum_)) return false;
-      if(!repeatedImportEnum_.Equals(other.repeatedImportEnum_)) return false;
-      if(!repeatedPublicImportMessage_.Equals(other.repeatedPublicImportMessage_)) return false;
-      if (OneofUint32 != other.OneofUint32) return false;
-      if (!object.Equals(OneofNestedMessage, other.OneofNestedMessage)) return false;
-      if (OneofString != other.OneofString) return false;
-      if (OneofBytes != other.OneofBytes) return false;
-      if (OneofFieldCase != other.OneofFieldCase) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (SingleInt32 != 0) hash ^= SingleInt32.GetHashCode();
-      if (SingleInt64 != 0L) hash ^= SingleInt64.GetHashCode();
-      if (SingleUint32 != 0) hash ^= SingleUint32.GetHashCode();
-      if (SingleUint64 != 0UL) hash ^= SingleUint64.GetHashCode();
-      if (SingleSint32 != 0) hash ^= SingleSint32.GetHashCode();
-      if (SingleSint64 != 0L) hash ^= SingleSint64.GetHashCode();
-      if (SingleFixed32 != 0) hash ^= SingleFixed32.GetHashCode();
-      if (SingleFixed64 != 0UL) hash ^= SingleFixed64.GetHashCode();
-      if (SingleSfixed32 != 0) hash ^= SingleSfixed32.GetHashCode();
-      if (SingleSfixed64 != 0L) hash ^= SingleSfixed64.GetHashCode();
-      if (SingleFloat != 0F) hash ^= pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.GetHashCode(SingleFloat);
-      if (SingleDouble != 0D) hash ^= pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.GetHashCode(SingleDouble);
-      if (SingleBool != false) hash ^= SingleBool.GetHashCode();
-      if (SingleString.Length != 0) hash ^= SingleString.GetHashCode();
-      if (SingleBytes.Length != 0) hash ^= SingleBytes.GetHashCode();
-      if (singleNestedMessage_ != null) hash ^= SingleNestedMessage.GetHashCode();
-      if (singleForeignMessage_ != null) hash ^= SingleForeignMessage.GetHashCode();
-      if (singleImportMessage_ != null) hash ^= SingleImportMessage.GetHashCode();
-      if (SingleNestedEnum != global::Google.Protobuf.TestProtos.TestAllTypes.Types.NestedEnum.Unspecified) hash ^= SingleNestedEnum.GetHashCode();
-      if (SingleForeignEnum != global::Google.Protobuf.TestProtos.ForeignEnum.ForeignUnspecified) hash ^= SingleForeignEnum.GetHashCode();
-      if (SingleImportEnum != global::Google.Protobuf.TestProtos.ImportEnum.Unspecified) hash ^= SingleImportEnum.GetHashCode();
-      if (singlePublicImportMessage_ != null) hash ^= SinglePublicImportMessage.GetHashCode();
-      hash ^= repeatedInt32_.GetHashCode();
-      hash ^= repeatedInt64_.GetHashCode();
-      hash ^= repeatedUint32_.GetHashCode();
-      hash ^= repeatedUint64_.GetHashCode();
-      hash ^= repeatedSint32_.GetHashCode();
-      hash ^= repeatedSint64_.GetHashCode();
-      hash ^= repeatedFixed32_.GetHashCode();
-      hash ^= repeatedFixed64_.GetHashCode();
-      hash ^= repeatedSfixed32_.GetHashCode();
-      hash ^= repeatedSfixed64_.GetHashCode();
-      hash ^= repeatedFloat_.GetHashCode();
-      hash ^= repeatedDouble_.GetHashCode();
-      hash ^= repeatedBool_.GetHashCode();
-      hash ^= repeatedString_.GetHashCode();
-      hash ^= repeatedBytes_.GetHashCode();
-      hash ^= repeatedNestedMessage_.GetHashCode();
-      hash ^= repeatedForeignMessage_.GetHashCode();
-      hash ^= repeatedImportMessage_.GetHashCode();
-      hash ^= repeatedNestedEnum_.GetHashCode();
-      hash ^= repeatedForeignEnum_.GetHashCode();
-      hash ^= repeatedImportEnum_.GetHashCode();
-      hash ^= repeatedPublicImportMessage_.GetHashCode();
-      if (oneofFieldCase_ == OneofFieldOneofCase.OneofUint32) hash ^= OneofUint32.GetHashCode();
-      if (oneofFieldCase_ == OneofFieldOneofCase.OneofNestedMessage) hash ^= OneofNestedMessage.GetHashCode();
-      if (oneofFieldCase_ == OneofFieldOneofCase.OneofString) hash ^= OneofString.GetHashCode();
-      if (oneofFieldCase_ == OneofFieldOneofCase.OneofBytes) hash ^= OneofBytes.GetHashCode();
-      hash ^= (int) oneofFieldCase_;
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (SingleInt32 != 0) {
-        output.WriteRawTag(8);
-        output.WriteInt32(SingleInt32);
-      }
-      if (SingleInt64 != 0L) {
-        output.WriteRawTag(16);
-        output.WriteInt64(SingleInt64);
-      }
-      if (SingleUint32 != 0) {
-        output.WriteRawTag(24);
-        output.WriteUInt32(SingleUint32);
-      }
-      if (SingleUint64 != 0UL) {
-        output.WriteRawTag(32);
-        output.WriteUInt64(SingleUint64);
-      }
-      if (SingleSint32 != 0) {
-        output.WriteRawTag(40);
-        output.WriteSInt32(SingleSint32);
-      }
-      if (SingleSint64 != 0L) {
-        output.WriteRawTag(48);
-        output.WriteSInt64(SingleSint64);
-      }
-      if (SingleFixed32 != 0) {
-        output.WriteRawTag(61);
-        output.WriteFixed32(SingleFixed32);
-      }
-      if (SingleFixed64 != 0UL) {
-        output.WriteRawTag(65);
-        output.WriteFixed64(SingleFixed64);
-      }
-      if (SingleSfixed32 != 0) {
-        output.WriteRawTag(77);
-        output.WriteSFixed32(SingleSfixed32);
-      }
-      if (SingleSfixed64 != 0L) {
-        output.WriteRawTag(81);
-        output.WriteSFixed64(SingleSfixed64);
-      }
-      if (SingleFloat != 0F) {
-        output.WriteRawTag(93);
-        output.WriteFloat(SingleFloat);
-      }
-      if (SingleDouble != 0D) {
-        output.WriteRawTag(97);
-        output.WriteDouble(SingleDouble);
-      }
-      if (SingleBool != false) {
-        output.WriteRawTag(104);
-        output.WriteBool(SingleBool);
-      }
-      if (SingleString.Length != 0) {
-        output.WriteRawTag(114);
-        output.WriteString(SingleString);
-      }
-      if (SingleBytes.Length != 0) {
-        output.WriteRawTag(122);
-        output.WriteBytes(SingleBytes);
-      }
-      if (singleNestedMessage_ != null) {
-        output.WriteRawTag(146, 1);
-        output.WriteMessage(SingleNestedMessage);
-      }
-      if (singleForeignMessage_ != null) {
-        output.WriteRawTag(154, 1);
-        output.WriteMessage(SingleForeignMessage);
-      }
-      if (singleImportMessage_ != null) {
-        output.WriteRawTag(162, 1);
-        output.WriteMessage(SingleImportMessage);
-      }
-      if (SingleNestedEnum != global::Google.Protobuf.TestProtos.TestAllTypes.Types.NestedEnum.Unspecified) {
-        output.WriteRawTag(168, 1);
-        output.WriteEnum((int) SingleNestedEnum);
-      }
-      if (SingleForeignEnum != global::Google.Protobuf.TestProtos.ForeignEnum.ForeignUnspecified) {
-        output.WriteRawTag(176, 1);
-        output.WriteEnum((int) SingleForeignEnum);
-      }
-      if (SingleImportEnum != global::Google.Protobuf.TestProtos.ImportEnum.Unspecified) {
-        output.WriteRawTag(184, 1);
-        output.WriteEnum((int) SingleImportEnum);
-      }
-      if (singlePublicImportMessage_ != null) {
-        output.WriteRawTag(210, 1);
-        output.WriteMessage(SinglePublicImportMessage);
-      }
-      repeatedInt32_.WriteTo(output, _repeated_repeatedInt32_codec);
-      repeatedInt64_.WriteTo(output, _repeated_repeatedInt64_codec);
-      repeatedUint32_.WriteTo(output, _repeated_repeatedUint32_codec);
-      repeatedUint64_.WriteTo(output, _repeated_repeatedUint64_codec);
-      repeatedSint32_.WriteTo(output, _repeated_repeatedSint32_codec);
-      repeatedSint64_.WriteTo(output, _repeated_repeatedSint64_codec);
-      repeatedFixed32_.WriteTo(output, _repeated_repeatedFixed32_codec);
-      repeatedFixed64_.WriteTo(output, _repeated_repeatedFixed64_codec);
-      repeatedSfixed32_.WriteTo(output, _repeated_repeatedSfixed32_codec);
-      repeatedSfixed64_.WriteTo(output, _repeated_repeatedSfixed64_codec);
-      repeatedFloat_.WriteTo(output, _repeated_repeatedFloat_codec);
-      repeatedDouble_.WriteTo(output, _repeated_repeatedDouble_codec);
-      repeatedBool_.WriteTo(output, _repeated_repeatedBool_codec);
-      repeatedString_.WriteTo(output, _repeated_repeatedString_codec);
-      repeatedBytes_.WriteTo(output, _repeated_repeatedBytes_codec);
-      repeatedNestedMessage_.WriteTo(output, _repeated_repeatedNestedMessage_codec);
-      repeatedForeignMessage_.WriteTo(output, _repeated_repeatedForeignMessage_codec);
-      repeatedImportMessage_.WriteTo(output, _repeated_repeatedImportMessage_codec);
-      repeatedNestedEnum_.WriteTo(output, _repeated_repeatedNestedEnum_codec);
-      repeatedForeignEnum_.WriteTo(output, _repeated_repeatedForeignEnum_codec);
-      repeatedImportEnum_.WriteTo(output, _repeated_repeatedImportEnum_codec);
-      repeatedPublicImportMessage_.WriteTo(output, _repeated_repeatedPublicImportMessage_codec);
-      if (oneofFieldCase_ == OneofFieldOneofCase.OneofUint32) {
-        output.WriteRawTag(248, 6);
-        output.WriteUInt32(OneofUint32);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.OneofNestedMessage) {
-        output.WriteRawTag(130, 7);
-        output.WriteMessage(OneofNestedMessage);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.OneofString) {
-        output.WriteRawTag(138, 7);
-        output.WriteString(OneofString);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.OneofBytes) {
-        output.WriteRawTag(146, 7);
-        output.WriteBytes(OneofBytes);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (SingleInt32 != 0) {
-        output.WriteRawTag(8);
-        output.WriteInt32(SingleInt32);
-      }
-      if (SingleInt64 != 0L) {
-        output.WriteRawTag(16);
-        output.WriteInt64(SingleInt64);
-      }
-      if (SingleUint32 != 0) {
-        output.WriteRawTag(24);
-        output.WriteUInt32(SingleUint32);
-      }
-      if (SingleUint64 != 0UL) {
-        output.WriteRawTag(32);
-        output.WriteUInt64(SingleUint64);
-      }
-      if (SingleSint32 != 0) {
-        output.WriteRawTag(40);
-        output.WriteSInt32(SingleSint32);
-      }
-      if (SingleSint64 != 0L) {
-        output.WriteRawTag(48);
-        output.WriteSInt64(SingleSint64);
-      }
-      if (SingleFixed32 != 0) {
-        output.WriteRawTag(61);
-        output.WriteFixed32(SingleFixed32);
-      }
-      if (SingleFixed64 != 0UL) {
-        output.WriteRawTag(65);
-        output.WriteFixed64(SingleFixed64);
-      }
-      if (SingleSfixed32 != 0) {
-        output.WriteRawTag(77);
-        output.WriteSFixed32(SingleSfixed32);
-      }
-      if (SingleSfixed64 != 0L) {
-        output.WriteRawTag(81);
-        output.WriteSFixed64(SingleSfixed64);
-      }
-      if (SingleFloat != 0F) {
-        output.WriteRawTag(93);
-        output.WriteFloat(SingleFloat);
-      }
-      if (SingleDouble != 0D) {
-        output.WriteRawTag(97);
-        output.WriteDouble(SingleDouble);
-      }
-      if (SingleBool != false) {
-        output.WriteRawTag(104);
-        output.WriteBool(SingleBool);
-      }
-      if (SingleString.Length != 0) {
-        output.WriteRawTag(114);
-        output.WriteString(SingleString);
-      }
-      if (SingleBytes.Length != 0) {
-        output.WriteRawTag(122);
-        output.WriteBytes(SingleBytes);
-      }
-      if (singleNestedMessage_ != null) {
-        output.WriteRawTag(146, 1);
-        output.WriteMessage(SingleNestedMessage);
-      }
-      if (singleForeignMessage_ != null) {
-        output.WriteRawTag(154, 1);
-        output.WriteMessage(SingleForeignMessage);
-      }
-      if (singleImportMessage_ != null) {
-        output.WriteRawTag(162, 1);
-        output.WriteMessage(SingleImportMessage);
-      }
-      if (SingleNestedEnum != global::Google.Protobuf.TestProtos.TestAllTypes.Types.NestedEnum.Unspecified) {
-        output.WriteRawTag(168, 1);
-        output.WriteEnum((int) SingleNestedEnum);
-      }
-      if (SingleForeignEnum != global::Google.Protobuf.TestProtos.ForeignEnum.ForeignUnspecified) {
-        output.WriteRawTag(176, 1);
-        output.WriteEnum((int) SingleForeignEnum);
-      }
-      if (SingleImportEnum != global::Google.Protobuf.TestProtos.ImportEnum.Unspecified) {
-        output.WriteRawTag(184, 1);
-        output.WriteEnum((int) SingleImportEnum);
-      }
-      if (singlePublicImportMessage_ != null) {
-        output.WriteRawTag(210, 1);
-        output.WriteMessage(SinglePublicImportMessage);
-      }
-      repeatedInt32_.WriteTo(ref output, _repeated_repeatedInt32_codec);
-      repeatedInt64_.WriteTo(ref output, _repeated_repeatedInt64_codec);
-      repeatedUint32_.WriteTo(ref output, _repeated_repeatedUint32_codec);
-      repeatedUint64_.WriteTo(ref output, _repeated_repeatedUint64_codec);
-      repeatedSint32_.WriteTo(ref output, _repeated_repeatedSint32_codec);
-      repeatedSint64_.WriteTo(ref output, _repeated_repeatedSint64_codec);
-      repeatedFixed32_.WriteTo(ref output, _repeated_repeatedFixed32_codec);
-      repeatedFixed64_.WriteTo(ref output, _repeated_repeatedFixed64_codec);
-      repeatedSfixed32_.WriteTo(ref output, _repeated_repeatedSfixed32_codec);
-      repeatedSfixed64_.WriteTo(ref output, _repeated_repeatedSfixed64_codec);
-      repeatedFloat_.WriteTo(ref output, _repeated_repeatedFloat_codec);
-      repeatedDouble_.WriteTo(ref output, _repeated_repeatedDouble_codec);
-      repeatedBool_.WriteTo(ref output, _repeated_repeatedBool_codec);
-      repeatedString_.WriteTo(ref output, _repeated_repeatedString_codec);
-      repeatedBytes_.WriteTo(ref output, _repeated_repeatedBytes_codec);
-      repeatedNestedMessage_.WriteTo(ref output, _repeated_repeatedNestedMessage_codec);
-      repeatedForeignMessage_.WriteTo(ref output, _repeated_repeatedForeignMessage_codec);
-      repeatedImportMessage_.WriteTo(ref output, _repeated_repeatedImportMessage_codec);
-      repeatedNestedEnum_.WriteTo(ref output, _repeated_repeatedNestedEnum_codec);
-      repeatedForeignEnum_.WriteTo(ref output, _repeated_repeatedForeignEnum_codec);
-      repeatedImportEnum_.WriteTo(ref output, _repeated_repeatedImportEnum_codec);
-      repeatedPublicImportMessage_.WriteTo(ref output, _repeated_repeatedPublicImportMessage_codec);
-      if (oneofFieldCase_ == OneofFieldOneofCase.OneofUint32) {
-        output.WriteRawTag(248, 6);
-        output.WriteUInt32(OneofUint32);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.OneofNestedMessage) {
-        output.WriteRawTag(130, 7);
-        output.WriteMessage(OneofNestedMessage);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.OneofString) {
-        output.WriteRawTag(138, 7);
-        output.WriteString(OneofString);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.OneofBytes) {
-        output.WriteRawTag(146, 7);
-        output.WriteBytes(OneofBytes);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (SingleInt32 != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(SingleInt32);
-      }
-      if (SingleInt64 != 0L) {
-        size += 1 + pb::CodedOutputStream.ComputeInt64Size(SingleInt64);
-      }
-      if (SingleUint32 != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeUInt32Size(SingleUint32);
-      }
-      if (SingleUint64 != 0UL) {
-        size += 1 + pb::CodedOutputStream.ComputeUInt64Size(SingleUint64);
-      }
-      if (SingleSint32 != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeSInt32Size(SingleSint32);
-      }
-      if (SingleSint64 != 0L) {
-        size += 1 + pb::CodedOutputStream.ComputeSInt64Size(SingleSint64);
-      }
-      if (SingleFixed32 != 0) {
-        size += 1 + 4;
-      }
-      if (SingleFixed64 != 0UL) {
-        size += 1 + 8;
-      }
-      if (SingleSfixed32 != 0) {
-        size += 1 + 4;
-      }
-      if (SingleSfixed64 != 0L) {
-        size += 1 + 8;
-      }
-      if (SingleFloat != 0F) {
-        size += 1 + 4;
-      }
-      if (SingleDouble != 0D) {
-        size += 1 + 8;
-      }
-      if (SingleBool != false) {
-        size += 1 + 1;
-      }
-      if (SingleString.Length != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(SingleString);
-      }
-      if (SingleBytes.Length != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeBytesSize(SingleBytes);
-      }
-      if (singleNestedMessage_ != null) {
-        size += 2 + pb::CodedOutputStream.ComputeMessageSize(SingleNestedMessage);
-      }
-      if (singleForeignMessage_ != null) {
-        size += 2 + pb::CodedOutputStream.ComputeMessageSize(SingleForeignMessage);
-      }
-      if (singleImportMessage_ != null) {
-        size += 2 + pb::CodedOutputStream.ComputeMessageSize(SingleImportMessage);
-      }
-      if (SingleNestedEnum != global::Google.Protobuf.TestProtos.TestAllTypes.Types.NestedEnum.Unspecified) {
-        size += 2 + pb::CodedOutputStream.ComputeEnumSize((int) SingleNestedEnum);
-      }
-      if (SingleForeignEnum != global::Google.Protobuf.TestProtos.ForeignEnum.ForeignUnspecified) {
-        size += 2 + pb::CodedOutputStream.ComputeEnumSize((int) SingleForeignEnum);
-      }
-      if (SingleImportEnum != global::Google.Protobuf.TestProtos.ImportEnum.Unspecified) {
-        size += 2 + pb::CodedOutputStream.ComputeEnumSize((int) SingleImportEnum);
-      }
-      if (singlePublicImportMessage_ != null) {
-        size += 2 + pb::CodedOutputStream.ComputeMessageSize(SinglePublicImportMessage);
-      }
-      size += repeatedInt32_.CalculateSize(_repeated_repeatedInt32_codec);
-      size += repeatedInt64_.CalculateSize(_repeated_repeatedInt64_codec);
-      size += repeatedUint32_.CalculateSize(_repeated_repeatedUint32_codec);
-      size += repeatedUint64_.CalculateSize(_repeated_repeatedUint64_codec);
-      size += repeatedSint32_.CalculateSize(_repeated_repeatedSint32_codec);
-      size += repeatedSint64_.CalculateSize(_repeated_repeatedSint64_codec);
-      size += repeatedFixed32_.CalculateSize(_repeated_repeatedFixed32_codec);
-      size += repeatedFixed64_.CalculateSize(_repeated_repeatedFixed64_codec);
-      size += repeatedSfixed32_.CalculateSize(_repeated_repeatedSfixed32_codec);
-      size += repeatedSfixed64_.CalculateSize(_repeated_repeatedSfixed64_codec);
-      size += repeatedFloat_.CalculateSize(_repeated_repeatedFloat_codec);
-      size += repeatedDouble_.CalculateSize(_repeated_repeatedDouble_codec);
-      size += repeatedBool_.CalculateSize(_repeated_repeatedBool_codec);
-      size += repeatedString_.CalculateSize(_repeated_repeatedString_codec);
-      size += repeatedBytes_.CalculateSize(_repeated_repeatedBytes_codec);
-      size += repeatedNestedMessage_.CalculateSize(_repeated_repeatedNestedMessage_codec);
-      size += repeatedForeignMessage_.CalculateSize(_repeated_repeatedForeignMessage_codec);
-      size += repeatedImportMessage_.CalculateSize(_repeated_repeatedImportMessage_codec);
-      size += repeatedNestedEnum_.CalculateSize(_repeated_repeatedNestedEnum_codec);
-      size += repeatedForeignEnum_.CalculateSize(_repeated_repeatedForeignEnum_codec);
-      size += repeatedImportEnum_.CalculateSize(_repeated_repeatedImportEnum_codec);
-      size += repeatedPublicImportMessage_.CalculateSize(_repeated_repeatedPublicImportMessage_codec);
-      if (oneofFieldCase_ == OneofFieldOneofCase.OneofUint32) {
-        size += 2 + pb::CodedOutputStream.ComputeUInt32Size(OneofUint32);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.OneofNestedMessage) {
-        size += 2 + pb::CodedOutputStream.ComputeMessageSize(OneofNestedMessage);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.OneofString) {
-        size += 2 + pb::CodedOutputStream.ComputeStringSize(OneofString);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.OneofBytes) {
-        size += 2 + pb::CodedOutputStream.ComputeBytesSize(OneofBytes);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(TestAllTypes other) {
-      if (other == null) {
-        return;
-      }
-      if (other.SingleInt32 != 0) {
-        SingleInt32 = other.SingleInt32;
-      }
-      if (other.SingleInt64 != 0L) {
-        SingleInt64 = other.SingleInt64;
-      }
-      if (other.SingleUint32 != 0) {
-        SingleUint32 = other.SingleUint32;
-      }
-      if (other.SingleUint64 != 0UL) {
-        SingleUint64 = other.SingleUint64;
-      }
-      if (other.SingleSint32 != 0) {
-        SingleSint32 = other.SingleSint32;
-      }
-      if (other.SingleSint64 != 0L) {
-        SingleSint64 = other.SingleSint64;
-      }
-      if (other.SingleFixed32 != 0) {
-        SingleFixed32 = other.SingleFixed32;
-      }
-      if (other.SingleFixed64 != 0UL) {
-        SingleFixed64 = other.SingleFixed64;
-      }
-      if (other.SingleSfixed32 != 0) {
-        SingleSfixed32 = other.SingleSfixed32;
-      }
-      if (other.SingleSfixed64 != 0L) {
-        SingleSfixed64 = other.SingleSfixed64;
-      }
-      if (other.SingleFloat != 0F) {
-        SingleFloat = other.SingleFloat;
-      }
-      if (other.SingleDouble != 0D) {
-        SingleDouble = other.SingleDouble;
-      }
-      if (other.SingleBool != false) {
-        SingleBool = other.SingleBool;
-      }
-      if (other.SingleString.Length != 0) {
-        SingleString = other.SingleString;
-      }
-      if (other.SingleBytes.Length != 0) {
-        SingleBytes = other.SingleBytes;
-      }
-      if (other.singleNestedMessage_ != null) {
-        if (singleNestedMessage_ == null) {
-          SingleNestedMessage = new global::Google.Protobuf.TestProtos.TestAllTypes.Types.NestedMessage();
-        }
-        SingleNestedMessage.MergeFrom(other.SingleNestedMessage);
-      }
-      if (other.singleForeignMessage_ != null) {
-        if (singleForeignMessage_ == null) {
-          SingleForeignMessage = new global::Google.Protobuf.TestProtos.ForeignMessage();
-        }
-        SingleForeignMessage.MergeFrom(other.SingleForeignMessage);
-      }
-      if (other.singleImportMessage_ != null) {
-        if (singleImportMessage_ == null) {
-          SingleImportMessage = new global::Google.Protobuf.TestProtos.ImportMessage();
-        }
-        SingleImportMessage.MergeFrom(other.SingleImportMessage);
-      }
-      if (other.SingleNestedEnum != global::Google.Protobuf.TestProtos.TestAllTypes.Types.NestedEnum.Unspecified) {
-        SingleNestedEnum = other.SingleNestedEnum;
-      }
-      if (other.SingleForeignEnum != global::Google.Protobuf.TestProtos.ForeignEnum.ForeignUnspecified) {
-        SingleForeignEnum = other.SingleForeignEnum;
-      }
-      if (other.SingleImportEnum != global::Google.Protobuf.TestProtos.ImportEnum.Unspecified) {
-        SingleImportEnum = other.SingleImportEnum;
-      }
-      if (other.singlePublicImportMessage_ != null) {
-        if (singlePublicImportMessage_ == null) {
-          SinglePublicImportMessage = new global::Google.Protobuf.TestProtos.PublicImportMessage();
-        }
-        SinglePublicImportMessage.MergeFrom(other.SinglePublicImportMessage);
-      }
-      repeatedInt32_.Add(other.repeatedInt32_);
-      repeatedInt64_.Add(other.repeatedInt64_);
-      repeatedUint32_.Add(other.repeatedUint32_);
-      repeatedUint64_.Add(other.repeatedUint64_);
-      repeatedSint32_.Add(other.repeatedSint32_);
-      repeatedSint64_.Add(other.repeatedSint64_);
-      repeatedFixed32_.Add(other.repeatedFixed32_);
-      repeatedFixed64_.Add(other.repeatedFixed64_);
-      repeatedSfixed32_.Add(other.repeatedSfixed32_);
-      repeatedSfixed64_.Add(other.repeatedSfixed64_);
-      repeatedFloat_.Add(other.repeatedFloat_);
-      repeatedDouble_.Add(other.repeatedDouble_);
-      repeatedBool_.Add(other.repeatedBool_);
-      repeatedString_.Add(other.repeatedString_);
-      repeatedBytes_.Add(other.repeatedBytes_);
-      repeatedNestedMessage_.Add(other.repeatedNestedMessage_);
-      repeatedForeignMessage_.Add(other.repeatedForeignMessage_);
-      repeatedImportMessage_.Add(other.repeatedImportMessage_);
-      repeatedNestedEnum_.Add(other.repeatedNestedEnum_);
-      repeatedForeignEnum_.Add(other.repeatedForeignEnum_);
-      repeatedImportEnum_.Add(other.repeatedImportEnum_);
-      repeatedPublicImportMessage_.Add(other.repeatedPublicImportMessage_);
-      switch (other.OneofFieldCase) {
-        case OneofFieldOneofCase.OneofUint32:
-          OneofUint32 = other.OneofUint32;
-          break;
-        case OneofFieldOneofCase.OneofNestedMessage:
-          if (OneofNestedMessage == null) {
-            OneofNestedMessage = new global::Google.Protobuf.TestProtos.TestAllTypes.Types.NestedMessage();
-          }
-          OneofNestedMessage.MergeFrom(other.OneofNestedMessage);
-          break;
-        case OneofFieldOneofCase.OneofString:
-          OneofString = other.OneofString;
-          break;
-        case OneofFieldOneofCase.OneofBytes:
-          OneofBytes = other.OneofBytes;
-          break;
-      }
-
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 8: {
-            SingleInt32 = input.ReadInt32();
-            break;
-          }
-          case 16: {
-            SingleInt64 = input.ReadInt64();
-            break;
-          }
-          case 24: {
-            SingleUint32 = input.ReadUInt32();
-            break;
-          }
-          case 32: {
-            SingleUint64 = input.ReadUInt64();
-            break;
-          }
-          case 40: {
-            SingleSint32 = input.ReadSInt32();
-            break;
-          }
-          case 48: {
-            SingleSint64 = input.ReadSInt64();
-            break;
-          }
-          case 61: {
-            SingleFixed32 = input.ReadFixed32();
-            break;
-          }
-          case 65: {
-            SingleFixed64 = input.ReadFixed64();
-            break;
-          }
-          case 77: {
-            SingleSfixed32 = input.ReadSFixed32();
-            break;
-          }
-          case 81: {
-            SingleSfixed64 = input.ReadSFixed64();
-            break;
-          }
-          case 93: {
-            SingleFloat = input.ReadFloat();
-            break;
-          }
-          case 97: {
-            SingleDouble = input.ReadDouble();
-            break;
-          }
-          case 104: {
-            SingleBool = input.ReadBool();
-            break;
-          }
-          case 114: {
-            SingleString = input.ReadString();
-            break;
-          }
-          case 122: {
-            SingleBytes = input.ReadBytes();
-            break;
-          }
-          case 146: {
-            if (singleNestedMessage_ == null) {
-              SingleNestedMessage = new global::Google.Protobuf.TestProtos.TestAllTypes.Types.NestedMessage();
-            }
-            input.ReadMessage(SingleNestedMessage);
-            break;
-          }
-          case 154: {
-            if (singleForeignMessage_ == null) {
-              SingleForeignMessage = new global::Google.Protobuf.TestProtos.ForeignMessage();
-            }
-            input.ReadMessage(SingleForeignMessage);
-            break;
-          }
-          case 162: {
-            if (singleImportMessage_ == null) {
-              SingleImportMessage = new global::Google.Protobuf.TestProtos.ImportMessage();
-            }
-            input.ReadMessage(SingleImportMessage);
-            break;
-          }
-          case 168: {
-            SingleNestedEnum = (global::Google.Protobuf.TestProtos.TestAllTypes.Types.NestedEnum) input.ReadEnum();
-            break;
-          }
-          case 176: {
-            SingleForeignEnum = (global::Google.Protobuf.TestProtos.ForeignEnum) input.ReadEnum();
-            break;
-          }
-          case 184: {
-            SingleImportEnum = (global::Google.Protobuf.TestProtos.ImportEnum) input.ReadEnum();
-            break;
-          }
-          case 210: {
-            if (singlePublicImportMessage_ == null) {
-              SinglePublicImportMessage = new global::Google.Protobuf.TestProtos.PublicImportMessage();
-            }
-            input.ReadMessage(SinglePublicImportMessage);
-            break;
-          }
-          case 250:
-          case 248: {
-            repeatedInt32_.AddEntriesFrom(input, _repeated_repeatedInt32_codec);
-            break;
-          }
-          case 258:
-          case 256: {
-            repeatedInt64_.AddEntriesFrom(input, _repeated_repeatedInt64_codec);
-            break;
-          }
-          case 266:
-          case 264: {
-            repeatedUint32_.AddEntriesFrom(input, _repeated_repeatedUint32_codec);
-            break;
-          }
-          case 274:
-          case 272: {
-            repeatedUint64_.AddEntriesFrom(input, _repeated_repeatedUint64_codec);
-            break;
-          }
-          case 282:
-          case 280: {
-            repeatedSint32_.AddEntriesFrom(input, _repeated_repeatedSint32_codec);
-            break;
-          }
-          case 290:
-          case 288: {
-            repeatedSint64_.AddEntriesFrom(input, _repeated_repeatedSint64_codec);
-            break;
-          }
-          case 298:
-          case 301: {
-            repeatedFixed32_.AddEntriesFrom(input, _repeated_repeatedFixed32_codec);
-            break;
-          }
-          case 306:
-          case 305: {
-            repeatedFixed64_.AddEntriesFrom(input, _repeated_repeatedFixed64_codec);
-            break;
-          }
-          case 314:
-          case 317: {
-            repeatedSfixed32_.AddEntriesFrom(input, _repeated_repeatedSfixed32_codec);
-            break;
-          }
-          case 322:
-          case 321: {
-            repeatedSfixed64_.AddEntriesFrom(input, _repeated_repeatedSfixed64_codec);
-            break;
-          }
-          case 330:
-          case 333: {
-            repeatedFloat_.AddEntriesFrom(input, _repeated_repeatedFloat_codec);
-            break;
-          }
-          case 338:
-          case 337: {
-            repeatedDouble_.AddEntriesFrom(input, _repeated_repeatedDouble_codec);
-            break;
-          }
-          case 346:
-          case 344: {
-            repeatedBool_.AddEntriesFrom(input, _repeated_repeatedBool_codec);
-            break;
-          }
-          case 354: {
-            repeatedString_.AddEntriesFrom(input, _repeated_repeatedString_codec);
-            break;
-          }
-          case 362: {
-            repeatedBytes_.AddEntriesFrom(input, _repeated_repeatedBytes_codec);
-            break;
-          }
-          case 386: {
-            repeatedNestedMessage_.AddEntriesFrom(input, _repeated_repeatedNestedMessage_codec);
-            break;
-          }
-          case 394: {
-            repeatedForeignMessage_.AddEntriesFrom(input, _repeated_repeatedForeignMessage_codec);
-            break;
-          }
-          case 402: {
-            repeatedImportMessage_.AddEntriesFrom(input, _repeated_repeatedImportMessage_codec);
-            break;
-          }
-          case 410:
-          case 408: {
-            repeatedNestedEnum_.AddEntriesFrom(input, _repeated_repeatedNestedEnum_codec);
-            break;
-          }
-          case 418:
-          case 416: {
-            repeatedForeignEnum_.AddEntriesFrom(input, _repeated_repeatedForeignEnum_codec);
-            break;
-          }
-          case 426:
-          case 424: {
-            repeatedImportEnum_.AddEntriesFrom(input, _repeated_repeatedImportEnum_codec);
-            break;
-          }
-          case 434: {
-            repeatedPublicImportMessage_.AddEntriesFrom(input, _repeated_repeatedPublicImportMessage_codec);
-            break;
-          }
-          case 888: {
-            OneofUint32 = input.ReadUInt32();
-            break;
-          }
-          case 898: {
-            global::Google.Protobuf.TestProtos.TestAllTypes.Types.NestedMessage subBuilder = new global::Google.Protobuf.TestProtos.TestAllTypes.Types.NestedMessage();
-            if (oneofFieldCase_ == OneofFieldOneofCase.OneofNestedMessage) {
-              subBuilder.MergeFrom(OneofNestedMessage);
-            }
-            input.ReadMessage(subBuilder);
-            OneofNestedMessage = subBuilder;
-            break;
-          }
-          case 906: {
-            OneofString = input.ReadString();
-            break;
-          }
-          case 914: {
-            OneofBytes = input.ReadBytes();
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 8: {
-            SingleInt32 = input.ReadInt32();
-            break;
-          }
-          case 16: {
-            SingleInt64 = input.ReadInt64();
-            break;
-          }
-          case 24: {
-            SingleUint32 = input.ReadUInt32();
-            break;
-          }
-          case 32: {
-            SingleUint64 = input.ReadUInt64();
-            break;
-          }
-          case 40: {
-            SingleSint32 = input.ReadSInt32();
-            break;
-          }
-          case 48: {
-            SingleSint64 = input.ReadSInt64();
-            break;
-          }
-          case 61: {
-            SingleFixed32 = input.ReadFixed32();
-            break;
-          }
-          case 65: {
-            SingleFixed64 = input.ReadFixed64();
-            break;
-          }
-          case 77: {
-            SingleSfixed32 = input.ReadSFixed32();
-            break;
-          }
-          case 81: {
-            SingleSfixed64 = input.ReadSFixed64();
-            break;
-          }
-          case 93: {
-            SingleFloat = input.ReadFloat();
-            break;
-          }
-          case 97: {
-            SingleDouble = input.ReadDouble();
-            break;
-          }
-          case 104: {
-            SingleBool = input.ReadBool();
-            break;
-          }
-          case 114: {
-            SingleString = input.ReadString();
-            break;
-          }
-          case 122: {
-            SingleBytes = input.ReadBytes();
-            break;
-          }
-          case 146: {
-            if (singleNestedMessage_ == null) {
-              SingleNestedMessage = new global::Google.Protobuf.TestProtos.TestAllTypes.Types.NestedMessage();
-            }
-            input.ReadMessage(SingleNestedMessage);
-            break;
-          }
-          case 154: {
-            if (singleForeignMessage_ == null) {
-              SingleForeignMessage = new global::Google.Protobuf.TestProtos.ForeignMessage();
-            }
-            input.ReadMessage(SingleForeignMessage);
-            break;
-          }
-          case 162: {
-            if (singleImportMessage_ == null) {
-              SingleImportMessage = new global::Google.Protobuf.TestProtos.ImportMessage();
-            }
-            input.ReadMessage(SingleImportMessage);
-            break;
-          }
-          case 168: {
-            SingleNestedEnum = (global::Google.Protobuf.TestProtos.TestAllTypes.Types.NestedEnum) input.ReadEnum();
-            break;
-          }
-          case 176: {
-            SingleForeignEnum = (global::Google.Protobuf.TestProtos.ForeignEnum) input.ReadEnum();
-            break;
-          }
-          case 184: {
-            SingleImportEnum = (global::Google.Protobuf.TestProtos.ImportEnum) input.ReadEnum();
-            break;
-          }
-          case 210: {
-            if (singlePublicImportMessage_ == null) {
-              SinglePublicImportMessage = new global::Google.Protobuf.TestProtos.PublicImportMessage();
-            }
-            input.ReadMessage(SinglePublicImportMessage);
-            break;
-          }
-          case 250:
-          case 248: {
-            repeatedInt32_.AddEntriesFrom(ref input, _repeated_repeatedInt32_codec);
-            break;
-          }
-          case 258:
-          case 256: {
-            repeatedInt64_.AddEntriesFrom(ref input, _repeated_repeatedInt64_codec);
-            break;
-          }
-          case 266:
-          case 264: {
-            repeatedUint32_.AddEntriesFrom(ref input, _repeated_repeatedUint32_codec);
-            break;
-          }
-          case 274:
-          case 272: {
-            repeatedUint64_.AddEntriesFrom(ref input, _repeated_repeatedUint64_codec);
-            break;
-          }
-          case 282:
-          case 280: {
-            repeatedSint32_.AddEntriesFrom(ref input, _repeated_repeatedSint32_codec);
-            break;
-          }
-          case 290:
-          case 288: {
-            repeatedSint64_.AddEntriesFrom(ref input, _repeated_repeatedSint64_codec);
-            break;
-          }
-          case 298:
-          case 301: {
-            repeatedFixed32_.AddEntriesFrom(ref input, _repeated_repeatedFixed32_codec);
-            break;
-          }
-          case 306:
-          case 305: {
-            repeatedFixed64_.AddEntriesFrom(ref input, _repeated_repeatedFixed64_codec);
-            break;
-          }
-          case 314:
-          case 317: {
-            repeatedSfixed32_.AddEntriesFrom(ref input, _repeated_repeatedSfixed32_codec);
-            break;
-          }
-          case 322:
-          case 321: {
-            repeatedSfixed64_.AddEntriesFrom(ref input, _repeated_repeatedSfixed64_codec);
-            break;
-          }
-          case 330:
-          case 333: {
-            repeatedFloat_.AddEntriesFrom(ref input, _repeated_repeatedFloat_codec);
-            break;
-          }
-          case 338:
-          case 337: {
-            repeatedDouble_.AddEntriesFrom(ref input, _repeated_repeatedDouble_codec);
-            break;
-          }
-          case 346:
-          case 344: {
-            repeatedBool_.AddEntriesFrom(ref input, _repeated_repeatedBool_codec);
-            break;
-          }
-          case 354: {
-            repeatedString_.AddEntriesFrom(ref input, _repeated_repeatedString_codec);
-            break;
-          }
-          case 362: {
-            repeatedBytes_.AddEntriesFrom(ref input, _repeated_repeatedBytes_codec);
-            break;
-          }
-          case 386: {
-            repeatedNestedMessage_.AddEntriesFrom(ref input, _repeated_repeatedNestedMessage_codec);
-            break;
-          }
-          case 394: {
-            repeatedForeignMessage_.AddEntriesFrom(ref input, _repeated_repeatedForeignMessage_codec);
-            break;
-          }
-          case 402: {
-            repeatedImportMessage_.AddEntriesFrom(ref input, _repeated_repeatedImportMessage_codec);
-            break;
-          }
-          case 410:
-          case 408: {
-            repeatedNestedEnum_.AddEntriesFrom(ref input, _repeated_repeatedNestedEnum_codec);
-            break;
-          }
-          case 418:
-          case 416: {
-            repeatedForeignEnum_.AddEntriesFrom(ref input, _repeated_repeatedForeignEnum_codec);
-            break;
-          }
-          case 426:
-          case 424: {
-            repeatedImportEnum_.AddEntriesFrom(ref input, _repeated_repeatedImportEnum_codec);
-            break;
-          }
-          case 434: {
-            repeatedPublicImportMessage_.AddEntriesFrom(ref input, _repeated_repeatedPublicImportMessage_codec);
-            break;
-          }
-          case 888: {
-            OneofUint32 = input.ReadUInt32();
-            break;
-          }
-          case 898: {
-            global::Google.Protobuf.TestProtos.TestAllTypes.Types.NestedMessage subBuilder = new global::Google.Protobuf.TestProtos.TestAllTypes.Types.NestedMessage();
-            if (oneofFieldCase_ == OneofFieldOneofCase.OneofNestedMessage) {
-              subBuilder.MergeFrom(OneofNestedMessage);
-            }
-            input.ReadMessage(subBuilder);
-            OneofNestedMessage = subBuilder;
-            break;
-          }
-          case 906: {
-            OneofString = input.ReadString();
-            break;
-          }
-          case 914: {
-            OneofBytes = input.ReadBytes();
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-    #region Nested types
-    /// <summary>Container for nested types declared in the TestAllTypes message type.</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static partial class Types {
-      public enum NestedEnum {
-        [pbr::OriginalName("NESTED_ENUM_UNSPECIFIED")] Unspecified = 0,
-        [pbr::OriginalName("FOO")] Foo = 1,
-        [pbr::OriginalName("BAR")] Bar = 2,
-        [pbr::OriginalName("BAZ")] Baz = 3,
-        /// <summary>
-        /// Intentionally negative.
-        /// </summary>
-        [pbr::OriginalName("NEG")] Neg = -1,
-      }
-
-      public sealed partial class NestedMessage : pb::IMessage<NestedMessage>
-      #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          , pb::IBufferMessage
-      #endif
-      {
-        private static readonly pb::MessageParser<NestedMessage> _parser = new pb::MessageParser<NestedMessage>(() => new NestedMessage());
-        private pb::UnknownFieldSet _unknownFields;
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static pb::MessageParser<NestedMessage> Parser { get { return _parser; } }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static pbr::MessageDescriptor Descriptor {
-          get { return global::Google.Protobuf.TestProtos.TestAllTypes.Descriptor.NestedTypes[0]; }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        pbr::MessageDescriptor pb::IMessage.Descriptor {
-          get { return Descriptor; }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public NestedMessage() {
-          OnConstruction();
-        }
-
-        partial void OnConstruction();
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public NestedMessage(NestedMessage other) : this() {
-          bb_ = other.bb_;
-          _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public NestedMessage Clone() {
-          return new NestedMessage(this);
-        }
-
-        /// <summary>Field number for the "bb" field.</summary>
-        public const int BbFieldNumber = 1;
-        private int bb_;
-        /// <summary>
-        /// The field name "b" fails to compile in proto1 because it conflicts with
-        /// a local variable named "b" in one of the generated methods.  Doh.
-        /// This file needs to compile in proto1 to test backwards-compatibility.
-        /// </summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public int Bb {
-          get { return bb_; }
-          set {
-            bb_ = value;
-          }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override bool Equals(object other) {
-          return Equals(other as NestedMessage);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool Equals(NestedMessage other) {
-          if (ReferenceEquals(other, null)) {
-            return false;
-          }
-          if (ReferenceEquals(other, this)) {
-            return true;
-          }
-          if (Bb != other.Bb) return false;
-          return Equals(_unknownFields, other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override int GetHashCode() {
-          int hash = 1;
-          if (Bb != 0) hash ^= Bb.GetHashCode();
-          if (_unknownFields != null) {
-            hash ^= _unknownFields.GetHashCode();
-          }
-          return hash;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override string ToString() {
-          return pb::JsonFormatter.ToDiagnosticString(this);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void WriteTo(pb::CodedOutputStream output) {
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          output.WriteRawMessage(this);
-        #else
-          if (Bb != 0) {
-            output.WriteRawTag(8);
-            output.WriteInt32(Bb);
-          }
-          if (_unknownFields != null) {
-            _unknownFields.WriteTo(output);
-          }
-        #endif
-        }
-
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-          if (Bb != 0) {
-            output.WriteRawTag(8);
-            output.WriteInt32(Bb);
-          }
-          if (_unknownFields != null) {
-            _unknownFields.WriteTo(ref output);
-          }
-        }
-        #endif
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public int CalculateSize() {
-          int size = 0;
-          if (Bb != 0) {
-            size += 1 + pb::CodedOutputStream.ComputeInt32Size(Bb);
-          }
-          if (_unknownFields != null) {
-            size += _unknownFields.CalculateSize();
-          }
-          return size;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(NestedMessage other) {
-          if (other == null) {
-            return;
-          }
-          if (other.Bb != 0) {
-            Bb = other.Bb;
-          }
-          _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(pb::CodedInputStream input) {
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          input.ReadRawMessage(this);
-        #else
-          uint tag;
-          while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
-              default:
-                _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-                break;
-              case 8: {
-                Bb = input.ReadInt32();
-                break;
-              }
-            }
-          }
-        #endif
-        }
-
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-          uint tag;
-          while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
-              default:
-                _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-                break;
-              case 8: {
-                Bb = input.ReadInt32();
-                break;
-              }
-            }
-          }
-        }
-        #endif
-
-      }
-
-    }
-    #endregion
-
-  }
-
-  /// <summary>
-  /// This proto includes a recursively nested message.
-  /// </summary>
-  public sealed partial class NestedTestAllTypes : pb::IMessage<NestedTestAllTypes>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<NestedTestAllTypes> _parser = new pb::MessageParser<NestedTestAllTypes>(() => new NestedTestAllTypes());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<NestedTestAllTypes> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.UnittestProto3Reflection.Descriptor.MessageTypes[1]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public NestedTestAllTypes() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public NestedTestAllTypes(NestedTestAllTypes other) : this() {
-      child_ = other.child_ != null ? other.child_.Clone() : null;
-      payload_ = other.payload_ != null ? other.payload_.Clone() : null;
-      repeatedChild_ = other.repeatedChild_.Clone();
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public NestedTestAllTypes Clone() {
-      return new NestedTestAllTypes(this);
-    }
-
-    /// <summary>Field number for the "child" field.</summary>
-    public const int ChildFieldNumber = 1;
-    private global::Google.Protobuf.TestProtos.NestedTestAllTypes child_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.TestProtos.NestedTestAllTypes Child {
-      get { return child_; }
-      set {
-        child_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "payload" field.</summary>
-    public const int PayloadFieldNumber = 2;
-    private global::Google.Protobuf.TestProtos.TestAllTypes payload_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.TestProtos.TestAllTypes Payload {
-      get { return payload_; }
-      set {
-        payload_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "repeated_child" field.</summary>
-    public const int RepeatedChildFieldNumber = 3;
-    private static readonly pb::FieldCodec<global::Google.Protobuf.TestProtos.NestedTestAllTypes> _repeated_repeatedChild_codec
-        = pb::FieldCodec.ForMessage(26, global::Google.Protobuf.TestProtos.NestedTestAllTypes.Parser);
-    private readonly pbc::RepeatedField<global::Google.Protobuf.TestProtos.NestedTestAllTypes> repeatedChild_ = new pbc::RepeatedField<global::Google.Protobuf.TestProtos.NestedTestAllTypes>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Google.Protobuf.TestProtos.NestedTestAllTypes> RepeatedChild {
-      get { return repeatedChild_; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as NestedTestAllTypes);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(NestedTestAllTypes other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (!object.Equals(Child, other.Child)) return false;
-      if (!object.Equals(Payload, other.Payload)) return false;
-      if(!repeatedChild_.Equals(other.repeatedChild_)) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (child_ != null) hash ^= Child.GetHashCode();
-      if (payload_ != null) hash ^= Payload.GetHashCode();
-      hash ^= repeatedChild_.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (child_ != null) {
-        output.WriteRawTag(10);
-        output.WriteMessage(Child);
-      }
-      if (payload_ != null) {
-        output.WriteRawTag(18);
-        output.WriteMessage(Payload);
-      }
-      repeatedChild_.WriteTo(output, _repeated_repeatedChild_codec);
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (child_ != null) {
-        output.WriteRawTag(10);
-        output.WriteMessage(Child);
-      }
-      if (payload_ != null) {
-        output.WriteRawTag(18);
-        output.WriteMessage(Payload);
-      }
-      repeatedChild_.WriteTo(ref output, _repeated_repeatedChild_codec);
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (child_ != null) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(Child);
-      }
-      if (payload_ != null) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(Payload);
-      }
-      size += repeatedChild_.CalculateSize(_repeated_repeatedChild_codec);
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(NestedTestAllTypes other) {
-      if (other == null) {
-        return;
-      }
-      if (other.child_ != null) {
-        if (child_ == null) {
-          Child = new global::Google.Protobuf.TestProtos.NestedTestAllTypes();
-        }
-        Child.MergeFrom(other.Child);
-      }
-      if (other.payload_ != null) {
-        if (payload_ == null) {
-          Payload = new global::Google.Protobuf.TestProtos.TestAllTypes();
-        }
-        Payload.MergeFrom(other.Payload);
-      }
-      repeatedChild_.Add(other.repeatedChild_);
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 10: {
-            if (child_ == null) {
-              Child = new global::Google.Protobuf.TestProtos.NestedTestAllTypes();
-            }
-            input.ReadMessage(Child);
-            break;
-          }
-          case 18: {
-            if (payload_ == null) {
-              Payload = new global::Google.Protobuf.TestProtos.TestAllTypes();
-            }
-            input.ReadMessage(Payload);
-            break;
-          }
-          case 26: {
-            repeatedChild_.AddEntriesFrom(input, _repeated_repeatedChild_codec);
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 10: {
-            if (child_ == null) {
-              Child = new global::Google.Protobuf.TestProtos.NestedTestAllTypes();
-            }
-            input.ReadMessage(Child);
-            break;
-          }
-          case 18: {
-            if (payload_ == null) {
-              Payload = new global::Google.Protobuf.TestProtos.TestAllTypes();
-            }
-            input.ReadMessage(Payload);
-            break;
-          }
-          case 26: {
-            repeatedChild_.AddEntriesFrom(ref input, _repeated_repeatedChild_codec);
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  public sealed partial class TestDeprecatedFields : pb::IMessage<TestDeprecatedFields>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<TestDeprecatedFields> _parser = new pb::MessageParser<TestDeprecatedFields>(() => new TestDeprecatedFields());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<TestDeprecatedFields> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.UnittestProto3Reflection.Descriptor.MessageTypes[2]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestDeprecatedFields() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestDeprecatedFields(TestDeprecatedFields other) : this() {
-      deprecatedInt32_ = other.deprecatedInt32_;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestDeprecatedFields Clone() {
-      return new TestDeprecatedFields(this);
-    }
-
-    /// <summary>Field number for the "deprecated_int32" field.</summary>
-    public const int DeprecatedInt32FieldNumber = 1;
-    private int deprecatedInt32_;
-    [global::System.ObsoleteAttribute]
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int DeprecatedInt32 {
-      get { return deprecatedInt32_; }
-      set {
-        deprecatedInt32_ = value;
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as TestDeprecatedFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(TestDeprecatedFields other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (DeprecatedInt32 != other.DeprecatedInt32) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (DeprecatedInt32 != 0) hash ^= DeprecatedInt32.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (DeprecatedInt32 != 0) {
-        output.WriteRawTag(8);
-        output.WriteInt32(DeprecatedInt32);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (DeprecatedInt32 != 0) {
-        output.WriteRawTag(8);
-        output.WriteInt32(DeprecatedInt32);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (DeprecatedInt32 != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(DeprecatedInt32);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(TestDeprecatedFields other) {
-      if (other == null) {
-        return;
-      }
-      if (other.DeprecatedInt32 != 0) {
-        DeprecatedInt32 = other.DeprecatedInt32;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 8: {
-            DeprecatedInt32 = input.ReadInt32();
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 8: {
-            DeprecatedInt32 = input.ReadInt32();
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  /// <summary>
-  /// Define these after TestAllTypes to make sure the compiler can handle
-  /// that.
-  /// </summary>
-  public sealed partial class ForeignMessage : pb::IMessage<ForeignMessage>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<ForeignMessage> _parser = new pb::MessageParser<ForeignMessage>(() => new ForeignMessage());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<ForeignMessage> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.UnittestProto3Reflection.Descriptor.MessageTypes[3]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ForeignMessage() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ForeignMessage(ForeignMessage other) : this() {
-      c_ = other.c_;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ForeignMessage Clone() {
-      return new ForeignMessage(this);
-    }
-
-    /// <summary>Field number for the "c" field.</summary>
-    public const int CFieldNumber = 1;
-    private int c_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int C {
-      get { return c_; }
-      set {
-        c_ = value;
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as ForeignMessage);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(ForeignMessage other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (C != other.C) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (C != 0) hash ^= C.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (C != 0) {
-        output.WriteRawTag(8);
-        output.WriteInt32(C);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (C != 0) {
-        output.WriteRawTag(8);
-        output.WriteInt32(C);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (C != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(C);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(ForeignMessage other) {
-      if (other == null) {
-        return;
-      }
-      if (other.C != 0) {
-        C = other.C;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 8: {
-            C = input.ReadInt32();
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 8: {
-            C = input.ReadInt32();
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  public sealed partial class TestReservedFields : pb::IMessage<TestReservedFields>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<TestReservedFields> _parser = new pb::MessageParser<TestReservedFields>(() => new TestReservedFields());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<TestReservedFields> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.UnittestProto3Reflection.Descriptor.MessageTypes[4]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestReservedFields() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestReservedFields(TestReservedFields other) : this() {
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestReservedFields Clone() {
-      return new TestReservedFields(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as TestReservedFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(TestReservedFields other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(TestReservedFields other) {
-      if (other == null) {
-        return;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-        }
-      }
-    }
-    #endif
-
-  }
-
-  /// <summary>
-  /// Test that we can use NestedMessage from outside TestAllTypes.
-  /// </summary>
-  public sealed partial class TestForeignNested : pb::IMessage<TestForeignNested>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<TestForeignNested> _parser = new pb::MessageParser<TestForeignNested>(() => new TestForeignNested());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<TestForeignNested> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.UnittestProto3Reflection.Descriptor.MessageTypes[5]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestForeignNested() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestForeignNested(TestForeignNested other) : this() {
-      foreignNested_ = other.foreignNested_ != null ? other.foreignNested_.Clone() : null;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestForeignNested Clone() {
-      return new TestForeignNested(this);
-    }
-
-    /// <summary>Field number for the "foreign_nested" field.</summary>
-    public const int ForeignNestedFieldNumber = 1;
-    private global::Google.Protobuf.TestProtos.TestAllTypes.Types.NestedMessage foreignNested_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.TestProtos.TestAllTypes.Types.NestedMessage ForeignNested {
-      get { return foreignNested_; }
-      set {
-        foreignNested_ = value;
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as TestForeignNested);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(TestForeignNested other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (!object.Equals(ForeignNested, other.ForeignNested)) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (foreignNested_ != null) hash ^= ForeignNested.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (foreignNested_ != null) {
-        output.WriteRawTag(10);
-        output.WriteMessage(ForeignNested);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (foreignNested_ != null) {
-        output.WriteRawTag(10);
-        output.WriteMessage(ForeignNested);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (foreignNested_ != null) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(ForeignNested);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(TestForeignNested other) {
-      if (other == null) {
-        return;
-      }
-      if (other.foreignNested_ != null) {
-        if (foreignNested_ == null) {
-          ForeignNested = new global::Google.Protobuf.TestProtos.TestAllTypes.Types.NestedMessage();
-        }
-        ForeignNested.MergeFrom(other.ForeignNested);
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 10: {
-            if (foreignNested_ == null) {
-              ForeignNested = new global::Google.Protobuf.TestProtos.TestAllTypes.Types.NestedMessage();
-            }
-            input.ReadMessage(ForeignNested);
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 10: {
-            if (foreignNested_ == null) {
-              ForeignNested = new global::Google.Protobuf.TestProtos.TestAllTypes.Types.NestedMessage();
-            }
-            input.ReadMessage(ForeignNested);
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  /// <summary>
-  /// Test that really large tag numbers don't break anything.
-  /// </summary>
-  public sealed partial class TestReallyLargeTagNumber : pb::IMessage<TestReallyLargeTagNumber>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<TestReallyLargeTagNumber> _parser = new pb::MessageParser<TestReallyLargeTagNumber>(() => new TestReallyLargeTagNumber());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<TestReallyLargeTagNumber> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.UnittestProto3Reflection.Descriptor.MessageTypes[6]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestReallyLargeTagNumber() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestReallyLargeTagNumber(TestReallyLargeTagNumber other) : this() {
-      a_ = other.a_;
-      bb_ = other.bb_;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestReallyLargeTagNumber Clone() {
-      return new TestReallyLargeTagNumber(this);
-    }
-
-    /// <summary>Field number for the "a" field.</summary>
-    public const int AFieldNumber = 1;
-    private int a_;
-    /// <summary>
-    /// The largest possible tag number is 2^28 - 1, since the wire format uses
-    /// three bits to communicate wire type.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int A {
-      get { return a_; }
-      set {
-        a_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "bb" field.</summary>
-    public const int BbFieldNumber = 268435455;
-    private int bb_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int Bb {
-      get { return bb_; }
-      set {
-        bb_ = value;
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as TestReallyLargeTagNumber);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(TestReallyLargeTagNumber other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (A != other.A) return false;
-      if (Bb != other.Bb) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (A != 0) hash ^= A.GetHashCode();
-      if (Bb != 0) hash ^= Bb.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (A != 0) {
-        output.WriteRawTag(8);
-        output.WriteInt32(A);
-      }
-      if (Bb != 0) {
-        output.WriteRawTag(248, 255, 255, 255, 7);
-        output.WriteInt32(Bb);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (A != 0) {
-        output.WriteRawTag(8);
-        output.WriteInt32(A);
-      }
-      if (Bb != 0) {
-        output.WriteRawTag(248, 255, 255, 255, 7);
-        output.WriteInt32(Bb);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (A != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(A);
-      }
-      if (Bb != 0) {
-        size += 5 + pb::CodedOutputStream.ComputeInt32Size(Bb);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(TestReallyLargeTagNumber other) {
-      if (other == null) {
-        return;
-      }
-      if (other.A != 0) {
-        A = other.A;
-      }
-      if (other.Bb != 0) {
-        Bb = other.Bb;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 8: {
-            A = input.ReadInt32();
-            break;
-          }
-          case 2147483640: {
-            Bb = input.ReadInt32();
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 8: {
-            A = input.ReadInt32();
-            break;
-          }
-          case 2147483640: {
-            Bb = input.ReadInt32();
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  public sealed partial class TestRecursiveMessage : pb::IMessage<TestRecursiveMessage>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<TestRecursiveMessage> _parser = new pb::MessageParser<TestRecursiveMessage>(() => new TestRecursiveMessage());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<TestRecursiveMessage> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.UnittestProto3Reflection.Descriptor.MessageTypes[7]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestRecursiveMessage() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestRecursiveMessage(TestRecursiveMessage other) : this() {
-      a_ = other.a_ != null ? other.a_.Clone() : null;
-      i_ = other.i_;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestRecursiveMessage Clone() {
-      return new TestRecursiveMessage(this);
-    }
-
-    /// <summary>Field number for the "a" field.</summary>
-    public const int AFieldNumber = 1;
-    private global::Google.Protobuf.TestProtos.TestRecursiveMessage a_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.TestProtos.TestRecursiveMessage A {
-      get { return a_; }
-      set {
-        a_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "i" field.</summary>
-    public const int IFieldNumber = 2;
-    private int i_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int I {
-      get { return i_; }
-      set {
-        i_ = value;
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as TestRecursiveMessage);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(TestRecursiveMessage other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (!object.Equals(A, other.A)) return false;
-      if (I != other.I) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (a_ != null) hash ^= A.GetHashCode();
-      if (I != 0) hash ^= I.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (a_ != null) {
-        output.WriteRawTag(10);
-        output.WriteMessage(A);
-      }
-      if (I != 0) {
-        output.WriteRawTag(16);
-        output.WriteInt32(I);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (a_ != null) {
-        output.WriteRawTag(10);
-        output.WriteMessage(A);
-      }
-      if (I != 0) {
-        output.WriteRawTag(16);
-        output.WriteInt32(I);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (a_ != null) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(A);
-      }
-      if (I != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(I);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(TestRecursiveMessage other) {
-      if (other == null) {
-        return;
-      }
-      if (other.a_ != null) {
-        if (a_ == null) {
-          A = new global::Google.Protobuf.TestProtos.TestRecursiveMessage();
-        }
-        A.MergeFrom(other.A);
-      }
-      if (other.I != 0) {
-        I = other.I;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 10: {
-            if (a_ == null) {
-              A = new global::Google.Protobuf.TestProtos.TestRecursiveMessage();
-            }
-            input.ReadMessage(A);
-            break;
-          }
-          case 16: {
-            I = input.ReadInt32();
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 10: {
-            if (a_ == null) {
-              A = new global::Google.Protobuf.TestProtos.TestRecursiveMessage();
-            }
-            input.ReadMessage(A);
-            break;
-          }
-          case 16: {
-            I = input.ReadInt32();
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  /// <summary>
-  /// Test that mutual recursion works.
-  /// </summary>
-  public sealed partial class TestMutualRecursionA : pb::IMessage<TestMutualRecursionA>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<TestMutualRecursionA> _parser = new pb::MessageParser<TestMutualRecursionA>(() => new TestMutualRecursionA());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<TestMutualRecursionA> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.UnittestProto3Reflection.Descriptor.MessageTypes[8]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestMutualRecursionA() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestMutualRecursionA(TestMutualRecursionA other) : this() {
-      bb_ = other.bb_ != null ? other.bb_.Clone() : null;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestMutualRecursionA Clone() {
-      return new TestMutualRecursionA(this);
-    }
-
-    /// <summary>Field number for the "bb" field.</summary>
-    public const int BbFieldNumber = 1;
-    private global::Google.Protobuf.TestProtos.TestMutualRecursionB bb_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.TestProtos.TestMutualRecursionB Bb {
-      get { return bb_; }
-      set {
-        bb_ = value;
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as TestMutualRecursionA);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(TestMutualRecursionA other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (!object.Equals(Bb, other.Bb)) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (bb_ != null) hash ^= Bb.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (bb_ != null) {
-        output.WriteRawTag(10);
-        output.WriteMessage(Bb);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (bb_ != null) {
-        output.WriteRawTag(10);
-        output.WriteMessage(Bb);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (bb_ != null) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(Bb);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(TestMutualRecursionA other) {
-      if (other == null) {
-        return;
-      }
-      if (other.bb_ != null) {
-        if (bb_ == null) {
-          Bb = new global::Google.Protobuf.TestProtos.TestMutualRecursionB();
-        }
-        Bb.MergeFrom(other.Bb);
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 10: {
-            if (bb_ == null) {
-              Bb = new global::Google.Protobuf.TestProtos.TestMutualRecursionB();
-            }
-            input.ReadMessage(Bb);
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 10: {
-            if (bb_ == null) {
-              Bb = new global::Google.Protobuf.TestProtos.TestMutualRecursionB();
-            }
-            input.ReadMessage(Bb);
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  public sealed partial class TestMutualRecursionB : pb::IMessage<TestMutualRecursionB>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<TestMutualRecursionB> _parser = new pb::MessageParser<TestMutualRecursionB>(() => new TestMutualRecursionB());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<TestMutualRecursionB> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.UnittestProto3Reflection.Descriptor.MessageTypes[9]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestMutualRecursionB() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestMutualRecursionB(TestMutualRecursionB other) : this() {
-      a_ = other.a_ != null ? other.a_.Clone() : null;
-      optionalInt32_ = other.optionalInt32_;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestMutualRecursionB Clone() {
-      return new TestMutualRecursionB(this);
-    }
-
-    /// <summary>Field number for the "a" field.</summary>
-    public const int AFieldNumber = 1;
-    private global::Google.Protobuf.TestProtos.TestMutualRecursionA a_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.TestProtos.TestMutualRecursionA A {
-      get { return a_; }
-      set {
-        a_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "optional_int32" field.</summary>
-    public const int OptionalInt32FieldNumber = 2;
-    private int optionalInt32_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int OptionalInt32 {
-      get { return optionalInt32_; }
-      set {
-        optionalInt32_ = value;
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as TestMutualRecursionB);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(TestMutualRecursionB other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (!object.Equals(A, other.A)) return false;
-      if (OptionalInt32 != other.OptionalInt32) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (a_ != null) hash ^= A.GetHashCode();
-      if (OptionalInt32 != 0) hash ^= OptionalInt32.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (a_ != null) {
-        output.WriteRawTag(10);
-        output.WriteMessage(A);
-      }
-      if (OptionalInt32 != 0) {
-        output.WriteRawTag(16);
-        output.WriteInt32(OptionalInt32);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (a_ != null) {
-        output.WriteRawTag(10);
-        output.WriteMessage(A);
-      }
-      if (OptionalInt32 != 0) {
-        output.WriteRawTag(16);
-        output.WriteInt32(OptionalInt32);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (a_ != null) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(A);
-      }
-      if (OptionalInt32 != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(OptionalInt32);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(TestMutualRecursionB other) {
-      if (other == null) {
-        return;
-      }
-      if (other.a_ != null) {
-        if (a_ == null) {
-          A = new global::Google.Protobuf.TestProtos.TestMutualRecursionA();
-        }
-        A.MergeFrom(other.A);
-      }
-      if (other.OptionalInt32 != 0) {
-        OptionalInt32 = other.OptionalInt32;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 10: {
-            if (a_ == null) {
-              A = new global::Google.Protobuf.TestProtos.TestMutualRecursionA();
-            }
-            input.ReadMessage(A);
-            break;
-          }
-          case 16: {
-            OptionalInt32 = input.ReadInt32();
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 10: {
-            if (a_ == null) {
-              A = new global::Google.Protobuf.TestProtos.TestMutualRecursionA();
-            }
-            input.ReadMessage(A);
-            break;
-          }
-          case 16: {
-            OptionalInt32 = input.ReadInt32();
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  public sealed partial class TestEnumAllowAlias : pb::IMessage<TestEnumAllowAlias>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<TestEnumAllowAlias> _parser = new pb::MessageParser<TestEnumAllowAlias>(() => new TestEnumAllowAlias());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<TestEnumAllowAlias> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.UnittestProto3Reflection.Descriptor.MessageTypes[10]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestEnumAllowAlias() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestEnumAllowAlias(TestEnumAllowAlias other) : this() {
-      value_ = other.value_;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestEnumAllowAlias Clone() {
-      return new TestEnumAllowAlias(this);
-    }
-
-    /// <summary>Field number for the "value" field.</summary>
-    public const int ValueFieldNumber = 1;
-    private global::Google.Protobuf.TestProtos.TestEnumWithDupValue value_ = global::Google.Protobuf.TestProtos.TestEnumWithDupValue.Unspecified;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.TestProtos.TestEnumWithDupValue Value {
-      get { return value_; }
-      set {
-        value_ = value;
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as TestEnumAllowAlias);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(TestEnumAllowAlias other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (Value != other.Value) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (Value != global::Google.Protobuf.TestProtos.TestEnumWithDupValue.Unspecified) hash ^= Value.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (Value != global::Google.Protobuf.TestProtos.TestEnumWithDupValue.Unspecified) {
-        output.WriteRawTag(8);
-        output.WriteEnum((int) Value);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (Value != global::Google.Protobuf.TestProtos.TestEnumWithDupValue.Unspecified) {
-        output.WriteRawTag(8);
-        output.WriteEnum((int) Value);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (Value != global::Google.Protobuf.TestProtos.TestEnumWithDupValue.Unspecified) {
-        size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Value);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(TestEnumAllowAlias other) {
-      if (other == null) {
-        return;
-      }
-      if (other.Value != global::Google.Protobuf.TestProtos.TestEnumWithDupValue.Unspecified) {
-        Value = other.Value;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 8: {
-            Value = (global::Google.Protobuf.TestProtos.TestEnumWithDupValue) input.ReadEnum();
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 8: {
-            Value = (global::Google.Protobuf.TestProtos.TestEnumWithDupValue) input.ReadEnum();
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  /// <summary>
-  /// Test message with CamelCase field names.  This violates Protocol Buffer
-  /// standard style.
-  /// </summary>
-  public sealed partial class TestCamelCaseFieldNames : pb::IMessage<TestCamelCaseFieldNames>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<TestCamelCaseFieldNames> _parser = new pb::MessageParser<TestCamelCaseFieldNames>(() => new TestCamelCaseFieldNames());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<TestCamelCaseFieldNames> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.UnittestProto3Reflection.Descriptor.MessageTypes[11]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestCamelCaseFieldNames() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestCamelCaseFieldNames(TestCamelCaseFieldNames other) : this() {
-      primitiveField_ = other.primitiveField_;
-      stringField_ = other.stringField_;
-      enumField_ = other.enumField_;
-      messageField_ = other.messageField_ != null ? other.messageField_.Clone() : null;
-      repeatedPrimitiveField_ = other.repeatedPrimitiveField_.Clone();
-      repeatedStringField_ = other.repeatedStringField_.Clone();
-      repeatedEnumField_ = other.repeatedEnumField_.Clone();
-      repeatedMessageField_ = other.repeatedMessageField_.Clone();
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestCamelCaseFieldNames Clone() {
-      return new TestCamelCaseFieldNames(this);
-    }
-
-    /// <summary>Field number for the "PrimitiveField" field.</summary>
-    public const int PrimitiveFieldFieldNumber = 1;
-    private int primitiveField_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int PrimitiveField {
-      get { return primitiveField_; }
-      set {
-        primitiveField_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "StringField" field.</summary>
-    public const int StringFieldFieldNumber = 2;
-    private string stringField_ = "";
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string StringField {
-      get { return stringField_; }
-      set {
-        stringField_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-
-    /// <summary>Field number for the "EnumField" field.</summary>
-    public const int EnumFieldFieldNumber = 3;
-    private global::Google.Protobuf.TestProtos.ForeignEnum enumField_ = global::Google.Protobuf.TestProtos.ForeignEnum.ForeignUnspecified;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.TestProtos.ForeignEnum EnumField {
-      get { return enumField_; }
-      set {
-        enumField_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "MessageField" field.</summary>
-    public const int MessageFieldFieldNumber = 4;
-    private global::Google.Protobuf.TestProtos.ForeignMessage messageField_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.TestProtos.ForeignMessage MessageField {
-      get { return messageField_; }
-      set {
-        messageField_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "RepeatedPrimitiveField" field.</summary>
-    public const int RepeatedPrimitiveFieldFieldNumber = 7;
-    private static readonly pb::FieldCodec<int> _repeated_repeatedPrimitiveField_codec
-        = pb::FieldCodec.ForInt32(58);
-    private readonly pbc::RepeatedField<int> repeatedPrimitiveField_ = new pbc::RepeatedField<int>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<int> RepeatedPrimitiveField {
-      get { return repeatedPrimitiveField_; }
-    }
-
-    /// <summary>Field number for the "RepeatedStringField" field.</summary>
-    public const int RepeatedStringFieldFieldNumber = 8;
-    private static readonly pb::FieldCodec<string> _repeated_repeatedStringField_codec
-        = pb::FieldCodec.ForString(66);
-    private readonly pbc::RepeatedField<string> repeatedStringField_ = new pbc::RepeatedField<string>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<string> RepeatedStringField {
-      get { return repeatedStringField_; }
-    }
-
-    /// <summary>Field number for the "RepeatedEnumField" field.</summary>
-    public const int RepeatedEnumFieldFieldNumber = 9;
-    private static readonly pb::FieldCodec<global::Google.Protobuf.TestProtos.ForeignEnum> _repeated_repeatedEnumField_codec
-        = pb::FieldCodec.ForEnum(74, x => (int) x, x => (global::Google.Protobuf.TestProtos.ForeignEnum) x);
-    private readonly pbc::RepeatedField<global::Google.Protobuf.TestProtos.ForeignEnum> repeatedEnumField_ = new pbc::RepeatedField<global::Google.Protobuf.TestProtos.ForeignEnum>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Google.Protobuf.TestProtos.ForeignEnum> RepeatedEnumField {
-      get { return repeatedEnumField_; }
-    }
-
-    /// <summary>Field number for the "RepeatedMessageField" field.</summary>
-    public const int RepeatedMessageFieldFieldNumber = 10;
-    private static readonly pb::FieldCodec<global::Google.Protobuf.TestProtos.ForeignMessage> _repeated_repeatedMessageField_codec
-        = pb::FieldCodec.ForMessage(82, global::Google.Protobuf.TestProtos.ForeignMessage.Parser);
-    private readonly pbc::RepeatedField<global::Google.Protobuf.TestProtos.ForeignMessage> repeatedMessageField_ = new pbc::RepeatedField<global::Google.Protobuf.TestProtos.ForeignMessage>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Google.Protobuf.TestProtos.ForeignMessage> RepeatedMessageField {
-      get { return repeatedMessageField_; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as TestCamelCaseFieldNames);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(TestCamelCaseFieldNames other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (PrimitiveField != other.PrimitiveField) return false;
-      if (StringField != other.StringField) return false;
-      if (EnumField != other.EnumField) return false;
-      if (!object.Equals(MessageField, other.MessageField)) return false;
-      if(!repeatedPrimitiveField_.Equals(other.repeatedPrimitiveField_)) return false;
-      if(!repeatedStringField_.Equals(other.repeatedStringField_)) return false;
-      if(!repeatedEnumField_.Equals(other.repeatedEnumField_)) return false;
-      if(!repeatedMessageField_.Equals(other.repeatedMessageField_)) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (PrimitiveField != 0) hash ^= PrimitiveField.GetHashCode();
-      if (StringField.Length != 0) hash ^= StringField.GetHashCode();
-      if (EnumField != global::Google.Protobuf.TestProtos.ForeignEnum.ForeignUnspecified) hash ^= EnumField.GetHashCode();
-      if (messageField_ != null) hash ^= MessageField.GetHashCode();
-      hash ^= repeatedPrimitiveField_.GetHashCode();
-      hash ^= repeatedStringField_.GetHashCode();
-      hash ^= repeatedEnumField_.GetHashCode();
-      hash ^= repeatedMessageField_.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (PrimitiveField != 0) {
-        output.WriteRawTag(8);
-        output.WriteInt32(PrimitiveField);
-      }
-      if (StringField.Length != 0) {
-        output.WriteRawTag(18);
-        output.WriteString(StringField);
-      }
-      if (EnumField != global::Google.Protobuf.TestProtos.ForeignEnum.ForeignUnspecified) {
-        output.WriteRawTag(24);
-        output.WriteEnum((int) EnumField);
-      }
-      if (messageField_ != null) {
-        output.WriteRawTag(34);
-        output.WriteMessage(MessageField);
-      }
-      repeatedPrimitiveField_.WriteTo(output, _repeated_repeatedPrimitiveField_codec);
-      repeatedStringField_.WriteTo(output, _repeated_repeatedStringField_codec);
-      repeatedEnumField_.WriteTo(output, _repeated_repeatedEnumField_codec);
-      repeatedMessageField_.WriteTo(output, _repeated_repeatedMessageField_codec);
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (PrimitiveField != 0) {
-        output.WriteRawTag(8);
-        output.WriteInt32(PrimitiveField);
-      }
-      if (StringField.Length != 0) {
-        output.WriteRawTag(18);
-        output.WriteString(StringField);
-      }
-      if (EnumField != global::Google.Protobuf.TestProtos.ForeignEnum.ForeignUnspecified) {
-        output.WriteRawTag(24);
-        output.WriteEnum((int) EnumField);
-      }
-      if (messageField_ != null) {
-        output.WriteRawTag(34);
-        output.WriteMessage(MessageField);
-      }
-      repeatedPrimitiveField_.WriteTo(ref output, _repeated_repeatedPrimitiveField_codec);
-      repeatedStringField_.WriteTo(ref output, _repeated_repeatedStringField_codec);
-      repeatedEnumField_.WriteTo(ref output, _repeated_repeatedEnumField_codec);
-      repeatedMessageField_.WriteTo(ref output, _repeated_repeatedMessageField_codec);
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (PrimitiveField != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(PrimitiveField);
-      }
-      if (StringField.Length != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(StringField);
-      }
-      if (EnumField != global::Google.Protobuf.TestProtos.ForeignEnum.ForeignUnspecified) {
-        size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) EnumField);
-      }
-      if (messageField_ != null) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(MessageField);
-      }
-      size += repeatedPrimitiveField_.CalculateSize(_repeated_repeatedPrimitiveField_codec);
-      size += repeatedStringField_.CalculateSize(_repeated_repeatedStringField_codec);
-      size += repeatedEnumField_.CalculateSize(_repeated_repeatedEnumField_codec);
-      size += repeatedMessageField_.CalculateSize(_repeated_repeatedMessageField_codec);
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(TestCamelCaseFieldNames other) {
-      if (other == null) {
-        return;
-      }
-      if (other.PrimitiveField != 0) {
-        PrimitiveField = other.PrimitiveField;
-      }
-      if (other.StringField.Length != 0) {
-        StringField = other.StringField;
-      }
-      if (other.EnumField != global::Google.Protobuf.TestProtos.ForeignEnum.ForeignUnspecified) {
-        EnumField = other.EnumField;
-      }
-      if (other.messageField_ != null) {
-        if (messageField_ == null) {
-          MessageField = new global::Google.Protobuf.TestProtos.ForeignMessage();
-        }
-        MessageField.MergeFrom(other.MessageField);
-      }
-      repeatedPrimitiveField_.Add(other.repeatedPrimitiveField_);
-      repeatedStringField_.Add(other.repeatedStringField_);
-      repeatedEnumField_.Add(other.repeatedEnumField_);
-      repeatedMessageField_.Add(other.repeatedMessageField_);
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 8: {
-            PrimitiveField = input.ReadInt32();
-            break;
-          }
-          case 18: {
-            StringField = input.ReadString();
-            break;
-          }
-          case 24: {
-            EnumField = (global::Google.Protobuf.TestProtos.ForeignEnum) input.ReadEnum();
-            break;
-          }
-          case 34: {
-            if (messageField_ == null) {
-              MessageField = new global::Google.Protobuf.TestProtos.ForeignMessage();
-            }
-            input.ReadMessage(MessageField);
-            break;
-          }
-          case 58:
-          case 56: {
-            repeatedPrimitiveField_.AddEntriesFrom(input, _repeated_repeatedPrimitiveField_codec);
-            break;
-          }
-          case 66: {
-            repeatedStringField_.AddEntriesFrom(input, _repeated_repeatedStringField_codec);
-            break;
-          }
-          case 74:
-          case 72: {
-            repeatedEnumField_.AddEntriesFrom(input, _repeated_repeatedEnumField_codec);
-            break;
-          }
-          case 82: {
-            repeatedMessageField_.AddEntriesFrom(input, _repeated_repeatedMessageField_codec);
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 8: {
-            PrimitiveField = input.ReadInt32();
-            break;
-          }
-          case 18: {
-            StringField = input.ReadString();
-            break;
-          }
-          case 24: {
-            EnumField = (global::Google.Protobuf.TestProtos.ForeignEnum) input.ReadEnum();
-            break;
-          }
-          case 34: {
-            if (messageField_ == null) {
-              MessageField = new global::Google.Protobuf.TestProtos.ForeignMessage();
-            }
-            input.ReadMessage(MessageField);
-            break;
-          }
-          case 58:
-          case 56: {
-            repeatedPrimitiveField_.AddEntriesFrom(ref input, _repeated_repeatedPrimitiveField_codec);
-            break;
-          }
-          case 66: {
-            repeatedStringField_.AddEntriesFrom(ref input, _repeated_repeatedStringField_codec);
-            break;
-          }
-          case 74:
-          case 72: {
-            repeatedEnumField_.AddEntriesFrom(ref input, _repeated_repeatedEnumField_codec);
-            break;
-          }
-          case 82: {
-            repeatedMessageField_.AddEntriesFrom(ref input, _repeated_repeatedMessageField_codec);
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  /// <summary>
-  /// We list fields out of order, to ensure that we're using field number and not
-  /// field index to determine serialization order.
-  /// </summary>
-  public sealed partial class TestFieldOrderings : pb::IMessage<TestFieldOrderings>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<TestFieldOrderings> _parser = new pb::MessageParser<TestFieldOrderings>(() => new TestFieldOrderings());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<TestFieldOrderings> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.UnittestProto3Reflection.Descriptor.MessageTypes[12]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestFieldOrderings() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestFieldOrderings(TestFieldOrderings other) : this() {
-      myString_ = other.myString_;
-      myInt_ = other.myInt_;
-      myFloat_ = other.myFloat_;
-      singleNestedMessage_ = other.singleNestedMessage_ != null ? other.singleNestedMessage_.Clone() : null;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestFieldOrderings Clone() {
-      return new TestFieldOrderings(this);
-    }
-
-    /// <summary>Field number for the "my_string" field.</summary>
-    public const int MyStringFieldNumber = 11;
-    private string myString_ = "";
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string MyString {
-      get { return myString_; }
-      set {
-        myString_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-
-    /// <summary>Field number for the "my_int" field.</summary>
-    public const int MyIntFieldNumber = 1;
-    private long myInt_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public long MyInt {
-      get { return myInt_; }
-      set {
-        myInt_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "my_float" field.</summary>
-    public const int MyFloatFieldNumber = 101;
-    private float myFloat_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public float MyFloat {
-      get { return myFloat_; }
-      set {
-        myFloat_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "single_nested_message" field.</summary>
-    public const int SingleNestedMessageFieldNumber = 200;
-    private global::Google.Protobuf.TestProtos.TestFieldOrderings.Types.NestedMessage singleNestedMessage_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.TestProtos.TestFieldOrderings.Types.NestedMessage SingleNestedMessage {
-      get { return singleNestedMessage_; }
-      set {
-        singleNestedMessage_ = value;
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as TestFieldOrderings);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(TestFieldOrderings other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (MyString != other.MyString) return false;
-      if (MyInt != other.MyInt) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.Equals(MyFloat, other.MyFloat)) return false;
-      if (!object.Equals(SingleNestedMessage, other.SingleNestedMessage)) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (MyString.Length != 0) hash ^= MyString.GetHashCode();
-      if (MyInt != 0L) hash ^= MyInt.GetHashCode();
-      if (MyFloat != 0F) hash ^= pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.GetHashCode(MyFloat);
-      if (singleNestedMessage_ != null) hash ^= SingleNestedMessage.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (MyInt != 0L) {
-        output.WriteRawTag(8);
-        output.WriteInt64(MyInt);
-      }
-      if (MyString.Length != 0) {
-        output.WriteRawTag(90);
-        output.WriteString(MyString);
-      }
-      if (MyFloat != 0F) {
-        output.WriteRawTag(173, 6);
-        output.WriteFloat(MyFloat);
-      }
-      if (singleNestedMessage_ != null) {
-        output.WriteRawTag(194, 12);
-        output.WriteMessage(SingleNestedMessage);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (MyInt != 0L) {
-        output.WriteRawTag(8);
-        output.WriteInt64(MyInt);
-      }
-      if (MyString.Length != 0) {
-        output.WriteRawTag(90);
-        output.WriteString(MyString);
-      }
-      if (MyFloat != 0F) {
-        output.WriteRawTag(173, 6);
-        output.WriteFloat(MyFloat);
-      }
-      if (singleNestedMessage_ != null) {
-        output.WriteRawTag(194, 12);
-        output.WriteMessage(SingleNestedMessage);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (MyString.Length != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(MyString);
-      }
-      if (MyInt != 0L) {
-        size += 1 + pb::CodedOutputStream.ComputeInt64Size(MyInt);
-      }
-      if (MyFloat != 0F) {
-        size += 2 + 4;
-      }
-      if (singleNestedMessage_ != null) {
-        size += 2 + pb::CodedOutputStream.ComputeMessageSize(SingleNestedMessage);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(TestFieldOrderings other) {
-      if (other == null) {
-        return;
-      }
-      if (other.MyString.Length != 0) {
-        MyString = other.MyString;
-      }
-      if (other.MyInt != 0L) {
-        MyInt = other.MyInt;
-      }
-      if (other.MyFloat != 0F) {
-        MyFloat = other.MyFloat;
-      }
-      if (other.singleNestedMessage_ != null) {
-        if (singleNestedMessage_ == null) {
-          SingleNestedMessage = new global::Google.Protobuf.TestProtos.TestFieldOrderings.Types.NestedMessage();
-        }
-        SingleNestedMessage.MergeFrom(other.SingleNestedMessage);
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 8: {
-            MyInt = input.ReadInt64();
-            break;
-          }
-          case 90: {
-            MyString = input.ReadString();
-            break;
-          }
-          case 813: {
-            MyFloat = input.ReadFloat();
-            break;
-          }
-          case 1602: {
-            if (singleNestedMessage_ == null) {
-              SingleNestedMessage = new global::Google.Protobuf.TestProtos.TestFieldOrderings.Types.NestedMessage();
-            }
-            input.ReadMessage(SingleNestedMessage);
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 8: {
-            MyInt = input.ReadInt64();
-            break;
-          }
-          case 90: {
-            MyString = input.ReadString();
-            break;
-          }
-          case 813: {
-            MyFloat = input.ReadFloat();
-            break;
-          }
-          case 1602: {
-            if (singleNestedMessage_ == null) {
-              SingleNestedMessage = new global::Google.Protobuf.TestProtos.TestFieldOrderings.Types.NestedMessage();
-            }
-            input.ReadMessage(SingleNestedMessage);
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-    #region Nested types
-    /// <summary>Container for nested types declared in the TestFieldOrderings message type.</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static partial class Types {
-      public sealed partial class NestedMessage : pb::IMessage<NestedMessage>
-      #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          , pb::IBufferMessage
-      #endif
-      {
-        private static readonly pb::MessageParser<NestedMessage> _parser = new pb::MessageParser<NestedMessage>(() => new NestedMessage());
-        private pb::UnknownFieldSet _unknownFields;
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static pb::MessageParser<NestedMessage> Parser { get { return _parser; } }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static pbr::MessageDescriptor Descriptor {
-          get { return global::Google.Protobuf.TestProtos.TestFieldOrderings.Descriptor.NestedTypes[0]; }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        pbr::MessageDescriptor pb::IMessage.Descriptor {
-          get { return Descriptor; }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public NestedMessage() {
-          OnConstruction();
-        }
-
-        partial void OnConstruction();
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public NestedMessage(NestedMessage other) : this() {
-          oo_ = other.oo_;
-          bb_ = other.bb_;
-          _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public NestedMessage Clone() {
-          return new NestedMessage(this);
-        }
-
-        /// <summary>Field number for the "oo" field.</summary>
-        public const int OoFieldNumber = 2;
-        private long oo_;
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public long Oo {
-          get { return oo_; }
-          set {
-            oo_ = value;
-          }
-        }
-
-        /// <summary>Field number for the "bb" field.</summary>
-        public const int BbFieldNumber = 1;
-        private int bb_;
-        /// <summary>
-        /// The field name "b" fails to compile in proto1 because it conflicts with
-        /// a local variable named "b" in one of the generated methods.  Doh.
-        /// This file needs to compile in proto1 to test backwards-compatibility.
-        /// </summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public int Bb {
-          get { return bb_; }
-          set {
-            bb_ = value;
-          }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override bool Equals(object other) {
-          return Equals(other as NestedMessage);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool Equals(NestedMessage other) {
-          if (ReferenceEquals(other, null)) {
-            return false;
-          }
-          if (ReferenceEquals(other, this)) {
-            return true;
-          }
-          if (Oo != other.Oo) return false;
-          if (Bb != other.Bb) return false;
-          return Equals(_unknownFields, other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override int GetHashCode() {
-          int hash = 1;
-          if (Oo != 0L) hash ^= Oo.GetHashCode();
-          if (Bb != 0) hash ^= Bb.GetHashCode();
-          if (_unknownFields != null) {
-            hash ^= _unknownFields.GetHashCode();
-          }
-          return hash;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override string ToString() {
-          return pb::JsonFormatter.ToDiagnosticString(this);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void WriteTo(pb::CodedOutputStream output) {
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          output.WriteRawMessage(this);
-        #else
-          if (Bb != 0) {
-            output.WriteRawTag(8);
-            output.WriteInt32(Bb);
-          }
-          if (Oo != 0L) {
-            output.WriteRawTag(16);
-            output.WriteInt64(Oo);
-          }
-          if (_unknownFields != null) {
-            _unknownFields.WriteTo(output);
-          }
-        #endif
-        }
-
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-          if (Bb != 0) {
-            output.WriteRawTag(8);
-            output.WriteInt32(Bb);
-          }
-          if (Oo != 0L) {
-            output.WriteRawTag(16);
-            output.WriteInt64(Oo);
-          }
-          if (_unknownFields != null) {
-            _unknownFields.WriteTo(ref output);
-          }
-        }
-        #endif
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public int CalculateSize() {
-          int size = 0;
-          if (Oo != 0L) {
-            size += 1 + pb::CodedOutputStream.ComputeInt64Size(Oo);
-          }
-          if (Bb != 0) {
-            size += 1 + pb::CodedOutputStream.ComputeInt32Size(Bb);
-          }
-          if (_unknownFields != null) {
-            size += _unknownFields.CalculateSize();
-          }
-          return size;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(NestedMessage other) {
-          if (other == null) {
-            return;
-          }
-          if (other.Oo != 0L) {
-            Oo = other.Oo;
-          }
-          if (other.Bb != 0) {
-            Bb = other.Bb;
-          }
-          _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(pb::CodedInputStream input) {
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          input.ReadRawMessage(this);
-        #else
-          uint tag;
-          while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
-              default:
-                _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-                break;
-              case 8: {
-                Bb = input.ReadInt32();
-                break;
-              }
-              case 16: {
-                Oo = input.ReadInt64();
-                break;
-              }
-            }
-          }
-        #endif
-        }
-
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-          uint tag;
-          while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
-              default:
-                _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-                break;
-              case 8: {
-                Bb = input.ReadInt32();
-                break;
-              }
-              case 16: {
-                Oo = input.ReadInt64();
-                break;
-              }
-            }
-          }
-        }
-        #endif
-
-      }
-
-    }
-    #endregion
-
-  }
-
-  public sealed partial class SparseEnumMessage : pb::IMessage<SparseEnumMessage>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<SparseEnumMessage> _parser = new pb::MessageParser<SparseEnumMessage>(() => new SparseEnumMessage());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<SparseEnumMessage> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.UnittestProto3Reflection.Descriptor.MessageTypes[13]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public SparseEnumMessage() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public SparseEnumMessage(SparseEnumMessage other) : this() {
-      sparseEnum_ = other.sparseEnum_;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public SparseEnumMessage Clone() {
-      return new SparseEnumMessage(this);
-    }
-
-    /// <summary>Field number for the "sparse_enum" field.</summary>
-    public const int SparseEnumFieldNumber = 1;
-    private global::Google.Protobuf.TestProtos.TestSparseEnum sparseEnum_ = global::Google.Protobuf.TestProtos.TestSparseEnum.Unspecified;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.TestProtos.TestSparseEnum SparseEnum {
-      get { return sparseEnum_; }
-      set {
-        sparseEnum_ = value;
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as SparseEnumMessage);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(SparseEnumMessage other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (SparseEnum != other.SparseEnum) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (SparseEnum != global::Google.Protobuf.TestProtos.TestSparseEnum.Unspecified) hash ^= SparseEnum.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (SparseEnum != global::Google.Protobuf.TestProtos.TestSparseEnum.Unspecified) {
-        output.WriteRawTag(8);
-        output.WriteEnum((int) SparseEnum);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (SparseEnum != global::Google.Protobuf.TestProtos.TestSparseEnum.Unspecified) {
-        output.WriteRawTag(8);
-        output.WriteEnum((int) SparseEnum);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (SparseEnum != global::Google.Protobuf.TestProtos.TestSparseEnum.Unspecified) {
-        size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) SparseEnum);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(SparseEnumMessage other) {
-      if (other == null) {
-        return;
-      }
-      if (other.SparseEnum != global::Google.Protobuf.TestProtos.TestSparseEnum.Unspecified) {
-        SparseEnum = other.SparseEnum;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 8: {
-            SparseEnum = (global::Google.Protobuf.TestProtos.TestSparseEnum) input.ReadEnum();
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 8: {
-            SparseEnum = (global::Google.Protobuf.TestProtos.TestSparseEnum) input.ReadEnum();
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  /// <summary>
-  /// Test String and Bytes: string is for valid UTF-8 strings
-  /// </summary>
-  public sealed partial class OneString : pb::IMessage<OneString>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<OneString> _parser = new pb::MessageParser<OneString>(() => new OneString());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<OneString> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.UnittestProto3Reflection.Descriptor.MessageTypes[14]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public OneString() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public OneString(OneString other) : this() {
-      data_ = other.data_;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public OneString Clone() {
-      return new OneString(this);
-    }
-
-    /// <summary>Field number for the "data" field.</summary>
-    public const int DataFieldNumber = 1;
-    private string data_ = "";
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string Data {
-      get { return data_; }
-      set {
-        data_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as OneString);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(OneString other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (Data != other.Data) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (Data.Length != 0) hash ^= Data.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (Data.Length != 0) {
-        output.WriteRawTag(10);
-        output.WriteString(Data);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (Data.Length != 0) {
-        output.WriteRawTag(10);
-        output.WriteString(Data);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (Data.Length != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(Data);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(OneString other) {
-      if (other == null) {
-        return;
-      }
-      if (other.Data.Length != 0) {
-        Data = other.Data;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 10: {
-            Data = input.ReadString();
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 10: {
-            Data = input.ReadString();
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  public sealed partial class MoreString : pb::IMessage<MoreString>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<MoreString> _parser = new pb::MessageParser<MoreString>(() => new MoreString());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<MoreString> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.UnittestProto3Reflection.Descriptor.MessageTypes[15]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public MoreString() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public MoreString(MoreString other) : this() {
-      data_ = other.data_.Clone();
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public MoreString Clone() {
-      return new MoreString(this);
-    }
-
-    /// <summary>Field number for the "data" field.</summary>
-    public const int DataFieldNumber = 1;
-    private static readonly pb::FieldCodec<string> _repeated_data_codec
-        = pb::FieldCodec.ForString(10);
-    private readonly pbc::RepeatedField<string> data_ = new pbc::RepeatedField<string>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<string> Data {
-      get { return data_; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as MoreString);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(MoreString other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if(!data_.Equals(other.data_)) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      hash ^= data_.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      data_.WriteTo(output, _repeated_data_codec);
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      data_.WriteTo(ref output, _repeated_data_codec);
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      size += data_.CalculateSize(_repeated_data_codec);
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(MoreString other) {
-      if (other == null) {
-        return;
-      }
-      data_.Add(other.data_);
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 10: {
-            data_.AddEntriesFrom(input, _repeated_data_codec);
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 10: {
-            data_.AddEntriesFrom(ref input, _repeated_data_codec);
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  public sealed partial class OneBytes : pb::IMessage<OneBytes>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<OneBytes> _parser = new pb::MessageParser<OneBytes>(() => new OneBytes());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<OneBytes> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.UnittestProto3Reflection.Descriptor.MessageTypes[16]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public OneBytes() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public OneBytes(OneBytes other) : this() {
-      data_ = other.data_;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public OneBytes Clone() {
-      return new OneBytes(this);
-    }
-
-    /// <summary>Field number for the "data" field.</summary>
-    public const int DataFieldNumber = 1;
-    private pb::ByteString data_ = pb::ByteString.Empty;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pb::ByteString Data {
-      get { return data_; }
-      set {
-        data_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as OneBytes);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(OneBytes other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (Data != other.Data) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (Data.Length != 0) hash ^= Data.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (Data.Length != 0) {
-        output.WriteRawTag(10);
-        output.WriteBytes(Data);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (Data.Length != 0) {
-        output.WriteRawTag(10);
-        output.WriteBytes(Data);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (Data.Length != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeBytesSize(Data);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(OneBytes other) {
-      if (other == null) {
-        return;
-      }
-      if (other.Data.Length != 0) {
-        Data = other.Data;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 10: {
-            Data = input.ReadBytes();
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 10: {
-            Data = input.ReadBytes();
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  public sealed partial class MoreBytes : pb::IMessage<MoreBytes>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<MoreBytes> _parser = new pb::MessageParser<MoreBytes>(() => new MoreBytes());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<MoreBytes> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.UnittestProto3Reflection.Descriptor.MessageTypes[17]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public MoreBytes() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public MoreBytes(MoreBytes other) : this() {
-      data_ = other.data_;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public MoreBytes Clone() {
-      return new MoreBytes(this);
-    }
-
-    /// <summary>Field number for the "data" field.</summary>
-    public const int DataFieldNumber = 1;
-    private pb::ByteString data_ = pb::ByteString.Empty;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pb::ByteString Data {
-      get { return data_; }
-      set {
-        data_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as MoreBytes);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(MoreBytes other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (Data != other.Data) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (Data.Length != 0) hash ^= Data.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (Data.Length != 0) {
-        output.WriteRawTag(10);
-        output.WriteBytes(Data);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (Data.Length != 0) {
-        output.WriteRawTag(10);
-        output.WriteBytes(Data);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (Data.Length != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeBytesSize(Data);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(MoreBytes other) {
-      if (other == null) {
-        return;
-      }
-      if (other.Data.Length != 0) {
-        Data = other.Data;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 10: {
-            Data = input.ReadBytes();
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 10: {
-            Data = input.ReadBytes();
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  /// <summary>
-  /// Test int32, uint32, int64, uint64, and bool are all compatible
-  /// </summary>
-  public sealed partial class Int32Message : pb::IMessage<Int32Message>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<Int32Message> _parser = new pb::MessageParser<Int32Message>(() => new Int32Message());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<Int32Message> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.UnittestProto3Reflection.Descriptor.MessageTypes[18]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Int32Message() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Int32Message(Int32Message other) : this() {
-      data_ = other.data_;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Int32Message Clone() {
-      return new Int32Message(this);
-    }
-
-    /// <summary>Field number for the "data" field.</summary>
-    public const int DataFieldNumber = 1;
-    private int data_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int Data {
-      get { return data_; }
-      set {
-        data_ = value;
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as Int32Message);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(Int32Message other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (Data != other.Data) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (Data != 0) hash ^= Data.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (Data != 0) {
-        output.WriteRawTag(8);
-        output.WriteInt32(Data);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (Data != 0) {
-        output.WriteRawTag(8);
-        output.WriteInt32(Data);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (Data != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(Data);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(Int32Message other) {
-      if (other == null) {
-        return;
-      }
-      if (other.Data != 0) {
-        Data = other.Data;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 8: {
-            Data = input.ReadInt32();
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 8: {
-            Data = input.ReadInt32();
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  public sealed partial class Uint32Message : pb::IMessage<Uint32Message>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<Uint32Message> _parser = new pb::MessageParser<Uint32Message>(() => new Uint32Message());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<Uint32Message> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.UnittestProto3Reflection.Descriptor.MessageTypes[19]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Uint32Message() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Uint32Message(Uint32Message other) : this() {
-      data_ = other.data_;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Uint32Message Clone() {
-      return new Uint32Message(this);
-    }
-
-    /// <summary>Field number for the "data" field.</summary>
-    public const int DataFieldNumber = 1;
-    private uint data_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public uint Data {
-      get { return data_; }
-      set {
-        data_ = value;
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as Uint32Message);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(Uint32Message other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (Data != other.Data) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (Data != 0) hash ^= Data.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (Data != 0) {
-        output.WriteRawTag(8);
-        output.WriteUInt32(Data);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (Data != 0) {
-        output.WriteRawTag(8);
-        output.WriteUInt32(Data);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (Data != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeUInt32Size(Data);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(Uint32Message other) {
-      if (other == null) {
-        return;
-      }
-      if (other.Data != 0) {
-        Data = other.Data;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 8: {
-            Data = input.ReadUInt32();
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 8: {
-            Data = input.ReadUInt32();
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  public sealed partial class Int64Message : pb::IMessage<Int64Message>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<Int64Message> _parser = new pb::MessageParser<Int64Message>(() => new Int64Message());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<Int64Message> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.UnittestProto3Reflection.Descriptor.MessageTypes[20]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Int64Message() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Int64Message(Int64Message other) : this() {
-      data_ = other.data_;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Int64Message Clone() {
-      return new Int64Message(this);
-    }
-
-    /// <summary>Field number for the "data" field.</summary>
-    public const int DataFieldNumber = 1;
-    private long data_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public long Data {
-      get { return data_; }
-      set {
-        data_ = value;
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as Int64Message);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(Int64Message other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (Data != other.Data) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (Data != 0L) hash ^= Data.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (Data != 0L) {
-        output.WriteRawTag(8);
-        output.WriteInt64(Data);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (Data != 0L) {
-        output.WriteRawTag(8);
-        output.WriteInt64(Data);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (Data != 0L) {
-        size += 1 + pb::CodedOutputStream.ComputeInt64Size(Data);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(Int64Message other) {
-      if (other == null) {
-        return;
-      }
-      if (other.Data != 0L) {
-        Data = other.Data;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 8: {
-            Data = input.ReadInt64();
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 8: {
-            Data = input.ReadInt64();
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  public sealed partial class Uint64Message : pb::IMessage<Uint64Message>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<Uint64Message> _parser = new pb::MessageParser<Uint64Message>(() => new Uint64Message());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<Uint64Message> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.UnittestProto3Reflection.Descriptor.MessageTypes[21]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Uint64Message() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Uint64Message(Uint64Message other) : this() {
-      data_ = other.data_;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Uint64Message Clone() {
-      return new Uint64Message(this);
-    }
-
-    /// <summary>Field number for the "data" field.</summary>
-    public const int DataFieldNumber = 1;
-    private ulong data_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ulong Data {
-      get { return data_; }
-      set {
-        data_ = value;
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as Uint64Message);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(Uint64Message other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (Data != other.Data) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (Data != 0UL) hash ^= Data.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (Data != 0UL) {
-        output.WriteRawTag(8);
-        output.WriteUInt64(Data);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (Data != 0UL) {
-        output.WriteRawTag(8);
-        output.WriteUInt64(Data);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (Data != 0UL) {
-        size += 1 + pb::CodedOutputStream.ComputeUInt64Size(Data);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(Uint64Message other) {
-      if (other == null) {
-        return;
-      }
-      if (other.Data != 0UL) {
-        Data = other.Data;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 8: {
-            Data = input.ReadUInt64();
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 8: {
-            Data = input.ReadUInt64();
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  public sealed partial class BoolMessage : pb::IMessage<BoolMessage>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<BoolMessage> _parser = new pb::MessageParser<BoolMessage>(() => new BoolMessage());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<BoolMessage> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.UnittestProto3Reflection.Descriptor.MessageTypes[22]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public BoolMessage() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public BoolMessage(BoolMessage other) : this() {
-      data_ = other.data_;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public BoolMessage Clone() {
-      return new BoolMessage(this);
-    }
-
-    /// <summary>Field number for the "data" field.</summary>
-    public const int DataFieldNumber = 1;
-    private bool data_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Data {
-      get { return data_; }
-      set {
-        data_ = value;
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as BoolMessage);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(BoolMessage other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (Data != other.Data) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (Data != false) hash ^= Data.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (Data != false) {
-        output.WriteRawTag(8);
-        output.WriteBool(Data);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (Data != false) {
-        output.WriteRawTag(8);
-        output.WriteBool(Data);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (Data != false) {
-        size += 1 + 1;
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(BoolMessage other) {
-      if (other == null) {
-        return;
-      }
-      if (other.Data != false) {
-        Data = other.Data;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 8: {
-            Data = input.ReadBool();
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 8: {
-            Data = input.ReadBool();
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  /// <summary>
-  /// Test oneofs.
-  /// </summary>
-  public sealed partial class TestOneof : pb::IMessage<TestOneof>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<TestOneof> _parser = new pb::MessageParser<TestOneof>(() => new TestOneof());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<TestOneof> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.UnittestProto3Reflection.Descriptor.MessageTypes[23]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestOneof() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestOneof(TestOneof other) : this() {
-      switch (other.FooCase) {
-        case FooOneofCase.FooInt:
-          FooInt = other.FooInt;
-          break;
-        case FooOneofCase.FooString:
-          FooString = other.FooString;
-          break;
-        case FooOneofCase.FooMessage:
-          FooMessage = other.FooMessage.Clone();
-          break;
-      }
-
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestOneof Clone() {
-      return new TestOneof(this);
-    }
-
-    /// <summary>Field number for the "foo_int" field.</summary>
-    public const int FooIntFieldNumber = 1;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int FooInt {
-      get { return fooCase_ == FooOneofCase.FooInt ? (int) foo_ : 0; }
-      set {
-        foo_ = value;
-        fooCase_ = FooOneofCase.FooInt;
-      }
-    }
-
-    /// <summary>Field number for the "foo_string" field.</summary>
-    public const int FooStringFieldNumber = 2;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string FooString {
-      get { return fooCase_ == FooOneofCase.FooString ? (string) foo_ : ""; }
-      set {
-        foo_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-        fooCase_ = FooOneofCase.FooString;
-      }
-    }
-
-    /// <summary>Field number for the "foo_message" field.</summary>
-    public const int FooMessageFieldNumber = 3;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.TestProtos.TestAllTypes FooMessage {
-      get { return fooCase_ == FooOneofCase.FooMessage ? (global::Google.Protobuf.TestProtos.TestAllTypes) foo_ : null; }
-      set {
-        foo_ = value;
-        fooCase_ = value == null ? FooOneofCase.None : FooOneofCase.FooMessage;
-      }
-    }
-
-    private object foo_;
-    /// <summary>Enum of possible cases for the "foo" oneof.</summary>
-    public enum FooOneofCase {
-      None = 0,
-      FooInt = 1,
-      FooString = 2,
-      FooMessage = 3,
-    }
-    private FooOneofCase fooCase_ = FooOneofCase.None;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public FooOneofCase FooCase {
-      get { return fooCase_; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearFoo() {
-      fooCase_ = FooOneofCase.None;
-      foo_ = null;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as TestOneof);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(TestOneof other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (FooInt != other.FooInt) return false;
-      if (FooString != other.FooString) return false;
-      if (!object.Equals(FooMessage, other.FooMessage)) return false;
-      if (FooCase != other.FooCase) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (fooCase_ == FooOneofCase.FooInt) hash ^= FooInt.GetHashCode();
-      if (fooCase_ == FooOneofCase.FooString) hash ^= FooString.GetHashCode();
-      if (fooCase_ == FooOneofCase.FooMessage) hash ^= FooMessage.GetHashCode();
-      hash ^= (int) fooCase_;
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (fooCase_ == FooOneofCase.FooInt) {
-        output.WriteRawTag(8);
-        output.WriteInt32(FooInt);
-      }
-      if (fooCase_ == FooOneofCase.FooString) {
-        output.WriteRawTag(18);
-        output.WriteString(FooString);
-      }
-      if (fooCase_ == FooOneofCase.FooMessage) {
-        output.WriteRawTag(26);
-        output.WriteMessage(FooMessage);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (fooCase_ == FooOneofCase.FooInt) {
-        output.WriteRawTag(8);
-        output.WriteInt32(FooInt);
-      }
-      if (fooCase_ == FooOneofCase.FooString) {
-        output.WriteRawTag(18);
-        output.WriteString(FooString);
-      }
-      if (fooCase_ == FooOneofCase.FooMessage) {
-        output.WriteRawTag(26);
-        output.WriteMessage(FooMessage);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (fooCase_ == FooOneofCase.FooInt) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(FooInt);
-      }
-      if (fooCase_ == FooOneofCase.FooString) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(FooString);
-      }
-      if (fooCase_ == FooOneofCase.FooMessage) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(FooMessage);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(TestOneof other) {
-      if (other == null) {
-        return;
-      }
-      switch (other.FooCase) {
-        case FooOneofCase.FooInt:
-          FooInt = other.FooInt;
-          break;
-        case FooOneofCase.FooString:
-          FooString = other.FooString;
-          break;
-        case FooOneofCase.FooMessage:
-          if (FooMessage == null) {
-            FooMessage = new global::Google.Protobuf.TestProtos.TestAllTypes();
-          }
-          FooMessage.MergeFrom(other.FooMessage);
-          break;
-      }
-
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 8: {
-            FooInt = input.ReadInt32();
-            break;
-          }
-          case 18: {
-            FooString = input.ReadString();
-            break;
-          }
-          case 26: {
-            global::Google.Protobuf.TestProtos.TestAllTypes subBuilder = new global::Google.Protobuf.TestProtos.TestAllTypes();
-            if (fooCase_ == FooOneofCase.FooMessage) {
-              subBuilder.MergeFrom(FooMessage);
-            }
-            input.ReadMessage(subBuilder);
-            FooMessage = subBuilder;
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 8: {
-            FooInt = input.ReadInt32();
-            break;
-          }
-          case 18: {
-            FooString = input.ReadString();
-            break;
-          }
-          case 26: {
-            global::Google.Protobuf.TestProtos.TestAllTypes subBuilder = new global::Google.Protobuf.TestProtos.TestAllTypes();
-            if (fooCase_ == FooOneofCase.FooMessage) {
-              subBuilder.MergeFrom(FooMessage);
-            }
-            input.ReadMessage(subBuilder);
-            FooMessage = subBuilder;
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  public sealed partial class TestPackedTypes : pb::IMessage<TestPackedTypes>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<TestPackedTypes> _parser = new pb::MessageParser<TestPackedTypes>(() => new TestPackedTypes());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<TestPackedTypes> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.UnittestProto3Reflection.Descriptor.MessageTypes[24]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestPackedTypes() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestPackedTypes(TestPackedTypes other) : this() {
-      packedInt32_ = other.packedInt32_.Clone();
-      packedInt64_ = other.packedInt64_.Clone();
-      packedUint32_ = other.packedUint32_.Clone();
-      packedUint64_ = other.packedUint64_.Clone();
-      packedSint32_ = other.packedSint32_.Clone();
-      packedSint64_ = other.packedSint64_.Clone();
-      packedFixed32_ = other.packedFixed32_.Clone();
-      packedFixed64_ = other.packedFixed64_.Clone();
-      packedSfixed32_ = other.packedSfixed32_.Clone();
-      packedSfixed64_ = other.packedSfixed64_.Clone();
-      packedFloat_ = other.packedFloat_.Clone();
-      packedDouble_ = other.packedDouble_.Clone();
-      packedBool_ = other.packedBool_.Clone();
-      packedEnum_ = other.packedEnum_.Clone();
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestPackedTypes Clone() {
-      return new TestPackedTypes(this);
-    }
-
-    /// <summary>Field number for the "packed_int32" field.</summary>
-    public const int PackedInt32FieldNumber = 90;
-    private static readonly pb::FieldCodec<int> _repeated_packedInt32_codec
-        = pb::FieldCodec.ForInt32(722);
-    private readonly pbc::RepeatedField<int> packedInt32_ = new pbc::RepeatedField<int>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<int> PackedInt32 {
-      get { return packedInt32_; }
-    }
-
-    /// <summary>Field number for the "packed_int64" field.</summary>
-    public const int PackedInt64FieldNumber = 91;
-    private static readonly pb::FieldCodec<long> _repeated_packedInt64_codec
-        = pb::FieldCodec.ForInt64(730);
-    private readonly pbc::RepeatedField<long> packedInt64_ = new pbc::RepeatedField<long>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<long> PackedInt64 {
-      get { return packedInt64_; }
-    }
-
-    /// <summary>Field number for the "packed_uint32" field.</summary>
-    public const int PackedUint32FieldNumber = 92;
-    private static readonly pb::FieldCodec<uint> _repeated_packedUint32_codec
-        = pb::FieldCodec.ForUInt32(738);
-    private readonly pbc::RepeatedField<uint> packedUint32_ = new pbc::RepeatedField<uint>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<uint> PackedUint32 {
-      get { return packedUint32_; }
-    }
-
-    /// <summary>Field number for the "packed_uint64" field.</summary>
-    public const int PackedUint64FieldNumber = 93;
-    private static readonly pb::FieldCodec<ulong> _repeated_packedUint64_codec
-        = pb::FieldCodec.ForUInt64(746);
-    private readonly pbc::RepeatedField<ulong> packedUint64_ = new pbc::RepeatedField<ulong>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<ulong> PackedUint64 {
-      get { return packedUint64_; }
-    }
-
-    /// <summary>Field number for the "packed_sint32" field.</summary>
-    public const int PackedSint32FieldNumber = 94;
-    private static readonly pb::FieldCodec<int> _repeated_packedSint32_codec
-        = pb::FieldCodec.ForSInt32(754);
-    private readonly pbc::RepeatedField<int> packedSint32_ = new pbc::RepeatedField<int>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<int> PackedSint32 {
-      get { return packedSint32_; }
-    }
-
-    /// <summary>Field number for the "packed_sint64" field.</summary>
-    public const int PackedSint64FieldNumber = 95;
-    private static readonly pb::FieldCodec<long> _repeated_packedSint64_codec
-        = pb::FieldCodec.ForSInt64(762);
-    private readonly pbc::RepeatedField<long> packedSint64_ = new pbc::RepeatedField<long>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<long> PackedSint64 {
-      get { return packedSint64_; }
-    }
-
-    /// <summary>Field number for the "packed_fixed32" field.</summary>
-    public const int PackedFixed32FieldNumber = 96;
-    private static readonly pb::FieldCodec<uint> _repeated_packedFixed32_codec
-        = pb::FieldCodec.ForFixed32(770);
-    private readonly pbc::RepeatedField<uint> packedFixed32_ = new pbc::RepeatedField<uint>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<uint> PackedFixed32 {
-      get { return packedFixed32_; }
-    }
-
-    /// <summary>Field number for the "packed_fixed64" field.</summary>
-    public const int PackedFixed64FieldNumber = 97;
-    private static readonly pb::FieldCodec<ulong> _repeated_packedFixed64_codec
-        = pb::FieldCodec.ForFixed64(778);
-    private readonly pbc::RepeatedField<ulong> packedFixed64_ = new pbc::RepeatedField<ulong>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<ulong> PackedFixed64 {
-      get { return packedFixed64_; }
-    }
-
-    /// <summary>Field number for the "packed_sfixed32" field.</summary>
-    public const int PackedSfixed32FieldNumber = 98;
-    private static readonly pb::FieldCodec<int> _repeated_packedSfixed32_codec
-        = pb::FieldCodec.ForSFixed32(786);
-    private readonly pbc::RepeatedField<int> packedSfixed32_ = new pbc::RepeatedField<int>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<int> PackedSfixed32 {
-      get { return packedSfixed32_; }
-    }
-
-    /// <summary>Field number for the "packed_sfixed64" field.</summary>
-    public const int PackedSfixed64FieldNumber = 99;
-    private static readonly pb::FieldCodec<long> _repeated_packedSfixed64_codec
-        = pb::FieldCodec.ForSFixed64(794);
-    private readonly pbc::RepeatedField<long> packedSfixed64_ = new pbc::RepeatedField<long>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<long> PackedSfixed64 {
-      get { return packedSfixed64_; }
-    }
-
-    /// <summary>Field number for the "packed_float" field.</summary>
-    public const int PackedFloatFieldNumber = 100;
-    private static readonly pb::FieldCodec<float> _repeated_packedFloat_codec
-        = pb::FieldCodec.ForFloat(802);
-    private readonly pbc::RepeatedField<float> packedFloat_ = new pbc::RepeatedField<float>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<float> PackedFloat {
-      get { return packedFloat_; }
-    }
-
-    /// <summary>Field number for the "packed_double" field.</summary>
-    public const int PackedDoubleFieldNumber = 101;
-    private static readonly pb::FieldCodec<double> _repeated_packedDouble_codec
-        = pb::FieldCodec.ForDouble(810);
-    private readonly pbc::RepeatedField<double> packedDouble_ = new pbc::RepeatedField<double>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<double> PackedDouble {
-      get { return packedDouble_; }
-    }
-
-    /// <summary>Field number for the "packed_bool" field.</summary>
-    public const int PackedBoolFieldNumber = 102;
-    private static readonly pb::FieldCodec<bool> _repeated_packedBool_codec
-        = pb::FieldCodec.ForBool(818);
-    private readonly pbc::RepeatedField<bool> packedBool_ = new pbc::RepeatedField<bool>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<bool> PackedBool {
-      get { return packedBool_; }
-    }
-
-    /// <summary>Field number for the "packed_enum" field.</summary>
-    public const int PackedEnumFieldNumber = 103;
-    private static readonly pb::FieldCodec<global::Google.Protobuf.TestProtos.ForeignEnum> _repeated_packedEnum_codec
-        = pb::FieldCodec.ForEnum(826, x => (int) x, x => (global::Google.Protobuf.TestProtos.ForeignEnum) x);
-    private readonly pbc::RepeatedField<global::Google.Protobuf.TestProtos.ForeignEnum> packedEnum_ = new pbc::RepeatedField<global::Google.Protobuf.TestProtos.ForeignEnum>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Google.Protobuf.TestProtos.ForeignEnum> PackedEnum {
-      get { return packedEnum_; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as TestPackedTypes);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(TestPackedTypes other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if(!packedInt32_.Equals(other.packedInt32_)) return false;
-      if(!packedInt64_.Equals(other.packedInt64_)) return false;
-      if(!packedUint32_.Equals(other.packedUint32_)) return false;
-      if(!packedUint64_.Equals(other.packedUint64_)) return false;
-      if(!packedSint32_.Equals(other.packedSint32_)) return false;
-      if(!packedSint64_.Equals(other.packedSint64_)) return false;
-      if(!packedFixed32_.Equals(other.packedFixed32_)) return false;
-      if(!packedFixed64_.Equals(other.packedFixed64_)) return false;
-      if(!packedSfixed32_.Equals(other.packedSfixed32_)) return false;
-      if(!packedSfixed64_.Equals(other.packedSfixed64_)) return false;
-      if(!packedFloat_.Equals(other.packedFloat_)) return false;
-      if(!packedDouble_.Equals(other.packedDouble_)) return false;
-      if(!packedBool_.Equals(other.packedBool_)) return false;
-      if(!packedEnum_.Equals(other.packedEnum_)) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      hash ^= packedInt32_.GetHashCode();
-      hash ^= packedInt64_.GetHashCode();
-      hash ^= packedUint32_.GetHashCode();
-      hash ^= packedUint64_.GetHashCode();
-      hash ^= packedSint32_.GetHashCode();
-      hash ^= packedSint64_.GetHashCode();
-      hash ^= packedFixed32_.GetHashCode();
-      hash ^= packedFixed64_.GetHashCode();
-      hash ^= packedSfixed32_.GetHashCode();
-      hash ^= packedSfixed64_.GetHashCode();
-      hash ^= packedFloat_.GetHashCode();
-      hash ^= packedDouble_.GetHashCode();
-      hash ^= packedBool_.GetHashCode();
-      hash ^= packedEnum_.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      packedInt32_.WriteTo(output, _repeated_packedInt32_codec);
-      packedInt64_.WriteTo(output, _repeated_packedInt64_codec);
-      packedUint32_.WriteTo(output, _repeated_packedUint32_codec);
-      packedUint64_.WriteTo(output, _repeated_packedUint64_codec);
-      packedSint32_.WriteTo(output, _repeated_packedSint32_codec);
-      packedSint64_.WriteTo(output, _repeated_packedSint64_codec);
-      packedFixed32_.WriteTo(output, _repeated_packedFixed32_codec);
-      packedFixed64_.WriteTo(output, _repeated_packedFixed64_codec);
-      packedSfixed32_.WriteTo(output, _repeated_packedSfixed32_codec);
-      packedSfixed64_.WriteTo(output, _repeated_packedSfixed64_codec);
-      packedFloat_.WriteTo(output, _repeated_packedFloat_codec);
-      packedDouble_.WriteTo(output, _repeated_packedDouble_codec);
-      packedBool_.WriteTo(output, _repeated_packedBool_codec);
-      packedEnum_.WriteTo(output, _repeated_packedEnum_codec);
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      packedInt32_.WriteTo(ref output, _repeated_packedInt32_codec);
-      packedInt64_.WriteTo(ref output, _repeated_packedInt64_codec);
-      packedUint32_.WriteTo(ref output, _repeated_packedUint32_codec);
-      packedUint64_.WriteTo(ref output, _repeated_packedUint64_codec);
-      packedSint32_.WriteTo(ref output, _repeated_packedSint32_codec);
-      packedSint64_.WriteTo(ref output, _repeated_packedSint64_codec);
-      packedFixed32_.WriteTo(ref output, _repeated_packedFixed32_codec);
-      packedFixed64_.WriteTo(ref output, _repeated_packedFixed64_codec);
-      packedSfixed32_.WriteTo(ref output, _repeated_packedSfixed32_codec);
-      packedSfixed64_.WriteTo(ref output, _repeated_packedSfixed64_codec);
-      packedFloat_.WriteTo(ref output, _repeated_packedFloat_codec);
-      packedDouble_.WriteTo(ref output, _repeated_packedDouble_codec);
-      packedBool_.WriteTo(ref output, _repeated_packedBool_codec);
-      packedEnum_.WriteTo(ref output, _repeated_packedEnum_codec);
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      size += packedInt32_.CalculateSize(_repeated_packedInt32_codec);
-      size += packedInt64_.CalculateSize(_repeated_packedInt64_codec);
-      size += packedUint32_.CalculateSize(_repeated_packedUint32_codec);
-      size += packedUint64_.CalculateSize(_repeated_packedUint64_codec);
-      size += packedSint32_.CalculateSize(_repeated_packedSint32_codec);
-      size += packedSint64_.CalculateSize(_repeated_packedSint64_codec);
-      size += packedFixed32_.CalculateSize(_repeated_packedFixed32_codec);
-      size += packedFixed64_.CalculateSize(_repeated_packedFixed64_codec);
-      size += packedSfixed32_.CalculateSize(_repeated_packedSfixed32_codec);
-      size += packedSfixed64_.CalculateSize(_repeated_packedSfixed64_codec);
-      size += packedFloat_.CalculateSize(_repeated_packedFloat_codec);
-      size += packedDouble_.CalculateSize(_repeated_packedDouble_codec);
-      size += packedBool_.CalculateSize(_repeated_packedBool_codec);
-      size += packedEnum_.CalculateSize(_repeated_packedEnum_codec);
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(TestPackedTypes other) {
-      if (other == null) {
-        return;
-      }
-      packedInt32_.Add(other.packedInt32_);
-      packedInt64_.Add(other.packedInt64_);
-      packedUint32_.Add(other.packedUint32_);
-      packedUint64_.Add(other.packedUint64_);
-      packedSint32_.Add(other.packedSint32_);
-      packedSint64_.Add(other.packedSint64_);
-      packedFixed32_.Add(other.packedFixed32_);
-      packedFixed64_.Add(other.packedFixed64_);
-      packedSfixed32_.Add(other.packedSfixed32_);
-      packedSfixed64_.Add(other.packedSfixed64_);
-      packedFloat_.Add(other.packedFloat_);
-      packedDouble_.Add(other.packedDouble_);
-      packedBool_.Add(other.packedBool_);
-      packedEnum_.Add(other.packedEnum_);
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 722:
-          case 720: {
-            packedInt32_.AddEntriesFrom(input, _repeated_packedInt32_codec);
-            break;
-          }
-          case 730:
-          case 728: {
-            packedInt64_.AddEntriesFrom(input, _repeated_packedInt64_codec);
-            break;
-          }
-          case 738:
-          case 736: {
-            packedUint32_.AddEntriesFrom(input, _repeated_packedUint32_codec);
-            break;
-          }
-          case 746:
-          case 744: {
-            packedUint64_.AddEntriesFrom(input, _repeated_packedUint64_codec);
-            break;
-          }
-          case 754:
-          case 752: {
-            packedSint32_.AddEntriesFrom(input, _repeated_packedSint32_codec);
-            break;
-          }
-          case 762:
-          case 760: {
-            packedSint64_.AddEntriesFrom(input, _repeated_packedSint64_codec);
-            break;
-          }
-          case 770:
-          case 773: {
-            packedFixed32_.AddEntriesFrom(input, _repeated_packedFixed32_codec);
-            break;
-          }
-          case 778:
-          case 777: {
-            packedFixed64_.AddEntriesFrom(input, _repeated_packedFixed64_codec);
-            break;
-          }
-          case 786:
-          case 789: {
-            packedSfixed32_.AddEntriesFrom(input, _repeated_packedSfixed32_codec);
-            break;
-          }
-          case 794:
-          case 793: {
-            packedSfixed64_.AddEntriesFrom(input, _repeated_packedSfixed64_codec);
-            break;
-          }
-          case 802:
-          case 805: {
-            packedFloat_.AddEntriesFrom(input, _repeated_packedFloat_codec);
-            break;
-          }
-          case 810:
-          case 809: {
-            packedDouble_.AddEntriesFrom(input, _repeated_packedDouble_codec);
-            break;
-          }
-          case 818:
-          case 816: {
-            packedBool_.AddEntriesFrom(input, _repeated_packedBool_codec);
-            break;
-          }
-          case 826:
-          case 824: {
-            packedEnum_.AddEntriesFrom(input, _repeated_packedEnum_codec);
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 722:
-          case 720: {
-            packedInt32_.AddEntriesFrom(ref input, _repeated_packedInt32_codec);
-            break;
-          }
-          case 730:
-          case 728: {
-            packedInt64_.AddEntriesFrom(ref input, _repeated_packedInt64_codec);
-            break;
-          }
-          case 738:
-          case 736: {
-            packedUint32_.AddEntriesFrom(ref input, _repeated_packedUint32_codec);
-            break;
-          }
-          case 746:
-          case 744: {
-            packedUint64_.AddEntriesFrom(ref input, _repeated_packedUint64_codec);
-            break;
-          }
-          case 754:
-          case 752: {
-            packedSint32_.AddEntriesFrom(ref input, _repeated_packedSint32_codec);
-            break;
-          }
-          case 762:
-          case 760: {
-            packedSint64_.AddEntriesFrom(ref input, _repeated_packedSint64_codec);
-            break;
-          }
-          case 770:
-          case 773: {
-            packedFixed32_.AddEntriesFrom(ref input, _repeated_packedFixed32_codec);
-            break;
-          }
-          case 778:
-          case 777: {
-            packedFixed64_.AddEntriesFrom(ref input, _repeated_packedFixed64_codec);
-            break;
-          }
-          case 786:
-          case 789: {
-            packedSfixed32_.AddEntriesFrom(ref input, _repeated_packedSfixed32_codec);
-            break;
-          }
-          case 794:
-          case 793: {
-            packedSfixed64_.AddEntriesFrom(ref input, _repeated_packedSfixed64_codec);
-            break;
-          }
-          case 802:
-          case 805: {
-            packedFloat_.AddEntriesFrom(ref input, _repeated_packedFloat_codec);
-            break;
-          }
-          case 810:
-          case 809: {
-            packedDouble_.AddEntriesFrom(ref input, _repeated_packedDouble_codec);
-            break;
-          }
-          case 818:
-          case 816: {
-            packedBool_.AddEntriesFrom(ref input, _repeated_packedBool_codec);
-            break;
-          }
-          case 826:
-          case 824: {
-            packedEnum_.AddEntriesFrom(ref input, _repeated_packedEnum_codec);
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  /// <summary>
-  /// A message with the same fields as TestPackedTypes, but without packing. Used
-  /// to test packed &lt;-> unpacked wire compatibility.
-  /// </summary>
-  public sealed partial class TestUnpackedTypes : pb::IMessage<TestUnpackedTypes>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<TestUnpackedTypes> _parser = new pb::MessageParser<TestUnpackedTypes>(() => new TestUnpackedTypes());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<TestUnpackedTypes> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.UnittestProto3Reflection.Descriptor.MessageTypes[25]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestUnpackedTypes() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestUnpackedTypes(TestUnpackedTypes other) : this() {
-      unpackedInt32_ = other.unpackedInt32_.Clone();
-      unpackedInt64_ = other.unpackedInt64_.Clone();
-      unpackedUint32_ = other.unpackedUint32_.Clone();
-      unpackedUint64_ = other.unpackedUint64_.Clone();
-      unpackedSint32_ = other.unpackedSint32_.Clone();
-      unpackedSint64_ = other.unpackedSint64_.Clone();
-      unpackedFixed32_ = other.unpackedFixed32_.Clone();
-      unpackedFixed64_ = other.unpackedFixed64_.Clone();
-      unpackedSfixed32_ = other.unpackedSfixed32_.Clone();
-      unpackedSfixed64_ = other.unpackedSfixed64_.Clone();
-      unpackedFloat_ = other.unpackedFloat_.Clone();
-      unpackedDouble_ = other.unpackedDouble_.Clone();
-      unpackedBool_ = other.unpackedBool_.Clone();
-      unpackedEnum_ = other.unpackedEnum_.Clone();
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestUnpackedTypes Clone() {
-      return new TestUnpackedTypes(this);
-    }
-
-    /// <summary>Field number for the "unpacked_int32" field.</summary>
-    public const int UnpackedInt32FieldNumber = 90;
-    private static readonly pb::FieldCodec<int> _repeated_unpackedInt32_codec
-        = pb::FieldCodec.ForInt32(720);
-    private readonly pbc::RepeatedField<int> unpackedInt32_ = new pbc::RepeatedField<int>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<int> UnpackedInt32 {
-      get { return unpackedInt32_; }
-    }
-
-    /// <summary>Field number for the "unpacked_int64" field.</summary>
-    public const int UnpackedInt64FieldNumber = 91;
-    private static readonly pb::FieldCodec<long> _repeated_unpackedInt64_codec
-        = pb::FieldCodec.ForInt64(728);
-    private readonly pbc::RepeatedField<long> unpackedInt64_ = new pbc::RepeatedField<long>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<long> UnpackedInt64 {
-      get { return unpackedInt64_; }
-    }
-
-    /// <summary>Field number for the "unpacked_uint32" field.</summary>
-    public const int UnpackedUint32FieldNumber = 92;
-    private static readonly pb::FieldCodec<uint> _repeated_unpackedUint32_codec
-        = pb::FieldCodec.ForUInt32(736);
-    private readonly pbc::RepeatedField<uint> unpackedUint32_ = new pbc::RepeatedField<uint>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<uint> UnpackedUint32 {
-      get { return unpackedUint32_; }
-    }
-
-    /// <summary>Field number for the "unpacked_uint64" field.</summary>
-    public const int UnpackedUint64FieldNumber = 93;
-    private static readonly pb::FieldCodec<ulong> _repeated_unpackedUint64_codec
-        = pb::FieldCodec.ForUInt64(744);
-    private readonly pbc::RepeatedField<ulong> unpackedUint64_ = new pbc::RepeatedField<ulong>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<ulong> UnpackedUint64 {
-      get { return unpackedUint64_; }
-    }
-
-    /// <summary>Field number for the "unpacked_sint32" field.</summary>
-    public const int UnpackedSint32FieldNumber = 94;
-    private static readonly pb::FieldCodec<int> _repeated_unpackedSint32_codec
-        = pb::FieldCodec.ForSInt32(752);
-    private readonly pbc::RepeatedField<int> unpackedSint32_ = new pbc::RepeatedField<int>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<int> UnpackedSint32 {
-      get { return unpackedSint32_; }
-    }
-
-    /// <summary>Field number for the "unpacked_sint64" field.</summary>
-    public const int UnpackedSint64FieldNumber = 95;
-    private static readonly pb::FieldCodec<long> _repeated_unpackedSint64_codec
-        = pb::FieldCodec.ForSInt64(760);
-    private readonly pbc::RepeatedField<long> unpackedSint64_ = new pbc::RepeatedField<long>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<long> UnpackedSint64 {
-      get { return unpackedSint64_; }
-    }
-
-    /// <summary>Field number for the "unpacked_fixed32" field.</summary>
-    public const int UnpackedFixed32FieldNumber = 96;
-    private static readonly pb::FieldCodec<uint> _repeated_unpackedFixed32_codec
-        = pb::FieldCodec.ForFixed32(773);
-    private readonly pbc::RepeatedField<uint> unpackedFixed32_ = new pbc::RepeatedField<uint>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<uint> UnpackedFixed32 {
-      get { return unpackedFixed32_; }
-    }
-
-    /// <summary>Field number for the "unpacked_fixed64" field.</summary>
-    public const int UnpackedFixed64FieldNumber = 97;
-    private static readonly pb::FieldCodec<ulong> _repeated_unpackedFixed64_codec
-        = pb::FieldCodec.ForFixed64(777);
-    private readonly pbc::RepeatedField<ulong> unpackedFixed64_ = new pbc::RepeatedField<ulong>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<ulong> UnpackedFixed64 {
-      get { return unpackedFixed64_; }
-    }
-
-    /// <summary>Field number for the "unpacked_sfixed32" field.</summary>
-    public const int UnpackedSfixed32FieldNumber = 98;
-    private static readonly pb::FieldCodec<int> _repeated_unpackedSfixed32_codec
-        = pb::FieldCodec.ForSFixed32(789);
-    private readonly pbc::RepeatedField<int> unpackedSfixed32_ = new pbc::RepeatedField<int>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<int> UnpackedSfixed32 {
-      get { return unpackedSfixed32_; }
-    }
-
-    /// <summary>Field number for the "unpacked_sfixed64" field.</summary>
-    public const int UnpackedSfixed64FieldNumber = 99;
-    private static readonly pb::FieldCodec<long> _repeated_unpackedSfixed64_codec
-        = pb::FieldCodec.ForSFixed64(793);
-    private readonly pbc::RepeatedField<long> unpackedSfixed64_ = new pbc::RepeatedField<long>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<long> UnpackedSfixed64 {
-      get { return unpackedSfixed64_; }
-    }
-
-    /// <summary>Field number for the "unpacked_float" field.</summary>
-    public const int UnpackedFloatFieldNumber = 100;
-    private static readonly pb::FieldCodec<float> _repeated_unpackedFloat_codec
-        = pb::FieldCodec.ForFloat(805);
-    private readonly pbc::RepeatedField<float> unpackedFloat_ = new pbc::RepeatedField<float>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<float> UnpackedFloat {
-      get { return unpackedFloat_; }
-    }
-
-    /// <summary>Field number for the "unpacked_double" field.</summary>
-    public const int UnpackedDoubleFieldNumber = 101;
-    private static readonly pb::FieldCodec<double> _repeated_unpackedDouble_codec
-        = pb::FieldCodec.ForDouble(809);
-    private readonly pbc::RepeatedField<double> unpackedDouble_ = new pbc::RepeatedField<double>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<double> UnpackedDouble {
-      get { return unpackedDouble_; }
-    }
-
-    /// <summary>Field number for the "unpacked_bool" field.</summary>
-    public const int UnpackedBoolFieldNumber = 102;
-    private static readonly pb::FieldCodec<bool> _repeated_unpackedBool_codec
-        = pb::FieldCodec.ForBool(816);
-    private readonly pbc::RepeatedField<bool> unpackedBool_ = new pbc::RepeatedField<bool>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<bool> UnpackedBool {
-      get { return unpackedBool_; }
-    }
-
-    /// <summary>Field number for the "unpacked_enum" field.</summary>
-    public const int UnpackedEnumFieldNumber = 103;
-    private static readonly pb::FieldCodec<global::Google.Protobuf.TestProtos.ForeignEnum> _repeated_unpackedEnum_codec
-        = pb::FieldCodec.ForEnum(824, x => (int) x, x => (global::Google.Protobuf.TestProtos.ForeignEnum) x);
-    private readonly pbc::RepeatedField<global::Google.Protobuf.TestProtos.ForeignEnum> unpackedEnum_ = new pbc::RepeatedField<global::Google.Protobuf.TestProtos.ForeignEnum>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Google.Protobuf.TestProtos.ForeignEnum> UnpackedEnum {
-      get { return unpackedEnum_; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as TestUnpackedTypes);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(TestUnpackedTypes other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if(!unpackedInt32_.Equals(other.unpackedInt32_)) return false;
-      if(!unpackedInt64_.Equals(other.unpackedInt64_)) return false;
-      if(!unpackedUint32_.Equals(other.unpackedUint32_)) return false;
-      if(!unpackedUint64_.Equals(other.unpackedUint64_)) return false;
-      if(!unpackedSint32_.Equals(other.unpackedSint32_)) return false;
-      if(!unpackedSint64_.Equals(other.unpackedSint64_)) return false;
-      if(!unpackedFixed32_.Equals(other.unpackedFixed32_)) return false;
-      if(!unpackedFixed64_.Equals(other.unpackedFixed64_)) return false;
-      if(!unpackedSfixed32_.Equals(other.unpackedSfixed32_)) return false;
-      if(!unpackedSfixed64_.Equals(other.unpackedSfixed64_)) return false;
-      if(!unpackedFloat_.Equals(other.unpackedFloat_)) return false;
-      if(!unpackedDouble_.Equals(other.unpackedDouble_)) return false;
-      if(!unpackedBool_.Equals(other.unpackedBool_)) return false;
-      if(!unpackedEnum_.Equals(other.unpackedEnum_)) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      hash ^= unpackedInt32_.GetHashCode();
-      hash ^= unpackedInt64_.GetHashCode();
-      hash ^= unpackedUint32_.GetHashCode();
-      hash ^= unpackedUint64_.GetHashCode();
-      hash ^= unpackedSint32_.GetHashCode();
-      hash ^= unpackedSint64_.GetHashCode();
-      hash ^= unpackedFixed32_.GetHashCode();
-      hash ^= unpackedFixed64_.GetHashCode();
-      hash ^= unpackedSfixed32_.GetHashCode();
-      hash ^= unpackedSfixed64_.GetHashCode();
-      hash ^= unpackedFloat_.GetHashCode();
-      hash ^= unpackedDouble_.GetHashCode();
-      hash ^= unpackedBool_.GetHashCode();
-      hash ^= unpackedEnum_.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      unpackedInt32_.WriteTo(output, _repeated_unpackedInt32_codec);
-      unpackedInt64_.WriteTo(output, _repeated_unpackedInt64_codec);
-      unpackedUint32_.WriteTo(output, _repeated_unpackedUint32_codec);
-      unpackedUint64_.WriteTo(output, _repeated_unpackedUint64_codec);
-      unpackedSint32_.WriteTo(output, _repeated_unpackedSint32_codec);
-      unpackedSint64_.WriteTo(output, _repeated_unpackedSint64_codec);
-      unpackedFixed32_.WriteTo(output, _repeated_unpackedFixed32_codec);
-      unpackedFixed64_.WriteTo(output, _repeated_unpackedFixed64_codec);
-      unpackedSfixed32_.WriteTo(output, _repeated_unpackedSfixed32_codec);
-      unpackedSfixed64_.WriteTo(output, _repeated_unpackedSfixed64_codec);
-      unpackedFloat_.WriteTo(output, _repeated_unpackedFloat_codec);
-      unpackedDouble_.WriteTo(output, _repeated_unpackedDouble_codec);
-      unpackedBool_.WriteTo(output, _repeated_unpackedBool_codec);
-      unpackedEnum_.WriteTo(output, _repeated_unpackedEnum_codec);
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      unpackedInt32_.WriteTo(ref output, _repeated_unpackedInt32_codec);
-      unpackedInt64_.WriteTo(ref output, _repeated_unpackedInt64_codec);
-      unpackedUint32_.WriteTo(ref output, _repeated_unpackedUint32_codec);
-      unpackedUint64_.WriteTo(ref output, _repeated_unpackedUint64_codec);
-      unpackedSint32_.WriteTo(ref output, _repeated_unpackedSint32_codec);
-      unpackedSint64_.WriteTo(ref output, _repeated_unpackedSint64_codec);
-      unpackedFixed32_.WriteTo(ref output, _repeated_unpackedFixed32_codec);
-      unpackedFixed64_.WriteTo(ref output, _repeated_unpackedFixed64_codec);
-      unpackedSfixed32_.WriteTo(ref output, _repeated_unpackedSfixed32_codec);
-      unpackedSfixed64_.WriteTo(ref output, _repeated_unpackedSfixed64_codec);
-      unpackedFloat_.WriteTo(ref output, _repeated_unpackedFloat_codec);
-      unpackedDouble_.WriteTo(ref output, _repeated_unpackedDouble_codec);
-      unpackedBool_.WriteTo(ref output, _repeated_unpackedBool_codec);
-      unpackedEnum_.WriteTo(ref output, _repeated_unpackedEnum_codec);
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      size += unpackedInt32_.CalculateSize(_repeated_unpackedInt32_codec);
-      size += unpackedInt64_.CalculateSize(_repeated_unpackedInt64_codec);
-      size += unpackedUint32_.CalculateSize(_repeated_unpackedUint32_codec);
-      size += unpackedUint64_.CalculateSize(_repeated_unpackedUint64_codec);
-      size += unpackedSint32_.CalculateSize(_repeated_unpackedSint32_codec);
-      size += unpackedSint64_.CalculateSize(_repeated_unpackedSint64_codec);
-      size += unpackedFixed32_.CalculateSize(_repeated_unpackedFixed32_codec);
-      size += unpackedFixed64_.CalculateSize(_repeated_unpackedFixed64_codec);
-      size += unpackedSfixed32_.CalculateSize(_repeated_unpackedSfixed32_codec);
-      size += unpackedSfixed64_.CalculateSize(_repeated_unpackedSfixed64_codec);
-      size += unpackedFloat_.CalculateSize(_repeated_unpackedFloat_codec);
-      size += unpackedDouble_.CalculateSize(_repeated_unpackedDouble_codec);
-      size += unpackedBool_.CalculateSize(_repeated_unpackedBool_codec);
-      size += unpackedEnum_.CalculateSize(_repeated_unpackedEnum_codec);
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(TestUnpackedTypes other) {
-      if (other == null) {
-        return;
-      }
-      unpackedInt32_.Add(other.unpackedInt32_);
-      unpackedInt64_.Add(other.unpackedInt64_);
-      unpackedUint32_.Add(other.unpackedUint32_);
-      unpackedUint64_.Add(other.unpackedUint64_);
-      unpackedSint32_.Add(other.unpackedSint32_);
-      unpackedSint64_.Add(other.unpackedSint64_);
-      unpackedFixed32_.Add(other.unpackedFixed32_);
-      unpackedFixed64_.Add(other.unpackedFixed64_);
-      unpackedSfixed32_.Add(other.unpackedSfixed32_);
-      unpackedSfixed64_.Add(other.unpackedSfixed64_);
-      unpackedFloat_.Add(other.unpackedFloat_);
-      unpackedDouble_.Add(other.unpackedDouble_);
-      unpackedBool_.Add(other.unpackedBool_);
-      unpackedEnum_.Add(other.unpackedEnum_);
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 722:
-          case 720: {
-            unpackedInt32_.AddEntriesFrom(input, _repeated_unpackedInt32_codec);
-            break;
-          }
-          case 730:
-          case 728: {
-            unpackedInt64_.AddEntriesFrom(input, _repeated_unpackedInt64_codec);
-            break;
-          }
-          case 738:
-          case 736: {
-            unpackedUint32_.AddEntriesFrom(input, _repeated_unpackedUint32_codec);
-            break;
-          }
-          case 746:
-          case 744: {
-            unpackedUint64_.AddEntriesFrom(input, _repeated_unpackedUint64_codec);
-            break;
-          }
-          case 754:
-          case 752: {
-            unpackedSint32_.AddEntriesFrom(input, _repeated_unpackedSint32_codec);
-            break;
-          }
-          case 762:
-          case 760: {
-            unpackedSint64_.AddEntriesFrom(input, _repeated_unpackedSint64_codec);
-            break;
-          }
-          case 770:
-          case 773: {
-            unpackedFixed32_.AddEntriesFrom(input, _repeated_unpackedFixed32_codec);
-            break;
-          }
-          case 778:
-          case 777: {
-            unpackedFixed64_.AddEntriesFrom(input, _repeated_unpackedFixed64_codec);
-            break;
-          }
-          case 786:
-          case 789: {
-            unpackedSfixed32_.AddEntriesFrom(input, _repeated_unpackedSfixed32_codec);
-            break;
-          }
-          case 794:
-          case 793: {
-            unpackedSfixed64_.AddEntriesFrom(input, _repeated_unpackedSfixed64_codec);
-            break;
-          }
-          case 802:
-          case 805: {
-            unpackedFloat_.AddEntriesFrom(input, _repeated_unpackedFloat_codec);
-            break;
-          }
-          case 810:
-          case 809: {
-            unpackedDouble_.AddEntriesFrom(input, _repeated_unpackedDouble_codec);
-            break;
-          }
-          case 818:
-          case 816: {
-            unpackedBool_.AddEntriesFrom(input, _repeated_unpackedBool_codec);
-            break;
-          }
-          case 826:
-          case 824: {
-            unpackedEnum_.AddEntriesFrom(input, _repeated_unpackedEnum_codec);
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 722:
-          case 720: {
-            unpackedInt32_.AddEntriesFrom(ref input, _repeated_unpackedInt32_codec);
-            break;
-          }
-          case 730:
-          case 728: {
-            unpackedInt64_.AddEntriesFrom(ref input, _repeated_unpackedInt64_codec);
-            break;
-          }
-          case 738:
-          case 736: {
-            unpackedUint32_.AddEntriesFrom(ref input, _repeated_unpackedUint32_codec);
-            break;
-          }
-          case 746:
-          case 744: {
-            unpackedUint64_.AddEntriesFrom(ref input, _repeated_unpackedUint64_codec);
-            break;
-          }
-          case 754:
-          case 752: {
-            unpackedSint32_.AddEntriesFrom(ref input, _repeated_unpackedSint32_codec);
-            break;
-          }
-          case 762:
-          case 760: {
-            unpackedSint64_.AddEntriesFrom(ref input, _repeated_unpackedSint64_codec);
-            break;
-          }
-          case 770:
-          case 773: {
-            unpackedFixed32_.AddEntriesFrom(ref input, _repeated_unpackedFixed32_codec);
-            break;
-          }
-          case 778:
-          case 777: {
-            unpackedFixed64_.AddEntriesFrom(ref input, _repeated_unpackedFixed64_codec);
-            break;
-          }
-          case 786:
-          case 789: {
-            unpackedSfixed32_.AddEntriesFrom(ref input, _repeated_unpackedSfixed32_codec);
-            break;
-          }
-          case 794:
-          case 793: {
-            unpackedSfixed64_.AddEntriesFrom(ref input, _repeated_unpackedSfixed64_codec);
-            break;
-          }
-          case 802:
-          case 805: {
-            unpackedFloat_.AddEntriesFrom(ref input, _repeated_unpackedFloat_codec);
-            break;
-          }
-          case 810:
-          case 809: {
-            unpackedDouble_.AddEntriesFrom(ref input, _repeated_unpackedDouble_codec);
-            break;
-          }
-          case 818:
-          case 816: {
-            unpackedBool_.AddEntriesFrom(ref input, _repeated_unpackedBool_codec);
-            break;
-          }
-          case 826:
-          case 824: {
-            unpackedEnum_.AddEntriesFrom(ref input, _repeated_unpackedEnum_codec);
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  public sealed partial class TestRepeatedScalarDifferentTagSizes : pb::IMessage<TestRepeatedScalarDifferentTagSizes>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<TestRepeatedScalarDifferentTagSizes> _parser = new pb::MessageParser<TestRepeatedScalarDifferentTagSizes>(() => new TestRepeatedScalarDifferentTagSizes());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<TestRepeatedScalarDifferentTagSizes> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.UnittestProto3Reflection.Descriptor.MessageTypes[26]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestRepeatedScalarDifferentTagSizes() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestRepeatedScalarDifferentTagSizes(TestRepeatedScalarDifferentTagSizes other) : this() {
-      repeatedFixed32_ = other.repeatedFixed32_.Clone();
-      repeatedInt32_ = other.repeatedInt32_.Clone();
-      repeatedFixed64_ = other.repeatedFixed64_.Clone();
-      repeatedInt64_ = other.repeatedInt64_.Clone();
-      repeatedFloat_ = other.repeatedFloat_.Clone();
-      repeatedUint64_ = other.repeatedUint64_.Clone();
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestRepeatedScalarDifferentTagSizes Clone() {
-      return new TestRepeatedScalarDifferentTagSizes(this);
-    }
-
-    /// <summary>Field number for the "repeated_fixed32" field.</summary>
-    public const int RepeatedFixed32FieldNumber = 12;
-    private static readonly pb::FieldCodec<uint> _repeated_repeatedFixed32_codec
-        = pb::FieldCodec.ForFixed32(98);
-    private readonly pbc::RepeatedField<uint> repeatedFixed32_ = new pbc::RepeatedField<uint>();
-    /// <summary>
-    /// Parsing repeated fixed size values used to fail. This message needs to be
-    /// used in order to get a tag of the right size; all of the repeated fields
-    /// in TestAllTypes didn't trigger the check.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<uint> RepeatedFixed32 {
-      get { return repeatedFixed32_; }
-    }
-
-    /// <summary>Field number for the "repeated_int32" field.</summary>
-    public const int RepeatedInt32FieldNumber = 13;
-    private static readonly pb::FieldCodec<int> _repeated_repeatedInt32_codec
-        = pb::FieldCodec.ForInt32(106);
-    private readonly pbc::RepeatedField<int> repeatedInt32_ = new pbc::RepeatedField<int>();
-    /// <summary>
-    /// Check for a varint type, just for good measure.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<int> RepeatedInt32 {
-      get { return repeatedInt32_; }
-    }
-
-    /// <summary>Field number for the "repeated_fixed64" field.</summary>
-    public const int RepeatedFixed64FieldNumber = 2046;
-    private static readonly pb::FieldCodec<ulong> _repeated_repeatedFixed64_codec
-        = pb::FieldCodec.ForFixed64(16370);
-    private readonly pbc::RepeatedField<ulong> repeatedFixed64_ = new pbc::RepeatedField<ulong>();
-    /// <summary>
-    /// These have two-byte tags.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<ulong> RepeatedFixed64 {
-      get { return repeatedFixed64_; }
-    }
-
-    /// <summary>Field number for the "repeated_int64" field.</summary>
-    public const int RepeatedInt64FieldNumber = 2047;
-    private static readonly pb::FieldCodec<long> _repeated_repeatedInt64_codec
-        = pb::FieldCodec.ForInt64(16378);
-    private readonly pbc::RepeatedField<long> repeatedInt64_ = new pbc::RepeatedField<long>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<long> RepeatedInt64 {
-      get { return repeatedInt64_; }
-    }
-
-    /// <summary>Field number for the "repeated_float" field.</summary>
-    public const int RepeatedFloatFieldNumber = 262142;
-    private static readonly pb::FieldCodec<float> _repeated_repeatedFloat_codec
-        = pb::FieldCodec.ForFloat(2097138);
-    private readonly pbc::RepeatedField<float> repeatedFloat_ = new pbc::RepeatedField<float>();
-    /// <summary>
-    /// Three byte tags.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<float> RepeatedFloat {
-      get { return repeatedFloat_; }
-    }
-
-    /// <summary>Field number for the "repeated_uint64" field.</summary>
-    public const int RepeatedUint64FieldNumber = 262143;
-    private static readonly pb::FieldCodec<ulong> _repeated_repeatedUint64_codec
-        = pb::FieldCodec.ForUInt64(2097146);
-    private readonly pbc::RepeatedField<ulong> repeatedUint64_ = new pbc::RepeatedField<ulong>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<ulong> RepeatedUint64 {
-      get { return repeatedUint64_; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as TestRepeatedScalarDifferentTagSizes);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(TestRepeatedScalarDifferentTagSizes other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if(!repeatedFixed32_.Equals(other.repeatedFixed32_)) return false;
-      if(!repeatedInt32_.Equals(other.repeatedInt32_)) return false;
-      if(!repeatedFixed64_.Equals(other.repeatedFixed64_)) return false;
-      if(!repeatedInt64_.Equals(other.repeatedInt64_)) return false;
-      if(!repeatedFloat_.Equals(other.repeatedFloat_)) return false;
-      if(!repeatedUint64_.Equals(other.repeatedUint64_)) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      hash ^= repeatedFixed32_.GetHashCode();
-      hash ^= repeatedInt32_.GetHashCode();
-      hash ^= repeatedFixed64_.GetHashCode();
-      hash ^= repeatedInt64_.GetHashCode();
-      hash ^= repeatedFloat_.GetHashCode();
-      hash ^= repeatedUint64_.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      repeatedFixed32_.WriteTo(output, _repeated_repeatedFixed32_codec);
-      repeatedInt32_.WriteTo(output, _repeated_repeatedInt32_codec);
-      repeatedFixed64_.WriteTo(output, _repeated_repeatedFixed64_codec);
-      repeatedInt64_.WriteTo(output, _repeated_repeatedInt64_codec);
-      repeatedFloat_.WriteTo(output, _repeated_repeatedFloat_codec);
-      repeatedUint64_.WriteTo(output, _repeated_repeatedUint64_codec);
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      repeatedFixed32_.WriteTo(ref output, _repeated_repeatedFixed32_codec);
-      repeatedInt32_.WriteTo(ref output, _repeated_repeatedInt32_codec);
-      repeatedFixed64_.WriteTo(ref output, _repeated_repeatedFixed64_codec);
-      repeatedInt64_.WriteTo(ref output, _repeated_repeatedInt64_codec);
-      repeatedFloat_.WriteTo(ref output, _repeated_repeatedFloat_codec);
-      repeatedUint64_.WriteTo(ref output, _repeated_repeatedUint64_codec);
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      size += repeatedFixed32_.CalculateSize(_repeated_repeatedFixed32_codec);
-      size += repeatedInt32_.CalculateSize(_repeated_repeatedInt32_codec);
-      size += repeatedFixed64_.CalculateSize(_repeated_repeatedFixed64_codec);
-      size += repeatedInt64_.CalculateSize(_repeated_repeatedInt64_codec);
-      size += repeatedFloat_.CalculateSize(_repeated_repeatedFloat_codec);
-      size += repeatedUint64_.CalculateSize(_repeated_repeatedUint64_codec);
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(TestRepeatedScalarDifferentTagSizes other) {
-      if (other == null) {
-        return;
-      }
-      repeatedFixed32_.Add(other.repeatedFixed32_);
-      repeatedInt32_.Add(other.repeatedInt32_);
-      repeatedFixed64_.Add(other.repeatedFixed64_);
-      repeatedInt64_.Add(other.repeatedInt64_);
-      repeatedFloat_.Add(other.repeatedFloat_);
-      repeatedUint64_.Add(other.repeatedUint64_);
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 98:
-          case 101: {
-            repeatedFixed32_.AddEntriesFrom(input, _repeated_repeatedFixed32_codec);
-            break;
-          }
-          case 106:
-          case 104: {
-            repeatedInt32_.AddEntriesFrom(input, _repeated_repeatedInt32_codec);
-            break;
-          }
-          case 16370:
-          case 16369: {
-            repeatedFixed64_.AddEntriesFrom(input, _repeated_repeatedFixed64_codec);
-            break;
-          }
-          case 16378:
-          case 16376: {
-            repeatedInt64_.AddEntriesFrom(input, _repeated_repeatedInt64_codec);
-            break;
-          }
-          case 2097138:
-          case 2097141: {
-            repeatedFloat_.AddEntriesFrom(input, _repeated_repeatedFloat_codec);
-            break;
-          }
-          case 2097146:
-          case 2097144: {
-            repeatedUint64_.AddEntriesFrom(input, _repeated_repeatedUint64_codec);
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 98:
-          case 101: {
-            repeatedFixed32_.AddEntriesFrom(ref input, _repeated_repeatedFixed32_codec);
-            break;
-          }
-          case 106:
-          case 104: {
-            repeatedInt32_.AddEntriesFrom(ref input, _repeated_repeatedInt32_codec);
-            break;
-          }
-          case 16370:
-          case 16369: {
-            repeatedFixed64_.AddEntriesFrom(ref input, _repeated_repeatedFixed64_codec);
-            break;
-          }
-          case 16378:
-          case 16376: {
-            repeatedInt64_.AddEntriesFrom(ref input, _repeated_repeatedInt64_codec);
-            break;
-          }
-          case 2097138:
-          case 2097141: {
-            repeatedFloat_.AddEntriesFrom(ref input, _repeated_repeatedFloat_codec);
-            break;
-          }
-          case 2097146:
-          case 2097144: {
-            repeatedUint64_.AddEntriesFrom(ref input, _repeated_repeatedUint64_codec);
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  public sealed partial class TestCommentInjectionMessage : pb::IMessage<TestCommentInjectionMessage>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<TestCommentInjectionMessage> _parser = new pb::MessageParser<TestCommentInjectionMessage>(() => new TestCommentInjectionMessage());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<TestCommentInjectionMessage> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.UnittestProto3Reflection.Descriptor.MessageTypes[27]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestCommentInjectionMessage() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestCommentInjectionMessage(TestCommentInjectionMessage other) : this() {
-      a_ = other.a_;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestCommentInjectionMessage Clone() {
-      return new TestCommentInjectionMessage(this);
-    }
-
-    /// <summary>Field number for the "a" field.</summary>
-    public const int AFieldNumber = 1;
-    private string a_ = "";
-    /// <summary>
-    /// */ &lt;- This should not close the generated doc comment
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string A {
-      get { return a_; }
-      set {
-        a_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as TestCommentInjectionMessage);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(TestCommentInjectionMessage other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (A != other.A) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (A.Length != 0) hash ^= A.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (A.Length != 0) {
-        output.WriteRawTag(10);
-        output.WriteString(A);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (A.Length != 0) {
-        output.WriteRawTag(10);
-        output.WriteString(A);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (A.Length != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(A);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(TestCommentInjectionMessage other) {
-      if (other == null) {
-        return;
-      }
-      if (other.A.Length != 0) {
-        A = other.A;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 10: {
-            A = input.ReadString();
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 10: {
-            A = input.ReadString();
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  /// <summary>
-  /// Test that RPC services work.
-  /// </summary>
-  public sealed partial class FooRequest : pb::IMessage<FooRequest>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<FooRequest> _parser = new pb::MessageParser<FooRequest>(() => new FooRequest());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<FooRequest> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.UnittestProto3Reflection.Descriptor.MessageTypes[28]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public FooRequest() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public FooRequest(FooRequest other) : this() {
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public FooRequest Clone() {
-      return new FooRequest(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as FooRequest);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(FooRequest other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(FooRequest other) {
-      if (other == null) {
-        return;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-        }
-      }
-    }
-    #endif
-
-  }
-
-  public sealed partial class FooResponse : pb::IMessage<FooResponse>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<FooResponse> _parser = new pb::MessageParser<FooResponse>(() => new FooResponse());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<FooResponse> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.UnittestProto3Reflection.Descriptor.MessageTypes[29]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public FooResponse() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public FooResponse(FooResponse other) : this() {
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public FooResponse Clone() {
-      return new FooResponse(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as FooResponse);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(FooResponse other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(FooResponse other) {
-      if (other == null) {
-        return;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-        }
-      }
-    }
-    #endif
-
-  }
-
-  public sealed partial class FooClientMessage : pb::IMessage<FooClientMessage>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<FooClientMessage> _parser = new pb::MessageParser<FooClientMessage>(() => new FooClientMessage());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<FooClientMessage> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.UnittestProto3Reflection.Descriptor.MessageTypes[30]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public FooClientMessage() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public FooClientMessage(FooClientMessage other) : this() {
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public FooClientMessage Clone() {
-      return new FooClientMessage(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as FooClientMessage);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(FooClientMessage other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(FooClientMessage other) {
-      if (other == null) {
-        return;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-        }
-      }
-    }
-    #endif
-
-  }
-
-  public sealed partial class FooServerMessage : pb::IMessage<FooServerMessage>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<FooServerMessage> _parser = new pb::MessageParser<FooServerMessage>(() => new FooServerMessage());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<FooServerMessage> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.UnittestProto3Reflection.Descriptor.MessageTypes[31]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public FooServerMessage() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public FooServerMessage(FooServerMessage other) : this() {
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public FooServerMessage Clone() {
-      return new FooServerMessage(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as FooServerMessage);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(FooServerMessage other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(FooServerMessage other) {
-      if (other == null) {
-        return;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-        }
-      }
-    }
-    #endif
-
-  }
-
-  public sealed partial class BarRequest : pb::IMessage<BarRequest>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<BarRequest> _parser = new pb::MessageParser<BarRequest>(() => new BarRequest());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<BarRequest> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.UnittestProto3Reflection.Descriptor.MessageTypes[32]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public BarRequest() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public BarRequest(BarRequest other) : this() {
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public BarRequest Clone() {
-      return new BarRequest(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as BarRequest);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(BarRequest other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(BarRequest other) {
-      if (other == null) {
-        return;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-        }
-      }
-    }
-    #endif
-
-  }
-
-  public sealed partial class BarResponse : pb::IMessage<BarResponse>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<BarResponse> _parser = new pb::MessageParser<BarResponse>(() => new BarResponse());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<BarResponse> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.UnittestProto3Reflection.Descriptor.MessageTypes[33]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public BarResponse() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public BarResponse(BarResponse other) : this() {
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public BarResponse Clone() {
-      return new BarResponse(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as BarResponse);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(BarResponse other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(BarResponse other) {
-      if (other == null) {
-        return;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-        }
-      }
-    }
-    #endif
-
-  }
-
-  public sealed partial class TestEmptyMessage : pb::IMessage<TestEmptyMessage>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<TestEmptyMessage> _parser = new pb::MessageParser<TestEmptyMessage>(() => new TestEmptyMessage());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<TestEmptyMessage> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.UnittestProto3Reflection.Descriptor.MessageTypes[34]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestEmptyMessage() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestEmptyMessage(TestEmptyMessage other) : this() {
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestEmptyMessage Clone() {
-      return new TestEmptyMessage(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as TestEmptyMessage);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(TestEmptyMessage other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(TestEmptyMessage other) {
-      if (other == null) {
-        return;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-        }
-      }
-    }
-    #endif
-
-  }
-
-  /// <summary>
-  /// This is a leading comment
-  /// </summary>
-  public sealed partial class CommentMessage : pb::IMessage<CommentMessage>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<CommentMessage> _parser = new pb::MessageParser<CommentMessage>(() => new CommentMessage());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<CommentMessage> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.UnittestProto3Reflection.Descriptor.MessageTypes[35]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public CommentMessage() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public CommentMessage(CommentMessage other) : this() {
-      text_ = other.text_;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public CommentMessage Clone() {
-      return new CommentMessage(this);
-    }
-
-    /// <summary>Field number for the "text" field.</summary>
-    public const int TextFieldNumber = 1;
-    private string text_ = "";
-    /// <summary>
-    /// Leading field comment
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string Text {
-      get { return text_; }
-      set {
-        text_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as CommentMessage);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(CommentMessage other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (Text != other.Text) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (Text.Length != 0) hash ^= Text.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (Text.Length != 0) {
-        output.WriteRawTag(10);
-        output.WriteString(Text);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (Text.Length != 0) {
-        output.WriteRawTag(10);
-        output.WriteString(Text);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (Text.Length != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(Text);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(CommentMessage other) {
-      if (other == null) {
-        return;
-      }
-      if (other.Text.Length != 0) {
-        Text = other.Text;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 10: {
-            Text = input.ReadString();
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 10: {
-            Text = input.ReadString();
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-    #region Nested types
-    /// <summary>Container for nested types declared in the CommentMessage message type.</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static partial class Types {
-      /// <summary>
-      /// Leading nested enum comment
-      /// </summary>
-      public enum NestedCommentEnum {
-        /// <summary>
-        /// Zero value comment
-        /// </summary>
-        [pbr::OriginalName("ZERO_VALUE")] ZeroValue = 0,
-      }
-
-      /// <summary>
-      /// Leading nested message comment
-      /// </summary>
-      public sealed partial class NestedCommentMessage : pb::IMessage<NestedCommentMessage>
-      #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          , pb::IBufferMessage
-      #endif
-      {
-        private static readonly pb::MessageParser<NestedCommentMessage> _parser = new pb::MessageParser<NestedCommentMessage>(() => new NestedCommentMessage());
-        private pb::UnknownFieldSet _unknownFields;
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static pb::MessageParser<NestedCommentMessage> Parser { get { return _parser; } }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static pbr::MessageDescriptor Descriptor {
-          get { return global::Google.Protobuf.TestProtos.CommentMessage.Descriptor.NestedTypes[0]; }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        pbr::MessageDescriptor pb::IMessage.Descriptor {
-          get { return Descriptor; }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public NestedCommentMessage() {
-          OnConstruction();
-        }
-
-        partial void OnConstruction();
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public NestedCommentMessage(NestedCommentMessage other) : this() {
-          nestedText_ = other.nestedText_;
-          _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public NestedCommentMessage Clone() {
-          return new NestedCommentMessage(this);
-        }
-
-        /// <summary>Field number for the "nested_text" field.</summary>
-        public const int NestedTextFieldNumber = 1;
-        private string nestedText_ = "";
-        /// <summary>
-        /// Leading nested message field comment
-        /// </summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public string NestedText {
-          get { return nestedText_; }
-          set {
-            nestedText_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-          }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override bool Equals(object other) {
-          return Equals(other as NestedCommentMessage);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool Equals(NestedCommentMessage other) {
-          if (ReferenceEquals(other, null)) {
-            return false;
-          }
-          if (ReferenceEquals(other, this)) {
-            return true;
-          }
-          if (NestedText != other.NestedText) return false;
-          return Equals(_unknownFields, other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override int GetHashCode() {
-          int hash = 1;
-          if (NestedText.Length != 0) hash ^= NestedText.GetHashCode();
-          if (_unknownFields != null) {
-            hash ^= _unknownFields.GetHashCode();
-          }
-          return hash;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override string ToString() {
-          return pb::JsonFormatter.ToDiagnosticString(this);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void WriteTo(pb::CodedOutputStream output) {
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          output.WriteRawMessage(this);
-        #else
-          if (NestedText.Length != 0) {
-            output.WriteRawTag(10);
-            output.WriteString(NestedText);
-          }
-          if (_unknownFields != null) {
-            _unknownFields.WriteTo(output);
-          }
-        #endif
-        }
-
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-          if (NestedText.Length != 0) {
-            output.WriteRawTag(10);
-            output.WriteString(NestedText);
-          }
-          if (_unknownFields != null) {
-            _unknownFields.WriteTo(ref output);
-          }
-        }
-        #endif
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public int CalculateSize() {
-          int size = 0;
-          if (NestedText.Length != 0) {
-            size += 1 + pb::CodedOutputStream.ComputeStringSize(NestedText);
-          }
-          if (_unknownFields != null) {
-            size += _unknownFields.CalculateSize();
-          }
-          return size;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(NestedCommentMessage other) {
-          if (other == null) {
-            return;
-          }
-          if (other.NestedText.Length != 0) {
-            NestedText = other.NestedText;
-          }
-          _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(pb::CodedInputStream input) {
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          input.ReadRawMessage(this);
-        #else
-          uint tag;
-          while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
-              default:
-                _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-                break;
-              case 10: {
-                NestedText = input.ReadString();
-                break;
-              }
-            }
-          }
-        #endif
-        }
-
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-          uint tag;
-          while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
-              default:
-                _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-                break;
-              case 10: {
-                NestedText = input.ReadString();
-                break;
-              }
-            }
-          }
-        }
-        #endif
-
-      }
-
-    }
-    #endregion
-
-  }
-
-  #endregion
-
-}
-
-#endregion Designer generated code
diff --git a/libs/protobuf/csharp/src/Google.Protobuf.Test.TestProtos/UnittestProto3Optional.cs b/libs/protobuf/csharp/src/Google.Protobuf.Test.TestProtos/UnittestProto3Optional.cs
deleted file mode 100644
index 4502ffa..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf.Test.TestProtos/UnittestProto3Optional.cs
+++ /dev/null
@@ -1,2092 +0,0 @@
-// <auto-generated>
-//     Generated by the protocol buffer compiler.  DO NOT EDIT!
-//     source: google/protobuf/unittest_proto3_optional.proto
-// </auto-generated>
-#pragma warning disable 1591, 0612, 3021, 8981
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-namespace ProtobufUnittest {
-
-  /// <summary>Holder for reflection information generated from google/protobuf/unittest_proto3_optional.proto</summary>
-  public static partial class UnittestProto3OptionalReflection {
-
-    #region Descriptor
-    /// <summary>File descriptor for google/protobuf/unittest_proto3_optional.proto</summary>
-    public static pbr::FileDescriptor Descriptor {
-      get { return descriptor; }
-    }
-    private static pbr::FileDescriptor descriptor;
-
-    static UnittestProto3OptionalReflection() {
-      byte[] descriptorData = global::System.Convert.FromBase64String(
-          string.Concat(
-            "Ci5nb29nbGUvcHJvdG9idWYvdW5pdHRlc3RfcHJvdG8zX29wdGlvbmFsLnBy",
-            "b3RvEhFwcm90b2J1Zl91bml0dGVzdBogZ29vZ2xlL3Byb3RvYnVmL2Rlc2Ny",
-            "aXB0b3IucHJvdG8isQoKElRlc3RQcm90bzNPcHRpb25hbBIbCg5vcHRpb25h",
-            "bF9pbnQzMhgBIAEoBUgAiAEBEhsKDm9wdGlvbmFsX2ludDY0GAIgASgDSAGI",
-            "AQESHAoPb3B0aW9uYWxfdWludDMyGAMgASgNSAKIAQESHAoPb3B0aW9uYWxf",
-            "dWludDY0GAQgASgESAOIAQESHAoPb3B0aW9uYWxfc2ludDMyGAUgASgRSASI",
-            "AQESHAoPb3B0aW9uYWxfc2ludDY0GAYgASgSSAWIAQESHQoQb3B0aW9uYWxf",
-            "Zml4ZWQzMhgHIAEoB0gGiAEBEh0KEG9wdGlvbmFsX2ZpeGVkNjQYCCABKAZI",
-            "B4gBARIeChFvcHRpb25hbF9zZml4ZWQzMhgJIAEoD0gIiAEBEh4KEW9wdGlv",
-            "bmFsX3NmaXhlZDY0GAogASgQSAmIAQESGwoOb3B0aW9uYWxfZmxvYXQYCyAB",
-            "KAJICogBARIcCg9vcHRpb25hbF9kb3VibGUYDCABKAFIC4gBARIaCg1vcHRp",
-            "b25hbF9ib29sGA0gASgISAyIAQESHAoPb3B0aW9uYWxfc3RyaW5nGA4gASgJ",
-            "SA2IAQESGwoOb3B0aW9uYWxfYnl0ZXMYDyABKAxIDogBARIeCg1vcHRpb25h",
-            "bF9jb3JkGBAgASgJQgIIAUgPiAEBElkKF29wdGlvbmFsX25lc3RlZF9tZXNz",
-            "YWdlGBIgASgLMjMucHJvdG9idWZfdW5pdHRlc3QuVGVzdFByb3RvM09wdGlv",
-            "bmFsLk5lc3RlZE1lc3NhZ2VIEIgBARJZChNsYXp5X25lc3RlZF9tZXNzYWdl",
-            "GBMgASgLMjMucHJvdG9idWZfdW5pdHRlc3QuVGVzdFByb3RvM09wdGlvbmFs",
-            "Lk5lc3RlZE1lc3NhZ2VCAigBSBGIAQESUwoUb3B0aW9uYWxfbmVzdGVkX2Vu",
-            "dW0YFSABKA4yMC5wcm90b2J1Zl91bml0dGVzdC5UZXN0UHJvdG8zT3B0aW9u",
-            "YWwuTmVzdGVkRW51bUgSiAEBEhYKDnNpbmd1bGFyX2ludDMyGBYgASgFEhYK",
-            "DnNpbmd1bGFyX2ludDY0GBcgASgDGicKDU5lc3RlZE1lc3NhZ2USDwoCYmIY",
-            "ASABKAVIAIgBAUIFCgNfYmIiSgoKTmVzdGVkRW51bRIPCgtVTlNQRUNJRklF",
-            "RBAAEgcKA0ZPTxABEgcKA0JBUhACEgcKA0JBWhADEhAKA05FRxD/////////",
-            "//8BQhEKD19vcHRpb25hbF9pbnQzMkIRCg9fb3B0aW9uYWxfaW50NjRCEgoQ",
-            "X29wdGlvbmFsX3VpbnQzMkISChBfb3B0aW9uYWxfdWludDY0QhIKEF9vcHRp",
-            "b25hbF9zaW50MzJCEgoQX29wdGlvbmFsX3NpbnQ2NEITChFfb3B0aW9uYWxf",
-            "Zml4ZWQzMkITChFfb3B0aW9uYWxfZml4ZWQ2NEIUChJfb3B0aW9uYWxfc2Zp",
-            "eGVkMzJCFAoSX29wdGlvbmFsX3NmaXhlZDY0QhEKD19vcHRpb25hbF9mbG9h",
-            "dEISChBfb3B0aW9uYWxfZG91YmxlQhAKDl9vcHRpb25hbF9ib29sQhIKEF9v",
-            "cHRpb25hbF9zdHJpbmdCEQoPX29wdGlvbmFsX2J5dGVzQhAKDl9vcHRpb25h",
-            "bF9jb3JkQhoKGF9vcHRpb25hbF9uZXN0ZWRfbWVzc2FnZUIWChRfbGF6eV9u",
-            "ZXN0ZWRfbWVzc2FnZUIXChVfb3B0aW9uYWxfbmVzdGVkX2VudW0iiQIKGVRl",
-            "c3RQcm90bzNPcHRpb25hbE1lc3NhZ2USUgoObmVzdGVkX21lc3NhZ2UYASAB",
-            "KAsyOi5wcm90b2J1Zl91bml0dGVzdC5UZXN0UHJvdG8zT3B0aW9uYWxNZXNz",
-            "YWdlLk5lc3RlZE1lc3NhZ2USYAoXb3B0aW9uYWxfbmVzdGVkX21lc3NhZ2UY",
-            "AiABKAsyOi5wcm90b2J1Zl91bml0dGVzdC5UZXN0UHJvdG8zT3B0aW9uYWxN",
-            "ZXNzYWdlLk5lc3RlZE1lc3NhZ2VIAIgBARoaCg1OZXN0ZWRNZXNzYWdlEgkK",
-            "AXMYASABKAlCGgoYX29wdGlvbmFsX25lc3RlZF9tZXNzYWdlIqkBChhQcm90",
-            "bzNPcHRpb25hbEV4dGVuc2lvbnMyPAoPZXh0X25vX29wdGlvbmFsEh8uZ29v",
-            "Z2xlLnByb3RvYnVmLk1lc3NhZ2VPcHRpb25zGIjN2akBIAEoBTJBChFleHRf",
-            "d2l0aF9vcHRpb25hbBIfLmdvb2dsZS5wcm90b2J1Zi5NZXNzYWdlT3B0aW9u",
-            "cxiJzdmpASABKAWIAQE6DMDozM0KCMjozM0KEEIlCiFjb20uZ29vZ2xlLnBy",
-            "b3RvYnVmLnRlc3RpbmcucHJvdG9QAWIGcHJvdG8z"));
-      descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-          new pbr::FileDescriptor[] { global::Google.Protobuf.Reflection.DescriptorReflection.Descriptor, },
-          new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::ProtobufUnittest.TestProto3Optional), global::ProtobufUnittest.TestProto3Optional.Parser, new[]{ "OptionalInt32", "OptionalInt64", "OptionalUint32", "OptionalUint64", "OptionalSint32", "OptionalSint64", "OptionalFixed32", "OptionalFixed64", "OptionalSfixed32", "OptionalSfixed64", "OptionalFloat", "OptionalDouble", "OptionalBool", "OptionalString", "OptionalBytes", "OptionalCord", "OptionalNestedMessage", "LazyNestedMessage", "OptionalNestedEnum", "SingularInt32", "SingularInt64" }, new[]{ "OptionalInt32", "OptionalInt64", "OptionalUint32", "OptionalUint64", "OptionalSint32", "OptionalSint64", "OptionalFixed32", "OptionalFixed64", "OptionalSfixed32", "OptionalSfixed64", "OptionalFloat", "OptionalDouble", "OptionalBool", "OptionalString", "OptionalBytes", "OptionalCord", "OptionalNestedMessage", "LazyNestedMessage", "OptionalNestedEnum" }, new[]{ typeof(global::ProtobufUnittest.TestProto3Optional.Types.NestedEnum) }, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::ProtobufUnittest.TestProto3Optional.Types.NestedMessage), global::ProtobufUnittest.TestProto3Optional.Types.NestedMessage.Parser, new[]{ "Bb" }, new[]{ "Bb" }, null, null, null)}),
-            new pbr::GeneratedClrTypeInfo(typeof(global::ProtobufUnittest.TestProto3OptionalMessage), global::ProtobufUnittest.TestProto3OptionalMessage.Parser, new[]{ "NestedMessage", "OptionalNestedMessage" }, new[]{ "OptionalNestedMessage" }, null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::ProtobufUnittest.TestProto3OptionalMessage.Types.NestedMessage), global::ProtobufUnittest.TestProto3OptionalMessage.Types.NestedMessage.Parser, new[]{ "S" }, null, null, null, null)}),
-            new pbr::GeneratedClrTypeInfo(typeof(global::ProtobufUnittest.Proto3OptionalExtensions), global::ProtobufUnittest.Proto3OptionalExtensions.Parser, null, null, null, new pb::Extension[] { global::ProtobufUnittest.Proto3OptionalExtensions.Extensions.ExtNoOptional, global::ProtobufUnittest.Proto3OptionalExtensions.Extensions.ExtWithOptional }, null)
-          }));
-    }
-    #endregion
-
-  }
-  #region Messages
-  public sealed partial class TestProto3Optional : pb::IMessage<TestProto3Optional>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<TestProto3Optional> _parser = new pb::MessageParser<TestProto3Optional>(() => new TestProto3Optional());
-    private pb::UnknownFieldSet _unknownFields;
-    private int _hasBits0;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<TestProto3Optional> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::ProtobufUnittest.UnittestProto3OptionalReflection.Descriptor.MessageTypes[0]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestProto3Optional() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestProto3Optional(TestProto3Optional other) : this() {
-      _hasBits0 = other._hasBits0;
-      optionalInt32_ = other.optionalInt32_;
-      optionalInt64_ = other.optionalInt64_;
-      optionalUint32_ = other.optionalUint32_;
-      optionalUint64_ = other.optionalUint64_;
-      optionalSint32_ = other.optionalSint32_;
-      optionalSint64_ = other.optionalSint64_;
-      optionalFixed32_ = other.optionalFixed32_;
-      optionalFixed64_ = other.optionalFixed64_;
-      optionalSfixed32_ = other.optionalSfixed32_;
-      optionalSfixed64_ = other.optionalSfixed64_;
-      optionalFloat_ = other.optionalFloat_;
-      optionalDouble_ = other.optionalDouble_;
-      optionalBool_ = other.optionalBool_;
-      optionalString_ = other.optionalString_;
-      optionalBytes_ = other.optionalBytes_;
-      optionalCord_ = other.optionalCord_;
-      optionalNestedMessage_ = other.optionalNestedMessage_ != null ? other.optionalNestedMessage_.Clone() : null;
-      lazyNestedMessage_ = other.lazyNestedMessage_ != null ? other.lazyNestedMessage_.Clone() : null;
-      optionalNestedEnum_ = other.optionalNestedEnum_;
-      singularInt32_ = other.singularInt32_;
-      singularInt64_ = other.singularInt64_;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestProto3Optional Clone() {
-      return new TestProto3Optional(this);
-    }
-
-    /// <summary>Field number for the "optional_int32" field.</summary>
-    public const int OptionalInt32FieldNumber = 1;
-    private int optionalInt32_;
-    /// <summary>
-    /// Singular
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int OptionalInt32 {
-      get { if ((_hasBits0 & 1) != 0) { return optionalInt32_; } else { return 0; } }
-      set {
-        _hasBits0 |= 1;
-        optionalInt32_ = value;
-      }
-    }
-    /// <summary>Gets whether the "optional_int32" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasOptionalInt32 {
-      get { return (_hasBits0 & 1) != 0; }
-    }
-    /// <summary>Clears the value of the "optional_int32" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearOptionalInt32() {
-      _hasBits0 &= ~1;
-    }
-
-    /// <summary>Field number for the "optional_int64" field.</summary>
-    public const int OptionalInt64FieldNumber = 2;
-    private long optionalInt64_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public long OptionalInt64 {
-      get { if ((_hasBits0 & 2) != 0) { return optionalInt64_; } else { return 0L; } }
-      set {
-        _hasBits0 |= 2;
-        optionalInt64_ = value;
-      }
-    }
-    /// <summary>Gets whether the "optional_int64" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasOptionalInt64 {
-      get { return (_hasBits0 & 2) != 0; }
-    }
-    /// <summary>Clears the value of the "optional_int64" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearOptionalInt64() {
-      _hasBits0 &= ~2;
-    }
-
-    /// <summary>Field number for the "optional_uint32" field.</summary>
-    public const int OptionalUint32FieldNumber = 3;
-    private uint optionalUint32_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public uint OptionalUint32 {
-      get { if ((_hasBits0 & 4) != 0) { return optionalUint32_; } else { return 0; } }
-      set {
-        _hasBits0 |= 4;
-        optionalUint32_ = value;
-      }
-    }
-    /// <summary>Gets whether the "optional_uint32" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasOptionalUint32 {
-      get { return (_hasBits0 & 4) != 0; }
-    }
-    /// <summary>Clears the value of the "optional_uint32" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearOptionalUint32() {
-      _hasBits0 &= ~4;
-    }
-
-    /// <summary>Field number for the "optional_uint64" field.</summary>
-    public const int OptionalUint64FieldNumber = 4;
-    private ulong optionalUint64_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ulong OptionalUint64 {
-      get { if ((_hasBits0 & 8) != 0) { return optionalUint64_; } else { return 0UL; } }
-      set {
-        _hasBits0 |= 8;
-        optionalUint64_ = value;
-      }
-    }
-    /// <summary>Gets whether the "optional_uint64" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasOptionalUint64 {
-      get { return (_hasBits0 & 8) != 0; }
-    }
-    /// <summary>Clears the value of the "optional_uint64" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearOptionalUint64() {
-      _hasBits0 &= ~8;
-    }
-
-    /// <summary>Field number for the "optional_sint32" field.</summary>
-    public const int OptionalSint32FieldNumber = 5;
-    private int optionalSint32_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int OptionalSint32 {
-      get { if ((_hasBits0 & 16) != 0) { return optionalSint32_; } else { return 0; } }
-      set {
-        _hasBits0 |= 16;
-        optionalSint32_ = value;
-      }
-    }
-    /// <summary>Gets whether the "optional_sint32" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasOptionalSint32 {
-      get { return (_hasBits0 & 16) != 0; }
-    }
-    /// <summary>Clears the value of the "optional_sint32" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearOptionalSint32() {
-      _hasBits0 &= ~16;
-    }
-
-    /// <summary>Field number for the "optional_sint64" field.</summary>
-    public const int OptionalSint64FieldNumber = 6;
-    private long optionalSint64_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public long OptionalSint64 {
-      get { if ((_hasBits0 & 32) != 0) { return optionalSint64_; } else { return 0L; } }
-      set {
-        _hasBits0 |= 32;
-        optionalSint64_ = value;
-      }
-    }
-    /// <summary>Gets whether the "optional_sint64" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasOptionalSint64 {
-      get { return (_hasBits0 & 32) != 0; }
-    }
-    /// <summary>Clears the value of the "optional_sint64" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearOptionalSint64() {
-      _hasBits0 &= ~32;
-    }
-
-    /// <summary>Field number for the "optional_fixed32" field.</summary>
-    public const int OptionalFixed32FieldNumber = 7;
-    private uint optionalFixed32_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public uint OptionalFixed32 {
-      get { if ((_hasBits0 & 64) != 0) { return optionalFixed32_; } else { return 0; } }
-      set {
-        _hasBits0 |= 64;
-        optionalFixed32_ = value;
-      }
-    }
-    /// <summary>Gets whether the "optional_fixed32" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasOptionalFixed32 {
-      get { return (_hasBits0 & 64) != 0; }
-    }
-    /// <summary>Clears the value of the "optional_fixed32" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearOptionalFixed32() {
-      _hasBits0 &= ~64;
-    }
-
-    /// <summary>Field number for the "optional_fixed64" field.</summary>
-    public const int OptionalFixed64FieldNumber = 8;
-    private ulong optionalFixed64_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ulong OptionalFixed64 {
-      get { if ((_hasBits0 & 128) != 0) { return optionalFixed64_; } else { return 0UL; } }
-      set {
-        _hasBits0 |= 128;
-        optionalFixed64_ = value;
-      }
-    }
-    /// <summary>Gets whether the "optional_fixed64" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasOptionalFixed64 {
-      get { return (_hasBits0 & 128) != 0; }
-    }
-    /// <summary>Clears the value of the "optional_fixed64" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearOptionalFixed64() {
-      _hasBits0 &= ~128;
-    }
-
-    /// <summary>Field number for the "optional_sfixed32" field.</summary>
-    public const int OptionalSfixed32FieldNumber = 9;
-    private int optionalSfixed32_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int OptionalSfixed32 {
-      get { if ((_hasBits0 & 256) != 0) { return optionalSfixed32_; } else { return 0; } }
-      set {
-        _hasBits0 |= 256;
-        optionalSfixed32_ = value;
-      }
-    }
-    /// <summary>Gets whether the "optional_sfixed32" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasOptionalSfixed32 {
-      get { return (_hasBits0 & 256) != 0; }
-    }
-    /// <summary>Clears the value of the "optional_sfixed32" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearOptionalSfixed32() {
-      _hasBits0 &= ~256;
-    }
-
-    /// <summary>Field number for the "optional_sfixed64" field.</summary>
-    public const int OptionalSfixed64FieldNumber = 10;
-    private long optionalSfixed64_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public long OptionalSfixed64 {
-      get { if ((_hasBits0 & 512) != 0) { return optionalSfixed64_; } else { return 0L; } }
-      set {
-        _hasBits0 |= 512;
-        optionalSfixed64_ = value;
-      }
-    }
-    /// <summary>Gets whether the "optional_sfixed64" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasOptionalSfixed64 {
-      get { return (_hasBits0 & 512) != 0; }
-    }
-    /// <summary>Clears the value of the "optional_sfixed64" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearOptionalSfixed64() {
-      _hasBits0 &= ~512;
-    }
-
-    /// <summary>Field number for the "optional_float" field.</summary>
-    public const int OptionalFloatFieldNumber = 11;
-    private float optionalFloat_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public float OptionalFloat {
-      get { if ((_hasBits0 & 1024) != 0) { return optionalFloat_; } else { return 0F; } }
-      set {
-        _hasBits0 |= 1024;
-        optionalFloat_ = value;
-      }
-    }
-    /// <summary>Gets whether the "optional_float" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasOptionalFloat {
-      get { return (_hasBits0 & 1024) != 0; }
-    }
-    /// <summary>Clears the value of the "optional_float" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearOptionalFloat() {
-      _hasBits0 &= ~1024;
-    }
-
-    /// <summary>Field number for the "optional_double" field.</summary>
-    public const int OptionalDoubleFieldNumber = 12;
-    private double optionalDouble_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double OptionalDouble {
-      get { if ((_hasBits0 & 2048) != 0) { return optionalDouble_; } else { return 0D; } }
-      set {
-        _hasBits0 |= 2048;
-        optionalDouble_ = value;
-      }
-    }
-    /// <summary>Gets whether the "optional_double" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasOptionalDouble {
-      get { return (_hasBits0 & 2048) != 0; }
-    }
-    /// <summary>Clears the value of the "optional_double" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearOptionalDouble() {
-      _hasBits0 &= ~2048;
-    }
-
-    /// <summary>Field number for the "optional_bool" field.</summary>
-    public const int OptionalBoolFieldNumber = 13;
-    private bool optionalBool_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool OptionalBool {
-      get { if ((_hasBits0 & 4096) != 0) { return optionalBool_; } else { return false; } }
-      set {
-        _hasBits0 |= 4096;
-        optionalBool_ = value;
-      }
-    }
-    /// <summary>Gets whether the "optional_bool" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasOptionalBool {
-      get { return (_hasBits0 & 4096) != 0; }
-    }
-    /// <summary>Clears the value of the "optional_bool" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearOptionalBool() {
-      _hasBits0 &= ~4096;
-    }
-
-    /// <summary>Field number for the "optional_string" field.</summary>
-    public const int OptionalStringFieldNumber = 14;
-    private string optionalString_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string OptionalString {
-      get { return optionalString_ ?? ""; }
-      set {
-        optionalString_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-    /// <summary>Gets whether the "optional_string" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasOptionalString {
-      get { return optionalString_ != null; }
-    }
-    /// <summary>Clears the value of the "optional_string" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearOptionalString() {
-      optionalString_ = null;
-    }
-
-    /// <summary>Field number for the "optional_bytes" field.</summary>
-    public const int OptionalBytesFieldNumber = 15;
-    private pb::ByteString optionalBytes_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pb::ByteString OptionalBytes {
-      get { return optionalBytes_ ?? pb::ByteString.Empty; }
-      set {
-        optionalBytes_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-    /// <summary>Gets whether the "optional_bytes" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasOptionalBytes {
-      get { return optionalBytes_ != null; }
-    }
-    /// <summary>Clears the value of the "optional_bytes" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearOptionalBytes() {
-      optionalBytes_ = null;
-    }
-
-    /// <summary>Field number for the "optional_cord" field.</summary>
-    public const int OptionalCordFieldNumber = 16;
-    private string optionalCord_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string OptionalCord {
-      get { return optionalCord_ ?? ""; }
-      set {
-        optionalCord_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-    /// <summary>Gets whether the "optional_cord" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasOptionalCord {
-      get { return optionalCord_ != null; }
-    }
-    /// <summary>Clears the value of the "optional_cord" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearOptionalCord() {
-      optionalCord_ = null;
-    }
-
-    /// <summary>Field number for the "optional_nested_message" field.</summary>
-    public const int OptionalNestedMessageFieldNumber = 18;
-    private global::ProtobufUnittest.TestProto3Optional.Types.NestedMessage optionalNestedMessage_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::ProtobufUnittest.TestProto3Optional.Types.NestedMessage OptionalNestedMessage {
-      get { return optionalNestedMessage_; }
-      set {
-        optionalNestedMessage_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "lazy_nested_message" field.</summary>
-    public const int LazyNestedMessageFieldNumber = 19;
-    private global::ProtobufUnittest.TestProto3Optional.Types.NestedMessage lazyNestedMessage_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::ProtobufUnittest.TestProto3Optional.Types.NestedMessage LazyNestedMessage {
-      get { return lazyNestedMessage_; }
-      set {
-        lazyNestedMessage_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "optional_nested_enum" field.</summary>
-    public const int OptionalNestedEnumFieldNumber = 21;
-    private global::ProtobufUnittest.TestProto3Optional.Types.NestedEnum optionalNestedEnum_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::ProtobufUnittest.TestProto3Optional.Types.NestedEnum OptionalNestedEnum {
-      get { if ((_hasBits0 & 8192) != 0) { return optionalNestedEnum_; } else { return global::ProtobufUnittest.TestProto3Optional.Types.NestedEnum.Unspecified; } }
-      set {
-        _hasBits0 |= 8192;
-        optionalNestedEnum_ = value;
-      }
-    }
-    /// <summary>Gets whether the "optional_nested_enum" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasOptionalNestedEnum {
-      get { return (_hasBits0 & 8192) != 0; }
-    }
-    /// <summary>Clears the value of the "optional_nested_enum" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearOptionalNestedEnum() {
-      _hasBits0 &= ~8192;
-    }
-
-    /// <summary>Field number for the "singular_int32" field.</summary>
-    public const int SingularInt32FieldNumber = 22;
-    private int singularInt32_;
-    /// <summary>
-    /// Add some non-optional fields to verify we can mix them.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int SingularInt32 {
-      get { return singularInt32_; }
-      set {
-        singularInt32_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "singular_int64" field.</summary>
-    public const int SingularInt64FieldNumber = 23;
-    private long singularInt64_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public long SingularInt64 {
-      get { return singularInt64_; }
-      set {
-        singularInt64_ = value;
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as TestProto3Optional);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(TestProto3Optional other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (OptionalInt32 != other.OptionalInt32) return false;
-      if (OptionalInt64 != other.OptionalInt64) return false;
-      if (OptionalUint32 != other.OptionalUint32) return false;
-      if (OptionalUint64 != other.OptionalUint64) return false;
-      if (OptionalSint32 != other.OptionalSint32) return false;
-      if (OptionalSint64 != other.OptionalSint64) return false;
-      if (OptionalFixed32 != other.OptionalFixed32) return false;
-      if (OptionalFixed64 != other.OptionalFixed64) return false;
-      if (OptionalSfixed32 != other.OptionalSfixed32) return false;
-      if (OptionalSfixed64 != other.OptionalSfixed64) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.Equals(OptionalFloat, other.OptionalFloat)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.Equals(OptionalDouble, other.OptionalDouble)) return false;
-      if (OptionalBool != other.OptionalBool) return false;
-      if (OptionalString != other.OptionalString) return false;
-      if (OptionalBytes != other.OptionalBytes) return false;
-      if (OptionalCord != other.OptionalCord) return false;
-      if (!object.Equals(OptionalNestedMessage, other.OptionalNestedMessage)) return false;
-      if (!object.Equals(LazyNestedMessage, other.LazyNestedMessage)) return false;
-      if (OptionalNestedEnum != other.OptionalNestedEnum) return false;
-      if (SingularInt32 != other.SingularInt32) return false;
-      if (SingularInt64 != other.SingularInt64) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (HasOptionalInt32) hash ^= OptionalInt32.GetHashCode();
-      if (HasOptionalInt64) hash ^= OptionalInt64.GetHashCode();
-      if (HasOptionalUint32) hash ^= OptionalUint32.GetHashCode();
-      if (HasOptionalUint64) hash ^= OptionalUint64.GetHashCode();
-      if (HasOptionalSint32) hash ^= OptionalSint32.GetHashCode();
-      if (HasOptionalSint64) hash ^= OptionalSint64.GetHashCode();
-      if (HasOptionalFixed32) hash ^= OptionalFixed32.GetHashCode();
-      if (HasOptionalFixed64) hash ^= OptionalFixed64.GetHashCode();
-      if (HasOptionalSfixed32) hash ^= OptionalSfixed32.GetHashCode();
-      if (HasOptionalSfixed64) hash ^= OptionalSfixed64.GetHashCode();
-      if (HasOptionalFloat) hash ^= pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.GetHashCode(OptionalFloat);
-      if (HasOptionalDouble) hash ^= pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.GetHashCode(OptionalDouble);
-      if (HasOptionalBool) hash ^= OptionalBool.GetHashCode();
-      if (HasOptionalString) hash ^= OptionalString.GetHashCode();
-      if (HasOptionalBytes) hash ^= OptionalBytes.GetHashCode();
-      if (HasOptionalCord) hash ^= OptionalCord.GetHashCode();
-      if (optionalNestedMessage_ != null) hash ^= OptionalNestedMessage.GetHashCode();
-      if (lazyNestedMessage_ != null) hash ^= LazyNestedMessage.GetHashCode();
-      if (HasOptionalNestedEnum) hash ^= OptionalNestedEnum.GetHashCode();
-      if (SingularInt32 != 0) hash ^= SingularInt32.GetHashCode();
-      if (SingularInt64 != 0L) hash ^= SingularInt64.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (HasOptionalInt32) {
-        output.WriteRawTag(8);
-        output.WriteInt32(OptionalInt32);
-      }
-      if (HasOptionalInt64) {
-        output.WriteRawTag(16);
-        output.WriteInt64(OptionalInt64);
-      }
-      if (HasOptionalUint32) {
-        output.WriteRawTag(24);
-        output.WriteUInt32(OptionalUint32);
-      }
-      if (HasOptionalUint64) {
-        output.WriteRawTag(32);
-        output.WriteUInt64(OptionalUint64);
-      }
-      if (HasOptionalSint32) {
-        output.WriteRawTag(40);
-        output.WriteSInt32(OptionalSint32);
-      }
-      if (HasOptionalSint64) {
-        output.WriteRawTag(48);
-        output.WriteSInt64(OptionalSint64);
-      }
-      if (HasOptionalFixed32) {
-        output.WriteRawTag(61);
-        output.WriteFixed32(OptionalFixed32);
-      }
-      if (HasOptionalFixed64) {
-        output.WriteRawTag(65);
-        output.WriteFixed64(OptionalFixed64);
-      }
-      if (HasOptionalSfixed32) {
-        output.WriteRawTag(77);
-        output.WriteSFixed32(OptionalSfixed32);
-      }
-      if (HasOptionalSfixed64) {
-        output.WriteRawTag(81);
-        output.WriteSFixed64(OptionalSfixed64);
-      }
-      if (HasOptionalFloat) {
-        output.WriteRawTag(93);
-        output.WriteFloat(OptionalFloat);
-      }
-      if (HasOptionalDouble) {
-        output.WriteRawTag(97);
-        output.WriteDouble(OptionalDouble);
-      }
-      if (HasOptionalBool) {
-        output.WriteRawTag(104);
-        output.WriteBool(OptionalBool);
-      }
-      if (HasOptionalString) {
-        output.WriteRawTag(114);
-        output.WriteString(OptionalString);
-      }
-      if (HasOptionalBytes) {
-        output.WriteRawTag(122);
-        output.WriteBytes(OptionalBytes);
-      }
-      if (HasOptionalCord) {
-        output.WriteRawTag(130, 1);
-        output.WriteString(OptionalCord);
-      }
-      if (optionalNestedMessage_ != null) {
-        output.WriteRawTag(146, 1);
-        output.WriteMessage(OptionalNestedMessage);
-      }
-      if (lazyNestedMessage_ != null) {
-        output.WriteRawTag(154, 1);
-        output.WriteMessage(LazyNestedMessage);
-      }
-      if (HasOptionalNestedEnum) {
-        output.WriteRawTag(168, 1);
-        output.WriteEnum((int) OptionalNestedEnum);
-      }
-      if (SingularInt32 != 0) {
-        output.WriteRawTag(176, 1);
-        output.WriteInt32(SingularInt32);
-      }
-      if (SingularInt64 != 0L) {
-        output.WriteRawTag(184, 1);
-        output.WriteInt64(SingularInt64);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (HasOptionalInt32) {
-        output.WriteRawTag(8);
-        output.WriteInt32(OptionalInt32);
-      }
-      if (HasOptionalInt64) {
-        output.WriteRawTag(16);
-        output.WriteInt64(OptionalInt64);
-      }
-      if (HasOptionalUint32) {
-        output.WriteRawTag(24);
-        output.WriteUInt32(OptionalUint32);
-      }
-      if (HasOptionalUint64) {
-        output.WriteRawTag(32);
-        output.WriteUInt64(OptionalUint64);
-      }
-      if (HasOptionalSint32) {
-        output.WriteRawTag(40);
-        output.WriteSInt32(OptionalSint32);
-      }
-      if (HasOptionalSint64) {
-        output.WriteRawTag(48);
-        output.WriteSInt64(OptionalSint64);
-      }
-      if (HasOptionalFixed32) {
-        output.WriteRawTag(61);
-        output.WriteFixed32(OptionalFixed32);
-      }
-      if (HasOptionalFixed64) {
-        output.WriteRawTag(65);
-        output.WriteFixed64(OptionalFixed64);
-      }
-      if (HasOptionalSfixed32) {
-        output.WriteRawTag(77);
-        output.WriteSFixed32(OptionalSfixed32);
-      }
-      if (HasOptionalSfixed64) {
-        output.WriteRawTag(81);
-        output.WriteSFixed64(OptionalSfixed64);
-      }
-      if (HasOptionalFloat) {
-        output.WriteRawTag(93);
-        output.WriteFloat(OptionalFloat);
-      }
-      if (HasOptionalDouble) {
-        output.WriteRawTag(97);
-        output.WriteDouble(OptionalDouble);
-      }
-      if (HasOptionalBool) {
-        output.WriteRawTag(104);
-        output.WriteBool(OptionalBool);
-      }
-      if (HasOptionalString) {
-        output.WriteRawTag(114);
-        output.WriteString(OptionalString);
-      }
-      if (HasOptionalBytes) {
-        output.WriteRawTag(122);
-        output.WriteBytes(OptionalBytes);
-      }
-      if (HasOptionalCord) {
-        output.WriteRawTag(130, 1);
-        output.WriteString(OptionalCord);
-      }
-      if (optionalNestedMessage_ != null) {
-        output.WriteRawTag(146, 1);
-        output.WriteMessage(OptionalNestedMessage);
-      }
-      if (lazyNestedMessage_ != null) {
-        output.WriteRawTag(154, 1);
-        output.WriteMessage(LazyNestedMessage);
-      }
-      if (HasOptionalNestedEnum) {
-        output.WriteRawTag(168, 1);
-        output.WriteEnum((int) OptionalNestedEnum);
-      }
-      if (SingularInt32 != 0) {
-        output.WriteRawTag(176, 1);
-        output.WriteInt32(SingularInt32);
-      }
-      if (SingularInt64 != 0L) {
-        output.WriteRawTag(184, 1);
-        output.WriteInt64(SingularInt64);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (HasOptionalInt32) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(OptionalInt32);
-      }
-      if (HasOptionalInt64) {
-        size += 1 + pb::CodedOutputStream.ComputeInt64Size(OptionalInt64);
-      }
-      if (HasOptionalUint32) {
-        size += 1 + pb::CodedOutputStream.ComputeUInt32Size(OptionalUint32);
-      }
-      if (HasOptionalUint64) {
-        size += 1 + pb::CodedOutputStream.ComputeUInt64Size(OptionalUint64);
-      }
-      if (HasOptionalSint32) {
-        size += 1 + pb::CodedOutputStream.ComputeSInt32Size(OptionalSint32);
-      }
-      if (HasOptionalSint64) {
-        size += 1 + pb::CodedOutputStream.ComputeSInt64Size(OptionalSint64);
-      }
-      if (HasOptionalFixed32) {
-        size += 1 + 4;
-      }
-      if (HasOptionalFixed64) {
-        size += 1 + 8;
-      }
-      if (HasOptionalSfixed32) {
-        size += 1 + 4;
-      }
-      if (HasOptionalSfixed64) {
-        size += 1 + 8;
-      }
-      if (HasOptionalFloat) {
-        size += 1 + 4;
-      }
-      if (HasOptionalDouble) {
-        size += 1 + 8;
-      }
-      if (HasOptionalBool) {
-        size += 1 + 1;
-      }
-      if (HasOptionalString) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(OptionalString);
-      }
-      if (HasOptionalBytes) {
-        size += 1 + pb::CodedOutputStream.ComputeBytesSize(OptionalBytes);
-      }
-      if (HasOptionalCord) {
-        size += 2 + pb::CodedOutputStream.ComputeStringSize(OptionalCord);
-      }
-      if (optionalNestedMessage_ != null) {
-        size += 2 + pb::CodedOutputStream.ComputeMessageSize(OptionalNestedMessage);
-      }
-      if (lazyNestedMessage_ != null) {
-        size += 2 + pb::CodedOutputStream.ComputeMessageSize(LazyNestedMessage);
-      }
-      if (HasOptionalNestedEnum) {
-        size += 2 + pb::CodedOutputStream.ComputeEnumSize((int) OptionalNestedEnum);
-      }
-      if (SingularInt32 != 0) {
-        size += 2 + pb::CodedOutputStream.ComputeInt32Size(SingularInt32);
-      }
-      if (SingularInt64 != 0L) {
-        size += 2 + pb::CodedOutputStream.ComputeInt64Size(SingularInt64);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(TestProto3Optional other) {
-      if (other == null) {
-        return;
-      }
-      if (other.HasOptionalInt32) {
-        OptionalInt32 = other.OptionalInt32;
-      }
-      if (other.HasOptionalInt64) {
-        OptionalInt64 = other.OptionalInt64;
-      }
-      if (other.HasOptionalUint32) {
-        OptionalUint32 = other.OptionalUint32;
-      }
-      if (other.HasOptionalUint64) {
-        OptionalUint64 = other.OptionalUint64;
-      }
-      if (other.HasOptionalSint32) {
-        OptionalSint32 = other.OptionalSint32;
-      }
-      if (other.HasOptionalSint64) {
-        OptionalSint64 = other.OptionalSint64;
-      }
-      if (other.HasOptionalFixed32) {
-        OptionalFixed32 = other.OptionalFixed32;
-      }
-      if (other.HasOptionalFixed64) {
-        OptionalFixed64 = other.OptionalFixed64;
-      }
-      if (other.HasOptionalSfixed32) {
-        OptionalSfixed32 = other.OptionalSfixed32;
-      }
-      if (other.HasOptionalSfixed64) {
-        OptionalSfixed64 = other.OptionalSfixed64;
-      }
-      if (other.HasOptionalFloat) {
-        OptionalFloat = other.OptionalFloat;
-      }
-      if (other.HasOptionalDouble) {
-        OptionalDouble = other.OptionalDouble;
-      }
-      if (other.HasOptionalBool) {
-        OptionalBool = other.OptionalBool;
-      }
-      if (other.HasOptionalString) {
-        OptionalString = other.OptionalString;
-      }
-      if (other.HasOptionalBytes) {
-        OptionalBytes = other.OptionalBytes;
-      }
-      if (other.HasOptionalCord) {
-        OptionalCord = other.OptionalCord;
-      }
-      if (other.optionalNestedMessage_ != null) {
-        if (optionalNestedMessage_ == null) {
-          OptionalNestedMessage = new global::ProtobufUnittest.TestProto3Optional.Types.NestedMessage();
-        }
-        OptionalNestedMessage.MergeFrom(other.OptionalNestedMessage);
-      }
-      if (other.lazyNestedMessage_ != null) {
-        if (lazyNestedMessage_ == null) {
-          LazyNestedMessage = new global::ProtobufUnittest.TestProto3Optional.Types.NestedMessage();
-        }
-        LazyNestedMessage.MergeFrom(other.LazyNestedMessage);
-      }
-      if (other.HasOptionalNestedEnum) {
-        OptionalNestedEnum = other.OptionalNestedEnum;
-      }
-      if (other.SingularInt32 != 0) {
-        SingularInt32 = other.SingularInt32;
-      }
-      if (other.SingularInt64 != 0L) {
-        SingularInt64 = other.SingularInt64;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 8: {
-            OptionalInt32 = input.ReadInt32();
-            break;
-          }
-          case 16: {
-            OptionalInt64 = input.ReadInt64();
-            break;
-          }
-          case 24: {
-            OptionalUint32 = input.ReadUInt32();
-            break;
-          }
-          case 32: {
-            OptionalUint64 = input.ReadUInt64();
-            break;
-          }
-          case 40: {
-            OptionalSint32 = input.ReadSInt32();
-            break;
-          }
-          case 48: {
-            OptionalSint64 = input.ReadSInt64();
-            break;
-          }
-          case 61: {
-            OptionalFixed32 = input.ReadFixed32();
-            break;
-          }
-          case 65: {
-            OptionalFixed64 = input.ReadFixed64();
-            break;
-          }
-          case 77: {
-            OptionalSfixed32 = input.ReadSFixed32();
-            break;
-          }
-          case 81: {
-            OptionalSfixed64 = input.ReadSFixed64();
-            break;
-          }
-          case 93: {
-            OptionalFloat = input.ReadFloat();
-            break;
-          }
-          case 97: {
-            OptionalDouble = input.ReadDouble();
-            break;
-          }
-          case 104: {
-            OptionalBool = input.ReadBool();
-            break;
-          }
-          case 114: {
-            OptionalString = input.ReadString();
-            break;
-          }
-          case 122: {
-            OptionalBytes = input.ReadBytes();
-            break;
-          }
-          case 130: {
-            OptionalCord = input.ReadString();
-            break;
-          }
-          case 146: {
-            if (optionalNestedMessage_ == null) {
-              OptionalNestedMessage = new global::ProtobufUnittest.TestProto3Optional.Types.NestedMessage();
-            }
-            input.ReadMessage(OptionalNestedMessage);
-            break;
-          }
-          case 154: {
-            if (lazyNestedMessage_ == null) {
-              LazyNestedMessage = new global::ProtobufUnittest.TestProto3Optional.Types.NestedMessage();
-            }
-            input.ReadMessage(LazyNestedMessage);
-            break;
-          }
-          case 168: {
-            OptionalNestedEnum = (global::ProtobufUnittest.TestProto3Optional.Types.NestedEnum) input.ReadEnum();
-            break;
-          }
-          case 176: {
-            SingularInt32 = input.ReadInt32();
-            break;
-          }
-          case 184: {
-            SingularInt64 = input.ReadInt64();
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 8: {
-            OptionalInt32 = input.ReadInt32();
-            break;
-          }
-          case 16: {
-            OptionalInt64 = input.ReadInt64();
-            break;
-          }
-          case 24: {
-            OptionalUint32 = input.ReadUInt32();
-            break;
-          }
-          case 32: {
-            OptionalUint64 = input.ReadUInt64();
-            break;
-          }
-          case 40: {
-            OptionalSint32 = input.ReadSInt32();
-            break;
-          }
-          case 48: {
-            OptionalSint64 = input.ReadSInt64();
-            break;
-          }
-          case 61: {
-            OptionalFixed32 = input.ReadFixed32();
-            break;
-          }
-          case 65: {
-            OptionalFixed64 = input.ReadFixed64();
-            break;
-          }
-          case 77: {
-            OptionalSfixed32 = input.ReadSFixed32();
-            break;
-          }
-          case 81: {
-            OptionalSfixed64 = input.ReadSFixed64();
-            break;
-          }
-          case 93: {
-            OptionalFloat = input.ReadFloat();
-            break;
-          }
-          case 97: {
-            OptionalDouble = input.ReadDouble();
-            break;
-          }
-          case 104: {
-            OptionalBool = input.ReadBool();
-            break;
-          }
-          case 114: {
-            OptionalString = input.ReadString();
-            break;
-          }
-          case 122: {
-            OptionalBytes = input.ReadBytes();
-            break;
-          }
-          case 130: {
-            OptionalCord = input.ReadString();
-            break;
-          }
-          case 146: {
-            if (optionalNestedMessage_ == null) {
-              OptionalNestedMessage = new global::ProtobufUnittest.TestProto3Optional.Types.NestedMessage();
-            }
-            input.ReadMessage(OptionalNestedMessage);
-            break;
-          }
-          case 154: {
-            if (lazyNestedMessage_ == null) {
-              LazyNestedMessage = new global::ProtobufUnittest.TestProto3Optional.Types.NestedMessage();
-            }
-            input.ReadMessage(LazyNestedMessage);
-            break;
-          }
-          case 168: {
-            OptionalNestedEnum = (global::ProtobufUnittest.TestProto3Optional.Types.NestedEnum) input.ReadEnum();
-            break;
-          }
-          case 176: {
-            SingularInt32 = input.ReadInt32();
-            break;
-          }
-          case 184: {
-            SingularInt64 = input.ReadInt64();
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-    #region Nested types
-    /// <summary>Container for nested types declared in the TestProto3Optional message type.</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static partial class Types {
-      public enum NestedEnum {
-        [pbr::OriginalName("UNSPECIFIED")] Unspecified = 0,
-        [pbr::OriginalName("FOO")] Foo = 1,
-        [pbr::OriginalName("BAR")] Bar = 2,
-        [pbr::OriginalName("BAZ")] Baz = 3,
-        /// <summary>
-        /// Intentionally negative.
-        /// </summary>
-        [pbr::OriginalName("NEG")] Neg = -1,
-      }
-
-      public sealed partial class NestedMessage : pb::IMessage<NestedMessage>
-      #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          , pb::IBufferMessage
-      #endif
-      {
-        private static readonly pb::MessageParser<NestedMessage> _parser = new pb::MessageParser<NestedMessage>(() => new NestedMessage());
-        private pb::UnknownFieldSet _unknownFields;
-        private int _hasBits0;
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static pb::MessageParser<NestedMessage> Parser { get { return _parser; } }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static pbr::MessageDescriptor Descriptor {
-          get { return global::ProtobufUnittest.TestProto3Optional.Descriptor.NestedTypes[0]; }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        pbr::MessageDescriptor pb::IMessage.Descriptor {
-          get { return Descriptor; }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public NestedMessage() {
-          OnConstruction();
-        }
-
-        partial void OnConstruction();
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public NestedMessage(NestedMessage other) : this() {
-          _hasBits0 = other._hasBits0;
-          bb_ = other.bb_;
-          _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public NestedMessage Clone() {
-          return new NestedMessage(this);
-        }
-
-        /// <summary>Field number for the "bb" field.</summary>
-        public const int BbFieldNumber = 1;
-        private int bb_;
-        /// <summary>
-        /// The field name "b" fails to compile in proto1 because it conflicts with
-        /// a local variable named "b" in one of the generated methods.  Doh.
-        /// This file needs to compile in proto1 to test backwards-compatibility.
-        /// </summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public int Bb {
-          get { if ((_hasBits0 & 1) != 0) { return bb_; } else { return 0; } }
-          set {
-            _hasBits0 |= 1;
-            bb_ = value;
-          }
-        }
-        /// <summary>Gets whether the "bb" field is set</summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool HasBb {
-          get { return (_hasBits0 & 1) != 0; }
-        }
-        /// <summary>Clears the value of the "bb" field</summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void ClearBb() {
-          _hasBits0 &= ~1;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override bool Equals(object other) {
-          return Equals(other as NestedMessage);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool Equals(NestedMessage other) {
-          if (ReferenceEquals(other, null)) {
-            return false;
-          }
-          if (ReferenceEquals(other, this)) {
-            return true;
-          }
-          if (Bb != other.Bb) return false;
-          return Equals(_unknownFields, other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override int GetHashCode() {
-          int hash = 1;
-          if (HasBb) hash ^= Bb.GetHashCode();
-          if (_unknownFields != null) {
-            hash ^= _unknownFields.GetHashCode();
-          }
-          return hash;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override string ToString() {
-          return pb::JsonFormatter.ToDiagnosticString(this);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void WriteTo(pb::CodedOutputStream output) {
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          output.WriteRawMessage(this);
-        #else
-          if (HasBb) {
-            output.WriteRawTag(8);
-            output.WriteInt32(Bb);
-          }
-          if (_unknownFields != null) {
-            _unknownFields.WriteTo(output);
-          }
-        #endif
-        }
-
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-          if (HasBb) {
-            output.WriteRawTag(8);
-            output.WriteInt32(Bb);
-          }
-          if (_unknownFields != null) {
-            _unknownFields.WriteTo(ref output);
-          }
-        }
-        #endif
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public int CalculateSize() {
-          int size = 0;
-          if (HasBb) {
-            size += 1 + pb::CodedOutputStream.ComputeInt32Size(Bb);
-          }
-          if (_unknownFields != null) {
-            size += _unknownFields.CalculateSize();
-          }
-          return size;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(NestedMessage other) {
-          if (other == null) {
-            return;
-          }
-          if (other.HasBb) {
-            Bb = other.Bb;
-          }
-          _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(pb::CodedInputStream input) {
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          input.ReadRawMessage(this);
-        #else
-          uint tag;
-          while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
-              default:
-                _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-                break;
-              case 8: {
-                Bb = input.ReadInt32();
-                break;
-              }
-            }
-          }
-        #endif
-        }
-
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-          uint tag;
-          while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
-              default:
-                _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-                break;
-              case 8: {
-                Bb = input.ReadInt32();
-                break;
-              }
-            }
-          }
-        }
-        #endif
-
-      }
-
-    }
-    #endregion
-
-  }
-
-  public sealed partial class TestProto3OptionalMessage : pb::IMessage<TestProto3OptionalMessage>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<TestProto3OptionalMessage> _parser = new pb::MessageParser<TestProto3OptionalMessage>(() => new TestProto3OptionalMessage());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<TestProto3OptionalMessage> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::ProtobufUnittest.UnittestProto3OptionalReflection.Descriptor.MessageTypes[1]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestProto3OptionalMessage() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestProto3OptionalMessage(TestProto3OptionalMessage other) : this() {
-      nestedMessage_ = other.nestedMessage_ != null ? other.nestedMessage_.Clone() : null;
-      optionalNestedMessage_ = other.optionalNestedMessage_ != null ? other.optionalNestedMessage_.Clone() : null;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestProto3OptionalMessage Clone() {
-      return new TestProto3OptionalMessage(this);
-    }
-
-    /// <summary>Field number for the "nested_message" field.</summary>
-    public const int NestedMessageFieldNumber = 1;
-    private global::ProtobufUnittest.TestProto3OptionalMessage.Types.NestedMessage nestedMessage_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::ProtobufUnittest.TestProto3OptionalMessage.Types.NestedMessage NestedMessage {
-      get { return nestedMessage_; }
-      set {
-        nestedMessage_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "optional_nested_message" field.</summary>
-    public const int OptionalNestedMessageFieldNumber = 2;
-    private global::ProtobufUnittest.TestProto3OptionalMessage.Types.NestedMessage optionalNestedMessage_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::ProtobufUnittest.TestProto3OptionalMessage.Types.NestedMessage OptionalNestedMessage {
-      get { return optionalNestedMessage_; }
-      set {
-        optionalNestedMessage_ = value;
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as TestProto3OptionalMessage);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(TestProto3OptionalMessage other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (!object.Equals(NestedMessage, other.NestedMessage)) return false;
-      if (!object.Equals(OptionalNestedMessage, other.OptionalNestedMessage)) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (nestedMessage_ != null) hash ^= NestedMessage.GetHashCode();
-      if (optionalNestedMessage_ != null) hash ^= OptionalNestedMessage.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (nestedMessage_ != null) {
-        output.WriteRawTag(10);
-        output.WriteMessage(NestedMessage);
-      }
-      if (optionalNestedMessage_ != null) {
-        output.WriteRawTag(18);
-        output.WriteMessage(OptionalNestedMessage);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (nestedMessage_ != null) {
-        output.WriteRawTag(10);
-        output.WriteMessage(NestedMessage);
-      }
-      if (optionalNestedMessage_ != null) {
-        output.WriteRawTag(18);
-        output.WriteMessage(OptionalNestedMessage);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (nestedMessage_ != null) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(NestedMessage);
-      }
-      if (optionalNestedMessage_ != null) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(OptionalNestedMessage);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(TestProto3OptionalMessage other) {
-      if (other == null) {
-        return;
-      }
-      if (other.nestedMessage_ != null) {
-        if (nestedMessage_ == null) {
-          NestedMessage = new global::ProtobufUnittest.TestProto3OptionalMessage.Types.NestedMessage();
-        }
-        NestedMessage.MergeFrom(other.NestedMessage);
-      }
-      if (other.optionalNestedMessage_ != null) {
-        if (optionalNestedMessage_ == null) {
-          OptionalNestedMessage = new global::ProtobufUnittest.TestProto3OptionalMessage.Types.NestedMessage();
-        }
-        OptionalNestedMessage.MergeFrom(other.OptionalNestedMessage);
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 10: {
-            if (nestedMessage_ == null) {
-              NestedMessage = new global::ProtobufUnittest.TestProto3OptionalMessage.Types.NestedMessage();
-            }
-            input.ReadMessage(NestedMessage);
-            break;
-          }
-          case 18: {
-            if (optionalNestedMessage_ == null) {
-              OptionalNestedMessage = new global::ProtobufUnittest.TestProto3OptionalMessage.Types.NestedMessage();
-            }
-            input.ReadMessage(OptionalNestedMessage);
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 10: {
-            if (nestedMessage_ == null) {
-              NestedMessage = new global::ProtobufUnittest.TestProto3OptionalMessage.Types.NestedMessage();
-            }
-            input.ReadMessage(NestedMessage);
-            break;
-          }
-          case 18: {
-            if (optionalNestedMessage_ == null) {
-              OptionalNestedMessage = new global::ProtobufUnittest.TestProto3OptionalMessage.Types.NestedMessage();
-            }
-            input.ReadMessage(OptionalNestedMessage);
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-    #region Nested types
-    /// <summary>Container for nested types declared in the TestProto3OptionalMessage message type.</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static partial class Types {
-      public sealed partial class NestedMessage : pb::IMessage<NestedMessage>
-      #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          , pb::IBufferMessage
-      #endif
-      {
-        private static readonly pb::MessageParser<NestedMessage> _parser = new pb::MessageParser<NestedMessage>(() => new NestedMessage());
-        private pb::UnknownFieldSet _unknownFields;
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static pb::MessageParser<NestedMessage> Parser { get { return _parser; } }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static pbr::MessageDescriptor Descriptor {
-          get { return global::ProtobufUnittest.TestProto3OptionalMessage.Descriptor.NestedTypes[0]; }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        pbr::MessageDescriptor pb::IMessage.Descriptor {
-          get { return Descriptor; }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public NestedMessage() {
-          OnConstruction();
-        }
-
-        partial void OnConstruction();
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public NestedMessage(NestedMessage other) : this() {
-          s_ = other.s_;
-          _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public NestedMessage Clone() {
-          return new NestedMessage(this);
-        }
-
-        /// <summary>Field number for the "s" field.</summary>
-        public const int SFieldNumber = 1;
-        private string s_ = "";
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public string S {
-          get { return s_; }
-          set {
-            s_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-          }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override bool Equals(object other) {
-          return Equals(other as NestedMessage);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool Equals(NestedMessage other) {
-          if (ReferenceEquals(other, null)) {
-            return false;
-          }
-          if (ReferenceEquals(other, this)) {
-            return true;
-          }
-          if (S != other.S) return false;
-          return Equals(_unknownFields, other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override int GetHashCode() {
-          int hash = 1;
-          if (S.Length != 0) hash ^= S.GetHashCode();
-          if (_unknownFields != null) {
-            hash ^= _unknownFields.GetHashCode();
-          }
-          return hash;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override string ToString() {
-          return pb::JsonFormatter.ToDiagnosticString(this);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void WriteTo(pb::CodedOutputStream output) {
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          output.WriteRawMessage(this);
-        #else
-          if (S.Length != 0) {
-            output.WriteRawTag(10);
-            output.WriteString(S);
-          }
-          if (_unknownFields != null) {
-            _unknownFields.WriteTo(output);
-          }
-        #endif
-        }
-
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-          if (S.Length != 0) {
-            output.WriteRawTag(10);
-            output.WriteString(S);
-          }
-          if (_unknownFields != null) {
-            _unknownFields.WriteTo(ref output);
-          }
-        }
-        #endif
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public int CalculateSize() {
-          int size = 0;
-          if (S.Length != 0) {
-            size += 1 + pb::CodedOutputStream.ComputeStringSize(S);
-          }
-          if (_unknownFields != null) {
-            size += _unknownFields.CalculateSize();
-          }
-          return size;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(NestedMessage other) {
-          if (other == null) {
-            return;
-          }
-          if (other.S.Length != 0) {
-            S = other.S;
-          }
-          _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(pb::CodedInputStream input) {
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          input.ReadRawMessage(this);
-        #else
-          uint tag;
-          while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
-              default:
-                _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-                break;
-              case 10: {
-                S = input.ReadString();
-                break;
-              }
-            }
-          }
-        #endif
-        }
-
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-          uint tag;
-          while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
-              default:
-                _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-                break;
-              case 10: {
-                S = input.ReadString();
-                break;
-              }
-            }
-          }
-        }
-        #endif
-
-      }
-
-    }
-    #endregion
-
-  }
-
-  public sealed partial class Proto3OptionalExtensions : pb::IMessage<Proto3OptionalExtensions>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<Proto3OptionalExtensions> _parser = new pb::MessageParser<Proto3OptionalExtensions>(() => new Proto3OptionalExtensions());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<Proto3OptionalExtensions> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::ProtobufUnittest.UnittestProto3OptionalReflection.Descriptor.MessageTypes[2]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Proto3OptionalExtensions() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Proto3OptionalExtensions(Proto3OptionalExtensions other) : this() {
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Proto3OptionalExtensions Clone() {
-      return new Proto3OptionalExtensions(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as Proto3OptionalExtensions);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(Proto3OptionalExtensions other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(Proto3OptionalExtensions other) {
-      if (other == null) {
-        return;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-        }
-      }
-    }
-    #endif
-
-    #region Extensions
-    /// <summary>Container for extensions for other messages declared in the Proto3OptionalExtensions message type.</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static partial class Extensions {
-      public static readonly pb::Extension<global::Google.Protobuf.Reflection.MessageOptions, int> ExtNoOptional =
-        new pb::Extension<global::Google.Protobuf.Reflection.MessageOptions, int>(355886728, pb::FieldCodec.ForInt32(2847093824, 0));
-      public static readonly pb::Extension<global::Google.Protobuf.Reflection.MessageOptions, int> ExtWithOptional =
-        new pb::Extension<global::Google.Protobuf.Reflection.MessageOptions, int>(355886729, pb::FieldCodec.ForInt32(2847093832, 0));
-    }
-    #endregion
-
-  }
-
-  #endregion
-
-}
-
-#endregion Designer generated code
diff --git a/libs/protobuf/csharp/src/Google.Protobuf.Test.TestProtos/UnittestSelfreferentialOptions.cs b/libs/protobuf/csharp/src/Google.Protobuf.Test.TestProtos/UnittestSelfreferentialOptions.cs
deleted file mode 100644
index e1118c9..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf.Test.TestProtos/UnittestSelfreferentialOptions.cs
+++ /dev/null
@@ -1,379 +0,0 @@
-// <auto-generated>
-//     Generated by the protocol buffer compiler.  DO NOT EDIT!
-//     source: unittest_selfreferential_options.proto
-// </auto-generated>
-#pragma warning disable 1591, 0612, 3021, 8981
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-namespace UnitTest.Issues.TestProtos.SelfreferentialOptions {
-
-  /// <summary>Holder for reflection information generated from unittest_selfreferential_options.proto</summary>
-  public static partial class UnittestSelfreferentialOptionsReflection {
-
-    #region Descriptor
-    /// <summary>File descriptor for unittest_selfreferential_options.proto</summary>
-    public static pbr::FileDescriptor Descriptor {
-      get { return descriptor; }
-    }
-    private static pbr::FileDescriptor descriptor;
-
-    static UnittestSelfreferentialOptionsReflection() {
-      byte[] descriptorData = global::System.Convert.FromBase64String(
-          string.Concat(
-            "CiZ1bml0dGVzdF9zZWxmcmVmZXJlbnRpYWxfb3B0aW9ucy5wcm90bxIpcHJv",
-            "dG9idWZfdW5pdHRlc3Rfc2VsZnJlZmVyZW50aWFsX29wdGlvbnMaIGdvb2ds",
-            "ZS9wcm90b2J1Zi9kZXNjcmlwdG9yLnByb3RvIkwKCkZvb09wdGlvbnMSHgoH",
-            "aW50X29wdBgBIAEoBUINyj4KCAHAPgLKPgIIAxITCgNmb28YAiABKAVCBso+",
-            "AxDSCSoJCOgHEICAgIACOjkKC2Jhcl9vcHRpb25zEh0uZ29vZ2xlLnByb3Rv",
-            "YnVmLkZpZWxkT3B0aW9ucxjoByABKAVCBMA+0gk6agoLZm9vX29wdGlvbnMS",
-            "HS5nb29nbGUucHJvdG9idWYuRmllbGRPcHRpb25zGOkHIAEoCzI1LnByb3Rv",
-            "YnVmX3VuaXR0ZXN0X3NlbGZyZWZlcmVudGlhbF9vcHRpb25zLkZvb09wdGlv",
-            "bnM6SwoLZm9vX2ludF9vcHQSNS5wcm90b2J1Zl91bml0dGVzdF9zZWxmcmVm",
-            "ZXJlbnRpYWxfb3B0aW9ucy5Gb29PcHRpb25zGOgHIAEoBTqCAQoLZm9vX2Zv",
-            "b19vcHQSNS5wcm90b2J1Zl91bml0dGVzdF9zZWxmcmVmZXJlbnRpYWxfb3B0",
-            "aW9ucy5Gb29PcHRpb25zGOkHIAEoCzI1LnByb3RvYnVmX3VuaXR0ZXN0X3Nl",
-            "bGZyZWZlcmVudGlhbF9vcHRpb25zLkZvb09wdGlvbnNCNKoCMVVuaXRUZXN0",
-            "Lklzc3Vlcy5UZXN0UHJvdG9zLlNlbGZyZWZlcmVudGlhbE9wdGlvbnM="));
-      descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-          new pbr::FileDescriptor[] { global::Google.Protobuf.Reflection.DescriptorReflection.Descriptor, },
-          new pbr::GeneratedClrTypeInfo(null, new pb::Extension[] { UnittestSelfreferentialOptionsExtensions.BarOptions, UnittestSelfreferentialOptionsExtensions.FooOptions, UnittestSelfreferentialOptionsExtensions.FooIntOpt, UnittestSelfreferentialOptionsExtensions.FooFooOpt }, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::UnitTest.Issues.TestProtos.SelfreferentialOptions.FooOptions), global::UnitTest.Issues.TestProtos.SelfreferentialOptions.FooOptions.Parser, new[]{ "IntOpt", "Foo" }, null, null, null, null)
-          }));
-    }
-    #endregion
-
-  }
-  /// <summary>Holder for extension identifiers generated from the top level of unittest_selfreferential_options.proto</summary>
-  public static partial class UnittestSelfreferentialOptionsExtensions {
-    /// <summary>
-    /// Custom field option used on the definition of that field option.
-    /// </summary>
-    public static readonly pb::Extension<global::Google.Protobuf.Reflection.FieldOptions, int> BarOptions =
-      new pb::Extension<global::Google.Protobuf.Reflection.FieldOptions, int>(1000, pb::FieldCodec.ForInt32(8000, 0));
-    public static readonly pb::Extension<global::Google.Protobuf.Reflection.FieldOptions, global::UnitTest.Issues.TestProtos.SelfreferentialOptions.FooOptions> FooOptions =
-      new pb::Extension<global::Google.Protobuf.Reflection.FieldOptions, global::UnitTest.Issues.TestProtos.SelfreferentialOptions.FooOptions>(1001, pb::FieldCodec.ForMessage(8010, global::UnitTest.Issues.TestProtos.SelfreferentialOptions.FooOptions.Parser));
-    public static readonly pb::Extension<global::UnitTest.Issues.TestProtos.SelfreferentialOptions.FooOptions, int> FooIntOpt =
-      new pb::Extension<global::UnitTest.Issues.TestProtos.SelfreferentialOptions.FooOptions, int>(1000, pb::FieldCodec.ForInt32(8000, 0));
-    public static readonly pb::Extension<global::UnitTest.Issues.TestProtos.SelfreferentialOptions.FooOptions, global::UnitTest.Issues.TestProtos.SelfreferentialOptions.FooOptions> FooFooOpt =
-      new pb::Extension<global::UnitTest.Issues.TestProtos.SelfreferentialOptions.FooOptions, global::UnitTest.Issues.TestProtos.SelfreferentialOptions.FooOptions>(1001, pb::FieldCodec.ForMessage(8010, global::UnitTest.Issues.TestProtos.SelfreferentialOptions.FooOptions.Parser));
-  }
-
-  #region Messages
-  public sealed partial class FooOptions : pb::IExtendableMessage<FooOptions>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<FooOptions> _parser = new pb::MessageParser<FooOptions>(() => new FooOptions());
-    private pb::UnknownFieldSet _unknownFields;
-    private pb::ExtensionSet<FooOptions> _extensions;
-    private pb::ExtensionSet<FooOptions> _Extensions { get { return _extensions; } }
-    private int _hasBits0;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<FooOptions> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::UnitTest.Issues.TestProtos.SelfreferentialOptions.UnittestSelfreferentialOptionsReflection.Descriptor.MessageTypes[0]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public FooOptions() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public FooOptions(FooOptions other) : this() {
-      _hasBits0 = other._hasBits0;
-      intOpt_ = other.intOpt_;
-      foo_ = other.foo_;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-      _extensions = pb::ExtensionSet.Clone(other._extensions);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public FooOptions Clone() {
-      return new FooOptions(this);
-    }
-
-    /// <summary>Field number for the "int_opt" field.</summary>
-    public const int IntOptFieldNumber = 1;
-    private readonly static int IntOptDefaultValue = 0;
-
-    private int intOpt_;
-    /// <summary>
-    /// Custom field option used in definition of the extension message.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int IntOpt {
-      get { if ((_hasBits0 & 1) != 0) { return intOpt_; } else { return IntOptDefaultValue; } }
-      set {
-        _hasBits0 |= 1;
-        intOpt_ = value;
-      }
-    }
-    /// <summary>Gets whether the "int_opt" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasIntOpt {
-      get { return (_hasBits0 & 1) != 0; }
-    }
-    /// <summary>Clears the value of the "int_opt" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearIntOpt() {
-      _hasBits0 &= ~1;
-    }
-
-    /// <summary>Field number for the "foo" field.</summary>
-    public const int FooFieldNumber = 2;
-    private readonly static int FooDefaultValue = 0;
-
-    private int foo_;
-    /// <summary>
-    /// Custom field option used in definition of the custom option's message.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int Foo {
-      get { if ((_hasBits0 & 2) != 0) { return foo_; } else { return FooDefaultValue; } }
-      set {
-        _hasBits0 |= 2;
-        foo_ = value;
-      }
-    }
-    /// <summary>Gets whether the "foo" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasFoo {
-      get { return (_hasBits0 & 2) != 0; }
-    }
-    /// <summary>Clears the value of the "foo" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearFoo() {
-      _hasBits0 &= ~2;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as FooOptions);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(FooOptions other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (IntOpt != other.IntOpt) return false;
-      if (Foo != other.Foo) return false;
-      if (!Equals(_extensions, other._extensions)) {
-        return false;
-      }
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (HasIntOpt) hash ^= IntOpt.GetHashCode();
-      if (HasFoo) hash ^= Foo.GetHashCode();
-      if (_extensions != null) {
-        hash ^= _extensions.GetHashCode();
-      }
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (HasIntOpt) {
-        output.WriteRawTag(8);
-        output.WriteInt32(IntOpt);
-      }
-      if (HasFoo) {
-        output.WriteRawTag(16);
-        output.WriteInt32(Foo);
-      }
-      if (_extensions != null) {
-        _extensions.WriteTo(output);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (HasIntOpt) {
-        output.WriteRawTag(8);
-        output.WriteInt32(IntOpt);
-      }
-      if (HasFoo) {
-        output.WriteRawTag(16);
-        output.WriteInt32(Foo);
-      }
-      if (_extensions != null) {
-        _extensions.WriteTo(ref output);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (HasIntOpt) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(IntOpt);
-      }
-      if (HasFoo) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(Foo);
-      }
-      if (_extensions != null) {
-        size += _extensions.CalculateSize();
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(FooOptions other) {
-      if (other == null) {
-        return;
-      }
-      if (other.HasIntOpt) {
-        IntOpt = other.IntOpt;
-      }
-      if (other.HasFoo) {
-        Foo = other.Foo;
-      }
-      pb::ExtensionSet.MergeFrom(ref _extensions, other._extensions);
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            if (!pb::ExtensionSet.TryMergeFieldFrom(ref _extensions, input)) {
-              _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            }
-            break;
-          case 8: {
-            IntOpt = input.ReadInt32();
-            break;
-          }
-          case 16: {
-            Foo = input.ReadInt32();
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            if (!pb::ExtensionSet.TryMergeFieldFrom(ref _extensions, ref input)) {
-              _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            }
-            break;
-          case 8: {
-            IntOpt = input.ReadInt32();
-            break;
-          }
-          case 16: {
-            Foo = input.ReadInt32();
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-    public TValue GetExtension<TValue>(pb::Extension<FooOptions, TValue> extension) {
-      return pb::ExtensionSet.Get(ref _extensions, extension);
-    }
-    public pbc::RepeatedField<TValue> GetExtension<TValue>(pb::RepeatedExtension<FooOptions, TValue> extension) {
-      return pb::ExtensionSet.Get(ref _extensions, extension);
-    }
-    public pbc::RepeatedField<TValue> GetOrInitializeExtension<TValue>(pb::RepeatedExtension<FooOptions, TValue> extension) {
-      return pb::ExtensionSet.GetOrInitialize(ref _extensions, extension);
-    }
-    public void SetExtension<TValue>(pb::Extension<FooOptions, TValue> extension, TValue value) {
-      pb::ExtensionSet.Set(ref _extensions, extension, value);
-    }
-    public bool HasExtension<TValue>(pb::Extension<FooOptions, TValue> extension) {
-      return pb::ExtensionSet.Has(ref _extensions, extension);
-    }
-    public void ClearExtension<TValue>(pb::Extension<FooOptions, TValue> extension) {
-      pb::ExtensionSet.Clear(ref _extensions, extension);
-    }
-    public void ClearExtension<TValue>(pb::RepeatedExtension<FooOptions, TValue> extension) {
-      pb::ExtensionSet.Clear(ref _extensions, extension);
-    }
-
-  }
-
-  #endregion
-
-}
-
-#endregion Designer generated code
diff --git a/libs/protobuf/csharp/src/Google.Protobuf.Test.TestProtos/UnittestWellKnownTypes.cs b/libs/protobuf/csharp/src/Google.Protobuf.Test.TestProtos/UnittestWellKnownTypes.cs
deleted file mode 100644
index 3ec8d35..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf.Test.TestProtos/UnittestWellKnownTypes.cs
+++ /dev/null
@@ -1,3464 +0,0 @@
-// <auto-generated>
-//     Generated by the protocol buffer compiler.  DO NOT EDIT!
-//     source: google/protobuf/unittest_well_known_types.proto
-// </auto-generated>
-#pragma warning disable 1591, 0612, 3021, 8981
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-namespace Google.Protobuf.TestProtos {
-
-  /// <summary>Holder for reflection information generated from google/protobuf/unittest_well_known_types.proto</summary>
-  public static partial class UnittestWellKnownTypesReflection {
-
-    #region Descriptor
-    /// <summary>File descriptor for google/protobuf/unittest_well_known_types.proto</summary>
-    public static pbr::FileDescriptor Descriptor {
-      get { return descriptor; }
-    }
-    private static pbr::FileDescriptor descriptor;
-
-    static UnittestWellKnownTypesReflection() {
-      byte[] descriptorData = global::System.Convert.FromBase64String(
-          string.Concat(
-            "Ci9nb29nbGUvcHJvdG9idWYvdW5pdHRlc3Rfd2VsbF9rbm93bl90eXBlcy5w",
-            "cm90bxIRcHJvdG9idWZfdW5pdHRlc3QaGWdvb2dsZS9wcm90b2J1Zi9hbnku",
-            "cHJvdG8aGWdvb2dsZS9wcm90b2J1Zi9hcGkucHJvdG8aHmdvb2dsZS9wcm90",
-            "b2J1Zi9kdXJhdGlvbi5wcm90bxobZ29vZ2xlL3Byb3RvYnVmL2VtcHR5LnBy",
-            "b3RvGiBnb29nbGUvcHJvdG9idWYvZmllbGRfbWFzay5wcm90bxokZ29vZ2xl",
-            "L3Byb3RvYnVmL3NvdXJjZV9jb250ZXh0LnByb3RvGhxnb29nbGUvcHJvdG9i",
-            "dWYvc3RydWN0LnByb3RvGh9nb29nbGUvcHJvdG9idWYvdGltZXN0YW1wLnBy",
-            "b3RvGhpnb29nbGUvcHJvdG9idWYvdHlwZS5wcm90bxoeZ29vZ2xlL3Byb3Rv",
-            "YnVmL3dyYXBwZXJzLnByb3RvIr4HChJUZXN0V2VsbEtub3duVHlwZXMSJwoJ",
-            "YW55X2ZpZWxkGAEgASgLMhQuZ29vZ2xlLnByb3RvYnVmLkFueRInCglhcGlf",
-            "ZmllbGQYAiABKAsyFC5nb29nbGUucHJvdG9idWYuQXBpEjEKDmR1cmF0aW9u",
-            "X2ZpZWxkGAMgASgLMhkuZ29vZ2xlLnByb3RvYnVmLkR1cmF0aW9uEisKC2Vt",
-            "cHR5X2ZpZWxkGAQgASgLMhYuZ29vZ2xlLnByb3RvYnVmLkVtcHR5EjQKEGZp",
-            "ZWxkX21hc2tfZmllbGQYBSABKAsyGi5nb29nbGUucHJvdG9idWYuRmllbGRN",
-            "YXNrEjwKFHNvdXJjZV9jb250ZXh0X2ZpZWxkGAYgASgLMh4uZ29vZ2xlLnBy",
-            "b3RvYnVmLlNvdXJjZUNvbnRleHQSLQoMc3RydWN0X2ZpZWxkGAcgASgLMhcu",
-            "Z29vZ2xlLnByb3RvYnVmLlN0cnVjdBIzCg90aW1lc3RhbXBfZmllbGQYCCAB",
-            "KAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wEikKCnR5cGVfZmllbGQY",
-            "CSABKAsyFS5nb29nbGUucHJvdG9idWYuVHlwZRIyCgxkb3VibGVfZmllbGQY",
-            "CiABKAsyHC5nb29nbGUucHJvdG9idWYuRG91YmxlVmFsdWUSMAoLZmxvYXRf",
-            "ZmllbGQYCyABKAsyGy5nb29nbGUucHJvdG9idWYuRmxvYXRWYWx1ZRIwCgtp",
-            "bnQ2NF9maWVsZBgMIAEoCzIbLmdvb2dsZS5wcm90b2J1Zi5JbnQ2NFZhbHVl",
-            "EjIKDHVpbnQ2NF9maWVsZBgNIAEoCzIcLmdvb2dsZS5wcm90b2J1Zi5VSW50",
-            "NjRWYWx1ZRIwCgtpbnQzMl9maWVsZBgOIAEoCzIbLmdvb2dsZS5wcm90b2J1",
-            "Zi5JbnQzMlZhbHVlEjIKDHVpbnQzMl9maWVsZBgPIAEoCzIcLmdvb2dsZS5w",
-            "cm90b2J1Zi5VSW50MzJWYWx1ZRIuCgpib29sX2ZpZWxkGBAgASgLMhouZ29v",
-            "Z2xlLnByb3RvYnVmLkJvb2xWYWx1ZRIyCgxzdHJpbmdfZmllbGQYESABKAsy",
-            "HC5nb29nbGUucHJvdG9idWYuU3RyaW5nVmFsdWUSMAoLYnl0ZXNfZmllbGQY",
-            "EiABKAsyGy5nb29nbGUucHJvdG9idWYuQnl0ZXNWYWx1ZRIrCgt2YWx1ZV9m",
-            "aWVsZBgTIAEoCzIWLmdvb2dsZS5wcm90b2J1Zi5WYWx1ZSKVBwoWUmVwZWF0",
-            "ZWRXZWxsS25vd25UeXBlcxInCglhbnlfZmllbGQYASADKAsyFC5nb29nbGUu",
-            "cHJvdG9idWYuQW55EicKCWFwaV9maWVsZBgCIAMoCzIULmdvb2dsZS5wcm90",
-            "b2J1Zi5BcGkSMQoOZHVyYXRpb25fZmllbGQYAyADKAsyGS5nb29nbGUucHJv",
-            "dG9idWYuRHVyYXRpb24SKwoLZW1wdHlfZmllbGQYBCADKAsyFi5nb29nbGUu",
-            "cHJvdG9idWYuRW1wdHkSNAoQZmllbGRfbWFza19maWVsZBgFIAMoCzIaLmdv",
-            "b2dsZS5wcm90b2J1Zi5GaWVsZE1hc2sSPAoUc291cmNlX2NvbnRleHRfZmll",
-            "bGQYBiADKAsyHi5nb29nbGUucHJvdG9idWYuU291cmNlQ29udGV4dBItCgxz",
-            "dHJ1Y3RfZmllbGQYByADKAsyFy5nb29nbGUucHJvdG9idWYuU3RydWN0EjMK",
-            "D3RpbWVzdGFtcF9maWVsZBgIIAMoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1l",
-            "c3RhbXASKQoKdHlwZV9maWVsZBgJIAMoCzIVLmdvb2dsZS5wcm90b2J1Zi5U",
-            "eXBlEjIKDGRvdWJsZV9maWVsZBgKIAMoCzIcLmdvb2dsZS5wcm90b2J1Zi5E",
-            "b3VibGVWYWx1ZRIwCgtmbG9hdF9maWVsZBgLIAMoCzIbLmdvb2dsZS5wcm90",
-            "b2J1Zi5GbG9hdFZhbHVlEjAKC2ludDY0X2ZpZWxkGAwgAygLMhsuZ29vZ2xl",
-            "LnByb3RvYnVmLkludDY0VmFsdWUSMgoMdWludDY0X2ZpZWxkGA0gAygLMhwu",
-            "Z29vZ2xlLnByb3RvYnVmLlVJbnQ2NFZhbHVlEjAKC2ludDMyX2ZpZWxkGA4g",
-            "AygLMhsuZ29vZ2xlLnByb3RvYnVmLkludDMyVmFsdWUSMgoMdWludDMyX2Zp",
-            "ZWxkGA8gAygLMhwuZ29vZ2xlLnByb3RvYnVmLlVJbnQzMlZhbHVlEi4KCmJv",
-            "b2xfZmllbGQYECADKAsyGi5nb29nbGUucHJvdG9idWYuQm9vbFZhbHVlEjIK",
-            "DHN0cmluZ19maWVsZBgRIAMoCzIcLmdvb2dsZS5wcm90b2J1Zi5TdHJpbmdW",
-            "YWx1ZRIwCgtieXRlc19maWVsZBgSIAMoCzIbLmdvb2dsZS5wcm90b2J1Zi5C",
-            "eXRlc1ZhbHVlIsUHChNPbmVvZldlbGxLbm93blR5cGVzEikKCWFueV9maWVs",
-            "ZBgBIAEoCzIULmdvb2dsZS5wcm90b2J1Zi5BbnlIABIpCglhcGlfZmllbGQY",
-            "AiABKAsyFC5nb29nbGUucHJvdG9idWYuQXBpSAASMwoOZHVyYXRpb25fZmll",
-            "bGQYAyABKAsyGS5nb29nbGUucHJvdG9idWYuRHVyYXRpb25IABItCgtlbXB0",
-            "eV9maWVsZBgEIAEoCzIWLmdvb2dsZS5wcm90b2J1Zi5FbXB0eUgAEjYKEGZp",
-            "ZWxkX21hc2tfZmllbGQYBSABKAsyGi5nb29nbGUucHJvdG9idWYuRmllbGRN",
-            "YXNrSAASPgoUc291cmNlX2NvbnRleHRfZmllbGQYBiABKAsyHi5nb29nbGUu",
-            "cHJvdG9idWYuU291cmNlQ29udGV4dEgAEi8KDHN0cnVjdF9maWVsZBgHIAEo",
-            "CzIXLmdvb2dsZS5wcm90b2J1Zi5TdHJ1Y3RIABI1Cg90aW1lc3RhbXBfZmll",
-            "bGQYCCABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wSAASKwoKdHlw",
-            "ZV9maWVsZBgJIAEoCzIVLmdvb2dsZS5wcm90b2J1Zi5UeXBlSAASNAoMZG91",
-            "YmxlX2ZpZWxkGAogASgLMhwuZ29vZ2xlLnByb3RvYnVmLkRvdWJsZVZhbHVl",
-            "SAASMgoLZmxvYXRfZmllbGQYCyABKAsyGy5nb29nbGUucHJvdG9idWYuRmxv",
-            "YXRWYWx1ZUgAEjIKC2ludDY0X2ZpZWxkGAwgASgLMhsuZ29vZ2xlLnByb3Rv",
-            "YnVmLkludDY0VmFsdWVIABI0Cgx1aW50NjRfZmllbGQYDSABKAsyHC5nb29n",
-            "bGUucHJvdG9idWYuVUludDY0VmFsdWVIABIyCgtpbnQzMl9maWVsZBgOIAEo",
-            "CzIbLmdvb2dsZS5wcm90b2J1Zi5JbnQzMlZhbHVlSAASNAoMdWludDMyX2Zp",
-            "ZWxkGA8gASgLMhwuZ29vZ2xlLnByb3RvYnVmLlVJbnQzMlZhbHVlSAASMAoK",
-            "Ym9vbF9maWVsZBgQIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5Cb29sVmFsdWVI",
-            "ABI0CgxzdHJpbmdfZmllbGQYESABKAsyHC5nb29nbGUucHJvdG9idWYuU3Ry",
-            "aW5nVmFsdWVIABIyCgtieXRlc19maWVsZBgSIAEoCzIbLmdvb2dsZS5wcm90",
-            "b2J1Zi5CeXRlc1ZhbHVlSABCDQoLb25lb2ZfZmllbGQilhYKEU1hcFdlbGxL",
-            "bm93blR5cGVzEkUKCWFueV9maWVsZBgBIAMoCzIyLnByb3RvYnVmX3VuaXR0",
-            "ZXN0Lk1hcFdlbGxLbm93blR5cGVzLkFueUZpZWxkRW50cnkSRQoJYXBpX2Zp",
-            "ZWxkGAIgAygLMjIucHJvdG9idWZfdW5pdHRlc3QuTWFwV2VsbEtub3duVHlw",
-            "ZXMuQXBpRmllbGRFbnRyeRJPCg5kdXJhdGlvbl9maWVsZBgDIAMoCzI3LnBy",
-            "b3RvYnVmX3VuaXR0ZXN0Lk1hcFdlbGxLbm93blR5cGVzLkR1cmF0aW9uRmll",
-            "bGRFbnRyeRJJCgtlbXB0eV9maWVsZBgEIAMoCzI0LnByb3RvYnVmX3VuaXR0",
-            "ZXN0Lk1hcFdlbGxLbm93blR5cGVzLkVtcHR5RmllbGRFbnRyeRJSChBmaWVs",
-            "ZF9tYXNrX2ZpZWxkGAUgAygLMjgucHJvdG9idWZfdW5pdHRlc3QuTWFwV2Vs",
-            "bEtub3duVHlwZXMuRmllbGRNYXNrRmllbGRFbnRyeRJaChRzb3VyY2VfY29u",
-            "dGV4dF9maWVsZBgGIAMoCzI8LnByb3RvYnVmX3VuaXR0ZXN0Lk1hcFdlbGxL",
-            "bm93blR5cGVzLlNvdXJjZUNvbnRleHRGaWVsZEVudHJ5EksKDHN0cnVjdF9m",
-            "aWVsZBgHIAMoCzI1LnByb3RvYnVmX3VuaXR0ZXN0Lk1hcFdlbGxLbm93blR5",
-            "cGVzLlN0cnVjdEZpZWxkRW50cnkSUQoPdGltZXN0YW1wX2ZpZWxkGAggAygL",
-            "MjgucHJvdG9idWZfdW5pdHRlc3QuTWFwV2VsbEtub3duVHlwZXMuVGltZXN0",
-            "YW1wRmllbGRFbnRyeRJHCgp0eXBlX2ZpZWxkGAkgAygLMjMucHJvdG9idWZf",
-            "dW5pdHRlc3QuTWFwV2VsbEtub3duVHlwZXMuVHlwZUZpZWxkRW50cnkSSwoM",
-            "ZG91YmxlX2ZpZWxkGAogAygLMjUucHJvdG9idWZfdW5pdHRlc3QuTWFwV2Vs",
-            "bEtub3duVHlwZXMuRG91YmxlRmllbGRFbnRyeRJJCgtmbG9hdF9maWVsZBgL",
-            "IAMoCzI0LnByb3RvYnVmX3VuaXR0ZXN0Lk1hcFdlbGxLbm93blR5cGVzLkZs",
-            "b2F0RmllbGRFbnRyeRJJCgtpbnQ2NF9maWVsZBgMIAMoCzI0LnByb3RvYnVm",
-            "X3VuaXR0ZXN0Lk1hcFdlbGxLbm93blR5cGVzLkludDY0RmllbGRFbnRyeRJL",
-            "Cgx1aW50NjRfZmllbGQYDSADKAsyNS5wcm90b2J1Zl91bml0dGVzdC5NYXBX",
-            "ZWxsS25vd25UeXBlcy5VaW50NjRGaWVsZEVudHJ5EkkKC2ludDMyX2ZpZWxk",
-            "GA4gAygLMjQucHJvdG9idWZfdW5pdHRlc3QuTWFwV2VsbEtub3duVHlwZXMu",
-            "SW50MzJGaWVsZEVudHJ5EksKDHVpbnQzMl9maWVsZBgPIAMoCzI1LnByb3Rv",
-            "YnVmX3VuaXR0ZXN0Lk1hcFdlbGxLbm93blR5cGVzLlVpbnQzMkZpZWxkRW50",
-            "cnkSRwoKYm9vbF9maWVsZBgQIAMoCzIzLnByb3RvYnVmX3VuaXR0ZXN0Lk1h",
-            "cFdlbGxLbm93blR5cGVzLkJvb2xGaWVsZEVudHJ5EksKDHN0cmluZ19maWVs",
-            "ZBgRIAMoCzI1LnByb3RvYnVmX3VuaXR0ZXN0Lk1hcFdlbGxLbm93blR5cGVz",
-            "LlN0cmluZ0ZpZWxkRW50cnkSSQoLYnl0ZXNfZmllbGQYEiADKAsyNC5wcm90",
-            "b2J1Zl91bml0dGVzdC5NYXBXZWxsS25vd25UeXBlcy5CeXRlc0ZpZWxkRW50",
-            "cnkaRQoNQW55RmllbGRFbnRyeRILCgNrZXkYASABKAUSIwoFdmFsdWUYAiAB",
-            "KAsyFC5nb29nbGUucHJvdG9idWYuQW55OgI4ARpFCg1BcGlGaWVsZEVudHJ5",
-            "EgsKA2tleRgBIAEoBRIjCgV2YWx1ZRgCIAEoCzIULmdvb2dsZS5wcm90b2J1",
-            "Zi5BcGk6AjgBGk8KEkR1cmF0aW9uRmllbGRFbnRyeRILCgNrZXkYASABKAUS",
-            "KAoFdmFsdWUYAiABKAsyGS5nb29nbGUucHJvdG9idWYuRHVyYXRpb246AjgB",
-            "GkkKD0VtcHR5RmllbGRFbnRyeRILCgNrZXkYASABKAUSJQoFdmFsdWUYAiAB",
-            "KAsyFi5nb29nbGUucHJvdG9idWYuRW1wdHk6AjgBGlEKE0ZpZWxkTWFza0Zp",
-            "ZWxkRW50cnkSCwoDa2V5GAEgASgFEikKBXZhbHVlGAIgASgLMhouZ29vZ2xl",
-            "LnByb3RvYnVmLkZpZWxkTWFzazoCOAEaWQoXU291cmNlQ29udGV4dEZpZWxk",
-            "RW50cnkSCwoDa2V5GAEgASgFEi0KBXZhbHVlGAIgASgLMh4uZ29vZ2xlLnBy",
-            "b3RvYnVmLlNvdXJjZUNvbnRleHQ6AjgBGksKEFN0cnVjdEZpZWxkRW50cnkS",
-            "CwoDa2V5GAEgASgFEiYKBXZhbHVlGAIgASgLMhcuZ29vZ2xlLnByb3RvYnVm",
-            "LlN0cnVjdDoCOAEaUQoTVGltZXN0YW1wRmllbGRFbnRyeRILCgNrZXkYASAB",
-            "KAUSKQoFdmFsdWUYAiABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1w",
-            "OgI4ARpHCg5UeXBlRmllbGRFbnRyeRILCgNrZXkYASABKAUSJAoFdmFsdWUY",
-            "AiABKAsyFS5nb29nbGUucHJvdG9idWYuVHlwZToCOAEaUAoQRG91YmxlRmll",
-            "bGRFbnRyeRILCgNrZXkYASABKAUSKwoFdmFsdWUYAiABKAsyHC5nb29nbGUu",
-            "cHJvdG9idWYuRG91YmxlVmFsdWU6AjgBGk4KD0Zsb2F0RmllbGRFbnRyeRIL",
-            "CgNrZXkYASABKAUSKgoFdmFsdWUYAiABKAsyGy5nb29nbGUucHJvdG9idWYu",
-            "RmxvYXRWYWx1ZToCOAEaTgoPSW50NjRGaWVsZEVudHJ5EgsKA2tleRgBIAEo",
-            "BRIqCgV2YWx1ZRgCIAEoCzIbLmdvb2dsZS5wcm90b2J1Zi5JbnQ2NFZhbHVl",
-            "OgI4ARpQChBVaW50NjRGaWVsZEVudHJ5EgsKA2tleRgBIAEoBRIrCgV2YWx1",
-            "ZRgCIAEoCzIcLmdvb2dsZS5wcm90b2J1Zi5VSW50NjRWYWx1ZToCOAEaTgoP",
-            "SW50MzJGaWVsZEVudHJ5EgsKA2tleRgBIAEoBRIqCgV2YWx1ZRgCIAEoCzIb",
-            "Lmdvb2dsZS5wcm90b2J1Zi5JbnQzMlZhbHVlOgI4ARpQChBVaW50MzJGaWVs",
-            "ZEVudHJ5EgsKA2tleRgBIAEoBRIrCgV2YWx1ZRgCIAEoCzIcLmdvb2dsZS5w",
-            "cm90b2J1Zi5VSW50MzJWYWx1ZToCOAEaTAoOQm9vbEZpZWxkRW50cnkSCwoD",
-            "a2V5GAEgASgFEikKBXZhbHVlGAIgASgLMhouZ29vZ2xlLnByb3RvYnVmLkJv",
-            "b2xWYWx1ZToCOAEaUAoQU3RyaW5nRmllbGRFbnRyeRILCgNrZXkYASABKAUS",
-            "KwoFdmFsdWUYAiABKAsyHC5nb29nbGUucHJvdG9idWYuU3RyaW5nVmFsdWU6",
-            "AjgBGk4KD0J5dGVzRmllbGRFbnRyeRILCgNrZXkYASABKAUSKgoFdmFsdWUY",
-            "AiABKAsyGy5nb29nbGUucHJvdG9idWYuQnl0ZXNWYWx1ZToCOAFCOQoYY29t",
-            "Lmdvb2dsZS5wcm90b2J1Zi50ZXN0UAGqAhpHb29nbGUuUHJvdG9idWYuVGVz",
-            "dFByb3Rvc2IGcHJvdG8z"));
-      descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-          new pbr::FileDescriptor[] { global::Google.Protobuf.WellKnownTypes.AnyReflection.Descriptor, global::Google.Protobuf.WellKnownTypes.ApiReflection.Descriptor, global::Google.Protobuf.WellKnownTypes.DurationReflection.Descriptor, global::Google.Protobuf.WellKnownTypes.EmptyReflection.Descriptor, global::Google.Protobuf.WellKnownTypes.FieldMaskReflection.Descriptor, global::Google.Protobuf.WellKnownTypes.SourceContextReflection.Descriptor, global::Google.Protobuf.WellKnownTypes.StructReflection.Descriptor, global::Google.Protobuf.WellKnownTypes.TimestampReflection.Descriptor, global::Google.Protobuf.WellKnownTypes.TypeReflection.Descriptor, global::Google.Protobuf.WellKnownTypes.WrappersReflection.Descriptor, },
-          new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.TestWellKnownTypes), global::Google.Protobuf.TestProtos.TestWellKnownTypes.Parser, new[]{ "AnyField", "ApiField", "DurationField", "EmptyField", "FieldMaskField", "SourceContextField", "StructField", "TimestampField", "TypeField", "DoubleField", "FloatField", "Int64Field", "Uint64Field", "Int32Field", "Uint32Field", "BoolField", "StringField", "BytesField", "ValueField" }, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.RepeatedWellKnownTypes), global::Google.Protobuf.TestProtos.RepeatedWellKnownTypes.Parser, new[]{ "AnyField", "ApiField", "DurationField", "EmptyField", "FieldMaskField", "SourceContextField", "StructField", "TimestampField", "TypeField", "DoubleField", "FloatField", "Int64Field", "Uint64Field", "Int32Field", "Uint32Field", "BoolField", "StringField", "BytesField" }, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.OneofWellKnownTypes), global::Google.Protobuf.TestProtos.OneofWellKnownTypes.Parser, new[]{ "AnyField", "ApiField", "DurationField", "EmptyField", "FieldMaskField", "SourceContextField", "StructField", "TimestampField", "TypeField", "DoubleField", "FloatField", "Int64Field", "Uint64Field", "Int32Field", "Uint32Field", "BoolField", "StringField", "BytesField" }, new[]{ "OneofField" }, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.TestProtos.MapWellKnownTypes), global::Google.Protobuf.TestProtos.MapWellKnownTypes.Parser, new[]{ "AnyField", "ApiField", "DurationField", "EmptyField", "FieldMaskField", "SourceContextField", "StructField", "TimestampField", "TypeField", "DoubleField", "FloatField", "Int64Field", "Uint64Field", "Int32Field", "Uint32Field", "BoolField", "StringField", "BytesField" }, null, null, null, new pbr::GeneratedClrTypeInfo[] { null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, })
-          }));
-    }
-    #endregion
-
-  }
-  #region Messages
-  /// <summary>
-  /// Test that we can include all well-known types.
-  /// Each wrapper type is included separately, as languages
-  /// map handle different wrappers in different ways.
-  /// </summary>
-  public sealed partial class TestWellKnownTypes : pb::IMessage<TestWellKnownTypes>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<TestWellKnownTypes> _parser = new pb::MessageParser<TestWellKnownTypes>(() => new TestWellKnownTypes());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<TestWellKnownTypes> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.UnittestWellKnownTypesReflection.Descriptor.MessageTypes[0]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestWellKnownTypes() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestWellKnownTypes(TestWellKnownTypes other) : this() {
-      anyField_ = other.anyField_ != null ? other.anyField_.Clone() : null;
-      apiField_ = other.apiField_ != null ? other.apiField_.Clone() : null;
-      durationField_ = other.durationField_ != null ? other.durationField_.Clone() : null;
-      emptyField_ = other.emptyField_ != null ? other.emptyField_.Clone() : null;
-      fieldMaskField_ = other.fieldMaskField_ != null ? other.fieldMaskField_.Clone() : null;
-      sourceContextField_ = other.sourceContextField_ != null ? other.sourceContextField_.Clone() : null;
-      structField_ = other.structField_ != null ? other.structField_.Clone() : null;
-      timestampField_ = other.timestampField_ != null ? other.timestampField_.Clone() : null;
-      typeField_ = other.typeField_ != null ? other.typeField_.Clone() : null;
-      DoubleField = other.DoubleField;
-      FloatField = other.FloatField;
-      Int64Field = other.Int64Field;
-      Uint64Field = other.Uint64Field;
-      Int32Field = other.Int32Field;
-      Uint32Field = other.Uint32Field;
-      BoolField = other.BoolField;
-      StringField = other.StringField;
-      BytesField = other.BytesField;
-      valueField_ = other.valueField_ != null ? other.valueField_.Clone() : null;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public TestWellKnownTypes Clone() {
-      return new TestWellKnownTypes(this);
-    }
-
-    /// <summary>Field number for the "any_field" field.</summary>
-    public const int AnyFieldFieldNumber = 1;
-    private global::Google.Protobuf.WellKnownTypes.Any anyField_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.WellKnownTypes.Any AnyField {
-      get { return anyField_; }
-      set {
-        anyField_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "api_field" field.</summary>
-    public const int ApiFieldFieldNumber = 2;
-    private global::Google.Protobuf.WellKnownTypes.Api apiField_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.WellKnownTypes.Api ApiField {
-      get { return apiField_; }
-      set {
-        apiField_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "duration_field" field.</summary>
-    public const int DurationFieldFieldNumber = 3;
-    private global::Google.Protobuf.WellKnownTypes.Duration durationField_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.WellKnownTypes.Duration DurationField {
-      get { return durationField_; }
-      set {
-        durationField_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "empty_field" field.</summary>
-    public const int EmptyFieldFieldNumber = 4;
-    private global::Google.Protobuf.WellKnownTypes.Empty emptyField_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.WellKnownTypes.Empty EmptyField {
-      get { return emptyField_; }
-      set {
-        emptyField_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "field_mask_field" field.</summary>
-    public const int FieldMaskFieldFieldNumber = 5;
-    private global::Google.Protobuf.WellKnownTypes.FieldMask fieldMaskField_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.WellKnownTypes.FieldMask FieldMaskField {
-      get { return fieldMaskField_; }
-      set {
-        fieldMaskField_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "source_context_field" field.</summary>
-    public const int SourceContextFieldFieldNumber = 6;
-    private global::Google.Protobuf.WellKnownTypes.SourceContext sourceContextField_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.WellKnownTypes.SourceContext SourceContextField {
-      get { return sourceContextField_; }
-      set {
-        sourceContextField_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "struct_field" field.</summary>
-    public const int StructFieldFieldNumber = 7;
-    private global::Google.Protobuf.WellKnownTypes.Struct structField_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.WellKnownTypes.Struct StructField {
-      get { return structField_; }
-      set {
-        structField_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "timestamp_field" field.</summary>
-    public const int TimestampFieldFieldNumber = 8;
-    private global::Google.Protobuf.WellKnownTypes.Timestamp timestampField_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.WellKnownTypes.Timestamp TimestampField {
-      get { return timestampField_; }
-      set {
-        timestampField_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "type_field" field.</summary>
-    public const int TypeFieldFieldNumber = 9;
-    private global::Google.Protobuf.WellKnownTypes.Type typeField_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.WellKnownTypes.Type TypeField {
-      get { return typeField_; }
-      set {
-        typeField_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "double_field" field.</summary>
-    public const int DoubleFieldFieldNumber = 10;
-    private static readonly pb::FieldCodec<double?> _single_doubleField_codec = pb::FieldCodec.ForStructWrapper<double>(82);
-    private double? doubleField_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double? DoubleField {
-      get { return doubleField_; }
-      set {
-        doubleField_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "float_field" field.</summary>
-    public const int FloatFieldFieldNumber = 11;
-    private static readonly pb::FieldCodec<float?> _single_floatField_codec = pb::FieldCodec.ForStructWrapper<float>(90);
-    private float? floatField_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public float? FloatField {
-      get { return floatField_; }
-      set {
-        floatField_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "int64_field" field.</summary>
-    public const int Int64FieldFieldNumber = 12;
-    private static readonly pb::FieldCodec<long?> _single_int64Field_codec = pb::FieldCodec.ForStructWrapper<long>(98);
-    private long? int64Field_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public long? Int64Field {
-      get { return int64Field_; }
-      set {
-        int64Field_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "uint64_field" field.</summary>
-    public const int Uint64FieldFieldNumber = 13;
-    private static readonly pb::FieldCodec<ulong?> _single_uint64Field_codec = pb::FieldCodec.ForStructWrapper<ulong>(106);
-    private ulong? uint64Field_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ulong? Uint64Field {
-      get { return uint64Field_; }
-      set {
-        uint64Field_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "int32_field" field.</summary>
-    public const int Int32FieldFieldNumber = 14;
-    private static readonly pb::FieldCodec<int?> _single_int32Field_codec = pb::FieldCodec.ForStructWrapper<int>(114);
-    private int? int32Field_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int? Int32Field {
-      get { return int32Field_; }
-      set {
-        int32Field_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "uint32_field" field.</summary>
-    public const int Uint32FieldFieldNumber = 15;
-    private static readonly pb::FieldCodec<uint?> _single_uint32Field_codec = pb::FieldCodec.ForStructWrapper<uint>(122);
-    private uint? uint32Field_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public uint? Uint32Field {
-      get { return uint32Field_; }
-      set {
-        uint32Field_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "bool_field" field.</summary>
-    public const int BoolFieldFieldNumber = 16;
-    private static readonly pb::FieldCodec<bool?> _single_boolField_codec = pb::FieldCodec.ForStructWrapper<bool>(130);
-    private bool? boolField_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool? BoolField {
-      get { return boolField_; }
-      set {
-        boolField_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "string_field" field.</summary>
-    public const int StringFieldFieldNumber = 17;
-    private static readonly pb::FieldCodec<string> _single_stringField_codec = pb::FieldCodec.ForClassWrapper<string>(138);
-    private string stringField_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string StringField {
-      get { return stringField_; }
-      set {
-        stringField_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "bytes_field" field.</summary>
-    public const int BytesFieldFieldNumber = 18;
-    private static readonly pb::FieldCodec<pb::ByteString> _single_bytesField_codec = pb::FieldCodec.ForClassWrapper<pb::ByteString>(146);
-    private pb::ByteString bytesField_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pb::ByteString BytesField {
-      get { return bytesField_; }
-      set {
-        bytesField_ = value;
-      }
-    }
-
-
-    /// <summary>Field number for the "value_field" field.</summary>
-    public const int ValueFieldFieldNumber = 19;
-    private global::Google.Protobuf.WellKnownTypes.Value valueField_;
-    /// <summary>
-    /// Part of struct, but useful to be able to test separately
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.WellKnownTypes.Value ValueField {
-      get { return valueField_; }
-      set {
-        valueField_ = value;
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as TestWellKnownTypes);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(TestWellKnownTypes other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (!object.Equals(AnyField, other.AnyField)) return false;
-      if (!object.Equals(ApiField, other.ApiField)) return false;
-      if (!object.Equals(DurationField, other.DurationField)) return false;
-      if (!object.Equals(EmptyField, other.EmptyField)) return false;
-      if (!object.Equals(FieldMaskField, other.FieldMaskField)) return false;
-      if (!object.Equals(SourceContextField, other.SourceContextField)) return false;
-      if (!object.Equals(StructField, other.StructField)) return false;
-      if (!object.Equals(TimestampField, other.TimestampField)) return false;
-      if (!object.Equals(TypeField, other.TypeField)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.Equals(DoubleField, other.DoubleField)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseNullableSingleEqualityComparer.Equals(FloatField, other.FloatField)) return false;
-      if (Int64Field != other.Int64Field) return false;
-      if (Uint64Field != other.Uint64Field) return false;
-      if (Int32Field != other.Int32Field) return false;
-      if (Uint32Field != other.Uint32Field) return false;
-      if (BoolField != other.BoolField) return false;
-      if (StringField != other.StringField) return false;
-      if (BytesField != other.BytesField) return false;
-      if (!object.Equals(ValueField, other.ValueField)) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (anyField_ != null) hash ^= AnyField.GetHashCode();
-      if (apiField_ != null) hash ^= ApiField.GetHashCode();
-      if (durationField_ != null) hash ^= DurationField.GetHashCode();
-      if (emptyField_ != null) hash ^= EmptyField.GetHashCode();
-      if (fieldMaskField_ != null) hash ^= FieldMaskField.GetHashCode();
-      if (sourceContextField_ != null) hash ^= SourceContextField.GetHashCode();
-      if (structField_ != null) hash ^= StructField.GetHashCode();
-      if (timestampField_ != null) hash ^= TimestampField.GetHashCode();
-      if (typeField_ != null) hash ^= TypeField.GetHashCode();
-      if (doubleField_ != null) hash ^= pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.GetHashCode(DoubleField);
-      if (floatField_ != null) hash ^= pbc::ProtobufEqualityComparers.BitwiseNullableSingleEqualityComparer.GetHashCode(FloatField);
-      if (int64Field_ != null) hash ^= Int64Field.GetHashCode();
-      if (uint64Field_ != null) hash ^= Uint64Field.GetHashCode();
-      if (int32Field_ != null) hash ^= Int32Field.GetHashCode();
-      if (uint32Field_ != null) hash ^= Uint32Field.GetHashCode();
-      if (boolField_ != null) hash ^= BoolField.GetHashCode();
-      if (stringField_ != null) hash ^= StringField.GetHashCode();
-      if (bytesField_ != null) hash ^= BytesField.GetHashCode();
-      if (valueField_ != null) hash ^= ValueField.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (anyField_ != null) {
-        output.WriteRawTag(10);
-        output.WriteMessage(AnyField);
-      }
-      if (apiField_ != null) {
-        output.WriteRawTag(18);
-        output.WriteMessage(ApiField);
-      }
-      if (durationField_ != null) {
-        output.WriteRawTag(26);
-        output.WriteMessage(DurationField);
-      }
-      if (emptyField_ != null) {
-        output.WriteRawTag(34);
-        output.WriteMessage(EmptyField);
-      }
-      if (fieldMaskField_ != null) {
-        output.WriteRawTag(42);
-        output.WriteMessage(FieldMaskField);
-      }
-      if (sourceContextField_ != null) {
-        output.WriteRawTag(50);
-        output.WriteMessage(SourceContextField);
-      }
-      if (structField_ != null) {
-        output.WriteRawTag(58);
-        output.WriteMessage(StructField);
-      }
-      if (timestampField_ != null) {
-        output.WriteRawTag(66);
-        output.WriteMessage(TimestampField);
-      }
-      if (typeField_ != null) {
-        output.WriteRawTag(74);
-        output.WriteMessage(TypeField);
-      }
-      if (doubleField_ != null) {
-        _single_doubleField_codec.WriteTagAndValue(output, DoubleField);
-      }
-      if (floatField_ != null) {
-        _single_floatField_codec.WriteTagAndValue(output, FloatField);
-      }
-      if (int64Field_ != null) {
-        _single_int64Field_codec.WriteTagAndValue(output, Int64Field);
-      }
-      if (uint64Field_ != null) {
-        _single_uint64Field_codec.WriteTagAndValue(output, Uint64Field);
-      }
-      if (int32Field_ != null) {
-        _single_int32Field_codec.WriteTagAndValue(output, Int32Field);
-      }
-      if (uint32Field_ != null) {
-        _single_uint32Field_codec.WriteTagAndValue(output, Uint32Field);
-      }
-      if (boolField_ != null) {
-        _single_boolField_codec.WriteTagAndValue(output, BoolField);
-      }
-      if (stringField_ != null) {
-        _single_stringField_codec.WriteTagAndValue(output, StringField);
-      }
-      if (bytesField_ != null) {
-        _single_bytesField_codec.WriteTagAndValue(output, BytesField);
-      }
-      if (valueField_ != null) {
-        output.WriteRawTag(154, 1);
-        output.WriteMessage(ValueField);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (anyField_ != null) {
-        output.WriteRawTag(10);
-        output.WriteMessage(AnyField);
-      }
-      if (apiField_ != null) {
-        output.WriteRawTag(18);
-        output.WriteMessage(ApiField);
-      }
-      if (durationField_ != null) {
-        output.WriteRawTag(26);
-        output.WriteMessage(DurationField);
-      }
-      if (emptyField_ != null) {
-        output.WriteRawTag(34);
-        output.WriteMessage(EmptyField);
-      }
-      if (fieldMaskField_ != null) {
-        output.WriteRawTag(42);
-        output.WriteMessage(FieldMaskField);
-      }
-      if (sourceContextField_ != null) {
-        output.WriteRawTag(50);
-        output.WriteMessage(SourceContextField);
-      }
-      if (structField_ != null) {
-        output.WriteRawTag(58);
-        output.WriteMessage(StructField);
-      }
-      if (timestampField_ != null) {
-        output.WriteRawTag(66);
-        output.WriteMessage(TimestampField);
-      }
-      if (typeField_ != null) {
-        output.WriteRawTag(74);
-        output.WriteMessage(TypeField);
-      }
-      if (doubleField_ != null) {
-        _single_doubleField_codec.WriteTagAndValue(ref output, DoubleField);
-      }
-      if (floatField_ != null) {
-        _single_floatField_codec.WriteTagAndValue(ref output, FloatField);
-      }
-      if (int64Field_ != null) {
-        _single_int64Field_codec.WriteTagAndValue(ref output, Int64Field);
-      }
-      if (uint64Field_ != null) {
-        _single_uint64Field_codec.WriteTagAndValue(ref output, Uint64Field);
-      }
-      if (int32Field_ != null) {
-        _single_int32Field_codec.WriteTagAndValue(ref output, Int32Field);
-      }
-      if (uint32Field_ != null) {
-        _single_uint32Field_codec.WriteTagAndValue(ref output, Uint32Field);
-      }
-      if (boolField_ != null) {
-        _single_boolField_codec.WriteTagAndValue(ref output, BoolField);
-      }
-      if (stringField_ != null) {
-        _single_stringField_codec.WriteTagAndValue(ref output, StringField);
-      }
-      if (bytesField_ != null) {
-        _single_bytesField_codec.WriteTagAndValue(ref output, BytesField);
-      }
-      if (valueField_ != null) {
-        output.WriteRawTag(154, 1);
-        output.WriteMessage(ValueField);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (anyField_ != null) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(AnyField);
-      }
-      if (apiField_ != null) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(ApiField);
-      }
-      if (durationField_ != null) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(DurationField);
-      }
-      if (emptyField_ != null) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(EmptyField);
-      }
-      if (fieldMaskField_ != null) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(FieldMaskField);
-      }
-      if (sourceContextField_ != null) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(SourceContextField);
-      }
-      if (structField_ != null) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(StructField);
-      }
-      if (timestampField_ != null) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(TimestampField);
-      }
-      if (typeField_ != null) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(TypeField);
-      }
-      if (doubleField_ != null) {
-        size += _single_doubleField_codec.CalculateSizeWithTag(DoubleField);
-      }
-      if (floatField_ != null) {
-        size += _single_floatField_codec.CalculateSizeWithTag(FloatField);
-      }
-      if (int64Field_ != null) {
-        size += _single_int64Field_codec.CalculateSizeWithTag(Int64Field);
-      }
-      if (uint64Field_ != null) {
-        size += _single_uint64Field_codec.CalculateSizeWithTag(Uint64Field);
-      }
-      if (int32Field_ != null) {
-        size += _single_int32Field_codec.CalculateSizeWithTag(Int32Field);
-      }
-      if (uint32Field_ != null) {
-        size += _single_uint32Field_codec.CalculateSizeWithTag(Uint32Field);
-      }
-      if (boolField_ != null) {
-        size += _single_boolField_codec.CalculateSizeWithTag(BoolField);
-      }
-      if (stringField_ != null) {
-        size += _single_stringField_codec.CalculateSizeWithTag(StringField);
-      }
-      if (bytesField_ != null) {
-        size += _single_bytesField_codec.CalculateSizeWithTag(BytesField);
-      }
-      if (valueField_ != null) {
-        size += 2 + pb::CodedOutputStream.ComputeMessageSize(ValueField);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(TestWellKnownTypes other) {
-      if (other == null) {
-        return;
-      }
-      if (other.anyField_ != null) {
-        if (anyField_ == null) {
-          AnyField = new global::Google.Protobuf.WellKnownTypes.Any();
-        }
-        AnyField.MergeFrom(other.AnyField);
-      }
-      if (other.apiField_ != null) {
-        if (apiField_ == null) {
-          ApiField = new global::Google.Protobuf.WellKnownTypes.Api();
-        }
-        ApiField.MergeFrom(other.ApiField);
-      }
-      if (other.durationField_ != null) {
-        if (durationField_ == null) {
-          DurationField = new global::Google.Protobuf.WellKnownTypes.Duration();
-        }
-        DurationField.MergeFrom(other.DurationField);
-      }
-      if (other.emptyField_ != null) {
-        if (emptyField_ == null) {
-          EmptyField = new global::Google.Protobuf.WellKnownTypes.Empty();
-        }
-        EmptyField.MergeFrom(other.EmptyField);
-      }
-      if (other.fieldMaskField_ != null) {
-        if (fieldMaskField_ == null) {
-          FieldMaskField = new global::Google.Protobuf.WellKnownTypes.FieldMask();
-        }
-        FieldMaskField.MergeFrom(other.FieldMaskField);
-      }
-      if (other.sourceContextField_ != null) {
-        if (sourceContextField_ == null) {
-          SourceContextField = new global::Google.Protobuf.WellKnownTypes.SourceContext();
-        }
-        SourceContextField.MergeFrom(other.SourceContextField);
-      }
-      if (other.structField_ != null) {
-        if (structField_ == null) {
-          StructField = new global::Google.Protobuf.WellKnownTypes.Struct();
-        }
-        StructField.MergeFrom(other.StructField);
-      }
-      if (other.timestampField_ != null) {
-        if (timestampField_ == null) {
-          TimestampField = new global::Google.Protobuf.WellKnownTypes.Timestamp();
-        }
-        TimestampField.MergeFrom(other.TimestampField);
-      }
-      if (other.typeField_ != null) {
-        if (typeField_ == null) {
-          TypeField = new global::Google.Protobuf.WellKnownTypes.Type();
-        }
-        TypeField.MergeFrom(other.TypeField);
-      }
-      if (other.doubleField_ != null) {
-        if (doubleField_ == null || other.DoubleField != 0D) {
-          DoubleField = other.DoubleField;
-        }
-      }
-      if (other.floatField_ != null) {
-        if (floatField_ == null || other.FloatField != 0F) {
-          FloatField = other.FloatField;
-        }
-      }
-      if (other.int64Field_ != null) {
-        if (int64Field_ == null || other.Int64Field != 0L) {
-          Int64Field = other.Int64Field;
-        }
-      }
-      if (other.uint64Field_ != null) {
-        if (uint64Field_ == null || other.Uint64Field != 0UL) {
-          Uint64Field = other.Uint64Field;
-        }
-      }
-      if (other.int32Field_ != null) {
-        if (int32Field_ == null || other.Int32Field != 0) {
-          Int32Field = other.Int32Field;
-        }
-      }
-      if (other.uint32Field_ != null) {
-        if (uint32Field_ == null || other.Uint32Field != 0) {
-          Uint32Field = other.Uint32Field;
-        }
-      }
-      if (other.boolField_ != null) {
-        if (boolField_ == null || other.BoolField != false) {
-          BoolField = other.BoolField;
-        }
-      }
-      if (other.stringField_ != null) {
-        if (stringField_ == null || other.StringField != "") {
-          StringField = other.StringField;
-        }
-      }
-      if (other.bytesField_ != null) {
-        if (bytesField_ == null || other.BytesField != pb::ByteString.Empty) {
-          BytesField = other.BytesField;
-        }
-      }
-      if (other.valueField_ != null) {
-        if (valueField_ == null) {
-          ValueField = new global::Google.Protobuf.WellKnownTypes.Value();
-        }
-        ValueField.MergeFrom(other.ValueField);
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 10: {
-            if (anyField_ == null) {
-              AnyField = new global::Google.Protobuf.WellKnownTypes.Any();
-            }
-            input.ReadMessage(AnyField);
-            break;
-          }
-          case 18: {
-            if (apiField_ == null) {
-              ApiField = new global::Google.Protobuf.WellKnownTypes.Api();
-            }
-            input.ReadMessage(ApiField);
-            break;
-          }
-          case 26: {
-            if (durationField_ == null) {
-              DurationField = new global::Google.Protobuf.WellKnownTypes.Duration();
-            }
-            input.ReadMessage(DurationField);
-            break;
-          }
-          case 34: {
-            if (emptyField_ == null) {
-              EmptyField = new global::Google.Protobuf.WellKnownTypes.Empty();
-            }
-            input.ReadMessage(EmptyField);
-            break;
-          }
-          case 42: {
-            if (fieldMaskField_ == null) {
-              FieldMaskField = new global::Google.Protobuf.WellKnownTypes.FieldMask();
-            }
-            input.ReadMessage(FieldMaskField);
-            break;
-          }
-          case 50: {
-            if (sourceContextField_ == null) {
-              SourceContextField = new global::Google.Protobuf.WellKnownTypes.SourceContext();
-            }
-            input.ReadMessage(SourceContextField);
-            break;
-          }
-          case 58: {
-            if (structField_ == null) {
-              StructField = new global::Google.Protobuf.WellKnownTypes.Struct();
-            }
-            input.ReadMessage(StructField);
-            break;
-          }
-          case 66: {
-            if (timestampField_ == null) {
-              TimestampField = new global::Google.Protobuf.WellKnownTypes.Timestamp();
-            }
-            input.ReadMessage(TimestampField);
-            break;
-          }
-          case 74: {
-            if (typeField_ == null) {
-              TypeField = new global::Google.Protobuf.WellKnownTypes.Type();
-            }
-            input.ReadMessage(TypeField);
-            break;
-          }
-          case 82: {
-            double? value = _single_doubleField_codec.Read(input);
-            if (doubleField_ == null || value != 0D) {
-              DoubleField = value;
-            }
-            break;
-          }
-          case 90: {
-            float? value = _single_floatField_codec.Read(input);
-            if (floatField_ == null || value != 0F) {
-              FloatField = value;
-            }
-            break;
-          }
-          case 98: {
-            long? value = _single_int64Field_codec.Read(input);
-            if (int64Field_ == null || value != 0L) {
-              Int64Field = value;
-            }
-            break;
-          }
-          case 106: {
-            ulong? value = _single_uint64Field_codec.Read(input);
-            if (uint64Field_ == null || value != 0UL) {
-              Uint64Field = value;
-            }
-            break;
-          }
-          case 114: {
-            int? value = _single_int32Field_codec.Read(input);
-            if (int32Field_ == null || value != 0) {
-              Int32Field = value;
-            }
-            break;
-          }
-          case 122: {
-            uint? value = _single_uint32Field_codec.Read(input);
-            if (uint32Field_ == null || value != 0) {
-              Uint32Field = value;
-            }
-            break;
-          }
-          case 130: {
-            bool? value = _single_boolField_codec.Read(input);
-            if (boolField_ == null || value != false) {
-              BoolField = value;
-            }
-            break;
-          }
-          case 138: {
-            string value = _single_stringField_codec.Read(input);
-            if (stringField_ == null || value != "") {
-              StringField = value;
-            }
-            break;
-          }
-          case 146: {
-            pb::ByteString value = _single_bytesField_codec.Read(input);
-            if (bytesField_ == null || value != pb::ByteString.Empty) {
-              BytesField = value;
-            }
-            break;
-          }
-          case 154: {
-            if (valueField_ == null) {
-              ValueField = new global::Google.Protobuf.WellKnownTypes.Value();
-            }
-            input.ReadMessage(ValueField);
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 10: {
-            if (anyField_ == null) {
-              AnyField = new global::Google.Protobuf.WellKnownTypes.Any();
-            }
-            input.ReadMessage(AnyField);
-            break;
-          }
-          case 18: {
-            if (apiField_ == null) {
-              ApiField = new global::Google.Protobuf.WellKnownTypes.Api();
-            }
-            input.ReadMessage(ApiField);
-            break;
-          }
-          case 26: {
-            if (durationField_ == null) {
-              DurationField = new global::Google.Protobuf.WellKnownTypes.Duration();
-            }
-            input.ReadMessage(DurationField);
-            break;
-          }
-          case 34: {
-            if (emptyField_ == null) {
-              EmptyField = new global::Google.Protobuf.WellKnownTypes.Empty();
-            }
-            input.ReadMessage(EmptyField);
-            break;
-          }
-          case 42: {
-            if (fieldMaskField_ == null) {
-              FieldMaskField = new global::Google.Protobuf.WellKnownTypes.FieldMask();
-            }
-            input.ReadMessage(FieldMaskField);
-            break;
-          }
-          case 50: {
-            if (sourceContextField_ == null) {
-              SourceContextField = new global::Google.Protobuf.WellKnownTypes.SourceContext();
-            }
-            input.ReadMessage(SourceContextField);
-            break;
-          }
-          case 58: {
-            if (structField_ == null) {
-              StructField = new global::Google.Protobuf.WellKnownTypes.Struct();
-            }
-            input.ReadMessage(StructField);
-            break;
-          }
-          case 66: {
-            if (timestampField_ == null) {
-              TimestampField = new global::Google.Protobuf.WellKnownTypes.Timestamp();
-            }
-            input.ReadMessage(TimestampField);
-            break;
-          }
-          case 74: {
-            if (typeField_ == null) {
-              TypeField = new global::Google.Protobuf.WellKnownTypes.Type();
-            }
-            input.ReadMessage(TypeField);
-            break;
-          }
-          case 82: {
-            double? value = _single_doubleField_codec.Read(ref input);
-            if (doubleField_ == null || value != 0D) {
-              DoubleField = value;
-            }
-            break;
-          }
-          case 90: {
-            float? value = _single_floatField_codec.Read(ref input);
-            if (floatField_ == null || value != 0F) {
-              FloatField = value;
-            }
-            break;
-          }
-          case 98: {
-            long? value = _single_int64Field_codec.Read(ref input);
-            if (int64Field_ == null || value != 0L) {
-              Int64Field = value;
-            }
-            break;
-          }
-          case 106: {
-            ulong? value = _single_uint64Field_codec.Read(ref input);
-            if (uint64Field_ == null || value != 0UL) {
-              Uint64Field = value;
-            }
-            break;
-          }
-          case 114: {
-            int? value = _single_int32Field_codec.Read(ref input);
-            if (int32Field_ == null || value != 0) {
-              Int32Field = value;
-            }
-            break;
-          }
-          case 122: {
-            uint? value = _single_uint32Field_codec.Read(ref input);
-            if (uint32Field_ == null || value != 0) {
-              Uint32Field = value;
-            }
-            break;
-          }
-          case 130: {
-            bool? value = _single_boolField_codec.Read(ref input);
-            if (boolField_ == null || value != false) {
-              BoolField = value;
-            }
-            break;
-          }
-          case 138: {
-            string value = _single_stringField_codec.Read(ref input);
-            if (stringField_ == null || value != "") {
-              StringField = value;
-            }
-            break;
-          }
-          case 146: {
-            pb::ByteString value = _single_bytesField_codec.Read(ref input);
-            if (bytesField_ == null || value != pb::ByteString.Empty) {
-              BytesField = value;
-            }
-            break;
-          }
-          case 154: {
-            if (valueField_ == null) {
-              ValueField = new global::Google.Protobuf.WellKnownTypes.Value();
-            }
-            input.ReadMessage(ValueField);
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  /// <summary>
-  /// A repeated field for each well-known type.
-  /// </summary>
-  public sealed partial class RepeatedWellKnownTypes : pb::IMessage<RepeatedWellKnownTypes>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<RepeatedWellKnownTypes> _parser = new pb::MessageParser<RepeatedWellKnownTypes>(() => new RepeatedWellKnownTypes());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<RepeatedWellKnownTypes> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.UnittestWellKnownTypesReflection.Descriptor.MessageTypes[1]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public RepeatedWellKnownTypes() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public RepeatedWellKnownTypes(RepeatedWellKnownTypes other) : this() {
-      anyField_ = other.anyField_.Clone();
-      apiField_ = other.apiField_.Clone();
-      durationField_ = other.durationField_.Clone();
-      emptyField_ = other.emptyField_.Clone();
-      fieldMaskField_ = other.fieldMaskField_.Clone();
-      sourceContextField_ = other.sourceContextField_.Clone();
-      structField_ = other.structField_.Clone();
-      timestampField_ = other.timestampField_.Clone();
-      typeField_ = other.typeField_.Clone();
-      doubleField_ = other.doubleField_.Clone();
-      floatField_ = other.floatField_.Clone();
-      int64Field_ = other.int64Field_.Clone();
-      uint64Field_ = other.uint64Field_.Clone();
-      int32Field_ = other.int32Field_.Clone();
-      uint32Field_ = other.uint32Field_.Clone();
-      boolField_ = other.boolField_.Clone();
-      stringField_ = other.stringField_.Clone();
-      bytesField_ = other.bytesField_.Clone();
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public RepeatedWellKnownTypes Clone() {
-      return new RepeatedWellKnownTypes(this);
-    }
-
-    /// <summary>Field number for the "any_field" field.</summary>
-    public const int AnyFieldFieldNumber = 1;
-    private static readonly pb::FieldCodec<global::Google.Protobuf.WellKnownTypes.Any> _repeated_anyField_codec
-        = pb::FieldCodec.ForMessage(10, global::Google.Protobuf.WellKnownTypes.Any.Parser);
-    private readonly pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Any> anyField_ = new pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Any>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Any> AnyField {
-      get { return anyField_; }
-    }
-
-    /// <summary>Field number for the "api_field" field.</summary>
-    public const int ApiFieldFieldNumber = 2;
-    private static readonly pb::FieldCodec<global::Google.Protobuf.WellKnownTypes.Api> _repeated_apiField_codec
-        = pb::FieldCodec.ForMessage(18, global::Google.Protobuf.WellKnownTypes.Api.Parser);
-    private readonly pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Api> apiField_ = new pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Api>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Api> ApiField {
-      get { return apiField_; }
-    }
-
-    /// <summary>Field number for the "duration_field" field.</summary>
-    public const int DurationFieldFieldNumber = 3;
-    private static readonly pb::FieldCodec<global::Google.Protobuf.WellKnownTypes.Duration> _repeated_durationField_codec
-        = pb::FieldCodec.ForMessage(26, global::Google.Protobuf.WellKnownTypes.Duration.Parser);
-    private readonly pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Duration> durationField_ = new pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Duration>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Duration> DurationField {
-      get { return durationField_; }
-    }
-
-    /// <summary>Field number for the "empty_field" field.</summary>
-    public const int EmptyFieldFieldNumber = 4;
-    private static readonly pb::FieldCodec<global::Google.Protobuf.WellKnownTypes.Empty> _repeated_emptyField_codec
-        = pb::FieldCodec.ForMessage(34, global::Google.Protobuf.WellKnownTypes.Empty.Parser);
-    private readonly pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Empty> emptyField_ = new pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Empty>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Empty> EmptyField {
-      get { return emptyField_; }
-    }
-
-    /// <summary>Field number for the "field_mask_field" field.</summary>
-    public const int FieldMaskFieldFieldNumber = 5;
-    private static readonly pb::FieldCodec<global::Google.Protobuf.WellKnownTypes.FieldMask> _repeated_fieldMaskField_codec
-        = pb::FieldCodec.ForMessage(42, global::Google.Protobuf.WellKnownTypes.FieldMask.Parser);
-    private readonly pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.FieldMask> fieldMaskField_ = new pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.FieldMask>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.FieldMask> FieldMaskField {
-      get { return fieldMaskField_; }
-    }
-
-    /// <summary>Field number for the "source_context_field" field.</summary>
-    public const int SourceContextFieldFieldNumber = 6;
-    private static readonly pb::FieldCodec<global::Google.Protobuf.WellKnownTypes.SourceContext> _repeated_sourceContextField_codec
-        = pb::FieldCodec.ForMessage(50, global::Google.Protobuf.WellKnownTypes.SourceContext.Parser);
-    private readonly pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.SourceContext> sourceContextField_ = new pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.SourceContext>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.SourceContext> SourceContextField {
-      get { return sourceContextField_; }
-    }
-
-    /// <summary>Field number for the "struct_field" field.</summary>
-    public const int StructFieldFieldNumber = 7;
-    private static readonly pb::FieldCodec<global::Google.Protobuf.WellKnownTypes.Struct> _repeated_structField_codec
-        = pb::FieldCodec.ForMessage(58, global::Google.Protobuf.WellKnownTypes.Struct.Parser);
-    private readonly pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Struct> structField_ = new pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Struct>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Struct> StructField {
-      get { return structField_; }
-    }
-
-    /// <summary>Field number for the "timestamp_field" field.</summary>
-    public const int TimestampFieldFieldNumber = 8;
-    private static readonly pb::FieldCodec<global::Google.Protobuf.WellKnownTypes.Timestamp> _repeated_timestampField_codec
-        = pb::FieldCodec.ForMessage(66, global::Google.Protobuf.WellKnownTypes.Timestamp.Parser);
-    private readonly pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Timestamp> timestampField_ = new pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Timestamp>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Timestamp> TimestampField {
-      get { return timestampField_; }
-    }
-
-    /// <summary>Field number for the "type_field" field.</summary>
-    public const int TypeFieldFieldNumber = 9;
-    private static readonly pb::FieldCodec<global::Google.Protobuf.WellKnownTypes.Type> _repeated_typeField_codec
-        = pb::FieldCodec.ForMessage(74, global::Google.Protobuf.WellKnownTypes.Type.Parser);
-    private readonly pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Type> typeField_ = new pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Type>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Type> TypeField {
-      get { return typeField_; }
-    }
-
-    /// <summary>Field number for the "double_field" field.</summary>
-    public const int DoubleFieldFieldNumber = 10;
-    private static readonly pb::FieldCodec<double?> _repeated_doubleField_codec
-        = pb::FieldCodec.ForStructWrapper<double>(82);
-    private readonly pbc::RepeatedField<double?> doubleField_ = new pbc::RepeatedField<double?>();
-    /// <summary>
-    /// These don't actually make a lot of sense, but they're not prohibited...
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<double?> DoubleField {
-      get { return doubleField_; }
-    }
-
-    /// <summary>Field number for the "float_field" field.</summary>
-    public const int FloatFieldFieldNumber = 11;
-    private static readonly pb::FieldCodec<float?> _repeated_floatField_codec
-        = pb::FieldCodec.ForStructWrapper<float>(90);
-    private readonly pbc::RepeatedField<float?> floatField_ = new pbc::RepeatedField<float?>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<float?> FloatField {
-      get { return floatField_; }
-    }
-
-    /// <summary>Field number for the "int64_field" field.</summary>
-    public const int Int64FieldFieldNumber = 12;
-    private static readonly pb::FieldCodec<long?> _repeated_int64Field_codec
-        = pb::FieldCodec.ForStructWrapper<long>(98);
-    private readonly pbc::RepeatedField<long?> int64Field_ = new pbc::RepeatedField<long?>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<long?> Int64Field {
-      get { return int64Field_; }
-    }
-
-    /// <summary>Field number for the "uint64_field" field.</summary>
-    public const int Uint64FieldFieldNumber = 13;
-    private static readonly pb::FieldCodec<ulong?> _repeated_uint64Field_codec
-        = pb::FieldCodec.ForStructWrapper<ulong>(106);
-    private readonly pbc::RepeatedField<ulong?> uint64Field_ = new pbc::RepeatedField<ulong?>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<ulong?> Uint64Field {
-      get { return uint64Field_; }
-    }
-
-    /// <summary>Field number for the "int32_field" field.</summary>
-    public const int Int32FieldFieldNumber = 14;
-    private static readonly pb::FieldCodec<int?> _repeated_int32Field_codec
-        = pb::FieldCodec.ForStructWrapper<int>(114);
-    private readonly pbc::RepeatedField<int?> int32Field_ = new pbc::RepeatedField<int?>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<int?> Int32Field {
-      get { return int32Field_; }
-    }
-
-    /// <summary>Field number for the "uint32_field" field.</summary>
-    public const int Uint32FieldFieldNumber = 15;
-    private static readonly pb::FieldCodec<uint?> _repeated_uint32Field_codec
-        = pb::FieldCodec.ForStructWrapper<uint>(122);
-    private readonly pbc::RepeatedField<uint?> uint32Field_ = new pbc::RepeatedField<uint?>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<uint?> Uint32Field {
-      get { return uint32Field_; }
-    }
-
-    /// <summary>Field number for the "bool_field" field.</summary>
-    public const int BoolFieldFieldNumber = 16;
-    private static readonly pb::FieldCodec<bool?> _repeated_boolField_codec
-        = pb::FieldCodec.ForStructWrapper<bool>(130);
-    private readonly pbc::RepeatedField<bool?> boolField_ = new pbc::RepeatedField<bool?>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<bool?> BoolField {
-      get { return boolField_; }
-    }
-
-    /// <summary>Field number for the "string_field" field.</summary>
-    public const int StringFieldFieldNumber = 17;
-    private static readonly pb::FieldCodec<string> _repeated_stringField_codec
-        = pb::FieldCodec.ForClassWrapper<string>(138);
-    private readonly pbc::RepeatedField<string> stringField_ = new pbc::RepeatedField<string>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<string> StringField {
-      get { return stringField_; }
-    }
-
-    /// <summary>Field number for the "bytes_field" field.</summary>
-    public const int BytesFieldFieldNumber = 18;
-    private static readonly pb::FieldCodec<pb::ByteString> _repeated_bytesField_codec
-        = pb::FieldCodec.ForClassWrapper<pb::ByteString>(146);
-    private readonly pbc::RepeatedField<pb::ByteString> bytesField_ = new pbc::RepeatedField<pb::ByteString>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<pb::ByteString> BytesField {
-      get { return bytesField_; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as RepeatedWellKnownTypes);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(RepeatedWellKnownTypes other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if(!anyField_.Equals(other.anyField_)) return false;
-      if(!apiField_.Equals(other.apiField_)) return false;
-      if(!durationField_.Equals(other.durationField_)) return false;
-      if(!emptyField_.Equals(other.emptyField_)) return false;
-      if(!fieldMaskField_.Equals(other.fieldMaskField_)) return false;
-      if(!sourceContextField_.Equals(other.sourceContextField_)) return false;
-      if(!structField_.Equals(other.structField_)) return false;
-      if(!timestampField_.Equals(other.timestampField_)) return false;
-      if(!typeField_.Equals(other.typeField_)) return false;
-      if(!doubleField_.Equals(other.doubleField_)) return false;
-      if(!floatField_.Equals(other.floatField_)) return false;
-      if(!int64Field_.Equals(other.int64Field_)) return false;
-      if(!uint64Field_.Equals(other.uint64Field_)) return false;
-      if(!int32Field_.Equals(other.int32Field_)) return false;
-      if(!uint32Field_.Equals(other.uint32Field_)) return false;
-      if(!boolField_.Equals(other.boolField_)) return false;
-      if(!stringField_.Equals(other.stringField_)) return false;
-      if(!bytesField_.Equals(other.bytesField_)) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      hash ^= anyField_.GetHashCode();
-      hash ^= apiField_.GetHashCode();
-      hash ^= durationField_.GetHashCode();
-      hash ^= emptyField_.GetHashCode();
-      hash ^= fieldMaskField_.GetHashCode();
-      hash ^= sourceContextField_.GetHashCode();
-      hash ^= structField_.GetHashCode();
-      hash ^= timestampField_.GetHashCode();
-      hash ^= typeField_.GetHashCode();
-      hash ^= doubleField_.GetHashCode();
-      hash ^= floatField_.GetHashCode();
-      hash ^= int64Field_.GetHashCode();
-      hash ^= uint64Field_.GetHashCode();
-      hash ^= int32Field_.GetHashCode();
-      hash ^= uint32Field_.GetHashCode();
-      hash ^= boolField_.GetHashCode();
-      hash ^= stringField_.GetHashCode();
-      hash ^= bytesField_.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      anyField_.WriteTo(output, _repeated_anyField_codec);
-      apiField_.WriteTo(output, _repeated_apiField_codec);
-      durationField_.WriteTo(output, _repeated_durationField_codec);
-      emptyField_.WriteTo(output, _repeated_emptyField_codec);
-      fieldMaskField_.WriteTo(output, _repeated_fieldMaskField_codec);
-      sourceContextField_.WriteTo(output, _repeated_sourceContextField_codec);
-      structField_.WriteTo(output, _repeated_structField_codec);
-      timestampField_.WriteTo(output, _repeated_timestampField_codec);
-      typeField_.WriteTo(output, _repeated_typeField_codec);
-      doubleField_.WriteTo(output, _repeated_doubleField_codec);
-      floatField_.WriteTo(output, _repeated_floatField_codec);
-      int64Field_.WriteTo(output, _repeated_int64Field_codec);
-      uint64Field_.WriteTo(output, _repeated_uint64Field_codec);
-      int32Field_.WriteTo(output, _repeated_int32Field_codec);
-      uint32Field_.WriteTo(output, _repeated_uint32Field_codec);
-      boolField_.WriteTo(output, _repeated_boolField_codec);
-      stringField_.WriteTo(output, _repeated_stringField_codec);
-      bytesField_.WriteTo(output, _repeated_bytesField_codec);
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      anyField_.WriteTo(ref output, _repeated_anyField_codec);
-      apiField_.WriteTo(ref output, _repeated_apiField_codec);
-      durationField_.WriteTo(ref output, _repeated_durationField_codec);
-      emptyField_.WriteTo(ref output, _repeated_emptyField_codec);
-      fieldMaskField_.WriteTo(ref output, _repeated_fieldMaskField_codec);
-      sourceContextField_.WriteTo(ref output, _repeated_sourceContextField_codec);
-      structField_.WriteTo(ref output, _repeated_structField_codec);
-      timestampField_.WriteTo(ref output, _repeated_timestampField_codec);
-      typeField_.WriteTo(ref output, _repeated_typeField_codec);
-      doubleField_.WriteTo(ref output, _repeated_doubleField_codec);
-      floatField_.WriteTo(ref output, _repeated_floatField_codec);
-      int64Field_.WriteTo(ref output, _repeated_int64Field_codec);
-      uint64Field_.WriteTo(ref output, _repeated_uint64Field_codec);
-      int32Field_.WriteTo(ref output, _repeated_int32Field_codec);
-      uint32Field_.WriteTo(ref output, _repeated_uint32Field_codec);
-      boolField_.WriteTo(ref output, _repeated_boolField_codec);
-      stringField_.WriteTo(ref output, _repeated_stringField_codec);
-      bytesField_.WriteTo(ref output, _repeated_bytesField_codec);
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      size += anyField_.CalculateSize(_repeated_anyField_codec);
-      size += apiField_.CalculateSize(_repeated_apiField_codec);
-      size += durationField_.CalculateSize(_repeated_durationField_codec);
-      size += emptyField_.CalculateSize(_repeated_emptyField_codec);
-      size += fieldMaskField_.CalculateSize(_repeated_fieldMaskField_codec);
-      size += sourceContextField_.CalculateSize(_repeated_sourceContextField_codec);
-      size += structField_.CalculateSize(_repeated_structField_codec);
-      size += timestampField_.CalculateSize(_repeated_timestampField_codec);
-      size += typeField_.CalculateSize(_repeated_typeField_codec);
-      size += doubleField_.CalculateSize(_repeated_doubleField_codec);
-      size += floatField_.CalculateSize(_repeated_floatField_codec);
-      size += int64Field_.CalculateSize(_repeated_int64Field_codec);
-      size += uint64Field_.CalculateSize(_repeated_uint64Field_codec);
-      size += int32Field_.CalculateSize(_repeated_int32Field_codec);
-      size += uint32Field_.CalculateSize(_repeated_uint32Field_codec);
-      size += boolField_.CalculateSize(_repeated_boolField_codec);
-      size += stringField_.CalculateSize(_repeated_stringField_codec);
-      size += bytesField_.CalculateSize(_repeated_bytesField_codec);
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(RepeatedWellKnownTypes other) {
-      if (other == null) {
-        return;
-      }
-      anyField_.Add(other.anyField_);
-      apiField_.Add(other.apiField_);
-      durationField_.Add(other.durationField_);
-      emptyField_.Add(other.emptyField_);
-      fieldMaskField_.Add(other.fieldMaskField_);
-      sourceContextField_.Add(other.sourceContextField_);
-      structField_.Add(other.structField_);
-      timestampField_.Add(other.timestampField_);
-      typeField_.Add(other.typeField_);
-      doubleField_.Add(other.doubleField_);
-      floatField_.Add(other.floatField_);
-      int64Field_.Add(other.int64Field_);
-      uint64Field_.Add(other.uint64Field_);
-      int32Field_.Add(other.int32Field_);
-      uint32Field_.Add(other.uint32Field_);
-      boolField_.Add(other.boolField_);
-      stringField_.Add(other.stringField_);
-      bytesField_.Add(other.bytesField_);
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 10: {
-            anyField_.AddEntriesFrom(input, _repeated_anyField_codec);
-            break;
-          }
-          case 18: {
-            apiField_.AddEntriesFrom(input, _repeated_apiField_codec);
-            break;
-          }
-          case 26: {
-            durationField_.AddEntriesFrom(input, _repeated_durationField_codec);
-            break;
-          }
-          case 34: {
-            emptyField_.AddEntriesFrom(input, _repeated_emptyField_codec);
-            break;
-          }
-          case 42: {
-            fieldMaskField_.AddEntriesFrom(input, _repeated_fieldMaskField_codec);
-            break;
-          }
-          case 50: {
-            sourceContextField_.AddEntriesFrom(input, _repeated_sourceContextField_codec);
-            break;
-          }
-          case 58: {
-            structField_.AddEntriesFrom(input, _repeated_structField_codec);
-            break;
-          }
-          case 66: {
-            timestampField_.AddEntriesFrom(input, _repeated_timestampField_codec);
-            break;
-          }
-          case 74: {
-            typeField_.AddEntriesFrom(input, _repeated_typeField_codec);
-            break;
-          }
-          case 82: {
-            doubleField_.AddEntriesFrom(input, _repeated_doubleField_codec);
-            break;
-          }
-          case 90: {
-            floatField_.AddEntriesFrom(input, _repeated_floatField_codec);
-            break;
-          }
-          case 98: {
-            int64Field_.AddEntriesFrom(input, _repeated_int64Field_codec);
-            break;
-          }
-          case 106: {
-            uint64Field_.AddEntriesFrom(input, _repeated_uint64Field_codec);
-            break;
-          }
-          case 114: {
-            int32Field_.AddEntriesFrom(input, _repeated_int32Field_codec);
-            break;
-          }
-          case 122: {
-            uint32Field_.AddEntriesFrom(input, _repeated_uint32Field_codec);
-            break;
-          }
-          case 130: {
-            boolField_.AddEntriesFrom(input, _repeated_boolField_codec);
-            break;
-          }
-          case 138: {
-            stringField_.AddEntriesFrom(input, _repeated_stringField_codec);
-            break;
-          }
-          case 146: {
-            bytesField_.AddEntriesFrom(input, _repeated_bytesField_codec);
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 10: {
-            anyField_.AddEntriesFrom(ref input, _repeated_anyField_codec);
-            break;
-          }
-          case 18: {
-            apiField_.AddEntriesFrom(ref input, _repeated_apiField_codec);
-            break;
-          }
-          case 26: {
-            durationField_.AddEntriesFrom(ref input, _repeated_durationField_codec);
-            break;
-          }
-          case 34: {
-            emptyField_.AddEntriesFrom(ref input, _repeated_emptyField_codec);
-            break;
-          }
-          case 42: {
-            fieldMaskField_.AddEntriesFrom(ref input, _repeated_fieldMaskField_codec);
-            break;
-          }
-          case 50: {
-            sourceContextField_.AddEntriesFrom(ref input, _repeated_sourceContextField_codec);
-            break;
-          }
-          case 58: {
-            structField_.AddEntriesFrom(ref input, _repeated_structField_codec);
-            break;
-          }
-          case 66: {
-            timestampField_.AddEntriesFrom(ref input, _repeated_timestampField_codec);
-            break;
-          }
-          case 74: {
-            typeField_.AddEntriesFrom(ref input, _repeated_typeField_codec);
-            break;
-          }
-          case 82: {
-            doubleField_.AddEntriesFrom(ref input, _repeated_doubleField_codec);
-            break;
-          }
-          case 90: {
-            floatField_.AddEntriesFrom(ref input, _repeated_floatField_codec);
-            break;
-          }
-          case 98: {
-            int64Field_.AddEntriesFrom(ref input, _repeated_int64Field_codec);
-            break;
-          }
-          case 106: {
-            uint64Field_.AddEntriesFrom(ref input, _repeated_uint64Field_codec);
-            break;
-          }
-          case 114: {
-            int32Field_.AddEntriesFrom(ref input, _repeated_int32Field_codec);
-            break;
-          }
-          case 122: {
-            uint32Field_.AddEntriesFrom(ref input, _repeated_uint32Field_codec);
-            break;
-          }
-          case 130: {
-            boolField_.AddEntriesFrom(ref input, _repeated_boolField_codec);
-            break;
-          }
-          case 138: {
-            stringField_.AddEntriesFrom(ref input, _repeated_stringField_codec);
-            break;
-          }
-          case 146: {
-            bytesField_.AddEntriesFrom(ref input, _repeated_bytesField_codec);
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  public sealed partial class OneofWellKnownTypes : pb::IMessage<OneofWellKnownTypes>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<OneofWellKnownTypes> _parser = new pb::MessageParser<OneofWellKnownTypes>(() => new OneofWellKnownTypes());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<OneofWellKnownTypes> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.UnittestWellKnownTypesReflection.Descriptor.MessageTypes[2]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public OneofWellKnownTypes() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public OneofWellKnownTypes(OneofWellKnownTypes other) : this() {
-      switch (other.OneofFieldCase) {
-        case OneofFieldOneofCase.AnyField:
-          AnyField = other.AnyField.Clone();
-          break;
-        case OneofFieldOneofCase.ApiField:
-          ApiField = other.ApiField.Clone();
-          break;
-        case OneofFieldOneofCase.DurationField:
-          DurationField = other.DurationField.Clone();
-          break;
-        case OneofFieldOneofCase.EmptyField:
-          EmptyField = other.EmptyField.Clone();
-          break;
-        case OneofFieldOneofCase.FieldMaskField:
-          FieldMaskField = other.FieldMaskField.Clone();
-          break;
-        case OneofFieldOneofCase.SourceContextField:
-          SourceContextField = other.SourceContextField.Clone();
-          break;
-        case OneofFieldOneofCase.StructField:
-          StructField = other.StructField.Clone();
-          break;
-        case OneofFieldOneofCase.TimestampField:
-          TimestampField = other.TimestampField.Clone();
-          break;
-        case OneofFieldOneofCase.TypeField:
-          TypeField = other.TypeField.Clone();
-          break;
-        case OneofFieldOneofCase.DoubleField:
-          DoubleField = other.DoubleField;
-          break;
-        case OneofFieldOneofCase.FloatField:
-          FloatField = other.FloatField;
-          break;
-        case OneofFieldOneofCase.Int64Field:
-          Int64Field = other.Int64Field;
-          break;
-        case OneofFieldOneofCase.Uint64Field:
-          Uint64Field = other.Uint64Field;
-          break;
-        case OneofFieldOneofCase.Int32Field:
-          Int32Field = other.Int32Field;
-          break;
-        case OneofFieldOneofCase.Uint32Field:
-          Uint32Field = other.Uint32Field;
-          break;
-        case OneofFieldOneofCase.BoolField:
-          BoolField = other.BoolField;
-          break;
-        case OneofFieldOneofCase.StringField:
-          StringField = other.StringField;
-          break;
-        case OneofFieldOneofCase.BytesField:
-          BytesField = other.BytesField;
-          break;
-      }
-
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public OneofWellKnownTypes Clone() {
-      return new OneofWellKnownTypes(this);
-    }
-
-    /// <summary>Field number for the "any_field" field.</summary>
-    public const int AnyFieldFieldNumber = 1;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.WellKnownTypes.Any AnyField {
-      get { return oneofFieldCase_ == OneofFieldOneofCase.AnyField ? (global::Google.Protobuf.WellKnownTypes.Any) oneofField_ : null; }
-      set {
-        oneofField_ = value;
-        oneofFieldCase_ = value == null ? OneofFieldOneofCase.None : OneofFieldOneofCase.AnyField;
-      }
-    }
-
-    /// <summary>Field number for the "api_field" field.</summary>
-    public const int ApiFieldFieldNumber = 2;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.WellKnownTypes.Api ApiField {
-      get { return oneofFieldCase_ == OneofFieldOneofCase.ApiField ? (global::Google.Protobuf.WellKnownTypes.Api) oneofField_ : null; }
-      set {
-        oneofField_ = value;
-        oneofFieldCase_ = value == null ? OneofFieldOneofCase.None : OneofFieldOneofCase.ApiField;
-      }
-    }
-
-    /// <summary>Field number for the "duration_field" field.</summary>
-    public const int DurationFieldFieldNumber = 3;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.WellKnownTypes.Duration DurationField {
-      get { return oneofFieldCase_ == OneofFieldOneofCase.DurationField ? (global::Google.Protobuf.WellKnownTypes.Duration) oneofField_ : null; }
-      set {
-        oneofField_ = value;
-        oneofFieldCase_ = value == null ? OneofFieldOneofCase.None : OneofFieldOneofCase.DurationField;
-      }
-    }
-
-    /// <summary>Field number for the "empty_field" field.</summary>
-    public const int EmptyFieldFieldNumber = 4;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.WellKnownTypes.Empty EmptyField {
-      get { return oneofFieldCase_ == OneofFieldOneofCase.EmptyField ? (global::Google.Protobuf.WellKnownTypes.Empty) oneofField_ : null; }
-      set {
-        oneofField_ = value;
-        oneofFieldCase_ = value == null ? OneofFieldOneofCase.None : OneofFieldOneofCase.EmptyField;
-      }
-    }
-
-    /// <summary>Field number for the "field_mask_field" field.</summary>
-    public const int FieldMaskFieldFieldNumber = 5;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.WellKnownTypes.FieldMask FieldMaskField {
-      get { return oneofFieldCase_ == OneofFieldOneofCase.FieldMaskField ? (global::Google.Protobuf.WellKnownTypes.FieldMask) oneofField_ : null; }
-      set {
-        oneofField_ = value;
-        oneofFieldCase_ = value == null ? OneofFieldOneofCase.None : OneofFieldOneofCase.FieldMaskField;
-      }
-    }
-
-    /// <summary>Field number for the "source_context_field" field.</summary>
-    public const int SourceContextFieldFieldNumber = 6;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.WellKnownTypes.SourceContext SourceContextField {
-      get { return oneofFieldCase_ == OneofFieldOneofCase.SourceContextField ? (global::Google.Protobuf.WellKnownTypes.SourceContext) oneofField_ : null; }
-      set {
-        oneofField_ = value;
-        oneofFieldCase_ = value == null ? OneofFieldOneofCase.None : OneofFieldOneofCase.SourceContextField;
-      }
-    }
-
-    /// <summary>Field number for the "struct_field" field.</summary>
-    public const int StructFieldFieldNumber = 7;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.WellKnownTypes.Struct StructField {
-      get { return oneofFieldCase_ == OneofFieldOneofCase.StructField ? (global::Google.Protobuf.WellKnownTypes.Struct) oneofField_ : null; }
-      set {
-        oneofField_ = value;
-        oneofFieldCase_ = value == null ? OneofFieldOneofCase.None : OneofFieldOneofCase.StructField;
-      }
-    }
-
-    /// <summary>Field number for the "timestamp_field" field.</summary>
-    public const int TimestampFieldFieldNumber = 8;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.WellKnownTypes.Timestamp TimestampField {
-      get { return oneofFieldCase_ == OneofFieldOneofCase.TimestampField ? (global::Google.Protobuf.WellKnownTypes.Timestamp) oneofField_ : null; }
-      set {
-        oneofField_ = value;
-        oneofFieldCase_ = value == null ? OneofFieldOneofCase.None : OneofFieldOneofCase.TimestampField;
-      }
-    }
-
-    /// <summary>Field number for the "type_field" field.</summary>
-    public const int TypeFieldFieldNumber = 9;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.WellKnownTypes.Type TypeField {
-      get { return oneofFieldCase_ == OneofFieldOneofCase.TypeField ? (global::Google.Protobuf.WellKnownTypes.Type) oneofField_ : null; }
-      set {
-        oneofField_ = value;
-        oneofFieldCase_ = value == null ? OneofFieldOneofCase.None : OneofFieldOneofCase.TypeField;
-      }
-    }
-
-    /// <summary>Field number for the "double_field" field.</summary>
-    public const int DoubleFieldFieldNumber = 10;
-    private static readonly pb::FieldCodec<double?> _oneof_doubleField_codec = pb::FieldCodec.ForStructWrapper<double>(82);
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double? DoubleField {
-      get { return oneofFieldCase_ == OneofFieldOneofCase.DoubleField ? (double?) oneofField_ : (double?) null; }
-      set {
-        oneofField_ = value;
-        oneofFieldCase_ = value == null ? OneofFieldOneofCase.None : OneofFieldOneofCase.DoubleField;
-      }
-    }
-
-    /// <summary>Field number for the "float_field" field.</summary>
-    public const int FloatFieldFieldNumber = 11;
-    private static readonly pb::FieldCodec<float?> _oneof_floatField_codec = pb::FieldCodec.ForStructWrapper<float>(90);
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public float? FloatField {
-      get { return oneofFieldCase_ == OneofFieldOneofCase.FloatField ? (float?) oneofField_ : (float?) null; }
-      set {
-        oneofField_ = value;
-        oneofFieldCase_ = value == null ? OneofFieldOneofCase.None : OneofFieldOneofCase.FloatField;
-      }
-    }
-
-    /// <summary>Field number for the "int64_field" field.</summary>
-    public const int Int64FieldFieldNumber = 12;
-    private static readonly pb::FieldCodec<long?> _oneof_int64Field_codec = pb::FieldCodec.ForStructWrapper<long>(98);
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public long? Int64Field {
-      get { return oneofFieldCase_ == OneofFieldOneofCase.Int64Field ? (long?) oneofField_ : (long?) null; }
-      set {
-        oneofField_ = value;
-        oneofFieldCase_ = value == null ? OneofFieldOneofCase.None : OneofFieldOneofCase.Int64Field;
-      }
-    }
-
-    /// <summary>Field number for the "uint64_field" field.</summary>
-    public const int Uint64FieldFieldNumber = 13;
-    private static readonly pb::FieldCodec<ulong?> _oneof_uint64Field_codec = pb::FieldCodec.ForStructWrapper<ulong>(106);
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ulong? Uint64Field {
-      get { return oneofFieldCase_ == OneofFieldOneofCase.Uint64Field ? (ulong?) oneofField_ : (ulong?) null; }
-      set {
-        oneofField_ = value;
-        oneofFieldCase_ = value == null ? OneofFieldOneofCase.None : OneofFieldOneofCase.Uint64Field;
-      }
-    }
-
-    /// <summary>Field number for the "int32_field" field.</summary>
-    public const int Int32FieldFieldNumber = 14;
-    private static readonly pb::FieldCodec<int?> _oneof_int32Field_codec = pb::FieldCodec.ForStructWrapper<int>(114);
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int? Int32Field {
-      get { return oneofFieldCase_ == OneofFieldOneofCase.Int32Field ? (int?) oneofField_ : (int?) null; }
-      set {
-        oneofField_ = value;
-        oneofFieldCase_ = value == null ? OneofFieldOneofCase.None : OneofFieldOneofCase.Int32Field;
-      }
-    }
-
-    /// <summary>Field number for the "uint32_field" field.</summary>
-    public const int Uint32FieldFieldNumber = 15;
-    private static readonly pb::FieldCodec<uint?> _oneof_uint32Field_codec = pb::FieldCodec.ForStructWrapper<uint>(122);
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public uint? Uint32Field {
-      get { return oneofFieldCase_ == OneofFieldOneofCase.Uint32Field ? (uint?) oneofField_ : (uint?) null; }
-      set {
-        oneofField_ = value;
-        oneofFieldCase_ = value == null ? OneofFieldOneofCase.None : OneofFieldOneofCase.Uint32Field;
-      }
-    }
-
-    /// <summary>Field number for the "bool_field" field.</summary>
-    public const int BoolFieldFieldNumber = 16;
-    private static readonly pb::FieldCodec<bool?> _oneof_boolField_codec = pb::FieldCodec.ForStructWrapper<bool>(130);
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool? BoolField {
-      get { return oneofFieldCase_ == OneofFieldOneofCase.BoolField ? (bool?) oneofField_ : (bool?) null; }
-      set {
-        oneofField_ = value;
-        oneofFieldCase_ = value == null ? OneofFieldOneofCase.None : OneofFieldOneofCase.BoolField;
-      }
-    }
-
-    /// <summary>Field number for the "string_field" field.</summary>
-    public const int StringFieldFieldNumber = 17;
-    private static readonly pb::FieldCodec<string> _oneof_stringField_codec = pb::FieldCodec.ForClassWrapper<string>(138);
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string StringField {
-      get { return oneofFieldCase_ == OneofFieldOneofCase.StringField ? (string) oneofField_ : (string) null; }
-      set {
-        oneofField_ = value;
-        oneofFieldCase_ = value == null ? OneofFieldOneofCase.None : OneofFieldOneofCase.StringField;
-      }
-    }
-
-    /// <summary>Field number for the "bytes_field" field.</summary>
-    public const int BytesFieldFieldNumber = 18;
-    private static readonly pb::FieldCodec<pb::ByteString> _oneof_bytesField_codec = pb::FieldCodec.ForClassWrapper<pb::ByteString>(146);
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pb::ByteString BytesField {
-      get { return oneofFieldCase_ == OneofFieldOneofCase.BytesField ? (pb::ByteString) oneofField_ : (pb::ByteString) null; }
-      set {
-        oneofField_ = value;
-        oneofFieldCase_ = value == null ? OneofFieldOneofCase.None : OneofFieldOneofCase.BytesField;
-      }
-    }
-
-    private object oneofField_;
-    /// <summary>Enum of possible cases for the "oneof_field" oneof.</summary>
-    public enum OneofFieldOneofCase {
-      None = 0,
-      AnyField = 1,
-      ApiField = 2,
-      DurationField = 3,
-      EmptyField = 4,
-      FieldMaskField = 5,
-      SourceContextField = 6,
-      StructField = 7,
-      TimestampField = 8,
-      TypeField = 9,
-      DoubleField = 10,
-      FloatField = 11,
-      Int64Field = 12,
-      Uint64Field = 13,
-      Int32Field = 14,
-      Uint32Field = 15,
-      BoolField = 16,
-      StringField = 17,
-      BytesField = 18,
-    }
-    private OneofFieldOneofCase oneofFieldCase_ = OneofFieldOneofCase.None;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public OneofFieldOneofCase OneofFieldCase {
-      get { return oneofFieldCase_; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearOneofField() {
-      oneofFieldCase_ = OneofFieldOneofCase.None;
-      oneofField_ = null;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as OneofWellKnownTypes);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(OneofWellKnownTypes other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (!object.Equals(AnyField, other.AnyField)) return false;
-      if (!object.Equals(ApiField, other.ApiField)) return false;
-      if (!object.Equals(DurationField, other.DurationField)) return false;
-      if (!object.Equals(EmptyField, other.EmptyField)) return false;
-      if (!object.Equals(FieldMaskField, other.FieldMaskField)) return false;
-      if (!object.Equals(SourceContextField, other.SourceContextField)) return false;
-      if (!object.Equals(StructField, other.StructField)) return false;
-      if (!object.Equals(TimestampField, other.TimestampField)) return false;
-      if (!object.Equals(TypeField, other.TypeField)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.Equals(DoubleField, other.DoubleField)) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseNullableSingleEqualityComparer.Equals(FloatField, other.FloatField)) return false;
-      if (Int64Field != other.Int64Field) return false;
-      if (Uint64Field != other.Uint64Field) return false;
-      if (Int32Field != other.Int32Field) return false;
-      if (Uint32Field != other.Uint32Field) return false;
-      if (BoolField != other.BoolField) return false;
-      if (StringField != other.StringField) return false;
-      if (BytesField != other.BytesField) return false;
-      if (OneofFieldCase != other.OneofFieldCase) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (oneofFieldCase_ == OneofFieldOneofCase.AnyField) hash ^= AnyField.GetHashCode();
-      if (oneofFieldCase_ == OneofFieldOneofCase.ApiField) hash ^= ApiField.GetHashCode();
-      if (oneofFieldCase_ == OneofFieldOneofCase.DurationField) hash ^= DurationField.GetHashCode();
-      if (oneofFieldCase_ == OneofFieldOneofCase.EmptyField) hash ^= EmptyField.GetHashCode();
-      if (oneofFieldCase_ == OneofFieldOneofCase.FieldMaskField) hash ^= FieldMaskField.GetHashCode();
-      if (oneofFieldCase_ == OneofFieldOneofCase.SourceContextField) hash ^= SourceContextField.GetHashCode();
-      if (oneofFieldCase_ == OneofFieldOneofCase.StructField) hash ^= StructField.GetHashCode();
-      if (oneofFieldCase_ == OneofFieldOneofCase.TimestampField) hash ^= TimestampField.GetHashCode();
-      if (oneofFieldCase_ == OneofFieldOneofCase.TypeField) hash ^= TypeField.GetHashCode();
-      if (oneofFieldCase_ == OneofFieldOneofCase.DoubleField) hash ^= pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.GetHashCode(DoubleField);
-      if (oneofFieldCase_ == OneofFieldOneofCase.FloatField) hash ^= pbc::ProtobufEqualityComparers.BitwiseNullableSingleEqualityComparer.GetHashCode(FloatField);
-      if (oneofFieldCase_ == OneofFieldOneofCase.Int64Field) hash ^= Int64Field.GetHashCode();
-      if (oneofFieldCase_ == OneofFieldOneofCase.Uint64Field) hash ^= Uint64Field.GetHashCode();
-      if (oneofFieldCase_ == OneofFieldOneofCase.Int32Field) hash ^= Int32Field.GetHashCode();
-      if (oneofFieldCase_ == OneofFieldOneofCase.Uint32Field) hash ^= Uint32Field.GetHashCode();
-      if (oneofFieldCase_ == OneofFieldOneofCase.BoolField) hash ^= BoolField.GetHashCode();
-      if (oneofFieldCase_ == OneofFieldOneofCase.StringField) hash ^= StringField.GetHashCode();
-      if (oneofFieldCase_ == OneofFieldOneofCase.BytesField) hash ^= BytesField.GetHashCode();
-      hash ^= (int) oneofFieldCase_;
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (oneofFieldCase_ == OneofFieldOneofCase.AnyField) {
-        output.WriteRawTag(10);
-        output.WriteMessage(AnyField);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.ApiField) {
-        output.WriteRawTag(18);
-        output.WriteMessage(ApiField);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.DurationField) {
-        output.WriteRawTag(26);
-        output.WriteMessage(DurationField);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.EmptyField) {
-        output.WriteRawTag(34);
-        output.WriteMessage(EmptyField);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.FieldMaskField) {
-        output.WriteRawTag(42);
-        output.WriteMessage(FieldMaskField);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.SourceContextField) {
-        output.WriteRawTag(50);
-        output.WriteMessage(SourceContextField);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.StructField) {
-        output.WriteRawTag(58);
-        output.WriteMessage(StructField);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.TimestampField) {
-        output.WriteRawTag(66);
-        output.WriteMessage(TimestampField);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.TypeField) {
-        output.WriteRawTag(74);
-        output.WriteMessage(TypeField);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.DoubleField) {
-        _oneof_doubleField_codec.WriteTagAndValue(output, (double?) oneofField_);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.FloatField) {
-        _oneof_floatField_codec.WriteTagAndValue(output, (float?) oneofField_);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.Int64Field) {
-        _oneof_int64Field_codec.WriteTagAndValue(output, (long?) oneofField_);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.Uint64Field) {
-        _oneof_uint64Field_codec.WriteTagAndValue(output, (ulong?) oneofField_);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.Int32Field) {
-        _oneof_int32Field_codec.WriteTagAndValue(output, (int?) oneofField_);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.Uint32Field) {
-        _oneof_uint32Field_codec.WriteTagAndValue(output, (uint?) oneofField_);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.BoolField) {
-        _oneof_boolField_codec.WriteTagAndValue(output, (bool?) oneofField_);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.StringField) {
-        _oneof_stringField_codec.WriteTagAndValue(output, (string) oneofField_);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.BytesField) {
-        _oneof_bytesField_codec.WriteTagAndValue(output, (pb::ByteString) oneofField_);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (oneofFieldCase_ == OneofFieldOneofCase.AnyField) {
-        output.WriteRawTag(10);
-        output.WriteMessage(AnyField);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.ApiField) {
-        output.WriteRawTag(18);
-        output.WriteMessage(ApiField);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.DurationField) {
-        output.WriteRawTag(26);
-        output.WriteMessage(DurationField);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.EmptyField) {
-        output.WriteRawTag(34);
-        output.WriteMessage(EmptyField);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.FieldMaskField) {
-        output.WriteRawTag(42);
-        output.WriteMessage(FieldMaskField);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.SourceContextField) {
-        output.WriteRawTag(50);
-        output.WriteMessage(SourceContextField);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.StructField) {
-        output.WriteRawTag(58);
-        output.WriteMessage(StructField);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.TimestampField) {
-        output.WriteRawTag(66);
-        output.WriteMessage(TimestampField);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.TypeField) {
-        output.WriteRawTag(74);
-        output.WriteMessage(TypeField);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.DoubleField) {
-        _oneof_doubleField_codec.WriteTagAndValue(ref output, (double?) oneofField_);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.FloatField) {
-        _oneof_floatField_codec.WriteTagAndValue(ref output, (float?) oneofField_);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.Int64Field) {
-        _oneof_int64Field_codec.WriteTagAndValue(ref output, (long?) oneofField_);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.Uint64Field) {
-        _oneof_uint64Field_codec.WriteTagAndValue(ref output, (ulong?) oneofField_);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.Int32Field) {
-        _oneof_int32Field_codec.WriteTagAndValue(ref output, (int?) oneofField_);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.Uint32Field) {
-        _oneof_uint32Field_codec.WriteTagAndValue(ref output, (uint?) oneofField_);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.BoolField) {
-        _oneof_boolField_codec.WriteTagAndValue(ref output, (bool?) oneofField_);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.StringField) {
-        _oneof_stringField_codec.WriteTagAndValue(ref output, (string) oneofField_);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.BytesField) {
-        _oneof_bytesField_codec.WriteTagAndValue(ref output, (pb::ByteString) oneofField_);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (oneofFieldCase_ == OneofFieldOneofCase.AnyField) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(AnyField);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.ApiField) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(ApiField);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.DurationField) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(DurationField);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.EmptyField) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(EmptyField);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.FieldMaskField) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(FieldMaskField);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.SourceContextField) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(SourceContextField);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.StructField) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(StructField);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.TimestampField) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(TimestampField);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.TypeField) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(TypeField);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.DoubleField) {
-        size += _oneof_doubleField_codec.CalculateSizeWithTag(DoubleField);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.FloatField) {
-        size += _oneof_floatField_codec.CalculateSizeWithTag(FloatField);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.Int64Field) {
-        size += _oneof_int64Field_codec.CalculateSizeWithTag(Int64Field);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.Uint64Field) {
-        size += _oneof_uint64Field_codec.CalculateSizeWithTag(Uint64Field);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.Int32Field) {
-        size += _oneof_int32Field_codec.CalculateSizeWithTag(Int32Field);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.Uint32Field) {
-        size += _oneof_uint32Field_codec.CalculateSizeWithTag(Uint32Field);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.BoolField) {
-        size += _oneof_boolField_codec.CalculateSizeWithTag(BoolField);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.StringField) {
-        size += _oneof_stringField_codec.CalculateSizeWithTag(StringField);
-      }
-      if (oneofFieldCase_ == OneofFieldOneofCase.BytesField) {
-        size += _oneof_bytesField_codec.CalculateSizeWithTag(BytesField);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(OneofWellKnownTypes other) {
-      if (other == null) {
-        return;
-      }
-      switch (other.OneofFieldCase) {
-        case OneofFieldOneofCase.AnyField:
-          if (AnyField == null) {
-            AnyField = new global::Google.Protobuf.WellKnownTypes.Any();
-          }
-          AnyField.MergeFrom(other.AnyField);
-          break;
-        case OneofFieldOneofCase.ApiField:
-          if (ApiField == null) {
-            ApiField = new global::Google.Protobuf.WellKnownTypes.Api();
-          }
-          ApiField.MergeFrom(other.ApiField);
-          break;
-        case OneofFieldOneofCase.DurationField:
-          if (DurationField == null) {
-            DurationField = new global::Google.Protobuf.WellKnownTypes.Duration();
-          }
-          DurationField.MergeFrom(other.DurationField);
-          break;
-        case OneofFieldOneofCase.EmptyField:
-          if (EmptyField == null) {
-            EmptyField = new global::Google.Protobuf.WellKnownTypes.Empty();
-          }
-          EmptyField.MergeFrom(other.EmptyField);
-          break;
-        case OneofFieldOneofCase.FieldMaskField:
-          if (FieldMaskField == null) {
-            FieldMaskField = new global::Google.Protobuf.WellKnownTypes.FieldMask();
-          }
-          FieldMaskField.MergeFrom(other.FieldMaskField);
-          break;
-        case OneofFieldOneofCase.SourceContextField:
-          if (SourceContextField == null) {
-            SourceContextField = new global::Google.Protobuf.WellKnownTypes.SourceContext();
-          }
-          SourceContextField.MergeFrom(other.SourceContextField);
-          break;
-        case OneofFieldOneofCase.StructField:
-          if (StructField == null) {
-            StructField = new global::Google.Protobuf.WellKnownTypes.Struct();
-          }
-          StructField.MergeFrom(other.StructField);
-          break;
-        case OneofFieldOneofCase.TimestampField:
-          if (TimestampField == null) {
-            TimestampField = new global::Google.Protobuf.WellKnownTypes.Timestamp();
-          }
-          TimestampField.MergeFrom(other.TimestampField);
-          break;
-        case OneofFieldOneofCase.TypeField:
-          if (TypeField == null) {
-            TypeField = new global::Google.Protobuf.WellKnownTypes.Type();
-          }
-          TypeField.MergeFrom(other.TypeField);
-          break;
-        case OneofFieldOneofCase.DoubleField:
-          DoubleField = other.DoubleField;
-          break;
-        case OneofFieldOneofCase.FloatField:
-          FloatField = other.FloatField;
-          break;
-        case OneofFieldOneofCase.Int64Field:
-          Int64Field = other.Int64Field;
-          break;
-        case OneofFieldOneofCase.Uint64Field:
-          Uint64Field = other.Uint64Field;
-          break;
-        case OneofFieldOneofCase.Int32Field:
-          Int32Field = other.Int32Field;
-          break;
-        case OneofFieldOneofCase.Uint32Field:
-          Uint32Field = other.Uint32Field;
-          break;
-        case OneofFieldOneofCase.BoolField:
-          BoolField = other.BoolField;
-          break;
-        case OneofFieldOneofCase.StringField:
-          StringField = other.StringField;
-          break;
-        case OneofFieldOneofCase.BytesField:
-          BytesField = other.BytesField;
-          break;
-      }
-
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 10: {
-            global::Google.Protobuf.WellKnownTypes.Any subBuilder = new global::Google.Protobuf.WellKnownTypes.Any();
-            if (oneofFieldCase_ == OneofFieldOneofCase.AnyField) {
-              subBuilder.MergeFrom(AnyField);
-            }
-            input.ReadMessage(subBuilder);
-            AnyField = subBuilder;
-            break;
-          }
-          case 18: {
-            global::Google.Protobuf.WellKnownTypes.Api subBuilder = new global::Google.Protobuf.WellKnownTypes.Api();
-            if (oneofFieldCase_ == OneofFieldOneofCase.ApiField) {
-              subBuilder.MergeFrom(ApiField);
-            }
-            input.ReadMessage(subBuilder);
-            ApiField = subBuilder;
-            break;
-          }
-          case 26: {
-            global::Google.Protobuf.WellKnownTypes.Duration subBuilder = new global::Google.Protobuf.WellKnownTypes.Duration();
-            if (oneofFieldCase_ == OneofFieldOneofCase.DurationField) {
-              subBuilder.MergeFrom(DurationField);
-            }
-            input.ReadMessage(subBuilder);
-            DurationField = subBuilder;
-            break;
-          }
-          case 34: {
-            global::Google.Protobuf.WellKnownTypes.Empty subBuilder = new global::Google.Protobuf.WellKnownTypes.Empty();
-            if (oneofFieldCase_ == OneofFieldOneofCase.EmptyField) {
-              subBuilder.MergeFrom(EmptyField);
-            }
-            input.ReadMessage(subBuilder);
-            EmptyField = subBuilder;
-            break;
-          }
-          case 42: {
-            global::Google.Protobuf.WellKnownTypes.FieldMask subBuilder = new global::Google.Protobuf.WellKnownTypes.FieldMask();
-            if (oneofFieldCase_ == OneofFieldOneofCase.FieldMaskField) {
-              subBuilder.MergeFrom(FieldMaskField);
-            }
-            input.ReadMessage(subBuilder);
-            FieldMaskField = subBuilder;
-            break;
-          }
-          case 50: {
-            global::Google.Protobuf.WellKnownTypes.SourceContext subBuilder = new global::Google.Protobuf.WellKnownTypes.SourceContext();
-            if (oneofFieldCase_ == OneofFieldOneofCase.SourceContextField) {
-              subBuilder.MergeFrom(SourceContextField);
-            }
-            input.ReadMessage(subBuilder);
-            SourceContextField = subBuilder;
-            break;
-          }
-          case 58: {
-            global::Google.Protobuf.WellKnownTypes.Struct subBuilder = new global::Google.Protobuf.WellKnownTypes.Struct();
-            if (oneofFieldCase_ == OneofFieldOneofCase.StructField) {
-              subBuilder.MergeFrom(StructField);
-            }
-            input.ReadMessage(subBuilder);
-            StructField = subBuilder;
-            break;
-          }
-          case 66: {
-            global::Google.Protobuf.WellKnownTypes.Timestamp subBuilder = new global::Google.Protobuf.WellKnownTypes.Timestamp();
-            if (oneofFieldCase_ == OneofFieldOneofCase.TimestampField) {
-              subBuilder.MergeFrom(TimestampField);
-            }
-            input.ReadMessage(subBuilder);
-            TimestampField = subBuilder;
-            break;
-          }
-          case 74: {
-            global::Google.Protobuf.WellKnownTypes.Type subBuilder = new global::Google.Protobuf.WellKnownTypes.Type();
-            if (oneofFieldCase_ == OneofFieldOneofCase.TypeField) {
-              subBuilder.MergeFrom(TypeField);
-            }
-            input.ReadMessage(subBuilder);
-            TypeField = subBuilder;
-            break;
-          }
-          case 82: {
-            DoubleField = _oneof_doubleField_codec.Read(input);
-            break;
-          }
-          case 90: {
-            FloatField = _oneof_floatField_codec.Read(input);
-            break;
-          }
-          case 98: {
-            Int64Field = _oneof_int64Field_codec.Read(input);
-            break;
-          }
-          case 106: {
-            Uint64Field = _oneof_uint64Field_codec.Read(input);
-            break;
-          }
-          case 114: {
-            Int32Field = _oneof_int32Field_codec.Read(input);
-            break;
-          }
-          case 122: {
-            Uint32Field = _oneof_uint32Field_codec.Read(input);
-            break;
-          }
-          case 130: {
-            BoolField = _oneof_boolField_codec.Read(input);
-            break;
-          }
-          case 138: {
-            StringField = _oneof_stringField_codec.Read(input);
-            break;
-          }
-          case 146: {
-            BytesField = _oneof_bytesField_codec.Read(input);
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 10: {
-            global::Google.Protobuf.WellKnownTypes.Any subBuilder = new global::Google.Protobuf.WellKnownTypes.Any();
-            if (oneofFieldCase_ == OneofFieldOneofCase.AnyField) {
-              subBuilder.MergeFrom(AnyField);
-            }
-            input.ReadMessage(subBuilder);
-            AnyField = subBuilder;
-            break;
-          }
-          case 18: {
-            global::Google.Protobuf.WellKnownTypes.Api subBuilder = new global::Google.Protobuf.WellKnownTypes.Api();
-            if (oneofFieldCase_ == OneofFieldOneofCase.ApiField) {
-              subBuilder.MergeFrom(ApiField);
-            }
-            input.ReadMessage(subBuilder);
-            ApiField = subBuilder;
-            break;
-          }
-          case 26: {
-            global::Google.Protobuf.WellKnownTypes.Duration subBuilder = new global::Google.Protobuf.WellKnownTypes.Duration();
-            if (oneofFieldCase_ == OneofFieldOneofCase.DurationField) {
-              subBuilder.MergeFrom(DurationField);
-            }
-            input.ReadMessage(subBuilder);
-            DurationField = subBuilder;
-            break;
-          }
-          case 34: {
-            global::Google.Protobuf.WellKnownTypes.Empty subBuilder = new global::Google.Protobuf.WellKnownTypes.Empty();
-            if (oneofFieldCase_ == OneofFieldOneofCase.EmptyField) {
-              subBuilder.MergeFrom(EmptyField);
-            }
-            input.ReadMessage(subBuilder);
-            EmptyField = subBuilder;
-            break;
-          }
-          case 42: {
-            global::Google.Protobuf.WellKnownTypes.FieldMask subBuilder = new global::Google.Protobuf.WellKnownTypes.FieldMask();
-            if (oneofFieldCase_ == OneofFieldOneofCase.FieldMaskField) {
-              subBuilder.MergeFrom(FieldMaskField);
-            }
-            input.ReadMessage(subBuilder);
-            FieldMaskField = subBuilder;
-            break;
-          }
-          case 50: {
-            global::Google.Protobuf.WellKnownTypes.SourceContext subBuilder = new global::Google.Protobuf.WellKnownTypes.SourceContext();
-            if (oneofFieldCase_ == OneofFieldOneofCase.SourceContextField) {
-              subBuilder.MergeFrom(SourceContextField);
-            }
-            input.ReadMessage(subBuilder);
-            SourceContextField = subBuilder;
-            break;
-          }
-          case 58: {
-            global::Google.Protobuf.WellKnownTypes.Struct subBuilder = new global::Google.Protobuf.WellKnownTypes.Struct();
-            if (oneofFieldCase_ == OneofFieldOneofCase.StructField) {
-              subBuilder.MergeFrom(StructField);
-            }
-            input.ReadMessage(subBuilder);
-            StructField = subBuilder;
-            break;
-          }
-          case 66: {
-            global::Google.Protobuf.WellKnownTypes.Timestamp subBuilder = new global::Google.Protobuf.WellKnownTypes.Timestamp();
-            if (oneofFieldCase_ == OneofFieldOneofCase.TimestampField) {
-              subBuilder.MergeFrom(TimestampField);
-            }
-            input.ReadMessage(subBuilder);
-            TimestampField = subBuilder;
-            break;
-          }
-          case 74: {
-            global::Google.Protobuf.WellKnownTypes.Type subBuilder = new global::Google.Protobuf.WellKnownTypes.Type();
-            if (oneofFieldCase_ == OneofFieldOneofCase.TypeField) {
-              subBuilder.MergeFrom(TypeField);
-            }
-            input.ReadMessage(subBuilder);
-            TypeField = subBuilder;
-            break;
-          }
-          case 82: {
-            DoubleField = _oneof_doubleField_codec.Read(ref input);
-            break;
-          }
-          case 90: {
-            FloatField = _oneof_floatField_codec.Read(ref input);
-            break;
-          }
-          case 98: {
-            Int64Field = _oneof_int64Field_codec.Read(ref input);
-            break;
-          }
-          case 106: {
-            Uint64Field = _oneof_uint64Field_codec.Read(ref input);
-            break;
-          }
-          case 114: {
-            Int32Field = _oneof_int32Field_codec.Read(ref input);
-            break;
-          }
-          case 122: {
-            Uint32Field = _oneof_uint32Field_codec.Read(ref input);
-            break;
-          }
-          case 130: {
-            BoolField = _oneof_boolField_codec.Read(ref input);
-            break;
-          }
-          case 138: {
-            StringField = _oneof_stringField_codec.Read(ref input);
-            break;
-          }
-          case 146: {
-            BytesField = _oneof_bytesField_codec.Read(ref input);
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  /// <summary>
-  /// A map field for each well-known type. We only
-  /// need to worry about the value part of the map being the
-  /// well-known types, as messages can't be map keys.
-  /// </summary>
-  public sealed partial class MapWellKnownTypes : pb::IMessage<MapWellKnownTypes>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<MapWellKnownTypes> _parser = new pb::MessageParser<MapWellKnownTypes>(() => new MapWellKnownTypes());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<MapWellKnownTypes> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.TestProtos.UnittestWellKnownTypesReflection.Descriptor.MessageTypes[3]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public MapWellKnownTypes() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public MapWellKnownTypes(MapWellKnownTypes other) : this() {
-      anyField_ = other.anyField_.Clone();
-      apiField_ = other.apiField_.Clone();
-      durationField_ = other.durationField_.Clone();
-      emptyField_ = other.emptyField_.Clone();
-      fieldMaskField_ = other.fieldMaskField_.Clone();
-      sourceContextField_ = other.sourceContextField_.Clone();
-      structField_ = other.structField_.Clone();
-      timestampField_ = other.timestampField_.Clone();
-      typeField_ = other.typeField_.Clone();
-      doubleField_ = other.doubleField_.Clone();
-      floatField_ = other.floatField_.Clone();
-      int64Field_ = other.int64Field_.Clone();
-      uint64Field_ = other.uint64Field_.Clone();
-      int32Field_ = other.int32Field_.Clone();
-      uint32Field_ = other.uint32Field_.Clone();
-      boolField_ = other.boolField_.Clone();
-      stringField_ = other.stringField_.Clone();
-      bytesField_ = other.bytesField_.Clone();
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public MapWellKnownTypes Clone() {
-      return new MapWellKnownTypes(this);
-    }
-
-    /// <summary>Field number for the "any_field" field.</summary>
-    public const int AnyFieldFieldNumber = 1;
-    private static readonly pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.Any>.Codec _map_anyField_codec
-        = new pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.Any>.Codec(pb::FieldCodec.ForInt32(8, 0), pb::FieldCodec.ForMessage(18, global::Google.Protobuf.WellKnownTypes.Any.Parser), 10);
-    private readonly pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.Any> anyField_ = new pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.Any>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.Any> AnyField {
-      get { return anyField_; }
-    }
-
-    /// <summary>Field number for the "api_field" field.</summary>
-    public const int ApiFieldFieldNumber = 2;
-    private static readonly pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.Api>.Codec _map_apiField_codec
-        = new pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.Api>.Codec(pb::FieldCodec.ForInt32(8, 0), pb::FieldCodec.ForMessage(18, global::Google.Protobuf.WellKnownTypes.Api.Parser), 18);
-    private readonly pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.Api> apiField_ = new pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.Api>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.Api> ApiField {
-      get { return apiField_; }
-    }
-
-    /// <summary>Field number for the "duration_field" field.</summary>
-    public const int DurationFieldFieldNumber = 3;
-    private static readonly pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.Duration>.Codec _map_durationField_codec
-        = new pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.Duration>.Codec(pb::FieldCodec.ForInt32(8, 0), pb::FieldCodec.ForMessage(18, global::Google.Protobuf.WellKnownTypes.Duration.Parser), 26);
-    private readonly pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.Duration> durationField_ = new pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.Duration>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.Duration> DurationField {
-      get { return durationField_; }
-    }
-
-    /// <summary>Field number for the "empty_field" field.</summary>
-    public const int EmptyFieldFieldNumber = 4;
-    private static readonly pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.Empty>.Codec _map_emptyField_codec
-        = new pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.Empty>.Codec(pb::FieldCodec.ForInt32(8, 0), pb::FieldCodec.ForMessage(18, global::Google.Protobuf.WellKnownTypes.Empty.Parser), 34);
-    private readonly pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.Empty> emptyField_ = new pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.Empty>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.Empty> EmptyField {
-      get { return emptyField_; }
-    }
-
-    /// <summary>Field number for the "field_mask_field" field.</summary>
-    public const int FieldMaskFieldFieldNumber = 5;
-    private static readonly pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.FieldMask>.Codec _map_fieldMaskField_codec
-        = new pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.FieldMask>.Codec(pb::FieldCodec.ForInt32(8, 0), pb::FieldCodec.ForMessage(18, global::Google.Protobuf.WellKnownTypes.FieldMask.Parser), 42);
-    private readonly pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.FieldMask> fieldMaskField_ = new pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.FieldMask>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.FieldMask> FieldMaskField {
-      get { return fieldMaskField_; }
-    }
-
-    /// <summary>Field number for the "source_context_field" field.</summary>
-    public const int SourceContextFieldFieldNumber = 6;
-    private static readonly pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.SourceContext>.Codec _map_sourceContextField_codec
-        = new pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.SourceContext>.Codec(pb::FieldCodec.ForInt32(8, 0), pb::FieldCodec.ForMessage(18, global::Google.Protobuf.WellKnownTypes.SourceContext.Parser), 50);
-    private readonly pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.SourceContext> sourceContextField_ = new pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.SourceContext>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.SourceContext> SourceContextField {
-      get { return sourceContextField_; }
-    }
-
-    /// <summary>Field number for the "struct_field" field.</summary>
-    public const int StructFieldFieldNumber = 7;
-    private static readonly pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.Struct>.Codec _map_structField_codec
-        = new pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.Struct>.Codec(pb::FieldCodec.ForInt32(8, 0), pb::FieldCodec.ForMessage(18, global::Google.Protobuf.WellKnownTypes.Struct.Parser), 58);
-    private readonly pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.Struct> structField_ = new pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.Struct>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.Struct> StructField {
-      get { return structField_; }
-    }
-
-    /// <summary>Field number for the "timestamp_field" field.</summary>
-    public const int TimestampFieldFieldNumber = 8;
-    private static readonly pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.Timestamp>.Codec _map_timestampField_codec
-        = new pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.Timestamp>.Codec(pb::FieldCodec.ForInt32(8, 0), pb::FieldCodec.ForMessage(18, global::Google.Protobuf.WellKnownTypes.Timestamp.Parser), 66);
-    private readonly pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.Timestamp> timestampField_ = new pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.Timestamp>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.Timestamp> TimestampField {
-      get { return timestampField_; }
-    }
-
-    /// <summary>Field number for the "type_field" field.</summary>
-    public const int TypeFieldFieldNumber = 9;
-    private static readonly pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.Type>.Codec _map_typeField_codec
-        = new pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.Type>.Codec(pb::FieldCodec.ForInt32(8, 0), pb::FieldCodec.ForMessage(18, global::Google.Protobuf.WellKnownTypes.Type.Parser), 74);
-    private readonly pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.Type> typeField_ = new pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.Type>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::MapField<int, global::Google.Protobuf.WellKnownTypes.Type> TypeField {
-      get { return typeField_; }
-    }
-
-    /// <summary>Field number for the "double_field" field.</summary>
-    public const int DoubleFieldFieldNumber = 10;
-    private static readonly pbc::MapField<int, double?>.Codec _map_doubleField_codec
-        = new pbc::MapField<int, double?>.Codec(pb::FieldCodec.ForInt32(8, 0), pb::FieldCodec.ForStructWrapper<double>(18), 82);
-    private readonly pbc::MapField<int, double?> doubleField_ = new pbc::MapField<int, double?>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::MapField<int, double?> DoubleField {
-      get { return doubleField_; }
-    }
-
-    /// <summary>Field number for the "float_field" field.</summary>
-    public const int FloatFieldFieldNumber = 11;
-    private static readonly pbc::MapField<int, float?>.Codec _map_floatField_codec
-        = new pbc::MapField<int, float?>.Codec(pb::FieldCodec.ForInt32(8, 0), pb::FieldCodec.ForStructWrapper<float>(18), 90);
-    private readonly pbc::MapField<int, float?> floatField_ = new pbc::MapField<int, float?>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::MapField<int, float?> FloatField {
-      get { return floatField_; }
-    }
-
-    /// <summary>Field number for the "int64_field" field.</summary>
-    public const int Int64FieldFieldNumber = 12;
-    private static readonly pbc::MapField<int, long?>.Codec _map_int64Field_codec
-        = new pbc::MapField<int, long?>.Codec(pb::FieldCodec.ForInt32(8, 0), pb::FieldCodec.ForStructWrapper<long>(18), 98);
-    private readonly pbc::MapField<int, long?> int64Field_ = new pbc::MapField<int, long?>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::MapField<int, long?> Int64Field {
-      get { return int64Field_; }
-    }
-
-    /// <summary>Field number for the "uint64_field" field.</summary>
-    public const int Uint64FieldFieldNumber = 13;
-    private static readonly pbc::MapField<int, ulong?>.Codec _map_uint64Field_codec
-        = new pbc::MapField<int, ulong?>.Codec(pb::FieldCodec.ForInt32(8, 0), pb::FieldCodec.ForStructWrapper<ulong>(18), 106);
-    private readonly pbc::MapField<int, ulong?> uint64Field_ = new pbc::MapField<int, ulong?>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::MapField<int, ulong?> Uint64Field {
-      get { return uint64Field_; }
-    }
-
-    /// <summary>Field number for the "int32_field" field.</summary>
-    public const int Int32FieldFieldNumber = 14;
-    private static readonly pbc::MapField<int, int?>.Codec _map_int32Field_codec
-        = new pbc::MapField<int, int?>.Codec(pb::FieldCodec.ForInt32(8, 0), pb::FieldCodec.ForStructWrapper<int>(18), 114);
-    private readonly pbc::MapField<int, int?> int32Field_ = new pbc::MapField<int, int?>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::MapField<int, int?> Int32Field {
-      get { return int32Field_; }
-    }
-
-    /// <summary>Field number for the "uint32_field" field.</summary>
-    public const int Uint32FieldFieldNumber = 15;
-    private static readonly pbc::MapField<int, uint?>.Codec _map_uint32Field_codec
-        = new pbc::MapField<int, uint?>.Codec(pb::FieldCodec.ForInt32(8, 0), pb::FieldCodec.ForStructWrapper<uint>(18), 122);
-    private readonly pbc::MapField<int, uint?> uint32Field_ = new pbc::MapField<int, uint?>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::MapField<int, uint?> Uint32Field {
-      get { return uint32Field_; }
-    }
-
-    /// <summary>Field number for the "bool_field" field.</summary>
-    public const int BoolFieldFieldNumber = 16;
-    private static readonly pbc::MapField<int, bool?>.Codec _map_boolField_codec
-        = new pbc::MapField<int, bool?>.Codec(pb::FieldCodec.ForInt32(8, 0), pb::FieldCodec.ForStructWrapper<bool>(18), 130);
-    private readonly pbc::MapField<int, bool?> boolField_ = new pbc::MapField<int, bool?>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::MapField<int, bool?> BoolField {
-      get { return boolField_; }
-    }
-
-    /// <summary>Field number for the "string_field" field.</summary>
-    public const int StringFieldFieldNumber = 17;
-    private static readonly pbc::MapField<int, string>.Codec _map_stringField_codec
-        = new pbc::MapField<int, string>.Codec(pb::FieldCodec.ForInt32(8, 0), pb::FieldCodec.ForClassWrapper<string>(18), 138);
-    private readonly pbc::MapField<int, string> stringField_ = new pbc::MapField<int, string>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::MapField<int, string> StringField {
-      get { return stringField_; }
-    }
-
-    /// <summary>Field number for the "bytes_field" field.</summary>
-    public const int BytesFieldFieldNumber = 18;
-    private static readonly pbc::MapField<int, pb::ByteString>.Codec _map_bytesField_codec
-        = new pbc::MapField<int, pb::ByteString>.Codec(pb::FieldCodec.ForInt32(8, 0), pb::FieldCodec.ForClassWrapper<pb::ByteString>(18), 146);
-    private readonly pbc::MapField<int, pb::ByteString> bytesField_ = new pbc::MapField<int, pb::ByteString>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::MapField<int, pb::ByteString> BytesField {
-      get { return bytesField_; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as MapWellKnownTypes);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(MapWellKnownTypes other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (!AnyField.Equals(other.AnyField)) return false;
-      if (!ApiField.Equals(other.ApiField)) return false;
-      if (!DurationField.Equals(other.DurationField)) return false;
-      if (!EmptyField.Equals(other.EmptyField)) return false;
-      if (!FieldMaskField.Equals(other.FieldMaskField)) return false;
-      if (!SourceContextField.Equals(other.SourceContextField)) return false;
-      if (!StructField.Equals(other.StructField)) return false;
-      if (!TimestampField.Equals(other.TimestampField)) return false;
-      if (!TypeField.Equals(other.TypeField)) return false;
-      if (!DoubleField.Equals(other.DoubleField)) return false;
-      if (!FloatField.Equals(other.FloatField)) return false;
-      if (!Int64Field.Equals(other.Int64Field)) return false;
-      if (!Uint64Field.Equals(other.Uint64Field)) return false;
-      if (!Int32Field.Equals(other.Int32Field)) return false;
-      if (!Uint32Field.Equals(other.Uint32Field)) return false;
-      if (!BoolField.Equals(other.BoolField)) return false;
-      if (!StringField.Equals(other.StringField)) return false;
-      if (!BytesField.Equals(other.BytesField)) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      hash ^= AnyField.GetHashCode();
-      hash ^= ApiField.GetHashCode();
-      hash ^= DurationField.GetHashCode();
-      hash ^= EmptyField.GetHashCode();
-      hash ^= FieldMaskField.GetHashCode();
-      hash ^= SourceContextField.GetHashCode();
-      hash ^= StructField.GetHashCode();
-      hash ^= TimestampField.GetHashCode();
-      hash ^= TypeField.GetHashCode();
-      hash ^= DoubleField.GetHashCode();
-      hash ^= FloatField.GetHashCode();
-      hash ^= Int64Field.GetHashCode();
-      hash ^= Uint64Field.GetHashCode();
-      hash ^= Int32Field.GetHashCode();
-      hash ^= Uint32Field.GetHashCode();
-      hash ^= BoolField.GetHashCode();
-      hash ^= StringField.GetHashCode();
-      hash ^= BytesField.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      anyField_.WriteTo(output, _map_anyField_codec);
-      apiField_.WriteTo(output, _map_apiField_codec);
-      durationField_.WriteTo(output, _map_durationField_codec);
-      emptyField_.WriteTo(output, _map_emptyField_codec);
-      fieldMaskField_.WriteTo(output, _map_fieldMaskField_codec);
-      sourceContextField_.WriteTo(output, _map_sourceContextField_codec);
-      structField_.WriteTo(output, _map_structField_codec);
-      timestampField_.WriteTo(output, _map_timestampField_codec);
-      typeField_.WriteTo(output, _map_typeField_codec);
-      doubleField_.WriteTo(output, _map_doubleField_codec);
-      floatField_.WriteTo(output, _map_floatField_codec);
-      int64Field_.WriteTo(output, _map_int64Field_codec);
-      uint64Field_.WriteTo(output, _map_uint64Field_codec);
-      int32Field_.WriteTo(output, _map_int32Field_codec);
-      uint32Field_.WriteTo(output, _map_uint32Field_codec);
-      boolField_.WriteTo(output, _map_boolField_codec);
-      stringField_.WriteTo(output, _map_stringField_codec);
-      bytesField_.WriteTo(output, _map_bytesField_codec);
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      anyField_.WriteTo(ref output, _map_anyField_codec);
-      apiField_.WriteTo(ref output, _map_apiField_codec);
-      durationField_.WriteTo(ref output, _map_durationField_codec);
-      emptyField_.WriteTo(ref output, _map_emptyField_codec);
-      fieldMaskField_.WriteTo(ref output, _map_fieldMaskField_codec);
-      sourceContextField_.WriteTo(ref output, _map_sourceContextField_codec);
-      structField_.WriteTo(ref output, _map_structField_codec);
-      timestampField_.WriteTo(ref output, _map_timestampField_codec);
-      typeField_.WriteTo(ref output, _map_typeField_codec);
-      doubleField_.WriteTo(ref output, _map_doubleField_codec);
-      floatField_.WriteTo(ref output, _map_floatField_codec);
-      int64Field_.WriteTo(ref output, _map_int64Field_codec);
-      uint64Field_.WriteTo(ref output, _map_uint64Field_codec);
-      int32Field_.WriteTo(ref output, _map_int32Field_codec);
-      uint32Field_.WriteTo(ref output, _map_uint32Field_codec);
-      boolField_.WriteTo(ref output, _map_boolField_codec);
-      stringField_.WriteTo(ref output, _map_stringField_codec);
-      bytesField_.WriteTo(ref output, _map_bytesField_codec);
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      size += anyField_.CalculateSize(_map_anyField_codec);
-      size += apiField_.CalculateSize(_map_apiField_codec);
-      size += durationField_.CalculateSize(_map_durationField_codec);
-      size += emptyField_.CalculateSize(_map_emptyField_codec);
-      size += fieldMaskField_.CalculateSize(_map_fieldMaskField_codec);
-      size += sourceContextField_.CalculateSize(_map_sourceContextField_codec);
-      size += structField_.CalculateSize(_map_structField_codec);
-      size += timestampField_.CalculateSize(_map_timestampField_codec);
-      size += typeField_.CalculateSize(_map_typeField_codec);
-      size += doubleField_.CalculateSize(_map_doubleField_codec);
-      size += floatField_.CalculateSize(_map_floatField_codec);
-      size += int64Field_.CalculateSize(_map_int64Field_codec);
-      size += uint64Field_.CalculateSize(_map_uint64Field_codec);
-      size += int32Field_.CalculateSize(_map_int32Field_codec);
-      size += uint32Field_.CalculateSize(_map_uint32Field_codec);
-      size += boolField_.CalculateSize(_map_boolField_codec);
-      size += stringField_.CalculateSize(_map_stringField_codec);
-      size += bytesField_.CalculateSize(_map_bytesField_codec);
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(MapWellKnownTypes other) {
-      if (other == null) {
-        return;
-      }
-      anyField_.Add(other.anyField_);
-      apiField_.Add(other.apiField_);
-      durationField_.Add(other.durationField_);
-      emptyField_.Add(other.emptyField_);
-      fieldMaskField_.Add(other.fieldMaskField_);
-      sourceContextField_.Add(other.sourceContextField_);
-      structField_.Add(other.structField_);
-      timestampField_.Add(other.timestampField_);
-      typeField_.Add(other.typeField_);
-      doubleField_.Add(other.doubleField_);
-      floatField_.Add(other.floatField_);
-      int64Field_.Add(other.int64Field_);
-      uint64Field_.Add(other.uint64Field_);
-      int32Field_.Add(other.int32Field_);
-      uint32Field_.Add(other.uint32Field_);
-      boolField_.Add(other.boolField_);
-      stringField_.Add(other.stringField_);
-      bytesField_.Add(other.bytesField_);
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 10: {
-            anyField_.AddEntriesFrom(input, _map_anyField_codec);
-            break;
-          }
-          case 18: {
-            apiField_.AddEntriesFrom(input, _map_apiField_codec);
-            break;
-          }
-          case 26: {
-            durationField_.AddEntriesFrom(input, _map_durationField_codec);
-            break;
-          }
-          case 34: {
-            emptyField_.AddEntriesFrom(input, _map_emptyField_codec);
-            break;
-          }
-          case 42: {
-            fieldMaskField_.AddEntriesFrom(input, _map_fieldMaskField_codec);
-            break;
-          }
-          case 50: {
-            sourceContextField_.AddEntriesFrom(input, _map_sourceContextField_codec);
-            break;
-          }
-          case 58: {
-            structField_.AddEntriesFrom(input, _map_structField_codec);
-            break;
-          }
-          case 66: {
-            timestampField_.AddEntriesFrom(input, _map_timestampField_codec);
-            break;
-          }
-          case 74: {
-            typeField_.AddEntriesFrom(input, _map_typeField_codec);
-            break;
-          }
-          case 82: {
-            doubleField_.AddEntriesFrom(input, _map_doubleField_codec);
-            break;
-          }
-          case 90: {
-            floatField_.AddEntriesFrom(input, _map_floatField_codec);
-            break;
-          }
-          case 98: {
-            int64Field_.AddEntriesFrom(input, _map_int64Field_codec);
-            break;
-          }
-          case 106: {
-            uint64Field_.AddEntriesFrom(input, _map_uint64Field_codec);
-            break;
-          }
-          case 114: {
-            int32Field_.AddEntriesFrom(input, _map_int32Field_codec);
-            break;
-          }
-          case 122: {
-            uint32Field_.AddEntriesFrom(input, _map_uint32Field_codec);
-            break;
-          }
-          case 130: {
-            boolField_.AddEntriesFrom(input, _map_boolField_codec);
-            break;
-          }
-          case 138: {
-            stringField_.AddEntriesFrom(input, _map_stringField_codec);
-            break;
-          }
-          case 146: {
-            bytesField_.AddEntriesFrom(input, _map_bytesField_codec);
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 10: {
-            anyField_.AddEntriesFrom(ref input, _map_anyField_codec);
-            break;
-          }
-          case 18: {
-            apiField_.AddEntriesFrom(ref input, _map_apiField_codec);
-            break;
-          }
-          case 26: {
-            durationField_.AddEntriesFrom(ref input, _map_durationField_codec);
-            break;
-          }
-          case 34: {
-            emptyField_.AddEntriesFrom(ref input, _map_emptyField_codec);
-            break;
-          }
-          case 42: {
-            fieldMaskField_.AddEntriesFrom(ref input, _map_fieldMaskField_codec);
-            break;
-          }
-          case 50: {
-            sourceContextField_.AddEntriesFrom(ref input, _map_sourceContextField_codec);
-            break;
-          }
-          case 58: {
-            structField_.AddEntriesFrom(ref input, _map_structField_codec);
-            break;
-          }
-          case 66: {
-            timestampField_.AddEntriesFrom(ref input, _map_timestampField_codec);
-            break;
-          }
-          case 74: {
-            typeField_.AddEntriesFrom(ref input, _map_typeField_codec);
-            break;
-          }
-          case 82: {
-            doubleField_.AddEntriesFrom(ref input, _map_doubleField_codec);
-            break;
-          }
-          case 90: {
-            floatField_.AddEntriesFrom(ref input, _map_floatField_codec);
-            break;
-          }
-          case 98: {
-            int64Field_.AddEntriesFrom(ref input, _map_int64Field_codec);
-            break;
-          }
-          case 106: {
-            uint64Field_.AddEntriesFrom(ref input, _map_uint64Field_codec);
-            break;
-          }
-          case 114: {
-            int32Field_.AddEntriesFrom(ref input, _map_int32Field_codec);
-            break;
-          }
-          case 122: {
-            uint32Field_.AddEntriesFrom(ref input, _map_uint32Field_codec);
-            break;
-          }
-          case 130: {
-            boolField_.AddEntriesFrom(ref input, _map_boolField_codec);
-            break;
-          }
-          case 138: {
-            stringField_.AddEntriesFrom(ref input, _map_stringField_codec);
-            break;
-          }
-          case 146: {
-            bytesField_.AddEntriesFrom(ref input, _map_bytesField_codec);
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  #endregion
-
-}
-
-#endregion Designer generated code
diff --git a/libs/protobuf/csharp/src/Google.Protobuf.Test/Buffers/ArrayBufferWriter.cs b/libs/protobuf/csharp/src/Google.Protobuf.Test/Buffers/ArrayBufferWriter.cs
deleted file mode 100644
index a36a951..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf.Test/Buffers/ArrayBufferWriter.cs
+++ /dev/null
@@ -1,225 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-using System.Buffers;
-using System.Diagnostics;
-
-namespace Google.Protobuf.Buffers
-{
-    /// <summary>
-    /// Represents a heap-based, array-backed output sink into which <typeparam name="T"/> data can be written.
-    /// 
-    /// ArrayBufferWriter is originally from corefx, and has been contributed to Protobuf
-    /// https://github.com/dotnet/runtime/blob/071da4c41aa808c949a773b92dca6f88de9d11f3/src/libraries/Common/src/System/Buffers/ArrayBufferWriter.cs
-    /// </summary>
-    internal sealed class TestArrayBufferWriter<T> : IBufferWriter<T>
-    {
-        private T[] _buffer;
-        private int _index;
-
-        private const int DefaultInitialBufferSize = 256;
-
-        /// <summary>
-        /// Creates an instance of an <see cref="TestArrayBufferWriter{T}"/>, in which data can be written to,
-        /// with the default initial capacity.
-        /// </summary>
-        public TestArrayBufferWriter()
-        {
-            _buffer = new T[0];
-            _index = 0;
-        }
-
-        /// <summary>
-        /// Useful for testing writing to buffer writer with a lot of small segments.
-        /// If set, it limits the max number of bytes by which the buffer grows by at once.
-        /// </summary>
-        public int? MaxGrowBy { get; set; }
-
-        /// <summary>
-        /// Creates an instance of an <see cref="TestArrayBufferWriter{T}"/>, in which data can be written to,
-        /// with an initial capacity specified.
-        /// </summary>
-        /// <param name="initialCapacity">The minimum capacity with which to initialize the underlying buffer.</param>
-        /// <exception cref="ArgumentException">
-        /// Thrown when <paramref name="initialCapacity"/> is not positive (i.e. less than or equal to 0).
-        /// </exception>
-        public TestArrayBufferWriter(int initialCapacity)
-        {
-            if (initialCapacity <= 0)
-                throw new ArgumentException(nameof(initialCapacity));
-
-            _buffer = new T[initialCapacity];
-            _index = 0;
-        }
-
-        /// <summary>
-        /// Returns the data written to the underlying buffer so far, as a <see cref="ReadOnlyMemory{T}"/>.
-        /// </summary>
-        public ReadOnlyMemory<T> WrittenMemory => _buffer.AsMemory(0, _index);
-
-        /// <summary>
-        /// Returns the data written to the underlying buffer so far, as a <see cref="ReadOnlySpan{T}"/>.
-        /// </summary>
-        public ReadOnlySpan<T> WrittenSpan => _buffer.AsSpan(0, _index);
-
-        /// <summary>
-        /// Returns the amount of data written to the underlying buffer so far.
-        /// </summary>
-        public int WrittenCount => _index;
-
-        /// <summary>
-        /// Returns the total amount of space within the underlying buffer.
-        /// </summary>
-        public int Capacity => _buffer.Length;
-
-        /// <summary>
-        /// Returns the amount of space available that can still be written into without forcing the underlying buffer to grow.
-        /// </summary>
-        public int FreeCapacity => _buffer.Length - _index;
-
-        /// <summary>
-        /// Clears the data written to the underlying buffer.
-        /// </summary>
-        /// <remarks>
-        /// You must clear the <see cref="TestArrayBufferWriter{T}"/> before trying to re-use it.
-        /// </remarks>
-        public void Clear()
-        {
-            Debug.Assert(_buffer.Length >= _index);
-            _buffer.AsSpan(0, _index).Clear();
-            _index = 0;
-        }
-
-        /// <summary>
-        /// Notifies <see cref="IBufferWriter{T}"/> that <paramref name="count"/> amount of data was written to the output <see cref="Span{T}"/>/<see cref="Memory{T}"/>
-        /// </summary>
-        /// <exception cref="ArgumentException">
-        /// Thrown when <paramref name="count"/> is negative.
-        /// </exception>
-        /// <exception cref="InvalidOperationException">
-        /// Thrown when attempting to advance past the end of the underlying buffer.
-        /// </exception>
-        /// <remarks>
-        /// You must request a new buffer after calling Advance to continue writing more data and cannot write to a previously acquired buffer.
-        /// </remarks>
-        public void Advance(int count)
-        {
-            if (count < 0)
-                throw new ArgumentException(nameof(count));
-
-            if (_index > _buffer.Length - count)
-                throw new InvalidOperationException("Advanced past capacity.");
-
-            _index += count;
-        }
-
-        /// <summary>
-        /// Returns a <see cref="Memory{T}"/> to write to that is at least the requested length (specified by <paramref name="sizeHint"/>).
-        /// If no <paramref name="sizeHint"/> is provided (or it's equal to <code>0</code>), some non-empty buffer is returned.
-        /// </summary>
-        /// <exception cref="ArgumentException">
-        /// Thrown when <paramref name="sizeHint"/> is negative.
-        /// </exception>
-        /// <remarks>
-        /// This will never return an empty <see cref="Memory{T}"/>.
-        /// </remarks>
-        /// <remarks>
-        /// There is no guarantee that successive calls will return the same buffer or the same-sized buffer.
-        /// </remarks>
-        /// <remarks>
-        /// You must request a new buffer after calling Advance to continue writing more data and cannot write to a previously acquired buffer.
-        /// </remarks>
-        public Memory<T> GetMemory(int sizeHint = 0)
-        {
-            CheckAndResizeBuffer(sizeHint);
-            Debug.Assert(_buffer.Length > _index);
-            return _buffer.AsMemory(_index);
-        }
-
-        /// <summary>
-        /// Returns a <see cref="Span{T}"/> to write to that is at least the requested length (specified by <paramref name="sizeHint"/>).
-        /// If no <paramref name="sizeHint"/> is provided (or it's equal to <code>0</code>), some non-empty buffer is returned.
-        /// </summary>
-        /// <exception cref="ArgumentException">
-        /// Thrown when <paramref name="sizeHint"/> is negative.
-        /// </exception>
-        /// <remarks>
-        /// This will never return an empty <see cref="Span{T}"/>.
-        /// </remarks>
-        /// <remarks>
-        /// There is no guarantee that successive calls will return the same buffer or the same-sized buffer.
-        /// </remarks>
-        /// <remarks>
-        /// You must request a new buffer after calling Advance to continue writing more data and cannot write to a previously acquired buffer.
-        /// </remarks>
-        public Span<T> GetSpan(int sizeHint = 0)
-        {
-            CheckAndResizeBuffer(sizeHint);
-            Debug.Assert(_buffer.Length > _index);
-            return _buffer.AsSpan(_index);
-        }
-
-        private void CheckAndResizeBuffer(int sizeHint)
-        {
-            if (sizeHint < 0)
-                throw new ArgumentException(nameof(sizeHint));
-
-            if (sizeHint == 0)
-            {
-                sizeHint = 1;
-            }
-
-            if (sizeHint > FreeCapacity)
-            {
-                int growBy = Math.Max(sizeHint, _buffer.Length);
-
-                if (_buffer.Length == 0)
-                {
-                    growBy = Math.Max(growBy, DefaultInitialBufferSize);
-                }
-
-                // enable tests that write to small buffer segments
-                if (MaxGrowBy.HasValue && growBy > MaxGrowBy.Value)
-                {
-                    growBy = MaxGrowBy.Value;
-                }
-
-                int newSize = checked(_buffer.Length + growBy);
-
-                Array.Resize(ref _buffer, newSize);
-            }
-
-            Debug.Assert(FreeCapacity > 0 && FreeCapacity >= sizeHint);
-        }
-    }
-}
\ No newline at end of file
diff --git a/libs/protobuf/csharp/src/Google.Protobuf.Test/ByteStringTest.cs b/libs/protobuf/csharp/src/Google.Protobuf.Test/ByteStringTest.cs
deleted file mode 100644
index 4876e09..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf.Test/ByteStringTest.cs
+++ /dev/null
@@ -1,439 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-using System.Text;
-using NUnit.Framework;
-using System.IO;
-using System.Collections.Generic;
-using System.Collections;
-using System.Linq;
-using System.Buffers;
-using System.Runtime.InteropServices;
-using System.Threading;
-using System.Runtime.CompilerServices;
-#if !NET35
-using System.Threading.Tasks;
-#endif
-
-namespace Google.Protobuf
-{
-    public class ByteStringTest
-    {
-        [Test]
-        public void Equality()
-        {
-            ByteString b1 = ByteString.CopyFrom(1, 2, 3);
-            ByteString b2 = ByteString.CopyFrom(1, 2, 3);
-            ByteString b3 = ByteString.CopyFrom(1, 2, 4);
-            ByteString b4 = ByteString.CopyFrom(1, 2, 3, 4);
-            EqualityTester.AssertEquality(b1, b1);
-            EqualityTester.AssertEquality(b1, b2);
-            EqualityTester.AssertInequality(b1, b3);
-            EqualityTester.AssertInequality(b1, b4);
-            EqualityTester.AssertInequality(b1, null);
-            EqualityTester.AssertEquality(ByteString.Empty, ByteString.Empty);
-#pragma warning disable 1718 // Deliberately calling ==(b1, b1) and !=(b1, b1)
-            Assert.IsTrue(b1 == b1);
-            Assert.IsTrue(b1 == b2);
-            Assert.IsFalse(b1 == b3);
-            Assert.IsFalse(b1 == b4);
-            Assert.IsFalse(b1 == null);
-            Assert.IsTrue((ByteString) null == null);
-            Assert.IsFalse(b1 != b1);
-            Assert.IsFalse(b1 != b2);
-            Assert.IsTrue(ByteString.Empty == ByteString.Empty);
-#pragma warning disable 1718
-            Assert.IsTrue(b1 != b3);
-            Assert.IsTrue(b1 != b4);
-            Assert.IsTrue(b1 != null);
-            Assert.IsFalse((ByteString) null != null);
-        }
-
-        [Test]
-        public void EmptyByteStringHasZeroSize()
-        {
-            Assert.AreEqual(0, ByteString.Empty.Length);
-        }
-
-        [Test]
-        public void CopyFromStringWithExplicitEncoding()
-        {
-            ByteString bs = ByteString.CopyFrom("AB", Encoding.Unicode);
-            Assert.AreEqual(4, bs.Length);
-            Assert.AreEqual(65, bs[0]);
-            Assert.AreEqual(0, bs[1]);
-            Assert.AreEqual(66, bs[2]);
-            Assert.AreEqual(0, bs[3]);
-        }
-
-        [Test]
-        public void IsEmptyWhenEmpty()
-        {
-            Assert.IsTrue(ByteString.CopyFromUtf8("").IsEmpty);
-        }
-
-        [Test]
-        public void IsEmptyWhenNotEmpty()
-        {
-            Assert.IsFalse(ByteString.CopyFromUtf8("X").IsEmpty);
-        }
-
-        [Test]
-        public void CopyFromByteArrayCopiesContents()
-        {
-            byte[] data = new byte[1];
-            data[0] = 10;
-            ByteString bs = ByteString.CopyFrom(data);
-            Assert.AreEqual(10, bs[0]);
-            data[0] = 5;
-            Assert.AreEqual(10, bs[0]);
-        }
-
-        [Test]
-        public void CopyFromReadOnlySpanCopiesContents()
-        {
-            byte[] data = new byte[1];
-            data[0] = 10;
-            ReadOnlySpan<byte> byteSpan = data;
-            var bs = ByteString.CopyFrom(byteSpan);
-            Assert.AreEqual(10, bs[0]);
-            data[0] = 5;
-            Assert.AreEqual(10, bs[0]);
-        }
-
-        [Test]
-        public void ToByteArrayCopiesContents()
-        {
-            ByteString bs = ByteString.CopyFromUtf8("Hello");
-            byte[] data = bs.ToByteArray();
-            Assert.AreEqual((byte)'H', data[0]);
-            Assert.AreEqual((byte)'H', bs[0]);
-            data[0] = 0;
-            Assert.AreEqual(0, data[0]);
-            Assert.AreEqual((byte)'H', bs[0]);
-        }
-
-        [Test]
-        public void CopyFromUtf8UsesUtf8()
-        {
-            ByteString bs = ByteString.CopyFromUtf8("\u20ac");
-            Assert.AreEqual(3, bs.Length);
-            Assert.AreEqual(0xe2, bs[0]);
-            Assert.AreEqual(0x82, bs[1]);
-            Assert.AreEqual(0xac, bs[2]);
-        }
-
-        [Test]
-        public void CopyFromPortion()
-        {
-            byte[] data = new byte[] {0, 1, 2, 3, 4, 5, 6};
-            ByteString bs = ByteString.CopyFrom(data, 2, 3);
-            Assert.AreEqual(3, bs.Length);
-            Assert.AreEqual(2, bs[0]);
-            Assert.AreEqual(3, bs[1]);
-        }
-
-        [Test]
-        public void CopyTo()
-        {
-            byte[] data = new byte[] { 0, 1, 2, 3, 4, 5, 6 };
-            ByteString bs = ByteString.CopyFrom(data);
-
-            byte[] dest = new byte[data.Length];
-            bs.CopyTo(dest, 0);
-
-            CollectionAssert.AreEqual(data, dest);
-        }
-
-        [Test]
-        public void GetEnumerator()
-        {
-            byte[] data = new byte[] { 0, 1, 2, 3, 4, 5, 6 };
-            ByteString bs = ByteString.CopyFrom(data);
-
-            IEnumerator<byte> genericEnumerator = bs.GetEnumerator();
-            Assert.IsTrue(genericEnumerator.MoveNext());
-            Assert.AreEqual(0, genericEnumerator.Current);
-
-            IEnumerator enumerator = ((IEnumerable)bs).GetEnumerator();
-            Assert.IsTrue(enumerator.MoveNext());
-            Assert.AreEqual(0, enumerator.Current);
-
-            // Call via LINQ
-            CollectionAssert.AreEqual(bs.Span.ToArray(), bs.ToArray());
-        }
-
-        [Test]
-        public void UnsafeWrap()
-        {
-            byte[] data = new byte[] { 0, 1, 2, 3, 4, 5, 6 };
-            ByteString bs = UnsafeByteOperations.UnsafeWrap(data.AsMemory(2, 3));
-            ReadOnlySpan<byte> s = bs.Span;
-
-            Assert.AreEqual(3, s.Length);
-            Assert.AreEqual(2, s[0]);
-            Assert.AreEqual(3, s[1]);
-            Assert.AreEqual(4, s[2]);
-
-            // Check that the value is not a copy
-            data[2] = byte.MaxValue;
-            Assert.AreEqual(byte.MaxValue, s[0]);
-        }
-
-        [Test]
-        public void CreateCodedInput_FromArraySegment()
-        {
-            byte[] data = new byte[] { 0, 1, 2, 3, 4, 5, 6 };
-            ByteString bs = UnsafeByteOperations.UnsafeWrap(data.AsMemory(2, 3));
-            CodedInputStream codedInputStream = bs.CreateCodedInput();
-
-            byte[] bytes = codedInputStream.ReadRawBytes(3);
-
-            Assert.AreEqual(3, bytes.Length);
-            Assert.AreEqual(2, bytes[0]);
-            Assert.AreEqual(3, bytes[1]);
-            Assert.AreEqual(4, bytes[2]);
-            Assert.IsTrue(codedInputStream.IsAtEnd);
-        }
-
-        [Test]
-        public void WriteToStream()
-        {
-            byte[] data = new byte[] { 0, 1, 2, 3, 4, 5, 6 };
-            ByteString bs = ByteString.CopyFrom(data);
-
-            MemoryStream ms = new MemoryStream();
-            bs.WriteTo(ms);
-
-            CollectionAssert.AreEqual(data, ms.ToArray());
-        }
-
-        [Test]
-        public void WriteToStream_Stackalloc()
-        {
-            byte[] data = Encoding.UTF8.GetBytes("Hello world");
-            Span<byte> s = stackalloc byte[data.Length];
-            data.CopyTo(s);
-
-            MemoryStream ms = new MemoryStream();
-
-            using (UnmanagedMemoryManager<byte> manager = new UnmanagedMemoryManager<byte>(s))
-            {
-                ByteString bs = ByteString.AttachBytes(manager.Memory);
-
-                bs.WriteTo(ms);
-            }
-
-            CollectionAssert.AreEqual(data, ms.ToArray());
-        }
-
-        [Test]
-        public void ToStringUtf8()
-        {
-            ByteString bs = ByteString.CopyFromUtf8("\u20ac");
-            Assert.AreEqual("\u20ac", bs.ToStringUtf8());
-        }
-
-        [Test]
-        public void ToStringWithExplicitEncoding()
-        {
-            ByteString bs = ByteString.CopyFrom("\u20ac", Encoding.Unicode);
-            Assert.AreEqual("\u20ac", bs.ToString(Encoding.Unicode));
-        }
-
-        [Test]
-        public void ToString_Stackalloc()
-        {
-            byte[] data = Encoding.UTF8.GetBytes("Hello world");
-            Span<byte> s = stackalloc byte[data.Length];
-            data.CopyTo(s);
-
-            using (UnmanagedMemoryManager<byte> manager = new UnmanagedMemoryManager<byte>(s))
-            {
-                ByteString bs = ByteString.AttachBytes(manager.Memory);
-
-                Assert.AreEqual("Hello world", bs.ToString(Encoding.UTF8));
-            }
-        }
-
-        [Test]
-        public void FromBase64_WithText()
-        {
-            byte[] data = new byte[] {0, 1, 2, 3, 4, 5, 6};
-            string base64 = Convert.ToBase64String(data);
-            ByteString bs = ByteString.FromBase64(base64);
-            Assert.AreEqual(data, bs.ToByteArray());
-        }
-
-        [Test]
-        public void FromBase64_Empty()
-        {
-            // Optimization which also fixes issue 61.
-            Assert.AreSame(ByteString.Empty, ByteString.FromBase64(""));
-        }
-
-        [Test]
-        public void ToBase64_Array()
-        {
-            ByteString bs = ByteString.CopyFrom(Encoding.UTF8.GetBytes("Hello world"));
-
-            Assert.AreEqual("SGVsbG8gd29ybGQ=", bs.ToBase64());
-        }
-
-        [Test]
-        public void ToBase64_Stackalloc()
-        {
-            byte[] data = Encoding.UTF8.GetBytes("Hello world");
-            Span<byte> s = stackalloc byte[data.Length];
-            data.CopyTo(s);
-
-            using (UnmanagedMemoryManager<byte> manager = new UnmanagedMemoryManager<byte>(s))
-            {
-                ByteString bs = ByteString.AttachBytes(manager.Memory);
-
-                Assert.AreEqual("SGVsbG8gd29ybGQ=", bs.ToBase64());
-            }
-        }
-
-        [Test]
-        public void FromStream_Seekable()
-        {
-            var stream = new MemoryStream(new byte[] { 1, 2, 3, 4, 5 });
-            // Consume the first byte, just to test that it's "from current position"
-            stream.ReadByte();
-            var actual = ByteString.FromStream(stream);
-            ByteString expected = ByteString.CopyFrom(2, 3, 4, 5);
-            Assert.AreEqual(expected, actual, $"{expected.ToBase64()} != {actual.ToBase64()}");
-        }
-
-        [Test]
-        public void FromStream_NotSeekable()
-        {
-            var stream = new MemoryStream(new byte[] { 1, 2, 3, 4, 5 });
-            // Consume the first byte, just to test that it's "from current position"
-            stream.ReadByte();
-            // Wrap the original stream in LimitedInputStream, which has CanSeek=false
-            var limitedStream = new LimitedInputStream(stream, 3);
-            var actual = ByteString.FromStream(limitedStream);
-            ByteString expected = ByteString.CopyFrom(2, 3, 4);
-            Assert.AreEqual(expected, actual, $"{expected.ToBase64()} != {actual.ToBase64()}");
-        }
-
-#if !NET35
-        [Test]
-        public async Task FromStreamAsync_Seekable()
-        {
-            var stream = new MemoryStream(new byte[] { 1, 2, 3, 4, 5 });
-            // Consume the first byte, just to test that it's "from current position"
-            stream.ReadByte();
-            var actual = await ByteString.FromStreamAsync(stream);
-            ByteString expected = ByteString.CopyFrom(2, 3, 4, 5);
-            Assert.AreEqual(expected, actual, $"{expected.ToBase64()} != {actual.ToBase64()}");
-        }
-
-        [Test]
-        public async Task FromStreamAsync_NotSeekable()
-        {
-            var stream = new MemoryStream(new byte[] { 1, 2, 3, 4, 5 });
-            // Consume the first byte, just to test that it's "from current position"
-            stream.ReadByte();
-            // Wrap the original stream in LimitedInputStream, which has CanSeek=false
-            var limitedStream = new LimitedInputStream(stream, 3);
-            var actual = await ByteString.FromStreamAsync(limitedStream);
-            ByteString expected = ByteString.CopyFrom(2, 3, 4);
-            Assert.AreEqual(expected, actual, $"{expected.ToBase64()} != {actual.ToBase64()}");
-        }
-#endif
-
-        [Test]
-        public void GetHashCode_Regression()
-        {
-            // We used to have an awful hash algorithm where only the last four
-            // bytes were relevant. This is a regression test for
-            // https://github.com/protocolbuffers/protobuf/issues/2511
-
-            ByteString b1 = ByteString.CopyFrom(100, 1, 2, 3, 4);
-            ByteString b2 = ByteString.CopyFrom(200, 1, 2, 3, 4);
-            Assert.AreNotEqual(b1.GetHashCode(), b2.GetHashCode());
-        }
-
-        [Test]
-        public void GetContentsAsReadOnlySpan()
-        {
-            var byteString = ByteString.CopyFrom(1, 2, 3, 4, 5);
-            var copied = byteString.Span.ToArray();
-            CollectionAssert.AreEqual(byteString, copied);
-        }
-
-        [Test]
-        public void GetContentsAsReadOnlyMemory()
-        {
-            var byteString = ByteString.CopyFrom(1, 2, 3, 4, 5);
-            var copied = byteString.Memory.ToArray();
-            CollectionAssert.AreEqual(byteString, copied);
-        }
-
-        // Create Memory<byte> from non-array source.
-        // Use by ByteString tests that have optimized path for array backed Memory<byte>.
-        private sealed unsafe class UnmanagedMemoryManager<T> : MemoryManager<T> where T : unmanaged
-        {
-            private readonly T* _pointer;
-            private readonly int _length;
-
-            public UnmanagedMemoryManager(Span<T> span)
-            {
-                fixed (T* ptr = &MemoryMarshal.GetReference(span))
-                {
-                    _pointer = ptr;
-                    _length = span.Length;
-                }
-            }
-
-            public override Span<T> GetSpan() => new Span<T>(_pointer, _length);
-
-            public override MemoryHandle Pin(int elementIndex = 0)
-            {
-                if (elementIndex < 0 || elementIndex >= _length)
-                {
-                    throw new ArgumentOutOfRangeException(nameof(elementIndex));
-                }
-
-                return new MemoryHandle(_pointer + elementIndex);
-            }
-
-            public override void Unpin() { }
-
-            protected override void Dispose(bool disposing) { }
-        }
-    }
-}
\ No newline at end of file
diff --git a/libs/protobuf/csharp/src/Google.Protobuf.Test/CodedInputStreamExtensions.cs b/libs/protobuf/csharp/src/Google.Protobuf.Test/CodedInputStreamExtensions.cs
deleted file mode 100644
index 23af288..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf.Test/CodedInputStreamExtensions.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using NUnit.Framework;
-
-namespace Google.Protobuf
-{
-    internal static class CodedInputStreamExtensions
-    {
-        public static void AssertNextTag(this CodedInputStream input, uint expectedTag)
-        {
-            uint tag = input.ReadTag();
-            Assert.AreEqual(expectedTag, tag);
-        }
-
-        public static T ReadMessage<T>(this CodedInputStream stream, MessageParser<T> parser)
-            where T : IMessage<T>
-        {
-            var message = parser.CreateTemplate();
-            stream.ReadMessage(message);
-            return message;
-        }
-    }
-}
diff --git a/libs/protobuf/csharp/src/Google.Protobuf.Test/CodedInputStreamTest.cs b/libs/protobuf/csharp/src/Google.Protobuf.Test/CodedInputStreamTest.cs
deleted file mode 100644
index b84a1b7..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf.Test/CodedInputStreamTest.cs
+++ /dev/null
@@ -1,1008 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-using System.Buffers;
-using System.IO;
-using Google.Protobuf.TestProtos;
-using Proto2 = Google.Protobuf.TestProtos.Proto2;
-using NUnit.Framework;
-
-namespace Google.Protobuf
-{
-    public class CodedInputStreamTest
-    {
-        /// <summary>
-        /// Helper to construct a byte array from a bunch of bytes.  The inputs are
-        /// actually ints so that I can use hex notation and not get stupid errors
-        /// about precision.
-        /// </summary>
-        private static byte[] Bytes(params int[] bytesAsInts)
-        {
-            byte[] bytes = new byte[bytesAsInts.Length];
-            for (int i = 0; i < bytesAsInts.Length; i++)
-            {
-                bytes[i] = (byte) bytesAsInts[i];
-            }
-            return bytes;
-        }
-
-        /// <summary>
-        /// Parses the given bytes using ReadRawVarint32() and ReadRawVarint64()
-        /// </summary>
-        private static void AssertReadVarint(byte[] data, ulong value)
-        {
-            CodedInputStream input = new CodedInputStream(data);
-            Assert.AreEqual((uint) value, input.ReadRawVarint32());
-            Assert.IsTrue(input.IsAtEnd);
-
-            input = new CodedInputStream(data);
-            Assert.AreEqual(value, input.ReadRawVarint64());
-            Assert.IsTrue(input.IsAtEnd);
-
-            AssertReadFromParseContext(new ReadOnlySequence<byte>(data), (ref ParseContext ctx) =>
-            {
-                Assert.AreEqual((uint) value, ctx.ReadUInt32());
-            }, true);
-
-            AssertReadFromParseContext(new ReadOnlySequence<byte>(data), (ref ParseContext ctx) =>
-            {
-                Assert.AreEqual(value, ctx.ReadUInt64());
-            }, true);
-
-            // Try different block sizes.
-            for (int bufferSize = 1; bufferSize <= 16; bufferSize *= 2)
-            {
-                input = new CodedInputStream(new SmallBlockInputStream(data, bufferSize));
-                Assert.AreEqual((uint) value, input.ReadRawVarint32());
-
-                input = new CodedInputStream(new SmallBlockInputStream(data, bufferSize));
-                Assert.AreEqual(value, input.ReadRawVarint64());
-                Assert.IsTrue(input.IsAtEnd);
-
-                AssertReadFromParseContext(ReadOnlySequenceFactory.CreateWithContent(data, bufferSize), (ref ParseContext ctx) =>
-                {
-                    Assert.AreEqual((uint) value, ctx.ReadUInt32());
-                }, true);
-
-                AssertReadFromParseContext(ReadOnlySequenceFactory.CreateWithContent(data, bufferSize), (ref ParseContext ctx) =>
-                {
-                    Assert.AreEqual(value, ctx.ReadUInt64());
-                }, true);
-            }
-
-            // Try reading directly from a MemoryStream. We want to verify that it
-            // doesn't read past the end of the input, so write an extra byte - this
-            // lets us test the position at the end.
-            MemoryStream memoryStream = new MemoryStream();
-            memoryStream.Write(data, 0, data.Length);
-            memoryStream.WriteByte(0);
-            memoryStream.Position = 0;
-            Assert.AreEqual((uint) value, CodedInputStream.ReadRawVarint32(memoryStream));
-            Assert.AreEqual(data.Length, memoryStream.Position);
-        }
-
-        /// <summary>
-        /// Parses the given bytes using ReadRawVarint32() and ReadRawVarint64() and
-        /// expects them to fail with an InvalidProtocolBufferException whose
-        /// description matches the given one.
-        /// </summary>
-        private static void AssertReadVarintFailure(InvalidProtocolBufferException expected, byte[] data)
-        {
-            CodedInputStream input = new CodedInputStream(data);
-            var exception = Assert.Throws<InvalidProtocolBufferException>(() => input.ReadRawVarint32());
-            Assert.AreEqual(expected.Message, exception.Message);
-
-            input = new CodedInputStream(data);
-            exception = Assert.Throws<InvalidProtocolBufferException>(() => input.ReadRawVarint64());
-            Assert.AreEqual(expected.Message, exception.Message);
-
-            AssertReadFromParseContext(new ReadOnlySequence<byte>(data), (ref ParseContext ctx) =>
-            {
-                try
-                {
-                    ctx.ReadUInt32();
-                    Assert.Fail();
-                }
-                catch (InvalidProtocolBufferException ex)
-                {
-                    Assert.AreEqual(expected.Message, ex.Message);
-                }
-            }, false);
-
-            AssertReadFromParseContext(new ReadOnlySequence<byte>(data), (ref ParseContext ctx) =>
-            {
-                try
-                {
-                    ctx.ReadUInt64();
-                    Assert.Fail();
-                }
-                catch (InvalidProtocolBufferException ex)
-                {
-                    Assert.AreEqual(expected.Message, ex.Message);
-                }
-            }, false);
-
-            // Make sure we get the same error when reading directly from a Stream.
-            exception = Assert.Throws<InvalidProtocolBufferException>(() => CodedInputStream.ReadRawVarint32(new MemoryStream(data)));
-            Assert.AreEqual(expected.Message, exception.Message);
-        }
-
-        private delegate void ParseContextAssertAction(ref ParseContext ctx);
-
-        private static void AssertReadFromParseContext(ReadOnlySequence<byte> input, ParseContextAssertAction assertAction, bool assertIsAtEnd)
-        {
-            // Check as ReadOnlySequence<byte>
-            ParseContext.Initialize(input, out ParseContext parseCtx);
-            assertAction(ref parseCtx);
-            if (assertIsAtEnd)
-            {
-                Assert.IsTrue(SegmentedBufferHelper.IsAtEnd(ref parseCtx.buffer, ref parseCtx.state));
-            }
-
-            // Check as ReadOnlySpan<byte>
-            ParseContext.Initialize(input.ToArray().AsSpan(), out ParseContext spanParseContext);
-            assertAction(ref spanParseContext);
-            if (assertIsAtEnd)
-            {
-                Assert.IsTrue(SegmentedBufferHelper.IsAtEnd(ref spanParseContext.buffer, ref spanParseContext.state));
-            }
-        }
-
-        [Test]
-        public void ReadVarint()
-        {
-            AssertReadVarint(Bytes(0x00), 0);
-            AssertReadVarint(Bytes(0x01), 1);
-            AssertReadVarint(Bytes(0x7f), 127);
-            // 14882
-            AssertReadVarint(Bytes(0xa2, 0x74), (0x22 << 0) | (0x74 << 7));
-            // 2961488830
-            AssertReadVarint(Bytes(0xbe, 0xf7, 0x92, 0x84, 0x0b),
-                             (0x3e << 0) | (0x77 << 7) | (0x12 << 14) | (0x04 << 21) |
-                             (0x0bL << 28));
-
-            // 64-bit
-            // 7256456126
-            AssertReadVarint(Bytes(0xbe, 0xf7, 0x92, 0x84, 0x1b),
-                             (0x3e << 0) | (0x77 << 7) | (0x12 << 14) | (0x04 << 21) |
-                             (0x1bL << 28));
-            // 41256202580718336
-            AssertReadVarint(Bytes(0x80, 0xe6, 0xeb, 0x9c, 0xc3, 0xc9, 0xa4, 0x49),
-                             (0x00 << 0) | (0x66 << 7) | (0x6b << 14) | (0x1c << 21) |
-                             (0x43L << 28) | (0x49L << 35) | (0x24L << 42) | (0x49L << 49));
-            // 11964378330978735131
-            AssertReadVarint(Bytes(0x9b, 0xa8, 0xf9, 0xc2, 0xbb, 0xd6, 0x80, 0x85, 0xa6, 0x01),
-                             (0x1b << 0) | (0x28 << 7) | (0x79 << 14) | (0x42 << 21) |
-                             (0x3bUL << 28) | (0x56UL << 35) | (0x00UL << 42) |
-                             (0x05UL << 49) | (0x26UL << 56) | (0x01UL << 63));
-
-            // Failures
-            AssertReadVarintFailure(
-                InvalidProtocolBufferException.MalformedVarint(),
-                Bytes(0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-                      0x00));
-            AssertReadVarintFailure(
-                InvalidProtocolBufferException.TruncatedMessage(),
-                Bytes(0x80));
-        }
-
-        /// <summary>
-        /// Parses the given bytes using ReadRawLittleEndian32() and checks
-        /// that the result matches the given value.
-        /// </summary>
-        private static void AssertReadLittleEndian32(byte[] data, uint value)
-        {
-            CodedInputStream input = new CodedInputStream(data);
-            Assert.AreEqual(value, input.ReadRawLittleEndian32());
-            Assert.IsTrue(input.IsAtEnd);
-
-            AssertReadFromParseContext(new ReadOnlySequence<byte>(data), (ref ParseContext ctx) =>
-            {
-                Assert.AreEqual(value, ctx.ReadFixed32());
-            }, true);
-
-            // Try different block sizes.
-            for (int blockSize = 1; blockSize <= 16; blockSize *= 2)
-            {
-                input = new CodedInputStream(
-                    new SmallBlockInputStream(data, blockSize));
-                Assert.AreEqual(value, input.ReadRawLittleEndian32());
-                Assert.IsTrue(input.IsAtEnd);
-
-                AssertReadFromParseContext(ReadOnlySequenceFactory.CreateWithContent(data, blockSize), (ref ParseContext ctx) =>
-                {
-                    Assert.AreEqual(value, ctx.ReadFixed32());
-                }, true);
-            }
-        }
-
-        /// <summary>
-        /// Parses the given bytes using ReadRawLittleEndian64() and checks
-        /// that the result matches the given value.
-        /// </summary>
-        private static void AssertReadLittleEndian64(byte[] data, ulong value)
-        {
-            CodedInputStream input = new CodedInputStream(data);
-            Assert.AreEqual(value, input.ReadRawLittleEndian64());
-            Assert.IsTrue(input.IsAtEnd);
-
-            AssertReadFromParseContext(new ReadOnlySequence<byte>(data), (ref ParseContext ctx) =>
-            {
-                Assert.AreEqual(value, ctx.ReadFixed64());
-            }, true);
-
-            // Try different block sizes.
-            for (int blockSize = 1; blockSize <= 16; blockSize *= 2)
-            {
-                input = new CodedInputStream(
-                    new SmallBlockInputStream(data, blockSize));
-                Assert.AreEqual(value, input.ReadRawLittleEndian64());
-                Assert.IsTrue(input.IsAtEnd);
-
-                AssertReadFromParseContext(ReadOnlySequenceFactory.CreateWithContent(data, blockSize), (ref ParseContext ctx) =>
-                {
-                    Assert.AreEqual(value, ctx.ReadFixed64());
-                }, true);
-            }
-        }
-
-        [Test]
-        public void ReadLittleEndian()
-        {
-            AssertReadLittleEndian32(Bytes(0x78, 0x56, 0x34, 0x12), 0x12345678);
-            AssertReadLittleEndian32(Bytes(0xf0, 0xde, 0xbc, 0x9a), 0x9abcdef0);
-
-            AssertReadLittleEndian64(Bytes(0xf0, 0xde, 0xbc, 0x9a, 0x78, 0x56, 0x34, 0x12),
-                                     0x123456789abcdef0L);
-            AssertReadLittleEndian64(
-                Bytes(0x78, 0x56, 0x34, 0x12, 0xf0, 0xde, 0xbc, 0x9a), 0x9abcdef012345678UL);
-        }
-
-        [Test]
-        public void DecodeZigZag32()
-        {
-            Assert.AreEqual(0, ParsingPrimitives.DecodeZigZag32(0));
-            Assert.AreEqual(-1, ParsingPrimitives.DecodeZigZag32(1));
-            Assert.AreEqual(1, ParsingPrimitives.DecodeZigZag32(2));
-            Assert.AreEqual(-2, ParsingPrimitives.DecodeZigZag32(3));
-            Assert.AreEqual(0x3FFFFFFF, ParsingPrimitives.DecodeZigZag32(0x7FFFFFFE));
-            Assert.AreEqual(unchecked((int) 0xC0000000), ParsingPrimitives.DecodeZigZag32(0x7FFFFFFF));
-            Assert.AreEqual(0x7FFFFFFF, ParsingPrimitives.DecodeZigZag32(0xFFFFFFFE));
-            Assert.AreEqual(unchecked((int) 0x80000000), ParsingPrimitives.DecodeZigZag32(0xFFFFFFFF));
-        }
-
-        [Test]
-        public void DecodeZigZag64()
-        {
-            Assert.AreEqual(0, ParsingPrimitives.DecodeZigZag64(0));
-            Assert.AreEqual(-1, ParsingPrimitives.DecodeZigZag64(1));
-            Assert.AreEqual(1, ParsingPrimitives.DecodeZigZag64(2));
-            Assert.AreEqual(-2, ParsingPrimitives.DecodeZigZag64(3));
-            Assert.AreEqual(0x000000003FFFFFFFL, ParsingPrimitives.DecodeZigZag64(0x000000007FFFFFFEL));
-            Assert.AreEqual(unchecked((long) 0xFFFFFFFFC0000000L), ParsingPrimitives.DecodeZigZag64(0x000000007FFFFFFFL));
-            Assert.AreEqual(0x000000007FFFFFFFL, ParsingPrimitives.DecodeZigZag64(0x00000000FFFFFFFEL));
-            Assert.AreEqual(unchecked((long) 0xFFFFFFFF80000000L), ParsingPrimitives.DecodeZigZag64(0x00000000FFFFFFFFL));
-            Assert.AreEqual(0x7FFFFFFFFFFFFFFFL, ParsingPrimitives.DecodeZigZag64(0xFFFFFFFFFFFFFFFEL));
-            Assert.AreEqual(unchecked((long) 0x8000000000000000L), ParsingPrimitives.DecodeZigZag64(0xFFFFFFFFFFFFFFFFL));
-        }
-        
-        [Test]
-        public void ReadWholeMessage_VaryingBlockSizes()
-        {
-            TestAllTypes message = SampleMessages.CreateFullTestAllTypes();
-
-            byte[] rawBytes = message.ToByteArray();
-            Assert.AreEqual(rawBytes.Length, message.CalculateSize());
-            TestAllTypes message2 = TestAllTypes.Parser.ParseFrom(rawBytes);
-            Assert.AreEqual(message, message2);
-
-            // Try different block sizes.
-            for (int blockSize = 1; blockSize < 256; blockSize *= 2)
-            {
-                message2 = TestAllTypes.Parser.ParseFrom(new SmallBlockInputStream(rawBytes, blockSize));
-                Assert.AreEqual(message, message2);
-            }
-        }
-
-        [Test]
-        public void ReadWholeMessage_VaryingBlockSizes_FromSequence()
-        {
-            TestAllTypes message = SampleMessages.CreateFullTestAllTypes();
-
-            byte[] rawBytes = message.ToByteArray();
-            Assert.AreEqual(rawBytes.Length, message.CalculateSize());
-            TestAllTypes message2 = TestAllTypes.Parser.ParseFrom(rawBytes);
-            Assert.AreEqual(message, message2);
-
-            // Try different block sizes.
-            for (int blockSize = 1; blockSize < 256; blockSize *= 2)
-            {
-                message2 = TestAllTypes.Parser.ParseFrom(ReadOnlySequenceFactory.CreateWithContent(rawBytes, blockSize));
-                Assert.AreEqual(message, message2);
-            }
-        }
-
-        [Test]
-        public void ReadInt32Wrapper_VariableBlockSizes()
-        {
-            byte[] rawBytes = new byte[] { 202, 1, 11, 8, 254, 255, 255, 255, 255, 255, 255, 255, 255, 1 };
-
-            for (int blockSize = 1; blockSize <= rawBytes.Length; blockSize++)
-            {
-                ReadOnlySequence<byte> data = ReadOnlySequenceFactory.CreateWithContent(rawBytes, blockSize);
-                AssertReadFromParseContext(data, (ref ParseContext ctx) =>
-                {
-                    ctx.ReadTag();
-
-                    var value = ParsingPrimitivesWrappers.ReadInt32Wrapper(ref ctx);
-
-                    Assert.AreEqual(-2, value);
-                }, true);
-            }
-        }
-
-        [Test]
-        public void ReadHugeBlob()
-        {
-            // Allocate and initialize a 1MB blob.
-            byte[] blob = new byte[1 << 20];
-            for (int i = 0; i < blob.Length; i++)
-            {
-                blob[i] = (byte) i;
-            }
-
-            // Make a message containing it.
-            var message = new TestAllTypes { SingleBytes = ByteString.CopyFrom(blob) };
-
-            // Serialize and parse it.  Make sure to parse from an InputStream, not
-            // directly from a ByteString, so that CodedInputStream uses buffered
-            // reading.
-            TestAllTypes message2 = TestAllTypes.Parser.ParseFrom(message.ToByteString());
-
-            Assert.AreEqual(message, message2);
-        }
-
-        [Test]
-        public void ReadMaliciouslyLargeBlob()
-        {
-            MemoryStream ms = new MemoryStream();
-            CodedOutputStream output = new CodedOutputStream(ms);
-
-            uint tag = WireFormat.MakeTag(1, WireFormat.WireType.LengthDelimited);
-            output.WriteRawVarint32(tag);
-            output.WriteRawVarint32(0x7FFFFFFF);
-            output.WriteRawBytes(new byte[32]); // Pad with a few random bytes.
-            output.Flush();
-            ms.Position = 0;
-
-            CodedInputStream input = new CodedInputStream(ms);
-            Assert.AreEqual(tag, input.ReadTag());
-
-            Assert.Throws<InvalidProtocolBufferException>(() => input.ReadBytes());
-        }
-
-        [Test]
-        public void ReadBlobGreaterThanCurrentLimit()
-        {
-            MemoryStream ms = new MemoryStream();
-            CodedOutputStream output = new CodedOutputStream(ms);
-            uint tag = WireFormat.MakeTag(1, WireFormat.WireType.LengthDelimited);
-            output.WriteRawVarint32(tag);
-            output.WriteRawVarint32(4);
-            output.WriteRawBytes(new byte[4]); // Pad with a few random bytes.
-            output.Flush();
-            ms.Position = 0;
-
-            CodedInputStream input = new CodedInputStream(ms);
-            Assert.AreEqual(tag, input.ReadTag());
-
-            // Specify limit smaller than data length
-            input.PushLimit(3);
-            Assert.Throws<InvalidProtocolBufferException>(() => input.ReadBytes());
-
-            AssertReadFromParseContext(new ReadOnlySequence<byte>(ms.ToArray()), (ref ParseContext ctx) =>
-            {
-                Assert.AreEqual(tag, ctx.ReadTag());
-                SegmentedBufferHelper.PushLimit(ref ctx.state, 3);
-                try
-                {
-                    ctx.ReadBytes();
-                    Assert.Fail();
-                }
-                catch (InvalidProtocolBufferException) {}
-            }, true);
-        }
-
-        [Test]
-        public void ReadStringGreaterThanCurrentLimit()
-        {
-            MemoryStream ms = new MemoryStream();
-            CodedOutputStream output = new CodedOutputStream(ms);
-            uint tag = WireFormat.MakeTag(1, WireFormat.WireType.LengthDelimited);
-            output.WriteRawVarint32(tag);
-            output.WriteRawVarint32(4);
-            output.WriteRawBytes(new byte[4]); // Pad with a few random bytes.
-            output.Flush();
-            ms.Position = 0;
-
-            CodedInputStream input = new CodedInputStream(ms.ToArray());
-            Assert.AreEqual(tag, input.ReadTag());
-
-            // Specify limit smaller than data length
-            input.PushLimit(3);
-            Assert.Throws<InvalidProtocolBufferException>(() => input.ReadString());
-
-            AssertReadFromParseContext(new ReadOnlySequence<byte>(ms.ToArray()), (ref ParseContext ctx) =>
-            {
-                Assert.AreEqual(tag, ctx.ReadTag());
-                SegmentedBufferHelper.PushLimit(ref ctx.state, 3);
-                try
-                {
-                    ctx.ReadString();
-                    Assert.Fail();
-                }
-                catch (InvalidProtocolBufferException) { }
-            }, true);
-        }
-
-        // Representations of a tag for field 0 with various wire types
-        [Test]
-        [TestCase(0)]
-        [TestCase(1)]
-        [TestCase(2)]
-        [TestCase(3)]
-        [TestCase(4)]
-        [TestCase(5)]
-        public void ReadTag_ZeroFieldRejected(byte tag)
-        {
-            CodedInputStream cis = new CodedInputStream(new byte[] { tag });
-            Assert.Throws<InvalidProtocolBufferException>(() => cis.ReadTag());
-        }
-
-        internal static TestRecursiveMessage MakeRecursiveMessage(int depth)
-        {
-            if (depth == 0)
-            {
-                return new TestRecursiveMessage { I = 5 };
-            }
-            else
-            {
-                return new TestRecursiveMessage { A = MakeRecursiveMessage(depth - 1) };
-            }
-        }
-
-        internal static void AssertMessageDepth(TestRecursiveMessage message, int depth)
-        {
-            if (depth == 0)
-            {
-                Assert.IsNull(message.A);
-                Assert.AreEqual(5, message.I);
-            }
-            else
-            {
-                Assert.IsNotNull(message.A);
-                AssertMessageDepth(message.A, depth - 1);
-            }
-        }
-
-        [Test]
-        public void MaliciousRecursion()
-        {
-            ByteString atRecursiveLimit = MakeRecursiveMessage(CodedInputStream.DefaultRecursionLimit).ToByteString();
-            ByteString beyondRecursiveLimit = MakeRecursiveMessage(CodedInputStream.DefaultRecursionLimit + 1).ToByteString();
-
-            AssertMessageDepth(TestRecursiveMessage.Parser.ParseFrom(atRecursiveLimit), CodedInputStream.DefaultRecursionLimit);
-
-            Assert.Throws<InvalidProtocolBufferException>(() => TestRecursiveMessage.Parser.ParseFrom(beyondRecursiveLimit));
-
-            CodedInputStream input = CodedInputStream.CreateWithLimits(new MemoryStream(atRecursiveLimit.ToByteArray()), 1000000, CodedInputStream.DefaultRecursionLimit - 1);
-            Assert.Throws<InvalidProtocolBufferException>(() => TestRecursiveMessage.Parser.ParseFrom(input));
-        }
-        
-        private static byte[] MakeMaliciousRecursionUnknownFieldsPayload(int recursionDepth)
-        {
-            // generate recursively nested groups that will be parsed as unknown fields
-            int unknownFieldNumber = 14;  // an unused field number
-            MemoryStream ms = new MemoryStream();
-            CodedOutputStream output = new CodedOutputStream(ms);
-            for (int i = 0; i < recursionDepth; i++)
-            {
-                output.WriteTag(WireFormat.MakeTag(unknownFieldNumber, WireFormat.WireType.StartGroup));
-            }
-            for (int i = 0; i < recursionDepth; i++)
-            {
-                output.WriteTag(WireFormat.MakeTag(unknownFieldNumber, WireFormat.WireType.EndGroup));
-            }
-            output.Flush();
-            return ms.ToArray();
-        }
-
-        [Test]
-        public void MaliciousRecursion_UnknownFields()
-        {
-            byte[] payloadAtRecursiveLimit = MakeMaliciousRecursionUnknownFieldsPayload(CodedInputStream.DefaultRecursionLimit);
-            byte[] payloadBeyondRecursiveLimit = MakeMaliciousRecursionUnknownFieldsPayload(CodedInputStream.DefaultRecursionLimit + 1);
-            
-            Assert.DoesNotThrow(() => TestRecursiveMessage.Parser.ParseFrom(payloadAtRecursiveLimit));
-            Assert.Throws<InvalidProtocolBufferException>(() => TestRecursiveMessage.Parser.ParseFrom(payloadBeyondRecursiveLimit));
-        }
-
-        [Test]
-        public void ReadGroup_WrongEndGroupTag()
-        {
-            int groupFieldNumber = Proto2.TestAllTypes.OptionalGroupFieldNumber;
-
-            // write Proto2.TestAllTypes with "optional_group" set, but use wrong EndGroup closing tag
-            MemoryStream ms = new MemoryStream();
-            CodedOutputStream output = new CodedOutputStream(ms);
-            output.WriteTag(WireFormat.MakeTag(groupFieldNumber, WireFormat.WireType.StartGroup));
-            output.WriteGroup(new Proto2.TestAllTypes.Types.OptionalGroup { A = 12345 });
-            // end group with different field number
-            output.WriteTag(WireFormat.MakeTag(groupFieldNumber + 1, WireFormat.WireType.EndGroup));
-            output.Flush();
-            var payload = ms.ToArray();
-
-            Assert.Throws<InvalidProtocolBufferException>(() => Proto2.TestAllTypes.Parser.ParseFrom(payload));
-        }
-
-        [Test]
-        public void ReadGroup_UnknownFields_WrongEndGroupTag()
-        {
-            MemoryStream ms = new MemoryStream();
-            CodedOutputStream output = new CodedOutputStream(ms);
-            output.WriteTag(WireFormat.MakeTag(14, WireFormat.WireType.StartGroup));
-            // end group with different field number
-            output.WriteTag(WireFormat.MakeTag(15, WireFormat.WireType.EndGroup));
-            output.Flush();
-            var payload = ms.ToArray();
-
-            Assert.Throws<InvalidProtocolBufferException>(() => TestRecursiveMessage.Parser.ParseFrom(payload));
-        }
-
-        [Test]
-        public void SizeLimit()
-        {
-            // Have to use a Stream rather than ByteString.CreateCodedInput as SizeLimit doesn't
-            // apply to the latter case.
-            MemoryStream ms = new MemoryStream(SampleMessages.CreateFullTestAllTypes().ToByteArray());
-            CodedInputStream input = CodedInputStream.CreateWithLimits(ms, 16, 100);
-            Assert.Throws<InvalidProtocolBufferException>(() => TestAllTypes.Parser.ParseFrom(input));
-        }
-
-        /// <summary>
-        /// Tests that if we read an string that contains invalid UTF-8, no exception
-        /// is thrown.  Instead, the invalid bytes are replaced with the Unicode
-        /// "replacement character" U+FFFD.
-        /// </summary>
-        [Test]
-        public void ReadInvalidUtf8()
-        {
-            MemoryStream ms = new MemoryStream();
-            CodedOutputStream output = new CodedOutputStream(ms);
-
-            uint tag = WireFormat.MakeTag(1, WireFormat.WireType.LengthDelimited);
-            output.WriteRawVarint32(tag);
-            output.WriteRawVarint32(1);
-            output.WriteRawBytes(new byte[] {0x80});
-            output.Flush();
-            ms.Position = 0;
-
-            CodedInputStream input = new CodedInputStream(ms);
-
-            Assert.AreEqual(tag, input.ReadTag());
-            string text = input.ReadString();
-            Assert.AreEqual('\ufffd', text[0]);
-        }
-
-        [Test]
-        public void ReadNegativeSizedStringThrowsInvalidProtocolBufferException()
-        {
-            MemoryStream ms = new MemoryStream();
-            CodedOutputStream output = new CodedOutputStream(ms);
-
-            uint tag = WireFormat.MakeTag(1, WireFormat.WireType.LengthDelimited);
-            output.WriteRawVarint32(tag);
-            output.WriteLength(-1);
-            output.Flush();
-            ms.Position = 0;
-
-            CodedInputStream input = new CodedInputStream(ms);
-
-            Assert.AreEqual(tag, input.ReadTag());
-            Assert.Throws<InvalidProtocolBufferException>(() => input.ReadString());
-        }
-
-        [Test]
-        public void ReadNegativeSizedBytesThrowsInvalidProtocolBufferException()
-        {
-            MemoryStream ms = new MemoryStream();
-            CodedOutputStream output = new CodedOutputStream(ms);
-
-            uint tag = WireFormat.MakeTag(1, WireFormat.WireType.LengthDelimited);
-            output.WriteRawVarint32(tag);
-            output.WriteLength(-1);
-            output.Flush();
-            ms.Position = 0;
-
-            CodedInputStream input = new CodedInputStream(ms);
-
-            Assert.AreEqual(tag, input.ReadTag());
-            Assert.Throws<InvalidProtocolBufferException>(() => input.ReadBytes());
-        }
-
-        /// <summary>
-        /// A stream which limits the number of bytes it reads at a time.
-        /// We use this to make sure that CodedInputStream doesn't screw up when
-        /// reading in small blocks.
-        /// </summary>
-        private sealed class SmallBlockInputStream : MemoryStream
-        {
-            private readonly int blockSize;
-
-            public SmallBlockInputStream(byte[] data, int blockSize)
-                : base(data)
-            {
-                this.blockSize = blockSize;
-            }
-
-            public override int Read(byte[] buffer, int offset, int count)
-            {
-                return base.Read(buffer, offset, Math.Min(count, blockSize));
-            }
-        }
-
-        [Test]
-        public void TestNegativeEnum()
-        {
-            byte[] bytes = { 0xFE, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x01 };
-            CodedInputStream input = new CodedInputStream(bytes);
-            Assert.AreEqual((int)SampleEnum.NegativeValue, input.ReadEnum());
-            Assert.IsTrue(input.IsAtEnd);
-        }
-
-        //Issue 71:	CodedInputStream.ReadBytes go to slow path unnecessarily
-        [Test]
-        public void TestSlowPathAvoidance()
-        {
-            using (var ms = new MemoryStream())
-            {
-                CodedOutputStream output = new CodedOutputStream(ms);
-                output.WriteTag(1, WireFormat.WireType.LengthDelimited);
-                output.WriteBytes(ByteString.CopyFrom(new byte[100]));
-                output.WriteTag(2, WireFormat.WireType.LengthDelimited);
-                output.WriteBytes(ByteString.CopyFrom(new byte[100]));
-                output.Flush();
-
-                ms.Position = 0;
-                CodedInputStream input = new CodedInputStream(ms, new byte[ms.Length / 2], 0, 0, false);
-
-                uint tag = input.ReadTag();
-                Assert.AreEqual(1, WireFormat.GetTagFieldNumber(tag));
-                Assert.AreEqual(100, input.ReadBytes().Length);
-
-                tag = input.ReadTag();
-                Assert.AreEqual(2, WireFormat.GetTagFieldNumber(tag));
-                Assert.AreEqual(100, input.ReadBytes().Length);
-            }
-        }
-
-        [Test]
-        public void MaximumFieldNumber()
-        {
-            MemoryStream ms = new MemoryStream();
-            CodedOutputStream output = new CodedOutputStream(ms);
-
-            int fieldNumber = 0x1FFFFFFF;
-            uint tag = WireFormat.MakeTag(fieldNumber, WireFormat.WireType.LengthDelimited);
-            output.WriteRawVarint32(tag);
-            output.WriteString("field 1");
-            output.Flush();
-            ms.Position = 0;
-
-            CodedInputStream input = new CodedInputStream(ms);
-
-            Assert.AreEqual(tag, input.ReadTag());
-            Assert.AreEqual(fieldNumber, WireFormat.GetTagFieldNumber(tag));
-        }
-
-        [Test]
-        public void Tag0Throws()
-        {
-            var input = new CodedInputStream(new byte[] { 0 });
-            Assert.Throws<InvalidProtocolBufferException>(() => input.ReadTag());
-        }
-
-        [Test]
-        public void SkipGroup()
-        {
-            // Create an output stream with a group in:
-            // Field 1: string "field 1"
-            // Field 2: group containing:
-            //   Field 1: fixed int32 value 100
-            //   Field 2: string "ignore me"
-            //   Field 3: nested group containing
-            //      Field 1: fixed int64 value 1000
-            // Field 3: string "field 3"
-            var stream = new MemoryStream();
-            var output = new CodedOutputStream(stream);
-            output.WriteTag(1, WireFormat.WireType.LengthDelimited);
-            output.WriteString("field 1");
-            
-            // The outer group...
-            output.WriteTag(2, WireFormat.WireType.StartGroup);
-            output.WriteTag(1, WireFormat.WireType.Fixed32);
-            output.WriteFixed32(100);
-            output.WriteTag(2, WireFormat.WireType.LengthDelimited);
-            output.WriteString("ignore me");
-            // The nested group...
-            output.WriteTag(3, WireFormat.WireType.StartGroup);
-            output.WriteTag(1, WireFormat.WireType.Fixed64);
-            output.WriteFixed64(1000);
-            // Note: Not sure the field number is relevant for end group...
-            output.WriteTag(3, WireFormat.WireType.EndGroup);
-
-            // End the outer group
-            output.WriteTag(2, WireFormat.WireType.EndGroup);
-
-            output.WriteTag(3, WireFormat.WireType.LengthDelimited);
-            output.WriteString("field 3");
-            output.Flush();
-            stream.Position = 0;
-
-            // Now act like a generated client
-            var input = new CodedInputStream(stream);
-            Assert.AreEqual(WireFormat.MakeTag(1, WireFormat.WireType.LengthDelimited), input.ReadTag());
-            Assert.AreEqual("field 1", input.ReadString());
-            Assert.AreEqual(WireFormat.MakeTag(2, WireFormat.WireType.StartGroup), input.ReadTag());
-            input.SkipLastField(); // Should consume the whole group, including the nested one.
-            Assert.AreEqual(WireFormat.MakeTag(3, WireFormat.WireType.LengthDelimited), input.ReadTag());
-            Assert.AreEqual("field 3", input.ReadString());
-        }
-
-        [Test]
-        public void SkipGroup_WrongEndGroupTag()
-        {
-            // Create an output stream with:
-            // Field 1: string "field 1"
-            // Start group 2
-            //   Field 3: fixed int32
-            // End group 4 (should give an error)
-            var stream = new MemoryStream();
-            var output = new CodedOutputStream(stream);
-            output.WriteTag(1, WireFormat.WireType.LengthDelimited);
-            output.WriteString("field 1");
-
-            // The outer group...
-            output.WriteTag(2, WireFormat.WireType.StartGroup);
-            output.WriteTag(3, WireFormat.WireType.Fixed32);
-            output.WriteFixed32(100);
-            output.WriteTag(4, WireFormat.WireType.EndGroup);
-            output.Flush();
-            stream.Position = 0;
-
-            // Now act like a generated client
-            var input = new CodedInputStream(stream);
-            Assert.AreEqual(WireFormat.MakeTag(1, WireFormat.WireType.LengthDelimited), input.ReadTag());
-            Assert.AreEqual("field 1", input.ReadString());
-            Assert.AreEqual(WireFormat.MakeTag(2, WireFormat.WireType.StartGroup), input.ReadTag());
-            Assert.Throws<InvalidProtocolBufferException>(input.SkipLastField);
-        }
-
-        [Test]
-        public void RogueEndGroupTag()
-        {
-            // If we have an end-group tag without a leading start-group tag, generated
-            // code will just call SkipLastField... so that should fail.
-
-            var stream = new MemoryStream();
-            var output = new CodedOutputStream(stream);
-            output.WriteTag(1, WireFormat.WireType.EndGroup);
-            output.Flush();
-            stream.Position = 0;
-
-            var input = new CodedInputStream(stream);
-            Assert.AreEqual(WireFormat.MakeTag(1, WireFormat.WireType.EndGroup), input.ReadTag());
-            Assert.Throws<InvalidProtocolBufferException>(input.SkipLastField);
-        }
-
-        [Test]
-        public void EndOfStreamReachedWhileSkippingGroup()
-        {
-            var stream = new MemoryStream();
-            var output = new CodedOutputStream(stream);
-            output.WriteTag(1, WireFormat.WireType.StartGroup);
-            output.WriteTag(2, WireFormat.WireType.StartGroup);
-            output.WriteTag(2, WireFormat.WireType.EndGroup);
-
-            output.Flush();
-            stream.Position = 0;
-
-            // Now act like a generated client
-            var input = new CodedInputStream(stream);
-            input.ReadTag();
-            Assert.Throws<InvalidProtocolBufferException>(input.SkipLastField);
-        }
-
-        [Test]
-        public void RecursionLimitAppliedWhileSkippingGroup()
-        {
-            var stream = new MemoryStream();
-            var output = new CodedOutputStream(stream);
-            for (int i = 0; i < CodedInputStream.DefaultRecursionLimit + 1; i++)
-            {
-                output.WriteTag(1, WireFormat.WireType.StartGroup);
-            }
-            for (int i = 0; i < CodedInputStream.DefaultRecursionLimit + 1; i++)
-            {
-                output.WriteTag(1, WireFormat.WireType.EndGroup);
-            }
-            output.Flush();
-            stream.Position = 0;
-
-            // Now act like a generated client
-            var input = new CodedInputStream(stream);
-            Assert.AreEqual(WireFormat.MakeTag(1, WireFormat.WireType.StartGroup), input.ReadTag());
-            Assert.Throws<InvalidProtocolBufferException>(input.SkipLastField);
-        }
-
-        [Test]
-        public void Construction_Invalid()
-        {
-            Assert.Throws<ArgumentNullException>(() => new CodedInputStream((byte[]) null));
-            Assert.Throws<ArgumentNullException>(() => new CodedInputStream(null, 0, 0));
-            Assert.Throws<ArgumentNullException>(() => new CodedInputStream((Stream) null));
-            Assert.Throws<ArgumentOutOfRangeException>(() => new CodedInputStream(new byte[10], 100, 0));
-            Assert.Throws<ArgumentOutOfRangeException>(() => new CodedInputStream(new byte[10], 5, 10));
-        }
-
-        [Test]
-        public void CreateWithLimits_InvalidLimits()
-        {
-            var stream = new MemoryStream();
-            Assert.Throws<ArgumentOutOfRangeException>(() => CodedInputStream.CreateWithLimits(stream, 0, 1));
-            Assert.Throws<ArgumentOutOfRangeException>(() => CodedInputStream.CreateWithLimits(stream, 1, 0));
-        }
-
-        [Test]
-        public void Dispose_DisposesUnderlyingStream()
-        {
-            var memoryStream = new MemoryStream();
-            Assert.IsTrue(memoryStream.CanRead);
-            using (var cis = new CodedInputStream(memoryStream))
-            {
-            }
-            Assert.IsFalse(memoryStream.CanRead); // Disposed
-        }
-
-        [Test]
-        public void Dispose_WithLeaveOpen()
-        {
-            var memoryStream = new MemoryStream();
-            Assert.IsTrue(memoryStream.CanRead);
-            using (var cis = new CodedInputStream(memoryStream, true))
-            {
-            }
-            Assert.IsTrue(memoryStream.CanRead); // We left the stream open
-        }
-
-        [Test]
-        public void Dispose_FromByteArray()
-        {
-            var stream = new CodedInputStream(new byte[10]);
-            stream.Dispose();
-        }
-
-        [Test]
-        public void TestParseMessagesCloseTo2G()
-        {
-            byte[] serializedMessage = GenerateBigSerializedMessage();
-            // How many of these big messages do we need to take us near our 2GB limit?
-            int count = Int32.MaxValue / serializedMessage.Length;
-            // Now make a MemoryStream that will fake a near-2GB stream of messages by returning
-            // our big serialized message 'count' times.
-            using (RepeatingMemoryStream stream = new RepeatingMemoryStream(serializedMessage, count))
-            {
-                Assert.DoesNotThrow(()=>TestAllTypes.Parser.ParseFrom(stream));
-            }
-        }
-
-        [Test]
-        public void TestParseMessagesOver2G()
-        {
-            byte[] serializedMessage = GenerateBigSerializedMessage();
-            // How many of these big messages do we need to take us near our 2GB limit?
-            int count = Int32.MaxValue / serializedMessage.Length;
-            // Now add one to take us over the 2GB limit
-            count++;
-            // Now make a MemoryStream that will fake a near-2GB stream of messages by returning
-            // our big serialized message 'count' times.
-            using (RepeatingMemoryStream stream = new RepeatingMemoryStream(serializedMessage, count))
-            {
-                Assert.Throws<InvalidProtocolBufferException>(() => TestAllTypes.Parser.ParseFrom(stream),
-                    "Protocol message was too large.  May be malicious.  " +
-                    "Use CodedInputStream.SetSizeLimit() to increase the size limit.");
-            }
-        }
-
-        /// <returns>A serialized big message</returns>
-        private static byte[] GenerateBigSerializedMessage()
-        {
-            byte[] value = new byte[16 * 1024 * 1024];
-            TestAllTypes message = SampleMessages.CreateFullTestAllTypes();
-            message.SingleBytes = ByteString.CopyFrom(value);
-            return message.ToByteArray();
-        }
-
-        /// <summary>
-        /// A MemoryStream that repeats a byte arrays' content a number of times.
-        /// Simulates really large input without consuming loads of memory. Used above
-        /// to test the parsing behavior when the input size exceeds 2GB or close to it.
-        /// </summary>
-        private class RepeatingMemoryStream: MemoryStream
-        {
-            private readonly byte[] bytes;
-            private readonly int maxIterations;
-            private int index = 0;
-
-            public RepeatingMemoryStream(byte[] bytes, int maxIterations)
-            {
-                this.bytes = bytes;
-                this.maxIterations = maxIterations;
-            }
-
-            public override int Read(byte[] buffer, int offset, int count)
-            {
-                if (bytes.Length == 0)
-                {
-                    return 0;
-                }
-                int numBytesCopiedTotal = 0;
-                while (numBytesCopiedTotal < count && index < maxIterations)
-                {
-                    int numBytesToCopy = Math.Min(bytes.Length - (int)Position, count);
-                    Array.Copy(bytes, (int)Position, buffer, offset, numBytesToCopy);
-                    numBytesCopiedTotal += numBytesToCopy;
-                    offset += numBytesToCopy;
-                    count -= numBytesCopiedTotal;
-                    Position += numBytesToCopy;
-                    if (Position >= bytes.Length)
-                    {
-                        Position = 0;
-                        index++;
-                    }
-                }
-                return numBytesCopiedTotal;
-            }
-        }
-    }
-}
diff --git a/libs/protobuf/csharp/src/Google.Protobuf.Test/CodedOutputStreamTest.cs b/libs/protobuf/csharp/src/Google.Protobuf.Test/CodedOutputStreamTest.cs
deleted file mode 100644
index 13f83a2..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf.Test/CodedOutputStreamTest.cs
+++ /dev/null
@@ -1,583 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-using System.IO;
-using Google.Protobuf.TestProtos;
-using Google.Protobuf.Buffers;
-using NUnit.Framework;
-using System.Text;
-
-namespace Google.Protobuf
-{
-    public class CodedOutputStreamTest
-    {
-        /// <summary>
-        /// Writes the given value using WriteRawVarint32() and WriteRawVarint64() and
-        /// checks that the result matches the given bytes
-        /// </summary>
-        private static void AssertWriteVarint(byte[] data, ulong value)
-        {
-            // Only do 32-bit write if the value fits in 32 bits.
-            if ((value >> 32) == 0)
-            {
-                // CodedOutputStream
-                MemoryStream rawOutput = new MemoryStream();
-                CodedOutputStream output = new CodedOutputStream(rawOutput);
-                output.WriteRawVarint32((uint) value);
-                output.Flush();
-                Assert.AreEqual(data, rawOutput.ToArray());
-
-                // IBufferWriter
-                var bufferWriter = new TestArrayBufferWriter<byte>();
-                WriteContext.Initialize(bufferWriter, out WriteContext ctx);
-                ctx.WriteUInt32((uint) value);
-                ctx.Flush();
-                Assert.AreEqual(data, bufferWriter.WrittenSpan.ToArray());
-
-                // Also try computing size.
-                Assert.AreEqual(data.Length, CodedOutputStream.ComputeRawVarint32Size((uint) value));
-            }
-
-            {
-                // CodedOutputStream
-                MemoryStream rawOutput = new MemoryStream();
-                CodedOutputStream output = new CodedOutputStream(rawOutput);
-                output.WriteRawVarint64(value);
-                output.Flush();
-                Assert.AreEqual(data, rawOutput.ToArray());
-
-                // IBufferWriter
-                var bufferWriter = new TestArrayBufferWriter<byte>();
-                WriteContext.Initialize(bufferWriter, out WriteContext ctx);
-                ctx.WriteUInt64(value);
-                ctx.Flush();
-                Assert.AreEqual(data, bufferWriter.WrittenSpan.ToArray());
-
-                // Also try computing size.
-                Assert.AreEqual(data.Length, CodedOutputStream.ComputeRawVarint64Size(value));
-            }
-
-            // Try different buffer sizes.
-            for (int bufferSize = 1; bufferSize <= 16; bufferSize *= 2)
-            {
-                // Only do 32-bit write if the value fits in 32 bits.
-                if ((value >> 32) == 0)
-                {
-                    MemoryStream rawOutput = new MemoryStream();
-                    CodedOutputStream output =
-                        new CodedOutputStream(rawOutput, bufferSize);
-                    output.WriteRawVarint32((uint) value);
-                    output.Flush();
-                    Assert.AreEqual(data, rawOutput.ToArray());
-
-                    var bufferWriter = new TestArrayBufferWriter<byte>();
-                    bufferWriter.MaxGrowBy = bufferSize;
-                    WriteContext.Initialize(bufferWriter, out WriteContext ctx);
-                    ctx.WriteUInt32((uint) value);
-                    ctx.Flush();
-                    Assert.AreEqual(data, bufferWriter.WrittenSpan.ToArray());
-                }
-
-                {
-                    MemoryStream rawOutput = new MemoryStream();
-                    CodedOutputStream output = new CodedOutputStream(rawOutput, bufferSize);
-                    output.WriteRawVarint64(value);
-                    output.Flush();
-                    Assert.AreEqual(data, rawOutput.ToArray());
-
-                    var bufferWriter = new TestArrayBufferWriter<byte>();
-                    bufferWriter.MaxGrowBy = bufferSize;
-                    WriteContext.Initialize(bufferWriter, out WriteContext ctx);
-                    ctx.WriteUInt64(value);
-                    ctx.Flush();
-                    Assert.AreEqual(data, bufferWriter.WrittenSpan.ToArray());
-                }
-
-            }
-        }
-
-        /// <summary>
-        /// Tests WriteRawVarint32() and WriteRawVarint64()
-        /// </summary>
-        [Test]
-        public void WriteVarint()
-        {
-            AssertWriteVarint(new byte[] {0x00}, 0);
-            AssertWriteVarint(new byte[] {0x01}, 1);
-            AssertWriteVarint(new byte[] {0x7f}, 127);
-            // 14882
-            AssertWriteVarint(new byte[] {0xa2, 0x74}, (0x22 << 0) | (0x74 << 7));
-            // 2961488830
-            AssertWriteVarint(new byte[] {0xbe, 0xf7, 0x92, 0x84, 0x0b},
-                              (0x3e << 0) | (0x77 << 7) | (0x12 << 14) | (0x04 << 21) |
-                              (0x0bL << 28));
-
-            // 64-bit
-            // 7256456126
-            AssertWriteVarint(new byte[] {0xbe, 0xf7, 0x92, 0x84, 0x1b},
-                              (0x3e << 0) | (0x77 << 7) | (0x12 << 14) | (0x04 << 21) |
-                              (0x1bL << 28));
-            // 41256202580718336
-            AssertWriteVarint(
-                new byte[] {0x80, 0xe6, 0xeb, 0x9c, 0xc3, 0xc9, 0xa4, 0x49},
-                (0x00 << 0) | (0x66 << 7) | (0x6b << 14) | (0x1c << 21) |
-                (0x43UL << 28) | (0x49L << 35) | (0x24UL << 42) | (0x49UL << 49));
-            // 11964378330978735131
-            AssertWriteVarint(
-                new byte[] {0x9b, 0xa8, 0xf9, 0xc2, 0xbb, 0xd6, 0x80, 0x85, 0xa6, 0x01},
-                unchecked((ulong)
-                          ((0x1b << 0) | (0x28 << 7) | (0x79 << 14) | (0x42 << 21) |
-                           (0x3bL << 28) | (0x56L << 35) | (0x00L << 42) |
-                           (0x05L << 49) | (0x26L << 56) | (0x01L << 63))));
-        }
-
-        /// <summary>
-        /// Parses the given bytes using WriteRawLittleEndian32() and checks
-        /// that the result matches the given value.
-        /// </summary>
-        private static void AssertWriteLittleEndian32(byte[] data, uint value)
-        {
-            {
-                var rawOutput = new MemoryStream();
-                var output = new CodedOutputStream(rawOutput);
-                output.WriteRawLittleEndian32(value);
-                output.Flush();
-                Assert.AreEqual(data, rawOutput.ToArray());
-
-                var bufferWriter = new TestArrayBufferWriter<byte>();
-                WriteContext.Initialize(bufferWriter, out WriteContext ctx);
-                ctx.WriteFixed32(value);
-                ctx.Flush();
-                Assert.AreEqual(data, bufferWriter.WrittenSpan.ToArray());
-            }
-
-            // Try different buffer sizes.
-            for (int bufferSize = 1; bufferSize <= 16; bufferSize *= 2)
-            {
-                var rawOutput = new MemoryStream();
-                var output = new CodedOutputStream(rawOutput, bufferSize);
-                output.WriteRawLittleEndian32(value);
-                output.Flush();
-                Assert.AreEqual(data, rawOutput.ToArray());
-
-                var bufferWriter = new TestArrayBufferWriter<byte>();
-                bufferWriter.MaxGrowBy = bufferSize;
-                WriteContext.Initialize(bufferWriter, out WriteContext ctx);
-                ctx.WriteFixed32(value);
-                ctx.Flush();
-                Assert.AreEqual(data, bufferWriter.WrittenSpan.ToArray());
-            }
-        }
-
-        /// <summary>
-        /// Parses the given bytes using WriteRawLittleEndian64() and checks
-        /// that the result matches the given value.
-        /// </summary>
-        private static void AssertWriteLittleEndian64(byte[] data, ulong value)
-        {
-            {
-                var rawOutput = new MemoryStream();
-                var output = new CodedOutputStream(rawOutput);
-                output.WriteRawLittleEndian64(value);
-                output.Flush();
-                Assert.AreEqual(data, rawOutput.ToArray());
-
-                var bufferWriter = new TestArrayBufferWriter<byte>();
-                WriteContext.Initialize(bufferWriter, out WriteContext ctx);
-                ctx.WriteFixed64(value);
-                ctx.Flush();
-                Assert.AreEqual(data, bufferWriter.WrittenSpan.ToArray());
-            }
-
-            // Try different block sizes.
-            for (int blockSize = 1; blockSize <= 16; blockSize *= 2)
-            {
-                var rawOutput = new MemoryStream();
-                var output = new CodedOutputStream(rawOutput, blockSize);
-                output.WriteRawLittleEndian64(value);
-                output.Flush();
-                Assert.AreEqual(data, rawOutput.ToArray());
-
-                var bufferWriter = new TestArrayBufferWriter<byte>();
-                bufferWriter.MaxGrowBy = blockSize;
-                WriteContext.Initialize(bufferWriter, out WriteContext ctx);
-                ctx.WriteFixed64(value);
-                ctx.Flush();
-                Assert.AreEqual(data, bufferWriter.WrittenSpan.ToArray());
-            }
-        }
-
-        /// <summary>
-        /// Tests writeRawLittleEndian32() and writeRawLittleEndian64().
-        /// </summary>
-        [Test]
-        public void WriteLittleEndian()
-        {
-            AssertWriteLittleEndian32(new byte[] {0x78, 0x56, 0x34, 0x12}, 0x12345678);
-            AssertWriteLittleEndian32(new byte[] {0xf0, 0xde, 0xbc, 0x9a}, 0x9abcdef0);
-
-            AssertWriteLittleEndian64(
-                new byte[] {0xf0, 0xde, 0xbc, 0x9a, 0x78, 0x56, 0x34, 0x12},
-                0x123456789abcdef0L);
-            AssertWriteLittleEndian64(
-                new byte[] {0x78, 0x56, 0x34, 0x12, 0xf0, 0xde, 0xbc, 0x9a},
-                0x9abcdef012345678UL);
-        }
-
-        [Test]
-        public void WriteWholeMessage_VaryingBlockSizes()
-        {
-            TestAllTypes message = SampleMessages.CreateFullTestAllTypes();
-
-            byte[] rawBytes = message.ToByteArray();
-
-            // Try different block sizes.
-            for (int blockSize = 1; blockSize < 256; blockSize *= 2)
-            {
-                MemoryStream rawOutput = new MemoryStream();
-                CodedOutputStream output = new CodedOutputStream(rawOutput, blockSize);
-                message.WriteTo(output);
-                output.Flush();
-                Assert.AreEqual(rawBytes, rawOutput.ToArray());
-
-                var bufferWriter = new TestArrayBufferWriter<byte>();
-                bufferWriter.MaxGrowBy = blockSize;
-                message.WriteTo(bufferWriter);
-                Assert.AreEqual(rawBytes, bufferWriter.WrittenSpan.ToArray()); 
-            }
-        }
-
-        [Test]
-        public void WriteContext_WritesWithFlushes()
-        {
-            TestAllTypes message = SampleMessages.CreateFullTestAllTypes();
-
-            MemoryStream expectedOutput = new MemoryStream();
-            CodedOutputStream output = new CodedOutputStream(expectedOutput);
-            output.WriteMessage(message);
-            output.Flush();
-            byte[] expectedBytes1 = expectedOutput.ToArray();
-
-            output.WriteMessage(message);
-            output.Flush();
-            byte[] expectedBytes2 = expectedOutput.ToArray();
-
-            var bufferWriter = new TestArrayBufferWriter<byte>();
-            WriteContext.Initialize(bufferWriter, out WriteContext ctx);
-            ctx.WriteMessage(message);
-            ctx.Flush();
-            Assert.AreEqual(expectedBytes1, bufferWriter.WrittenSpan.ToArray());
-
-            ctx.WriteMessage(message);
-            ctx.Flush();
-            Assert.AreEqual(expectedBytes2, bufferWriter.WrittenSpan.ToArray());
-        }
-        
-        [Test]
-        public void EncodeZigZag32()
-        {
-            Assert.AreEqual(0u, WritingPrimitives.EncodeZigZag32(0));
-            Assert.AreEqual(1u, WritingPrimitives.EncodeZigZag32(-1));
-            Assert.AreEqual(2u, WritingPrimitives.EncodeZigZag32(1));
-            Assert.AreEqual(3u, WritingPrimitives.EncodeZigZag32(-2));
-            Assert.AreEqual(0x7FFFFFFEu, WritingPrimitives.EncodeZigZag32(0x3FFFFFFF));
-            Assert.AreEqual(0x7FFFFFFFu, WritingPrimitives.EncodeZigZag32(unchecked((int) 0xC0000000)));
-            Assert.AreEqual(0xFFFFFFFEu, WritingPrimitives.EncodeZigZag32(0x7FFFFFFF));
-            Assert.AreEqual(0xFFFFFFFFu, WritingPrimitives.EncodeZigZag32(unchecked((int) 0x80000000)));
-        }
-
-        [Test]
-        public void EncodeZigZag64()
-        {
-            Assert.AreEqual(0u, WritingPrimitives.EncodeZigZag64(0));
-            Assert.AreEqual(1u, WritingPrimitives.EncodeZigZag64(-1));
-            Assert.AreEqual(2u, WritingPrimitives.EncodeZigZag64(1));
-            Assert.AreEqual(3u, WritingPrimitives.EncodeZigZag64(-2));
-            Assert.AreEqual(0x000000007FFFFFFEuL,
-                            WritingPrimitives.EncodeZigZag64(unchecked((long) 0x000000003FFFFFFFUL)));
-            Assert.AreEqual(0x000000007FFFFFFFuL,
-                            WritingPrimitives.EncodeZigZag64(unchecked((long) 0xFFFFFFFFC0000000UL)));
-            Assert.AreEqual(0x00000000FFFFFFFEuL,
-                            WritingPrimitives.EncodeZigZag64(unchecked((long) 0x000000007FFFFFFFUL)));
-            Assert.AreEqual(0x00000000FFFFFFFFuL,
-                            WritingPrimitives.EncodeZigZag64(unchecked((long) 0xFFFFFFFF80000000UL)));
-            Assert.AreEqual(0xFFFFFFFFFFFFFFFEL,
-                            WritingPrimitives.EncodeZigZag64(unchecked((long) 0x7FFFFFFFFFFFFFFFUL)));
-            Assert.AreEqual(0xFFFFFFFFFFFFFFFFL,
-                            WritingPrimitives.EncodeZigZag64(unchecked((long) 0x8000000000000000UL)));
-        }
-
-        [Test]
-        public void RoundTripZigZag32()
-        {
-            // Some easier-to-verify round-trip tests.  The inputs (other than 0, 1, -1)
-            // were chosen semi-randomly via keyboard bashing.
-            Assert.AreEqual(0, ParsingPrimitives.DecodeZigZag32(WritingPrimitives.EncodeZigZag32(0)));
-            Assert.AreEqual(1, ParsingPrimitives.DecodeZigZag32(WritingPrimitives.EncodeZigZag32(1)));
-            Assert.AreEqual(-1, ParsingPrimitives.DecodeZigZag32(WritingPrimitives.EncodeZigZag32(-1)));
-            Assert.AreEqual(14927, ParsingPrimitives.DecodeZigZag32(WritingPrimitives.EncodeZigZag32(14927)));
-            Assert.AreEqual(-3612, ParsingPrimitives.DecodeZigZag32(WritingPrimitives.EncodeZigZag32(-3612)));
-        }
-
-        [Test]
-        public void RoundTripZigZag64()
-        {
-            Assert.AreEqual(0, ParsingPrimitives.DecodeZigZag64(WritingPrimitives.EncodeZigZag64(0)));
-            Assert.AreEqual(1, ParsingPrimitives.DecodeZigZag64(WritingPrimitives.EncodeZigZag64(1)));
-            Assert.AreEqual(-1, ParsingPrimitives.DecodeZigZag64(WritingPrimitives.EncodeZigZag64(-1)));
-            Assert.AreEqual(14927, ParsingPrimitives.DecodeZigZag64(WritingPrimitives.EncodeZigZag64(14927)));
-            Assert.AreEqual(-3612, ParsingPrimitives.DecodeZigZag64(WritingPrimitives.EncodeZigZag64(-3612)));
-
-            Assert.AreEqual(856912304801416L,
-                            ParsingPrimitives.DecodeZigZag64(WritingPrimitives.EncodeZigZag64(856912304801416L)));
-            Assert.AreEqual(-75123905439571256L,
-                            ParsingPrimitives.DecodeZigZag64(WritingPrimitives.EncodeZigZag64(-75123905439571256L)));
-        }
-
-        [Test]
-        public void TestNegativeEnumNoTag()
-        {
-            Assert.AreEqual(10, CodedOutputStream.ComputeInt32Size(-2));
-            Assert.AreEqual(10, CodedOutputStream.ComputeEnumSize((int) SampleEnum.NegativeValue));
-
-            byte[] bytes = new byte[10];
-            CodedOutputStream output = new CodedOutputStream(bytes);
-            output.WriteEnum((int) SampleEnum.NegativeValue);
-
-            Assert.AreEqual(0, output.SpaceLeft);
-            Assert.AreEqual("FE-FF-FF-FF-FF-FF-FF-FF-FF-01", BitConverter.ToString(bytes));
-        }
-
-        [Test]
-        public void TestCodedInputOutputPosition()
-        {
-            byte[] content = new byte[110];
-            for (int i = 0; i < content.Length; i++)
-                content[i] = (byte)i;
-
-            byte[] child = new byte[120];
-            {
-                MemoryStream ms = new MemoryStream(child);
-                CodedOutputStream cout = new CodedOutputStream(ms, 20);
-                // Field 11: numeric value: 500
-                cout.WriteTag(11, WireFormat.WireType.Varint);
-                Assert.AreEqual(1, cout.Position);
-                cout.WriteInt32(500);
-                Assert.AreEqual(3, cout.Position);
-                //Field 12: length delimited 120 bytes
-                cout.WriteTag(12, WireFormat.WireType.LengthDelimited);
-                Assert.AreEqual(4, cout.Position);
-                cout.WriteBytes(ByteString.CopyFrom(content));
-                Assert.AreEqual(115, cout.Position);
-                // Field 13: fixed numeric value: 501
-                cout.WriteTag(13, WireFormat.WireType.Fixed32);
-                Assert.AreEqual(116, cout.Position);
-                cout.WriteSFixed32(501);
-                Assert.AreEqual(120, cout.Position);
-                cout.Flush();
-            }
-
-            byte[] bytes = new byte[130];
-            {
-                CodedOutputStream cout = new CodedOutputStream(bytes);
-                // Field 1: numeric value: 500
-                cout.WriteTag(1, WireFormat.WireType.Varint);
-                Assert.AreEqual(1, cout.Position);
-                cout.WriteInt32(500);
-                Assert.AreEqual(3, cout.Position);
-                //Field 2: length delimited 120 bytes
-                cout.WriteTag(2, WireFormat.WireType.LengthDelimited);
-                Assert.AreEqual(4, cout.Position);
-                cout.WriteBytes(ByteString.CopyFrom(child));
-                Assert.AreEqual(125, cout.Position);
-                // Field 3: fixed numeric value: 500
-                cout.WriteTag(3, WireFormat.WireType.Fixed32);
-                Assert.AreEqual(126, cout.Position);
-                cout.WriteSFixed32(501);
-                Assert.AreEqual(130, cout.Position);
-                cout.Flush();
-            }
-            // Now test Input stream:
-            {
-                CodedInputStream cin = new CodedInputStream(new MemoryStream(bytes), new byte[50], 0, 0, false);
-                Assert.AreEqual(0, cin.Position);
-                // Field 1:
-                uint tag = cin.ReadTag();
-                Assert.AreEqual(1, tag >> 3);
-                Assert.AreEqual(1, cin.Position);
-                Assert.AreEqual(500, cin.ReadInt32());
-                Assert.AreEqual(3, cin.Position);
-                //Field 2:
-                tag = cin.ReadTag();
-                Assert.AreEqual(2, tag >> 3);
-                Assert.AreEqual(4, cin.Position);
-                int childlen = cin.ReadLength();
-                Assert.AreEqual(120, childlen);
-                Assert.AreEqual(5, cin.Position);
-                int oldlimit = cin.PushLimit((int)childlen);
-                Assert.AreEqual(5, cin.Position);
-                // Now we are reading child message
-                {
-                    // Field 11: numeric value: 500
-                    tag = cin.ReadTag();
-                    Assert.AreEqual(11, tag >> 3);
-                    Assert.AreEqual(6, cin.Position);
-                    Assert.AreEqual(500, cin.ReadInt32());
-                    Assert.AreEqual(8, cin.Position);
-                    //Field 12: length delimited 120 bytes
-                    tag = cin.ReadTag();
-                    Assert.AreEqual(12, tag >> 3);
-                    Assert.AreEqual(9, cin.Position);
-                    ByteString bstr = cin.ReadBytes();
-                    Assert.AreEqual(110, bstr.Length);
-                    Assert.AreEqual((byte) 109, bstr[109]);
-                    Assert.AreEqual(120, cin.Position);
-                    // Field 13: fixed numeric value: 501
-                    tag = cin.ReadTag();
-                    Assert.AreEqual(13, tag >> 3);
-                    // ROK - Previously broken here, this returned 126 failing to account for bufferSizeAfterLimit
-                    Assert.AreEqual(121, cin.Position);
-                    Assert.AreEqual(501, cin.ReadSFixed32());
-                    Assert.AreEqual(125, cin.Position);
-                    Assert.IsTrue(cin.IsAtEnd);
-                }
-                cin.PopLimit(oldlimit);
-                Assert.AreEqual(125, cin.Position);
-                // Field 3: fixed numeric value: 501
-                tag = cin.ReadTag();
-                Assert.AreEqual(3, tag >> 3);
-                Assert.AreEqual(126, cin.Position);
-                Assert.AreEqual(501, cin.ReadSFixed32());
-                Assert.AreEqual(130, cin.Position);
-                Assert.IsTrue(cin.IsAtEnd);
-            }
-        }
-
-        [Test]
-        public void Dispose_DisposesUnderlyingStream()
-        {
-            var memoryStream = new MemoryStream();
-            Assert.IsTrue(memoryStream.CanWrite);
-            using (var cos = new CodedOutputStream(memoryStream))
-            {
-                cos.WriteRawBytes(new byte[] {0});
-                Assert.AreEqual(0, memoryStream.Position); // Not flushed yet
-            }
-            Assert.AreEqual(1, memoryStream.ToArray().Length); // Flushed data from CodedOutputStream to MemoryStream
-            Assert.IsFalse(memoryStream.CanWrite); // Disposed
-        }
-
-        [Test]
-        public void Dispose_WithLeaveOpen()
-        {
-            var memoryStream = new MemoryStream();
-            Assert.IsTrue(memoryStream.CanWrite);
-            using (var cos = new CodedOutputStream(memoryStream, true))
-            {
-                cos.WriteRawBytes(new byte[] {0});
-                Assert.AreEqual(0, memoryStream.Position); // Not flushed yet
-            }
-            Assert.AreEqual(1, memoryStream.Position); // Flushed data from CodedOutputStream to MemoryStream
-            Assert.IsTrue(memoryStream.CanWrite); // We left the stream open
-        }
-
-        [Test]
-        public void Dispose_FromByteArray()
-        {
-            var stream = new CodedOutputStream(new byte[10]);
-            stream.Dispose();
-        }
-
-        [Test]
-        public void WriteString_AsciiSmall_MaxUtf8SizeExceedsBuffer()
-        {
-            var buffer = new byte[5];
-            var output = new CodedOutputStream(buffer);
-            output.WriteString("ABC");
-
-            output.Flush();
-
-            // Verify written content
-            var input = new CodedInputStream(buffer);
-            Assert.AreEqual("ABC", input.ReadString());
-        }
-
-        [Test]
-        public void WriteStringsOfDifferentSizes_Ascii()
-        {
-            for (int i = 1; i <= 1024; i++)
-            {
-                var buffer = new byte[4096];
-                var output = new CodedOutputStream(buffer);
-                var sb = new StringBuilder();
-                for (int j = 0; j < i; j++)
-                {
-                    sb.Append((j % 10).ToString()); // incrementing numbers, repeating
-                }
-                var s = sb.ToString();
-                output.WriteString(s);
-
-                output.Flush();
-
-                // Verify written content
-                var input = new CodedInputStream(buffer);
-                Assert.AreEqual(s, input.ReadString());
-            }
-        }
-
-        [Test]
-        public void WriteStringsOfDifferentSizes_Unicode()
-        {
-            for (int i = 1; i <= 1024; i++)
-            {
-                var buffer = new byte[4096];
-                var output = new CodedOutputStream(buffer);
-                var sb = new StringBuilder();
-                for (int j = 0; j < i; j++)
-                {
-                    char c = (char)((j % 10) + 10112);
-                    sb.Append(c.ToString()); // incrementing unicode numbers, repeating
-                }
-                var s = sb.ToString();
-                output.WriteString(s);
-
-                output.Flush();
-
-                // Verify written content
-                var input = new CodedInputStream(buffer);
-
-                Assert.AreEqual(s, input.ReadString());
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/libs/protobuf/csharp/src/Google.Protobuf.Test/Collections/MapFieldTest.cs b/libs/protobuf/csharp/src/Google.Protobuf.Test/Collections/MapFieldTest.cs
deleted file mode 100644
index 1f7b8a3..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf.Test/Collections/MapFieldTest.cs
+++ /dev/null
@@ -1,659 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-using System.IO;
-using System.Collections.Generic;
-using Google.Protobuf.TestProtos;
-using NUnit.Framework;
-using System.Collections;
-using System.Linq;
-
-namespace Google.Protobuf.Collections
-{
-    /// <summary>
-    /// Tests for MapField which aren't reliant on the encoded format -
-    /// tests for serialization/deserialization are part of GeneratedMessageTest.
-    /// </summary>
-    public class MapFieldTest
-    {
-        [Test]
-        public void Clone_ClonesMessages()
-        {
-            var message = new ForeignMessage { C = 20 };
-            var map = new MapField<string, ForeignMessage> { { "x", message } };
-            var clone = map.Clone();
-            map["x"].C = 30;
-            Assert.AreEqual(20, clone["x"].C);
-        }
-
-        [Test]
-        public void NullValuesProhibited()
-        {
-            TestNullValues<int?>(0);
-            TestNullValues("");
-            TestNullValues(new TestAllTypes());
-        }
-
-        private void TestNullValues<T>(T nonNullValue)
-        {
-            var map = new MapField<int, T>();
-            var nullValue = (T) (object) null;
-            Assert.Throws<ArgumentNullException>(() => map.Add(0, nullValue));
-            Assert.Throws<ArgumentNullException>(() => map[0] = nullValue);
-            map.Add(1, nonNullValue);
-            map[1] = nonNullValue;
-        }
-
-        [Test]
-        public void Add_ForbidsNullKeys()
-        {
-            var map = new MapField<string, ForeignMessage>();
-            Assert.Throws<ArgumentNullException>(() => map.Add(null, new ForeignMessage()));
-        }
-
-        [Test]
-        public void Indexer_ForbidsNullKeys()
-        {
-            var map = new MapField<string, ForeignMessage>();
-            Assert.Throws<ArgumentNullException>(() => map[null] = new ForeignMessage());
-        }
-
-        [Test]
-        public void AddPreservesInsertionOrder()
-        {
-            var map = new MapField<string, string>();
-            map.Add("a", "v1");
-            map.Add("b", "v2");
-            map.Add("c", "v3");
-            map.Remove("b");
-            map.Add("d", "v4");
-            CollectionAssert.AreEqual(new[] { "a", "c", "d" }, map.Keys);
-            CollectionAssert.AreEqual(new[] { "v1", "v3", "v4" }, map.Values);
-        }
-
-        [Test]
-        public void EqualityIsOrderInsensitive()
-        {
-            var map1 = new MapField<string, string>();
-            map1.Add("a", "v1");
-            map1.Add("b", "v2");
-
-            var map2 = new MapField<string, string>();
-            map2.Add("b", "v2");
-            map2.Add("a", "v1");
-
-            EqualityTester.AssertEquality(map1, map2);
-        }
-
-        [Test]
-        public void EqualityIsKeySensitive()
-        {
-            var map1 = new MapField<string, string>();
-            map1.Add("first key", "v1");
-            map1.Add("second key", "v2");
-
-            var map2 = new MapField<string, string>();
-            map2.Add("third key", "v1");
-            map2.Add("fourth key", "v2");
-
-            EqualityTester.AssertInequality(map1, map2);
-        }
-
-        [Test]
-        public void Equality_Simple()
-        {
-            var map = new MapField<string, string>();
-            EqualityTester.AssertEquality(map, map);
-            EqualityTester.AssertInequality(map, null);
-            Assert.IsFalse(map.Equals(new object()));
-        }
-
-        [Test]
-        public void EqualityIsValueSensitive()
-        {
-            // Note: Without some care, it's a little easier than one might
-            // hope to see hash collisions, but only in some environments...
-            var map1 = new MapField<string, string>();
-            map1.Add("a", "first value");
-            map1.Add("b", "second value");
-
-            var map2 = new MapField<string, string>();
-            map2.Add("a", "third value");
-            map2.Add("b", "fourth value");
-
-            EqualityTester.AssertInequality(map1, map2);
-        }
-
-        [Test]
-        public void Add_Dictionary()
-        {
-            var map1 = new MapField<string, string>
-            {
-                { "x", "y" },
-                { "a", "b" }
-            };
-            var map2 = new MapField<string, string>
-            {
-                { "before", "" },
-                map1,
-                { "after", "" }
-            };
-            var expected = new MapField<string, string>
-            {
-                { "before", "" },
-                { "x", "y" },
-                { "a", "b" },
-                { "after", "" }
-            };
-            Assert.AreEqual(expected, map2);
-            CollectionAssert.AreEqual(new[] { "before", "x", "a", "after" }, map2.Keys);
-        }
-
-        // General IDictionary<TKey, TValue> behavior tests
-        [Test]
-        public void Add_KeyAlreadyExists()
-        {
-            var map = new MapField<string, string>();
-            map.Add("foo", "bar");
-            Assert.Throws<ArgumentException>(() => map.Add("foo", "baz"));
-        }
-
-        [Test]
-        public void Add_Pair()
-        {
-            var map = new MapField<string, string>();
-            ICollection<KeyValuePair<string, string>> collection = map;
-            collection.Add(NewKeyValuePair("x", "y"));
-            Assert.AreEqual("y", map["x"]);
-            Assert.Throws<ArgumentException>(() => collection.Add(NewKeyValuePair("x", "z")));
-        }
-
-        [Test]
-        public void Contains_Pair()
-        {
-            var map = new MapField<string, string> { { "x", "y" } };
-            ICollection<KeyValuePair<string, string>> collection = map;
-            Assert.IsTrue(collection.Contains(NewKeyValuePair("x", "y")));
-            Assert.IsFalse(collection.Contains(NewKeyValuePair("x", "z")));
-            Assert.IsFalse(collection.Contains(NewKeyValuePair("z", "y")));
-        }
-
-        [Test]
-        public void Remove_Key()
-        {
-            var map = new MapField<string, string>();
-            map.Add("foo", "bar");
-            Assert.AreEqual(1, map.Count);
-            Assert.IsFalse(map.Remove("missing"));
-            Assert.AreEqual(1, map.Count);
-            Assert.IsTrue(map.Remove("foo"));
-            Assert.AreEqual(0, map.Count);
-            Assert.Throws<ArgumentNullException>(() => map.Remove(null));
-        }
-
-        [Test]
-        public void Remove_Pair()
-        {
-            var map = new MapField<string, string>();
-            map.Add("foo", "bar");
-            ICollection<KeyValuePair<string, string>> collection = map;
-            Assert.AreEqual(1, map.Count);
-            Assert.IsFalse(collection.Remove(NewKeyValuePair("wrong key", "bar")));
-            Assert.AreEqual(1, map.Count);
-            Assert.IsFalse(collection.Remove(NewKeyValuePair("foo", "wrong value")));
-            Assert.AreEqual(1, map.Count);
-            Assert.IsTrue(collection.Remove(NewKeyValuePair("foo", "bar")));
-            Assert.AreEqual(0, map.Count);
-            Assert.Throws<ArgumentException>(() => collection.Remove(new KeyValuePair<string, string>(null, "")));
-        }
-
-        [Test]
-        public void CopyTo_Pair()
-        {
-            var map = new MapField<string, string>();
-            map.Add("foo", "bar");
-            ICollection<KeyValuePair<string, string>> collection = map;
-            KeyValuePair<string, string>[] array = new KeyValuePair<string, string>[3];
-            collection.CopyTo(array, 1);
-            Assert.AreEqual(NewKeyValuePair("foo", "bar"), array[1]);
-        }
-
-        [Test]
-        public void Clear()
-        {
-            var map = new MapField<string, string> { { "x", "y" } };
-            Assert.AreEqual(1, map.Count);
-            map.Clear();
-            Assert.AreEqual(0, map.Count);
-            map.Add("x", "y");
-            Assert.AreEqual(1, map.Count);
-        }
-
-        [Test]
-        public void Indexer_Get()
-        {
-            var map = new MapField<string, string> { { "x", "y" } };
-            Assert.AreEqual("y", map["x"]);
-            Assert.Throws<KeyNotFoundException>(() => { var ignored = map["z"]; });
-        }
-
-        [Test]
-        public void Indexer_Set()
-        {
-            var map = new MapField<string, string>();
-            map["x"] = "y";
-            Assert.AreEqual("y", map["x"]);
-            map["x"] = "z"; // This won't throw, unlike Add.
-            Assert.AreEqual("z", map["x"]);
-        }
-
-        [Test]
-        public void GetEnumerator_NonGeneric()
-        {
-            IEnumerable map = new MapField<string, string> { { "x", "y" } };
-            CollectionAssert.AreEqual(new[] { new KeyValuePair<string, string>("x", "y") },
-                map.Cast<object>().ToList());
-        }
-
-        // Test for the explicitly-implemented non-generic IDictionary interface
-        [Test]
-        public void IDictionary_GetEnumerator()
-        {
-            IDictionary map = new MapField<string, string> { { "x", "y" } };
-            var enumerator = map.GetEnumerator();
-
-            // Commented assertions show an ideal situation - it looks like
-            // the LinkedList enumerator doesn't throw when you ask for the current entry
-            // at an inappropriate time; fixing this would be more work than it's worth.
-            // Assert.Throws<InvalidOperationException>(() => enumerator.Current.GetHashCode());
-            Assert.IsTrue(enumerator.MoveNext());
-            Assert.AreEqual("x", enumerator.Key);
-            Assert.AreEqual("y", enumerator.Value);
-            Assert.AreEqual(new DictionaryEntry("x", "y"), enumerator.Current);
-            Assert.AreEqual(new DictionaryEntry("x", "y"), enumerator.Entry);
-            Assert.IsFalse(enumerator.MoveNext());
-            // Assert.Throws<InvalidOperationException>(() => enumerator.Current.GetHashCode());
-            enumerator.Reset();
-            // Assert.Throws<InvalidOperationException>(() => enumerator.Current.GetHashCode());
-            Assert.IsTrue(enumerator.MoveNext());
-            Assert.AreEqual("x", enumerator.Key); // Assume the rest are okay
-        }
-
-        [Test]
-        public void IDictionary_Add()
-        {
-            var map = new MapField<string, string> { { "x", "y" } };
-            IDictionary dictionary = map;
-            dictionary.Add("a", "b");
-            Assert.AreEqual("b", map["a"]);
-            Assert.Throws<ArgumentException>(() => dictionary.Add("a", "duplicate"));
-            Assert.Throws<InvalidCastException>(() => dictionary.Add(new object(), "key is bad"));
-            Assert.Throws<InvalidCastException>(() => dictionary.Add("value is bad", new object()));
-        }
-
-        [Test]
-        public void IDictionary_Contains()
-        {
-            var map = new MapField<string, string> { { "x", "y" } };
-            IDictionary dictionary = map;
-
-            Assert.IsFalse(dictionary.Contains("a"));
-            Assert.IsFalse(dictionary.Contains(5));
-            // Surprising, but IDictionary.Contains is only about keys.
-            Assert.IsFalse(dictionary.Contains(new DictionaryEntry("x", "y")));
-            Assert.IsTrue(dictionary.Contains("x"));
-        }
-
-        [Test]
-        public void IDictionary_Remove()
-        {
-            var map = new MapField<string, string> { { "x", "y" } };
-            IDictionary dictionary = map;
-            dictionary.Remove("a");
-            Assert.AreEqual(1, dictionary.Count);
-            dictionary.Remove(5);
-            Assert.AreEqual(1, dictionary.Count);
-            dictionary.Remove(new DictionaryEntry("x", "y"));
-            Assert.AreEqual(1, dictionary.Count);
-            dictionary.Remove("x");
-            Assert.AreEqual(0, dictionary.Count);
-            Assert.Throws<ArgumentNullException>(() => dictionary.Remove(null));
-        }
-
-        [Test]
-        public void IDictionary_CopyTo()
-        {
-            var map = new MapField<string, string> { { "x", "y" } };
-            IDictionary dictionary = map;
-            var array = new DictionaryEntry[3];
-            dictionary.CopyTo(array, 1);
-            CollectionAssert.AreEqual(new[] { default(DictionaryEntry), new DictionaryEntry("x", "y"), default(DictionaryEntry) },
-                array);
-            var objectArray = new object[3];
-            dictionary.CopyTo(objectArray, 1);
-            CollectionAssert.AreEqual(new object[] { null, new DictionaryEntry("x", "y"), null },
-                objectArray);
-        }
-
-        [Test]
-        public void IDictionary_IsFixedSize()
-        {
-            var map = new MapField<string, string> { { "x", "y" } };
-            IDictionary dictionary = map;
-            Assert.IsFalse(dictionary.IsFixedSize);
-        }
-
-        [Test]
-        public void IDictionary_Keys()
-        {
-            IDictionary dictionary = new MapField<string, string> { { "x", "y" } };
-            CollectionAssert.AreEqual(new[] { "x" }, dictionary.Keys);
-        }
-
-        [Test]
-        public void IDictionary_Values()
-        {
-            IDictionary dictionary = new MapField<string, string> { { "x", "y" } };
-            CollectionAssert.AreEqual(new[] { "y" }, dictionary.Values);
-        }
-
-        [Test]
-        public void IDictionary_IsSynchronized()
-        {
-            IDictionary dictionary = new MapField<string, string> { { "x", "y" } };
-            Assert.IsFalse(dictionary.IsSynchronized);
-        }
-
-        [Test]
-        public void IDictionary_SyncRoot()
-        {
-            IDictionary dictionary = new MapField<string, string> { { "x", "y" } };
-            Assert.AreSame(dictionary, dictionary.SyncRoot);
-        }
-
-        [Test]
-        public void IDictionary_Indexer_Get()
-        {
-            IDictionary dictionary = new MapField<string, string> { { "x", "y" } };
-            Assert.AreEqual("y", dictionary["x"]);
-            Assert.IsNull(dictionary["a"]);
-            Assert.IsNull(dictionary[5]);
-            Assert.Throws<ArgumentNullException>(() => dictionary[null].GetHashCode());
-        }
-
-        [Test]
-        public void IDictionary_Indexer_Set()
-        {
-            var map = new MapField<string, string> { { "x", "y" } };
-            IDictionary dictionary = map;
-            map["a"] = "b";
-            Assert.AreEqual("b", map["a"]);
-            map["a"] = "c";
-            Assert.AreEqual("c", map["a"]);
-            Assert.Throws<InvalidCastException>(() => dictionary[5] = "x");
-            Assert.Throws<InvalidCastException>(() => dictionary["x"] = 5);
-            Assert.Throws<ArgumentNullException>(() => dictionary[null] = "z");
-            Assert.Throws<ArgumentNullException>(() => dictionary["x"] = null);
-        }
-
-        [Test]
-        public void KeysReturnsLiveView()
-        {
-            var map = new MapField<string, string>();
-            var keys = map.Keys;
-            CollectionAssert.AreEqual(new string[0], keys);
-            map["foo"] = "bar";
-            map["x"] = "y";
-            CollectionAssert.AreEqual(new[] { "foo", "x" }, keys);
-        }
-
-        [Test]
-        public void ValuesReturnsLiveView()
-        {
-            var map = new MapField<string, string>();
-            var values = map.Values;
-            CollectionAssert.AreEqual(new string[0], values);
-            map["foo"] = "bar";
-            map["x"] = "y";
-            CollectionAssert.AreEqual(new[] { "bar", "y" }, values);
-        }
-
-        // Just test keys - we know the implementation is the same for values
-        [Test]
-        public void ViewsAreReadOnly()
-        {
-            var map = new MapField<string, string>();
-            var keys = map.Keys;
-            Assert.IsTrue(keys.IsReadOnly);
-            Assert.Throws<NotSupportedException>(() => keys.Clear());
-            Assert.Throws<NotSupportedException>(() => keys.Remove("a"));
-            Assert.Throws<NotSupportedException>(() => keys.Add("a"));
-        }
-
-        // Just test keys - we know the implementation is the same for values
-        [Test]
-        public void ViewCopyTo()
-        {
-            var map = new MapField<string, string> { { "foo", "bar" }, { "x", "y" } };
-            var keys = map.Keys;
-            var array = new string[4];
-            Assert.Throws<ArgumentException>(() => keys.CopyTo(array, 3));
-            Assert.Throws<ArgumentOutOfRangeException>(() => keys.CopyTo(array, -1));
-            keys.CopyTo(array, 1);
-            CollectionAssert.AreEqual(new[] { null, "foo", "x", null }, array);
-        }
-
-        // Just test keys - we know the implementation is the same for values
-        [Test]
-        public void NonGenericViewCopyTo()
-        {
-            IDictionary map = new MapField<string, string> { { "foo", "bar" }, { "x", "y" } };
-            ICollection keys = map.Keys;
-            // Note the use of the Array type here rather than string[]
-            Array array = new string[4];
-            Assert.Throws<ArgumentException>(() => keys.CopyTo(array, 3));
-            Assert.Throws<ArgumentOutOfRangeException>(() => keys.CopyTo(array, -1));
-            keys.CopyTo(array, 1);
-            CollectionAssert.AreEqual(new[] { null, "foo", "x", null }, array);
-        }
-
-        [Test]
-        public void KeysContains()
-        {
-            var map = new MapField<string, string> { { "foo", "bar" }, { "x", "y" } };
-            var keys = map.Keys;
-            Assert.IsTrue(keys.Contains("foo"));
-            Assert.IsFalse(keys.Contains("bar")); // It's a value!
-            Assert.IsFalse(keys.Contains("1"));
-            // Keys can't be null, so we should prevent contains check
-            Assert.Throws<ArgumentNullException>(() => keys.Contains(null));
-        }
-
-        [Test]
-        public void KeysCopyTo()
-        {
-            var map = new MapField<string, string> { { "foo", "bar" }, { "x", "y" } };
-            var keys = map.Keys.ToArray(); // Uses CopyTo internally
-            CollectionAssert.AreEquivalent(new[] { "foo", "x" }, keys);
-        }
-
-        [Test]
-        public void ValuesContains()
-        {
-            var map = new MapField<string, string> { { "foo", "bar" }, { "x", "y" } };
-            var values = map.Values;
-            Assert.IsTrue(values.Contains("bar"));
-            Assert.IsFalse(values.Contains("foo")); // It's a key!
-            Assert.IsFalse(values.Contains("1"));
-            // Values can be null, so this makes sense
-            Assert.IsFalse(values.Contains(null));
-        }
-
-        [Test]
-        public void ValuesCopyTo()
-        {
-            var map = new MapField<string, string> { { "foo", "bar" }, { "x", "y" } };
-            var values = map.Values.ToArray(); // Uses CopyTo internally
-            CollectionAssert.AreEquivalent(new[] { "bar", "y" }, values);
-        }
-
-        [Test]
-        public void ToString_StringToString()
-        {
-            var map = new MapField<string, string> { { "foo", "bar" }, { "x", "y" } };
-            Assert.AreEqual("{ \"foo\": \"bar\", \"x\": \"y\" }", map.ToString());
-        }
-
-        [Test]
-        public void ToString_UnsupportedKeyType()
-        {
-            var map = new MapField<byte, string> { { 10, "foo" } };
-            Assert.Throws<ArgumentException>(() => map.ToString());
-        }
-
-        [Test]
-        public void NaNValuesComparedBitwise()
-        {
-            var map1 = new MapField<string, double>
-            {
-                { "x", SampleNaNs.Regular },
-                { "y", SampleNaNs.SignallingFlipped }
-            };
-
-            var map2 = new MapField<string, double>
-            {
-                { "x", SampleNaNs.Regular },
-                { "y", SampleNaNs.PayloadFlipped }
-            };
-
-            var map3 = new MapField<string, double>
-            {
-                { "x", SampleNaNs.Regular },
-                { "y", SampleNaNs.SignallingFlipped }
-            };
-
-            EqualityTester.AssertInequality(map1, map2);
-            EqualityTester.AssertEquality(map1, map3);
-            Assert.True(map1.Values.Contains(SampleNaNs.SignallingFlipped));
-            Assert.False(map2.Values.Contains(SampleNaNs.SignallingFlipped));
-        }
-
-        // This wouldn't usually happen, as protos can't use doubles as map keys,
-        // but let's be consistent.
-        [Test]
-        public void NaNKeysComparedBitwise()
-        {
-            var map = new MapField<double, string>
-            {
-                { SampleNaNs.Regular, "x" },
-                { SampleNaNs.SignallingFlipped, "y" }
-            };
-            Assert.AreEqual("x", map[SampleNaNs.Regular]);
-            Assert.AreEqual("y", map[SampleNaNs.SignallingFlipped]);
-            string ignored;
-            Assert.False(map.TryGetValue(SampleNaNs.PayloadFlipped, out ignored));
-        }
-
-        [Test]
-        public void AddEntriesFrom_CodedInputStream()
-        {
-            // map will have string key and string value
-            var keyTag = WireFormat.MakeTag(1, WireFormat.WireType.LengthDelimited);
-            var valueTag = WireFormat.MakeTag(2, WireFormat.WireType.LengthDelimited);
-
-            var memoryStream = new MemoryStream();
-            var output = new CodedOutputStream(memoryStream);
-            output.WriteLength(20);  // total of keyTag + key + valueTag + value
-            output.WriteTag(keyTag);
-            output.WriteString("the_key");
-            output.WriteTag(valueTag);
-            output.WriteString("the_value");
-            output.Flush();
-
-            var field = new MapField<string,string>();
-            var mapCodec = new MapField<string,string>.Codec(FieldCodec.ForString(keyTag, ""), FieldCodec.ForString(valueTag, ""), 10);
-            var input = new CodedInputStream(memoryStream.ToArray());
-
-            // test the legacy overload of AddEntriesFrom that takes a CodedInputStream
-            field.AddEntriesFrom(input, mapCodec);
-            CollectionAssert.AreEquivalent(new[] { "the_key" }, field.Keys);
-            CollectionAssert.AreEquivalent(new[] { "the_value" }, field.Values);
-            Assert.IsTrue(input.IsAtEnd);
-        }
-
-        [Test]
-        public void AddEntriesFrom_CodedInputStream_MissingKey()
-        {
-            // map will have string key and string value
-            var keyTag = WireFormat.MakeTag(1, WireFormat.WireType.LengthDelimited);
-            var valueTag = WireFormat.MakeTag(2, WireFormat.WireType.LengthDelimited);
-
-            var memoryStream = new MemoryStream();
-            var output = new CodedOutputStream(memoryStream);
-            output.WriteLength(11);  // total of valueTag + value
-            output.WriteTag(valueTag);
-            output.WriteString("the_value");
-            output.Flush();
-
-            var field = new MapField<string, string>();
-            var mapCodec = new MapField<string, string>.Codec(FieldCodec.ForString(keyTag, ""), FieldCodec.ForString(valueTag, ""), 10);
-            var input = new CodedInputStream(memoryStream.ToArray());
-
-            field.AddEntriesFrom(input, mapCodec);
-            CollectionAssert.AreEquivalent(new[] { "" }, field.Keys);
-            CollectionAssert.AreEquivalent(new[] { "the_value" }, field.Values);
-            Assert.IsTrue(input.IsAtEnd);
-        }
-
-#if !NET35
-        [Test]
-        public void IDictionaryKeys_Equals_IReadOnlyDictionaryKeys()
-        {
-            var map = new MapField<string, string> { { "foo", "bar" }, { "x", "y" } };
-            CollectionAssert.AreEquivalent(((IDictionary<string, string>)map).Keys, ((IReadOnlyDictionary<string, string>)map).Keys);
-        }
-
-        [Test]
-        public void IDictionaryValues_Equals_IReadOnlyDictionaryValues()
-        {
-            var map = new MapField<string, string> { { "foo", "bar" }, { "x", "y" } };
-            CollectionAssert.AreEquivalent(((IDictionary<string, string>)map).Values, ((IReadOnlyDictionary<string, string>)map).Values);
-        }
-#endif
-
-        private static KeyValuePair<TKey, TValue> NewKeyValuePair<TKey, TValue>(TKey key, TValue value)
-        {
-            return new KeyValuePair<TKey, TValue>(key, value);
-        }
-    }
-}
diff --git a/libs/protobuf/csharp/src/Google.Protobuf.Test/Collections/ProtobufEqualityComparersTest.cs b/libs/protobuf/csharp/src/Google.Protobuf.Test/Collections/ProtobufEqualityComparersTest.cs
deleted file mode 100644
index 594a879..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf.Test/Collections/ProtobufEqualityComparersTest.cs
+++ /dev/null
@@ -1,124 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2017 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using NUnit.Framework;
-using System.Collections.Generic;
-using System.Linq;
-using static Google.Protobuf.Collections.ProtobufEqualityComparers;
-
-namespace Google.Protobuf.Collections
-{
-    public class ProtobufEqualityComparersTest
-    {
-        private static readonly double[] doubles =
-        {
-            0,
-            1,
-            1.5,
-            -1.5,
-            double.PositiveInfinity,
-            double.NegativeInfinity,
-            // Three different types of NaN...
-            SampleNaNs.Regular,
-            SampleNaNs.SignallingFlipped,
-            SampleNaNs.PayloadFlipped
-        };
-
-        [Test]
-        public void GetEqualityComparer_Default()
-        {
-            // It's more pain than it's worth to try to parameterize these tests.
-            Assert.AreSame(EqualityComparer<object>.Default, GetEqualityComparer<object>());
-            Assert.AreSame(EqualityComparer<string>.Default, GetEqualityComparer<string>());
-            Assert.AreSame(EqualityComparer<int>.Default, GetEqualityComparer<int>());
-            Assert.AreSame(EqualityComparer<int?>.Default, GetEqualityComparer<int?>());
-        }
-
-        [Test]
-        public void GetEqualityComparer_NotDefault()
-        {
-            // It's more pain than it's worth to try to parameterize these tests.
-            Assert.AreSame(BitwiseDoubleEqualityComparer, GetEqualityComparer<double>());
-            Assert.AreSame(BitwiseSingleEqualityComparer, GetEqualityComparer<float>());
-            Assert.AreSame(BitwiseNullableDoubleEqualityComparer, GetEqualityComparer<double?>());
-            Assert.AreSame(BitwiseNullableSingleEqualityComparer, GetEqualityComparer<float?>());
-        }
-
-        [Test]
-        public void DoubleComparisons()
-        {
-            ValidateEqualityComparer(BitwiseDoubleEqualityComparer, doubles);
-        }
-
-        [Test]
-        public void NullableDoubleComparisons()
-        {
-            ValidateEqualityComparer(BitwiseNullableDoubleEqualityComparer, doubles.Select(d => (double?) d).Concat(new double?[] { null }));
-        }
-
-        [Test]
-        public void SingleComparisons()
-        {
-            ValidateEqualityComparer(BitwiseSingleEqualityComparer, doubles.Select(d => (float) d));
-        }
-
-        [Test]
-        public void NullableSingleComparisons()
-        {
-            ValidateEqualityComparer(BitwiseNullableSingleEqualityComparer, doubles.Select(d => (float?) d).Concat(new float?[] { null }));
-        }
-
-        private static void ValidateEqualityComparer<T>(EqualityComparer<T> comparer, IEnumerable<T> values)
-        {
-            var array = values.ToArray();
-            // Each value should be equal to itself, but not to any other value.
-            for (int i = 0; i < array.Length; i++)
-            {
-                for (int j = 0; j < array.Length; j++)
-                {
-                    if (i == j)
-                    {
-                        Assert.IsTrue(comparer.Equals(array[i], array[j]),
-                            "{0} should be equal to itself", array[i], array[j]);
-                    }
-                    else
-                    {
-                        Assert.IsFalse(comparer.Equals(array[i], array[j]),
-                            "{0} and {1} should not be equal", array[i], array[j]);
-                        Assert.AreNotEqual(comparer.GetHashCode(array[i]), comparer.GetHashCode(array[j]),
-                            "Hash codes for {0} and {1} should not be equal", array[i], array[j]);
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/libs/protobuf/csharp/src/Google.Protobuf.Test/Collections/RepeatedFieldTest.cs b/libs/protobuf/csharp/src/Google.Protobuf.Test/Collections/RepeatedFieldTest.cs
deleted file mode 100644
index ff8f5cc..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf.Test/Collections/RepeatedFieldTest.cs
+++ /dev/null
@@ -1,897 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.IO;
-using System.Linq;
-using System.Text;
-using Google.Protobuf.TestProtos;
-using Google.Protobuf.WellKnownTypes;
-using NUnit.Framework;
-
-namespace Google.Protobuf.Collections
-{
-    public class RepeatedFieldTest
-    {
-        [Test]
-        public void NullValuesRejected()
-        {
-            var list = new RepeatedField<string>();
-            Assert.Throws<ArgumentNullException>(() => list.Add((string)null));
-            Assert.Throws<ArgumentNullException>(() => list.Add((IEnumerable<string>)null));
-            Assert.Throws<ArgumentNullException>(() => list.Add((RepeatedField<string>)null));
-            Assert.Throws<ArgumentNullException>(() => list.Contains(null));
-            Assert.Throws<ArgumentNullException>(() => list.IndexOf(null));
-        }
-
-        [Test]
-        public void Add_SingleItem()
-        {
-            var list = new RepeatedField<string>();
-            list.Add("foo");
-            Assert.AreEqual(1, list.Count);
-            Assert.AreEqual("foo", list[0]);
-        }
-
-        [Test]
-        public void Add_Sequence()
-        {
-            var list = new RepeatedField<string>();
-            list.Add(new[] { "foo", "bar" });
-            Assert.AreEqual(2, list.Count);
-            Assert.AreEqual("foo", list[0]);
-            Assert.AreEqual("bar", list[1]);
-        }
-
-        [Test]
-        public void AddRange_SlowPath()
-        {
-            var list = new RepeatedField<string>();
-            list.AddRange(new[] { "foo", "bar" }.Select(x => x));
-            Assert.AreEqual(2, list.Count);
-            Assert.AreEqual("foo", list[0]);
-            Assert.AreEqual("bar", list[1]);
-        }
-
-        [Test]
-        public void AddRange_SlowPath_NullsProhibited_ReferenceType()
-        {
-            var list = new RepeatedField<string>();
-            // It's okay for this to throw ArgumentNullException if necessary.
-            // It's not ideal, but not awful.
-            Assert.Catch<ArgumentException>(() => list.AddRange(new[] { "foo", null }.Select(x => x)));
-        }
-
-        [Test]
-        public void AddRange_SlowPath_NullsProhibited_NullableValueType()
-        {
-            var list = new RepeatedField<int?>();
-            // It's okay for this to throw ArgumentNullException if necessary.
-            // It's not ideal, but not awful.
-            Assert.Catch<ArgumentException>(() => list.AddRange(new[] { 20, (int?)null }.Select(x => x)));
-        }
-
-        [Test]
-        public void AddRange_Optimized_NonNullableValueType()
-        {
-            var list = new RepeatedField<int>();
-            list.AddRange(new List<int> { 20, 30 });
-            Assert.AreEqual(2, list.Count);
-            Assert.AreEqual(20, list[0]);
-            Assert.AreEqual(30, list[1]);
-        }
-
-        [Test]
-        public void AddRange_Optimized_ReferenceType()
-        {
-            var list = new RepeatedField<string>();
-            list.AddRange(new List<string> { "foo", "bar" });
-            Assert.AreEqual(2, list.Count);
-            Assert.AreEqual("foo", list[0]);
-            Assert.AreEqual("bar", list[1]);
-        }
-
-        [Test]
-        public void AddRange_Optimized_NullableValueType()
-        {
-            var list = new RepeatedField<int?>();
-            list.AddRange(new List<int?> { 20, 30 });
-            Assert.AreEqual(2, list.Count);
-            Assert.AreEqual((int?) 20, list[0]);
-            Assert.AreEqual((int?) 30, list[1]);
-        }
-
-        [Test]
-        public void AddRange_Optimized_NullsProhibited_ReferenceType()
-        {
-            // We don't just trust that a collection with a nullable element type doesn't contain nulls
-            var list = new RepeatedField<string>();
-            // It's okay for this to throw ArgumentNullException if necessary.
-            // It's not ideal, but not awful.
-            Assert.Catch<ArgumentException>(() => list.AddRange(new List<string> { "foo", null }));
-        }
-
-        [Test]
-        public void AddRange_Optimized_NullsProhibited_NullableValueType()
-        {
-            // We don't just trust that a collection with a nullable element type doesn't contain nulls
-            var list = new RepeatedField<int?>();
-            // It's okay for this to throw ArgumentNullException if necessary.
-            // It's not ideal, but not awful.
-            Assert.Catch<ArgumentException>(() => list.AddRange(new List<int?> { 20, null }));
-        }
-
-        [Test]
-        public void AddRange_AlreadyNotEmpty()
-        {
-            var list = new RepeatedField<int> { 1, 2, 3 };
-            list.AddRange(new List<int> { 4, 5, 6 });
-            CollectionAssert.AreEqual(new[] { 1, 2, 3, 4, 5, 6 }, list);
-        }
-
-        [Test]
-        public void AddRange_RepeatedField()
-        {
-            var list = new RepeatedField<string> { "original" };
-            list.AddRange(new RepeatedField<string> { "foo", "bar" });
-            Assert.AreEqual(3, list.Count);
-            Assert.AreEqual("original", list[0]);
-            Assert.AreEqual("foo", list[1]);
-            Assert.AreEqual("bar", list[2]);
-        }
-
-        [Test]
-        public void RemoveAt_Valid()
-        {
-            var list = new RepeatedField<string> { "first", "second", "third" };
-            list.RemoveAt(1);
-            CollectionAssert.AreEqual(new[] { "first", "third" }, list);
-            // Just check that these don't throw...
-            list.RemoveAt(list.Count - 1); // Now the count will be 1...
-            list.RemoveAt(0);
-            Assert.AreEqual(0, list.Count);
-        }
-
-        [Test]
-        public void RemoveAt_Invalid()
-        {
-            var list = new RepeatedField<string> { "first", "second", "third" };
-            Assert.Throws<ArgumentOutOfRangeException>(() => list.RemoveAt(-1));
-            Assert.Throws<ArgumentOutOfRangeException>(() => list.RemoveAt(3));
-        }
-
-        [Test]
-        public void Insert_Valid()
-        {
-            var list = new RepeatedField<string> { "first", "second" };
-            list.Insert(1, "middle");
-            CollectionAssert.AreEqual(new[] { "first", "middle", "second" }, list);
-            list.Insert(3, "end");
-            CollectionAssert.AreEqual(new[] { "first", "middle", "second", "end" }, list);
-            list.Insert(0, "start");
-            CollectionAssert.AreEqual(new[] { "start", "first", "middle", "second", "end" }, list);
-        }
-
-        [Test]
-        public void Insert_Invalid()
-        {
-            var list = new RepeatedField<string> { "first", "second" };
-            Assert.Throws<ArgumentOutOfRangeException>(() => list.Insert(-1, "foo"));
-            Assert.Throws<ArgumentOutOfRangeException>(() => list.Insert(3, "foo"));
-            Assert.Throws<ArgumentNullException>(() => list.Insert(0, null));
-        }
-
-        [Test]
-        public void Equals_RepeatedField()
-        {
-            var list = new RepeatedField<string> { "first", "second" };
-            Assert.IsFalse(list.Equals((RepeatedField<string>) null));
-            Assert.IsTrue(list.Equals(list));
-            Assert.IsFalse(list.Equals(new RepeatedField<string> { "first", "third" }));
-            Assert.IsFalse(list.Equals(new RepeatedField<string> { "first" }));
-            Assert.IsTrue(list.Equals(new RepeatedField<string> { "first", "second" }));
-        }
-
-        [Test]
-        public void Equals_Object()
-        {
-            var list = new RepeatedField<string> { "first", "second" };
-            Assert.IsFalse(list.Equals((object) null));
-            Assert.IsTrue(list.Equals((object) list));
-            Assert.IsFalse(list.Equals((object) new RepeatedField<string> { "first", "third" }));
-            Assert.IsFalse(list.Equals((object) new RepeatedField<string> { "first" }));
-            Assert.IsTrue(list.Equals((object) new RepeatedField<string> { "first", "second" }));
-            Assert.IsFalse(list.Equals(new object()));
-        }
-
-        [Test]
-        public void GetEnumerator_GenericInterface()
-        {
-            IEnumerable<string> list = new RepeatedField<string> { "first", "second" };
-            // Select gets rid of the optimizations in ToList...
-            CollectionAssert.AreEqual(new[] { "first", "second" }, list.Select(x => x).ToList());
-        }
-
-        [Test]
-        public void GetEnumerator_NonGenericInterface()
-        {
-            IEnumerable list = new RepeatedField<string> { "first", "second" };
-            CollectionAssert.AreEqual(new[] { "first", "second" }, list.Cast<object>().ToList());
-        }
-
-        [Test]
-        public void CopyTo()
-        {
-            var list = new RepeatedField<string> { "first", "second" };
-            string[] stringArray = new string[4];
-            list.CopyTo(stringArray, 1);
-            CollectionAssert.AreEqual(new[] { null, "first", "second", null }, stringArray);
-        }
-
-        [Test]
-        public void Indexer_Get()
-        {
-            var list = new RepeatedField<string> { "first", "second" };
-            Assert.AreEqual("first", list[0]);
-            Assert.AreEqual("second", list[1]);
-            Assert.Throws<ArgumentOutOfRangeException>(() => list[-1].GetHashCode());
-            Assert.Throws<ArgumentOutOfRangeException>(() => list[2].GetHashCode());
-        }
-
-        [Test]
-        public void Indexer_Set()
-        {
-            var list = new RepeatedField<string> { "first", "second" };
-            list[0] = "changed";
-            Assert.AreEqual("changed", list[0]);
-            Assert.Throws<ArgumentNullException>(() => list[0] = null);
-            Assert.Throws<ArgumentOutOfRangeException>(() => list[-1] = "bad");
-            Assert.Throws<ArgumentOutOfRangeException>(() => list[2] = "bad");
-        }
-
-        [Test]
-        public void Clone_ReturnsMutable()
-        {
-            var list = new RepeatedField<int> { 0 };
-            var clone = list.Clone();
-            clone[0] = 1;
-        }
-
-        [Test]
-        public void Enumerator()
-        {
-            var list = new RepeatedField<string> { "first", "second" };
-            using (var enumerator = list.GetEnumerator())
-            {
-                Assert.IsTrue(enumerator.MoveNext());
-                Assert.AreEqual("first", enumerator.Current);
-                Assert.IsTrue(enumerator.MoveNext());
-                Assert.AreEqual("second", enumerator.Current);
-                Assert.IsFalse(enumerator.MoveNext());
-                Assert.IsFalse(enumerator.MoveNext());
-            }
-        }
-
-        [Test]
-        public void AddEntriesFrom_PackedInt32()
-        {
-            uint packedTag = WireFormat.MakeTag(10, WireFormat.WireType.LengthDelimited);
-            var stream = new MemoryStream();
-            var output = new CodedOutputStream(stream);
-            var length = CodedOutputStream.ComputeInt32Size(10)
-                + CodedOutputStream.ComputeInt32Size(999)
-                + CodedOutputStream.ComputeInt32Size(-1000);
-            output.WriteTag(packedTag);
-            output.WriteRawVarint32((uint) length);
-            output.WriteInt32(10);
-            output.WriteInt32(999);
-            output.WriteInt32(-1000);
-            output.Flush();
-            stream.Position = 0;
-
-            // Deliberately "expecting" a non-packed tag, but we detect that the data is
-            // actually packed.
-            uint nonPackedTag = WireFormat.MakeTag(10, WireFormat.WireType.LengthDelimited);
-            var field = new RepeatedField<int>();
-            var input = new CodedInputStream(stream);
-            input.AssertNextTag(packedTag);
-            field.AddEntriesFrom(input, FieldCodec.ForInt32(nonPackedTag));
-            CollectionAssert.AreEqual(new[] { 10, 999, -1000 }, field);
-            Assert.IsTrue(input.IsAtEnd);
-        }
-
-        [Test]
-        public void AddEntriesFrom_NonPackedInt32()
-        {
-            uint nonPackedTag = WireFormat.MakeTag(10, WireFormat.WireType.Varint);
-            var stream = new MemoryStream();
-            var output = new CodedOutputStream(stream);
-            output.WriteTag(nonPackedTag);
-            output.WriteInt32(10);
-            output.WriteTag(nonPackedTag);
-            output.WriteInt32(999);
-            output.WriteTag(nonPackedTag);
-            output.WriteInt32(-1000); // Just for variety...
-            output.Flush();
-            stream.Position = 0;
-
-            // Deliberately "expecting" a packed tag, but we detect that the data is
-            // actually not packed.
-            uint packedTag = WireFormat.MakeTag(10, WireFormat.WireType.LengthDelimited);
-            var field = new RepeatedField<int>();
-            var input = new CodedInputStream(stream);
-            input.AssertNextTag(nonPackedTag);
-            field.AddEntriesFrom(input, FieldCodec.ForInt32(packedTag));
-            CollectionAssert.AreEqual(new[] { 10, 999, -1000 }, field);
-            Assert.IsTrue(input.IsAtEnd);
-        }
-
-        [Test]
-        public void AddEntriesFrom_String()
-        {
-            uint tag = WireFormat.MakeTag(10, WireFormat.WireType.LengthDelimited);
-            var stream = new MemoryStream();
-            var output = new CodedOutputStream(stream);
-            output.WriteTag(tag);
-            output.WriteString("Foo");
-            output.WriteTag(tag);
-            output.WriteString("");
-            output.WriteTag(tag);
-            output.WriteString("Bar");
-            output.Flush();
-            stream.Position = 0;
-
-            var field = new RepeatedField<string>();
-            var input = new CodedInputStream(stream);
-            input.AssertNextTag(tag);
-            field.AddEntriesFrom(input, FieldCodec.ForString(tag));
-            CollectionAssert.AreEqual(new[] { "Foo", "", "Bar" }, field);
-            Assert.IsTrue(input.IsAtEnd);
-        }
-
-        [Test]
-        public void AddEntriesFrom_Message()
-        {
-            var message1 = new ForeignMessage { C = 2000 };
-            var message2 = new ForeignMessage { C = -250 };
-
-            uint tag = WireFormat.MakeTag(10, WireFormat.WireType.LengthDelimited);
-            var stream = new MemoryStream();
-            var output = new CodedOutputStream(stream);
-            output.WriteTag(tag);
-            output.WriteMessage(message1);
-            output.WriteTag(tag);
-            output.WriteMessage(message2);
-            output.Flush();
-            stream.Position = 0;
-
-            var field = new RepeatedField<ForeignMessage>();
-            var input = new CodedInputStream(stream);
-            input.AssertNextTag(tag);
-            field.AddEntriesFrom(input, FieldCodec.ForMessage(tag, ForeignMessage.Parser));
-            CollectionAssert.AreEqual(new[] { message1, message2}, field);
-            Assert.IsTrue(input.IsAtEnd);
-        }
-
-        [Test]
-        public void WriteTo_PackedInt32()
-        {
-            uint tag = WireFormat.MakeTag(10, WireFormat.WireType.LengthDelimited);
-            var field = new RepeatedField<int> { 10, 1000, 1000000 };
-            var stream = new MemoryStream();
-            var output = new CodedOutputStream(stream);
-            field.WriteTo(output, FieldCodec.ForInt32(tag));
-            output.Flush();
-            stream.Position = 0;
-
-            var input = new CodedInputStream(stream);
-            input.AssertNextTag(tag);
-            var length = input.ReadLength();
-            Assert.AreEqual(10, input.ReadInt32());
-            Assert.AreEqual(1000, input.ReadInt32());
-            Assert.AreEqual(1000000, input.ReadInt32());
-            Assert.IsTrue(input.IsAtEnd);
-            Assert.AreEqual(1 + CodedOutputStream.ComputeLengthSize(length) + length, stream.Length);
-        }
-
-        [Test]
-        public void WriteTo_NonPackedInt32()
-        {
-            uint tag = WireFormat.MakeTag(10, WireFormat.WireType.Varint);
-            var field = new RepeatedField<int> { 10, 1000, 1000000};
-            var stream = new MemoryStream();
-            var output = new CodedOutputStream(stream);
-            field.WriteTo(output, FieldCodec.ForInt32(tag));
-            output.Flush();
-            stream.Position = 0;
-
-            var input = new CodedInputStream(stream);
-            input.AssertNextTag(tag);
-            Assert.AreEqual(10, input.ReadInt32());
-            input.AssertNextTag(tag);
-            Assert.AreEqual(1000, input.ReadInt32());
-            input.AssertNextTag(tag);
-            Assert.AreEqual(1000000, input.ReadInt32());
-            Assert.IsTrue(input.IsAtEnd);
-        }
-
-        [Test]
-        public void WriteTo_String()
-        {
-            uint tag = WireFormat.MakeTag(10, WireFormat.WireType.LengthDelimited);
-            var field = new RepeatedField<string> { "Foo", "", "Bar" };
-            var stream = new MemoryStream();
-            var output = new CodedOutputStream(stream);
-            field.WriteTo(output, FieldCodec.ForString(tag));
-            output.Flush();
-            stream.Position = 0;
-
-            var input = new CodedInputStream(stream);
-            input.AssertNextTag(tag);
-            Assert.AreEqual("Foo", input.ReadString());
-            input.AssertNextTag(tag);
-            Assert.AreEqual("", input.ReadString());
-            input.AssertNextTag(tag);
-            Assert.AreEqual("Bar", input.ReadString());
-            Assert.IsTrue(input.IsAtEnd);
-        }
-
-        [Test]
-        public void WriteTo_Message()
-        {
-            var message1 = new ForeignMessage { C = 20 };
-            var message2 = new ForeignMessage { C = 25 };
-            uint tag = WireFormat.MakeTag(10, WireFormat.WireType.LengthDelimited);
-            var field = new RepeatedField<ForeignMessage> { message1, message2 };
-            var stream = new MemoryStream();
-            var output = new CodedOutputStream(stream);
-            field.WriteTo(output, FieldCodec.ForMessage(tag, ForeignMessage.Parser));
-            output.Flush();
-            stream.Position = 0;
-
-            var input = new CodedInputStream(stream);
-            input.AssertNextTag(tag);
-            Assert.AreEqual(message1, input.ReadMessage(ForeignMessage.Parser));
-            input.AssertNextTag(tag);
-            Assert.AreEqual(message2, input.ReadMessage(ForeignMessage.Parser));
-            Assert.IsTrue(input.IsAtEnd);
-        }
-
-        [Test]
-        public void CalculateSize_VariableSizeNonPacked()
-        {
-            var list = new RepeatedField<int> { 1, 500, 1 };
-            var tag = WireFormat.MakeTag(1, WireFormat.WireType.Varint);
-            // 2 bytes for the first entry, 3 bytes for the second, 2 bytes for the third
-            Assert.AreEqual(7, list.CalculateSize(FieldCodec.ForInt32(tag)));
-        }
-
-        [Test]
-        public void CalculateSize_FixedSizeNonPacked()
-        {
-            var list = new RepeatedField<int> { 1, 500, 1 };
-            var tag = WireFormat.MakeTag(1, WireFormat.WireType.Fixed32);
-            // 5 bytes for the each entry
-            Assert.AreEqual(15, list.CalculateSize(FieldCodec.ForSFixed32(tag)));
-        }
-
-        [Test]
-        public void CalculateSize_VariableSizePacked()
-        {
-            var list = new RepeatedField<int> { 1, 500, 1};
-            var tag = WireFormat.MakeTag(1, WireFormat.WireType.LengthDelimited);
-            // 1 byte for the tag, 1 byte for the length,
-            // 1 byte for the first entry, 2 bytes for the second, 1 byte for the third
-            Assert.AreEqual(6, list.CalculateSize(FieldCodec.ForInt32(tag)));
-        }
-
-        [Test]
-        public void CalculateSize_FixedSizePacked()
-        {
-            var list = new RepeatedField<int> { 1, 500, 1 };
-            var tag = WireFormat.MakeTag(1, WireFormat.WireType.LengthDelimited);
-            // 1 byte for the tag, 1 byte for the length, 4 bytes per entry
-            Assert.AreEqual(14, list.CalculateSize(FieldCodec.ForSFixed32(tag)));
-        }
-
-        [Test]
-        public void TestNegativeEnumArray()
-        {
-            int arraySize = 1 + 1 + (11 * 5);
-            int msgSize = arraySize;
-            byte[] bytes = new byte[msgSize];
-            CodedOutputStream output = new CodedOutputStream(bytes);
-            uint tag = WireFormat.MakeTag(8, WireFormat.WireType.Varint);
-            for (int i = 0; i >= -5; i--)
-            {
-                output.WriteTag(tag);
-                output.WriteEnum(i);
-            }
-
-            Assert.AreEqual(0, output.SpaceLeft);
-
-            CodedInputStream input = new CodedInputStream(bytes);
-            tag = input.ReadTag();
-
-            RepeatedField<SampleEnum> values = new RepeatedField<SampleEnum>();
-            values.AddEntriesFrom(input, FieldCodec.ForEnum(tag, x => (int)x, x => (SampleEnum)x));
-
-            Assert.AreEqual(6, values.Count);
-            Assert.AreEqual(SampleEnum.None, values[0]);
-            Assert.AreEqual(((SampleEnum)(-1)), values[1]);
-            Assert.AreEqual(SampleEnum.NegativeValue, values[2]);
-            Assert.AreEqual(((SampleEnum)(-3)), values[3]);
-            Assert.AreEqual(((SampleEnum)(-4)), values[4]);
-            Assert.AreEqual(((SampleEnum)(-5)), values[5]);
-        }
-
-
-        [Test]
-        public void TestNegativeEnumPackedArray()
-        {
-            int arraySize = 1 + (10 * 5);
-            int msgSize = 1 + 1 + arraySize;
-            byte[] bytes = new byte[msgSize];
-            CodedOutputStream output = new CodedOutputStream(bytes);
-            // Length-delimited to show we want the packed representation
-            uint tag = WireFormat.MakeTag(8, WireFormat.WireType.LengthDelimited);
-            output.WriteTag(tag);
-            int size = 0;
-            for (int i = 0; i >= -5; i--)
-            {
-                size += CodedOutputStream.ComputeEnumSize(i);
-            }
-            output.WriteRawVarint32((uint)size);
-            for (int i = 0; i >= -5; i--)
-            {
-                output.WriteEnum(i);
-            }
-            Assert.AreEqual(0, output.SpaceLeft);
-
-            CodedInputStream input = new CodedInputStream(bytes);
-            tag = input.ReadTag();
-
-            RepeatedField<SampleEnum> values = new RepeatedField<SampleEnum>();
-            values.AddEntriesFrom(input, FieldCodec.ForEnum(tag, x => (int)x, x => (SampleEnum)x));
-
-            Assert.AreEqual(6, values.Count);
-            Assert.AreEqual(SampleEnum.None, values[0]);
-            Assert.AreEqual(((SampleEnum)(-1)), values[1]);
-            Assert.AreEqual(SampleEnum.NegativeValue, values[2]);
-            Assert.AreEqual(((SampleEnum)(-3)), values[3]);
-            Assert.AreEqual(((SampleEnum)(-4)), values[4]);
-            Assert.AreEqual(((SampleEnum)(-5)), values[5]);
-        }
-
-        [Test]
-        public void TestPackedRepeatedFieldCollectionNonDivisibleLength()
-        {
-            uint tag = WireFormat.MakeTag(10, WireFormat.WireType.LengthDelimited);
-            var codec = FieldCodec.ForFixed32(tag);
-            var stream = new MemoryStream();
-            var output = new CodedOutputStream(stream);
-            output.WriteTag(tag);
-            output.WriteString("A long string");
-            output.WriteTag(codec.Tag);
-            output.WriteRawVarint32((uint)codec.FixedSize - 1); // Length not divisible by FixedSize
-            output.WriteFixed32(uint.MaxValue);
-            output.Flush();
-            stream.Position = 0;
-
-            var input = new CodedInputStream(stream);
-            input.ReadTag();
-            input.ReadString();
-            input.ReadTag();
-            var field = new RepeatedField<uint>();
-            Assert.Throws<InvalidProtocolBufferException>(() => field.AddEntriesFrom(input, codec));
-
-            // Collection was not pre-initialized
-            Assert.AreEqual(0, field.Count);
-        }
-
-        [Test]
-        public void TestPackedRepeatedFieldCollectionNotAllocatedWhenLengthExceedsBuffer()
-        {
-            uint tag = WireFormat.MakeTag(10, WireFormat.WireType.LengthDelimited);
-            var codec = FieldCodec.ForFixed32(tag);
-            var stream = new MemoryStream();
-            var output = new CodedOutputStream(stream);
-            output.WriteTag(tag);
-            output.WriteString("A long string");
-            output.WriteTag(codec.Tag);
-            output.WriteRawVarint32((uint)codec.FixedSize);
-            // Note that there is no content for the packed field.
-            // The field length exceeds the remaining length of content.
-            output.Flush();
-            stream.Position = 0;
-
-            var input = new CodedInputStream(stream);
-            input.ReadTag();
-            input.ReadString();
-            input.ReadTag();
-            var field = new RepeatedField<uint>();
-            Assert.Throws<InvalidProtocolBufferException>(() => field.AddEntriesFrom(input, codec));
-
-            // Collection was not pre-initialized
-            Assert.AreEqual(0, field.Count);
-        }
-
-        [Test]
-        public void TestPackedRepeatedFieldCollectionNotAllocatedWhenLengthExceedsRemainingData()
-        {
-            uint tag = WireFormat.MakeTag(10, WireFormat.WireType.LengthDelimited);
-            var codec = FieldCodec.ForFixed32(tag);
-            var stream = new MemoryStream();
-            var output = new CodedOutputStream(stream);
-            output.WriteTag(tag);
-            output.WriteString("A long string");
-            output.WriteTag(codec.Tag);
-            output.WriteRawVarint32((uint)codec.FixedSize);
-            // Note that there is no content for the packed field.
-            // The field length exceeds the remaining length of the buffer.
-            output.Flush();
-            stream.Position = 0;
-
-            var sequence = ReadOnlySequenceFactory.CreateWithContent(stream.ToArray());
-            ParseContext.Initialize(sequence, out ParseContext ctx);
-
-            ctx.ReadTag();
-            ctx.ReadString();
-            ctx.ReadTag();
-            var field = new RepeatedField<uint>();
-            try
-            {
-                field.AddEntriesFrom(ref ctx, codec);
-                Assert.Fail();
-            }
-            catch (InvalidProtocolBufferException)
-            {
-            }
-
-            // Collection was not pre-initialized
-            Assert.AreEqual(0, field.Count);
-        }
-
-        // Fairly perfunctory tests for the non-generic IList implementation
-        [Test]
-        public void IList_Indexer()
-        {
-            var field = new RepeatedField<string> { "first", "second" };
-            IList list = field;
-            Assert.AreEqual("first", list[0]);
-            list[1] = "changed";
-            Assert.AreEqual("changed", field[1]);
-        }
-
-        [Test]
-        public void IList_Contains()
-        {
-            IList list = new RepeatedField<string> { "first", "second" };
-            Assert.IsTrue(list.Contains("second"));
-            Assert.IsFalse(list.Contains("third"));
-            Assert.IsFalse(list.Contains(new object()));
-        }
-
-        [Test]
-        public void IList_Add()
-        {
-            IList list = new RepeatedField<string> { "first", "second" };
-            list.Add("third");
-            CollectionAssert.AreEqual(new[] { "first", "second", "third" }, list);
-        }
-
-        [Test]
-        public void IList_Remove()
-        {
-            IList list = new RepeatedField<string> { "first", "second" };
-            list.Remove("third"); // No-op, no exception
-            list.Remove(new object()); // No-op, no exception
-            list.Remove("first");
-            CollectionAssert.AreEqual(new[] { "second" }, list);
-        }
-
-        [Test]
-        public void IList_IsFixedSize()
-        {
-            var field = new RepeatedField<string> { "first", "second" };
-            IList list = field;
-            Assert.IsFalse(list.IsFixedSize);
-        }
-
-        [Test]
-        public void IList_IndexOf()
-        {
-            IList list = new RepeatedField<string> { "first", "second" };
-            Assert.AreEqual(1, list.IndexOf("second"));
-            Assert.AreEqual(-1, list.IndexOf("third"));
-            Assert.AreEqual(-1, list.IndexOf(new object()));
-        }
-
-        [Test]
-        public void IList_SyncRoot()
-        {
-            IList list = new RepeatedField<string> { "first", "second" };
-            Assert.AreSame(list, list.SyncRoot);
-        }
-
-        [Test]
-        public void IList_CopyTo()
-        {
-            IList list = new RepeatedField<string> { "first", "second" };
-            string[] stringArray = new string[4];
-            list.CopyTo(stringArray, 1);
-            CollectionAssert.AreEqual(new[] { null, "first",  "second", null }, stringArray);
-
-            object[] objectArray = new object[4];
-            list.CopyTo(objectArray, 1);
-            CollectionAssert.AreEqual(new[] { null, "first", "second", null }, objectArray);
-
-            Assert.Throws<ArrayTypeMismatchException>(() => list.CopyTo(new StringBuilder[4], 1));
-            Assert.Throws<ArrayTypeMismatchException>(() => list.CopyTo(new int[4], 1));
-        }
-
-        [Test]
-        public void IList_IsSynchronized()
-        {
-            IList list = new RepeatedField<string> { "first", "second" };
-            Assert.IsFalse(list.IsSynchronized);
-        }
-
-        [Test]
-        public void IList_Insert()
-        {
-            IList list = new RepeatedField<string> { "first", "second" };
-            list.Insert(1, "middle");
-            CollectionAssert.AreEqual(new[] { "first", "middle", "second" }, list);
-        }
-
-        [Test]
-        public void ToString_Integers()
-        {
-            var list = new RepeatedField<int> { 5, 10, 20 };
-            var text = list.ToString();
-            Assert.AreEqual("[ 5, 10, 20 ]", text);
-        }
-
-        [Test]
-        public void ToString_Strings()
-        {
-            var list = new RepeatedField<string> { "x", "y", "z" };
-            var text = list.ToString();
-            Assert.AreEqual("[ \"x\", \"y\", \"z\" ]", text);
-        }
-
-        [Test]
-        public void ToString_Messages()
-        {
-            var list = new RepeatedField<TestAllTypes> { new TestAllTypes { SingleDouble = 1.5 }, new TestAllTypes { SingleInt32 = 10 } };
-            var text = list.ToString();
-            Assert.AreEqual("[ { \"singleDouble\": 1.5 }, { \"singleInt32\": 10 } ]", text);
-        }
-
-        [Test]
-        public void ToString_Empty()
-        {
-            var list = new RepeatedField<TestAllTypes> { };
-            var text = list.ToString();
-            Assert.AreEqual("[ ]", text);
-        }
-
-        [Test]
-        public void ToString_InvalidElementType()
-        {
-            var list = new RepeatedField<decimal> { 15m };
-            Assert.Throws<ArgumentException>(() => list.ToString());
-        }
-
-        [Test]
-        public void ToString_Timestamp()
-        {
-            var list = new RepeatedField<Timestamp> { Timestamp.FromDateTime(new DateTime(2015, 10, 1, 12, 34, 56, DateTimeKind.Utc)) };
-            var text = list.ToString();
-            Assert.AreEqual("[ \"2015-10-01T12:34:56Z\" ]", text);
-        }
-
-        [Test]
-        public void ToString_Struct()
-        {
-            var message = new Struct { Fields = { { "foo", new Value { NumberValue = 20 } } } };
-            var list = new RepeatedField<Struct> { message };
-            var text = list.ToString();
-            Assert.AreEqual(text, "[ { \"foo\": 20 } ]", message.ToString());
-        }
-
-        [Test]
-        public void NaNValuesComparedBitwise()
-        {
-            var list1 = new RepeatedField<double> { SampleNaNs.Regular, SampleNaNs.SignallingFlipped };
-            var list2 = new RepeatedField<double> { SampleNaNs.Regular, SampleNaNs.PayloadFlipped };
-            var list3 = new RepeatedField<double> { SampleNaNs.Regular, SampleNaNs.SignallingFlipped };
-
-            // All SampleNaNs have the same hashcode under certain targets (e.g. netcoreapp3.1)
-            EqualityTester.AssertInequality(list1, list2, checkHashcode: false);
-            EqualityTester.AssertEquality(list1, list3);
-            Assert.True(list1.Contains(SampleNaNs.SignallingFlipped));
-            Assert.False(list2.Contains(SampleNaNs.SignallingFlipped));
-        }
-
-        [Test]
-        public void Capacity_Increase()
-        {
-            // Unfortunately this case tests implementation details of RepeatedField.  This is necessary
-
-            var list = new RepeatedField<int>() { 1, 2, 3 };
-
-            Assert.AreEqual(8, list.Capacity);
-            Assert.AreEqual(3, list.Count);
-
-            list.Capacity = 10; // Set capacity to a larger value to trigger growth
-            Assert.AreEqual(10, list.Capacity, "Capacity increased");
-            Assert.AreEqual(3, list.Count);
-
-            CollectionAssert.AreEqual(new int[] {1, 2, 3}, list.ToArray(), "We didn't lose our data in the resize");
-        }
-
-        [Test]
-        public void Capacity_Decrease()
-        {
-            var list = new RepeatedField<int>() { 1, 2, 3 };
-
-            Assert.AreEqual(8, list.Capacity);
-            Assert.DoesNotThrow(() => list.Capacity = 5, "Can decrease capacity if new capacity is greater than list.Count");
-            Assert.AreEqual(5, list.Capacity);
-
-            Assert.DoesNotThrow(() => list.Capacity = 3, "Can set capacity exactly to list.Count" );
-
-            Assert.Throws<ArgumentOutOfRangeException>(() => list.Capacity = 2, "Can't set the capacity smaller than list.Count" );
-
-            Assert.Throws<ArgumentOutOfRangeException>(() => list.Capacity = 0, "Can't set the capacity to zero" );
-
-            Assert.Throws<ArgumentOutOfRangeException>(() => list.Capacity = -1, "Can't set the capacity to negative" );
-        }
-
-        [Test]
-        public void Capacity_Zero()
-        {
-            var list = new RepeatedField<int>() { 1 };
-            list.RemoveAt(0);
-            Assert.AreEqual(0, list.Count);
-            Assert.AreEqual(8, list.Capacity);
-
-            Assert.DoesNotThrow(() => list.Capacity = 0, "Can set Capacity to 0");
-            Assert.AreEqual(0, list.Capacity);
-        }
-    }
-}
diff --git a/libs/protobuf/csharp/src/Google.Protobuf.Test/Compatibility/PropertyInfoExtensionsTest.cs b/libs/protobuf/csharp/src/Google.Protobuf.Test/Compatibility/PropertyInfoExtensionsTest.cs
deleted file mode 100644
index df23a09..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf.Test/Compatibility/PropertyInfoExtensionsTest.cs
+++ /dev/null
@@ -1,98 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using NUnit.Framework;
-using System.Reflection;
-
-namespace Google.Protobuf.Compatibility
-{
-    public class PropertyInfoExtensionsTest
-    {
-        public string PublicReadWrite { get; set; }
-        private string PrivateReadWrite { get; set; }
-        public string PublicReadPrivateWrite { get; private set; }
-        public string PrivateReadPublicWrite { private get; set; }
-        public string PublicReadOnly { get { return null; } }
-        private string PrivateReadOnly { get { return null; } }
-        public string PublicWriteOnly { set { } }
-        private string PrivateWriteOnly { set {  } }
-
-        [Test]
-        [TestCase("PublicReadWrite")]
-        [TestCase("PublicReadPrivateWrite")]
-        [TestCase("PublicReadOnly")]
-        public void GetGetMethod_Success(string name)
-        {
-            var propertyInfo = typeof(PropertyInfoExtensionsTest)
-                .GetProperty(name, BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public);
-            Assert.IsNotNull(PropertyInfoExtensions.GetGetMethod(propertyInfo));
-        }
-
-        [Test]
-        [TestCase("PrivateReadWrite")]
-        [TestCase("PrivateReadPublicWrite")]
-        [TestCase("PrivateReadOnly")]
-        [TestCase("PublicWriteOnly")]
-        [TestCase("PrivateWriteOnly")]
-        public void GetGetMethod_NoAccessibleGetter(string name)
-        {
-            var propertyInfo = typeof(PropertyInfoExtensionsTest)
-                .GetProperty(name, BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public);
-            Assert.IsNull(PropertyInfoExtensions.GetGetMethod(propertyInfo));
-        }
-
-        [Test]
-        [TestCase("PublicReadWrite")]
-        [TestCase("PrivateReadPublicWrite")]
-        [TestCase("PublicWriteOnly")]
-        public void GetSetMethod_Success(string name)
-        {
-            var propertyInfo = typeof(PropertyInfoExtensionsTest)
-                .GetProperty(name, BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public);
-            Assert.IsNotNull(PropertyInfoExtensions.GetSetMethod(propertyInfo));
-        }
-
-        [Test]
-        [TestCase("PublicReadPrivateWrite")]
-        [TestCase("PrivateReadWrite")]
-        [TestCase("PrivateReadOnly")]
-        [TestCase("PublicReadOnly")]
-        [TestCase("PrivateWriteOnly")]
-        public void GetSetMethod_NoAccessibleGetter(string name)
-        {
-            var propertyInfo = typeof(PropertyInfoExtensionsTest)
-                .GetProperty(name, BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public);
-            Assert.IsNull(PropertyInfoExtensions.GetSetMethod(propertyInfo));
-        }
-    }
-
-}
diff --git a/libs/protobuf/csharp/src/Google.Protobuf.Test/Compatibility/StreamExtensionsTest.cs b/libs/protobuf/csharp/src/Google.Protobuf.Test/Compatibility/StreamExtensionsTest.cs
deleted file mode 100644
index 48c0725..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf.Test/Compatibility/StreamExtensionsTest.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-#if NET35
-using System;
-using System.IO;
-using NUnit.Framework;
-using Google.Protobuf.Compatibility;
-
-namespace Google.Protobuf.Test.Compatibility
-{
-    public class StreamExtensionsTest
-    {
-        [Test]
-        public void CopyToNullArgument()
-        {
-            var memoryStream = new MemoryStream();
-            Assert.Throws<ArgumentNullException>(() => memoryStream.CopyTo(null));
-        }
-
-        [Test]
-        public void CopyToTest()
-        {
-            byte[] bytesToStream = new byte[] { 0x31, 0x08, 0xFF, 0x00 };
-            Stream source = new MemoryStream(bytesToStream);
-            Stream destination = new MemoryStream((int)source.Length);
-            source.CopyTo(destination);
-            destination.Seek(0, SeekOrigin.Begin);
-
-            Assert.AreEqual(0x31, destination.ReadByte());
-            Assert.AreEqual(0x08, destination.ReadByte());
-            Assert.AreEqual(0xFF, destination.ReadByte());
-            Assert.AreEqual(0x00, destination.ReadByte());
-            Assert.AreEqual(-1, destination.ReadByte());
-        }
-    }
-}
-#endif
diff --git a/libs/protobuf/csharp/src/Google.Protobuf.Test/Compatibility/TypeExtensionsTest.cs b/libs/protobuf/csharp/src/Google.Protobuf.Test/Compatibility/TypeExtensionsTest.cs
deleted file mode 100644
index 5d86c20..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf.Test/Compatibility/TypeExtensionsTest.cs
+++ /dev/null
@@ -1,117 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-using NUnit.Framework;
-using System;
-using System.Collections.Generic;
-using System.Reflection;
-
-#if !NET35
-namespace Google.Protobuf.Compatibility
-{
-    public class TypeExtensionsTest
-    {
-        public class DerivedList : List<string> { }
-        public string PublicProperty { get; set; }
-        private string PrivateProperty { get; set; }
-
-        public void PublicMethod()
-        {
-        }
-
-        private void PrivateMethod()
-        {
-        }
-
-        [Test]
-        [TestCase(typeof(object), typeof(string), true)]
-        [TestCase(typeof(object), typeof(int), true)]
-        [TestCase(typeof(string), typeof(string), true)]
-        [TestCase(typeof(string), typeof(object), false)]
-        [TestCase(typeof(string), typeof(int), false)]
-        [TestCase(typeof(int), typeof(int), true)]
-        [TestCase(typeof(ValueType), typeof(int), true)]
-        [TestCase(typeof(long), typeof(int), false)] //
-        public void IsAssignableFrom(Type target, Type argument, bool expected)
-        {
-            Assert.AreEqual(expected, TypeExtensions.IsAssignableFrom(target, argument));
-        }
-
-        [Test]
-        [TestCase(typeof(DerivedList), "Count")] // Go up the type hierarchy
-        [TestCase(typeof(List<string>), "Count")]
-        [TestCase(typeof(List<>), "Count")]
-        [TestCase(typeof(TypeExtensionsTest), "PublicProperty")]
-        public void GetProperty_Success(Type type, string name)
-        {
-            var property = TypeExtensions.GetProperty(type, name);
-            Assert.IsNotNull(property);
-            Assert.AreEqual(name, property.Name);
-        }
-
-        [Test]
-        [TestCase(typeof(TypeExtensionsTest), "PrivateProperty")]
-        [TestCase(typeof(TypeExtensionsTest), "Garbage")]
-        public void GetProperty_NoSuchProperty(Type type, string name)
-        {
-            var property = TypeExtensions.GetProperty(type, name);
-            Assert.IsNull(property);
-        }
-
-        [Test]
-        [TestCase(typeof(DerivedList), "RemoveAt")] // Go up the type hierarchy
-        [TestCase(typeof(List<>), "RemoveAt")]
-        [TestCase(typeof(TypeExtensionsTest), "PublicMethod")]
-        public void GetMethod_Success(Type type, string name)
-        {
-            var method = TypeExtensions.GetMethod(type, name);
-            Assert.IsNotNull(method);
-            Assert.AreEqual(name, method.Name);
-        }
-
-        [Test]
-        [TestCase(typeof(TypeExtensionsTest), "PrivateMethod")]
-        [TestCase(typeof(TypeExtensionsTest), "GarbageMethod")]
-        public void GetMethod_NoSuchMethod(Type type, string name)
-        {
-            var method = TypeExtensions.GetMethod(type, name);
-            Assert.IsNull(method);
-        }
-
-        [Test]
-        [TestCase(typeof(List<string>), "IndexOf")]
-        public void GetMethod_Ambiguous(Type type, string name)
-        {
-            Assert.Throws<AmbiguousMatchException>(() => TypeExtensions.GetMethod(type, name));
-        }
-    }
-}
-#endif
diff --git a/libs/protobuf/csharp/src/Google.Protobuf.Test/DeprecatedMemberTest.cs b/libs/protobuf/csharp/src/Google.Protobuf.Test/DeprecatedMemberTest.cs
deleted file mode 100644
index fd041e0..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf.Test/DeprecatedMemberTest.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-    
-using System;
-using System.Reflection;
-using Google.Protobuf.TestProtos;
-using NUnit.Framework;
-
-namespace Google.Protobuf
-{
-    public class DeprecatedMemberTest
-    {
-        private static void AssertIsDeprecated(MemberInfo member)
-        {
-            Assert.NotNull(member);
-            Assert.IsTrue(member.IsDefined(typeof(ObsoleteAttribute), false), "Member not obsolete: " + member);
-        }
-
-        [Test]
-        public void TestDepreatedPrimitiveValue()
-        {
-            AssertIsDeprecated(typeof(TestDeprecatedFields).GetProperty("DeprecatedInt32"));
-        }
-
-    }
-}
diff --git a/libs/protobuf/csharp/src/Google.Protobuf.Test/EqualityTester.cs b/libs/protobuf/csharp/src/Google.Protobuf.Test/EqualityTester.cs
deleted file mode 100644
index d4b3c13..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf.Test/EqualityTester.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-using NUnit.Framework;
-
-namespace Google.Protobuf
-{
-    /// <summary>
-    /// Helper methods when testing equality. NUnit's Assert.AreEqual and
-    /// Assert.AreNotEqual methods try to be clever with collections, which can
-    /// be annoying...
-    /// </summary>
-    internal static class EqualityTester
-    {
-        public static void AssertEquality<T>(T first, T second) where T : IEquatable<T>
-        {
-            Assert.IsTrue(first.Equals(second));
-            Assert.IsTrue(first.Equals((object) second));
-            Assert.AreEqual(first.GetHashCode(), second.GetHashCode());
-        }
-
-        public static void AssertInequality<T>(T first, T second, bool checkHashcode = true) where T : IEquatable<T>
-        {
-            Assert.IsFalse(first.Equals(second));
-            Assert.IsFalse(first.Equals((object) second));
-            // While this isn't a requirement, the chances of this test failing due to
-            // coincidence rather than a bug are very small.
-            // For such rare cases, an argument can be used to disable the check.
-            if (checkHashcode && first != null && second != null)
-            {
-                Assert.AreNotEqual(first.GetHashCode(), second.GetHashCode());
-            }
-        }
-    }
-}
diff --git a/libs/protobuf/csharp/src/Google.Protobuf.Test/ExtensionSetTest.cs b/libs/protobuf/csharp/src/Google.Protobuf.Test/ExtensionSetTest.cs
deleted file mode 100644
index b2c24dd..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf.Test/ExtensionSetTest.cs
+++ /dev/null
@@ -1,196 +0,0 @@
-using System;
-using System.Collections;
-using Google.Protobuf.TestProtos.Proto2;
-using NUnit.Framework;
-
-using static Google.Protobuf.TestProtos.Proto2.UnittestExtensions;
-
-namespace Google.Protobuf
-{
-    public class ExtensionSetTest
-    {
-        [Test]
-        public void EmptyExtensionSet()
-        {
-            ExtensionSet<TestAllExtensions> extensions = new ExtensionSet<TestAllExtensions>();
-            Assert.AreEqual(0, extensions.CalculateSize());
-        }
-
-        [Test]
-        public void MergeExtensionSet()
-        {
-            ExtensionSet<TestAllExtensions> extensions = null;
-            ExtensionSet.Set(ref extensions, OptionalBoolExtension, true);
-
-            ExtensionSet<TestAllExtensions> other = null;
-
-            Assert.IsFalse(ExtensionSet.Has(ref other, OptionalBoolExtension));
-            ExtensionSet.MergeFrom(ref other, extensions);
-            Assert.IsTrue(ExtensionSet.Has(ref other, OptionalBoolExtension));
-        }
-
-        [Test]
-        public void TestMergeCodedInput()
-        {
-            var message = new TestAllExtensions();
-            message.SetExtension(OptionalBoolExtension, true);
-            var serialized = message.ToByteArray();
-
-            MessageParsingHelpers.AssertWritingMessage(message);
-
-            MessageParsingHelpers.AssertReadingMessage(
-                TestAllExtensions.Parser.WithExtensionRegistry(new ExtensionRegistry() { OptionalBoolExtension }),
-                serialized,
-                other =>
-                {
-                    Assert.AreEqual(message, other);
-                    Assert.AreEqual(message.CalculateSize(), other.CalculateSize());
-                });
-        }
-
-        [Test]
-        public void TestMergeMessage()
-        {
-            var message = new TestAllExtensions();
-            message.SetExtension(OptionalBoolExtension, true);
-
-            var other = new TestAllExtensions();
-
-            Assert.AreNotEqual(message, other);
-            Assert.AreNotEqual(message.CalculateSize(), other.CalculateSize());
-
-            other.MergeFrom(message);
-
-            Assert.AreEqual(message, other);
-            Assert.AreEqual(message.CalculateSize(), other.CalculateSize());
-        }
-
-        [Test]
-        public void TryMergeFieldFrom_CodedInputStream()
-        {
-            var message = new TestAllExtensions();
-            message.SetExtension(OptionalStringExtension, "abcd");
-
-            var input = new CodedInputStream(message.ToByteArray());
-            input.ExtensionRegistry = new ExtensionRegistry() { OptionalStringExtension };
-            input.ReadTag(); // TryMergeFieldFrom expects that a tag was just read and will inspect the LastTag value
-
-            ExtensionSet<TestAllExtensions> extensionSet = null;
-            // test the legacy overload of TryMergeFieldFrom that takes a CodedInputStream
-            Assert.IsTrue(ExtensionSet.TryMergeFieldFrom(ref extensionSet, input));
-            Assert.AreEqual("abcd", ExtensionSet.Get(ref extensionSet, OptionalStringExtension));
-        }
-
-        [Test]
-        public void GetSingle()
-        {
-            var extensionValue = new TestAllTypes.Types.NestedMessage() { Bb = 42 };
-            var untypedExtension = new Extension<TestAllExtensions, object>(OptionalNestedMessageExtension.FieldNumber, codec: null);
-            var wrongTypedExtension = new Extension<TestAllExtensions, TestAllTypes>(OptionalNestedMessageExtension.FieldNumber, codec: null);
-
-            var message = new TestAllExtensions();
-
-            var value1 = message.GetExtension(untypedExtension);
-            Assert.IsNull(value1);
-
-            message.SetExtension(OptionalNestedMessageExtension, extensionValue);
-            var value2 = message.GetExtension(untypedExtension);
-            Assert.IsNotNull(value2);
-
-            var valueBytes = ((IMessage)value2).ToByteArray();
-            var parsedValue = TestProtos.Proto2.TestAllTypes.Types.NestedMessage.Parser.ParseFrom(valueBytes);
-            Assert.AreEqual(extensionValue, parsedValue);
-
-            var ex = Assert.Throws<InvalidOperationException>(() => message.GetExtension(wrongTypedExtension));
-
-            var expectedMessage = "The stored extension value has a type of 'Google.Protobuf.TestProtos.Proto2.TestAllTypes+Types+NestedMessage, Google.Protobuf.Test.TestProtos, Version=1.0.0.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604'. " +
-                "This a different from the requested type of 'Google.Protobuf.TestProtos.Proto2.TestAllTypes, Google.Protobuf.Test.TestProtos, Version=1.0.0.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604'.";
-            Assert.AreEqual(expectedMessage, ex.Message);
-        }
-
-        [Test]
-        public void GetRepeated()
-        {
-            var extensionValue = new TestAllTypes.Types.NestedMessage() { Bb = 42 };
-            var untypedExtension = new Extension<TestAllExtensions, IList>(RepeatedNestedMessageExtension.FieldNumber, codec: null);
-            var wrongTypedExtension = new RepeatedExtension<TestAllExtensions, TestAllTypes>(RepeatedNestedMessageExtension.FieldNumber, codec: null);
-
-            var message = new TestAllExtensions();
-
-            var value1 = message.GetExtension(untypedExtension);
-            Assert.IsNull(value1);
-
-            var repeatedField = message.GetOrInitializeExtension<TestAllTypes.Types.NestedMessage>(RepeatedNestedMessageExtension);
-            repeatedField.Add(extensionValue);
-
-            var value2 = message.GetExtension(untypedExtension);
-            Assert.IsNotNull(value2);
-            Assert.AreEqual(1, value2.Count);
-
-            var valueBytes = ((IMessage)value2[0]).ToByteArray();
-            var parsedValue = TestProtos.Proto2.TestAllTypes.Types.NestedMessage.Parser.ParseFrom(valueBytes);
-            Assert.AreEqual(extensionValue, parsedValue);
-
-            var ex = Assert.Throws<InvalidOperationException>(() => message.GetExtension(wrongTypedExtension));
-
-            var expectedMessage = "The stored extension value has a type of 'Google.Protobuf.TestProtos.Proto2.TestAllTypes+Types+NestedMessage, Google.Protobuf.Test.TestProtos, Version=1.0.0.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604'. " +
-                "This a different from the requested type of 'Google.Protobuf.TestProtos.Proto2.TestAllTypes, Google.Protobuf.Test.TestProtos, Version=1.0.0.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604'.";
-            Assert.AreEqual(expectedMessage, ex.Message);
-        }
-
-        [Test]
-        public void TestEquals()
-        {
-            var message = new TestAllExtensions();
-            message.SetExtension(OptionalBoolExtension, true);
-
-            var other = new TestAllExtensions();
-
-            Assert.AreNotEqual(message, other);
-            Assert.AreNotEqual(message.CalculateSize(), other.CalculateSize());
-
-            other.SetExtension(OptionalBoolExtension, true);
-
-            Assert.AreEqual(message, other);
-            Assert.AreEqual(message.CalculateSize(), other.CalculateSize());
-        }
-
-        [Test]
-        public void TestHashCode()
-        {
-            var message = new TestAllExtensions();
-            var hashCode = message.GetHashCode();
-
-            message.SetExtension(OptionalBoolExtension, true);
-
-            Assert.AreNotEqual(hashCode, message.GetHashCode());
-        }
-
-        [Test]
-        public void TestClone()
-        {
-            var message = new TestAllExtensions();
-            message.SetExtension(OptionalBoolExtension, true);
-
-            var other = message.Clone();
-
-            Assert.AreEqual(message, other);
-            Assert.AreEqual(message.CalculateSize(), other.CalculateSize());
-        }
-
-        [Test]
-        public void TestDefaultValueRoundTrip()
-        {
-            var message = new TestAllExtensions();
-            message.SetExtension(OptionalBoolExtension, false);
-            Assert.IsFalse(message.GetExtension(OptionalBoolExtension));
-            Assert.IsTrue(message.HasExtension(OptionalBoolExtension));
-
-            var bytes = message.ToByteArray();
-            var registry = new ExtensionRegistry { OptionalBoolExtension };
-            var parsed = TestAllExtensions.Parser.WithExtensionRegistry(registry).ParseFrom(bytes);
-            Assert.IsFalse(parsed.GetExtension(OptionalBoolExtension));
-            Assert.IsTrue(parsed.HasExtension(OptionalBoolExtension));
-        }
-    }
-}
diff --git a/libs/protobuf/csharp/src/Google.Protobuf.Test/FieldCodecTest.cs b/libs/protobuf/csharp/src/Google.Protobuf.Test/FieldCodecTest.cs
deleted file mode 100644
index 7f36692..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf.Test/FieldCodecTest.cs
+++ /dev/null
@@ -1,219 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System.Collections.Generic;
-using System.IO;
-using System.Reflection;
-using Google.Protobuf.TestProtos;
-using NUnit.Framework;
-
-namespace Google.Protobuf
-{
-    public class FieldCodecTest
-    {
-#pragma warning disable 0414 // Used by tests via reflection - do not remove!
-        private static readonly List<ICodecTestData> Codecs = new List<ICodecTestData>
-        {
-            new FieldCodecTestData<bool>(FieldCodec.ForBool(100), true, "FixedBool"),
-            new FieldCodecTestData<string>(FieldCodec.ForString(100), "sample", "String"),
-            new FieldCodecTestData<ByteString>(FieldCodec.ForBytes(100), ByteString.CopyFrom(1, 2, 3), "Bytes"),
-            new FieldCodecTestData<int>(FieldCodec.ForInt32(100), -1000, "Int32"),
-            new FieldCodecTestData<int>(FieldCodec.ForSInt32(100), -1000, "SInt32"),
-            new FieldCodecTestData<int>(FieldCodec.ForSFixed32(100), -1000, "SFixed32"),
-            new FieldCodecTestData<uint>(FieldCodec.ForUInt32(100), 1234, "UInt32"),
-            new FieldCodecTestData<uint>(FieldCodec.ForFixed32(100), 1234, "Fixed32"),
-            new FieldCodecTestData<long>(FieldCodec.ForInt64(100), -1000, "Int64"),
-            new FieldCodecTestData<long>(FieldCodec.ForSInt64(100), -1000, "SInt64"),
-            new FieldCodecTestData<long>(FieldCodec.ForSFixed64(100), -1000, "SFixed64"),
-            new FieldCodecTestData<ulong>(FieldCodec.ForUInt64(100), 1234, "UInt64"),
-            new FieldCodecTestData<ulong>(FieldCodec.ForFixed64(100), 1234, "Fixed64"),
-            new FieldCodecTestData<float>(FieldCodec.ForFloat(100), 1234.5f, "FixedFloat"),
-            new FieldCodecTestData<double>(FieldCodec.ForDouble(100), 1234567890.5d, "FixedDouble"),
-            new FieldCodecTestData<ForeignEnum>(
-                FieldCodec.ForEnum(100, t => (int) t, t => (ForeignEnum) t), ForeignEnum.ForeignBaz, "Enum"),
-            new FieldCodecTestData<ForeignMessage>(
-                FieldCodec.ForMessage(100, ForeignMessage.Parser), new ForeignMessage { C = 10 }, "Message"),
-        };
-#pragma warning restore 0414
-
-        [Test, TestCaseSource("Codecs")]
-        public void RoundTripWithTag(ICodecTestData codec)
-        {
-            codec.TestRoundTripWithTag();
-        }
-
-        [Test, TestCaseSource("Codecs")]
-        public void RoundTripRaw(ICodecTestData codec)
-        {
-            codec.TestRoundTripRaw();
-        }
-
-        [Test, TestCaseSource("Codecs")]
-        public void CalculateSize(ICodecTestData codec)
-        {
-            codec.TestCalculateSizeWithTag();
-        }
-
-        [Test, TestCaseSource("Codecs")]
-        public void DefaultValue(ICodecTestData codec)
-        {
-            codec.TestDefaultValue();
-        }
-
-        [Test, TestCaseSource("Codecs")]
-        public void FixedSize(ICodecTestData codec)
-        {
-            codec.TestFixedSize();
-        }
-
-        // This is ugly, but it means we can have a non-generic interface.
-        // It feels like NUnit should support this better, but I don't know
-        // of any better ways right now.
-        public interface ICodecTestData
-        {
-            void TestRoundTripRaw();
-            void TestRoundTripWithTag();
-            void TestCalculateSizeWithTag();
-            void TestDefaultValue();
-            void TestFixedSize();
-        }
-
-        public class FieldCodecTestData<T> : ICodecTestData
-        {
-            private readonly FieldCodec<T> codec;
-            private readonly T sampleValue;
-            private readonly string name;
-
-            public FieldCodecTestData(FieldCodec<T> codec, T sampleValue, string name)
-            {
-                this.codec = codec;
-                this.sampleValue = sampleValue;
-                this.name = name;
-            }
-
-            public void TestRoundTripRaw()
-            {
-                var stream = new MemoryStream();
-                var codedOutput = new CodedOutputStream(stream);
-                WriteContext.Initialize(codedOutput, out WriteContext ctx);
-                try
-                {
-                    // only write the value using the codec
-                    codec.ValueWriter(ref ctx, sampleValue);
-                }
-                finally
-                {
-                    ctx.CopyStateTo(codedOutput);
-                }
-                
-                codedOutput.Flush();
-                stream.Position = 0;
-                var codedInput = new CodedInputStream(stream);
-                Assert.AreEqual(sampleValue, codec.Read(codedInput));
-                Assert.IsTrue(codedInput.IsAtEnd);
-            }
-
-            public void TestRoundTripWithTag()
-            {
-                var stream = new MemoryStream();
-                var codedOutput = new CodedOutputStream(stream);
-                codec.WriteTagAndValue(codedOutput, sampleValue);
-                codedOutput.Flush();
-                stream.Position = 0;
-                var codedInput = new CodedInputStream(stream);
-                codedInput.AssertNextTag(codec.Tag);
-                Assert.AreEqual(sampleValue, codec.Read(codedInput));
-                Assert.IsTrue(codedInput.IsAtEnd);
-            }
-
-            public void TestCalculateSizeWithTag()
-            {
-                var stream = new MemoryStream();
-                var codedOutput = new CodedOutputStream(stream);
-                codec.WriteTagAndValue(codedOutput, sampleValue);
-                codedOutput.Flush();
-                Assert.AreEqual(stream.Position, codec.CalculateSizeWithTag(sampleValue));
-            }
-
-            public void TestDefaultValue()
-            {
-                // WriteTagAndValue ignores default values
-                var stream = new MemoryStream();
-                CodedOutputStream codedOutput;
-#if !NET35
-                codedOutput = new CodedOutputStream(stream);
-                codec.WriteTagAndValue(codedOutput, codec.DefaultValue);
-                codedOutput.Flush();
-                Assert.AreEqual(0, stream.Position);
-                Assert.AreEqual(0, codec.CalculateSizeWithTag(codec.DefaultValue));
-                if (typeof(T).GetTypeInfo().IsValueType)
-                {
-                    Assert.AreEqual(default(T), codec.DefaultValue);
-                }
-#endif
-
-                // The plain ValueWriter/ValueReader delegates don't.
-                if (codec.DefaultValue != null) // This part isn't appropriate for message types.
-                {
-                    codedOutput = new CodedOutputStream(stream);
-                    WriteContext.Initialize(codedOutput, out WriteContext ctx);
-                    try
-                    {
-                        // only write the value using the codec
-                        codec.ValueWriter(ref ctx, codec.DefaultValue);
-                    }
-                    finally
-                    {
-                        ctx.CopyStateTo(codedOutput);
-                    }
-                    
-                    codedOutput.Flush();
-                    Assert.AreNotEqual(0, stream.Position);
-                    Assert.AreEqual(stream.Position, codec.ValueSizeCalculator(codec.DefaultValue));
-                    stream.Position = 0;
-                    var codedInput = new CodedInputStream(stream);
-                    Assert.AreEqual(codec.DefaultValue, codec.Read(codedInput));
-                }
-            }
-
-            public void TestFixedSize()
-            {
-                Assert.AreEqual(name.Contains("Fixed"), codec.FixedSize != 0);
-            }
-
-            public override string ToString()
-            {
-                return name;
-            }
-        }
-    }
-}
diff --git a/libs/protobuf/csharp/src/Google.Protobuf.Test/FieldMaskTreeTest.cs b/libs/protobuf/csharp/src/Google.Protobuf.Test/FieldMaskTreeTest.cs
deleted file mode 100644
index f71744a..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf.Test/FieldMaskTreeTest.cs
+++ /dev/null
@@ -1,436 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System.Collections.Generic;
-using Google.Protobuf.Collections;
-using Google.Protobuf.TestProtos;
-using NUnit.Framework;
-using Google.Protobuf.WellKnownTypes;
-
-namespace Google.Protobuf
-{
-    public class FieldMaskTreeTest
-    {
-        [Test]
-        public void AddFieldPath()
-        {
-            FieldMaskTree tree = new FieldMaskTree();
-            RepeatedField<string> paths = tree.ToFieldMask().Paths;
-            Assert.AreEqual(0, paths.Count);
-
-            tree.AddFieldPath("");
-            paths = tree.ToFieldMask().Paths;
-            Assert.AreEqual(1, paths.Count);
-            Assert.Contains("", paths);
-
-            // New branch.
-            tree.AddFieldPath("foo");
-            paths = tree.ToFieldMask().Paths;
-            Assert.AreEqual(2, paths.Count);
-            Assert.Contains("foo", paths);
-
-            // Redundant path.
-            tree.AddFieldPath("foo");
-            paths = tree.ToFieldMask().Paths;
-            Assert.AreEqual(2, paths.Count);
-
-            // New branch.
-            tree.AddFieldPath("bar.baz");
-            paths = tree.ToFieldMask().Paths;
-            Assert.AreEqual(3, paths.Count);
-            Assert.Contains("bar.baz", paths);
-
-            // Redundant sub-path.
-            tree.AddFieldPath("foo.bar");
-            paths = tree.ToFieldMask().Paths;
-            Assert.AreEqual(3, paths.Count);
-
-            // New branch from a non-root node.
-            tree.AddFieldPath("bar.quz");
-            paths = tree.ToFieldMask().Paths;
-            Assert.AreEqual(4, paths.Count);
-            Assert.Contains("bar.quz", paths);
-
-            // A path that matches several existing sub-paths.
-            tree.AddFieldPath("bar");
-            paths = tree.ToFieldMask().Paths;
-            Assert.AreEqual(3, paths.Count);
-            Assert.Contains("foo", paths);
-            Assert.Contains("bar", paths);
-        }
-
-        [Test]
-        public void MergeFromFieldMask()
-        {
-            FieldMaskTree tree = new FieldMaskTree();
-            tree.MergeFromFieldMask(new FieldMask
-            {
-                Paths = {"foo", "bar.baz", "bar.quz"}
-            });
-            RepeatedField<string> paths = tree.ToFieldMask().Paths;
-            Assert.AreEqual(3, paths.Count);
-            Assert.Contains("foo", paths);
-            Assert.Contains("bar.baz", paths);
-            Assert.Contains("bar.quz", paths);
-
-            tree.MergeFromFieldMask(new FieldMask
-            {
-                Paths = {"foo.bar", "bar"}
-            });
-            paths = tree.ToFieldMask().Paths;
-            Assert.AreEqual(2, paths.Count);
-            Assert.Contains("foo", paths);
-            Assert.Contains("bar", paths);
-        }
-
-        [Test]
-        public void IntersectFieldPath()
-        {
-            FieldMaskTree tree = new FieldMaskTree();
-            FieldMaskTree result = new FieldMaskTree();
-            tree.MergeFromFieldMask(new FieldMask
-            {
-                Paths = {"foo", "bar.baz", "bar.quz"}
-            });
-
-            // Empty path.
-            tree.IntersectFieldPath("", result);
-            RepeatedField<string> paths = result.ToFieldMask().Paths;
-            Assert.AreEqual(0, paths.Count);
-
-            // Non-exist path.
-            tree.IntersectFieldPath("quz", result);
-            paths = result.ToFieldMask().Paths;
-            Assert.AreEqual(0, paths.Count);
-
-            // Sub-path of an existing leaf.
-            tree.IntersectFieldPath("foo.bar", result);
-            paths = result.ToFieldMask().Paths;
-            Assert.AreEqual(1, paths.Count);
-            Assert.Contains("foo.bar", paths);
-
-            // Match an existing leaf node.
-            tree.IntersectFieldPath("foo", result);
-            paths = result.ToFieldMask().Paths;
-            Assert.AreEqual(1, paths.Count);
-            Assert.Contains("foo", paths);
-
-            // Non-exist path.
-            tree.IntersectFieldPath("bar.foo", result);
-            paths = result.ToFieldMask().Paths;
-            Assert.AreEqual(1, paths.Count);
-            Assert.Contains("foo", paths);
-
-            // Match a non-leaf node.
-            tree.IntersectFieldPath("bar", result);
-            paths = result.ToFieldMask().Paths;
-            Assert.AreEqual(3, paths.Count);
-            Assert.Contains("foo", paths);
-            Assert.Contains("bar.baz", paths);
-            Assert.Contains("bar.quz", paths);
-        }
-
-        private void Merge(FieldMaskTree tree, IMessage source, IMessage destination, FieldMask.MergeOptions options, bool useDynamicMessage)
-        {
-            if (useDynamicMessage)
-            {
-                var newSource = source.Descriptor.Parser.CreateTemplate();
-                newSource.MergeFrom(source.ToByteString());
-
-                var newDestination = source.Descriptor.Parser.CreateTemplate();
-                newDestination.MergeFrom(destination.ToByteString());
-
-                tree.Merge(newSource, newDestination, options);
-
-                // Clear before merging:
-                foreach (var fieldDescriptor in destination.Descriptor.Fields.InFieldNumberOrder())
-                {
-                    fieldDescriptor.Accessor.Clear(destination);
-                }
-                destination.MergeFrom(newDestination.ToByteString());
-            }
-            else
-            {
-                tree.Merge(source, destination, options);
-            }
-        }
-
-        [Test]
-        [TestCase(true)]
-        [TestCase(false)]
-        public void Merge(bool useDynamicMessage)
-        {
-            TestAllTypes value = new TestAllTypes
-            {
-                SingleInt32 = 1234,
-                SingleNestedMessage = new TestAllTypes.Types.NestedMessage {Bb = 5678},
-                RepeatedInt32 = {4321},
-                RepeatedNestedMessage = {new TestAllTypes.Types.NestedMessage {Bb = 8765}}
-            };
-
-            NestedTestAllTypes source = new NestedTestAllTypes
-            {
-                Payload = value,
-                Child = new NestedTestAllTypes {Payload = value}
-            };
-            // Now we have a message source with the following structure:
-            //   [root] -+- payload -+- single_int32
-            //           |           +- single_nested_message
-            //           |           +- repeated_int32
-            //           |           +- repeated_nested_message
-            //           |
-            //           +- child --- payload -+- single_int32
-            //                                 +- single_nested_message
-            //                                 +- repeated_int32
-            //                                 +- repeated_nested_message
-
-            FieldMask.MergeOptions options = new FieldMask.MergeOptions();
-
-            // Test merging each individual field.
-            NestedTestAllTypes destination = new NestedTestAllTypes();
-            Merge(new FieldMaskTree().AddFieldPath("payload.single_int32"),
-                source, destination, options, useDynamicMessage);
-            NestedTestAllTypes expected = new NestedTestAllTypes
-            {
-                Payload = new TestAllTypes
-                {
-                    SingleInt32 = 1234
-                }
-            };
-            Assert.AreEqual(expected, destination);
-
-            destination = new NestedTestAllTypes();
-            Merge(new FieldMaskTree().AddFieldPath("payload.single_nested_message"),
-                source, destination, options, useDynamicMessage);
-            expected = new NestedTestAllTypes
-            {
-                Payload = new TestAllTypes
-                {
-                    SingleNestedMessage = new TestAllTypes.Types.NestedMessage {Bb = 5678}
-                }
-            };
-            Assert.AreEqual(expected, destination);
-
-            destination = new NestedTestAllTypes();
-            Merge(new FieldMaskTree().AddFieldPath("payload.repeated_int32"),
-                source, destination, options, useDynamicMessage);
-            expected = new NestedTestAllTypes
-            {
-                Payload = new TestAllTypes
-                {
-                    RepeatedInt32 = {4321}
-                }
-            };
-            Assert.AreEqual(expected, destination);
-
-            destination = new NestedTestAllTypes();
-            Merge(new FieldMaskTree().AddFieldPath("payload.repeated_nested_message"),
-                source, destination, options, useDynamicMessage);
-            expected = new NestedTestAllTypes
-            {
-                Payload = new TestAllTypes
-                {
-                    RepeatedNestedMessage = {new TestAllTypes.Types.NestedMessage {Bb = 8765}}
-                }
-            };
-            Assert.AreEqual(expected, destination);
-
-            destination = new NestedTestAllTypes();
-            Merge(
-                new FieldMaskTree().AddFieldPath("child.payload.single_int32"),
-                source,
-                destination,
-                options,
-                useDynamicMessage);
-            expected = new NestedTestAllTypes
-            {
-                Child = new NestedTestAllTypes
-                {
-                    Payload = new TestAllTypes
-                    {
-                        SingleInt32 = 1234
-                    }
-                }
-            };
-            Assert.AreEqual(expected, destination);
-
-            destination = new NestedTestAllTypes();
-            Merge(
-                new FieldMaskTree().AddFieldPath("child.payload.single_nested_message"),
-                source,
-                destination,
-                options,
-                useDynamicMessage);
-            expected = new NestedTestAllTypes
-            {
-                Child = new NestedTestAllTypes
-                {
-                    Payload = new TestAllTypes
-                    {
-                        SingleNestedMessage = new TestAllTypes.Types.NestedMessage {Bb = 5678}
-                    }
-                }
-            };
-            Assert.AreEqual(expected, destination);
-
-            destination = new NestedTestAllTypes();
-            Merge(new FieldMaskTree().AddFieldPath("child.payload.repeated_int32"),
-                source, destination, options, useDynamicMessage);
-            expected = new NestedTestAllTypes
-            {
-                Child = new NestedTestAllTypes
-                {
-                    Payload = new TestAllTypes
-                    {
-                        RepeatedInt32 = {4321}
-                    }
-                }
-            };
-            Assert.AreEqual(expected, destination);
-
-            destination = new NestedTestAllTypes();
-            Merge(new FieldMaskTree().AddFieldPath("child.payload.repeated_nested_message"),
-                source, destination, options, useDynamicMessage);
-            expected = new NestedTestAllTypes
-            {
-                Child = new NestedTestAllTypes
-                {
-                    Payload = new TestAllTypes
-                    {
-                        RepeatedNestedMessage = {new TestAllTypes.Types.NestedMessage {Bb = 8765}}
-                    }
-                }
-            };
-            Assert.AreEqual(expected, destination);
-
-            destination = new NestedTestAllTypes();
-            Merge(new FieldMaskTree().AddFieldPath("child").AddFieldPath("payload"),
-                source, destination, options, useDynamicMessage);
-            Assert.AreEqual(source, destination);
-
-            // Test repeated options.
-            destination = new NestedTestAllTypes
-            {
-                Payload = new TestAllTypes
-                {
-                    RepeatedInt32 = { 1000 }
-                }
-            };
-            Merge(new FieldMaskTree().AddFieldPath("payload.repeated_int32"),
-                    source, destination, options, useDynamicMessage);
-            // Default behavior is to append repeated fields.
-            Assert.AreEqual(2, destination.Payload.RepeatedInt32.Count);
-            Assert.AreEqual(1000, destination.Payload.RepeatedInt32[0]);
-            Assert.AreEqual(4321, destination.Payload.RepeatedInt32[1]);
-            // Change to replace repeated fields.
-            options.ReplaceRepeatedFields = true;
-            Merge(new FieldMaskTree().AddFieldPath("payload.repeated_int32"),
-                source, destination, options, useDynamicMessage);
-            Assert.AreEqual(1, destination.Payload.RepeatedInt32.Count);
-            Assert.AreEqual(4321, destination.Payload.RepeatedInt32[0]);
-
-            // Test message options.
-            destination = new NestedTestAllTypes
-            {
-                Payload = new TestAllTypes
-                {
-                    SingleInt32 = 1000,
-                    SingleUint32 = 2000
-                }
-            };
-            Merge(new FieldMaskTree().AddFieldPath("payload"),
-                    source, destination, options, useDynamicMessage);
-            // Default behavior is to merge message fields.
-            Assert.AreEqual(1234, destination.Payload.SingleInt32);
-            Assert.AreEqual(2000, destination.Payload.SingleUint32);
-
-            // Test merging unset message fields.
-            NestedTestAllTypes clearedSource = source.Clone();
-            clearedSource.Payload = null;
-            destination = new NestedTestAllTypes();
-            Merge(new FieldMaskTree().AddFieldPath("payload"),
-                clearedSource, destination, options, useDynamicMessage);
-            Assert.IsNull(destination.Payload);
-
-            // Skip a message field if they are unset in both source and target.
-            destination = new NestedTestAllTypes();
-            Merge(new FieldMaskTree().AddFieldPath("payload.single_int32"),
-                clearedSource, destination, options, useDynamicMessage);
-            Assert.IsNull(destination.Payload);
-
-            // Change to replace message fields.
-            options.ReplaceMessageFields = true;
-            destination = new NestedTestAllTypes
-            {
-                Payload = new TestAllTypes
-                {
-                    SingleInt32 = 1000,
-                    SingleUint32 = 2000
-                }
-            };
-            Merge(new FieldMaskTree().AddFieldPath("payload"),
-                    source, destination, options, useDynamicMessage);
-            Assert.AreEqual(1234, destination.Payload.SingleInt32);
-            Assert.AreEqual(0, destination.Payload.SingleUint32);
-
-            // Test merging unset message fields.
-            destination = new NestedTestAllTypes
-            {
-                Payload = new TestAllTypes
-                {
-                    SingleInt32 = 1000,
-                    SingleUint32 = 2000
-                }
-            };
-            Merge(new FieldMaskTree().AddFieldPath("payload"),
-                    clearedSource, destination, options, useDynamicMessage);
-            Assert.IsNull(destination.Payload);
-
-            // Test merging unset primitive fields.
-            destination = source.Clone();
-            destination.Payload.SingleInt32 = 0;
-            NestedTestAllTypes sourceWithPayloadInt32Unset = destination;
-            destination = source.Clone();
-            Merge(new FieldMaskTree().AddFieldPath("payload.single_int32"),
-                sourceWithPayloadInt32Unset, destination, options, useDynamicMessage);
-            Assert.AreEqual(0, destination.Payload.SingleInt32);
-
-            // Change to clear unset primitive fields.
-            options.ReplacePrimitiveFields = true;
-            destination = source.Clone();
-            Merge(new FieldMaskTree().AddFieldPath("payload.single_int32"),
-                sourceWithPayloadInt32Unset, destination, options, useDynamicMessage);
-            Assert.IsNotNull(destination.Payload);
-        }
-
-    }
-}
diff --git a/libs/protobuf/csharp/src/Google.Protobuf.Test/GeneratedMessageTest.Proto2.cs b/libs/protobuf/csharp/src/Google.Protobuf.Test/GeneratedMessageTest.Proto2.cs
deleted file mode 100644
index fa5f927..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf.Test/GeneratedMessageTest.Proto2.cs
+++ /dev/null
@@ -1,397 +0,0 @@
-using Google.Protobuf.TestProtos.Proto2;
-using Proto2 = Google.Protobuf.TestProtos.Proto2;
-using NUnit.Framework;
-
-using static Google.Protobuf.TestProtos.Proto2.UnittestExtensions;
-
-namespace Google.Protobuf
-{
-    /// <summary>
-    /// Tests around the generated TestAllTypes message in unittest.proto
-    /// </summary>
-    public partial class GeneratedMessageTest
-    {
-        [Test]
-        public void DefaultProto2Values()
-        {
-            var message = new TestAllTypes();
-            Assert.AreEqual(false, message.OptionalBool);
-            Assert.AreEqual(ByteString.Empty, message.OptionalBytes);
-            Assert.AreEqual(0.0, message.OptionalDouble);
-            Assert.AreEqual(0, message.OptionalFixed32);
-            Assert.AreEqual(0L, message.OptionalFixed64);
-            Assert.AreEqual(0.0f, message.OptionalFloat);
-            Assert.AreEqual(ForeignEnum.ForeignFoo, message.OptionalForeignEnum);
-            Assert.IsNull(message.OptionalForeignMessage);
-            Assert.AreEqual(ImportEnum.ImportFoo, message.OptionalImportEnum);
-            Assert.IsNull(message.OptionalImportMessage);
-            Assert.AreEqual(0, message.OptionalInt32);
-            Assert.AreEqual(0L, message.OptionalInt64);
-            Assert.AreEqual(Proto2.TestAllTypes.Types.NestedEnum.Foo, message.OptionalNestedEnum);
-            Assert.IsNull(message.OptionalNestedMessage);
-            Assert.IsNull(message.OptionalPublicImportMessage);
-            Assert.AreEqual(0, message.OptionalSfixed32);
-            Assert.AreEqual(0L, message.OptionalSfixed64);
-            Assert.AreEqual(0, message.OptionalSint32);
-            Assert.AreEqual(0L, message.OptionalSint64);
-            Assert.AreEqual("", message.OptionalString);
-            Assert.AreEqual(0U, message.OptionalUint32);
-            Assert.AreEqual(0UL, message.OptionalUint64);
-
-            // Repeated fields
-            Assert.AreEqual(0, message.RepeatedBool.Count);
-            Assert.AreEqual(0, message.RepeatedBytes.Count);
-            Assert.AreEqual(0, message.RepeatedDouble.Count);
-            Assert.AreEqual(0, message.RepeatedFixed32.Count);
-            Assert.AreEqual(0, message.RepeatedFixed64.Count);
-            Assert.AreEqual(0, message.RepeatedFloat.Count);
-            Assert.AreEqual(0, message.RepeatedForeignEnum.Count);
-            Assert.AreEqual(0, message.RepeatedForeignMessage.Count);
-            Assert.AreEqual(0, message.RepeatedImportEnum.Count);
-            Assert.AreEqual(0, message.RepeatedImportMessage.Count);
-            Assert.AreEqual(0, message.RepeatedNestedEnum.Count);
-            Assert.AreEqual(0, message.RepeatedNestedMessage.Count);
-            Assert.AreEqual(0, message.RepeatedSfixed32.Count);
-            Assert.AreEqual(0, message.RepeatedSfixed64.Count);
-            Assert.AreEqual(0, message.RepeatedSint32.Count);
-            Assert.AreEqual(0, message.RepeatedSint64.Count);
-            Assert.AreEqual(0, message.RepeatedString.Count);
-            Assert.AreEqual(0, message.RepeatedUint32.Count);
-            Assert.AreEqual(0, message.RepeatedUint64.Count);
-
-            // Oneof fields
-            Assert.AreEqual(Proto2.TestAllTypes.OneofFieldOneofCase.None, message.OneofFieldCase);
-            Assert.AreEqual(0, message.OneofUint32);
-            Assert.AreEqual("", message.OneofString);
-            Assert.AreEqual(ByteString.Empty, message.OneofBytes);
-            Assert.IsNull(message.OneofNestedMessage);
-
-            Assert.AreEqual(true, message.DefaultBool);
-            Assert.AreEqual(ByteString.CopyFromUtf8("world"), message.DefaultBytes);
-            Assert.AreEqual("123", message.DefaultCord);
-            Assert.AreEqual(52e3, message.DefaultDouble);
-            Assert.AreEqual(47, message.DefaultFixed32);
-            Assert.AreEqual(48, message.DefaultFixed64);
-            Assert.AreEqual(51.5, message.DefaultFloat);
-            Assert.AreEqual(ForeignEnum.ForeignBar, message.DefaultForeignEnum);
-            Assert.AreEqual(ImportEnum.ImportBar, message.DefaultImportEnum);
-            Assert.AreEqual(41, message.DefaultInt32);
-            Assert.AreEqual(42, message.DefaultInt64);
-            Assert.AreEqual(Proto2.TestAllTypes.Types.NestedEnum.Bar, message.DefaultNestedEnum);
-            Assert.AreEqual(49, message.DefaultSfixed32);
-            Assert.AreEqual(-50, message.DefaultSfixed64);
-            Assert.AreEqual(-45, message.DefaultSint32);
-            Assert.AreEqual(46, message.DefaultSint64);
-            Assert.AreEqual("hello", message.DefaultString);
-            Assert.AreEqual("abc", message.DefaultStringPiece);
-            Assert.AreEqual(43, message.DefaultUint32);
-            Assert.AreEqual(44, message.DefaultUint64);
-
-            Assert.False(message.HasDefaultBool);
-            Assert.False(message.HasDefaultBytes);
-            Assert.False(message.HasDefaultCord);
-            Assert.False(message.HasDefaultDouble);
-            Assert.False(message.HasDefaultFixed32);
-            Assert.False(message.HasDefaultFixed64);
-            Assert.False(message.HasDefaultFloat);
-            Assert.False(message.HasDefaultForeignEnum);
-            Assert.False(message.HasDefaultImportEnum);
-            Assert.False(message.HasDefaultInt32);
-            Assert.False(message.HasDefaultInt64);
-            Assert.False(message.HasDefaultNestedEnum);
-            Assert.False(message.HasDefaultSfixed32);
-            Assert.False(message.HasDefaultSfixed64);
-            Assert.False(message.HasDefaultSint32);
-            Assert.False(message.HasDefaultSint64);
-            Assert.False(message.HasDefaultString);
-            Assert.False(message.HasDefaultStringPiece);
-            Assert.False(message.HasDefaultUint32);
-            Assert.False(message.HasDefaultUint64);
-        }
-
-        [Test]
-        public void DefaultExtensionValues()
-        {
-            var message = new TestAllExtensions();
-            Assert.AreEqual(false, message.GetExtension(OptionalBoolExtension));
-            Assert.AreEqual(ByteString.Empty, message.GetExtension(OptionalBytesExtension));
-            Assert.AreEqual(0.0, message.GetExtension(OptionalDoubleExtension));
-            Assert.AreEqual(0, message.GetExtension(OptionalFixed32Extension));
-            Assert.AreEqual(0L, message.GetExtension(OptionalFixed64Extension));
-            Assert.AreEqual(0.0f, message.GetExtension(OptionalFloatExtension));
-            Assert.AreEqual(ForeignEnum.ForeignFoo, message.GetExtension(OptionalForeignEnumExtension));
-            Assert.IsNull(message.GetExtension(OptionalForeignMessageExtension));
-            Assert.AreEqual(ImportEnum.ImportFoo, message.GetExtension(OptionalImportEnumExtension));
-            Assert.IsNull(message.GetExtension(OptionalImportMessageExtension));
-            Assert.AreEqual(0, message.GetExtension(OptionalInt32Extension));
-            Assert.AreEqual(0L, message.GetExtension(OptionalInt64Extension));
-            Assert.AreEqual(Proto2.TestAllTypes.Types.NestedEnum.Foo, message.GetExtension(OptionalNestedEnumExtension));
-            Assert.IsNull(message.GetExtension(OptionalNestedMessageExtension));
-            Assert.IsNull(message.GetExtension(OptionalPublicImportMessageExtension));
-            Assert.AreEqual(0, message.GetExtension(OptionalSfixed32Extension));
-            Assert.AreEqual(0L, message.GetExtension(OptionalSfixed64Extension));
-            Assert.AreEqual(0, message.GetExtension(OptionalSint32Extension));
-            Assert.AreEqual(0L, message.GetExtension(OptionalSint64Extension));
-            Assert.AreEqual("", message.GetExtension(OptionalStringExtension));
-            Assert.AreEqual(0U, message.GetExtension(OptionalUint32Extension));
-            Assert.AreEqual(0UL, message.GetExtension(OptionalUint64Extension));
-
-            // Repeated fields
-            Assert.IsNull(message.GetExtension(RepeatedBoolExtension));
-            Assert.IsNull(message.GetExtension(RepeatedBytesExtension));
-            Assert.IsNull(message.GetExtension(RepeatedDoubleExtension));
-            Assert.IsNull(message.GetExtension(RepeatedFixed32Extension));
-            Assert.IsNull(message.GetExtension(RepeatedFixed64Extension));
-            Assert.IsNull(message.GetExtension(RepeatedFloatExtension));
-            Assert.IsNull(message.GetExtension(RepeatedForeignEnumExtension));
-            Assert.IsNull(message.GetExtension(RepeatedForeignMessageExtension));
-            Assert.IsNull(message.GetExtension(RepeatedImportEnumExtension));
-            Assert.IsNull(message.GetExtension(RepeatedImportMessageExtension));
-            Assert.IsNull(message.GetExtension(RepeatedNestedEnumExtension));
-            Assert.IsNull(message.GetExtension(RepeatedNestedMessageExtension));
-            Assert.IsNull(message.GetExtension(RepeatedSfixed32Extension));
-            Assert.IsNull(message.GetExtension(RepeatedSfixed64Extension));
-            Assert.IsNull(message.GetExtension(RepeatedSint32Extension));
-            Assert.IsNull(message.GetExtension(RepeatedSint64Extension));
-            Assert.IsNull(message.GetExtension(RepeatedStringExtension));
-            Assert.IsNull(message.GetExtension(RepeatedUint32Extension));
-            Assert.IsNull(message.GetExtension(RepeatedUint64Extension));
-
-            // Oneof fields
-            Assert.AreEqual(0, message.GetExtension(OneofUint32Extension));
-            Assert.AreEqual("", message.GetExtension(OneofStringExtension));
-            Assert.AreEqual(ByteString.Empty, message.GetExtension(OneofBytesExtension));
-            Assert.IsNull(message.GetExtension(OneofNestedMessageExtension));
-
-            Assert.AreEqual(true, message.GetExtension(DefaultBoolExtension));
-            Assert.AreEqual(ByteString.CopyFromUtf8("world"), message.GetExtension(DefaultBytesExtension));
-            Assert.AreEqual("123", message.GetExtension(DefaultCordExtension));
-            Assert.AreEqual(52e3, message.GetExtension(DefaultDoubleExtension));
-            Assert.AreEqual(47, message.GetExtension(DefaultFixed32Extension));
-            Assert.AreEqual(48, message.GetExtension(DefaultFixed64Extension));
-            Assert.AreEqual(51.5, message.GetExtension(DefaultFloatExtension));
-            Assert.AreEqual(ForeignEnum.ForeignBar, message.GetExtension(DefaultForeignEnumExtension));
-            Assert.AreEqual(ImportEnum.ImportBar, message.GetExtension(DefaultImportEnumExtension));
-            Assert.AreEqual(41, message.GetExtension(DefaultInt32Extension));
-            Assert.AreEqual(42, message.GetExtension(DefaultInt64Extension));
-            Assert.AreEqual(Proto2.TestAllTypes.Types.NestedEnum.Bar, message.GetExtension(DefaultNestedEnumExtension));
-            Assert.AreEqual(49, message.GetExtension(DefaultSfixed32Extension));
-            Assert.AreEqual(-50, message.GetExtension(DefaultSfixed64Extension));
-            Assert.AreEqual(-45, message.GetExtension(DefaultSint32Extension));
-            Assert.AreEqual(46, message.GetExtension(DefaultSint64Extension));
-            Assert.AreEqual("hello", message.GetExtension(DefaultStringExtension));
-            Assert.AreEqual("abc", message.GetExtension(DefaultStringPieceExtension));
-            Assert.AreEqual(43, message.GetExtension(DefaultUint32Extension));
-            Assert.AreEqual(44, message.GetExtension(DefaultUint64Extension));
-
-            Assert.False(message.HasExtension(DefaultBoolExtension));
-            Assert.False(message.HasExtension(DefaultBytesExtension));
-            Assert.False(message.HasExtension(DefaultCordExtension));
-            Assert.False(message.HasExtension(DefaultDoubleExtension));
-            Assert.False(message.HasExtension(DefaultFixed32Extension));
-            Assert.False(message.HasExtension(DefaultFixed64Extension));
-            Assert.False(message.HasExtension(DefaultFloatExtension));
-            Assert.False(message.HasExtension(DefaultForeignEnumExtension));
-            Assert.False(message.HasExtension(DefaultImportEnumExtension));
-            Assert.False(message.HasExtension(DefaultInt32Extension));
-            Assert.False(message.HasExtension(DefaultInt64Extension));
-            Assert.False(message.HasExtension(DefaultNestedEnumExtension));
-            Assert.False(message.HasExtension(DefaultSfixed32Extension));
-            Assert.False(message.HasExtension(DefaultSfixed64Extension));
-            Assert.False(message.HasExtension(DefaultSint32Extension));
-            Assert.False(message.HasExtension(DefaultSint64Extension));
-            Assert.False(message.HasExtension(DefaultStringExtension));
-            Assert.False(message.HasExtension(DefaultStringPieceExtension));
-            Assert.False(message.HasExtension(DefaultUint32Extension));
-            Assert.False(message.HasExtension(DefaultUint64Extension));
-        }
-
-        [Test]
-        public void FieldPresence()
-        {
-            var message = new TestAllTypes();
-
-            Assert.False(message.HasOptionalBool);
-            Assert.False(message.OptionalBool);
-
-            message.OptionalBool = true;
-
-            Assert.True(message.HasOptionalBool);
-            Assert.True(message.OptionalBool);
-
-            message.OptionalBool = false;
-
-            Assert.True(message.HasOptionalBool);
-            Assert.False(message.OptionalBool);
-
-            message.ClearOptionalBool();
-
-            Assert.False(message.HasOptionalBool);
-            Assert.False(message.OptionalBool);
-
-            Assert.False(message.HasDefaultBool);
-            Assert.True(message.DefaultBool);
-
-            message.DefaultBool = false;
-
-            Assert.True(message.HasDefaultBool);
-            Assert.False(message.DefaultBool);
-
-            message.DefaultBool = true;
-
-            Assert.True(message.HasDefaultBool);
-            Assert.True(message.DefaultBool);
-
-            message.ClearDefaultBool();
-
-            Assert.False(message.HasDefaultBool);
-            Assert.True(message.DefaultBool);
-        }
-
-        [Test]
-        public void RequiredFields()
-        {
-            var message = new TestRequired();
-            Assert.False(message.IsInitialized());
-
-            message.A = 1;
-            message.B = 2;
-            message.C = 3;
-
-            Assert.True(message.IsInitialized());
-        }
-
-        /// <summary>
-        /// Code was accidentally left in message parser that threw exceptions when missing required fields after parsing.
-        /// We've decided to not throw exceptions on missing fields, instead leaving it up to the consumer how they
-        /// want to check and handle missing fields.
-        /// </summary>
-        [Test]
-        public void RequiredFieldsNoThrow()
-        {
-            Assert.DoesNotThrow(() => MessageParsingHelpers.AssertReadingMessage(TestRequired.Parser, new byte[0], m => { }));
-            Assert.DoesNotThrow(() => MessageParsingHelpers.AssertReadingMessage(TestRequired.Parser as MessageParser, new byte[0], m => { }));
-        }
-
-        [Test]
-        public void RequiredFieldsInExtensions()
-        {
-            var message = new TestAllExtensions();
-            Assert.True(message.IsInitialized());
-
-            message.SetExtension(TestRequired.Extensions.Single, new TestRequired());
-
-            Assert.False(message.IsInitialized());
-
-            var extensionMessage = message.GetExtension(TestRequired.Extensions.Single);
-            extensionMessage.A = 1;
-            extensionMessage.B = 2;
-            extensionMessage.C = 3;
-
-            Assert.True(message.IsInitialized());
-
-            message.GetOrInitializeExtension(TestRequired.Extensions.Multi);
-
-            Assert.True(message.IsInitialized());
-
-            message.GetExtension(TestRequired.Extensions.Multi).Add(new TestRequired());
-
-            Assert.False(message.IsInitialized());
-
-            extensionMessage = message.GetExtension(TestRequired.Extensions.Multi)[0];
-            extensionMessage.A = 1;
-            extensionMessage.B = 2;
-            extensionMessage.C = 3;
-
-            Assert.True(message.IsInitialized());
-
-            message.SetExtension(UnittestExtensions.OptionalBoolExtension, true);
-
-            Assert.True(message.IsInitialized());
-
-            message.GetOrInitializeExtension(UnittestExtensions.RepeatedBoolExtension).Add(true);
-
-            Assert.True(message.IsInitialized());
-        }
-
-        [Test]
-        public void RequiredFieldInNestedMessageMapValue()
-        {
-            var message = new TestRequiredMap();
-            message.Foo.Add(0, new TestRequiredMap.Types.NestedMessage());
-
-            Assert.False(message.IsInitialized());
-
-            message.Foo[0].RequiredInt32 = 12;
-
-            Assert.True(message.IsInitialized());
-        }
-
-        [Test]
-        public void RoundTrip_Groups()
-        {
-            var message = new TestAllTypes
-            {
-                OptionalGroup = new TestAllTypes.Types.OptionalGroup
-                {
-                    A = 10
-                },
-                RepeatedGroup =
-                {
-                    new TestAllTypes.Types.RepeatedGroup { A = 10 },
-                    new TestAllTypes.Types.RepeatedGroup { A = 20 },
-                    new TestAllTypes.Types.RepeatedGroup { A = 30 }
-                }
-            };
-
-            MessageParsingHelpers.AssertWritingMessage(message);
-
-            MessageParsingHelpers.AssertRoundtrip(Proto2.TestAllTypes.Parser, message);
-        }
-
-        [Test]
-        public void RoundTrip_ExtensionGroups()
-        {
-            var message = new TestAllExtensions();
-            message.SetExtension(UnittestExtensions.OptionalGroupExtension, new OptionalGroup_extension { A = 10 });
-            message.GetOrInitializeExtension(UnittestExtensions.RepeatedGroupExtension).AddRange(new[]
-            {
-                new RepeatedGroup_extension { A = 10 },
-                new RepeatedGroup_extension { A = 20 },
-                new RepeatedGroup_extension { A = 30 }
-            });
-
-            MessageParsingHelpers.AssertWritingMessage(message);
-
-            MessageParsingHelpers.AssertRoundtrip(
-                TestAllExtensions.Parser.WithExtensionRegistry(new ExtensionRegistry() { UnittestExtensions.OptionalGroupExtension, UnittestExtensions.RepeatedGroupExtension }),
-                message);
-        }
-
-        [Test]
-        public void RoundTrip_NestedExtensionGroup()
-        {
-            var message = new TestGroupExtension();
-            message.SetExtension(TestNestedExtension.Extensions.OptionalGroupExtension, new TestNestedExtension.Types.OptionalGroup_extension { A = 10 });
-
-            MessageParsingHelpers.AssertWritingMessage(message);
-            
-            MessageParsingHelpers.AssertRoundtrip(
-                TestGroupExtension.Parser.WithExtensionRegistry(new ExtensionRegistry() { TestNestedExtension.Extensions.OptionalGroupExtension }),
-                message);
-        }
-
-        [Test]
-        public void RoundTrip_ParseUsingCodedInput()
-        {
-            var message = new TestAllExtensions();
-            message.SetExtension(UnittestExtensions.OptionalBoolExtension, true);
-            byte[] bytes = message.ToByteArray();
-            using (CodedInputStream input = new CodedInputStream(bytes))
-            {
-                var parsed = TestAllExtensions.Parser.WithExtensionRegistry(new ExtensionRegistry() { UnittestExtensions.OptionalBoolExtension }).ParseFrom(input);
-                Assert.AreEqual(message, parsed);
-            }
-        }
-    }
-}
diff --git a/libs/protobuf/csharp/src/Google.Protobuf.Test/GeneratedMessageTest.cs b/libs/protobuf/csharp/src/Google.Protobuf.Test/GeneratedMessageTest.cs
deleted file mode 100644
index 41a0b91..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf.Test/GeneratedMessageTest.cs
+++ /dev/null
@@ -1,799 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-using System.IO;
-using Google.Protobuf.TestProtos;
-using Proto2 = Google.Protobuf.TestProtos.Proto2;
-using NUnit.Framework;
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-using Google.Protobuf.WellKnownTypes;
-
-namespace Google.Protobuf
-{
-    /// <summary>
-    /// Tests around the generated TestAllTypes message.
-    /// </summary>
-    public partial class GeneratedMessageTest
-    {
-        [Test]
-        public void EmptyMessageFieldDistinctFromMissingMessageField()
-        {
-            // This demonstrates what we're really interested in...
-            var message1 = new TestAllTypes { SingleForeignMessage = new ForeignMessage() };
-            var message2 = new TestAllTypes(); // SingleForeignMessage is null
-            EqualityTester.AssertInequality(message1, message2);
-        }
-
-        [Test]
-        public void DefaultValues()
-        {
-            // Single fields
-            var message = new TestAllTypes();
-            Assert.AreEqual(false, message.SingleBool);
-            Assert.AreEqual(ByteString.Empty, message.SingleBytes);
-            Assert.AreEqual(0.0, message.SingleDouble);
-            Assert.AreEqual(0, message.SingleFixed32);
-            Assert.AreEqual(0L, message.SingleFixed64);
-            Assert.AreEqual(0.0f, message.SingleFloat);
-            Assert.AreEqual(ForeignEnum.ForeignUnspecified, message.SingleForeignEnum);
-            Assert.IsNull(message.SingleForeignMessage);
-            Assert.AreEqual(ImportEnum.Unspecified, message.SingleImportEnum);
-            Assert.IsNull(message.SingleImportMessage);
-            Assert.AreEqual(0, message.SingleInt32);
-            Assert.AreEqual(0L, message.SingleInt64);
-            Assert.AreEqual(TestAllTypes.Types.NestedEnum.Unspecified, message.SingleNestedEnum);
-            Assert.IsNull(message.SingleNestedMessage);
-            Assert.IsNull(message.SinglePublicImportMessage);
-            Assert.AreEqual(0, message.SingleSfixed32);
-            Assert.AreEqual(0L, message.SingleSfixed64);
-            Assert.AreEqual(0, message.SingleSint32);
-            Assert.AreEqual(0L, message.SingleSint64);
-            Assert.AreEqual("", message.SingleString);
-            Assert.AreEqual(0U, message.SingleUint32);
-            Assert.AreEqual(0UL, message.SingleUint64);
-
-            // Repeated fields
-            Assert.AreEqual(0, message.RepeatedBool.Count);
-            Assert.AreEqual(0, message.RepeatedBytes.Count);
-            Assert.AreEqual(0, message.RepeatedDouble.Count);
-            Assert.AreEqual(0, message.RepeatedFixed32.Count);
-            Assert.AreEqual(0, message.RepeatedFixed64.Count);
-            Assert.AreEqual(0, message.RepeatedFloat.Count);
-            Assert.AreEqual(0, message.RepeatedForeignEnum.Count);
-            Assert.AreEqual(0, message.RepeatedForeignMessage.Count);
-            Assert.AreEqual(0, message.RepeatedImportEnum.Count);
-            Assert.AreEqual(0, message.RepeatedImportMessage.Count);
-            Assert.AreEqual(0, message.RepeatedNestedEnum.Count);
-            Assert.AreEqual(0, message.RepeatedNestedMessage.Count);
-            Assert.AreEqual(0, message.RepeatedPublicImportMessage.Count);
-            Assert.AreEqual(0, message.RepeatedSfixed32.Count);
-            Assert.AreEqual(0, message.RepeatedSfixed64.Count);
-            Assert.AreEqual(0, message.RepeatedSint32.Count);
-            Assert.AreEqual(0, message.RepeatedSint64.Count);
-            Assert.AreEqual(0, message.RepeatedString.Count);
-            Assert.AreEqual(0, message.RepeatedUint32.Count);
-            Assert.AreEqual(0, message.RepeatedUint64.Count);
-
-            // Oneof fields
-            Assert.AreEqual(TestAllTypes.OneofFieldOneofCase.None, message.OneofFieldCase);
-            Assert.AreEqual(0, message.OneofUint32);
-            Assert.AreEqual("", message.OneofString);
-            Assert.AreEqual(ByteString.Empty, message.OneofBytes);
-            Assert.IsNull(message.OneofNestedMessage);
-        }
-
-        [Test]
-        public void NullStringAndBytesRejected()
-        {
-            var message = new TestAllTypes();
-            Assert.Throws<ArgumentNullException>(() => message.SingleString = null);
-            Assert.Throws<ArgumentNullException>(() => message.OneofString = null);
-            Assert.Throws<ArgumentNullException>(() => message.SingleBytes = null);
-            Assert.Throws<ArgumentNullException>(() => message.OneofBytes = null);
-        }
-
-        [Test]
-        public void RoundTrip_Empty()
-        {
-            var message = new TestAllTypes();
-            // Without setting any values, there's nothing to write.
-            byte[] bytes = message.ToByteArray();
-            Assert.AreEqual(0, bytes.Length);
-
-            MessageParsingHelpers.AssertWritingMessage(message);
-
-            MessageParsingHelpers.AssertRoundtrip(TestAllTypes.Parser, message);
-        }
-
-        [Test]
-        public void RoundTrip_SingleValues()
-        {
-            var message = new TestAllTypes
-            {
-                SingleBool = true,
-                SingleBytes = ByteString.CopyFrom(1, 2, 3, 4),
-                SingleDouble = 23.5,
-                SingleFixed32 = 23,
-                SingleFixed64 = 1234567890123,
-                SingleFloat = 12.25f,
-                SingleForeignEnum = ForeignEnum.ForeignBar,
-                SingleForeignMessage = new ForeignMessage { C = 10 },
-                SingleImportEnum = ImportEnum.ImportBaz,
-                SingleImportMessage = new ImportMessage { D = 20 },
-                SingleInt32 = 100,
-                SingleInt64 = 3210987654321,
-                SingleNestedEnum = TestAllTypes.Types.NestedEnum.Foo,
-                SingleNestedMessage = new TestAllTypes.Types.NestedMessage { Bb = 35 },
-                SinglePublicImportMessage = new PublicImportMessage { E = 54 },
-                SingleSfixed32 = -123,
-                SingleSfixed64 = -12345678901234,
-                SingleSint32 = -456,
-                SingleSint64 = -12345678901235,
-                SingleString = "test",
-                SingleUint32 = uint.MaxValue,
-                SingleUint64 = ulong.MaxValue
-            };
-
-            MessageParsingHelpers.AssertWritingMessage(message);
-
-            MessageParsingHelpers.AssertRoundtrip(TestAllTypes.Parser, message);
-        }
-
-        [Test]
-        public void RoundTrip_RepeatedValues()
-        {
-            var message = new TestAllTypes
-            {
-                RepeatedBool = { true, false },
-                RepeatedBytes = { ByteString.CopyFrom(1, 2, 3, 4), ByteString.CopyFrom(5, 6) },
-                RepeatedDouble = { -12.25, 23.5 },
-                RepeatedFixed32 = { uint.MaxValue, 23 },
-                RepeatedFixed64 = { ulong.MaxValue, 1234567890123 },
-                RepeatedFloat = { 100f, 12.25f },
-                RepeatedForeignEnum = { ForeignEnum.ForeignFoo, ForeignEnum.ForeignBar },
-                RepeatedForeignMessage = { new ForeignMessage(), new ForeignMessage { C = 10 } },
-                RepeatedImportEnum = { ImportEnum.ImportBaz, ImportEnum.Unspecified },
-                RepeatedImportMessage = { new ImportMessage { D = 20 }, new ImportMessage { D = 25 } },
-                RepeatedInt32 = { 100, 200 },
-                RepeatedInt64 = { 3210987654321, long.MaxValue },
-                RepeatedNestedEnum = { TestAllTypes.Types.NestedEnum.Foo, TestAllTypes.Types.NestedEnum.Neg },
-                RepeatedNestedMessage = { new TestAllTypes.Types.NestedMessage { Bb = 35 }, new TestAllTypes.Types.NestedMessage { Bb = 10 } },
-                RepeatedPublicImportMessage = { new PublicImportMessage { E = 54 }, new PublicImportMessage { E = -1 } },
-                RepeatedSfixed32 = { -123, 123 },
-                RepeatedSfixed64 = { -12345678901234, 12345678901234 },
-                RepeatedSint32 = { -456, 100 },
-                RepeatedSint64 = { -12345678901235, 123 },
-                RepeatedString = { "foo", "bar" },
-                RepeatedUint32 = { uint.MaxValue, uint.MinValue },
-                RepeatedUint64 = { ulong.MaxValue, uint.MinValue }
-            };
-
-            MessageParsingHelpers.AssertWritingMessage(message);
-
-            MessageParsingHelpers.AssertRoundtrip(TestAllTypes.Parser, message);
-        }
-
-        // Note that not every map within map_unittest_proto3 is used. They all go through very
-        // similar code paths. The fact that all maps are present is validation that we have codecs
-        // for every type.
-        [Test]
-        public void RoundTrip_Maps()
-        {
-            var message = new TestMap
-            {
-                MapBoolBool = {
-                    { false, true },
-                    { true, false }
-                },
-                MapInt32Bytes = {
-                    { 5, ByteString.CopyFrom(6, 7, 8) },
-                    { 25, ByteString.CopyFrom(1, 2, 3, 4, 5) },
-                    { 10, ByteString.Empty }
-                },
-                MapInt32ForeignMessage = {
-                    { 0, new ForeignMessage { C = 10 } },
-                    { 5, new ForeignMessage() },
-                },
-                MapInt32Enum = {
-                    { 1, MapEnum.Bar },
-                    { 2000, MapEnum.Foo }
-                }
-            };
-
-            MessageParsingHelpers.AssertWritingMessage(message);
-
-            MessageParsingHelpers.AssertRoundtrip(TestMap.Parser, message);
-        }
-
-        [Test]
-        public void MapWithEmptyEntry()
-        {
-            var message = new TestMap
-            {
-                MapInt32Bytes = { { 0, ByteString.Empty } }
-            };
-
-            byte[] bytes = message.ToByteArray();
-            Assert.AreEqual(2, bytes.Length); // Tag for field entry (1 byte), length of entry (0; 1 byte)
-
-            MessageParsingHelpers.AssertWritingMessage(message);
-
-            MessageParsingHelpers.AssertReadingMessage(
-                TestMap.Parser,
-                bytes,
-                parsed=>
-                {
-                    Assert.AreEqual(1, parsed.MapInt32Bytes.Count);
-                    Assert.AreEqual(ByteString.Empty, parsed.MapInt32Bytes[0]);
-                });
-        }
-
-        [Test]
-        public void MapWithOnlyValue()
-        {
-            // Hand-craft the stream to contain a single entry with just a value.
-            var memoryStream = new MemoryStream();
-            var output = new CodedOutputStream(memoryStream);
-            output.WriteTag(TestMap.MapInt32ForeignMessageFieldNumber, WireFormat.WireType.LengthDelimited);
-            var nestedMessage = new ForeignMessage { C = 20 };
-            // Size of the entry (tag, size written by WriteMessage, data written by WriteMessage)
-            output.WriteLength(2 + nestedMessage.CalculateSize());
-            output.WriteTag(2, WireFormat.WireType.LengthDelimited);
-            output.WriteMessage(nestedMessage);
-            output.Flush();
-
-            MessageParsingHelpers.AssertReadingMessage(
-                TestMap.Parser,
-                memoryStream.ToArray(),
-                parsed =>
-                {
-                    Assert.AreEqual(nestedMessage, parsed.MapInt32ForeignMessage[0]);
-                });
-        }
-
-        [Test]
-        public void MapWithOnlyKey_PrimitiveValue()
-        {
-            // Hand-craft the stream to contain a single entry with just a key.
-            var memoryStream = new MemoryStream();
-            var output = new CodedOutputStream(memoryStream);
-            output.WriteTag(TestMap.MapInt32DoubleFieldNumber, WireFormat.WireType.LengthDelimited);
-            int key = 10;
-            output.WriteLength(1 + CodedOutputStream.ComputeInt32Size(key));
-            output.WriteTag(1, WireFormat.WireType.Varint);
-            output.WriteInt32(key);
-            output.Flush();
-
-            MessageParsingHelpers.AssertReadingMessage(
-                TestMap.Parser,
-                memoryStream.ToArray(),
-                parsed =>
-                {
-                    Assert.AreEqual(0.0, parsed.MapInt32Double[key]);
-                });
-        }
-
-        [Test]
-        public void MapWithOnlyKey_MessageValue()
-        {
-            // Hand-craft the stream to contain a single entry with just a key.
-            var memoryStream = new MemoryStream();
-            var output = new CodedOutputStream(memoryStream);
-            output.WriteTag(TestMap.MapInt32ForeignMessageFieldNumber, WireFormat.WireType.LengthDelimited);
-            int key = 10;
-            output.WriteLength(1 + CodedOutputStream.ComputeInt32Size(key));
-            output.WriteTag(1, WireFormat.WireType.Varint);
-            output.WriteInt32(key);
-            output.Flush();
-
-            MessageParsingHelpers.AssertReadingMessage(
-                TestMap.Parser,
-                memoryStream.ToArray(),
-                parsed =>
-                {
-                    Assert.AreEqual(new ForeignMessage(), parsed.MapInt32ForeignMessage[key]);
-                });
-        }
-
-        [Test]
-        public void MapIgnoresExtraFieldsWithinEntryMessages()
-        {
-            // Hand-craft the stream to contain a single entry with three fields
-            var memoryStream = new MemoryStream();
-            var output = new CodedOutputStream(memoryStream);
-
-            output.WriteTag(TestMap.MapInt32Int32FieldNumber, WireFormat.WireType.LengthDelimited);
-
-            var key = 10; // Field 1 
-            var value = 20; // Field 2
-            var extra = 30; // Field 3
-
-            // Each field can be represented in a single byte, with a single byte tag.
-            // Total message size: 6 bytes.
-            output.WriteLength(6);
-            output.WriteTag(1, WireFormat.WireType.Varint);
-            output.WriteInt32(key);
-            output.WriteTag(2, WireFormat.WireType.Varint);
-            output.WriteInt32(value);
-            output.WriteTag(3, WireFormat.WireType.Varint);
-            output.WriteInt32(extra);
-            output.Flush();
-
-            MessageParsingHelpers.AssertReadingMessage(
-                TestMap.Parser,
-                memoryStream.ToArray(),
-                parsed =>
-                {
-                    Assert.AreEqual(value, parsed.MapInt32Int32[key]);
-                });
-        }
-
-        [Test]
-        public void MapFieldOrderIsIrrelevant()
-        {
-            var memoryStream = new MemoryStream();
-            var output = new CodedOutputStream(memoryStream);
-
-            output.WriteTag(TestMap.MapInt32Int32FieldNumber, WireFormat.WireType.LengthDelimited);
-
-            var key = 10;
-            var value = 20;
-
-            // Each field can be represented in a single byte, with a single byte tag.
-            // Total message size: 4 bytes.
-            output.WriteLength(4);
-            output.WriteTag(2, WireFormat.WireType.Varint);
-            output.WriteInt32(value);
-            output.WriteTag(1, WireFormat.WireType.Varint);
-            output.WriteInt32(key);
-            output.Flush();
-
-            MessageParsingHelpers.AssertReadingMessage(
-                TestMap.Parser,
-                memoryStream.ToArray(),
-                parsed =>
-                {
-                    Assert.AreEqual(value, parsed.MapInt32Int32[key]);
-                });
-        }
-
-        [Test]
-        public void MapNonContiguousEntries()
-        {
-            var memoryStream = new MemoryStream();
-            var output = new CodedOutputStream(memoryStream);
-
-            // Message structure:
-            // Entry for MapInt32Int32
-            // Entry for MapStringString
-            // Entry for MapInt32Int32
-
-            // First entry
-            var key1 = 10;
-            var value1 = 20;
-            output.WriteTag(TestMap.MapInt32Int32FieldNumber, WireFormat.WireType.LengthDelimited);
-            output.WriteLength(4);
-            output.WriteTag(1, WireFormat.WireType.Varint);
-            output.WriteInt32(key1);
-            output.WriteTag(2, WireFormat.WireType.Varint);
-            output.WriteInt32(value1);
-
-            // Second entry
-            var key2 = "a";
-            var value2 = "b";
-            output.WriteTag(TestMap.MapStringStringFieldNumber, WireFormat.WireType.LengthDelimited);
-            output.WriteLength(6); // 3 bytes per entry: tag, size, character
-            output.WriteTag(1, WireFormat.WireType.LengthDelimited);
-            output.WriteString(key2);
-            output.WriteTag(2, WireFormat.WireType.LengthDelimited);
-            output.WriteString(value2);
-
-            // Third entry
-            var key3 = 15;
-            var value3 = 25;
-            output.WriteTag(TestMap.MapInt32Int32FieldNumber, WireFormat.WireType.LengthDelimited);
-            output.WriteLength(4);
-            output.WriteTag(1, WireFormat.WireType.Varint);
-            output.WriteInt32(key3);
-            output.WriteTag(2, WireFormat.WireType.Varint);
-            output.WriteInt32(value3);
-
-            output.Flush();
-
-            MessageParsingHelpers.AssertReadingMessage(
-                TestMap.Parser,
-                memoryStream.ToArray(),
-                parsed =>
-                {
-                    var expected = new TestMap
-                    {
-                        MapInt32Int32 = { { key1, value1 }, { key3, value3 } },
-                        MapStringString = { { key2, value2 } }
-                    };
-                    Assert.AreEqual(expected, parsed);
-                });
-        }
-
-        [Test]
-        public void DuplicateKeys_LastEntryWins()
-        {
-            var memoryStream = new MemoryStream();
-            var output = new CodedOutputStream(memoryStream);
-
-            var key = 10;
-            var value1 = 20;
-            var value2 = 30;
-
-            // First entry
-            output.WriteTag(TestMap.MapInt32Int32FieldNumber, WireFormat.WireType.LengthDelimited);
-            output.WriteLength(4);
-            output.WriteTag(1, WireFormat.WireType.Varint);
-            output.WriteInt32(key);
-            output.WriteTag(2, WireFormat.WireType.Varint);
-            output.WriteInt32(value1);
-
-            // Second entry - same key, different value
-            output.WriteTag(TestMap.MapInt32Int32FieldNumber, WireFormat.WireType.LengthDelimited);
-            output.WriteLength(4);
-            output.WriteTag(1, WireFormat.WireType.Varint);
-            output.WriteInt32(key);
-            output.WriteTag(2, WireFormat.WireType.Varint);
-            output.WriteInt32(value2);
-            output.Flush();
-
-            MessageParsingHelpers.AssertReadingMessage(
-                TestMap.Parser,
-                memoryStream.ToArray(),
-                parsed =>
-                {
-                    Assert.AreEqual(value2, parsed.MapInt32Int32[key]);
-                });
-        }
-
-        [Test]
-        public void CloneSingleNonMessageValues()
-        {
-            var original = new TestAllTypes
-            {
-                SingleBool = true,
-                SingleBytes = ByteString.CopyFrom(1, 2, 3, 4),
-                SingleDouble = 23.5,
-                SingleFixed32 = 23,
-                SingleFixed64 = 1234567890123,
-                SingleFloat = 12.25f,
-                SingleInt32 = 100,
-                SingleInt64 = 3210987654321,
-                SingleNestedEnum = TestAllTypes.Types.NestedEnum.Foo,
-                SingleSfixed32 = -123,
-                SingleSfixed64 = -12345678901234,
-                SingleSint32 = -456,
-                SingleSint64 = -12345678901235,
-                SingleString = "test",
-                SingleUint32 = uint.MaxValue,
-                SingleUint64 = ulong.MaxValue
-            };
-            var clone = original.Clone();
-            Assert.AreNotSame(original, clone);
-            Assert.AreEqual(original, clone);
-            // Just as a single example
-            clone.SingleInt32 = 150;
-            Assert.AreNotEqual(original, clone);
-        }
-
-        [Test]
-        public void CloneRepeatedNonMessageValues()
-        {
-            var original = new TestAllTypes
-            {
-                RepeatedBool = { true, false },
-                RepeatedBytes = { ByteString.CopyFrom(1, 2, 3, 4), ByteString.CopyFrom(5, 6) },
-                RepeatedDouble = { -12.25, 23.5 },
-                RepeatedFixed32 = { uint.MaxValue, 23 },
-                RepeatedFixed64 = { ulong.MaxValue, 1234567890123 },
-                RepeatedFloat = { 100f, 12.25f },
-                RepeatedInt32 = { 100, 200 },
-                RepeatedInt64 = { 3210987654321, long.MaxValue },
-                RepeatedNestedEnum = { TestAllTypes.Types.NestedEnum.Foo, TestAllTypes.Types.NestedEnum.Neg },
-                RepeatedSfixed32 = { -123, 123 },
-                RepeatedSfixed64 = { -12345678901234, 12345678901234 },
-                RepeatedSint32 = { -456, 100 },
-                RepeatedSint64 = { -12345678901235, 123 },
-                RepeatedString = { "foo", "bar" },
-                RepeatedUint32 = { uint.MaxValue, uint.MinValue },
-                RepeatedUint64 = { ulong.MaxValue, uint.MinValue }
-            };
-
-            var clone = original.Clone();
-            Assert.AreNotSame(original, clone);
-            Assert.AreEqual(original, clone);
-            // Just as a single example
-            clone.RepeatedDouble.Add(25.5);
-            Assert.AreNotEqual(original, clone);
-        }
-
-        [Test]
-        public void CloneSingleMessageField()
-        {
-            var original = new TestAllTypes
-            {
-                SingleNestedMessage = new TestAllTypes.Types.NestedMessage { Bb = 20 }
-            };
-
-            var clone = original.Clone();
-            Assert.AreNotSame(original, clone);
-            Assert.AreNotSame(original.SingleNestedMessage, clone.SingleNestedMessage);
-            Assert.AreEqual(original, clone);
-
-            clone.SingleNestedMessage.Bb = 30;
-            Assert.AreNotEqual(original, clone);
-        }
-
-        [Test]
-        public void CloneRepeatedMessageField()
-        {
-            var original = new TestAllTypes
-            {
-                RepeatedNestedMessage = { new TestAllTypes.Types.NestedMessage { Bb = 20 } }
-            };
-
-            var clone = original.Clone();
-            Assert.AreNotSame(original, clone);
-            Assert.AreNotSame(original.RepeatedNestedMessage, clone.RepeatedNestedMessage);
-            Assert.AreNotSame(original.RepeatedNestedMessage[0], clone.RepeatedNestedMessage[0]);
-            Assert.AreEqual(original, clone);
-
-            clone.RepeatedNestedMessage[0].Bb = 30;
-            Assert.AreNotEqual(original, clone);
-        }
-
-        [Test]
-        public void CloneOneofField()
-        {
-            var original = new TestAllTypes
-            {
-                OneofNestedMessage = new TestAllTypes.Types.NestedMessage { Bb = 20 }
-            };
-
-            var clone = original.Clone();
-            Assert.AreNotSame(original, clone);
-            Assert.AreEqual(original, clone);
-
-            // We should have cloned the message
-            original.OneofNestedMessage.Bb = 30;
-            Assert.AreNotEqual(original, clone);
-        }
-
-        [Test]
-        public void OneofProperties()
-        {
-            // Switch the oneof case between each of the different options, and check everything behaves
-            // as expected in each case.
-            var message = new TestAllTypes();
-            Assert.AreEqual("", message.OneofString);
-            Assert.AreEqual(0, message.OneofUint32);
-            Assert.AreEqual(ByteString.Empty, message.OneofBytes);
-            Assert.IsNull(message.OneofNestedMessage);
-            Assert.AreEqual(TestAllTypes.OneofFieldOneofCase.None, message.OneofFieldCase);
-
-            message.OneofString = "sample";
-            Assert.AreEqual("sample", message.OneofString);
-            Assert.AreEqual(0, message.OneofUint32);
-            Assert.AreEqual(ByteString.Empty, message.OneofBytes);
-            Assert.IsNull(message.OneofNestedMessage);
-            Assert.AreEqual(TestAllTypes.OneofFieldOneofCase.OneofString, message.OneofFieldCase);
-
-            var bytes = ByteString.CopyFrom(1, 2, 3);
-            message.OneofBytes = bytes;
-            Assert.AreEqual("", message.OneofString);
-            Assert.AreEqual(0, message.OneofUint32);
-            Assert.AreEqual(bytes, message.OneofBytes);
-            Assert.IsNull(message.OneofNestedMessage);
-            Assert.AreEqual(TestAllTypes.OneofFieldOneofCase.OneofBytes, message.OneofFieldCase);
-
-            message.OneofUint32 = 20;
-            Assert.AreEqual("", message.OneofString);
-            Assert.AreEqual(20, message.OneofUint32);
-            Assert.AreEqual(ByteString.Empty, message.OneofBytes);
-            Assert.IsNull(message.OneofNestedMessage);
-            Assert.AreEqual(TestAllTypes.OneofFieldOneofCase.OneofUint32, message.OneofFieldCase);
-
-            var nestedMessage = new TestAllTypes.Types.NestedMessage { Bb = 25 };
-            message.OneofNestedMessage = nestedMessage;
-            Assert.AreEqual("", message.OneofString);
-            Assert.AreEqual(0, message.OneofUint32);
-            Assert.AreEqual(ByteString.Empty, message.OneofBytes);
-            Assert.AreEqual(nestedMessage, message.OneofNestedMessage);
-            Assert.AreEqual(TestAllTypes.OneofFieldOneofCase.OneofNestedMessage, message.OneofFieldCase);
-
-            message.ClearOneofField();
-            Assert.AreEqual("", message.OneofString);
-            Assert.AreEqual(0, message.OneofUint32);
-            Assert.AreEqual(ByteString.Empty, message.OneofBytes);
-            Assert.IsNull(message.OneofNestedMessage);
-            Assert.AreEqual(TestAllTypes.OneofFieldOneofCase.None, message.OneofFieldCase);
-        }
-
-        [Test]
-        public void Oneof_DefaultValuesNotEqual()
-        {
-            var message1 = new TestAllTypes { OneofString = "" };
-            var message2 = new TestAllTypes { OneofUint32 = 0 };
-            Assert.AreEqual(TestAllTypes.OneofFieldOneofCase.OneofString, message1.OneofFieldCase);
-            Assert.AreEqual(TestAllTypes.OneofFieldOneofCase.OneofUint32, message2.OneofFieldCase);
-            Assert.AreNotEqual(message1, message2);
-        }
-
-        [Test]
-        public void OneofSerialization_NonDefaultValue()
-        {
-            var message = new TestAllTypes();
-            message.OneofString = "this would take a bit of space";
-            message.OneofUint32 = 10;
-            var bytes = message.ToByteArray();
-            Assert.AreEqual(3, bytes.Length); // 2 bytes for the tag + 1 for the value - no string!
-
-            MessageParsingHelpers.AssertWritingMessage(message);
-
-            MessageParsingHelpers.AssertRoundtrip(TestAllTypes.Parser, message, parsedMessage =>
-            {
-                Assert.AreEqual(TestAllTypes.OneofFieldOneofCase.OneofUint32, parsedMessage.OneofFieldCase);
-            });
-        }
-
-        [Test]
-        public void OneofSerialization_DefaultValue()
-        {
-            var message = new TestAllTypes();
-            message.OneofString = "this would take a bit of space";
-            message.OneofUint32 = 0; // This is the default value for UInt32; normally wouldn't be serialized
-            var bytes = message.ToByteArray();
-            Assert.AreEqual(3, bytes.Length); // 2 bytes for the tag + 1 for the value - it's still serialized
-
-            MessageParsingHelpers.AssertWritingMessage(message);
-
-            MessageParsingHelpers.AssertRoundtrip(TestAllTypes.Parser, message, parsedMessage =>
-            {
-                Assert.AreEqual(TestAllTypes.OneofFieldOneofCase.OneofUint32, parsedMessage.OneofFieldCase);
-            });
-        }
-
-        [Test]
-        public void DiscardUnknownFields_RealDataStillRead()
-        {
-            var message = SampleMessages.CreateFullTestAllTypes();
-            var stream = new MemoryStream();
-            var output = new CodedOutputStream(stream);
-            var unusedFieldNumber = 23456;
-            Assert.IsFalse(TestAllTypes.Descriptor.Fields.InDeclarationOrder().Select(x => x.FieldNumber).Contains(unusedFieldNumber));
-            output.WriteTag(unusedFieldNumber, WireFormat.WireType.LengthDelimited);
-            output.WriteString("ignore me");
-            message.WriteTo(output);
-            output.Flush();
-
-            MessageParsingHelpers.AssertReadingMessage(
-                TestAllTypes.Parser,
-                stream.ToArray(),
-                parsed =>
-                {
-                    // TODO(jieluo): Add test back when DiscardUnknownFields API is supported.
-                    // Assert.AreEqual(message, parsed);
-                });
-        }
-
-        [Test]
-        public void DiscardUnknownFields_AllTypes()
-        {
-            // Simple way of ensuring we can skip all kinds of fields.
-            var data = SampleMessages.CreateFullTestAllTypes().ToByteArray();
-            var empty = Empty.Parser.ParseFrom(data);
-
-            MessageParsingHelpers.AssertReadingMessage(
-                Empty.Parser,
-                data,
-                parsed =>
-                {
-                    // TODO(jieluo): Add test back when DiscardUnknownFields API is supported.
-                    // Assert.AreNotEqual(new Empty(), empty);
-                });
-        }
-
-        // This was originally seen as a conformance test failure.
-        [Test]
-        public void TruncatedMessageFieldThrows()
-        {
-            // 130, 3 is the message tag
-            // 1 is the data length - but there's no data.
-            var data = new byte[] { 130, 3, 1 };
-            MessageParsingHelpers.AssertReadingMessageThrows<TestAllTypes, InvalidProtocolBufferException>(TestAllTypes.Parser, data);
-        }
-
-        /// <summary>
-        /// Demonstrates current behaviour with an extraneous end group tag - see issue 688
-        /// for details; we may want to change this.
-        /// </summary>
-        [Test]
-        public void ExtraEndGroupThrows()
-        {
-            var message = SampleMessages.CreateFullTestAllTypes();
-            var stream = new MemoryStream();
-            var output = new CodedOutputStream(stream);
-
-            output.WriteTag(TestAllTypes.SingleFixed32FieldNumber, WireFormat.WireType.Fixed32);
-            output.WriteFixed32(123);
-            output.WriteTag(100, WireFormat.WireType.EndGroup);
-
-            output.Flush();
-
-            stream.Position = 0;
-            MessageParsingHelpers.AssertReadingMessageThrows<TestAllTypes, InvalidProtocolBufferException>(TestAllTypes.Parser, stream.ToArray());
-        }
-
-        [Test]
-        public void CustomDiagnosticMessage_DirectToStringCall()
-        {
-            var message = new ForeignMessage { C = 31 };
-            Assert.AreEqual("{ \"c\": 31, \"@cInHex\": \"1f\" }", message.ToString());
-            Assert.AreEqual("{ \"c\": 31 }", JsonFormatter.Default.Format(message));
-        }
-
-        [Test]
-        public void CustomDiagnosticMessage_Nested()
-        {
-            var message = new TestAllTypes { SingleForeignMessage = new ForeignMessage { C = 16 } };
-            Assert.AreEqual("{ \"singleForeignMessage\": { \"c\": 16, \"@cInHex\": \"10\" } }", message.ToString());
-            Assert.AreEqual("{ \"singleForeignMessage\": { \"c\": 16 } }", JsonFormatter.Default.Format(message));
-        }
-
-        [Test]
-        public void CustomDiagnosticMessage_DirectToTextWriterCall()
-        {
-            var message = new ForeignMessage { C = 31 };
-            var writer = new StringWriter();
-            JsonFormatter.Default.Format(message, writer);
-            Assert.AreEqual("{ \"c\": 31 }", writer.ToString());
-        }
-
-        [Test]
-        public void NaNComparisons()
-        {
-            var message1 = new TestAllTypes { SingleDouble = SampleNaNs.Regular };
-            var message2 = new TestAllTypes { SingleDouble = SampleNaNs.PayloadFlipped };
-            var message3 = new TestAllTypes { SingleDouble = SampleNaNs.Regular };
-
-            EqualityTester.AssertInequality(message1, message2);
-            EqualityTester.AssertEquality(message1, message3);
-        }
-    }
-}
\ No newline at end of file
diff --git a/libs/protobuf/csharp/src/Google.Protobuf.Test/Google.Protobuf.Test.csproj b/libs/protobuf/csharp/src/Google.Protobuf.Test/Google.Protobuf.Test.csproj
deleted file mode 100644
index fe5ff80..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf.Test/Google.Protobuf.Test.csproj
+++ /dev/null
@@ -1,31 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFrameworks>net462;netcoreapp3.1;net60</TargetFrameworks>
-    <AssemblyOriginatorKeyFile>../../keys/Google.Protobuf.snk</AssemblyOriginatorKeyFile>
-    <SignAssembly>true</SignAssembly>
-    <IsPackable>False</IsPackable>
-    <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\Google.Protobuf\Google.Protobuf.csproj" />
-    <ProjectReference Include="..\Google.Protobuf.Test.TestProtos\Google.Protobuf.Test.TestProtos.csproj"/>
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
-    <PackageReference Include="NUnit" Version="3.13.3" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
-  </ItemGroup>
-
-  <!-- Needed for the net45 build to work on Unix. See https://github.com/dotnet/designs/pull/33 -->
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2" PrivateAssets="All" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <EmbeddedResource Include="testprotos.pb" />
-  </ItemGroup>
-
-</Project>
diff --git a/libs/protobuf/csharp/src/Google.Protobuf.Test/IssuesTest.cs b/libs/protobuf/csharp/src/Google.Protobuf.Test/IssuesTest.cs
deleted file mode 100644
index 6953989..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf.Test/IssuesTest.cs
+++ /dev/null
@@ -1,132 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using Google.Protobuf.Reflection;
-using UnitTest.Issues.TestProtos;
-using NUnit.Framework;
-using System.IO;
-using static UnitTest.Issues.TestProtos.OneofMerging.Types;
-
-namespace Google.Protobuf
-{
-    /// <summary>
-    /// Tests for issues which aren't easily compartmentalized into other unit tests.
-    /// </summary>
-    public class IssuesTest
-    {
-        // Issue 45
-        [Test]
-        public void FieldCalledItem()
-        {
-            ItemField message = new ItemField { Item = 3 };
-            FieldDescriptor field = ItemField.Descriptor.FindFieldByName("item");
-            Assert.NotNull(field);
-            Assert.AreEqual(3, (int)field.Accessor.GetValue(message));
-        }
-
-        [Test]
-        public void ReservedNames()
-        {
-            var message = new ReservedNames { Types_ = 10, Descriptor_ = 20 };
-            // Underscores aren't reflected in the JSON.
-            Assert.AreEqual("{ \"types\": 10, \"descriptor\": 20 }", message.ToString());
-        }
-
-        [Test]
-        public void JsonNameParseTest()
-        {
-            var settings = new JsonParser.Settings(10, TypeRegistry.FromFiles(UnittestIssuesReflection.Descriptor));
-            var parser = new JsonParser(settings);
-
-            // It is safe to use either original field name or explicitly specified json_name
-            Assert.AreEqual(new TestJsonName { Name = "test", Description = "test2", Guid = "test3" },
-                parser.Parse<TestJsonName>("{ \"name\": \"test\", \"desc\": \"test2\", \"guid\": \"test3\" }"));
-        }
-
-        [Test]
-        public void JsonNameFormatTest()
-        {
-            var message = new TestJsonName { Name = "test", Description = "test2", Guid = "test3" };
-            Assert.AreEqual("{ \"name\": \"test\", \"desc\": \"test2\", \"exid\": \"test3\" }",
-                JsonFormatter.Default.Format(message));
-        }
-
-        [Test]
-        public void OneofMerging()
-        {
-            var message1 = new OneofMerging { Nested = new Nested { X = 10 } };
-            var message2 = new OneofMerging { Nested = new Nested { Y = 20 } };
-            var expected = new OneofMerging { Nested = new Nested { X = 10, Y = 20 } };
-
-            var merged = message1.Clone();
-            merged.MergeFrom(message2);
-            Assert.AreEqual(expected, merged);
-        }
-
-        // Check that a tag immediately followed by end of limit can still be read.
-        [Test]
-        public void CodedInputStream_LimitReachedRightAfterTag()
-        {
-            MemoryStream ms = new MemoryStream();
-            var cos = new CodedOutputStream(ms);
-            cos.WriteTag(11, WireFormat.WireType.Varint);
-            Assert.AreEqual(1, cos.Position);
-            cos.WriteString("some extra padding");  // ensure is currentLimit distinct from the end of the buffer.
-            cos.Flush();
-
-            var cis = new CodedInputStream(ms.ToArray());
-            cis.PushLimit(1);  // make sure we reach the limit right after reading the tag.
-
-            // we still must read the tag correctly, even though the tag is at the very end of our limited input
-            // (which is a corner case and will most likely result in an error when trying to read value of the field
-            // described by this tag, but it would be a logical error not to read the tag that's actually present).
-            // See https://github.com/protocolbuffers/protobuf/pull/7289
-            cis.AssertNextTag(WireFormat.MakeTag(11, WireFormat.WireType.Varint));
-        }
-
-        [Test]
-        public void NoneFieldInOneof()
-        {
-            var message = new OneofWithNoneField();
-            var emptyHashCode = message.GetHashCode();
-            Assert.AreEqual(OneofWithNoneField.TestOneofCase.None, message.TestCase);
-            message.None = "test";
-            Assert.AreEqual(OneofWithNoneField.TestOneofCase.None_, message.TestCase);
-            Assert.AreNotEqual(emptyHashCode, message.GetHashCode());
-
-            var bytes = message.ToByteArray();
-            var parsed = OneofWithNoneField.Parser.ParseFrom(bytes);
-            Assert.AreEqual(message, parsed);
-            Assert.AreEqual("test", parsed.None);
-        }
-    }
-}
diff --git a/libs/protobuf/csharp/src/Google.Protobuf.Test/JsonFormatterTest.cs b/libs/protobuf/csharp/src/Google.Protobuf.Test/JsonFormatterTest.cs
deleted file mode 100644
index 3a77990..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf.Test/JsonFormatterTest.cs
+++ /dev/null
@@ -1,705 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-using Google.Protobuf.TestProtos;
-using NUnit.Framework;
-using UnitTest.Issues.TestProtos;
-using Google.Protobuf.WellKnownTypes;
-using Google.Protobuf.Reflection;
-
-using static Google.Protobuf.JsonParserTest; // For WrapInQuotes
-using System.IO;
-using Google.Protobuf.Collections;
-using ProtobufUnittest;
-
-namespace Google.Protobuf
-{
-    /// <summary>
-    /// Tests for the JSON formatter. Note that in these tests, double quotes are replaced with apostrophes
-    /// for the sake of readability (embedding \" everywhere is painful). See the AssertJson method for details.
-    /// </summary>
-    public class JsonFormatterTest
-    {
-        [Test]
-        public void DefaultValues_WhenOmitted()
-        {
-            var formatter = JsonFormatter.Default;
-
-            AssertJson("{ }", formatter.Format(new ForeignMessage()));
-            AssertJson("{ }", formatter.Format(new TestAllTypes()));
-            AssertJson("{ }", formatter.Format(new TestMap()));
-        }
-
-        [Test]
-        public void DefaultValues_WhenIncluded()
-        {
-            var formatter = new JsonFormatter(JsonFormatter.Settings.Default.WithFormatDefaultValues(true));
-            AssertJson("{ 'c': 0 }", formatter.Format(new ForeignMessage()));
-        }
-
-        [Test]
-        public void EnumAllowAlias()
-        {
-            var message = new TestEnumAllowAlias
-            {
-                Value = TestEnumWithDupValue.Foo2,
-            };
-            var actualText = JsonFormatter.Default.Format(message);
-            var expectedText = "{ 'value': 'FOO1' }";
-            AssertJson(expectedText, actualText);
-        }
-
-        [Test]
-        public void EnumAsInt()
-        {
-            var message = new TestAllTypes
-            {
-                SingleForeignEnum = ForeignEnum.ForeignBar,
-                RepeatedForeignEnum = { ForeignEnum.ForeignBaz, (ForeignEnum) 100, ForeignEnum.ForeignFoo }
-            };
-            var formatter = new JsonFormatter(JsonFormatter.Settings.Default.WithFormatEnumsAsIntegers(true));
-            var actualText = formatter.Format(message);
-            var expectedText = "{ " +
-                               "'singleForeignEnum': 5, " +
-                               "'repeatedForeignEnum': [ 6, 100, 4 ]" +
-                               " }";
-            AssertJson(expectedText, actualText);
-        }
-
-        [Test]
-        public void AllSingleFields()
-        {
-            var message = new TestAllTypes
-            {
-                SingleBool = true,
-                SingleBytes = ByteString.CopyFrom(1, 2, 3, 4),
-                SingleDouble = 23.5,
-                SingleFixed32 = 23,
-                SingleFixed64 = 1234567890123,
-                SingleFloat = 12.25f,
-                SingleForeignEnum = ForeignEnum.ForeignBar,
-                SingleForeignMessage = new ForeignMessage { C = 10 },
-                SingleImportEnum = ImportEnum.ImportBaz,
-                SingleImportMessage = new ImportMessage { D = 20 },
-                SingleInt32 = 100,
-                SingleInt64 = 3210987654321,
-                SingleNestedEnum = TestAllTypes.Types.NestedEnum.Foo,
-                SingleNestedMessage = new TestAllTypes.Types.NestedMessage { Bb = 35 },
-                SinglePublicImportMessage = new PublicImportMessage { E = 54 },
-                SingleSfixed32 = -123,
-                SingleSfixed64 = -12345678901234,
-                SingleSint32 = -456,
-                SingleSint64 = -12345678901235,
-                SingleString = "test\twith\ttabs",
-                SingleUint32 = uint.MaxValue,
-                SingleUint64 = ulong.MaxValue,
-            };
-            var actualText = JsonFormatter.Default.Format(message);
-
-            // Fields in numeric order
-            var expectedText = "{ " +
-                "'singleInt32': 100, " +
-                "'singleInt64': '3210987654321', " +
-                "'singleUint32': 4294967295, " +
-                "'singleUint64': '18446744073709551615', " +
-                "'singleSint32': -456, " +
-                "'singleSint64': '-12345678901235', " +
-                "'singleFixed32': 23, " +
-                "'singleFixed64': '1234567890123', " +
-                "'singleSfixed32': -123, " +
-                "'singleSfixed64': '-12345678901234', " +
-                "'singleFloat': 12.25, " +
-                "'singleDouble': 23.5, " +
-                "'singleBool': true, " +
-                "'singleString': 'test\\twith\\ttabs', " +
-                "'singleBytes': 'AQIDBA==', " +
-                "'singleNestedMessage': { 'bb': 35 }, " +
-                "'singleForeignMessage': { 'c': 10 }, " +
-                "'singleImportMessage': { 'd': 20 }, " +
-                "'singleNestedEnum': 'FOO', " +
-                "'singleForeignEnum': 'FOREIGN_BAR', " +
-                "'singleImportEnum': 'IMPORT_BAZ', " +
-                "'singlePublicImportMessage': { 'e': 54 }" +
-                " }";
-            AssertJson(expectedText, actualText);
-        }
-
-        [Test]
-        public void WithFormatDefaultValues_DoesNotAffectMessageFields()
-        {
-            var message = new TestAllTypes();
-            var formatter = new JsonFormatter(JsonFormatter.Settings.Default.WithFormatDefaultValues(true));
-            var json = formatter.Format(message);
-            Assert.IsFalse(json.Contains("\"singleNestedMessage\""));
-            Assert.IsFalse(json.Contains("\"singleForeignMessage\""));
-            Assert.IsFalse(json.Contains("\"singleImportMessage\""));
-        }
-
-        [Test]
-        public void WithFormatDefaultValues_DoesNotAffectProto3OptionalFields()
-        {
-            var message = new TestProto3Optional();
-            message.OptionalInt32 = 0;
-            var formatter = new JsonFormatter(JsonFormatter.Settings.Default.WithFormatDefaultValues(true));
-            var json = formatter.Format(message);
-            // The non-optional proto3 fields are formatted, as is the optional-but-specified field.
-            AssertJson("{ 'optionalInt32': 0, 'singularInt32': 0, 'singularInt64': '0' }", json);
-        }
-
-        [Test]
-        public void WithFormatDefaultValues_DoesNotAffectProto2Fields()
-        {
-            var message = new TestProtos.Proto2.ForeignMessage();
-            message.C = 0;
-            var formatter = new JsonFormatter(JsonFormatter.Settings.Default.WithFormatDefaultValues(true));
-            var json = formatter.Format(message);
-            // The specified field is formatted, but the non-specified field (d) is not.
-            AssertJson("{ 'c': 0 }", json);
-        }
-
-        [Test]
-        public void WithFormatDefaultValues_DoesNotAffectOneofFields()
-        {
-            var message = new TestOneof();
-            var formatter = new JsonFormatter(JsonFormatter.Settings.Default.WithFormatDefaultValues(true));
-            var json = formatter.Format(message);
-            AssertJson("{ }", json);
-        }
-
-        [Test]
-        public void RepeatedField()
-        {
-            AssertJson("{ 'repeatedInt32': [ 1, 2, 3, 4, 5 ] }",
-                JsonFormatter.Default.Format(new TestAllTypes { RepeatedInt32 = { 1, 2, 3, 4, 5 } }));
-        }
-
-        [Test]
-        public void MapField_StringString()
-        {
-            AssertJson("{ 'mapStringString': { 'with spaces': 'bar', 'a': 'b' } }",
-                JsonFormatter.Default.Format(new TestMap { MapStringString = { { "with spaces", "bar" }, { "a", "b" } } }));
-        }
-
-        [Test]
-        public void MapField_Int32Int32()
-        {
-            // The keys are quoted, but the values aren't.
-            AssertJson("{ 'mapInt32Int32': { '0': 1, '2': 3 } }",
-                JsonFormatter.Default.Format(new TestMap { MapInt32Int32 = { { 0, 1 }, { 2, 3 } } }));
-        }
-
-        [Test]
-        public void MapField_BoolBool()
-        {
-            // The keys are quoted, but the values aren't.
-            AssertJson("{ 'mapBoolBool': { 'false': true, 'true': false } }",
-                JsonFormatter.Default.Format(new TestMap { MapBoolBool = { { false, true }, { true, false } } }));
-        }
-
-        [Test]
-        public void NullValueOutsideStruct()
-        {
-            var message = new NullValueOutsideStruct { NullValue = NullValue.NullValue };
-            AssertJson("{ 'nullValue': null }", JsonFormatter.Default.Format(message));
-        }
-
-        [Test]
-        public void NullValueNotInOneof()
-        {
-            var message = new NullValueNotInOneof();
-            AssertJson("{ }", JsonFormatter.Default.Format(message));
-        }
-
-        [Test]
-        public void NullValueNotInOneof_FormatDefaults()
-        {
-            var formatter = new JsonFormatter(JsonFormatter.Settings.Default.WithFormatDefaultValues(true));
-            var message = new NullValueNotInOneof();
-            AssertJson("{ 'nullValue': null }", formatter.Format(message));
-        }
-
-        [TestCase(1.0, "1")]
-        [TestCase(double.NaN, "'NaN'")]
-        [TestCase(double.PositiveInfinity, "'Infinity'")]
-        [TestCase(double.NegativeInfinity, "'-Infinity'")]
-        public void DoubleRepresentations(double value, string expectedValueText)
-        {
-            var message = new TestAllTypes { SingleDouble = value };
-            string actualText = JsonFormatter.Default.Format(message);
-            string expectedText = "{ 'singleDouble': " + expectedValueText + " }";
-            AssertJson(expectedText, actualText);
-        }
-
-        [Test]
-        public void UnknownEnumValueNumeric_SingleField()
-        {
-            var message = new TestAllTypes { SingleForeignEnum = (ForeignEnum) 100 };
-            AssertJson("{ 'singleForeignEnum': 100 }", JsonFormatter.Default.Format(message));
-        }
-
-        [Test]
-        public void UnknownEnumValueNumeric_RepeatedField()
-        {
-            var message = new TestAllTypes { RepeatedForeignEnum = { ForeignEnum.ForeignBaz, (ForeignEnum) 100, ForeignEnum.ForeignFoo } };
-            AssertJson("{ 'repeatedForeignEnum': [ 'FOREIGN_BAZ', 100, 'FOREIGN_FOO' ] }", JsonFormatter.Default.Format(message));
-        }
-
-        [Test]
-        public void UnknownEnumValueNumeric_MapField()
-        {
-            var message = new TestMap { MapInt32Enum = { { 1, MapEnum.Foo }, { 2, (MapEnum) 100 }, { 3, MapEnum.Bar } } };
-            AssertJson("{ 'mapInt32Enum': { '1': 'MAP_ENUM_FOO', '2': 100, '3': 'MAP_ENUM_BAR' } }", JsonFormatter.Default.Format(message));
-        }
-
-        [Test]
-        public void UnknownEnumValue_RepeatedField_AllEntriesUnknown()
-        {
-            var message = new TestAllTypes { RepeatedForeignEnum = { (ForeignEnum) 200, (ForeignEnum) 100 } };
-            AssertJson("{ 'repeatedForeignEnum': [ 200, 100 ] }", JsonFormatter.Default.Format(message));
-        }
-
-        [Test]
-        [TestCase("a\u17b4b", "a\\u17b4b")] // Explicit
-        [TestCase("a\u0601b", "a\\u0601b")] // Ranged
-        [TestCase("a\u0605b", "a\u0605b")] // Passthrough (note lack of double backslash...)
-        public void SimpleNonAscii(string text, string encoded)
-        {
-            var message = new TestAllTypes { SingleString = text };
-            AssertJson("{ 'singleString': '" + encoded + "' }", JsonFormatter.Default.Format(message));
-        }
-
-        [Test]
-        public void SurrogatePairEscaping()
-        {
-            var message = new TestAllTypes { SingleString = "a\uD801\uDC01b" };
-            AssertJson("{ 'singleString': 'a\\ud801\\udc01b' }", JsonFormatter.Default.Format(message));
-        }
-
-        [Test]
-        public void InvalidSurrogatePairsFail()
-        {
-            // Note: don't use TestCase for these, as the strings can't be reliably represented
-            // See http://codeblog.jonskeet.uk/2014/11/07/when-is-a-string-not-a-string/
-
-            // Lone low surrogate
-            var message = new TestAllTypes { SingleString = "a\uDC01b" };
-            Assert.Throws<ArgumentException>(() => JsonFormatter.Default.Format(message));
-
-            // Lone high surrogate
-            message = new TestAllTypes { SingleString = "a\uD801b" };
-            Assert.Throws<ArgumentException>(() => JsonFormatter.Default.Format(message));
-        }
-
-        [Test]
-        [TestCase("foo_bar", "fooBar")]
-        [TestCase("bananaBanana", "bananaBanana")]
-        [TestCase("BANANABanana", "BANANABanana")]
-        [TestCase("simple", "simple")]
-        [TestCase("ACTION_AND_ADVENTURE", "ACTIONANDADVENTURE")]
-        [TestCase("action_and_adventure", "actionAndAdventure")]
-        [TestCase("kFoo", "kFoo")]
-        [TestCase("HTTPServer", "HTTPServer")]
-        [TestCase("CLIENT", "CLIENT")]
-        public void ToJsonName(string original, string expected)
-        {
-            Assert.AreEqual(expected, JsonFormatter.ToJsonName(original));
-        }
-
-        [Test]
-        [TestCase(null, "{ }")]
-        [TestCase("x", "{ 'fooString': 'x' }")]
-        [TestCase("", "{ 'fooString': '' }")]
-        public void Oneof(string fooStringValue, string expectedJson)
-        {
-            var message = new TestOneof();
-            if (fooStringValue != null)
-            {
-                message.FooString = fooStringValue;
-            }
-
-            // We should get the same result both with and without "format default values".
-            var formatter = JsonFormatter.Default;
-            AssertJson(expectedJson, formatter.Format(message));
-            formatter = new JsonFormatter(JsonFormatter.Settings.Default.WithFormatDefaultValues(true));
-            AssertJson(expectedJson, formatter.Format(message));
-        }
-
-        [Test]
-        public void WrapperFormatting_Single()
-        {
-            // Just a few examples, handling both classes and value types, and
-            // default vs non-default values
-            var message = new TestWellKnownTypes
-            {
-                Int64Field = 10,
-                Int32Field = 0,
-                BytesField = ByteString.FromBase64("ABCD"),
-                StringField = ""
-            };
-            var expectedJson = "{ 'int64Field': '10', 'int32Field': 0, 'stringField': '', 'bytesField': 'ABCD' }";
-            AssertJson(expectedJson, JsonFormatter.Default.Format(message));
-        }
-
-        [Test]
-        public void WrapperFormatting_Message()
-        {
-            Assert.AreEqual("\"\"", JsonFormatter.Default.Format(new StringValue()));
-            Assert.AreEqual("0", JsonFormatter.Default.Format(new Int32Value()));
-        }
-
-        [Test]
-        public void WrapperFormatting_FormatDefaultValuesDoesNotFormatNull()
-        {
-            // The actual JSON here is very large because there are lots of fields. Just test a couple of them.
-            var message = new TestWellKnownTypes { Int32Field = 10 };
-            var formatter = new JsonFormatter(JsonFormatter.Settings.Default.WithFormatDefaultValues(true));
-            var actualJson = formatter.Format(message);
-            // This *used* to include "int64Field": null, but that was a bug.
-            // WithDefaultValues should not affect message fields, including wrapper types.
-            Assert.IsFalse(actualJson.Contains("\"int64Field\": null"));
-            Assert.IsTrue(actualJson.Contains("\"int32Field\": 10"));
-        }
-
-        [Test]
-        public void OutputIsInNumericFieldOrder_NoDefaults()
-        {
-            var formatter = JsonFormatter.Default;
-            var message = new TestJsonFieldOrdering { PlainString = "p1", PlainInt32 = 2 };
-            AssertJson("{ 'plainString': 'p1', 'plainInt32': 2 }", formatter.Format(message));
-            message = new TestJsonFieldOrdering { O1Int32 = 5, O2String = "o2", PlainInt32 = 10, PlainString = "plain" };
-            AssertJson("{ 'plainString': 'plain', 'o2String': 'o2', 'plainInt32': 10, 'o1Int32': 5 }", formatter.Format(message));
-            message = new TestJsonFieldOrdering { O1String = "", O2Int32 = 0, PlainInt32 = 10, PlainString = "plain" };
-            AssertJson("{ 'plainString': 'plain', 'o1String': '', 'plainInt32': 10, 'o2Int32': 0 }", formatter.Format(message));
-        }
-
-        [Test]
-        public void OutputIsInNumericFieldOrder_WithDefaults()
-        {
-            var formatter = new JsonFormatter(JsonFormatter.Settings.Default.WithFormatDefaultValues(true));
-            var message = new TestJsonFieldOrdering();
-            AssertJson("{ 'plainString': '', 'plainInt32': 0 }", formatter.Format(message));
-            message = new TestJsonFieldOrdering { O1Int32 = 5, O2String = "o2", PlainInt32 = 10, PlainString = "plain" };
-            AssertJson("{ 'plainString': 'plain', 'o2String': 'o2', 'plainInt32': 10, 'o1Int32': 5 }", formatter.Format(message));
-            message = new TestJsonFieldOrdering { O1String = "", O2Int32 = 0, PlainInt32 = 10, PlainString = "plain" };
-            AssertJson("{ 'plainString': 'plain', 'o1String': '', 'plainInt32': 10, 'o2Int32': 0 }", formatter.Format(message));
-        }
-
-        [Test]
-        [TestCase("1970-01-01T00:00:00Z", 0)]
-        [TestCase("1970-01-01T00:00:00.000000001Z", 1)]
-        [TestCase("1970-01-01T00:00:00.000000010Z", 10)]
-        [TestCase("1970-01-01T00:00:00.000000100Z", 100)]
-        [TestCase("1970-01-01T00:00:00.000001Z", 1000)]
-        [TestCase("1970-01-01T00:00:00.000010Z", 10000)]
-        [TestCase("1970-01-01T00:00:00.000100Z", 100000)]
-        [TestCase("1970-01-01T00:00:00.001Z", 1000000)]
-        [TestCase("1970-01-01T00:00:00.010Z", 10000000)]
-        [TestCase("1970-01-01T00:00:00.100Z", 100000000)]
-        [TestCase("1970-01-01T00:00:00.120Z", 120000000)]
-        [TestCase("1970-01-01T00:00:00.123Z", 123000000)]
-        [TestCase("1970-01-01T00:00:00.123400Z", 123400000)]
-        [TestCase("1970-01-01T00:00:00.123450Z", 123450000)]
-        [TestCase("1970-01-01T00:00:00.123456Z", 123456000)]
-        [TestCase("1970-01-01T00:00:00.123456700Z", 123456700)]
-        [TestCase("1970-01-01T00:00:00.123456780Z", 123456780)]
-        [TestCase("1970-01-01T00:00:00.123456789Z", 123456789)]
-        public void TimestampStandalone(string expected, int nanos)
-        {
-            Assert.AreEqual(WrapInQuotes(expected), new Timestamp { Nanos = nanos }.ToString());
-        }
-
-        [Test]
-        public void TimestampStandalone_FromDateTime()
-        {
-            // One before and one after the Unix epoch, more easily represented via DateTime.
-            Assert.AreEqual("\"1673-06-19T12:34:56Z\"",
-                new DateTime(1673, 6, 19, 12, 34, 56, DateTimeKind.Utc).ToTimestamp().ToString());
-            Assert.AreEqual("\"2015-07-31T10:29:34Z\"",
-                new DateTime(2015, 7, 31, 10, 29, 34, DateTimeKind.Utc).ToTimestamp().ToString());
-        }
-
-        [Test]
-        [TestCase(-1, -1)] // Would be valid as duration
-        [TestCase(1, Timestamp.MaxNanos + 1)]
-        [TestCase(Timestamp.UnixSecondsAtBclMaxValue + 1, 0)]
-        [TestCase(Timestamp.UnixSecondsAtBclMinValue - 1, 0)]
-        public void TimestampStandalone_NonNormalized(long seconds, int nanoseconds)
-        {
-            var timestamp = new Timestamp { Seconds = seconds, Nanos = nanoseconds };
-            Assert.Throws<InvalidOperationException>(() => JsonFormatter.Default.Format(timestamp));
-        }
-
-        [Test]
-        public void TimestampField()
-        {
-            var message = new TestWellKnownTypes { TimestampField = new Timestamp() };
-            AssertJson("{ 'timestampField': '1970-01-01T00:00:00Z' }", JsonFormatter.Default.Format(message));
-        }
-
-        [Test]
-        [TestCase(0, 0, "0s")]
-        [TestCase(1, 0, "1s")]
-        [TestCase(-1, 0, "-1s")]
-        [TestCase(0, 1, "0.000000001s")]
-        [TestCase(0, 10, "0.000000010s")]
-        [TestCase(0, 100, "0.000000100s")]
-        [TestCase(0, 1000, "0.000001s")]
-        [TestCase(0, 10000, "0.000010s")]
-        [TestCase(0, 100000, "0.000100s")]
-        [TestCase(0, 1000000, "0.001s")]
-        [TestCase(0, 10000000, "0.010s")]
-        [TestCase(0, 100000000, "0.100s")]
-        [TestCase(0, 120000000, "0.120s")]
-        [TestCase(0, 123000000, "0.123s")]
-        [TestCase(0, 123400000, "0.123400s")]
-        [TestCase(0, 123450000, "0.123450s")]
-        [TestCase(0, 123456000, "0.123456s")]
-        [TestCase(0, 123456700, "0.123456700s")]
-        [TestCase(0, 123456780, "0.123456780s")]
-        [TestCase(0, 123456789, "0.123456789s")]
-        [TestCase(0, -100000000, "-0.100s")]
-        [TestCase(1, 100000000, "1.100s")]
-        [TestCase(-1, -100000000, "-1.100s")]
-        public void DurationStandalone(long seconds, int nanoseconds, string expected)
-        {
-            var json = JsonFormatter.Default.Format(new Duration { Seconds = seconds, Nanos = nanoseconds });
-            Assert.AreEqual(WrapInQuotes(expected), json);
-        }
-
-        [Test]
-        [TestCase(1, 2123456789)]
-        [TestCase(1, -100000000)]
-        public void DurationStandalone_NonNormalized(long seconds, int nanoseconds)
-        {
-            var duration = new Duration { Seconds = seconds, Nanos = nanoseconds };
-            Assert.Throws<InvalidOperationException>(() => JsonFormatter.Default.Format(duration));
-        }
-
-        [Test]
-        public void DurationField()
-        {
-            var message = new TestWellKnownTypes { DurationField = new Duration() };
-            AssertJson("{ 'durationField': '0s' }", JsonFormatter.Default.Format(message));
-        }
-
-        [Test]
-        public void StructSample()
-        {
-            var message = new Struct
-            {
-                Fields =
-                {
-                    { "a", Value.ForNull() },
-                    { "b", Value.ForBool(false) },
-                    { "c", Value.ForNumber(10.5) },
-                    { "d", Value.ForString("text") },
-                    { "e", Value.ForList(Value.ForString("t1"), Value.ForNumber(5)) },
-                    { "f", Value.ForStruct(new Struct { Fields = { { "nested", Value.ForString("value") } } }) }
-                }
-            };
-            AssertJson("{ 'a': null, 'b': false, 'c': 10.5, 'd': 'text', 'e': [ 't1', 5 ], 'f': { 'nested': 'value' } }", message.ToString());
-        }
-
-        [Test]
-        [TestCase("foo__bar")]
-        [TestCase("foo_3_ar")]
-        [TestCase("fooBar")]
-        public void FieldMaskInvalid(string input)
-        {
-            var mask = new FieldMask { Paths = { input } };
-            Assert.Throws<InvalidOperationException>(() => JsonFormatter.Default.Format(mask));
-        }
-
-        [Test]
-        public void FieldMaskStandalone()
-        {
-            var fieldMask = new FieldMask { Paths = { "", "single", "with_underscore", "nested.field.name", "nested..double_dot" } };
-            Assert.AreEqual("\",single,withUnderscore,nested.field.name,nested..doubleDot\"", fieldMask.ToString());
-
-            // Invalid, but we shouldn't create broken JSON...
-            fieldMask = new FieldMask { Paths = { "x\\y" } };
-            Assert.AreEqual(@"""x\\y""", fieldMask.ToString());
-        }
-
-        [Test]
-        public void FieldMaskField()
-        {
-            var message = new TestWellKnownTypes { FieldMaskField = new FieldMask { Paths = { "user.display_name", "photo" } } };
-            AssertJson("{ 'fieldMaskField': 'user.displayName,photo' }", JsonFormatter.Default.Format(message));
-        }
-
-        // SourceContext is an example of a well-known type with no special JSON handling
-        [Test]
-        public void SourceContextStandalone()
-        {
-            var message = new SourceContext { FileName = "foo.proto" };
-            AssertJson("{ 'fileName': 'foo.proto' }", JsonFormatter.Default.Format(message));
-        }
-
-        [Test]
-        public void AnyWellKnownType()
-        {
-            var formatter = new JsonFormatter(JsonFormatter.Settings.Default.WithTypeRegistry(TypeRegistry.FromMessages(Timestamp.Descriptor)));
-            var timestamp = new DateTime(1673, 6, 19, 12, 34, 56, DateTimeKind.Utc).ToTimestamp();
-            var any = Any.Pack(timestamp);
-            AssertJson("{ '@type': 'type.googleapis.com/google.protobuf.Timestamp', 'value': '1673-06-19T12:34:56Z' }", formatter.Format(any));
-        }
-
-        [Test]
-        public void AnyMessageType()
-        {
-            var formatter = new JsonFormatter(JsonFormatter.Settings.Default.WithTypeRegistry(TypeRegistry.FromMessages(TestAllTypes.Descriptor)));
-            var message = new TestAllTypes { SingleInt32 = 10, SingleNestedMessage = new TestAllTypes.Types.NestedMessage { Bb = 20 } };
-            var any = Any.Pack(message);
-            AssertJson("{ '@type': 'type.googleapis.com/protobuf_unittest3.TestAllTypes', 'singleInt32': 10, 'singleNestedMessage': { 'bb': 20 } }", formatter.Format(any));
-        }
-
-        [Test]
-        public void AnyMessageType_CustomPrefix()
-        {
-            var formatter = new JsonFormatter(JsonFormatter.Settings.Default.WithTypeRegistry(TypeRegistry.FromMessages(TestAllTypes.Descriptor)));
-            var message = new TestAllTypes { SingleInt32 = 10 };
-            var any = Any.Pack(message, "foo.bar/baz");
-            AssertJson("{ '@type': 'foo.bar/baz/protobuf_unittest3.TestAllTypes', 'singleInt32': 10 }", formatter.Format(any));
-        }
-
-        [Test]
-        public void AnyNested()
-        {
-            var registry = TypeRegistry.FromMessages(TestWellKnownTypes.Descriptor, TestAllTypes.Descriptor);
-            var formatter = new JsonFormatter(JsonFormatter.Settings.Default.WithTypeRegistry(registry));
-
-            // Nest an Any as the value of an Any.
-            var doubleNestedMessage = new TestAllTypes { SingleInt32 = 20 };
-            var nestedMessage = Any.Pack(doubleNestedMessage);
-            var message = new TestWellKnownTypes { AnyField = Any.Pack(nestedMessage) };
-            AssertJson("{ 'anyField': { '@type': 'type.googleapis.com/google.protobuf.Any', 'value': { '@type': 'type.googleapis.com/protobuf_unittest3.TestAllTypes', 'singleInt32': 20 } } }",
-                formatter.Format(message));
-        }
-
-        [Test]
-        public void AnyUnknownType()
-        {
-            // The default type registry doesn't have any types in it.
-            var message = new TestAllTypes();
-            var any = Any.Pack(message);
-            Assert.Throws<InvalidOperationException>(() => JsonFormatter.Default.Format(any));
-        }
-
-        [Test]
-        [TestCase(typeof(BoolValue), true, "true")]
-        [TestCase(typeof(Int32Value), 32, "32")]
-        [TestCase(typeof(Int64Value), 32L, "\"32\"")]
-        [TestCase(typeof(UInt32Value), 32U, "32")]
-        [TestCase(typeof(UInt64Value), 32UL, "\"32\"")]
-        [TestCase(typeof(StringValue), "foo", "\"foo\"")]
-        [TestCase(typeof(FloatValue), 1.5f, "1.5")]
-        [TestCase(typeof(DoubleValue), 1.5d, "1.5")]
-        public void Wrappers_Standalone(System.Type wrapperType, object value, string expectedJson)
-        {
-            IMessage populated = (IMessage)Activator.CreateInstance(wrapperType);
-            populated.Descriptor.Fields[WrappersReflection.WrapperValueFieldNumber].Accessor.SetValue(populated, value);
-            Assert.AreEqual(expectedJson, JsonFormatter.Default.Format(populated));
-        }
-
-        // Sanity tests for WriteValue. Not particularly comprehensive, as it's all covered above already,
-        // as FormatMessage uses WriteValue.
-
-        [TestCase(null, "null")]
-        [TestCase(1, "1")]
-        [TestCase(1L, "'1'")]
-        [TestCase(0.5f, "0.5")]
-        [TestCase(0.5d, "0.5")]
-        [TestCase("text", "'text'")]
-        [TestCase("x\ny", @"'x\ny'")]
-        [TestCase(ForeignEnum.ForeignBar, "'FOREIGN_BAR'")]
-        public void WriteValue_Constant(object value, string expectedJson)
-        {
-            AssertWriteValue(value, expectedJson);
-        }
-
-        [Test]
-        public void WriteValue_Timestamp()
-        {
-            var value = new DateTime(1673, 6, 19, 12, 34, 56, DateTimeKind.Utc).ToTimestamp();
-            AssertWriteValue(value, "'1673-06-19T12:34:56Z'");
-        }
-
-        [Test]
-        public void WriteValue_Message()
-        {
-            var value = new TestAllTypes { SingleInt32 = 100, SingleInt64 = 3210987654321L };
-            AssertWriteValue(value, "{ 'singleInt32': 100, 'singleInt64': '3210987654321' }");
-        }
-
-        [Test]
-        public void WriteValue_Message_PreserveNames()
-        {
-            var value = new TestAllTypes { SingleInt32 = 100, SingleInt64 = 3210987654321L };
-            AssertWriteValue(value, "{ 'single_int32': 100, 'single_int64': '3210987654321' }", JsonFormatter.Settings.Default.WithPreserveProtoFieldNames(true));
-        }
-
-        [Test]
-        public void WriteValue_List()
-        {
-            var value = new RepeatedField<int> { 1, 2, 3 };
-            AssertWriteValue(value, "[ 1, 2, 3 ]");
-        }
-
-        [Test]
-        public void Proto2_DefaultValuesWritten()
-        {
-            var value = new ProtobufTestMessages.Proto2.TestAllTypesProto2() { FieldName13 = 0 };
-            AssertWriteValue(value, "{ 'FieldName13': 0 }");
-        }
-
-        private static void AssertWriteValue(object value, string expectedJson, JsonFormatter.Settings settings = null)
-        {
-            var writer = new StringWriter();
-            new JsonFormatter(settings ?? JsonFormatter.Settings.Default).WriteValue(writer, value);
-            string actual = writer.ToString();
-            AssertJson(expectedJson, actual);
-        }
-
-        /// <summary>
-        /// Checks that the actual JSON is the same as the expected JSON - but after replacing
-        /// all apostrophes in the expected JSON with double quotes. This basically makes the tests easier
-        /// to read.
-        /// </summary>
-        private static void AssertJson(string expectedJsonWithApostrophes, string actualJson)
-        {
-            var expectedJson = expectedJsonWithApostrophes.Replace("'", "\"");
-            Assert.AreEqual(expectedJson, actualJson);
-        }
-    }
-}
diff --git a/libs/protobuf/csharp/src/Google.Protobuf.Test/JsonParserTest.cs b/libs/protobuf/csharp/src/Google.Protobuf.Test/JsonParserTest.cs
deleted file mode 100644
index eb8996e..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf.Test/JsonParserTest.cs
+++ /dev/null
@@ -1,1149 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using Google.Protobuf.Reflection;
-using Google.Protobuf.TestProtos;
-using Google.Protobuf.WellKnownTypes;
-using NUnit.Framework;
-using ProtobufTestMessages.Proto2;
-using ProtobufTestMessages.Proto3;
-using System;
-using UnitTest.Issues.TestProtos;
-
-namespace Google.Protobuf
-{
-    /// <summary>
-    /// Unit tests for JSON parsing.
-    /// </summary>
-    public class JsonParserTest
-    {
-        // Sanity smoke test
-        [Test]
-        public void AllTypesRoundtrip()
-        {
-            AssertRoundtrip(SampleMessages.CreateFullTestAllTypes());
-        }
-
-        [Test]
-        public void Maps()
-        {
-            AssertRoundtrip(new TestMap { MapStringString = { { "with spaces", "bar" }, { "a", "b" } } });
-            AssertRoundtrip(new TestMap { MapInt32Int32 = { { 0, 1 }, { 2, 3 } } });
-            AssertRoundtrip(new TestMap { MapBoolBool = { { false, true }, { true, false } } });
-        }
-
-        [Test]
-        [TestCase(" 1 ")]
-        [TestCase("+1")]
-        [TestCase("1,000")]
-        [TestCase("1.5")]
-        public void IntegerMapKeysAreStrict(string keyText)
-        {
-            // Test that integer parsing is strict. We assume that if this is correct for int32,
-            // it's correct for other numeric key types.
-            var json = "{ \"mapInt32Int32\": { \"" + keyText + "\" : \"1\" } }";
-            Assert.Throws<InvalidProtocolBufferException>(() => JsonParser.Default.Parse<TestMap>(json));
-        }
-
-        [Test]
-        public void OriginalFieldNameAccepted()
-        {
-            var json = "{ \"single_int32\": 10 }";
-            var expected = new TestAllTypes { SingleInt32 = 10 };
-            Assert.AreEqual(expected, TestAllTypes.Parser.ParseJson(json));
-        }
-
-        [Test]
-        public void SourceContextRoundtrip()
-        {
-            AssertRoundtrip(new SourceContext { FileName = "foo.proto" });
-        }
-
-        [Test]
-        public void SingularWrappers_DefaultNonNullValues()
-        {
-            var message = new TestWellKnownTypes
-            {
-                StringField = "",
-                BytesField = ByteString.Empty,
-                BoolField = false,
-                FloatField = 0f,
-                DoubleField = 0d,
-                Int32Field = 0,
-                Int64Field = 0,
-                Uint32Field = 0,
-                Uint64Field = 0
-            };
-            AssertRoundtrip(message);
-        }
-
-        [Test]
-        public void SingularWrappers_NonDefaultValues()
-        {
-            var message = new TestWellKnownTypes
-            {
-                StringField = "x",
-                BytesField = ByteString.CopyFrom(1, 2, 3),
-                BoolField = true,
-                FloatField = 12.5f,
-                DoubleField = 12.25d,
-                Int32Field = 1,
-                Int64Field = 2,
-                Uint32Field = 3,
-                Uint64Field = 4
-            };
-            AssertRoundtrip(message);
-        }
-
-        [Test]
-        public void SingularWrappers_ExplicitNulls()
-        {
-            // When we parse the "valueField": null part, we remember it... basically, it's one case
-            // where explicit default values don't fully roundtrip.
-            var message = new TestWellKnownTypes { ValueField = Value.ForNull() };
-            var json = new JsonFormatter(new JsonFormatter.Settings(true)).Format(message);
-            var parsed = JsonParser.Default.Parse<TestWellKnownTypes>(json);
-            Assert.AreEqual(message, parsed);
-        }
-
-        [Test]
-        [TestCase(typeof(BoolValue), "true", true)]
-        [TestCase(typeof(Int32Value), "32", 32)]
-        [TestCase(typeof(Int64Value), "32", 32L)]
-        [TestCase(typeof(Int64Value), "\"32\"", 32L)]
-        [TestCase(typeof(UInt32Value), "32", 32U)]
-        [TestCase(typeof(UInt64Value), "\"32\"", 32UL)]
-        [TestCase(typeof(UInt64Value), "32", 32UL)]
-        [TestCase(typeof(StringValue), "\"foo\"", "foo")]
-        [TestCase(typeof(FloatValue), "1.5", 1.5f)]
-        [TestCase(typeof(DoubleValue), "1.5", 1.5d)]
-        public void Wrappers_Standalone(System.Type wrapperType, string json, object expectedValue)
-        {
-            IMessage parsed = (IMessage)Activator.CreateInstance(wrapperType);
-            IMessage expected = (IMessage)Activator.CreateInstance(wrapperType);
-            JsonParser.Default.Merge(parsed, "null");
-            Assert.AreEqual(expected, parsed);
-
-            JsonParser.Default.Merge(parsed, json);
-            expected.Descriptor.Fields[WrappersReflection.WrapperValueFieldNumber].Accessor.SetValue(expected, expectedValue);
-            Assert.AreEqual(expected, parsed);
-        }
-
-        [Test]
-        public void ExplicitNullValue()
-        {
-            string json = "{\"valueField\": null}";
-            var message = JsonParser.Default.Parse<TestWellKnownTypes>(json);
-            Assert.AreEqual(new TestWellKnownTypes { ValueField = Value.ForNull() }, message);
-        }
-
-        [Test]
-        public void BytesWrapper_Standalone()
-        {
-            ByteString data = ByteString.CopyFrom(1, 2, 3);
-            // Can't do this with attributes...
-            var parsed = JsonParser.Default.Parse<BytesValue>(WrapInQuotes(data.ToBase64()));
-            var expected = new BytesValue { Value = data };
-            Assert.AreEqual(expected, parsed);
-        }
-
-        [Test]
-        public void RepeatedWrappers()
-        {
-            var message = new RepeatedWellKnownTypes
-            {
-                BoolField = { true, false },
-                BytesField = { ByteString.CopyFrom(1, 2, 3), ByteString.CopyFrom(4, 5, 6), ByteString.Empty },
-                DoubleField = { 12.5, -1.5, 0d },
-                FloatField = { 123.25f, -20f, 0f },
-                Int32Field = { int.MaxValue, int.MinValue, 0 },
-                Int64Field = { long.MaxValue, long.MinValue, 0L },
-                StringField = { "First", "Second", "" },
-                Uint32Field = { uint.MaxValue, uint.MinValue, 0U },
-                Uint64Field = { ulong.MaxValue, ulong.MinValue, 0UL },
-            };
-            AssertRoundtrip(message);
-        }
-
-        [Test]
-        public void RepeatedField_NullElementProhibited()
-        {
-            string json = "{ \"repeated_foreign_message\": [null] }";
-            Assert.Throws<InvalidProtocolBufferException>(() => TestAllTypes.Parser.ParseJson(json));
-        }
-
-        [Test]
-        public void RepeatedField_NullOverallValueAllowed()
-        {
-            string json = "{ \"repeated_foreign_message\": null }";
-            Assert.AreEqual(new TestAllTypes(), TestAllTypes.Parser.ParseJson(json));
-        }
-
-        [Test]
-        [TestCase("{ \"mapInt32Int32\": { \"10\": null }")]
-        [TestCase("{ \"mapStringString\": { \"abc\": null }")]
-        [TestCase("{ \"mapInt32ForeignMessage\": { \"10\": null }")]
-        public void MapField_NullValueProhibited(string json)
-        {
-            Assert.Throws<InvalidProtocolBufferException>(() => TestMap.Parser.ParseJson(json));
-        }
-
-        [Test]
-        public void MapField_NullOverallValueAllowed()
-        {
-            string json = "{ \"mapInt32Int32\": null }";
-            Assert.AreEqual(new TestMap(), TestMap.Parser.ParseJson(json));
-        }
-
-        [Test]
-        public void IndividualWrapperTypes()
-        {
-            Assert.AreEqual(new StringValue { Value = "foo" }, StringValue.Parser.ParseJson("\"foo\""));
-            Assert.AreEqual(new Int32Value { Value = 1 }, Int32Value.Parser.ParseJson("1"));
-            // Can parse strings directly too
-            Assert.AreEqual(new Int32Value { Value = 1 }, Int32Value.Parser.ParseJson("\"1\""));
-        }
-
-        private static void AssertRoundtrip<T>(T message) where T : IMessage<T>, new()
-        {
-            var clone = message.Clone();
-            var json = JsonFormatter.Default.Format(message);
-            var parsed = JsonParser.Default.Parse<T>(json);
-            Assert.AreEqual(clone, parsed);
-        }
-
-        [Test]
-        [TestCase("0", 0)]
-        [TestCase("-0", 0)] // Not entirely clear whether we intend to allow this...
-        [TestCase("1", 1)]
-        [TestCase("-1", -1)]
-        [TestCase("2147483647", 2147483647)]
-        [TestCase("-2147483648", -2147483648)]
-        public void StringToInt32_Valid(string jsonValue, int expectedParsedValue)
-        {
-            string json = "{ \"singleInt32\": \"" + jsonValue + "\"}";
-            var parsed = TestAllTypes.Parser.ParseJson(json);
-            Assert.AreEqual(expectedParsedValue, parsed.SingleInt32);
-        }
-
-        [Test]
-        [TestCase("+0")]
-        [TestCase(" 1")]
-        [TestCase("1 ")]
-        [TestCase("00")]
-        [TestCase("-00")]
-        [TestCase("--1")]
-        [TestCase("+1")]
-        [TestCase("1.5")]
-        [TestCase("1e10")]
-        [TestCase("2147483648")]
-        [TestCase("-2147483649")]
-        public void StringToInt32_Invalid(string jsonValue)
-        {
-            string json = "{ \"singleInt32\": \"" + jsonValue + "\"}";
-            Assert.Throws<InvalidProtocolBufferException>(() => TestAllTypes.Parser.ParseJson(json));
-        }
-
-        [Test]
-        [TestCase("0", 0U)]
-        [TestCase("1", 1U)]
-        [TestCase("4294967295", 4294967295U)]
-        public void StringToUInt32_Valid(string jsonValue, uint expectedParsedValue)
-        {
-            string json = "{ \"singleUint32\": \"" + jsonValue + "\"}";
-            var parsed = TestAllTypes.Parser.ParseJson(json);
-            Assert.AreEqual(expectedParsedValue, parsed.SingleUint32);
-        }
-
-        // Assume that anything non-bounds-related is covered in the Int32 case
-        [Test]
-        [TestCase("-1")]
-        [TestCase("4294967296")]
-        public void StringToUInt32_Invalid(string jsonValue)
-        {
-            string json = "{ \"singleUint32\": \"" + jsonValue + "\"}";
-            Assert.Throws<InvalidProtocolBufferException>(() => TestAllTypes.Parser.ParseJson(json));
-        }
-
-        [Test]
-        [TestCase("0", 0L)]
-        [TestCase("1", 1L)]
-        [TestCase("-1", -1L)]
-        [TestCase("9223372036854775807", 9223372036854775807)]
-        [TestCase("-9223372036854775808", -9223372036854775808)]
-        public void StringToInt64_Valid(string jsonValue, long expectedParsedValue)
-        {
-            string json = "{ \"singleInt64\": \"" + jsonValue + "\"}";
-            var parsed = TestAllTypes.Parser.ParseJson(json);
-            Assert.AreEqual(expectedParsedValue, parsed.SingleInt64);
-        }
-
-        // Assume that anything non-bounds-related is covered in the Int32 case
-        [Test]
-        [TestCase("-9223372036854775809")]
-        [TestCase("9223372036854775808")]
-        public void StringToInt64_Invalid(string jsonValue)
-        {
-            string json = "{ \"singleInt64\": \"" + jsonValue + "\"}";
-            Assert.Throws<InvalidProtocolBufferException>(() => TestAllTypes.Parser.ParseJson(json));
-        }
-
-        [Test]
-        [TestCase("0", 0UL)]
-        [TestCase("1", 1UL)]
-        [TestCase("18446744073709551615", 18446744073709551615)]
-        public void StringToUInt64_Valid(string jsonValue, ulong expectedParsedValue)
-        {
-            string json = "{ \"singleUint64\": \"" + jsonValue + "\"}";
-            var parsed = TestAllTypes.Parser.ParseJson(json);
-            Assert.AreEqual(expectedParsedValue, parsed.SingleUint64);
-        }
-
-        // Assume that anything non-bounds-related is covered in the Int32 case
-        [Test]
-        [TestCase("-1")]
-        [TestCase("18446744073709551616")]
-        public void StringToUInt64_Invalid(string jsonValue)
-        {
-            string json = "{ \"singleUint64\": \"" + jsonValue + "\"}";
-            Assert.Throws<InvalidProtocolBufferException>(() => TestAllTypes.Parser.ParseJson(json));
-        }
-
-        [Test]
-        [TestCase("0", 0d)]
-        [TestCase("1", 1d)]
-        [TestCase("1.000000", 1d)]
-        [TestCase("1.0000000000000000000000001", 1d)] // We don't notice that we haven't preserved the exact value
-        [TestCase("-1", -1d)]
-        [TestCase("1e1", 10d)]
-        [TestCase("1e01", 10d)] // Leading decimals are allowed in exponents
-        [TestCase("1E1", 10d)] // Either case is fine
-        [TestCase("-1e1", -10d)]
-        [TestCase("1.5e1", 15d)]
-        [TestCase("-1.5e1", -15d)]
-        [TestCase("15e-1", 1.5d)]
-        [TestCase("-15e-1", -1.5d)]
-        [TestCase("1.79769e308", 1.79769e308)]
-        [TestCase("-1.79769e308", -1.79769e308)]
-        [TestCase("Infinity", double.PositiveInfinity)]
-        [TestCase("-Infinity", double.NegativeInfinity)]
-        [TestCase("NaN", double.NaN)]
-        public void StringToDouble_Valid(string jsonValue, double expectedParsedValue)
-        {
-            string json = "{ \"singleDouble\": \"" + jsonValue + "\"}";
-            var parsed = TestAllTypes.Parser.ParseJson(json);
-            Assert.AreEqual(expectedParsedValue, parsed.SingleDouble);
-        }
-
-        [Test]
-        [TestCase("1.7977e308")]
-        [TestCase("-1.7977e308")]
-        [TestCase("1e309")]
-        [TestCase("1,0")]
-        [TestCase("1.0.0")]
-        [TestCase("+1")]
-        [TestCase("00")]
-        [TestCase("01")]
-        [TestCase("-00")]
-        [TestCase("-01")]
-        [TestCase("--1")]
-        [TestCase(" Infinity")]
-        [TestCase(" -Infinity")]
-        [TestCase("NaN ")]
-        [TestCase("Infinity ")]
-        [TestCase("-Infinity ")]
-        [TestCase(" NaN")]
-        [TestCase("INFINITY")]
-        [TestCase("nan")]
-        [TestCase("\u00BD")] // 1/2 as a single Unicode character. Just sanity checking...
-        public void StringToDouble_Invalid(string jsonValue)
-        {
-            string json = "{ \"singleDouble\": \"" + jsonValue + "\"}";
-            Assert.Throws<InvalidProtocolBufferException>(() => TestAllTypes.Parser.ParseJson(json));
-        }
-
-        [Test]
-        [TestCase("0", 0f)]
-        [TestCase("1", 1f)]
-        [TestCase("1.000000", 1f)]
-        [TestCase("-1", -1f)]
-        [TestCase("3.402823e38", 3.402823e38f)]
-        [TestCase("-3.402823e38", -3.402823e38f)]
-        [TestCase("1.5e1", 15f)]
-        [TestCase("15e-1", 1.5f)]
-        public void StringToFloat_Valid(string jsonValue, float expectedParsedValue)
-        {
-            string json = "{ \"singleFloat\": \"" + jsonValue + "\"}";
-            var parsed = TestAllTypes.Parser.ParseJson(json);
-            Assert.AreEqual(expectedParsedValue, parsed.SingleFloat);
-        }
-
-        [Test]
-        [TestCase("3.402824e38")]
-        [TestCase("-3.402824e38")]
-        [TestCase("1,0")]
-        [TestCase("1.0.0")]
-        [TestCase("+1")]
-        [TestCase("00")]
-        [TestCase("--1")]
-        public void StringToFloat_Invalid(string jsonValue)
-        {
-            string json = "{ \"singleFloat\": \"" + jsonValue + "\"}";
-            Assert.Throws<InvalidProtocolBufferException>(() => TestAllTypes.Parser.ParseJson(json));
-        }
-
-        [Test]
-        [TestCase("0", 0)]
-        [TestCase("-0", 0)] // Not entirely clear whether we intend to allow this...
-        [TestCase("1", 1)]
-        [TestCase("-1", -1)]
-        [TestCase("2147483647", 2147483647)]
-        [TestCase("-2147483648", -2147483648)]
-        [TestCase("1e1", 10)]
-        [TestCase("-1e1", -10)]
-        [TestCase("10.00", 10)]
-        [TestCase("-10.00", -10)]
-        public void NumberToInt32_Valid(string jsonValue, int expectedParsedValue)
-        {
-            string json = "{ \"singleInt32\": " + jsonValue + "}";
-            var parsed = TestAllTypes.Parser.ParseJson(json);
-            Assert.AreEqual(expectedParsedValue, parsed.SingleInt32);
-        }
-
-        [Test]
-        [TestCase("+0", typeof(InvalidJsonException))]
-        [TestCase("00", typeof(InvalidJsonException))]
-        [TestCase("-00", typeof(InvalidJsonException))]
-        [TestCase("--1", typeof(InvalidJsonException))]
-        [TestCase("+1", typeof(InvalidJsonException))]
-        [TestCase("1.5", typeof(InvalidProtocolBufferException))]
-        // Value is out of range
-        [TestCase("1e10", typeof(InvalidProtocolBufferException))]
-        [TestCase("2147483648", typeof(InvalidProtocolBufferException))]
-        [TestCase("-2147483649", typeof(InvalidProtocolBufferException))]
-        public void NumberToInt32_Invalid(string jsonValue, System.Type expectedExceptionType)
-        {
-            string json = "{ \"singleInt32\": " + jsonValue + "}";
-            Assert.Throws(expectedExceptionType, () => TestAllTypes.Parser.ParseJson(json));
-        }
-
-        [Test]
-        [TestCase("0", 0U)]
-        [TestCase("1", 1U)]
-        [TestCase("4294967295", 4294967295U)]
-        public void NumberToUInt32_Valid(string jsonValue, uint expectedParsedValue)
-        {
-            string json = "{ \"singleUint32\": " + jsonValue + "}";
-            var parsed = TestAllTypes.Parser.ParseJson(json);
-            Assert.AreEqual(expectedParsedValue, parsed.SingleUint32);
-        }
-
-        // Assume that anything non-bounds-related is covered in the Int32 case
-        [Test]
-        [TestCase("-1")]
-        [TestCase("4294967296")]
-        public void NumberToUInt32_Invalid(string jsonValue)
-        {
-            string json = "{ \"singleUint32\": " + jsonValue + "}";
-            Assert.Throws<InvalidProtocolBufferException>(() => TestAllTypes.Parser.ParseJson(json));
-        }
-
-        [Test]
-        [TestCase("0", 0L)]
-        [TestCase("1", 1L)]
-        [TestCase("-1", -1L)]
-        // long.MaxValue isn't actually representable as a double. This string value is the highest
-        // representable value which isn't greater than long.MaxValue.
-        [TestCase("9223372036854774784", 9223372036854774784)]
-        [TestCase("-9223372036854775808", -9223372036854775808)]
-        public void NumberToInt64_Valid(string jsonValue, long expectedParsedValue)
-        {
-            string json = "{ \"singleInt64\": " + jsonValue + "}";
-            var parsed = TestAllTypes.Parser.ParseJson(json);
-            Assert.AreEqual(expectedParsedValue, parsed.SingleInt64);
-        }
-
-        // Assume that anything non-bounds-related is covered in the Int32 case
-        [Test]
-        [TestCase("9223372036854775808")]
-        // Theoretical bound would be -9223372036854775809, but when that is parsed to a double
-        // we end up with the exact value of long.MinValue due to lack of precision. The value here
-        // is the "next double down".
-        [TestCase("-9223372036854780000")]
-        public void NumberToInt64_Invalid(string jsonValue)
-        {
-            string json = "{ \"singleInt64\": " + jsonValue + "}";
-            Assert.Throws<InvalidProtocolBufferException>(() => TestAllTypes.Parser.ParseJson(json));
-        }
-
-        [Test]
-        [TestCase("0", 0UL)]
-        [TestCase("1", 1UL)]
-        // ulong.MaxValue isn't representable as a double. This value is the largest double within
-        // the range of ulong.
-        [TestCase("18446744073709549568", 18446744073709549568UL)]
-        public void NumberToUInt64_Valid(string jsonValue, ulong expectedParsedValue)
-        {
-            string json = "{ \"singleUint64\": " + jsonValue + "}";
-            var parsed = TestAllTypes.Parser.ParseJson(json);
-            Assert.AreEqual(expectedParsedValue, parsed.SingleUint64);
-        }
-
-        // Assume that anything non-bounds-related is covered in the Int32 case
-        [Test]
-        [TestCase("-1")]
-        [TestCase("18446744073709551616")]
-        public void NumberToUInt64_Invalid(string jsonValue)
-        {
-            string json = "{ \"singleUint64\": " + jsonValue + "}";
-            Assert.Throws<InvalidProtocolBufferException>(() => TestAllTypes.Parser.ParseJson(json));
-        }
-
-        [Test]
-        [TestCase("0", 0d)]
-        [TestCase("1", 1d)]
-        [TestCase("1.000000", 1d)]
-        [TestCase("1.0000000000000000000000001", 1d)] // We don't notice that we haven't preserved the exact value
-        [TestCase("-1", -1d)]
-        [TestCase("1e1", 10d)]
-        [TestCase("1e01", 10d)] // Leading decimals are allowed in exponents
-        [TestCase("1E1", 10d)] // Either case is fine
-        [TestCase("-1e1", -10d)]
-        [TestCase("1.5e1", 15d)]
-        [TestCase("-1.5e1", -15d)]
-        [TestCase("15e-1", 1.5d)]
-        [TestCase("-15e-1", -1.5d)]
-        [TestCase("1.79769e308", 1.79769e308)]
-        [TestCase("-1.79769e308", -1.79769e308)]
-        public void NumberToDouble_Valid(string jsonValue, double expectedParsedValue)
-        {
-            string json = "{ \"singleDouble\": " + jsonValue + "}";
-            var parsed = TestAllTypes.Parser.ParseJson(json);
-            Assert.AreEqual(expectedParsedValue, parsed.SingleDouble);
-        }
-
-        [Test]
-        [TestCase("1.7977e308")]
-        [TestCase("-1.7977e308")]
-        [TestCase("1e309")]
-        [TestCase("1,0")]
-        [TestCase("1.0.0")]
-        [TestCase("+1")]
-        [TestCase("00")]
-        [TestCase("--1")]
-        [TestCase("\u00BD")] // 1/2 as a single Unicode character. Just sanity checking...
-        public void NumberToDouble_Invalid(string jsonValue)
-        {
-            string json = "{ \"singleDouble\": " + jsonValue + "}";
-            Assert.Throws<InvalidJsonException>(() => TestAllTypes.Parser.ParseJson(json));
-        }
-
-        [Test]
-        [TestCase("0", 0f)]
-        [TestCase("1", 1f)]
-        [TestCase("1.000000", 1f)]
-        [TestCase("-1", -1f)]
-        [TestCase("3.402823e38", 3.402823e38f)]
-        [TestCase("-3.402823e38", -3.402823e38f)]
-        [TestCase("1.5e1", 15f)]
-        [TestCase("15e-1", 1.5f)]
-        public void NumberToFloat_Valid(string jsonValue, float expectedParsedValue)
-        {
-            string json = "{ \"singleFloat\": " + jsonValue + "}";
-            var parsed = TestAllTypes.Parser.ParseJson(json);
-            Assert.AreEqual(expectedParsedValue, parsed.SingleFloat);
-        }
-
-        [Test]
-        [TestCase("3.402824e38", typeof(InvalidProtocolBufferException))]
-        [TestCase("-3.402824e38", typeof(InvalidProtocolBufferException))]
-        [TestCase("1,0", typeof(InvalidJsonException))]
-        [TestCase("1.0.0", typeof(InvalidJsonException))]
-        [TestCase("+1", typeof(InvalidJsonException))]
-        [TestCase("00", typeof(InvalidJsonException))]
-        [TestCase("--1", typeof(InvalidJsonException))]
-        public void NumberToFloat_Invalid(string jsonValue, System.Type expectedExceptionType)
-        {
-            string json = "{ \"singleFloat\": " + jsonValue + "}";
-            Assert.Throws(expectedExceptionType, () => TestAllTypes.Parser.ParseJson(json));
-        }
-
-        // The simplest way of testing that the value has parsed correctly is to reformat it,
-        // as we trust the formatting. In many cases that will give the same result as the input,
-        // so in those cases we accept an expectedFormatted value of null. Sometimes the results
-        // will be different though, due to a different number of digits being provided.
-        [Test]
-        // Z offset
-        [TestCase("2015-10-09T14:46:23.123456789Z", null)]
-        [TestCase("2015-10-09T14:46:23.123456Z", null)]
-        [TestCase("2015-10-09T14:46:23.123Z", null)]
-        [TestCase("2015-10-09T14:46:23Z", null)]
-        [TestCase("2015-10-09T14:46:23.123456000Z", "2015-10-09T14:46:23.123456Z")]
-        [TestCase("2015-10-09T14:46:23.1234560Z", "2015-10-09T14:46:23.123456Z")]
-        [TestCase("2015-10-09T14:46:23.123000000Z", "2015-10-09T14:46:23.123Z")]
-        [TestCase("2015-10-09T14:46:23.1230Z", "2015-10-09T14:46:23.123Z")]
-        [TestCase("2015-10-09T14:46:23.00Z", "2015-10-09T14:46:23Z")]
-
-        // +00:00 offset
-        [TestCase("2015-10-09T14:46:23.123456789+00:00", "2015-10-09T14:46:23.123456789Z")]
-        [TestCase("2015-10-09T14:46:23.123456+00:00", "2015-10-09T14:46:23.123456Z")]
-        [TestCase("2015-10-09T14:46:23.123+00:00", "2015-10-09T14:46:23.123Z")]
-        [TestCase("2015-10-09T14:46:23+00:00", "2015-10-09T14:46:23Z")]
-        [TestCase("2015-10-09T14:46:23.123456000+00:00", "2015-10-09T14:46:23.123456Z")]
-        [TestCase("2015-10-09T14:46:23.1234560+00:00", "2015-10-09T14:46:23.123456Z")]
-        [TestCase("2015-10-09T14:46:23.123000000+00:00", "2015-10-09T14:46:23.123Z")]
-        [TestCase("2015-10-09T14:46:23.1230+00:00", "2015-10-09T14:46:23.123Z")]
-        [TestCase("2015-10-09T14:46:23.00+00:00", "2015-10-09T14:46:23Z")]
-
-        // Other offsets (assume by now that the subsecond handling is okay)
-        [TestCase("2015-10-09T15:46:23.123456789+01:00", "2015-10-09T14:46:23.123456789Z")]
-        [TestCase("2015-10-09T13:46:23.123456789-01:00", "2015-10-09T14:46:23.123456789Z")]
-        [TestCase("2015-10-09T15:16:23.123456789+00:30", "2015-10-09T14:46:23.123456789Z")]
-        [TestCase("2015-10-09T14:16:23.123456789-00:30", "2015-10-09T14:46:23.123456789Z")]
-        [TestCase("2015-10-09T16:31:23.123456789+01:45", "2015-10-09T14:46:23.123456789Z")]
-        [TestCase("2015-10-09T13:01:23.123456789-01:45", "2015-10-09T14:46:23.123456789Z")]
-        [TestCase("2015-10-10T08:46:23.123456789+18:00", "2015-10-09T14:46:23.123456789Z")]
-        [TestCase("2015-10-08T20:46:23.123456789-18:00", "2015-10-09T14:46:23.123456789Z")]
-
-        // Leap years and min/max
-        [TestCase("2016-02-29T14:46:23.123456789Z", null)]
-        [TestCase("2000-02-29T14:46:23.123456789Z", null)]
-        [TestCase("0001-01-01T00:00:00Z", null)]
-        [TestCase("9999-12-31T23:59:59.999999999Z", null)]
-        public void Timestamp_Valid(string jsonValue, string expectedFormatted)
-        {
-            expectedFormatted = expectedFormatted ?? jsonValue;
-            string json = WrapInQuotes(jsonValue);
-            var parsed = Timestamp.Parser.ParseJson(json);
-            Assert.AreEqual(WrapInQuotes(expectedFormatted), parsed.ToString());
-        }
-
-        [Test]
-        [TestCase("2015-10-09 14:46:23.123456789Z", Description = "No T between date and time")]
-        [TestCase("2015/10/09T14:46:23.123456789Z", Description = "Wrong date separators")]
-        [TestCase("2015-10-09T14.46.23.123456789Z", Description = "Wrong time separators")]
-        [TestCase("2015-10-09T14:46:23,123456789Z", Description = "Wrong fractional second separators (valid ISO-8601 though)")]
-        [TestCase(" 2015-10-09T14:46:23.123456789Z", Description = "Whitespace at start")]
-        [TestCase("2015-10-09T14:46:23.123456789Z ", Description = "Whitespace at end")]
-        [TestCase("2015-10-09T14:46:23.1234567890", Description = "Too many digits")]
-        [TestCase("2015-10-09T14:46:23.123456789", Description = "No offset")]
-        [TestCase("2015-13-09T14:46:23.123456789Z", Description = "Invalid month")]
-        [TestCase("2015-10-32T14:46:23.123456789Z", Description = "Invalid day")]
-        [TestCase("2015-10-09T24:00:00.000000000Z", Description = "Invalid hour (valid ISO-8601 though)")]
-        [TestCase("2015-10-09T14:60:23.123456789Z", Description = "Invalid minutes")]
-        [TestCase("2015-10-09T14:46:60.123456789Z", Description = "Invalid seconds")]
-        [TestCase("2015-10-09T14:46:23.123456789+18:01", Description = "Offset too large (positive)")]
-        [TestCase("2015-10-09T14:46:23.123456789-18:01", Description = "Offset too large (negative)")]
-        [TestCase("2015-10-09T14:46:23.123456789-00:00", Description = "Local offset (-00:00) makes no sense here")]
-        [TestCase("0001-01-01T00:00:00+00:01", Description = "Value before earliest when offset applied")]
-        [TestCase("9999-12-31T23:59:59.999999999-00:01", Description = "Value after latest when offset applied")]
-        [TestCase("2100-02-29T14:46:23.123456789Z", Description = "Feb 29th on a non-leap-year")]
-        public void Timestamp_Invalid(string jsonValue)
-        {
-            string json = WrapInQuotes(jsonValue);
-            Assert.Throws<InvalidProtocolBufferException>(() => Timestamp.Parser.ParseJson(json));
-        }
-
-        [Test]
-        public void StructValue_Null()
-        {
-            Assert.AreEqual(new Value { NullValue = 0 }, Value.Parser.ParseJson("null"));
-        }
-
-        [Test]
-        public void StructValue_String()
-        {
-            Assert.AreEqual(new Value { StringValue = "hi" }, Value.Parser.ParseJson("\"hi\""));
-        }
-
-        [Test]
-        public void StructValue_Bool()
-        {
-            Assert.AreEqual(new Value { BoolValue = true }, Value.Parser.ParseJson("true"));
-            Assert.AreEqual(new Value { BoolValue = false }, Value.Parser.ParseJson("false"));
-        }
-
-        [Test]
-        public void StructValue_List()
-        {
-            Assert.AreEqual(Value.ForList(Value.ForNumber(1), Value.ForString("x")), Value.Parser.ParseJson("[1, \"x\"]"));
-        }
-
-        [Test]
-        public void Value_List_WithNullElement()
-        {
-            var expected = Value.ForList(Value.ForString("x"), Value.ForNull(), Value.ForString("y"));
-            var actual = Value.Parser.ParseJson("[\"x\", null, \"y\"]");
-            Assert.AreEqual(expected, actual);
-        }
-
-        [Test]
-        public void StructValue_NullElement()
-        {
-            var expected = Value.ForStruct(new Struct { Fields = { { "x", Value.ForNull() } } });
-            var actual = Value.Parser.ParseJson("{ \"x\": null }");
-            Assert.AreEqual(expected, actual);
-        }
-
-        [Test]
-        public void ParseListValue()
-        {
-            Assert.AreEqual(new ListValue { Values = { Value.ForNumber(1), Value.ForString("x") } }, ListValue.Parser.ParseJson("[1, \"x\"]"));
-        }
-
-        [Test]
-        public void StructValue_Struct()
-        {
-            Assert.AreEqual(
-                Value.ForStruct(new Struct { Fields = { { "x", Value.ForNumber(1) }, { "y", Value.ForString("z") } } }),
-                Value.Parser.ParseJson("{ \"x\": 1, \"y\": \"z\" }"));
-        }
-
-        [Test]
-        public void ParseStruct()
-        {
-            Assert.AreEqual(new Struct { Fields = { { "x", Value.ForNumber(1) }, { "y", Value.ForString("z") } } },
-                Struct.Parser.ParseJson("{ \"x\": 1, \"y\": \"z\" }"));
-        }
-
-        // TODO for duration parsing: upper and lower bounds.
-        // +/- 315576000000 seconds
-
-        [Test]
-        [TestCase("1.123456789s", null)]
-        [TestCase("1.123456s", null)]
-        [TestCase("1.123s", null)]
-        [TestCase("1.12300s", "1.123s")]
-        [TestCase("1.12345s", "1.123450s")]
-        [TestCase("1s", null)]
-        [TestCase("-1.123456789s", null)]
-        [TestCase("-1.123456s", null)]
-        [TestCase("-1.123s", null)]
-        [TestCase("-1s", null)]
-        [TestCase("0.123s", null)]
-        [TestCase("-0.123s", null)]
-        [TestCase("123456.123s", null)]
-        [TestCase("-123456.123s", null)]
-        // Upper and lower bounds
-        [TestCase("315576000000s", null)]
-        [TestCase("-315576000000s", null)]
-        public void Duration_Valid(string jsonValue, string expectedFormatted)
-        {
-            expectedFormatted = expectedFormatted ?? jsonValue;
-            string json = WrapInQuotes(jsonValue);
-            var parsed = Duration.Parser.ParseJson(json);
-            Assert.AreEqual(WrapInQuotes(expectedFormatted), parsed.ToString());
-        }
-
-        // The simplest way of testing that the value has parsed correctly is to reformat it,
-        // as we trust the formatting. In many cases that will give the same result as the input,
-        // so in those cases we accept an expectedFormatted value of null. Sometimes the results
-        // will be different though, due to a different number of digits being provided.
-        [Test]
-        [TestCase("1.1234567890s", Description = "Too many digits")]
-        [TestCase("1.123456789", Description = "No suffix")]
-        [TestCase("1.123456789ss", Description = "Too much suffix")]
-        [TestCase("1.123456789S", Description = "Upper case suffix")]
-        [TestCase("+1.123456789s", Description = "Leading +")]
-        [TestCase(".123456789s", Description = "No integer before the fraction")]
-        [TestCase("1,123456789s", Description = "Comma as decimal separator")]
-        [TestCase("1x1.123456789s", Description = "Non-digit in integer part")]
-        [TestCase("1.1x3456789s", Description = "Non-digit in fractional part")]
-        [TestCase(" 1.123456789s", Description = "Whitespace before fraction")]
-        [TestCase("1.123456789s ", Description = "Whitespace after value")]
-        [TestCase("01.123456789s", Description = "Leading zero (positive)")]
-        [TestCase("-01.123456789s", Description = "Leading zero (negative)")]
-        [TestCase("--0.123456789s", Description = "Double minus sign")]
-        // Violate upper/lower bounds in various ways
-        [TestCase("315576000001s", Description = "Integer part too large")]
-        [TestCase("3155760000000s", Description = "Integer part too long (positive)")]
-        [TestCase("-3155760000000s", Description = "Integer part too long (negative)")]
-        public void Duration_Invalid(string jsonValue)
-        {
-            string json = WrapInQuotes(jsonValue);
-            Assert.Throws<InvalidProtocolBufferException>(() => Duration.Parser.ParseJson(json));
-        }
-
-        // Not as many tests for field masks as I'd like; more to be added when we have more
-        // detailed specifications.
-
-        [Test]
-        [TestCase("")]
-        [TestCase("foo", "foo")]
-        [TestCase("foo,bar", "foo", "bar")]
-        [TestCase("foo.bar", "foo.bar")]
-        [TestCase("fooBar", "foo_bar")]
-        [TestCase("fooBar.bazQux", "foo_bar.baz_qux")]
-        public void FieldMask_Valid(string jsonValue, params string[] expectedPaths)
-        {
-            string json = WrapInQuotes(jsonValue);
-            var parsed = FieldMask.Parser.ParseJson(json);
-            CollectionAssert.AreEqual(expectedPaths, parsed.Paths);
-        }
-
-        [Test]
-        [TestCase("foo_bar")]
-        public void FieldMask_Invalid(string jsonValue)
-        {
-            string json = WrapInQuotes(jsonValue);
-            Assert.Throws<InvalidProtocolBufferException>(() => FieldMask.Parser.ParseJson(json));
-        }
-
-        [Test]
-        public void Any_RegularMessage()
-        {
-            var registry = TypeRegistry.FromMessages(TestAllTypes.Descriptor);
-            var formatter = new JsonFormatter(new JsonFormatter.Settings(false, TypeRegistry.FromMessages(TestAllTypes.Descriptor)));
-            var message = new TestAllTypes { SingleInt32 = 10, SingleNestedMessage = new TestAllTypes.Types.NestedMessage { Bb = 20 } };
-            var original = Any.Pack(message);
-            var json = formatter.Format(original); // This is tested in JsonFormatterTest
-            var parser = new JsonParser(new JsonParser.Settings(10, registry));
-            Assert.AreEqual(original, parser.Parse<Any>(json));
-            string valueFirstJson = "{ \"singleInt32\": 10, \"singleNestedMessage\": { \"bb\": 20 }, \"@type\": \"type.googleapis.com/protobuf_unittest3.TestAllTypes\" }";
-            Assert.AreEqual(original, parser.Parse<Any>(valueFirstJson));
-        }
-
-        [Test]
-        public void Any_CustomPrefix()
-        {
-            var registry = TypeRegistry.FromMessages(TestAllTypes.Descriptor);
-            var message = new TestAllTypes { SingleInt32 = 10 };
-            var original = Any.Pack(message, "custom.prefix/middle-part");
-            var parser = new JsonParser(new JsonParser.Settings(10, registry));
-            string json = "{ \"@type\": \"custom.prefix/middle-part/protobuf_unittest3.TestAllTypes\", \"singleInt32\": 10 }";
-            Assert.AreEqual(original, parser.Parse<Any>(json));
-        }
-
-        [Test]
-        public void Any_UnknownType()
-        {
-            string json = "{ \"@type\": \"type.googleapis.com/bogus\" }";
-            Assert.Throws<InvalidOperationException>(() => Any.Parser.ParseJson(json));
-        }
-
-        [Test]
-        public void Any_NoTypeUrl()
-        {
-            string json = "{ \"foo\": \"bar\" }";
-            Assert.Throws<InvalidProtocolBufferException>(() => Any.Parser.ParseJson(json));
-        }
-
-        [Test]
-        public void Any_WellKnownType()
-        {
-            var registry = TypeRegistry.FromMessages(Timestamp.Descriptor);
-            var formatter = new JsonFormatter(new JsonFormatter.Settings(false, registry));
-            var timestamp = new DateTime(1673, 6, 19, 12, 34, 56, DateTimeKind.Utc).ToTimestamp();
-            var original = Any.Pack(timestamp);
-            var json = formatter.Format(original); // This is tested in JsonFormatterTest
-            var parser = new JsonParser(new JsonParser.Settings(10, registry));
-            Assert.AreEqual(original, parser.Parse<Any>(json));
-            string valueFirstJson = "{ \"value\": \"1673-06-19T12:34:56Z\", \"@type\": \"type.googleapis.com/google.protobuf.Timestamp\" }";
-            Assert.AreEqual(original, parser.Parse<Any>(valueFirstJson));
-        }
-
-        [Test]
-        public void Any_Nested()
-        {
-            var registry = TypeRegistry.FromMessages(TestWellKnownTypes.Descriptor, TestAllTypes.Descriptor);
-            var formatter = new JsonFormatter(new JsonFormatter.Settings(false, registry));
-            var parser = new JsonParser(new JsonParser.Settings(10, registry));
-            var doubleNestedMessage = new TestAllTypes { SingleInt32 = 20 };
-            var nestedMessage = Any.Pack(doubleNestedMessage);
-            var message = new TestWellKnownTypes { AnyField = Any.Pack(nestedMessage) };
-            var json = formatter.Format(message);
-            // Use the descriptor-based parser just for a change.
-            Assert.AreEqual(message, parser.Parse(json, TestWellKnownTypes.Descriptor));
-        }
-
-        [Test]
-        public void DataAfterObject()
-        {
-            string json = "{} 10";
-            Assert.Throws<InvalidJsonException>(() => TestAllTypes.Parser.ParseJson(json));
-        }
-
-        /// <summary>
-        /// JSON equivalent to <see cref="CodedInputStreamTest.MaliciousRecursion"/>
-        /// </summary>
-        [Test]
-        public void MaliciousRecursion()
-        {
-            string data64 = CodedInputStreamTest.MakeRecursiveMessage(64).ToString();
-            string data65 = CodedInputStreamTest.MakeRecursiveMessage(65).ToString();
-
-            var parser64 = new JsonParser(new JsonParser.Settings(64));
-            CodedInputStreamTest.AssertMessageDepth(parser64.Parse<TestRecursiveMessage>(data64), 64);
-            Assert.Throws<InvalidProtocolBufferException>(() => parser64.Parse<TestRecursiveMessage>(data65));
-
-            var parser63 = new JsonParser(new JsonParser.Settings(63));
-            Assert.Throws<InvalidProtocolBufferException>(() => parser63.Parse<TestRecursiveMessage>(data64));
-        }
-
-        [Test]
-        [TestCase("AQI")]
-        [TestCase("_-==")]
-        public void Bytes_InvalidBase64(string badBase64)
-        {
-            string json = "{ \"singleBytes\": \"" + badBase64 + "\" }";
-            Assert.Throws<InvalidProtocolBufferException>(() => TestAllTypes.Parser.ParseJson(json));
-        }
-
-        [Test]
-        [TestCase("\"FOREIGN_BAR\"", TestProtos.ForeignEnum.ForeignBar)]
-        [TestCase("5", TestProtos.ForeignEnum.ForeignBar)]
-        [TestCase("100", (TestProtos.ForeignEnum)100)]
-        public void EnumValid(string value, TestProtos.ForeignEnum expectedValue)
-        {
-            string json = "{ \"singleForeignEnum\": " + value + " }";
-            var parsed = TestAllTypes.Parser.ParseJson(json);
-            Assert.AreEqual(new TestAllTypes { SingleForeignEnum = expectedValue }, parsed);
-        }
-
-        [Test]
-        [TestCase("\"NOT_A_VALID_VALUE\"")]
-        [TestCase("5.5")]
-        public void Enum_Invalid(string value)
-        {
-            string json = "{ \"singleForeignEnum\": " + value + " }";
-            Assert.Throws<InvalidProtocolBufferException>(() => TestAllTypes.Parser.ParseJson(json));
-        }
-
-        [Test]
-        public void OneofDuplicate_Invalid()
-        {
-            string json = "{ \"oneofString\": \"x\", \"oneofUint32\": 10 }";
-            Assert.Throws<InvalidProtocolBufferException>(() => TestAllTypes.Parser.ParseJson(json));
-        }
-
-        [Test]
-        public void UnknownField_NotIgnored()
-        {
-            string json = "{ \"unknownField\": 10, \"singleString\": \"x\" }";
-            Assert.Throws<InvalidProtocolBufferException>(() => TestAllTypes.Parser.ParseJson(json));
-        }
-
-        [Test]
-        public void Proto2_DefaultValuesPreserved()
-        {
-            string json = "{ \"FieldName13\": 0 }";
-            var parsed = TestAllTypesProto2.Parser.ParseJson(json);
-            Assert.False(parsed.HasFieldName10);
-            Assert.True(parsed.HasFieldName13);
-            Assert.AreEqual(0, parsed.FieldName13);
-        }
-
-        [Test]
-        [TestCase("5")]
-        [TestCase("\"text\"")]
-        [TestCase("[0, 1, 2]")]
-        [TestCase("{ \"a\": { \"b\": 10 } }")]
-        public void UnknownField_Ignored(string value)
-        {
-            var parser = new JsonParser(JsonParser.Settings.Default.WithIgnoreUnknownFields(true));
-            string json = "{ \"unknownField\": " + value + ", \"singleString\": \"x\" }";
-            var actual = parser.Parse<TestAllTypes>(json);
-            var expected = new TestAllTypes { SingleString = "x" };
-            Assert.AreEqual(expected, actual);
-        }
-
-        [Test]
-        public void NullValueOutsideStruct_NullLiteral()
-        {
-            string json = "{ \"nullValue\": null }";
-            var message = NullValueOutsideStruct.Parser.ParseJson(json);
-            Assert.AreEqual(NullValueOutsideStruct.ValueOneofCase.NullValue, message.ValueCase);
-        }
-
-        [Test]
-        public void NullValueNotInOneof_NullLiteral()
-        {
-            // We'd only normally see this with FormatDefaultValues set to true.
-            string json = "{ \"nullValue\": null }";
-            var message = NullValueNotInOneof.Parser.ParseJson(json);
-            Assert.AreEqual(NullValue.NullValue, message.NullValue);
-        }
-
-        // NullValue used to only be converted to the null literal when part of a struct.
-        // Otherwise, it would end up as a string "NULL_VALUE" (the name of the enum value).
-        // We still parse that form, for compatibility.
-        [Test]
-        public void NullValueOutsideStruct_Compatibility()
-        {
-            string json = "{ \"nullValue\": \"NULL_VALUE\" }";
-            var message = NullValueOutsideStruct.Parser.ParseJson(json);
-            Assert.AreEqual(NullValueOutsideStruct.ValueOneofCase.NullValue, message.ValueCase);
-        }
-
-        [Test]
-        public void NullValueNotInOneof_Compatibility()
-        {
-            // We'd only normally see this with FormatDefaultValues set to true.
-            string json = "{ \"nullValue\": \"NULL_VALUE\" }";
-            var message = NullValueNotInOneof.Parser.ParseJson(json);
-            Assert.AreEqual(NullValue.NullValue, message.NullValue);
-        }
-
-        /// <summary>
-        /// Various tests use strings which have quotes round them for parsing or as the result
-        /// of formatting, but without those quotes being specified in the tests (for the sake of readability).
-        /// This method simply returns the input, wrapped in double quotes.
-        /// </summary>
-        internal static string WrapInQuotes(string text)
-        {
-            return '"' + text + '"';
-        }
-
-        [Test]
-        public void ParseAllNullValues()
-        {
-            string json = @"{
-  ""optionalInt32"": null,
-  ""optionalInt64"": null,
-  ""optionalUint32"": null,
-  ""optionalUint64"": null,
-  ""optionalSint32"": null,
-  ""optionalSint64"": null,
-  ""optionalFixed32"": null,
-  ""optionalFixed64"": null,
-  ""optionalSfixed32"": null,
-  ""optionalSfixed64"": null,
-  ""optionalFloat"": null,
-  ""optionalDouble"": null,
-  ""optionalBool"": null,
-  ""optionalString"": null,
-  ""optionalBytes"": null,
-  ""optionalNestedEnum"": null,
-  ""optionalNestedMessage"": null,
-  ""repeatedInt32"": null,
-  ""repeatedInt64"": null,
-  ""repeatedUint32"": null,
-  ""repeatedUint64"": null,
-  ""repeatedSint32"": null,
-  ""repeatedSint64"": null,
-  ""repeatedFixed32"": null,
-  ""repeatedFixed64"": null,
-  ""repeatedSfixed32"": null,
-  ""repeatedSfixed64"": null,
-  ""repeatedFloat"": null,
-  ""repeatedDouble"": null,
-  ""repeatedBool"": null,
-  ""repeatedString"": null,
-  ""repeatedBytes"": null,
-  ""repeatedNestedEnum"": null,
-  ""repeatedNestedMessage"": null,
-  ""mapInt32Int32"": null,
-  ""mapBoolBool"": null,
-  ""mapStringNestedMessage"": null
-}";
-
-            TestAllTypesProto3 message = new TestAllTypesProto3();
-
-            message.OptionalInt32 = 1;
-            message.OptionalInt64 = 1;
-            message.OptionalUint32 = 1;
-            message.OptionalUint64 = 1;
-            message.OptionalSint32 = 1;
-            message.OptionalSint64 = 1;
-            message.OptionalFixed32 = 1;
-            message.OptionalFixed64 = 1;
-            message.OptionalSfixed32 = 1;
-            message.OptionalSfixed64 = 1;
-            message.OptionalFloat = 1;
-            message.OptionalDouble = 1;
-            message.OptionalBool = true;
-            message.OptionalString = "1";
-            message.OptionalBytes = ByteString.CopyFrom(new byte[] { 1 });
-            message.OptionalNestedEnum = TestAllTypesProto3.Types.NestedEnum.Bar;
-            message.OptionalNestedMessage = new TestAllTypesProto3.Types.NestedMessage();
-            message.RepeatedInt32.Add(1);
-            message.RepeatedInt64.Add(1);
-            message.RepeatedUint32.Add(1);
-            message.RepeatedUint64.Add(1);
-            message.RepeatedSint32.Add(1);
-            message.RepeatedSint64.Add(1);
-            message.RepeatedFixed32.Add(1);
-            message.RepeatedFixed64.Add(1);
-            message.RepeatedSfixed32.Add(1);
-            message.RepeatedSfixed64.Add(1);
-            message.RepeatedFloat.Add(1);
-            message.RepeatedDouble.Add(1);
-            message.RepeatedBool.Add(true);
-            message.RepeatedString.Add("1");
-            message.RepeatedBytes.Add(ByteString.CopyFrom(new byte[] { 1 }));
-            message.RepeatedNestedEnum.Add(TestAllTypesProto3.Types.NestedEnum.Bar);
-            message.RepeatedNestedMessage.Add(new TestAllTypesProto3.Types.NestedMessage());
-            message.MapInt32Int32.Add(1, 1);
-            message.MapBoolBool.Add(true, true);
-            message.MapStringNestedMessage.Add(" ", new TestAllTypesProto3.Types.NestedMessage());
-
-            JsonParser.Default.Merge(message, json);
-
-            Assert.AreEqual(0, message.OptionalInt32);
-            Assert.AreEqual(0, message.OptionalInt64);
-            Assert.AreEqual(0, message.OptionalUint32);
-            Assert.AreEqual(0, message.OptionalUint64);
-            Assert.AreEqual(0, message.OptionalSint32);
-            Assert.AreEqual(0, message.OptionalSint64);
-            Assert.AreEqual(0, message.OptionalFixed32);
-            Assert.AreEqual(0, message.OptionalFixed64);
-            Assert.AreEqual(0, message.OptionalSfixed32);
-            Assert.AreEqual(0, message.OptionalSfixed64);
-            Assert.AreEqual(0, message.OptionalFloat);
-            Assert.AreEqual(0, message.OptionalDouble);
-            Assert.AreEqual(false, message.OptionalBool);
-            Assert.AreEqual("", message.OptionalString);
-            Assert.AreEqual(ByteString.Empty, message.OptionalBytes);
-            Assert.AreEqual(TestAllTypesProto3.Types.NestedEnum.Foo, message.OptionalNestedEnum);
-            Assert.AreEqual(null, message.OptionalNestedMessage);
-            Assert.AreEqual(0, message.RepeatedInt32.Count);
-            Assert.AreEqual(0, message.RepeatedInt64.Count);
-            Assert.AreEqual(0, message.RepeatedUint32.Count);
-            Assert.AreEqual(0, message.RepeatedUint64.Count);
-            Assert.AreEqual(0, message.RepeatedSint32.Count);
-            Assert.AreEqual(0, message.RepeatedSint64.Count);
-            Assert.AreEqual(0, message.RepeatedFixed32.Count);
-            Assert.AreEqual(0, message.RepeatedFixed64.Count);
-            Assert.AreEqual(0, message.RepeatedSfixed32.Count);
-            Assert.AreEqual(0, message.RepeatedFloat.Count);
-            Assert.AreEqual(0, message.RepeatedDouble.Count);
-            Assert.AreEqual(0, message.RepeatedBool.Count);
-            Assert.AreEqual(0, message.RepeatedString.Count);
-            Assert.AreEqual(0, message.RepeatedBytes.Count);
-            Assert.AreEqual(0, message.RepeatedNestedEnum.Count);
-            Assert.AreEqual(0, message.RepeatedNestedMessage.Count);
-            Assert.AreEqual(0, message.MapInt32Int32.Count);
-            Assert.AreEqual(0, message.MapBoolBool.Count);
-            Assert.AreEqual(0, message.MapStringNestedMessage.Count);
-        }
-    }
-}
\ No newline at end of file
diff --git a/libs/protobuf/csharp/src/Google.Protobuf.Test/JsonTokenizerTest.cs b/libs/protobuf/csharp/src/Google.Protobuf.Test/JsonTokenizerTest.cs
deleted file mode 100644
index df43eff..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf.Test/JsonTokenizerTest.cs
+++ /dev/null
@@ -1,424 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-using NUnit.Framework;
-using System;
-using System.IO;
-
-namespace Google.Protobuf
-{
-    public class JsonTokenizerTest
-    {
-        [Test]
-        public void EmptyObjectValue()
-        {
-            AssertTokens("{}", JsonToken.StartObject, JsonToken.EndObject);
-        }
-
-        [Test]
-        public void EmptyArrayValue()
-        {
-            AssertTokens("[]", JsonToken.StartArray, JsonToken.EndArray);
-        }
-
-        [Test]
-        [TestCase("foo", "foo")]
-        [TestCase("tab\\t", "tab\t")]
-        [TestCase("line\\nfeed", "line\nfeed")]
-        [TestCase("carriage\\rreturn", "carriage\rreturn")]
-        [TestCase("back\\bspace", "back\bspace")]
-        [TestCase("form\\ffeed", "form\ffeed")]
-        [TestCase("escaped\\/slash", "escaped/slash")]
-        [TestCase("escaped\\\\backslash", "escaped\\backslash")]
-        [TestCase("escaped\\\"quote", "escaped\"quote")]
-        [TestCase("foo {}[] bar", "foo {}[] bar")]
-        [TestCase("foo\\u09aFbar", "foo\u09afbar")] // Digits, upper hex, lower hex
-        [TestCase("ab\ud800\udc00cd", "ab\ud800\udc00cd")]
-        [TestCase("ab\\ud800\\udc00cd", "ab\ud800\udc00cd")]
-        public void StringValue(string json, string expectedValue)
-        {
-            AssertTokensNoReplacement("\"" + json + "\"", JsonToken.Value(expectedValue));
-        }
-
-        // Valid surrogate pairs, with mixed escaping. These test cases can't be expressed
-        // using TestCase as they have no valid UTF-8 representation.
-        // It's unclear exactly how we should handle a mixture of escaped or not: that can't
-        // come from UTF-8 text, but could come from a .NET string. For the moment,
-        // treat it as valid in the obvious way.
-        [Test]
-        public void MixedSurrogatePairs()
-        {
-            string expected = "\ud800\udc00";
-            AssertTokens("'\\ud800\udc00'", JsonToken.Value(expected));
-            AssertTokens("'\ud800\\udc00'", JsonToken.Value(expected));
-        }
-
-        [Test]
-        public void ObjectDepth()
-        {
-            string json = "{ \"foo\": { \"x\": 1, \"y\": [ 0 ] } }";
-            var tokenizer = JsonTokenizer.FromTextReader(new StringReader(json));
-            // If we had more tests like this, I'd introduce a helper method... but for one test, it's not worth it.
-            Assert.AreEqual(0, tokenizer.ObjectDepth);
-            Assert.AreEqual(JsonToken.StartObject, tokenizer.Next());
-            Assert.AreEqual(1, tokenizer.ObjectDepth);
-            Assert.AreEqual(JsonToken.Name("foo"), tokenizer.Next());
-            Assert.AreEqual(1, tokenizer.ObjectDepth);
-            Assert.AreEqual(JsonToken.StartObject, tokenizer.Next());
-            Assert.AreEqual(2, tokenizer.ObjectDepth);
-            Assert.AreEqual(JsonToken.Name("x"), tokenizer.Next());
-            Assert.AreEqual(2, tokenizer.ObjectDepth);
-            Assert.AreEqual(JsonToken.Value(1), tokenizer.Next());
-            Assert.AreEqual(2, tokenizer.ObjectDepth);
-            Assert.AreEqual(JsonToken.Name("y"), tokenizer.Next());
-            Assert.AreEqual(2, tokenizer.ObjectDepth);
-            Assert.AreEqual(JsonToken.StartArray, tokenizer.Next());
-            Assert.AreEqual(2, tokenizer.ObjectDepth); // Depth hasn't changed in array
-            Assert.AreEqual(JsonToken.Value(0), tokenizer.Next());
-            Assert.AreEqual(2, tokenizer.ObjectDepth);
-            Assert.AreEqual(JsonToken.EndArray, tokenizer.Next());
-            Assert.AreEqual(2, tokenizer.ObjectDepth);
-            Assert.AreEqual(JsonToken.EndObject, tokenizer.Next());
-            Assert.AreEqual(1, tokenizer.ObjectDepth);
-            Assert.AreEqual(JsonToken.EndObject, tokenizer.Next());
-            Assert.AreEqual(0, tokenizer.ObjectDepth);
-            Assert.AreEqual(JsonToken.EndDocument, tokenizer.Next());
-            Assert.AreEqual(0, tokenizer.ObjectDepth);
-        }
-
-        [Test]
-        public void ObjectDepth_WithPushBack()
-        {
-            string json = "{}";
-            var tokenizer = JsonTokenizer.FromTextReader(new StringReader(json));
-            Assert.AreEqual(0, tokenizer.ObjectDepth);
-            var token = tokenizer.Next();
-            Assert.AreEqual(1, tokenizer.ObjectDepth);
-            // When we push back a "start object", we should effectively be back to the previous depth.
-            tokenizer.PushBack(token);
-            Assert.AreEqual(0, tokenizer.ObjectDepth);
-            // Read the same token again, and get back to depth 1
-            token = tokenizer.Next();
-            Assert.AreEqual(1, tokenizer.ObjectDepth);
-
-            // Now the same in reverse, with EndObject
-            token = tokenizer.Next();
-            Assert.AreEqual(0, tokenizer.ObjectDepth);
-            tokenizer.PushBack(token);
-            Assert.AreEqual(1, tokenizer.ObjectDepth);
-            tokenizer.Next();
-            Assert.AreEqual(0, tokenizer.ObjectDepth);
-        }
-
-        [Test]
-        [TestCase("embedded tab\t")]
-        [TestCase("embedded CR\r")]
-        [TestCase("embedded LF\n")]
-        [TestCase("embedded bell\u0007")]
-        [TestCase("bad escape\\a")]
-        [TestCase("incomplete escape\\")]
-        [TestCase("incomplete Unicode escape\\u000")]
-        [TestCase("invalid Unicode escape\\u000H")]
-        // Surrogate pair handling, both in raw .NET strings and escaped. We only need
-        // to detect this in strings, as non-ASCII characters anywhere other than in strings
-        // will already lead to parsing errors.
-        [TestCase("\\ud800")]
-        [TestCase("\\udc00")]
-        [TestCase("\\ud800x")]
-        [TestCase("\\udc00x")]
-        [TestCase("\\udc00\\ud800y")]
-        public void InvalidStringValue(string json)
-        {
-            AssertThrowsAfter("\"" + json + "\"");
-        }
-
-        // Tests for invalid strings that can't be expressed in attributes,
-        // as the constants can't be expressed as UTF-8 strings.
-        [Test]
-        public void InvalidSurrogatePairs()
-        {
-            AssertThrowsAfter("\"\ud800x\"");
-            AssertThrowsAfter("\"\udc00y\"");
-            AssertThrowsAfter("\"\udc00\ud800y\"");
-        }
-
-        [Test]
-        [TestCase("0", 0)]
-        [TestCase("-0", 0)] // We don't distinguish between positive and negative 0
-        [TestCase("1", 1)]
-        [TestCase("-1", -1)]
-        // From here on, assume leading sign is okay...
-        [TestCase("1.125", 1.125)]
-        [TestCase("1.0", 1)]
-        [TestCase("1e5", 100000)]
-        [TestCase("1e000000", 1)] // Weird, but not prohibited by the spec
-        [TestCase("1E5", 100000)]
-        [TestCase("1e+5", 100000)]
-        [TestCase("1E-5", 0.00001)]
-        [TestCase("123E-2", 1.23)]
-        [TestCase("123.45E3", 123450)]
-        [TestCase("   1   ", 1)]
-        public void NumberValue(string json, double expectedValue)
-        {
-            AssertTokens(json, JsonToken.Value(expectedValue));
-        }
-
-        [Test]
-        [TestCase("00")]
-        [TestCase(".5")]
-        [TestCase("1.")]
-        [TestCase("1e")]
-        [TestCase("1e-")]
-        [TestCase("--")]
-        [TestCase("--1")]
-        [TestCase("-1.7977e308")]
-        [TestCase("1.7977e308")]
-        public void InvalidNumberValue(string json)
-        {
-            AssertThrowsAfter(json);
-        }
-
-        [Test]
-        [TestCase("nul")]
-        [TestCase("nothing")]
-        [TestCase("truth")]
-        [TestCase("fALSEhood")]
-        public void InvalidLiterals(string json)
-        {
-            AssertThrowsAfter(json);
-        }
-
-        [Test]
-        public void NullValue()
-        {
-            AssertTokens("null", JsonToken.Null);
-        }
-
-        [Test]
-        public void TrueValue()
-        {
-            AssertTokens("true", JsonToken.True);
-        }
-
-        [Test]
-        public void FalseValue()
-        {
-            AssertTokens("false", JsonToken.False);
-        }
-
-        [Test]
-        public void SimpleObject()
-        {
-            AssertTokens("{'x': 'y'}",
-                JsonToken.StartObject, JsonToken.Name("x"), JsonToken.Value("y"), JsonToken.EndObject);
-        }
-
-        [Test]
-        [TestCase("[10, 20", 3)]
-        [TestCase("[10,", 2)]
-        [TestCase("[10:20]", 2)]
-        [TestCase("[", 1)]
-        [TestCase("[,", 1)]
-        [TestCase("{", 1)]
-        [TestCase("{,", 1)]
-        [TestCase("{[", 1)]
-        [TestCase("{{", 1)]
-        [TestCase("{0", 1)]
-        [TestCase("{null", 1)]
-        [TestCase("{false", 1)]
-        [TestCase("{true", 1)]
-        [TestCase("}", 0)]
-        [TestCase("]", 0)]
-        [TestCase(",", 0)]
-        [TestCase("'foo' 'bar'", 1)]
-        [TestCase(":", 0)]
-        [TestCase("'foo", 0)] // Incomplete string
-        [TestCase("{ 'foo' }", 2)]
-        [TestCase("{ x:1", 1)] // Property names must be quoted
-        [TestCase("{]", 1)]
-        [TestCase("[}", 1)]
-        [TestCase("[1,", 2)]
-        [TestCase("{'x':0]", 3)]
-        [TestCase("{ 'foo': }", 2)]
-        [TestCase("{ 'foo':'bar', }", 3)]
-        public void InvalidStructure(string json, int expectedValidTokens)
-        {
-            // Note: we don't test that the earlier tokens are exactly as expected,
-            // partly because that's hard to parameterize.
-            var reader = new StringReader(json.Replace('\'', '"'));
-            var tokenizer = JsonTokenizer.FromTextReader(reader);
-            for (int i = 0; i < expectedValidTokens; i++)
-            {
-                Assert.IsNotNull(tokenizer.Next());
-            }
-            Assert.Throws<InvalidJsonException>(() => tokenizer.Next());
-        }
-
-        [Test]
-        public void ArrayMixedType()
-        {
-            AssertTokens("[1, 'foo', null, false, true, [2], {'x':'y' }]",
-                JsonToken.StartArray,
-                JsonToken.Value(1),
-                JsonToken.Value("foo"),
-                JsonToken.Null,
-                JsonToken.False,
-                JsonToken.True,
-                JsonToken.StartArray,
-                JsonToken.Value(2),
-                JsonToken.EndArray,
-                JsonToken.StartObject,
-                JsonToken.Name("x"),
-                JsonToken.Value("y"),
-                JsonToken.EndObject,
-                JsonToken.EndArray);
-        }
-
-        [Test]
-        public void ObjectMixedType()
-        {
-            AssertTokens(@"{'a': 1, 'b': 'bar', 'c': null, 'd': false, 'e': true,
-                           'f': [2], 'g': {'x':'y' }}",
-                JsonToken.StartObject,
-                JsonToken.Name("a"),
-                JsonToken.Value(1),
-                JsonToken.Name("b"),
-                JsonToken.Value("bar"),
-                JsonToken.Name("c"),
-                JsonToken.Null,
-                JsonToken.Name("d"),
-                JsonToken.False,
-                JsonToken.Name("e"),
-                JsonToken.True,
-                JsonToken.Name("f"),
-                JsonToken.StartArray,
-                JsonToken.Value(2),
-                JsonToken.EndArray,
-                JsonToken.Name("g"),
-                JsonToken.StartObject,
-                JsonToken.Name("x"),
-                JsonToken.Value("y"),
-                JsonToken.EndObject,
-                JsonToken.EndObject);
-        }
-
-        [Test]
-        public void NextAfterEndDocumentThrows()
-        {
-            var tokenizer = JsonTokenizer.FromTextReader(new StringReader("null"));
-            Assert.AreEqual(JsonToken.Null, tokenizer.Next());
-            Assert.AreEqual(JsonToken.EndDocument, tokenizer.Next());
-            Assert.Throws<InvalidOperationException>(() => tokenizer.Next());
-        }
-
-        [Test]
-        public void CanPushBackEndDocument()
-        {
-            var tokenizer = JsonTokenizer.FromTextReader(new StringReader("null"));
-            Assert.AreEqual(JsonToken.Null, tokenizer.Next());
-            Assert.AreEqual(JsonToken.EndDocument, tokenizer.Next());
-            tokenizer.PushBack(JsonToken.EndDocument);
-            Assert.AreEqual(JsonToken.EndDocument, tokenizer.Next());
-            Assert.Throws<InvalidOperationException>(() => tokenizer.Next());
-        }
-
-        [Test]
-        [TestCase("{ 'skip': 0, 'next': 1")]
-        [TestCase("{ 'skip': [0, 1, 2], 'next': 1")]
-        [TestCase("{ 'skip': 'x', 'next': 1")]
-        [TestCase("{ 'skip': ['x', 'y'], 'next': 1")]
-        [TestCase("{ 'skip': {'a': 0}, 'next': 1")]
-        [TestCase("{ 'skip': {'a': [0, {'b':[]}]}, 'next': 1")]
-        public void SkipValue(string json)
-        {
-            var tokenizer = JsonTokenizer.FromTextReader(new StringReader(json.Replace('\'', '"')));
-            Assert.AreEqual(JsonToken.StartObject, tokenizer.Next());
-            Assert.AreEqual("skip", tokenizer.Next().StringValue);
-            tokenizer.SkipValue();
-            Assert.AreEqual("next", tokenizer.Next().StringValue);
-        }
-
-        /// <summary>
-        /// Asserts that the specified JSON is tokenized into the given sequence of tokens.
-        /// All apostrophes are first converted to double quotes, allowing any tests
-        /// that don't need to check actual apostrophe handling to use apostrophes in the JSON, avoiding
-        /// messy string literal escaping. The "end document" token is not specified in the list of
-        /// expected tokens, but is implicit.
-        /// </summary>
-        private static void AssertTokens(string json, params JsonToken[] expectedTokens)
-        {
-            AssertTokensNoReplacement(json.Replace('\'', '"'), expectedTokens);
-        }
-
-        /// <summary>
-        /// Asserts that the specified JSON is tokenized into the given sequence of tokens.
-        /// Unlike <see cref="AssertTokens(string, JsonToken[])"/>, this does not perform any character
-        /// replacement on the specified JSON, and should be used when the text contains apostrophes which
-        /// are expected to be used *as* apostrophes. The "end document" token is not specified in the list of
-        /// expected tokens, but is implicit.
-        /// </summary>
-        private static void AssertTokensNoReplacement(string json, params JsonToken[] expectedTokens)
-        {
-            var reader = new StringReader(json);
-            var tokenizer = JsonTokenizer.FromTextReader(reader);
-            for (int i = 0; i < expectedTokens.Length; i++)
-            {
-                var actualToken = tokenizer.Next();
-                if (actualToken == JsonToken.EndDocument)
-                {
-                    Assert.Fail("Expected {0} but reached end of token stream", expectedTokens[i]);
-                }
-                Assert.AreEqual(expectedTokens[i], actualToken);
-            }
-            var finalToken = tokenizer.Next();
-            if (finalToken != JsonToken.EndDocument)
-            {
-                Assert.Fail("Expected token stream to be exhausted; received {0}", finalToken);
-            }
-        }
-
-        private static void AssertThrowsAfter(string json, params JsonToken[] expectedTokens)
-        {
-            var reader = new StringReader(json);
-            var tokenizer = JsonTokenizer.FromTextReader(reader);
-            for (int i = 0; i < expectedTokens.Length; i++)
-            {
-                var actualToken = tokenizer.Next();
-                if (actualToken == JsonToken.EndDocument)
-                {
-                    Assert.Fail("Expected {0} but reached end of document", expectedTokens[i]);
-                }
-                Assert.AreEqual(expectedTokens[i], actualToken);
-            }
-            Assert.Throws<InvalidJsonException>(() => tokenizer.Next());
-        }
-    }
-}
diff --git a/libs/protobuf/csharp/src/Google.Protobuf.Test/LegacyGeneratedCodeTest.cs b/libs/protobuf/csharp/src/Google.Protobuf.Test/LegacyGeneratedCodeTest.cs
deleted file mode 100644
index 22adcaa..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf.Test/LegacyGeneratedCodeTest.cs
+++ /dev/null
@@ -1,296 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-using Google.Protobuf;
-using Google.Protobuf.Reflection;
-using System.Buffers;
-using pb = global::Google.Protobuf;
-using pbr = global::Google.Protobuf.Reflection;
-using NUnit.Framework;
-using System.IO;
-using System;
-using Google.Protobuf.Buffers;
-
-namespace Google.Protobuf
-{
-    public class LegacyGeneratedCodeTest
-    {
-        [Test]
-        public void IntermixingOfNewAndLegacyGeneratedCodeWorksWithCodedInputStream()
-        {
-            var message = new ParseContextEnabledMessageB
-            {
-                A = new LegacyGeneratedCodeMessageA
-                {
-                    Bb = new ParseContextEnabledMessageB { OptionalInt32 = 12345 }
-                },
-                OptionalInt32 = 6789
-            };
-            var data = message.ToByteArray();
-
-            // when parsing started using CodedInputStream and a message with legacy generated code
-            // is encountered somewhere in the parse tree, we still need to be able to use its
-            // MergeFrom(CodedInputStream) method to parse correctly.
-            var codedInput = new CodedInputStream(data);
-            var parsed = new ParseContextEnabledMessageB();
-            codedInput.ReadRawMessage(parsed);
-            Assert.IsTrue(codedInput.IsAtEnd);
-
-            Assert.AreEqual(12345, parsed.A.Bb.OptionalInt32);
-            Assert.AreEqual(6789, parsed.OptionalInt32);
-        }
-
-        [Test]
-        public void LegacyGeneratedCodeThrowsWithReadOnlySequence()
-        {
-            var message = new ParseContextEnabledMessageB
-            {
-                A = new LegacyGeneratedCodeMessageA
-                {
-                    Bb = new ParseContextEnabledMessageB { OptionalInt32 = 12345 }
-                },
-                OptionalInt32 = 6789
-            };
-            var data = message.ToByteArray();
-
-            // if parsing started using ReadOnlySequence and we don't have a CodedInputStream
-            // instance at hand, we cannot fall back to the legacy MergeFrom(CodedInputStream)
-            // method and parsing will fail. As a consequence, one can only use parsing
-            // from ReadOnlySequence if all the messages in the parsing tree have their generated
-            // code up to date.
-            var exception = Assert.Throws<InvalidProtocolBufferException>(() =>
-            {
-                ParseContext.Initialize(new ReadOnlySequence<byte>(data), out ParseContext parseCtx);
-                var parsed = new ParseContextEnabledMessageB();
-                ParsingPrimitivesMessages.ReadRawMessage(ref parseCtx, parsed);
-            });
-            Assert.AreEqual($"Message {typeof(LegacyGeneratedCodeMessageA).Name} doesn't provide the generated method that enables ParseContext-based parsing. You might need to regenerate the generated protobuf code.", exception.Message);
-        }
-
-        [Test]
-        public void IntermixingOfNewAndLegacyGeneratedCodeWorksWithCodedOutputStream()
-        {
-            // when serialization started using CodedOutputStream and a message with legacy generated code
-            // is encountered somewhere in the parse tree, we still need to be able to use its
-            // WriteTo(CodedOutputStream) method to serialize correctly.
-            var ms = new MemoryStream();
-            var codedOutput = new CodedOutputStream(ms);
-            var message = new ParseContextEnabledMessageB
-            {
-                A = new LegacyGeneratedCodeMessageA
-                {
-                    Bb = new ParseContextEnabledMessageB { OptionalInt32 = 12345 }
-                },
-                OptionalInt32 = 6789
-            };
-            message.WriteTo(codedOutput);
-            codedOutput.Flush();
-
-            var codedInput = new CodedInputStream(ms.ToArray());
-            var parsed = new ParseContextEnabledMessageB();
-            codedInput.ReadRawMessage(parsed);
-            Assert.IsTrue(codedInput.IsAtEnd);
-
-            Assert.AreEqual(12345, parsed.A.Bb.OptionalInt32);
-            Assert.AreEqual(6789, parsed.OptionalInt32);
-        }
-
-        [Test]
-        public void LegacyGeneratedCodeThrowsWithIBufferWriter()
-        {
-            // if serialization started using IBufferWriter and we don't have a CodedOutputStream
-            // instance at hand, we cannot fall back to the legacy WriteTo(CodedOutputStream)
-            // method and serializatin will fail. As a consequence, one can only use serialization
-            // to IBufferWriter if all the messages in the parsing tree have their generated
-            // code up to date.
-            var message = new ParseContextEnabledMessageB
-            {
-                A = new LegacyGeneratedCodeMessageA
-                {
-                    Bb = new ParseContextEnabledMessageB { OptionalInt32 = 12345 }
-                },
-                OptionalInt32 = 6789
-            };
-            var exception = Assert.Throws<InvalidProtocolBufferException>(() =>
-            {
-                WriteContext.Initialize(new TestArrayBufferWriter<byte>(), out WriteContext writeCtx);
-                ((IBufferMessage)message).InternalWriteTo(ref writeCtx);
-            });
-            Assert.AreEqual($"Message {typeof(LegacyGeneratedCodeMessageA).Name} doesn't provide the generated method that enables WriteContext-based serialization. You might need to regenerate the generated protobuf code.", exception.Message);
-        }
-
-        // hand-modified version of a generated message that only provides the legacy
-        // MergeFrom(CodedInputStream) method and doesn't implement IBufferMessage.
-        private sealed partial class LegacyGeneratedCodeMessageA : pb::IMessage {
-          private pb::UnknownFieldSet _unknownFields;
-
-          pbr::MessageDescriptor pb::IMessage.Descriptor => throw new System.NotImplementedException();
-
-          /// <summary>Field number for the "bb" field.</summary>
-          public const int BbFieldNumber = 1;
-          private ParseContextEnabledMessageB bb_;
-          public ParseContextEnabledMessageB Bb {
-            get { return bb_; }
-            set {
-              bb_ = value;
-            }
-          }
-
-          public void WriteTo(pb::CodedOutputStream output) {
-            if (bb_ != null) {
-              output.WriteRawTag(10);
-              output.WriteMessage(Bb);
-            }
-            if (_unknownFields != null) {
-              _unknownFields.WriteTo(output);
-            }
-          }
-
-          public int CalculateSize() {
-            int size = 0;
-            if (bb_ != null) {
-              size += 1 + pb::CodedOutputStream.ComputeMessageSize(Bb);
-            }
-            if (_unknownFields != null) {
-              size += _unknownFields.CalculateSize();
-            }
-            return size;
-          }
-
-          public void MergeFrom(pb::CodedInputStream input) {
-            uint tag;
-            while ((tag = input.ReadTag()) != 0) {
-              switch(tag) {
-                default:
-                  _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-                  break;
-                case 10: {
-                  if (bb_ == null) {
-                    Bb = new ParseContextEnabledMessageB();
-                  }
-                  input.ReadMessage(Bb);
-                  break;
-                }
-              }
-            }
-          }
-        }
-
-        // hand-modified version of a generated message that does provide
-        // the new InternalMergeFrom(ref ParseContext) method.
-        private sealed partial class ParseContextEnabledMessageB : pb::IBufferMessage {
-          private pb::UnknownFieldSet _unknownFields;
-
-          pbr::MessageDescriptor pb::IMessage.Descriptor => throw new System.NotImplementedException();
-
-          /// <summary>Field number for the "a" field.</summary>
-          public const int AFieldNumber = 1;
-          private LegacyGeneratedCodeMessageA a_;
-          public LegacyGeneratedCodeMessageA A {
-            get { return a_; }
-            set {
-              a_ = value;
-            }
-          }
-
-          /// <summary>Field number for the "optional_int32" field.</summary>
-          public const int OptionalInt32FieldNumber = 2;
-          private int optionalInt32_;
-          public int OptionalInt32 {
-            get { return optionalInt32_; }
-            set {
-              optionalInt32_ = value;
-            }
-          }
-
-          public void WriteTo(pb::CodedOutputStream output) {
-            output.WriteRawMessage(this);
-          }
-
-          void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output)
-          {
-            if (a_ != null)
-            {
-              output.WriteRawTag(10);
-              output.WriteMessage(A);
-            }
-            if (OptionalInt32 != 0)
-            {
-              output.WriteRawTag(16);
-              output.WriteInt32(OptionalInt32);
-            }
-            if (_unknownFields != null)
-            {
-              _unknownFields.WriteTo(ref output);
-            }
-          }
-
-          public int CalculateSize() {
-            int size = 0;
-            if (a_ != null) {
-              size += 1 + pb::CodedOutputStream.ComputeMessageSize(A);
-            }
-            if (OptionalInt32 != 0) {
-              size += 1 + pb::CodedOutputStream.ComputeInt32Size(OptionalInt32);
-            }
-            if (_unknownFields != null) {
-              size += _unknownFields.CalculateSize();
-            }
-            return size;
-          }
-          public void MergeFrom(pb::CodedInputStream input) {
-            input.ReadRawMessage(this);
-          }
-
-          void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-            uint tag;
-            while ((tag = input.ReadTag()) != 0) {
-              switch(tag) {
-                default:
-                  _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-                  break;
-                case 10: {
-                  if (a_ == null) {
-                    A = new LegacyGeneratedCodeMessageA();
-                  }
-                  input.ReadMessage(A);
-                  break;
-                }
-                case 16: {
-                  OptionalInt32 = input.ReadInt32();
-                  break;
-                }
-              }
-            }
-          }
-        }
-    }
-}
\ No newline at end of file
diff --git a/libs/protobuf/csharp/src/Google.Protobuf.Test/MessageParsingHelpers.cs b/libs/protobuf/csharp/src/Google.Protobuf.Test/MessageParsingHelpers.cs
deleted file mode 100644
index 05f1e36..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf.Test/MessageParsingHelpers.cs
+++ /dev/null
@@ -1,154 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using NUnit.Framework;
-using System;
-using System.Buffers;
-using Google.Protobuf.Buffers;
-
-namespace Google.Protobuf
-{
-    public static class MessageParsingHelpers
-    {
-        public static void AssertReadingMessage<T>(MessageParser<T> parser, byte[] bytes, Action<T> assert) where T : IMessage<T>
-        {
-            var parsedMsg = parser.ParseFrom(bytes);
-            assert(parsedMsg);
-
-            // Load content as single segment
-            parsedMsg = parser.ParseFrom(new ReadOnlySequence<byte>(bytes));
-            assert(parsedMsg);
-
-            // Load content as multiple segments
-            parsedMsg = parser.ParseFrom(ReadOnlySequenceFactory.CreateWithContent(bytes));
-            assert(parsedMsg);
-
-            // Load content as ReadOnlySpan
-            parsedMsg = parser.ParseFrom(new ReadOnlySpan<byte>(bytes));
-            assert(parsedMsg);
-        }
-
-        public static void AssertReadingMessage(MessageParser parser, byte[] bytes, Action<IMessage> assert)
-        {
-            var parsedMsg = parser.ParseFrom(bytes);
-            assert(parsedMsg);
-
-            // Load content as single segment
-            parsedMsg = parser.ParseFrom(new ReadOnlySequence<byte>(bytes));
-            assert(parsedMsg);
-
-            // Load content as multiple segments
-            parsedMsg = parser.ParseFrom(ReadOnlySequenceFactory.CreateWithContent(bytes));
-            assert(parsedMsg);
-
-            // Load content as ReadOnlySpan
-            parsedMsg = parser.ParseFrom(new ReadOnlySpan<byte>(bytes));
-            assert(parsedMsg);
-        }
-
-        public static void AssertReadingMessageThrows<TMessage, TException>(MessageParser<TMessage> parser, byte[] bytes)
-            where TMessage : IMessage<TMessage>
-            where TException : Exception
-        {
-            Assert.Throws<TException>(() => parser.ParseFrom(bytes));
-
-            Assert.Throws<TException>(() => parser.ParseFrom(new ReadOnlySequence<byte>(bytes)));
-
-            Assert.Throws<TException>(() => parser.ParseFrom(new ReadOnlySpan<byte>(bytes)));
-        }
-
-        public static void AssertRoundtrip<T>(MessageParser<T> parser, T message, Action<T> additionalAssert = null) where T : IMessage<T>
-        {
-            var bytes = message.ToByteArray();
-
-            // also serialize using IBufferWriter and check it leads to the same data
-            var bufferWriter = new TestArrayBufferWriter<byte>();
-            message.WriteTo(bufferWriter);
-            Assert.AreEqual(bytes, bufferWriter.WrittenSpan.ToArray(), "Both serialization approaches need to result in the same data.");
-
-            var parsedMsg = parser.ParseFrom(bytes);
-            Assert.AreEqual(message, parsedMsg);
-            additionalAssert?.Invoke(parsedMsg);
-
-            // Load content as single segment
-            parsedMsg = parser.ParseFrom(new ReadOnlySequence<byte>(bytes));
-            Assert.AreEqual(message, parsedMsg);
-            additionalAssert?.Invoke(parsedMsg);
-
-            // Load content as multiple segments
-            parsedMsg = parser.ParseFrom(ReadOnlySequenceFactory.CreateWithContent(bytes));
-            Assert.AreEqual(message, parsedMsg);
-            additionalAssert?.Invoke(parsedMsg);
-
-            // Load content as ReadOnlySpan
-            parsedMsg = parser.ParseFrom(new ReadOnlySpan<byte>(bytes));
-            Assert.AreEqual(message, parsedMsg);
-            additionalAssert?.Invoke(parsedMsg);
-        }
-
-        public static void AssertWritingMessage(IMessage message)
-        {
-            // serialize using CodedOutputStream
-            var bytes = message.ToByteArray();
-
-            int messageSize = message.CalculateSize(); 
-            Assert.AreEqual(message.CalculateSize(), bytes.Length);
-
-            // serialize using IBufferWriter and check it leads to the same output
-            var bufferWriter = new TestArrayBufferWriter<byte>();
-            message.WriteTo(bufferWriter);
-            Assert.AreEqual(bytes, bufferWriter.WrittenSpan.ToArray());
-
-            // serialize into a single span and check it leads to the same output
-            var singleSpan = new Span<byte>(new byte[messageSize]);
-            message.WriteTo(singleSpan);
-            Assert.AreEqual(bytes, singleSpan.ToArray());
-
-            // test for different IBufferWriter.GetSpan() segment sizes
-            for (int blockSize = 1; blockSize < 256; blockSize *= 2)
-            {
-                var segmentedBufferWriter = new TestArrayBufferWriter<byte>();
-                segmentedBufferWriter.MaxGrowBy = blockSize;
-                message.WriteTo(segmentedBufferWriter);
-                Assert.AreEqual(bytes, segmentedBufferWriter.WrittenSpan.ToArray());
-            }
-
-            // if the full message is small enough, try serializing directly into stack-allocated buffer
-            if (bytes.Length <= 256)
-            {
-                Span<byte> stackAllocBuffer = stackalloc byte[bytes.Length];
-                message.WriteTo(stackAllocBuffer);
-                Assert.AreEqual(bytes, stackAllocBuffer.ToArray());
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/libs/protobuf/csharp/src/Google.Protobuf.Test/Proto3OptionalTest.cs b/libs/protobuf/csharp/src/Google.Protobuf.Test/Proto3OptionalTest.cs
deleted file mode 100644
index 46a8c57..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf.Test/Proto3OptionalTest.cs
+++ /dev/null
@@ -1,153 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using NUnit.Framework;
-using ProtobufUnittest;
-using System;
-using System.IO;
-using UnitTest.Issues.TestProtos;
-
-namespace Google.Protobuf.Test
-{
-    class Proto3OptionalTest
-    {
-        [Test]
-        public void OptionalInt32FieldLifecycle()
-        {
-            var message = new TestProto3Optional();
-            Assert.IsFalse(message.HasOptionalInt32);
-            Assert.AreEqual(0, message.OptionalInt32);
-
-            message.OptionalInt32 = 5;
-            Assert.IsTrue(message.HasOptionalInt32);
-            Assert.AreEqual(5, message.OptionalInt32);
-
-            message.OptionalInt32 = 0;
-            Assert.IsTrue(message.HasOptionalInt32);
-            Assert.AreEqual(0, message.OptionalInt32);
-
-            message.ClearOptionalInt32();
-            Assert.IsFalse(message.HasOptionalInt32);
-            Assert.AreEqual(0, message.OptionalInt32);
-        }
-
-        [Test]
-        public void OptionalStringFieldLifecycle()
-        {
-            var message = new TestProto3Optional();
-            Assert.IsFalse(message.HasOptionalString);
-            Assert.AreEqual("", message.OptionalString);
-
-            message.OptionalString = "x";
-            Assert.IsTrue(message.HasOptionalString);
-            Assert.AreEqual("x", message.OptionalString);
-
-            message.OptionalString = "";
-            Assert.IsTrue(message.HasOptionalString);
-            Assert.AreEqual("", message.OptionalString);
-
-            message.ClearOptionalString();
-            Assert.IsFalse(message.HasOptionalString);
-            Assert.AreEqual("", message.OptionalString);
-
-            Assert.Throws<ArgumentNullException>(() => message.OptionalString = null);
-        }
-
-        [Test]
-        public void Clone()
-        {
-            var original = new TestProto3Optional { OptionalInt64 = 0L };
-
-            var clone = original.Clone();
-            Assert.False(clone.HasOptionalInt32);
-            Assert.AreEqual(0, clone.OptionalInt32);
-            Assert.True(clone.HasOptionalInt64);
-            Assert.AreEqual(0L, clone.OptionalInt64);
-        }
-
-        [Test]
-        public void Serialization_NotSet()
-        {
-            var stream = new MemoryStream();
-            var message = new TestProto3Optional();
-            message.WriteTo(stream);
-            Assert.AreEqual(0, stream.Length);
-        }
-
-        [Test]
-        public void Serialization_SetToDefault()
-        {
-            var stream = new MemoryStream();
-            var message = new TestProto3Optional { OptionalInt32 = 0 };
-            message.WriteTo(stream);
-            Assert.AreEqual(2, stream.Length); // Tag and value
-        }
-
-        [Test]
-        public void Serialization_Roundtrip()
-        {
-            var original = new TestProto3Optional { OptionalInt64 = 0L, OptionalFixed32 = 5U };
-            var stream = new MemoryStream();
-            original.WriteTo(stream);
-            stream.Position = 0;
-            var deserialized = TestProto3Optional.Parser.ParseFrom(stream);
-
-            Assert.AreEqual(0, deserialized.OptionalInt32);
-            Assert.IsFalse(deserialized.HasOptionalInt32);
-
-            Assert.AreEqual(0L, deserialized.OptionalInt64);
-            Assert.IsTrue(deserialized.HasOptionalInt64);
-
-            Assert.AreEqual(5U, deserialized.OptionalFixed32);
-            Assert.IsTrue(deserialized.HasOptionalFixed32);
-        }
-
-        [Test]
-        public void Equality_IgnoresPresence()
-        {
-            var message1 = new TestProto3Optional { OptionalInt32 = 0 };
-            var message2 = new TestProto3Optional();
-
-            Assert.IsTrue(message1.Equals(message2));
-            message1.ClearOptionalInt32();
-        }
-
-        [Test]
-        public void MixedFields()
-        {
-            var descriptor = MixedRegularAndOptional.Descriptor;
-            Assert.AreEqual(1, descriptor.Oneofs.Count);
-            Assert.AreEqual(0, descriptor.RealOneofCount);
-            Assert.True(descriptor.Oneofs[0].IsSynthetic);
-        }
-    }
-}
diff --git a/libs/protobuf/csharp/src/Google.Protobuf.Test/ReadOnlySequenceFactory.cs b/libs/protobuf/csharp/src/Google.Protobuf.Test/ReadOnlySequenceFactory.cs
deleted file mode 100644
index f0248ac..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf.Test/ReadOnlySequenceFactory.cs
+++ /dev/null
@@ -1,139 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-using System.Buffers;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Google.Protobuf
-{
-    internal static class ReadOnlySequenceFactory
-    {
-        /// <summary>
-        /// Create a sequence from the specified data. The data will be divided up into segments in the sequence.
-        /// </summary>
-        public static ReadOnlySequence<byte> CreateWithContent(byte[] data, int segmentSize = 1, bool addEmptySegmentDelimiters = true)
-        {
-            var segments = new List<byte[]>();
-
-            if (addEmptySegmentDelimiters)
-            {
-                segments.Add(new byte[0]);
-            }
-
-            var currentIndex = 0;
-            while (currentIndex < data.Length)
-            {
-                var segment = new List<byte>();
-                while (segment.Count < segmentSize && currentIndex < data.Length)
-                {
-                    segment.Add(data[currentIndex++]);
-                }
-                segments.Add(segment.ToArray());
-
-                if (addEmptySegmentDelimiters)
-                {
-                    segments.Add(new byte[0]);
-                }
-            }
-
-            return CreateSegments(segments.ToArray());
-        }
-
-        /// <summary>
-        /// Originally from corefx, and has been contributed to Protobuf
-        /// https://github.com/dotnet/corefx/blob/e99ec129cfd594d53f4390bf97d1d736cff6f860/src/System.Memory/tests/ReadOnlyBuffer/ReadOnlySequenceFactory.byte.cs
-        /// </summary>
-        private static ReadOnlySequence<byte> CreateSegments(params byte[][] inputs)
-        {
-            if (inputs == null || inputs.Length == 0)
-            {
-                throw new InvalidOperationException();
-            }
-
-            int i = 0;
-
-            BufferSegment last = null;
-            BufferSegment first = null;
-
-            do
-            {
-                byte[] s = inputs[i];
-                int length = s.Length;
-                int dataOffset = length;
-                var chars = new byte[length * 2];
-
-                for (int j = 0; j < length; j++)
-                {
-                    chars[dataOffset + j] = s[j];
-                }
-
-                // Create a segment that has offset relative to the OwnedMemory and OwnedMemory itself has offset relative to array
-                var memory = new Memory<byte>(chars).Slice(length, length);
-
-                if (first == null)
-                {
-                    first = new BufferSegment(memory);
-                    last = first;
-                }
-                else
-                {
-                    last = last.Append(memory);
-                }
-                i++;
-            } while (i < inputs.Length);
-
-            return new ReadOnlySequence<byte>(first, 0, last, last.Memory.Length);
-        }
-
-        private class BufferSegment : ReadOnlySequenceSegment<byte>
-        {
-            public BufferSegment(Memory<byte> memory)
-            {
-                Memory = memory;
-            }
-
-            public BufferSegment Append(Memory<byte> memory)
-            {
-                var segment = new BufferSegment(memory)
-                {
-                    RunningIndex = RunningIndex + Memory.Length
-                };
-                Next = segment;
-                return segment;
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/libs/protobuf/csharp/src/Google.Protobuf.Test/RefStructCompatibilityTest.cs b/libs/protobuf/csharp/src/Google.Protobuf.Test/RefStructCompatibilityTest.cs
deleted file mode 100644
index 9dca501..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf.Test/RefStructCompatibilityTest.cs
+++ /dev/null
@@ -1,119 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using NUnit.Framework;
-using System.Diagnostics;
-using System;
-using System.Reflection;
-using System.IO;
-
-namespace Google.Protobuf
-{
-    public class RefStructCompatibilityTest
-    {
-        /// <summary>
-        /// Checks that the generated code can be compiler with an old C# compiler.
-        /// The reason why this test is needed is that even though dotnet SDK projects allow to set LangVersion,
-        /// this setting doesn't accurately simulate compilation with an actual old pre-roslyn C# compiler.
-        /// For instance, the "ref struct" types are only supported by C# 7.2 and higher, but even if
-        /// LangVersion is set low, the roslyn compiler still understands the concept of ref struct
-        /// and silently accepts them. Therefore we try to build the generated code with an actual old C# compiler
-        /// to be able to catch these sort of compatibility problems.
-        /// </summary>
-        [Test]
-        public void GeneratedCodeCompilesWithOldCsharpCompiler()
-        {
-            if (Environment.OSVersion.Platform != PlatformID.Win32NT)
-            {
-                // This tests needs old C# compiler which is only available on Windows. Skipping it on all other platforms.
-                return;
-            }
-
-            var currentAssemblyDir = Path.GetDirectoryName(typeof(RefStructCompatibilityTest).GetTypeInfo().Assembly.Location);
-            var testProtosProjectDir = Path.GetFullPath(Path.Combine(currentAssemblyDir, "..", "..", "..", "..", "Google.Protobuf.Test.TestProtos"));
-            var testProtosOutputDir = (currentAssemblyDir.Contains("bin/Debug/") || currentAssemblyDir.Contains("bin\\Debug\\")) ? "bin\\Debug\\net462" : "bin\\Release\\net462";
-
-            // If "ref struct" types are used in the generated code, compilation with an old compiler will fail with the following error:
-            // "XYZ is obsolete: 'Types with embedded references are not supported in this version of your compiler.'"
-            // We build the code with GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE to avoid the use of ref struct in the generated code.
-            var compatibilityFlag = "-define:GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE";
-            var sources = "*.cs";  // the generated sources from the TestProtos project
-            var args = $"-langversion:3 -target:library {compatibilityFlag} -reference:{testProtosOutputDir}\\Google.Protobuf.dll -out:{testProtosOutputDir}\\TestProtos.RefStructCompatibilityTest.OldCompiler.dll {sources}";
-            RunOldCsharpCompilerAndCheckSuccess(args, testProtosProjectDir);
-        }
-
-        /// <summary>
-        /// Invoke an old C# compiler in a subprocess and check it finished successful.
-        /// </summary>
-        /// <param name="args"></param>
-        /// <param name="workingDirectory"></param>
-        private void RunOldCsharpCompilerAndCheckSuccess(string args, string workingDirectory)
-        {  
-            using (var process = new Process())
-            {
-                // Get the path to the old C# 5 compiler from .NET framework. This approach is not 100% reliable, but works on most machines.
-                // Alternative way of getting the framework path is System.Runtime.InteropServices.RuntimeEnvironment.GetRuntimeDirectory()
-                // but it only works with the net45 target.
-                var oldCsharpCompilerPath = Path.Combine(Environment.GetEnvironmentVariable("WINDIR"), "Microsoft.NET", "Framework", "v4.0.30319", "csc.exe");
-                process.StartInfo.FileName = oldCsharpCompilerPath;
-                process.StartInfo.RedirectStandardOutput = true;
-                process.StartInfo.RedirectStandardError = true;
-                process.StartInfo.UseShellExecute = false;
-                process.StartInfo.Arguments = args;
-                process.StartInfo.WorkingDirectory = workingDirectory;
-
-                process.OutputDataReceived += (sender, e) =>
-                {
-                    if (e.Data != null)
-                    {
-                        Console.WriteLine(e.Data);
-                    }
-                };
-                process.ErrorDataReceived += (sender, e) =>
-                {
-                    if (e.Data != null)
-                    {
-                        Console.WriteLine(e.Data);
-                    }
-                };
-
-                process.Start();
-
-                process.BeginErrorReadLine();
-                process.BeginOutputReadLine();
-
-                process.WaitForExit();
-                Assert.AreEqual(0, process.ExitCode);
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/libs/protobuf/csharp/src/Google.Protobuf.Test/Reflection/CustomOptionsTest.cs b/libs/protobuf/csharp/src/Google.Protobuf.Test/Reflection/CustomOptionsTest.cs
deleted file mode 100644
index 68b9bd3..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf.Test/Reflection/CustomOptionsTest.cs
+++ /dev/null
@@ -1,263 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2017 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using Google.Protobuf.Reflection;
-using Google.Protobuf.WellKnownTypes;
-using NUnit.Framework;
-using System;
-using System.IO;
-using System.Linq;
-using UnitTest.Issues.TestProtos;
-using static Google.Protobuf.WireFormat;
-using static UnitTest.Issues.TestProtos.ComplexOptionType2.Types;
-using static UnitTest.Issues.TestProtos.UnittestCustomOptionsProto3Extensions;
-using static UnitTest.Issues.TestProtos.DummyMessageContainingEnum.Types;
-using Google.Protobuf.TestProtos;
-
-#pragma warning disable CS0618
-
-namespace Google.Protobuf.Test.Reflection
-{
-    /// <summary>
-    /// The majority of the testing here is done via parsed descriptors. That's simpler to
-    /// achieve (and more important) than constructing a CodedInputStream manually.
-    /// </summary>
-    public class CustomOptionsTest
-    {
-        delegate bool OptionFetcher<T>(int field, out T value);
-
-        OptionFetcher<E> EnumFetcher<E>(CustomOptions options)
-        {
-            return (int i, out E v) => {
-                if (options.TryGetInt32(i, out int value))
-                {
-                    v = (E)(object)value;
-                    return true;
-                }
-                else
-                {
-                    v = default(E);
-                    return false;
-                }
-            };
-        }
-
-        [Test]
-        public void BuiltinOptionsCanBeRetrieved()
-        {
-            // non-custom options (that are not extensions but regular fields) can only be accessed via descriptor.Options
-            var fileOptions = UnittestProto3Reflection.Descriptor.GetOptions();
-            Assert.AreEqual("Google.Protobuf.TestProtos", fileOptions.CsharpNamespace);
-        }
-
-        [Test]
-        public void OptionPresenceCanBeDetected()
-        {
-            // case 1: the descriptor has no options at all so the options message is not present
-            Assert.IsNull(TestAllTypes.Descriptor.GetOptions());
-
-            // case 2: the descriptor has some options, but not the one we're looking for
-            // HasExtension will be false and GetExtension returns extension's default value
-            Assert.IsFalse(UnittestProto3Reflection.Descriptor.GetOptions().HasExtension(FileOpt1));
-            Assert.AreEqual(0, UnittestProto3Reflection.Descriptor.GetOptions().GetExtension(FileOpt1));
-
-            // case 3: option is present
-            Assert.IsTrue(UnittestCustomOptionsProto3Reflection.Descriptor.GetOptions().HasExtension(FileOpt1));
-            Assert.AreEqual(9876543210UL, UnittestCustomOptionsProto3Reflection.Descriptor.GetOptions().GetExtension(FileOpt1));
-        }
-
-        [Test]
-        public void ScalarOptions()
-        {
-            var d = CustomOptionOtherValues.Descriptor;
-            var customOptions = d.CustomOptions;
-            AssertOption(-100, customOptions.TryGetInt32, Int32Opt, d.GetOption, d.GetOptions().GetExtension);
-            AssertOption(12.3456789f, customOptions.TryGetFloat, FloatOpt, d.GetOption, d.GetOptions().GetExtension);
-            AssertOption(1.234567890123456789d, customOptions.TryGetDouble, DoubleOpt, d.GetOption, d.GetOptions().GetExtension);
-            AssertOption("Hello, \"World\"", customOptions.TryGetString, StringOpt, d.GetOption, d.GetOptions().GetExtension);
-            AssertOption(ByteString.CopyFromUtf8("Hello\0World"), customOptions.TryGetBytes, BytesOpt, d.GetOption, d.GetOptions().GetExtension);
-            AssertOption(TestEnumType.TestOptionEnumType2, EnumFetcher<TestEnumType>(customOptions), EnumOpt, d.GetOption, d.GetOptions().GetExtension);
-        }
-
-        [Test]
-        public void MessageOptions()
-        {
-            var d = VariousComplexOptions.Descriptor;
-            var customOptions = d.CustomOptions;
-            AssertOption(new ComplexOptionType1 { Foo = 42, Foo4 = { 99, 88 } }, customOptions.TryGetMessage, ComplexOpt1, d.GetOption, d.GetOptions().GetExtension);
-            AssertOption(new ComplexOptionType2
-            {
-                Baz = 987,
-                Bar = new ComplexOptionType1 { Foo = 743 },
-                Fred = new ComplexOptionType4 { Waldo = 321 },
-                Barney = { new ComplexOptionType4 { Waldo = 101 }, new ComplexOptionType4 { Waldo = 212 } }
-            },
-                customOptions.TryGetMessage, ComplexOpt2, d.GetOption, d.GetOptions().GetExtension);
-            AssertOption(new ComplexOptionType3 { Qux = 9 }, customOptions.TryGetMessage, ComplexOpt3, d.GetOption, d.GetOptions().GetExtension);
-        }
-
-        [Test]
-        public void OptionLocations()
-        {
-            var fileDescriptor = UnittestCustomOptionsProto3Reflection.Descriptor;
-            AssertOption(9876543210UL, fileDescriptor.CustomOptions.TryGetUInt64, FileOpt1, fileDescriptor.GetOption, fileDescriptor.GetOptions().GetExtension);
-
-            var messageDescriptor = TestMessageWithCustomOptions.Descriptor;
-            AssertOption(-56, messageDescriptor.CustomOptions.TryGetInt32, MessageOpt1, messageDescriptor.GetOption, messageDescriptor.GetOptions().GetExtension);
-
-            var fieldDescriptor = TestMessageWithCustomOptions.Descriptor.Fields["field1"];
-            AssertOption(8765432109UL, fieldDescriptor.CustomOptions.TryGetFixed64, FieldOpt1, fieldDescriptor.GetOption, fieldDescriptor.GetOptions().GetExtension);
-
-            var oneofDescriptor = TestMessageWithCustomOptions.Descriptor.Oneofs[0];
-            AssertOption(-99, oneofDescriptor.CustomOptions.TryGetInt32, OneofOpt1, oneofDescriptor.GetOption, oneofDescriptor.GetOptions().GetExtension);
-
-            var enumDescriptor = TestMessageWithCustomOptions.Descriptor.EnumTypes[0];
-            AssertOption(-789, enumDescriptor.CustomOptions.TryGetSFixed32, EnumOpt1, enumDescriptor.GetOption, enumDescriptor.GetOptions().GetExtension);
-
-            var enumValueDescriptor = TestMessageWithCustomOptions.Descriptor.EnumTypes[0].FindValueByNumber(2);
-            AssertOption(123, enumValueDescriptor.CustomOptions.TryGetInt32, EnumValueOpt1, enumValueDescriptor.GetOption, enumValueDescriptor.GetOptions().GetExtension);
-
-            var serviceDescriptor = UnittestCustomOptionsProto3Reflection.Descriptor.Services
-                .Single(s => s.Name == "TestServiceWithCustomOptions");
-            AssertOption(-9876543210, serviceDescriptor.CustomOptions.TryGetSInt64, ServiceOpt1, serviceDescriptor.GetOption, serviceDescriptor.GetOptions().GetExtension);
-
-            var methodDescriptor = serviceDescriptor.Methods[0];
-            AssertOption(UnitTest.Issues.TestProtos.MethodOpt1.Val2, EnumFetcher<UnitTest.Issues.TestProtos.MethodOpt1>(methodDescriptor.CustomOptions), UnittestCustomOptionsProto3Extensions.MethodOpt1, methodDescriptor.GetOption, methodDescriptor.GetOptions().GetExtension);
-        }
-
-        [Test]
-        public void MinValues()
-        {
-            var d = CustomOptionMinIntegerValues.Descriptor;
-            var customOptions = d.CustomOptions;
-            AssertOption(false, customOptions.TryGetBool, BoolOpt, d.GetOption, d.GetOptions().GetExtension);
-            AssertOption(int.MinValue, customOptions.TryGetInt32, Int32Opt, d.GetOption, d.GetOptions().GetExtension);
-            AssertOption(long.MinValue, customOptions.TryGetInt64, Int64Opt, d.GetOption, d.GetOptions().GetExtension);
-            AssertOption(uint.MinValue, customOptions.TryGetUInt32, Uint32Opt, d.GetOption, d.GetOptions().GetExtension);
-            AssertOption(ulong.MinValue, customOptions.TryGetUInt64, Uint64Opt, d.GetOption, d.GetOptions().GetExtension);
-            AssertOption(int.MinValue, customOptions.TryGetSInt32, Sint32Opt, d.GetOption, d.GetOptions().GetExtension);
-            AssertOption(long.MinValue, customOptions.TryGetSInt64, Sint64Opt, d.GetOption, d.GetOptions().GetExtension);
-            AssertOption(uint.MinValue, customOptions.TryGetUInt32, Fixed32Opt, d.GetOption, d.GetOptions().GetExtension);
-            AssertOption(ulong.MinValue, customOptions.TryGetUInt64, Fixed64Opt, d.GetOption, d.GetOptions().GetExtension);
-            AssertOption(int.MinValue, customOptions.TryGetInt32, Sfixed32Opt, d.GetOption, d.GetOptions().GetExtension);
-            AssertOption(long.MinValue, customOptions.TryGetInt64, Sfixed64Opt, d.GetOption, d.GetOptions().GetExtension);
-        }
-
-        [Test]
-        public void MaxValues()
-        {
-            var d = CustomOptionMaxIntegerValues.Descriptor;
-            var customOptions = d.CustomOptions;
-            AssertOption(true, customOptions.TryGetBool, BoolOpt, d.GetOption, d.GetOptions().GetExtension);
-            AssertOption(int.MaxValue, customOptions.TryGetInt32, Int32Opt, d.GetOption, d.GetOptions().GetExtension);
-            AssertOption(long.MaxValue, customOptions.TryGetInt64, Int64Opt, d.GetOption, d.GetOptions().GetExtension);
-            AssertOption(uint.MaxValue, customOptions.TryGetUInt32, Uint32Opt, d.GetOption, d.GetOptions().GetExtension);
-            AssertOption(ulong.MaxValue, customOptions.TryGetUInt64, Uint64Opt, d.GetOption, d.GetOptions().GetExtension);
-            AssertOption(int.MaxValue, customOptions.TryGetSInt32, Sint32Opt, d.GetOption, d.GetOptions().GetExtension);
-            AssertOption(long.MaxValue, customOptions.TryGetSInt64, Sint64Opt, d.GetOption, d.GetOptions().GetExtension);
-            AssertOption(uint.MaxValue, customOptions.TryGetFixed32, Fixed32Opt, d.GetOption, d.GetOptions().GetExtension);
-            AssertOption(ulong.MaxValue, customOptions.TryGetFixed64, Fixed64Opt, d.GetOption, d.GetOptions().GetExtension);
-            AssertOption(int.MaxValue, customOptions.TryGetSFixed32, Sfixed32Opt, d.GetOption, d.GetOptions().GetExtension);
-            AssertOption(long.MaxValue, customOptions.TryGetSFixed64, Sfixed64Opt, d.GetOption, d.GetOptions().GetExtension);
-        }
-
-        [Test]
-        public void AggregateOptions()
-        {
-            // Just two examples
-            var messageDescriptor = AggregateMessage.Descriptor;
-            AssertOption(new Aggregate { I = 101, S = "MessageAnnotation" }, messageDescriptor.CustomOptions.TryGetMessage, Msgopt, messageDescriptor.GetOption, messageDescriptor.GetOptions().GetExtension);
-
-            var fieldDescriptor = messageDescriptor.Fields["fieldname"];
-            AssertOption(new Aggregate { S = "FieldAnnotation" }, fieldDescriptor.CustomOptions.TryGetMessage, Fieldopt, fieldDescriptor.GetOption, fieldDescriptor.GetOptions().GetExtension);
-        }
-
-        [Test]
-        public void NoOptions()
-        {
-            var fileDescriptor = UnittestProto3Reflection.Descriptor;
-            var messageDescriptor = TestAllTypes.Descriptor;
-            Assert.NotNull(fileDescriptor.CustomOptions);
-            Assert.NotNull(messageDescriptor.CustomOptions);
-            Assert.NotNull(messageDescriptor.Fields[1].CustomOptions);
-            Assert.NotNull(fileDescriptor.Services[0].CustomOptions);
-            Assert.NotNull(fileDescriptor.Services[0].Methods[0].CustomOptions);
-            Assert.NotNull(fileDescriptor.EnumTypes[0].CustomOptions);
-            Assert.NotNull(fileDescriptor.EnumTypes[0].Values[0].CustomOptions);
-            Assert.NotNull(TestAllTypes.Descriptor.Oneofs[0].CustomOptions);
-        }
-
-        [Test]
-        public void MultipleImportOfSameFileWithExtension()
-        {
-            var descriptor = UnittestIssue6936CReflection.Descriptor;
-            var foo = Foo.Descriptor;
-            var bar = Bar.Descriptor;
-            AssertOption("foo", foo.CustomOptions.TryGetString, UnittestIssue6936AExtensions.Opt, foo.GetOption, foo.GetOptions().GetExtension);
-            AssertOption("bar", bar.CustomOptions.TryGetString, UnittestIssue6936AExtensions.Opt, bar.GetOption, bar.GetOptions().GetExtension);
-        }
-
-        [Test]
-        public void SelfReferentialOptions()
-        {
-            // Custom field option used in definition of the custom option's message.
-            var fooField = UnitTest.Issues.TestProtos.SelfreferentialOptions.FooOptions.Descriptor.FindFieldByName("foo");
-            var fooFieldFooExtensionValue = fooField.GetOptions().GetExtension(UnitTest.Issues.TestProtos.SelfreferentialOptions.UnittestSelfreferentialOptionsExtensions.FooOptions);
-            Assert.AreEqual(1234, fooFieldFooExtensionValue.Foo);
-
-            // Custom field option used on the definition of that field option.
-            var fileDescriptor = UnitTest.Issues.TestProtos.SelfreferentialOptions.UnittestSelfreferentialOptionsReflection.Descriptor;
-            var barOptionsField = fileDescriptor.Extensions.UnorderedExtensions.Single(field => field.Name == "bar_options");
-            var barExtensionValue = barOptionsField.GetOptions().GetExtension(UnitTest.Issues.TestProtos.SelfreferentialOptions.UnittestSelfreferentialOptionsExtensions.BarOptions);
-            Assert.AreEqual(1234, barExtensionValue);
-
-            // Custom field option used in definition of the extension message.
-            var intOptField = UnitTest.Issues.TestProtos.SelfreferentialOptions.FooOptions.Descriptor.FindFieldByName("int_opt");
-            var intOptFieldFooExtensionValue = intOptField.GetOptions().GetExtension(UnitTest.Issues.TestProtos.SelfreferentialOptions.UnittestSelfreferentialOptionsExtensions.FooOptions);
-            Assert.AreEqual(1, intOptFieldFooExtensionValue.IntOpt);
-            Assert.AreEqual(2, intOptFieldFooExtensionValue.GetExtension(UnitTest.Issues.TestProtos.SelfreferentialOptions.UnittestSelfreferentialOptionsExtensions.FooIntOpt));
-            Assert.AreEqual(3, intOptFieldFooExtensionValue.GetExtension(UnitTest.Issues.TestProtos.SelfreferentialOptions.UnittestSelfreferentialOptionsExtensions.FooFooOpt).IntOpt);
-        }
-
-        private void AssertOption<T, D>(T expected, OptionFetcher<T> customOptionFetcher, Extension<D, T> extension, Func<Extension<D, T>, T> getOptionFetcher, Func<Extension<D, T>, T> extensionFetcher) where D : IExtendableMessage<D>
-        {
-            Assert.IsTrue(customOptionFetcher(extension.FieldNumber, out T customOptionsValue));
-            Assert.AreEqual(expected, customOptionsValue);
-
-            T getOptionValue = getOptionFetcher(extension);
-            Assert.AreEqual(expected, getOptionValue);
-
-            T extensionValue = extensionFetcher(extension);
-            Assert.AreEqual(expected, extensionValue);
-        }
-    }
-}
diff --git a/libs/protobuf/csharp/src/Google.Protobuf.Test/Reflection/DescriptorDeclarationTest.cs b/libs/protobuf/csharp/src/Google.Protobuf.Test/Reflection/DescriptorDeclarationTest.cs
deleted file mode 100644
index d9d5667..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf.Test/Reflection/DescriptorDeclarationTest.cs
+++ /dev/null
@@ -1,175 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2018 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using Google.Protobuf.Reflection;
-using NUnit.Framework;
-using System.Linq;
-using System.Reflection;
-
-namespace Google.Protobuf.Test.Reflection
-{
-    // In reality this isn't a test for DescriptorDeclaration so much as the way they're loaded.
-    public class DescriptorDeclarationTest
-    {
-        static readonly FileDescriptor unitTestProto3Descriptor = LoadProtos();
-
-        // Note: we don't expose a declaration for FileDescriptor as it doesn't have comments
-        // at the moment and the locations aren't terribly useful.
-
-        // The tests for most elements are quite basic: we don't test every aspect of every element.
-        // The code within the library falls into two categories:
-        // - Exposing the properties for *any* declaration
-        // - Finding the right declaration for an element from the descriptor data
-        // We have a per-element check to make sure we *are* finding the right declaration, and we
-        // check every property of declarations in at least one test, but we don't have a cross-product.
-        // That would effectively be testing protoc, which seems redundant here.
-
-        [Test]
-        public void ServiceComments()
-        {
-            var service = unitTestProto3Descriptor.FindTypeByName<ServiceDescriptor>("TestService");
-            Assert.NotNull(service.Declaration);
-            Assert.AreEqual(" This is a test service\n", service.Declaration.LeadingComments);
-        }
-
-        [Test]
-        public void MethodComments()
-        {
-            var service = unitTestProto3Descriptor.FindTypeByName<ServiceDescriptor>("TestService");
-            var method = service.FindMethodByName("Foo");
-            Assert.NotNull(method.Declaration);
-            Assert.AreEqual(" This is a test method\n", method.Declaration.LeadingComments);
-        }
-
-        [Test]
-        public void MessageComments()
-        {
-            var message = unitTestProto3Descriptor.FindTypeByName<MessageDescriptor>("CommentMessage");
-            Assert.NotNull(message.Declaration);
-            Assert.AreEqual(" This is a leading comment\n", message.Declaration.LeadingComments);
-            Assert.AreEqual(new[] { " This is leading detached comment 1\n", " This is leading detached comment 2\n" },
-                message.Declaration.LeadingDetachedComments);
-        }
-
-        // Note: this test is somewhat brittle; a change earlier in the proto will break it.
-        [Test]
-        public void MessageLocations()
-        {
-            var message = unitTestProto3Descriptor.FindTypeByName<MessageDescriptor>("CommentMessage");
-            Assert.NotNull(message.Declaration);
-            Assert.AreEqual(389, message.Declaration.StartLine);
-            Assert.AreEqual(1, message.Declaration.StartColumn);
-
-            Assert.AreEqual(404, message.Declaration.EndLine);
-            Assert.AreEqual(2, message.Declaration.EndColumn);
-        }
-
-        [Test]
-        public void EnumComments()
-        {
-            var descriptor = unitTestProto3Descriptor.FindTypeByName<EnumDescriptor>("CommentEnum");
-            Assert.NotNull(descriptor.Declaration);
-            Assert.AreEqual(" Leading enum comment\n", descriptor.Declaration.LeadingComments);
-        }
-
-        [Test]
-        public void NestedMessageComments()
-        {
-            var outer = unitTestProto3Descriptor.FindTypeByName<MessageDescriptor>("CommentMessage");
-            var nested = outer.FindDescriptor<MessageDescriptor>("NestedCommentMessage");
-            Assert.NotNull(nested.Declaration);
-            Assert.AreEqual(" Leading nested message comment\n", nested.Declaration.LeadingComments);
-        }
-
-        [Test]
-        public void NestedEnumComments()
-        {
-            var outer = unitTestProto3Descriptor.FindTypeByName<MessageDescriptor>("CommentMessage");
-            var nested = outer.FindDescriptor<EnumDescriptor>("NestedCommentEnum");
-            Assert.NotNull(nested.Declaration);
-            Assert.AreEqual(" Leading nested enum comment\n", nested.Declaration.LeadingComments);
-        }
-
-        [Test]
-        public void FieldComments()
-        {
-            var message = unitTestProto3Descriptor.FindTypeByName<MessageDescriptor>("CommentMessage");
-            var field = message.FindFieldByName("text");
-            Assert.NotNull(field.Declaration);
-            Assert.AreEqual(" Leading field comment\n", field.Declaration.LeadingComments);
-            Assert.AreEqual(" Trailing field comment\n", field.Declaration.TrailingComments);
-        }
-
-        [Test]
-        public void NestedMessageFieldComments()
-        {
-            var outer = unitTestProto3Descriptor.FindTypeByName<MessageDescriptor>("CommentMessage");
-            var nested = outer.FindDescriptor<MessageDescriptor>("NestedCommentMessage");
-            var field = nested.FindFieldByName("nested_text");
-            Assert.NotNull(field.Declaration);
-            Assert.AreEqual(" Leading nested message field comment\n", field.Declaration.LeadingComments);
-        }
-
-        [Test]
-        public void EnumValueComments()
-        {
-            var enumDescriptor = unitTestProto3Descriptor.FindTypeByName<EnumDescriptor>("CommentEnum");
-            var value = enumDescriptor.FindValueByName("ZERO_VALUE");
-            Assert.NotNull(value.Declaration);
-            Assert.AreEqual(" Zero value comment\n", value.Declaration.LeadingComments);
-        }
-
-        [Test]
-        public void NestedEnumValueComments()
-        {
-            var outer = unitTestProto3Descriptor.FindTypeByName<MessageDescriptor>("CommentMessage");
-            var nested = outer.FindDescriptor<EnumDescriptor>("NestedCommentEnum");
-            var value = nested.FindValueByName("ZERO_VALUE");
-            Assert.NotNull(value.Declaration);
-            Assert.AreEqual(" Zero value comment\n", value.Declaration.LeadingComments);
-        }
-
-        private static FileDescriptor LoadProtos()
-        {
-            var type = typeof(DescriptorDeclarationTest);
-            // TODO: Make this simpler :)
-            FileDescriptorSet descriptorSet;
-            using (var stream = type.GetTypeInfo().Assembly.GetManifestResourceStream($"Google.Protobuf.Test.testprotos.pb"))
-            {
-                descriptorSet = FileDescriptorSet.Parser.ParseFrom(stream);
-            }
-            var byteStrings = descriptorSet.File.Select(f => f.ToByteString()).ToList();
-            var descriptors = FileDescriptor.BuildFromByteStrings(byteStrings);
-            return descriptors.Single(d => d.Name == "unittest_proto3.proto");
-        }
-    }
-}
diff --git a/libs/protobuf/csharp/src/Google.Protobuf.Test/Reflection/DescriptorsTest.cs b/libs/protobuf/csharp/src/Google.Protobuf.Test/Reflection/DescriptorsTest.cs
deleted file mode 100644
index 65c8b82..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf.Test/Reflection/DescriptorsTest.cs
+++ /dev/null
@@ -1,481 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using Google.Protobuf.TestProtos;
-using NUnit.Framework;
-using ProtobufUnittest;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using UnitTest.Issues.TestProtos;
-
-namespace Google.Protobuf.Reflection
-{
-    /// <summary>
-    /// Tests for descriptors. (Not in its own namespace or broken up into individual classes as the
-    /// size doesn't warrant it. On the other hand, this makes me feel a bit dirty...)
-    /// </summary>
-    public class DescriptorsTest
-    {
-        [Test]
-        public void FileDescriptor_GeneratedCode()
-        {
-            TestFileDescriptor(
-                UnittestProto3Reflection.Descriptor,
-                UnittestImportProto3Reflection.Descriptor,
-                UnittestImportPublicProto3Reflection.Descriptor);
-        }
-
-        [Test]
-        public void FileDescriptor_BuildFromByteStrings()
-        {
-            // The descriptors have to be supplied in an order such that all the
-            // dependencies come before the descriptors depending on them.
-            var descriptorData = new List<ByteString>
-            {
-                UnittestImportPublicProto3Reflection.Descriptor.SerializedData,
-                UnittestImportProto3Reflection.Descriptor.SerializedData,
-                UnittestProto3Reflection.Descriptor.SerializedData
-            };
-            var converted = FileDescriptor.BuildFromByteStrings(descriptorData);
-            Assert.AreEqual(3, converted.Count);
-            TestFileDescriptor(converted[2], converted[1], converted[0]);
-        }
-
-        [Test]
-        public void FileDescriptor_BuildFromByteStrings_WithExtensionRegistry()
-        {
-            var extension = UnittestCustomOptionsProto3Extensions.MessageOpt1;
-
-            var byteStrings = new[]
-            {
-                DescriptorReflection.Descriptor.Proto.ToByteString(),
-                UnittestCustomOptionsProto3Reflection.Descriptor.Proto.ToByteString()
-            };
-            var registry = new ExtensionRegistry { extension };
-
-            var descriptor = FileDescriptor.BuildFromByteStrings(byteStrings, registry).Last();
-            var message = descriptor.MessageTypes.Single(t => t.Name == nameof(TestMessageWithCustomOptions));
-            var extensionValue = message.GetOptions().GetExtension(extension);
-            Assert.AreEqual(-56, extensionValue);
-        }
-
-        private void TestFileDescriptor(FileDescriptor file, FileDescriptor importedFile, FileDescriptor importedPublicFile)
-        {
-            Assert.AreEqual("unittest_proto3.proto", file.Name);
-            Assert.AreEqual("protobuf_unittest3", file.Package);
-
-            Assert.AreEqual("UnittestProto", file.Proto.Options.JavaOuterClassname);
-            Assert.AreEqual("unittest_proto3.proto", file.Proto.Name);
-
-            // unittest_proto3.proto doesn't have any public imports, but unittest_import_proto3.proto does.
-            Assert.AreEqual(0, file.PublicDependencies.Count);
-            Assert.AreEqual(1, importedFile.PublicDependencies.Count);
-            Assert.AreEqual(importedPublicFile, importedFile.PublicDependencies[0]);
-
-            Assert.AreEqual(1, file.Dependencies.Count);
-            Assert.AreEqual(importedFile, file.Dependencies[0]);
-
-            Assert.Null(file.FindTypeByName<MessageDescriptor>("NoSuchType"));
-            Assert.Null(file.FindTypeByName<MessageDescriptor>("protobuf_unittest3.TestAllTypes"));
-            for (int i = 0; i < file.MessageTypes.Count; i++)
-            {
-                Assert.AreEqual(i, file.MessageTypes[i].Index);
-            }
-
-            Assert.AreEqual(file.EnumTypes[0], file.FindTypeByName<EnumDescriptor>("ForeignEnum"));
-            Assert.Null(file.FindTypeByName<EnumDescriptor>("NoSuchType"));
-            Assert.Null(file.FindTypeByName<EnumDescriptor>("protobuf_unittest3.ForeignEnum"));
-            Assert.AreEqual(1, importedFile.EnumTypes.Count);
-            Assert.AreEqual("ImportEnum", importedFile.EnumTypes[0].Name);
-            for (int i = 0; i < file.EnumTypes.Count; i++)
-            {
-                Assert.AreEqual(i, file.EnumTypes[i].Index);
-            }
-
-            Assert.AreEqual(10, file.SerializedData[0]);
-            TestDescriptorToProto(file.ToProto, file.Proto);
-        }
-
-        [Test]
-        public void FileDescriptor_NonRootPath()
-        {
-            // unittest_proto3.proto used to be in google/protobuf. Now it's in the C#-specific location,
-            // let's test something that's still in a directory.
-            FileDescriptor file = UnittestWellKnownTypesReflection.Descriptor;
-            Assert.AreEqual("google/protobuf/unittest_well_known_types.proto", file.Name);
-            Assert.AreEqual("protobuf_unittest", file.Package);
-        }
-
-        [Test]
-        public void FileDescriptor_BuildFromByteStrings_MissingDependency()
-        {
-            var descriptorData = new List<ByteString>
-            {
-                UnittestImportProto3Reflection.Descriptor.SerializedData,
-                UnittestProto3Reflection.Descriptor.SerializedData,
-            };
-            // This will fail, because we're missing UnittestImportPublicProto3Reflection
-            Assert.Throws<ArgumentException>(() => FileDescriptor.BuildFromByteStrings(descriptorData));
-        }
-
-        [Test]
-        public void FileDescriptor_BuildFromByteStrings_DuplicateNames()
-        {
-            var descriptorData = new List<ByteString>
-            {
-                UnittestImportPublicProto3Reflection.Descriptor.SerializedData,
-                UnittestImportPublicProto3Reflection.Descriptor.SerializedData,
-            };
-            // This will fail due to the same name being used twice
-            Assert.Throws<ArgumentException>(() => FileDescriptor.BuildFromByteStrings(descriptorData));
-        }
-
-        [Test]
-        public void FileDescriptor_BuildFromByteStrings_IncorrectOrder()
-        {
-            var descriptorData = new List<ByteString>
-            {
-                UnittestProto3Reflection.Descriptor.SerializedData,
-                UnittestImportPublicProto3Reflection.Descriptor.SerializedData,
-                UnittestImportProto3Reflection.Descriptor.SerializedData
-            };
-            // This will fail, because the dependencies should come first
-            Assert.Throws<ArgumentException>(() => FileDescriptor.BuildFromByteStrings(descriptorData));
-
-        }
-
-        [Test]
-        public void MessageDescriptorFromGeneratedCodeFileDescriptor()
-        {
-            var file = UnittestProto3Reflection.Descriptor;
-
-            MessageDescriptor messageType = TestAllTypes.Descriptor;
-            Assert.AreSame(typeof(TestAllTypes), messageType.ClrType);
-            Assert.AreSame(TestAllTypes.Parser, messageType.Parser);
-            Assert.AreEqual(messageType, file.MessageTypes[0]);
-            Assert.AreEqual(messageType, file.FindTypeByName<MessageDescriptor>("TestAllTypes"));
-        }
-
-        [Test]
-        public void MessageDescriptor()
-        {
-            MessageDescriptor messageType = TestAllTypes.Descriptor;
-            MessageDescriptor nestedType = TestAllTypes.Types.NestedMessage.Descriptor;
-
-            Assert.AreEqual("TestAllTypes", messageType.Name);
-            Assert.AreEqual("protobuf_unittest3.TestAllTypes", messageType.FullName);
-            Assert.AreEqual(UnittestProto3Reflection.Descriptor, messageType.File);
-            Assert.IsNull(messageType.ContainingType);
-            Assert.IsNull(messageType.Proto.Options);
-
-            Assert.AreEqual("TestAllTypes", messageType.Name);
-
-            Assert.AreEqual("NestedMessage", nestedType.Name);
-            Assert.AreEqual("protobuf_unittest3.TestAllTypes.NestedMessage", nestedType.FullName);
-            Assert.AreEqual(UnittestProto3Reflection.Descriptor, nestedType.File);
-            Assert.AreEqual(messageType, nestedType.ContainingType);
-
-            FieldDescriptor field = messageType.Fields.InDeclarationOrder()[0];
-            Assert.AreEqual("single_int32", field.Name);
-            Assert.AreEqual(field, messageType.FindDescriptor<FieldDescriptor>("single_int32"));
-            Assert.Null(messageType.FindDescriptor<FieldDescriptor>("no_such_field"));
-            Assert.AreEqual(field, messageType.FindFieldByNumber(1));
-            Assert.Null(messageType.FindFieldByNumber(571283));
-            var fieldsInDeclarationOrder = messageType.Fields.InDeclarationOrder();
-            for (int i = 0; i < fieldsInDeclarationOrder.Count; i++)
-            {
-                Assert.AreEqual(i, fieldsInDeclarationOrder[i].Index);
-            }
-
-            Assert.AreEqual(nestedType, messageType.NestedTypes[0]);
-            Assert.AreEqual(nestedType, messageType.FindDescriptor<MessageDescriptor>("NestedMessage"));
-            Assert.Null(messageType.FindDescriptor<MessageDescriptor>("NoSuchType"));
-            for (int i = 0; i < messageType.NestedTypes.Count; i++)
-            {
-                Assert.AreEqual(i, messageType.NestedTypes[i].Index);
-            }
-
-            Assert.AreEqual(messageType.EnumTypes[0], messageType.FindDescriptor<EnumDescriptor>("NestedEnum"));
-            Assert.Null(messageType.FindDescriptor<EnumDescriptor>("NoSuchType"));
-            for (int i = 0; i < messageType.EnumTypes.Count; i++)
-            {
-                Assert.AreEqual(i, messageType.EnumTypes[i].Index);
-            }
-            TestDescriptorToProto(messageType.ToProto, messageType.Proto);
-        }
-
-        [Test]
-        public void FieldDescriptor_GeneratedCode()
-        {
-            TestFieldDescriptor(UnittestProto3Reflection.Descriptor, TestAllTypes.Descriptor, ForeignMessage.Descriptor, ImportMessage.Descriptor);
-        }
-
-        [Test]
-        public void FieldDescriptor_BuildFromByteStrings()
-        {
-            // The descriptors have to be supplied in an order such that all the
-            // dependencies come before the descriptors depending on them.
-            var descriptorData = new List<ByteString>
-            {
-                UnittestImportPublicProto3Reflection.Descriptor.SerializedData,
-                UnittestImportProto3Reflection.Descriptor.SerializedData,
-                UnittestProto3Reflection.Descriptor.SerializedData
-            };
-            var converted = FileDescriptor.BuildFromByteStrings(descriptorData);
-            TestFieldDescriptor(
-                converted[2],
-                converted[2].FindTypeByName<MessageDescriptor>("TestAllTypes"),
-                converted[2].FindTypeByName<MessageDescriptor>("ForeignMessage"),
-                converted[1].FindTypeByName<MessageDescriptor>("ImportMessage"));
-        }
-
-        public void TestFieldDescriptor(
-            FileDescriptor unitTestProto3Descriptor,
-            MessageDescriptor testAllTypesDescriptor,
-            MessageDescriptor foreignMessageDescriptor,
-            MessageDescriptor importMessageDescriptor)
-        {
-            FieldDescriptor primitiveField = testAllTypesDescriptor.FindDescriptor<FieldDescriptor>("single_int32");
-            FieldDescriptor enumField = testAllTypesDescriptor.FindDescriptor<FieldDescriptor>("single_nested_enum");
-            FieldDescriptor foreignMessageField = testAllTypesDescriptor.FindDescriptor<FieldDescriptor>("single_foreign_message");
-            FieldDescriptor importMessageField = testAllTypesDescriptor.FindDescriptor<FieldDescriptor>("single_import_message");
-            FieldDescriptor fieldInOneof = testAllTypesDescriptor.FindDescriptor<FieldDescriptor>("oneof_string");
-
-            Assert.AreEqual("single_int32", primitiveField.Name);
-            Assert.AreEqual("protobuf_unittest3.TestAllTypes.single_int32",
-                            primitiveField.FullName);
-            Assert.AreEqual(1, primitiveField.FieldNumber);
-            Assert.AreEqual(testAllTypesDescriptor, primitiveField.ContainingType);
-            Assert.AreEqual(unitTestProto3Descriptor, primitiveField.File);
-            Assert.AreEqual(FieldType.Int32, primitiveField.FieldType);
-            Assert.IsNull(primitiveField.Proto.Options);
-
-            Assert.AreEqual("single_nested_enum", enumField.Name);
-            Assert.AreEqual(FieldType.Enum, enumField.FieldType);
-            Assert.AreEqual(testAllTypesDescriptor.EnumTypes[0], enumField.EnumType);
-
-            Assert.AreEqual("single_foreign_message", foreignMessageField.Name);
-            Assert.AreEqual(FieldType.Message, foreignMessageField.FieldType);
-            Assert.AreEqual(foreignMessageDescriptor, foreignMessageField.MessageType);
-
-            Assert.AreEqual("single_import_message", importMessageField.Name);
-            Assert.AreEqual(FieldType.Message, importMessageField.FieldType);
-            Assert.AreEqual(importMessageDescriptor, importMessageField.MessageType);
-
-            // For a field in a regular onoef, ContainingOneof and RealContainingOneof should be the same.
-            Assert.AreEqual("oneof_field", fieldInOneof.ContainingOneof.Name);
-            Assert.AreSame(fieldInOneof.ContainingOneof, fieldInOneof.RealContainingOneof);
-
-            TestDescriptorToProto(primitiveField.ToProto, primitiveField.Proto);
-            TestDescriptorToProto(enumField.ToProto, enumField.Proto);
-            TestDescriptorToProto(foreignMessageField.ToProto, foreignMessageField.Proto);
-            TestDescriptorToProto(fieldInOneof.ToProto, fieldInOneof.Proto);
-        }
-
-        [Test]
-        public void FieldDescriptorLabel()
-        {
-            FieldDescriptor singleField =
-                TestAllTypes.Descriptor.FindDescriptor<FieldDescriptor>("single_int32");
-            FieldDescriptor repeatedField =
-                TestAllTypes.Descriptor.FindDescriptor<FieldDescriptor>("repeated_int32");
-
-            Assert.IsFalse(singleField.IsRepeated);
-            Assert.IsTrue(repeatedField.IsRepeated);
-        }
-
-        [Test]
-        public void EnumDescriptor()
-        {
-            // Note: this test is a bit different to the Java version because there's no static way of getting to the descriptor
-            EnumDescriptor enumType = UnittestProto3Reflection.Descriptor.FindTypeByName<EnumDescriptor>("ForeignEnum");
-            EnumDescriptor nestedType = TestAllTypes.Descriptor.FindDescriptor<EnumDescriptor>("NestedEnum");
-
-            Assert.AreEqual("ForeignEnum", enumType.Name);
-            Assert.AreEqual("protobuf_unittest3.ForeignEnum", enumType.FullName);
-            Assert.AreEqual(UnittestProto3Reflection.Descriptor, enumType.File);
-            Assert.Null(enumType.ContainingType);
-            Assert.Null(enumType.Proto.Options);
-
-            Assert.AreEqual("NestedEnum", nestedType.Name);
-            Assert.AreEqual("protobuf_unittest3.TestAllTypes.NestedEnum",
-                            nestedType.FullName);
-            Assert.AreEqual(UnittestProto3Reflection.Descriptor, nestedType.File);
-            Assert.AreEqual(TestAllTypes.Descriptor, nestedType.ContainingType);
-
-            EnumValueDescriptor value = enumType.FindValueByName("FOREIGN_FOO");
-            Assert.AreEqual(value, enumType.Values[1]);
-            Assert.AreEqual("FOREIGN_FOO", value.Name);
-            Assert.AreEqual(4, value.Number);
-            Assert.AreEqual((int) ForeignEnum.ForeignFoo, value.Number);
-            Assert.AreEqual(value, enumType.FindValueByNumber(4));
-            Assert.Null(enumType.FindValueByName("NO_SUCH_VALUE"));
-            for (int i = 0; i < enumType.Values.Count; i++)
-            {
-                Assert.AreEqual(i, enumType.Values[i].Index);
-            }
-            TestDescriptorToProto(enumType.ToProto, enumType.Proto);
-            TestDescriptorToProto(nestedType.ToProto, nestedType.Proto);
-        }
-
-        [Test]
-        public void OneofDescriptor()
-        {
-            OneofDescriptor descriptor = TestAllTypes.Descriptor.FindDescriptor<OneofDescriptor>("oneof_field");
-            Assert.IsFalse(descriptor.IsSynthetic);
-            Assert.AreEqual("oneof_field", descriptor.Name);
-            Assert.AreEqual("protobuf_unittest3.TestAllTypes.oneof_field", descriptor.FullName);
-
-            var expectedFields = new[] {
-                TestAllTypes.OneofBytesFieldNumber,
-                TestAllTypes.OneofNestedMessageFieldNumber,
-                TestAllTypes.OneofStringFieldNumber,
-                TestAllTypes.OneofUint32FieldNumber }
-                .Select(fieldNumber => TestAllTypes.Descriptor.FindFieldByNumber(fieldNumber))
-                .ToList();
-            foreach (var field in expectedFields)
-            {
-                Assert.AreSame(descriptor, field.ContainingOneof);
-            }
-
-            CollectionAssert.AreEquivalent(expectedFields, descriptor.Fields);
-            TestDescriptorToProto(descriptor.ToProto, descriptor.Proto);
-        }
-
-        [Test]
-        public void MapEntryMessageDescriptor()
-        {
-            var descriptor = MapWellKnownTypes.Descriptor.NestedTypes[0];
-            Assert.IsNull(descriptor.Parser);
-            Assert.IsNull(descriptor.ClrType);
-            Assert.IsNull(descriptor.Fields[1].Accessor);
-            TestDescriptorToProto(descriptor.ToProto, descriptor.Proto);
-        }
-
-        // From TestFieldOrdering:
-        // string my_string = 11;
-        // int64 my_int = 1;
-        // float my_float = 101;
-        // NestedMessage single_nested_message = 200;
-        [Test]
-        public void FieldListOrderings()
-        {
-            var fields = TestFieldOrderings.Descriptor.Fields;
-            Assert.AreEqual(new[] { 11, 1, 101, 200 }, fields.InDeclarationOrder().Select(x => x.FieldNumber));
-            Assert.AreEqual(new[] { 1, 11, 101, 200 }, fields.InFieldNumberOrder().Select(x => x.FieldNumber));
-        }
-
-
-        [Test]
-        public void DescriptorProtoFileDescriptor()
-        {
-            var descriptor = Google.Protobuf.Reflection.FileDescriptor.DescriptorProtoFileDescriptor;
-            Assert.AreEqual("google/protobuf/descriptor.proto", descriptor.Name);
-            TestDescriptorToProto(descriptor.ToProto, descriptor.Proto);
-        }
-
-        [Test]
-        public void DescriptorImportingExtensionsFromOldCodeGen()
-        {
-            // The extension collection includes a null extension. There's not a lot we can do about that
-            // in itself, as the old generator didn't provide us the extension information.
-            var extensions = TestProtos.OldGenerator.OldExtensions2Reflection.Descriptor.Extensions;
-            Assert.AreEqual(1, extensions.UnorderedExtensions.Count);
-            // Note: this assertion is present so that it will fail if OldExtensions2 is regenerated
-            // with a new generator.
-            Assert.Null(extensions.UnorderedExtensions[0].Extension);
-
-            // ... but we can make sure we at least don't cause a failure when retrieving descriptors.
-            // In particular, old_extensions1.proto imports old_extensions2.proto, and this used to cause
-            // an execution-time failure.
-            var importingDescriptor = TestProtos.OldGenerator.OldExtensions1Reflection.Descriptor;
-            Assert.NotNull(importingDescriptor);
-        }
-
-        [Test]
-        public void Proto3OptionalDescriptors()
-        {
-            var descriptor = TestProto3Optional.Descriptor;
-            var field = descriptor.Fields[TestProto3Optional.OptionalInt32FieldNumber];
-            Assert.NotNull(field.ContainingOneof);
-            Assert.IsTrue(field.ContainingOneof.IsSynthetic);
-            Assert.Null(field.RealContainingOneof);
-        }
-
-
-        [Test]
-        public void SyntheticOneofReflection()
-        {
-            // Expect every oneof in TestProto3Optional to be synthetic
-            var proto3OptionalDescriptor = TestProto3Optional.Descriptor;
-            Assert.AreEqual(0, proto3OptionalDescriptor.RealOneofCount);
-            foreach (var oneof in proto3OptionalDescriptor.Oneofs)
-            {
-                Assert.True(oneof.IsSynthetic);
-            }
-
-            // Expect no oneof in the original proto3 unit test file to be synthetic.
-            foreach (var descriptor in ProtobufTestMessages.Proto3.TestMessagesProto3Reflection.Descriptor.MessageTypes)
-            {
-                Assert.AreEqual(descriptor.Oneofs.Count, descriptor.RealOneofCount);
-                foreach (var oneof in descriptor.Oneofs)
-                {
-                    Assert.False(oneof.IsSynthetic);
-                }
-            }
-
-            // Expect no oneof in the original proto2 unit test file to be synthetic.
-            foreach (var descriptor in ProtobufTestMessages.Proto2.TestMessagesProto2Reflection.Descriptor.MessageTypes)
-            {
-                Assert.AreEqual(descriptor.Oneofs.Count, descriptor.RealOneofCount);
-                foreach (var oneof in descriptor.Oneofs)
-                {
-                    Assert.False(oneof.IsSynthetic);
-                }
-            }
-        }
-
-        private static void TestDescriptorToProto(Func<IMessage> toProtoFunction, IMessage expectedProto)
-        {
-            var clone1 = toProtoFunction();
-            var clone2 = toProtoFunction();
-            Assert.AreNotSame(clone1, clone2);
-            Assert.AreNotSame(clone1, expectedProto);
-            Assert.AreNotSame(clone2, expectedProto);
-
-            Assert.AreEqual(clone1, clone2);
-            Assert.AreEqual(clone1, expectedProto);
-        }
-    }
-}
diff --git a/libs/protobuf/csharp/src/Google.Protobuf.Test/Reflection/FieldAccessTest.cs b/libs/protobuf/csharp/src/Google.Protobuf.Test/Reflection/FieldAccessTest.cs
deleted file mode 100644
index b4dcdab..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf.Test/Reflection/FieldAccessTest.cs
+++ /dev/null
@@ -1,436 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using Google.Protobuf.TestProtos;
-using Proto2 = Google.Protobuf.TestProtos.Proto2;
-using NUnit.Framework;
-using System;
-using System.Collections;
-using System.Collections.Generic;
-
-using static Google.Protobuf.TestProtos.Proto2.UnittestExtensions;
-using ProtobufUnittest;
-
-namespace Google.Protobuf.Reflection
-{
-    public class FieldAccessTest
-    {
-        [Test]
-        public void GetValue()
-        {
-            var message = SampleMessages.CreateFullTestAllTypes();
-            var fields = TestProtos.TestAllTypes.Descriptor.Fields;
-            Assert.AreEqual(message.SingleBool, fields[TestProtos.TestAllTypes.SingleBoolFieldNumber].Accessor.GetValue(message));
-            Assert.AreEqual(message.SingleBytes, fields[TestProtos.TestAllTypes.SingleBytesFieldNumber].Accessor.GetValue(message));
-            Assert.AreEqual(message.SingleDouble, fields[TestProtos.TestAllTypes.SingleDoubleFieldNumber].Accessor.GetValue(message));
-            Assert.AreEqual(message.SingleFixed32, fields[TestProtos.TestAllTypes.SingleFixed32FieldNumber].Accessor.GetValue(message));
-            Assert.AreEqual(message.SingleFixed64, fields[TestProtos.TestAllTypes.SingleFixed64FieldNumber].Accessor.GetValue(message));
-            Assert.AreEqual(message.SingleFloat, fields[TestProtos.TestAllTypes.SingleFloatFieldNumber].Accessor.GetValue(message));
-            Assert.AreEqual(message.SingleForeignEnum, fields[TestProtos.TestAllTypes.SingleForeignEnumFieldNumber].Accessor.GetValue(message));
-            Assert.AreEqual(message.SingleForeignMessage, fields[TestProtos.TestAllTypes.SingleForeignMessageFieldNumber].Accessor.GetValue(message));
-            Assert.AreEqual(message.SingleImportEnum, fields[TestProtos.TestAllTypes.SingleImportEnumFieldNumber].Accessor.GetValue(message));
-            Assert.AreEqual(message.SingleImportMessage, fields[TestProtos.TestAllTypes.SingleImportMessageFieldNumber].Accessor.GetValue(message));
-            Assert.AreEqual(message.SingleInt32, fields[TestProtos.TestAllTypes.SingleInt32FieldNumber].Accessor.GetValue(message));
-            Assert.AreEqual(message.SingleInt64, fields[TestProtos.TestAllTypes.SingleInt64FieldNumber].Accessor.GetValue(message));
-            Assert.AreEqual(message.SingleNestedEnum, fields[TestProtos.TestAllTypes.SingleNestedEnumFieldNumber].Accessor.GetValue(message));
-            Assert.AreEqual(message.SingleNestedMessage, fields[TestProtos.TestAllTypes.SingleNestedMessageFieldNumber].Accessor.GetValue(message));
-            Assert.AreEqual(message.SinglePublicImportMessage, fields[TestProtos.TestAllTypes.SinglePublicImportMessageFieldNumber].Accessor.GetValue(message));
-            Assert.AreEqual(message.SingleSint32, fields[TestProtos.TestAllTypes.SingleSint32FieldNumber].Accessor.GetValue(message));
-            Assert.AreEqual(message.SingleSint64, fields[TestProtos.TestAllTypes.SingleSint64FieldNumber].Accessor.GetValue(message));
-            Assert.AreEqual(message.SingleString, fields[TestProtos.TestAllTypes.SingleStringFieldNumber].Accessor.GetValue(message));
-            Assert.AreEqual(message.SingleSfixed32, fields[TestProtos.TestAllTypes.SingleSfixed32FieldNumber].Accessor.GetValue(message));
-            Assert.AreEqual(message.SingleSfixed64, fields[TestProtos.TestAllTypes.SingleSfixed64FieldNumber].Accessor.GetValue(message));
-            Assert.AreEqual(message.SingleUint32, fields[TestProtos.TestAllTypes.SingleUint32FieldNumber].Accessor.GetValue(message));
-            Assert.AreEqual(message.SingleUint64, fields[TestProtos.TestAllTypes.SingleUint64FieldNumber].Accessor.GetValue(message));
-            Assert.AreEqual(message.OneofBytes, fields[TestProtos.TestAllTypes.OneofBytesFieldNumber].Accessor.GetValue(message));
-            Assert.AreEqual(message.OneofString, fields[TestProtos.TestAllTypes.OneofStringFieldNumber].Accessor.GetValue(message));
-            Assert.AreEqual(message.OneofNestedMessage, fields[TestProtos.TestAllTypes.OneofNestedMessageFieldNumber].Accessor.GetValue(message));
-            Assert.AreEqual(message.OneofUint32, fields[TestProtos.TestAllTypes.OneofUint32FieldNumber].Accessor.GetValue(message));
-
-            // Just one example for repeated fields - they're all just returning the list
-            var list = (IList) fields[TestProtos.TestAllTypes.RepeatedInt32FieldNumber].Accessor.GetValue(message);
-            Assert.AreEqual(message.RepeatedInt32, list);
-            Assert.AreEqual(message.RepeatedInt32[0], list[0]); // Just in case there was any doubt...
-
-            // Just a single map field, for the same reason
-            var mapMessage = new TestMap { MapStringString = { { "key1", "value1" }, { "key2", "value2" } } };
-            fields = TestMap.Descriptor.Fields;
-            var dictionary = (IDictionary) fields[TestMap.MapStringStringFieldNumber].Accessor.GetValue(mapMessage);
-            Assert.AreEqual(mapMessage.MapStringString, dictionary);
-            Assert.AreEqual("value1", dictionary["key1"]);
-        }
-
-        [Test]
-        public void GetValue_IncorrectType()
-        {
-            IMessage message = SampleMessages.CreateFullTestAllTypes();
-            var fields = message.Descriptor.Fields;
-            Assert.Throws<InvalidCastException>(() => fields[TestProtos.TestAllTypes.SingleBoolFieldNumber].Accessor.GetValue(new TestMap()));
-        }
-
-        [Test]
-        public void HasValue_Proto3_Message()
-        {
-            var message = new TestAllTypes();
-            var accessor = ((IMessage) message).Descriptor.Fields[TestProtos.TestAllTypes.SingleForeignMessageFieldNumber].Accessor;
-            Assert.False(accessor.HasValue(message));
-            message.SingleForeignMessage = new ForeignMessage();
-            Assert.True(accessor.HasValue(message));
-            message.SingleForeignMessage = null;
-            Assert.False(accessor.HasValue(message));
-        }
-
-        [Test]
-        public void HasValue_Proto3_Oneof()
-        {
-            TestAllTypes message = new TestAllTypes();
-            var accessor = ((IMessage) message).Descriptor.Fields[TestProtos.TestAllTypes.OneofStringFieldNumber].Accessor;
-            Assert.False(accessor.HasValue(message));
-            // Even though it's the default value, we still have a value.
-            message.OneofString = "";
-            Assert.True(accessor.HasValue(message));
-            message.OneofString = "hello";
-            Assert.True(accessor.HasValue(message));
-            message.OneofUint32 = 10;
-            Assert.False(accessor.HasValue(message));
-        }
-
-        [Test]
-        public void HasValue_Proto3_Primitive_Optional()
-        {
-            var message = new TestProto3Optional();
-            var accessor = ((IMessage) message).Descriptor.Fields[TestProto3Optional.OptionalInt64FieldNumber].Accessor;
-            Assert.IsFalse(accessor.HasValue(message));
-            message.OptionalInt64 = 5L;
-            Assert.IsTrue(accessor.HasValue(message));
-            message.ClearOptionalInt64();
-            Assert.IsFalse(accessor.HasValue(message));
-            message.OptionalInt64 = 0L;
-            Assert.IsTrue(accessor.HasValue(message));
-        }
-
-        [Test]
-        public void HasValue_Proto3_Primitive_NotOptional()
-        {
-            IMessage message = SampleMessages.CreateFullTestAllTypes();
-            var fields = message.Descriptor.Fields;
-            Assert.Throws<InvalidOperationException>(() => fields[TestProtos.TestAllTypes.SingleBoolFieldNumber].Accessor.HasValue(message));
-        }
-
-        [Test]
-        public void HasValue_Proto3_Repeated()
-        {
-            var message = new TestAllTypes();
-            var accessor = ((IMessage) message).Descriptor.Fields[TestProtos.TestAllTypes.RepeatedBoolFieldNumber].Accessor;
-            Assert.Throws<InvalidOperationException>(() => accessor.HasValue(message));
-        }
-
-        [Test]
-        public void HasValue_Proto2_Primitive()
-        {
-            var message = new Proto2.TestAllTypes();
-            var accessor = ((IMessage) message).Descriptor.Fields[Proto2.TestAllTypes.OptionalInt64FieldNumber].Accessor;
-
-            Assert.IsFalse(accessor.HasValue(message));
-            message.OptionalInt64 = 5L;
-            Assert.IsTrue(accessor.HasValue(message));
-            message.ClearOptionalInt64();
-            Assert.IsFalse(accessor.HasValue(message));
-            message.OptionalInt64 = 0L;
-            Assert.IsTrue(accessor.HasValue(message));
-        }
-
-        [Test]
-        public void HasValue_Proto2_Message()
-        {
-            var message = new Proto2.TestAllTypes();
-            var field = ((IMessage) message).Descriptor.Fields[Proto2.TestAllTypes.OptionalForeignMessageFieldNumber];
-            Assert.False(field.Accessor.HasValue(message));
-            message.OptionalForeignMessage = new Proto2.ForeignMessage();
-            Assert.True(field.Accessor.HasValue(message));
-            message.OptionalForeignMessage = null;
-            Assert.False(field.Accessor.HasValue(message));
-        }
-
-        [Test]
-        public void HasValue_Proto2_Oneof()
-        {
-            var message = new Proto2.TestAllTypes();
-            var accessor = ((IMessage) message).Descriptor.Fields[Proto2.TestAllTypes.OneofStringFieldNumber].Accessor;
-            Assert.False(accessor.HasValue(message));
-            // Even though it's the default value, we still have a value.
-            message.OneofString = "";
-            Assert.True(accessor.HasValue(message));
-            message.OneofString = "hello";
-            Assert.True(accessor.HasValue(message));
-            message.OneofUint32 = 10;
-            Assert.False(accessor.HasValue(message));
-        }
-
-        [Test]
-        public void HasValue_Proto2_Repeated()
-        {
-            var message = new Proto2.TestAllTypes();
-            var accessor = ((IMessage) message).Descriptor.Fields[Proto2.TestAllTypes.RepeatedBoolFieldNumber].Accessor;
-            Assert.Throws<InvalidOperationException>(() => accessor.HasValue(message));
-        }
-
-        [Test]
-        public void SetValue_SingleFields()
-        {
-            // Just a sample (primitives, messages, enums, strings, byte strings)
-            var message = SampleMessages.CreateFullTestAllTypes();
-            var fields = TestProtos.TestAllTypes.Descriptor.Fields;
-            fields[TestProtos.TestAllTypes.SingleBoolFieldNumber].Accessor.SetValue(message, false);
-            fields[TestProtos.TestAllTypes.SingleInt32FieldNumber].Accessor.SetValue(message, 500);
-            fields[TestProtos.TestAllTypes.SingleStringFieldNumber].Accessor.SetValue(message, "It's a string");
-            fields[TestProtos.TestAllTypes.SingleBytesFieldNumber].Accessor.SetValue(message, ByteString.CopyFrom(99, 98, 97));
-            fields[TestProtos.TestAllTypes.SingleForeignEnumFieldNumber].Accessor.SetValue(message, ForeignEnum.ForeignFoo);
-            fields[TestProtos.TestAllTypes.SingleForeignMessageFieldNumber].Accessor.SetValue(message, new ForeignMessage { C = 12345 });
-            fields[TestProtos.TestAllTypes.SingleDoubleFieldNumber].Accessor.SetValue(message, 20150701.5);
-
-            var expected = new TestAllTypes(SampleMessages.CreateFullTestAllTypes())
-            {
-                SingleBool = false,
-                SingleInt32 = 500,
-                SingleString = "It's a string",
-                SingleBytes = ByteString.CopyFrom(99, 98, 97),
-                SingleForeignEnum = ForeignEnum.ForeignFoo,
-                SingleForeignMessage = new ForeignMessage { C = 12345 },
-                SingleDouble = 20150701.5
-            };
-
-            Assert.AreEqual(expected, message);
-        }
-
-        [Test]
-        public void SetValue_SingleFields_WrongType()
-        {
-            IMessage message = SampleMessages.CreateFullTestAllTypes();
-            var fields = message.Descriptor.Fields;
-            Assert.Throws<InvalidCastException>(() => fields[TestProtos.TestAllTypes.SingleBoolFieldNumber].Accessor.SetValue(message, "This isn't a bool"));
-        }
-
-        [Test]
-        public void SetValue_MapFields()
-        {
-            IMessage message = new TestMap();
-            var fields = message.Descriptor.Fields;
-            Assert.Throws<InvalidOperationException>(() => fields[TestMap.MapStringStringFieldNumber].Accessor.SetValue(message, new Dictionary<string, string>()));
-        }
-
-        [Test]
-        public void SetValue_RepeatedFields()
-        {
-            IMessage message = SampleMessages.CreateFullTestAllTypes();
-            var fields = message.Descriptor.Fields;
-            Assert.Throws<InvalidOperationException>(() => fields[TestProtos.TestAllTypes.RepeatedDoubleFieldNumber].Accessor.SetValue(message, new double[10]));
-        }
-
-        [Test]
-        public void Oneof()
-        {
-            var message = new TestAllTypes();
-            var descriptor = TestProtos.TestAllTypes.Descriptor;
-            Assert.AreEqual(1, descriptor.Oneofs.Count);
-            var oneof = descriptor.Oneofs[0];
-            Assert.AreEqual("oneof_field", oneof.Name);
-            Assert.IsNull(oneof.Accessor.GetCaseFieldDescriptor(message));
-
-            message.OneofString = "foo";
-            Assert.AreSame(descriptor.Fields[TestProtos.TestAllTypes.OneofStringFieldNumber], oneof.Accessor.GetCaseFieldDescriptor(message));
-
-            message.OneofUint32 = 10;
-            Assert.AreSame(descriptor.Fields[TestProtos.TestAllTypes.OneofUint32FieldNumber], oneof.Accessor.GetCaseFieldDescriptor(message));
-
-            oneof.Accessor.Clear(message);
-            Assert.AreEqual(TestProtos.TestAllTypes.OneofFieldOneofCase.None, message.OneofFieldCase);
-        }
-
-        [Test]
-        public void Clear()
-        {
-            var message = SampleMessages.CreateFullTestAllTypes();
-            var fields = TestProtos.TestAllTypes.Descriptor.Fields;
-            fields[TestProtos.TestAllTypes.SingleBoolFieldNumber].Accessor.Clear(message);
-            fields[TestProtos.TestAllTypes.SingleInt32FieldNumber].Accessor.Clear(message);
-            fields[TestProtos.TestAllTypes.SingleStringFieldNumber].Accessor.Clear(message);
-            fields[TestProtos.TestAllTypes.SingleBytesFieldNumber].Accessor.Clear(message);
-            fields[TestProtos.TestAllTypes.SingleForeignEnumFieldNumber].Accessor.Clear(message);
-            fields[TestProtos.TestAllTypes.SingleForeignMessageFieldNumber].Accessor.Clear(message);
-            fields[TestProtos.TestAllTypes.RepeatedDoubleFieldNumber].Accessor.Clear(message);
-
-            var expected = new TestAllTypes(SampleMessages.CreateFullTestAllTypes())
-            {
-                SingleBool = false,
-                SingleInt32 = 0,
-                SingleString = "",
-                SingleBytes = ByteString.Empty,
-                SingleForeignEnum = 0,
-                SingleForeignMessage = null,
-            };
-            expected.RepeatedDouble.Clear();
-
-            Assert.AreEqual(expected, message);
-
-            // Separately, maps.
-            var mapMessage = new TestMap { MapStringString = { { "key1", "value1" }, { "key2", "value2" } } };
-            fields = TestMap.Descriptor.Fields;
-            fields[TestMap.MapStringStringFieldNumber].Accessor.Clear(mapMessage);
-            Assert.AreEqual(0, mapMessage.MapStringString.Count);
-        }
-
-        [Test]
-        public void Clear_Proto3Optional()
-        {
-            TestProto3Optional message = new TestProto3Optional
-            {
-                OptionalInt32 = 0,
-                OptionalNestedMessage = new TestProto3Optional.Types.NestedMessage()
-            };
-            var primitiveField = TestProto3Optional.Descriptor.Fields[TestProto3Optional.OptionalInt32FieldNumber];
-            var messageField = TestProto3Optional.Descriptor.Fields[TestProto3Optional.OptionalNestedMessageFieldNumber];
-
-            Assert.True(message.HasOptionalInt32);
-            Assert.NotNull(message.OptionalNestedMessage);
-
-            primitiveField.Accessor.Clear(message);
-            messageField.Accessor.Clear(message);
-
-            Assert.False(message.HasOptionalInt32);
-            Assert.Null(message.OptionalNestedMessage);
-        }
-
-        [Test]
-        public void Clear_Proto3_Oneof()
-        {
-            var message = new TestAllTypes();
-            var accessor = ((IMessage) message).Descriptor.Fields[TestProtos.TestAllTypes.OneofUint32FieldNumber].Accessor;
-
-            // The field accessor Clear method only affects a oneof if the current case is the one being cleared.
-            message.OneofString = "hello";
-            Assert.AreEqual(TestProtos.TestAllTypes.OneofFieldOneofCase.OneofString, message.OneofFieldCase);
-            accessor.Clear(message);
-            Assert.AreEqual(TestProtos.TestAllTypes.OneofFieldOneofCase.OneofString, message.OneofFieldCase);
-
-            message.OneofUint32 = 100;
-            Assert.AreEqual(TestProtos.TestAllTypes.OneofFieldOneofCase.OneofUint32, message.OneofFieldCase);
-            accessor.Clear(message);
-            Assert.AreEqual(TestProtos.TestAllTypes.OneofFieldOneofCase.None, message.OneofFieldCase);
-        }
-
-        [Test]
-        public void Clear_Proto2_Oneof()
-        {
-            var message = new Proto2.TestAllTypes();
-            var accessor = ((IMessage) message).Descriptor.Fields[Proto2.TestAllTypes.OneofUint32FieldNumber].Accessor;
-
-            // The field accessor Clear method only affects a oneof if the current case is the one being cleared.
-            message.OneofString = "hello";
-            Assert.AreEqual(Proto2.TestAllTypes.OneofFieldOneofCase.OneofString, message.OneofFieldCase);
-            accessor.Clear(message);
-            Assert.AreEqual(Proto2.TestAllTypes.OneofFieldOneofCase.OneofString, message.OneofFieldCase);
-
-            message.OneofUint32 = 100;
-            Assert.AreEqual(Proto2.TestAllTypes.OneofFieldOneofCase.OneofUint32, message.OneofFieldCase);
-            accessor.Clear(message);
-            Assert.AreEqual(Proto2.TestAllTypes.OneofFieldOneofCase.None, message.OneofFieldCase);
-        }
-
-        [Test]
-        public void FieldDescriptor_ByName()
-        {
-            var descriptor = TestProtos.TestAllTypes.Descriptor;
-            Assert.AreSame(
-                descriptor.Fields[TestProtos.TestAllTypes.SingleBoolFieldNumber],
-                descriptor.Fields["single_bool"]);
-        }
-
-        [Test]
-        public void FieldDescriptor_NotFound()
-        {
-            var descriptor = TestProtos.TestAllTypes.Descriptor;
-            Assert.Throws<KeyNotFoundException>(() => descriptor.Fields[999999].ToString());
-            Assert.Throws<KeyNotFoundException>(() => descriptor.Fields["not found"].ToString());
-        }
-
-        [Test]
-        public void GetExtensionValue()
-        {
-            var message = SampleMessages.CreateFullTestAllExtensions();
-
-            // test that the reflector works, since the reflector just runs through IExtendableMessage
-            Assert.AreEqual(message.GetExtension(OptionalBoolExtension), Proto2.TestAllExtensions.Descriptor.FindFieldByNumber(OptionalBoolExtension.FieldNumber).Accessor.GetValue(message));
-        }
-
-        [Test]
-        public void GetRepeatedExtensionValue()
-        {
-            // check to make sure repeated accessor uses GetOrRegister
-            var message = new Proto2.TestAllExtensions();
-
-            Assert.IsNull(message.GetExtension(RepeatedBoolExtension));
-            Assert.IsNotNull(Proto2.TestAllExtensions.Descriptor.FindFieldByNumber(RepeatedBoolExtension.FieldNumber).Accessor.GetValue(message));
-            Assert.IsNotNull(message.GetExtension(RepeatedBoolExtension));
-
-            message.ClearExtension(RepeatedBoolExtension);
-            Assert.IsNull(message.GetExtension(RepeatedBoolExtension));
-        }
-
-        [Test]
-        public void HasPresence()
-        {
-            // Proto3
-            var fields = TestProtos.TestAllTypes.Descriptor.Fields;
-            Assert.IsFalse(fields[TestProtos.TestAllTypes.SingleBoolFieldNumber].HasPresence);
-            Assert.IsTrue(fields[TestProtos.TestAllTypes.OneofBytesFieldNumber].HasPresence);
-            Assert.IsTrue(fields[TestProtos.TestAllTypes.SingleForeignMessageFieldNumber].HasPresence);
-            Assert.IsFalse(fields[TestProtos.TestAllTypes.RepeatedBoolFieldNumber].HasPresence);
-
-            fields = TestMap.Descriptor.Fields;
-            Assert.IsFalse(fields[TestMap.MapBoolBoolFieldNumber].HasPresence);
-
-            fields = TestProto3Optional.Descriptor.Fields;
-            Assert.IsTrue(fields[TestProto3Optional.OptionalBoolFieldNumber].HasPresence);
-
-            // Proto2
-            fields = Proto2.TestAllTypes.Descriptor.Fields;
-            Assert.IsTrue(fields[Proto2.TestAllTypes.OptionalBoolFieldNumber].HasPresence);
-            Assert.IsTrue(fields[Proto2.TestAllTypes.OneofBytesFieldNumber].HasPresence);
-            Assert.IsTrue(fields[Proto2.TestAllTypes.OptionalForeignMessageFieldNumber].HasPresence);
-            Assert.IsFalse(fields[Proto2.TestAllTypes.RepeatedBoolFieldNumber].HasPresence);
-
-            fields = Proto2.TestRequired.Descriptor.Fields;
-            Assert.IsTrue(fields[Proto2.TestRequired.AFieldNumber].HasPresence);
-        }
-    }
-}
diff --git a/libs/protobuf/csharp/src/Google.Protobuf.Test/Reflection/TypeRegistryTest.cs b/libs/protobuf/csharp/src/Google.Protobuf.Test/Reflection/TypeRegistryTest.cs
deleted file mode 100644
index 5be7ca2..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf.Test/Reflection/TypeRegistryTest.cs
+++ /dev/null
@@ -1,94 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using Google.Protobuf.TestProtos;
-using Google.Protobuf.WellKnownTypes;
-using NUnit.Framework;
-
-namespace Google.Protobuf.Reflection
-{
-    public class TypeRegistryTest
-    {
-        // Most of our tests use messages. Simple test that we really can use files...
-        [Test]
-        public void CreateWithFileDescriptor()
-        {
-            var registry = TypeRegistry.FromFiles(DurationReflection.Descriptor, StructReflection.Descriptor);
-            AssertDescriptorPresent(registry, Duration.Descriptor);
-            AssertDescriptorPresent(registry, ListValue.Descriptor);
-            AssertDescriptorAbsent(registry, Timestamp.Descriptor);
-        }
-
-        [Test]
-        public void TypesFromSameFile()
-        {
-            // Just for kicks, let's start with a nested type
-            var registry = TypeRegistry.FromMessages(TestAllTypes.Types.NestedMessage.Descriptor);
-            // Top-level...
-            AssertDescriptorPresent(registry, TestFieldOrderings.Descriptor);
-            // ... and nested (not the same as the original NestedMessage!)
-            AssertDescriptorPresent(registry, TestFieldOrderings.Types.NestedMessage.Descriptor);
-        }
-
-        [Test]
-        public void DependenciesAreIncluded()
-        {
-            var registry = TypeRegistry.FromMessages(TestAllTypes.Descriptor);
-            // Direct dependencies
-            AssertDescriptorPresent(registry, ImportMessage.Descriptor);
-            // Public dependencies
-            AssertDescriptorPresent(registry, PublicImportMessage.Descriptor);
-        }
-
-        [Test]
-        public void DuplicateFiles()
-        {
-            // Duplicates via dependencies and simply via repetition
-            var registry = TypeRegistry.FromFiles(
-                UnittestProto3Reflection.Descriptor, UnittestImportProto3Reflection.Descriptor,
-                TimestampReflection.Descriptor, TimestampReflection.Descriptor);
-            AssertDescriptorPresent(registry, TestAllTypes.Descriptor);
-            AssertDescriptorPresent(registry, ImportMessage.Descriptor);
-            AssertDescriptorPresent(registry, Timestamp.Descriptor);
-        }
-
-        private static void AssertDescriptorPresent(TypeRegistry registry, MessageDescriptor descriptor)
-        {
-            Assert.AreSame(descriptor, registry.Find(descriptor.FullName));
-        }
-
-        private static void AssertDescriptorAbsent(TypeRegistry registry, MessageDescriptor descriptor)
-        {
-            Assert.IsNull(registry.Find(descriptor.FullName));
-        }
-    }
-}
diff --git a/libs/protobuf/csharp/src/Google.Protobuf.Test/SampleEnum.cs b/libs/protobuf/csharp/src/Google.Protobuf.Test/SampleEnum.cs
deleted file mode 100644
index 44f232a..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf.Test/SampleEnum.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-namespace Google.Protobuf
-{
-    // Just a sample enum with positive and negative values to be used in tests.
-    internal enum SampleEnum
-    {
-        NegativeValue = -2,
-        None = 0,
-        PositiveValue = 3
-    }
-}
diff --git a/libs/protobuf/csharp/src/Google.Protobuf.Test/SampleMessages.cs b/libs/protobuf/csharp/src/Google.Protobuf.Test/SampleMessages.cs
deleted file mode 100644
index 03a20d6..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf.Test/SampleMessages.cs
+++ /dev/null
@@ -1,207 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-using Google.Protobuf.TestProtos;
-using Proto2 = Google.Protobuf.TestProtos.Proto2;
-
-using static Google.Protobuf.TestProtos.Proto2.UnittestExtensions;
-
-namespace Google.Protobuf
-{
-    /// <summary>
-    /// Helper methods to create sample instances of types generated from unit test messages.
-    /// </summary>
-    public class SampleMessages
-    {
-        /// <summary>
-        /// Creates a new sample TestAllTypes message with all fields populated.
-        /// The "oneof" field is populated with the string property (OneofString).
-        /// </summary>
-        public static TestAllTypes CreateFullTestAllTypes()
-        {
-            return new TestAllTypes
-            {
-                SingleBool = true,
-                SingleBytes = ByteString.CopyFrom(1, 2, 3, 4),
-                SingleDouble = 23.5,
-                SingleFixed32 = 23,
-                SingleFixed64 = 1234567890123,
-                SingleFloat = 12.25f,
-                SingleForeignEnum = ForeignEnum.ForeignBar,
-                SingleForeignMessage = new ForeignMessage { C = 10 },
-                SingleImportEnum = ImportEnum.ImportBaz,
-                SingleImportMessage = new ImportMessage { D = 20 },
-                SingleInt32 = 100,
-                SingleInt64 = 3210987654321,
-                SingleNestedEnum = TestProtos.TestAllTypes.Types.NestedEnum.Foo,
-                SingleNestedMessage = new TestAllTypes.Types.NestedMessage { Bb = 35 },
-                SinglePublicImportMessage = new PublicImportMessage { E = 54 },
-                SingleSfixed32 = -123,
-                SingleSfixed64 = -12345678901234,
-                SingleSint32 = -456,
-                SingleSint64 = -12345678901235,
-                SingleString = "test",
-                SingleUint32 = UInt32.MaxValue,
-                SingleUint64 = UInt64.MaxValue,
-                RepeatedBool = { true, false },
-                RepeatedBytes = { ByteString.CopyFrom(1, 2, 3, 4), ByteString.CopyFrom(5, 6), ByteString.CopyFrom(new byte[1000]) },
-                RepeatedDouble = { -12.25, 23.5 },
-                RepeatedFixed32 = { UInt32.MaxValue, 23 },
-                RepeatedFixed64 = { UInt64.MaxValue, 1234567890123 },
-                RepeatedFloat = { 100f, 12.25f },
-                RepeatedForeignEnum = { ForeignEnum.ForeignFoo, ForeignEnum.ForeignBar },
-                RepeatedForeignMessage = { new ForeignMessage(), new ForeignMessage { C = 10 } },
-                RepeatedImportEnum = { ImportEnum.ImportBaz, ImportEnum.Unspecified },
-                RepeatedImportMessage = { new ImportMessage { D = 20 }, new ImportMessage { D = 25 } },
-                RepeatedInt32 = { 100, 200 },
-                RepeatedInt64 = { 3210987654321, Int64.MaxValue },
-                RepeatedNestedEnum = { TestProtos.TestAllTypes.Types.NestedEnum.Foo, TestProtos.TestAllTypes.Types.NestedEnum.Neg },
-                RepeatedNestedMessage = { new TestAllTypes.Types.NestedMessage { Bb = 35 }, new TestAllTypes.Types.NestedMessage { Bb = 10 } },
-                RepeatedPublicImportMessage = { new PublicImportMessage { E = 54 }, new PublicImportMessage { E = -1 } },
-                RepeatedSfixed32 = { -123, 123 },
-                RepeatedSfixed64 = { -12345678901234, 12345678901234 },
-                RepeatedSint32 = { -456, 100 },
-                RepeatedSint64 = { -12345678901235, 123 },
-                RepeatedString = { "foo", "bar" },
-                RepeatedUint32 = { UInt32.MaxValue, UInt32.MinValue },
-                RepeatedUint64 = { UInt64.MaxValue, UInt32.MinValue },
-                OneofString = "Oneof string"
-            };
-        }
-
-        public static Proto2.TestAllTypes CreateFullTestAllTypesProto2()
-        {
-            return new Proto2.TestAllTypes
-            {
-                OptionalBool = true,
-                OptionalBytes = ByteString.CopyFrom(1, 2, 3, 4),
-                OptionalDouble = 23.5,
-                OptionalFixed32 = 23,
-                OptionalFixed64 = 1234567890123,
-                OptionalFloat = 12.25f,
-                OptionalForeignEnum = Proto2.ForeignEnum.ForeignBar,
-                OptionalForeignMessage = new Proto2.ForeignMessage { C = 10 },
-                OptionalImportEnum = Proto2.ImportEnum.ImportBaz,
-                OptionalImportMessage = new Proto2.ImportMessage { D = 20 },
-                OptionalInt32 = 100,
-                OptionalInt64 = 3210987654321,
-                OptionalNestedEnum = Proto2.TestAllTypes.Types.NestedEnum.Foo,
-                OptionalNestedMessage = new Proto2.TestAllTypes.Types.NestedMessage { Bb = 35 },
-                OptionalPublicImportMessage = new Proto2.PublicImportMessage { E = 54 },
-                OptionalSfixed32 = -123,
-                OptionalSfixed64 = -12345678901234,
-                OptionalSint32 = -456,
-                OptionalSint64 = -12345678901235,
-                OptionalString = "test",
-                OptionalUint32 = UInt32.MaxValue,
-                OptionalUint64 = UInt64.MaxValue,
-                OptionalGroup = new Proto2.TestAllTypes.Types.OptionalGroup { A = 10 },
-                RepeatedBool = { true, false },
-                RepeatedBytes = { ByteString.CopyFrom(1, 2, 3, 4), ByteString.CopyFrom(5, 6), ByteString.CopyFrom(new byte[1000]) },
-                RepeatedDouble = { -12.25, 23.5 },
-                RepeatedFixed32 = { UInt32.MaxValue, 23 },
-                RepeatedFixed64 = { UInt64.MaxValue, 1234567890123 },
-                RepeatedFloat = { 100f, 12.25f },
-                RepeatedForeignEnum = { Proto2.ForeignEnum.ForeignFoo, Proto2.ForeignEnum.ForeignBar },
-                RepeatedForeignMessage = { new Proto2.ForeignMessage(), new Proto2.ForeignMessage { C = 10 } },
-                RepeatedImportEnum = { Proto2.ImportEnum.ImportBaz, Proto2.ImportEnum.ImportFoo },
-                RepeatedImportMessage = { new Proto2.ImportMessage { D = 20 }, new Proto2.ImportMessage { D = 25 } },
-                RepeatedInt32 = { 100, 200 },
-                RepeatedInt64 = { 3210987654321, Int64.MaxValue },
-                RepeatedNestedEnum = { Proto2.TestAllTypes.Types.NestedEnum.Foo, Proto2.TestAllTypes.Types.NestedEnum.Neg },
-                RepeatedNestedMessage = { new Proto2.TestAllTypes.Types.NestedMessage { Bb = 35 }, new Proto2.TestAllTypes.Types.NestedMessage { Bb = 10 } },
-                RepeatedSfixed32 = { -123, 123 },
-                RepeatedSfixed64 = { -12345678901234, 12345678901234 },
-                RepeatedSint32 = { -456, 100 },
-                RepeatedSint64 = { -12345678901235, 123 },
-                RepeatedString = { "foo", "bar" },
-                RepeatedUint32 = { UInt32.MaxValue, UInt32.MinValue },
-                RepeatedUint64 = { UInt64.MaxValue, UInt32.MinValue },
-                RepeatedGroup = { new Proto2.TestAllTypes.Types.RepeatedGroup { A = 10 }, new Proto2.TestAllTypes.Types.RepeatedGroup { A = 20 } },
-                OneofString = "Oneof string"
-            };
-        }
-
-        public static Proto2.TestAllExtensions CreateFullTestAllExtensions()
-        {
-            var message = new Proto2.TestAllExtensions();
-            message.SetExtension(OptionalBoolExtension, true);
-            message.SetExtension(OptionalBytesExtension, ByteString.CopyFrom(1, 2, 3, 4));
-            message.SetExtension(OptionalDoubleExtension, 23.5);
-            message.SetExtension(OptionalFixed32Extension, 23u);
-            message.SetExtension(OptionalFixed64Extension, 1234567890123u);
-            message.SetExtension(OptionalFloatExtension, 12.25f);
-            message.SetExtension(OptionalForeignEnumExtension, Proto2.ForeignEnum.ForeignBar);
-            message.SetExtension(OptionalForeignMessageExtension, new Proto2.ForeignMessage { C = 10 });
-            message.SetExtension(OptionalImportEnumExtension, Proto2.ImportEnum.ImportBaz);
-            message.SetExtension(OptionalImportMessageExtension, new Proto2.ImportMessage { D = 20 });
-            message.SetExtension(OptionalInt32Extension, 100);
-            message.SetExtension(OptionalInt64Extension, 3210987654321);
-            message.SetExtension(OptionalNestedEnumExtension, Proto2.TestAllTypes.Types.NestedEnum.Foo);
-            message.SetExtension(OptionalNestedMessageExtension, new Proto2.TestAllTypes.Types.NestedMessage { Bb = 35 });
-            message.SetExtension(OptionalPublicImportMessageExtension, new Proto2.PublicImportMessage { E = 54 });
-            message.SetExtension(OptionalSfixed32Extension, -123);
-            message.SetExtension(OptionalSfixed64Extension, -12345678901234);
-            message.SetExtension(OptionalSint32Extension, -456);
-            message.SetExtension(OptionalSint64Extension, -12345678901235);
-            message.SetExtension(OptionalStringExtension, "test");
-            message.SetExtension(OptionalUint32Extension, UInt32.MaxValue);
-            message.SetExtension(OptionalUint64Extension, UInt64.MaxValue);
-            message.SetExtension(OptionalGroupExtension, new Proto2.OptionalGroup_extension { A = 10 });
-            message.GetOrInitializeExtension(RepeatedBoolExtension).AddRange(new[] { true, false });
-            message.GetOrInitializeExtension(RepeatedBytesExtension).AddRange(new[] { ByteString.CopyFrom(1, 2, 3, 4), ByteString.CopyFrom(5, 6), ByteString.CopyFrom(new byte[1000]) });
-            message.GetOrInitializeExtension(RepeatedDoubleExtension).AddRange(new[] { -12.25, 23.5 });
-            message.GetOrInitializeExtension(RepeatedFixed32Extension).AddRange(new[] { UInt32.MaxValue, 23u });
-            message.GetOrInitializeExtension(RepeatedFixed64Extension).AddRange(new[] { UInt64.MaxValue, 1234567890123ul });
-            message.GetOrInitializeExtension(RepeatedFloatExtension).AddRange(new[] { 100f, 12.25f });
-            message.GetOrInitializeExtension(RepeatedForeignEnumExtension).AddRange(new[] { Proto2.ForeignEnum.ForeignFoo, Proto2.ForeignEnum.ForeignBar });
-            message.GetOrInitializeExtension(RepeatedForeignMessageExtension).AddRange(new[] { new Proto2.ForeignMessage(), new Proto2.ForeignMessage { C = 10 } });
-            message.GetOrInitializeExtension(RepeatedImportEnumExtension).AddRange(new[] { Proto2.ImportEnum.ImportBaz, Proto2.ImportEnum.ImportFoo });
-            message.GetOrInitializeExtension(RepeatedImportMessageExtension).AddRange(new[] { new Proto2.ImportMessage { D = 20 }, new Proto2.ImportMessage { D = 25 } });
-            message.GetOrInitializeExtension(RepeatedInt32Extension).AddRange(new[] { 100, 200 });
-            message.GetOrInitializeExtension(RepeatedInt64Extension).AddRange(new[] { 3210987654321, Int64.MaxValue });
-            message.GetOrInitializeExtension(RepeatedNestedEnumExtension).AddRange(new[] { Proto2.TestAllTypes.Types.NestedEnum.Foo, Proto2.TestAllTypes.Types.NestedEnum.Neg });
-            message.GetOrInitializeExtension(RepeatedNestedMessageExtension).AddRange(new[] { new Proto2.TestAllTypes.Types.NestedMessage { Bb = 35 }, new Proto2.TestAllTypes.Types.NestedMessage { Bb = 10 } });
-            message.GetOrInitializeExtension(RepeatedSfixed32Extension).AddRange(new[] { -123, 123 });
-            message.GetOrInitializeExtension(RepeatedSfixed64Extension).AddRange(new[] { -12345678901234, 12345678901234 });
-            message.GetOrInitializeExtension(RepeatedSint32Extension).AddRange(new[] { -456, 100 });
-            message.GetOrInitializeExtension(RepeatedSint64Extension).AddRange(new[] { -12345678901235, 123 });
-            message.GetOrInitializeExtension(RepeatedStringExtension).AddRange(new[] { "foo", "bar" });
-            message.GetOrInitializeExtension(RepeatedUint32Extension).AddRange(new[] { UInt32.MaxValue, UInt32.MinValue });
-            message.GetOrInitializeExtension(RepeatedUint64Extension).AddRange(new[] { UInt64.MaxValue, UInt32.MinValue });
-            message.GetOrInitializeExtension(RepeatedGroupExtension).AddRange(new[] { new Proto2.RepeatedGroup_extension { A = 10 }, new Proto2.RepeatedGroup_extension { A = 20 } });
-            message.SetExtension(OneofStringExtension, "Oneof string");
-            return message;
-        }
-    }
-}
\ No newline at end of file
diff --git a/libs/protobuf/csharp/src/Google.Protobuf.Test/SampleNaNs.cs b/libs/protobuf/csharp/src/Google.Protobuf.Test/SampleNaNs.cs
deleted file mode 100644
index 34019ac..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf.Test/SampleNaNs.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2017 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-
-namespace Google.Protobuf
-{
-    /// <summary>
-    /// Samples of different not-a-number values, for testing equality comparisons.
-    /// </summary>
-    public static class SampleNaNs
-    {
-        public static double Regular { get; } = double.NaN;
-
-        // Signalling bit is inverted compared with double.NaN. Doesn't really matter
-        // whether that makes it quiet or signalling - it's different.
-        public static double SignallingFlipped { get; } =
-            BitConverter.Int64BitsToDouble(BitConverter.DoubleToInt64Bits(double.NaN) ^ -0x8000_0000_0000_0000L);
-
-        // A bit in the middle of the mantissa is flipped; this difference is preserved when casting to float.
-        public static double PayloadFlipped { get; } =
-            BitConverter.Int64BitsToDouble(BitConverter.DoubleToInt64Bits(double.NaN) ^ 0x1_0000_0000L);
-    }
-}
diff --git a/libs/protobuf/csharp/src/Google.Protobuf.Test/TestCornerCases.cs b/libs/protobuf/csharp/src/Google.Protobuf.Test/TestCornerCases.cs
deleted file mode 100644
index 859b49c..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf.Test/TestCornerCases.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-    
-using UnitTest.Issues.TestProtos;
-using NUnit.Framework;
-
-namespace Google.Protobuf
-{
-    public class TestCornerCases
-    {
-        [Test]
-        public void TestRoundTripNegativeEnums()
-        {
-            NegativeEnumMessage msg = new NegativeEnumMessage
-            {
-                Value = NegativeEnum.MinusOne,
-                Values = { NegativeEnum.Zero, NegativeEnum.MinusOne, NegativeEnum.FiveBelow },
-                PackedValues = { NegativeEnum.Zero, NegativeEnum.MinusOne, NegativeEnum.FiveBelow }
-            };
-
-            Assert.AreEqual(58, msg.CalculateSize());
-
-            byte[] bytes = new byte[58];
-            CodedOutputStream output = new CodedOutputStream(bytes);
-
-            msg.WriteTo(output);
-            Assert.AreEqual(0, output.SpaceLeft);
-
-            NegativeEnumMessage copy = NegativeEnumMessage.Parser.ParseFrom(bytes);
-            Assert.AreEqual(msg, copy);
-        }
-    }
-}
diff --git a/libs/protobuf/csharp/src/Google.Protobuf.Test/UnknownFieldSetTest.cs b/libs/protobuf/csharp/src/Google.Protobuf.Test/UnknownFieldSetTest.cs
deleted file mode 100644
index f3e5af2..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf.Test/UnknownFieldSetTest.cs
+++ /dev/null
@@ -1,229 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-using System.IO;
-using Google.Protobuf.TestProtos;
-using Proto2 = Google.Protobuf.TestProtos.Proto2;
-using NUnit.Framework;
-
-namespace Google.Protobuf
-{
-    public class UnknownFieldSetTest
-    {
-        public class Data
-        {
-            public static System.Collections.IEnumerable Messages
-            {
-                get
-                {
-                    yield return SampleMessages.CreateFullTestAllTypesProto2();
-                    yield return SampleMessages.CreateFullTestAllTypes();
-                }
-            }
-        }
-
-        [Test]
-        public void EmptyUnknownFieldSet()
-        {
-            UnknownFieldSet unknownFields = new UnknownFieldSet();
-            Assert.AreEqual(0, unknownFields.CalculateSize());
-        }
-
-        [Test]
-        public void MergeUnknownFieldSet()
-        {
-            UnknownFieldSet unknownFields = new UnknownFieldSet();
-            UnknownField field = new UnknownField();
-            field.AddFixed32(123);
-            unknownFields.AddOrReplaceField(1, field);
-            UnknownFieldSet otherUnknownFields = new UnknownFieldSet();
-            Assert.IsFalse(otherUnknownFields.HasField(1));
-            UnknownFieldSet.MergeFrom(otherUnknownFields, unknownFields);
-            Assert.IsTrue(otherUnknownFields.HasField(1));
-        }
-
-        [Test]
-        [TestCaseSource(typeof(Data), "Messages")]
-        public void TestMergeCodedInput(IMessage message)
-        {
-            var emptyMessage = new TestEmptyMessage();
-            emptyMessage.MergeFrom(message.ToByteArray());
-            Assert.AreEqual(message.CalculateSize(), emptyMessage.CalculateSize());
-            Assert.AreEqual(message.ToByteArray(), emptyMessage.ToByteArray());
-
-            var newMessage = message.Descriptor.Parser.ParseFrom(emptyMessage.ToByteArray());
-            Assert.AreEqual(message, newMessage);
-            Assert.AreEqual(message.CalculateSize(), newMessage.CalculateSize());
-        }
-
-        [Test]
-        [TestCaseSource(typeof(Data), "Messages")]
-        public void TestMergeMessage(IMessage message)
-        {
-            var emptyMessage = new TestEmptyMessage();
-            var otherEmptyMessage = new TestEmptyMessage();
-            emptyMessage.MergeFrom(message.ToByteArray());
-            otherEmptyMessage.MergeFrom(emptyMessage);
-
-            Assert.AreEqual(message.CalculateSize(), otherEmptyMessage.CalculateSize());
-            Assert.AreEqual(message.ToByteArray(), otherEmptyMessage.ToByteArray());
-        }
-
-        [Test]
-        [TestCaseSource(typeof(Data), "Messages")]
-        public void TestEquals(IMessage message)
-        {
-            var emptyMessage = new TestEmptyMessage();
-            var otherEmptyMessage = new TestEmptyMessage();
-            Assert.AreEqual(emptyMessage, otherEmptyMessage);
-            emptyMessage.MergeFrom(message.ToByteArray());
-            Assert.AreNotEqual(emptyMessage.CalculateSize(),
-                               otherEmptyMessage.CalculateSize());
-            Assert.AreNotEqual(emptyMessage, otherEmptyMessage);
-        }
-
-        [Test]
-        [TestCaseSource(typeof(Data), "Messages")]
-        public void TestHashCode(IMessage message)
-        {
-            var emptyMessage = new TestEmptyMessage();
-            int hashCode = emptyMessage.GetHashCode();
-            emptyMessage.MergeFrom(message.ToByteArray());
-            Assert.AreNotEqual(hashCode, emptyMessage.GetHashCode());
-        }
-
-        [Test]
-        [TestCaseSource(typeof(Data), "Messages")]
-        public void TestClone(IMessage message)
-        {
-            var emptyMessage = new TestEmptyMessage();
-            var otherEmptyMessage = new TestEmptyMessage();
-            otherEmptyMessage = emptyMessage.Clone();
-            Assert.AreEqual(emptyMessage.CalculateSize(), otherEmptyMessage.CalculateSize());
-            Assert.AreEqual(emptyMessage.ToByteArray(), otherEmptyMessage.ToByteArray());
-
-            emptyMessage.MergeFrom(message.ToByteArray());
-            otherEmptyMessage = emptyMessage.Clone();
-            Assert.AreEqual(message.CalculateSize(), otherEmptyMessage.CalculateSize());
-            Assert.AreEqual(message.ToByteArray(), otherEmptyMessage.ToByteArray());
-        }
-
-        [Test]
-        public void TestClone_LengthDelimited()
-        {
-            var unknownVarintField = new UnknownField();
-            unknownVarintField.AddVarint(99);
-
-            var unknownLengthDelimitedField1 = new UnknownField();
-            unknownLengthDelimitedField1.AddLengthDelimited(ByteString.CopyFromUtf8("some data"));
-
-            var unknownLengthDelimitedField2 = new UnknownField();
-            unknownLengthDelimitedField2.AddLengthDelimited(ByteString.CopyFromUtf8("some more data"));
-
-            var destUnknownFieldSet = new UnknownFieldSet();
-            destUnknownFieldSet.AddOrReplaceField(997, unknownVarintField);
-            destUnknownFieldSet.AddOrReplaceField(999, unknownLengthDelimitedField1);
-            destUnknownFieldSet.AddOrReplaceField(999, unknownLengthDelimitedField2);
-
-            var clone = UnknownFieldSet.Clone(destUnknownFieldSet);
-
-            Assert.IsTrue(clone.HasField(997));
-            Assert.IsTrue(clone.HasField(999));
-        }
-
-        [Test]
-        [TestCaseSource(typeof(Data), "Messages")]
-        public void TestDiscardUnknownFields(IMessage message)
-        {
-            var goldenEmptyMessage = new TestEmptyMessage();
-            byte[] data = message.ToByteArray();
-            int fullSize = message.CalculateSize();
-
-            Action<IMessage> assertEmpty = msg =>
-            {
-                Assert.AreEqual(0, msg.CalculateSize());
-                Assert.AreEqual(goldenEmptyMessage, msg);
-            };
-
-            Action<IMessage> assertFull = msg => Assert.AreEqual(fullSize, msg.CalculateSize());
-
-            // Test the behavior of the parsers with and without discarding, both generic and non-generic.
-            MessageParser<TestEmptyMessage> retainingParser1 = TestEmptyMessage.Parser;
-            MessageParser retainingParser2 = retainingParser1;
-            MessageParser<TestEmptyMessage> discardingParser1 = retainingParser1.WithDiscardUnknownFields(true);
-            MessageParser discardingParser2 = retainingParser2.WithDiscardUnknownFields(true);
-
-            // Test parse from byte[]
-            MessageParsingHelpers.AssertReadingMessage(retainingParser1, data, m => assertFull(m));
-            MessageParsingHelpers.AssertReadingMessage(retainingParser2, data, m => assertFull(m));
-            MessageParsingHelpers.AssertReadingMessage(discardingParser1, data, m => assertEmpty(m));
-            MessageParsingHelpers.AssertReadingMessage(discardingParser2, data, m => assertEmpty(m));
-
-            // Test parse from byte[] with offset
-            assertFull(retainingParser1.ParseFrom(data, 0, data.Length));
-            assertFull(retainingParser2.ParseFrom(data, 0, data.Length));
-            assertEmpty(discardingParser1.ParseFrom(data, 0, data.Length));
-            assertEmpty(discardingParser2.ParseFrom(data, 0, data.Length));
-
-            // Test parse from CodedInputStream
-            assertFull(retainingParser1.ParseFrom(new CodedInputStream(data)));
-            assertFull(retainingParser2.ParseFrom(new CodedInputStream(data)));
-            assertEmpty(discardingParser1.ParseFrom(new CodedInputStream(data)));
-            assertEmpty(discardingParser2.ParseFrom(new CodedInputStream(data)));
-
-            // Test parse from Stream
-            assertFull(retainingParser1.ParseFrom(new MemoryStream(data)));
-            assertFull(retainingParser2.ParseFrom(new MemoryStream(data)));
-            assertEmpty(discardingParser1.ParseFrom(new MemoryStream(data)));
-            assertEmpty(discardingParser2.ParseFrom(new MemoryStream(data)));
-        }
-
-        [Test]
-        public void TestReadInvalidWireTypeThrowsInvalidProtocolBufferException()
-        {
-            MemoryStream ms = new MemoryStream();
-            CodedOutputStream output = new CodedOutputStream(ms);
-
-            uint tag = WireFormat.MakeTag(1, (WireFormat.WireType)6);
-            output.WriteRawVarint32(tag);
-            output.WriteLength(-1);
-            output.Flush();
-            ms.Position = 0;
-
-            CodedInputStream input = new CodedInputStream(ms);
-            Assert.AreEqual(tag, input.ReadTag());
-
-            Assert.Throws<InvalidProtocolBufferException>(() => UnknownFieldSet.MergeFieldFrom(null, input));
-        }
-    }
-}
diff --git a/libs/protobuf/csharp/src/Google.Protobuf.Test/WellKnownTypes/AnyTest.cs b/libs/protobuf/csharp/src/Google.Protobuf.Test/WellKnownTypes/AnyTest.cs
deleted file mode 100644
index c05cb08..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf.Test/WellKnownTypes/AnyTest.cs
+++ /dev/null
@@ -1,157 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using Google.Protobuf.TestProtos;
-using NUnit.Framework;
-
-namespace Google.Protobuf.WellKnownTypes
-{
-    public class AnyTest
-    {
-        [Test]
-        public void Pack()
-        {
-            var message = SampleMessages.CreateFullTestAllTypes();
-            var any = Any.Pack(message);
-            Assert.AreEqual("type.googleapis.com/protobuf_unittest3.TestAllTypes", any.TypeUrl);
-            Assert.AreEqual(message.CalculateSize(), any.Value.Length);
-        }
-
-        [Test]
-        public void Pack_WithCustomPrefix()
-        {
-            var message = SampleMessages.CreateFullTestAllTypes();
-            var any = Any.Pack(message, "foo.bar/baz");
-            Assert.AreEqual("foo.bar/baz/protobuf_unittest3.TestAllTypes", any.TypeUrl);
-            Assert.AreEqual(message.CalculateSize(), any.Value.Length);
-        }
-
-        [Test]
-        public void Pack_WithCustomPrefixTrailingSlash()
-        {
-            var message = SampleMessages.CreateFullTestAllTypes();
-            var any = Any.Pack(message, "foo.bar/baz/");
-            Assert.AreEqual("foo.bar/baz/protobuf_unittest3.TestAllTypes", any.TypeUrl);
-            Assert.AreEqual(message.CalculateSize(), any.Value.Length);
-        }
-
-        [Test]
-        public void Unpack_WrongType()
-        {
-            var message = SampleMessages.CreateFullTestAllTypes();
-            var any = Any.Pack(message);
-            Assert.Throws<InvalidProtocolBufferException>(() => any.Unpack<TestOneof>());
-        }
-
-        [Test]
-        public void Unpack_Success()
-        {
-            var message = SampleMessages.CreateFullTestAllTypes();
-            var any = Any.Pack(message);
-            var unpacked = any.Unpack<TestAllTypes>();
-            Assert.AreEqual(message, unpacked);
-        }
-
-        [Test]
-        public void Unpack_CustomPrefix_Success()
-        {
-            var message = SampleMessages.CreateFullTestAllTypes();
-            var any = Any.Pack(message, "foo.bar/baz");
-            var unpacked = any.Unpack<TestAllTypes>();
-            Assert.AreEqual(message, unpacked);
-        }
-
-        [Test]
-        public void TryUnpack_WrongType()
-        {
-            var message = SampleMessages.CreateFullTestAllTypes();
-            var any = Any.Pack(message);
-            Assert.False(any.TryUnpack(out TestOneof unpacked));
-            Assert.Null(unpacked);
-        }
-
-        [Test]
-        public void TryUnpack_RightType()
-        {
-            var message = SampleMessages.CreateFullTestAllTypes();
-            var any = Any.Pack(message);
-            Assert.IsTrue(any.TryUnpack(out TestAllTypes unpacked));
-            Assert.AreEqual(message, unpacked);
-        }
-
-        [Test]
-        public void ToString_WithValues()
-        {
-            var message = SampleMessages.CreateFullTestAllTypes();
-            var any = Any.Pack(message);
-            var text = any.ToString();
-            Assert.That(text, Does.Contain("\"@value\": \"" + message.ToByteString().ToBase64() + "\""));
-        }
-
-        [Test]
-        [TestCase("proto://foo.bar", "foo.bar")]
-        [TestCase("/foo/bar/baz", "baz")]
-        [TestCase("foobar", "")]
-        public void GetTypeName(string typeUrl, string expectedTypeName)
-        {
-            var any = new Any { TypeUrl = typeUrl };
-            Assert.AreEqual(expectedTypeName, Any.GetTypeName(typeUrl));
-        }
-
-        [Test]
-        public void ToString_Empty()
-        {
-            var any = new Any();
-            Assert.AreEqual("{ \"@type\": \"\", \"@value\": \"\" }", any.ToString());
-        }
-
-        [Test]
-        public void ToString_MessageContainingAny()
-        {
-            var message = new TestWellKnownTypes { AnyField = new Any() };
-            Assert.AreEqual("{ \"anyField\": { \"@type\": \"\", \"@value\": \"\" } }", message.ToString());
-        }
-
-        [Test]
-        public void IsWrongType()
-        {
-            var any = Any.Pack(SampleMessages.CreateFullTestAllTypes());
-            Assert.False(any.Is(TestOneof.Descriptor));
-        }
-
-        public void IsRightType()
-        {
-            var any = Any.Pack(SampleMessages.CreateFullTestAllTypes());
-            Assert.True(any.Is(TestAllTypes.Descriptor));
-        }
-    }
-}
diff --git a/libs/protobuf/csharp/src/Google.Protobuf.Test/WellKnownTypes/DurationTest.cs b/libs/protobuf/csharp/src/Google.Protobuf.Test/WellKnownTypes/DurationTest.cs
deleted file mode 100644
index 141faf8..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf.Test/WellKnownTypes/DurationTest.cs
+++ /dev/null
@@ -1,132 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using NUnit.Framework;
-using System;
-
-namespace Google.Protobuf.WellKnownTypes
-{
-    public class DurationTest
-    {
-        [Test]
-        public void ToTimeSpan()
-        {
-            Assert.AreEqual(TimeSpan.FromSeconds(1), new Duration { Seconds = 1 }.ToTimeSpan());
-            Assert.AreEqual(TimeSpan.FromSeconds(-1), new Duration { Seconds = -1 }.ToTimeSpan());
-            Assert.AreEqual(TimeSpan.FromMilliseconds(1), new Duration { Nanos = 1000000 }.ToTimeSpan());
-            Assert.AreEqual(TimeSpan.FromMilliseconds(-1), new Duration { Nanos = -1000000 }.ToTimeSpan());
-            Assert.AreEqual(TimeSpan.FromTicks(1), new Duration { Nanos = 100 }.ToTimeSpan());
-            Assert.AreEqual(TimeSpan.FromTicks(-1), new Duration { Nanos = -100 }.ToTimeSpan());
-
-            // Rounding is towards 0
-            Assert.AreEqual(TimeSpan.FromTicks(2), new Duration { Nanos = 250 }.ToTimeSpan());
-            Assert.AreEqual(TimeSpan.FromTicks(-2), new Duration { Nanos = -250 }.ToTimeSpan());
-        }
-
-        [Test]
-        public void Addition()
-        {
-            Assert.AreEqual(new Duration { Seconds = 2, Nanos = 100000000 },
-                new Duration { Seconds = 1, Nanos = 600000000 } + new Duration { Nanos = 500000000 });
-            Assert.AreEqual(new Duration { Seconds = -2, Nanos = -100000000 },
-                new Duration { Seconds = -1, Nanos = -600000000 } + new Duration { Nanos = -500000000 });
-            Assert.AreEqual(new Duration { Seconds = 1, Nanos = 100000000 },
-                new Duration { Seconds = 1, Nanos = 600000000 } + new Duration { Nanos = -500000000 });
-
-            // Non-normalized durations, or non-normalized intermediate results
-            Assert.AreEqual(new Duration { Seconds = 1 },
-                new Duration { Seconds = 1, Nanos = -500000000 } + new Duration { Nanos = 500000000 });
-
-            Assert.AreEqual(new Duration { Nanos = -900000000 },
-                new Duration { Seconds = -1, Nanos = -100000000 } + new Duration { Nanos = 200000000 });
-            Assert.AreEqual(new Duration { Nanos = 900000000 },
-                new Duration { Seconds = 1, Nanos = 100000000 } + new Duration { Nanos = -200000000 });
-        }
-
-        [Test]
-        public void Subtraction()
-        {
-            Assert.AreEqual(new Duration { Seconds = 1, Nanos = 100000000 },
-                new Duration { Seconds = 1, Nanos = 600000000 } - new Duration { Nanos = 500000000 });
-            Assert.AreEqual(new Duration { Seconds = -1, Nanos = -100000000 },
-                new Duration { Seconds = -1, Nanos = -600000000 } - new Duration { Nanos = -500000000 });
-            Assert.AreEqual(new Duration { Seconds = 2, Nanos = 100000000 },
-                new Duration { Seconds = 1, Nanos = 600000000 } - new Duration { Nanos = -500000000 });
-
-            // Non-normalized durations
-            Assert.AreEqual(new Duration(),
-                new Duration { Seconds = 1, Nanos = -500000000 } - new Duration { Nanos = 500000000 });
-            Assert.AreEqual(new Duration { Seconds = 1 },
-                new Duration { Nanos = 2000000000 } - new Duration { Nanos = 1000000000 });
-        }
-
-        [Test]
-        public void FromTimeSpan()
-        {
-            Assert.AreEqual(new Duration { Seconds = 1 }, Duration.FromTimeSpan(TimeSpan.FromSeconds(1)));
-            Assert.AreEqual(new Duration { Nanos = Duration.NanosecondsPerTick }, Duration.FromTimeSpan(TimeSpan.FromTicks(1)));
-        }
-
-        [Test]
-        [TestCase(0, Duration.MaxNanoseconds + 1)]
-        [TestCase(0, Duration.MinNanoseconds - 1)]
-        [TestCase(Duration.MinSeconds - 1, 0)]
-        [TestCase(Duration.MaxSeconds + 1, 0)]
-        [TestCase(1, -1)]
-        [TestCase(-1, 1)]
-        public void ToTimeSpan_Invalid(long seconds, int nanoseconds)
-        {
-            var duration = new Duration { Seconds = seconds, Nanos = nanoseconds };
-            Assert.Throws<InvalidOperationException>(() => duration.ToTimeSpan());
-        }
-
-        [Test]
-        [TestCase(0, Duration.MaxNanoseconds)]
-        [TestCase(0, Duration.MinNanoseconds)]
-        [TestCase(Duration.MinSeconds, Duration.MinNanoseconds)]
-        [TestCase(Duration.MaxSeconds, Duration.MaxNanoseconds)]
-        public void ToTimeSpan_Valid(long seconds, int nanoseconds)
-        {
-            // Only testing that these values don't throw, unlike their similar tests in ToTimeSpan_Invalid
-            var duration = new Duration { Seconds = seconds, Nanos = nanoseconds };
-            duration.ToTimeSpan();
-        }
-
-        [Test]
-        public void ToString_NonNormalized()
-        {
-            // Just a single example should be sufficient...
-            var duration = new Duration { Seconds = 1, Nanos = -1 };
-            Assert.AreEqual("{ \"@warning\": \"Invalid Duration\", \"seconds\": \"1\", \"nanos\": -1 }", duration.ToString());
-        }
-    }
-}
diff --git a/libs/protobuf/csharp/src/Google.Protobuf.Test/WellKnownTypes/FieldMaskTest.cs b/libs/protobuf/csharp/src/Google.Protobuf.Test/WellKnownTypes/FieldMaskTest.cs
deleted file mode 100644
index 5dc5035..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf.Test/WellKnownTypes/FieldMaskTest.cs
+++ /dev/null
@@ -1,245 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2016 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-using Google.Protobuf.TestProtos;
-using NUnit.Framework;
-
-namespace Google.Protobuf.WellKnownTypes
-{
-    public class FieldMaskTest
-    {
-        [Test]
-        [TestCase("foo__bar")]
-        [TestCase("foo_3_ar")]
-        [TestCase("fooBar")]
-        public void ToString_Invalid(string input)
-        {
-            var mask = new FieldMask { Paths = { input } };
-            var text = mask.ToString();
-            // More specific test below
-            Assert.That(text, Does.Contain("@warning"));
-            Assert.That(text, Does.Contain(input));
-        }
-
-        [Test]
-        public void ToString_Invalid_Precise()
-        {
-            var mask = new FieldMask { Paths = { "x", "foo__bar", @"x\y" } };
-            Assert.AreEqual(
-                "{ \"@warning\": \"Invalid FieldMask\", \"paths\": [ \"x\", \"foo__bar\", \"x\\\\y\" ] }",
-                mask.ToString());
-        }
-
-        [Test]
-        public void IsValid()
-        {
-            Assert.IsTrue(FieldMask.IsValid<NestedTestAllTypes>("payload"));
-            Assert.IsFalse(FieldMask.IsValid<NestedTestAllTypes>("nonexist"));
-            Assert.IsTrue(FieldMask.IsValid<NestedTestAllTypes>("payload.single_int32"));
-            Assert.IsTrue(FieldMask.IsValid<NestedTestAllTypes>("payload.repeated_int32"));
-            Assert.IsTrue(FieldMask.IsValid<NestedTestAllTypes>("payload.single_nested_message"));
-            Assert.IsTrue(FieldMask.IsValid<NestedTestAllTypes>("payload.repeated_nested_message"));
-            Assert.IsFalse(FieldMask.IsValid<NestedTestAllTypes>("payload.nonexist"));
-
-            Assert.IsTrue(FieldMask.IsValid<NestedTestAllTypes>(FieldMask.FromString("payload")));
-            Assert.IsFalse(FieldMask.IsValid<NestedTestAllTypes>(FieldMask.FromString("nonexist")));
-            Assert.IsFalse(FieldMask.IsValid<NestedTestAllTypes>(FieldMask.FromString("payload,nonexist")));
-
-            Assert.IsTrue(FieldMask.IsValid(NestedTestAllTypes.Descriptor, "payload"));
-            Assert.IsFalse(FieldMask.IsValid(NestedTestAllTypes.Descriptor, "nonexist"));
-
-            Assert.IsTrue(FieldMask.IsValid(NestedTestAllTypes.Descriptor, FieldMask.FromString("payload")));
-            Assert.IsFalse(FieldMask.IsValid(NestedTestAllTypes.Descriptor, FieldMask.FromString("nonexist")));
-
-            Assert.IsTrue(FieldMask.IsValid<NestedTestAllTypes>("payload.single_nested_message.bb"));
-
-            // Repeated fields cannot have sub-paths.
-            Assert.IsFalse(FieldMask.IsValid<NestedTestAllTypes>("payload.repeated_nested_message.bb"));
-
-            // Non-message fields cannot have sub-paths.
-            Assert.IsFalse(FieldMask.IsValid<NestedTestAllTypes>("payload.single_int32.bb"));
-        }
-
-        [Test]
-        [TestCase(new string[] { }, "\"\"")]
-        [TestCase(new string[] { "foo" }, "\"foo\"")]
-        [TestCase(new string[] { "foo", "bar" }, "\"foo,bar\"")]
-        [TestCase(new string[] { "", "foo", "", "bar", "" }, "\",foo,,bar,\"")]
-        public void ToString(string[] input, string expectedOutput)
-        {
-            FieldMask mask = new FieldMask();
-            mask.Paths.AddRange(input);
-            Assert.AreEqual(expectedOutput, mask.ToString());
-        }
-
-        [Test]
-        [TestCase("", new string[] { })]
-        [TestCase("foo", new string[] { "foo" })]
-        [TestCase("foo,bar.baz", new string[] { "foo", "bar.baz" })]
-        [TestCase(",foo,,bar,", new string[] { "foo", "bar" })]
-        public void FromString(string input, string[] expectedOutput)
-        {
-            FieldMask mask = FieldMask.FromString(input);
-            Assert.AreEqual(expectedOutput.Length, mask.Paths.Count);
-            for (int i = 0; i < expectedOutput.Length; i++)
-            {
-                Assert.AreEqual(expectedOutput[i], mask.Paths[i]);
-            }
-        }
-
-        [Test]
-        public void FromString_Validated()
-        {
-            // Check whether the field paths are valid if a class parameter is provided.
-            Assert.DoesNotThrow(() => FieldMask.FromString<NestedTestAllTypes>(",payload"));
-            Assert.Throws<InvalidProtocolBufferException>(() => FieldMask.FromString<NestedTestAllTypes>("payload,nonexist"));
-        }
-
-        [Test]
-        [TestCase(new int[] { }, new string[] { })]
-        [TestCase(new int[] { TestAllTypes.SingleInt32FieldNumber }, new string[] { "single_int32" })]
-        [TestCase(new int[] { TestAllTypes.SingleInt32FieldNumber, TestAllTypes.SingleInt64FieldNumber }, new string[] { "single_int32", "single_int64" })]
-        public void FromFieldNumbers(int[] input, string[] expectedOutput)
-        {
-            FieldMask mask = FieldMask.FromFieldNumbers<TestAllTypes>(input);
-            Assert.AreEqual(expectedOutput.Length, mask.Paths.Count);
-            for (int i = 0; i < expectedOutput.Length; i++)
-            {
-                Assert.AreEqual(expectedOutput[i], mask.Paths[i]);
-            }
-        }
-
-        [Test]
-        public void FromFieldNumbers_Invalid()
-        {
-            Assert.Throws<ArgumentNullException>(() =>
-            {
-                int invalidFieldNumber = 1000;
-                FieldMask.FromFieldNumbers<TestAllTypes>(invalidFieldNumber);
-            });
-        }
-
-        [Test]
-        [TestCase(new string[] { }, "\"\"")]
-        [TestCase(new string[] { "foo" }, "\"foo\"")]
-        [TestCase(new string[] { "foo", "bar" }, "\"foo,bar\"")]
-        [TestCase(new string[] { "", "foo", "", "bar", "" }, "\",foo,bar\"")]
-        public void Normalize(string[] input, string expectedOutput)
-        {
-            FieldMask mask = new FieldMask();
-            mask.Paths.AddRange(input);
-            FieldMask result = mask.Normalize();
-            Assert.AreEqual(expectedOutput, result.ToString());
-        }
-
-        [Test]
-        public void Union()
-        {
-            // Only test a simple case here and expect
-            // {@link FieldMaskTreeTest#AddFieldPath} to cover all scenarios.
-            FieldMask mask1 = FieldMask.FromString("foo,bar.baz,bar.quz");
-            FieldMask mask2 = FieldMask.FromString("foo.bar,bar");
-            FieldMask result = mask1.Union(mask2);
-            Assert.AreEqual(2, result.Paths.Count);
-            Assert.Contains("bar", result.Paths);
-            Assert.Contains("foo", result.Paths);
-            Assert.That(result.Paths, Has.No.Member("bar.baz"));
-            Assert.That(result.Paths, Has.No.Member("bar.quz"));
-            Assert.That(result.Paths, Has.No.Member("foo.bar"));
-        }
-
-        [Test]
-        public void Union_UsingVarArgs()
-        {
-            FieldMask mask1 = FieldMask.FromString("foo");
-            FieldMask mask2 = FieldMask.FromString("foo.bar,bar.quz");
-            FieldMask mask3 = FieldMask.FromString("bar.quz");
-            FieldMask mask4 = FieldMask.FromString("bar");
-            FieldMask result = mask1.Union(mask2, mask3, mask4);
-            Assert.AreEqual(2, result.Paths.Count);
-            Assert.Contains("bar", result.Paths);
-            Assert.Contains("foo", result.Paths);
-            Assert.That(result.Paths, Has.No.Member("foo.bar"));
-            Assert.That(result.Paths, Has.No.Member("bar.quz"));
-        }
-
-        [Test]
-        public void Intersection()
-        {
-            // Only test a simple case here and expect
-            // {@link FieldMaskTreeTest#IntersectFieldPath} to cover all scenarios.
-            FieldMask mask1 = FieldMask.FromString("foo,bar.baz,bar.quz");
-            FieldMask mask2 = FieldMask.FromString("foo.bar,bar");
-            FieldMask result = mask1.Intersection(mask2);
-            Assert.AreEqual(3, result.Paths.Count);
-            Assert.Contains("foo.bar", result.Paths);
-            Assert.Contains("bar.baz", result.Paths);
-            Assert.Contains("bar.quz", result.Paths);
-            Assert.That(result.Paths, Has.No.Member("foo"));
-            Assert.That(result.Paths, Has.No.Member("bar"));
-        }
-
-        [Test]
-        public void Merge()
-        {
-            // Only test a simple case here and expect
-            // {@link FieldMaskTreeTest#Merge} to cover all scenarios.
-            FieldMask fieldMask = FieldMask.FromString("payload");
-            NestedTestAllTypes source = new NestedTestAllTypes
-            {
-                Payload = new TestAllTypes
-                {
-                    SingleInt32 = 1234,
-                    SingleFixed64 = 4321
-                }
-            };
-            NestedTestAllTypes destination = new NestedTestAllTypes();
-            fieldMask.Merge(source, destination);
-            Assert.AreEqual(1234, destination.Payload.SingleInt32);
-            Assert.AreEqual(4321, destination.Payload.SingleFixed64);
-
-            destination = new NestedTestAllTypes
-            {
-                Payload = new TestAllTypes
-                {
-                    SingleInt32 = 4321,
-                    SingleInt64 = 5678
-                }
-            };
-            fieldMask.Merge(source, destination);
-            Assert.AreEqual(1234, destination.Payload.SingleInt32);
-            Assert.AreEqual(5678, destination.Payload.SingleInt64);
-            Assert.AreEqual(4321, destination.Payload.SingleFixed64);
-        }
-    }
-}
diff --git a/libs/protobuf/csharp/src/Google.Protobuf.Test/WellKnownTypes/TimestampTest.cs b/libs/protobuf/csharp/src/Google.Protobuf.Test/WellKnownTypes/TimestampTest.cs
deleted file mode 100644
index ffc6041..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf.Test/WellKnownTypes/TimestampTest.cs
+++ /dev/null
@@ -1,216 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using NUnit.Framework;
-using System;
-
-namespace Google.Protobuf.WellKnownTypes
-{
-    public class TimestampTest
-    {
-        [Test]
-        public void FromAndToDateTime()
-        {
-            DateTime utcMin = DateTime.SpecifyKind(DateTime.MinValue, DateTimeKind.Utc);
-            DateTime utcMax = DateTime.SpecifyKind(DateTime.MaxValue, DateTimeKind.Utc);
-            AssertRoundtrip(new Timestamp { Seconds = -62135596800 }, utcMin);
-            AssertRoundtrip(new Timestamp { Seconds = 253402300799, Nanos = 999999900 }, utcMax);
-            AssertRoundtrip(new Timestamp(), new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc));
-            AssertRoundtrip(new Timestamp { Nanos = 1000000}, new DateTime(1970, 1, 1, 0, 0, 0, 1, DateTimeKind.Utc));
-            AssertRoundtrip(new Timestamp { Seconds = -1, Nanos = 999000000 }, new DateTime(1969, 12, 31, 23, 59, 59, 999, DateTimeKind.Utc));
-            AssertRoundtrip(new Timestamp { Seconds = 3600 }, new DateTime(1970, 1, 1, 1, 0, 0, DateTimeKind.Utc));
-            AssertRoundtrip(new Timestamp { Seconds = -3600 }, new DateTime(1969, 12, 31, 23, 0, 0, DateTimeKind.Utc));
-        }
-
-        [Test]
-        public void ToDateTimeTruncation()
-        {
-            var t1 = new Timestamp { Seconds = 1, Nanos = 1000000 + Duration.NanosecondsPerTick - 1 };
-            Assert.AreEqual(new DateTime(1970, 1, 1, 0, 0, 1, DateTimeKind.Utc).AddMilliseconds(1), t1.ToDateTime());
-
-            var t2 = new Timestamp { Seconds = -1, Nanos = 1000000 + Duration.NanosecondsPerTick - 1 };
-            Assert.AreEqual(new DateTime(1969, 12, 31, 23, 59, 59).AddMilliseconds(1), t2.ToDateTime());
-        }
-
-        [Test]
-        [TestCase(Timestamp.UnixSecondsAtBclMinValue - 1, Timestamp.MaxNanos)]
-        [TestCase(Timestamp.UnixSecondsAtBclMaxValue + 1, 0)]
-        [TestCase(0, -1)]
-        [TestCase(0, Timestamp.MaxNanos + 1)]
-        public void ToDateTime_OutOfRange(long seconds, int nanoseconds)
-        {
-            var value = new Timestamp { Seconds = seconds, Nanos = nanoseconds };
-            Assert.Throws<InvalidOperationException>(() => value.ToDateTime());
-        }
-
-        // 1ns larger or smaller than the above values
-        [Test]
-        [TestCase(Timestamp.UnixSecondsAtBclMinValue, 0)]
-        [TestCase(Timestamp.UnixSecondsAtBclMaxValue, Timestamp.MaxNanos)]
-        [TestCase(0, 0)]
-        [TestCase(0, Timestamp.MaxNanos)]
-        public void ToDateTime_ValidBoundaries(long seconds, int nanoseconds)
-        {
-            var value = new Timestamp { Seconds = seconds, Nanos = nanoseconds };
-            value.ToDateTime();
-        }
-
-        private static void AssertRoundtrip(Timestamp timestamp, DateTime dateTime)
-        {
-            Assert.AreEqual(timestamp, Timestamp.FromDateTime(dateTime));
-            Assert.AreEqual(dateTime, timestamp.ToDateTime());
-            Assert.AreEqual(DateTimeKind.Utc, timestamp.ToDateTime().Kind);
-        }
-
-        [Test]
-        public void Arithmetic()
-        {
-            Timestamp t1 = new Timestamp { Seconds = 10000, Nanos = 5000 };
-            Timestamp t2 = new Timestamp { Seconds = 8000, Nanos = 10000 };
-            Duration difference = new Duration { Seconds = 1999, Nanos = Duration.NanosecondsPerSecond - 5000 };
-            Assert.AreEqual(difference, t1 - t2);
-            Assert.AreEqual(-difference, t2 - t1);
-
-            Assert.AreEqual(t1, t2 + difference);
-            Assert.AreEqual(t2, t1 - difference);
-        }
-
-        [Test]
-        public void ToString_NonNormalized()
-        {
-            // Just a single example should be sufficient...
-            var duration = new Timestamp { Seconds = 1, Nanos = -1 };
-            Assert.AreEqual("{ \"@warning\": \"Invalid Timestamp\", \"seconds\": \"1\", \"nanos\": -1 }", duration.ToString());
-        }
-
-        [Test]
-        public void Comparability()
-        {
-            Timestamp
-                a = null,
-                b = new Timestamp { Seconds = 1, Nanos = 1 },
-                c = new Timestamp { Seconds = 1, Nanos = 10 },
-                d = new Timestamp { Seconds = 10, Nanos = 1 },
-                e = new Timestamp { Seconds = 10, Nanos = 10 };
-
-            Assert.IsTrue(b.CompareTo(a) > 0); // null is always first (according to default behavior of Array.Sort)
-            Assert.IsTrue(b.CompareTo(b) == 0);
-            Assert.IsTrue(b.CompareTo(b.Clone()) == 0);
-            Assert.IsTrue(b.CompareTo(c) < 0);
-            Assert.IsTrue(b.CompareTo(d) < 0);
-            Assert.IsTrue(b.CompareTo(e) < 0);
-
-            Assert.IsTrue(c.CompareTo(a) > 0);
-            Assert.IsTrue(c.CompareTo(b) > 0);
-            Assert.IsTrue(c.CompareTo(c) == 0);
-            Assert.IsTrue(c.CompareTo(c.Clone()) == 0);
-            Assert.IsTrue(c.CompareTo(d) < 0);
-            Assert.IsTrue(c.CompareTo(e) < 0);
-
-            Assert.IsTrue(d.CompareTo(a) > 0);
-            Assert.IsTrue(d.CompareTo(b) > 0);
-            Assert.IsTrue(d.CompareTo(c) > 0);
-            Assert.IsTrue(d.CompareTo(d) == 0);
-            Assert.IsTrue(d.CompareTo(d.Clone()) == 0);
-            Assert.IsTrue(d.CompareTo(e) < 0);
-
-            Assert.IsTrue(e.CompareTo(a) > 0);
-            Assert.IsTrue(e.CompareTo(b) > 0);
-            Assert.IsTrue(e.CompareTo(c) > 0);
-            Assert.IsTrue(e.CompareTo(d) > 0);
-            Assert.IsTrue(e.CompareTo(e) == 0);
-            Assert.IsTrue(e.CompareTo(e.Clone()) == 0);
-        }
-
-
-        [Test]
-        public void ComparabilityOperators()
-        {
-            Timestamp
-                a = null,
-                b = new Timestamp { Seconds = 1, Nanos = 1 },
-                c = new Timestamp { Seconds = 1, Nanos = 10 },
-                d = new Timestamp { Seconds = 10, Nanos = 1 },
-                e = new Timestamp { Seconds = 10, Nanos = 10 };
-
-#pragma warning disable CS1718 // Comparison made to same variable
-            Assert.IsTrue(b > a);
-            Assert.IsTrue(b == b);
-            Assert.IsTrue(b == b.Clone());
-            Assert.IsTrue(b < c);
-            Assert.IsTrue(b < d);
-            Assert.IsTrue(b < e);
-
-            Assert.IsTrue(c > a);
-            Assert.IsTrue(c > b);
-            Assert.IsTrue(c == c);
-            Assert.IsTrue(c == c.Clone());
-            Assert.IsTrue(c < d);
-            Assert.IsTrue(c < e);
-
-            Assert.IsTrue(d > a);
-            Assert.IsTrue(d > b);
-            Assert.IsTrue(d > c);
-            Assert.IsTrue(d == d);
-            Assert.IsTrue(d == d.Clone());
-            Assert.IsTrue(d < e);
-
-            Assert.IsTrue(e > a);
-            Assert.IsTrue(e > b);
-            Assert.IsTrue(e > c);
-            Assert.IsTrue(e > d);
-            Assert.IsTrue(e == e);
-            Assert.IsTrue(e == e.Clone());
-
-            Assert.IsTrue(b >= a);
-            Assert.IsTrue(b <= c);
-            Assert.IsTrue(b <= d);
-            Assert.IsTrue(b <= e);
-
-            Assert.IsTrue(c >= a);
-            Assert.IsTrue(c >= b);
-            Assert.IsTrue(c <= d);
-            Assert.IsTrue(c <= e);
-
-            Assert.IsTrue(d >= a);
-            Assert.IsTrue(d >= b);
-            Assert.IsTrue(d >= c);
-            Assert.IsTrue(d <= e);
-
-            Assert.IsTrue(e >= a);
-            Assert.IsTrue(e >= b);
-            Assert.IsTrue(e >= c);
-            Assert.IsTrue(e >= d);
-#pragma warning restore CS1718 // Comparison made to same variable
-        }
-    }
-}
diff --git a/libs/protobuf/csharp/src/Google.Protobuf.Test/WellKnownTypes/WrappersTest.cs b/libs/protobuf/csharp/src/Google.Protobuf.Test/WellKnownTypes/WrappersTest.cs
deleted file mode 100644
index 5b0e5e8..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf.Test/WellKnownTypes/WrappersTest.cs
+++ /dev/null
@@ -1,546 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-using Google.Protobuf.TestProtos;
-using NUnit.Framework;
-using System.Collections;
-using System.IO;
-
-namespace Google.Protobuf.WellKnownTypes
-{
-    public class WrappersTest
-    {
-        [Test]
-        public void NullIsDefault()
-        {
-            var message = new TestWellKnownTypes();
-            Assert.IsNull(message.StringField);
-            Assert.IsNull(message.BytesField);
-            Assert.IsNull(message.BoolField);
-            Assert.IsNull(message.FloatField);
-            Assert.IsNull(message.DoubleField);
-            Assert.IsNull(message.Int32Field);
-            Assert.IsNull(message.Int64Field);
-            Assert.IsNull(message.Uint32Field);
-            Assert.IsNull(message.Uint64Field);
-        }
-
-        [Test]
-        public void NonDefaultSingleValues()
-        {
-            var message = new TestWellKnownTypes
-            {
-                StringField = "x",
-                BytesField = ByteString.CopyFrom(1, 2, 3),
-                BoolField = true,
-                FloatField = 12.5f,
-                DoubleField = 12.25d,
-                Int32Field = 1,
-                Int64Field = 2,
-                Uint32Field = 3,
-                Uint64Field = 4
-            };
-
-            MessageParsingHelpers.AssertWritingMessage(message);
-
-            MessageParsingHelpers.AssertRoundtrip(TestWellKnownTypes.Parser, message, parsed =>
-            {
-                Assert.AreEqual("x", parsed.StringField);
-                Assert.AreEqual(ByteString.CopyFrom(1, 2, 3), parsed.BytesField);
-                Assert.AreEqual(true, parsed.BoolField);
-                Assert.AreEqual(12.5f, parsed.FloatField);
-                Assert.AreEqual(12.25d, parsed.DoubleField);
-                Assert.AreEqual(1, parsed.Int32Field);
-                Assert.AreEqual(2L, parsed.Int64Field);
-                Assert.AreEqual(3U, parsed.Uint32Field);
-                Assert.AreEqual(4UL, parsed.Uint64Field);
-            });
-        }
-
-        [Test]
-        public void NegativeSingleValues()
-        {
-            var message = new TestWellKnownTypes
-            {
-                FloatField = -12.5f,
-                DoubleField = -12.25d,
-                Int32Field = -1,
-                Int64Field = -2
-            };
-
-            MessageParsingHelpers.AssertWritingMessage(message);
-
-            MessageParsingHelpers.AssertRoundtrip(TestWellKnownTypes.Parser, message, parsed =>
-            {
-                Assert.AreEqual(-12.5f, parsed.FloatField);
-                Assert.AreEqual(-12.25d, parsed.DoubleField);
-                Assert.AreEqual(-1, parsed.Int32Field);
-                Assert.AreEqual(-2L, parsed.Int64Field);
-            });
-        }
-
-        [Test]
-        public void NonNullDefaultIsPreservedThroughSerialization()
-        {
-            var message = new TestWellKnownTypes
-            {
-                StringField = "",
-                BytesField = ByteString.Empty,
-                BoolField = false,
-                FloatField = 0f,
-                DoubleField = 0d,
-                Int32Field = 0,
-                Int64Field = 0,
-                Uint32Field = 0,
-                Uint64Field = 0
-            };
-
-            MessageParsingHelpers.AssertWritingMessage(message);
-
-            MessageParsingHelpers.AssertRoundtrip(TestWellKnownTypes.Parser, message, parsed =>
-            {
-                Assert.AreEqual("", parsed.StringField);
-                Assert.AreEqual(ByteString.Empty, parsed.BytesField);
-                Assert.AreEqual(false, parsed.BoolField);
-                Assert.AreEqual(0f, parsed.FloatField);
-                Assert.AreEqual(0d, parsed.DoubleField);
-                Assert.AreEqual(0, parsed.Int32Field);
-                Assert.AreEqual(0L, parsed.Int64Field);
-                Assert.AreEqual(0U, parsed.Uint32Field);
-                Assert.AreEqual(0UL, parsed.Uint64Field);
-            });
-        }
-
-        [Test]
-        public void RepeatedWrappersProhibitNullItems()
-        {
-            var message = new RepeatedWellKnownTypes();
-            Assert.Throws<ArgumentNullException>(() => message.BoolField.Add((bool?) null));
-            Assert.Throws<ArgumentNullException>(() => message.Int32Field.Add((int?) null));
-            Assert.Throws<ArgumentNullException>(() => message.StringField.Add((string) null));
-            Assert.Throws<ArgumentNullException>(() => message.BytesField.Add((ByteString) null));
-        }
-
-        [Test]
-        public void RepeatedWrappersSerializeDeserialize()
-        {
-            var message = new RepeatedWellKnownTypes
-            {
-                BoolField = { true, false },
-                BytesField = { ByteString.CopyFrom(1, 2, 3), ByteString.CopyFrom(4, 5, 6), ByteString.Empty },
-                DoubleField = { 12.5, -1.5, 0d },
-                FloatField = { 123.25f, -20f, 0f },
-                Int32Field = { int.MaxValue, int.MinValue, 0 },
-                Int64Field = { long.MaxValue, long.MinValue, 0L },
-                StringField = { "First", "Second", "" },
-                Uint32Field = { uint.MaxValue, uint.MinValue, 0U },
-                Uint64Field = { ulong.MaxValue, ulong.MinValue, 0UL },
-            };
-
-            // Just to test a single value for sanity...
-            Assert.AreEqual("Second", message.StringField[1]);
-
-            MessageParsingHelpers.AssertWritingMessage(message);
-
-            MessageParsingHelpers.AssertRoundtrip(RepeatedWellKnownTypes.Parser, message);
-        }
-
-        [Test]
-        public void RepeatedWrappersBinaryFormat()
-        {
-            // At one point we accidentally used a packed format for repeated wrappers, which is wrong (and weird).
-            // This test is just to prove that we use the right format.
-
-            var rawOutput = new MemoryStream();
-            var output = new CodedOutputStream(rawOutput);
-            // Write a value of 5
-            output.WriteTag(RepeatedWellKnownTypes.Int32FieldFieldNumber, WireFormat.WireType.LengthDelimited);
-            output.WriteLength(2);
-            output.WriteTag(WrappersReflection.WrapperValueFieldNumber, WireFormat.WireType.Varint);
-            output.WriteInt32(5);
-            // Write a value of 0 (empty message)
-            output.WriteTag(RepeatedWellKnownTypes.Int32FieldFieldNumber, WireFormat.WireType.LengthDelimited);
-            output.WriteLength(0);
-            output.Flush();
-            var expectedBytes = rawOutput.ToArray();
-
-            var message = new RepeatedWellKnownTypes { Int32Field = { 5, 0 } };
-            var actualBytes = message.ToByteArray();
-            Assert.AreEqual(expectedBytes, actualBytes);
-
-            MessageParsingHelpers.AssertWritingMessage(message);
-        }
-
-        [Test]
-        public void MapWrappersSerializeDeserialize()
-        {
-            // Note: no null values here, as they are prohibited in map fields
-            // (despite being representable).
-            var message = new MapWellKnownTypes
-            {
-                BoolField = { { 10, false }, { 20, true } },
-                BytesField = {
-                    { -1, ByteString.CopyFrom(1, 2, 3) },
-                    { 10, ByteString.CopyFrom(4, 5, 6) },
-                    { 1000, ByteString.Empty },
-                },
-                DoubleField = { { 1, 12.5 }, { 10, -1.5 }, { 20, 0d } },
-                FloatField = { { 2, 123.25f }, { 3, -20f }, { 4, 0f } },
-                Int32Field = { { 5, int.MaxValue }, { 6, int.MinValue }, { 7, 0 } },
-                Int64Field = { { 8, long.MaxValue }, { 9, long.MinValue }, { 10, 0L } },
-                StringField = { { 11, "First" }, { 12, "Second" }, { 13, "" } },
-                Uint32Field = { { 15, uint.MaxValue }, { 16, uint.MinValue }, { 17, 0U } },
-                Uint64Field = { { 18, ulong.MaxValue }, { 19, ulong.MinValue }, { 20, 0UL } },
-            };
-
-            // Just to test a single value for sanity...
-            Assert.AreEqual("Second", message.StringField[12]);
-
-            MessageParsingHelpers.AssertWritingMessage(message);
-
-            MessageParsingHelpers.AssertRoundtrip(MapWellKnownTypes.Parser, message);
-        }
-
-        [Test]
-        public void Reflection_SingleValues()
-        {
-            var message = new TestWellKnownTypes
-            {
-                StringField = "x",
-                BytesField = ByteString.CopyFrom(1, 2, 3),
-                BoolField = true,
-                FloatField = 12.5f,
-                DoubleField = 12.25d,
-                Int32Field = 1,
-                Int64Field = 2,
-                Uint32Field = 3,
-                Uint64Field = 4
-            };
-            var fields = TestWellKnownTypes.Descriptor.Fields;
-
-            Assert.AreEqual("x", fields[TestWellKnownTypes.StringFieldFieldNumber].Accessor.GetValue(message));
-            Assert.AreEqual(ByteString.CopyFrom(1, 2, 3), fields[TestWellKnownTypes.BytesFieldFieldNumber].Accessor.GetValue(message));
-            Assert.AreEqual(true, fields[TestWellKnownTypes.BoolFieldFieldNumber].Accessor.GetValue(message));
-            Assert.AreEqual(12.5f, fields[TestWellKnownTypes.FloatFieldFieldNumber].Accessor.GetValue(message));
-            Assert.AreEqual(12.25d, fields[TestWellKnownTypes.DoubleFieldFieldNumber].Accessor.GetValue(message));
-            Assert.AreEqual(1, fields[TestWellKnownTypes.Int32FieldFieldNumber].Accessor.GetValue(message));
-            Assert.AreEqual(2L, fields[TestWellKnownTypes.Int64FieldFieldNumber].Accessor.GetValue(message));
-            Assert.AreEqual(3U, fields[TestWellKnownTypes.Uint32FieldFieldNumber].Accessor.GetValue(message));
-            Assert.AreEqual(4UL, fields[TestWellKnownTypes.Uint64FieldFieldNumber].Accessor.GetValue(message));
-
-            // And a couple of null fields...
-            message.StringField = null;
-            message.FloatField = null;
-            Assert.IsNull(fields[TestWellKnownTypes.StringFieldFieldNumber].Accessor.GetValue(message));
-            Assert.IsNull(fields[TestWellKnownTypes.FloatFieldFieldNumber].Accessor.GetValue(message));
-        }
-
-        [Test]
-        public void Reflection_RepeatedFields()
-        {
-            // Just a single example... note that we can't have a null value here
-            var message = new RepeatedWellKnownTypes { Int32Field = { 1, 2 } };
-            var fields = RepeatedWellKnownTypes.Descriptor.Fields;
-            var list = (IList) fields[RepeatedWellKnownTypes.Int32FieldFieldNumber].Accessor.GetValue(message);
-            CollectionAssert.AreEqual(new[] { 1, 2 }, list);
-        }
-
-        [Test]
-        public void Reflection_MapFields()
-        {
-            // Just a single example... note that we can't have a null value here despite the value type being int?
-            var message = new MapWellKnownTypes { Int32Field = { { 1, 2 } } };
-            var fields = MapWellKnownTypes.Descriptor.Fields;
-            var dictionary = (IDictionary) fields[MapWellKnownTypes.Int32FieldFieldNumber].Accessor.GetValue(message);
-            Assert.AreEqual(2, dictionary[1]);
-        }
-
-        [Test]
-        public void Oneof()
-        {
-            var message = new OneofWellKnownTypes { EmptyField = new Empty() };
-            // Start off with a non-wrapper
-            Assert.AreEqual(OneofWellKnownTypes.OneofFieldOneofCase.EmptyField, message.OneofFieldCase);
-            AssertOneofRoundTrip(message);
-
-            message.StringField = "foo";
-            Assert.AreEqual(OneofWellKnownTypes.OneofFieldOneofCase.StringField, message.OneofFieldCase);
-            AssertOneofRoundTrip(message);
-
-            message.StringField = "foo";
-            Assert.AreEqual(OneofWellKnownTypes.OneofFieldOneofCase.StringField, message.OneofFieldCase);
-            AssertOneofRoundTrip(message);
-
-            message.DoubleField = 0.0f;
-            Assert.AreEqual(OneofWellKnownTypes.OneofFieldOneofCase.DoubleField, message.OneofFieldCase);
-            AssertOneofRoundTrip(message);
-
-            message.DoubleField = 1.0f;
-            Assert.AreEqual(OneofWellKnownTypes.OneofFieldOneofCase.DoubleField, message.OneofFieldCase);
-            AssertOneofRoundTrip(message);
-
-            message.ClearOneofField();
-            Assert.AreEqual(OneofWellKnownTypes.OneofFieldOneofCase.None, message.OneofFieldCase);
-            AssertOneofRoundTrip(message);
-        }
-
-        private void AssertOneofRoundTrip(OneofWellKnownTypes message)
-        {
-            // Normal roundtrip, but explicitly checking the case...
-            MessageParsingHelpers.AssertRoundtrip(OneofWellKnownTypes.Parser, message, parsed =>
-            {
-                Assert.AreEqual(message.OneofFieldCase, parsed.OneofFieldCase);
-            });
-        }
-
-        [Test]
-        [TestCase("x", "y", "y")]
-        [TestCase("x", "", "x")]
-        [TestCase("x", null, "x")]
-        [TestCase("", "y", "y")]
-        [TestCase("", "", "")]
-        [TestCase("", null, "")]
-        [TestCase(null, "y", "y")]
-        [TestCase(null, "", "")]
-        [TestCase(null, null, null)]
-        public void Merging(string original, string merged, string expected)
-        {
-            var originalMessage = new TestWellKnownTypes { StringField = original };
-            var mergingMessage = new TestWellKnownTypes { StringField = merged };
-            originalMessage.MergeFrom(mergingMessage);
-            Assert.AreEqual(expected, originalMessage.StringField);
-
-            // Try it using MergeFrom(CodedInputStream) too...
-            originalMessage = new TestWellKnownTypes { StringField = original };
-            originalMessage.MergeFrom(mergingMessage.ToByteArray());
-            Assert.AreEqual(expected, originalMessage.StringField);
-        }
-
-        // Merging is odd with wrapper types, due to the way that default values aren't emitted in
-        // the binary stream. In fact we cheat a little bit - a message with an explicitly present default
-        // value will have that default value ignored. See issue 615. Fixing this would require significant upheaval to
-        // the FieldCodec side of things.
-        [Test]
-        public void MergingStreamExplicitValue()
-        {
-            var message = new TestWellKnownTypes { Int32Field = 5 };
-
-            // Create a byte array which has the data of an Int32Value explicitly containing a value of 0.
-            // This wouldn't normally happen.
-            byte[] bytes;
-            var wrapperTag = WireFormat.MakeTag(TestWellKnownTypes.Int32FieldFieldNumber, WireFormat.WireType.LengthDelimited);
-            var valueTag = WireFormat.MakeTag(Int32Value.ValueFieldNumber, WireFormat.WireType.Varint);
-            using (var stream = new MemoryStream())
-            {
-                var coded = new CodedOutputStream(stream);
-                coded.WriteTag(wrapperTag);
-                coded.WriteLength(2); // valueTag + a value 0, each one byte
-                coded.WriteTag(valueTag);
-                coded.WriteInt32(0);
-                coded.Flush();
-                bytes = stream.ToArray();
-            }
-
-            message.MergeFrom(bytes);
-            // A normal implementation would have 0 now, as the explicit default would have been overwritten the 5.
-            // With the FieldCodec for Nullable<int>, we can't tell the difference between an implicit 0 and an explicit 0.
-            Assert.AreEqual(5, message.Int32Field);
-        }
-
-        [Test]
-        public void MergingStreamNoValue()
-        {
-            var message = new TestWellKnownTypes { Int32Field = 5 };
-
-            // Create a byte array which an Int32 field, but with no value.
-            var bytes = new TestWellKnownTypes { Int32Field = 0 }.ToByteArray();
-            Assert.AreEqual(2, bytes.Length); // The tag for Int32Field is a single byte, then a byte indicating a 0-length message.
-            message.MergeFrom(bytes);
-
-            // The "implicit" 0 did *not* overwrite the value.
-            // (This is the correct behaviour.)
-            Assert.AreEqual(5, message.Int32Field);
-        }
-
-        // All permutations of origin/merging value being null, zero (default) or non-default.
-        // As this is the in-memory version, we don't need to worry about the difference between implicit and explicit 0.
-        [Test]
-        [TestCase(null, null, null)]
-        [TestCase(null, 0, 0)]
-        [TestCase(null, 5, 5)]
-        [TestCase(0, null, 0)]
-        [TestCase(0, 0, 0)]
-        [TestCase(0, 5, 5)]
-        [TestCase(5, null, 5)]
-        [TestCase(5, 0, 5)]
-        [TestCase(5, 10, 10)]
-        public void MergingMessageWithZero(int? originValue, int? mergingValue, int? expectedResult)
-        {
-            // This differs from the MergingStreamCornerCase because when we merge message *objects*,
-            // we ignore default values from the "source".
-            var message1 = new TestWellKnownTypes { Int32Field = originValue };
-            var message2 = new TestWellKnownTypes { Int32Field = mergingValue };
-            message1.MergeFrom(message2);
-            Assert.AreEqual(expectedResult, message1.Int32Field);
-        }
-
-        [Test]
-        public void UnknownFieldInWrapperInt32FastPath()
-        {
-            var stream = new MemoryStream();
-            var output = new CodedOutputStream(stream);
-            var wrapperTag = WireFormat.MakeTag(TestWellKnownTypes.Int32FieldFieldNumber, WireFormat.WireType.LengthDelimited);
-            var unknownTag = WireFormat.MakeTag(15, WireFormat.WireType.Varint);
-            var valueTag = WireFormat.MakeTag(Int32Value.ValueFieldNumber, WireFormat.WireType.Varint);
-
-            output.WriteTag(wrapperTag);
-            // Wrapper message is just long enough - 6 bytes - to use the wrapper fast-path.
-            output.WriteLength(6); // unknownTag + value 5 + valueType, each 1 byte, + value 65536, 3 bytes
-            output.WriteTag(unknownTag);
-            output.WriteInt32((int) valueTag); // Sneakily "pretend" it's a tag when it's really a value
-            output.WriteTag(valueTag);
-            output.WriteInt32(65536);
-            
-            output.Flush();
-            Assert.AreEqual(8, stream.Length); // tag (1 byte) + length (1 byte) + message (6 bytes)
-            stream.Position = 0;
-
-            MessageParsingHelpers.AssertReadingMessage(
-                TestWellKnownTypes.Parser,
-                stream.ToArray(),
-                message => Assert.AreEqual(65536, message.Int32Field));
-        }
-
-        [Test]
-        public void UnknownFieldInWrapperInt32SlowPath()
-        {
-            var stream = new MemoryStream();
-            var output = new CodedOutputStream(stream);
-            var wrapperTag = WireFormat.MakeTag(TestWellKnownTypes.Int32FieldFieldNumber, WireFormat.WireType.LengthDelimited);
-            var unknownTag = WireFormat.MakeTag(15, WireFormat.WireType.Varint);
-            var valueTag = WireFormat.MakeTag(Int32Value.ValueFieldNumber, WireFormat.WireType.Varint);
-
-            output.WriteTag(wrapperTag);
-            // Wrapper message is too short to be used on the wrapper fast-path.
-            output.WriteLength(4); // unknownTag + value 5 + valueType + value 6, each 1 byte
-            output.WriteTag(unknownTag);
-            output.WriteInt32((int)valueTag); // Sneakily "pretend" it's a tag when it's really a value
-            output.WriteTag(valueTag);
-            output.WriteInt32(6);
-
-            output.Flush();
-            Assert.Less(stream.Length, 8); // tag (1 byte) + length (1 byte) + message
-            stream.Position = 0;
-
-            MessageParsingHelpers.AssertReadingMessage(
-                TestWellKnownTypes.Parser,
-                stream.ToArray(),
-                message => Assert.AreEqual(6, message.Int32Field));
-        }
-
-        [Test]
-        public void UnknownFieldInWrapperInt64FastPath()
-        {
-            var stream = new MemoryStream();
-            var output = new CodedOutputStream(stream);
-            var wrapperTag = WireFormat.MakeTag(TestWellKnownTypes.Int64FieldFieldNumber, WireFormat.WireType.LengthDelimited);
-            var unknownTag = WireFormat.MakeTag(15, WireFormat.WireType.Varint);
-            var valueTag = WireFormat.MakeTag(Int64Value.ValueFieldNumber, WireFormat.WireType.Varint);
-
-            output.WriteTag(wrapperTag);
-            // Wrapper message is just long enough - 10 bytes - to use the wrapper fast-path.
-            output.WriteLength(11); // unknownTag + value 5 + valueType, each 1 byte, + value 0xfffffffffffff, 8 bytes
-            output.WriteTag(unknownTag);
-            output.WriteInt64((int)valueTag); // Sneakily "pretend" it's a tag when it's really a value
-            output.WriteTag(valueTag);
-            output.WriteInt64(0xfffffffffffffL);
-
-            output.Flush();
-            Assert.AreEqual(13, stream.Length); // tag (1 byte) + length (1 byte) + message (11 bytes)
-            stream.Position = 0;
-
-            MessageParsingHelpers.AssertReadingMessage(
-                TestWellKnownTypes.Parser,
-                stream.ToArray(),
-                message => Assert.AreEqual(0xfffffffffffffL, message.Int64Field));
-        }
-
-        [Test]
-        public void UnknownFieldInWrapperInt64SlowPath()
-        {
-            var stream = new MemoryStream();
-            var output = new CodedOutputStream(stream);
-            var wrapperTag = WireFormat.MakeTag(TestWellKnownTypes.Int64FieldFieldNumber, WireFormat.WireType.LengthDelimited);
-            var unknownTag = WireFormat.MakeTag(15, WireFormat.WireType.Varint);
-            var valueTag = WireFormat.MakeTag(Int64Value.ValueFieldNumber, WireFormat.WireType.Varint);
-
-            output.WriteTag(wrapperTag);
-            // Wrapper message is too short to be used on the wrapper fast-path.
-            output.WriteLength(4); // unknownTag + value 5 + valueType + value 6, each 1 byte
-            output.WriteTag(unknownTag);
-            output.WriteInt64((int)valueTag); // Sneakily "pretend" it's a tag when it's really a value
-            output.WriteTag(valueTag);
-            output.WriteInt64(6);
-
-            output.Flush();
-            Assert.Less(stream.Length, 12); // tag (1 byte) + length (1 byte) + message
-            stream.Position = 0;
-
-            MessageParsingHelpers.AssertReadingMessage(
-                TestWellKnownTypes.Parser,
-                stream.ToArray(),
-                message => Assert.AreEqual(6L, message.Int64Field));
-        }
-
-        [Test]
-        public void ClearWithReflection()
-        {
-            // String and Bytes are the tricky ones here, as the CLR type of the property
-            // is the same between the wrapper and non-wrapper types.
-            var message = new TestWellKnownTypes { StringField = "foo" };
-            TestWellKnownTypes.Descriptor.Fields[TestWellKnownTypes.StringFieldFieldNumber].Accessor.Clear(message);
-            Assert.IsNull(message.StringField);
-        }
-
-        [Test]
-        public void NaNComparisons()
-        {
-            var message1 = new TestWellKnownTypes { DoubleField = SampleNaNs.Regular };
-            var message2 = new TestWellKnownTypes { DoubleField = SampleNaNs.PayloadFlipped };
-            var message3 = new TestWellKnownTypes { DoubleField = SampleNaNs.Regular };
-
-            EqualityTester.AssertInequality(message1, message2);
-            EqualityTester.AssertEquality(message1, message3);
-        }
-    }
-}
diff --git a/libs/protobuf/csharp/src/Google.Protobuf.Test/testprotos.pb b/libs/protobuf/csharp/src/Google.Protobuf.Test/testprotos.pb
deleted file mode 100644
index 83958c6..0000000
Binary files a/libs/protobuf/csharp/src/Google.Protobuf.Test/testprotos.pb and /dev/null differ
diff --git a/libs/protobuf/csharp/src/Google.Protobuf.sln b/libs/protobuf/csharp/src/Google.Protobuf.sln
deleted file mode 100644
index b571e53..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf.sln
+++ /dev/null
@@ -1,60 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.26114.2
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AddressBook", "AddressBook\AddressBook.csproj", "{AFB63919-1E05-43B4-802A-8FB8C9B2F463}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Google.Protobuf", "Google.Protobuf\Google.Protobuf.csproj", "{9B576380-726D-4142-8238-60A43AB0E35A}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Google.Protobuf.Test", "Google.Protobuf.Test\Google.Protobuf.Test.csproj", "{580EB013-D3C7-4578-B845-015F4A3B0591}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Google.Protobuf.Conformance", "Google.Protobuf.Conformance\Google.Protobuf.Conformance.csproj", "{DDDC055B-E185-4181-BAB0-072F0F984569}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Google.Protobuf.JsonDump", "Google.Protobuf.JsonDump\Google.Protobuf.JsonDump.csproj", "{9695E08F-9829-497D-B95C-B38F28D48690}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Google.Protobuf.Benchmarks", "Google.Protobuf.Benchmarks\Google.Protobuf.Benchmarks.csproj", "{D25E4804-4DEA-45AB-9F8C-BA4DBD8E5A07}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Google.Protobuf.Test.TestProtos", "Google.Protobuf.Test.TestProtos\Google.Protobuf.Test.TestProtos.csproj", "{ADF24BEB-A318-4530-8448-356B72B820EA}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{AFB63919-1E05-43B4-802A-8FB8C9B2F463}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AFB63919-1E05-43B4-802A-8FB8C9B2F463}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AFB63919-1E05-43B4-802A-8FB8C9B2F463}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AFB63919-1E05-43B4-802A-8FB8C9B2F463}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9B576380-726D-4142-8238-60A43AB0E35A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9B576380-726D-4142-8238-60A43AB0E35A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9B576380-726D-4142-8238-60A43AB0E35A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9B576380-726D-4142-8238-60A43AB0E35A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{580EB013-D3C7-4578-B845-015F4A3B0591}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{580EB013-D3C7-4578-B845-015F4A3B0591}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{580EB013-D3C7-4578-B845-015F4A3B0591}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{580EB013-D3C7-4578-B845-015F4A3B0591}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DDDC055B-E185-4181-BAB0-072F0F984569}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DDDC055B-E185-4181-BAB0-072F0F984569}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DDDC055B-E185-4181-BAB0-072F0F984569}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DDDC055B-E185-4181-BAB0-072F0F984569}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9695E08F-9829-497D-B95C-B38F28D48690}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9695E08F-9829-497D-B95C-B38F28D48690}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9695E08F-9829-497D-B95C-B38F28D48690}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9695E08F-9829-497D-B95C-B38F28D48690}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D25E4804-4DEA-45AB-9F8C-BA4DBD8E5A07}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D25E4804-4DEA-45AB-9F8C-BA4DBD8E5A07}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D25E4804-4DEA-45AB-9F8C-BA4DBD8E5A07}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D25E4804-4DEA-45AB-9F8C-BA4DBD8E5A07}.Release|Any CPU.Build.0 = Release|Any CPU
-		{ADF24BEB-A318-4530-8448-356B72B820EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{ADF24BEB-A318-4530-8448-356B72B820EA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{ADF24BEB-A318-4530-8448-356B72B820EA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{ADF24BEB-A318-4530-8448-356B72B820EA}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {7B06C87B-83E1-4F5F-A0DD-6E9AFAC03DAC}
-	EndGlobalSection
-EndGlobal
diff --git a/libs/protobuf/csharp/src/Google.Protobuf/ByteArray.cs b/libs/protobuf/csharp/src/Google.Protobuf/ByteArray.cs
deleted file mode 100644
index 094a81e..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf/ByteArray.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-
-namespace Google.Protobuf
-{
-    /// <summary>
-    /// Provides a utility routine to copy small arrays much more quickly than Buffer.BlockCopy
-    /// </summary>
-    internal static class ByteArray
-    {
-        /// <summary>
-        /// The threshold above which you should use Buffer.BlockCopy rather than ByteArray.Copy
-        /// </summary>
-        private const int CopyThreshold = 12;
-
-        /// <summary>
-        /// Determines which copy routine to use based on the number of bytes to be copied.
-        /// </summary>
-        internal static void Copy(byte[] src, int srcOffset, byte[] dst, int dstOffset, int count)
-        {
-            if (count > CopyThreshold)
-            {
-                Buffer.BlockCopy(src, srcOffset, dst, dstOffset, count);
-            }
-            else
-            {
-                int stop = srcOffset + count;
-                for (int i = srcOffset; i < stop; i++)
-                {
-                    dst[dstOffset++] = src[i];
-                }
-            }
-        }
-
-        /// <summary>
-        /// Reverses the order of bytes in the array
-        /// </summary>
-        internal static void Reverse(byte[] bytes)
-        {
-            for (int first = 0, last = bytes.Length - 1; first < last; first++, last--)
-            {
-                byte temp = bytes[first];
-                bytes[first] = bytes[last];
-                bytes[last] = temp;
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/libs/protobuf/csharp/src/Google.Protobuf/ByteString.cs b/libs/protobuf/csharp/src/Google.Protobuf/ByteString.cs
deleted file mode 100644
index 8c6eb5b..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf/ByteString.cs
+++ /dev/null
@@ -1,434 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.IO;
-using System.Runtime.InteropServices;
-using System.Security;
-using System.Text;
-#if !NET35
-using System.Threading;
-using System.Threading.Tasks;
-#endif
-#if NET35
-using Google.Protobuf.Compatibility;
-#endif
-
-namespace Google.Protobuf
-{
-    /// <summary>
-    /// Immutable array of bytes.
-    /// </summary>
-    [SecuritySafeCritical]
-    public sealed class ByteString : IEnumerable<byte>, IEquatable<ByteString>
-    {
-        private static readonly ByteString empty = new ByteString(new byte[0]);
-
-        private readonly ReadOnlyMemory<byte> bytes;
-
-        /// <summary>
-        /// Internal use only. Ensure that the provided memory is not mutated and belongs to this instance.
-        /// </summary>
-        internal static ByteString AttachBytes(ReadOnlyMemory<byte> bytes)
-        {
-            return new ByteString(bytes);
-        }
-
-        /// <summary>
-        /// Internal use only. Ensure that the provided memory is not mutated and belongs to this instance.
-        /// This method encapsulates converting array to memory. Reduces need for SecuritySafeCritical
-        /// in .NET Framework.
-        /// </summary>
-        internal static ByteString AttachBytes(byte[] bytes)
-        {
-            return AttachBytes(bytes.AsMemory());
-        }
-
-        /// <summary>
-        /// Constructs a new ByteString from the given memory. The memory is
-        /// *not* copied, and must not be modified after this constructor is called.
-        /// </summary>
-        private ByteString(ReadOnlyMemory<byte> bytes)
-        {
-            this.bytes = bytes;
-        }
-
-        /// <summary>
-        /// Returns an empty ByteString.
-        /// </summary>
-        public static ByteString Empty
-        {
-            get { return empty; }
-        }
-
-        /// <summary>
-        /// Returns the length of this ByteString in bytes.
-        /// </summary>
-        public int Length
-        {
-            get { return bytes.Length; }
-        }
-
-        /// <summary>
-        /// Returns <c>true</c> if this byte string is empty, <c>false</c> otherwise.
-        /// </summary>
-        public bool IsEmpty
-        {
-            get { return Length == 0; }
-        }
-
-        /// <summary>
-        /// Provides read-only access to the data of this <see cref="ByteString"/>.
-        /// No data is copied so this is the most efficient way of accessing.
-        /// </summary>
-        public ReadOnlySpan<byte> Span
-        {
-            get { return bytes.Span; }
-        }
-
-        /// <summary>
-        /// Provides read-only access to the data of this <see cref="ByteString"/>.
-        /// No data is copied so this is the most efficient way of accessing.
-        /// </summary>
-        public ReadOnlyMemory<byte> Memory
-        {
-            get { return bytes; }
-        }
-
-        /// <summary>
-        /// Converts this <see cref="ByteString"/> into a byte array.
-        /// </summary>
-        /// <remarks>The data is copied - changes to the returned array will not be reflected in this <c>ByteString</c>.</remarks>
-        /// <returns>A byte array with the same data as this <c>ByteString</c>.</returns>
-        public byte[] ToByteArray()
-        {
-            return bytes.ToArray();
-        }
-
-        /// <summary>
-        /// Converts this <see cref="ByteString"/> into a standard base64 representation.
-        /// </summary>
-        /// <returns>A base64 representation of this <c>ByteString</c>.</returns>
-        public string ToBase64()
-        {
-            if (MemoryMarshal.TryGetArray(bytes, out ArraySegment<byte> segment))
-            {
-                // Fast path. ByteString was created with an array, so pass the underlying array.
-                return Convert.ToBase64String(segment.Array, segment.Offset, segment.Count);
-            }
-            else
-            {
-                // Slow path. BytesString is not an array. Convert memory and pass result to ToBase64String.
-                return Convert.ToBase64String(bytes.ToArray());
-            }
-        }
-
-        /// <summary>
-        /// Constructs a <see cref="ByteString" /> from the Base64 Encoded String.
-        /// </summary>
-        public static ByteString FromBase64(string bytes)
-        {
-            // By handling the empty string explicitly, we not only optimize but we fix a
-            // problem on CF 2.0. See issue 61 for details.
-            return bytes == "" ? Empty : new ByteString(Convert.FromBase64String(bytes));
-        }
-
-        /// <summary>
-        /// Constructs a <see cref="ByteString"/> from data in the given stream, synchronously.
-        /// </summary>
-        /// <remarks>If successful, <paramref name="stream"/> will be read completely, from the position
-        /// at the start of the call.</remarks>
-        /// <param name="stream">The stream to copy into a ByteString.</param>
-        /// <returns>A ByteString with content read from the given stream.</returns>
-        public static ByteString FromStream(Stream stream)
-        {
-            ProtoPreconditions.CheckNotNull(stream, nameof(stream));
-            int capacity = stream.CanSeek ? checked((int) (stream.Length - stream.Position)) : 0;
-            var memoryStream = new MemoryStream(capacity);
-            stream.CopyTo(memoryStream);
-#if NETSTANDARD1_1 || NETSTANDARD2_0
-            byte[] bytes = memoryStream.ToArray();
-#else
-            // Avoid an extra copy if we can.
-            byte[] bytes = memoryStream.Length == memoryStream.Capacity ? memoryStream.GetBuffer() : memoryStream.ToArray();
-#endif
-            return AttachBytes(bytes);
-        }
-
-#if !NET35
-        /// <summary>
-        /// Constructs a <see cref="ByteString"/> from data in the given stream, asynchronously.
-        /// </summary>
-        /// <remarks>If successful, <paramref name="stream"/> will be read completely, from the position
-        /// at the start of the call.</remarks>
-        /// <param name="stream">The stream to copy into a ByteString.</param>
-        /// <param name="cancellationToken">The cancellation token to use when reading from the stream, if any.</param>
-        /// <returns>A ByteString with content read from the given stream.</returns>
-        public static Task<ByteString> FromStreamAsync(Stream stream, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            ProtoPreconditions.CheckNotNull(stream, nameof(stream));
-            return ByteStringAsync.FromStreamAsyncCore(stream, cancellationToken);
-        }
-#endif
-
-        /// <summary>
-        /// Constructs a <see cref="ByteString" /> from the given array. The contents
-        /// are copied, so further modifications to the array will not
-        /// be reflected in the returned ByteString.
-        /// This method can also be invoked in <c>ByteString.CopyFrom(0xaa, 0xbb, ...)</c> form
-        /// which is primarily useful for testing.
-        /// </summary>
-        public static ByteString CopyFrom(params byte[] bytes)
-        {
-            return new ByteString((byte[]) bytes.Clone());
-        }
-
-        /// <summary>
-        /// Constructs a <see cref="ByteString" /> from a portion of a byte array.
-        /// </summary>
-        public static ByteString CopyFrom(byte[] bytes, int offset, int count)
-        {
-            byte[] portion = new byte[count];
-            ByteArray.Copy(bytes, offset, portion, 0, count);
-            return new ByteString(portion);
-        }
-
-        /// <summary>
-        /// Constructs a <see cref="ByteString" /> from a read only span. The contents
-        /// are copied, so further modifications to the span will not
-        /// be reflected in the returned <see cref="ByteString" />.
-        /// </summary>
-        public static ByteString CopyFrom(ReadOnlySpan<byte> bytes)
-        {
-            return new ByteString(bytes.ToArray());
-        }
-
-        /// <summary>
-        /// Creates a new <see cref="ByteString" /> by encoding the specified text with
-        /// the given encoding.
-        /// </summary>
-        public static ByteString CopyFrom(string text, Encoding encoding)
-        {
-            return new ByteString(encoding.GetBytes(text));
-        }
-
-        /// <summary>
-        /// Creates a new <see cref="ByteString" /> by encoding the specified text in UTF-8.
-        /// </summary>
-        public static ByteString CopyFromUtf8(string text)
-        {
-            return CopyFrom(text, Encoding.UTF8);
-        }
-
-        /// <summary>
-        /// Returns the byte at the given index.
-        /// </summary>
-        public byte this[int index]
-        {
-            get { return bytes.Span[index]; }
-        }
-
-        /// <summary>
-        /// Converts this <see cref="ByteString"/> into a string by applying the given encoding.
-        /// </summary>
-        /// <remarks>
-        /// This method should only be used to convert binary data which was the result of encoding
-        /// text with the given encoding.
-        /// </remarks>
-        /// <param name="encoding">The encoding to use to decode the binary data into text.</param>
-        /// <returns>The result of decoding the binary data with the given decoding.</returns>
-        public string ToString(Encoding encoding)
-        {
-            if (MemoryMarshal.TryGetArray(bytes, out ArraySegment<byte> segment))
-            {
-                // Fast path. ByteString was created with an array.
-                return encoding.GetString(segment.Array, segment.Offset, segment.Count);
-            }
-            else
-            {
-                // Slow path. BytesString is not an array. Convert memory and pass result to GetString.
-                // TODO: Consider using GetString overload that takes a pointer.
-                byte[] array = bytes.ToArray();
-                return encoding.GetString(array, 0, array.Length);
-            }
-        }
-
-        /// <summary>
-        /// Converts this <see cref="ByteString"/> into a string by applying the UTF-8 encoding.
-        /// </summary>
-        /// <remarks>
-        /// This method should only be used to convert binary data which was the result of encoding
-        /// text with UTF-8.
-        /// </remarks>
-        /// <returns>The result of decoding the binary data with the given decoding.</returns>
-        public string ToStringUtf8()
-        {
-            return ToString(Encoding.UTF8);
-        }
-
-        /// <summary>
-        /// Returns an iterator over the bytes in this <see cref="ByteString"/>.
-        /// </summary>
-        /// <returns>An iterator over the bytes in this object.</returns>
-        [SecuritySafeCritical]
-        public IEnumerator<byte> GetEnumerator()
-        {
-            return MemoryMarshal.ToEnumerable(bytes).GetEnumerator();
-        }
-
-        /// <summary>
-        /// Returns an iterator over the bytes in this <see cref="ByteString"/>.
-        /// </summary>
-        /// <returns>An iterator over the bytes in this object.</returns>
-        IEnumerator IEnumerable.GetEnumerator()
-        {
-            return GetEnumerator();
-        }
-
-        /// <summary>
-        /// Creates a CodedInputStream from this ByteString's data.
-        /// </summary>
-        public CodedInputStream CreateCodedInput()
-        {
-            // We trust CodedInputStream not to reveal the provided byte array or modify it
-            if (MemoryMarshal.TryGetArray(bytes, out ArraySegment<byte> segment) && segment.Count == bytes.Length)
-            {
-                // Fast path. ByteString was created with a complete array.
-                return new CodedInputStream(segment.Array, segment.Offset, segment.Count);
-            }
-            else
-            {
-                // Slow path. BytesString is not an array, or is a slice of an array.
-                // Convert memory and pass result to WriteRawBytes.
-                return new CodedInputStream(bytes.ToArray());
-            }
-        }
-
-        /// <summary>
-        /// Compares two byte strings for equality.
-        /// </summary>
-        /// <param name="lhs">The first byte string to compare.</param>
-        /// <param name="rhs">The second byte string to compare.</param>
-        /// <returns><c>true</c> if the byte strings are equal; false otherwise.</returns>
-        public static bool operator ==(ByteString lhs, ByteString rhs)
-        {
-            if (ReferenceEquals(lhs, rhs))
-            {
-                return true;
-            }
-            if (ReferenceEquals(lhs, null) || ReferenceEquals(rhs, null))
-            {
-                return false;
-            }
-
-            return lhs.bytes.Span.SequenceEqual(rhs.bytes.Span);
-        }
-
-        /// <summary>
-        /// Compares two byte strings for inequality.
-        /// </summary>
-        /// <param name="lhs">The first byte string to compare.</param>
-        /// <param name="rhs">The second byte string to compare.</param>
-        /// <returns><c>false</c> if the byte strings are equal; true otherwise.</returns>
-        public static bool operator !=(ByteString lhs, ByteString rhs)
-        {
-            return !(lhs == rhs);
-        }
-
-        /// <summary>
-        /// Compares this byte string with another object.
-        /// </summary>
-        /// <param name="obj">The object to compare this with.</param>
-        /// <returns><c>true</c> if <paramref name="obj"/> refers to an equal <see cref="ByteString"/>; <c>false</c> otherwise.</returns>
-        [SecuritySafeCritical]
-        public override bool Equals(object obj)
-        {
-            return this == (obj as ByteString);
-        }
-
-        /// <summary>
-        /// Returns a hash code for this object. Two equal byte strings
-        /// will return the same hash code.
-        /// </summary>
-        /// <returns>A hash code for this object.</returns>
-        [SecuritySafeCritical]
-        public override int GetHashCode()
-        {
-            ReadOnlySpan<byte> b = bytes.Span;
-
-            int ret = 23;
-            for (int i = 0; i < b.Length; i++)
-            {
-                ret = (ret * 31) + b[i];
-            }
-            return ret;
-        }
-
-        /// <summary>
-        /// Compares this byte string with another.
-        /// </summary>
-        /// <param name="other">The <see cref="ByteString"/> to compare this with.</param>
-        /// <returns><c>true</c> if <paramref name="other"/> refers to an equal byte string; <c>false</c> otherwise.</returns>
-        public bool Equals(ByteString other)
-        {
-            return this == other;
-        }
-
-        /// <summary>
-        /// Copies the entire byte array to the destination array provided at the offset specified.
-        /// </summary>
-        public void CopyTo(byte[] array, int position)
-        {
-            bytes.CopyTo(array.AsMemory(position));
-        }
-
-        /// <summary>
-        /// Writes the entire byte array to the provided stream
-        /// </summary>
-        public void WriteTo(Stream outputStream)
-        {
-            if (MemoryMarshal.TryGetArray(bytes, out ArraySegment<byte> segment))
-            {
-                // Fast path. ByteString was created with an array, so pass the underlying array.
-                outputStream.Write(segment.Array, segment.Offset, segment.Count);
-            }
-            else
-            {
-                // Slow path. BytesString is not an array. Convert memory and pass result to WriteRawBytes.
-                var array = bytes.ToArray();
-                outputStream.Write(array, 0, array.Length);
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/libs/protobuf/csharp/src/Google.Protobuf/ByteStringAsync.cs b/libs/protobuf/csharp/src/Google.Protobuf/ByteStringAsync.cs
deleted file mode 100644
index 3465cc6..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf/ByteStringAsync.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-using System.IO;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace Google.Protobuf
-{
-    /// <summary>
-    /// SecuritySafeCritical attribute can not be placed on types with async methods.
-    /// This class has ByteString's async methods so it can be marked with SecuritySafeCritical.
-    /// </summary>
-    internal static class ByteStringAsync
-    {
-#if !NET35
-        internal static async Task<ByteString> FromStreamAsyncCore(Stream stream, CancellationToken cancellationToken)
-        {
-            int capacity = stream.CanSeek ? checked((int)(stream.Length - stream.Position)) : 0;
-            var memoryStream = new MemoryStream(capacity);
-            // We have to specify the buffer size here, as there's no overload accepting the cancellation token
-            // alone. But it's documented to use 81920 by default if not specified.
-            await stream.CopyToAsync(memoryStream, 81920, cancellationToken);
-#if NETSTANDARD1_1
-            byte[] bytes = memoryStream.ToArray();
-#else
-            // Avoid an extra copy if we can.
-            byte[] bytes = memoryStream.Length == memoryStream.Capacity ? memoryStream.GetBuffer() : memoryStream.ToArray();
-#endif
-            return ByteString.AttachBytes(bytes);
-        }
-#endif
-    }
-}
\ No newline at end of file
diff --git a/libs/protobuf/csharp/src/Google.Protobuf/CodedInputStream.cs b/libs/protobuf/csharp/src/Google.Protobuf/CodedInputStream.cs
deleted file mode 100644
index 96ae84c..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf/CodedInputStream.cs
+++ /dev/null
@@ -1,698 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using Google.Protobuf.Collections;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using System.Security;
-
-namespace Google.Protobuf
-{
-    /// <summary>
-    /// Reads and decodes protocol message fields.
-    /// </summary>
-    /// <remarks>
-    /// <para>
-    /// This class is generally used by generated code to read appropriate
-    /// primitives from the stream. It effectively encapsulates the lowest
-    /// levels of protocol buffer format.
-    /// </para>
-    /// <para>
-    /// Repeated fields and map fields are not handled by this class; use <see cref="RepeatedField{T}"/>
-    /// and <see cref="MapField{TKey, TValue}"/> to serialize such fields.
-    /// </para>
-    /// </remarks>
-    [SecuritySafeCritical]
-    public sealed class CodedInputStream : IDisposable
-    {
-        /// <summary>
-        /// Whether to leave the underlying stream open when disposing of this stream.
-        /// This is always true when there's no stream.
-        /// </summary>
-        private readonly bool leaveOpen;
-
-        /// <summary>
-        /// Buffer of data read from the stream or provided at construction time.
-        /// </summary>
-        private readonly byte[] buffer;
-
-        /// <summary>
-        /// The stream to read further input from, or null if the byte array buffer was provided
-        /// directly on construction, with no further data available.
-        /// </summary>
-        private readonly Stream input;
-
-        /// <summary>
-        /// The parser state is kept separately so that other parse implementations can reuse the same
-        /// parsing primitives.
-        /// </summary>
-        private ParserInternalState state;
-
-        internal const int DefaultRecursionLimit = 100;
-        internal const int DefaultSizeLimit = Int32.MaxValue;
-        internal const int BufferSize = 4096;
-
-        #region Construction
-        // Note that the checks are performed such that we don't end up checking obviously-valid things
-        // like non-null references for arrays we've just created.
-
-        /// <summary>
-        /// Creates a new CodedInputStream reading data from the given byte array.
-        /// </summary>
-        public CodedInputStream(byte[] buffer) : this(null, ProtoPreconditions.CheckNotNull(buffer, "buffer"), 0, buffer.Length, true)
-        {            
-        }
-
-        /// <summary>
-        /// Creates a new <see cref="CodedInputStream"/> that reads from the given byte array slice.
-        /// </summary>
-        public CodedInputStream(byte[] buffer, int offset, int length)
-            : this(null, ProtoPreconditions.CheckNotNull(buffer, "buffer"), offset, offset + length, true)
-        {            
-            if (offset < 0 || offset > buffer.Length)
-            {
-                throw new ArgumentOutOfRangeException("offset", "Offset must be within the buffer");
-            }
-            if (length < 0 || offset + length > buffer.Length)
-            {
-                throw new ArgumentOutOfRangeException("length", "Length must be non-negative and within the buffer");
-            }
-        }
-
-        /// <summary>
-        /// Creates a new <see cref="CodedInputStream"/> reading data from the given stream, which will be disposed
-        /// when the returned object is disposed.
-        /// </summary>
-        /// <param name="input">The stream to read from.</param>
-        public CodedInputStream(Stream input) : this(input, false)
-        {
-        }
-
-        /// <summary>
-        /// Creates a new <see cref="CodedInputStream"/> reading data from the given stream.
-        /// </summary>
-        /// <param name="input">The stream to read from.</param>
-        /// <param name="leaveOpen"><c>true</c> to leave <paramref name="input"/> open when the returned
-        /// <c cref="CodedInputStream"/> is disposed; <c>false</c> to dispose of the given stream when the
-        /// returned object is disposed.</param>
-        public CodedInputStream(Stream input, bool leaveOpen)
-            : this(ProtoPreconditions.CheckNotNull(input, "input"), new byte[BufferSize], 0, 0, leaveOpen)
-        {
-        }
-        
-        /// <summary>
-        /// Creates a new CodedInputStream reading data from the given
-        /// stream and buffer, using the default limits.
-        /// </summary>
-        internal CodedInputStream(Stream input, byte[] buffer, int bufferPos, int bufferSize, bool leaveOpen)
-        {
-            this.input = input;
-            this.buffer = buffer;
-            this.state.bufferPos = bufferPos;
-            this.state.bufferSize = bufferSize;
-            this.state.sizeLimit = DefaultSizeLimit;
-            this.state.recursionLimit = DefaultRecursionLimit;
-            SegmentedBufferHelper.Initialize(this, out this.state.segmentedBufferHelper);
-            this.leaveOpen = leaveOpen;
-
-            this.state.currentLimit = int.MaxValue;
-        }
-
-        /// <summary>
-        /// Creates a new CodedInputStream reading data from the given
-        /// stream and buffer, using the specified limits.
-        /// </summary>
-        /// <remarks>
-        /// This chains to the version with the default limits instead of vice versa to avoid
-        /// having to check that the default values are valid every time.
-        /// </remarks>
-        internal CodedInputStream(Stream input, byte[] buffer, int bufferPos, int bufferSize, int sizeLimit, int recursionLimit, bool leaveOpen)
-            : this(input, buffer, bufferPos, bufferSize, leaveOpen)
-        {
-            if (sizeLimit <= 0)
-            {
-                throw new ArgumentOutOfRangeException("sizeLimit", "Size limit must be positive");
-            }
-            if (recursionLimit <= 0)
-            {
-                throw new ArgumentOutOfRangeException("recursionLimit!", "Recursion limit must be positive");
-            }
-            this.state.sizeLimit = sizeLimit;
-            this.state.recursionLimit = recursionLimit;
-        }
-        #endregion
-
-        /// <summary>
-        /// Creates a <see cref="CodedInputStream"/> with the specified size and recursion limits, reading
-        /// from an input stream.
-        /// </summary>
-        /// <remarks>
-        /// This method exists separately from the constructor to reduce the number of constructor overloads.
-        /// It is likely to be used considerably less frequently than the constructors, as the default limits
-        /// are suitable for most use cases.
-        /// </remarks>
-        /// <param name="input">The input stream to read from</param>
-        /// <param name="sizeLimit">The total limit of data to read from the stream.</param>
-        /// <param name="recursionLimit">The maximum recursion depth to allow while reading.</param>
-        /// <returns>A <c>CodedInputStream</c> reading from <paramref name="input"/> with the specified size
-        /// and recursion limits.</returns>
-        public static CodedInputStream CreateWithLimits(Stream input, int sizeLimit, int recursionLimit)
-        {
-            // Note: we may want an overload accepting leaveOpen
-            return new CodedInputStream(input, new byte[BufferSize], 0, 0, sizeLimit, recursionLimit, false);
-        }
-
-        /// <summary>
-        /// Returns the current position in the input stream, or the position in the input buffer
-        /// </summary>
-        public long Position 
-        {
-            get
-            {
-                if (input != null)
-                {
-                    return input.Position - ((state.bufferSize + state.bufferSizeAfterLimit) - state.bufferPos);
-                }
-                return state.bufferPos;
-            }
-        }
-
-        /// <summary>
-        /// Returns the last tag read, or 0 if no tags have been read or we've read beyond
-        /// the end of the stream.
-        /// </summary>
-        internal uint LastTag { get { return state.lastTag; } }
-
-        /// <summary>
-        /// Returns the size limit for this stream.
-        /// </summary>
-        /// <remarks>
-        /// This limit is applied when reading from the underlying stream, as a sanity check. It is
-        /// not applied when reading from a byte array data source without an underlying stream.
-        /// The default value is Int32.MaxValue.
-        /// </remarks>
-        /// <value>
-        /// The size limit.
-        /// </value>
-        public int SizeLimit { get { return state.sizeLimit; } }
-
-        /// <summary>
-        /// Returns the recursion limit for this stream. This limit is applied whilst reading messages,
-        /// to avoid maliciously-recursive data.
-        /// </summary>
-        /// <remarks>
-        /// The default limit is 100.
-        /// </remarks>
-        /// <value>
-        /// The recursion limit for this stream.
-        /// </value>
-        public int RecursionLimit { get { return state.recursionLimit; } }
-
-        /// <summary>
-        /// Internal-only property; when set to true, unknown fields will be discarded while parsing.
-        /// </summary>
-        internal bool DiscardUnknownFields
-        {
-            get { return state.DiscardUnknownFields; }
-            set { state.DiscardUnknownFields = value; }
-        }
-
-        /// <summary>
-        /// Internal-only property; provides extension identifiers to compatible messages while parsing.
-        /// </summary>
-        internal ExtensionRegistry ExtensionRegistry
-        {
-            get { return state.ExtensionRegistry; }
-            set { state.ExtensionRegistry = value; }
-        }
-
-        internal byte[] InternalBuffer => buffer;
-
-        internal Stream InternalInputStream => input;
-
-        internal ref ParserInternalState InternalState => ref state;
-
-        /// <summary>
-        /// Disposes of this instance, potentially closing any underlying stream.
-        /// </summary>
-        /// <remarks>
-        /// As there is no flushing to perform here, disposing of a <see cref="CodedInputStream"/> which
-        /// was constructed with the <c>leaveOpen</c> option parameter set to <c>true</c> (or one which
-        /// was constructed to read from a byte array) has no effect.
-        /// </remarks>
-        public void Dispose()
-        {
-            if (!leaveOpen)
-            {
-                input.Dispose();
-            }
-        }
-
-        #region Validation
-        /// <summary>
-        /// Verifies that the last call to ReadTag() returned tag 0 - in other words,
-        /// we've reached the end of the stream when we expected to.
-        /// </summary>
-        /// <exception cref="InvalidProtocolBufferException">The 
-        /// tag read was not the one specified</exception>
-        internal void CheckReadEndOfStreamTag()
-        {
-            ParsingPrimitivesMessages.CheckReadEndOfStreamTag(ref state);
-        }
-        #endregion
-
-        #region Reading of tags etc
-
-        /// <summary>
-        /// Peeks at the next field tag. This is like calling <see cref="ReadTag"/>, but the
-        /// tag is not consumed. (So a subsequent call to <see cref="ReadTag"/> will return the
-        /// same value.)
-        /// </summary>
-        public uint PeekTag()
-        {
-            var span = new ReadOnlySpan<byte>(buffer);
-            return ParsingPrimitives.PeekTag(ref span, ref state);
-        }
-
-        /// <summary>
-        /// Reads a field tag, returning the tag of 0 for "end of stream".
-        /// </summary>
-        /// <remarks>
-        /// If this method returns 0, it doesn't necessarily mean the end of all
-        /// the data in this CodedInputStream; it may be the end of the logical stream
-        /// for an embedded message, for example.
-        /// </remarks>
-        /// <returns>The next field tag, or 0 for end of stream. (0 is never a valid tag.)</returns>
-        public uint ReadTag()
-        {
-            var span = new ReadOnlySpan<byte>(buffer);
-            return ParsingPrimitives.ParseTag(ref span, ref state);
-        }
-
-        /// <summary>
-        /// Skips the data for the field with the tag we've just read.
-        /// This should be called directly after <see cref="ReadTag"/>, when
-        /// the caller wishes to skip an unknown field.
-        /// </summary>
-        /// <remarks>
-        /// This method throws <see cref="InvalidProtocolBufferException"/> if the last-read tag was an end-group tag.
-        /// If a caller wishes to skip a group, they should skip the whole group, by calling this method after reading the
-        /// start-group tag. This behavior allows callers to call this method on any field they don't understand, correctly
-        /// resulting in an error if an end-group tag has not been paired with an earlier start-group tag.
-        /// </remarks>
-        /// <exception cref="InvalidProtocolBufferException">The last tag was an end-group tag</exception>
-        /// <exception cref="InvalidOperationException">The last read operation read to the end of the logical stream</exception>
-        public void SkipLastField()
-        {
-            var span = new ReadOnlySpan<byte>(buffer);
-            ParsingPrimitivesMessages.SkipLastField(ref span, ref state);
-        }
-
-        /// <summary>
-        /// Skip a group.
-        /// </summary>
-        internal void SkipGroup(uint startGroupTag)
-        {
-            var span = new ReadOnlySpan<byte>(buffer);
-            ParsingPrimitivesMessages.SkipGroup(ref span, ref state, startGroupTag);
-        }
-
-        /// <summary>
-        /// Reads a double field from the stream.
-        /// </summary>
-        public double ReadDouble()
-        {
-            var span = new ReadOnlySpan<byte>(buffer);
-            return ParsingPrimitives.ParseDouble(ref span, ref state);
-        }
-
-        /// <summary>
-        /// Reads a float field from the stream.
-        /// </summary>
-        public float ReadFloat()
-        {
-            var span = new ReadOnlySpan<byte>(buffer);
-            return ParsingPrimitives.ParseFloat(ref span, ref state);
-        }
-
-        /// <summary>
-        /// Reads a uint64 field from the stream.
-        /// </summary>
-        public ulong ReadUInt64()
-        {
-            return ReadRawVarint64();
-        }
-
-        /// <summary>
-        /// Reads an int64 field from the stream.
-        /// </summary>
-        public long ReadInt64()
-        {
-            return (long) ReadRawVarint64();
-        }
-
-        /// <summary>
-        /// Reads an int32 field from the stream.
-        /// </summary>
-        public int ReadInt32()
-        {
-            return (int) ReadRawVarint32();
-        }
-
-        /// <summary>
-        /// Reads a fixed64 field from the stream.
-        /// </summary>
-        public ulong ReadFixed64()
-        {
-            return ReadRawLittleEndian64();
-        }
-
-        /// <summary>
-        /// Reads a fixed32 field from the stream.
-        /// </summary>
-        public uint ReadFixed32()
-        {
-            return ReadRawLittleEndian32();
-        }
-
-        /// <summary>
-        /// Reads a bool field from the stream.
-        /// </summary>
-        public bool ReadBool()
-        {
-            return ReadRawVarint64() != 0;
-        }
-
-        /// <summary>
-        /// Reads a string field from the stream.
-        /// </summary>
-        public string ReadString()
-        {
-            var span = new ReadOnlySpan<byte>(buffer);
-            return ParsingPrimitives.ReadString(ref span, ref state);
-        }
-
-        /// <summary>
-        /// Reads an embedded message field value from the stream.
-        /// </summary>
-        public void ReadMessage(IMessage builder)
-        {
-            // TODO(jtattermusch): if the message doesn't implement IBufferMessage (and thus does not provide the InternalMergeFrom method),
-            // what we're doing here works fine, but could be more efficient.
-            // What happens is that we first initialize a ParseContext from the current coded input stream only to parse the length of the message, at which point
-            // we will need to switch back again to CodedInputStream-based parsing (which involves copying and storing the state) to be able to
-            // invoke the legacy MergeFrom(CodedInputStream) method.
-            // For now, this inefficiency is fine, considering this is only a backward-compatibility scenario (and regenerating the code fixes it).
-            ParseContext.Initialize(buffer.AsSpan(), ref state, out ParseContext ctx);
-            try
-            {
-                ParsingPrimitivesMessages.ReadMessage(ref ctx, builder);
-            }
-            finally
-            {
-                ctx.CopyStateTo(this);
-            }
-        }
-
-        /// <summary>
-        /// Reads an embedded group field from the stream.
-        /// </summary>
-        public void ReadGroup(IMessage builder)
-        {
-            ParseContext.Initialize(this, out ParseContext ctx);
-            try
-            {
-                ParsingPrimitivesMessages.ReadGroup(ref ctx, builder);
-            }
-            finally
-            {
-                ctx.CopyStateTo(this);
-            }
-        }
-
-        /// <summary>
-        /// Reads a bytes field value from the stream.
-        /// </summary>   
-        public ByteString ReadBytes()
-        {
-            var span = new ReadOnlySpan<byte>(buffer);
-            return ParsingPrimitives.ReadBytes(ref span, ref state);
-        }
-
-        /// <summary>
-        /// Reads a uint32 field value from the stream.
-        /// </summary>   
-        public uint ReadUInt32()
-        {
-            return ReadRawVarint32();
-        }
-
-        /// <summary>
-        /// Reads an enum field value from the stream.
-        /// </summary>   
-        public int ReadEnum()
-        {
-            // Currently just a pass-through, but it's nice to separate it logically from WriteInt32.
-            return (int) ReadRawVarint32();
-        }
-
-        /// <summary>
-        /// Reads an sfixed32 field value from the stream.
-        /// </summary>   
-        public int ReadSFixed32()
-        {
-            return (int) ReadRawLittleEndian32();
-        }
-
-        /// <summary>
-        /// Reads an sfixed64 field value from the stream.
-        /// </summary>   
-        public long ReadSFixed64()
-        {
-            return (long) ReadRawLittleEndian64();
-        }
-
-        /// <summary>
-        /// Reads an sint32 field value from the stream.
-        /// </summary>   
-        public int ReadSInt32()
-        {
-            return ParsingPrimitives.DecodeZigZag32(ReadRawVarint32());
-        }
-
-        /// <summary>
-        /// Reads an sint64 field value from the stream.
-        /// </summary>   
-        public long ReadSInt64()
-        {
-            return ParsingPrimitives.DecodeZigZag64(ReadRawVarint64());
-        }
-
-        /// <summary>
-        /// Reads a length for length-delimited data.
-        /// </summary>
-        /// <remarks>
-        /// This is internally just reading a varint, but this method exists
-        /// to make the calling code clearer.
-        /// </remarks>
-        public int ReadLength()
-        {
-            var span = new ReadOnlySpan<byte>(buffer);
-            return ParsingPrimitives.ParseLength(ref span, ref state);
-        }
-
-        /// <summary>
-        /// Peeks at the next tag in the stream. If it matches <paramref name="tag"/>,
-        /// the tag is consumed and the method returns <c>true</c>; otherwise, the
-        /// stream is left in the original position and the method returns <c>false</c>.
-        /// </summary>
-        public bool MaybeConsumeTag(uint tag)
-        {
-            var span = new ReadOnlySpan<byte>(buffer);
-            return ParsingPrimitives.MaybeConsumeTag(ref span, ref state, tag);
-        }
-
-#endregion
-
-        #region Underlying reading primitives
-
-        /// <summary>
-        /// Reads a raw Varint from the stream.  If larger than 32 bits, discard the upper bits.
-        /// This method is optimised for the case where we've got lots of data in the buffer.
-        /// That means we can check the size just once, then just read directly from the buffer
-        /// without constant rechecking of the buffer length.
-        /// </summary>
-        internal uint ReadRawVarint32()
-        {
-            var span = new ReadOnlySpan<byte>(buffer);
-            return ParsingPrimitives.ParseRawVarint32(ref span, ref state);
-        }
-
-        /// <summary>
-        /// Reads a varint from the input one byte at a time, so that it does not
-        /// read any bytes after the end of the varint. If you simply wrapped the
-        /// stream in a CodedInputStream and used ReadRawVarint32(Stream)
-        /// then you would probably end up reading past the end of the varint since
-        /// CodedInputStream buffers its input.
-        /// </summary>
-        /// <param name="input"></param>
-        /// <returns></returns>
-        internal static uint ReadRawVarint32(Stream input)
-        {
-            return ParsingPrimitives.ReadRawVarint32(input);
-        }
-
-        /// <summary>
-        /// Reads a raw varint from the stream.
-        /// </summary>
-        internal ulong ReadRawVarint64()
-        {
-            var span = new ReadOnlySpan<byte>(buffer);
-            return ParsingPrimitives.ParseRawVarint64(ref span, ref state);
-        }
-
-        /// <summary>
-        /// Reads a 32-bit little-endian integer from the stream.
-        /// </summary>
-        internal uint ReadRawLittleEndian32()
-        {
-            var span = new ReadOnlySpan<byte>(buffer);
-            return ParsingPrimitives.ParseRawLittleEndian32(ref span, ref state);
-        }
-
-        /// <summary>
-        /// Reads a 64-bit little-endian integer from the stream.
-        /// </summary>
-        internal ulong ReadRawLittleEndian64()
-        {
-            var span = new ReadOnlySpan<byte>(buffer);
-            return ParsingPrimitives.ParseRawLittleEndian64(ref span, ref state);
-        }
-        #endregion
-
-        #region Internal reading and buffer management
-
-        /// <summary>
-        /// Sets currentLimit to (current position) + byteLimit. This is called
-        /// when descending into a length-delimited embedded message. The previous
-        /// limit is returned.
-        /// </summary>
-        /// <returns>The old limit.</returns>
-        internal int PushLimit(int byteLimit)
-        {
-            return SegmentedBufferHelper.PushLimit(ref state, byteLimit);
-        }
-
-        /// <summary>
-        /// Discards the current limit, returning the previous limit.
-        /// </summary>
-        internal void PopLimit(int oldLimit)
-        {
-            SegmentedBufferHelper.PopLimit(ref state, oldLimit);
-        }
-
-        /// <summary>
-        /// Returns whether or not all the data before the limit has been read.
-        /// </summary>
-        /// <returns></returns>
-        internal bool ReachedLimit
-        {
-            get
-            {
-                return SegmentedBufferHelper.IsReachedLimit(ref state);
-            }
-        }
-
-        /// <summary>
-        /// Returns true if the stream has reached the end of the input. This is the
-        /// case if either the end of the underlying input source has been reached or
-        /// the stream has reached a limit created using PushLimit.
-        /// </summary>
-        public bool IsAtEnd
-        {
-            get
-            {
-                var span = new ReadOnlySpan<byte>(buffer);
-                return SegmentedBufferHelper.IsAtEnd(ref span, ref state);
-            }
-        }
-
-        /// <summary>
-        /// Called when buffer is empty to read more bytes from the
-        /// input.  If <paramref name="mustSucceed"/> is true, RefillBuffer() guarantees that
-        /// either there will be at least one byte in the buffer when it returns
-        /// or it will throw an exception.  If <paramref name="mustSucceed"/> is false,
-        /// RefillBuffer() returns false if no more bytes were available.
-        /// </summary>
-        /// <param name="mustSucceed"></param>
-        /// <returns></returns>
-        private bool RefillBuffer(bool mustSucceed)
-        {
-            var span = new ReadOnlySpan<byte>(buffer);
-            return state.segmentedBufferHelper.RefillBuffer(ref span, ref state, mustSucceed);
-        }
-
-        /// <summary>
-        /// Reads a fixed size of bytes from the input.
-        /// </summary>
-        /// <exception cref="InvalidProtocolBufferException">
-        /// the end of the stream or the current limit was reached
-        /// </exception>
-        internal byte[] ReadRawBytes(int size)
-        {
-            var span = new ReadOnlySpan<byte>(buffer);
-            return ParsingPrimitives.ReadRawBytes(ref span, ref state, size);
-        }
-
-        /// <summary>
-        /// Reads a top-level message or a nested message after the limits for this message have been pushed.
-        /// (parser will proceed until the end of the current limit)
-        /// NOTE: this method needs to be public because it's invoked by the generated code - e.g. msg.MergeFrom(CodedInputStream input) method
-        /// </summary>
-        public void ReadRawMessage(IMessage message)
-        {
-            ParseContext.Initialize(this, out ParseContext ctx);
-            try
-            {
-                ParsingPrimitivesMessages.ReadRawMessage(ref ctx, message);
-            }
-            finally
-            {
-                ctx.CopyStateTo(this);
-            }
-        }
-#endregion
-    }
-}
diff --git a/libs/protobuf/csharp/src/Google.Protobuf/CodedOutputStream.ComputeSize.cs b/libs/protobuf/csharp/src/Google.Protobuf/CodedOutputStream.ComputeSize.cs
deleted file mode 100644
index 6f18afb..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf/CodedOutputStream.ComputeSize.cs
+++ /dev/null
@@ -1,308 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-
-namespace Google.Protobuf
-{
-    // This part of CodedOutputStream provides all the static entry points that are used
-    // by generated code and internally to compute the size of messages prior to being
-    // written to an instance of CodedOutputStream.
-    public sealed partial class CodedOutputStream
-    {
-        private const int LittleEndian64Size = 8;
-        private const int LittleEndian32Size = 4;        
-
-        internal const int DoubleSize = LittleEndian64Size;
-        internal const int FloatSize = LittleEndian32Size;
-        internal const int BoolSize = 1;
-
-        /// <summary>
-        /// Computes the number of bytes that would be needed to encode a
-        /// double field, including the tag.
-        /// </summary>
-        public static int ComputeDoubleSize(double value)
-        {
-            return DoubleSize;
-        }
-
-        /// <summary>
-        /// Computes the number of bytes that would be needed to encode a
-        /// float field, including the tag.
-        /// </summary>
-        public static int ComputeFloatSize(float value)
-        {
-            return FloatSize;
-        }
-
-        /// <summary>
-        /// Computes the number of bytes that would be needed to encode a
-        /// uint64 field, including the tag.
-        /// </summary>
-        public static int ComputeUInt64Size(ulong value)
-        {
-            return ComputeRawVarint64Size(value);
-        }
-
-        /// <summary>
-        /// Computes the number of bytes that would be needed to encode an
-        /// int64 field, including the tag.
-        /// </summary>
-        public static int ComputeInt64Size(long value)
-        {
-            return ComputeRawVarint64Size((ulong) value);
-        }
-
-        /// <summary>
-        /// Computes the number of bytes that would be needed to encode an
-        /// int32 field, including the tag.
-        /// </summary>
-        public static int ComputeInt32Size(int value)
-        {
-            if (value >= 0)
-            {
-                return ComputeRawVarint32Size((uint) value);
-            }
-            else
-            {
-                // Must sign-extend.
-                return 10;
-            }
-        }
-
-        /// <summary>
-        /// Computes the number of bytes that would be needed to encode a
-        /// fixed64 field, including the tag.
-        /// </summary>
-        public static int ComputeFixed64Size(ulong value)
-        {
-            return LittleEndian64Size;
-        }
-
-        /// <summary>
-        /// Computes the number of bytes that would be needed to encode a
-        /// fixed32 field, including the tag.
-        /// </summary>
-        public static int ComputeFixed32Size(uint value)
-        {
-            return LittleEndian32Size;
-        }
-
-        /// <summary>
-        /// Computes the number of bytes that would be needed to encode a
-        /// bool field, including the tag.
-        /// </summary>
-        public static int ComputeBoolSize(bool value)
-        {
-            return BoolSize;
-        }
-
-        /// <summary>
-        /// Computes the number of bytes that would be needed to encode a
-        /// string field, including the tag.
-        /// </summary>
-        public static int ComputeStringSize(String value)
-        {
-            int byteArraySize = WritingPrimitives.Utf8Encoding.GetByteCount(value);
-            return ComputeLengthSize(byteArraySize) + byteArraySize;
-        }
-
-        /// <summary>
-        /// Computes the number of bytes that would be needed to encode a
-        /// group field, including the tag.
-        /// </summary>
-        public static int ComputeGroupSize(IMessage value)
-        {
-            return value.CalculateSize();
-        }
-
-        /// <summary>
-        /// Computes the number of bytes that would be needed to encode an
-        /// embedded message field, including the tag.
-        /// </summary>
-        public static int ComputeMessageSize(IMessage value)
-        {
-            int size = value.CalculateSize();
-            return ComputeLengthSize(size) + size;
-        }
-
-        /// <summary>
-        /// Computes the number of bytes that would be needed to encode a
-        /// bytes field, including the tag.
-        /// </summary>
-        public static int ComputeBytesSize(ByteString value)
-        {
-            return ComputeLengthSize(value.Length) + value.Length;
-        }
-
-        /// <summary>
-        /// Computes the number of bytes that would be needed to encode a
-        /// uint32 field, including the tag.
-        /// </summary>
-        public static int ComputeUInt32Size(uint value)
-        {
-            return ComputeRawVarint32Size(value);
-        }
-
-        /// <summary>
-        /// Computes the number of bytes that would be needed to encode a
-        /// enum field, including the tag. The caller is responsible for
-        /// converting the enum value to its numeric value.
-        /// </summary>
-        public static int ComputeEnumSize(int value)
-        {
-            // Currently just a pass-through, but it's nice to separate it logically.
-            return ComputeInt32Size(value);
-        }
-
-        /// <summary>
-        /// Computes the number of bytes that would be needed to encode an
-        /// sfixed32 field, including the tag.
-        /// </summary>
-        public static int ComputeSFixed32Size(int value)
-        {
-            return LittleEndian32Size;
-        }
-
-        /// <summary>
-        /// Computes the number of bytes that would be needed to encode an
-        /// sfixed64 field, including the tag.
-        /// </summary>
-        public static int ComputeSFixed64Size(long value)
-        {
-            return LittleEndian64Size;
-        }
-
-        /// <summary>
-        /// Computes the number of bytes that would be needed to encode an
-        /// sint32 field, including the tag.
-        /// </summary>
-        public static int ComputeSInt32Size(int value)
-        {
-            return ComputeRawVarint32Size(WritingPrimitives.EncodeZigZag32(value));
-        }
-
-        /// <summary>
-        /// Computes the number of bytes that would be needed to encode an
-        /// sint64 field, including the tag.
-        /// </summary>
-        public static int ComputeSInt64Size(long value)
-        {
-            return ComputeRawVarint64Size(WritingPrimitives.EncodeZigZag64(value));
-        }
-
-        /// <summary>
-        /// Computes the number of bytes that would be needed to encode a length,
-        /// as written by <see cref="WriteLength"/>.
-        /// </summary>
-        public static int ComputeLengthSize(int length)
-        {
-            return ComputeRawVarint32Size((uint) length);
-        }
-
-        /// <summary>
-        /// Computes the number of bytes that would be needed to encode a varint.
-        /// </summary>
-        public static int ComputeRawVarint32Size(uint value)
-        {
-            if ((value & (0xffffffff << 7)) == 0)
-            {
-                return 1;
-            }
-            if ((value & (0xffffffff << 14)) == 0)
-            {
-                return 2;
-            }
-            if ((value & (0xffffffff << 21)) == 0)
-            {
-                return 3;
-            }
-            if ((value & (0xffffffff << 28)) == 0)
-            {
-                return 4;
-            }
-            return 5;
-        }
-
-        /// <summary>
-        /// Computes the number of bytes that would be needed to encode a varint.
-        /// </summary>
-        public static int ComputeRawVarint64Size(ulong value)
-        {
-            if ((value & (0xffffffffffffffffL << 7)) == 0)
-            {
-                return 1;
-            }
-            if ((value & (0xffffffffffffffffL << 14)) == 0)
-            {
-                return 2;
-            }
-            if ((value & (0xffffffffffffffffL << 21)) == 0)
-            {
-                return 3;
-            }
-            if ((value & (0xffffffffffffffffL << 28)) == 0)
-            {
-                return 4;
-            }
-            if ((value & (0xffffffffffffffffL << 35)) == 0)
-            {
-                return 5;
-            }
-            if ((value & (0xffffffffffffffffL << 42)) == 0)
-            {
-                return 6;
-            }
-            if ((value & (0xffffffffffffffffL << 49)) == 0)
-            {
-                return 7;
-            }
-            if ((value & (0xffffffffffffffffL << 56)) == 0)
-            {
-                return 8;
-            }
-            if ((value & (0xffffffffffffffffL << 63)) == 0)
-            {
-                return 9;
-            }
-            return 10;
-        }
-
-        /// <summary>
-        /// Computes the number of bytes that would be needed to encode a tag.
-        /// </summary>
-        public static int ComputeTagSize(int fieldNumber)
-        {
-            return ComputeRawVarint32Size(WireFormat.MakeTag(fieldNumber, 0));
-        }
-    }
-}
\ No newline at end of file
diff --git a/libs/protobuf/csharp/src/Google.Protobuf/CodedOutputStream.cs b/libs/protobuf/csharp/src/Google.Protobuf/CodedOutputStream.cs
deleted file mode 100644
index 5b8cca1..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf/CodedOutputStream.cs
+++ /dev/null
@@ -1,607 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using Google.Protobuf.Collections;
-using System;
-using System.IO;
-using System.Security;
-using System.Text;
-
-namespace Google.Protobuf
-{
-    /// <summary>
-    /// Encodes and writes protocol message fields.
-    /// </summary>
-    /// <remarks>
-    /// <para>
-    /// This class is generally used by generated code to write appropriate
-    /// primitives to the stream. It effectively encapsulates the lowest
-    /// levels of protocol buffer format. Unlike some other implementations,
-    /// this does not include combined "write tag and value" methods. Generated
-    /// code knows the exact byte representations of the tags they're going to write,
-    /// so there's no need to re-encode them each time. Manually-written code calling
-    /// this class should just call one of the <c>WriteTag</c> overloads before each value.
-    /// </para>
-    /// <para>
-    /// Repeated fields and map fields are not handled by this class; use <c>RepeatedField&lt;T&gt;</c>
-    /// and <c>MapField&lt;TKey, TValue&gt;</c> to serialize such fields.
-    /// </para>
-    /// </remarks>
-    [SecuritySafeCritical]
-    public sealed partial class CodedOutputStream : IDisposable
-    {
-        /// <summary>
-        /// The buffer size used by CreateInstance(Stream).
-        /// </summary>
-        public static readonly int DefaultBufferSize = 4096;
-
-        private readonly bool leaveOpen;
-        private readonly byte[] buffer;
-        private WriterInternalState state;
-
-        private readonly Stream output;
-
-        #region Construction
-        /// <summary>
-        /// Creates a new CodedOutputStream that writes directly to the given
-        /// byte array. If more bytes are written than fit in the array,
-        /// OutOfSpaceException will be thrown.
-        /// </summary>
-        public CodedOutputStream(byte[] flatArray) : this(flatArray, 0, flatArray.Length)
-        {
-        }
-
-        /// <summary>
-        /// Creates a new CodedOutputStream that writes directly to the given
-        /// byte array slice. If more bytes are written than fit in the array,
-        /// OutOfSpaceException will be thrown.
-        /// </summary>
-        private CodedOutputStream(byte[] buffer, int offset, int length)
-        {
-            this.output = null;
-            this.buffer = ProtoPreconditions.CheckNotNull(buffer, nameof(buffer));
-            this.state.position = offset;
-            this.state.limit = offset + length;
-            WriteBufferHelper.Initialize(this, out this.state.writeBufferHelper);
-            leaveOpen = true; // Simple way of avoiding trying to dispose of a null reference
-        }
-
-        private CodedOutputStream(Stream output, byte[] buffer, bool leaveOpen)
-        {
-            this.output = ProtoPreconditions.CheckNotNull(output, nameof(output));
-            this.buffer = buffer;
-            this.state.position = 0;
-            this.state.limit = buffer.Length;
-            WriteBufferHelper.Initialize(this, out this.state.writeBufferHelper);
-            this.leaveOpen = leaveOpen;
-        }
-
-        /// <summary>
-        /// Creates a new <see cref="CodedOutputStream" /> which write to the given stream, and disposes of that
-        /// stream when the returned <c>CodedOutputStream</c> is disposed.
-        /// </summary>
-        /// <param name="output">The stream to write to. It will be disposed when the returned <c>CodedOutputStream is disposed.</c></param>
-        public CodedOutputStream(Stream output) : this(output, DefaultBufferSize, false)
-        {
-        }
-
-        /// <summary>
-        /// Creates a new CodedOutputStream which write to the given stream and uses
-        /// the specified buffer size.
-        /// </summary>
-        /// <param name="output">The stream to write to. It will be disposed when the returned <c>CodedOutputStream is disposed.</c></param>
-        /// <param name="bufferSize">The size of buffer to use internally.</param>
-        public CodedOutputStream(Stream output, int bufferSize) : this(output, new byte[bufferSize], false)
-        {
-        }
-
-        /// <summary>
-        /// Creates a new CodedOutputStream which write to the given stream.
-        /// </summary>
-        /// <param name="output">The stream to write to.</param>
-        /// <param name="leaveOpen">If <c>true</c>, <paramref name="output"/> is left open when the returned <c>CodedOutputStream</c> is disposed;
-        /// if <c>false</c>, the provided stream is disposed as well.</param>
-        public CodedOutputStream(Stream output, bool leaveOpen) : this(output, DefaultBufferSize, leaveOpen)
-        {
-        }
-
-        /// <summary>
-        /// Creates a new CodedOutputStream which write to the given stream and uses
-        /// the specified buffer size.
-        /// </summary>
-        /// <param name="output">The stream to write to.</param>
-        /// <param name="bufferSize">The size of buffer to use internally.</param>
-        /// <param name="leaveOpen">If <c>true</c>, <paramref name="output"/> is left open when the returned <c>CodedOutputStream</c> is disposed;
-        /// if <c>false</c>, the provided stream is disposed as well.</param>
-        public CodedOutputStream(Stream output, int bufferSize, bool leaveOpen) : this(output, new byte[bufferSize], leaveOpen)
-        {
-        }
-        #endregion
-
-        /// <summary>
-        /// Returns the current position in the stream, or the position in the output buffer
-        /// </summary>
-        public long Position
-        {
-            get
-            {
-                if (output != null)
-                {
-                    return output.Position + state.position;
-                }
-                return state.position;
-            }
-        }
-
-        #region Writing of values (not including tags)
-
-        /// <summary>
-        /// Writes a double field value, without a tag, to the stream.
-        /// </summary>
-        /// <param name="value">The value to write</param>
-        public void WriteDouble(double value)
-        {
-            var span = new Span<byte>(buffer);
-            WritingPrimitives.WriteDouble(ref span, ref state, value);
-        }
-
-        /// <summary>
-        /// Writes a float field value, without a tag, to the stream.
-        /// </summary>
-        /// <param name="value">The value to write</param>
-        public void WriteFloat(float value)
-        {
-            var span = new Span<byte>(buffer);
-            WritingPrimitives.WriteFloat(ref span, ref state, value);
-        }
-
-        /// <summary>
-        /// Writes a uint64 field value, without a tag, to the stream.
-        /// </summary>
-        /// <param name="value">The value to write</param>
-        public void WriteUInt64(ulong value)
-        {
-            var span = new Span<byte>(buffer);
-            WritingPrimitives.WriteUInt64(ref span, ref state, value);
-        }
-
-        /// <summary>
-        /// Writes an int64 field value, without a tag, to the stream.
-        /// </summary>
-        /// <param name="value">The value to write</param>
-        public void WriteInt64(long value)
-        {
-            var span = new Span<byte>(buffer);
-            WritingPrimitives.WriteInt64(ref span, ref state, value);
-        }
-
-        /// <summary>
-        /// Writes an int32 field value, without a tag, to the stream.
-        /// </summary>
-        /// <param name="value">The value to write</param>
-        public void WriteInt32(int value)
-        {
-            var span = new Span<byte>(buffer);
-            WritingPrimitives.WriteInt32(ref span, ref state, value);
-        }
-
-        /// <summary>
-        /// Writes a fixed64 field value, without a tag, to the stream.
-        /// </summary>
-        /// <param name="value">The value to write</param>
-        public void WriteFixed64(ulong value)
-        {
-            var span = new Span<byte>(buffer);
-            WritingPrimitives.WriteFixed64(ref span, ref state, value);
-        }
-
-        /// <summary>
-        /// Writes a fixed32 field value, without a tag, to the stream.
-        /// </summary>
-        /// <param name="value">The value to write</param>
-        public void WriteFixed32(uint value)
-        {
-            var span = new Span<byte>(buffer);
-            WritingPrimitives.WriteFixed32(ref span, ref state, value);
-        }
-
-        /// <summary>
-        /// Writes a bool field value, without a tag, to the stream.
-        /// </summary>
-        /// <param name="value">The value to write</param>
-        public void WriteBool(bool value)
-        {
-            var span = new Span<byte>(buffer);
-            WritingPrimitives.WriteBool(ref span, ref state, value);
-        }
-
-        /// <summary>
-        /// Writes a string field value, without a tag, to the stream.
-        /// The data is length-prefixed.
-        /// </summary>
-        /// <param name="value">The value to write</param>
-        public void WriteString(string value)
-        {
-            var span = new Span<byte>(buffer);
-            WritingPrimitives.WriteString(ref span, ref state, value);
-        }
-
-        /// <summary>
-        /// Writes a message, without a tag, to the stream.
-        /// The data is length-prefixed.
-        /// </summary>
-        /// <param name="value">The value to write</param>
-        public void WriteMessage(IMessage value)
-        {
-            // TODO(jtattermusch): if the message doesn't implement IBufferMessage (and thus does not provide the InternalWriteTo method),
-            // what we're doing here works fine, but could be more efficient.
-            // For now, this inefficiency is fine, considering this is only a backward-compatibility scenario (and regenerating the code fixes it).
-            var span = new Span<byte>(buffer);
-            WriteContext.Initialize(ref span, ref state, out WriteContext ctx);
-            try
-            {
-                WritingPrimitivesMessages.WriteMessage(ref ctx, value);
-            }
-            finally
-            {
-                ctx.CopyStateTo(this);
-            }
-        }
-
-        /// <summary>
-        /// Writes a message, without a tag, to the stream.
-        /// Only the message data is written, without a length-delimiter.
-        /// </summary>
-        /// <param name="value">The value to write</param>
-        public void WriteRawMessage(IMessage value)
-        {
-            // TODO(jtattermusch): if the message doesn't implement IBufferMessage (and thus does not provide the InternalWriteTo method),
-            // what we're doing here works fine, but could be more efficient.
-            // For now, this inefficiency is fine, considering this is only a backward-compatibility scenario (and regenerating the code fixes it).
-            var span = new Span<byte>(buffer);
-            WriteContext.Initialize(ref span, ref state, out WriteContext ctx);
-            try
-            {
-                WritingPrimitivesMessages.WriteRawMessage(ref ctx, value);
-            }
-            finally
-            {
-                ctx.CopyStateTo(this);
-            }
-        }
-
-        /// <summary>
-        /// Writes a group, without a tag, to the stream.
-        /// </summary>
-        /// <param name="value">The value to write</param>
-        public void WriteGroup(IMessage value)
-        {
-            var span = new Span<byte>(buffer);
-            WriteContext.Initialize(ref span, ref state, out WriteContext ctx);
-            try
-            {
-                WritingPrimitivesMessages.WriteGroup(ref ctx, value);
-            }
-            finally
-            {
-                ctx.CopyStateTo(this);
-            }
-        }
-
-        /// <summary>
-        /// Write a byte string, without a tag, to the stream.
-        /// The data is length-prefixed.
-        /// </summary>
-        /// <param name="value">The value to write</param>
-        public void WriteBytes(ByteString value)
-        {
-            var span = new Span<byte>(buffer);
-            WritingPrimitives.WriteBytes(ref span, ref state, value);
-        }
-
-        /// <summary>
-        /// Writes a uint32 value, without a tag, to the stream.
-        /// </summary>
-        /// <param name="value">The value to write</param>
-        public void WriteUInt32(uint value)
-        {
-            var span = new Span<byte>(buffer);
-            WritingPrimitives.WriteUInt32(ref span, ref state, value);
-        }
-
-        /// <summary>
-        /// Writes an enum value, without a tag, to the stream.
-        /// </summary>
-        /// <param name="value">The value to write</param>
-        public void WriteEnum(int value)
-        {
-            var span = new Span<byte>(buffer);
-            WritingPrimitives.WriteEnum(ref span, ref state, value);
-        }
-
-        /// <summary>
-        /// Writes an sfixed32 value, without a tag, to the stream.
-        /// </summary>
-        /// <param name="value">The value to write.</param>
-        public void WriteSFixed32(int value)
-        {
-            var span = new Span<byte>(buffer);
-            WritingPrimitives.WriteSFixed32(ref span, ref state, value);
-        }
-
-        /// <summary>
-        /// Writes an sfixed64 value, without a tag, to the stream.
-        /// </summary>
-        /// <param name="value">The value to write</param>
-        public void WriteSFixed64(long value)
-        {
-            var span = new Span<byte>(buffer);
-            WritingPrimitives.WriteSFixed64(ref span, ref state, value);
-        }
-
-        /// <summary>
-        /// Writes an sint32 value, without a tag, to the stream.
-        /// </summary>
-        /// <param name="value">The value to write</param>
-        public void WriteSInt32(int value)
-        {
-            var span = new Span<byte>(buffer);
-            WritingPrimitives.WriteSInt32(ref span, ref state, value);
-        }
-
-        /// <summary>
-        /// Writes an sint64 value, without a tag, to the stream.
-        /// </summary>
-        /// <param name="value">The value to write</param>
-        public void WriteSInt64(long value)
-        {
-            var span = new Span<byte>(buffer);
-            WritingPrimitives.WriteSInt64(ref span, ref state, value);
-        }
-
-        /// <summary>
-        /// Writes a length (in bytes) for length-delimited data.
-        /// </summary>
-        /// <remarks>
-        /// This method simply writes a rawint, but exists for clarity in calling code.
-        /// </remarks>
-        /// <param name="length">Length value, in bytes.</param>
-        public void WriteLength(int length)
-        {
-            var span = new Span<byte>(buffer);
-            WritingPrimitives.WriteLength(ref span, ref state, length);
-        }
-
-        #endregion
-
-        #region Raw tag writing
-        /// <summary>
-        /// Encodes and writes a tag.
-        /// </summary>
-        /// <param name="fieldNumber">The number of the field to write the tag for</param>
-        /// <param name="type">The wire format type of the tag to write</param>
-        public void WriteTag(int fieldNumber, WireFormat.WireType type)
-        {
-            var span = new Span<byte>(buffer);
-            WritingPrimitives.WriteTag(ref span, ref state, fieldNumber, type);
-        }
-
-        /// <summary>
-        /// Writes an already-encoded tag.
-        /// </summary>
-        /// <param name="tag">The encoded tag</param>
-        public void WriteTag(uint tag)
-        {
-            var span = new Span<byte>(buffer);
-            WritingPrimitives.WriteTag(ref span, ref state, tag);
-        }
-
-        /// <summary>
-        /// Writes the given single-byte tag directly to the stream.
-        /// </summary>
-        /// <param name="b1">The encoded tag</param>
-        public void WriteRawTag(byte b1)
-        {
-            var span = new Span<byte>(buffer);
-            WritingPrimitives.WriteRawTag(ref span, ref state, b1);
-        }
-
-        /// <summary>
-        /// Writes the given two-byte tag directly to the stream.
-        /// </summary>
-        /// <param name="b1">The first byte of the encoded tag</param>
-        /// <param name="b2">The second byte of the encoded tag</param>
-        public void WriteRawTag(byte b1, byte b2)
-        {
-            var span = new Span<byte>(buffer);
-            WritingPrimitives.WriteRawTag(ref span, ref state, b1, b2);
-        }
-
-        /// <summary>
-        /// Writes the given three-byte tag directly to the stream.
-        /// </summary>
-        /// <param name="b1">The first byte of the encoded tag</param>
-        /// <param name="b2">The second byte of the encoded tag</param>
-        /// <param name="b3">The third byte of the encoded tag</param>
-        public void WriteRawTag(byte b1, byte b2, byte b3)
-        {
-            var span = new Span<byte>(buffer);
-            WritingPrimitives.WriteRawTag(ref span, ref state, b1, b2, b3);
-        }
-
-        /// <summary>
-        /// Writes the given four-byte tag directly to the stream.
-        /// </summary>
-        /// <param name="b1">The first byte of the encoded tag</param>
-        /// <param name="b2">The second byte of the encoded tag</param>
-        /// <param name="b3">The third byte of the encoded tag</param>
-        /// <param name="b4">The fourth byte of the encoded tag</param>
-        public void WriteRawTag(byte b1, byte b2, byte b3, byte b4)
-        {
-            var span = new Span<byte>(buffer);
-            WritingPrimitives.WriteRawTag(ref span, ref state, b1, b2, b3, b4);
-        }
-
-        /// <summary>
-        /// Writes the given five-byte tag directly to the stream.
-        /// </summary>
-        /// <param name="b1">The first byte of the encoded tag</param>
-        /// <param name="b2">The second byte of the encoded tag</param>
-        /// <param name="b3">The third byte of the encoded tag</param>
-        /// <param name="b4">The fourth byte of the encoded tag</param>
-        /// <param name="b5">The fifth byte of the encoded tag</param>
-        public void WriteRawTag(byte b1, byte b2, byte b3, byte b4, byte b5)
-        {
-            var span = new Span<byte>(buffer);
-            WritingPrimitives.WriteRawTag(ref span, ref state, b1, b2, b3, b4, b5);
-        }
-        #endregion
-
-        #region Underlying writing primitives
-        
-        /// <summary>
-        /// Writes a 32 bit value as a varint. The fast route is taken when
-        /// there's enough buffer space left to whizz through without checking
-        /// for each byte; otherwise, we resort to calling WriteRawByte each time.
-        /// </summary>
-        internal void WriteRawVarint32(uint value)
-        {
-            var span = new Span<byte>(buffer);
-            WritingPrimitives.WriteRawVarint32(ref span, ref state, value);
-        }
-
-        internal void WriteRawVarint64(ulong value)
-        {
-            var span = new Span<byte>(buffer);
-            WritingPrimitives.WriteRawVarint64(ref span, ref state, value);
-        }
-
-        internal void WriteRawLittleEndian32(uint value)
-        {
-            var span = new Span<byte>(buffer);
-            WritingPrimitives.WriteRawLittleEndian32(ref span, ref state, value);
-        }
-
-        internal void WriteRawLittleEndian64(ulong value)
-        {
-            var span = new Span<byte>(buffer);
-            WritingPrimitives.WriteRawLittleEndian64(ref span, ref state, value);
-        }
-
-        /// <summary>
-        /// Writes out an array of bytes.
-        /// </summary>
-        internal void WriteRawBytes(byte[] value)
-        {
-            WriteRawBytes(value, 0, value.Length);
-        }
-
-        /// <summary>
-        /// Writes out part of an array of bytes.
-        /// </summary>
-        internal void WriteRawBytes(byte[] value, int offset, int length)
-        {
-            var span = new Span<byte>(buffer);
-            WritingPrimitives.WriteRawBytes(ref span, ref state, value, offset, length);
-        }
-
-        #endregion
-
-        /// <summary>
-        /// Indicates that a CodedOutputStream wrapping a flat byte array
-        /// ran out of space.
-        /// </summary>
-        public sealed class OutOfSpaceException : IOException
-        {
-            internal OutOfSpaceException()
-                : base("CodedOutputStream was writing to a flat byte array and ran out of space.")
-            {
-            }
-        }
-
-        /// <summary>
-        /// Flushes any buffered data and optionally closes the underlying stream, if any.
-        /// </summary>
-        /// <remarks>
-        /// <para>
-        /// By default, any underlying stream is closed by this method. To configure this behaviour,
-        /// use a constructor overload with a <c>leaveOpen</c> parameter. If this instance does not
-        /// have an underlying stream, this method does nothing.
-        /// </para>
-        /// <para>
-        /// For the sake of efficiency, calling this method does not prevent future write calls - but
-        /// if a later write ends up writing to a stream which has been disposed, that is likely to
-        /// fail. It is recommend that you not call any other methods after this.
-        /// </para>
-        /// </remarks>
-        public void Dispose()
-        {
-            Flush();
-            if (!leaveOpen)
-            {
-                output.Dispose();
-            }
-        }
-
-        /// <summary>
-        /// Flushes any buffered data to the underlying stream (if there is one).
-        /// </summary>
-        public void Flush()
-        {
-            var span = new Span<byte>(buffer);
-            WriteBufferHelper.Flush(ref span, ref state);
-        }
-
-        /// <summary>
-        /// Verifies that SpaceLeft returns zero. It's common to create a byte array
-        /// that is exactly big enough to hold a message, then write to it with
-        /// a CodedOutputStream. Calling CheckNoSpaceLeft after writing verifies that
-        /// the message was actually as big as expected, which can help finding bugs.
-        /// </summary>
-        public void CheckNoSpaceLeft()
-        {
-            WriteBufferHelper.CheckNoSpaceLeft(ref state);
-        }
-
-        /// <summary>
-        /// If writing to a flat array, returns the space left in the array. Otherwise,
-        /// throws an InvalidOperationException.
-        /// </summary>
-        public int SpaceLeft => WriteBufferHelper.GetSpaceLeft(ref state);
-
-        internal byte[] InternalBuffer => buffer;
-
-        internal Stream InternalOutputStream => output;
-
-        internal ref WriterInternalState InternalState => ref state;
-    }
-}
diff --git a/libs/protobuf/csharp/src/Google.Protobuf/Collections/Lists.cs b/libs/protobuf/csharp/src/Google.Protobuf/Collections/Lists.cs
deleted file mode 100644
index 860795c..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf/Collections/Lists.cs
+++ /dev/null
@@ -1,89 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2017 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-
-namespace Google.Protobuf.Collections
-{
-    /// <summary>
-    /// Utility to compare if two Lists are the same, and the hash code
-    /// of a List.
-    /// </summary>
-    public static class Lists
-    {
-        /// <summary>
-        /// Checks if two lists are equal.
-        /// </summary>
-        public static bool Equals<T>(List<T> left, List<T> right)
-        {
-            if (left == right)
-            {
-                return true;
-            }
-            if (left == null || right == null)
-            {
-                return false;
-            }
-            if (left.Count != right.Count)
-            {
-                return false;
-            }
-            IEqualityComparer<T> comparer = EqualityComparer<T>.Default;
-            for (int i = 0; i < left.Count; i++)
-            {
-                if (!comparer.Equals(left[i], right[i]))
-                {
-                    return false;
-                }
-            }
-            return true;
-        }
-
-        /// <summary>
-        /// Gets the list's hash code.
-        /// </summary>
-        public static int GetHashCode<T>(List<T> list)
-        {
-            if (list == null)
-            {
-                return 0;
-            }
-            int hash = 31;
-            foreach (T element in list)
-            {
-                hash = hash * 29 + element.GetHashCode();
-            }
-            return hash;
-        }
-    }
-}
\ No newline at end of file
diff --git a/libs/protobuf/csharp/src/Google.Protobuf/Collections/MapField.cs b/libs/protobuf/csharp/src/Google.Protobuf/Collections/MapField.cs
deleted file mode 100644
index e5217f4..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf/Collections/MapField.cs
+++ /dev/null
@@ -1,762 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using Google.Protobuf.Compatibility;
-using Google.Protobuf.Reflection;
-using System;
-using System.Buffers;
-using System.Collections;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Security;
-
-namespace Google.Protobuf.Collections
-{
-    /// <summary>
-    /// Representation of a map field in a Protocol Buffer message.
-    /// </summary>
-    /// <typeparam name="TKey">Key type in the map. Must be a type supported by Protocol Buffer map keys.</typeparam>
-    /// <typeparam name="TValue">Value type in the map. Must be a type supported by Protocol Buffers.</typeparam>
-    /// <remarks>
-    /// <para>
-    /// For string keys, the equality comparison is provided by <see cref="StringComparer.Ordinal" />.
-    /// </para>
-    /// <para>
-    /// Null values are not permitted in the map, either for wrapper types or regular messages.
-    /// If a map is deserialized from a data stream and the value is missing from an entry, a default value
-    /// is created instead. For primitive types, that is the regular default value (0, the empty string and so
-    /// on); for message types, an empty instance of the message is created, as if the map entry contained a 0-length
-    /// encoded value for the field.
-    /// </para>
-    /// <para>
-    /// This implementation does not generally prohibit the use of key/value types which are not
-    /// supported by Protocol Buffers (e.g. using a key type of <code>byte</code>) but nor does it guarantee
-    /// that all operations will work in such cases.
-    /// </para>
-    /// <para>
-    /// The order in which entries are returned when iterating over this object is undefined, and may change
-    /// in future versions.
-    /// </para>
-    /// </remarks>
-    public sealed class MapField<TKey, TValue> : IDeepCloneable<MapField<TKey, TValue>>, IDictionary<TKey, TValue>, IEquatable<MapField<TKey, TValue>>, IDictionary
-#if !NET35
-        , IReadOnlyDictionary<TKey, TValue>
-#endif
-    {
-        private static readonly EqualityComparer<TValue> ValueEqualityComparer = ProtobufEqualityComparers.GetEqualityComparer<TValue>();
-        private static readonly EqualityComparer<TKey> KeyEqualityComparer = ProtobufEqualityComparers.GetEqualityComparer<TKey>();
-
-        // TODO: Don't create the map/list until we have an entry. (Assume many maps will be empty.)
-        private readonly Dictionary<TKey, LinkedListNode<KeyValuePair<TKey, TValue>>> map =
-            new Dictionary<TKey, LinkedListNode<KeyValuePair<TKey, TValue>>>(KeyEqualityComparer);
-        private readonly LinkedList<KeyValuePair<TKey, TValue>> list = new LinkedList<KeyValuePair<TKey, TValue>>();
-
-        /// <summary>
-        /// Creates a deep clone of this object.
-        /// </summary>
-        /// <returns>
-        /// A deep clone of this object.
-        /// </returns>
-        public MapField<TKey, TValue> Clone()
-        {
-            var clone = new MapField<TKey, TValue>();
-            // Keys are never cloneable. Values might be.
-            if (typeof(IDeepCloneable<TValue>).IsAssignableFrom(typeof(TValue)))
-            {
-                foreach (var pair in list)
-                {
-                    clone.Add(pair.Key, ((IDeepCloneable<TValue>)pair.Value).Clone());
-                }
-            }
-            else
-            {
-                // Nothing is cloneable, so we don't need to worry.
-                clone.Add(this);
-            }
-            return clone;
-        }
-
-        /// <summary>
-        /// Adds the specified key/value pair to the map.
-        /// </summary>
-        /// <remarks>
-        /// This operation fails if the key already exists in the map. To replace an existing entry, use the indexer.
-        /// </remarks>
-        /// <param name="key">The key to add</param>
-        /// <param name="value">The value to add.</param>
-        /// <exception cref="System.ArgumentException">The given key already exists in map.</exception>
-        public void Add(TKey key, TValue value)
-        {
-            // Validation of arguments happens in ContainsKey and the indexer
-            if (ContainsKey(key))
-            {
-                throw new ArgumentException("Key already exists in map", nameof(key));
-            }
-            this[key] = value;
-        }
-
-        /// <summary>
-        /// Determines whether the specified key is present in the map.
-        /// </summary>
-        /// <param name="key">The key to check.</param>
-        /// <returns><c>true</c> if the map contains the given key; <c>false</c> otherwise.</returns>
-        public bool ContainsKey(TKey key)
-        {
-            ProtoPreconditions.CheckNotNullUnconstrained(key, nameof(key));
-            return map.ContainsKey(key);
-        }
-
-        private bool ContainsValue(TValue value) =>
-            list.Any(pair => ValueEqualityComparer.Equals(pair.Value, value));
-
-        /// <summary>
-        /// Removes the entry identified by the given key from the map.
-        /// </summary>
-        /// <param name="key">The key indicating the entry to remove from the map.</param>
-        /// <returns><c>true</c> if the map contained the given key before the entry was removed; <c>false</c> otherwise.</returns>
-        public bool Remove(TKey key)
-        {
-            ProtoPreconditions.CheckNotNullUnconstrained(key, nameof(key));
-            LinkedListNode<KeyValuePair<TKey, TValue>> node;
-            if (map.TryGetValue(key, out node))
-            {
-                map.Remove(key);
-                node.List.Remove(node);
-                return true;
-            }
-            else
-            {
-                return false;
-            }
-        }
-
-        /// <summary>
-        /// Gets the value associated with the specified key.
-        /// </summary>
-        /// <param name="key">The key whose value to get.</param>
-        /// <param name="value">When this method returns, the value associated with the specified key, if the key is found;
-        /// otherwise, the default value for the type of the <paramref name="value"/> parameter.
-        /// This parameter is passed uninitialized.</param>
-        /// <returns><c>true</c> if the map contains an element with the specified key; otherwise, <c>false</c>.</returns>
-        public bool TryGetValue(TKey key, out TValue value)
-        {
-            LinkedListNode<KeyValuePair<TKey, TValue>> node;
-            if (map.TryGetValue(key, out node))
-            {
-                value = node.Value.Value;
-                return true;
-            }
-            else
-            {
-                value = default(TValue);
-                return false;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the value associated with the specified key.
-        /// </summary>
-        /// <param name="key">The key of the value to get or set.</param>
-        /// <exception cref="KeyNotFoundException">The property is retrieved and key does not exist in the collection.</exception>
-        /// <returns>The value associated with the specified key. If the specified key is not found,
-        /// a get operation throws a <see cref="KeyNotFoundException"/>, and a set operation creates a new element with the specified key.</returns>
-        public TValue this[TKey key]
-        {
-            get
-            {
-                ProtoPreconditions.CheckNotNullUnconstrained(key, nameof(key));
-                TValue value;
-                if (TryGetValue(key, out value))
-                {
-                    return value;
-                }
-                throw new KeyNotFoundException();
-            }
-            set
-            {
-                ProtoPreconditions.CheckNotNullUnconstrained(key, nameof(key));
-                // value == null check here is redundant, but avoids boxing.
-                if (value == null)
-                {
-                    ProtoPreconditions.CheckNotNullUnconstrained(value, nameof(value));
-                }
-                LinkedListNode<KeyValuePair<TKey, TValue>> node;
-                var pair = new KeyValuePair<TKey, TValue>(key, value);
-                if (map.TryGetValue(key, out node))
-                {
-                    node.Value = pair;
-                }
-                else
-                {
-                    node = list.AddLast(pair);
-                    map[key] = node;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Gets a collection containing the keys in the map.
-        /// </summary>
-        public ICollection<TKey> Keys { get { return new MapView<TKey>(this, pair => pair.Key, ContainsKey); } }
-
-        /// <summary>
-        /// Gets a collection containing the values in the map.
-        /// </summary>
-        public ICollection<TValue> Values { get { return new MapView<TValue>(this, pair => pair.Value, ContainsValue); } }
-
-        /// <summary>
-        /// Adds the specified entries to the map. The keys and values are not automatically cloned.
-        /// </summary>
-        /// <param name="entries">The entries to add to the map.</param>
-        public void Add(IDictionary<TKey, TValue> entries)
-        {
-            ProtoPreconditions.CheckNotNull(entries, nameof(entries));
-            foreach (var pair in entries)
-            {
-                Add(pair.Key, pair.Value);
-            }
-        }
-
-        /// <summary>
-        /// Returns an enumerator that iterates through the collection.
-        /// </summary>
-        /// <returns>
-        /// An enumerator that can be used to iterate through the collection.
-        /// </returns>
-        public IEnumerator<KeyValuePair<TKey, TValue>> GetEnumerator()
-        {
-            return list.GetEnumerator();
-        }
-
-        /// <summary>
-        /// Returns an enumerator that iterates through a collection.
-        /// </summary>
-        /// <returns>
-        /// An <see cref="T:System.Collections.IEnumerator" /> object that can be used to iterate through the collection.
-        /// </returns>
-        IEnumerator IEnumerable.GetEnumerator()
-        {
-            return GetEnumerator();
-        }
-
-        /// <summary>
-        /// Adds the specified item to the map.
-        /// </summary>
-        /// <param name="item">The item to add to the map.</param>
-        void ICollection<KeyValuePair<TKey, TValue>>.Add(KeyValuePair<TKey, TValue> item)
-        {
-            Add(item.Key, item.Value);
-        }
-
-        /// <summary>
-        /// Removes all items from the map.
-        /// </summary>
-        public void Clear()
-        {
-            list.Clear();
-            map.Clear();
-        }
-
-        /// <summary>
-        /// Determines whether map contains an entry equivalent to the given key/value pair.
-        /// </summary>
-        /// <param name="item">The key/value pair to find.</param>
-        /// <returns></returns>
-        bool ICollection<KeyValuePair<TKey, TValue>>.Contains(KeyValuePair<TKey, TValue> item)
-        {
-            TValue value;
-            return TryGetValue(item.Key, out value) && ValueEqualityComparer.Equals(item.Value, value);
-        }
-
-        /// <summary>
-        /// Copies the key/value pairs in this map to an array.
-        /// </summary>
-        /// <param name="array">The array to copy the entries into.</param>
-        /// <param name="arrayIndex">The index of the array at which to start copying values.</param>
-        void ICollection<KeyValuePair<TKey, TValue>>.CopyTo(KeyValuePair<TKey, TValue>[] array, int arrayIndex)
-        {
-            list.CopyTo(array, arrayIndex);
-        }
-
-        /// <summary>
-        /// Removes the specified key/value pair from the map.
-        /// </summary>
-        /// <remarks>Both the key and the value must be found for the entry to be removed.</remarks>
-        /// <param name="item">The key/value pair to remove.</param>
-        /// <returns><c>true</c> if the key/value pair was found and removed; <c>false</c> otherwise.</returns>
-        bool ICollection<KeyValuePair<TKey, TValue>>.Remove(KeyValuePair<TKey, TValue> item)
-        {
-            if (item.Key == null)
-            {
-                throw new ArgumentException("Key is null", nameof(item));
-            }
-            LinkedListNode<KeyValuePair<TKey, TValue>> node;
-            if (map.TryGetValue(item.Key, out node) &&
-                EqualityComparer<TValue>.Default.Equals(item.Value, node.Value.Value))
-            {
-                map.Remove(item.Key);
-                node.List.Remove(node);
-                return true;
-            }
-            else
-            {
-                return false;
-            }
-        }
-
-        /// <summary>
-        /// Gets the number of elements contained in the map.
-        /// </summary>
-        public int Count { get { return list.Count; } }
-
-        /// <summary>
-        /// Gets a value indicating whether the map is read-only.
-        /// </summary>
-        public bool IsReadOnly { get { return false; } }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object" />, is equal to this instance.
-        /// </summary>
-        /// <param name="other">The <see cref="System.Object" /> to compare with this instance.</param>
-        /// <returns>
-        ///   <c>true</c> if the specified <see cref="System.Object" /> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object other)
-        {
-            return Equals(other as MapField<TKey, TValue>);
-        }
-
-        /// <summary>
-        /// Returns a hash code for this instance.
-        /// </summary>
-        /// <returns>
-        /// A hash code for this instance, suitable for use in hashing algorithms and data structures like a hash table. 
-        /// </returns>
-        public override int GetHashCode()
-        {
-            var keyComparer = KeyEqualityComparer;
-            var valueComparer = ValueEqualityComparer;
-            int hash = 0;
-            foreach (var pair in list)
-            {
-                hash ^= keyComparer.GetHashCode(pair.Key) * 31 + valueComparer.GetHashCode(pair.Value);
-            }
-            return hash;
-        }
-
-        /// <summary>
-        /// Compares this map with another for equality.
-        /// </summary>
-        /// <remarks>
-        /// The order of the key/value pairs in the maps is not deemed significant in this comparison.
-        /// </remarks>
-        /// <param name="other">The map to compare this with.</param>
-        /// <returns><c>true</c> if <paramref name="other"/> refers to an equal map; <c>false</c> otherwise.</returns>
-        public bool Equals(MapField<TKey, TValue> other)
-        {
-            if (other == null)
-            {
-                return false;
-            }
-            if (other == this)
-            {
-                return true;
-            }
-            if (other.Count != this.Count)
-            {
-                return false;
-            }
-            var valueComparer = ValueEqualityComparer;
-            foreach (var pair in this)
-            {
-                TValue value;
-                if (!other.TryGetValue(pair.Key, out value))
-                {
-                    return false;
-                }
-                if (!valueComparer.Equals(value, pair.Value))
-                {
-                    return false;
-                }
-            }
-            return true;
-        }
-
-        /// <summary>
-        /// Adds entries to the map from the given stream.
-        /// </summary>
-        /// <remarks>
-        /// It is assumed that the stream is initially positioned after the tag specified by the codec.
-        /// This method will continue reading entries from the stream until the end is reached, or
-        /// a different tag is encountered.
-        /// </remarks>
-        /// <param name="input">Stream to read from</param>
-        /// <param name="codec">Codec describing how the key/value pairs are encoded</param>
-        public void AddEntriesFrom(CodedInputStream input, Codec codec)
-        {
-            ParseContext.Initialize(input, out ParseContext ctx);
-            try
-            {
-                AddEntriesFrom(ref ctx, codec);
-            }
-            finally
-            {
-                ctx.CopyStateTo(input);
-            }
-        }
-
-        /// <summary>
-        /// Adds entries to the map from the given parse context.
-        /// </summary>
-        /// <remarks>
-        /// It is assumed that the input is initially positioned after the tag specified by the codec.
-        /// This method will continue reading entries from the input until the end is reached, or
-        /// a different tag is encountered.
-        /// </remarks>
-        /// <param name="ctx">Input to read from</param>
-        /// <param name="codec">Codec describing how the key/value pairs are encoded</param>
-        [SecuritySafeCritical]
-        public void AddEntriesFrom(ref ParseContext ctx, Codec codec)
-        {
-            do
-            {
-                KeyValuePair<TKey, TValue> entry = ParsingPrimitivesMessages.ReadMapEntry(ref ctx, codec);
-                this[entry.Key] = entry.Value;
-            } while (ParsingPrimitives.MaybeConsumeTag(ref ctx.buffer, ref ctx.state, codec.MapTag));
-        }
-
-        /// <summary>
-        /// Writes the contents of this map to the given coded output stream, using the specified codec
-        /// to encode each entry.
-        /// </summary>
-        /// <param name="output">The output stream to write to.</param>
-        /// <param name="codec">The codec to use for each entry.</param>
-        public void WriteTo(CodedOutputStream output, Codec codec)
-        {
-            WriteContext.Initialize(output, out WriteContext ctx);
-            try
-            {
-                WriteTo(ref ctx, codec);
-            }
-            finally
-            {
-                ctx.CopyStateTo(output);
-            }
-        }
-
-        /// <summary>
-        /// Writes the contents of this map to the given write context, using the specified codec
-        /// to encode each entry.
-        /// </summary>
-        /// <param name="ctx">The write context to write to.</param>
-        /// <param name="codec">The codec to use for each entry.</param>
-        [SecuritySafeCritical]
-        public void WriteTo(ref WriteContext ctx, Codec codec)
-        {
-            foreach (var entry in list)
-            {
-                ctx.WriteTag(codec.MapTag);
-
-                WritingPrimitives.WriteLength(ref ctx.buffer, ref ctx.state, CalculateEntrySize(codec, entry));
-                codec.KeyCodec.WriteTagAndValue(ref ctx, entry.Key);
-                codec.ValueCodec.WriteTagAndValue(ref ctx, entry.Value);
-            }
-        }
-
-        /// <summary>
-        /// Calculates the size of this map based on the given entry codec.
-        /// </summary>
-        /// <param name="codec">The codec to use to encode each entry.</param>
-        /// <returns></returns>
-        public int CalculateSize(Codec codec)
-        {
-            if (Count == 0)
-            {
-                return 0;
-            }
-            int size = 0;
-            foreach (var entry in list)
-            {
-                int entrySize = CalculateEntrySize(codec, entry);
-
-                size += CodedOutputStream.ComputeRawVarint32Size(codec.MapTag);
-                size += CodedOutputStream.ComputeLengthSize(entrySize) + entrySize;
-            }
-            return size;
-        }
-
-        private static int CalculateEntrySize(Codec codec, KeyValuePair<TKey, TValue> entry)
-        {
-            return codec.KeyCodec.CalculateSizeWithTag(entry.Key) + codec.ValueCodec.CalculateSizeWithTag(entry.Value);
-        }
-
-        /// <summary>
-        /// Returns a string representation of this repeated field, in the same
-        /// way as it would be represented by the default JSON formatter.
-        /// </summary>
-        public override string ToString()
-        {
-            var writer = new StringWriter();
-            JsonFormatter.Default.WriteDictionary(writer, this);
-            return writer.ToString();
-        }
-
-        #region IDictionary explicit interface implementation
-        void IDictionary.Add(object key, object value)
-        {
-            Add((TKey)key, (TValue)value);
-        }
-
-        bool IDictionary.Contains(object key)
-        {
-            if (!(key is TKey))
-            {
-                return false;
-            }
-            return ContainsKey((TKey)key);
-        }
-
-        IDictionaryEnumerator IDictionary.GetEnumerator()
-        {
-            return new DictionaryEnumerator(GetEnumerator());
-        }
-
-        void IDictionary.Remove(object key)
-        {
-            ProtoPreconditions.CheckNotNull(key, nameof(key));
-            if (!(key is TKey))
-            {
-                return;
-            }
-            Remove((TKey)key);
-        }
-
-        void ICollection.CopyTo(Array array, int index)
-        {
-            // This is ugly and slow as heck, but with any luck it will never be used anyway.
-            ICollection temp = this.Select(pair => new DictionaryEntry(pair.Key, pair.Value)).ToList();
-            temp.CopyTo(array, index);
-        }
-
-        bool IDictionary.IsFixedSize { get { return false; } }
-
-        ICollection IDictionary.Keys { get { return (ICollection)Keys; } }
-
-        ICollection IDictionary.Values { get { return (ICollection)Values; } }
-
-        bool ICollection.IsSynchronized { get { return false; } }
-
-        object ICollection.SyncRoot { get { return this; } }
-
-        object IDictionary.this[object key]
-        {
-            get
-            {
-                ProtoPreconditions.CheckNotNull(key, nameof(key));
-                if (!(key is TKey))
-                {
-                    return null;
-                }
-                TValue value;
-                TryGetValue((TKey)key, out value);
-                return value;
-            }
-
-            set
-            {
-                this[(TKey)key] = (TValue)value;
-            }
-        }
-        #endregion
-
-        #region IReadOnlyDictionary explicit interface implementation
-#if !NET35
-        IEnumerable<TKey> IReadOnlyDictionary<TKey, TValue>.Keys => Keys;
-
-        IEnumerable<TValue> IReadOnlyDictionary<TKey, TValue>.Values => Values;
-#endif
-        #endregion
-
-        private class DictionaryEnumerator : IDictionaryEnumerator
-        {
-            private readonly IEnumerator<KeyValuePair<TKey, TValue>> enumerator;
-
-            internal DictionaryEnumerator(IEnumerator<KeyValuePair<TKey, TValue>> enumerator)
-            {
-                this.enumerator = enumerator;
-            }
-
-            public bool MoveNext()
-            {
-                return enumerator.MoveNext();
-            }
-
-            public void Reset()
-            {
-                enumerator.Reset();
-            }
-
-            public object Current { get { return Entry; } }
-            public DictionaryEntry Entry { get { return new DictionaryEntry(Key, Value); } }
-            public object Key { get { return enumerator.Current.Key; } }
-            public object Value { get { return enumerator.Current.Value; } }
-        }
-
-        /// <summary>
-        /// A codec for a specific map field. This contains all the information required to encode and
-        /// decode the nested messages.
-        /// </summary>
-        public sealed class Codec
-        {
-            private readonly FieldCodec<TKey> keyCodec;
-            private readonly FieldCodec<TValue> valueCodec;
-            private readonly uint mapTag;
-
-            /// <summary>
-            /// Creates a new entry codec based on a separate key codec and value codec,
-            /// and the tag to use for each map entry.
-            /// </summary>
-            /// <param name="keyCodec">The key codec.</param>
-            /// <param name="valueCodec">The value codec.</param>
-            /// <param name="mapTag">The map tag to use to introduce each map entry.</param>
-            public Codec(FieldCodec<TKey> keyCodec, FieldCodec<TValue> valueCodec, uint mapTag)
-            {
-                this.keyCodec = keyCodec;
-                this.valueCodec = valueCodec;
-                this.mapTag = mapTag;
-            }
-
-            /// <summary>
-            /// The key codec.
-            /// </summary>
-            internal FieldCodec<TKey> KeyCodec => keyCodec;
-
-            /// <summary>
-            /// The value codec.
-            /// </summary>
-            internal FieldCodec<TValue> ValueCodec => valueCodec;
-
-            /// <summary>
-            /// The tag used in the enclosing message to indicate map entries.
-            /// </summary>
-            internal uint MapTag => mapTag;
-        }
-
-        private class MapView<T> : ICollection<T>, ICollection
-        {
-            private readonly MapField<TKey, TValue> parent;
-            private readonly Func<KeyValuePair<TKey, TValue>, T> projection;
-            private readonly Func<T, bool> containsCheck;
-
-            internal MapView(
-                MapField<TKey, TValue> parent,
-                Func<KeyValuePair<TKey, TValue>, T> projection,
-                Func<T, bool> containsCheck)
-            {
-                this.parent = parent;
-                this.projection = projection;
-                this.containsCheck = containsCheck;
-            }
-
-            public int Count { get { return parent.Count; } }
-
-            public bool IsReadOnly { get { return true; } }
-
-            public bool IsSynchronized { get { return false; } }
-
-            public object SyncRoot { get { return parent; } }
-
-            public void Add(T item)
-            {
-                throw new NotSupportedException();
-            }
-
-            public void Clear()
-            {
-                throw new NotSupportedException();
-            }
-
-            public bool Contains(T item)
-            {
-                return containsCheck(item);
-            }
-
-            public void CopyTo(T[] array, int arrayIndex)
-            {
-                if (arrayIndex < 0)
-                {
-                    throw new ArgumentOutOfRangeException(nameof(arrayIndex));
-                }
-                if (arrayIndex + Count > array.Length)
-                {
-                    throw new ArgumentException("Not enough space in the array", nameof(array));
-                }
-                foreach (var item in this)
-                {
-                    array[arrayIndex++] = item;
-                }
-            }
-
-            public IEnumerator<T> GetEnumerator()
-            {
-                return parent.list.Select(projection).GetEnumerator();
-            }
-
-            public bool Remove(T item)
-            {
-                throw new NotSupportedException();
-            }
-
-            IEnumerator IEnumerable.GetEnumerator()
-            {
-                return GetEnumerator();
-            }
-
-            public void CopyTo(Array array, int index)
-            {
-                if (index < 0)
-                {
-                    throw new ArgumentOutOfRangeException(nameof(index));
-                }
-                if (index + Count > array.Length)
-                {
-                    throw new ArgumentException("Not enough space in the array", nameof(array));
-                }
-                foreach (var item in this)
-                {
-                    array.SetValue(item, index++);
-                }
-            }
-        }
-    }
-}
diff --git a/libs/protobuf/csharp/src/Google.Protobuf/Collections/ProtobufEqualityComparers.cs b/libs/protobuf/csharp/src/Google.Protobuf/Collections/ProtobufEqualityComparers.cs
deleted file mode 100644
index 13ef60f..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf/Collections/ProtobufEqualityComparers.cs
+++ /dev/null
@@ -1,130 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2017 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-using System.Collections.Generic;
-
-namespace Google.Protobuf.Collections
-{
-    /// <summary>
-    /// Provides a central place to implement equality comparisons, primarily for bitwise float/double equality.
-    /// </summary>
-    public static class ProtobufEqualityComparers
-    {
-        /// <summary>
-        /// Returns an equality comparer for <typeparamref name="T"/> suitable for Protobuf equality comparisons.
-        /// This is usually just the default equality comparer for the type, but floating point numbers are compared
-        /// bitwise.
-        /// </summary>
-        /// <typeparam name="T">The type of equality comparer to return.</typeparam>
-        /// <returns>The equality comparer.</returns>
-        public static EqualityComparer<T> GetEqualityComparer<T>()
-        {
-            return typeof(T) == typeof(double) ? (EqualityComparer<T>) (object) BitwiseDoubleEqualityComparer
-                : typeof(T) == typeof(float) ? (EqualityComparer<T>) (object) BitwiseSingleEqualityComparer
-                : typeof(T) == typeof(double?) ? (EqualityComparer<T>) (object) BitwiseNullableDoubleEqualityComparer
-                : typeof(T) == typeof(float?) ? (EqualityComparer<T>) (object) BitwiseNullableSingleEqualityComparer
-                : EqualityComparer<T>.Default;
-        }
-
-        /// <summary>
-        /// Returns an equality comparer suitable for comparing 64-bit floating point values, by bitwise comparison.
-        /// (NaN values are considered equal, but only when they have the same representation.)
-        /// </summary>
-        public static EqualityComparer<double> BitwiseDoubleEqualityComparer { get; } = new BitwiseDoubleEqualityComparerImpl();
-
-        /// <summary>
-        /// Returns an equality comparer suitable for comparing 32-bit floating point values, by bitwise comparison.
-        /// (NaN values are considered equal, but only when they have the same representation.)
-        /// </summary>
-        public static EqualityComparer<float> BitwiseSingleEqualityComparer { get; } = new BitwiseSingleEqualityComparerImpl();
-
-        /// <summary>
-        /// Returns an equality comparer suitable for comparing nullable 64-bit floating point values, by bitwise comparison.
-        /// (NaN values are considered equal, but only when they have the same representation.)
-        /// </summary>
-        public static EqualityComparer<double?> BitwiseNullableDoubleEqualityComparer { get; } = new BitwiseNullableDoubleEqualityComparerImpl();
-
-        /// <summary>
-        /// Returns an equality comparer suitable for comparing nullable 32-bit floating point values, by bitwise comparison.
-        /// (NaN values are considered equal, but only when they have the same representation.)
-        /// </summary>
-        public static EqualityComparer<float?> BitwiseNullableSingleEqualityComparer { get; } = new BitwiseNullableSingleEqualityComparerImpl();
-
-        private class BitwiseDoubleEqualityComparerImpl : EqualityComparer<double>
-        {
-            public override bool Equals(double x, double y) =>
-                BitConverter.DoubleToInt64Bits(x) == BitConverter.DoubleToInt64Bits(y);
-
-            public override int GetHashCode(double obj) =>
-                BitConverter.DoubleToInt64Bits(obj).GetHashCode();
-        }
-
-        private class BitwiseSingleEqualityComparerImpl : EqualityComparer<float>
-        {
-            // Just promote values to double and use BitConverter.DoubleToInt64Bits,
-            // as there's no BitConverter.SingleToInt32Bits, unfortunately.
-
-            public override bool Equals(float x, float y) =>
-                BitConverter.DoubleToInt64Bits(x) == BitConverter.DoubleToInt64Bits(y);
-
-            public override int GetHashCode(float obj) =>
-                BitConverter.DoubleToInt64Bits(obj).GetHashCode();
-        }
-
-        private class BitwiseNullableDoubleEqualityComparerImpl : EqualityComparer<double?>
-        {
-            public override bool Equals(double? x, double? y) =>
-                x == null && y == null ? true
-                : x == null || y == null ? false
-                : BitwiseDoubleEqualityComparer.Equals(x.Value, y.Value);
-
-            // The hash code for null is just a constant which is at least *unlikely* to be used
-            // elsewhere. (Compared with 0, say.)
-            public override int GetHashCode(double? obj) =>
-                obj == null ? 293864 : BitwiseDoubleEqualityComparer.GetHashCode(obj.Value);
-        }
-
-        private class BitwiseNullableSingleEqualityComparerImpl : EqualityComparer<float?>
-        {
-            public override bool Equals(float? x, float? y) =>
-                x == null && y == null ? true
-                : x == null || y == null ? false
-                : BitwiseSingleEqualityComparer.Equals(x.Value, y.Value);
-
-            // The hash code for null is just a constant which is at least *unlikely* to be used
-            // elsewhere. (Compared with 0, say.)
-            public override int GetHashCode(float? obj) =>
-                obj == null ? 293864 : BitwiseSingleEqualityComparer.GetHashCode(obj.Value);
-        }
-    }
-}
diff --git a/libs/protobuf/csharp/src/Google.Protobuf/Collections/ReadOnlyDictionary.cs b/libs/protobuf/csharp/src/Google.Protobuf/Collections/ReadOnlyDictionary.cs
deleted file mode 100644
index 28530a2..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf/Collections/ReadOnlyDictionary.cs
+++ /dev/null
@@ -1,147 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-
-namespace Google.Protobuf.Collections
-{
-    /// <summary>
-    /// Read-only wrapper around another dictionary.
-    /// </summary>
-    internal sealed class ReadOnlyDictionary<TKey, TValue> : IDictionary<TKey, TValue>
-    {
-        private readonly IDictionary<TKey, TValue> wrapped;
-
-        public ReadOnlyDictionary(IDictionary<TKey, TValue> wrapped)
-        {
-            this.wrapped = wrapped;
-        }
-
-        public void Add(TKey key, TValue value)
-        {
-            throw new InvalidOperationException();
-        }
-
-        public bool ContainsKey(TKey key)
-        {
-            return wrapped.ContainsKey(key);
-        }
-
-        public ICollection<TKey> Keys
-        {
-            get { return wrapped.Keys; }
-        }
-
-        public bool Remove(TKey key)
-        {
-            throw new InvalidOperationException();
-        }
-
-        public bool TryGetValue(TKey key, out TValue value)
-        {
-            return wrapped.TryGetValue(key, out value);
-        }
-
-        public ICollection<TValue> Values
-        {
-            get { return wrapped.Values; }
-        }
-
-        public TValue this[TKey key]
-        {
-            get { return wrapped[key]; }
-            set { throw new InvalidOperationException(); }
-        }
-
-        public void Add(KeyValuePair<TKey, TValue> item)
-        {
-            throw new InvalidOperationException();
-        }
-
-        public void Clear()
-        {
-            throw new InvalidOperationException();
-        }
-
-        public bool Contains(KeyValuePair<TKey, TValue> item)
-        {
-            return wrapped.Contains(item);
-        }
-
-        public void CopyTo(KeyValuePair<TKey, TValue>[] array, int arrayIndex)
-        {
-            wrapped.CopyTo(array, arrayIndex);
-        }
-
-        public int Count
-        {
-            get { return wrapped.Count; }
-        }
-
-        public bool IsReadOnly
-        {
-            get { return true; }
-        }
-
-        public bool Remove(KeyValuePair<TKey, TValue> item)
-        {
-            throw new InvalidOperationException();
-        }
-
-        public IEnumerator<KeyValuePair<TKey, TValue>> GetEnumerator()
-        {
-            return wrapped.GetEnumerator();
-        }
-
-        IEnumerator IEnumerable.GetEnumerator()
-        {
-            return ((IEnumerable) wrapped).GetEnumerator();
-        }
-
-        public override bool Equals(object obj)
-        {
-            return wrapped.Equals(obj);
-        }
-
-        public override int GetHashCode()
-        {
-            return wrapped.GetHashCode();
-        }
-
-        public override string ToString()
-        {
-            return wrapped.ToString();
-        }
-    }
-}
\ No newline at end of file
diff --git a/libs/protobuf/csharp/src/Google.Protobuf/Collections/RepeatedField.cs b/libs/protobuf/csharp/src/Google.Protobuf/Collections/RepeatedField.cs
deleted file mode 100644
index 9269c74..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf/Collections/RepeatedField.cs
+++ /dev/null
@@ -1,698 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.IO;
-using System.Security;
-using System.Threading;
-
-namespace Google.Protobuf.Collections
-{
-    /// <summary>
-    /// The contents of a repeated field: essentially, a collection with some extra
-    /// restrictions (no null values) and capabilities (deep cloning).
-    /// </summary>
-    /// <remarks>
-    /// This implementation does not generally prohibit the use of types which are not
-    /// supported by Protocol Buffers but nor does it guarantee that all operations will work in such cases.
-    /// </remarks>
-    /// <typeparam name="T">The element type of the repeated field.</typeparam>
-    public sealed class RepeatedField<T> : IList<T>, IList, IDeepCloneable<RepeatedField<T>>, IEquatable<RepeatedField<T>>
-#if !NET35
-        , IReadOnlyList<T>
-#endif
-    {
-        private static readonly EqualityComparer<T> EqualityComparer = ProtobufEqualityComparers.GetEqualityComparer<T>();
-        private static readonly T[] EmptyArray = new T[0];
-        private const int MinArraySize = 8;
-
-        private T[] array = EmptyArray;
-        private int count = 0;
-
-        /// <summary>
-        /// Creates a deep clone of this repeated field.
-        /// </summary>
-        /// <remarks>
-        /// If the field type is
-        /// a message type, each element is also cloned; otherwise, it is
-        /// assumed that the field type is primitive (including string and
-        /// bytes, both of which are immutable) and so a simple copy is
-        /// equivalent to a deep clone.
-        /// </remarks>
-        /// <returns>A deep clone of this repeated field.</returns>
-        public RepeatedField<T> Clone()
-        {
-            RepeatedField<T> clone = new RepeatedField<T>();
-            if (array != EmptyArray)
-            {
-                clone.array = (T[])array.Clone();
-                IDeepCloneable<T>[] cloneableArray = clone.array as IDeepCloneable<T>[];
-                if (cloneableArray != null)
-                {
-                    for (int i = 0; i < count; i++)
-                    {
-                        clone.array[i] = cloneableArray[i].Clone();
-                    }
-                }
-            }
-            clone.count = count;
-            return clone;
-        }
-
-        /// <summary>
-        /// Adds the entries from the given input stream, decoding them with the specified codec.
-        /// </summary>
-        /// <param name="input">The input stream to read from.</param>
-        /// <param name="codec">The codec to use in order to read each entry.</param>
-        public void AddEntriesFrom(CodedInputStream input, FieldCodec<T> codec)
-        {
-            ParseContext.Initialize(input, out ParseContext ctx);
-            try
-            {
-                AddEntriesFrom(ref ctx, codec);
-            }
-            finally
-            {
-                ctx.CopyStateTo(input);
-            }
-        }
-
-        /// <summary>
-        /// Adds the entries from the given parse context, decoding them with the specified codec.
-        /// </summary>
-        /// <param name="ctx">The input to read from.</param>
-        /// <param name="codec">The codec to use in order to read each entry.</param>
-        [SecuritySafeCritical]
-        public void AddEntriesFrom(ref ParseContext ctx, FieldCodec<T> codec)
-        {
-            // TODO: Inline some of the Add code, so we can avoid checking the size on every
-            // iteration.
-            uint tag = ctx.state.lastTag;
-            var reader = codec.ValueReader;
-            // Non-nullable value types can be packed or not.
-            if (FieldCodec<T>.IsPackedRepeatedField(tag))
-            {
-                int length = ctx.ReadLength();
-                if (length > 0)
-                {
-                    int oldLimit = SegmentedBufferHelper.PushLimit(ref ctx.state, length);
-
-                    // If the content is fixed size then we can calculate the length
-                    // of the repeated field and pre-initialize the underlying collection.
-                    //
-                    // Check that the supplied length doesn't exceed the underlying buffer.
-                    // That prevents a malicious length from initializing a very large collection.
-                    if (codec.FixedSize > 0 && length % codec.FixedSize == 0 && ParsingPrimitives.IsDataAvailable(ref ctx.state, length))
-                    {
-                        EnsureSize(count + (length / codec.FixedSize));
-
-                        while (!SegmentedBufferHelper.IsReachedLimit(ref ctx.state))
-                        {
-                            // Only FieldCodecs with a fixed size can reach here, and they are all known
-                            // types that don't allow the user to specify a custom reader action.
-                            // reader action will never return null.
-                            array[count++] = reader(ref ctx);
-                        }
-                    }
-                    else
-                    {
-                        // Content is variable size so add until we reach the limit.
-                        while (!SegmentedBufferHelper.IsReachedLimit(ref ctx.state))
-                        {
-                            Add(reader(ref ctx));
-                        }
-                    }
-                    SegmentedBufferHelper.PopLimit(ref ctx.state, oldLimit);
-                }
-                // Empty packed field. Odd, but valid - just ignore.
-            }
-            else
-            {
-                // Not packed... (possibly not packable)
-                do
-                {
-                    Add(reader(ref ctx));
-                } while (ParsingPrimitives.MaybeConsumeTag(ref ctx.buffer, ref ctx.state, tag));
-            }
-        }
-
-        /// <summary>
-        /// Calculates the size of this collection based on the given codec.
-        /// </summary>
-        /// <param name="codec">The codec to use when encoding each field.</param>
-        /// <returns>The number of bytes that would be written to an output by one of the <c>WriteTo</c> methods,
-        /// using the same codec.</returns>
-        public int CalculateSize(FieldCodec<T> codec)
-        {
-            if (count == 0)
-            {
-                return 0;
-            }
-            uint tag = codec.Tag;
-            if (codec.PackedRepeatedField)
-            {
-                int dataSize = CalculatePackedDataSize(codec);
-                return CodedOutputStream.ComputeRawVarint32Size(tag) +
-                    CodedOutputStream.ComputeLengthSize(dataSize) +
-                    dataSize;
-            }
-            else
-            {
-                var sizeCalculator = codec.ValueSizeCalculator;
-                int size = count * CodedOutputStream.ComputeRawVarint32Size(tag);
-                if (codec.EndTag != 0)
-                {
-                    size += count * CodedOutputStream.ComputeRawVarint32Size(codec.EndTag);
-                }
-                for (int i = 0; i < count; i++)
-                {
-                    size += sizeCalculator(array[i]);
-                }
-                return size;
-            }
-        }
-
-        private int CalculatePackedDataSize(FieldCodec<T> codec)
-        {
-            int fixedSize = codec.FixedSize;
-            if (fixedSize == 0)
-            {
-                var calculator = codec.ValueSizeCalculator;
-                int tmp = 0;
-                for (int i = 0; i < count; i++)
-                {
-                    tmp += calculator(array[i]);
-                }
-                return tmp;
-            }
-            else
-            {
-                return fixedSize * Count;
-            }
-        }
-
-        /// <summary>
-        /// Writes the contents of this collection to the given <see cref="CodedOutputStream"/>,
-        /// encoding each value using the specified codec.
-        /// </summary>
-        /// <param name="output">The output stream to write to.</param>
-        /// <param name="codec">The codec to use when encoding each value.</param>
-        public void WriteTo(CodedOutputStream output, FieldCodec<T> codec)
-        {
-            WriteContext.Initialize(output, out WriteContext ctx);
-            try
-            {
-                WriteTo(ref ctx, codec);
-            }
-            finally
-            {
-                ctx.CopyStateTo(output);
-            }
-        }
-
-        /// <summary>
-        /// Writes the contents of this collection to the given write context,
-        /// encoding each value using the specified codec.
-        /// </summary>
-        /// <param name="ctx">The write context to write to.</param>
-        /// <param name="codec">The codec to use when encoding each value.</param>
-        [SecuritySafeCritical]
-        public void WriteTo(ref WriteContext ctx, FieldCodec<T> codec)
-        {
-            if (count == 0)
-            {
-                return;
-            }
-            var writer = codec.ValueWriter;
-            var tag = codec.Tag;
-            if (codec.PackedRepeatedField)
-            {
-                // Packed primitive type
-                int size = CalculatePackedDataSize(codec);
-                ctx.WriteTag(tag);
-                ctx.WriteLength(size);
-                for (int i = 0; i < count; i++)
-                {
-                    writer(ref ctx, array[i]);
-                }
-            }
-            else
-            {
-                // Not packed: a simple tag/value pair for each value.
-                // Can't use codec.WriteTagAndValue, as that omits default values.
-                for (int i = 0; i < count; i++)
-                {
-                    ctx.WriteTag(tag);
-                    writer(ref ctx, array[i]);
-                    if (codec.EndTag != 0)
-                    {
-                        ctx.WriteTag(codec.EndTag);
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// Gets and sets the capacity of the RepeatedField's internal array.  WHen set, the internal array is reallocated to the given capacity.
-        /// <exception cref="ArgumentOutOfRangeException">The new value is less than Count -or- when Count is less than 0.</exception>
-        /// </summary>
-        public int Capacity
-        {
-            get { return array.Length; }
-            set
-            {
-                if (value < count)
-                {
-                    throw new ArgumentOutOfRangeException("Capacity", value,
-                        $"Cannot set Capacity to a value smaller than the current item count, {count}");
-                }
-
-                if (value >= 0 && value != array.Length)
-                {
-                    SetSize(value);
-                }
-            }
-        }
-
-        // May increase the size of the internal array, but will never shrink it.
-        private void EnsureSize(int size)
-        {
-            if (array.Length < size)
-            {
-                size = Math.Max(size, MinArraySize);
-                int newSize = Math.Max(array.Length * 2, size);
-                SetSize(newSize);
-            }
-        }
-
-        // Sets the internal array to an exact size.
-        private void SetSize(int size)
-        {
-            if (size != array.Length)
-            {
-                var tmp = new T[size];
-                Array.Copy(array, 0, tmp, 0, count);
-                array = tmp;
-            }
-        }
-
-        /// <summary>
-        /// Adds the specified item to the collection.
-        /// </summary>
-        /// <param name="item">The item to add.</param>
-        public void Add(T item)
-        {
-            ProtoPreconditions.CheckNotNullUnconstrained(item, nameof(item));
-            EnsureSize(count + 1);
-            array[count++] = item;
-        }
-
-        /// <summary>
-        /// Removes all items from the collection.
-        /// </summary>
-        public void Clear()
-        {
-            array = EmptyArray;
-            count = 0;
-        }
-
-        /// <summary>
-        /// Determines whether this collection contains the given item.
-        /// </summary>
-        /// <param name="item">The item to find.</param>
-        /// <returns><c>true</c> if this collection contains the given item; <c>false</c> otherwise.</returns>
-        public bool Contains(T item)
-        {
-            return IndexOf(item) != -1;
-        }
-
-        /// <summary>
-        /// Copies this collection to the given array.
-        /// </summary>
-        /// <param name="array">The array to copy to.</param>
-        /// <param name="arrayIndex">The first index of the array to copy to.</param>
-        public void CopyTo(T[] array, int arrayIndex)
-        {
-            Array.Copy(this.array, 0, array, arrayIndex, count);
-        }
-
-        /// <summary>
-        /// Removes the specified item from the collection
-        /// </summary>
-        /// <param name="item">The item to remove.</param>
-        /// <returns><c>true</c> if the item was found and removed; <c>false</c> otherwise.</returns>
-        public bool Remove(T item)
-        {
-            int index = IndexOf(item);
-            if (index == -1)
-            {
-                return false;
-            }            
-            Array.Copy(array, index + 1, array, index, count - index - 1);
-            count--;
-            array[count] = default(T);
-            return true;
-        }
-
-        /// <summary>
-        /// Gets the number of elements contained in the collection.
-        /// </summary>
-        public int Count => count;
-
-        /// <summary>
-        /// Gets a value indicating whether the collection is read-only.
-        /// </summary>
-        public bool IsReadOnly => false;
-
-        /// <summary>
-        /// Adds all of the specified values into this collection.
-        /// </summary>
-        /// <param name="values">The values to add to this collection.</param>
-        public void AddRange(IEnumerable<T> values)
-        {
-            ProtoPreconditions.CheckNotNull(values, nameof(values));
-
-            // Optimization 1: If the collection we're adding is already a RepeatedField<T>,
-            // we know the values are valid.
-            var otherRepeatedField = values as RepeatedField<T>;
-            if (otherRepeatedField != null)
-            {
-                EnsureSize(count + otherRepeatedField.count);
-                Array.Copy(otherRepeatedField.array, 0, array, count, otherRepeatedField.count);
-                count += otherRepeatedField.count;
-                return;
-            }
-
-            // Optimization 2: The collection is an ICollection, so we can expand
-            // just once and ask the collection to copy itself into the array.
-            var collection = values as ICollection;
-            if (collection != null)
-            {
-                var extraCount = collection.Count;
-                // For reference types and nullable value types, we need to check that there are no nulls
-                // present. (This isn't a thread-safe approach, but we don't advertise this is thread-safe.)
-                // We expect the JITter to optimize this test to true/false, so it's effectively conditional
-                // specialization.
-                if (default(T) == null)
-                {
-                    // TODO: Measure whether iterating once to check and then letting the collection copy
-                    // itself is faster or slower than iterating and adding as we go. For large
-                    // collections this will not be great in terms of cache usage... but the optimized
-                    // copy may be significantly faster than doing it one at a time.
-                    foreach (var item in collection)
-                    {
-                        if (item == null)
-                        {
-                            throw new ArgumentException("Sequence contained null element", nameof(values));
-                        }
-                    }
-                }
-                EnsureSize(count + extraCount);
-                collection.CopyTo(array, count);
-                count += extraCount;
-                return;
-            }
-
-            // We *could* check for ICollection<T> as well, but very very few collections implement
-            // ICollection<T> but not ICollection. (HashSet<T> does, for one...)
-
-            // Fall back to a slower path of adding items one at a time.
-            foreach (T item in values)
-            {
-                Add(item);
-            }
-        }
-
-        /// <summary>
-        /// Adds all of the specified values into this collection. This method is present to
-        /// allow repeated fields to be constructed from queries within collection initializers.
-        /// Within non-collection-initializer code, consider using the equivalent <see cref="AddRange"/>
-        /// method instead for clarity.
-        /// </summary>
-        /// <param name="values">The values to add to this collection.</param>
-        public void Add(IEnumerable<T> values)
-        {
-            AddRange(values);
-        }
-
-        /// <summary>
-        /// Returns an enumerator that iterates through the collection.
-        /// </summary>
-        /// <returns>
-        /// An enumerator that can be used to iterate through the collection.
-        /// </returns>
-        public IEnumerator<T> GetEnumerator()
-        {
-            for (int i = 0; i < count; i++)
-            {
-                yield return array[i];
-            }
-        }
-
-        /// <summary>
-        /// Determines whether the specified <see cref="System.Object" />, is equal to this instance.
-        /// </summary>
-        /// <param name="obj">The <see cref="System.Object" /> to compare with this instance.</param>
-        /// <returns>
-        ///   <c>true</c> if the specified <see cref="System.Object" /> is equal to this instance; otherwise, <c>false</c>.
-        /// </returns>
-        public override bool Equals(object obj)
-        {
-            return Equals(obj as RepeatedField<T>);
-        }
-
-        /// <summary>
-        /// Returns an enumerator that iterates through a collection.
-        /// </summary>
-        /// <returns>
-        /// An <see cref="T:System.Collections.IEnumerator" /> object that can be used to iterate through the collection.
-        /// </returns>
-        IEnumerator IEnumerable.GetEnumerator()
-        {
-            return GetEnumerator();
-        }
-
-        /// <summary>
-        /// Returns a hash code for this instance.
-        /// </summary>
-        /// <returns>
-        /// A hash code for this instance, suitable for use in hashing algorithms and data structures like a hash table. 
-        /// </returns>
-        public override int GetHashCode()
-        {
-            int hash = 0;
-            for (int i = 0; i < count; i++)
-            {
-                hash = hash * 31 + array[i].GetHashCode();
-            }
-            return hash;
-        }
-
-        /// <summary>
-        /// Compares this repeated field with another for equality.
-        /// </summary>
-        /// <param name="other">The repeated field to compare this with.</param>
-        /// <returns><c>true</c> if <paramref name="other"/> refers to an equal repeated field; <c>false</c> otherwise.</returns>
-        public bool Equals(RepeatedField<T> other)
-        {
-            if (ReferenceEquals(other, null))
-            {
-                return false;
-            }
-            if (ReferenceEquals(other, this))
-            {
-                return true;
-            }
-            if (other.Count != this.Count)
-            {
-                return false;
-            }
-            EqualityComparer<T> comparer = EqualityComparer;
-            for (int i = 0; i < count; i++)
-            {
-                if (!comparer.Equals(array[i], other.array[i]))
-                {
-                    return false;
-                }
-            }
-            return true;
-        }
-
-        /// <summary>
-        /// Returns the index of the given item within the collection, or -1 if the item is not
-        /// present.
-        /// </summary>
-        /// <param name="item">The item to find in the collection.</param>
-        /// <returns>The zero-based index of the item, or -1 if it is not found.</returns>
-        public int IndexOf(T item)
-        {
-            ProtoPreconditions.CheckNotNullUnconstrained(item, nameof(item));
-            EqualityComparer<T> comparer = EqualityComparer;
-            for (int i = 0; i < count; i++)
-            {
-                if (comparer.Equals(array[i], item))
-                {
-                    return i;
-                }
-            }
-            return -1;
-        }
-
-        /// <summary>
-        /// Inserts the given item at the specified index.
-        /// </summary>
-        /// <param name="index">The index at which to insert the item.</param>
-        /// <param name="item">The item to insert.</param>
-        public void Insert(int index, T item)
-        {
-            ProtoPreconditions.CheckNotNullUnconstrained(item, nameof(item));
-            if (index < 0 || index > count)
-            {
-                throw new ArgumentOutOfRangeException(nameof(index));
-            }
-            EnsureSize(count + 1);
-            Array.Copy(array, index, array, index + 1, count - index);
-            array[index] = item;
-            count++;
-        }
-
-        /// <summary>
-        /// Removes the item at the given index.
-        /// </summary>
-        /// <param name="index">The zero-based index of the item to remove.</param>
-        public void RemoveAt(int index)
-        {
-            if (index < 0 || index >= count)
-            {
-                throw new ArgumentOutOfRangeException(nameof(index));
-            }
-            Array.Copy(array, index + 1, array, index, count - index - 1);
-            count--;
-            array[count] = default(T);
-        }
-
-        /// <summary>
-        /// Returns a string representation of this repeated field, in the same
-        /// way as it would be represented by the default JSON formatter.
-        /// </summary>
-        public override string ToString()
-        {
-            var writer = new StringWriter();
-            JsonFormatter.Default.WriteList(writer, this);
-            return writer.ToString();
-        }
-
-        /// <summary>
-        /// Gets or sets the item at the specified index.
-        /// </summary>
-        /// <value>
-        /// The element at the specified index.
-        /// </value>
-        /// <param name="index">The zero-based index of the element to get or set.</param>
-        /// <returns>The item at the specified index.</returns>
-        public T this[int index]
-        {
-            get
-            {
-                if (index < 0 || index >= count)
-                {
-                    throw new ArgumentOutOfRangeException(nameof(index));
-                }
-                return array[index];
-            }
-            set
-            {
-                if (index < 0 || index >= count)
-                {
-                    throw new ArgumentOutOfRangeException(nameof(index));
-                }
-                ProtoPreconditions.CheckNotNullUnconstrained(value, nameof(value));
-                array[index] = value;
-            }
-        }
-
-        #region Explicit interface implementation for IList and ICollection.
-        bool IList.IsFixedSize => false;
-
-        void ICollection.CopyTo(Array array, int index)
-        {
-            Array.Copy(this.array, 0, array, index, count);
-        }
-
-        bool ICollection.IsSynchronized => false;
-
-        object ICollection.SyncRoot => this;
-
-        object IList.this[int index]
-        {
-            get { return this[index]; }
-            set { this[index] = (T)value; }
-        }
-
-        int IList.Add(object value)
-        {
-            Add((T) value);
-            return count - 1;
-        }
-
-        bool IList.Contains(object value)
-        {
-            return (value is T && Contains((T)value));
-        }
-
-        int IList.IndexOf(object value)
-        {
-            if (!(value is T))
-            {
-                return -1;
-            }
-            return IndexOf((T)value);
-        }
-
-        void IList.Insert(int index, object value)
-        {
-            Insert(index, (T) value);
-        }
-
-        void IList.Remove(object value)
-        {
-            if (!(value is T))
-            {
-                return;
-            }
-            Remove((T)value);
-        }
-        #endregion        
-    }
-}
diff --git a/libs/protobuf/csharp/src/Google.Protobuf/Compatibility/DynamicallyAccessedMemberTypes.cs b/libs/protobuf/csharp/src/Google.Protobuf/Compatibility/DynamicallyAccessedMemberTypes.cs
deleted file mode 100644
index a4d739d..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf/Compatibility/DynamicallyAccessedMemberTypes.cs
+++ /dev/null
@@ -1,127 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-#if !NET5_0_OR_GREATER
-// Copied with permission from https://github.com/dotnet/runtime/tree/8fbf206d0e518b45ca855832e8bfb391afa85972/src/libraries/System.Private.CoreLib/src/System/Diagnostics/CodeAnalysis
-namespace System.Diagnostics.CodeAnalysis
-{
-    /// <summary>
-    /// Specifies the types of members that are dynamically accessed.
-    ///
-    /// This enumeration has a <see cref="FlagsAttribute"/> attribute that allows a
-    /// bitwise combination of its member values.
-    /// </summary>
-    [Flags]
-    internal enum DynamicallyAccessedMemberTypes
-    {
-        /// <summary>
-        /// Specifies no members.
-        /// </summary>
-        None = 0,
-
-        /// <summary>
-        /// Specifies the default, parameterless public constructor.
-        /// </summary>
-        PublicParameterlessConstructor = 0x0001,
-
-        /// <summary>
-        /// Specifies all public constructors.
-        /// </summary>
-        PublicConstructors = 0x0002 | PublicParameterlessConstructor,
-
-        /// <summary>
-        /// Specifies all non-public constructors.
-        /// </summary>
-        NonPublicConstructors = 0x0004,
-
-        /// <summary>
-        /// Specifies all public methods.
-        /// </summary>
-        PublicMethods = 0x0008,
-
-        /// <summary>
-        /// Specifies all non-public methods.
-        /// </summary>
-        NonPublicMethods = 0x0010,
-
-        /// <summary>
-        /// Specifies all public fields.
-        /// </summary>
-        PublicFields = 0x0020,
-
-        /// <summary>
-        /// Specifies all non-public fields.
-        /// </summary>
-        NonPublicFields = 0x0040,
-
-        /// <summary>
-        /// Specifies all public nested types.
-        /// </summary>
-        PublicNestedTypes = 0x0080,
-
-        /// <summary>
-        /// Specifies all non-public nested types.
-        /// </summary>
-        NonPublicNestedTypes = 0x0100,
-
-        /// <summary>
-        /// Specifies all public properties.
-        /// </summary>
-        PublicProperties = 0x0200,
-
-        /// <summary>
-        /// Specifies all non-public properties.
-        /// </summary>
-        NonPublicProperties = 0x0400,
-
-        /// <summary>
-        /// Specifies all public events.
-        /// </summary>
-        PublicEvents = 0x0800,
-
-        /// <summary>
-        /// Specifies all non-public events.
-        /// </summary>
-        NonPublicEvents = 0x1000,
-
-        /// <summary>
-        /// Specifies all interfaces implemented by the type.
-        /// </summary>
-        Interfaces = 0x2000,
-
-        /// <summary>
-        /// Specifies all members.
-        /// </summary>
-        All = ~None
-    }
-}
-#endif
diff --git a/libs/protobuf/csharp/src/Google.Protobuf/Compatibility/DynamicallyAccessedMembersAttribute.cs b/libs/protobuf/csharp/src/Google.Protobuf/Compatibility/DynamicallyAccessedMembersAttribute.cs
deleted file mode 100644
index ae09276..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf/Compatibility/DynamicallyAccessedMembersAttribute.cs
+++ /dev/null
@@ -1,83 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-#if !NET5_0_OR_GREATER
-// Copied with permission from https://github.com/dotnet/runtime/tree/8fbf206d0e518b45ca855832e8bfb391afa85972/src/libraries/System.Private.CoreLib/src/System/Diagnostics/CodeAnalysis
-namespace System.Diagnostics.CodeAnalysis
-{
-    /// <summary>
-    /// Indicates that certain members on a specified <see cref="Type"/> are accessed dynamically,
-    /// for example through <see cref="System.Reflection"/>.
-    /// </summary>
-    /// <remarks>
-    /// This allows tools to understand which members are being accessed during the execution
-    /// of a program.
-    ///
-    /// This attribute is valid on members whose type is <see cref="Type"/> or <see cref="string"/>.
-    ///
-    /// When this attribute is applied to a location of type <see cref="string"/>, the assumption is
-    /// that the string represents a fully qualified type name.
-    ///
-    /// When this attribute is applied to a class, interface, or struct, the members specified
-    /// can be accessed dynamically on <see cref="Type"/> instances returned from calling
-    /// <see cref="object.GetType"/> on instances of that class, interface, or struct.
-    ///
-    /// If the attribute is applied to a method it's treated as a special case and it implies
-    /// the attribute should be applied to the "this" parameter of the method. As such the attribute
-    /// should only be used on instance methods of types assignable to System.Type (or string, but no methods
-    /// will use it there).
-    /// </remarks>
-    [AttributeUsage(
-        AttributeTargets.Field | AttributeTargets.ReturnValue | AttributeTargets.GenericParameter |
-        AttributeTargets.Parameter | AttributeTargets.Property | AttributeTargets.Method |
-        AttributeTargets.Class | AttributeTargets.Interface | AttributeTargets.Struct,
-        Inherited = false)]
-    internal sealed class DynamicallyAccessedMembersAttribute : Attribute
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DynamicallyAccessedMembersAttribute"/> class
-        /// with the specified member types.
-        /// </summary>
-        /// <param name="memberTypes">The types of members dynamically accessed.</param>
-        public DynamicallyAccessedMembersAttribute(DynamicallyAccessedMemberTypes memberTypes)
-        {
-            MemberTypes = memberTypes;
-        }
-
-        /// <summary>
-        /// Gets the <see cref="DynamicallyAccessedMemberTypes"/> which specifies the type
-        /// of members dynamically accessed.
-        /// </summary>
-        public DynamicallyAccessedMemberTypes MemberTypes { get; }
-    }
-}
-#endif
diff --git a/libs/protobuf/csharp/src/Google.Protobuf/Compatibility/MethodInfoExtensions.cs b/libs/protobuf/csharp/src/Google.Protobuf/Compatibility/MethodInfoExtensions.cs
deleted file mode 100644
index 7b946cb..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf/Compatibility/MethodInfoExtensions.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2017 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-#if NET35
-using System;
-using System.Reflection;
-
-namespace Google.Protobuf.Compatibility
-{
-    // .NET Core (at least netstandard1.0) doesn't have Delegate.CreateDelegate, and .NET 3.5 doesn't have
-    // MethodInfo.CreateDelegate. Proxy from one to the other on .NET 3.5...
-    internal static class MethodInfoExtensions
-    {
-        internal static Delegate CreateDelegate(this MethodInfo method, Type type) =>
-            Delegate.CreateDelegate(type, method);
-    }
-}
-#endif
diff --git a/libs/protobuf/csharp/src/Google.Protobuf/Compatibility/PropertyInfoExtensions.cs b/libs/protobuf/csharp/src/Google.Protobuf/Compatibility/PropertyInfoExtensions.cs
deleted file mode 100644
index 95a02c7..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf/Compatibility/PropertyInfoExtensions.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System.Reflection;
-
-namespace Google.Protobuf.Compatibility
-{
-    /// <summary>
-    /// Extension methods for <see cref="PropertyInfo"/>, effectively providing
-    /// the familiar members from previous desktop framework versions while
-    /// targeting the newer releases, .NET Core etc.
-    /// </summary>
-    internal static class PropertyInfoExtensions
-    {
-        /// <summary>
-        /// Returns the public getter of a property, or null if there is no such getter
-        /// (either because it's read-only, or the getter isn't public).
-        /// </summary>
-        internal static MethodInfo GetGetMethod(this PropertyInfo target)
-        {
-#if NET35
-            var method = target.GetGetMethod();
-#else
-            var method = target.GetMethod;
-#endif
-            return method != null && method.IsPublic ? method : null;
-        }
-
-        /// <summary>
-        /// Returns the public setter of a property, or null if there is no such setter
-        /// (either because it's write-only, or the setter isn't public).
-        /// </summary>
-        internal static MethodInfo GetSetMethod(this PropertyInfo target)
-        {
-#if NET35
-            var method = target.GetSetMethod();
-#else
-            var method = target.SetMethod;
-#endif
-            return method != null && method.IsPublic ? method : null;
-        }
-    }
-}
diff --git a/libs/protobuf/csharp/src/Google.Protobuf/Compatibility/RequiresUnreferencedCodeAttribute.cs b/libs/protobuf/csharp/src/Google.Protobuf/Compatibility/RequiresUnreferencedCodeAttribute.cs
deleted file mode 100644
index 1fc8e66..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf/Compatibility/RequiresUnreferencedCodeAttribute.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-#if !NET5_0_OR_GREATER
-// Copied with permission from https://github.com/dotnet/runtime/tree/8fbf206d0e518b45ca855832e8bfb391afa85972/src/libraries/System.Private.CoreLib/src/System/Diagnostics/CodeAnalysis
-namespace System.Diagnostics.CodeAnalysis
-{
-    /// <summary>
-    /// Indicates that the specified method requires dynamic access to code that is not referenced
-    /// statically, for example through <see cref="System.Reflection"/>.
-    /// </summary>
-    /// <remarks>
-    /// This allows tools to understand which methods are unsafe to call when removing unreferenced
-    /// code from an application.
-    /// </remarks>
-    [AttributeUsage(AttributeTargets.Method | AttributeTargets.Constructor | AttributeTargets.Class, Inherited = false)]
-    internal sealed class RequiresUnreferencedCodeAttribute : Attribute
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RequiresUnreferencedCodeAttribute"/> class
-        /// with the specified message.
-        /// </summary>
-        /// <param name="message">
-        /// A message that contains information about the usage of unreferenced code.
-        /// </param>
-        public RequiresUnreferencedCodeAttribute(string message)
-        {
-            Message = message;
-        }
-
-        /// <summary>
-        /// Gets a message that contains information about the usage of unreferenced code.
-        /// </summary>
-        public string Message { get; }
-
-        /// <summary>
-        /// Gets or sets an optional URL that contains more information about the method,
-        /// why it requires unreferenced code, and what options a consumer has to deal with it.
-        /// </summary>
-        public string Url { get; set; }
-    }
-}
-#endif
diff --git a/libs/protobuf/csharp/src/Google.Protobuf/Compatibility/StreamExtensions.cs b/libs/protobuf/csharp/src/Google.Protobuf/Compatibility/StreamExtensions.cs
deleted file mode 100644
index bf4bf22..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf/Compatibility/StreamExtensions.cs
+++ /dev/null
@@ -1,66 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-#if NET35
-using System;
-using System.IO;
-
-namespace Google.Protobuf.Compatibility
-{
-    /// <summary>
-    /// Extension methods for <see cref="Stream"/> in order to provide
-    /// backwards compatibility with .NET 3.5
-    /// </summary>
-    public static class StreamExtensions
-    {
-        // 81920 seems to be the default buffer size used in .NET 4.5.1
-        private const int BUFFER_SIZE = 81920;
-
-        /// <summary>
-        /// Write the contents of the current stream to the destination stream
-        /// </summary>
-        public static void CopyTo(this Stream source, Stream destination)
-        {
-            if (destination == null)
-            {
-                throw new ArgumentNullException(nameof(destination));
-            }
-
-            byte[] buffer = new byte[BUFFER_SIZE];
-            int numBytesRead;
-            while ((numBytesRead = source.Read(buffer, 0, buffer.Length)) > 0) {
-                destination.Write(buffer, 0, numBytesRead);
-            }
-        }
-    }
-}
-#endif
diff --git a/libs/protobuf/csharp/src/Google.Protobuf/Compatibility/TypeExtensions.cs b/libs/protobuf/csharp/src/Google.Protobuf/Compatibility/TypeExtensions.cs
deleted file mode 100644
index b3acda2..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf/Compatibility/TypeExtensions.cs
+++ /dev/null
@@ -1,115 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-#if !NET35
-namespace Google.Protobuf.Compatibility
-{
-    /// <summary>
-    /// Provides extension methods on Type that just proxy to TypeInfo.
-    /// These are used to support the new type system from .NET 4.5, without
-    /// having calls to GetTypeInfo all over the place. While the methods here are meant to be
-    /// broadly compatible with the desktop framework, there are some subtle differences in behaviour - but
-    /// they're not expected to affect our use cases. While the class is internal, that should be fine: we can
-    /// evaluate each new use appropriately.
-    /// </summary>
-    internal static class TypeExtensions
-    {
-        /// <summary>
-        /// See https://msdn.microsoft.com/en-us/library/system.type.isassignablefrom
-        /// </summary>
-        internal static bool IsAssignableFrom(this Type target, Type c)
-        {
-            return target.GetTypeInfo().IsAssignableFrom(c.GetTypeInfo());
-        }
-
-        /// <summary>
-        /// Returns a representation of the public property associated with the given name in the given type,
-        /// including inherited properties or null if there is no such public property.
-        /// Here, "public property" means a property where either the getter, or the setter, or both, is public.
-        /// </summary>
-        [UnconditionalSuppressMessage("Trimming", "IL2072",
-            Justification = "The BaseType of the target will have all properties because of the annotation.")]
-        internal static PropertyInfo GetProperty(
-            [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicProperties | DynamicallyAccessedMemberTypes.NonPublicProperties)]
-            this Type target, string name)
-        {
-            // GetDeclaredProperty only returns properties declared in the given type, so we need to recurse.
-            while (target != null)
-            {
-                var typeInfo = target.GetTypeInfo();
-                var ret = typeInfo.GetDeclaredProperty(name);
-                if (ret != null && ((ret.CanRead && ret.GetMethod.IsPublic) || (ret.CanWrite && ret.SetMethod.IsPublic)))
-                {
-                    return ret;
-                }
-                target = typeInfo.BaseType;
-            }
-            return null;
-        }
-
-        /// <summary>
-        /// Returns a representation of the public method associated with the given name in the given type,
-        /// including inherited methods.
-        /// </summary>
-        /// <remarks>
-        /// This has a few differences compared with Type.GetMethod in the desktop framework. It will throw
-        /// if there is an ambiguous match even between a private method and a public one, but it *won't* throw
-        /// if there are two overloads at different levels in the type hierarchy (e.g. class Base declares public void Foo(int) and
-        /// class Child : Base declares public void Foo(long)).
-        /// </remarks>
-        /// <exception cref="AmbiguousMatchException">One type in the hierarchy declared more than one method with the same name</exception>
-        [UnconditionalSuppressMessage("Trimming", "IL2072",
-            Justification = "The BaseType of the target will have all properties because of the annotation.")]
-        internal static MethodInfo GetMethod(
-            [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicMethods | DynamicallyAccessedMemberTypes.NonPublicMethods)]
-            this Type target, string name)
-        {
-            // GetDeclaredMethod only returns methods declared in the given type, so we need to recurse.
-            while (target != null)
-            {
-                var typeInfo = target.GetTypeInfo();
-                var ret = typeInfo.GetDeclaredMethod(name);
-                if (ret != null && ret.IsPublic)
-                {
-                    return ret;
-                }
-                target = typeInfo.BaseType;
-            }
-            return null;
-        }
-    }
-}
-#endif
diff --git a/libs/protobuf/csharp/src/Google.Protobuf/Compatibility/UnconditionalSuppressMessageAttribute.cs b/libs/protobuf/csharp/src/Google.Protobuf/Compatibility/UnconditionalSuppressMessageAttribute.cs
deleted file mode 100644
index a02a145..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf/Compatibility/UnconditionalSuppressMessageAttribute.cs
+++ /dev/null
@@ -1,117 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-#if !NET5_0_OR_GREATER
-// Copied with permission from https://github.com/dotnet/runtime/tree/8fbf206d0e518b45ca855832e8bfb391afa85972/src/libraries/System.Private.CoreLib/src/System/Diagnostics/CodeAnalysis
-namespace System.Diagnostics.CodeAnalysis
-{
-    /// <summary>
-    /// Suppresses reporting of a specific rule violation, allowing multiple suppressions on a
-    /// single code artifact.
-    /// </summary>
-    /// <remarks>
-    /// <see cref="UnconditionalSuppressMessageAttribute"/> is different than
-    /// <see cref="SuppressMessageAttribute"/> in that it doesn't have a
-    /// <see cref="ConditionalAttribute"/>. So it is always preserved in the compiled assembly.
-    /// </remarks>
-    [AttributeUsage(AttributeTargets.All, Inherited = false, AllowMultiple = true)]
-    internal sealed class UnconditionalSuppressMessageAttribute : Attribute
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="UnconditionalSuppressMessageAttribute"/>
-        /// class, specifying the category of the tool and the identifier for an analysis rule.
-        /// </summary>
-        /// <param name="category">The category for the attribute.</param>
-        /// <param name="checkId">The identifier of the analysis rule the attribute applies to.</param>
-        public UnconditionalSuppressMessageAttribute(string category, string checkId)
-        {
-            Category = category;
-            CheckId = checkId;
-        }
-
-        /// <summary>
-        /// Gets the category identifying the classification of the attribute.
-        /// </summary>
-        /// <remarks>
-        /// The <see cref="Category"/> property describes the tool or tool analysis category
-        /// for which a message suppression attribute applies.
-        /// </remarks>
-        public string Category { get; }
-
-        /// <summary>
-        /// Gets the identifier of the analysis tool rule to be suppressed.
-        /// </summary>
-        /// <remarks>
-        /// Concatenated together, the <see cref="Category"/> and <see cref="CheckId"/>
-        /// properties form a unique check identifier.
-        /// </remarks>
-        public string CheckId { get; }
-
-        /// <summary>
-        /// Gets or sets the scope of the code that is relevant for the attribute.
-        /// </summary>
-        /// <remarks>
-        /// The Scope property is an optional argument that specifies the metadata scope for which
-        /// the attribute is relevant.
-        /// </remarks>
-        public string Scope { get; set; }
-
-        /// <summary>
-        /// Gets or sets a fully qualified path that represents the target of the attribute.
-        /// </summary>
-        /// <remarks>
-        /// The <see cref="Target"/> property is an optional argument identifying the analysis target
-        /// of the attribute. An example value is "System.IO.Stream.ctor():System.Void".
-        /// Because it is fully qualified, it can be long, particularly for targets such as parameters.
-        /// The analysis tool user interface should be capable of automatically formatting the parameter.
-        /// </remarks>
-        public string Target { get; set; }
-
-        /// <summary>
-        /// Gets or sets an optional argument expanding on exclusion criteria.
-        /// </summary>
-        /// <remarks>
-        /// The <see cref="MessageId "/> property is an optional argument that specifies additional
-        /// exclusion where the literal metadata target is not sufficiently precise. For example,
-        /// the <see cref="UnconditionalSuppressMessageAttribute"/> cannot be applied within a method,
-        /// and it may be desirable to suppress a violation against a statement in the method that will
-        /// give a rule violation, but not against all statements in the method.
-        /// </remarks>
-        public string MessageId { get; set; }
-
-        /// <summary>
-        /// Gets or sets the justification for suppressing the code analysis message.
-        /// </summary>
-        public string Justification { get; set; }
-    }
-}
-#endif
diff --git a/libs/protobuf/csharp/src/Google.Protobuf/Extension.cs b/libs/protobuf/csharp/src/Google.Protobuf/Extension.cs
deleted file mode 100644
index d10a668..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf/Extension.cs
+++ /dev/null
@@ -1,119 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-
-namespace Google.Protobuf
-{
-    /// <summary>
-    /// Represents a non-generic extension definition. This API is experimental and subject to change.
-    /// </summary>
-    public abstract class Extension
-    {
-        internal abstract Type TargetType { get; }
-
-        /// <summary>
-        /// Internal use. Creates a new extension with the specified field number.
-        /// </summary>
-        protected Extension(int fieldNumber)
-        {
-            FieldNumber = fieldNumber;
-        }
-
-        internal abstract IExtensionValue CreateValue();
-
-        /// <summary>
-        /// Gets the field number of this extension
-        /// </summary>
-        public int FieldNumber { get; }
-
-        internal abstract bool IsRepeated { get; }
-    }
-
-    /// <summary>
-    /// Represents a type-safe extension identifier used for getting and setting single extension values in <see cref="IExtendableMessage{T}"/> instances. 
-    /// This API is experimental and subject to change.
-    /// </summary>
-    /// <typeparam name="TTarget">The message type this field applies to</typeparam>
-    /// <typeparam name="TValue">The field value type of this extension</typeparam>
-    public sealed class Extension<TTarget, TValue> : Extension where TTarget : IExtendableMessage<TTarget>
-    {
-        private readonly FieldCodec<TValue> codec;
-
-        /// <summary>
-        /// Creates a new extension identifier with the specified field number and codec
-        /// </summary>
-        public Extension(int fieldNumber, FieldCodec<TValue> codec) : base(fieldNumber)
-        {
-            this.codec = codec;
-        }
-
-        internal TValue DefaultValue => codec != null ? codec.DefaultValue : default(TValue);
-
-        internal override Type TargetType => typeof(TTarget);
-
-        internal override bool IsRepeated => false;
-
-        internal override IExtensionValue CreateValue()
-        {
-            return new ExtensionValue<TValue>(codec);
-        }
-    }
-
-    /// <summary>
-    /// Represents a type-safe extension identifier used for getting repeated extension values in <see cref="IExtendableMessage{T}"/> instances.
-    /// This API is experimental and subject to change.
-    /// </summary>
-    /// <typeparam name="TTarget">The message type this field applies to</typeparam>
-    /// <typeparam name="TValue">The repeated field value type of this extension</typeparam>
-    public sealed class RepeatedExtension<TTarget, TValue> : Extension where TTarget : IExtendableMessage<TTarget>
-    {
-        private readonly FieldCodec<TValue> codec;
-
-        /// <summary>
-        /// Creates a new repeated extension identifier with the specified field number and codec
-        /// </summary>
-        public RepeatedExtension(int fieldNumber, FieldCodec<TValue> codec) : base(fieldNumber)
-        {
-            this.codec = codec;
-        }
-
-        internal override Type TargetType => typeof(TTarget);
-
-        internal override bool IsRepeated => true;
-
-        internal override IExtensionValue CreateValue()
-        {
-            return new RepeatedExtensionValue<TValue>(codec);
-        }
-    }
-}
diff --git a/libs/protobuf/csharp/src/Google.Protobuf/ExtensionRegistry.cs b/libs/protobuf/csharp/src/Google.Protobuf/ExtensionRegistry.cs
deleted file mode 100644
index e72314b..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf/ExtensionRegistry.cs
+++ /dev/null
@@ -1,184 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace Google.Protobuf
-{
-    /// <summary>
-    /// Provides extensions to messages while parsing. This API is experimental and subject to change.
-    /// </summary>
-    public sealed class ExtensionRegistry : ICollection<Extension>, IDeepCloneable<ExtensionRegistry>
-    {
-        internal sealed class ExtensionComparer : IEqualityComparer<Extension>
-        {
-            public bool Equals(Extension a, Extension b)
-            {
-                return new ObjectIntPair<Type>(a.TargetType, a.FieldNumber).Equals(new ObjectIntPair<Type>(b.TargetType, b.FieldNumber));
-            }
-            public int GetHashCode(Extension a)
-            {
-                return new ObjectIntPair<Type>(a.TargetType, a.FieldNumber).GetHashCode();
-            }
-
-            internal static ExtensionComparer Instance = new ExtensionComparer();
-        }
-        private IDictionary<ObjectIntPair<Type>, Extension> extensions;
-
-        /// <summary>
-        /// Creates a new empty extension registry
-        /// </summary>
-        public ExtensionRegistry()
-        {
-            extensions = new Dictionary<ObjectIntPair<Type>, Extension>();
-        }
-
-        private ExtensionRegistry(IDictionary<ObjectIntPair<Type>, Extension> collection)
-        {
-            extensions = collection.ToDictionary(k => k.Key, v => v.Value);
-        }
-
-        /// <summary>
-        /// Gets the total number of extensions in this extension registry
-        /// </summary>
-        public int Count => extensions.Count;
-
-        /// <summary>
-        /// Returns whether the registry is readonly
-        /// </summary>
-        bool ICollection<Extension>.IsReadOnly => false;
-
-        internal bool ContainsInputField(uint lastTag, Type target, out Extension extension)
-        {
-            return extensions.TryGetValue(new ObjectIntPair<Type>(target, WireFormat.GetTagFieldNumber(lastTag)), out extension);
-        }
-
-        /// <summary>
-        /// Adds the specified extension to the registry
-        /// </summary>
-        public void Add(Extension extension)
-        {
-            ProtoPreconditions.CheckNotNull(extension, nameof(extension));
-
-            extensions.Add(new ObjectIntPair<Type>(extension.TargetType, extension.FieldNumber), extension);
-        }
-
-        /// <summary>
-        /// Adds the specified extensions to the registry
-        /// </summary>
-        public void AddRange(IEnumerable<Extension> extensions)
-        {
-            ProtoPreconditions.CheckNotNull(extensions, nameof(extensions));
-
-            foreach (var extension in extensions)
-            {
-                Add(extension);
-            }
-        }
-
-        /// <summary>
-        /// Clears the registry of all values
-        /// </summary>
-        public void Clear()
-        {
-            extensions.Clear();
-        }
-
-        /// <summary>
-        /// Gets whether the extension registry contains the specified extension
-        /// </summary>
-        public bool Contains(Extension item)
-        {
-            ProtoPreconditions.CheckNotNull(item, nameof(item));
-
-            return extensions.ContainsKey(new ObjectIntPair<Type>(item.TargetType, item.FieldNumber));
-        }
-
-        /// <summary>
-        /// Copies the arrays in the registry set to the specified array at the specified index
-        /// </summary>
-        /// <param name="array">The array to copy to</param>
-        /// <param name="arrayIndex">The array index to start at</param>
-        void ICollection<Extension>.CopyTo(Extension[] array, int arrayIndex)
-        {
-            ProtoPreconditions.CheckNotNull(array, nameof(array));
-            if (arrayIndex < 0 || arrayIndex >= array.Length)
-            {
-                throw new ArgumentOutOfRangeException(nameof(arrayIndex));
-            }
-            if (array.Length - arrayIndex < Count)
-            {
-                throw new ArgumentException("The provided array is shorter than the number of elements in the registry");
-            }
-
-            for (int i = 0; i < array.Length; i++)
-            {
-                Extension extension = array[i];
-                extensions.Add(new ObjectIntPair<Type>(extension.TargetType, extension.FieldNumber), extension);
-            }
-        }
-
-        /// <summary>
-        /// Returns an enumerator to enumerate through the items in the registry
-        /// </summary>
-        /// <returns>Returns an enumerator for the extensions in this registry</returns>
-        public IEnumerator<Extension> GetEnumerator()
-        {
-            return extensions.Values.GetEnumerator();
-        }
-
-        /// <summary>
-        /// Removes the specified extension from the set
-        /// </summary>
-        /// <param name="item">The extension</param>
-        /// <returns><c>true</c> if the extension was removed, otherwise <c>false</c></returns>
-        public bool Remove(Extension item)
-        {
-            ProtoPreconditions.CheckNotNull(item, nameof(item));
-
-            return extensions.Remove(new ObjectIntPair<Type>(item.TargetType, item.FieldNumber));
-        }
-
-        IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
-
-        /// <summary>
-        /// Clones the registry into a new registry
-        /// </summary>
-        public ExtensionRegistry Clone()
-        {
-            return new ExtensionRegistry(extensions);
-        }
-    }
-}
diff --git a/libs/protobuf/csharp/src/Google.Protobuf/ExtensionSet.cs b/libs/protobuf/csharp/src/Google.Protobuf/ExtensionSet.cs
deleted file mode 100644
index 306e45e..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf/ExtensionSet.cs
+++ /dev/null
@@ -1,428 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using Google.Protobuf.Collections;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using System.Security;
-
-namespace Google.Protobuf
-{
-    /// <summary>
-    /// Methods for managing <see cref="ExtensionSet{TTarget}"/>s with null checking.
-    /// 
-    /// Most users will not use this class directly and its API is experimental and subject to change.
-    /// </summary>
-    public static class ExtensionSet
-    {
-        private static bool TryGetValue<TTarget>(ref ExtensionSet<TTarget> set, Extension extension, out IExtensionValue value) where TTarget : IExtendableMessage<TTarget>
-        {
-            if (set == null)
-            {
-                value = null;
-                return false;
-            }
-            return set.ValuesByNumber.TryGetValue(extension.FieldNumber, out value);
-        }
-
-        /// <summary>
-        /// Gets the value of the specified extension
-        /// </summary>
-        public static TValue Get<TTarget, TValue>(ref ExtensionSet<TTarget> set, Extension<TTarget, TValue> extension) where TTarget : IExtendableMessage<TTarget>
-        {
-            IExtensionValue value;
-            if (TryGetValue(ref set, extension, out value))
-            {
-                // The stored ExtensionValue can be a different type to what is being requested.
-                // This happens when the same extension proto is compiled in different assemblies.
-                // To allow consuming assemblies to still get the value when the TValue type is
-                // different, this get method:
-                // 1. Attempts to cast the value to the expected ExtensionValue<TValue>.
-                //    This is the usual case. It is used first because it avoids possibly boxing the value.
-                // 2. Fallback to get the value as object from IExtensionValue then casting.
-                //    This allows for someone to specify a TValue of object. They can then convert
-                //    the values to bytes and reparse using expected value.
-                // 3. If neither of these work, throw a user friendly error that the types aren't compatible.
-                if (value is ExtensionValue<TValue> extensionValue)
-                {
-                    return extensionValue.GetValue();
-                }
-                else if (value.GetValue() is TValue underlyingValue)
-                {
-                    return underlyingValue;
-                }
-                else
-                {
-                    var valueType = value.GetType().GetTypeInfo();
-                    if (valueType.IsGenericType && valueType.GetGenericTypeDefinition() == typeof(ExtensionValue<>))
-                    {
-                        var storedType = valueType.GenericTypeArguments[0];
-                        throw new InvalidOperationException(
-                            "The stored extension value has a type of '" + storedType.AssemblyQualifiedName + "'. " +
-                            "This a different from the requested type of '" + typeof(TValue).AssemblyQualifiedName + "'.");
-                    }
-                    else
-                    {
-                        throw new InvalidOperationException("Unexpected extension value type: " + valueType.AssemblyQualifiedName);
-                    }
-                }
-            }
-            else 
-            {
-                return extension.DefaultValue;
-            }
-        }
-
-        /// <summary>
-        /// Gets the value of the specified repeated extension or null if it doesn't exist in this set
-        /// </summary>
-        public static RepeatedField<TValue> Get<TTarget, TValue>(ref ExtensionSet<TTarget> set, RepeatedExtension<TTarget, TValue> extension) where TTarget : IExtendableMessage<TTarget>
-        {
-            IExtensionValue value;
-            if (TryGetValue(ref set, extension, out value))
-            {
-                if (value is RepeatedExtensionValue<TValue> extensionValue)
-                {
-                    return extensionValue.GetValue();
-                }
-                else
-                {
-                    var valueType = value.GetType().GetTypeInfo();
-                    if (valueType.IsGenericType && valueType.GetGenericTypeDefinition() == typeof(RepeatedExtensionValue<>))
-                    {
-                        var storedType = valueType.GenericTypeArguments[0];
-                        throw new InvalidOperationException(
-                            "The stored extension value has a type of '" + storedType.AssemblyQualifiedName + "'. " +
-                            "This a different from the requested type of '" + typeof(TValue).AssemblyQualifiedName + "'.");
-                    }
-                    else
-                    {
-                        throw new InvalidOperationException("Unexpected extension value type: " + valueType.AssemblyQualifiedName);
-                    }
-                }
-            }
-            else 
-            {
-                return null;
-            }
-        }
-
-        /// <summary>
-        /// Gets the value of the specified repeated extension, registering it if it doesn't exist
-        /// </summary>
-        public static RepeatedField<TValue> GetOrInitialize<TTarget, TValue>(ref ExtensionSet<TTarget> set, RepeatedExtension<TTarget, TValue> extension) where TTarget : IExtendableMessage<TTarget>
-        {
-            IExtensionValue value;
-            if (set == null)
-            {
-                value = extension.CreateValue();
-                set = new ExtensionSet<TTarget>();
-                set.ValuesByNumber.Add(extension.FieldNumber, value);
-            }
-            else
-            {
-                if (!set.ValuesByNumber.TryGetValue(extension.FieldNumber, out value))
-                {
-                    value = extension.CreateValue();
-                    set.ValuesByNumber.Add(extension.FieldNumber, value);
-                }
-            }
-
-            return ((RepeatedExtensionValue<TValue>)value).GetValue();
-        }
-
-        /// <summary>
-        /// Sets the value of the specified extension. This will make a new instance of ExtensionSet if the set is null.
-        /// </summary>
-        public static void Set<TTarget, TValue>(ref ExtensionSet<TTarget> set, Extension<TTarget, TValue> extension, TValue value) where TTarget : IExtendableMessage<TTarget>
-        {
-            ProtoPreconditions.CheckNotNullUnconstrained(value, nameof(value));
-
-            IExtensionValue extensionValue;
-            if (set == null)
-            {
-                extensionValue = extension.CreateValue();
-                set = new ExtensionSet<TTarget>();
-                set.ValuesByNumber.Add(extension.FieldNumber, extensionValue);
-            }
-            else
-            {
-                if (!set.ValuesByNumber.TryGetValue(extension.FieldNumber, out extensionValue))
-                {
-                    extensionValue = extension.CreateValue();
-                    set.ValuesByNumber.Add(extension.FieldNumber, extensionValue);
-                }
-            }
-            
-            ((ExtensionValue<TValue>)extensionValue).SetValue(value);
-        }
-
-        /// <summary>
-        /// Gets whether the value of the specified extension is set
-        /// </summary>
-        public static bool Has<TTarget, TValue>(ref ExtensionSet<TTarget> set, Extension<TTarget, TValue> extension) where TTarget : IExtendableMessage<TTarget>
-        {
-            IExtensionValue value;
-            return TryGetValue(ref set, extension, out value);
-        }
-
-        /// <summary>
-        /// Clears the value of the specified extension
-        /// </summary>
-        public static void Clear<TTarget, TValue>(ref ExtensionSet<TTarget> set, Extension<TTarget, TValue> extension) where TTarget : IExtendableMessage<TTarget>
-        {
-            if (set == null)
-            {
-                return;
-            }
-            set.ValuesByNumber.Remove(extension.FieldNumber);
-            if (set.ValuesByNumber.Count == 0)
-            {
-                set = null;
-            }
-        }
-
-        /// <summary>
-        /// Clears the value of the specified extension
-        /// </summary>
-        public static void Clear<TTarget, TValue>(ref ExtensionSet<TTarget> set, RepeatedExtension<TTarget, TValue> extension) where TTarget : IExtendableMessage<TTarget>
-        {
-            if (set == null)
-            {
-                return;
-            }
-            set.ValuesByNumber.Remove(extension.FieldNumber);
-            if (set.ValuesByNumber.Count == 0)
-            {
-                set = null;
-            }
-        }
-
-        /// <summary>
-        /// Tries to merge a field from the coded input, returning true if the field was merged.
-        /// If the set is null or the field was not otherwise merged, this returns false.
-        /// </summary>
-        public static bool TryMergeFieldFrom<TTarget>(ref ExtensionSet<TTarget> set, CodedInputStream stream) where TTarget : IExtendableMessage<TTarget>
-        {
-            ParseContext.Initialize(stream, out ParseContext ctx);
-            try
-            {
-                return TryMergeFieldFrom<TTarget>(ref set, ref ctx);
-            }
-            finally
-            {
-                ctx.CopyStateTo(stream);
-            }
-        }
-
-        /// <summary>
-        /// Tries to merge a field from the coded input, returning true if the field was merged.
-        /// If the set is null or the field was not otherwise merged, this returns false.
-        /// </summary>
-        public static bool TryMergeFieldFrom<TTarget>(ref ExtensionSet<TTarget> set, ref ParseContext ctx) where TTarget : IExtendableMessage<TTarget>
-        {
-            Extension extension;
-            int lastFieldNumber = WireFormat.GetTagFieldNumber(ctx.LastTag);
-
-            IExtensionValue extensionValue;
-            if (set != null && set.ValuesByNumber.TryGetValue(lastFieldNumber, out extensionValue))
-            {
-                extensionValue.MergeFrom(ref ctx);
-                return true;
-            }
-            else if (ctx.ExtensionRegistry != null && ctx.ExtensionRegistry.ContainsInputField(ctx.LastTag, typeof(TTarget), out extension))
-            {
-                IExtensionValue value = extension.CreateValue();
-                value.MergeFrom(ref ctx);
-                set = (set ?? new ExtensionSet<TTarget>());
-                set.ValuesByNumber.Add(extension.FieldNumber, value);
-                return true;
-            }
-            else
-            {
-                return false;
-            }
-        }
-
-        /// <summary>
-        /// Merges the second set into the first set, creating a new instance if first is null
-        /// </summary>
-        public static void MergeFrom<TTarget>(ref ExtensionSet<TTarget> first, ExtensionSet<TTarget> second) where TTarget : IExtendableMessage<TTarget>
-        {
-            if (second == null)
-            {
-                return;
-            }
-            if (first == null)
-            {
-                first = new ExtensionSet<TTarget>();
-            }
-            foreach (var pair in second.ValuesByNumber)
-            {
-                IExtensionValue value;
-                if (first.ValuesByNumber.TryGetValue(pair.Key, out value))
-                {
-                    value.MergeFrom(pair.Value);
-                }
-                else
-                {
-                    var cloned = pair.Value.Clone();
-                    first.ValuesByNumber[pair.Key] = cloned;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Clones the set into a new set. If the set is null, this returns null
-        /// </summary>
-        public static ExtensionSet<TTarget> Clone<TTarget>(ExtensionSet<TTarget> set) where TTarget : IExtendableMessage<TTarget>
-        {
-            if (set == null)
-            {
-                return null;
-            }
-
-            var newSet = new ExtensionSet<TTarget>();
-            foreach (var pair in set.ValuesByNumber)
-            {
-                var cloned = pair.Value.Clone();
-                newSet.ValuesByNumber[pair.Key] = cloned;
-            }
-            return newSet;
-        }
-    }
-
-    /// <summary>
-    /// Used for keeping track of extensions in messages. 
-    /// <see cref="IExtendableMessage{T}"/> methods route to this set.
-    /// 
-    /// Most users will not need to use this class directly
-    /// </summary>
-    /// <typeparam name="TTarget">The message type that extensions in this set target</typeparam>
-    public sealed class ExtensionSet<TTarget> where TTarget : IExtendableMessage<TTarget>
-    {
-        internal Dictionary<int, IExtensionValue> ValuesByNumber { get; } = new Dictionary<int, IExtensionValue>();
-
-        /// <summary>
-        /// Gets a hash code of the set
-        /// </summary>
-        public override int GetHashCode()
-        {
-            int ret = typeof(TTarget).GetHashCode();
-            foreach (KeyValuePair<int, IExtensionValue> field in ValuesByNumber)
-            {
-                // Use ^ here to make the field order irrelevant.
-                int hash = field.Key.GetHashCode() ^ field.Value.GetHashCode();
-                ret ^= hash;
-            }
-            return ret;
-        }
-
-        /// <summary>
-        /// Returns whether this set is equal to the other object
-        /// </summary>
-        public override bool Equals(object other)
-        {
-            if (ReferenceEquals(this, other))
-            {
-                return true;
-            }
-            ExtensionSet<TTarget> otherSet = other as ExtensionSet<TTarget>;
-            if (ValuesByNumber.Count != otherSet.ValuesByNumber.Count)
-            {
-                return false;
-            }
-            foreach (var pair in ValuesByNumber)
-            {
-                IExtensionValue secondValue;
-                if (!otherSet.ValuesByNumber.TryGetValue(pair.Key, out secondValue))
-                {
-                    return false;
-                }
-                if (!pair.Value.Equals(secondValue))
-                {
-                    return false;
-                }
-            }
-            return true;
-        }
-
-        /// <summary>
-        /// Calculates the size of this extension set
-        /// </summary>
-        public int CalculateSize()
-        {
-            int size = 0;
-            foreach (var value in ValuesByNumber.Values)
-            {
-                size += value.CalculateSize();
-            }
-            return size;
-        }
-
-        /// <summary>
-        /// Writes the extension values in this set to the output stream
-        /// </summary>
-        public void WriteTo(CodedOutputStream stream)
-        {
-            
-            WriteContext.Initialize(stream, out WriteContext ctx);
-            try
-            {
-                WriteTo(ref ctx);
-            }
-            finally
-            {
-                ctx.CopyStateTo(stream);
-            }
-        }
-
-        /// <summary>
-        /// Writes the extension values in this set to the write context
-        /// </summary>
-        [SecuritySafeCritical]
-        public void WriteTo(ref WriteContext ctx)
-        {
-            foreach (var value in ValuesByNumber.Values)
-            {
-                value.WriteTo(ref ctx);
-            }
-        }
-
-        internal bool IsInitialized()
-        {
-            return ValuesByNumber.Values.All(v => v.IsInitialized());
-        }
-    }
-}
diff --git a/libs/protobuf/csharp/src/Google.Protobuf/ExtensionValue.cs b/libs/protobuf/csharp/src/Google.Protobuf/ExtensionValue.cs
deleted file mode 100644
index 1329b2f..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf/ExtensionValue.cs
+++ /dev/null
@@ -1,230 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using Google.Protobuf.Collections;
-using System;
-using System.Linq;
-
-namespace Google.Protobuf
-{
-    internal interface IExtensionValue : IEquatable<IExtensionValue>, IDeepCloneable<IExtensionValue>
-    {
-        void MergeFrom(ref ParseContext ctx);
-
-        void MergeFrom(IExtensionValue value);
-        void WriteTo(ref WriteContext ctx);
-        int CalculateSize();
-        bool IsInitialized();
-        object GetValue();
-    }
-
-    internal sealed class ExtensionValue<T> : IExtensionValue
-    {
-        private T field;
-        private FieldCodec<T> codec;
-
-        internal ExtensionValue(FieldCodec<T> codec)
-        {
-            this.codec = codec;
-            field = codec.DefaultValue;
-        }
-
-        public int CalculateSize()
-        {
-            return codec.CalculateUnconditionalSizeWithTag(field);
-        }
-
-        public IExtensionValue Clone()
-        {
-            return new ExtensionValue<T>(codec)
-            {
-                field = field is IDeepCloneable<T> ? (field as IDeepCloneable<T>).Clone() : field
-            };
-        }
-
-        public bool Equals(IExtensionValue other)
-        {
-            if (ReferenceEquals(this, other))
-                return true;
-
-            return other is ExtensionValue<T>
-                && codec.Equals((other as ExtensionValue<T>).codec)
-                && Equals(field, (other as ExtensionValue<T>).field);
-            // we check for equality in the codec since we could have equal field values however the values could be written in different ways
-        }
-
-        public override int GetHashCode()
-        {
-            unchecked
-            {
-                int hash = 17;
-                hash = hash * 31 + field.GetHashCode();
-                hash = hash * 31 + codec.GetHashCode();
-                return hash;
-            }
-        }
-
-        public void MergeFrom(ref ParseContext ctx)
-        {
-            codec.ValueMerger(ref ctx, ref field);
-        }
-
-        public void MergeFrom(IExtensionValue value)
-        {
-            if (value is ExtensionValue<T>)
-            {
-                var extensionValue = value as ExtensionValue<T>;
-                codec.FieldMerger(ref field, extensionValue.field);
-            }
-        }
-
-        public void WriteTo(ref WriteContext ctx)
-        {
-            ctx.WriteTag(codec.Tag);
-            codec.ValueWriter(ref ctx, field);
-            if (codec.EndTag != 0)
-            {
-                ctx.WriteTag(codec.EndTag);
-            }
-        }
-
-        public T GetValue() => field;
-
-        object IExtensionValue.GetValue() => field;
-
-        public void SetValue(T value)
-        {
-            field = value;
-        }
-
-        public bool IsInitialized()
-        {
-            if (field is IMessage)
-            {
-                return (field as IMessage).IsInitialized();
-            }
-            else
-            {
-                return true;
-            }
-        }
-    }
-
-    internal sealed class RepeatedExtensionValue<T> : IExtensionValue
-    {
-        private RepeatedField<T> field;
-        private readonly FieldCodec<T> codec;
-
-        internal RepeatedExtensionValue(FieldCodec<T> codec)
-        {
-            this.codec = codec;
-            field = new RepeatedField<T>();
-        }
-
-        public int CalculateSize()
-        {
-            return field.CalculateSize(codec);
-        }
-
-        public IExtensionValue Clone()
-        {
-            return new RepeatedExtensionValue<T>(codec)
-            {
-                field = field.Clone()
-            };
-        }
-
-        public bool Equals(IExtensionValue other)
-        {
-            if (ReferenceEquals(this, other))
-                return true;
-
-            return other is RepeatedExtensionValue<T> 
-                && field.Equals((other as RepeatedExtensionValue<T>).field) 
-                && codec.Equals((other as RepeatedExtensionValue<T>).codec);
-        }
-
-        public override int GetHashCode()
-        {
-            unchecked
-            {
-                int hash = 17;
-                hash = hash * 31 + field.GetHashCode();
-                hash = hash * 31 + codec.GetHashCode();
-                return hash;
-            }
-        }
-
-        public void MergeFrom(ref ParseContext ctx)
-        {
-            field.AddEntriesFrom(ref ctx, codec);
-        }
-
-        public void MergeFrom(IExtensionValue value)
-        {
-            if (value is RepeatedExtensionValue<T>)
-            {
-                field.Add((value as RepeatedExtensionValue<T>).field);
-            }
-        }
-
-        public void WriteTo(ref WriteContext ctx)
-        {
-            field.WriteTo(ref ctx, codec);
-        }
-
-        public RepeatedField<T> GetValue() => field;
-
-        object IExtensionValue.GetValue() => field;
-
-        public bool IsInitialized()
-        {
-            for (int i = 0; i < field.Count; i++)
-            {
-                var element = field[i];
-                if (element is IMessage)
-                {
-                    if (!(element as IMessage).IsInitialized())
-                    {
-                        return false;
-                    }
-                }
-                else
-                {
-                    break;
-                }
-            }
-
-            return true;
-        }
-    }
-}
diff --git a/libs/protobuf/csharp/src/Google.Protobuf/FieldCodec.cs b/libs/protobuf/csharp/src/Google.Protobuf/FieldCodec.cs
deleted file mode 100644
index ee6bd6a..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf/FieldCodec.cs
+++ /dev/null
@@ -1,887 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using Google.Protobuf.Collections;
-using Google.Protobuf.Compatibility;
-using Google.Protobuf.WellKnownTypes;
-using System;
-using System.Collections.Generic;
-using System.Security;
-
-namespace Google.Protobuf
-{
-    /// <summary>
-    /// Factory methods for <see cref="FieldCodec{T}"/>.
-    /// </summary>
-    public static class FieldCodec
-    {
-        // TODO: Avoid the "dual hit" of lambda expressions: create open delegates instead. (At least test...)
-
-        /// <summary>
-        /// Retrieves a codec suitable for a string field with the given tag.
-        /// </summary>
-        /// <param name="tag">The tag.</param>
-        /// <returns>A codec for the given tag.</returns>
-        public static FieldCodec<string> ForString(uint tag)
-        {
-            return FieldCodec.ForString(tag, "");
-        }
-
-        /// <summary>
-        /// Retrieves a codec suitable for a bytes field with the given tag.
-        /// </summary>
-        /// <param name="tag">The tag.</param>
-        /// <returns>A codec for the given tag.</returns>
-        public static FieldCodec<ByteString> ForBytes(uint tag)
-        {
-            return FieldCodec.ForBytes(tag, ByteString.Empty);
-        }
-
-        /// <summary>
-        /// Retrieves a codec suitable for a bool field with the given tag.
-        /// </summary>
-        /// <param name="tag">The tag.</param>
-        /// <returns>A codec for the given tag.</returns>
-        public static FieldCodec<bool> ForBool(uint tag)
-        {
-            return FieldCodec.ForBool(tag, false);
-        }
-
-        /// <summary>
-        /// Retrieves a codec suitable for an int32 field with the given tag.
-        /// </summary>
-        /// <param name="tag">The tag.</param>
-        /// <returns>A codec for the given tag.</returns>
-        public static FieldCodec<int> ForInt32(uint tag)
-        {
-            return FieldCodec.ForInt32(tag, 0);
-        }
-
-        /// <summary>
-        /// Retrieves a codec suitable for an sint32 field with the given tag.
-        /// </summary>
-        /// <param name="tag">The tag.</param>
-        /// <returns>A codec for the given tag.</returns>
-        public static FieldCodec<int> ForSInt32(uint tag)
-        {
-            return FieldCodec.ForSInt32(tag, 0);
-        }
-
-        /// <summary>
-        /// Retrieves a codec suitable for a fixed32 field with the given tag.
-        /// </summary>
-        /// <param name="tag">The tag.</param>
-        /// <returns>A codec for the given tag.</returns>
-        public static FieldCodec<uint> ForFixed32(uint tag)
-        {
-            return FieldCodec.ForFixed32(tag, 0);
-        }
-
-        /// <summary>
-        /// Retrieves a codec suitable for an sfixed32 field with the given tag.
-        /// </summary>
-        /// <param name="tag">The tag.</param>
-        /// <returns>A codec for the given tag.</returns>
-        public static FieldCodec<int> ForSFixed32(uint tag)
-        {
-            return FieldCodec.ForSFixed32(tag, 0);
-        }
-
-        /// <summary>
-        /// Retrieves a codec suitable for a uint32 field with the given tag.
-        /// </summary>
-        /// <param name="tag">The tag.</param>
-        /// <returns>A codec for the given tag.</returns>
-        public static FieldCodec<uint> ForUInt32(uint tag)
-        {
-            return FieldCodec.ForUInt32(tag, 0);
-        }
-
-        /// <summary>
-        /// Retrieves a codec suitable for an int64 field with the given tag.
-        /// </summary>
-        /// <param name="tag">The tag.</param>
-        /// <returns>A codec for the given tag.</returns>
-        public static FieldCodec<long> ForInt64(uint tag)
-        {
-            return FieldCodec.ForInt64(tag, 0);
-        }
-
-        /// <summary>
-        /// Retrieves a codec suitable for an sint64 field with the given tag.
-        /// </summary>
-        /// <param name="tag">The tag.</param>
-        /// <returns>A codec for the given tag.</returns>
-        public static FieldCodec<long> ForSInt64(uint tag)
-        {
-            return FieldCodec.ForSInt64(tag, 0);
-        }
-
-        /// <summary>
-        /// Retrieves a codec suitable for a fixed64 field with the given tag.
-        /// </summary>
-        /// <param name="tag">The tag.</param>
-        /// <returns>A codec for the given tag.</returns>
-        public static FieldCodec<ulong> ForFixed64(uint tag)
-        {
-            return FieldCodec.ForFixed64(tag, 0);
-        }
-
-        /// <summary>
-        /// Retrieves a codec suitable for an sfixed64 field with the given tag.
-        /// </summary>
-        /// <param name="tag">The tag.</param>
-        /// <returns>A codec for the given tag.</returns>
-        public static FieldCodec<long> ForSFixed64(uint tag)
-        {
-            return FieldCodec.ForSFixed64(tag, 0);
-        }
-
-        /// <summary>
-        /// Retrieves a codec suitable for a uint64 field with the given tag.
-        /// </summary>
-        /// <param name="tag">The tag.</param>
-        /// <returns>A codec for the given tag.</returns>
-        public static FieldCodec<ulong> ForUInt64(uint tag)
-        {
-            return FieldCodec.ForUInt64(tag, 0);
-        }
-
-        /// <summary>
-        /// Retrieves a codec suitable for a float field with the given tag.
-        /// </summary>
-        /// <param name="tag">The tag.</param>
-        /// <returns>A codec for the given tag.</returns>
-        public static FieldCodec<float> ForFloat(uint tag)
-        {
-            return FieldCodec.ForFloat(tag, 0);
-        }
-
-        /// <summary>
-        /// Retrieves a codec suitable for a double field with the given tag.
-        /// </summary>
-        /// <param name="tag">The tag.</param>
-        /// <returns>A codec for the given tag.</returns>
-        public static FieldCodec<double> ForDouble(uint tag)
-        {
-            return FieldCodec.ForDouble(tag, 0);
-        }
-
-        // Enums are tricky. We can probably use expression trees to build these delegates automatically,
-        // but it's easy to generate the code for it.
-
-        /// <summary>
-        /// Retrieves a codec suitable for an enum field with the given tag.
-        /// </summary>
-        /// <param name="tag">The tag.</param>
-        /// <param name="toInt32">A conversion function from <see cref="Int32"/> to the enum type.</param>
-        /// <param name="fromInt32">A conversion function from the enum type to <see cref="Int32"/>.</param>
-        /// <returns>A codec for the given tag.</returns>
-        public static FieldCodec<T> ForEnum<T>(uint tag, Func<T, int> toInt32, Func<int, T> fromInt32)
-        {
-            return FieldCodec.ForEnum(tag, toInt32, fromInt32, default(T));
-        }
-
-        /// <summary>
-        /// Retrieves a codec suitable for a string field with the given tag.
-        /// </summary>
-        /// <param name="tag">The tag.</param>
-        /// <param name="defaultValue">The default value.</param>
-        /// <returns>A codec for the given tag.</returns>
-        public static FieldCodec<string> ForString(uint tag, string defaultValue)
-        {
-            return new FieldCodec<string>((ref ParseContext ctx) => ctx.ReadString(), (ref WriteContext ctx, string value) => ctx.WriteString(value), CodedOutputStream.ComputeStringSize, tag, defaultValue);
-        }
-
-        /// <summary>
-        /// Retrieves a codec suitable for a bytes field with the given tag.
-        /// </summary>
-        /// <param name="tag">The tag.</param>
-        /// <param name="defaultValue">The default value.</param>
-        /// <returns>A codec for the given tag.</returns>
-        public static FieldCodec<ByteString> ForBytes(uint tag, ByteString defaultValue)
-        {
-            return new FieldCodec<ByteString>((ref ParseContext ctx) => ctx.ReadBytes(), (ref WriteContext ctx, ByteString value) => ctx.WriteBytes(value), CodedOutputStream.ComputeBytesSize, tag, defaultValue);
-        }
-
-        /// <summary>
-        /// Retrieves a codec suitable for a bool field with the given tag.
-        /// </summary>
-        /// <param name="tag">The tag.</param>
-        /// <param name="defaultValue">The default value.</param>
-        /// <returns>A codec for the given tag.</returns>
-        public static FieldCodec<bool> ForBool(uint tag, bool defaultValue)
-        {
-            return new FieldCodec<bool>((ref ParseContext ctx) => ctx.ReadBool(), (ref WriteContext ctx, bool value) => ctx.WriteBool(value), CodedOutputStream.BoolSize, tag, defaultValue);
-        }
-
-        /// <summary>
-        /// Retrieves a codec suitable for an int32 field with the given tag.
-        /// </summary>
-        /// <param name="tag">The tag.</param>
-        /// <param name="defaultValue">The default value.</param>
-        /// <returns>A codec for the given tag.</returns>
-        public static FieldCodec<int> ForInt32(uint tag, int defaultValue)
-        {
-            return new FieldCodec<int>((ref ParseContext ctx) => ctx.ReadInt32(), (ref WriteContext output, int value) => output.WriteInt32(value), CodedOutputStream.ComputeInt32Size, tag, defaultValue);
-        }
-
-        /// <summary>
-        /// Retrieves a codec suitable for an sint32 field with the given tag.
-        /// </summary>
-        /// <param name="tag">The tag.</param>
-        /// <param name="defaultValue">The default value.</param>
-        /// <returns>A codec for the given tag.</returns>
-        public static FieldCodec<int> ForSInt32(uint tag, int defaultValue)
-        {
-            return new FieldCodec<int>((ref ParseContext ctx) => ctx.ReadSInt32(), (ref WriteContext output, int value) => output.WriteSInt32(value), CodedOutputStream.ComputeSInt32Size, tag, defaultValue);
-        }
-
-        /// <summary>
-        /// Retrieves a codec suitable for a fixed32 field with the given tag.
-        /// </summary>
-        /// <param name="tag">The tag.</param>
-        /// <param name="defaultValue">The default value.</param>
-        /// <returns>A codec for the given tag.</returns>
-        public static FieldCodec<uint> ForFixed32(uint tag, uint defaultValue)
-        {
-            return new FieldCodec<uint>((ref ParseContext ctx) => ctx.ReadFixed32(), (ref WriteContext output, uint value) => output.WriteFixed32(value), 4, tag, defaultValue);
-        }
-
-        /// <summary>
-        /// Retrieves a codec suitable for an sfixed32 field with the given tag.
-        /// </summary>
-        /// <param name="tag">The tag.</param>
-        /// <param name="defaultValue">The default value.</param>
-        /// <returns>A codec for the given tag.</returns>
-        public static FieldCodec<int> ForSFixed32(uint tag, int defaultValue)
-        {
-            return new FieldCodec<int>((ref ParseContext ctx) => ctx.ReadSFixed32(), (ref WriteContext output, int value) => output.WriteSFixed32(value), 4, tag, defaultValue);
-        }
-
-        /// <summary>
-        /// Retrieves a codec suitable for a uint32 field with the given tag.
-        /// </summary>
-        /// <param name="tag">The tag.</param>
-        /// <param name="defaultValue">The default value.</param>
-        /// <returns>A codec for the given tag.</returns>
-        public static FieldCodec<uint> ForUInt32(uint tag, uint defaultValue)
-        {
-            return new FieldCodec<uint>((ref ParseContext ctx) => ctx.ReadUInt32(), (ref WriteContext output, uint value) => output.WriteUInt32(value), CodedOutputStream.ComputeUInt32Size, tag, defaultValue);
-        }
-
-        /// <summary>
-        /// Retrieves a codec suitable for an int64 field with the given tag.
-        /// </summary>
-        /// <param name="tag">The tag.</param>
-        /// <param name="defaultValue">The default value.</param>
-        /// <returns>A codec for the given tag.</returns>
-        public static FieldCodec<long> ForInt64(uint tag, long defaultValue)
-        {
-            return new FieldCodec<long>((ref ParseContext ctx) => ctx.ReadInt64(), (ref WriteContext output, long value) => output.WriteInt64(value), CodedOutputStream.ComputeInt64Size, tag, defaultValue);
-        }
-
-        /// <summary>
-        /// Retrieves a codec suitable for an sint64 field with the given tag.
-        /// </summary>
-        /// <param name="tag">The tag.</param>
-        /// <param name="defaultValue">The default value.</param>
-        /// <returns>A codec for the given tag.</returns>
-        public static FieldCodec<long> ForSInt64(uint tag, long defaultValue)
-        {
-            return new FieldCodec<long>((ref ParseContext ctx) => ctx.ReadSInt64(), (ref WriteContext output, long value) => output.WriteSInt64(value), CodedOutputStream.ComputeSInt64Size, tag, defaultValue);
-        }
-
-        /// <summary>
-        /// Retrieves a codec suitable for a fixed64 field with the given tag.
-        /// </summary>
-        /// <param name="tag">The tag.</param>
-        /// <param name="defaultValue">The default value.</param>
-        /// <returns>A codec for the given tag.</returns>
-        public static FieldCodec<ulong> ForFixed64(uint tag, ulong defaultValue)
-        {
-            return new FieldCodec<ulong>((ref ParseContext ctx) => ctx.ReadFixed64(), (ref WriteContext output, ulong value) => output.WriteFixed64(value), 8, tag, defaultValue);
-        }
-
-        /// <summary>
-        /// Retrieves a codec suitable for an sfixed64 field with the given tag.
-        /// </summary>
-        /// <param name="tag">The tag.</param>
-        /// <param name="defaultValue">The default value.</param>
-        /// <returns>A codec for the given tag.</returns>
-        public static FieldCodec<long> ForSFixed64(uint tag, long defaultValue)
-        {
-            return new FieldCodec<long>((ref ParseContext ctx) => ctx.ReadSFixed64(), (ref WriteContext output, long value) => output.WriteSFixed64(value), 8, tag, defaultValue);
-        }
-
-        /// <summary>
-        /// Retrieves a codec suitable for a uint64 field with the given tag.
-        /// </summary>
-        /// <param name="tag">The tag.</param>
-        /// <param name="defaultValue">The default value.</param>
-        /// <returns>A codec for the given tag.</returns>
-        public static FieldCodec<ulong> ForUInt64(uint tag, ulong defaultValue)
-        {
-            return new FieldCodec<ulong>((ref ParseContext ctx) => ctx.ReadUInt64(), (ref WriteContext output, ulong value) => output.WriteUInt64(value), CodedOutputStream.ComputeUInt64Size, tag, defaultValue);
-        }
-
-        /// <summary>
-        /// Retrieves a codec suitable for a float field with the given tag.
-        /// </summary>
-        /// <param name="tag">The tag.</param>
-        /// <param name="defaultValue">The default value.</param>
-        /// <returns>A codec for the given tag.</returns>
-        public static FieldCodec<float> ForFloat(uint tag, float defaultValue)
-        {
-            return new FieldCodec<float>((ref ParseContext ctx) => ctx.ReadFloat(), (ref WriteContext output, float value) => output.WriteFloat(value), CodedOutputStream.FloatSize, tag, defaultValue);
-        }
-
-        /// <summary>
-        /// Retrieves a codec suitable for a double field with the given tag.
-        /// </summary>
-        /// <param name="tag">The tag.</param>
-        /// <param name="defaultValue">The default value.</param>
-        /// <returns>A codec for the given tag.</returns>
-        public static FieldCodec<double> ForDouble(uint tag, double defaultValue)
-        {
-            return new FieldCodec<double>((ref ParseContext ctx) => ctx.ReadDouble(), (ref WriteContext output, double value) => output.WriteDouble(value), CodedOutputStream.DoubleSize, tag, defaultValue);
-        }
-
-        // Enums are tricky. We can probably use expression trees to build these delegates automatically,
-        // but it's easy to generate the code for it.
-
-        /// <summary>
-        /// Retrieves a codec suitable for an enum field with the given tag.
-        /// </summary>
-        /// <param name="tag">The tag.</param>
-        /// <param name="toInt32">A conversion function from <see cref="Int32"/> to the enum type.</param>
-        /// <param name="fromInt32">A conversion function from the enum type to <see cref="Int32"/>.</param>
-        /// <param name="defaultValue">The default value.</param>
-        /// <returns>A codec for the given tag.</returns>
-        public static FieldCodec<T> ForEnum<T>(uint tag, Func<T, int> toInt32, Func<int, T> fromInt32, T defaultValue)
-        {
-            return new FieldCodec<T>((ref ParseContext ctx) => fromInt32(
-                ctx.ReadEnum()),
-                (ref WriteContext output, T value) => output.WriteEnum(toInt32(value)),
-                value => CodedOutputStream.ComputeEnumSize(toInt32(value)), tag, defaultValue);
-        }
-
-        /// <summary>
-        /// Retrieves a codec suitable for a message field with the given tag.
-        /// </summary>
-        /// <param name="tag">The tag.</param>
-        /// <param name="parser">A parser to use for the message type.</param>
-        /// <returns>A codec for the given tag.</returns>
-        public static FieldCodec<T> ForMessage<T>(uint tag, MessageParser<T> parser) where T : class, IMessage<T>
-        {
-            return new FieldCodec<T>(
-                (ref ParseContext ctx) => 
-                { 
-                    T message = parser.CreateTemplate(); 
-                    ctx.ReadMessage(message); 
-                    return message; 
-                },
-                (ref WriteContext output, T value) => output.WriteMessage(value),
-                (ref ParseContext ctx, ref T v) => 
-                {
-                    if (v == null)
-                    {
-                        v = parser.CreateTemplate();
-                    }
-
-                    ctx.ReadMessage(v);
-                },
-                (ref T v, T v2) =>
-                {
-                    if (v2 == null)
-                    {
-                        return false;
-                    }
-                    else if (v == null)
-                    {
-                        v = v2.Clone();
-                    }
-                    else
-                    {
-                        v.MergeFrom(v2);
-                    }
-                    return true;
-                }, 
-                message => CodedOutputStream.ComputeMessageSize(message), tag);
-        }
-
-        /// <summary>
-        /// Retrieves a codec suitable for a group field with the given tag.
-        /// </summary>
-        /// <param name="startTag">The start group tag.</param>
-        /// <param name="endTag">The end group tag.</param>
-        /// <param name="parser">A parser to use for the group message type.</param>
-        /// <returns>A codec for given tag</returns>
-        public static FieldCodec<T> ForGroup<T>(uint startTag, uint endTag, MessageParser<T> parser) where T : class, IMessage<T>
-        {
-            return new FieldCodec<T>(
-                (ref ParseContext ctx) => 
-                { 
-                    T message = parser.CreateTemplate();
-                    ctx.ReadGroup(message);
-                    return message;
-                },
-                (ref WriteContext output, T value) => output.WriteGroup(value), 
-                (ref ParseContext ctx, ref T v) => 
-                {
-                    if (v == null)
-                    {
-                        v = parser.CreateTemplate();
-                    }
-
-                    ctx.ReadGroup(v);
-                },
-                (ref T v, T v2) =>
-                {
-                    if (v2 == null)
-                    {
-                        return v == null;
-                    }
-                    else if (v == null)
-                    {
-                        v = v2.Clone();
-                    }
-                    else
-                    {
-                        v.MergeFrom(v2);
-                    }
-                    return true;
-                }, 
-                message => CodedOutputStream.ComputeGroupSize(message), startTag, endTag);
-        }
-
-        /// <summary>
-        /// Creates a codec for a wrapper type of a class - which must be string or ByteString.
-        /// </summary>
-        public static FieldCodec<T> ForClassWrapper<T>(uint tag) where T : class
-        {
-            var nestedCodec = WrapperCodecs.GetCodec<T>();
-            return new FieldCodec<T>(
-                (ref ParseContext ctx) => WrapperCodecs.Read<T>(ref ctx, nestedCodec),
-                (ref WriteContext output, T value) => WrapperCodecs.Write<T>(ref output, value, nestedCodec),
-                (ref ParseContext ctx, ref T v) => v = WrapperCodecs.Read<T>(ref ctx, nestedCodec),
-                (ref T v, T v2) => { v = v2; return v == null; },
-                value => WrapperCodecs.CalculateSize<T>(value, nestedCodec),
-                tag, 0,
-                null); // Default value for the wrapper
-        }
-
-        /// <summary>
-        /// Creates a codec for a wrapper type of a struct - which must be Int32, Int64, UInt32, UInt64,
-        /// Bool, Single or Double.
-        /// </summary>
-        public static FieldCodec<T?> ForStructWrapper<T>(uint tag) where T : struct
-        {
-            var nestedCodec = WrapperCodecs.GetCodec<T>();
-            return new FieldCodec<T?>(
-                WrapperCodecs.GetReader<T>(),
-                (ref WriteContext output, T? value) => WrapperCodecs.Write<T>(ref output, value.Value, nestedCodec),
-                (ref ParseContext ctx, ref T? v) => v = WrapperCodecs.Read<T>(ref ctx, nestedCodec),
-                (ref T? v, T? v2) => { if (v2.HasValue) { v = v2; } return v.HasValue; },
-                value => value == null ? 0 : WrapperCodecs.CalculateSize<T>(value.Value, nestedCodec),
-                tag, 0,
-                null); // Default value for the wrapper
-        }
-
-        /// <summary>
-        /// Helper code to create codecs for wrapper types.
-        /// </summary>
-        /// <remarks>
-        /// Somewhat ugly with all the static methods, but the conversions involved to/from nullable types make it
-        /// slightly tricky to improve. So long as we keep the public API (ForClassWrapper, ForStructWrapper) in place,
-        /// we can refactor later if we come up with something cleaner.
-        /// </remarks>
-        private static class WrapperCodecs
-        {
-            private static readonly Dictionary<System.Type, object> Codecs = new Dictionary<System.Type, object>
-            {
-                { typeof(bool), ForBool(WireFormat.MakeTag(WrappersReflection.WrapperValueFieldNumber, WireFormat.WireType.Varint)) },
-                { typeof(int), ForInt32(WireFormat.MakeTag(WrappersReflection.WrapperValueFieldNumber, WireFormat.WireType.Varint)) },
-                { typeof(long), ForInt64(WireFormat.MakeTag(WrappersReflection.WrapperValueFieldNumber, WireFormat.WireType.Varint)) },
-                { typeof(uint), ForUInt32(WireFormat.MakeTag(WrappersReflection.WrapperValueFieldNumber, WireFormat.WireType.Varint)) },
-                { typeof(ulong), ForUInt64(WireFormat.MakeTag(WrappersReflection.WrapperValueFieldNumber, WireFormat.WireType.Varint)) },
-                { typeof(float), ForFloat(WireFormat.MakeTag(WrappersReflection.WrapperValueFieldNumber, WireFormat.WireType.Fixed32)) },
-                { typeof(double), ForDouble(WireFormat.MakeTag(WrappersReflection.WrapperValueFieldNumber, WireFormat.WireType.Fixed64)) },
-                { typeof(string), ForString(WireFormat.MakeTag(WrappersReflection.WrapperValueFieldNumber, WireFormat.WireType.LengthDelimited)) },
-                { typeof(ByteString), ForBytes(WireFormat.MakeTag(WrappersReflection.WrapperValueFieldNumber, WireFormat.WireType.LengthDelimited)) }
-            };
-
-            private static readonly Dictionary<System.Type, object> Readers = new Dictionary<System.Type, object>
-            {
-                // TODO: Provide more optimized readers.
-                { typeof(bool), (ValueReader<bool?>)ParsingPrimitivesWrappers.ReadBoolWrapper },
-                { typeof(int), (ValueReader<int?>)ParsingPrimitivesWrappers.ReadInt32Wrapper },
-                { typeof(long), (ValueReader<long?>)ParsingPrimitivesWrappers.ReadInt64Wrapper },
-                { typeof(uint), (ValueReader<uint?>)ParsingPrimitivesWrappers.ReadUInt32Wrapper },
-                { typeof(ulong), (ValueReader<ulong?>)ParsingPrimitivesWrappers.ReadUInt64Wrapper },
-                { typeof(float), BitConverter.IsLittleEndian ?
-                    (ValueReader<float?>)ParsingPrimitivesWrappers.ReadFloatWrapperLittleEndian :
-                    (ValueReader<float?>)ParsingPrimitivesWrappers.ReadFloatWrapperSlow },
-                { typeof(double), BitConverter.IsLittleEndian ?
-                    (ValueReader<double?>)ParsingPrimitivesWrappers.ReadDoubleWrapperLittleEndian :
-                    (ValueReader<double?>)ParsingPrimitivesWrappers.ReadDoubleWrapperSlow },
-                // `string` and `ByteString` less performance-sensitive. Do not implement for now.
-                { typeof(string), null },
-                { typeof(ByteString), null },
-            };
-
-            /// <summary>
-            /// Returns a field codec which effectively wraps a value of type T in a message.
-            ///
-            /// </summary>
-            internal static FieldCodec<T> GetCodec<T>()
-            {
-                object value;
-                if (!Codecs.TryGetValue(typeof(T), out value))
-                {
-                    throw new InvalidOperationException("Invalid type argument requested for wrapper codec: " + typeof(T));
-                }
-                return (FieldCodec<T>) value;
-            }
-
-            internal static ValueReader<T?> GetReader<T>() where T : struct
-            {
-                object value;
-                if (!Readers.TryGetValue(typeof(T), out value))
-                {
-                    throw new InvalidOperationException("Invalid type argument requested for wrapper reader: " + typeof(T));
-                }
-                if (value == null)
-                {
-                    // Return default unoptimized reader for the wrapper type.
-                    var nestedCoded = GetCodec<T>();
-                    return (ref ParseContext ctx) => Read<T>(ref ctx, nestedCoded);
-                }
-                // Return optimized read for the wrapper type.
-                return (ValueReader<T?>)value;
-            }
-
-            [SecuritySafeCritical]
-            internal static T Read<T>(ref ParseContext ctx, FieldCodec<T> codec)
-            {
-                int length = ctx.ReadLength();
-                int oldLimit = SegmentedBufferHelper.PushLimit(ref ctx.state, length);
-
-                uint tag;
-                T value = codec.DefaultValue;
-                while ((tag = ctx.ReadTag()) != 0)
-                {
-                    if (tag == codec.Tag)
-                    {
-                        value = codec.Read(ref ctx);
-                    }
-                    else
-                    {
-                        ParsingPrimitivesMessages.SkipLastField(ref ctx.buffer, ref ctx.state);
-                    }
-
-                }
-                ParsingPrimitivesMessages.CheckReadEndOfStreamTag(ref ctx.state);
-                SegmentedBufferHelper.PopLimit(ref ctx.state, oldLimit);
-
-                return value;
-            }
-
-            internal static void Write<T>(ref WriteContext ctx, T value, FieldCodec<T> codec)
-            {
-                ctx.WriteLength(codec.CalculateSizeWithTag(value));
-                codec.WriteTagAndValue(ref ctx, value);
-            }
-
-            internal  static int CalculateSize<T>(T value, FieldCodec<T> codec)
-            {
-                int fieldLength = codec.CalculateSizeWithTag(value);
-                return CodedOutputStream.ComputeLengthSize(fieldLength) + fieldLength;
-            }
-        }
-    }
-
-    internal delegate TValue ValueReader<out TValue>(ref ParseContext ctx);
-    internal delegate void ValueWriter<T>(ref WriteContext ctx, T value);
-
-    /// <summary>
-    /// <para>
-    /// An encode/decode pair for a single field. This effectively encapsulates
-    /// all the information needed to read or write the field value from/to a coded
-    /// stream.
-    /// </para>
-    /// <para>
-    /// This class is public and has to be as it is used by generated code, but its public
-    /// API is very limited - just what the generated code needs to call directly.
-    /// </para>
-    /// </summary>
-    /// <remarks>
-    /// This never writes default values to the stream, and does not address "packedness"
-    /// in repeated fields itself, other than to know whether or not the field *should* be packed.
-    /// </remarks>
-    public sealed class FieldCodec<T>
-    {
-        private static readonly EqualityComparer<T> EqualityComparer = ProtobufEqualityComparers.GetEqualityComparer<T>();
-        private static readonly T DefaultDefault;
-        // Only non-nullable value types support packing. This is the simplest way of detecting that.
-        private static readonly bool TypeSupportsPacking = default(T) != null;
-
-        /// <summary>
-        /// Merges an input stream into a value
-        /// </summary>
-        internal delegate void InputMerger(ref ParseContext ctx, ref T value);
-
-        /// <summary>
-        /// Merges a value into a reference to another value, returning a boolean if the value was set
-        /// </summary>
-        internal delegate bool ValuesMerger(ref T value, T other);
-
-        static FieldCodec()
-        {
-            if (typeof(T) == typeof(string))
-            {
-                DefaultDefault = (T)(object)"";
-            }
-            else if (typeof(T) == typeof(ByteString))
-            {
-                DefaultDefault = (T)(object)ByteString.Empty;
-            }
-            // Otherwise it's the default value of the CLR type
-        }
-
-        internal static bool IsPackedRepeatedField(uint tag) =>
-            TypeSupportsPacking && WireFormat.GetTagWireType(tag) == WireFormat.WireType.LengthDelimited;
-
-        internal bool PackedRepeatedField { get; }
-
-        /// <summary>
-        /// Returns a delegate to write a value (unconditionally) to a coded output stream.
-        /// </summary>
-        internal ValueWriter<T> ValueWriter { get; }
-
-        /// <summary>
-        /// Returns the size calculator for just a value.
-        /// </summary>
-        internal Func<T, int> ValueSizeCalculator { get; }
-
-        /// <summary>
-        /// Returns a delegate to read a value from a coded input stream. It is assumed that
-        /// the stream is already positioned on the appropriate tag.
-        /// </summary>
-        internal ValueReader<T> ValueReader { get; }
-
-        /// <summary>
-        /// Returns a delegate to merge a value from a coded input stream.
-        /// It is assumed that the stream is already positioned on the appropriate tag
-        /// </summary>
-        internal InputMerger ValueMerger { get; }
-
-        /// <summary>
-        /// Returns a delegate to merge two values together.
-        /// </summary>
-        internal ValuesMerger FieldMerger { get; }
-
-        /// <summary>
-        /// Returns the fixed size for an entry, or 0 if sizes vary.
-        /// </summary>
-        internal int FixedSize { get; }
-
-        /// <summary>
-        /// Gets the tag of the codec.
-        /// </summary>
-        /// <value>
-        /// The tag of the codec.
-        /// </value>
-        internal uint Tag { get; }
-
-        /// <summary>
-        /// Gets the end tag of the codec or 0 if there is no end tag
-        /// </summary>
-        /// <value>
-        /// The end tag of the codec.
-        /// </value>
-        internal uint EndTag { get; }
-
-        /// <summary>
-        /// Default value for this codec. Usually the same for every instance of the same type, but
-        /// for string/ByteString wrapper fields the codec's default value is null, whereas for
-        /// other string/ByteString fields it's "" or ByteString.Empty.
-        /// </summary>
-        /// <value>
-        /// The default value of the codec's type.
-        /// </value>
-        internal T DefaultValue { get; }
-
-        private readonly int tagSize;
-
-        internal FieldCodec(
-                ValueReader<T> reader,
-                ValueWriter<T> writer,
-                int fixedSize,
-                uint tag,
-                T defaultValue) : this(reader, writer, _ => fixedSize, tag, defaultValue)
-        {
-            FixedSize = fixedSize;
-        }
-
-        internal FieldCodec(
-            ValueReader<T> reader,
-            ValueWriter<T> writer,
-            Func<T, int> sizeCalculator,
-            uint tag,
-            T defaultValue) : this(reader, writer, (ref ParseContext ctx, ref T v) => v = reader(ref ctx), (ref T v, T v2) => { v = v2; return true; }, sizeCalculator, tag, 0, defaultValue)
-        {
-        }
-
-        internal FieldCodec(
-            ValueReader<T> reader,
-            ValueWriter<T> writer,
-            InputMerger inputMerger,
-            ValuesMerger valuesMerger,
-            Func<T, int> sizeCalculator,
-            uint tag,
-            uint endTag = 0) : this(reader, writer, inputMerger, valuesMerger, sizeCalculator, tag, endTag, DefaultDefault)
-        {
-        }
-
-        internal FieldCodec(
-            ValueReader<T> reader,
-            ValueWriter<T> writer,
-            InputMerger inputMerger,
-            ValuesMerger valuesMerger,
-            Func<T, int> sizeCalculator,
-            uint tag,
-            uint endTag,
-            T defaultValue)
-        {
-            ValueReader = reader;
-            ValueWriter = writer;
-            ValueMerger = inputMerger;
-            FieldMerger = valuesMerger;
-            ValueSizeCalculator = sizeCalculator;
-            FixedSize = 0;
-            Tag = tag;
-            EndTag = endTag;
-            DefaultValue = defaultValue;
-            tagSize = CodedOutputStream.ComputeRawVarint32Size(tag);
-            if (endTag != 0)
-                tagSize += CodedOutputStream.ComputeRawVarint32Size(endTag);
-            // Detect packed-ness once, so we can check for it within RepeatedField<T>.
-            PackedRepeatedField = IsPackedRepeatedField(tag);
-        }
-
-        /// <summary>
-        /// Write a tag and the given value, *if* the value is not the default.
-        /// </summary>
-        public void WriteTagAndValue(CodedOutputStream output, T value)
-        {
-            WriteContext.Initialize(output, out WriteContext ctx);
-            try
-            {
-                WriteTagAndValue(ref ctx, value);
-            }
-            finally
-            {
-                ctx.CopyStateTo(output);
-            }
-
-
-            //if (!IsDefault(value))
-            //{
-            //    output.WriteTag(Tag);
-            //    ValueWriter(output, value);
-            //    if (EndTag != 0)
-            //    {
-            //        output.WriteTag(EndTag);
-            //    }
-            //}
-        }
-
-        /// <summary>
-        /// Write a tag and the given value, *if* the value is not the default.
-        /// </summary>
-        public void WriteTagAndValue(ref WriteContext ctx, T value)
-        {
-            if (!IsDefault(value))
-            {
-                ctx.WriteTag(Tag);
-                ValueWriter(ref ctx, value);
-                if (EndTag != 0)
-                {
-                    ctx.WriteTag(EndTag);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Reads a value of the codec type from the given <see cref="CodedInputStream"/>.
-        /// </summary>
-        /// <param name="input">The input stream to read from.</param>
-        /// <returns>The value read from the stream.</returns>
-        public T Read(CodedInputStream input)
-        {
-            ParseContext.Initialize(input, out ParseContext ctx);
-            try
-            {
-                return ValueReader(ref ctx);
-            }
-            finally
-            {
-                ctx.CopyStateTo(input);
-            }
-        }
-
-        /// <summary>
-        /// Reads a value of the codec type from the given <see cref="ParseContext"/>.
-        /// </summary>
-        /// <param name="ctx">The parse context to read from.</param>
-        /// <returns>The value read.</returns>
-        public T Read(ref ParseContext ctx)
-        {
-            return ValueReader(ref ctx);
-        }
-
-        /// <summary>
-        /// Calculates the size required to write the given value, with a tag,
-        /// if the value is not the default.
-        /// </summary>
-        public int CalculateSizeWithTag(T value) => IsDefault(value) ? 0 : ValueSizeCalculator(value) + tagSize;
-
-        /// <summary>
-        /// Calculates the size required to write the given value, with a tag, even
-        /// if the value is the default.
-        /// </summary>
-        internal int CalculateUnconditionalSizeWithTag(T value) => ValueSizeCalculator(value) + tagSize;
-
-        private bool IsDefault(T value) => EqualityComparer.Equals(value, DefaultValue);
-    }
-}
diff --git a/libs/protobuf/csharp/src/Google.Protobuf/FieldMaskTree.cs b/libs/protobuf/csharp/src/Google.Protobuf/FieldMaskTree.cs
deleted file mode 100644
index 2297e7a..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf/FieldMaskTree.cs
+++ /dev/null
@@ -1,365 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System.Collections;
-using System.Collections.Generic;
-using System.Diagnostics;
-using Google.Protobuf.Reflection;
-using Google.Protobuf.WellKnownTypes;
-
-namespace Google.Protobuf
-{
-    /// <summary>
-    /// <para>A tree representation of a FieldMask. Each leaf node in this tree represent
-    /// a field path in the FieldMask.</para>
-    ///
-    /// <para>For example, FieldMask "foo.bar,foo.baz,bar.baz" as a tree will be:</para>
-    /// <code>
-    ///   [root] -+- foo -+- bar
-    ///           |       |
-    ///           |       +- baz
-    ///           |
-    ///           +- bar --- baz
-    /// </code>
-    ///
-    /// <para>By representing FieldMasks with this tree structure we can easily convert
-    /// a FieldMask to a canonical form, merge two FieldMasks, calculate the
-    /// intersection to two FieldMasks and traverse all fields specified by the
-    /// FieldMask in a message tree.</para>
-    /// </summary>
-    internal sealed class FieldMaskTree
-    {
-        private const char FIELD_PATH_SEPARATOR = '.';
-
-        internal sealed class Node
-        {
-            public Dictionary<string, Node> Children { get; } = new Dictionary<string, Node>();
-        }
-
-        private readonly Node root = new Node();
-
-        /// <summary>
-        /// Creates an empty FieldMaskTree.
-        /// </summary>
-        public FieldMaskTree()
-        {
-        }
-
-        /// <summary>
-        /// Creates a FieldMaskTree for a given FieldMask.
-        /// </summary>
-        public FieldMaskTree(FieldMask mask)
-        {
-            MergeFromFieldMask(mask);
-        }
-
-        public override string ToString()
-        {
-            return ToFieldMask().ToString();
-        }
-
-        /// <summary>
-        /// Adds a field path to the tree. In a FieldMask, every field path matches the
-        /// specified field as well as all its sub-fields. For example, a field path
-        /// "foo.bar" matches field "foo.bar" and also "foo.bar.baz", etc. When adding
-        /// a field path to the tree, redundant sub-paths will be removed. That is,
-        /// after adding "foo.bar" to the tree, "foo.bar.baz" will be removed if it
-        /// exists, which will turn the tree node for "foo.bar" to a leaf node.
-        /// Likewise, if the field path to add is a sub-path of an existing leaf node,
-        /// nothing will be changed in the tree.
-        /// </summary>
-        public FieldMaskTree AddFieldPath(string path)
-        {
-            var parts = path.Split(FIELD_PATH_SEPARATOR);
-            if (parts.Length == 0)
-            {
-                return this;
-            }
-
-            var node = root;
-            var createNewBranch = false;
-
-            // Find the matching node in the tree.
-            foreach (var part in parts)
-            {
-                // Check whether the path matches an existing leaf node.
-                if (!createNewBranch
-                    && node != root
-                    && node.Children.Count == 0)
-                {
-                    // The path to add is a sub-path of an existing leaf node.
-                    return this;
-                }
-
-                Node childNode;
-                if (!node.Children.TryGetValue(part, out childNode))
-                {
-                    createNewBranch = true;
-                    childNode = new Node();
-                    node.Children.Add(part, childNode);
-                }
-                node = childNode;
-            }
-
-            // Turn the matching node into a leaf node (i.e., remove sub-paths).
-            node.Children.Clear();
-            return this;
-        }
-
-        /// <summary>
-        /// Merges all field paths in a FieldMask into this tree.
-        /// </summary>
-        public FieldMaskTree MergeFromFieldMask(FieldMask mask)
-        {
-            foreach (var path in mask.Paths)
-            {
-                AddFieldPath(path);
-            }
-
-            return this;
-        }
-
-        /// <summary>
-        /// Converts this tree to a FieldMask.
-        /// </summary>
-        public FieldMask ToFieldMask()
-        {
-            var mask = new FieldMask();
-            if (root.Children.Count != 0)
-            {
-                var paths = new List<string>();
-                GetFieldPaths(root, "", paths);
-                mask.Paths.AddRange(paths);
-            }
-
-            return mask;
-        }
-
-        /// <summary>
-        /// Gathers all field paths in a sub-tree.
-        /// </summary>
-        private void GetFieldPaths(Node node, string path, List<string> paths)
-        {
-            if (node.Children.Count == 0)
-            {
-                paths.Add(path);
-                return;
-            }
-
-            foreach (var entry in node.Children)
-            {
-                var childPath = path.Length == 0 ? entry.Key : path + "." + entry.Key;
-                GetFieldPaths(entry.Value, childPath, paths);
-            }
-        }
-
-        /// <summary>
-        /// Adds the intersection of this tree with the given <paramref name="path"/> to <paramref name="output"/>.
-        /// </summary>
-        public void IntersectFieldPath(string path, FieldMaskTree output)
-        {
-            if (root.Children.Count == 0)
-            {
-                return;
-            }
-
-            var parts = path.Split(FIELD_PATH_SEPARATOR);
-            if (parts.Length == 0)
-            {
-                return;
-            }
-
-            var node = root;
-            foreach (var part in parts)
-            {
-                if (node != root
-                    && node.Children.Count == 0)
-                {
-                    // The given path is a sub-path of an existing leaf node in the tree.
-                    output.AddFieldPath(path);
-                    return;
-                }
-
-                if (!node.Children.TryGetValue(part, out node))
-                {
-                    return;
-                }
-            }
-
-            // We found a matching node for the path. All leaf children of this matching
-            // node is in the intersection.
-            var paths = new List<string>();
-            GetFieldPaths(node, path, paths);
-            foreach (var value in paths)
-            {
-                output.AddFieldPath(value);
-            }
-        }
-
-        /// <summary>
-        /// Merges all fields specified by this FieldMaskTree from <paramref name="source"/> to <paramref name="destination"/>.
-        /// </summary>
-        public void Merge(IMessage source, IMessage destination, FieldMask.MergeOptions options)
-        {
-            if (source.Descriptor != destination.Descriptor)
-            {
-                throw new InvalidProtocolBufferException("Cannot merge messages of different types.");
-            }
-
-            if (root.Children.Count == 0)
-            {
-                return;
-            }
-
-            Merge(root, "", source, destination, options);
-        }
-
-        /// <summary>
-        /// Merges all fields specified by a sub-tree from <paramref name="source"/> to <paramref name="destination"/>.
-        /// </summary>
-        private void Merge(
-            Node node,
-            string path,
-            IMessage source,
-            IMessage destination,
-            FieldMask.MergeOptions options)
-        {
-            if (source.Descriptor != destination.Descriptor)
-            {
-                throw new InvalidProtocolBufferException($"source ({source.Descriptor}) and destination ({destination.Descriptor}) descriptor must be equal");
-            }
-
-            var descriptor = source.Descriptor;
-            foreach (var entry in node.Children)
-            {
-                var field = descriptor.FindFieldByName(entry.Key);
-                if (field == null)
-                {
-                    Debug.WriteLine($"Cannot find field \"{entry.Key}\" in message type \"{descriptor.FullName}\"");
-                    continue;
-                }
-
-                if (entry.Value.Children.Count != 0)
-                {
-                    if (field.IsRepeated
-                        || field.FieldType != FieldType.Message)
-                    {
-                        Debug.WriteLine($"Field \"{field.FullName}\" is not a singular message field and cannot have sub-fields.");
-                        continue;
-                    }
-
-                    var sourceField = field.Accessor.GetValue(source);
-                    var destinationField = field.Accessor.GetValue(destination);
-                    if (sourceField == null
-                        && destinationField == null)
-                    {
-                        // If the message field is not present in both source and destination, skip recursing
-                        // so we don't create unnecessary empty messages.
-                        continue;
-                    }
-
-                    if (destinationField == null)
-                    {
-                        // If we have to merge but the destination does not contain the field, create it.
-                        destinationField = field.MessageType.Parser.CreateTemplate();
-                        field.Accessor.SetValue(destination, destinationField);
-                    }
-
-                    var childPath = path.Length == 0 ? entry.Key : path + "." + entry.Key;
-                    Merge(entry.Value, childPath, (IMessage)sourceField, (IMessage)destinationField, options);
-                    continue;
-                }
-
-                if (field.IsRepeated)
-                {
-                    if (options.ReplaceRepeatedFields)
-                    {
-                        field.Accessor.Clear(destination);
-                    }
-
-                    var sourceField = (IList)field.Accessor.GetValue(source);
-                    var destinationField = (IList)field.Accessor.GetValue(destination);
-                    foreach (var element in sourceField)
-                    {
-                        destinationField.Add(element);
-                    }
-                }
-                else
-                {
-                    var sourceField = field.Accessor.GetValue(source);
-                    if (field.FieldType == FieldType.Message)
-                    {
-                        if (options.ReplaceMessageFields)
-                        {
-                            if (sourceField == null)
-                            {
-                                field.Accessor.Clear(destination);
-                            }
-                            else
-                            {
-                                field.Accessor.SetValue(destination, sourceField);
-                            }
-                        }
-                        else
-                        {
-                            if (sourceField != null)
-                            {
-                                var sourceByteString = ((IMessage)sourceField).ToByteString();
-                                var destinationValue = (IMessage)field.Accessor.GetValue(destination);
-                                if (destinationValue != null)
-                                {
-                                    destinationValue.MergeFrom(sourceByteString);
-                                }
-                                else
-                                {
-                                    field.Accessor.SetValue(destination, field.MessageType.Parser.ParseFrom(sourceByteString));
-                                }
-                            }
-                        }
-                    }
-                    else
-                    {
-                        if (sourceField != null
-                            || !options.ReplacePrimitiveFields)
-                        {
-                            field.Accessor.SetValue(destination, sourceField);
-                        }
-                        else
-                        {
-                            field.Accessor.Clear(destination);
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/libs/protobuf/csharp/src/Google.Protobuf/FrameworkPortability.cs b/libs/protobuf/csharp/src/Google.Protobuf/FrameworkPortability.cs
deleted file mode 100644
index 1606411..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf/FrameworkPortability.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-using System.Text.RegularExpressions;
-
-namespace Google.Protobuf
-{
-    /// <summary>
-    /// Class containing helpful workarounds for various platform compatibility
-    /// </summary>
-    internal static class FrameworkPortability
-    {
-        // The value of RegexOptions.Compiled is 8. We can test for the presence at
-        // execution time using Enum.IsDefined, so a single build will do the right thing
-        // on each platform. (RegexOptions.Compiled isn't supported by PCLs.)
-        internal static readonly RegexOptions CompiledRegexWhereAvailable =
-            Enum.IsDefined(typeof(RegexOptions), 8) ? (RegexOptions)8 : RegexOptions.None;
-    }
-}
\ No newline at end of file
diff --git a/libs/protobuf/csharp/src/Google.Protobuf/Google.Protobuf.csproj b/libs/protobuf/csharp/src/Google.Protobuf/Google.Protobuf.csproj
deleted file mode 100644
index 3c42b9e..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf/Google.Protobuf.csproj
+++ /dev/null
@@ -1,52 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <Description>C# runtime library for Protocol Buffers - Google's data interchange format.</Description>
-    <Copyright>Copyright 2015, Google Inc.</Copyright>
-    <AssemblyTitle>Google Protocol Buffers</AssemblyTitle>
-    <VersionPrefix>3.21.12</VersionPrefix>
-    <!-- C# 7.2 is required for Span/BufferWriter/ReadOnlySequence -->
-    <LangVersion>7.2</LangVersion>
-    <Authors>Google Inc.</Authors>
-    <TargetFrameworks>netstandard1.1;netstandard2.0;net45;net50</TargetFrameworks>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <AssemblyOriginatorKeyFile>../../keys/Google.Protobuf.snk</AssemblyOriginatorKeyFile>
-    <SignAssembly>true</SignAssembly>
-    <PackageTags>Protocol;Buffers;Binary;Serialization;Format;Google;proto;proto3</PackageTags>
-    <PackageReleaseNotes>C# proto3 support</PackageReleaseNotes>
-    <PackageProjectUrl>https://github.com/protocolbuffers/protobuf</PackageProjectUrl>
-    <PackageLicenseExpression>BSD-3-Clause</PackageLicenseExpression>
-    <RepositoryType>git</RepositoryType>
-    <RepositoryUrl>https://github.com/protocolbuffers/protobuf.git</RepositoryUrl>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <EmbedUntrackedSources>true</EmbedUntrackedSources>
-    <!-- Include PDB in the built .nupkg -->
-    <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
-    <IsTrimmable>true</IsTrimmable>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
-    <DefineConstants>$(DefineConstants);GOOGLE_PROTOBUF_SUPPORT_FAST_STRING</DefineConstants>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'net50' ">
-    <DefineConstants>$(DefineConstants);GOOGLE_PROTOBUF_SUPPORT_FAST_STRING;GOOGLE_PROTOBUF_SIMD</DefineConstants>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" Version="1.0.0"/>
-    <!-- Needed for the net45 build to work on Unix. See https://github.com/dotnet/designs/pull/33 -->
-    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" Version="1.0.0"/>
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net45' OR '$(TargetFramework)' == 'netstandard1.1' ">
-    <PackageReference Include="System.Memory" Version="4.5.3"/>
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
-    <PackageReference Include="System.Memory" Version="4.5.3"/>
-    <!-- Needed for netcoreapp3.1 to work correctly. .NET is not able to load the assembly without this -->
-    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.5.2"/>
-  </ItemGroup>
-
-</Project>
diff --git a/libs/protobuf/csharp/src/Google.Protobuf/IBufferMessage.cs b/libs/protobuf/csharp/src/Google.Protobuf/IBufferMessage.cs
deleted file mode 100644
index 05c15db..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf/IBufferMessage.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-namespace Google.Protobuf
-{
-    /// <summary>
-    /// Interface for a Protocol Buffers message, supporting
-    /// parsing from <see cref="ParseContext"/> and writing to <see cref="WriteContext"/>.
-    /// </summary>
-    public interface IBufferMessage : IMessage
-    {
-        /// <summary>
-        /// Internal implementation of merging data from given parse context into this message.
-        /// Users should never invoke this method directly.
-        /// </summary>        
-        void InternalMergeFrom(ref ParseContext ctx);
-
-        /// <summary>
-        /// Internal implementation of writing this message to a given write context.
-        /// Users should never invoke this method directly.
-        /// </summary>        
-        void InternalWriteTo(ref WriteContext ctx);
-    }
-}
diff --git a/libs/protobuf/csharp/src/Google.Protobuf/ICustomDiagnosticMessage.cs b/libs/protobuf/csharp/src/Google.Protobuf/ICustomDiagnosticMessage.cs
deleted file mode 100644
index a009056..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf/ICustomDiagnosticMessage.cs
+++ /dev/null
@@ -1,69 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2016 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-namespace Google.Protobuf
-{
-    /// <summary>
-    /// A message type that has a custom string format for diagnostic purposes.
-    /// </summary>
-    /// <remarks>
-    /// <para>
-    /// Calling <see cref="object.ToString"/> on a generated message type normally
-    /// returns the JSON representation. If a message type implements this interface,
-    /// then the <see cref="ToDiagnosticString"/> method will be called instead of the regular
-    /// JSON formatting code, but only when <c>ToString()</c> is called either on the message itself
-    /// or on another message which contains it. This does not affect the normal JSON formatting of
-    /// the message.
-    /// </para>
-    /// <para>
-    /// For example, if you create a proto message representing a GUID, the internal
-    /// representation may be a <c>bytes</c> field or four <c>fixed32</c> fields. However, when debugging
-    /// it may be more convenient to see a result in the same format as <see cref="System.Guid"/> provides.
-    /// </para>
-    /// <para>This interface extends <see cref="IMessage"/> to avoid it accidentally being implemented
-    /// on types other than messages, where it would not be used by anything in the framework.</para>
-    /// </remarks>
-    public interface ICustomDiagnosticMessage : IMessage
-    {
-        /// <summary>
-        /// Returns a string representation of this object, for diagnostic purposes.
-        /// </summary>
-        /// <remarks>
-        /// This method is called when a message is formatted as part of a <see cref="object.ToString"/>
-        /// call. It does not affect the JSON representation used by <see cref="JsonFormatter"/> other than
-        /// in calls to <see cref="JsonFormatter.ToDiagnosticString(IMessage)"/>. While it is recommended
-        /// that the result is valid JSON, this is never assumed by the Protobuf library.
-        /// </remarks>
-        /// <returns>A string representation of this object, for diagnostic purposes.</returns>
-        string ToDiagnosticString();
-    }
-}
diff --git a/libs/protobuf/csharp/src/Google.Protobuf/IDeepCloneable.cs b/libs/protobuf/csharp/src/Google.Protobuf/IDeepCloneable.cs
deleted file mode 100644
index c9c71bb..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf/IDeepCloneable.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-namespace Google.Protobuf
-{
-    /// <summary>
-    /// Generic interface for a deeply cloneable type.
-    /// </summary>
-    /// <remarks>
-    /// <para>
-    /// All generated messages implement this interface, but so do some non-message types.
-    /// Additionally, due to the type constraint on <c>T</c> in <see cref="IMessage{T}"/>,
-    /// it is simpler to keep this as a separate interface.
-    /// </para>
-    /// </remarks>
-    /// <typeparam name="T">The type itself, returned by the <see cref="Clone"/> method.</typeparam>
-    public interface IDeepCloneable<T>
-    {
-        /// <summary>
-        /// Creates a deep clone of this object.
-        /// </summary>
-        /// <returns>A deep clone of this object.</returns>
-        T Clone();
-    }
-}
diff --git a/libs/protobuf/csharp/src/Google.Protobuf/IExtendableMessage.cs b/libs/protobuf/csharp/src/Google.Protobuf/IExtendableMessage.cs
deleted file mode 100644
index 8fca2b4..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf/IExtendableMessage.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using Google.Protobuf.Collections;
-
-namespace Google.Protobuf
-{
-    /// <summary>
-    /// Generic interface for a Protocol Buffers message containing one or more extensions, where the type parameter is expected to be the same type as the implementation class.
-    /// This interface is experiemental and is subject to change.
-    /// </summary>
-    public interface IExtendableMessage<T> : IMessage<T> where T : IExtendableMessage<T>
-    {
-        /// <summary>
-        /// Gets the value of the specified extension
-        /// </summary>
-        TValue GetExtension<TValue>(Extension<T, TValue> extension);
-
-        /// <summary>
-        /// Gets the value of the specified repeated extension or null if the extension isn't registered in this set.
-        /// For a version of this method that never returns null, use <see cref="IExtendableMessage{T}.GetOrInitializeExtension{TValue}(RepeatedExtension{T, TValue})"/>
-        /// </summary>
-        RepeatedField<TValue> GetExtension<TValue>(RepeatedExtension<T, TValue> extension);
-
-        /// <summary>
-        /// Gets the value of the specified repeated extension, registering it if it hasn't already been registered.
-        /// </summary>
-        RepeatedField<TValue> GetOrInitializeExtension<TValue>(RepeatedExtension<T, TValue> extension);
-
-        /// <summary>
-        /// Sets the value of the specified extension
-        /// </summary>
-        void SetExtension<TValue>(Extension<T, TValue> extension, TValue value);
-
-        /// <summary>
-        /// Gets whether the value of the specified extension is set
-        /// </summary>
-        bool HasExtension<TValue>(Extension<T, TValue> extension);
-
-        /// <summary>
-        /// Clears the value of the specified extension
-        /// </summary>
-        void ClearExtension<TValue>(Extension<T, TValue> extension);
-
-        /// <summary>
-        /// Clears the value of the specified repeated extension
-        /// </summary>
-        void ClearExtension<TValue>(RepeatedExtension<T, TValue> extension);
-    }
-}
diff --git a/libs/protobuf/csharp/src/Google.Protobuf/IMessage.cs b/libs/protobuf/csharp/src/Google.Protobuf/IMessage.cs
deleted file mode 100644
index 3e644c1..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf/IMessage.cs
+++ /dev/null
@@ -1,87 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-using Google.Protobuf.Reflection;
-
-namespace Google.Protobuf
-{
-    /// <summary>
-    /// Interface for a Protocol Buffers message, supporting
-    /// basic operations required for serialization.
-    /// </summary>
-    public interface IMessage
-    {
-        /// <summary>
-        /// Merges the data from the specified coded input stream with the current message.
-        /// </summary>
-        /// <remarks>See the user guide for precise merge semantics.</remarks>
-        /// <param name="input"></param>
-        void MergeFrom(CodedInputStream input);
-
-        /// <summary>
-        /// Writes the data to the given coded output stream.
-        /// </summary>
-        /// <param name="output">Coded output stream to write the data to. Must not be null.</param>
-        void WriteTo(CodedOutputStream output);
-
-        /// <summary>
-        /// Calculates the size of this message in Protocol Buffer wire format, in bytes.
-        /// </summary>
-        /// <returns>The number of bytes required to write this message
-        /// to a coded output stream.</returns>
-        int CalculateSize();
-
-        /// <summary>
-        /// Descriptor for this message. All instances are expected to return the same descriptor,
-        /// and for generated types this will be an explicitly-implemented member, returning the
-        /// same value as the static property declared on the type.
-        /// </summary>
-        MessageDescriptor Descriptor { get; }
-    }
-
-    /// <summary>
-    /// Generic interface for a Protocol Buffers message,
-    /// where the type parameter is expected to be the same type as
-    /// the implementation class.
-    /// </summary>
-    /// <typeparam name="T">The message type.</typeparam>
-    public interface IMessage<T> : IMessage, IEquatable<T>, IDeepCloneable<T> where T : IMessage<T>
-    {
-        /// <summary>
-        /// Merges the given message into this one.
-        /// </summary>
-        /// <remarks>See the user guide for precise merge semantics.</remarks>
-        /// <param name="message">The message to merge with this one. Must not be null.</param>
-        void MergeFrom(T message);
-    }
-}
diff --git a/libs/protobuf/csharp/src/Google.Protobuf/InvalidJsonException.cs b/libs/protobuf/csharp/src/Google.Protobuf/InvalidJsonException.cs
deleted file mode 100644
index b543420..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf/InvalidJsonException.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System.IO;
-
-namespace Google.Protobuf
-{
-    /// <summary>
-    /// Thrown when an attempt is made to parse invalid JSON, e.g. using
-    /// a non-string property key, or including a redundant comma. Parsing a protocol buffer
-    /// message represented in JSON using <see cref="JsonParser"/> can throw both this
-    /// exception and <see cref="InvalidProtocolBufferException"/> depending on the situation. This
-    /// exception is only thrown for "pure JSON" errors, whereas <c>InvalidProtocolBufferException</c>
-    /// is thrown when the JSON may be valid in and of itself, but cannot be parsed as a protocol buffer
-    /// message.
-    /// </summary>
-    public sealed class InvalidJsonException : IOException
-    {
-        internal InvalidJsonException(string message)
-            : base(message)
-        {
-        }
-    }
-}
\ No newline at end of file
diff --git a/libs/protobuf/csharp/src/Google.Protobuf/InvalidProtocolBufferException.cs b/libs/protobuf/csharp/src/Google.Protobuf/InvalidProtocolBufferException.cs
deleted file mode 100644
index 6a3dbd6..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf/InvalidProtocolBufferException.cs
+++ /dev/null
@@ -1,140 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-using System.IO;
-
-namespace Google.Protobuf
-{
-    /// <summary>
-    /// Thrown when a protocol message being parsed is invalid in some way,
-    /// e.g. it contains a malformed varint or a negative byte length.
-    /// </summary>
-    public sealed class InvalidProtocolBufferException : IOException
-    {
-        internal InvalidProtocolBufferException(string message)
-            : base(message)
-        {
-        }
-
-        internal InvalidProtocolBufferException(string message, Exception innerException)
-            : base(message, innerException)
-        {
-        }
-
-        internal static InvalidProtocolBufferException MoreDataAvailable()
-        {
-            return new InvalidProtocolBufferException(
-                "Completed reading a message while more data was available in the stream.");
-        }
-
-        internal static InvalidProtocolBufferException TruncatedMessage()
-        {
-            return new InvalidProtocolBufferException(
-                "While parsing a protocol message, the input ended unexpectedly " +
-                "in the middle of a field.  This could mean either that the " +
-                "input has been truncated or that an embedded message " +
-                "misreported its own length.");
-        }
-
-        internal static InvalidProtocolBufferException NegativeSize()
-        {
-            return new InvalidProtocolBufferException(
-                "CodedInputStream encountered an embedded string or message " +
-                "which claimed to have negative size.");
-        }
-
-        internal static InvalidProtocolBufferException MalformedVarint()
-        {
-            return new InvalidProtocolBufferException(
-                "CodedInputStream encountered a malformed varint.");
-        }
-
-        /// <summary>
-        /// Creates an exception for an error condition of an invalid tag being encountered.
-        /// </summary>
-        internal static InvalidProtocolBufferException InvalidTag()
-        {
-            return new InvalidProtocolBufferException(
-                "Protocol message contained an invalid tag (zero).");
-        }
-
-        internal static InvalidProtocolBufferException InvalidWireType()
-        {
-            return new InvalidProtocolBufferException(
-                "Protocol message contained a tag with an invalid wire type.");
-        }
-
-        internal static InvalidProtocolBufferException InvalidBase64(Exception innerException)
-        {
-            return new InvalidProtocolBufferException("Invalid base64 data", innerException);
-        }
-
-        internal static InvalidProtocolBufferException InvalidEndTag()
-        {
-            return new InvalidProtocolBufferException(
-                "Protocol message end-group tag did not match expected tag.");
-        }
-
-        internal static InvalidProtocolBufferException RecursionLimitExceeded()
-        {
-            return new InvalidProtocolBufferException(
-                "Protocol message had too many levels of nesting.  May be malicious.  " +
-                "Use CodedInputStream.SetRecursionLimit() to increase the depth limit.");
-        }
-
-        internal static InvalidProtocolBufferException JsonRecursionLimitExceeded()
-        {
-            return new InvalidProtocolBufferException(
-                "Protocol message had too many levels of nesting.  May be malicious.  " +
-                "Use JsonParser.Settings to increase the depth limit.");
-        }
-
-        internal static InvalidProtocolBufferException SizeLimitExceeded()
-        {
-            return new InvalidProtocolBufferException(
-                "Protocol message was too large.  May be malicious.  " +
-                "Use CodedInputStream.SetSizeLimit() to increase the size limit.");
-        }
-
-        internal static InvalidProtocolBufferException InvalidMessageStreamTag()
-        {
-            return new InvalidProtocolBufferException(
-                "Stream of protocol messages had invalid tag. Expected tag is length-delimited field 1.");
-        }
-
-        internal static InvalidProtocolBufferException MissingFields()
-        {
-            return new InvalidProtocolBufferException("Message was missing required fields");
-        }
-}
-}
\ No newline at end of file
diff --git a/libs/protobuf/csharp/src/Google.Protobuf/JsonFormatter.cs b/libs/protobuf/csharp/src/Google.Protobuf/JsonFormatter.cs
deleted file mode 100644
index 16f7c5a..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf/JsonFormatter.cs
+++ /dev/null
@@ -1,943 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-using System.Collections;
-using System.Globalization;
-using System.Text;
-using Google.Protobuf.Reflection;
-using Google.Protobuf.WellKnownTypes;
-using System.IO;
-using System.Linq;
-using System.Collections.Generic;
-using System.Reflection;
-using System.Diagnostics.CodeAnalysis;
-
-namespace Google.Protobuf
-{
-    /// <summary>
-    /// Reflection-based converter from messages to JSON.
-    /// </summary>
-    /// <remarks>
-    /// <para>
-    /// Instances of this class are thread-safe, with no mutable state.
-    /// </para>
-    /// <para>
-    /// This is a simple start to get JSON formatting working. As it's reflection-based,
-    /// it's not as quick as baking calls into generated messages - but is a simpler implementation.
-    /// (This code is generally not heavily optimized.)
-    /// </para>
-    /// </remarks>
-    public sealed class JsonFormatter
-    {
-        internal const string AnyTypeUrlField = "@type";
-        internal const string AnyDiagnosticValueField = "@value";
-        internal const string AnyWellKnownTypeValueField = "value";
-        private const string TypeUrlPrefix = "type.googleapis.com";
-        private const string NameValueSeparator = ": ";
-        private const string PropertySeparator = ", ";
-
-        /// <summary>
-        /// Returns a formatter using the default settings.
-        /// </summary>
-        public static JsonFormatter Default { get; } = new JsonFormatter(Settings.Default);
-
-        // A JSON formatter which *only* exists
-        private static readonly JsonFormatter diagnosticFormatter = new JsonFormatter(Settings.Default);
-
-        /// <summary>
-        /// The JSON representation of the first 160 characters of Unicode.
-        /// Empty strings are replaced by the static constructor.
-        /// </summary>
-        private static readonly string[] CommonRepresentations = {
-            // C0 (ASCII and derivatives) control characters
-            "\\u0000", "\\u0001", "\\u0002", "\\u0003",  // 0x00
-          "\\u0004", "\\u0005", "\\u0006", "\\u0007",
-          "\\b",     "\\t",     "\\n",     "\\u000b",
-          "\\f",     "\\r",     "\\u000e", "\\u000f",
-          "\\u0010", "\\u0011", "\\u0012", "\\u0013",  // 0x10
-          "\\u0014", "\\u0015", "\\u0016", "\\u0017",
-          "\\u0018", "\\u0019", "\\u001a", "\\u001b",
-          "\\u001c", "\\u001d", "\\u001e", "\\u001f",
-            // Escaping of " and \ are required by www.json.org string definition.
-            // Escaping of < and > are required for HTML security.
-            "", "", "\\\"", "", "",        "", "",        "",  // 0x20
-          "", "", "",     "", "",        "", "",        "",
-          "", "", "",     "", "",        "", "",        "",  // 0x30
-          "", "", "",     "", "\\u003c", "", "\\u003e", "",
-          "", "", "",     "", "",        "", "",        "",  // 0x40
-          "", "", "",     "", "",        "", "",        "",
-          "", "", "",     "", "",        "", "",        "",  // 0x50
-          "", "", "",     "", "\\\\",    "", "",        "",
-          "", "", "",     "", "",        "", "",        "",  // 0x60
-          "", "", "",     "", "",        "", "",        "",
-          "", "", "",     "", "",        "", "",        "",  // 0x70
-          "", "", "",     "", "",        "", "",        "\\u007f",
-            // C1 (ISO 8859 and Unicode) extended control characters
-            "\\u0080", "\\u0081", "\\u0082", "\\u0083",  // 0x80
-          "\\u0084", "\\u0085", "\\u0086", "\\u0087",
-          "\\u0088", "\\u0089", "\\u008a", "\\u008b",
-          "\\u008c", "\\u008d", "\\u008e", "\\u008f",
-          "\\u0090", "\\u0091", "\\u0092", "\\u0093",  // 0x90
-          "\\u0094", "\\u0095", "\\u0096", "\\u0097",
-          "\\u0098", "\\u0099", "\\u009a", "\\u009b",
-          "\\u009c", "\\u009d", "\\u009e", "\\u009f"
-        };
-
-        static JsonFormatter()
-        {
-            for (int i = 0; i < CommonRepresentations.Length; i++)
-            {
-                if (CommonRepresentations[i] == "")
-                {
-                    CommonRepresentations[i] = ((char) i).ToString();
-                }
-            }
-        }
-
-        private readonly Settings settings;
-
-        private bool DiagnosticOnly => ReferenceEquals(this, diagnosticFormatter);
-
-        /// <summary>
-        /// Creates a new formatted with the given settings.
-        /// </summary>
-        /// <param name="settings">The settings.</param>
-        public JsonFormatter(Settings settings)
-        {
-            this.settings = ProtoPreconditions.CheckNotNull(settings, nameof(settings));
-        }
-
-        /// <summary>
-        /// Formats the specified message as JSON.
-        /// </summary>
-        /// <param name="message">The message to format.</param>
-        /// <returns>The formatted message.</returns>
-        public string Format(IMessage message)
-        {
-            var writer = new StringWriter();
-            Format(message, writer);
-            return writer.ToString();
-        }
-
-        /// <summary>
-        /// Formats the specified message as JSON.
-        /// </summary>
-        /// <param name="message">The message to format.</param>
-        /// <param name="writer">The TextWriter to write the formatted message to.</param>
-        /// <returns>The formatted message.</returns>
-        public void Format(IMessage message, TextWriter writer)
-        {
-            ProtoPreconditions.CheckNotNull(message, nameof(message));
-            ProtoPreconditions.CheckNotNull(writer, nameof(writer));
-
-            if (message.Descriptor.IsWellKnownType)
-            {
-                WriteWellKnownTypeValue(writer, message.Descriptor, message);
-            }
-            else
-            {
-                WriteMessage(writer, message);
-            }
-        }
-
-        /// <summary>
-        /// Converts a message to JSON for diagnostic purposes with no extra context.
-        /// </summary>
-        /// <remarks>
-        /// <para>
-        /// This differs from calling <see cref="Format(IMessage)"/> on the default JSON
-        /// formatter in its handling of <see cref="Any"/>. As no type registry is available
-        /// in <see cref="object.ToString"/> calls, the normal way of resolving the type of
-        /// an <c>Any</c> message cannot be applied. Instead, a JSON property named <c>@value</c>
-        /// is included with the base64 data from the <see cref="Any.Value"/> property of the message.
-        /// </para>
-        /// <para>The value returned by this method is only designed to be used for diagnostic
-        /// purposes. It may not be parsable by <see cref="JsonParser"/>, and may not be parsable
-        /// by other Protocol Buffer implementations.</para>
-        /// </remarks>
-        /// <param name="message">The message to format for diagnostic purposes.</param>
-        /// <returns>The diagnostic-only JSON representation of the message</returns>
-        public static string ToDiagnosticString(IMessage message)
-        {
-            ProtoPreconditions.CheckNotNull(message, nameof(message));
-            return diagnosticFormatter.Format(message);
-        }
-
-        private void WriteMessage(TextWriter writer, IMessage message)
-        {
-            if (message == null)
-            {
-                WriteNull(writer);
-                return;
-            }
-            if (DiagnosticOnly)
-            {
-                ICustomDiagnosticMessage customDiagnosticMessage = message as ICustomDiagnosticMessage;
-                if (customDiagnosticMessage != null)
-                {
-                    writer.Write(customDiagnosticMessage.ToDiagnosticString());
-                    return;
-                }
-            }
-            writer.Write("{ ");
-            bool writtenFields = WriteMessageFields(writer, message, false);
-            writer.Write(writtenFields ? " }" : "}");
-        }
-
-        private bool WriteMessageFields(TextWriter writer, IMessage message, bool assumeFirstFieldWritten)
-        {
-            var fields = message.Descriptor.Fields;
-            bool first = !assumeFirstFieldWritten;
-            // First non-oneof fields
-            foreach (var field in fields.InFieldNumberOrder())
-            {
-                var accessor = field.Accessor;
-                var value = accessor.GetValue(message);
-                if (!ShouldFormatFieldValue(message, field, value))
-                {
-                    continue;
-                }
-
-                if (!first)
-                {
-                    writer.Write(PropertySeparator);
-                }
-
-                if (settings.PreserveProtoFieldNames)
-                {
-                    WriteString(writer, accessor.Descriptor.Name);
-                }
-                else
-                {
-                    WriteString(writer, accessor.Descriptor.JsonName);
-                }
-                writer.Write(NameValueSeparator);
-                WriteValue(writer, value);
-
-                first = false;
-            }
-            return !first;
-        }
-
-        /// <summary>
-        /// Determines whether or not a field value should be serialized according to the field,
-        /// its value in the message, and the settings of this formatter.
-        /// </summary>
-        private bool ShouldFormatFieldValue(IMessage message, FieldDescriptor field, object value) =>
-            field.HasPresence
-            // Fields that support presence *just* use that
-            ? field.Accessor.HasValue(message)
-            // Otherwise, format if either we've been asked to format default values, or if it's
-            // not a default value anyway.
-            : settings.FormatDefaultValues || !IsDefaultValue(field, value);
-
-        // Converted from java/core/src/main/java/com/google/protobuf/Descriptors.java
-        internal static string ToJsonName(string name)
-        {
-            StringBuilder result = new StringBuilder(name.Length);
-            bool isNextUpperCase = false;
-            foreach (char ch in name)
-            {
-                if (ch == '_')
-                {
-                    isNextUpperCase = true;
-                }
-                else if (isNextUpperCase)
-                {
-                    result.Append(char.ToUpperInvariant(ch));
-                    isNextUpperCase = false;
-                }
-                else
-                {
-                    result.Append(ch);
-                }
-            }
-            return result.ToString();
-        }
-
-        internal static string FromJsonName(string name)
-        {
-            StringBuilder result = new StringBuilder(name.Length);
-            foreach (char ch in name)
-            {
-                if (char.IsUpper(ch))
-                {
-                    result.Append('_');
-                    result.Append(char.ToLowerInvariant(ch));
-                }
-                else
-                {
-                    result.Append(ch);
-                }
-            }
-            return result.ToString();
-        }
-
-        private static void WriteNull(TextWriter writer)
-        {
-            writer.Write("null");
-        }
-
-        private static bool IsDefaultValue(FieldDescriptor descriptor, object value)
-        {
-            if (descriptor.IsMap)
-            {
-                IDictionary dictionary = (IDictionary) value;
-                return dictionary.Count == 0;
-            }
-            if (descriptor.IsRepeated)
-            {
-                IList list = (IList) value;
-                return list.Count == 0;
-            }
-            switch (descriptor.FieldType)
-            {
-                case FieldType.Bool:
-                    return (bool) value == false;
-                case FieldType.Bytes:
-                    return (ByteString) value == ByteString.Empty;
-                case FieldType.String:
-                    return (string) value == "";
-                case FieldType.Double:
-                    return (double) value == 0.0;
-                case FieldType.SInt32:
-                case FieldType.Int32:
-                case FieldType.SFixed32:
-                case FieldType.Enum:
-                    return (int) value == 0;
-                case FieldType.Fixed32:
-                case FieldType.UInt32:
-                    return (uint) value == 0;
-                case FieldType.Fixed64:
-                case FieldType.UInt64:
-                    return (ulong) value == 0;
-                case FieldType.SFixed64:
-                case FieldType.Int64:
-                case FieldType.SInt64:
-                    return (long) value == 0;
-                case FieldType.Float:
-                    return (float) value == 0f;
-                case FieldType.Message:
-                case FieldType.Group: // Never expect to get this, but...
-                    return value == null;
-                default:
-                    throw new ArgumentException("Invalid field type");
-            }
-        }
-
-        /// <summary>
-        /// Writes a single value to the given writer as JSON. Only types understood by
-        /// Protocol Buffers can be written in this way. This method is only exposed for
-        /// advanced use cases; most users should be using <see cref="Format(IMessage)"/>
-        /// or <see cref="Format(IMessage, TextWriter)"/>.
-        /// </summary>
-        /// <param name="writer">The writer to write the value to. Must not be null.</param>
-        /// <param name="value">The value to write. May be null.</param>
-        public void WriteValue(TextWriter writer, object value)
-        {
-            if (value == null || value is NullValue)
-            {
-                WriteNull(writer);
-            }
-            else if (value is bool)
-            {
-                writer.Write((bool)value ? "true" : "false");
-            }
-            else if (value is ByteString)
-            {
-                // Nothing in Base64 needs escaping
-                writer.Write('"');
-                writer.Write(((ByteString)value).ToBase64());
-                writer.Write('"');
-            }
-            else if (value is string)
-            {
-                WriteString(writer, (string)value);
-            }
-            else if (value is IDictionary)
-            {
-                WriteDictionary(writer, (IDictionary)value);
-            }
-            else if (value is IList)
-            {
-                WriteList(writer, (IList)value);
-            }
-            else if (value is int || value is uint)
-            {
-                IFormattable formattable = (IFormattable) value;
-                writer.Write(formattable.ToString("d", CultureInfo.InvariantCulture));
-            }
-            else if (value is long || value is ulong)
-            {
-                writer.Write('"');
-                IFormattable formattable = (IFormattable) value;
-                writer.Write(formattable.ToString("d", CultureInfo.InvariantCulture));
-                writer.Write('"');
-            }
-            else if (value is System.Enum)
-            {
-                if (settings.FormatEnumsAsIntegers)
-                {
-                    WriteValue(writer, (int)value);
-                }
-                else
-                {
-                    string name = OriginalEnumValueHelper.GetOriginalName(value);
-                    if (name != null)
-                    {
-                        WriteString(writer, name);
-                    }
-                    else
-                    {
-                        WriteValue(writer, (int)value);
-                    }
-                }
-            }
-            else if (value is float || value is double)
-            {
-                string text = ((IFormattable) value).ToString("r", CultureInfo.InvariantCulture);
-                if (text == "NaN" || text == "Infinity" || text == "-Infinity")
-                {
-                    writer.Write('"');
-                    writer.Write(text);
-                    writer.Write('"');
-                }
-                else
-                {
-                    writer.Write(text);
-                }
-            }
-            else if (value is IMessage)
-            {
-                Format((IMessage)value, writer);
-            }
-            else
-            {
-                throw new ArgumentException("Unable to format value of type " + value.GetType());
-            }
-        }
-
-        /// <summary>
-        /// Central interception point for well-known type formatting. Any well-known types which
-        /// don't need special handling can fall back to WriteMessage. We avoid assuming that the
-        /// values are using the embedded well-known types, in order to allow for dynamic messages
-        /// in the future.
-        /// </summary>
-        private void WriteWellKnownTypeValue(TextWriter writer, MessageDescriptor descriptor, object value)
-        {
-            // Currently, we can never actually get here, because null values are always handled by the caller. But if we *could*,
-            // this would do the right thing.
-            if (value == null)
-            {
-                WriteNull(writer);
-                return;
-            }
-            // For wrapper types, the value will either be the (possibly boxed) "native" value,
-            // or the message itself if we're formatting it at the top level (e.g. just calling ToString on the object itself).
-            // If it's the message form, we can extract the value first, which *will* be the (possibly boxed) native value,
-            // and then proceed, writing it as if we were definitely in a field. (We never need to wrap it in an extra string...
-            // WriteValue will do the right thing.)
-            if (descriptor.IsWrapperType)
-            {
-                if (value is IMessage)
-                {
-                    var message = (IMessage) value;
-                    value = message.Descriptor.Fields[WrappersReflection.WrapperValueFieldNumber].Accessor.GetValue(message);
-                }
-                WriteValue(writer, value);
-                return;
-            }
-            if (descriptor.FullName == Timestamp.Descriptor.FullName)
-            {
-                WriteTimestamp(writer, (IMessage)value);
-                return;
-            }
-            if (descriptor.FullName == Duration.Descriptor.FullName)
-            {
-                WriteDuration(writer, (IMessage)value);
-                return;
-            }
-            if (descriptor.FullName == FieldMask.Descriptor.FullName)
-            {
-                WriteFieldMask(writer, (IMessage)value);
-                return;
-            }
-            if (descriptor.FullName == Struct.Descriptor.FullName)
-            {
-                WriteStruct(writer, (IMessage)value);
-                return;
-            }
-            if (descriptor.FullName == ListValue.Descriptor.FullName)
-            {
-                var fieldAccessor = descriptor.Fields[ListValue.ValuesFieldNumber].Accessor;
-                WriteList(writer, (IList)fieldAccessor.GetValue((IMessage)value));
-                return;
-            }
-            if (descriptor.FullName == Value.Descriptor.FullName)
-            {
-                WriteStructFieldValue(writer, (IMessage)value);
-                return;
-            }
-            if (descriptor.FullName == Any.Descriptor.FullName)
-            {
-                WriteAny(writer, (IMessage)value);
-                return;
-            }
-            WriteMessage(writer, (IMessage)value);
-        }
-
-        private void WriteTimestamp(TextWriter writer, IMessage value)
-        {
-            // TODO: In the common case where this *is* using the built-in Timestamp type, we could
-            // avoid all the reflection at this point, by casting to Timestamp. In the interests of
-            // avoiding subtle bugs, don't do that until we've implemented DynamicMessage so that we can prove
-            // it still works in that case.
-            int nanos = (int) value.Descriptor.Fields[Timestamp.NanosFieldNumber].Accessor.GetValue(value);
-            long seconds = (long) value.Descriptor.Fields[Timestamp.SecondsFieldNumber].Accessor.GetValue(value);
-            writer.Write(Timestamp.ToJson(seconds, nanos, DiagnosticOnly));
-        }
-
-        private void WriteDuration(TextWriter writer, IMessage value)
-        {
-            // TODO: Same as for WriteTimestamp
-            int nanos = (int) value.Descriptor.Fields[Duration.NanosFieldNumber].Accessor.GetValue(value);
-            long seconds = (long) value.Descriptor.Fields[Duration.SecondsFieldNumber].Accessor.GetValue(value);
-            writer.Write(Duration.ToJson(seconds, nanos, DiagnosticOnly));
-        }
-
-        private void WriteFieldMask(TextWriter writer, IMessage value)
-        {
-            var paths = (IList<string>) value.Descriptor.Fields[FieldMask.PathsFieldNumber].Accessor.GetValue(value);
-            writer.Write(FieldMask.ToJson(paths, DiagnosticOnly));
-        }
-
-        private void WriteAny(TextWriter writer, IMessage value)
-        {
-            if (DiagnosticOnly)
-            {
-                WriteDiagnosticOnlyAny(writer, value);
-                return;
-            }
-
-            string typeUrl = (string) value.Descriptor.Fields[Any.TypeUrlFieldNumber].Accessor.GetValue(value);
-            ByteString data = (ByteString) value.Descriptor.Fields[Any.ValueFieldNumber].Accessor.GetValue(value);
-            string typeName = Any.GetTypeName(typeUrl);
-            MessageDescriptor descriptor = settings.TypeRegistry.Find(typeName);
-            if (descriptor == null)
-            {
-                throw new InvalidOperationException($"Type registry has no descriptor for type name '{typeName}'");
-            }
-            IMessage message = descriptor.Parser.ParseFrom(data);
-            writer.Write("{ ");
-            WriteString(writer, AnyTypeUrlField);
-            writer.Write(NameValueSeparator);
-            WriteString(writer, typeUrl);
-
-            if (descriptor.IsWellKnownType)
-            {
-                writer.Write(PropertySeparator);
-                WriteString(writer, AnyWellKnownTypeValueField);
-                writer.Write(NameValueSeparator);
-                WriteWellKnownTypeValue(writer, descriptor, message);
-            }
-            else
-            {
-                WriteMessageFields(writer, message, true);
-            }
-            writer.Write(" }");
-        }
-
-        private void WriteDiagnosticOnlyAny(TextWriter writer, IMessage value)
-        {
-            string typeUrl = (string) value.Descriptor.Fields[Any.TypeUrlFieldNumber].Accessor.GetValue(value);
-            ByteString data = (ByteString) value.Descriptor.Fields[Any.ValueFieldNumber].Accessor.GetValue(value);
-            writer.Write("{ ");
-            WriteString(writer, AnyTypeUrlField);
-            writer.Write(NameValueSeparator);
-            WriteString(writer, typeUrl);
-            writer.Write(PropertySeparator);
-            WriteString(writer, AnyDiagnosticValueField);
-            writer.Write(NameValueSeparator);
-            writer.Write('"');
-            writer.Write(data.ToBase64());
-            writer.Write('"');
-            writer.Write(" }");
-        }
-
-        private void WriteStruct(TextWriter writer, IMessage message)
-        {
-            writer.Write("{ ");
-            IDictionary fields = (IDictionary) message.Descriptor.Fields[Struct.FieldsFieldNumber].Accessor.GetValue(message);
-            bool first = true;
-            foreach (DictionaryEntry entry in fields)
-            {
-                string key = (string) entry.Key;
-                IMessage value = (IMessage) entry.Value;
-                if (string.IsNullOrEmpty(key) || value == null)
-                {
-                    throw new InvalidOperationException("Struct fields cannot have an empty key or a null value.");
-                }
-
-                if (!first)
-                {
-                    writer.Write(PropertySeparator);
-                }
-                WriteString(writer, key);
-                writer.Write(NameValueSeparator);
-                WriteStructFieldValue(writer, value);
-                first = false;
-            }
-            writer.Write(first ? "}" : " }");
-        }
-
-        private void WriteStructFieldValue(TextWriter writer, IMessage message)
-        {
-            var specifiedField = message.Descriptor.Oneofs[0].Accessor.GetCaseFieldDescriptor(message);
-            if (specifiedField == null)
-            {
-                throw new InvalidOperationException("Value message must contain a value for the oneof.");
-            }
-
-            object value = specifiedField.Accessor.GetValue(message);
-
-            switch (specifiedField.FieldNumber)
-            {
-                case Value.BoolValueFieldNumber:
-                case Value.StringValueFieldNumber:
-                case Value.NumberValueFieldNumber:
-                    WriteValue(writer, value);
-                    return;
-                case Value.StructValueFieldNumber:
-                case Value.ListValueFieldNumber:
-                    // Structs and ListValues are nested messages, and already well-known types.
-                    var nestedMessage = (IMessage) specifiedField.Accessor.GetValue(message);
-                    WriteWellKnownTypeValue(writer, nestedMessage.Descriptor, nestedMessage);
-                    return;
-                case Value.NullValueFieldNumber:
-                    WriteNull(writer);
-                    return;
-                default:
-                    throw new InvalidOperationException("Unexpected case in struct field: " + specifiedField.FieldNumber);
-            }
-        }
-
-        internal void WriteList(TextWriter writer, IList list)
-        {
-            writer.Write("[ ");
-            bool first = true;
-            foreach (var value in list)
-            {
-                if (!first)
-                {
-                    writer.Write(PropertySeparator);
-                }
-                WriteValue(writer, value);
-                first = false;
-            }
-            writer.Write(first ? "]" : " ]");
-        }
-
-        internal void WriteDictionary(TextWriter writer, IDictionary dictionary)
-        {
-            writer.Write("{ ");
-            bool first = true;
-            // This will box each pair. Could use IDictionaryEnumerator, but that's ugly in terms of disposal.
-            foreach (DictionaryEntry pair in dictionary)
-            {
-                if (!first)
-                {
-                    writer.Write(PropertySeparator);
-                }
-                string keyText;
-                if (pair.Key is string)
-                {
-                    keyText = (string) pair.Key;
-                }
-                else if (pair.Key is bool)
-                {
-                    keyText = (bool) pair.Key ? "true" : "false";
-                }
-                else if (pair.Key is int || pair.Key is uint | pair.Key is long || pair.Key is ulong)
-                {
-                    keyText = ((IFormattable) pair.Key).ToString("d", CultureInfo.InvariantCulture);
-                }
-                else
-                {
-                    if (pair.Key == null)
-                    {
-                        throw new ArgumentException("Dictionary has entry with null key");
-                    }
-                    throw new ArgumentException("Unhandled dictionary key type: " + pair.Key.GetType());
-                }
-                WriteString(writer, keyText);
-                writer.Write(NameValueSeparator);
-                WriteValue(writer, pair.Value);
-                first = false;
-            }
-            writer.Write(first ? "}" : " }");
-        }
-
-        /// <summary>
-        /// Writes a string (including leading and trailing double quotes) to a builder, escaping as required.
-        /// </summary>
-        /// <remarks>
-        /// Other than surrogate pair handling, this code is mostly taken from src/google/protobuf/util/internal/json_escaping.cc.
-        /// </remarks>
-        internal static void WriteString(TextWriter writer, string text)
-        {
-            writer.Write('"');
-            for (int i = 0; i < text.Length; i++)
-            {
-                char c = text[i];
-                if (c < 0xa0)
-                {
-                    writer.Write(CommonRepresentations[c]);
-                    continue;
-                }
-                if (char.IsHighSurrogate(c))
-                {
-                    // Encountered first part of a surrogate pair.
-                    // Check that we have the whole pair, and encode both parts as hex.
-                    i++;
-                    if (i == text.Length || !char.IsLowSurrogate(text[i]))
-                    {
-                        throw new ArgumentException("String contains low surrogate not followed by high surrogate");
-                    }
-                    HexEncodeUtf16CodeUnit(writer, c);
-                    HexEncodeUtf16CodeUnit(writer, text[i]);
-                    continue;
-                }
-                else if (char.IsLowSurrogate(c))
-                {
-                    throw new ArgumentException("String contains high surrogate not preceded by low surrogate");
-                }
-                switch ((uint) c)
-                {
-                    // These are not required by json spec
-                    // but used to prevent security bugs in javascript.
-                    case 0xfeff:  // Zero width no-break space
-                    case 0xfff9:  // Interlinear annotation anchor
-                    case 0xfffa:  // Interlinear annotation separator
-                    case 0xfffb:  // Interlinear annotation terminator
-
-                    case 0x00ad:  // Soft-hyphen
-                    case 0x06dd:  // Arabic end of ayah
-                    case 0x070f:  // Syriac abbreviation mark
-                    case 0x17b4:  // Khmer vowel inherent Aq
-                    case 0x17b5:  // Khmer vowel inherent Aa
-                        HexEncodeUtf16CodeUnit(writer, c);
-                        break;
-
-                    default:
-                        if ((c >= 0x0600 && c <= 0x0603) ||  // Arabic signs
-                            (c >= 0x200b && c <= 0x200f) ||  // Zero width etc.
-                            (c >= 0x2028 && c <= 0x202e) ||  // Separators etc.
-                            (c >= 0x2060 && c <= 0x2064) ||  // Invisible etc.
-                            (c >= 0x206a && c <= 0x206f))
-                        {
-                            HexEncodeUtf16CodeUnit(writer, c);
-                        }
-                        else
-                        {
-                            // No handling of surrogates here - that's done earlier
-                            writer.Write(c);
-                        }
-                        break;
-                }
-            }
-            writer.Write('"');
-        }
-
-        private const string Hex = "0123456789abcdef";
-        private static void HexEncodeUtf16CodeUnit(TextWriter writer, char c)
-        {
-            writer.Write("\\u");
-            writer.Write(Hex[(c >> 12) & 0xf]);
-            writer.Write(Hex[(c >> 8) & 0xf]);
-            writer.Write(Hex[(c >> 4) & 0xf]);
-            writer.Write(Hex[(c >> 0) & 0xf]);
-        }
-
-        /// <summary>
-        /// Settings controlling JSON formatting.
-        /// </summary>
-        public sealed class Settings
-        {
-            /// <summary>
-            /// Default settings, as used by <see cref="JsonFormatter.Default"/>
-            /// </summary>
-            public static Settings Default { get; }
-
-            // Workaround for the Mono compiler complaining about XML comments not being on
-            // valid language elements.
-            static Settings()
-            {
-                Default = new Settings(false);
-            }
-
-            /// <summary>
-            /// Whether fields which would otherwise not be included in the formatted data
-            /// should be formatted even when the value is not present, or has the default value.
-            /// This option only affects fields which don't support "presence" (e.g.
-            /// singular non-optional proto3 primitive fields).
-            /// </summary>
-            public bool FormatDefaultValues { get; }
-
-            /// <summary>
-            /// The type registry used to format <see cref="Any"/> messages.
-            /// </summary>
-            public TypeRegistry TypeRegistry { get; }
-
-            /// <summary>
-            /// Whether to format enums as ints. Defaults to false.
-            /// </summary>
-            public bool FormatEnumsAsIntegers { get; }
-
-            /// <summary>
-            /// Whether to use the original proto field names as defined in the .proto file. Defaults to false.
-            /// </summary>
-            public bool PreserveProtoFieldNames { get; }
-
-
-            /// <summary>
-            /// Creates a new <see cref="Settings"/> object with the specified formatting of default values
-            /// and an empty type registry.
-            /// </summary>
-            /// <param name="formatDefaultValues"><c>true</c> if default values (0, empty strings etc) should be formatted; <c>false</c> otherwise.</param>
-            public Settings(bool formatDefaultValues) : this(formatDefaultValues, TypeRegistry.Empty)
-            {
-            }
-
-            /// <summary>
-            /// Creates a new <see cref="Settings"/> object with the specified formatting of default values
-            /// and type registry.
-            /// </summary>
-            /// <param name="formatDefaultValues"><c>true</c> if default values (0, empty strings etc) should be formatted; <c>false</c> otherwise.</param>
-            /// <param name="typeRegistry">The <see cref="TypeRegistry"/> to use when formatting <see cref="Any"/> messages.</param>
-            public Settings(bool formatDefaultValues, TypeRegistry typeRegistry) : this(formatDefaultValues, typeRegistry, false, false)
-            {
-            }
-
-            /// <summary>
-            /// Creates a new <see cref="Settings"/> object with the specified parameters.
-            /// </summary>
-            /// <param name="formatDefaultValues"><c>true</c> if default values (0, empty strings etc) should be formatted; <c>false</c> otherwise.</param>
-            /// <param name="typeRegistry">The <see cref="TypeRegistry"/> to use when formatting <see cref="Any"/> messages. TypeRegistry.Empty will be used if it is null.</param>
-            /// <param name="formatEnumsAsIntegers"><c>true</c> to format the enums as integers; <c>false</c> to format enums as enum names.</param>
-            /// <param name="preserveProtoFieldNames"><c>true</c> to preserve proto field names; <c>false</c> to convert them to lowerCamelCase.</param>
-            private Settings(bool formatDefaultValues,
-                            TypeRegistry typeRegistry,
-                            bool formatEnumsAsIntegers,
-                            bool preserveProtoFieldNames)
-            {
-                FormatDefaultValues = formatDefaultValues;
-                TypeRegistry = typeRegistry ?? TypeRegistry.Empty;
-                FormatEnumsAsIntegers = formatEnumsAsIntegers;
-                PreserveProtoFieldNames = preserveProtoFieldNames;
-            }
-
-            /// <summary>
-            /// Creates a new <see cref="Settings"/> object with the specified formatting of default values and the current settings.
-            /// </summary>
-            /// <param name="formatDefaultValues"><c>true</c> if default values (0, empty strings etc) should be formatted; <c>false</c> otherwise.</param>
-            public Settings WithFormatDefaultValues(bool formatDefaultValues) => new Settings(formatDefaultValues, TypeRegistry, FormatEnumsAsIntegers, PreserveProtoFieldNames);
-
-            /// <summary>
-            /// Creates a new <see cref="Settings"/> object with the specified type registry and the current settings.
-            /// </summary>
-            /// <param name="typeRegistry">The <see cref="TypeRegistry"/> to use when formatting <see cref="Any"/> messages.</param>
-            public Settings WithTypeRegistry(TypeRegistry typeRegistry) => new Settings(FormatDefaultValues, typeRegistry, FormatEnumsAsIntegers, PreserveProtoFieldNames);
-
-            /// <summary>
-            /// Creates a new <see cref="Settings"/> object with the specified enums formatting option and the current settings.
-            /// </summary>
-            /// <param name="formatEnumsAsIntegers"><c>true</c> to format the enums as integers; <c>false</c> to format enums as enum names.</param>
-            public Settings WithFormatEnumsAsIntegers(bool formatEnumsAsIntegers) => new Settings(FormatDefaultValues, TypeRegistry, formatEnumsAsIntegers, PreserveProtoFieldNames);
-
-            /// <summary>
-            /// Creates a new <see cref="Settings"/> object with the specified field name formatting option and the current settings.
-            /// </summary>
-            /// <param name="preserveProtoFieldNames"><c>true</c> to preserve proto field names; <c>false</c> to convert them to lowerCamelCase.</param>
-            public Settings WithPreserveProtoFieldNames(bool preserveProtoFieldNames) => new Settings(FormatDefaultValues, TypeRegistry, FormatEnumsAsIntegers, preserveProtoFieldNames);
-        }
-
-        // Effectively a cache of mapping from enum values to the original name as specified in the proto file,
-        // fetched by reflection.
-        // The need for this is unfortunate, as is its unbounded size, but realistically it shouldn't cause issues.
-        private static class OriginalEnumValueHelper
-        {
-            // TODO: In the future we might want to use ConcurrentDictionary, at the point where all
-            // the platforms we target have it.
-            private static readonly Dictionary<System.Type, Dictionary<object, string>> dictionaries
-                = new Dictionary<System.Type, Dictionary<object, string>>();
-
-            [UnconditionalSuppressMessage("Trimming", "IL2072",
-                Justification = "The field for the value must still be present. It will be returned by reflection, will be in this collection, and its name can be resolved.")]
-            internal static string GetOriginalName(object value)
-            {
-                var enumType = value.GetType();
-                Dictionary<object, string> nameMapping;
-                lock (dictionaries)
-                {
-                    if (!dictionaries.TryGetValue(enumType, out nameMapping))
-                    {
-                        nameMapping = GetNameMapping(enumType);
-                        dictionaries[enumType] = nameMapping;
-                    }
-                }
-
-                string originalName;
-                // If this returns false, originalName will be null, which is what we want.
-                nameMapping.TryGetValue(value, out originalName);
-                return originalName;
-            }
-
-            private static Dictionary<object, string> GetNameMapping(
-                [DynamicallyAccessedMembers(
-                    DynamicallyAccessedMemberTypes.PublicFields |
-                    DynamicallyAccessedMemberTypes.NonPublicFields)]
-                System.Type enumType)
-            {
-                return enumType.GetTypeInfo().DeclaredFields
-                    .Where(f => f.IsStatic)
-                    .Where(f => f.GetCustomAttributes<OriginalNameAttribute>()
-                                 .FirstOrDefault()?.PreferredAlias ?? true)
-                    .ToDictionary(f => f.GetValue(null),
-                                  f => f.GetCustomAttributes<OriginalNameAttribute>()
-                                        .FirstOrDefault()
-                                        // If the attribute hasn't been applied, fall back to the name of the field.
-                                        ?.Name ?? f.Name);
-            }
-        }
-    }
-}
diff --git a/libs/protobuf/csharp/src/Google.Protobuf/JsonParser.cs b/libs/protobuf/csharp/src/Google.Protobuf/JsonParser.cs
deleted file mode 100644
index cb5f5a8..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf/JsonParser.cs
+++ /dev/null
@@ -1,1073 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using Google.Protobuf.Reflection;
-using Google.Protobuf.WellKnownTypes;
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Text.RegularExpressions;
-
-namespace Google.Protobuf
-{
-    /// <summary>
-    /// Reflection-based converter from JSON to messages.
-    /// </summary>
-    /// <remarks>
-    /// <para>
-    /// Instances of this class are thread-safe, with no mutable state.
-    /// </para>
-    /// <para>
-    /// This is a simple start to get JSON parsing working. As it's reflection-based,
-    /// it's not as quick as baking calls into generated messages - but is a simpler implementation.
-    /// (This code is generally not heavily optimized.)
-    /// </para>
-    /// </remarks>
-    public sealed class JsonParser
-    {
-        // Note: using 0-9 instead of \d to ensure no non-ASCII digits.
-        // This regex isn't a complete validator, but will remove *most* invalid input. We rely on parsing to do the rest.
-        private static readonly Regex TimestampRegex = new Regex(@"^(?<datetime>[0-9]{4}-[01][0-9]-[0-3][0-9]T[012][0-9]:[0-5][0-9]:[0-5][0-9])(?<subseconds>\.[0-9]{1,9})?(?<offset>(Z|[+-][0-1][0-9]:[0-5][0-9]))$", FrameworkPortability.CompiledRegexWhereAvailable);
-        private static readonly Regex DurationRegex = new Regex(@"^(?<sign>-)?(?<int>[0-9]{1,12})(?<subseconds>\.[0-9]{1,9})?s$", FrameworkPortability.CompiledRegexWhereAvailable);
-        private static readonly int[] SubsecondScalingFactors = { 0, 100000000, 100000000, 10000000, 1000000, 100000, 10000, 1000, 100, 10, 1 };
-        private static readonly char[] FieldMaskPathSeparators = new[] { ',' };
-        private static readonly EnumDescriptor NullValueDescriptor = StructReflection.Descriptor.EnumTypes.Single(ed => ed.ClrType == typeof(NullValue));
-
-        private static readonly JsonParser defaultInstance = new JsonParser(Settings.Default);
-
-        // TODO: Consider introducing a class containing parse state of the parser, tokenizer and depth. That would simplify these handlers
-        // and the signatures of various methods.
-        private static readonly Dictionary<string, Action<JsonParser, IMessage, JsonTokenizer>>
-            WellKnownTypeHandlers = new Dictionary<string, Action<JsonParser, IMessage, JsonTokenizer>>
-        {
-            { Timestamp.Descriptor.FullName, (parser, message, tokenizer) => MergeTimestamp(message, tokenizer.Next()) },
-            { Duration.Descriptor.FullName, (parser, message, tokenizer) => MergeDuration(message, tokenizer.Next()) },
-            { Value.Descriptor.FullName, (parser, message, tokenizer) => parser.MergeStructValue(message, tokenizer) },
-            { ListValue.Descriptor.FullName, (parser, message, tokenizer) =>
-                parser.MergeRepeatedField(message, message.Descriptor.Fields[ListValue.ValuesFieldNumber], tokenizer) },
-            { Struct.Descriptor.FullName, (parser, message, tokenizer) => parser.MergeStruct(message, tokenizer) },
-            { Any.Descriptor.FullName, (parser, message, tokenizer) => parser.MergeAny(message, tokenizer) },
-            { FieldMask.Descriptor.FullName, (parser, message, tokenizer) => MergeFieldMask(message, tokenizer.Next()) },
-            { Int32Value.Descriptor.FullName, MergeWrapperField },
-            { Int64Value.Descriptor.FullName, MergeWrapperField },
-            { UInt32Value.Descriptor.FullName, MergeWrapperField },
-            { UInt64Value.Descriptor.FullName, MergeWrapperField },
-            { FloatValue.Descriptor.FullName, MergeWrapperField },
-            { DoubleValue.Descriptor.FullName, MergeWrapperField },
-            { BytesValue.Descriptor.FullName, MergeWrapperField },
-            { StringValue.Descriptor.FullName, MergeWrapperField },
-            { BoolValue.Descriptor.FullName, MergeWrapperField }
-        };
-
-        // Convenience method to avoid having to repeat the same code multiple times in the above
-        // dictionary initialization.
-        private static void MergeWrapperField(JsonParser parser, IMessage message, JsonTokenizer tokenizer)
-        {
-            parser.MergeField(message, message.Descriptor.Fields[WrappersReflection.WrapperValueFieldNumber], tokenizer);
-        }
-
-        /// <summary>
-        /// Returns a formatter using the default settings.
-        /// </summary>
-        public static JsonParser Default { get { return defaultInstance; } }
-
-        private readonly Settings settings;
-
-        /// <summary>
-        /// Creates a new formatted with the given settings.
-        /// </summary>
-        /// <param name="settings">The settings.</param>
-        public JsonParser(Settings settings)
-        {
-            this.settings = ProtoPreconditions.CheckNotNull(settings, nameof(settings));
-        }
-
-        /// <summary>
-        /// Parses <paramref name="json"/> and merges the information into the given message.
-        /// </summary>
-        /// <param name="message">The message to merge the JSON information into.</param>
-        /// <param name="json">The JSON to parse.</param>
-        internal void Merge(IMessage message, string json)
-        {
-            Merge(message, new StringReader(json));
-        }
-
-        /// <summary>
-        /// Parses JSON read from <paramref name="jsonReader"/> and merges the information into the given message.
-        /// </summary>
-        /// <param name="message">The message to merge the JSON information into.</param>
-        /// <param name="jsonReader">Reader providing the JSON to parse.</param>
-        internal void Merge(IMessage message, TextReader jsonReader)
-        {
-            var tokenizer = JsonTokenizer.FromTextReader(jsonReader);
-            Merge(message, tokenizer);
-            var lastToken = tokenizer.Next();
-            if (lastToken != JsonToken.EndDocument)
-            {
-                throw new InvalidProtocolBufferException("Expected end of JSON after object");
-            }
-        }
-
-        /// <summary>
-        /// Merges the given message using data from the given tokenizer. In most cases, the next
-        /// token should be a "start object" token, but wrapper types and nullity can invalidate
-        /// that assumption. This is implemented as an LL(1) recursive descent parser over the stream
-        /// of tokens provided by the tokenizer. This token stream is assumed to be valid JSON, with the
-        /// tokenizer performing that validation - but not every token stream is valid "protobuf JSON".
-        /// </summary>
-        private void Merge(IMessage message, JsonTokenizer tokenizer)
-        {
-            if (tokenizer.ObjectDepth > settings.RecursionLimit)
-            {
-                throw InvalidProtocolBufferException.JsonRecursionLimitExceeded();
-            }
-            if (message.Descriptor.IsWellKnownType)
-            {
-                Action<JsonParser, IMessage, JsonTokenizer> handler;
-                if (WellKnownTypeHandlers.TryGetValue(message.Descriptor.FullName, out handler))
-                {
-                    handler(this, message, tokenizer);
-                    return;
-                }
-                // Well-known types with no special handling continue in the normal way.
-            }
-            var token = tokenizer.Next();
-            if (token.Type != JsonToken.TokenType.StartObject)
-            {
-                throw new InvalidProtocolBufferException("Expected an object");
-            }
-            var descriptor = message.Descriptor;
-            var jsonFieldMap = descriptor.Fields.ByJsonName();
-            // All the oneof fields we've already accounted for - we can only see each of them once.
-            // The set is created lazily to avoid the overhead of creating a set for every message
-            // we parsed, when oneofs are relatively rare.
-            HashSet<OneofDescriptor> seenOneofs = null;
-            while (true)
-            {
-                token = tokenizer.Next();
-                if (token.Type == JsonToken.TokenType.EndObject)
-                {
-                    return;
-                }
-                if (token.Type != JsonToken.TokenType.Name)
-                {
-                    throw new InvalidOperationException("Unexpected token type " + token.Type);
-                }
-                string name = token.StringValue;
-                FieldDescriptor field;
-                if (jsonFieldMap.TryGetValue(name, out field))
-                {
-                    if (field.ContainingOneof != null)
-                    {
-                        if (seenOneofs == null)
-                        {
-                            seenOneofs = new HashSet<OneofDescriptor>();
-                        }
-                        if (!seenOneofs.Add(field.ContainingOneof))
-                        {
-                            throw new InvalidProtocolBufferException($"Multiple values specified for oneof {field.ContainingOneof.Name}");
-                        }
-                    }
-                    MergeField(message, field, tokenizer);
-                }
-                else
-                {
-                    if (settings.IgnoreUnknownFields)
-                    {
-                        tokenizer.SkipValue();
-                    }
-                    else
-                    {
-                        throw new InvalidProtocolBufferException("Unknown field: " + name);
-                    }
-                }
-            }
-        }
-
-        private void MergeField(IMessage message, FieldDescriptor field, JsonTokenizer tokenizer)
-        {
-            var token = tokenizer.Next();
-            if (token.Type == JsonToken.TokenType.Null)
-            {
-                // Clear the field if we see a null token, unless it's for a singular field of type
-                // google.protobuf.Value or google.protobuf.NullValue.
-                // Note: different from Java API, which just ignores it.
-                // TODO: Bring it more in line? Discuss...
-                if (field.IsMap || field.IsRepeated ||
-                    !(IsGoogleProtobufValueField(field) || IsGoogleProtobufNullValueField(field)))
-                {
-                    field.Accessor.Clear(message);
-                    return;
-                }
-            }
-            tokenizer.PushBack(token);
-
-            if (field.IsMap)
-            {
-                MergeMapField(message, field, tokenizer);
-            }
-            else if (field.IsRepeated)
-            {
-                MergeRepeatedField(message, field, tokenizer);
-            }
-            else
-            {
-                var value = ParseSingleValue(field, tokenizer);
-                field.Accessor.SetValue(message, value);
-            }
-        }
-
-        private void MergeRepeatedField(IMessage message, FieldDescriptor field, JsonTokenizer tokenizer)
-        {
-            var token = tokenizer.Next();
-            if (token.Type != JsonToken.TokenType.StartArray)
-            {
-                throw new InvalidProtocolBufferException("Repeated field value was not an array. Token type: " + token.Type);
-            }
-
-            IList list = (IList) field.Accessor.GetValue(message);
-            while (true)
-            {
-                token = tokenizer.Next();
-                if (token.Type == JsonToken.TokenType.EndArray)
-                {
-                    return;
-                }
-                tokenizer.PushBack(token);
-                object value = ParseSingleValue(field, tokenizer);
-                if (value == null)
-                {
-                    throw new InvalidProtocolBufferException("Repeated field elements cannot be null");
-                }
-                list.Add(value);
-            }
-        }
-
-        private void MergeMapField(IMessage message, FieldDescriptor field, JsonTokenizer tokenizer)
-        {
-            // Map fields are always objects, even if the values are well-known types: ParseSingleValue handles those.
-            var token = tokenizer.Next();
-            if (token.Type != JsonToken.TokenType.StartObject)
-            {
-                throw new InvalidProtocolBufferException("Expected an object to populate a map");
-            }
-
-            var type = field.MessageType;
-            var keyField = type.FindFieldByNumber(1);
-            var valueField = type.FindFieldByNumber(2);
-            if (keyField == null || valueField == null)
-            {
-                throw new InvalidProtocolBufferException("Invalid map field: " + field.FullName);
-            }
-            IDictionary dictionary = (IDictionary) field.Accessor.GetValue(message);
-
-            while (true)
-            {
-                token = tokenizer.Next();
-                if (token.Type == JsonToken.TokenType.EndObject)
-                {
-                    return;
-                }
-                object key = ParseMapKey(keyField, token.StringValue);
-                object value = ParseSingleValue(valueField, tokenizer);
-                if (value == null)
-                {
-                    throw new InvalidProtocolBufferException("Map values must not be null");
-                }
-                dictionary[key] = value;
-            }
-        }
-
-        private static bool IsGoogleProtobufValueField(FieldDescriptor field)
-        {
-            return field.FieldType == FieldType.Message &&
-                field.MessageType.FullName == Value.Descriptor.FullName;
-        }
-
-        private static bool IsGoogleProtobufNullValueField(FieldDescriptor field)
-        {
-            return field.FieldType == FieldType.Enum &&
-                field.EnumType.FullName == NullValueDescriptor.FullName;
-        }
-
-        private object ParseSingleValue(FieldDescriptor field, JsonTokenizer tokenizer)
-        {
-            var token = tokenizer.Next();
-            if (token.Type == JsonToken.TokenType.Null)
-            {
-                // TODO: In order to support dynamic messages, we should really build this up
-                // dynamically.
-                if (IsGoogleProtobufValueField(field))
-                {
-                    return Value.ForNull();
-                }
-                if (IsGoogleProtobufNullValueField(field))
-                {
-                    return NullValue.NullValue;
-                }
-                return null;
-            }
-
-            var fieldType = field.FieldType;
-            if (fieldType == FieldType.Message)
-            {
-                // Parse wrapper types as their constituent types.
-                // TODO: What does this mean for null?
-                if (field.MessageType.IsWrapperType)
-                {
-                    field = field.MessageType.Fields[WrappersReflection.WrapperValueFieldNumber];
-                    fieldType = field.FieldType;
-                }
-                else
-                {
-                    // TODO: Merge the current value in message? (Public API currently doesn't make this relevant as we don't expose merging.)
-                    tokenizer.PushBack(token);
-                    IMessage subMessage = NewMessageForField(field);
-                    Merge(subMessage, tokenizer);
-                    return subMessage;
-                }
-            }
-
-            switch (token.Type)
-            {
-                case JsonToken.TokenType.True:
-                case JsonToken.TokenType.False:
-                    if (fieldType == FieldType.Bool)
-                    {
-                        return token.Type == JsonToken.TokenType.True;
-                    }
-                    // Fall through to "we don't support this type for this case"; could duplicate the behaviour of the default
-                    // case instead, but this way we'd only need to change one place.
-                    goto default;
-                case JsonToken.TokenType.StringValue:
-                    return ParseSingleStringValue(field, token.StringValue);
-                // Note: not passing the number value itself here, as we may end up storing the string value in the token too.
-                case JsonToken.TokenType.Number:
-                    return ParseSingleNumberValue(field, token);
-                case JsonToken.TokenType.Null:
-                    throw new NotImplementedException("Haven't worked out what to do for null yet");
-                default:
-                    throw new InvalidProtocolBufferException("Unsupported JSON token type " + token.Type + " for field type " + fieldType);
-            }
-        }
-
-        /// <summary>
-        /// Parses <paramref name="json"/> into a new message.
-        /// </summary>
-        /// <typeparam name="T">The type of message to create.</typeparam>
-        /// <param name="json">The JSON to parse.</param>
-        /// <exception cref="InvalidJsonException">The JSON does not comply with RFC 7159</exception>
-        /// <exception cref="InvalidProtocolBufferException">The JSON does not represent a Protocol Buffers message correctly</exception>
-        public T Parse<T>(string json) where T : IMessage, new()
-        {
-            ProtoPreconditions.CheckNotNull(json, nameof(json));
-            return Parse<T>(new StringReader(json));
-        }
-
-        /// <summary>
-        /// Parses JSON read from <paramref name="jsonReader"/> into a new message.
-        /// </summary>
-        /// <typeparam name="T">The type of message to create.</typeparam>
-        /// <param name="jsonReader">Reader providing the JSON to parse.</param>
-        /// <exception cref="InvalidJsonException">The JSON does not comply with RFC 7159</exception>
-        /// <exception cref="InvalidProtocolBufferException">The JSON does not represent a Protocol Buffers message correctly</exception>
-        public T Parse<T>(TextReader jsonReader) where T : IMessage, new()
-        {
-            ProtoPreconditions.CheckNotNull(jsonReader, nameof(jsonReader));
-            T message = new T();
-            Merge(message, jsonReader);
-            return message;
-        }
-
-        /// <summary>
-        /// Parses <paramref name="json"/> into a new message.
-        /// </summary>
-        /// <param name="json">The JSON to parse.</param>
-        /// <param name="descriptor">Descriptor of message type to parse.</param>
-        /// <exception cref="InvalidJsonException">The JSON does not comply with RFC 7159</exception>
-        /// <exception cref="InvalidProtocolBufferException">The JSON does not represent a Protocol Buffers message correctly</exception>
-        public IMessage Parse(string json, MessageDescriptor descriptor)
-        {
-            ProtoPreconditions.CheckNotNull(json, nameof(json));
-            ProtoPreconditions.CheckNotNull(descriptor, nameof(descriptor));
-            return Parse(new StringReader(json), descriptor);
-        }
-
-        /// <summary>
-        /// Parses JSON read from <paramref name="jsonReader"/> into a new message.
-        /// </summary>
-        /// <param name="jsonReader">Reader providing the JSON to parse.</param>
-        /// <param name="descriptor">Descriptor of message type to parse.</param>
-        /// <exception cref="InvalidJsonException">The JSON does not comply with RFC 7159</exception>
-        /// <exception cref="InvalidProtocolBufferException">The JSON does not represent a Protocol Buffers message correctly</exception>
-        public IMessage Parse(TextReader jsonReader, MessageDescriptor descriptor)
-        {
-            ProtoPreconditions.CheckNotNull(jsonReader, nameof(jsonReader));
-            ProtoPreconditions.CheckNotNull(descriptor, nameof(descriptor));
-            IMessage message = descriptor.Parser.CreateTemplate();
-            Merge(message, jsonReader);
-            return message;
-        }
-
-        private void MergeStructValue(IMessage message, JsonTokenizer tokenizer)
-        {
-            var firstToken = tokenizer.Next();
-            var fields = message.Descriptor.Fields;
-            switch (firstToken.Type)
-            {
-                case JsonToken.TokenType.Null:
-                    fields[Value.NullValueFieldNumber].Accessor.SetValue(message, 0);
-                    return;
-                case JsonToken.TokenType.StringValue:
-                    fields[Value.StringValueFieldNumber].Accessor.SetValue(message, firstToken.StringValue);
-                    return;
-                case JsonToken.TokenType.Number:
-                    fields[Value.NumberValueFieldNumber].Accessor.SetValue(message, firstToken.NumberValue);
-                    return;
-                case JsonToken.TokenType.False:
-                case JsonToken.TokenType.True:
-                    fields[Value.BoolValueFieldNumber].Accessor.SetValue(message, firstToken.Type == JsonToken.TokenType.True);
-                    return;
-                case JsonToken.TokenType.StartObject:
-                    {
-                        var field = fields[Value.StructValueFieldNumber];
-                        var structMessage = NewMessageForField(field);
-                        tokenizer.PushBack(firstToken);
-                        Merge(structMessage, tokenizer);
-                        field.Accessor.SetValue(message, structMessage);
-                        return;
-                    }
-                case JsonToken.TokenType.StartArray:
-                    {
-                        var field = fields[Value.ListValueFieldNumber];
-                        var list = NewMessageForField(field);
-                        tokenizer.PushBack(firstToken);
-                        Merge(list, tokenizer);
-                        field.Accessor.SetValue(message, list);
-                        return;
-                    }
-                default:
-                    throw new InvalidOperationException("Unexpected token type: " + firstToken.Type);
-            }
-        }
-
-        private void MergeStruct(IMessage message, JsonTokenizer tokenizer)
-        {
-            var token = tokenizer.Next();
-            if (token.Type != JsonToken.TokenType.StartObject)
-            {
-                throw new InvalidProtocolBufferException("Expected object value for Struct");
-            }
-            tokenizer.PushBack(token);
-
-            var field = message.Descriptor.Fields[Struct.FieldsFieldNumber];
-            MergeMapField(message, field, tokenizer);
-        }
-
-        private void MergeAny(IMessage message, JsonTokenizer tokenizer)
-        {
-            // Record the token stream until we see the @type property. At that point, we can take the value, consult
-            // the type registry for the relevant message, and replay the stream, omitting the @type property.
-            var tokens = new List<JsonToken>();
-
-            var token = tokenizer.Next();
-            if (token.Type != JsonToken.TokenType.StartObject)
-            {
-                throw new InvalidProtocolBufferException("Expected object value for Any");
-            }
-            int typeUrlObjectDepth = tokenizer.ObjectDepth;
-
-            // The check for the property depth protects us from nested Any values which occur before the type URL
-            // for *this* Any.
-            while (token.Type != JsonToken.TokenType.Name ||
-                token.StringValue != JsonFormatter.AnyTypeUrlField ||
-                tokenizer.ObjectDepth != typeUrlObjectDepth)
-            {
-                tokens.Add(token);
-                token = tokenizer.Next();
-
-                if (tokenizer.ObjectDepth < typeUrlObjectDepth)
-                {
-                    throw new InvalidProtocolBufferException("Any message with no @type");
-                }
-            }
-
-            // Don't add the @type property or its value to the recorded token list
-            token = tokenizer.Next();
-            if (token.Type != JsonToken.TokenType.StringValue)
-            {
-                throw new InvalidProtocolBufferException("Expected string value for Any.@type");
-            }
-            string typeUrl = token.StringValue;
-            string typeName = Any.GetTypeName(typeUrl);
-
-            MessageDescriptor descriptor = settings.TypeRegistry.Find(typeName);
-            if (descriptor == null)
-            {
-                throw new InvalidOperationException($"Type registry has no descriptor for type name '{typeName}'");
-            }
-
-            // Now replay the token stream we've already read and anything that remains of the object, just parsing it
-            // as normal. Our original tokenizer should end up at the end of the object.
-            var replay = JsonTokenizer.FromReplayedTokens(tokens, tokenizer);
-            var body = descriptor.Parser.CreateTemplate();
-            if (descriptor.IsWellKnownType)
-            {
-                MergeWellKnownTypeAnyBody(body, replay);
-            }
-            else
-            {
-                Merge(body, replay);
-            }
-            var data = body.ToByteString();
-
-            // Now that we have the message data, we can pack it into an Any (the message received as a parameter).
-            message.Descriptor.Fields[Any.TypeUrlFieldNumber].Accessor.SetValue(message, typeUrl);
-            message.Descriptor.Fields[Any.ValueFieldNumber].Accessor.SetValue(message, data);
-        }
-
-        // Well-known types end up in a property called "value" in the JSON. As there's no longer a @type property
-        // in the given JSON token stream, we should *only* have tokens of start-object, name("value"), the value
-        // itself, and then end-object.
-        private void MergeWellKnownTypeAnyBody(IMessage body, JsonTokenizer tokenizer)
-        {
-            var token = tokenizer.Next(); // Definitely start-object; checked in previous method
-            token = tokenizer.Next();
-            // TODO: What about an absent Int32Value, for example?
-            if (token.Type != JsonToken.TokenType.Name || token.StringValue != JsonFormatter.AnyWellKnownTypeValueField)
-            {
-                throw new InvalidProtocolBufferException($"Expected '{JsonFormatter.AnyWellKnownTypeValueField}' property for well-known type Any body");
-            }
-            Merge(body, tokenizer);
-            token = tokenizer.Next();
-            if (token.Type != JsonToken.TokenType.EndObject)
-            {
-                throw new InvalidProtocolBufferException($"Expected end-object token after @type/value for well-known type");
-            }
-        }
-
-        #region Utility methods which don't depend on the state (or settings) of the parser.
-        private static object ParseMapKey(FieldDescriptor field, string keyText)
-        {
-            switch (field.FieldType)
-            {
-                case FieldType.Bool:
-                    if (keyText == "true")
-                    {
-                        return true;
-                    }
-                    if (keyText == "false")
-                    {
-                        return false;
-                    }
-                    throw new InvalidProtocolBufferException("Invalid string for bool map key: " + keyText);
-                case FieldType.String:
-                    return keyText;
-                case FieldType.Int32:
-                case FieldType.SInt32:
-                case FieldType.SFixed32:
-                    return ParseNumericString(keyText, int.Parse);
-                case FieldType.UInt32:
-                case FieldType.Fixed32:
-                    return ParseNumericString(keyText, uint.Parse);
-                case FieldType.Int64:
-                case FieldType.SInt64:
-                case FieldType.SFixed64:
-                    return ParseNumericString(keyText, long.Parse);
-                case FieldType.UInt64:
-                case FieldType.Fixed64:
-                    return ParseNumericString(keyText, ulong.Parse);
-                default:
-                    throw new InvalidProtocolBufferException("Invalid field type for map: " + field.FieldType);
-            }
-        }
-
-        private static object ParseSingleNumberValue(FieldDescriptor field, JsonToken token)
-        {
-            double value = token.NumberValue;
-            checked
-            {
-                try
-                {
-                    switch (field.FieldType)
-                    {
-                        case FieldType.Int32:
-                        case FieldType.SInt32:
-                        case FieldType.SFixed32:
-                            CheckInteger(value);
-                            return (int) value;
-                        case FieldType.UInt32:
-                        case FieldType.Fixed32:
-                            CheckInteger(value);
-                            return (uint) value;
-                        case FieldType.Int64:
-                        case FieldType.SInt64:
-                        case FieldType.SFixed64:
-                            CheckInteger(value);
-                            return (long) value;
-                        case FieldType.UInt64:
-                        case FieldType.Fixed64:
-                            CheckInteger(value);
-                            return (ulong) value;
-                        case FieldType.Double:
-                            return value;
-                        case FieldType.Float:
-                            if (double.IsNaN(value))
-                            {
-                                return float.NaN;
-                            }
-                            if (value > float.MaxValue || value < float.MinValue)
-                            {
-                                if (double.IsPositiveInfinity(value))
-                                {
-                                    return float.PositiveInfinity;
-                                }
-                                if (double.IsNegativeInfinity(value))
-                                {
-                                    return float.NegativeInfinity;
-                                }
-                                throw new InvalidProtocolBufferException($"Value out of range: {value}");
-                            }
-                            return (float) value;
-                        case FieldType.Enum:
-                            CheckInteger(value);
-                            // Just return it as an int, and let the CLR convert it.
-                            // Note that we deliberately don't check that it's a known value.
-                            return (int) value;
-                        default:
-                            throw new InvalidProtocolBufferException($"Unsupported conversion from JSON number for field type {field.FieldType}");
-                    }
-                }
-                catch (OverflowException)
-                {
-                    throw new InvalidProtocolBufferException($"Value out of range: {value}");
-                }
-            }
-        }
-
-        private static void CheckInteger(double value)
-        {
-            if (double.IsInfinity(value) || double.IsNaN(value))
-            {
-                throw new InvalidProtocolBufferException($"Value not an integer: {value}");
-            }
-            if (value != Math.Floor(value))
-            {
-                throw new InvalidProtocolBufferException($"Value not an integer: {value}");
-            }
-        }
-
-        private static object ParseSingleStringValue(FieldDescriptor field, string text)
-        {
-            switch (field.FieldType)
-            {
-                case FieldType.String:
-                    return text;
-                case FieldType.Bytes:
-                    try
-                    {
-                        return ByteString.FromBase64(text);
-                    }
-                    catch (FormatException e)
-                    {
-                        throw InvalidProtocolBufferException.InvalidBase64(e);
-                    }
-                case FieldType.Int32:
-                case FieldType.SInt32:
-                case FieldType.SFixed32:
-                    return ParseNumericString(text, int.Parse);
-                case FieldType.UInt32:
-                case FieldType.Fixed32:
-                    return ParseNumericString(text, uint.Parse);
-                case FieldType.Int64:
-                case FieldType.SInt64:
-                case FieldType.SFixed64:
-                    return ParseNumericString(text, long.Parse);
-                case FieldType.UInt64:
-                case FieldType.Fixed64:
-                    return ParseNumericString(text, ulong.Parse);
-                case FieldType.Double:
-                    double d = ParseNumericString(text, double.Parse);
-                    ValidateInfinityAndNan(text, double.IsPositiveInfinity(d), double.IsNegativeInfinity(d), double.IsNaN(d));
-                    return d;
-                case FieldType.Float:
-                    float f = ParseNumericString(text, float.Parse);
-                    ValidateInfinityAndNan(text, float.IsPositiveInfinity(f), float.IsNegativeInfinity(f), float.IsNaN(f));
-                    return f;
-                case FieldType.Enum:
-                    var enumValue = field.EnumType.FindValueByName(text);
-                    if (enumValue == null)
-                    {
-                        throw new InvalidProtocolBufferException($"Invalid enum value: {text} for enum type: {field.EnumType.FullName}");
-                    }
-                    // Just return it as an int, and let the CLR convert it.
-                    return enumValue.Number;
-                default:
-                    throw new InvalidProtocolBufferException($"Unsupported conversion from JSON string for field type {field.FieldType}");
-            }
-        }
-
-        /// <summary>
-        /// Creates a new instance of the message type for the given field.
-        /// </summary>
-        private static IMessage NewMessageForField(FieldDescriptor field)
-        {
-            return field.MessageType.Parser.CreateTemplate();
-        }
-
-        private static T ParseNumericString<T>(string text, Func<string, NumberStyles, IFormatProvider, T> parser)
-        {
-            // Can't prohibit this with NumberStyles.
-            if (text.StartsWith("+"))
-            {
-                throw new InvalidProtocolBufferException($"Invalid numeric value: {text}");
-            }
-            if (text.StartsWith("0") && text.Length > 1)
-            {
-                if (text[1] >= '0' && text[1] <= '9')
-                {
-                    throw new InvalidProtocolBufferException($"Invalid numeric value: {text}");
-                }
-            }
-            else if (text.StartsWith("-0") && text.Length > 2)
-            {
-                if (text[2] >= '0' && text[2] <= '9')
-                {
-                    throw new InvalidProtocolBufferException($"Invalid numeric value: {text}");
-                }
-            }
-            try
-            {
-                return parser(text, NumberStyles.AllowLeadingSign | NumberStyles.AllowDecimalPoint | NumberStyles.AllowExponent, CultureInfo.InvariantCulture);
-            }
-            catch (FormatException)
-            {
-                throw new InvalidProtocolBufferException($"Invalid numeric value for type: {text}");
-            }
-            catch (OverflowException)
-            {
-                throw new InvalidProtocolBufferException($"Value out of range: {text}");
-            }
-        }
-
-        /// <summary>
-        /// Checks that any infinite/NaN values originated from the correct text.
-        /// This corrects the lenient whitespace handling of double.Parse/float.Parse, as well as the
-        /// way that Mono parses out-of-range values as infinity.
-        /// </summary>
-        private static void ValidateInfinityAndNan(string text, bool isPositiveInfinity, bool isNegativeInfinity, bool isNaN)
-        {
-            if ((isPositiveInfinity && text != "Infinity") ||
-                (isNegativeInfinity && text != "-Infinity") ||
-                (isNaN && text != "NaN"))
-            {
-                throw new InvalidProtocolBufferException($"Invalid numeric value: {text}");
-            }
-        }
-
-        private static void MergeTimestamp(IMessage message, JsonToken token)
-        {
-            if (token.Type != JsonToken.TokenType.StringValue)
-            {
-                throw new InvalidProtocolBufferException("Expected string value for Timestamp");
-            }
-            var match = TimestampRegex.Match(token.StringValue);
-            if (!match.Success)
-            {
-                throw new InvalidProtocolBufferException($"Invalid Timestamp value: {token.StringValue}");
-            }
-            var dateTime = match.Groups["datetime"].Value;
-            var subseconds = match.Groups["subseconds"].Value;
-            var offset = match.Groups["offset"].Value;
-
-            try
-            {
-                DateTime parsed = DateTime.ParseExact(
-                    dateTime,
-                    "yyyy-MM-dd'T'HH:mm:ss",
-                    CultureInfo.InvariantCulture,
-                    DateTimeStyles.AssumeUniversal | DateTimeStyles.AdjustToUniversal);
-                // TODO: It would be nice not to have to create all these objects... easy to optimize later though.
-                Timestamp timestamp = Timestamp.FromDateTime(parsed);
-                int nanosToAdd = 0;
-                if (subseconds != "")
-                {
-                    // This should always work, as we've got 1-9 digits.
-                    int parsedFraction = int.Parse(subseconds.Substring(1), CultureInfo.InvariantCulture);
-                    nanosToAdd = parsedFraction * SubsecondScalingFactors[subseconds.Length];
-                }
-                int secondsToAdd = 0;
-                if (offset != "Z")
-                {
-                    // This is the amount we need to *subtract* from the local time to get to UTC - hence - => +1 and vice versa.
-                    int sign = offset[0] == '-' ? 1 : -1;
-                    int hours = int.Parse(offset.Substring(1, 2), CultureInfo.InvariantCulture);
-                    int minutes = int.Parse(offset.Substring(4, 2));
-                    int totalMinutes = hours * 60 + minutes;
-                    if (totalMinutes > 18 * 60)
-                    {
-                        throw new InvalidProtocolBufferException("Invalid Timestamp value: " + token.StringValue);
-                    }
-                    if (totalMinutes == 0 && sign == 1)
-                    {
-                        // This is an offset of -00:00, which means "unknown local offset". It makes no sense for a timestamp.
-                        throw new InvalidProtocolBufferException("Invalid Timestamp value: " + token.StringValue);
-                    }
-                    // We need to *subtract* the offset from local time to get UTC.
-                    secondsToAdd = sign * totalMinutes * 60;
-                }
-                // Ensure we've got the right signs. Currently unnecessary, but easy to do.
-                if (secondsToAdd < 0 && nanosToAdd > 0)
-                {
-                    secondsToAdd++;
-                    nanosToAdd = nanosToAdd - Duration.NanosecondsPerSecond;
-                }
-                if (secondsToAdd != 0 || nanosToAdd != 0)
-                {
-                    timestamp += new Duration { Nanos = nanosToAdd, Seconds = secondsToAdd };
-                    // The resulting timestamp after offset change would be out of our expected range. Currently the Timestamp message doesn't validate this
-                    // anywhere, but we shouldn't parse it.
-                    if (timestamp.Seconds < Timestamp.UnixSecondsAtBclMinValue || timestamp.Seconds > Timestamp.UnixSecondsAtBclMaxValue)
-                    {
-                        throw new InvalidProtocolBufferException("Invalid Timestamp value: " + token.StringValue);
-                    }
-                }
-                message.Descriptor.Fields[Timestamp.SecondsFieldNumber].Accessor.SetValue(message, timestamp.Seconds);
-                message.Descriptor.Fields[Timestamp.NanosFieldNumber].Accessor.SetValue(message, timestamp.Nanos);
-            }
-            catch (FormatException)
-            {
-                throw new InvalidProtocolBufferException("Invalid Timestamp value: " + token.StringValue);
-            }
-        }
-
-        private static void MergeDuration(IMessage message, JsonToken token)
-        {
-            if (token.Type != JsonToken.TokenType.StringValue)
-            {
-                throw new InvalidProtocolBufferException("Expected string value for Duration");
-            }
-            var match = DurationRegex.Match(token.StringValue);
-            if (!match.Success)
-            {
-                throw new InvalidProtocolBufferException("Invalid Duration value: " + token.StringValue);
-            }
-            var sign = match.Groups["sign"].Value;
-            var secondsText = match.Groups["int"].Value;
-            // Prohibit leading insignficant zeroes
-            if (secondsText[0] == '0' && secondsText.Length > 1)
-            {
-                throw new InvalidProtocolBufferException("Invalid Duration value: " + token.StringValue);
-            }
-            var subseconds = match.Groups["subseconds"].Value;
-            var multiplier = sign == "-" ? -1 : 1;
-
-            try
-            {
-                long seconds = long.Parse(secondsText, CultureInfo.InvariantCulture) * multiplier;
-                int nanos = 0;
-                if (subseconds != "")
-                {
-                    // This should always work, as we've got 1-9 digits.
-                    int parsedFraction = int.Parse(subseconds.Substring(1));
-                    nanos = parsedFraction * SubsecondScalingFactors[subseconds.Length] * multiplier;
-                }
-                if (!Duration.IsNormalized(seconds, nanos))
-                {
-                    throw new InvalidProtocolBufferException($"Invalid Duration value: {token.StringValue}");
-                }
-                message.Descriptor.Fields[Duration.SecondsFieldNumber].Accessor.SetValue(message, seconds);
-                message.Descriptor.Fields[Duration.NanosFieldNumber].Accessor.SetValue(message, nanos);
-            }
-            catch (FormatException)
-            {
-                throw new InvalidProtocolBufferException($"Invalid Duration value: {token.StringValue}");
-            }
-        }
-
-        private static void MergeFieldMask(IMessage message, JsonToken token)
-        {
-            if (token.Type != JsonToken.TokenType.StringValue)
-            {
-                throw new InvalidProtocolBufferException("Expected string value for FieldMask");
-            }
-            // TODO: Do we *want* to remove empty entries? Probably okay to treat "" as "no paths", but "foo,,bar"?
-            string[] jsonPaths = token.StringValue.Split(FieldMaskPathSeparators, StringSplitOptions.RemoveEmptyEntries);
-            IList messagePaths = (IList) message.Descriptor.Fields[FieldMask.PathsFieldNumber].Accessor.GetValue(message);
-            foreach (var path in jsonPaths)
-            {
-                messagePaths.Add(ToSnakeCase(path));
-            }
-        }
-
-        // Ported from src/google/protobuf/util/internal/utility.cc
-        private static string ToSnakeCase(string text)
-        {
-            var builder = new StringBuilder(text.Length * 2);
-            // Note: this is probably unnecessary now, but currently retained to be as close as possible to the
-            // C++, whilst still throwing an exception on underscores.
-            bool wasNotUnderscore = false;  // Initialize to false for case 1 (below)
-            bool wasNotCap = false;
-
-            for (int i = 0; i < text.Length; i++)
-            {
-                char c = text[i];
-                if (c >= 'A' && c <= 'Z') // ascii_isupper
-                {
-                    // Consider when the current character B is capitalized:
-                    // 1) At beginning of input:   "B..." => "b..."
-                    //    (e.g. "Biscuit" => "biscuit")
-                    // 2) Following a lowercase:   "...aB..." => "...a_b..."
-                    //    (e.g. "gBike" => "g_bike")
-                    // 3) At the end of input:     "...AB" => "...ab"
-                    //    (e.g. "GoogleLAB" => "google_lab")
-                    // 4) Followed by a lowercase: "...ABc..." => "...a_bc..."
-                    //    (e.g. "GBike" => "g_bike")
-                    if (wasNotUnderscore &&               //            case 1 out
-                        (wasNotCap ||                     // case 2 in, case 3 out
-                         (i + 1 < text.Length &&         //            case 3 out
-                          (text[i + 1] >= 'a' && text[i + 1] <= 'z')))) // ascii_islower(text[i + 1])
-                    {  // case 4 in
-                       // We add an underscore for case 2 and case 4.
-                        builder.Append('_');
-                    }
-                    // ascii_tolower, but we already know that c *is* an upper case ASCII character...
-                    builder.Append((char) (c + 'a' - 'A'));
-                    wasNotUnderscore = true;
-                    wasNotCap = false;
-                }
-                else
-                {
-                    builder.Append(c);
-                    if (c == '_')
-                    {
-                        throw new InvalidProtocolBufferException($"Invalid field mask: {text}");
-                    }
-                    wasNotUnderscore = true;
-                    wasNotCap = true;
-                }
-            }
-            return builder.ToString();
-        }
-        #endregion
-
-        /// <summary>
-        /// Settings controlling JSON parsing.
-        /// </summary>
-        public sealed class Settings
-        {
-            /// <summary>
-            /// Default settings, as used by <see cref="JsonParser.Default"/>. This has the same default
-            /// recursion limit as <see cref="CodedInputStream"/>, and an empty type registry.
-            /// </summary>
-            public static Settings Default { get; }
-
-            // Workaround for the Mono compiler complaining about XML comments not being on
-            // valid language elements.
-            static Settings()
-            {
-                Default = new Settings(CodedInputStream.DefaultRecursionLimit);
-            }
-
-            /// <summary>
-            /// The maximum depth of messages to parse. Note that this limit only applies to parsing
-            /// messages, not collections - so a message within a collection within a message only counts as
-            /// depth 2, not 3.
-            /// </summary>
-            public int RecursionLimit { get; }
-
-            /// <summary>
-            /// The type registry used to parse <see cref="Any"/> messages.
-            /// </summary>
-            public TypeRegistry TypeRegistry { get; }
-
-            /// <summary>
-            /// Whether the parser should ignore unknown fields (<c>true</c>) or throw an exception when
-            /// they are encountered (<c>false</c>).
-            /// </summary>
-            public bool IgnoreUnknownFields { get; }
-
-            private Settings(int recursionLimit, TypeRegistry typeRegistry, bool ignoreUnknownFields)
-            {
-                RecursionLimit = recursionLimit;
-                TypeRegistry = ProtoPreconditions.CheckNotNull(typeRegistry, nameof(typeRegistry));
-                IgnoreUnknownFields = ignoreUnknownFields;
-            }
-
-            /// <summary>
-            /// Creates a new <see cref="Settings"/> object with the specified recursion limit.
-            /// </summary>
-            /// <param name="recursionLimit">The maximum depth of messages to parse</param>
-            public Settings(int recursionLimit) : this(recursionLimit, TypeRegistry.Empty)
-            {
-            }
-
-            /// <summary>
-            /// Creates a new <see cref="Settings"/> object with the specified recursion limit and type registry.
-            /// </summary>
-            /// <param name="recursionLimit">The maximum depth of messages to parse</param>
-            /// <param name="typeRegistry">The type registry used to parse <see cref="Any"/> messages</param>
-            public Settings(int recursionLimit, TypeRegistry typeRegistry) : this(recursionLimit, typeRegistry, false)
-            {
-            }
-
-            /// <summary>
-            /// Creates a new <see cref="Settings"/> object set to either ignore unknown fields, or throw an exception
-            /// when unknown fields are encountered.
-            /// </summary>
-            /// <param name="ignoreUnknownFields"><c>true</c> if unknown fields should be ignored when parsing; <c>false</c> to throw an exception.</param>
-            public Settings WithIgnoreUnknownFields(bool ignoreUnknownFields) =>
-                new Settings(RecursionLimit, TypeRegistry, ignoreUnknownFields);
-
-            /// <summary>
-            /// Creates a new <see cref="Settings"/> object based on this one, but with the specified recursion limit.
-            /// </summary>
-            /// <param name="recursionLimit">The new recursion limit.</param>
-            public Settings WithRecursionLimit(int recursionLimit) =>
-                new Settings(recursionLimit, TypeRegistry, IgnoreUnknownFields);
-
-            /// <summary>
-            /// Creates a new <see cref="Settings"/> object based on this one, but with the specified type registry.
-            /// </summary>
-            /// <param name="typeRegistry">The new type registry. Must not be null.</param>
-            public Settings WithTypeRegistry(TypeRegistry typeRegistry) =>
-                new Settings(
-                    RecursionLimit,
-                    ProtoPreconditions.CheckNotNull(typeRegistry, nameof(typeRegistry)),
-                    IgnoreUnknownFields);
-        }
-    }
-}
diff --git a/libs/protobuf/csharp/src/Google.Protobuf/JsonToken.cs b/libs/protobuf/csharp/src/Google.Protobuf/JsonToken.cs
deleted file mode 100644
index 6c0138c..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf/JsonToken.cs
+++ /dev/null
@@ -1,166 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-
-namespace Google.Protobuf
-{
-    internal sealed class JsonToken : IEquatable<JsonToken>
-    {
-        // Tokens with no value can be reused.
-        private static readonly JsonToken _true = new JsonToken(TokenType.True);
-        private static readonly JsonToken _false = new JsonToken(TokenType.False);
-        private static readonly JsonToken _null = new JsonToken(TokenType.Null);
-        private static readonly JsonToken startObject = new JsonToken(TokenType.StartObject);
-        private static readonly JsonToken endObject = new JsonToken(TokenType.EndObject);
-        private static readonly JsonToken startArray = new JsonToken(TokenType.StartArray);
-        private static readonly JsonToken endArray = new JsonToken(TokenType.EndArray);
-        private static readonly JsonToken endDocument = new JsonToken(TokenType.EndDocument);
-
-        internal static JsonToken Null { get { return _null; } }
-        internal static JsonToken False { get { return _false; } }
-        internal static JsonToken True { get { return _true; } }
-        internal static JsonToken StartObject{ get { return startObject; } }
-        internal static JsonToken EndObject { get { return endObject; } }
-        internal static JsonToken StartArray { get { return startArray; } }
-        internal static JsonToken EndArray { get { return endArray; } }
-        internal static JsonToken EndDocument { get { return endDocument; } }
-
-        internal static JsonToken Name(string name)
-        {
-            return new JsonToken(TokenType.Name, stringValue: name);
-        }
-
-        internal static JsonToken Value(string value)
-        {
-            return new JsonToken(TokenType.StringValue, stringValue: value);
-        }
-
-        internal static JsonToken Value(double value)
-        {
-            return new JsonToken(TokenType.Number, numberValue: value);
-        }
-
-        internal enum TokenType
-        {
-            Null,
-            False,
-            True,
-            StringValue,
-            Number,
-            Name,
-            StartObject,
-            EndObject,
-            StartArray,
-            EndArray,
-            EndDocument
-        }
-
-        // A value is a string, number, array, object, null, true or false
-        // Arrays and objects have start/end
-        // A document consists of a value
-        // Objects are name/value sequences.
-
-        private readonly TokenType type;
-        private readonly string stringValue;
-        private readonly double numberValue;
-
-        internal TokenType Type { get { return type; } }
-        internal string StringValue { get { return stringValue; } }
-        internal double NumberValue { get { return numberValue; } }
-
-        private JsonToken(TokenType type, string stringValue = null, double numberValue = 0)
-        {
-            this.type = type;
-            this.stringValue = stringValue;
-            this.numberValue = numberValue;
-        }
-
-        public override bool Equals(object obj)
-        {
-            return Equals(obj as JsonToken);
-        }
-
-        public override int GetHashCode()
-        {
-            unchecked
-            {
-                int hash = 17;
-                hash = hash * 31 + (int) type;
-                hash = hash * 31 + stringValue == null ? 0 : stringValue.GetHashCode();
-                hash = hash * 31 + numberValue.GetHashCode();
-                return hash;
-            }
-        }
-
-        public override string ToString()
-        {
-            switch (type)
-            {
-                case TokenType.Null:
-                    return "null";
-                case TokenType.True:
-                    return "true";
-                case TokenType.False:
-                    return "false";
-                case TokenType.Name:
-                    return "name (" + stringValue + ")";
-                case TokenType.StringValue:
-                    return "value (" + stringValue + ")";
-                case TokenType.Number:
-                    return "number (" + numberValue + ")";
-                case TokenType.StartObject:
-                    return "start-object";
-                case TokenType.EndObject:
-                    return "end-object";
-                case TokenType.StartArray:
-                    return "start-array";
-                case TokenType.EndArray:
-                    return "end-array";
-                case TokenType.EndDocument:
-                    return "end-document";
-                default:
-                    throw new InvalidOperationException("Token is of unknown type " + type);
-            }
-        }
-
-        public bool Equals(JsonToken other)
-        {
-            if (ReferenceEquals(other, null))
-            {
-                return false;
-            }
-            // Note use of other.numberValue.Equals rather than ==, so that NaN compares appropriately.
-            return other.type == type && other.stringValue == stringValue && other.numberValue.Equals(numberValue);
-        }
-    }
-}
diff --git a/libs/protobuf/csharp/src/Google.Protobuf/JsonTokenizer.cs b/libs/protobuf/csharp/src/Google.Protobuf/JsonTokenizer.cs
deleted file mode 100644
index 13a12c0..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf/JsonTokenizer.cs
+++ /dev/null
@@ -1,775 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
-using System.Text;
-
-namespace Google.Protobuf
-{
-    /// <summary>
-    /// Simple but strict JSON tokenizer, rigidly following RFC 7159.
-    /// </summary>
-    /// <remarks>
-    /// <para>
-    /// This tokenizer is stateful, and only returns "useful" tokens - names, values etc.
-    /// It does not create tokens for the separator between names and values, or for the comma
-    /// between values. It validates the token stream as it goes - so callers can assume that the
-    /// tokens it produces are appropriate. For example, it would never produce "start object, end array."
-    /// </para>
-    /// <para>Implementation details: the base class handles single token push-back and </para>
-    /// <para>Not thread-safe.</para>
-    /// </remarks>
-    internal abstract class JsonTokenizer
-    {
-        private JsonToken bufferedToken;
-
-        /// <summary>
-        ///  Creates a tokenizer that reads from the given text reader.
-        /// </summary>
-        internal static JsonTokenizer FromTextReader(TextReader reader)
-        {
-            return new JsonTextTokenizer(reader);
-        }
-
-        /// <summary>
-        /// Creates a tokenizer that first replays the given list of tokens, then continues reading
-        /// from another tokenizer. Note that if the returned tokenizer is "pushed back", that does not push back
-        /// on the continuation tokenizer, or vice versa. Care should be taken when using this method - it was
-        /// created for the sake of Any parsing.
-        /// </summary>
-        internal static JsonTokenizer FromReplayedTokens(IList<JsonToken> tokens, JsonTokenizer continuation)
-        {
-            return new JsonReplayTokenizer(tokens, continuation);
-        }
-
-        /// <summary>
-        /// Returns the depth of the stack, purely in objects (not collections).
-        /// Informally, this is the number of remaining unclosed '{' characters we have.
-        /// </summary>
-        internal int ObjectDepth { get; private set; }
-
-        // TODO: Why do we allow a different token to be pushed back? It might be better to always remember the previous
-        // token returned, and allow a parameterless Rewind() method (which could only be called once, just like the current PushBack).
-        internal void PushBack(JsonToken token)
-        {
-            if (bufferedToken != null)
-            {
-                throw new InvalidOperationException("Can't push back twice");
-            }
-            bufferedToken = token;
-            if (token.Type == JsonToken.TokenType.StartObject)
-            {
-                ObjectDepth--;
-            }
-            else if (token.Type == JsonToken.TokenType.EndObject)
-            {
-                ObjectDepth++;
-            }
-        }
-
-        /// <summary>
-        /// Returns the next JSON token in the stream. An EndDocument token is returned to indicate the end of the stream,
-        /// after which point <c>Next()</c> should not be called again.
-        /// </summary>
-        /// <remarks>This implementation provides single-token buffering, and calls <see cref="NextImpl"/> if there is no buffered token.</remarks>
-        /// <returns>The next token in the stream. This is never null.</returns>
-        /// <exception cref="InvalidOperationException">This method is called after an EndDocument token has been returned</exception>
-        /// <exception cref="InvalidJsonException">The input text does not comply with RFC 7159</exception>
-        internal JsonToken Next()
-        {
-            JsonToken tokenToReturn;
-            if (bufferedToken != null)
-            {
-                tokenToReturn = bufferedToken;
-                bufferedToken = null;
-            }
-            else
-            {
-                tokenToReturn = NextImpl();
-            }
-            if (tokenToReturn.Type == JsonToken.TokenType.StartObject)
-            {
-                ObjectDepth++;
-            }
-            else if (tokenToReturn.Type == JsonToken.TokenType.EndObject)
-            {
-                ObjectDepth--;
-            }
-            return tokenToReturn;
-        }
-
-        /// <summary>
-        /// Returns the next JSON token in the stream, when requested by the base class. (The <see cref="Next"/> method delegates
-        /// to this if it doesn't have a buffered token.)
-        /// </summary>
-        /// <exception cref="InvalidOperationException">This method is called after an EndDocument token has been returned</exception>
-        /// <exception cref="InvalidJsonException">The input text does not comply with RFC 7159</exception>
-        protected abstract JsonToken NextImpl();
-
-        /// <summary>
-        /// Skips the value we're about to read. This must only be called immediately after reading a property name.
-        /// If the value is an object or an array, the complete object/array is skipped.
-        /// </summary>
-        internal void SkipValue()
-        {
-            // We'll assume that Next() makes sure that the end objects and end arrays are all valid.
-            // All we care about is the total nesting depth we need to close.
-            int depth = 0;
-
-            // do/while rather than while loop so that we read at least one token.
-            do
-            {
-                var token = Next();
-                switch (token.Type)
-                {
-                    case JsonToken.TokenType.EndArray:
-                    case JsonToken.TokenType.EndObject:
-                        depth--;
-                        break;
-                    case JsonToken.TokenType.StartArray:
-                    case JsonToken.TokenType.StartObject:
-                        depth++;
-                        break;
-                }
-            } while (depth != 0);
-        }
-
-        /// <summary>
-        /// Tokenizer which first exhausts a list of tokens, then consults another tokenizer.
-        /// </summary>
-        private class JsonReplayTokenizer : JsonTokenizer
-        {
-            private readonly IList<JsonToken> tokens;
-            private readonly JsonTokenizer nextTokenizer;
-            private int nextTokenIndex;
-
-            internal JsonReplayTokenizer(IList<JsonToken> tokens, JsonTokenizer nextTokenizer)
-            {
-                this.tokens = tokens;
-                this.nextTokenizer = nextTokenizer;
-            }
-
-            // FIXME: Object depth not maintained...
-            protected override JsonToken NextImpl()
-            {
-                if (nextTokenIndex >= tokens.Count)
-                {
-                    return nextTokenizer.Next();
-                }
-                return tokens[nextTokenIndex++];
-            }
-        }
-
-        /// <summary>
-        /// Tokenizer which does all the *real* work of parsing JSON.
-        /// </summary>
-        private sealed class JsonTextTokenizer : JsonTokenizer
-        {
-            // The set of states in which a value is valid next token.
-            private static readonly State ValueStates = State.ArrayStart | State.ArrayAfterComma | State.ObjectAfterColon | State.StartOfDocument;
-
-            private readonly Stack<ContainerType> containerStack = new Stack<ContainerType>();
-            private readonly PushBackReader reader;
-            private State state;
-
-            internal JsonTextTokenizer(TextReader reader)
-            {
-                this.reader = new PushBackReader(reader);
-                state = State.StartOfDocument;
-                containerStack.Push(ContainerType.Document);
-            }
-
-            /// <remarks>
-            /// This method essentially just loops through characters skipping whitespace, validating and
-            /// changing state (e.g. from ObjectBeforeColon to ObjectAfterColon)
-            /// until it reaches something which will be a genuine token (e.g. a start object, or a value) at which point
-            /// it returns the token. Although the method is large, it would be relatively hard to break down further... most
-            /// of it is the large switch statement, which sometimes returns and sometimes doesn't.
-            /// </remarks>
-            protected override JsonToken NextImpl()
-            {
-                if (state == State.ReaderExhausted)
-                {
-                    throw new InvalidOperationException("Next() called after end of document");
-                }
-                while (true)
-                {
-                    var next = reader.Read();
-                    if (next == null)
-                    {
-                        ValidateState(State.ExpectedEndOfDocument, "Unexpected end of document in state: ");
-                        state = State.ReaderExhausted;
-                        return JsonToken.EndDocument;
-                    }
-                    switch (next.Value)
-                    {
-                        // Skip whitespace between tokens
-                        case ' ':
-                        case '\t':
-                        case '\r':
-                        case '\n':
-                            break;
-                        case ':':
-                            ValidateState(State.ObjectBeforeColon, "Invalid state to read a colon: ");
-                            state = State.ObjectAfterColon;
-                            break;
-                        case ',':
-                            ValidateState(State.ObjectAfterProperty | State.ArrayAfterValue, "Invalid state to read a comma: ");
-                            state = state == State.ObjectAfterProperty ? State.ObjectAfterComma : State.ArrayAfterComma;
-                            break;
-                        case '"':
-                            string stringValue = ReadString();
-                            if ((state & (State.ObjectStart | State.ObjectAfterComma)) != 0)
-                            {
-                                state = State.ObjectBeforeColon;
-                                return JsonToken.Name(stringValue);
-                            }
-                            else
-                            {
-                                ValidateAndModifyStateForValue("Invalid state to read a double quote: ");
-                                return JsonToken.Value(stringValue);
-                            }
-                        case '{':
-                            ValidateState(ValueStates, "Invalid state to read an open brace: ");
-                            state = State.ObjectStart;
-                            containerStack.Push(ContainerType.Object);
-                            return JsonToken.StartObject;
-                        case '}':
-                            ValidateState(State.ObjectAfterProperty | State.ObjectStart, "Invalid state to read a close brace: ");
-                            PopContainer();
-                            return JsonToken.EndObject;
-                        case '[':
-                            ValidateState(ValueStates, "Invalid state to read an open square bracket: ");
-                            state = State.ArrayStart;
-                            containerStack.Push(ContainerType.Array);
-                            return JsonToken.StartArray;
-                        case ']':
-                            ValidateState(State.ArrayAfterValue | State.ArrayStart, "Invalid state to read a close square bracket: ");
-                            PopContainer();
-                            return JsonToken.EndArray;
-                        case 'n': // Start of null
-                            ConsumeLiteral("null");
-                            ValidateAndModifyStateForValue("Invalid state to read a null literal: ");
-                            return JsonToken.Null;
-                        case 't': // Start of true
-                            ConsumeLiteral("true");
-                            ValidateAndModifyStateForValue("Invalid state to read a true literal: ");
-                            return JsonToken.True;
-                        case 'f': // Start of false
-                            ConsumeLiteral("false");
-                            ValidateAndModifyStateForValue("Invalid state to read a false literal: ");
-                            return JsonToken.False;
-                        case '-': // Start of a number
-                        case '0':
-                        case '1':
-                        case '2':
-                        case '3':
-                        case '4':
-                        case '5':
-                        case '6':
-                        case '7':
-                        case '8':
-                        case '9':
-                            double number = ReadNumber(next.Value);
-                            ValidateAndModifyStateForValue("Invalid state to read a number token: ");
-                            return JsonToken.Value(number);
-                        default:
-                            throw new InvalidJsonException("Invalid first character of token: " + next.Value);
-                    }
-                }
-            }
-
-            private void ValidateState(State validStates, string errorPrefix)
-            {
-                if ((validStates & state) == 0)
-                {
-                    throw reader.CreateException(errorPrefix + state);
-                }
-            }
-
-            /// <summary>
-            /// Reads a string token. It is assumed that the opening " has already been read.
-            /// </summary>
-            private string ReadString()
-            {
-                var value = new StringBuilder();
-                bool haveHighSurrogate = false;
-                while (true)
-                {
-                    char c = reader.ReadOrFail("Unexpected end of text while reading string");
-                    if (c < ' ')
-                    {
-                        throw reader.CreateException(string.Format(CultureInfo.InvariantCulture, "Invalid character in string literal: U+{0:x4}", (int) c));
-                    }
-                    if (c == '"')
-                    {
-                        if (haveHighSurrogate)
-                        {
-                            throw reader.CreateException("Invalid use of surrogate pair code units");
-                        }
-                        return value.ToString();
-                    }
-                    if (c == '\\')
-                    {
-                        c = ReadEscapedCharacter();
-                    }
-                    // TODO: Consider only allowing surrogate pairs that are either both escaped,
-                    // or both not escaped. It would be a very odd text stream that contained a "lone" high surrogate
-                    // followed by an escaped low surrogate or vice versa... and that couldn't even be represented in UTF-8.
-                    if (haveHighSurrogate != char.IsLowSurrogate(c))
-                    {
-                        throw reader.CreateException("Invalid use of surrogate pair code units");
-                    }
-                    haveHighSurrogate = char.IsHighSurrogate(c);
-                    value.Append(c);
-                }
-            }
-
-            /// <summary>
-            /// Reads an escaped character. It is assumed that the leading backslash has already been read.
-            /// </summary>
-            private char ReadEscapedCharacter()
-            {
-                char c = reader.ReadOrFail("Unexpected end of text while reading character escape sequence");
-                switch (c)
-                {
-                    case 'n':
-                        return '\n';
-                    case '\\':
-                        return '\\';
-                    case 'b':
-                        return '\b';
-                    case 'f':
-                        return '\f';
-                    case 'r':
-                        return '\r';
-                    case 't':
-                        return '\t';
-                    case '"':
-                        return '"';
-                    case '/':
-                        return '/';
-                    case 'u':
-                        return ReadUnicodeEscape();
-                    default:
-                        throw reader.CreateException(string.Format(CultureInfo.InvariantCulture, "Invalid character in character escape sequence: U+{0:x4}", (int) c));
-                }
-            }
-
-            /// <summary>
-            /// Reads an escaped Unicode 4-nybble hex sequence. It is assumed that the leading \u has already been read.
-            /// </summary>
-            private char ReadUnicodeEscape()
-            {
-                int result = 0;
-                for (int i = 0; i < 4; i++)
-                {
-                    char c = reader.ReadOrFail("Unexpected end of text while reading Unicode escape sequence");
-                    int nybble;
-                    if (c >= '0' && c <= '9')
-                    {
-                        nybble = c - '0';
-                    }
-                    else if (c >= 'a' && c <= 'f')
-                    {
-                        nybble = c - 'a' + 10;
-                    }
-                    else if (c >= 'A' && c <= 'F')
-                    {
-                        nybble = c - 'A' + 10;
-                    }
-                    else
-                    {
-                        throw reader.CreateException(string.Format(CultureInfo.InvariantCulture, "Invalid character in character escape sequence: U+{0:x4}", (int) c));
-                    }
-                    result = (result << 4) + nybble;
-                }
-                return (char) result;
-            }
-
-            /// <summary>
-            /// Consumes a text-only literal, throwing an exception if the read text doesn't match it.
-            /// It is assumed that the first letter of the literal has already been read.
-            /// </summary>
-            private void ConsumeLiteral(string text)
-            {
-                for (int i = 1; i < text.Length; i++)
-                {
-                    char? next = reader.Read();
-                    if (next == null)
-                    {
-                        throw reader.CreateException("Unexpected end of text while reading literal token " + text);
-                    }
-                    if (next.Value != text[i])
-                    {
-                        throw reader.CreateException("Unexpected character while reading literal token " + text);
-                    }
-                }
-            }
-
-            private double ReadNumber(char initialCharacter)
-            {
-                StringBuilder builder = new StringBuilder();
-                if (initialCharacter == '-')
-                {
-                    builder.Append("-");
-                }
-                else
-                {
-                    reader.PushBack(initialCharacter);
-                }
-                // Each method returns the character it read that doesn't belong in that part,
-                // so we know what to do next, including pushing the character back at the end.
-                // null is returned for "end of text".
-                char? next = ReadInt(builder);
-                if (next == '.')
-                {
-                    next = ReadFrac(builder);
-                }
-                if (next == 'e' || next == 'E')
-                {
-                    next = ReadExp(builder);
-                }
-                // If we read a character which wasn't part of the number, push it back so we can read it again
-                // to parse the next token.
-                if (next != null)
-                {
-                    reader.PushBack(next.Value);
-                }
-
-                // TODO: What exception should we throw if the value can't be represented as a double?
-                try
-                {
-                    double result = double.Parse(builder.ToString(),
-                        NumberStyles.AllowLeadingSign | NumberStyles.AllowDecimalPoint | NumberStyles.AllowExponent,
-                        CultureInfo.InvariantCulture);
-
-                    // .NET Core 3.0 and later returns infinity if the number is too large or small to be represented.
-                    // For compatibility with other Protobuf implementations the tokenizer should still throw.
-                    if (double.IsInfinity(result))
-                    {
-                        throw reader.CreateException("Numeric value out of range: " + builder);
-                    }
-
-                    return result;
-                }
-                catch (OverflowException)
-                {
-                    throw reader.CreateException("Numeric value out of range: " + builder);
-                }
-            }
-
-            private char? ReadInt(StringBuilder builder)
-            {
-                char first = reader.ReadOrFail("Invalid numeric literal");
-                if (first < '0' || first > '9')
-                {
-                    throw reader.CreateException("Invalid numeric literal");
-                }
-                builder.Append(first);
-                int digitCount;
-                char? next = ConsumeDigits(builder, out digitCount);
-                if (first == '0' && digitCount != 0)
-                {
-                    throw reader.CreateException("Invalid numeric literal: leading 0 for non-zero value.");
-                }
-                return next;
-            }
-
-            private char? ReadFrac(StringBuilder builder)
-            {
-                builder.Append('.'); // Already consumed this
-                int digitCount;
-                char? next = ConsumeDigits(builder, out digitCount);
-                if (digitCount == 0)
-                {
-                    throw reader.CreateException("Invalid numeric literal: fraction with no trailing digits");
-                }
-                return next;
-            }
-
-            private char? ReadExp(StringBuilder builder)
-            {
-                builder.Append('E'); // Already consumed this (or 'e')
-                char? next = reader.Read();
-                if (next == null)
-                {
-                    throw reader.CreateException("Invalid numeric literal: exponent with no trailing digits");
-                }
-                if (next == '-' || next == '+')
-                {
-                    builder.Append(next.Value);
-                }
-                else
-                {
-                    reader.PushBack(next.Value);
-                }
-                int digitCount;
-                next = ConsumeDigits(builder, out digitCount);
-                if (digitCount == 0)
-                {
-                    throw reader.CreateException("Invalid numeric literal: exponent without value");
-                }
-                return next;
-            }
-
-            private char? ConsumeDigits(StringBuilder builder, out int count)
-            {
-                count = 0;
-                while (true)
-                {
-                    char? next = reader.Read();
-                    if (next == null || next.Value < '0' || next.Value > '9')
-                    {
-                        return next;
-                    }
-                    count++;
-                    builder.Append(next.Value);
-                }
-            }
-
-            /// <summary>
-            /// Validates that we're in a valid state to read a value (using the given error prefix if necessary)
-            /// and changes the state to the appropriate one, e.g. ObjectAfterColon to ObjectAfterProperty.
-            /// </summary>
-            private void ValidateAndModifyStateForValue(string errorPrefix)
-            {
-                ValidateState(ValueStates, errorPrefix);
-                switch (state)
-                {
-                    case State.StartOfDocument:
-                        state = State.ExpectedEndOfDocument;
-                        return;
-                    case State.ObjectAfterColon:
-                        state = State.ObjectAfterProperty;
-                        return;
-                    case State.ArrayStart:
-                    case State.ArrayAfterComma:
-                        state = State.ArrayAfterValue;
-                        return;
-                    default:
-                        throw new InvalidOperationException("ValidateAndModifyStateForValue does not handle all value states (and should)");
-                }
-            }
-
-            /// <summary>
-            /// Pops the top-most container, and sets the state to the appropriate one for the end of a value
-            /// in the parent container.
-            /// </summary>
-            private void PopContainer()
-            {
-                containerStack.Pop();
-                var parent = containerStack.Peek();
-                switch (parent)
-                {
-                    case ContainerType.Object:
-                        state = State.ObjectAfterProperty;
-                        break;
-                    case ContainerType.Array:
-                        state = State.ArrayAfterValue;
-                        break;
-                    case ContainerType.Document:
-                        state = State.ExpectedEndOfDocument;
-                        break;
-                    default:
-                        throw new InvalidOperationException("Unexpected container type: " + parent);
-                }
-            }
-
-            private enum ContainerType
-            {
-                Document, Object, Array
-            }
-
-            /// <summary>
-            /// Possible states of the tokenizer.
-            /// </summary>
-            /// <remarks>
-            /// <para>This is a flags enum purely so we can simply and efficiently represent a set of valid states
-            /// for checking.</para>
-            /// <para>
-            /// Each is documented with an example,
-            /// where ^ represents the current position within the text stream. The examples all use string values,
-            /// but could be any value, including nested objects/arrays.
-            /// The complete state of the tokenizer also includes a stack to indicate the contexts (arrays/objects).
-            /// Any additional notional state of "AfterValue" indicates that a value has been completed, at which
-            /// point there's an immediate transition to ExpectedEndOfDocument,  ObjectAfterProperty or ArrayAfterValue.
-            /// </para>
-            /// <para>
-            /// These states were derived manually by reading RFC 7159 carefully.
-            /// </para>
-            /// </remarks>
-            [Flags]
-            private enum State
-            {
-                /// <summary>
-                /// ^ { "foo": "bar" }
-                /// Before the value in a document. Next states: ObjectStart, ArrayStart, "AfterValue"
-                /// </summary>
-                StartOfDocument = 1 << 0,
-                /// <summary>
-                /// { "foo": "bar" } ^
-                /// After the value in a document. Next states: ReaderExhausted
-                /// </summary>
-                ExpectedEndOfDocument = 1 << 1,
-                /// <summary>
-                /// { "foo": "bar" } ^ (and already read to the end of the reader)
-                /// Terminal state.
-                /// </summary>
-                ReaderExhausted = 1 << 2,
-                /// <summary>
-                /// { ^ "foo": "bar" }
-                /// Before the *first* property in an object.
-                /// Next states:
-                /// "AfterValue" (empty object)
-                /// ObjectBeforeColon (read a name)
-                /// </summary>
-                ObjectStart = 1 << 3,
-                /// <summary>
-                /// { "foo" ^ : "bar", "x": "y" }
-                /// Next state: ObjectAfterColon
-                /// </summary>
-                ObjectBeforeColon = 1 << 4,
-                /// <summary>
-                /// { "foo" : ^ "bar", "x": "y" }
-                /// Before any property other than the first in an object.
-                /// (Equivalently: after any property in an object)
-                /// Next states:
-                /// "AfterValue" (value is simple)
-                /// ObjectStart (value is object)
-                /// ArrayStart (value is array)
-                /// </summary>
-                ObjectAfterColon = 1 << 5,
-                /// <summary>
-                /// { "foo" : "bar" ^ , "x" : "y" }
-                /// At the end of a property, so expecting either a comma or end-of-object
-                /// Next states: ObjectAfterComma or "AfterValue"
-                /// </summary>
-                ObjectAfterProperty = 1 << 6,
-                /// <summary>
-                /// { "foo":"bar", ^ "x":"y" }
-                /// Read the comma after the previous property, so expecting another property.
-                /// This is like ObjectStart, but closing brace isn't valid here
-                /// Next state: ObjectBeforeColon.
-                /// </summary>
-                ObjectAfterComma = 1 << 7,
-                /// <summary>
-                /// [ ^ "foo", "bar" ]
-                /// Before the *first* value in an array.
-                /// Next states:
-                /// "AfterValue" (read a value)
-                /// "AfterValue" (end of array; will pop stack)
-                /// </summary>
-                ArrayStart = 1 << 8,
-                /// <summary>
-                /// [ "foo" ^ , "bar" ]
-                /// After any value in an array, so expecting either a comma or end-of-array
-                /// Next states: ArrayAfterComma or "AfterValue"
-                /// </summary>
-                ArrayAfterValue = 1 << 9,
-                /// <summary>
-                /// [ "foo", ^ "bar" ]
-                /// After a comma in an array, so there *must* be another value (simple or complex).
-                /// Next states: "AfterValue" (simple value), StartObject, StartArray
-                /// </summary>
-                ArrayAfterComma = 1 << 10
-            }
-
-            /// <summary>
-            /// Wrapper around a text reader allowing small amounts of buffering and location handling.
-            /// </summary>
-            private class PushBackReader
-            {
-                // TODO: Add locations for errors etc.
-
-                private readonly TextReader reader;
-
-                internal PushBackReader(TextReader reader)
-                {
-                    // TODO: Wrap the reader in a BufferedReader?
-                    this.reader = reader;
-                }
-
-                /// <summary>
-                /// The buffered next character, if we have one.
-                /// </summary>
-                private char? nextChar;
-
-                /// <summary>
-                /// Returns the next character in the stream, or null if we have reached the end.
-                /// </summary>
-                /// <returns></returns>
-                internal char? Read()
-                {
-                    if (nextChar != null)
-                    {
-                        char? tmp = nextChar;
-                        nextChar = null;
-                        return tmp;
-                    }
-                    int next = reader.Read();
-                    return next == -1 ? null : (char?) next;
-                }
-
-                internal char ReadOrFail(string messageOnFailure)
-                {
-                    char? next = Read();
-                    if (next == null)
-                    {
-                        throw CreateException(messageOnFailure);
-                    }
-                    return next.Value;
-                }
-
-                internal void PushBack(char c)
-                {
-                    if (nextChar != null)
-                    {
-                        throw new InvalidOperationException("Cannot push back when already buffering a character");
-                    }
-                    nextChar = c;
-                }
-
-                /// <summary>
-                /// Creates a new exception appropriate for the current state of the reader.
-                /// </summary>
-                internal InvalidJsonException CreateException(string message)
-                {
-                    // TODO: Keep track of and use the location.
-                    return new InvalidJsonException(message);
-                }
-            }
-        }
-    }
-}
diff --git a/libs/protobuf/csharp/src/Google.Protobuf/LimitedInputStream.cs b/libs/protobuf/csharp/src/Google.Protobuf/LimitedInputStream.cs
deleted file mode 100644
index 50ead9c..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf/LimitedInputStream.cs
+++ /dev/null
@@ -1,110 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-using System.IO;
-
-namespace Google.Protobuf
-{
-    /// <summary>
-    /// Stream implementation which proxies another stream, only allowing a certain amount
-    /// of data to be read. Note that this is only used to read delimited streams, so it
-    /// doesn't attempt to implement everything.
-    /// </summary>
-    internal sealed class LimitedInputStream : Stream
-    {
-        private readonly Stream proxied;
-        private int bytesLeft;
-
-        internal LimitedInputStream(Stream proxied, int size)
-        {
-            this.proxied = proxied;
-            bytesLeft = size;
-        }
-
-        public override bool CanRead
-        {
-            get { return true; }
-        }
-
-        public override bool CanSeek
-        {
-            get { return false; }
-        }
-
-        public override bool CanWrite
-        {
-            get { return false; }
-        }
-
-        public override void Flush()
-        {
-        }
-
-        public override long Length
-        {
-            get { throw new NotSupportedException(); }
-        }
-
-        public override long Position
-        {
-            get { throw new NotSupportedException(); }
-            set { throw new NotSupportedException(); }
-        }
-
-        public override int Read(byte[] buffer, int offset, int count)
-        {
-            if (bytesLeft > 0)
-            {
-                int bytesRead = proxied.Read(buffer, offset, Math.Min(bytesLeft, count));
-                bytesLeft -= bytesRead;
-                return bytesRead;
-            }
-            return 0;
-        }
-
-        public override long Seek(long offset, SeekOrigin origin)
-        {
-            throw new NotSupportedException();
-        }
-
-        public override void SetLength(long value)
-        {
-            throw new NotSupportedException();
-        }
-
-        public override void Write(byte[] buffer, int offset, int count)
-        {
-            throw new NotSupportedException();
-        }
-    }
-}
diff --git a/libs/protobuf/csharp/src/Google.Protobuf/MessageExtensions.cs b/libs/protobuf/csharp/src/Google.Protobuf/MessageExtensions.cs
deleted file mode 100644
index c4b3f82..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf/MessageExtensions.cs
+++ /dev/null
@@ -1,325 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using Google.Protobuf.Reflection;
-using System.Buffers;
-using System.Collections;
-using System;
-using System.IO;
-using System.Linq;
-using System.Security;
-
-namespace Google.Protobuf
-{
-    /// <summary>
-    /// Extension methods on <see cref="IMessage"/> and <see cref="IMessage{T}"/>.
-    /// </summary>
-    public static class MessageExtensions
-    {
-        /// <summary>
-        /// Merges data from the given byte array into an existing message.
-        /// </summary>
-        /// <param name="message">The message to merge the data into.</param>
-        /// <param name="data">The data to merge, which must be protobuf-encoded binary data.</param>
-        public static void MergeFrom(this IMessage message, byte[] data) =>
-            MergeFrom(message, data, false, null);
-
-        /// <summary>
-        /// Merges data from the given byte array slice into an existing message.
-        /// </summary>
-        /// <param name="message">The message to merge the data into.</param>
-        /// <param name="data">The data containing the slice to merge, which must be protobuf-encoded binary data.</param>
-        /// <param name="offset">The offset of the slice to merge.</param>
-        /// <param name="length">The length of the slice to merge.</param>
-        public static void MergeFrom(this IMessage message, byte[] data, int offset, int length) =>
-            MergeFrom(message, data, offset, length, false, null);
-
-        /// <summary>
-        /// Merges data from the given byte string into an existing message.
-        /// </summary>
-        /// <param name="message">The message to merge the data into.</param>
-        /// <param name="data">The data to merge, which must be protobuf-encoded binary data.</param>
-        public static void MergeFrom(this IMessage message, ByteString data) =>
-            MergeFrom(message, data, false, null);
-
-        /// <summary>
-        /// Merges data from the given stream into an existing message.
-        /// </summary>
-        /// <param name="message">The message to merge the data into.</param>
-        /// <param name="input">Stream containing the data to merge, which must be protobuf-encoded binary data.</param>
-        public static void MergeFrom(this IMessage message, Stream input) =>
-            MergeFrom(message, input, false, null);
-
-        /// <summary>
-        /// Merges data from the given span into an existing message.
-        /// </summary>
-        /// <param name="message">The message to merge the data into.</param>
-        /// <param name="span">Span containing the data to merge, which must be protobuf-encoded binary data.</param>
-        [SecuritySafeCritical]
-        public static void MergeFrom(this IMessage message, ReadOnlySpan<byte> span) =>
-            MergeFrom(message, span, false, null);
-
-        /// <summary>
-        /// Merges length-delimited data from the given stream into an existing message.
-        /// </summary>
-        /// <remarks>
-        /// The stream is expected to contain a length and then the data. Only the amount of data
-        /// specified by the length will be consumed.
-        /// </remarks>
-        /// <param name="message">The message to merge the data into.</param>
-        /// <param name="input">Stream containing the data to merge, which must be protobuf-encoded binary data.</param>
-        public static void MergeDelimitedFrom(this IMessage message, Stream input) =>
-            MergeDelimitedFrom(message, input, false, null);
-
-        /// <summary>
-        /// Converts the given message into a byte array in protobuf encoding.
-        /// </summary>
-        /// <param name="message">The message to convert.</param>
-        /// <returns>The message data as a byte array.</returns>
-        public static byte[] ToByteArray(this IMessage message)
-        {
-            ProtoPreconditions.CheckNotNull(message, "message");
-            byte[] result = new byte[message.CalculateSize()];
-            CodedOutputStream output = new CodedOutputStream(result);
-            message.WriteTo(output);
-            output.CheckNoSpaceLeft();
-            return result;
-        }
-
-        /// <summary>
-        /// Writes the given message data to the given stream in protobuf encoding.
-        /// </summary>
-        /// <param name="message">The message to write to the stream.</param>
-        /// <param name="output">The stream to write to.</param>
-        public static void WriteTo(this IMessage message, Stream output)
-        {
-            ProtoPreconditions.CheckNotNull(message, "message");
-            ProtoPreconditions.CheckNotNull(output, "output");
-            CodedOutputStream codedOutput = new CodedOutputStream(output);
-            message.WriteTo(codedOutput);
-            codedOutput.Flush();
-        }
-
-        /// <summary>
-        /// Writes the length and then data of the given message to a stream.
-        /// </summary>
-        /// <param name="message">The message to write.</param>
-        /// <param name="output">The output stream to write to.</param>
-        public static void WriteDelimitedTo(this IMessage message, Stream output)
-        {
-            ProtoPreconditions.CheckNotNull(message, "message");
-            ProtoPreconditions.CheckNotNull(output, "output");
-            CodedOutputStream codedOutput = new CodedOutputStream(output);
-            codedOutput.WriteLength(message.CalculateSize());
-            message.WriteTo(codedOutput);
-            codedOutput.Flush();
-        }
-
-        /// <summary>
-        /// Converts the given message into a byte string in protobuf encoding.
-        /// </summary>
-        /// <param name="message">The message to convert.</param>
-        /// <returns>The message data as a byte string.</returns>
-        public static ByteString ToByteString(this IMessage message)
-        {
-            ProtoPreconditions.CheckNotNull(message, "message");
-            return ByteString.AttachBytes(message.ToByteArray());
-        }
-
-        /// <summary>
-        /// Writes the given message data to the given buffer writer in protobuf encoding.
-        /// </summary>
-        /// <param name="message">The message to write to the stream.</param>
-        /// <param name="output">The stream to write to.</param>
-        [SecuritySafeCritical]
-        public static void WriteTo(this IMessage message, IBufferWriter<byte> output)
-        {
-            ProtoPreconditions.CheckNotNull(message, nameof(message));
-            ProtoPreconditions.CheckNotNull(output, nameof(output));
-
-            WriteContext.Initialize(output, out WriteContext ctx);
-            WritingPrimitivesMessages.WriteRawMessage(ref ctx, message);
-            ctx.Flush();
-        }
-
-        /// <summary>
-        /// Writes the given message data to the given span in protobuf encoding.
-        /// The size of the destination span needs to fit the serialized size
-        /// of the message exactly, otherwise an exception is thrown.
-        /// </summary>
-        /// <param name="message">The message to write to the stream.</param>
-        /// <param name="output">The span to write to. Size must match size of the message exactly.</param>
-        [SecuritySafeCritical]
-        public static void WriteTo(this IMessage message, Span<byte> output)
-        {
-            ProtoPreconditions.CheckNotNull(message, nameof(message));
-
-            WriteContext.Initialize(ref output, out WriteContext ctx);
-            WritingPrimitivesMessages.WriteRawMessage(ref ctx, message);
-            ctx.CheckNoSpaceLeft();
-        }
-
-        /// <summary>
-        /// Checks if all required fields in a message have values set. For proto3 messages, this returns true
-        /// </summary>
-        public static bool IsInitialized(this IMessage message)
-        {
-            if (message.Descriptor.File.Syntax == Syntax.Proto3)
-            {
-                return true;
-            }
-
-            if (!message.Descriptor.IsExtensionsInitialized(message))
-            {
-                return false;
-            }
-
-            return message.Descriptor
-                .Fields
-                .InDeclarationOrder()
-                .All(f =>
-                {
-                    if (f.IsMap)
-                    {
-                        var valueField = f.MessageType.Fields[2];
-                        if (valueField.FieldType == FieldType.Message)
-                        {
-                            var map = (IDictionary)f.Accessor.GetValue(message);
-                            return map.Values.Cast<IMessage>().All(IsInitialized);
-                        }
-                        else
-                        {
-                            return true;
-                        }
-                    }
-                    else if (f.IsRepeated && f.FieldType == FieldType.Message || f.FieldType == FieldType.Group)
-                    {
-                        var enumerable = (IEnumerable)f.Accessor.GetValue(message);
-                        return enumerable.Cast<IMessage>().All(IsInitialized);
-                    }
-                    else if (f.FieldType == FieldType.Message || f.FieldType == FieldType.Group)
-                    {
-                        if (f.Accessor.HasValue(message))
-                        {
-                            return ((IMessage)f.Accessor.GetValue(message)).IsInitialized();
-                        }
-                        else
-                        {
-                            return !f.IsRequired;
-                        }
-                    }
-                    else if (f.IsRequired)
-                    {
-                        return f.Accessor.HasValue(message);
-                    }
-                    else
-                    {
-                        return true;
-                    }
-                });
-        }
-
-        // Implementations allowing unknown fields to be discarded.
-        internal static void MergeFrom(this IMessage message, byte[] data, bool discardUnknownFields, ExtensionRegistry registry)
-        {
-            ProtoPreconditions.CheckNotNull(message, "message");
-            ProtoPreconditions.CheckNotNull(data, "data");
-            CodedInputStream input = new CodedInputStream(data);
-            input.DiscardUnknownFields = discardUnknownFields;
-            input.ExtensionRegistry = registry;
-            message.MergeFrom(input);
-            input.CheckReadEndOfStreamTag();
-        }
-
-        internal static void MergeFrom(this IMessage message, byte[] data, int offset, int length, bool discardUnknownFields, ExtensionRegistry registry)
-        {
-            ProtoPreconditions.CheckNotNull(message, "message");
-            ProtoPreconditions.CheckNotNull(data, "data");
-            CodedInputStream input = new CodedInputStream(data, offset, length);
-            input.DiscardUnknownFields = discardUnknownFields;
-            input.ExtensionRegistry = registry;
-            message.MergeFrom(input);
-            input.CheckReadEndOfStreamTag();
-        }
-
-        internal static void MergeFrom(this IMessage message, ByteString data, bool discardUnknownFields, ExtensionRegistry registry)
-        {
-            ProtoPreconditions.CheckNotNull(message, "message");
-            ProtoPreconditions.CheckNotNull(data, "data");
-            CodedInputStream input = data.CreateCodedInput();
-            input.DiscardUnknownFields = discardUnknownFields;
-            input.ExtensionRegistry = registry;
-            message.MergeFrom(input);
-            input.CheckReadEndOfStreamTag();
-        }
-
-        internal static void MergeFrom(this IMessage message, Stream input, bool discardUnknownFields, ExtensionRegistry registry)
-        {
-            ProtoPreconditions.CheckNotNull(message, "message");
-            ProtoPreconditions.CheckNotNull(input, "input");
-            CodedInputStream codedInput = new CodedInputStream(input);
-            codedInput.DiscardUnknownFields = discardUnknownFields;
-            codedInput.ExtensionRegistry = registry;
-            message.MergeFrom(codedInput);
-            codedInput.CheckReadEndOfStreamTag();
-        }
-
-        [SecuritySafeCritical]
-        internal static void MergeFrom(this IMessage message, ReadOnlySequence<byte> data, bool discardUnknownFields, ExtensionRegistry registry)
-        {
-            ParseContext.Initialize(data, out ParseContext ctx);
-            ctx.DiscardUnknownFields = discardUnknownFields;
-            ctx.ExtensionRegistry = registry;
-            ParsingPrimitivesMessages.ReadRawMessage(ref ctx, message);
-            ParsingPrimitivesMessages.CheckReadEndOfStreamTag(ref ctx.state);
-        }
-
-        [SecuritySafeCritical]
-        internal static void MergeFrom(this IMessage message, ReadOnlySpan<byte> data, bool discardUnknownFields, ExtensionRegistry registry)
-        {
-            ParseContext.Initialize(data, out ParseContext ctx);
-            ctx.DiscardUnknownFields = discardUnknownFields;
-            ctx.ExtensionRegistry = registry;
-            ParsingPrimitivesMessages.ReadRawMessage(ref ctx, message);
-            ParsingPrimitivesMessages.CheckReadEndOfStreamTag(ref ctx.state);
-        }
-
-        internal static void MergeDelimitedFrom(this IMessage message, Stream input, bool discardUnknownFields, ExtensionRegistry registry)
-        {
-            ProtoPreconditions.CheckNotNull(message, "message");
-            ProtoPreconditions.CheckNotNull(input, "input");
-            int size = (int) CodedInputStream.ReadRawVarint32(input);
-            Stream limitedStream = new LimitedInputStream(input, size);
-            MergeFrom(message, limitedStream, discardUnknownFields, registry);
-        }
-    }
-}
diff --git a/libs/protobuf/csharp/src/Google.Protobuf/MessageParser.cs b/libs/protobuf/csharp/src/Google.Protobuf/MessageParser.cs
deleted file mode 100644
index a10c908..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf/MessageParser.cs
+++ /dev/null
@@ -1,405 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-using System.Buffers;
-using System.IO;
-using System.Security;
-
-namespace Google.Protobuf
-{
-    /// <summary>
-    /// A general message parser, typically used by reflection-based code as all the methods
-    /// return simple <see cref="IMessage"/>.
-    /// </summary>
-    public class MessageParser
-    {
-        private Func<IMessage> factory;
-        // TODO: When we use a C# 7.1 compiler, make this private protected.
-        internal bool DiscardUnknownFields { get; }
-
-        internal ExtensionRegistry Extensions { get; }
-
-        internal MessageParser(Func<IMessage> factory, bool discardUnknownFields, ExtensionRegistry extensions)
-        {
-            this.factory = factory;
-            DiscardUnknownFields = discardUnknownFields;
-            Extensions = extensions;
-        }
-
-        /// <summary>
-        /// Creates a template instance ready for population.
-        /// </summary>
-        /// <returns>An empty message.</returns>
-        internal IMessage CreateTemplate()
-        {
-            return factory();
-        }
-
-        /// <summary>
-        /// Parses a message from a byte array.
-        /// </summary>
-        /// <param name="data">The byte array containing the message. Must not be null.</param>
-        /// <returns>The newly parsed message.</returns>
-        public IMessage ParseFrom(byte[] data)
-        {
-            IMessage message = factory();
-            message.MergeFrom(data, DiscardUnknownFields, Extensions);
-            return message;
-        }
-
-        /// <summary>
-        /// Parses a message from a byte array slice.
-        /// </summary>
-        /// <param name="data">The byte array containing the message. Must not be null.</param>
-        /// <param name="offset">The offset of the slice to parse.</param>
-        /// <param name="length">The length of the slice to parse.</param>
-        /// <returns>The newly parsed message.</returns>
-        public IMessage ParseFrom(byte[] data, int offset, int length)
-        {
-            IMessage message = factory();
-            message.MergeFrom(data, offset, length, DiscardUnknownFields, Extensions);
-            return message;
-        }
-
-        /// <summary>
-        /// Parses a message from the given byte string.
-        /// </summary>
-        /// <param name="data">The data to parse.</param>
-        /// <returns>The parsed message.</returns>
-        public IMessage ParseFrom(ByteString data)
-        {
-            IMessage message = factory();
-            message.MergeFrom(data, DiscardUnknownFields, Extensions);
-            return message;
-        }
-
-        /// <summary>
-        /// Parses a message from the given stream.
-        /// </summary>
-        /// <param name="input">The stream to parse.</param>
-        /// <returns>The parsed message.</returns>
-        public IMessage ParseFrom(Stream input)
-        {
-            IMessage message = factory();
-            message.MergeFrom(input, DiscardUnknownFields, Extensions);
-            return message;
-        }
-
-        /// <summary>
-        /// Parses a message from the given sequence.
-        /// </summary>
-        /// <param name="data">The data to parse.</param>
-        /// <returns>The parsed message.</returns>
-        [SecuritySafeCritical]
-        public IMessage ParseFrom(ReadOnlySequence<byte> data)
-        {
-            IMessage message = factory();
-            message.MergeFrom(data, DiscardUnknownFields, Extensions);
-            return message;
-        }
-
-        /// <summary>
-        /// Parses a message from the given span.
-        /// </summary>
-        /// <param name="data">The data to parse.</param>
-        /// <returns>The parsed message.</returns>
-        [SecuritySafeCritical]
-        public IMessage ParseFrom(ReadOnlySpan<byte> data)
-        {
-            IMessage message = factory();
-            message.MergeFrom(data, DiscardUnknownFields, Extensions);
-            return message;
-        }
-
-        /// <summary>
-        /// Parses a length-delimited message from the given stream.
-        /// </summary>
-        /// <remarks>
-        /// The stream is expected to contain a length and then the data. Only the amount of data
-        /// specified by the length will be consumed.
-        /// </remarks>
-        /// <param name="input">The stream to parse.</param>
-        /// <returns>The parsed message.</returns>
-        public IMessage ParseDelimitedFrom(Stream input)
-        {
-            IMessage message = factory();
-            message.MergeDelimitedFrom(input, DiscardUnknownFields, Extensions);
-            return message;
-        }
-
-        /// <summary>
-        /// Parses a message from the given coded input stream.
-        /// </summary>
-        /// <param name="input">The stream to parse.</param>
-        /// <returns>The parsed message.</returns>
-        public IMessage ParseFrom(CodedInputStream input)
-        {
-            IMessage message = factory();
-            MergeFrom(message, input);
-            return message;
-        }
-
-        /// <summary>
-        /// Parses a message from the given JSON.
-        /// </summary>
-        /// <param name="json">The JSON to parse.</param>
-        /// <returns>The parsed message.</returns>
-        /// <exception cref="InvalidJsonException">The JSON does not comply with RFC 7159</exception>
-        /// <exception cref="InvalidProtocolBufferException">The JSON does not represent a Protocol Buffers message correctly</exception>
-        public IMessage ParseJson(string json)
-        {
-            IMessage message = factory();
-            JsonParser.Default.Merge(message, json);
-            return message;
-        }
-
-        // TODO: When we're using a C# 7.1 compiler, make this private protected.
-        internal void MergeFrom(IMessage message, CodedInputStream codedInput)
-        {
-            bool originalDiscard = codedInput.DiscardUnknownFields;
-            ExtensionRegistry originalRegistry = codedInput.ExtensionRegistry;
-            try
-            {
-                codedInput.DiscardUnknownFields = DiscardUnknownFields;
-                codedInput.ExtensionRegistry = Extensions;
-                message.MergeFrom(codedInput);
-            }
-            finally
-            {
-                codedInput.DiscardUnknownFields = originalDiscard;
-                codedInput.ExtensionRegistry = originalRegistry;
-            }
-        }
-
-        /// <summary>
-        /// Creates a new message parser which optionally discards unknown fields when parsing.
-        /// </summary>
-        /// <param name="discardUnknownFields">Whether or not to discard unknown fields when parsing.</param>
-        /// <returns>A newly configured message parser.</returns>
-        public MessageParser WithDiscardUnknownFields(bool discardUnknownFields) =>
-            new MessageParser(factory, discardUnknownFields, Extensions);
-
-        /// <summary>
-        /// Creates a new message parser which registers extensions from the specified registry upon creating the message instance
-        /// </summary>
-        /// <param name="registry">The extensions to register</param>
-        /// <returns>A newly configured message parser.</returns>
-        public MessageParser WithExtensionRegistry(ExtensionRegistry registry) =>
-            new MessageParser(factory, DiscardUnknownFields, registry);
-    }
-
-    /// <summary>
-    /// A parser for a specific message type.
-    /// </summary>
-    /// <remarks>
-    /// <p>
-    /// This delegates most behavior to the
-    /// <see cref="IMessage.MergeFrom"/> implementation within the original type, but
-    /// provides convenient overloads to parse from a variety of sources.
-    /// </p>
-    /// <p>
-    /// Most applications will never need to create their own instances of this type;
-    /// instead, use the static <c>Parser</c> property of a generated message type to obtain a
-    /// parser for that type.
-    /// </p>
-    /// </remarks>
-    /// <typeparam name="T">The type of message to be parsed.</typeparam>
-    public sealed class MessageParser<T> : MessageParser where T : IMessage<T>
-    {
-        // Implementation note: all the methods here *could* just delegate up to the base class and cast the result.
-        // The current implementation avoids a virtual method call and a cast, which *may* be significant in some cases.
-        // Benchmarking work is required to measure the significance - but it's only a few lines of code in any case.
-        // The API wouldn't change anyway - just the implementation - so this work can be deferred.
-        private readonly Func<T> factory;
-
-        /// <summary>
-        /// Creates a new parser.
-        /// </summary>
-        /// <remarks>
-        /// The factory method is effectively an optimization over using a generic constraint
-        /// to require a parameterless constructor: delegates are significantly faster to execute.
-        /// </remarks>
-        /// <param name="factory">Function to invoke when a new, empty message is required.</param>
-        public MessageParser(Func<T> factory) : this(factory, false, null)
-        {
-        }
-
-        internal MessageParser(Func<T> factory, bool discardUnknownFields, ExtensionRegistry extensions) : base(() => factory(), discardUnknownFields, extensions)
-        {
-            this.factory = factory;
-        }
-
-        /// <summary>
-        /// Creates a template instance ready for population.
-        /// </summary>
-        /// <returns>An empty message.</returns>
-        internal new T CreateTemplate()
-        {
-            return factory();
-        }
-
-        /// <summary>
-        /// Parses a message from a byte array.
-        /// </summary>
-        /// <param name="data">The byte array containing the message. Must not be null.</param>
-        /// <returns>The newly parsed message.</returns>
-        public new T ParseFrom(byte[] data)
-        {
-            T message = factory();
-            message.MergeFrom(data, DiscardUnknownFields, Extensions);
-            return message;
-        }
-
-        /// <summary>
-        /// Parses a message from a byte array slice.
-        /// </summary>
-        /// <param name="data">The byte array containing the message. Must not be null.</param>
-        /// <param name="offset">The offset of the slice to parse.</param>
-        /// <param name="length">The length of the slice to parse.</param>
-        /// <returns>The newly parsed message.</returns>
-        public new T ParseFrom(byte[] data, int offset, int length)
-        {
-            T message = factory();
-            message.MergeFrom(data, offset, length, DiscardUnknownFields, Extensions);
-            return message;
-        }
-
-        /// <summary>
-        /// Parses a message from the given byte string.
-        /// </summary>
-        /// <param name="data">The data to parse.</param>
-        /// <returns>The parsed message.</returns>
-        public new T ParseFrom(ByteString data)
-        {
-            T message = factory();
-            message.MergeFrom(data, DiscardUnknownFields, Extensions);
-            return message;
-        }
-
-        /// <summary>
-        /// Parses a message from the given stream.
-        /// </summary>
-        /// <param name="input">The stream to parse.</param>
-        /// <returns>The parsed message.</returns>
-        public new T ParseFrom(Stream input)
-        {
-            T message = factory();
-            message.MergeFrom(input, DiscardUnknownFields, Extensions);
-            return message;
-        }
-
-        /// <summary>
-        /// Parses a message from the given sequence.
-        /// </summary>
-        /// <param name="data">The data to parse.</param>
-        /// <returns>The parsed message.</returns>
-        [SecuritySafeCritical]
-        public new T ParseFrom(ReadOnlySequence<byte> data)
-        {
-            T message = factory();
-            message.MergeFrom(data, DiscardUnknownFields, Extensions);
-            return message;
-        }
-
-        /// <summary>
-        /// Parses a message from the given span.
-        /// </summary>
-        /// <param name="data">The data to parse.</param>
-        /// <returns>The parsed message.</returns>
-        [SecuritySafeCritical]
-        public new T ParseFrom(ReadOnlySpan<byte> data)
-        {
-            T message = factory();
-            message.MergeFrom(data, DiscardUnknownFields, Extensions);
-            return message;
-        }
-
-        /// <summary>
-        /// Parses a length-delimited message from the given stream.
-        /// </summary>
-        /// <remarks>
-        /// The stream is expected to contain a length and then the data. Only the amount of data
-        /// specified by the length will be consumed.
-        /// </remarks>
-        /// <param name="input">The stream to parse.</param>
-        /// <returns>The parsed message.</returns>
-        public new T ParseDelimitedFrom(Stream input)
-        {
-            T message = factory();
-            message.MergeDelimitedFrom(input, DiscardUnknownFields, Extensions);
-            return message;
-        }
-
-        /// <summary>
-        /// Parses a message from the given coded input stream.
-        /// </summary>
-        /// <param name="input">The stream to parse.</param>
-        /// <returns>The parsed message.</returns>
-        public new T ParseFrom(CodedInputStream input)
-        {
-            T message = factory();
-            MergeFrom(message, input);
-            return message;
-        }
-
-        /// <summary>
-        /// Parses a message from the given JSON.
-        /// </summary>
-        /// <param name="json">The JSON to parse.</param>
-        /// <returns>The parsed message.</returns>
-        /// <exception cref="InvalidJsonException">The JSON does not comply with RFC 7159</exception>
-        /// <exception cref="InvalidProtocolBufferException">The JSON does not represent a Protocol Buffers message correctly</exception>
-        public new T ParseJson(string json)
-        {
-            T message = factory();
-            JsonParser.Default.Merge(message, json);
-            return message;
-        }
-
-        /// <summary>
-        /// Creates a new message parser which optionally discards unknown fields when parsing.
-        /// </summary>
-        /// <param name="discardUnknownFields">Whether or not to discard unknown fields when parsing.</param>
-        /// <returns>A newly configured message parser.</returns>
-        public new MessageParser<T> WithDiscardUnknownFields(bool discardUnknownFields) =>
-            new MessageParser<T>(factory, discardUnknownFields, Extensions);
-
-        /// <summary>
-        /// Creates a new message parser which registers extensions from the specified registry upon creating the message instance
-        /// </summary>
-        /// <param name="registry">The extensions to register</param>
-        /// <returns>A newly configured message parser.</returns>
-        public new MessageParser<T> WithExtensionRegistry(ExtensionRegistry registry) =>
-            new MessageParser<T>(factory, DiscardUnknownFields, registry);
-    }
-}
diff --git a/libs/protobuf/csharp/src/Google.Protobuf/ObjectIntPair.cs b/libs/protobuf/csharp/src/Google.Protobuf/ObjectIntPair.cs
deleted file mode 100644
index b61fc68..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf/ObjectIntPair.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-using System;
-
-namespace Google.Protobuf
-{
-    /// <summary>
-    /// Struct used to hold the keys for the fieldByNumber table in DescriptorPool and the keys for the 
-    /// extensionByNumber table in ExtensionRegistry.
-    /// </summary>
-    internal struct ObjectIntPair<T> : IEquatable<ObjectIntPair<T>> where T : class
-    {
-        private readonly int number;
-        private readonly T obj;
-
-        internal ObjectIntPair(T obj, int number)
-        {
-            this.number = number;
-            this.obj = obj;
-        }
-
-        public bool Equals(ObjectIntPair<T> other)
-        {
-            return obj == other.obj
-                   && number == other.number;
-        }
-
-        public override bool Equals(object obj)
-        {
-            if (obj is ObjectIntPair<T>)
-            {
-                return Equals((ObjectIntPair<T>)obj);
-            }
-            return false;
-        }
-
-        public override int GetHashCode()
-        {
-            return obj.GetHashCode() * ((1 << 16) - 1) + number;
-        }
-    }
-}
diff --git a/libs/protobuf/csharp/src/Google.Protobuf/ParseContext.cs b/libs/protobuf/csharp/src/Google.Protobuf/ParseContext.cs
deleted file mode 100644
index 7b278b5..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf/ParseContext.cs
+++ /dev/null
@@ -1,348 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-using System.Buffers;
-using System.Buffers.Binary;
-using System.Collections.Generic;
-using System.IO;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using System.Security;
-using System.Text;
-using Google.Protobuf.Collections;
-
-namespace Google.Protobuf
-{
-    /// <summary>
-    /// An opaque struct that represents the current parsing state and is passed along
-    /// as the parsing proceeds.
-    /// All the public methods are intended to be invoked only by the generated code,
-    /// users should never invoke them directly.
-    /// </summary>
-    [SecuritySafeCritical]
-    public ref struct ParseContext
-    {
-        internal const int DefaultRecursionLimit = 100;
-        internal const int DefaultSizeLimit = Int32.MaxValue;
-
-        internal ReadOnlySpan<byte> buffer;
-        internal ParserInternalState state;
-
-        /// <summary>
-        /// Initialize a <see cref="ParseContext"/>, building all <see cref="ParserInternalState"/> from defaults and
-        /// the given <paramref name="buffer"/>.
-        /// </summary>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        internal static void Initialize(ReadOnlySpan<byte> buffer, out ParseContext ctx)
-        {
-            ParserInternalState state = default;
-            state.sizeLimit = DefaultSizeLimit;
-            state.recursionLimit = DefaultRecursionLimit;
-            state.currentLimit = int.MaxValue;
-            state.bufferSize = buffer.Length;
-
-            Initialize(buffer, ref state, out ctx);
-        }
-
-        /// <summary>
-        /// Initialize a <see cref="ParseContext"/> using existing <see cref="ParserInternalState"/>, e.g. from <see cref="CodedInputStream"/>.
-        /// </summary>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        internal static void Initialize(ReadOnlySpan<byte> buffer, ref ParserInternalState state, out ParseContext ctx)
-        {
-            ctx.buffer = buffer;
-            ctx.state = state;
-        }
-
-        /// <summary>
-        /// Creates a ParseContext instance from CodedInputStream.
-        /// WARNING: internally this copies the CodedInputStream's state, so after done with the ParseContext,
-        /// the CodedInputStream's state needs to be updated.
-        /// </summary>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        internal static void Initialize(CodedInputStream input, out ParseContext ctx)
-        {
-            ctx.buffer = new ReadOnlySpan<byte>(input.InternalBuffer);
-            // ideally we would use a reference to the original state, but that doesn't seem possible
-            // so we just copy the struct that holds the state. We will need to later store the state back
-            // into CodedInputStream if we want to keep it usable.
-            ctx.state = input.InternalState;
-        }
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        internal static void Initialize(ReadOnlySequence<byte> input, out ParseContext ctx)
-        {
-            Initialize(input, DefaultRecursionLimit, out ctx);
-        }
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        internal static void Initialize(ReadOnlySequence<byte> input, int recursionLimit, out ParseContext ctx)
-        {
-            ctx.buffer = default;
-            ctx.state = default;
-            ctx.state.lastTag = 0;
-            ctx.state.recursionDepth = 0;
-            ctx.state.sizeLimit = DefaultSizeLimit;
-            ctx.state.recursionLimit = recursionLimit;
-            ctx.state.currentLimit = int.MaxValue;
-            SegmentedBufferHelper.Initialize(input, out ctx.state.segmentedBufferHelper, out ctx.buffer);
-            ctx.state.bufferPos = 0;
-            ctx.state.bufferSize = ctx.buffer.Length;
-
-            ctx.state.DiscardUnknownFields = false;
-            ctx.state.ExtensionRegistry = null;
-        }
-
-        /// <summary>
-        /// Returns the last tag read, or 0 if no tags have been read or we've read beyond
-        /// the end of the input.
-        /// </summary>
-        internal uint LastTag { get { return state.lastTag; } }
-
-        /// <summary>
-        /// Internal-only property; when set to true, unknown fields will be discarded while parsing.
-        /// </summary>
-        internal bool DiscardUnknownFields {
-            get { return state.DiscardUnknownFields; }
-            set { state.DiscardUnknownFields = value; }
-        }
-
-        /// <summary>
-        /// Internal-only property; provides extension identifiers to compatible messages while parsing.
-        /// </summary>
-        internal ExtensionRegistry ExtensionRegistry
-        {
-            get { return state.ExtensionRegistry; }
-            set { state.ExtensionRegistry = value; }
-        }
-
-        /// <summary>
-        /// Reads a field tag, returning the tag of 0 for "end of input".
-        /// </summary>
-        /// <remarks>
-        /// If this method returns 0, it doesn't necessarily mean the end of all
-        /// the data in this CodedInputReader; it may be the end of the logical input
-        /// for an embedded message, for example.
-        /// </remarks>
-        /// <returns>The next field tag, or 0 for end of input. (0 is never a valid tag.)</returns>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public uint ReadTag()
-        {
-            return ParsingPrimitives.ParseTag(ref buffer, ref state);
-        }
-
-        /// <summary>
-        /// Reads a double field from the input.
-        /// </summary>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public double ReadDouble()
-        {
-            return ParsingPrimitives.ParseDouble(ref buffer, ref state);
-        }
-
-        /// <summary>
-        /// Reads a float field from the input.
-        /// </summary>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public float ReadFloat()
-        {
-            return ParsingPrimitives.ParseFloat(ref buffer, ref state);
-        }
-
-        /// <summary>
-        /// Reads a uint64 field from the input.
-        /// </summary>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public ulong ReadUInt64()
-        {
-            return ParsingPrimitives.ParseRawVarint64(ref buffer, ref state);
-        }
-
-        /// <summary>
-        /// Reads an int64 field from the input.
-        /// </summary>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public long ReadInt64()
-        {
-            return (long)ParsingPrimitives.ParseRawVarint64(ref buffer, ref state);
-        }
-
-        /// <summary>
-        /// Reads an int32 field from the input.
-        /// </summary>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public int ReadInt32()
-        {
-            return (int)ParsingPrimitives.ParseRawVarint32(ref buffer, ref state);
-        }
-
-        /// <summary>
-        /// Reads a fixed64 field from the input.
-        /// </summary>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public ulong ReadFixed64()
-        {
-            return ParsingPrimitives.ParseRawLittleEndian64(ref buffer, ref state);
-        }
-
-        /// <summary>
-        /// Reads a fixed32 field from the input.
-        /// </summary>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public uint ReadFixed32()
-        {
-            return ParsingPrimitives.ParseRawLittleEndian32(ref buffer, ref state);
-        }
-
-        /// <summary>
-        /// Reads a bool field from the input.
-        /// </summary>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public bool ReadBool()
-        {
-            return ParsingPrimitives.ParseRawVarint64(ref buffer, ref state) != 0;
-        }
-        /// <summary>
-        /// Reads a string field from the input.
-        /// </summary>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public string ReadString()
-        {
-            return ParsingPrimitives.ReadString(ref buffer, ref state);
-        }
-
-        /// <summary>
-        /// Reads an embedded message field value from the input.
-        /// </summary>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public void ReadMessage(IMessage message)
-        {
-            ParsingPrimitivesMessages.ReadMessage(ref this, message);
-        }
-
-        /// <summary>
-        /// Reads an embedded group field from the input.
-        /// </summary>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public void ReadGroup(IMessage message)
-        {
-            ParsingPrimitivesMessages.ReadGroup(ref this, message);
-        }
-
-        /// <summary>
-        /// Reads a bytes field value from the input.
-        /// </summary>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public ByteString ReadBytes()
-        {
-            return ParsingPrimitives.ReadBytes(ref buffer, ref state);
-        }
-        /// <summary>
-        /// Reads a uint32 field value from the input.
-        /// </summary>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public uint ReadUInt32()
-        {
-            return ParsingPrimitives.ParseRawVarint32(ref buffer, ref state);
-        }
-
-        /// <summary>
-        /// Reads an enum field value from the input.
-        /// </summary>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public int ReadEnum()
-        {
-            // Currently just a pass-through, but it's nice to separate it logically from WriteInt32.
-            return (int)ParsingPrimitives.ParseRawVarint32(ref buffer, ref state);
-        }
-
-        /// <summary>
-        /// Reads an sfixed32 field value from the input.
-        /// </summary>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public int ReadSFixed32()
-        {
-            return (int)ParsingPrimitives.ParseRawLittleEndian32(ref buffer, ref state);
-        }
-
-        /// <summary>
-        /// Reads an sfixed64 field value from the input.
-        /// </summary>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public long ReadSFixed64()
-        {
-            return (long)ParsingPrimitives.ParseRawLittleEndian64(ref buffer, ref state);
-        }
-
-        /// <summary>
-        /// Reads an sint32 field value from the input.
-        /// </summary>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public int ReadSInt32()
-        {
-            return ParsingPrimitives.DecodeZigZag32(ParsingPrimitives.ParseRawVarint32(ref buffer, ref state));
-        }
-
-        /// <summary>
-        /// Reads an sint64 field value from the input.
-        /// </summary>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public long ReadSInt64()
-        {
-            return ParsingPrimitives.DecodeZigZag64(ParsingPrimitives.ParseRawVarint64(ref buffer, ref state));
-        }
-
-        /// <summary>
-        /// Reads a length for length-delimited data.
-        /// </summary>
-        /// <remarks>
-        /// This is internally just reading a varint, but this method exists
-        /// to make the calling code clearer.
-        /// </remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public int ReadLength()
-        {
-            return (int)ParsingPrimitives.ParseRawVarint32(ref buffer, ref state);
-        }
-
-        internal void CopyStateTo(CodedInputStream input)
-        {
-            input.InternalState = state;
-        }
-
-        internal void LoadStateFrom(CodedInputStream input)
-        {
-            state = input.InternalState;
-        }
-    }
-}
\ No newline at end of file
diff --git a/libs/protobuf/csharp/src/Google.Protobuf/ParserInternalState.cs b/libs/protobuf/csharp/src/Google.Protobuf/ParserInternalState.cs
deleted file mode 100644
index cb4f471..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf/ParserInternalState.cs
+++ /dev/null
@@ -1,115 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-using System.Buffers;
-using System.Buffers.Binary;
-using System.Collections.Generic;
-using System.IO;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using System.Security;
-using System.Text;
-using Google.Protobuf.Collections;
-
-namespace Google.Protobuf
-{
-
-    // warning: this is a mutable struct, so it needs to be only passed as a ref!
-    internal struct ParserInternalState
-    {
-        // NOTE: the Span representing the current buffer is kept separate so that this doesn't have to be a ref struct and so it can
-        // be included in CodedInputStream's internal state
-
-        /// <summary>
-        /// The position within the current buffer (i.e. the next byte to read)
-        /// </summary>
-        internal int bufferPos;
-
-        /// <summary>
-        /// Size of the current buffer
-        /// </summary>
-        internal int bufferSize;
-
-        /// <summary>
-        /// If we are currently inside a length-delimited block, this is the number of
-        /// bytes in the buffer that are still available once we leave the delimited block.
-        /// </summary>
-        internal int bufferSizeAfterLimit;
-
-        /// <summary>
-        /// The absolute position of the end of the current length-delimited block (including totalBytesRetired)
-        /// </summary>
-        internal int currentLimit;
-
-        /// <summary>
-        /// The total number of consumed before the start of the current buffer. The
-        /// total bytes read up to the current position can be computed as
-        /// totalBytesRetired + bufferPos.
-        /// </summary>
-        internal int totalBytesRetired;
-
-        internal int recursionDepth;  // current recursion depth
-
-        internal SegmentedBufferHelper segmentedBufferHelper;
-
-        /// <summary>
-        /// The last tag we read. 0 indicates we've read to the end of the stream
-        /// (or haven't read anything yet).
-        /// </summary>
-        internal uint lastTag;
-
-        /// <summary>
-        /// The next tag, used to store the value read by PeekTag.
-        /// </summary>
-        internal uint nextTag;
-        internal bool hasNextTag;
-
-        // these fields are configuration, they should be readonly
-        internal int sizeLimit;
-        internal int recursionLimit;
-
-        // If non-null, the top level parse method was started with given coded input stream as an argument
-        // which also means we can potentially fallback to calling MergeFrom(CodedInputStream cis) if needed.
-        internal CodedInputStream CodedInputStream => segmentedBufferHelper.CodedInputStream;
-
-        /// <summary>
-        /// Internal-only property; when set to true, unknown fields will be discarded while parsing.
-        /// </summary>
-        internal bool DiscardUnknownFields { get; set; }
-
-        /// <summary>
-        /// Internal-only property; provides extension identifiers to compatible messages while parsing.
-        /// </summary>
-        internal ExtensionRegistry ExtensionRegistry { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/libs/protobuf/csharp/src/Google.Protobuf/ParsingPrimitives.cs b/libs/protobuf/csharp/src/Google.Protobuf/ParsingPrimitives.cs
deleted file mode 100644
index e270ed8..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf/ParsingPrimitives.cs
+++ /dev/null
@@ -1,815 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-using System.Buffers;
-using System.Buffers.Binary;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using System.Security;
-using System.Text;
-using Google.Protobuf.Collections;
-
-namespace Google.Protobuf
-{
-    /// <summary>
-    /// Primitives for parsing protobuf wire format.
-    /// </summary>
-    [SecuritySafeCritical]
-    internal static class ParsingPrimitives
-    {
-        private const int StackallocThreshold = 256;
-
-        /// <summary>
-        /// Reads a length for length-delimited data.
-        /// </summary>
-        /// <remarks>
-        /// This is internally just reading a varint, but this method exists
-        /// to make the calling code clearer.
-        /// </remarks>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static int ParseLength(ref ReadOnlySpan<byte> buffer, ref ParserInternalState state)
-        {
-            return (int)ParseRawVarint32(ref buffer, ref state);
-        }
-
-        /// <summary>
-        /// Parses the next tag.
-        /// If the end of logical stream was reached, an invalid tag of 0 is returned. 
-        /// </summary>
-        public static uint ParseTag(ref ReadOnlySpan<byte> buffer, ref ParserInternalState state)
-        {
-            // The "nextTag" logic is there only as an optimization for reading non-packed repeated / map
-            // fields and is strictly speaking not necessary.
-            // TODO(jtattermusch): look into simplifying the ParseTag logic.
-            if (state.hasNextTag)
-            {
-                state.lastTag = state.nextTag;
-                state.hasNextTag = false;
-                return state.lastTag;
-            }
-
-            // Optimize for the incredibly common case of having at least two bytes left in the buffer,
-            // and those two bytes being enough to get the tag. This will be true for fields up to 4095.
-            if (state.bufferPos + 2 <= state.bufferSize)
-            {
-                int tmp = buffer[state.bufferPos++];
-                if (tmp < 128)
-                {
-                    state.lastTag = (uint)tmp;
-                }
-                else
-                {
-                    int result = tmp & 0x7f;
-                    if ((tmp = buffer[state.bufferPos++]) < 128)
-                    {
-                        result |= tmp << 7;
-                        state.lastTag = (uint) result;
-                    }
-                    else
-                    {
-                        // Nope, rewind and go the potentially slow route.
-                        state.bufferPos -= 2;
-                        state.lastTag = ParsingPrimitives.ParseRawVarint32(ref buffer, ref state);
-                    }
-                }
-            }
-            else
-            {
-                if (SegmentedBufferHelper.IsAtEnd(ref buffer, ref state))
-                {
-                    state.lastTag = 0;
-                    return 0;
-                }
-
-                state.lastTag = ParsingPrimitives.ParseRawVarint32(ref buffer, ref state);
-            }
-            if (WireFormat.GetTagFieldNumber(state.lastTag) == 0)
-            {
-                // If we actually read a tag with a field of 0, that's not a valid tag.
-                throw InvalidProtocolBufferException.InvalidTag();
-            }
-            return state.lastTag;
-        }
-
-        /// <summary>
-        /// Peeks at the next tag in the stream. If it matches <paramref name="tag"/>,
-        /// the tag is consumed and the method returns <c>true</c>; otherwise, the
-        /// stream is left in the original position and the method returns <c>false</c>.
-        /// </summary>
-        public static bool MaybeConsumeTag(ref ReadOnlySpan<byte> buffer, ref ParserInternalState state, uint tag)
-        {
-            if (PeekTag(ref buffer, ref state) == tag)
-            {
-                state.hasNextTag = false;
-                return true;
-            }
-            return false;
-        }
-
-        /// <summary>
-        /// Peeks at the next field tag. This is like calling <see cref="ParseTag"/>, but the
-        /// tag is not consumed. (So a subsequent call to <see cref="ParseTag"/> will return the
-        /// same value.)
-        /// </summary>
-        public static uint PeekTag(ref ReadOnlySpan<byte> buffer, ref ParserInternalState state)
-        {
-            if (state.hasNextTag)
-            {
-                return state.nextTag;
-            }
-
-            uint savedLast = state.lastTag;
-            state.nextTag = ParseTag(ref buffer, ref state);
-            state.hasNextTag = true;
-            state.lastTag = savedLast; // Undo the side effect of ReadTag
-            return state.nextTag;
-        }
-
-        /// <summary>
-        /// Parses a raw varint.
-        /// </summary>
-        public static ulong ParseRawVarint64(ref ReadOnlySpan<byte> buffer, ref ParserInternalState state)
-        {
-            if (state.bufferPos + 10 > state.bufferSize)
-            {
-                return ParseRawVarint64SlowPath(ref buffer, ref state);
-            }
-
-            ulong result = buffer[state.bufferPos++];
-            if (result < 128)
-            {
-                return result;
-            }
-            result &= 0x7f;
-            int shift = 7;
-            do
-            {
-                byte b = buffer[state.bufferPos++];
-                result |= (ulong)(b & 0x7F) << shift;
-                if (b < 0x80)
-                {
-                    return result;
-                }
-                shift += 7;
-            }
-            while (shift < 64);
-
-            throw InvalidProtocolBufferException.MalformedVarint();
-        }
-
-        private static ulong ParseRawVarint64SlowPath(ref ReadOnlySpan<byte> buffer, ref ParserInternalState state)
-        {
-            int shift = 0;
-            ulong result = 0;
-            do
-            {
-                byte b = ReadRawByte(ref buffer, ref state);
-                result |= (ulong)(b & 0x7F) << shift;
-                if (b < 0x80)
-                {
-                    return result;
-                }
-                shift += 7;
-            }
-            while (shift < 64);
-
-            throw InvalidProtocolBufferException.MalformedVarint();
-        }
-
-        /// <summary>
-        /// Parses a raw Varint.  If larger than 32 bits, discard the upper bits.
-        /// This method is optimised for the case where we've got lots of data in the buffer.
-        /// That means we can check the size just once, then just read directly from the buffer
-        /// without constant rechecking of the buffer length.
-        /// </summary>
-        public static uint ParseRawVarint32(ref ReadOnlySpan<byte> buffer, ref ParserInternalState state)
-        {
-            if (state.bufferPos + 5 > state.bufferSize)
-            {
-                return ParseRawVarint32SlowPath(ref buffer, ref state);
-            }
-
-            int tmp = buffer[state.bufferPos++];
-            if (tmp < 128)
-            {
-                return (uint)tmp;
-            }
-            int result = tmp & 0x7f;
-            if ((tmp = buffer[state.bufferPos++]) < 128)
-            {
-                result |= tmp << 7;
-            }
-            else
-            {
-                result |= (tmp & 0x7f) << 7;
-                if ((tmp = buffer[state.bufferPos++]) < 128)
-                {
-                    result |= tmp << 14;
-                }
-                else
-                {
-                    result |= (tmp & 0x7f) << 14;
-                    if ((tmp = buffer[state.bufferPos++]) < 128)
-                    {
-                        result |= tmp << 21;
-                    }
-                    else
-                    {
-                        result |= (tmp & 0x7f) << 21;
-                        result |= (tmp = buffer[state.bufferPos++]) << 28;
-                        if (tmp >= 128)
-                        {
-                            // Discard upper 32 bits.
-                            // Note that this has to use ReadRawByte() as we only ensure we've
-                            // got at least 5 bytes at the start of the method. This lets us
-                            // use the fast path in more cases, and we rarely hit this section of code.
-                            for (int i = 0; i < 5; i++)
-                            {
-                                if (ReadRawByte(ref buffer, ref state) < 128)
-                                {
-                                    return (uint) result;
-                                }
-                            }
-                            throw InvalidProtocolBufferException.MalformedVarint();
-                        }
-                    }
-                }
-            }
-            return (uint)result;
-        }
-
-        private static uint ParseRawVarint32SlowPath(ref ReadOnlySpan<byte> buffer, ref ParserInternalState state)
-        {
-            int tmp = ReadRawByte(ref buffer, ref state);
-            if (tmp < 128)
-            {
-                return (uint) tmp;
-            }
-            int result = tmp & 0x7f;
-            if ((tmp = ReadRawByte(ref buffer, ref state)) < 128)
-            {
-                result |= tmp << 7;
-            }
-            else
-            {
-                result |= (tmp & 0x7f) << 7;
-                if ((tmp = ReadRawByte(ref buffer, ref state)) < 128)
-                {
-                    result |= tmp << 14;
-                }
-                else
-                {
-                    result |= (tmp & 0x7f) << 14;
-                    if ((tmp = ReadRawByte(ref buffer, ref state)) < 128)
-                    {
-                        result |= tmp << 21;
-                    }
-                    else
-                    {
-                        result |= (tmp & 0x7f) << 21;
-                        result |= (tmp = ReadRawByte(ref buffer, ref state)) << 28;
-                        if (tmp >= 128)
-                        {
-                            // Discard upper 32 bits.
-                            for (int i = 0; i < 5; i++)
-                            {
-                                if (ReadRawByte(ref buffer, ref state) < 128)
-                                {
-                                    return (uint) result;
-                                }
-                            }
-                            throw InvalidProtocolBufferException.MalformedVarint();
-                        }
-                    }
-                }
-            }
-            return (uint) result;
-        }
-
-        /// <summary>
-        /// Parses a 32-bit little-endian integer.
-        /// </summary>
-        public static uint ParseRawLittleEndian32(ref ReadOnlySpan<byte> buffer, ref ParserInternalState state)
-        {
-            const int uintLength = sizeof(uint);
-            const int ulongLength = sizeof(ulong);
-            if (state.bufferPos + ulongLength > state.bufferSize)
-            {
-                return ParseRawLittleEndian32SlowPath(ref buffer, ref state);
-            }
-            // ReadUInt32LittleEndian is many times slower than ReadUInt64LittleEndian (at least on some runtimes)
-            // so it's faster better to use ReadUInt64LittleEndian and truncate the result.
-            uint result = (uint) BinaryPrimitives.ReadUInt64LittleEndian(buffer.Slice(state.bufferPos, ulongLength));
-            state.bufferPos += uintLength;
-            return result;
-        }
-
-        private static uint ParseRawLittleEndian32SlowPath(ref ReadOnlySpan<byte> buffer, ref ParserInternalState state)
-        {
-            uint b1 = ReadRawByte(ref buffer, ref state);
-            uint b2 = ReadRawByte(ref buffer, ref state);
-            uint b3 = ReadRawByte(ref buffer, ref state);
-            uint b4 = ReadRawByte(ref buffer, ref state);
-            return b1 | (b2 << 8) | (b3 << 16) | (b4 << 24);
-        }
-
-        /// <summary>
-        /// Parses a 64-bit little-endian integer.
-        /// </summary>
-        public static ulong ParseRawLittleEndian64(ref ReadOnlySpan<byte> buffer, ref ParserInternalState state)
-        {
-            const int length = sizeof(ulong);
-            if (state.bufferPos + length > state.bufferSize)
-            {
-                return ParseRawLittleEndian64SlowPath(ref buffer, ref state);
-            }
-            ulong result = BinaryPrimitives.ReadUInt64LittleEndian(buffer.Slice(state.bufferPos, length));
-            state.bufferPos += length;
-            return result;
-        }
-
-        private static ulong ParseRawLittleEndian64SlowPath(ref ReadOnlySpan<byte> buffer, ref ParserInternalState state)
-        {
-            ulong b1 = ReadRawByte(ref buffer, ref state);
-            ulong b2 = ReadRawByte(ref buffer, ref state);
-            ulong b3 = ReadRawByte(ref buffer, ref state);
-            ulong b4 = ReadRawByte(ref buffer, ref state);
-            ulong b5 = ReadRawByte(ref buffer, ref state);
-            ulong b6 = ReadRawByte(ref buffer, ref state);
-            ulong b7 = ReadRawByte(ref buffer, ref state);
-            ulong b8 = ReadRawByte(ref buffer, ref state);
-            return b1 | (b2 << 8) | (b3 << 16) | (b4 << 24)
-                    | (b5 << 32) | (b6 << 40) | (b7 << 48) | (b8 << 56);
-        }
-
-        /// <summary>
-        /// Parses a double value.
-        /// </summary>
-        public static double ParseDouble(ref ReadOnlySpan<byte> buffer, ref ParserInternalState state)
-        {
-            const int length = sizeof(double);
-            if (!BitConverter.IsLittleEndian || state.bufferPos + length > state.bufferSize)
-            {
-                return BitConverter.Int64BitsToDouble((long)ParseRawLittleEndian64(ref buffer, ref state));
-            }
-            // ReadUnaligned uses processor architecture for endianness.
-            double result = Unsafe.ReadUnaligned<double>(ref MemoryMarshal.GetReference(buffer.Slice(state.bufferPos, length)));
-            state.bufferPos += length;
-            return result;
-        }
-
-        /// <summary>
-        /// Parses a float value.
-        /// </summary>
-        public static float ParseFloat(ref ReadOnlySpan<byte> buffer, ref ParserInternalState state)
-        {
-            const int length = sizeof(float);
-            if (!BitConverter.IsLittleEndian || state.bufferPos + length > state.bufferSize)
-            {
-                return ParseFloatSlow(ref buffer, ref state);
-            }
-            // ReadUnaligned uses processor architecture for endianness.
-            float result = Unsafe.ReadUnaligned<float>(ref MemoryMarshal.GetReference(buffer.Slice(state.bufferPos, length)));
-            state.bufferPos += length;
-            return result;  
-        }
-
-        private static unsafe float ParseFloatSlow(ref ReadOnlySpan<byte> buffer, ref ParserInternalState state)
-        {
-            const int length = sizeof(float);
-            byte* stackBuffer = stackalloc byte[length];
-            Span<byte> tempSpan = new Span<byte>(stackBuffer, length);
-            for (int i = 0; i < length; i++)
-            {
-                tempSpan[i] = ReadRawByte(ref buffer, ref state);
-            }
-
-            // Content is little endian. Reverse if needed to match endianness of architecture.
-            if (!BitConverter.IsLittleEndian)
-            {
-                tempSpan.Reverse();
-            }
-            return Unsafe.ReadUnaligned<float>(ref MemoryMarshal.GetReference(tempSpan));
-        }
-
-        /// <summary>
-        /// Reads a fixed size of bytes from the input.
-        /// </summary>
-        /// <exception cref="InvalidProtocolBufferException">
-        /// the end of the stream or the current limit was reached
-        /// </exception>
-        public static byte[] ReadRawBytes(ref ReadOnlySpan<byte> buffer, ref ParserInternalState state, int size)
-        {
-            if (size < 0)
-            {
-                throw InvalidProtocolBufferException.NegativeSize();
-            }
-
-            if (size <= state.bufferSize - state.bufferPos)
-            {
-                // We have all the bytes we need already.
-                byte[] bytes = new byte[size];
-                buffer.Slice(state.bufferPos, size).CopyTo(bytes);
-                state.bufferPos += size;
-                return bytes;
-            }
-
-            return ReadRawBytesSlow(ref buffer, ref state, size);
-        }
-
-        private static byte[] ReadRawBytesSlow(ref ReadOnlySpan<byte> buffer, ref ParserInternalState state, int size)
-        {
-            ValidateCurrentLimit(ref buffer, ref state, size);
-
-            if ((!state.segmentedBufferHelper.TotalLength.HasValue && size < buffer.Length) ||
-                IsDataAvailableInSource(ref state, size))
-            {
-                // Reading more bytes than are in the buffer, but not an excessive number
-                // of bytes.  We can safely allocate the resulting array ahead of time.
-
-                byte[] bytes = new byte[size];
-                ReadRawBytesIntoSpan(ref buffer, ref state, size, bytes);
-                return bytes;
-            }
-            else
-            {
-                // The size is very large.  For security reasons, we can't allocate the
-                // entire byte array yet.  The size comes directly from the input, so a
-                // maliciously-crafted message could provide a bogus very large size in
-                // order to trick the app into allocating a lot of memory.  We avoid this
-                // by allocating and reading only a small chunk at a time, so that the
-                // malicious message must actually *be* extremely large to cause
-                // problems.  Meanwhile, we limit the allowed size of a message elsewhere.
-
-                List<byte[]> chunks = new List<byte[]>();
-
-                int pos = state.bufferSize - state.bufferPos;
-                byte[] firstChunk = new byte[pos];
-                buffer.Slice(state.bufferPos, pos).CopyTo(firstChunk);
-                chunks.Add(firstChunk);
-                state.bufferPos = state.bufferSize;
-
-                // Read all the rest of the bytes we need.
-                int sizeLeft = size - pos;
-                while (sizeLeft > 0)
-                {
-                    state.segmentedBufferHelper.RefillBuffer(ref buffer, ref state, true);
-                    byte[] chunk = new byte[Math.Min(sizeLeft, state.bufferSize)];
-
-                    buffer.Slice(0, chunk.Length)
-                        .CopyTo(chunk);
-                    state.bufferPos += chunk.Length;
-                    sizeLeft -= chunk.Length;
-                    chunks.Add(chunk);
-                }
-
-                // OK, got everything.  Now concatenate it all into one buffer.
-                byte[] bytes = new byte[size];
-                int newPos = 0;
-                foreach (byte[] chunk in chunks)
-                {
-                    Buffer.BlockCopy(chunk, 0, bytes, newPos, chunk.Length);
-                    newPos += chunk.Length;
-                }
-
-                // Done.
-                return bytes;
-            }
-        }
-
-        /// <summary>
-        /// Reads and discards <paramref name="size"/> bytes.
-        /// </summary>
-        /// <exception cref="InvalidProtocolBufferException">the end of the stream
-        /// or the current limit was reached</exception>
-        public static void SkipRawBytes(ref ReadOnlySpan<byte> buffer, ref ParserInternalState state, int size)
-        {
-            if (size < 0)
-            {
-                throw InvalidProtocolBufferException.NegativeSize();
-            }
-
-            ValidateCurrentLimit(ref buffer, ref state, size);
-
-            if (size <= state.bufferSize - state.bufferPos)
-            {
-                // We have all the bytes we need already.
-                state.bufferPos += size;
-            }
-            else
-            {
-                // Skipping more bytes than are in the buffer.  First skip what we have.
-                int pos = state.bufferSize - state.bufferPos;
-                state.bufferPos = state.bufferSize;
-
-                // TODO: If our segmented buffer is backed by a Stream that is seekable, we could skip the bytes more efficiently
-                // by simply updating stream's Position property. This used to be supported in the past, but the support was dropped
-                // because it would make the segmentedBufferHelper more complex. Support can be reintroduced if needed.
-                state.segmentedBufferHelper.RefillBuffer(ref buffer, ref state, true);
-
-                while (size - pos > state.bufferSize)
-                {
-                    pos += state.bufferSize;
-                    state.bufferPos = state.bufferSize;
-                    state.segmentedBufferHelper.RefillBuffer(ref buffer, ref state, true);
-                }
-
-                state.bufferPos = size - pos;
-            }
-        }
-
-        /// <summary>
-        /// Reads a string field value from the input.
-        /// </summary>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static string ReadString(ref ReadOnlySpan<byte> buffer, ref ParserInternalState state)
-        {
-            int length = ParsingPrimitives.ParseLength(ref buffer, ref state);
-            return ParsingPrimitives.ReadRawString(ref buffer, ref state, length);
-        }
-
-        /// <summary>
-        /// Reads a bytes field value from the input.
-        /// </summary>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static ByteString ReadBytes(ref ReadOnlySpan<byte> buffer, ref ParserInternalState state)
-        {
-            int length = ParsingPrimitives.ParseLength(ref buffer, ref state);
-            return ByteString.AttachBytes(ParsingPrimitives.ReadRawBytes(ref buffer, ref state, length));
-        }
-
-        /// <summary>
-        /// Reads a UTF-8 string from the next "length" bytes.
-        /// </summary>
-        /// <exception cref="InvalidProtocolBufferException">
-        /// the end of the stream or the current limit was reached
-        /// </exception>
-        [SecuritySafeCritical]
-        public static string ReadRawString(ref ReadOnlySpan<byte> buffer, ref ParserInternalState state, int length)
-        {
-            // No need to read any data for an empty string.
-            if (length == 0)
-            {
-                return string.Empty;
-            }
-
-            if (length < 0)
-            {
-                throw InvalidProtocolBufferException.NegativeSize();
-            }
-
-#if GOOGLE_PROTOBUF_SUPPORT_FAST_STRING
-            if (length <= state.bufferSize - state.bufferPos)
-            {
-                // Fast path: all bytes to decode appear in the same span.
-                ReadOnlySpan<byte> data = buffer.Slice(state.bufferPos, length);
-
-                string value;
-                unsafe
-                {
-                    fixed (byte* sourceBytes = &MemoryMarshal.GetReference(data))
-                    {
-                        value = WritingPrimitives.Utf8Encoding.GetString(sourceBytes, length);
-                    }
-                }
-
-                state.bufferPos += length;
-                return value;
-            }
-#endif
-
-            return ReadStringSlow(ref buffer, ref state, length);
-        }
-
-        /// <summary>
-        /// Reads a string assuming that it is spread across multiple spans in a <see cref="ReadOnlySequence{T}"/>.
-        /// </summary>
-        private static string ReadStringSlow(ref ReadOnlySpan<byte> buffer, ref ParserInternalState state, int length)
-        {
-            ValidateCurrentLimit(ref buffer, ref state, length);
-
-#if GOOGLE_PROTOBUF_SUPPORT_FAST_STRING
-            if (IsDataAvailable(ref state, length))
-            {
-                // Read string data into a temporary buffer, either stackalloc'ed or from ArrayPool
-                // Once all data is read then call Encoding.GetString on buffer and return to pool if needed.
-
-                byte[] byteArray = null;
-                Span<byte> byteSpan = length <= StackallocThreshold ?
-                    stackalloc byte[length] :
-                    (byteArray = ArrayPool<byte>.Shared.Rent(length));
-
-                try
-                {
-                    unsafe
-                    {
-                        fixed (byte* pByteSpan = &MemoryMarshal.GetReference(byteSpan))
-                        {
-                            // Compiler doesn't like that a potentially stackalloc'd Span<byte> is being used
-                            // in a method with a "ref Span<byte> buffer" argument. If the stackalloc'd span was assigned
-                            // to the ref argument then bad things would happen. We'll never do that so it is ok.
-                            // Make compiler happy by passing a new span created from pointer.
-                            var tempSpan = new Span<byte>(pByteSpan, byteSpan.Length);
-                            ReadRawBytesIntoSpan(ref buffer, ref state, length, tempSpan);
-
-                            return WritingPrimitives.Utf8Encoding.GetString(pByteSpan, length);
-                        }
-                    }
-                }
-                finally
-                {
-                    if (byteArray != null)
-                    {
-                        ArrayPool<byte>.Shared.Return(byteArray);
-                    }
-                }
-            }
-#endif
-
-            // Slow path: Build a byte array first then copy it.
-            // This will be called when reading from a Stream because we don't know the length of the stream,
-            // or there is not enough data in the sequence. If there is not enough data then ReadRawBytes will
-            // throw an exception.
-            return WritingPrimitives.Utf8Encoding.GetString(ReadRawBytes(ref buffer, ref state, length), 0, length);
-        }
-
-        /// <summary>
-        /// Validates that the specified size doesn't exceed the current limit. If it does then remaining bytes
-        /// are skipped and an error is thrown.
-        /// </summary>
-        private static void ValidateCurrentLimit(ref ReadOnlySpan<byte> buffer, ref ParserInternalState state, int size)
-        {
-            if (state.totalBytesRetired + state.bufferPos + size > state.currentLimit)
-            {
-                // Read to the end of the stream (up to the current limit) anyway.
-                SkipRawBytes(ref buffer, ref state, state.currentLimit - state.totalBytesRetired - state.bufferPos);
-                // Then fail.
-                throw InvalidProtocolBufferException.TruncatedMessage();
-            }
-        }
-
-        [SecuritySafeCritical]
-        private static byte ReadRawByte(ref ReadOnlySpan<byte> buffer, ref ParserInternalState state)
-        {
-            if (state.bufferPos == state.bufferSize)
-            {
-                state.segmentedBufferHelper.RefillBuffer(ref buffer, ref state, true);
-            }
-            return buffer[state.bufferPos++];
-        }
-
-        /// <summary>
-        /// Reads a varint from the input one byte at a time, so that it does not
-        /// read any bytes after the end of the varint. If you simply wrapped the
-        /// stream in a CodedInputStream and used ReadRawVarint32(Stream)
-        /// then you would probably end up reading past the end of the varint since
-        /// CodedInputStream buffers its input.
-        /// </summary>
-        /// <param name="input"></param>
-        /// <returns></returns>
-        public static uint ReadRawVarint32(Stream input)
-        {
-            int result = 0;
-            int offset = 0;
-            for (; offset < 32; offset += 7)
-            {
-                int b = input.ReadByte();
-                if (b == -1)
-                {
-                    throw InvalidProtocolBufferException.TruncatedMessage();
-                }
-                result |= (b & 0x7f) << offset;
-                if ((b & 0x80) == 0)
-                {
-                    return (uint) result;
-                }
-            }
-            // Keep reading up to 64 bits.
-            for (; offset < 64; offset += 7)
-            {
-                int b = input.ReadByte();
-                if (b == -1)
-                {
-                    throw InvalidProtocolBufferException.TruncatedMessage();
-                }
-                if ((b & 0x80) == 0)
-                {
-                    return (uint) result;
-                }
-            }
-            throw InvalidProtocolBufferException.MalformedVarint();
-        }
-
-        /// <summary>
-        /// Decode a 32-bit value with ZigZag encoding.
-        /// </summary>
-        /// <remarks>
-        /// ZigZag encodes signed integers into values that can be efficiently
-        /// encoded with varint.  (Otherwise, negative values must be 
-        /// sign-extended to 32 bits to be varint encoded, thus always taking
-        /// 5 bytes on the wire.)
-        /// </remarks>
-        public static int DecodeZigZag32(uint n)
-        {
-            return (int)(n >> 1) ^ -(int)(n & 1);
-        }
-
-        /// <summary>
-        /// Decode a 64-bit value with ZigZag encoding.
-        /// </summary>
-        /// <remarks>
-        /// ZigZag encodes signed integers into values that can be efficiently
-        /// encoded with varint.  (Otherwise, negative values must be 
-        /// sign-extended to 64 bits to be varint encoded, thus always taking
-        /// 10 bytes on the wire.)
-        /// </remarks>
-        public static long DecodeZigZag64(ulong n)
-        {
-            return (long)(n >> 1) ^ -(long)(n & 1);
-        }
-
-        /// <summary>
-        /// Checks whether there is known data available of the specified size remaining to parse.
-        /// When parsing from a Stream this can return false because we have no knowledge of the amount
-        /// of data remaining in the stream until it is read.
-        /// </summary>
-        public static bool IsDataAvailable(ref ParserInternalState state, int size)
-        {
-            // Data fits in remaining buffer
-            if (size <= state.bufferSize - state.bufferPos)
-            {
-                return true;
-            }
-
-            return IsDataAvailableInSource(ref state, size);
-        }
-
-        /// <summary>
-        /// Checks whether there is known data available of the specified size remaining to parse
-        /// in the underlying data source.
-        /// When parsing from a Stream this will return false because we have no knowledge of the amount
-        /// of data remaining in the stream until it is read.
-        /// </summary>
-        private static bool IsDataAvailableInSource(ref ParserInternalState state, int size)
-        {
-            // Data fits in remaining source data.
-            // Note that this will never be true when reading from a stream as the total length is unknown.
-            return size <= state.segmentedBufferHelper.TotalLength - state.totalBytesRetired - state.bufferPos;
-        }
-
-        /// <summary>
-        /// Read raw bytes of the specified length into a span. The amount of data available and the current limit should
-        /// be checked before calling this method.
-        /// </summary>
-        private static void ReadRawBytesIntoSpan(ref ReadOnlySpan<byte> buffer, ref ParserInternalState state, int length, Span<byte> byteSpan)
-        {
-            int remainingByteLength = length;
-            while (remainingByteLength > 0)
-            {
-                if (state.bufferSize - state.bufferPos == 0)
-                {
-                    state.segmentedBufferHelper.RefillBuffer(ref buffer, ref state, true);
-                }
-
-                ReadOnlySpan<byte> unreadSpan = buffer.Slice(state.bufferPos, Math.Min(remainingByteLength, state.bufferSize - state.bufferPos));
-                unreadSpan.CopyTo(byteSpan.Slice(length - remainingByteLength));
-
-                remainingByteLength -= unreadSpan.Length;
-                state.bufferPos += unreadSpan.Length;
-            }
-        }
-    }
-}
diff --git a/libs/protobuf/csharp/src/Google.Protobuf/ParsingPrimitivesMessages.cs b/libs/protobuf/csharp/src/Google.Protobuf/ParsingPrimitivesMessages.cs
deleted file mode 100644
index eabaf96..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf/ParsingPrimitivesMessages.cs
+++ /dev/null
@@ -1,292 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-using System.Buffers;
-using System.Collections.Generic;
-using System.IO;
-using System.Runtime.CompilerServices;
-using System.Security;
-using Google.Protobuf.Collections;
-
-namespace Google.Protobuf
-{
-    /// <summary>
-    /// Reading and skipping messages / groups
-    /// </summary>
-    [SecuritySafeCritical]
-    internal static class ParsingPrimitivesMessages
-    {
-        private static readonly byte[] ZeroLengthMessageStreamData = new byte[] { 0 };
-
-        public static void SkipLastField(ref ReadOnlySpan<byte> buffer, ref ParserInternalState state)
-        {
-            if (state.lastTag == 0)
-            {
-                throw new InvalidOperationException("SkipLastField cannot be called at the end of a stream");
-            }
-            switch (WireFormat.GetTagWireType(state.lastTag))
-            {
-                case WireFormat.WireType.StartGroup:
-                    SkipGroup(ref buffer, ref state, state.lastTag);
-                    break;
-                case WireFormat.WireType.EndGroup:
-                    throw new InvalidProtocolBufferException(
-                        "SkipLastField called on an end-group tag, indicating that the corresponding start-group was missing");
-                case WireFormat.WireType.Fixed32:
-                    ParsingPrimitives.ParseRawLittleEndian32(ref buffer, ref state);
-                    break;
-                case WireFormat.WireType.Fixed64:
-                    ParsingPrimitives.ParseRawLittleEndian64(ref buffer, ref state);
-                    break;
-                case WireFormat.WireType.LengthDelimited:
-                    var length = ParsingPrimitives.ParseLength(ref buffer, ref state);
-                    ParsingPrimitives.SkipRawBytes(ref buffer, ref state, length);
-                    break;
-                case WireFormat.WireType.Varint:
-                    ParsingPrimitives.ParseRawVarint32(ref buffer, ref state);
-                    break;
-            }
-        }
-
-        /// <summary>
-        /// Skip a group.
-        /// </summary>
-        public static void SkipGroup(ref ReadOnlySpan<byte> buffer, ref ParserInternalState state, uint startGroupTag)
-        {
-            // Note: Currently we expect this to be the way that groups are read. We could put the recursion
-            // depth changes into the ReadTag method instead, potentially...
-            state.recursionDepth++;
-            if (state.recursionDepth >= state.recursionLimit)
-            {
-                throw InvalidProtocolBufferException.RecursionLimitExceeded();
-            }
-            uint tag;
-            while (true)
-            {
-                tag = ParsingPrimitives.ParseTag(ref buffer, ref state);
-                if (tag == 0)
-                {
-                    throw InvalidProtocolBufferException.TruncatedMessage();
-                }
-                // Can't call SkipLastField for this case- that would throw.
-                if (WireFormat.GetTagWireType(tag) == WireFormat.WireType.EndGroup)
-                {
-                    break;
-                }
-                // This recursion will allow us to handle nested groups.
-                SkipLastField(ref buffer, ref state);
-            }
-            int startField = WireFormat.GetTagFieldNumber(startGroupTag);
-            int endField = WireFormat.GetTagFieldNumber(tag);
-            if (startField != endField)
-            {
-                throw new InvalidProtocolBufferException(
-                    $"Mismatched end-group tag. Started with field {startField}; ended with field {endField}");
-            }
-            state.recursionDepth--;
-        }
-
-        public static void ReadMessage(ref ParseContext ctx, IMessage message)
-        {
-            int length = ParsingPrimitives.ParseLength(ref ctx.buffer, ref ctx.state);
-            if (ctx.state.recursionDepth >= ctx.state.recursionLimit)
-            {
-                throw InvalidProtocolBufferException.RecursionLimitExceeded();
-            }
-            int oldLimit = SegmentedBufferHelper.PushLimit(ref ctx.state, length);
-            ++ctx.state.recursionDepth;
-
-            ReadRawMessage(ref ctx, message);
-
-            CheckReadEndOfStreamTag(ref ctx.state);
-            // Check that we've read exactly as much data as expected.
-            if (!SegmentedBufferHelper.IsReachedLimit(ref ctx.state))
-            {
-                throw InvalidProtocolBufferException.TruncatedMessage();
-            }
-            --ctx.state.recursionDepth;
-            SegmentedBufferHelper.PopLimit(ref ctx.state, oldLimit);
-        }
-
-        public static KeyValuePair<TKey, TValue> ReadMapEntry<TKey, TValue>(ref ParseContext ctx, MapField<TKey, TValue>.Codec codec)
-        {
-            int length = ParsingPrimitives.ParseLength(ref ctx.buffer, ref ctx.state);
-            if (ctx.state.recursionDepth >= ctx.state.recursionLimit)
-            {
-                throw InvalidProtocolBufferException.RecursionLimitExceeded();
-            }
-            int oldLimit = SegmentedBufferHelper.PushLimit(ref ctx.state, length);
-            ++ctx.state.recursionDepth;
-
-            TKey key = codec.KeyCodec.DefaultValue;
-            TValue value = codec.ValueCodec.DefaultValue;
-
-            uint tag;
-            while ((tag = ctx.ReadTag()) != 0)
-            {
-                if (tag == codec.KeyCodec.Tag)
-                {
-                    key = codec.KeyCodec.Read(ref ctx);
-                }
-                else if (tag == codec.ValueCodec.Tag)
-                {
-                    value = codec.ValueCodec.Read(ref ctx);
-                }
-                else
-                {
-                    SkipLastField(ref ctx.buffer, ref ctx.state);
-                }
-            }
-
-            // Corner case: a map entry with a key but no value, where the value type is a message.
-            // Read it as if we'd seen input with no data (i.e. create a "default" message).
-            if (value == null)
-            {
-                if (ctx.state.CodedInputStream != null)
-                {
-                    // the decoded message might not support parsing from ParseContext, so
-                    // we need to allow fallback to the legacy MergeFrom(CodedInputStream) parsing.
-                    value = codec.ValueCodec.Read(new CodedInputStream(ZeroLengthMessageStreamData));
-                }
-                else
-                {
-                    ParseContext.Initialize(new ReadOnlySequence<byte>(ZeroLengthMessageStreamData), out ParseContext zeroLengthCtx);
-                    value = codec.ValueCodec.Read(ref zeroLengthCtx);
-                }
-            }
-
-            CheckReadEndOfStreamTag(ref ctx.state);
-            // Check that we've read exactly as much data as expected.
-            if (!SegmentedBufferHelper.IsReachedLimit(ref ctx.state))
-            {
-                throw InvalidProtocolBufferException.TruncatedMessage();
-            }
-            --ctx.state.recursionDepth;
-            SegmentedBufferHelper.PopLimit(ref ctx.state, oldLimit);
-
-            return new KeyValuePair<TKey, TValue>(key, value);
-        }
-
-        public static void ReadGroup(ref ParseContext ctx, IMessage message)
-        {
-            if (ctx.state.recursionDepth >= ctx.state.recursionLimit)
-            {
-                throw InvalidProtocolBufferException.RecursionLimitExceeded();
-            }
-            ++ctx.state.recursionDepth;
-            
-            uint tag = ctx.state.lastTag;
-            int fieldNumber = WireFormat.GetTagFieldNumber(tag);
-            ReadRawMessage(ref ctx, message);
-            CheckLastTagWas(ref ctx.state, WireFormat.MakeTag(fieldNumber, WireFormat.WireType.EndGroup));
-
-            --ctx.state.recursionDepth;
-        }
-
-        public static void ReadGroup(ref ParseContext ctx, int fieldNumber, UnknownFieldSet set)
-        {
-            if (ctx.state.recursionDepth >= ctx.state.recursionLimit)
-            {
-                throw InvalidProtocolBufferException.RecursionLimitExceeded();
-            }
-            ++ctx.state.recursionDepth;
-
-            set.MergeGroupFrom(ref ctx);
-            CheckLastTagWas(ref ctx.state, WireFormat.MakeTag(fieldNumber, WireFormat.WireType.EndGroup));
-
-            --ctx.state.recursionDepth;
-        }
-
-        public static void ReadRawMessage(ref ParseContext ctx, IMessage message)
-        {
-            if (message is IBufferMessage bufferMessage)
-            {
-                bufferMessage.InternalMergeFrom(ref ctx);   
-            }
-            else
-            {
-                // If we reached here, it means we've ran into a nested message with older generated code
-                // which doesn't provide the InternalMergeFrom method that takes a ParseContext.
-                // With a slight performance overhead, we can still parse this message just fine,
-                // but we need to find the original CodedInputStream instance that initiated this
-                // parsing process and make sure its internal state is up to date.
-                // Note that this performance overhead is not very high (basically copying contents of a struct)
-                // and it will only be incurred in case the application mixes older and newer generated code.
-                // Regenerating the code from .proto files will remove this overhead because it will
-                // generate the InternalMergeFrom method we need.
-
-                if (ctx.state.CodedInputStream == null)
-                {
-                    // This can only happen when the parsing started without providing a CodedInputStream instance
-                    // (e.g. ParseContext was created directly from a ReadOnlySequence).
-                    // That also means that one of the new parsing APIs was used at the top level
-                    // and in such case it is reasonable to require that all the nested message provide
-                    // up-to-date generated code with ParseContext support (and fail otherwise).
-                    throw new InvalidProtocolBufferException($"Message {message.GetType().Name} doesn't provide the generated method that enables ParseContext-based parsing. You might need to regenerate the generated protobuf code.");
-                }
-
-                ctx.CopyStateTo(ctx.state.CodedInputStream);
-                try
-                {
-                    // fallback parse using the CodedInputStream that started current parsing tree
-                    message.MergeFrom(ctx.state.CodedInputStream);
-                }
-                finally
-                {
-                    ctx.LoadStateFrom(ctx.state.CodedInputStream);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Verifies that the last call to ReadTag() returned tag 0 - in other words,
-        /// we've reached the end of the stream when we expected to.
-        /// </summary>
-        /// <exception cref="InvalidProtocolBufferException">The 
-        /// tag read was not the one specified</exception>
-        public static void CheckReadEndOfStreamTag(ref ParserInternalState state)
-        {
-            if (state.lastTag != 0)
-            {
-                throw InvalidProtocolBufferException.MoreDataAvailable();
-            }
-        }
-
-        private static void CheckLastTagWas(ref ParserInternalState state, uint expectedTag)
-        {
-            if (state.lastTag != expectedTag) {
-               throw InvalidProtocolBufferException.InvalidEndTag();
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/libs/protobuf/csharp/src/Google.Protobuf/ParsingPrimitivesWrappers.cs b/libs/protobuf/csharp/src/Google.Protobuf/ParsingPrimitivesWrappers.cs
deleted file mode 100644
index 629ec32..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf/ParsingPrimitivesWrappers.cs
+++ /dev/null
@@ -1,355 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-using System.Buffers;
-using System.Buffers.Binary;
-using System.Collections.Generic;
-using System.IO;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using System.Security;
-using System.Text;
-using Google.Protobuf.Collections;
-
-namespace Google.Protobuf
-{
-    /// <summary>
-    /// Fast parsing primitives for wrapper types
-    /// </summary>
-    [SecuritySafeCritical]
-    internal static class ParsingPrimitivesWrappers
-    {
-        internal static float? ReadFloatWrapperLittleEndian(ref ReadOnlySpan<byte> buffer, ref ParserInternalState state)
-        {
-            // length:1 + tag:1 + value:4 = 6 bytes
-            if (state.bufferPos + 6 <= state.bufferSize)
-            {
-                // The entire wrapper message is already contained in `buffer`.
-                int length = buffer[state.bufferPos];
-                if (length == 0)
-                {
-                    state.bufferPos++;
-                    return 0F;
-                }
-                // tag:1 + value:4 = length of 5 bytes
-                // field=1, type=32-bit = tag of 13
-                if (length != 5 || buffer[state.bufferPos + 1] != 13)
-                {
-                    return ReadFloatWrapperSlow(ref buffer, ref state);
-                }
-                state.bufferPos += 2;
-                return ParsingPrimitives.ParseFloat(ref buffer, ref state);
-            }
-            else
-            {
-                return ReadFloatWrapperSlow(ref buffer, ref state);
-            }
-        }
-
-        internal static float? ReadFloatWrapperSlow(ref ReadOnlySpan<byte> buffer, ref ParserInternalState state)
-        {
-            int length = ParsingPrimitives.ParseLength(ref buffer, ref state);
-            if (length == 0)
-            {
-                return 0F;
-            }
-            int finalBufferPos = state.totalBytesRetired + state.bufferPos + length;
-            float result = 0F;
-            do
-            {
-                // field=1, type=32-bit = tag of 13
-                if (ParsingPrimitives.ParseTag(ref buffer, ref state) == 13)
-                {
-                    result = ParsingPrimitives.ParseFloat(ref buffer, ref state);
-                }
-                else
-                {
-                    ParsingPrimitivesMessages.SkipLastField(ref buffer, ref state);
-                }
-            }
-            while (state.totalBytesRetired + state.bufferPos < finalBufferPos);
-            return result;
-        }
-
-        internal static double? ReadDoubleWrapperLittleEndian(ref ReadOnlySpan<byte> buffer, ref ParserInternalState state)
-        {
-            // length:1 + tag:1 + value:8 = 10 bytes
-            if (state.bufferPos + 10 <= state.bufferSize)
-            {
-                // The entire wrapper message is already contained in `buffer`.
-                int length = buffer[state.bufferPos];
-                if (length == 0)
-                {
-                    state.bufferPos++;
-                    return 0D;
-                }
-                // tag:1 + value:8 = length of 9 bytes
-                // field=1, type=64-bit = tag of 9
-                if (length != 9 || buffer[state.bufferPos + 1] != 9)
-                {
-                    return ReadDoubleWrapperSlow(ref buffer, ref state);
-                }
-                state.bufferPos += 2;
-                return ParsingPrimitives.ParseDouble(ref buffer, ref state);
-            }
-            else
-            {
-                return ReadDoubleWrapperSlow(ref buffer, ref state);
-            }
-        }
-
-        internal static double? ReadDoubleWrapperSlow(ref ReadOnlySpan<byte> buffer, ref ParserInternalState state)
-        {
-            int length = ParsingPrimitives.ParseLength(ref buffer, ref state);
-            if (length == 0)
-            {
-                return 0D;
-            }
-            int finalBufferPos = state.totalBytesRetired + state.bufferPos + length;
-            double result = 0D;
-            do
-            {
-                // field=1, type=64-bit = tag of 9
-                if (ParsingPrimitives.ParseTag(ref buffer, ref state) == 9)
-                {
-                    result = ParsingPrimitives.ParseDouble(ref buffer, ref state);
-                }
-                else
-                {
-                    ParsingPrimitivesMessages.SkipLastField(ref buffer, ref state);
-                }
-            }
-            while (state.totalBytesRetired + state.bufferPos < finalBufferPos);
-            return result;
-        }
-
-        internal static bool? ReadBoolWrapper(ref ReadOnlySpan<byte> buffer, ref ParserInternalState state)
-        {
-            return ReadUInt64Wrapper(ref buffer, ref state) != 0;
-        }
-
-        internal static uint? ReadUInt32Wrapper(ref ReadOnlySpan<byte> buffer, ref ParserInternalState state)
-        {
-            // field=1, type=varint = tag of 8
-            const int expectedTag = 8;
-            // length:1 + tag:1 + value:10(varint64-max) = 12 bytes
-            // Value can be 64 bits for negative integers
-            if (state.bufferPos + 12 <= state.bufferSize)
-            {
-                // The entire wrapper message is already contained in `buffer`.
-                int pos0 = state.bufferPos;
-                int length = buffer[state.bufferPos++];
-                if (length == 0)
-                {
-                    return 0;
-                }
-                // Length will always fit in a single byte.
-                if (length >= 128)
-                {
-                    state.bufferPos = pos0;
-                    return ReadUInt32WrapperSlow(ref buffer, ref state);
-                }
-                int finalBufferPos = state.bufferPos + length;
-                if (buffer[state.bufferPos++] != expectedTag)
-                {
-                    state.bufferPos = pos0;
-                    return ReadUInt32WrapperSlow(ref buffer, ref state);
-                }
-                var result = ParsingPrimitives.ParseRawVarint32(ref buffer, ref state);
-                // Verify this message only contained a single field.
-                if (state.bufferPos != finalBufferPos)
-                {
-                    state.bufferPos = pos0;
-                    return ReadUInt32WrapperSlow(ref buffer, ref state);
-                }
-                return result;
-            }
-            else
-            {
-                return ReadUInt32WrapperSlow(ref buffer, ref state);
-            }
-        }
-
-        internal static uint? ReadUInt32WrapperSlow(ref ReadOnlySpan<byte> buffer, ref ParserInternalState state)
-        {
-            int length = ParsingPrimitives.ParseLength(ref buffer, ref state);
-            if (length == 0)
-            {
-                return 0;
-            }
-            int finalBufferPos = state.totalBytesRetired + state.bufferPos + length;
-            uint result = 0;
-            do
-            {
-                // field=1, type=varint = tag of 8
-                if (ParsingPrimitives.ParseTag(ref buffer, ref state) == 8)
-                {
-                    result = ParsingPrimitives.ParseRawVarint32(ref buffer, ref state);
-                }
-                else
-                {
-                    ParsingPrimitivesMessages.SkipLastField(ref buffer, ref state);
-                }
-            }
-            while (state.totalBytesRetired + state.bufferPos < finalBufferPos);
-            return result;
-        }
-
-        internal static int? ReadInt32Wrapper(ref ReadOnlySpan<byte> buffer, ref ParserInternalState state)
-        {
-            return (int?)ReadUInt32Wrapper(ref buffer, ref state);
-        }
-
-        internal static ulong? ReadUInt64Wrapper(ref ReadOnlySpan<byte> buffer, ref ParserInternalState state)
-        {
-            // field=1, type=varint = tag of 8
-            const int expectedTag = 8;
-            // length:1 + tag:1 + value:10(varint64-max) = 12 bytes
-            if (state.bufferPos + 12 <= state.bufferSize)
-            {
-                // The entire wrapper message is already contained in `buffer`.
-                int pos0 = state.bufferPos;
-                int length = buffer[state.bufferPos++];
-                if (length == 0)
-                {
-                    return 0L;
-                }
-                // Length will always fit in a single byte.
-                if (length >= 128)
-                {
-                    state.bufferPos = pos0;
-                    return ReadUInt64WrapperSlow(ref buffer, ref state);
-                }
-                int finalBufferPos = state.bufferPos + length;
-                if (buffer[state.bufferPos++] != expectedTag)
-                {
-                    state.bufferPos = pos0;
-                    return ReadUInt64WrapperSlow(ref buffer, ref state);
-                }
-                var result = ParsingPrimitives.ParseRawVarint64(ref buffer, ref state);
-                // Verify this message only contained a single field.
-                if (state.bufferPos != finalBufferPos)
-                {
-                    state.bufferPos = pos0;
-                    return ReadUInt64WrapperSlow(ref buffer, ref state);
-                }
-                return result;
-            }
-            else
-            {
-                return ReadUInt64WrapperSlow(ref buffer, ref state);
-            }
-        }
-
-        internal static ulong? ReadUInt64WrapperSlow(ref ReadOnlySpan<byte> buffer, ref ParserInternalState state)
-        {
-            // field=1, type=varint = tag of 8
-            const int expectedTag = 8;
-            int length = ParsingPrimitives.ParseLength(ref buffer, ref state);
-            if (length == 0)
-            {
-                return 0L;
-            }
-            int finalBufferPos = state.totalBytesRetired + state.bufferPos + length;
-            ulong result = 0L;
-            do
-            {
-                if (ParsingPrimitives.ParseTag(ref buffer, ref state) == expectedTag)
-                {
-                    result = ParsingPrimitives.ParseRawVarint64(ref buffer, ref state);
-                }
-                else
-                {
-                    ParsingPrimitivesMessages.SkipLastField(ref buffer, ref state);
-                }
-            }
-            while (state.totalBytesRetired + state.bufferPos < finalBufferPos);
-            return result;
-        }
-
-        internal static long? ReadInt64Wrapper(ref ReadOnlySpan<byte> buffer, ref ParserInternalState state)
-        {
-            return (long?)ReadUInt64Wrapper(ref buffer, ref state);
-        }
-
-        internal static float? ReadFloatWrapperLittleEndian(ref ParseContext ctx)
-        {
-            return ParsingPrimitivesWrappers.ReadFloatWrapperLittleEndian(ref ctx.buffer, ref ctx.state);
-        }
-
-        internal static float? ReadFloatWrapperSlow(ref ParseContext ctx)
-        {
-            return ParsingPrimitivesWrappers.ReadFloatWrapperSlow(ref ctx.buffer, ref ctx.state);
-        }
-
-        internal static double? ReadDoubleWrapperLittleEndian(ref ParseContext ctx)
-        {
-            return ParsingPrimitivesWrappers.ReadDoubleWrapperLittleEndian(ref ctx.buffer, ref ctx.state);
-        }
-
-        internal static double? ReadDoubleWrapperSlow(ref ParseContext ctx)
-        {
-            return ParsingPrimitivesWrappers.ReadDoubleWrapperSlow(ref ctx.buffer, ref ctx.state);
-        }
-
-        internal static bool? ReadBoolWrapper(ref ParseContext ctx)
-        {
-            return ParsingPrimitivesWrappers.ReadBoolWrapper(ref ctx.buffer, ref ctx.state);
-        }
-
-        internal static uint? ReadUInt32Wrapper(ref ParseContext ctx)
-        {
-            return ParsingPrimitivesWrappers.ReadUInt32Wrapper(ref ctx.buffer, ref ctx.state);
-        }
-
-        internal static int? ReadInt32Wrapper(ref ParseContext ctx)
-        {
-            return ParsingPrimitivesWrappers.ReadInt32Wrapper(ref ctx.buffer, ref ctx.state);
-        }
-
-        internal static ulong? ReadUInt64Wrapper(ref ParseContext ctx)
-        {
-            return ParsingPrimitivesWrappers.ReadUInt64Wrapper(ref ctx.buffer, ref ctx.state);
-        }
-
-        internal static ulong? ReadUInt64WrapperSlow(ref ParseContext ctx)
-        {
-            return ParsingPrimitivesWrappers.ReadUInt64WrapperSlow(ref ctx.buffer, ref ctx.state);
-        }
-
-        internal static long? ReadInt64Wrapper(ref ParseContext ctx)
-        {
-            return ParsingPrimitivesWrappers.ReadInt64Wrapper(ref ctx.buffer, ref ctx.state);
-        }
-    }
-}
\ No newline at end of file
diff --git a/libs/protobuf/csharp/src/Google.Protobuf/Properties/AssemblyInfo.cs b/libs/protobuf/csharp/src/Google.Protobuf/Properties/AssemblyInfo.cs
deleted file mode 100644
index 4328e2e..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System.Runtime.CompilerServices;
-using System.Security;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-
-#if !NCRUNCH
-[assembly: AllowPartiallyTrustedCallers]
-#endif
-
-[assembly: InternalsVisibleTo("Google.Protobuf.Test, PublicKey=" +
-    "002400000480000094000000060200000024000052534131000400000100010025800fbcfc63a1" +
-    "7c66b303aae80b03a6beaa176bb6bef883be436f2a1579edd80ce23edf151a1f4ced97af83abcd" +
-    "981207041fd5b2da3b498346fcfcd94910d52f25537c4a43ce3fbe17dc7d43e6cbdb4d8f1242dc" +
-    "b6bd9b5906be74da8daa7d7280f97130f318a16c07baf118839b156299a48522f9fae2371c9665" +
-    "c5ae9cb6")]
-
-[assembly: InternalsVisibleTo("Google.Protobuf.Benchmarks, PublicKey=" +
-    "002400000480000094000000060200000024000052534131000400000100010025800fbcfc63a1" +
-    "7c66b303aae80b03a6beaa176bb6bef883be436f2a1579edd80ce23edf151a1f4ced97af83abcd" +
-    "981207041fd5b2da3b498346fcfcd94910d52f25537c4a43ce3fbe17dc7d43e6cbdb4d8f1242dc" +
-    "b6bd9b5906be74da8daa7d7280f97130f318a16c07baf118839b156299a48522f9fae2371c9665" +
-    "c5ae9cb6")]
diff --git a/libs/protobuf/csharp/src/Google.Protobuf/ProtoPreconditions.cs b/libs/protobuf/csharp/src/Google.Protobuf/ProtoPreconditions.cs
deleted file mode 100644
index 1814b8b..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf/ProtoPreconditions.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-
-namespace Google.Protobuf
-{
-    /// <summary>
-    /// Helper methods for throwing exceptions when preconditions are not met.
-    /// </summary>
-    /// <remarks>
-    /// This class is used internally and by generated code; it is not particularly
-    /// expected to be used from application code, although nothing prevents it
-    /// from being used that way.
-    /// </remarks>
-    public static class ProtoPreconditions
-    {
-        /// <summary>
-        /// Throws an ArgumentNullException if the given value is null, otherwise
-        /// return the value to the caller.
-        /// </summary>
-        public static T CheckNotNull<T>(T value, string name) where T : class
-        {
-            if (value == null)
-            {
-                throw new ArgumentNullException(name);
-            }
-            return value;
-        }
-
-        /// <summary>
-        /// Throws an ArgumentNullException if the given value is null, otherwise
-        /// return the value to the caller.
-        /// </summary>
-        /// <remarks>
-        /// This is equivalent to <see cref="CheckNotNull{T}(T, string)"/> but without the type parameter
-        /// constraint. In most cases, the constraint is useful to prevent you from calling CheckNotNull
-        /// with a value type - but it gets in the way if either you want to use it with a nullable
-        /// value type, or you want to use it with an unconstrained type parameter.
-        /// </remarks>
-        internal static T CheckNotNullUnconstrained<T>(T value, string name)
-        {
-            if (value == null)
-            {
-                throw new ArgumentNullException(name);
-            }
-            return value;
-        }
-    }
-}
\ No newline at end of file
diff --git a/libs/protobuf/csharp/src/Google.Protobuf/Reflection/CustomOptions.cs b/libs/protobuf/csharp/src/Google.Protobuf/Reflection/CustomOptions.cs
deleted file mode 100644
index f6fa152..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf/Reflection/CustomOptions.cs
+++ /dev/null
@@ -1,324 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2017 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using Google.Protobuf.Collections;
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-using System.Reflection;
-
-namespace Google.Protobuf.Reflection
-{
-    /// <summary>
-    /// Container for a set of custom options specified within a message, field etc.
-    /// </summary>
-    /// <remarks>
-    /// <para>
-    /// This type is publicly immutable, but internally mutable. It is only populated
-    /// by the descriptor parsing code - by the time any user code is able to see an instance,
-    /// it will be fully initialized.
-    /// </para>
-    /// <para>
-    /// If an option is requested using the incorrect method, an answer may still be returned: all
-    /// of the numeric types are represented internally using 64-bit integers, for example. It is up to
-    /// the caller to ensure that they make the appropriate method call for the option they're interested in.
-    /// Note that enum options are simply stored as integers, so the value should be fetched using
-    /// <see cref="TryGetInt32(int, out int)"/> and then cast appropriately.
-    /// </para>
-    /// <para>
-    /// Repeated options are currently not supported. Asking for a single value of an option
-    /// which was actually repeated will return the last value, except for message types where
-    /// all the set values are merged together.
-    /// </para>
-    /// </remarks>
-    public sealed class CustomOptions
-    {
-        private const string UnreferencedCodeMessage = "CustomOptions is incompatible with trimming.";
-
-        private static readonly object[] EmptyParameters = new object[0];
-        private readonly IDictionary<int, IExtensionValue> values;
-
-        internal CustomOptions(IDictionary<int, IExtensionValue> values)
-        {
-            this.values = values;
-        }
-
-        /// <summary>
-        /// Retrieves a Boolean value for the specified option field.
-        /// </summary>
-        /// <param name="field">The field to fetch the value for.</param>
-        /// <param name="value">The output variable to populate.</param>
-        /// <returns><c>true</c> if a suitable value for the field was found; <c>false</c> otherwise.</returns>
-        [RequiresUnreferencedCode(UnreferencedCodeMessage)]
-        public bool TryGetBool(int field, out bool value) => TryGetPrimitiveValue(field, out value);
-
-        /// <summary>
-        /// Retrieves a signed 32-bit integer value for the specified option field.
-        /// </summary>
-        /// <param name="field">The field to fetch the value for.</param>
-        /// <param name="value">The output variable to populate.</param>
-        /// <returns><c>true</c> if a suitable value for the field was found; <c>false</c> otherwise.</returns>
-        [RequiresUnreferencedCode(UnreferencedCodeMessage)]
-        public bool TryGetInt32(int field, out int value) => TryGetPrimitiveValue(field, out value);
-
-        /// <summary>
-        /// Retrieves a signed 64-bit integer value for the specified option field.
-        /// </summary>
-        /// <param name="field">The field to fetch the value for.</param>
-        /// <param name="value">The output variable to populate.</param>
-        /// <returns><c>true</c> if a suitable value for the field was found; <c>false</c> otherwise.</returns>
-        [RequiresUnreferencedCode(UnreferencedCodeMessage)]
-        public bool TryGetInt64(int field, out long value) => TryGetPrimitiveValue(field, out value);
-
-        /// <summary>
-        /// Retrieves an unsigned 32-bit integer value for the specified option field,
-        /// assuming a fixed-length representation.
-        /// </summary>
-        /// <param name="field">The field to fetch the value for.</param>
-        /// <param name="value">The output variable to populate.</param>
-        /// <returns><c>true</c> if a suitable value for the field was found; <c>false</c> otherwise.</returns>
-        [RequiresUnreferencedCode(UnreferencedCodeMessage)]
-        public bool TryGetFixed32(int field, out uint value) => TryGetUInt32(field, out value);
-
-        /// <summary>
-        /// Retrieves an unsigned 64-bit integer value for the specified option field,
-        /// assuming a fixed-length representation.
-        /// </summary>
-        /// <param name="field">The field to fetch the value for.</param>
-        /// <param name="value">The output variable to populate.</param>
-        /// <returns><c>true</c> if a suitable value for the field was found; <c>false</c> otherwise.</returns>
-        [RequiresUnreferencedCode(UnreferencedCodeMessage)]
-        public bool TryGetFixed64(int field, out ulong value) => TryGetUInt64(field, out value);
-
-        /// <summary>
-        /// Retrieves a signed 32-bit integer value for the specified option field,
-        /// assuming a fixed-length representation.
-        /// </summary>
-        /// <param name="field">The field to fetch the value for.</param>
-        /// <param name="value">The output variable to populate.</param>
-        /// <returns><c>true</c> if a suitable value for the field was found; <c>false</c> otherwise.</returns>
-        [RequiresUnreferencedCode(UnreferencedCodeMessage)]
-        public bool TryGetSFixed32(int field, out int value) => TryGetInt32(field, out value);
-
-        /// <summary>
-        /// Retrieves a signed 64-bit integer value for the specified option field,
-        /// assuming a fixed-length representation.
-        /// </summary>
-        /// <param name="field">The field to fetch the value for.</param>
-        /// <param name="value">The output variable to populate.</param>
-        /// <returns><c>true</c> if a suitable value for the field was found; <c>false</c> otherwise.</returns>
-        [RequiresUnreferencedCode(UnreferencedCodeMessage)]
-        public bool TryGetSFixed64(int field, out long value) => TryGetInt64(field, out value);
-
-        /// <summary>
-        /// Retrieves a signed 32-bit integer value for the specified option field,
-        /// assuming a zigzag encoding.
-        /// </summary>
-        /// <param name="field">The field to fetch the value for.</param>
-        /// <param name="value">The output variable to populate.</param>
-        /// <returns><c>true</c> if a suitable value for the field was found; <c>false</c> otherwise.</returns>
-        [RequiresUnreferencedCode(UnreferencedCodeMessage)]
-        public bool TryGetSInt32(int field, out int value) => TryGetPrimitiveValue(field, out value);
-
-        /// <summary>
-        /// Retrieves a signed 64-bit integer value for the specified option field,
-        /// assuming a zigzag encoding.
-        /// </summary>
-        /// <param name="field">The field to fetch the value for.</param>
-        /// <param name="value">The output variable to populate.</param>
-        /// <returns><c>true</c> if a suitable value for the field was found; <c>false</c> otherwise.</returns>
-        [RequiresUnreferencedCode(UnreferencedCodeMessage)]
-        public bool TryGetSInt64(int field, out long value) => TryGetPrimitiveValue(field, out value);
-
-        /// <summary>
-        /// Retrieves an unsigned 32-bit integer value for the specified option field.
-        /// </summary>
-        /// <param name="field">The field to fetch the value for.</param>
-        /// <param name="value">The output variable to populate.</param>
-        /// <returns><c>true</c> if a suitable value for the field was found; <c>false</c> otherwise.</returns>
-        [RequiresUnreferencedCode(UnreferencedCodeMessage)]
-        public bool TryGetUInt32(int field, out uint value) => TryGetPrimitiveValue(field, out value);
-
-        /// <summary>
-        /// Retrieves an unsigned 64-bit integer value for the specified option field.
-        /// </summary>
-        /// <param name="field">The field to fetch the value for.</param>
-        /// <param name="value">The output variable to populate.</param>
-        /// <returns><c>true</c> if a suitable value for the field was found; <c>false</c> otherwise.</returns>
-        [RequiresUnreferencedCode(UnreferencedCodeMessage)]
-        public bool TryGetUInt64(int field, out ulong value) => TryGetPrimitiveValue(field, out value);
-
-        /// <summary>
-        /// Retrieves a 32-bit floating point value for the specified option field.
-        /// </summary>
-        /// <param name="field">The field to fetch the value for.</param>
-        /// <param name="value">The output variable to populate.</param>
-        /// <returns><c>true</c> if a suitable value for the field was found; <c>false</c> otherwise.</returns>
-        [RequiresUnreferencedCode(UnreferencedCodeMessage)]
-        public bool TryGetFloat(int field, out float value) => TryGetPrimitiveValue(field, out value);
-
-        /// <summary>
-        /// Retrieves a 64-bit floating point value for the specified option field.
-        /// </summary>
-        /// <param name="field">The field to fetch the value for.</param>
-        /// <param name="value">The output variable to populate.</param>
-        /// <returns><c>true</c> if a suitable value for the field was found; <c>false</c> otherwise.</returns>
-        [RequiresUnreferencedCode(UnreferencedCodeMessage)]
-        public bool TryGetDouble(int field, out double value) => TryGetPrimitiveValue(field, out value);
-
-        /// <summary>
-        /// Retrieves a string value for the specified option field.
-        /// </summary>
-        /// <param name="field">The field to fetch the value for.</param>
-        /// <param name="value">The output variable to populate.</param>
-        /// <returns><c>true</c> if a suitable value for the field was found; <c>false</c> otherwise.</returns>
-        [RequiresUnreferencedCode(UnreferencedCodeMessage)]
-        public bool TryGetString(int field, out string value) => TryGetPrimitiveValue(field, out value);
-
-        /// <summary>
-        /// Retrieves a bytes value for the specified option field.
-        /// </summary>
-        /// <param name="field">The field to fetch the value for.</param>
-        /// <param name="value">The output variable to populate.</param>
-        /// <returns><c>true</c> if a suitable value for the field was found; <c>false</c> otherwise.</returns>
-        [RequiresUnreferencedCode(UnreferencedCodeMessage)]
-        public bool TryGetBytes(int field, out ByteString value) => TryGetPrimitiveValue(field, out value);
-
-        /// <summary>
-        /// Retrieves a message value for the specified option field.
-        /// </summary>
-        /// <param name="field">The field to fetch the value for.</param>
-        /// <param name="value">The output variable to populate.</param>
-        /// <returns><c>true</c> if a suitable value for the field was found; <c>false</c> otherwise.</returns>
-        [RequiresUnreferencedCode(UnreferencedCodeMessage)]
-        public bool TryGetMessage<T>(int field, out T value) where T : class, IMessage, new()
-        {
-            if (values == null)
-            {
-                value = default(T);
-                return false;
-            }
-
-            IExtensionValue extensionValue;
-            if (values.TryGetValue(field, out extensionValue))
-            {
-                if (extensionValue is ExtensionValue<T>)
-                {
-                    ExtensionValue<T> single = extensionValue as ExtensionValue<T>;
-                    ByteString bytes = single.GetValue().ToByteString();
-                    value = new T();
-                    value.MergeFrom(bytes);
-                    return true;
-                }
-                else if (extensionValue is RepeatedExtensionValue<T>)
-                {
-                    RepeatedExtensionValue<T> repeated = extensionValue as RepeatedExtensionValue<T>;
-                    value = repeated.GetValue()
-                        .Select(v => v.ToByteString())
-                        .Aggregate(new T(), (t, b) =>
-                        {
-                            t.MergeFrom(b);
-                            return t;
-                        });
-                    return true;
-                }
-            }
-
-            value = null;
-            return false;
-        }
-
-        [RequiresUnreferencedCode(UnreferencedCodeMessage)]
-        private bool TryGetPrimitiveValue<T>(int field, out T value)
-        {
-            if (values == null)
-            {
-                value = default(T);
-                return false;
-            }
-
-            IExtensionValue extensionValue;
-            if (values.TryGetValue(field, out extensionValue))
-            {
-                if (extensionValue is ExtensionValue<T>)
-                {
-                    ExtensionValue<T> single = extensionValue as ExtensionValue<T>;
-                    value = single.GetValue();
-                    return true;
-                }
-                else if (extensionValue is RepeatedExtensionValue<T>)
-                {
-                    RepeatedExtensionValue<T> repeated = extensionValue as RepeatedExtensionValue<T>;
-                    if (repeated.GetValue().Count != 0)
-                    {
-                        RepeatedField<T> repeatedField = repeated.GetValue();
-                        value = repeatedField[repeatedField.Count - 1];
-                        return true;
-                    }
-                }
-                else // and here we find explicit enum handling since T : Enum ! x is ExtensionValue<Enum>
-                {
-                    var type = extensionValue.GetType();
-                    if (type.GetGenericTypeDefinition() == typeof(ExtensionValue<>))
-                    {
-                        var typeInfo = type.GetTypeInfo();
-                        var typeArgs = typeInfo.GenericTypeArguments;
-                        if (typeArgs.Length == 1 && typeArgs[0].GetTypeInfo().IsEnum)
-                        {
-                            value = (T)typeInfo.GetDeclaredMethod(nameof(ExtensionValue<T>.GetValue)).Invoke(extensionValue, EmptyParameters);
-                            return true;
-                        }
-                    }
-                    else if (type.GetGenericTypeDefinition() == typeof(RepeatedExtensionValue<>))
-                    {
-                        var typeInfo = type.GetTypeInfo();
-                        var typeArgs = typeInfo.GenericTypeArguments;
-                        if (typeArgs.Length == 1 && typeArgs[0].GetTypeInfo().IsEnum)
-                        {
-                            var values = (IList)typeInfo.GetDeclaredMethod(nameof(RepeatedExtensionValue<T>.GetValue)).Invoke(extensionValue, EmptyParameters);
-                            if (values.Count != 0)
-                            {
-                                value = (T)values[values.Count - 1];
-                                return true;
-                            }
-                        }
-                    }
-                }
-            }
-
-            value = default(T);
-            return false;
-        }
-    }
-}
diff --git a/libs/protobuf/csharp/src/Google.Protobuf/Reflection/Descriptor.cs b/libs/protobuf/csharp/src/Google.Protobuf/Reflection/Descriptor.cs
deleted file mode 100644
index 1cb43c0..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf/Reflection/Descriptor.cs
+++ /dev/null
@@ -1,11083 +0,0 @@
-// <auto-generated>
-//     Generated by the protocol buffer compiler.  DO NOT EDIT!
-//     source: google/protobuf/descriptor.proto
-// </auto-generated>
-#pragma warning disable 1591, 0612, 3021, 8981
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-namespace Google.Protobuf.Reflection {
-
-  /// <summary>Holder for reflection information generated from google/protobuf/descriptor.proto</summary>
-  public static partial class DescriptorReflection {
-
-    #region Descriptor
-    /// <summary>File descriptor for google/protobuf/descriptor.proto</summary>
-    public static pbr::FileDescriptor Descriptor {
-      get { return descriptor; }
-    }
-    private static pbr::FileDescriptor descriptor;
-
-    static DescriptorReflection() {
-      byte[] descriptorData = global::System.Convert.FromBase64String(
-          string.Concat(
-            "CiBnb29nbGUvcHJvdG9idWYvZGVzY3JpcHRvci5wcm90bxIPZ29vZ2xlLnBy",
-            "b3RvYnVmIkcKEUZpbGVEZXNjcmlwdG9yU2V0EjIKBGZpbGUYASADKAsyJC5n",
-            "b29nbGUucHJvdG9idWYuRmlsZURlc2NyaXB0b3JQcm90byLbAwoTRmlsZURl",
-            "c2NyaXB0b3JQcm90bxIMCgRuYW1lGAEgASgJEg8KB3BhY2thZ2UYAiABKAkS",
-            "EgoKZGVwZW5kZW5jeRgDIAMoCRIZChFwdWJsaWNfZGVwZW5kZW5jeRgKIAMo",
-            "BRIXCg93ZWFrX2RlcGVuZGVuY3kYCyADKAUSNgoMbWVzc2FnZV90eXBlGAQg",
-            "AygLMiAuZ29vZ2xlLnByb3RvYnVmLkRlc2NyaXB0b3JQcm90bxI3CgllbnVt",
-            "X3R5cGUYBSADKAsyJC5nb29nbGUucHJvdG9idWYuRW51bURlc2NyaXB0b3JQ",
-            "cm90bxI4CgdzZXJ2aWNlGAYgAygLMicuZ29vZ2xlLnByb3RvYnVmLlNlcnZp",
-            "Y2VEZXNjcmlwdG9yUHJvdG8SOAoJZXh0ZW5zaW9uGAcgAygLMiUuZ29vZ2xl",
-            "LnByb3RvYnVmLkZpZWxkRGVzY3JpcHRvclByb3RvEi0KB29wdGlvbnMYCCAB",
-            "KAsyHC5nb29nbGUucHJvdG9idWYuRmlsZU9wdGlvbnMSOQoQc291cmNlX2Nv",
-            "ZGVfaW5mbxgJIAEoCzIfLmdvb2dsZS5wcm90b2J1Zi5Tb3VyY2VDb2RlSW5m",
-            "bxIOCgZzeW50YXgYDCABKAkiqQUKD0Rlc2NyaXB0b3JQcm90bxIMCgRuYW1l",
-            "GAEgASgJEjQKBWZpZWxkGAIgAygLMiUuZ29vZ2xlLnByb3RvYnVmLkZpZWxk",
-            "RGVzY3JpcHRvclByb3RvEjgKCWV4dGVuc2lvbhgGIAMoCzIlLmdvb2dsZS5w",
-            "cm90b2J1Zi5GaWVsZERlc2NyaXB0b3JQcm90bxI1CgtuZXN0ZWRfdHlwZRgD",
-            "IAMoCzIgLmdvb2dsZS5wcm90b2J1Zi5EZXNjcmlwdG9yUHJvdG8SNwoJZW51",
-            "bV90eXBlGAQgAygLMiQuZ29vZ2xlLnByb3RvYnVmLkVudW1EZXNjcmlwdG9y",
-            "UHJvdG8SSAoPZXh0ZW5zaW9uX3JhbmdlGAUgAygLMi8uZ29vZ2xlLnByb3Rv",
-            "YnVmLkRlc2NyaXB0b3JQcm90by5FeHRlbnNpb25SYW5nZRI5CgpvbmVvZl9k",
-            "ZWNsGAggAygLMiUuZ29vZ2xlLnByb3RvYnVmLk9uZW9mRGVzY3JpcHRvclBy",
-            "b3RvEjAKB29wdGlvbnMYByABKAsyHy5nb29nbGUucHJvdG9idWYuTWVzc2Fn",
-            "ZU9wdGlvbnMSRgoOcmVzZXJ2ZWRfcmFuZ2UYCSADKAsyLi5nb29nbGUucHJv",
-            "dG9idWYuRGVzY3JpcHRvclByb3RvLlJlc2VydmVkUmFuZ2USFQoNcmVzZXJ2",
-            "ZWRfbmFtZRgKIAMoCRplCg5FeHRlbnNpb25SYW5nZRINCgVzdGFydBgBIAEo",
-            "BRILCgNlbmQYAiABKAUSNwoHb3B0aW9ucxgDIAEoCzImLmdvb2dsZS5wcm90",
-            "b2J1Zi5FeHRlbnNpb25SYW5nZU9wdGlvbnMaKwoNUmVzZXJ2ZWRSYW5nZRIN",
-            "CgVzdGFydBgBIAEoBRILCgNlbmQYAiABKAUiZwoVRXh0ZW5zaW9uUmFuZ2VP",
-            "cHRpb25zEkMKFHVuaW50ZXJwcmV0ZWRfb3B0aW9uGOcHIAMoCzIkLmdvb2ds",
-            "ZS5wcm90b2J1Zi5VbmludGVycHJldGVkT3B0aW9uKgkI6AcQgICAgAIi1QUK",
-            "FEZpZWxkRGVzY3JpcHRvclByb3RvEgwKBG5hbWUYASABKAkSDgoGbnVtYmVy",
-            "GAMgASgFEjoKBWxhYmVsGAQgASgOMisuZ29vZ2xlLnByb3RvYnVmLkZpZWxk",
-            "RGVzY3JpcHRvclByb3RvLkxhYmVsEjgKBHR5cGUYBSABKA4yKi5nb29nbGUu",
-            "cHJvdG9idWYuRmllbGREZXNjcmlwdG9yUHJvdG8uVHlwZRIRCgl0eXBlX25h",
-            "bWUYBiABKAkSEAoIZXh0ZW5kZWUYAiABKAkSFQoNZGVmYXVsdF92YWx1ZRgH",
-            "IAEoCRITCgtvbmVvZl9pbmRleBgJIAEoBRIRCglqc29uX25hbWUYCiABKAkS",
-            "LgoHb3B0aW9ucxgIIAEoCzIdLmdvb2dsZS5wcm90b2J1Zi5GaWVsZE9wdGlv",
-            "bnMSFwoPcHJvdG8zX29wdGlvbmFsGBEgASgIIrYCCgRUeXBlEg8KC1RZUEVf",
-            "RE9VQkxFEAESDgoKVFlQRV9GTE9BVBACEg4KClRZUEVfSU5UNjQQAxIPCgtU",
-            "WVBFX1VJTlQ2NBAEEg4KClRZUEVfSU5UMzIQBRIQCgxUWVBFX0ZJWEVENjQQ",
-            "BhIQCgxUWVBFX0ZJWEVEMzIQBxINCglUWVBFX0JPT0wQCBIPCgtUWVBFX1NU",
-            "UklORxAJEg4KClRZUEVfR1JPVVAQChIQCgxUWVBFX01FU1NBR0UQCxIOCgpU",
-            "WVBFX0JZVEVTEAwSDwoLVFlQRV9VSU5UMzIQDRINCglUWVBFX0VOVU0QDhIR",
-            "Cg1UWVBFX1NGSVhFRDMyEA8SEQoNVFlQRV9TRklYRUQ2NBAQEg8KC1RZUEVf",
-            "U0lOVDMyEBESDwoLVFlQRV9TSU5UNjQQEiJDCgVMYWJlbBISCg5MQUJFTF9P",
-            "UFRJT05BTBABEhIKDkxBQkVMX1JFUVVJUkVEEAISEgoOTEFCRUxfUkVQRUFU",
-            "RUQQAyJUChRPbmVvZkRlc2NyaXB0b3JQcm90bxIMCgRuYW1lGAEgASgJEi4K",
-            "B29wdGlvbnMYAiABKAsyHS5nb29nbGUucHJvdG9idWYuT25lb2ZPcHRpb25z",
-            "IqQCChNFbnVtRGVzY3JpcHRvclByb3RvEgwKBG5hbWUYASABKAkSOAoFdmFs",
-            "dWUYAiADKAsyKS5nb29nbGUucHJvdG9idWYuRW51bVZhbHVlRGVzY3JpcHRv",
-            "clByb3RvEi0KB29wdGlvbnMYAyABKAsyHC5nb29nbGUucHJvdG9idWYuRW51",
-            "bU9wdGlvbnMSTgoOcmVzZXJ2ZWRfcmFuZ2UYBCADKAsyNi5nb29nbGUucHJv",
-            "dG9idWYuRW51bURlc2NyaXB0b3JQcm90by5FbnVtUmVzZXJ2ZWRSYW5nZRIV",
-            "Cg1yZXNlcnZlZF9uYW1lGAUgAygJGi8KEUVudW1SZXNlcnZlZFJhbmdlEg0K",
-            "BXN0YXJ0GAEgASgFEgsKA2VuZBgCIAEoBSJsChhFbnVtVmFsdWVEZXNjcmlw",
-            "dG9yUHJvdG8SDAoEbmFtZRgBIAEoCRIOCgZudW1iZXIYAiABKAUSMgoHb3B0",
-            "aW9ucxgDIAEoCzIhLmdvb2dsZS5wcm90b2J1Zi5FbnVtVmFsdWVPcHRpb25z",
-            "IpABChZTZXJ2aWNlRGVzY3JpcHRvclByb3RvEgwKBG5hbWUYASABKAkSNgoG",
-            "bWV0aG9kGAIgAygLMiYuZ29vZ2xlLnByb3RvYnVmLk1ldGhvZERlc2NyaXB0",
-            "b3JQcm90bxIwCgdvcHRpb25zGAMgASgLMh8uZ29vZ2xlLnByb3RvYnVmLlNl",
-            "cnZpY2VPcHRpb25zIsEBChVNZXRob2REZXNjcmlwdG9yUHJvdG8SDAoEbmFt",
-            "ZRgBIAEoCRISCgppbnB1dF90eXBlGAIgASgJEhMKC291dHB1dF90eXBlGAMg",
-            "ASgJEi8KB29wdGlvbnMYBCABKAsyHi5nb29nbGUucHJvdG9idWYuTWV0aG9k",
-            "T3B0aW9ucxIfChBjbGllbnRfc3RyZWFtaW5nGAUgASgIOgVmYWxzZRIfChBz",
-            "ZXJ2ZXJfc3RyZWFtaW5nGAYgASgIOgVmYWxzZSKlBgoLRmlsZU9wdGlvbnMS",
-            "FAoMamF2YV9wYWNrYWdlGAEgASgJEhwKFGphdmFfb3V0ZXJfY2xhc3NuYW1l",
-            "GAggASgJEiIKE2phdmFfbXVsdGlwbGVfZmlsZXMYCiABKAg6BWZhbHNlEikK",
-            "HWphdmFfZ2VuZXJhdGVfZXF1YWxzX2FuZF9oYXNoGBQgASgIQgIYARIlChZq",
-            "YXZhX3N0cmluZ19jaGVja191dGY4GBsgASgIOgVmYWxzZRJGCgxvcHRpbWl6",
-            "ZV9mb3IYCSABKA4yKS5nb29nbGUucHJvdG9idWYuRmlsZU9wdGlvbnMuT3B0",
-            "aW1pemVNb2RlOgVTUEVFRBISCgpnb19wYWNrYWdlGAsgASgJEiIKE2NjX2dl",
-            "bmVyaWNfc2VydmljZXMYECABKAg6BWZhbHNlEiQKFWphdmFfZ2VuZXJpY19z",
-            "ZXJ2aWNlcxgRIAEoCDoFZmFsc2USIgoTcHlfZ2VuZXJpY19zZXJ2aWNlcxgS",
-            "IAEoCDoFZmFsc2USIwoUcGhwX2dlbmVyaWNfc2VydmljZXMYKiABKAg6BWZh",
-            "bHNlEhkKCmRlcHJlY2F0ZWQYFyABKAg6BWZhbHNlEh4KEGNjX2VuYWJsZV9h",
-            "cmVuYXMYHyABKAg6BHRydWUSGQoRb2JqY19jbGFzc19wcmVmaXgYJCABKAkS",
-            "GAoQY3NoYXJwX25hbWVzcGFjZRglIAEoCRIUCgxzd2lmdF9wcmVmaXgYJyAB",
-            "KAkSGAoQcGhwX2NsYXNzX3ByZWZpeBgoIAEoCRIVCg1waHBfbmFtZXNwYWNl",
-            "GCkgASgJEh4KFnBocF9tZXRhZGF0YV9uYW1lc3BhY2UYLCABKAkSFAoMcnVi",
-            "eV9wYWNrYWdlGC0gASgJEkMKFHVuaW50ZXJwcmV0ZWRfb3B0aW9uGOcHIAMo",
-            "CzIkLmdvb2dsZS5wcm90b2J1Zi5VbmludGVycHJldGVkT3B0aW9uIjoKDE9w",
-            "dGltaXplTW9kZRIJCgVTUEVFRBABEg0KCUNPREVfU0laRRACEhAKDExJVEVf",
-            "UlVOVElNRRADKgkI6AcQgICAgAJKBAgmECcihAIKDk1lc3NhZ2VPcHRpb25z",
-            "EiYKF21lc3NhZ2Vfc2V0X3dpcmVfZm9ybWF0GAEgASgIOgVmYWxzZRIuCh9u",
-            "b19zdGFuZGFyZF9kZXNjcmlwdG9yX2FjY2Vzc29yGAIgASgIOgVmYWxzZRIZ",
-            "CgpkZXByZWNhdGVkGAMgASgIOgVmYWxzZRIRCgltYXBfZW50cnkYByABKAgS",
-            "QwoUdW5pbnRlcnByZXRlZF9vcHRpb24Y5wcgAygLMiQuZ29vZ2xlLnByb3Rv",
-            "YnVmLlVuaW50ZXJwcmV0ZWRPcHRpb24qCQjoBxCAgICAAkoECAQQBUoECAUQ",
-            "BkoECAYQB0oECAgQCUoECAkQCiK+AwoMRmllbGRPcHRpb25zEjoKBWN0eXBl",
-            "GAEgASgOMiMuZ29vZ2xlLnByb3RvYnVmLkZpZWxkT3B0aW9ucy5DVHlwZToG",
-            "U1RSSU5HEg4KBnBhY2tlZBgCIAEoCBI/CgZqc3R5cGUYBiABKA4yJC5nb29n",
-            "bGUucHJvdG9idWYuRmllbGRPcHRpb25zLkpTVHlwZToJSlNfTk9STUFMEhMK",
-            "BGxhenkYBSABKAg6BWZhbHNlEh4KD3VudmVyaWZpZWRfbGF6eRgPIAEoCDoF",
-            "ZmFsc2USGQoKZGVwcmVjYXRlZBgDIAEoCDoFZmFsc2USEwoEd2VhaxgKIAEo",
-            "CDoFZmFsc2USQwoUdW5pbnRlcnByZXRlZF9vcHRpb24Y5wcgAygLMiQuZ29v",
-            "Z2xlLnByb3RvYnVmLlVuaW50ZXJwcmV0ZWRPcHRpb24iLwoFQ1R5cGUSCgoG",
-            "U1RSSU5HEAASCAoEQ09SRBABEhAKDFNUUklOR19QSUVDRRACIjUKBkpTVHlw",
-            "ZRINCglKU19OT1JNQUwQABINCglKU19TVFJJTkcQARINCglKU19OVU1CRVIQ",
-            "AioJCOgHEICAgIACSgQIBBAFIl4KDE9uZW9mT3B0aW9ucxJDChR1bmludGVy",
-            "cHJldGVkX29wdGlvbhjnByADKAsyJC5nb29nbGUucHJvdG9idWYuVW5pbnRl",
-            "cnByZXRlZE9wdGlvbioJCOgHEICAgIACIpMBCgtFbnVtT3B0aW9ucxITCgth",
-            "bGxvd19hbGlhcxgCIAEoCBIZCgpkZXByZWNhdGVkGAMgASgIOgVmYWxzZRJD",
-            "ChR1bmludGVycHJldGVkX29wdGlvbhjnByADKAsyJC5nb29nbGUucHJvdG9i",
-            "dWYuVW5pbnRlcnByZXRlZE9wdGlvbioJCOgHEICAgIACSgQIBRAGIn0KEEVu",
-            "dW1WYWx1ZU9wdGlvbnMSGQoKZGVwcmVjYXRlZBgBIAEoCDoFZmFsc2USQwoU",
-            "dW5pbnRlcnByZXRlZF9vcHRpb24Y5wcgAygLMiQuZ29vZ2xlLnByb3RvYnVm",
-            "LlVuaW50ZXJwcmV0ZWRPcHRpb24qCQjoBxCAgICAAiJ7Cg5TZXJ2aWNlT3B0",
-            "aW9ucxIZCgpkZXByZWNhdGVkGCEgASgIOgVmYWxzZRJDChR1bmludGVycHJl",
-            "dGVkX29wdGlvbhjnByADKAsyJC5nb29nbGUucHJvdG9idWYuVW5pbnRlcnBy",
-            "ZXRlZE9wdGlvbioJCOgHEICAgIACIq0CCg1NZXRob2RPcHRpb25zEhkKCmRl",
-            "cHJlY2F0ZWQYISABKAg6BWZhbHNlEl8KEWlkZW1wb3RlbmN5X2xldmVsGCIg",
-            "ASgOMi8uZ29vZ2xlLnByb3RvYnVmLk1ldGhvZE9wdGlvbnMuSWRlbXBvdGVu",
-            "Y3lMZXZlbDoTSURFTVBPVEVOQ1lfVU5LTk9XThJDChR1bmludGVycHJldGVk",
-            "X29wdGlvbhjnByADKAsyJC5nb29nbGUucHJvdG9idWYuVW5pbnRlcnByZXRl",
-            "ZE9wdGlvbiJQChBJZGVtcG90ZW5jeUxldmVsEhcKE0lERU1QT1RFTkNZX1VO",
-            "S05PV04QABITCg9OT19TSURFX0VGRkVDVFMQARIOCgpJREVNUE9URU5UEAIq",
-            "CQjoBxCAgICAAiKeAgoTVW5pbnRlcnByZXRlZE9wdGlvbhI7CgRuYW1lGAIg",
-            "AygLMi0uZ29vZ2xlLnByb3RvYnVmLlVuaW50ZXJwcmV0ZWRPcHRpb24uTmFt",
-            "ZVBhcnQSGAoQaWRlbnRpZmllcl92YWx1ZRgDIAEoCRIaChJwb3NpdGl2ZV9p",
-            "bnRfdmFsdWUYBCABKAQSGgoSbmVnYXRpdmVfaW50X3ZhbHVlGAUgASgDEhQK",
-            "DGRvdWJsZV92YWx1ZRgGIAEoARIUCgxzdHJpbmdfdmFsdWUYByABKAwSFwoP",
-            "YWdncmVnYXRlX3ZhbHVlGAggASgJGjMKCE5hbWVQYXJ0EhEKCW5hbWVfcGFy",
-            "dBgBIAIoCRIUCgxpc19leHRlbnNpb24YAiACKAgi1QEKDlNvdXJjZUNvZGVJ",
-            "bmZvEjoKCGxvY2F0aW9uGAEgAygLMiguZ29vZ2xlLnByb3RvYnVmLlNvdXJj",
-            "ZUNvZGVJbmZvLkxvY2F0aW9uGoYBCghMb2NhdGlvbhIQCgRwYXRoGAEgAygF",
-            "QgIQARIQCgRzcGFuGAIgAygFQgIQARIYChBsZWFkaW5nX2NvbW1lbnRzGAMg",
-            "ASgJEhkKEXRyYWlsaW5nX2NvbW1lbnRzGAQgASgJEiEKGWxlYWRpbmdfZGV0",
-            "YWNoZWRfY29tbWVudHMYBiADKAkipwEKEUdlbmVyYXRlZENvZGVJbmZvEkEK",
-            "CmFubm90YXRpb24YASADKAsyLS5nb29nbGUucHJvdG9idWYuR2VuZXJhdGVk",
-            "Q29kZUluZm8uQW5ub3RhdGlvbhpPCgpBbm5vdGF0aW9uEhAKBHBhdGgYASAD",
-            "KAVCAhABEhMKC3NvdXJjZV9maWxlGAIgASgJEg0KBWJlZ2luGAMgASgFEgsK",
-            "A2VuZBgEIAEoBUJ+ChNjb20uZ29vZ2xlLnByb3RvYnVmQhBEZXNjcmlwdG9y",
-            "UHJvdG9zSAFaLWdvb2dsZS5nb2xhbmcub3JnL3Byb3RvYnVmL3R5cGVzL2Rl",
-            "c2NyaXB0b3JwYvgBAaICA0dQQqoCGkdvb2dsZS5Qcm90b2J1Zi5SZWZsZWN0",
-            "aW9u"));
-      descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-          new pbr::FileDescriptor[] { },
-          new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.Reflection.FileDescriptorSet), global::Google.Protobuf.Reflection.FileDescriptorSet.Parser, new[]{ "File" }, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.Reflection.FileDescriptorProto), global::Google.Protobuf.Reflection.FileDescriptorProto.Parser, new[]{ "Name", "Package", "Dependency", "PublicDependency", "WeakDependency", "MessageType", "EnumType", "Service", "Extension", "Options", "SourceCodeInfo", "Syntax" }, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.Reflection.DescriptorProto), global::Google.Protobuf.Reflection.DescriptorProto.Parser, new[]{ "Name", "Field", "Extension", "NestedType", "EnumType", "ExtensionRange", "OneofDecl", "Options", "ReservedRange", "ReservedName" }, null, null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.Reflection.DescriptorProto.Types.ExtensionRange), global::Google.Protobuf.Reflection.DescriptorProto.Types.ExtensionRange.Parser, new[]{ "Start", "End", "Options" }, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.Reflection.DescriptorProto.Types.ReservedRange), global::Google.Protobuf.Reflection.DescriptorProto.Types.ReservedRange.Parser, new[]{ "Start", "End" }, null, null, null, null)}),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.Reflection.ExtensionRangeOptions), global::Google.Protobuf.Reflection.ExtensionRangeOptions.Parser, new[]{ "UninterpretedOption" }, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.Reflection.FieldDescriptorProto), global::Google.Protobuf.Reflection.FieldDescriptorProto.Parser, new[]{ "Name", "Number", "Label", "Type", "TypeName", "Extendee", "DefaultValue", "OneofIndex", "JsonName", "Options", "Proto3Optional" }, null, new[]{ typeof(global::Google.Protobuf.Reflection.FieldDescriptorProto.Types.Type), typeof(global::Google.Protobuf.Reflection.FieldDescriptorProto.Types.Label) }, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.Reflection.OneofDescriptorProto), global::Google.Protobuf.Reflection.OneofDescriptorProto.Parser, new[]{ "Name", "Options" }, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.Reflection.EnumDescriptorProto), global::Google.Protobuf.Reflection.EnumDescriptorProto.Parser, new[]{ "Name", "Value", "Options", "ReservedRange", "ReservedName" }, null, null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.Reflection.EnumDescriptorProto.Types.EnumReservedRange), global::Google.Protobuf.Reflection.EnumDescriptorProto.Types.EnumReservedRange.Parser, new[]{ "Start", "End" }, null, null, null, null)}),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.Reflection.EnumValueDescriptorProto), global::Google.Protobuf.Reflection.EnumValueDescriptorProto.Parser, new[]{ "Name", "Number", "Options" }, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.Reflection.ServiceDescriptorProto), global::Google.Protobuf.Reflection.ServiceDescriptorProto.Parser, new[]{ "Name", "Method", "Options" }, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.Reflection.MethodDescriptorProto), global::Google.Protobuf.Reflection.MethodDescriptorProto.Parser, new[]{ "Name", "InputType", "OutputType", "Options", "ClientStreaming", "ServerStreaming" }, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.Reflection.FileOptions), global::Google.Protobuf.Reflection.FileOptions.Parser, new[]{ "JavaPackage", "JavaOuterClassname", "JavaMultipleFiles", "JavaGenerateEqualsAndHash", "JavaStringCheckUtf8", "OptimizeFor", "GoPackage", "CcGenericServices", "JavaGenericServices", "PyGenericServices", "PhpGenericServices", "Deprecated", "CcEnableArenas", "ObjcClassPrefix", "CsharpNamespace", "SwiftPrefix", "PhpClassPrefix", "PhpNamespace", "PhpMetadataNamespace", "RubyPackage", "UninterpretedOption" }, null, new[]{ typeof(global::Google.Protobuf.Reflection.FileOptions.Types.OptimizeMode) }, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.Reflection.MessageOptions), global::Google.Protobuf.Reflection.MessageOptions.Parser, new[]{ "MessageSetWireFormat", "NoStandardDescriptorAccessor", "Deprecated", "MapEntry", "UninterpretedOption" }, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.Reflection.FieldOptions), global::Google.Protobuf.Reflection.FieldOptions.Parser, new[]{ "Ctype", "Packed", "Jstype", "Lazy", "UnverifiedLazy", "Deprecated", "Weak", "UninterpretedOption" }, null, new[]{ typeof(global::Google.Protobuf.Reflection.FieldOptions.Types.CType), typeof(global::Google.Protobuf.Reflection.FieldOptions.Types.JSType) }, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.Reflection.OneofOptions), global::Google.Protobuf.Reflection.OneofOptions.Parser, new[]{ "UninterpretedOption" }, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.Reflection.EnumOptions), global::Google.Protobuf.Reflection.EnumOptions.Parser, new[]{ "AllowAlias", "Deprecated", "UninterpretedOption" }, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.Reflection.EnumValueOptions), global::Google.Protobuf.Reflection.EnumValueOptions.Parser, new[]{ "Deprecated", "UninterpretedOption" }, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.Reflection.ServiceOptions), global::Google.Protobuf.Reflection.ServiceOptions.Parser, new[]{ "Deprecated", "UninterpretedOption" }, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.Reflection.MethodOptions), global::Google.Protobuf.Reflection.MethodOptions.Parser, new[]{ "Deprecated", "IdempotencyLevel", "UninterpretedOption" }, null, new[]{ typeof(global::Google.Protobuf.Reflection.MethodOptions.Types.IdempotencyLevel) }, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.Reflection.UninterpretedOption), global::Google.Protobuf.Reflection.UninterpretedOption.Parser, new[]{ "Name", "IdentifierValue", "PositiveIntValue", "NegativeIntValue", "DoubleValue", "StringValue", "AggregateValue" }, null, null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.Reflection.UninterpretedOption.Types.NamePart), global::Google.Protobuf.Reflection.UninterpretedOption.Types.NamePart.Parser, new[]{ "NamePart_", "IsExtension" }, null, null, null, null)}),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.Reflection.SourceCodeInfo), global::Google.Protobuf.Reflection.SourceCodeInfo.Parser, new[]{ "Location" }, null, null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.Reflection.SourceCodeInfo.Types.Location), global::Google.Protobuf.Reflection.SourceCodeInfo.Types.Location.Parser, new[]{ "Path", "Span", "LeadingComments", "TrailingComments", "LeadingDetachedComments" }, null, null, null, null)}),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.Reflection.GeneratedCodeInfo), global::Google.Protobuf.Reflection.GeneratedCodeInfo.Parser, new[]{ "Annotation" }, null, null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.Reflection.GeneratedCodeInfo.Types.Annotation), global::Google.Protobuf.Reflection.GeneratedCodeInfo.Types.Annotation.Parser, new[]{ "Path", "SourceFile", "Begin", "End" }, null, null, null, null)})
-          }));
-    }
-    #endregion
-
-  }
-  #region Messages
-  /// <summary>
-  /// The protocol compiler can output a FileDescriptorSet containing the .proto
-  /// files it parses.
-  /// </summary>
-  public sealed partial class FileDescriptorSet : pb::IMessage<FileDescriptorSet>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<FileDescriptorSet> _parser = new pb::MessageParser<FileDescriptorSet>(() => new FileDescriptorSet());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<FileDescriptorSet> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.Reflection.DescriptorReflection.Descriptor.MessageTypes[0]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public FileDescriptorSet() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public FileDescriptorSet(FileDescriptorSet other) : this() {
-      file_ = other.file_.Clone();
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public FileDescriptorSet Clone() {
-      return new FileDescriptorSet(this);
-    }
-
-    /// <summary>Field number for the "file" field.</summary>
-    public const int FileFieldNumber = 1;
-    private static readonly pb::FieldCodec<global::Google.Protobuf.Reflection.FileDescriptorProto> _repeated_file_codec
-        = pb::FieldCodec.ForMessage(10, global::Google.Protobuf.Reflection.FileDescriptorProto.Parser);
-    private readonly pbc::RepeatedField<global::Google.Protobuf.Reflection.FileDescriptorProto> file_ = new pbc::RepeatedField<global::Google.Protobuf.Reflection.FileDescriptorProto>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Google.Protobuf.Reflection.FileDescriptorProto> File {
-      get { return file_; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as FileDescriptorSet);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(FileDescriptorSet other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if(!file_.Equals(other.file_)) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      hash ^= file_.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      file_.WriteTo(output, _repeated_file_codec);
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      file_.WriteTo(ref output, _repeated_file_codec);
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      size += file_.CalculateSize(_repeated_file_codec);
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(FileDescriptorSet other) {
-      if (other == null) {
-        return;
-      }
-      file_.Add(other.file_);
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 10: {
-            file_.AddEntriesFrom(input, _repeated_file_codec);
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 10: {
-            file_.AddEntriesFrom(ref input, _repeated_file_codec);
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  /// <summary>
-  /// Describes a complete .proto file.
-  /// </summary>
-  public sealed partial class FileDescriptorProto : pb::IMessage<FileDescriptorProto>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<FileDescriptorProto> _parser = new pb::MessageParser<FileDescriptorProto>(() => new FileDescriptorProto());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<FileDescriptorProto> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.Reflection.DescriptorReflection.Descriptor.MessageTypes[1]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public FileDescriptorProto() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public FileDescriptorProto(FileDescriptorProto other) : this() {
-      name_ = other.name_;
-      package_ = other.package_;
-      dependency_ = other.dependency_.Clone();
-      publicDependency_ = other.publicDependency_.Clone();
-      weakDependency_ = other.weakDependency_.Clone();
-      messageType_ = other.messageType_.Clone();
-      enumType_ = other.enumType_.Clone();
-      service_ = other.service_.Clone();
-      extension_ = other.extension_.Clone();
-      options_ = other.options_ != null ? other.options_.Clone() : null;
-      sourceCodeInfo_ = other.sourceCodeInfo_ != null ? other.sourceCodeInfo_.Clone() : null;
-      syntax_ = other.syntax_;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public FileDescriptorProto Clone() {
-      return new FileDescriptorProto(this);
-    }
-
-    /// <summary>Field number for the "name" field.</summary>
-    public const int NameFieldNumber = 1;
-    private readonly static string NameDefaultValue = "";
-
-    private string name_;
-    /// <summary>
-    /// file name, relative to root of source tree
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string Name {
-      get { return name_ ?? NameDefaultValue; }
-      set {
-        name_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-    /// <summary>Gets whether the "name" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasName {
-      get { return name_ != null; }
-    }
-    /// <summary>Clears the value of the "name" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearName() {
-      name_ = null;
-    }
-
-    /// <summary>Field number for the "package" field.</summary>
-    public const int PackageFieldNumber = 2;
-    private readonly static string PackageDefaultValue = "";
-
-    private string package_;
-    /// <summary>
-    /// e.g. "foo", "foo.bar", etc.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string Package {
-      get { return package_ ?? PackageDefaultValue; }
-      set {
-        package_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-    /// <summary>Gets whether the "package" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasPackage {
-      get { return package_ != null; }
-    }
-    /// <summary>Clears the value of the "package" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearPackage() {
-      package_ = null;
-    }
-
-    /// <summary>Field number for the "dependency" field.</summary>
-    public const int DependencyFieldNumber = 3;
-    private static readonly pb::FieldCodec<string> _repeated_dependency_codec
-        = pb::FieldCodec.ForString(26);
-    private readonly pbc::RepeatedField<string> dependency_ = new pbc::RepeatedField<string>();
-    /// <summary>
-    /// Names of files imported by this file.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<string> Dependency {
-      get { return dependency_; }
-    }
-
-    /// <summary>Field number for the "public_dependency" field.</summary>
-    public const int PublicDependencyFieldNumber = 10;
-    private static readonly pb::FieldCodec<int> _repeated_publicDependency_codec
-        = pb::FieldCodec.ForInt32(80);
-    private readonly pbc::RepeatedField<int> publicDependency_ = new pbc::RepeatedField<int>();
-    /// <summary>
-    /// Indexes of the public imported files in the dependency list above.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<int> PublicDependency {
-      get { return publicDependency_; }
-    }
-
-    /// <summary>Field number for the "weak_dependency" field.</summary>
-    public const int WeakDependencyFieldNumber = 11;
-    private static readonly pb::FieldCodec<int> _repeated_weakDependency_codec
-        = pb::FieldCodec.ForInt32(88);
-    private readonly pbc::RepeatedField<int> weakDependency_ = new pbc::RepeatedField<int>();
-    /// <summary>
-    /// Indexes of the weak imported files in the dependency list.
-    /// For Google-internal migration only. Do not use.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<int> WeakDependency {
-      get { return weakDependency_; }
-    }
-
-    /// <summary>Field number for the "message_type" field.</summary>
-    public const int MessageTypeFieldNumber = 4;
-    private static readonly pb::FieldCodec<global::Google.Protobuf.Reflection.DescriptorProto> _repeated_messageType_codec
-        = pb::FieldCodec.ForMessage(34, global::Google.Protobuf.Reflection.DescriptorProto.Parser);
-    private readonly pbc::RepeatedField<global::Google.Protobuf.Reflection.DescriptorProto> messageType_ = new pbc::RepeatedField<global::Google.Protobuf.Reflection.DescriptorProto>();
-    /// <summary>
-    /// All top-level definitions in this file.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Google.Protobuf.Reflection.DescriptorProto> MessageType {
-      get { return messageType_; }
-    }
-
-    /// <summary>Field number for the "enum_type" field.</summary>
-    public const int EnumTypeFieldNumber = 5;
-    private static readonly pb::FieldCodec<global::Google.Protobuf.Reflection.EnumDescriptorProto> _repeated_enumType_codec
-        = pb::FieldCodec.ForMessage(42, global::Google.Protobuf.Reflection.EnumDescriptorProto.Parser);
-    private readonly pbc::RepeatedField<global::Google.Protobuf.Reflection.EnumDescriptorProto> enumType_ = new pbc::RepeatedField<global::Google.Protobuf.Reflection.EnumDescriptorProto>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Google.Protobuf.Reflection.EnumDescriptorProto> EnumType {
-      get { return enumType_; }
-    }
-
-    /// <summary>Field number for the "service" field.</summary>
-    public const int ServiceFieldNumber = 6;
-    private static readonly pb::FieldCodec<global::Google.Protobuf.Reflection.ServiceDescriptorProto> _repeated_service_codec
-        = pb::FieldCodec.ForMessage(50, global::Google.Protobuf.Reflection.ServiceDescriptorProto.Parser);
-    private readonly pbc::RepeatedField<global::Google.Protobuf.Reflection.ServiceDescriptorProto> service_ = new pbc::RepeatedField<global::Google.Protobuf.Reflection.ServiceDescriptorProto>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Google.Protobuf.Reflection.ServiceDescriptorProto> Service {
-      get { return service_; }
-    }
-
-    /// <summary>Field number for the "extension" field.</summary>
-    public const int ExtensionFieldNumber = 7;
-    private static readonly pb::FieldCodec<global::Google.Protobuf.Reflection.FieldDescriptorProto> _repeated_extension_codec
-        = pb::FieldCodec.ForMessage(58, global::Google.Protobuf.Reflection.FieldDescriptorProto.Parser);
-    private readonly pbc::RepeatedField<global::Google.Protobuf.Reflection.FieldDescriptorProto> extension_ = new pbc::RepeatedField<global::Google.Protobuf.Reflection.FieldDescriptorProto>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Google.Protobuf.Reflection.FieldDescriptorProto> Extension {
-      get { return extension_; }
-    }
-
-    /// <summary>Field number for the "options" field.</summary>
-    public const int OptionsFieldNumber = 8;
-    private global::Google.Protobuf.Reflection.FileOptions options_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.Reflection.FileOptions Options {
-      get { return options_; }
-      set {
-        options_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "source_code_info" field.</summary>
-    public const int SourceCodeInfoFieldNumber = 9;
-    private global::Google.Protobuf.Reflection.SourceCodeInfo sourceCodeInfo_;
-    /// <summary>
-    /// This field contains optional information about the original source code.
-    /// You may safely remove this entire field without harming runtime
-    /// functionality of the descriptors -- the information is needed only by
-    /// development tools.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.Reflection.SourceCodeInfo SourceCodeInfo {
-      get { return sourceCodeInfo_; }
-      set {
-        sourceCodeInfo_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "syntax" field.</summary>
-    public const int SyntaxFieldNumber = 12;
-    private readonly static string SyntaxDefaultValue = "";
-
-    private string syntax_;
-    /// <summary>
-    /// The syntax of the proto file.
-    /// The supported values are "proto2" and "proto3".
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string Syntax {
-      get { return syntax_ ?? SyntaxDefaultValue; }
-      set {
-        syntax_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-    /// <summary>Gets whether the "syntax" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasSyntax {
-      get { return syntax_ != null; }
-    }
-    /// <summary>Clears the value of the "syntax" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearSyntax() {
-      syntax_ = null;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as FileDescriptorProto);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(FileDescriptorProto other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (Name != other.Name) return false;
-      if (Package != other.Package) return false;
-      if(!dependency_.Equals(other.dependency_)) return false;
-      if(!publicDependency_.Equals(other.publicDependency_)) return false;
-      if(!weakDependency_.Equals(other.weakDependency_)) return false;
-      if(!messageType_.Equals(other.messageType_)) return false;
-      if(!enumType_.Equals(other.enumType_)) return false;
-      if(!service_.Equals(other.service_)) return false;
-      if(!extension_.Equals(other.extension_)) return false;
-      if (!object.Equals(Options, other.Options)) return false;
-      if (!object.Equals(SourceCodeInfo, other.SourceCodeInfo)) return false;
-      if (Syntax != other.Syntax) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (HasName) hash ^= Name.GetHashCode();
-      if (HasPackage) hash ^= Package.GetHashCode();
-      hash ^= dependency_.GetHashCode();
-      hash ^= publicDependency_.GetHashCode();
-      hash ^= weakDependency_.GetHashCode();
-      hash ^= messageType_.GetHashCode();
-      hash ^= enumType_.GetHashCode();
-      hash ^= service_.GetHashCode();
-      hash ^= extension_.GetHashCode();
-      if (options_ != null) hash ^= Options.GetHashCode();
-      if (sourceCodeInfo_ != null) hash ^= SourceCodeInfo.GetHashCode();
-      if (HasSyntax) hash ^= Syntax.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (HasName) {
-        output.WriteRawTag(10);
-        output.WriteString(Name);
-      }
-      if (HasPackage) {
-        output.WriteRawTag(18);
-        output.WriteString(Package);
-      }
-      dependency_.WriteTo(output, _repeated_dependency_codec);
-      messageType_.WriteTo(output, _repeated_messageType_codec);
-      enumType_.WriteTo(output, _repeated_enumType_codec);
-      service_.WriteTo(output, _repeated_service_codec);
-      extension_.WriteTo(output, _repeated_extension_codec);
-      if (options_ != null) {
-        output.WriteRawTag(66);
-        output.WriteMessage(Options);
-      }
-      if (sourceCodeInfo_ != null) {
-        output.WriteRawTag(74);
-        output.WriteMessage(SourceCodeInfo);
-      }
-      publicDependency_.WriteTo(output, _repeated_publicDependency_codec);
-      weakDependency_.WriteTo(output, _repeated_weakDependency_codec);
-      if (HasSyntax) {
-        output.WriteRawTag(98);
-        output.WriteString(Syntax);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (HasName) {
-        output.WriteRawTag(10);
-        output.WriteString(Name);
-      }
-      if (HasPackage) {
-        output.WriteRawTag(18);
-        output.WriteString(Package);
-      }
-      dependency_.WriteTo(ref output, _repeated_dependency_codec);
-      messageType_.WriteTo(ref output, _repeated_messageType_codec);
-      enumType_.WriteTo(ref output, _repeated_enumType_codec);
-      service_.WriteTo(ref output, _repeated_service_codec);
-      extension_.WriteTo(ref output, _repeated_extension_codec);
-      if (options_ != null) {
-        output.WriteRawTag(66);
-        output.WriteMessage(Options);
-      }
-      if (sourceCodeInfo_ != null) {
-        output.WriteRawTag(74);
-        output.WriteMessage(SourceCodeInfo);
-      }
-      publicDependency_.WriteTo(ref output, _repeated_publicDependency_codec);
-      weakDependency_.WriteTo(ref output, _repeated_weakDependency_codec);
-      if (HasSyntax) {
-        output.WriteRawTag(98);
-        output.WriteString(Syntax);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (HasName) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(Name);
-      }
-      if (HasPackage) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(Package);
-      }
-      size += dependency_.CalculateSize(_repeated_dependency_codec);
-      size += publicDependency_.CalculateSize(_repeated_publicDependency_codec);
-      size += weakDependency_.CalculateSize(_repeated_weakDependency_codec);
-      size += messageType_.CalculateSize(_repeated_messageType_codec);
-      size += enumType_.CalculateSize(_repeated_enumType_codec);
-      size += service_.CalculateSize(_repeated_service_codec);
-      size += extension_.CalculateSize(_repeated_extension_codec);
-      if (options_ != null) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(Options);
-      }
-      if (sourceCodeInfo_ != null) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(SourceCodeInfo);
-      }
-      if (HasSyntax) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(Syntax);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(FileDescriptorProto other) {
-      if (other == null) {
-        return;
-      }
-      if (other.HasName) {
-        Name = other.Name;
-      }
-      if (other.HasPackage) {
-        Package = other.Package;
-      }
-      dependency_.Add(other.dependency_);
-      publicDependency_.Add(other.publicDependency_);
-      weakDependency_.Add(other.weakDependency_);
-      messageType_.Add(other.messageType_);
-      enumType_.Add(other.enumType_);
-      service_.Add(other.service_);
-      extension_.Add(other.extension_);
-      if (other.options_ != null) {
-        if (options_ == null) {
-          Options = new global::Google.Protobuf.Reflection.FileOptions();
-        }
-        Options.MergeFrom(other.Options);
-      }
-      if (other.sourceCodeInfo_ != null) {
-        if (sourceCodeInfo_ == null) {
-          SourceCodeInfo = new global::Google.Protobuf.Reflection.SourceCodeInfo();
-        }
-        SourceCodeInfo.MergeFrom(other.SourceCodeInfo);
-      }
-      if (other.HasSyntax) {
-        Syntax = other.Syntax;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 10: {
-            Name = input.ReadString();
-            break;
-          }
-          case 18: {
-            Package = input.ReadString();
-            break;
-          }
-          case 26: {
-            dependency_.AddEntriesFrom(input, _repeated_dependency_codec);
-            break;
-          }
-          case 34: {
-            messageType_.AddEntriesFrom(input, _repeated_messageType_codec);
-            break;
-          }
-          case 42: {
-            enumType_.AddEntriesFrom(input, _repeated_enumType_codec);
-            break;
-          }
-          case 50: {
-            service_.AddEntriesFrom(input, _repeated_service_codec);
-            break;
-          }
-          case 58: {
-            extension_.AddEntriesFrom(input, _repeated_extension_codec);
-            break;
-          }
-          case 66: {
-            if (options_ == null) {
-              Options = new global::Google.Protobuf.Reflection.FileOptions();
-            }
-            input.ReadMessage(Options);
-            break;
-          }
-          case 74: {
-            if (sourceCodeInfo_ == null) {
-              SourceCodeInfo = new global::Google.Protobuf.Reflection.SourceCodeInfo();
-            }
-            input.ReadMessage(SourceCodeInfo);
-            break;
-          }
-          case 82:
-          case 80: {
-            publicDependency_.AddEntriesFrom(input, _repeated_publicDependency_codec);
-            break;
-          }
-          case 90:
-          case 88: {
-            weakDependency_.AddEntriesFrom(input, _repeated_weakDependency_codec);
-            break;
-          }
-          case 98: {
-            Syntax = input.ReadString();
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 10: {
-            Name = input.ReadString();
-            break;
-          }
-          case 18: {
-            Package = input.ReadString();
-            break;
-          }
-          case 26: {
-            dependency_.AddEntriesFrom(ref input, _repeated_dependency_codec);
-            break;
-          }
-          case 34: {
-            messageType_.AddEntriesFrom(ref input, _repeated_messageType_codec);
-            break;
-          }
-          case 42: {
-            enumType_.AddEntriesFrom(ref input, _repeated_enumType_codec);
-            break;
-          }
-          case 50: {
-            service_.AddEntriesFrom(ref input, _repeated_service_codec);
-            break;
-          }
-          case 58: {
-            extension_.AddEntriesFrom(ref input, _repeated_extension_codec);
-            break;
-          }
-          case 66: {
-            if (options_ == null) {
-              Options = new global::Google.Protobuf.Reflection.FileOptions();
-            }
-            input.ReadMessage(Options);
-            break;
-          }
-          case 74: {
-            if (sourceCodeInfo_ == null) {
-              SourceCodeInfo = new global::Google.Protobuf.Reflection.SourceCodeInfo();
-            }
-            input.ReadMessage(SourceCodeInfo);
-            break;
-          }
-          case 82:
-          case 80: {
-            publicDependency_.AddEntriesFrom(ref input, _repeated_publicDependency_codec);
-            break;
-          }
-          case 90:
-          case 88: {
-            weakDependency_.AddEntriesFrom(ref input, _repeated_weakDependency_codec);
-            break;
-          }
-          case 98: {
-            Syntax = input.ReadString();
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  /// <summary>
-  /// Describes a message type.
-  /// </summary>
-  public sealed partial class DescriptorProto : pb::IMessage<DescriptorProto>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<DescriptorProto> _parser = new pb::MessageParser<DescriptorProto>(() => new DescriptorProto());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<DescriptorProto> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.Reflection.DescriptorReflection.Descriptor.MessageTypes[2]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public DescriptorProto() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public DescriptorProto(DescriptorProto other) : this() {
-      name_ = other.name_;
-      field_ = other.field_.Clone();
-      extension_ = other.extension_.Clone();
-      nestedType_ = other.nestedType_.Clone();
-      enumType_ = other.enumType_.Clone();
-      extensionRange_ = other.extensionRange_.Clone();
-      oneofDecl_ = other.oneofDecl_.Clone();
-      options_ = other.options_ != null ? other.options_.Clone() : null;
-      reservedRange_ = other.reservedRange_.Clone();
-      reservedName_ = other.reservedName_.Clone();
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public DescriptorProto Clone() {
-      return new DescriptorProto(this);
-    }
-
-    /// <summary>Field number for the "name" field.</summary>
-    public const int NameFieldNumber = 1;
-    private readonly static string NameDefaultValue = "";
-
-    private string name_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string Name {
-      get { return name_ ?? NameDefaultValue; }
-      set {
-        name_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-    /// <summary>Gets whether the "name" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasName {
-      get { return name_ != null; }
-    }
-    /// <summary>Clears the value of the "name" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearName() {
-      name_ = null;
-    }
-
-    /// <summary>Field number for the "field" field.</summary>
-    public const int FieldFieldNumber = 2;
-    private static readonly pb::FieldCodec<global::Google.Protobuf.Reflection.FieldDescriptorProto> _repeated_field_codec
-        = pb::FieldCodec.ForMessage(18, global::Google.Protobuf.Reflection.FieldDescriptorProto.Parser);
-    private readonly pbc::RepeatedField<global::Google.Protobuf.Reflection.FieldDescriptorProto> field_ = new pbc::RepeatedField<global::Google.Protobuf.Reflection.FieldDescriptorProto>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Google.Protobuf.Reflection.FieldDescriptorProto> Field {
-      get { return field_; }
-    }
-
-    /// <summary>Field number for the "extension" field.</summary>
-    public const int ExtensionFieldNumber = 6;
-    private static readonly pb::FieldCodec<global::Google.Protobuf.Reflection.FieldDescriptorProto> _repeated_extension_codec
-        = pb::FieldCodec.ForMessage(50, global::Google.Protobuf.Reflection.FieldDescriptorProto.Parser);
-    private readonly pbc::RepeatedField<global::Google.Protobuf.Reflection.FieldDescriptorProto> extension_ = new pbc::RepeatedField<global::Google.Protobuf.Reflection.FieldDescriptorProto>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Google.Protobuf.Reflection.FieldDescriptorProto> Extension {
-      get { return extension_; }
-    }
-
-    /// <summary>Field number for the "nested_type" field.</summary>
-    public const int NestedTypeFieldNumber = 3;
-    private static readonly pb::FieldCodec<global::Google.Protobuf.Reflection.DescriptorProto> _repeated_nestedType_codec
-        = pb::FieldCodec.ForMessage(26, global::Google.Protobuf.Reflection.DescriptorProto.Parser);
-    private readonly pbc::RepeatedField<global::Google.Protobuf.Reflection.DescriptorProto> nestedType_ = new pbc::RepeatedField<global::Google.Protobuf.Reflection.DescriptorProto>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Google.Protobuf.Reflection.DescriptorProto> NestedType {
-      get { return nestedType_; }
-    }
-
-    /// <summary>Field number for the "enum_type" field.</summary>
-    public const int EnumTypeFieldNumber = 4;
-    private static readonly pb::FieldCodec<global::Google.Protobuf.Reflection.EnumDescriptorProto> _repeated_enumType_codec
-        = pb::FieldCodec.ForMessage(34, global::Google.Protobuf.Reflection.EnumDescriptorProto.Parser);
-    private readonly pbc::RepeatedField<global::Google.Protobuf.Reflection.EnumDescriptorProto> enumType_ = new pbc::RepeatedField<global::Google.Protobuf.Reflection.EnumDescriptorProto>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Google.Protobuf.Reflection.EnumDescriptorProto> EnumType {
-      get { return enumType_; }
-    }
-
-    /// <summary>Field number for the "extension_range" field.</summary>
-    public const int ExtensionRangeFieldNumber = 5;
-    private static readonly pb::FieldCodec<global::Google.Protobuf.Reflection.DescriptorProto.Types.ExtensionRange> _repeated_extensionRange_codec
-        = pb::FieldCodec.ForMessage(42, global::Google.Protobuf.Reflection.DescriptorProto.Types.ExtensionRange.Parser);
-    private readonly pbc::RepeatedField<global::Google.Protobuf.Reflection.DescriptorProto.Types.ExtensionRange> extensionRange_ = new pbc::RepeatedField<global::Google.Protobuf.Reflection.DescriptorProto.Types.ExtensionRange>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Google.Protobuf.Reflection.DescriptorProto.Types.ExtensionRange> ExtensionRange {
-      get { return extensionRange_; }
-    }
-
-    /// <summary>Field number for the "oneof_decl" field.</summary>
-    public const int OneofDeclFieldNumber = 8;
-    private static readonly pb::FieldCodec<global::Google.Protobuf.Reflection.OneofDescriptorProto> _repeated_oneofDecl_codec
-        = pb::FieldCodec.ForMessage(66, global::Google.Protobuf.Reflection.OneofDescriptorProto.Parser);
-    private readonly pbc::RepeatedField<global::Google.Protobuf.Reflection.OneofDescriptorProto> oneofDecl_ = new pbc::RepeatedField<global::Google.Protobuf.Reflection.OneofDescriptorProto>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Google.Protobuf.Reflection.OneofDescriptorProto> OneofDecl {
-      get { return oneofDecl_; }
-    }
-
-    /// <summary>Field number for the "options" field.</summary>
-    public const int OptionsFieldNumber = 7;
-    private global::Google.Protobuf.Reflection.MessageOptions options_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.Reflection.MessageOptions Options {
-      get { return options_; }
-      set {
-        options_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "reserved_range" field.</summary>
-    public const int ReservedRangeFieldNumber = 9;
-    private static readonly pb::FieldCodec<global::Google.Protobuf.Reflection.DescriptorProto.Types.ReservedRange> _repeated_reservedRange_codec
-        = pb::FieldCodec.ForMessage(74, global::Google.Protobuf.Reflection.DescriptorProto.Types.ReservedRange.Parser);
-    private readonly pbc::RepeatedField<global::Google.Protobuf.Reflection.DescriptorProto.Types.ReservedRange> reservedRange_ = new pbc::RepeatedField<global::Google.Protobuf.Reflection.DescriptorProto.Types.ReservedRange>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Google.Protobuf.Reflection.DescriptorProto.Types.ReservedRange> ReservedRange {
-      get { return reservedRange_; }
-    }
-
-    /// <summary>Field number for the "reserved_name" field.</summary>
-    public const int ReservedNameFieldNumber = 10;
-    private static readonly pb::FieldCodec<string> _repeated_reservedName_codec
-        = pb::FieldCodec.ForString(82);
-    private readonly pbc::RepeatedField<string> reservedName_ = new pbc::RepeatedField<string>();
-    /// <summary>
-    /// Reserved field names, which may not be used by fields in the same message.
-    /// A given name may only be reserved once.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<string> ReservedName {
-      get { return reservedName_; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as DescriptorProto);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(DescriptorProto other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (Name != other.Name) return false;
-      if(!field_.Equals(other.field_)) return false;
-      if(!extension_.Equals(other.extension_)) return false;
-      if(!nestedType_.Equals(other.nestedType_)) return false;
-      if(!enumType_.Equals(other.enumType_)) return false;
-      if(!extensionRange_.Equals(other.extensionRange_)) return false;
-      if(!oneofDecl_.Equals(other.oneofDecl_)) return false;
-      if (!object.Equals(Options, other.Options)) return false;
-      if(!reservedRange_.Equals(other.reservedRange_)) return false;
-      if(!reservedName_.Equals(other.reservedName_)) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (HasName) hash ^= Name.GetHashCode();
-      hash ^= field_.GetHashCode();
-      hash ^= extension_.GetHashCode();
-      hash ^= nestedType_.GetHashCode();
-      hash ^= enumType_.GetHashCode();
-      hash ^= extensionRange_.GetHashCode();
-      hash ^= oneofDecl_.GetHashCode();
-      if (options_ != null) hash ^= Options.GetHashCode();
-      hash ^= reservedRange_.GetHashCode();
-      hash ^= reservedName_.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (HasName) {
-        output.WriteRawTag(10);
-        output.WriteString(Name);
-      }
-      field_.WriteTo(output, _repeated_field_codec);
-      nestedType_.WriteTo(output, _repeated_nestedType_codec);
-      enumType_.WriteTo(output, _repeated_enumType_codec);
-      extensionRange_.WriteTo(output, _repeated_extensionRange_codec);
-      extension_.WriteTo(output, _repeated_extension_codec);
-      if (options_ != null) {
-        output.WriteRawTag(58);
-        output.WriteMessage(Options);
-      }
-      oneofDecl_.WriteTo(output, _repeated_oneofDecl_codec);
-      reservedRange_.WriteTo(output, _repeated_reservedRange_codec);
-      reservedName_.WriteTo(output, _repeated_reservedName_codec);
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (HasName) {
-        output.WriteRawTag(10);
-        output.WriteString(Name);
-      }
-      field_.WriteTo(ref output, _repeated_field_codec);
-      nestedType_.WriteTo(ref output, _repeated_nestedType_codec);
-      enumType_.WriteTo(ref output, _repeated_enumType_codec);
-      extensionRange_.WriteTo(ref output, _repeated_extensionRange_codec);
-      extension_.WriteTo(ref output, _repeated_extension_codec);
-      if (options_ != null) {
-        output.WriteRawTag(58);
-        output.WriteMessage(Options);
-      }
-      oneofDecl_.WriteTo(ref output, _repeated_oneofDecl_codec);
-      reservedRange_.WriteTo(ref output, _repeated_reservedRange_codec);
-      reservedName_.WriteTo(ref output, _repeated_reservedName_codec);
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (HasName) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(Name);
-      }
-      size += field_.CalculateSize(_repeated_field_codec);
-      size += extension_.CalculateSize(_repeated_extension_codec);
-      size += nestedType_.CalculateSize(_repeated_nestedType_codec);
-      size += enumType_.CalculateSize(_repeated_enumType_codec);
-      size += extensionRange_.CalculateSize(_repeated_extensionRange_codec);
-      size += oneofDecl_.CalculateSize(_repeated_oneofDecl_codec);
-      if (options_ != null) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(Options);
-      }
-      size += reservedRange_.CalculateSize(_repeated_reservedRange_codec);
-      size += reservedName_.CalculateSize(_repeated_reservedName_codec);
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(DescriptorProto other) {
-      if (other == null) {
-        return;
-      }
-      if (other.HasName) {
-        Name = other.Name;
-      }
-      field_.Add(other.field_);
-      extension_.Add(other.extension_);
-      nestedType_.Add(other.nestedType_);
-      enumType_.Add(other.enumType_);
-      extensionRange_.Add(other.extensionRange_);
-      oneofDecl_.Add(other.oneofDecl_);
-      if (other.options_ != null) {
-        if (options_ == null) {
-          Options = new global::Google.Protobuf.Reflection.MessageOptions();
-        }
-        Options.MergeFrom(other.Options);
-      }
-      reservedRange_.Add(other.reservedRange_);
-      reservedName_.Add(other.reservedName_);
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 10: {
-            Name = input.ReadString();
-            break;
-          }
-          case 18: {
-            field_.AddEntriesFrom(input, _repeated_field_codec);
-            break;
-          }
-          case 26: {
-            nestedType_.AddEntriesFrom(input, _repeated_nestedType_codec);
-            break;
-          }
-          case 34: {
-            enumType_.AddEntriesFrom(input, _repeated_enumType_codec);
-            break;
-          }
-          case 42: {
-            extensionRange_.AddEntriesFrom(input, _repeated_extensionRange_codec);
-            break;
-          }
-          case 50: {
-            extension_.AddEntriesFrom(input, _repeated_extension_codec);
-            break;
-          }
-          case 58: {
-            if (options_ == null) {
-              Options = new global::Google.Protobuf.Reflection.MessageOptions();
-            }
-            input.ReadMessage(Options);
-            break;
-          }
-          case 66: {
-            oneofDecl_.AddEntriesFrom(input, _repeated_oneofDecl_codec);
-            break;
-          }
-          case 74: {
-            reservedRange_.AddEntriesFrom(input, _repeated_reservedRange_codec);
-            break;
-          }
-          case 82: {
-            reservedName_.AddEntriesFrom(input, _repeated_reservedName_codec);
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 10: {
-            Name = input.ReadString();
-            break;
-          }
-          case 18: {
-            field_.AddEntriesFrom(ref input, _repeated_field_codec);
-            break;
-          }
-          case 26: {
-            nestedType_.AddEntriesFrom(ref input, _repeated_nestedType_codec);
-            break;
-          }
-          case 34: {
-            enumType_.AddEntriesFrom(ref input, _repeated_enumType_codec);
-            break;
-          }
-          case 42: {
-            extensionRange_.AddEntriesFrom(ref input, _repeated_extensionRange_codec);
-            break;
-          }
-          case 50: {
-            extension_.AddEntriesFrom(ref input, _repeated_extension_codec);
-            break;
-          }
-          case 58: {
-            if (options_ == null) {
-              Options = new global::Google.Protobuf.Reflection.MessageOptions();
-            }
-            input.ReadMessage(Options);
-            break;
-          }
-          case 66: {
-            oneofDecl_.AddEntriesFrom(ref input, _repeated_oneofDecl_codec);
-            break;
-          }
-          case 74: {
-            reservedRange_.AddEntriesFrom(ref input, _repeated_reservedRange_codec);
-            break;
-          }
-          case 82: {
-            reservedName_.AddEntriesFrom(ref input, _repeated_reservedName_codec);
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-    #region Nested types
-    /// <summary>Container for nested types declared in the DescriptorProto message type.</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static partial class Types {
-      public sealed partial class ExtensionRange : pb::IMessage<ExtensionRange>
-      #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          , pb::IBufferMessage
-      #endif
-      {
-        private static readonly pb::MessageParser<ExtensionRange> _parser = new pb::MessageParser<ExtensionRange>(() => new ExtensionRange());
-        private pb::UnknownFieldSet _unknownFields;
-        private int _hasBits0;
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static pb::MessageParser<ExtensionRange> Parser { get { return _parser; } }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static pbr::MessageDescriptor Descriptor {
-          get { return global::Google.Protobuf.Reflection.DescriptorProto.Descriptor.NestedTypes[0]; }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        pbr::MessageDescriptor pb::IMessage.Descriptor {
-          get { return Descriptor; }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public ExtensionRange() {
-          OnConstruction();
-        }
-
-        partial void OnConstruction();
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public ExtensionRange(ExtensionRange other) : this() {
-          _hasBits0 = other._hasBits0;
-          start_ = other.start_;
-          end_ = other.end_;
-          options_ = other.options_ != null ? other.options_.Clone() : null;
-          _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public ExtensionRange Clone() {
-          return new ExtensionRange(this);
-        }
-
-        /// <summary>Field number for the "start" field.</summary>
-        public const int StartFieldNumber = 1;
-        private readonly static int StartDefaultValue = 0;
-
-        private int start_;
-        /// <summary>
-        /// Inclusive.
-        /// </summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public int Start {
-          get { if ((_hasBits0 & 1) != 0) { return start_; } else { return StartDefaultValue; } }
-          set {
-            _hasBits0 |= 1;
-            start_ = value;
-          }
-        }
-        /// <summary>Gets whether the "start" field is set</summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool HasStart {
-          get { return (_hasBits0 & 1) != 0; }
-        }
-        /// <summary>Clears the value of the "start" field</summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void ClearStart() {
-          _hasBits0 &= ~1;
-        }
-
-        /// <summary>Field number for the "end" field.</summary>
-        public const int EndFieldNumber = 2;
-        private readonly static int EndDefaultValue = 0;
-
-        private int end_;
-        /// <summary>
-        /// Exclusive.
-        /// </summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public int End {
-          get { if ((_hasBits0 & 2) != 0) { return end_; } else { return EndDefaultValue; } }
-          set {
-            _hasBits0 |= 2;
-            end_ = value;
-          }
-        }
-        /// <summary>Gets whether the "end" field is set</summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool HasEnd {
-          get { return (_hasBits0 & 2) != 0; }
-        }
-        /// <summary>Clears the value of the "end" field</summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void ClearEnd() {
-          _hasBits0 &= ~2;
-        }
-
-        /// <summary>Field number for the "options" field.</summary>
-        public const int OptionsFieldNumber = 3;
-        private global::Google.Protobuf.Reflection.ExtensionRangeOptions options_;
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public global::Google.Protobuf.Reflection.ExtensionRangeOptions Options {
-          get { return options_; }
-          set {
-            options_ = value;
-          }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override bool Equals(object other) {
-          return Equals(other as ExtensionRange);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool Equals(ExtensionRange other) {
-          if (ReferenceEquals(other, null)) {
-            return false;
-          }
-          if (ReferenceEquals(other, this)) {
-            return true;
-          }
-          if (Start != other.Start) return false;
-          if (End != other.End) return false;
-          if (!object.Equals(Options, other.Options)) return false;
-          return Equals(_unknownFields, other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override int GetHashCode() {
-          int hash = 1;
-          if (HasStart) hash ^= Start.GetHashCode();
-          if (HasEnd) hash ^= End.GetHashCode();
-          if (options_ != null) hash ^= Options.GetHashCode();
-          if (_unknownFields != null) {
-            hash ^= _unknownFields.GetHashCode();
-          }
-          return hash;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override string ToString() {
-          return pb::JsonFormatter.ToDiagnosticString(this);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void WriteTo(pb::CodedOutputStream output) {
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          output.WriteRawMessage(this);
-        #else
-          if (HasStart) {
-            output.WriteRawTag(8);
-            output.WriteInt32(Start);
-          }
-          if (HasEnd) {
-            output.WriteRawTag(16);
-            output.WriteInt32(End);
-          }
-          if (options_ != null) {
-            output.WriteRawTag(26);
-            output.WriteMessage(Options);
-          }
-          if (_unknownFields != null) {
-            _unknownFields.WriteTo(output);
-          }
-        #endif
-        }
-
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-          if (HasStart) {
-            output.WriteRawTag(8);
-            output.WriteInt32(Start);
-          }
-          if (HasEnd) {
-            output.WriteRawTag(16);
-            output.WriteInt32(End);
-          }
-          if (options_ != null) {
-            output.WriteRawTag(26);
-            output.WriteMessage(Options);
-          }
-          if (_unknownFields != null) {
-            _unknownFields.WriteTo(ref output);
-          }
-        }
-        #endif
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public int CalculateSize() {
-          int size = 0;
-          if (HasStart) {
-            size += 1 + pb::CodedOutputStream.ComputeInt32Size(Start);
-          }
-          if (HasEnd) {
-            size += 1 + pb::CodedOutputStream.ComputeInt32Size(End);
-          }
-          if (options_ != null) {
-            size += 1 + pb::CodedOutputStream.ComputeMessageSize(Options);
-          }
-          if (_unknownFields != null) {
-            size += _unknownFields.CalculateSize();
-          }
-          return size;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(ExtensionRange other) {
-          if (other == null) {
-            return;
-          }
-          if (other.HasStart) {
-            Start = other.Start;
-          }
-          if (other.HasEnd) {
-            End = other.End;
-          }
-          if (other.options_ != null) {
-            if (options_ == null) {
-              Options = new global::Google.Protobuf.Reflection.ExtensionRangeOptions();
-            }
-            Options.MergeFrom(other.Options);
-          }
-          _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(pb::CodedInputStream input) {
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          input.ReadRawMessage(this);
-        #else
-          uint tag;
-          while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
-              default:
-                _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-                break;
-              case 8: {
-                Start = input.ReadInt32();
-                break;
-              }
-              case 16: {
-                End = input.ReadInt32();
-                break;
-              }
-              case 26: {
-                if (options_ == null) {
-                  Options = new global::Google.Protobuf.Reflection.ExtensionRangeOptions();
-                }
-                input.ReadMessage(Options);
-                break;
-              }
-            }
-          }
-        #endif
-        }
-
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-          uint tag;
-          while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
-              default:
-                _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-                break;
-              case 8: {
-                Start = input.ReadInt32();
-                break;
-              }
-              case 16: {
-                End = input.ReadInt32();
-                break;
-              }
-              case 26: {
-                if (options_ == null) {
-                  Options = new global::Google.Protobuf.Reflection.ExtensionRangeOptions();
-                }
-                input.ReadMessage(Options);
-                break;
-              }
-            }
-          }
-        }
-        #endif
-
-      }
-
-      /// <summary>
-      /// Range of reserved tag numbers. Reserved tag numbers may not be used by
-      /// fields or extension ranges in the same message. Reserved ranges may
-      /// not overlap.
-      /// </summary>
-      public sealed partial class ReservedRange : pb::IMessage<ReservedRange>
-      #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          , pb::IBufferMessage
-      #endif
-      {
-        private static readonly pb::MessageParser<ReservedRange> _parser = new pb::MessageParser<ReservedRange>(() => new ReservedRange());
-        private pb::UnknownFieldSet _unknownFields;
-        private int _hasBits0;
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static pb::MessageParser<ReservedRange> Parser { get { return _parser; } }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static pbr::MessageDescriptor Descriptor {
-          get { return global::Google.Protobuf.Reflection.DescriptorProto.Descriptor.NestedTypes[1]; }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        pbr::MessageDescriptor pb::IMessage.Descriptor {
-          get { return Descriptor; }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public ReservedRange() {
-          OnConstruction();
-        }
-
-        partial void OnConstruction();
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public ReservedRange(ReservedRange other) : this() {
-          _hasBits0 = other._hasBits0;
-          start_ = other.start_;
-          end_ = other.end_;
-          _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public ReservedRange Clone() {
-          return new ReservedRange(this);
-        }
-
-        /// <summary>Field number for the "start" field.</summary>
-        public const int StartFieldNumber = 1;
-        private readonly static int StartDefaultValue = 0;
-
-        private int start_;
-        /// <summary>
-        /// Inclusive.
-        /// </summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public int Start {
-          get { if ((_hasBits0 & 1) != 0) { return start_; } else { return StartDefaultValue; } }
-          set {
-            _hasBits0 |= 1;
-            start_ = value;
-          }
-        }
-        /// <summary>Gets whether the "start" field is set</summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool HasStart {
-          get { return (_hasBits0 & 1) != 0; }
-        }
-        /// <summary>Clears the value of the "start" field</summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void ClearStart() {
-          _hasBits0 &= ~1;
-        }
-
-        /// <summary>Field number for the "end" field.</summary>
-        public const int EndFieldNumber = 2;
-        private readonly static int EndDefaultValue = 0;
-
-        private int end_;
-        /// <summary>
-        /// Exclusive.
-        /// </summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public int End {
-          get { if ((_hasBits0 & 2) != 0) { return end_; } else { return EndDefaultValue; } }
-          set {
-            _hasBits0 |= 2;
-            end_ = value;
-          }
-        }
-        /// <summary>Gets whether the "end" field is set</summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool HasEnd {
-          get { return (_hasBits0 & 2) != 0; }
-        }
-        /// <summary>Clears the value of the "end" field</summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void ClearEnd() {
-          _hasBits0 &= ~2;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override bool Equals(object other) {
-          return Equals(other as ReservedRange);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool Equals(ReservedRange other) {
-          if (ReferenceEquals(other, null)) {
-            return false;
-          }
-          if (ReferenceEquals(other, this)) {
-            return true;
-          }
-          if (Start != other.Start) return false;
-          if (End != other.End) return false;
-          return Equals(_unknownFields, other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override int GetHashCode() {
-          int hash = 1;
-          if (HasStart) hash ^= Start.GetHashCode();
-          if (HasEnd) hash ^= End.GetHashCode();
-          if (_unknownFields != null) {
-            hash ^= _unknownFields.GetHashCode();
-          }
-          return hash;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override string ToString() {
-          return pb::JsonFormatter.ToDiagnosticString(this);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void WriteTo(pb::CodedOutputStream output) {
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          output.WriteRawMessage(this);
-        #else
-          if (HasStart) {
-            output.WriteRawTag(8);
-            output.WriteInt32(Start);
-          }
-          if (HasEnd) {
-            output.WriteRawTag(16);
-            output.WriteInt32(End);
-          }
-          if (_unknownFields != null) {
-            _unknownFields.WriteTo(output);
-          }
-        #endif
-        }
-
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-          if (HasStart) {
-            output.WriteRawTag(8);
-            output.WriteInt32(Start);
-          }
-          if (HasEnd) {
-            output.WriteRawTag(16);
-            output.WriteInt32(End);
-          }
-          if (_unknownFields != null) {
-            _unknownFields.WriteTo(ref output);
-          }
-        }
-        #endif
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public int CalculateSize() {
-          int size = 0;
-          if (HasStart) {
-            size += 1 + pb::CodedOutputStream.ComputeInt32Size(Start);
-          }
-          if (HasEnd) {
-            size += 1 + pb::CodedOutputStream.ComputeInt32Size(End);
-          }
-          if (_unknownFields != null) {
-            size += _unknownFields.CalculateSize();
-          }
-          return size;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(ReservedRange other) {
-          if (other == null) {
-            return;
-          }
-          if (other.HasStart) {
-            Start = other.Start;
-          }
-          if (other.HasEnd) {
-            End = other.End;
-          }
-          _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(pb::CodedInputStream input) {
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          input.ReadRawMessage(this);
-        #else
-          uint tag;
-          while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
-              default:
-                _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-                break;
-              case 8: {
-                Start = input.ReadInt32();
-                break;
-              }
-              case 16: {
-                End = input.ReadInt32();
-                break;
-              }
-            }
-          }
-        #endif
-        }
-
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-          uint tag;
-          while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
-              default:
-                _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-                break;
-              case 8: {
-                Start = input.ReadInt32();
-                break;
-              }
-              case 16: {
-                End = input.ReadInt32();
-                break;
-              }
-            }
-          }
-        }
-        #endif
-
-      }
-
-    }
-    #endregion
-
-  }
-
-  public sealed partial class ExtensionRangeOptions : pb::IExtendableMessage<ExtensionRangeOptions>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<ExtensionRangeOptions> _parser = new pb::MessageParser<ExtensionRangeOptions>(() => new ExtensionRangeOptions());
-    private pb::UnknownFieldSet _unknownFields;
-    internal pb::ExtensionSet<ExtensionRangeOptions> _extensions;
-    private pb::ExtensionSet<ExtensionRangeOptions> _Extensions { get { return _extensions; } }
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<ExtensionRangeOptions> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.Reflection.DescriptorReflection.Descriptor.MessageTypes[3]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ExtensionRangeOptions() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ExtensionRangeOptions(ExtensionRangeOptions other) : this() {
-      uninterpretedOption_ = other.uninterpretedOption_.Clone();
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-      _extensions = pb::ExtensionSet.Clone(other._extensions);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ExtensionRangeOptions Clone() {
-      return new ExtensionRangeOptions(this);
-    }
-
-    /// <summary>Field number for the "uninterpreted_option" field.</summary>
-    public const int UninterpretedOptionFieldNumber = 999;
-    private static readonly pb::FieldCodec<global::Google.Protobuf.Reflection.UninterpretedOption> _repeated_uninterpretedOption_codec
-        = pb::FieldCodec.ForMessage(7994, global::Google.Protobuf.Reflection.UninterpretedOption.Parser);
-    private readonly pbc::RepeatedField<global::Google.Protobuf.Reflection.UninterpretedOption> uninterpretedOption_ = new pbc::RepeatedField<global::Google.Protobuf.Reflection.UninterpretedOption>();
-    /// <summary>
-    /// The parser stores options it doesn't recognize here. See above.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Google.Protobuf.Reflection.UninterpretedOption> UninterpretedOption {
-      get { return uninterpretedOption_; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as ExtensionRangeOptions);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(ExtensionRangeOptions other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if(!uninterpretedOption_.Equals(other.uninterpretedOption_)) return false;
-      if (!Equals(_extensions, other._extensions)) {
-        return false;
-      }
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      hash ^= uninterpretedOption_.GetHashCode();
-      if (_extensions != null) {
-        hash ^= _extensions.GetHashCode();
-      }
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      uninterpretedOption_.WriteTo(output, _repeated_uninterpretedOption_codec);
-      if (_extensions != null) {
-        _extensions.WriteTo(output);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      uninterpretedOption_.WriteTo(ref output, _repeated_uninterpretedOption_codec);
-      if (_extensions != null) {
-        _extensions.WriteTo(ref output);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      size += uninterpretedOption_.CalculateSize(_repeated_uninterpretedOption_codec);
-      if (_extensions != null) {
-        size += _extensions.CalculateSize();
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(ExtensionRangeOptions other) {
-      if (other == null) {
-        return;
-      }
-      uninterpretedOption_.Add(other.uninterpretedOption_);
-      pb::ExtensionSet.MergeFrom(ref _extensions, other._extensions);
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            if (!pb::ExtensionSet.TryMergeFieldFrom(ref _extensions, input)) {
-              _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            }
-            break;
-          case 7994: {
-            uninterpretedOption_.AddEntriesFrom(input, _repeated_uninterpretedOption_codec);
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            if (!pb::ExtensionSet.TryMergeFieldFrom(ref _extensions, ref input)) {
-              _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            }
-            break;
-          case 7994: {
-            uninterpretedOption_.AddEntriesFrom(ref input, _repeated_uninterpretedOption_codec);
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-    public TValue GetExtension<TValue>(pb::Extension<ExtensionRangeOptions, TValue> extension) {
-      return pb::ExtensionSet.Get(ref _extensions, extension);
-    }
-    public pbc::RepeatedField<TValue> GetExtension<TValue>(pb::RepeatedExtension<ExtensionRangeOptions, TValue> extension) {
-      return pb::ExtensionSet.Get(ref _extensions, extension);
-    }
-    public pbc::RepeatedField<TValue> GetOrInitializeExtension<TValue>(pb::RepeatedExtension<ExtensionRangeOptions, TValue> extension) {
-      return pb::ExtensionSet.GetOrInitialize(ref _extensions, extension);
-    }
-    public void SetExtension<TValue>(pb::Extension<ExtensionRangeOptions, TValue> extension, TValue value) {
-      pb::ExtensionSet.Set(ref _extensions, extension, value);
-    }
-    public bool HasExtension<TValue>(pb::Extension<ExtensionRangeOptions, TValue> extension) {
-      return pb::ExtensionSet.Has(ref _extensions, extension);
-    }
-    public void ClearExtension<TValue>(pb::Extension<ExtensionRangeOptions, TValue> extension) {
-      pb::ExtensionSet.Clear(ref _extensions, extension);
-    }
-    public void ClearExtension<TValue>(pb::RepeatedExtension<ExtensionRangeOptions, TValue> extension) {
-      pb::ExtensionSet.Clear(ref _extensions, extension);
-    }
-
-  }
-
-  /// <summary>
-  /// Describes a field within a message.
-  /// </summary>
-  public sealed partial class FieldDescriptorProto : pb::IMessage<FieldDescriptorProto>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<FieldDescriptorProto> _parser = new pb::MessageParser<FieldDescriptorProto>(() => new FieldDescriptorProto());
-    private pb::UnknownFieldSet _unknownFields;
-    private int _hasBits0;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<FieldDescriptorProto> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.Reflection.DescriptorReflection.Descriptor.MessageTypes[4]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public FieldDescriptorProto() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public FieldDescriptorProto(FieldDescriptorProto other) : this() {
-      _hasBits0 = other._hasBits0;
-      name_ = other.name_;
-      number_ = other.number_;
-      label_ = other.label_;
-      type_ = other.type_;
-      typeName_ = other.typeName_;
-      extendee_ = other.extendee_;
-      defaultValue_ = other.defaultValue_;
-      oneofIndex_ = other.oneofIndex_;
-      jsonName_ = other.jsonName_;
-      options_ = other.options_ != null ? other.options_.Clone() : null;
-      proto3Optional_ = other.proto3Optional_;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public FieldDescriptorProto Clone() {
-      return new FieldDescriptorProto(this);
-    }
-
-    /// <summary>Field number for the "name" field.</summary>
-    public const int NameFieldNumber = 1;
-    private readonly static string NameDefaultValue = "";
-
-    private string name_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string Name {
-      get { return name_ ?? NameDefaultValue; }
-      set {
-        name_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-    /// <summary>Gets whether the "name" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasName {
-      get { return name_ != null; }
-    }
-    /// <summary>Clears the value of the "name" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearName() {
-      name_ = null;
-    }
-
-    /// <summary>Field number for the "number" field.</summary>
-    public const int NumberFieldNumber = 3;
-    private readonly static int NumberDefaultValue = 0;
-
-    private int number_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int Number {
-      get { if ((_hasBits0 & 1) != 0) { return number_; } else { return NumberDefaultValue; } }
-      set {
-        _hasBits0 |= 1;
-        number_ = value;
-      }
-    }
-    /// <summary>Gets whether the "number" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasNumber {
-      get { return (_hasBits0 & 1) != 0; }
-    }
-    /// <summary>Clears the value of the "number" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearNumber() {
-      _hasBits0 &= ~1;
-    }
-
-    /// <summary>Field number for the "label" field.</summary>
-    public const int LabelFieldNumber = 4;
-    private readonly static global::Google.Protobuf.Reflection.FieldDescriptorProto.Types.Label LabelDefaultValue = global::Google.Protobuf.Reflection.FieldDescriptorProto.Types.Label.Optional;
-
-    private global::Google.Protobuf.Reflection.FieldDescriptorProto.Types.Label label_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.Reflection.FieldDescriptorProto.Types.Label Label {
-      get { if ((_hasBits0 & 2) != 0) { return label_; } else { return LabelDefaultValue; } }
-      set {
-        _hasBits0 |= 2;
-        label_ = value;
-      }
-    }
-    /// <summary>Gets whether the "label" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasLabel {
-      get { return (_hasBits0 & 2) != 0; }
-    }
-    /// <summary>Clears the value of the "label" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearLabel() {
-      _hasBits0 &= ~2;
-    }
-
-    /// <summary>Field number for the "type" field.</summary>
-    public const int TypeFieldNumber = 5;
-    private readonly static global::Google.Protobuf.Reflection.FieldDescriptorProto.Types.Type TypeDefaultValue = global::Google.Protobuf.Reflection.FieldDescriptorProto.Types.Type.Double;
-
-    private global::Google.Protobuf.Reflection.FieldDescriptorProto.Types.Type type_;
-    /// <summary>
-    /// If type_name is set, this need not be set.  If both this and type_name
-    /// are set, this must be one of TYPE_ENUM, TYPE_MESSAGE or TYPE_GROUP.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.Reflection.FieldDescriptorProto.Types.Type Type {
-      get { if ((_hasBits0 & 4) != 0) { return type_; } else { return TypeDefaultValue; } }
-      set {
-        _hasBits0 |= 4;
-        type_ = value;
-      }
-    }
-    /// <summary>Gets whether the "type" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasType {
-      get { return (_hasBits0 & 4) != 0; }
-    }
-    /// <summary>Clears the value of the "type" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearType() {
-      _hasBits0 &= ~4;
-    }
-
-    /// <summary>Field number for the "type_name" field.</summary>
-    public const int TypeNameFieldNumber = 6;
-    private readonly static string TypeNameDefaultValue = "";
-
-    private string typeName_;
-    /// <summary>
-    /// For message and enum types, this is the name of the type.  If the name
-    /// starts with a '.', it is fully-qualified.  Otherwise, C++-like scoping
-    /// rules are used to find the type (i.e. first the nested types within this
-    /// message are searched, then within the parent, on up to the root
-    /// namespace).
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string TypeName {
-      get { return typeName_ ?? TypeNameDefaultValue; }
-      set {
-        typeName_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-    /// <summary>Gets whether the "type_name" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasTypeName {
-      get { return typeName_ != null; }
-    }
-    /// <summary>Clears the value of the "type_name" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearTypeName() {
-      typeName_ = null;
-    }
-
-    /// <summary>Field number for the "extendee" field.</summary>
-    public const int ExtendeeFieldNumber = 2;
-    private readonly static string ExtendeeDefaultValue = "";
-
-    private string extendee_;
-    /// <summary>
-    /// For extensions, this is the name of the type being extended.  It is
-    /// resolved in the same manner as type_name.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string Extendee {
-      get { return extendee_ ?? ExtendeeDefaultValue; }
-      set {
-        extendee_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-    /// <summary>Gets whether the "extendee" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasExtendee {
-      get { return extendee_ != null; }
-    }
-    /// <summary>Clears the value of the "extendee" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearExtendee() {
-      extendee_ = null;
-    }
-
-    /// <summary>Field number for the "default_value" field.</summary>
-    public const int DefaultValueFieldNumber = 7;
-    private readonly static string DefaultValueDefaultValue = "";
-
-    private string defaultValue_;
-    /// <summary>
-    /// For numeric types, contains the original text representation of the value.
-    /// For booleans, "true" or "false".
-    /// For strings, contains the default text contents (not escaped in any way).
-    /// For bytes, contains the C escaped value.  All bytes >= 128 are escaped.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string DefaultValue {
-      get { return defaultValue_ ?? DefaultValueDefaultValue; }
-      set {
-        defaultValue_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-    /// <summary>Gets whether the "default_value" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasDefaultValue {
-      get { return defaultValue_ != null; }
-    }
-    /// <summary>Clears the value of the "default_value" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearDefaultValue() {
-      defaultValue_ = null;
-    }
-
-    /// <summary>Field number for the "oneof_index" field.</summary>
-    public const int OneofIndexFieldNumber = 9;
-    private readonly static int OneofIndexDefaultValue = 0;
-
-    private int oneofIndex_;
-    /// <summary>
-    /// If set, gives the index of a oneof in the containing type's oneof_decl
-    /// list.  This field is a member of that oneof.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int OneofIndex {
-      get { if ((_hasBits0 & 8) != 0) { return oneofIndex_; } else { return OneofIndexDefaultValue; } }
-      set {
-        _hasBits0 |= 8;
-        oneofIndex_ = value;
-      }
-    }
-    /// <summary>Gets whether the "oneof_index" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasOneofIndex {
-      get { return (_hasBits0 & 8) != 0; }
-    }
-    /// <summary>Clears the value of the "oneof_index" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearOneofIndex() {
-      _hasBits0 &= ~8;
-    }
-
-    /// <summary>Field number for the "json_name" field.</summary>
-    public const int JsonNameFieldNumber = 10;
-    private readonly static string JsonNameDefaultValue = "";
-
-    private string jsonName_;
-    /// <summary>
-    /// JSON name of this field. The value is set by protocol compiler. If the
-    /// user has set a "json_name" option on this field, that option's value
-    /// will be used. Otherwise, it's deduced from the field's name by converting
-    /// it to camelCase.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string JsonName {
-      get { return jsonName_ ?? JsonNameDefaultValue; }
-      set {
-        jsonName_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-    /// <summary>Gets whether the "json_name" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasJsonName {
-      get { return jsonName_ != null; }
-    }
-    /// <summary>Clears the value of the "json_name" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearJsonName() {
-      jsonName_ = null;
-    }
-
-    /// <summary>Field number for the "options" field.</summary>
-    public const int OptionsFieldNumber = 8;
-    private global::Google.Protobuf.Reflection.FieldOptions options_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.Reflection.FieldOptions Options {
-      get { return options_; }
-      set {
-        options_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "proto3_optional" field.</summary>
-    public const int Proto3OptionalFieldNumber = 17;
-    private readonly static bool Proto3OptionalDefaultValue = false;
-
-    private bool proto3Optional_;
-    /// <summary>
-    /// If true, this is a proto3 "optional". When a proto3 field is optional, it
-    /// tracks presence regardless of field type.
-    ///
-    /// When proto3_optional is true, this field must be belong to a oneof to
-    /// signal to old proto3 clients that presence is tracked for this field. This
-    /// oneof is known as a "synthetic" oneof, and this field must be its sole
-    /// member (each proto3 optional field gets its own synthetic oneof). Synthetic
-    /// oneofs exist in the descriptor only, and do not generate any API. Synthetic
-    /// oneofs must be ordered after all "real" oneofs.
-    ///
-    /// For message fields, proto3_optional doesn't create any semantic change,
-    /// since non-repeated message fields always track presence. However it still
-    /// indicates the semantic detail of whether the user wrote "optional" or not.
-    /// This can be useful for round-tripping the .proto file. For consistency we
-    /// give message fields a synthetic oneof also, even though it is not required
-    /// to track presence. This is especially important because the parser can't
-    /// tell if a field is a message or an enum, so it must always create a
-    /// synthetic oneof.
-    ///
-    /// Proto2 optional fields do not set this flag, because they already indicate
-    /// optional with `LABEL_OPTIONAL`.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Proto3Optional {
-      get { if ((_hasBits0 & 16) != 0) { return proto3Optional_; } else { return Proto3OptionalDefaultValue; } }
-      set {
-        _hasBits0 |= 16;
-        proto3Optional_ = value;
-      }
-    }
-    /// <summary>Gets whether the "proto3_optional" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasProto3Optional {
-      get { return (_hasBits0 & 16) != 0; }
-    }
-    /// <summary>Clears the value of the "proto3_optional" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearProto3Optional() {
-      _hasBits0 &= ~16;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as FieldDescriptorProto);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(FieldDescriptorProto other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (Name != other.Name) return false;
-      if (Number != other.Number) return false;
-      if (Label != other.Label) return false;
-      if (Type != other.Type) return false;
-      if (TypeName != other.TypeName) return false;
-      if (Extendee != other.Extendee) return false;
-      if (DefaultValue != other.DefaultValue) return false;
-      if (OneofIndex != other.OneofIndex) return false;
-      if (JsonName != other.JsonName) return false;
-      if (!object.Equals(Options, other.Options)) return false;
-      if (Proto3Optional != other.Proto3Optional) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (HasName) hash ^= Name.GetHashCode();
-      if (HasNumber) hash ^= Number.GetHashCode();
-      if (HasLabel) hash ^= Label.GetHashCode();
-      if (HasType) hash ^= Type.GetHashCode();
-      if (HasTypeName) hash ^= TypeName.GetHashCode();
-      if (HasExtendee) hash ^= Extendee.GetHashCode();
-      if (HasDefaultValue) hash ^= DefaultValue.GetHashCode();
-      if (HasOneofIndex) hash ^= OneofIndex.GetHashCode();
-      if (HasJsonName) hash ^= JsonName.GetHashCode();
-      if (options_ != null) hash ^= Options.GetHashCode();
-      if (HasProto3Optional) hash ^= Proto3Optional.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (HasName) {
-        output.WriteRawTag(10);
-        output.WriteString(Name);
-      }
-      if (HasExtendee) {
-        output.WriteRawTag(18);
-        output.WriteString(Extendee);
-      }
-      if (HasNumber) {
-        output.WriteRawTag(24);
-        output.WriteInt32(Number);
-      }
-      if (HasLabel) {
-        output.WriteRawTag(32);
-        output.WriteEnum((int) Label);
-      }
-      if (HasType) {
-        output.WriteRawTag(40);
-        output.WriteEnum((int) Type);
-      }
-      if (HasTypeName) {
-        output.WriteRawTag(50);
-        output.WriteString(TypeName);
-      }
-      if (HasDefaultValue) {
-        output.WriteRawTag(58);
-        output.WriteString(DefaultValue);
-      }
-      if (options_ != null) {
-        output.WriteRawTag(66);
-        output.WriteMessage(Options);
-      }
-      if (HasOneofIndex) {
-        output.WriteRawTag(72);
-        output.WriteInt32(OneofIndex);
-      }
-      if (HasJsonName) {
-        output.WriteRawTag(82);
-        output.WriteString(JsonName);
-      }
-      if (HasProto3Optional) {
-        output.WriteRawTag(136, 1);
-        output.WriteBool(Proto3Optional);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (HasName) {
-        output.WriteRawTag(10);
-        output.WriteString(Name);
-      }
-      if (HasExtendee) {
-        output.WriteRawTag(18);
-        output.WriteString(Extendee);
-      }
-      if (HasNumber) {
-        output.WriteRawTag(24);
-        output.WriteInt32(Number);
-      }
-      if (HasLabel) {
-        output.WriteRawTag(32);
-        output.WriteEnum((int) Label);
-      }
-      if (HasType) {
-        output.WriteRawTag(40);
-        output.WriteEnum((int) Type);
-      }
-      if (HasTypeName) {
-        output.WriteRawTag(50);
-        output.WriteString(TypeName);
-      }
-      if (HasDefaultValue) {
-        output.WriteRawTag(58);
-        output.WriteString(DefaultValue);
-      }
-      if (options_ != null) {
-        output.WriteRawTag(66);
-        output.WriteMessage(Options);
-      }
-      if (HasOneofIndex) {
-        output.WriteRawTag(72);
-        output.WriteInt32(OneofIndex);
-      }
-      if (HasJsonName) {
-        output.WriteRawTag(82);
-        output.WriteString(JsonName);
-      }
-      if (HasProto3Optional) {
-        output.WriteRawTag(136, 1);
-        output.WriteBool(Proto3Optional);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (HasName) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(Name);
-      }
-      if (HasNumber) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(Number);
-      }
-      if (HasLabel) {
-        size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Label);
-      }
-      if (HasType) {
-        size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Type);
-      }
-      if (HasTypeName) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(TypeName);
-      }
-      if (HasExtendee) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(Extendee);
-      }
-      if (HasDefaultValue) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(DefaultValue);
-      }
-      if (HasOneofIndex) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(OneofIndex);
-      }
-      if (HasJsonName) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(JsonName);
-      }
-      if (options_ != null) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(Options);
-      }
-      if (HasProto3Optional) {
-        size += 2 + 1;
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(FieldDescriptorProto other) {
-      if (other == null) {
-        return;
-      }
-      if (other.HasName) {
-        Name = other.Name;
-      }
-      if (other.HasNumber) {
-        Number = other.Number;
-      }
-      if (other.HasLabel) {
-        Label = other.Label;
-      }
-      if (other.HasType) {
-        Type = other.Type;
-      }
-      if (other.HasTypeName) {
-        TypeName = other.TypeName;
-      }
-      if (other.HasExtendee) {
-        Extendee = other.Extendee;
-      }
-      if (other.HasDefaultValue) {
-        DefaultValue = other.DefaultValue;
-      }
-      if (other.HasOneofIndex) {
-        OneofIndex = other.OneofIndex;
-      }
-      if (other.HasJsonName) {
-        JsonName = other.JsonName;
-      }
-      if (other.options_ != null) {
-        if (options_ == null) {
-          Options = new global::Google.Protobuf.Reflection.FieldOptions();
-        }
-        Options.MergeFrom(other.Options);
-      }
-      if (other.HasProto3Optional) {
-        Proto3Optional = other.Proto3Optional;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 10: {
-            Name = input.ReadString();
-            break;
-          }
-          case 18: {
-            Extendee = input.ReadString();
-            break;
-          }
-          case 24: {
-            Number = input.ReadInt32();
-            break;
-          }
-          case 32: {
-            Label = (global::Google.Protobuf.Reflection.FieldDescriptorProto.Types.Label) input.ReadEnum();
-            break;
-          }
-          case 40: {
-            Type = (global::Google.Protobuf.Reflection.FieldDescriptorProto.Types.Type) input.ReadEnum();
-            break;
-          }
-          case 50: {
-            TypeName = input.ReadString();
-            break;
-          }
-          case 58: {
-            DefaultValue = input.ReadString();
-            break;
-          }
-          case 66: {
-            if (options_ == null) {
-              Options = new global::Google.Protobuf.Reflection.FieldOptions();
-            }
-            input.ReadMessage(Options);
-            break;
-          }
-          case 72: {
-            OneofIndex = input.ReadInt32();
-            break;
-          }
-          case 82: {
-            JsonName = input.ReadString();
-            break;
-          }
-          case 136: {
-            Proto3Optional = input.ReadBool();
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 10: {
-            Name = input.ReadString();
-            break;
-          }
-          case 18: {
-            Extendee = input.ReadString();
-            break;
-          }
-          case 24: {
-            Number = input.ReadInt32();
-            break;
-          }
-          case 32: {
-            Label = (global::Google.Protobuf.Reflection.FieldDescriptorProto.Types.Label) input.ReadEnum();
-            break;
-          }
-          case 40: {
-            Type = (global::Google.Protobuf.Reflection.FieldDescriptorProto.Types.Type) input.ReadEnum();
-            break;
-          }
-          case 50: {
-            TypeName = input.ReadString();
-            break;
-          }
-          case 58: {
-            DefaultValue = input.ReadString();
-            break;
-          }
-          case 66: {
-            if (options_ == null) {
-              Options = new global::Google.Protobuf.Reflection.FieldOptions();
-            }
-            input.ReadMessage(Options);
-            break;
-          }
-          case 72: {
-            OneofIndex = input.ReadInt32();
-            break;
-          }
-          case 82: {
-            JsonName = input.ReadString();
-            break;
-          }
-          case 136: {
-            Proto3Optional = input.ReadBool();
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-    #region Nested types
-    /// <summary>Container for nested types declared in the FieldDescriptorProto message type.</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static partial class Types {
-      public enum Type {
-        /// <summary>
-        /// 0 is reserved for errors.
-        /// Order is weird for historical reasons.
-        /// </summary>
-        [pbr::OriginalName("TYPE_DOUBLE")] Double = 1,
-        [pbr::OriginalName("TYPE_FLOAT")] Float = 2,
-        /// <summary>
-        /// Not ZigZag encoded.  Negative numbers take 10 bytes.  Use TYPE_SINT64 if
-        /// negative values are likely.
-        /// </summary>
-        [pbr::OriginalName("TYPE_INT64")] Int64 = 3,
-        [pbr::OriginalName("TYPE_UINT64")] Uint64 = 4,
-        /// <summary>
-        /// Not ZigZag encoded.  Negative numbers take 10 bytes.  Use TYPE_SINT32 if
-        /// negative values are likely.
-        /// </summary>
-        [pbr::OriginalName("TYPE_INT32")] Int32 = 5,
-        [pbr::OriginalName("TYPE_FIXED64")] Fixed64 = 6,
-        [pbr::OriginalName("TYPE_FIXED32")] Fixed32 = 7,
-        [pbr::OriginalName("TYPE_BOOL")] Bool = 8,
-        [pbr::OriginalName("TYPE_STRING")] String = 9,
-        /// <summary>
-        /// Tag-delimited aggregate.
-        /// Group type is deprecated and not supported in proto3. However, Proto3
-        /// implementations should still be able to parse the group wire format and
-        /// treat group fields as unknown fields.
-        /// </summary>
-        [pbr::OriginalName("TYPE_GROUP")] Group = 10,
-        /// <summary>
-        /// Length-delimited aggregate.
-        /// </summary>
-        [pbr::OriginalName("TYPE_MESSAGE")] Message = 11,
-        /// <summary>
-        /// New in version 2.
-        /// </summary>
-        [pbr::OriginalName("TYPE_BYTES")] Bytes = 12,
-        [pbr::OriginalName("TYPE_UINT32")] Uint32 = 13,
-        [pbr::OriginalName("TYPE_ENUM")] Enum = 14,
-        [pbr::OriginalName("TYPE_SFIXED32")] Sfixed32 = 15,
-        [pbr::OriginalName("TYPE_SFIXED64")] Sfixed64 = 16,
-        /// <summary>
-        /// Uses ZigZag encoding.
-        /// </summary>
-        [pbr::OriginalName("TYPE_SINT32")] Sint32 = 17,
-        /// <summary>
-        /// Uses ZigZag encoding.
-        /// </summary>
-        [pbr::OriginalName("TYPE_SINT64")] Sint64 = 18,
-      }
-
-      public enum Label {
-        /// <summary>
-        /// 0 is reserved for errors
-        /// </summary>
-        [pbr::OriginalName("LABEL_OPTIONAL")] Optional = 1,
-        [pbr::OriginalName("LABEL_REQUIRED")] Required = 2,
-        [pbr::OriginalName("LABEL_REPEATED")] Repeated = 3,
-      }
-
-    }
-    #endregion
-
-  }
-
-  /// <summary>
-  /// Describes a oneof.
-  /// </summary>
-  public sealed partial class OneofDescriptorProto : pb::IMessage<OneofDescriptorProto>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<OneofDescriptorProto> _parser = new pb::MessageParser<OneofDescriptorProto>(() => new OneofDescriptorProto());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<OneofDescriptorProto> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.Reflection.DescriptorReflection.Descriptor.MessageTypes[5]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public OneofDescriptorProto() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public OneofDescriptorProto(OneofDescriptorProto other) : this() {
-      name_ = other.name_;
-      options_ = other.options_ != null ? other.options_.Clone() : null;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public OneofDescriptorProto Clone() {
-      return new OneofDescriptorProto(this);
-    }
-
-    /// <summary>Field number for the "name" field.</summary>
-    public const int NameFieldNumber = 1;
-    private readonly static string NameDefaultValue = "";
-
-    private string name_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string Name {
-      get { return name_ ?? NameDefaultValue; }
-      set {
-        name_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-    /// <summary>Gets whether the "name" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasName {
-      get { return name_ != null; }
-    }
-    /// <summary>Clears the value of the "name" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearName() {
-      name_ = null;
-    }
-
-    /// <summary>Field number for the "options" field.</summary>
-    public const int OptionsFieldNumber = 2;
-    private global::Google.Protobuf.Reflection.OneofOptions options_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.Reflection.OneofOptions Options {
-      get { return options_; }
-      set {
-        options_ = value;
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as OneofDescriptorProto);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(OneofDescriptorProto other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (Name != other.Name) return false;
-      if (!object.Equals(Options, other.Options)) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (HasName) hash ^= Name.GetHashCode();
-      if (options_ != null) hash ^= Options.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (HasName) {
-        output.WriteRawTag(10);
-        output.WriteString(Name);
-      }
-      if (options_ != null) {
-        output.WriteRawTag(18);
-        output.WriteMessage(Options);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (HasName) {
-        output.WriteRawTag(10);
-        output.WriteString(Name);
-      }
-      if (options_ != null) {
-        output.WriteRawTag(18);
-        output.WriteMessage(Options);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (HasName) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(Name);
-      }
-      if (options_ != null) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(Options);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(OneofDescriptorProto other) {
-      if (other == null) {
-        return;
-      }
-      if (other.HasName) {
-        Name = other.Name;
-      }
-      if (other.options_ != null) {
-        if (options_ == null) {
-          Options = new global::Google.Protobuf.Reflection.OneofOptions();
-        }
-        Options.MergeFrom(other.Options);
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 10: {
-            Name = input.ReadString();
-            break;
-          }
-          case 18: {
-            if (options_ == null) {
-              Options = new global::Google.Protobuf.Reflection.OneofOptions();
-            }
-            input.ReadMessage(Options);
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 10: {
-            Name = input.ReadString();
-            break;
-          }
-          case 18: {
-            if (options_ == null) {
-              Options = new global::Google.Protobuf.Reflection.OneofOptions();
-            }
-            input.ReadMessage(Options);
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  /// <summary>
-  /// Describes an enum type.
-  /// </summary>
-  public sealed partial class EnumDescriptorProto : pb::IMessage<EnumDescriptorProto>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<EnumDescriptorProto> _parser = new pb::MessageParser<EnumDescriptorProto>(() => new EnumDescriptorProto());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<EnumDescriptorProto> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.Reflection.DescriptorReflection.Descriptor.MessageTypes[6]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public EnumDescriptorProto() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public EnumDescriptorProto(EnumDescriptorProto other) : this() {
-      name_ = other.name_;
-      value_ = other.value_.Clone();
-      options_ = other.options_ != null ? other.options_.Clone() : null;
-      reservedRange_ = other.reservedRange_.Clone();
-      reservedName_ = other.reservedName_.Clone();
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public EnumDescriptorProto Clone() {
-      return new EnumDescriptorProto(this);
-    }
-
-    /// <summary>Field number for the "name" field.</summary>
-    public const int NameFieldNumber = 1;
-    private readonly static string NameDefaultValue = "";
-
-    private string name_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string Name {
-      get { return name_ ?? NameDefaultValue; }
-      set {
-        name_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-    /// <summary>Gets whether the "name" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasName {
-      get { return name_ != null; }
-    }
-    /// <summary>Clears the value of the "name" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearName() {
-      name_ = null;
-    }
-
-    /// <summary>Field number for the "value" field.</summary>
-    public const int ValueFieldNumber = 2;
-    private static readonly pb::FieldCodec<global::Google.Protobuf.Reflection.EnumValueDescriptorProto> _repeated_value_codec
-        = pb::FieldCodec.ForMessage(18, global::Google.Protobuf.Reflection.EnumValueDescriptorProto.Parser);
-    private readonly pbc::RepeatedField<global::Google.Protobuf.Reflection.EnumValueDescriptorProto> value_ = new pbc::RepeatedField<global::Google.Protobuf.Reflection.EnumValueDescriptorProto>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Google.Protobuf.Reflection.EnumValueDescriptorProto> Value {
-      get { return value_; }
-    }
-
-    /// <summary>Field number for the "options" field.</summary>
-    public const int OptionsFieldNumber = 3;
-    private global::Google.Protobuf.Reflection.EnumOptions options_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.Reflection.EnumOptions Options {
-      get { return options_; }
-      set {
-        options_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "reserved_range" field.</summary>
-    public const int ReservedRangeFieldNumber = 4;
-    private static readonly pb::FieldCodec<global::Google.Protobuf.Reflection.EnumDescriptorProto.Types.EnumReservedRange> _repeated_reservedRange_codec
-        = pb::FieldCodec.ForMessage(34, global::Google.Protobuf.Reflection.EnumDescriptorProto.Types.EnumReservedRange.Parser);
-    private readonly pbc::RepeatedField<global::Google.Protobuf.Reflection.EnumDescriptorProto.Types.EnumReservedRange> reservedRange_ = new pbc::RepeatedField<global::Google.Protobuf.Reflection.EnumDescriptorProto.Types.EnumReservedRange>();
-    /// <summary>
-    /// Range of reserved numeric values. Reserved numeric values may not be used
-    /// by enum values in the same enum declaration. Reserved ranges may not
-    /// overlap.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Google.Protobuf.Reflection.EnumDescriptorProto.Types.EnumReservedRange> ReservedRange {
-      get { return reservedRange_; }
-    }
-
-    /// <summary>Field number for the "reserved_name" field.</summary>
-    public const int ReservedNameFieldNumber = 5;
-    private static readonly pb::FieldCodec<string> _repeated_reservedName_codec
-        = pb::FieldCodec.ForString(42);
-    private readonly pbc::RepeatedField<string> reservedName_ = new pbc::RepeatedField<string>();
-    /// <summary>
-    /// Reserved enum value names, which may not be reused. A given name may only
-    /// be reserved once.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<string> ReservedName {
-      get { return reservedName_; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as EnumDescriptorProto);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(EnumDescriptorProto other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (Name != other.Name) return false;
-      if(!value_.Equals(other.value_)) return false;
-      if (!object.Equals(Options, other.Options)) return false;
-      if(!reservedRange_.Equals(other.reservedRange_)) return false;
-      if(!reservedName_.Equals(other.reservedName_)) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (HasName) hash ^= Name.GetHashCode();
-      hash ^= value_.GetHashCode();
-      if (options_ != null) hash ^= Options.GetHashCode();
-      hash ^= reservedRange_.GetHashCode();
-      hash ^= reservedName_.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (HasName) {
-        output.WriteRawTag(10);
-        output.WriteString(Name);
-      }
-      value_.WriteTo(output, _repeated_value_codec);
-      if (options_ != null) {
-        output.WriteRawTag(26);
-        output.WriteMessage(Options);
-      }
-      reservedRange_.WriteTo(output, _repeated_reservedRange_codec);
-      reservedName_.WriteTo(output, _repeated_reservedName_codec);
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (HasName) {
-        output.WriteRawTag(10);
-        output.WriteString(Name);
-      }
-      value_.WriteTo(ref output, _repeated_value_codec);
-      if (options_ != null) {
-        output.WriteRawTag(26);
-        output.WriteMessage(Options);
-      }
-      reservedRange_.WriteTo(ref output, _repeated_reservedRange_codec);
-      reservedName_.WriteTo(ref output, _repeated_reservedName_codec);
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (HasName) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(Name);
-      }
-      size += value_.CalculateSize(_repeated_value_codec);
-      if (options_ != null) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(Options);
-      }
-      size += reservedRange_.CalculateSize(_repeated_reservedRange_codec);
-      size += reservedName_.CalculateSize(_repeated_reservedName_codec);
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(EnumDescriptorProto other) {
-      if (other == null) {
-        return;
-      }
-      if (other.HasName) {
-        Name = other.Name;
-      }
-      value_.Add(other.value_);
-      if (other.options_ != null) {
-        if (options_ == null) {
-          Options = new global::Google.Protobuf.Reflection.EnumOptions();
-        }
-        Options.MergeFrom(other.Options);
-      }
-      reservedRange_.Add(other.reservedRange_);
-      reservedName_.Add(other.reservedName_);
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 10: {
-            Name = input.ReadString();
-            break;
-          }
-          case 18: {
-            value_.AddEntriesFrom(input, _repeated_value_codec);
-            break;
-          }
-          case 26: {
-            if (options_ == null) {
-              Options = new global::Google.Protobuf.Reflection.EnumOptions();
-            }
-            input.ReadMessage(Options);
-            break;
-          }
-          case 34: {
-            reservedRange_.AddEntriesFrom(input, _repeated_reservedRange_codec);
-            break;
-          }
-          case 42: {
-            reservedName_.AddEntriesFrom(input, _repeated_reservedName_codec);
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 10: {
-            Name = input.ReadString();
-            break;
-          }
-          case 18: {
-            value_.AddEntriesFrom(ref input, _repeated_value_codec);
-            break;
-          }
-          case 26: {
-            if (options_ == null) {
-              Options = new global::Google.Protobuf.Reflection.EnumOptions();
-            }
-            input.ReadMessage(Options);
-            break;
-          }
-          case 34: {
-            reservedRange_.AddEntriesFrom(ref input, _repeated_reservedRange_codec);
-            break;
-          }
-          case 42: {
-            reservedName_.AddEntriesFrom(ref input, _repeated_reservedName_codec);
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-    #region Nested types
-    /// <summary>Container for nested types declared in the EnumDescriptorProto message type.</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static partial class Types {
-      /// <summary>
-      /// Range of reserved numeric values. Reserved values may not be used by
-      /// entries in the same enum. Reserved ranges may not overlap.
-      ///
-      /// Note that this is distinct from DescriptorProto.ReservedRange in that it
-      /// is inclusive such that it can appropriately represent the entire int32
-      /// domain.
-      /// </summary>
-      public sealed partial class EnumReservedRange : pb::IMessage<EnumReservedRange>
-      #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          , pb::IBufferMessage
-      #endif
-      {
-        private static readonly pb::MessageParser<EnumReservedRange> _parser = new pb::MessageParser<EnumReservedRange>(() => new EnumReservedRange());
-        private pb::UnknownFieldSet _unknownFields;
-        private int _hasBits0;
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static pb::MessageParser<EnumReservedRange> Parser { get { return _parser; } }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static pbr::MessageDescriptor Descriptor {
-          get { return global::Google.Protobuf.Reflection.EnumDescriptorProto.Descriptor.NestedTypes[0]; }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        pbr::MessageDescriptor pb::IMessage.Descriptor {
-          get { return Descriptor; }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public EnumReservedRange() {
-          OnConstruction();
-        }
-
-        partial void OnConstruction();
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public EnumReservedRange(EnumReservedRange other) : this() {
-          _hasBits0 = other._hasBits0;
-          start_ = other.start_;
-          end_ = other.end_;
-          _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public EnumReservedRange Clone() {
-          return new EnumReservedRange(this);
-        }
-
-        /// <summary>Field number for the "start" field.</summary>
-        public const int StartFieldNumber = 1;
-        private readonly static int StartDefaultValue = 0;
-
-        private int start_;
-        /// <summary>
-        /// Inclusive.
-        /// </summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public int Start {
-          get { if ((_hasBits0 & 1) != 0) { return start_; } else { return StartDefaultValue; } }
-          set {
-            _hasBits0 |= 1;
-            start_ = value;
-          }
-        }
-        /// <summary>Gets whether the "start" field is set</summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool HasStart {
-          get { return (_hasBits0 & 1) != 0; }
-        }
-        /// <summary>Clears the value of the "start" field</summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void ClearStart() {
-          _hasBits0 &= ~1;
-        }
-
-        /// <summary>Field number for the "end" field.</summary>
-        public const int EndFieldNumber = 2;
-        private readonly static int EndDefaultValue = 0;
-
-        private int end_;
-        /// <summary>
-        /// Inclusive.
-        /// </summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public int End {
-          get { if ((_hasBits0 & 2) != 0) { return end_; } else { return EndDefaultValue; } }
-          set {
-            _hasBits0 |= 2;
-            end_ = value;
-          }
-        }
-        /// <summary>Gets whether the "end" field is set</summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool HasEnd {
-          get { return (_hasBits0 & 2) != 0; }
-        }
-        /// <summary>Clears the value of the "end" field</summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void ClearEnd() {
-          _hasBits0 &= ~2;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override bool Equals(object other) {
-          return Equals(other as EnumReservedRange);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool Equals(EnumReservedRange other) {
-          if (ReferenceEquals(other, null)) {
-            return false;
-          }
-          if (ReferenceEquals(other, this)) {
-            return true;
-          }
-          if (Start != other.Start) return false;
-          if (End != other.End) return false;
-          return Equals(_unknownFields, other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override int GetHashCode() {
-          int hash = 1;
-          if (HasStart) hash ^= Start.GetHashCode();
-          if (HasEnd) hash ^= End.GetHashCode();
-          if (_unknownFields != null) {
-            hash ^= _unknownFields.GetHashCode();
-          }
-          return hash;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override string ToString() {
-          return pb::JsonFormatter.ToDiagnosticString(this);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void WriteTo(pb::CodedOutputStream output) {
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          output.WriteRawMessage(this);
-        #else
-          if (HasStart) {
-            output.WriteRawTag(8);
-            output.WriteInt32(Start);
-          }
-          if (HasEnd) {
-            output.WriteRawTag(16);
-            output.WriteInt32(End);
-          }
-          if (_unknownFields != null) {
-            _unknownFields.WriteTo(output);
-          }
-        #endif
-        }
-
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-          if (HasStart) {
-            output.WriteRawTag(8);
-            output.WriteInt32(Start);
-          }
-          if (HasEnd) {
-            output.WriteRawTag(16);
-            output.WriteInt32(End);
-          }
-          if (_unknownFields != null) {
-            _unknownFields.WriteTo(ref output);
-          }
-        }
-        #endif
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public int CalculateSize() {
-          int size = 0;
-          if (HasStart) {
-            size += 1 + pb::CodedOutputStream.ComputeInt32Size(Start);
-          }
-          if (HasEnd) {
-            size += 1 + pb::CodedOutputStream.ComputeInt32Size(End);
-          }
-          if (_unknownFields != null) {
-            size += _unknownFields.CalculateSize();
-          }
-          return size;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(EnumReservedRange other) {
-          if (other == null) {
-            return;
-          }
-          if (other.HasStart) {
-            Start = other.Start;
-          }
-          if (other.HasEnd) {
-            End = other.End;
-          }
-          _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(pb::CodedInputStream input) {
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          input.ReadRawMessage(this);
-        #else
-          uint tag;
-          while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
-              default:
-                _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-                break;
-              case 8: {
-                Start = input.ReadInt32();
-                break;
-              }
-              case 16: {
-                End = input.ReadInt32();
-                break;
-              }
-            }
-          }
-        #endif
-        }
-
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-          uint tag;
-          while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
-              default:
-                _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-                break;
-              case 8: {
-                Start = input.ReadInt32();
-                break;
-              }
-              case 16: {
-                End = input.ReadInt32();
-                break;
-              }
-            }
-          }
-        }
-        #endif
-
-      }
-
-    }
-    #endregion
-
-  }
-
-  /// <summary>
-  /// Describes a value within an enum.
-  /// </summary>
-  public sealed partial class EnumValueDescriptorProto : pb::IMessage<EnumValueDescriptorProto>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<EnumValueDescriptorProto> _parser = new pb::MessageParser<EnumValueDescriptorProto>(() => new EnumValueDescriptorProto());
-    private pb::UnknownFieldSet _unknownFields;
-    private int _hasBits0;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<EnumValueDescriptorProto> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.Reflection.DescriptorReflection.Descriptor.MessageTypes[7]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public EnumValueDescriptorProto() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public EnumValueDescriptorProto(EnumValueDescriptorProto other) : this() {
-      _hasBits0 = other._hasBits0;
-      name_ = other.name_;
-      number_ = other.number_;
-      options_ = other.options_ != null ? other.options_.Clone() : null;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public EnumValueDescriptorProto Clone() {
-      return new EnumValueDescriptorProto(this);
-    }
-
-    /// <summary>Field number for the "name" field.</summary>
-    public const int NameFieldNumber = 1;
-    private readonly static string NameDefaultValue = "";
-
-    private string name_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string Name {
-      get { return name_ ?? NameDefaultValue; }
-      set {
-        name_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-    /// <summary>Gets whether the "name" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasName {
-      get { return name_ != null; }
-    }
-    /// <summary>Clears the value of the "name" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearName() {
-      name_ = null;
-    }
-
-    /// <summary>Field number for the "number" field.</summary>
-    public const int NumberFieldNumber = 2;
-    private readonly static int NumberDefaultValue = 0;
-
-    private int number_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int Number {
-      get { if ((_hasBits0 & 1) != 0) { return number_; } else { return NumberDefaultValue; } }
-      set {
-        _hasBits0 |= 1;
-        number_ = value;
-      }
-    }
-    /// <summary>Gets whether the "number" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasNumber {
-      get { return (_hasBits0 & 1) != 0; }
-    }
-    /// <summary>Clears the value of the "number" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearNumber() {
-      _hasBits0 &= ~1;
-    }
-
-    /// <summary>Field number for the "options" field.</summary>
-    public const int OptionsFieldNumber = 3;
-    private global::Google.Protobuf.Reflection.EnumValueOptions options_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.Reflection.EnumValueOptions Options {
-      get { return options_; }
-      set {
-        options_ = value;
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as EnumValueDescriptorProto);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(EnumValueDescriptorProto other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (Name != other.Name) return false;
-      if (Number != other.Number) return false;
-      if (!object.Equals(Options, other.Options)) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (HasName) hash ^= Name.GetHashCode();
-      if (HasNumber) hash ^= Number.GetHashCode();
-      if (options_ != null) hash ^= Options.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (HasName) {
-        output.WriteRawTag(10);
-        output.WriteString(Name);
-      }
-      if (HasNumber) {
-        output.WriteRawTag(16);
-        output.WriteInt32(Number);
-      }
-      if (options_ != null) {
-        output.WriteRawTag(26);
-        output.WriteMessage(Options);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (HasName) {
-        output.WriteRawTag(10);
-        output.WriteString(Name);
-      }
-      if (HasNumber) {
-        output.WriteRawTag(16);
-        output.WriteInt32(Number);
-      }
-      if (options_ != null) {
-        output.WriteRawTag(26);
-        output.WriteMessage(Options);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (HasName) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(Name);
-      }
-      if (HasNumber) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(Number);
-      }
-      if (options_ != null) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(Options);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(EnumValueDescriptorProto other) {
-      if (other == null) {
-        return;
-      }
-      if (other.HasName) {
-        Name = other.Name;
-      }
-      if (other.HasNumber) {
-        Number = other.Number;
-      }
-      if (other.options_ != null) {
-        if (options_ == null) {
-          Options = new global::Google.Protobuf.Reflection.EnumValueOptions();
-        }
-        Options.MergeFrom(other.Options);
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 10: {
-            Name = input.ReadString();
-            break;
-          }
-          case 16: {
-            Number = input.ReadInt32();
-            break;
-          }
-          case 26: {
-            if (options_ == null) {
-              Options = new global::Google.Protobuf.Reflection.EnumValueOptions();
-            }
-            input.ReadMessage(Options);
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 10: {
-            Name = input.ReadString();
-            break;
-          }
-          case 16: {
-            Number = input.ReadInt32();
-            break;
-          }
-          case 26: {
-            if (options_ == null) {
-              Options = new global::Google.Protobuf.Reflection.EnumValueOptions();
-            }
-            input.ReadMessage(Options);
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  /// <summary>
-  /// Describes a service.
-  /// </summary>
-  public sealed partial class ServiceDescriptorProto : pb::IMessage<ServiceDescriptorProto>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<ServiceDescriptorProto> _parser = new pb::MessageParser<ServiceDescriptorProto>(() => new ServiceDescriptorProto());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<ServiceDescriptorProto> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.Reflection.DescriptorReflection.Descriptor.MessageTypes[8]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ServiceDescriptorProto() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ServiceDescriptorProto(ServiceDescriptorProto other) : this() {
-      name_ = other.name_;
-      method_ = other.method_.Clone();
-      options_ = other.options_ != null ? other.options_.Clone() : null;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ServiceDescriptorProto Clone() {
-      return new ServiceDescriptorProto(this);
-    }
-
-    /// <summary>Field number for the "name" field.</summary>
-    public const int NameFieldNumber = 1;
-    private readonly static string NameDefaultValue = "";
-
-    private string name_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string Name {
-      get { return name_ ?? NameDefaultValue; }
-      set {
-        name_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-    /// <summary>Gets whether the "name" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasName {
-      get { return name_ != null; }
-    }
-    /// <summary>Clears the value of the "name" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearName() {
-      name_ = null;
-    }
-
-    /// <summary>Field number for the "method" field.</summary>
-    public const int MethodFieldNumber = 2;
-    private static readonly pb::FieldCodec<global::Google.Protobuf.Reflection.MethodDescriptorProto> _repeated_method_codec
-        = pb::FieldCodec.ForMessage(18, global::Google.Protobuf.Reflection.MethodDescriptorProto.Parser);
-    private readonly pbc::RepeatedField<global::Google.Protobuf.Reflection.MethodDescriptorProto> method_ = new pbc::RepeatedField<global::Google.Protobuf.Reflection.MethodDescriptorProto>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Google.Protobuf.Reflection.MethodDescriptorProto> Method {
-      get { return method_; }
-    }
-
-    /// <summary>Field number for the "options" field.</summary>
-    public const int OptionsFieldNumber = 3;
-    private global::Google.Protobuf.Reflection.ServiceOptions options_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.Reflection.ServiceOptions Options {
-      get { return options_; }
-      set {
-        options_ = value;
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as ServiceDescriptorProto);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(ServiceDescriptorProto other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (Name != other.Name) return false;
-      if(!method_.Equals(other.method_)) return false;
-      if (!object.Equals(Options, other.Options)) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (HasName) hash ^= Name.GetHashCode();
-      hash ^= method_.GetHashCode();
-      if (options_ != null) hash ^= Options.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (HasName) {
-        output.WriteRawTag(10);
-        output.WriteString(Name);
-      }
-      method_.WriteTo(output, _repeated_method_codec);
-      if (options_ != null) {
-        output.WriteRawTag(26);
-        output.WriteMessage(Options);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (HasName) {
-        output.WriteRawTag(10);
-        output.WriteString(Name);
-      }
-      method_.WriteTo(ref output, _repeated_method_codec);
-      if (options_ != null) {
-        output.WriteRawTag(26);
-        output.WriteMessage(Options);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (HasName) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(Name);
-      }
-      size += method_.CalculateSize(_repeated_method_codec);
-      if (options_ != null) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(Options);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(ServiceDescriptorProto other) {
-      if (other == null) {
-        return;
-      }
-      if (other.HasName) {
-        Name = other.Name;
-      }
-      method_.Add(other.method_);
-      if (other.options_ != null) {
-        if (options_ == null) {
-          Options = new global::Google.Protobuf.Reflection.ServiceOptions();
-        }
-        Options.MergeFrom(other.Options);
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 10: {
-            Name = input.ReadString();
-            break;
-          }
-          case 18: {
-            method_.AddEntriesFrom(input, _repeated_method_codec);
-            break;
-          }
-          case 26: {
-            if (options_ == null) {
-              Options = new global::Google.Protobuf.Reflection.ServiceOptions();
-            }
-            input.ReadMessage(Options);
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 10: {
-            Name = input.ReadString();
-            break;
-          }
-          case 18: {
-            method_.AddEntriesFrom(ref input, _repeated_method_codec);
-            break;
-          }
-          case 26: {
-            if (options_ == null) {
-              Options = new global::Google.Protobuf.Reflection.ServiceOptions();
-            }
-            input.ReadMessage(Options);
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  /// <summary>
-  /// Describes a method of a service.
-  /// </summary>
-  public sealed partial class MethodDescriptorProto : pb::IMessage<MethodDescriptorProto>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<MethodDescriptorProto> _parser = new pb::MessageParser<MethodDescriptorProto>(() => new MethodDescriptorProto());
-    private pb::UnknownFieldSet _unknownFields;
-    private int _hasBits0;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<MethodDescriptorProto> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.Reflection.DescriptorReflection.Descriptor.MessageTypes[9]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public MethodDescriptorProto() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public MethodDescriptorProto(MethodDescriptorProto other) : this() {
-      _hasBits0 = other._hasBits0;
-      name_ = other.name_;
-      inputType_ = other.inputType_;
-      outputType_ = other.outputType_;
-      options_ = other.options_ != null ? other.options_.Clone() : null;
-      clientStreaming_ = other.clientStreaming_;
-      serverStreaming_ = other.serverStreaming_;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public MethodDescriptorProto Clone() {
-      return new MethodDescriptorProto(this);
-    }
-
-    /// <summary>Field number for the "name" field.</summary>
-    public const int NameFieldNumber = 1;
-    private readonly static string NameDefaultValue = "";
-
-    private string name_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string Name {
-      get { return name_ ?? NameDefaultValue; }
-      set {
-        name_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-    /// <summary>Gets whether the "name" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasName {
-      get { return name_ != null; }
-    }
-    /// <summary>Clears the value of the "name" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearName() {
-      name_ = null;
-    }
-
-    /// <summary>Field number for the "input_type" field.</summary>
-    public const int InputTypeFieldNumber = 2;
-    private readonly static string InputTypeDefaultValue = "";
-
-    private string inputType_;
-    /// <summary>
-    /// Input and output type names.  These are resolved in the same way as
-    /// FieldDescriptorProto.type_name, but must refer to a message type.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string InputType {
-      get { return inputType_ ?? InputTypeDefaultValue; }
-      set {
-        inputType_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-    /// <summary>Gets whether the "input_type" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasInputType {
-      get { return inputType_ != null; }
-    }
-    /// <summary>Clears the value of the "input_type" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearInputType() {
-      inputType_ = null;
-    }
-
-    /// <summary>Field number for the "output_type" field.</summary>
-    public const int OutputTypeFieldNumber = 3;
-    private readonly static string OutputTypeDefaultValue = "";
-
-    private string outputType_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string OutputType {
-      get { return outputType_ ?? OutputTypeDefaultValue; }
-      set {
-        outputType_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-    /// <summary>Gets whether the "output_type" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasOutputType {
-      get { return outputType_ != null; }
-    }
-    /// <summary>Clears the value of the "output_type" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearOutputType() {
-      outputType_ = null;
-    }
-
-    /// <summary>Field number for the "options" field.</summary>
-    public const int OptionsFieldNumber = 4;
-    private global::Google.Protobuf.Reflection.MethodOptions options_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.Reflection.MethodOptions Options {
-      get { return options_; }
-      set {
-        options_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "client_streaming" field.</summary>
-    public const int ClientStreamingFieldNumber = 5;
-    private readonly static bool ClientStreamingDefaultValue = false;
-
-    private bool clientStreaming_;
-    /// <summary>
-    /// Identifies if client streams multiple client messages
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool ClientStreaming {
-      get { if ((_hasBits0 & 1) != 0) { return clientStreaming_; } else { return ClientStreamingDefaultValue; } }
-      set {
-        _hasBits0 |= 1;
-        clientStreaming_ = value;
-      }
-    }
-    /// <summary>Gets whether the "client_streaming" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasClientStreaming {
-      get { return (_hasBits0 & 1) != 0; }
-    }
-    /// <summary>Clears the value of the "client_streaming" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearClientStreaming() {
-      _hasBits0 &= ~1;
-    }
-
-    /// <summary>Field number for the "server_streaming" field.</summary>
-    public const int ServerStreamingFieldNumber = 6;
-    private readonly static bool ServerStreamingDefaultValue = false;
-
-    private bool serverStreaming_;
-    /// <summary>
-    /// Identifies if server streams multiple server messages
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool ServerStreaming {
-      get { if ((_hasBits0 & 2) != 0) { return serverStreaming_; } else { return ServerStreamingDefaultValue; } }
-      set {
-        _hasBits0 |= 2;
-        serverStreaming_ = value;
-      }
-    }
-    /// <summary>Gets whether the "server_streaming" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasServerStreaming {
-      get { return (_hasBits0 & 2) != 0; }
-    }
-    /// <summary>Clears the value of the "server_streaming" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearServerStreaming() {
-      _hasBits0 &= ~2;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as MethodDescriptorProto);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(MethodDescriptorProto other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (Name != other.Name) return false;
-      if (InputType != other.InputType) return false;
-      if (OutputType != other.OutputType) return false;
-      if (!object.Equals(Options, other.Options)) return false;
-      if (ClientStreaming != other.ClientStreaming) return false;
-      if (ServerStreaming != other.ServerStreaming) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (HasName) hash ^= Name.GetHashCode();
-      if (HasInputType) hash ^= InputType.GetHashCode();
-      if (HasOutputType) hash ^= OutputType.GetHashCode();
-      if (options_ != null) hash ^= Options.GetHashCode();
-      if (HasClientStreaming) hash ^= ClientStreaming.GetHashCode();
-      if (HasServerStreaming) hash ^= ServerStreaming.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (HasName) {
-        output.WriteRawTag(10);
-        output.WriteString(Name);
-      }
-      if (HasInputType) {
-        output.WriteRawTag(18);
-        output.WriteString(InputType);
-      }
-      if (HasOutputType) {
-        output.WriteRawTag(26);
-        output.WriteString(OutputType);
-      }
-      if (options_ != null) {
-        output.WriteRawTag(34);
-        output.WriteMessage(Options);
-      }
-      if (HasClientStreaming) {
-        output.WriteRawTag(40);
-        output.WriteBool(ClientStreaming);
-      }
-      if (HasServerStreaming) {
-        output.WriteRawTag(48);
-        output.WriteBool(ServerStreaming);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (HasName) {
-        output.WriteRawTag(10);
-        output.WriteString(Name);
-      }
-      if (HasInputType) {
-        output.WriteRawTag(18);
-        output.WriteString(InputType);
-      }
-      if (HasOutputType) {
-        output.WriteRawTag(26);
-        output.WriteString(OutputType);
-      }
-      if (options_ != null) {
-        output.WriteRawTag(34);
-        output.WriteMessage(Options);
-      }
-      if (HasClientStreaming) {
-        output.WriteRawTag(40);
-        output.WriteBool(ClientStreaming);
-      }
-      if (HasServerStreaming) {
-        output.WriteRawTag(48);
-        output.WriteBool(ServerStreaming);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (HasName) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(Name);
-      }
-      if (HasInputType) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(InputType);
-      }
-      if (HasOutputType) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(OutputType);
-      }
-      if (options_ != null) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(Options);
-      }
-      if (HasClientStreaming) {
-        size += 1 + 1;
-      }
-      if (HasServerStreaming) {
-        size += 1 + 1;
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(MethodDescriptorProto other) {
-      if (other == null) {
-        return;
-      }
-      if (other.HasName) {
-        Name = other.Name;
-      }
-      if (other.HasInputType) {
-        InputType = other.InputType;
-      }
-      if (other.HasOutputType) {
-        OutputType = other.OutputType;
-      }
-      if (other.options_ != null) {
-        if (options_ == null) {
-          Options = new global::Google.Protobuf.Reflection.MethodOptions();
-        }
-        Options.MergeFrom(other.Options);
-      }
-      if (other.HasClientStreaming) {
-        ClientStreaming = other.ClientStreaming;
-      }
-      if (other.HasServerStreaming) {
-        ServerStreaming = other.ServerStreaming;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 10: {
-            Name = input.ReadString();
-            break;
-          }
-          case 18: {
-            InputType = input.ReadString();
-            break;
-          }
-          case 26: {
-            OutputType = input.ReadString();
-            break;
-          }
-          case 34: {
-            if (options_ == null) {
-              Options = new global::Google.Protobuf.Reflection.MethodOptions();
-            }
-            input.ReadMessage(Options);
-            break;
-          }
-          case 40: {
-            ClientStreaming = input.ReadBool();
-            break;
-          }
-          case 48: {
-            ServerStreaming = input.ReadBool();
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 10: {
-            Name = input.ReadString();
-            break;
-          }
-          case 18: {
-            InputType = input.ReadString();
-            break;
-          }
-          case 26: {
-            OutputType = input.ReadString();
-            break;
-          }
-          case 34: {
-            if (options_ == null) {
-              Options = new global::Google.Protobuf.Reflection.MethodOptions();
-            }
-            input.ReadMessage(Options);
-            break;
-          }
-          case 40: {
-            ClientStreaming = input.ReadBool();
-            break;
-          }
-          case 48: {
-            ServerStreaming = input.ReadBool();
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  public sealed partial class FileOptions : pb::IExtendableMessage<FileOptions>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<FileOptions> _parser = new pb::MessageParser<FileOptions>(() => new FileOptions());
-    private pb::UnknownFieldSet _unknownFields;
-    internal pb::ExtensionSet<FileOptions> _extensions;
-    private pb::ExtensionSet<FileOptions> _Extensions { get { return _extensions; } }
-    private int _hasBits0;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<FileOptions> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.Reflection.DescriptorReflection.Descriptor.MessageTypes[10]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public FileOptions() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public FileOptions(FileOptions other) : this() {
-      _hasBits0 = other._hasBits0;
-      javaPackage_ = other.javaPackage_;
-      javaOuterClassname_ = other.javaOuterClassname_;
-      javaMultipleFiles_ = other.javaMultipleFiles_;
-      javaGenerateEqualsAndHash_ = other.javaGenerateEqualsAndHash_;
-      javaStringCheckUtf8_ = other.javaStringCheckUtf8_;
-      optimizeFor_ = other.optimizeFor_;
-      goPackage_ = other.goPackage_;
-      ccGenericServices_ = other.ccGenericServices_;
-      javaGenericServices_ = other.javaGenericServices_;
-      pyGenericServices_ = other.pyGenericServices_;
-      phpGenericServices_ = other.phpGenericServices_;
-      deprecated_ = other.deprecated_;
-      ccEnableArenas_ = other.ccEnableArenas_;
-      objcClassPrefix_ = other.objcClassPrefix_;
-      csharpNamespace_ = other.csharpNamespace_;
-      swiftPrefix_ = other.swiftPrefix_;
-      phpClassPrefix_ = other.phpClassPrefix_;
-      phpNamespace_ = other.phpNamespace_;
-      phpMetadataNamespace_ = other.phpMetadataNamespace_;
-      rubyPackage_ = other.rubyPackage_;
-      uninterpretedOption_ = other.uninterpretedOption_.Clone();
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-      _extensions = pb::ExtensionSet.Clone(other._extensions);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public FileOptions Clone() {
-      return new FileOptions(this);
-    }
-
-    /// <summary>Field number for the "java_package" field.</summary>
-    public const int JavaPackageFieldNumber = 1;
-    private readonly static string JavaPackageDefaultValue = "";
-
-    private string javaPackage_;
-    /// <summary>
-    /// Sets the Java package where classes generated from this .proto will be
-    /// placed.  By default, the proto package is used, but this is often
-    /// inappropriate because proto packages do not normally start with backwards
-    /// domain names.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string JavaPackage {
-      get { return javaPackage_ ?? JavaPackageDefaultValue; }
-      set {
-        javaPackage_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-    /// <summary>Gets whether the "java_package" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasJavaPackage {
-      get { return javaPackage_ != null; }
-    }
-    /// <summary>Clears the value of the "java_package" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearJavaPackage() {
-      javaPackage_ = null;
-    }
-
-    /// <summary>Field number for the "java_outer_classname" field.</summary>
-    public const int JavaOuterClassnameFieldNumber = 8;
-    private readonly static string JavaOuterClassnameDefaultValue = "";
-
-    private string javaOuterClassname_;
-    /// <summary>
-    /// Controls the name of the wrapper Java class generated for the .proto file.
-    /// That class will always contain the .proto file's getDescriptor() method as
-    /// well as any top-level extensions defined in the .proto file.
-    /// If java_multiple_files is disabled, then all the other classes from the
-    /// .proto file will be nested inside the single wrapper outer class.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string JavaOuterClassname {
-      get { return javaOuterClassname_ ?? JavaOuterClassnameDefaultValue; }
-      set {
-        javaOuterClassname_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-    /// <summary>Gets whether the "java_outer_classname" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasJavaOuterClassname {
-      get { return javaOuterClassname_ != null; }
-    }
-    /// <summary>Clears the value of the "java_outer_classname" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearJavaOuterClassname() {
-      javaOuterClassname_ = null;
-    }
-
-    /// <summary>Field number for the "java_multiple_files" field.</summary>
-    public const int JavaMultipleFilesFieldNumber = 10;
-    private readonly static bool JavaMultipleFilesDefaultValue = false;
-
-    private bool javaMultipleFiles_;
-    /// <summary>
-    /// If enabled, then the Java code generator will generate a separate .java
-    /// file for each top-level message, enum, and service defined in the .proto
-    /// file.  Thus, these types will *not* be nested inside the wrapper class
-    /// named by java_outer_classname.  However, the wrapper class will still be
-    /// generated to contain the file's getDescriptor() method as well as any
-    /// top-level extensions defined in the file.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool JavaMultipleFiles {
-      get { if ((_hasBits0 & 2) != 0) { return javaMultipleFiles_; } else { return JavaMultipleFilesDefaultValue; } }
-      set {
-        _hasBits0 |= 2;
-        javaMultipleFiles_ = value;
-      }
-    }
-    /// <summary>Gets whether the "java_multiple_files" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasJavaMultipleFiles {
-      get { return (_hasBits0 & 2) != 0; }
-    }
-    /// <summary>Clears the value of the "java_multiple_files" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearJavaMultipleFiles() {
-      _hasBits0 &= ~2;
-    }
-
-    /// <summary>Field number for the "java_generate_equals_and_hash" field.</summary>
-    public const int JavaGenerateEqualsAndHashFieldNumber = 20;
-    private readonly static bool JavaGenerateEqualsAndHashDefaultValue = false;
-
-    private bool javaGenerateEqualsAndHash_;
-    /// <summary>
-    /// This option does nothing.
-    /// </summary>
-    [global::System.ObsoleteAttribute]
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool JavaGenerateEqualsAndHash {
-      get { if ((_hasBits0 & 32) != 0) { return javaGenerateEqualsAndHash_; } else { return JavaGenerateEqualsAndHashDefaultValue; } }
-      set {
-        _hasBits0 |= 32;
-        javaGenerateEqualsAndHash_ = value;
-      }
-    }
-    /// <summary>Gets whether the "java_generate_equals_and_hash" field is set</summary>
-    [global::System.ObsoleteAttribute]
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasJavaGenerateEqualsAndHash {
-      get { return (_hasBits0 & 32) != 0; }
-    }
-    /// <summary>Clears the value of the "java_generate_equals_and_hash" field</summary>
-    [global::System.ObsoleteAttribute]
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearJavaGenerateEqualsAndHash() {
-      _hasBits0 &= ~32;
-    }
-
-    /// <summary>Field number for the "java_string_check_utf8" field.</summary>
-    public const int JavaStringCheckUtf8FieldNumber = 27;
-    private readonly static bool JavaStringCheckUtf8DefaultValue = false;
-
-    private bool javaStringCheckUtf8_;
-    /// <summary>
-    /// If set true, then the Java2 code generator will generate code that
-    /// throws an exception whenever an attempt is made to assign a non-UTF-8
-    /// byte sequence to a string field.
-    /// Message reflection will do the same.
-    /// However, an extension field still accepts non-UTF-8 byte sequences.
-    /// This option has no effect on when used with the lite runtime.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool JavaStringCheckUtf8 {
-      get { if ((_hasBits0 & 128) != 0) { return javaStringCheckUtf8_; } else { return JavaStringCheckUtf8DefaultValue; } }
-      set {
-        _hasBits0 |= 128;
-        javaStringCheckUtf8_ = value;
-      }
-    }
-    /// <summary>Gets whether the "java_string_check_utf8" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasJavaStringCheckUtf8 {
-      get { return (_hasBits0 & 128) != 0; }
-    }
-    /// <summary>Clears the value of the "java_string_check_utf8" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearJavaStringCheckUtf8() {
-      _hasBits0 &= ~128;
-    }
-
-    /// <summary>Field number for the "optimize_for" field.</summary>
-    public const int OptimizeForFieldNumber = 9;
-    private readonly static global::Google.Protobuf.Reflection.FileOptions.Types.OptimizeMode OptimizeForDefaultValue = global::Google.Protobuf.Reflection.FileOptions.Types.OptimizeMode.Speed;
-
-    private global::Google.Protobuf.Reflection.FileOptions.Types.OptimizeMode optimizeFor_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.Reflection.FileOptions.Types.OptimizeMode OptimizeFor {
-      get { if ((_hasBits0 & 1) != 0) { return optimizeFor_; } else { return OptimizeForDefaultValue; } }
-      set {
-        _hasBits0 |= 1;
-        optimizeFor_ = value;
-      }
-    }
-    /// <summary>Gets whether the "optimize_for" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasOptimizeFor {
-      get { return (_hasBits0 & 1) != 0; }
-    }
-    /// <summary>Clears the value of the "optimize_for" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearOptimizeFor() {
-      _hasBits0 &= ~1;
-    }
-
-    /// <summary>Field number for the "go_package" field.</summary>
-    public const int GoPackageFieldNumber = 11;
-    private readonly static string GoPackageDefaultValue = "";
-
-    private string goPackage_;
-    /// <summary>
-    /// Sets the Go package where structs generated from this .proto will be
-    /// placed. If omitted, the Go package will be derived from the following:
-    ///   - The basename of the package import path, if provided.
-    ///   - Otherwise, the package statement in the .proto file, if present.
-    ///   - Otherwise, the basename of the .proto file, without extension.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string GoPackage {
-      get { return goPackage_ ?? GoPackageDefaultValue; }
-      set {
-        goPackage_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-    /// <summary>Gets whether the "go_package" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasGoPackage {
-      get { return goPackage_ != null; }
-    }
-    /// <summary>Clears the value of the "go_package" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearGoPackage() {
-      goPackage_ = null;
-    }
-
-    /// <summary>Field number for the "cc_generic_services" field.</summary>
-    public const int CcGenericServicesFieldNumber = 16;
-    private readonly static bool CcGenericServicesDefaultValue = false;
-
-    private bool ccGenericServices_;
-    /// <summary>
-    /// Should generic services be generated in each language?  "Generic" services
-    /// are not specific to any particular RPC system.  They are generated by the
-    /// main code generators in each language (without additional plugins).
-    /// Generic services were the only kind of service generation supported by
-    /// early versions of google.protobuf.
-    ///
-    /// Generic services are now considered deprecated in favor of using plugins
-    /// that generate code specific to your particular RPC system.  Therefore,
-    /// these default to false.  Old code which depends on generic services should
-    /// explicitly set them to true.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool CcGenericServices {
-      get { if ((_hasBits0 & 4) != 0) { return ccGenericServices_; } else { return CcGenericServicesDefaultValue; } }
-      set {
-        _hasBits0 |= 4;
-        ccGenericServices_ = value;
-      }
-    }
-    /// <summary>Gets whether the "cc_generic_services" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasCcGenericServices {
-      get { return (_hasBits0 & 4) != 0; }
-    }
-    /// <summary>Clears the value of the "cc_generic_services" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearCcGenericServices() {
-      _hasBits0 &= ~4;
-    }
-
-    /// <summary>Field number for the "java_generic_services" field.</summary>
-    public const int JavaGenericServicesFieldNumber = 17;
-    private readonly static bool JavaGenericServicesDefaultValue = false;
-
-    private bool javaGenericServices_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool JavaGenericServices {
-      get { if ((_hasBits0 & 8) != 0) { return javaGenericServices_; } else { return JavaGenericServicesDefaultValue; } }
-      set {
-        _hasBits0 |= 8;
-        javaGenericServices_ = value;
-      }
-    }
-    /// <summary>Gets whether the "java_generic_services" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasJavaGenericServices {
-      get { return (_hasBits0 & 8) != 0; }
-    }
-    /// <summary>Clears the value of the "java_generic_services" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearJavaGenericServices() {
-      _hasBits0 &= ~8;
-    }
-
-    /// <summary>Field number for the "py_generic_services" field.</summary>
-    public const int PyGenericServicesFieldNumber = 18;
-    private readonly static bool PyGenericServicesDefaultValue = false;
-
-    private bool pyGenericServices_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool PyGenericServices {
-      get { if ((_hasBits0 & 16) != 0) { return pyGenericServices_; } else { return PyGenericServicesDefaultValue; } }
-      set {
-        _hasBits0 |= 16;
-        pyGenericServices_ = value;
-      }
-    }
-    /// <summary>Gets whether the "py_generic_services" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasPyGenericServices {
-      get { return (_hasBits0 & 16) != 0; }
-    }
-    /// <summary>Clears the value of the "py_generic_services" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearPyGenericServices() {
-      _hasBits0 &= ~16;
-    }
-
-    /// <summary>Field number for the "php_generic_services" field.</summary>
-    public const int PhpGenericServicesFieldNumber = 42;
-    private readonly static bool PhpGenericServicesDefaultValue = false;
-
-    private bool phpGenericServices_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool PhpGenericServices {
-      get { if ((_hasBits0 & 512) != 0) { return phpGenericServices_; } else { return PhpGenericServicesDefaultValue; } }
-      set {
-        _hasBits0 |= 512;
-        phpGenericServices_ = value;
-      }
-    }
-    /// <summary>Gets whether the "php_generic_services" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasPhpGenericServices {
-      get { return (_hasBits0 & 512) != 0; }
-    }
-    /// <summary>Clears the value of the "php_generic_services" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearPhpGenericServices() {
-      _hasBits0 &= ~512;
-    }
-
-    /// <summary>Field number for the "deprecated" field.</summary>
-    public const int DeprecatedFieldNumber = 23;
-    private readonly static bool DeprecatedDefaultValue = false;
-
-    private bool deprecated_;
-    /// <summary>
-    /// Is this file deprecated?
-    /// Depending on the target platform, this can emit Deprecated annotations
-    /// for everything in the file, or it will be completely ignored; in the very
-    /// least, this is a formalization for deprecating files.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Deprecated {
-      get { if ((_hasBits0 & 64) != 0) { return deprecated_; } else { return DeprecatedDefaultValue; } }
-      set {
-        _hasBits0 |= 64;
-        deprecated_ = value;
-      }
-    }
-    /// <summary>Gets whether the "deprecated" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasDeprecated {
-      get { return (_hasBits0 & 64) != 0; }
-    }
-    /// <summary>Clears the value of the "deprecated" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearDeprecated() {
-      _hasBits0 &= ~64;
-    }
-
-    /// <summary>Field number for the "cc_enable_arenas" field.</summary>
-    public const int CcEnableArenasFieldNumber = 31;
-    private readonly static bool CcEnableArenasDefaultValue = true;
-
-    private bool ccEnableArenas_;
-    /// <summary>
-    /// Enables the use of arenas for the proto messages in this file. This applies
-    /// only to generated classes for C++.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool CcEnableArenas {
-      get { if ((_hasBits0 & 256) != 0) { return ccEnableArenas_; } else { return CcEnableArenasDefaultValue; } }
-      set {
-        _hasBits0 |= 256;
-        ccEnableArenas_ = value;
-      }
-    }
-    /// <summary>Gets whether the "cc_enable_arenas" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasCcEnableArenas {
-      get { return (_hasBits0 & 256) != 0; }
-    }
-    /// <summary>Clears the value of the "cc_enable_arenas" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearCcEnableArenas() {
-      _hasBits0 &= ~256;
-    }
-
-    /// <summary>Field number for the "objc_class_prefix" field.</summary>
-    public const int ObjcClassPrefixFieldNumber = 36;
-    private readonly static string ObjcClassPrefixDefaultValue = "";
-
-    private string objcClassPrefix_;
-    /// <summary>
-    /// Sets the objective c class prefix which is prepended to all objective c
-    /// generated classes from this .proto. There is no default.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string ObjcClassPrefix {
-      get { return objcClassPrefix_ ?? ObjcClassPrefixDefaultValue; }
-      set {
-        objcClassPrefix_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-    /// <summary>Gets whether the "objc_class_prefix" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasObjcClassPrefix {
-      get { return objcClassPrefix_ != null; }
-    }
-    /// <summary>Clears the value of the "objc_class_prefix" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearObjcClassPrefix() {
-      objcClassPrefix_ = null;
-    }
-
-    /// <summary>Field number for the "csharp_namespace" field.</summary>
-    public const int CsharpNamespaceFieldNumber = 37;
-    private readonly static string CsharpNamespaceDefaultValue = "";
-
-    private string csharpNamespace_;
-    /// <summary>
-    /// Namespace for generated classes; defaults to the package.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string CsharpNamespace {
-      get { return csharpNamespace_ ?? CsharpNamespaceDefaultValue; }
-      set {
-        csharpNamespace_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-    /// <summary>Gets whether the "csharp_namespace" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasCsharpNamespace {
-      get { return csharpNamespace_ != null; }
-    }
-    /// <summary>Clears the value of the "csharp_namespace" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearCsharpNamespace() {
-      csharpNamespace_ = null;
-    }
-
-    /// <summary>Field number for the "swift_prefix" field.</summary>
-    public const int SwiftPrefixFieldNumber = 39;
-    private readonly static string SwiftPrefixDefaultValue = "";
-
-    private string swiftPrefix_;
-    /// <summary>
-    /// By default Swift generators will take the proto package and CamelCase it
-    /// replacing '.' with underscore and use that to prefix the types/symbols
-    /// defined. When this options is provided, they will use this value instead
-    /// to prefix the types/symbols defined.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string SwiftPrefix {
-      get { return swiftPrefix_ ?? SwiftPrefixDefaultValue; }
-      set {
-        swiftPrefix_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-    /// <summary>Gets whether the "swift_prefix" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasSwiftPrefix {
-      get { return swiftPrefix_ != null; }
-    }
-    /// <summary>Clears the value of the "swift_prefix" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearSwiftPrefix() {
-      swiftPrefix_ = null;
-    }
-
-    /// <summary>Field number for the "php_class_prefix" field.</summary>
-    public const int PhpClassPrefixFieldNumber = 40;
-    private readonly static string PhpClassPrefixDefaultValue = "";
-
-    private string phpClassPrefix_;
-    /// <summary>
-    /// Sets the php class prefix which is prepended to all php generated classes
-    /// from this .proto. Default is empty.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string PhpClassPrefix {
-      get { return phpClassPrefix_ ?? PhpClassPrefixDefaultValue; }
-      set {
-        phpClassPrefix_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-    /// <summary>Gets whether the "php_class_prefix" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasPhpClassPrefix {
-      get { return phpClassPrefix_ != null; }
-    }
-    /// <summary>Clears the value of the "php_class_prefix" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearPhpClassPrefix() {
-      phpClassPrefix_ = null;
-    }
-
-    /// <summary>Field number for the "php_namespace" field.</summary>
-    public const int PhpNamespaceFieldNumber = 41;
-    private readonly static string PhpNamespaceDefaultValue = "";
-
-    private string phpNamespace_;
-    /// <summary>
-    /// Use this option to change the namespace of php generated classes. Default
-    /// is empty. When this option is empty, the package name will be used for
-    /// determining the namespace.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string PhpNamespace {
-      get { return phpNamespace_ ?? PhpNamespaceDefaultValue; }
-      set {
-        phpNamespace_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-    /// <summary>Gets whether the "php_namespace" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasPhpNamespace {
-      get { return phpNamespace_ != null; }
-    }
-    /// <summary>Clears the value of the "php_namespace" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearPhpNamespace() {
-      phpNamespace_ = null;
-    }
-
-    /// <summary>Field number for the "php_metadata_namespace" field.</summary>
-    public const int PhpMetadataNamespaceFieldNumber = 44;
-    private readonly static string PhpMetadataNamespaceDefaultValue = "";
-
-    private string phpMetadataNamespace_;
-    /// <summary>
-    /// Use this option to change the namespace of php generated metadata classes.
-    /// Default is empty. When this option is empty, the proto file name will be
-    /// used for determining the namespace.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string PhpMetadataNamespace {
-      get { return phpMetadataNamespace_ ?? PhpMetadataNamespaceDefaultValue; }
-      set {
-        phpMetadataNamespace_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-    /// <summary>Gets whether the "php_metadata_namespace" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasPhpMetadataNamespace {
-      get { return phpMetadataNamespace_ != null; }
-    }
-    /// <summary>Clears the value of the "php_metadata_namespace" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearPhpMetadataNamespace() {
-      phpMetadataNamespace_ = null;
-    }
-
-    /// <summary>Field number for the "ruby_package" field.</summary>
-    public const int RubyPackageFieldNumber = 45;
-    private readonly static string RubyPackageDefaultValue = "";
-
-    private string rubyPackage_;
-    /// <summary>
-    /// Use this option to change the package of ruby generated classes. Default
-    /// is empty. When this option is not set, the package name will be used for
-    /// determining the ruby package.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string RubyPackage {
-      get { return rubyPackage_ ?? RubyPackageDefaultValue; }
-      set {
-        rubyPackage_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-    /// <summary>Gets whether the "ruby_package" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasRubyPackage {
-      get { return rubyPackage_ != null; }
-    }
-    /// <summary>Clears the value of the "ruby_package" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearRubyPackage() {
-      rubyPackage_ = null;
-    }
-
-    /// <summary>Field number for the "uninterpreted_option" field.</summary>
-    public const int UninterpretedOptionFieldNumber = 999;
-    private static readonly pb::FieldCodec<global::Google.Protobuf.Reflection.UninterpretedOption> _repeated_uninterpretedOption_codec
-        = pb::FieldCodec.ForMessage(7994, global::Google.Protobuf.Reflection.UninterpretedOption.Parser);
-    private readonly pbc::RepeatedField<global::Google.Protobuf.Reflection.UninterpretedOption> uninterpretedOption_ = new pbc::RepeatedField<global::Google.Protobuf.Reflection.UninterpretedOption>();
-    /// <summary>
-    /// The parser stores options it doesn't recognize here.
-    /// See the documentation for the "Options" section above.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Google.Protobuf.Reflection.UninterpretedOption> UninterpretedOption {
-      get { return uninterpretedOption_; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as FileOptions);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(FileOptions other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (JavaPackage != other.JavaPackage) return false;
-      if (JavaOuterClassname != other.JavaOuterClassname) return false;
-      if (JavaMultipleFiles != other.JavaMultipleFiles) return false;
-      if (JavaGenerateEqualsAndHash != other.JavaGenerateEqualsAndHash) return false;
-      if (JavaStringCheckUtf8 != other.JavaStringCheckUtf8) return false;
-      if (OptimizeFor != other.OptimizeFor) return false;
-      if (GoPackage != other.GoPackage) return false;
-      if (CcGenericServices != other.CcGenericServices) return false;
-      if (JavaGenericServices != other.JavaGenericServices) return false;
-      if (PyGenericServices != other.PyGenericServices) return false;
-      if (PhpGenericServices != other.PhpGenericServices) return false;
-      if (Deprecated != other.Deprecated) return false;
-      if (CcEnableArenas != other.CcEnableArenas) return false;
-      if (ObjcClassPrefix != other.ObjcClassPrefix) return false;
-      if (CsharpNamespace != other.CsharpNamespace) return false;
-      if (SwiftPrefix != other.SwiftPrefix) return false;
-      if (PhpClassPrefix != other.PhpClassPrefix) return false;
-      if (PhpNamespace != other.PhpNamespace) return false;
-      if (PhpMetadataNamespace != other.PhpMetadataNamespace) return false;
-      if (RubyPackage != other.RubyPackage) return false;
-      if(!uninterpretedOption_.Equals(other.uninterpretedOption_)) return false;
-      if (!Equals(_extensions, other._extensions)) {
-        return false;
-      }
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (HasJavaPackage) hash ^= JavaPackage.GetHashCode();
-      if (HasJavaOuterClassname) hash ^= JavaOuterClassname.GetHashCode();
-      if (HasJavaMultipleFiles) hash ^= JavaMultipleFiles.GetHashCode();
-      if (HasJavaGenerateEqualsAndHash) hash ^= JavaGenerateEqualsAndHash.GetHashCode();
-      if (HasJavaStringCheckUtf8) hash ^= JavaStringCheckUtf8.GetHashCode();
-      if (HasOptimizeFor) hash ^= OptimizeFor.GetHashCode();
-      if (HasGoPackage) hash ^= GoPackage.GetHashCode();
-      if (HasCcGenericServices) hash ^= CcGenericServices.GetHashCode();
-      if (HasJavaGenericServices) hash ^= JavaGenericServices.GetHashCode();
-      if (HasPyGenericServices) hash ^= PyGenericServices.GetHashCode();
-      if (HasPhpGenericServices) hash ^= PhpGenericServices.GetHashCode();
-      if (HasDeprecated) hash ^= Deprecated.GetHashCode();
-      if (HasCcEnableArenas) hash ^= CcEnableArenas.GetHashCode();
-      if (HasObjcClassPrefix) hash ^= ObjcClassPrefix.GetHashCode();
-      if (HasCsharpNamespace) hash ^= CsharpNamespace.GetHashCode();
-      if (HasSwiftPrefix) hash ^= SwiftPrefix.GetHashCode();
-      if (HasPhpClassPrefix) hash ^= PhpClassPrefix.GetHashCode();
-      if (HasPhpNamespace) hash ^= PhpNamespace.GetHashCode();
-      if (HasPhpMetadataNamespace) hash ^= PhpMetadataNamespace.GetHashCode();
-      if (HasRubyPackage) hash ^= RubyPackage.GetHashCode();
-      hash ^= uninterpretedOption_.GetHashCode();
-      if (_extensions != null) {
-        hash ^= _extensions.GetHashCode();
-      }
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (HasJavaPackage) {
-        output.WriteRawTag(10);
-        output.WriteString(JavaPackage);
-      }
-      if (HasJavaOuterClassname) {
-        output.WriteRawTag(66);
-        output.WriteString(JavaOuterClassname);
-      }
-      if (HasOptimizeFor) {
-        output.WriteRawTag(72);
-        output.WriteEnum((int) OptimizeFor);
-      }
-      if (HasJavaMultipleFiles) {
-        output.WriteRawTag(80);
-        output.WriteBool(JavaMultipleFiles);
-      }
-      if (HasGoPackage) {
-        output.WriteRawTag(90);
-        output.WriteString(GoPackage);
-      }
-      if (HasCcGenericServices) {
-        output.WriteRawTag(128, 1);
-        output.WriteBool(CcGenericServices);
-      }
-      if (HasJavaGenericServices) {
-        output.WriteRawTag(136, 1);
-        output.WriteBool(JavaGenericServices);
-      }
-      if (HasPyGenericServices) {
-        output.WriteRawTag(144, 1);
-        output.WriteBool(PyGenericServices);
-      }
-      if (HasJavaGenerateEqualsAndHash) {
-        output.WriteRawTag(160, 1);
-        output.WriteBool(JavaGenerateEqualsAndHash);
-      }
-      if (HasDeprecated) {
-        output.WriteRawTag(184, 1);
-        output.WriteBool(Deprecated);
-      }
-      if (HasJavaStringCheckUtf8) {
-        output.WriteRawTag(216, 1);
-        output.WriteBool(JavaStringCheckUtf8);
-      }
-      if (HasCcEnableArenas) {
-        output.WriteRawTag(248, 1);
-        output.WriteBool(CcEnableArenas);
-      }
-      if (HasObjcClassPrefix) {
-        output.WriteRawTag(162, 2);
-        output.WriteString(ObjcClassPrefix);
-      }
-      if (HasCsharpNamespace) {
-        output.WriteRawTag(170, 2);
-        output.WriteString(CsharpNamespace);
-      }
-      if (HasSwiftPrefix) {
-        output.WriteRawTag(186, 2);
-        output.WriteString(SwiftPrefix);
-      }
-      if (HasPhpClassPrefix) {
-        output.WriteRawTag(194, 2);
-        output.WriteString(PhpClassPrefix);
-      }
-      if (HasPhpNamespace) {
-        output.WriteRawTag(202, 2);
-        output.WriteString(PhpNamespace);
-      }
-      if (HasPhpGenericServices) {
-        output.WriteRawTag(208, 2);
-        output.WriteBool(PhpGenericServices);
-      }
-      if (HasPhpMetadataNamespace) {
-        output.WriteRawTag(226, 2);
-        output.WriteString(PhpMetadataNamespace);
-      }
-      if (HasRubyPackage) {
-        output.WriteRawTag(234, 2);
-        output.WriteString(RubyPackage);
-      }
-      uninterpretedOption_.WriteTo(output, _repeated_uninterpretedOption_codec);
-      if (_extensions != null) {
-        _extensions.WriteTo(output);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (HasJavaPackage) {
-        output.WriteRawTag(10);
-        output.WriteString(JavaPackage);
-      }
-      if (HasJavaOuterClassname) {
-        output.WriteRawTag(66);
-        output.WriteString(JavaOuterClassname);
-      }
-      if (HasOptimizeFor) {
-        output.WriteRawTag(72);
-        output.WriteEnum((int) OptimizeFor);
-      }
-      if (HasJavaMultipleFiles) {
-        output.WriteRawTag(80);
-        output.WriteBool(JavaMultipleFiles);
-      }
-      if (HasGoPackage) {
-        output.WriteRawTag(90);
-        output.WriteString(GoPackage);
-      }
-      if (HasCcGenericServices) {
-        output.WriteRawTag(128, 1);
-        output.WriteBool(CcGenericServices);
-      }
-      if (HasJavaGenericServices) {
-        output.WriteRawTag(136, 1);
-        output.WriteBool(JavaGenericServices);
-      }
-      if (HasPyGenericServices) {
-        output.WriteRawTag(144, 1);
-        output.WriteBool(PyGenericServices);
-      }
-      if (HasJavaGenerateEqualsAndHash) {
-        output.WriteRawTag(160, 1);
-        output.WriteBool(JavaGenerateEqualsAndHash);
-      }
-      if (HasDeprecated) {
-        output.WriteRawTag(184, 1);
-        output.WriteBool(Deprecated);
-      }
-      if (HasJavaStringCheckUtf8) {
-        output.WriteRawTag(216, 1);
-        output.WriteBool(JavaStringCheckUtf8);
-      }
-      if (HasCcEnableArenas) {
-        output.WriteRawTag(248, 1);
-        output.WriteBool(CcEnableArenas);
-      }
-      if (HasObjcClassPrefix) {
-        output.WriteRawTag(162, 2);
-        output.WriteString(ObjcClassPrefix);
-      }
-      if (HasCsharpNamespace) {
-        output.WriteRawTag(170, 2);
-        output.WriteString(CsharpNamespace);
-      }
-      if (HasSwiftPrefix) {
-        output.WriteRawTag(186, 2);
-        output.WriteString(SwiftPrefix);
-      }
-      if (HasPhpClassPrefix) {
-        output.WriteRawTag(194, 2);
-        output.WriteString(PhpClassPrefix);
-      }
-      if (HasPhpNamespace) {
-        output.WriteRawTag(202, 2);
-        output.WriteString(PhpNamespace);
-      }
-      if (HasPhpGenericServices) {
-        output.WriteRawTag(208, 2);
-        output.WriteBool(PhpGenericServices);
-      }
-      if (HasPhpMetadataNamespace) {
-        output.WriteRawTag(226, 2);
-        output.WriteString(PhpMetadataNamespace);
-      }
-      if (HasRubyPackage) {
-        output.WriteRawTag(234, 2);
-        output.WriteString(RubyPackage);
-      }
-      uninterpretedOption_.WriteTo(ref output, _repeated_uninterpretedOption_codec);
-      if (_extensions != null) {
-        _extensions.WriteTo(ref output);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (HasJavaPackage) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(JavaPackage);
-      }
-      if (HasJavaOuterClassname) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(JavaOuterClassname);
-      }
-      if (HasJavaMultipleFiles) {
-        size += 1 + 1;
-      }
-      if (HasJavaGenerateEqualsAndHash) {
-        size += 2 + 1;
-      }
-      if (HasJavaStringCheckUtf8) {
-        size += 2 + 1;
-      }
-      if (HasOptimizeFor) {
-        size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) OptimizeFor);
-      }
-      if (HasGoPackage) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(GoPackage);
-      }
-      if (HasCcGenericServices) {
-        size += 2 + 1;
-      }
-      if (HasJavaGenericServices) {
-        size += 2 + 1;
-      }
-      if (HasPyGenericServices) {
-        size += 2 + 1;
-      }
-      if (HasPhpGenericServices) {
-        size += 2 + 1;
-      }
-      if (HasDeprecated) {
-        size += 2 + 1;
-      }
-      if (HasCcEnableArenas) {
-        size += 2 + 1;
-      }
-      if (HasObjcClassPrefix) {
-        size += 2 + pb::CodedOutputStream.ComputeStringSize(ObjcClassPrefix);
-      }
-      if (HasCsharpNamespace) {
-        size += 2 + pb::CodedOutputStream.ComputeStringSize(CsharpNamespace);
-      }
-      if (HasSwiftPrefix) {
-        size += 2 + pb::CodedOutputStream.ComputeStringSize(SwiftPrefix);
-      }
-      if (HasPhpClassPrefix) {
-        size += 2 + pb::CodedOutputStream.ComputeStringSize(PhpClassPrefix);
-      }
-      if (HasPhpNamespace) {
-        size += 2 + pb::CodedOutputStream.ComputeStringSize(PhpNamespace);
-      }
-      if (HasPhpMetadataNamespace) {
-        size += 2 + pb::CodedOutputStream.ComputeStringSize(PhpMetadataNamespace);
-      }
-      if (HasRubyPackage) {
-        size += 2 + pb::CodedOutputStream.ComputeStringSize(RubyPackage);
-      }
-      size += uninterpretedOption_.CalculateSize(_repeated_uninterpretedOption_codec);
-      if (_extensions != null) {
-        size += _extensions.CalculateSize();
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(FileOptions other) {
-      if (other == null) {
-        return;
-      }
-      if (other.HasJavaPackage) {
-        JavaPackage = other.JavaPackage;
-      }
-      if (other.HasJavaOuterClassname) {
-        JavaOuterClassname = other.JavaOuterClassname;
-      }
-      if (other.HasJavaMultipleFiles) {
-        JavaMultipleFiles = other.JavaMultipleFiles;
-      }
-      if (other.HasJavaGenerateEqualsAndHash) {
-        JavaGenerateEqualsAndHash = other.JavaGenerateEqualsAndHash;
-      }
-      if (other.HasJavaStringCheckUtf8) {
-        JavaStringCheckUtf8 = other.JavaStringCheckUtf8;
-      }
-      if (other.HasOptimizeFor) {
-        OptimizeFor = other.OptimizeFor;
-      }
-      if (other.HasGoPackage) {
-        GoPackage = other.GoPackage;
-      }
-      if (other.HasCcGenericServices) {
-        CcGenericServices = other.CcGenericServices;
-      }
-      if (other.HasJavaGenericServices) {
-        JavaGenericServices = other.JavaGenericServices;
-      }
-      if (other.HasPyGenericServices) {
-        PyGenericServices = other.PyGenericServices;
-      }
-      if (other.HasPhpGenericServices) {
-        PhpGenericServices = other.PhpGenericServices;
-      }
-      if (other.HasDeprecated) {
-        Deprecated = other.Deprecated;
-      }
-      if (other.HasCcEnableArenas) {
-        CcEnableArenas = other.CcEnableArenas;
-      }
-      if (other.HasObjcClassPrefix) {
-        ObjcClassPrefix = other.ObjcClassPrefix;
-      }
-      if (other.HasCsharpNamespace) {
-        CsharpNamespace = other.CsharpNamespace;
-      }
-      if (other.HasSwiftPrefix) {
-        SwiftPrefix = other.SwiftPrefix;
-      }
-      if (other.HasPhpClassPrefix) {
-        PhpClassPrefix = other.PhpClassPrefix;
-      }
-      if (other.HasPhpNamespace) {
-        PhpNamespace = other.PhpNamespace;
-      }
-      if (other.HasPhpMetadataNamespace) {
-        PhpMetadataNamespace = other.PhpMetadataNamespace;
-      }
-      if (other.HasRubyPackage) {
-        RubyPackage = other.RubyPackage;
-      }
-      uninterpretedOption_.Add(other.uninterpretedOption_);
-      pb::ExtensionSet.MergeFrom(ref _extensions, other._extensions);
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            if (!pb::ExtensionSet.TryMergeFieldFrom(ref _extensions, input)) {
-              _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            }
-            break;
-          case 10: {
-            JavaPackage = input.ReadString();
-            break;
-          }
-          case 66: {
-            JavaOuterClassname = input.ReadString();
-            break;
-          }
-          case 72: {
-            OptimizeFor = (global::Google.Protobuf.Reflection.FileOptions.Types.OptimizeMode) input.ReadEnum();
-            break;
-          }
-          case 80: {
-            JavaMultipleFiles = input.ReadBool();
-            break;
-          }
-          case 90: {
-            GoPackage = input.ReadString();
-            break;
-          }
-          case 128: {
-            CcGenericServices = input.ReadBool();
-            break;
-          }
-          case 136: {
-            JavaGenericServices = input.ReadBool();
-            break;
-          }
-          case 144: {
-            PyGenericServices = input.ReadBool();
-            break;
-          }
-          case 160: {
-            JavaGenerateEqualsAndHash = input.ReadBool();
-            break;
-          }
-          case 184: {
-            Deprecated = input.ReadBool();
-            break;
-          }
-          case 216: {
-            JavaStringCheckUtf8 = input.ReadBool();
-            break;
-          }
-          case 248: {
-            CcEnableArenas = input.ReadBool();
-            break;
-          }
-          case 290: {
-            ObjcClassPrefix = input.ReadString();
-            break;
-          }
-          case 298: {
-            CsharpNamespace = input.ReadString();
-            break;
-          }
-          case 314: {
-            SwiftPrefix = input.ReadString();
-            break;
-          }
-          case 322: {
-            PhpClassPrefix = input.ReadString();
-            break;
-          }
-          case 330: {
-            PhpNamespace = input.ReadString();
-            break;
-          }
-          case 336: {
-            PhpGenericServices = input.ReadBool();
-            break;
-          }
-          case 354: {
-            PhpMetadataNamespace = input.ReadString();
-            break;
-          }
-          case 362: {
-            RubyPackage = input.ReadString();
-            break;
-          }
-          case 7994: {
-            uninterpretedOption_.AddEntriesFrom(input, _repeated_uninterpretedOption_codec);
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            if (!pb::ExtensionSet.TryMergeFieldFrom(ref _extensions, ref input)) {
-              _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            }
-            break;
-          case 10: {
-            JavaPackage = input.ReadString();
-            break;
-          }
-          case 66: {
-            JavaOuterClassname = input.ReadString();
-            break;
-          }
-          case 72: {
-            OptimizeFor = (global::Google.Protobuf.Reflection.FileOptions.Types.OptimizeMode) input.ReadEnum();
-            break;
-          }
-          case 80: {
-            JavaMultipleFiles = input.ReadBool();
-            break;
-          }
-          case 90: {
-            GoPackage = input.ReadString();
-            break;
-          }
-          case 128: {
-            CcGenericServices = input.ReadBool();
-            break;
-          }
-          case 136: {
-            JavaGenericServices = input.ReadBool();
-            break;
-          }
-          case 144: {
-            PyGenericServices = input.ReadBool();
-            break;
-          }
-          case 160: {
-            JavaGenerateEqualsAndHash = input.ReadBool();
-            break;
-          }
-          case 184: {
-            Deprecated = input.ReadBool();
-            break;
-          }
-          case 216: {
-            JavaStringCheckUtf8 = input.ReadBool();
-            break;
-          }
-          case 248: {
-            CcEnableArenas = input.ReadBool();
-            break;
-          }
-          case 290: {
-            ObjcClassPrefix = input.ReadString();
-            break;
-          }
-          case 298: {
-            CsharpNamespace = input.ReadString();
-            break;
-          }
-          case 314: {
-            SwiftPrefix = input.ReadString();
-            break;
-          }
-          case 322: {
-            PhpClassPrefix = input.ReadString();
-            break;
-          }
-          case 330: {
-            PhpNamespace = input.ReadString();
-            break;
-          }
-          case 336: {
-            PhpGenericServices = input.ReadBool();
-            break;
-          }
-          case 354: {
-            PhpMetadataNamespace = input.ReadString();
-            break;
-          }
-          case 362: {
-            RubyPackage = input.ReadString();
-            break;
-          }
-          case 7994: {
-            uninterpretedOption_.AddEntriesFrom(ref input, _repeated_uninterpretedOption_codec);
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-    public TValue GetExtension<TValue>(pb::Extension<FileOptions, TValue> extension) {
-      return pb::ExtensionSet.Get(ref _extensions, extension);
-    }
-    public pbc::RepeatedField<TValue> GetExtension<TValue>(pb::RepeatedExtension<FileOptions, TValue> extension) {
-      return pb::ExtensionSet.Get(ref _extensions, extension);
-    }
-    public pbc::RepeatedField<TValue> GetOrInitializeExtension<TValue>(pb::RepeatedExtension<FileOptions, TValue> extension) {
-      return pb::ExtensionSet.GetOrInitialize(ref _extensions, extension);
-    }
-    public void SetExtension<TValue>(pb::Extension<FileOptions, TValue> extension, TValue value) {
-      pb::ExtensionSet.Set(ref _extensions, extension, value);
-    }
-    public bool HasExtension<TValue>(pb::Extension<FileOptions, TValue> extension) {
-      return pb::ExtensionSet.Has(ref _extensions, extension);
-    }
-    public void ClearExtension<TValue>(pb::Extension<FileOptions, TValue> extension) {
-      pb::ExtensionSet.Clear(ref _extensions, extension);
-    }
-    public void ClearExtension<TValue>(pb::RepeatedExtension<FileOptions, TValue> extension) {
-      pb::ExtensionSet.Clear(ref _extensions, extension);
-    }
-
-    #region Nested types
-    /// <summary>Container for nested types declared in the FileOptions message type.</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static partial class Types {
-      /// <summary>
-      /// Generated classes can be optimized for speed or code size.
-      /// </summary>
-      public enum OptimizeMode {
-        /// <summary>
-        /// Generate complete code for parsing, serialization,
-        /// </summary>
-        [pbr::OriginalName("SPEED")] Speed = 1,
-        /// <summary>
-        /// etc.
-        /// </summary>
-        [pbr::OriginalName("CODE_SIZE")] CodeSize = 2,
-        /// <summary>
-        /// Generate code using MessageLite and the lite runtime.
-        /// </summary>
-        [pbr::OriginalName("LITE_RUNTIME")] LiteRuntime = 3,
-      }
-
-    }
-    #endregion
-
-  }
-
-  public sealed partial class MessageOptions : pb::IExtendableMessage<MessageOptions>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<MessageOptions> _parser = new pb::MessageParser<MessageOptions>(() => new MessageOptions());
-    private pb::UnknownFieldSet _unknownFields;
-    internal pb::ExtensionSet<MessageOptions> _extensions;
-    private pb::ExtensionSet<MessageOptions> _Extensions { get { return _extensions; } }
-    private int _hasBits0;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<MessageOptions> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.Reflection.DescriptorReflection.Descriptor.MessageTypes[11]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public MessageOptions() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public MessageOptions(MessageOptions other) : this() {
-      _hasBits0 = other._hasBits0;
-      messageSetWireFormat_ = other.messageSetWireFormat_;
-      noStandardDescriptorAccessor_ = other.noStandardDescriptorAccessor_;
-      deprecated_ = other.deprecated_;
-      mapEntry_ = other.mapEntry_;
-      uninterpretedOption_ = other.uninterpretedOption_.Clone();
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-      _extensions = pb::ExtensionSet.Clone(other._extensions);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public MessageOptions Clone() {
-      return new MessageOptions(this);
-    }
-
-    /// <summary>Field number for the "message_set_wire_format" field.</summary>
-    public const int MessageSetWireFormatFieldNumber = 1;
-    private readonly static bool MessageSetWireFormatDefaultValue = false;
-
-    private bool messageSetWireFormat_;
-    /// <summary>
-    /// Set true to use the old proto1 MessageSet wire format for extensions.
-    /// This is provided for backwards-compatibility with the MessageSet wire
-    /// format.  You should not use this for any other reason:  It's less
-    /// efficient, has fewer features, and is more complicated.
-    ///
-    /// The message must be defined exactly as follows:
-    ///   message Foo {
-    ///     option message_set_wire_format = true;
-    ///     extensions 4 to max;
-    ///   }
-    /// Note that the message cannot have any defined fields; MessageSets only
-    /// have extensions.
-    ///
-    /// All extensions of your type must be singular messages; e.g. they cannot
-    /// be int32s, enums, or repeated messages.
-    ///
-    /// Because this is an option, the above two restrictions are not enforced by
-    /// the protocol compiler.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool MessageSetWireFormat {
-      get { if ((_hasBits0 & 1) != 0) { return messageSetWireFormat_; } else { return MessageSetWireFormatDefaultValue; } }
-      set {
-        _hasBits0 |= 1;
-        messageSetWireFormat_ = value;
-      }
-    }
-    /// <summary>Gets whether the "message_set_wire_format" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasMessageSetWireFormat {
-      get { return (_hasBits0 & 1) != 0; }
-    }
-    /// <summary>Clears the value of the "message_set_wire_format" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearMessageSetWireFormat() {
-      _hasBits0 &= ~1;
-    }
-
-    /// <summary>Field number for the "no_standard_descriptor_accessor" field.</summary>
-    public const int NoStandardDescriptorAccessorFieldNumber = 2;
-    private readonly static bool NoStandardDescriptorAccessorDefaultValue = false;
-
-    private bool noStandardDescriptorAccessor_;
-    /// <summary>
-    /// Disables the generation of the standard "descriptor()" accessor, which can
-    /// conflict with a field of the same name.  This is meant to make migration
-    /// from proto1 easier; new code should avoid fields named "descriptor".
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool NoStandardDescriptorAccessor {
-      get { if ((_hasBits0 & 2) != 0) { return noStandardDescriptorAccessor_; } else { return NoStandardDescriptorAccessorDefaultValue; } }
-      set {
-        _hasBits0 |= 2;
-        noStandardDescriptorAccessor_ = value;
-      }
-    }
-    /// <summary>Gets whether the "no_standard_descriptor_accessor" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasNoStandardDescriptorAccessor {
-      get { return (_hasBits0 & 2) != 0; }
-    }
-    /// <summary>Clears the value of the "no_standard_descriptor_accessor" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearNoStandardDescriptorAccessor() {
-      _hasBits0 &= ~2;
-    }
-
-    /// <summary>Field number for the "deprecated" field.</summary>
-    public const int DeprecatedFieldNumber = 3;
-    private readonly static bool DeprecatedDefaultValue = false;
-
-    private bool deprecated_;
-    /// <summary>
-    /// Is this message deprecated?
-    /// Depending on the target platform, this can emit Deprecated annotations
-    /// for the message, or it will be completely ignored; in the very least,
-    /// this is a formalization for deprecating messages.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Deprecated {
-      get { if ((_hasBits0 & 4) != 0) { return deprecated_; } else { return DeprecatedDefaultValue; } }
-      set {
-        _hasBits0 |= 4;
-        deprecated_ = value;
-      }
-    }
-    /// <summary>Gets whether the "deprecated" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasDeprecated {
-      get { return (_hasBits0 & 4) != 0; }
-    }
-    /// <summary>Clears the value of the "deprecated" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearDeprecated() {
-      _hasBits0 &= ~4;
-    }
-
-    /// <summary>Field number for the "map_entry" field.</summary>
-    public const int MapEntryFieldNumber = 7;
-    private readonly static bool MapEntryDefaultValue = false;
-
-    private bool mapEntry_;
-    /// <summary>
-    /// Whether the message is an automatically generated map entry type for the
-    /// maps field.
-    ///
-    /// For maps fields:
-    ///     map&lt;KeyType, ValueType> map_field = 1;
-    /// The parsed descriptor looks like:
-    ///     message MapFieldEntry {
-    ///         option map_entry = true;
-    ///         optional KeyType key = 1;
-    ///         optional ValueType value = 2;
-    ///     }
-    ///     repeated MapFieldEntry map_field = 1;
-    ///
-    /// Implementations may choose not to generate the map_entry=true message, but
-    /// use a native map in the target language to hold the keys and values.
-    /// The reflection APIs in such implementations still need to work as
-    /// if the field is a repeated message field.
-    ///
-    /// NOTE: Do not set the option in .proto files. Always use the maps syntax
-    /// instead. The option should only be implicitly set by the proto compiler
-    /// parser.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool MapEntry {
-      get { if ((_hasBits0 & 8) != 0) { return mapEntry_; } else { return MapEntryDefaultValue; } }
-      set {
-        _hasBits0 |= 8;
-        mapEntry_ = value;
-      }
-    }
-    /// <summary>Gets whether the "map_entry" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasMapEntry {
-      get { return (_hasBits0 & 8) != 0; }
-    }
-    /// <summary>Clears the value of the "map_entry" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearMapEntry() {
-      _hasBits0 &= ~8;
-    }
-
-    /// <summary>Field number for the "uninterpreted_option" field.</summary>
-    public const int UninterpretedOptionFieldNumber = 999;
-    private static readonly pb::FieldCodec<global::Google.Protobuf.Reflection.UninterpretedOption> _repeated_uninterpretedOption_codec
-        = pb::FieldCodec.ForMessage(7994, global::Google.Protobuf.Reflection.UninterpretedOption.Parser);
-    private readonly pbc::RepeatedField<global::Google.Protobuf.Reflection.UninterpretedOption> uninterpretedOption_ = new pbc::RepeatedField<global::Google.Protobuf.Reflection.UninterpretedOption>();
-    /// <summary>
-    /// The parser stores options it doesn't recognize here. See above.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Google.Protobuf.Reflection.UninterpretedOption> UninterpretedOption {
-      get { return uninterpretedOption_; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as MessageOptions);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(MessageOptions other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (MessageSetWireFormat != other.MessageSetWireFormat) return false;
-      if (NoStandardDescriptorAccessor != other.NoStandardDescriptorAccessor) return false;
-      if (Deprecated != other.Deprecated) return false;
-      if (MapEntry != other.MapEntry) return false;
-      if(!uninterpretedOption_.Equals(other.uninterpretedOption_)) return false;
-      if (!Equals(_extensions, other._extensions)) {
-        return false;
-      }
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (HasMessageSetWireFormat) hash ^= MessageSetWireFormat.GetHashCode();
-      if (HasNoStandardDescriptorAccessor) hash ^= NoStandardDescriptorAccessor.GetHashCode();
-      if (HasDeprecated) hash ^= Deprecated.GetHashCode();
-      if (HasMapEntry) hash ^= MapEntry.GetHashCode();
-      hash ^= uninterpretedOption_.GetHashCode();
-      if (_extensions != null) {
-        hash ^= _extensions.GetHashCode();
-      }
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (HasMessageSetWireFormat) {
-        output.WriteRawTag(8);
-        output.WriteBool(MessageSetWireFormat);
-      }
-      if (HasNoStandardDescriptorAccessor) {
-        output.WriteRawTag(16);
-        output.WriteBool(NoStandardDescriptorAccessor);
-      }
-      if (HasDeprecated) {
-        output.WriteRawTag(24);
-        output.WriteBool(Deprecated);
-      }
-      if (HasMapEntry) {
-        output.WriteRawTag(56);
-        output.WriteBool(MapEntry);
-      }
-      uninterpretedOption_.WriteTo(output, _repeated_uninterpretedOption_codec);
-      if (_extensions != null) {
-        _extensions.WriteTo(output);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (HasMessageSetWireFormat) {
-        output.WriteRawTag(8);
-        output.WriteBool(MessageSetWireFormat);
-      }
-      if (HasNoStandardDescriptorAccessor) {
-        output.WriteRawTag(16);
-        output.WriteBool(NoStandardDescriptorAccessor);
-      }
-      if (HasDeprecated) {
-        output.WriteRawTag(24);
-        output.WriteBool(Deprecated);
-      }
-      if (HasMapEntry) {
-        output.WriteRawTag(56);
-        output.WriteBool(MapEntry);
-      }
-      uninterpretedOption_.WriteTo(ref output, _repeated_uninterpretedOption_codec);
-      if (_extensions != null) {
-        _extensions.WriteTo(ref output);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (HasMessageSetWireFormat) {
-        size += 1 + 1;
-      }
-      if (HasNoStandardDescriptorAccessor) {
-        size += 1 + 1;
-      }
-      if (HasDeprecated) {
-        size += 1 + 1;
-      }
-      if (HasMapEntry) {
-        size += 1 + 1;
-      }
-      size += uninterpretedOption_.CalculateSize(_repeated_uninterpretedOption_codec);
-      if (_extensions != null) {
-        size += _extensions.CalculateSize();
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(MessageOptions other) {
-      if (other == null) {
-        return;
-      }
-      if (other.HasMessageSetWireFormat) {
-        MessageSetWireFormat = other.MessageSetWireFormat;
-      }
-      if (other.HasNoStandardDescriptorAccessor) {
-        NoStandardDescriptorAccessor = other.NoStandardDescriptorAccessor;
-      }
-      if (other.HasDeprecated) {
-        Deprecated = other.Deprecated;
-      }
-      if (other.HasMapEntry) {
-        MapEntry = other.MapEntry;
-      }
-      uninterpretedOption_.Add(other.uninterpretedOption_);
-      pb::ExtensionSet.MergeFrom(ref _extensions, other._extensions);
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            if (!pb::ExtensionSet.TryMergeFieldFrom(ref _extensions, input)) {
-              _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            }
-            break;
-          case 8: {
-            MessageSetWireFormat = input.ReadBool();
-            break;
-          }
-          case 16: {
-            NoStandardDescriptorAccessor = input.ReadBool();
-            break;
-          }
-          case 24: {
-            Deprecated = input.ReadBool();
-            break;
-          }
-          case 56: {
-            MapEntry = input.ReadBool();
-            break;
-          }
-          case 7994: {
-            uninterpretedOption_.AddEntriesFrom(input, _repeated_uninterpretedOption_codec);
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            if (!pb::ExtensionSet.TryMergeFieldFrom(ref _extensions, ref input)) {
-              _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            }
-            break;
-          case 8: {
-            MessageSetWireFormat = input.ReadBool();
-            break;
-          }
-          case 16: {
-            NoStandardDescriptorAccessor = input.ReadBool();
-            break;
-          }
-          case 24: {
-            Deprecated = input.ReadBool();
-            break;
-          }
-          case 56: {
-            MapEntry = input.ReadBool();
-            break;
-          }
-          case 7994: {
-            uninterpretedOption_.AddEntriesFrom(ref input, _repeated_uninterpretedOption_codec);
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-    public TValue GetExtension<TValue>(pb::Extension<MessageOptions, TValue> extension) {
-      return pb::ExtensionSet.Get(ref _extensions, extension);
-    }
-    public pbc::RepeatedField<TValue> GetExtension<TValue>(pb::RepeatedExtension<MessageOptions, TValue> extension) {
-      return pb::ExtensionSet.Get(ref _extensions, extension);
-    }
-    public pbc::RepeatedField<TValue> GetOrInitializeExtension<TValue>(pb::RepeatedExtension<MessageOptions, TValue> extension) {
-      return pb::ExtensionSet.GetOrInitialize(ref _extensions, extension);
-    }
-    public void SetExtension<TValue>(pb::Extension<MessageOptions, TValue> extension, TValue value) {
-      pb::ExtensionSet.Set(ref _extensions, extension, value);
-    }
-    public bool HasExtension<TValue>(pb::Extension<MessageOptions, TValue> extension) {
-      return pb::ExtensionSet.Has(ref _extensions, extension);
-    }
-    public void ClearExtension<TValue>(pb::Extension<MessageOptions, TValue> extension) {
-      pb::ExtensionSet.Clear(ref _extensions, extension);
-    }
-    public void ClearExtension<TValue>(pb::RepeatedExtension<MessageOptions, TValue> extension) {
-      pb::ExtensionSet.Clear(ref _extensions, extension);
-    }
-
-  }
-
-  public sealed partial class FieldOptions : pb::IExtendableMessage<FieldOptions>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<FieldOptions> _parser = new pb::MessageParser<FieldOptions>(() => new FieldOptions());
-    private pb::UnknownFieldSet _unknownFields;
-    internal pb::ExtensionSet<FieldOptions> _extensions;
-    private pb::ExtensionSet<FieldOptions> _Extensions { get { return _extensions; } }
-    private int _hasBits0;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<FieldOptions> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.Reflection.DescriptorReflection.Descriptor.MessageTypes[12]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public FieldOptions() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public FieldOptions(FieldOptions other) : this() {
-      _hasBits0 = other._hasBits0;
-      ctype_ = other.ctype_;
-      packed_ = other.packed_;
-      jstype_ = other.jstype_;
-      lazy_ = other.lazy_;
-      unverifiedLazy_ = other.unverifiedLazy_;
-      deprecated_ = other.deprecated_;
-      weak_ = other.weak_;
-      uninterpretedOption_ = other.uninterpretedOption_.Clone();
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-      _extensions = pb::ExtensionSet.Clone(other._extensions);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public FieldOptions Clone() {
-      return new FieldOptions(this);
-    }
-
-    /// <summary>Field number for the "ctype" field.</summary>
-    public const int CtypeFieldNumber = 1;
-    private readonly static global::Google.Protobuf.Reflection.FieldOptions.Types.CType CtypeDefaultValue = global::Google.Protobuf.Reflection.FieldOptions.Types.CType.String;
-
-    private global::Google.Protobuf.Reflection.FieldOptions.Types.CType ctype_;
-    /// <summary>
-    /// The ctype option instructs the C++ code generator to use a different
-    /// representation of the field than it normally would.  See the specific
-    /// options below.  This option is not yet implemented in the open source
-    /// release -- sorry, we'll try to include it in a future version!
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.Reflection.FieldOptions.Types.CType Ctype {
-      get { if ((_hasBits0 & 1) != 0) { return ctype_; } else { return CtypeDefaultValue; } }
-      set {
-        _hasBits0 |= 1;
-        ctype_ = value;
-      }
-    }
-    /// <summary>Gets whether the "ctype" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasCtype {
-      get { return (_hasBits0 & 1) != 0; }
-    }
-    /// <summary>Clears the value of the "ctype" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearCtype() {
-      _hasBits0 &= ~1;
-    }
-
-    /// <summary>Field number for the "packed" field.</summary>
-    public const int PackedFieldNumber = 2;
-    private readonly static bool PackedDefaultValue = false;
-
-    private bool packed_;
-    /// <summary>
-    /// The packed option can be enabled for repeated primitive fields to enable
-    /// a more efficient representation on the wire. Rather than repeatedly
-    /// writing the tag and type for each element, the entire array is encoded as
-    /// a single length-delimited blob. In proto3, only explicit setting it to
-    /// false will avoid using packed encoding.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Packed {
-      get { if ((_hasBits0 & 2) != 0) { return packed_; } else { return PackedDefaultValue; } }
-      set {
-        _hasBits0 |= 2;
-        packed_ = value;
-      }
-    }
-    /// <summary>Gets whether the "packed" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasPacked {
-      get { return (_hasBits0 & 2) != 0; }
-    }
-    /// <summary>Clears the value of the "packed" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearPacked() {
-      _hasBits0 &= ~2;
-    }
-
-    /// <summary>Field number for the "jstype" field.</summary>
-    public const int JstypeFieldNumber = 6;
-    private readonly static global::Google.Protobuf.Reflection.FieldOptions.Types.JSType JstypeDefaultValue = global::Google.Protobuf.Reflection.FieldOptions.Types.JSType.JsNormal;
-
-    private global::Google.Protobuf.Reflection.FieldOptions.Types.JSType jstype_;
-    /// <summary>
-    /// The jstype option determines the JavaScript type used for values of the
-    /// field.  The option is permitted only for 64 bit integral and fixed types
-    /// (int64, uint64, sint64, fixed64, sfixed64).  A field with jstype JS_STRING
-    /// is represented as JavaScript string, which avoids loss of precision that
-    /// can happen when a large value is converted to a floating point JavaScript.
-    /// Specifying JS_NUMBER for the jstype causes the generated JavaScript code to
-    /// use the JavaScript "number" type.  The behavior of the default option
-    /// JS_NORMAL is implementation dependent.
-    ///
-    /// This option is an enum to permit additional types to be added, e.g.
-    /// goog.math.Integer.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.Reflection.FieldOptions.Types.JSType Jstype {
-      get { if ((_hasBits0 & 16) != 0) { return jstype_; } else { return JstypeDefaultValue; } }
-      set {
-        _hasBits0 |= 16;
-        jstype_ = value;
-      }
-    }
-    /// <summary>Gets whether the "jstype" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasJstype {
-      get { return (_hasBits0 & 16) != 0; }
-    }
-    /// <summary>Clears the value of the "jstype" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearJstype() {
-      _hasBits0 &= ~16;
-    }
-
-    /// <summary>Field number for the "lazy" field.</summary>
-    public const int LazyFieldNumber = 5;
-    private readonly static bool LazyDefaultValue = false;
-
-    private bool lazy_;
-    /// <summary>
-    /// Should this field be parsed lazily?  Lazy applies only to message-type
-    /// fields.  It means that when the outer message is initially parsed, the
-    /// inner message's contents will not be parsed but instead stored in encoded
-    /// form.  The inner message will actually be parsed when it is first accessed.
-    ///
-    /// This is only a hint.  Implementations are free to choose whether to use
-    /// eager or lazy parsing regardless of the value of this option.  However,
-    /// setting this option true suggests that the protocol author believes that
-    /// using lazy parsing on this field is worth the additional bookkeeping
-    /// overhead typically needed to implement it.
-    ///
-    /// This option does not affect the public interface of any generated code;
-    /// all method signatures remain the same.  Furthermore, thread-safety of the
-    /// interface is not affected by this option; const methods remain safe to
-    /// call from multiple threads concurrently, while non-const methods continue
-    /// to require exclusive access.
-    ///
-    /// Note that implementations may choose not to check required fields within
-    /// a lazy sub-message.  That is, calling IsInitialized() on the outer message
-    /// may return true even if the inner message has missing required fields.
-    /// This is necessary because otherwise the inner message would have to be
-    /// parsed in order to perform the check, defeating the purpose of lazy
-    /// parsing.  An implementation which chooses not to check required fields
-    /// must be consistent about it.  That is, for any particular sub-message, the
-    /// implementation must either *always* check its required fields, or *never*
-    /// check its required fields, regardless of whether or not the message has
-    /// been parsed.
-    ///
-    /// As of 2021, lazy does no correctness checks on the byte stream during
-    /// parsing.  This may lead to crashes if and when an invalid byte stream is
-    /// finally parsed upon access.
-    ///
-    /// TODO(b/211906113):  Enable validation on lazy fields.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Lazy {
-      get { if ((_hasBits0 & 8) != 0) { return lazy_; } else { return LazyDefaultValue; } }
-      set {
-        _hasBits0 |= 8;
-        lazy_ = value;
-      }
-    }
-    /// <summary>Gets whether the "lazy" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasLazy {
-      get { return (_hasBits0 & 8) != 0; }
-    }
-    /// <summary>Clears the value of the "lazy" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearLazy() {
-      _hasBits0 &= ~8;
-    }
-
-    /// <summary>Field number for the "unverified_lazy" field.</summary>
-    public const int UnverifiedLazyFieldNumber = 15;
-    private readonly static bool UnverifiedLazyDefaultValue = false;
-
-    private bool unverifiedLazy_;
-    /// <summary>
-    /// unverified_lazy does no correctness checks on the byte stream. This should
-    /// only be used where lazy with verification is prohibitive for performance
-    /// reasons.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool UnverifiedLazy {
-      get { if ((_hasBits0 & 64) != 0) { return unverifiedLazy_; } else { return UnverifiedLazyDefaultValue; } }
-      set {
-        _hasBits0 |= 64;
-        unverifiedLazy_ = value;
-      }
-    }
-    /// <summary>Gets whether the "unverified_lazy" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasUnverifiedLazy {
-      get { return (_hasBits0 & 64) != 0; }
-    }
-    /// <summary>Clears the value of the "unverified_lazy" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearUnverifiedLazy() {
-      _hasBits0 &= ~64;
-    }
-
-    /// <summary>Field number for the "deprecated" field.</summary>
-    public const int DeprecatedFieldNumber = 3;
-    private readonly static bool DeprecatedDefaultValue = false;
-
-    private bool deprecated_;
-    /// <summary>
-    /// Is this field deprecated?
-    /// Depending on the target platform, this can emit Deprecated annotations
-    /// for accessors, or it will be completely ignored; in the very least, this
-    /// is a formalization for deprecating fields.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Deprecated {
-      get { if ((_hasBits0 & 4) != 0) { return deprecated_; } else { return DeprecatedDefaultValue; } }
-      set {
-        _hasBits0 |= 4;
-        deprecated_ = value;
-      }
-    }
-    /// <summary>Gets whether the "deprecated" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasDeprecated {
-      get { return (_hasBits0 & 4) != 0; }
-    }
-    /// <summary>Clears the value of the "deprecated" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearDeprecated() {
-      _hasBits0 &= ~4;
-    }
-
-    /// <summary>Field number for the "weak" field.</summary>
-    public const int WeakFieldNumber = 10;
-    private readonly static bool WeakDefaultValue = false;
-
-    private bool weak_;
-    /// <summary>
-    /// For Google-internal migration only. Do not use.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Weak {
-      get { if ((_hasBits0 & 32) != 0) { return weak_; } else { return WeakDefaultValue; } }
-      set {
-        _hasBits0 |= 32;
-        weak_ = value;
-      }
-    }
-    /// <summary>Gets whether the "weak" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasWeak {
-      get { return (_hasBits0 & 32) != 0; }
-    }
-    /// <summary>Clears the value of the "weak" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearWeak() {
-      _hasBits0 &= ~32;
-    }
-
-    /// <summary>Field number for the "uninterpreted_option" field.</summary>
-    public const int UninterpretedOptionFieldNumber = 999;
-    private static readonly pb::FieldCodec<global::Google.Protobuf.Reflection.UninterpretedOption> _repeated_uninterpretedOption_codec
-        = pb::FieldCodec.ForMessage(7994, global::Google.Protobuf.Reflection.UninterpretedOption.Parser);
-    private readonly pbc::RepeatedField<global::Google.Protobuf.Reflection.UninterpretedOption> uninterpretedOption_ = new pbc::RepeatedField<global::Google.Protobuf.Reflection.UninterpretedOption>();
-    /// <summary>
-    /// The parser stores options it doesn't recognize here. See above.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Google.Protobuf.Reflection.UninterpretedOption> UninterpretedOption {
-      get { return uninterpretedOption_; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as FieldOptions);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(FieldOptions other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (Ctype != other.Ctype) return false;
-      if (Packed != other.Packed) return false;
-      if (Jstype != other.Jstype) return false;
-      if (Lazy != other.Lazy) return false;
-      if (UnverifiedLazy != other.UnverifiedLazy) return false;
-      if (Deprecated != other.Deprecated) return false;
-      if (Weak != other.Weak) return false;
-      if(!uninterpretedOption_.Equals(other.uninterpretedOption_)) return false;
-      if (!Equals(_extensions, other._extensions)) {
-        return false;
-      }
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (HasCtype) hash ^= Ctype.GetHashCode();
-      if (HasPacked) hash ^= Packed.GetHashCode();
-      if (HasJstype) hash ^= Jstype.GetHashCode();
-      if (HasLazy) hash ^= Lazy.GetHashCode();
-      if (HasUnverifiedLazy) hash ^= UnverifiedLazy.GetHashCode();
-      if (HasDeprecated) hash ^= Deprecated.GetHashCode();
-      if (HasWeak) hash ^= Weak.GetHashCode();
-      hash ^= uninterpretedOption_.GetHashCode();
-      if (_extensions != null) {
-        hash ^= _extensions.GetHashCode();
-      }
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (HasCtype) {
-        output.WriteRawTag(8);
-        output.WriteEnum((int) Ctype);
-      }
-      if (HasPacked) {
-        output.WriteRawTag(16);
-        output.WriteBool(Packed);
-      }
-      if (HasDeprecated) {
-        output.WriteRawTag(24);
-        output.WriteBool(Deprecated);
-      }
-      if (HasLazy) {
-        output.WriteRawTag(40);
-        output.WriteBool(Lazy);
-      }
-      if (HasJstype) {
-        output.WriteRawTag(48);
-        output.WriteEnum((int) Jstype);
-      }
-      if (HasWeak) {
-        output.WriteRawTag(80);
-        output.WriteBool(Weak);
-      }
-      if (HasUnverifiedLazy) {
-        output.WriteRawTag(120);
-        output.WriteBool(UnverifiedLazy);
-      }
-      uninterpretedOption_.WriteTo(output, _repeated_uninterpretedOption_codec);
-      if (_extensions != null) {
-        _extensions.WriteTo(output);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (HasCtype) {
-        output.WriteRawTag(8);
-        output.WriteEnum((int) Ctype);
-      }
-      if (HasPacked) {
-        output.WriteRawTag(16);
-        output.WriteBool(Packed);
-      }
-      if (HasDeprecated) {
-        output.WriteRawTag(24);
-        output.WriteBool(Deprecated);
-      }
-      if (HasLazy) {
-        output.WriteRawTag(40);
-        output.WriteBool(Lazy);
-      }
-      if (HasJstype) {
-        output.WriteRawTag(48);
-        output.WriteEnum((int) Jstype);
-      }
-      if (HasWeak) {
-        output.WriteRawTag(80);
-        output.WriteBool(Weak);
-      }
-      if (HasUnverifiedLazy) {
-        output.WriteRawTag(120);
-        output.WriteBool(UnverifiedLazy);
-      }
-      uninterpretedOption_.WriteTo(ref output, _repeated_uninterpretedOption_codec);
-      if (_extensions != null) {
-        _extensions.WriteTo(ref output);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (HasCtype) {
-        size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Ctype);
-      }
-      if (HasPacked) {
-        size += 1 + 1;
-      }
-      if (HasJstype) {
-        size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Jstype);
-      }
-      if (HasLazy) {
-        size += 1 + 1;
-      }
-      if (HasUnverifiedLazy) {
-        size += 1 + 1;
-      }
-      if (HasDeprecated) {
-        size += 1 + 1;
-      }
-      if (HasWeak) {
-        size += 1 + 1;
-      }
-      size += uninterpretedOption_.CalculateSize(_repeated_uninterpretedOption_codec);
-      if (_extensions != null) {
-        size += _extensions.CalculateSize();
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(FieldOptions other) {
-      if (other == null) {
-        return;
-      }
-      if (other.HasCtype) {
-        Ctype = other.Ctype;
-      }
-      if (other.HasPacked) {
-        Packed = other.Packed;
-      }
-      if (other.HasJstype) {
-        Jstype = other.Jstype;
-      }
-      if (other.HasLazy) {
-        Lazy = other.Lazy;
-      }
-      if (other.HasUnverifiedLazy) {
-        UnverifiedLazy = other.UnverifiedLazy;
-      }
-      if (other.HasDeprecated) {
-        Deprecated = other.Deprecated;
-      }
-      if (other.HasWeak) {
-        Weak = other.Weak;
-      }
-      uninterpretedOption_.Add(other.uninterpretedOption_);
-      pb::ExtensionSet.MergeFrom(ref _extensions, other._extensions);
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            if (!pb::ExtensionSet.TryMergeFieldFrom(ref _extensions, input)) {
-              _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            }
-            break;
-          case 8: {
-            Ctype = (global::Google.Protobuf.Reflection.FieldOptions.Types.CType) input.ReadEnum();
-            break;
-          }
-          case 16: {
-            Packed = input.ReadBool();
-            break;
-          }
-          case 24: {
-            Deprecated = input.ReadBool();
-            break;
-          }
-          case 40: {
-            Lazy = input.ReadBool();
-            break;
-          }
-          case 48: {
-            Jstype = (global::Google.Protobuf.Reflection.FieldOptions.Types.JSType) input.ReadEnum();
-            break;
-          }
-          case 80: {
-            Weak = input.ReadBool();
-            break;
-          }
-          case 120: {
-            UnverifiedLazy = input.ReadBool();
-            break;
-          }
-          case 7994: {
-            uninterpretedOption_.AddEntriesFrom(input, _repeated_uninterpretedOption_codec);
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            if (!pb::ExtensionSet.TryMergeFieldFrom(ref _extensions, ref input)) {
-              _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            }
-            break;
-          case 8: {
-            Ctype = (global::Google.Protobuf.Reflection.FieldOptions.Types.CType) input.ReadEnum();
-            break;
-          }
-          case 16: {
-            Packed = input.ReadBool();
-            break;
-          }
-          case 24: {
-            Deprecated = input.ReadBool();
-            break;
-          }
-          case 40: {
-            Lazy = input.ReadBool();
-            break;
-          }
-          case 48: {
-            Jstype = (global::Google.Protobuf.Reflection.FieldOptions.Types.JSType) input.ReadEnum();
-            break;
-          }
-          case 80: {
-            Weak = input.ReadBool();
-            break;
-          }
-          case 120: {
-            UnverifiedLazy = input.ReadBool();
-            break;
-          }
-          case 7994: {
-            uninterpretedOption_.AddEntriesFrom(ref input, _repeated_uninterpretedOption_codec);
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-    public TValue GetExtension<TValue>(pb::Extension<FieldOptions, TValue> extension) {
-      return pb::ExtensionSet.Get(ref _extensions, extension);
-    }
-    public pbc::RepeatedField<TValue> GetExtension<TValue>(pb::RepeatedExtension<FieldOptions, TValue> extension) {
-      return pb::ExtensionSet.Get(ref _extensions, extension);
-    }
-    public pbc::RepeatedField<TValue> GetOrInitializeExtension<TValue>(pb::RepeatedExtension<FieldOptions, TValue> extension) {
-      return pb::ExtensionSet.GetOrInitialize(ref _extensions, extension);
-    }
-    public void SetExtension<TValue>(pb::Extension<FieldOptions, TValue> extension, TValue value) {
-      pb::ExtensionSet.Set(ref _extensions, extension, value);
-    }
-    public bool HasExtension<TValue>(pb::Extension<FieldOptions, TValue> extension) {
-      return pb::ExtensionSet.Has(ref _extensions, extension);
-    }
-    public void ClearExtension<TValue>(pb::Extension<FieldOptions, TValue> extension) {
-      pb::ExtensionSet.Clear(ref _extensions, extension);
-    }
-    public void ClearExtension<TValue>(pb::RepeatedExtension<FieldOptions, TValue> extension) {
-      pb::ExtensionSet.Clear(ref _extensions, extension);
-    }
-
-    #region Nested types
-    /// <summary>Container for nested types declared in the FieldOptions message type.</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static partial class Types {
-      public enum CType {
-        /// <summary>
-        /// Default mode.
-        /// </summary>
-        [pbr::OriginalName("STRING")] String = 0,
-        [pbr::OriginalName("CORD")] Cord = 1,
-        [pbr::OriginalName("STRING_PIECE")] StringPiece = 2,
-      }
-
-      public enum JSType {
-        /// <summary>
-        /// Use the default type.
-        /// </summary>
-        [pbr::OriginalName("JS_NORMAL")] JsNormal = 0,
-        /// <summary>
-        /// Use JavaScript strings.
-        /// </summary>
-        [pbr::OriginalName("JS_STRING")] JsString = 1,
-        /// <summary>
-        /// Use JavaScript numbers.
-        /// </summary>
-        [pbr::OriginalName("JS_NUMBER")] JsNumber = 2,
-      }
-
-    }
-    #endregion
-
-  }
-
-  public sealed partial class OneofOptions : pb::IExtendableMessage<OneofOptions>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<OneofOptions> _parser = new pb::MessageParser<OneofOptions>(() => new OneofOptions());
-    private pb::UnknownFieldSet _unknownFields;
-    internal pb::ExtensionSet<OneofOptions> _extensions;
-    private pb::ExtensionSet<OneofOptions> _Extensions { get { return _extensions; } }
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<OneofOptions> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.Reflection.DescriptorReflection.Descriptor.MessageTypes[13]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public OneofOptions() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public OneofOptions(OneofOptions other) : this() {
-      uninterpretedOption_ = other.uninterpretedOption_.Clone();
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-      _extensions = pb::ExtensionSet.Clone(other._extensions);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public OneofOptions Clone() {
-      return new OneofOptions(this);
-    }
-
-    /// <summary>Field number for the "uninterpreted_option" field.</summary>
-    public const int UninterpretedOptionFieldNumber = 999;
-    private static readonly pb::FieldCodec<global::Google.Protobuf.Reflection.UninterpretedOption> _repeated_uninterpretedOption_codec
-        = pb::FieldCodec.ForMessage(7994, global::Google.Protobuf.Reflection.UninterpretedOption.Parser);
-    private readonly pbc::RepeatedField<global::Google.Protobuf.Reflection.UninterpretedOption> uninterpretedOption_ = new pbc::RepeatedField<global::Google.Protobuf.Reflection.UninterpretedOption>();
-    /// <summary>
-    /// The parser stores options it doesn't recognize here. See above.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Google.Protobuf.Reflection.UninterpretedOption> UninterpretedOption {
-      get { return uninterpretedOption_; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as OneofOptions);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(OneofOptions other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if(!uninterpretedOption_.Equals(other.uninterpretedOption_)) return false;
-      if (!Equals(_extensions, other._extensions)) {
-        return false;
-      }
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      hash ^= uninterpretedOption_.GetHashCode();
-      if (_extensions != null) {
-        hash ^= _extensions.GetHashCode();
-      }
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      uninterpretedOption_.WriteTo(output, _repeated_uninterpretedOption_codec);
-      if (_extensions != null) {
-        _extensions.WriteTo(output);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      uninterpretedOption_.WriteTo(ref output, _repeated_uninterpretedOption_codec);
-      if (_extensions != null) {
-        _extensions.WriteTo(ref output);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      size += uninterpretedOption_.CalculateSize(_repeated_uninterpretedOption_codec);
-      if (_extensions != null) {
-        size += _extensions.CalculateSize();
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(OneofOptions other) {
-      if (other == null) {
-        return;
-      }
-      uninterpretedOption_.Add(other.uninterpretedOption_);
-      pb::ExtensionSet.MergeFrom(ref _extensions, other._extensions);
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            if (!pb::ExtensionSet.TryMergeFieldFrom(ref _extensions, input)) {
-              _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            }
-            break;
-          case 7994: {
-            uninterpretedOption_.AddEntriesFrom(input, _repeated_uninterpretedOption_codec);
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            if (!pb::ExtensionSet.TryMergeFieldFrom(ref _extensions, ref input)) {
-              _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            }
-            break;
-          case 7994: {
-            uninterpretedOption_.AddEntriesFrom(ref input, _repeated_uninterpretedOption_codec);
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-    public TValue GetExtension<TValue>(pb::Extension<OneofOptions, TValue> extension) {
-      return pb::ExtensionSet.Get(ref _extensions, extension);
-    }
-    public pbc::RepeatedField<TValue> GetExtension<TValue>(pb::RepeatedExtension<OneofOptions, TValue> extension) {
-      return pb::ExtensionSet.Get(ref _extensions, extension);
-    }
-    public pbc::RepeatedField<TValue> GetOrInitializeExtension<TValue>(pb::RepeatedExtension<OneofOptions, TValue> extension) {
-      return pb::ExtensionSet.GetOrInitialize(ref _extensions, extension);
-    }
-    public void SetExtension<TValue>(pb::Extension<OneofOptions, TValue> extension, TValue value) {
-      pb::ExtensionSet.Set(ref _extensions, extension, value);
-    }
-    public bool HasExtension<TValue>(pb::Extension<OneofOptions, TValue> extension) {
-      return pb::ExtensionSet.Has(ref _extensions, extension);
-    }
-    public void ClearExtension<TValue>(pb::Extension<OneofOptions, TValue> extension) {
-      pb::ExtensionSet.Clear(ref _extensions, extension);
-    }
-    public void ClearExtension<TValue>(pb::RepeatedExtension<OneofOptions, TValue> extension) {
-      pb::ExtensionSet.Clear(ref _extensions, extension);
-    }
-
-  }
-
-  public sealed partial class EnumOptions : pb::IExtendableMessage<EnumOptions>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<EnumOptions> _parser = new pb::MessageParser<EnumOptions>(() => new EnumOptions());
-    private pb::UnknownFieldSet _unknownFields;
-    internal pb::ExtensionSet<EnumOptions> _extensions;
-    private pb::ExtensionSet<EnumOptions> _Extensions { get { return _extensions; } }
-    private int _hasBits0;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<EnumOptions> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.Reflection.DescriptorReflection.Descriptor.MessageTypes[14]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public EnumOptions() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public EnumOptions(EnumOptions other) : this() {
-      _hasBits0 = other._hasBits0;
-      allowAlias_ = other.allowAlias_;
-      deprecated_ = other.deprecated_;
-      uninterpretedOption_ = other.uninterpretedOption_.Clone();
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-      _extensions = pb::ExtensionSet.Clone(other._extensions);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public EnumOptions Clone() {
-      return new EnumOptions(this);
-    }
-
-    /// <summary>Field number for the "allow_alias" field.</summary>
-    public const int AllowAliasFieldNumber = 2;
-    private readonly static bool AllowAliasDefaultValue = false;
-
-    private bool allowAlias_;
-    /// <summary>
-    /// Set this option to true to allow mapping different tag names to the same
-    /// value.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool AllowAlias {
-      get { if ((_hasBits0 & 1) != 0) { return allowAlias_; } else { return AllowAliasDefaultValue; } }
-      set {
-        _hasBits0 |= 1;
-        allowAlias_ = value;
-      }
-    }
-    /// <summary>Gets whether the "allow_alias" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasAllowAlias {
-      get { return (_hasBits0 & 1) != 0; }
-    }
-    /// <summary>Clears the value of the "allow_alias" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearAllowAlias() {
-      _hasBits0 &= ~1;
-    }
-
-    /// <summary>Field number for the "deprecated" field.</summary>
-    public const int DeprecatedFieldNumber = 3;
-    private readonly static bool DeprecatedDefaultValue = false;
-
-    private bool deprecated_;
-    /// <summary>
-    /// Is this enum deprecated?
-    /// Depending on the target platform, this can emit Deprecated annotations
-    /// for the enum, or it will be completely ignored; in the very least, this
-    /// is a formalization for deprecating enums.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Deprecated {
-      get { if ((_hasBits0 & 2) != 0) { return deprecated_; } else { return DeprecatedDefaultValue; } }
-      set {
-        _hasBits0 |= 2;
-        deprecated_ = value;
-      }
-    }
-    /// <summary>Gets whether the "deprecated" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasDeprecated {
-      get { return (_hasBits0 & 2) != 0; }
-    }
-    /// <summary>Clears the value of the "deprecated" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearDeprecated() {
-      _hasBits0 &= ~2;
-    }
-
-    /// <summary>Field number for the "uninterpreted_option" field.</summary>
-    public const int UninterpretedOptionFieldNumber = 999;
-    private static readonly pb::FieldCodec<global::Google.Protobuf.Reflection.UninterpretedOption> _repeated_uninterpretedOption_codec
-        = pb::FieldCodec.ForMessage(7994, global::Google.Protobuf.Reflection.UninterpretedOption.Parser);
-    private readonly pbc::RepeatedField<global::Google.Protobuf.Reflection.UninterpretedOption> uninterpretedOption_ = new pbc::RepeatedField<global::Google.Protobuf.Reflection.UninterpretedOption>();
-    /// <summary>
-    /// The parser stores options it doesn't recognize here. See above.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Google.Protobuf.Reflection.UninterpretedOption> UninterpretedOption {
-      get { return uninterpretedOption_; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as EnumOptions);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(EnumOptions other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (AllowAlias != other.AllowAlias) return false;
-      if (Deprecated != other.Deprecated) return false;
-      if(!uninterpretedOption_.Equals(other.uninterpretedOption_)) return false;
-      if (!Equals(_extensions, other._extensions)) {
-        return false;
-      }
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (HasAllowAlias) hash ^= AllowAlias.GetHashCode();
-      if (HasDeprecated) hash ^= Deprecated.GetHashCode();
-      hash ^= uninterpretedOption_.GetHashCode();
-      if (_extensions != null) {
-        hash ^= _extensions.GetHashCode();
-      }
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (HasAllowAlias) {
-        output.WriteRawTag(16);
-        output.WriteBool(AllowAlias);
-      }
-      if (HasDeprecated) {
-        output.WriteRawTag(24);
-        output.WriteBool(Deprecated);
-      }
-      uninterpretedOption_.WriteTo(output, _repeated_uninterpretedOption_codec);
-      if (_extensions != null) {
-        _extensions.WriteTo(output);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (HasAllowAlias) {
-        output.WriteRawTag(16);
-        output.WriteBool(AllowAlias);
-      }
-      if (HasDeprecated) {
-        output.WriteRawTag(24);
-        output.WriteBool(Deprecated);
-      }
-      uninterpretedOption_.WriteTo(ref output, _repeated_uninterpretedOption_codec);
-      if (_extensions != null) {
-        _extensions.WriteTo(ref output);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (HasAllowAlias) {
-        size += 1 + 1;
-      }
-      if (HasDeprecated) {
-        size += 1 + 1;
-      }
-      size += uninterpretedOption_.CalculateSize(_repeated_uninterpretedOption_codec);
-      if (_extensions != null) {
-        size += _extensions.CalculateSize();
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(EnumOptions other) {
-      if (other == null) {
-        return;
-      }
-      if (other.HasAllowAlias) {
-        AllowAlias = other.AllowAlias;
-      }
-      if (other.HasDeprecated) {
-        Deprecated = other.Deprecated;
-      }
-      uninterpretedOption_.Add(other.uninterpretedOption_);
-      pb::ExtensionSet.MergeFrom(ref _extensions, other._extensions);
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            if (!pb::ExtensionSet.TryMergeFieldFrom(ref _extensions, input)) {
-              _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            }
-            break;
-          case 16: {
-            AllowAlias = input.ReadBool();
-            break;
-          }
-          case 24: {
-            Deprecated = input.ReadBool();
-            break;
-          }
-          case 7994: {
-            uninterpretedOption_.AddEntriesFrom(input, _repeated_uninterpretedOption_codec);
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            if (!pb::ExtensionSet.TryMergeFieldFrom(ref _extensions, ref input)) {
-              _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            }
-            break;
-          case 16: {
-            AllowAlias = input.ReadBool();
-            break;
-          }
-          case 24: {
-            Deprecated = input.ReadBool();
-            break;
-          }
-          case 7994: {
-            uninterpretedOption_.AddEntriesFrom(ref input, _repeated_uninterpretedOption_codec);
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-    public TValue GetExtension<TValue>(pb::Extension<EnumOptions, TValue> extension) {
-      return pb::ExtensionSet.Get(ref _extensions, extension);
-    }
-    public pbc::RepeatedField<TValue> GetExtension<TValue>(pb::RepeatedExtension<EnumOptions, TValue> extension) {
-      return pb::ExtensionSet.Get(ref _extensions, extension);
-    }
-    public pbc::RepeatedField<TValue> GetOrInitializeExtension<TValue>(pb::RepeatedExtension<EnumOptions, TValue> extension) {
-      return pb::ExtensionSet.GetOrInitialize(ref _extensions, extension);
-    }
-    public void SetExtension<TValue>(pb::Extension<EnumOptions, TValue> extension, TValue value) {
-      pb::ExtensionSet.Set(ref _extensions, extension, value);
-    }
-    public bool HasExtension<TValue>(pb::Extension<EnumOptions, TValue> extension) {
-      return pb::ExtensionSet.Has(ref _extensions, extension);
-    }
-    public void ClearExtension<TValue>(pb::Extension<EnumOptions, TValue> extension) {
-      pb::ExtensionSet.Clear(ref _extensions, extension);
-    }
-    public void ClearExtension<TValue>(pb::RepeatedExtension<EnumOptions, TValue> extension) {
-      pb::ExtensionSet.Clear(ref _extensions, extension);
-    }
-
-  }
-
-  public sealed partial class EnumValueOptions : pb::IExtendableMessage<EnumValueOptions>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<EnumValueOptions> _parser = new pb::MessageParser<EnumValueOptions>(() => new EnumValueOptions());
-    private pb::UnknownFieldSet _unknownFields;
-    internal pb::ExtensionSet<EnumValueOptions> _extensions;
-    private pb::ExtensionSet<EnumValueOptions> _Extensions { get { return _extensions; } }
-    private int _hasBits0;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<EnumValueOptions> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.Reflection.DescriptorReflection.Descriptor.MessageTypes[15]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public EnumValueOptions() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public EnumValueOptions(EnumValueOptions other) : this() {
-      _hasBits0 = other._hasBits0;
-      deprecated_ = other.deprecated_;
-      uninterpretedOption_ = other.uninterpretedOption_.Clone();
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-      _extensions = pb::ExtensionSet.Clone(other._extensions);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public EnumValueOptions Clone() {
-      return new EnumValueOptions(this);
-    }
-
-    /// <summary>Field number for the "deprecated" field.</summary>
-    public const int DeprecatedFieldNumber = 1;
-    private readonly static bool DeprecatedDefaultValue = false;
-
-    private bool deprecated_;
-    /// <summary>
-    /// Is this enum value deprecated?
-    /// Depending on the target platform, this can emit Deprecated annotations
-    /// for the enum value, or it will be completely ignored; in the very least,
-    /// this is a formalization for deprecating enum values.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Deprecated {
-      get { if ((_hasBits0 & 1) != 0) { return deprecated_; } else { return DeprecatedDefaultValue; } }
-      set {
-        _hasBits0 |= 1;
-        deprecated_ = value;
-      }
-    }
-    /// <summary>Gets whether the "deprecated" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasDeprecated {
-      get { return (_hasBits0 & 1) != 0; }
-    }
-    /// <summary>Clears the value of the "deprecated" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearDeprecated() {
-      _hasBits0 &= ~1;
-    }
-
-    /// <summary>Field number for the "uninterpreted_option" field.</summary>
-    public const int UninterpretedOptionFieldNumber = 999;
-    private static readonly pb::FieldCodec<global::Google.Protobuf.Reflection.UninterpretedOption> _repeated_uninterpretedOption_codec
-        = pb::FieldCodec.ForMessage(7994, global::Google.Protobuf.Reflection.UninterpretedOption.Parser);
-    private readonly pbc::RepeatedField<global::Google.Protobuf.Reflection.UninterpretedOption> uninterpretedOption_ = new pbc::RepeatedField<global::Google.Protobuf.Reflection.UninterpretedOption>();
-    /// <summary>
-    /// The parser stores options it doesn't recognize here. See above.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Google.Protobuf.Reflection.UninterpretedOption> UninterpretedOption {
-      get { return uninterpretedOption_; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as EnumValueOptions);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(EnumValueOptions other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (Deprecated != other.Deprecated) return false;
-      if(!uninterpretedOption_.Equals(other.uninterpretedOption_)) return false;
-      if (!Equals(_extensions, other._extensions)) {
-        return false;
-      }
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (HasDeprecated) hash ^= Deprecated.GetHashCode();
-      hash ^= uninterpretedOption_.GetHashCode();
-      if (_extensions != null) {
-        hash ^= _extensions.GetHashCode();
-      }
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (HasDeprecated) {
-        output.WriteRawTag(8);
-        output.WriteBool(Deprecated);
-      }
-      uninterpretedOption_.WriteTo(output, _repeated_uninterpretedOption_codec);
-      if (_extensions != null) {
-        _extensions.WriteTo(output);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (HasDeprecated) {
-        output.WriteRawTag(8);
-        output.WriteBool(Deprecated);
-      }
-      uninterpretedOption_.WriteTo(ref output, _repeated_uninterpretedOption_codec);
-      if (_extensions != null) {
-        _extensions.WriteTo(ref output);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (HasDeprecated) {
-        size += 1 + 1;
-      }
-      size += uninterpretedOption_.CalculateSize(_repeated_uninterpretedOption_codec);
-      if (_extensions != null) {
-        size += _extensions.CalculateSize();
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(EnumValueOptions other) {
-      if (other == null) {
-        return;
-      }
-      if (other.HasDeprecated) {
-        Deprecated = other.Deprecated;
-      }
-      uninterpretedOption_.Add(other.uninterpretedOption_);
-      pb::ExtensionSet.MergeFrom(ref _extensions, other._extensions);
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            if (!pb::ExtensionSet.TryMergeFieldFrom(ref _extensions, input)) {
-              _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            }
-            break;
-          case 8: {
-            Deprecated = input.ReadBool();
-            break;
-          }
-          case 7994: {
-            uninterpretedOption_.AddEntriesFrom(input, _repeated_uninterpretedOption_codec);
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            if (!pb::ExtensionSet.TryMergeFieldFrom(ref _extensions, ref input)) {
-              _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            }
-            break;
-          case 8: {
-            Deprecated = input.ReadBool();
-            break;
-          }
-          case 7994: {
-            uninterpretedOption_.AddEntriesFrom(ref input, _repeated_uninterpretedOption_codec);
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-    public TValue GetExtension<TValue>(pb::Extension<EnumValueOptions, TValue> extension) {
-      return pb::ExtensionSet.Get(ref _extensions, extension);
-    }
-    public pbc::RepeatedField<TValue> GetExtension<TValue>(pb::RepeatedExtension<EnumValueOptions, TValue> extension) {
-      return pb::ExtensionSet.Get(ref _extensions, extension);
-    }
-    public pbc::RepeatedField<TValue> GetOrInitializeExtension<TValue>(pb::RepeatedExtension<EnumValueOptions, TValue> extension) {
-      return pb::ExtensionSet.GetOrInitialize(ref _extensions, extension);
-    }
-    public void SetExtension<TValue>(pb::Extension<EnumValueOptions, TValue> extension, TValue value) {
-      pb::ExtensionSet.Set(ref _extensions, extension, value);
-    }
-    public bool HasExtension<TValue>(pb::Extension<EnumValueOptions, TValue> extension) {
-      return pb::ExtensionSet.Has(ref _extensions, extension);
-    }
-    public void ClearExtension<TValue>(pb::Extension<EnumValueOptions, TValue> extension) {
-      pb::ExtensionSet.Clear(ref _extensions, extension);
-    }
-    public void ClearExtension<TValue>(pb::RepeatedExtension<EnumValueOptions, TValue> extension) {
-      pb::ExtensionSet.Clear(ref _extensions, extension);
-    }
-
-  }
-
-  public sealed partial class ServiceOptions : pb::IExtendableMessage<ServiceOptions>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<ServiceOptions> _parser = new pb::MessageParser<ServiceOptions>(() => new ServiceOptions());
-    private pb::UnknownFieldSet _unknownFields;
-    internal pb::ExtensionSet<ServiceOptions> _extensions;
-    private pb::ExtensionSet<ServiceOptions> _Extensions { get { return _extensions; } }
-    private int _hasBits0;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<ServiceOptions> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.Reflection.DescriptorReflection.Descriptor.MessageTypes[16]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ServiceOptions() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ServiceOptions(ServiceOptions other) : this() {
-      _hasBits0 = other._hasBits0;
-      deprecated_ = other.deprecated_;
-      uninterpretedOption_ = other.uninterpretedOption_.Clone();
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-      _extensions = pb::ExtensionSet.Clone(other._extensions);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ServiceOptions Clone() {
-      return new ServiceOptions(this);
-    }
-
-    /// <summary>Field number for the "deprecated" field.</summary>
-    public const int DeprecatedFieldNumber = 33;
-    private readonly static bool DeprecatedDefaultValue = false;
-
-    private bool deprecated_;
-    /// <summary>
-    /// Is this service deprecated?
-    /// Depending on the target platform, this can emit Deprecated annotations
-    /// for the service, or it will be completely ignored; in the very least,
-    /// this is a formalization for deprecating services.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Deprecated {
-      get { if ((_hasBits0 & 1) != 0) { return deprecated_; } else { return DeprecatedDefaultValue; } }
-      set {
-        _hasBits0 |= 1;
-        deprecated_ = value;
-      }
-    }
-    /// <summary>Gets whether the "deprecated" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasDeprecated {
-      get { return (_hasBits0 & 1) != 0; }
-    }
-    /// <summary>Clears the value of the "deprecated" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearDeprecated() {
-      _hasBits0 &= ~1;
-    }
-
-    /// <summary>Field number for the "uninterpreted_option" field.</summary>
-    public const int UninterpretedOptionFieldNumber = 999;
-    private static readonly pb::FieldCodec<global::Google.Protobuf.Reflection.UninterpretedOption> _repeated_uninterpretedOption_codec
-        = pb::FieldCodec.ForMessage(7994, global::Google.Protobuf.Reflection.UninterpretedOption.Parser);
-    private readonly pbc::RepeatedField<global::Google.Protobuf.Reflection.UninterpretedOption> uninterpretedOption_ = new pbc::RepeatedField<global::Google.Protobuf.Reflection.UninterpretedOption>();
-    /// <summary>
-    /// The parser stores options it doesn't recognize here. See above.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Google.Protobuf.Reflection.UninterpretedOption> UninterpretedOption {
-      get { return uninterpretedOption_; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as ServiceOptions);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(ServiceOptions other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (Deprecated != other.Deprecated) return false;
-      if(!uninterpretedOption_.Equals(other.uninterpretedOption_)) return false;
-      if (!Equals(_extensions, other._extensions)) {
-        return false;
-      }
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (HasDeprecated) hash ^= Deprecated.GetHashCode();
-      hash ^= uninterpretedOption_.GetHashCode();
-      if (_extensions != null) {
-        hash ^= _extensions.GetHashCode();
-      }
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (HasDeprecated) {
-        output.WriteRawTag(136, 2);
-        output.WriteBool(Deprecated);
-      }
-      uninterpretedOption_.WriteTo(output, _repeated_uninterpretedOption_codec);
-      if (_extensions != null) {
-        _extensions.WriteTo(output);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (HasDeprecated) {
-        output.WriteRawTag(136, 2);
-        output.WriteBool(Deprecated);
-      }
-      uninterpretedOption_.WriteTo(ref output, _repeated_uninterpretedOption_codec);
-      if (_extensions != null) {
-        _extensions.WriteTo(ref output);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (HasDeprecated) {
-        size += 2 + 1;
-      }
-      size += uninterpretedOption_.CalculateSize(_repeated_uninterpretedOption_codec);
-      if (_extensions != null) {
-        size += _extensions.CalculateSize();
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(ServiceOptions other) {
-      if (other == null) {
-        return;
-      }
-      if (other.HasDeprecated) {
-        Deprecated = other.Deprecated;
-      }
-      uninterpretedOption_.Add(other.uninterpretedOption_);
-      pb::ExtensionSet.MergeFrom(ref _extensions, other._extensions);
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            if (!pb::ExtensionSet.TryMergeFieldFrom(ref _extensions, input)) {
-              _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            }
-            break;
-          case 264: {
-            Deprecated = input.ReadBool();
-            break;
-          }
-          case 7994: {
-            uninterpretedOption_.AddEntriesFrom(input, _repeated_uninterpretedOption_codec);
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            if (!pb::ExtensionSet.TryMergeFieldFrom(ref _extensions, ref input)) {
-              _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            }
-            break;
-          case 264: {
-            Deprecated = input.ReadBool();
-            break;
-          }
-          case 7994: {
-            uninterpretedOption_.AddEntriesFrom(ref input, _repeated_uninterpretedOption_codec);
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-    public TValue GetExtension<TValue>(pb::Extension<ServiceOptions, TValue> extension) {
-      return pb::ExtensionSet.Get(ref _extensions, extension);
-    }
-    public pbc::RepeatedField<TValue> GetExtension<TValue>(pb::RepeatedExtension<ServiceOptions, TValue> extension) {
-      return pb::ExtensionSet.Get(ref _extensions, extension);
-    }
-    public pbc::RepeatedField<TValue> GetOrInitializeExtension<TValue>(pb::RepeatedExtension<ServiceOptions, TValue> extension) {
-      return pb::ExtensionSet.GetOrInitialize(ref _extensions, extension);
-    }
-    public void SetExtension<TValue>(pb::Extension<ServiceOptions, TValue> extension, TValue value) {
-      pb::ExtensionSet.Set(ref _extensions, extension, value);
-    }
-    public bool HasExtension<TValue>(pb::Extension<ServiceOptions, TValue> extension) {
-      return pb::ExtensionSet.Has(ref _extensions, extension);
-    }
-    public void ClearExtension<TValue>(pb::Extension<ServiceOptions, TValue> extension) {
-      pb::ExtensionSet.Clear(ref _extensions, extension);
-    }
-    public void ClearExtension<TValue>(pb::RepeatedExtension<ServiceOptions, TValue> extension) {
-      pb::ExtensionSet.Clear(ref _extensions, extension);
-    }
-
-  }
-
-  public sealed partial class MethodOptions : pb::IExtendableMessage<MethodOptions>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<MethodOptions> _parser = new pb::MessageParser<MethodOptions>(() => new MethodOptions());
-    private pb::UnknownFieldSet _unknownFields;
-    internal pb::ExtensionSet<MethodOptions> _extensions;
-    private pb::ExtensionSet<MethodOptions> _Extensions { get { return _extensions; } }
-    private int _hasBits0;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<MethodOptions> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.Reflection.DescriptorReflection.Descriptor.MessageTypes[17]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public MethodOptions() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public MethodOptions(MethodOptions other) : this() {
-      _hasBits0 = other._hasBits0;
-      deprecated_ = other.deprecated_;
-      idempotencyLevel_ = other.idempotencyLevel_;
-      uninterpretedOption_ = other.uninterpretedOption_.Clone();
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-      _extensions = pb::ExtensionSet.Clone(other._extensions);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public MethodOptions Clone() {
-      return new MethodOptions(this);
-    }
-
-    /// <summary>Field number for the "deprecated" field.</summary>
-    public const int DeprecatedFieldNumber = 33;
-    private readonly static bool DeprecatedDefaultValue = false;
-
-    private bool deprecated_;
-    /// <summary>
-    /// Is this method deprecated?
-    /// Depending on the target platform, this can emit Deprecated annotations
-    /// for the method, or it will be completely ignored; in the very least,
-    /// this is a formalization for deprecating methods.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Deprecated {
-      get { if ((_hasBits0 & 1) != 0) { return deprecated_; } else { return DeprecatedDefaultValue; } }
-      set {
-        _hasBits0 |= 1;
-        deprecated_ = value;
-      }
-    }
-    /// <summary>Gets whether the "deprecated" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasDeprecated {
-      get { return (_hasBits0 & 1) != 0; }
-    }
-    /// <summary>Clears the value of the "deprecated" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearDeprecated() {
-      _hasBits0 &= ~1;
-    }
-
-    /// <summary>Field number for the "idempotency_level" field.</summary>
-    public const int IdempotencyLevelFieldNumber = 34;
-    private readonly static global::Google.Protobuf.Reflection.MethodOptions.Types.IdempotencyLevel IdempotencyLevelDefaultValue = global::Google.Protobuf.Reflection.MethodOptions.Types.IdempotencyLevel.IdempotencyUnknown;
-
-    private global::Google.Protobuf.Reflection.MethodOptions.Types.IdempotencyLevel idempotencyLevel_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.Reflection.MethodOptions.Types.IdempotencyLevel IdempotencyLevel {
-      get { if ((_hasBits0 & 2) != 0) { return idempotencyLevel_; } else { return IdempotencyLevelDefaultValue; } }
-      set {
-        _hasBits0 |= 2;
-        idempotencyLevel_ = value;
-      }
-    }
-    /// <summary>Gets whether the "idempotency_level" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasIdempotencyLevel {
-      get { return (_hasBits0 & 2) != 0; }
-    }
-    /// <summary>Clears the value of the "idempotency_level" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearIdempotencyLevel() {
-      _hasBits0 &= ~2;
-    }
-
-    /// <summary>Field number for the "uninterpreted_option" field.</summary>
-    public const int UninterpretedOptionFieldNumber = 999;
-    private static readonly pb::FieldCodec<global::Google.Protobuf.Reflection.UninterpretedOption> _repeated_uninterpretedOption_codec
-        = pb::FieldCodec.ForMessage(7994, global::Google.Protobuf.Reflection.UninterpretedOption.Parser);
-    private readonly pbc::RepeatedField<global::Google.Protobuf.Reflection.UninterpretedOption> uninterpretedOption_ = new pbc::RepeatedField<global::Google.Protobuf.Reflection.UninterpretedOption>();
-    /// <summary>
-    /// The parser stores options it doesn't recognize here. See above.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Google.Protobuf.Reflection.UninterpretedOption> UninterpretedOption {
-      get { return uninterpretedOption_; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as MethodOptions);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(MethodOptions other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (Deprecated != other.Deprecated) return false;
-      if (IdempotencyLevel != other.IdempotencyLevel) return false;
-      if(!uninterpretedOption_.Equals(other.uninterpretedOption_)) return false;
-      if (!Equals(_extensions, other._extensions)) {
-        return false;
-      }
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (HasDeprecated) hash ^= Deprecated.GetHashCode();
-      if (HasIdempotencyLevel) hash ^= IdempotencyLevel.GetHashCode();
-      hash ^= uninterpretedOption_.GetHashCode();
-      if (_extensions != null) {
-        hash ^= _extensions.GetHashCode();
-      }
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (HasDeprecated) {
-        output.WriteRawTag(136, 2);
-        output.WriteBool(Deprecated);
-      }
-      if (HasIdempotencyLevel) {
-        output.WriteRawTag(144, 2);
-        output.WriteEnum((int) IdempotencyLevel);
-      }
-      uninterpretedOption_.WriteTo(output, _repeated_uninterpretedOption_codec);
-      if (_extensions != null) {
-        _extensions.WriteTo(output);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (HasDeprecated) {
-        output.WriteRawTag(136, 2);
-        output.WriteBool(Deprecated);
-      }
-      if (HasIdempotencyLevel) {
-        output.WriteRawTag(144, 2);
-        output.WriteEnum((int) IdempotencyLevel);
-      }
-      uninterpretedOption_.WriteTo(ref output, _repeated_uninterpretedOption_codec);
-      if (_extensions != null) {
-        _extensions.WriteTo(ref output);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (HasDeprecated) {
-        size += 2 + 1;
-      }
-      if (HasIdempotencyLevel) {
-        size += 2 + pb::CodedOutputStream.ComputeEnumSize((int) IdempotencyLevel);
-      }
-      size += uninterpretedOption_.CalculateSize(_repeated_uninterpretedOption_codec);
-      if (_extensions != null) {
-        size += _extensions.CalculateSize();
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(MethodOptions other) {
-      if (other == null) {
-        return;
-      }
-      if (other.HasDeprecated) {
-        Deprecated = other.Deprecated;
-      }
-      if (other.HasIdempotencyLevel) {
-        IdempotencyLevel = other.IdempotencyLevel;
-      }
-      uninterpretedOption_.Add(other.uninterpretedOption_);
-      pb::ExtensionSet.MergeFrom(ref _extensions, other._extensions);
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            if (!pb::ExtensionSet.TryMergeFieldFrom(ref _extensions, input)) {
-              _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            }
-            break;
-          case 264: {
-            Deprecated = input.ReadBool();
-            break;
-          }
-          case 272: {
-            IdempotencyLevel = (global::Google.Protobuf.Reflection.MethodOptions.Types.IdempotencyLevel) input.ReadEnum();
-            break;
-          }
-          case 7994: {
-            uninterpretedOption_.AddEntriesFrom(input, _repeated_uninterpretedOption_codec);
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            if (!pb::ExtensionSet.TryMergeFieldFrom(ref _extensions, ref input)) {
-              _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            }
-            break;
-          case 264: {
-            Deprecated = input.ReadBool();
-            break;
-          }
-          case 272: {
-            IdempotencyLevel = (global::Google.Protobuf.Reflection.MethodOptions.Types.IdempotencyLevel) input.ReadEnum();
-            break;
-          }
-          case 7994: {
-            uninterpretedOption_.AddEntriesFrom(ref input, _repeated_uninterpretedOption_codec);
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-    public TValue GetExtension<TValue>(pb::Extension<MethodOptions, TValue> extension) {
-      return pb::ExtensionSet.Get(ref _extensions, extension);
-    }
-    public pbc::RepeatedField<TValue> GetExtension<TValue>(pb::RepeatedExtension<MethodOptions, TValue> extension) {
-      return pb::ExtensionSet.Get(ref _extensions, extension);
-    }
-    public pbc::RepeatedField<TValue> GetOrInitializeExtension<TValue>(pb::RepeatedExtension<MethodOptions, TValue> extension) {
-      return pb::ExtensionSet.GetOrInitialize(ref _extensions, extension);
-    }
-    public void SetExtension<TValue>(pb::Extension<MethodOptions, TValue> extension, TValue value) {
-      pb::ExtensionSet.Set(ref _extensions, extension, value);
-    }
-    public bool HasExtension<TValue>(pb::Extension<MethodOptions, TValue> extension) {
-      return pb::ExtensionSet.Has(ref _extensions, extension);
-    }
-    public void ClearExtension<TValue>(pb::Extension<MethodOptions, TValue> extension) {
-      pb::ExtensionSet.Clear(ref _extensions, extension);
-    }
-    public void ClearExtension<TValue>(pb::RepeatedExtension<MethodOptions, TValue> extension) {
-      pb::ExtensionSet.Clear(ref _extensions, extension);
-    }
-
-    #region Nested types
-    /// <summary>Container for nested types declared in the MethodOptions message type.</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static partial class Types {
-      /// <summary>
-      /// Is this method side-effect-free (or safe in HTTP parlance), or idempotent,
-      /// or neither? HTTP based RPC implementation may choose GET verb for safe
-      /// methods, and PUT verb for idempotent methods instead of the default POST.
-      /// </summary>
-      public enum IdempotencyLevel {
-        [pbr::OriginalName("IDEMPOTENCY_UNKNOWN")] IdempotencyUnknown = 0,
-        /// <summary>
-        /// implies idempotent
-        /// </summary>
-        [pbr::OriginalName("NO_SIDE_EFFECTS")] NoSideEffects = 1,
-        /// <summary>
-        /// idempotent, but may have side effects
-        /// </summary>
-        [pbr::OriginalName("IDEMPOTENT")] Idempotent = 2,
-      }
-
-    }
-    #endregion
-
-  }
-
-  /// <summary>
-  /// A message representing a option the parser does not recognize. This only
-  /// appears in options protos created by the compiler::Parser class.
-  /// DescriptorPool resolves these when building Descriptor objects. Therefore,
-  /// options protos in descriptor objects (e.g. returned by Descriptor::options(),
-  /// or produced by Descriptor::CopyTo()) will never have UninterpretedOptions
-  /// in them.
-  /// </summary>
-  public sealed partial class UninterpretedOption : pb::IMessage<UninterpretedOption>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<UninterpretedOption> _parser = new pb::MessageParser<UninterpretedOption>(() => new UninterpretedOption());
-    private pb::UnknownFieldSet _unknownFields;
-    private int _hasBits0;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<UninterpretedOption> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.Reflection.DescriptorReflection.Descriptor.MessageTypes[18]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public UninterpretedOption() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public UninterpretedOption(UninterpretedOption other) : this() {
-      _hasBits0 = other._hasBits0;
-      name_ = other.name_.Clone();
-      identifierValue_ = other.identifierValue_;
-      positiveIntValue_ = other.positiveIntValue_;
-      negativeIntValue_ = other.negativeIntValue_;
-      doubleValue_ = other.doubleValue_;
-      stringValue_ = other.stringValue_;
-      aggregateValue_ = other.aggregateValue_;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public UninterpretedOption Clone() {
-      return new UninterpretedOption(this);
-    }
-
-    /// <summary>Field number for the "name" field.</summary>
-    public const int NameFieldNumber = 2;
-    private static readonly pb::FieldCodec<global::Google.Protobuf.Reflection.UninterpretedOption.Types.NamePart> _repeated_name_codec
-        = pb::FieldCodec.ForMessage(18, global::Google.Protobuf.Reflection.UninterpretedOption.Types.NamePart.Parser);
-    private readonly pbc::RepeatedField<global::Google.Protobuf.Reflection.UninterpretedOption.Types.NamePart> name_ = new pbc::RepeatedField<global::Google.Protobuf.Reflection.UninterpretedOption.Types.NamePart>();
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Google.Protobuf.Reflection.UninterpretedOption.Types.NamePart> Name {
-      get { return name_; }
-    }
-
-    /// <summary>Field number for the "identifier_value" field.</summary>
-    public const int IdentifierValueFieldNumber = 3;
-    private readonly static string IdentifierValueDefaultValue = "";
-
-    private string identifierValue_;
-    /// <summary>
-    /// The value of the uninterpreted option, in whatever type the tokenizer
-    /// identified it as during parsing. Exactly one of these should be set.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string IdentifierValue {
-      get { return identifierValue_ ?? IdentifierValueDefaultValue; }
-      set {
-        identifierValue_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-    /// <summary>Gets whether the "identifier_value" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasIdentifierValue {
-      get { return identifierValue_ != null; }
-    }
-    /// <summary>Clears the value of the "identifier_value" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearIdentifierValue() {
-      identifierValue_ = null;
-    }
-
-    /// <summary>Field number for the "positive_int_value" field.</summary>
-    public const int PositiveIntValueFieldNumber = 4;
-    private readonly static ulong PositiveIntValueDefaultValue = 0UL;
-
-    private ulong positiveIntValue_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ulong PositiveIntValue {
-      get { if ((_hasBits0 & 1) != 0) { return positiveIntValue_; } else { return PositiveIntValueDefaultValue; } }
-      set {
-        _hasBits0 |= 1;
-        positiveIntValue_ = value;
-      }
-    }
-    /// <summary>Gets whether the "positive_int_value" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasPositiveIntValue {
-      get { return (_hasBits0 & 1) != 0; }
-    }
-    /// <summary>Clears the value of the "positive_int_value" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearPositiveIntValue() {
-      _hasBits0 &= ~1;
-    }
-
-    /// <summary>Field number for the "negative_int_value" field.</summary>
-    public const int NegativeIntValueFieldNumber = 5;
-    private readonly static long NegativeIntValueDefaultValue = 0L;
-
-    private long negativeIntValue_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public long NegativeIntValue {
-      get { if ((_hasBits0 & 2) != 0) { return negativeIntValue_; } else { return NegativeIntValueDefaultValue; } }
-      set {
-        _hasBits0 |= 2;
-        negativeIntValue_ = value;
-      }
-    }
-    /// <summary>Gets whether the "negative_int_value" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasNegativeIntValue {
-      get { return (_hasBits0 & 2) != 0; }
-    }
-    /// <summary>Clears the value of the "negative_int_value" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearNegativeIntValue() {
-      _hasBits0 &= ~2;
-    }
-
-    /// <summary>Field number for the "double_value" field.</summary>
-    public const int DoubleValueFieldNumber = 6;
-    private readonly static double DoubleValueDefaultValue = 0D;
-
-    private double doubleValue_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double DoubleValue {
-      get { if ((_hasBits0 & 4) != 0) { return doubleValue_; } else { return DoubleValueDefaultValue; } }
-      set {
-        _hasBits0 |= 4;
-        doubleValue_ = value;
-      }
-    }
-    /// <summary>Gets whether the "double_value" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasDoubleValue {
-      get { return (_hasBits0 & 4) != 0; }
-    }
-    /// <summary>Clears the value of the "double_value" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearDoubleValue() {
-      _hasBits0 &= ~4;
-    }
-
-    /// <summary>Field number for the "string_value" field.</summary>
-    public const int StringValueFieldNumber = 7;
-    private readonly static pb::ByteString StringValueDefaultValue = pb::ByteString.Empty;
-
-    private pb::ByteString stringValue_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pb::ByteString StringValue {
-      get { return stringValue_ ?? StringValueDefaultValue; }
-      set {
-        stringValue_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-    /// <summary>Gets whether the "string_value" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasStringValue {
-      get { return stringValue_ != null; }
-    }
-    /// <summary>Clears the value of the "string_value" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearStringValue() {
-      stringValue_ = null;
-    }
-
-    /// <summary>Field number for the "aggregate_value" field.</summary>
-    public const int AggregateValueFieldNumber = 8;
-    private readonly static string AggregateValueDefaultValue = "";
-
-    private string aggregateValue_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string AggregateValue {
-      get { return aggregateValue_ ?? AggregateValueDefaultValue; }
-      set {
-        aggregateValue_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-    /// <summary>Gets whether the "aggregate_value" field is set</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool HasAggregateValue {
-      get { return aggregateValue_ != null; }
-    }
-    /// <summary>Clears the value of the "aggregate_value" field</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearAggregateValue() {
-      aggregateValue_ = null;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as UninterpretedOption);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(UninterpretedOption other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if(!name_.Equals(other.name_)) return false;
-      if (IdentifierValue != other.IdentifierValue) return false;
-      if (PositiveIntValue != other.PositiveIntValue) return false;
-      if (NegativeIntValue != other.NegativeIntValue) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.Equals(DoubleValue, other.DoubleValue)) return false;
-      if (StringValue != other.StringValue) return false;
-      if (AggregateValue != other.AggregateValue) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      hash ^= name_.GetHashCode();
-      if (HasIdentifierValue) hash ^= IdentifierValue.GetHashCode();
-      if (HasPositiveIntValue) hash ^= PositiveIntValue.GetHashCode();
-      if (HasNegativeIntValue) hash ^= NegativeIntValue.GetHashCode();
-      if (HasDoubleValue) hash ^= pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.GetHashCode(DoubleValue);
-      if (HasStringValue) hash ^= StringValue.GetHashCode();
-      if (HasAggregateValue) hash ^= AggregateValue.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      name_.WriteTo(output, _repeated_name_codec);
-      if (HasIdentifierValue) {
-        output.WriteRawTag(26);
-        output.WriteString(IdentifierValue);
-      }
-      if (HasPositiveIntValue) {
-        output.WriteRawTag(32);
-        output.WriteUInt64(PositiveIntValue);
-      }
-      if (HasNegativeIntValue) {
-        output.WriteRawTag(40);
-        output.WriteInt64(NegativeIntValue);
-      }
-      if (HasDoubleValue) {
-        output.WriteRawTag(49);
-        output.WriteDouble(DoubleValue);
-      }
-      if (HasStringValue) {
-        output.WriteRawTag(58);
-        output.WriteBytes(StringValue);
-      }
-      if (HasAggregateValue) {
-        output.WriteRawTag(66);
-        output.WriteString(AggregateValue);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      name_.WriteTo(ref output, _repeated_name_codec);
-      if (HasIdentifierValue) {
-        output.WriteRawTag(26);
-        output.WriteString(IdentifierValue);
-      }
-      if (HasPositiveIntValue) {
-        output.WriteRawTag(32);
-        output.WriteUInt64(PositiveIntValue);
-      }
-      if (HasNegativeIntValue) {
-        output.WriteRawTag(40);
-        output.WriteInt64(NegativeIntValue);
-      }
-      if (HasDoubleValue) {
-        output.WriteRawTag(49);
-        output.WriteDouble(DoubleValue);
-      }
-      if (HasStringValue) {
-        output.WriteRawTag(58);
-        output.WriteBytes(StringValue);
-      }
-      if (HasAggregateValue) {
-        output.WriteRawTag(66);
-        output.WriteString(AggregateValue);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      size += name_.CalculateSize(_repeated_name_codec);
-      if (HasIdentifierValue) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(IdentifierValue);
-      }
-      if (HasPositiveIntValue) {
-        size += 1 + pb::CodedOutputStream.ComputeUInt64Size(PositiveIntValue);
-      }
-      if (HasNegativeIntValue) {
-        size += 1 + pb::CodedOutputStream.ComputeInt64Size(NegativeIntValue);
-      }
-      if (HasDoubleValue) {
-        size += 1 + 8;
-      }
-      if (HasStringValue) {
-        size += 1 + pb::CodedOutputStream.ComputeBytesSize(StringValue);
-      }
-      if (HasAggregateValue) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(AggregateValue);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(UninterpretedOption other) {
-      if (other == null) {
-        return;
-      }
-      name_.Add(other.name_);
-      if (other.HasIdentifierValue) {
-        IdentifierValue = other.IdentifierValue;
-      }
-      if (other.HasPositiveIntValue) {
-        PositiveIntValue = other.PositiveIntValue;
-      }
-      if (other.HasNegativeIntValue) {
-        NegativeIntValue = other.NegativeIntValue;
-      }
-      if (other.HasDoubleValue) {
-        DoubleValue = other.DoubleValue;
-      }
-      if (other.HasStringValue) {
-        StringValue = other.StringValue;
-      }
-      if (other.HasAggregateValue) {
-        AggregateValue = other.AggregateValue;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 18: {
-            name_.AddEntriesFrom(input, _repeated_name_codec);
-            break;
-          }
-          case 26: {
-            IdentifierValue = input.ReadString();
-            break;
-          }
-          case 32: {
-            PositiveIntValue = input.ReadUInt64();
-            break;
-          }
-          case 40: {
-            NegativeIntValue = input.ReadInt64();
-            break;
-          }
-          case 49: {
-            DoubleValue = input.ReadDouble();
-            break;
-          }
-          case 58: {
-            StringValue = input.ReadBytes();
-            break;
-          }
-          case 66: {
-            AggregateValue = input.ReadString();
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 18: {
-            name_.AddEntriesFrom(ref input, _repeated_name_codec);
-            break;
-          }
-          case 26: {
-            IdentifierValue = input.ReadString();
-            break;
-          }
-          case 32: {
-            PositiveIntValue = input.ReadUInt64();
-            break;
-          }
-          case 40: {
-            NegativeIntValue = input.ReadInt64();
-            break;
-          }
-          case 49: {
-            DoubleValue = input.ReadDouble();
-            break;
-          }
-          case 58: {
-            StringValue = input.ReadBytes();
-            break;
-          }
-          case 66: {
-            AggregateValue = input.ReadString();
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-    #region Nested types
-    /// <summary>Container for nested types declared in the UninterpretedOption message type.</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static partial class Types {
-      /// <summary>
-      /// The name of the uninterpreted option.  Each string represents a segment in
-      /// a dot-separated name.  is_extension is true iff a segment represents an
-      /// extension (denoted with parentheses in options specs in .proto files).
-      /// E.g.,{ ["foo", false], ["bar.baz", true], ["moo", false] } represents
-      /// "foo.(bar.baz).moo".
-      /// </summary>
-      public sealed partial class NamePart : pb::IMessage<NamePart>
-      #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          , pb::IBufferMessage
-      #endif
-      {
-        private static readonly pb::MessageParser<NamePart> _parser = new pb::MessageParser<NamePart>(() => new NamePart());
-        private pb::UnknownFieldSet _unknownFields;
-        private int _hasBits0;
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static pb::MessageParser<NamePart> Parser { get { return _parser; } }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static pbr::MessageDescriptor Descriptor {
-          get { return global::Google.Protobuf.Reflection.UninterpretedOption.Descriptor.NestedTypes[0]; }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        pbr::MessageDescriptor pb::IMessage.Descriptor {
-          get { return Descriptor; }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public NamePart() {
-          OnConstruction();
-        }
-
-        partial void OnConstruction();
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public NamePart(NamePart other) : this() {
-          _hasBits0 = other._hasBits0;
-          namePart_ = other.namePart_;
-          isExtension_ = other.isExtension_;
-          _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public NamePart Clone() {
-          return new NamePart(this);
-        }
-
-        /// <summary>Field number for the "name_part" field.</summary>
-        public const int NamePart_FieldNumber = 1;
-        private readonly static string NamePart_DefaultValue = "";
-
-        private string namePart_;
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public string NamePart_ {
-          get { return namePart_ ?? NamePart_DefaultValue; }
-          set {
-            namePart_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-          }
-        }
-        /// <summary>Gets whether the "name_part" field is set</summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool HasNamePart_ {
-          get { return namePart_ != null; }
-        }
-        /// <summary>Clears the value of the "name_part" field</summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void ClearNamePart_() {
-          namePart_ = null;
-        }
-
-        /// <summary>Field number for the "is_extension" field.</summary>
-        public const int IsExtensionFieldNumber = 2;
-        private readonly static bool IsExtensionDefaultValue = false;
-
-        private bool isExtension_;
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool IsExtension {
-          get { if ((_hasBits0 & 1) != 0) { return isExtension_; } else { return IsExtensionDefaultValue; } }
-          set {
-            _hasBits0 |= 1;
-            isExtension_ = value;
-          }
-        }
-        /// <summary>Gets whether the "is_extension" field is set</summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool HasIsExtension {
-          get { return (_hasBits0 & 1) != 0; }
-        }
-        /// <summary>Clears the value of the "is_extension" field</summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void ClearIsExtension() {
-          _hasBits0 &= ~1;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override bool Equals(object other) {
-          return Equals(other as NamePart);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool Equals(NamePart other) {
-          if (ReferenceEquals(other, null)) {
-            return false;
-          }
-          if (ReferenceEquals(other, this)) {
-            return true;
-          }
-          if (NamePart_ != other.NamePart_) return false;
-          if (IsExtension != other.IsExtension) return false;
-          return Equals(_unknownFields, other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override int GetHashCode() {
-          int hash = 1;
-          if (HasNamePart_) hash ^= NamePart_.GetHashCode();
-          if (HasIsExtension) hash ^= IsExtension.GetHashCode();
-          if (_unknownFields != null) {
-            hash ^= _unknownFields.GetHashCode();
-          }
-          return hash;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override string ToString() {
-          return pb::JsonFormatter.ToDiagnosticString(this);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void WriteTo(pb::CodedOutputStream output) {
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          output.WriteRawMessage(this);
-        #else
-          if (HasNamePart_) {
-            output.WriteRawTag(10);
-            output.WriteString(NamePart_);
-          }
-          if (HasIsExtension) {
-            output.WriteRawTag(16);
-            output.WriteBool(IsExtension);
-          }
-          if (_unknownFields != null) {
-            _unknownFields.WriteTo(output);
-          }
-        #endif
-        }
-
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-          if (HasNamePart_) {
-            output.WriteRawTag(10);
-            output.WriteString(NamePart_);
-          }
-          if (HasIsExtension) {
-            output.WriteRawTag(16);
-            output.WriteBool(IsExtension);
-          }
-          if (_unknownFields != null) {
-            _unknownFields.WriteTo(ref output);
-          }
-        }
-        #endif
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public int CalculateSize() {
-          int size = 0;
-          if (HasNamePart_) {
-            size += 1 + pb::CodedOutputStream.ComputeStringSize(NamePart_);
-          }
-          if (HasIsExtension) {
-            size += 1 + 1;
-          }
-          if (_unknownFields != null) {
-            size += _unknownFields.CalculateSize();
-          }
-          return size;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(NamePart other) {
-          if (other == null) {
-            return;
-          }
-          if (other.HasNamePart_) {
-            NamePart_ = other.NamePart_;
-          }
-          if (other.HasIsExtension) {
-            IsExtension = other.IsExtension;
-          }
-          _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(pb::CodedInputStream input) {
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          input.ReadRawMessage(this);
-        #else
-          uint tag;
-          while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
-              default:
-                _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-                break;
-              case 10: {
-                NamePart_ = input.ReadString();
-                break;
-              }
-              case 16: {
-                IsExtension = input.ReadBool();
-                break;
-              }
-            }
-          }
-        #endif
-        }
-
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-          uint tag;
-          while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
-              default:
-                _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-                break;
-              case 10: {
-                NamePart_ = input.ReadString();
-                break;
-              }
-              case 16: {
-                IsExtension = input.ReadBool();
-                break;
-              }
-            }
-          }
-        }
-        #endif
-
-      }
-
-    }
-    #endregion
-
-  }
-
-  /// <summary>
-  /// Encapsulates information about the original source file from which a
-  /// FileDescriptorProto was generated.
-  /// </summary>
-  public sealed partial class SourceCodeInfo : pb::IMessage<SourceCodeInfo>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<SourceCodeInfo> _parser = new pb::MessageParser<SourceCodeInfo>(() => new SourceCodeInfo());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<SourceCodeInfo> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.Reflection.DescriptorReflection.Descriptor.MessageTypes[19]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public SourceCodeInfo() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public SourceCodeInfo(SourceCodeInfo other) : this() {
-      location_ = other.location_.Clone();
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public SourceCodeInfo Clone() {
-      return new SourceCodeInfo(this);
-    }
-
-    /// <summary>Field number for the "location" field.</summary>
-    public const int LocationFieldNumber = 1;
-    private static readonly pb::FieldCodec<global::Google.Protobuf.Reflection.SourceCodeInfo.Types.Location> _repeated_location_codec
-        = pb::FieldCodec.ForMessage(10, global::Google.Protobuf.Reflection.SourceCodeInfo.Types.Location.Parser);
-    private readonly pbc::RepeatedField<global::Google.Protobuf.Reflection.SourceCodeInfo.Types.Location> location_ = new pbc::RepeatedField<global::Google.Protobuf.Reflection.SourceCodeInfo.Types.Location>();
-    /// <summary>
-    /// A Location identifies a piece of source code in a .proto file which
-    /// corresponds to a particular definition.  This information is intended
-    /// to be useful to IDEs, code indexers, documentation generators, and similar
-    /// tools.
-    ///
-    /// For example, say we have a file like:
-    ///   message Foo {
-    ///     optional string foo = 1;
-    ///   }
-    /// Let's look at just the field definition:
-    ///   optional string foo = 1;
-    ///   ^       ^^     ^^  ^  ^^^
-    ///   a       bc     de  f  ghi
-    /// We have the following locations:
-    ///   span   path               represents
-    ///   [a,i)  [ 4, 0, 2, 0 ]     The whole field definition.
-    ///   [a,b)  [ 4, 0, 2, 0, 4 ]  The label (optional).
-    ///   [c,d)  [ 4, 0, 2, 0, 5 ]  The type (string).
-    ///   [e,f)  [ 4, 0, 2, 0, 1 ]  The name (foo).
-    ///   [g,h)  [ 4, 0, 2, 0, 3 ]  The number (1).
-    ///
-    /// Notes:
-    /// - A location may refer to a repeated field itself (i.e. not to any
-    ///   particular index within it).  This is used whenever a set of elements are
-    ///   logically enclosed in a single code segment.  For example, an entire
-    ///   extend block (possibly containing multiple extension definitions) will
-    ///   have an outer location whose path refers to the "extensions" repeated
-    ///   field without an index.
-    /// - Multiple locations may have the same path.  This happens when a single
-    ///   logical declaration is spread out across multiple places.  The most
-    ///   obvious example is the "extend" block again -- there may be multiple
-    ///   extend blocks in the same scope, each of which will have the same path.
-    /// - A location's span is not always a subset of its parent's span.  For
-    ///   example, the "extendee" of an extension declaration appears at the
-    ///   beginning of the "extend" block and is shared by all extensions within
-    ///   the block.
-    /// - Just because a location's span is a subset of some other location's span
-    ///   does not mean that it is a descendant.  For example, a "group" defines
-    ///   both a type and a field in a single declaration.  Thus, the locations
-    ///   corresponding to the type and field and their components will overlap.
-    /// - Code which tries to interpret locations should probably be designed to
-    ///   ignore those that it doesn't understand, as more types of locations could
-    ///   be recorded in the future.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Google.Protobuf.Reflection.SourceCodeInfo.Types.Location> Location {
-      get { return location_; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as SourceCodeInfo);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(SourceCodeInfo other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if(!location_.Equals(other.location_)) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      hash ^= location_.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      location_.WriteTo(output, _repeated_location_codec);
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      location_.WriteTo(ref output, _repeated_location_codec);
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      size += location_.CalculateSize(_repeated_location_codec);
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(SourceCodeInfo other) {
-      if (other == null) {
-        return;
-      }
-      location_.Add(other.location_);
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 10: {
-            location_.AddEntriesFrom(input, _repeated_location_codec);
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 10: {
-            location_.AddEntriesFrom(ref input, _repeated_location_codec);
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-    #region Nested types
-    /// <summary>Container for nested types declared in the SourceCodeInfo message type.</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static partial class Types {
-      public sealed partial class Location : pb::IMessage<Location>
-      #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          , pb::IBufferMessage
-      #endif
-      {
-        private static readonly pb::MessageParser<Location> _parser = new pb::MessageParser<Location>(() => new Location());
-        private pb::UnknownFieldSet _unknownFields;
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static pb::MessageParser<Location> Parser { get { return _parser; } }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static pbr::MessageDescriptor Descriptor {
-          get { return global::Google.Protobuf.Reflection.SourceCodeInfo.Descriptor.NestedTypes[0]; }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        pbr::MessageDescriptor pb::IMessage.Descriptor {
-          get { return Descriptor; }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public Location() {
-          OnConstruction();
-        }
-
-        partial void OnConstruction();
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public Location(Location other) : this() {
-          path_ = other.path_.Clone();
-          span_ = other.span_.Clone();
-          leadingComments_ = other.leadingComments_;
-          trailingComments_ = other.trailingComments_;
-          leadingDetachedComments_ = other.leadingDetachedComments_.Clone();
-          _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public Location Clone() {
-          return new Location(this);
-        }
-
-        /// <summary>Field number for the "path" field.</summary>
-        public const int PathFieldNumber = 1;
-        private static readonly pb::FieldCodec<int> _repeated_path_codec
-            = pb::FieldCodec.ForInt32(10);
-        private readonly pbc::RepeatedField<int> path_ = new pbc::RepeatedField<int>();
-        /// <summary>
-        /// Identifies which part of the FileDescriptorProto was defined at this
-        /// location.
-        ///
-        /// Each element is a field number or an index.  They form a path from
-        /// the root FileDescriptorProto to the place where the definition occurs.
-        /// For example, this path:
-        ///   [ 4, 3, 2, 7, 1 ]
-        /// refers to:
-        ///   file.message_type(3)  // 4, 3
-        ///       .field(7)         // 2, 7
-        ///       .name()           // 1
-        /// This is because FileDescriptorProto.message_type has field number 4:
-        ///   repeated DescriptorProto message_type = 4;
-        /// and DescriptorProto.field has field number 2:
-        ///   repeated FieldDescriptorProto field = 2;
-        /// and FieldDescriptorProto.name has field number 1:
-        ///   optional string name = 1;
-        ///
-        /// Thus, the above path gives the location of a field name.  If we removed
-        /// the last element:
-        ///   [ 4, 3, 2, 7 ]
-        /// this path refers to the whole field declaration (from the beginning
-        /// of the label to the terminating semicolon).
-        /// </summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public pbc::RepeatedField<int> Path {
-          get { return path_; }
-        }
-
-        /// <summary>Field number for the "span" field.</summary>
-        public const int SpanFieldNumber = 2;
-        private static readonly pb::FieldCodec<int> _repeated_span_codec
-            = pb::FieldCodec.ForInt32(18);
-        private readonly pbc::RepeatedField<int> span_ = new pbc::RepeatedField<int>();
-        /// <summary>
-        /// Always has exactly three or four elements: start line, start column,
-        /// end line (optional, otherwise assumed same as start line), end column.
-        /// These are packed into a single field for efficiency.  Note that line
-        /// and column numbers are zero-based -- typically you will want to add
-        /// 1 to each before displaying to a user.
-        /// </summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public pbc::RepeatedField<int> Span {
-          get { return span_; }
-        }
-
-        /// <summary>Field number for the "leading_comments" field.</summary>
-        public const int LeadingCommentsFieldNumber = 3;
-        private readonly static string LeadingCommentsDefaultValue = "";
-
-        private string leadingComments_;
-        /// <summary>
-        /// If this SourceCodeInfo represents a complete declaration, these are any
-        /// comments appearing before and after the declaration which appear to be
-        /// attached to the declaration.
-        ///
-        /// A series of line comments appearing on consecutive lines, with no other
-        /// tokens appearing on those lines, will be treated as a single comment.
-        ///
-        /// leading_detached_comments will keep paragraphs of comments that appear
-        /// before (but not connected to) the current element. Each paragraph,
-        /// separated by empty lines, will be one comment element in the repeated
-        /// field.
-        ///
-        /// Only the comment content is provided; comment markers (e.g. //) are
-        /// stripped out.  For block comments, leading whitespace and an asterisk
-        /// will be stripped from the beginning of each line other than the first.
-        /// Newlines are included in the output.
-        ///
-        /// Examples:
-        ///
-        ///   optional int32 foo = 1;  // Comment attached to foo.
-        ///   // Comment attached to bar.
-        ///   optional int32 bar = 2;
-        ///
-        ///   optional string baz = 3;
-        ///   // Comment attached to baz.
-        ///   // Another line attached to baz.
-        ///
-        ///   // Comment attached to moo.
-        ///   //
-        ///   // Another line attached to moo.
-        ///   optional double moo = 4;
-        ///
-        ///   // Detached comment for corge. This is not leading or trailing comments
-        ///   // to moo or corge because there are blank lines separating it from
-        ///   // both.
-        ///
-        ///   // Detached comment for corge paragraph 2.
-        ///
-        ///   optional string corge = 5;
-        ///   /* Block comment attached
-        ///    * to corge.  Leading asterisks
-        ///    * will be removed. */
-        ///   /* Block comment attached to
-        ///    * grault. */
-        ///   optional int32 grault = 6;
-        ///
-        ///   // ignored detached comments.
-        /// </summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public string LeadingComments {
-          get { return leadingComments_ ?? LeadingCommentsDefaultValue; }
-          set {
-            leadingComments_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-          }
-        }
-        /// <summary>Gets whether the "leading_comments" field is set</summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool HasLeadingComments {
-          get { return leadingComments_ != null; }
-        }
-        /// <summary>Clears the value of the "leading_comments" field</summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void ClearLeadingComments() {
-          leadingComments_ = null;
-        }
-
-        /// <summary>Field number for the "trailing_comments" field.</summary>
-        public const int TrailingCommentsFieldNumber = 4;
-        private readonly static string TrailingCommentsDefaultValue = "";
-
-        private string trailingComments_;
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public string TrailingComments {
-          get { return trailingComments_ ?? TrailingCommentsDefaultValue; }
-          set {
-            trailingComments_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-          }
-        }
-        /// <summary>Gets whether the "trailing_comments" field is set</summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool HasTrailingComments {
-          get { return trailingComments_ != null; }
-        }
-        /// <summary>Clears the value of the "trailing_comments" field</summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void ClearTrailingComments() {
-          trailingComments_ = null;
-        }
-
-        /// <summary>Field number for the "leading_detached_comments" field.</summary>
-        public const int LeadingDetachedCommentsFieldNumber = 6;
-        private static readonly pb::FieldCodec<string> _repeated_leadingDetachedComments_codec
-            = pb::FieldCodec.ForString(50);
-        private readonly pbc::RepeatedField<string> leadingDetachedComments_ = new pbc::RepeatedField<string>();
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public pbc::RepeatedField<string> LeadingDetachedComments {
-          get { return leadingDetachedComments_; }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override bool Equals(object other) {
-          return Equals(other as Location);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool Equals(Location other) {
-          if (ReferenceEquals(other, null)) {
-            return false;
-          }
-          if (ReferenceEquals(other, this)) {
-            return true;
-          }
-          if(!path_.Equals(other.path_)) return false;
-          if(!span_.Equals(other.span_)) return false;
-          if (LeadingComments != other.LeadingComments) return false;
-          if (TrailingComments != other.TrailingComments) return false;
-          if(!leadingDetachedComments_.Equals(other.leadingDetachedComments_)) return false;
-          return Equals(_unknownFields, other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override int GetHashCode() {
-          int hash = 1;
-          hash ^= path_.GetHashCode();
-          hash ^= span_.GetHashCode();
-          if (HasLeadingComments) hash ^= LeadingComments.GetHashCode();
-          if (HasTrailingComments) hash ^= TrailingComments.GetHashCode();
-          hash ^= leadingDetachedComments_.GetHashCode();
-          if (_unknownFields != null) {
-            hash ^= _unknownFields.GetHashCode();
-          }
-          return hash;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override string ToString() {
-          return pb::JsonFormatter.ToDiagnosticString(this);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void WriteTo(pb::CodedOutputStream output) {
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          output.WriteRawMessage(this);
-        #else
-          path_.WriteTo(output, _repeated_path_codec);
-          span_.WriteTo(output, _repeated_span_codec);
-          if (HasLeadingComments) {
-            output.WriteRawTag(26);
-            output.WriteString(LeadingComments);
-          }
-          if (HasTrailingComments) {
-            output.WriteRawTag(34);
-            output.WriteString(TrailingComments);
-          }
-          leadingDetachedComments_.WriteTo(output, _repeated_leadingDetachedComments_codec);
-          if (_unknownFields != null) {
-            _unknownFields.WriteTo(output);
-          }
-        #endif
-        }
-
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-          path_.WriteTo(ref output, _repeated_path_codec);
-          span_.WriteTo(ref output, _repeated_span_codec);
-          if (HasLeadingComments) {
-            output.WriteRawTag(26);
-            output.WriteString(LeadingComments);
-          }
-          if (HasTrailingComments) {
-            output.WriteRawTag(34);
-            output.WriteString(TrailingComments);
-          }
-          leadingDetachedComments_.WriteTo(ref output, _repeated_leadingDetachedComments_codec);
-          if (_unknownFields != null) {
-            _unknownFields.WriteTo(ref output);
-          }
-        }
-        #endif
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public int CalculateSize() {
-          int size = 0;
-          size += path_.CalculateSize(_repeated_path_codec);
-          size += span_.CalculateSize(_repeated_span_codec);
-          if (HasLeadingComments) {
-            size += 1 + pb::CodedOutputStream.ComputeStringSize(LeadingComments);
-          }
-          if (HasTrailingComments) {
-            size += 1 + pb::CodedOutputStream.ComputeStringSize(TrailingComments);
-          }
-          size += leadingDetachedComments_.CalculateSize(_repeated_leadingDetachedComments_codec);
-          if (_unknownFields != null) {
-            size += _unknownFields.CalculateSize();
-          }
-          return size;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(Location other) {
-          if (other == null) {
-            return;
-          }
-          path_.Add(other.path_);
-          span_.Add(other.span_);
-          if (other.HasLeadingComments) {
-            LeadingComments = other.LeadingComments;
-          }
-          if (other.HasTrailingComments) {
-            TrailingComments = other.TrailingComments;
-          }
-          leadingDetachedComments_.Add(other.leadingDetachedComments_);
-          _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(pb::CodedInputStream input) {
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          input.ReadRawMessage(this);
-        #else
-          uint tag;
-          while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
-              default:
-                _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-                break;
-              case 10:
-              case 8: {
-                path_.AddEntriesFrom(input, _repeated_path_codec);
-                break;
-              }
-              case 18:
-              case 16: {
-                span_.AddEntriesFrom(input, _repeated_span_codec);
-                break;
-              }
-              case 26: {
-                LeadingComments = input.ReadString();
-                break;
-              }
-              case 34: {
-                TrailingComments = input.ReadString();
-                break;
-              }
-              case 50: {
-                leadingDetachedComments_.AddEntriesFrom(input, _repeated_leadingDetachedComments_codec);
-                break;
-              }
-            }
-          }
-        #endif
-        }
-
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-          uint tag;
-          while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
-              default:
-                _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-                break;
-              case 10:
-              case 8: {
-                path_.AddEntriesFrom(ref input, _repeated_path_codec);
-                break;
-              }
-              case 18:
-              case 16: {
-                span_.AddEntriesFrom(ref input, _repeated_span_codec);
-                break;
-              }
-              case 26: {
-                LeadingComments = input.ReadString();
-                break;
-              }
-              case 34: {
-                TrailingComments = input.ReadString();
-                break;
-              }
-              case 50: {
-                leadingDetachedComments_.AddEntriesFrom(ref input, _repeated_leadingDetachedComments_codec);
-                break;
-              }
-            }
-          }
-        }
-        #endif
-
-      }
-
-    }
-    #endregion
-
-  }
-
-  /// <summary>
-  /// Describes the relationship between generated code and its original source
-  /// file. A GeneratedCodeInfo message is associated with only one generated
-  /// source file, but may contain references to different source .proto files.
-  /// </summary>
-  public sealed partial class GeneratedCodeInfo : pb::IMessage<GeneratedCodeInfo>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<GeneratedCodeInfo> _parser = new pb::MessageParser<GeneratedCodeInfo>(() => new GeneratedCodeInfo());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<GeneratedCodeInfo> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.Reflection.DescriptorReflection.Descriptor.MessageTypes[20]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public GeneratedCodeInfo() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public GeneratedCodeInfo(GeneratedCodeInfo other) : this() {
-      annotation_ = other.annotation_.Clone();
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public GeneratedCodeInfo Clone() {
-      return new GeneratedCodeInfo(this);
-    }
-
-    /// <summary>Field number for the "annotation" field.</summary>
-    public const int AnnotationFieldNumber = 1;
-    private static readonly pb::FieldCodec<global::Google.Protobuf.Reflection.GeneratedCodeInfo.Types.Annotation> _repeated_annotation_codec
-        = pb::FieldCodec.ForMessage(10, global::Google.Protobuf.Reflection.GeneratedCodeInfo.Types.Annotation.Parser);
-    private readonly pbc::RepeatedField<global::Google.Protobuf.Reflection.GeneratedCodeInfo.Types.Annotation> annotation_ = new pbc::RepeatedField<global::Google.Protobuf.Reflection.GeneratedCodeInfo.Types.Annotation>();
-    /// <summary>
-    /// An Annotation connects some span of text in generated code to an element
-    /// of its generating .proto file.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Google.Protobuf.Reflection.GeneratedCodeInfo.Types.Annotation> Annotation {
-      get { return annotation_; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as GeneratedCodeInfo);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(GeneratedCodeInfo other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if(!annotation_.Equals(other.annotation_)) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      hash ^= annotation_.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      annotation_.WriteTo(output, _repeated_annotation_codec);
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      annotation_.WriteTo(ref output, _repeated_annotation_codec);
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      size += annotation_.CalculateSize(_repeated_annotation_codec);
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(GeneratedCodeInfo other) {
-      if (other == null) {
-        return;
-      }
-      annotation_.Add(other.annotation_);
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 10: {
-            annotation_.AddEntriesFrom(input, _repeated_annotation_codec);
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 10: {
-            annotation_.AddEntriesFrom(ref input, _repeated_annotation_codec);
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-    #region Nested types
-    /// <summary>Container for nested types declared in the GeneratedCodeInfo message type.</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static partial class Types {
-      public sealed partial class Annotation : pb::IMessage<Annotation>
-      #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          , pb::IBufferMessage
-      #endif
-      {
-        private static readonly pb::MessageParser<Annotation> _parser = new pb::MessageParser<Annotation>(() => new Annotation());
-        private pb::UnknownFieldSet _unknownFields;
-        private int _hasBits0;
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static pb::MessageParser<Annotation> Parser { get { return _parser; } }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public static pbr::MessageDescriptor Descriptor {
-          get { return global::Google.Protobuf.Reflection.GeneratedCodeInfo.Descriptor.NestedTypes[0]; }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        pbr::MessageDescriptor pb::IMessage.Descriptor {
-          get { return Descriptor; }
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public Annotation() {
-          OnConstruction();
-        }
-
-        partial void OnConstruction();
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public Annotation(Annotation other) : this() {
-          _hasBits0 = other._hasBits0;
-          path_ = other.path_.Clone();
-          sourceFile_ = other.sourceFile_;
-          begin_ = other.begin_;
-          end_ = other.end_;
-          _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public Annotation Clone() {
-          return new Annotation(this);
-        }
-
-        /// <summary>Field number for the "path" field.</summary>
-        public const int PathFieldNumber = 1;
-        private static readonly pb::FieldCodec<int> _repeated_path_codec
-            = pb::FieldCodec.ForInt32(10);
-        private readonly pbc::RepeatedField<int> path_ = new pbc::RepeatedField<int>();
-        /// <summary>
-        /// Identifies the element in the original source .proto file. This field
-        /// is formatted the same as SourceCodeInfo.Location.path.
-        /// </summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public pbc::RepeatedField<int> Path {
-          get { return path_; }
-        }
-
-        /// <summary>Field number for the "source_file" field.</summary>
-        public const int SourceFileFieldNumber = 2;
-        private readonly static string SourceFileDefaultValue = "";
-
-        private string sourceFile_;
-        /// <summary>
-        /// Identifies the filesystem path to the original source .proto.
-        /// </summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public string SourceFile {
-          get { return sourceFile_ ?? SourceFileDefaultValue; }
-          set {
-            sourceFile_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-          }
-        }
-        /// <summary>Gets whether the "source_file" field is set</summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool HasSourceFile {
-          get { return sourceFile_ != null; }
-        }
-        /// <summary>Clears the value of the "source_file" field</summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void ClearSourceFile() {
-          sourceFile_ = null;
-        }
-
-        /// <summary>Field number for the "begin" field.</summary>
-        public const int BeginFieldNumber = 3;
-        private readonly static int BeginDefaultValue = 0;
-
-        private int begin_;
-        /// <summary>
-        /// Identifies the starting offset in bytes in the generated code
-        /// that relates to the identified object.
-        /// </summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public int Begin {
-          get { if ((_hasBits0 & 1) != 0) { return begin_; } else { return BeginDefaultValue; } }
-          set {
-            _hasBits0 |= 1;
-            begin_ = value;
-          }
-        }
-        /// <summary>Gets whether the "begin" field is set</summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool HasBegin {
-          get { return (_hasBits0 & 1) != 0; }
-        }
-        /// <summary>Clears the value of the "begin" field</summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void ClearBegin() {
-          _hasBits0 &= ~1;
-        }
-
-        /// <summary>Field number for the "end" field.</summary>
-        public const int EndFieldNumber = 4;
-        private readonly static int EndDefaultValue = 0;
-
-        private int end_;
-        /// <summary>
-        /// Identifies the ending offset in bytes in the generated code that
-        /// relates to the identified offset. The end offset should be one past
-        /// the last relevant byte (so the length of the text = end - begin).
-        /// </summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public int End {
-          get { if ((_hasBits0 & 2) != 0) { return end_; } else { return EndDefaultValue; } }
-          set {
-            _hasBits0 |= 2;
-            end_ = value;
-          }
-        }
-        /// <summary>Gets whether the "end" field is set</summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool HasEnd {
-          get { return (_hasBits0 & 2) != 0; }
-        }
-        /// <summary>Clears the value of the "end" field</summary>
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void ClearEnd() {
-          _hasBits0 &= ~2;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override bool Equals(object other) {
-          return Equals(other as Annotation);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public bool Equals(Annotation other) {
-          if (ReferenceEquals(other, null)) {
-            return false;
-          }
-          if (ReferenceEquals(other, this)) {
-            return true;
-          }
-          if(!path_.Equals(other.path_)) return false;
-          if (SourceFile != other.SourceFile) return false;
-          if (Begin != other.Begin) return false;
-          if (End != other.End) return false;
-          return Equals(_unknownFields, other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override int GetHashCode() {
-          int hash = 1;
-          hash ^= path_.GetHashCode();
-          if (HasSourceFile) hash ^= SourceFile.GetHashCode();
-          if (HasBegin) hash ^= Begin.GetHashCode();
-          if (HasEnd) hash ^= End.GetHashCode();
-          if (_unknownFields != null) {
-            hash ^= _unknownFields.GetHashCode();
-          }
-          return hash;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public override string ToString() {
-          return pb::JsonFormatter.ToDiagnosticString(this);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void WriteTo(pb::CodedOutputStream output) {
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          output.WriteRawMessage(this);
-        #else
-          path_.WriteTo(output, _repeated_path_codec);
-          if (HasSourceFile) {
-            output.WriteRawTag(18);
-            output.WriteString(SourceFile);
-          }
-          if (HasBegin) {
-            output.WriteRawTag(24);
-            output.WriteInt32(Begin);
-          }
-          if (HasEnd) {
-            output.WriteRawTag(32);
-            output.WriteInt32(End);
-          }
-          if (_unknownFields != null) {
-            _unknownFields.WriteTo(output);
-          }
-        #endif
-        }
-
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-          path_.WriteTo(ref output, _repeated_path_codec);
-          if (HasSourceFile) {
-            output.WriteRawTag(18);
-            output.WriteString(SourceFile);
-          }
-          if (HasBegin) {
-            output.WriteRawTag(24);
-            output.WriteInt32(Begin);
-          }
-          if (HasEnd) {
-            output.WriteRawTag(32);
-            output.WriteInt32(End);
-          }
-          if (_unknownFields != null) {
-            _unknownFields.WriteTo(ref output);
-          }
-        }
-        #endif
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public int CalculateSize() {
-          int size = 0;
-          size += path_.CalculateSize(_repeated_path_codec);
-          if (HasSourceFile) {
-            size += 1 + pb::CodedOutputStream.ComputeStringSize(SourceFile);
-          }
-          if (HasBegin) {
-            size += 1 + pb::CodedOutputStream.ComputeInt32Size(Begin);
-          }
-          if (HasEnd) {
-            size += 1 + pb::CodedOutputStream.ComputeInt32Size(End);
-          }
-          if (_unknownFields != null) {
-            size += _unknownFields.CalculateSize();
-          }
-          return size;
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(Annotation other) {
-          if (other == null) {
-            return;
-          }
-          path_.Add(other.path_);
-          if (other.HasSourceFile) {
-            SourceFile = other.SourceFile;
-          }
-          if (other.HasBegin) {
-            Begin = other.Begin;
-          }
-          if (other.HasEnd) {
-            End = other.End;
-          }
-          _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-        }
-
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        public void MergeFrom(pb::CodedInputStream input) {
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-          input.ReadRawMessage(this);
-        #else
-          uint tag;
-          while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
-              default:
-                _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-                break;
-              case 10:
-              case 8: {
-                path_.AddEntriesFrom(input, _repeated_path_codec);
-                break;
-              }
-              case 18: {
-                SourceFile = input.ReadString();
-                break;
-              }
-              case 24: {
-                Begin = input.ReadInt32();
-                break;
-              }
-              case 32: {
-                End = input.ReadInt32();
-                break;
-              }
-            }
-          }
-        #endif
-        }
-
-        #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-        [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-        void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-          uint tag;
-          while ((tag = input.ReadTag()) != 0) {
-            switch(tag) {
-              default:
-                _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-                break;
-              case 10:
-              case 8: {
-                path_.AddEntriesFrom(ref input, _repeated_path_codec);
-                break;
-              }
-              case 18: {
-                SourceFile = input.ReadString();
-                break;
-              }
-              case 24: {
-                Begin = input.ReadInt32();
-                break;
-              }
-              case 32: {
-                End = input.ReadInt32();
-                break;
-              }
-            }
-          }
-        }
-        #endif
-
-      }
-
-    }
-    #endregion
-
-  }
-
-  #endregion
-
-}
-
-#endregion Designer generated code
diff --git a/libs/protobuf/csharp/src/Google.Protobuf/Reflection/DescriptorBase.cs b/libs/protobuf/csharp/src/Google.Protobuf/Reflection/DescriptorBase.cs
deleted file mode 100644
index 6befbf1..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf/Reflection/DescriptorBase.cs
+++ /dev/null
@@ -1,92 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System.Collections.Generic;
-
-namespace Google.Protobuf.Reflection
-{
-    /// <summary>
-    /// Base class for nearly all descriptors, providing common functionality.
-    /// </summary>
-    public abstract class DescriptorBase : IDescriptor
-    {
-        internal DescriptorBase(FileDescriptor file, string fullName, int index)
-        {
-            File = file;
-            FullName = fullName;
-            Index = index;
-        }
-
-        /// <value>
-        /// The index of this descriptor within its parent descriptor.
-        /// </value>
-        /// <remarks>
-        /// This returns the index of this descriptor within its parent, for
-        /// this descriptor's type. (There can be duplicate values for different
-        /// types, e.g. one enum type with index 0 and one message type with index 0.)
-        /// </remarks>
-        public int Index { get; }
-
-        /// <summary>
-        /// Returns the name of the entity (field, message etc) being described.
-        /// </summary>
-        public abstract string Name { get; }
-
-        /// <summary>
-        /// The fully qualified name of the descriptor's target.
-        /// </summary>
-        public string FullName { get; }
-
-        /// <value>
-        /// The file this descriptor was declared in.
-        /// </value>
-        public FileDescriptor File { get; }
-
-        /// <summary>
-        /// The declaration information about the descriptor, or null if no declaration information
-        /// is available for this descriptor.
-        /// </summary>
-        /// <remarks>
-        /// This information is typically only available for dynamically loaded descriptors,
-        /// for example within a protoc plugin where the full descriptors, including source info,
-        /// are passed to the code by protoc.
-        /// </remarks>
-        public DescriptorDeclaration Declaration => File.GetDeclaration(this);
-
-        /// <summary>
-        /// Retrieves the list of nested descriptors corresponding to the given field number, if any.
-        /// If the field is unknown or not a nested descriptor list, return null to terminate the search.
-        /// The default implementation returns null.
-        /// </summary>
-        internal virtual IReadOnlyList<DescriptorBase> GetNestedDescriptorListForField(int fieldNumber) => null;
-    }
-}
\ No newline at end of file
diff --git a/libs/protobuf/csharp/src/Google.Protobuf/Reflection/DescriptorDeclaration.cs b/libs/protobuf/csharp/src/Google.Protobuf/Reflection/DescriptorDeclaration.cs
deleted file mode 100644
index b22048f..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf/Reflection/DescriptorDeclaration.cs
+++ /dev/null
@@ -1,112 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2018 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Text;
-using static Google.Protobuf.Reflection.SourceCodeInfo.Types;
-
-namespace Google.Protobuf.Reflection
-{
-    /// <summary>
-    /// Provides additional information about the declaration of a descriptor,
-    /// such as source location and comments.
-    /// </summary>
-    public sealed class DescriptorDeclaration
-    {
-        /// <summary>
-        /// The descriptor this declaration relates to.
-        /// </summary>
-        public IDescriptor Descriptor { get; }
-
-        /// <summary>
-        /// The start line of the declaration within the source file. This value is 1-based.
-        /// </summary>
-        public int StartLine { get; }
-        /// <summary>
-        /// The start column of the declaration within the source file. This value is 1-based.
-        /// </summary>
-        public int StartColumn { get; }
-
-        /// <summary>
-        /// // The end line of the declaration within the source file. This value is 1-based.
-        /// </summary>
-        public int EndLine { get; }
-        /// <summary>
-        /// The end column of the declaration within the source file. This value is 1-based, and
-        /// exclusive. (The final character of the declaration is on the column before this value.)
-        /// </summary>
-        public int EndColumn { get; }
-
-        /// <summary>
-        /// Comments appearing before the declaration. Never null, but may be empty. Multi-line comments
-        /// are represented as a newline-separated string. Leading whitespace and the comment marker ("//")
-        /// are removed from each line.
-        /// </summary>
-        public string LeadingComments { get; }
-
-        /// <summary>
-        /// Comments appearing after the declaration. Never null, but may be empty. Multi-line comments
-        /// are represented as a newline-separated string. Leading whitespace and the comment marker ("//")
-        /// are removed from each line.
-        /// </summary>
-        public string TrailingComments { get; }
-
-        /// <summary>
-        /// Comments appearing before the declaration, but separated from it by blank
-        /// lines. Each string represents a newline-separated paragraph of comments.
-        /// Leading whitespace and the comment marker ("//") are removed from each line.
-        /// The list is never null, but may be empty. Likewise each element is never null, but may be empty.
-        /// </summary>
-        public IReadOnlyList<string> LeadingDetachedComments { get; }
-
-        private DescriptorDeclaration(IDescriptor descriptor, Location location)
-        {
-            // TODO: Validation
-            Descriptor = descriptor;
-            bool hasEndLine = location.Span.Count == 4;
-            // Lines and columns are 0-based in the proto.
-            StartLine = location.Span[0] + 1;
-            StartColumn = location.Span[1] + 1;
-            EndLine = hasEndLine ? location.Span[2] + 1 : StartLine;
-            EndColumn = location.Span[hasEndLine ? 3 : 2] + 1;
-            LeadingComments = location.LeadingComments;
-            TrailingComments = location.TrailingComments;
-            LeadingDetachedComments = new ReadOnlyCollection<string>(location.LeadingDetachedComments.ToList());
-        }
-
-        internal static DescriptorDeclaration FromProto(IDescriptor descriptor, Location location) =>
-            new DescriptorDeclaration(descriptor, location);
-    }
-}
diff --git a/libs/protobuf/csharp/src/Google.Protobuf/Reflection/DescriptorPool.cs b/libs/protobuf/csharp/src/Google.Protobuf/Reflection/DescriptorPool.cs
deleted file mode 100644
index 93f2fa9..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf/Reflection/DescriptorPool.cs
+++ /dev/null
@@ -1,334 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Text.RegularExpressions;
-
-namespace Google.Protobuf.Reflection
-{
-    /// <summary>
-    /// Contains lookup tables containing all the descriptors defined in a particular file.
-    /// </summary>
-    internal sealed class DescriptorPool
-    {
-        private readonly IDictionary<string, IDescriptor> descriptorsByName =
-            new Dictionary<string, IDescriptor>();
-
-        private readonly IDictionary<ObjectIntPair<IDescriptor>, FieldDescriptor> fieldsByNumber =
-            new Dictionary<ObjectIntPair<IDescriptor>, FieldDescriptor>();
-
-        private readonly IDictionary<ObjectIntPair<IDescriptor>, EnumValueDescriptor> enumValuesByNumber =
-            new Dictionary<ObjectIntPair<IDescriptor>, EnumValueDescriptor>();
-
-        private readonly HashSet<FileDescriptor> dependencies;
-
-        internal DescriptorPool(IEnumerable<FileDescriptor> dependencyFiles)
-        {
-            dependencies = new HashSet<FileDescriptor>();
-            foreach (var dependencyFile in dependencyFiles)
-            {
-                dependencies.Add(dependencyFile);
-                ImportPublicDependencies(dependencyFile);
-            }
-
-            foreach (FileDescriptor dependency in dependencyFiles)
-            {
-                AddPackage(dependency.Package, dependency);
-            }
-        }
-
-        private void ImportPublicDependencies(FileDescriptor file)
-        {
-            foreach (FileDescriptor dependency in file.PublicDependencies)
-            {
-                if (dependencies.Add(dependency))
-                {
-                    ImportPublicDependencies(dependency);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Finds a symbol of the given name within the pool.
-        /// </summary>
-        /// <typeparam name="T">The type of symbol to look for</typeparam>
-        /// <param name="fullName">Fully-qualified name to look up</param>
-        /// <returns>The symbol with the given name and type,
-        /// or null if the symbol doesn't exist or has the wrong type</returns>
-        internal T FindSymbol<T>(string fullName) where T : class
-        {
-            IDescriptor result;
-            descriptorsByName.TryGetValue(fullName, out result);
-            T descriptor = result as T;
-            if (descriptor != null)
-            {
-                return descriptor;
-            }
-
-            // dependencies contains direct dependencies and any *public* dependencies
-            // of those dependencies (transitively)... so we don't need to recurse here.
-            foreach (FileDescriptor dependency in dependencies)
-            {
-                dependency.DescriptorPool.descriptorsByName.TryGetValue(fullName, out result);
-                descriptor = result as T;
-                if (descriptor != null)
-                {
-                    return descriptor;
-                }
-            }
-
-            return null;
-        }
-
-        /// <summary>
-        /// Adds a package to the symbol tables. If a package by the same name
-        /// already exists, that is fine, but if some other kind of symbol
-        /// exists under the same name, an exception is thrown. If the package
-        /// has multiple components, this also adds the parent package(s).
-        /// </summary>
-        internal void AddPackage(string fullName, FileDescriptor file)
-        {
-            int dotpos = fullName.LastIndexOf('.');
-            String name;
-            if (dotpos != -1)
-            {
-                AddPackage(fullName.Substring(0, dotpos), file);
-                name = fullName.Substring(dotpos + 1);
-            }
-            else
-            {
-                name = fullName;
-            }
-
-            IDescriptor old;
-            if (descriptorsByName.TryGetValue(fullName, out old))
-            {
-                if (!(old is PackageDescriptor))
-                {
-                    throw new DescriptorValidationException(file,
-                                                            "\"" + name +
-                                                            "\" is already defined (as something other than a " +
-                                                            "package) in file \"" + old.File.Name + "\".");
-                }
-            }
-            descriptorsByName[fullName] = new PackageDescriptor(name, fullName, file);
-        }
-
-        /// <summary>
-        /// Adds a symbol to the symbol table.
-        /// </summary>
-        /// <exception cref="DescriptorValidationException">The symbol already existed
-        /// in the symbol table.</exception>
-        internal void AddSymbol(IDescriptor descriptor)
-        {
-            ValidateSymbolName(descriptor);
-            String fullName = descriptor.FullName;
-
-            IDescriptor old;
-            if (descriptorsByName.TryGetValue(fullName, out old))
-            {
-                int dotPos = fullName.LastIndexOf('.');
-                string message;
-                if (descriptor.File == old.File)
-                {
-                    if (dotPos == -1)
-                    {
-                        message = "\"" + fullName + "\" is already defined.";
-                    }
-                    else
-                    {
-                        message = "\"" + fullName.Substring(dotPos + 1) + "\" is already defined in \"" +
-                                  fullName.Substring(0, dotPos) + "\".";
-                    }
-                }
-                else
-                {
-                    message = "\"" + fullName + "\" is already defined in file \"" + old.File.Name + "\".";
-                }
-                throw new DescriptorValidationException(descriptor, message);
-            }
-            descriptorsByName[fullName] = descriptor;
-        }
-
-        private static readonly Regex ValidationRegex = new Regex("^[_A-Za-z][_A-Za-z0-9]*$",
-                                                                  FrameworkPortability.CompiledRegexWhereAvailable);
-
-        /// <summary>
-        /// Verifies that the descriptor's name is valid (i.e. it contains
-        /// only letters, digits and underscores, and does not start with a digit).
-        /// </summary>
-        /// <param name="descriptor"></param>
-        private static void ValidateSymbolName(IDescriptor descriptor)
-        {
-            if (descriptor.Name == "")
-            {
-                throw new DescriptorValidationException(descriptor, "Missing name.");
-            }
-            if (!ValidationRegex.IsMatch(descriptor.Name))
-            {
-                throw new DescriptorValidationException(descriptor,
-                                                        "\"" + descriptor.Name + "\" is not a valid identifier.");
-            }
-        }
-
-        /// <summary>
-        /// Returns the field with the given number in the given descriptor,
-        /// or null if it can't be found.
-        /// </summary>
-        internal FieldDescriptor FindFieldByNumber(MessageDescriptor messageDescriptor, int number)
-        {
-            FieldDescriptor ret;
-            fieldsByNumber.TryGetValue(new ObjectIntPair<IDescriptor>(messageDescriptor, number), out ret);
-            return ret;
-        }
-
-        internal EnumValueDescriptor FindEnumValueByNumber(EnumDescriptor enumDescriptor, int number)
-        {
-            EnumValueDescriptor ret;
-            enumValuesByNumber.TryGetValue(new ObjectIntPair<IDescriptor>(enumDescriptor, number), out ret);
-            return ret;
-        }
-
-        /// <summary>
-        /// Adds a field to the fieldsByNumber table.
-        /// </summary>
-        /// <exception cref="DescriptorValidationException">A field with the same
-        /// containing type and number already exists.</exception>
-        internal void AddFieldByNumber(FieldDescriptor field)
-        {
-            // for extensions, we use the extended type, otherwise we use the containing type
-            ObjectIntPair<IDescriptor> key = new ObjectIntPair<IDescriptor>(field.Proto.HasExtendee ? field.ExtendeeType : field.ContainingType, field.FieldNumber);
-            FieldDescriptor old;
-            if (fieldsByNumber.TryGetValue(key, out old))
-            {
-                throw new DescriptorValidationException(field, "Field number " + field.FieldNumber +
-                                                               "has already been used in \"" +
-                                                               field.ContainingType.FullName +
-                                                               "\" by field \"" + old.Name + "\".");
-            }
-            fieldsByNumber[key] = field;
-        }
-
-        /// <summary>
-        /// Adds an enum value to the enumValuesByNumber table. If an enum value
-        /// with the same type and number already exists, this method does nothing.
-        /// (This is allowed; the first value defined with the number takes precedence.)
-        /// </summary>
-        internal void AddEnumValueByNumber(EnumValueDescriptor enumValue)
-        {
-            ObjectIntPair<IDescriptor> key = new ObjectIntPair<IDescriptor>(enumValue.EnumDescriptor, enumValue.Number);
-            if (!enumValuesByNumber.ContainsKey(key))
-            {
-                enumValuesByNumber[key] = enumValue;
-            }
-        }
-
-        /// <summary>
-        /// Looks up a descriptor by name, relative to some other descriptor.
-        /// The name may be fully-qualified (with a leading '.'), partially-qualified,
-        /// or unqualified. C++-like name lookup semantics are used to search for the
-        /// matching descriptor.
-        /// </summary>
-        /// <remarks>
-        /// This isn't heavily optimized, but it's only used during cross linking anyway.
-        /// If it starts being used more widely, we should look at performance more carefully.
-        /// </remarks>
-        internal IDescriptor LookupSymbol(string name, IDescriptor relativeTo)
-        {
-            IDescriptor result;
-            if (name.StartsWith("."))
-            {
-                // Fully-qualified name.
-                result = FindSymbol<IDescriptor>(name.Substring(1));
-            }
-            else
-            {
-                // If "name" is a compound identifier, we want to search for the
-                // first component of it, then search within it for the rest.
-                int firstPartLength = name.IndexOf('.');
-                string firstPart = firstPartLength == -1 ? name : name.Substring(0, firstPartLength);
-
-                // We will search each parent scope of "relativeTo" looking for the
-                // symbol.
-                StringBuilder scopeToTry = new StringBuilder(relativeTo.FullName);
-
-                while (true)
-                {
-                    // Chop off the last component of the scope.
-
-                    int dotpos = scopeToTry.ToString().LastIndexOf(".");
-                    if (dotpos == -1)
-                    {
-                        result = FindSymbol<IDescriptor>(name);
-                        break;
-                    }
-                    else
-                    {
-                        scopeToTry.Length = dotpos + 1;
-
-                        // Append firstPart and try to find.
-                        scopeToTry.Append(firstPart);
-                        result = FindSymbol<IDescriptor>(scopeToTry.ToString());
-
-                        if (result != null)
-                        {
-                            if (firstPartLength != -1)
-                            {
-                                // We only found the first part of the symbol.  Now look for
-                                // the whole thing.  If this fails, we *don't* want to keep
-                                // searching parent scopes.
-                                scopeToTry.Length = dotpos + 1;
-                                scopeToTry.Append(name);
-                                result = FindSymbol<IDescriptor>(scopeToTry.ToString());
-                            }
-                            break;
-                        }
-
-                        // Not found.  Remove the name so we can try again.
-                        scopeToTry.Length = dotpos;
-                    }
-                }
-            }
-
-            if (result == null)
-            {
-                throw new DescriptorValidationException(relativeTo, "\"" + name + "\" is not defined.");
-            }
-            else
-            {
-                return result;
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/libs/protobuf/csharp/src/Google.Protobuf/Reflection/DescriptorUtil.cs b/libs/protobuf/csharp/src/Google.Protobuf/Reflection/DescriptorUtil.cs
deleted file mode 100644
index f5570fc..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf/Reflection/DescriptorUtil.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-
-namespace Google.Protobuf.Reflection
-{
-    /// <summary>
-    /// Internal class containing utility methods when working with descriptors.
-    /// </summary>
-    internal static class DescriptorUtil
-    {
-        /// <summary>
-        /// Equivalent to Func[TInput, int, TOutput] but usable in .NET 2.0. Only used to convert
-        /// arrays.
-        /// </summary>
-        internal delegate TOutput IndexedConverter<TInput, TOutput>(TInput element, int index);
-
-        /// <summary>
-        /// Converts the given array into a read-only list, applying the specified conversion to
-        /// each input element.
-        /// </summary>
-        internal static IList<TOutput> ConvertAndMakeReadOnly<TInput, TOutput>
-            (IList<TInput> input, IndexedConverter<TInput, TOutput> converter)
-        {
-            TOutput[] array = new TOutput[input.Count];
-            for (int i = 0; i < array.Length; i++)
-            {
-                array[i] = converter(input[i], i);
-            }
-            return new ReadOnlyCollection<TOutput>(array);
-        }
-    }
-}
\ No newline at end of file
diff --git a/libs/protobuf/csharp/src/Google.Protobuf/Reflection/DescriptorValidationException.cs b/libs/protobuf/csharp/src/Google.Protobuf/Reflection/DescriptorValidationException.cs
deleted file mode 100644
index 143671d..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf/Reflection/DescriptorValidationException.cs
+++ /dev/null
@@ -1,80 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-
-namespace Google.Protobuf.Reflection
-{
-    /// <summary>
-    /// Thrown when building descriptors fails because the source DescriptorProtos
-    /// are not valid.
-    /// </summary>
-    public sealed class DescriptorValidationException : Exception
-    {
-        private readonly String name;
-        private readonly string description;
-
-        /// <value>
-        /// The full name of the descriptor where the error occurred.
-        /// </value>
-        public String ProblemSymbolName
-        {
-            get { return name; }
-        }
-
-        /// <value>
-        /// A human-readable description of the error. (The Message property
-        /// is made up of the descriptor's name and this description.)
-        /// </value>
-        public string Description
-        {
-            get { return description; }
-        }
-
-        internal DescriptorValidationException(IDescriptor problemDescriptor, string description) :
-            base(problemDescriptor.FullName + ": " + description)
-        {
-            // Note that problemDescriptor may be partially uninitialized, so we
-            // don't want to expose it directly to the user.  So, we only provide
-            // the name and the original proto.
-            name = problemDescriptor.FullName;
-            this.description = description;
-        }
-
-        internal DescriptorValidationException(IDescriptor problemDescriptor, string description, Exception cause) :
-            base(problemDescriptor.FullName + ": " + description, cause)
-        {
-            name = problemDescriptor.FullName;
-            this.description = description;
-        }
-    }
-}
\ No newline at end of file
diff --git a/libs/protobuf/csharp/src/Google.Protobuf/Reflection/EnumDescriptor.cs b/libs/protobuf/csharp/src/Google.Protobuf/Reflection/EnumDescriptor.cs
deleted file mode 100644
index 3f2e1c4..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf/Reflection/EnumDescriptor.cs
+++ /dev/null
@@ -1,169 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using Google.Protobuf.Collections;
-using System;
-using System.Collections.Generic;
-
-namespace Google.Protobuf.Reflection
-{
-    /// <summary>
-    /// Descriptor for an enum type in a .proto file.
-    /// </summary>
-    public sealed class EnumDescriptor : DescriptorBase
-    {
-        private readonly EnumDescriptorProto proto;
-        private readonly MessageDescriptor containingType;
-        private readonly IList<EnumValueDescriptor> values;
-        private readonly Type clrType;
-
-        internal EnumDescriptor(EnumDescriptorProto proto, FileDescriptor file, MessageDescriptor parent, int index, Type clrType)
-            : base(file, file.ComputeFullName(parent, proto.Name), index)
-        {
-            this.proto = proto;
-            this.clrType = clrType;
-            containingType = parent;
-
-            if (proto.Value.Count == 0)
-            {
-                // We cannot allow enums with no values because this would mean there
-                // would be no valid default value for fields of this type.
-                throw new DescriptorValidationException(this, "Enums must contain at least one value.");
-            }
-
-            values = DescriptorUtil.ConvertAndMakeReadOnly(proto.Value,
-                                                           (value, i) => new EnumValueDescriptor(value, file, this, i));
-
-            File.DescriptorPool.AddSymbol(this);
-        }
-
-        internal EnumDescriptorProto Proto { get { return proto; } }
-
-        /// <summary>
-        /// Returns a clone of the underlying <see cref="EnumDescriptorProto"/> describing this enum.
-        /// Note that a copy is taken every time this method is called, so clients using it frequently
-        /// (and not modifying it) may want to cache the returned value.
-        /// </summary>
-        /// <returns>A protobuf representation of this enum descriptor.</returns>
-        public EnumDescriptorProto ToProto() => Proto.Clone();
-
-        /// <summary>
-        /// The brief name of the descriptor's target.
-        /// </summary>
-        public override string Name { get { return proto.Name; } }
-
-        internal override IReadOnlyList<DescriptorBase> GetNestedDescriptorListForField(int fieldNumber)
-        {
-            switch (fieldNumber)
-            {
-                case EnumDescriptorProto.ValueFieldNumber:
-                    return (IReadOnlyList<DescriptorBase>) Values;
-                default:
-                    return null;
-            }
-        }
-
-        /// <summary>
-        /// The CLR type for this enum. For generated code, this will be a CLR enum type.
-        /// </summary>
-        public Type ClrType { get { return clrType; } }
-
-        /// <value>
-        /// If this is a nested type, get the outer descriptor, otherwise null.
-        /// </value>
-        public MessageDescriptor ContainingType
-        {
-            get { return containingType; }
-        }
-
-        /// <value>
-        /// An unmodifiable list of defined value descriptors for this enum.
-        /// </value>
-        public IList<EnumValueDescriptor> Values
-        {
-            get { return values; }
-        }
-
-        /// <summary>
-        /// Finds an enum value by number. If multiple enum values have the
-        /// same number, this returns the first defined value with that number.
-        /// If there is no value for the given number, this returns <c>null</c>.
-        /// </summary>
-        public EnumValueDescriptor FindValueByNumber(int number)
-        {
-            return File.DescriptorPool.FindEnumValueByNumber(this, number);
-        }
-
-        /// <summary>
-        /// Finds an enum value by name.
-        /// </summary>
-        /// <param name="name">The unqualified name of the value (e.g. "FOO").</param>
-        /// <returns>The value's descriptor, or null if not found.</returns>
-        public EnumValueDescriptor FindValueByName(string name)
-        {
-            return File.DescriptorPool.FindSymbol<EnumValueDescriptor>(FullName + "." + name);
-        }
-
-        /// <summary>
-        /// The (possibly empty) set of custom options for this enum.
-        /// </summary>
-        [Obsolete("CustomOptions are obsolete. Use the GetOptions() method.")]
-        public CustomOptions CustomOptions => new CustomOptions(Proto.Options?._extensions?.ValuesByNumber);
-
-        /// <summary>
-        /// The <c>EnumOptions</c>, defined in <c>descriptor.proto</c>.
-        /// If the options message is not present (i.e. there are no options), <c>null</c> is returned.
-        /// Custom options can be retrieved as extensions of the returned message.
-        /// NOTE: A defensive copy is created each time this property is retrieved.
-        /// </summary>
-        public EnumOptions GetOptions() => Proto.Options?.Clone();
-
-        /// <summary>
-        /// Gets a single value enum option for this descriptor
-        /// </summary>
-        [Obsolete("GetOption is obsolete. Use the GetOptions() method.")]
-        public T GetOption<T>(Extension<EnumOptions, T> extension)
-        {
-            var value = Proto.Options.GetExtension(extension);
-            return value is IDeepCloneable<T> ? (value as IDeepCloneable<T>).Clone() : value;
-        }
-
-        /// <summary>
-        /// Gets a repeated value enum option for this descriptor
-        /// </summary>
-        [Obsolete("GetOption is obsolete. Use the GetOptions() method.")]
-        public RepeatedField<T> GetOption<T>(RepeatedExtension<EnumOptions, T> extension)
-        {
-            return Proto.Options.GetExtension(extension).Clone();
-        }
-    }
-}
\ No newline at end of file
diff --git a/libs/protobuf/csharp/src/Google.Protobuf/Reflection/EnumValueDescriptor.cs b/libs/protobuf/csharp/src/Google.Protobuf/Reflection/EnumValueDescriptor.cs
deleted file mode 100644
index 50b26a4..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf/Reflection/EnumValueDescriptor.cs
+++ /dev/null
@@ -1,115 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using Google.Protobuf.Collections;
-using System;
-
-namespace Google.Protobuf.Reflection
-{
-    /// <summary>
-    /// Descriptor for a single enum value within an enum in a .proto file.
-    /// </summary>
-    public sealed class EnumValueDescriptor : DescriptorBase
-    {
-        private readonly EnumDescriptor enumDescriptor;
-        private readonly EnumValueDescriptorProto proto;
-
-        internal EnumValueDescriptor(EnumValueDescriptorProto proto, FileDescriptor file,
-                                     EnumDescriptor parent, int index)
-            : base(file, parent.FullName + "." + proto.Name, index)
-        {
-            this.proto = proto;
-            enumDescriptor = parent;
-            file.DescriptorPool.AddSymbol(this);
-            file.DescriptorPool.AddEnumValueByNumber(this);
-        }
-
-        internal EnumValueDescriptorProto Proto { get { return proto; } }
-
-        /// <summary>
-        /// Returns a clone of the underlying <see cref="EnumValueDescriptorProto"/> describing this enum value.
-        /// Note that a copy is taken every time this method is called, so clients using it frequently
-        /// (and not modifying it) may want to cache the returned value.
-        /// </summary>
-        /// <returns>A protobuf representation of this enum value descriptor.</returns>
-        public EnumValueDescriptorProto ToProto() => Proto.Clone();
-
-        /// <summary>
-        /// Returns the name of the enum value described by this object.
-        /// </summary>
-        public override string Name { get { return proto.Name; } }
-
-        /// <summary>
-        /// Returns the number associated with this enum value.
-        /// </summary>
-        public int Number { get { return Proto.Number; } }
-
-        /// <summary>
-        /// Returns the enum descriptor that this value is part of.
-        /// </summary>
-        public EnumDescriptor EnumDescriptor { get { return enumDescriptor; } }
-
-        /// <summary>
-        /// The (possibly empty) set of custom options for this enum value.
-        /// </summary>
-        [Obsolete("CustomOptions are obsolete. Use the GetOptions() method.")]
-        public CustomOptions CustomOptions => new CustomOptions(Proto.Options?._extensions?.ValuesByNumber);
-
-        /// <summary>
-        /// The <c>EnumValueOptions</c>, defined in <c>descriptor.proto</c>.
-        /// If the options message is not present (i.e. there are no options), <c>null</c> is returned.
-        /// Custom options can be retrieved as extensions of the returned message.
-        /// NOTE: A defensive copy is created each time this property is retrieved.
-        /// </summary>
-        public EnumValueOptions GetOptions() => Proto.Options?.Clone();
-
-        /// <summary>
-        /// Gets a single value enum value option for this descriptor
-        /// </summary>
-        [Obsolete("GetOption is obsolete. Use the GetOptions() method.")]
-        public T GetOption<T>(Extension<EnumValueOptions, T> extension)
-        {
-            var value = Proto.Options.GetExtension(extension);
-            return value is IDeepCloneable<T> ? (value as IDeepCloneable<T>).Clone() : value;
-        }
-
-        /// <summary>
-        /// Gets a repeated value enum value option for this descriptor
-        /// </summary>
-        [Obsolete("GetOption is obsolete. Use the GetOptions() method.")]
-        public RepeatedField<T> GetOption<T>(RepeatedExtension<EnumValueOptions, T> extension)
-        {
-            return Proto.Options.GetExtension(extension).Clone();
-        }
-    }
-}
- 
\ No newline at end of file
diff --git a/libs/protobuf/csharp/src/Google.Protobuf/Reflection/ExtensionAccessor.cs b/libs/protobuf/csharp/src/Google.Protobuf/Reflection/ExtensionAccessor.cs
deleted file mode 100644
index 81d6e35..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf/Reflection/ExtensionAccessor.cs
+++ /dev/null
@@ -1,69 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-namespace Google.Protobuf.Reflection
-{
-    internal sealed class ExtensionAccessor : IFieldAccessor
-    {
-        private readonly Extension extension;
-        private readonly ReflectionUtil.IExtensionReflectionHelper helper;
-
-        internal ExtensionAccessor(FieldDescriptor descriptor)
-        {
-            Descriptor = descriptor;
-            extension = descriptor.Extension;
-            helper = ReflectionUtil.CreateExtensionHelper(extension);
-        }
-
-        public FieldDescriptor Descriptor { get; }
-
-        public void Clear(IMessage message)
-        {
-            helper.ClearExtension(message);
-        }
-
-        public bool HasValue(IMessage message)
-        {
-            return helper.HasExtension(message);
-        }
-
-        public object GetValue(IMessage message)
-        {
-            return helper.GetExtension(message);
-        }
-
-        public void SetValue(IMessage message, object value)
-        {
-            helper.SetExtension(message, value);
-        }
-    }
-}
diff --git a/libs/protobuf/csharp/src/Google.Protobuf/Reflection/ExtensionCollection.cs b/libs/protobuf/csharp/src/Google.Protobuf/Reflection/ExtensionCollection.cs
deleted file mode 100644
index ca874f9..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf/Reflection/ExtensionCollection.cs
+++ /dev/null
@@ -1,126 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-
-namespace Google.Protobuf.Reflection
-{
-    /// <summary>
-    /// A collection to simplify retrieving the descriptors of extensions in a descriptor for a message
-    /// </summary>
-    public sealed class ExtensionCollection
-    {
-        private IDictionary<MessageDescriptor, IList<FieldDescriptor>> extensionsByTypeInDeclarationOrder;
-        private IDictionary<MessageDescriptor, IList<FieldDescriptor>> extensionsByTypeInNumberOrder;
-
-        internal ExtensionCollection(FileDescriptor file, Extension[] extensions)
-        {
-            UnorderedExtensions = DescriptorUtil.ConvertAndMakeReadOnly(
-                file.Proto.Extension,
-                (extension, i) => {
-                    if (extensions?.Length != 0)
-                    {
-                        return new FieldDescriptor(extension, file, null, i, null, extensions?[i]);
-                    }
-                    else
-                    {
-                        return new FieldDescriptor(extension, file, null, i, null, null); // return null if there's no extensions in this array for old code-gen
-                    }
-                });
-        }
-
-        internal ExtensionCollection(MessageDescriptor message, Extension[] extensions)
-        {
-            UnorderedExtensions = DescriptorUtil.ConvertAndMakeReadOnly(
-                message.Proto.Extension,
-                (extension, i) => {
-                    if (extensions?.Length != 0)
-                    {
-                        return new FieldDescriptor(extension, message.File, message, i, null, extensions?[i]);
-                    }
-                    else
-                    {
-                        return new FieldDescriptor(extension, message.File, message, i, null, null);
-                    }
-                });
-        }
-
-        /// <summary>
-        /// Returns a readonly list of all the extensions defined in this type in 
-        /// the order they were defined in the source .proto file
-        /// </summary>
-        public IList<FieldDescriptor> UnorderedExtensions { get; }
-
-        /// <summary>
-        /// Returns a readonly list of all the extensions define in this type that extend 
-        /// the provided descriptor type in the order they were defined in the source .proto file
-        /// </summary>
-        public IList<FieldDescriptor> GetExtensionsInDeclarationOrder(MessageDescriptor descriptor)
-        {
-            return extensionsByTypeInDeclarationOrder[descriptor];
-        }
-
-        /// <summary>
-        /// Returns a readonly list of all the extensions define in this type that extend 
-        /// the provided descriptor type in ascending field order
-        /// </summary>
-        public IList<FieldDescriptor> GetExtensionsInNumberOrder(MessageDescriptor descriptor)
-        {
-            return extensionsByTypeInNumberOrder[descriptor];
-        }
-
-        internal void CrossLink()
-        {
-            Dictionary<MessageDescriptor, IList<FieldDescriptor>> declarationOrder = new Dictionary<MessageDescriptor, IList<FieldDescriptor>>();
-            foreach (FieldDescriptor descriptor in UnorderedExtensions)
-            {
-                descriptor.CrossLink();
-
-                IList<FieldDescriptor> list;
-                if (!declarationOrder.TryGetValue(descriptor.ExtendeeType, out list))
-                {
-                    list = new List<FieldDescriptor>();
-                    declarationOrder.Add(descriptor.ExtendeeType, list);
-                }
-
-                list.Add(descriptor);
-            }
-
-            extensionsByTypeInDeclarationOrder = declarationOrder
-                .ToDictionary(kvp => kvp.Key, kvp => (IList<FieldDescriptor>)new ReadOnlyCollection<FieldDescriptor>(kvp.Value));
-            extensionsByTypeInNumberOrder = declarationOrder
-                .ToDictionary(kvp => kvp.Key, kvp => (IList<FieldDescriptor>)new ReadOnlyCollection<FieldDescriptor>(kvp.Value.OrderBy(field => field.FieldNumber).ToArray()));
-        }
-    }
-}
diff --git a/libs/protobuf/csharp/src/Google.Protobuf/Reflection/FieldAccessorBase.cs b/libs/protobuf/csharp/src/Google.Protobuf/Reflection/FieldAccessorBase.cs
deleted file mode 100644
index 85b7d39..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf/Reflection/FieldAccessorBase.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-using System.Reflection;
-using Google.Protobuf.Compatibility;
-
-namespace Google.Protobuf.Reflection
-{
-    /// <summary>
-    /// Base class for field accessors.
-    /// </summary>
-    internal abstract class FieldAccessorBase : IFieldAccessor
-    {
-        private readonly Func<IMessage, object> getValueDelegate;
-        private readonly FieldDescriptor descriptor;
-
-        internal FieldAccessorBase(PropertyInfo property, FieldDescriptor descriptor)
-        {
-            this.descriptor = descriptor;
-            getValueDelegate = ReflectionUtil.CreateFuncIMessageObject(property.GetGetMethod());
-        }
-
-        public FieldDescriptor Descriptor { get { return descriptor; } }
-
-        public object GetValue(IMessage message)
-        {
-            return getValueDelegate(message);
-        }
-
-        public abstract bool HasValue(IMessage message);
-        public abstract void Clear(IMessage message);
-        public abstract void SetValue(IMessage message, object value);
-    }
-}
diff --git a/libs/protobuf/csharp/src/Google.Protobuf/Reflection/FieldDescriptor.cs b/libs/protobuf/csharp/src/Google.Protobuf/Reflection/FieldDescriptor.cs
deleted file mode 100644
index 84ad49d..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf/Reflection/FieldDescriptor.cs
+++ /dev/null
@@ -1,468 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using Google.Protobuf.Collections;
-using Google.Protobuf.Compatibility;
-using System;
-
-namespace Google.Protobuf.Reflection
-{
-    /// <summary>
-    /// Descriptor for a field or extension within a message in a .proto file.
-    /// </summary>
-    public sealed class FieldDescriptor : DescriptorBase, IComparable<FieldDescriptor>
-    {
-        private EnumDescriptor enumType;
-        private MessageDescriptor extendeeType;
-        private MessageDescriptor messageType;
-        private FieldType fieldType;
-        private IFieldAccessor accessor;
-
-        /// <summary>
-        /// Get the field's containing message type, or <c>null</c> if it is a field defined at the top level of a file as an extension.
-        /// </summary>
-        public MessageDescriptor ContainingType { get; }
-
-        /// <summary>
-        /// Returns the oneof containing this field, or <c>null</c> if it is not part of a oneof.
-        /// </summary>
-        public OneofDescriptor ContainingOneof { get; }
-
-        /// <summary>
-        /// Returns the oneof containing this field if it's a "real" oneof, or <c>null</c> if either this
-        /// field is not part of a oneof, or the oneof is synthetic.
-        /// </summary>
-        public OneofDescriptor RealContainingOneof => ContainingOneof?.IsSynthetic == false ? ContainingOneof : null;
-
-        /// <summary>
-        /// The effective JSON name for this field. This is usually the lower-camel-cased form of the field name,
-        /// but can be overridden using the <c>json_name</c> option in the .proto file.
-        /// </summary>
-        public string JsonName { get; }
-
-        /// <summary>
-        /// The name of the property in the <c>ContainingType.ClrType</c> class.
-        /// </summary>
-        public string PropertyName { get; }
-
-        /// <summary>
-        /// Indicates whether this field supports presence, either implicitly (e.g. due to it being a message
-        /// type field) or explicitly via Has/Clear members. If this returns true, it is safe to call
-        /// <see cref="IFieldAccessor.Clear(IMessage)"/> and <see cref="IFieldAccessor.HasValue(IMessage)"/>
-        /// on this field's accessor with a suitable message.
-        /// </summary>
-        public bool HasPresence =>
-            Extension != null ? !Extension.IsRepeated
-            : IsRepeated ? false
-            : IsMap ? false
-            : FieldType == FieldType.Message ? true
-            // This covers "real oneof members" and "proto3 optional fields"
-            : ContainingOneof != null ? true
-            : File.Syntax == Syntax.Proto2;
-
-        internal FieldDescriptorProto Proto { get; }
-
-        /// <summary>
-        /// Returns a clone of the underlying <see cref="FieldDescriptorProto"/> describing this field.
-        /// Note that a copy is taken every time this method is called, so clients using it frequently
-        /// (and not modifying it) may want to cache the returned value.
-        /// </summary>
-        /// <returns>A protobuf representation of this field descriptor.</returns>
-        public FieldDescriptorProto ToProto() => Proto.Clone();
-
-        /// <summary>
-        /// An extension identifier for this field, or <c>null</c> if this field isn't an extension.
-        /// </summary>
-        public Extension Extension { get; }
-
-        internal FieldDescriptor(FieldDescriptorProto proto, FileDescriptor file,
-                                 MessageDescriptor parent, int index, string propertyName, Extension extension)
-            : base(file, file.ComputeFullName(parent, proto.Name), index)
-        {
-            Proto = proto;
-            if (proto.Type != 0)
-            {
-                fieldType = GetFieldTypeFromProtoType(proto.Type);
-            }
-
-            if (FieldNumber <= 0)
-            {
-                throw new DescriptorValidationException(this, "Field numbers must be positive integers.");
-            }
-            ContainingType = parent;
-            if (proto.HasOneofIndex)
-            {
-                if (proto.OneofIndex < 0 || proto.OneofIndex >= parent.Proto.OneofDecl.Count)
-                {
-                    throw new DescriptorValidationException(this,
-                        $"FieldDescriptorProto.oneof_index is out of range for type {parent.Name}");
-                }
-                ContainingOneof = parent.Oneofs[proto.OneofIndex];
-            }
-
-            file.DescriptorPool.AddSymbol(this);
-            // We can't create the accessor until we've cross-linked, unfortunately, as we
-            // may not know whether the type of the field is a map or not. Remember the property name
-            // for later.
-            // We could trust the generated code and check whether the type of the property is
-            // a MapField, but that feels a tad nasty.
-            PropertyName = propertyName;
-            Extension = extension;
-            JsonName =  Proto.JsonName == "" ? JsonFormatter.ToJsonName(Proto.Name) : Proto.JsonName;
-        }
-
-
-        /// <summary>
-        /// The brief name of the descriptor's target.
-        /// </summary>
-        public override string Name => Proto.Name;
-
-        /// <summary>
-        /// Returns the accessor for this field.
-        /// </summary>
-        /// <remarks>
-        /// <para>
-        /// While a <see cref="FieldDescriptor"/> describes the field, it does not provide
-        /// any way of obtaining or changing the value of the field within a specific message;
-        /// that is the responsibility of the accessor.
-        /// </para>
-        /// <para>
-        /// In descriptors for generated code, the value returned by this property will be non-null for all
-        /// regular fields. However, if a message containing a map field is introspected, the list of nested messages will include
-        /// an auto-generated nested key/value pair message for the field. This is not represented in any
-        /// generated type, and the value of the map field itself is represented by a dictionary in the
-        /// reflection API. There are never instances of those "hidden" messages, so no accessor is provided
-        /// and this property will return null.
-        /// </para>
-        /// <para>
-        /// In dynamically loaded descriptors, the value returned by this property will current be null;
-        /// if and when dynamic messages are supported, it will return a suitable accessor to work with
-        /// them.
-        /// </para>
-        /// </remarks>
-        public IFieldAccessor Accessor => accessor;
-
-        /// <summary>
-        /// Maps a field type as included in the .proto file to a FieldType.
-        /// </summary>
-        private static FieldType GetFieldTypeFromProtoType(FieldDescriptorProto.Types.Type type)
-        {
-            switch (type)
-            {
-                case FieldDescriptorProto.Types.Type.Double:
-                    return FieldType.Double;
-                case FieldDescriptorProto.Types.Type.Float:
-                    return FieldType.Float;
-                case FieldDescriptorProto.Types.Type.Int64:
-                    return FieldType.Int64;
-                case FieldDescriptorProto.Types.Type.Uint64:
-                    return FieldType.UInt64;
-                case FieldDescriptorProto.Types.Type.Int32:
-                    return FieldType.Int32;
-                case FieldDescriptorProto.Types.Type.Fixed64:
-                    return FieldType.Fixed64;
-                case FieldDescriptorProto.Types.Type.Fixed32:
-                    return FieldType.Fixed32;
-                case FieldDescriptorProto.Types.Type.Bool:
-                    return FieldType.Bool;
-                case FieldDescriptorProto.Types.Type.String:
-                    return FieldType.String;
-                case FieldDescriptorProto.Types.Type.Group:
-                    return FieldType.Group;
-                case FieldDescriptorProto.Types.Type.Message:
-                    return FieldType.Message;
-                case FieldDescriptorProto.Types.Type.Bytes:
-                    return FieldType.Bytes;
-                case FieldDescriptorProto.Types.Type.Uint32:
-                    return FieldType.UInt32;
-                case FieldDescriptorProto.Types.Type.Enum:
-                    return FieldType.Enum;
-                case FieldDescriptorProto.Types.Type.Sfixed32:
-                    return FieldType.SFixed32;
-                case FieldDescriptorProto.Types.Type.Sfixed64:
-                    return FieldType.SFixed64;
-                case FieldDescriptorProto.Types.Type.Sint32:
-                    return FieldType.SInt32;
-                case FieldDescriptorProto.Types.Type.Sint64:
-                    return FieldType.SInt64;
-                default:
-                    throw new ArgumentException("Invalid type specified");
-            }
-        }
-
-        /// <summary>
-        /// Returns <c>true</c> if this field is a repeated field; <c>false</c> otherwise.
-        /// </summary>
-        public bool IsRepeated => Proto.Label == FieldDescriptorProto.Types.Label.Repeated;
-
-        /// <summary>
-        /// Returns <c>true</c> if this field is a required field; <c>false</c> otherwise.
-        /// </summary>
-        public bool IsRequired => Proto.Label == FieldDescriptorProto.Types.Label.Required;
-
-        /// <summary>
-        /// Returns <c>true</c> if this field is a map field; <c>false</c> otherwise.
-        /// </summary>
-        public bool IsMap => fieldType == FieldType.Message && messageType.Proto.Options != null && messageType.Proto.Options.MapEntry;
-
-        /// <summary>
-        /// Returns <c>true</c> if this field is a packed, repeated field; <c>false</c> otherwise.
-        /// </summary>
-        public bool IsPacked
-        {
-            get
-            {
-                if (File.Syntax != Syntax.Proto3)
-                {
-                    return Proto.Options?.Packed ?? false;
-                }
-                else
-                {
-                    // Packed by default with proto3
-                    return Proto.Options == null || !Proto.Options.HasPacked || Proto.Options.Packed;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Returns <c>true</c> if this field extends another message type; <c>false</c> otherwise.
-        /// </summary>
-        public bool IsExtension => Proto.HasExtendee;
-
-        /// <summary>
-        /// Returns the type of the field.
-        /// </summary>
-        public FieldType FieldType => fieldType;
-
-        /// <summary>
-        /// Returns the field number declared in the proto file.
-        /// </summary>
-        public int FieldNumber => Proto.Number;
-
-        /// <summary>
-        /// Compares this descriptor with another one, ordering in "canonical" order
-        /// which simply means ascending order by field number. <paramref name="other"/>
-        /// must be a field of the same type, i.e. the <see cref="ContainingType"/> of
-        /// both fields must be the same.
-        /// </summary>
-        public int CompareTo(FieldDescriptor other)
-        {
-            if (other.ContainingType != ContainingType)
-            {
-                throw new ArgumentException("FieldDescriptors can only be compared to other FieldDescriptors " +
-                                            "for fields of the same message type.");
-            }
-            return FieldNumber - other.FieldNumber;
-        }
-
-        /// <summary>
-        /// For enum fields, returns the field's type.
-        /// </summary>
-        public EnumDescriptor EnumType
-        {
-            get
-            {
-                if (fieldType != FieldType.Enum)
-                {
-                    throw new InvalidOperationException("EnumType is only valid for enum fields.");
-                }
-                return enumType;
-            }
-        }
-
-        /// <summary>
-        /// For embedded message and group fields, returns the field's type.
-        /// </summary>
-        public MessageDescriptor MessageType
-        {
-            get
-            {
-                if (fieldType != FieldType.Message && fieldType != FieldType.Group)
-                {
-                    throw new InvalidOperationException("MessageType is only valid for message or group fields.");
-                }
-                return messageType;
-            }
-        }
-
-        /// <summary>
-        /// For extension fields, returns the extended type
-        /// </summary>
-        public MessageDescriptor ExtendeeType
-        {
-            get
-            {
-                if (!Proto.HasExtendee)
-                {
-                    throw new InvalidOperationException("ExtendeeType is only valid for extension fields.");
-                }
-                return extendeeType;
-            }
-        }
-
-        /// <summary>
-        /// The (possibly empty) set of custom options for this field.
-        /// </summary>
-        [Obsolete("CustomOptions are obsolete. Use the GetOptions() method.")]
-        public CustomOptions CustomOptions => new CustomOptions(Proto.Options?._extensions?.ValuesByNumber);
-
-        /// <summary>
-        /// The <c>FieldOptions</c>, defined in <c>descriptor.proto</c>.
-        /// If the options message is not present (i.e. there are no options), <c>null</c> is returned.
-        /// Custom options can be retrieved as extensions of the returned message.
-        /// NOTE: A defensive copy is created each time this property is retrieved.
-        /// </summary>
-        public FieldOptions GetOptions() => Proto.Options?.Clone();
-
-        /// <summary>
-        /// Gets a single value field option for this descriptor
-        /// </summary>
-         [Obsolete("GetOption is obsolete. Use the GetOptions() method.")]
-        public T GetOption<T>(Extension<FieldOptions, T> extension)
-        {
-            var value = Proto.Options.GetExtension(extension);
-            return value is IDeepCloneable<T> ? (value as IDeepCloneable<T>).Clone() : value;
-        }
-
-        /// <summary>
-        /// Gets a repeated value field option for this descriptor
-        /// </summary>
-         [Obsolete("GetOption is obsolete. Use the GetOptions() method.")]
-        public RepeatedField<T> GetOption<T>(RepeatedExtension<FieldOptions, T> extension)
-        {
-            return Proto.Options.GetExtension(extension).Clone();
-        }
-
-        /// <summary>
-        /// Look up and cross-link all field types etc.
-        /// </summary>
-        internal void CrossLink()
-        {
-            if (Proto.HasTypeName)
-            {
-                IDescriptor typeDescriptor =
-                    File.DescriptorPool.LookupSymbol(Proto.TypeName, this);
-
-                if (Proto.HasType)
-                {
-                    // Choose field type based on symbol.
-                    if (typeDescriptor is MessageDescriptor)
-                    {
-                        fieldType = FieldType.Message;
-                    }
-                    else if (typeDescriptor is EnumDescriptor)
-                    {
-                        fieldType = FieldType.Enum;
-                    }
-                    else
-                    {
-                        throw new DescriptorValidationException(this, $"\"{Proto.TypeName}\" is not a type.");
-                    }
-                }
-
-                if (fieldType == FieldType.Message || fieldType == FieldType.Group)
-                {
-                    if (!(typeDescriptor is MessageDescriptor))
-                    {
-                        throw new DescriptorValidationException(this, $"\"{Proto.TypeName}\" is not a message type.");
-                    }
-                    messageType = (MessageDescriptor) typeDescriptor;
-
-                    if (Proto.HasDefaultValue)
-                    {
-                        throw new DescriptorValidationException(this, "Messages can't have default values.");
-                    }
-                }
-                else if (fieldType == FieldType.Enum)
-                {
-                    if (!(typeDescriptor is EnumDescriptor))
-                    {
-                        throw new DescriptorValidationException(this, $"\"{Proto.TypeName}\" is not an enum type.");
-                    }
-                    enumType = (EnumDescriptor) typeDescriptor;
-                }
-                else
-                {
-                    throw new DescriptorValidationException(this, "Field with primitive type has type_name.");
-                }
-            }
-            else
-            {
-                if (fieldType == FieldType.Message || fieldType == FieldType.Enum)
-                {
-                    throw new DescriptorValidationException(this, "Field with message or enum type missing type_name.");
-                }
-            }
-
-            if (Proto.HasExtendee)
-            {
-                extendeeType = File.DescriptorPool.LookupSymbol(Proto.Extendee, this) as MessageDescriptor;
-            }
-
-            // Note: no attempt to perform any default value parsing
-
-            File.DescriptorPool.AddFieldByNumber(this);
-
-            if (ContainingType != null && ContainingType.Proto.Options != null && ContainingType.Proto.Options.MessageSetWireFormat)
-            {
-                throw new DescriptorValidationException(this, "MessageSet format is not supported.");
-            }
-            accessor = CreateAccessor();
-        }
-
-        private IFieldAccessor CreateAccessor()
-        {
-            if (Extension != null)
-            {
-                return new ExtensionAccessor(this);
-            }
-
-            // If we're given no property name, that's because we really don't want an accessor.
-            // This could be because it's a map message, or it could be that we're loading a FileDescriptor dynamically.
-            // TODO: Support dynamic messages.
-            if (PropertyName == null)
-            {
-                return null;
-            }
-
-            var property = ContainingType.ClrType.GetProperty(PropertyName);
-            if (property == null)
-            {
-                throw new DescriptorValidationException(this, $"Property {PropertyName} not found in {ContainingType.ClrType}");
-            }
-            return IsMap ? new MapFieldAccessor(property, this)
-                : IsRepeated ? new RepeatedFieldAccessor(property, this)
-                : (IFieldAccessor) new SingleFieldAccessor(ContainingType.ClrType, property, this);
-        }
-    }
-}
- 
\ No newline at end of file
diff --git a/libs/protobuf/csharp/src/Google.Protobuf/Reflection/FieldType.cs b/libs/protobuf/csharp/src/Google.Protobuf/Reflection/FieldType.cs
deleted file mode 100644
index 37af179..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf/Reflection/FieldType.cs
+++ /dev/null
@@ -1,113 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-namespace Google.Protobuf.Reflection
-{
-    /// <summary>
-    /// Enumeration of all the possible field types.
-    /// </summary>
-    public enum FieldType
-    {
-        /// <summary>
-        /// The <c>double</c> field type.
-        /// </summary>
-        Double,
-        /// <summary>
-        /// The <c>float</c> field type.
-        /// </summary>
-        Float,
-        /// <summary>
-        /// The <c>int64</c> field type.
-        /// </summary>
-        Int64,
-        /// <summary>
-        /// The <c>uint64</c> field type.
-        /// </summary>
-        UInt64,
-        /// <summary>
-        /// The <c>int32</c> field type.
-        /// </summary>
-        Int32,
-        /// <summary>
-        /// The <c>fixed64</c> field type.
-        /// </summary>
-        Fixed64,
-        /// <summary>
-        /// The <c>fixed32</c> field type.
-        /// </summary>
-        Fixed32,
-        /// <summary>
-        /// The <c>bool</c> field type.
-        /// </summary>
-        Bool,
-        /// <summary>
-        /// The <c>string</c> field type.
-        /// </summary>
-        String,
-        /// <summary>
-        /// The field type used for groups.
-        /// </summary>
-        Group,
-        /// <summary>
-        /// The field type used for message fields.
-        /// </summary>
-        Message,
-        /// <summary>
-        /// The <c>bytes</c> field type.
-        /// </summary>
-        Bytes,
-        /// <summary>
-        /// The <c>uint32</c> field type.
-        /// </summary>
-        UInt32,
-        /// <summary>
-        /// The <c>sfixed32</c> field type.
-        /// </summary>
-        SFixed32,
-        /// <summary>
-        /// The <c>sfixed64</c> field type.
-        /// </summary>
-        SFixed64,
-        /// <summary>
-        /// The <c>sint32</c> field type.
-        /// </summary>
-        SInt32,
-        /// <summary>
-        /// The <c>sint64</c> field type.
-        /// </summary>
-        SInt64,
-        /// <summary>
-        /// The field type used for enum fields.
-        /// </summary>
-        Enum
-    }
-}
\ No newline at end of file
diff --git a/libs/protobuf/csharp/src/Google.Protobuf/Reflection/FileDescriptor.cs b/libs/protobuf/csharp/src/Google.Protobuf/Reflection/FileDescriptor.cs
deleted file mode 100644
index d7701da..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf/Reflection/FileDescriptor.cs
+++ /dev/null
@@ -1,616 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using Google.Protobuf.Collections;
-using Google.Protobuf.WellKnownTypes;
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Diagnostics;
-using System.Linq;
-using System.Threading;
-using static Google.Protobuf.Reflection.SourceCodeInfo.Types;
-
-namespace Google.Protobuf.Reflection
-{
-    /// <summary>
-    /// The syntax of a .proto file
-    /// </summary>
-    public enum Syntax
-    {
-        /// <summary>
-        /// Proto2 syntax
-        /// </summary>
-        Proto2,
-        /// <summary>
-        /// Proto3 syntax
-        /// </summary>
-        Proto3,
-        /// <summary>
-        /// An unknown declared syntax
-        /// </summary>
-        Unknown
-    }
-
-    /// <summary>
-    /// Describes a .proto file, including everything defined within.
-    /// IDescriptor is implemented such that the File property returns this descriptor,
-    /// and the FullName is the same as the Name.
-    /// </summary>
-    public sealed class FileDescriptor : IDescriptor
-    {
-        // Prevent linker failures when using IL2CPP with the well-known types.
-        static FileDescriptor()
-        {
-            ForceReflectionInitialization<Syntax>();
-            ForceReflectionInitialization<NullValue>();
-            ForceReflectionInitialization<Field.Types.Cardinality>();
-            ForceReflectionInitialization<Field.Types.Kind>();
-            ForceReflectionInitialization<Value.KindOneofCase>();
-        }
-
-        private readonly Lazy<Dictionary<IDescriptor, DescriptorDeclaration>> declarations;
-
-        private FileDescriptor(ByteString descriptorData, FileDescriptorProto proto, IEnumerable<FileDescriptor> dependencies, DescriptorPool pool, bool allowUnknownDependencies, GeneratedClrTypeInfo generatedCodeInfo)
-        {
-            SerializedData = descriptorData;
-            DescriptorPool = pool;
-            Proto = proto;
-            Dependencies = new ReadOnlyCollection<FileDescriptor>(dependencies.ToList());
-
-            PublicDependencies = DeterminePublicDependencies(this, proto, dependencies, allowUnknownDependencies);
-
-            pool.AddPackage(Package, this);
-
-            MessageTypes = DescriptorUtil.ConvertAndMakeReadOnly(proto.MessageType,
-                                                                 (message, index) =>
-                                                                 new MessageDescriptor(message, this, null, index, generatedCodeInfo?.NestedTypes[index]));
-
-            EnumTypes = DescriptorUtil.ConvertAndMakeReadOnly(proto.EnumType,
-                                                              (enumType, index) =>
-                                                              new EnumDescriptor(enumType, this, null, index, generatedCodeInfo?.NestedEnums[index]));
-
-            Services = DescriptorUtil.ConvertAndMakeReadOnly(proto.Service,
-                                                             (service, index) =>
-                                                             new ServiceDescriptor(service, this, index));
-
-            Extensions = new ExtensionCollection(this, generatedCodeInfo?.Extensions);
-
-            declarations = new Lazy<Dictionary<IDescriptor, DescriptorDeclaration>>(CreateDeclarationMap, LazyThreadSafetyMode.ExecutionAndPublication);
-
-            if (!proto.HasSyntax || proto.Syntax == "proto2")
-            {
-                Syntax = Syntax.Proto2;
-            }
-            else if (proto.Syntax == "proto3")
-            {
-                Syntax = Syntax.Proto3;
-            }
-            else
-            {
-                Syntax = Syntax.Unknown;
-            }
-        }
-
-        private Dictionary<IDescriptor, DescriptorDeclaration> CreateDeclarationMap()
-        {
-            var dictionary = new Dictionary<IDescriptor, DescriptorDeclaration>();
-            foreach (var location in Proto.SourceCodeInfo?.Location ?? Enumerable.Empty<Location>())
-            {
-                var descriptor = FindDescriptorForPath(location.Path);
-                if (descriptor != null)
-                {
-                    dictionary[descriptor] = DescriptorDeclaration.FromProto(descriptor, location);
-                }
-            }
-            return dictionary;
-        }
-
-        private IDescriptor FindDescriptorForPath(IList<int> path)
-        {
-            // All complete declarations have an even, non-empty path length
-            // (There can be an empty path for a descriptor declaration, but that can't have any comments,
-            // so we currently ignore it.)
-            if (path.Count == 0 || (path.Count & 1) != 0)
-            {
-                return null;
-            }
-            IReadOnlyList<DescriptorBase> topLevelList = GetNestedDescriptorListForField(path[0]);
-            DescriptorBase current = GetDescriptorFromList(topLevelList, path[1]);
-
-            for (int i = 2; current != null && i < path.Count; i += 2)
-            {
-                var list = current.GetNestedDescriptorListForField(path[i]);
-                current = GetDescriptorFromList(list, path[i + 1]);
-            }
-            return current;
-        }
-
-        private DescriptorBase GetDescriptorFromList(IReadOnlyList<DescriptorBase> list, int index)
-        {
-            // This is fine: it may be a newer version of protobuf than we understand, with a new descriptor
-            // field.
-            if (list == null)
-            {
-                return null;
-            }
-            // We *could* return null to silently continue, but this is basically data corruption.
-            if (index < 0 || index >= list.Count)
-            {
-                // We don't have much extra information to give at this point unfortunately. If this becomes a problem,
-                // we can pass in the complete path and report that and the file name.
-                throw new InvalidProtocolBufferException($"Invalid descriptor location path: index out of range");
-            }
-            return list[index];
-        }
-
-        private IReadOnlyList<DescriptorBase> GetNestedDescriptorListForField(int fieldNumber)
-        {
-            switch (fieldNumber)
-            {
-                case FileDescriptorProto.ServiceFieldNumber:
-                    return (IReadOnlyList<DescriptorBase>) Services;
-                case FileDescriptorProto.MessageTypeFieldNumber:
-                    return (IReadOnlyList<DescriptorBase>) MessageTypes;
-                case FileDescriptorProto.EnumTypeFieldNumber:
-                    return (IReadOnlyList<DescriptorBase>) EnumTypes;
-                default:
-                    return null;
-            }
-        }
-
-        internal DescriptorDeclaration GetDeclaration(IDescriptor descriptor)
-        {
-            DescriptorDeclaration declaration;
-            declarations.Value.TryGetValue(descriptor, out declaration);
-            return declaration;
-        }
-
-        /// <summary>
-        /// Computes the full name of a descriptor within this file, with an optional parent message.
-        /// </summary>
-        internal string ComputeFullName(MessageDescriptor parent, string name)
-        {
-            if (parent != null)
-            {
-                return parent.FullName + "." + name;
-            }
-            if (Package.Length > 0)
-            {
-                return Package + "." + name;
-            }
-            return name;
-        }
-
-        /// <summary>
-        /// Extracts public dependencies from direct dependencies. This is a static method despite its
-        /// first parameter, as the value we're in the middle of constructing is only used for exceptions.
-        /// </summary>
-        private static IList<FileDescriptor> DeterminePublicDependencies(FileDescriptor @this, FileDescriptorProto proto, IEnumerable<FileDescriptor> dependencies, bool allowUnknownDependencies)
-        {
-            var nameToFileMap = dependencies.ToDictionary(file => file.Name);
-            var publicDependencies = new List<FileDescriptor>();
-            for (int i = 0; i < proto.PublicDependency.Count; i++)
-            {
-                int index = proto.PublicDependency[i];
-                if (index < 0 || index >= proto.Dependency.Count)
-                {
-                    throw new DescriptorValidationException(@this, "Invalid public dependency index.");
-                }
-                string name = proto.Dependency[index];
-                FileDescriptor file;
-                if (!nameToFileMap.TryGetValue(name, out file))
-                {
-                    if (!allowUnknownDependencies)
-                    {
-                        throw new DescriptorValidationException(@this, "Invalid public dependency: " + name);
-                    }
-                    // Ignore unknown dependencies.
-                }
-                else
-                {
-                    publicDependencies.Add(file);
-                }
-            }
-            return new ReadOnlyCollection<FileDescriptor>(publicDependencies);
-        }
-
-        /// <value>
-        /// The descriptor in its protocol message representation.
-        /// </value>
-        internal FileDescriptorProto Proto { get; }
-
-        /// <summary>
-        /// Returns a clone of the underlying <see cref="FileDescriptorProto"/> describing this file.
-        /// Note that a copy is taken every time this method is called, so clients using it frequently
-        /// (and not modifying it) may want to cache the returned value.
-        /// </summary>
-        /// <returns>A protobuf representation of this file descriptor.</returns>
-        public FileDescriptorProto ToProto() => Proto.Clone();
-
-        /// <summary>
-        /// The syntax of the file
-        /// </summary>
-        public Syntax Syntax { get; }
-
-        /// <value>
-        /// The file name.
-        /// </value>
-        public string Name => Proto.Name;
-
-        /// <summary>
-        /// The package as declared in the .proto file. This may or may not
-        /// be equivalent to the .NET namespace of the generated classes.
-        /// </summary>
-        public string Package => Proto.Package;
-
-        /// <value>
-        /// Unmodifiable list of top-level message types declared in this file.
-        /// </value>
-        public IList<MessageDescriptor> MessageTypes { get; }
-
-        /// <value>
-        /// Unmodifiable list of top-level enum types declared in this file.
-        /// </value>
-        public IList<EnumDescriptor> EnumTypes { get; }
-
-        /// <value>
-        /// Unmodifiable list of top-level services declared in this file.
-        /// </value>
-        public IList<ServiceDescriptor> Services { get; }
-
-        /// <summary>
-        /// Unmodifiable list of top-level extensions declared in this file.
-        /// Note that some extensions may be incomplete (FieldDescriptor.Extension may be null)
-        /// if this descriptor was generated using a version of protoc that did not fully
-        /// support extensions in C#.
-        /// </summary>
-        public ExtensionCollection Extensions { get; }
-
-        /// <value>
-        /// Unmodifiable list of this file's dependencies (imports).
-        /// </value>
-        public IList<FileDescriptor> Dependencies { get; }
-
-        /// <value>
-        /// Unmodifiable list of this file's public dependencies (public imports).
-        /// </value>
-        public IList<FileDescriptor> PublicDependencies { get; }
-
-        /// <value>
-        /// The original serialized binary form of this descriptor.
-        /// </value>
-        public ByteString SerializedData { get; }
-
-        /// <value>
-        /// Implementation of IDescriptor.FullName - just returns the same as Name.
-        /// </value>
-        string IDescriptor.FullName => Name;
-
-        /// <value>
-        /// Implementation of IDescriptor.File - just returns this descriptor.
-        /// </value>
-        FileDescriptor IDescriptor.File => this;
-
-        /// <value>
-        /// Pool containing symbol descriptors.
-        /// </value>
-        internal DescriptorPool DescriptorPool { get; }
-
-        /// <summary>
-        /// Finds a type (message, enum, service or extension) in the file by name. Does not find nested types.
-        /// </summary>
-        /// <param name="name">The unqualified type name to look for.</param>
-        /// <typeparam name="T">The type of descriptor to look for</typeparam>
-        /// <returns>The type's descriptor, or null if not found.</returns>
-        public T FindTypeByName<T>(String name)
-            where T : class, IDescriptor
-        {
-            // Don't allow looking up nested types.  This will make optimization
-            // easier later.
-            if (name.IndexOf('.') != -1)
-            {
-                return null;
-            }
-            if (Package.Length > 0)
-            {
-                name = Package + "." + name;
-            }
-            T result = DescriptorPool.FindSymbol<T>(name);
-            if (result != null && result.File == this)
-            {
-                return result;
-            }
-            return null;
-        }
-
-        /// <summary>
-        /// Builds a FileDescriptor from its protocol buffer representation.
-        /// </summary>
-        /// <param name="descriptorData">The original serialized descriptor data.
-        /// We have only limited proto2 support, so serializing FileDescriptorProto
-        /// would not necessarily give us this.</param>
-        /// <param name="proto">The protocol message form of the FileDescriptor.</param>
-        /// <param name="dependencies">FileDescriptors corresponding to all of the
-        /// file's dependencies, in the exact order listed in the .proto file. May be null,
-        /// in which case it is treated as an empty array.</param>
-        /// <param name="allowUnknownDependencies">Whether unknown dependencies are ignored (true) or cause an exception to be thrown (false).</param>
-        /// <param name="generatedCodeInfo">Details about generated code, for the purposes of reflection.</param>
-        /// <exception cref="DescriptorValidationException">If <paramref name="proto"/> is not
-        /// a valid descriptor. This can occur for a number of reasons, such as a field
-        /// having an undefined type or because two messages were defined with the same name.</exception>
-        private static FileDescriptor BuildFrom(ByteString descriptorData, FileDescriptorProto proto, FileDescriptor[] dependencies, bool allowUnknownDependencies, GeneratedClrTypeInfo generatedCodeInfo)
-        {
-            // Building descriptors involves two steps: translating and linking.
-            // In the translation step (implemented by FileDescriptor's
-            // constructor), we build an object tree mirroring the
-            // FileDescriptorProto's tree and put all of the descriptors into the
-            // DescriptorPool's lookup tables.  In the linking step, we look up all
-            // type references in the DescriptorPool, so that, for example, a
-            // FieldDescriptor for an embedded message contains a pointer directly
-            // to the Descriptor for that message's type.  We also detect undefined
-            // types in the linking step.
-            if (dependencies == null)
-            {
-                dependencies = new FileDescriptor[0];
-            }
-
-            DescriptorPool pool = new DescriptorPool(dependencies);
-            FileDescriptor result = new FileDescriptor(descriptorData, proto, dependencies, pool, allowUnknownDependencies, generatedCodeInfo);
-
-            // Validate that the dependencies we've been passed (as FileDescriptors) are actually the ones we
-            // need.
-            if (dependencies.Length != proto.Dependency.Count)
-            {
-                throw new DescriptorValidationException(
-                    result,
-                    "Dependencies passed to FileDescriptor.BuildFrom() don't match " +
-                    "those listed in the FileDescriptorProto.");
-            }
-
-            result.CrossLink();
-            return result;
-        }
-
-        private void CrossLink()
-        {
-            foreach (MessageDescriptor message in MessageTypes)
-            {
-                message.CrossLink();
-            }
-
-            foreach (ServiceDescriptor service in Services)
-            {
-                service.CrossLink();
-            }
-
-            Extensions.CrossLink();
-        }
-
-        /// <summary>
-        /// Creates a descriptor for generated code.
-        /// </summary>
-        /// <remarks>
-        /// This method is only designed to be used by the results of generating code with protoc,
-        /// which creates the appropriate dependencies etc. It has to be public because the generated
-        /// code is "external", but should not be called directly by end users.
-        /// </remarks>
-        public static FileDescriptor FromGeneratedCode(
-            byte[] descriptorData,
-            FileDescriptor[] dependencies,
-            GeneratedClrTypeInfo generatedCodeInfo)
-        {
-            ExtensionRegistry registry = new ExtensionRegistry();
-            registry.AddRange(GetAllExtensions(dependencies, generatedCodeInfo));
-    
-            FileDescriptorProto proto;
-            try
-            {
-                proto = FileDescriptorProto.Parser.WithExtensionRegistry(registry).ParseFrom(descriptorData);
-            }
-            catch (InvalidProtocolBufferException e)
-            {
-                throw new ArgumentException("Failed to parse protocol buffer descriptor for generated code.", e);
-            }
-
-            try
-            {
-                // When building descriptors for generated code, we allow unknown
-                // dependencies by default.
-                return BuildFrom(ByteString.CopyFrom(descriptorData), proto, dependencies, true, generatedCodeInfo);
-            }
-            catch (DescriptorValidationException e)
-            {
-                throw new ArgumentException($"Invalid embedded descriptor for \"{proto.Name}\".", e);
-            }
-        }
-
-        private static IEnumerable<Extension> GetAllExtensions(FileDescriptor[] dependencies, GeneratedClrTypeInfo generatedInfo)
-        {
-            return dependencies.SelectMany(GetAllDependedExtensions).Distinct(ExtensionRegistry.ExtensionComparer.Instance).Concat(GetAllGeneratedExtensions(generatedInfo));
-        }
-
-        private static IEnumerable<Extension> GetAllGeneratedExtensions(GeneratedClrTypeInfo generated)
-        {
-            return generated.Extensions.Concat(generated.NestedTypes.Where(t => t != null).SelectMany(GetAllGeneratedExtensions));
-        }
-
-        private static IEnumerable<Extension> GetAllDependedExtensions(FileDescriptor descriptor)
-        {
-            return descriptor.Extensions.UnorderedExtensions
-                .Select(s => s.Extension)
-                .Where(e => e != null)
-                .Concat(descriptor.Dependencies.Concat(descriptor.PublicDependencies).SelectMany(GetAllDependedExtensions))
-                .Concat(descriptor.MessageTypes.SelectMany(GetAllDependedExtensionsFromMessage));
-        }
-
-        private static IEnumerable<Extension> GetAllDependedExtensionsFromMessage(MessageDescriptor descriptor)
-        {
-            return descriptor.Extensions.UnorderedExtensions
-                .Select(s => s.Extension)
-                .Where(e => e != null)
-                .Concat(descriptor.NestedTypes.SelectMany(GetAllDependedExtensionsFromMessage));
-        }
-
-        /// <summary>
-        /// Converts the given descriptor binary data into FileDescriptor objects.
-        /// Note: reflection using the returned FileDescriptors is not currently supported.
-        /// </summary>
-        /// <param name="descriptorData">The binary file descriptor proto data. Must not be null, and any
-        /// dependencies must come before the descriptor which depends on them. (If A depends on B, and B
-        /// depends on C, then the descriptors must be presented in the order C, B, A.) This is compatible
-        /// with the order in which protoc provides descriptors to plugins.</param>
-        /// <param name="registry">The extension registry to use when parsing, or null if no extensions are required.</param>
-        /// <returns>The file descriptors corresponding to <paramref name="descriptorData"/>.</returns>
-        public static IReadOnlyList<FileDescriptor> BuildFromByteStrings(IEnumerable<ByteString> descriptorData, ExtensionRegistry registry)
-        {
-            ProtoPreconditions.CheckNotNull(descriptorData, nameof(descriptorData));
-
-            var parser = FileDescriptorProto.Parser.WithExtensionRegistry(registry);
-
-            // TODO: See if we can build a single DescriptorPool instead of building lots of them.
-            // This will all behave correctly, but it's less efficient than we'd like.
-            var descriptors = new List<FileDescriptor>();
-            var descriptorsByName = new Dictionary<string, FileDescriptor>();
-            foreach (var data in descriptorData)
-            {
-                var proto = parser.ParseFrom(data);
-                var dependencies = new List<FileDescriptor>();
-                foreach (var dependencyName in proto.Dependency)
-                {
-                    FileDescriptor dependency;
-                    if (!descriptorsByName.TryGetValue(dependencyName, out dependency))
-                    {
-                        throw new ArgumentException($"Dependency missing: {dependencyName}");
-                    }
-                    dependencies.Add(dependency);
-                }
-                var pool = new DescriptorPool(dependencies);
-                FileDescriptor descriptor = new FileDescriptor(
-                    data, proto, dependencies, pool,
-                    allowUnknownDependencies: false, generatedCodeInfo: null);
-                descriptor.CrossLink();
-                descriptors.Add(descriptor);
-                if (descriptorsByName.ContainsKey(descriptor.Name))
-                {
-                    throw new ArgumentException($"Duplicate descriptor name: {descriptor.Name}");
-                }
-                descriptorsByName.Add(descriptor.Name, descriptor);
-            }
-            return new ReadOnlyCollection<FileDescriptor>(descriptors);
-        }
-
-        /// <summary>
-        /// Converts the given descriptor binary data into FileDescriptor objects.
-        /// Note: reflection using the returned FileDescriptors is not currently supported.
-        /// </summary>
-        /// <param name="descriptorData">The binary file descriptor proto data. Must not be null, and any
-        /// dependencies must come before the descriptor which depends on them. (If A depends on B, and B
-        /// depends on C, then the descriptors must be presented in the order C, B, A.) This is compatible
-        /// with the order in which protoc provides descriptors to plugins.</param>
-        /// <returns>The file descriptors corresponding to <paramref name="descriptorData"/>.</returns>
-        public static IReadOnlyList<FileDescriptor> BuildFromByteStrings(IEnumerable<ByteString> descriptorData) =>
-            BuildFromByteStrings(descriptorData, null);
-
-        /// <summary>
-        /// Returns a <see cref="System.String" /> that represents this instance.
-        /// </summary>
-        /// <returns>
-        /// A <see cref="System.String" /> that represents this instance.
-        /// </returns>
-        public override string ToString()
-        {
-            return $"FileDescriptor for {Name}";
-        }
-
-        /// <summary>
-        /// Returns the file descriptor for descriptor.proto.
-        /// </summary>
-        /// <remarks>
-        /// This is used for protos which take a direct dependency on <c>descriptor.proto</c>, typically for
-        /// annotations. While <c>descriptor.proto</c> is a proto2 file, it is built into the Google.Protobuf
-        /// runtime for reflection purposes. The messages are internal to the runtime as they would require
-        /// proto2 semantics for full support, but the file descriptor is available via this property. The
-        /// C# codegen in protoc automatically uses this property when it detects a dependency on <c>descriptor.proto</c>.
-        /// </remarks>
-        /// <value>
-        /// The file descriptor for <c>descriptor.proto</c>.
-        /// </value>
-        public static FileDescriptor DescriptorProtoFileDescriptor { get { return DescriptorReflection.Descriptor; } }
-
-        /// <summary>
-        /// The (possibly empty) set of custom options for this file.
-        /// </summary>
-        [Obsolete("CustomOptions are obsolete. Use the GetOptions() method.")]
-        public CustomOptions CustomOptions => new CustomOptions(Proto.Options?._extensions?.ValuesByNumber);
-
-        /// <summary>
-        /// The <c>FileOptions</c>, defined in <c>descriptor.proto</c>.
-        /// If the options message is not present (i.e. there are no options), <c>null</c> is returned.
-        /// Custom options can be retrieved as extensions of the returned message.
-        /// NOTE: A defensive copy is created each time this property is retrieved.
-        /// </summary>
-        public FileOptions GetOptions() => Proto.Options?.Clone();
-
-        /// <summary>
-        /// Gets a single value file option for this descriptor
-        /// </summary>
-        [Obsolete("GetOption is obsolete. Use the GetOptions() method.")]
-        public T GetOption<T>(Extension<FileOptions, T> extension)
-        {
-            var value = Proto.Options.GetExtension(extension);
-            return value is IDeepCloneable<T> ? (value as IDeepCloneable<T>).Clone() : value;
-        }
-
-        /// <summary>
-        /// Gets a repeated value file option for this descriptor
-        /// </summary>
-        [Obsolete("GetOption is obsolete. Use the GetOptions() method.")]
-        public RepeatedField<T> GetOption<T>(RepeatedExtension<FileOptions, T> extension)
-        {
-            return Proto.Options.GetExtension(extension).Clone();
-        }
-
-        /// <summary>
-        /// Performs initialization for the given generic type argument.
-        /// </summary>
-        /// <remarks>
-        /// This method is present for the sake of AOT compilers. It allows code (whether handwritten or generated)
-        /// to make calls into the reflection machinery of this library to express an intention to use that type
-        /// reflectively (e.g. for JSON parsing and formatting). The call itself does almost nothing, but AOT compilers
-        /// attempting to determine which generic type arguments need to be handled will spot the code path and act
-        /// accordingly.
-        /// </remarks>
-        /// <typeparam name="T">The type to force initialization for.</typeparam>
-        public static void ForceReflectionInitialization<T>() => ReflectionUtil.ForceInitialize<T>();
-    }
-}
diff --git a/libs/protobuf/csharp/src/Google.Protobuf/Reflection/GeneratedClrTypeInfo.cs b/libs/protobuf/csharp/src/Google.Protobuf/Reflection/GeneratedClrTypeInfo.cs
deleted file mode 100644
index d0a495b..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf/Reflection/GeneratedClrTypeInfo.cs
+++ /dev/null
@@ -1,146 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-using System;
-using System.Diagnostics.CodeAnalysis;
-
-namespace Google.Protobuf.Reflection
-{
-    /// <summary>
-    /// Extra information provided by generated code when initializing a message or file descriptor.
-    /// These are constructed as required, and are not long-lived. Hand-written code should
-    /// never need to use this type.
-    /// </summary>
-    public sealed class GeneratedClrTypeInfo
-    {
-        private static readonly string[] EmptyNames = new string[0];
-        private static readonly GeneratedClrTypeInfo[] EmptyCodeInfo = new GeneratedClrTypeInfo[0];
-        private static readonly Extension[] EmptyExtensions = new Extension[0];
-        internal const DynamicallyAccessedMemberTypes MessageAccessibility =
-            // Creating types
-            DynamicallyAccessedMemberTypes.PublicConstructors |
-            // Getting and setting properties
-            DynamicallyAccessedMemberTypes.PublicProperties |
-            DynamicallyAccessedMemberTypes.NonPublicProperties |
-            // Calling presence methods
-            DynamicallyAccessedMemberTypes.PublicMethods;
-
-        /// <summary>
-        /// Irrelevant for file descriptors; the CLR type for the message for message descriptors.
-        /// </summary>
-        [DynamicallyAccessedMembers(MessageAccessibility)]
-        public Type ClrType { get; private set; }
-
-        /// <summary>
-        /// Irrelevant for file descriptors; the parser for message descriptors.
-        /// </summary>
-        public MessageParser Parser { get; }
-
-        /// <summary>
-        /// Irrelevant for file descriptors; the CLR property names (in message descriptor field order)
-        /// for fields in the message for message descriptors.
-        /// </summary>
-        public string[] PropertyNames { get; }
-
-        /// <summary>
-        /// The extensions defined within this file/message descriptor
-        /// </summary>
-        public Extension[] Extensions { get; }
-
-        /// <summary>
-        /// Irrelevant for file descriptors; the CLR property "base" names (in message descriptor oneof order)
-        /// for oneofs in the message for message descriptors. It is expected that for a oneof name of "Foo",
-        /// there will be a "FooCase" property and a "ClearFoo" method.
-        /// </summary>
-        public string[] OneofNames { get; }
-
-        /// <summary>
-        /// The reflection information for types within this file/message descriptor. Elements may be null
-        /// if there is no corresponding generated type, e.g. for map entry types.
-        /// </summary>
-        public GeneratedClrTypeInfo[] NestedTypes { get; }
-
-        /// <summary>
-        /// The CLR types for enums within this file/message descriptor.
-        /// </summary>
-        public Type[] NestedEnums { get; }
-
-        /// <summary>
-        /// Creates a GeneratedClrTypeInfo for a message descriptor, with nested types, nested enums, the CLR type, property names and oneof names.
-        /// Each array parameter may be null, to indicate a lack of values.
-        /// The parameter order is designed to make it feasible to format the generated code readably.
-        /// </summary>
-        public GeneratedClrTypeInfo(
-            // Preserve all public members on message types when trimming is enabled.
-            // This ensures that members used by reflection, e.g. JSON serialization, are preserved.
-            [DynamicallyAccessedMembers(MessageAccessibility)]
-            Type clrType, MessageParser parser, string[] propertyNames, string[] oneofNames, Type[] nestedEnums, Extension[] extensions, GeneratedClrTypeInfo[] nestedTypes)
-        {
-            NestedTypes = nestedTypes ?? EmptyCodeInfo;
-            NestedEnums = nestedEnums ?? ReflectionUtil.EmptyTypes;
-            ClrType = clrType;
-            Extensions = extensions ?? EmptyExtensions;
-            Parser = parser;
-            PropertyNames = propertyNames ?? EmptyNames;
-            OneofNames = oneofNames ?? EmptyNames;
-        }
-
-        /// <summary>
-        /// Creates a GeneratedClrTypeInfo for a message descriptor, with nested types, nested enums, the CLR type, property names and oneof names.
-        /// Each array parameter may be null, to indicate a lack of values.
-        /// The parameter order is designed to make it feasible to format the generated code readably.
-        /// </summary>
-        public GeneratedClrTypeInfo(
-            // Preserve all public members on message types when trimming is enabled.
-            // This ensures that members used by reflection, e.g. JSON serialization, are preserved.
-            [DynamicallyAccessedMembers(MessageAccessibility)]
-            Type clrType, MessageParser parser, string[] propertyNames, string[] oneofNames, Type[] nestedEnums, GeneratedClrTypeInfo[] nestedTypes)
-            : this(clrType, parser, propertyNames, oneofNames, nestedEnums, null, nestedTypes)
-        {
-        }
-
-        /// <summary>
-        /// Creates a GeneratedClrTypeInfo for a file descriptor, with only types, enums, and extensions.
-        /// </summary>
-        public GeneratedClrTypeInfo(Type[] nestedEnums, Extension[] extensions, GeneratedClrTypeInfo[] nestedTypes)
-            : this(null, null, null, null, nestedEnums, extensions, nestedTypes)
-        {
-        }
-
-        /// <summary>
-        /// Creates a GeneratedClrTypeInfo for a file descriptor, with only types and enums.
-        /// </summary>
-        public GeneratedClrTypeInfo(Type[] nestedEnums, GeneratedClrTypeInfo[] nestedTypes)
-            : this(null, null, null, null, nestedEnums, nestedTypes)
-        {
-        }
-    }
-}
\ No newline at end of file
diff --git a/libs/protobuf/csharp/src/Google.Protobuf/Reflection/IDescriptor.cs b/libs/protobuf/csharp/src/Google.Protobuf/Reflection/IDescriptor.cs
deleted file mode 100644
index 1c1ef38..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf/Reflection/IDescriptor.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-namespace Google.Protobuf.Reflection
-{
-    /// <summary>
-    /// Interface implemented by all descriptor types.
-    /// </summary>
-    public interface IDescriptor
-    {
-        /// <summary>
-        /// Returns the name of the entity (message, field etc) being described.
-        /// </summary>
-        string Name { get; }
-
-        /// <summary>
-        /// Returns the fully-qualified name of the entity being described.
-        /// </summary>
-        string FullName { get; }
-
-        /// <summary>
-        /// Returns the descriptor for the .proto file that this entity is part of.
-        /// </summary>
-        FileDescriptor File { get; }
-    }
-}
\ No newline at end of file
diff --git a/libs/protobuf/csharp/src/Google.Protobuf/Reflection/IFieldAccessor.cs b/libs/protobuf/csharp/src/Google.Protobuf/Reflection/IFieldAccessor.cs
deleted file mode 100644
index d73427b..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf/Reflection/IFieldAccessor.cs
+++ /dev/null
@@ -1,77 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-using System.Collections;
-
-namespace Google.Protobuf.Reflection
-{
-    /// <summary>
-    /// Allows fields to be reflectively accessed.
-    /// </summary>
-    public interface IFieldAccessor
-    {
-        /// <summary>
-        /// Returns the descriptor associated with this field.
-        /// </summary>
-        FieldDescriptor Descriptor { get; }
-
-        /// <summary>
-        /// Clears the field in the specified message. (For repeated fields,
-        /// this clears the list.)
-        /// </summary>
-        void Clear(IMessage message);
-
-        /// <summary>
-        /// Fetches the field value. For repeated values, this will be an
-        /// <see cref="IList"/> implementation. For map values, this will be an
-        /// <see cref="IDictionary"/> implementation.
-        /// </summary>
-        object GetValue(IMessage message);
-
-        /// <summary>
-        /// Indicates whether the field in the specified message is set.
-        /// For proto3 fields that aren't explicitly optional, this throws an <see cref="InvalidOperationException"/>
-        /// </summary>
-        bool HasValue(IMessage message);
-
-        /// <summary>
-        /// Mutator for single "simple" fields only.
-        /// </summary>
-        /// <remarks>
-        /// Repeated fields are mutated by fetching the value and manipulating it as a list.
-        /// Map fields are mutated by fetching the value and manipulating it as a dictionary.
-        /// </remarks>
-        /// <exception cref="InvalidOperationException">The field is not a "simple" field.</exception>
-        void SetValue(IMessage message, object value);
-    }
-}
\ No newline at end of file
diff --git a/libs/protobuf/csharp/src/Google.Protobuf/Reflection/MapFieldAccessor.cs b/libs/protobuf/csharp/src/Google.Protobuf/Reflection/MapFieldAccessor.cs
deleted file mode 100644
index 56e3ddd..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf/Reflection/MapFieldAccessor.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-using System.Collections;
-using System.Reflection;
-
-namespace Google.Protobuf.Reflection
-{
-    /// <summary>
-    /// Accessor for map fields.
-    /// </summary>
-    internal sealed class MapFieldAccessor : FieldAccessorBase
-    {
-        internal MapFieldAccessor(PropertyInfo property, FieldDescriptor descriptor) : base(property, descriptor)
-        {
-        }
-
-        public override void Clear(IMessage message)
-        {
-            IDictionary list = (IDictionary) GetValue(message);
-            list.Clear();
-        }
-
-        public override bool HasValue(IMessage message)
-        {
-            throw new InvalidOperationException("HasValue is not implemented for map fields");
-        }
-
-        public override void SetValue(IMessage message, object value)
-        {
-            throw new InvalidOperationException("SetValue is not implemented for map fields");
-        }
-    }
-}
diff --git a/libs/protobuf/csharp/src/Google.Protobuf/Reflection/MessageDescriptor.cs b/libs/protobuf/csharp/src/Google.Protobuf/Reflection/MessageDescriptor.cs
deleted file mode 100644
index 40a6ff8..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf/Reflection/MessageDescriptor.cs
+++ /dev/null
@@ -1,430 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-using System.Reflection;
-#if NET35
-// Needed for ReadOnlyDictionary, which does not exist in .NET 3.5
-using Google.Protobuf.Collections;
-#endif
-
-namespace Google.Protobuf.Reflection
-{
-    /// <summary>
-    /// Describes a message type.
-    /// </summary>
-    public sealed class MessageDescriptor : DescriptorBase
-    {
-        private static readonly HashSet<string> WellKnownTypeNames = new HashSet<string>
-        {
-            "google/protobuf/any.proto",
-            "google/protobuf/api.proto",
-            "google/protobuf/duration.proto",
-            "google/protobuf/empty.proto",
-            "google/protobuf/wrappers.proto",
-            "google/protobuf/timestamp.proto",
-            "google/protobuf/field_mask.proto",
-            "google/protobuf/source_context.proto",
-            "google/protobuf/struct.proto",
-            "google/protobuf/type.proto",
-        };
-
-        private readonly IList<FieldDescriptor> fieldsInDeclarationOrder;
-        private readonly IList<FieldDescriptor> fieldsInNumberOrder;
-        private readonly IDictionary<string, FieldDescriptor> jsonFieldMap;
-        private Func<IMessage, bool> extensionSetIsInitialized;
-
-        internal MessageDescriptor(DescriptorProto proto, FileDescriptor file, MessageDescriptor parent, int typeIndex, GeneratedClrTypeInfo generatedCodeInfo)
-            : base(file, file.ComputeFullName(parent, proto.Name), typeIndex)
-        {
-            Proto = proto;
-            Parser = generatedCodeInfo?.Parser;
-            ClrType = generatedCodeInfo?.ClrType;
-            ContainingType = parent;
-
-            // If generatedCodeInfo is null, we just won't generate an accessor for any fields.
-            Oneofs = DescriptorUtil.ConvertAndMakeReadOnly(
-                proto.OneofDecl,
-                (oneof, index) =>
-                new OneofDescriptor(oneof, file, this, index, generatedCodeInfo?.OneofNames[index]));
-
-            int syntheticOneofCount = 0;
-            foreach (var oneof in Oneofs)
-            {
-                if (oneof.IsSynthetic)
-                {
-                    syntheticOneofCount++;
-                }
-                else if (syntheticOneofCount != 0)
-                {
-                    throw new ArgumentException("All synthetic oneofs should come after real oneofs");
-                }
-            }
-            RealOneofCount = Oneofs.Count - syntheticOneofCount;
-
-            NestedTypes = DescriptorUtil.ConvertAndMakeReadOnly(
-                proto.NestedType,
-                (type, index) =>
-                new MessageDescriptor(type, file, this, index, generatedCodeInfo?.NestedTypes[index]));
-
-            EnumTypes = DescriptorUtil.ConvertAndMakeReadOnly(
-                proto.EnumType,
-                (type, index) =>
-                new EnumDescriptor(type, file, this, index, generatedCodeInfo?.NestedEnums[index]));
-
-            Extensions = new ExtensionCollection(this, generatedCodeInfo?.Extensions);
-
-            fieldsInDeclarationOrder = DescriptorUtil.ConvertAndMakeReadOnly(
-                proto.Field,
-                (field, index) =>
-                new FieldDescriptor(field, file, this, index, generatedCodeInfo?.PropertyNames[index], null));
-            fieldsInNumberOrder = new ReadOnlyCollection<FieldDescriptor>(fieldsInDeclarationOrder.OrderBy(field => field.FieldNumber).ToArray());
-            // TODO: Use field => field.Proto.JsonName when we're confident it's appropriate. (And then use it in the formatter, too.)
-            jsonFieldMap = CreateJsonFieldMap(fieldsInNumberOrder);
-            file.DescriptorPool.AddSymbol(this);
-            Fields = new FieldCollection(this);
-        }
-
-        private static ReadOnlyDictionary<string, FieldDescriptor> CreateJsonFieldMap(IList<FieldDescriptor> fields)
-        {
-            var map = new Dictionary<string, FieldDescriptor>();
-            foreach (var field in fields)
-            {
-                map[field.Name] = field;
-                map[field.JsonName] = field;
-            }
-            return new ReadOnlyDictionary<string, FieldDescriptor>(map);
-        }
-
-        /// <summary>
-        /// The brief name of the descriptor's target.
-        /// </summary>
-        public override string Name => Proto.Name;
-
-        internal override IReadOnlyList<DescriptorBase> GetNestedDescriptorListForField(int fieldNumber)
-        {
-            switch (fieldNumber)
-            {
-                case DescriptorProto.FieldFieldNumber:
-                    return (IReadOnlyList<DescriptorBase>) fieldsInDeclarationOrder;
-                case DescriptorProto.NestedTypeFieldNumber:
-                    return (IReadOnlyList<DescriptorBase>) NestedTypes;
-                case DescriptorProto.EnumTypeFieldNumber:
-                    return (IReadOnlyList<DescriptorBase>) EnumTypes;
-                default:
-                    return null;
-            }
-        }
-
-        internal DescriptorProto Proto { get; }
-
-        /// <summary>
-        /// Returns a clone of the underlying <see cref="DescriptorProto"/> describing this message.
-        /// Note that a copy is taken every time this method is called, so clients using it frequently
-        /// (and not modifying it) may want to cache the returned value.
-        /// </summary>
-        /// <returns>A protobuf representation of this message descriptor.</returns>
-        public DescriptorProto ToProto() => Proto.Clone();
-
-        internal bool IsExtensionsInitialized(IMessage message)
-        {
-            if (Proto.ExtensionRange.Count == 0)
-            {
-                return true;
-            }
-
-            if (extensionSetIsInitialized == null)
-            {
-                extensionSetIsInitialized = ReflectionUtil.CreateIsInitializedCaller(ClrType);
-            }
-
-            return extensionSetIsInitialized(message);
-        }
-
-        /// <summary>
-        /// The CLR type used to represent message instances from this descriptor.
-        /// </summary>
-        /// <remarks>
-        /// <para>
-        /// The value returned by this property will be non-null for all regular fields. However,
-        /// if a message containing a map field is introspected, the list of nested messages will include
-        /// an auto-generated nested key/value pair message for the field. This is not represented in any
-        /// generated type, so this property will return null in such cases.
-        /// </para>
-        /// <para>
-        /// For wrapper types (<see cref="Google.Protobuf.WellKnownTypes.StringValue"/> and the like), the type returned here
-        /// will be the generated message type, not the native type used by reflection for fields of those types. Code
-        /// using reflection should call <see cref="IsWrapperType"/> to determine whether a message descriptor represents
-        /// a wrapper type, and handle the result appropriately.
-        /// </para>
-        /// </remarks>
-        [DynamicallyAccessedMembers(GeneratedClrTypeInfo.MessageAccessibility)]
-        public Type ClrType { get; }
-
-        /// <summary>
-        /// A parser for this message type.
-        /// </summary>
-        /// <remarks>
-        /// <para>
-        /// As <see cref="MessageDescriptor"/> is not generic, this cannot be statically
-        /// typed to the relevant type, but it should produce objects of a type compatible with <see cref="ClrType"/>.
-        /// </para>
-        /// <para>
-        /// The value returned by this property will be non-null for all regular fields. However,
-        /// if a message containing a map field is introspected, the list of nested messages will include
-        /// an auto-generated nested key/value pair message for the field. No message parser object is created for
-        /// such messages, so this property will return null in such cases.
-        /// </para>
-        /// <para>
-        /// For wrapper types (<see cref="Google.Protobuf.WellKnownTypes.StringValue"/> and the like), the parser returned here
-        /// will be the generated message type, not the native type used by reflection for fields of those types. Code
-        /// using reflection should call <see cref="IsWrapperType"/> to determine whether a message descriptor represents
-        /// a wrapper type, and handle the result appropriately.
-        /// </para>
-        /// </remarks>
-        public MessageParser Parser { get; }
-
-        /// <summary>
-        /// Returns whether this message is one of the "well known types" which may have runtime/protoc support.
-        /// </summary>
-        internal bool IsWellKnownType => File.Package == "google.protobuf" && WellKnownTypeNames.Contains(File.Name);
-
-        /// <summary>
-        /// Returns whether this message is one of the "wrapper types" used for fields which represent primitive values
-        /// with the addition of presence.
-        /// </summary>
-        internal bool IsWrapperType => File.Package == "google.protobuf" && File.Name == "google/protobuf/wrappers.proto";
-
-        /// <value>
-        /// If this is a nested type, get the outer descriptor, otherwise null.
-        /// </value>
-        public MessageDescriptor ContainingType { get; }
-
-        /// <value>
-        /// A collection of fields, which can be retrieved by name or field number.
-        /// </value>
-        public FieldCollection Fields { get; }
-
-        /// <summary>
-        /// An unmodifiable list of extensions defined in this message's scope.
-        /// Note that some extensions may be incomplete (FieldDescriptor.Extension may be null)
-        /// if they are declared in a file generated using a version of protoc that did not fully
-        /// support extensions in C#.
-        /// </summary>
-        public ExtensionCollection Extensions { get; }
-
-        /// <value>
-        /// An unmodifiable list of this message type's nested types.
-        /// </value>
-        public IList<MessageDescriptor> NestedTypes { get; }
-
-        /// <value>
-        /// An unmodifiable list of this message type's enum types.
-        /// </value>
-        public IList<EnumDescriptor> EnumTypes { get; }
-
-        /// <value>
-        /// An unmodifiable list of the "oneof" field collections in this message type.
-        /// All "real" oneofs (where <see cref="OneofDescriptor.IsSynthetic"/> returns false)
-        /// come before synthetic ones.
-        /// </value>
-        public IList<OneofDescriptor> Oneofs { get; }
-
-        /// <summary>
-        /// The number of real "oneof" descriptors in this message type. Every element in <see cref="Oneofs"/>
-        /// with an index less than this will have a <see cref="OneofDescriptor.IsSynthetic"/> property value
-        /// of <c>false</c>; every element with an index greater than or equal to this will have a
-        /// <see cref="OneofDescriptor.IsSynthetic"/> property value of <c>true</c>.
-        /// </summary>
-        public int RealOneofCount { get; }
-
-        /// <summary>
-        /// Finds a field by field name.
-        /// </summary>
-        /// <param name="name">The unqualified name of the field (e.g. "foo").</param>
-        /// <returns>The field's descriptor, or null if not found.</returns>
-        public FieldDescriptor FindFieldByName(String name) => File.DescriptorPool.FindSymbol<FieldDescriptor>(FullName + "." + name);
-
-        /// <summary>
-        /// Finds a field by field number.
-        /// </summary>
-        /// <param name="number">The field number within this message type.</param>
-        /// <returns>The field's descriptor, or null if not found.</returns>
-        public FieldDescriptor FindFieldByNumber(int number) => File.DescriptorPool.FindFieldByNumber(this, number);
-
-        /// <summary>
-        /// Finds a nested descriptor by name. The is valid for fields, nested
-        /// message types, oneofs and enums.
-        /// </summary>
-        /// <param name="name">The unqualified name of the descriptor, e.g. "Foo"</param>
-        /// <returns>The descriptor, or null if not found.</returns>
-        public T FindDescriptor<T>(string name)  where T : class, IDescriptor =>
-            File.DescriptorPool.FindSymbol<T>(FullName + "." + name);
-
-        /// <summary>
-        /// The (possibly empty) set of custom options for this message.
-        /// </summary>
-        [Obsolete("CustomOptions are obsolete. Use the GetOptions() method.")]
-        public CustomOptions CustomOptions => new CustomOptions(Proto.Options?._extensions?.ValuesByNumber);
-
-        /// <summary>
-        /// The <c>MessageOptions</c>, defined in <c>descriptor.proto</c>.
-        /// If the options message is not present (i.e. there are no options), <c>null</c> is returned.
-        /// Custom options can be retrieved as extensions of the returned message.
-        /// NOTE: A defensive copy is created each time this property is retrieved.
-        /// </summary>
-        public MessageOptions GetOptions() => Proto.Options?.Clone();
-
-        /// <summary>
-        /// Gets a single value message option for this descriptor
-        /// </summary>
-        [Obsolete("GetOption is obsolete. Use the GetOptions() method.")]
-        public T GetOption<T>(Extension<MessageOptions, T> extension)
-        {
-            var value = Proto.Options.GetExtension(extension);
-            return value is IDeepCloneable<T> ? (value as IDeepCloneable<T>).Clone() : value;
-        }
-
-        /// <summary>
-        /// Gets a repeated value message option for this descriptor
-        /// </summary>
-        [Obsolete("GetOption is obsolete. Use the GetOptions() method.")]
-        public Collections.RepeatedField<T> GetOption<T>(RepeatedExtension<MessageOptions, T> extension)
-        {
-            return Proto.Options.GetExtension(extension).Clone();
-        }
-
-        /// <summary>
-        /// Looks up and cross-links all fields and nested types.
-        /// </summary>
-        internal void CrossLink()
-        {
-            foreach (MessageDescriptor message in NestedTypes)
-            {
-                message.CrossLink();
-            }
-
-            foreach (FieldDescriptor field in fieldsInDeclarationOrder)
-            {
-                field.CrossLink();
-            }
-
-            foreach (OneofDescriptor oneof in Oneofs)
-            {
-                oneof.CrossLink();
-            }
-
-            Extensions.CrossLink();
-        }
-
-        /// <summary>
-        /// A collection to simplify retrieving the field accessor for a particular field.
-        /// </summary>
-        public sealed class FieldCollection
-        {
-            private readonly MessageDescriptor messageDescriptor;
-
-            internal FieldCollection(MessageDescriptor messageDescriptor)
-            {
-                this.messageDescriptor = messageDescriptor;
-            }
-
-            /// <value>
-            /// Returns the fields in the message as an immutable list, in the order in which they
-            /// are declared in the source .proto file.
-            /// </value>
-            public IList<FieldDescriptor> InDeclarationOrder() => messageDescriptor.fieldsInDeclarationOrder;
-
-            /// <value>
-            /// Returns the fields in the message as an immutable list, in ascending field number
-            /// order. Field numbers need not be contiguous, so there is no direct mapping from the
-            /// index in the list to the field number; to retrieve a field by field number, it is better
-            /// to use the <see cref="FieldCollection"/> indexer.
-            /// </value>
-            public IList<FieldDescriptor> InFieldNumberOrder() => messageDescriptor.fieldsInNumberOrder;
-
-            // TODO: consider making this public in the future. (Being conservative for now...)
-
-            /// <value>
-            /// Returns a read-only dictionary mapping the field names in this message as they're available
-            /// in the JSON representation to the field descriptors. For example, a field <c>foo_bar</c>
-            /// in the message would result two entries, one with a key <c>fooBar</c> and one with a key
-            /// <c>foo_bar</c>, both referring to the same field.
-            /// </value>
-            internal IDictionary<string, FieldDescriptor> ByJsonName() => messageDescriptor.jsonFieldMap;
-
-            /// <summary>
-            /// Retrieves the descriptor for the field with the given number.
-            /// </summary>
-            /// <param name="number">Number of the field to retrieve the descriptor for</param>
-            /// <returns>The accessor for the given field</returns>
-            /// <exception cref="KeyNotFoundException">The message descriptor does not contain a field
-            /// with the given number</exception>
-            public FieldDescriptor this[int number]
-            {
-                get
-                {
-                    var fieldDescriptor = messageDescriptor.FindFieldByNumber(number);
-                    if (fieldDescriptor == null)
-                    {
-                        throw new KeyNotFoundException("No such field number");
-                    }
-                    return fieldDescriptor;
-                }
-            }
-
-            /// <summary>
-            /// Retrieves the descriptor for the field with the given name.
-            /// </summary>
-            /// <param name="name">Name of the field to retrieve the descriptor for</param>
-            /// <returns>The descriptor for the given field</returns>
-            /// <exception cref="KeyNotFoundException">The message descriptor does not contain a field
-            /// with the given name</exception>
-            public FieldDescriptor this[string name]
-            {
-                get
-                {
-                    var fieldDescriptor = messageDescriptor.FindFieldByName(name);
-                    if (fieldDescriptor == null)
-                    {
-                        throw new KeyNotFoundException("No such field name");
-                    }
-                    return fieldDescriptor;
-                }
-            }
-        }
-    }
-}
diff --git a/libs/protobuf/csharp/src/Google.Protobuf/Reflection/MethodDescriptor.cs b/libs/protobuf/csharp/src/Google.Protobuf/Reflection/MethodDescriptor.cs
deleted file mode 100644
index f5ecf2e..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf/Reflection/MethodDescriptor.cs
+++ /dev/null
@@ -1,148 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using Google.Protobuf.Collections;
-using System;
-
-namespace Google.Protobuf.Reflection
-{
-    /// <summary>
-    /// Describes a single method in a service.
-    /// </summary>
-    public sealed class MethodDescriptor : DescriptorBase
-    {
-        private readonly MethodDescriptorProto proto;
-        private readonly ServiceDescriptor service;
-        private MessageDescriptor inputType;
-        private MessageDescriptor outputType;
-
-        /// <value>
-        /// The service this method belongs to.
-        /// </value>
-        public ServiceDescriptor Service { get { return service; } }
-
-        /// <value>
-        /// The method's input type.
-        /// </value>
-        public MessageDescriptor InputType { get { return inputType; } }
-
-        /// <value>
-        /// The method's input type.
-        /// </value>
-        public MessageDescriptor OutputType { get { return outputType; } }
-
-        /// <value>
-        /// Indicates if client streams multiple requests.
-        /// </value>
-        public bool IsClientStreaming { get { return proto.ClientStreaming; } }
-
-        /// <value>
-        /// Indicates if server streams multiple responses.
-        /// </value>
-        public bool IsServerStreaming { get { return proto.ServerStreaming; } }
-
-        /// <summary>
-        /// The (possibly empty) set of custom options for this method.
-        /// </summary>
-        [Obsolete("CustomOptions are obsolete. Use the GetOptions() method.")]
-        public CustomOptions CustomOptions => new CustomOptions(Proto.Options?._extensions?.ValuesByNumber);
-
-        /// <summary>
-        /// The <c>MethodOptions</c>, defined in <c>descriptor.proto</c>.
-        /// If the options message is not present (i.e. there are no options), <c>null</c> is returned.
-        /// Custom options can be retrieved as extensions of the returned message.
-        /// NOTE: A defensive copy is created each time this property is retrieved.
-        /// </summary>
-        public MethodOptions GetOptions() => Proto.Options?.Clone();
-
-        /// <summary>
-        /// Gets a single value method option for this descriptor
-        /// </summary>
-        [Obsolete("GetOption is obsolete. Use the GetOptions() method.")]
-        public T GetOption<T>(Extension<MethodOptions, T> extension)
-        {
-            var value = Proto.Options.GetExtension(extension);
-            return value is IDeepCloneable<T> ? (value as IDeepCloneable<T>).Clone() : value;
-        }
-
-        /// <summary>
-        /// Gets a repeated value method option for this descriptor
-        /// </summary>
-        [Obsolete("GetOption is obsolete. Use the GetOptions() method.")]
-        public RepeatedField<T> GetOption<T>(RepeatedExtension<MethodOptions, T> extension)
-        {
-            return Proto.Options.GetExtension(extension).Clone();
-        }
-
-        internal MethodDescriptor(MethodDescriptorProto proto, FileDescriptor file,
-                                  ServiceDescriptor parent, int index)
-            : base(file, parent.FullName + "." + proto.Name, index)
-        {
-            this.proto = proto;
-            service = parent;
-            file.DescriptorPool.AddSymbol(this);
-        }
-
-        internal MethodDescriptorProto Proto { get { return proto; } }
-
-        /// <summary>
-        /// Returns a clone of the underlying <see cref="MethodDescriptorProto"/> describing this method.
-        /// Note that a copy is taken every time this method is called, so clients using it frequently
-        /// (and not modifying it) may want to cache the returned value.
-        /// </summary>
-        /// <returns>A protobuf representation of this method descriptor.</returns>
-        public MethodDescriptorProto ToProto() => Proto.Clone();
-
-        /// <summary>
-        /// The brief name of the descriptor's target.
-        /// </summary>
-        public override string Name { get { return proto.Name; } }
-
-        internal void CrossLink()
-        {
-            IDescriptor lookup = File.DescriptorPool.LookupSymbol(Proto.InputType, this);
-            if (!(lookup is MessageDescriptor))
-            {
-                throw new DescriptorValidationException(this, "\"" + Proto.InputType + "\" is not a message type.");
-            }
-            inputType = (MessageDescriptor) lookup;
-
-            lookup = File.DescriptorPool.LookupSymbol(Proto.OutputType, this);
-            if (!(lookup is MessageDescriptor))
-            {
-                throw new DescriptorValidationException(this, "\"" + Proto.OutputType + "\" is not a message type.");
-            }
-            outputType = (MessageDescriptor) lookup;
-        }
-    }
-}
- 
\ No newline at end of file
diff --git a/libs/protobuf/csharp/src/Google.Protobuf/Reflection/OneofAccessor.cs b/libs/protobuf/csharp/src/Google.Protobuf/Reflection/OneofAccessor.cs
deleted file mode 100644
index 7523426..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf/Reflection/OneofAccessor.cs
+++ /dev/null
@@ -1,97 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-using System.Reflection;
-using Google.Protobuf.Compatibility;
-
-namespace Google.Protobuf.Reflection
-{
-    /// <summary>
-    /// Reflection access for a oneof, allowing clear and "get case" actions.
-    /// </summary>
-    public sealed class OneofAccessor
-    {
-        private readonly Func<IMessage, int> caseDelegate;
-        private readonly Action<IMessage> clearDelegate;
-
-        private OneofAccessor(OneofDescriptor descriptor, Func<IMessage, int> caseDelegate, Action<IMessage> clearDelegate)
-        {
-            Descriptor = descriptor;
-            this.caseDelegate = caseDelegate;
-            this.clearDelegate = clearDelegate;
-        }
-
-        internal static OneofAccessor ForRegularOneof(
-            OneofDescriptor descriptor,
-            PropertyInfo caseProperty,
-            MethodInfo clearMethod) =>
-            new OneofAccessor(
-                descriptor,
-                ReflectionUtil.CreateFuncIMessageInt32(caseProperty.GetGetMethod()),
-                ReflectionUtil.CreateActionIMessage(clearMethod));
-
-        internal static OneofAccessor ForSyntheticOneof(OneofDescriptor descriptor)
-        {
-            // Note: descriptor.Fields will be null when this method is called, because we haven't
-            // cross-linked yet. But by the time the delegates are called by user code, all will be
-            // well. (That's why we capture the descriptor itself rather than a field.)
-            return new OneofAccessor(descriptor,
-                message => descriptor.Fields[0].Accessor.HasValue(message) ? descriptor.Fields[0].FieldNumber : 0,
-                message => descriptor.Fields[0].Accessor.Clear(message));
-        }
-
-        /// <summary>
-        /// Gets the descriptor for this oneof.
-        /// </summary>
-        /// <value>
-        /// The descriptor of the oneof.
-        /// </value>
-        public OneofDescriptor Descriptor { get; }
-
-        /// <summary>
-        /// Clears the oneof in the specified message.
-        /// </summary>
-        public void Clear(IMessage message) => clearDelegate(message);
-
-        /// <summary>
-        /// Indicates which field in the oneof is set for specified message
-        /// </summary>
-        public FieldDescriptor GetCaseFieldDescriptor(IMessage message)
-        {
-            int fieldNumber = caseDelegate(message);
-            return fieldNumber > 0
-                ? Descriptor.ContainingType.FindFieldByNumber(fieldNumber)
-                : null;
-        }
-    }
-}
diff --git a/libs/protobuf/csharp/src/Google.Protobuf/Reflection/OneofDescriptor.cs b/libs/protobuf/csharp/src/Google.Protobuf/Reflection/OneofDescriptor.cs
deleted file mode 100644
index ae29ded..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf/Reflection/OneofDescriptor.cs
+++ /dev/null
@@ -1,205 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using Google.Protobuf.Collections;
-using Google.Protobuf.Compatibility;
-
-namespace Google.Protobuf.Reflection
-{
-    /// <summary>
-    /// Describes a "oneof" field collection in a message type: a set of
-    /// fields of which at most one can be set in any particular message.
-    /// </summary>
-    public sealed class OneofDescriptor : DescriptorBase
-    {
-        private MessageDescriptor containingType;
-        private IList<FieldDescriptor> fields;
-        private readonly OneofAccessor accessor;
-
-        internal OneofDescriptor(OneofDescriptorProto proto, FileDescriptor file, MessageDescriptor parent, int index, string clrName)
-            : base(file, file.ComputeFullName(parent, proto.Name), index)
-        {
-            this.Proto = proto;
-            containingType = parent;
-            file.DescriptorPool.AddSymbol(this);
-
-            // It's useful to determine whether or not this is a synthetic oneof before cross-linking. That means
-            // diving into the proto directly rather than using FieldDescriptor, but that's okay.
-            var firstFieldInOneof = parent.Proto.Field.FirstOrDefault(fieldProto => fieldProto.HasOneofIndex && fieldProto.OneofIndex == index);
-            IsSynthetic = firstFieldInOneof?.Proto3Optional ?? false;
-
-            accessor = CreateAccessor(clrName);
-        }
-
-        /// <summary>
-        /// The brief name of the descriptor's target.
-        /// </summary>
-        public override string Name => Proto.Name;
-
-        // Visible for testing
-        internal OneofDescriptorProto Proto { get; }
-
-        /// <summary>
-        /// Returns a clone of the underlying <see cref="OneofDescriptorProto"/> describing this oneof.
-        /// Note that a copy is taken every time this method is called, so clients using it frequently
-        /// (and not modifying it) may want to cache the returned value.
-        /// </summary>
-        /// <returns>A protobuf representation of this oneof descriptor.</returns>
-        public OneofDescriptorProto ToProto() => Proto.Clone();
-
-        /// <summary>
-        /// Gets the message type containing this oneof.
-        /// </summary>
-        /// <value>
-        /// The message type containing this oneof.
-        /// </value>
-        public MessageDescriptor ContainingType
-        {
-            get { return containingType; }
-        }
-
-        /// <summary>
-        /// Gets the fields within this oneof, in declaration order.
-        /// </summary>
-        /// <value>
-        /// The fields within this oneof, in declaration order.
-        /// </value>
-        public IList<FieldDescriptor> Fields { get { return fields; } }
-
-        /// <summary>
-        /// Returns <c>true</c> if this oneof is a synthetic oneof containing a proto3 optional field;
-        /// <c>false</c> otherwise.
-        /// </summary>
-        public bool IsSynthetic { get; }
-
-        /// <summary>
-        /// Gets an accessor for reflective access to the values associated with the oneof
-        /// in a particular message.
-        /// </summary>
-        /// <remarks>
-        /// <para>
-        /// In descriptors for generated code, the value returned by this property will always be non-null.
-        /// </para>
-        /// <para>
-        /// In dynamically loaded descriptors, the value returned by this property will current be null;
-        /// if and when dynamic messages are supported, it will return a suitable accessor to work with
-        /// them.
-        /// </para>
-        /// </remarks>
-        /// <value>
-        /// The accessor used for reflective access.
-        /// </value>
-        public OneofAccessor Accessor { get { return accessor; } }
-
-        /// <summary>
-        /// The (possibly empty) set of custom options for this oneof.
-        /// </summary>
-        [Obsolete("CustomOptions are obsolete. Use the GetOptions method.")]
-        public CustomOptions CustomOptions => new CustomOptions(Proto.Options?._extensions?.ValuesByNumber);
-
-        /// <summary>
-        /// The <c>OneofOptions</c>, defined in <c>descriptor.proto</c>.
-        /// If the options message is not present (i.e. there are no options), <c>null</c> is returned.
-        /// Custom options can be retrieved as extensions of the returned message.
-        /// NOTE: A defensive copy is created each time this property is retrieved.
-        /// </summary>
-        public OneofOptions GetOptions() => Proto.Options?.Clone();
-
-        /// <summary>
-        /// Gets a single value oneof option for this descriptor
-        /// </summary>
-        [Obsolete("GetOption is obsolete. Use the GetOptions() method.")]
-        public T GetOption<T>(Extension<OneofOptions, T> extension)
-        {
-            var value = Proto.Options.GetExtension(extension);
-            return value is IDeepCloneable<T> ? (value as IDeepCloneable<T>).Clone() : value;
-        }
-
-        /// <summary>
-        /// Gets a repeated value oneof option for this descriptor
-        /// </summary>
-        [Obsolete("GetOption is obsolete. Use the GetOptions() method.")]
-        public RepeatedField<T> GetOption<T>(RepeatedExtension<OneofOptions, T> extension)
-        {
-            return Proto.Options.GetExtension(extension).Clone();
-        }
-
-        internal void CrossLink()
-        {
-            List<FieldDescriptor> fieldCollection = new List<FieldDescriptor>();
-            foreach (var field in ContainingType.Fields.InDeclarationOrder())
-            {
-                if (field.ContainingOneof == this)
-                {
-                    fieldCollection.Add(field);
-                }
-            }
-            fields = new ReadOnlyCollection<FieldDescriptor>(fieldCollection);
-        }
-
-        private OneofAccessor CreateAccessor(string clrName)
-        {
-            // We won't have a CLR name if this is from a dynamically-loaded FileDescriptor.
-            // TODO: Support dynamic messages.
-            if (clrName == null)
-            {
-                return null;
-            }
-            if (IsSynthetic)
-            {
-                return OneofAccessor.ForSyntheticOneof(this);
-            }
-            else
-            {
-                var caseProperty = containingType.ClrType.GetProperty(clrName + "Case");
-                if (caseProperty == null)
-                {
-                    throw new DescriptorValidationException(this, $"Property {clrName}Case not found in {containingType.ClrType}");
-                }
-                if (!caseProperty.CanRead)
-                {
-                    throw new ArgumentException($"Cannot read from property {clrName}Case in {containingType.ClrType}");
-                }
-                var clearMethod = containingType.ClrType.GetMethod("Clear" + clrName);
-                if (clearMethod == null)
-                {
-                    throw new DescriptorValidationException(this, $"Method Clear{clrName} not found in {containingType.ClrType}");
-                }
-                return OneofAccessor.ForRegularOneof(this, caseProperty, clearMethod);
-            }
-        }
-    }
-}
diff --git a/libs/protobuf/csharp/src/Google.Protobuf/Reflection/OriginalNameAttribute.cs b/libs/protobuf/csharp/src/Google.Protobuf/Reflection/OriginalNameAttribute.cs
deleted file mode 100644
index 63f5228..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf/Reflection/OriginalNameAttribute.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-
-namespace Google.Protobuf.Reflection
-{
-    /// <summary>
-    /// Specifies the original name (in the .proto file) of a named element,
-    /// such as an enum value.
-    /// </summary>
-    [AttributeUsage(AttributeTargets.Field)]
-    public class OriginalNameAttribute : Attribute
-    {
-        /// <summary>
-        /// The name of the element in the .proto file.
-        /// </summary>
-        public string Name { get; set; }
-
-        /// <summary>
-        /// If the name is preferred in the .proto file.
-        /// </summary>
-        public bool PreferredAlias { get; set; }
-
-        /// <summary>
-        /// Constructs a new attribute instance for the given name.
-        /// </summary>
-        /// <param name="name">The name of the element in the .proto file.</param>
-        public OriginalNameAttribute(string name)
-        {
-            Name = ProtoPreconditions.CheckNotNull(name, nameof(name));
-            PreferredAlias = true;
-        }
-
-    }
-}
diff --git a/libs/protobuf/csharp/src/Google.Protobuf/Reflection/PackageDescriptor.cs b/libs/protobuf/csharp/src/Google.Protobuf/Reflection/PackageDescriptor.cs
deleted file mode 100644
index e547d83..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf/Reflection/PackageDescriptor.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-namespace Google.Protobuf.Reflection
-{
-    /// <summary>
-    /// Represents a package in the symbol table.  We use PackageDescriptors
-    /// just as placeholders so that someone cannot define, say, a message type
-    /// that has the same name as an existing package.
-    /// </summary>
-    internal sealed class PackageDescriptor : IDescriptor
-    {
-        private readonly string name;
-        private readonly string fullName;
-        private readonly FileDescriptor file;
-
-        internal PackageDescriptor(string name, string fullName, FileDescriptor file)
-        {
-            this.file = file;
-            this.fullName = fullName;
-            this.name = name;
-        }
-
-        public string Name
-        {
-            get { return name; }
-        }
-
-        public string FullName
-        {
-            get { return fullName; }
-        }
-
-        public FileDescriptor File
-        {
-            get { return file; }
-        }
-    }
-}
\ No newline at end of file
diff --git a/libs/protobuf/csharp/src/Google.Protobuf/Reflection/ReflectionUtil.cs b/libs/protobuf/csharp/src/Google.Protobuf/Reflection/ReflectionUtil.cs
deleted file mode 100644
index 73efcc2..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf/Reflection/ReflectionUtil.cs
+++ /dev/null
@@ -1,365 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using Google.Protobuf.Compatibility;
-using System;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
-namespace Google.Protobuf.Reflection
-{
-    /// <summary>
-    /// The methods in this class are somewhat evil, and should not be tampered with lightly.
-    /// Basically they allow the creation of relatively weakly typed delegates from MethodInfos
-    /// which are more strongly typed. They do this by creating an appropriate strongly typed
-    /// delegate from the MethodInfo, and then calling that within an anonymous method.
-    /// Mind-bending stuff (at least to your humble narrator) but the resulting delegates are
-    /// very fast compared with calling Invoke later on.
-    /// </summary>
-    internal static class ReflectionUtil
-    {
-        static ReflectionUtil()
-        {
-            ForceInitialize<string>(); // Handles all reference types
-            ForceInitialize<int>();
-            ForceInitialize<long>();
-            ForceInitialize<uint>();
-            ForceInitialize<ulong>();
-            ForceInitialize<float>();
-            ForceInitialize<double>();
-            ForceInitialize<bool>();
-            ForceInitialize<int?>();
-            ForceInitialize<long?>();
-            ForceInitialize<uint?>();
-            ForceInitialize<ulong?>();
-            ForceInitialize<float?>();
-            ForceInitialize<double?>();
-            ForceInitialize<bool?>();
-            ForceInitialize<SampleEnum>();
-            SampleEnumMethod();
-        }
-
-        internal static void ForceInitialize<T>() => new ReflectionHelper<IMessage, T>();
-
-        /// <summary>
-        /// Empty Type[] used when calling GetProperty to force property instead of indexer fetching.
-        /// </summary>
-        internal static readonly Type[] EmptyTypes = new Type[0];
-
-        /// <summary>
-        /// Creates a delegate which will cast the argument to the type that declares the method,
-        /// call the method on it, then convert the result to object.
-        /// </summary>
-        /// <param name="method">The method to create a delegate for, which must be declared in an IMessage
-        /// implementation.</param>
-        internal static Func<IMessage, object> CreateFuncIMessageObject(MethodInfo method) =>
-            GetReflectionHelper(method.DeclaringType, method.ReturnType).CreateFuncIMessageObject(method);
-
-        /// <summary>
-        /// Creates a delegate which will cast the argument to the type that declares the method,
-        /// call the method on it, then convert the result to the specified type. The method is expected
-        /// to actually return an enum (because of where we're calling it - for oneof cases). Sometimes that
-        /// means we need some extra work to perform conversions.
-        /// </summary>
-        /// <param name="method">The method to create a delegate for, which must be declared in an IMessage
-        /// implementation.</param>
-        internal static Func<IMessage, int> CreateFuncIMessageInt32(MethodInfo method) =>
-            GetReflectionHelper(method.DeclaringType, method.ReturnType).CreateFuncIMessageInt32(method);
-
-        /// <summary>
-        /// Creates a delegate which will execute the given method after casting the first argument to
-        /// the type that declares the method, and the second argument to the first parameter type of the method.
-        /// </summary>
-        /// <param name="method">The method to create a delegate for, which must be declared in an IMessage
-        /// implementation.</param>
-        internal static Action<IMessage, object> CreateActionIMessageObject(MethodInfo method) =>
-            GetReflectionHelper(method.DeclaringType, method.GetParameters()[0].ParameterType).CreateActionIMessageObject(method);
-
-        /// <summary>
-        /// Creates a delegate which will execute the given method after casting the first argument to
-        /// type that declares the method.
-        /// </summary>
-        /// <param name="method">The method to create a delegate for, which must be declared in an IMessage
-        /// implementation.</param>
-        internal static Action<IMessage> CreateActionIMessage(MethodInfo method) =>
-            GetReflectionHelper(method.DeclaringType, typeof(object)).CreateActionIMessage(method);
-
-        internal static Func<IMessage, bool> CreateFuncIMessageBool(MethodInfo method) =>
-            GetReflectionHelper(method.DeclaringType, method.ReturnType).CreateFuncIMessageBool(method);
-
-        [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Type parameter members are preserved with DynamicallyAccessedMembers on GeneratedClrTypeInfo.ctor clrType parameter.")]
-        internal static Func<IMessage, bool> CreateIsInitializedCaller([DynamicallyAccessedMembers(GeneratedClrTypeInfo.MessageAccessibility)]Type msg) =>
-            ((IExtensionSetReflector)Activator.CreateInstance(typeof(ExtensionSetReflector<>).MakeGenericType(msg))).CreateIsInitializedCaller();
-
-        /// <summary>
-        /// Creates a delegate which will execute the given method after casting the first argument to
-        /// the type that declares the method, and the second argument to the first parameter type of the method.
-        /// </summary>
-        [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Type parameter members are preserved with DynamicallyAccessedMembers on GeneratedClrTypeInfo.ctor clrType parameter.")]
-        internal static IExtensionReflectionHelper CreateExtensionHelper(Extension extension) =>
-            (IExtensionReflectionHelper)Activator.CreateInstance(typeof(ExtensionReflectionHelper<,>).MakeGenericType(extension.TargetType, extension.GetType().GenericTypeArguments[1]), extension);
-
-        /// <summary>
-        /// Creates a reflection helper for the given type arguments. Currently these are created on demand
-        /// rather than cached; this will be "busy" when initially loading a message's descriptor, but after that
-        /// they can be garbage collected. We could cache them by type if that proves to be important, but creating
-        /// an object is pretty cheap.
-        /// </summary>
-        [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "Type parameter members are preserved with DynamicallyAccessedMembers on GeneratedClrTypeInfo.ctor clrType parameter.")]
-        private static IReflectionHelper GetReflectionHelper(Type t1, Type t2) =>
-            (IReflectionHelper) Activator.CreateInstance(typeof(ReflectionHelper<,>).MakeGenericType(t1, t2));
-
-        // Non-generic interface allowing us to use an instance of ReflectionHelper<T1, T2> without statically
-        // knowing the types involved.
-        private interface IReflectionHelper
-        {
-            Func<IMessage, int> CreateFuncIMessageInt32(MethodInfo method);
-            Action<IMessage> CreateActionIMessage(MethodInfo method);
-            Func<IMessage, object> CreateFuncIMessageObject(MethodInfo method);
-            Action<IMessage, object> CreateActionIMessageObject(MethodInfo method);
-            Func<IMessage, bool> CreateFuncIMessageBool(MethodInfo method);
-        }
-
-        internal interface IExtensionReflectionHelper
-        {
-            object GetExtension(IMessage message);
-            void SetExtension(IMessage message, object value);
-            bool HasExtension(IMessage message);
-            void ClearExtension(IMessage message);
-        }
-
-        private interface IExtensionSetReflector
-        {
-            Func<IMessage, bool> CreateIsInitializedCaller();
-        }
-
-        private class ReflectionHelper<T1, T2> : IReflectionHelper
-        {
-
-            public Func<IMessage, int> CreateFuncIMessageInt32(MethodInfo method)
-            {
-                // On pleasant runtimes, we can create a Func<int> from a method returning
-                // an enum based on an int. That's the fast path.
-                if (CanConvertEnumFuncToInt32Func)
-                {
-                    var del = (Func<T1, int>) method.CreateDelegate(typeof(Func<T1, int>));
-                    return message => del((T1) message);
-                }
-                else
-                {
-                    // On some runtimes (e.g. old Mono) the return type has to be exactly correct,
-                    // so we go via boxing. Reflection is already fairly inefficient, and this is
-                    // only used for one-of case checking, fortunately.
-                    var del = (Func<T1, T2>) method.CreateDelegate(typeof(Func<T1, T2>));
-                    return message => (int) (object) del((T1) message);
-                }
-            }
-
-            public Action<IMessage> CreateActionIMessage(MethodInfo method)
-            {
-                var del = (Action<T1>) method.CreateDelegate(typeof(Action<T1>));
-                return message => del((T1) message);
-            }
-
-            public Func<IMessage, object> CreateFuncIMessageObject(MethodInfo method)
-            {
-                var del = (Func<T1, T2>) method.CreateDelegate(typeof(Func<T1, T2>));
-                return message => del((T1) message);
-            }
-
-            public Action<IMessage, object> CreateActionIMessageObject(MethodInfo method)
-            {
-                var del = (Action<T1, T2>) method.CreateDelegate(typeof(Action<T1, T2>));
-                return (message, arg) => del((T1) message, (T2) arg);
-            }
-
-            public Func<IMessage, bool> CreateFuncIMessageBool(MethodInfo method)
-            {
-                var del = (Func<T1, bool>)method.CreateDelegate(typeof(Func<T1, bool>));
-                return message => del((T1)message);
-            }
-        }
-
-        private class ExtensionReflectionHelper<T1, T3> : IExtensionReflectionHelper
-            where T1 : IExtendableMessage<T1>
-        {
-            private readonly Extension extension;
-
-            public ExtensionReflectionHelper(Extension extension)
-            {
-                this.extension = extension;
-            }
-
-            public object GetExtension(IMessage message)
-            {
-                if (!(message is T1))
-                {
-                    throw new InvalidCastException("Cannot access extension on message that isn't IExtensionMessage");
-                }
-
-                T1 extensionMessage = (T1)message;
-
-                if (extension is Extension<T1, T3>)
-                {
-                    return extensionMessage.GetExtension(extension as Extension<T1, T3>);
-                }
-                else if (extension is RepeatedExtension<T1, T3>)
-                {
-                    return extensionMessage.GetOrInitializeExtension(extension as RepeatedExtension<T1, T3>);
-                }
-                else
-                {
-                    throw new InvalidCastException("The provided extension is not a valid extension identifier type");
-                }
-            }
-
-            public bool HasExtension(IMessage message)
-            {
-                if (!(message is T1))
-                {
-                    throw new InvalidCastException("Cannot access extension on message that isn't IExtensionMessage");
-                }
-
-                T1 extensionMessage = (T1)message;
-
-                if (extension is Extension<T1, T3>)
-                {
-                    return extensionMessage.HasExtension(extension as Extension<T1, T3>);
-                }
-                else if (extension is RepeatedExtension<T1, T3>)
-                {
-                    throw new InvalidOperationException("HasValue is not implemented for repeated extensions");
-                }
-                else
-                {
-                    throw new InvalidCastException("The provided extension is not a valid extension identifier type");
-                }
-            }
-
-            public void SetExtension(IMessage message, object value)
-            {
-                if (!(message is T1))
-                {
-                    throw new InvalidCastException("Cannot access extension on message that isn't IExtensionMessage");
-                }
-
-                T1 extensionMessage = (T1)message;
-
-                if (extension is Extension<T1, T3>)
-                {
-                    extensionMessage.SetExtension(extension as Extension<T1, T3>, (T3)value);
-                }
-                else if (extension is RepeatedExtension<T1, T3>)
-                {
-                    throw new InvalidOperationException("SetValue is not implemented for repeated extensions");
-                }
-                else
-                {
-                    throw new InvalidCastException("The provided extension is not a valid extension identifier type");
-                }
-            }
-
-            public void ClearExtension(IMessage message)
-            {
-                if (!(message is T1))
-                {
-                    throw new InvalidCastException("Cannot access extension on message that isn't IExtensionMessage");
-                }
-
-                T1 extensionMessage = (T1)message;
-
-                if (extension is Extension<T1, T3>)
-                {
-                    extensionMessage.ClearExtension(extension as Extension<T1, T3>);
-                }
-                else if (extension is RepeatedExtension<T1, T3>)
-                {
-                    extensionMessage.GetExtension(extension as RepeatedExtension<T1, T3>).Clear();
-                }
-                else
-                {
-                    throw new InvalidCastException("The provided extension is not a valid extension identifier type");
-                }
-            }
-        }
-
-        private class ExtensionSetReflector<
-            [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicProperties | DynamicallyAccessedMemberTypes.NonPublicProperties)]
-            T1> : IExtensionSetReflector where T1 : IExtendableMessage<T1>
-        {
-            public Func<IMessage, bool> CreateIsInitializedCaller()
-            {
-                var prop = typeof(T1).GetTypeInfo().GetDeclaredProperty("_Extensions");
-                var getFunc = (Func<T1, ExtensionSet<T1>>)prop.GetMethod.CreateDelegate(typeof(Func<T1, ExtensionSet<T1>>));
-                var initializedFunc = (Func<ExtensionSet<T1>, bool>)
-                    typeof(ExtensionSet<T1>)
-                        .GetTypeInfo()
-                        .GetDeclaredMethod("IsInitialized")
-                        .CreateDelegate(typeof(Func<ExtensionSet<T1>, bool>));
-                return (m) => {
-                    var set = getFunc((T1)m);
-                    return set == null || initializedFunc(set);
-                };
-            }
-        }
-
-        // Runtime compatibility checking code - see ReflectionHelper<T1, T2>.CreateFuncIMessageInt32 for
-        // details about why we're doing this.
-
-        // Deliberately not inside the generic type. We only want to check this once.
-        private static bool CanConvertEnumFuncToInt32Func { get; } = CheckCanConvertEnumFuncToInt32Func();
-
-        private static bool CheckCanConvertEnumFuncToInt32Func()
-        {
-            try
-            {
-                // Try to do the conversion using reflection, so we can see whether it's supported.
-                MethodInfo method = typeof(ReflectionUtil).GetMethod(nameof(SampleEnumMethod));
-                // If this passes, we're in a reasonable runtime.
-                method.CreateDelegate(typeof(Func<int>));
-                return true;
-            }
-            catch (ArgumentException)
-            {
-                return false;
-            }
-        }
-
-        public enum SampleEnum
-        {
-            X
-        }
-
-        // Public to make the reflection simpler.
-        public static SampleEnum SampleEnumMethod() => SampleEnum.X;
-    }
-}
diff --git a/libs/protobuf/csharp/src/Google.Protobuf/Reflection/RepeatedFieldAccessor.cs b/libs/protobuf/csharp/src/Google.Protobuf/Reflection/RepeatedFieldAccessor.cs
deleted file mode 100644
index afb4a69..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf/Reflection/RepeatedFieldAccessor.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-using System.Collections;
-using System.Reflection;
-
-namespace Google.Protobuf.Reflection
-{
-    /// <summary>
-    /// Accessor for repeated fields.
-    /// </summary>
-    internal sealed class RepeatedFieldAccessor : FieldAccessorBase
-    {
-        internal RepeatedFieldAccessor(PropertyInfo property, FieldDescriptor descriptor) : base(property, descriptor)
-        {
-        }
-
-        public override void Clear(IMessage message)
-        {
-            IList list = (IList) GetValue(message);
-            list.Clear();
-        }
-
-        public override bool HasValue(IMessage message)
-        {
-            throw new InvalidOperationException("HasValue is not implemented for repeated fields");
-        }
-
-        public override void SetValue(IMessage message, object value)
-        {
-            throw new InvalidOperationException("SetValue is not implemented for repeated fields");
-        }
-
-    }
-}
diff --git a/libs/protobuf/csharp/src/Google.Protobuf/Reflection/ServiceDescriptor.cs b/libs/protobuf/csharp/src/Google.Protobuf/Reflection/ServiceDescriptor.cs
deleted file mode 100644
index 944ea11..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf/Reflection/ServiceDescriptor.cs
+++ /dev/null
@@ -1,144 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using Google.Protobuf.Collections;
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-
-namespace Google.Protobuf.Reflection
-{
-    /// <summary>
-    /// Describes a service type.
-    /// </summary>
-    public sealed class ServiceDescriptor : DescriptorBase
-    {
-        private readonly ServiceDescriptorProto proto;
-        private readonly IList<MethodDescriptor> methods;
-
-        internal ServiceDescriptor(ServiceDescriptorProto proto, FileDescriptor file, int index)
-            : base(file, file.ComputeFullName(null, proto.Name), index)
-        {
-            this.proto = proto;
-            methods = DescriptorUtil.ConvertAndMakeReadOnly(proto.Method,
-                                                            (method, i) => new MethodDescriptor(method, file, this, i));
-
-            file.DescriptorPool.AddSymbol(this);
-        }
-
-        /// <summary>
-        /// The brief name of the descriptor's target.
-        /// </summary>
-        public override string Name { get { return proto.Name; } }
-
-        internal override IReadOnlyList<DescriptorBase> GetNestedDescriptorListForField(int fieldNumber)
-        {
-            switch (fieldNumber)
-            {
-                case ServiceDescriptorProto.MethodFieldNumber:
-                    return (IReadOnlyList<DescriptorBase>) methods;
-                default:
-                    return null;
-            }
-        }
-
-        internal ServiceDescriptorProto Proto { get { return proto; } }
-
-        /// <summary>
-        /// Returns a clone of the underlying <see cref="ServiceDescriptorProto"/> describing this service.
-        /// Note that a copy is taken every time this method is called, so clients using it frequently
-        /// (and not modifying it) may want to cache the returned value.
-        /// </summary>
-        /// <returns>A protobuf representation of this service descriptor.</returns>
-        public ServiceDescriptorProto ToProto() => Proto.Clone();
-
-        /// <value>
-        /// An unmodifiable list of methods in this service.
-        /// </value>
-        public IList<MethodDescriptor> Methods
-        {
-            get { return methods; }
-        }
-
-        /// <summary>
-        /// Finds a method by name.
-        /// </summary>
-        /// <param name="name">The unqualified name of the method (e.g. "Foo").</param>
-        /// <returns>The method's descriptor, or null if not found.</returns>
-        public MethodDescriptor FindMethodByName(String name)
-        {
-            return File.DescriptorPool.FindSymbol<MethodDescriptor>(FullName + "." + name);
-        }
-
-        /// <summary>
-        /// The (possibly empty) set of custom options for this service.
-        /// </summary>
-        [Obsolete("CustomOptions are obsolete. Use the GetOptions() method.")]
-        public CustomOptions CustomOptions => new CustomOptions(Proto.Options?._extensions?.ValuesByNumber);
-
-        /// <summary>
-        /// The <c>ServiceOptions</c>, defined in <c>descriptor.proto</c>.
-        /// If the options message is not present (i.e. there are no options), <c>null</c> is returned.
-        /// Custom options can be retrieved as extensions of the returned message.
-        /// NOTE: A defensive copy is created each time this property is retrieved.
-        /// </summary>
-        public ServiceOptions GetOptions() => Proto.Options?.Clone();
-
-        /// <summary>
-        /// Gets a single value service option for this descriptor
-        /// </summary>
-        [Obsolete("GetOption is obsolete. Use the GetOptions() method.")]
-        public T GetOption<T>(Extension<ServiceOptions, T> extension)
-        {
-            var value = Proto.Options.GetExtension(extension);
-            return value is IDeepCloneable<T> ? (value as IDeepCloneable<T>).Clone() : value;
-        }
-
-        /// <summary>
-        /// Gets a repeated value service option for this descriptor
-        /// </summary>
-        [Obsolete("GetOption is obsolete. Use the GetOptions() method.")]
-        public RepeatedField<T> GetOption<T>(RepeatedExtension<ServiceOptions, T> extension)
-        {
-            return Proto.Options.GetExtension(extension).Clone();
-        }
-
-        internal void CrossLink()
-        {
-            foreach (MethodDescriptor method in methods)
-            {
-                method.CrossLink();
-            }
-        }
-    }
-}
- 
\ No newline at end of file
diff --git a/libs/protobuf/csharp/src/Google.Protobuf/Reflection/SingleFieldAccessor.cs b/libs/protobuf/csharp/src/Google.Protobuf/Reflection/SingleFieldAccessor.cs
deleted file mode 100644
index ac35e72..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf/Reflection/SingleFieldAccessor.cs
+++ /dev/null
@@ -1,160 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-using Google.Protobuf.Compatibility;
-
-namespace Google.Protobuf.Reflection
-{
-    /// <summary>
-    /// Accessor for single fields.
-    /// </summary>
-    internal sealed class SingleFieldAccessor : FieldAccessorBase
-    {
-        // All the work here is actually done in the constructor - it creates the appropriate delegates.
-        // There are various cases to consider, based on the property type (message, string/bytes, or "genuine" primitive)
-        // and proto2 vs proto3 for non-message types, as proto3 doesn't support "full" presence detection or default
-        // values.
-
-        private readonly Action<IMessage, object> setValueDelegate;
-        private readonly Action<IMessage> clearDelegate;
-        private readonly Func<IMessage, bool> hasDelegate;
-
-        internal SingleFieldAccessor(
-            [DynamicallyAccessedMembers(GeneratedClrTypeInfo.MessageAccessibility)]
-            Type messageType, PropertyInfo property, FieldDescriptor descriptor) : base(property, descriptor)
-        {
-            if (!property.CanWrite)
-            {
-                throw new ArgumentException("Not all required properties/methods available");
-            }
-            setValueDelegate = ReflectionUtil.CreateActionIMessageObject(property.GetSetMethod());
-
-            // Note: this looks worrying in that we access the containing oneof, which isn't valid until cross-linking
-            // is complete... but field accessors aren't created until after cross-linking.
-            // The oneof itself won't be cross-linked yet, but that's okay: the oneof accessor is created
-            // earlier.
-
-            // Message fields always support presence, via null checks.
-            if (descriptor.FieldType == FieldType.Message)
-            {
-                hasDelegate = message => GetValue(message) != null;
-                clearDelegate = message => SetValue(message, null);
-            }
-            // Oneof fields always support presence, via case checks.
-            // Note that clearing the field is a no-op unless that specific field is the current "case".
-            else if (descriptor.RealContainingOneof != null)
-            {
-                var oneofAccessor = descriptor.RealContainingOneof.Accessor;
-                hasDelegate = message => oneofAccessor.GetCaseFieldDescriptor(message) == descriptor;
-                clearDelegate = message =>
-                {
-                    // Clear on a field only affects the oneof itself if the current case is the field we're accessing.
-                    if (oneofAccessor.GetCaseFieldDescriptor(message) == descriptor)
-                    {
-                        oneofAccessor.Clear(message);
-                    }
-                };
-            }
-            // Primitive fields always support presence in proto2, and support presence in proto3 for optional fields.
-            else if (descriptor.File.Syntax == Syntax.Proto2 || descriptor.Proto.Proto3Optional)
-            {
-                MethodInfo hasMethod = messageType.GetRuntimeProperty("Has" + property.Name).GetMethod;
-                if (hasMethod == null)
-                {
-                    throw new ArgumentException("Not all required properties/methods are available");
-                }
-                hasDelegate = ReflectionUtil.CreateFuncIMessageBool(hasMethod);
-                MethodInfo clearMethod = messageType.GetRuntimeMethod("Clear" + property.Name, ReflectionUtil.EmptyTypes);
-                if (clearMethod == null)
-                {
-                    throw new ArgumentException("Not all required properties/methods are available");
-                }
-                clearDelegate = ReflectionUtil.CreateActionIMessage(clearMethod);
-            }
-            // What's left?
-            // Primitive proto3 fields without the optional keyword, which aren't in oneofs.
-            else
-            {
-                hasDelegate = message => { throw new InvalidOperationException("Presence is not implemented for this field"); };
-
-                // While presence isn't supported, clearing still is; it's just setting to a default value.
-                object defaultValue = GetDefaultValue(descriptor);
-                clearDelegate = message => SetValue(message, defaultValue);
-            }
-        }
-
-        private static object GetDefaultValue(FieldDescriptor descriptor)
-        {
-            switch (descriptor.FieldType)
-            {
-                case FieldType.Bool:
-                    return false;
-                case FieldType.Bytes:
-                    return ByteString.Empty;
-                case FieldType.String:
-                    return "";
-                case FieldType.Double:
-                    return 0.0;
-                case FieldType.SInt32:
-                case FieldType.Int32:
-                case FieldType.SFixed32:
-                case FieldType.Enum:
-                    return 0;
-                case FieldType.Fixed32:
-                case FieldType.UInt32:
-                    return (uint)0;
-                case FieldType.Fixed64:
-                case FieldType.UInt64:
-                    return 0UL;
-                case FieldType.SFixed64:
-                case FieldType.Int64:
-                case FieldType.SInt64:
-                    return 0L;
-                case FieldType.Float:
-                    return 0f;
-                case FieldType.Message:
-                case FieldType.Group: // Never expect to get this, but...
-                    return null;
-                default:
-                    throw new ArgumentException("Invalid field type");
-            }
-        }
-
-        public override void Clear(IMessage message) => clearDelegate(message);
-        public override bool HasValue(IMessage message) => hasDelegate(message);
-        public override void SetValue(IMessage message, object value) => setValueDelegate(message, value);
-    }
-}
diff --git a/libs/protobuf/csharp/src/Google.Protobuf/Reflection/TypeRegistry.cs b/libs/protobuf/csharp/src/Google.Protobuf/Reflection/TypeRegistry.cs
deleted file mode 100644
index e94e3e6..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf/Reflection/TypeRegistry.cs
+++ /dev/null
@@ -1,183 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-using System.Collections.Generic;
-using System.Linq;
-
-namespace Google.Protobuf.Reflection
-{
-    /// <summary>
-    /// An immutable registry of types which can be looked up by their full name.
-    /// </summary>
-    public sealed class TypeRegistry
-    {
-        /// <summary>
-        /// An empty type registry, containing no types.
-        /// </summary>
-        public static TypeRegistry Empty { get; } = new TypeRegistry(new Dictionary<string, MessageDescriptor>());
-
-        private readonly Dictionary<string, MessageDescriptor> fullNameToMessageMap;
-
-        private TypeRegistry(Dictionary<string, MessageDescriptor> fullNameToMessageMap)
-        {
-            this.fullNameToMessageMap = fullNameToMessageMap;
-        }
-
-        /// <summary>
-        /// Attempts to find a message descriptor by its full name.
-        /// </summary>
-        /// <param name="fullName">The full name of the message, which is the dot-separated
-        /// combination of package, containing messages and message name</param>
-        /// <returns>The message descriptor corresponding to <paramref name="fullName"/> or null
-        /// if there is no such message descriptor.</returns>
-        public MessageDescriptor Find(string fullName)
-        {
-            MessageDescriptor ret;
-            // Ignore the return value as ret will end up with the right value either way.
-            fullNameToMessageMap.TryGetValue(fullName, out ret);
-            return ret;
-        }
-
-        /// <summary>
-        /// Creates a type registry from the specified set of file descriptors.
-        /// </summary>
-        /// <remarks>
-        /// This is a convenience overload for <see cref="FromFiles(IEnumerable{FileDescriptor})"/>
-        /// to allow calls such as <c>TypeRegistry.FromFiles(descriptor1, descriptor2)</c>.
-        /// </remarks>
-        /// <param name="fileDescriptors">The set of files to include in the registry. Must not contain null values.</param>
-        /// <returns>A type registry for the given files.</returns>
-        public static TypeRegistry FromFiles(params FileDescriptor[] fileDescriptors)
-        {
-            return FromFiles((IEnumerable<FileDescriptor>) fileDescriptors);
-        }
-
-        /// <summary>
-        /// Creates a type registry from the specified set of file descriptors.
-        /// </summary>
-        /// <remarks>
-        /// All message types within all the specified files are added to the registry, and
-        /// the dependencies of the specified files are also added, recursively.
-        /// </remarks>
-        /// <param name="fileDescriptors">The set of files to include in the registry. Must not contain null values.</param>
-        /// <returns>A type registry for the given files.</returns>
-        public static TypeRegistry FromFiles(IEnumerable<FileDescriptor> fileDescriptors)
-        {
-            ProtoPreconditions.CheckNotNull(fileDescriptors, nameof(fileDescriptors));
-            var builder = new Builder();
-            foreach (var file in fileDescriptors)
-            {
-                builder.AddFile(file);
-            }
-            return builder.Build();
-        }
-
-        /// <summary>
-        /// Creates a type registry from the file descriptor parents of the specified set of message descriptors.
-        /// </summary>
-        /// <remarks>
-        /// This is a convenience overload for <see cref="FromMessages(IEnumerable{MessageDescriptor})"/>
-        /// to allow calls such as <c>TypeRegistry.FromFiles(descriptor1, descriptor2)</c>.
-        /// </remarks>
-        /// <param name="messageDescriptors">The set of message descriptors to use to identify file descriptors to include in the registry.
-        /// Must not contain null values.</param>
-        /// <returns>A type registry for the given files.</returns>
-        public static TypeRegistry FromMessages(params MessageDescriptor[] messageDescriptors)
-        {
-            return FromMessages((IEnumerable<MessageDescriptor>) messageDescriptors);
-        }
-
-        /// <summary>
-        /// Creates a type registry from the file descriptor parents of the specified set of message descriptors.
-        /// </summary>
-        /// <remarks>
-        /// The specified message descriptors are only used to identify their file descriptors; the returned registry
-        /// contains all the types within the file descriptors which contain the specified message descriptors (and
-        /// the dependencies of those files), not just the specified messages.
-        /// </remarks>
-        /// <param name="messageDescriptors">The set of message descriptors to use to identify file descriptors to include in the registry.
-        /// Must not contain null values.</param>
-        /// <returns>A type registry for the given files.</returns>
-        public static TypeRegistry FromMessages(IEnumerable<MessageDescriptor> messageDescriptors)
-        {
-            ProtoPreconditions.CheckNotNull(messageDescriptors, nameof(messageDescriptors));
-            return FromFiles(messageDescriptors.Select(md => md.File));
-        }
-
-        /// <summary>
-        /// Builder class which isn't exposed, but acts as a convenient alternative to passing round two dictionaries in recursive calls.
-        /// </summary>
-        private class Builder
-        {
-            private readonly Dictionary<string, MessageDescriptor> types;
-            private readonly HashSet<string> fileDescriptorNames;
-
-            internal Builder()
-            {
-                types = new Dictionary<string, MessageDescriptor>();
-                fileDescriptorNames = new HashSet<string>();
-            }
-
-            internal void AddFile(FileDescriptor fileDescriptor)
-            {
-                if (!fileDescriptorNames.Add(fileDescriptor.Name))
-                {
-                    return;
-                }
-                foreach (var dependency in fileDescriptor.Dependencies)
-                {
-                    AddFile(dependency);
-                }
-                foreach (var message in fileDescriptor.MessageTypes)
-                {
-                    AddMessage(message);
-                }
-            }
-
-            private void AddMessage(MessageDescriptor messageDescriptor)
-            {
-                foreach (var nestedType in messageDescriptor.NestedTypes)
-                {
-                    AddMessage(nestedType);
-                }
-                // This will overwrite any previous entry. Given that each file should
-                // only be added once, this could be a problem such as package A.B with type C,
-                // and package A with type B.C... it's unclear what we should do in that case.
-                types[messageDescriptor.FullName] = messageDescriptor;
-            }
-
-            internal TypeRegistry Build()
-            {
-                return new TypeRegistry(types);
-            }
-        }
-    }
-}
diff --git a/libs/protobuf/csharp/src/Google.Protobuf/SegmentedBufferHelper.cs b/libs/protobuf/csharp/src/Google.Protobuf/SegmentedBufferHelper.cs
deleted file mode 100644
index b5441d3..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf/SegmentedBufferHelper.cs
+++ /dev/null
@@ -1,296 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-using System.Buffers;
-using System.IO;
-using System.Runtime.CompilerServices;
-using System.Security;
-
-namespace Google.Protobuf
-{
-    /// <summary>
-    /// Abstraction for reading from a stream / read only sequence.
-    /// Parsing from the buffer is a loop of reading from current buffer / refreshing the buffer once done.
-    /// </summary>
-    [SecuritySafeCritical]
-    internal struct SegmentedBufferHelper
-    {
-        private int? totalLength;
-        private ReadOnlySequence<byte>.Enumerator readOnlySequenceEnumerator;
-        private CodedInputStream codedInputStream;
-
-        /// <summary>
-        /// Initialize an instance with a coded input stream.
-        /// This approach is faster than using a constructor because the instance to initialize is passed by reference
-        /// and we can write directly into it without copying.
-        /// </summary>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void Initialize(CodedInputStream codedInputStream, out SegmentedBufferHelper instance)
-        {
-            instance.totalLength = codedInputStream.InternalInputStream == null ? (int?)codedInputStream.InternalBuffer.Length : null;
-            instance.readOnlySequenceEnumerator = default;
-            instance.codedInputStream = codedInputStream;
-        }
-
-        /// <summary>
-        /// Initialize an instance with a read only sequence.
-        /// This approach is faster than using a constructor because the instance to initialize is passed by reference
-        /// and we can write directly into it without copying.
-        /// </summary>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void Initialize(ReadOnlySequence<byte> sequence, out SegmentedBufferHelper instance, out ReadOnlySpan<byte> firstSpan)
-        {
-            instance.codedInputStream = null;
-            if (sequence.IsSingleSegment)
-            {
-                firstSpan = sequence.First.Span;
-                instance.totalLength = firstSpan.Length;
-                instance.readOnlySequenceEnumerator = default;
-            }
-            else
-            {
-                instance.readOnlySequenceEnumerator = sequence.GetEnumerator();
-                instance.totalLength = (int) sequence.Length;
-
-                // set firstSpan to the first segment
-                instance.readOnlySequenceEnumerator.MoveNext();
-                firstSpan = instance.readOnlySequenceEnumerator.Current.Span;
-            }
-        }
-        
-        public bool RefillBuffer(ref ReadOnlySpan<byte> buffer, ref ParserInternalState state, bool mustSucceed)
-        {
-            if (codedInputStream != null)
-            {
-                return RefillFromCodedInputStream(ref buffer, ref state, mustSucceed);
-            }
-            else
-            {
-                return RefillFromReadOnlySequence(ref buffer, ref state, mustSucceed);
-            }
-        }
-
-        public int? TotalLength => totalLength;
-
-        public CodedInputStream CodedInputStream => codedInputStream;
-
-        /// <summary>
-        /// Sets currentLimit to (current position) + byteLimit. This is called
-        /// when descending into a length-delimited embedded message. The previous
-        /// limit is returned.
-        /// </summary>
-        /// <returns>The old limit.</returns>
-        public static int PushLimit(ref ParserInternalState state, int byteLimit)
-        {
-            if (byteLimit < 0)
-            {
-                throw InvalidProtocolBufferException.NegativeSize();
-            }
-            byteLimit += state.totalBytesRetired + state.bufferPos;
-            int oldLimit = state.currentLimit;
-            if (byteLimit > oldLimit)
-            {
-                throw InvalidProtocolBufferException.TruncatedMessage();
-            }
-            state.currentLimit = byteLimit;
-
-            RecomputeBufferSizeAfterLimit(ref state);
-
-            return oldLimit;
-        }
-
-        /// <summary>
-        /// Discards the current limit, returning the previous limit.
-        /// </summary>
-        public static void PopLimit(ref ParserInternalState state, int oldLimit)
-        {
-            state.currentLimit = oldLimit;
-            RecomputeBufferSizeAfterLimit(ref state);
-        }
-
-        /// <summary>
-        /// Returns whether or not all the data before the limit has been read.
-        /// </summary>
-        /// <returns></returns>
-        public static bool IsReachedLimit(ref ParserInternalState state)
-        {
-            if (state.currentLimit == int.MaxValue)
-            {
-                return false;
-            }
-            int currentAbsolutePosition = state.totalBytesRetired + state.bufferPos;
-            return currentAbsolutePosition >= state.currentLimit;
-        }
-
-        /// <summary>
-        /// Returns true if the stream has reached the end of the input. This is the
-        /// case if either the end of the underlying input source has been reached or
-        /// the stream has reached a limit created using PushLimit.
-        /// </summary>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static bool IsAtEnd(ref ReadOnlySpan<byte> buffer, ref ParserInternalState state)
-        {
-            return state.bufferPos == state.bufferSize && !state.segmentedBufferHelper.RefillBuffer(ref buffer, ref state, false);
-        }
-
-        private bool RefillFromReadOnlySequence(ref ReadOnlySpan<byte> buffer, ref ParserInternalState state, bool mustSucceed)
-        {
-            CheckCurrentBufferIsEmpty(ref state);
-
-            if (state.totalBytesRetired + state.bufferSize == state.currentLimit)
-            {
-                // Oops, we hit a limit.
-                if (mustSucceed)
-                {
-                    throw InvalidProtocolBufferException.TruncatedMessage();
-                }
-                else
-                {
-                    return false;
-                }
-            }
-
-            state.totalBytesRetired += state.bufferSize;
-
-            state.bufferPos = 0;
-            state.bufferSize = 0;
-            while (readOnlySequenceEnumerator.MoveNext())
-            {
-                buffer = readOnlySequenceEnumerator.Current.Span;
-                state.bufferSize = buffer.Length;
-                if (buffer.Length != 0)
-                {
-                    break;
-                }
-            }
-
-            if (state.bufferSize == 0)
-            {
-                if (mustSucceed)
-                {
-                    throw InvalidProtocolBufferException.TruncatedMessage();
-                }
-                else
-                {
-                    return false;
-                }
-            }
-            else
-            {
-                RecomputeBufferSizeAfterLimit(ref state);
-                int totalBytesRead =
-                    state.totalBytesRetired + state.bufferSize + state.bufferSizeAfterLimit;
-                if (totalBytesRead < 0 || totalBytesRead > state.sizeLimit)
-                {
-                    throw InvalidProtocolBufferException.SizeLimitExceeded();
-                }
-                return true;
-            }
-        }
-
-        private bool RefillFromCodedInputStream(ref ReadOnlySpan<byte> buffer, ref ParserInternalState state, bool mustSucceed)
-        {
-            CheckCurrentBufferIsEmpty(ref state);
-
-            if (state.totalBytesRetired + state.bufferSize == state.currentLimit)
-            {
-                // Oops, we hit a limit.
-                if (mustSucceed)
-                {
-                    throw InvalidProtocolBufferException.TruncatedMessage();
-                }
-                else
-                {
-                    return false;
-                }
-            }
-
-            Stream input = codedInputStream.InternalInputStream;
-
-            state.totalBytesRetired += state.bufferSize;
-
-            state.bufferPos = 0;
-            state.bufferSize = (input == null) ? 0 : input.Read(codedInputStream.InternalBuffer, 0, buffer.Length);
-            if (state.bufferSize < 0)
-            {
-                throw new InvalidOperationException("Stream.Read returned a negative count");
-            }
-            if (state.bufferSize == 0)
-            {
-                if (mustSucceed)
-                {
-                    throw InvalidProtocolBufferException.TruncatedMessage();
-                }
-                else
-                {
-                    return false;
-                }
-            }
-            else
-            {
-                RecomputeBufferSizeAfterLimit(ref state);
-                int totalBytesRead =
-                    state.totalBytesRetired + state.bufferSize + state.bufferSizeAfterLimit;
-                if (totalBytesRead < 0 || totalBytesRead > state.sizeLimit)
-                {
-                    throw InvalidProtocolBufferException.SizeLimitExceeded();
-                }
-                return true;
-            }
-        }
-
-        private static void RecomputeBufferSizeAfterLimit(ref ParserInternalState state)
-        {
-            state.bufferSize += state.bufferSizeAfterLimit;
-            int bufferEnd = state.totalBytesRetired + state.bufferSize;
-            if (bufferEnd > state.currentLimit)
-            {
-                // Limit is in current buffer.
-                state.bufferSizeAfterLimit = bufferEnd - state.currentLimit;
-                state.bufferSize -= state.bufferSizeAfterLimit;
-            }
-            else
-            {
-                state.bufferSizeAfterLimit = 0;
-            }
-        }
-
-        private static void CheckCurrentBufferIsEmpty(ref ParserInternalState state)
-        {
-            if (state.bufferPos < state.bufferSize)
-            {
-                throw new InvalidOperationException("RefillBuffer() called when buffer wasn't empty.");
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/libs/protobuf/csharp/src/Google.Protobuf/UnknownField.cs b/libs/protobuf/csharp/src/Google.Protobuf/UnknownField.cs
deleted file mode 100644
index 4793a64..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf/UnknownField.cs
+++ /dev/null
@@ -1,290 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2017 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using Google.Protobuf.Collections;
-
-namespace Google.Protobuf
-{
-    /// <summary>
-    /// Represents a single field in an UnknownFieldSet.
-    ///
-    /// An UnknownField consists of four lists of values. The lists correspond
-    /// to the four "wire types" used in the protocol buffer binary format.
-    /// Normally, only one of the four lists will contain any values, since it
-    /// is impossible to define a valid message type that declares two different
-    /// types for the same field number. However, the code is designed to allow
-    /// for the case where the same unknown field number is encountered using
-    /// multiple different wire types.
-    ///
-    /// </summary>
-    internal sealed class UnknownField
-    {
-        private List<ulong> varintList;
-        private List<uint> fixed32List;
-        private List<ulong> fixed64List;
-        private List<ByteString> lengthDelimitedList;
-        private List<UnknownFieldSet> groupList;
-
-        /// <summary>
-        /// Creates a new UnknownField.
-        /// </summary>
-        public UnknownField()
-        {
-        }
-
-        /// <summary>
-        /// Checks if two unknown field are equal.
-        /// </summary>
-        public override bool Equals(object other)
-        {
-            if (ReferenceEquals(this, other))
-            {
-                return true;
-            }
-            UnknownField otherField = other as UnknownField;
-            return otherField != null
-                   && Lists.Equals(varintList, otherField.varintList)
-                   && Lists.Equals(fixed32List, otherField.fixed32List)
-                   && Lists.Equals(fixed64List, otherField.fixed64List)
-                   && Lists.Equals(lengthDelimitedList, otherField.lengthDelimitedList)
-                   && Lists.Equals(groupList, otherField.groupList);
-        }
-
-        /// <summary>
-        /// Get the hash code of the unknown field.
-        /// </summary>
-        public override int GetHashCode()
-        {
-            int hash = 43;
-            hash = hash * 47 + Lists.GetHashCode(varintList);
-            hash = hash * 47 + Lists.GetHashCode(fixed32List);
-            hash = hash * 47 + Lists.GetHashCode(fixed64List);
-            hash = hash * 47 + Lists.GetHashCode(lengthDelimitedList);
-            hash = hash * 47 + Lists.GetHashCode(groupList);
-            return hash;
-        }
-
-        /// <summary>
-        /// Serializes the field, including the field number, and writes it to
-        /// <paramref name="output"/>
-        /// </summary>
-        /// <param name="fieldNumber">The unknown field number.</param>
-        /// <param name="output">The write context to write to.</param>
-        internal void WriteTo(int fieldNumber, ref WriteContext output)
-        {
-            if (varintList != null)
-            {
-                foreach (ulong value in varintList)
-                {
-                    output.WriteTag(fieldNumber, WireFormat.WireType.Varint);
-                    output.WriteUInt64(value);
-                }
-            }
-            if (fixed32List != null)
-            {
-                foreach (uint value in fixed32List)
-                {
-                    output.WriteTag(fieldNumber, WireFormat.WireType.Fixed32);
-                    output.WriteFixed32(value);
-                }
-            }
-            if (fixed64List != null)
-            {
-                foreach (ulong value in fixed64List)
-                {
-                    output.WriteTag(fieldNumber, WireFormat.WireType.Fixed64);
-                    output.WriteFixed64(value);
-                }
-            }
-            if (lengthDelimitedList != null)
-            {
-                foreach (ByteString value in lengthDelimitedList)
-                {
-                    output.WriteTag(fieldNumber, WireFormat.WireType.LengthDelimited);
-                    output.WriteBytes(value);
-                }
-            }
-            if (groupList != null)
-            {
-                foreach (UnknownFieldSet value in groupList)
-                {
-                    output.WriteTag(fieldNumber, WireFormat.WireType.StartGroup);
-                    value.WriteTo(ref output);
-                    output.WriteTag(fieldNumber, WireFormat.WireType.EndGroup);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Computes the number of bytes required to encode this field, including field
-        /// number.
-        /// </summary>
-        internal int GetSerializedSize(int fieldNumber)
-        {
-            int result = 0;
-            if (varintList != null)
-            {
-                result += CodedOutputStream.ComputeTagSize(fieldNumber) * varintList.Count;
-                foreach (ulong value in varintList)
-                {
-                    result += CodedOutputStream.ComputeUInt64Size(value);
-                }
-            }
-            if (fixed32List != null)
-            {
-                result += CodedOutputStream.ComputeTagSize(fieldNumber) * fixed32List.Count;
-                result += CodedOutputStream.ComputeFixed32Size(1) * fixed32List.Count;
-            }
-            if (fixed64List != null)
-            {
-                result += CodedOutputStream.ComputeTagSize(fieldNumber) * fixed64List.Count;
-                result += CodedOutputStream.ComputeFixed64Size(1) * fixed64List.Count;
-            }
-            if (lengthDelimitedList != null)
-            {
-                result += CodedOutputStream.ComputeTagSize(fieldNumber) * lengthDelimitedList.Count;
-                foreach (ByteString value in lengthDelimitedList)
-                {
-                    result += CodedOutputStream.ComputeBytesSize(value);
-                }
-            }
-            if (groupList != null)
-            {
-                result += CodedOutputStream.ComputeTagSize(fieldNumber) * 2 * groupList.Count;
-                foreach (UnknownFieldSet value in groupList)
-                {
-                    result += value.CalculateSize();
-                }
-            }
-            return result;
-        }
-
-        /// <summary>
-        /// Merge the values in <paramref name="other" /> into this field.  For each list
-        /// of values, <paramref name="other"/>'s values are append to the ones in this
-        /// field.
-        /// </summary>
-        internal UnknownField MergeFrom(UnknownField other)
-        {
-            varintList = AddAll(varintList, other.varintList);
-            fixed32List = AddAll(fixed32List, other.fixed32List);
-            fixed64List = AddAll(fixed64List, other.fixed64List);
-            lengthDelimitedList = AddAll(lengthDelimitedList, other.lengthDelimitedList);
-            groupList = AddAll(groupList, other.groupList);
-            return this;
-        }
-
-        /// <summary>
-        /// Returns a new list containing all of the given specified values from
-        /// both the <paramref name="current"/> and <paramref name="extras"/> lists.
-        /// If <paramref name="current" /> is null and <paramref name="extras"/> is null or empty,
-        /// null is returned. Otherwise, either a new list is created (if <paramref name="current" />
-        /// is null) or the elements of <paramref name="extras"/> are added to <paramref name="current" />.
-        /// </summary>
-        private static List<T> AddAll<T>(List<T> current, IList<T> extras)
-        {
-            if (extras == null || extras.Count == 0)
-            {
-                return current;
-            }
-            if (current == null)
-            {
-                current = new List<T>(extras);
-            }
-            else
-            {
-                current.AddRange(extras);
-            }
-            return current;
-        }
-
-        /// <summary>
-        /// Adds a varint value.
-        /// </summary>
-        internal UnknownField AddVarint(ulong value)
-        {
-            varintList = Add(varintList, value);
-            return this;
-        }
-
-        /// <summary>
-        /// Adds a fixed32 value.
-        /// </summary>
-        internal UnknownField AddFixed32(uint value)
-        {
-            fixed32List = Add(fixed32List, value);
-            return this;
-        }
-
-        /// <summary>
-        /// Adds a fixed64 value.
-        /// </summary>
-        internal UnknownField AddFixed64(ulong value)
-        {
-            fixed64List = Add(fixed64List, value);
-            return this;
-        }
-
-        /// <summary>
-        /// Adds a length-delimited value.
-        /// </summary>
-        internal UnknownField AddLengthDelimited(ByteString value)
-        {
-            lengthDelimitedList = Add(lengthDelimitedList, value);
-            return this;
-        }
-
-        internal UnknownField AddGroup(UnknownFieldSet value)
-        {
-            groupList = Add(groupList, value);
-            return this;
-        }
-
-        /// <summary>
-        /// Adds <paramref name="value"/> to the <paramref name="list"/>, creating
-        /// a new list if <paramref name="list"/> is null. The list is returned - either
-        /// the original reference or the new list.
-        /// </summary>
-        private static List<T> Add<T>(List<T> list, T value)
-        {
-            if (list == null)
-            {
-                list = new List<T>();
-            }
-            list.Add(value);
-            return list;
-        }
-    }
-}
diff --git a/libs/protobuf/csharp/src/Google.Protobuf/UnknownFieldSet.cs b/libs/protobuf/csharp/src/Google.Protobuf/UnknownFieldSet.cs
deleted file mode 100644
index 9888dd1..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf/UnknownFieldSet.cs
+++ /dev/null
@@ -1,393 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Security;
-using Google.Protobuf.Reflection;
-
-namespace Google.Protobuf
-{
-    /// <summary>
-    /// Used to keep track of fields which were seen when parsing a protocol message
-    /// but whose field numbers or types are unrecognized. This most frequently
-    /// occurs when new fields are added to a message type and then messages containing
-    /// those fields are read by old software that was built before the new types were
-    /// added.
-    ///
-    /// Most users will never need to use this class directly.
-    /// </summary>
-    public sealed partial class UnknownFieldSet
-    {
-        private readonly IDictionary<int, UnknownField> fields;
-
-        /// <summary>
-        /// Creates a new UnknownFieldSet.
-        /// </summary>
-        internal UnknownFieldSet()
-        {
-            this.fields = new Dictionary<int, UnknownField>();
-        }
-
-        /// <summary>
-        /// Checks whether or not the given field number is present in the set.
-        /// </summary>
-        internal bool HasField(int field)
-        {
-            return fields.ContainsKey(field);
-        }
-
-        /// <summary>
-        /// Serializes the set and writes it to <paramref name="output"/>.
-        /// </summary>
-        public void WriteTo(CodedOutputStream output)
-        {
-            WriteContext.Initialize(output, out WriteContext ctx);
-            try
-            {
-                WriteTo(ref ctx);
-            }
-            finally
-            {
-                ctx.CopyStateTo(output);
-            }
-        }
-
-        /// <summary>
-        /// Serializes the set and writes it to <paramref name="ctx"/>.
-        /// </summary>
-        [SecuritySafeCritical]
-        public void WriteTo(ref WriteContext ctx)
-        {
-            foreach (KeyValuePair<int, UnknownField> entry in fields)
-            {
-                entry.Value.WriteTo(entry.Key, ref ctx);
-            }
-        }
-
-        /// <summary>
-        /// Gets the number of bytes required to encode this set.
-        /// </summary>
-        public int CalculateSize()
-        {
-            int result = 0;
-            foreach (KeyValuePair<int, UnknownField> entry in fields)
-            {
-                result += entry.Value.GetSerializedSize(entry.Key);
-            }
-            return result;
-        }
-
-        /// <summary>
-        /// Checks if two unknown field sets are equal.
-        /// </summary>
-        public override bool Equals(object other)
-        {
-            if (ReferenceEquals(this, other))
-            {
-                return true;
-            }
-            UnknownFieldSet otherSet = other as UnknownFieldSet;
-            IDictionary<int, UnknownField> otherFields = otherSet.fields;
-            if (fields.Count  != otherFields.Count)
-            {
-                return false;
-            }
-            foreach (KeyValuePair<int, UnknownField> leftEntry in fields)
-            {
-                UnknownField rightValue;
-                if (!otherFields.TryGetValue(leftEntry.Key, out rightValue))
-                {
-                    return false;
-                }
-                if (!leftEntry.Value.Equals(rightValue))
-                {
-                    return false;
-                }
-            }
-            return true;
-        }
-
-        /// <summary>
-        /// Gets the unknown field set's hash code.
-        /// </summary>
-        public override int GetHashCode()
-        {
-            int ret = 1;
-            foreach (KeyValuePair<int, UnknownField> field in fields)
-            {
-                // Use ^ here to make the field order irrelevant.
-                int hash = field.Key.GetHashCode() ^ field.Value.GetHashCode();
-                ret ^= hash;
-            }
-            return ret;
-        }
-
-        // Optimization:  We keep around the last field that was
-        // modified so that we can efficiently add to it multiple times in a
-        // row (important when parsing an unknown repeated field).
-        private int lastFieldNumber;
-        private UnknownField lastField;
-
-        private UnknownField GetOrAddField(int number)
-        {
-            if (lastField != null && number == lastFieldNumber)
-            {
-                return lastField;
-            }
-            if (number == 0)
-            {
-                return null;
-            }
-
-            UnknownField existing;
-            if (fields.TryGetValue(number, out existing))
-            {
-                return existing;
-            }
-            lastField = new UnknownField();
-            AddOrReplaceField(number, lastField);
-            lastFieldNumber = number;
-            return lastField;
-        }
-
-        /// <summary>
-        /// Adds a field to the set. If a field with the same number already exists, it
-        /// is replaced.
-        /// </summary>
-        internal UnknownFieldSet AddOrReplaceField(int number, UnknownField field)
-        {
-            if (number == 0)
-            {
-                throw new ArgumentOutOfRangeException("number", "Zero is not a valid field number.");
-            }
-            fields[number] = field;
-            return this;
-        }
-        
-        /// <summary>
-        /// Parse a single field from <paramref name="ctx"/> and merge it
-        /// into this set.
-        /// </summary>
-        /// <param name="ctx">The parse context from which to read the field</param>
-        /// <returns>false if the tag is an "end group" tag, true otherwise</returns>
-        private bool MergeFieldFrom(ref ParseContext ctx)
-        {
-            uint tag = ctx.LastTag;
-            int number = WireFormat.GetTagFieldNumber(tag);
-            switch (WireFormat.GetTagWireType(tag))
-            {
-                case WireFormat.WireType.Varint:
-                    {
-                        ulong uint64 = ctx.ReadUInt64();
-                        GetOrAddField(number).AddVarint(uint64);
-                        return true;
-                    }
-                case WireFormat.WireType.Fixed32:
-                    {
-                        uint uint32 = ctx.ReadFixed32();
-                        GetOrAddField(number).AddFixed32(uint32);
-                        return true;
-                    }
-                case WireFormat.WireType.Fixed64:
-                    {
-                        ulong uint64 = ctx.ReadFixed64();
-                        GetOrAddField(number).AddFixed64(uint64);
-                        return true;
-                    }
-                case WireFormat.WireType.LengthDelimited:
-                    {
-                        ByteString bytes = ctx.ReadBytes();
-                        GetOrAddField(number).AddLengthDelimited(bytes);
-                        return true;
-                    }
-                case WireFormat.WireType.StartGroup:
-                    {
-                        UnknownFieldSet set = new UnknownFieldSet();
-                        ParsingPrimitivesMessages.ReadGroup(ref ctx, number, set);
-                        GetOrAddField(number).AddGroup(set);
-                        return true;
-                    }
-                case WireFormat.WireType.EndGroup:
-                    {
-                        return false;
-                    }
-                default:
-                    throw InvalidProtocolBufferException.InvalidWireType();
-            }
-        }
-
-        internal void MergeGroupFrom(ref ParseContext ctx)
-        {
-            while (true)
-            {
-                uint tag = ctx.ReadTag();
-                if (tag == 0)
-                {
-                    break;
-                }
-                if (!MergeFieldFrom(ref ctx))
-                {
-                    break;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Create a new UnknownFieldSet if unknownFields is null.
-        /// Parse a single field from <paramref name="input"/> and merge it
-        /// into unknownFields. If <paramref name="input"/> is configured to discard unknown fields,
-        /// <paramref name="unknownFields"/> will be returned as-is and the field will be skipped.
-        /// </summary>
-        /// <param name="unknownFields">The UnknownFieldSet which need to be merged</param>
-        /// <param name="input">The coded input stream containing the field</param>
-        /// <returns>The merged UnknownFieldSet</returns>
-        public static UnknownFieldSet MergeFieldFrom(UnknownFieldSet unknownFields,
-                                                     CodedInputStream input)
-        {
-            ParseContext.Initialize(input, out ParseContext ctx);
-            try
-            {
-                return MergeFieldFrom(unknownFields, ref ctx);
-            }
-            finally
-            {
-                ctx.CopyStateTo(input);
-            }
-        }
-
-        /// <summary>
-        /// Create a new UnknownFieldSet if unknownFields is null.
-        /// Parse a single field from <paramref name="ctx"/> and merge it
-        /// into unknownFields. If <paramref name="ctx"/> is configured to discard unknown fields,
-        /// <paramref name="unknownFields"/> will be returned as-is and the field will be skipped.
-        /// </summary>
-        /// <param name="unknownFields">The UnknownFieldSet which need to be merged</param>
-        /// <param name="ctx">The parse context from which to read the field</param>
-        /// <returns>The merged UnknownFieldSet</returns>
-        [SecuritySafeCritical]
-        public static UnknownFieldSet MergeFieldFrom(UnknownFieldSet unknownFields,
-                                                     ref ParseContext ctx)
-        {
-            if (ctx.DiscardUnknownFields)
-            {
-                ParsingPrimitivesMessages.SkipLastField(ref ctx.buffer, ref ctx.state);
-                return unknownFields;
-            }
-            if (unknownFields == null)
-            {
-                unknownFields = new UnknownFieldSet();
-            }
-            if (!unknownFields.MergeFieldFrom(ref ctx))
-            {
-                throw new InvalidProtocolBufferException("Merge an unknown field of end-group tag, indicating that the corresponding start-group was missing."); // match the old code-gen
-            }
-            return unknownFields;
-        }
-
-        /// <summary>
-        /// Merges the fields from <paramref name="other"/> into this set.
-        /// If a field number exists in both sets, the values in <paramref name="other"/>
-        /// will be appended to the values in this set.
-        /// </summary>
-        private UnknownFieldSet MergeFrom(UnknownFieldSet other)
-        {
-            if (other != null)
-            {
-                foreach (KeyValuePair<int, UnknownField> entry in other.fields)
-                {
-                    MergeField(entry.Key, entry.Value);
-                }
-            }
-            return this;
-        }
-
-        /// <summary>
-        /// Created a new UnknownFieldSet to <paramref name="unknownFields"/> if
-        /// needed and merges the fields from <paramref name="other"/> into the first set.
-        /// If a field number exists in both sets, the values in <paramref name="other"/>
-        /// will be appended to the values in this set.
-        /// </summary>
-        public static UnknownFieldSet MergeFrom(UnknownFieldSet unknownFields,
-                                                UnknownFieldSet other)
-        {
-            if (other == null)
-            {
-                return unknownFields;
-            }
-            if (unknownFields == null)
-            {
-                unknownFields = new UnknownFieldSet();
-            }
-            unknownFields.MergeFrom(other);
-            return unknownFields;
-        }
-
-
-        /// <summary>
-        /// Adds a field to the unknown field set. If a field with the same
-        /// number already exists, the two are merged.
-        /// </summary>
-        private UnknownFieldSet MergeField(int number, UnknownField field)
-        {
-            if (number == 0)
-            {
-                throw new ArgumentOutOfRangeException("number", "Zero is not a valid field number.");
-            }
-            if (HasField(number))
-            {
-                GetOrAddField(number).MergeFrom(field);
-            }
-            else
-            {
-                AddOrReplaceField(number, field);
-            }
-            return this;
-        }
-
-        /// <summary>
-        /// Clone an unknown field set from <paramref name="other"/>.
-        /// </summary>
-        public static UnknownFieldSet Clone(UnknownFieldSet other)
-        {
-            if (other == null)
-            {
-                return null;
-            }
-            UnknownFieldSet unknownFields = new UnknownFieldSet();
-            unknownFields.MergeFrom(other);
-            return unknownFields;
-        }
-    }
-}
-
diff --git a/libs/protobuf/csharp/src/Google.Protobuf/UnsafeByteOperations.cs b/libs/protobuf/csharp/src/Google.Protobuf/UnsafeByteOperations.cs
deleted file mode 100644
index 865ea06..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf/UnsafeByteOperations.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-using System.Security;
-
-namespace Google.Protobuf
-{
-    /// <summary>
-    /// Provides a number of unsafe byte operations to be used by advanced applications with high performance
-    /// requirements. These methods are referred to as "unsafe" due to the fact that they potentially expose
-    /// the backing buffer of a <see cref="ByteString"/> to the application.
-    /// </summary>
-    /// <remarks>
-    /// <para>
-    /// The methods in this class should only be called if it is guaranteed that the buffer backing the
-    /// <see cref="ByteString"/> will never change! Mutation of a <see cref="ByteString"/> can lead to unexpected
-    /// and undesirable consequences in your application, and will likely be difficult to debug. Proceed with caution!
-    /// </para>
-    /// <para>
-    /// This can have a number of significant side affects that have spooky-action-at-a-distance-like behavior. In
-    /// particular, if the bytes value changes out from under a Protocol Buffer:
-    /// </para>
-    /// <list type="bullet">
-    /// <item>
-    /// <description>serialization may throw</description>
-    /// </item>
-    /// <item>
-    /// <description>serialization may succeed but the wrong bytes may be written out</description>
-    /// </item>
-    /// <item>
-    /// <description>objects that are normally immutable (such as ByteString) are no longer immutable</description>
-    /// </item>
-    /// <item>
-    /// <description>hashCode may be incorrect</description>
-    /// </item>
-    /// </list>
-    /// </remarks>
-    [SecuritySafeCritical]
-    public static class UnsafeByteOperations
-    {
-        /// <summary>
-        /// Constructs a new <see cref="ByteString" /> from the given bytes. The bytes are not copied,
-        /// and must not be modified while the <see cref="ByteString" /> is in use.
-        /// This API is experimental and subject to change.
-        /// </summary>
-        public static ByteString UnsafeWrap(ReadOnlyMemory<byte> bytes)
-        {
-            return ByteString.AttachBytes(bytes);
-        }
-    }
-}
diff --git a/libs/protobuf/csharp/src/Google.Protobuf/WellKnownTypes/Any.cs b/libs/protobuf/csharp/src/Google.Protobuf/WellKnownTypes/Any.cs
deleted file mode 100644
index d0ce71b..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf/WellKnownTypes/Any.cs
+++ /dev/null
@@ -1,387 +0,0 @@
-// <auto-generated>
-//     Generated by the protocol buffer compiler.  DO NOT EDIT!
-//     source: google/protobuf/any.proto
-// </auto-generated>
-#pragma warning disable 1591, 0612, 3021, 8981
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-namespace Google.Protobuf.WellKnownTypes {
-
-  /// <summary>Holder for reflection information generated from google/protobuf/any.proto</summary>
-  public static partial class AnyReflection {
-
-    #region Descriptor
-    /// <summary>File descriptor for google/protobuf/any.proto</summary>
-    public static pbr::FileDescriptor Descriptor {
-      get { return descriptor; }
-    }
-    private static pbr::FileDescriptor descriptor;
-
-    static AnyReflection() {
-      byte[] descriptorData = global::System.Convert.FromBase64String(
-          string.Concat(
-            "Chlnb29nbGUvcHJvdG9idWYvYW55LnByb3RvEg9nb29nbGUucHJvdG9idWYi",
-            "JgoDQW55EhAKCHR5cGVfdXJsGAEgASgJEg0KBXZhbHVlGAIgASgMQnYKE2Nv",
-            "bS5nb29nbGUucHJvdG9idWZCCEFueVByb3RvUAFaLGdvb2dsZS5nb2xhbmcu",
-            "b3JnL3Byb3RvYnVmL3R5cGVzL2tub3duL2FueXBiogIDR1BCqgIeR29vZ2xl",
-            "LlByb3RvYnVmLldlbGxLbm93blR5cGVzYgZwcm90bzM="));
-      descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-          new pbr::FileDescriptor[] { },
-          new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.WellKnownTypes.Any), global::Google.Protobuf.WellKnownTypes.Any.Parser, new[]{ "TypeUrl", "Value" }, null, null, null, null)
-          }));
-    }
-    #endregion
-
-  }
-  #region Messages
-  /// <summary>
-  /// `Any` contains an arbitrary serialized protocol buffer message along with a
-  /// URL that describes the type of the serialized message.
-  ///
-  /// Protobuf library provides support to pack/unpack Any values in the form
-  /// of utility functions or additional generated methods of the Any type.
-  ///
-  /// Example 1: Pack and unpack a message in C++.
-  ///
-  ///     Foo foo = ...;
-  ///     Any any;
-  ///     any.PackFrom(foo);
-  ///     ...
-  ///     if (any.UnpackTo(&amp;foo)) {
-  ///       ...
-  ///     }
-  ///
-  /// Example 2: Pack and unpack a message in Java.
-  ///
-  ///     Foo foo = ...;
-  ///     Any any = Any.pack(foo);
-  ///     ...
-  ///     if (any.is(Foo.class)) {
-  ///       foo = any.unpack(Foo.class);
-  ///     }
-  ///
-  /// Example 3: Pack and unpack a message in Python.
-  ///
-  ///     foo = Foo(...)
-  ///     any = Any()
-  ///     any.Pack(foo)
-  ///     ...
-  ///     if any.Is(Foo.DESCRIPTOR):
-  ///       any.Unpack(foo)
-  ///       ...
-  ///
-  /// Example 4: Pack and unpack a message in Go
-  ///
-  ///      foo := &amp;pb.Foo{...}
-  ///      any, err := anypb.New(foo)
-  ///      if err != nil {
-  ///        ...
-  ///      }
-  ///      ...
-  ///      foo := &amp;pb.Foo{}
-  ///      if err := any.UnmarshalTo(foo); err != nil {
-  ///        ...
-  ///      }
-  ///
-  /// The pack methods provided by protobuf library will by default use
-  /// 'type.googleapis.com/full.type.name' as the type URL and the unpack
-  /// methods only use the fully qualified type name after the last '/'
-  /// in the type URL, for example "foo.bar.com/x/y.z" will yield type
-  /// name "y.z".
-  ///
-  /// JSON
-  ///
-  /// The JSON representation of an `Any` value uses the regular
-  /// representation of the deserialized, embedded message, with an
-  /// additional field `@type` which contains the type URL. Example:
-  ///
-  ///     package google.profile;
-  ///     message Person {
-  ///       string first_name = 1;
-  ///       string last_name = 2;
-  ///     }
-  ///
-  ///     {
-  ///       "@type": "type.googleapis.com/google.profile.Person",
-  ///       "firstName": &lt;string>,
-  ///       "lastName": &lt;string>
-  ///     }
-  ///
-  /// If the embedded message type is well-known and has a custom JSON
-  /// representation, that representation will be embedded adding a field
-  /// `value` which holds the custom JSON in addition to the `@type`
-  /// field. Example (for message [google.protobuf.Duration][]):
-  ///
-  ///     {
-  ///       "@type": "type.googleapis.com/google.protobuf.Duration",
-  ///       "value": "1.212s"
-  ///     }
-  /// </summary>
-  public sealed partial class Any : pb::IMessage<Any>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<Any> _parser = new pb::MessageParser<Any>(() => new Any());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<Any> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.WellKnownTypes.AnyReflection.Descriptor.MessageTypes[0]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Any() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Any(Any other) : this() {
-      typeUrl_ = other.typeUrl_;
-      value_ = other.value_;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Any Clone() {
-      return new Any(this);
-    }
-
-    /// <summary>Field number for the "type_url" field.</summary>
-    public const int TypeUrlFieldNumber = 1;
-    private string typeUrl_ = "";
-    /// <summary>
-    /// A URL/resource name that uniquely identifies the type of the serialized
-    /// protocol buffer message. This string must contain at least
-    /// one "/" character. The last segment of the URL's path must represent
-    /// the fully qualified name of the type (as in
-    /// `path/google.protobuf.Duration`). The name should be in a canonical form
-    /// (e.g., leading "." is not accepted).
-    ///
-    /// In practice, teams usually precompile into the binary all types that they
-    /// expect it to use in the context of Any. However, for URLs which use the
-    /// scheme `http`, `https`, or no scheme, one can optionally set up a type
-    /// server that maps type URLs to message definitions as follows:
-    ///
-    /// * If no scheme is provided, `https` is assumed.
-    /// * An HTTP GET on the URL must yield a [google.protobuf.Type][]
-    ///   value in binary format, or produce an error.
-    /// * Applications are allowed to cache lookup results based on the
-    ///   URL, or have them precompiled into a binary to avoid any
-    ///   lookup. Therefore, binary compatibility needs to be preserved
-    ///   on changes to types. (Use versioned type names to manage
-    ///   breaking changes.)
-    ///
-    /// Note: this functionality is not currently available in the official
-    /// protobuf release, and it is not used for type URLs beginning with
-    /// type.googleapis.com.
-    ///
-    /// Schemes other than `http`, `https` (or the empty scheme) might be
-    /// used with implementation specific semantics.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string TypeUrl {
-      get { return typeUrl_; }
-      set {
-        typeUrl_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-
-    /// <summary>Field number for the "value" field.</summary>
-    public const int ValueFieldNumber = 2;
-    private pb::ByteString value_ = pb::ByteString.Empty;
-    /// <summary>
-    /// Must be a valid serialized protocol buffer of the above specified type.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pb::ByteString Value {
-      get { return value_; }
-      set {
-        value_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as Any);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(Any other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (TypeUrl != other.TypeUrl) return false;
-      if (Value != other.Value) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (TypeUrl.Length != 0) hash ^= TypeUrl.GetHashCode();
-      if (Value.Length != 0) hash ^= Value.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (TypeUrl.Length != 0) {
-        output.WriteRawTag(10);
-        output.WriteString(TypeUrl);
-      }
-      if (Value.Length != 0) {
-        output.WriteRawTag(18);
-        output.WriteBytes(Value);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (TypeUrl.Length != 0) {
-        output.WriteRawTag(10);
-        output.WriteString(TypeUrl);
-      }
-      if (Value.Length != 0) {
-        output.WriteRawTag(18);
-        output.WriteBytes(Value);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (TypeUrl.Length != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(TypeUrl);
-      }
-      if (Value.Length != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeBytesSize(Value);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(Any other) {
-      if (other == null) {
-        return;
-      }
-      if (other.TypeUrl.Length != 0) {
-        TypeUrl = other.TypeUrl;
-      }
-      if (other.Value.Length != 0) {
-        Value = other.Value;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 10: {
-            TypeUrl = input.ReadString();
-            break;
-          }
-          case 18: {
-            Value = input.ReadBytes();
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 10: {
-            TypeUrl = input.ReadString();
-            break;
-          }
-          case 18: {
-            Value = input.ReadBytes();
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  #endregion
-
-}
-
-#endregion Designer generated code
diff --git a/libs/protobuf/csharp/src/Google.Protobuf/WellKnownTypes/AnyPartial.cs b/libs/protobuf/csharp/src/Google.Protobuf/WellKnownTypes/AnyPartial.cs
deleted file mode 100644
index 5e7b6d5..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf/WellKnownTypes/AnyPartial.cs
+++ /dev/null
@@ -1,147 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using Google.Protobuf.Reflection;
-
-namespace Google.Protobuf.WellKnownTypes
-{
-    public partial class Any
-    {
-        private const string DefaultPrefix = "type.googleapis.com";
-
-        // This could be moved to MessageDescriptor if we wanted to, but keeping it here means
-        // all the Any-specific code is in the same place.
-        private static string GetTypeUrl(MessageDescriptor descriptor, string prefix) =>
-            prefix.EndsWith("/") ? prefix + descriptor.FullName : prefix + "/" + descriptor.FullName;
-
-        /// <summary>
-        /// Retrieves the type name for a type URL, matching the <see cref="DescriptorBase.FullName"/>
-        /// of the packed message type.
-        /// </summary>
-        /// <remarks>
-        /// <para>
-        /// This is always just the last part of the URL, after the final slash. No validation of
-        /// anything before the trailing slash is performed. If the type URL does not include a slash,
-        /// an empty string is returned rather than an exception being thrown; this won't match any types,
-        /// and the calling code is probably in a better position to give a meaningful error.
-        /// </para>
-        /// <para>
-        /// There is no handling of fragments or queries  at the moment.
-        /// </para>
-        /// </remarks>
-        /// <param name="typeUrl">The URL to extract the type name from</param>
-        /// <returns>The type name</returns>
-        public static string GetTypeName(string typeUrl)
-        {
-            ProtoPreconditions.CheckNotNull(typeUrl, nameof(typeUrl));
-            int lastSlash = typeUrl.LastIndexOf('/');
-            return lastSlash == -1 ? "" : typeUrl.Substring(lastSlash + 1);
-        }
-
-        /// <summary>
-        /// Returns a bool indictating whether this Any message is of the target message type
-        /// </summary>
-        /// <param name="descriptor">The descriptor of the message type</param>
-        /// <returns><c>true</c> if the type name matches the descriptor's full name or <c>false</c> otherwise</returns>
-        public bool Is(MessageDescriptor descriptor)
-        {
-            ProtoPreconditions.CheckNotNull(descriptor, nameof(descriptor));
-            return GetTypeName(TypeUrl) == descriptor.FullName;
-        }
-
-        /// <summary>
-        /// Unpacks the content of this Any message into the target message type,
-        /// which must match the type URL within this Any message.
-        /// </summary>
-        /// <typeparam name="T">The type of message to unpack the content into.</typeparam>
-        /// <returns>The unpacked message.</returns>
-        /// <exception cref="InvalidProtocolBufferException">The target message type doesn't match the type URL in this message</exception>
-        public T Unpack<T>() where T : IMessage, new()
-        {
-            // Note: this doesn't perform as well is it might. We could take a MessageParser<T> in an alternative overload,
-            // which would be expected to perform slightly better... although the difference is likely to be negligible.
-            T target = new T();
-            if (GetTypeName(TypeUrl) != target.Descriptor.FullName)
-            {
-                throw new InvalidProtocolBufferException(
-                    $"Full type name for {target.Descriptor.Name} is {target.Descriptor.FullName}; Any message's type url is {TypeUrl}");
-            }
-            target.MergeFrom(Value);
-            return target;
-        }
-
-        /// <summary>
-        /// Attempts to unpack the content of this Any message into the target message type,
-        /// if it matches the type URL within this Any message.
-        /// </summary>
-        /// <typeparam name="T">The type of message to attempt to unpack the content into.</typeparam>
-        /// <returns><c>true</c> if the message was successfully unpacked; <c>false</c> if the type name didn't match</returns>
-        public bool TryUnpack<T>(out T result) where T : IMessage, new()
-        {
-            // Note: deliberately avoid writing anything to result until the end, in case it's being
-            // monitored by other threads. (That would be a bug in the calling code, but let's not make it worse.)
-            T target = new T();
-            if (GetTypeName(TypeUrl) != target.Descriptor.FullName)
-            {
-                result = default(T); // Can't use null as there's no class constraint, but this always *will* be null in real usage.
-                return false;
-            }
-            target.MergeFrom(Value);
-            result = target;
-            return true;
-        }
-
-        /// <summary>
-        /// Packs the specified message into an Any message using a type URL prefix of "type.googleapis.com".
-        /// </summary>
-        /// <param name="message">The message to pack.</param>
-        /// <returns>An Any message with the content and type URL of <paramref name="message"/>.</returns>
-        public static Any Pack(IMessage message) => Pack(message, DefaultPrefix);
-
-        /// <summary>
-        /// Packs the specified message into an Any message using the specified type URL prefix.
-        /// </summary>
-        /// <param name="message">The message to pack.</param>
-        /// <param name="typeUrlPrefix">The prefix for the type URL.</param>
-        /// <returns>An Any message with the content and type URL of <paramref name="message"/>.</returns>
-        public static Any Pack(IMessage message, string typeUrlPrefix)
-        {
-            ProtoPreconditions.CheckNotNull(message, nameof(message));
-            ProtoPreconditions.CheckNotNull(typeUrlPrefix, nameof(typeUrlPrefix));
-            return new Any
-            {
-                TypeUrl = GetTypeUrl(message.Descriptor, typeUrlPrefix),
-                Value = message.ToByteString()
-            };
-        }
-    }
-}
diff --git a/libs/protobuf/csharp/src/Google.Protobuf/WellKnownTypes/Api.cs b/libs/protobuf/csharp/src/Google.Protobuf/WellKnownTypes/Api.cs
deleted file mode 100644
index c524031..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf/WellKnownTypes/Api.cs
+++ /dev/null
@@ -1,1236 +0,0 @@
-// <auto-generated>
-//     Generated by the protocol buffer compiler.  DO NOT EDIT!
-//     source: google/protobuf/api.proto
-// </auto-generated>
-#pragma warning disable 1591, 0612, 3021, 8981
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-namespace Google.Protobuf.WellKnownTypes {
-
-  /// <summary>Holder for reflection information generated from google/protobuf/api.proto</summary>
-  public static partial class ApiReflection {
-
-    #region Descriptor
-    /// <summary>File descriptor for google/protobuf/api.proto</summary>
-    public static pbr::FileDescriptor Descriptor {
-      get { return descriptor; }
-    }
-    private static pbr::FileDescriptor descriptor;
-
-    static ApiReflection() {
-      byte[] descriptorData = global::System.Convert.FromBase64String(
-          string.Concat(
-            "Chlnb29nbGUvcHJvdG9idWYvYXBpLnByb3RvEg9nb29nbGUucHJvdG9idWYa",
-            "JGdvb2dsZS9wcm90b2J1Zi9zb3VyY2VfY29udGV4dC5wcm90bxoaZ29vZ2xl",
-            "L3Byb3RvYnVmL3R5cGUucHJvdG8igQIKA0FwaRIMCgRuYW1lGAEgASgJEigK",
-            "B21ldGhvZHMYAiADKAsyFy5nb29nbGUucHJvdG9idWYuTWV0aG9kEigKB29w",
-            "dGlvbnMYAyADKAsyFy5nb29nbGUucHJvdG9idWYuT3B0aW9uEg8KB3ZlcnNp",
-            "b24YBCABKAkSNgoOc291cmNlX2NvbnRleHQYBSABKAsyHi5nb29nbGUucHJv",
-            "dG9idWYuU291cmNlQ29udGV4dBImCgZtaXhpbnMYBiADKAsyFi5nb29nbGUu",
-            "cHJvdG9idWYuTWl4aW4SJwoGc3ludGF4GAcgASgOMhcuZ29vZ2xlLnByb3Rv",
-            "YnVmLlN5bnRheCLVAQoGTWV0aG9kEgwKBG5hbWUYASABKAkSGAoQcmVxdWVz",
-            "dF90eXBlX3VybBgCIAEoCRIZChFyZXF1ZXN0X3N0cmVhbWluZxgDIAEoCBIZ",
-            "ChFyZXNwb25zZV90eXBlX3VybBgEIAEoCRIaChJyZXNwb25zZV9zdHJlYW1p",
-            "bmcYBSABKAgSKAoHb3B0aW9ucxgGIAMoCzIXLmdvb2dsZS5wcm90b2J1Zi5P",
-            "cHRpb24SJwoGc3ludGF4GAcgASgOMhcuZ29vZ2xlLnByb3RvYnVmLlN5bnRh",
-            "eCIjCgVNaXhpbhIMCgRuYW1lGAEgASgJEgwKBHJvb3QYAiABKAlCdgoTY29t",
-            "Lmdvb2dsZS5wcm90b2J1ZkIIQXBpUHJvdG9QAVosZ29vZ2xlLmdvbGFuZy5v",
-            "cmcvcHJvdG9idWYvdHlwZXMva25vd24vYXBpcGKiAgNHUEKqAh5Hb29nbGUu",
-            "UHJvdG9idWYuV2VsbEtub3duVHlwZXNiBnByb3RvMw=="));
-      descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-          new pbr::FileDescriptor[] { global::Google.Protobuf.WellKnownTypes.SourceContextReflection.Descriptor, global::Google.Protobuf.WellKnownTypes.TypeReflection.Descriptor, },
-          new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.WellKnownTypes.Api), global::Google.Protobuf.WellKnownTypes.Api.Parser, new[]{ "Name", "Methods", "Options", "Version", "SourceContext", "Mixins", "Syntax" }, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.WellKnownTypes.Method), global::Google.Protobuf.WellKnownTypes.Method.Parser, new[]{ "Name", "RequestTypeUrl", "RequestStreaming", "ResponseTypeUrl", "ResponseStreaming", "Options", "Syntax" }, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.WellKnownTypes.Mixin), global::Google.Protobuf.WellKnownTypes.Mixin.Parser, new[]{ "Name", "Root" }, null, null, null, null)
-          }));
-    }
-    #endregion
-
-  }
-  #region Messages
-  /// <summary>
-  /// Api is a light-weight descriptor for an API Interface.
-  ///
-  /// Interfaces are also described as "protocol buffer services" in some contexts,
-  /// such as by the "service" keyword in a .proto file, but they are different
-  /// from API Services, which represent a concrete implementation of an interface
-  /// as opposed to simply a description of methods and bindings. They are also
-  /// sometimes simply referred to as "APIs" in other contexts, such as the name of
-  /// this message itself. See https://cloud.google.com/apis/design/glossary for
-  /// detailed terminology.
-  /// </summary>
-  public sealed partial class Api : pb::IMessage<Api>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<Api> _parser = new pb::MessageParser<Api>(() => new Api());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<Api> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.WellKnownTypes.ApiReflection.Descriptor.MessageTypes[0]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Api() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Api(Api other) : this() {
-      name_ = other.name_;
-      methods_ = other.methods_.Clone();
-      options_ = other.options_.Clone();
-      version_ = other.version_;
-      sourceContext_ = other.sourceContext_ != null ? other.sourceContext_.Clone() : null;
-      mixins_ = other.mixins_.Clone();
-      syntax_ = other.syntax_;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Api Clone() {
-      return new Api(this);
-    }
-
-    /// <summary>Field number for the "name" field.</summary>
-    public const int NameFieldNumber = 1;
-    private string name_ = "";
-    /// <summary>
-    /// The fully qualified name of this interface, including package name
-    /// followed by the interface's simple name.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string Name {
-      get { return name_; }
-      set {
-        name_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-
-    /// <summary>Field number for the "methods" field.</summary>
-    public const int MethodsFieldNumber = 2;
-    private static readonly pb::FieldCodec<global::Google.Protobuf.WellKnownTypes.Method> _repeated_methods_codec
-        = pb::FieldCodec.ForMessage(18, global::Google.Protobuf.WellKnownTypes.Method.Parser);
-    private readonly pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Method> methods_ = new pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Method>();
-    /// <summary>
-    /// The methods of this interface, in unspecified order.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Method> Methods {
-      get { return methods_; }
-    }
-
-    /// <summary>Field number for the "options" field.</summary>
-    public const int OptionsFieldNumber = 3;
-    private static readonly pb::FieldCodec<global::Google.Protobuf.WellKnownTypes.Option> _repeated_options_codec
-        = pb::FieldCodec.ForMessage(26, global::Google.Protobuf.WellKnownTypes.Option.Parser);
-    private readonly pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Option> options_ = new pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Option>();
-    /// <summary>
-    /// Any metadata attached to the interface.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Option> Options {
-      get { return options_; }
-    }
-
-    /// <summary>Field number for the "version" field.</summary>
-    public const int VersionFieldNumber = 4;
-    private string version_ = "";
-    /// <summary>
-    /// A version string for this interface. If specified, must have the form
-    /// `major-version.minor-version`, as in `1.10`. If the minor version is
-    /// omitted, it defaults to zero. If the entire version field is empty, the
-    /// major version is derived from the package name, as outlined below. If the
-    /// field is not empty, the version in the package name will be verified to be
-    /// consistent with what is provided here.
-    ///
-    /// The versioning schema uses [semantic
-    /// versioning](http://semver.org) where the major version number
-    /// indicates a breaking change and the minor version an additive,
-    /// non-breaking change. Both version numbers are signals to users
-    /// what to expect from different versions, and should be carefully
-    /// chosen based on the product plan.
-    ///
-    /// The major version is also reflected in the package name of the
-    /// interface, which must end in `v&lt;major-version>`, as in
-    /// `google.feature.v1`. For major versions 0 and 1, the suffix can
-    /// be omitted. Zero major versions must only be used for
-    /// experimental, non-GA interfaces.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string Version {
-      get { return version_; }
-      set {
-        version_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-
-    /// <summary>Field number for the "source_context" field.</summary>
-    public const int SourceContextFieldNumber = 5;
-    private global::Google.Protobuf.WellKnownTypes.SourceContext sourceContext_;
-    /// <summary>
-    /// Source context for the protocol buffer service represented by this
-    /// message.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.WellKnownTypes.SourceContext SourceContext {
-      get { return sourceContext_; }
-      set {
-        sourceContext_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "mixins" field.</summary>
-    public const int MixinsFieldNumber = 6;
-    private static readonly pb::FieldCodec<global::Google.Protobuf.WellKnownTypes.Mixin> _repeated_mixins_codec
-        = pb::FieldCodec.ForMessage(50, global::Google.Protobuf.WellKnownTypes.Mixin.Parser);
-    private readonly pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Mixin> mixins_ = new pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Mixin>();
-    /// <summary>
-    /// Included interfaces. See [Mixin][].
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Mixin> Mixins {
-      get { return mixins_; }
-    }
-
-    /// <summary>Field number for the "syntax" field.</summary>
-    public const int SyntaxFieldNumber = 7;
-    private global::Google.Protobuf.WellKnownTypes.Syntax syntax_ = global::Google.Protobuf.WellKnownTypes.Syntax.Proto2;
-    /// <summary>
-    /// The source syntax of the service.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.WellKnownTypes.Syntax Syntax {
-      get { return syntax_; }
-      set {
-        syntax_ = value;
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as Api);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(Api other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (Name != other.Name) return false;
-      if(!methods_.Equals(other.methods_)) return false;
-      if(!options_.Equals(other.options_)) return false;
-      if (Version != other.Version) return false;
-      if (!object.Equals(SourceContext, other.SourceContext)) return false;
-      if(!mixins_.Equals(other.mixins_)) return false;
-      if (Syntax != other.Syntax) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (Name.Length != 0) hash ^= Name.GetHashCode();
-      hash ^= methods_.GetHashCode();
-      hash ^= options_.GetHashCode();
-      if (Version.Length != 0) hash ^= Version.GetHashCode();
-      if (sourceContext_ != null) hash ^= SourceContext.GetHashCode();
-      hash ^= mixins_.GetHashCode();
-      if (Syntax != global::Google.Protobuf.WellKnownTypes.Syntax.Proto2) hash ^= Syntax.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (Name.Length != 0) {
-        output.WriteRawTag(10);
-        output.WriteString(Name);
-      }
-      methods_.WriteTo(output, _repeated_methods_codec);
-      options_.WriteTo(output, _repeated_options_codec);
-      if (Version.Length != 0) {
-        output.WriteRawTag(34);
-        output.WriteString(Version);
-      }
-      if (sourceContext_ != null) {
-        output.WriteRawTag(42);
-        output.WriteMessage(SourceContext);
-      }
-      mixins_.WriteTo(output, _repeated_mixins_codec);
-      if (Syntax != global::Google.Protobuf.WellKnownTypes.Syntax.Proto2) {
-        output.WriteRawTag(56);
-        output.WriteEnum((int) Syntax);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (Name.Length != 0) {
-        output.WriteRawTag(10);
-        output.WriteString(Name);
-      }
-      methods_.WriteTo(ref output, _repeated_methods_codec);
-      options_.WriteTo(ref output, _repeated_options_codec);
-      if (Version.Length != 0) {
-        output.WriteRawTag(34);
-        output.WriteString(Version);
-      }
-      if (sourceContext_ != null) {
-        output.WriteRawTag(42);
-        output.WriteMessage(SourceContext);
-      }
-      mixins_.WriteTo(ref output, _repeated_mixins_codec);
-      if (Syntax != global::Google.Protobuf.WellKnownTypes.Syntax.Proto2) {
-        output.WriteRawTag(56);
-        output.WriteEnum((int) Syntax);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (Name.Length != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(Name);
-      }
-      size += methods_.CalculateSize(_repeated_methods_codec);
-      size += options_.CalculateSize(_repeated_options_codec);
-      if (Version.Length != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(Version);
-      }
-      if (sourceContext_ != null) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(SourceContext);
-      }
-      size += mixins_.CalculateSize(_repeated_mixins_codec);
-      if (Syntax != global::Google.Protobuf.WellKnownTypes.Syntax.Proto2) {
-        size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Syntax);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(Api other) {
-      if (other == null) {
-        return;
-      }
-      if (other.Name.Length != 0) {
-        Name = other.Name;
-      }
-      methods_.Add(other.methods_);
-      options_.Add(other.options_);
-      if (other.Version.Length != 0) {
-        Version = other.Version;
-      }
-      if (other.sourceContext_ != null) {
-        if (sourceContext_ == null) {
-          SourceContext = new global::Google.Protobuf.WellKnownTypes.SourceContext();
-        }
-        SourceContext.MergeFrom(other.SourceContext);
-      }
-      mixins_.Add(other.mixins_);
-      if (other.Syntax != global::Google.Protobuf.WellKnownTypes.Syntax.Proto2) {
-        Syntax = other.Syntax;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 10: {
-            Name = input.ReadString();
-            break;
-          }
-          case 18: {
-            methods_.AddEntriesFrom(input, _repeated_methods_codec);
-            break;
-          }
-          case 26: {
-            options_.AddEntriesFrom(input, _repeated_options_codec);
-            break;
-          }
-          case 34: {
-            Version = input.ReadString();
-            break;
-          }
-          case 42: {
-            if (sourceContext_ == null) {
-              SourceContext = new global::Google.Protobuf.WellKnownTypes.SourceContext();
-            }
-            input.ReadMessage(SourceContext);
-            break;
-          }
-          case 50: {
-            mixins_.AddEntriesFrom(input, _repeated_mixins_codec);
-            break;
-          }
-          case 56: {
-            Syntax = (global::Google.Protobuf.WellKnownTypes.Syntax) input.ReadEnum();
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 10: {
-            Name = input.ReadString();
-            break;
-          }
-          case 18: {
-            methods_.AddEntriesFrom(ref input, _repeated_methods_codec);
-            break;
-          }
-          case 26: {
-            options_.AddEntriesFrom(ref input, _repeated_options_codec);
-            break;
-          }
-          case 34: {
-            Version = input.ReadString();
-            break;
-          }
-          case 42: {
-            if (sourceContext_ == null) {
-              SourceContext = new global::Google.Protobuf.WellKnownTypes.SourceContext();
-            }
-            input.ReadMessage(SourceContext);
-            break;
-          }
-          case 50: {
-            mixins_.AddEntriesFrom(ref input, _repeated_mixins_codec);
-            break;
-          }
-          case 56: {
-            Syntax = (global::Google.Protobuf.WellKnownTypes.Syntax) input.ReadEnum();
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  /// <summary>
-  /// Method represents a method of an API interface.
-  /// </summary>
-  public sealed partial class Method : pb::IMessage<Method>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<Method> _parser = new pb::MessageParser<Method>(() => new Method());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<Method> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.WellKnownTypes.ApiReflection.Descriptor.MessageTypes[1]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Method() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Method(Method other) : this() {
-      name_ = other.name_;
-      requestTypeUrl_ = other.requestTypeUrl_;
-      requestStreaming_ = other.requestStreaming_;
-      responseTypeUrl_ = other.responseTypeUrl_;
-      responseStreaming_ = other.responseStreaming_;
-      options_ = other.options_.Clone();
-      syntax_ = other.syntax_;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Method Clone() {
-      return new Method(this);
-    }
-
-    /// <summary>Field number for the "name" field.</summary>
-    public const int NameFieldNumber = 1;
-    private string name_ = "";
-    /// <summary>
-    /// The simple name of this method.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string Name {
-      get { return name_; }
-      set {
-        name_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-
-    /// <summary>Field number for the "request_type_url" field.</summary>
-    public const int RequestTypeUrlFieldNumber = 2;
-    private string requestTypeUrl_ = "";
-    /// <summary>
-    /// A URL of the input message type.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string RequestTypeUrl {
-      get { return requestTypeUrl_; }
-      set {
-        requestTypeUrl_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-
-    /// <summary>Field number for the "request_streaming" field.</summary>
-    public const int RequestStreamingFieldNumber = 3;
-    private bool requestStreaming_;
-    /// <summary>
-    /// If true, the request is streamed.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool RequestStreaming {
-      get { return requestStreaming_; }
-      set {
-        requestStreaming_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "response_type_url" field.</summary>
-    public const int ResponseTypeUrlFieldNumber = 4;
-    private string responseTypeUrl_ = "";
-    /// <summary>
-    /// The URL of the output message type.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string ResponseTypeUrl {
-      get { return responseTypeUrl_; }
-      set {
-        responseTypeUrl_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-
-    /// <summary>Field number for the "response_streaming" field.</summary>
-    public const int ResponseStreamingFieldNumber = 5;
-    private bool responseStreaming_;
-    /// <summary>
-    /// If true, the response is streamed.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool ResponseStreaming {
-      get { return responseStreaming_; }
-      set {
-        responseStreaming_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "options" field.</summary>
-    public const int OptionsFieldNumber = 6;
-    private static readonly pb::FieldCodec<global::Google.Protobuf.WellKnownTypes.Option> _repeated_options_codec
-        = pb::FieldCodec.ForMessage(50, global::Google.Protobuf.WellKnownTypes.Option.Parser);
-    private readonly pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Option> options_ = new pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Option>();
-    /// <summary>
-    /// Any metadata attached to the method.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Option> Options {
-      get { return options_; }
-    }
-
-    /// <summary>Field number for the "syntax" field.</summary>
-    public const int SyntaxFieldNumber = 7;
-    private global::Google.Protobuf.WellKnownTypes.Syntax syntax_ = global::Google.Protobuf.WellKnownTypes.Syntax.Proto2;
-    /// <summary>
-    /// The source syntax of this method.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.WellKnownTypes.Syntax Syntax {
-      get { return syntax_; }
-      set {
-        syntax_ = value;
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as Method);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(Method other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (Name != other.Name) return false;
-      if (RequestTypeUrl != other.RequestTypeUrl) return false;
-      if (RequestStreaming != other.RequestStreaming) return false;
-      if (ResponseTypeUrl != other.ResponseTypeUrl) return false;
-      if (ResponseStreaming != other.ResponseStreaming) return false;
-      if(!options_.Equals(other.options_)) return false;
-      if (Syntax != other.Syntax) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (Name.Length != 0) hash ^= Name.GetHashCode();
-      if (RequestTypeUrl.Length != 0) hash ^= RequestTypeUrl.GetHashCode();
-      if (RequestStreaming != false) hash ^= RequestStreaming.GetHashCode();
-      if (ResponseTypeUrl.Length != 0) hash ^= ResponseTypeUrl.GetHashCode();
-      if (ResponseStreaming != false) hash ^= ResponseStreaming.GetHashCode();
-      hash ^= options_.GetHashCode();
-      if (Syntax != global::Google.Protobuf.WellKnownTypes.Syntax.Proto2) hash ^= Syntax.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (Name.Length != 0) {
-        output.WriteRawTag(10);
-        output.WriteString(Name);
-      }
-      if (RequestTypeUrl.Length != 0) {
-        output.WriteRawTag(18);
-        output.WriteString(RequestTypeUrl);
-      }
-      if (RequestStreaming != false) {
-        output.WriteRawTag(24);
-        output.WriteBool(RequestStreaming);
-      }
-      if (ResponseTypeUrl.Length != 0) {
-        output.WriteRawTag(34);
-        output.WriteString(ResponseTypeUrl);
-      }
-      if (ResponseStreaming != false) {
-        output.WriteRawTag(40);
-        output.WriteBool(ResponseStreaming);
-      }
-      options_.WriteTo(output, _repeated_options_codec);
-      if (Syntax != global::Google.Protobuf.WellKnownTypes.Syntax.Proto2) {
-        output.WriteRawTag(56);
-        output.WriteEnum((int) Syntax);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (Name.Length != 0) {
-        output.WriteRawTag(10);
-        output.WriteString(Name);
-      }
-      if (RequestTypeUrl.Length != 0) {
-        output.WriteRawTag(18);
-        output.WriteString(RequestTypeUrl);
-      }
-      if (RequestStreaming != false) {
-        output.WriteRawTag(24);
-        output.WriteBool(RequestStreaming);
-      }
-      if (ResponseTypeUrl.Length != 0) {
-        output.WriteRawTag(34);
-        output.WriteString(ResponseTypeUrl);
-      }
-      if (ResponseStreaming != false) {
-        output.WriteRawTag(40);
-        output.WriteBool(ResponseStreaming);
-      }
-      options_.WriteTo(ref output, _repeated_options_codec);
-      if (Syntax != global::Google.Protobuf.WellKnownTypes.Syntax.Proto2) {
-        output.WriteRawTag(56);
-        output.WriteEnum((int) Syntax);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (Name.Length != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(Name);
-      }
-      if (RequestTypeUrl.Length != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(RequestTypeUrl);
-      }
-      if (RequestStreaming != false) {
-        size += 1 + 1;
-      }
-      if (ResponseTypeUrl.Length != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(ResponseTypeUrl);
-      }
-      if (ResponseStreaming != false) {
-        size += 1 + 1;
-      }
-      size += options_.CalculateSize(_repeated_options_codec);
-      if (Syntax != global::Google.Protobuf.WellKnownTypes.Syntax.Proto2) {
-        size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Syntax);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(Method other) {
-      if (other == null) {
-        return;
-      }
-      if (other.Name.Length != 0) {
-        Name = other.Name;
-      }
-      if (other.RequestTypeUrl.Length != 0) {
-        RequestTypeUrl = other.RequestTypeUrl;
-      }
-      if (other.RequestStreaming != false) {
-        RequestStreaming = other.RequestStreaming;
-      }
-      if (other.ResponseTypeUrl.Length != 0) {
-        ResponseTypeUrl = other.ResponseTypeUrl;
-      }
-      if (other.ResponseStreaming != false) {
-        ResponseStreaming = other.ResponseStreaming;
-      }
-      options_.Add(other.options_);
-      if (other.Syntax != global::Google.Protobuf.WellKnownTypes.Syntax.Proto2) {
-        Syntax = other.Syntax;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 10: {
-            Name = input.ReadString();
-            break;
-          }
-          case 18: {
-            RequestTypeUrl = input.ReadString();
-            break;
-          }
-          case 24: {
-            RequestStreaming = input.ReadBool();
-            break;
-          }
-          case 34: {
-            ResponseTypeUrl = input.ReadString();
-            break;
-          }
-          case 40: {
-            ResponseStreaming = input.ReadBool();
-            break;
-          }
-          case 50: {
-            options_.AddEntriesFrom(input, _repeated_options_codec);
-            break;
-          }
-          case 56: {
-            Syntax = (global::Google.Protobuf.WellKnownTypes.Syntax) input.ReadEnum();
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 10: {
-            Name = input.ReadString();
-            break;
-          }
-          case 18: {
-            RequestTypeUrl = input.ReadString();
-            break;
-          }
-          case 24: {
-            RequestStreaming = input.ReadBool();
-            break;
-          }
-          case 34: {
-            ResponseTypeUrl = input.ReadString();
-            break;
-          }
-          case 40: {
-            ResponseStreaming = input.ReadBool();
-            break;
-          }
-          case 50: {
-            options_.AddEntriesFrom(ref input, _repeated_options_codec);
-            break;
-          }
-          case 56: {
-            Syntax = (global::Google.Protobuf.WellKnownTypes.Syntax) input.ReadEnum();
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  /// <summary>
-  /// Declares an API Interface to be included in this interface. The including
-  /// interface must redeclare all the methods from the included interface, but
-  /// documentation and options are inherited as follows:
-  ///
-  /// - If after comment and whitespace stripping, the documentation
-  ///   string of the redeclared method is empty, it will be inherited
-  ///   from the original method.
-  ///
-  /// - Each annotation belonging to the service config (http,
-  ///   visibility) which is not set in the redeclared method will be
-  ///   inherited.
-  ///
-  /// - If an http annotation is inherited, the path pattern will be
-  ///   modified as follows. Any version prefix will be replaced by the
-  ///   version of the including interface plus the [root][] path if
-  ///   specified.
-  ///
-  /// Example of a simple mixin:
-  ///
-  ///     package google.acl.v1;
-  ///     service AccessControl {
-  ///       // Get the underlying ACL object.
-  ///       rpc GetAcl(GetAclRequest) returns (Acl) {
-  ///         option (google.api.http).get = "/v1/{resource=**}:getAcl";
-  ///       }
-  ///     }
-  ///
-  ///     package google.storage.v2;
-  ///     service Storage {
-  ///       rpc GetAcl(GetAclRequest) returns (Acl);
-  ///
-  ///       // Get a data record.
-  ///       rpc GetData(GetDataRequest) returns (Data) {
-  ///         option (google.api.http).get = "/v2/{resource=**}";
-  ///       }
-  ///     }
-  ///
-  /// Example of a mixin configuration:
-  ///
-  ///     apis:
-  ///     - name: google.storage.v2.Storage
-  ///       mixins:
-  ///       - name: google.acl.v1.AccessControl
-  ///
-  /// The mixin construct implies that all methods in `AccessControl` are
-  /// also declared with same name and request/response types in
-  /// `Storage`. A documentation generator or annotation processor will
-  /// see the effective `Storage.GetAcl` method after inheriting
-  /// documentation and annotations as follows:
-  ///
-  ///     service Storage {
-  ///       // Get the underlying ACL object.
-  ///       rpc GetAcl(GetAclRequest) returns (Acl) {
-  ///         option (google.api.http).get = "/v2/{resource=**}:getAcl";
-  ///       }
-  ///       ...
-  ///     }
-  ///
-  /// Note how the version in the path pattern changed from `v1` to `v2`.
-  ///
-  /// If the `root` field in the mixin is specified, it should be a
-  /// relative path under which inherited HTTP paths are placed. Example:
-  ///
-  ///     apis:
-  ///     - name: google.storage.v2.Storage
-  ///       mixins:
-  ///       - name: google.acl.v1.AccessControl
-  ///         root: acls
-  ///
-  /// This implies the following inherited HTTP annotation:
-  ///
-  ///     service Storage {
-  ///       // Get the underlying ACL object.
-  ///       rpc GetAcl(GetAclRequest) returns (Acl) {
-  ///         option (google.api.http).get = "/v2/acls/{resource=**}:getAcl";
-  ///       }
-  ///       ...
-  ///     }
-  /// </summary>
-  public sealed partial class Mixin : pb::IMessage<Mixin>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<Mixin> _parser = new pb::MessageParser<Mixin>(() => new Mixin());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<Mixin> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.WellKnownTypes.ApiReflection.Descriptor.MessageTypes[2]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Mixin() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Mixin(Mixin other) : this() {
-      name_ = other.name_;
-      root_ = other.root_;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Mixin Clone() {
-      return new Mixin(this);
-    }
-
-    /// <summary>Field number for the "name" field.</summary>
-    public const int NameFieldNumber = 1;
-    private string name_ = "";
-    /// <summary>
-    /// The fully qualified name of the interface which is included.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string Name {
-      get { return name_; }
-      set {
-        name_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-
-    /// <summary>Field number for the "root" field.</summary>
-    public const int RootFieldNumber = 2;
-    private string root_ = "";
-    /// <summary>
-    /// If non-empty specifies a path under which inherited HTTP paths
-    /// are rooted.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string Root {
-      get { return root_; }
-      set {
-        root_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as Mixin);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(Mixin other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (Name != other.Name) return false;
-      if (Root != other.Root) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (Name.Length != 0) hash ^= Name.GetHashCode();
-      if (Root.Length != 0) hash ^= Root.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (Name.Length != 0) {
-        output.WriteRawTag(10);
-        output.WriteString(Name);
-      }
-      if (Root.Length != 0) {
-        output.WriteRawTag(18);
-        output.WriteString(Root);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (Name.Length != 0) {
-        output.WriteRawTag(10);
-        output.WriteString(Name);
-      }
-      if (Root.Length != 0) {
-        output.WriteRawTag(18);
-        output.WriteString(Root);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (Name.Length != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(Name);
-      }
-      if (Root.Length != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(Root);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(Mixin other) {
-      if (other == null) {
-        return;
-      }
-      if (other.Name.Length != 0) {
-        Name = other.Name;
-      }
-      if (other.Root.Length != 0) {
-        Root = other.Root;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 10: {
-            Name = input.ReadString();
-            break;
-          }
-          case 18: {
-            Root = input.ReadString();
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 10: {
-            Name = input.ReadString();
-            break;
-          }
-          case 18: {
-            Root = input.ReadString();
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  #endregion
-
-}
-
-#endregion Designer generated code
diff --git a/libs/protobuf/csharp/src/Google.Protobuf/WellKnownTypes/Duration.cs b/libs/protobuf/csharp/src/Google.Protobuf/WellKnownTypes/Duration.cs
deleted file mode 100644
index 576ef2e..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf/WellKnownTypes/Duration.cs
+++ /dev/null
@@ -1,346 +0,0 @@
-// <auto-generated>
-//     Generated by the protocol buffer compiler.  DO NOT EDIT!
-//     source: google/protobuf/duration.proto
-// </auto-generated>
-#pragma warning disable 1591, 0612, 3021, 8981
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-namespace Google.Protobuf.WellKnownTypes {
-
-  /// <summary>Holder for reflection information generated from google/protobuf/duration.proto</summary>
-  public static partial class DurationReflection {
-
-    #region Descriptor
-    /// <summary>File descriptor for google/protobuf/duration.proto</summary>
-    public static pbr::FileDescriptor Descriptor {
-      get { return descriptor; }
-    }
-    private static pbr::FileDescriptor descriptor;
-
-    static DurationReflection() {
-      byte[] descriptorData = global::System.Convert.FromBase64String(
-          string.Concat(
-            "Ch5nb29nbGUvcHJvdG9idWYvZHVyYXRpb24ucHJvdG8SD2dvb2dsZS5wcm90",
-            "b2J1ZiIqCghEdXJhdGlvbhIPCgdzZWNvbmRzGAEgASgDEg0KBW5hbm9zGAIg",
-            "ASgFQoMBChNjb20uZ29vZ2xlLnByb3RvYnVmQg1EdXJhdGlvblByb3RvUAFa",
-            "MWdvb2dsZS5nb2xhbmcub3JnL3Byb3RvYnVmL3R5cGVzL2tub3duL2R1cmF0",
-            "aW9ucGL4AQGiAgNHUEKqAh5Hb29nbGUuUHJvdG9idWYuV2VsbEtub3duVHlw",
-            "ZXNiBnByb3RvMw=="));
-      descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-          new pbr::FileDescriptor[] { },
-          new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.WellKnownTypes.Duration), global::Google.Protobuf.WellKnownTypes.Duration.Parser, new[]{ "Seconds", "Nanos" }, null, null, null, null)
-          }));
-    }
-    #endregion
-
-  }
-  #region Messages
-  /// <summary>
-  /// A Duration represents a signed, fixed-length span of time represented
-  /// as a count of seconds and fractions of seconds at nanosecond
-  /// resolution. It is independent of any calendar and concepts like "day"
-  /// or "month". It is related to Timestamp in that the difference between
-  /// two Timestamp values is a Duration and it can be added or subtracted
-  /// from a Timestamp. Range is approximately +-10,000 years.
-  ///
-  /// # Examples
-  ///
-  /// Example 1: Compute Duration from two Timestamps in pseudo code.
-  ///
-  ///     Timestamp start = ...;
-  ///     Timestamp end = ...;
-  ///     Duration duration = ...;
-  ///
-  ///     duration.seconds = end.seconds - start.seconds;
-  ///     duration.nanos = end.nanos - start.nanos;
-  ///
-  ///     if (duration.seconds &lt; 0 &amp;&amp; duration.nanos > 0) {
-  ///       duration.seconds += 1;
-  ///       duration.nanos -= 1000000000;
-  ///     } else if (duration.seconds > 0 &amp;&amp; duration.nanos &lt; 0) {
-  ///       duration.seconds -= 1;
-  ///       duration.nanos += 1000000000;
-  ///     }
-  ///
-  /// Example 2: Compute Timestamp from Timestamp + Duration in pseudo code.
-  ///
-  ///     Timestamp start = ...;
-  ///     Duration duration = ...;
-  ///     Timestamp end = ...;
-  ///
-  ///     end.seconds = start.seconds + duration.seconds;
-  ///     end.nanos = start.nanos + duration.nanos;
-  ///
-  ///     if (end.nanos &lt; 0) {
-  ///       end.seconds -= 1;
-  ///       end.nanos += 1000000000;
-  ///     } else if (end.nanos >= 1000000000) {
-  ///       end.seconds += 1;
-  ///       end.nanos -= 1000000000;
-  ///     }
-  ///
-  /// Example 3: Compute Duration from datetime.timedelta in Python.
-  ///
-  ///     td = datetime.timedelta(days=3, minutes=10)
-  ///     duration = Duration()
-  ///     duration.FromTimedelta(td)
-  ///
-  /// # JSON Mapping
-  ///
-  /// In JSON format, the Duration type is encoded as a string rather than an
-  /// object, where the string ends in the suffix "s" (indicating seconds) and
-  /// is preceded by the number of seconds, with nanoseconds expressed as
-  /// fractional seconds. For example, 3 seconds with 0 nanoseconds should be
-  /// encoded in JSON format as "3s", while 3 seconds and 1 nanosecond should
-  /// be expressed in JSON format as "3.000000001s", and 3 seconds and 1
-  /// microsecond should be expressed in JSON format as "3.000001s".
-  /// </summary>
-  public sealed partial class Duration : pb::IMessage<Duration>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<Duration> _parser = new pb::MessageParser<Duration>(() => new Duration());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<Duration> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.WellKnownTypes.DurationReflection.Descriptor.MessageTypes[0]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Duration() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Duration(Duration other) : this() {
-      seconds_ = other.seconds_;
-      nanos_ = other.nanos_;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Duration Clone() {
-      return new Duration(this);
-    }
-
-    /// <summary>Field number for the "seconds" field.</summary>
-    public const int SecondsFieldNumber = 1;
-    private long seconds_;
-    /// <summary>
-    /// Signed seconds of the span of time. Must be from -315,576,000,000
-    /// to +315,576,000,000 inclusive. Note: these bounds are computed from:
-    /// 60 sec/min * 60 min/hr * 24 hr/day * 365.25 days/year * 10000 years
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public long Seconds {
-      get { return seconds_; }
-      set {
-        seconds_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "nanos" field.</summary>
-    public const int NanosFieldNumber = 2;
-    private int nanos_;
-    /// <summary>
-    /// Signed fractions of a second at nanosecond resolution of the span
-    /// of time. Durations less than one second are represented with a 0
-    /// `seconds` field and a positive or negative `nanos` field. For durations
-    /// of one second or more, a non-zero value for the `nanos` field must be
-    /// of the same sign as the `seconds` field. Must be from -999,999,999
-    /// to +999,999,999 inclusive.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int Nanos {
-      get { return nanos_; }
-      set {
-        nanos_ = value;
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as Duration);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(Duration other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (Seconds != other.Seconds) return false;
-      if (Nanos != other.Nanos) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (Seconds != 0L) hash ^= Seconds.GetHashCode();
-      if (Nanos != 0) hash ^= Nanos.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (Seconds != 0L) {
-        output.WriteRawTag(8);
-        output.WriteInt64(Seconds);
-      }
-      if (Nanos != 0) {
-        output.WriteRawTag(16);
-        output.WriteInt32(Nanos);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (Seconds != 0L) {
-        output.WriteRawTag(8);
-        output.WriteInt64(Seconds);
-      }
-      if (Nanos != 0) {
-        output.WriteRawTag(16);
-        output.WriteInt32(Nanos);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (Seconds != 0L) {
-        size += 1 + pb::CodedOutputStream.ComputeInt64Size(Seconds);
-      }
-      if (Nanos != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(Nanos);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(Duration other) {
-      if (other == null) {
-        return;
-      }
-      if (other.Seconds != 0L) {
-        Seconds = other.Seconds;
-      }
-      if (other.Nanos != 0) {
-        Nanos = other.Nanos;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 8: {
-            Seconds = input.ReadInt64();
-            break;
-          }
-          case 16: {
-            Nanos = input.ReadInt32();
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 8: {
-            Seconds = input.ReadInt64();
-            break;
-          }
-          case 16: {
-            Nanos = input.ReadInt32();
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  #endregion
-
-}
-
-#endregion Designer generated code
diff --git a/libs/protobuf/csharp/src/Google.Protobuf/WellKnownTypes/DurationPartial.cs b/libs/protobuf/csharp/src/Google.Protobuf/WellKnownTypes/DurationPartial.cs
deleted file mode 100644
index 9a468fc..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf/WellKnownTypes/DurationPartial.cs
+++ /dev/null
@@ -1,270 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-using System.Globalization;
-using System.Text;
-
-namespace Google.Protobuf.WellKnownTypes
-{
-    // Manually-written partial class for the Duration well-known type,
-    // providing a conversion to TimeSpan and convenience operators.
-    public partial class Duration : ICustomDiagnosticMessage
-    {
-        /// <summary>
-        /// The number of nanoseconds in a second.
-        /// </summary>
-        public const int NanosecondsPerSecond = 1000000000;
-        /// <summary>
-        /// The number of nanoseconds in a BCL tick (as used by <see cref="TimeSpan"/> and <see cref="DateTime"/>).
-        /// </summary>
-        public const int NanosecondsPerTick = 100;
-
-        /// <summary>
-        /// The maximum permitted number of seconds.
-        /// </summary>
-        public const long MaxSeconds = 315576000000L;
-
-        /// <summary>
-        /// The minimum permitted number of seconds.
-        /// </summary>
-        public const long MinSeconds = -315576000000L;
-
-        internal const int MaxNanoseconds = NanosecondsPerSecond - 1;
-        internal const int MinNanoseconds = -NanosecondsPerSecond + 1;
-
-        internal static bool IsNormalized(long seconds, int nanoseconds)
-        {
-            // Simple boundaries
-            if (seconds < MinSeconds || seconds > MaxSeconds ||
-                nanoseconds < MinNanoseconds || nanoseconds > MaxNanoseconds)
-            {
-                return false;
-            }
-            // We only have a problem is one is strictly negative and the other is
-            // strictly positive.
-            return Math.Sign(seconds) * Math.Sign(nanoseconds) != -1;
-        }
-
-        /// <summary>
-        /// Converts this <see cref="Duration"/> to a <see cref="TimeSpan"/>.
-        /// </summary>
-        /// <remarks>If the duration is not a precise number of ticks, it is truncated towards 0.</remarks>
-        /// <returns>The value of this duration, as a <c>TimeSpan</c>.</returns>
-        /// <exception cref="InvalidOperationException">This value isn't a valid normalized duration, as
-        /// described in the documentation.</exception>
-        public TimeSpan ToTimeSpan()
-        {
-            checked
-            {
-                if (!IsNormalized(Seconds, Nanos))
-                {
-                    throw new InvalidOperationException("Duration was not a valid normalized duration");
-                }
-                long ticks = Seconds * TimeSpan.TicksPerSecond + Nanos / NanosecondsPerTick;
-                return TimeSpan.FromTicks(ticks);
-            }
-        }
-
-        /// <summary>
-        /// Converts the given <see cref="TimeSpan"/> to a <see cref="Duration"/>.
-        /// </summary>
-        /// <param name="timeSpan">The <c>TimeSpan</c> to convert.</param>
-        /// <returns>The value of the given <c>TimeSpan</c>, as a <c>Duration</c>.</returns>
-        public static Duration FromTimeSpan(TimeSpan timeSpan)
-        {
-            checked
-            {
-                long ticks = timeSpan.Ticks;
-                long seconds = ticks / TimeSpan.TicksPerSecond;
-                int nanos = (int) (ticks % TimeSpan.TicksPerSecond) * NanosecondsPerTick;
-                return new Duration { Seconds = seconds, Nanos = nanos };
-            }
-        }
-
-        /// <summary>
-        /// Returns the result of negating the duration. For example, the negation of 5 minutes is -5 minutes.
-        /// </summary>
-        /// <param name="value">The duration to negate. Must not be null.</param>
-        /// <returns>The negated value of this duration.</returns>
-        public static Duration operator -(Duration value)
-        {
-            ProtoPreconditions.CheckNotNull(value, "value");
-            checked
-            {
-                return Normalize(-value.Seconds, -value.Nanos);
-            }
-        }
-
-        /// <summary>
-        /// Adds the two specified <see cref="Duration"/> values together.
-        /// </summary>
-        /// <param name="lhs">The first value to add. Must not be null.</param>
-        /// <param name="rhs">The second value to add. Must not be null.</param>
-        /// <returns></returns>
-        public static Duration operator +(Duration lhs, Duration rhs)
-        {
-            ProtoPreconditions.CheckNotNull(lhs, "lhs");
-            ProtoPreconditions.CheckNotNull(rhs, "rhs");
-            checked
-            {
-                return Normalize(lhs.Seconds + rhs.Seconds, lhs.Nanos + rhs.Nanos);
-            }
-        }
-
-        /// <summary>
-        /// Subtracts one <see cref="Duration"/> from another.
-        /// </summary>
-        /// <param name="lhs">The duration to subtract from. Must not be null.</param>
-        /// <param name="rhs">The duration to subtract. Must not be null.</param>
-        /// <returns>The difference between the two specified durations.</returns>
-        public static Duration operator -(Duration lhs, Duration rhs)
-        {
-            ProtoPreconditions.CheckNotNull(lhs, "lhs");
-            ProtoPreconditions.CheckNotNull(rhs, "rhs");
-            checked
-            {
-                return Normalize(lhs.Seconds - rhs.Seconds, lhs.Nanos - rhs.Nanos);
-            }
-        }
-
-        /// <summary>
-        /// Creates a duration with the normalized values from the given number of seconds and
-        /// nanoseconds, conforming with the description in the proto file.
-        /// </summary>
-        internal static Duration Normalize(long seconds, int nanoseconds)
-        {
-            // Ensure that nanoseconds is in the range (-1,000,000,000, +1,000,000,000)
-            int extraSeconds = nanoseconds / NanosecondsPerSecond;
-            seconds += extraSeconds;
-            nanoseconds -= extraSeconds * NanosecondsPerSecond;
-
-            // Now make sure that Sign(seconds) == Sign(nanoseconds) if Sign(seconds) != 0.
-            if (seconds < 0 && nanoseconds > 0)
-            {
-                seconds += 1;
-                nanoseconds -= NanosecondsPerSecond;
-            }
-            else if (seconds > 0 && nanoseconds < 0)
-            {
-                seconds -= 1;
-                nanoseconds += NanosecondsPerSecond;
-            }
-            return new Duration { Seconds = seconds, Nanos = nanoseconds };
-        }
-
-        /// <summary>
-        /// Converts a duration specified in seconds/nanoseconds to a string.
-        /// </summary>
-        /// <remarks>
-        /// If the value is a normalized duration in the range described in <c>duration.proto</c>,
-        /// <paramref name="diagnosticOnly"/> is ignored. Otherwise, if the parameter is <c>true</c>,
-        /// a JSON object with a warning is returned; if it is <c>false</c>, an <see cref="InvalidOperationException"/> is thrown.
-        /// </remarks>
-        /// <param name="seconds">Seconds portion of the duration.</param>
-        /// <param name="nanoseconds">Nanoseconds portion of the duration.</param>
-        /// <param name="diagnosticOnly">Determines the handling of non-normalized values</param>
-        /// <exception cref="InvalidOperationException">The represented duration is invalid, and <paramref name="diagnosticOnly"/> is <c>false</c>.</exception>
-        internal static string ToJson(long seconds, int nanoseconds, bool diagnosticOnly)
-        {
-            if (IsNormalized(seconds, nanoseconds))
-            {
-                var builder = new StringBuilder();
-                builder.Append('"');
-                // The seconds part will normally provide the minus sign if we need it, but not if it's 0...
-                if (seconds == 0 && nanoseconds < 0)
-                {
-                    builder.Append('-');
-                }
-
-                builder.Append(seconds.ToString("d", CultureInfo.InvariantCulture));
-                AppendNanoseconds(builder, Math.Abs(nanoseconds));
-                builder.Append("s\"");
-                return builder.ToString();
-            }
-            if (diagnosticOnly)
-            {
-                // Note: the double braces here are escaping for braces in format strings.
-                return string.Format(CultureInfo.InvariantCulture,
-                    "{{ \"@warning\": \"Invalid Duration\", \"seconds\": \"{0}\", \"nanos\": {1} }}",
-                    seconds,
-                    nanoseconds);
-            }
-            else
-            {
-                throw new InvalidOperationException("Non-normalized duration value");
-            }
-        }
-
-        /// <summary>
-        /// Returns a string representation of this <see cref="Duration"/> for diagnostic purposes.
-        /// </summary>
-        /// <remarks>
-        /// Normally the returned value will be a JSON string value (including leading and trailing quotes) but
-        /// when the value is non-normalized or out of range, a JSON object representation will be returned
-        /// instead, including a warning. This is to avoid exceptions being thrown when trying to
-        /// diagnose problems - the regular JSON formatter will still throw an exception for non-normalized
-        /// values.
-        /// </remarks>
-        /// <returns>A string representation of this value.</returns>
-        public string ToDiagnosticString()
-        {
-            return ToJson(Seconds, Nanos, true);
-        }
-
-        /// <summary>
-        /// Appends a number of nanoseconds to a StringBuilder. Either 0 digits are added (in which
-        /// case no "." is appended), or 3 6 or 9 digits. This is internal for use in Timestamp as well
-        /// as Duration.
-        /// </summary>
-        internal static void AppendNanoseconds(StringBuilder builder, int nanos)
-        {
-            if (nanos != 0)
-            {
-                builder.Append('.');
-                // Output to 3, 6 or 9 digits.
-                if (nanos % 1000000 == 0)
-                {
-                    builder.Append((nanos / 1000000).ToString("d3", CultureInfo.InvariantCulture));
-                }
-                else if (nanos % 1000 == 0)
-                {
-                    builder.Append((nanos / 1000).ToString("d6", CultureInfo.InvariantCulture));
-                }
-                else
-                {
-                    builder.Append(nanos.ToString("d9", CultureInfo.InvariantCulture));
-                }
-            }
-        }
-    }
-}
diff --git a/libs/protobuf/csharp/src/Google.Protobuf/WellKnownTypes/Empty.cs b/libs/protobuf/csharp/src/Google.Protobuf/WellKnownTypes/Empty.cs
deleted file mode 100644
index 43d2b74..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf/WellKnownTypes/Empty.cs
+++ /dev/null
@@ -1,207 +0,0 @@
-// <auto-generated>
-//     Generated by the protocol buffer compiler.  DO NOT EDIT!
-//     source: google/protobuf/empty.proto
-// </auto-generated>
-#pragma warning disable 1591, 0612, 3021, 8981
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-namespace Google.Protobuf.WellKnownTypes {
-
-  /// <summary>Holder for reflection information generated from google/protobuf/empty.proto</summary>
-  public static partial class EmptyReflection {
-
-    #region Descriptor
-    /// <summary>File descriptor for google/protobuf/empty.proto</summary>
-    public static pbr::FileDescriptor Descriptor {
-      get { return descriptor; }
-    }
-    private static pbr::FileDescriptor descriptor;
-
-    static EmptyReflection() {
-      byte[] descriptorData = global::System.Convert.FromBase64String(
-          string.Concat(
-            "Chtnb29nbGUvcHJvdG9idWYvZW1wdHkucHJvdG8SD2dvb2dsZS5wcm90b2J1",
-            "ZiIHCgVFbXB0eUJ9ChNjb20uZ29vZ2xlLnByb3RvYnVmQgpFbXB0eVByb3Rv",
-            "UAFaLmdvb2dsZS5nb2xhbmcub3JnL3Byb3RvYnVmL3R5cGVzL2tub3duL2Vt",
-            "cHR5cGL4AQGiAgNHUEKqAh5Hb29nbGUuUHJvdG9idWYuV2VsbEtub3duVHlw",
-            "ZXNiBnByb3RvMw=="));
-      descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-          new pbr::FileDescriptor[] { },
-          new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.WellKnownTypes.Empty), global::Google.Protobuf.WellKnownTypes.Empty.Parser, null, null, null, null, null)
-          }));
-    }
-    #endregion
-
-  }
-  #region Messages
-  /// <summary>
-  /// A generic empty message that you can re-use to avoid defining duplicated
-  /// empty messages in your APIs. A typical example is to use it as the request
-  /// or the response type of an API method. For instance:
-  ///
-  ///     service Foo {
-  ///       rpc Bar(google.protobuf.Empty) returns (google.protobuf.Empty);
-  ///     }
-  /// </summary>
-  public sealed partial class Empty : pb::IMessage<Empty>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<Empty> _parser = new pb::MessageParser<Empty>(() => new Empty());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<Empty> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.WellKnownTypes.EmptyReflection.Descriptor.MessageTypes[0]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Empty() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Empty(Empty other) : this() {
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Empty Clone() {
-      return new Empty(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as Empty);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(Empty other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(Empty other) {
-      if (other == null) {
-        return;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-        }
-      }
-    }
-    #endif
-
-  }
-
-  #endregion
-
-}
-
-#endregion Designer generated code
diff --git a/libs/protobuf/csharp/src/Google.Protobuf/WellKnownTypes/FieldMask.cs b/libs/protobuf/csharp/src/Google.Protobuf/WellKnownTypes/FieldMask.cs
deleted file mode 100644
index 19e0e6e..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf/WellKnownTypes/FieldMask.cs
+++ /dev/null
@@ -1,427 +0,0 @@
-// <auto-generated>
-//     Generated by the protocol buffer compiler.  DO NOT EDIT!
-//     source: google/protobuf/field_mask.proto
-// </auto-generated>
-#pragma warning disable 1591, 0612, 3021, 8981
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-namespace Google.Protobuf.WellKnownTypes {
-
-  /// <summary>Holder for reflection information generated from google/protobuf/field_mask.proto</summary>
-  public static partial class FieldMaskReflection {
-
-    #region Descriptor
-    /// <summary>File descriptor for google/protobuf/field_mask.proto</summary>
-    public static pbr::FileDescriptor Descriptor {
-      get { return descriptor; }
-    }
-    private static pbr::FileDescriptor descriptor;
-
-    static FieldMaskReflection() {
-      byte[] descriptorData = global::System.Convert.FromBase64String(
-          string.Concat(
-            "CiBnb29nbGUvcHJvdG9idWYvZmllbGRfbWFzay5wcm90bxIPZ29vZ2xlLnBy",
-            "b3RvYnVmIhoKCUZpZWxkTWFzaxINCgVwYXRocxgBIAMoCUKFAQoTY29tLmdv",
-            "b2dsZS5wcm90b2J1ZkIORmllbGRNYXNrUHJvdG9QAVoyZ29vZ2xlLmdvbGFu",
-            "Zy5vcmcvcHJvdG9idWYvdHlwZXMva25vd24vZmllbGRtYXNrcGL4AQGiAgNH",
-            "UEKqAh5Hb29nbGUuUHJvdG9idWYuV2VsbEtub3duVHlwZXNiBnByb3RvMw=="));
-      descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-          new pbr::FileDescriptor[] { },
-          new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.WellKnownTypes.FieldMask), global::Google.Protobuf.WellKnownTypes.FieldMask.Parser, new[]{ "Paths" }, null, null, null, null)
-          }));
-    }
-    #endregion
-
-  }
-  #region Messages
-  /// <summary>
-  /// `FieldMask` represents a set of symbolic field paths, for example:
-  ///
-  ///     paths: "f.a"
-  ///     paths: "f.b.d"
-  ///
-  /// Here `f` represents a field in some root message, `a` and `b`
-  /// fields in the message found in `f`, and `d` a field found in the
-  /// message in `f.b`.
-  ///
-  /// Field masks are used to specify a subset of fields that should be
-  /// returned by a get operation or modified by an update operation.
-  /// Field masks also have a custom JSON encoding (see below).
-  ///
-  /// # Field Masks in Projections
-  ///
-  /// When used in the context of a projection, a response message or
-  /// sub-message is filtered by the API to only contain those fields as
-  /// specified in the mask. For example, if the mask in the previous
-  /// example is applied to a response message as follows:
-  ///
-  ///     f {
-  ///       a : 22
-  ///       b {
-  ///         d : 1
-  ///         x : 2
-  ///       }
-  ///       y : 13
-  ///     }
-  ///     z: 8
-  ///
-  /// The result will not contain specific values for fields x,y and z
-  /// (their value will be set to the default, and omitted in proto text
-  /// output):
-  ///
-  ///     f {
-  ///       a : 22
-  ///       b {
-  ///         d : 1
-  ///       }
-  ///     }
-  ///
-  /// A repeated field is not allowed except at the last position of a
-  /// paths string.
-  ///
-  /// If a FieldMask object is not present in a get operation, the
-  /// operation applies to all fields (as if a FieldMask of all fields
-  /// had been specified).
-  ///
-  /// Note that a field mask does not necessarily apply to the
-  /// top-level response message. In case of a REST get operation, the
-  /// field mask applies directly to the response, but in case of a REST
-  /// list operation, the mask instead applies to each individual message
-  /// in the returned resource list. In case of a REST custom method,
-  /// other definitions may be used. Where the mask applies will be
-  /// clearly documented together with its declaration in the API.  In
-  /// any case, the effect on the returned resource/resources is required
-  /// behavior for APIs.
-  ///
-  /// # Field Masks in Update Operations
-  ///
-  /// A field mask in update operations specifies which fields of the
-  /// targeted resource are going to be updated. The API is required
-  /// to only change the values of the fields as specified in the mask
-  /// and leave the others untouched. If a resource is passed in to
-  /// describe the updated values, the API ignores the values of all
-  /// fields not covered by the mask.
-  ///
-  /// If a repeated field is specified for an update operation, new values will
-  /// be appended to the existing repeated field in the target resource. Note that
-  /// a repeated field is only allowed in the last position of a `paths` string.
-  ///
-  /// If a sub-message is specified in the last position of the field mask for an
-  /// update operation, then new value will be merged into the existing sub-message
-  /// in the target resource.
-  ///
-  /// For example, given the target message:
-  ///
-  ///     f {
-  ///       b {
-  ///         d: 1
-  ///         x: 2
-  ///       }
-  ///       c: [1]
-  ///     }
-  ///
-  /// And an update message:
-  ///
-  ///     f {
-  ///       b {
-  ///         d: 10
-  ///       }
-  ///       c: [2]
-  ///     }
-  ///
-  /// then if the field mask is:
-  ///
-  ///  paths: ["f.b", "f.c"]
-  ///
-  /// then the result will be:
-  ///
-  ///     f {
-  ///       b {
-  ///         d: 10
-  ///         x: 2
-  ///       }
-  ///       c: [1, 2]
-  ///     }
-  ///
-  /// An implementation may provide options to override this default behavior for
-  /// repeated and message fields.
-  ///
-  /// In order to reset a field's value to the default, the field must
-  /// be in the mask and set to the default value in the provided resource.
-  /// Hence, in order to reset all fields of a resource, provide a default
-  /// instance of the resource and set all fields in the mask, or do
-  /// not provide a mask as described below.
-  ///
-  /// If a field mask is not present on update, the operation applies to
-  /// all fields (as if a field mask of all fields has been specified).
-  /// Note that in the presence of schema evolution, this may mean that
-  /// fields the client does not know and has therefore not filled into
-  /// the request will be reset to their default. If this is unwanted
-  /// behavior, a specific service may require a client to always specify
-  /// a field mask, producing an error if not.
-  ///
-  /// As with get operations, the location of the resource which
-  /// describes the updated values in the request message depends on the
-  /// operation kind. In any case, the effect of the field mask is
-  /// required to be honored by the API.
-  ///
-  /// ## Considerations for HTTP REST
-  ///
-  /// The HTTP kind of an update operation which uses a field mask must
-  /// be set to PATCH instead of PUT in order to satisfy HTTP semantics
-  /// (PUT must only be used for full updates).
-  ///
-  /// # JSON Encoding of Field Masks
-  ///
-  /// In JSON, a field mask is encoded as a single string where paths are
-  /// separated by a comma. Fields name in each path are converted
-  /// to/from lower-camel naming conventions.
-  ///
-  /// As an example, consider the following message declarations:
-  ///
-  ///     message Profile {
-  ///       User user = 1;
-  ///       Photo photo = 2;
-  ///     }
-  ///     message User {
-  ///       string display_name = 1;
-  ///       string address = 2;
-  ///     }
-  ///
-  /// In proto a field mask for `Profile` may look as such:
-  ///
-  ///     mask {
-  ///       paths: "user.display_name"
-  ///       paths: "photo"
-  ///     }
-  ///
-  /// In JSON, the same mask is represented as below:
-  ///
-  ///     {
-  ///       mask: "user.displayName,photo"
-  ///     }
-  ///
-  /// # Field Masks and Oneof Fields
-  ///
-  /// Field masks treat fields in oneofs just as regular fields. Consider the
-  /// following message:
-  ///
-  ///     message SampleMessage {
-  ///       oneof test_oneof {
-  ///         string name = 4;
-  ///         SubMessage sub_message = 9;
-  ///       }
-  ///     }
-  ///
-  /// The field mask can be:
-  ///
-  ///     mask {
-  ///       paths: "name"
-  ///     }
-  ///
-  /// Or:
-  ///
-  ///     mask {
-  ///       paths: "sub_message"
-  ///     }
-  ///
-  /// Note that oneof type names ("test_oneof" in this case) cannot be used in
-  /// paths.
-  ///
-  /// ## Field Mask Verification
-  ///
-  /// The implementation of any API method which has a FieldMask type field in the
-  /// request should verify the included field paths, and return an
-  /// `INVALID_ARGUMENT` error if any path is unmappable.
-  /// </summary>
-  public sealed partial class FieldMask : pb::IMessage<FieldMask>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<FieldMask> _parser = new pb::MessageParser<FieldMask>(() => new FieldMask());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<FieldMask> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.WellKnownTypes.FieldMaskReflection.Descriptor.MessageTypes[0]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public FieldMask() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public FieldMask(FieldMask other) : this() {
-      paths_ = other.paths_.Clone();
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public FieldMask Clone() {
-      return new FieldMask(this);
-    }
-
-    /// <summary>Field number for the "paths" field.</summary>
-    public const int PathsFieldNumber = 1;
-    private static readonly pb::FieldCodec<string> _repeated_paths_codec
-        = pb::FieldCodec.ForString(10);
-    private readonly pbc::RepeatedField<string> paths_ = new pbc::RepeatedField<string>();
-    /// <summary>
-    /// The set of field mask paths.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<string> Paths {
-      get { return paths_; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as FieldMask);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(FieldMask other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if(!paths_.Equals(other.paths_)) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      hash ^= paths_.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      paths_.WriteTo(output, _repeated_paths_codec);
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      paths_.WriteTo(ref output, _repeated_paths_codec);
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      size += paths_.CalculateSize(_repeated_paths_codec);
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(FieldMask other) {
-      if (other == null) {
-        return;
-      }
-      paths_.Add(other.paths_);
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 10: {
-            paths_.AddEntriesFrom(input, _repeated_paths_codec);
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 10: {
-            paths_.AddEntriesFrom(ref input, _repeated_paths_codec);
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  #endregion
-
-}
-
-#endregion Designer generated code
diff --git a/libs/protobuf/csharp/src/Google.Protobuf/WellKnownTypes/FieldMaskPartial.cs b/libs/protobuf/csharp/src/Google.Protobuf/WellKnownTypes/FieldMaskPartial.cs
deleted file mode 100644
index 58a33cb..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf/WellKnownTypes/FieldMaskPartial.cs
+++ /dev/null
@@ -1,371 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2016 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.IO;
-using System.Linq;
-using Google.Protobuf.Reflection;
-
-namespace Google.Protobuf.WellKnownTypes
-{
-    // Manually-written partial class for the FieldMask well-known type.
-    public partial class FieldMask : ICustomDiagnosticMessage
-    {
-        private const char FIELD_PATH_SEPARATOR = ',';
-        private const char FIELD_SEPARATOR_REGEX = '.';
-
-        /// <summary>
-        /// Converts a field mask specified by paths to a string.
-        /// </summary>
-        /// <remarks>
-        /// If the value is a normalized duration in the range described in <c>field_mask.proto</c>,
-        /// <paramref name="diagnosticOnly"/> is ignored. Otherwise, if the parameter is <c>true</c>,
-        /// a JSON object with a warning is returned; if it is <c>false</c>, an <see cref="InvalidOperationException"/> is thrown.
-        /// </remarks>
-        /// <param name="paths">Paths in the field mask</param>
-        /// <param name="diagnosticOnly">Determines the handling of non-normalized values</param>
-        /// <exception cref="InvalidOperationException">The represented field mask is invalid, and <paramref name="diagnosticOnly"/> is <c>false</c>.</exception>
-        internal static string ToJson(IList<string> paths, bool diagnosticOnly)
-        {
-            var firstInvalid = paths.FirstOrDefault(p => !IsPathValid(p));
-            if (firstInvalid == null)
-            {
-                var writer = new StringWriter();
-#if NET35
-                var query = paths.Select(JsonFormatter.ToJsonName);
-                JsonFormatter.WriteString(writer, string.Join(",", query.ToArray()));
-#else
-                JsonFormatter.WriteString(writer, string.Join(",", paths.Select(JsonFormatter.ToJsonName)));
-#endif
-                return writer.ToString();
-            }
-            else
-            {
-                if (diagnosticOnly)
-                {
-                    var writer = new StringWriter();
-                    writer.Write("{ \"@warning\": \"Invalid FieldMask\", \"paths\": ");
-                    JsonFormatter.Default.WriteList(writer, (IList)paths);
-                    writer.Write(" }");
-                    return writer.ToString();
-                }
-                else
-                {
-                    throw new InvalidOperationException($"Invalid field mask to be converted to JSON: {firstInvalid}");
-                }
-            }
-        }
-
-        /// <summary>
-        /// Returns a string representation of this <see cref="FieldMask"/> for diagnostic purposes.
-        /// </summary>
-        /// <remarks>
-        /// Normally the returned value will be a JSON string value (including leading and trailing quotes) but
-        /// when the value is non-normalized or out of range, a JSON object representation will be returned
-        /// instead, including a warning. This is to avoid exceptions being thrown when trying to
-        /// diagnose problems - the regular JSON formatter will still throw an exception for non-normalized
-        /// values.
-        /// </remarks>
-        /// <returns>A string representation of this value.</returns>
-        public string ToDiagnosticString()
-        {
-            return ToJson(Paths, true);
-        }
-
-        /// <summary>
-        /// Parses from a string to a FieldMask.
-        /// </summary>
-        public static FieldMask FromString(string value)
-        {
-            return FromStringEnumerable<Empty>(new List<string>(value.Split(FIELD_PATH_SEPARATOR)));
-        }
-
-        /// <summary>
-        /// Parses from a string to a FieldMask and validates all field paths.
-        /// </summary>
-        /// <typeparam name="T">The type to validate the field paths against.</typeparam>
-        public static FieldMask FromString<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicParameterlessConstructor)]T>(string value) where T : IMessage
-        {
-            return FromStringEnumerable<T>(new List<string>(value.Split(FIELD_PATH_SEPARATOR)));
-        }
-
-        /// <summary>
-        /// Constructs a FieldMask for a list of field paths in a certain type.
-        /// </summary>
-        /// <typeparam name="T">The type to validate the field paths against.</typeparam>
-        public static FieldMask FromStringEnumerable<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicParameterlessConstructor)]T>(IEnumerable<string> paths) where T : IMessage
-        {
-            var mask = new FieldMask();
-            foreach (var path in paths)
-            {
-                if (path.Length == 0)
-                {
-                    // Ignore empty field paths.
-                    continue;
-                }
-
-                if (typeof(T) != typeof(Empty)
-                    && !IsValid<T>(path))
-                {
-                    throw new InvalidProtocolBufferException(path + " is not a valid path for " + typeof(T));
-                }
-
-                mask.Paths.Add(path);
-            }
-
-            return mask;
-        }
-
-        /// <summary>
-        /// Constructs a FieldMask from the passed field numbers.
-        /// </summary>
-        /// <typeparam name="T">The type to validate the field paths against.</typeparam>
-        public static FieldMask FromFieldNumbers<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicParameterlessConstructor)]T>(params int[] fieldNumbers) where T : IMessage
-        {
-            return FromFieldNumbers<T>((IEnumerable<int>)fieldNumbers);
-        }
-
-        /// <summary>
-        /// Constructs a FieldMask from the passed field numbers.
-        /// </summary>
-        /// <typeparam name="T">The type to validate the field paths against.</typeparam>
-        public static FieldMask FromFieldNumbers<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicParameterlessConstructor)]T>(IEnumerable<int> fieldNumbers) where T : IMessage
-        {
-            var descriptor = Activator.CreateInstance<T>().Descriptor;
-
-            var mask = new FieldMask();
-            foreach (var fieldNumber in fieldNumbers)
-            {
-                var field = descriptor.FindFieldByNumber(fieldNumber);
-                if (field == null)
-                {
-                    throw new ArgumentNullException($"{fieldNumber} is not a valid field number for {descriptor.Name}");
-                }
-
-                mask.Paths.Add(field.Name);
-            }
-
-            return mask;
-        }
-
-        /// <summary>
-        /// Checks whether the given path is valid for a field mask.
-        /// </summary>
-        /// <returns>true if the path is valid; false otherwise</returns>
-        private static bool IsPathValid(string input)
-        {
-            for (int i = 0; i < input.Length; i++)
-            {
-                char c = input[i];
-                if (c >= 'A' && c <= 'Z')
-                {
-                    return false;
-                }
-                if (c == '_' && i < input.Length - 1)
-                {
-                    char next = input[i + 1];
-                    if (next < 'a' || next > 'z')
-                    {
-                        return false;
-                    }
-                }
-            }
-            return true;
-        }
-
-        /// <summary>
-        /// Checks whether paths in a given fields mask are valid.
-        /// </summary>
-        /// <typeparam name="T">The type to validate the field paths against.</typeparam>
-        public static bool IsValid<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicParameterlessConstructor)]T>(FieldMask fieldMask) where T : IMessage
-        {
-            var descriptor = Activator.CreateInstance<T>().Descriptor;
-
-            return IsValid(descriptor, fieldMask);
-        }
-
-        /// <summary>
-        /// Checks whether paths in a given fields mask are valid.
-        /// </summary>
-        public static bool IsValid(MessageDescriptor descriptor, FieldMask fieldMask)
-        {
-            foreach (var path in fieldMask.Paths)
-            {
-                if (!IsValid(descriptor, path))
-                {
-                    return false;
-                }
-            }
-
-            return true;
-        }
-
-        /// <summary>
-        /// Checks whether a given field path is valid.
-        /// </summary>
-        /// <typeparam name="T">The type to validate the field paths against.</typeparam>
-        public static bool IsValid<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicParameterlessConstructor)]T>(string path) where T : IMessage
-        {
-            var descriptor = Activator.CreateInstance<T>().Descriptor;
-
-            return IsValid(descriptor, path);
-        }
-
-        /// <summary>
-        /// Checks whether paths in a given fields mask are valid.
-        /// </summary>
-        public static bool IsValid(MessageDescriptor descriptor, string path)
-        {
-            var parts = path.Split(FIELD_SEPARATOR_REGEX);
-            if (parts.Length == 0)
-            {
-                return false;
-            }
-
-            foreach (var name in parts)
-            {
-                var field = descriptor?.FindFieldByName(name);
-                if (field == null)
-                {
-                    return false;
-                }
-
-                if (!field.IsRepeated
-                    && field.FieldType == FieldType.Message)
-                {
-                    descriptor = field.MessageType;
-                }
-                else
-                {
-                    descriptor = null;
-                }
-            }
-
-            return true;
-        }
-
-        /// <summary>
-        /// Converts this FieldMask to its canonical form. In the canonical form of a
-        /// FieldMask, all field paths are sorted alphabetically and redundant field
-        /// paths are removed.
-        /// </summary>
-        public FieldMask Normalize()
-        {
-            return new FieldMaskTree(this).ToFieldMask();
-        }
-
-        /// <summary>
-        /// Creates a union of two or more FieldMasks.
-        /// </summary>
-        public FieldMask Union(params FieldMask[] otherMasks)
-        {
-            var maskTree = new FieldMaskTree(this);
-            foreach (var mask in otherMasks)
-            {
-                maskTree.MergeFromFieldMask(mask);
-            }
-
-            return maskTree.ToFieldMask();
-        }
-
-        /// <summary>
-        /// Calculates the intersection of two FieldMasks.
-        /// </summary>
-        public FieldMask Intersection(FieldMask additionalMask)
-        {
-            var tree = new FieldMaskTree(this);
-            var result = new FieldMaskTree();
-            foreach (var path in additionalMask.Paths)
-            {
-                tree.IntersectFieldPath(path, result);
-            }
-
-            return result.ToFieldMask();
-        }
-
-        /// <summary>
-        /// Merges fields specified by this FieldMask from one message to another with the
-        /// specified merge options.
-        /// </summary>
-        public void Merge(IMessage source, IMessage destination, MergeOptions options)
-        {
-            new FieldMaskTree(this).Merge(source, destination, options);
-        }
-
-        /// <summary>
-        /// Merges fields specified by this FieldMask from one message to another.
-        /// </summary>
-        public void Merge(IMessage source, IMessage destination)
-        {
-            Merge(source, destination, new MergeOptions());
-        }
-
-        /// <summary>
-        /// Options to customize merging behavior.
-        /// </summary>
-        public sealed class MergeOptions
-        {
-            /// <summary>
-            /// Whether to replace message fields(i.e., discard existing content in
-            /// destination message fields) when merging.
-            /// Default behavior is to merge the source message field into the
-            /// destination message field.
-            /// </summary>
-            public bool ReplaceMessageFields { get; set; } = false;
-
-            /// <summary>
-            /// Whether to replace repeated fields (i.e., discard existing content in
-            /// destination repeated fields) when merging.
-            /// Default behavior is to append elements from source repeated field to the
-            /// destination repeated field.
-            /// </summary>
-            public bool ReplaceRepeatedFields { get; set; } = false;
-
-            /// <summary>
-            /// Whether to replace primitive (non-repeated and non-message) fields in
-            /// destination message fields with the source primitive fields (i.e., if the
-            /// field is set in the source, the value is copied to the
-            /// destination; if the field is unset in the source, the field is cleared
-            /// from the destination) when merging.
-            ///
-            /// Default behavior is to always set the value of the source primitive
-            /// field to the destination primitive field, and if the source field is
-            /// unset, the default value of the source field is copied to the
-            /// destination.
-            /// </summary>
-            public bool ReplacePrimitiveFields { get; set; } = false;
-        }
-    }
-}
diff --git a/libs/protobuf/csharp/src/Google.Protobuf/WellKnownTypes/SourceContext.cs b/libs/protobuf/csharp/src/Google.Protobuf/WellKnownTypes/SourceContext.cs
deleted file mode 100644
index 6edd4f1..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf/WellKnownTypes/SourceContext.cs
+++ /dev/null
@@ -1,244 +0,0 @@
-// <auto-generated>
-//     Generated by the protocol buffer compiler.  DO NOT EDIT!
-//     source: google/protobuf/source_context.proto
-// </auto-generated>
-#pragma warning disable 1591, 0612, 3021, 8981
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-namespace Google.Protobuf.WellKnownTypes {
-
-  /// <summary>Holder for reflection information generated from google/protobuf/source_context.proto</summary>
-  public static partial class SourceContextReflection {
-
-    #region Descriptor
-    /// <summary>File descriptor for google/protobuf/source_context.proto</summary>
-    public static pbr::FileDescriptor Descriptor {
-      get { return descriptor; }
-    }
-    private static pbr::FileDescriptor descriptor;
-
-    static SourceContextReflection() {
-      byte[] descriptorData = global::System.Convert.FromBase64String(
-          string.Concat(
-            "CiRnb29nbGUvcHJvdG9idWYvc291cmNlX2NvbnRleHQucHJvdG8SD2dvb2ds",
-            "ZS5wcm90b2J1ZiIiCg1Tb3VyY2VDb250ZXh0EhEKCWZpbGVfbmFtZRgBIAEo",
-            "CUKKAQoTY29tLmdvb2dsZS5wcm90b2J1ZkISU291cmNlQ29udGV4dFByb3Rv",
-            "UAFaNmdvb2dsZS5nb2xhbmcub3JnL3Byb3RvYnVmL3R5cGVzL2tub3duL3Nv",
-            "dXJjZWNvbnRleHRwYqICA0dQQqoCHkdvb2dsZS5Qcm90b2J1Zi5XZWxsS25v",
-            "d25UeXBlc2IGcHJvdG8z"));
-      descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-          new pbr::FileDescriptor[] { },
-          new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.WellKnownTypes.SourceContext), global::Google.Protobuf.WellKnownTypes.SourceContext.Parser, new[]{ "FileName" }, null, null, null, null)
-          }));
-    }
-    #endregion
-
-  }
-  #region Messages
-  /// <summary>
-  /// `SourceContext` represents information about the source of a
-  /// protobuf element, like the file in which it is defined.
-  /// </summary>
-  public sealed partial class SourceContext : pb::IMessage<SourceContext>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<SourceContext> _parser = new pb::MessageParser<SourceContext>(() => new SourceContext());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<SourceContext> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.WellKnownTypes.SourceContextReflection.Descriptor.MessageTypes[0]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public SourceContext() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public SourceContext(SourceContext other) : this() {
-      fileName_ = other.fileName_;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public SourceContext Clone() {
-      return new SourceContext(this);
-    }
-
-    /// <summary>Field number for the "file_name" field.</summary>
-    public const int FileNameFieldNumber = 1;
-    private string fileName_ = "";
-    /// <summary>
-    /// The path-qualified name of the .proto file that contained the associated
-    /// protobuf element.  For example: `"google/protobuf/source_context.proto"`.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string FileName {
-      get { return fileName_; }
-      set {
-        fileName_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as SourceContext);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(SourceContext other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (FileName != other.FileName) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (FileName.Length != 0) hash ^= FileName.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (FileName.Length != 0) {
-        output.WriteRawTag(10);
-        output.WriteString(FileName);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (FileName.Length != 0) {
-        output.WriteRawTag(10);
-        output.WriteString(FileName);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (FileName.Length != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(FileName);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(SourceContext other) {
-      if (other == null) {
-        return;
-      }
-      if (other.FileName.Length != 0) {
-        FileName = other.FileName;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 10: {
-            FileName = input.ReadString();
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 10: {
-            FileName = input.ReadString();
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  #endregion
-
-}
-
-#endregion Designer generated code
diff --git a/libs/protobuf/csharp/src/Google.Protobuf/WellKnownTypes/Struct.cs b/libs/protobuf/csharp/src/Google.Protobuf/WellKnownTypes/Struct.cs
deleted file mode 100644
index 8c1eec5..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf/WellKnownTypes/Struct.cs
+++ /dev/null
@@ -1,924 +0,0 @@
-// <auto-generated>
-//     Generated by the protocol buffer compiler.  DO NOT EDIT!
-//     source: google/protobuf/struct.proto
-// </auto-generated>
-#pragma warning disable 1591, 0612, 3021, 8981
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-namespace Google.Protobuf.WellKnownTypes {
-
-  /// <summary>Holder for reflection information generated from google/protobuf/struct.proto</summary>
-  public static partial class StructReflection {
-
-    #region Descriptor
-    /// <summary>File descriptor for google/protobuf/struct.proto</summary>
-    public static pbr::FileDescriptor Descriptor {
-      get { return descriptor; }
-    }
-    private static pbr::FileDescriptor descriptor;
-
-    static StructReflection() {
-      byte[] descriptorData = global::System.Convert.FromBase64String(
-          string.Concat(
-            "Chxnb29nbGUvcHJvdG9idWYvc3RydWN0LnByb3RvEg9nb29nbGUucHJvdG9i",
-            "dWYihAEKBlN0cnVjdBIzCgZmaWVsZHMYASADKAsyIy5nb29nbGUucHJvdG9i",
-            "dWYuU3RydWN0LkZpZWxkc0VudHJ5GkUKC0ZpZWxkc0VudHJ5EgsKA2tleRgB",
-            "IAEoCRIlCgV2YWx1ZRgCIAEoCzIWLmdvb2dsZS5wcm90b2J1Zi5WYWx1ZToC",
-            "OAEi6gEKBVZhbHVlEjAKCm51bGxfdmFsdWUYASABKA4yGi5nb29nbGUucHJv",
-            "dG9idWYuTnVsbFZhbHVlSAASFgoMbnVtYmVyX3ZhbHVlGAIgASgBSAASFgoM",
-            "c3RyaW5nX3ZhbHVlGAMgASgJSAASFAoKYm9vbF92YWx1ZRgEIAEoCEgAEi8K",
-            "DHN0cnVjdF92YWx1ZRgFIAEoCzIXLmdvb2dsZS5wcm90b2J1Zi5TdHJ1Y3RI",
-            "ABIwCgpsaXN0X3ZhbHVlGAYgASgLMhouZ29vZ2xlLnByb3RvYnVmLkxpc3RW",
-            "YWx1ZUgAQgYKBGtpbmQiMwoJTGlzdFZhbHVlEiYKBnZhbHVlcxgBIAMoCzIW",
-            "Lmdvb2dsZS5wcm90b2J1Zi5WYWx1ZSobCglOdWxsVmFsdWUSDgoKTlVMTF9W",
-            "QUxVRRAAQn8KE2NvbS5nb29nbGUucHJvdG9idWZCC1N0cnVjdFByb3RvUAFa",
-            "L2dvb2dsZS5nb2xhbmcub3JnL3Byb3RvYnVmL3R5cGVzL2tub3duL3N0cnVj",
-            "dHBi+AEBogIDR1BCqgIeR29vZ2xlLlByb3RvYnVmLldlbGxLbm93blR5cGVz",
-            "YgZwcm90bzM="));
-      descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-          new pbr::FileDescriptor[] { },
-          new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Google.Protobuf.WellKnownTypes.NullValue), }, null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.WellKnownTypes.Struct), global::Google.Protobuf.WellKnownTypes.Struct.Parser, new[]{ "Fields" }, null, null, null, new pbr::GeneratedClrTypeInfo[] { null, }),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.WellKnownTypes.Value), global::Google.Protobuf.WellKnownTypes.Value.Parser, new[]{ "NullValue", "NumberValue", "StringValue", "BoolValue", "StructValue", "ListValue" }, new[]{ "Kind" }, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.WellKnownTypes.ListValue), global::Google.Protobuf.WellKnownTypes.ListValue.Parser, new[]{ "Values" }, null, null, null, null)
-          }));
-    }
-    #endregion
-
-  }
-  #region Enums
-  /// <summary>
-  /// `NullValue` is a singleton enumeration to represent the null value for the
-  /// `Value` type union.
-  ///
-  ///  The JSON representation for `NullValue` is JSON `null`.
-  /// </summary>
-  public enum NullValue {
-    /// <summary>
-    /// Null value.
-    /// </summary>
-    [pbr::OriginalName("NULL_VALUE")] NullValue = 0,
-  }
-
-  #endregion
-
-  #region Messages
-  /// <summary>
-  /// `Struct` represents a structured data value, consisting of fields
-  /// which map to dynamically typed values. In some languages, `Struct`
-  /// might be supported by a native representation. For example, in
-  /// scripting languages like JS a struct is represented as an
-  /// object. The details of that representation are described together
-  /// with the proto support for the language.
-  ///
-  /// The JSON representation for `Struct` is JSON object.
-  /// </summary>
-  public sealed partial class Struct : pb::IMessage<Struct>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<Struct> _parser = new pb::MessageParser<Struct>(() => new Struct());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<Struct> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.WellKnownTypes.StructReflection.Descriptor.MessageTypes[0]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Struct() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Struct(Struct other) : this() {
-      fields_ = other.fields_.Clone();
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Struct Clone() {
-      return new Struct(this);
-    }
-
-    /// <summary>Field number for the "fields" field.</summary>
-    public const int FieldsFieldNumber = 1;
-    private static readonly pbc::MapField<string, global::Google.Protobuf.WellKnownTypes.Value>.Codec _map_fields_codec
-        = new pbc::MapField<string, global::Google.Protobuf.WellKnownTypes.Value>.Codec(pb::FieldCodec.ForString(10, ""), pb::FieldCodec.ForMessage(18, global::Google.Protobuf.WellKnownTypes.Value.Parser), 10);
-    private readonly pbc::MapField<string, global::Google.Protobuf.WellKnownTypes.Value> fields_ = new pbc::MapField<string, global::Google.Protobuf.WellKnownTypes.Value>();
-    /// <summary>
-    /// Unordered map of dynamically typed values.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::MapField<string, global::Google.Protobuf.WellKnownTypes.Value> Fields {
-      get { return fields_; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as Struct);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(Struct other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (!Fields.Equals(other.Fields)) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      hash ^= Fields.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      fields_.WriteTo(output, _map_fields_codec);
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      fields_.WriteTo(ref output, _map_fields_codec);
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      size += fields_.CalculateSize(_map_fields_codec);
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(Struct other) {
-      if (other == null) {
-        return;
-      }
-      fields_.Add(other.fields_);
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 10: {
-            fields_.AddEntriesFrom(input, _map_fields_codec);
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 10: {
-            fields_.AddEntriesFrom(ref input, _map_fields_codec);
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  /// <summary>
-  /// `Value` represents a dynamically typed value which can be either
-  /// null, a number, a string, a boolean, a recursive struct value, or a
-  /// list of values. A producer of value is expected to set one of these
-  /// variants. Absence of any variant indicates an error.
-  ///
-  /// The JSON representation for `Value` is JSON value.
-  /// </summary>
-  public sealed partial class Value : pb::IMessage<Value>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<Value> _parser = new pb::MessageParser<Value>(() => new Value());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<Value> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.WellKnownTypes.StructReflection.Descriptor.MessageTypes[1]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Value() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Value(Value other) : this() {
-      switch (other.KindCase) {
-        case KindOneofCase.NullValue:
-          NullValue = other.NullValue;
-          break;
-        case KindOneofCase.NumberValue:
-          NumberValue = other.NumberValue;
-          break;
-        case KindOneofCase.StringValue:
-          StringValue = other.StringValue;
-          break;
-        case KindOneofCase.BoolValue:
-          BoolValue = other.BoolValue;
-          break;
-        case KindOneofCase.StructValue:
-          StructValue = other.StructValue.Clone();
-          break;
-        case KindOneofCase.ListValue:
-          ListValue = other.ListValue.Clone();
-          break;
-      }
-
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Value Clone() {
-      return new Value(this);
-    }
-
-    /// <summary>Field number for the "null_value" field.</summary>
-    public const int NullValueFieldNumber = 1;
-    /// <summary>
-    /// Represents a null value.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.WellKnownTypes.NullValue NullValue {
-      get { return kindCase_ == KindOneofCase.NullValue ? (global::Google.Protobuf.WellKnownTypes.NullValue) kind_ : global::Google.Protobuf.WellKnownTypes.NullValue.NullValue; }
-      set {
-        kind_ = value;
-        kindCase_ = KindOneofCase.NullValue;
-      }
-    }
-
-    /// <summary>Field number for the "number_value" field.</summary>
-    public const int NumberValueFieldNumber = 2;
-    /// <summary>
-    /// Represents a double value.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double NumberValue {
-      get { return kindCase_ == KindOneofCase.NumberValue ? (double) kind_ : 0D; }
-      set {
-        kind_ = value;
-        kindCase_ = KindOneofCase.NumberValue;
-      }
-    }
-
-    /// <summary>Field number for the "string_value" field.</summary>
-    public const int StringValueFieldNumber = 3;
-    /// <summary>
-    /// Represents a string value.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string StringValue {
-      get { return kindCase_ == KindOneofCase.StringValue ? (string) kind_ : ""; }
-      set {
-        kind_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-        kindCase_ = KindOneofCase.StringValue;
-      }
-    }
-
-    /// <summary>Field number for the "bool_value" field.</summary>
-    public const int BoolValueFieldNumber = 4;
-    /// <summary>
-    /// Represents a boolean value.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool BoolValue {
-      get { return kindCase_ == KindOneofCase.BoolValue ? (bool) kind_ : false; }
-      set {
-        kind_ = value;
-        kindCase_ = KindOneofCase.BoolValue;
-      }
-    }
-
-    /// <summary>Field number for the "struct_value" field.</summary>
-    public const int StructValueFieldNumber = 5;
-    /// <summary>
-    /// Represents a structured value.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.WellKnownTypes.Struct StructValue {
-      get { return kindCase_ == KindOneofCase.StructValue ? (global::Google.Protobuf.WellKnownTypes.Struct) kind_ : null; }
-      set {
-        kind_ = value;
-        kindCase_ = value == null ? KindOneofCase.None : KindOneofCase.StructValue;
-      }
-    }
-
-    /// <summary>Field number for the "list_value" field.</summary>
-    public const int ListValueFieldNumber = 6;
-    /// <summary>
-    /// Represents a repeated `Value`.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.WellKnownTypes.ListValue ListValue {
-      get { return kindCase_ == KindOneofCase.ListValue ? (global::Google.Protobuf.WellKnownTypes.ListValue) kind_ : null; }
-      set {
-        kind_ = value;
-        kindCase_ = value == null ? KindOneofCase.None : KindOneofCase.ListValue;
-      }
-    }
-
-    private object kind_;
-    /// <summary>Enum of possible cases for the "kind" oneof.</summary>
-    public enum KindOneofCase {
-      None = 0,
-      NullValue = 1,
-      NumberValue = 2,
-      StringValue = 3,
-      BoolValue = 4,
-      StructValue = 5,
-      ListValue = 6,
-    }
-    private KindOneofCase kindCase_ = KindOneofCase.None;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public KindOneofCase KindCase {
-      get { return kindCase_; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void ClearKind() {
-      kindCase_ = KindOneofCase.None;
-      kind_ = null;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as Value);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(Value other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (NullValue != other.NullValue) return false;
-      if (!pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.Equals(NumberValue, other.NumberValue)) return false;
-      if (StringValue != other.StringValue) return false;
-      if (BoolValue != other.BoolValue) return false;
-      if (!object.Equals(StructValue, other.StructValue)) return false;
-      if (!object.Equals(ListValue, other.ListValue)) return false;
-      if (KindCase != other.KindCase) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (kindCase_ == KindOneofCase.NullValue) hash ^= NullValue.GetHashCode();
-      if (kindCase_ == KindOneofCase.NumberValue) hash ^= pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.GetHashCode(NumberValue);
-      if (kindCase_ == KindOneofCase.StringValue) hash ^= StringValue.GetHashCode();
-      if (kindCase_ == KindOneofCase.BoolValue) hash ^= BoolValue.GetHashCode();
-      if (kindCase_ == KindOneofCase.StructValue) hash ^= StructValue.GetHashCode();
-      if (kindCase_ == KindOneofCase.ListValue) hash ^= ListValue.GetHashCode();
-      hash ^= (int) kindCase_;
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (kindCase_ == KindOneofCase.NullValue) {
-        output.WriteRawTag(8);
-        output.WriteEnum((int) NullValue);
-      }
-      if (kindCase_ == KindOneofCase.NumberValue) {
-        output.WriteRawTag(17);
-        output.WriteDouble(NumberValue);
-      }
-      if (kindCase_ == KindOneofCase.StringValue) {
-        output.WriteRawTag(26);
-        output.WriteString(StringValue);
-      }
-      if (kindCase_ == KindOneofCase.BoolValue) {
-        output.WriteRawTag(32);
-        output.WriteBool(BoolValue);
-      }
-      if (kindCase_ == KindOneofCase.StructValue) {
-        output.WriteRawTag(42);
-        output.WriteMessage(StructValue);
-      }
-      if (kindCase_ == KindOneofCase.ListValue) {
-        output.WriteRawTag(50);
-        output.WriteMessage(ListValue);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (kindCase_ == KindOneofCase.NullValue) {
-        output.WriteRawTag(8);
-        output.WriteEnum((int) NullValue);
-      }
-      if (kindCase_ == KindOneofCase.NumberValue) {
-        output.WriteRawTag(17);
-        output.WriteDouble(NumberValue);
-      }
-      if (kindCase_ == KindOneofCase.StringValue) {
-        output.WriteRawTag(26);
-        output.WriteString(StringValue);
-      }
-      if (kindCase_ == KindOneofCase.BoolValue) {
-        output.WriteRawTag(32);
-        output.WriteBool(BoolValue);
-      }
-      if (kindCase_ == KindOneofCase.StructValue) {
-        output.WriteRawTag(42);
-        output.WriteMessage(StructValue);
-      }
-      if (kindCase_ == KindOneofCase.ListValue) {
-        output.WriteRawTag(50);
-        output.WriteMessage(ListValue);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (kindCase_ == KindOneofCase.NullValue) {
-        size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) NullValue);
-      }
-      if (kindCase_ == KindOneofCase.NumberValue) {
-        size += 1 + 8;
-      }
-      if (kindCase_ == KindOneofCase.StringValue) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(StringValue);
-      }
-      if (kindCase_ == KindOneofCase.BoolValue) {
-        size += 1 + 1;
-      }
-      if (kindCase_ == KindOneofCase.StructValue) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(StructValue);
-      }
-      if (kindCase_ == KindOneofCase.ListValue) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(ListValue);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(Value other) {
-      if (other == null) {
-        return;
-      }
-      switch (other.KindCase) {
-        case KindOneofCase.NullValue:
-          NullValue = other.NullValue;
-          break;
-        case KindOneofCase.NumberValue:
-          NumberValue = other.NumberValue;
-          break;
-        case KindOneofCase.StringValue:
-          StringValue = other.StringValue;
-          break;
-        case KindOneofCase.BoolValue:
-          BoolValue = other.BoolValue;
-          break;
-        case KindOneofCase.StructValue:
-          if (StructValue == null) {
-            StructValue = new global::Google.Protobuf.WellKnownTypes.Struct();
-          }
-          StructValue.MergeFrom(other.StructValue);
-          break;
-        case KindOneofCase.ListValue:
-          if (ListValue == null) {
-            ListValue = new global::Google.Protobuf.WellKnownTypes.ListValue();
-          }
-          ListValue.MergeFrom(other.ListValue);
-          break;
-      }
-
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 8: {
-            kind_ = input.ReadEnum();
-            kindCase_ = KindOneofCase.NullValue;
-            break;
-          }
-          case 17: {
-            NumberValue = input.ReadDouble();
-            break;
-          }
-          case 26: {
-            StringValue = input.ReadString();
-            break;
-          }
-          case 32: {
-            BoolValue = input.ReadBool();
-            break;
-          }
-          case 42: {
-            global::Google.Protobuf.WellKnownTypes.Struct subBuilder = new global::Google.Protobuf.WellKnownTypes.Struct();
-            if (kindCase_ == KindOneofCase.StructValue) {
-              subBuilder.MergeFrom(StructValue);
-            }
-            input.ReadMessage(subBuilder);
-            StructValue = subBuilder;
-            break;
-          }
-          case 50: {
-            global::Google.Protobuf.WellKnownTypes.ListValue subBuilder = new global::Google.Protobuf.WellKnownTypes.ListValue();
-            if (kindCase_ == KindOneofCase.ListValue) {
-              subBuilder.MergeFrom(ListValue);
-            }
-            input.ReadMessage(subBuilder);
-            ListValue = subBuilder;
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 8: {
-            kind_ = input.ReadEnum();
-            kindCase_ = KindOneofCase.NullValue;
-            break;
-          }
-          case 17: {
-            NumberValue = input.ReadDouble();
-            break;
-          }
-          case 26: {
-            StringValue = input.ReadString();
-            break;
-          }
-          case 32: {
-            BoolValue = input.ReadBool();
-            break;
-          }
-          case 42: {
-            global::Google.Protobuf.WellKnownTypes.Struct subBuilder = new global::Google.Protobuf.WellKnownTypes.Struct();
-            if (kindCase_ == KindOneofCase.StructValue) {
-              subBuilder.MergeFrom(StructValue);
-            }
-            input.ReadMessage(subBuilder);
-            StructValue = subBuilder;
-            break;
-          }
-          case 50: {
-            global::Google.Protobuf.WellKnownTypes.ListValue subBuilder = new global::Google.Protobuf.WellKnownTypes.ListValue();
-            if (kindCase_ == KindOneofCase.ListValue) {
-              subBuilder.MergeFrom(ListValue);
-            }
-            input.ReadMessage(subBuilder);
-            ListValue = subBuilder;
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  /// <summary>
-  /// `ListValue` is a wrapper around a repeated field of values.
-  ///
-  /// The JSON representation for `ListValue` is JSON array.
-  /// </summary>
-  public sealed partial class ListValue : pb::IMessage<ListValue>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<ListValue> _parser = new pb::MessageParser<ListValue>(() => new ListValue());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<ListValue> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.WellKnownTypes.StructReflection.Descriptor.MessageTypes[2]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ListValue() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ListValue(ListValue other) : this() {
-      values_ = other.values_.Clone();
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ListValue Clone() {
-      return new ListValue(this);
-    }
-
-    /// <summary>Field number for the "values" field.</summary>
-    public const int ValuesFieldNumber = 1;
-    private static readonly pb::FieldCodec<global::Google.Protobuf.WellKnownTypes.Value> _repeated_values_codec
-        = pb::FieldCodec.ForMessage(10, global::Google.Protobuf.WellKnownTypes.Value.Parser);
-    private readonly pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Value> values_ = new pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Value>();
-    /// <summary>
-    /// Repeated field of dynamically typed values.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Value> Values {
-      get { return values_; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as ListValue);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(ListValue other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if(!values_.Equals(other.values_)) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      hash ^= values_.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      values_.WriteTo(output, _repeated_values_codec);
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      values_.WriteTo(ref output, _repeated_values_codec);
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      size += values_.CalculateSize(_repeated_values_codec);
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(ListValue other) {
-      if (other == null) {
-        return;
-      }
-      values_.Add(other.values_);
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 10: {
-            values_.AddEntriesFrom(input, _repeated_values_codec);
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 10: {
-            values_.AddEntriesFrom(ref input, _repeated_values_codec);
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  #endregion
-
-}
-
-#endregion Designer generated code
diff --git a/libs/protobuf/csharp/src/Google.Protobuf/WellKnownTypes/TimeExtensions.cs b/libs/protobuf/csharp/src/Google.Protobuf/WellKnownTypes/TimeExtensions.cs
deleted file mode 100644
index 8b63d63..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf/WellKnownTypes/TimeExtensions.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-
-namespace Google.Protobuf.WellKnownTypes
-{
-    /// <summary>
-    /// Extension methods on BCL time-related types, converting to protobuf types.
-    /// </summary>
-    public static class TimeExtensions
-    {
-        /// <summary>
-        /// Converts the given <see cref="DateTime"/> to a <see cref="Timestamp"/>.
-        /// </summary>
-        /// <param name="dateTime">The date and time to convert to a timestamp.</param>
-        /// <exception cref="ArgumentException">The <paramref name="dateTime"/> value has a <see cref="DateTime.Kind"/>other than <c>Utc</c>.</exception>
-        /// <returns>The converted timestamp.</returns>
-        public static Timestamp ToTimestamp(this DateTime dateTime)
-        {
-            return Timestamp.FromDateTime(dateTime);
-        }
-
-        /// <summary>
-        /// Converts the given <see cref="DateTimeOffset"/> to a <see cref="Timestamp"/>
-        /// </summary>
-        /// <remarks>The offset is taken into consideration when converting the value (so the same instant in time
-        /// is represented) but is not a separate part of the resulting value. In other words, there is no
-        /// roundtrip operation to retrieve the original <c>DateTimeOffset</c>.</remarks>
-        /// <param name="dateTimeOffset">The date and time (with UTC offset) to convert to a timestamp.</param>
-        /// <returns>The converted timestamp.</returns>
-        public static Timestamp ToTimestamp(this DateTimeOffset dateTimeOffset)
-        {
-            return Timestamp.FromDateTimeOffset(dateTimeOffset);
-        }
-
-        /// <summary>
-        /// Converts the given <see cref="TimeSpan"/> to a <see cref="Duration"/>.
-        /// </summary>
-        /// <param name="timeSpan">The time span to convert.</param>
-        /// <returns>The converted duration.</returns>
-        public static Duration ToDuration(this TimeSpan timeSpan)
-        {
-            return Duration.FromTimeSpan(timeSpan);
-        }
-    }
-}
diff --git a/libs/protobuf/csharp/src/Google.Protobuf/WellKnownTypes/Timestamp.cs b/libs/protobuf/csharp/src/Google.Protobuf/WellKnownTypes/Timestamp.cs
deleted file mode 100644
index e6d57af..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf/WellKnownTypes/Timestamp.cs
+++ /dev/null
@@ -1,375 +0,0 @@
-// <auto-generated>
-//     Generated by the protocol buffer compiler.  DO NOT EDIT!
-//     source: google/protobuf/timestamp.proto
-// </auto-generated>
-#pragma warning disable 1591, 0612, 3021, 8981
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-namespace Google.Protobuf.WellKnownTypes {
-
-  /// <summary>Holder for reflection information generated from google/protobuf/timestamp.proto</summary>
-  public static partial class TimestampReflection {
-
-    #region Descriptor
-    /// <summary>File descriptor for google/protobuf/timestamp.proto</summary>
-    public static pbr::FileDescriptor Descriptor {
-      get { return descriptor; }
-    }
-    private static pbr::FileDescriptor descriptor;
-
-    static TimestampReflection() {
-      byte[] descriptorData = global::System.Convert.FromBase64String(
-          string.Concat(
-            "Ch9nb29nbGUvcHJvdG9idWYvdGltZXN0YW1wLnByb3RvEg9nb29nbGUucHJv",
-            "dG9idWYiKwoJVGltZXN0YW1wEg8KB3NlY29uZHMYASABKAMSDQoFbmFub3MY",
-            "AiABKAVChQEKE2NvbS5nb29nbGUucHJvdG9idWZCDlRpbWVzdGFtcFByb3Rv",
-            "UAFaMmdvb2dsZS5nb2xhbmcub3JnL3Byb3RvYnVmL3R5cGVzL2tub3duL3Rp",
-            "bWVzdGFtcHBi+AEBogIDR1BCqgIeR29vZ2xlLlByb3RvYnVmLldlbGxLbm93",
-            "blR5cGVzYgZwcm90bzM="));
-      descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-          new pbr::FileDescriptor[] { },
-          new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.WellKnownTypes.Timestamp), global::Google.Protobuf.WellKnownTypes.Timestamp.Parser, new[]{ "Seconds", "Nanos" }, null, null, null, null)
-          }));
-    }
-    #endregion
-
-  }
-  #region Messages
-  /// <summary>
-  /// A Timestamp represents a point in time independent of any time zone or local
-  /// calendar, encoded as a count of seconds and fractions of seconds at
-  /// nanosecond resolution. The count is relative to an epoch at UTC midnight on
-  /// January 1, 1970, in the proleptic Gregorian calendar which extends the
-  /// Gregorian calendar backwards to year one.
-  ///
-  /// All minutes are 60 seconds long. Leap seconds are "smeared" so that no leap
-  /// second table is needed for interpretation, using a [24-hour linear
-  /// smear](https://developers.google.com/time/smear).
-  ///
-  /// The range is from 0001-01-01T00:00:00Z to 9999-12-31T23:59:59.999999999Z. By
-  /// restricting to that range, we ensure that we can convert to and from [RFC
-  /// 3339](https://www.ietf.org/rfc/rfc3339.txt) date strings.
-  ///
-  /// # Examples
-  ///
-  /// Example 1: Compute Timestamp from POSIX `time()`.
-  ///
-  ///     Timestamp timestamp;
-  ///     timestamp.set_seconds(time(NULL));
-  ///     timestamp.set_nanos(0);
-  ///
-  /// Example 2: Compute Timestamp from POSIX `gettimeofday()`.
-  ///
-  ///     struct timeval tv;
-  ///     gettimeofday(&amp;tv, NULL);
-  ///
-  ///     Timestamp timestamp;
-  ///     timestamp.set_seconds(tv.tv_sec);
-  ///     timestamp.set_nanos(tv.tv_usec * 1000);
-  ///
-  /// Example 3: Compute Timestamp from Win32 `GetSystemTimeAsFileTime()`.
-  ///
-  ///     FILETIME ft;
-  ///     GetSystemTimeAsFileTime(&amp;ft);
-  ///     UINT64 ticks = (((UINT64)ft.dwHighDateTime) &lt;&lt; 32) | ft.dwLowDateTime;
-  ///
-  ///     // A Windows tick is 100 nanoseconds. Windows epoch 1601-01-01T00:00:00Z
-  ///     // is 11644473600 seconds before Unix epoch 1970-01-01T00:00:00Z.
-  ///     Timestamp timestamp;
-  ///     timestamp.set_seconds((INT64) ((ticks / 10000000) - 11644473600LL));
-  ///     timestamp.set_nanos((INT32) ((ticks % 10000000) * 100));
-  ///
-  /// Example 4: Compute Timestamp from Java `System.currentTimeMillis()`.
-  ///
-  ///     long millis = System.currentTimeMillis();
-  ///
-  ///     Timestamp timestamp = Timestamp.newBuilder().setSeconds(millis / 1000)
-  ///         .setNanos((int) ((millis % 1000) * 1000000)).build();
-  ///
-  /// Example 5: Compute Timestamp from Java `Instant.now()`.
-  ///
-  ///     Instant now = Instant.now();
-  ///
-  ///     Timestamp timestamp =
-  ///         Timestamp.newBuilder().setSeconds(now.getEpochSecond())
-  ///             .setNanos(now.getNano()).build();
-  ///
-  /// Example 6: Compute Timestamp from current time in Python.
-  ///
-  ///     timestamp = Timestamp()
-  ///     timestamp.GetCurrentTime()
-  ///
-  /// # JSON Mapping
-  ///
-  /// In JSON format, the Timestamp type is encoded as a string in the
-  /// [RFC 3339](https://www.ietf.org/rfc/rfc3339.txt) format. That is, the
-  /// format is "{year}-{month}-{day}T{hour}:{min}:{sec}[.{frac_sec}]Z"
-  /// where {year} is always expressed using four digits while {month}, {day},
-  /// {hour}, {min}, and {sec} are zero-padded to two digits each. The fractional
-  /// seconds, which can go up to 9 digits (i.e. up to 1 nanosecond resolution),
-  /// are optional. The "Z" suffix indicates the timezone ("UTC"); the timezone
-  /// is required. A proto3 JSON serializer should always use UTC (as indicated by
-  /// "Z") when printing the Timestamp type and a proto3 JSON parser should be
-  /// able to accept both UTC and other timezones (as indicated by an offset).
-  ///
-  /// For example, "2017-01-15T01:30:15.01Z" encodes 15.01 seconds past
-  /// 01:30 UTC on January 15, 2017.
-  ///
-  /// In JavaScript, one can convert a Date object to this format using the
-  /// standard
-  /// [toISOString()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/toISOString)
-  /// method. In Python, a standard `datetime.datetime` object can be converted
-  /// to this format using
-  /// [`strftime`](https://docs.python.org/2/library/time.html#time.strftime) with
-  /// the time format spec '%Y-%m-%dT%H:%M:%S.%fZ'. Likewise, in Java, one can use
-  /// the Joda Time's [`ISODateTimeFormat.dateTime()`](
-  /// http://www.joda.org/joda-time/apidocs/org/joda/time/format/ISODateTimeFormat.html#dateTime%2D%2D
-  /// ) to obtain a formatter capable of generating timestamps in this format.
-  /// </summary>
-  public sealed partial class Timestamp : pb::IMessage<Timestamp>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<Timestamp> _parser = new pb::MessageParser<Timestamp>(() => new Timestamp());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<Timestamp> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.WellKnownTypes.TimestampReflection.Descriptor.MessageTypes[0]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Timestamp() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Timestamp(Timestamp other) : this() {
-      seconds_ = other.seconds_;
-      nanos_ = other.nanos_;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Timestamp Clone() {
-      return new Timestamp(this);
-    }
-
-    /// <summary>Field number for the "seconds" field.</summary>
-    public const int SecondsFieldNumber = 1;
-    private long seconds_;
-    /// <summary>
-    /// Represents seconds of UTC time since Unix epoch
-    /// 1970-01-01T00:00:00Z. Must be from 0001-01-01T00:00:00Z to
-    /// 9999-12-31T23:59:59Z inclusive.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public long Seconds {
-      get { return seconds_; }
-      set {
-        seconds_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "nanos" field.</summary>
-    public const int NanosFieldNumber = 2;
-    private int nanos_;
-    /// <summary>
-    /// Non-negative fractions of a second at nanosecond resolution. Negative
-    /// second values with fractions must still have non-negative nanos values
-    /// that count forward in time. Must be from 0 to 999,999,999
-    /// inclusive.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int Nanos {
-      get { return nanos_; }
-      set {
-        nanos_ = value;
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as Timestamp);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(Timestamp other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (Seconds != other.Seconds) return false;
-      if (Nanos != other.Nanos) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (Seconds != 0L) hash ^= Seconds.GetHashCode();
-      if (Nanos != 0) hash ^= Nanos.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (Seconds != 0L) {
-        output.WriteRawTag(8);
-        output.WriteInt64(Seconds);
-      }
-      if (Nanos != 0) {
-        output.WriteRawTag(16);
-        output.WriteInt32(Nanos);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (Seconds != 0L) {
-        output.WriteRawTag(8);
-        output.WriteInt64(Seconds);
-      }
-      if (Nanos != 0) {
-        output.WriteRawTag(16);
-        output.WriteInt32(Nanos);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (Seconds != 0L) {
-        size += 1 + pb::CodedOutputStream.ComputeInt64Size(Seconds);
-      }
-      if (Nanos != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(Nanos);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(Timestamp other) {
-      if (other == null) {
-        return;
-      }
-      if (other.Seconds != 0L) {
-        Seconds = other.Seconds;
-      }
-      if (other.Nanos != 0) {
-        Nanos = other.Nanos;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 8: {
-            Seconds = input.ReadInt64();
-            break;
-          }
-          case 16: {
-            Nanos = input.ReadInt32();
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 8: {
-            Seconds = input.ReadInt64();
-            break;
-          }
-          case 16: {
-            Nanos = input.ReadInt32();
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  #endregion
-
-}
-
-#endregion Designer generated code
diff --git a/libs/protobuf/csharp/src/Google.Protobuf/WellKnownTypes/TimestampPartial.cs b/libs/protobuf/csharp/src/Google.Protobuf/WellKnownTypes/TimestampPartial.cs
deleted file mode 100644
index 2f5172f..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf/WellKnownTypes/TimestampPartial.cs
+++ /dev/null
@@ -1,344 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-using System.Globalization;
-using System.Text;
-
-namespace Google.Protobuf.WellKnownTypes
-{
-    public partial class Timestamp : ICustomDiagnosticMessage, IComparable<Timestamp>
-    {
-        private static readonly DateTime UnixEpoch = new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc);
-        // Constants determined programmatically, but then hard-coded so they can be constant expressions.
-        private const long BclSecondsAtUnixEpoch = 62135596800;
-        internal const long UnixSecondsAtBclMaxValue = 253402300799;
-        internal const long UnixSecondsAtBclMinValue = -BclSecondsAtUnixEpoch;
-        internal const int MaxNanos = Duration.NanosecondsPerSecond - 1;
-
-        private static bool IsNormalized(long seconds, int nanoseconds) =>
-            nanoseconds >= 0 &&
-            nanoseconds <= MaxNanos &&
-            seconds >= UnixSecondsAtBclMinValue &&
-            seconds <= UnixSecondsAtBclMaxValue;
-
-        /// <summary>
-        /// Returns the difference between one <see cref="Timestamp"/> and another, as a <see cref="Duration"/>.
-        /// </summary>
-        /// <param name="lhs">The timestamp to subtract from. Must not be null.</param>
-        /// <param name="rhs">The timestamp to subtract. Must not be null.</param>
-        /// <returns>The difference between the two specified timestamps.</returns>
-        public static Duration operator -(Timestamp lhs, Timestamp rhs)
-        {
-            ProtoPreconditions.CheckNotNull(lhs, "lhs");
-            ProtoPreconditions.CheckNotNull(rhs, "rhs");
-            checked
-            {
-                return Duration.Normalize(lhs.Seconds - rhs.Seconds, lhs.Nanos - rhs.Nanos);
-            }
-        }
-
-        /// <summary>
-        /// Adds a <see cref="Duration"/> to a <see cref="Timestamp"/>, to obtain another <c>Timestamp</c>.
-        /// </summary>
-        /// <param name="lhs">The timestamp to add the duration to. Must not be null.</param>
-        /// <param name="rhs">The duration to add. Must not be null.</param>
-        /// <returns>The result of adding the duration to the timestamp.</returns>
-        public static Timestamp operator +(Timestamp lhs, Duration rhs)
-        {
-            ProtoPreconditions.CheckNotNull(lhs, "lhs");
-            ProtoPreconditions.CheckNotNull(rhs, "rhs");
-            checked
-            {
-                return Normalize(lhs.Seconds + rhs.Seconds, lhs.Nanos + rhs.Nanos);
-            }
-        }
-
-        /// <summary>
-        /// Subtracts a <see cref="Duration"/> from a <see cref="Timestamp"/>, to obtain another <c>Timestamp</c>.
-        /// </summary>
-        /// <param name="lhs">The timestamp to subtract the duration from. Must not be null.</param>
-        /// <param name="rhs">The duration to subtract.</param>
-        /// <returns>The result of subtracting the duration from the timestamp.</returns>
-        public static Timestamp operator -(Timestamp lhs, Duration rhs)
-        {
-            ProtoPreconditions.CheckNotNull(lhs, "lhs");
-            ProtoPreconditions.CheckNotNull(rhs, "rhs");
-            checked
-            {
-                return Normalize(lhs.Seconds - rhs.Seconds, lhs.Nanos - rhs.Nanos);
-            }
-        }
-
-        /// <summary>
-        /// Converts this timestamp into a <see cref="DateTime"/>.
-        /// </summary>
-        /// <remarks>
-        /// The resulting <c>DateTime</c> will always have a <c>Kind</c> of <c>Utc</c>.
-        /// If the timestamp is not a precise number of ticks, it will be truncated towards the start
-        /// of time. For example, a timestamp with a <see cref="Nanos"/> value of 99 will result in a
-        /// <see cref="DateTime"/> value precisely on a second.
-        /// </remarks>
-        /// <returns>This timestamp as a <c>DateTime</c>.</returns>
-        /// <exception cref="InvalidOperationException">The timestamp contains invalid values; either it is
-        /// incorrectly normalized or is outside the valid range.</exception>
-        public DateTime ToDateTime()
-        {
-            if (!IsNormalized(Seconds, Nanos))
-            {
-                throw new InvalidOperationException(@"Timestamp contains invalid values: Seconds={Seconds}; Nanos={Nanos}");
-            }
-            return UnixEpoch.AddSeconds(Seconds).AddTicks(Nanos / Duration.NanosecondsPerTick);
-        }
-
-        /// <summary>
-        /// Converts this timestamp into a <see cref="DateTimeOffset"/>.
-        /// </summary>
-        /// <remarks>
-        /// The resulting <c>DateTimeOffset</c> will always have an <c>Offset</c> of zero.
-        /// If the timestamp is not a precise number of ticks, it will be truncated towards the start
-        /// of time. For example, a timestamp with a <see cref="Nanos"/> value of 99 will result in a
-        /// <see cref="DateTimeOffset"/> value precisely on a second.
-        /// </remarks>
-        /// <returns>This timestamp as a <c>DateTimeOffset</c>.</returns>
-        /// <exception cref="InvalidOperationException">The timestamp contains invalid values; either it is
-        /// incorrectly normalized or is outside the valid range.</exception>
-        public DateTimeOffset ToDateTimeOffset()
-        {
-            return new DateTimeOffset(ToDateTime(), TimeSpan.Zero);
-        }
-
-        /// <summary>
-        /// Converts the specified <see cref="DateTime"/> to a <see cref="Timestamp"/>.
-        /// </summary>
-        /// <param name="dateTime"></param>
-        /// <exception cref="ArgumentException">The <c>Kind</c> of <paramref name="dateTime"/> is not <c>DateTimeKind.Utc</c>.</exception>
-        /// <returns>The converted timestamp.</returns>
-        public static Timestamp FromDateTime(DateTime dateTime)
-        {
-            if (dateTime.Kind != DateTimeKind.Utc)
-            {
-                throw new ArgumentException("Conversion from DateTime to Timestamp requires the DateTime kind to be Utc", "dateTime");
-            }
-            // Do the arithmetic using DateTime.Ticks, which is always non-negative, making things simpler.
-            long secondsSinceBclEpoch = dateTime.Ticks / TimeSpan.TicksPerSecond;
-            int nanoseconds = (int)  (dateTime.Ticks % TimeSpan.TicksPerSecond) * Duration.NanosecondsPerTick;
-            return new Timestamp { Seconds = secondsSinceBclEpoch - BclSecondsAtUnixEpoch, Nanos = nanoseconds };
-        }
-
-        /// <summary>
-        /// Converts the given <see cref="DateTimeOffset"/> to a <see cref="Timestamp"/>
-        /// </summary>
-        /// <remarks>The offset is taken into consideration when converting the value (so the same instant in time
-        /// is represented) but is not a separate part of the resulting value. In other words, there is no
-        /// roundtrip operation to retrieve the original <c>DateTimeOffset</c>.</remarks>
-        /// <param name="dateTimeOffset">The date and time (with UTC offset) to convert to a timestamp.</param>
-        /// <returns>The converted timestamp.</returns>
-        public static Timestamp FromDateTimeOffset(DateTimeOffset dateTimeOffset)
-        {
-            // We don't need to worry about this having negative ticks: DateTimeOffset is constrained to handle
-            // values whose *UTC* value is in the range of DateTime.
-            return FromDateTime(dateTimeOffset.UtcDateTime);
-        }
-
-        internal static Timestamp Normalize(long seconds, int nanoseconds)
-        {
-            int extraSeconds = nanoseconds / Duration.NanosecondsPerSecond;
-            seconds += extraSeconds;
-            nanoseconds -= extraSeconds * Duration.NanosecondsPerSecond;
-
-            if (nanoseconds < 0)
-            {
-                nanoseconds += Duration.NanosecondsPerSecond;
-                seconds--;
-            }
-            return new Timestamp { Seconds = seconds, Nanos = nanoseconds };
-        }
-
-        /// <summary>
-        /// Converts a timestamp specified in seconds/nanoseconds to a string.
-        /// </summary>
-        /// <remarks>
-        /// If the value is a normalized duration in the range described in <c>timestamp.proto</c>,
-        /// <paramref name="diagnosticOnly"/> is ignored. Otherwise, if the parameter is <c>true</c>,
-        /// a JSON object with a warning is returned; if it is <c>false</c>, an <see cref="InvalidOperationException"/> is thrown.
-        /// </remarks>
-        /// <param name="seconds">Seconds portion of the duration.</param>
-        /// <param name="nanoseconds">Nanoseconds portion of the duration.</param>
-        /// <param name="diagnosticOnly">Determines the handling of non-normalized values</param>
-        /// <exception cref="InvalidOperationException">The represented duration is invalid, and <paramref name="diagnosticOnly"/> is <c>false</c>.</exception>
-        internal static string ToJson(long seconds, int nanoseconds, bool diagnosticOnly)
-        {
-            if (IsNormalized(seconds, nanoseconds))
-            {
-                // Use .NET's formatting for the value down to the second, including an opening double quote (as it's a string value)
-                DateTime dateTime = UnixEpoch.AddSeconds(seconds);
-                var builder = new StringBuilder();
-                builder.Append('"');
-                builder.Append(dateTime.ToString("yyyy'-'MM'-'dd'T'HH:mm:ss", CultureInfo.InvariantCulture));
-                Duration.AppendNanoseconds(builder, nanoseconds);
-                builder.Append("Z\"");
-                return builder.ToString();
-            }
-            if (diagnosticOnly)
-            {
-                return string.Format(CultureInfo.InvariantCulture,
-                    "{{ \"@warning\": \"Invalid Timestamp\", \"seconds\": \"{0}\", \"nanos\": {1} }}",
-                    seconds,
-                    nanoseconds);
-            }
-            else
-            {
-                throw new InvalidOperationException("Non-normalized timestamp value");
-            }
-        }
-
-        /// <summary>
-        /// Given another timestamp, returns 0 if the timestamps are equivalent, -1 if this timestamp precedes the other, and 1 otherwise
-        /// </summary>
-        /// <remarks>
-        /// Make sure the timestamps are normalized. Comparing non-normalized timestamps is not specified and may give unexpected results.
-        /// </remarks>
-        /// <param name="other">Timestamp to compare</param>
-        /// <returns>an integer indicating whether this timestamp precedes or follows the other</returns>
-        public int CompareTo(Timestamp other)
-        {
-            return other == null ? 1
-                : Seconds < other.Seconds ? -1
-                : Seconds > other.Seconds ? 1
-                : Nanos < other.Nanos ? -1
-                : Nanos > other.Nanos ? 1
-                : 0;
-        }
-
-        /// <summary>
-        /// Compares two timestamps and returns whether the first is less than (chronologically precedes) the second
-        /// </summary>
-        /// <remarks>
-        /// Make sure the timestamps are normalized. Comparing non-normalized timestamps is not specified and may give unexpected results.
-        /// </remarks>
-        /// <param name="a"></param>
-        /// <param name="b"></param>
-        /// <returns>true if a precedes b</returns>
-        public static bool operator <(Timestamp a, Timestamp b)
-        {
-            return a.CompareTo(b) < 0;
-        }
-
-        /// <summary>
-        /// Compares two timestamps and returns whether the first is greater than (chronologically follows) the second
-        /// </summary>
-        /// <remarks>
-        /// Make sure the timestamps are normalized. Comparing non-normalized timestamps is not specified and may give unexpected results.
-        /// </remarks>
-        /// <param name="a"></param>
-        /// <param name="b"></param>
-        /// <returns>true if a follows b</returns>
-        public static bool operator >(Timestamp a, Timestamp b)
-        {
-            return a.CompareTo(b) > 0;
-        }
-
-        /// <summary>
-        /// Compares two timestamps and returns whether the first is less than (chronologically precedes) the second
-        /// </summary>
-        /// <remarks>
-        /// Make sure the timestamps are normalized. Comparing non-normalized timestamps is not specified and may give unexpected results.
-        /// </remarks>
-        /// <param name="a"></param>
-        /// <param name="b"></param>
-        /// <returns>true if a precedes b</returns>
-        public static bool operator <=(Timestamp a, Timestamp b)
-        {
-            return a.CompareTo(b) <= 0;
-        }
-
-        /// <summary>
-        /// Compares two timestamps and returns whether the first is greater than (chronologically follows) the second
-        /// </summary>
-        /// <remarks>
-        /// Make sure the timestamps are normalized. Comparing non-normalized timestamps is not specified and may give unexpected results.
-        /// </remarks>
-        /// <param name="a"></param>
-        /// <param name="b"></param>
-        /// <returns>true if a follows b</returns>
-        public static bool operator >=(Timestamp a, Timestamp b)
-        {
-            return a.CompareTo(b) >= 0;
-        }
-
-
-        /// <summary>
-        /// Returns whether two timestamps are equivalent
-        /// </summary>
-        /// <remarks>
-        /// Make sure the timestamps are normalized. Comparing non-normalized timestamps is not specified and may give unexpected results.
-        /// </remarks>
-        /// <param name="a"></param>
-        /// <param name="b"></param>
-        /// <returns>true if the two timestamps refer to the same nanosecond</returns>
-        public static bool operator ==(Timestamp a, Timestamp b)
-        {
-            return ReferenceEquals(a, b) || (ReferenceEquals(a, null) ? (ReferenceEquals(b, null) ? true : false) : a.Equals(b));
-        }
-
-        /// <summary>
-        /// Returns whether two timestamps differ
-        /// </summary>
-        /// <remarks>
-        /// Make sure the timestamps are normalized. Comparing non-normalized timestamps is not specified and may give unexpected results.
-        /// </remarks>
-        /// <param name="a"></param>
-        /// <param name="b"></param>
-        /// <returns>true if the two timestamps differ</returns>
-        public static bool operator !=(Timestamp a, Timestamp b)
-        {
-            return !(a == b);
-        }
-
-        /// <summary>
-        /// Returns a string representation of this <see cref="Timestamp"/> for diagnostic purposes.
-        /// </summary>
-        /// <remarks>
-        /// Normally the returned value will be a JSON string value (including leading and trailing quotes) but
-        /// when the value is non-normalized or out of range, a JSON object representation will be returned
-        /// instead, including a warning. This is to avoid exceptions being thrown when trying to
-        /// diagnose problems - the regular JSON formatter will still throw an exception for non-normalized
-        /// values.
-        /// </remarks>
-        /// <returns>A string representation of this value.</returns>
-        public string ToDiagnosticString()
-        {
-            return ToJson(Seconds, Nanos, true);
-        }
-    }
-}
diff --git a/libs/protobuf/csharp/src/Google.Protobuf/WellKnownTypes/Type.cs b/libs/protobuf/csharp/src/Google.Protobuf/WellKnownTypes/Type.cs
deleted file mode 100644
index 3088e38..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf/WellKnownTypes/Type.cs
+++ /dev/null
@@ -1,1984 +0,0 @@
-// <auto-generated>
-//     Generated by the protocol buffer compiler.  DO NOT EDIT!
-//     source: google/protobuf/type.proto
-// </auto-generated>
-#pragma warning disable 1591, 0612, 3021, 8981
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-namespace Google.Protobuf.WellKnownTypes {
-
-  /// <summary>Holder for reflection information generated from google/protobuf/type.proto</summary>
-  public static partial class TypeReflection {
-
-    #region Descriptor
-    /// <summary>File descriptor for google/protobuf/type.proto</summary>
-    public static pbr::FileDescriptor Descriptor {
-      get { return descriptor; }
-    }
-    private static pbr::FileDescriptor descriptor;
-
-    static TypeReflection() {
-      byte[] descriptorData = global::System.Convert.FromBase64String(
-          string.Concat(
-            "Chpnb29nbGUvcHJvdG9idWYvdHlwZS5wcm90bxIPZ29vZ2xlLnByb3RvYnVm",
-            "Ghlnb29nbGUvcHJvdG9idWYvYW55LnByb3RvGiRnb29nbGUvcHJvdG9idWYv",
-            "c291cmNlX2NvbnRleHQucHJvdG8i1wEKBFR5cGUSDAoEbmFtZRgBIAEoCRIm",
-            "CgZmaWVsZHMYAiADKAsyFi5nb29nbGUucHJvdG9idWYuRmllbGQSDgoGb25l",
-            "b2ZzGAMgAygJEigKB29wdGlvbnMYBCADKAsyFy5nb29nbGUucHJvdG9idWYu",
-            "T3B0aW9uEjYKDnNvdXJjZV9jb250ZXh0GAUgASgLMh4uZ29vZ2xlLnByb3Rv",
-            "YnVmLlNvdXJjZUNvbnRleHQSJwoGc3ludGF4GAYgASgOMhcuZ29vZ2xlLnBy",
-            "b3RvYnVmLlN5bnRheCLVBQoFRmllbGQSKQoEa2luZBgBIAEoDjIbLmdvb2ds",
-            "ZS5wcm90b2J1Zi5GaWVsZC5LaW5kEjcKC2NhcmRpbmFsaXR5GAIgASgOMiIu",
-            "Z29vZ2xlLnByb3RvYnVmLkZpZWxkLkNhcmRpbmFsaXR5Eg4KBm51bWJlchgD",
-            "IAEoBRIMCgRuYW1lGAQgASgJEhAKCHR5cGVfdXJsGAYgASgJEhMKC29uZW9m",
-            "X2luZGV4GAcgASgFEg4KBnBhY2tlZBgIIAEoCBIoCgdvcHRpb25zGAkgAygL",
-            "MhcuZ29vZ2xlLnByb3RvYnVmLk9wdGlvbhIRCglqc29uX25hbWUYCiABKAkS",
-            "FQoNZGVmYXVsdF92YWx1ZRgLIAEoCSLIAgoES2luZBIQCgxUWVBFX1VOS05P",
-            "V04QABIPCgtUWVBFX0RPVUJMRRABEg4KClRZUEVfRkxPQVQQAhIOCgpUWVBF",
-            "X0lOVDY0EAMSDwoLVFlQRV9VSU5UNjQQBBIOCgpUWVBFX0lOVDMyEAUSEAoM",
-            "VFlQRV9GSVhFRDY0EAYSEAoMVFlQRV9GSVhFRDMyEAcSDQoJVFlQRV9CT09M",
-            "EAgSDwoLVFlQRV9TVFJJTkcQCRIOCgpUWVBFX0dST1VQEAoSEAoMVFlQRV9N",
-            "RVNTQUdFEAsSDgoKVFlQRV9CWVRFUxAMEg8KC1RZUEVfVUlOVDMyEA0SDQoJ",
-            "VFlQRV9FTlVNEA4SEQoNVFlQRV9TRklYRUQzMhAPEhEKDVRZUEVfU0ZJWEVE",
-            "NjQQEBIPCgtUWVBFX1NJTlQzMhAREg8KC1RZUEVfU0lOVDY0EBIidAoLQ2Fy",
-            "ZGluYWxpdHkSFwoTQ0FSRElOQUxJVFlfVU5LTk9XThAAEhgKFENBUkRJTkFM",
-            "SVRZX09QVElPTkFMEAESGAoUQ0FSRElOQUxJVFlfUkVRVUlSRUQQAhIYChRD",
-            "QVJESU5BTElUWV9SRVBFQVRFRBADIs4BCgRFbnVtEgwKBG5hbWUYASABKAkS",
-            "LQoJZW51bXZhbHVlGAIgAygLMhouZ29vZ2xlLnByb3RvYnVmLkVudW1WYWx1",
-            "ZRIoCgdvcHRpb25zGAMgAygLMhcuZ29vZ2xlLnByb3RvYnVmLk9wdGlvbhI2",
-            "Cg5zb3VyY2VfY29udGV4dBgEIAEoCzIeLmdvb2dsZS5wcm90b2J1Zi5Tb3Vy",
-            "Y2VDb250ZXh0EicKBnN5bnRheBgFIAEoDjIXLmdvb2dsZS5wcm90b2J1Zi5T",
-            "eW50YXgiUwoJRW51bVZhbHVlEgwKBG5hbWUYASABKAkSDgoGbnVtYmVyGAIg",
-            "ASgFEigKB29wdGlvbnMYAyADKAsyFy5nb29nbGUucHJvdG9idWYuT3B0aW9u",
-            "IjsKBk9wdGlvbhIMCgRuYW1lGAEgASgJEiMKBXZhbHVlGAIgASgLMhQuZ29v",
-            "Z2xlLnByb3RvYnVmLkFueSouCgZTeW50YXgSEQoNU1lOVEFYX1BST1RPMhAA",
-            "EhEKDVNZTlRBWF9QUk9UTzMQAUJ7ChNjb20uZ29vZ2xlLnByb3RvYnVmQglU",
-            "eXBlUHJvdG9QAVotZ29vZ2xlLmdvbGFuZy5vcmcvcHJvdG9idWYvdHlwZXMv",
-            "a25vd24vdHlwZXBi+AEBogIDR1BCqgIeR29vZ2xlLlByb3RvYnVmLldlbGxL",
-            "bm93blR5cGVzYgZwcm90bzM="));
-      descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-          new pbr::FileDescriptor[] { global::Google.Protobuf.WellKnownTypes.AnyReflection.Descriptor, global::Google.Protobuf.WellKnownTypes.SourceContextReflection.Descriptor, },
-          new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Google.Protobuf.WellKnownTypes.Syntax), }, null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.WellKnownTypes.Type), global::Google.Protobuf.WellKnownTypes.Type.Parser, new[]{ "Name", "Fields", "Oneofs", "Options", "SourceContext", "Syntax" }, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.WellKnownTypes.Field), global::Google.Protobuf.WellKnownTypes.Field.Parser, new[]{ "Kind", "Cardinality", "Number", "Name", "TypeUrl", "OneofIndex", "Packed", "Options", "JsonName", "DefaultValue" }, null, new[]{ typeof(global::Google.Protobuf.WellKnownTypes.Field.Types.Kind), typeof(global::Google.Protobuf.WellKnownTypes.Field.Types.Cardinality) }, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.WellKnownTypes.Enum), global::Google.Protobuf.WellKnownTypes.Enum.Parser, new[]{ "Name", "Enumvalue", "Options", "SourceContext", "Syntax" }, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.WellKnownTypes.EnumValue), global::Google.Protobuf.WellKnownTypes.EnumValue.Parser, new[]{ "Name", "Number", "Options" }, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.WellKnownTypes.Option), global::Google.Protobuf.WellKnownTypes.Option.Parser, new[]{ "Name", "Value" }, null, null, null, null)
-          }));
-    }
-    #endregion
-
-  }
-  #region Enums
-  /// <summary>
-  /// The syntax in which a protocol buffer element is defined.
-  /// </summary>
-  public enum Syntax {
-    /// <summary>
-    /// Syntax `proto2`.
-    /// </summary>
-    [pbr::OriginalName("SYNTAX_PROTO2")] Proto2 = 0,
-    /// <summary>
-    /// Syntax `proto3`.
-    /// </summary>
-    [pbr::OriginalName("SYNTAX_PROTO3")] Proto3 = 1,
-  }
-
-  #endregion
-
-  #region Messages
-  /// <summary>
-  /// A protocol buffer message type.
-  /// </summary>
-  public sealed partial class Type : pb::IMessage<Type>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<Type> _parser = new pb::MessageParser<Type>(() => new Type());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<Type> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.WellKnownTypes.TypeReflection.Descriptor.MessageTypes[0]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Type() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Type(Type other) : this() {
-      name_ = other.name_;
-      fields_ = other.fields_.Clone();
-      oneofs_ = other.oneofs_.Clone();
-      options_ = other.options_.Clone();
-      sourceContext_ = other.sourceContext_ != null ? other.sourceContext_.Clone() : null;
-      syntax_ = other.syntax_;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Type Clone() {
-      return new Type(this);
-    }
-
-    /// <summary>Field number for the "name" field.</summary>
-    public const int NameFieldNumber = 1;
-    private string name_ = "";
-    /// <summary>
-    /// The fully qualified message name.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string Name {
-      get { return name_; }
-      set {
-        name_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-
-    /// <summary>Field number for the "fields" field.</summary>
-    public const int FieldsFieldNumber = 2;
-    private static readonly pb::FieldCodec<global::Google.Protobuf.WellKnownTypes.Field> _repeated_fields_codec
-        = pb::FieldCodec.ForMessage(18, global::Google.Protobuf.WellKnownTypes.Field.Parser);
-    private readonly pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Field> fields_ = new pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Field>();
-    /// <summary>
-    /// The list of fields.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Field> Fields {
-      get { return fields_; }
-    }
-
-    /// <summary>Field number for the "oneofs" field.</summary>
-    public const int OneofsFieldNumber = 3;
-    private static readonly pb::FieldCodec<string> _repeated_oneofs_codec
-        = pb::FieldCodec.ForString(26);
-    private readonly pbc::RepeatedField<string> oneofs_ = new pbc::RepeatedField<string>();
-    /// <summary>
-    /// The list of types appearing in `oneof` definitions in this type.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<string> Oneofs {
-      get { return oneofs_; }
-    }
-
-    /// <summary>Field number for the "options" field.</summary>
-    public const int OptionsFieldNumber = 4;
-    private static readonly pb::FieldCodec<global::Google.Protobuf.WellKnownTypes.Option> _repeated_options_codec
-        = pb::FieldCodec.ForMessage(34, global::Google.Protobuf.WellKnownTypes.Option.Parser);
-    private readonly pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Option> options_ = new pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Option>();
-    /// <summary>
-    /// The protocol buffer options.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Option> Options {
-      get { return options_; }
-    }
-
-    /// <summary>Field number for the "source_context" field.</summary>
-    public const int SourceContextFieldNumber = 5;
-    private global::Google.Protobuf.WellKnownTypes.SourceContext sourceContext_;
-    /// <summary>
-    /// The source context.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.WellKnownTypes.SourceContext SourceContext {
-      get { return sourceContext_; }
-      set {
-        sourceContext_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "syntax" field.</summary>
-    public const int SyntaxFieldNumber = 6;
-    private global::Google.Protobuf.WellKnownTypes.Syntax syntax_ = global::Google.Protobuf.WellKnownTypes.Syntax.Proto2;
-    /// <summary>
-    /// The source syntax.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.WellKnownTypes.Syntax Syntax {
-      get { return syntax_; }
-      set {
-        syntax_ = value;
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as Type);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(Type other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (Name != other.Name) return false;
-      if(!fields_.Equals(other.fields_)) return false;
-      if(!oneofs_.Equals(other.oneofs_)) return false;
-      if(!options_.Equals(other.options_)) return false;
-      if (!object.Equals(SourceContext, other.SourceContext)) return false;
-      if (Syntax != other.Syntax) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (Name.Length != 0) hash ^= Name.GetHashCode();
-      hash ^= fields_.GetHashCode();
-      hash ^= oneofs_.GetHashCode();
-      hash ^= options_.GetHashCode();
-      if (sourceContext_ != null) hash ^= SourceContext.GetHashCode();
-      if (Syntax != global::Google.Protobuf.WellKnownTypes.Syntax.Proto2) hash ^= Syntax.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (Name.Length != 0) {
-        output.WriteRawTag(10);
-        output.WriteString(Name);
-      }
-      fields_.WriteTo(output, _repeated_fields_codec);
-      oneofs_.WriteTo(output, _repeated_oneofs_codec);
-      options_.WriteTo(output, _repeated_options_codec);
-      if (sourceContext_ != null) {
-        output.WriteRawTag(42);
-        output.WriteMessage(SourceContext);
-      }
-      if (Syntax != global::Google.Protobuf.WellKnownTypes.Syntax.Proto2) {
-        output.WriteRawTag(48);
-        output.WriteEnum((int) Syntax);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (Name.Length != 0) {
-        output.WriteRawTag(10);
-        output.WriteString(Name);
-      }
-      fields_.WriteTo(ref output, _repeated_fields_codec);
-      oneofs_.WriteTo(ref output, _repeated_oneofs_codec);
-      options_.WriteTo(ref output, _repeated_options_codec);
-      if (sourceContext_ != null) {
-        output.WriteRawTag(42);
-        output.WriteMessage(SourceContext);
-      }
-      if (Syntax != global::Google.Protobuf.WellKnownTypes.Syntax.Proto2) {
-        output.WriteRawTag(48);
-        output.WriteEnum((int) Syntax);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (Name.Length != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(Name);
-      }
-      size += fields_.CalculateSize(_repeated_fields_codec);
-      size += oneofs_.CalculateSize(_repeated_oneofs_codec);
-      size += options_.CalculateSize(_repeated_options_codec);
-      if (sourceContext_ != null) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(SourceContext);
-      }
-      if (Syntax != global::Google.Protobuf.WellKnownTypes.Syntax.Proto2) {
-        size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Syntax);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(Type other) {
-      if (other == null) {
-        return;
-      }
-      if (other.Name.Length != 0) {
-        Name = other.Name;
-      }
-      fields_.Add(other.fields_);
-      oneofs_.Add(other.oneofs_);
-      options_.Add(other.options_);
-      if (other.sourceContext_ != null) {
-        if (sourceContext_ == null) {
-          SourceContext = new global::Google.Protobuf.WellKnownTypes.SourceContext();
-        }
-        SourceContext.MergeFrom(other.SourceContext);
-      }
-      if (other.Syntax != global::Google.Protobuf.WellKnownTypes.Syntax.Proto2) {
-        Syntax = other.Syntax;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 10: {
-            Name = input.ReadString();
-            break;
-          }
-          case 18: {
-            fields_.AddEntriesFrom(input, _repeated_fields_codec);
-            break;
-          }
-          case 26: {
-            oneofs_.AddEntriesFrom(input, _repeated_oneofs_codec);
-            break;
-          }
-          case 34: {
-            options_.AddEntriesFrom(input, _repeated_options_codec);
-            break;
-          }
-          case 42: {
-            if (sourceContext_ == null) {
-              SourceContext = new global::Google.Protobuf.WellKnownTypes.SourceContext();
-            }
-            input.ReadMessage(SourceContext);
-            break;
-          }
-          case 48: {
-            Syntax = (global::Google.Protobuf.WellKnownTypes.Syntax) input.ReadEnum();
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 10: {
-            Name = input.ReadString();
-            break;
-          }
-          case 18: {
-            fields_.AddEntriesFrom(ref input, _repeated_fields_codec);
-            break;
-          }
-          case 26: {
-            oneofs_.AddEntriesFrom(ref input, _repeated_oneofs_codec);
-            break;
-          }
-          case 34: {
-            options_.AddEntriesFrom(ref input, _repeated_options_codec);
-            break;
-          }
-          case 42: {
-            if (sourceContext_ == null) {
-              SourceContext = new global::Google.Protobuf.WellKnownTypes.SourceContext();
-            }
-            input.ReadMessage(SourceContext);
-            break;
-          }
-          case 48: {
-            Syntax = (global::Google.Protobuf.WellKnownTypes.Syntax) input.ReadEnum();
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  /// <summary>
-  /// A single field of a message type.
-  /// </summary>
-  public sealed partial class Field : pb::IMessage<Field>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<Field> _parser = new pb::MessageParser<Field>(() => new Field());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<Field> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.WellKnownTypes.TypeReflection.Descriptor.MessageTypes[1]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Field() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Field(Field other) : this() {
-      kind_ = other.kind_;
-      cardinality_ = other.cardinality_;
-      number_ = other.number_;
-      name_ = other.name_;
-      typeUrl_ = other.typeUrl_;
-      oneofIndex_ = other.oneofIndex_;
-      packed_ = other.packed_;
-      options_ = other.options_.Clone();
-      jsonName_ = other.jsonName_;
-      defaultValue_ = other.defaultValue_;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Field Clone() {
-      return new Field(this);
-    }
-
-    /// <summary>Field number for the "kind" field.</summary>
-    public const int KindFieldNumber = 1;
-    private global::Google.Protobuf.WellKnownTypes.Field.Types.Kind kind_ = global::Google.Protobuf.WellKnownTypes.Field.Types.Kind.TypeUnknown;
-    /// <summary>
-    /// The field type.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.WellKnownTypes.Field.Types.Kind Kind {
-      get { return kind_; }
-      set {
-        kind_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "cardinality" field.</summary>
-    public const int CardinalityFieldNumber = 2;
-    private global::Google.Protobuf.WellKnownTypes.Field.Types.Cardinality cardinality_ = global::Google.Protobuf.WellKnownTypes.Field.Types.Cardinality.Unknown;
-    /// <summary>
-    /// The field cardinality.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.WellKnownTypes.Field.Types.Cardinality Cardinality {
-      get { return cardinality_; }
-      set {
-        cardinality_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "number" field.</summary>
-    public const int NumberFieldNumber = 3;
-    private int number_;
-    /// <summary>
-    /// The field number.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int Number {
-      get { return number_; }
-      set {
-        number_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "name" field.</summary>
-    public const int NameFieldNumber = 4;
-    private string name_ = "";
-    /// <summary>
-    /// The field name.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string Name {
-      get { return name_; }
-      set {
-        name_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-
-    /// <summary>Field number for the "type_url" field.</summary>
-    public const int TypeUrlFieldNumber = 6;
-    private string typeUrl_ = "";
-    /// <summary>
-    /// The field type URL, without the scheme, for message or enumeration
-    /// types. Example: `"type.googleapis.com/google.protobuf.Timestamp"`.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string TypeUrl {
-      get { return typeUrl_; }
-      set {
-        typeUrl_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-
-    /// <summary>Field number for the "oneof_index" field.</summary>
-    public const int OneofIndexFieldNumber = 7;
-    private int oneofIndex_;
-    /// <summary>
-    /// The index of the field type in `Type.oneofs`, for message or enumeration
-    /// types. The first type has index 1; zero means the type is not in the list.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int OneofIndex {
-      get { return oneofIndex_; }
-      set {
-        oneofIndex_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "packed" field.</summary>
-    public const int PackedFieldNumber = 8;
-    private bool packed_;
-    /// <summary>
-    /// Whether to use alternative packed wire representation.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Packed {
-      get { return packed_; }
-      set {
-        packed_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "options" field.</summary>
-    public const int OptionsFieldNumber = 9;
-    private static readonly pb::FieldCodec<global::Google.Protobuf.WellKnownTypes.Option> _repeated_options_codec
-        = pb::FieldCodec.ForMessage(74, global::Google.Protobuf.WellKnownTypes.Option.Parser);
-    private readonly pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Option> options_ = new pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Option>();
-    /// <summary>
-    /// The protocol buffer options.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Option> Options {
-      get { return options_; }
-    }
-
-    /// <summary>Field number for the "json_name" field.</summary>
-    public const int JsonNameFieldNumber = 10;
-    private string jsonName_ = "";
-    /// <summary>
-    /// The field JSON name.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string JsonName {
-      get { return jsonName_; }
-      set {
-        jsonName_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-
-    /// <summary>Field number for the "default_value" field.</summary>
-    public const int DefaultValueFieldNumber = 11;
-    private string defaultValue_ = "";
-    /// <summary>
-    /// The string value of the default value of this field. Proto2 syntax only.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string DefaultValue {
-      get { return defaultValue_; }
-      set {
-        defaultValue_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as Field);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(Field other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (Kind != other.Kind) return false;
-      if (Cardinality != other.Cardinality) return false;
-      if (Number != other.Number) return false;
-      if (Name != other.Name) return false;
-      if (TypeUrl != other.TypeUrl) return false;
-      if (OneofIndex != other.OneofIndex) return false;
-      if (Packed != other.Packed) return false;
-      if(!options_.Equals(other.options_)) return false;
-      if (JsonName != other.JsonName) return false;
-      if (DefaultValue != other.DefaultValue) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (Kind != global::Google.Protobuf.WellKnownTypes.Field.Types.Kind.TypeUnknown) hash ^= Kind.GetHashCode();
-      if (Cardinality != global::Google.Protobuf.WellKnownTypes.Field.Types.Cardinality.Unknown) hash ^= Cardinality.GetHashCode();
-      if (Number != 0) hash ^= Number.GetHashCode();
-      if (Name.Length != 0) hash ^= Name.GetHashCode();
-      if (TypeUrl.Length != 0) hash ^= TypeUrl.GetHashCode();
-      if (OneofIndex != 0) hash ^= OneofIndex.GetHashCode();
-      if (Packed != false) hash ^= Packed.GetHashCode();
-      hash ^= options_.GetHashCode();
-      if (JsonName.Length != 0) hash ^= JsonName.GetHashCode();
-      if (DefaultValue.Length != 0) hash ^= DefaultValue.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (Kind != global::Google.Protobuf.WellKnownTypes.Field.Types.Kind.TypeUnknown) {
-        output.WriteRawTag(8);
-        output.WriteEnum((int) Kind);
-      }
-      if (Cardinality != global::Google.Protobuf.WellKnownTypes.Field.Types.Cardinality.Unknown) {
-        output.WriteRawTag(16);
-        output.WriteEnum((int) Cardinality);
-      }
-      if (Number != 0) {
-        output.WriteRawTag(24);
-        output.WriteInt32(Number);
-      }
-      if (Name.Length != 0) {
-        output.WriteRawTag(34);
-        output.WriteString(Name);
-      }
-      if (TypeUrl.Length != 0) {
-        output.WriteRawTag(50);
-        output.WriteString(TypeUrl);
-      }
-      if (OneofIndex != 0) {
-        output.WriteRawTag(56);
-        output.WriteInt32(OneofIndex);
-      }
-      if (Packed != false) {
-        output.WriteRawTag(64);
-        output.WriteBool(Packed);
-      }
-      options_.WriteTo(output, _repeated_options_codec);
-      if (JsonName.Length != 0) {
-        output.WriteRawTag(82);
-        output.WriteString(JsonName);
-      }
-      if (DefaultValue.Length != 0) {
-        output.WriteRawTag(90);
-        output.WriteString(DefaultValue);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (Kind != global::Google.Protobuf.WellKnownTypes.Field.Types.Kind.TypeUnknown) {
-        output.WriteRawTag(8);
-        output.WriteEnum((int) Kind);
-      }
-      if (Cardinality != global::Google.Protobuf.WellKnownTypes.Field.Types.Cardinality.Unknown) {
-        output.WriteRawTag(16);
-        output.WriteEnum((int) Cardinality);
-      }
-      if (Number != 0) {
-        output.WriteRawTag(24);
-        output.WriteInt32(Number);
-      }
-      if (Name.Length != 0) {
-        output.WriteRawTag(34);
-        output.WriteString(Name);
-      }
-      if (TypeUrl.Length != 0) {
-        output.WriteRawTag(50);
-        output.WriteString(TypeUrl);
-      }
-      if (OneofIndex != 0) {
-        output.WriteRawTag(56);
-        output.WriteInt32(OneofIndex);
-      }
-      if (Packed != false) {
-        output.WriteRawTag(64);
-        output.WriteBool(Packed);
-      }
-      options_.WriteTo(ref output, _repeated_options_codec);
-      if (JsonName.Length != 0) {
-        output.WriteRawTag(82);
-        output.WriteString(JsonName);
-      }
-      if (DefaultValue.Length != 0) {
-        output.WriteRawTag(90);
-        output.WriteString(DefaultValue);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (Kind != global::Google.Protobuf.WellKnownTypes.Field.Types.Kind.TypeUnknown) {
-        size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Kind);
-      }
-      if (Cardinality != global::Google.Protobuf.WellKnownTypes.Field.Types.Cardinality.Unknown) {
-        size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Cardinality);
-      }
-      if (Number != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(Number);
-      }
-      if (Name.Length != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(Name);
-      }
-      if (TypeUrl.Length != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(TypeUrl);
-      }
-      if (OneofIndex != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(OneofIndex);
-      }
-      if (Packed != false) {
-        size += 1 + 1;
-      }
-      size += options_.CalculateSize(_repeated_options_codec);
-      if (JsonName.Length != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(JsonName);
-      }
-      if (DefaultValue.Length != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(DefaultValue);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(Field other) {
-      if (other == null) {
-        return;
-      }
-      if (other.Kind != global::Google.Protobuf.WellKnownTypes.Field.Types.Kind.TypeUnknown) {
-        Kind = other.Kind;
-      }
-      if (other.Cardinality != global::Google.Protobuf.WellKnownTypes.Field.Types.Cardinality.Unknown) {
-        Cardinality = other.Cardinality;
-      }
-      if (other.Number != 0) {
-        Number = other.Number;
-      }
-      if (other.Name.Length != 0) {
-        Name = other.Name;
-      }
-      if (other.TypeUrl.Length != 0) {
-        TypeUrl = other.TypeUrl;
-      }
-      if (other.OneofIndex != 0) {
-        OneofIndex = other.OneofIndex;
-      }
-      if (other.Packed != false) {
-        Packed = other.Packed;
-      }
-      options_.Add(other.options_);
-      if (other.JsonName.Length != 0) {
-        JsonName = other.JsonName;
-      }
-      if (other.DefaultValue.Length != 0) {
-        DefaultValue = other.DefaultValue;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 8: {
-            Kind = (global::Google.Protobuf.WellKnownTypes.Field.Types.Kind) input.ReadEnum();
-            break;
-          }
-          case 16: {
-            Cardinality = (global::Google.Protobuf.WellKnownTypes.Field.Types.Cardinality) input.ReadEnum();
-            break;
-          }
-          case 24: {
-            Number = input.ReadInt32();
-            break;
-          }
-          case 34: {
-            Name = input.ReadString();
-            break;
-          }
-          case 50: {
-            TypeUrl = input.ReadString();
-            break;
-          }
-          case 56: {
-            OneofIndex = input.ReadInt32();
-            break;
-          }
-          case 64: {
-            Packed = input.ReadBool();
-            break;
-          }
-          case 74: {
-            options_.AddEntriesFrom(input, _repeated_options_codec);
-            break;
-          }
-          case 82: {
-            JsonName = input.ReadString();
-            break;
-          }
-          case 90: {
-            DefaultValue = input.ReadString();
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 8: {
-            Kind = (global::Google.Protobuf.WellKnownTypes.Field.Types.Kind) input.ReadEnum();
-            break;
-          }
-          case 16: {
-            Cardinality = (global::Google.Protobuf.WellKnownTypes.Field.Types.Cardinality) input.ReadEnum();
-            break;
-          }
-          case 24: {
-            Number = input.ReadInt32();
-            break;
-          }
-          case 34: {
-            Name = input.ReadString();
-            break;
-          }
-          case 50: {
-            TypeUrl = input.ReadString();
-            break;
-          }
-          case 56: {
-            OneofIndex = input.ReadInt32();
-            break;
-          }
-          case 64: {
-            Packed = input.ReadBool();
-            break;
-          }
-          case 74: {
-            options_.AddEntriesFrom(ref input, _repeated_options_codec);
-            break;
-          }
-          case 82: {
-            JsonName = input.ReadString();
-            break;
-          }
-          case 90: {
-            DefaultValue = input.ReadString();
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-    #region Nested types
-    /// <summary>Container for nested types declared in the Field message type.</summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static partial class Types {
-      /// <summary>
-      /// Basic field types.
-      /// </summary>
-      public enum Kind {
-        /// <summary>
-        /// Field type unknown.
-        /// </summary>
-        [pbr::OriginalName("TYPE_UNKNOWN")] TypeUnknown = 0,
-        /// <summary>
-        /// Field type double.
-        /// </summary>
-        [pbr::OriginalName("TYPE_DOUBLE")] TypeDouble = 1,
-        /// <summary>
-        /// Field type float.
-        /// </summary>
-        [pbr::OriginalName("TYPE_FLOAT")] TypeFloat = 2,
-        /// <summary>
-        /// Field type int64.
-        /// </summary>
-        [pbr::OriginalName("TYPE_INT64")] TypeInt64 = 3,
-        /// <summary>
-        /// Field type uint64.
-        /// </summary>
-        [pbr::OriginalName("TYPE_UINT64")] TypeUint64 = 4,
-        /// <summary>
-        /// Field type int32.
-        /// </summary>
-        [pbr::OriginalName("TYPE_INT32")] TypeInt32 = 5,
-        /// <summary>
-        /// Field type fixed64.
-        /// </summary>
-        [pbr::OriginalName("TYPE_FIXED64")] TypeFixed64 = 6,
-        /// <summary>
-        /// Field type fixed32.
-        /// </summary>
-        [pbr::OriginalName("TYPE_FIXED32")] TypeFixed32 = 7,
-        /// <summary>
-        /// Field type bool.
-        /// </summary>
-        [pbr::OriginalName("TYPE_BOOL")] TypeBool = 8,
-        /// <summary>
-        /// Field type string.
-        /// </summary>
-        [pbr::OriginalName("TYPE_STRING")] TypeString = 9,
-        /// <summary>
-        /// Field type group. Proto2 syntax only, and deprecated.
-        /// </summary>
-        [pbr::OriginalName("TYPE_GROUP")] TypeGroup = 10,
-        /// <summary>
-        /// Field type message.
-        /// </summary>
-        [pbr::OriginalName("TYPE_MESSAGE")] TypeMessage = 11,
-        /// <summary>
-        /// Field type bytes.
-        /// </summary>
-        [pbr::OriginalName("TYPE_BYTES")] TypeBytes = 12,
-        /// <summary>
-        /// Field type uint32.
-        /// </summary>
-        [pbr::OriginalName("TYPE_UINT32")] TypeUint32 = 13,
-        /// <summary>
-        /// Field type enum.
-        /// </summary>
-        [pbr::OriginalName("TYPE_ENUM")] TypeEnum = 14,
-        /// <summary>
-        /// Field type sfixed32.
-        /// </summary>
-        [pbr::OriginalName("TYPE_SFIXED32")] TypeSfixed32 = 15,
-        /// <summary>
-        /// Field type sfixed64.
-        /// </summary>
-        [pbr::OriginalName("TYPE_SFIXED64")] TypeSfixed64 = 16,
-        /// <summary>
-        /// Field type sint32.
-        /// </summary>
-        [pbr::OriginalName("TYPE_SINT32")] TypeSint32 = 17,
-        /// <summary>
-        /// Field type sint64.
-        /// </summary>
-        [pbr::OriginalName("TYPE_SINT64")] TypeSint64 = 18,
-      }
-
-      /// <summary>
-      /// Whether a field is optional, required, or repeated.
-      /// </summary>
-      public enum Cardinality {
-        /// <summary>
-        /// For fields with unknown cardinality.
-        /// </summary>
-        [pbr::OriginalName("CARDINALITY_UNKNOWN")] Unknown = 0,
-        /// <summary>
-        /// For optional fields.
-        /// </summary>
-        [pbr::OriginalName("CARDINALITY_OPTIONAL")] Optional = 1,
-        /// <summary>
-        /// For required fields. Proto2 syntax only.
-        /// </summary>
-        [pbr::OriginalName("CARDINALITY_REQUIRED")] Required = 2,
-        /// <summary>
-        /// For repeated fields.
-        /// </summary>
-        [pbr::OriginalName("CARDINALITY_REPEATED")] Repeated = 3,
-      }
-
-    }
-    #endregion
-
-  }
-
-  /// <summary>
-  /// Enum type definition.
-  /// </summary>
-  public sealed partial class Enum : pb::IMessage<Enum>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<Enum> _parser = new pb::MessageParser<Enum>(() => new Enum());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<Enum> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.WellKnownTypes.TypeReflection.Descriptor.MessageTypes[2]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Enum() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Enum(Enum other) : this() {
-      name_ = other.name_;
-      enumvalue_ = other.enumvalue_.Clone();
-      options_ = other.options_.Clone();
-      sourceContext_ = other.sourceContext_ != null ? other.sourceContext_.Clone() : null;
-      syntax_ = other.syntax_;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Enum Clone() {
-      return new Enum(this);
-    }
-
-    /// <summary>Field number for the "name" field.</summary>
-    public const int NameFieldNumber = 1;
-    private string name_ = "";
-    /// <summary>
-    /// Enum type name.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string Name {
-      get { return name_; }
-      set {
-        name_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-
-    /// <summary>Field number for the "enumvalue" field.</summary>
-    public const int EnumvalueFieldNumber = 2;
-    private static readonly pb::FieldCodec<global::Google.Protobuf.WellKnownTypes.EnumValue> _repeated_enumvalue_codec
-        = pb::FieldCodec.ForMessage(18, global::Google.Protobuf.WellKnownTypes.EnumValue.Parser);
-    private readonly pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.EnumValue> enumvalue_ = new pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.EnumValue>();
-    /// <summary>
-    /// Enum value definitions.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.EnumValue> Enumvalue {
-      get { return enumvalue_; }
-    }
-
-    /// <summary>Field number for the "options" field.</summary>
-    public const int OptionsFieldNumber = 3;
-    private static readonly pb::FieldCodec<global::Google.Protobuf.WellKnownTypes.Option> _repeated_options_codec
-        = pb::FieldCodec.ForMessage(26, global::Google.Protobuf.WellKnownTypes.Option.Parser);
-    private readonly pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Option> options_ = new pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Option>();
-    /// <summary>
-    /// Protocol buffer options.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Option> Options {
-      get { return options_; }
-    }
-
-    /// <summary>Field number for the "source_context" field.</summary>
-    public const int SourceContextFieldNumber = 4;
-    private global::Google.Protobuf.WellKnownTypes.SourceContext sourceContext_;
-    /// <summary>
-    /// The source context.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.WellKnownTypes.SourceContext SourceContext {
-      get { return sourceContext_; }
-      set {
-        sourceContext_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "syntax" field.</summary>
-    public const int SyntaxFieldNumber = 5;
-    private global::Google.Protobuf.WellKnownTypes.Syntax syntax_ = global::Google.Protobuf.WellKnownTypes.Syntax.Proto2;
-    /// <summary>
-    /// The source syntax.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.WellKnownTypes.Syntax Syntax {
-      get { return syntax_; }
-      set {
-        syntax_ = value;
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as Enum);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(Enum other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (Name != other.Name) return false;
-      if(!enumvalue_.Equals(other.enumvalue_)) return false;
-      if(!options_.Equals(other.options_)) return false;
-      if (!object.Equals(SourceContext, other.SourceContext)) return false;
-      if (Syntax != other.Syntax) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (Name.Length != 0) hash ^= Name.GetHashCode();
-      hash ^= enumvalue_.GetHashCode();
-      hash ^= options_.GetHashCode();
-      if (sourceContext_ != null) hash ^= SourceContext.GetHashCode();
-      if (Syntax != global::Google.Protobuf.WellKnownTypes.Syntax.Proto2) hash ^= Syntax.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (Name.Length != 0) {
-        output.WriteRawTag(10);
-        output.WriteString(Name);
-      }
-      enumvalue_.WriteTo(output, _repeated_enumvalue_codec);
-      options_.WriteTo(output, _repeated_options_codec);
-      if (sourceContext_ != null) {
-        output.WriteRawTag(34);
-        output.WriteMessage(SourceContext);
-      }
-      if (Syntax != global::Google.Protobuf.WellKnownTypes.Syntax.Proto2) {
-        output.WriteRawTag(40);
-        output.WriteEnum((int) Syntax);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (Name.Length != 0) {
-        output.WriteRawTag(10);
-        output.WriteString(Name);
-      }
-      enumvalue_.WriteTo(ref output, _repeated_enumvalue_codec);
-      options_.WriteTo(ref output, _repeated_options_codec);
-      if (sourceContext_ != null) {
-        output.WriteRawTag(34);
-        output.WriteMessage(SourceContext);
-      }
-      if (Syntax != global::Google.Protobuf.WellKnownTypes.Syntax.Proto2) {
-        output.WriteRawTag(40);
-        output.WriteEnum((int) Syntax);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (Name.Length != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(Name);
-      }
-      size += enumvalue_.CalculateSize(_repeated_enumvalue_codec);
-      size += options_.CalculateSize(_repeated_options_codec);
-      if (sourceContext_ != null) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(SourceContext);
-      }
-      if (Syntax != global::Google.Protobuf.WellKnownTypes.Syntax.Proto2) {
-        size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Syntax);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(Enum other) {
-      if (other == null) {
-        return;
-      }
-      if (other.Name.Length != 0) {
-        Name = other.Name;
-      }
-      enumvalue_.Add(other.enumvalue_);
-      options_.Add(other.options_);
-      if (other.sourceContext_ != null) {
-        if (sourceContext_ == null) {
-          SourceContext = new global::Google.Protobuf.WellKnownTypes.SourceContext();
-        }
-        SourceContext.MergeFrom(other.SourceContext);
-      }
-      if (other.Syntax != global::Google.Protobuf.WellKnownTypes.Syntax.Proto2) {
-        Syntax = other.Syntax;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 10: {
-            Name = input.ReadString();
-            break;
-          }
-          case 18: {
-            enumvalue_.AddEntriesFrom(input, _repeated_enumvalue_codec);
-            break;
-          }
-          case 26: {
-            options_.AddEntriesFrom(input, _repeated_options_codec);
-            break;
-          }
-          case 34: {
-            if (sourceContext_ == null) {
-              SourceContext = new global::Google.Protobuf.WellKnownTypes.SourceContext();
-            }
-            input.ReadMessage(SourceContext);
-            break;
-          }
-          case 40: {
-            Syntax = (global::Google.Protobuf.WellKnownTypes.Syntax) input.ReadEnum();
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 10: {
-            Name = input.ReadString();
-            break;
-          }
-          case 18: {
-            enumvalue_.AddEntriesFrom(ref input, _repeated_enumvalue_codec);
-            break;
-          }
-          case 26: {
-            options_.AddEntriesFrom(ref input, _repeated_options_codec);
-            break;
-          }
-          case 34: {
-            if (sourceContext_ == null) {
-              SourceContext = new global::Google.Protobuf.WellKnownTypes.SourceContext();
-            }
-            input.ReadMessage(SourceContext);
-            break;
-          }
-          case 40: {
-            Syntax = (global::Google.Protobuf.WellKnownTypes.Syntax) input.ReadEnum();
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  /// <summary>
-  /// Enum value definition.
-  /// </summary>
-  public sealed partial class EnumValue : pb::IMessage<EnumValue>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<EnumValue> _parser = new pb::MessageParser<EnumValue>(() => new EnumValue());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<EnumValue> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.WellKnownTypes.TypeReflection.Descriptor.MessageTypes[3]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public EnumValue() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public EnumValue(EnumValue other) : this() {
-      name_ = other.name_;
-      number_ = other.number_;
-      options_ = other.options_.Clone();
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public EnumValue Clone() {
-      return new EnumValue(this);
-    }
-
-    /// <summary>Field number for the "name" field.</summary>
-    public const int NameFieldNumber = 1;
-    private string name_ = "";
-    /// <summary>
-    /// Enum value name.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string Name {
-      get { return name_; }
-      set {
-        name_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-
-    /// <summary>Field number for the "number" field.</summary>
-    public const int NumberFieldNumber = 2;
-    private int number_;
-    /// <summary>
-    /// Enum value number.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int Number {
-      get { return number_; }
-      set {
-        number_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "options" field.</summary>
-    public const int OptionsFieldNumber = 3;
-    private static readonly pb::FieldCodec<global::Google.Protobuf.WellKnownTypes.Option> _repeated_options_codec
-        = pb::FieldCodec.ForMessage(26, global::Google.Protobuf.WellKnownTypes.Option.Parser);
-    private readonly pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Option> options_ = new pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Option>();
-    /// <summary>
-    /// Protocol buffer options.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pbc::RepeatedField<global::Google.Protobuf.WellKnownTypes.Option> Options {
-      get { return options_; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as EnumValue);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(EnumValue other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (Name != other.Name) return false;
-      if (Number != other.Number) return false;
-      if(!options_.Equals(other.options_)) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (Name.Length != 0) hash ^= Name.GetHashCode();
-      if (Number != 0) hash ^= Number.GetHashCode();
-      hash ^= options_.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (Name.Length != 0) {
-        output.WriteRawTag(10);
-        output.WriteString(Name);
-      }
-      if (Number != 0) {
-        output.WriteRawTag(16);
-        output.WriteInt32(Number);
-      }
-      options_.WriteTo(output, _repeated_options_codec);
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (Name.Length != 0) {
-        output.WriteRawTag(10);
-        output.WriteString(Name);
-      }
-      if (Number != 0) {
-        output.WriteRawTag(16);
-        output.WriteInt32(Number);
-      }
-      options_.WriteTo(ref output, _repeated_options_codec);
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (Name.Length != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(Name);
-      }
-      if (Number != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(Number);
-      }
-      size += options_.CalculateSize(_repeated_options_codec);
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(EnumValue other) {
-      if (other == null) {
-        return;
-      }
-      if (other.Name.Length != 0) {
-        Name = other.Name;
-      }
-      if (other.Number != 0) {
-        Number = other.Number;
-      }
-      options_.Add(other.options_);
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 10: {
-            Name = input.ReadString();
-            break;
-          }
-          case 16: {
-            Number = input.ReadInt32();
-            break;
-          }
-          case 26: {
-            options_.AddEntriesFrom(input, _repeated_options_codec);
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 10: {
-            Name = input.ReadString();
-            break;
-          }
-          case 16: {
-            Number = input.ReadInt32();
-            break;
-          }
-          case 26: {
-            options_.AddEntriesFrom(ref input, _repeated_options_codec);
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  /// <summary>
-  /// A protocol buffer option, which can be attached to a message, field,
-  /// enumeration, etc.
-  /// </summary>
-  public sealed partial class Option : pb::IMessage<Option>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<Option> _parser = new pb::MessageParser<Option>(() => new Option());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<Option> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.WellKnownTypes.TypeReflection.Descriptor.MessageTypes[4]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Option() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Option(Option other) : this() {
-      name_ = other.name_;
-      value_ = other.value_ != null ? other.value_.Clone() : null;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Option Clone() {
-      return new Option(this);
-    }
-
-    /// <summary>Field number for the "name" field.</summary>
-    public const int NameFieldNumber = 1;
-    private string name_ = "";
-    /// <summary>
-    /// The option's name. For protobuf built-in options (options defined in
-    /// descriptor.proto), this is the short name. For example, `"map_entry"`.
-    /// For custom options, it should be the fully-qualified name. For example,
-    /// `"google.api.http"`.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string Name {
-      get { return name_; }
-      set {
-        name_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-
-    /// <summary>Field number for the "value" field.</summary>
-    public const int ValueFieldNumber = 2;
-    private global::Google.Protobuf.WellKnownTypes.Any value_;
-    /// <summary>
-    /// The option's value packed in an Any message. If the value is a primitive,
-    /// the corresponding wrapper type defined in google/protobuf/wrappers.proto
-    /// should be used. If the value is an enum, it should be stored as an int32
-    /// value using the google.protobuf.Int32Value type.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public global::Google.Protobuf.WellKnownTypes.Any Value {
-      get { return value_; }
-      set {
-        value_ = value;
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as Option);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(Option other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (Name != other.Name) return false;
-      if (!object.Equals(Value, other.Value)) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (Name.Length != 0) hash ^= Name.GetHashCode();
-      if (value_ != null) hash ^= Value.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (Name.Length != 0) {
-        output.WriteRawTag(10);
-        output.WriteString(Name);
-      }
-      if (value_ != null) {
-        output.WriteRawTag(18);
-        output.WriteMessage(Value);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (Name.Length != 0) {
-        output.WriteRawTag(10);
-        output.WriteString(Name);
-      }
-      if (value_ != null) {
-        output.WriteRawTag(18);
-        output.WriteMessage(Value);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (Name.Length != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(Name);
-      }
-      if (value_ != null) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(Value);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(Option other) {
-      if (other == null) {
-        return;
-      }
-      if (other.Name.Length != 0) {
-        Name = other.Name;
-      }
-      if (other.value_ != null) {
-        if (value_ == null) {
-          Value = new global::Google.Protobuf.WellKnownTypes.Any();
-        }
-        Value.MergeFrom(other.Value);
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 10: {
-            Name = input.ReadString();
-            break;
-          }
-          case 18: {
-            if (value_ == null) {
-              Value = new global::Google.Protobuf.WellKnownTypes.Any();
-            }
-            input.ReadMessage(Value);
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 10: {
-            Name = input.ReadString();
-            break;
-          }
-          case 18: {
-            if (value_ == null) {
-              Value = new global::Google.Protobuf.WellKnownTypes.Any();
-            }
-            input.ReadMessage(Value);
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  #endregion
-
-}
-
-#endregion Designer generated code
diff --git a/libs/protobuf/csharp/src/Google.Protobuf/WellKnownTypes/ValuePartial.cs b/libs/protobuf/csharp/src/Google.Protobuf/WellKnownTypes/ValuePartial.cs
deleted file mode 100644
index d34b560..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf/WellKnownTypes/ValuePartial.cs
+++ /dev/null
@@ -1,99 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-namespace Google.Protobuf.WellKnownTypes
-{
-    public partial class Value
-    {
-        /// <summary>
-        /// Convenience method to create a Value message with a string value.
-        /// </summary>
-        /// <param name="value">Value to set for the StringValue property.</param>
-        /// <returns>A newly-created Value message with the given value.</returns>
-        public static Value ForString(string value)
-        {
-            ProtoPreconditions.CheckNotNull(value, "value");
-            return new Value { StringValue = value };
-        }
-
-        /// <summary>
-        /// Convenience method to create a Value message with a number value.
-        /// </summary>
-        /// <param name="value">Value to set for the NumberValue property.</param>
-        /// <returns>A newly-created Value message with the given value.</returns>
-        public static Value ForNumber(double value)
-        {
-            return new Value { NumberValue = value };
-        }
-
-        /// <summary>
-        /// Convenience method to create a Value message with a Boolean value.
-        /// </summary>
-        /// <param name="value">Value to set for the BoolValue property.</param>
-        /// <returns>A newly-created Value message with the given value.</returns>
-        public static Value ForBool(bool value)
-        {
-            return new Value { BoolValue = value };
-        }
-
-        /// <summary>
-        /// Convenience method to create a Value message with a null initial value.
-        /// </summary>
-        /// <returns>A newly-created Value message a null initial value.</returns>
-        public static Value ForNull()
-        {
-            return new Value { NullValue = 0 };
-        }
-
-        /// <summary>
-        /// Convenience method to create a Value message with an initial list of values.
-        /// </summary>
-        /// <remarks>The values provided are not cloned; the references are copied directly.</remarks>
-        /// <returns>A newly-created Value message an initial list value.</returns>
-        public static Value ForList(params Value[] values)
-        {
-            ProtoPreconditions.CheckNotNull(values, "values");
-            return new Value { ListValue = new ListValue { Values = { values } } };
-        }
-
-        /// <summary>
-        /// Convenience method to create a Value message with an initial struct value
-        /// </summary>
-        /// <remarks>The value provided is not cloned; the reference is copied directly.</remarks>
-        /// <returns>A newly-created Value message an initial struct value.</returns>
-        public static Value ForStruct(Struct value)
-        {
-            ProtoPreconditions.CheckNotNull(value, "value");
-            return new Value { StructValue = value };
-        }
-    }
-}
diff --git a/libs/protobuf/csharp/src/Google.Protobuf/WellKnownTypes/Wrappers.cs b/libs/protobuf/csharp/src/Google.Protobuf/WellKnownTypes/Wrappers.cs
deleted file mode 100644
index 307a446..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf/WellKnownTypes/Wrappers.cs
+++ /dev/null
@@ -1,1833 +0,0 @@
-// <auto-generated>
-//     Generated by the protocol buffer compiler.  DO NOT EDIT!
-//     source: google/protobuf/wrappers.proto
-// </auto-generated>
-#pragma warning disable 1591, 0612, 3021, 8981
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-namespace Google.Protobuf.WellKnownTypes {
-
-  /// <summary>Holder for reflection information generated from google/protobuf/wrappers.proto</summary>
-  public static partial class WrappersReflection {
-
-    #region Descriptor
-    /// <summary>File descriptor for google/protobuf/wrappers.proto</summary>
-    public static pbr::FileDescriptor Descriptor {
-      get { return descriptor; }
-    }
-    private static pbr::FileDescriptor descriptor;
-
-    static WrappersReflection() {
-      byte[] descriptorData = global::System.Convert.FromBase64String(
-          string.Concat(
-            "Ch5nb29nbGUvcHJvdG9idWYvd3JhcHBlcnMucHJvdG8SD2dvb2dsZS5wcm90",
-            "b2J1ZiIcCgtEb3VibGVWYWx1ZRINCgV2YWx1ZRgBIAEoASIbCgpGbG9hdFZh",
-            "bHVlEg0KBXZhbHVlGAEgASgCIhsKCkludDY0VmFsdWUSDQoFdmFsdWUYASAB",
-            "KAMiHAoLVUludDY0VmFsdWUSDQoFdmFsdWUYASABKAQiGwoKSW50MzJWYWx1",
-            "ZRINCgV2YWx1ZRgBIAEoBSIcCgtVSW50MzJWYWx1ZRINCgV2YWx1ZRgBIAEo",
-            "DSIaCglCb29sVmFsdWUSDQoFdmFsdWUYASABKAgiHAoLU3RyaW5nVmFsdWUS",
-            "DQoFdmFsdWUYASABKAkiGwoKQnl0ZXNWYWx1ZRINCgV2YWx1ZRgBIAEoDEKD",
-            "AQoTY29tLmdvb2dsZS5wcm90b2J1ZkINV3JhcHBlcnNQcm90b1ABWjFnb29n",
-            "bGUuZ29sYW5nLm9yZy9wcm90b2J1Zi90eXBlcy9rbm93bi93cmFwcGVyc3Bi",
-            "+AEBogIDR1BCqgIeR29vZ2xlLlByb3RvYnVmLldlbGxLbm93blR5cGVzYgZw",
-            "cm90bzM="));
-      descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-          new pbr::FileDescriptor[] { },
-          new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.WellKnownTypes.DoubleValue), global::Google.Protobuf.WellKnownTypes.DoubleValue.Parser, new[]{ "Value" }, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.WellKnownTypes.FloatValue), global::Google.Protobuf.WellKnownTypes.FloatValue.Parser, new[]{ "Value" }, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.WellKnownTypes.Int64Value), global::Google.Protobuf.WellKnownTypes.Int64Value.Parser, new[]{ "Value" }, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.WellKnownTypes.UInt64Value), global::Google.Protobuf.WellKnownTypes.UInt64Value.Parser, new[]{ "Value" }, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.WellKnownTypes.Int32Value), global::Google.Protobuf.WellKnownTypes.Int32Value.Parser, new[]{ "Value" }, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.WellKnownTypes.UInt32Value), global::Google.Protobuf.WellKnownTypes.UInt32Value.Parser, new[]{ "Value" }, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.WellKnownTypes.BoolValue), global::Google.Protobuf.WellKnownTypes.BoolValue.Parser, new[]{ "Value" }, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.WellKnownTypes.StringValue), global::Google.Protobuf.WellKnownTypes.StringValue.Parser, new[]{ "Value" }, null, null, null, null),
-            new pbr::GeneratedClrTypeInfo(typeof(global::Google.Protobuf.WellKnownTypes.BytesValue), global::Google.Protobuf.WellKnownTypes.BytesValue.Parser, new[]{ "Value" }, null, null, null, null)
-          }));
-    }
-    #endregion
-
-  }
-  #region Messages
-  /// <summary>
-  /// Wrapper message for `double`.
-  ///
-  /// The JSON representation for `DoubleValue` is JSON number.
-  /// </summary>
-  public sealed partial class DoubleValue : pb::IMessage<DoubleValue>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<DoubleValue> _parser = new pb::MessageParser<DoubleValue>(() => new DoubleValue());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<DoubleValue> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.WellKnownTypes.WrappersReflection.Descriptor.MessageTypes[0]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public DoubleValue() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public DoubleValue(DoubleValue other) : this() {
-      value_ = other.value_;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public DoubleValue Clone() {
-      return new DoubleValue(this);
-    }
-
-    /// <summary>Field number for the "value" field.</summary>
-    public const int ValueFieldNumber = 1;
-    private double value_;
-    /// <summary>
-    /// The double value.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public double Value {
-      get { return value_; }
-      set {
-        value_ = value;
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as DoubleValue);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(DoubleValue other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (!pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.Equals(Value, other.Value)) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (Value != 0D) hash ^= pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.GetHashCode(Value);
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (Value != 0D) {
-        output.WriteRawTag(9);
-        output.WriteDouble(Value);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (Value != 0D) {
-        output.WriteRawTag(9);
-        output.WriteDouble(Value);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (Value != 0D) {
-        size += 1 + 8;
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(DoubleValue other) {
-      if (other == null) {
-        return;
-      }
-      if (other.Value != 0D) {
-        Value = other.Value;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 9: {
-            Value = input.ReadDouble();
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 9: {
-            Value = input.ReadDouble();
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  /// <summary>
-  /// Wrapper message for `float`.
-  ///
-  /// The JSON representation for `FloatValue` is JSON number.
-  /// </summary>
-  public sealed partial class FloatValue : pb::IMessage<FloatValue>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<FloatValue> _parser = new pb::MessageParser<FloatValue>(() => new FloatValue());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<FloatValue> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.WellKnownTypes.WrappersReflection.Descriptor.MessageTypes[1]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public FloatValue() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public FloatValue(FloatValue other) : this() {
-      value_ = other.value_;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public FloatValue Clone() {
-      return new FloatValue(this);
-    }
-
-    /// <summary>Field number for the "value" field.</summary>
-    public const int ValueFieldNumber = 1;
-    private float value_;
-    /// <summary>
-    /// The float value.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public float Value {
-      get { return value_; }
-      set {
-        value_ = value;
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as FloatValue);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(FloatValue other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (!pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.Equals(Value, other.Value)) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (Value != 0F) hash ^= pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.GetHashCode(Value);
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (Value != 0F) {
-        output.WriteRawTag(13);
-        output.WriteFloat(Value);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (Value != 0F) {
-        output.WriteRawTag(13);
-        output.WriteFloat(Value);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (Value != 0F) {
-        size += 1 + 4;
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(FloatValue other) {
-      if (other == null) {
-        return;
-      }
-      if (other.Value != 0F) {
-        Value = other.Value;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 13: {
-            Value = input.ReadFloat();
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 13: {
-            Value = input.ReadFloat();
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  /// <summary>
-  /// Wrapper message for `int64`.
-  ///
-  /// The JSON representation for `Int64Value` is JSON string.
-  /// </summary>
-  public sealed partial class Int64Value : pb::IMessage<Int64Value>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<Int64Value> _parser = new pb::MessageParser<Int64Value>(() => new Int64Value());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<Int64Value> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.WellKnownTypes.WrappersReflection.Descriptor.MessageTypes[2]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Int64Value() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Int64Value(Int64Value other) : this() {
-      value_ = other.value_;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Int64Value Clone() {
-      return new Int64Value(this);
-    }
-
-    /// <summary>Field number for the "value" field.</summary>
-    public const int ValueFieldNumber = 1;
-    private long value_;
-    /// <summary>
-    /// The int64 value.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public long Value {
-      get { return value_; }
-      set {
-        value_ = value;
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as Int64Value);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(Int64Value other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (Value != other.Value) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (Value != 0L) hash ^= Value.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (Value != 0L) {
-        output.WriteRawTag(8);
-        output.WriteInt64(Value);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (Value != 0L) {
-        output.WriteRawTag(8);
-        output.WriteInt64(Value);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (Value != 0L) {
-        size += 1 + pb::CodedOutputStream.ComputeInt64Size(Value);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(Int64Value other) {
-      if (other == null) {
-        return;
-      }
-      if (other.Value != 0L) {
-        Value = other.Value;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 8: {
-            Value = input.ReadInt64();
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 8: {
-            Value = input.ReadInt64();
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  /// <summary>
-  /// Wrapper message for `uint64`.
-  ///
-  /// The JSON representation for `UInt64Value` is JSON string.
-  /// </summary>
-  public sealed partial class UInt64Value : pb::IMessage<UInt64Value>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<UInt64Value> _parser = new pb::MessageParser<UInt64Value>(() => new UInt64Value());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<UInt64Value> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.WellKnownTypes.WrappersReflection.Descriptor.MessageTypes[3]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public UInt64Value() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public UInt64Value(UInt64Value other) : this() {
-      value_ = other.value_;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public UInt64Value Clone() {
-      return new UInt64Value(this);
-    }
-
-    /// <summary>Field number for the "value" field.</summary>
-    public const int ValueFieldNumber = 1;
-    private ulong value_;
-    /// <summary>
-    /// The uint64 value.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public ulong Value {
-      get { return value_; }
-      set {
-        value_ = value;
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as UInt64Value);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(UInt64Value other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (Value != other.Value) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (Value != 0UL) hash ^= Value.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (Value != 0UL) {
-        output.WriteRawTag(8);
-        output.WriteUInt64(Value);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (Value != 0UL) {
-        output.WriteRawTag(8);
-        output.WriteUInt64(Value);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (Value != 0UL) {
-        size += 1 + pb::CodedOutputStream.ComputeUInt64Size(Value);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(UInt64Value other) {
-      if (other == null) {
-        return;
-      }
-      if (other.Value != 0UL) {
-        Value = other.Value;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 8: {
-            Value = input.ReadUInt64();
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 8: {
-            Value = input.ReadUInt64();
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  /// <summary>
-  /// Wrapper message for `int32`.
-  ///
-  /// The JSON representation for `Int32Value` is JSON number.
-  /// </summary>
-  public sealed partial class Int32Value : pb::IMessage<Int32Value>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<Int32Value> _parser = new pb::MessageParser<Int32Value>(() => new Int32Value());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<Int32Value> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.WellKnownTypes.WrappersReflection.Descriptor.MessageTypes[4]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Int32Value() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Int32Value(Int32Value other) : this() {
-      value_ = other.value_;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public Int32Value Clone() {
-      return new Int32Value(this);
-    }
-
-    /// <summary>Field number for the "value" field.</summary>
-    public const int ValueFieldNumber = 1;
-    private int value_;
-    /// <summary>
-    /// The int32 value.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int Value {
-      get { return value_; }
-      set {
-        value_ = value;
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as Int32Value);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(Int32Value other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (Value != other.Value) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (Value != 0) hash ^= Value.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (Value != 0) {
-        output.WriteRawTag(8);
-        output.WriteInt32(Value);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (Value != 0) {
-        output.WriteRawTag(8);
-        output.WriteInt32(Value);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (Value != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(Value);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(Int32Value other) {
-      if (other == null) {
-        return;
-      }
-      if (other.Value != 0) {
-        Value = other.Value;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 8: {
-            Value = input.ReadInt32();
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 8: {
-            Value = input.ReadInt32();
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  /// <summary>
-  /// Wrapper message for `uint32`.
-  ///
-  /// The JSON representation for `UInt32Value` is JSON number.
-  /// </summary>
-  public sealed partial class UInt32Value : pb::IMessage<UInt32Value>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<UInt32Value> _parser = new pb::MessageParser<UInt32Value>(() => new UInt32Value());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<UInt32Value> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.WellKnownTypes.WrappersReflection.Descriptor.MessageTypes[5]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public UInt32Value() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public UInt32Value(UInt32Value other) : this() {
-      value_ = other.value_;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public UInt32Value Clone() {
-      return new UInt32Value(this);
-    }
-
-    /// <summary>Field number for the "value" field.</summary>
-    public const int ValueFieldNumber = 1;
-    private uint value_;
-    /// <summary>
-    /// The uint32 value.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public uint Value {
-      get { return value_; }
-      set {
-        value_ = value;
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as UInt32Value);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(UInt32Value other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (Value != other.Value) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (Value != 0) hash ^= Value.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (Value != 0) {
-        output.WriteRawTag(8);
-        output.WriteUInt32(Value);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (Value != 0) {
-        output.WriteRawTag(8);
-        output.WriteUInt32(Value);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (Value != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeUInt32Size(Value);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(UInt32Value other) {
-      if (other == null) {
-        return;
-      }
-      if (other.Value != 0) {
-        Value = other.Value;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 8: {
-            Value = input.ReadUInt32();
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 8: {
-            Value = input.ReadUInt32();
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  /// <summary>
-  /// Wrapper message for `bool`.
-  ///
-  /// The JSON representation for `BoolValue` is JSON `true` and `false`.
-  /// </summary>
-  public sealed partial class BoolValue : pb::IMessage<BoolValue>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<BoolValue> _parser = new pb::MessageParser<BoolValue>(() => new BoolValue());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<BoolValue> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.WellKnownTypes.WrappersReflection.Descriptor.MessageTypes[6]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public BoolValue() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public BoolValue(BoolValue other) : this() {
-      value_ = other.value_;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public BoolValue Clone() {
-      return new BoolValue(this);
-    }
-
-    /// <summary>Field number for the "value" field.</summary>
-    public const int ValueFieldNumber = 1;
-    private bool value_;
-    /// <summary>
-    /// The bool value.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Value {
-      get { return value_; }
-      set {
-        value_ = value;
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as BoolValue);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(BoolValue other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (Value != other.Value) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (Value != false) hash ^= Value.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (Value != false) {
-        output.WriteRawTag(8);
-        output.WriteBool(Value);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (Value != false) {
-        output.WriteRawTag(8);
-        output.WriteBool(Value);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (Value != false) {
-        size += 1 + 1;
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(BoolValue other) {
-      if (other == null) {
-        return;
-      }
-      if (other.Value != false) {
-        Value = other.Value;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 8: {
-            Value = input.ReadBool();
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 8: {
-            Value = input.ReadBool();
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  /// <summary>
-  /// Wrapper message for `string`.
-  ///
-  /// The JSON representation for `StringValue` is JSON string.
-  /// </summary>
-  public sealed partial class StringValue : pb::IMessage<StringValue>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<StringValue> _parser = new pb::MessageParser<StringValue>(() => new StringValue());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<StringValue> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.WellKnownTypes.WrappersReflection.Descriptor.MessageTypes[7]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public StringValue() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public StringValue(StringValue other) : this() {
-      value_ = other.value_;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public StringValue Clone() {
-      return new StringValue(this);
-    }
-
-    /// <summary>Field number for the "value" field.</summary>
-    public const int ValueFieldNumber = 1;
-    private string value_ = "";
-    /// <summary>
-    /// The string value.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public string Value {
-      get { return value_; }
-      set {
-        value_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as StringValue);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(StringValue other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (Value != other.Value) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (Value.Length != 0) hash ^= Value.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (Value.Length != 0) {
-        output.WriteRawTag(10);
-        output.WriteString(Value);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (Value.Length != 0) {
-        output.WriteRawTag(10);
-        output.WriteString(Value);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (Value.Length != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(Value);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(StringValue other) {
-      if (other == null) {
-        return;
-      }
-      if (other.Value.Length != 0) {
-        Value = other.Value;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 10: {
-            Value = input.ReadString();
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 10: {
-            Value = input.ReadString();
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  /// <summary>
-  /// Wrapper message for `bytes`.
-  ///
-  /// The JSON representation for `BytesValue` is JSON string.
-  /// </summary>
-  public sealed partial class BytesValue : pb::IMessage<BytesValue>
-  #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      , pb::IBufferMessage
-  #endif
-  {
-    private static readonly pb::MessageParser<BytesValue> _parser = new pb::MessageParser<BytesValue>(() => new BytesValue());
-    private pb::UnknownFieldSet _unknownFields;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pb::MessageParser<BytesValue> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Google.Protobuf.WellKnownTypes.WrappersReflection.Descriptor.MessageTypes[8]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public BytesValue() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public BytesValue(BytesValue other) : this() {
-      value_ = other.value_;
-      _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public BytesValue Clone() {
-      return new BytesValue(this);
-    }
-
-    /// <summary>Field number for the "value" field.</summary>
-    public const int ValueFieldNumber = 1;
-    private pb::ByteString value_ = pb::ByteString.Empty;
-    /// <summary>
-    /// The bytes value.
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public pb::ByteString Value {
-      get { return value_; }
-      set {
-        value_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override bool Equals(object other) {
-      return Equals(other as BytesValue);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public bool Equals(BytesValue other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (Value != other.Value) return false;
-      return Equals(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (Value.Length != 0) hash ^= Value.GetHashCode();
-      if (_unknownFields != null) {
-        hash ^= _unknownFields.GetHashCode();
-      }
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void WriteTo(pb::CodedOutputStream output) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      output.WriteRawMessage(this);
-    #else
-      if (Value.Length != 0) {
-        output.WriteRawTag(10);
-        output.WriteBytes(Value);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(output);
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
-      if (Value.Length != 0) {
-        output.WriteRawTag(10);
-        output.WriteBytes(Value);
-      }
-      if (_unknownFields != null) {
-        _unknownFields.WriteTo(ref output);
-      }
-    }
-    #endif
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public int CalculateSize() {
-      int size = 0;
-      if (Value.Length != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeBytesSize(Value);
-      }
-      if (_unknownFields != null) {
-        size += _unknownFields.CalculateSize();
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(BytesValue other) {
-      if (other == null) {
-        return;
-      }
-      if (other.Value.Length != 0) {
-        Value = other.Value;
-      }
-      _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    public void MergeFrom(pb::CodedInputStream input) {
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-      input.ReadRawMessage(this);
-    #else
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, input);
-            break;
-          case 10: {
-            Value = input.ReadBytes();
-            break;
-          }
-        }
-      }
-    #endif
-    }
-
-    #if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
-    void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, ref input);
-            break;
-          case 10: {
-            Value = input.ReadBytes();
-            break;
-          }
-        }
-      }
-    }
-    #endif
-
-  }
-
-  #endregion
-
-}
-
-#endregion Designer generated code
diff --git a/libs/protobuf/csharp/src/Google.Protobuf/WellKnownTypes/WrappersPartial.cs b/libs/protobuf/csharp/src/Google.Protobuf/WellKnownTypes/WrappersPartial.cs
deleted file mode 100644
index 9f620eb..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf/WellKnownTypes/WrappersPartial.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-namespace Google.Protobuf.WellKnownTypes
-{
-    public static partial class WrappersReflection
-    {
-        /// <summary>
-        /// Field number for the single "value" field in all wrapper types.
-        /// </summary>
-        internal const int WrapperValueFieldNumber = Int32Value.ValueFieldNumber;
-    }
-}
diff --git a/libs/protobuf/csharp/src/Google.Protobuf/WireFormat.cs b/libs/protobuf/csharp/src/Google.Protobuf/WireFormat.cs
deleted file mode 100644
index 7cd2ada..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf/WireFormat.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-namespace Google.Protobuf
-{
-    /// <summary>
-    /// This class is used internally by the Protocol Buffer Library and generated
-    /// message implementations. It is public only for the sake of those generated
-    /// messages. Others should not use this class directly.
-    /// <para>
-    /// This class contains constants and helper functions useful for dealing with
-    /// the Protocol Buffer wire format.
-    /// </para>
-    /// </summary>
-    public static class WireFormat
-    {
-        /// <summary>
-        /// Wire types within protobuf encoding.
-        /// </summary>
-        public enum WireType : uint
-        {
-            /// <summary>
-            /// Variable-length integer.
-            /// </summary>
-            Varint = 0,
-            /// <summary>
-            /// A fixed-length 64-bit value.
-            /// </summary>
-            Fixed64 = 1,
-            /// <summary>
-            /// A length-delimited value, i.e. a length followed by that many bytes of data.
-            /// </summary>
-            LengthDelimited = 2,
-            /// <summary>
-            /// A "start group" value
-            /// </summary>
-            StartGroup = 3,
-            /// <summary>
-            /// An "end group" value
-            /// </summary>
-            EndGroup = 4,
-            /// <summary>
-            /// A fixed-length 32-bit value.
-            /// </summary>
-            Fixed32 = 5
-        }
-
-        private const int TagTypeBits = 3;
-        private const uint TagTypeMask = (1 << TagTypeBits) - 1;
-
-        /// <summary>
-        /// Given a tag value, determines the wire type (lower 3 bits).
-        /// </summary>
-        public static WireType GetTagWireType(uint tag)
-        {
-            return (WireType) (tag & TagTypeMask);
-        }
-
-        /// <summary>
-        /// Given a tag value, determines the field number (the upper 29 bits).
-        /// </summary>
-        public static int GetTagFieldNumber(uint tag)
-        {
-            return (int) (tag >> TagTypeBits);
-        }
-
-        /// <summary>
-        /// Makes a tag value given a field number and wire type.
-        /// </summary>
-        public static uint MakeTag(int fieldNumber, WireType wireType)
-        {
-            return (uint) (fieldNumber << TagTypeBits) | (uint) wireType;
-        }
-    }
-}
\ No newline at end of file
diff --git a/libs/protobuf/csharp/src/Google.Protobuf/WriteBufferHelper.cs b/libs/protobuf/csharp/src/Google.Protobuf/WriteBufferHelper.cs
deleted file mode 100644
index f2a59bc..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf/WriteBufferHelper.cs
+++ /dev/null
@@ -1,166 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-using System.Buffers;
-using System.IO;
-using System.Runtime.CompilerServices;
-using System.Security;
-
-namespace Google.Protobuf
-{
-    /// <summary>
-    /// Abstraction for writing to a steam / IBufferWriter
-    /// </summary>
-    [SecuritySafeCritical]
-    internal struct WriteBufferHelper
-    {
-        private IBufferWriter<byte> bufferWriter;
-        private CodedOutputStream codedOutputStream;
-
-        public CodedOutputStream CodedOutputStream => codedOutputStream;
-
-        /// <summary>
-        /// Initialize an instance with a coded output stream.
-        /// This approach is faster than using a constructor because the instance to initialize is passed by reference
-        /// and we can write directly into it without copying.
-        /// </summary>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void Initialize(CodedOutputStream codedOutputStream, out WriteBufferHelper instance)
-        {
-            instance.bufferWriter = null;
-            instance.codedOutputStream = codedOutputStream;
-        }
-
-        /// <summary>
-        /// Initialize an instance with a buffer writer.
-        /// This approach is faster than using a constructor because the instance to initialize is passed by reference
-        /// and we can write directly into it without copying.
-        /// </summary>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void Initialize(IBufferWriter<byte> bufferWriter, out WriteBufferHelper instance, out Span<byte> buffer)
-        {
-            instance.bufferWriter = bufferWriter;
-            instance.codedOutputStream = null;
-            buffer = default;  // TODO: initialize the initial buffer so that the first write is not via slowpath.
-        }
-
-        /// <summary>
-        /// Initialize an instance with a buffer represented by a single span (i.e. buffer cannot be refreshed)
-        /// This approach is faster than using a constructor because the instance to initialize is passed by reference
-        /// and we can write directly into it without copying.
-        /// </summary>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void InitializeNonRefreshable(out WriteBufferHelper instance)
-        {
-            instance.bufferWriter = null;
-            instance.codedOutputStream = null;
-        }
-
-        /// <summary>
-        /// Verifies that SpaceLeft returns zero.
-        /// </summary>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void CheckNoSpaceLeft(ref WriterInternalState state)
-        {
-            if (GetSpaceLeft(ref state) != 0)
-            {
-                throw new InvalidOperationException("Did not write as much data as expected.");
-            }
-        }
-
-        /// <summary>
-        /// If writing to a flat array, returns the space left in the array. Otherwise,
-        /// throws an InvalidOperationException.
-        /// </summary>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static int GetSpaceLeft(ref WriterInternalState state)
-        {
-            if (state.writeBufferHelper.codedOutputStream?.InternalOutputStream == null && state.writeBufferHelper.bufferWriter == null)
-            {
-                return state.limit - state.position;
-            }
-            else
-            {
-                throw new InvalidOperationException(
-                    "SpaceLeft can only be called on CodedOutputStreams that are " +
-                        "writing to a flat array or when writing to a single span.");
-            }
-        }
-
-        [MethodImpl(MethodImplOptions.NoInlining)]
-        public static void RefreshBuffer(ref Span<byte> buffer, ref WriterInternalState state)
-        {
-            if (state.writeBufferHelper.codedOutputStream?.InternalOutputStream != null)
-            {
-                // because we're using coded output stream, we know that "buffer" and codedOutputStream.InternalBuffer are identical.
-                state.writeBufferHelper.codedOutputStream.InternalOutputStream.Write(state.writeBufferHelper.codedOutputStream.InternalBuffer, 0, state.position);
-                // reset position, limit stays the same because we are reusing the codedOutputStream's internal buffer.
-                state.position = 0;
-            }
-            else if (state.writeBufferHelper.bufferWriter != null)
-            {
-                // commit the bytes and get a new buffer to write to.
-                state.writeBufferHelper.bufferWriter.Advance(state.position);
-                state.position = 0;
-                buffer = state.writeBufferHelper.bufferWriter.GetSpan();
-                state.limit = buffer.Length;
-            }
-            else
-            {
-                // We're writing to a single buffer.
-                throw new CodedOutputStream.OutOfSpaceException();
-            }
-        }
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void Flush(ref Span<byte> buffer, ref WriterInternalState state)
-        {
-            if (state.writeBufferHelper.codedOutputStream?.InternalOutputStream != null)
-            {
-                // because we're using coded output stream, we know that "buffer" and codedOutputStream.InternalBuffer are identical.
-                state.writeBufferHelper.codedOutputStream.InternalOutputStream.Write(state.writeBufferHelper.codedOutputStream.InternalBuffer, 0, state.position);
-                state.position = 0;
-            }
-            else if (state.writeBufferHelper.bufferWriter != null)
-            {
-                // calling Advance invalidates the current buffer and we must not continue writing to it,
-                // so we set the current buffer to point to an empty Span. If any subsequent writes happen,
-                // the first subsequent write will trigger refresing of the buffer.
-                state.writeBufferHelper.bufferWriter.Advance(state.position);
-                state.position = 0;
-                state.limit = 0;
-                buffer = default;  // invalidate the current buffer
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/libs/protobuf/csharp/src/Google.Protobuf/WriteContext.cs b/libs/protobuf/csharp/src/Google.Protobuf/WriteContext.cs
deleted file mode 100644
index e822e1d..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf/WriteContext.cs
+++ /dev/null
@@ -1,371 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-using System.Buffers;
-using System.Buffers.Binary;
-using System.Collections.Generic;
-using System.IO;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using System.Security;
-using System.Text;
-using Google.Protobuf.Collections;
-
-namespace Google.Protobuf
-{
-    /// <summary>
-    /// An opaque struct that represents the current serialization state and is passed along
-    /// as the serialization proceeds.
-    /// All the public methods are intended to be invoked only by the generated code,
-    /// users should never invoke them directly.
-    /// </summary>
-    [SecuritySafeCritical]
-    public ref struct WriteContext
-    {
-        internal Span<byte> buffer;
-        internal WriterInternalState state;
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        internal static void Initialize(ref Span<byte> buffer, ref WriterInternalState state, out WriteContext ctx)
-        {
-            ctx.buffer = buffer;
-            ctx.state = state;
-        }
-
-        /// <summary>
-        /// Creates a WriteContext instance from CodedOutputStream.
-        /// WARNING: internally this copies the CodedOutputStream's state, so after done with the WriteContext,
-        /// the CodedOutputStream's state needs to be updated.
-        /// </summary>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        internal static void Initialize(CodedOutputStream output, out WriteContext ctx)
-        {
-            ctx.buffer = new Span<byte>(output.InternalBuffer);
-            // ideally we would use a reference to the original state, but that doesn't seem possible
-            // so we just copy the struct that holds the state. We will need to later store the state back
-            // into CodedOutputStream if we want to keep it usable.
-            ctx.state = output.InternalState;
-        }
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        internal static void Initialize(IBufferWriter<byte> output, out WriteContext ctx)
-        {
-            ctx.buffer = default;
-            ctx.state = default;
-            WriteBufferHelper.Initialize(output, out ctx.state.writeBufferHelper, out ctx.buffer);
-            ctx.state.limit = ctx.buffer.Length;
-            ctx.state.position = 0;
-        }
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        internal static void Initialize(ref Span<byte> buffer, out WriteContext ctx)
-        {
-            ctx.buffer = buffer;
-            ctx.state = default;
-            ctx.state.limit = ctx.buffer.Length;
-            ctx.state.position = 0;
-            WriteBufferHelper.InitializeNonRefreshable(out ctx.state.writeBufferHelper);
-        }
-
-        /// <summary>
-        /// Writes a double field value, without a tag.
-        /// </summary>
-        /// <param name="value">The value to write</param>
-        public void WriteDouble(double value)
-        {
-            WritingPrimitives.WriteDouble(ref buffer, ref state, value);
-        }
-
-        /// <summary>
-        /// Writes a float field value, without a tag.
-        /// </summary>
-        /// <param name="value">The value to write</param>
-        public void WriteFloat(float value)
-        {
-            WritingPrimitives.WriteFloat(ref buffer, ref state, value);
-        }
-
-        /// <summary>
-        /// Writes a uint64 field value, without a tag.
-        /// </summary>
-        /// <param name="value">The value to write</param>
-        public void WriteUInt64(ulong value)
-        {
-            WritingPrimitives.WriteUInt64(ref buffer, ref state, value);
-        }
-
-        /// <summary>
-        /// Writes an int64 field value, without a tag.
-        /// </summary>
-        /// <param name="value">The value to write</param>
-        public void WriteInt64(long value)
-        {
-            WritingPrimitives.WriteInt64(ref buffer, ref state, value);
-        }
-
-        /// <summary>
-        /// Writes an int32 field value, without a tag.
-        /// </summary>
-        /// <param name="value">The value to write</param>
-        public void WriteInt32(int value)
-        {
-            WritingPrimitives.WriteInt32(ref buffer, ref state, value);
-        }
-
-        /// <summary>
-        /// Writes a fixed64 field value, without a tag.
-        /// </summary>
-        /// <param name="value">The value to write</param>
-        public void WriteFixed64(ulong value)
-        {
-            WritingPrimitives.WriteFixed64(ref buffer, ref state, value);
-        }
-
-        /// <summary>
-        /// Writes a fixed32 field value, without a tag.
-        /// </summary>
-        /// <param name="value">The value to write</param>
-        public void WriteFixed32(uint value)
-        {
-            WritingPrimitives.WriteFixed32(ref buffer, ref state, value);
-        }
-
-        /// <summary>
-        /// Writes a bool field value, without a tag.
-        /// </summary>
-        /// <param name="value">The value to write</param>
-        public void WriteBool(bool value)
-        {
-            WritingPrimitives.WriteBool(ref buffer, ref state, value);
-        }
-
-        /// <summary>
-        /// Writes a string field value, without a tag.
-        /// The data is length-prefixed.
-        /// </summary>
-        /// <param name="value">The value to write</param>
-        public void WriteString(string value)
-        {
-            WritingPrimitives.WriteString(ref buffer, ref state, value);
-        }
-
-        /// <summary>
-        /// Writes a message, without a tag.
-        /// The data is length-prefixed.
-        /// </summary>
-        /// <param name="value">The value to write</param>
-        public void WriteMessage(IMessage value)
-        {
-            WritingPrimitivesMessages.WriteMessage(ref this, value);
-        }
-
-        /// <summary>
-        /// Writes a group, without a tag, to the stream.
-        /// </summary>
-        /// <param name="value">The value to write</param>
-        public void WriteGroup(IMessage value)
-        {
-            WritingPrimitivesMessages.WriteGroup(ref this, value);
-        }
-
-        /// <summary>
-        /// Write a byte string, without a tag, to the stream.
-        /// The data is length-prefixed.
-        /// </summary>
-        /// <param name="value">The value to write</param>
-        public void WriteBytes(ByteString value)
-        {
-            WritingPrimitives.WriteBytes(ref buffer, ref state, value);
-        }
-
-        /// <summary>
-        /// Writes a uint32 value, without a tag.
-        /// </summary>
-        /// <param name="value">The value to write</param>
-        public void WriteUInt32(uint value)
-        {
-            WritingPrimitives.WriteUInt32(ref buffer, ref state, value);
-        }
-
-        /// <summary>
-        /// Writes an enum value, without a tag.
-        /// </summary>
-        /// <param name="value">The value to write</param>
-        public void WriteEnum(int value)
-        {
-            WritingPrimitives.WriteEnum(ref buffer, ref state, value);
-        }
-
-        /// <summary>
-        /// Writes an sfixed32 value, without a tag.
-        /// </summary>
-        /// <param name="value">The value to write.</param>
-        public void WriteSFixed32(int value)
-        {
-            WritingPrimitives.WriteSFixed32(ref buffer, ref state, value);
-        }
-
-        /// <summary>
-        /// Writes an sfixed64 value, without a tag.
-        /// </summary>
-        /// <param name="value">The value to write</param>
-        public void WriteSFixed64(long value)
-        {
-            WritingPrimitives.WriteSFixed64(ref buffer, ref state, value);
-        }
-
-        /// <summary>
-        /// Writes an sint32 value, without a tag.
-        /// </summary>
-        /// <param name="value">The value to write</param>
-        public void WriteSInt32(int value)
-        {
-            WritingPrimitives.WriteSInt32(ref buffer, ref state, value);
-        }
-
-        /// <summary>
-        /// Writes an sint64 value, without a tag.
-        /// </summary>
-        /// <param name="value">The value to write</param>
-        public void WriteSInt64(long value)
-        {
-            WritingPrimitives.WriteSInt64(ref buffer, ref state, value);
-        }
-
-        /// <summary>
-        /// Writes a length (in bytes) for length-delimited data.
-        /// </summary>
-        /// <remarks>
-        /// This method simply writes a rawint, but exists for clarity in calling code.
-        /// </remarks>
-        /// <param name="length">Length value, in bytes.</param>
-        public void WriteLength(int length)
-        {
-            WritingPrimitives.WriteLength(ref buffer, ref state, length);
-        }
-
-        /// <summary>
-        /// Encodes and writes a tag.
-        /// </summary>
-        /// <param name="fieldNumber">The number of the field to write the tag for</param>
-        /// <param name="type">The wire format type of the tag to write</param>
-        public void WriteTag(int fieldNumber, WireFormat.WireType type)
-        {
-            WritingPrimitives.WriteTag(ref buffer, ref state, fieldNumber, type);
-        }
-
-        /// <summary>
-        /// Writes an already-encoded tag.
-        /// </summary>
-        /// <param name="tag">The encoded tag</param>
-        public void WriteTag(uint tag)
-        {
-            WritingPrimitives.WriteTag(ref buffer, ref state, tag);
-        }
-
-        /// <summary>
-        /// Writes the given single-byte tag.
-        /// </summary>
-        /// <param name="b1">The encoded tag</param>
-        public void WriteRawTag(byte b1)
-        {
-            WritingPrimitives.WriteRawTag(ref buffer, ref state, b1);
-        }
-
-        /// <summary>
-        /// Writes the given two-byte tag.
-        /// </summary>
-        /// <param name="b1">The first byte of the encoded tag</param>
-        /// <param name="b2">The second byte of the encoded tag</param>
-        public void WriteRawTag(byte b1, byte b2)
-        {
-            WritingPrimitives.WriteRawTag(ref buffer, ref state, b1, b2);
-        }
-
-        /// <summary>
-        /// Writes the given three-byte tag.
-        /// </summary>
-        /// <param name="b1">The first byte of the encoded tag</param>
-        /// <param name="b2">The second byte of the encoded tag</param>
-        /// <param name="b3">The third byte of the encoded tag</param>
-        public void WriteRawTag(byte b1, byte b2, byte b3)
-        {
-            WritingPrimitives.WriteRawTag(ref buffer, ref state, b1, b2, b3);
-        }
-
-        /// <summary>
-        /// Writes the given four-byte tag.
-        /// </summary>
-        /// <param name="b1">The first byte of the encoded tag</param>
-        /// <param name="b2">The second byte of the encoded tag</param>
-        /// <param name="b3">The third byte of the encoded tag</param>
-        /// <param name="b4">The fourth byte of the encoded tag</param>
-        public void WriteRawTag(byte b1, byte b2, byte b3, byte b4)
-        {
-            WritingPrimitives.WriteRawTag(ref buffer, ref state, b1, b2, b3, b4);
-        }
-
-        /// <summary>
-        /// Writes the given five-byte tag.
-        /// </summary>
-        /// <param name="b1">The first byte of the encoded tag</param>
-        /// <param name="b2">The second byte of the encoded tag</param>
-        /// <param name="b3">The third byte of the encoded tag</param>
-        /// <param name="b4">The fourth byte of the encoded tag</param>
-        /// <param name="b5">The fifth byte of the encoded tag</param>
-        public void WriteRawTag(byte b1, byte b2, byte b3, byte b4, byte b5)
-        {
-            WritingPrimitives.WriteRawTag(ref buffer, ref state, b1, b2, b3, b4, b5);
-        }
-
-        internal void Flush()
-        {
-            WriteBufferHelper.Flush(ref buffer, ref state);
-        }
-
-        internal void CheckNoSpaceLeft()
-        {
-            WriteBufferHelper.CheckNoSpaceLeft(ref state);
-        }
-
-        internal void CopyStateTo(CodedOutputStream output)
-        {
-            output.InternalState = state;
-        }
-
-        internal void LoadStateFrom(CodedOutputStream output)
-        {
-            state = output.InternalState;
-        }
-    }
-}
\ No newline at end of file
diff --git a/libs/protobuf/csharp/src/Google.Protobuf/WriterInternalState.cs b/libs/protobuf/csharp/src/Google.Protobuf/WriterInternalState.cs
deleted file mode 100644
index a779305..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf/WriterInternalState.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-using System.Buffers;
-using System.Buffers.Binary;
-using System.Collections.Generic;
-using System.IO;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using System.Security;
-using System.Text;
-using Google.Protobuf.Collections;
-
-namespace Google.Protobuf
-{
-    
-    // warning: this is a mutable struct, so it needs to be only passed as a ref!
-    internal struct WriterInternalState
-    {
-        // NOTE: the Span representing the current buffer is kept separate so that this doesn't have to be a ref struct and so it can
-        // be included in CodedOutputStream's internal state
-
-        internal int limit;  // the size of the current buffer
-        internal int position;  // position in the current buffer
-
-        internal WriteBufferHelper writeBufferHelper;
-
-        // If non-null, the top level parse method was started with given coded output stream as an argument
-        // which also means we can potentially fallback to calling WriteTo(CodedOutputStream cos) if needed.
-        internal CodedOutputStream CodedOutputStream => writeBufferHelper.CodedOutputStream;
-    }
-}
\ No newline at end of file
diff --git a/libs/protobuf/csharp/src/Google.Protobuf/WritingPrimitives.cs b/libs/protobuf/csharp/src/Google.Protobuf/WritingPrimitives.cs
deleted file mode 100644
index 8beefc5..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf/WritingPrimitives.cs
+++ /dev/null
@@ -1,757 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-using System.Buffers.Binary;
-using System.Diagnostics;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-#if GOOGLE_PROTOBUF_SIMD
-using System.Runtime.Intrinsics;
-using System.Runtime.Intrinsics.Arm;
-using System.Runtime.Intrinsics.X86;
-#endif
-using System.Security;
-using System.Text;
-
-namespace Google.Protobuf
-{
-    /// <summary>
-    /// Primitives for encoding protobuf wire format.
-    /// </summary>
-    [SecuritySafeCritical]
-    internal static class WritingPrimitives
-    {
-#if NET5_0
-        internal static Encoding Utf8Encoding => Encoding.UTF8; // allows JIT to devirtualize
-#else
-        internal static readonly Encoding Utf8Encoding = Encoding.UTF8; // "Local" copy of Encoding.UTF8, for efficiency. (Yes, it makes a difference.)
-#endif
-
-        #region Writing of values (not including tags)
-
-        /// <summary>
-        /// Writes a double field value, without a tag, to the stream.
-        /// </summary>
-        public static void WriteDouble(ref Span<byte> buffer, ref WriterInternalState state, double value)
-        {
-            WriteRawLittleEndian64(ref buffer, ref state, (ulong)BitConverter.DoubleToInt64Bits(value));
-        }
-
-        /// <summary>
-        /// Writes a float field value, without a tag, to the stream.
-        /// </summary>
-        public static unsafe void WriteFloat(ref Span<byte> buffer, ref WriterInternalState state, float value)
-        {
-            const int length = sizeof(float);
-            if (buffer.Length - state.position >= length)
-            {
-                // if there's enough space in the buffer, write the float directly into the buffer
-                var floatSpan = buffer.Slice(state.position, length);
-                Unsafe.WriteUnaligned(ref MemoryMarshal.GetReference(floatSpan), value);
-
-                if (!BitConverter.IsLittleEndian)
-                {
-                    floatSpan.Reverse();
-                }
-                state.position += length;
-            }
-            else
-            {
-                WriteFloatSlowPath(ref buffer, ref state, value);
-            }
-        }
-
-        [MethodImpl(MethodImplOptions.NoInlining)]
-        private static unsafe void WriteFloatSlowPath(ref Span<byte> buffer, ref WriterInternalState state, float value)
-        {
-            const int length = sizeof(float);
-
-            // TODO(jtattermusch): deduplicate the code. Populating the span is the same as for the fastpath.
-            Span<byte> floatSpan = stackalloc byte[length];
-            Unsafe.WriteUnaligned(ref MemoryMarshal.GetReference(floatSpan), value);
-            if (!BitConverter.IsLittleEndian)
-            {
-                floatSpan.Reverse();
-            }
-
-            WriteRawByte(ref buffer, ref state, floatSpan[0]);
-            WriteRawByte(ref buffer, ref state, floatSpan[1]);
-            WriteRawByte(ref buffer, ref state, floatSpan[2]);
-            WriteRawByte(ref buffer, ref state, floatSpan[3]);
-        }
-
-        /// <summary>
-        /// Writes a uint64 field value, without a tag, to the stream.
-        /// </summary>
-        public static void WriteUInt64(ref Span<byte> buffer, ref WriterInternalState state, ulong value)
-        {
-            WriteRawVarint64(ref buffer, ref state, value);
-        }
-
-        /// <summary>
-        /// Writes an int64 field value, without a tag, to the stream.
-        /// </summary>
-        public static void WriteInt64(ref Span<byte> buffer, ref WriterInternalState state, long value)
-        {
-            WriteRawVarint64(ref buffer, ref state, (ulong)value);
-        }
-
-        /// <summary>
-        /// Writes an int32 field value, without a tag, to the stream.
-        /// </summary>
-        public static void WriteInt32(ref Span<byte> buffer, ref WriterInternalState state, int value)
-        {
-            if (value >= 0)
-            {
-                WriteRawVarint32(ref buffer, ref state, (uint)value);
-            }
-            else
-            {
-                // Must sign-extend.
-                WriteRawVarint64(ref buffer, ref state, (ulong)value);
-            }
-        }
-
-        /// <summary>
-        /// Writes a fixed64 field value, without a tag, to the stream.
-        /// </summary>
-        public static void WriteFixed64(ref Span<byte> buffer, ref WriterInternalState state, ulong value)
-        {
-            WriteRawLittleEndian64(ref buffer, ref state, value);
-        }
-
-        /// <summary>
-        /// Writes a fixed32 field value, without a tag, to the stream.
-        /// </summary>
-        public static void WriteFixed32(ref Span<byte> buffer, ref WriterInternalState state, uint value)
-        {
-            WriteRawLittleEndian32(ref buffer, ref state, value);
-        }
-
-        /// <summary>
-        /// Writes a bool field value, without a tag, to the stream.
-        /// </summary>
-        public static void WriteBool(ref Span<byte> buffer, ref WriterInternalState state, bool value)
-        {
-            WriteRawByte(ref buffer, ref state, value ? (byte)1 : (byte)0);
-        }
-
-        /// <summary>
-        /// Writes a string field value, without a tag, to the stream.
-        /// The data is length-prefixed.
-        /// </summary>
-        public static void WriteString(ref Span<byte> buffer, ref WriterInternalState state, string value)
-        {
-            const int MaxBytesPerChar = 3;
-            const int MaxSmallStringLength = 128 / MaxBytesPerChar;
-
-            // The string is small enough that the length will always be a 1 byte varint.
-            // Also there is enough space to write length + bytes to buffer.
-            // Write string directly to the buffer, and then write length.
-            // This saves calling GetByteCount on the string. We get the string length from GetBytes.
-            if (value.Length <= MaxSmallStringLength && buffer.Length - state.position - 1 >= value.Length * MaxBytesPerChar)
-            {
-                int indexOfLengthDelimiter = state.position++;
-                buffer[indexOfLengthDelimiter] = (byte)WriteStringToBuffer(buffer, ref state, value);
-                return;
-            }
-
-            int length = Utf8Encoding.GetByteCount(value);
-            WriteLength(ref buffer, ref state, length);
-
-            // Optimise the case where we have enough space to write
-            // the string directly to the buffer, which should be common.
-            if (buffer.Length - state.position >= length)
-            {
-                if (length == value.Length) // Must be all ASCII...
-                {
-                    WriteAsciiStringToBuffer(buffer, ref state, value, length);
-                }
-                else
-                {
-                    WriteStringToBuffer(buffer, ref state, value);
-                }
-            }
-            else
-            {
-                // Opportunity for future optimization:
-                // Large strings that don't fit into the current buffer segment
-                // can probably be optimized by using Utf8Encoding.GetEncoder()
-                // but more benchmarks would need to be added as evidence.
-                byte[] bytes = Utf8Encoding.GetBytes(value);
-                WriteRawBytes(ref buffer, ref state, bytes);
-            }
-        }
-
-        // Calling this method with non-ASCII content will break.
-        // Content must be verified to be all ASCII before using this method.
-        private static void WriteAsciiStringToBuffer(Span<byte> buffer, ref WriterInternalState state, string value, int length)
-        {
-            ref char sourceChars = ref MemoryMarshal.GetReference(value.AsSpan());
-            ref byte destinationBytes = ref MemoryMarshal.GetReference(buffer.Slice(state.position));
-
-            int currentIndex = 0;
-            // If 64bit, process 4 chars at a time.
-            // The logic inside this check will be elided by JIT in 32bit programs.
-            if (IntPtr.Size == 8)
-            {
-                // Need at least 4 chars available to use this optimization. 
-                if (length >= 4)
-                {
-                    ref byte sourceBytes = ref Unsafe.As<char, byte>(ref sourceChars);
-
-                    // Process 4 chars at a time until there are less than 4 remaining.
-                    // We already know all characters are ASCII so there is no need to validate the source.
-                    int lastIndexWhereCanReadFourChars = value.Length - 4;
-                    do
-                    {
-                        NarrowFourUtf16CharsToAsciiAndWriteToBuffer(
-                            ref Unsafe.AddByteOffset(ref destinationBytes, (IntPtr)currentIndex),
-                            Unsafe.ReadUnaligned<ulong>(ref Unsafe.AddByteOffset(ref sourceBytes, (IntPtr)(currentIndex * 2))));
-
-                    } while ((currentIndex += 4) <= lastIndexWhereCanReadFourChars);
-                }
-            }
-
-            // Process any remaining, 1 char at a time.
-            // Avoid bounds checking with ref + Unsafe
-            for (; currentIndex < length; currentIndex++)
-            {
-                Unsafe.AddByteOffset(ref destinationBytes, (IntPtr)currentIndex) = (byte)Unsafe.AddByteOffset(ref sourceChars, (IntPtr)(currentIndex * 2));
-            }
-
-            state.position += length;
-        }
-
-        // Copied with permission from https://github.com/dotnet/runtime/blob/1cdafd27e4afd2c916af5df949c13f8b373c4335/src/libraries/System.Private.CoreLib/src/System/Text/ASCIIUtility.cs#L1119-L1171
-        //
-        /// <summary>
-        /// Given a QWORD which represents a buffer of 4 ASCII chars in machine-endian order,
-        /// narrows each WORD to a BYTE, then writes the 4-byte result to the output buffer
-        /// also in machine-endian order.
-        /// </summary>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private static void NarrowFourUtf16CharsToAsciiAndWriteToBuffer(ref byte outputBuffer, ulong value)
-        {
-#if GOOGLE_PROTOBUF_SIMD
-            if (Sse2.X64.IsSupported)
-            {
-                // Narrows a vector of words [ w0 w1 w2 w3 ] to a vector of bytes
-                // [ b0 b1 b2 b3 b0 b1 b2 b3 ], then writes 4 bytes (32 bits) to the destination.
-
-                Vector128<short> vecWide = Sse2.X64.ConvertScalarToVector128UInt64(value).AsInt16();
-                Vector128<uint> vecNarrow = Sse2.PackUnsignedSaturate(vecWide, vecWide).AsUInt32();
-                Unsafe.WriteUnaligned<uint>(ref outputBuffer, Sse2.ConvertToUInt32(vecNarrow));
-            }
-            else if (AdvSimd.IsSupported)
-            {
-                // Narrows a vector of words [ w0 w1 w2 w3 ] to a vector of bytes
-                // [ b0 b1 b2 b3 * * * * ], then writes 4 bytes (32 bits) to the destination.
-
-                Vector128<short> vecWide = Vector128.CreateScalarUnsafe(value).AsInt16();
-                Vector64<byte> lower = AdvSimd.ExtractNarrowingSaturateUnsignedLower(vecWide);
-                Unsafe.WriteUnaligned<uint>(ref outputBuffer, lower.AsUInt32().ToScalar());
-            }
-            else
-#endif
-            {
-                // Fallback to non-SIMD approach when SIMD is not available.
-                // This could happen either because the APIs are not available, or hardware doesn't support it.
-                // Processing 4 chars at a time in this fallback is still faster than casting one char at a time.
-                if (BitConverter.IsLittleEndian)
-                {
-                    outputBuffer = (byte)value;
-                    value >>= 16;
-                    Unsafe.Add(ref outputBuffer, 1) = (byte)value;
-                    value >>= 16;
-                    Unsafe.Add(ref outputBuffer, 2) = (byte)value;
-                    value >>= 16;
-                    Unsafe.Add(ref outputBuffer, 3) = (byte)value;
-                }
-                else
-                {
-                    Unsafe.Add(ref outputBuffer, 3) = (byte)value;
-                    value >>= 16;
-                    Unsafe.Add(ref outputBuffer, 2) = (byte)value;
-                    value >>= 16;
-                    Unsafe.Add(ref outputBuffer, 1) = (byte)value;
-                    value >>= 16;
-                    outputBuffer = (byte)value;
-                }
-            }
-        }
-
-        private static int WriteStringToBuffer(Span<byte> buffer, ref WriterInternalState state, string value)
-        {
-#if NETSTANDARD1_1
-            // slowpath when Encoding.GetBytes(Char*, Int32, Byte*, Int32) is not available
-            byte[] bytes = Utf8Encoding.GetBytes(value);
-            WriteRawBytes(ref buffer, ref state, bytes);
-            return bytes.Length;
-#else
-            ReadOnlySpan<char> source = value.AsSpan();
-            int bytesUsed;
-            unsafe
-            {
-                fixed (char* sourceChars = &MemoryMarshal.GetReference(source))
-                fixed (byte* destinationBytes = &MemoryMarshal.GetReference(buffer))
-                {
-                    bytesUsed = Utf8Encoding.GetBytes(
-                        sourceChars,
-                        source.Length,
-                        destinationBytes + state.position,
-                        buffer.Length - state.position);
-                }
-            }
-            state.position += bytesUsed;
-            return bytesUsed;
-#endif
-        }
-
-        /// <summary>
-        /// Write a byte string, without a tag, to the stream.
-        /// The data is length-prefixed.
-        /// </summary>
-        public static void WriteBytes(ref Span<byte> buffer, ref WriterInternalState state, ByteString value)
-        {
-            WriteLength(ref buffer, ref state, value.Length);
-            WriteRawBytes(ref buffer, ref state, value.Span);
-        }
-
-        /// <summary>
-        /// Writes a uint32 value, without a tag, to the stream.
-        /// </summary>
-        public static void WriteUInt32(ref Span<byte> buffer, ref WriterInternalState state, uint value)
-        {
-            WriteRawVarint32(ref buffer, ref state, value);
-        }
-
-        /// <summary>
-        /// Writes an enum value, without a tag, to the stream.
-        /// </summary>
-        public static void WriteEnum(ref Span<byte> buffer, ref WriterInternalState state, int value)
-        {
-            WriteInt32(ref buffer, ref state, value);
-        }
-
-        /// <summary>
-        /// Writes an sfixed32 value, without a tag, to the stream.
-        /// </summary>
-        public static void WriteSFixed32(ref Span<byte> buffer, ref WriterInternalState state, int value)
-        {
-            WriteRawLittleEndian32(ref buffer, ref state, (uint)value);
-        }
-
-        /// <summary>
-        /// Writes an sfixed64 value, without a tag, to the stream.
-        /// </summary>
-        public static void WriteSFixed64(ref Span<byte> buffer, ref WriterInternalState state, long value)
-        {
-            WriteRawLittleEndian64(ref buffer, ref state, (ulong)value);
-        }
-
-        /// <summary>
-        /// Writes an sint32 value, without a tag, to the stream.
-        /// </summary>
-        public static void WriteSInt32(ref Span<byte> buffer, ref WriterInternalState state, int value)
-        {
-            WriteRawVarint32(ref buffer, ref state, EncodeZigZag32(value));
-        }
-
-        /// <summary>
-        /// Writes an sint64 value, without a tag, to the stream.
-        /// </summary>
-        public static void WriteSInt64(ref Span<byte> buffer, ref WriterInternalState state, long value)
-        {
-            WriteRawVarint64(ref buffer, ref state, EncodeZigZag64(value));
-        }
-
-        /// <summary>
-        /// Writes a length (in bytes) for length-delimited data.
-        /// </summary>
-        /// <remarks>
-        /// This method simply writes a rawint, but exists for clarity in calling code.
-        /// </remarks>
-        public static void WriteLength(ref Span<byte> buffer, ref WriterInternalState state, int length)
-        {
-            WriteRawVarint32(ref buffer, ref state, (uint)length);
-        }
-
-        #endregion
-
-        #region Writing primitives
-        /// <summary>
-        /// Writes a 32 bit value as a varint. The fast route is taken when
-        /// there's enough buffer space left to whizz through without checking
-        /// for each byte; otherwise, we resort to calling WriteRawByte each time.
-        /// </summary>
-        public static void WriteRawVarint32(ref Span<byte> buffer, ref WriterInternalState state, uint value)
-        {
-            // Optimize for the common case of a single byte value
-            if (value < 128 && state.position < buffer.Length)
-            {
-                buffer[state.position++] = (byte)value;
-                return;
-            }
-
-            // Fast path when capacity is available
-            while (state.position < buffer.Length)
-            {
-                if (value > 127)
-                {
-                    buffer[state.position++] = (byte)((value & 0x7F) | 0x80);
-                    value >>= 7;
-                }
-                else
-                {
-                    buffer[state.position++] = (byte)value;
-                    return;
-                }
-            }
-
-            while (value > 127)
-            {
-                WriteRawByte(ref buffer, ref state, (byte)((value & 0x7F) | 0x80));
-                value >>= 7;
-            }
-
-            WriteRawByte(ref buffer, ref state, (byte)value);
-        }
-
-        public static void WriteRawVarint64(ref Span<byte> buffer, ref WriterInternalState state, ulong value)
-        {
-            // Optimize for the common case of a single byte value
-            if (value < 128 && state.position < buffer.Length)
-            {
-                buffer[state.position++] = (byte)value;
-                return;
-            }
-
-            // Fast path when capacity is available
-            while (state.position < buffer.Length)
-            {
-                if (value > 127)
-                {
-                    buffer[state.position++] = (byte)((value & 0x7F) | 0x80);
-                    value >>= 7;
-                }
-                else
-                {
-                    buffer[state.position++] = (byte)value;
-                    return;
-                }
-            }
-
-            while (value > 127)
-            {
-                WriteRawByte(ref buffer, ref state, (byte)((value & 0x7F) | 0x80));
-                value >>= 7;
-            }
-
-            WriteRawByte(ref buffer, ref state, (byte)value);
-        }
-
-        public static void WriteRawLittleEndian32(ref Span<byte> buffer, ref WriterInternalState state, uint value)
-        {
-            const int length = sizeof(uint);
-            if (state.position + length > buffer.Length)
-            {
-                WriteRawLittleEndian32SlowPath(ref buffer, ref state, value);
-            }
-            else
-            {
-                BinaryPrimitives.WriteUInt32LittleEndian(buffer.Slice(state.position), value);
-                state.position += length;
-            }
-        }
-
-        [MethodImpl(MethodImplOptions.NoInlining)]
-        private static void WriteRawLittleEndian32SlowPath(ref Span<byte> buffer, ref WriterInternalState state, uint value)
-        {
-            WriteRawByte(ref buffer, ref state, (byte)value);
-            WriteRawByte(ref buffer, ref state, (byte)(value >> 8));
-            WriteRawByte(ref buffer, ref state, (byte)(value >> 16));
-            WriteRawByte(ref buffer, ref state, (byte)(value >> 24));
-        }
-
-        public static void WriteRawLittleEndian64(ref Span<byte> buffer, ref WriterInternalState state, ulong value)
-        {
-            const int length = sizeof(ulong);
-            if (state.position + length > buffer.Length)
-            {
-                WriteRawLittleEndian64SlowPath(ref buffer, ref state, value);
-            }
-            else
-            {
-                BinaryPrimitives.WriteUInt64LittleEndian(buffer.Slice(state.position), value);
-                state.position += length;
-            }
-        }
-
-        [MethodImpl(MethodImplOptions.NoInlining)]
-        public static void WriteRawLittleEndian64SlowPath(ref Span<byte> buffer, ref WriterInternalState state, ulong value)
-        {
-            WriteRawByte(ref buffer, ref state, (byte)value);
-            WriteRawByte(ref buffer, ref state, (byte)(value >> 8));
-            WriteRawByte(ref buffer, ref state, (byte)(value >> 16));
-            WriteRawByte(ref buffer, ref state, (byte)(value >> 24));
-            WriteRawByte(ref buffer, ref state, (byte)(value >> 32));
-            WriteRawByte(ref buffer, ref state, (byte)(value >> 40));
-            WriteRawByte(ref buffer, ref state, (byte)(value >> 48));
-            WriteRawByte(ref buffer, ref state, (byte)(value >> 56));
-        }
-
-        private static void WriteRawByte(ref Span<byte> buffer, ref WriterInternalState state, byte value)
-        {
-            if (state.position == buffer.Length)
-            {
-                WriteBufferHelper.RefreshBuffer(ref buffer, ref state);
-            }
-
-            buffer[state.position++] = value;
-        }
-
-        /// <summary>
-        /// Writes out an array of bytes.
-        /// </summary>
-        public static void WriteRawBytes(ref Span<byte> buffer, ref WriterInternalState state, byte[] value)
-        {
-            WriteRawBytes(ref buffer, ref state, new ReadOnlySpan<byte>(value));
-        }
-
-        /// <summary>
-        /// Writes out part of an array of bytes.
-        /// </summary>
-        public static void WriteRawBytes(ref Span<byte> buffer, ref WriterInternalState state, byte[] value, int offset, int length)
-        {
-            WriteRawBytes(ref buffer, ref state, new ReadOnlySpan<byte>(value, offset, length));
-        }
-
-        /// <summary>
-        /// Writes out part of an array of bytes.
-        /// </summary>
-        public static void WriteRawBytes(ref Span<byte> buffer, ref WriterInternalState state, ReadOnlySpan<byte> value)
-        {
-            if (buffer.Length - state.position >= value.Length)
-            {
-                // We have room in the current buffer.    
-                value.CopyTo(buffer.Slice(state.position, value.Length));
-                state.position += value.Length;
-            }
-            else
-            {
-                // When writing to a CodedOutputStream backed by a Stream, we could avoid
-                // copying the data twice (first copying to the current buffer and
-                // and later writing from the current buffer to the underlying Stream)
-                // in some circumstances by writing the data directly to the underlying Stream.
-                // Current this is not being done to avoid specialcasing the code for
-                // CodedOutputStream vs IBufferWriter<byte>.
-                int bytesWritten = 0;
-                while (buffer.Length - state.position < value.Length - bytesWritten)
-                {
-                    int length = buffer.Length - state.position;
-                    value.Slice(bytesWritten, length).CopyTo(buffer.Slice(state.position, length));
-                    bytesWritten += length;
-                    state.position += length;
-                    WriteBufferHelper.RefreshBuffer(ref buffer, ref state);
-                }
-
-                // copy the remaining data
-                int remainderLength = value.Length - bytesWritten;
-                value.Slice(bytesWritten, remainderLength).CopyTo(buffer.Slice(state.position, remainderLength));
-                state.position += remainderLength;
-            }
-        }
-        #endregion
-
-        #region Raw tag writing
-        /// <summary>
-        /// Encodes and writes a tag.
-        /// </summary>
-        public static void WriteTag(ref Span<byte> buffer, ref WriterInternalState state, int fieldNumber, WireFormat.WireType type)
-        {
-            WriteRawVarint32(ref buffer, ref state, WireFormat.MakeTag(fieldNumber, type));
-        }
-
-        /// <summary>
-        /// Writes an already-encoded tag.
-        /// </summary>
-        public static void WriteTag(ref Span<byte> buffer, ref WriterInternalState state, uint tag)
-        {
-            WriteRawVarint32(ref buffer, ref state, tag);
-        }
-
-        /// <summary>
-        /// Writes the given single-byte tag directly to the stream.
-        /// </summary>
-        public static void WriteRawTag(ref Span<byte> buffer, ref WriterInternalState state, byte b1)
-        {
-            WriteRawByte(ref buffer, ref state, b1);
-        }
-
-        /// <summary>
-        /// Writes the given two-byte tag directly to the stream.
-        /// </summary>
-        public static void WriteRawTag(ref Span<byte> buffer, ref WriterInternalState state, byte b1, byte b2)
-        {
-            if (state.position + 2 > buffer.Length)
-            {
-                WriteRawTagSlowPath(ref buffer, ref state, b1, b2);
-            }
-            else
-            {
-                buffer[state.position++] = b1;
-                buffer[state.position++] = b2;
-            }
-        }
-
-        [MethodImpl(MethodImplOptions.NoInlining)]
-        private static void WriteRawTagSlowPath(ref Span<byte> buffer, ref WriterInternalState state, byte b1, byte b2)
-        {
-            WriteRawByte(ref buffer, ref state, b1);
-            WriteRawByte(ref buffer, ref state, b2);
-        }
-
-        /// <summary>
-        /// Writes the given three-byte tag directly to the stream.
-        /// </summary>
-        public static void WriteRawTag(ref Span<byte> buffer, ref WriterInternalState state, byte b1, byte b2, byte b3)
-        {
-            if (state.position + 3 > buffer.Length)
-            {
-                WriteRawTagSlowPath(ref buffer, ref state, b1, b2, b3);
-            }
-            else
-            {
-                buffer[state.position++] = b1;
-                buffer[state.position++] = b2;
-                buffer[state.position++] = b3;
-            }
-        }
-
-        [MethodImpl(MethodImplOptions.NoInlining)]
-        private static void WriteRawTagSlowPath(ref Span<byte> buffer, ref WriterInternalState state, byte b1, byte b2, byte b3)
-        {
-            WriteRawByte(ref buffer, ref state, b1);
-            WriteRawByte(ref buffer, ref state, b2);
-            WriteRawByte(ref buffer, ref state, b3);
-        }
-
-        /// <summary>
-        /// Writes the given four-byte tag directly to the stream.
-        /// </summary>
-        public static void WriteRawTag(ref Span<byte> buffer, ref WriterInternalState state, byte b1, byte b2, byte b3, byte b4)
-        {
-            if (state.position + 4 > buffer.Length)
-            {
-                WriteRawTagSlowPath(ref buffer, ref state, b1, b2, b3, b4);
-            }
-            else
-            {
-                buffer[state.position++] = b1;
-                buffer[state.position++] = b2;
-                buffer[state.position++] = b3;
-                buffer[state.position++] = b4;
-            }
-        }
-
-        [MethodImpl(MethodImplOptions.NoInlining)]
-
-        private static void WriteRawTagSlowPath(ref Span<byte> buffer, ref WriterInternalState state, byte b1, byte b2, byte b3, byte b4)
-        {
-            WriteRawByte(ref buffer, ref state, b1);
-            WriteRawByte(ref buffer, ref state, b2);
-            WriteRawByte(ref buffer, ref state, b3);
-            WriteRawByte(ref buffer, ref state, b4);
-        }
-
-        /// <summary>
-        /// Writes the given five-byte tag directly to the stream.
-        /// </summary>
-        public static void WriteRawTag(ref Span<byte> buffer, ref WriterInternalState state, byte b1, byte b2, byte b3, byte b4, byte b5)
-        {
-            if (state.position + 5 > buffer.Length)
-            {
-                WriteRawTagSlowPath(ref buffer, ref state, b1, b2, b3, b4, b5);
-            }
-            else
-            {
-                buffer[state.position++] = b1;
-                buffer[state.position++] = b2;
-                buffer[state.position++] = b3;
-                buffer[state.position++] = b4;
-                buffer[state.position++] = b5;
-            }
-        }
-
-        [MethodImpl(MethodImplOptions.NoInlining)]
-        private static void WriteRawTagSlowPath(ref Span<byte> buffer, ref WriterInternalState state, byte b1, byte b2, byte b3, byte b4, byte b5)
-        {
-            WriteRawByte(ref buffer, ref state, b1);
-            WriteRawByte(ref buffer, ref state, b2);
-            WriteRawByte(ref buffer, ref state, b3);
-            WriteRawByte(ref buffer, ref state, b4);
-            WriteRawByte(ref buffer, ref state, b5);
-        }
-        #endregion
-
-        /// <summary>
-        /// Encode a 32-bit value with ZigZag encoding.
-        /// </summary>
-        /// <remarks>
-        /// ZigZag encodes signed integers into values that can be efficiently
-        /// encoded with varint.  (Otherwise, negative values must be 
-        /// sign-extended to 64 bits to be varint encoded, thus always taking
-        /// 10 bytes on the wire.)
-        /// </remarks>
-        public static uint EncodeZigZag32(int n)
-        {
-            // Note:  the right-shift must be arithmetic
-            return (uint)((n << 1) ^ (n >> 31));
-        }
-
-        /// <summary>
-        /// Encode a 64-bit value with ZigZag encoding.
-        /// </summary>
-        /// <remarks>
-        /// ZigZag encodes signed integers into values that can be efficiently
-        /// encoded with varint.  (Otherwise, negative values must be 
-        /// sign-extended to 64 bits to be varint encoded, thus always taking
-        /// 10 bytes on the wire.)
-        /// </remarks>
-        public static ulong EncodeZigZag64(long n)
-        {
-            return (ulong)((n << 1) ^ (n >> 63));
-        }
-    }
-}
\ No newline at end of file
diff --git a/libs/protobuf/csharp/src/Google.Protobuf/WritingPrimitivesMessages.cs b/libs/protobuf/csharp/src/Google.Protobuf/WritingPrimitivesMessages.cs
deleted file mode 100644
index cd2d437..0000000
--- a/libs/protobuf/csharp/src/Google.Protobuf/WritingPrimitivesMessages.cs
+++ /dev/null
@@ -1,112 +0,0 @@
-#region Copyright notice and license
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#endregion
-
-using System;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices.ComTypes;
-using System.Security;
-
-namespace Google.Protobuf
-{
-    /// <summary>
-    /// Writing messages / groups.
-    /// </summary>
-    [SecuritySafeCritical]
-    internal static class WritingPrimitivesMessages
-    {
-        /// <summary>
-        /// Writes a message, without a tag.
-        /// The data is length-prefixed.
-        /// </summary>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void WriteMessage(ref WriteContext ctx, IMessage value)
-        {
-            WritingPrimitives.WriteLength(ref ctx.buffer, ref ctx.state, value.CalculateSize());
-            WriteRawMessage(ref ctx, value);
-        }
-
-        /// <summary>
-        /// Writes a group, without a tag.
-        /// </summary>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void WriteGroup(ref WriteContext ctx, IMessage value)
-        {
-            WriteRawMessage(ref ctx, value);
-        }
-
-        /// <summary>
-        /// Writes a message, without a tag.
-        /// Message will be written without a length prefix.
-        /// </summary>
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void WriteRawMessage(ref WriteContext ctx, IMessage message)
-        {
-            if (message is IBufferMessage bufferMessage)
-            {
-                bufferMessage.InternalWriteTo(ref ctx);
-            }
-            else
-            {
-                // If we reached here, it means we've ran into a nested message with older generated code
-                // which doesn't provide the InternalWriteTo method that takes a WriteContext.
-                // With a slight performance overhead, we can still serialize this message just fine,
-                // but we need to find the original CodedOutputStream instance that initiated this
-                // serialization process and make sure its internal state is up to date.
-                // Note that this performance overhead is not very high (basically copying contents of a struct)
-                // and it will only be incurred in case the application mixes older and newer generated code.
-                // Regenerating the code from .proto files will remove this overhead because it will
-                // generate the InternalWriteTo method we need.
-
-                if (ctx.state.CodedOutputStream == null)
-                {
-                    // This can only happen when the serialization started without providing a CodedOutputStream instance
-                    // (e.g. WriteContext was created directly from a IBufferWriter).
-                    // That also means that one of the new parsing APIs was used at the top level
-                    // and in such case it is reasonable to require that all the nested message provide
-                    // up-to-date generated code with WriteContext support (and fail otherwise).
-                    throw new InvalidProtocolBufferException($"Message {message.GetType().Name} doesn't provide the generated method that enables WriteContext-based serialization. You might need to regenerate the generated protobuf code.");
-                }
-
-                ctx.CopyStateTo(ctx.state.CodedOutputStream);
-                try
-                {
-                    // fallback parse using the CodedOutputStream that started current serialization tree
-                    message.WriteTo(ctx.state.CodedOutputStream);
-                }
-                finally
-                {
-                    ctx.LoadStateFrom(ctx.state.CodedOutputStream);
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/libs/protobuf/docs/csharp/proto2.md b/libs/protobuf/docs/csharp/proto2.md
deleted file mode 100644
index 53fc43c..0000000
--- a/libs/protobuf/docs/csharp/proto2.md
+++ /dev/null
@@ -1,184 +0,0 @@
-As part of the 3.10 release of Google.Protobuf, experimental proto2 support has been released. This document outlines the new changes brought about to include proto2 support. This does not break existing proto3 support and users may continue to use proto3 features without changing their current code. Again the generated code and public API associated with proto2 is experimental and subject to change in the future. APIs for proto2 may be added, removed, or adjusted as feedback is received.
-Generated code for proto2 may also be modified by adding, removing, or adjusting APIs as feedback is received.
-
-### Enabling proto2 features
-
-For information about specific proto2 features, please read the [proto2 language guide](https://developers.google.com/protocol-buffers/docs/proto).
-
-Much like other languages, proto2 features are used with proto2 files with the syntax declaration `syntax = "proto2";`. However, please note, proto3 is still the recommended version of protobuf and proto2 support is meant for legacy system interop and advanced uses.
-
-# Generated code
-
-### Messages
-
-Messages in proto2 files are very similar to their proto3 counterparts. They expose the usual property for getting and setting,  but they also include properties and methods to handle field presence.
-
-For `optional`/`required` field XYZ, a `HasXYZ` property is included for checking presence and a `ClearXYZ` method is included for clearing the value.
-
-```proto
-message Foo {
-    optional Bar bar = 1;
-    required Baz baz = 2;
-}
-```
-```cs
-var foo = new Foo();
-Assert.IsNull(foo.Bar);
-Assert.False(foo.HasBar);
-foo.Bar = new Bar();
-Assert.True(foo.HasBar);
-foo.ClearBar();
-```
-
-### Messages with extension ranges
-
-Messages which define extension ranges implement the `IExtendableMessage` interface as shown below.
-See inline comments for more info.
-
-```cs
-public interface IExtendableMessage<T> : IMessage<T> where T : IExtendableMessage<T>
-{
-    // Gets the value of a single value extension. If the extension isn't present, this returns the default value.
-    TValue GetExtension<TValue>(Extension<T, TValue> extension);
-    // Gets the value of a repeated extension. If the extension hasn't been set, this returns null to prevent unnecessary allocations.
-    RepeatedField<TValue> GetExtension<TValue>(RepeatedExtension<T, TValue> extension);
-    // Gets the value of a repeated extension. This will initialize the value of the repeated field and will never return null.
-    RepeatedField<TValue> GetOrInitializeExtension<TValue>(RepeatedExtension<T, TValue> extension);
-    // Sets the value of the extension
-    void SetExtension<TValue>(Extension<T, TValue> extension, TValue value);
-    // Returns whether the extension is present in the message
-    bool HasExtension<TValue>(Extension<T, TValue> extension);
-    // Clears the value of the extension, removing it from the message
-    void ClearExtension<TValue>(Extension<T, TValue> extension);
-    // Clears the value of the repeated extension, removing it from the message. Calling GetExtension after this will always return null.
-    void ClearExtension<TValue>(RepeatedExtension<T, TValue> extension);
-}
-```
-
-### Extensions
-
-Extensions are generated in static containers like reflection classes and type classes. 
-For example for a file called `foo.proto` containing extensions in the file scope, a 
-`FooExtensions` class is created containing the extensions defined in the file scope.
-For easy access, this class can be used with `using static` to bring all extensions into scope.
-
-```proto
-option csharp_namespace = "FooBar";
-extend Foo {
-    optional Baz foo_ext = 124;
-}
-message Baz {
-    extend Foo {
-        repeated Baz repeated_foo_ext = 125;
-    }
-}
-```
-```cs
-public static partial class FooExtensions {
-    public static readonly Extension<Foo, Baz> FooExt = /* initialization */;
-}
-
-public partial class Baz {
-    public partial static class Extensions {
-        public static readonly RepeatedExtension<Foo, Baz> RepeatedFooExt = /* initialization */;
-    }
-}
-```
-```cs
-using static FooBar.FooExtensions;
-using static FooBar.Baz.Extensions;
-
-var foo = new Foo();
-foo.SetExtension(FooExt, new Baz());
-foo.GetOrInitializeExtension(RepeatedFooExt).Add(new Baz());
-```
-
-# APIs
-
-### Message initialization
-
-Initialization refers to checking the status of required fields in a proto2 message. If a message is uninitialized, not all required fields are set in either the message itself or any of its submessages. In other languages, missing required fields throw errors depending on the merge method used. This could cause unforeseen errors at runtime if the incorrect method is used. 
-However, in this implementation, parsers and input streams don't check messages for initialization on their own and throw errors. Instead it's up to you to handle messages with missing required fields in whatever way you see fit.
-Checking message initialization can be done manually via the `IsInitialized` extension method in `MessageExtensions`.
-
-### Extension registries
-
-Just like in Java, extension registries can be constructed to parse extensions when reading new messages
-from input streams. The API is fairly similar to the Java API with some added bonuses with C# syntax sugars.
-
-```proto
-message Baz {
-    extend Foo {
-        optional Baz foo_ext = 124;
-    }
-}
-```
-```cs
-var registry = new ExtensionRegistry() 
-{ 
-    Baz.Extensions.FooExt
-};
-var foo = Foo.Factory.WithExtensionRegistry(registry).ParseFrom(input);
-Assert.True(foo.HasExtension(Bas.Extensions.FooExt));
-var fooNoRegistry = Foo.Factory.ParseFrom(input);
-Assert.False(foo.HasExtension(Bas.Extensions.FooExt));
-```
-
-### Custom options
-
-Due to their limited use and lack of type safety, the original `CustomOptions` APIs are now deprecated. Using the new generated extension identifiers, you can access extensions safely through the GetOption APIs. Note that cloneable values such as 
-repeated fields and messages will be deep cloned.
-
-Example based on custom options usage example [here](https://github.com/protocolbuffers/protobuf/issues/5007#issuecomment-411604515).
-```cs
-foreach (var service in input.Services)
-{
-    Console.WriteLine($"  {service.Name}");
-    foreach (var method in service.Methods)
-    {
-        var rule = method.GetOption(AnnotationsExtensions.Http);
-        if (rule != null)
-        {
-            Console.WriteLine($"    {method.Name}: {rule}");
-        }
-        else
-        {
-            Console.WriteLine($"    {method.Name}: no HTTP binding");
-        }
-    }
-}
-```
-
-### Reflection
-
-Reflection APIs have been extended to enable accessing the new proto2 portions of the library and generated code.
-
- * FieldDescriptor.Extension
-    * Gets the extension identifier behind an extension field, allowing it to be added to an ExtensionRegistry
- * FieldDescriptor.IsExtension
-    * Returns whether a field is an extension of another type.
- * FieldDescriptor.ExtendeeType
-    * Returns the extended type of an extension field
- * IFieldAccessor.HasValue
-    * Returns whether a field's value is set. For proto3 fields, throws an InvalidOperationException.
- * FileDescriptor.Syntax
-    * Gets the syntax of a file
- * FileDescriptor.Extensions
-    * An immutable list of extensions defined in the file
- * MessageDescriptor.Extensions
-    * An immutable list of extensions defined in the message
-
-```cs
-var extensions = Baz.Descriptor.Extensions.GetExtensionsInDeclarationOrder(Foo.Descriptor);
-var registry = new ExtensionRegistry();
-registry.AddRange(extensions.Select(f => f.Extension));
-
-var baz = Foo.Descriptor.Parser.WithExtensionRegistry(registry).ParseFrom(input);
-foreach (var field in extensions)
-{
-    if (field.Accessor.HasValue(baz))
-    {
-        Console.WriteLine($"{field.Name}: {field.Accessor.GetValue(baz)}");
-    }
-}
-```
diff --git a/libs/protobuf/docs/field_presence.md b/libs/protobuf/docs/field_presence.md
deleted file mode 100644
index 218622d..0000000
--- a/libs/protobuf/docs/field_presence.md
+++ /dev/null
@@ -1,476 +0,0 @@
-# Application note: Field presence
-
-This application note explains the various presence tracking disciplines for protobuf fields. It also explains the behaviour of explicit presence tracking for singular proto3 fields with basic types.
-
-## Background
-
-_Field presence_ is the notion of whether a protobuf field has a value. There are two different manifestations of presence for protobufs: _no presence_, where the generated message API stores field values (only), and _explicit presence_, where the API also stores whether or not a field has been set.
-
-Historically, proto2 has mostly followed _explicit presence_, while proto3 exposes only _no presence_ semantics. Singular proto3 fields of basic types (numeric, string, bytes, and enums) which are defined with the `optional` label have _explicit presence_, like proto2 (this feature is enabled by default as release 3.15).
-
-### Presence disciplines
-
-_Presence disciplines_ define the semantics for translating between the _API representation_ and the _serialized representation_. The _no presence_ discipline relies upon the field value itself to make decisions at (de)serialization time, while the _explicit presence_ discipline relies upon the explicit tracking state instead.
-
-### Presence in _tag-value stream_ (wire format) serialization
-
-The wire format is a stream of tagged, _self-delimiting_ values. By definition, the wire format represents a sequence of _present_ values. In other words, every value found within a serialization represents a _present_ field; furthermore, the serialization contains no information about not-present values.
-
-The generated API for a proto message includes (de)serialization definitions which translate between API types and a stream of definitionally _present_ (tag, value) pairs. This translation is designed to be forward- and backward-compatible across changes to the message definition; however, this compatibility introduces some (perhaps surprising) considerations when deserializing wire-formatted messages:
-
--   When serializing, fields with _no presence_ are not serialized if they contain their default value.
-	-   For numeric types, the default is 0.
-	-   For enums, the default is the zero-valued enumerator.
-	-   For strings, bytes, and repeated fields, the default is the zero-length value.
-	-   For messages, the default is the language-specific null value.
--   "Empty" length-delimited values (such as empty strings) can be validly represented in serialized values: the field is "present," in the sense that it appears in the wire format. However, if the generated API does not track presence, then these values may not be re-serialized; i.e., the empty field may be "not present" after a serialization round-trip.
--   When deserializing, duplicate field values may be handled in different ways depending on the field definition.
-	-   Duplicate `repeated` fields are typically appended to the field's API representation. (Note that serializing a _packed_ repeated field produces only one, length-delimited value in the tag stream.)
-	-   Duplicate `optional` field values follow the rule that "the last one wins."
--   `oneof` fields expose the API-level invariant that only one field is set at a time. However, the wire format may include multiple (tag, value) pairs which notionally belong to the `oneof`. Similar to `optional` fields, the generated API follows the "last one wins" rule.
--   Out-of-range values are not returned for enum fields in generated proto2 APIs. However, out-of-range values may be stored as _unknown fields_ in the API, even though the wire-format tag was recognized.
-
-### Presence in _named-field mapping_ formats
-
-Protobufs can be represented in human-readable, textual forms. Two notable formats are TextFormat (the output format produced by generated message `DebugString` methods) and JSON. 
-
-These formats have correctness requirements of their own, and are generally stricter than _tagged-value stream_ formats. However, TextFormat more closely mimics the semantics of the wire format, and does, in certain cases, provide similar semantics (for example, appending repeated name-value mappings to a repeated field). In particular, similar to the wire format, TextFormat only includes fields which are present.
-
-JSON is a much stricter format, however, and cannot validly represent some semantics of the wire format or TextFormat.
-
--   Notably, JSON _elements_ are semantically unordered, and each member must have a unique name. This is different from TextFormat rules for repeated fields.
--   JSON may include fields that are "not present," unlike the _no presence_ discipline for other formats:
-	-   JSON defines a `null` value, which may be used to represent a _defined but not-present field_.
-	-   Repeated field values may be included in the formatted output, even if they are equal to the default (an empty list).
--   Because JSON elements are unordered, there is no way to unambiguously interpret the "last one wins" rule.
-    -   In most cases, this is fine: JSON elements must have unique names: repeated field values are not valid JSON, so they do not need to be resolved as they are for TextFormat.
-	-   However, this means that it may not be possible to interpret `oneof` fields unambiguously: if multiple cases are present, they are unordered.
-
-In theory, JSON _can_ represent presence in a semantic-preserving fashion. In practice, however, presence correctness can vary depending upon implementation choices, especially if JSON was chosen as a means to interoperate with clients not using protobufs.
-
-### Presence in proto2 APIs
-
-This table outlines whether presence is tracked for fields in proto2 APIs (both for generated APIs and using dynamic reflection):
-
-Field type                                   | Explicit Presence
--------------------------------------------- | -----------------
-Singular numeric (integer or floating point) | ✔�
-Singular enum                                | ✔�
-Singular string or bytes                     | ✔�
-Singular message                             | ✔�
-Repeated                                     |
-Oneofs                                       | ✔�
-Maps                                         |
-
-Singular fields (of all types) track presence explicitly in the generated API. The generated message interface includes methods to query presence of fields. For example, the field `foo` has a corresponding `has_foo` method. (The specific name follows the same language-specific naming convention as the field accessors.) These methods are sometimes referred to as "hazzers" within the protobuf implementation.
-
-Similar to singular fields, `oneof` fields explicitly track which one of the members, if any, contains a value. For example, consider this example `oneof`:
-
-```protobuf
-oneof foo {
-  int32 a = 1;
-  float b = 2;
-}
-```
-
-Depending on the target language, the generated API would generally include several methods:
-
--   A hazzer for the oneof: `has_foo`
--   A _oneof case_ method: `foo`
--   Hazzers for the members: `has_a`, `has_b`
--   Getters for the members: `a`, `b`
-
-Repeated fields and maps do not track presence: there is no distinction between an _empty_ and a _not-present_ repeated field.
-
-### Presence in proto3 APIs
-
-This table outlines whether presence is tracked for fields in proto3 APIs (both for generated APIs and using dynamic reflection):
-
-Field type                                   | `optional` | Explicit Presence
--------------------------------------------- | ---------- | -----------------
-Singular numeric (integer or floating point) | No         |
-Singular enum                                | No         |
-Singular string or bytes                     | No         |
-Singular numeric (integer or floating point) | Yes        | ✔�
-Singular enum                                | Yes        | ✔�
-Singular string or bytes                     | Yes        | ✔�
-Singular message                             | Yes        | ✔�
-Singular message                             | No         | ✔�
-Repeated                                     | N/A        |
-Oneofs                                       | N/A        | ✔�
-Maps                                         | N/A        |
-
-Similar to proto2 APIs, proto3 does not track presence explicitly for repeated fields. Without the `optional` label, proto3 APIs do not track presence for basic types (numeric, string, bytes, and enums), either. Oneof fields affirmatively expose presence, although the same set of hazzer methods may not generated as in proto2 APIs.
-
-Under the _no presence_ discipline, the default value is synonymous with "not present" for purposes of serialization. To notionally "clear" a field (so it won't be serialized), an API user would set it to the default value.
-
-The default value for enum-typed fields under _no presence_ is the corresponding 0-valued enumerator. Under proto3 syntax rules, all enum types are required to have an enumerator value which maps to 0. By convention, this is an `UNKNOWN` or similarly-named enumerator. If the zero value is notionally outside the domain of valid values for the application, this behavior can be thought of as tantamount to _explicit presence_.
-
-## Semantic differences
-
-The _no presence_ serialization discipline results in visible differences from the _explicit presence_ tracking discipline, when the default value is set. For a singular field with numeric, enum, or string type:
-
--   _No presence_ discipline:
-	-   Default values are not serialized.
-	-   Default values are _not_ merged-from.
-	-   To "clear" a field, it is set to its default value.
-    -   The default value may mean:
-		-   the field was explicitly set to its default value, which is valid in the application-specific domain of values;
-		-   the field was notionally "cleared" by setting its default; or
-		-   the field was never set.
--   _Explicit presence_ discipline:
-	-   Explicitly set values are always serialized, including default values.
-	-   Un-set fields are never merged-from.
-	-   Explicitly set fields -- including default values -- _are_ merged-from.
-	-   A generated `has_foo` method indicates whether or not the field `foo` has been set (and not cleared).
-	-   A generated `clear_foo` method must be used to clear (i.e., un-set) the value.
-
-### Considerations for merging
-
-Under the _no presence_ rules, it is effectively impossible for a target field to merge-from its default value (using the protobuf's API merging functions). This is because default values are skipped, similar to the _no presence_ serialization discipline. Merging only updates the target (merged-to) message using the non-skipped values from the update (merged-from) message.
-
-The difference in merging behavior has further implications for protocols which rely on partial "patch" updates. If field presence is not tracked, then an update patch alone cannot represent an update to the default value, because only non-default values are merged-from.
-
-Updating to set a default value in this case requires some external mechanism, such as `FieldMask`. However, if presence _is_ tracked, then all explicitly-set values -- even default values -- will be merged into the target.
-
-### Considerations for change-compatibility
-
-Changing a field between _explicit presence_ and _no presence_ is a binary-compatible change for serialized values in wire format. However, the serialized representation of the message may differ, depending on which version of the message definition was used for serialization. Specifically, when a "sender" explicitly sets a field to its default value:
-
--   The serialized value following _no presence_ discipline does not contain the default value, even though it was explicitly set.
--   The serialized value following _explicit presence_ discipline contains every "present" field, even if it contains the default value.
-
-This change may or may not be safe, depending on the application's semantics. For example, consider two clients with different versions of a message definition.
-
-Client A uses this definition of the message, which follows the _explicit presence_ serialization discipline for field `foo`:
-
-```protobuf
-syntax = "proto3";
-message Msg {
-  optional int32 foo = 1;
-}
-```
-
-Client B uses a definition of the same message, except that it follows the _no presence_ discipline:
-
-```protobuf
-syntax = "proto3";
-message Msg {
-  int32 foo = 1;
-}
-```
-
-Now, consider a scenario where client A observes `foo`'s presence as the clients repeatedly exchange the "same" message by deserializing and reserializing:
-
-```protobuf
-// Client A:
-Msg m_a;
-m_a.set_foo(1);                  // non-default value
-assert(m_a.has_foo());           // OK
-Send(m_a.SerializeAsString());   // to client B
-
-// Client B:
-Msg m_b;
-m_b.ParseFromString(Receive());  // from client A
-assert(m_b.foo() == 1);          // OK
-Send(m_b.SerializeAsString());   // to client A
-
-// Client A:
-m_a.ParseFromString(Receive());  // from client B
-assert(m_a.foo() == 1);          // OK
-assert(m_a.has_foo());           // OK
-m_a.set_foo(0);                  // default value
-Send(m_a.SerializeAsString());   // to client B
-
-// Client B:
-Msg m_b;
-m_b.ParseFromString(Receive());  // from client A
-assert(m_b.foo() == 0);          // OK
-Send(m_b.SerializeAsString());   // to client A
-
-// Client A:
-m_a.ParseFromString(Receive());  // from client B
-assert(m_a.foo() == 0);          // OK
-assert(m_a.has_foo());           // FAIL
-```
-
-If client A depends on _explicit presence_ for `foo`, then a "round trip" through client B will be lossy from the perspective of client A. In the example, this is not a safe change: client A requires (by `assert`) that the field is present; even without any modifications through the API, that requirement fails in a value- and peer-dependent case.
-
-## How to enable _explicit presence_ in proto3
-
-These are the general steps to use field tracking support for proto3:
-
-1.  Add an `optional` field to a `.proto` file.
-1.  Run `protoc` (at least v3.15, or v3.12 using `--experimental_allow_proto3_optional` flag).
-1.  Use the generated "hazzer" methods and "clear" methods in application code, instead of comparing or setting default values.
-
-### `.proto` file changes
-
-This is an example of a proto3 message with fields which follow both _no presence_ and _explicit presence_ semantics:
-
-```protobuf
-syntax = "proto3";
-package example;
-
-message MyMessage {
-  // No presence:
-  int32 not_tracked = 1;
-
-  // Explicit presence:
-  optional int32 tracked = 2;
-}
-```
-
-### `protoc` invocation
-
-Presence tracking for proto3 messages is enabled by default [since v3.15.0](https://github.com/protocolbuffers/protobuf/releases/tag/v3.15.0) release, formerly up until [v3.12.0](https://github.com/protocolbuffers/protobuf/releases/tag/v3.12.0) the `--experimental_allow_proto3_optional` flag was required when using presence tracking with protoc.
-
-### Using the generated code
-
-The generated code for proto3 fields with _explicit presence_ (the `optional` label) will be the same as it would be in a proto2 file.
-
-This is the definition used in the "no presence" examples below:
-
-```protobuf
-syntax = "proto3";
-package example;
-message Msg {  
-  int32 foo = 1;
-}
-```
-
-This is the definition used in the "explicit presence" examples below:
-
-```protobuf
-syntax = "proto3";
-package example;
-message Msg {
-  optional int32 foo = 1;
-}
-```
-
-In the examples, a function `GetProto` constructs and returns a message of type `Msg` with unspecified contents.
-
-#### C++ example
-
-No presence:
-
-```C++
-Msg m = GetProto();
-if (m.foo() != 0) {
-  // "Clear" the field:
-  m.set_foo(0);
-} else {
-  // Default value: field may not have been present.
-  m.set_foo(1);
-}
-```
-
-Explicit presence:
-
-```C++
-Msg m = GetProto();
-if (m.has_foo()) {
-  // Clear the field:
-  m.clear_foo();
-} else {
-  // Field is not present, so set it.
-  m.set_foo(1);
-}
-```
-
-#### C# example
-
-No presence:
-
-```C#
-var m = GetProto();
-if (m.Foo != 0) {
-  // "Clear" the field:
-  m.Foo = 0;
-} else {
-  // Default value: field may not have been present.
-  m.Foo = 1;
-}
-```
-
-Explicit presence:
-
-```C#
-var m = GetProto();
-if (m.HasFoo) {
-  // Clear the field:
-  m.ClearFoo();
-} else {
-  // Field is not present, so set it.
-  m.Foo = 1;
-}
-```
-
-#### Go example
-
-No presence:
-
-```go
-m := GetProto()
-if m.Foo != 0 {
-  // "Clear" the field:
-  m.Foo = 0
-} else {
-  // Default value: field may not have been present.
-  m.Foo = 1
-}
-```
-
-Explicit presence:
-
-```go
-m := GetProto()
-if m.Foo != nil {
-  // Clear the field:
-  m.Foo = nil
-} else {
-  // Field is not present, so set it.
-  m.Foo = proto.Int32(1)
-}
-```
-
-#### Java example
-
-These examples use a `Builder` to demonstrate clearing. Simply checking presence and getting values from a `Builder` follows the same API as the message type.
-
-No presence:
-
-```java
-Msg.Builder m = GetProto().toBuilder();
-if (m.getFoo() != 0) {
-  // "Clear" the field:
-  m.setFoo(0);
-} else {
-  // Default value: field may not have been present.
-  m.setFoo(1);
-}
-```
-
-Explicit presence:
-
-```java
-Msg.Builder m = GetProto().toBuilder();
-if (m.hasFoo()) {
-  // Clear the field:
-  m.clearFoo()
-} else {
-  // Field is not present, so set it.
-  m.setFoo(1);
-}
-```
-
-#### Python example
-
-No presence:
-
-```python
-m = example.Msg()
-if m.foo != 0:
-  # "Clear" the field:
-  m.foo = 0
-else:
-  # Default value: field may not have been present.
-  m.foo = 1
-```
-
-Explicit presence:
-
-```python
-m = example.Msg()
-if m.HasField('foo'):
-  # Clear the field:
-  m.ClearField('foo')
-else:
-  # Field is not present, so set it.
-  m.foo = 1
-```
-
-#### Ruby example
-
-No presence:
-
-```ruby
-m = Msg.new
-if m.foo != 0
-  # "Clear" the field:
-  m.foo = 0
-else
-  # Default value: field may not have been present.
-  m.foo = 1
-end
-```
-
-Explicit presence:
-
-```ruby
-m = Msg.new
-if m.has_foo?
-  # Clear the field:
-  m.clear_foo
-else
-  # Field is not present, so set it.
-  m.foo = 1
-end
-```
-
-#### Javascript example
-
-No presence:
-
-```js
-var m = new Msg();
-if (m.getFoo() != 0) {
-  // "Clear" the field:
-  m.setFoo(0);
-} else {
-  // Default value: field may not have been present.
-  m.setFoo(1);
-}
-```
-
-Explicit presence:
-
-```js
-var m = new Msg();
-if (m.hasFoo()) {
-  // Clear the field:
-  m.clearFoo()
-} else {
-  // Field is not present, so set it.
-  m.setFoo(1);
-}
-```
-
-#### Objective C example
-
-No presence:
-
-```Objective-C
-Msg *m = [[Msg alloc] init];
-if (m.foo != 0) {
-  // "Clear" the field:
-  m.foo = 0;
-} else {
-  // Default value: field may not have been present.
-  m.foo = 1;
-}
-```
-
-Explicit presence:
-
-```Objective-C
-Msg *m = [[Msg alloc] init];
-if (m.hasFoo()) {
-  // Clear the field:
-  [m clearFoo];
-} else {
-  // Field is not present, so set it.
-  [m setFoo:1];
-}
-```
diff --git a/libs/protobuf/docs/implementing_proto3_presence.md b/libs/protobuf/docs/implementing_proto3_presence.md
deleted file mode 100644
index 7c3e213..0000000
--- a/libs/protobuf/docs/implementing_proto3_presence.md
+++ /dev/null
@@ -1,400 +0,0 @@
-# How To Implement Field Presence for Proto3
-
-Protobuf release 3.12 adds experimental support for `optional` fields in
-proto3. Proto3 optional fields track presence like in proto2. For background
-information about what presence tracking means, please see
-[docs/field_presence](field_presence.md).
-
-## Document Summary
-
-This document is targeted at developers who own or maintain protobuf code
-generators. All code generators will need to be updated to support proto3
-optional fields. First-party code generators developed by Google are being
-updated already. However third-party code generators will need to be updated
-independently by their authors. This includes:
-
-- implementations of Protocol Buffers for other languages.
-- alternate implementations of Protocol Buffers that target specialized use
-  cases.
-- RPC code generators that create generated APIs for service calls.
-- code generators that implement some utility code on top of protobuf generated
-  classes.
-
-While this document speaks in terms of "code generators", these same principles
-apply to implementations that dynamically generate a protocol buffer API "on the
-fly", directly from a descriptor, in languages that support this kind of usage.
-
-## Background
-
-Presence tracking was added to proto3 in response to user feedback, both from
-inside Google and [from open-source
-users](https://github.com/protocolbuffers/protobuf/issues/1606). The [proto3
-wrapper
-types](https://github.com/protocolbuffers/protobuf/blob/main/src/google/protobuf/wrappers.proto)
-were previously the only supported presence mechanism for proto3. Users have
-pointed to both efficiency and usability issues with the wrapper types.
-
-Presence in proto3 uses exactly the same syntax and semantics as in proto2.
-Proto3 Fields marked `optional` will track presence like proto2, while fields
-without any label (known as "singular fields"), will continue to omit presence
-information.  The `optional` keyword was chosen to minimize differences with
-proto2.
-
-Unfortunately, for the current descriptor protos and `Descriptor` API (as of
-3.11.4) it is not possible to use the same representation as proto2. Proto3
-descriptors already use `LABEL_OPTIONAL` for proto3 singular fields, which do
-not track presence. There is a lot of existing code that reflects over proto3
-protos and assumes that `LABEL_OPTIONAL` in proto3 means "no presence." Changing
-the semantics now would be risky, since old software would likely drop proto3
-presence information, which would be a data loss bug.
-
-To minimize this risk we chose a descriptor representation that is semantically
-compatible with existing proto3 reflection. Every proto3 optional field is
-placed into a one-field `oneof`. We call this a "synthetic" oneof, as it was not
-present in the source `.proto` file.
-
-Since oneof fields in proto3 already track presence, existing proto3
-reflection-based algorithms should correctly preserve presence for proto3
-optional fields with no code changes. For example, the JSON and TextFormat
-parsers/serializers in C++ and Java did not require any changes to support
-proto3 presence. This is the major benefit of synthetic oneofs.
-
-This design does leave some cruft in descriptors. Synthetic oneofs are a
-compatibility measure that we can hopefully clean up in the future. For now
-though, it is important to preserve them across different descriptor formats and
-APIs. It is never safe to drop synthetic oneofs from a proto schema. Code
-generators can (and should) skip synthetic oneofs when generating a user-facing
-API or user-facing documentation. But for any schema representation that is
-consumed programmatically, it is important to keep the synthetic oneofs around.
-
-In APIs it can be helpful to offer separate accessors that refer to "real"
-oneofs (see [API Changes](#api-changes) below). This is a convenient way to omit
-synthetic oneofs in code generators.
-
-## Updating a Code Generator
-
-When a user adds an `optional` field to proto3, this is internally rewritten as
-a one-field oneof, for backward-compatibility with reflection-based algorithms:
-
-```protobuf
-syntax = "proto3";
-
-message Foo {
-  // Experimental feature, not generally supported yet!
-  optional int32 foo = 1;
-
-  // Internally rewritten to:
-  // oneof _foo {
-  //   int32 foo = 1 [proto3_optional=true];
-  // }
-  //
-  // We call _foo a "synthetic" oneof, since it was not created by the user.
-}
-```
-
-As a result, the main two goals when updating a code generator are:
-
-1. Give `optional` fields like `foo` normal field presence, as described in
-   [docs/field_presence](field_presence.md) If your implementation already
-   supports proto2, a proto3 `optional` field should use exactly the same API
-   and internal implementation as proto2 `optional`.
-2. Avoid generating any oneof-based accessors for the synthetic oneof. Its only
-   purpose is to make reflection-based algorithms work properly if they are
-   not aware of proto3 presence. The synthetic oneof should not appear anywhere
-   in the generated API.
-
-### Satisfying the Experimental Check
-
-If you try to run `protoc` on a file with proto3 `optional` fields, you will get
-an error because the feature is still experimental:
-
-```
-$ cat test.proto
-syntax = "proto3";
-
-message Foo {
-  // Experimental feature, not generally supported yet!
-  optional int32 a = 1;
-}
-$ protoc --cpp_out=. test.proto
-test.proto: This file contains proto3 optional fields, but --experimental_allow_proto3_optional was not set.
-```
-
-There are two options for getting around this error:
-
-1. Pass `--experimental_allow_proto3_optional` to protoc.
-2. Make your filename (or a directory name) contain the string
-   `test_proto3_optional`. This indicates that the proto file is specifically
-   for testing proto3 optional support, so the check is suppressed.
-
-These options are demonstrated below:
-
-```
-# One option:
-$ ./src/protoc test.proto --cpp_out=. --experimental_allow_proto3_optional
-
-# Another option:
-$ cp test.proto test_proto3_optional.proto
-$ ./src/protoc test_proto3_optional.proto --cpp_out=.
-$
-```
-
-The experimental check will be removed  in a future release, once we are ready
-to make this feature generally available. Ideally this will happen for the 3.13
-release of protobuf, sometime in mid-2020, but there is not a specific date set
-for this yet. Some of the timing will depend on feedback we get from the
-community, so if you have questions or concerns please get in touch via a
-GitHub issue.
-
-### Signaling That Your Code Generator Supports Proto3 Optional
-
-If you now try to invoke your own code generator with the test proto, you will
-run into a different error:
-
-```
-$ ./src/protoc test_proto3_optional.proto --my_codegen_out=.
-test_proto3_optional.proto: is a proto3 file that contains optional fields, but
-code generator --my_codegen_out hasn't been updated to support optional fields in
-proto3. Please ask the owner of this code generator to support proto3 optional.
-```
-
-This check exists to make sure that code generators get a chance to update
-before they are used with proto3 `optional` fields. Without this check an old
-code generator might emit obsolete generated APIs (like accessors for a
-synthetic oneof) and users could start depending on these. That would create
-a legacy migration burden once a code generator actually implements the feature.
-
-To signal that your code generator supports `optional` fields in proto3, you
-need to tell `protoc` what features you support. The method for doing this
-depends on whether you are using the C++
-`google::protobuf::compiler::CodeGenerator`
-framework or not.
-
-If you are using the CodeGenerator framework:
-
-```c++
-class MyCodeGenerator : public google::protobuf::compiler::CodeGenerator {
-  // Add this method.
-  uint64_t GetSupportedFeatures() const override {
-    // Indicate that this code generator supports proto3 optional fields.
-    // (Note: don't release your code generator with this flag set until you
-    // have actually added and tested your proto3 support!)
-    return FEATURE_PROTO3_OPTIONAL;
-  }
-}
-```
-
-If you are generating code using raw `CodeGeneratorRequest` and
-`CodeGeneratorResponse` messages from `plugin.proto`, the change will be very
-similar:
-
-```c++
-void GenerateResponse() {
-  CodeGeneratorResponse response;
-  response.set_supported_features(CodeGeneratorResponse::FEATURE_PROTO3_OPTIONAL);
-
-  // Generate code...
-}
-```
-
-Once you have added this, you should now be able to successfully use your code
-generator to generate a file containing proto3 optional fields:
-
-```
-$ ./src/protoc test_proto3_optional.proto --my_codegen_out=.
-```
-
-### Updating Your Code Generator
-
-Now to actually add support for proto3 optional to your code generator. The goal
-is to recognize proto3 optional fields as optional, and suppress any output from
-synthetic oneofs.
-
-If your code generator does not currently support proto2, you will need to
-design an API and implementation for supporting presence in scalar fields.
-Generally this means:
-
-- allocating a bit inside the generated class to represent whether a given field
-  is present or not.
-- exposing a `has_foo()` method for each field to return the value of this bit.
-- make the parser set this bit when a value is parsed from the wire.
-- make the serializer test this bit to decide whether to serialize.
-
-If your code generator already supports proto2, then most of your work is
-already done. All you need to do is make sure that proto3 optional fields have
-exactly the same API and behave in exactly the same way as proto2 optional
-fields.
-
-From experience updating several of Google's code generators, most of the
-updates that are required fall into one of several patterns. Here we will show
-the patterns in terms of the C++ CodeGenerator framework. If you are using
-`CodeGeneratorRequest` and `CodeGeneratorReply` directly, you can translate the
-C++ examples to your own language, referencing the C++ implementation of these
-methods where required.
-
-#### To test whether a field should have presence
-
-Old:
-
-```c++
-bool MessageHasPresence(const google::protobuf::Descriptor* message) {
-  return message->file()->syntax() ==
-         google::protobuf::FileDescriptor::SYNTAX_PROTO2;
-}
-```
-
-New:
-
-```c++
-// Presence is no longer a property of a message, it's a property of individual
-// fields.
-bool FieldHasPresence(const google::protobuf::FieldDescriptor* field) {
-  return field->has_presence();
-  // Note, the above will return true for fields in a oneof.
-  // If you want to filter out oneof fields, write this instead:
-  //   return field->has_presence && !field->real_containing_oneof()
-}
-```
-
-#### To test whether a field is a member of a oneof
-
-Old:
-
-```c++
-bool FieldIsInOneof(const google::protobuf::FieldDescriptor* field) {
-  return field->containing_oneof() != nullptr;
-}
-```
-
-New:
-
-```c++
-bool FieldIsInOneof(const google::protobuf::FieldDescriptor* field) {
-  // real_containing_oneof() returns nullptr for synthetic oneofs.
-  return field->real_containing_oneof() != nullptr;
-}
-```
-
-#### To iterate over all oneofs
-
-Old:
-
-```c++
-bool IterateOverOneofs(const google::protobuf::Descriptor* message) {
-  for (int i = 0; i < message->oneof_decl_count(); i++) {
-    const google::protobuf::OneofDescriptor* oneof = message->oneof(i);
-    // ...
-  }
-}
-```
-
-New:
-
-```c++
-bool IterateOverOneofs(const google::protobuf::Descriptor* message) {
-  // Real oneofs are always first, and real_oneof_decl_count() will return the
-  // total number of oneofs, excluding synthetic oneofs.
-  for (int i = 0; i < message->real_oneof_decl_count(); i++) {
-    const google::protobuf::OneofDescriptor* oneof = message->oneof(i);
-    // ...
-  }
-}
-```
-
-## Updating Reflection
-
-If your implementation offers reflection, there are a few other changes to make:
-
-### API Changes
-
-The API for reflecting over fields and oneofs should make the following changes.
-These match the changes implemented in C++ reflection.
-
-1. Add a `FieldDescriptor::has_presence()` method returning `bool`
-   (adjusted to your language's naming convention).  This should return true
-   for all fields that have explicit presence, as documented in
-   [docs/field_presence](field_presence.md).  In particular, this includes
-   fields in a oneof, proto2 scalar fields, and proto3 `optional` fields.
-   This accessor will allow users to query what fields have presence without
-   thinking about the difference between proto2 and proto3.
-2. As a corollary of (1), please do *not* expose an accessor for the
-   `FieldDescriptorProto.proto3_optional` field. We want to avoid having
-   users implement any proto2/proto3-specific logic. Users should use the
-   `has_presence()` function instead.
-3. You may also wish to add a `FieldDescriptor::has_optional_keyword()` method
-   returning `bool`, which indicates whether the `optional` keyword is present.
-   Message fields will always return `true` for `has_presence()`, so this method
-   can allow a user to know whether the user wrote `optional` or not. It can
-   occasionally be useful to have this information, even though it does not
-   change the presence semantics of the field.
-4. If your reflection API may be used for a code generator, you may wish to
-   implement methods to help users tell the difference between real and
-   synthetic oneofs.  In particular:
-   - `OneofDescriptor::is_synthetic()`: returns true if this is a synthetic
-     oneof.
-   - `FieldDescriptor::real_containing_oneof()`: like `containing_oneof()`,
-     but returns `nullptr` if the oneof is synthetic.
-   - `Descriptor::real_oneof_decl_count()`: like `oneof_decl_count()`, but
-     returns the number of real oneofs only.
-
-### Implementation Changes
-
-Proto3 `optional` fields and synthetic oneofs must work correctly when
-reflected on. Specifically:
-
-1. Reflection for synthetic oneofs should work properly. Even though synthetic
-   oneofs do not really exist in the message, you can still make reflection work
-   as if they did. In particular, you can make a method like
-   `Reflection::HasOneof()` or `Reflection::GetOneofFieldDescriptor()` look at
-   the hasbit to determine if the oneof is present or not.
-2. Reflection for proto3 optional fields should work properly. For example, a
-   method like `Reflection::HasField()` should know to look for the hasbit for a
-   proto3 `optional` field. It should not be fooled by the synthetic oneof into
-   thinking that there is a `case` member for the oneof.
-
-Once you have updated reflection to work properly with proto3 `optional` and
-synthetic oneofs, any code that *uses* your reflection interface should work
-properly with no changes. This is the benefit of using synthetic oneofs.
-
-In particular, if you have a reflection-based implementation of protobuf text
-format or JSON, it should properly support proto3 optional fields without any
-changes to the code. The fields will look like they all belong to a one-field
-oneof, and existing proto3 reflection code should know how to test presence for
-fields in a oneof.
-
-So the best way to test your reflection changes is to try round-tripping a
-message through text format, JSON, or some other reflection-based parser and
-serializer, if you have one.
-
-### Validating Descriptors
-
-If your reflection implementation supports loading descriptors at runtime,
-you must verify that all synthetic oneofs are ordered after all "real" oneofs.
-
-Here is the code that implements this validation step in C++, for inspiration:
-
-```c++
-  // Validation that runs for each message.
-  // Synthetic oneofs must be last.
-  int first_synthetic = -1;
-  for (int i = 0; i < message->oneof_decl_count(); i++) {
-    const OneofDescriptor* oneof = message->oneof_decl(i);
-    if (oneof->is_synthetic()) {
-      if (first_synthetic == -1) {
-        first_synthetic = i;
-      }
-    } else {
-      if (first_synthetic != -1) {
-        AddError(message->full_name(), proto.oneof_decl(i),
-                 DescriptorPool::ErrorCollector::OTHER,
-                 "Synthetic oneofs must be after all other oneofs");
-      }
-    }
-  }
-
-  if (first_synthetic == -1) {
-    message->real_oneof_decl_count_ = message->oneof_decl_count_;
-  } else {
-    message->real_oneof_decl_count_ = first_synthetic;
-  }
-```
diff --git a/libs/protobuf/docs/jvm_aot.md b/libs/protobuf/docs/jvm_aot.md
deleted file mode 100644
index 304c829..0000000
--- a/libs/protobuf/docs/jvm_aot.md
+++ /dev/null
@@ -1,18 +0,0 @@
-# Ahead Of Time (AOT) compilation for the Java Virtual Machine (JVM)"
-
-Ahead Of Time (AOT) compilation build tools such as those provided by [GraalVM's `native-image`](https://www.graalvm.org/reference-manual/native-image/) can require some configuration when using protobuf.
-Protobuf for the JVM uses reflection and some of its target classes are not possible to determine in advance.
-Historically, there were good reasons to use reflection based on APIs that were published effectively requiring them, and this situation is unlikely to change.
-
-[The Lite version of protobuf for the JVM](https://github.com/protocolbuffers/protobuf/blob/main/java/lite.md)
-avoids reflection and may be better suited for use with AOT compilation tooling. This Lite version was originally targeted for use on Android which has similar AOT compilation
-goals as GraalVM's native-image tool.
-
-## GraalVM native-image
-
-This section addresses GraalVM's `native-image` configuration specifically as this AOT compilation tool due to its popularity. The `native-image` tool can be configured
-with respect to: the [Java Native Interface](https://en.wikipedia.org/wiki/Java_Native_Interface) (JNI), http proxying, reflection, and other resources. While these
-considerations can be manually declared as JSON files, we recommend that a JVM application is exercised along with 
-[the assisted configuration agent](https://www.graalvm.org/reference-manual/native-image/BuildConfiguration/#assisted-configuration-of-native-image-builds). The agent
-will generate files that you can then subsequently point at when invoking `native-image`. We recommend that the generated files are retained with a project's source
-code.
diff --git a/libs/protobuf/docs/options.md b/libs/protobuf/docs/options.md
deleted file mode 100644
index b489288..0000000
--- a/libs/protobuf/docs/options.md
+++ /dev/null
@@ -1,322 +0,0 @@
-# Protobuf Global Extension Registry
-
-This file contains a global registry of known extensions for descriptor.proto,
-so that any developer who wishes to use multiple 3rd party projects, each with
-their own extensions, can be confident that there won't be collisions in
-extension numbers.
-
-If you need an extension number for your custom option (see [custom options](
-https://developers.google.com/protocol-buffers/docs/proto#customoptions)),
-please [send us a pull request](https://github.com/protocolbuffers/protobuf/pulls) to
-add an entry to this doc, or [create an issue](https://github.com/protocolbuffers/protobuf/issues)
-with info about your project (name and website) so we can add an entry for you.
-
-## Existing Registered Extensions
-
-1. C# port of protocol buffers
-   * Website: https://github.com/jskeet/protobuf-csharp-port
-   * Extensions: 1000
-
-1. Perl/XS port of protocol buffers
-   * Website: http://code.google.com/p/protobuf-perlxs
-   * Extensions: 1001
-
-1. Objective-C port of protocol buffers
-   * Website: http://code.google.com/p/protobuf-objc
-   * Extensions: 1002
-
-1. Google Wave Federation Protocol open-source release (FedOne)
-   * Website: http://code.google.com/p/wave-protocol
-   * Extensions: 1003
-
-1. PHP code generator plugin
-   * Website: ???
-   * Extensions: 1004
-
-1. GWT code generator plugin (third-party!)
-   * Website: http://code.google.com/p/protobuf-gwt/
-   * Extensions: 1005
-
-1. Unix Domain RPC code generator plugin
-   * Website: http://go/udrpc
-   * Extensions: 1006
-
-1. Object-C generator plugin (Plausible Labs)
-   * Website: http://www.plausible.coop
-   * Extensions: 1007
-
-1. TBD (code42.com)
-   * Website: ???
-   * Extensions: 1008
-
-1. Goby Underwater Autonomy Project
-   * Website: https://github.com/GobySoft/goby
-   * Extensions: 1009
-
-1. Nanopb
-   * Website: http://kapsi.fi/~jpa/nanopb
-   * Extensions: 1010
-
-1. Bluefin AUV Communication Extensions
-   * Website: http://www.bluefinrobotics.com
-   * Extensions: 1011
-
-1. Dynamic Compact Control Language
-   * Website: http://github.com/GobySoft/dccl
-   * Extensions: 1012
-
-1. ScaleOut StateServer® Native C++ API
-   * Website: http://www.scaleoutsoftware.com
-   * Extensions: 1013
-
-1. FoundationDB SQL Layer
-   * Website: https://github.com/FoundationDB/sql-layer
-   * Extensions: 1014
-
-1. Fender
-   * Website: https://github.com/hassox/fender
-   * Extensions: 1015
-
-1. Vortex
-   * Website: http://www.prismtech.com/vortex
-   * Extensions: 1016
-
-1. tresorit
-   * Website: https://tresorit.com/
-   * Extensions: 1017
-
-1. CRIU (Checkpoint Restore In Userspace)
-   * Website: http://criu.org/Main_Page
-   * Extensions: 1018
-
-1. protobuf-c
-   * Website: https://github.com/protobuf-c/protobuf-c
-   * Extensions: 1019
-
-1. ScalaPB
-   * Website: https://scalapb.github.io/
-   * Extensions: 1020
-
-1. protoc-gen-bq-schema
-   * Website: https://github.com/GoogleCloudPlatform/protoc-gen-bq-schema
-   * Extensions: 1021
-
-1. grpc-gateway
-   * Website: https://github.com/gengo/grpc-gateway
-   * Extensions: 1022
-
-1. Certificate Transparency
-   * Website: https://github.com/google/certificate-transparency
-   * Extensions: 1023
-
-1. JUNOS Router Telemetry
-   * Website: http://www.juniper.net
-   * Extensions: 1024
-
-1. Spine Event Engine
-   * Website: https://github.com/SpineEventEngine/core-java
-   * Extensions: 1025
-
-1. Aruba cloud platform
-   * Website: ???
-   * Extensions: 1026 -> 1030
-
-1. Voltha
-   * Website: ???
-   * Extensions: 1031 -> 1033
-
-1. gator
-   * Website: ???
-   * Extensions: 1034
-
-1. protoc-gen-flowtypes
-   * Website: https://github.com/tmc/grpcutil/tree/master/protoc-gen-flowtypes
-   * Extensions: 1035
-
-1. ProfaneDB
-   * Website: https://gitlab.com/ProfaneDB/ProfaneDB
-   * Extensions: 1036
-
-1. protobuf-net
-   * Website: https://github.com/mgravell/protobuf-net
-   * Extensions: 1037
-
-1. FICO / StreamEngine
-   * Website: http://www.fico.com/
-   * Extensions: 1038
-
-1. GopherJS
-   * Website: https://github.com/johanbrandhorst/protobuf
-   * Extensions: 1039
-
-1. ygot
-   * Website: https://github.com/openconfig/ygot
-   * Extensions: 1040
-
-1. go-grpcmw
-   * Website: https://github.com/MarquisIO/go-grpcmw
-   * Extensions: 1041
-
-1. grpc-gateway protoc-gen-swagger
-   * Website: https://github.com/grpc-ecosystem/grpc-gateway
-   * Extensions: 1042
-
-1. AN Message
-   * Website: TBD
-   * Extensions: 1043
-
-1. protofire
-   * Website: https://github.com/ribrdb/protofire
-   * Extensions: 1044
-
-1. Gravity
-   * Website: https://github.com/aphysci/gravity
-   * Extensions: 1045
-
-1. SEMI Standards – I&C Technical Committee
-   * Website: http://downloads.semi.org/web/wstdsbal.nsf/9c2b317e76523cca88257641005a47f5/88a5863a580e323088256e7b00707489!OpenDocument
-   * Extensions: 1046
-
-1. Elixir plugin
-   * Website: https://github.com/tony612/grpc-elixir
-   * Extensions: 1047
-
-1. API client generators
-   * Website: ???
-   * Extensions: 1048-1056
-
-1. Netifi Proteus
-   * Website: https://github.com/netifi-proteus
-   * Extensions: 1057
-
-1. CGSN Mooring Project
-   * Website: https://bitbucket.org/ooicgsn/cgsn-mooring
-   * Extensions: 1058
-
-1. Container Storage Interface
-   * Website: https://github.com/container-storage-interface/spec
-   * Extensions: 1059-1069
-
-1. TwirpQL Plugin
-   * Website: https://twirpql.dev
-   * Extensions: 1070
-
-1. Protoc-gen-validate
-   * Website: https://github.com/envoyproxy/protoc-gen-validate
-   * Extensions: 1071
-
-1. Protokt
-   * Website: https://github.com/open-toast/protokt
-   * Extensions: 1072
-
-1. Dart port of protocol buffers
-   * Website https://github.com/dart-lang/protobuf
-   * Extensions: 1073
-
-1. Ocaml-protoc-plugin
-   * Website: https://github.com/issuu/ocaml-protoc-plugin
-   * Extensions: 1074
-
-1. Analyze Re Graphene
-   * Website: https://analyzere.com
-   * Extensions: 1075
-
-1. Wire since and until
-   * Website: https://square.github.io/wire/
-   * Extensions: 1076, 1077
-
-1. Bazel, Failure Details
-   * Website: https://github.com/bazelbuild/bazel
-   * Extensions: 1078
-
-1. grpc-graphql-gateway
-   * Website: https://github.com/ysugimoto/grpc-graphql-gateway
-   * Extensions: 1079
-
-1. Cloudstate
-   * Website: https://cloudstate.io
-   * Extensions: 1080-1084
-
-1. SummaFT protoc-plugins
-   * Website: https://summaft.com/
-   * Extensions: 1085
-
-1. ADLINK EdgeSDK
-   * Website: https://www.adlinktech.com/en/Edge-SDK-IoT
-   * Extensions: 1086
-
-1. Wire wire_package
-   * Website: https://square.github.io/wire/
-   * Extensions: 1087
-
-1. Confluent Schema Registry
-   * Website: https://github.com/confluentinc/schema-registry
-   * Extensions: 1088
-
-1. ScalaPB Validate
-   * Website: https://scalapb.github.io/docs/validation
-   * Extension: 1089
-
-1. Astounding (Currently Private)
-   * Website: https://github.com/PbPipes/Astounding
-   * Extension: 1090
-
-1. Protoc-gen-psql
-   * Website: https://github.com/Intrinsec/protoc-gen-psql
-   * Extension: 1091-1101
-
-1. Protoc-gen-sanitize
-   * Website: https://github.com/Intrinsec/protoc-gen-sanitize
-   * Extension: 1102-1106
-
-1. Coach Client Connect (planned release in March 2021)
-   * Website: https://www.coachclientconnect.com
-   * Extension: 1107
-
-1. Kratos API Errors
-   * Website: https://go-kratos.dev
-   * Extension: 1108
-
-1. Glitchdot (Currently Private)
-   * Website: https://go.glitchdot.com
-   * Extension: 1109
-
-1. eigr/protocol
-   * Website: https://eigr.io
-   * Extension: 1110-1114
-
-1. Container Object Storage Interface (COSI)
-   * Website: https://github.com/kubernetes-sigs/container-object-storage-interface-spec
-   * Extension: 1115-1124
-
-1. Protoc-gen-jsonschema
-   * Website: https://github.com/chrusty/protoc-gen-jsonschema
-   * Extension: 1125-1129
-
-1. Protoc-gen-checker
-   * Website: https://github.com/Intrinsec/protoc-gen-checker
-   * Extension: 1130-1139
-
-1. Protoc-gen-go-svc
-   * Website: https://github.com/dane/protoc-gen-go-svc
-   * Extension: 1140
-
-1. Embedded Proto
-   * Website: https://EmbeddedProto.com
-   * Extension: 1141
-
-1. Protoc-gen-fieldmask
-   * Website: https://github.com/yeqown/protoc-gen-fieldmask
-   * Extension: 1142
- 
-1. Google Gnostic
-   * Website: https://github.com/google/gnostic
-   * Extension: 1143
-
-1. Protoc-gen-go-micro
-   * Website: https://github.com/unistack-org/protoc-gen-go-micro
-   * Extension: 1144
-
-1. Protoc-gen-authz
-   * Website: https://github.com/Neakxs/protoc-gen-authz
-   * Extension: 1145
diff --git a/libs/protobuf/docs/performance.md b/libs/protobuf/docs/performance.md
deleted file mode 100644
index 245fdf1..0000000
--- a/libs/protobuf/docs/performance.md
+++ /dev/null
@@ -1,304 +0,0 @@
-# Protobuf Performance
-The following benchmark test results were produced on a workstation utilizing an Intel® Xeon® Processor E5-2630 with 32GB of RAM.
-
-This table contains the results of three separate languages:
-
-* **C++** - For C++, there are three parsing methods:
-	* **new** - This is for using a new operator for creating a message instance.
-    * **new arena** - This is for using arena for creating a new message instance.
-    * **reuse** - This is for reusing the same message instance for parsing.
-* **Java** - For Java, there are three parsing/serialization methods:
-	* **byte[]** - This is for parsing from a Byte Array.
-    * **ByteString** - This is for parsing from a
-    	com.google.protobuf.ByteString.
-    * **InputStream** - This is for parsing from an InputStream.
-* **Python** - For Python, there are three types of Python protobuf for testing:
-	* **C++-generated-code** - This is for using C++ generated code of the
-    	proto file as a dynamic linked library.
-	* **C++-reflection** - This is for using C++ reflection, for which there's no
-    	generated code, but still using C++ protobuf library as a dynamic linked
-        library.
-	* **pure-Python** - This is for the pure version of Python, which does not link with
-    	any C++ protobuf library.
-
-## Parsing performance
-
-<table>
-<tbody><tr>
-<th rowspan="2"> </th>
-<th colspan="3" rowspan="1">C++</th>
-<th colspan="3" rowspan="1">C++ with tcmalloc</th>
-<th colspan="3" rowspan="1">java</th>
-<th colspan="3" rowspan="1">python</th>
-</tr>
-<tr>
-<th colspan="1">new</th>
-<th colspan="1">new arena</th>
-<th colspan="1">reuse</th>
-<th colspan="1">new</th>
-<th colspan="1">new arena</th>
-<th colspan="1">reuse</th>
-<th colspan="1">byte[]</th>
-<th colspan="1">ByteString</th>
-<th colspan="1">InputStream</th>
-<th colspan="1">C++-generated-code</th>
-<th colspan="1">C++-reflection</th>
-<th colspan="1">pure-Python</th>
-</tr>
-<tr>
-<td>google_message1_proto2</td>
-<td>368.717MB/s</td>
-<td>261.847MB/s</td>
-<td>799.403MB/s</td>
-<td>645.183MB/s</td>
-<td>441.023MB/s</td>
-<td>1.122GB/s</td>
-<td>425.437MB/s</td>
-<td>425.937MB/s</td>
-<td>251.018MB/s</td>
-<td>82.8314MB/s</td>
-<td>47.6763MB/s</td>
-<td>3.76299MB/s</td>
-</tr>
-<tr>
-<td>google_message1_proto3</td>
-<td>294.517MB/s</td>
-<td>229.116MB/s</td>
-<td>469.982MB/s</td>
-<td>434.510MB/s</td>
-<td>394.701MB/s</td>
-<td>591.931MB/s</td>
-<td>357.597MB/s</td>
-<td>378.568MB/s</td>
-<td>221.676MB/s</td>
-<td>82.0498MB/s</td>
-<td>39.9467MB/s</td>
-<td>3.77751MB/s</td>
-</tr>
-<tr>
-<td>google_message2</td>
-<td>277.242MB/s</td>
-<td>347.611MB/s</td>
-<td>793.67MB/s</td>
-<td>503.721MB/s</td>
-<td>596.333MB/s</td>
-<td>922.533MB/s</td>
-<td>416.778MB/s</td>
-<td>419.543MB/s</td>
-<td>367.145MB/s</td>
-<td>241.46MB/s</td>
-<td>71.5723MB/s</td>
-<td>2.73538MB/s</td>
-</tr>
-<tr>
-<td>google_message3_1</td>
-<td>213.478MB/s</td>
-<td>291.58MB/s</td>
-<td>543.398MB/s</td>
-<td>539.704MB/s</td>
-<td>717.300MB/s</td>
-<td>927.333MB/s</td>
-<td>684.241MB/s</td>
-<td>704.47MB/s</td>
-<td>648.624MB/s</td>
-<td>209.036MB/s</td>
-<td>142.356MB/s</td>
-<td>15.3324MB/s</td>
-</tr>
-<tr>
-<td>google_message3_2</td>
-<td>672.685MB/s</td>
-<td>802.767MB/s</td>
-<td>1.21505GB/s</td>
-<td>985.790MB/s</td>
-<td>1.136GB/s</td>
-<td>1.367GB/s</td>
-<td>1.54439GB/s</td>
-<td>1.60603GB/s</td>
-<td>1.33443GB/s</td>
-<td>573.835MB/s</td>
-<td>314.33MB/s</td>
-<td>15.0169MB/s</td>
-</tr>
-<tr>
-<td>google_message3_3</td>
-<td>207.681MB/s</td>
-<td>140.591MB/s</td>
-<td>535.181MB/s</td>
-<td>369.743MB/s</td>
-<td>262.301MB/s</td>
-<td>556.644MB/s</td>
-<td>279.385MB/s</td>
-<td>304.853MB/s</td>
-<td>107.575MB/s</td>
-<td>32.248MB/s</td>
-<td>26.1431MB/s</td>
-<td>2.63541MB/s</td>
-</tr>
-<tr>
-<td>google_message3_4</td>
-<td>7.96091GB/s</td>
-<td>7.10024GB/s</td>
-<td>9.3013GB/s</td>
-<td>8.518GB/s</td>
-<td>8.171GB/s</td>
-<td>9.917GB/s</td>
-<td>5.78006GB/s</td>
-<td>5.85198GB/s</td>
-<td>4.62609GB/s</td>
-<td>2.49631GB/s</td>
-<td>2.35442GB/s</td>
-<td>802.061MB/s</td>
-</tr>
-<tr>
-<td>google_message3_5</td>
-<td>76.0072MB/s</td>
-<td>51.6769MB/s</td>
-<td>237.856MB/s</td>
-<td>178.495MB/s</td>
-<td>111.751MB/s</td>
-<td>329.569MB/s</td>
-<td>121.038MB/s</td>
-<td>132.866MB/s</td>
-<td>36.9197MB/s</td>
-<td>10.3962MB/s</td>
-<td>8.84659MB/s</td>
-<td>1.25203MB/s</td>
-</tr>
-<tr>
-<td>google_message4</td>
-<td>331.46MB/s</td>
-<td>404.862MB/s</td>
-<td>427.99MB/s</td>
-<td>589.887MB/s</td>
-<td>720.367MB/s</td>
-<td>705.373MB/s</td>
-<td>606.228MB/s</td>
-<td>589.13MB/s</td>
-<td>530.692MB/s</td>
-<td>305.543MB/s</td>
-<td>174.834MB/s</td>
-<td>7.86485MB/s</td>
-</tr>
-</tbody></table>
-
-## Serialization performance
-
-<table>
-<tbody><tr>
-<th rowspan="2"> </th>
-<th colspan="1" rowspan="2">C++</th>
-<th colspan="1" rowspan="2">C++ with tcmalloc</th>
-<th colspan="3" rowspan="1">java</th>
-<th colspan="3" rowspan="1">python</th>
-</tr>
-<tr>
-<th colspan="1">byte[]</th>
-<th colspan="1">ByteString</th>
-<th colspan="1">InputStream</th>
-<th colspan="1">C++-generated-code</th>
-<th colspan="1">C++-reflection</th>
-<th colspan="1">pure-Python</th>
-</tr>
-<tr>
-<td>google_message1_proto2</td>
-<td>1.39698GB/s</td>
-<td>1.701GB/s</td>
-<td>1.12915GB/s</td>
-<td>1.13589GB/s</td>
-<td>758.609MB/s</td>
-<td>260.911MB/s</td>
-<td>58.4815MB/s</td>
-<td>5.77824MB/s</td>
-</tr>
-<tr>
-<td>google_message1_proto3</td>
-<td>959.305MB/s</td>
-<td>939.404MB/s</td>
-<td>1.15372GB/s</td>
-<td>1.07824GB/s</td>
-<td>802.337MB/s</td>
-<td>239.4MB/s</td>
-<td>33.6336MB/s</td>
-<td>5.80524MB/s</td>
-</tr>
-<tr>
-<td>google_message2</td>
-<td>1.27429GB/s</td>
-<td>1.402GB/s</td>
-<td>1.01039GB/s</td>
-<td>1022.99MB/s</td>
-<td>798.736MB/s</td>
-<td>996.755MB/s</td>
-<td>57.9601MB/s</td>
-<td>4.09246MB/s</td>
-</tr>
-<tr>
-<td>google_message3_1</td>
-<td>1.31916GB/s</td>
-<td>2.049GB/s</td>
-<td>991.496MB/s</td>
-<td>860.332MB/s</td>
-<td>662.88MB/s</td>
-<td>1.48625GB/s</td>
-<td>421.287MB/s</td>
-<td>18.002MB/s</td>
-</tr>
-<tr>
-<td>google_message3_2</td>
-<td>2.15676GB/s</td>
-<td>2.632GB/s</td>
-<td>2.14736GB/s</td>
-<td>2.08136GB/s</td>
-<td>1.55997GB/s</td>
-<td>2.39597GB/s</td>
-<td>326.777MB/s</td>
-<td>16.0527MB/s</td>
-</tr>
-<tr>
-<td>google_message3_3</td>
-<td>650.456MB/s</td>
-<td>1.040GB/s</td>
-<td>593.52MB/s</td>
-<td>580.667MB/s</td>
-<td>346.839MB/s</td>
-<td>123.978MB/s</td>
-<td>35.893MB/s</td>
-<td>2.32834MB/s</td>
-</tr>
-<tr>
-<td>google_message3_4</td>
-<td>8.70154GB/s</td>
-<td>9.825GB/s</td>
-<td>5.88645GB/s</td>
-<td>5.93946GB/s</td>
-<td>2.44388GB/s</td>
-<td>5.9241GB/s</td>
-<td>4.05837GB/s</td>
-<td>876.87MB/s</td>
-</tr>
-<tr>
-<td>google_message3_5</td>
-<td>246.33MB/s</td>
-<td>443.993MB/s</td>
-<td>283.278MB/s</td>
-<td>259.167MB/s</td>
-<td>206.37MB/s</td>
-<td>37.0285MB/s</td>
-<td>12.2228MB/s</td>
-<td>1.1979MB/s</td>
-</tr>
-<tr>
-<td>google_message4</td>
-<td>1.56674GB/s</td>
-<td>2.19601GB/s</td>
-<td>776.907MB/s</td>
-<td>770.707MB/s</td>
-<td>702.931MB/s</td>
-<td>1.49623GB/s</td>
-<td>205.116MB/s</td>
-<td>8.93428MB/s</td>
-</tr>
-</tbody></table>
-
-\* The cpp performance can be improved by using [tcmalloc](https://gperftools.github.io/gperftools/tcmalloc.html), please follow the (instruction)[https://github.com/protocolbuffers/protobuf/blob/main/benchmarks/README.md] to link with tcmalloc to get the faster result.
diff --git a/libs/protobuf/docs/third_party.md b/libs/protobuf/docs/third_party.md
deleted file mode 100644
index d8478e9..0000000
--- a/libs/protobuf/docs/third_party.md
+++ /dev/null
@@ -1,205 +0,0 @@
-# Third-Party Add-ons for Protocol Buffers
-
-This page lists code related to Protocol Buffers which is developed and maintained by third parties.  You may find this code useful, but note that **these projects are not affiliated with or endorsed by Google (unless explicitly marked)**; try them at your own risk.  Also note that many projects here are in the early stages of development and not production-ready.
-
-If you have a project that should be listed here, please
-[send us a pull request](https://github.com/protocolbuffers/protobuf/pulls) to update this page.
-
-## Programming Languages
-
-These are projects we know about implementing Protocol Buffers for other programming languages:
-* Action Script: https://code.google.com/p/protobuf-actionscript3/
-* Action Script: https://code.google.com/p/protoc-gen-as3/
-* Action Script: https://github.com/matrix3d/JProtoc
-* Action Script: https://github.com/zhongfq/protobuf-as3/
-* Ada: https://github.com/reznikmm/protobuf
-* C: https://github.com/protobuf-c/protobuf-c
-* C: https://koti.kapsi.fi/jpa/nanopb/
-* C: https://github.com/cloudwu/pbc/
-* C: https://github.com/haberman/upb/wiki
-* C: https://github.com/squidfunk/protobluff
-* C: https://github.com/eerimoq/pbtools
-* C++: https://github.com/protocolbuffers/protobuf (Google-official implementation)
-* C++: https://EmbeddedProto.com
-* C/C++: http://spbc.sf.net/
-* C#: https://code.google.com/p/protobuf-csharp-port
-* C#: https://silentorbit.com/protobuf/
-* C#/.NET/WCF/VB: https://code.google.com/p/protobuf-net/
-* Clojure: http://github.com/ninjudd/clojure-protobuf
-* Clojure: https://github.com/clojusc/protobuf
-* Clojure: https://protojure.readthedocs.io
-* Common Lisp: http://github.com/brown/protobuf
-* Common Lisp: http://github.com/qitab/cl-protobuf
-* D: https://github.com/dcarp/protobuf-d
-* D: https://github.com/msoucy/dproto
-* D: https://github.com/opticron/ProtocolBuffer
-* Dart: https://github.com/dart-lang/dart-protobuf (runtime) https://github.com/dart-lang/dart-protoc-plugin (code generator)
-* Delphi: http://sourceforge.net/projects/protobuf-delphi/
-* Delphi: http://fundementals.sourceforge.net/dl.html
-* Elixir: https://github.com/jeremyong/exprotoc
-* Elixir: https://github.com/tony612/protobuf-elixir
-* Elixir: https://github.com/ahamez/protox
-* Elm: https://github.com/tiziano88/elm-protobuf
-* Erlang: https://github.com/tomas-abrahamsson/gpb
-* Erlang: http://piqi.org/
-* Erlang: https://github.com/basho/erlang_protobuffs (no longer maintained, use gpb instead)
-* Hacklang/HHVM: https://github.com/y3llowcake/proto-hack
-* GDScript: https://github.com/oniksan/godobuf (Godot v3 engine plugin)
-* Go: https://github.com/golang/protobuf (Google-official implementation)
-* Go: https://github.com/akunspy/gopbuf
-* Go: https://github.com/gogo/protobuf
-* GopherJS: https://github.com/johanbrandhorst/protobuf
-* Haskell: https://hackage.haskell.org/package/hprotoc
-* Haskell: https://github.com/google/proto-lens (Google-unofficial implementation)
-* Haskell: https://github.com/awakesecurity/proto3-suite (code generator) https://github.com/awakesecurity/proto3-wire (binary serializer/deserializer)
-* Haxe: https://github.com/Atry/protoc-gen-haxe
-* Java: https://github.com/protocolbuffers/protobuf (Google-official implementation)
-* Java/Android: https://github.com/square/wire
-* Java: https://github.com/HebiRobotics/QuickBuffers/
-* Java ME: https://code.google.com/p/protobuf-javame/
-* Java ME: http://swingme.sourceforge.net/encode.shtml
-* Javascript: https://code.google.com/p/protobuf-js/
-* Javascript: http://github.com/sirikata/protojs
-* Javascript: https://github.com/dcodeIO/ProtoBuf.js
-* Javascript: https://code.google.com/p/protobuf-for-node/
-* Javascript: https://code.google.com/p/protostuff/
-* Javascript: https://github.com/seishun/node-protoc-plugin (Node.js port of plugin.h)
-* Javascript: https://github.com/seishun/node-protoc-gen-javascript (Node.js port of the Google-official implementation)
-* Javascript: https://github.com/ButterCam/sisyphus-js
-* Julia: https://github.com/tanmaykm/ProtoBuf.jl
-* Kotlin: https://github.com/marcoferrer/kroto-plus
-* Kotlin: https://github.com/Kotlin/kotlinx.serialization
-* Kotlin: https://github.com/ButterCam/sisyphus
-* Kotlin: https://github.com/open-toast/protokt
-* Kotlin Multiplatform: https://github.com/streem/pbandk
-* Lua: https://code.google.com/p/protoc-gen-lua/
-* Lua: http://github.com/indygreg/lua-protobuf
-* Lua: https://github.com/Neopallium/lua-pb
-* Matlab: https://code.google.com/p/protobuf-matlab/
-* Mercury: https://code.google.com/p/protobuf-mercury/
-* Objective C: https://code.google.com/p/protobuf-objc/
-* Objective C: https://github.com/alexeyxo/protobuf-objc
-* OCaml: http://piqi.org/
-* Perl: http://groups.google.com/group/protobuf-perl
-* Perl: https://metacpan.org/pod/Google::ProtocolBuffers
-* Perl: https://metacpan.org/pod/Google::ProtocolBuffers::Dynamic
-* Perl/XS: https://code.google.com/p/protobuf-perlxs/
-* PHP: https://code.google.com/p/pb4php/
-* PHP: https://github.com/allegro/php-protobuf/
-* PHP: https://github.com/chobie/php-protocolbuffers
-* Prolog: http://www.swi-prolog.org/pldoc/package/protobufs.html
-* Purescript: https://github.com/xc-jp/purescript-protobuf
-* Python: https://github.com/protocolbuffers/protobuf (Google-official implementation)
-* Python: https://github.com/eigenein/protobuf
-* Python: https://github.com/danielgtaylor/python-betterproto
-* R: http://cran.r-project.org/package=RProtoBuf
-* Ruby: https://code.google.com/p/ruby-protobuf/
-* Ruby: http://github.com/mozy/ruby-protocol-buffers
-* Ruby: https://github.com/bmizerany/beefcake/tree/master/lib/beefcake
-* Ruby: https://github.com/localshred/protobuf
-* Rust: https://github.com/tokio-rs/prost
-* Rust: https://github.com/stepancheg/rust-protobuf/
-* Rust: https://github.com/tafia/quick-protobuf
-* Scala: http://github.com/jeffplaisance/scala-protobuf
-* Scala: https://code.google.com/p/protobuf-scala
-* Scala: https://github.com/SandroGrzicic/ScalaBuff
-* Scala: https://scalapb.github.io
-* Solidity: https://github.com/celer-network/pb3-gen-sol
-* Swift: https://github.com/alexeyxo/protobuf-swift
-* Swift: https://github.com/apple/swift-protobuf/
-* Typescript: https://github.com/thesayyn/protoc-gen-ts
-* Typescript: https://github.com/pbkit/pbkit
-* Vala: https://launchpad.net/protobuf-vala
-* Visual Basic: https://code.google.com/p/protobuf-net/
-
-## RPC Implementations
-
-GRPC (http://www.grpc.io/) is Google's RPC implementation for Protocol Buffers. There are other third-party RPC implementations as well.  Some of these actually work with Protocol Buffers service definitions (defined using the `service` keyword in `.proto` files) while others just use Protocol Buffers message objects.
-
-* https://github.com/grpc/grpc (C++, Node.js, Python, Ruby, Objective-C, PHP, C#, Google-official implementation)
-* https://zeroc.com/products/ice (Multiple languages)
-* https://github.com/protobuf-net/protobuf-net (C#/.NET/WCF/VB)
-* http://www.deltavsoft.com/doc/_external_serialization.html#Protobufs (C++)
-* https://protojure.github.io (Clojure)
-* https://code.google.com/p/protobuf-rpc-pro/ (Java)
-* https://github.com/baidu/sofa-pbrpc (C++)
-* https://github.com/madhon/protobuf-csharp-rpc (C#)
-* https://github.com/madwyn/libpbrpc (C++)
-* https://github.com/SeriousMa/grpc-protobuf-validation (Java)
-* https://github.com/elixir-grpc/grpc (Elixir)
-* https://github.com/johanbrandhorst/protobuf (GopherJS)
-* https://github.com/awakesecurity/gRPC-haskell (Haskell)
-* https://github.com/Yeolar/raster (C++)
-* https://github.com/jnordberg/wsrpc (JavaScript Node.js/Browser)
-* https://github.com/pbkit/npm-packages/blob/main/frpc-test/src/index.spec.ts (TypeScript Node.js/Browser)
-* https://github.com/ppissias/xsrpcj (Java)
-* https://github.com/twitchtv/twirp (Multiple languages)
-
-Inactive:
-
-* https://launchpad.net/txprotobuf/ (Python)
-* https://github.com/modeswitch/protobuf-rpc (Python)
-* https://github.com/sdeo/protobuf-socket-rpc (Java, Python)
-* https://code.google.com/p/proto-streamer/ (Java)
-* https://code.google.com/p/server1/ (C++)
-* https://code.google.com/p/protobuf-mina-rpc/ (Python client, Java server)
-* https://code.google.com/p/casocklib/ (C++)
-* https://code.google.com/p/cxf-protobuf/ (Java)
-* https://code.google.com/p/protobuf-remote/ (C++/C#)
-* https://code.google.com/p/eneter-protobuf-serializer/ (Java/.NET)
-* https://github.com/robbinfan/claire/tree/master/protorpc (C++)
-* https://github.com/ebencheung/arab (C++)
-* https://code.google.com/p/protobuf-csharp-rpc/ (C#)
-* https://github.com/thesamet/rpcz (C++/Python, based on ZeroMQ)
-* https://github.com/w359405949/libmaid (C++, Python)
-
-## Other Utilities
-
-There are miscellaneous other things you may find useful as a Protocol Buffers developer.
-
-* [Bazel Build](https://bazel.build)
-    * [rules_closure](https://github.com/bazelbuild/rules_closure) `js-closure`
-    * [rules_go](https://github.com/bazelbuild/rules_go) `go`
-    * [rules_protobuf](https://github.com/pubref/rules_protobuf) `java` `c++` `c#` `go` `js-closure` `js-node` `python` `ruby`
-* [NetBeans IDE plugin](https://code.google.com/p/protobuf-netbeans-plugin/)
-* [Wireshark/Ethereal packet sniffer plugin](https://code.google.com/p/protobuf-wireshark/)
-* [Alternate encodings (JSON, XML, HTML) for Java protobufs](https://code.google.com/p/protobuf-java-format/)
-* [Another JSON encoder/decoder for Java](https://github.com/sijuv/protobuf-codec)
-* [Editor for serialized protobufs](https://code.google.com/p/protobufeditor/)
-* [IntelliJ IDEA plugin](http://github.com/jvolkman/intellij-protobuf-editor)
-* [IntelliJ Protobuf Plugin](https://github.com/devkanro/intellij-protobuf-plugin)
-* [TextMate syntax highlighting](http://github.com/michaeledgar/protobuf-tmbundle)
-* [Oracle PL SQL plugin](https://code.google.com/p/protocol-buffer-plsql/)
-* [Eclipse editor for protobuf (from Google)](https://code.google.com/p/protobuf-dt/)
-* [C++ Builder compatible protobuf](https://github.com/saadware/protobuf-cppbuilder)
-* Maven Protobuf Compiler Plugin
-    * By xolstice.org ([Documentation](https://www.xolstice.org/protobuf-maven-plugin/)) ([Source](https://github.com/xolstice/protobuf-maven-plugin/)) [![Maven Central](https://img.shields.io/maven-central/v/org.xolstice.maven.plugins/protobuf-maven-plugin.svg)](https://repo1.maven.org/maven2/org/xolstice/maven/plugins/protobuf-maven-plugin/)
-    * https://code.google.com/p/maven-protoc-plugin/
-    * https://github.com/os72/protoc-jar-maven-plugin
-* [Documentation generator plugin (Markdown/HTML/DocBook/...)](https://github.com/pseudomuto/protoc-gen-doc)
-* [DocBook generator for .proto files](https://code.google.com/p/protoc-gen-docbook/)
-* [Protobuf for nginx module](https://github.com/dbcode/protobuf-nginx/)
-* [RSpec matchers and Cucumber step defs for testing Protocol Buffers](https://github.com/connamara/protobuf_spec)
-* [Sbt plugin for Protocol Buffers](https://github.com/Atry/sbt-cppp)
-* [Protobuf Plugin for Gradle](https://github.com/google/protobuf-gradle-plugin)
-* [Multi-platform executable JAR and Java API for protoc](https://github.com/os72/protoc-jar)
-* [Python scripts to convert between Protocol Buffers and JSON](https://github.com/NextTuesday/py-pb-converters)
-* [Visual Studio Language Service support for Protocol Buffers](http://visualstudiogallery.msdn.microsoft.com/4bc0f38c-b058-4e05-ae38-155e053c19c5)
-* [Visual Studio Code Support for Protocol Buffers](https://marketplace.visualstudio.com/items?itemName=zxh404.vscode-proto3)
-* [C++ library for serialization/de-serialization between Protocol Buffers and JSON.](https://github.com/yinqiwen/pbjson)
-* [ProtoBuf with Java EE7 Expression Language 3.0; pure Java ProtoBuf Parser and Builder.](https://github.com/protobufel/protobuf-el)
-* [Notepad++ Syntax Highlighting for .proto files](https://github.com/chai2010/notepadplus-protobuf)
-* [Linter for .proto files](https://github.com/ckaznocha/protoc-gen-lint)
-* [Protocol Buffers Dynamic Schema - create protobuf schemas programmatically (Java)](https://github.com/os72/protobuf-dynamic)
-* [Make protoc plugins in NodeJS](https://github.com/konsumer/node-protoc-plugin)
-* [ProfaneDB - A Protocol Buffers database](https://profanedb.gitlab.io)
-* [Protocol Buffer property-based testing utility and example message generator (Python / Hypothesis)](https://github.com/CurataEng/hypothesis-protobuf)
-* [Protolock - CLI utility to prevent backward-incompatible changes to .proto files](https://github.com/nilslice/protolock)
-* [Optional GRPC - GRPC for testable microservices (Python)](https://github.com/mattpaletta/optional-grpc.git)
-* [Protobuf Parser - Yet another Go package which parses a Protocol Buffer file (proto2+proto3)](https://github.com/yoheimuta/go-protoparser)
-* [Protolint - A tool to enforce Protocol Buffer style and conventions.](https://github.com/yoheimuta/protolint)
-    * [vscode-protolint: A protobuf linter for visual studio code](https://github.com/plexsystems/vscode-protolint)
-    * [intellij-protolint: A protobuf linter for JetBrains IDEs](https://github.com/yoheimuta/intellij-protolint)
-    * [vim-protolint: A protobuf linter for Vim](https://github.com/yoheimuta/vim-protolint)
-* [super-linter: Protocol Buffer lint as GitHub Action](https://github.com/github/super-linter)
-* [protoc-gen-fieldmask - A plugin to generate static type fieldmask paths](https://github.com/idodod/protoc-gen-fieldmask)
diff --git a/libs/protobuf/editors/README.txt b/libs/protobuf/editors/README.txt
deleted file mode 100644
index 3e9fc79..0000000
--- a/libs/protobuf/editors/README.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-This directory contains syntax highlighting and configuration files for editors
-to properly display Protocol Buffer files.
-
-See each file's header comment for directions on how to use it with the
-appropriate editor.
diff --git a/libs/protobuf/editors/proto.vim b/libs/protobuf/editors/proto.vim
deleted file mode 100644
index bdc60ce..0000000
--- a/libs/protobuf/editors/proto.vim
+++ /dev/null
@@ -1,105 +0,0 @@
-" Protocol Buffers - Google's data interchange format
-" Copyright 2008 Google Inc.  All rights reserved.
-" https://developers.google.com/protocol-buffers/
-"
-" Redistribution and use in source and binary forms, with or without
-" modification, are permitted provided that the following conditions are
-" met:
-"
-"     * Redistributions of source code must retain the above copyright
-" notice, this list of conditions and the following disclaimer.
-"     * Redistributions in binary form must reproduce the above
-" copyright notice, this list of conditions and the following disclaimer
-" in the documentation and/or other materials provided with the
-" distribution.
-"     * Neither the name of Google Inc. nor the names of its
-" contributors may be used to endorse or promote products derived from
-" this software without specific prior written permission.
-"
-" THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-" "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-" LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-" A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-" OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-" SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-" LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-" DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-" OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-" This is the Vim syntax file for Google Protocol Buffers.
-"
-" Usage:
-"
-" 1. cp proto.vim ~/.vim/syntax/
-" 2. Add the following to ~/.vimrc:
-"
-" augroup filetype
-"   au! BufRead,BufNewFile *.proto setfiletype proto
-" augroup end
-"
-" Or just create a new file called ~/.vim/ftdetect/proto.vim with the
-" previous lines on it.
-
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
-  finish
-endif
-
-syn case match
-
-syn keyword pbTodo       contained TODO FIXME XXX
-syn cluster pbCommentGrp contains=pbTodo
-
-syn keyword pbSyntax     syntax import option
-syn keyword pbStructure  package message group oneof
-syn keyword pbRepeat     optional required repeated
-syn keyword pbDefault    default
-syn keyword pbExtend     extend extensions to max reserved
-syn keyword pbRPC        service rpc returns
-
-syn keyword pbType      int32 int64 uint32 uint64 sint32 sint64
-syn keyword pbType      fixed32 fixed64 sfixed32 sfixed64
-syn keyword pbType      float double bool string bytes
-syn keyword pbTypedef   enum
-syn keyword pbBool      true false
-
-syn match   pbInt     /-\?\<\d\+\>/
-syn match   pbInt     /\<0[xX]\x+\>/
-syn match   pbFloat   /\<-\?\d*\(\.\d*\)\?/
-syn region  pbComment start="\/\*" end="\*\/" contains=@pbCommentGrp,@Spell
-syn region  pbComment start="//" skip="\\$" end="$" keepend contains=@pbCommentGrp,@Spell
-syn region  pbString  start=/"/ skip=/\\./ end=/"/ contains=@Spell
-syn region  pbString  start=/'/ skip=/\\./ end=/'/ contains=@Spell
-
-if version >= 508 || !exists("did_proto_syn_inits")
-  if version < 508
-    let did_proto_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
-
-  HiLink pbTodo         Todo
-
-  HiLink pbSyntax       Include
-  HiLink pbStructure    Structure
-  HiLink pbRepeat       Repeat
-  HiLink pbDefault      Keyword
-  HiLink pbExtend       Keyword
-  HiLink pbRPC          Keyword
-  HiLink pbType         Type
-  HiLink pbTypedef      Typedef
-  HiLink pbBool         Boolean
-
-  HiLink pbInt          Number
-  HiLink pbFloat        Float
-  HiLink pbComment      Comment
-  HiLink pbString       String
-
-  delcommand HiLink
-endif
-
-let b:current_syntax = "proto"
diff --git a/libs/protobuf/editors/protobuf-mode.el b/libs/protobuf/editors/protobuf-mode.el
deleted file mode 100644
index e97b95c..0000000
--- a/libs/protobuf/editors/protobuf-mode.el
+++ /dev/null
@@ -1,218 +0,0 @@
-;;; protobuf-mode.el --- major mode for editing protocol buffers.  -*- lexical-binding: t; -*-
-
-;; Author: Alexandre Vassalotti <alexandre@peadrop.com>
-;; Created: 23-Apr-2009
-;; Version: 0.3
-;; Keywords: google protobuf languages
-
-;; Redistribution and use in source and binary forms, with or without
-;; modification, are permitted provided that the following conditions are
-;; met:
-;;
-;;     * Redistributions of source code must retain the above copyright
-;; notice, this list of conditions and the following disclaimer.
-;;     * Redistributions in binary form must reproduce the above
-;; copyright notice, this list of conditions and the following disclaimer
-;; in the documentation and/or other materials provided with the
-;; distribution.
-;;     * Neither the name of Google Inc. nor the names of its
-;; contributors may be used to endorse or promote products derived from
-;; this software without specific prior written permission.
-;;
-;; THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-;; "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-;; LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-;; A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-;; OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-;; SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-;; LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-;; DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-;; THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-;; (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-;; OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-;;; Commentary:
-
-;; Installation:
-;;   - Put `protobuf-mode.el' in your Emacs load-path.
-;;   - Add this line to your .emacs file:
-;;       (require 'protobuf-mode)
-;;
-;; You can customize this mode just like any mode derived from CC Mode.  If
-;; you want to add customizations specific to protobuf-mode, you can use the
-;; `protobuf-mode-hook'. For example, the following would make protocol-mode
-;; use 2-space indentation:
-;;
-;;   (defconst my-protobuf-style
-;;     '((c-basic-offset . 2)
-;;       (indent-tabs-mode . nil)))
-;;
-;;   (add-hook 'protobuf-mode-hook
-;;     (lambda () (c-add-style "my-style" my-protobuf-style t)))
-;;
-;; Refer to the documentation of CC Mode for more information about
-;; customization details and how to use this mode.
-;;
-;; TODO:
-;;   - Make highlighting for enum values work properly.
-;;   - Fix the parser to recognize extensions as identifiers and not
-;;     as casts.
-;;   - Improve the parsing of option assignment lists. For example:
-;;       optional int32 foo = 1 [(my_field_option) = 4.5];
-;;   - Add support for fully-qualified identifiers (e.g., with a leading ".").
-
-;;; Code:
-
-(require 'cc-mode)
-
-(eval-when-compile
-  (and (= emacs-major-version 24)
-       (>= emacs-minor-version 4)
-       (require 'cl-lib))
-  (require 'cc-langs)
-  (require 'cc-fonts))
-
-;; This mode does not inherit properties from other modes. So, we do not use
-;; the usual `c-add-language' function.
-(eval-and-compile
-  (put 'protobuf-mode 'c-mode-prefix "protobuf-"))
-
-;; The following code uses of the `c-lang-defconst' macro define syntactic
-;; features of protocol buffer language.  Refer to the documentation in the
-;; cc-langs.el file for information about the meaning of the -kwds variables.
-
-(c-lang-defconst c-primitive-type-kwds
-  protobuf '("double" "float" "int32" "int64" "uint32" "uint64" "sint32"
-             "sint64" "fixed32" "fixed64" "sfixed32" "sfixed64" "bool"
-             "string" "bytes" "group"))
-
-(c-lang-defconst c-modifier-kwds
-  protobuf '("required" "optional" "repeated"))
-
-(c-lang-defconst c-class-decl-kwds
-  protobuf '("message" "enum" "service"))
-
-(c-lang-defconst c-constant-kwds
-  protobuf '("true" "false"))
-
-(c-lang-defconst c-other-decl-kwds
-  protobuf '("package" "import"))
-
-(c-lang-defconst c-other-kwds
-  protobuf '("default" "max"))
-
-(c-lang-defconst c-identifier-ops
-  ;; Handle extended identifiers like google.protobuf.MessageOptions
-  protobuf '((left-assoc ".")))
-
-;; The following keywords do not fit well in keyword classes defined by
-;; cc-mode.  So, we approximate as best we can.
-
-(c-lang-defconst c-type-list-kwds
-  protobuf '("extensions" "to" "reserved"))
-
-(c-lang-defconst c-typeless-decl-kwds
-  protobuf '("extend" "rpc" "option" "returns"))
-
-
-;; Here we remove default syntax for loops, if-statements and other C
-;; syntactic features that are not supported by the protocol buffer language.
-
-(c-lang-defconst c-brace-list-decl-kwds
-  ;; Remove syntax for C-style enumerations.
-  protobuf nil)
-
-(c-lang-defconst c-block-stmt-1-kwds
-  ;; Remove syntax for "do" and "else" keywords.
-  protobuf nil)
-
-(c-lang-defconst c-block-stmt-2-kwds
-  ;; Remove syntax for "for", "if", "switch" and "while" keywords.
-  protobuf nil)
-
-(c-lang-defconst c-simple-stmt-kwds
-  ;; Remove syntax for "break", "continue", "goto" and "return" keywords.
-  protobuf nil)
-
-(c-lang-defconst c-paren-stmt-kwds
-  ;; Remove special case for the "(;;)" in for-loops.
-  protobuf nil)
-
-(c-lang-defconst c-label-kwds
-  ;; Remove case label syntax for the "case" and "default" keywords.
-  protobuf nil)
-
-(c-lang-defconst c-before-label-kwds
-  ;; Remove special case for the label in a goto statement.
-  protobuf nil)
-
-(c-lang-defconst c-cpp-matchers
-  ;; Disable all the C preprocessor syntax.
-  protobuf nil)
-
-(c-lang-defconst c-decl-prefix-re
-  ;; Same as for C, except it does not match "(". This is needed for disabling
-  ;; the syntax for casts.
-  protobuf "\\([\{\};,]+\\)")
-
-
-;; Add support for variable levels of syntax highlighting.
-
-(defconst protobuf-font-lock-keywords-1 (c-lang-const c-matchers-1 protobuf)
-  "Minimal highlighting for protobuf-mode.")
-
-(defconst protobuf-font-lock-keywords-2 (c-lang-const c-matchers-2 protobuf)
-  "Fast normal highlighting for protobuf-mode.")
-
-(defconst protobuf-font-lock-keywords-3 (c-lang-const c-matchers-3 protobuf)
-  "Accurate normal highlighting for protobuf-mode.")
-
-(defvar protobuf-font-lock-keywords protobuf-font-lock-keywords-3
-  "Default expressions to highlight in protobuf-mode.")
-
-;; Our syntax table is auto-generated from the keyword classes we defined
-;; previously with the `c-lang-const' macro.
-(defvar protobuf-mode-syntax-table nil
-  "Syntax table used in protobuf-mode buffers.")
-(or protobuf-mode-syntax-table
-    (setq protobuf-mode-syntax-table
-          (funcall (c-lang-const c-make-mode-syntax-table protobuf))))
-
-(defvar protobuf-mode-abbrev-table nil
-  "Abbreviation table used in protobuf-mode buffers.")
-
-(defvar protobuf-mode-map nil
-  "Keymap used in protobuf-mode buffers.")
-(or protobuf-mode-map
-    (setq protobuf-mode-map (c-make-inherited-keymap)))
-
-(easy-menu-define protobuf-menu protobuf-mode-map
-  "Protocol Buffers Mode Commands"
-  (cons "Protocol Buffers" (c-lang-const c-mode-menu protobuf)))
-
-;;;###autoload (add-to-list 'auto-mode-alist '("\\.proto\\'" . protobuf-mode))
-
-;;;###autoload
-(define-derived-mode protobuf-mode prog-mode "Protocol-Buffers"
-  "Major mode for editing Protocol Buffers description language.
-
-The hook `c-mode-common-hook' is run with no argument at mode
-initialization, then `protobuf-mode-hook'.
-
-Key bindings:
-\\{protobuf-mode-map}"
-  :after-hook (c-update-modeline)
-  (setq abbrev-mode t)
-  (c-initialize-cc-mode t)
-  (c-init-language-vars protobuf-mode)
-  (c-common-init 'protobuf-mode)
-  (easy-menu-add protobuf-menu)
-  (setq imenu-generic-expression
-	    '(("Message" "^[[:space:]]*message[[:space:]]+\\([[:alnum:]]+\\)" 1)
-          ("Enum" "^[[:space:]]*enum[[:space:]]+\\([[:alnum:]]+\\)" 1)
-          ("Service" "^[[:space:]]*service[[:space:]]+\\([[:alnum:]]+\\)" 1)))
-  (c-run-mode-hooks 'c-mode-common-hook))
-
-(provide 'protobuf-mode)
-
-;;; protobuf-mode.el ends here
diff --git a/libs/protobuf/examples/.gitignore b/libs/protobuf/examples/.gitignore
deleted file mode 100644
index 229542d..0000000
--- a/libs/protobuf/examples/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-# Ignore the bazel symlinks
-/bazel-*
diff --git a/libs/protobuf/examples/AddPerson.java b/libs/protobuf/examples/AddPerson.java
deleted file mode 100644
index 2f6a231..0000000
--- a/libs/protobuf/examples/AddPerson.java
+++ /dev/null
@@ -1,95 +0,0 @@
-// See README.txt for information and build instructions.
-
-import com.example.tutorial.protos.AddressBook;
-import com.example.tutorial.protos.Person;
-import java.io.BufferedReader;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.InputStreamReader;
-import java.io.IOException;
-import java.io.PrintStream;
-
-class AddPerson {
-  // This function fills in a Person message based on user input.
-  static Person PromptForAddress(BufferedReader stdin,
-                                 PrintStream stdout) throws IOException {
-    Person.Builder person = Person.newBuilder();
-
-    stdout.print("Enter person ID: ");
-    person.setId(Integer.valueOf(stdin.readLine()));
-
-    stdout.print("Enter name: ");
-    person.setName(stdin.readLine());
-
-    stdout.print("Enter email address (blank for none): ");
-    String email = stdin.readLine();
-    if (email.length() > 0) {
-      person.setEmail(email);
-    }
-
-    while (true) {
-      stdout.print("Enter a phone number (or leave blank to finish): ");
-      String number = stdin.readLine();
-      if (number.length() == 0) {
-        break;
-      }
-
-      Person.PhoneNumber.Builder phoneNumber =
-        Person.PhoneNumber.newBuilder().setNumber(number);
-
-      stdout.print("Is this a mobile, home, or work phone? ");
-      String type = stdin.readLine();
-      if (type.equals("mobile")) {
-        phoneNumber.setType(Person.PhoneType.MOBILE);
-      } else if (type.equals("home")) {
-        phoneNumber.setType(Person.PhoneType.HOME);
-      } else if (type.equals("work")) {
-        phoneNumber.setType(Person.PhoneType.WORK);
-      } else {
-        stdout.println("Unknown phone type.  Using default.");
-      }
-
-      person.addPhones(phoneNumber);
-    }
-
-    return person.build();
-  }
-
-  // Main function:  Reads the entire address book from a file,
-  //   adds one person based on user input, then writes it back out to the same
-  //   file.
-  public static void main(String[] args) throws Exception {
-    if (args.length != 1) {
-      System.err.println("Usage:  AddPerson ADDRESS_BOOK_FILE");
-      System.exit(-1);
-    }
-
-    AddressBook.Builder addressBook = AddressBook.newBuilder();
-
-    // Read the existing address book.
-    try {
-      FileInputStream input = new FileInputStream(args[0]);
-      try {
-        addressBook.mergeFrom(input);
-      } finally {
-        try { input.close(); } catch (Throwable ignore) {}
-      }
-    } catch (FileNotFoundException e) {
-      System.out.println(args[0] + ": File not found.  Creating a new file.");
-    }
-
-    // Add an address.
-    addressBook.addPeople(
-      PromptForAddress(new BufferedReader(new InputStreamReader(System.in)),
-                       System.out));
-
-    // Write the new address book back to disk.
-    FileOutputStream output = new FileOutputStream(args[0]);
-    try {
-      addressBook.build().writeTo(output);
-    } finally {
-      output.close();
-    }
-  }
-}
diff --git a/libs/protobuf/examples/BUILD.bazel b/libs/protobuf/examples/BUILD.bazel
deleted file mode 100644
index d5a719c..0000000
--- a/libs/protobuf/examples/BUILD.bazel
+++ /dev/null
@@ -1,137 +0,0 @@
-# This BUILD file shows how to use protobuf with bazel. Before you can use
-# proto_library/<lang>_proto_library rules in a BUILD file, you need to
-# include protobuf repo as remote repositories in your WORKSPACE file. See
-# the WORKSPACE file in the same directory with this BUILD file for an
-# example.
-
-load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_proto_library")
-load("@rules_java//java:defs.bzl", "java_binary", "java_lite_proto_library", "java_proto_library")
-load("@rules_pkg//:mappings.bzl", "pkg_files", "strip_prefix")
-load("@rules_proto//proto:defs.bzl", "proto_library")
-
-# For each .proto file, a proto_library target should be defined. This target
-# is not bound to any particular language. Instead, it defines the dependency
-# graph of the .proto files (i.e., proto imports) and serves as the provider
-# of .proto source files to the protocol compiler.
-#
-# Remote repository "com_google_protobuf" must be defined to use this rule.
-proto_library(
-    name = "addressbook_proto",
-    srcs = ["addressbook.proto"],
-    deps = ["@com_google_protobuf//:timestamp_proto"],
-)
-
-# The cc_proto_library rule generates C++ code for a proto_library rule. It
-# must have exactly one proto_library dependency. If you want to use multiple
-# proto_library targets, create a separate cc_proto_library target for each
-# of them.
-#
-# Remote repository "com_google_protobuf_cc" must be defined to use this rule.
-cc_proto_library(
-    name = "addressbook_cc_proto",
-    deps = [":addressbook_proto"],
-)
-
-# cc_library/cc_binary targets can depend on cc_proto_library targets.
-cc_binary(
-    name = "add_person_cpp",
-    srcs = ["add_person.cc"],
-    deps = [":addressbook_cc_proto"],
-)
-
-cc_binary(
-    name = "list_people_cpp",
-    srcs = ["list_people.cc"],
-    deps = [":addressbook_cc_proto"],
-)
-
-# Similar to cc_proto_library but for Java.
-#
-# Remote repository "com_google_protobuf_java" must be defined to use this rule.
-java_proto_library(
-    name = "addressbook_java_proto",
-    deps = [":addressbook_proto"],
-)
-
-java_binary(
-    name = "add_person_java",
-    srcs = ["AddPerson.java"],
-    main_class = "AddPerson",
-    deps = [":addressbook_java_proto"],
-)
-
-java_binary(
-    name = "list_people_java",
-    srcs = ["ListPeople.java"],
-    main_class = "ListPeople",
-    deps = [":addressbook_java_proto"],
-)
-
-# Java lite.
-#
-# Remote repository "com_google_protobuf_javalite" must be defined to use this
-# rule.
-java_lite_proto_library(
-    name = "addressbook_java_lite_proto",
-    deps = [":addressbook_proto"],
-)
-
-# Java lite API is a subset of the regular Java API so if you only uses this
-# subset in your code, you can actually compile your code against both (i.e.,
-# share code between server build and Android build).
-#
-# The lite version has a smaller code size, and you can see that by comparing
-# the resulted .jar file:
-#
-#   $ bazel build :add_person_java_deploy.jar :add_person_java_lite_deploy.jar
-#   $ ls -l bazel-bin/*_deploy.jar
-#   -r-xr-xr-x 1 xiaofeng eng 1230797 Sep  8 12:24 bazel-bin/add_person_java_deploy.jar
-#   -r-xr-xr-x 1 xiaofeng eng  236166 Sep  8 12:24 bazel-bin/add_person_java_lite_deploy.jar
-#
-# In the above example, the lite .jar file is 6 times smaller. With proper
-# proguard inlining/stripping, the difference can be much more larger than
-# that.
-java_binary(
-    name = "add_person_java_lite",
-    srcs = ["AddPerson.java"],
-    main_class = "AddPerson",
-    deps = [":addressbook_java_lite_proto"],
-)
-
-java_binary(
-    name = "list_people_java_lite",
-    srcs = ["ListPeople.java"],
-    main_class = "ListPeople",
-    deps = [":addressbook_java_lite_proto"],
-)
-
-# Files included in all source distributions
-pkg_files(
-    name = "dist_files",
-    srcs = [
-        "AddPerson.java",
-        "BUILD.bazel",
-        "CMakeLists.txt",
-        "ListPeople.java",
-        "Makefile",
-        "README.md",
-        "WORKSPACE",
-        "add_person.cc",
-        "add_person.dart",
-        "add_person.py",
-        "addressbook.proto",
-        "go/cmd/add_person/add_person.go",
-        "go/cmd/add_person/add_person_test.go",
-        "go/cmd/list_people/list_people.go",
-        "go/cmd/list_people/list_people_test.go",
-        "go/go.mod",
-        "go/go.sum",
-        "list_people.cc",
-        "list_people.dart",
-        "list_people.py",
-        "pubspec.yaml",
-    ],
-    prefix = "examples/",
-    strip_prefix = strip_prefix.from_root(""),
-    visibility = ["//visibility:public"],
-)
diff --git a/libs/protobuf/examples/CMakeLists.txt b/libs/protobuf/examples/CMakeLists.txt
deleted file mode 100644
index 1136296..0000000
--- a/libs/protobuf/examples/CMakeLists.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-# Minimum CMake required
-cmake_minimum_required(VERSION 2.8.12)
-
-# Project
-project(protobuf-examples)
-
-# Find required protobuf package
-find_package(protobuf CONFIG REQUIRED)
-
-if(protobuf_VERBOSE)
-  message(STATUS "Using Protocol Buffers ${protobuf_VERSION}")
-endif()
-
-set(CMAKE_INCLUDE_CURRENT_DIR TRUE)
-
-# http://www.cmake.org/Wiki/CMake_FAQ#How_can_I_build_my_MSVC_application_with_a_static_runtime.3F
-if(MSVC AND protobuf_MSVC_STATIC_RUNTIME)
-  foreach(flag_var
-      CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE
-      CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO)
-    if(${flag_var} MATCHES "/MD")
-      string(REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}")
-    endif(${flag_var} MATCHES "/MD")
-  endforeach()
-endif()
-
-foreach(example add_person list_people)
-  set(${example}_SRCS ${example}.cc)
-  set(${example}_PROTOS addressbook.proto)
-
-  #Code Generation
-  if(protobuf_MODULE_COMPATIBLE) #Legacy Support
-    protobuf_generate_cpp(${example}_PROTO_SRCS ${example}_PROTO_HDRS ${${example}_PROTOS})
-    list(APPEND ${example}_SRCS ${${example}_PROTO_SRCS} ${${example}_PROTO_HDRS})
-  endif()
-
-  #Executable setup
-  set(executable_name ${example}_cpp)
-  add_executable(${executable_name} ${${example}_SRCS} ${${example}_PROTOS})
-  if(protobuf_MODULE_COMPATIBLE) #Legacy mode
-    target_include_directories(${executable_name} PUBLIC ${PROTOBUF_INCLUDE_DIRS})
-    target_link_libraries(${executable_name} ${PROTOBUF_LIBRARIES})
-  else()
-    target_link_libraries(${executable_name} protobuf::libprotobuf)
-    protobuf_generate(TARGET ${executable_name})
-  endif()
-
-endforeach()
diff --git a/libs/protobuf/examples/ListPeople.java b/libs/protobuf/examples/ListPeople.java
deleted file mode 100644
index ab07b79..0000000
--- a/libs/protobuf/examples/ListPeople.java
+++ /dev/null
@@ -1,53 +0,0 @@
-// See README.txt for information and build instructions.
-
-import com.example.tutorial.protos.AddressBook;
-import com.example.tutorial.protos.Person;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.PrintStream;
-
-class ListPeople {
-  // Iterates though all people in the AddressBook and prints info about them.
-  static void Print(AddressBook addressBook) {
-    for (Person person: addressBook.getPeopleList()) {
-      System.out.println("Person ID: " + person.getId());
-      System.out.println("  Name: " + person.getName());
-      if (!person.getEmail().isEmpty()) {
-        System.out.println("  E-mail address: " + person.getEmail());
-      }
-
-      for (Person.PhoneNumber phoneNumber : person.getPhonesList()) {
-        switch (phoneNumber.getType()) {
-          case MOBILE:
-            System.out.print("  Mobile phone #: ");
-            break;
-          case HOME:
-            System.out.print("  Home phone #: ");
-            break;
-          case WORK:
-            System.out.print("  Work phone #: ");
-            break;
-          default:
-            System.out.println(" Unknown phone #: ");
-            break;
-        }
-        System.out.println(phoneNumber.getNumber());
-      }
-    }
-  }
-
-  // Main function:  Reads the entire address book from a file and prints all
-  //   the information inside.
-  public static void main(String[] args) throws Exception {
-    if (args.length != 1) {
-      System.err.println("Usage:  ListPeople ADDRESS_BOOK_FILE");
-      System.exit(-1);
-    }
-
-    // Read the existing address book.
-    AddressBook addressBook =
-      AddressBook.parseFrom(new FileInputStream(args[0]));
-
-    Print(addressBook);
-  }
-}
diff --git a/libs/protobuf/examples/Makefile b/libs/protobuf/examples/Makefile
deleted file mode 100644
index 1c7ec8d..0000000
--- a/libs/protobuf/examples/Makefile
+++ /dev/null
@@ -1,91 +0,0 @@
-# See README.txt.
-
-.PHONY: all cpp java python clean
-
-all: cpp java python
-
-cpp:    add_person_cpp    list_people_cpp
-dart:   add_person_dart   list_people_dart
-go:     add_person_go     list_people_go
-gotest: add_person_gotest list_people_gotest
-java:   add_person_java   list_people_java
-python: add_person_python list_people_python
-
-clean:
-	rm -f add_person_cpp list_people_cpp add_person_java list_people_java add_person_python list_people_python
-	rm -f javac_middleman AddPerson*.class ListPeople*.class com/example/tutorial/*.class
-	rm -f protoc_middleman addressbook.pb.cc addressbook.pb.h addressbook_pb2.py com/example/tutorial/AddressBookProtos.java
-	rm -f *.pyc
-	rm -f go/tutorialpb/*.pb.go add_person_go list_people_go
-	rm -f protoc_middleman_dart dart_tutorial/*.pb*.dart
-	rmdir dart_tutorial 2>/dev/null || true
-	rmdir tutorial 2>/dev/null || true
-	rmdir com/example/tutorial 2>/dev/null || true
-	rmdir com/example 2>/dev/null || true
-	rmdir com 2>/dev/null || true
-
-protoc_middleman: addressbook.proto
-	protoc $$PROTO_PATH --cpp_out=. --java_out=. --python_out=. addressbook.proto
-	@touch protoc_middleman
-
-go/tutorialpb/addressbook.pb.go: addressbook.proto
-	mkdir -p go/tutorialpb # make directory for go package
-	protoc $$PROTO_PATH --go_opt=paths=source_relative --go_out=go/tutorialpb addressbook.proto
-
-protoc_middleman_dart: addressbook.proto
-	mkdir -p dart_tutorial # make directory for the dart package
-	protoc -I ../src/:. --dart_out=dart_tutorial addressbook.proto ../src/google/protobuf/timestamp.proto
-	pub get
-	@touch protoc_middleman_dart
-
-add_person_cpp: add_person.cc protoc_middleman
-	pkg-config --cflags protobuf  # fails if protobuf is not installed
-	c++ -std=c++11 add_person.cc addressbook.pb.cc -o add_person_cpp `pkg-config --cflags --libs protobuf`
-
-list_people_cpp: list_people.cc protoc_middleman
-	pkg-config --cflags protobuf  # fails if protobuf is not installed
-	c++ -std=c++11 list_people.cc addressbook.pb.cc -o list_people_cpp `pkg-config --cflags --libs protobuf`
-
-add_person_dart: add_person.dart protoc_middleman_dart
-
-list_people_dart: list_people.dart protoc_middleman_dart
-
-add_person_go: go/cmd/add_person/add_person.go go/tutorialpb/addressbook.pb.go
-	cd go && go build -o ../add_person_go ./cmd/add_person
-
-add_person_gotest: go/tutorialpb/addressbook.pb.go
-	cd go && go test ./cmd/add_person
-
-list_people_go: go/cmd/list_people/list_people.go go/tutorialpb/addressbook.pb.go
-	cd go && go build -o ../list_people_go ./cmd/list_people
-
-list_people_gotest: go/tutorialpb/addressbook.pb.go
-	cd go && go test ./cmd/list_people
-
-javac_middleman: AddPerson.java ListPeople.java protoc_middleman
-	javac -cp $$CLASSPATH AddPerson.java ListPeople.java com/example/tutorial/AddressBookProtos.java
-	@touch javac_middleman
-
-add_person_java: javac_middleman
-	@echo "Writing shortcut script add_person_java..."
-	@echo '#! /bin/sh' > add_person_java
-	@echo 'java -classpath .:$$CLASSPATH AddPerson "$$@"' >> add_person_java
-	@chmod +x add_person_java
-
-list_people_java: javac_middleman
-	@echo "Writing shortcut script list_people_java..."
-	@echo '#! /bin/sh' > list_people_java
-	@echo 'java -classpath .:$$CLASSPATH ListPeople "$$@"' >> list_people_java
-	@chmod +x list_people_java
-
-add_person_python: add_person.py protoc_middleman
-	@echo "Writing shortcut script add_person_python..."
-	@echo '#! /bin/sh' > add_person_python
-	@echo './add_person.py "$$@"' >> add_person_python
-	@chmod +x add_person_python
-
-list_people_python: list_people.py protoc_middleman
-	@echo "Writing shortcut script list_people_python..."
-	@echo '#! /bin/sh' > list_people_python
-	@echo './list_people.py "$$@"' >> list_people_python
-	@chmod +x list_people_python
diff --git a/libs/protobuf/examples/README.md b/libs/protobuf/examples/README.md
deleted file mode 100644
index a99883e..0000000
--- a/libs/protobuf/examples/README.md
+++ /dev/null
@@ -1,140 +0,0 @@
-# Protocol Buffers - Code Example
-
-This directory contains example code that uses Protocol Buffers to manage an
-address book. Two programs are provided for each supported language. The
-add_person example adds a new person to an address book, prompting the user to
-input the person's information. The list_people example lists people already in
-the address book. The examples use the exact same format in all three languages,
-so you can, for example, use add_person_java to create an address book and then
-use list_people_python to read it.
-
-These examples are part of the Protocol Buffers tutorial, located at:
-  https://developers.google.com/protocol-buffers/docs/tutorials
-
-## Build the example using bazel
-
-The example requires bazel 0.5.4 or newer to build. You can download/install
-the latest version of bazel from bazel's release page:
-
-    https://github.com/bazelbuild/bazel/releases
-
-Once you have bazel installed, simply run the following command in this examples
-directory to build the code:
-
-    $ bazel build :all
-
-Then you can run the built binary:
-
-    $ bazel-bin/add_person_cpp addressbook.data
-
-To use protobuf in your own bazel project, please follow instructions in the
-[BUILD](BUILD) file and [WORKSPACE](WORKSPACE) file.
-
-## Build the example using make
-
-You must install the protobuf package before you can build it using make. The
-minimum requirement is to install protocol compiler (i.e., the protoc binary)
-and the protobuf runtime for the language you want to build.
-
-You can simply run "make" to build the example for all languages (except for
-Go). However, since different language has different installation requirement,
-it will likely fail. It's better to follow individual instructions below to
-build only the language you are interested in.
-
-### C++
-
-You can follow instructions in [../src/README.md](../src/README.md) to install
-protoc and protobuf C++ runtime from source.
-
-Then run "make cpp" in this examples directory to build the C++ example. It
-will create two executables: add_person_cpp and list_people_cpp. These programs
-simply take an address book file as their parameter. The add_person_cpp
-programs will create the file if it doesn't already exist.
-
-To run the examples:
-
-    $ ./add_person_cpp addressbook.data
-    $ ./list_people_cpp addressbook.data
-
-Note that on some platforms you may have to edit the Makefile and remove
-"-lpthread" from the linker commands (perhaps replacing it with something else).
-We didn't do this automatically because we wanted to keep the example simple.
-
-### Python
-
-Follow instructions in [../README.md](../README.md) to install protoc and then
-follow [../python/README.md](../python/README.md) to install protobuf python
-runtime from source. You can also install python runtime using pip:
-
-    $ pip install protobuf
-
-Make sure the runtime version is the same as protoc binary, or it may not work.
-
-After you have install both protoc and python runtime, run "make python" to
-build two executables (shell scripts actually): add_person_python and
-list_people_python. They work the same way as the C++ executables.
-
-### Java
-
-Follow instructions in [../README.md](../README.md) to install protoc and then
-download protobuf Java runtime .jar file from maven:
-
-    https://mvnrepository.com/artifact/com.google.protobuf/protobuf-java
-
-Then run the following:
-
-    $ export CLASSPATH=/path/to/protobuf-java-[version].jar
-    $ make java
-
-This will create the add_person_java/list_people_java executables (shell
-scripts) and can be used to create/display an address book data file.
-
-### Go
-
-Follow instructions in [../README.md](../README.md) to install protoc. Then
-install the Go protoc plugin (protoc-gen-go):
-
-    $ go install google.golang.org/protobuf/cmd/protoc-gen-go@latest
-
-The "go install" command will install protoc-gen-go into the GOBIN
-directory.  You can set the $GOBIN environment variable before
-running "go install" to change the install location.  Make sure the
-install directory is in your shell $PATH.
-
-Build the Go samples with "make go".  This creates the following
-executable files in the current directory:
-
-    add_person_go      list_people_go
-
-To run the example:
-
-    ./add_person_go addressbook.data
-
-to add a person to the protocol buffer encoded file addressbook.data.  The file
-is created if it does not exist.  To view the data, run:
-
-    ./list_people_go addressbook.data
-
-Observe that the C++, Python, Java, and Dart examples in this directory run in a
-similar way and can view/modify files created by the Go example and vice
-versa.
-
-### Dart
-
-First, follow the instructions in [../README.md](../README.md) to install the Protocol Buffer Compiler (protoc).
-
-Then, install the Dart Protocol Buffer plugin as described [here](https://github.com/dart-lang/dart-protoc-plugin#how-to-build-and-use).
-Note, the executable `bin/protoc-gen-dart` must be in your `PATH` for `protoc` to find it.
-
-Build the Dart samples in this directory with `make dart`.
-
-To run the examples:
-
-```sh
-$ dart add_person.dart addressbook.data
-$ dart list_people.dart addressbook.data
-```
-
-The two programs take a protocol buffer encoded file as their parameter.
-The first can be used to add a person to the file. The file is created
-if it does not exist. The second displays the data in the file.
diff --git a/libs/protobuf/examples/WORKSPACE b/libs/protobuf/examples/WORKSPACE
deleted file mode 100644
index 3897572..0000000
--- a/libs/protobuf/examples/WORKSPACE
+++ /dev/null
@@ -1,31 +0,0 @@
-workspace(name = "com_google_protobuf_examples")
-
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
-
-# This com_google_protobuf repository is required for proto_library rule.
-# It provides the protocol compiler binary (i.e., protoc).
-#
-# We declare it as local_repository so we can test changes
-# before they get merged. You'll want to use the following instead:
-#
-# http_archive(
-#     name = "com_google_protobuf",
-#     strip_prefix = "protobuf-main",
-#     urls = ["https://github.com/protocolbuffers/protobuf/archive/main.zip"],
-# )
-local_repository(
-    name = "com_google_protobuf",
-    path = "..",
-)
-
-# Similar to com_google_protobuf but for Java lite. If you are building
-# for Android, the lite version should be preferred because it has a much
-# smaller code size.
-local_repository(
-    name = "com_google_protobuf_javalite",
-    path = "..",
-)
-
-load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
-
-protobuf_deps()
diff --git a/libs/protobuf/examples/add_person.cc b/libs/protobuf/examples/add_person.cc
deleted file mode 100644
index 856e90b..0000000
--- a/libs/protobuf/examples/add_person.cc
+++ /dev/null
@@ -1,102 +0,0 @@
-// See README.txt for information and build instructions.
-
-#include <ctime>
-#include <fstream>
-#include <google/protobuf/util/time_util.h>
-#include <iostream>
-#include <string>
-
-#include "addressbook.pb.h"
-
-using namespace std;
-
-using google::protobuf::util::TimeUtil;
-
-// This function fills in a Person message based on user input.
-void PromptForAddress(tutorial::Person* person) {
-  cout << "Enter person ID number: ";
-  int id;
-  cin >> id;
-  person->set_id(id);
-  cin.ignore(256, '\n');
-
-  cout << "Enter name: ";
-  getline(cin, *person->mutable_name());
-
-  cout << "Enter email address (blank for none): ";
-  string email;
-  getline(cin, email);
-  if (!email.empty()) {
-    person->set_email(email);
-  }
-
-  while (true) {
-    cout << "Enter a phone number (or leave blank to finish): ";
-    string number;
-    getline(cin, number);
-    if (number.empty()) {
-      break;
-    }
-
-    tutorial::Person::PhoneNumber* phone_number = person->add_phones();
-    phone_number->set_number(number);
-
-    cout << "Is this a mobile, home, or work phone? ";
-    string type;
-    getline(cin, type);
-    if (type == "mobile") {
-      phone_number->set_type(tutorial::Person::MOBILE);
-    } else if (type == "home") {
-      phone_number->set_type(tutorial::Person::HOME);
-    } else if (type == "work") {
-      phone_number->set_type(tutorial::Person::WORK);
-    } else {
-      cout << "Unknown phone type.  Using default." << endl;
-    }
-  }
-  *person->mutable_last_updated() = TimeUtil::SecondsToTimestamp(time(NULL));
-}
-
-// Main function:  Reads the entire address book from a file,
-//   adds one person based on user input, then writes it back out to the same
-//   file.
-int main(int argc, char* argv[]) {
-  // Verify that the version of the library that we linked against is
-  // compatible with the version of the headers we compiled against.
-  GOOGLE_PROTOBUF_VERIFY_VERSION;
-
-  if (argc != 2) {
-    cerr << "Usage:  " << argv[0] << " ADDRESS_BOOK_FILE" << endl;
-    return -1;
-  }
-
-  tutorial::AddressBook address_book;
-
-  {
-    // Read the existing address book.
-    fstream input(argv[1], ios::in | ios::binary);
-    if (!input) {
-      cout << argv[1] << ": File not found.  Creating a new file." << endl;
-    } else if (!address_book.ParseFromIstream(&input)) {
-      cerr << "Failed to parse address book." << endl;
-      return -1;
-    }
-  }
-
-  // Add an address.
-  PromptForAddress(address_book.add_people());
-
-  {
-    // Write the new address book back to disk.
-    fstream output(argv[1], ios::out | ios::trunc | ios::binary);
-    if (!address_book.SerializeToOstream(&output)) {
-      cerr << "Failed to write address book." << endl;
-      return -1;
-    }
-  }
-
-  // Optional:  Delete all global objects allocated by libprotobuf.
-  google::protobuf::ShutdownProtobufLibrary();
-
-  return 0;
-}
diff --git a/libs/protobuf/examples/add_person.dart b/libs/protobuf/examples/add_person.dart
deleted file mode 100644
index 0352dc7..0000000
--- a/libs/protobuf/examples/add_person.dart
+++ /dev/null
@@ -1,67 +0,0 @@
-import 'dart:io';
-
-import 'dart_tutorial/addressbook.pb.dart';
-
-/// This function fills in a Person message based on user input.
-Person promptForAddress() {
-  final person = Person();
-
-  print('Enter person ID: ');
-  final input = stdin.readLineSync();
-  person.id = int.parse(input);
-
-  print('Enter name');
-  person.name = stdin.readLineSync();
-
-  print('Enter email address (blank for none) : ');
-  final email = stdin.readLineSync();
-  if (email.isNotEmpty) person.email = email;
-
-  while (true) {
-    print('Enter a phone number (or leave blank to finish): ');
-    final number = stdin.readLineSync();
-    if (number.isEmpty) break;
-
-    final phoneNumber = Person_PhoneNumber()..number = number;
-
-    print('Is this a mobile, home, or work phone? ');
-
-    final type = stdin.readLineSync();
-    switch (type) {
-      case 'mobile':
-        phoneNumber.type = Person_PhoneType.MOBILE;
-        break;
-      case 'home':
-        phoneNumber.type = Person_PhoneType.HOME;
-        break;
-      case 'work':
-        phoneNumber.type = Person_PhoneType.WORK;
-        break;
-      default:
-        print('Unknown phone type.  Using default.');
-    }
-    person.phones.add(phoneNumber);
-  }
-
-  return person;
-}
-
-/// Reads the entire address book from a file, adds one person based
-/// on user input, then writes it back out to the same file.
-void main(List<String> arguments) {
-  if (arguments.length != 1) {
-    print('Usage: add_person ADDRESS_BOOK_FILE');
-    exit(-1);
-  }
-
-  final file = File(arguments.first);
-  AddressBook addressBook;
-  if (!file.existsSync()) {
-    print('File not found. Creating new file.');
-    addressBook = AddressBook();
-  } else {
-    addressBook = AddressBook.fromBuffer(file.readAsBytesSync());
-  }
-  addressBook.people.add(promptForAddress());
-  file.writeAsBytes(addressBook.writeToBuffer());
-}
diff --git a/libs/protobuf/examples/add_person.py b/libs/protobuf/examples/add_person.py
deleted file mode 100755
index aa0fbca..0000000
--- a/libs/protobuf/examples/add_person.py
+++ /dev/null
@@ -1,63 +0,0 @@
-#! /usr/bin/env python
-
-# See README.txt for information and build instructions.
-
-import addressbook_pb2
-import sys
-
-try:
-  raw_input          # Python 2
-except NameError:
-  raw_input = input  # Python 3
-
-
-# This function fills in a Person message based on user input.
-def PromptForAddress(person):
-  person.id = int(raw_input("Enter person ID number: "))
-  person.name = raw_input("Enter name: ")
-
-  email = raw_input("Enter email address (blank for none): ")
-  if email != "":
-    person.email = email
-
-  while True:
-    number = raw_input("Enter a phone number (or leave blank to finish): ")
-    if number == "":
-      break
-
-    phone_number = person.phones.add()
-    phone_number.number = number
-
-    type = raw_input("Is this a mobile, home, or work phone? ")
-    if type == "mobile":
-      phone_number.type = addressbook_pb2.Person.MOBILE
-    elif type == "home":
-      phone_number.type = addressbook_pb2.Person.HOME
-    elif type == "work":
-      phone_number.type = addressbook_pb2.Person.WORK
-    else:
-      print("Unknown phone type; leaving as default value.")
-
-
-# Main procedure:  Reads the entire address book from a file,
-#   adds one person based on user input, then writes it back out to the same
-#   file.
-if len(sys.argv) != 2:
-  print("Usage:", sys.argv[0], "ADDRESS_BOOK_FILE")
-  sys.exit(-1)
-
-address_book = addressbook_pb2.AddressBook()
-
-# Read the existing address book.
-try:
-  with open(sys.argv[1], "rb") as f:
-    address_book.ParseFromString(f.read())
-except IOError:
-  print(sys.argv[1] + ": File not found.  Creating a new file.")
-
-# Add an address.
-PromptForAddress(address_book.people.add())
-
-# Write the new address book back to disk.
-with open(sys.argv[1], "wb") as f:
-  f.write(address_book.SerializeToString())
diff --git a/libs/protobuf/examples/addressbook.proto b/libs/protobuf/examples/addressbook.proto
deleted file mode 100644
index 1bff4ad..0000000
--- a/libs/protobuf/examples/addressbook.proto
+++ /dev/null
@@ -1,56 +0,0 @@
-// See README.txt for information and build instructions.
-//
-// Note: START and END tags are used in comments to define sections used in
-// tutorials.  They are not part of the syntax for Protocol Buffers.
-//
-// To get an in-depth walkthrough of this file and the related examples, see:
-// https://developers.google.com/protocol-buffers/docs/tutorials
-
-// [START declaration]
-syntax = "proto3";
-package tutorial;
-
-import "google/protobuf/timestamp.proto";
-// [END declaration]
-
-// [START java_declaration]
-option java_multiple_files = true;
-option java_package = "com.example.tutorial.protos";
-option java_outer_classname = "AddressBookProtos";
-// [END java_declaration]
-
-// [START csharp_declaration]
-option csharp_namespace = "Google.Protobuf.Examples.AddressBook";
-// [END csharp_declaration]
-
-// [START go_declaration]
-option go_package = "github.com/protocolbuffers/protobuf/examples/go/tutorialpb";
-// [END go_declaration]
-
-// [START messages]
-message Person {
-  string name = 1;
-  int32 id = 2;  // Unique ID number for this person.
-  string email = 3;
-
-  enum PhoneType {
-    MOBILE = 0;
-    HOME = 1;
-    WORK = 2;
-  }
-
-  message PhoneNumber {
-    string number = 1;
-    PhoneType type = 2;
-  }
-
-  repeated PhoneNumber phones = 4;
-
-  google.protobuf.Timestamp last_updated = 5;
-}
-
-// Our address book file is just one of these.
-message AddressBook {
-  repeated Person people = 1;
-}
-// [END messages]
diff --git a/libs/protobuf/examples/go/cmd/add_person/add_person.go b/libs/protobuf/examples/go/cmd/add_person/add_person.go
deleted file mode 100644
index 5d2f21c..0000000
--- a/libs/protobuf/examples/go/cmd/add_person/add_person.go
+++ /dev/null
@@ -1,133 +0,0 @@
-package main
-
-import (
-	"bufio"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"log"
-	"os"
-	"strings"
-
-	pb "github.com/protocolbuffers/protobuf/examples/go/tutorialpb"
-	"google.golang.org/protobuf/proto"
-)
-
-func promptForAddress(r io.Reader) (*pb.Person, error) {
-	// A protocol buffer can be created like any struct.
-	p := &pb.Person{}
-
-	rd := bufio.NewReader(r)
-	fmt.Print("Enter person ID number: ")
-	// An int32 field in the .proto file is represented as an int32 field
-	// in the generated Go struct.
-	if _, err := fmt.Fscanf(rd, "%d\n", &p.Id); err != nil {
-		return p, err
-	}
-
-	fmt.Print("Enter name: ")
-	name, err := rd.ReadString('\n')
-	if err != nil {
-		return p, err
-	}
-	// A string field in the .proto file results in a string field in Go.
-	// We trim the whitespace because rd.ReadString includes the trailing
-	// newline character in its output.
-	p.Name = strings.TrimSpace(name)
-
-	fmt.Print("Enter email address (blank for none): ")
-	email, err := rd.ReadString('\n')
-	if err != nil {
-		return p, err
-	}
-	p.Email = strings.TrimSpace(email)
-
-	for {
-		fmt.Print("Enter a phone number (or leave blank to finish): ")
-		phone, err := rd.ReadString('\n')
-		if err != nil {
-			return p, err
-		}
-		phone = strings.TrimSpace(phone)
-		if phone == "" {
-			break
-		}
-		// The PhoneNumber message type is nested within the Person
-		// message in the .proto file.  This results in a Go struct
-		// named using the name of the parent prefixed to the name of
-		// the nested message.  Just as with pb.Person, it can be
-		// created like any other struct.
-		pn := &pb.Person_PhoneNumber{
-			Number: phone,
-		}
-
-		fmt.Print("Is this a mobile, home, or work phone? ")
-		ptype, err := rd.ReadString('\n')
-		if err != nil {
-			return p, err
-		}
-		ptype = strings.TrimSpace(ptype)
-
-		// A proto enum results in a Go constant for each enum value.
-		switch ptype {
-		case "mobile":
-			pn.Type = pb.Person_MOBILE
-		case "home":
-			pn.Type = pb.Person_HOME
-		case "work":
-			pn.Type = pb.Person_WORK
-		default:
-			fmt.Printf("Unknown phone type %q.  Using default.\n", ptype)
-		}
-
-		// A repeated proto field maps to a slice field in Go.  We can
-		// append to it like any other slice.
-		p.Phones = append(p.Phones, pn)
-	}
-
-	return p, nil
-}
-
-// Main reads the entire address book from a file, adds one person based on
-// user input, then writes it back out to the same file.
-func main() {
-	if len(os.Args) != 2 {
-		log.Fatalf("Usage:  %s ADDRESS_BOOK_FILE\n", os.Args[0])
-	}
-	fname := os.Args[1]
-
-	// Read the existing address book.
-	in, err := ioutil.ReadFile(fname)
-	if err != nil {
-		if os.IsNotExist(err) {
-			fmt.Printf("%s: File not found.  Creating new file.\n", fname)
-		} else {
-			log.Fatalln("Error reading file:", err)
-		}
-	}
-
-	// [START marshal_proto]
-	book := &pb.AddressBook{}
-	// [START_EXCLUDE]
-	if err := proto.Unmarshal(in, book); err != nil {
-		log.Fatalln("Failed to parse address book:", err)
-	}
-
-	// Add an address.
-	addr, err := promptForAddress(os.Stdin)
-	if err != nil {
-		log.Fatalln("Error with address:", err)
-	}
-	book.People = append(book.People, addr)
-	// [END_EXCLUDE]
-
-	// Write the new address book back to disk.
-	out, err := proto.Marshal(book)
-	if err != nil {
-		log.Fatalln("Failed to encode address book:", err)
-	}
-	if err := ioutil.WriteFile(fname, out, 0644); err != nil {
-		log.Fatalln("Failed to write address book:", err)
-	}
-	// [END marshal_proto]
-}
diff --git a/libs/protobuf/examples/go/cmd/add_person/add_person_test.go b/libs/protobuf/examples/go/cmd/add_person/add_person_test.go
deleted file mode 100644
index f10c355..0000000
--- a/libs/protobuf/examples/go/cmd/add_person/add_person_test.go
+++ /dev/null
@@ -1,58 +0,0 @@
-package main
-
-import (
-	"strings"
-	"testing"
-
-	pb "github.com/protocolbuffers/protobuf/examples/go/tutorialpb"
-	"google.golang.org/protobuf/proto"
-)
-
-func TestPromptForAddressReturnsAddress(t *testing.T) {
-	in := `12345
-Example Name
-name@example.com
-123-456-7890
-home
-222-222-2222
-mobile
-111-111-1111
-work
-777-777-7777
-unknown
-
-`
-	got, err := promptForAddress(strings.NewReader(in))
-	if err != nil {
-		t.Fatalf("promptForAddress(%q) had unexpected error: %s", in, err.Error())
-	}
-	if got.Id != 12345 {
-		t.Errorf("promptForAddress(%q) got %d, want ID %d", in, got.Id, 12345)
-	}
-	if got.Name != "Example Name" {
-		t.Errorf("promptForAddress(%q) => want name %q, got %q", in, "Example Name", got.Name)
-	}
-	if got.Email != "name@example.com" {
-		t.Errorf("promptForAddress(%q) => want email %q, got %q", in, "name@example.com", got.Email)
-	}
-
-	want := []*pb.Person_PhoneNumber{
-		{Number: "123-456-7890", Type: pb.Person_HOME},
-		{Number: "222-222-2222", Type: pb.Person_MOBILE},
-		{Number: "111-111-1111", Type: pb.Person_WORK},
-		{Number: "777-777-7777", Type: pb.Person_MOBILE},
-	}
-	if len(got.Phones) != len(want) {
-		t.Errorf("want %d phone numbers, got %d", len(want), len(got.Phones))
-	}
-	phones := len(got.Phones)
-	if phones > len(want) {
-		phones = len(want)
-	}
-	for i := 0; i < phones; i++ {
-		if !proto.Equal(got.Phones[i], want[i]) {
-			t.Errorf("want phone %q, got %q", want[i], got.Phones[i])
-		}
-
-	}
-}
diff --git a/libs/protobuf/examples/go/cmd/list_people/list_people.go b/libs/protobuf/examples/go/cmd/list_people/list_people.go
deleted file mode 100644
index 5ca0dcf..0000000
--- a/libs/protobuf/examples/go/cmd/list_people/list_people.go
+++ /dev/null
@@ -1,61 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"io"
-	"io/ioutil"
-	"log"
-	"os"
-
-	pb "github.com/protocolbuffers/protobuf/examples/go/tutorialpb"
-	"google.golang.org/protobuf/proto"
-)
-
-func writePerson(w io.Writer, p *pb.Person) {
-	fmt.Fprintln(w, "Person ID:", p.Id)
-	fmt.Fprintln(w, "  Name:", p.Name)
-	if p.Email != "" {
-		fmt.Fprintln(w, "  E-mail address:", p.Email)
-	}
-
-	for _, pn := range p.Phones {
-		switch pn.Type {
-		case pb.Person_MOBILE:
-			fmt.Fprint(w, "  Mobile phone #: ")
-		case pb.Person_HOME:
-			fmt.Fprint(w, "  Home phone #: ")
-		case pb.Person_WORK:
-			fmt.Fprint(w, "  Work phone #: ")
-		}
-		fmt.Fprintln(w, pn.Number)
-	}
-}
-
-func listPeople(w io.Writer, book *pb.AddressBook) {
-	for _, p := range book.People {
-		writePerson(w, p)
-	}
-}
-
-// Main reads the entire address book from a file and prints all the
-// information inside.
-func main() {
-	if len(os.Args) != 2 {
-		log.Fatalf("Usage:  %s ADDRESS_BOOK_FILE\n", os.Args[0])
-	}
-	fname := os.Args[1]
-
-	// [START unmarshal_proto]
-	// Read the existing address book.
-	in, err := ioutil.ReadFile(fname)
-	if err != nil {
-		log.Fatalln("Error reading file:", err)
-	}
-	book := &pb.AddressBook{}
-	if err := proto.Unmarshal(in, book); err != nil {
-		log.Fatalln("Failed to parse address book:", err)
-	}
-	// [END unmarshal_proto]
-
-	listPeople(os.Stdout, book)
-}
diff --git a/libs/protobuf/examples/go/cmd/list_people/list_people_test.go b/libs/protobuf/examples/go/cmd/list_people/list_people_test.go
deleted file mode 100644
index b116c16..0000000
--- a/libs/protobuf/examples/go/cmd/list_people/list_people_test.go
+++ /dev/null
@@ -1,120 +0,0 @@
-package main
-
-import (
-	"bytes"
-	"strings"
-	"testing"
-
-	pb "github.com/protocolbuffers/protobuf/examples/go/tutorialpb"
-)
-
-func TestWritePersonWritesPerson(t *testing.T) {
-	buf := new(bytes.Buffer)
-	// [START populate_proto]
-	p := pb.Person{
-		Id:    1234,
-		Name:  "John Doe",
-		Email: "jdoe@example.com",
-		Phones: []*pb.Person_PhoneNumber{
-			{Number: "555-4321", Type: pb.Person_HOME},
-		},
-	}
-	// [END populate_proto]
-	writePerson(buf, &p)
-	got := buf.String()
-	want := `Person ID: 1234
-  Name: John Doe
-  E-mail address: jdoe@example.com
-  Home phone #: 555-4321
-`
-	if got != want {
-		t.Errorf("writePerson(%s) =>\n\t%q, want %q", p.String(), got, want)
-	}
-}
-
-func TestListPeopleWritesList(t *testing.T) {
-	buf := new(bytes.Buffer)
-	in := pb.AddressBook{People: []*pb.Person{
-		{
-			Name:  "John Doe",
-			Id:    101,
-			Email: "john@example.com",
-		},
-		{
-			Name: "Jane Doe",
-			Id:   102,
-		},
-		{
-			Name:  "Jack Doe",
-			Id:    201,
-			Email: "jack@example.com",
-			Phones: []*pb.Person_PhoneNumber{
-				{Number: "555-555-5555", Type: pb.Person_WORK},
-			},
-		},
-		{
-			Name:  "Jack Buck",
-			Id:    301,
-			Email: "buck@example.com",
-			Phones: []*pb.Person_PhoneNumber{
-				{Number: "555-555-0000", Type: pb.Person_HOME},
-				{Number: "555-555-0001", Type: pb.Person_MOBILE},
-				{Number: "555-555-0002", Type: pb.Person_WORK},
-			},
-		},
-		{
-			Name:  "Janet Doe",
-			Id:    1001,
-			Email: "janet@example.com",
-			Phones: []*pb.Person_PhoneNumber{
-				{Number: "555-777-0000"},
-				{Number: "555-777-0001", Type: pb.Person_HOME},
-			},
-		},
-	}}
-	listPeople(buf, &in)
-	want := strings.Split(`Person ID: 101
-  Name: John Doe
-  E-mail address: john@example.com
-Person ID: 102
-  Name: Jane Doe
-Person ID: 201
-  Name: Jack Doe
-  E-mail address: jack@example.com
-  Work phone #: 555-555-5555
-Person ID: 301
-  Name: Jack Buck
-  E-mail address: buck@example.com
-  Home phone #: 555-555-0000
-  Mobile phone #: 555-555-0001
-  Work phone #: 555-555-0002
-Person ID: 1001
-  Name: Janet Doe
-  E-mail address: janet@example.com
-  Mobile phone #: 555-777-0000
-  Home phone #: 555-777-0001
-`, "\n")
-	got := strings.Split(buf.String(), "\n")
-	if len(got) != len(want) {
-		t.Errorf(
-			"listPeople(%s) =>\n\t%q has %d lines, want %d",
-			in.String(),
-			buf.String(),
-			len(got),
-			len(want))
-	}
-	lines := len(got)
-	if lines > len(want) {
-		lines = len(want)
-	}
-	for i := 0; i < lines; i++ {
-		if got[i] != want[i] {
-			t.Errorf(
-				"listPeople(%s) =>\n\tline %d %q, want %q",
-				in.String(),
-				i,
-				got[i],
-				want[i])
-		}
-	}
-}
diff --git a/libs/protobuf/examples/go/go.mod b/libs/protobuf/examples/go/go.mod
deleted file mode 100644
index ed43328..0000000
--- a/libs/protobuf/examples/go/go.mod
+++ /dev/null
@@ -1,5 +0,0 @@
-module github.com/protocolbuffers/protobuf/examples/go
-
-go 1.14
-
-require google.golang.org/protobuf v1.27.1
diff --git a/libs/protobuf/examples/go/go.sum b/libs/protobuf/examples/go/go.sum
deleted file mode 100644
index 9f8c064..0000000
--- a/libs/protobuf/examples/go/go.sum
+++ /dev/null
@@ -1,6 +0,0 @@
-github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
-github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
-google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ=
-google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
diff --git a/libs/protobuf/examples/list_people.cc b/libs/protobuf/examples/list_people.cc
deleted file mode 100644
index b309c59..0000000
--- a/libs/protobuf/examples/list_people.cc
+++ /dev/null
@@ -1,79 +0,0 @@
-// See README.txt for information and build instructions.
-
-#include <fstream>
-#include <google/protobuf/util/time_util.h>
-#include <iostream>
-#include <string>
-
-#include "addressbook.pb.h"
-
-using namespace std;
-
-using google::protobuf::util::TimeUtil;
-
-// Iterates though all people in the AddressBook and prints info about them.
-void ListPeople(const tutorial::AddressBook& address_book) {
-  for (int i = 0; i < address_book.people_size(); i++) {
-    const tutorial::Person& person = address_book.people(i);
-
-    cout << "Person ID: " << person.id() << endl;
-    cout << "  Name: " << person.name() << endl;
-    if (person.email() != "") {
-      cout << "  E-mail address: " << person.email() << endl;
-    }
-
-    for (int j = 0; j < person.phones_size(); j++) {
-      const tutorial::Person::PhoneNumber& phone_number = person.phones(j);
-
-      switch (phone_number.type()) {
-        case tutorial::Person::MOBILE:
-          cout << "  Mobile phone #: ";
-          break;
-        case tutorial::Person::HOME:
-          cout << "  Home phone #: ";
-          break;
-        case tutorial::Person::WORK:
-          cout << "  Work phone #: ";
-          break;
-        default:
-          cout << "  Unknown phone #: ";
-          break;
-      }
-      cout << phone_number.number() << endl;
-    }
-    if (person.has_last_updated()) {
-      cout << "  Updated: " << TimeUtil::ToString(person.last_updated()) << endl;
-    }
-  }
-}
-
-// Main function:  Reads the entire address book from a file and prints all
-//   the information inside.
-int main(int argc, char* argv[]) {
-  // Verify that the version of the library that we linked against is
-  // compatible with the version of the headers we compiled against.
-  GOOGLE_PROTOBUF_VERIFY_VERSION;
-
-  if (argc != 2) {
-    cerr << "Usage:  " << argv[0] << " ADDRESS_BOOK_FILE" << endl;
-    return -1;
-  }
-
-  tutorial::AddressBook address_book;
-
-  {
-    // Read the existing address book.
-    fstream input(argv[1], ios::in | ios::binary);
-    if (!address_book.ParseFromIstream(&input)) {
-      cerr << "Failed to parse address book." << endl;
-      return -1;
-    }
-  }
-
-  ListPeople(address_book);
-
-  // Optional:  Delete all global objects allocated by libprotobuf.
-  google::protobuf::ShutdownProtobufLibrary();
-
-  return 0;
-}
diff --git a/libs/protobuf/examples/list_people.dart b/libs/protobuf/examples/list_people.dart
deleted file mode 100644
index 8a96d82..0000000
--- a/libs/protobuf/examples/list_people.dart
+++ /dev/null
@@ -1,47 +0,0 @@
-import 'dart:io';
-
-import 'dart_tutorial/addressbook.pb.dart';
-import 'dart_tutorial/addressbook.pbenum.dart';
-
-/// Iterates though all people in the AddressBook and prints info about them.
-void printAddressBook(AddressBook addressBook) {
-  for (var person in addressBook.people) {
-    print('Person ID: ${person.id}');
-    print('  Name: ${person.name}');
-    if (person.hasEmail()) {
-      print('  E-mail address:${person.email}');
-    }
-
-    for (var phoneNumber in person.phones) {
-      switch (phoneNumber.type) {
-        case Person_PhoneType.MOBILE:
-          print('   Mobile phone #: ');
-          break;
-        case Person_PhoneType.HOME:
-          print('   Home phone #: ');
-          break;
-        case Person_PhoneType.WORK:
-          print('   Work phone #: ');
-          break;
-        default:
-          print('   Unknown phone #: ');
-          break;
-      }
-      print(phoneNumber.number);
-    }
-  }
-}
-
-/// Reads the entire address book from a file and prints all
-/// the information inside.
-void main(List<String> arguments) {
-  if (arguments.length != 1) {
-    print('Usage: list_person ADDRESS_BOOK_FILE');
-    exit(-1);
-  }
-
-  // Read the existing address book.
-  final file = new File(arguments.first);
-  final addressBook = new AddressBook.fromBuffer(file.readAsBytesSync());
-  printAddressBook(addressBook);
-}
diff --git a/libs/protobuf/examples/list_people.py b/libs/protobuf/examples/list_people.py
deleted file mode 100755
index d2c294c..0000000
--- a/libs/protobuf/examples/list_people.py
+++ /dev/null
@@ -1,40 +0,0 @@
-#! /usr/bin/env python
-
-# See README.txt for information and build instructions.
-
-from __future__ import print_function
-import addressbook_pb2
-import sys
-
-
-# Iterates though all people in the AddressBook and prints info about them.
-def ListPeople(address_book):
-  for person in address_book.people:
-    print("Person ID:", person.id)
-    print("  Name:", person.name)
-    if person.email != "":
-      print("  E-mail address:", person.email)
-
-    for phone_number in person.phones:
-      if phone_number.type == addressbook_pb2.Person.MOBILE:
-        print("  Mobile phone #:", end=" ")
-      elif phone_number.type == addressbook_pb2.Person.HOME:
-        print("  Home phone #:", end=" ")
-      elif phone_number.type == addressbook_pb2.Person.WORK:
-        print("  Work phone #:", end=" ")
-      print(phone_number.number)
-
-
-# Main procedure:  Reads the entire address book from a file and prints all
-#   the information inside.
-if len(sys.argv) != 2:
-  print("Usage:", sys.argv[0], "ADDRESS_BOOK_FILE")
-  sys.exit(-1)
-
-address_book = addressbook_pb2.AddressBook()
-
-# Read the existing address book.
-with open(sys.argv[1], "rb") as f:
-  address_book.ParseFromString(f.read())
-
-ListPeople(address_book)
diff --git a/libs/protobuf/examples/pubspec.yaml b/libs/protobuf/examples/pubspec.yaml
deleted file mode 100644
index 0c36dbd..0000000
--- a/libs/protobuf/examples/pubspec.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-name: addressbook
-description: dartlang.org example code.
-
-dependencies:
-  protobuf:
diff --git a/libs/protobuf/fix_permissions.sh b/libs/protobuf/fix_permissions.sh
deleted file mode 100755
index f33c25c..0000000
--- a/libs/protobuf/fix_permissions.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-for file in $(find . -type f); do
-  if [ "$(head -c 2 $file)" == "#!" ]; then
-    chmod u+x $file
-  else
-    chmod a-x $file
-  fi
-done
diff --git a/libs/protobuf/generate_changelog.py b/libs/protobuf/generate_changelog.py
deleted file mode 100755
index fe7e95b..0000000
--- a/libs/protobuf/generate_changelog.py
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/usr/bin/env python
-
-"""Generates a friendly list of changes per language since the last release."""
-
-import sys
-import os
-
-class Language(object):
-  def __init__(self, name, pathspec):
-    self.name = name
-    self.pathspec = pathspec
-
-languages = [
-  Language("C++", [
-      "':(glob)src/google/protobuf/*'",
-      "src/google/protobuf/compiler/cpp",
-      "src/google/protobuf/io",
-      "src/google/protobuf/util",
-      "src/google/protobuf/stubs",
-  ]),
-  Language("Java", [
-      "java",
-      "src/google/protobuf/compiler/java",
-  ]),
-  Language("Python", [
-      "python",
-      "src/google/protobuf/compiler/python",
-  ]),
-  Language("PHP", [
-      "php",
-      "src/google/protobuf/compiler/php",
-  ]),
-  Language("Ruby", [
-      "ruby",
-      "src/google/protobuf/compiler/ruby",
-  ]),
-  Language("Csharp", [
-      "csharp",
-      "src/google/protobuf/compiler/csharp",
-  ]),
-  Language("Objective C", [
-      "objectivec",
-      "src/google/protobuf/compiler/objectivec",
-  ]),
-]
-
-if len(sys.argv) < 2:
-  print("Usage: generate_changelog.py <previous release>")
-  sys.exit(1)
-
-previous = sys.argv[1]
-
-for language in languages:
-  print(language.name)
-  sys.stdout.flush()
-  os.system(("git log --pretty=oneline --abbrev-commit %s...HEAD %s | " +
-             "sed -e 's/^/ - /'") % (previous, " ".join(language.pathspec)))
-  print("")
-
-print("To view a commit on GitHub: " +
-      "https://github.com/protocolbuffers/protobuf/commit/<commit id>")
diff --git a/libs/protobuf/generate_descriptor_proto.sh b/libs/protobuf/generate_descriptor_proto.sh
deleted file mode 100755
index dc03fee..0000000
--- a/libs/protobuf/generate_descriptor_proto.sh
+++ /dev/null
@@ -1,115 +0,0 @@
-#!/usr/bin/env bash
-
-# Run this script to regenerate descriptor.pb.{h,cc} after the protocol
-# compiler changes.  Since these files are compiled into the protocol compiler
-# itself, they cannot be generated automatically by a make rule.  "make check"
-# will fail if these files do not match what the protocol compiler would
-# generate.
-#
-# HINT:  Flags passed to generate_descriptor_proto.sh will be passed directly
-#   to make when building protoc.  This is particularly useful for passing
-#   -j4 to run 4 jobs simultaneously.
-
-if test ! -e src/google/protobuf/stubs/common.h; then
-  cat >&2 << __EOF__
-Could not find source code.  Make sure you are running this script from the
-root of the distribution tree.
-__EOF__
-  exit 1
-fi
-
-cd src
-
-declare -a RUNTIME_PROTO_FILES=(\
-  google/protobuf/any.proto \
-  google/protobuf/api.proto \
-  google/protobuf/descriptor.proto \
-  google/protobuf/duration.proto \
-  google/protobuf/empty.proto \
-  google/protobuf/field_mask.proto \
-  google/protobuf/source_context.proto \
-  google/protobuf/struct.proto \
-  google/protobuf/timestamp.proto \
-  google/protobuf/type.proto \
-  google/protobuf/wrappers.proto)
-
-declare -a COMPILER_PROTO_FILES=(\
-  google/protobuf/compiler/plugin.proto)
-
-CORE_PROTO_IS_CORRECT=0
-PROCESS_ROUND=1
-BOOTSTRAP_PROTOC=""
-while [ $# -gt 0 ]; do
-  case $1 in
-    --bootstrap_protoc)
-      BOOTSTRAP_PROTOC=$2
-      shift 2
-      ;;
-    *)
-      break
-      ;;
-  esac
-  shift
-done
-TMP=$(mktemp -d)
-echo "Updating descriptor protos..."
-while [ $CORE_PROTO_IS_CORRECT -ne 1 ]
-do
-  echo "Round $PROCESS_ROUND"
-  CORE_PROTO_IS_CORRECT=1
-
-  if [ "$BOOTSTRAP_PROTOC" != "" ]; then
-    PROTOC=$BOOTSTRAP_PROTOC
-    BOOTSTRAP_PROTOC=""
-  else
-    make -j$(nproc) $@ protoc
-    if test $? -ne 0; then
-      echo "Failed to build protoc."
-      exit 1
-    fi
-    PROTOC="./protoc"
-  fi
-
-  $PROTOC --cpp_out=dllexport_decl=PROTOBUF_EXPORT:$TMP ${RUNTIME_PROTO_FILES[@]} && \
-  $PROTOC --cpp_out=dllexport_decl=PROTOC_EXPORT:$TMP ${COMPILER_PROTO_FILES[@]}
-
-  for PROTO_FILE in ${RUNTIME_PROTO_FILES[@]} ${COMPILER_PROTO_FILES[@]}; do
-    BASE_NAME=${PROTO_FILE%.*}
-    diff ${BASE_NAME}.pb.h $TMP/${BASE_NAME}.pb.h > /dev/null
-    if test $? -ne 0; then
-      CORE_PROTO_IS_CORRECT=0
-    fi
-    diff ${BASE_NAME}.pb.cc $TMP/${BASE_NAME}.pb.cc > /dev/null
-    if test $? -ne 0; then
-      CORE_PROTO_IS_CORRECT=0
-    fi
-  done
-
-  # Only override the output if the files are different to avoid re-compilation
-  # of the protoc.
-  if [ $CORE_PROTO_IS_CORRECT -ne 1 ]; then
-    for PROTO_FILE in ${RUNTIME_PROTO_FILES[@]} ${COMPILER_PROTO_FILES[@]}; do
-      BASE_NAME=${PROTO_FILE%.*}
-      mv $TMP/${BASE_NAME}.pb.h ${BASE_NAME}.pb.h
-      mv $TMP/${BASE_NAME}.pb.cc ${BASE_NAME}.pb.cc
-    done
-  fi
-
-  PROCESS_ROUND=$((PROCESS_ROUND + 1))
-done
-cd ..
-
-if test -x objectivec/generate_well_known_types.sh; then
-  echo "Generating messages for objc."
-  objectivec/generate_well_known_types.sh $@
-fi
-
-if test -x csharp/generate_protos.sh; then
-  echo "Generating messages for C#."
-  csharp/generate_protos.sh $@
-fi
-
-if test -x php/generate_descriptor_protos.sh; then
-  echo "Generating messages for PHP."
-  php/generate_descriptor_protos.sh $@
-fi
diff --git a/libs/protobuf/global.json b/libs/protobuf/global.json
deleted file mode 100644
index ade0252..0000000
--- a/libs/protobuf/global.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "sdk": {
-    "version": "6.0.100",
-    "rollForward": "latestMinor"
-  }
-}
diff --git a/libs/protobuf/java/BUILD.bazel b/libs/protobuf/java/BUILD.bazel
deleted file mode 100644
index b3178c9..0000000
--- a/libs/protobuf/java/BUILD.bazel
+++ /dev/null
@@ -1,53 +0,0 @@
-load("@rules_pkg//:mappings.bzl", "pkg_filegroup", "pkg_files", "strip_prefix")
-
-test_suite(
-    name = "tests",
-    tests = [
-        "//java/core:tests",
-        "//java/kotlin:tests",
-        "//java/kotlin-lite:tests",
-        "//java/lite:tests",
-        "//java/util:tests",
-    ],
-)
-
-filegroup(
-    name = "release",
-    srcs = [
-        "//java/core:release",  # contains lite.
-        "//java/kotlin:release",
-        "//java/kotlin-lite:release",
-        "//java/util:release",
-    ],
-)
-
-################################################################################
-# Packaging rules
-################################################################################
-
-pkg_files(
-    name = "dist_files",
-    srcs = [
-        "BUILD.bazel",
-        "README.md",
-        "bom/pom.xml",
-        "lite.md",
-        "pom.xml",
-    ],
-    strip_prefix = strip_prefix.from_root(""),
-    visibility = ["//pkg:__pkg__"],
-)
-
-pkg_filegroup(
-    name = "all_dist_files",
-    srcs = [
-        ":dist_files",
-        "//java/core:dist_files",
-        "//java/internal:dist_files",
-        "//java/kotlin:dist_files",
-        "//java/kotlin-lite:dist_files",
-        "//java/lite:dist_files",
-        "//java/util:dist_files",
-    ],
-    visibility = ["//pkg:__pkg__"],
-)
diff --git a/libs/protobuf/java/README.md b/libs/protobuf/java/README.md
deleted file mode 100644
index 5df8114..0000000
--- a/libs/protobuf/java/README.md
+++ /dev/null
@@ -1,185 +0,0 @@
-# Protocol Buffers - Google's data interchange format
-
-Copyright 2008 Google Inc.
-
-https://developers.google.com/protocol-buffers/
-
-## Use Java Protocol Buffers
-
-To use protobuf in Java, first obtain the protocol compiler (a.k.a., protoc,
-see instructions in the toplevel [README.md](../README.md)) and use it to
-generate Java code for your .proto files:
-
-    $ protoc --java_out=${OUTPUT_DIR} path/to/your/proto/file
-
-Include the generated Java files in your project and add a dependency on the
-protobuf Java runtime.
-
-### Maven
-
-If you are using Maven, use the following:
-
-```xml
-<dependency>
-  <groupId>com.google.protobuf</groupId>
-  <artifactId>protobuf-java</artifactId>
-  <version>3.21.12</version>
-</dependency>
-```
-
-Make sure the version number of the runtime matches (or is newer than) the
-version number of the protoc.
-
-If you want to use features like protobuf JsonFormat, add a dependency on the
-protobuf-java-util package:
-
-```xml
-<dependency>
-  <groupId>com.google.protobuf</groupId>
-  <artifactId>protobuf-java-util</artifactId>
-  <version>3.21.12</version>
-</dependency>
-```
-
-### Gradle
-
-If you are using Gradle, add the following to your `build.gradle` file's dependencies:
-```
-    implementation 'com.google.protobuf:protobuf-java:3.21.12'
-```
-Again, be sure to check that the version number matches (or is newer than) the version number of protoc that you are using.
-
-### Use Java Protocol Buffers on Android
-
-For Android users, it's recommended to use protobuf Java Lite runtime because
-of its smaller code size. Java Lite runtime also works better with Proguard
-because it doesn't rely on Java reflection and is optimized to allow as much
-code stripping as possible. You can following these [instructions to use Java
-Lite runtime](lite.md).
-
-### Use Java Protocol Buffers with Bazel
-
-Bazel has native build rules to work with protobuf. For Java, you can use the
-`java_proto_library` rule for server and the `java_lite_proto_library` rule
-for Android. Check out [our build files examples](../examples/BUILD) to learn
-how to use them.
-
-## Build from Source
-
-Most users should follow the instructions above to use protobuf Java runtime.
-If you are contributing code to protobuf or want to use a protobuf version
-that hasn't been officially released yet, you can follow the instructions
-below to build protobuf from source code.
-
-### Build from Source - With Maven
-
-1) Install Apache Maven if you don't have it:
-
-     http://maven.apache.org/
-
-2) Build the C++ code, or obtain a binary distribution of protoc (see
-   the toplevel [README.md](../README.md)). If you install a binary
-   distribution, make sure that it is the same version as this package.
-   If in doubt, run:
-
-     $ protoc --version
-
-   You will need to place the protoc executable in ../src.  (If you
-   built it yourself, it should already be there.)
-
-3) Run the tests:
-
-     $ mvn test
-
-   If some tests fail, this library may not work correctly on your
-   system.  Continue at your own risk.
-
-4) Install the library into your Maven repository:
-
-     $ mvn install
-
-5) If you do not use Maven to manage your own build, you can build a
-   .jar file to use:
-
-     $ mvn package
-
-   The .jar will be placed in the "target" directory.
-
-The above instructions will install 2 maven artifacts:
-
-  * protobuf-java: The core Java Protocol Buffers library. Most users only
-                   need this artifact.
-  * protobuf-java-util: Utilities to work with protos. It contains JSON support
-                        as well as utilities to work with proto3 well-known
-                        types.
-
-### Build from Source - Without Maven
-
-If you would rather not install Maven to build the library, you may
-follow these instructions instead.  Note that these instructions skip
-running unit tests and only describes how to install the core protobuf
-library (without the util package).
-
-1) Build the C++ code, or obtain a binary distribution of protoc.  If
-   you install a binary distribution, make sure that it is the same
-   version as this package.  If in doubt, run:
-
-     $ protoc --version
-
-   If you built the C++ code without installing, the compiler binary
-   should be located in ../src.
-
-2) Invoke protoc to build DescriptorProtos.java:
-
-     $ protoc --java_out=core/src/main/java -I../src \
-         ../src/google/protobuf/descriptor.proto
-
-3) Compile the code in core/src/main/java using whatever means you prefer.
-
-4) Install the classes wherever you prefer.
-
-## Compatibility Notice
-
-* Protobuf minor version releases are backwards-compatible. If your code
-  can build/run against the old version, it's expected to build/run against
-  the new version as well. Both binary compatibility and source compatibility
-  are guaranteed for minor version releases if the user follows the guideline
-  described in this section.
-
-* Protobuf major version releases may also be backwards-compatible with the
-  last release of the previous major version. See the release notice for more
-  details.
-
-* APIs marked with the @ExperimentalApi annotation are subject to change. They
-  can be modified in any way, or even removed, at any time. Don't use them if
-  compatibility is needed. If your code is a library itself (i.e. it is used on
-  the CLASSPATH of users outside your own control), you should not use
-  experimental APIs, unless you repackage them (e.g. using ProGuard).
-
-* Deprecated non-experimental APIs will be removed two years after the release
-  in which they are first deprecated. You must fix your references before this
-  time. If you don't, any manner of breakage could result (you are not
-  guaranteed a compilation error).
-
-* Protobuf message interfaces/classes are designed to be subclassed by protobuf
-  generated code only. Do not subclass these message interfaces/classes
-  yourself. We may add new methods to the message interfaces/classes which will
-  break your own subclasses.
-
-* Don't use any method/class that is marked as "used by generated code only".
-  Such methods/classes are subject to change.
-
-* Protobuf LITE runtime APIs are not stable yet. They are subject to change even
-  in minor version releases.
-
-## Documentation
-
-The complete documentation for Protocol Buffers is available via the
-web at:
-
-  https://developers.google.com/protocol-buffers/
-
-## Kotlin Protocol Buffers
-
-Code to support more idiomatic Kotlin protocol buffers has been added to the
-repository, and Kotlin support will be launched in the next numbered release.
diff --git a/libs/protobuf/java/bom/pom.xml b/libs/protobuf/java/bom/pom.xml
deleted file mode 100644
index 3181676..0000000
--- a/libs/protobuf/java/bom/pom.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0                              http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>com.google.protobuf</groupId>
-  <artifactId>protobuf-bom</artifactId>
-  <version>3.21.12</version>
-  <packaging>pom</packaging>
-
-  <name>Protocol Buffers [BOM]</name>
-  <description>A compatible set of open source libraries for working with protocol buffers.</description>
-  <url>https://developers.google.com/protocol-buffers/</url>
-
-  <organization>
-    <name>Google LLC</name>
-    <url>https://cloud.google.com</url>
-  </organization>
-
-  <developers>
-    <developer>
-      <id>haon</id>
-      <name>Hao Nguyen</name>
-      <email>haon@google.com</email>
-      <organization>Google</organization>
-      <organizationUrl>https://cloud.google.com</organizationUrl>
-      <timezone>America/Los_Angeles</timezone>
-    </developer>
-  </developers>
-
-  <licenses>
-    <license>
-      <name>BSD-3-Clause</name>
-      <url>https://opensource.org/licenses/BSD-3-Clause</url>
-    </license>
-  </licenses>
-
-  <scm>
-    <url>https://github.com/protocolbuffers/protobuf</url>
-    <connection>scm:git:https://github.com/protocolbuffers/protobuf.git</connection>
-  </scm>
-
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-  </properties>
-
-  <distributionManagement>
-    <snapshotRepository>
-      <id>sonatype-nexus-staging</id>
-      <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-    </snapshotRepository>
-    <repository>
-      <id>sonatype-nexus-staging</id>
-      <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
-    </repository>
-  </distributionManagement>
-
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>com.google.protobuf</groupId>
-        <artifactId>protobuf-java</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.google.protobuf</groupId>
-        <artifactId>protobuf-java-util</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-
-  <profiles>
-    <profile>
-      <!-- If you see the error message
-           gpg: signing failed: Inappropriate ioctl for device
-           when signing run the command
-           export GPG_TTY=$(tty)
-           and try again. -->
-      <id>release</id>
-      <build>
-        <plugins>
-          <plugin>
-            <artifactId>maven-gpg-plugin</artifactId>
-            <version>1.6</version>
-            <executions>
-              <execution>
-                <id>sign-artifacts</id>
-                <phase>verify</phase>
-                <goals>
-                  <goal>sign</goal>
-                </goals>
-               </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <groupId>org.sonatype.plugins</groupId>
-	    <artifactId>nexus-staging-maven-plugin</artifactId>
-            <version>1.6.6</version>
-            <extensions>true</extensions>
-            <configuration>
-              <nexusUrl>https://oss.sonatype.org/</nexusUrl>
-              <serverId>sonatype-nexus-staging</serverId>
-              <autoReleaseAfterClose>false</autoReleaseAfterClose>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
-</project>
diff --git a/libs/protobuf/java/core/BUILD.bazel b/libs/protobuf/java/core/BUILD.bazel
deleted file mode 100644
index cfd53f4..0000000
--- a/libs/protobuf/java/core/BUILD.bazel
+++ /dev/null
@@ -1,471 +0,0 @@
-load("@bazel_skylib//rules:build_test.bzl", "build_test")
-load("@rules_java//java:defs.bzl", "java_library", "java_lite_proto_library", "java_proto_library")
-load("@rules_jvm_external//:defs.bzl", "java_export")
-load("@rules_pkg//:mappings.bzl", "pkg_files", "strip_prefix")
-load("@rules_proto//proto:defs.bzl", "proto_lang_toolchain", "proto_library")
-load("//conformance:defs.bzl", "conformance_test")
-load("//:protobuf.bzl", "internal_gen_well_known_protos_java")
-load("//:protobuf_version.bzl", "PROTOBUF_JAVA_VERSION")
-load("//java/internal:testing.bzl", "junit_tests")
-
-LITE_SRCS = [
-    # Keep in sync with `//java/lite:pom.xml`.
-    "src/main/java/com/google/protobuf/AbstractMessageLite.java",
-    "src/main/java/com/google/protobuf/AbstractParser.java",
-    "src/main/java/com/google/protobuf/AbstractProtobufList.java",
-    "src/main/java/com/google/protobuf/AllocatedBuffer.java",
-    "src/main/java/com/google/protobuf/Android.java",
-    "src/main/java/com/google/protobuf/ArrayDecoders.java",
-    "src/main/java/com/google/protobuf/BinaryReader.java",
-    "src/main/java/com/google/protobuf/BinaryWriter.java",
-    "src/main/java/com/google/protobuf/BooleanArrayList.java",
-    "src/main/java/com/google/protobuf/BufferAllocator.java",
-    "src/main/java/com/google/protobuf/ByteBufferWriter.java",
-    "src/main/java/com/google/protobuf/ByteOutput.java",
-    "src/main/java/com/google/protobuf/ByteString.java",
-    "src/main/java/com/google/protobuf/CanIgnoreReturnValue.java",
-    "src/main/java/com/google/protobuf/CheckReturnValue.java",
-    "src/main/java/com/google/protobuf/CodedInputStream.java",
-    "src/main/java/com/google/protobuf/CodedInputStreamReader.java",
-    "src/main/java/com/google/protobuf/CodedOutputStream.java",
-    "src/main/java/com/google/protobuf/CodedOutputStreamWriter.java",
-    "src/main/java/com/google/protobuf/CompileTimeConstant.java",
-    "src/main/java/com/google/protobuf/DoubleArrayList.java",
-    "src/main/java/com/google/protobuf/ExperimentalApi.java",
-    "src/main/java/com/google/protobuf/ExtensionLite.java",
-    "src/main/java/com/google/protobuf/ExtensionRegistryFactory.java",
-    "src/main/java/com/google/protobuf/ExtensionRegistryLite.java",
-    "src/main/java/com/google/protobuf/ExtensionSchema.java",
-    "src/main/java/com/google/protobuf/ExtensionSchemaLite.java",
-    "src/main/java/com/google/protobuf/ExtensionSchemas.java",
-    "src/main/java/com/google/protobuf/FieldInfo.java",
-    "src/main/java/com/google/protobuf/FieldSet.java",
-    "src/main/java/com/google/protobuf/FieldType.java",
-    "src/main/java/com/google/protobuf/FloatArrayList.java",
-    "src/main/java/com/google/protobuf/GeneratedMessageInfoFactory.java",
-    "src/main/java/com/google/protobuf/GeneratedMessageLite.java",
-    "src/main/java/com/google/protobuf/InlineMe.java",
-    "src/main/java/com/google/protobuf/IntArrayList.java",
-    "src/main/java/com/google/protobuf/Internal.java",
-    "src/main/java/com/google/protobuf/InvalidProtocolBufferException.java",
-    "src/main/java/com/google/protobuf/IterableByteBufferInputStream.java",
-    "src/main/java/com/google/protobuf/JavaType.java",
-    "src/main/java/com/google/protobuf/LazyField.java",
-    "src/main/java/com/google/protobuf/LazyFieldLite.java",
-    "src/main/java/com/google/protobuf/LazyStringArrayList.java",
-    "src/main/java/com/google/protobuf/LazyStringList.java",
-    "src/main/java/com/google/protobuf/ListFieldSchema.java",
-    "src/main/java/com/google/protobuf/LongArrayList.java",
-    "src/main/java/com/google/protobuf/ManifestSchemaFactory.java",
-    "src/main/java/com/google/protobuf/MapEntryLite.java",
-    "src/main/java/com/google/protobuf/MapFieldLite.java",
-    "src/main/java/com/google/protobuf/MapFieldSchema.java",
-    "src/main/java/com/google/protobuf/MapFieldSchemaLite.java",
-    "src/main/java/com/google/protobuf/MapFieldSchemas.java",
-    "src/main/java/com/google/protobuf/MessageInfo.java",
-    "src/main/java/com/google/protobuf/MessageInfoFactory.java",
-    "src/main/java/com/google/protobuf/MessageLite.java",
-    "src/main/java/com/google/protobuf/MessageLiteOrBuilder.java",
-    "src/main/java/com/google/protobuf/MessageLiteToString.java",
-    "src/main/java/com/google/protobuf/MessageSchema.java",
-    "src/main/java/com/google/protobuf/MessageSetSchema.java",
-    "src/main/java/com/google/protobuf/MutabilityOracle.java",
-    "src/main/java/com/google/protobuf/NewInstanceSchema.java",
-    "src/main/java/com/google/protobuf/NewInstanceSchemaLite.java",
-    "src/main/java/com/google/protobuf/NewInstanceSchemas.java",
-    "src/main/java/com/google/protobuf/NioByteString.java",
-    "src/main/java/com/google/protobuf/OneofInfo.java",
-    "src/main/java/com/google/protobuf/Parser.java",
-    "src/main/java/com/google/protobuf/PrimitiveNonBoxingCollection.java",
-    "src/main/java/com/google/protobuf/ProtoSyntax.java",
-    "src/main/java/com/google/protobuf/Protobuf.java",
-    "src/main/java/com/google/protobuf/ProtobufArrayList.java",
-    "src/main/java/com/google/protobuf/ProtobufLists.java",
-    "src/main/java/com/google/protobuf/ProtocolStringList.java",
-    "src/main/java/com/google/protobuf/RawMessageInfo.java",
-    "src/main/java/com/google/protobuf/Reader.java",
-    "src/main/java/com/google/protobuf/RopeByteString.java",
-    "src/main/java/com/google/protobuf/Schema.java",
-    "src/main/java/com/google/protobuf/SchemaFactory.java",
-    "src/main/java/com/google/protobuf/SchemaUtil.java",
-    "src/main/java/com/google/protobuf/SmallSortedMap.java",
-    "src/main/java/com/google/protobuf/StructuralMessageInfo.java",
-    "src/main/java/com/google/protobuf/TextFormatEscaper.java",
-    "src/main/java/com/google/protobuf/UninitializedMessageException.java",
-    "src/main/java/com/google/protobuf/UnknownFieldSchema.java",
-    "src/main/java/com/google/protobuf/UnknownFieldSetLite.java",
-    "src/main/java/com/google/protobuf/UnknownFieldSetLiteSchema.java",
-    "src/main/java/com/google/protobuf/UnmodifiableLazyStringList.java",
-    "src/main/java/com/google/protobuf/UnsafeByteOperations.java",
-    "src/main/java/com/google/protobuf/UnsafeUtil.java",
-    "src/main/java/com/google/protobuf/Utf8.java",
-    "src/main/java/com/google/protobuf/WireFormat.java",
-    "src/main/java/com/google/protobuf/Writer.java",
-]
-
-internal_gen_well_known_protos_java(
-    name = "gen_well_known_protos_javalite",
-    javalite = True,
-    deps = [
-        "//:any_proto",
-        "//:api_proto",
-        "//:duration_proto",
-        "//:empty_proto",
-        "//:field_mask_proto",
-        "//:source_context_proto",
-        "//:struct_proto",
-        "//:timestamp_proto",
-        "//:type_proto",
-        "//:wrappers_proto",
-    ],
-)
-
-# Should be used as `//java/lite`.
-java_library(
-    name = "lite",
-    srcs = LITE_SRCS + [
-        ":gen_well_known_protos_javalite",
-    ],
-    visibility = [
-        "//java/lite:__pkg__",
-    ],
-)
-
-# Bazel users, don't depend on this target, use //java/lite.
-java_export(
-    name = "lite_mvn",
-    maven_coordinates = "com.google.protobuf:protobuf-javalite:%s" % PROTOBUF_JAVA_VERSION,
-    pom_template = "//java/lite:pom_template.xml",
-    resources = [
-        "//:lite_well_known_protos",
-    ],
-    tags = ["manual"],
-    runtime_deps = [":lite"],
-)
-
-java_library(
-    name = "lite_runtime_only",
-    srcs = LITE_SRCS,
-)
-
-internal_gen_well_known_protos_java(
-    name = "gen_well_known_protos_java",
-    deps = [
-        "//:any_proto",
-        "//:api_proto",
-        "//:compiler_plugin_proto",
-        "//:descriptor_proto",
-        "//:duration_proto",
-        "//:empty_proto",
-        "//:field_mask_proto",
-        "//:source_context_proto",
-        "//:struct_proto",
-        "//:timestamp_proto",
-        "//:type_proto",
-        "//:wrappers_proto",
-    ],
-)
-
-java_library(
-    name = "core",
-    srcs = glob(
-        [
-            "src/main/java/com/google/protobuf/*.java",
-        ],
-        exclude = LITE_SRCS,
-    ) + [
-        ":gen_well_known_protos_java",
-    ],
-    visibility = ["//visibility:public"],
-    exports = [
-        ":lite_runtime_only",
-    ],
-    deps = [
-        ":lite_runtime_only",
-    ],
-)
-
-# Bazel users, don't depend on this target, use :core.
-java_export(
-    name = "core_mvn",
-    maven_coordinates = "com.google.protobuf:protobuf-java:%s" % PROTOBUF_JAVA_VERSION,
-    pom_template = "pom_template.xml",
-    resources = [
-        "//:built_in_runtime_protos",
-        "//:well_known_type_protos",
-    ],
-    tags = ["manual"],
-    runtime_deps = [":core"],
-)
-
-filegroup(
-    name = "release",
-    srcs = [
-        ":core_mvn-docs",
-        ":core_mvn-maven-source",
-        ":core_mvn-pom",
-        ":core_mvn-project",
-        ":lite_mvn-docs",
-        ":lite_mvn-maven-source",
-        ":lite_mvn-pom",
-        ":lite_mvn-project",
-    ],
-    visibility = ["//java:__pkg__"],
-)
-
-proto_lang_toolchain(
-    name = "toolchain",
-    # keep this in sync w/ WELL_KNOWN_PROTO_MAP in //:BUILD
-    blacklisted_protos = [
-        "//:any_proto",
-        "//:api_proto",
-        "//:compiler_plugin_proto",
-        "//:descriptor_proto",
-        "//:duration_proto",
-        "//:empty_proto",
-        "//:field_mask_proto",
-        "//:source_context_proto",
-        "//:struct_proto",
-        "//:timestamp_proto",
-        "//:type_proto",
-        "//:wrappers_proto",
-    ],
-    command_line = "--java_out=$(OUT)",
-    runtime = ":core",
-    visibility = ["//visibility:public"],
-)
-
-proto_library(
-    name = "java_test_protos",
-    srcs = glob(["src/test/proto/**/*.proto"]),
-    strip_import_prefix = "src/test/proto",
-    deps = [
-        "//:any_proto",
-        "//:descriptor_proto",
-        "//:generic_test_protos",
-        "//:wrappers_proto",
-    ],
-)
-
-java_proto_library(
-    name = "generic_test_protos_java_proto",
-    visibility = [
-        "//java:__subpackages__",
-    ],
-    deps = ["//:generic_test_protos"],
-)
-
-java_proto_library(
-    name = "java_test_protos_java_proto",
-    deps = [":java_test_protos"],
-)
-
-java_library(
-    name = "test_util",
-    srcs = [
-        "src/test/java/com/google/protobuf/TestUtil.java",
-        "src/test/java/com/google/protobuf/TestUtilLite.java",
-    ],
-    visibility = ["//java:__subpackages__"],
-    deps = [
-        ":core",
-        ":generic_test_protos_java_proto",
-        ":java_test_protos_java_proto",
-        "@maven//:com_google_guava_guava",
-        "@maven//:junit_junit",
-    ],
-)
-
-test_suite(
-    name = "tests",
-    tests = [
-        "conformance_test",
-        "core_build_test",
-        "core_tests",
-        "utf8_tests",
-    ],
-)
-
-build_test(
-    name = "core_build_test",
-    targets = [
-        ":core",
-    ],
-)
-
-conformance_test(
-    name = "conformance_test",
-    failure_list = "//conformance:failure_list_java.txt",
-    testee = "//conformance:conformance_java",
-    text_format_failure_list = "//conformance:text_format_failure_list_java.txt",
-)
-
-junit_tests(
-    name = "core_tests",
-    size = "small",
-    srcs = glob(
-        ["src/test/java/**/*.java"],
-        exclude = [
-            "src/test/java/com/google/protobuf/DecodeUtf8Test.java",
-            "src/test/java/com/google/protobuf/IsValidUtf8Test.java",
-            "src/test/java/com/google/protobuf/TestUtil.java",
-            "src/test/java/com/google/protobuf/TestUtilLite.java",
-        ],
-    ),
-    data = ["//:testdata"],
-    deps = [
-        ":core",
-        ":generic_test_protos_java_proto",
-        ":java_test_protos_java_proto",
-        ":test_util",
-        "@maven//:com_google_guava_guava",
-        "@maven//:com_google_truth_truth",
-        "@maven//:junit_junit",
-        "@maven//:org_mockito_mockito_core",
-    ],
-)
-
-# The UTF-8 validation tests are much slower than the other tests, so they get
-# their own test target with a longer timeout.
-junit_tests(
-    name = "utf8_tests",
-    size = "large",
-    srcs = [
-        "src/test/java/com/google/protobuf/DecodeUtf8Test.java",
-        "src/test/java/com/google/protobuf/IsValidUtf8Test.java",
-        "src/test/java/com/google/protobuf/IsValidUtf8TestUtil.java",
-    ],
-    deps = [
-        ":core",
-        "@maven//:com_google_guava_guava",
-        "@maven//:com_google_truth_truth",
-        "@maven//:junit_junit",
-    ],
-)
-
-java_lite_proto_library(
-    name = "generic_test_protos_java_proto_lite",
-    visibility = [
-        "//java/kotlin-lite:__pkg__",
-        "//java/lite:__pkg__",
-    ],
-    deps = ["//:generic_test_protos"],
-)
-
-java_lite_proto_library(
-    name = "java_test_protos_java_proto_lite",
-    visibility = [
-        "//java/lite:__pkg__",
-    ],
-    deps = [":java_test_protos"],
-)
-
-genrule(
-    name = "rewrite_javalite_test_util",
-    srcs = [
-        "//java/lite:lite.awk",
-        "src/test/java/com/google/protobuf/TestUtil.java",
-    ],
-    outs = ["TestUtil.java"],
-    cmd = "awk -f $(location //java/lite:lite.awk) $(location src/test/java/com/google/protobuf/TestUtil.java) > $@",
-)
-
-java_library(
-    name = "test_util_lite",
-    srcs = [
-        "src/test/java/com/google/protobuf/TestUtilLite.java",
-        ":rewrite_javalite_test_util",
-    ],
-    visibility = [
-        "//java/kotlin-lite:__pkg__",
-        "//java/lite:__pkg__",
-    ],
-    deps = [
-        ":generic_test_protos_java_proto_lite",
-        ":java_test_protos_java_proto_lite",
-        ":lite_runtime_only",
-        "@maven//:com_google_guava_guava",
-        "@maven//:junit_junit",
-    ],
-)
-
-LITE_TEST_EXCLUSIONS = [
-    # Keep in sync with //java/lite:pom.xml id=copy-test-source-files execution.
-    "src/test/java/com/google/protobuf/AbstractMessageTest.java",
-    "src/test/java/com/google/protobuf/AbstractProto2SchemaTest.java",
-    "src/test/java/com/google/protobuf/AnyTest.java",
-    "src/test/java/com/google/protobuf/CodedInputStreamTest.java",
-    "src/test/java/com/google/protobuf/DeprecatedFieldTest.java",
-    "src/test/java/com/google/protobuf/DescriptorsTest.java",
-    "src/test/java/com/google/protobuf/DiscardUnknownFieldsTest.java",
-    "src/test/java/com/google/protobuf/DynamicMessageTest.java",
-    "src/test/java/com/google/protobuf/ExtensionRegistryFactoryTest.java",
-    "src/test/java/com/google/protobuf/FieldPresenceTest.java",
-    "src/test/java/com/google/protobuf/ForceFieldBuildersPreRun.java",
-    "src/test/java/com/google/protobuf/GeneratedMessageTest.java",
-    "src/test/java/com/google/protobuf/LazyFieldTest.java",
-    "src/test/java/com/google/protobuf/LazyStringEndToEndTest.java",
-    "src/test/java/com/google/protobuf/MapForProto2Test.java",
-    "src/test/java/com/google/protobuf/MapTest.java",
-    "src/test/java/com/google/protobuf/MessageTest.java",
-    "src/test/java/com/google/protobuf/NestedBuildersTest.java",
-    "src/test/java/com/google/protobuf/PackedFieldTest.java",
-    "src/test/java/com/google/protobuf/ParserTest.java",
-    "src/test/java/com/google/protobuf/ParseExceptionsTest.java",
-    "src/test/java/com/google/protobuf/Proto2ExtensionLookupSchemaTest.java",
-    "src/test/java/com/google/protobuf/Proto2SchemaTest.java",
-    "src/test/java/com/google/protobuf/Proto2UnknownEnumValueTest.java",
-    "src/test/java/com/google/protobuf/RepeatedFieldBuilderV3Test.java",
-    "src/test/java/com/google/protobuf/ServiceTest.java",
-    "src/test/java/com/google/protobuf/SingleFieldBuilderV3Test.java",
-    "src/test/java/com/google/protobuf/TestBadIdentifiers.java",
-    "src/test/java/com/google/protobuf/TextFormatParseInfoTreeTest.java",
-    "src/test/java/com/google/protobuf/TextFormatParseLocationTest.java",
-    "src/test/java/com/google/protobuf/TextFormatTest.java",
-    "src/test/java/com/google/protobuf/TestUtil.java",
-    "src/test/java/com/google/protobuf/TestUtilLite.java",
-    "src/test/java/com/google/protobuf/TypeRegistryTest.java",
-    "src/test/java/com/google/protobuf/UnknownEnumValueTest.java",
-    "src/test/java/com/google/protobuf/UnknownFieldSetLiteTest.java",
-    "src/test/java/com/google/protobuf/UnknownFieldSetPerformanceTest.java",
-    "src/test/java/com/google/protobuf/UnknownFieldSetTest.java",
-    "src/test/java/com/google/protobuf/WellKnownTypesTest.java",
-    "src/test/java/com/google/protobuf/WireFormatTest.java",
-]
-
-junit_tests(
-    name = "lite_tests",
-    size = "large",
-    srcs = glob(
-        ["src/test/java/**/*.java"],
-        exclude = LITE_TEST_EXCLUSIONS,
-    ),
-    data = ["//:testdata"],
-    test_prefix = "Lite",
-    deps = [
-        ":generic_test_protos_java_proto_lite",
-        ":java_test_protos_java_proto_lite",
-        ":lite",
-        ":test_util_lite",
-        "@maven//:com_google_truth_truth",
-        "@maven//:junit_junit",
-        "@maven//:org_mockito_mockito_core",
-    ],
-)
-
-pkg_files(
-    name = "dist_files",
-    srcs = glob([
-        "src/main/java/com/google/protobuf/*.java",
-        "src/test/java/**/*.java",
-        "src/test/proto/**/*.proto",
-    ]) + [
-        "BUILD.bazel",
-        "generate-sources-build.xml",
-        "generate-test-sources-build.xml",
-        "pom.xml",
-        "pom_template.xml",
-    ],
-    strip_prefix = strip_prefix.from_root(""),
-    visibility = ["//java:__pkg__"],
-)
diff --git a/libs/protobuf/java/core/generate-sources-build.xml b/libs/protobuf/java/core/generate-sources-build.xml
deleted file mode 100644
index 0996e5f..0000000
--- a/libs/protobuf/java/core/generate-sources-build.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<project name="generate-sources">
-    <echo message="Running protoc ..."/>
-    <mkdir dir="${generated.sources.dir}"/>
-    <exec executable="${protoc}">
-        <arg value="--java_out=${generated.sources.dir}"/>
-        <arg value="--proto_path=${protobuf.source.dir}"/>
-        <arg value="${protobuf.source.dir}/google/protobuf/any.proto"/>
-        <arg value="${protobuf.source.dir}/google/protobuf/api.proto"/>
-        <arg value="${protobuf.source.dir}/google/protobuf/descriptor.proto"/>
-        <arg value="${protobuf.source.dir}/google/protobuf/duration.proto"/>
-        <arg value="${protobuf.source.dir}/google/protobuf/empty.proto"/>
-        <arg value="${protobuf.source.dir}/google/protobuf/field_mask.proto"/>
-        <arg value="${protobuf.source.dir}/google/protobuf/source_context.proto"/>
-        <arg value="${protobuf.source.dir}/google/protobuf/struct.proto"/>
-        <arg value="${protobuf.source.dir}/google/protobuf/timestamp.proto"/>
-        <arg value="${protobuf.source.dir}/google/protobuf/type.proto"/>
-        <arg value="${protobuf.source.dir}/google/protobuf/wrappers.proto"/>
-        <arg value="${protobuf.source.dir}/google/protobuf/compiler/plugin.proto"/>
-    </exec>
-</project>
\ No newline at end of file
diff --git a/libs/protobuf/java/core/generate-test-sources-build.xml b/libs/protobuf/java/core/generate-test-sources-build.xml
deleted file mode 100644
index bad6f19..0000000
--- a/libs/protobuf/java/core/generate-test-sources-build.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<project name="generate-test-sources">
-    <mkdir dir="${generated.testsources.dir}"/>
-    <exec executable="${protoc}">
-        <arg value="--java_out=${generated.testsources.dir}"/>
-        <arg value="--proto_path=${protobuf.source.dir}"/>
-        <arg value="--proto_path=${test.proto.dir}"/>
-        <arg value="${protobuf.source.dir}/google/protobuf/map_lite_unittest.proto"/>
-        <arg value="${protobuf.source.dir}/google/protobuf/unittest.proto"/>
-        <arg value="${protobuf.source.dir}/google/protobuf/unittest_custom_options.proto"/>
-        <arg value="${protobuf.source.dir}/google/protobuf/unittest_enormous_descriptor.proto"/>
-        <arg value="${protobuf.source.dir}/google/protobuf/unittest_import.proto"/>
-        <arg value="${protobuf.source.dir}/google/protobuf/unittest_import_lite.proto"/>
-        <arg value="${protobuf.source.dir}/google/protobuf/unittest_import_public.proto"/>
-        <arg value="${protobuf.source.dir}/google/protobuf/unittest_import_public_lite.proto"/>
-        <arg value="${protobuf.source.dir}/google/protobuf/unittest_lite.proto"/>
-        <arg value="${protobuf.source.dir}/google/protobuf/unittest_mset.proto"/>
-        <arg value="${protobuf.source.dir}/google/protobuf/unittest_mset_wire_format.proto"/>
-        <arg value="${protobuf.source.dir}/google/protobuf/unittest_no_generic_services.proto"/>
-        <arg value="${protobuf.source.dir}/google/protobuf/unittest_optimize_for.proto"/>
-        <arg value="${protobuf.source.dir}/google/protobuf/unittest_proto3.proto"/>
-        <arg value="${protobuf.source.dir}/google/protobuf/unittest_proto3_optional.proto"/>
-        <arg value="${protobuf.source.dir}/google/protobuf/unittest_well_known_types.proto"/>
-        <arg value="${test.proto.dir}/com/google/protobuf/any_test.proto"/>
-        <arg value="${test.proto.dir}/com/google/protobuf/cached_field_size_test.proto"/>
-        <arg value="${test.proto.dir}/com/google/protobuf/deprecated_file.proto"/>
-        <arg value="${test.proto.dir}/com/google/protobuf/dynamic_message_test.proto"/>
-        <arg value="${test.proto.dir}/com/google/protobuf/field_presence_test.proto"/>
-        <arg value="${test.proto.dir}/com/google/protobuf/lazy_fields_lite.proto"/>
-        <arg value="${test.proto.dir}/com/google/protobuf/lite_equals_and_hash.proto"/>
-        <arg value="${test.proto.dir}/com/google/protobuf/map_for_proto2_lite_test.proto"/>
-        <arg value="${test.proto.dir}/com/google/protobuf/map_for_proto2_test.proto"/>
-        <arg value="${test.proto.dir}/com/google/protobuf/map_initialization_order_test.proto"/>
-        <arg value="${test.proto.dir}/com/google/protobuf/map_lite_test.proto"/>
-        <arg value="${test.proto.dir}/com/google/protobuf/map_test.proto"/>
-        <arg value="${test.proto.dir}/com/google/protobuf/multiple_files_test.proto"/>
-        <arg value="${test.proto.dir}/com/google/protobuf/nested_builders_test.proto"/>
-        <arg value="${test.proto.dir}/com/google/protobuf/nested_extension.proto"/>
-        <arg value="${test.proto.dir}/com/google/protobuf/non_nested_extension.proto"/>
-        <arg value="${test.proto.dir}/com/google/protobuf/outer_class_name_test.proto"/>
-        <arg value="${test.proto.dir}/com/google/protobuf/outer_class_name_test2.proto"/>
-        <arg value="${test.proto.dir}/com/google/protobuf/outer_class_name_test3.proto"/>
-        <arg value="${test.proto.dir}/com/google/protobuf/packed_field_test.proto"/>
-        <arg value="${test.proto.dir}/com/google/protobuf/proto2_message.proto"/>
-        <arg value="${test.proto.dir}/com/google/protobuf/proto2_message_lite.proto"/>
-        <arg value="${test.proto.dir}/com/google/protobuf/proto2_unknown_enum_values.proto"/>
-        <arg value="${test.proto.dir}/com/google/protobuf/proto3_message.proto"/>
-        <arg value="${test.proto.dir}/com/google/protobuf/proto3_message_lite.proto"/>
-        <arg value="${test.proto.dir}/com/google/protobuf/test_bad_identifiers.proto"/>
-        <arg value="${test.proto.dir}/com/google/protobuf/test_check_utf8.proto"/>
-        <arg value="${test.proto.dir}/com/google/protobuf/test_check_utf8_size.proto"/>
-        <arg value="${test.proto.dir}/com/google/protobuf/test_custom_options.proto"/>
-        <arg value="${test.proto.dir}/com/google/protobuf/wrappers_test.proto"/>
-    </exec>
-    <!-- Also generate some Lite protos needed for ExtensionRegistryFactoryTest -->
-    <exec executable="${protoc}">
-        <arg value="--java_out=lite:${generated.testsources.dir}"/>
-        <arg value="--proto_path=${protobuf.source.dir}"/>
-        <arg value="--proto_path=${test.proto.dir}"/>
-        <arg value="${test.proto.dir}/com/google/protobuf/nested_extension_lite.proto"/>
-        <arg value="${test.proto.dir}/com/google/protobuf/non_nested_extension_lite.proto"/>
-    </exec>
-</project>
diff --git a/libs/protobuf/java/core/pom.xml b/libs/protobuf/java/core/pom.xml
deleted file mode 100644
index 83b7351..0000000
--- a/libs/protobuf/java/core/pom.xml
+++ /dev/null
@@ -1,158 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>com.google.protobuf</groupId>
-    <artifactId>protobuf-parent</artifactId>
-    <version>3.21.12</version>
-  </parent>
-
-  <artifactId>protobuf-java</artifactId>
-  <packaging>bundle</packaging>
-
-  <name>Protocol Buffers [Core]</name>
-  <description>
-    Core Protocol Buffers library. Protocol Buffers are a way of encoding structured data in an
-    efficient yet extensible format.
-  </description>
-
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-core</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.truth</groupId>
-      <artifactId>truth</artifactId>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <!-- Include core protos in the bundle as resources -->
-    <resources>
-      <resource>
-        <directory>${protobuf.source.dir}</directory>
-        <includes>
-          <include>google/protobuf/any.proto</include>
-          <include>google/protobuf/api.proto</include>
-          <include>google/protobuf/descriptor.proto</include>
-          <include>google/protobuf/duration.proto</include>
-          <include>google/protobuf/empty.proto</include>
-          <include>google/protobuf/field_mask.proto</include>
-          <include>google/protobuf/source_context.proto</include>
-          <include>google/protobuf/struct.proto</include>
-          <include>google/protobuf/timestamp.proto</include>
-          <include>google/protobuf/type.proto</include>
-          <include>google/protobuf/wrappers.proto</include>
-          <include>google/protobuf/compiler/plugin.proto</include>
-        </includes>
-      </resource>
-    </resources>
-    <testResources>
-      <testResource>
-        <directory>${protobuf.source.dir}</directory>
-        <includes>
-          <include>google/protobuf/testdata/golden_message_oneof_implemented</include>
-          <include>google/protobuf/testdata/golden_packed_fields_message</include>
-        </includes>
-      </testResource>
-    </testResources>
-
-    <plugins>
-      <!-- Use Antrun plugin to generate sources with protoc -->
-      <plugin>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <executions>
-          <!-- Generate core protos -->
-          <execution>
-            <id>generate-sources</id>
-            <phase>generate-sources</phase>
-            <configuration>
-              <target>
-                <ant antfile="generate-sources-build.xml"/>
-              </target>
-            </configuration>
-            <goals>
-              <goal>run</goal>
-            </goals>
-          </execution>
-
-          <!-- Generate the test protos -->
-          <execution>
-            <id>generate-test-sources</id>
-            <phase>generate-test-sources</phase>
-            <configuration>
-              <target>
-                <ant antfile="generate-test-sources-build.xml"/>
-              </target>
-            </configuration>
-            <goals>
-              <goal>run</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-
-      <!-- Add the generated sources to the build -->
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>add-generated-sources</id>
-            <phase>generate-sources</phase>
-            <goals>
-              <goal>add-source</goal>
-            </goals>
-            <configuration>
-              <sources>
-                <source>${generated.sources.dir}</source>
-              </sources>
-            </configuration>
-          </execution>
-          <execution>
-            <id>add-generated-test-sources</id>
-            <phase>generate-test-sources</phase>
-            <goals>
-              <goal>add-test-source</goal>
-            </goals>
-            <configuration>
-              <sources>
-                <source>${generated.testsources.dir}</source>
-              </sources>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-
-      <!-- OSGI bundle configuration -->
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <extensions>true</extensions>
-        <configuration>
-          <instructions>
-            <Automatic-Module-Name>com.google.protobuf</Automatic-Module-Name> <!-- Java9+ Jigsaw module name -->
-            <Bundle-DocURL>https://developers.google.com/protocol-buffers/</Bundle-DocURL>
-            <Bundle-SymbolicName>com.google.protobuf</Bundle-SymbolicName>
-            <Export-Package>com.google.protobuf;version=${project.version}</Export-Package>
-            <Import-Package>sun.misc;resolution:=optional,*</Import-Package>
-          </instructions>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-</project>
diff --git a/libs/protobuf/java/core/pom_template.xml b/libs/protobuf/java/core/pom_template.xml
deleted file mode 100644
index 2c61281..0000000
--- a/libs/protobuf/java/core/pom_template.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>{groupId}</groupId>
-    <artifactId>protobuf-parent</artifactId>
-    <version>{version}</version>
-  </parent>
-
-  <artifactId>{artifactId}</artifactId>
-  <packaging>{type}</packaging>
-
-  <name>Protocol Buffers [Core]</name>
-  <description>
-    Core Protocol Buffers library. Protocol Buffers are a way of encoding structured data in an
-    efficient yet extensible format.
-  </description>
-</project>
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/AbstractMessage.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/AbstractMessage.java
deleted file mode 100644
index bbfb965..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/AbstractMessage.java
+++ /dev/null
@@ -1,605 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import com.google.protobuf.Descriptors.EnumValueDescriptor;
-import com.google.protobuf.Descriptors.FieldDescriptor;
-import com.google.protobuf.Descriptors.OneofDescriptor;
-import com.google.protobuf.Internal.EnumLite;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-/**
- * A partial implementation of the {@link Message} interface which implements as many methods of
- * that interface as possible in terms of other methods.
- *
- * @author kenton@google.com Kenton Varda
- */
-public abstract class AbstractMessage
-    // TODO(dweis): Update GeneratedMessage to parameterize with MessageType and BuilderType.
-    extends AbstractMessageLite implements Message {
-
-  @Override
-  public boolean isInitialized() {
-    return MessageReflection.isInitialized(this);
-  }
-
-  /**
-   * Interface for the parent of a Builder that allows the builder to communicate invalidations back
-   * to the parent for use when using nested builders.
-   */
-  protected interface BuilderParent {
-
-    /**
-     * A builder becomes dirty whenever a field is modified -- including fields in nested builders
-     * -- and becomes clean when build() is called. Thus, when a builder becomes dirty, all its
-     * parents become dirty as well, and when it becomes clean, all its children become clean. The
-     * dirtiness state is used to invalidate certain cached values.
-     *
-     * <p>To this end, a builder calls markDirty() on its parent whenever it transitions from clean
-     * to dirty. The parent must propagate this call to its own parent, unless it was already dirty,
-     * in which case the grandparent must necessarily already be dirty as well. The parent can only
-     * transition back to "clean" after calling build() on all children.
-     */
-    void markDirty();
-  }
-
-  /** Create a nested builder. */
-  protected Message.Builder newBuilderForType(BuilderParent parent) {
-    throw new UnsupportedOperationException("Nested builder is not supported for this type.");
-  }
-
-
-  @Override
-  public List<String> findInitializationErrors() {
-    return MessageReflection.findMissingFields(this);
-  }
-
-  @Override
-  public String getInitializationErrorString() {
-    return MessageReflection.delimitWithCommas(findInitializationErrors());
-  }
-
-  // TODO(jieluo): Clear it when all subclasses have implemented this method.
-  @Override
-  public boolean hasOneof(OneofDescriptor oneof) {
-    throw new UnsupportedOperationException("hasOneof() is not implemented.");
-  }
-
-  // TODO(jieluo): Clear it when all subclasses have implemented this method.
-  @Override
-  public FieldDescriptor getOneofFieldDescriptor(OneofDescriptor oneof) {
-    throw new UnsupportedOperationException("getOneofFieldDescriptor() is not implemented.");
-  }
-
-  @Override
-  public final String toString() {
-    return TextFormat.printer().printToString(this);
-  }
-
-  @Override
-  public void writeTo(final CodedOutputStream output) throws IOException {
-    MessageReflection.writeMessageTo(this, getAllFields(), output, false);
-  }
-
-  protected int memoizedSize = -1;
-
-  @Override
-  int getMemoizedSerializedSize() {
-    return memoizedSize;
-  }
-
-  @Override
-  void setMemoizedSerializedSize(int size) {
-    memoizedSize = size;
-  }
-
-  @Override
-  public int getSerializedSize() {
-    int size = memoizedSize;
-    if (size != -1) {
-      return size;
-    }
-
-    memoizedSize = MessageReflection.getSerializedSize(this, getAllFields());
-    return memoizedSize;
-  }
-
-  @Override
-  public boolean equals(final Object other) {
-    if (other == this) {
-      return true;
-    }
-    if (!(other instanceof Message)) {
-      return false;
-    }
-    final Message otherMessage = (Message) other;
-    if (getDescriptorForType() != otherMessage.getDescriptorForType()) {
-      return false;
-    }
-    return compareFields(getAllFields(), otherMessage.getAllFields())
-        && getUnknownFields().equals(otherMessage.getUnknownFields());
-  }
-
-  @Override
-  public int hashCode() {
-    int hash = memoizedHashCode;
-    if (hash == 0) {
-      hash = 41;
-      hash = (19 * hash) + getDescriptorForType().hashCode();
-      hash = hashFields(hash, getAllFields());
-      hash = (29 * hash) + getUnknownFields().hashCode();
-      memoizedHashCode = hash;
-    }
-    return hash;
-  }
-
-  private static ByteString toByteString(Object value) {
-    if (value instanceof byte[]) {
-      return ByteString.copyFrom((byte[]) value);
-    } else {
-      return (ByteString) value;
-    }
-  }
-
-  /**
-   * Compares two bytes fields. The parameters must be either a byte array or a ByteString object.
-   * They can be of different type though.
-   */
-  private static boolean compareBytes(Object a, Object b) {
-    if (a instanceof byte[] && b instanceof byte[]) {
-      return Arrays.equals((byte[]) a, (byte[]) b);
-    }
-    return toByteString(a).equals(toByteString(b));
-  }
-
-  /** Converts a list of MapEntry messages into a Map used for equals() and hashCode(). */
-  @SuppressWarnings({"rawtypes", "unchecked"})
-  private static Map convertMapEntryListToMap(List list) {
-    if (list.isEmpty()) {
-      return Collections.emptyMap();
-    }
-    Map result = new HashMap<>();
-    Iterator iterator = list.iterator();
-    Message entry = (Message) iterator.next();
-    Descriptors.Descriptor descriptor = entry.getDescriptorForType();
-    Descriptors.FieldDescriptor key = descriptor.findFieldByName("key");
-    Descriptors.FieldDescriptor value = descriptor.findFieldByName("value");
-    Object fieldValue = entry.getField(value);
-    if (fieldValue instanceof EnumValueDescriptor) {
-      fieldValue = ((EnumValueDescriptor) fieldValue).getNumber();
-    }
-    result.put(entry.getField(key), fieldValue);
-    while (iterator.hasNext()) {
-      entry = (Message) iterator.next();
-      fieldValue = entry.getField(value);
-      if (fieldValue instanceof EnumValueDescriptor) {
-        fieldValue = ((EnumValueDescriptor) fieldValue).getNumber();
-      }
-      result.put(entry.getField(key), fieldValue);
-    }
-    return result;
-  }
-
-  /** Compares two map fields. The parameters must be a list of MapEntry messages. */
-  @SuppressWarnings({"rawtypes", "unchecked"})
-  private static boolean compareMapField(Object a, Object b) {
-    Map ma = convertMapEntryListToMap((List) a);
-    Map mb = convertMapEntryListToMap((List) b);
-    return MapFieldLite.equals(ma, mb);
-  }
-
-  /**
-   * Compares two sets of fields. This method is used to implement {@link
-   * AbstractMessage#equals(Object)} and {@link AbstractMutableMessage#equals(Object)}. It takes
-   * special care of bytes fields because immutable messages and mutable messages use different Java
-   * type to represent a bytes field and this method should be able to compare immutable messages,
-   * mutable messages and also an immutable message to a mutable message.
-   */
-  static boolean compareFields(Map<FieldDescriptor, Object> a, Map<FieldDescriptor, Object> b) {
-    if (a.size() != b.size()) {
-      return false;
-    }
-    for (FieldDescriptor descriptor : a.keySet()) {
-      if (!b.containsKey(descriptor)) {
-        return false;
-      }
-      Object value1 = a.get(descriptor);
-      Object value2 = b.get(descriptor);
-      if (descriptor.getType() == FieldDescriptor.Type.BYTES) {
-        if (descriptor.isRepeated()) {
-          List<?> list1 = (List) value1;
-          List<?> list2 = (List) value2;
-          if (list1.size() != list2.size()) {
-            return false;
-          }
-          for (int i = 0; i < list1.size(); i++) {
-            if (!compareBytes(list1.get(i), list2.get(i))) {
-              return false;
-            }
-          }
-        } else {
-          // Compares a singular bytes field.
-          if (!compareBytes(value1, value2)) {
-            return false;
-          }
-        }
-      } else if (descriptor.isMapField()) {
-        if (!compareMapField(value1, value2)) {
-          return false;
-        }
-      } else {
-        // Compare non-bytes fields.
-        if (!value1.equals(value2)) {
-          return false;
-        }
-      }
-    }
-    return true;
-  }
-
-  /** Calculates the hash code of a map field. {@code value} must be a list of MapEntry messages. */
-  @SuppressWarnings("unchecked")
-  private static int hashMapField(Object value) {
-    return MapFieldLite.calculateHashCodeForMap(convertMapEntryListToMap((List) value));
-  }
-
-  /** Get a hash code for given fields and values, using the given seed. */
-  @SuppressWarnings("unchecked")
-  protected static int hashFields(int hash, Map<FieldDescriptor, Object> map) {
-    for (Map.Entry<FieldDescriptor, Object> entry : map.entrySet()) {
-      FieldDescriptor field = entry.getKey();
-      Object value = entry.getValue();
-      hash = (37 * hash) + field.getNumber();
-      if (field.isMapField()) {
-        hash = (53 * hash) + hashMapField(value);
-      } else if (field.getType() != FieldDescriptor.Type.ENUM) {
-        hash = (53 * hash) + value.hashCode();
-      } else if (field.isRepeated()) {
-        List<? extends EnumLite> list = (List<? extends EnumLite>) value;
-        hash = (53 * hash) + Internal.hashEnumList(list);
-      } else {
-        hash = (53 * hash) + Internal.hashEnum((EnumLite) value);
-      }
-    }
-    return hash;
-  }
-
-  /**
-   * Package private helper method for AbstractParser to create UninitializedMessageException with
-   * missing field information.
-   */
-  @Override
-  UninitializedMessageException newUninitializedMessageException() {
-    return Builder.newUninitializedMessageException(this);
-  }
-
-  // =================================================================
-
-  /**
-   * A partial implementation of the {@link Message.Builder} interface which implements as many
-   * methods of that interface as possible in terms of other methods.
-   */
-  @SuppressWarnings("unchecked")
-  public abstract static class Builder<BuilderType extends Builder<BuilderType>>
-      extends AbstractMessageLite.Builder implements Message.Builder {
-    // The compiler produces an error if this is not declared explicitly.
-    // Method isn't abstract to bypass Java 1.6 compiler issue:
-    //     http://bugs.java.com/view_bug.do?bug_id=6908259
-    @Override
-    public BuilderType clone() {
-      throw new UnsupportedOperationException("clone() should be implemented in subclasses.");
-    }
-
-    /** TODO(jieluo): Clear it when all subclasses have implemented this method. */
-    @Override
-    public boolean hasOneof(OneofDescriptor oneof) {
-      throw new UnsupportedOperationException("hasOneof() is not implemented.");
-    }
-
-    /** TODO(jieluo): Clear it when all subclasses have implemented this method. */
-    @Override
-    public FieldDescriptor getOneofFieldDescriptor(OneofDescriptor oneof) {
-      throw new UnsupportedOperationException("getOneofFieldDescriptor() is not implemented.");
-    }
-
-    /** TODO(jieluo): Clear it when all subclasses have implemented this method. */
-    @Override
-    public BuilderType clearOneof(OneofDescriptor oneof) {
-      throw new UnsupportedOperationException("clearOneof() is not implemented.");
-    }
-
-    @Override
-    public BuilderType clear() {
-      for (final Map.Entry<FieldDescriptor, Object> entry : getAllFields().entrySet()) {
-        clearField(entry.getKey());
-      }
-      return (BuilderType) this;
-    }
-
-    @Override
-    public List<String> findInitializationErrors() {
-      return MessageReflection.findMissingFields(this);
-    }
-
-    @Override
-    public String getInitializationErrorString() {
-      return MessageReflection.delimitWithCommas(findInitializationErrors());
-    }
-
-    @Override
-    protected BuilderType internalMergeFrom(AbstractMessageLite other) {
-      return mergeFrom((Message) other);
-    }
-
-    @Override
-    public BuilderType mergeFrom(final Message other) {
-      return mergeFrom(other, other.getAllFields());
-    }
-
-    BuilderType mergeFrom(final Message other, Map<FieldDescriptor, Object> allFields) {
-      if (other.getDescriptorForType() != getDescriptorForType()) {
-        throw new IllegalArgumentException(
-            "mergeFrom(Message) can only merge messages of the same type.");
-      }
-
-      // Note:  We don't attempt to verify that other's fields have valid
-      //   types.  Doing so would be a losing battle.  We'd have to verify
-      //   all sub-messages as well, and we'd have to make copies of all of
-      //   them to insure that they don't change after verification (since
-      //   the Message interface itself cannot enforce immutability of
-      //   implementations).
-
-      for (final Map.Entry<FieldDescriptor, Object> entry : allFields.entrySet()) {
-        final FieldDescriptor field = entry.getKey();
-        if (field.isRepeated()) {
-          for (final Object element : (List) entry.getValue()) {
-            addRepeatedField(field, element);
-          }
-        } else if (field.getJavaType() == FieldDescriptor.JavaType.MESSAGE) {
-          final Message existingValue = (Message) getField(field);
-          if (existingValue == existingValue.getDefaultInstanceForType()) {
-            setField(field, entry.getValue());
-          } else {
-            setField(
-                field,
-                existingValue
-                    .newBuilderForType()
-                    .mergeFrom(existingValue)
-                    .mergeFrom((Message) entry.getValue())
-                    .build());
-          }
-        } else {
-          setField(field, entry.getValue());
-        }
-      }
-
-      mergeUnknownFields(other.getUnknownFields());
-
-      return (BuilderType) this;
-    }
-
-    @Override
-    public BuilderType mergeFrom(final CodedInputStream input) throws IOException {
-      return mergeFrom(input, ExtensionRegistry.getEmptyRegistry());
-    }
-
-    @Override
-    public BuilderType mergeFrom(
-        final CodedInputStream input, final ExtensionRegistryLite extensionRegistry)
-        throws IOException {
-      boolean discardUnknown = input.shouldDiscardUnknownFields();
-      final UnknownFieldSet.Builder unknownFields =
-          discardUnknown ? null : getUnknownFieldSetBuilder();
-      MessageReflection.mergeMessageFrom(this, unknownFields, input, extensionRegistry);
-      if (unknownFields != null) {
-        setUnknownFieldSetBuilder(unknownFields);
-      }
-      return (BuilderType) this;
-    }
-
-    protected UnknownFieldSet.Builder getUnknownFieldSetBuilder() {
-      return UnknownFieldSet.newBuilder(getUnknownFields());
-    }
-
-    protected void setUnknownFieldSetBuilder(final UnknownFieldSet.Builder builder) {
-      setUnknownFields(builder.build());
-    }
-
-    @Override
-    public BuilderType mergeUnknownFields(final UnknownFieldSet unknownFields) {
-      setUnknownFields(
-          UnknownFieldSet.newBuilder(getUnknownFields()).mergeFrom(unknownFields).build());
-      return (BuilderType) this;
-    }
-
-    @Override
-    public Message.Builder getFieldBuilder(final FieldDescriptor field) {
-      throw new UnsupportedOperationException(
-          "getFieldBuilder() called on an unsupported message type.");
-    }
-
-    @Override
-    public Message.Builder getRepeatedFieldBuilder(final FieldDescriptor field, int index) {
-      throw new UnsupportedOperationException(
-          "getRepeatedFieldBuilder() called on an unsupported message type.");
-    }
-
-    @Override
-    public String toString() {
-      return TextFormat.printer().printToString(this);
-    }
-
-    /** Construct an UninitializedMessageException reporting missing fields in the given message. */
-    protected static UninitializedMessageException newUninitializedMessageException(
-        Message message) {
-      return new UninitializedMessageException(MessageReflection.findMissingFields(message));
-    }
-
-    /**
-     * Used to support nested builders and called to mark this builder as clean. Clean builders will
-     * propagate the {@link BuilderParent#markDirty()} event to their parent builders, while dirty
-     * builders will not, as their parents should be dirty already.
-     *
-     * <p>NOTE: Implementations that don't support nested builders don't need to override this
-     * method.
-     */
-    void markClean() {
-      throw new IllegalStateException("Should be overridden by subclasses.");
-    }
-
-    /**
-     * Used to support nested builders and called when this nested builder is no longer used by its
-     * parent builder and should release the reference to its parent builder.
-     *
-     * <p>NOTE: Implementations that don't support nested builders don't need to override this
-     * method.
-     */
-    void dispose() {
-      throw new IllegalStateException("Should be overridden by subclasses.");
-    }
-
-    // ===============================================================
-    // The following definitions seem to be required in order to make javac
-    // not produce weird errors like:
-    //
-    // java/com/google/protobuf/DynamicMessage.java:203: types
-    //   com.google.protobuf.AbstractMessage.Builder<
-    //     com.google.protobuf.DynamicMessage.Builder> and
-    //   com.google.protobuf.AbstractMessage.Builder<
-    //     com.google.protobuf.DynamicMessage.Builder> are incompatible; both
-    //   define mergeFrom(com.google.protobuf.ByteString), but with unrelated
-    //   return types.
-    //
-    // Strangely, these lines are only needed if javac is invoked separately
-    // on AbstractMessage.java and AbstractMessageLite.java.  If javac is
-    // invoked on both simultaneously, it works.  (Or maybe the important
-    // point is whether or not DynamicMessage.java is compiled together with
-    // AbstractMessageLite.java -- not sure.)  I suspect this is a compiler
-    // bug.
-
-    @Override
-    public BuilderType mergeFrom(final ByteString data) throws InvalidProtocolBufferException {
-      return (BuilderType) super.mergeFrom(data);
-    }
-
-    @Override
-    public BuilderType mergeFrom(
-        final ByteString data, final ExtensionRegistryLite extensionRegistry)
-        throws InvalidProtocolBufferException {
-      return (BuilderType) super.mergeFrom(data, extensionRegistry);
-    }
-
-    @Override
-    public BuilderType mergeFrom(final byte[] data) throws InvalidProtocolBufferException {
-      return (BuilderType) super.mergeFrom(data);
-    }
-
-    @Override
-    public BuilderType mergeFrom(final byte[] data, final int off, final int len)
-        throws InvalidProtocolBufferException {
-      return (BuilderType) super.mergeFrom(data, off, len);
-    }
-
-    @Override
-    public BuilderType mergeFrom(final byte[] data, final ExtensionRegistryLite extensionRegistry)
-        throws InvalidProtocolBufferException {
-      return (BuilderType) super.mergeFrom(data, extensionRegistry);
-    }
-
-    @Override
-    public BuilderType mergeFrom(
-        final byte[] data,
-        final int off,
-        final int len,
-        final ExtensionRegistryLite extensionRegistry)
-        throws InvalidProtocolBufferException {
-      return (BuilderType) super.mergeFrom(data, off, len, extensionRegistry);
-    }
-
-    @Override
-    public BuilderType mergeFrom(final InputStream input) throws IOException {
-      return (BuilderType) super.mergeFrom(input);
-    }
-
-    @Override
-    public BuilderType mergeFrom(
-        final InputStream input, final ExtensionRegistryLite extensionRegistry) throws IOException {
-      return (BuilderType) super.mergeFrom(input, extensionRegistry);
-    }
-  }
-
-  /**
-   * @deprecated from v3.0.0-beta-3+, for compatibility with v2.5.0 and v2.6.1
-   * generated code.
-   */
-  @Deprecated
-  protected static int hashLong(long n) {
-    return (int) (n ^ (n >>> 32));
-  }
-  //
-  /**
-   * @deprecated from v3.0.0-beta-3+, for compatibility with v2.5.0 and v2.6.1
-   * generated code.
-   */
-  @Deprecated
-  protected static int hashBoolean(boolean b) {
-    return b ? 1231 : 1237;
-  }
-  //
-  /**
-   * @deprecated from v3.0.0-beta-3+, for compatibility with v2.5.0 and v2.6.1
-   * generated code.
-   */
-  @Deprecated
-  protected static int hashEnum(EnumLite e) {
-    return e.getNumber();
-  }
-  //
-  /**
-   * @deprecated from v3.0.0-beta-3+, for compatibility with v2.5.0 and v2.6.1
-   * generated code.
-   */
-  @Deprecated
-  protected static int hashEnumList(List<? extends EnumLite> list) {
-    int hash = 1;
-    for (EnumLite e : list) {
-      hash = 31 * hash + hashEnum(e);
-    }
-    return hash;
-  }
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/AbstractMessageLite.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/AbstractMessageLite.java
deleted file mode 100644
index 7ad2a85..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/AbstractMessageLite.java
+++ /dev/null
@@ -1,442 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.protobuf.Internal.checkNotNull;
-
-import java.io.FilterInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-/**
- * A partial implementation of the {@link MessageLite} interface which implements as many methods of
- * that interface as possible in terms of other methods.
- *
- * @author kenton@google.com Kenton Varda
- */
-public abstract class AbstractMessageLite<
-        MessageType extends AbstractMessageLite<MessageType, BuilderType>,
-        BuilderType extends AbstractMessageLite.Builder<MessageType, BuilderType>>
-    implements MessageLite {
-  protected int memoizedHashCode = 0;
-
-  @Override
-  public ByteString toByteString() {
-    try {
-      final ByteString.CodedBuilder out = ByteString.newCodedBuilder(getSerializedSize());
-      writeTo(out.getCodedOutput());
-      return out.build();
-    } catch (IOException e) {
-      throw new RuntimeException(getSerializingExceptionMessage("ByteString"), e);
-    }
-  }
-
-  @Override
-  public byte[] toByteArray() {
-    try {
-      final byte[] result = new byte[getSerializedSize()];
-      final CodedOutputStream output = CodedOutputStream.newInstance(result);
-      writeTo(output);
-      output.checkNoSpaceLeft();
-      return result;
-    } catch (IOException e) {
-      throw new RuntimeException(getSerializingExceptionMessage("byte array"), e);
-    }
-  }
-
-  @Override
-  public void writeTo(final OutputStream output) throws IOException {
-    final int bufferSize = CodedOutputStream.computePreferredBufferSize(getSerializedSize());
-    final CodedOutputStream codedOutput = CodedOutputStream.newInstance(output, bufferSize);
-    writeTo(codedOutput);
-    codedOutput.flush();
-  }
-
-  @Override
-  public void writeDelimitedTo(final OutputStream output) throws IOException {
-    final int serialized = getSerializedSize();
-    final int bufferSize =
-        CodedOutputStream.computePreferredBufferSize(
-            CodedOutputStream.computeUInt32SizeNoTag(serialized) + serialized);
-    final CodedOutputStream codedOutput = CodedOutputStream.newInstance(output, bufferSize);
-    codedOutput.writeUInt32NoTag(serialized);
-    writeTo(codedOutput);
-    codedOutput.flush();
-  }
-
-  // We'd like these to be abstract but some folks are extending this class directly. They shouldn't
-  // be doing that and they should feel bad.
-  int getMemoizedSerializedSize() {
-    throw new UnsupportedOperationException();
-  }
-
-  void setMemoizedSerializedSize(int size) {
-    throw new UnsupportedOperationException();
-  }
-
-
-  int getSerializedSize(Schema schema) {
-    int memoizedSerializedSize = getMemoizedSerializedSize();
-    if (memoizedSerializedSize == -1) {
-      memoizedSerializedSize = schema.getSerializedSize(this);
-      setMemoizedSerializedSize(memoizedSerializedSize);
-    }
-    return memoizedSerializedSize;
-  }
-
-  /** Package private helper method for AbstractParser to create UninitializedMessageException. */
-  UninitializedMessageException newUninitializedMessageException() {
-    return new UninitializedMessageException(this);
-  }
-
-  private String getSerializingExceptionMessage(String target) {
-    return "Serializing "
-        + getClass().getName()
-        + " to a "
-        + target
-        + " threw an IOException (should never happen).";
-  }
-
-  protected static void checkByteStringIsUtf8(ByteString byteString)
-      throws IllegalArgumentException {
-    if (!byteString.isValidUtf8()) {
-      throw new IllegalArgumentException("Byte string is not UTF-8.");
-    }
-  }
-
-  // For binary compatibility
-  @Deprecated
-  protected static <T> void addAll(final Iterable<T> values, final Collection<? super T> list) {
-    Builder.addAll(values, (List) list);
-  }
-
-  protected static <T> void addAll(final Iterable<T> values, final List<? super T> list) {
-    Builder.addAll(values, list);
-  }
-
-  /** Interface for an enum which signifies which field in a {@code oneof} was specified. */
-  protected interface InternalOneOfEnum {
-    /**
-     * Retrieves the field number of the field which was set in this {@code oneof}, or {@code 0} if
-     * none were.
-     */
-    int getNumber();
-  }
-
-  /**
-   * A partial implementation of the {@link Message.Builder} interface which implements as many
-   * methods of that interface as possible in terms of other methods.
-   */
-  @SuppressWarnings("unchecked")
-  public abstract static class Builder<
-          MessageType extends AbstractMessageLite<MessageType, BuilderType>,
-          BuilderType extends Builder<MessageType, BuilderType>>
-      implements MessageLite.Builder {
-    // The compiler produces an error if this is not declared explicitly.
-    @Override
-    public abstract BuilderType clone();
-
-    @Override
-    public BuilderType mergeFrom(final CodedInputStream input) throws IOException {
-      return mergeFrom(input, ExtensionRegistryLite.getEmptyRegistry());
-    }
-
-    // Re-defined here for return type covariance.
-    @Override
-    public abstract BuilderType mergeFrom(
-        final CodedInputStream input, final ExtensionRegistryLite extensionRegistry)
-        throws IOException;
-
-    @Override
-    public BuilderType mergeFrom(final ByteString data) throws InvalidProtocolBufferException {
-      try {
-        final CodedInputStream input = data.newCodedInput();
-        mergeFrom(input);
-        input.checkLastTagWas(0);
-        return (BuilderType) this;
-      } catch (InvalidProtocolBufferException e) {
-        throw e;
-      } catch (IOException e) {
-        throw new RuntimeException(getReadingExceptionMessage("ByteString"), e);
-      }
-    }
-
-    @Override
-    public BuilderType mergeFrom(
-        final ByteString data, final ExtensionRegistryLite extensionRegistry)
-        throws InvalidProtocolBufferException {
-      try {
-        final CodedInputStream input = data.newCodedInput();
-        mergeFrom(input, extensionRegistry);
-        input.checkLastTagWas(0);
-        return (BuilderType) this;
-      } catch (InvalidProtocolBufferException e) {
-        throw e;
-      } catch (IOException e) {
-        throw new RuntimeException(getReadingExceptionMessage("ByteString"), e);
-      }
-    }
-
-    @Override
-    public BuilderType mergeFrom(final byte[] data) throws InvalidProtocolBufferException {
-      return mergeFrom(data, 0, data.length);
-    }
-
-    @Override
-    public BuilderType mergeFrom(final byte[] data, final int off, final int len)
-        throws InvalidProtocolBufferException {
-      try {
-        final CodedInputStream input = CodedInputStream.newInstance(data, off, len);
-        mergeFrom(input);
-        input.checkLastTagWas(0);
-        return (BuilderType) this;
-      } catch (InvalidProtocolBufferException e) {
-        throw e;
-      } catch (IOException e) {
-        throw new RuntimeException(getReadingExceptionMessage("byte array"), e);
-      }
-    }
-
-    @Override
-    public BuilderType mergeFrom(final byte[] data, final ExtensionRegistryLite extensionRegistry)
-        throws InvalidProtocolBufferException {
-      return mergeFrom(data, 0, data.length, extensionRegistry);
-    }
-
-    @Override
-    public BuilderType mergeFrom(
-        final byte[] data,
-        final int off,
-        final int len,
-        final ExtensionRegistryLite extensionRegistry)
-        throws InvalidProtocolBufferException {
-      try {
-        final CodedInputStream input = CodedInputStream.newInstance(data, off, len);
-        mergeFrom(input, extensionRegistry);
-        input.checkLastTagWas(0);
-        return (BuilderType) this;
-      } catch (InvalidProtocolBufferException e) {
-        throw e;
-      } catch (IOException e) {
-        throw new RuntimeException(getReadingExceptionMessage("byte array"), e);
-      }
-    }
-
-    @Override
-    public BuilderType mergeFrom(final InputStream input) throws IOException {
-      final CodedInputStream codedInput = CodedInputStream.newInstance(input);
-      mergeFrom(codedInput);
-      codedInput.checkLastTagWas(0);
-      return (BuilderType) this;
-    }
-
-    @Override
-    public BuilderType mergeFrom(
-        final InputStream input, final ExtensionRegistryLite extensionRegistry) throws IOException {
-      final CodedInputStream codedInput = CodedInputStream.newInstance(input);
-      mergeFrom(codedInput, extensionRegistry);
-      codedInput.checkLastTagWas(0);
-      return (BuilderType) this;
-    }
-
-    /**
-     * An InputStream implementations which reads from some other InputStream but is limited to a
-     * particular number of bytes. Used by mergeDelimitedFrom(). This is intentionally
-     * package-private so that UnknownFieldSet can share it.
-     */
-    static final class LimitedInputStream extends FilterInputStream {
-      private int limit;
-
-      LimitedInputStream(InputStream in, int limit) {
-        super(in);
-        this.limit = limit;
-      }
-
-      @Override
-      public int available() throws IOException {
-        return Math.min(super.available(), limit);
-      }
-
-      @Override
-      public int read() throws IOException {
-        if (limit <= 0) {
-          return -1;
-        }
-        final int result = super.read();
-        if (result >= 0) {
-          --limit;
-        }
-        return result;
-      }
-
-      @Override
-      public int read(final byte[] b, final int off, int len) throws IOException {
-        if (limit <= 0) {
-          return -1;
-        }
-        len = Math.min(len, limit);
-        final int result = super.read(b, off, len);
-        if (result >= 0) {
-          limit -= result;
-        }
-        return result;
-      }
-
-      @Override
-      public long skip(final long n) throws IOException {
-        // because we take the minimum of an int and a long, result is guaranteed to be
-        // less than or equal to Integer.MAX_INT so this cast is safe
-        int result = (int) super.skip(Math.min(n, limit));
-        if (result >= 0) {
-          // if the superclass adheres to the contract for skip, this condition is always true
-          limit -= result;
-        }
-        return result;
-      }
-    }
-
-    @Override
-    public boolean mergeDelimitedFrom(
-        final InputStream input, final ExtensionRegistryLite extensionRegistry) throws IOException {
-      final int firstByte = input.read();
-      if (firstByte == -1) {
-        return false;
-      }
-      final int size = CodedInputStream.readRawVarint32(firstByte, input);
-      final InputStream limitedInput = new LimitedInputStream(input, size);
-      mergeFrom(limitedInput, extensionRegistry);
-      return true;
-    }
-
-    @Override
-    public boolean mergeDelimitedFrom(final InputStream input) throws IOException {
-      return mergeDelimitedFrom(input, ExtensionRegistryLite.getEmptyRegistry());
-    }
-
-    @Override
-    @SuppressWarnings("unchecked") // isInstance takes care of this
-    public BuilderType mergeFrom(final MessageLite other) {
-      if (!getDefaultInstanceForType().getClass().isInstance(other)) {
-        throw new IllegalArgumentException(
-            "mergeFrom(MessageLite) can only merge messages of the same type.");
-      }
-
-      return internalMergeFrom((MessageType) other);
-    }
-
-    protected abstract BuilderType internalMergeFrom(MessageType message);
-
-    private String getReadingExceptionMessage(String target) {
-      return "Reading "
-          + getClass().getName()
-          + " from a "
-          + target
-          + " threw an IOException (should never happen).";
-    }
-
-    // We check nulls as we iterate to avoid iterating over values twice.
-    private static <T> void addAllCheckingNulls(Iterable<T> values, List<? super T> list) {
-      if (list instanceof ArrayList && values instanceof Collection) {
-        ((ArrayList<T>) list).ensureCapacity(list.size() + ((Collection<T>) values).size());
-      }
-      int begin = list.size();
-      for (T value : values) {
-        if (value == null) {
-          // encountered a null value so we must undo our modifications prior to throwing
-          String message = "Element at index " + (list.size() - begin) + " is null.";
-          for (int i = list.size() - 1; i >= begin; i--) {
-            list.remove(i);
-          }
-          throw new NullPointerException(message);
-        }
-        list.add(value);
-      }
-    }
-
-    /** Construct an UninitializedMessageException reporting missing fields in the given message. */
-    protected static UninitializedMessageException newUninitializedMessageException(
-        MessageLite message) {
-      return new UninitializedMessageException(message);
-    }
-
-    // For binary compatibility.
-    @Deprecated
-    protected static <T> void addAll(final Iterable<T> values, final Collection<? super T> list) {
-      addAll(values, (List<T>) list);
-    }
-
-    /**
-     * Adds the {@code values} to the {@code list}. This is a helper method used by generated code.
-     * Users should ignore it.
-     *
-     * @throws NullPointerException if {@code values} or any of the elements of {@code values} is
-     *     null.
-     */
-    protected static <T> void addAll(final Iterable<T> values, final List<? super T> list) {
-      checkNotNull(values);
-      if (values instanceof LazyStringList) {
-        // For StringOrByteStringLists, check the underlying elements to avoid
-        // forcing conversions of ByteStrings to Strings.
-        // TODO(dweis): Could we just prohibit nulls in all protobuf lists and get rid of this? Is
-        // if even possible to hit this condition as all protobuf methods check for null first,
-        // right?
-        List<?> lazyValues = ((LazyStringList) values).getUnderlyingElements();
-        LazyStringList lazyList = (LazyStringList) list;
-        int begin = list.size();
-        for (Object value : lazyValues) {
-          if (value == null) {
-            // encountered a null value so we must undo our modifications prior to throwing
-            String message = "Element at index " + (lazyList.size() - begin) + " is null.";
-            for (int i = lazyList.size() - 1; i >= begin; i--) {
-              lazyList.remove(i);
-            }
-            throw new NullPointerException(message);
-          }
-          if (value instanceof ByteString) {
-            lazyList.add((ByteString) value);
-          } else {
-            lazyList.add((String) value);
-          }
-        }
-      } else {
-        if (values instanceof PrimitiveNonBoxingCollection) {
-          list.addAll((Collection<T>) values);
-        } else {
-          addAllCheckingNulls(values, list);
-        }
-      }
-    }
-  }
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/AbstractParser.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/AbstractParser.java
deleted file mode 100644
index abfaca8..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/AbstractParser.java
+++ /dev/null
@@ -1,274 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import com.google.protobuf.AbstractMessageLite.Builder.LimitedInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.ByteBuffer;
-
-/**
- * A partial implementation of the {@link Parser} interface which implements as many methods of that
- * interface as possible in terms of other methods.
- *
- * <p>Note: This class implements all the convenience methods in the {@link Parser} interface. See
- * {@link Parser} for related javadocs. Subclasses need to implement {@link
- * Parser#parsePartialFrom(CodedInputStream, ExtensionRegistryLite)}
- *
- * @author liujisi@google.com (Pherl Liu)
- */
-public abstract class AbstractParser<MessageType extends MessageLite>
-    implements Parser<MessageType> {
-  /** Creates an UninitializedMessageException for MessageType. */
-  private UninitializedMessageException newUninitializedMessageException(MessageType message) {
-    if (message instanceof AbstractMessageLite) {
-      return ((AbstractMessageLite) message).newUninitializedMessageException();
-    }
-    return new UninitializedMessageException(message);
-  }
-
-  /**
-   * Helper method to check if message is initialized.
-   *
-   * @throws InvalidProtocolBufferException if it is not initialized.
-   * @return The message to check.
-   */
-  private MessageType checkMessageInitialized(MessageType message)
-      throws InvalidProtocolBufferException {
-    if (message != null && !message.isInitialized()) {
-      throw newUninitializedMessageException(message)
-          .asInvalidProtocolBufferException()
-          .setUnfinishedMessage(message);
-    }
-    return message;
-  }
-
-  private static final ExtensionRegistryLite EMPTY_REGISTRY =
-      ExtensionRegistryLite.getEmptyRegistry();
-
-  @Override
-  public MessageType parsePartialFrom(CodedInputStream input)
-      throws InvalidProtocolBufferException {
-    return parsePartialFrom(input, EMPTY_REGISTRY);
-  }
-
-  @Override
-  public MessageType parseFrom(CodedInputStream input, ExtensionRegistryLite extensionRegistry)
-      throws InvalidProtocolBufferException {
-    return checkMessageInitialized(parsePartialFrom(input, extensionRegistry));
-  }
-
-  @Override
-  public MessageType parseFrom(CodedInputStream input) throws InvalidProtocolBufferException {
-    return parseFrom(input, EMPTY_REGISTRY);
-  }
-
-  @Override
-  public MessageType parsePartialFrom(ByteString data, ExtensionRegistryLite extensionRegistry)
-      throws InvalidProtocolBufferException {
-    MessageType message;
-    try {
-      CodedInputStream input = data.newCodedInput();
-      message = parsePartialFrom(input, extensionRegistry);
-      try {
-        input.checkLastTagWas(0);
-      } catch (InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(message);
-      }
-      return message;
-    } catch (InvalidProtocolBufferException e) {
-      throw e;
-    }
-  }
-
-  @Override
-  public MessageType parsePartialFrom(ByteString data) throws InvalidProtocolBufferException {
-    return parsePartialFrom(data, EMPTY_REGISTRY);
-  }
-
-  @Override
-  public MessageType parseFrom(ByteString data, ExtensionRegistryLite extensionRegistry)
-      throws InvalidProtocolBufferException {
-    return checkMessageInitialized(parsePartialFrom(data, extensionRegistry));
-  }
-
-  @Override
-  public MessageType parseFrom(ByteString data) throws InvalidProtocolBufferException {
-    return parseFrom(data, EMPTY_REGISTRY);
-  }
-
-  @Override
-  public MessageType parseFrom(ByteBuffer data, ExtensionRegistryLite extensionRegistry)
-      throws InvalidProtocolBufferException {
-    MessageType message;
-    try {
-      CodedInputStream input = CodedInputStream.newInstance(data);
-      message = parsePartialFrom(input, extensionRegistry);
-      try {
-        input.checkLastTagWas(0);
-      } catch (InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(message);
-      }
-    } catch (InvalidProtocolBufferException e) {
-      throw e;
-    }
-
-    return checkMessageInitialized(message);
-  }
-
-  @Override
-  public MessageType parseFrom(ByteBuffer data) throws InvalidProtocolBufferException {
-    return parseFrom(data, EMPTY_REGISTRY);
-  }
-
-  @Override
-  public MessageType parsePartialFrom(
-      byte[] data, int off, int len, ExtensionRegistryLite extensionRegistry)
-      throws InvalidProtocolBufferException {
-    try {
-      CodedInputStream input = CodedInputStream.newInstance(data, off, len);
-      MessageType message = parsePartialFrom(input, extensionRegistry);
-      try {
-        input.checkLastTagWas(0);
-      } catch (InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(message);
-      }
-      return message;
-    } catch (InvalidProtocolBufferException e) {
-      throw e;
-    }
-  }
-
-  @Override
-  public MessageType parsePartialFrom(byte[] data, int off, int len)
-      throws InvalidProtocolBufferException {
-    return parsePartialFrom(data, off, len, EMPTY_REGISTRY);
-  }
-
-  @Override
-  public MessageType parsePartialFrom(byte[] data, ExtensionRegistryLite extensionRegistry)
-      throws InvalidProtocolBufferException {
-    return parsePartialFrom(data, 0, data.length, extensionRegistry);
-  }
-
-  @Override
-  public MessageType parsePartialFrom(byte[] data) throws InvalidProtocolBufferException {
-    return parsePartialFrom(data, 0, data.length, EMPTY_REGISTRY);
-  }
-
-  @Override
-  public MessageType parseFrom(
-      byte[] data, int off, int len, ExtensionRegistryLite extensionRegistry)
-      throws InvalidProtocolBufferException {
-    return checkMessageInitialized(parsePartialFrom(data, off, len, extensionRegistry));
-  }
-
-  @Override
-  public MessageType parseFrom(byte[] data, int off, int len)
-      throws InvalidProtocolBufferException {
-    return parseFrom(data, off, len, EMPTY_REGISTRY);
-  }
-
-  @Override
-  public MessageType parseFrom(byte[] data, ExtensionRegistryLite extensionRegistry)
-      throws InvalidProtocolBufferException {
-    return parseFrom(data, 0, data.length, extensionRegistry);
-  }
-
-  @Override
-  public MessageType parseFrom(byte[] data) throws InvalidProtocolBufferException {
-    return parseFrom(data, EMPTY_REGISTRY);
-  }
-
-  @Override
-  public MessageType parsePartialFrom(InputStream input, ExtensionRegistryLite extensionRegistry)
-      throws InvalidProtocolBufferException {
-    CodedInputStream codedInput = CodedInputStream.newInstance(input);
-    MessageType message = parsePartialFrom(codedInput, extensionRegistry);
-    try {
-      codedInput.checkLastTagWas(0);
-    } catch (InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(message);
-    }
-    return message;
-  }
-
-  @Override
-  public MessageType parsePartialFrom(InputStream input) throws InvalidProtocolBufferException {
-    return parsePartialFrom(input, EMPTY_REGISTRY);
-  }
-
-  @Override
-  public MessageType parseFrom(InputStream input, ExtensionRegistryLite extensionRegistry)
-      throws InvalidProtocolBufferException {
-    return checkMessageInitialized(parsePartialFrom(input, extensionRegistry));
-  }
-
-  @Override
-  public MessageType parseFrom(InputStream input) throws InvalidProtocolBufferException {
-    return parseFrom(input, EMPTY_REGISTRY);
-  }
-
-  @Override
-  public MessageType parsePartialDelimitedFrom(
-      InputStream input, ExtensionRegistryLite extensionRegistry)
-      throws InvalidProtocolBufferException {
-    int size;
-    try {
-      int firstByte = input.read();
-      if (firstByte == -1) {
-        return null;
-      }
-      size = CodedInputStream.readRawVarint32(firstByte, input);
-    } catch (IOException e) {
-      throw new InvalidProtocolBufferException(e);
-    }
-    InputStream limitedInput = new LimitedInputStream(input, size);
-    return parsePartialFrom(limitedInput, extensionRegistry);
-  }
-
-  @Override
-  public MessageType parsePartialDelimitedFrom(InputStream input)
-      throws InvalidProtocolBufferException {
-    return parsePartialDelimitedFrom(input, EMPTY_REGISTRY);
-  }
-
-  @Override
-  public MessageType parseDelimitedFrom(InputStream input, ExtensionRegistryLite extensionRegistry)
-      throws InvalidProtocolBufferException {
-    return checkMessageInitialized(parsePartialDelimitedFrom(input, extensionRegistry));
-  }
-
-  @Override
-  public MessageType parseDelimitedFrom(InputStream input) throws InvalidProtocolBufferException {
-    return parseDelimitedFrom(input, EMPTY_REGISTRY);
-  }
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/AbstractProtobufList.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/AbstractProtobufList.java
deleted file mode 100644
index e792d7d..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/AbstractProtobufList.java
+++ /dev/null
@@ -1,180 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import com.google.protobuf.Internal.ProtobufList;
-import java.util.AbstractList;
-import java.util.Collection;
-import java.util.List;
-import java.util.RandomAccess;
-
-/**
- * An abstract implementation of {@link ProtobufList} which manages mutability semantics. All mutate
- * methods must check if the list is mutable before proceeding. Subclasses must invoke {@link
- * #ensureIsMutable()} manually when overriding those methods.
- *
- * <p>This implementation assumes all subclasses are array based, supporting random access.
- */
-abstract class AbstractProtobufList<E> extends AbstractList<E> implements ProtobufList<E> {
-
-  protected static final int DEFAULT_CAPACITY = 10;
-
-  /** Whether or not this list is modifiable. */
-  private boolean isMutable;
-
-  /** Constructs a mutable list by default. */
-  AbstractProtobufList() {
-    isMutable = true;
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (o == this) {
-      return true;
-    }
-    if (!(o instanceof List)) {
-      return false;
-    }
-    // Handle lists that do not support RandomAccess as efficiently as possible by using an iterator
-    // based approach in our super class. Otherwise our index based approach will avoid those
-    // allocations.
-    if (!(o instanceof RandomAccess)) {
-      return super.equals(o);
-    }
-
-    List<?> other = (List<?>) o;
-    final int size = size();
-    if (size != other.size()) {
-      return false;
-    }
-    for (int i = 0; i < size; i++) {
-      if (!get(i).equals(other.get(i))) {
-        return false;
-      }
-    }
-    return true;
-  }
-
-  @Override
-  public int hashCode() {
-    final int size = size();
-    int hashCode = 1;
-    for (int i = 0; i < size; i++) {
-      hashCode = (31 * hashCode) + get(i).hashCode();
-    }
-    return hashCode;
-  }
-
-  @Override
-  public boolean add(E e) {
-    ensureIsMutable();
-    return super.add(e);
-  }
-
-  @Override
-  public void add(int index, E element) {
-    ensureIsMutable();
-    super.add(index, element);
-  }
-
-  @Override
-  public boolean addAll(Collection<? extends E> c) {
-    ensureIsMutable();
-    return super.addAll(c);
-  }
-
-  @Override
-  public boolean addAll(int index, Collection<? extends E> c) {
-    ensureIsMutable();
-    return super.addAll(index, c);
-  }
-
-  @Override
-  public void clear() {
-    ensureIsMutable();
-    super.clear();
-  }
-
-  @Override
-  public boolean isModifiable() {
-    return isMutable;
-  }
-
-  @Override
-  public final void makeImmutable() {
-    isMutable = false;
-  }
-
-  @Override
-  public E remove(int index) {
-    ensureIsMutable();
-    return super.remove(index);
-  }
-
-  @Override
-  public boolean remove(Object o) {
-    ensureIsMutable();
-    int index = indexOf(o);
-    if (index == -1) {
-      return false;
-    }
-    remove(index);
-    return true;
-  }
-
-  @Override
-  public boolean removeAll(Collection<?> c) {
-    ensureIsMutable();
-    return super.removeAll(c);
-  }
-
-  @Override
-  public boolean retainAll(Collection<?> c) {
-    ensureIsMutable();
-    return super.retainAll(c);
-  }
-
-  @Override
-  public E set(int index, E element) {
-    ensureIsMutable();
-    return super.set(index, element);
-  }
-
-  /**
-   * Throws an {@link UnsupportedOperationException} if the list is immutable. Subclasses are
-   * responsible for invoking this method on mutate operations.
-   */
-  protected void ensureIsMutable() {
-    if (!isMutable) {
-      throw new UnsupportedOperationException();
-    }
-  }
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/AllocatedBuffer.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/AllocatedBuffer.java
deleted file mode 100644
index 94b0994..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/AllocatedBuffer.java
+++ /dev/null
@@ -1,265 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.protobuf.Internal.checkNotNull;
-
-import java.nio.ByteBuffer;
-
-/**
- * A buffer that was allocated by a {@link BufferAllocator}. For every buffer, it is guaranteed that
- * at least one of {@link #hasArray()} or {@link #hasNioBuffer()} will be {@code true}.
- */
-@CheckReturnValue
-@ExperimentalApi
-abstract class AllocatedBuffer {
-  /**
-   * Indicates whether this buffer contains a backing {@link ByteBuffer} (i.e. it is safe to call
-   * {@link #nioBuffer()}).
-   */
-  public abstract boolean hasNioBuffer();
-
-  /**
-   * Indicates whether this buffer contains a backing array (i.e. it is safe to call {@link
-   * #array()}).
-   */
-  public abstract boolean hasArray();
-
-  /**
-   * Returns the {@link ByteBuffer} that backs this buffer <i>(optional operation)</i>.
-   *
-   * <p>Call {@link #hasNioBuffer()} before invoking this method in order to ensure that this buffer
-   * has a backing {@link ByteBuffer}.
-   *
-   * @return The {@link ByteBuffer} that backs this buffer
-   * @throws UnsupportedOperationException If this buffer is not backed by a {@link ByteBuffer}.
-   */
-  public abstract ByteBuffer nioBuffer();
-
-  /**
-   * Returns the byte array that backs this buffer <i>(optional operation)</i>.
-   *
-   * <p>Call {@link #hasArray()} before invoking this method in order to ensure that this buffer has
-   * an accessible backing array.
-   *
-   * @return The array that backs this buffer
-   * @throws java.nio.ReadOnlyBufferException If this buffer is backed by an array but is read-only
-   * @throws UnsupportedOperationException If this buffer is not backed by an accessible array
-   */
-  public abstract byte[] array();
-
-  /**
-   * Returns the offset within this buffer's backing array of the first element of the buffer
-   * <i>(optional operation)</i>.
-   *
-   * <p>If this buffer is backed by an array then {@link #position()} corresponds to the array index
-   * {@link #position()} {@code +} {@link #arrayOffset()}.
-   *
-   * <p>Invoke the {@link #hasArray hasArray} method before invoking this method in order to ensure
-   * that this buffer has an accessible backing array.
-   *
-   * @return The offset within this buffer's array of the first element of the buffer
-   * @throws java.nio.ReadOnlyBufferException If this buffer is backed by an array but is read-only
-   * @throws UnsupportedOperationException If this buffer is not backed by an accessible array
-   */
-  public abstract int arrayOffset();
-
-  /**
-   * Returns this buffer's position.
-   *
-   * @return The position of this buffer
-   */
-  public abstract int position();
-
-  /**
-   * Sets this buffer's position.
-   *
-   * @param position The new position value; must be non-negative and no larger than the current
-   *     limit
-   * @return This buffer
-   * @throws IllegalArgumentException If the preconditions on {@code position} do not hold
-   */
-  @CanIgnoreReturnValue
-  public abstract AllocatedBuffer position(int position);
-
-  /**
-   * Returns this buffer's limit.
-   *
-   * @return The limit of this buffer
-   */
-  public abstract int limit();
-
-  /**
-   * Returns the number of elements between the current {@link #position()} and the {@link #limit()}
-   * .
-   *
-   * @return The number of elements remaining in this buffer
-   */
-  public abstract int remaining();
-
-  /**
-   * Creates a new {@link AllocatedBuffer} that is backed by the given array. The returned buffer
-   * will have {@link #hasArray} == {@code true}, {@link #arrayOffset()} == {@code 0}, {@link
-   * #position()} == {@code 0} and {@link #limit()} equal to the length of {@code bytes}.
-   */
-  public static AllocatedBuffer wrap(byte[] bytes) {
-    return wrapNoCheck(bytes, 0, bytes.length);
-  }
-
-  /**
-   * Creates a new {@link AllocatedBuffer} that is backed by the given array. The returned buffer
-   * will have {@link #hasArray} == {@code true}, {@link #arrayOffset()} == {@code offset}, {@link
-   * #position()} == {@code 0} and {@link #limit()} == {@code length}.
-   */
-  public static AllocatedBuffer wrap(final byte[] bytes, final int offset, final int length) {
-    if (offset < 0 || length < 0 || (offset + length) > bytes.length) {
-      throw new IndexOutOfBoundsException(
-          String.format("bytes.length=%d, offset=%d, length=%d", bytes.length, offset, length));
-    }
-
-    return wrapNoCheck(bytes, offset, length);
-  }
-
-  /**
-   * Creates a new {@link AllocatedBuffer} that is backed by the given {@link ByteBuffer}. The
-   * returned buffer will have {@link #hasNioBuffer} == {@code true}.
-   */
-  public static AllocatedBuffer wrap(final ByteBuffer buffer) {
-    checkNotNull(buffer, "buffer");
-
-    return new AllocatedBuffer() {
-
-      @Override
-      public boolean hasNioBuffer() {
-        return true;
-      }
-
-      @Override
-      public ByteBuffer nioBuffer() {
-        return buffer;
-      }
-
-      @Override
-      public boolean hasArray() {
-        return buffer.hasArray();
-      }
-
-      @Override
-      public byte[] array() {
-        return buffer.array();
-      }
-
-      @Override
-      public int arrayOffset() {
-        return buffer.arrayOffset();
-      }
-
-      @Override
-      public int position() {
-        return buffer.position();
-      }
-
-      @Override
-      public AllocatedBuffer position(int position) {
-        buffer.position(position);
-        return this;
-      }
-
-      @Override
-      public int limit() {
-        return buffer.limit();
-      }
-
-      @Override
-      public int remaining() {
-        return buffer.remaining();
-      }
-    };
-  }
-
-  private static AllocatedBuffer wrapNoCheck(
-      final byte[] bytes, final int offset, final int length) {
-    return new AllocatedBuffer() {
-      // Relative to offset.
-      private int position;
-
-      @Override
-      public boolean hasNioBuffer() {
-        return false;
-      }
-
-      @Override
-      public ByteBuffer nioBuffer() {
-        throw new UnsupportedOperationException();
-      }
-
-      @Override
-      public boolean hasArray() {
-        return true;
-      }
-
-      @Override
-      public byte[] array() {
-        return bytes;
-      }
-
-      @Override
-      public int arrayOffset() {
-        return offset;
-      }
-
-      @Override
-      public int position() {
-        return position;
-      }
-
-      @Override
-      public AllocatedBuffer position(int position) {
-        if (position < 0 || position > length) {
-          throw new IllegalArgumentException("Invalid position: " + position);
-        }
-        this.position = position;
-        return this;
-      }
-
-      @Override
-      public int limit() {
-        // Relative to offset.
-        return length;
-      }
-
-      @Override
-      public int remaining() {
-        return length - position;
-      }
-    };
-  }
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/Android.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/Android.java
deleted file mode 100644
index 5a7ce9e..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/Android.java
+++ /dev/null
@@ -1,64 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-final class Android {
-  private Android() {
-  }
-
-  // Set to true in lite_proguard_android.pgcfg.
-  @SuppressWarnings("ConstantField")
-  private static boolean ASSUME_ANDROID;
-
-  private static final Class<?> MEMORY_CLASS = getClassForName("libcore.io.Memory");
-
-  private static final boolean IS_ROBOLECTRIC =
-      !ASSUME_ANDROID && getClassForName("org.robolectric.Robolectric") != null;
-
-  /** Returns {@code true} if running on an Android device. */
-  static boolean isOnAndroidDevice() {
-    return ASSUME_ANDROID || (MEMORY_CLASS != null && !IS_ROBOLECTRIC);
-  }
-
-  /** Returns the memory class or {@code null} if not on Android device. */
-  static Class<?> getMemoryClass() {
-    return MEMORY_CLASS;
-  }
-
-  @SuppressWarnings("unchecked")
-  private static <T> Class<T> getClassForName(String name) {
-    try {
-      return (Class<T>) Class.forName(name);
-    } catch (Throwable e) {
-      return null;
-    }
-  }
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/ArrayDecoders.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/ArrayDecoders.java
deleted file mode 100644
index 183bbc2..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/ArrayDecoders.java
+++ /dev/null
@@ -1,1106 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.protobuf.MessageSchema.getMutableUnknownFields;
-
-import com.google.protobuf.GeneratedMessageLite.ExtensionDescriptor;
-import com.google.protobuf.Internal.ProtobufList;
-import java.io.IOException;
-
-/**
- * Helper functions to decode protobuf wire format from a byte array.
- *
- * <p>Note that these functions don't do boundary check on the byte array but instead rely on Java
- * VM to check it. That means parsing routines utilizing these functions must catch
- * IndexOutOfBoundsException and convert it to protobuf's InvalidProtocolBufferException when
- * crossing protobuf public API boundaries.
- */
-@CheckReturnValue
-final class ArrayDecoders {
-
-  private ArrayDecoders() {
-  }
-
-  /**
-   * A helper used to return multiple values in a Java function. Java doesn't natively support
-   * returning multiple values in a function. Creating a new Object to hold the return values will
-   * be too expensive. Instead, we pass a Registers instance to functions that want to return
-   * multiple values and let the function set the return value in this Registers instance instead.
-   */
-  static final class Registers {
-    public int int1;
-    public long long1;
-    public Object object1;
-    public final ExtensionRegistryLite extensionRegistry;
-
-    Registers() {
-      this.extensionRegistry = ExtensionRegistryLite.getEmptyRegistry();
-    }
-
-    Registers(ExtensionRegistryLite extensionRegistry) {
-      if (extensionRegistry == null) {
-        throw new NullPointerException();
-      }
-      this.extensionRegistry = extensionRegistry;
-    }
-  }
-
-  /**
-   * Decodes a varint. Returns the position after the varint. The decoded varint is stored in
-   * registers.int1.
-   */
-  static int decodeVarint32(byte[] data, int position, Registers registers) {
-    int value = data[position++];
-    if (value >= 0) {
-      registers.int1 = value;
-      return position;
-    }
-    return decodeVarint32(value, data, position, registers);
-  }
-
-  /** Like decodeVarint32 except that the first byte is already read. */
-  static int decodeVarint32(int firstByte, byte[] data, int position, Registers registers) {
-    int value = firstByte & 0x7F;
-    final byte b2 = data[position++];
-    if (b2 >= 0) {
-      registers.int1 = value | ((int) b2 << 7);
-      return position;
-    }
-    value |= (b2 & 0x7F) << 7;
-
-    final byte b3 = data[position++];
-    if (b3 >= 0) {
-      registers.int1 = value | ((int) b3 << 14);
-      return position;
-    }
-    value |= (b3 & 0x7F) << 14;
-
-    final byte b4 = data[position++];
-    if (b4 >= 0) {
-      registers.int1 = value | ((int) b4 << 21);
-      return position;
-    }
-    value |= (b4 & 0x7F) << 21;
-
-    final byte b5 = data[position++];
-    if (b5 >= 0) {
-      registers.int1 = value | ((int) b5 << 28);
-      return position;
-    }
-    value |= (b5 & 0x7F) << 28;
-
-    while (data[position++] < 0) {}
-
-    registers.int1 = value;
-    return position;
-  }
-
-  /**
-   * Decodes a varint. Returns the position after the varint. The decoded varint is stored in
-   * registers.long1.
-   */
-  static int decodeVarint64(byte[] data, int position, Registers registers) {
-    long value = data[position++];
-    if (value >= 0) {
-      registers.long1 = value;
-      return position;
-    } else {
-      return decodeVarint64(value, data, position, registers);
-    }
-  }
-
-  /** Like decodeVarint64 except that the first byte is already read. */
-  static int decodeVarint64(long firstByte, byte[] data, int position, Registers registers) {
-    long value = firstByte & 0x7F;
-    byte next = data[position++];
-    int shift = 7;
-    value |= (long) (next & 0x7F) << 7;
-    while (next < 0) {
-      next = data[position++];
-      shift += 7;
-      value |= (long) (next & 0x7F) << shift;
-    }
-    registers.long1 = value;
-    return position;
-  }
-
-  /** Decodes and returns a fixed32 value. */
-  static int decodeFixed32(byte[] data, int position) {
-    return (data[position] & 0xff)
-        | ((data[position + 1] & 0xff) << 8)
-        | ((data[position + 2] & 0xff) << 16)
-        | ((data[position + 3] & 0xff) << 24);
-  }
-
-  /** Decodes and returns a fixed64 value. */
-  static long decodeFixed64(byte[] data, int position) {
-    return (data[position] & 0xffL)
-        | ((data[position + 1] & 0xffL) << 8)
-        | ((data[position + 2] & 0xffL) << 16)
-        | ((data[position + 3] & 0xffL) << 24)
-        | ((data[position + 4] & 0xffL) << 32)
-        | ((data[position + 5] & 0xffL) << 40)
-        | ((data[position + 6] & 0xffL) << 48)
-        | ((data[position + 7] & 0xffL) << 56);
-  }
-
-  /** Decodes and returns a double value. */
-  static double decodeDouble(byte[] data, int position) {
-    return Double.longBitsToDouble(decodeFixed64(data, position));
-  }
-
-  /** Decodes and returns a float value. */
-  static float decodeFloat(byte[] data, int position) {
-    return Float.intBitsToFloat(decodeFixed32(data, position));
-  }
-
-  /** Decodes a string value. */
-  static int decodeString(byte[] data, int position, Registers registers)
-      throws InvalidProtocolBufferException {
-    position = decodeVarint32(data, position, registers);
-    final int length = registers.int1;
-    if (length < 0) {
-      throw InvalidProtocolBufferException.negativeSize();
-    } else if (length == 0) {
-      registers.object1 = "";
-      return position;
-    } else {
-      registers.object1 = new String(data, position, length, Internal.UTF_8);
-      return position + length;
-    }
-  }
-
-  /** Decodes a string value with utf8 check. */
-  static int decodeStringRequireUtf8(byte[] data, int position, Registers registers)
-      throws InvalidProtocolBufferException {
-    position = decodeVarint32(data, position, registers);
-    final int length = registers.int1;
-    if (length < 0) {
-      throw InvalidProtocolBufferException.negativeSize();
-    } else if (length == 0) {
-      registers.object1 = "";
-      return position;
-    } else {
-      registers.object1 = Utf8.decodeUtf8(data, position, length);
-      return position + length;
-    }
-  }
-
-  /** Decodes a bytes value. */
-  static int decodeBytes(byte[] data, int position, Registers registers)
-      throws InvalidProtocolBufferException {
-    position = decodeVarint32(data, position, registers);
-    final int length = registers.int1;
-    if (length < 0) {
-      throw InvalidProtocolBufferException.negativeSize();
-    } else if (length > data.length - position) {
-      throw InvalidProtocolBufferException.truncatedMessage();
-    } else if (length == 0) {
-      registers.object1 = ByteString.EMPTY;
-      return position;
-    } else {
-      registers.object1 = ByteString.copyFrom(data, position, length);
-      return position + length;
-    }
-  }
-
-  /** Decodes a message value. */
-  @SuppressWarnings({"unchecked", "rawtypes"})
-  static int decodeMessageField(
-      Schema schema, byte[] data, int position, int limit, Registers registers) throws IOException {
-    Object msg = schema.newInstance();
-    int offset = mergeMessageField(msg, schema, data, position, limit, registers);
-    schema.makeImmutable(msg);
-    registers.object1 = msg;
-    return offset;
-  }
-
-  /** Decodes a group value. */
-  @SuppressWarnings({"unchecked", "rawtypes"})
-  static int decodeGroupField(
-      Schema schema, byte[] data, int position, int limit, int endGroup, Registers registers)
-      throws IOException {
-    Object msg = schema.newInstance();
-    int offset = mergeGroupField(msg, schema, data, position, limit, endGroup, registers);
-    schema.makeImmutable(msg);
-    registers.object1 = msg;
-    return offset;
-  }
-
-  @SuppressWarnings({"unchecked", "rawtypes"})
-  static int mergeMessageField(
-      Object msg, Schema schema, byte[] data, int position, int limit, Registers registers)
-      throws IOException {
-    int length = data[position++];
-    if (length < 0) {
-      position = decodeVarint32(length, data, position, registers);
-      length = registers.int1;
-    }
-    if (length < 0 || length > limit - position) {
-      throw InvalidProtocolBufferException.truncatedMessage();
-    }
-    schema.mergeFrom(msg, data, position, position + length, registers);
-    registers.object1 = msg;
-    return position + length;
-  }
-
-  @SuppressWarnings({"unchecked", "rawtypes"})
-  static int mergeGroupField(
-      Object msg,
-      Schema schema,
-      byte[] data,
-      int position,
-      int limit,
-      int endGroup,
-      Registers registers)
-      throws IOException {
-    // A group field must has a MessageSchema (the only other subclass of Schema is MessageSetSchema
-    // and it can't be used in group fields).
-    final MessageSchema messageSchema = (MessageSchema) schema;
-    // It's OK to directly use parseProto2Message since proto3 doesn't have group.
-    final int endPosition =
-        messageSchema.parseProto2Message(msg, data, position, limit, endGroup, registers);
-    registers.object1 = msg;
-    return endPosition;
-  }
-
-  /** Decodes a repeated 32-bit varint field. Returns the position after all read values. */
-  static int decodeVarint32List(
-      int tag, byte[] data, int position, int limit, ProtobufList<?> list, Registers registers) {
-    final IntArrayList output = (IntArrayList) list;
-    position = decodeVarint32(data, position, registers);
-    output.addInt(registers.int1);
-    while (position < limit) {
-      int nextPosition = decodeVarint32(data, position, registers);
-      if (tag != registers.int1) {
-        break;
-      }
-      position = decodeVarint32(data, nextPosition, registers);
-      output.addInt(registers.int1);
-    }
-    return position;
-  }
-
-  /** Decodes a repeated 64-bit varint field. Returns the position after all read values. */
-  static int decodeVarint64List(
-      int tag, byte[] data, int position, int limit, ProtobufList<?> list, Registers registers) {
-    final LongArrayList output = (LongArrayList) list;
-    position = decodeVarint64(data, position, registers);
-    output.addLong(registers.long1);
-    while (position < limit) {
-      int nextPosition = decodeVarint32(data, position, registers);
-      if (tag != registers.int1) {
-        break;
-      }
-      position = decodeVarint64(data, nextPosition, registers);
-      output.addLong(registers.long1);
-    }
-    return position;
-  }
-
-  /** Decodes a repeated fixed32 field. Returns the position after all read values. */
-  static int decodeFixed32List(
-      int tag, byte[] data, int position, int limit, ProtobufList<?> list, Registers registers) {
-    final IntArrayList output = (IntArrayList) list;
-    output.addInt(decodeFixed32(data, position));
-    position += 4;
-    while (position < limit) {
-      int nextPosition = decodeVarint32(data, position, registers);
-      if (tag != registers.int1) {
-        break;
-      }
-      output.addInt(decodeFixed32(data, nextPosition));
-      position = nextPosition + 4;
-    }
-    return position;
-  }
-
-  /** Decodes a repeated fixed64 field. Returns the position after all read values. */
-  static int decodeFixed64List(
-      int tag, byte[] data, int position, int limit, ProtobufList<?> list, Registers registers) {
-    final LongArrayList output = (LongArrayList) list;
-    output.addLong(decodeFixed64(data, position));
-    position += 8;
-    while (position < limit) {
-      int nextPosition = decodeVarint32(data, position, registers);
-      if (tag != registers.int1) {
-        break;
-      }
-      output.addLong(decodeFixed64(data, nextPosition));
-      position = nextPosition + 8;
-    }
-    return position;
-  }
-
-  /** Decodes a repeated float field. Returns the position after all read values. */
-  static int decodeFloatList(
-      int tag, byte[] data, int position, int limit, ProtobufList<?> list, Registers registers) {
-    final FloatArrayList output = (FloatArrayList) list;
-    output.addFloat(decodeFloat(data, position));
-    position += 4;
-    while (position < limit) {
-      int nextPosition = decodeVarint32(data, position, registers);
-      if (tag != registers.int1) {
-        break;
-      }
-      output.addFloat(decodeFloat(data, nextPosition));
-      position = nextPosition + 4;
-    }
-    return position;
-  }
-
-  /** Decodes a repeated double field. Returns the position after all read values. */
-  static int decodeDoubleList(
-      int tag, byte[] data, int position, int limit, ProtobufList<?> list, Registers registers) {
-    final DoubleArrayList output = (DoubleArrayList) list;
-    output.addDouble(decodeDouble(data, position));
-    position += 8;
-    while (position < limit) {
-      int nextPosition = decodeVarint32(data, position, registers);
-      if (tag != registers.int1) {
-        break;
-      }
-      output.addDouble(decodeDouble(data, nextPosition));
-      position = nextPosition + 8;
-    }
-    return position;
-  }
-
-  /** Decodes a repeated boolean field. Returns the position after all read values. */
-  static int decodeBoolList(
-      int tag, byte[] data, int position, int limit, ProtobufList<?> list, Registers registers) {
-    final BooleanArrayList output = (BooleanArrayList) list;
-    position = decodeVarint64(data, position, registers);
-    output.addBoolean(registers.long1 != 0);
-    while (position < limit) {
-      int nextPosition = decodeVarint32(data, position, registers);
-      if (tag != registers.int1) {
-        break;
-      }
-      position = decodeVarint64(data, nextPosition, registers);
-      output.addBoolean(registers.long1 != 0);
-    }
-    return position;
-  }
-
-  /** Decodes a repeated sint32 field. Returns the position after all read values. */
-  static int decodeSInt32List(
-      int tag, byte[] data, int position, int limit, ProtobufList<?> list, Registers registers) {
-    final IntArrayList output = (IntArrayList) list;
-    position = decodeVarint32(data, position, registers);
-    output.addInt(CodedInputStream.decodeZigZag32(registers.int1));
-    while (position < limit) {
-      int nextPosition = decodeVarint32(data, position, registers);
-      if (tag != registers.int1) {
-        break;
-      }
-      position = decodeVarint32(data, nextPosition, registers);
-      output.addInt(CodedInputStream.decodeZigZag32(registers.int1));
-    }
-    return position;
-  }
-
-  /** Decodes a repeated sint64 field. Returns the position after all read values. */
-  static int decodeSInt64List(
-      int tag, byte[] data, int position, int limit, ProtobufList<?> list, Registers registers) {
-    final LongArrayList output = (LongArrayList) list;
-    position = decodeVarint64(data, position, registers);
-    output.addLong(CodedInputStream.decodeZigZag64(registers.long1));
-    while (position < limit) {
-      int nextPosition = decodeVarint32(data, position, registers);
-      if (tag != registers.int1) {
-        break;
-      }
-      position = decodeVarint64(data, nextPosition, registers);
-      output.addLong(CodedInputStream.decodeZigZag64(registers.long1));
-    }
-    return position;
-  }
-
-  /** Decodes a packed 32-bit varint field. Returns the position after all read values. */
-  static int decodePackedVarint32List(
-      byte[] data, int position, ProtobufList<?> list, Registers registers) throws IOException {
-    final IntArrayList output = (IntArrayList) list;
-    position = decodeVarint32(data, position, registers);
-    final int fieldLimit = position + registers.int1;
-    while (position < fieldLimit) {
-      position = decodeVarint32(data, position, registers);
-      output.addInt(registers.int1);
-    }
-    if (position != fieldLimit) {
-      throw InvalidProtocolBufferException.truncatedMessage();
-    }
-    return position;
-  }
-
-  /** Decodes a packed 64-bit varint field. Returns the position after all read values. */
-  static int decodePackedVarint64List(
-      byte[] data, int position, ProtobufList<?> list, Registers registers) throws IOException {
-    final LongArrayList output = (LongArrayList) list;
-    position = decodeVarint32(data, position, registers);
-    final int fieldLimit = position + registers.int1;
-    while (position < fieldLimit) {
-      position = decodeVarint64(data, position, registers);
-      output.addLong(registers.long1);
-    }
-    if (position != fieldLimit) {
-      throw InvalidProtocolBufferException.truncatedMessage();
-    }
-    return position;
-  }
-
-  /** Decodes a packed fixed32 field. Returns the position after all read values. */
-  static int decodePackedFixed32List(
-      byte[] data, int position, ProtobufList<?> list, Registers registers) throws IOException {
-    final IntArrayList output = (IntArrayList) list;
-    position = decodeVarint32(data, position, registers);
-    final int fieldLimit = position + registers.int1;
-    while (position < fieldLimit) {
-      output.addInt(decodeFixed32(data, position));
-      position += 4;
-    }
-    if (position != fieldLimit) {
-      throw InvalidProtocolBufferException.truncatedMessage();
-    }
-    return position;
-  }
-
-  /** Decodes a packed fixed64 field. Returns the position after all read values. */
-  static int decodePackedFixed64List(
-      byte[] data, int position, ProtobufList<?> list, Registers registers) throws IOException {
-    final LongArrayList output = (LongArrayList) list;
-    position = decodeVarint32(data, position, registers);
-    final int fieldLimit = position + registers.int1;
-    while (position < fieldLimit) {
-      output.addLong(decodeFixed64(data, position));
-      position += 8;
-    }
-    if (position != fieldLimit) {
-      throw InvalidProtocolBufferException.truncatedMessage();
-    }
-    return position;
-  }
-
-  /** Decodes a packed float field. Returns the position after all read values. */
-  static int decodePackedFloatList(
-      byte[] data, int position, ProtobufList<?> list, Registers registers) throws IOException {
-    final FloatArrayList output = (FloatArrayList) list;
-    position = decodeVarint32(data, position, registers);
-    final int fieldLimit = position + registers.int1;
-    while (position < fieldLimit) {
-      output.addFloat(decodeFloat(data, position));
-      position += 4;
-    }
-    if (position != fieldLimit) {
-      throw InvalidProtocolBufferException.truncatedMessage();
-    }
-    return position;
-  }
-
-  /** Decodes a packed double field. Returns the position after all read values. */
-  static int decodePackedDoubleList(
-      byte[] data, int position, ProtobufList<?> list, Registers registers) throws IOException {
-    final DoubleArrayList output = (DoubleArrayList) list;
-    position = decodeVarint32(data, position, registers);
-    final int fieldLimit = position + registers.int1;
-    while (position < fieldLimit) {
-      output.addDouble(decodeDouble(data, position));
-      position += 8;
-    }
-    if (position != fieldLimit) {
-      throw InvalidProtocolBufferException.truncatedMessage();
-    }
-    return position;
-  }
-
-  /** Decodes a packed boolean field. Returns the position after all read values. */
-  static int decodePackedBoolList(
-      byte[] data, int position, ProtobufList<?> list, Registers registers) throws IOException {
-    final BooleanArrayList output = (BooleanArrayList) list;
-    position = decodeVarint32(data, position, registers);
-    final int fieldLimit = position + registers.int1;
-    while (position < fieldLimit) {
-      position = decodeVarint64(data, position, registers);
-      output.addBoolean(registers.long1 != 0);
-    }
-    if (position != fieldLimit) {
-      throw InvalidProtocolBufferException.truncatedMessage();
-    }
-    return position;
-  }
-
-  /** Decodes a packed sint32 field. Returns the position after all read values. */
-  static int decodePackedSInt32List(
-      byte[] data, int position, ProtobufList<?> list, Registers registers) throws IOException {
-    final IntArrayList output = (IntArrayList) list;
-    position = decodeVarint32(data, position, registers);
-    final int fieldLimit = position + registers.int1;
-    while (position < fieldLimit) {
-      position = decodeVarint32(data, position, registers);
-      output.addInt(CodedInputStream.decodeZigZag32(registers.int1));
-    }
-    if (position != fieldLimit) {
-      throw InvalidProtocolBufferException.truncatedMessage();
-    }
-    return position;
-  }
-
-  /** Decodes a packed sint64 field. Returns the position after all read values. */
-  static int decodePackedSInt64List(
-      byte[] data, int position, ProtobufList<?> list, Registers registers) throws IOException {
-    final LongArrayList output = (LongArrayList) list;
-    position = decodeVarint32(data, position, registers);
-    final int fieldLimit = position + registers.int1;
-    while (position < fieldLimit) {
-      position = decodeVarint64(data, position, registers);
-      output.addLong(CodedInputStream.decodeZigZag64(registers.long1));
-    }
-    if (position != fieldLimit) {
-      throw InvalidProtocolBufferException.truncatedMessage();
-    }
-    return position;
-  }
-
-  /** Decodes a repeated string field. Returns the position after all read values. */
-  @SuppressWarnings("unchecked")
-  static int decodeStringList(
-      int tag, byte[] data, int position, int limit, ProtobufList<?> list, Registers registers)
-      throws InvalidProtocolBufferException {
-    final ProtobufList<String> output = (ProtobufList<String>) list;
-    position = decodeVarint32(data, position, registers);
-    final int length = registers.int1;
-    if (length < 0) {
-      throw InvalidProtocolBufferException.negativeSize();
-    } else if (length == 0) {
-      output.add("");
-    } else {
-      String value = new String(data, position, length, Internal.UTF_8);
-      output.add(value);
-      position += length;
-    }
-    while (position < limit) {
-      int nextPosition = decodeVarint32(data, position, registers);
-      if (tag != registers.int1) {
-        break;
-      }
-      position = decodeVarint32(data, nextPosition, registers);
-      final int nextLength = registers.int1;
-      if (nextLength < 0) {
-        throw InvalidProtocolBufferException.negativeSize();
-      } else if (nextLength == 0) {
-        output.add("");
-      } else {
-        String value = new String(data, position, nextLength, Internal.UTF_8);
-        output.add(value);
-        position += nextLength;
-      }
-    }
-    return position;
-  }
-
-  /**
-   * Decodes a repeated string field with utf8 check. Returns the position after all read values.
-   */
-  @SuppressWarnings("unchecked")
-  static int decodeStringListRequireUtf8(
-      int tag, byte[] data, int position, int limit, ProtobufList<?> list, Registers registers)
-      throws InvalidProtocolBufferException {
-    final ProtobufList<String> output = (ProtobufList<String>) list;
-    position = decodeVarint32(data, position, registers);
-    final int length = registers.int1;
-    if (length < 0) {
-      throw InvalidProtocolBufferException.negativeSize();
-    } else if (length == 0) {
-      output.add("");
-    } else {
-      if (!Utf8.isValidUtf8(data, position, position + length)) {
-        throw InvalidProtocolBufferException.invalidUtf8();
-      }
-      String value = new String(data, position, length, Internal.UTF_8);
-      output.add(value);
-      position += length;
-    }
-    while (position < limit) {
-      int nextPosition = decodeVarint32(data, position, registers);
-      if (tag != registers.int1) {
-        break;
-      }
-      position = decodeVarint32(data, nextPosition, registers);
-      final int nextLength = registers.int1;
-      if (nextLength < 0) {
-        throw InvalidProtocolBufferException.negativeSize();
-      } else if (nextLength == 0) {
-        output.add("");
-      } else {
-        if (!Utf8.isValidUtf8(data, position, position + nextLength)) {
-          throw InvalidProtocolBufferException.invalidUtf8();
-        }
-        String value = new String(data, position, nextLength, Internal.UTF_8);
-        output.add(value);
-        position += nextLength;
-      }
-    }
-    return position;
-  }
-
-  /** Decodes a repeated bytes field. Returns the position after all read values. */
-  @SuppressWarnings("unchecked")
-  static int decodeBytesList(
-      int tag, byte[] data, int position, int limit, ProtobufList<?> list, Registers registers)
-      throws InvalidProtocolBufferException {
-    final ProtobufList<ByteString> output = (ProtobufList<ByteString>) list;
-    position = decodeVarint32(data, position, registers);
-    final int length = registers.int1;
-    if (length < 0) {
-      throw InvalidProtocolBufferException.negativeSize();
-    } else if (length > data.length - position) {
-      throw InvalidProtocolBufferException.truncatedMessage();
-    } else if (length == 0) {
-      output.add(ByteString.EMPTY);
-    } else {
-      output.add(ByteString.copyFrom(data, position, length));
-      position += length;
-    }
-    while (position < limit) {
-      int nextPosition = decodeVarint32(data, position, registers);
-      if (tag != registers.int1) {
-        break;
-      }
-      position = decodeVarint32(data, nextPosition, registers);
-      final int nextLength = registers.int1;
-      if (nextLength < 0) {
-        throw InvalidProtocolBufferException.negativeSize();
-      } else if (nextLength > data.length - position) {
-        throw InvalidProtocolBufferException.truncatedMessage();
-      } else if (nextLength == 0) {
-        output.add(ByteString.EMPTY);
-      } else {
-        output.add(ByteString.copyFrom(data, position, nextLength));
-        position += nextLength;
-      }
-    }
-    return position;
-  }
-
-  /**
-   * Decodes a repeated message field
-   *
-   * @return The position of after read all messages
-   */
-  @SuppressWarnings({"unchecked"})
-  static int decodeMessageList(
-      Schema<?> schema,
-      int tag,
-      byte[] data,
-      int position,
-      int limit,
-      ProtobufList<?> list,
-      Registers registers)
-      throws IOException {
-    final ProtobufList<Object> output = (ProtobufList<Object>) list;
-    position = decodeMessageField(schema, data, position, limit, registers);
-    output.add(registers.object1);
-    while (position < limit) {
-      int nextPosition = decodeVarint32(data, position, registers);
-      if (tag != registers.int1) {
-        break;
-      }
-      position = decodeMessageField(schema, data, nextPosition, limit, registers);
-      output.add(registers.object1);
-    }
-    return position;
-  }
-
-  /**
-   * Decodes a repeated group field
-   *
-   * @return The position of after read all groups
-   */
-  @SuppressWarnings({"unchecked", "rawtypes"})
-  static int decodeGroupList(
-      Schema schema,
-      int tag,
-      byte[] data,
-      int position,
-      int limit,
-      ProtobufList<?> list,
-      Registers registers)
-      throws IOException {
-    final ProtobufList<Object> output = (ProtobufList<Object>) list;
-    final int endgroup = (tag & ~0x7) | WireFormat.WIRETYPE_END_GROUP;
-    position = decodeGroupField(schema, data, position, limit, endgroup, registers);
-    output.add(registers.object1);
-    while (position < limit) {
-      int nextPosition = decodeVarint32(data, position, registers);
-      if (tag != registers.int1) {
-        break;
-      }
-      position = decodeGroupField(schema, data, nextPosition, limit, endgroup, registers);
-      output.add(registers.object1);
-    }
-    return position;
-  }
-
-  static int decodeExtensionOrUnknownField(
-      int tag, byte[] data, int position, int limit,
-      Object message,
-      MessageLite defaultInstance,
-      UnknownFieldSchema<UnknownFieldSetLite, UnknownFieldSetLite> unknownFieldSchema,
-      Registers registers)
-      throws IOException {
-    final int number = tag >>> 3;
-    GeneratedMessageLite.GeneratedExtension extension =
-        registers.extensionRegistry.findLiteExtensionByNumber(defaultInstance, number);
-    if (extension == null) {
-      return decodeUnknownField(
-          tag, data, position, limit, getMutableUnknownFields(message), registers);
-    } else  {
-      // TODO(b/230609037): remove the unused variable
-      FieldSet<ExtensionDescriptor> unused =
-          ((GeneratedMessageLite.ExtendableMessage<?, ?>) message).ensureExtensionsAreMutable();
-      return decodeExtension(
-          tag, data, position, limit, (GeneratedMessageLite.ExtendableMessage) message,
-          extension, unknownFieldSchema, registers);
-    }
-  }
-
-  static int decodeExtension(
-      int tag,
-      byte[] data,
-      int position,
-      int limit,
-      GeneratedMessageLite.ExtendableMessage<?, ?> message,
-      GeneratedMessageLite.GeneratedExtension<?, ?> extension,
-      UnknownFieldSchema<UnknownFieldSetLite, UnknownFieldSetLite> unknownFieldSchema,
-      Registers registers)
-      throws IOException {
-    final FieldSet<GeneratedMessageLite.ExtensionDescriptor> extensions = message.extensions;
-    final int fieldNumber = tag >>> 3;
-    if (extension.descriptor.isRepeated() && extension.descriptor.isPacked()) {
-      switch (extension.getLiteType()) {
-        case DOUBLE:
-        {
-          DoubleArrayList list = new DoubleArrayList();
-          position = decodePackedDoubleList(data, position, list, registers);
-          extensions.setField(extension.descriptor, list);
-          break;
-        }
-        case FLOAT:
-        {
-          FloatArrayList list = new FloatArrayList();
-          position = decodePackedFloatList(data, position, list, registers);
-          extensions.setField(extension.descriptor, list);
-          break;
-        }
-        case INT64:
-        case UINT64:
-        {
-          LongArrayList list = new LongArrayList();
-          position = decodePackedVarint64List(data, position, list, registers);
-          extensions.setField(extension.descriptor, list);
-          break;
-        }
-        case INT32:
-        case UINT32:
-        {
-          IntArrayList list = new IntArrayList();
-          position = decodePackedVarint32List(data, position, list, registers);
-          extensions.setField(extension.descriptor, list);
-          break;
-        }
-        case FIXED64:
-        case SFIXED64:
-        {
-          LongArrayList list = new LongArrayList();
-          position = decodePackedFixed64List(data, position, list, registers);
-          extensions.setField(extension.descriptor, list);
-          break;
-        }
-        case FIXED32:
-        case SFIXED32:
-        {
-          IntArrayList list = new IntArrayList();
-          position = decodePackedFixed32List(data, position, list, registers);
-          extensions.setField(extension.descriptor, list);
-          break;
-        }
-        case BOOL:
-        {
-          BooleanArrayList list = new BooleanArrayList();
-          position = decodePackedBoolList(data, position, list, registers);
-          extensions.setField(extension.descriptor, list);
-          break;
-        }
-        case SINT32:
-        {
-          IntArrayList list = new IntArrayList();
-          position = decodePackedSInt32List(data, position, list, registers);
-          extensions.setField(extension.descriptor, list);
-          break;
-        }
-        case SINT64:
-        {
-          LongArrayList list = new LongArrayList();
-          position = decodePackedSInt64List(data, position, list, registers);
-          extensions.setField(extension.descriptor, list);
-          break;
-        }
-        case ENUM:
-          {
-            IntArrayList list = new IntArrayList();
-            position = decodePackedVarint32List(data, position, list, registers);
-            SchemaUtil.filterUnknownEnumList(
-                message,
-                fieldNumber,
-                list,
-                extension.descriptor.getEnumType(),
-                null,
-                unknownFieldSchema);
-            extensions.setField(extension.descriptor, list);
-            break;
-          }
-        default:
-          throw new IllegalStateException(
-              "Type cannot be packed: " + extension.descriptor.getLiteType());
-      }
-    } else {
-      Object value = null;
-      // Enum is a special case because unknown enum values will be put into UnknownFieldSetLite.
-      if (extension.getLiteType() == WireFormat.FieldType.ENUM) {
-        position = decodeVarint32(data, position, registers);
-        Object enumValue = extension.descriptor.getEnumType().findValueByNumber(registers.int1);
-        if (enumValue == null) {
-          SchemaUtil.storeUnknownEnum(
-              message, fieldNumber, registers.int1, null, unknownFieldSchema);
-          return position;
-        }
-        // Note, we store the integer value instead of the actual enum object in FieldSet.
-        // This is also different from full-runtime where we store EnumValueDescriptor.
-        value = registers.int1;
-      } else {
-        switch (extension.getLiteType()) {
-          case DOUBLE:
-            value = decodeDouble(data, position);
-            position += 8;
-            break;
-          case FLOAT:
-            value = decodeFloat(data, position);
-            position += 4;
-            break;
-          case INT64:
-          case UINT64:
-            position = decodeVarint64(data, position, registers);
-            value = registers.long1;
-            break;
-          case INT32:
-          case UINT32:
-            position = decodeVarint32(data, position, registers);
-            value = registers.int1;
-            break;
-          case FIXED64:
-          case SFIXED64:
-            value = decodeFixed64(data, position);
-            position += 8;
-            break;
-          case FIXED32:
-          case SFIXED32:
-            value = decodeFixed32(data, position);
-            position += 4;
-            break;
-          case BOOL:
-            position = decodeVarint64(data, position, registers);
-            value = (registers.long1 != 0);
-            break;
-          case BYTES:
-            position = decodeBytes(data, position, registers);
-            value = registers.object1;
-            break;
-          case SINT32:
-            position = decodeVarint32(data, position, registers);
-            value = CodedInputStream.decodeZigZag32(registers.int1);
-            break;
-          case SINT64:
-            position = decodeVarint64(data, position, registers);
-            value = CodedInputStream.decodeZigZag64(registers.long1);
-            break;
-          case STRING:
-            position = decodeString(data, position, registers);
-            value = registers.object1;
-            break;
-          case GROUP:
-            {
-              final int endTag = (fieldNumber << 3) | WireFormat.WIRETYPE_END_GROUP;
-              final Schema fieldSchema =
-                  Protobuf.getInstance()
-                      .schemaFor(extension.getMessageDefaultInstance().getClass());
-              if (extension.isRepeated()) {
-                position = decodeGroupField(fieldSchema, data, position, limit, endTag, registers);
-                extensions.addRepeatedField(extension.descriptor, registers.object1);
-              } else {
-                Object oldValue = extensions.getField(extension.descriptor);
-                if (oldValue == null) {
-                  oldValue = fieldSchema.newInstance();
-                  extensions.setField(extension.descriptor, oldValue);
-                }
-                position =
-                    mergeGroupField(
-                        oldValue, fieldSchema, data, position, limit, endTag, registers);
-              }
-              return position;
-            }
-          case MESSAGE:
-            {
-              final Schema fieldSchema =
-                  Protobuf.getInstance()
-                      .schemaFor(extension.getMessageDefaultInstance().getClass());
-              if (extension.isRepeated()) {
-                position = decodeMessageField(fieldSchema, data, position, limit, registers);
-                extensions.addRepeatedField(extension.descriptor, registers.object1);
-              } else {
-                Object oldValue = extensions.getField(extension.descriptor);
-                if (oldValue == null) {
-                  oldValue = fieldSchema.newInstance();
-                  extensions.setField(extension.descriptor, oldValue);
-                }
-                position =
-                    mergeMessageField(oldValue, fieldSchema, data, position, limit, registers);
-              }
-              return position;
-            }
-          case ENUM:
-            throw new IllegalStateException("Shouldn't reach here.");
-        }
-      }
-      if (extension.isRepeated()) {
-        extensions.addRepeatedField(extension.descriptor, value);
-      } else {
-        extensions.setField(extension.descriptor, value);
-      }
-    }
-    return position;
-  }
-
-  /** Decodes an unknown field. */
-  static int decodeUnknownField(
-      int tag,
-      byte[] data,
-      int position,
-      int limit,
-      UnknownFieldSetLite unknownFields,
-      Registers registers)
-      throws InvalidProtocolBufferException {
-    if (WireFormat.getTagFieldNumber(tag) == 0) {
-      throw InvalidProtocolBufferException.invalidTag();
-    }
-    switch (WireFormat.getTagWireType(tag)) {
-      case WireFormat.WIRETYPE_VARINT:
-        position = decodeVarint64(data, position, registers);
-        unknownFields.storeField(tag, registers.long1);
-        return position;
-      case WireFormat.WIRETYPE_FIXED32:
-        unknownFields.storeField(tag, decodeFixed32(data, position));
-        return position + 4;
-      case WireFormat.WIRETYPE_FIXED64:
-        unknownFields.storeField(tag, decodeFixed64(data, position));
-        return position + 8;
-      case WireFormat.WIRETYPE_LENGTH_DELIMITED:
-        position = decodeVarint32(data, position, registers);
-        final int length = registers.int1;
-        if (length < 0) {
-          throw InvalidProtocolBufferException.negativeSize();
-        } else if (length > data.length - position) {
-          throw InvalidProtocolBufferException.truncatedMessage();
-        } else if (length == 0) {
-          unknownFields.storeField(tag, ByteString.EMPTY);
-        } else {
-          unknownFields.storeField(tag, ByteString.copyFrom(data, position, length));
-        }
-        return position + length;
-      case WireFormat.WIRETYPE_START_GROUP:
-        final UnknownFieldSetLite child = UnknownFieldSetLite.newInstance();
-        final int endGroup = (tag & ~0x7) | WireFormat.WIRETYPE_END_GROUP;
-        int lastTag = 0;
-        while (position < limit) {
-          position = decodeVarint32(data, position, registers);
-          lastTag = registers.int1;
-          if (lastTag == endGroup) {
-            break;
-          }
-          position = decodeUnknownField(lastTag, data, position, limit, child, registers);
-        }
-        if (position > limit || lastTag != endGroup) {
-          throw InvalidProtocolBufferException.parseFailure();
-        }
-        unknownFields.storeField(tag, child);
-        return position;
-      default:
-        throw InvalidProtocolBufferException.invalidTag();
-    }
-  }
-
-  /** Skips an unknown field. */
-  static int skipField(int tag, byte[] data, int position, int limit, Registers registers)
-      throws InvalidProtocolBufferException {
-    if (WireFormat.getTagFieldNumber(tag) == 0) {
-      throw InvalidProtocolBufferException.invalidTag();
-    }
-    switch (WireFormat.getTagWireType(tag)) {
-      case WireFormat.WIRETYPE_VARINT:
-        position = decodeVarint64(data, position, registers);
-        return position;
-      case WireFormat.WIRETYPE_FIXED32:
-        return position + 4;
-      case WireFormat.WIRETYPE_FIXED64:
-        return position + 8;
-      case WireFormat.WIRETYPE_LENGTH_DELIMITED:
-        position = decodeVarint32(data, position, registers);
-        return position + registers.int1;
-      case WireFormat.WIRETYPE_START_GROUP:
-        final int endGroup = (tag & ~0x7) | WireFormat.WIRETYPE_END_GROUP;
-        int lastTag = 0;
-        while (position < limit) {
-          position = decodeVarint32(data, position, registers);
-          lastTag = registers.int1;
-          if (lastTag == endGroup) {
-            break;
-          }
-          position = skipField(lastTag, data, position, limit, registers);
-        }
-        if (position > limit || lastTag != endGroup) {
-          throw InvalidProtocolBufferException.parseFailure();
-        }
-        return position;
-      default:
-        throw InvalidProtocolBufferException.invalidTag();
-    }
-  }
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/BinaryReader.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/BinaryReader.java
deleted file mode 100644
index 9533df6..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/BinaryReader.java
+++ /dev/null
@@ -1,1742 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.protobuf.WireFormat.FIXED32_SIZE;
-import static com.google.protobuf.WireFormat.FIXED64_SIZE;
-import static com.google.protobuf.WireFormat.WIRETYPE_END_GROUP;
-import static com.google.protobuf.WireFormat.WIRETYPE_FIXED32;
-import static com.google.protobuf.WireFormat.WIRETYPE_FIXED64;
-import static com.google.protobuf.WireFormat.WIRETYPE_LENGTH_DELIMITED;
-import static com.google.protobuf.WireFormat.WIRETYPE_START_GROUP;
-import static com.google.protobuf.WireFormat.WIRETYPE_VARINT;
-
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.util.List;
-import java.util.Map;
-
-/**
- * A {@link Reader} that reads from a buffer containing a message serialized with the binary
- * protocol.
- */
-@CheckReturnValue
-@ExperimentalApi
-abstract class BinaryReader implements Reader {
-  private static final int FIXED32_MULTIPLE_MASK = FIXED32_SIZE - 1;
-  private static final int FIXED64_MULTIPLE_MASK = FIXED64_SIZE - 1;
-
-  /**
-   * Creates a new reader using the given {@code buffer} as input.
-   *
-   * @param buffer the input buffer. The buffer (including position, limit, etc.) will not be
-   *     modified. To increment the buffer position after the read completes, use the value returned
-   *     by {@link #getTotalBytesRead()}.
-   * @param bufferIsImmutable if {@code true} the reader assumes that the content of {@code buffer}
-   *     will never change and any allocated {@link ByteString} instances will by directly wrap
-   *     slices of {@code buffer}.
-   * @return the reader
-   */
-  public static BinaryReader newInstance(ByteBuffer buffer, boolean bufferIsImmutable) {
-    if (buffer.hasArray()) {
-      // TODO(nathanmittler): Add support for unsafe operations.
-      return new SafeHeapReader(buffer, bufferIsImmutable);
-    }
-    // TODO(nathanmittler): Add support for direct buffers
-    throw new IllegalArgumentException("Direct buffers not yet supported");
-  }
-
-  /** Only allow subclassing for inner classes. */
-  private BinaryReader() {}
-
-  /** Returns the total number of bytes read so far from the input buffer. */
-  public abstract int getTotalBytesRead();
-
-  @Override
-  public boolean shouldDiscardUnknownFields() {
-    return false;
-  }
-
-  /**
-   * A {@link BinaryReader} implementation that operates on a heap {@link ByteBuffer}. Uses only
-   * safe operations on the underlying array.
-   */
-  private static final class SafeHeapReader extends BinaryReader {
-    private final boolean bufferIsImmutable;
-    private final byte[] buffer;
-    private int pos;
-    private final int initialPos;
-    private int limit;
-    private int tag;
-    private int endGroupTag;
-
-    public SafeHeapReader(ByteBuffer bytebuf, boolean bufferIsImmutable) {
-      this.bufferIsImmutable = bufferIsImmutable;
-      buffer = bytebuf.array();
-      initialPos = pos = bytebuf.arrayOffset() + bytebuf.position();
-      limit = bytebuf.arrayOffset() + bytebuf.limit();
-    }
-
-    private boolean isAtEnd() {
-      return pos == limit;
-    }
-
-    @Override
-    public int getTotalBytesRead() {
-      return pos - initialPos;
-    }
-
-    @Override
-    public int getFieldNumber() throws IOException {
-      if (isAtEnd()) {
-        return Reader.READ_DONE;
-      }
-      tag = readVarint32();
-      if (tag == endGroupTag) {
-        return Reader.READ_DONE;
-      }
-      return WireFormat.getTagFieldNumber(tag);
-    }
-
-    @Override
-    public int getTag() {
-      return tag;
-    }
-
-    @Override
-    public boolean skipField() throws IOException {
-      if (isAtEnd() || tag == endGroupTag) {
-        return false;
-      }
-
-      switch (WireFormat.getTagWireType(tag)) {
-        case WIRETYPE_VARINT:
-          skipVarint();
-          return true;
-        case WIRETYPE_FIXED64:
-          skipBytes(FIXED64_SIZE);
-          return true;
-        case WIRETYPE_LENGTH_DELIMITED:
-          skipBytes(readVarint32());
-          return true;
-        case WIRETYPE_FIXED32:
-          skipBytes(FIXED32_SIZE);
-          return true;
-        case WIRETYPE_START_GROUP:
-          skipGroup();
-          return true;
-        default:
-          throw InvalidProtocolBufferException.invalidWireType();
-      }
-    }
-
-    @Override
-    public double readDouble() throws IOException {
-      requireWireType(WIRETYPE_FIXED64);
-      return Double.longBitsToDouble(readLittleEndian64());
-    }
-
-    @Override
-    public float readFloat() throws IOException {
-      requireWireType(WIRETYPE_FIXED32);
-      return Float.intBitsToFloat(readLittleEndian32());
-    }
-
-    @Override
-    public long readUInt64() throws IOException {
-      requireWireType(WIRETYPE_VARINT);
-      return readVarint64();
-    }
-
-    @Override
-    public long readInt64() throws IOException {
-      requireWireType(WIRETYPE_VARINT);
-      return readVarint64();
-    }
-
-    @Override
-    public int readInt32() throws IOException {
-      requireWireType(WIRETYPE_VARINT);
-      return readVarint32();
-    }
-
-    @Override
-    public long readFixed64() throws IOException {
-      requireWireType(WIRETYPE_FIXED64);
-      return readLittleEndian64();
-    }
-
-    @Override
-    public int readFixed32() throws IOException {
-      requireWireType(WIRETYPE_FIXED32);
-      return readLittleEndian32();
-    }
-
-    @Override
-    public boolean readBool() throws IOException {
-      requireWireType(WIRETYPE_VARINT);
-      return readVarint32() != 0;
-    }
-
-    @Override
-    public String readString() throws IOException {
-      return readStringInternal(false);
-    }
-
-    @Override
-    public String readStringRequireUtf8() throws IOException {
-      return readStringInternal(true);
-    }
-
-    public String readStringInternal(boolean requireUtf8) throws IOException {
-      requireWireType(WIRETYPE_LENGTH_DELIMITED);
-      final int size = readVarint32();
-      if (size == 0) {
-        return "";
-      }
-
-      requireBytes(size);
-      if (requireUtf8 && !Utf8.isValidUtf8(buffer, pos, pos + size)) {
-        throw InvalidProtocolBufferException.invalidUtf8();
-      }
-      String result = new String(buffer, pos, size, Internal.UTF_8);
-      pos += size;
-      return result;
-    }
-
-    @Override
-    public <T> T readMessage(Class<T> clazz, ExtensionRegistryLite extensionRegistry)
-        throws IOException {
-      requireWireType(WIRETYPE_LENGTH_DELIMITED);
-      return readMessage(Protobuf.getInstance().schemaFor(clazz), extensionRegistry);
-    }
-
-    @Override
-    public <T> T readMessageBySchemaWithCheck(
-        Schema<T> schema, ExtensionRegistryLite extensionRegistry) throws IOException {
-      requireWireType(WIRETYPE_LENGTH_DELIMITED);
-      return readMessage(schema, extensionRegistry);
-    }
-
-    private <T> T readMessage(Schema<T> schema, ExtensionRegistryLite extensionRegistry)
-        throws IOException {
-      T newInstance = schema.newInstance();
-      mergeMessageField(newInstance, schema, extensionRegistry);
-      schema.makeImmutable(newInstance);
-      return newInstance;
-    }
-
-    @Override
-    public <T> void mergeMessageField(
-        T target, Schema<T> schema, ExtensionRegistryLite extensionRegistry) throws IOException {
-      int size = readVarint32();
-      requireBytes(size);
-
-      // Update the limit.
-      int prevLimit = limit;
-      int newLimit = pos + size;
-      limit = newLimit;
-
-      try {
-        schema.mergeFrom(target, this, extensionRegistry);
-        if (pos != newLimit) {
-          throw InvalidProtocolBufferException.parseFailure();
-        }
-      } finally {
-        // Restore the limit.
-        limit = prevLimit;
-      }
-    }
-
-    @Deprecated
-    @Override
-    public <T> T readGroup(Class<T> clazz, ExtensionRegistryLite extensionRegistry)
-        throws IOException {
-      requireWireType(WIRETYPE_START_GROUP);
-      return readGroup(Protobuf.getInstance().schemaFor(clazz), extensionRegistry);
-    }
-
-    @Deprecated
-    @Override
-    public <T> T readGroupBySchemaWithCheck(
-        Schema<T> schema, ExtensionRegistryLite extensionRegistry) throws IOException {
-      requireWireType(WIRETYPE_START_GROUP);
-      return readGroup(schema, extensionRegistry);
-    }
-
-    private <T> T readGroup(Schema<T> schema, ExtensionRegistryLite extensionRegistry)
-        throws IOException {
-      T newInstance = schema.newInstance();
-      mergeGroupField(newInstance, schema, extensionRegistry);
-      schema.makeImmutable(newInstance);
-      return newInstance;
-    }
-
-    @Override
-    public <T> void mergeGroupField(
-        T target, Schema<T> schema, ExtensionRegistryLite extensionRegistry) throws IOException {
-      int prevEndGroupTag = endGroupTag;
-      endGroupTag = WireFormat.makeTag(WireFormat.getTagFieldNumber(tag), WIRETYPE_END_GROUP);
-
-      try {
-        schema.mergeFrom(target, this, extensionRegistry);
-        if (tag != endGroupTag) {
-          throw InvalidProtocolBufferException.parseFailure();
-        }
-      } finally {
-        // Restore the old end group tag.
-        endGroupTag = prevEndGroupTag;
-      }
-    }
-
-    @Override
-    public ByteString readBytes() throws IOException {
-      requireWireType(WIRETYPE_LENGTH_DELIMITED);
-      int size = readVarint32();
-      if (size == 0) {
-        return ByteString.EMPTY;
-      }
-
-      requireBytes(size);
-      ByteString bytes =
-          bufferIsImmutable
-              ? ByteString.wrap(buffer, pos, size)
-              : ByteString.copyFrom(buffer, pos, size);
-      pos += size;
-      return bytes;
-    }
-
-    @Override
-    public int readUInt32() throws IOException {
-      requireWireType(WIRETYPE_VARINT);
-      return readVarint32();
-    }
-
-    @Override
-    public int readEnum() throws IOException {
-      requireWireType(WIRETYPE_VARINT);
-      return readVarint32();
-    }
-
-    @Override
-    public int readSFixed32() throws IOException {
-      requireWireType(WIRETYPE_FIXED32);
-      return readLittleEndian32();
-    }
-
-    @Override
-    public long readSFixed64() throws IOException {
-      requireWireType(WIRETYPE_FIXED64);
-      return readLittleEndian64();
-    }
-
-    @Override
-    public int readSInt32() throws IOException {
-      requireWireType(WIRETYPE_VARINT);
-      return CodedInputStream.decodeZigZag32(readVarint32());
-    }
-
-    @Override
-    public long readSInt64() throws IOException {
-      requireWireType(WIRETYPE_VARINT);
-      return CodedInputStream.decodeZigZag64(readVarint64());
-    }
-
-    @Override
-    public void readDoubleList(List<Double> target) throws IOException {
-      if (target instanceof DoubleArrayList) {
-        DoubleArrayList plist = (DoubleArrayList) target;
-        switch (WireFormat.getTagWireType(tag)) {
-          case WIRETYPE_LENGTH_DELIMITED:
-            final int bytes = readVarint32();
-            verifyPackedFixed64Length(bytes);
-            final int fieldEndPos = pos + bytes;
-            while (pos < fieldEndPos) {
-              plist.addDouble(Double.longBitsToDouble(readLittleEndian64_NoCheck()));
-            }
-            break;
-          case WIRETYPE_FIXED64:
-            while (true) {
-              plist.addDouble(readDouble());
-
-              if (isAtEnd()) {
-                return;
-              }
-              int prevPos = pos;
-              int nextTag = readVarint32();
-              if (nextTag != tag) {
-                // We've reached the end of the repeated field. Rewind the buffer position to before
-                // the new tag.
-                pos = prevPos;
-                return;
-              }
-            }
-          default:
-            throw InvalidProtocolBufferException.invalidWireType();
-        }
-      } else {
-        switch (WireFormat.getTagWireType(tag)) {
-          case WIRETYPE_LENGTH_DELIMITED:
-            final int bytes = readVarint32();
-            verifyPackedFixed64Length(bytes);
-            final int fieldEndPos = pos + bytes;
-            while (pos < fieldEndPos) {
-              target.add(Double.longBitsToDouble(readLittleEndian64_NoCheck()));
-            }
-            break;
-          case WIRETYPE_FIXED64:
-            while (true) {
-              target.add(readDouble());
-
-              if (isAtEnd()) {
-                return;
-              }
-              int prevPos = pos;
-              int nextTag = readVarint32();
-              if (nextTag != tag) {
-                // We've reached the end of the repeated field. Rewind the buffer position to before
-                // the new tag.
-                pos = prevPos;
-                return;
-              }
-            }
-          default:
-            throw InvalidProtocolBufferException.invalidWireType();
-        }
-      }
-    }
-
-    @Override
-    public void readFloatList(List<Float> target) throws IOException {
-      if (target instanceof FloatArrayList) {
-        FloatArrayList plist = (FloatArrayList) target;
-        switch (WireFormat.getTagWireType(tag)) {
-          case WIRETYPE_LENGTH_DELIMITED:
-            final int bytes = readVarint32();
-            verifyPackedFixed32Length(bytes);
-            final int fieldEndPos = pos + bytes;
-            while (pos < fieldEndPos) {
-              plist.addFloat(Float.intBitsToFloat(readLittleEndian32_NoCheck()));
-            }
-            break;
-          case WIRETYPE_FIXED32:
-            while (true) {
-              plist.addFloat(readFloat());
-
-              if (isAtEnd()) {
-                return;
-              }
-              int prevPos = pos;
-              int nextTag = readVarint32();
-              if (nextTag != tag) {
-                // We've reached the end of the repeated field. Rewind the buffer position to before
-                // the new tag.
-                pos = prevPos;
-                return;
-              }
-            }
-          default:
-            throw InvalidProtocolBufferException.invalidWireType();
-        }
-      } else {
-        switch (WireFormat.getTagWireType(tag)) {
-          case WIRETYPE_LENGTH_DELIMITED:
-            final int bytes = readVarint32();
-            verifyPackedFixed32Length(bytes);
-            final int fieldEndPos = pos + bytes;
-            while (pos < fieldEndPos) {
-              target.add(Float.intBitsToFloat(readLittleEndian32_NoCheck()));
-            }
-            break;
-          case WIRETYPE_FIXED32:
-            while (true) {
-              target.add(readFloat());
-
-              if (isAtEnd()) {
-                return;
-              }
-              int prevPos = pos;
-              int nextTag = readVarint32();
-              if (nextTag != tag) {
-                // We've reached the end of the repeated field. Rewind the buffer position to before
-                // the new tag.
-                pos = prevPos;
-                return;
-              }
-            }
-          default:
-            throw InvalidProtocolBufferException.invalidWireType();
-        }
-      }
-    }
-
-    @Override
-    public void readUInt64List(List<Long> target) throws IOException {
-      if (target instanceof LongArrayList) {
-        LongArrayList plist = (LongArrayList) target;
-        switch (WireFormat.getTagWireType(tag)) {
-          case WIRETYPE_LENGTH_DELIMITED:
-            final int bytes = readVarint32();
-            final int fieldEndPos = pos + bytes;
-            while (pos < fieldEndPos) {
-              plist.addLong(readVarint64());
-            }
-            requirePosition(fieldEndPos);
-            break;
-          case WIRETYPE_VARINT:
-            while (true) {
-              plist.addLong(readUInt64());
-
-              if (isAtEnd()) {
-                return;
-              }
-              int prevPos = pos;
-              int nextTag = readVarint32();
-              if (nextTag != tag) {
-                // We've reached the end of the repeated field. Rewind the buffer position to before
-                // the new tag.
-                pos = prevPos;
-                return;
-              }
-            }
-          default:
-            throw InvalidProtocolBufferException.invalidWireType();
-        }
-      } else {
-        switch (WireFormat.getTagWireType(tag)) {
-          case WIRETYPE_LENGTH_DELIMITED:
-            final int bytes = readVarint32();
-            final int fieldEndPos = pos + bytes;
-            while (pos < fieldEndPos) {
-              target.add(readVarint64());
-            }
-            requirePosition(fieldEndPos);
-            break;
-          case WIRETYPE_VARINT:
-            while (true) {
-              target.add(readUInt64());
-
-              if (isAtEnd()) {
-                return;
-              }
-              int prevPos = pos;
-              int nextTag = readVarint32();
-              if (nextTag != tag) {
-                // We've reached the end of the repeated field. Rewind the buffer position to before
-                // the new tag.
-                pos = prevPos;
-                return;
-              }
-            }
-          default:
-            throw InvalidProtocolBufferException.invalidWireType();
-        }
-      }
-    }
-
-    @Override
-    public void readInt64List(List<Long> target) throws IOException {
-      if (target instanceof LongArrayList) {
-        LongArrayList plist = (LongArrayList) target;
-        switch (WireFormat.getTagWireType(tag)) {
-          case WIRETYPE_LENGTH_DELIMITED:
-            final int bytes = readVarint32();
-            final int fieldEndPos = pos + bytes;
-            while (pos < fieldEndPos) {
-              plist.addLong(readVarint64());
-            }
-            requirePosition(fieldEndPos);
-            break;
-          case WIRETYPE_VARINT:
-            while (true) {
-              plist.addLong(readInt64());
-
-              if (isAtEnd()) {
-                return;
-              }
-              int prevPos = pos;
-              int nextTag = readVarint32();
-              if (nextTag != tag) {
-                // We've reached the end of the repeated field. Rewind the buffer position to before
-                // the new tag.
-                pos = prevPos;
-                return;
-              }
-            }
-          default:
-            throw InvalidProtocolBufferException.invalidWireType();
-        }
-      } else {
-        switch (WireFormat.getTagWireType(tag)) {
-          case WIRETYPE_LENGTH_DELIMITED:
-            final int bytes = readVarint32();
-            final int fieldEndPos = pos + bytes;
-            while (pos < fieldEndPos) {
-              target.add(readVarint64());
-            }
-            requirePosition(fieldEndPos);
-            break;
-          case WIRETYPE_VARINT:
-            while (true) {
-              target.add(readInt64());
-
-              if (isAtEnd()) {
-                return;
-              }
-              int prevPos = pos;
-              int nextTag = readVarint32();
-              if (nextTag != tag) {
-                // We've reached the end of the repeated field. Rewind the buffer position to before
-                // the new tag.
-                pos = prevPos;
-                return;
-              }
-            }
-          default:
-            throw InvalidProtocolBufferException.invalidWireType();
-        }
-      }
-    }
-
-    @Override
-    public void readInt32List(List<Integer> target) throws IOException {
-      if (target instanceof IntArrayList) {
-        IntArrayList plist = (IntArrayList) target;
-        switch (WireFormat.getTagWireType(tag)) {
-          case WIRETYPE_LENGTH_DELIMITED:
-            final int bytes = readVarint32();
-            final int fieldEndPos = pos + bytes;
-            while (pos < fieldEndPos) {
-              plist.addInt(readVarint32());
-            }
-            requirePosition(fieldEndPos);
-            break;
-          case WIRETYPE_VARINT:
-            while (true) {
-              plist.addInt(readInt32());
-
-              if (isAtEnd()) {
-                return;
-              }
-              int prevPos = pos;
-              int nextTag = readVarint32();
-              if (nextTag != tag) {
-                // We've reached the end of the repeated field. Rewind the buffer position to before
-                // the new tag.
-                pos = prevPos;
-                return;
-              }
-            }
-          default:
-            throw InvalidProtocolBufferException.invalidWireType();
-        }
-      } else {
-        switch (WireFormat.getTagWireType(tag)) {
-          case WIRETYPE_LENGTH_DELIMITED:
-            final int bytes = readVarint32();
-            final int fieldEndPos = pos + bytes;
-            while (pos < fieldEndPos) {
-              target.add(readVarint32());
-            }
-            requirePosition(fieldEndPos);
-            break;
-          case WIRETYPE_VARINT:
-            while (true) {
-              target.add(readInt32());
-
-              if (isAtEnd()) {
-                return;
-              }
-              int prevPos = pos;
-              int nextTag = readVarint32();
-              if (nextTag != tag) {
-                // We've reached the end of the repeated field. Rewind the buffer position to before
-                // the new tag.
-                pos = prevPos;
-                return;
-              }
-            }
-          default:
-            throw InvalidProtocolBufferException.invalidWireType();
-        }
-      }
-    }
-
-    @Override
-    public void readFixed64List(List<Long> target) throws IOException {
-      if (target instanceof LongArrayList) {
-        LongArrayList plist = (LongArrayList) target;
-        switch (WireFormat.getTagWireType(tag)) {
-          case WIRETYPE_LENGTH_DELIMITED:
-            final int bytes = readVarint32();
-            verifyPackedFixed64Length(bytes);
-            final int fieldEndPos = pos + bytes;
-            while (pos < fieldEndPos) {
-              plist.addLong(readLittleEndian64_NoCheck());
-            }
-            break;
-          case WIRETYPE_FIXED64:
-            while (true) {
-              plist.addLong(readFixed64());
-
-              if (isAtEnd()) {
-                return;
-              }
-              int prevPos = pos;
-              int nextTag = readVarint32();
-              if (nextTag != tag) {
-                // We've reached the end of the repeated field. Rewind the buffer position to before
-                // the new tag.
-                pos = prevPos;
-                return;
-              }
-            }
-          default:
-            throw InvalidProtocolBufferException.invalidWireType();
-        }
-      } else {
-        switch (WireFormat.getTagWireType(tag)) {
-          case WIRETYPE_LENGTH_DELIMITED:
-            final int bytes = readVarint32();
-            verifyPackedFixed64Length(bytes);
-            final int fieldEndPos = pos + bytes;
-            while (pos < fieldEndPos) {
-              target.add(readLittleEndian64_NoCheck());
-            }
-            break;
-          case WIRETYPE_FIXED64:
-            while (true) {
-              target.add(readFixed64());
-
-              if (isAtEnd()) {
-                return;
-              }
-              int prevPos = pos;
-              int nextTag = readVarint32();
-              if (nextTag != tag) {
-                // We've reached the end of the repeated field. Rewind the buffer position to before
-                // the new tag.
-                pos = prevPos;
-                return;
-              }
-            }
-          default:
-            throw InvalidProtocolBufferException.invalidWireType();
-        }
-      }
-    }
-
-    @Override
-    public void readFixed32List(List<Integer> target) throws IOException {
-      if (target instanceof IntArrayList) {
-        IntArrayList plist = (IntArrayList) target;
-        switch (WireFormat.getTagWireType(tag)) {
-          case WIRETYPE_LENGTH_DELIMITED:
-            final int bytes = readVarint32();
-            verifyPackedFixed32Length(bytes);
-            final int fieldEndPos = pos + bytes;
-            while (pos < fieldEndPos) {
-              plist.addInt(readLittleEndian32_NoCheck());
-            }
-            break;
-          case WIRETYPE_FIXED32:
-            while (true) {
-              plist.addInt(readFixed32());
-
-              if (isAtEnd()) {
-                return;
-              }
-              int prevPos = pos;
-              int nextTag = readVarint32();
-              if (nextTag != tag) {
-                // We've reached the end of the repeated field. Rewind the buffer position to before
-                // the new tag.
-                pos = prevPos;
-                return;
-              }
-            }
-          default:
-            throw InvalidProtocolBufferException.invalidWireType();
-        }
-      } else {
-        switch (WireFormat.getTagWireType(tag)) {
-          case WIRETYPE_LENGTH_DELIMITED:
-            final int bytes = readVarint32();
-            verifyPackedFixed32Length(bytes);
-            final int fieldEndPos = pos + bytes;
-            while (pos < fieldEndPos) {
-              target.add(readLittleEndian32_NoCheck());
-            }
-            break;
-          case WIRETYPE_FIXED32:
-            while (true) {
-              target.add(readFixed32());
-
-              if (isAtEnd()) {
-                return;
-              }
-              int prevPos = pos;
-              int nextTag = readVarint32();
-              if (nextTag != tag) {
-                // We've reached the end of the repeated field. Rewind the buffer position to before
-                // the new tag.
-                pos = prevPos;
-                return;
-              }
-            }
-          default:
-            throw InvalidProtocolBufferException.invalidWireType();
-        }
-      }
-    }
-
-    @Override
-    public void readBoolList(List<Boolean> target) throws IOException {
-      if (target instanceof BooleanArrayList) {
-        BooleanArrayList plist = (BooleanArrayList) target;
-        switch (WireFormat.getTagWireType(tag)) {
-          case WIRETYPE_LENGTH_DELIMITED:
-            final int bytes = readVarint32();
-            final int fieldEndPos = pos + bytes;
-            while (pos < fieldEndPos) {
-              plist.addBoolean(readVarint32() != 0);
-            }
-            requirePosition(fieldEndPos);
-            break;
-          case WIRETYPE_VARINT:
-            while (true) {
-              plist.addBoolean(readBool());
-
-              if (isAtEnd()) {
-                return;
-              }
-              int prevPos = pos;
-              int nextTag = readVarint32();
-              if (nextTag != tag) {
-                // We've reached the end of the repeated field. Rewind the buffer position to before
-                // the new tag.
-                pos = prevPos;
-                return;
-              }
-            }
-          default:
-            throw InvalidProtocolBufferException.invalidWireType();
-        }
-      } else {
-        switch (WireFormat.getTagWireType(tag)) {
-          case WIRETYPE_LENGTH_DELIMITED:
-            final int bytes = readVarint32();
-            final int fieldEndPos = pos + bytes;
-            while (pos < fieldEndPos) {
-              target.add(readVarint32() != 0);
-            }
-            requirePosition(fieldEndPos);
-            break;
-          case WIRETYPE_VARINT:
-            while (true) {
-              target.add(readBool());
-
-              if (isAtEnd()) {
-                return;
-              }
-              int prevPos = pos;
-              int nextTag = readVarint32();
-              if (nextTag != tag) {
-                // We've reached the end of the repeated field. Rewind the buffer position to before
-                // the new tag.
-                pos = prevPos;
-                return;
-              }
-            }
-          default:
-            throw InvalidProtocolBufferException.invalidWireType();
-        }
-      }
-    }
-
-    @Override
-    public void readStringList(List<String> target) throws IOException {
-      readStringListInternal(target, false);
-    }
-
-    @Override
-    public void readStringListRequireUtf8(List<String> target) throws IOException {
-      readStringListInternal(target, true);
-    }
-
-    public void readStringListInternal(List<String> target, boolean requireUtf8)
-        throws IOException {
-      if (WireFormat.getTagWireType(tag) != WIRETYPE_LENGTH_DELIMITED) {
-        throw InvalidProtocolBufferException.invalidWireType();
-      }
-
-      if (target instanceof LazyStringList && !requireUtf8) {
-        LazyStringList lazyList = (LazyStringList) target;
-        while (true) {
-          lazyList.add(readBytes());
-
-          if (isAtEnd()) {
-            return;
-          }
-          int prevPos = pos;
-          int nextTag = readVarint32();
-          if (nextTag != tag) {
-            // We've reached the end of the repeated field. Rewind the buffer position to before
-            // the new tag.
-            pos = prevPos;
-            return;
-          }
-        }
-      } else {
-        while (true) {
-          target.add(readStringInternal(requireUtf8));
-
-          if (isAtEnd()) {
-            return;
-          }
-          int prevPos = pos;
-          int nextTag = readVarint32();
-          if (nextTag != tag) {
-            // We've reached the end of the repeated field. Rewind the buffer position to before
-            // the new tag.
-            pos = prevPos;
-            return;
-          }
-        }
-      }
-    }
-
-    @Override
-    public <T> void readMessageList(
-        List<T> target, Class<T> targetType, ExtensionRegistryLite extensionRegistry)
-        throws IOException {
-      final Schema<T> schema = Protobuf.getInstance().schemaFor(targetType);
-      readMessageList(target, schema, extensionRegistry);
-    }
-
-    @Override
-    public <T> void readMessageList(
-        List<T> target, Schema<T> schema, ExtensionRegistryLite extensionRegistry)
-        throws IOException {
-      if (WireFormat.getTagWireType(tag) != WIRETYPE_LENGTH_DELIMITED) {
-        throw InvalidProtocolBufferException.invalidWireType();
-      }
-      final int listTag = tag;
-      while (true) {
-        target.add(readMessage(schema, extensionRegistry));
-
-        if (isAtEnd()) {
-          return;
-        }
-        int prevPos = pos;
-        int nextTag = readVarint32();
-        if (nextTag != listTag) {
-          // We've reached the end of the repeated field. Rewind the buffer position to before
-          // the new tag.
-          pos = prevPos;
-          return;
-        }
-      }
-    }
-
-    @Deprecated
-    @Override
-    public <T> void readGroupList(
-        List<T> target, Class<T> targetType, ExtensionRegistryLite extensionRegistry)
-        throws IOException {
-      final Schema<T> schema = Protobuf.getInstance().schemaFor(targetType);
-      readGroupList(target, schema, extensionRegistry);
-    }
-
-    @Deprecated
-    @Override
-    public <T> void readGroupList(
-        List<T> target, Schema<T> schema, ExtensionRegistryLite extensionRegistry)
-        throws IOException {
-      if (WireFormat.getTagWireType(tag) != WIRETYPE_START_GROUP) {
-        throw InvalidProtocolBufferException.invalidWireType();
-      }
-      final int listTag = tag;
-      while (true) {
-        target.add(readGroup(schema, extensionRegistry));
-
-        if (isAtEnd()) {
-          return;
-        }
-        int prevPos = pos;
-        int nextTag = readVarint32();
-        if (nextTag != listTag) {
-          // We've reached the end of the repeated field. Rewind the buffer position to before
-          // the new tag.
-          pos = prevPos;
-          return;
-        }
-      }
-    }
-
-    @Override
-    public void readBytesList(List<ByteString> target) throws IOException {
-      if (WireFormat.getTagWireType(tag) != WIRETYPE_LENGTH_DELIMITED) {
-        throw InvalidProtocolBufferException.invalidWireType();
-      }
-
-      while (true) {
-        target.add(readBytes());
-
-        if (isAtEnd()) {
-          return;
-        }
-        int prevPos = pos;
-        int nextTag = readVarint32();
-        if (nextTag != tag) {
-          // We've reached the end of the repeated field. Rewind the buffer position to before
-          // the new tag.
-          pos = prevPos;
-          return;
-        }
-      }
-    }
-
-    @Override
-    public void readUInt32List(List<Integer> target) throws IOException {
-      if (target instanceof IntArrayList) {
-        IntArrayList plist = (IntArrayList) target;
-        switch (WireFormat.getTagWireType(tag)) {
-          case WIRETYPE_LENGTH_DELIMITED:
-            final int bytes = readVarint32();
-            final int fieldEndPos = pos + bytes;
-            while (pos < fieldEndPos) {
-              plist.addInt(readVarint32());
-            }
-            break;
-          case WIRETYPE_VARINT:
-            while (true) {
-              plist.addInt(readUInt32());
-
-              if (isAtEnd()) {
-                return;
-              }
-              int prevPos = pos;
-              int nextTag = readVarint32();
-              if (nextTag != tag) {
-                // We've reached the end of the repeated field. Rewind the buffer position to before
-                // the new tag.
-                pos = prevPos;
-                return;
-              }
-            }
-          default:
-            throw InvalidProtocolBufferException.invalidWireType();
-        }
-      } else {
-        switch (WireFormat.getTagWireType(tag)) {
-          case WIRETYPE_LENGTH_DELIMITED:
-            final int bytes = readVarint32();
-            final int fieldEndPos = pos + bytes;
-            while (pos < fieldEndPos) {
-              target.add(readVarint32());
-            }
-            break;
-          case WIRETYPE_VARINT:
-            while (true) {
-              target.add(readUInt32());
-
-              if (isAtEnd()) {
-                return;
-              }
-              int prevPos = pos;
-              int nextTag = readVarint32();
-              if (nextTag != tag) {
-                // We've reached the end of the repeated field. Rewind the buffer position to before
-                // the new tag.
-                pos = prevPos;
-                return;
-              }
-            }
-          default:
-            throw InvalidProtocolBufferException.invalidWireType();
-        }
-      }
-    }
-
-    @Override
-    public void readEnumList(List<Integer> target) throws IOException {
-      if (target instanceof IntArrayList) {
-        IntArrayList plist = (IntArrayList) target;
-        switch (WireFormat.getTagWireType(tag)) {
-          case WIRETYPE_LENGTH_DELIMITED:
-            final int bytes = readVarint32();
-            final int fieldEndPos = pos + bytes;
-            while (pos < fieldEndPos) {
-              plist.addInt(readVarint32());
-            }
-            break;
-          case WIRETYPE_VARINT:
-            while (true) {
-              plist.addInt(readEnum());
-
-              if (isAtEnd()) {
-                return;
-              }
-              int prevPos = pos;
-              int nextTag = readVarint32();
-              if (nextTag != tag) {
-                // We've reached the end of the repeated field. Rewind the buffer position to before
-                // the new tag.
-                pos = prevPos;
-                return;
-              }
-            }
-          default:
-            throw InvalidProtocolBufferException.invalidWireType();
-        }
-      } else {
-        switch (WireFormat.getTagWireType(tag)) {
-          case WIRETYPE_LENGTH_DELIMITED:
-            final int bytes = readVarint32();
-            final int fieldEndPos = pos + bytes;
-            while (pos < fieldEndPos) {
-              target.add(readVarint32());
-            }
-            break;
-          case WIRETYPE_VARINT:
-            while (true) {
-              target.add(readEnum());
-
-              if (isAtEnd()) {
-                return;
-              }
-              int prevPos = pos;
-              int nextTag = readVarint32();
-              if (nextTag != tag) {
-                // We've reached the end of the repeated field. Rewind the buffer position to before
-                // the new tag.
-                pos = prevPos;
-                return;
-              }
-            }
-          default:
-            throw InvalidProtocolBufferException.invalidWireType();
-        }
-      }
-    }
-
-    @Override
-    public void readSFixed32List(List<Integer> target) throws IOException {
-      if (target instanceof IntArrayList) {
-        IntArrayList plist = (IntArrayList) target;
-        switch (WireFormat.getTagWireType(tag)) {
-          case WIRETYPE_LENGTH_DELIMITED:
-            final int bytes = readVarint32();
-            verifyPackedFixed32Length(bytes);
-            final int fieldEndPos = pos + bytes;
-            while (pos < fieldEndPos) {
-              plist.addInt(readLittleEndian32_NoCheck());
-            }
-            break;
-          case WIRETYPE_FIXED32:
-            while (true) {
-              plist.addInt(readSFixed32());
-
-              if (isAtEnd()) {
-                return;
-              }
-              int prevPos = pos;
-              int nextTag = readVarint32();
-              if (nextTag != tag) {
-                // We've reached the end of the repeated field. Rewind the buffer position to before
-                // the new tag.
-                pos = prevPos;
-                return;
-              }
-            }
-          default:
-            throw InvalidProtocolBufferException.invalidWireType();
-        }
-      } else {
-        switch (WireFormat.getTagWireType(tag)) {
-          case WIRETYPE_LENGTH_DELIMITED:
-            final int bytes = readVarint32();
-            verifyPackedFixed32Length(bytes);
-            final int fieldEndPos = pos + bytes;
-            while (pos < fieldEndPos) {
-              target.add(readLittleEndian32_NoCheck());
-            }
-            break;
-          case WIRETYPE_FIXED32:
-            while (true) {
-              target.add(readSFixed32());
-
-              if (isAtEnd()) {
-                return;
-              }
-              int prevPos = pos;
-              int nextTag = readVarint32();
-              if (nextTag != tag) {
-                // We've reached the end of the repeated field. Rewind the buffer position to before
-                // the new tag.
-                pos = prevPos;
-                return;
-              }
-            }
-          default:
-            throw InvalidProtocolBufferException.invalidWireType();
-        }
-      }
-    }
-
-    @Override
-    public void readSFixed64List(List<Long> target) throws IOException {
-      if (target instanceof LongArrayList) {
-        LongArrayList plist = (LongArrayList) target;
-        switch (WireFormat.getTagWireType(tag)) {
-          case WIRETYPE_LENGTH_DELIMITED:
-            final int bytes = readVarint32();
-            verifyPackedFixed64Length(bytes);
-            final int fieldEndPos = pos + bytes;
-            while (pos < fieldEndPos) {
-              plist.addLong(readLittleEndian64_NoCheck());
-            }
-            break;
-          case WIRETYPE_FIXED64:
-            while (true) {
-              plist.addLong(readSFixed64());
-
-              if (isAtEnd()) {
-                return;
-              }
-              int prevPos = pos;
-              int nextTag = readVarint32();
-              if (nextTag != tag) {
-                // We've reached the end of the repeated field. Rewind the buffer position to before
-                // the new tag.
-                pos = prevPos;
-                return;
-              }
-            }
-          default:
-            throw InvalidProtocolBufferException.invalidWireType();
-        }
-      } else {
-        switch (WireFormat.getTagWireType(tag)) {
-          case WIRETYPE_LENGTH_DELIMITED:
-            final int bytes = readVarint32();
-            verifyPackedFixed64Length(bytes);
-            final int fieldEndPos = pos + bytes;
-            while (pos < fieldEndPos) {
-              target.add(readLittleEndian64_NoCheck());
-            }
-            break;
-          case WIRETYPE_FIXED64:
-            while (true) {
-              target.add(readSFixed64());
-
-              if (isAtEnd()) {
-                return;
-              }
-              int prevPos = pos;
-              int nextTag = readVarint32();
-              if (nextTag != tag) {
-                // We've reached the end of the repeated field. Rewind the buffer position to before
-                // the new tag.
-                pos = prevPos;
-                return;
-              }
-            }
-          default:
-            throw InvalidProtocolBufferException.invalidWireType();
-        }
-      }
-    }
-
-    @Override
-    public void readSInt32List(List<Integer> target) throws IOException {
-      if (target instanceof IntArrayList) {
-        IntArrayList plist = (IntArrayList) target;
-        switch (WireFormat.getTagWireType(tag)) {
-          case WIRETYPE_LENGTH_DELIMITED:
-            final int bytes = readVarint32();
-            final int fieldEndPos = pos + bytes;
-            while (pos < fieldEndPos) {
-              plist.addInt(CodedInputStream.decodeZigZag32(readVarint32()));
-            }
-            break;
-          case WIRETYPE_VARINT:
-            while (true) {
-              plist.addInt(readSInt32());
-
-              if (isAtEnd()) {
-                return;
-              }
-              int prevPos = pos;
-              int nextTag = readVarint32();
-              if (nextTag != tag) {
-                // We've reached the end of the repeated field. Rewind the buffer position to before
-                // the new tag.
-                pos = prevPos;
-                return;
-              }
-            }
-          default:
-            throw InvalidProtocolBufferException.invalidWireType();
-        }
-      } else {
-        switch (WireFormat.getTagWireType(tag)) {
-          case WIRETYPE_LENGTH_DELIMITED:
-            final int bytes = readVarint32();
-            final int fieldEndPos = pos + bytes;
-            while (pos < fieldEndPos) {
-              target.add(CodedInputStream.decodeZigZag32(readVarint32()));
-            }
-            break;
-          case WIRETYPE_VARINT:
-            while (true) {
-              target.add(readSInt32());
-
-              if (isAtEnd()) {
-                return;
-              }
-              int prevPos = pos;
-              int nextTag = readVarint32();
-              if (nextTag != tag) {
-                // We've reached the end of the repeated field. Rewind the buffer position to before
-                // the new tag.
-                pos = prevPos;
-                return;
-              }
-            }
-          default:
-            throw InvalidProtocolBufferException.invalidWireType();
-        }
-      }
-    }
-
-    @Override
-    public void readSInt64List(List<Long> target) throws IOException {
-      if (target instanceof LongArrayList) {
-        LongArrayList plist = (LongArrayList) target;
-        switch (WireFormat.getTagWireType(tag)) {
-          case WIRETYPE_LENGTH_DELIMITED:
-            final int bytes = readVarint32();
-            final int fieldEndPos = pos + bytes;
-            while (pos < fieldEndPos) {
-              plist.addLong(CodedInputStream.decodeZigZag64(readVarint64()));
-            }
-            break;
-          case WIRETYPE_VARINT:
-            while (true) {
-              plist.addLong(readSInt64());
-
-              if (isAtEnd()) {
-                return;
-              }
-              int prevPos = pos;
-              int nextTag = readVarint32();
-              if (nextTag != tag) {
-                // We've reached the end of the repeated field. Rewind the buffer position to before
-                // the new tag.
-                pos = prevPos;
-                return;
-              }
-            }
-          default:
-            throw InvalidProtocolBufferException.invalidWireType();
-        }
-      } else {
-        switch (WireFormat.getTagWireType(tag)) {
-          case WIRETYPE_LENGTH_DELIMITED:
-            final int bytes = readVarint32();
-            final int fieldEndPos = pos + bytes;
-            while (pos < fieldEndPos) {
-              target.add(CodedInputStream.decodeZigZag64(readVarint64()));
-            }
-            break;
-          case WIRETYPE_VARINT:
-            while (true) {
-              target.add(readSInt64());
-
-              if (isAtEnd()) {
-                return;
-              }
-              int prevPos = pos;
-              int nextTag = readVarint32();
-              if (nextTag != tag) {
-                // We've reached the end of the repeated field. Rewind the buffer position to before
-                // the new tag.
-                pos = prevPos;
-                return;
-              }
-            }
-          default:
-            throw InvalidProtocolBufferException.invalidWireType();
-        }
-      }
-    }
-
-    @SuppressWarnings("unchecked")
-    @Override
-    public <K, V> void readMap(
-        Map<K, V> target,
-        MapEntryLite.Metadata<K, V> metadata,
-        ExtensionRegistryLite extensionRegistry)
-        throws IOException {
-      requireWireType(WIRETYPE_LENGTH_DELIMITED);
-      int size = readVarint32();
-      requireBytes(size);
-
-      // Update the limit.
-      int prevLimit = limit;
-      int newLimit = pos + size;
-      limit = newLimit;
-
-      try {
-        K key = metadata.defaultKey;
-        V value = metadata.defaultValue;
-        while (true) {
-          int number = getFieldNumber();
-          if (number == READ_DONE) {
-            break;
-          }
-          try {
-            switch (number) {
-              case 1:
-                key = (K) readField(metadata.keyType, null, null);
-                break;
-              case 2:
-                value =
-                    (V)
-                        readField(
-                            metadata.valueType,
-                            metadata.defaultValue.getClass(),
-                            extensionRegistry);
-                break;
-              default:
-                if (!skipField()) {
-                  throw new InvalidProtocolBufferException("Unable to parse map entry.");
-                }
-                break;
-            }
-          } catch (InvalidProtocolBufferException.InvalidWireTypeException ignore) {
-            // the type doesn't match, skip the field.
-            if (!skipField()) {
-              throw new InvalidProtocolBufferException("Unable to parse map entry.");
-            }
-          }
-        }
-        target.put(key, value);
-      } finally {
-        // Restore the limit.
-        limit = prevLimit;
-      }
-    }
-
-    private Object readField(
-        WireFormat.FieldType fieldType,
-        Class<?> messageType,
-        ExtensionRegistryLite extensionRegistry)
-        throws IOException {
-      switch (fieldType) {
-        case BOOL:
-          return readBool();
-        case BYTES:
-          return readBytes();
-        case DOUBLE:
-          return readDouble();
-        case ENUM:
-          return readEnum();
-        case FIXED32:
-          return readFixed32();
-        case FIXED64:
-          return readFixed64();
-        case FLOAT:
-          return readFloat();
-        case INT32:
-          return readInt32();
-        case INT64:
-          return readInt64();
-        case MESSAGE:
-          return readMessage(messageType, extensionRegistry);
-        case SFIXED32:
-          return readSFixed32();
-        case SFIXED64:
-          return readSFixed64();
-        case SINT32:
-          return readSInt32();
-        case SINT64:
-          return readSInt64();
-        case STRING:
-          return readStringRequireUtf8();
-        case UINT32:
-          return readUInt32();
-        case UINT64:
-          return readUInt64();
-        default:
-          throw new RuntimeException("unsupported field type.");
-      }
-    }
-
-    /** Read a raw Varint from the stream. If larger than 32 bits, discard the upper bits. */
-    private int readVarint32() throws IOException {
-      // See implementation notes for readRawVarint64
-      int i = pos;
-
-      if (limit == pos) {
-        throw InvalidProtocolBufferException.truncatedMessage();
-      }
-
-      int x;
-      if ((x = buffer[i++]) >= 0) {
-        pos = i;
-        return x;
-      } else if (limit - i < 9) {
-        return (int) readVarint64SlowPath();
-      } else if ((x ^= (buffer[i++] << 7)) < 0) {
-        x ^= (~0 << 7);
-      } else if ((x ^= (buffer[i++] << 14)) >= 0) {
-        x ^= (~0 << 7) ^ (~0 << 14);
-      } else if ((x ^= (buffer[i++] << 21)) < 0) {
-        x ^= (~0 << 7) ^ (~0 << 14) ^ (~0 << 21);
-      } else {
-        int y = buffer[i++];
-        x ^= y << 28;
-        x ^= (~0 << 7) ^ (~0 << 14) ^ (~0 << 21) ^ (~0 << 28);
-        if (y < 0
-            && buffer[i++] < 0
-            && buffer[i++] < 0
-            && buffer[i++] < 0
-            && buffer[i++] < 0
-            && buffer[i++] < 0) {
-          throw InvalidProtocolBufferException.malformedVarint();
-        }
-      }
-      pos = i;
-      return x;
-    }
-
-    public long readVarint64() throws IOException {
-      // Implementation notes:
-      //
-      // Optimized for one-byte values, expected to be common.
-      // The particular code below was selected from various candidates
-      // empirically, by winning VarintBenchmark.
-      //
-      // Sign extension of (signed) Java bytes is usually a nuisance, but
-      // we exploit it here to more easily obtain the sign of bytes read.
-      // Instead of cleaning up the sign extension bits by masking eagerly,
-      // we delay until we find the final (positive) byte, when we clear all
-      // accumulated bits with one xor.  We depend on javac to constant fold.
-      int i = pos;
-
-      if (limit == i) {
-        throw InvalidProtocolBufferException.truncatedMessage();
-      }
-
-      final byte[] buffer = this.buffer;
-      long x;
-      int y;
-      if ((y = buffer[i++]) >= 0) {
-        pos = i;
-        return y;
-      } else if (limit - i < 9) {
-        return readVarint64SlowPath();
-      } else if ((y ^= (buffer[i++] << 7)) < 0) {
-        x = y ^ (~0 << 7);
-      } else if ((y ^= (buffer[i++] << 14)) >= 0) {
-        x = y ^ ((~0 << 7) ^ (~0 << 14));
-      } else if ((y ^= (buffer[i++] << 21)) < 0) {
-        x = y ^ ((~0 << 7) ^ (~0 << 14) ^ (~0 << 21));
-      } else if ((x = y ^ ((long) buffer[i++] << 28)) >= 0L) {
-        x ^= (~0L << 7) ^ (~0L << 14) ^ (~0L << 21) ^ (~0L << 28);
-      } else if ((x ^= ((long) buffer[i++] << 35)) < 0L) {
-        x ^= (~0L << 7) ^ (~0L << 14) ^ (~0L << 21) ^ (~0L << 28) ^ (~0L << 35);
-      } else if ((x ^= ((long) buffer[i++] << 42)) >= 0L) {
-        x ^= (~0L << 7) ^ (~0L << 14) ^ (~0L << 21) ^ (~0L << 28) ^ (~0L << 35) ^ (~0L << 42);
-      } else if ((x ^= ((long) buffer[i++] << 49)) < 0L) {
-        x ^=
-            (~0L << 7)
-                ^ (~0L << 14)
-                ^ (~0L << 21)
-                ^ (~0L << 28)
-                ^ (~0L << 35)
-                ^ (~0L << 42)
-                ^ (~0L << 49);
-      } else {
-        x ^= ((long) buffer[i++] << 56);
-        x ^=
-            (~0L << 7)
-                ^ (~0L << 14)
-                ^ (~0L << 21)
-                ^ (~0L << 28)
-                ^ (~0L << 35)
-                ^ (~0L << 42)
-                ^ (~0L << 49)
-                ^ (~0L << 56);
-        if (x < 0L) {
-          if (buffer[i++] < 0L) {
-            throw InvalidProtocolBufferException.malformedVarint();
-          }
-        }
-      }
-      pos = i;
-      return x;
-    }
-
-    private long readVarint64SlowPath() throws IOException {
-      long result = 0;
-      for (int shift = 0; shift < 64; shift += 7) {
-        final byte b = readByte();
-        result |= (long) (b & 0x7F) << shift;
-        if ((b & 0x80) == 0) {
-          return result;
-        }
-      }
-      throw InvalidProtocolBufferException.malformedVarint();
-    }
-
-    private byte readByte() throws IOException {
-      if (pos == limit) {
-        throw InvalidProtocolBufferException.truncatedMessage();
-      }
-      return buffer[pos++];
-    }
-
-    private int readLittleEndian32() throws IOException {
-      requireBytes(FIXED32_SIZE);
-      return readLittleEndian32_NoCheck();
-    }
-
-    private long readLittleEndian64() throws IOException {
-      requireBytes(FIXED64_SIZE);
-      return readLittleEndian64_NoCheck();
-    }
-
-    private int readLittleEndian32_NoCheck() {
-      int p = pos;
-      final byte[] buffer = this.buffer;
-      pos = p + FIXED32_SIZE;
-      return (((buffer[p] & 0xff))
-          | ((buffer[p + 1] & 0xff) << 8)
-          | ((buffer[p + 2] & 0xff) << 16)
-          | ((buffer[p + 3] & 0xff) << 24));
-    }
-
-    private long readLittleEndian64_NoCheck() {
-      int p = pos;
-      final byte[] buffer = this.buffer;
-      pos = p + FIXED64_SIZE;
-      return (((buffer[p] & 0xffL))
-          | ((buffer[p + 1] & 0xffL) << 8)
-          | ((buffer[p + 2] & 0xffL) << 16)
-          | ((buffer[p + 3] & 0xffL) << 24)
-          | ((buffer[p + 4] & 0xffL) << 32)
-          | ((buffer[p + 5] & 0xffL) << 40)
-          | ((buffer[p + 6] & 0xffL) << 48)
-          | ((buffer[p + 7] & 0xffL) << 56));
-    }
-
-    private void skipVarint() throws IOException {
-      if (limit - pos >= 10) {
-        final byte[] buffer = this.buffer;
-        int p = pos;
-        for (int i = 0; i < 10; i++) {
-          if (buffer[p++] >= 0) {
-            pos = p;
-            return;
-          }
-        }
-      }
-      skipVarintSlowPath();
-    }
-
-    private void skipVarintSlowPath() throws IOException {
-      for (int i = 0; i < 10; i++) {
-        if (readByte() >= 0) {
-          return;
-        }
-      }
-      throw InvalidProtocolBufferException.malformedVarint();
-    }
-
-    private void skipBytes(final int size) throws IOException {
-      requireBytes(size);
-
-      pos += size;
-    }
-
-    private void skipGroup() throws IOException {
-      int prevEndGroupTag = endGroupTag;
-      endGroupTag = WireFormat.makeTag(WireFormat.getTagFieldNumber(tag), WIRETYPE_END_GROUP);
-      while (true) {
-        if (getFieldNumber() == READ_DONE || !skipField()) {
-          break;
-        }
-      }
-      if (tag != endGroupTag) {
-        throw InvalidProtocolBufferException.parseFailure();
-      }
-      endGroupTag = prevEndGroupTag;
-    }
-
-    private void requireBytes(int size) throws IOException {
-      if (size < 0 || size > (limit - pos)) {
-        throw InvalidProtocolBufferException.truncatedMessage();
-      }
-    }
-
-    private void requireWireType(int requiredWireType) throws IOException {
-      if (WireFormat.getTagWireType(tag) != requiredWireType) {
-        throw InvalidProtocolBufferException.invalidWireType();
-      }
-    }
-
-    private void verifyPackedFixed64Length(int bytes) throws IOException {
-      requireBytes(bytes);
-      if ((bytes & FIXED64_MULTIPLE_MASK) != 0) {
-        // Require that the number of bytes be a multiple of 8.
-        throw InvalidProtocolBufferException.parseFailure();
-      }
-    }
-
-    private void verifyPackedFixed32Length(int bytes) throws IOException {
-      requireBytes(bytes);
-      if ((bytes & FIXED32_MULTIPLE_MASK) != 0) {
-        // Require that the number of bytes be a multiple of 4.
-        throw InvalidProtocolBufferException.parseFailure();
-      }
-    }
-
-    private void requirePosition(int expectedPosition) throws IOException {
-      if (pos != expectedPosition) {
-        throw InvalidProtocolBufferException.truncatedMessage();
-      }
-    }
-  }
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/BinaryWriter.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/BinaryWriter.java
deleted file mode 100644
index cf394e3..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/BinaryWriter.java
+++ /dev/null
@@ -1,3081 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.protobuf.Internal.checkNotNull;
-import static com.google.protobuf.WireFormat.FIXED32_SIZE;
-import static com.google.protobuf.WireFormat.FIXED64_SIZE;
-import static com.google.protobuf.WireFormat.MAX_VARINT32_SIZE;
-import static com.google.protobuf.WireFormat.MAX_VARINT64_SIZE;
-import static com.google.protobuf.WireFormat.MESSAGE_SET_ITEM;
-import static com.google.protobuf.WireFormat.MESSAGE_SET_MESSAGE;
-import static com.google.protobuf.WireFormat.MESSAGE_SET_TYPE_ID;
-import static com.google.protobuf.WireFormat.WIRETYPE_END_GROUP;
-import static com.google.protobuf.WireFormat.WIRETYPE_FIXED32;
-import static com.google.protobuf.WireFormat.WIRETYPE_FIXED64;
-import static com.google.protobuf.WireFormat.WIRETYPE_LENGTH_DELIMITED;
-import static com.google.protobuf.WireFormat.WIRETYPE_START_GROUP;
-import static com.google.protobuf.WireFormat.WIRETYPE_VARINT;
-
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-import java.util.ArrayDeque;
-import java.util.List;
-import java.util.Map;
-import java.util.Queue;
-
-/**
- * A protobuf writer that serializes messages in their binary form. Messages are serialized in
- * reverse in order to avoid calculating the serialized size of each nested message. Since the
- * message size is not known in advance, the writer employs a strategy of chunking and buffer
- * chaining. Buffers are allocated as-needed by a provided {@link BufferAllocator}. Once writing is
- * finished, the application can access the buffers in forward-writing order by calling {@link
- * #complete()}.
- *
- * <p>Once {@link #complete()} has been called, the writer can not be reused for additional writes.
- * The {@link #getTotalBytesWritten()} will continue to reflect the total of the write and will not
- * be reset.
- */
-@CheckReturnValue
-@ExperimentalApi
-abstract class BinaryWriter extends ByteOutput implements Writer {
-  public static final int DEFAULT_CHUNK_SIZE = 4096;
-
-  private final BufferAllocator alloc;
-  private final int chunkSize;
-
-  final ArrayDeque<AllocatedBuffer> buffers = new ArrayDeque<AllocatedBuffer>(4);
-  int totalDoneBytes;
-
-  /**
-   * Creates a new {@link BinaryWriter} that will allocate heap buffers of {@link
-   * #DEFAULT_CHUNK_SIZE} as necessary.
-   */
-  public static BinaryWriter newHeapInstance(BufferAllocator alloc) {
-    return newHeapInstance(alloc, DEFAULT_CHUNK_SIZE);
-  }
-
-  /**
-   * Creates a new {@link BinaryWriter} that will allocate heap buffers of {@code chunkSize} as
-   * necessary.
-   */
-  public static BinaryWriter newHeapInstance(BufferAllocator alloc, int chunkSize) {
-    return isUnsafeHeapSupported()
-        ? newUnsafeHeapInstance(alloc, chunkSize)
-        : newSafeHeapInstance(alloc, chunkSize);
-  }
-
-  /**
-   * Creates a new {@link BinaryWriter} that will allocate direct (i.e. non-heap) buffers of {@link
-   * #DEFAULT_CHUNK_SIZE} as necessary.
-   */
-  public static BinaryWriter newDirectInstance(BufferAllocator alloc) {
-    return newDirectInstance(alloc, DEFAULT_CHUNK_SIZE);
-  }
-
-  /**
-   * Creates a new {@link BinaryWriter} that will allocate direct (i.e. non-heap) buffers of {@code
-   * chunkSize} as necessary.
-   */
-  public static BinaryWriter newDirectInstance(BufferAllocator alloc, int chunkSize) {
-    return isUnsafeDirectSupported()
-        ? newUnsafeDirectInstance(alloc, chunkSize)
-        : newSafeDirectInstance(alloc, chunkSize);
-  }
-
-  static boolean isUnsafeHeapSupported() {
-    return UnsafeHeapWriter.isSupported();
-  }
-
-  static boolean isUnsafeDirectSupported() {
-    return UnsafeDirectWriter.isSupported();
-  }
-
-  static BinaryWriter newSafeHeapInstance(BufferAllocator alloc, int chunkSize) {
-    return new SafeHeapWriter(alloc, chunkSize);
-  }
-
-  static BinaryWriter newUnsafeHeapInstance(BufferAllocator alloc, int chunkSize) {
-    if (!isUnsafeHeapSupported()) {
-      throw new UnsupportedOperationException("Unsafe operations not supported");
-    }
-    return new UnsafeHeapWriter(alloc, chunkSize);
-  }
-
-  static BinaryWriter newSafeDirectInstance(BufferAllocator alloc, int chunkSize) {
-    return new SafeDirectWriter(alloc, chunkSize);
-  }
-
-  static BinaryWriter newUnsafeDirectInstance(BufferAllocator alloc, int chunkSize) {
-    if (!isUnsafeDirectSupported()) {
-      throw new UnsupportedOperationException("Unsafe operations not supported");
-    }
-    return new UnsafeDirectWriter(alloc, chunkSize);
-  }
-
-  /** Only allow subclassing for inner classes. */
-  private BinaryWriter(BufferAllocator alloc, int chunkSize) {
-    if (chunkSize <= 0) {
-      throw new IllegalArgumentException("chunkSize must be > 0");
-    }
-    this.alloc = checkNotNull(alloc, "alloc");
-    this.chunkSize = chunkSize;
-  }
-
-  @Override
-  public final FieldOrder fieldOrder() {
-    return FieldOrder.DESCENDING;
-  }
-
-  /**
-   * Completes the write operation and returns a queue of {@link AllocatedBuffer} objects in
-   * forward-writing order. This method should only be called once.
-   *
-   * <p>After calling this method, the writer can not be reused. Create a new writer for future
-   * writes.
-   */
-  @CanIgnoreReturnValue
-  public final Queue<AllocatedBuffer> complete() {
-    finishCurrentBuffer();
-    return buffers;
-  }
-
-  @Override
-  public final void writeSFixed32(int fieldNumber, int value) throws IOException {
-    writeFixed32(fieldNumber, value);
-  }
-
-  @Override
-  public final void writeInt64(int fieldNumber, long value) throws IOException {
-    writeUInt64(fieldNumber, value);
-  }
-
-  @Override
-  public final void writeSFixed64(int fieldNumber, long value) throws IOException {
-    writeFixed64(fieldNumber, value);
-  }
-
-  @Override
-  public final void writeFloat(int fieldNumber, float value) throws IOException {
-    writeFixed32(fieldNumber, Float.floatToRawIntBits(value));
-  }
-
-  @Override
-  public final void writeDouble(int fieldNumber, double value) throws IOException {
-    writeFixed64(fieldNumber, Double.doubleToRawLongBits(value));
-  }
-
-  @Override
-  public final void writeEnum(int fieldNumber, int value) throws IOException {
-    writeInt32(fieldNumber, value);
-  }
-
-  @Override
-  public final void writeInt32List(int fieldNumber, List<Integer> list, boolean packed)
-      throws IOException {
-    if (list instanceof IntArrayList) {
-      writeInt32List_Internal(fieldNumber, (IntArrayList) list, packed);
-    } else {
-      writeInt32List_Internal(fieldNumber, list, packed);
-    }
-  }
-
-  private final void writeInt32List_Internal(int fieldNumber, List<Integer> list, boolean packed)
-      throws IOException {
-    if (packed) {
-      requireSpace((MAX_VARINT32_SIZE * 2) + (list.size() * MAX_VARINT64_SIZE));
-      int prevBytes = getTotalBytesWritten();
-      for (int i = list.size() - 1; i >= 0; --i) {
-        writeInt32(list.get(i));
-      }
-      int length = getTotalBytesWritten() - prevBytes;
-      writeVarint32(length);
-      writeTag(fieldNumber, WIRETYPE_LENGTH_DELIMITED);
-    } else {
-      for (int i = list.size() - 1; i >= 0; --i) {
-        writeInt32(fieldNumber, list.get(i));
-      }
-    }
-  }
-
-  private final void writeInt32List_Internal(int fieldNumber, IntArrayList list, boolean packed)
-      throws IOException {
-    if (packed) {
-      requireSpace((MAX_VARINT32_SIZE * 2) + (list.size() * MAX_VARINT64_SIZE));
-      int prevBytes = getTotalBytesWritten();
-      for (int i = list.size() - 1; i >= 0; --i) {
-        writeInt32(list.getInt(i));
-      }
-      int length = getTotalBytesWritten() - prevBytes;
-      writeVarint32(length);
-      writeTag(fieldNumber, WIRETYPE_LENGTH_DELIMITED);
-    } else {
-      for (int i = list.size() - 1; i >= 0; --i) {
-        writeInt32(fieldNumber, list.getInt(i));
-      }
-    }
-  }
-
-  @Override
-  public final void writeFixed32List(int fieldNumber, List<Integer> list, boolean packed)
-      throws IOException {
-    if (list instanceof IntArrayList) {
-      writeFixed32List_Internal(fieldNumber, (IntArrayList) list, packed);
-    } else {
-      writeFixed32List_Internal(fieldNumber, list, packed);
-    }
-  }
-
-  private final void writeFixed32List_Internal(int fieldNumber, List<Integer> list, boolean packed)
-      throws IOException {
-    if (packed) {
-      requireSpace((MAX_VARINT32_SIZE * 2) + (list.size() * FIXED32_SIZE));
-      int prevBytes = getTotalBytesWritten();
-      for (int i = list.size() - 1; i >= 0; --i) {
-        writeFixed32(list.get(i));
-      }
-      int length = getTotalBytesWritten() - prevBytes;
-      writeVarint32(length);
-      writeTag(fieldNumber, WIRETYPE_LENGTH_DELIMITED);
-    } else {
-      for (int i = list.size() - 1; i >= 0; --i) {
-        writeFixed32(fieldNumber, list.get(i));
-      }
-    }
-  }
-
-  private final void writeFixed32List_Internal(int fieldNumber, IntArrayList list, boolean packed)
-      throws IOException {
-    if (packed) {
-      requireSpace((MAX_VARINT32_SIZE * 2) + (list.size() * FIXED32_SIZE));
-      int prevBytes = getTotalBytesWritten();
-      for (int i = list.size() - 1; i >= 0; --i) {
-        writeFixed32(list.getInt(i));
-      }
-      int length = getTotalBytesWritten() - prevBytes;
-      writeVarint32(length);
-      writeTag(fieldNumber, WIRETYPE_LENGTH_DELIMITED);
-    } else {
-      for (int i = list.size() - 1; i >= 0; --i) {
-        writeFixed32(fieldNumber, list.getInt(i));
-      }
-    }
-  }
-
-  @Override
-  public final void writeInt64List(int fieldNumber, List<Long> list, boolean packed)
-      throws IOException {
-    writeUInt64List(fieldNumber, list, packed);
-  }
-
-  @Override
-  public final void writeUInt64List(int fieldNumber, List<Long> list, boolean packed)
-      throws IOException {
-    if (list instanceof LongArrayList) {
-      writeUInt64List_Internal(fieldNumber, (LongArrayList) list, packed);
-    } else {
-      writeUInt64List_Internal(fieldNumber, list, packed);
-    }
-  }
-
-  private final void writeUInt64List_Internal(int fieldNumber, List<Long> list, boolean packed)
-      throws IOException {
-    if (packed) {
-      requireSpace((MAX_VARINT32_SIZE * 2) + (list.size() * MAX_VARINT64_SIZE));
-      int prevBytes = getTotalBytesWritten();
-      for (int i = list.size() - 1; i >= 0; --i) {
-        writeVarint64(list.get(i));
-      }
-      int length = getTotalBytesWritten() - prevBytes;
-      writeVarint32(length);
-      writeTag(fieldNumber, WIRETYPE_LENGTH_DELIMITED);
-    } else {
-      for (int i = list.size() - 1; i >= 0; --i) {
-        writeUInt64(fieldNumber, list.get(i));
-      }
-    }
-  }
-
-  private final void writeUInt64List_Internal(int fieldNumber, LongArrayList list, boolean packed)
-      throws IOException {
-    if (packed) {
-      requireSpace((MAX_VARINT32_SIZE * 2) + (list.size() * MAX_VARINT64_SIZE));
-      int prevBytes = getTotalBytesWritten();
-      for (int i = list.size() - 1; i >= 0; --i) {
-        writeVarint64(list.getLong(i));
-      }
-      int length = getTotalBytesWritten() - prevBytes;
-      writeVarint32(length);
-      writeTag(fieldNumber, WIRETYPE_LENGTH_DELIMITED);
-    } else {
-      for (int i = list.size() - 1; i >= 0; --i) {
-        writeUInt64(fieldNumber, list.getLong(i));
-      }
-    }
-  }
-
-  @Override
-  public final void writeFixed64List(int fieldNumber, List<Long> list, boolean packed)
-      throws IOException {
-    if (list instanceof LongArrayList) {
-      writeFixed64List_Internal(fieldNumber, (LongArrayList) list, packed);
-    } else {
-      writeFixed64List_Internal(fieldNumber, list, packed);
-    }
-  }
-
-  private final void writeFixed64List_Internal(int fieldNumber, List<Long> list, boolean packed)
-      throws IOException {
-    if (packed) {
-      requireSpace((MAX_VARINT32_SIZE * 2) + (list.size() * FIXED64_SIZE));
-      int prevBytes = getTotalBytesWritten();
-      for (int i = list.size() - 1; i >= 0; --i) {
-        writeFixed64(list.get(i));
-      }
-      int length = getTotalBytesWritten() - prevBytes;
-      writeVarint32(length);
-      writeTag(fieldNumber, WIRETYPE_LENGTH_DELIMITED);
-    } else {
-      for (int i = list.size() - 1; i >= 0; --i) {
-        writeFixed64(fieldNumber, list.get(i));
-      }
-    }
-  }
-
-  private final void writeFixed64List_Internal(int fieldNumber, LongArrayList list, boolean packed)
-      throws IOException {
-    if (packed) {
-      requireSpace((MAX_VARINT32_SIZE * 2) + (list.size() * FIXED64_SIZE));
-      int prevBytes = getTotalBytesWritten();
-      for (int i = list.size() - 1; i >= 0; --i) {
-        writeFixed64(list.getLong(i));
-      }
-      int length = getTotalBytesWritten() - prevBytes;
-      writeVarint32(length);
-      writeTag(fieldNumber, WIRETYPE_LENGTH_DELIMITED);
-    } else {
-      for (int i = list.size() - 1; i >= 0; --i) {
-        writeFixed64(fieldNumber, list.getLong(i));
-      }
-    }
-  }
-
-  @Override
-  public final void writeFloatList(int fieldNumber, List<Float> list, boolean packed)
-      throws IOException {
-    if (list instanceof FloatArrayList) {
-      writeFloatList_Internal(fieldNumber, (FloatArrayList) list, packed);
-    } else {
-      writeFloatList_Internal(fieldNumber, list, packed);
-    }
-  }
-
-  private final void writeFloatList_Internal(int fieldNumber, List<Float> list, boolean packed)
-      throws IOException {
-    if (packed) {
-      requireSpace((MAX_VARINT32_SIZE * 2) + (list.size() * FIXED32_SIZE));
-      int prevBytes = getTotalBytesWritten();
-      for (int i = list.size() - 1; i >= 0; --i) {
-        writeFixed32(Float.floatToRawIntBits(list.get(i)));
-      }
-      int length = getTotalBytesWritten() - prevBytes;
-      writeVarint32(length);
-      writeTag(fieldNumber, WIRETYPE_LENGTH_DELIMITED);
-    } else {
-      for (int i = list.size() - 1; i >= 0; --i) {
-        writeFloat(fieldNumber, list.get(i));
-      }
-    }
-  }
-
-  private final void writeFloatList_Internal(int fieldNumber, FloatArrayList list, boolean packed)
-      throws IOException {
-    if (packed) {
-      requireSpace((MAX_VARINT32_SIZE * 2) + (list.size() * FIXED32_SIZE));
-      int prevBytes = getTotalBytesWritten();
-      for (int i = list.size() - 1; i >= 0; --i) {
-        writeFixed32(Float.floatToRawIntBits(list.getFloat(i)));
-      }
-      int length = getTotalBytesWritten() - prevBytes;
-      writeVarint32(length);
-      writeTag(fieldNumber, WIRETYPE_LENGTH_DELIMITED);
-    } else {
-      for (int i = list.size() - 1; i >= 0; --i) {
-        writeFloat(fieldNumber, list.getFloat(i));
-      }
-    }
-  }
-
-  @Override
-  public final void writeDoubleList(int fieldNumber, List<Double> list, boolean packed)
-      throws IOException {
-    if (list instanceof DoubleArrayList) {
-      writeDoubleList_Internal(fieldNumber, (DoubleArrayList) list, packed);
-    } else {
-      writeDoubleList_Internal(fieldNumber, list, packed);
-    }
-  }
-
-  private final void writeDoubleList_Internal(int fieldNumber, List<Double> list, boolean packed)
-      throws IOException {
-    if (packed) {
-      requireSpace((MAX_VARINT32_SIZE * 2) + (list.size() * FIXED64_SIZE));
-      int prevBytes = getTotalBytesWritten();
-      for (int i = list.size() - 1; i >= 0; --i) {
-        writeFixed64(Double.doubleToRawLongBits(list.get(i)));
-      }
-      int length = getTotalBytesWritten() - prevBytes;
-      writeVarint32(length);
-      writeTag(fieldNumber, WIRETYPE_LENGTH_DELIMITED);
-    } else {
-      for (int i = list.size() - 1; i >= 0; --i) {
-        writeDouble(fieldNumber, list.get(i));
-      }
-    }
-  }
-
-  private final void writeDoubleList_Internal(int fieldNumber, DoubleArrayList list, boolean packed)
-      throws IOException {
-    if (packed) {
-      requireSpace((MAX_VARINT32_SIZE * 2) + (list.size() * FIXED64_SIZE));
-      int prevBytes = getTotalBytesWritten();
-      for (int i = list.size() - 1; i >= 0; --i) {
-        writeFixed64(Double.doubleToRawLongBits(list.getDouble(i)));
-      }
-      int length = getTotalBytesWritten() - prevBytes;
-      writeVarint32(length);
-      writeTag(fieldNumber, WIRETYPE_LENGTH_DELIMITED);
-    } else {
-      for (int i = list.size() - 1; i >= 0; --i) {
-        writeDouble(fieldNumber, list.getDouble(i));
-      }
-    }
-  }
-
-  @Override
-  public final void writeEnumList(int fieldNumber, List<Integer> list, boolean packed)
-      throws IOException {
-    writeInt32List(fieldNumber, list, packed);
-  }
-
-  @Override
-  public final void writeBoolList(int fieldNumber, List<Boolean> list, boolean packed)
-      throws IOException {
-    if (list instanceof BooleanArrayList) {
-      writeBoolList_Internal(fieldNumber, (BooleanArrayList) list, packed);
-    } else {
-      writeBoolList_Internal(fieldNumber, list, packed);
-    }
-  }
-
-  private final void writeBoolList_Internal(int fieldNumber, List<Boolean> list, boolean packed)
-      throws IOException {
-    if (packed) {
-      requireSpace((MAX_VARINT32_SIZE * 2) + list.size());
-      int prevBytes = getTotalBytesWritten();
-      for (int i = list.size() - 1; i >= 0; --i) {
-        writeBool(list.get(i));
-      }
-      int length = getTotalBytesWritten() - prevBytes;
-      writeVarint32(length);
-      writeTag(fieldNumber, WIRETYPE_LENGTH_DELIMITED);
-    } else {
-      for (int i = list.size() - 1; i >= 0; --i) {
-        writeBool(fieldNumber, list.get(i));
-      }
-    }
-  }
-
-  private final void writeBoolList_Internal(int fieldNumber, BooleanArrayList list, boolean packed)
-      throws IOException {
-    if (packed) {
-      requireSpace((MAX_VARINT32_SIZE * 2) + list.size());
-      int prevBytes = getTotalBytesWritten();
-      for (int i = list.size() - 1; i >= 0; --i) {
-        writeBool(list.getBoolean(i));
-      }
-      int length = getTotalBytesWritten() - prevBytes;
-      writeVarint32(length);
-      writeTag(fieldNumber, WIRETYPE_LENGTH_DELIMITED);
-    } else {
-      for (int i = list.size() - 1; i >= 0; --i) {
-        writeBool(fieldNumber, list.getBoolean(i));
-      }
-    }
-  }
-
-  @Override
-  public final void writeStringList(int fieldNumber, List<String> list) throws IOException {
-    if (list instanceof LazyStringList) {
-      final LazyStringList lazyList = (LazyStringList) list;
-      for (int i = list.size() - 1; i >= 0; i--) {
-        writeLazyString(fieldNumber, lazyList.getRaw(i));
-      }
-    } else {
-      for (int i = list.size() - 1; i >= 0; i--) {
-        writeString(fieldNumber, list.get(i));
-      }
-    }
-  }
-
-  private void writeLazyString(int fieldNumber, Object value) throws IOException {
-    if (value instanceof String) {
-      writeString(fieldNumber, (String) value);
-    } else {
-      writeBytes(fieldNumber, (ByteString) value);
-    }
-  }
-
-  @Override
-  public final void writeBytesList(int fieldNumber, List<ByteString> list) throws IOException {
-    for (int i = list.size() - 1; i >= 0; i--) {
-      writeBytes(fieldNumber, list.get(i));
-    }
-  }
-
-  @Override
-  public final void writeUInt32List(int fieldNumber, List<Integer> list, boolean packed)
-      throws IOException {
-    if (list instanceof IntArrayList) {
-      writeUInt32List_Internal(fieldNumber, (IntArrayList) list, packed);
-    } else {
-      writeUInt32List_Internal(fieldNumber, list, packed);
-    }
-  }
-
-  private final void writeUInt32List_Internal(int fieldNumber, List<Integer> list, boolean packed)
-      throws IOException {
-    if (packed) {
-      requireSpace((MAX_VARINT32_SIZE * 2) + (list.size() * MAX_VARINT32_SIZE));
-      int prevBytes = getTotalBytesWritten();
-      for (int i = list.size() - 1; i >= 0; --i) {
-        writeVarint32(list.get(i));
-      }
-      int length = getTotalBytesWritten() - prevBytes;
-      writeVarint32(length);
-      writeTag(fieldNumber, WIRETYPE_LENGTH_DELIMITED);
-    } else {
-      for (int i = list.size() - 1; i >= 0; --i) {
-        writeUInt32(fieldNumber, list.get(i));
-      }
-    }
-  }
-
-  private final void writeUInt32List_Internal(int fieldNumber, IntArrayList list, boolean packed)
-      throws IOException {
-    if (packed) {
-      requireSpace((MAX_VARINT32_SIZE * 2) + (list.size() * MAX_VARINT32_SIZE));
-      int prevBytes = getTotalBytesWritten();
-      for (int i = list.size() - 1; i >= 0; --i) {
-        writeVarint32(list.getInt(i));
-      }
-      int length = getTotalBytesWritten() - prevBytes;
-      writeVarint32(length);
-      writeTag(fieldNumber, WIRETYPE_LENGTH_DELIMITED);
-    } else {
-      for (int i = list.size() - 1; i >= 0; --i) {
-        writeUInt32(fieldNumber, list.getInt(i));
-      }
-    }
-  }
-
-  @Override
-  public final void writeSFixed32List(int fieldNumber, List<Integer> list, boolean packed)
-      throws IOException {
-    writeFixed32List(fieldNumber, list, packed);
-  }
-
-  @Override
-  public final void writeSFixed64List(int fieldNumber, List<Long> list, boolean packed)
-      throws IOException {
-    writeFixed64List(fieldNumber, list, packed);
-  }
-
-  @Override
-  public final void writeSInt32List(int fieldNumber, List<Integer> list, boolean packed)
-      throws IOException {
-    if (list instanceof IntArrayList) {
-      writeSInt32List_Internal(fieldNumber, (IntArrayList) list, packed);
-    } else {
-      writeSInt32List_Internal(fieldNumber, list, packed);
-    }
-  }
-
-  private final void writeSInt32List_Internal(int fieldNumber, List<Integer> list, boolean packed)
-      throws IOException {
-    if (packed) {
-      requireSpace((MAX_VARINT32_SIZE * 2) + (list.size() * MAX_VARINT32_SIZE));
-      int prevBytes = getTotalBytesWritten();
-      for (int i = list.size() - 1; i >= 0; --i) {
-        writeSInt32(list.get(i));
-      }
-      int length = getTotalBytesWritten() - prevBytes;
-      writeVarint32(length);
-      writeTag(fieldNumber, WIRETYPE_LENGTH_DELIMITED);
-    } else {
-      for (int i = list.size() - 1; i >= 0; --i) {
-        writeSInt32(fieldNumber, list.get(i));
-      }
-    }
-  }
-
-  private final void writeSInt32List_Internal(int fieldNumber, IntArrayList list, boolean packed)
-      throws IOException {
-    if (packed) {
-      requireSpace((MAX_VARINT32_SIZE * 2) + (list.size() * MAX_VARINT32_SIZE));
-      int prevBytes = getTotalBytesWritten();
-      for (int i = list.size() - 1; i >= 0; --i) {
-        writeSInt32(list.getInt(i));
-      }
-      int length = getTotalBytesWritten() - prevBytes;
-      writeVarint32(length);
-      writeTag(fieldNumber, WIRETYPE_LENGTH_DELIMITED);
-    } else {
-      for (int i = list.size() - 1; i >= 0; --i) {
-        writeSInt32(fieldNumber, list.getInt(i));
-      }
-    }
-  }
-
-  @Override
-  public final void writeSInt64List(int fieldNumber, List<Long> list, boolean packed)
-      throws IOException {
-    if (list instanceof LongArrayList) {
-      writeSInt64List_Internal(fieldNumber, (LongArrayList) list, packed);
-    } else {
-      writeSInt64List_Internal(fieldNumber, list, packed);
-    }
-  }
-
-  private static final int MAP_KEY_NUMBER = 1;
-  private static final int MAP_VALUE_NUMBER = 2;
-
-  @Override
-  public <K, V> void writeMap(int fieldNumber, MapEntryLite.Metadata<K, V> metadata, Map<K, V> map)
-      throws IOException {
-    // TODO(liujisi): Reverse write those entries.
-    for (Map.Entry<K, V> entry : map.entrySet()) {
-      int prevBytes = getTotalBytesWritten();
-      writeMapEntryField(this, MAP_VALUE_NUMBER, metadata.valueType, entry.getValue());
-      writeMapEntryField(this, MAP_KEY_NUMBER, metadata.keyType, entry.getKey());
-      int length = getTotalBytesWritten() - prevBytes;
-      writeVarint32(length);
-      writeTag(fieldNumber, WIRETYPE_LENGTH_DELIMITED);
-    }
-  }
-
-  static final void writeMapEntryField(
-      Writer writer, int fieldNumber, WireFormat.FieldType fieldType, Object object)
-      throws IOException {
-    switch (fieldType) {
-      case BOOL:
-        writer.writeBool(fieldNumber, (Boolean) object);
-        break;
-      case FIXED32:
-        writer.writeFixed32(fieldNumber, (Integer) object);
-        break;
-      case FIXED64:
-        writer.writeFixed64(fieldNumber, (Long) object);
-        break;
-      case INT32:
-        writer.writeInt32(fieldNumber, (Integer) object);
-        break;
-      case INT64:
-        writer.writeInt64(fieldNumber, (Long) object);
-        break;
-      case SFIXED32:
-        writer.writeSFixed32(fieldNumber, (Integer) object);
-        break;
-      case SFIXED64:
-        writer.writeSFixed64(fieldNumber, (Long) object);
-        break;
-      case SINT32:
-        writer.writeSInt32(fieldNumber, (Integer) object);
-        break;
-      case SINT64:
-        writer.writeSInt64(fieldNumber, (Long) object);
-        break;
-      case STRING:
-        writer.writeString(fieldNumber, (String) object);
-        break;
-      case UINT32:
-        writer.writeUInt32(fieldNumber, (Integer) object);
-        break;
-      case UINT64:
-        writer.writeUInt64(fieldNumber, (Long) object);
-        break;
-      case FLOAT:
-        writer.writeFloat(fieldNumber, (Float) object);
-        break;
-      case DOUBLE:
-        writer.writeDouble(fieldNumber, (Double) object);
-        break;
-      case MESSAGE:
-        writer.writeMessage(fieldNumber, object);
-        break;
-      case BYTES:
-        writer.writeBytes(fieldNumber, (ByteString) object);
-        break;
-      case ENUM:
-        if (object instanceof Internal.EnumLite) {
-          writer.writeEnum(fieldNumber, ((Internal.EnumLite) object).getNumber());
-        } else if (object instanceof Integer) {
-          writer.writeEnum(fieldNumber, (Integer) object);
-        } else {
-          throw new IllegalArgumentException("Unexpected type for enum in map.");
-        }
-        break;
-      default:
-        throw new IllegalArgumentException("Unsupported map value type for: " + fieldType);
-    }
-  }
-
-  private final void writeSInt64List_Internal(int fieldNumber, List<Long> list, boolean packed)
-      throws IOException {
-    if (packed) {
-      requireSpace((MAX_VARINT32_SIZE * 2) + (list.size() * MAX_VARINT64_SIZE));
-      int prevBytes = getTotalBytesWritten();
-      for (int i = list.size() - 1; i >= 0; --i) {
-        writeSInt64(list.get(i));
-      }
-      int length = getTotalBytesWritten() - prevBytes;
-      writeVarint32(length);
-      writeTag(fieldNumber, WIRETYPE_LENGTH_DELIMITED);
-    } else {
-      for (int i = list.size() - 1; i >= 0; --i) {
-        writeSInt64(fieldNumber, list.get(i));
-      }
-    }
-  }
-
-  private final void writeSInt64List_Internal(int fieldNumber, LongArrayList list, boolean packed)
-      throws IOException {
-    if (packed) {
-      requireSpace((MAX_VARINT32_SIZE * 2) + (list.size() * MAX_VARINT64_SIZE));
-      int prevBytes = getTotalBytesWritten();
-      for (int i = list.size() - 1; i >= 0; --i) {
-        writeSInt64(list.getLong(i));
-      }
-      int length = getTotalBytesWritten() - prevBytes;
-      writeVarint32(length);
-      writeTag(fieldNumber, WIRETYPE_LENGTH_DELIMITED);
-    } else {
-      for (int i = list.size() - 1; i >= 0; --i) {
-        writeSInt64(fieldNumber, list.getLong(i));
-      }
-    }
-  }
-
-  @Override
-  public final void writeMessageList(int fieldNumber, List<?> list) throws IOException {
-    for (int i = list.size() - 1; i >= 0; i--) {
-      writeMessage(fieldNumber, list.get(i));
-    }
-  }
-
-  @Override
-  public final void writeMessageList(int fieldNumber, List<?> list, Schema schema)
-      throws IOException {
-    for (int i = list.size() - 1; i >= 0; i--) {
-      writeMessage(fieldNumber, list.get(i), schema);
-    }
-  }
-
-  @Deprecated
-  @Override
-  public final void writeGroupList(int fieldNumber, List<?> list) throws IOException {
-    for (int i = list.size() - 1; i >= 0; i--) {
-      writeGroup(fieldNumber, list.get(i));
-    }
-  }
-
-  @Deprecated
-  @Override
-  public final void writeGroupList(int fieldNumber, List<?> list, Schema schema)
-      throws IOException {
-    for (int i = list.size() - 1; i >= 0; i--) {
-      writeGroup(fieldNumber, list.get(i), schema);
-    }
-  }
-
-  @Override
-  public final void writeMessageSetItem(int fieldNumber, Object value) throws IOException {
-    writeTag(MESSAGE_SET_ITEM, WIRETYPE_END_GROUP);
-    if (value instanceof ByteString) {
-      writeBytes(MESSAGE_SET_MESSAGE, (ByteString) value);
-    } else {
-      writeMessage(MESSAGE_SET_MESSAGE, value);
-    }
-    writeUInt32(MESSAGE_SET_TYPE_ID, fieldNumber);
-    writeTag(MESSAGE_SET_ITEM, WIRETYPE_START_GROUP);
-  }
-
-  final AllocatedBuffer newHeapBuffer() {
-    return alloc.allocateHeapBuffer(chunkSize);
-  }
-
-  final AllocatedBuffer newHeapBuffer(int capacity) {
-    return alloc.allocateHeapBuffer(Math.max(capacity, chunkSize));
-  }
-
-  final AllocatedBuffer newDirectBuffer() {
-    return alloc.allocateDirectBuffer(chunkSize);
-  }
-
-  final AllocatedBuffer newDirectBuffer(int capacity) {
-    return alloc.allocateDirectBuffer(Math.max(capacity, chunkSize));
-  }
-
-  /**
-   * Gets the total number of bytes that have been written. This will not be reset by a call to
-   * {@link #complete()}.
-   */
-  public abstract int getTotalBytesWritten();
-
-  abstract void requireSpace(int size);
-
-  abstract void finishCurrentBuffer();
-
-  abstract void writeTag(int fieldNumber, int wireType);
-
-  abstract void writeVarint32(int value);
-
-  abstract void writeInt32(int value);
-
-  abstract void writeSInt32(int value);
-
-  abstract void writeFixed32(int value);
-
-  abstract void writeVarint64(long value);
-
-  abstract void writeSInt64(long value);
-
-  abstract void writeFixed64(long value);
-
-  abstract void writeBool(boolean value);
-
-  abstract void writeString(String in);
-
-  /**
-   * Not using the version in CodedOutputStream due to the fact that benchmarks have shown a
-   * performance improvement when returning a byte (rather than an int).
-   */
-  private static byte computeUInt64SizeNoTag(long value) {
-    // handle two popular special cases up front ...
-    if ((value & (~0L << 7)) == 0L) {
-      // Byte 1
-      return 1;
-    }
-    if (value < 0L) {
-      // Byte 10
-      return 10;
-    }
-    // ... leaving us with 8 remaining, which we can divide and conquer
-    byte n = 2;
-    if ((value & (~0L << 35)) != 0L) {
-      // Byte 6-9
-      n += 4; // + (value >>> 63);
-      value >>>= 28;
-    }
-    if ((value & (~0L << 21)) != 0L) {
-      // Byte 4-5 or 8-9
-      n += 2;
-      value >>>= 14;
-    }
-    if ((value & (~0L << 14)) != 0L) {
-      // Byte 3 or 7
-      n += 1;
-    }
-    return n;
-  }
-
-  /** Writer that uses safe operations on target array. */
-  private static final class SafeHeapWriter extends BinaryWriter {
-    private AllocatedBuffer allocatedBuffer;
-    private byte[] buffer;
-    private int offset;
-    private int limit;
-    private int offsetMinusOne;
-    private int limitMinusOne;
-    private int pos;
-
-    SafeHeapWriter(BufferAllocator alloc, int chunkSize) {
-      super(alloc, chunkSize);
-      nextBuffer();
-    }
-
-    @Override
-    void finishCurrentBuffer() {
-      if (allocatedBuffer != null) {
-        totalDoneBytes += bytesWrittenToCurrentBuffer();
-        allocatedBuffer.position((pos - allocatedBuffer.arrayOffset()) + 1);
-        allocatedBuffer = null;
-        pos = 0;
-        limitMinusOne = 0;
-      }
-    }
-
-    private void nextBuffer() {
-      nextBuffer(newHeapBuffer());
-    }
-
-    private void nextBuffer(int capacity) {
-      nextBuffer(newHeapBuffer(capacity));
-    }
-
-    private void nextBuffer(AllocatedBuffer allocatedBuffer) {
-      if (!allocatedBuffer.hasArray()) {
-        throw new RuntimeException("Allocator returned non-heap buffer");
-      }
-
-      finishCurrentBuffer();
-
-      buffers.addFirst(allocatedBuffer);
-
-      this.allocatedBuffer = allocatedBuffer;
-      this.buffer = allocatedBuffer.array();
-      int arrayOffset = allocatedBuffer.arrayOffset();
-      this.limit = arrayOffset + allocatedBuffer.limit();
-      this.offset = arrayOffset + allocatedBuffer.position();
-      this.offsetMinusOne = offset - 1;
-      this.limitMinusOne = limit - 1;
-      this.pos = limitMinusOne;
-    }
-
-    @Override
-    public int getTotalBytesWritten() {
-      return totalDoneBytes + bytesWrittenToCurrentBuffer();
-    }
-
-    int bytesWrittenToCurrentBuffer() {
-      return limitMinusOne - pos;
-    }
-
-    int spaceLeft() {
-      return pos - offsetMinusOne;
-    }
-
-    @Override
-    public void writeUInt32(int fieldNumber, int value) throws IOException {
-      requireSpace(MAX_VARINT32_SIZE * 2);
-      writeVarint32(value);
-      writeTag(fieldNumber, WIRETYPE_VARINT);
-    }
-
-    @Override
-    public void writeInt32(int fieldNumber, int value) throws IOException {
-      requireSpace(MAX_VARINT32_SIZE + MAX_VARINT64_SIZE);
-      writeInt32(value);
-      writeTag(fieldNumber, WIRETYPE_VARINT);
-    }
-
-    @Override
-    public void writeSInt32(int fieldNumber, int value) throws IOException {
-      requireSpace(MAX_VARINT32_SIZE * 2);
-      writeSInt32(value);
-      writeTag(fieldNumber, WIRETYPE_VARINT);
-    }
-
-    @Override
-    public void writeFixed32(int fieldNumber, int value) throws IOException {
-      requireSpace(MAX_VARINT32_SIZE + FIXED32_SIZE);
-      writeFixed32(value);
-      writeTag(fieldNumber, WIRETYPE_FIXED32);
-    }
-
-    @Override
-    public void writeUInt64(int fieldNumber, long value) throws IOException {
-      requireSpace(MAX_VARINT32_SIZE + MAX_VARINT64_SIZE);
-      writeVarint64(value);
-      writeTag(fieldNumber, WIRETYPE_VARINT);
-    }
-
-    @Override
-    public void writeSInt64(int fieldNumber, long value) throws IOException {
-      requireSpace(MAX_VARINT32_SIZE + MAX_VARINT64_SIZE);
-      writeSInt64(value);
-      writeTag(fieldNumber, WIRETYPE_VARINT);
-    }
-
-    @Override
-    public void writeFixed64(int fieldNumber, long value) throws IOException {
-      requireSpace(MAX_VARINT32_SIZE + FIXED64_SIZE);
-      writeFixed64(value);
-      writeTag(fieldNumber, WIRETYPE_FIXED64);
-    }
-
-    @Override
-    public void writeBool(int fieldNumber, boolean value) throws IOException {
-      requireSpace(MAX_VARINT32_SIZE + 1);
-      write((byte) (value ? 1 : 0));
-      writeTag(fieldNumber, WIRETYPE_VARINT);
-    }
-
-    @Override
-    public void writeString(int fieldNumber, String value) throws IOException {
-      int prevBytes = getTotalBytesWritten();
-      writeString(value);
-      int length = getTotalBytesWritten() - prevBytes;
-      requireSpace(2 * MAX_VARINT32_SIZE);
-      writeVarint32(length);
-      writeTag(fieldNumber, WIRETYPE_LENGTH_DELIMITED);
-    }
-
-    @Override
-    public void writeBytes(int fieldNumber, ByteString value) throws IOException {
-      try {
-        value.writeToReverse(this);
-      } catch (IOException e) {
-        // Should never happen since the writer does not throw.
-        throw new RuntimeException(e);
-      }
-
-      requireSpace(MAX_VARINT32_SIZE * 2);
-      writeVarint32(value.size());
-      writeTag(fieldNumber, WIRETYPE_LENGTH_DELIMITED);
-    }
-
-    @Override
-    public void writeMessage(int fieldNumber, Object value) throws IOException {
-      int prevBytes = getTotalBytesWritten();
-      Protobuf.getInstance().writeTo(value, this);
-      int length = getTotalBytesWritten() - prevBytes;
-      requireSpace(MAX_VARINT32_SIZE * 2);
-      writeVarint32(length);
-      writeTag(fieldNumber, WIRETYPE_LENGTH_DELIMITED);
-    }
-
-    @Override
-    public void writeMessage(int fieldNumber, Object value, Schema schema) throws IOException {
-      int prevBytes = getTotalBytesWritten();
-      schema.writeTo(value, this);
-      int length = getTotalBytesWritten() - prevBytes;
-      requireSpace(MAX_VARINT32_SIZE * 2);
-      writeVarint32(length);
-      writeTag(fieldNumber, WIRETYPE_LENGTH_DELIMITED);
-    }
-
-    @Deprecated
-    @Override
-    public void writeGroup(int fieldNumber, Object value) throws IOException {
-      writeTag(fieldNumber, WIRETYPE_END_GROUP);
-      Protobuf.getInstance().writeTo(value, this);
-      writeTag(fieldNumber, WIRETYPE_START_GROUP);
-    }
-
-    @Override
-    public void writeGroup(int fieldNumber, Object value, Schema schema) throws IOException {
-      writeTag(fieldNumber, WIRETYPE_END_GROUP);
-      schema.writeTo(value, this);
-      writeTag(fieldNumber, WIRETYPE_START_GROUP);
-    }
-
-    @Override
-    public void writeStartGroup(int fieldNumber) {
-      writeTag(fieldNumber, WIRETYPE_START_GROUP);
-    }
-
-    @Override
-    public void writeEndGroup(int fieldNumber) {
-      writeTag(fieldNumber, WIRETYPE_END_GROUP);
-    }
-
-    @Override
-    void writeInt32(int value) {
-      if (value >= 0) {
-        writeVarint32(value);
-      } else {
-        writeVarint64(value);
-      }
-    }
-
-    @Override
-    void writeSInt32(int value) {
-      writeVarint32(CodedOutputStream.encodeZigZag32(value));
-    }
-
-    @Override
-    void writeSInt64(long value) {
-      writeVarint64(CodedOutputStream.encodeZigZag64(value));
-    }
-
-    @Override
-    void writeBool(boolean value) {
-      write((byte) (value ? 1 : 0));
-    }
-
-    @Override
-    void writeTag(int fieldNumber, int wireType) {
-      writeVarint32(WireFormat.makeTag(fieldNumber, wireType));
-    }
-
-    @Override
-    void writeVarint32(int value) {
-      if ((value & (~0 << 7)) == 0) {
-        writeVarint32OneByte(value);
-      } else if ((value & (~0 << 14)) == 0) {
-        writeVarint32TwoBytes(value);
-      } else if ((value & (~0 << 21)) == 0) {
-        writeVarint32ThreeBytes(value);
-      } else if ((value & (~0 << 28)) == 0) {
-        writeVarint32FourBytes(value);
-      } else {
-        writeVarint32FiveBytes(value);
-      }
-    }
-
-    private void writeVarint32OneByte(int value) {
-      buffer[pos--] = (byte) value;
-    }
-
-    private void writeVarint32TwoBytes(int value) {
-      buffer[pos--] = (byte) (value >>> 7);
-      buffer[pos--] = (byte) ((value & 0x7F) | 0x80);
-    }
-
-    private void writeVarint32ThreeBytes(int value) {
-      buffer[pos--] = (byte) (value >>> 14);
-      buffer[pos--] = (byte) (((value >>> 7) & 0x7F) | 0x80);
-      buffer[pos--] = (byte) ((value & 0x7F) | 0x80);
-    }
-
-    private void writeVarint32FourBytes(int value) {
-      buffer[pos--] = (byte) (value >>> 21);
-      buffer[pos--] = (byte) (((value >>> 14) & 0x7F) | 0x80);
-      buffer[pos--] = (byte) (((value >>> 7) & 0x7F) | 0x80);
-      buffer[pos--] = (byte) ((value & 0x7F) | 0x80);
-    }
-
-    private void writeVarint32FiveBytes(int value) {
-      buffer[pos--] = (byte) (value >>> 28);
-      buffer[pos--] = (byte) (((value >>> 21) & 0x7F) | 0x80);
-      buffer[pos--] = (byte) (((value >>> 14) & 0x7F) | 0x80);
-      buffer[pos--] = (byte) (((value >>> 7) & 0x7F) | 0x80);
-      buffer[pos--] = (byte) ((value & 0x7F) | 0x80);
-    }
-
-    @Override
-    void writeVarint64(long value) {
-      switch (computeUInt64SizeNoTag(value)) {
-        case 1:
-          writeVarint64OneByte(value);
-          break;
-        case 2:
-          writeVarint64TwoBytes(value);
-          break;
-        case 3:
-          writeVarint64ThreeBytes(value);
-          break;
-        case 4:
-          writeVarint64FourBytes(value);
-          break;
-        case 5:
-          writeVarint64FiveBytes(value);
-          break;
-        case 6:
-          writeVarint64SixBytes(value);
-          break;
-        case 7:
-          writeVarint64SevenBytes(value);
-          break;
-        case 8:
-          writeVarint64EightBytes(value);
-          break;
-        case 9:
-          writeVarint64NineBytes(value);
-          break;
-        case 10:
-          writeVarint64TenBytes(value);
-          break;
-      }
-    }
-
-    private void writeVarint64OneByte(long value) {
-      buffer[pos--] = (byte) value;
-    }
-
-    private void writeVarint64TwoBytes(long value) {
-      buffer[pos--] = (byte) (value >>> 7);
-      buffer[pos--] = (byte) (((int) value & 0x7F) | 0x80);
-    }
-
-    private void writeVarint64ThreeBytes(long value) {
-      buffer[pos--] = (byte) (((int) value) >>> 14);
-      buffer[pos--] = (byte) (((value >>> 7) & 0x7F) | 0x80);
-      buffer[pos--] = (byte) ((value & 0x7F) | 0x80);
-    }
-
-    private void writeVarint64FourBytes(long value) {
-      buffer[pos--] = (byte) (value >>> 21);
-      buffer[pos--] = (byte) (((value >>> 14) & 0x7F) | 0x80);
-      buffer[pos--] = (byte) (((value >>> 7) & 0x7F) | 0x80);
-      buffer[pos--] = (byte) ((value & 0x7F) | 0x80);
-    }
-
-    private void writeVarint64FiveBytes(long value) {
-      buffer[pos--] = (byte) (value >>> 28);
-      buffer[pos--] = (byte) (((value >>> 21) & 0x7F) | 0x80);
-      buffer[pos--] = (byte) (((value >>> 14) & 0x7F) | 0x80);
-      buffer[pos--] = (byte) (((value >>> 7) & 0x7F) | 0x80);
-      buffer[pos--] = (byte) ((value & 0x7F) | 0x80);
-    }
-
-    private void writeVarint64SixBytes(long value) {
-      buffer[pos--] = (byte) (value >>> 35);
-      buffer[pos--] = (byte) (((value >>> 28) & 0x7F) | 0x80);
-      buffer[pos--] = (byte) (((value >>> 21) & 0x7F) | 0x80);
-      buffer[pos--] = (byte) (((value >>> 14) & 0x7F) | 0x80);
-      buffer[pos--] = (byte) (((value >>> 7) & 0x7F) | 0x80);
-      buffer[pos--] = (byte) ((value & 0x7F) | 0x80);
-    }
-
-    private void writeVarint64SevenBytes(long value) {
-      buffer[pos--] = (byte) (value >>> 42);
-      buffer[pos--] = (byte) (((value >>> 35) & 0x7F) | 0x80);
-      buffer[pos--] = (byte) (((value >>> 28) & 0x7F) | 0x80);
-      buffer[pos--] = (byte) (((value >>> 21) & 0x7F) | 0x80);
-      buffer[pos--] = (byte) (((value >>> 14) & 0x7F) | 0x80);
-      buffer[pos--] = (byte) (((value >>> 7) & 0x7F) | 0x80);
-      buffer[pos--] = (byte) ((value & 0x7F) | 0x80);
-    }
-
-    private void writeVarint64EightBytes(long value) {
-      buffer[pos--] = (byte) (value >>> 49);
-      buffer[pos--] = (byte) (((value >>> 42) & 0x7F) | 0x80);
-      buffer[pos--] = (byte) (((value >>> 35) & 0x7F) | 0x80);
-      buffer[pos--] = (byte) (((value >>> 28) & 0x7F) | 0x80);
-      buffer[pos--] = (byte) (((value >>> 21) & 0x7F) | 0x80);
-      buffer[pos--] = (byte) (((value >>> 14) & 0x7F) | 0x80);
-      buffer[pos--] = (byte) (((value >>> 7) & 0x7F) | 0x80);
-      buffer[pos--] = (byte) ((value & 0x7F) | 0x80);
-    }
-
-    private void writeVarint64NineBytes(long value) {
-      buffer[pos--] = (byte) (value >>> 56);
-      buffer[pos--] = (byte) (((value >>> 49) & 0x7F) | 0x80);
-      buffer[pos--] = (byte) (((value >>> 42) & 0x7F) | 0x80);
-      buffer[pos--] = (byte) (((value >>> 35) & 0x7F) | 0x80);
-      buffer[pos--] = (byte) (((value >>> 28) & 0x7F) | 0x80);
-      buffer[pos--] = (byte) (((value >>> 21) & 0x7F) | 0x80);
-      buffer[pos--] = (byte) (((value >>> 14) & 0x7F) | 0x80);
-      buffer[pos--] = (byte) (((value >>> 7) & 0x7F) | 0x80);
-      buffer[pos--] = (byte) ((value & 0x7F) | 0x80);
-    }
-
-    private void writeVarint64TenBytes(long value) {
-      buffer[pos--] = (byte) (value >>> 63);
-      buffer[pos--] = (byte) (((value >>> 56) & 0x7F) | 0x80);
-      buffer[pos--] = (byte) (((value >>> 49) & 0x7F) | 0x80);
-      buffer[pos--] = (byte) (((value >>> 42) & 0x7F) | 0x80);
-      buffer[pos--] = (byte) (((value >>> 35) & 0x7F) | 0x80);
-      buffer[pos--] = (byte) (((value >>> 28) & 0x7F) | 0x80);
-      buffer[pos--] = (byte) (((value >>> 21) & 0x7F) | 0x80);
-      buffer[pos--] = (byte) (((value >>> 14) & 0x7F) | 0x80);
-      buffer[pos--] = (byte) (((value >>> 7) & 0x7F) | 0x80);
-      buffer[pos--] = (byte) ((value & 0x7F) | 0x80);
-    }
-
-    @Override
-    void writeFixed32(int value) {
-      buffer[pos--] = (byte) ((value >> 24) & 0xFF);
-      buffer[pos--] = (byte) ((value >> 16) & 0xFF);
-      buffer[pos--] = (byte) ((value >> 8) & 0xFF);
-      buffer[pos--] = (byte) (value & 0xFF);
-    }
-
-    @Override
-    void writeFixed64(long value) {
-      buffer[pos--] = (byte) ((int) (value >> 56) & 0xFF);
-      buffer[pos--] = (byte) ((int) (value >> 48) & 0xFF);
-      buffer[pos--] = (byte) ((int) (value >> 40) & 0xFF);
-      buffer[pos--] = (byte) ((int) (value >> 32) & 0xFF);
-      buffer[pos--] = (byte) ((int) (value >> 24) & 0xFF);
-      buffer[pos--] = (byte) ((int) (value >> 16) & 0xFF);
-      buffer[pos--] = (byte) ((int) (value >> 8) & 0xFF);
-      buffer[pos--] = (byte) ((int) (value) & 0xFF);
-    }
-
-    @Override
-    void writeString(String in) {
-      // Request enough space to write the ASCII string.
-      requireSpace(in.length());
-
-      // We know the buffer is big enough...
-      int i = in.length() - 1;
-      // Set pos to the start of the ASCII string.
-      pos -= i;
-      // Designed to take advantage of
-      // https://wiki.openjdk.java.net/display/HotSpotInternals/RangeCheckElimination
-      for (char c; i >= 0 && (c = in.charAt(i)) < 0x80; i--) {
-        buffer[pos + i] = (byte) c;
-      }
-      if (i == -1) {
-        // Move pos past the String.
-        pos -= 1;
-        return;
-      }
-      pos += i;
-      for (char c; i >= 0; i--) {
-        c = in.charAt(i);
-        if (c < 0x80 && pos > offsetMinusOne) {
-          buffer[pos--] = (byte) c;
-        } else if (c < 0x800 && pos > offset) { // 11 bits, two UTF-8 bytes
-          buffer[pos--] = (byte) (0x80 | (0x3F & c));
-          buffer[pos--] = (byte) ((0xF << 6) | (c >>> 6));
-        } else if ((c < Character.MIN_SURROGATE || Character.MAX_SURROGATE < c)
-            && pos > (offset + 1)) {
-          // Maximum single-char code point is 0xFFFF, 16 bits, three UTF-8 bytes
-          buffer[pos--] = (byte) (0x80 | (0x3F & c));
-          buffer[pos--] = (byte) (0x80 | (0x3F & (c >>> 6)));
-          buffer[pos--] = (byte) ((0xF << 5) | (c >>> 12));
-        } else if (pos > (offset + 2)) {
-          // Minimum code point represented by a surrogate pair is 0x10000, 17 bits,
-          // four UTF-8 bytes
-          char high = 0;
-          if (i == 0 || !Character.isSurrogatePair(high = in.charAt(i - 1), c)) {
-            throw new Utf8.UnpairedSurrogateException(i - 1, i);
-          }
-          i--;
-          int codePoint = Character.toCodePoint(high, c);
-          buffer[pos--] = (byte) (0x80 | (0x3F & codePoint));
-          buffer[pos--] = (byte) (0x80 | (0x3F & (codePoint >>> 6)));
-          buffer[pos--] = (byte) (0x80 | (0x3F & (codePoint >>> 12)));
-          buffer[pos--] = (byte) ((0xF << 4) | (codePoint >>> 18));
-        } else {
-          // Buffer is full - allocate a new one and revisit the current character.
-          requireSpace(i);
-          i++;
-        }
-      }
-    }
-
-    @Override
-    public void write(byte value) {
-      buffer[pos--] = value;
-    }
-
-    @Override
-    public void write(byte[] value, int offset, int length) {
-      if (spaceLeft() < length) {
-        nextBuffer(length);
-      }
-
-      pos -= length;
-      System.arraycopy(value, offset, buffer, pos + 1, length);
-    }
-
-    @Override
-    public void writeLazy(byte[] value, int offset, int length) {
-      if (spaceLeft() < length) {
-        // We consider the value to be immutable (likely the internals of a ByteString). Just
-        // wrap it in a Netty buffer and add it to the output buffer.
-        totalDoneBytes += length;
-        buffers.addFirst(AllocatedBuffer.wrap(value, offset, length));
-
-        // Advance the writer to the next buffer.
-        // TODO(nathanmittler): Consider slicing if space available above some threshold.
-        nextBuffer();
-        return;
-      }
-
-      pos -= length;
-      System.arraycopy(value, offset, buffer, pos + 1, length);
-    }
-
-    @Override
-    public void write(ByteBuffer value) {
-      int length = value.remaining();
-      if (spaceLeft() < length) {
-        nextBuffer(length);
-      }
-
-      pos -= length;
-      value.get(buffer, pos + 1, length);
-    }
-
-    @Override
-    public void writeLazy(ByteBuffer value) {
-      int length = value.remaining();
-      if (spaceLeft() < length) {
-        // We consider the value to be immutable (likely the internals of a ByteString). Just
-        // wrap it in a Netty buffer and add it to the output buffer.
-        totalDoneBytes += length;
-        buffers.addFirst(AllocatedBuffer.wrap(value));
-
-        // Advance the writer to the next buffer.
-        // TODO(nathanmittler): Consider slicing if space available above some threshold.
-        nextBuffer();
-      }
-
-      pos -= length;
-      value.get(buffer, pos + 1, length);
-    }
-
-    @Override
-    void requireSpace(int size) {
-      if (spaceLeft() < size) {
-        nextBuffer(size);
-      }
-    }
-  }
-
-  /** Writer that uses unsafe operations on a target array. */
-  private static final class UnsafeHeapWriter extends BinaryWriter {
-    private AllocatedBuffer allocatedBuffer;
-    private byte[] buffer;
-    private long offset;
-    private long limit;
-    private long offsetMinusOne;
-    private long limitMinusOne;
-    private long pos;
-
-    UnsafeHeapWriter(BufferAllocator alloc, int chunkSize) {
-      super(alloc, chunkSize);
-      nextBuffer();
-    }
-
-    /** Indicates whether the required unsafe operations are supported on this platform. */
-    static boolean isSupported() {
-      return UnsafeUtil.hasUnsafeArrayOperations();
-    }
-
-    @Override
-    void finishCurrentBuffer() {
-      if (allocatedBuffer != null) {
-        totalDoneBytes += bytesWrittenToCurrentBuffer();
-        allocatedBuffer.position((arrayPos() - allocatedBuffer.arrayOffset()) + 1);
-        allocatedBuffer = null;
-        pos = 0;
-        limitMinusOne = 0;
-      }
-    }
-
-    private int arrayPos() {
-      return (int) pos;
-    }
-
-    private void nextBuffer() {
-      nextBuffer(newHeapBuffer());
-    }
-
-    private void nextBuffer(int capacity) {
-      nextBuffer(newHeapBuffer(capacity));
-    }
-
-    private void nextBuffer(AllocatedBuffer allocatedBuffer) {
-      if (!allocatedBuffer.hasArray()) {
-        throw new RuntimeException("Allocator returned non-heap buffer");
-      }
-
-      finishCurrentBuffer();
-      buffers.addFirst(allocatedBuffer);
-
-      this.allocatedBuffer = allocatedBuffer;
-      this.buffer = allocatedBuffer.array();
-      int arrayOffset = allocatedBuffer.arrayOffset();
-      this.limit = (long) arrayOffset + allocatedBuffer.limit();
-      this.offset = (long) arrayOffset + allocatedBuffer.position();
-      this.offsetMinusOne = offset - 1;
-      this.limitMinusOne = limit - 1;
-      this.pos = limitMinusOne;
-    }
-
-    @Override
-    public int getTotalBytesWritten() {
-      return totalDoneBytes + bytesWrittenToCurrentBuffer();
-    }
-
-    int bytesWrittenToCurrentBuffer() {
-      return (int) (limitMinusOne - pos);
-    }
-
-    int spaceLeft() {
-      return (int) (pos - offsetMinusOne);
-    }
-
-    @Override
-    public void writeUInt32(int fieldNumber, int value) {
-      requireSpace(MAX_VARINT32_SIZE * 2);
-      writeVarint32(value);
-      writeTag(fieldNumber, WIRETYPE_VARINT);
-    }
-
-    @Override
-    public void writeInt32(int fieldNumber, int value) {
-      requireSpace(MAX_VARINT32_SIZE + MAX_VARINT64_SIZE);
-      writeInt32(value);
-      writeTag(fieldNumber, WIRETYPE_VARINT);
-    }
-
-    @Override
-    public void writeSInt32(int fieldNumber, int value) {
-      requireSpace(MAX_VARINT32_SIZE * 2);
-      writeSInt32(value);
-      writeTag(fieldNumber, WIRETYPE_VARINT);
-    }
-
-    @Override
-    public void writeFixed32(int fieldNumber, int value) {
-      requireSpace(MAX_VARINT32_SIZE + FIXED32_SIZE);
-      writeFixed32(value);
-      writeTag(fieldNumber, WIRETYPE_FIXED32);
-    }
-
-    @Override
-    public void writeUInt64(int fieldNumber, long value) {
-      requireSpace(MAX_VARINT32_SIZE + MAX_VARINT64_SIZE);
-      writeVarint64(value);
-      writeTag(fieldNumber, WIRETYPE_VARINT);
-    }
-
-    @Override
-    public void writeSInt64(int fieldNumber, long value) {
-      requireSpace(MAX_VARINT32_SIZE + MAX_VARINT64_SIZE);
-      writeSInt64(value);
-      writeTag(fieldNumber, WIRETYPE_VARINT);
-    }
-
-    @Override
-    public void writeFixed64(int fieldNumber, long value) {
-      requireSpace(MAX_VARINT32_SIZE + FIXED64_SIZE);
-      writeFixed64(value);
-      writeTag(fieldNumber, WIRETYPE_FIXED64);
-    }
-
-    @Override
-    public void writeBool(int fieldNumber, boolean value) {
-      requireSpace(MAX_VARINT32_SIZE + 1);
-      write((byte) (value ? 1 : 0));
-      writeTag(fieldNumber, WIRETYPE_VARINT);
-    }
-
-    @Override
-    public void writeString(int fieldNumber, String value) {
-      int prevBytes = getTotalBytesWritten();
-      writeString(value);
-      int length = getTotalBytesWritten() - prevBytes;
-      requireSpace(2 * MAX_VARINT32_SIZE);
-      writeVarint32(length);
-      writeTag(fieldNumber, WIRETYPE_LENGTH_DELIMITED);
-    }
-
-    @Override
-    public void writeBytes(int fieldNumber, ByteString value) {
-      try {
-        value.writeToReverse(this);
-      } catch (IOException e) {
-        // Should never happen since the writer does not throw.
-        throw new RuntimeException(e);
-      }
-
-      requireSpace(MAX_VARINT32_SIZE * 2);
-      writeVarint32(value.size());
-      writeTag(fieldNumber, WIRETYPE_LENGTH_DELIMITED);
-    }
-
-    @Override
-    public void writeMessage(int fieldNumber, Object value) throws IOException {
-      int prevBytes = getTotalBytesWritten();
-      Protobuf.getInstance().writeTo(value, this);
-      int length = getTotalBytesWritten() - prevBytes;
-      requireSpace(MAX_VARINT32_SIZE * 2);
-      writeVarint32(length);
-      writeTag(fieldNumber, WIRETYPE_LENGTH_DELIMITED);
-    }
-
-    @Override
-    public void writeMessage(int fieldNumber, Object value, Schema schema) throws IOException {
-      int prevBytes = getTotalBytesWritten();
-      schema.writeTo(value, this);
-      int length = getTotalBytesWritten() - prevBytes;
-      requireSpace(MAX_VARINT32_SIZE * 2);
-      writeVarint32(length);
-      writeTag(fieldNumber, WIRETYPE_LENGTH_DELIMITED);
-    }
-
-    @Override
-    public void writeGroup(int fieldNumber, Object value) throws IOException {
-      writeTag(fieldNumber, WIRETYPE_END_GROUP);
-      Protobuf.getInstance().writeTo(value, this);
-      writeTag(fieldNumber, WIRETYPE_START_GROUP);
-    }
-
-    @Override
-    public void writeGroup(int fieldNumber, Object value, Schema schema) throws IOException {
-      writeTag(fieldNumber, WIRETYPE_END_GROUP);
-      schema.writeTo(value, this);
-      writeTag(fieldNumber, WIRETYPE_START_GROUP);
-    }
-
-    @Override
-    public void writeStartGroup(int fieldNumber) {
-      writeTag(fieldNumber, WIRETYPE_START_GROUP);
-    }
-
-    @Override
-    public void writeEndGroup(int fieldNumber) {
-      writeTag(fieldNumber, WIRETYPE_END_GROUP);
-    }
-
-    @Override
-    void writeInt32(int value) {
-      if (value >= 0) {
-        writeVarint32(value);
-      } else {
-        writeVarint64(value);
-      }
-    }
-
-    @Override
-    void writeSInt32(int value) {
-      writeVarint32(CodedOutputStream.encodeZigZag32(value));
-    }
-
-    @Override
-    void writeSInt64(long value) {
-      writeVarint64(CodedOutputStream.encodeZigZag64(value));
-    }
-
-    @Override
-    void writeBool(boolean value) {
-      write((byte) (value ? 1 : 0));
-    }
-
-    @Override
-    void writeTag(int fieldNumber, int wireType) {
-      writeVarint32(WireFormat.makeTag(fieldNumber, wireType));
-    }
-
-    @Override
-    void writeVarint32(int value) {
-      if ((value & (~0 << 7)) == 0) {
-        writeVarint32OneByte(value);
-      } else if ((value & (~0 << 14)) == 0) {
-        writeVarint32TwoBytes(value);
-      } else if ((value & (~0 << 21)) == 0) {
-        writeVarint32ThreeBytes(value);
-      } else if ((value & (~0 << 28)) == 0) {
-        writeVarint32FourBytes(value);
-      } else {
-        writeVarint32FiveBytes(value);
-      }
-    }
-
-    private void writeVarint32OneByte(int value) {
-      UnsafeUtil.putByte(buffer, pos--, (byte) value);
-    }
-
-    private void writeVarint32TwoBytes(int value) {
-      UnsafeUtil.putByte(buffer, pos--, (byte) (value >>> 7));
-      UnsafeUtil.putByte(buffer, pos--, (byte) ((value & 0x7F) | 0x80));
-    }
-
-    private void writeVarint32ThreeBytes(int value) {
-      UnsafeUtil.putByte(buffer, pos--, (byte) (value >>> 14));
-      UnsafeUtil.putByte(buffer, pos--, (byte) (((value >>> 7) & 0x7F) | 0x80));
-      UnsafeUtil.putByte(buffer, pos--, (byte) ((value & 0x7F) | 0x80));
-    }
-
-    private void writeVarint32FourBytes(int value) {
-      UnsafeUtil.putByte(buffer, pos--, (byte) (value >>> 21));
-      UnsafeUtil.putByte(buffer, pos--, (byte) (((value >>> 14) & 0x7F) | 0x80));
-      UnsafeUtil.putByte(buffer, pos--, (byte) (((value >>> 7) & 0x7F) | 0x80));
-      UnsafeUtil.putByte(buffer, pos--, (byte) ((value & 0x7F) | 0x80));
-    }
-
-    private void writeVarint32FiveBytes(int value) {
-      UnsafeUtil.putByte(buffer, pos--, (byte) (value >>> 28));
-      UnsafeUtil.putByte(buffer, pos--, (byte) (((value >>> 21) & 0x7F) | 0x80));
-      UnsafeUtil.putByte(buffer, pos--, (byte) (((value >>> 14) & 0x7F) | 0x80));
-      UnsafeUtil.putByte(buffer, pos--, (byte) (((value >>> 7) & 0x7F) | 0x80));
-      UnsafeUtil.putByte(buffer, pos--, (byte) ((value & 0x7F) | 0x80));
-    }
-
-    @Override
-    void writeVarint64(long value) {
-      switch (computeUInt64SizeNoTag(value)) {
-        case 1:
-          writeVarint64OneByte(value);
-          break;
-        case 2:
-          writeVarint64TwoBytes(value);
-          break;
-        case 3:
-          writeVarint64ThreeBytes(value);
-          break;
-        case 4:
-          writeVarint64FourBytes(value);
-          break;
-        case 5:
-          writeVarint64FiveBytes(value);
-          break;
-        case 6:
-          writeVarint64SixBytes(value);
-          break;
-        case 7:
-          writeVarint64SevenBytes(value);
-          break;
-        case 8:
-          writeVarint64EightBytes(value);
-          break;
-        case 9:
-          writeVarint64NineBytes(value);
-          break;
-        case 10:
-          writeVarint64TenBytes(value);
-          break;
-      }
-    }
-
-    private void writeVarint64OneByte(long value) {
-      UnsafeUtil.putByte(buffer, pos--, (byte) value);
-    }
-
-    private void writeVarint64TwoBytes(long value) {
-      UnsafeUtil.putByte(buffer, pos--, (byte) (value >>> 7));
-      UnsafeUtil.putByte(buffer, pos--, (byte) (((int) value & 0x7F) | 0x80));
-    }
-
-    private void writeVarint64ThreeBytes(long value) {
-      UnsafeUtil.putByte(buffer, pos--, (byte) (((int) value) >>> 14));
-      UnsafeUtil.putByte(buffer, pos--, (byte) (((value >>> 7) & 0x7F) | 0x80));
-      UnsafeUtil.putByte(buffer, pos--, (byte) ((value & 0x7F) | 0x80));
-    }
-
-    private void writeVarint64FourBytes(long value) {
-      UnsafeUtil.putByte(buffer, pos--, (byte) (value >>> 21));
-      UnsafeUtil.putByte(buffer, pos--, (byte) (((value >>> 14) & 0x7F) | 0x80));
-      UnsafeUtil.putByte(buffer, pos--, (byte) (((value >>> 7) & 0x7F) | 0x80));
-      UnsafeUtil.putByte(buffer, pos--, (byte) ((value & 0x7F) | 0x80));
-    }
-
-    private void writeVarint64FiveBytes(long value) {
-      UnsafeUtil.putByte(buffer, pos--, (byte) (value >>> 28));
-      UnsafeUtil.putByte(buffer, pos--, (byte) (((value >>> 21) & 0x7F) | 0x80));
-      UnsafeUtil.putByte(buffer, pos--, (byte) (((value >>> 14) & 0x7F) | 0x80));
-      UnsafeUtil.putByte(buffer, pos--, (byte) (((value >>> 7) & 0x7F) | 0x80));
-      UnsafeUtil.putByte(buffer, pos--, (byte) ((value & 0x7F) | 0x80));
-    }
-
-    private void writeVarint64SixBytes(long value) {
-      UnsafeUtil.putByte(buffer, pos--, (byte) (value >>> 35));
-      UnsafeUtil.putByte(buffer, pos--, (byte) (((value >>> 28) & 0x7F) | 0x80));
-      UnsafeUtil.putByte(buffer, pos--, (byte) (((value >>> 21) & 0x7F) | 0x80));
-      UnsafeUtil.putByte(buffer, pos--, (byte) (((value >>> 14) & 0x7F) | 0x80));
-      UnsafeUtil.putByte(buffer, pos--, (byte) (((value >>> 7) & 0x7F) | 0x80));
-      UnsafeUtil.putByte(buffer, pos--, (byte) ((value & 0x7F) | 0x80));
-    }
-
-    private void writeVarint64SevenBytes(long value) {
-      UnsafeUtil.putByte(buffer, pos--, (byte) (value >>> 42));
-      UnsafeUtil.putByte(buffer, pos--, (byte) (((value >>> 35) & 0x7F) | 0x80));
-      UnsafeUtil.putByte(buffer, pos--, (byte) (((value >>> 28) & 0x7F) | 0x80));
-      UnsafeUtil.putByte(buffer, pos--, (byte) (((value >>> 21) & 0x7F) | 0x80));
-      UnsafeUtil.putByte(buffer, pos--, (byte) (((value >>> 14) & 0x7F) | 0x80));
-      UnsafeUtil.putByte(buffer, pos--, (byte) (((value >>> 7) & 0x7F) | 0x80));
-      UnsafeUtil.putByte(buffer, pos--, (byte) ((value & 0x7F) | 0x80));
-    }
-
-    private void writeVarint64EightBytes(long value) {
-      UnsafeUtil.putByte(buffer, pos--, (byte) (value >>> 49));
-      UnsafeUtil.putByte(buffer, pos--, (byte) (((value >>> 42) & 0x7F) | 0x80));
-      UnsafeUtil.putByte(buffer, pos--, (byte) (((value >>> 35) & 0x7F) | 0x80));
-      UnsafeUtil.putByte(buffer, pos--, (byte) (((value >>> 28) & 0x7F) | 0x80));
-      UnsafeUtil.putByte(buffer, pos--, (byte) (((value >>> 21) & 0x7F) | 0x80));
-      UnsafeUtil.putByte(buffer, pos--, (byte) (((value >>> 14) & 0x7F) | 0x80));
-      UnsafeUtil.putByte(buffer, pos--, (byte) (((value >>> 7) & 0x7F) | 0x80));
-      UnsafeUtil.putByte(buffer, pos--, (byte) ((value & 0x7F) | 0x80));
-    }
-
-    private void writeVarint64NineBytes(long value) {
-      UnsafeUtil.putByte(buffer, pos--, (byte) (value >>> 56));
-      UnsafeUtil.putByte(buffer, pos--, (byte) (((value >>> 49) & 0x7F) | 0x80));
-      UnsafeUtil.putByte(buffer, pos--, (byte) (((value >>> 42) & 0x7F) | 0x80));
-      UnsafeUtil.putByte(buffer, pos--, (byte) (((value >>> 35) & 0x7F) | 0x80));
-      UnsafeUtil.putByte(buffer, pos--, (byte) (((value >>> 28) & 0x7F) | 0x80));
-      UnsafeUtil.putByte(buffer, pos--, (byte) (((value >>> 21) & 0x7F) | 0x80));
-      UnsafeUtil.putByte(buffer, pos--, (byte) (((value >>> 14) & 0x7F) | 0x80));
-      UnsafeUtil.putByte(buffer, pos--, (byte) (((value >>> 7) & 0x7F) | 0x80));
-      UnsafeUtil.putByte(buffer, pos--, (byte) ((value & 0x7F) | 0x80));
-    }
-
-    private void writeVarint64TenBytes(long value) {
-      UnsafeUtil.putByte(buffer, pos--, (byte) (value >>> 63));
-      UnsafeUtil.putByte(buffer, pos--, (byte) (((value >>> 56) & 0x7F) | 0x80));
-      UnsafeUtil.putByte(buffer, pos--, (byte) (((value >>> 49) & 0x7F) | 0x80));
-      UnsafeUtil.putByte(buffer, pos--, (byte) (((value >>> 42) & 0x7F) | 0x80));
-      UnsafeUtil.putByte(buffer, pos--, (byte) (((value >>> 35) & 0x7F) | 0x80));
-      UnsafeUtil.putByte(buffer, pos--, (byte) (((value >>> 28) & 0x7F) | 0x80));
-      UnsafeUtil.putByte(buffer, pos--, (byte) (((value >>> 21) & 0x7F) | 0x80));
-      UnsafeUtil.putByte(buffer, pos--, (byte) (((value >>> 14) & 0x7F) | 0x80));
-      UnsafeUtil.putByte(buffer, pos--, (byte) (((value >>> 7) & 0x7F) | 0x80));
-      UnsafeUtil.putByte(buffer, pos--, (byte) ((value & 0x7F) | 0x80));
-    }
-
-    @Override
-    void writeFixed32(int value) {
-      UnsafeUtil.putByte(buffer, pos--, (byte) ((value >> 24) & 0xFF));
-      UnsafeUtil.putByte(buffer, pos--, (byte) ((value >> 16) & 0xFF));
-      UnsafeUtil.putByte(buffer, pos--, (byte) ((value >> 8) & 0xFF));
-      UnsafeUtil.putByte(buffer, pos--, (byte) (value & 0xFF));
-    }
-
-    @Override
-    void writeFixed64(long value) {
-      UnsafeUtil.putByte(buffer, pos--, (byte) ((int) (value >> 56) & 0xFF));
-      UnsafeUtil.putByte(buffer, pos--, (byte) ((int) (value >> 48) & 0xFF));
-      UnsafeUtil.putByte(buffer, pos--, (byte) ((int) (value >> 40) & 0xFF));
-      UnsafeUtil.putByte(buffer, pos--, (byte) ((int) (value >> 32) & 0xFF));
-      UnsafeUtil.putByte(buffer, pos--, (byte) ((int) (value >> 24) & 0xFF));
-      UnsafeUtil.putByte(buffer, pos--, (byte) ((int) (value >> 16) & 0xFF));
-      UnsafeUtil.putByte(buffer, pos--, (byte) ((int) (value >> 8) & 0xFF));
-      UnsafeUtil.putByte(buffer, pos--, (byte) ((int) (value) & 0xFF));
-    }
-
-    @Override
-    void writeString(String in) {
-      // Request enough space to write the ASCII string.
-      requireSpace(in.length());
-
-      // We know the buffer is big enough...
-      int i = in.length() - 1;
-      // Set pos to the start of the ASCII string.
-      // pos -= i;
-      // Designed to take advantage of
-      // https://wiki.openjdk.java.net/display/HotSpotInternals/RangeCheckElimination
-      for (char c; i >= 0 && (c = in.charAt(i)) < 0x80; i--) {
-        UnsafeUtil.putByte(buffer, pos--, (byte) c);
-      }
-      if (i == -1) {
-        // Move pos past the String.
-        return;
-      }
-      for (char c; i >= 0; i--) {
-        c = in.charAt(i);
-        if (c < 0x80 && pos > offsetMinusOne) {
-          UnsafeUtil.putByte(buffer, pos--, (byte) c);
-        } else if (c < 0x800 && pos > offset) { // 11 bits, two UTF-8 bytes
-          UnsafeUtil.putByte(buffer, pos--, (byte) (0x80 | (0x3F & c)));
-          UnsafeUtil.putByte(buffer, pos--, (byte) ((0xF << 6) | (c >>> 6)));
-        } else if ((c < Character.MIN_SURROGATE || Character.MAX_SURROGATE < c)
-            && pos > offset + 1) {
-          // Maximum single-char code point is 0xFFFF, 16 bits, three UTF-8 bytes
-          UnsafeUtil.putByte(buffer, pos--, (byte) (0x80 | (0x3F & c)));
-          UnsafeUtil.putByte(buffer, pos--, (byte) (0x80 | (0x3F & (c >>> 6))));
-          UnsafeUtil.putByte(buffer, pos--, (byte) ((0xF << 5) | (c >>> 12)));
-        } else if (pos > offset + 2) {
-          // Minimum code point represented by a surrogate pair is 0x10000, 17 bits,
-          // four UTF-8 bytes
-          final char high;
-          if (i == 0 || !Character.isSurrogatePair(high = in.charAt(i - 1), c)) {
-            throw new Utf8.UnpairedSurrogateException(i - 1, i);
-          }
-          i--;
-          int codePoint = Character.toCodePoint(high, c);
-          UnsafeUtil.putByte(buffer, pos--, (byte) (0x80 | (0x3F & codePoint)));
-          UnsafeUtil.putByte(buffer, pos--, (byte) (0x80 | (0x3F & (codePoint >>> 6))));
-          UnsafeUtil.putByte(buffer, pos--, (byte) (0x80 | (0x3F & (codePoint >>> 12))));
-          UnsafeUtil.putByte(buffer, pos--, (byte) ((0xF << 4) | (codePoint >>> 18)));
-        } else {
-          // Buffer is full - allocate a new one and revisit the current character.
-          requireSpace(i);
-          i++;
-        }
-      }
-    }
-
-    @Override
-    public void write(byte value) {
-      UnsafeUtil.putByte(buffer, pos--, value);
-    }
-
-    @Override
-    public void write(byte[] value, int offset, int length) {
-      if (offset < 0 || offset + length > value.length) {
-        throw new ArrayIndexOutOfBoundsException(
-            String.format("value.length=%d, offset=%d, length=%d", value.length, offset, length));
-      }
-      requireSpace(length);
-
-      pos -= length;
-      System.arraycopy(value, offset, buffer, arrayPos() + 1, length);
-    }
-
-    @Override
-    public void writeLazy(byte[] value, int offset, int length) {
-      if (offset < 0 || offset + length > value.length) {
-        throw new ArrayIndexOutOfBoundsException(
-            String.format("value.length=%d, offset=%d, length=%d", value.length, offset, length));
-      }
-      if (spaceLeft() < length) {
-        // We consider the value to be immutable (likely the internals of a ByteString). Just
-        // wrap it in a Netty buffer and add it to the output buffer.
-        totalDoneBytes += length;
-        buffers.addFirst(AllocatedBuffer.wrap(value, offset, length));
-
-        // Advance the writer to the next buffer.
-        // TODO(nathanmittler): Consider slicing if space available above some threshold.
-        nextBuffer();
-        return;
-      }
-
-      pos -= length;
-      System.arraycopy(value, offset, buffer, arrayPos() + 1, length);
-    }
-
-    @Override
-    public void write(ByteBuffer value) {
-      int length = value.remaining();
-      requireSpace(length);
-
-      pos -= length;
-      value.get(buffer, arrayPos() + 1, length);
-    }
-
-    @Override
-    public void writeLazy(ByteBuffer value) {
-      int length = value.remaining();
-      if (spaceLeft() < length) {
-        // We consider the value to be immutable (likely the internals of a ByteString). Just
-        // wrap it in a Netty buffer and add it to the output buffer.
-        totalDoneBytes += length;
-        buffers.addFirst(AllocatedBuffer.wrap(value));
-
-        // Advance the writer to the next buffer.
-        // TODO(nathanmittler): Consider slicing if space available above some threshold.
-        nextBuffer();
-      }
-
-      pos -= length;
-      value.get(buffer, arrayPos() + 1, length);
-    }
-
-    @Override
-    void requireSpace(int size) {
-      if (spaceLeft() < size) {
-        nextBuffer(size);
-      }
-    }
-  }
-
-  /** Writer that uses safe operations on a target {@link ByteBuffer}. */
-  private static final class SafeDirectWriter extends BinaryWriter {
-    private ByteBuffer buffer;
-    private int limitMinusOne;
-    private int pos;
-
-    SafeDirectWriter(BufferAllocator alloc, int chunkSize) {
-      super(alloc, chunkSize);
-      nextBuffer();
-    }
-
-    private void nextBuffer() {
-      nextBuffer(newDirectBuffer());
-    }
-
-    private void nextBuffer(int capacity) {
-      nextBuffer(newDirectBuffer(capacity));
-    }
-
-    private void nextBuffer(AllocatedBuffer allocatedBuffer) {
-      if (!allocatedBuffer.hasNioBuffer()) {
-        throw new RuntimeException("Allocated buffer does not have NIO buffer");
-      }
-      ByteBuffer nioBuffer = allocatedBuffer.nioBuffer();
-      if (!nioBuffer.isDirect()) {
-        throw new RuntimeException("Allocator returned non-direct buffer");
-      }
-
-      finishCurrentBuffer();
-      buffers.addFirst(allocatedBuffer);
-
-      buffer = nioBuffer;
-      buffer.limit(buffer.capacity());
-      buffer.position(0);
-      // Set byte order to little endian for fast writing of fixed 32/64.
-      buffer.order(ByteOrder.LITTLE_ENDIAN);
-
-      limitMinusOne = buffer.limit() - 1;
-      pos = limitMinusOne;
-    }
-
-    @Override
-    public int getTotalBytesWritten() {
-      return totalDoneBytes + bytesWrittenToCurrentBuffer();
-    }
-
-    private int bytesWrittenToCurrentBuffer() {
-      return limitMinusOne - pos;
-    }
-
-    private int spaceLeft() {
-      return pos + 1;
-    }
-
-    @Override
-    void finishCurrentBuffer() {
-      if (buffer != null) {
-        totalDoneBytes += bytesWrittenToCurrentBuffer();
-        // Update the indices on the netty buffer.
-        buffer.position(pos + 1);
-        buffer = null;
-        pos = 0;
-        limitMinusOne = 0;
-      }
-    }
-
-    @Override
-    public void writeUInt32(int fieldNumber, int value) {
-      requireSpace(MAX_VARINT32_SIZE * 2);
-      writeVarint32(value);
-      writeTag(fieldNumber, WIRETYPE_VARINT);
-    }
-
-    @Override
-    public void writeInt32(int fieldNumber, int value) {
-      requireSpace(MAX_VARINT32_SIZE + MAX_VARINT64_SIZE);
-      writeInt32(value);
-      writeTag(fieldNumber, WIRETYPE_VARINT);
-    }
-
-    @Override
-    public void writeSInt32(int fieldNumber, int value) {
-      requireSpace(MAX_VARINT32_SIZE * 2);
-      writeSInt32(value);
-      writeTag(fieldNumber, WIRETYPE_VARINT);
-    }
-
-    @Override
-    public void writeFixed32(int fieldNumber, int value) {
-      requireSpace(MAX_VARINT32_SIZE + FIXED32_SIZE);
-      writeFixed32(value);
-      writeTag(fieldNumber, WIRETYPE_FIXED32);
-    }
-
-    @Override
-    public void writeUInt64(int fieldNumber, long value) {
-      requireSpace(MAX_VARINT32_SIZE + MAX_VARINT64_SIZE);
-      writeVarint64(value);
-      writeTag(fieldNumber, WIRETYPE_VARINT);
-    }
-
-    @Override
-    public void writeSInt64(int fieldNumber, long value) {
-      requireSpace(MAX_VARINT32_SIZE + MAX_VARINT64_SIZE);
-      writeSInt64(value);
-      writeTag(fieldNumber, WIRETYPE_VARINT);
-    }
-
-    @Override
-    public void writeFixed64(int fieldNumber, long value) {
-      requireSpace(MAX_VARINT32_SIZE + FIXED64_SIZE);
-      writeFixed64(value);
-      writeTag(fieldNumber, WIRETYPE_FIXED64);
-    }
-
-    @Override
-    public void writeBool(int fieldNumber, boolean value) {
-      requireSpace(MAX_VARINT32_SIZE + 1);
-      write((byte) (value ? 1 : 0));
-      writeTag(fieldNumber, WIRETYPE_VARINT);
-    }
-
-    @Override
-    public void writeString(int fieldNumber, String value) {
-      int prevBytes = getTotalBytesWritten();
-      writeString(value);
-      int length = getTotalBytesWritten() - prevBytes;
-      requireSpace(2 * MAX_VARINT32_SIZE);
-      writeVarint32(length);
-      writeTag(fieldNumber, WIRETYPE_LENGTH_DELIMITED);
-    }
-
-    @Override
-    public void writeBytes(int fieldNumber, ByteString value) {
-      try {
-        value.writeToReverse(this);
-      } catch (IOException e) {
-        // Should never happen since the writer does not throw.
-        throw new RuntimeException(e);
-      }
-
-      requireSpace(MAX_VARINT32_SIZE * 2);
-      writeVarint32(value.size());
-      writeTag(fieldNumber, WIRETYPE_LENGTH_DELIMITED);
-    }
-
-    @Override
-    public void writeMessage(int fieldNumber, Object value) throws IOException {
-      int prevBytes = getTotalBytesWritten();
-      Protobuf.getInstance().writeTo(value, this);
-      int length = getTotalBytesWritten() - prevBytes;
-      requireSpace(MAX_VARINT32_SIZE * 2);
-      writeVarint32(length);
-      writeTag(fieldNumber, WIRETYPE_LENGTH_DELIMITED);
-    }
-
-    @Override
-    public void writeMessage(int fieldNumber, Object value, Schema schema) throws IOException {
-      int prevBytes = getTotalBytesWritten();
-      schema.writeTo(value, this);
-      int length = getTotalBytesWritten() - prevBytes;
-      requireSpace(MAX_VARINT32_SIZE * 2);
-      writeVarint32(length);
-      writeTag(fieldNumber, WIRETYPE_LENGTH_DELIMITED);
-    }
-
-    @Deprecated
-    @Override
-    public void writeGroup(int fieldNumber, Object value) throws IOException {
-      writeTag(fieldNumber, WIRETYPE_END_GROUP);
-      Protobuf.getInstance().writeTo(value, this);
-      writeTag(fieldNumber, WIRETYPE_START_GROUP);
-    }
-
-    @Override
-    public void writeGroup(int fieldNumber, Object value, Schema schema) throws IOException {
-      writeTag(fieldNumber, WIRETYPE_END_GROUP);
-      schema.writeTo(value, this);
-      writeTag(fieldNumber, WIRETYPE_START_GROUP);
-    }
-
-    @Deprecated
-    @Override
-    public void writeStartGroup(int fieldNumber) {
-      writeTag(fieldNumber, WIRETYPE_START_GROUP);
-    }
-
-    @Deprecated
-    @Override
-    public void writeEndGroup(int fieldNumber) {
-      writeTag(fieldNumber, WIRETYPE_END_GROUP);
-    }
-
-    @Override
-    void writeInt32(int value) {
-      if (value >= 0) {
-        writeVarint32(value);
-      } else {
-        writeVarint64(value);
-      }
-    }
-
-    @Override
-    void writeSInt32(int value) {
-      writeVarint32(CodedOutputStream.encodeZigZag32(value));
-    }
-
-    @Override
-    void writeSInt64(long value) {
-      writeVarint64(CodedOutputStream.encodeZigZag64(value));
-    }
-
-    @Override
-    void writeBool(boolean value) {
-      write((byte) (value ? 1 : 0));
-    }
-
-    @Override
-    void writeTag(int fieldNumber, int wireType) {
-      writeVarint32(WireFormat.makeTag(fieldNumber, wireType));
-    }
-
-    @Override
-    void writeVarint32(int value) {
-      if ((value & (~0 << 7)) == 0) {
-        writeVarint32OneByte(value);
-      } else if ((value & (~0 << 14)) == 0) {
-        writeVarint32TwoBytes(value);
-      } else if ((value & (~0 << 21)) == 0) {
-        writeVarint32ThreeBytes(value);
-      } else if ((value & (~0 << 28)) == 0) {
-        writeVarint32FourBytes(value);
-      } else {
-        writeVarint32FiveBytes(value);
-      }
-    }
-
-    private void writeVarint32OneByte(int value) {
-      buffer.put(pos--, (byte) value);
-    }
-
-    private void writeVarint32TwoBytes(int value) {
-      // Byte order is little-endian.
-      pos -= 2;
-      buffer.putShort(pos + 1, (short) (((value & (0x7F << 7)) << 1) | ((value & 0x7F) | 0x80)));
-    }
-
-    private void writeVarint32ThreeBytes(int value) {
-      // Byte order is little-endian.
-      pos -= 3;
-      buffer.putInt(
-          pos,
-          ((value & (0x7F << 14)) << 10)
-              | (((value & (0x7F << 7)) | (0x80 << 7)) << 9)
-              | ((value & 0x7F) | 0x80) << 8);
-    }
-
-    private void writeVarint32FourBytes(int value) {
-      // Byte order is little-endian.
-      pos -= 4;
-      buffer.putInt(
-          pos + 1,
-          ((value & (0x7F << 21)) << 3)
-              | (((value & (0x7F << 14)) | (0x80 << 14)) << 2)
-              | (((value & (0x7F << 7)) | (0x80 << 7)) << 1)
-              | ((value & 0x7F) | 0x80));
-    }
-
-    private void writeVarint32FiveBytes(int value) {
-      // Byte order is little-endian.
-      buffer.put(pos--, (byte) (value >>> 28));
-      pos -= 4;
-      buffer.putInt(
-          pos + 1,
-          ((((value >>> 21) & 0x7F) | 0x80) << 24)
-              | ((((value >>> 14) & 0x7F) | 0x80) << 16)
-              | ((((value >>> 7) & 0x7F) | 0x80) << 8)
-              | ((value & 0x7F) | 0x80));
-    }
-
-    @Override
-    void writeVarint64(long value) {
-      switch (computeUInt64SizeNoTag(value)) {
-        case 1:
-          writeVarint64OneByte(value);
-          break;
-        case 2:
-          writeVarint64TwoBytes(value);
-          break;
-        case 3:
-          writeVarint64ThreeBytes(value);
-          break;
-        case 4:
-          writeVarint64FourBytes(value);
-          break;
-        case 5:
-          writeVarint64FiveBytes(value);
-          break;
-        case 6:
-          writeVarint64SixBytes(value);
-          break;
-        case 7:
-          writeVarint64SevenBytes(value);
-          break;
-        case 8:
-          writeVarint64EightBytes(value);
-          break;
-        case 9:
-          writeVarint64NineBytes(value);
-          break;
-        case 10:
-          writeVarint64TenBytes(value);
-          break;
-      }
-    }
-
-    private void writeVarint64OneByte(long value) {
-      writeVarint32OneByte((int) value);
-    }
-
-    private void writeVarint64TwoBytes(long value) {
-      writeVarint32TwoBytes((int) value);
-    }
-
-    private void writeVarint64ThreeBytes(long value) {
-      writeVarint32ThreeBytes((int) value);
-    }
-
-    private void writeVarint64FourBytes(long value) {
-      writeVarint32FourBytes((int) value);
-    }
-
-    private void writeVarint64FiveBytes(long value) {
-      // Byte order is little-endian.
-      pos -= 5;
-      buffer.putLong(
-          pos - 2,
-          ((value & (0x7FL << 28)) << 28)
-              | (((value & (0x7F << 21)) | (0x80 << 21)) << 27)
-              | (((value & (0x7F << 14)) | (0x80 << 14)) << 26)
-              | (((value & (0x7F << 7)) | (0x80 << 7)) << 25)
-              | (((value & 0x7F) | 0x80)) << 24);
-    }
-
-    private void writeVarint64SixBytes(long value) {
-      // Byte order is little-endian.
-      pos -= 6;
-      buffer.putLong(
-          pos - 1,
-          ((value & (0x7FL << 35)) << 21)
-              | (((value & (0x7FL << 28)) | (0x80L << 28)) << 20)
-              | (((value & (0x7F << 21)) | (0x80 << 21)) << 19)
-              | (((value & (0x7F << 14)) | (0x80 << 14)) << 18)
-              | (((value & (0x7F << 7)) | (0x80 << 7)) << 17)
-              | (((value & 0x7F) | 0x80)) << 16);
-    }
-
-    private void writeVarint64SevenBytes(long value) {
-      // Byte order is little-endian.
-      pos -= 7;
-      buffer.putLong(
-          pos,
-          ((value & (0x7FL << 42)) << 14)
-              | (((value & (0x7FL << 35)) | (0x80L << 35)) << 13)
-              | (((value & (0x7FL << 28)) | (0x80L << 28)) << 12)
-              | (((value & (0x7F << 21)) | (0x80 << 21)) << 11)
-              | (((value & (0x7F << 14)) | (0x80 << 14)) << 10)
-              | (((value & (0x7F << 7)) | (0x80 << 7)) << 9)
-              | (((value & 0x7F) | 0x80)) << 8);
-    }
-
-    private void writeVarint64EightBytes(long value) {
-      // Byte order is little-endian.
-      pos -= 8;
-      buffer.putLong(
-          pos + 1,
-          ((value & (0x7FL << 49)) << 7)
-              | (((value & (0x7FL << 42)) | (0x80L << 42)) << 6)
-              | (((value & (0x7FL << 35)) | (0x80L << 35)) << 5)
-              | (((value & (0x7FL << 28)) | (0x80L << 28)) << 4)
-              | (((value & (0x7F << 21)) | (0x80 << 21)) << 3)
-              | (((value & (0x7F << 14)) | (0x80 << 14)) << 2)
-              | (((value & (0x7F << 7)) | (0x80 << 7)) << 1)
-              | ((value & 0x7F) | 0x80));
-    }
-
-    private void writeVarint64EightBytesWithSign(long value) {
-      // Byte order is little-endian.
-      pos -= 8;
-      buffer.putLong(
-          pos + 1,
-          (((value & (0x7FL << 49)) | (0x80L << 49)) << 7)
-              | (((value & (0x7FL << 42)) | (0x80L << 42)) << 6)
-              | (((value & (0x7FL << 35)) | (0x80L << 35)) << 5)
-              | (((value & (0x7FL << 28)) | (0x80L << 28)) << 4)
-              | (((value & (0x7F << 21)) | (0x80 << 21)) << 3)
-              | (((value & (0x7F << 14)) | (0x80 << 14)) << 2)
-              | (((value & (0x7F << 7)) | (0x80 << 7)) << 1)
-              | ((value & 0x7F) | 0x80));
-    }
-
-    private void writeVarint64NineBytes(long value) {
-      buffer.put(pos--, (byte) (value >>> 56));
-      writeVarint64EightBytesWithSign(value & 0xFFFFFFFFFFFFFFL);
-    }
-
-    private void writeVarint64TenBytes(long value) {
-      buffer.put(pos--, (byte) (value >>> 63));
-      buffer.put(pos--, (byte) (((value >>> 56) & 0x7F) | 0x80));
-      writeVarint64EightBytesWithSign(value & 0xFFFFFFFFFFFFFFL);
-    }
-
-    @Override
-    void writeFixed32(int value) {
-      pos -= 4;
-      buffer.putInt(pos + 1, value);
-    }
-
-    @Override
-    void writeFixed64(long value) {
-      pos -= 8;
-      buffer.putLong(pos + 1, value);
-    }
-
-    @Override
-    void writeString(String in) {
-      // Request enough space to write the ASCII string.
-      requireSpace(in.length());
-
-      // We know the buffer is big enough...
-      int i = in.length() - 1;
-      pos -= i;
-      // Designed to take advantage of
-      // https://wiki.openjdk.java.net/display/HotSpotInternals/RangeCheckElimination
-      for (char c; i >= 0 && (c = in.charAt(i)) < 0x80; i--) {
-        buffer.put(pos + i, (byte) c);
-      }
-      if (i == -1) {
-        // Move the position past the ASCII string.
-        pos -= 1;
-        return;
-      }
-      pos += i;
-      for (char c; i >= 0; i--) {
-        c = in.charAt(i);
-        if (c < 0x80 && pos >= 0) {
-          buffer.put(pos--, (byte) c);
-        } else if (c < 0x800 && pos > 0) { // 11 bits, two UTF-8 bytes
-          buffer.put(pos--, (byte) (0x80 | (0x3F & c)));
-          buffer.put(pos--, (byte) ((0xF << 6) | (c >>> 6)));
-        } else if ((c < Character.MIN_SURROGATE || Character.MAX_SURROGATE < c) && pos > 1) {
-          // Maximum single-char code point is 0xFFFF, 16 bits, three UTF-8 bytes
-          buffer.put(pos--, (byte) (0x80 | (0x3F & c)));
-          buffer.put(pos--, (byte) (0x80 | (0x3F & (c >>> 6))));
-          buffer.put(pos--, (byte) ((0xF << 5) | (c >>> 12)));
-        } else if (pos > 2) {
-          // Minimum code point represented by a surrogate pair is 0x10000, 17 bits,
-          // four UTF-8 bytes
-          char high = 0;
-          if (i == 0 || !Character.isSurrogatePair(high = in.charAt(i - 1), c)) {
-            throw new Utf8.UnpairedSurrogateException(i - 1, i);
-          }
-          i--;
-          int codePoint = Character.toCodePoint(high, c);
-          buffer.put(pos--, (byte) (0x80 | (0x3F & codePoint)));
-          buffer.put(pos--, (byte) (0x80 | (0x3F & (codePoint >>> 6))));
-          buffer.put(pos--, (byte) (0x80 | (0x3F & (codePoint >>> 12))));
-          buffer.put(pos--, (byte) ((0xF << 4) | (codePoint >>> 18)));
-        } else {
-          // Buffer is full - allocate a new one and revisit the current character.
-          requireSpace(i);
-          i++;
-        }
-      }
-    }
-
-    @Override
-    public void write(byte value) {
-      buffer.put(pos--, value);
-    }
-
-    @Override
-    public void write(byte[] value, int offset, int length) {
-      if (spaceLeft() < length) {
-        nextBuffer(length);
-      }
-
-      pos -= length;
-      buffer.position(pos + 1);
-      buffer.put(value, offset, length);
-    }
-
-    @Override
-    public void writeLazy(byte[] value, int offset, int length) {
-      if (spaceLeft() < length) {
-        // We consider the value to be immutable (likely the internals of a ByteString). Just
-        // wrap it in a Netty buffer and add it to the output buffer.
-        totalDoneBytes += length;
-        buffers.addFirst(AllocatedBuffer.wrap(value, offset, length));
-
-        // Advance the writer to the next buffer.
-        // TODO(nathanmittler): Consider slicing if space available above some threshold.
-        nextBuffer();
-        return;
-      }
-
-      pos -= length;
-      buffer.position(pos + 1);
-      buffer.put(value, offset, length);
-    }
-
-    @Override
-    public void write(ByteBuffer value) {
-      int length = value.remaining();
-      if (spaceLeft() < length) {
-        nextBuffer(length);
-      }
-
-      pos -= length;
-      buffer.position(pos + 1);
-      buffer.put(value);
-    }
-
-    @Override
-    public void writeLazy(ByteBuffer value) {
-      int length = value.remaining();
-      if (spaceLeft() < length) {
-        // We consider the value to be immutable (likely the internals of a ByteString). Just
-        // wrap it in a Netty buffer and add it to the output buffer.
-        totalDoneBytes += length;
-        buffers.addFirst(AllocatedBuffer.wrap(value));
-
-        // Advance the writer to the next buffer.
-        // TODO(nathanmittler): Consider slicing if space available above some threshold.
-        nextBuffer();
-        return;
-      }
-
-      pos -= length;
-      buffer.position(pos + 1);
-      buffer.put(value);
-    }
-
-    @Override
-    void requireSpace(int size) {
-      if (spaceLeft() < size) {
-        nextBuffer(size);
-      }
-    }
-  }
-
-  /** Writer that uses unsafe operations on a target {@link ByteBuffer}. */
-  private static final class UnsafeDirectWriter extends BinaryWriter {
-    private ByteBuffer buffer;
-    private long bufferOffset;
-    private long limitMinusOne;
-    private long pos;
-
-    UnsafeDirectWriter(BufferAllocator alloc, int chunkSize) {
-      super(alloc, chunkSize);
-      nextBuffer();
-    }
-
-    /** Indicates whether the required unsafe operations are supported on this platform. */
-    private static boolean isSupported() {
-      return UnsafeUtil.hasUnsafeByteBufferOperations();
-    }
-
-    private void nextBuffer() {
-      nextBuffer(newDirectBuffer());
-    }
-
-    private void nextBuffer(int capacity) {
-      nextBuffer(newDirectBuffer(capacity));
-    }
-
-    private void nextBuffer(AllocatedBuffer allocatedBuffer) {
-      if (!allocatedBuffer.hasNioBuffer()) {
-        throw new RuntimeException("Allocated buffer does not have NIO buffer");
-      }
-      ByteBuffer nioBuffer = allocatedBuffer.nioBuffer();
-      if (!nioBuffer.isDirect()) {
-        throw new RuntimeException("Allocator returned non-direct buffer");
-      }
-
-      finishCurrentBuffer();
-      buffers.addFirst(allocatedBuffer);
-
-      buffer = nioBuffer;
-      buffer.limit(buffer.capacity());
-      buffer.position(0);
-
-      bufferOffset = UnsafeUtil.addressOffset(buffer);
-      limitMinusOne = bufferOffset + (buffer.limit() - 1);
-      pos = limitMinusOne;
-    }
-
-    @Override
-    public int getTotalBytesWritten() {
-      return totalDoneBytes + bytesWrittenToCurrentBuffer();
-    }
-
-    private int bytesWrittenToCurrentBuffer() {
-      return (int) (limitMinusOne - pos);
-    }
-
-    private int spaceLeft() {
-      return bufferPos() + 1;
-    }
-
-    @Override
-    void finishCurrentBuffer() {
-      if (buffer != null) {
-        totalDoneBytes += bytesWrittenToCurrentBuffer();
-        // Update the indices on the netty buffer.
-        buffer.position(bufferPos() + 1);
-        buffer = null;
-        pos = 0;
-        limitMinusOne = 0;
-      }
-    }
-
-    private int bufferPos() {
-      return (int) (pos - bufferOffset);
-    }
-
-    @Override
-    public void writeUInt32(int fieldNumber, int value) {
-      requireSpace(MAX_VARINT32_SIZE * 2);
-      writeVarint32(value);
-      writeTag(fieldNumber, WIRETYPE_VARINT);
-    }
-
-    @Override
-    public void writeInt32(int fieldNumber, int value) {
-      requireSpace(MAX_VARINT32_SIZE + MAX_VARINT64_SIZE);
-      writeInt32(value);
-      writeTag(fieldNumber, WIRETYPE_VARINT);
-    }
-
-    @Override
-    public void writeSInt32(int fieldNumber, int value) {
-      requireSpace(MAX_VARINT32_SIZE * 2);
-      writeSInt32(value);
-      writeTag(fieldNumber, WIRETYPE_VARINT);
-    }
-
-    @Override
-    public void writeFixed32(int fieldNumber, int value) {
-      requireSpace(MAX_VARINT32_SIZE + FIXED32_SIZE);
-      writeFixed32(value);
-      writeTag(fieldNumber, WIRETYPE_FIXED32);
-    }
-
-    @Override
-    public void writeUInt64(int fieldNumber, long value) {
-      requireSpace(MAX_VARINT32_SIZE + MAX_VARINT64_SIZE);
-      writeVarint64(value);
-      writeTag(fieldNumber, WIRETYPE_VARINT);
-    }
-
-    @Override
-    public void writeSInt64(int fieldNumber, long value) {
-      requireSpace(MAX_VARINT32_SIZE + MAX_VARINT64_SIZE);
-      writeSInt64(value);
-      writeTag(fieldNumber, WIRETYPE_VARINT);
-    }
-
-    @Override
-    public void writeFixed64(int fieldNumber, long value) {
-      requireSpace(MAX_VARINT32_SIZE + FIXED64_SIZE);
-      writeFixed64(value);
-      writeTag(fieldNumber, WIRETYPE_FIXED64);
-    }
-
-    @Override
-    public void writeBool(int fieldNumber, boolean value) {
-      requireSpace(MAX_VARINT32_SIZE + 1);
-      write((byte) (value ? 1 : 0));
-      writeTag(fieldNumber, WIRETYPE_VARINT);
-    }
-
-    @Override
-    public void writeString(int fieldNumber, String value) {
-      int prevBytes = getTotalBytesWritten();
-      writeString(value);
-      int length = getTotalBytesWritten() - prevBytes;
-      requireSpace(2 * MAX_VARINT32_SIZE);
-      writeVarint32(length);
-      writeTag(fieldNumber, WIRETYPE_LENGTH_DELIMITED);
-    }
-
-    @Override
-    public void writeBytes(int fieldNumber, ByteString value) {
-      try {
-        value.writeToReverse(this);
-      } catch (IOException e) {
-        // Should never happen since the writer does not throw.
-        throw new RuntimeException(e);
-      }
-
-      requireSpace(MAX_VARINT32_SIZE * 2);
-      writeVarint32(value.size());
-      writeTag(fieldNumber, WIRETYPE_LENGTH_DELIMITED);
-    }
-
-    @Override
-    public void writeMessage(int fieldNumber, Object value) throws IOException {
-      int prevBytes = getTotalBytesWritten();
-      Protobuf.getInstance().writeTo(value, this);
-      int length = getTotalBytesWritten() - prevBytes;
-      requireSpace(MAX_VARINT32_SIZE * 2);
-      writeVarint32(length);
-      writeTag(fieldNumber, WIRETYPE_LENGTH_DELIMITED);
-    }
-
-    @Override
-    public void writeMessage(int fieldNumber, Object value, Schema schema) throws IOException {
-      int prevBytes = getTotalBytesWritten();
-      schema.writeTo(value, this);
-      int length = getTotalBytesWritten() - prevBytes;
-      requireSpace(MAX_VARINT32_SIZE * 2);
-      writeVarint32(length);
-      writeTag(fieldNumber, WIRETYPE_LENGTH_DELIMITED);
-    }
-
-    @Override
-    public void writeGroup(int fieldNumber, Object value) throws IOException {
-      writeTag(fieldNumber, WIRETYPE_END_GROUP);
-      Protobuf.getInstance().writeTo(value, this);
-      writeTag(fieldNumber, WIRETYPE_START_GROUP);
-    }
-
-    @Override
-    public void writeGroup(int fieldNumber, Object value, Schema schema) throws IOException {
-      writeTag(fieldNumber, WIRETYPE_END_GROUP);
-      schema.writeTo(value, this);
-      writeTag(fieldNumber, WIRETYPE_START_GROUP);
-    }
-
-    @Deprecated
-    @Override
-    public void writeStartGroup(int fieldNumber) {
-      writeTag(fieldNumber, WIRETYPE_START_GROUP);
-    }
-
-    @Deprecated
-    @Override
-    public void writeEndGroup(int fieldNumber) {
-      writeTag(fieldNumber, WIRETYPE_END_GROUP);
-    }
-
-    @Override
-    void writeInt32(int value) {
-      if (value >= 0) {
-        writeVarint32(value);
-      } else {
-        writeVarint64(value);
-      }
-    }
-
-    @Override
-    void writeSInt32(int value) {
-      writeVarint32(CodedOutputStream.encodeZigZag32(value));
-    }
-
-    @Override
-    void writeSInt64(long value) {
-      writeVarint64(CodedOutputStream.encodeZigZag64(value));
-    }
-
-    @Override
-    void writeBool(boolean value) {
-      write((byte) (value ? 1 : 0));
-    }
-
-    @Override
-    void writeTag(int fieldNumber, int wireType) {
-      writeVarint32(WireFormat.makeTag(fieldNumber, wireType));
-    }
-
-    @Override
-    void writeVarint32(int value) {
-      if ((value & (~0 << 7)) == 0) {
-        writeVarint32OneByte(value);
-      } else if ((value & (~0 << 14)) == 0) {
-        writeVarint32TwoBytes(value);
-      } else if ((value & (~0 << 21)) == 0) {
-        writeVarint32ThreeBytes(value);
-      } else if ((value & (~0 << 28)) == 0) {
-        writeVarint32FourBytes(value);
-      } else {
-        writeVarint32FiveBytes(value);
-      }
-    }
-
-    private void writeVarint32OneByte(int value) {
-      UnsafeUtil.putByte(pos--, (byte) value);
-    }
-
-    private void writeVarint32TwoBytes(int value) {
-      UnsafeUtil.putByte(pos--, (byte) (value >>> 7));
-      UnsafeUtil.putByte(pos--, (byte) ((value & 0x7F) | 0x80));
-    }
-
-    private void writeVarint32ThreeBytes(int value) {
-      UnsafeUtil.putByte(pos--, (byte) (value >>> 14));
-      UnsafeUtil.putByte(pos--, (byte) (((value >>> 7) & 0x7F) | 0x80));
-      UnsafeUtil.putByte(pos--, (byte) ((value & 0x7F) | 0x80));
-    }
-
-    private void writeVarint32FourBytes(int value) {
-      UnsafeUtil.putByte(pos--, (byte) (value >>> 21));
-      UnsafeUtil.putByte(pos--, (byte) (((value >>> 14) & 0x7F) | 0x80));
-      UnsafeUtil.putByte(pos--, (byte) (((value >>> 7) & 0x7F) | 0x80));
-      UnsafeUtil.putByte(pos--, (byte) ((value & 0x7F) | 0x80));
-    }
-
-    private void writeVarint32FiveBytes(int value) {
-      UnsafeUtil.putByte(pos--, (byte) (value >>> 28));
-      UnsafeUtil.putByte(pos--, (byte) (((value >>> 21) & 0x7F) | 0x80));
-      UnsafeUtil.putByte(pos--, (byte) (((value >>> 14) & 0x7F) | 0x80));
-      UnsafeUtil.putByte(pos--, (byte) (((value >>> 7) & 0x7F) | 0x80));
-      UnsafeUtil.putByte(pos--, (byte) ((value & 0x7F) | 0x80));
-    }
-
-    @Override
-    void writeVarint64(long value) {
-      switch (computeUInt64SizeNoTag(value)) {
-        case 1:
-          writeVarint64OneByte(value);
-          break;
-        case 2:
-          writeVarint64TwoBytes(value);
-          break;
-        case 3:
-          writeVarint64ThreeBytes(value);
-          break;
-        case 4:
-          writeVarint64FourBytes(value);
-          break;
-        case 5:
-          writeVarint64FiveBytes(value);
-          break;
-        case 6:
-          writeVarint64SixBytes(value);
-          break;
-        case 7:
-          writeVarint64SevenBytes(value);
-          break;
-        case 8:
-          writeVarint64EightBytes(value);
-          break;
-        case 9:
-          writeVarint64NineBytes(value);
-          break;
-        case 10:
-          writeVarint64TenBytes(value);
-          break;
-      }
-    }
-
-    private void writeVarint64OneByte(long value) {
-      UnsafeUtil.putByte(pos--, (byte) value);
-    }
-
-    private void writeVarint64TwoBytes(long value) {
-      UnsafeUtil.putByte(pos--, (byte) (value >>> 7));
-      UnsafeUtil.putByte(pos--, (byte) (((int) value & 0x7F) | 0x80));
-    }
-
-    private void writeVarint64ThreeBytes(long value) {
-      UnsafeUtil.putByte(pos--, (byte) (((int) value) >>> 14));
-      UnsafeUtil.putByte(pos--, (byte) (((value >>> 7) & 0x7F) | 0x80));
-      UnsafeUtil.putByte(pos--, (byte) ((value & 0x7F) | 0x80));
-    }
-
-    private void writeVarint64FourBytes(long value) {
-      UnsafeUtil.putByte(pos--, (byte) (value >>> 21));
-      UnsafeUtil.putByte(pos--, (byte) (((value >>> 14) & 0x7F) | 0x80));
-      UnsafeUtil.putByte(pos--, (byte) (((value >>> 7) & 0x7F) | 0x80));
-      UnsafeUtil.putByte(pos--, (byte) ((value & 0x7F) | 0x80));
-    }
-
-    private void writeVarint64FiveBytes(long value) {
-      UnsafeUtil.putByte(pos--, (byte) (value >>> 28));
-      UnsafeUtil.putByte(pos--, (byte) (((value >>> 21) & 0x7F) | 0x80));
-      UnsafeUtil.putByte(pos--, (byte) (((value >>> 14) & 0x7F) | 0x80));
-      UnsafeUtil.putByte(pos--, (byte) (((value >>> 7) & 0x7F) | 0x80));
-      UnsafeUtil.putByte(pos--, (byte) ((value & 0x7F) | 0x80));
-    }
-
-    private void writeVarint64SixBytes(long value) {
-      UnsafeUtil.putByte(pos--, (byte) (value >>> 35));
-      UnsafeUtil.putByte(pos--, (byte) (((value >>> 28) & 0x7F) | 0x80));
-      UnsafeUtil.putByte(pos--, (byte) (((value >>> 21) & 0x7F) | 0x80));
-      UnsafeUtil.putByte(pos--, (byte) (((value >>> 14) & 0x7F) | 0x80));
-      UnsafeUtil.putByte(pos--, (byte) (((value >>> 7) & 0x7F) | 0x80));
-      UnsafeUtil.putByte(pos--, (byte) ((value & 0x7F) | 0x80));
-    }
-
-    private void writeVarint64SevenBytes(long value) {
-      UnsafeUtil.putByte(pos--, (byte) (value >>> 42));
-      UnsafeUtil.putByte(pos--, (byte) (((value >>> 35) & 0x7F) | 0x80));
-      UnsafeUtil.putByte(pos--, (byte) (((value >>> 28) & 0x7F) | 0x80));
-      UnsafeUtil.putByte(pos--, (byte) (((value >>> 21) & 0x7F) | 0x80));
-      UnsafeUtil.putByte(pos--, (byte) (((value >>> 14) & 0x7F) | 0x80));
-      UnsafeUtil.putByte(pos--, (byte) (((value >>> 7) & 0x7F) | 0x80));
-      UnsafeUtil.putByte(pos--, (byte) ((value & 0x7F) | 0x80));
-    }
-
-    private void writeVarint64EightBytes(long value) {
-      UnsafeUtil.putByte(pos--, (byte) (value >>> 49));
-      UnsafeUtil.putByte(pos--, (byte) (((value >>> 42) & 0x7F) | 0x80));
-      UnsafeUtil.putByte(pos--, (byte) (((value >>> 35) & 0x7F) | 0x80));
-      UnsafeUtil.putByte(pos--, (byte) (((value >>> 28) & 0x7F) | 0x80));
-      UnsafeUtil.putByte(pos--, (byte) (((value >>> 21) & 0x7F) | 0x80));
-      UnsafeUtil.putByte(pos--, (byte) (((value >>> 14) & 0x7F) | 0x80));
-      UnsafeUtil.putByte(pos--, (byte) (((value >>> 7) & 0x7F) | 0x80));
-      UnsafeUtil.putByte(pos--, (byte) ((value & 0x7F) | 0x80));
-    }
-
-    private void writeVarint64NineBytes(long value) {
-      UnsafeUtil.putByte(pos--, (byte) (value >>> 56));
-      UnsafeUtil.putByte(pos--, (byte) (((value >>> 49) & 0x7F) | 0x80));
-      UnsafeUtil.putByte(pos--, (byte) (((value >>> 42) & 0x7F) | 0x80));
-      UnsafeUtil.putByte(pos--, (byte) (((value >>> 35) & 0x7F) | 0x80));
-      UnsafeUtil.putByte(pos--, (byte) (((value >>> 28) & 0x7F) | 0x80));
-      UnsafeUtil.putByte(pos--, (byte) (((value >>> 21) & 0x7F) | 0x80));
-      UnsafeUtil.putByte(pos--, (byte) (((value >>> 14) & 0x7F) | 0x80));
-      UnsafeUtil.putByte(pos--, (byte) (((value >>> 7) & 0x7F) | 0x80));
-      UnsafeUtil.putByte(pos--, (byte) ((value & 0x7F) | 0x80));
-    }
-
-    private void writeVarint64TenBytes(long value) {
-      UnsafeUtil.putByte(pos--, (byte) (value >>> 63));
-      UnsafeUtil.putByte(pos--, (byte) (((value >>> 56) & 0x7F) | 0x80));
-      UnsafeUtil.putByte(pos--, (byte) (((value >>> 49) & 0x7F) | 0x80));
-      UnsafeUtil.putByte(pos--, (byte) (((value >>> 42) & 0x7F) | 0x80));
-      UnsafeUtil.putByte(pos--, (byte) (((value >>> 35) & 0x7F) | 0x80));
-      UnsafeUtil.putByte(pos--, (byte) (((value >>> 28) & 0x7F) | 0x80));
-      UnsafeUtil.putByte(pos--, (byte) (((value >>> 21) & 0x7F) | 0x80));
-      UnsafeUtil.putByte(pos--, (byte) (((value >>> 14) & 0x7F) | 0x80));
-      UnsafeUtil.putByte(pos--, (byte) (((value >>> 7) & 0x7F) | 0x80));
-      UnsafeUtil.putByte(pos--, (byte) ((value & 0x7F) | 0x80));
-    }
-
-    @Override
-    void writeFixed32(int value) {
-      UnsafeUtil.putByte(pos--, (byte) ((value >> 24) & 0xFF));
-      UnsafeUtil.putByte(pos--, (byte) ((value >> 16) & 0xFF));
-      UnsafeUtil.putByte(pos--, (byte) ((value >> 8) & 0xFF));
-      UnsafeUtil.putByte(pos--, (byte) (value & 0xFF));
-    }
-
-    @Override
-    void writeFixed64(long value) {
-      UnsafeUtil.putByte(pos--, (byte) ((int) (value >> 56) & 0xFF));
-      UnsafeUtil.putByte(pos--, (byte) ((int) (value >> 48) & 0xFF));
-      UnsafeUtil.putByte(pos--, (byte) ((int) (value >> 40) & 0xFF));
-      UnsafeUtil.putByte(pos--, (byte) ((int) (value >> 32) & 0xFF));
-      UnsafeUtil.putByte(pos--, (byte) ((int) (value >> 24) & 0xFF));
-      UnsafeUtil.putByte(pos--, (byte) ((int) (value >> 16) & 0xFF));
-      UnsafeUtil.putByte(pos--, (byte) ((int) (value >> 8) & 0xFF));
-      UnsafeUtil.putByte(pos--, (byte) ((int) (value) & 0xFF));
-    }
-
-    @Override
-    void writeString(String in) {
-      // Request enough space to write the ASCII string.
-      requireSpace(in.length());
-
-      // We know the buffer is big enough...
-      int i = in.length() - 1;
-      // Designed to take advantage of
-      // https://wiki.openjdk.java.net/display/HotSpotInternals/RangeCheckElimination
-      for (char c; i >= 0 && (c = in.charAt(i)) < 0x80; i--) {
-        UnsafeUtil.putByte(pos--, (byte) c);
-      }
-      if (i == -1) {
-        // ASCII.
-        return;
-      }
-      for (char c; i >= 0; i--) {
-        c = in.charAt(i);
-        if (c < 0x80 && pos >= bufferOffset) {
-          UnsafeUtil.putByte(pos--, (byte) c);
-        } else if (c < 0x800 && pos > bufferOffset) { // 11 bits, two UTF-8 bytes
-          UnsafeUtil.putByte(pos--, (byte) (0x80 | (0x3F & c)));
-          UnsafeUtil.putByte(pos--, (byte) ((0xF << 6) | (c >>> 6)));
-        } else if ((c < Character.MIN_SURROGATE || Character.MAX_SURROGATE < c)
-            && pos > bufferOffset + 1) {
-          // Maximum single-char code point is 0xFFFF, 16 bits, three UTF-8 bytes
-          UnsafeUtil.putByte(pos--, (byte) (0x80 | (0x3F & c)));
-          UnsafeUtil.putByte(pos--, (byte) (0x80 | (0x3F & (c >>> 6))));
-          UnsafeUtil.putByte(pos--, (byte) ((0xF << 5) | (c >>> 12)));
-        } else if (pos > bufferOffset + 2) {
-          // Minimum code point represented by a surrogate pair is 0x10000, 17 bits,
-          // four UTF-8 bytes
-          final char high;
-          if (i == 0 || !Character.isSurrogatePair(high = in.charAt(i - 1), c)) {
-            throw new Utf8.UnpairedSurrogateException(i - 1, i);
-          }
-          i--;
-          int codePoint = Character.toCodePoint(high, c);
-          UnsafeUtil.putByte(pos--, (byte) (0x80 | (0x3F & codePoint)));
-          UnsafeUtil.putByte(pos--, (byte) (0x80 | (0x3F & (codePoint >>> 6))));
-          UnsafeUtil.putByte(pos--, (byte) (0x80 | (0x3F & (codePoint >>> 12))));
-          UnsafeUtil.putByte(pos--, (byte) ((0xF << 4) | (codePoint >>> 18)));
-        } else {
-          // Buffer is full - allocate a new one and revisit the current character.
-          requireSpace(i);
-          i++;
-        }
-      }
-    }
-
-    @Override
-    public void write(byte value) {
-      UnsafeUtil.putByte(pos--, value);
-    }
-
-    @Override
-    public void write(byte[] value, int offset, int length) {
-      if (spaceLeft() < length) {
-        nextBuffer(length);
-      }
-
-      pos -= length;
-      buffer.position(bufferPos() + 1);
-      buffer.put(value, offset, length);
-    }
-
-    @Override
-    public void writeLazy(byte[] value, int offset, int length) {
-      if (spaceLeft() < length) {
-        // We consider the value to be immutable (likely the internals of a ByteString). Just
-        // wrap it in a Netty buffer and add it to the output buffer.
-        totalDoneBytes += length;
-        buffers.addFirst(AllocatedBuffer.wrap(value, offset, length));
-
-        // Advance the writer to the next buffer.
-        // TODO(nathanmittler): Consider slicing if space available above some threshold.
-        nextBuffer();
-        return;
-      }
-
-      pos -= length;
-      buffer.position(bufferPos() + 1);
-      buffer.put(value, offset, length);
-    }
-
-    @Override
-    public void write(ByteBuffer value) {
-      int length = value.remaining();
-      if (spaceLeft() < length) {
-        nextBuffer(length);
-      }
-
-      pos -= length;
-      buffer.position(bufferPos() + 1);
-      buffer.put(value);
-    }
-
-    @Override
-    public void writeLazy(ByteBuffer value) {
-      int length = value.remaining();
-      if (spaceLeft() < length) {
-        // We consider the value to be immutable (likely the internals of a ByteString). Just
-        // wrap it in a Netty buffer and add it to the output buffer.
-        totalDoneBytes += length;
-        buffers.addFirst(AllocatedBuffer.wrap(value));
-
-        // Advance the writer to the next buffer.
-        // TODO(nathanmittler): Consider slicing if space available above some threshold.
-        nextBuffer();
-        return;
-      }
-
-      pos -= length;
-      buffer.position(bufferPos() + 1);
-      buffer.put(value);
-    }
-
-    @Override
-    void requireSpace(int size) {
-      if (spaceLeft() < size) {
-        nextBuffer(size);
-      }
-    }
-  }
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/BlockingRpcChannel.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/BlockingRpcChannel.java
deleted file mode 100644
index 8af8005..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/BlockingRpcChannel.java
+++ /dev/null
@@ -1,51 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-/**
- * Abstract interface for a blocking RPC channel. {@code BlockingRpcChannel} is the blocking
- * equivalent to {@link RpcChannel}.
- *
- * @author kenton@google.com Kenton Varda
- * @author cpovirk@google.com Chris Povirk
- */
-public interface BlockingRpcChannel {
-  /**
-   * Call the given method of the remote service and blocks until it returns. {@code
-   * callBlockingMethod()} is the blocking equivalent to {@link RpcChannel#callMethod}.
-   */
-  Message callBlockingMethod(
-      Descriptors.MethodDescriptor method,
-      RpcController controller,
-      Message request,
-      Message responsePrototype)
-      throws ServiceException;
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/BlockingService.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/BlockingService.java
deleted file mode 100644
index e2b99c9..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/BlockingService.java
+++ /dev/null
@@ -1,57 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-/**
- * Blocking equivalent to {@link Service}.
- *
- * @author kenton@google.com Kenton Varda
- * @author cpovirk@google.com Chris Povirk
- */
-public interface BlockingService {
-  /** Equivalent to {@link Service#getDescriptorForType}. */
-  Descriptors.ServiceDescriptor getDescriptorForType();
-
-  /**
-   * Equivalent to {@link Service#callMethod}, except that {@code callBlockingMethod()} returns the
-   * result of the RPC or throws a {@link ServiceException} if there is a failure, rather than
-   * passing the information to a callback.
-   */
-  Message callBlockingMethod(
-      Descriptors.MethodDescriptor method, RpcController controller, Message request)
-      throws ServiceException;
-
-  /** Equivalent to {@link Service#getRequestPrototype}. */
-  Message getRequestPrototype(Descriptors.MethodDescriptor method);
-
-  /** Equivalent to {@link Service#getResponsePrototype}. */
-  Message getResponsePrototype(Descriptors.MethodDescriptor method);
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/BooleanArrayList.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/BooleanArrayList.java
deleted file mode 100644
index 451fce1..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/BooleanArrayList.java
+++ /dev/null
@@ -1,298 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.protobuf.Internal.checkNotNull;
-
-import com.google.protobuf.Internal.BooleanList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.RandomAccess;
-
-/**
- * An implementation of {@link BooleanList} on top of a primitive array.
- *
- * @author dweis@google.com (Daniel Weis)
- */
-final class BooleanArrayList extends AbstractProtobufList<Boolean>
-    implements BooleanList, RandomAccess, PrimitiveNonBoxingCollection {
-
-  private static final BooleanArrayList EMPTY_LIST = new BooleanArrayList(new boolean[0], 0);
-  static {
-    EMPTY_LIST.makeImmutable();
-  }
-
-  public static BooleanArrayList emptyList() {
-    return EMPTY_LIST;
-  }
-
-  /** The backing store for the list. */
-  private boolean[] array;
-
-  /**
-   * The size of the list distinct from the length of the array. That is, it is the number of
-   * elements set in the list.
-   */
-  private int size;
-
-  /** Constructs a new mutable {@code BooleanArrayList} with default capacity. */
-  BooleanArrayList() {
-    this(new boolean[DEFAULT_CAPACITY], 0);
-  }
-
-  /**
-   * Constructs a new mutable {@code BooleanArrayList} containing the same elements as {@code
-   * other}.
-   */
-  private BooleanArrayList(boolean[] other, int size) {
-    array = other;
-    this.size = size;
-  }
-
-  @Override
-  protected void removeRange(int fromIndex, int toIndex) {
-    ensureIsMutable();
-    if (toIndex < fromIndex) {
-      throw new IndexOutOfBoundsException("toIndex < fromIndex");
-    }
-
-    System.arraycopy(array, toIndex, array, fromIndex, size - toIndex);
-    size -= (toIndex - fromIndex);
-    modCount++;
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (!(o instanceof BooleanArrayList)) {
-      return super.equals(o);
-    }
-    BooleanArrayList other = (BooleanArrayList) o;
-    if (size != other.size) {
-      return false;
-    }
-
-    final boolean[] arr = other.array;
-    for (int i = 0; i < size; i++) {
-      if (array[i] != arr[i]) {
-        return false;
-      }
-    }
-
-    return true;
-  }
-
-  @Override
-  public int hashCode() {
-    int result = 1;
-    for (int i = 0; i < size; i++) {
-      result = (31 * result) + Internal.hashBoolean(array[i]);
-    }
-    return result;
-  }
-
-  @Override
-  public BooleanList mutableCopyWithCapacity(int capacity) {
-    if (capacity < size) {
-      throw new IllegalArgumentException();
-    }
-    return new BooleanArrayList(Arrays.copyOf(array, capacity), size);
-  }
-
-  @Override
-  public Boolean get(int index) {
-    return getBoolean(index);
-  }
-
-  @Override
-  public boolean getBoolean(int index) {
-    ensureIndexInRange(index);
-    return array[index];
-  }
-
-  @Override
-  public int indexOf(Object element) {
-    if (!(element instanceof Boolean)) {
-      return -1;
-    }
-    boolean unboxedElement = (Boolean) element;
-    int numElems = size();
-    for (int i = 0; i < numElems; i++) {
-      if (array[i] == unboxedElement) {
-        return i;
-      }
-    }
-    return -1;
-  }
-
-  @Override
-  public boolean contains(Object element) {
-    return indexOf(element) != -1;
-  }
-
-  @Override
-  public int size() {
-    return size;
-  }
-
-  @Override
-  public Boolean set(int index, Boolean element) {
-    return setBoolean(index, element);
-  }
-
-  @Override
-  public boolean setBoolean(int index, boolean element) {
-    ensureIsMutable();
-    ensureIndexInRange(index);
-    boolean previousValue = array[index];
-    array[index] = element;
-    return previousValue;
-  }
-
-  @Override
-  public boolean add(Boolean element) {
-    addBoolean(element);
-    return true;
-  }
-
-  @Override
-  public void add(int index, Boolean element) {
-    addBoolean(index, element);
-  }
-
-  /** Like {@link #add(Boolean)} but more efficient in that it doesn't box the element. */
-  @Override
-  public void addBoolean(boolean element) {
-    ensureIsMutable();
-    if (size == array.length) {
-      // Resize to 1.5x the size
-      int length = ((size * 3) / 2) + 1;
-      boolean[] newArray = new boolean[length];
-
-      System.arraycopy(array, 0, newArray, 0, size);
-      array = newArray;
-    }
-
-    array[size++] = element;
-  }
-
-  /** Like {@link #add(int, Boolean)} but more efficient in that it doesn't box the element. */
-  private void addBoolean(int index, boolean element) {
-    ensureIsMutable();
-    if (index < 0 || index > size) {
-      throw new IndexOutOfBoundsException(makeOutOfBoundsExceptionMessage(index));
-    }
-
-    if (size < array.length) {
-      // Shift everything over to make room
-      System.arraycopy(array, index, array, index + 1, size - index);
-    } else {
-      // Resize to 1.5x the size
-      int length = ((size * 3) / 2) + 1;
-      boolean[] newArray = new boolean[length];
-
-      // Copy the first part directly
-      System.arraycopy(array, 0, newArray, 0, index);
-
-      // Copy the rest shifted over by one to make room
-      System.arraycopy(array, index, newArray, index + 1, size - index);
-      array = newArray;
-    }
-
-    array[index] = element;
-    size++;
-    modCount++;
-  }
-
-  @Override
-  public boolean addAll(Collection<? extends Boolean> collection) {
-    ensureIsMutable();
-
-    checkNotNull(collection);
-
-    // We specialize when adding another BooleanArrayList to avoid boxing elements.
-    if (!(collection instanceof BooleanArrayList)) {
-      return super.addAll(collection);
-    }
-
-    BooleanArrayList list = (BooleanArrayList) collection;
-    if (list.size == 0) {
-      return false;
-    }
-
-    int overflow = Integer.MAX_VALUE - size;
-    if (overflow < list.size) {
-      // We can't actually represent a list this large.
-      throw new OutOfMemoryError();
-    }
-
-    int newSize = size + list.size;
-    if (newSize > array.length) {
-      array = Arrays.copyOf(array, newSize);
-    }
-
-    System.arraycopy(list.array, 0, array, size, list.size);
-    size = newSize;
-    modCount++;
-    return true;
-  }
-
-  @Override
-  public Boolean remove(int index) {
-    ensureIsMutable();
-    ensureIndexInRange(index);
-    boolean value = array[index];
-    if (index < size - 1) {
-      System.arraycopy(array, index + 1, array, index, size - index - 1);
-    }
-    size--;
-    modCount++;
-    return value;
-  }
-
-  /**
-   * Ensures that the provided {@code index} is within the range of {@code [0, size]}. Throws an
-   * {@link IndexOutOfBoundsException} if it is not.
-   *
-   * @param index the index to verify is in range
-   */
-  private void ensureIndexInRange(int index) {
-    if (index < 0 || index >= size) {
-      throw new IndexOutOfBoundsException(makeOutOfBoundsExceptionMessage(index));
-    }
-  }
-
-  private String makeOutOfBoundsExceptionMessage(int index) {
-    return "Index:" + index + ", Size:" + size;
-  }
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/BufferAllocator.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/BufferAllocator.java
deleted file mode 100644
index a229539..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/BufferAllocator.java
+++ /dev/null
@@ -1,65 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import java.nio.ByteBuffer;
-
-/**
- * An object responsible for allocation of buffers. This is an extension point to enable buffer
- * pooling within an application.
- */
-@CheckReturnValue
-@ExperimentalApi
-abstract class BufferAllocator {
-  private static final BufferAllocator UNPOOLED =
-      new BufferAllocator() {
-        @Override
-        public AllocatedBuffer allocateHeapBuffer(int capacity) {
-          return AllocatedBuffer.wrap(new byte[capacity]);
-        }
-
-        @Override
-        public AllocatedBuffer allocateDirectBuffer(int capacity) {
-          return AllocatedBuffer.wrap(ByteBuffer.allocateDirect(capacity));
-        }
-      };
-
-  /** Returns an unpooled buffer allocator, which will create a new buffer for each request. */
-  public static BufferAllocator unpooled() {
-    return UNPOOLED;
-  }
-
-  /** Allocates a buffer with the given capacity that is backed by an array on the heap. */
-  public abstract AllocatedBuffer allocateHeapBuffer(int capacity);
-
-  /** Allocates a direct (i.e. non-heap) buffer with the given capacity. */
-  public abstract AllocatedBuffer allocateDirectBuffer(int capacity);
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/ByteBufferWriter.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/ByteBufferWriter.java
deleted file mode 100644
index 2cb3ada..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/ByteBufferWriter.java
+++ /dev/null
@@ -1,181 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static java.lang.Math.max;
-import static java.lang.Math.min;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.lang.ref.SoftReference;
-import java.lang.reflect.Field;
-import java.nio.ByteBuffer;
-import java.nio.channels.WritableByteChannel;
-
-/** Utility class to provide efficient writing of {@link ByteBuffer}s to {@link OutputStream}s. */
-final class ByteBufferWriter {
-  private ByteBufferWriter() {}
-
-  /**
-   * Minimum size for a cached buffer. This prevents us from allocating buffers that are too small
-   * to be easily reused.
-   */
-  // TODO(nathanmittler): tune this property or allow configuration?
-  private static final int MIN_CACHED_BUFFER_SIZE = 1024;
-
-  /**
-   * Maximum size for a cached buffer. If a larger buffer is required, it will be allocated but not
-   * cached.
-   */
-  // TODO(nathanmittler): tune this property or allow configuration?
-  private static final int MAX_CACHED_BUFFER_SIZE = 16 * 1024;
-
-  /** The fraction of the requested buffer size under which the buffer will be reallocated. */
-  // TODO(nathanmittler): tune this property or allow configuration?
-  private static final float BUFFER_REALLOCATION_THRESHOLD = 0.5f;
-
-  /**
-   * Keeping a soft reference to a thread-local buffer. This buffer is used for writing a {@link
-   * ByteBuffer} to an {@link OutputStream} when no zero-copy alternative was available. Using a
-   * "soft" reference since VMs may keep this reference around longer than "weak" (e.g. HotSpot will
-   * maintain soft references until memory pressure warrants collection).
-   */
-  private static final ThreadLocal<SoftReference<byte[]>> BUFFER =
-      new ThreadLocal<SoftReference<byte[]>>();
-
-  /** This is a hack for GAE, where {@code FileOutputStream} is unavailable. */
-  private static final Class<?> FILE_OUTPUT_STREAM_CLASS = safeGetClass("java.io.FileOutputStream");
-
-  private static final long CHANNEL_FIELD_OFFSET = getChannelFieldOffset(FILE_OUTPUT_STREAM_CLASS);
-
-  /**
-   * For testing purposes only. Clears the cached buffer to force a new allocation on the next
-   * invocation.
-   */
-  static void clearCachedBuffer() {
-    BUFFER.set(null);
-  }
-
-  /**
-   * Writes the remaining content of the buffer to the given stream. The buffer {@code position}
-   * will remain unchanged by this method.
-   */
-  static void write(ByteBuffer buffer, OutputStream output) throws IOException {
-    final int initialPos = buffer.position();
-    try {
-      if (buffer.hasArray()) {
-        // Optimized write for array-backed buffers.
-        // Note that we're taking the risk that a malicious OutputStream could modify the array.
-        output.write(buffer.array(), buffer.arrayOffset() + buffer.position(), buffer.remaining());
-      } else if (!writeToChannel(buffer, output)) {
-        // Read all of the data from the buffer to an array.
-        // TODO(nathanmittler): Consider performance improvements for other "known" stream types.
-        final byte[] array = getOrCreateBuffer(buffer.remaining());
-        while (buffer.hasRemaining()) {
-          int length = min(buffer.remaining(), array.length);
-          buffer.get(array, 0, length);
-          output.write(array, 0, length);
-        }
-      }
-    } finally {
-      // Restore the initial position.
-      buffer.position(initialPos);
-    }
-  }
-
-  private static byte[] getOrCreateBuffer(int requestedSize) {
-    requestedSize = max(requestedSize, MIN_CACHED_BUFFER_SIZE);
-
-    byte[] buffer = getBuffer();
-    // Only allocate if we need to.
-    if (buffer == null || needToReallocate(requestedSize, buffer.length)) {
-      buffer = new byte[requestedSize];
-
-      // Only cache the buffer if it's not too big.
-      if (requestedSize <= MAX_CACHED_BUFFER_SIZE) {
-        setBuffer(buffer);
-      }
-    }
-    return buffer;
-  }
-
-  private static boolean needToReallocate(int requestedSize, int bufferLength) {
-    // First check against just the requested length to avoid the multiply.
-    return bufferLength < requestedSize
-        && bufferLength < requestedSize * BUFFER_REALLOCATION_THRESHOLD;
-  }
-
-  private static byte[] getBuffer() {
-    SoftReference<byte[]> sr = BUFFER.get();
-    return sr == null ? null : sr.get();
-  }
-
-  private static void setBuffer(byte[] value) {
-    BUFFER.set(new SoftReference<byte[]>(value));
-  }
-
-  private static boolean writeToChannel(ByteBuffer buffer, OutputStream output) throws IOException {
-    if (CHANNEL_FIELD_OFFSET >= 0 && FILE_OUTPUT_STREAM_CLASS.isInstance(output)) {
-      // Use a channel to write out the ByteBuffer. This will automatically empty the buffer.
-      WritableByteChannel channel = null;
-      try {
-        channel = (WritableByteChannel) UnsafeUtil.getObject(output, CHANNEL_FIELD_OFFSET);
-      } catch (ClassCastException e) {
-        // Absorb.
-      }
-      if (channel != null) {
-        channel.write(buffer);
-        return true;
-      }
-    }
-    return false;
-  }
-
-  private static Class<?> safeGetClass(String className) {
-    try {
-      return Class.forName(className);
-    } catch (ClassNotFoundException e) {
-      return null;
-    }
-  }
-
-  private static long getChannelFieldOffset(Class<?> clazz) {
-    try {
-      if (clazz != null && UnsafeUtil.hasUnsafeArrayOperations()) {
-        Field field = clazz.getDeclaredField("channel");
-        return UnsafeUtil.objectFieldOffset(field);
-      }
-    } catch (Throwable e) {
-      // Absorb
-    }
-    return -1;
-  }
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/ByteOutput.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/ByteOutput.java
deleted file mode 100644
index dba7a37..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/ByteOutput.java
+++ /dev/null
@@ -1,116 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import java.io.IOException;
-import java.nio.ByteBuffer;
-
-/**
- * An output target for raw bytes. This interface provides semantics that support two types of
- * writing:
- *
- * <p><b>Traditional write operations:</b> (as defined by {@link java.io.OutputStream}) where the
- * target method is responsible for either copying the data or completing the write before returning
- * from the method call.
- *
- * <p><b>Lazy write operations:</b> where the caller guarantees that it will never modify the
- * provided buffer and it can therefore be considered immutable. The target method is free to
- * maintain a reference to the buffer beyond the scope of the method call (e.g. until the write
- * operation completes).
- */
-@ExperimentalApi
-public abstract class ByteOutput {
-  /**
-   * Writes a single byte.
-   *
-   * @param value the byte to be written
-   * @throws IOException thrown if an error occurred while writing
-   */
-  public abstract void write(byte value) throws IOException;
-
-  /**
-   * Writes a sequence of bytes. The {@link ByteOutput} must copy {@code value} if it will not be
-   * processed prior to the return of this method call, since {@code value} may be reused/altered by
-   * the caller.
-   *
-   * <p>NOTE: This method <strong>MUST NOT</strong> modify the {@code value}. Doing so is a
-   * programming error and will lead to data corruption which will be difficult to debug.
-   *
-   * @param value the bytes to be written
-   * @param offset the offset of the start of the writable range
-   * @param length the number of bytes to write starting from {@code offset}
-   * @throws IOException thrown if an error occurred while writing
-   */
-  public abstract void write(byte[] value, int offset, int length) throws IOException;
-
-  /**
-   * Writes a sequence of bytes. The {@link ByteOutput} is free to retain a reference to the value
-   * beyond the scope of this method call (e.g. write later) since it is considered immutable and is
-   * guaranteed not to change by the caller.
-   *
-   * <p>NOTE: This method <strong>MUST NOT</strong> modify the {@code value}. Doing so is a
-   * programming error and will lead to data corruption which will be difficult to debug.
-   *
-   * @param value the bytes to be written
-   * @param offset the offset of the start of the writable range
-   * @param length the number of bytes to write starting from {@code offset}
-   * @throws IOException thrown if an error occurred while writing
-   */
-  public abstract void writeLazy(byte[] value, int offset, int length) throws IOException;
-
-  /**
-   * Writes a sequence of bytes. The {@link ByteOutput} must copy {@code value} if it will not be
-   * processed prior to the return of this method call, since {@code value} may be reused/altered by
-   * the caller.
-   *
-   * <p>NOTE: This method <strong>MUST NOT</strong> modify the {@code value}. Doing so is a
-   * programming error and will lead to data corruption which will be difficult to debug.
-   *
-   * @param value the bytes to be written. Upon returning from this call, the {@code position} of
-   *     this buffer will be set to the {@code limit}
-   * @throws IOException thrown if an error occurred while writing
-   */
-  public abstract void write(ByteBuffer value) throws IOException;
-
-  /**
-   * Writes a sequence of bytes. The {@link ByteOutput} is free to retain a reference to the value
-   * beyond the scope of this method call (e.g. write later) since it is considered immutable and is
-   * guaranteed not to change by the caller.
-   *
-   * <p>NOTE: This method <strong>MUST NOT</strong> modify the {@code value}. Doing so is a
-   * programming error and will lead to data corruption which will be difficult to debug.
-   *
-   * @param value the bytes to be written. Upon returning from this call, the {@code position} of
-   *     this buffer will be set to the {@code limit}
-   * @throws IOException thrown if an error occurred while writing
-   */
-  public abstract void writeLazy(ByteBuffer value) throws IOException;
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/ByteString.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/ByteString.java
deleted file mode 100644
index 480f85f..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/ByteString.java
+++ /dev/null
@@ -1,1691 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.protobuf.TextFormatEscaper.escapeBytes;
-import static java.lang.Integer.toHexString;
-import static java.lang.System.identityHashCode;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InvalidObjectException;
-import java.io.ObjectInputStream;
-import java.io.OutputStream;
-import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
-import java.nio.ByteBuffer;
-import java.nio.charset.Charset;
-import java.nio.charset.UnsupportedCharsetException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Locale;
-import java.util.NoSuchElementException;
-
-/**
- * Immutable sequence of bytes. Provides conversions to and from {@code byte[]}, {@link
- * java.lang.String}, {@link ByteBuffer}, {@link InputStream}, {@link OutputStream}. Also provides a
- * conversion to {@link CodedInputStream}.
- *
- * <p>Like {@link String}, the contents of a {@link ByteString} can never be observed to change, not
- * even in the presence of a data race or incorrect API usage in the client code.
- *
- * <p>Substring is supported by sharing the reference to the immutable underlying bytes.
- * Concatenation is likewise supported without copying (long strings) by building a tree of pieces
- * in {@link RopeByteString}.
- *
- * @author crazybob@google.com Bob Lee
- * @author kenton@google.com Kenton Varda
- * @author carlanton@google.com Carl Haverl
- * @author martinrb@google.com Martin Buchholz
- */
-@CheckReturnValue
-public abstract class ByteString implements Iterable<Byte>, Serializable {
-
-  /**
-   * When two strings to be concatenated have a combined length shorter than this, we just copy
-   * their bytes on {@link #concat(ByteString)}. The trade-off is copy size versus the overhead of
-   * creating tree nodes in {@link RopeByteString}.
-   */
-  static final int CONCATENATE_BY_COPY_SIZE = 128;
-
-  /**
-   * When copying an InputStream into a ByteString with .readFrom(), the chunks in the underlying
-   * rope start at 256 bytes, but double each iteration up to 8192 bytes.
-   */
-  static final int MIN_READ_FROM_CHUNK_SIZE = 0x100; // 256b
-
-  static final int MAX_READ_FROM_CHUNK_SIZE = 0x2000; // 8k
-
-  /** Empty {@code ByteString}. */
-  public static final ByteString EMPTY = new LiteralByteString(Internal.EMPTY_BYTE_ARRAY);
-
-  /**
-   * An interface to efficiently copy {@code byte[]}.
-   *
-   * <p>One of the noticeable costs of copying a byte[] into a new array using {@code
-   * System.arraycopy} is nullification of a new buffer before the copy. It has been shown the
-   * Hotspot VM is capable to intrisicfy {@code Arrays.copyOfRange} operation to avoid this
-   * expensive nullification and provide substantial performance gain. Unfortunately this does not
-   * hold on Android runtimes and could make the copy slightly slower due to additional code in the
-   * {@code Arrays.copyOfRange}. Thus we provide two different implementation for array copier for
-   * Hotspot and Android runtimes.
-   */
-  private interface ByteArrayCopier {
-    /** Copies the specified range of the specified array into a new array */
-    byte[] copyFrom(byte[] bytes, int offset, int size);
-  }
-
-  /** Implementation of {@code ByteArrayCopier} which uses {@link System#arraycopy}. */
-  private static final class SystemByteArrayCopier implements ByteArrayCopier {
-    @Override
-    public byte[] copyFrom(byte[] bytes, int offset, int size) {
-      byte[] copy = new byte[size];
-      System.arraycopy(bytes, offset, copy, 0, size);
-      return copy;
-    }
-  }
-
-  /** Implementation of {@code ByteArrayCopier} which uses {@link Arrays#copyOfRange}. */
-  private static final class ArraysByteArrayCopier implements ByteArrayCopier {
-    @Override
-    public byte[] copyFrom(byte[] bytes, int offset, int size) {
-      return Arrays.copyOfRange(bytes, offset, offset + size);
-    }
-  }
-
-  private static final ByteArrayCopier byteArrayCopier;
-
-  static {
-    byteArrayCopier =
-        Android.isOnAndroidDevice() ? new SystemByteArrayCopier() : new ArraysByteArrayCopier();
-  }
-
-  /**
-   * Cached hash value. Intentionally accessed via a data race, which is safe because of the Java
-   * Memory Model's "no out-of-thin-air values" guarantees for ints. A value of 0 implies that the
-   * hash has not been set.
-   */
-  private int hash = 0;
-
-  // This constructor is here to prevent subclassing outside of this package,
-  ByteString() {}
-
-  /**
-   * Gets the byte at the given index. This method should be used only for random access to
-   * individual bytes. To access bytes sequentially, use the {@link ByteIterator} returned by {@link
-   * #iterator()}, and call {@link #substring(int, int)} first if necessary.
-   *
-   * @param index index of byte
-   * @return the value
-   * @throws IndexOutOfBoundsException {@code index < 0 or index >= size}
-   */
-  public abstract byte byteAt(int index);
-
-  /**
-   * Gets the byte at the given index, assumes bounds checking has already been performed.
-   *
-   * @param index index of byte
-   * @return the value
-   * @throws IndexOutOfBoundsException {@code index < 0 or index >= size}
-   */
-  abstract byte internalByteAt(int index);
-
-  /**
-   * Return a {@link ByteString.ByteIterator} over the bytes in the ByteString. To avoid
-   * auto-boxing, you may get the iterator manually and call {@link ByteIterator#nextByte()}.
-   *
-   * @return the iterator
-   */
-  @Override
-  public ByteIterator iterator() {
-    return new AbstractByteIterator() {
-      private int position = 0;
-      private final int limit = size();
-
-      @Override
-      public boolean hasNext() {
-        return position < limit;
-      }
-
-      @Override
-      public byte nextByte() {
-        int currentPos = position;
-        if (currentPos >= limit) {
-          throw new NoSuchElementException();
-        }
-        position = currentPos + 1;
-        return internalByteAt(currentPos);
-      }
-    };
-  }
-
-  /**
-   * This interface extends {@code Iterator<Byte>}, so that we can return an unboxed {@code byte}.
-   */
-  public interface ByteIterator extends Iterator<Byte> {
-    /**
-     * An alternative to {@link Iterator#next()} that returns an unboxed primitive {@code byte}.
-     *
-     * @return the next {@code byte} in the iteration
-     * @throws NoSuchElementException if the iteration has no more elements
-     */
-    byte nextByte();
-  }
-
-  abstract static class AbstractByteIterator implements ByteIterator {
-    @Override
-    public final Byte next() {
-      // Boxing calls Byte.valueOf(byte), which does not instantiate.
-      return nextByte();
-    }
-
-    @Override
-    public final void remove() {
-      throw new UnsupportedOperationException();
-    }
-  }
-
-  /**
-   * Gets the number of bytes.
-   *
-   * @return size in bytes
-   */
-  public abstract int size();
-
-  /**
-   * Returns {@code true} if the size is {@code 0}, {@code false} otherwise.
-   *
-   * @return true if this is zero bytes long
-   */
-  public final boolean isEmpty() {
-    return size() == 0;
-  }
-
-  /** Returns an empty {@code ByteString} of size {@code 0}. */
-  public static final ByteString empty() {
-    return EMPTY;
-  }
-
-  // =================================================================
-  // Comparison
-
-  private static final int UNSIGNED_BYTE_MASK = 0xFF;
-
-  /**
-   * Returns the value of the given byte as an integer, interpreting the byte as an unsigned value.
-   * That is, returns {@code value + 256} if {@code value} is negative; {@code value} itself
-   * otherwise.
-   *
-   * <p>Note: This code was copied from {@link com.google.common.primitives.UnsignedBytes#toInt}, as
-   * Guava libraries cannot be used in the {@code com.google.protobuf} package.
-   */
-  private static int toInt(byte value) {
-    return value & UNSIGNED_BYTE_MASK;
-  }
-
-  /** Returns the numeric value of the given character in hex, or -1 if invalid. */
-  private static int hexDigit(char c) {
-    if (c >= '0' && c <= '9') {
-      return c - '0';
-    } else if (c >= 'A' && c <= 'F') {
-      return c - 'A' + 10;
-    } else if (c >= 'a' && c <= 'f') {
-      return c - 'a' + 10;
-    } else {
-      return -1;
-    }
-  }
-
-  /**
-   * Returns the numeric value of the given character at index in hexString.
-   *
-   * @throws NumberFormatException if the hexString character is invalid.
-   */
-  private static int extractHexDigit(String hexString, int index) {
-    int digit = hexDigit(hexString.charAt(index));
-    if (digit == -1) {
-      throw new NumberFormatException(
-          "Invalid hexString "
-              + hexString
-              + " must only contain [0-9a-fA-F] but contained "
-              + hexString.charAt(index)
-              + " at index "
-              + index);
-    }
-    return digit;
-  }
-
-  /**
-   * Compares two {@link ByteString}s lexicographically, treating their contents as unsigned byte
-   * values between 0 and 255 (inclusive).
-   *
-   * <p>For example, {@code (byte) -1} is considered to be greater than {@code (byte) 1} because it
-   * is interpreted as an unsigned value, {@code 255}.
-   */
-  private static final Comparator<ByteString> UNSIGNED_LEXICOGRAPHICAL_COMPARATOR =
-      new Comparator<ByteString>() {
-        @Override
-        public int compare(ByteString former, ByteString latter) {
-          ByteIterator formerBytes = former.iterator();
-          ByteIterator latterBytes = latter.iterator();
-
-          while (formerBytes.hasNext() && latterBytes.hasNext()) {
-            int result =
-                Integer.valueOf(toInt(formerBytes.nextByte()))
-                    .compareTo(toInt(latterBytes.nextByte()));
-            if (result != 0) {
-              return result;
-            }
-          }
-          return Integer.valueOf(former.size()).compareTo(Integer.valueOf(latter.size()));
-        }
-      };
-
-  /**
-   * Returns a {@link Comparator} which compares {@link ByteString}-s lexicographically as sequences
-   * of unsigned bytes (i.e. values between 0 and 255, inclusive).
-   *
-   * <p>For example, {@code (byte) -1} is considered to be greater than {@code (byte) 1} because it
-   * is interpreted as an unsigned value, {@code 255}:
-   *
-   * <ul>
-   *   <li>{@code `-1` -> 0b11111111 (two's complement) -> 255}
-   *   <li>{@code `1` -> 0b00000001 -> 1}
-   * </ul>
-   */
-  public static Comparator<ByteString> unsignedLexicographicalComparator() {
-    return UNSIGNED_LEXICOGRAPHICAL_COMPARATOR;
-  }
-
-  // =================================================================
-  // ByteString -> substring
-
-  /**
-   * Return the substring from {@code beginIndex}, inclusive, to the end of the string.
-   *
-   * @param beginIndex start at this index
-   * @return substring sharing underlying data
-   * @throws IndexOutOfBoundsException if {@code beginIndex < 0} or {@code beginIndex > size()}.
-   */
-  public final ByteString substring(int beginIndex) {
-    return substring(beginIndex, size());
-  }
-
-  /**
-   * Return the substring from {@code beginIndex}, inclusive, to {@code endIndex}, exclusive.
-   *
-   * @param beginIndex start at this index
-   * @param endIndex the last character is the one before this index
-   * @return substring sharing underlying data
-   * @throws IndexOutOfBoundsException if {@code beginIndex < 0}, {@code endIndex > size()}, or
-   *     {@code beginIndex > endIndex}.
-   */
-  public abstract ByteString substring(int beginIndex, int endIndex);
-
-  /**
-   * Tests if this bytestring starts with the specified prefix. Similar to {@link
-   * String#startsWith(String)}
-   *
-   * @param prefix the prefix.
-   * @return <code>true</code> if the byte sequence represented by the argument is a prefix of the
-   *     byte sequence represented by this string; <code>false</code> otherwise.
-   */
-  public final boolean startsWith(ByteString prefix) {
-    return size() >= prefix.size() && substring(0, prefix.size()).equals(prefix);
-  }
-
-  /**
-   * Tests if this bytestring ends with the specified suffix. Similar to {@link
-   * String#endsWith(String)}
-   *
-   * @param suffix the suffix.
-   * @return <code>true</code> if the byte sequence represented by the argument is a suffix of the
-   *     byte sequence represented by this string; <code>false</code> otherwise.
-   */
-  public final boolean endsWith(ByteString suffix) {
-    return size() >= suffix.size() && substring(size() - suffix.size()).equals(suffix);
-  }
-
-  // =================================================================
-  // String -> ByteString
-
-  /**
-   * Returns a {@code ByteString} from a hexadecimal String. Alternative CharSequences should use
-   * {@link ByteStrings#decode(CharSequence, BaseEncoding)}
-   *
-   * @param hexString String of hexadecimal digits to create {@code ByteString} from.
-   * @throws NumberFormatException if the hexString does not contain a parsable hex String.
-   */
-  public static ByteString fromHex(@CompileTimeConstant String hexString) {
-    if (hexString.length() % 2 != 0) {
-      throw new NumberFormatException(
-          "Invalid hexString " + hexString + " of length " + hexString.length() + " must be even.");
-    }
-    byte[] bytes = new byte[hexString.length() / 2];
-    for (int i = 0; i < bytes.length; i++) {
-      int d1 = extractHexDigit(hexString, 2 * i);
-      int d2 = extractHexDigit(hexString, 2 * i + 1);
-      bytes[i] = (byte) (d1 << 4 | d2);
-    }
-    return new LiteralByteString(bytes);
-  }
-
-  // =================================================================
-  // byte[] -> ByteString
-
-  /**
-   * Copies the given bytes into a {@code ByteString}.
-   *
-   * @param bytes source array
-   * @param offset offset in source array
-   * @param size number of bytes to copy
-   * @return new {@code ByteString}
-   * @throws IndexOutOfBoundsException if {@code offset} or {@code size} are out of bounds
-   */
-  public static ByteString copyFrom(byte[] bytes, int offset, int size) {
-    checkRange(offset, offset + size, bytes.length);
-    return new LiteralByteString(byteArrayCopier.copyFrom(bytes, offset, size));
-  }
-
-  /**
-   * Copies the given bytes into a {@code ByteString}.
-   *
-   * @param bytes to copy
-   * @return new {@code ByteString}
-   */
-  public static ByteString copyFrom(byte[] bytes) {
-    return copyFrom(bytes, 0, bytes.length);
-  }
-
-  /** Wraps the given bytes into a {@code ByteString}. Intended for internal only usage. */
-  static ByteString wrap(ByteBuffer buffer) {
-    if (buffer.hasArray()) {
-      final int offset = buffer.arrayOffset();
-      return ByteString.wrap(buffer.array(), offset + buffer.position(), buffer.remaining());
-    } else {
-      return new NioByteString(buffer);
-    }
-  }
-
-  /**
-   * Wraps the given bytes into a {@code ByteString}. Intended for internal only usage to force a
-   * classload of ByteString before LiteralByteString.
-   */
-  static ByteString wrap(byte[] bytes) {
-    // TODO(dweis): Return EMPTY when bytes are empty to reduce allocations?
-    return new LiteralByteString(bytes);
-  }
-
-  /**
-   * Wraps the given bytes into a {@code ByteString}. Intended for internal only usage to force a
-   * classload of ByteString before BoundedByteString and LiteralByteString.
-   */
-  static ByteString wrap(byte[] bytes, int offset, int length) {
-    return new BoundedByteString(bytes, offset, length);
-  }
-
-  /**
-   * Copies the next {@code size} bytes from a {@code java.nio.ByteBuffer} into a {@code
-   * ByteString}.
-   *
-   * @param bytes source buffer
-   * @param size number of bytes to copy
-   * @return new {@code ByteString}
-   * @throws IndexOutOfBoundsException if {@code size > bytes.remaining()}
-   */
-  public static ByteString copyFrom(ByteBuffer bytes, int size) {
-    checkRange(0, size, bytes.remaining());
-    byte[] copy = new byte[size];
-    bytes.get(copy);
-    return new LiteralByteString(copy);
-  }
-
-  /**
-   * Copies the remaining bytes from a {@code java.nio.ByteBuffer} into a {@code ByteString}.
-   *
-   * @param bytes sourceBuffer
-   * @return new {@code ByteString}
-   */
-  public static ByteString copyFrom(ByteBuffer bytes) {
-    return copyFrom(bytes, bytes.remaining());
-  }
-
-  /**
-   * Encodes {@code text} into a sequence of bytes using the named charset and returns the result as
-   * a {@code ByteString}.
-   *
-   * @param text source string
-   * @param charsetName encoding to use
-   * @return new {@code ByteString}
-   * @throws UnsupportedEncodingException if the encoding isn't found
-   */
-  public static ByteString copyFrom(String text, String charsetName)
-      throws UnsupportedEncodingException {
-    return new LiteralByteString(text.getBytes(charsetName));
-  }
-
-  /**
-   * Encodes {@code text} into a sequence of bytes using the named charset and returns the result as
-   * a {@code ByteString}.
-   *
-   * @param text source string
-   * @param charset encode using this charset
-   * @return new {@code ByteString}
-   */
-  public static ByteString copyFrom(String text, Charset charset) {
-    return new LiteralByteString(text.getBytes(charset));
-  }
-
-  /**
-   * Encodes {@code text} into a sequence of UTF-8 bytes and returns the result as a {@code
-   * ByteString}.
-   *
-   * @param text source string
-   * @return new {@code ByteString}
-   */
-  public static ByteString copyFromUtf8(String text) {
-    return new LiteralByteString(text.getBytes(Internal.UTF_8));
-  }
-
-  // =================================================================
-  // InputStream -> ByteString
-
-  /**
-   * Completely reads the given stream's bytes into a {@code ByteString}, blocking if necessary
-   * until all bytes are read through to the end of the stream.
-   *
-   * <p><b>Performance notes:</b> The returned {@code ByteString} is an immutable tree of byte
-   * arrays ("chunks") of the stream data. The first chunk is small, with subsequent chunks each
-   * being double the size, up to 8K.
-   *
-   * <p>Each byte read from the input stream will be copied twice to ensure that the resulting
-   * ByteString is truly immutable.
-   *
-   * @param streamToDrain The source stream, which is read completely but not closed.
-   * @return A new {@code ByteString} which is made up of chunks of various sizes, depending on the
-   *     behavior of the underlying stream.
-   * @throws IOException if there is a problem reading the underlying stream
-   * @throws IllegalArgumentException if the stream supplies more than Integer.MAX_VALUE bytes
-   */
-  public static ByteString readFrom(InputStream streamToDrain) throws IOException {
-    return readFrom(streamToDrain, MIN_READ_FROM_CHUNK_SIZE, MAX_READ_FROM_CHUNK_SIZE);
-  }
-
-  /**
-   * Completely reads the given stream's bytes into a {@code ByteString}, blocking if necessary
-   * until all bytes are read through to the end of the stream.
-   *
-   * <p><b>Performance notes:</b> The returned {@code ByteString} is an immutable tree of byte
-   * arrays ("chunks") of the stream data. The chunkSize parameter sets the size of these byte
-   * arrays.
-   *
-   * <p>Each byte read from the input stream will be copied twice to ensure that the resulting
-   * ByteString is truly immutable.
-   *
-   * @param streamToDrain The source stream, which is read completely but not closed.
-   * @param chunkSize The size of the chunks in which to read the stream.
-   * @return A new {@code ByteString} which is made up of chunks of the given size.
-   * @throws IOException if there is a problem reading the underlying stream
-   * @throws IllegalArgumentException if the stream supplies more than Integer.MAX_VALUE bytes
-   */
-  public static ByteString readFrom(InputStream streamToDrain, int chunkSize) throws IOException {
-    return readFrom(streamToDrain, chunkSize, chunkSize);
-  }
-
-  /**
-   * Helper method that takes the chunk size range as a parameter.
-   *
-   * @param streamToDrain the source stream, which is read completely but not closed
-   * @param minChunkSize the minimum size of the chunks in which to read the stream
-   * @param maxChunkSize the maximum size of the chunks in which to read the stream
-   * @return a new {@code ByteString} which is made up of chunks within the given size range
-   * @throws IOException if there is a problem reading the underlying stream
-   * @throws IllegalArgumentException if the stream supplies more than Integer.MAX_VALUE bytes
-   */
-  public static ByteString readFrom(InputStream streamToDrain, int minChunkSize, int maxChunkSize)
-      throws IOException {
-    Collection<ByteString> results = new ArrayList<ByteString>();
-
-    // copy the inbound bytes into a list of chunks; the chunk size
-    // grows exponentially to support both short and long streams.
-    int chunkSize = minChunkSize;
-    while (true) {
-      ByteString chunk = readChunk(streamToDrain, chunkSize);
-      if (chunk == null) {
-        break;
-      }
-      results.add(chunk);
-      chunkSize = Math.min(chunkSize * 2, maxChunkSize);
-    }
-
-    return ByteString.copyFrom(results);
-  }
-
-  /**
-   * Blocks until a chunk of the given size can be made from the stream, or EOF is reached. Calls
-   * read() repeatedly in case the given stream implementation doesn't completely fill the given
-   * buffer in one read() call.
-   *
-   * @return A chunk of the desired size, or else a chunk as large as was available when end of
-   *     stream was reached. Returns null if the given stream had no more data in it.
-   */
-  private static ByteString readChunk(InputStream in, final int chunkSize) throws IOException {
-    final byte[] buf = new byte[chunkSize];
-    int bytesRead = 0;
-    while (bytesRead < chunkSize) {
-      final int count = in.read(buf, bytesRead, chunkSize - bytesRead);
-      if (count == -1) {
-        break;
-      }
-      bytesRead += count;
-    }
-
-    if (bytesRead == 0) {
-      return null;
-    }
-
-    // Always make a copy since InputStream could steal a reference to buf.
-    return ByteString.copyFrom(buf, 0, bytesRead);
-  }
-
-  // =================================================================
-  // Multiple ByteStrings -> One ByteString
-
-  /**
-   * Concatenate the given {@code ByteString} to this one. Short concatenations, of total size
-   * smaller than {@link ByteString#CONCATENATE_BY_COPY_SIZE}, are produced by copying the
-   * underlying bytes (as per Rope.java, <a
-   * href="http://www.cs.ubc.ca/local/reading/proceedings/spe91-95/spe/vol25/issue12/spe986.pdf">
-   * BAP95 </a>. In general, the concatenate involves no copying.
-   *
-   * @param other string to concatenate
-   * @return a new {@code ByteString} instance
-   * @throws IllegalArgumentException if the combined size of the two byte strings exceeds
-   *     Integer.MAX_VALUE
-   */
-  public final ByteString concat(ByteString other) {
-    if (Integer.MAX_VALUE - size() < other.size()) {
-      throw new IllegalArgumentException(
-          "ByteString would be too long: " + size() + "+" + other.size());
-    }
-
-    return RopeByteString.concatenate(this, other);
-  }
-
-  /**
-   * Concatenates all byte strings in the iterable and returns the result. This is designed to run
-   * in O(list size), not O(total bytes).
-   *
-   * <p>The returned {@code ByteString} is not necessarily a unique object. If the list is empty,
-   * the returned object is the singleton empty {@code ByteString}. If the list has only one
-   * element, that {@code ByteString} will be returned without copying.
-   *
-   * @param byteStrings strings to be concatenated
-   * @return new {@code ByteString}
-   * @throws IllegalArgumentException if the combined size of the byte strings exceeds
-   *     Integer.MAX_VALUE
-   */
-  public static ByteString copyFrom(Iterable<ByteString> byteStrings) {
-    // Determine the size;
-    final int size;
-    if (!(byteStrings instanceof Collection)) {
-      int tempSize = 0;
-      for (Iterator<ByteString> iter = byteStrings.iterator();
-          iter.hasNext();
-          iter.next(), ++tempSize) {}
-      size = tempSize;
-    } else {
-      size = ((Collection<ByteString>) byteStrings).size();
-    }
-
-    if (size == 0) {
-      return EMPTY;
-    }
-
-    return balancedConcat(byteStrings.iterator(), size);
-  }
-
-  // Internal function used by copyFrom(Iterable<ByteString>).
-  // Create a balanced concatenation of the next "length" elements from the
-  // iterable.
-  private static ByteString balancedConcat(Iterator<ByteString> iterator, int length) {
-    if (length < 1) {
-      throw new IllegalArgumentException(String.format("length (%s) must be >= 1", length));
-    }
-    ByteString result;
-    if (length == 1) {
-      result = iterator.next();
-    } else {
-      int halfLength = length >>> 1;
-      ByteString left = balancedConcat(iterator, halfLength);
-      ByteString right = balancedConcat(iterator, length - halfLength);
-      result = left.concat(right);
-    }
-    return result;
-  }
-
-  // =================================================================
-  // ByteString -> byte[]
-
-  /**
-   * Copies bytes into a buffer at the given offset.
-   *
-   * <p>To copy a subset of bytes, you call this method on the return value of {@link
-   * #substring(int, int)}. Example: {@code byteString.substring(start, end).copyTo(target, offset)}
-   *
-   * @param target buffer to copy into
-   * @param offset in the target buffer
-   * @throws IndexOutOfBoundsException if the offset is negative or too large
-   */
-  public void copyTo(byte[] target, int offset) {
-    copyTo(target, 0, offset, size());
-  }
-
-  /**
-   * Copies bytes into a buffer.
-   *
-   * @param target buffer to copy into
-   * @param sourceOffset offset within these bytes
-   * @param targetOffset offset within the target buffer
-   * @param numberToCopy number of bytes to copy
-   * @throws IndexOutOfBoundsException if an offset or size is negative or too large
-   * @deprecated Instead, call {@code byteString.substring(sourceOffset, sourceOffset +
-   *     numberToCopy).copyTo(target, targetOffset)}
-   */
-  @Deprecated
-  public final void copyTo(byte[] target, int sourceOffset, int targetOffset, int numberToCopy) {
-    checkRange(sourceOffset, sourceOffset + numberToCopy, size());
-    checkRange(targetOffset, targetOffset + numberToCopy, target.length);
-    if (numberToCopy > 0) {
-      copyToInternal(target, sourceOffset, targetOffset, numberToCopy);
-    }
-  }
-
-  /**
-   * Internal (package private) implementation of {@link #copyTo(byte[],int,int,int)}. It assumes
-   * that all error checking has already been performed and that {@code numberToCopy > 0}.
-   */
-  protected abstract void copyToInternal(
-      byte[] target, int sourceOffset, int targetOffset, int numberToCopy);
-
-  /**
-   * Copies bytes into a ByteBuffer.
-   *
-   * <p>To copy a subset of bytes, you call this method on the return value of {@link
-   * #substring(int, int)}. Example: {@code byteString.substring(start, end).copyTo(target)}
-   *
-   * @param target ByteBuffer to copy into.
-   * @throws java.nio.ReadOnlyBufferException if the {@code target} is read-only
-   * @throws java.nio.BufferOverflowException if the {@code target}'s remaining() space is not large
-   *     enough to hold the data.
-   */
-  public abstract void copyTo(ByteBuffer target);
-
-  /**
-   * Copies bytes to a {@code byte[]}.
-   *
-   * @return copied bytes
-   */
-  public final byte[] toByteArray() {
-    final int size = size();
-    if (size == 0) {
-      return Internal.EMPTY_BYTE_ARRAY;
-    }
-    byte[] result = new byte[size];
-    copyToInternal(result, 0, 0, size);
-    return result;
-  }
-
-  /**
-   * Writes a copy of the contents of this byte string to the specified output stream argument.
-   *
-   * @param out the output stream to which to write the data.
-   * @throws IOException if an I/O error occurs.
-   */
-  public abstract void writeTo(OutputStream out) throws IOException;
-
-  /**
-   * Writes a specified part of this byte string to an output stream.
-   *
-   * @param out the output stream to which to write the data.
-   * @param sourceOffset offset within these bytes
-   * @param numberToWrite number of bytes to write
-   * @throws IOException if an I/O error occurs.
-   * @throws IndexOutOfBoundsException if an offset or size is negative or too large
-   */
-  final void writeTo(OutputStream out, int sourceOffset, int numberToWrite) throws IOException {
-    checkRange(sourceOffset, sourceOffset + numberToWrite, size());
-    if (numberToWrite > 0) {
-      writeToInternal(out, sourceOffset, numberToWrite);
-    }
-  }
-
-  /**
-   * Internal version of {@link #writeTo(OutputStream,int,int)} that assumes all error checking has
-   * already been done.
-   */
-  abstract void writeToInternal(OutputStream out, int sourceOffset, int numberToWrite)
-      throws IOException;
-
-  /**
-   * Writes this {@link ByteString} to the provided {@link ByteOutput}. Calling this method may
-   * result in multiple operations on the target {@link ByteOutput}.
-   *
-   * <p>This method may expose internal backing buffers of the {@link ByteString} to the {@link
-   * ByteOutput} in order to avoid additional copying overhead. It would be possible for a malicious
-   * {@link ByteOutput} to corrupt the {@link ByteString}. Use with caution!
-   *
-   * @param byteOutput the output target to receive the bytes
-   * @throws IOException if an I/O error occurs
-   * @see UnsafeByteOperations#unsafeWriteTo(ByteString, ByteOutput)
-   */
-  abstract void writeTo(ByteOutput byteOutput) throws IOException;
-
-  /**
-   * This method behaves exactly the same as {@link #writeTo(ByteOutput)} unless the {@link
-   * ByteString} is a rope. For ropes, the leaf nodes are written in reverse order to the {@code
-   * byteOutput}.
-   *
-   * @param byteOutput the output target to receive the bytes
-   * @throws IOException if an I/O error occurs
-   * @see UnsafeByteOperations#unsafeWriteToReverse(ByteString, ByteOutput)
-   */
-  abstract void writeToReverse(ByteOutput byteOutput) throws IOException;
-
-  /**
-   * Constructs a read-only {@code java.nio.ByteBuffer} whose content is equal to the contents of
-   * this byte string. The result uses the same backing array as the byte string, if possible.
-   *
-   * @return wrapped bytes
-   */
-  public abstract ByteBuffer asReadOnlyByteBuffer();
-
-  /**
-   * Constructs a list of read-only {@code java.nio.ByteBuffer} objects such that the concatenation
-   * of their contents is equal to the contents of this byte string. The result uses the same
-   * backing arrays as the byte string.
-   *
-   * <p>By returning a list, implementations of this method may be able to avoid copying even when
-   * there are multiple backing arrays.
-   *
-   * @return a list of wrapped bytes
-   */
-  public abstract List<ByteBuffer> asReadOnlyByteBufferList();
-
-  /**
-   * Constructs a new {@code String} by decoding the bytes using the specified charset.
-   *
-   * @param charsetName encode using this charset
-   * @return new string
-   * @throws UnsupportedEncodingException if charset isn't recognized
-   */
-  public final String toString(String charsetName) throws UnsupportedEncodingException {
-    try {
-      return toString(Charset.forName(charsetName));
-    } catch (UnsupportedCharsetException e) {
-      UnsupportedEncodingException exception = new UnsupportedEncodingException(charsetName);
-      exception.initCause(e);
-      throw exception;
-    }
-  }
-
-  /**
-   * Constructs a new {@code String} by decoding the bytes using the specified charset. Returns the
-   * same empty String if empty.
-   *
-   * @param charset encode using this charset
-   * @return new string
-   */
-  public final String toString(Charset charset) {
-    return size() == 0 ? "" : toStringInternal(charset);
-  }
-
-  /**
-   * Constructs a new {@code String} by decoding the bytes using the specified charset.
-   *
-   * @param charset encode using this charset
-   * @return new string
-   */
-  protected abstract String toStringInternal(Charset charset);
-
-  // =================================================================
-  // UTF-8 decoding
-
-  /**
-   * Constructs a new {@code String} by decoding the bytes as UTF-8.
-   *
-   * @return new string using UTF-8 encoding
-   */
-  public final String toStringUtf8() {
-    return toString(Internal.UTF_8);
-  }
-
-  /**
-   * Tells whether this {@code ByteString} represents a well-formed UTF-8 byte sequence, such that
-   * the original bytes can be converted to a String object and then round tripped back to bytes
-   * without loss.
-   *
-   * <p>More precisely, returns {@code true} whenever:
-   *
-   * <pre>{@code
-   * Arrays.equals(byteString.toByteArray(),
-   *     new String(byteString.toByteArray(), "UTF-8").getBytes("UTF-8"))
-   * }</pre>
-   *
-   * <p>This method returns {@code false} for "overlong" byte sequences, as well as for 3-byte
-   * sequences that would map to a surrogate character, in accordance with the restricted definition
-   * of UTF-8 introduced in Unicode 3.1. Note that the UTF-8 decoder included in Oracle's JDK has
-   * been modified to also reject "overlong" byte sequences, but (as of 2011) still accepts 3-byte
-   * surrogate character byte sequences.
-   *
-   * <p>See the Unicode Standard,<br>
-   * Table 3-6. <em>UTF-8 Bit Distribution</em>,<br>
-   * Table 3-7. <em>Well Formed UTF-8 Byte Sequences</em>.
-   *
-   * @return whether the bytes in this {@code ByteString} are a well-formed UTF-8 byte sequence
-   */
-  public abstract boolean isValidUtf8();
-
-  /**
-   * Tells whether the given byte sequence is a well-formed, malformed, or incomplete UTF-8 byte
-   * sequence. This method accepts and returns a partial state result, allowing the bytes for a
-   * complete UTF-8 byte sequence to be composed from multiple {@code ByteString} segments.
-   *
-   * @param state either {@code 0} (if this is the initial decoding operation) or the value returned
-   *     from a call to a partial decoding method for the previous bytes
-   * @param offset offset of the first byte to check
-   * @param length number of bytes to check
-   * @return {@code -1} if the partial byte sequence is definitely malformed, {@code 0} if it is
-   *     well-formed (no additional input needed), or, if the byte sequence is "incomplete", i.e.
-   *     apparently terminated in the middle of a character, an opaque integer "state" value
-   *     containing enough information to decode the character when passed to a subsequent
-   *     invocation of a partial decoding method.
-   */
-  protected abstract int partialIsValidUtf8(int state, int offset, int length);
-
-  // =================================================================
-  // equals() and hashCode()
-
-  @Override
-  public abstract boolean equals(Object o);
-
-  /** Base class for leaf {@link ByteString}s (i.e. non-ropes). */
-  abstract static class LeafByteString extends ByteString {
-    @Override
-    protected final int getTreeDepth() {
-      return 0;
-    }
-
-    @Override
-    protected final boolean isBalanced() {
-      return true;
-    }
-
-    @Override
-    void writeToReverse(ByteOutput byteOutput) throws IOException {
-      writeTo(byteOutput);
-    }
-
-    /**
-     * Check equality of the substring of given length of this object starting at zero with another
-     * {@code ByteString} substring starting at offset.
-     *
-     * @param other what to compare a substring in
-     * @param offset offset into other
-     * @param length number of bytes to compare
-     * @return true for equality of substrings, else false.
-     */
-    abstract boolean equalsRange(ByteString other, int offset, int length);
-  }
-
-  /**
-   * Compute the hashCode using the traditional algorithm from {@link ByteString}.
-   *
-   * @return hashCode value
-   */
-  @Override
-  public final int hashCode() {
-    int h = hash;
-
-    if (h == 0) {
-      int size = size();
-      h = partialHash(size, 0, size);
-      if (h == 0) {
-        h = 1;
-      }
-      hash = h;
-    }
-    return h;
-  }
-
-  // =================================================================
-  // Input stream
-
-  /**
-   * Creates an {@code InputStream} which can be used to read the bytes.
-   *
-   * <p>The {@link InputStream} returned by this method is guaranteed to be completely non-blocking.
-   * The method {@link InputStream#available()} returns the number of bytes remaining in the stream.
-   * The methods {@link InputStream#read(byte[])}, {@link InputStream#read(byte[],int,int)} and
-   * {@link InputStream#skip(long)} will read/skip as many bytes as are available. The method {@link
-   * InputStream#markSupported()} returns {@code true}.
-   *
-   * <p>The methods in the returned {@link InputStream} might <b>not</b> be thread safe.
-   *
-   * @return an input stream that returns the bytes of this byte string.
-   */
-  public abstract InputStream newInput();
-
-  /**
-   * Creates a {@link CodedInputStream} which can be used to read the bytes. Using this is often
-   * more efficient than creating a {@link CodedInputStream} that wraps the result of {@link
-   * #newInput()}.
-   *
-   * @return stream based on wrapped data
-   */
-  public abstract CodedInputStream newCodedInput();
-
-  // =================================================================
-  // Output stream
-
-  /**
-   * Creates a new {@link Output} with the given initial capacity. Call {@link
-   * Output#toByteString()} to create the {@code ByteString} instance.
-   *
-   * <p>A {@link ByteString.Output} offers the same functionality as a {@link
-   * ByteArrayOutputStream}, except that it returns a {@link ByteString} rather than a {@code byte}
-   * array.
-   *
-   * @param initialCapacity estimate of number of bytes to be written
-   * @return {@code OutputStream} for building a {@code ByteString}
-   */
-  public static Output newOutput(int initialCapacity) {
-    return new Output(initialCapacity);
-  }
-
-  /**
-   * Creates a new {@link Output}. Call {@link Output#toByteString()} to create the {@code
-   * ByteString} instance.
-   *
-   * <p>A {@link ByteString.Output} offers the same functionality as a {@link
-   * ByteArrayOutputStream}, except that it returns a {@link ByteString} rather than a {@code byte
-   * array}.
-   *
-   * @return {@code OutputStream} for building a {@code ByteString}
-   */
-  public static Output newOutput() {
-    return new Output(CONCATENATE_BY_COPY_SIZE);
-  }
-
-  /**
-   * Outputs to a {@code ByteString} instance. Call {@link #toByteString()} to create the {@code
-   * ByteString} instance.
-   */
-  public static final class Output extends OutputStream {
-    // Implementation note.
-    // The public methods of this class must be synchronized.  ByteStrings
-    // are guaranteed to be immutable.  Without some sort of locking, it could
-    // be possible for one thread to call toByteSring(), while another thread
-    // is still modifying the underlying byte array.
-
-    private static final byte[] EMPTY_BYTE_ARRAY = new byte[0];
-    // argument passed by user, indicating initial capacity.
-    private final int initialCapacity;
-    // ByteStrings to be concatenated to create the result
-    private final ArrayList<ByteString> flushedBuffers;
-    // Total number of bytes in the ByteStrings of flushedBuffers
-    private int flushedBuffersTotalBytes;
-    // Current buffer to which we are writing
-    private byte[] buffer;
-    // Location in buffer[] to which we write the next byte.
-    private int bufferPos;
-
-    /**
-     * Creates a new ByteString output stream with the specified initial capacity.
-     *
-     * @param initialCapacity the initial capacity of the output stream.
-     */
-    Output(int initialCapacity) {
-      if (initialCapacity < 0) {
-        throw new IllegalArgumentException("Buffer size < 0");
-      }
-      this.initialCapacity = initialCapacity;
-      this.flushedBuffers = new ArrayList<ByteString>();
-      this.buffer = new byte[initialCapacity];
-    }
-
-    @Override
-    public synchronized void write(int b) {
-      if (bufferPos == buffer.length) {
-        flushFullBuffer(1);
-      }
-      buffer[bufferPos++] = (byte) b;
-    }
-
-    @Override
-    public synchronized void write(byte[] b, int offset, int length) {
-      if (length <= buffer.length - bufferPos) {
-        // The bytes can fit into the current buffer.
-        System.arraycopy(b, offset, buffer, bufferPos, length);
-        bufferPos += length;
-      } else {
-        // Use up the current buffer
-        int copySize = buffer.length - bufferPos;
-        System.arraycopy(b, offset, buffer, bufferPos, copySize);
-        offset += copySize;
-        length -= copySize;
-        // Flush the buffer, and get a new buffer at least big enough to cover
-        // what we still need to output
-        flushFullBuffer(length);
-        System.arraycopy(b, offset, buffer, /* count= */ 0, length);
-        bufferPos = length;
-      }
-    }
-
-    /**
-     * Creates a byte string with the size and contents of this output stream. This does not create
-     * a new copy of the underlying bytes. If the stream size grows dynamically, the runtime is
-     * O(log n) in respect to the number of bytes written to the {@link Output}. If the stream size
-     * stays within the initial capacity, the runtime is O(1).
-     *
-     * @return the current contents of this output stream, as a byte string.
-     */
-    public synchronized ByteString toByteString() {
-      flushLastBuffer();
-      return ByteString.copyFrom(flushedBuffers);
-    }
-
-    /** Implement java.util.Arrays.copyOf() for jdk 1.5. */
-    private byte[] copyArray(byte[] buffer, int length) {
-      byte[] result = new byte[length];
-      System.arraycopy(buffer, 0, result, 0, Math.min(buffer.length, length));
-      return result;
-    }
-
-    /**
-     * Writes the complete contents of this byte array output stream to the specified output stream
-     * argument.
-     *
-     * @param out the output stream to which to write the data.
-     * @throws IOException if an I/O error occurs.
-     */
-    public void writeTo(OutputStream out) throws IOException {
-      ByteString[] cachedFlushBuffers;
-      byte[] cachedBuffer;
-      int cachedBufferPos;
-      synchronized (this) {
-        // Copy the information we need into local variables so as to hold
-        // the lock for as short a time as possible.
-        cachedFlushBuffers = flushedBuffers.toArray(new ByteString[flushedBuffers.size()]);
-        cachedBuffer = buffer;
-        cachedBufferPos = bufferPos;
-      }
-      for (ByteString byteString : cachedFlushBuffers) {
-        byteString.writeTo(out);
-      }
-
-      out.write(copyArray(cachedBuffer, cachedBufferPos));
-    }
-
-    /**
-     * Returns the current size of the output stream.
-     *
-     * @return the current size of the output stream
-     */
-    public synchronized int size() {
-      return flushedBuffersTotalBytes + bufferPos;
-    }
-
-    /**
-     * Resets this stream, so that all currently accumulated output in the output stream is
-     * discarded. The output stream can be used again, reusing the already allocated buffer space.
-     */
-    public synchronized void reset() {
-      flushedBuffers.clear();
-      flushedBuffersTotalBytes = 0;
-      bufferPos = 0;
-    }
-
-    @Override
-    public String toString() {
-      return String.format(
-          "<ByteString.Output@%s size=%d>",
-          Integer.toHexString(System.identityHashCode(this)), size());
-    }
-
-    /**
-     * Internal function used by writers. The current buffer is full, and the writer needs a new
-     * buffer whose size is at least the specified minimum size.
-     */
-    private void flushFullBuffer(int minSize) {
-      flushedBuffers.add(new LiteralByteString(buffer));
-      flushedBuffersTotalBytes += buffer.length;
-      // We want to increase our total capacity by 50%, but as a minimum,
-      // the new buffer should also at least be >= minSize and
-      // >= initial Capacity.
-      int newSize = Math.max(initialCapacity, Math.max(minSize, flushedBuffersTotalBytes >>> 1));
-      buffer = new byte[newSize];
-      bufferPos = 0;
-    }
-
-    /**
-     * Internal function used by {@link #toByteString()}. The current buffer may or may not be full,
-     * but it needs to be flushed.
-     */
-    private void flushLastBuffer() {
-      if (bufferPos < buffer.length) {
-        if (bufferPos > 0) {
-          byte[] bufferCopy = copyArray(buffer, bufferPos);
-          flushedBuffers.add(new LiteralByteString(bufferCopy));
-        }
-        // We reuse this buffer for further writes.
-      } else {
-        // Buffer is completely full.  Huzzah.
-        flushedBuffers.add(new LiteralByteString(buffer));
-        // 99% of the time, we're not going to use this OutputStream again.
-        // We set buffer to an empty byte stream so that we're handling this
-        // case without wasting space.  In the rare case that more writes
-        // *do* occur, this empty buffer will be flushed and an appropriately
-        // sized new buffer will be created.
-        buffer = EMPTY_BYTE_ARRAY;
-      }
-      flushedBuffersTotalBytes += bufferPos;
-      bufferPos = 0;
-    }
-  }
-
-  /**
-   * Constructs a new {@code ByteString} builder, which allows you to efficiently construct a {@code
-   * ByteString} by writing to a {@link CodedOutputStream}. Using this is much more efficient than
-   * calling {@code newOutput()} and wrapping that in a {@code CodedOutputStream}.
-   *
-   * <p>This is package-private because it's a somewhat confusing interface. Users can call {@link
-   * Message#toByteString()} instead of calling this directly.
-   *
-   * @param size The target byte size of the {@code ByteString}. You must write exactly this many
-   *     bytes before building the result.
-   * @return the builder
-   */
-  static CodedBuilder newCodedBuilder(int size) {
-    return new CodedBuilder(size);
-  }
-
-  /** See {@link ByteString#newCodedBuilder(int)}. */
-  static final class CodedBuilder {
-    private final CodedOutputStream output;
-    private final byte[] buffer;
-
-    private CodedBuilder(int size) {
-      buffer = new byte[size];
-      output = CodedOutputStream.newInstance(buffer);
-    }
-
-    public ByteString build() {
-      output.checkNoSpaceLeft();
-
-      // We can be confident that the CodedOutputStream will not modify the
-      // underlying bytes anymore because it already wrote all of them.  So,
-      // no need to make a copy.
-      return new LiteralByteString(buffer);
-    }
-
-    public CodedOutputStream getCodedOutput() {
-      return output;
-    }
-  }
-
-  // =================================================================
-  // Methods {@link RopeByteString} needs on instances, which aren't part of the
-  // public API.
-
-  /**
-   * Return the depth of the tree representing this {@code ByteString}, if any, whose root is this
-   * node. If this is a leaf node, return 0.
-   *
-   * @return tree depth or zero
-   */
-  protected abstract int getTreeDepth();
-
-  /**
-   * Return {@code true} if this ByteString is literal (a leaf node) or a flat-enough tree in the
-   * sense of {@link RopeByteString}.
-   *
-   * @return true if the tree is flat enough
-   */
-  protected abstract boolean isBalanced();
-
-  /**
-   * Return the cached hash code if available.
-   *
-   * @return value of cached hash code or 0 if not computed yet
-   */
-  protected final int peekCachedHashCode() {
-    return hash;
-  }
-
-  /**
-   * Compute the hash across the value bytes starting with the given hash, and return the result.
-   * This is used to compute the hash across strings represented as a set of pieces by allowing the
-   * hash computation to be continued from piece to piece.
-   *
-   * @param h starting hash value
-   * @param offset offset into this value to start looking at data values
-   * @param length number of data values to include in the hash computation
-   * @return ending hash value
-   */
-  protected abstract int partialHash(int h, int offset, int length);
-
-  /**
-   * Checks that the given index falls within the specified array size.
-   *
-   * @param index the index position to be tested
-   * @param size the length of the array
-   * @throws IndexOutOfBoundsException if the index does not fall within the array.
-   */
-  static void checkIndex(int index, int size) {
-    if ((index | (size - (index + 1))) < 0) {
-      if (index < 0) {
-        throw new ArrayIndexOutOfBoundsException("Index < 0: " + index);
-      }
-      throw new ArrayIndexOutOfBoundsException("Index > length: " + index + ", " + size);
-    }
-  }
-
-  /**
-   * Checks that the given range falls within the bounds of an array
-   *
-   * @param startIndex the start index of the range (inclusive)
-   * @param endIndex the end index of the range (exclusive)
-   * @param size the size of the array.
-   * @return the length of the range.
-   * @throws IndexOutOfBoundsException some or all of the range falls outside of the array.
-   */
-  @CanIgnoreReturnValue
-  static int checkRange(int startIndex, int endIndex, int size) {
-    final int length = endIndex - startIndex;
-    if ((startIndex | endIndex | length | (size - endIndex)) < 0) {
-      if (startIndex < 0) {
-        throw new IndexOutOfBoundsException("Beginning index: " + startIndex + " < 0");
-      }
-      if (endIndex < startIndex) {
-        throw new IndexOutOfBoundsException(
-            "Beginning index larger than ending index: " + startIndex + ", " + endIndex);
-      }
-      // endIndex >= size
-      throw new IndexOutOfBoundsException("End index: " + endIndex + " >= " + size);
-    }
-    return length;
-  }
-
-  @Override
-  public final String toString() {
-    return String.format(
-        Locale.ROOT,
-        "<ByteString@%s size=%d contents=\"%s\">",
-        toHexString(identityHashCode(this)),
-        size(),
-        truncateAndEscapeForDisplay());
-  }
-
-  private String truncateAndEscapeForDisplay() {
-    final int limit = 50;
-
-    return size() <= limit ? escapeBytes(this) : escapeBytes(substring(0, limit - 3)) + "...";
-  }
-
-  /**
-   * This class implements a {@link com.google.protobuf.ByteString} backed by a single array of
-   * bytes, contiguous in memory. It supports substring by pointing to only a sub-range of the
-   * underlying byte array, meaning that a substring will reference the full byte-array of the
-   * string it's made from, exactly as with {@link String}.
-   *
-   * @author carlanton@google.com (Carl Haverl)
-   */
-  // Keep this class private to avoid deadlocks in classloading across threads as ByteString's
-  // static initializer loads LiteralByteString and another thread loads LiteralByteString.
-  private static class LiteralByteString extends ByteString.LeafByteString {
-    private static final long serialVersionUID = 1L;
-
-    protected final byte[] bytes;
-
-    /**
-     * Creates a {@code LiteralByteString} backed by the given array, without copying.
-     *
-     * @param bytes array to wrap
-     */
-    LiteralByteString(byte[] bytes) {
-      if (bytes == null) {
-        throw new NullPointerException();
-      }
-      this.bytes = bytes;
-    }
-
-    @Override
-    public byte byteAt(int index) {
-      // Unlike most methods in this class, this one is a direct implementation
-      // ignoring the potential offset because we need to do range-checking in the
-      // substring case anyway.
-      return bytes[index];
-    }
-
-    @Override
-    byte internalByteAt(int index) {
-      return bytes[index];
-    }
-
-    @Override
-    public int size() {
-      return bytes.length;
-    }
-
-    // =================================================================
-    // ByteString -> substring
-
-    @Override
-    public final ByteString substring(int beginIndex, int endIndex) {
-      final int length = checkRange(beginIndex, endIndex, size());
-
-      if (length == 0) {
-        return ByteString.EMPTY;
-      }
-
-      return new BoundedByteString(bytes, getOffsetIntoBytes() + beginIndex, length);
-    }
-
-    // =================================================================
-    // ByteString -> byte[]
-
-    @Override
-    protected void copyToInternal(
-        byte[] target, int sourceOffset, int targetOffset, int numberToCopy) {
-      // Optimized form, not for subclasses, since we don't call
-      // getOffsetIntoBytes() or check the 'numberToCopy' parameter.
-      // TODO(nathanmittler): Is not calling getOffsetIntoBytes really saving that much?
-      System.arraycopy(bytes, sourceOffset, target, targetOffset, numberToCopy);
-    }
-
-    @Override
-    public final void copyTo(ByteBuffer target) {
-      target.put(bytes, getOffsetIntoBytes(), size()); // Copies bytes
-    }
-
-    @Override
-    public final ByteBuffer asReadOnlyByteBuffer() {
-      return ByteBuffer.wrap(bytes, getOffsetIntoBytes(), size()).asReadOnlyBuffer();
-    }
-
-    @Override
-    public final List<ByteBuffer> asReadOnlyByteBufferList() {
-      return Collections.singletonList(asReadOnlyByteBuffer());
-    }
-
-    @Override
-    public final void writeTo(OutputStream outputStream) throws IOException {
-      outputStream.write(toByteArray());
-    }
-
-    @Override
-    final void writeToInternal(OutputStream outputStream, int sourceOffset, int numberToWrite)
-        throws IOException {
-      outputStream.write(bytes, getOffsetIntoBytes() + sourceOffset, numberToWrite);
-    }
-
-    @Override
-    final void writeTo(ByteOutput output) throws IOException {
-      output.writeLazy(bytes, getOffsetIntoBytes(), size());
-    }
-
-    @Override
-    protected final String toStringInternal(Charset charset) {
-      return new String(bytes, getOffsetIntoBytes(), size(), charset);
-    }
-
-    // =================================================================
-    // UTF-8 decoding
-
-    @Override
-    public final boolean isValidUtf8() {
-      int offset = getOffsetIntoBytes();
-      return Utf8.isValidUtf8(bytes, offset, offset + size());
-    }
-
-    @Override
-    protected final int partialIsValidUtf8(int state, int offset, int length) {
-      int index = getOffsetIntoBytes() + offset;
-      return Utf8.partialIsValidUtf8(state, bytes, index, index + length);
-    }
-
-    // =================================================================
-    // equals() and hashCode()
-
-    @Override
-    public final boolean equals(Object other) {
-      if (other == this) {
-        return true;
-      }
-      if (!(other instanceof ByteString)) {
-        return false;
-      }
-
-      if (size() != ((ByteString) other).size()) {
-        return false;
-      }
-      if (size() == 0) {
-        return true;
-      }
-
-      if (other instanceof LiteralByteString) {
-        LiteralByteString otherAsLiteral = (LiteralByteString) other;
-        // If we know the hash codes and they are not equal, we know the byte
-        // strings are not equal.
-        int thisHash = peekCachedHashCode();
-        int thatHash = otherAsLiteral.peekCachedHashCode();
-        if (thisHash != 0 && thatHash != 0 && thisHash != thatHash) {
-          return false;
-        }
-
-        return equalsRange((LiteralByteString) other, 0, size());
-      } else {
-        // RopeByteString and NioByteString.
-        return other.equals(this);
-      }
-    }
-
-    /**
-     * Check equality of the substring of given length of this object starting at zero with another
-     * {@code LiteralByteString} substring starting at offset.
-     *
-     * @param other what to compare a substring in
-     * @param offset offset into other
-     * @param length number of bytes to compare
-     * @return true for equality of substrings, else false.
-     */
-    @Override
-    final boolean equalsRange(ByteString other, int offset, int length) {
-      if (length > other.size()) {
-        throw new IllegalArgumentException("Length too large: " + length + size());
-      }
-      if (offset + length > other.size()) {
-        throw new IllegalArgumentException(
-            "Ran off end of other: " + offset + ", " + length + ", " + other.size());
-      }
-
-      if (other instanceof LiteralByteString) {
-        LiteralByteString lbsOther = (LiteralByteString) other;
-        byte[] thisBytes = bytes;
-        byte[] otherBytes = lbsOther.bytes;
-        int thisLimit = getOffsetIntoBytes() + length;
-        for (int thisIndex = getOffsetIntoBytes(),
-                otherIndex = lbsOther.getOffsetIntoBytes() + offset;
-            (thisIndex < thisLimit);
-            ++thisIndex, ++otherIndex) {
-          if (thisBytes[thisIndex] != otherBytes[otherIndex]) {
-            return false;
-          }
-        }
-        return true;
-      }
-
-      return other.substring(offset, offset + length).equals(substring(0, length));
-    }
-
-    @Override
-    protected final int partialHash(int h, int offset, int length) {
-      return Internal.partialHash(h, bytes, getOffsetIntoBytes() + offset, length);
-    }
-
-    // =================================================================
-    // Input stream
-
-    @Override
-    public final InputStream newInput() {
-      return new ByteArrayInputStream(bytes, getOffsetIntoBytes(), size()); // No copy
-    }
-
-    @Override
-    public final CodedInputStream newCodedInput() {
-      // We trust CodedInputStream not to modify the bytes, or to give anyone
-      // else access to them.
-      return CodedInputStream.newInstance(
-          bytes, getOffsetIntoBytes(), size(), /* bufferIsImmutable= */ true);
-    }
-
-    // =================================================================
-    // Internal methods
-
-    /**
-     * Offset into {@code bytes[]} to use, non-zero for substrings.
-     *
-     * @return always 0 for this class
-     */
-    protected int getOffsetIntoBytes() {
-      return 0;
-    }
-  }
-
-  /**
-   * This class is used to represent the substring of a {@link ByteString} over a single byte array.
-   * In terms of the public API of {@link ByteString}, you end up here by calling {@link
-   * ByteString#copyFrom(byte[])} followed by {@link ByteString#substring(int, int)}.
-   *
-   * <p>This class contains most of the overhead involved in creating a substring from a {@link
-   * LiteralByteString}. The overhead involves some range-checking and two extra fields.
-   *
-   * @author carlanton@google.com (Carl Haverl)
-   */
-  // Keep this class private to avoid deadlocks in classloading across threads as ByteString's
-  // static initializer loads LiteralByteString and another thread loads BoundedByteString.
-  private static final class BoundedByteString extends LiteralByteString {
-
-    private final int bytesOffset;
-    private final int bytesLength;
-
-    /**
-     * Creates a {@code BoundedByteString} backed by the sub-range of given array, without copying.
-     *
-     * @param bytes array to wrap
-     * @param offset index to first byte to use in bytes
-     * @param length number of bytes to use from bytes
-     * @throws IllegalArgumentException if {@code offset < 0}, {@code length < 0}, or if {@code
-     *     offset + length > bytes.length}.
-     */
-    BoundedByteString(byte[] bytes, int offset, int length) {
-      super(bytes);
-      checkRange(offset, offset + length, bytes.length);
-
-      this.bytesOffset = offset;
-      this.bytesLength = length;
-    }
-
-    /**
-     * Gets the byte at the given index. Throws {@link ArrayIndexOutOfBoundsException} for
-     * backwards-compatibility reasons although it would more properly be {@link
-     * IndexOutOfBoundsException}.
-     *
-     * @param index index of byte
-     * @return the value
-     * @throws ArrayIndexOutOfBoundsException {@code index} is < 0 or >= size
-     */
-    @Override
-    public byte byteAt(int index) {
-      // We must check the index ourselves as we cannot rely on Java array index
-      // checking for substrings.
-      checkIndex(index, size());
-      return bytes[bytesOffset + index];
-    }
-
-    @Override
-    byte internalByteAt(int index) {
-      return bytes[bytesOffset + index];
-    }
-
-    @Override
-    public int size() {
-      return bytesLength;
-    }
-
-    @Override
-    protected int getOffsetIntoBytes() {
-      return bytesOffset;
-    }
-
-    // =================================================================
-    // ByteString -> byte[]
-
-    @Override
-    protected void copyToInternal(
-        byte[] target, int sourceOffset, int targetOffset, int numberToCopy) {
-      System.arraycopy(
-          bytes, getOffsetIntoBytes() + sourceOffset, target, targetOffset, numberToCopy);
-    }
-
-    // =================================================================
-    // Serializable
-
-    private static final long serialVersionUID = 1L;
-
-    Object writeReplace() {
-      return ByteString.wrap(toByteArray());
-    }
-
-    private void readObject(@SuppressWarnings("unused") ObjectInputStream in) throws IOException {
-      throw new InvalidObjectException(
-          "BoundedByteStream instances are not to be serialized directly");
-    }
-  }
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/CanIgnoreReturnValue.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/CanIgnoreReturnValue.java
deleted file mode 100644
index 9e84432..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/CanIgnoreReturnValue.java
+++ /dev/null
@@ -1,50 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.CLASS;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-/**
- * Indicates that the return value of the annotated method can be safely ignored.
- *
- * <p>This is the opposite of {@link CheckReturnValue}. It can be used inside classes or packages
- * annotated with {@code @CheckReturnValue} to exempt specific methods from the default.
- */
-@Documented
-@Target({METHOD, TYPE})
-@Retention(CLASS)
-@interface CanIgnoreReturnValue {}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/CheckReturnValue.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/CheckReturnValue.java
deleted file mode 100644
index 38c83d8..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/CheckReturnValue.java
+++ /dev/null
@@ -1,55 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static java.lang.annotation.ElementType.CONSTRUCTOR;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.PACKAGE;
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-/**
- * Indicates that the return value of the annotated method must be checked. An error is triggered
- * when one of these methods is called but the result is not used.
- *
- * <p>{@code @CheckReturnValue} may be applied to a class or package to indicate that all methods in
- * that class or package must have their return values checked. For convenience, we provide an
- * annotation, {@link CanIgnoreReturnValue}, to exempt specific methods or classes from this
- * behavior.
- */
-@Documented
-@Target({METHOD, CONSTRUCTOR, TYPE, PACKAGE})
-@Retention(RUNTIME)
-@interface CheckReturnValue {}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/CodedInputStream.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/CodedInputStream.java
deleted file mode 100644
index b3074b5..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/CodedInputStream.java
+++ /dev/null
@@ -1,3982 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.protobuf.Internal.EMPTY_BYTE_ARRAY;
-import static com.google.protobuf.Internal.EMPTY_BYTE_BUFFER;
-import static com.google.protobuf.Internal.UTF_8;
-import static com.google.protobuf.Internal.checkNotNull;
-import static com.google.protobuf.WireFormat.FIXED32_SIZE;
-import static com.google.protobuf.WireFormat.FIXED64_SIZE;
-import static com.google.protobuf.WireFormat.MAX_VARINT_SIZE;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.Buffer;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-
-/**
- * Reads and decodes protocol message fields.
- *
- * <p>This class contains two kinds of methods: methods that read specific protocol message
- * constructs and field types (e.g. {@link #readTag()} and {@link #readInt32()}) and methods that
- * read low-level values (e.g. {@link #readRawVarint32()} and {@link #readRawBytes}). If you are
- * reading encoded protocol messages, you should use the former methods, but if you are reading some
- * other format of your own design, use the latter.
- *
- * @author kenton@google.com Kenton Varda
- */
-public abstract class CodedInputStream {
-  private static final int DEFAULT_BUFFER_SIZE = 4096;
-  // Integer.MAX_VALUE == 0x7FFFFFF == INT_MAX from limits.h
-  private static final int DEFAULT_SIZE_LIMIT = Integer.MAX_VALUE;
-  private static volatile int defaultRecursionLimit = 100;
-
-  /** Visible for subclasses. See setRecursionLimit() */
-  int recursionDepth;
-
-  int recursionLimit = defaultRecursionLimit;
-
-  /** Visible for subclasses. See setSizeLimit() */
-  int sizeLimit = DEFAULT_SIZE_LIMIT;
-
-  /** Used to adapt to the experimental {@link Reader} interface. */
-  CodedInputStreamReader wrapper;
-
-  /** Create a new CodedInputStream wrapping the given InputStream. */
-  public static CodedInputStream newInstance(final InputStream input) {
-    return newInstance(input, DEFAULT_BUFFER_SIZE);
-  }
-
-  /** Create a new CodedInputStream wrapping the given InputStream, with a specified buffer size. */
-  public static CodedInputStream newInstance(final InputStream input, int bufferSize) {
-    if (bufferSize <= 0) {
-      throw new IllegalArgumentException("bufferSize must be > 0");
-    }
-    if (input == null) {
-      // Ideally we would throw here. This is done for backward compatibility.
-      return newInstance(EMPTY_BYTE_ARRAY);
-    }
-    return new StreamDecoder(input, bufferSize);
-  }
-
-  /** Create a new CodedInputStream wrapping the given {@code Iterable <ByteBuffer>}. */
-  public static CodedInputStream newInstance(final Iterable<ByteBuffer> input) {
-    if (!UnsafeDirectNioDecoder.isSupported()) {
-      return newInstance(new IterableByteBufferInputStream(input));
-    }
-    return newInstance(input, false);
-  }
-
-  /** Create a new CodedInputStream wrapping the given {@code Iterable <ByteBuffer>}. */
-  static CodedInputStream newInstance(
-      final Iterable<ByteBuffer> bufs, final boolean bufferIsImmutable) {
-    // flag is to check the type of input's ByteBuffers.
-    // flag equals 1: all ByteBuffers have array.
-    // flag equals 2: all ByteBuffers are direct ByteBuffers.
-    // flag equals 3: some ByteBuffers are direct and some have array.
-    // flag greater than 3: other cases.
-    int flag = 0;
-    // Total size of the input
-    int totalSize = 0;
-    for (ByteBuffer buf : bufs) {
-      totalSize += buf.remaining();
-      if (buf.hasArray()) {
-        flag |= 1;
-      } else if (buf.isDirect()) {
-        flag |= 2;
-      } else {
-        flag |= 4;
-      }
-    }
-    if (flag == 2) {
-      return new IterableDirectByteBufferDecoder(bufs, totalSize, bufferIsImmutable);
-    } else {
-      // TODO(yilunchong): add another decoders to deal case 1 and 3.
-      return newInstance(new IterableByteBufferInputStream(bufs));
-    }
-  }
-
-  /** Create a new CodedInputStream wrapping the given byte array. */
-  public static CodedInputStream newInstance(final byte[] buf) {
-    return newInstance(buf, 0, buf.length);
-  }
-
-  /** Create a new CodedInputStream wrapping the given byte array slice. */
-  public static CodedInputStream newInstance(final byte[] buf, final int off, final int len) {
-    return newInstance(buf, off, len, /* bufferIsImmutable= */ false);
-  }
-
-  /** Create a new CodedInputStream wrapping the given byte array slice. */
-  static CodedInputStream newInstance(
-      final byte[] buf, final int off, final int len, final boolean bufferIsImmutable) {
-    ArrayDecoder result = new ArrayDecoder(buf, off, len, bufferIsImmutable);
-    try {
-      // Some uses of CodedInputStream can be more efficient if they know
-      // exactly how many bytes are available.  By pushing the end point of the
-      // buffer as a limit, we allow them to get this information via
-      // getBytesUntilLimit().  Pushing a limit that we know is at the end of
-      // the stream can never hurt, since we can never past that point anyway.
-      result.pushLimit(len);
-    } catch (InvalidProtocolBufferException ex) {
-      // The only reason pushLimit() might throw an exception here is if len
-      // is negative. Normally pushLimit()'s parameter comes directly off the
-      // wire, so it's important to catch exceptions in case of corrupt or
-      // malicious data. However, in this case, we expect that len is not a
-      // user-supplied value, so we can assume that it being negative indicates
-      // a programming error. Therefore, throwing an unchecked exception is
-      // appropriate.
-      throw new IllegalArgumentException(ex);
-    }
-    return result;
-  }
-
-  /**
-   * Create a new CodedInputStream wrapping the given ByteBuffer. The data starting from the
-   * ByteBuffer's current position to its limit will be read. The returned CodedInputStream may or
-   * may not share the underlying data in the ByteBuffer, therefore the ByteBuffer cannot be changed
-   * while the CodedInputStream is in use. Note that the ByteBuffer's position won't be changed by
-   * this function. Concurrent calls with the same ByteBuffer object are safe if no other thread is
-   * trying to alter the ByteBuffer's status.
-   */
-  public static CodedInputStream newInstance(ByteBuffer buf) {
-    return newInstance(buf, /* bufferIsImmutable= */ false);
-  }
-
-  /** Create a new CodedInputStream wrapping the given buffer. */
-  static CodedInputStream newInstance(ByteBuffer buf, boolean bufferIsImmutable) {
-    if (buf.hasArray()) {
-      return newInstance(
-          buf.array(), buf.arrayOffset() + buf.position(), buf.remaining(), bufferIsImmutable);
-    }
-
-    if (buf.isDirect() && UnsafeDirectNioDecoder.isSupported()) {
-      return new UnsafeDirectNioDecoder(buf, bufferIsImmutable);
-    }
-
-    // The buffer is non-direct and does not expose the underlying array. Using the ByteBuffer API
-    // to access individual bytes is very slow, so just copy the buffer to an array.
-    // TODO(nathanmittler): Re-evaluate with Java 9
-    byte[] buffer = new byte[buf.remaining()];
-    buf.duplicate().get(buffer);
-    return newInstance(buffer, 0, buffer.length, true);
-  }
-
-  public void checkRecursionLimit() throws InvalidProtocolBufferException {
-    if (recursionDepth >= recursionLimit) {
-      throw InvalidProtocolBufferException.recursionLimitExceeded();
-    }
-  }
-  /** Disable construction/inheritance outside of this class. */
-  private CodedInputStream() {}
-
-  // -----------------------------------------------------------------
-
-  /**
-   * Attempt to read a field tag, returning zero if we have reached EOF. Protocol message parsers
-   * use this to read tags, since a protocol message may legally end wherever a tag occurs, and zero
-   * is not a valid tag number.
-   */
-  public abstract int readTag() throws IOException;
-
-  /**
-   * Verifies that the last call to readTag() returned the given tag value. This is used to verify
-   * that a nested group ended with the correct end tag.
-   *
-   * @throws InvalidProtocolBufferException {@code value} does not match the last tag.
-   */
-  public abstract void checkLastTagWas(final int value) throws InvalidProtocolBufferException;
-
-  public abstract int getLastTag();
-
-  /**
-   * Reads and discards a single field, given its tag value.
-   *
-   * @return {@code false} if the tag is an endgroup tag, in which case nothing is skipped.
-   *     Otherwise, returns {@code true}.
-   */
-  public abstract boolean skipField(final int tag) throws IOException;
-
-  /**
-   * Reads a single field and writes it to output in wire format, given its tag value.
-   *
-   * @return {@code false} if the tag is an endgroup tag, in which case nothing is skipped.
-   *     Otherwise, returns {@code true}.
-   * @deprecated use {@code UnknownFieldSet} or {@code UnknownFieldSetLite} to skip to an output
-   *     stream.
-   */
-  @Deprecated
-  public abstract boolean skipField(final int tag, final CodedOutputStream output)
-      throws IOException;
-
-  /**
-   * Reads and discards an entire message. This will read either until EOF or until an endgroup tag,
-   * whichever comes first.
-   */
-  public abstract void skipMessage() throws IOException;
-
-  /**
-   * Reads an entire message and writes it to output in wire format. This will read either until EOF
-   * or until an endgroup tag, whichever comes first.
-   */
-  public abstract void skipMessage(CodedOutputStream output) throws IOException;
-
-
-  // -----------------------------------------------------------------
-
-  /** Read a {@code double} field value from the stream. */
-  public abstract double readDouble() throws IOException;
-
-  /** Read a {@code float} field value from the stream. */
-  public abstract float readFloat() throws IOException;
-
-  /** Read a {@code uint64} field value from the stream. */
-  public abstract long readUInt64() throws IOException;
-
-  /** Read an {@code int64} field value from the stream. */
-  public abstract long readInt64() throws IOException;
-
-  /** Read an {@code int32} field value from the stream. */
-  public abstract int readInt32() throws IOException;
-
-  /** Read a {@code fixed64} field value from the stream. */
-  public abstract long readFixed64() throws IOException;
-
-  /** Read a {@code fixed32} field value from the stream. */
-  public abstract int readFixed32() throws IOException;
-
-  /** Read a {@code bool} field value from the stream. */
-  public abstract boolean readBool() throws IOException;
-
-  /**
-   * Read a {@code string} field value from the stream. If the stream contains malformed UTF-8,
-   * replace the offending bytes with the standard UTF-8 replacement character.
-   */
-  public abstract String readString() throws IOException;
-
-  /**
-   * Read a {@code string} field value from the stream. If the stream contains malformed UTF-8,
-   * throw exception {@link InvalidProtocolBufferException}.
-   */
-  public abstract String readStringRequireUtf8() throws IOException;
-
-  /** Read a {@code group} field value from the stream. */
-  public abstract void readGroup(
-      final int fieldNumber,
-      final MessageLite.Builder builder,
-      final ExtensionRegistryLite extensionRegistry)
-      throws IOException;
-
-
-  /** Read a {@code group} field value from the stream. */
-  public abstract <T extends MessageLite> T readGroup(
-      final int fieldNumber, final Parser<T> parser, final ExtensionRegistryLite extensionRegistry)
-      throws IOException;
-
-  /**
-   * Reads a {@code group} field value from the stream and merges it into the given {@link
-   * UnknownFieldSet}.
-   *
-   * @deprecated UnknownFieldSet.Builder now implements MessageLite.Builder, so you can just call
-   *     {@link #readGroup}.
-   */
-  @Deprecated
-  public abstract void readUnknownGroup(final int fieldNumber, final MessageLite.Builder builder)
-      throws IOException;
-
-  /** Read an embedded message field value from the stream. */
-  public abstract void readMessage(
-      final MessageLite.Builder builder, final ExtensionRegistryLite extensionRegistry)
-      throws IOException;
-
-
-  /** Read an embedded message field value from the stream. */
-  public abstract <T extends MessageLite> T readMessage(
-      final Parser<T> parser, final ExtensionRegistryLite extensionRegistry) throws IOException;
-
-  /** Read a {@code bytes} field value from the stream. */
-  public abstract ByteString readBytes() throws IOException;
-
-  /** Read a {@code bytes} field value from the stream. */
-  public abstract byte[] readByteArray() throws IOException;
-
-  /** Read a {@code bytes} field value from the stream. */
-  public abstract ByteBuffer readByteBuffer() throws IOException;
-
-  /** Read a {@code uint32} field value from the stream. */
-  public abstract int readUInt32() throws IOException;
-
-  /**
-   * Read an enum field value from the stream. Caller is responsible for converting the numeric
-   * value to an actual enum.
-   */
-  public abstract int readEnum() throws IOException;
-
-  /** Read an {@code sfixed32} field value from the stream. */
-  public abstract int readSFixed32() throws IOException;
-
-  /** Read an {@code sfixed64} field value from the stream. */
-  public abstract long readSFixed64() throws IOException;
-
-  /** Read an {@code sint32} field value from the stream. */
-  public abstract int readSInt32() throws IOException;
-
-  /** Read an {@code sint64} field value from the stream. */
-  public abstract long readSInt64() throws IOException;
-
-  // =================================================================
-
-  /** Read a raw Varint from the stream. If larger than 32 bits, discard the upper bits. */
-  public abstract int readRawVarint32() throws IOException;
-
-  /** Read a raw Varint from the stream. */
-  public abstract long readRawVarint64() throws IOException;
-
-  /** Variant of readRawVarint64 for when uncomfortably close to the limit. */
-  /* Visible for testing */
-  abstract long readRawVarint64SlowPath() throws IOException;
-
-  /** Read a 32-bit little-endian integer from the stream. */
-  public abstract int readRawLittleEndian32() throws IOException;
-
-  /** Read a 64-bit little-endian integer from the stream. */
-  public abstract long readRawLittleEndian64() throws IOException;
-
-  // -----------------------------------------------------------------
-
-  /**
-   * Enables {@link ByteString} aliasing of the underlying buffer, trading off on buffer pinning for
-   * data copies. Only valid for buffer-backed streams.
-   */
-  public abstract void enableAliasing(boolean enabled);
-
-  /**
-   * Set the maximum message recursion depth. In order to prevent malicious messages from causing
-   * stack overflows, {@code CodedInputStream} limits how deeply messages may be nested. The default
-   * limit is 100.
-   *
-   * @return the old limit.
-   */
-  public final int setRecursionLimit(final int limit) {
-    if (limit < 0) {
-      throw new IllegalArgumentException("Recursion limit cannot be negative: " + limit);
-    }
-    final int oldLimit = recursionLimit;
-    recursionLimit = limit;
-    return oldLimit;
-  }
-
-  /**
-   * Only valid for {@link InputStream}-backed streams.
-   *
-   * <p>Set the maximum message size. In order to prevent malicious messages from exhausting memory
-   * or causing integer overflows, {@code CodedInputStream} limits how large a message may be. The
-   * default limit is {@code Integer.MAX_VALUE}. You should set this limit as small as you can
-   * without harming your app's functionality. Note that size limits only apply when reading from an
-   * {@code InputStream}, not when constructed around a raw byte array.
-   *
-   * <p>If you want to read several messages from a single CodedInputStream, you could call {@link
-   * #resetSizeCounter()} after each one to avoid hitting the size limit.
-   *
-   * @return the old limit.
-   */
-  public final int setSizeLimit(final int limit) {
-    if (limit < 0) {
-      throw new IllegalArgumentException("Size limit cannot be negative: " + limit);
-    }
-    final int oldLimit = sizeLimit;
-    sizeLimit = limit;
-    return oldLimit;
-  }
-
-  private boolean shouldDiscardUnknownFields = false;
-
-  /**
-   * Sets this {@code CodedInputStream} to discard unknown fields. Only applies to full runtime
-   * messages; lite messages will always preserve unknowns.
-   *
-   * <p>Note calling this function alone will have NO immediate effect on the underlying input data.
-   * The unknown fields will be discarded during parsing. This affects both Proto2 and Proto3 full
-   * runtime.
-   */
-  final void discardUnknownFields() {
-    shouldDiscardUnknownFields = true;
-  }
-
-  /**
-   * Reverts the unknown fields preservation behavior for Proto2 and Proto3 full runtime to their
-   * default.
-   */
-  final void unsetDiscardUnknownFields() {
-    shouldDiscardUnknownFields = false;
-  }
-
-  /**
-   * Whether unknown fields in this input stream should be discarded during parsing into full
-   * runtime messages.
-   */
-  final boolean shouldDiscardUnknownFields() {
-    return shouldDiscardUnknownFields;
-  }
-
-  /**
-   * Resets the current size counter to zero (see {@link #setSizeLimit(int)}). Only valid for {@link
-   * InputStream}-backed streams.
-   */
-  public abstract void resetSizeCounter();
-
-  /**
-   * Sets {@code currentLimit} to (current position) + {@code byteLimit}. This is called when
-   * descending into a length-delimited embedded message.
-   *
-   * <p>Note that {@code pushLimit()} does NOT affect how many bytes the {@code CodedInputStream}
-   * reads from an underlying {@code InputStream} when refreshing its buffer. If you need to prevent
-   * reading past a certain point in the underlying {@code InputStream} (e.g. because you expect it
-   * to contain more data after the end of the message which you need to handle differently) then
-   * you must place a wrapper around your {@code InputStream} which limits the amount of data that
-   * can be read from it.
-   *
-   * @return the old limit.
-   */
-  public abstract int pushLimit(int byteLimit) throws InvalidProtocolBufferException;
-
-  /**
-   * Discards the current limit, returning to the previous limit.
-   *
-   * @param oldLimit The old limit, as returned by {@code pushLimit}.
-   */
-  public abstract void popLimit(final int oldLimit);
-
-  /**
-   * Returns the number of bytes to be read before the current limit. If no limit is set, returns
-   * -1.
-   */
-  public abstract int getBytesUntilLimit();
-
-  /**
-   * Returns true if the stream has reached the end of the input. This is the case if either the end
-   * of the underlying input source has been reached or if the stream has reached a limit created
-   * using {@link #pushLimit(int)}. This function may get blocked when using StreamDecoder as it
-   * invokes {@link StreamDecoder#tryRefillBuffer(int)} in this function which will try to read
-   * bytes from input.
-   */
-  public abstract boolean isAtEnd() throws IOException;
-
-  /**
-   * The total bytes read up to the current position. Calling {@link #resetSizeCounter()} resets
-   * this value to zero.
-   */
-  public abstract int getTotalBytesRead();
-
-  /**
-   * Read one byte from the input.
-   *
-   * @throws InvalidProtocolBufferException The end of the stream or the current limit was reached.
-   */
-  public abstract byte readRawByte() throws IOException;
-
-  /**
-   * Read a fixed size of bytes from the input.
-   *
-   * @throws InvalidProtocolBufferException The end of the stream or the current limit was reached.
-   */
-  public abstract byte[] readRawBytes(final int size) throws IOException;
-
-  /**
-   * Reads and discards {@code size} bytes.
-   *
-   * @throws InvalidProtocolBufferException The end of the stream or the current limit was reached.
-   */
-  public abstract void skipRawBytes(final int size) throws IOException;
-
-  /**
-   * Decode a ZigZag-encoded 32-bit value. ZigZag encodes signed integers into values that can be
-   * efficiently encoded with varint. (Otherwise, negative values must be sign-extended to 64 bits
-   * to be varint encoded, thus always taking 10 bytes on the wire.)
-   *
-   * @param n An unsigned 32-bit integer, stored in a signed int because Java has no explicit
-   *     unsigned support.
-   * @return A signed 32-bit integer.
-   */
-  public static int decodeZigZag32(final int n) {
-    return (n >>> 1) ^ -(n & 1);
-  }
-
-  /**
-   * Decode a ZigZag-encoded 64-bit value. ZigZag encodes signed integers into values that can be
-   * efficiently encoded with varint. (Otherwise, negative values must be sign-extended to 64 bits
-   * to be varint encoded, thus always taking 10 bytes on the wire.)
-   *
-   * @param n An unsigned 64-bit integer, stored in a signed int because Java has no explicit
-   *     unsigned support.
-   * @return A signed 64-bit integer.
-   */
-  public static long decodeZigZag64(final long n) {
-    return (n >>> 1) ^ -(n & 1);
-  }
-
-  /**
-   * Like {@link #readRawVarint32(InputStream)}, but expects that the caller has already read one
-   * byte. This allows the caller to determine if EOF has been reached before attempting to read.
-   */
-  public static int readRawVarint32(final int firstByte, final InputStream input)
-      throws IOException {
-    if ((firstByte & 0x80) == 0) {
-      return firstByte;
-    }
-
-    int result = firstByte & 0x7f;
-    int offset = 7;
-    for (; offset < 32; offset += 7) {
-      final int b = input.read();
-      if (b == -1) {
-        throw InvalidProtocolBufferException.truncatedMessage();
-      }
-      result |= (b & 0x7f) << offset;
-      if ((b & 0x80) == 0) {
-        return result;
-      }
-    }
-    // Keep reading up to 64 bits.
-    for (; offset < 64; offset += 7) {
-      final int b = input.read();
-      if (b == -1) {
-        throw InvalidProtocolBufferException.truncatedMessage();
-      }
-      if ((b & 0x80) == 0) {
-        return result;
-      }
-    }
-    throw InvalidProtocolBufferException.malformedVarint();
-  }
-
-  /**
-   * Reads a varint from the input one byte at a time, so that it does not read any bytes after the
-   * end of the varint. If you simply wrapped the stream in a CodedInputStream and used {@link
-   * #readRawVarint32(InputStream)} then you would probably end up reading past the end of the
-   * varint since CodedInputStream buffers its input.
-   */
-  static int readRawVarint32(final InputStream input) throws IOException {
-    final int firstByte = input.read();
-    if (firstByte == -1) {
-      throw InvalidProtocolBufferException.truncatedMessage();
-    }
-    return readRawVarint32(firstByte, input);
-  }
-
-  /** A {@link CodedInputStream} implementation that uses a backing array as the input. */
-  private static final class ArrayDecoder extends CodedInputStream {
-    private final byte[] buffer;
-    private final boolean immutable;
-    private int limit;
-    private int bufferSizeAfterLimit;
-    private int pos;
-    private int startPos;
-    private int lastTag;
-    private boolean enableAliasing;
-
-    /** The absolute position of the end of the current message. */
-    private int currentLimit = Integer.MAX_VALUE;
-
-    private ArrayDecoder(final byte[] buffer, final int offset, final int len, boolean immutable) {
-      this.buffer = buffer;
-      limit = offset + len;
-      pos = offset;
-      startPos = pos;
-      this.immutable = immutable;
-    }
-
-    @Override
-    public int readTag() throws IOException {
-      if (isAtEnd()) {
-        lastTag = 0;
-        return 0;
-      }
-
-      lastTag = readRawVarint32();
-      if (WireFormat.getTagFieldNumber(lastTag) == 0) {
-        // If we actually read zero (or any tag number corresponding to field
-        // number zero), that's not a valid tag.
-        throw InvalidProtocolBufferException.invalidTag();
-      }
-      return lastTag;
-    }
-
-    @Override
-    public void checkLastTagWas(final int value) throws InvalidProtocolBufferException {
-      if (lastTag != value) {
-        throw InvalidProtocolBufferException.invalidEndTag();
-      }
-    }
-
-    @Override
-    public int getLastTag() {
-      return lastTag;
-    }
-
-    @Override
-    public boolean skipField(final int tag) throws IOException {
-      switch (WireFormat.getTagWireType(tag)) {
-        case WireFormat.WIRETYPE_VARINT:
-          skipRawVarint();
-          return true;
-        case WireFormat.WIRETYPE_FIXED64:
-          skipRawBytes(FIXED64_SIZE);
-          return true;
-        case WireFormat.WIRETYPE_LENGTH_DELIMITED:
-          skipRawBytes(readRawVarint32());
-          return true;
-        case WireFormat.WIRETYPE_START_GROUP:
-          skipMessage();
-          checkLastTagWas(
-              WireFormat.makeTag(WireFormat.getTagFieldNumber(tag), WireFormat.WIRETYPE_END_GROUP));
-          return true;
-        case WireFormat.WIRETYPE_END_GROUP:
-          return false;
-        case WireFormat.WIRETYPE_FIXED32:
-          skipRawBytes(FIXED32_SIZE);
-          return true;
-        default:
-          throw InvalidProtocolBufferException.invalidWireType();
-      }
-    }
-
-    @Override
-    public boolean skipField(final int tag, final CodedOutputStream output) throws IOException {
-      switch (WireFormat.getTagWireType(tag)) {
-        case WireFormat.WIRETYPE_VARINT:
-          {
-            long value = readInt64();
-            output.writeUInt32NoTag(tag);
-            output.writeUInt64NoTag(value);
-            return true;
-          }
-        case WireFormat.WIRETYPE_FIXED64:
-          {
-            long value = readRawLittleEndian64();
-            output.writeUInt32NoTag(tag);
-            output.writeFixed64NoTag(value);
-            return true;
-          }
-        case WireFormat.WIRETYPE_LENGTH_DELIMITED:
-          {
-            ByteString value = readBytes();
-            output.writeUInt32NoTag(tag);
-            output.writeBytesNoTag(value);
-            return true;
-          }
-        case WireFormat.WIRETYPE_START_GROUP:
-          {
-            output.writeUInt32NoTag(tag);
-            skipMessage(output);
-            int endtag =
-                WireFormat.makeTag(
-                    WireFormat.getTagFieldNumber(tag), WireFormat.WIRETYPE_END_GROUP);
-            checkLastTagWas(endtag);
-            output.writeUInt32NoTag(endtag);
-            return true;
-          }
-        case WireFormat.WIRETYPE_END_GROUP:
-          {
-            return false;
-          }
-        case WireFormat.WIRETYPE_FIXED32:
-          {
-            int value = readRawLittleEndian32();
-            output.writeUInt32NoTag(tag);
-            output.writeFixed32NoTag(value);
-            return true;
-          }
-        default:
-          throw InvalidProtocolBufferException.invalidWireType();
-      }
-    }
-
-    @Override
-    public void skipMessage() throws IOException {
-      while (true) {
-        final int tag = readTag();
-        if (tag == 0 || !skipField(tag)) {
-          return;
-        }
-      }
-    }
-
-    @Override
-    public void skipMessage(CodedOutputStream output) throws IOException {
-      while (true) {
-        final int tag = readTag();
-        if (tag == 0 || !skipField(tag, output)) {
-          return;
-        }
-      }
-    }
-
-
-    // -----------------------------------------------------------------
-
-    @Override
-    public double readDouble() throws IOException {
-      return Double.longBitsToDouble(readRawLittleEndian64());
-    }
-
-    @Override
-    public float readFloat() throws IOException {
-      return Float.intBitsToFloat(readRawLittleEndian32());
-    }
-
-    @Override
-    public long readUInt64() throws IOException {
-      return readRawVarint64();
-    }
-
-    @Override
-    public long readInt64() throws IOException {
-      return readRawVarint64();
-    }
-
-    @Override
-    public int readInt32() throws IOException {
-      return readRawVarint32();
-    }
-
-    @Override
-    public long readFixed64() throws IOException {
-      return readRawLittleEndian64();
-    }
-
-    @Override
-    public int readFixed32() throws IOException {
-      return readRawLittleEndian32();
-    }
-
-    @Override
-    public boolean readBool() throws IOException {
-      return readRawVarint64() != 0;
-    }
-
-    @Override
-    public String readString() throws IOException {
-      final int size = readRawVarint32();
-      if (size > 0 && size <= (limit - pos)) {
-        // Fast path:  We already have the bytes in a contiguous buffer, so
-        //   just copy directly from it.
-        final String result = new String(buffer, pos, size, UTF_8);
-        pos += size;
-        return result;
-      }
-
-      if (size == 0) {
-        return "";
-      }
-      if (size < 0) {
-        throw InvalidProtocolBufferException.negativeSize();
-      }
-      throw InvalidProtocolBufferException.truncatedMessage();
-    }
-
-    @Override
-    public String readStringRequireUtf8() throws IOException {
-      final int size = readRawVarint32();
-      if (size > 0 && size <= (limit - pos)) {
-        String result = Utf8.decodeUtf8(buffer, pos, size);
-        pos += size;
-        return result;
-      }
-
-      if (size == 0) {
-        return "";
-      }
-      if (size <= 0) {
-        throw InvalidProtocolBufferException.negativeSize();
-      }
-      throw InvalidProtocolBufferException.truncatedMessage();
-    }
-
-    @Override
-    public void readGroup(
-        final int fieldNumber,
-        final MessageLite.Builder builder,
-        final ExtensionRegistryLite extensionRegistry)
-        throws IOException {
-      checkRecursionLimit();
-      ++recursionDepth;
-      builder.mergeFrom(this, extensionRegistry);
-      checkLastTagWas(WireFormat.makeTag(fieldNumber, WireFormat.WIRETYPE_END_GROUP));
-      --recursionDepth;
-    }
-
-
-    @Override
-    public <T extends MessageLite> T readGroup(
-        final int fieldNumber,
-        final Parser<T> parser,
-        final ExtensionRegistryLite extensionRegistry)
-        throws IOException {
-      checkRecursionLimit();
-      ++recursionDepth;
-      T result = parser.parsePartialFrom(this, extensionRegistry);
-      checkLastTagWas(WireFormat.makeTag(fieldNumber, WireFormat.WIRETYPE_END_GROUP));
-      --recursionDepth;
-      return result;
-    }
-
-    @Deprecated
-    @Override
-    public void readUnknownGroup(final int fieldNumber, final MessageLite.Builder builder)
-        throws IOException {
-      readGroup(fieldNumber, builder, ExtensionRegistryLite.getEmptyRegistry());
-    }
-
-    @Override
-    public void readMessage(
-        final MessageLite.Builder builder, final ExtensionRegistryLite extensionRegistry)
-        throws IOException {
-      final int length = readRawVarint32();
-      checkRecursionLimit();
-      final int oldLimit = pushLimit(length);
-      ++recursionDepth;
-      builder.mergeFrom(this, extensionRegistry);
-      checkLastTagWas(0);
-      --recursionDepth;
-      if (getBytesUntilLimit() != 0) {
-        throw InvalidProtocolBufferException.truncatedMessage();
-      }
-      popLimit(oldLimit);
-    }
-
-
-    @Override
-    public <T extends MessageLite> T readMessage(
-        final Parser<T> parser, final ExtensionRegistryLite extensionRegistry) throws IOException {
-      int length = readRawVarint32();
-      checkRecursionLimit();
-      final int oldLimit = pushLimit(length);
-      ++recursionDepth;
-      T result = parser.parsePartialFrom(this, extensionRegistry);
-      checkLastTagWas(0);
-      --recursionDepth;
-      if (getBytesUntilLimit() != 0) {
-        throw InvalidProtocolBufferException.truncatedMessage();
-      }
-      popLimit(oldLimit);
-      return result;
-    }
-
-    @Override
-    public ByteString readBytes() throws IOException {
-      final int size = readRawVarint32();
-      if (size > 0 && size <= (limit - pos)) {
-        // Fast path:  We already have the bytes in a contiguous buffer, so
-        //   just copy directly from it.
-        final ByteString result =
-            immutable && enableAliasing
-                ? ByteString.wrap(buffer, pos, size)
-                : ByteString.copyFrom(buffer, pos, size);
-        pos += size;
-        return result;
-      }
-      if (size == 0) {
-        return ByteString.EMPTY;
-      }
-      // Slow path:  Build a byte array first then copy it.
-      return ByteString.wrap(readRawBytes(size));
-    }
-
-    @Override
-    public byte[] readByteArray() throws IOException {
-      final int size = readRawVarint32();
-      return readRawBytes(size);
-    }
-
-    @Override
-    public ByteBuffer readByteBuffer() throws IOException {
-      final int size = readRawVarint32();
-      if (size > 0 && size <= (limit - pos)) {
-        // Fast path: We already have the bytes in a contiguous buffer.
-        // When aliasing is enabled, we can return a ByteBuffer pointing directly
-        // into the underlying byte array without copy if the CodedInputStream is
-        // constructed from a byte array. If aliasing is disabled or the input is
-        // from an InputStream or ByteString, we have to make a copy of the bytes.
-        ByteBuffer result =
-            !immutable && enableAliasing
-                ? ByteBuffer.wrap(buffer, pos, size).slice()
-                : ByteBuffer.wrap(Arrays.copyOfRange(buffer, pos, pos + size));
-        pos += size;
-        // TODO(nathanmittler): Investigate making the ByteBuffer be made read-only
-        return result;
-      }
-
-      if (size == 0) {
-        return EMPTY_BYTE_BUFFER;
-      }
-      if (size < 0) {
-        throw InvalidProtocolBufferException.negativeSize();
-      }
-      throw InvalidProtocolBufferException.truncatedMessage();
-    }
-
-    @Override
-    public int readUInt32() throws IOException {
-      return readRawVarint32();
-    }
-
-    @Override
-    public int readEnum() throws IOException {
-      return readRawVarint32();
-    }
-
-    @Override
-    public int readSFixed32() throws IOException {
-      return readRawLittleEndian32();
-    }
-
-    @Override
-    public long readSFixed64() throws IOException {
-      return readRawLittleEndian64();
-    }
-
-    @Override
-    public int readSInt32() throws IOException {
-      return decodeZigZag32(readRawVarint32());
-    }
-
-    @Override
-    public long readSInt64() throws IOException {
-      return decodeZigZag64(readRawVarint64());
-    }
-
-    // =================================================================
-
-    @Override
-    public int readRawVarint32() throws IOException {
-      // See implementation notes for readRawVarint64
-      fastpath:
-      {
-        int tempPos = pos;
-
-        if (limit == tempPos) {
-          break fastpath;
-        }
-
-        final byte[] buffer = this.buffer;
-        int x;
-        if ((x = buffer[tempPos++]) >= 0) {
-          pos = tempPos;
-          return x;
-        } else if (limit - tempPos < 9) {
-          break fastpath;
-        } else if ((x ^= (buffer[tempPos++] << 7)) < 0) {
-          x ^= (~0 << 7);
-        } else if ((x ^= (buffer[tempPos++] << 14)) >= 0) {
-          x ^= (~0 << 7) ^ (~0 << 14);
-        } else if ((x ^= (buffer[tempPos++] << 21)) < 0) {
-          x ^= (~0 << 7) ^ (~0 << 14) ^ (~0 << 21);
-        } else {
-          int y = buffer[tempPos++];
-          x ^= y << 28;
-          x ^= (~0 << 7) ^ (~0 << 14) ^ (~0 << 21) ^ (~0 << 28);
-          if (y < 0
-              && buffer[tempPos++] < 0
-              && buffer[tempPos++] < 0
-              && buffer[tempPos++] < 0
-              && buffer[tempPos++] < 0
-              && buffer[tempPos++] < 0) {
-            break fastpath; // Will throw malformedVarint()
-          }
-        }
-        pos = tempPos;
-        return x;
-      }
-      return (int) readRawVarint64SlowPath();
-    }
-
-    private void skipRawVarint() throws IOException {
-      if (limit - pos >= MAX_VARINT_SIZE) {
-        skipRawVarintFastPath();
-      } else {
-        skipRawVarintSlowPath();
-      }
-    }
-
-    private void skipRawVarintFastPath() throws IOException {
-      for (int i = 0; i < MAX_VARINT_SIZE; i++) {
-        if (buffer[pos++] >= 0) {
-          return;
-        }
-      }
-      throw InvalidProtocolBufferException.malformedVarint();
-    }
-
-    private void skipRawVarintSlowPath() throws IOException {
-      for (int i = 0; i < MAX_VARINT_SIZE; i++) {
-        if (readRawByte() >= 0) {
-          return;
-        }
-      }
-      throw InvalidProtocolBufferException.malformedVarint();
-    }
-
-    @Override
-    public long readRawVarint64() throws IOException {
-      // Implementation notes:
-      //
-      // Optimized for one-byte values, expected to be common.
-      // The particular code below was selected from various candidates
-      // empirically, by winning VarintBenchmark.
-      //
-      // Sign extension of (signed) Java bytes is usually a nuisance, but
-      // we exploit it here to more easily obtain the sign of bytes read.
-      // Instead of cleaning up the sign extension bits by masking eagerly,
-      // we delay until we find the final (positive) byte, when we clear all
-      // accumulated bits with one xor.  We depend on javac to constant fold.
-      fastpath:
-      {
-        int tempPos = pos;
-
-        if (limit == tempPos) {
-          break fastpath;
-        }
-
-        final byte[] buffer = this.buffer;
-        long x;
-        int y;
-        if ((y = buffer[tempPos++]) >= 0) {
-          pos = tempPos;
-          return y;
-        } else if (limit - tempPos < 9) {
-          break fastpath;
-        } else if ((y ^= (buffer[tempPos++] << 7)) < 0) {
-          x = y ^ (~0 << 7);
-        } else if ((y ^= (buffer[tempPos++] << 14)) >= 0) {
-          x = y ^ ((~0 << 7) ^ (~0 << 14));
-        } else if ((y ^= (buffer[tempPos++] << 21)) < 0) {
-          x = y ^ ((~0 << 7) ^ (~0 << 14) ^ (~0 << 21));
-        } else if ((x = y ^ ((long) buffer[tempPos++] << 28)) >= 0L) {
-          x ^= (~0L << 7) ^ (~0L << 14) ^ (~0L << 21) ^ (~0L << 28);
-        } else if ((x ^= ((long) buffer[tempPos++] << 35)) < 0L) {
-          x ^= (~0L << 7) ^ (~0L << 14) ^ (~0L << 21) ^ (~0L << 28) ^ (~0L << 35);
-        } else if ((x ^= ((long) buffer[tempPos++] << 42)) >= 0L) {
-          x ^= (~0L << 7) ^ (~0L << 14) ^ (~0L << 21) ^ (~0L << 28) ^ (~0L << 35) ^ (~0L << 42);
-        } else if ((x ^= ((long) buffer[tempPos++] << 49)) < 0L) {
-          x ^=
-              (~0L << 7)
-                  ^ (~0L << 14)
-                  ^ (~0L << 21)
-                  ^ (~0L << 28)
-                  ^ (~0L << 35)
-                  ^ (~0L << 42)
-                  ^ (~0L << 49);
-        } else {
-          x ^= ((long) buffer[tempPos++] << 56);
-          x ^=
-              (~0L << 7)
-                  ^ (~0L << 14)
-                  ^ (~0L << 21)
-                  ^ (~0L << 28)
-                  ^ (~0L << 35)
-                  ^ (~0L << 42)
-                  ^ (~0L << 49)
-                  ^ (~0L << 56);
-          if (x < 0L) {
-            if (buffer[tempPos++] < 0L) {
-              break fastpath; // Will throw malformedVarint()
-            }
-          }
-        }
-        pos = tempPos;
-        return x;
-      }
-      return readRawVarint64SlowPath();
-    }
-
-    @Override
-    long readRawVarint64SlowPath() throws IOException {
-      long result = 0;
-      for (int shift = 0; shift < 64; shift += 7) {
-        final byte b = readRawByte();
-        result |= (long) (b & 0x7F) << shift;
-        if ((b & 0x80) == 0) {
-          return result;
-        }
-      }
-      throw InvalidProtocolBufferException.malformedVarint();
-    }
-
-    @Override
-    public int readRawLittleEndian32() throws IOException {
-      int tempPos = pos;
-
-      if (limit - tempPos < FIXED32_SIZE) {
-        throw InvalidProtocolBufferException.truncatedMessage();
-      }
-
-      final byte[] buffer = this.buffer;
-      pos = tempPos + FIXED32_SIZE;
-      return ((buffer[tempPos] & 0xff)
-          | ((buffer[tempPos + 1] & 0xff) << 8)
-          | ((buffer[tempPos + 2] & 0xff) << 16)
-          | ((buffer[tempPos + 3] & 0xff) << 24));
-    }
-
-    @Override
-    public long readRawLittleEndian64() throws IOException {
-      int tempPos = pos;
-
-      if (limit - tempPos < FIXED64_SIZE) {
-        throw InvalidProtocolBufferException.truncatedMessage();
-      }
-
-      final byte[] buffer = this.buffer;
-      pos = tempPos + FIXED64_SIZE;
-      return ((buffer[tempPos] & 0xffL)
-          | ((buffer[tempPos + 1] & 0xffL) << 8)
-          | ((buffer[tempPos + 2] & 0xffL) << 16)
-          | ((buffer[tempPos + 3] & 0xffL) << 24)
-          | ((buffer[tempPos + 4] & 0xffL) << 32)
-          | ((buffer[tempPos + 5] & 0xffL) << 40)
-          | ((buffer[tempPos + 6] & 0xffL) << 48)
-          | ((buffer[tempPos + 7] & 0xffL) << 56));
-    }
-
-    @Override
-    public void enableAliasing(boolean enabled) {
-      this.enableAliasing = enabled;
-    }
-
-    @Override
-    public void resetSizeCounter() {
-      startPos = pos;
-    }
-
-    @Override
-    public int pushLimit(int byteLimit) throws InvalidProtocolBufferException {
-      if (byteLimit < 0) {
-        throw InvalidProtocolBufferException.negativeSize();
-      }
-      byteLimit += getTotalBytesRead();
-      if (byteLimit < 0) {
-        throw InvalidProtocolBufferException.parseFailure();
-      }
-      final int oldLimit = currentLimit;
-      if (byteLimit > oldLimit) {
-        throw InvalidProtocolBufferException.truncatedMessage();
-      }
-      currentLimit = byteLimit;
-
-      recomputeBufferSizeAfterLimit();
-
-      return oldLimit;
-    }
-
-    private void recomputeBufferSizeAfterLimit() {
-      limit += bufferSizeAfterLimit;
-      final int bufferEnd = limit - startPos;
-      if (bufferEnd > currentLimit) {
-        // Limit is in current buffer.
-        bufferSizeAfterLimit = bufferEnd - currentLimit;
-        limit -= bufferSizeAfterLimit;
-      } else {
-        bufferSizeAfterLimit = 0;
-      }
-    }
-
-    @Override
-    public void popLimit(final int oldLimit) {
-      currentLimit = oldLimit;
-      recomputeBufferSizeAfterLimit();
-    }
-
-    @Override
-    public int getBytesUntilLimit() {
-      if (currentLimit == Integer.MAX_VALUE) {
-        return -1;
-      }
-
-      return currentLimit - getTotalBytesRead();
-    }
-
-    @Override
-    public boolean isAtEnd() throws IOException {
-      return pos == limit;
-    }
-
-    @Override
-    public int getTotalBytesRead() {
-      return pos - startPos;
-    }
-
-    @Override
-    public byte readRawByte() throws IOException {
-      if (pos == limit) {
-        throw InvalidProtocolBufferException.truncatedMessage();
-      }
-      return buffer[pos++];
-    }
-
-    @Override
-    public byte[] readRawBytes(final int length) throws IOException {
-      if (length > 0 && length <= (limit - pos)) {
-        final int tempPos = pos;
-        pos += length;
-        return Arrays.copyOfRange(buffer, tempPos, pos);
-      }
-
-      if (length <= 0) {
-        if (length == 0) {
-          return Internal.EMPTY_BYTE_ARRAY;
-        } else {
-          throw InvalidProtocolBufferException.negativeSize();
-        }
-      }
-      throw InvalidProtocolBufferException.truncatedMessage();
-    }
-
-    @Override
-    public void skipRawBytes(final int length) throws IOException {
-      if (length >= 0 && length <= (limit - pos)) {
-        // We have all the bytes we need already.
-        pos += length;
-        return;
-      }
-
-      if (length < 0) {
-        throw InvalidProtocolBufferException.negativeSize();
-      }
-      throw InvalidProtocolBufferException.truncatedMessage();
-    }
-  }
-
-  /**
-   * A {@link CodedInputStream} implementation that uses a backing direct ByteBuffer as the input.
-   * Requires the use of {@code sun.misc.Unsafe} to perform fast reads on the buffer.
-   */
-  private static final class UnsafeDirectNioDecoder extends CodedInputStream {
-    /** The direct buffer that is backing this stream. */
-    private final ByteBuffer buffer;
-
-    /**
-     * If {@code true}, indicates that the buffer is backing a {@link ByteString} and is therefore
-     * considered to be an immutable input source.
-     */
-    private final boolean immutable;
-
-    /** The unsafe address of the content of {@link #buffer}. */
-    private final long address;
-
-    /** The unsafe address of the current read limit of the buffer. */
-    private long limit;
-
-    /** The unsafe address of the current read position of the buffer. */
-    private long pos;
-
-    /** The unsafe address of the starting read position. */
-    private long startPos;
-
-    /** The amount of available data in the buffer beyond {@link #limit}. */
-    private int bufferSizeAfterLimit;
-
-    /** The last tag that was read from this stream. */
-    private int lastTag;
-
-    /**
-     * If {@code true}, indicates that calls to read {@link ByteString} or {@code byte[]}
-     * <strong>may</strong> return slices of the underlying buffer, rather than copies.
-     */
-    private boolean enableAliasing;
-
-    /** The absolute position of the end of the current message. */
-    private int currentLimit = Integer.MAX_VALUE;
-
-    static boolean isSupported() {
-      return UnsafeUtil.hasUnsafeByteBufferOperations();
-    }
-
-    private UnsafeDirectNioDecoder(ByteBuffer buffer, boolean immutable) {
-      this.buffer = buffer;
-      address = UnsafeUtil.addressOffset(buffer);
-      limit = address + buffer.limit();
-      pos = address + buffer.position();
-      startPos = pos;
-      this.immutable = immutable;
-    }
-
-    @Override
-    public int readTag() throws IOException {
-      if (isAtEnd()) {
-        lastTag = 0;
-        return 0;
-      }
-
-      lastTag = readRawVarint32();
-      if (WireFormat.getTagFieldNumber(lastTag) == 0) {
-        // If we actually read zero (or any tag number corresponding to field
-        // number zero), that's not a valid tag.
-        throw InvalidProtocolBufferException.invalidTag();
-      }
-      return lastTag;
-    }
-
-    @Override
-    public void checkLastTagWas(final int value) throws InvalidProtocolBufferException {
-      if (lastTag != value) {
-        throw InvalidProtocolBufferException.invalidEndTag();
-      }
-    }
-
-    @Override
-    public int getLastTag() {
-      return lastTag;
-    }
-
-    @Override
-    public boolean skipField(final int tag) throws IOException {
-      switch (WireFormat.getTagWireType(tag)) {
-        case WireFormat.WIRETYPE_VARINT:
-          skipRawVarint();
-          return true;
-        case WireFormat.WIRETYPE_FIXED64:
-          skipRawBytes(FIXED64_SIZE);
-          return true;
-        case WireFormat.WIRETYPE_LENGTH_DELIMITED:
-          skipRawBytes(readRawVarint32());
-          return true;
-        case WireFormat.WIRETYPE_START_GROUP:
-          skipMessage();
-          checkLastTagWas(
-              WireFormat.makeTag(WireFormat.getTagFieldNumber(tag), WireFormat.WIRETYPE_END_GROUP));
-          return true;
-        case WireFormat.WIRETYPE_END_GROUP:
-          return false;
-        case WireFormat.WIRETYPE_FIXED32:
-          skipRawBytes(FIXED32_SIZE);
-          return true;
-        default:
-          throw InvalidProtocolBufferException.invalidWireType();
-      }
-    }
-
-    @Override
-    public boolean skipField(final int tag, final CodedOutputStream output) throws IOException {
-      switch (WireFormat.getTagWireType(tag)) {
-        case WireFormat.WIRETYPE_VARINT:
-          {
-            long value = readInt64();
-            output.writeUInt32NoTag(tag);
-            output.writeUInt64NoTag(value);
-            return true;
-          }
-        case WireFormat.WIRETYPE_FIXED64:
-          {
-            long value = readRawLittleEndian64();
-            output.writeUInt32NoTag(tag);
-            output.writeFixed64NoTag(value);
-            return true;
-          }
-        case WireFormat.WIRETYPE_LENGTH_DELIMITED:
-          {
-            ByteString value = readBytes();
-            output.writeUInt32NoTag(tag);
-            output.writeBytesNoTag(value);
-            return true;
-          }
-        case WireFormat.WIRETYPE_START_GROUP:
-          {
-            output.writeUInt32NoTag(tag);
-            skipMessage(output);
-            int endtag =
-                WireFormat.makeTag(
-                    WireFormat.getTagFieldNumber(tag), WireFormat.WIRETYPE_END_GROUP);
-            checkLastTagWas(endtag);
-            output.writeUInt32NoTag(endtag);
-            return true;
-          }
-        case WireFormat.WIRETYPE_END_GROUP:
-          {
-            return false;
-          }
-        case WireFormat.WIRETYPE_FIXED32:
-          {
-            int value = readRawLittleEndian32();
-            output.writeUInt32NoTag(tag);
-            output.writeFixed32NoTag(value);
-            return true;
-          }
-        default:
-          throw InvalidProtocolBufferException.invalidWireType();
-      }
-    }
-
-    @Override
-    public void skipMessage() throws IOException {
-      while (true) {
-        final int tag = readTag();
-        if (tag == 0 || !skipField(tag)) {
-          return;
-        }
-      }
-    }
-
-    @Override
-    public void skipMessage(CodedOutputStream output) throws IOException {
-      while (true) {
-        final int tag = readTag();
-        if (tag == 0 || !skipField(tag, output)) {
-          return;
-        }
-      }
-    }
-
-
-    // -----------------------------------------------------------------
-
-    @Override
-    public double readDouble() throws IOException {
-      return Double.longBitsToDouble(readRawLittleEndian64());
-    }
-
-    @Override
-    public float readFloat() throws IOException {
-      return Float.intBitsToFloat(readRawLittleEndian32());
-    }
-
-    @Override
-    public long readUInt64() throws IOException {
-      return readRawVarint64();
-    }
-
-    @Override
-    public long readInt64() throws IOException {
-      return readRawVarint64();
-    }
-
-    @Override
-    public int readInt32() throws IOException {
-      return readRawVarint32();
-    }
-
-    @Override
-    public long readFixed64() throws IOException {
-      return readRawLittleEndian64();
-    }
-
-    @Override
-    public int readFixed32() throws IOException {
-      return readRawLittleEndian32();
-    }
-
-    @Override
-    public boolean readBool() throws IOException {
-      return readRawVarint64() != 0;
-    }
-
-    @Override
-    public String readString() throws IOException {
-      final int size = readRawVarint32();
-      if (size > 0 && size <= remaining()) {
-        // TODO(nathanmittler): Is there a way to avoid this copy?
-        // TODO(anuraaga): It might be possible to share the optimized loop with
-        // readStringRequireUtf8 by implementing Java replacement logic there.
-        // The same as readBytes' logic
-        byte[] bytes = new byte[size];
-        UnsafeUtil.copyMemory(pos, bytes, 0, size);
-        String result = new String(bytes, UTF_8);
-        pos += size;
-        return result;
-      }
-
-      if (size == 0) {
-        return "";
-      }
-      if (size < 0) {
-        throw InvalidProtocolBufferException.negativeSize();
-      }
-      throw InvalidProtocolBufferException.truncatedMessage();
-    }
-
-    @Override
-    public String readStringRequireUtf8() throws IOException {
-      final int size = readRawVarint32();
-      if (size > 0 && size <= remaining()) {
-        final int bufferPos = bufferPos(pos);
-        String result = Utf8.decodeUtf8(buffer, bufferPos, size);
-        pos += size;
-        return result;
-      }
-
-      if (size == 0) {
-        return "";
-      }
-      if (size <= 0) {
-        throw InvalidProtocolBufferException.negativeSize();
-      }
-      throw InvalidProtocolBufferException.truncatedMessage();
-    }
-
-    @Override
-    public void readGroup(
-        final int fieldNumber,
-        final MessageLite.Builder builder,
-        final ExtensionRegistryLite extensionRegistry)
-        throws IOException {
-      checkRecursionLimit();
-      ++recursionDepth;
-      builder.mergeFrom(this, extensionRegistry);
-      checkLastTagWas(WireFormat.makeTag(fieldNumber, WireFormat.WIRETYPE_END_GROUP));
-      --recursionDepth;
-    }
-
-
-    @Override
-    public <T extends MessageLite> T readGroup(
-        final int fieldNumber,
-        final Parser<T> parser,
-        final ExtensionRegistryLite extensionRegistry)
-        throws IOException {
-      checkRecursionLimit();
-      ++recursionDepth;
-      T result = parser.parsePartialFrom(this, extensionRegistry);
-      checkLastTagWas(WireFormat.makeTag(fieldNumber, WireFormat.WIRETYPE_END_GROUP));
-      --recursionDepth;
-      return result;
-    }
-
-    @Deprecated
-    @Override
-    public void readUnknownGroup(final int fieldNumber, final MessageLite.Builder builder)
-        throws IOException {
-      readGroup(fieldNumber, builder, ExtensionRegistryLite.getEmptyRegistry());
-    }
-
-    @Override
-    public void readMessage(
-        final MessageLite.Builder builder, final ExtensionRegistryLite extensionRegistry)
-        throws IOException {
-      final int length = readRawVarint32();
-      checkRecursionLimit();
-      final int oldLimit = pushLimit(length);
-      ++recursionDepth;
-      builder.mergeFrom(this, extensionRegistry);
-      checkLastTagWas(0);
-      --recursionDepth;
-      if (getBytesUntilLimit() != 0) {
-        throw InvalidProtocolBufferException.truncatedMessage();
-      }
-      popLimit(oldLimit);
-    }
-
-
-    @Override
-    public <T extends MessageLite> T readMessage(
-        final Parser<T> parser, final ExtensionRegistryLite extensionRegistry) throws IOException {
-      int length = readRawVarint32();
-      checkRecursionLimit();
-      final int oldLimit = pushLimit(length);
-      ++recursionDepth;
-      T result = parser.parsePartialFrom(this, extensionRegistry);
-      checkLastTagWas(0);
-      --recursionDepth;
-      if (getBytesUntilLimit() != 0) {
-        throw InvalidProtocolBufferException.truncatedMessage();
-      }
-      popLimit(oldLimit);
-      return result;
-    }
-
-    @Override
-    public ByteString readBytes() throws IOException {
-      final int size = readRawVarint32();
-      if (size > 0 && size <= remaining()) {
-        if (immutable && enableAliasing) {
-          final ByteBuffer result = slice(pos, pos + size);
-          pos += size;
-          return ByteString.wrap(result);
-        } else {
-          // Use UnsafeUtil to copy the memory to bytes instead of using ByteBuffer ways.
-          byte[] bytes = new byte[size];
-          UnsafeUtil.copyMemory(pos, bytes, 0, size);
-          pos += size;
-          return ByteString.wrap(bytes);
-        }
-      }
-
-      if (size == 0) {
-        return ByteString.EMPTY;
-      }
-      if (size < 0) {
-        throw InvalidProtocolBufferException.negativeSize();
-      }
-      throw InvalidProtocolBufferException.truncatedMessage();
-    }
-
-    @Override
-    public byte[] readByteArray() throws IOException {
-      return readRawBytes(readRawVarint32());
-    }
-
-    @Override
-    public ByteBuffer readByteBuffer() throws IOException {
-      final int size = readRawVarint32();
-      if (size > 0 && size <= remaining()) {
-        // "Immutable" implies that buffer is backing a ByteString.
-        // Disallow slicing in this case to prevent the caller from modifying the contents
-        // of the ByteString.
-        if (!immutable && enableAliasing) {
-          final ByteBuffer result = slice(pos, pos + size);
-          pos += size;
-          return result;
-        } else {
-          // The same as readBytes' logic
-          byte[] bytes = new byte[size];
-          UnsafeUtil.copyMemory(pos, bytes, 0, size);
-          pos += size;
-          return ByteBuffer.wrap(bytes);
-        }
-        // TODO(nathanmittler): Investigate making the ByteBuffer be made read-only
-      }
-
-      if (size == 0) {
-        return EMPTY_BYTE_BUFFER;
-      }
-      if (size < 0) {
-        throw InvalidProtocolBufferException.negativeSize();
-      }
-      throw InvalidProtocolBufferException.truncatedMessage();
-    }
-
-    @Override
-    public int readUInt32() throws IOException {
-      return readRawVarint32();
-    }
-
-    @Override
-    public int readEnum() throws IOException {
-      return readRawVarint32();
-    }
-
-    @Override
-    public int readSFixed32() throws IOException {
-      return readRawLittleEndian32();
-    }
-
-    @Override
-    public long readSFixed64() throws IOException {
-      return readRawLittleEndian64();
-    }
-
-    @Override
-    public int readSInt32() throws IOException {
-      return decodeZigZag32(readRawVarint32());
-    }
-
-    @Override
-    public long readSInt64() throws IOException {
-      return decodeZigZag64(readRawVarint64());
-    }
-
-    // =================================================================
-
-    @Override
-    public int readRawVarint32() throws IOException {
-      // See implementation notes for readRawVarint64
-      fastpath:
-      {
-        long tempPos = pos;
-
-        if (limit == tempPos) {
-          break fastpath;
-        }
-
-        int x;
-        if ((x = UnsafeUtil.getByte(tempPos++)) >= 0) {
-          pos = tempPos;
-          return x;
-        } else if (limit - tempPos < 9) {
-          break fastpath;
-        } else if ((x ^= (UnsafeUtil.getByte(tempPos++) << 7)) < 0) {
-          x ^= (~0 << 7);
-        } else if ((x ^= (UnsafeUtil.getByte(tempPos++) << 14)) >= 0) {
-          x ^= (~0 << 7) ^ (~0 << 14);
-        } else if ((x ^= (UnsafeUtil.getByte(tempPos++) << 21)) < 0) {
-          x ^= (~0 << 7) ^ (~0 << 14) ^ (~0 << 21);
-        } else {
-          int y = UnsafeUtil.getByte(tempPos++);
-          x ^= y << 28;
-          x ^= (~0 << 7) ^ (~0 << 14) ^ (~0 << 21) ^ (~0 << 28);
-          if (y < 0
-              && UnsafeUtil.getByte(tempPos++) < 0
-              && UnsafeUtil.getByte(tempPos++) < 0
-              && UnsafeUtil.getByte(tempPos++) < 0
-              && UnsafeUtil.getByte(tempPos++) < 0
-              && UnsafeUtil.getByte(tempPos++) < 0) {
-            break fastpath; // Will throw malformedVarint()
-          }
-        }
-        pos = tempPos;
-        return x;
-      }
-      return (int) readRawVarint64SlowPath();
-    }
-
-    private void skipRawVarint() throws IOException {
-      if (remaining() >= MAX_VARINT_SIZE) {
-        skipRawVarintFastPath();
-      } else {
-        skipRawVarintSlowPath();
-      }
-    }
-
-    private void skipRawVarintFastPath() throws IOException {
-      for (int i = 0; i < MAX_VARINT_SIZE; i++) {
-        if (UnsafeUtil.getByte(pos++) >= 0) {
-          return;
-        }
-      }
-      throw InvalidProtocolBufferException.malformedVarint();
-    }
-
-    private void skipRawVarintSlowPath() throws IOException {
-      for (int i = 0; i < MAX_VARINT_SIZE; i++) {
-        if (readRawByte() >= 0) {
-          return;
-        }
-      }
-      throw InvalidProtocolBufferException.malformedVarint();
-    }
-
-    @Override
-    public long readRawVarint64() throws IOException {
-      // Implementation notes:
-      //
-      // Optimized for one-byte values, expected to be common.
-      // The particular code below was selected from various candidates
-      // empirically, by winning VarintBenchmark.
-      //
-      // Sign extension of (signed) Java bytes is usually a nuisance, but
-      // we exploit it here to more easily obtain the sign of bytes read.
-      // Instead of cleaning up the sign extension bits by masking eagerly,
-      // we delay until we find the final (positive) byte, when we clear all
-      // accumulated bits with one xor.  We depend on javac to constant fold.
-      fastpath:
-      {
-        long tempPos = pos;
-
-        if (limit == tempPos) {
-          break fastpath;
-        }
-
-        long x;
-        int y;
-        if ((y = UnsafeUtil.getByte(tempPos++)) >= 0) {
-          pos = tempPos;
-          return y;
-        } else if (limit - tempPos < 9) {
-          break fastpath;
-        } else if ((y ^= (UnsafeUtil.getByte(tempPos++) << 7)) < 0) {
-          x = y ^ (~0 << 7);
-        } else if ((y ^= (UnsafeUtil.getByte(tempPos++) << 14)) >= 0) {
-          x = y ^ ((~0 << 7) ^ (~0 << 14));
-        } else if ((y ^= (UnsafeUtil.getByte(tempPos++) << 21)) < 0) {
-          x = y ^ ((~0 << 7) ^ (~0 << 14) ^ (~0 << 21));
-        } else if ((x = y ^ ((long) UnsafeUtil.getByte(tempPos++) << 28)) >= 0L) {
-          x ^= (~0L << 7) ^ (~0L << 14) ^ (~0L << 21) ^ (~0L << 28);
-        } else if ((x ^= ((long) UnsafeUtil.getByte(tempPos++) << 35)) < 0L) {
-          x ^= (~0L << 7) ^ (~0L << 14) ^ (~0L << 21) ^ (~0L << 28) ^ (~0L << 35);
-        } else if ((x ^= ((long) UnsafeUtil.getByte(tempPos++) << 42)) >= 0L) {
-          x ^= (~0L << 7) ^ (~0L << 14) ^ (~0L << 21) ^ (~0L << 28) ^ (~0L << 35) ^ (~0L << 42);
-        } else if ((x ^= ((long) UnsafeUtil.getByte(tempPos++) << 49)) < 0L) {
-          x ^=
-              (~0L << 7)
-                  ^ (~0L << 14)
-                  ^ (~0L << 21)
-                  ^ (~0L << 28)
-                  ^ (~0L << 35)
-                  ^ (~0L << 42)
-                  ^ (~0L << 49);
-        } else {
-          x ^= ((long) UnsafeUtil.getByte(tempPos++) << 56);
-          x ^=
-              (~0L << 7)
-                  ^ (~0L << 14)
-                  ^ (~0L << 21)
-                  ^ (~0L << 28)
-                  ^ (~0L << 35)
-                  ^ (~0L << 42)
-                  ^ (~0L << 49)
-                  ^ (~0L << 56);
-          if (x < 0L) {
-            if (UnsafeUtil.getByte(tempPos++) < 0L) {
-              break fastpath; // Will throw malformedVarint()
-            }
-          }
-        }
-        pos = tempPos;
-        return x;
-      }
-      return readRawVarint64SlowPath();
-    }
-
-    @Override
-    long readRawVarint64SlowPath() throws IOException {
-      long result = 0;
-      for (int shift = 0; shift < 64; shift += 7) {
-        final byte b = readRawByte();
-        result |= (long) (b & 0x7F) << shift;
-        if ((b & 0x80) == 0) {
-          return result;
-        }
-      }
-      throw InvalidProtocolBufferException.malformedVarint();
-    }
-
-    @Override
-    public int readRawLittleEndian32() throws IOException {
-      long tempPos = pos;
-
-      if (limit - tempPos < FIXED32_SIZE) {
-        throw InvalidProtocolBufferException.truncatedMessage();
-      }
-
-      pos = tempPos + FIXED32_SIZE;
-      return ((UnsafeUtil.getByte(tempPos) & 0xff)
-          | ((UnsafeUtil.getByte(tempPos + 1) & 0xff) << 8)
-          | ((UnsafeUtil.getByte(tempPos + 2) & 0xff) << 16)
-          | ((UnsafeUtil.getByte(tempPos + 3) & 0xff) << 24));
-    }
-
-    @Override
-    public long readRawLittleEndian64() throws IOException {
-      long tempPos = pos;
-
-      if (limit - tempPos < FIXED64_SIZE) {
-        throw InvalidProtocolBufferException.truncatedMessage();
-      }
-
-      pos = tempPos + FIXED64_SIZE;
-      return ((UnsafeUtil.getByte(tempPos) & 0xffL)
-          | ((UnsafeUtil.getByte(tempPos + 1) & 0xffL) << 8)
-          | ((UnsafeUtil.getByte(tempPos + 2) & 0xffL) << 16)
-          | ((UnsafeUtil.getByte(tempPos + 3) & 0xffL) << 24)
-          | ((UnsafeUtil.getByte(tempPos + 4) & 0xffL) << 32)
-          | ((UnsafeUtil.getByte(tempPos + 5) & 0xffL) << 40)
-          | ((UnsafeUtil.getByte(tempPos + 6) & 0xffL) << 48)
-          | ((UnsafeUtil.getByte(tempPos + 7) & 0xffL) << 56));
-    }
-
-    @Override
-    public void enableAliasing(boolean enabled) {
-      this.enableAliasing = enabled;
-    }
-
-    @Override
-    public void resetSizeCounter() {
-      startPos = pos;
-    }
-
-    @Override
-    public int pushLimit(int byteLimit) throws InvalidProtocolBufferException {
-      if (byteLimit < 0) {
-        throw InvalidProtocolBufferException.negativeSize();
-      }
-      byteLimit += getTotalBytesRead();
-      final int oldLimit = currentLimit;
-      if (byteLimit > oldLimit) {
-        throw InvalidProtocolBufferException.truncatedMessage();
-      }
-      currentLimit = byteLimit;
-
-      recomputeBufferSizeAfterLimit();
-
-      return oldLimit;
-    }
-
-    @Override
-    public void popLimit(final int oldLimit) {
-      currentLimit = oldLimit;
-      recomputeBufferSizeAfterLimit();
-    }
-
-    @Override
-    public int getBytesUntilLimit() {
-      if (currentLimit == Integer.MAX_VALUE) {
-        return -1;
-      }
-
-      return currentLimit - getTotalBytesRead();
-    }
-
-    @Override
-    public boolean isAtEnd() throws IOException {
-      return pos == limit;
-    }
-
-    @Override
-    public int getTotalBytesRead() {
-      return (int) (pos - startPos);
-    }
-
-    @Override
-    public byte readRawByte() throws IOException {
-      if (pos == limit) {
-        throw InvalidProtocolBufferException.truncatedMessage();
-      }
-      return UnsafeUtil.getByte(pos++);
-    }
-
-    @Override
-    public byte[] readRawBytes(final int length) throws IOException {
-      if (length >= 0 && length <= remaining()) {
-        byte[] bytes = new byte[length];
-        slice(pos, pos + length).get(bytes);
-        pos += length;
-        return bytes;
-      }
-
-      if (length <= 0) {
-        if (length == 0) {
-          return EMPTY_BYTE_ARRAY;
-        } else {
-          throw InvalidProtocolBufferException.negativeSize();
-        }
-      }
-
-      throw InvalidProtocolBufferException.truncatedMessage();
-    }
-
-    @Override
-    public void skipRawBytes(final int length) throws IOException {
-      if (length >= 0 && length <= remaining()) {
-        // We have all the bytes we need already.
-        pos += length;
-        return;
-      }
-
-      if (length < 0) {
-        throw InvalidProtocolBufferException.negativeSize();
-      }
-      throw InvalidProtocolBufferException.truncatedMessage();
-    }
-
-    private void recomputeBufferSizeAfterLimit() {
-      limit += bufferSizeAfterLimit;
-      final int bufferEnd = (int) (limit - startPos);
-      if (bufferEnd > currentLimit) {
-        // Limit is in current buffer.
-        bufferSizeAfterLimit = bufferEnd - currentLimit;
-        limit -= bufferSizeAfterLimit;
-      } else {
-        bufferSizeAfterLimit = 0;
-      }
-    }
-
-    private int remaining() {
-      return (int) (limit - pos);
-    }
-
-    private int bufferPos(long pos) {
-      return (int) (pos - address);
-    }
-
-    private ByteBuffer slice(long begin, long end) throws IOException {
-      int prevPos = buffer.position();
-      int prevLimit = buffer.limit();
-      // View ByteBuffer as Buffer to avoid cross-Java version issues.
-      // See https://issues.apache.org/jira/browse/MRESOLVER-85
-      Buffer asBuffer = buffer;
-      try {
-        asBuffer.position(bufferPos(begin));
-        asBuffer.limit(bufferPos(end));
-        return buffer.slice();
-      } catch (IllegalArgumentException e) {
-        InvalidProtocolBufferException ex = InvalidProtocolBufferException.truncatedMessage();
-        ex.initCause(e);
-        throw ex;
-      } finally {
-        asBuffer.position(prevPos);
-        asBuffer.limit(prevLimit);
-      }
-    }
-  }
-
-  /**
-   * Implementation of {@link CodedInputStream} that uses an {@link InputStream} as the data source.
-   */
-  private static final class StreamDecoder extends CodedInputStream {
-    private final InputStream input;
-    private final byte[] buffer;
-    /** bufferSize represents how many bytes are currently filled in the buffer */
-    private int bufferSize;
-
-    private int bufferSizeAfterLimit;
-    private int pos;
-    private int lastTag;
-
-    /**
-     * The total number of bytes read before the current buffer. The total bytes read up to the
-     * current position can be computed as {@code totalBytesRetired + pos}. This value may be
-     * negative if reading started in the middle of the current buffer (e.g. if the constructor that
-     * takes a byte array and an offset was used).
-     */
-    private int totalBytesRetired;
-
-    /** The absolute position of the end of the current message. */
-    private int currentLimit = Integer.MAX_VALUE;
-
-    private StreamDecoder(final InputStream input, int bufferSize) {
-      checkNotNull(input, "input");
-      this.input = input;
-      this.buffer = new byte[bufferSize];
-      this.bufferSize = 0;
-      pos = 0;
-      totalBytesRetired = 0;
-    }
-
-    /*
-     * The following wrapper methods exist so that InvalidProtocolBufferExceptions thrown by the
-     * InputStream can be differentiated from ones thrown by CodedInputStream itself. Each call to
-     * an InputStream method that can throw IOException must be wrapped like this. We do this
-     * because we sometimes need to modify IPBE instances after they are thrown far away from where
-     * they are thrown (ex. to add unfinished messages) and we use this signal elsewhere in the
-     * exception catch chain to know when to perform these operations directly or to wrap the
-     * exception in their own IPBE so the extra information can be communicated without trampling
-     * downstream information.
-     */
-    private static int read(InputStream input, byte[] data, int offset, int length)
-        throws IOException {
-      try {
-        return input.read(data, offset, length);
-      } catch (InvalidProtocolBufferException e) {
-        e.setThrownFromInputStream();
-        throw e;
-      }
-    }
-
-    private static long skip(InputStream input, long length) throws IOException {
-      try {
-        return input.skip(length);
-      } catch (InvalidProtocolBufferException e) {
-        e.setThrownFromInputStream();
-        throw e;
-      }
-    }
-
-    private static int available(InputStream input) throws IOException {
-      try {
-        return input.available();
-      } catch (InvalidProtocolBufferException e) {
-        e.setThrownFromInputStream();
-        throw e;
-      }
-    }
-
-    @Override
-    public int readTag() throws IOException {
-      if (isAtEnd()) {
-        lastTag = 0;
-        return 0;
-      }
-
-      lastTag = readRawVarint32();
-      if (WireFormat.getTagFieldNumber(lastTag) == 0) {
-        // If we actually read zero (or any tag number corresponding to field
-        // number zero), that's not a valid tag.
-        throw InvalidProtocolBufferException.invalidTag();
-      }
-      return lastTag;
-    }
-
-    @Override
-    public void checkLastTagWas(final int value) throws InvalidProtocolBufferException {
-      if (lastTag != value) {
-        throw InvalidProtocolBufferException.invalidEndTag();
-      }
-    }
-
-    @Override
-    public int getLastTag() {
-      return lastTag;
-    }
-
-    @Override
-    public boolean skipField(final int tag) throws IOException {
-      switch (WireFormat.getTagWireType(tag)) {
-        case WireFormat.WIRETYPE_VARINT:
-          skipRawVarint();
-          return true;
-        case WireFormat.WIRETYPE_FIXED64:
-          skipRawBytes(FIXED64_SIZE);
-          return true;
-        case WireFormat.WIRETYPE_LENGTH_DELIMITED:
-          skipRawBytes(readRawVarint32());
-          return true;
-        case WireFormat.WIRETYPE_START_GROUP:
-          skipMessage();
-          checkLastTagWas(
-              WireFormat.makeTag(WireFormat.getTagFieldNumber(tag), WireFormat.WIRETYPE_END_GROUP));
-          return true;
-        case WireFormat.WIRETYPE_END_GROUP:
-          return false;
-        case WireFormat.WIRETYPE_FIXED32:
-          skipRawBytes(FIXED32_SIZE);
-          return true;
-        default:
-          throw InvalidProtocolBufferException.invalidWireType();
-      }
-    }
-
-    @Override
-    public boolean skipField(final int tag, final CodedOutputStream output) throws IOException {
-      switch (WireFormat.getTagWireType(tag)) {
-        case WireFormat.WIRETYPE_VARINT:
-          {
-            long value = readInt64();
-            output.writeUInt32NoTag(tag);
-            output.writeUInt64NoTag(value);
-            return true;
-          }
-        case WireFormat.WIRETYPE_FIXED64:
-          {
-            long value = readRawLittleEndian64();
-            output.writeUInt32NoTag(tag);
-            output.writeFixed64NoTag(value);
-            return true;
-          }
-        case WireFormat.WIRETYPE_LENGTH_DELIMITED:
-          {
-            ByteString value = readBytes();
-            output.writeUInt32NoTag(tag);
-            output.writeBytesNoTag(value);
-            return true;
-          }
-        case WireFormat.WIRETYPE_START_GROUP:
-          {
-            output.writeUInt32NoTag(tag);
-            skipMessage(output);
-            int endtag =
-                WireFormat.makeTag(
-                    WireFormat.getTagFieldNumber(tag), WireFormat.WIRETYPE_END_GROUP);
-            checkLastTagWas(endtag);
-            output.writeUInt32NoTag(endtag);
-            return true;
-          }
-        case WireFormat.WIRETYPE_END_GROUP:
-          {
-            return false;
-          }
-        case WireFormat.WIRETYPE_FIXED32:
-          {
-            int value = readRawLittleEndian32();
-            output.writeUInt32NoTag(tag);
-            output.writeFixed32NoTag(value);
-            return true;
-          }
-        default:
-          throw InvalidProtocolBufferException.invalidWireType();
-      }
-    }
-
-    @Override
-    public void skipMessage() throws IOException {
-      while (true) {
-        final int tag = readTag();
-        if (tag == 0 || !skipField(tag)) {
-          return;
-        }
-      }
-    }
-
-    @Override
-    public void skipMessage(CodedOutputStream output) throws IOException {
-      while (true) {
-        final int tag = readTag();
-        if (tag == 0 || !skipField(tag, output)) {
-          return;
-        }
-      }
-    }
-
-    /** Collects the bytes skipped and returns the data in a ByteBuffer. */
-    private class SkippedDataSink implements RefillCallback {
-      private int lastPos = pos;
-      private ByteArrayOutputStream byteArrayStream;
-
-      @Override
-      public void onRefill() {
-        if (byteArrayStream == null) {
-          byteArrayStream = new ByteArrayOutputStream();
-        }
-        byteArrayStream.write(buffer, lastPos, pos - lastPos);
-        lastPos = 0;
-      }
-
-      /** Gets skipped data in a ByteBuffer. This method should only be called once. */
-      ByteBuffer getSkippedData() {
-        if (byteArrayStream == null) {
-          return ByteBuffer.wrap(buffer, lastPos, pos - lastPos);
-        } else {
-          byteArrayStream.write(buffer, lastPos, pos);
-          return ByteBuffer.wrap(byteArrayStream.toByteArray());
-        }
-      }
-    }
-
-
-    // -----------------------------------------------------------------
-
-    @Override
-    public double readDouble() throws IOException {
-      return Double.longBitsToDouble(readRawLittleEndian64());
-    }
-
-    @Override
-    public float readFloat() throws IOException {
-      return Float.intBitsToFloat(readRawLittleEndian32());
-    }
-
-    @Override
-    public long readUInt64() throws IOException {
-      return readRawVarint64();
-    }
-
-    @Override
-    public long readInt64() throws IOException {
-      return readRawVarint64();
-    }
-
-    @Override
-    public int readInt32() throws IOException {
-      return readRawVarint32();
-    }
-
-    @Override
-    public long readFixed64() throws IOException {
-      return readRawLittleEndian64();
-    }
-
-    @Override
-    public int readFixed32() throws IOException {
-      return readRawLittleEndian32();
-    }
-
-    @Override
-    public boolean readBool() throws IOException {
-      return readRawVarint64() != 0;
-    }
-
-    @Override
-    public String readString() throws IOException {
-      final int size = readRawVarint32();
-      if (size > 0 && size <= (bufferSize - pos)) {
-        // Fast path:  We already have the bytes in a contiguous buffer, so
-        //   just copy directly from it.
-        final String result = new String(buffer, pos, size, UTF_8);
-        pos += size;
-        return result;
-      }
-      if (size == 0) {
-        return "";
-      }
-      if (size <= bufferSize) {
-        refillBuffer(size);
-        String result = new String(buffer, pos, size, UTF_8);
-        pos += size;
-        return result;
-      }
-      // Slow path:  Build a byte array first then copy it.
-      return new String(readRawBytesSlowPath(size, /* ensureNoLeakedReferences= */ false), UTF_8);
-    }
-
-    @Override
-    public String readStringRequireUtf8() throws IOException {
-      final int size = readRawVarint32();
-      final byte[] bytes;
-      final int oldPos = pos;
-      final int tempPos;
-      if (size <= (bufferSize - oldPos) && size > 0) {
-        // Fast path:  We already have the bytes in a contiguous buffer, so
-        //   just copy directly from it.
-        bytes = buffer;
-        pos = oldPos + size;
-        tempPos = oldPos;
-      } else if (size == 0) {
-        return "";
-      } else if (size <= bufferSize) {
-        refillBuffer(size);
-        bytes = buffer;
-        tempPos = 0;
-        pos = tempPos + size;
-      } else {
-        // Slow path:  Build a byte array first then copy it.
-        bytes = readRawBytesSlowPath(size, /* ensureNoLeakedReferences= */ false);
-        tempPos = 0;
-      }
-      return Utf8.decodeUtf8(bytes, tempPos, size);
-    }
-
-    @Override
-    public void readGroup(
-        final int fieldNumber,
-        final MessageLite.Builder builder,
-        final ExtensionRegistryLite extensionRegistry)
-        throws IOException {
-      checkRecursionLimit();
-      ++recursionDepth;
-      builder.mergeFrom(this, extensionRegistry);
-      checkLastTagWas(WireFormat.makeTag(fieldNumber, WireFormat.WIRETYPE_END_GROUP));
-      --recursionDepth;
-    }
-
-
-    @Override
-    public <T extends MessageLite> T readGroup(
-        final int fieldNumber,
-        final Parser<T> parser,
-        final ExtensionRegistryLite extensionRegistry)
-        throws IOException {
-      checkRecursionLimit();
-      ++recursionDepth;
-      T result = parser.parsePartialFrom(this, extensionRegistry);
-      checkLastTagWas(WireFormat.makeTag(fieldNumber, WireFormat.WIRETYPE_END_GROUP));
-      --recursionDepth;
-      return result;
-    }
-
-    @Deprecated
-    @Override
-    public void readUnknownGroup(final int fieldNumber, final MessageLite.Builder builder)
-        throws IOException {
-      readGroup(fieldNumber, builder, ExtensionRegistryLite.getEmptyRegistry());
-    }
-
-    @Override
-    public void readMessage(
-        final MessageLite.Builder builder, final ExtensionRegistryLite extensionRegistry)
-        throws IOException {
-      final int length = readRawVarint32();
-      checkRecursionLimit();
-      final int oldLimit = pushLimit(length);
-      ++recursionDepth;
-      builder.mergeFrom(this, extensionRegistry);
-      checkLastTagWas(0);
-      --recursionDepth;
-      if (getBytesUntilLimit() != 0) {
-        throw InvalidProtocolBufferException.truncatedMessage();
-      }
-      popLimit(oldLimit);
-    }
-
-
-    @Override
-    public <T extends MessageLite> T readMessage(
-        final Parser<T> parser, final ExtensionRegistryLite extensionRegistry) throws IOException {
-      int length = readRawVarint32();
-      checkRecursionLimit();
-      final int oldLimit = pushLimit(length);
-      ++recursionDepth;
-      T result = parser.parsePartialFrom(this, extensionRegistry);
-      checkLastTagWas(0);
-      --recursionDepth;
-      if (getBytesUntilLimit() != 0) {
-        throw InvalidProtocolBufferException.truncatedMessage();
-      }
-      popLimit(oldLimit);
-      return result;
-    }
-
-    @Override
-    public ByteString readBytes() throws IOException {
-      final int size = readRawVarint32();
-      if (size <= (bufferSize - pos) && size > 0) {
-        // Fast path:  We already have the bytes in a contiguous buffer, so
-        //   just copy directly from it.
-        final ByteString result = ByteString.copyFrom(buffer, pos, size);
-        pos += size;
-        return result;
-      }
-      if (size == 0) {
-        return ByteString.EMPTY;
-      }
-      return readBytesSlowPath(size);
-    }
-
-    @Override
-    public byte[] readByteArray() throws IOException {
-      final int size = readRawVarint32();
-      if (size <= (bufferSize - pos) && size > 0) {
-        // Fast path: We already have the bytes in a contiguous buffer, so
-        // just copy directly from it.
-        final byte[] result = Arrays.copyOfRange(buffer, pos, pos + size);
-        pos += size;
-        return result;
-      } else {
-        // Slow path: Build a byte array first then copy it.
-        // TODO(dweis): Do we want to protect from malicious input streams here?
-        return readRawBytesSlowPath(size, /* ensureNoLeakedReferences= */ false);
-      }
-    }
-
-    @Override
-    public ByteBuffer readByteBuffer() throws IOException {
-      final int size = readRawVarint32();
-      if (size <= (bufferSize - pos) && size > 0) {
-        // Fast path: We already have the bytes in a contiguous buffer.
-        ByteBuffer result = ByteBuffer.wrap(Arrays.copyOfRange(buffer, pos, pos + size));
-        pos += size;
-        return result;
-      }
-      if (size == 0) {
-        return Internal.EMPTY_BYTE_BUFFER;
-      }
-      // Slow path: Build a byte array first then copy it.
-      
-      // We must copy as the byte array was handed off to the InputStream and a malicious
-      // implementation could retain a reference.
-      return ByteBuffer.wrap(readRawBytesSlowPath(size, /* ensureNoLeakedReferences= */ true));
-    }
-
-    @Override
-    public int readUInt32() throws IOException {
-      return readRawVarint32();
-    }
-
-    @Override
-    public int readEnum() throws IOException {
-      return readRawVarint32();
-    }
-
-    @Override
-    public int readSFixed32() throws IOException {
-      return readRawLittleEndian32();
-    }
-
-    @Override
-    public long readSFixed64() throws IOException {
-      return readRawLittleEndian64();
-    }
-
-    @Override
-    public int readSInt32() throws IOException {
-      return decodeZigZag32(readRawVarint32());
-    }
-
-    @Override
-    public long readSInt64() throws IOException {
-      return decodeZigZag64(readRawVarint64());
-    }
-
-    // =================================================================
-
-    @Override
-    public int readRawVarint32() throws IOException {
-      // See implementation notes for readRawVarint64
-      fastpath:
-      {
-        int tempPos = pos;
-
-        if (bufferSize == tempPos) {
-          break fastpath;
-        }
-
-        final byte[] buffer = this.buffer;
-        int x;
-        if ((x = buffer[tempPos++]) >= 0) {
-          pos = tempPos;
-          return x;
-        } else if (bufferSize - tempPos < 9) {
-          break fastpath;
-        } else if ((x ^= (buffer[tempPos++] << 7)) < 0) {
-          x ^= (~0 << 7);
-        } else if ((x ^= (buffer[tempPos++] << 14)) >= 0) {
-          x ^= (~0 << 7) ^ (~0 << 14);
-        } else if ((x ^= (buffer[tempPos++] << 21)) < 0) {
-          x ^= (~0 << 7) ^ (~0 << 14) ^ (~0 << 21);
-        } else {
-          int y = buffer[tempPos++];
-          x ^= y << 28;
-          x ^= (~0 << 7) ^ (~0 << 14) ^ (~0 << 21) ^ (~0 << 28);
-          if (y < 0
-              && buffer[tempPos++] < 0
-              && buffer[tempPos++] < 0
-              && buffer[tempPos++] < 0
-              && buffer[tempPos++] < 0
-              && buffer[tempPos++] < 0) {
-            break fastpath; // Will throw malformedVarint()
-          }
-        }
-        pos = tempPos;
-        return x;
-      }
-      return (int) readRawVarint64SlowPath();
-    }
-
-    private void skipRawVarint() throws IOException {
-      if (bufferSize - pos >= MAX_VARINT_SIZE) {
-        skipRawVarintFastPath();
-      } else {
-        skipRawVarintSlowPath();
-      }
-    }
-
-    private void skipRawVarintFastPath() throws IOException {
-      for (int i = 0; i < MAX_VARINT_SIZE; i++) {
-        if (buffer[pos++] >= 0) {
-          return;
-        }
-      }
-      throw InvalidProtocolBufferException.malformedVarint();
-    }
-
-    private void skipRawVarintSlowPath() throws IOException {
-      for (int i = 0; i < MAX_VARINT_SIZE; i++) {
-        if (readRawByte() >= 0) {
-          return;
-        }
-      }
-      throw InvalidProtocolBufferException.malformedVarint();
-    }
-
-    @Override
-    public long readRawVarint64() throws IOException {
-      // Implementation notes:
-      //
-      // Optimized for one-byte values, expected to be common.
-      // The particular code below was selected from various candidates
-      // empirically, by winning VarintBenchmark.
-      //
-      // Sign extension of (signed) Java bytes is usually a nuisance, but
-      // we exploit it here to more easily obtain the sign of bytes read.
-      // Instead of cleaning up the sign extension bits by masking eagerly,
-      // we delay until we find the final (positive) byte, when we clear all
-      // accumulated bits with one xor.  We depend on javac to constant fold.
-      fastpath:
-      {
-        int tempPos = pos;
-
-        if (bufferSize == tempPos) {
-          break fastpath;
-        }
-
-        final byte[] buffer = this.buffer;
-        long x;
-        int y;
-        if ((y = buffer[tempPos++]) >= 0) {
-          pos = tempPos;
-          return y;
-        } else if (bufferSize - tempPos < 9) {
-          break fastpath;
-        } else if ((y ^= (buffer[tempPos++] << 7)) < 0) {
-          x = y ^ (~0 << 7);
-        } else if ((y ^= (buffer[tempPos++] << 14)) >= 0) {
-          x = y ^ ((~0 << 7) ^ (~0 << 14));
-        } else if ((y ^= (buffer[tempPos++] << 21)) < 0) {
-          x = y ^ ((~0 << 7) ^ (~0 << 14) ^ (~0 << 21));
-        } else if ((x = y ^ ((long) buffer[tempPos++] << 28)) >= 0L) {
-          x ^= (~0L << 7) ^ (~0L << 14) ^ (~0L << 21) ^ (~0L << 28);
-        } else if ((x ^= ((long) buffer[tempPos++] << 35)) < 0L) {
-          x ^= (~0L << 7) ^ (~0L << 14) ^ (~0L << 21) ^ (~0L << 28) ^ (~0L << 35);
-        } else if ((x ^= ((long) buffer[tempPos++] << 42)) >= 0L) {
-          x ^= (~0L << 7) ^ (~0L << 14) ^ (~0L << 21) ^ (~0L << 28) ^ (~0L << 35) ^ (~0L << 42);
-        } else if ((x ^= ((long) buffer[tempPos++] << 49)) < 0L) {
-          x ^=
-              (~0L << 7)
-                  ^ (~0L << 14)
-                  ^ (~0L << 21)
-                  ^ (~0L << 28)
-                  ^ (~0L << 35)
-                  ^ (~0L << 42)
-                  ^ (~0L << 49);
-        } else {
-          x ^= ((long) buffer[tempPos++] << 56);
-          x ^=
-              (~0L << 7)
-                  ^ (~0L << 14)
-                  ^ (~0L << 21)
-                  ^ (~0L << 28)
-                  ^ (~0L << 35)
-                  ^ (~0L << 42)
-                  ^ (~0L << 49)
-                  ^ (~0L << 56);
-          if (x < 0L) {
-            if (buffer[tempPos++] < 0L) {
-              break fastpath; // Will throw malformedVarint()
-            }
-          }
-        }
-        pos = tempPos;
-        return x;
-      }
-      return readRawVarint64SlowPath();
-    }
-
-    @Override
-    long readRawVarint64SlowPath() throws IOException {
-      long result = 0;
-      for (int shift = 0; shift < 64; shift += 7) {
-        final byte b = readRawByte();
-        result |= (long) (b & 0x7F) << shift;
-        if ((b & 0x80) == 0) {
-          return result;
-        }
-      }
-      throw InvalidProtocolBufferException.malformedVarint();
-    }
-
-    @Override
-    public int readRawLittleEndian32() throws IOException {
-      int tempPos = pos;
-
-      if (bufferSize - tempPos < FIXED32_SIZE) {
-        refillBuffer(FIXED32_SIZE);
-        tempPos = pos;
-      }
-
-      final byte[] buffer = this.buffer;
-      pos = tempPos + FIXED32_SIZE;
-      return ((buffer[tempPos] & 0xff)
-          | ((buffer[tempPos + 1] & 0xff) << 8)
-          | ((buffer[tempPos + 2] & 0xff) << 16)
-          | ((buffer[tempPos + 3] & 0xff) << 24));
-    }
-
-    @Override
-    public long readRawLittleEndian64() throws IOException {
-      int tempPos = pos;
-
-      if (bufferSize - tempPos < FIXED64_SIZE) {
-        refillBuffer(FIXED64_SIZE);
-        tempPos = pos;
-      }
-
-      final byte[] buffer = this.buffer;
-      pos = tempPos + FIXED64_SIZE;
-      return (((buffer[tempPos] & 0xffL))
-          | ((buffer[tempPos + 1] & 0xffL) << 8)
-          | ((buffer[tempPos + 2] & 0xffL) << 16)
-          | ((buffer[tempPos + 3] & 0xffL) << 24)
-          | ((buffer[tempPos + 4] & 0xffL) << 32)
-          | ((buffer[tempPos + 5] & 0xffL) << 40)
-          | ((buffer[tempPos + 6] & 0xffL) << 48)
-          | ((buffer[tempPos + 7] & 0xffL) << 56));
-    }
-
-    // -----------------------------------------------------------------
-
-    @Override
-    public void enableAliasing(boolean enabled) {
-      // TODO(nathanmittler): Ideally we should throw here. Do nothing for backward compatibility.
-    }
-
-    @Override
-    public void resetSizeCounter() {
-      totalBytesRetired = -pos;
-    }
-
-    @Override
-    public int pushLimit(int byteLimit) throws InvalidProtocolBufferException {
-      if (byteLimit < 0) {
-        throw InvalidProtocolBufferException.negativeSize();
-      }
-      byteLimit += totalBytesRetired + pos;
-      final int oldLimit = currentLimit;
-      if (byteLimit > oldLimit) {
-        throw InvalidProtocolBufferException.truncatedMessage();
-      }
-      currentLimit = byteLimit;
-
-      recomputeBufferSizeAfterLimit();
-
-      return oldLimit;
-    }
-
-    private void recomputeBufferSizeAfterLimit() {
-      bufferSize += bufferSizeAfterLimit;
-      final int bufferEnd = totalBytesRetired + bufferSize;
-      if (bufferEnd > currentLimit) {
-        // Limit is in current buffer.
-        bufferSizeAfterLimit = bufferEnd - currentLimit;
-        bufferSize -= bufferSizeAfterLimit;
-      } else {
-        bufferSizeAfterLimit = 0;
-      }
-    }
-
-    @Override
-    public void popLimit(final int oldLimit) {
-      currentLimit = oldLimit;
-      recomputeBufferSizeAfterLimit();
-    }
-
-    @Override
-    public int getBytesUntilLimit() {
-      if (currentLimit == Integer.MAX_VALUE) {
-        return -1;
-      }
-
-      final int currentAbsolutePosition = totalBytesRetired + pos;
-      return currentLimit - currentAbsolutePosition;
-    }
-
-    @Override
-    public boolean isAtEnd() throws IOException {
-      return pos == bufferSize && !tryRefillBuffer(1);
-    }
-
-    @Override
-    public int getTotalBytesRead() {
-      return totalBytesRetired + pos;
-    }
-
-    private interface RefillCallback {
-      void onRefill();
-    }
-
-    private RefillCallback refillCallback = null;
-
-    /**
-     * Reads more bytes from the input, making at least {@code n} bytes available in the buffer.
-     * Caller must ensure that the requested space is not yet available, and that the requested
-     * space is less than BUFFER_SIZE.
-     *
-     * @throws InvalidProtocolBufferException The end of the stream or the current limit was
-     *     reached.
-     */
-    private void refillBuffer(int n) throws IOException {
-      if (!tryRefillBuffer(n)) {
-        // We have to distinguish the exception between sizeLimitExceeded and truncatedMessage. So
-        // we just throw an sizeLimitExceeded exception here if it exceeds the sizeLimit
-        if (n > sizeLimit - totalBytesRetired - pos) {
-          throw InvalidProtocolBufferException.sizeLimitExceeded();
-        } else {
-          throw InvalidProtocolBufferException.truncatedMessage();
-        }
-      }
-    }
-
-    /**
-     * Tries to read more bytes from the input, making at least {@code n} bytes available in the
-     * buffer. Caller must ensure that the requested space is not yet available, and that the
-     * requested space is less than BUFFER_SIZE.
-     *
-     * @return {@code true} If the bytes could be made available; {@code false} 1. Current at the
-     *     end of the stream 2. The current limit was reached 3. The total size limit was reached
-     */
-    private boolean tryRefillBuffer(int n) throws IOException {
-      if (pos + n <= bufferSize) {
-        throw new IllegalStateException(
-            "refillBuffer() called when " + n + " bytes were already available in buffer");
-      }
-
-      // Check whether the size of total message needs to read is bigger than the size limit.
-      // We shouldn't throw an exception here as isAtEnd() function needs to get this function's
-      // return as the result.
-      if (n > sizeLimit - totalBytesRetired - pos) {
-        return false;
-      }
-
-      // Shouldn't throw the exception here either.
-      if (totalBytesRetired + pos + n > currentLimit) {
-        // Oops, we hit a limit.
-        return false;
-      }
-
-      if (refillCallback != null) {
-        refillCallback.onRefill();
-      }
-
-      int tempPos = pos;
-      if (tempPos > 0) {
-        if (bufferSize > tempPos) {
-          System.arraycopy(buffer, tempPos, buffer, 0, bufferSize - tempPos);
-        }
-        totalBytesRetired += tempPos;
-        bufferSize -= tempPos;
-        pos = 0;
-      }
-
-      // Here we should refill the buffer as many bytes as possible.
-      int bytesRead =
-          read(
-              input,
-              buffer,
-              bufferSize,
-              Math.min(
-                  //  the size of allocated but unused bytes in the buffer
-                  buffer.length - bufferSize,
-                  //  do not exceed the total bytes limit
-                  sizeLimit - totalBytesRetired - bufferSize));
-      if (bytesRead == 0 || bytesRead < -1 || bytesRead > buffer.length) {
-        throw new IllegalStateException(
-            input.getClass()
-                + "#read(byte[]) returned invalid result: "
-                + bytesRead
-                + "\nThe InputStream implementation is buggy.");
-      }
-      if (bytesRead > 0) {
-        bufferSize += bytesRead;
-        recomputeBufferSizeAfterLimit();
-        return (bufferSize >= n) ? true : tryRefillBuffer(n);
-      }
-
-      return false;
-    }
-
-    @Override
-    public byte readRawByte() throws IOException {
-      if (pos == bufferSize) {
-        refillBuffer(1);
-      }
-      return buffer[pos++];
-    }
-
-    @Override
-    public byte[] readRawBytes(final int size) throws IOException {
-      final int tempPos = pos;
-      if (size <= (bufferSize - tempPos) && size > 0) {
-        pos = tempPos + size;
-        return Arrays.copyOfRange(buffer, tempPos, tempPos + size);
-      } else {
-        // TODO(dweis): Do we want to protect from malicious input streams here?
-        return readRawBytesSlowPath(size, /* ensureNoLeakedReferences= */ false);
-      }
-    }
-
-    /**
-     * Exactly like readRawBytes, but caller must have already checked the fast path: (size <=
-     * (bufferSize - pos) && size > 0)
-     * 
-     * If ensureNoLeakedReferences is true, the value is guaranteed to have not escaped to
-     * untrusted code.
-     */
-    private byte[] readRawBytesSlowPath(
-        final int size, boolean ensureNoLeakedReferences) throws IOException {
-      // Attempt to read the data in one byte array when it's safe to do.
-      byte[] result = readRawBytesSlowPathOneChunk(size);
-      if (result != null) {
-        return ensureNoLeakedReferences ? result.clone() : result;
-      }
-
-      final int originalBufferPos = pos;
-      final int bufferedBytes = bufferSize - pos;
-
-      // Mark the current buffer consumed.
-      totalBytesRetired += bufferSize;
-      pos = 0;
-      bufferSize = 0;
-
-      // Determine the number of bytes we need to read from the input stream.
-      int sizeLeft = size - bufferedBytes;
-
-      // The size is very large. For security reasons we read them in small
-      // chunks.
-      List<byte[]> chunks = readRawBytesSlowPathRemainingChunks(sizeLeft);
-
-      // OK, got everything.  Now concatenate it all into one buffer.
-      final byte[] bytes = new byte[size];
-
-      // Start by copying the leftover bytes from this.buffer.
-      System.arraycopy(buffer, originalBufferPos, bytes, 0, bufferedBytes);
-
-      // And now all the chunks.
-      int tempPos = bufferedBytes;
-      for (final byte[] chunk : chunks) {
-        System.arraycopy(chunk, 0, bytes, tempPos, chunk.length);
-        tempPos += chunk.length;
-      }
-
-      // Done.
-      return bytes;
-    }
-
-    /**
-     * Attempts to read the data in one byte array when it's safe to do. Returns null if the size to
-     * read is too large and needs to be allocated in smaller chunks for security reasons.
-     * 
-     * Returns a byte[] that may have escaped to user code via InputStream APIs.
-     */
-    private byte[] readRawBytesSlowPathOneChunk(final int size) throws IOException {
-      if (size == 0) {
-        return Internal.EMPTY_BYTE_ARRAY;
-      }
-      if (size < 0) {
-        throw InvalidProtocolBufferException.negativeSize();
-      }
-
-      // Integer-overflow-conscious check that the message size so far has not exceeded sizeLimit.
-      int currentMessageSize = totalBytesRetired + pos + size;
-      if (currentMessageSize - sizeLimit > 0) {
-        throw InvalidProtocolBufferException.sizeLimitExceeded();
-      }
-
-      // Verify that the message size so far has not exceeded currentLimit.
-      if (currentMessageSize > currentLimit) {
-        // Read to the end of the stream anyway.
-        skipRawBytes(currentLimit - totalBytesRetired - pos);
-        throw InvalidProtocolBufferException.truncatedMessage();
-      }
-
-      final int bufferedBytes = bufferSize - pos;
-      // Determine the number of bytes we need to read from the input stream.
-      int sizeLeft = size - bufferedBytes;
-      // TODO(nathanmittler): Consider using a value larger than DEFAULT_BUFFER_SIZE.
-      if (sizeLeft < DEFAULT_BUFFER_SIZE || sizeLeft <= available(input)) {
-        // Either the bytes we need are known to be available, or the required buffer is
-        // within an allowed threshold - go ahead and allocate the buffer now.
-        final byte[] bytes = new byte[size];
-
-        // Copy all of the buffered bytes to the result buffer.
-        System.arraycopy(buffer, pos, bytes, 0, bufferedBytes);
-        totalBytesRetired += bufferSize;
-        pos = 0;
-        bufferSize = 0;
-
-        // Fill the remaining bytes from the input stream.
-        int tempPos = bufferedBytes;
-        while (tempPos < bytes.length) {
-          int n = read(input, bytes, tempPos, size - tempPos);
-          if (n == -1) {
-            throw InvalidProtocolBufferException.truncatedMessage();
-          }
-          totalBytesRetired += n;
-          tempPos += n;
-        }
-
-        return bytes;
-      }
-
-      return null;
-    }
-
-    /**
-     * Reads the remaining data in small chunks from the input stream.
-     * 
-     * Returns a byte[] that may have escaped to user code via InputStream APIs.
-     */
-    private List<byte[]> readRawBytesSlowPathRemainingChunks(int sizeLeft) throws IOException {
-      // The size is very large.  For security reasons, we can't allocate the
-      // entire byte array yet.  The size comes directly from the input, so a
-      // maliciously-crafted message could provide a bogus very large size in
-      // order to trick the app into allocating a lot of memory.  We avoid this
-      // by allocating and reading only a small chunk at a time, so that the
-      // malicious message must actually *be* extremely large to cause
-      // problems.  Meanwhile, we limit the allowed size of a message elsewhere.
-      final List<byte[]> chunks = new ArrayList<>();
-
-      while (sizeLeft > 0) {
-        // TODO(nathanmittler): Consider using a value larger than DEFAULT_BUFFER_SIZE.
-        final byte[] chunk = new byte[Math.min(sizeLeft, DEFAULT_BUFFER_SIZE)];
-        int tempPos = 0;
-        while (tempPos < chunk.length) {
-          final int n = input.read(chunk, tempPos, chunk.length - tempPos);
-          if (n == -1) {
-            throw InvalidProtocolBufferException.truncatedMessage();
-          }
-          totalBytesRetired += n;
-          tempPos += n;
-        }
-        sizeLeft -= chunk.length;
-        chunks.add(chunk);
-      }
-
-      return chunks;
-    }
-
-    /**
-     * Like readBytes, but caller must have already checked the fast path: (size <= (bufferSize -
-     * pos) && size > 0 || size == 0)
-     */
-    private ByteString readBytesSlowPath(final int size) throws IOException {
-      final byte[] result = readRawBytesSlowPathOneChunk(size);
-      if (result != null) {
-        // We must copy as the byte array was handed off to the InputStream and a malicious
-        // implementation could retain a reference.
-        return ByteString.copyFrom(result);
-      }
-
-      final int originalBufferPos = pos;
-      final int bufferedBytes = bufferSize - pos;
-
-      // Mark the current buffer consumed.
-      totalBytesRetired += bufferSize;
-      pos = 0;
-      bufferSize = 0;
-
-      // Determine the number of bytes we need to read from the input stream.
-      int sizeLeft = size - bufferedBytes;
-
-      // The size is very large. For security reasons we read them in small
-      // chunks.
-      List<byte[]> chunks = readRawBytesSlowPathRemainingChunks(sizeLeft);
-
-      // OK, got everything.  Now concatenate it all into one buffer.
-      final byte[] bytes = new byte[size];
-
-      // Start by copying the leftover bytes from this.buffer.
-      System.arraycopy(buffer, originalBufferPos, bytes, 0, bufferedBytes);
-
-      // And now all the chunks.
-      int tempPos = bufferedBytes;
-      for (final byte[] chunk : chunks) {
-        System.arraycopy(chunk, 0, bytes, tempPos, chunk.length);
-        tempPos += chunk.length;
-      }
-      
-      return ByteString.wrap(bytes);
-    }
-
-    @Override
-    public void skipRawBytes(final int size) throws IOException {
-      if (size <= (bufferSize - pos) && size >= 0) {
-        // We have all the bytes we need already.
-        pos += size;
-      } else {
-        skipRawBytesSlowPath(size);
-      }
-    }
-
-    /**
-     * Exactly like skipRawBytes, but caller must have already checked the fast path: (size <=
-     * (bufferSize - pos) && size >= 0)
-     */
-    private void skipRawBytesSlowPath(final int size) throws IOException {
-      if (size < 0) {
-        throw InvalidProtocolBufferException.negativeSize();
-      }
-
-      if (totalBytesRetired + pos + size > currentLimit) {
-        // Read to the end of the stream anyway.
-        skipRawBytes(currentLimit - totalBytesRetired - pos);
-        // Then fail.
-        throw InvalidProtocolBufferException.truncatedMessage();
-      }
-
-      int totalSkipped = 0;
-      if (refillCallback == null) {
-        // Skipping more bytes than are in the buffer.  First skip what we have.
-        totalBytesRetired += pos;
-        totalSkipped = bufferSize - pos;
-        bufferSize = 0;
-        pos = 0;
-
-        try {
-          while (totalSkipped < size) {
-            int toSkip = size - totalSkipped;
-            long skipped = skip(input, toSkip);
-            if (skipped < 0 || skipped > toSkip) {
-              throw new IllegalStateException(
-                  input.getClass()
-                      + "#skip returned invalid result: "
-                      + skipped
-                      + "\nThe InputStream implementation is buggy.");
-            } else if (skipped == 0) {
-              // The API contract of skip() permits an inputstream to skip zero bytes for any reason
-              // it wants. In particular, ByteArrayInputStream will just return zero over and over
-              // when it's at the end of its input. In order to actually confirm that we've hit the
-              // end of input, we need to issue a read call via the other path.
-              break;
-            }
-            totalSkipped += (int) skipped;
-          }
-        } finally {
-          totalBytesRetired += totalSkipped;
-          recomputeBufferSizeAfterLimit();
-        }
-      }
-      if (totalSkipped < size) {
-        // Skipping more bytes than are in the buffer.  First skip what we have.
-        int tempPos = bufferSize - pos;
-        pos = bufferSize;
-
-        // Keep refilling the buffer until we get to the point we wanted to skip to.
-        // This has the side effect of ensuring the limits are updated correctly.
-        refillBuffer(1);
-        while (size - tempPos > bufferSize) {
-          tempPos += bufferSize;
-          pos = bufferSize;
-          refillBuffer(1);
-        }
-
-        pos = size - tempPos;
-      }
-    }
-  }
-
-  /**
-   * Implementation of {@link CodedInputStream} that uses an {@link Iterable <ByteBuffer>} as the
-   * data source. Requires the use of {@code sun.misc.Unsafe} to perform fast reads on the buffer.
-   */
-  private static final class IterableDirectByteBufferDecoder extends CodedInputStream {
-    /** The object that need to decode. */
-    private final Iterable<ByteBuffer> input;
-    /** The {@link Iterator} with type {@link ByteBuffer} of {@code input} */
-    private final Iterator<ByteBuffer> iterator;
-    /** The current ByteBuffer; */
-    private ByteBuffer currentByteBuffer;
-    /**
-     * If {@code true}, indicates that all the buffers are backing a {@link ByteString} and are
-     * therefore considered to be an immutable input source.
-     */
-    private final boolean immutable;
-    /**
-     * If {@code true}, indicates that calls to read {@link ByteString} or {@code byte[]}
-     * <strong>may</strong> return slices of the underlying buffer, rather than copies.
-     */
-    private boolean enableAliasing;
-    /** The global total message length limit */
-    private int totalBufferSize;
-    /** The amount of available data in the input beyond {@link #currentLimit}. */
-    private int bufferSizeAfterCurrentLimit;
-    /** The absolute position of the end of the current message. */
-    private int currentLimit = Integer.MAX_VALUE;
-    /** The last tag that was read from this stream. */
-    private int lastTag;
-    /** Total Bytes have been Read from the {@link Iterable} {@link ByteBuffer} */
-    private int totalBytesRead;
-    /** The start position offset of the whole message, used as to reset the totalBytesRead */
-    private int startOffset;
-    /** The current position for current ByteBuffer */
-    private long currentByteBufferPos;
-
-    private long currentByteBufferStartPos;
-    /**
-     * If the current ByteBuffer is unsafe-direct based, currentAddress is the start address of this
-     * ByteBuffer; otherwise should be zero.
-     */
-    private long currentAddress;
-    /** The limit position for current ByteBuffer */
-    private long currentByteBufferLimit;
-
-    /**
-     * The constructor of {@code Iterable<ByteBuffer>} decoder.
-     *
-     * @param inputBufs The input data.
-     * @param size The total size of the input data.
-     * @param immutableFlag whether the input data is immutable.
-     */
-    private IterableDirectByteBufferDecoder(
-        Iterable<ByteBuffer> inputBufs, int size, boolean immutableFlag) {
-      totalBufferSize = size;
-      input = inputBufs;
-      iterator = input.iterator();
-      immutable = immutableFlag;
-      startOffset = totalBytesRead = 0;
-      if (size == 0) {
-        currentByteBuffer = EMPTY_BYTE_BUFFER;
-        currentByteBufferPos = 0;
-        currentByteBufferStartPos = 0;
-        currentByteBufferLimit = 0;
-        currentAddress = 0;
-      } else {
-        tryGetNextByteBuffer();
-      }
-    }
-
-    /** To get the next ByteBuffer from {@code input}, and then update the parameters */
-    private void getNextByteBuffer() throws InvalidProtocolBufferException {
-      if (!iterator.hasNext()) {
-        throw InvalidProtocolBufferException.truncatedMessage();
-      }
-      tryGetNextByteBuffer();
-    }
-
-    private void tryGetNextByteBuffer() {
-      currentByteBuffer = iterator.next();
-      totalBytesRead += (int) (currentByteBufferPos - currentByteBufferStartPos);
-      currentByteBufferPos = currentByteBuffer.position();
-      currentByteBufferStartPos = currentByteBufferPos;
-      currentByteBufferLimit = currentByteBuffer.limit();
-      currentAddress = UnsafeUtil.addressOffset(currentByteBuffer);
-      currentByteBufferPos += currentAddress;
-      currentByteBufferStartPos += currentAddress;
-      currentByteBufferLimit += currentAddress;
-    }
-
-    @Override
-    public int readTag() throws IOException {
-      if (isAtEnd()) {
-        lastTag = 0;
-        return 0;
-      }
-
-      lastTag = readRawVarint32();
-      if (WireFormat.getTagFieldNumber(lastTag) == 0) {
-        // If we actually read zero (or any tag number corresponding to field
-        // number zero), that's not a valid tag.
-        throw InvalidProtocolBufferException.invalidTag();
-      }
-      return lastTag;
-    }
-
-    @Override
-    public void checkLastTagWas(final int value) throws InvalidProtocolBufferException {
-      if (lastTag != value) {
-        throw InvalidProtocolBufferException.invalidEndTag();
-      }
-    }
-
-    @Override
-    public int getLastTag() {
-      return lastTag;
-    }
-
-    @Override
-    public boolean skipField(final int tag) throws IOException {
-      switch (WireFormat.getTagWireType(tag)) {
-        case WireFormat.WIRETYPE_VARINT:
-          skipRawVarint();
-          return true;
-        case WireFormat.WIRETYPE_FIXED64:
-          skipRawBytes(FIXED64_SIZE);
-          return true;
-        case WireFormat.WIRETYPE_LENGTH_DELIMITED:
-          skipRawBytes(readRawVarint32());
-          return true;
-        case WireFormat.WIRETYPE_START_GROUP:
-          skipMessage();
-          checkLastTagWas(
-              WireFormat.makeTag(WireFormat.getTagFieldNumber(tag), WireFormat.WIRETYPE_END_GROUP));
-          return true;
-        case WireFormat.WIRETYPE_END_GROUP:
-          return false;
-        case WireFormat.WIRETYPE_FIXED32:
-          skipRawBytes(FIXED32_SIZE);
-          return true;
-        default:
-          throw InvalidProtocolBufferException.invalidWireType();
-      }
-    }
-
-    @Override
-    public boolean skipField(final int tag, final CodedOutputStream output) throws IOException {
-      switch (WireFormat.getTagWireType(tag)) {
-        case WireFormat.WIRETYPE_VARINT:
-          {
-            long value = readInt64();
-            output.writeUInt32NoTag(tag);
-            output.writeUInt64NoTag(value);
-            return true;
-          }
-        case WireFormat.WIRETYPE_FIXED64:
-          {
-            long value = readRawLittleEndian64();
-            output.writeUInt32NoTag(tag);
-            output.writeFixed64NoTag(value);
-            return true;
-          }
-        case WireFormat.WIRETYPE_LENGTH_DELIMITED:
-          {
-            ByteString value = readBytes();
-            output.writeUInt32NoTag(tag);
-            output.writeBytesNoTag(value);
-            return true;
-          }
-        case WireFormat.WIRETYPE_START_GROUP:
-          {
-            output.writeUInt32NoTag(tag);
-            skipMessage(output);
-            int endtag =
-                WireFormat.makeTag(
-                    WireFormat.getTagFieldNumber(tag), WireFormat.WIRETYPE_END_GROUP);
-            checkLastTagWas(endtag);
-            output.writeUInt32NoTag(endtag);
-            return true;
-          }
-        case WireFormat.WIRETYPE_END_GROUP:
-          {
-            return false;
-          }
-        case WireFormat.WIRETYPE_FIXED32:
-          {
-            int value = readRawLittleEndian32();
-            output.writeUInt32NoTag(tag);
-            output.writeFixed32NoTag(value);
-            return true;
-          }
-        default:
-          throw InvalidProtocolBufferException.invalidWireType();
-      }
-    }
-
-    @Override
-    public void skipMessage() throws IOException {
-      while (true) {
-        final int tag = readTag();
-        if (tag == 0 || !skipField(tag)) {
-          return;
-        }
-      }
-    }
-
-    @Override
-    public void skipMessage(CodedOutputStream output) throws IOException {
-      while (true) {
-        final int tag = readTag();
-        if (tag == 0 || !skipField(tag, output)) {
-          return;
-        }
-      }
-    }
-
-    // -----------------------------------------------------------------
-
-    @Override
-    public double readDouble() throws IOException {
-      return Double.longBitsToDouble(readRawLittleEndian64());
-    }
-
-    @Override
-    public float readFloat() throws IOException {
-      return Float.intBitsToFloat(readRawLittleEndian32());
-    }
-
-    @Override
-    public long readUInt64() throws IOException {
-      return readRawVarint64();
-    }
-
-    @Override
-    public long readInt64() throws IOException {
-      return readRawVarint64();
-    }
-
-    @Override
-    public int readInt32() throws IOException {
-      return readRawVarint32();
-    }
-
-    @Override
-    public long readFixed64() throws IOException {
-      return readRawLittleEndian64();
-    }
-
-    @Override
-    public int readFixed32() throws IOException {
-      return readRawLittleEndian32();
-    }
-
-    @Override
-    public boolean readBool() throws IOException {
-      return readRawVarint64() != 0;
-    }
-
-    @Override
-    public String readString() throws IOException {
-      final int size = readRawVarint32();
-      if (size > 0 && size <= currentByteBufferLimit - currentByteBufferPos) {
-        byte[] bytes = new byte[size];
-        UnsafeUtil.copyMemory(currentByteBufferPos, bytes, 0, size);
-        String result = new String(bytes, UTF_8);
-        currentByteBufferPos += size;
-        return result;
-      } else if (size > 0 && size <= remaining()) {
-        // TODO(yilunchong): To use an underlying bytes[] instead of allocating a new bytes[]
-        byte[] bytes = new byte[size];
-        readRawBytesTo(bytes, 0, size);
-        String result = new String(bytes, UTF_8);
-        return result;
-      }
-
-      if (size == 0) {
-        return "";
-      }
-      if (size < 0) {
-        throw InvalidProtocolBufferException.negativeSize();
-      }
-      throw InvalidProtocolBufferException.truncatedMessage();
-    }
-
-    @Override
-    public String readStringRequireUtf8() throws IOException {
-      final int size = readRawVarint32();
-      if (size > 0 && size <= currentByteBufferLimit - currentByteBufferPos) {
-        final int bufferPos = (int) (currentByteBufferPos - currentByteBufferStartPos);
-        String result = Utf8.decodeUtf8(currentByteBuffer, bufferPos, size);
-        currentByteBufferPos += size;
-        return result;
-      }
-      if (size >= 0 && size <= remaining()) {
-        byte[] bytes = new byte[size];
-        readRawBytesTo(bytes, 0, size);
-        return Utf8.decodeUtf8(bytes, 0, size);
-      }
-
-      if (size == 0) {
-        return "";
-      }
-      if (size <= 0) {
-        throw InvalidProtocolBufferException.negativeSize();
-      }
-      throw InvalidProtocolBufferException.truncatedMessage();
-    }
-
-    @Override
-    public void readGroup(
-        final int fieldNumber,
-        final MessageLite.Builder builder,
-        final ExtensionRegistryLite extensionRegistry)
-        throws IOException {
-      checkRecursionLimit();
-      ++recursionDepth;
-      builder.mergeFrom(this, extensionRegistry);
-      checkLastTagWas(WireFormat.makeTag(fieldNumber, WireFormat.WIRETYPE_END_GROUP));
-      --recursionDepth;
-    }
-
-
-    @Override
-    public <T extends MessageLite> T readGroup(
-        final int fieldNumber,
-        final Parser<T> parser,
-        final ExtensionRegistryLite extensionRegistry)
-        throws IOException {
-      checkRecursionLimit();
-      ++recursionDepth;
-      T result = parser.parsePartialFrom(this, extensionRegistry);
-      checkLastTagWas(WireFormat.makeTag(fieldNumber, WireFormat.WIRETYPE_END_GROUP));
-      --recursionDepth;
-      return result;
-    }
-
-    @Deprecated
-    @Override
-    public void readUnknownGroup(final int fieldNumber, final MessageLite.Builder builder)
-        throws IOException {
-      readGroup(fieldNumber, builder, ExtensionRegistryLite.getEmptyRegistry());
-    }
-
-    @Override
-    public void readMessage(
-        final MessageLite.Builder builder, final ExtensionRegistryLite extensionRegistry)
-        throws IOException {
-      final int length = readRawVarint32();
-      checkRecursionLimit();
-      final int oldLimit = pushLimit(length);
-      ++recursionDepth;
-      builder.mergeFrom(this, extensionRegistry);
-      checkLastTagWas(0);
-      --recursionDepth;
-      if (getBytesUntilLimit() != 0) {
-        throw InvalidProtocolBufferException.truncatedMessage();
-      }
-      popLimit(oldLimit);
-    }
-
-
-    @Override
-    public <T extends MessageLite> T readMessage(
-        final Parser<T> parser, final ExtensionRegistryLite extensionRegistry) throws IOException {
-      int length = readRawVarint32();
-      checkRecursionLimit();
-      final int oldLimit = pushLimit(length);
-      ++recursionDepth;
-      T result = parser.parsePartialFrom(this, extensionRegistry);
-      checkLastTagWas(0);
-      --recursionDepth;
-      if (getBytesUntilLimit() != 0) {
-        throw InvalidProtocolBufferException.truncatedMessage();
-      }
-      popLimit(oldLimit);
-      return result;
-    }
-
-    @Override
-    public ByteString readBytes() throws IOException {
-      final int size = readRawVarint32();
-      if (size > 0 && size <= currentByteBufferLimit - currentByteBufferPos) {
-        if (immutable && enableAliasing) {
-          final int idx = (int) (currentByteBufferPos - currentAddress);
-          final ByteString result = ByteString.wrap(slice(idx, idx + size));
-          currentByteBufferPos += size;
-          return result;
-        } else {
-          byte[] bytes = new byte[size];
-          UnsafeUtil.copyMemory(currentByteBufferPos, bytes, 0, size);
-          currentByteBufferPos += size;
-          return ByteString.wrap(bytes);
-        }
-      } else if (size > 0 && size <= remaining()) {
-        if (immutable && enableAliasing) {
-          ArrayList<ByteString> byteStrings = new ArrayList<>();
-          int l = size;
-          while (l > 0) {
-            if (currentRemaining() == 0) {
-              getNextByteBuffer();
-            }
-            int bytesToCopy = Math.min(l, (int) currentRemaining());
-            int idx = (int) (currentByteBufferPos - currentAddress);
-            byteStrings.add(ByteString.wrap(slice(idx, idx + bytesToCopy)));
-            l -= bytesToCopy;
-            currentByteBufferPos += bytesToCopy;
-          }
-          return ByteString.copyFrom(byteStrings);
-        } else {
-          byte[] temp = new byte[size];
-          readRawBytesTo(temp, 0, size);
-          return ByteString.wrap(temp);
-        }
-      }
-
-      if (size == 0) {
-        return ByteString.EMPTY;
-      }
-      if (size < 0) {
-        throw InvalidProtocolBufferException.negativeSize();
-      }
-      throw InvalidProtocolBufferException.truncatedMessage();
-    }
-
-    @Override
-    public byte[] readByteArray() throws IOException {
-      return readRawBytes(readRawVarint32());
-    }
-
-    @Override
-    public ByteBuffer readByteBuffer() throws IOException {
-      final int size = readRawVarint32();
-      if (size > 0 && size <= currentRemaining()) {
-        if (!immutable && enableAliasing) {
-          currentByteBufferPos += size;
-          return slice(
-              (int) (currentByteBufferPos - currentAddress - size),
-              (int) (currentByteBufferPos - currentAddress));
-        } else {
-          byte[] bytes = new byte[size];
-          UnsafeUtil.copyMemory(currentByteBufferPos, bytes, 0, size);
-          currentByteBufferPos += size;
-          return ByteBuffer.wrap(bytes);
-        }
-      } else if (size > 0 && size <= remaining()) {
-        byte[] temp = new byte[size];
-        readRawBytesTo(temp, 0, size);
-        return ByteBuffer.wrap(temp);
-      }
-
-      if (size == 0) {
-        return EMPTY_BYTE_BUFFER;
-      }
-      if (size < 0) {
-        throw InvalidProtocolBufferException.negativeSize();
-      }
-      throw InvalidProtocolBufferException.truncatedMessage();
-    }
-
-    @Override
-    public int readUInt32() throws IOException {
-      return readRawVarint32();
-    }
-
-    @Override
-    public int readEnum() throws IOException {
-      return readRawVarint32();
-    }
-
-    @Override
-    public int readSFixed32() throws IOException {
-      return readRawLittleEndian32();
-    }
-
-    @Override
-    public long readSFixed64() throws IOException {
-      return readRawLittleEndian64();
-    }
-
-    @Override
-    public int readSInt32() throws IOException {
-      return decodeZigZag32(readRawVarint32());
-    }
-
-    @Override
-    public long readSInt64() throws IOException {
-      return decodeZigZag64(readRawVarint64());
-    }
-
-    @Override
-    public int readRawVarint32() throws IOException {
-      fastpath:
-      {
-        long tempPos = currentByteBufferPos;
-
-        if (currentByteBufferLimit == currentByteBufferPos) {
-          break fastpath;
-        }
-
-        int x;
-        if ((x = UnsafeUtil.getByte(tempPos++)) >= 0) {
-          currentByteBufferPos++;
-          return x;
-        } else if (currentByteBufferLimit - currentByteBufferPos < 10) {
-          break fastpath;
-        } else if ((x ^= (UnsafeUtil.getByte(tempPos++) << 7)) < 0) {
-          x ^= (~0 << 7);
-        } else if ((x ^= (UnsafeUtil.getByte(tempPos++) << 14)) >= 0) {
-          x ^= (~0 << 7) ^ (~0 << 14);
-        } else if ((x ^= (UnsafeUtil.getByte(tempPos++) << 21)) < 0) {
-          x ^= (~0 << 7) ^ (~0 << 14) ^ (~0 << 21);
-        } else {
-          int y = UnsafeUtil.getByte(tempPos++);
-          x ^= y << 28;
-          x ^= (~0 << 7) ^ (~0 << 14) ^ (~0 << 21) ^ (~0 << 28);
-          if (y < 0
-              && UnsafeUtil.getByte(tempPos++) < 0
-              && UnsafeUtil.getByte(tempPos++) < 0
-              && UnsafeUtil.getByte(tempPos++) < 0
-              && UnsafeUtil.getByte(tempPos++) < 0
-              && UnsafeUtil.getByte(tempPos++) < 0) {
-            break fastpath; // Will throw malformedVarint()
-          }
-        }
-        currentByteBufferPos = tempPos;
-        return x;
-      }
-      return (int) readRawVarint64SlowPath();
-    }
-
-    @Override
-    public long readRawVarint64() throws IOException {
-      fastpath:
-      {
-        long tempPos = currentByteBufferPos;
-
-        if (currentByteBufferLimit == currentByteBufferPos) {
-          break fastpath;
-        }
-
-        long x;
-        int y;
-        if ((y = UnsafeUtil.getByte(tempPos++)) >= 0) {
-          currentByteBufferPos++;
-          return y;
-        } else if (currentByteBufferLimit - currentByteBufferPos < 10) {
-          break fastpath;
-        } else if ((y ^= (UnsafeUtil.getByte(tempPos++) << 7)) < 0) {
-          x = y ^ (~0 << 7);
-        } else if ((y ^= (UnsafeUtil.getByte(tempPos++) << 14)) >= 0) {
-          x = y ^ ((~0 << 7) ^ (~0 << 14));
-        } else if ((y ^= (UnsafeUtil.getByte(tempPos++) << 21)) < 0) {
-          x = y ^ ((~0 << 7) ^ (~0 << 14) ^ (~0 << 21));
-        } else if ((x = y ^ ((long) UnsafeUtil.getByte(tempPos++) << 28)) >= 0L) {
-          x ^= (~0L << 7) ^ (~0L << 14) ^ (~0L << 21) ^ (~0L << 28);
-        } else if ((x ^= ((long) UnsafeUtil.getByte(tempPos++) << 35)) < 0L) {
-          x ^= (~0L << 7) ^ (~0L << 14) ^ (~0L << 21) ^ (~0L << 28) ^ (~0L << 35);
-        } else if ((x ^= ((long) UnsafeUtil.getByte(tempPos++) << 42)) >= 0L) {
-          x ^= (~0L << 7) ^ (~0L << 14) ^ (~0L << 21) ^ (~0L << 28) ^ (~0L << 35) ^ (~0L << 42);
-        } else if ((x ^= ((long) UnsafeUtil.getByte(tempPos++) << 49)) < 0L) {
-          x ^=
-              (~0L << 7)
-                  ^ (~0L << 14)
-                  ^ (~0L << 21)
-                  ^ (~0L << 28)
-                  ^ (~0L << 35)
-                  ^ (~0L << 42)
-                  ^ (~0L << 49);
-        } else {
-          x ^= ((long) UnsafeUtil.getByte(tempPos++) << 56);
-          x ^=
-              (~0L << 7)
-                  ^ (~0L << 14)
-                  ^ (~0L << 21)
-                  ^ (~0L << 28)
-                  ^ (~0L << 35)
-                  ^ (~0L << 42)
-                  ^ (~0L << 49)
-                  ^ (~0L << 56);
-          if (x < 0L) {
-            if (UnsafeUtil.getByte(tempPos++) < 0L) {
-              break fastpath; // Will throw malformedVarint()
-            }
-          }
-        }
-        currentByteBufferPos = tempPos;
-        return x;
-      }
-      return readRawVarint64SlowPath();
-    }
-
-    @Override
-    long readRawVarint64SlowPath() throws IOException {
-      long result = 0;
-      for (int shift = 0; shift < 64; shift += 7) {
-        final byte b = readRawByte();
-        result |= (long) (b & 0x7F) << shift;
-        if ((b & 0x80) == 0) {
-          return result;
-        }
-      }
-      throw InvalidProtocolBufferException.malformedVarint();
-    }
-
-    @Override
-    public int readRawLittleEndian32() throws IOException {
-      if (currentRemaining() >= FIXED32_SIZE) {
-        long tempPos = currentByteBufferPos;
-        currentByteBufferPos += FIXED32_SIZE;
-        return ((UnsafeUtil.getByte(tempPos) & 0xff)
-            | ((UnsafeUtil.getByte(tempPos + 1) & 0xff) << 8)
-            | ((UnsafeUtil.getByte(tempPos + 2) & 0xff) << 16)
-            | ((UnsafeUtil.getByte(tempPos + 3) & 0xff) << 24));
-      }
-      return ((readRawByte() & 0xff)
-          | ((readRawByte() & 0xff) << 8)
-          | ((readRawByte() & 0xff) << 16)
-          | ((readRawByte() & 0xff) << 24));
-    }
-
-    @Override
-    public long readRawLittleEndian64() throws IOException {
-      if (currentRemaining() >= FIXED64_SIZE) {
-        long tempPos = currentByteBufferPos;
-        currentByteBufferPos += FIXED64_SIZE;
-        return ((UnsafeUtil.getByte(tempPos) & 0xffL)
-            | ((UnsafeUtil.getByte(tempPos + 1) & 0xffL) << 8)
-            | ((UnsafeUtil.getByte(tempPos + 2) & 0xffL) << 16)
-            | ((UnsafeUtil.getByte(tempPos + 3) & 0xffL) << 24)
-            | ((UnsafeUtil.getByte(tempPos + 4) & 0xffL) << 32)
-            | ((UnsafeUtil.getByte(tempPos + 5) & 0xffL) << 40)
-            | ((UnsafeUtil.getByte(tempPos + 6) & 0xffL) << 48)
-            | ((UnsafeUtil.getByte(tempPos + 7) & 0xffL) << 56));
-      }
-      return ((readRawByte() & 0xffL)
-          | ((readRawByte() & 0xffL) << 8)
-          | ((readRawByte() & 0xffL) << 16)
-          | ((readRawByte() & 0xffL) << 24)
-          | ((readRawByte() & 0xffL) << 32)
-          | ((readRawByte() & 0xffL) << 40)
-          | ((readRawByte() & 0xffL) << 48)
-          | ((readRawByte() & 0xffL) << 56));
-    }
-
-    @Override
-    public void enableAliasing(boolean enabled) {
-      this.enableAliasing = enabled;
-    }
-
-    @Override
-    public void resetSizeCounter() {
-      startOffset = (int) (totalBytesRead + currentByteBufferPos - currentByteBufferStartPos);
-    }
-
-    @Override
-    public int pushLimit(int byteLimit) throws InvalidProtocolBufferException {
-      if (byteLimit < 0) {
-        throw InvalidProtocolBufferException.negativeSize();
-      }
-      byteLimit += getTotalBytesRead();
-      final int oldLimit = currentLimit;
-      if (byteLimit > oldLimit) {
-        throw InvalidProtocolBufferException.truncatedMessage();
-      }
-      currentLimit = byteLimit;
-
-      recomputeBufferSizeAfterLimit();
-
-      return oldLimit;
-    }
-
-    private void recomputeBufferSizeAfterLimit() {
-      totalBufferSize += bufferSizeAfterCurrentLimit;
-      final int bufferEnd = totalBufferSize - startOffset;
-      if (bufferEnd > currentLimit) {
-        // Limit is in current buffer.
-        bufferSizeAfterCurrentLimit = bufferEnd - currentLimit;
-        totalBufferSize -= bufferSizeAfterCurrentLimit;
-      } else {
-        bufferSizeAfterCurrentLimit = 0;
-      }
-    }
-
-    @Override
-    public void popLimit(final int oldLimit) {
-      currentLimit = oldLimit;
-      recomputeBufferSizeAfterLimit();
-    }
-
-    @Override
-    public int getBytesUntilLimit() {
-      if (currentLimit == Integer.MAX_VALUE) {
-        return -1;
-      }
-
-      return currentLimit - getTotalBytesRead();
-    }
-
-    @Override
-    public boolean isAtEnd() throws IOException {
-      return totalBytesRead + currentByteBufferPos - currentByteBufferStartPos == totalBufferSize;
-    }
-
-    @Override
-    public int getTotalBytesRead() {
-      return (int)
-          (totalBytesRead - startOffset + currentByteBufferPos - currentByteBufferStartPos);
-    }
-
-    @Override
-    public byte readRawByte() throws IOException {
-      if (currentRemaining() == 0) {
-        getNextByteBuffer();
-      }
-      return UnsafeUtil.getByte(currentByteBufferPos++);
-    }
-
-    @Override
-    public byte[] readRawBytes(final int length) throws IOException {
-      if (length >= 0 && length <= currentRemaining()) {
-        byte[] bytes = new byte[length];
-        UnsafeUtil.copyMemory(currentByteBufferPos, bytes, 0, length);
-        currentByteBufferPos += length;
-        return bytes;
-      }
-      if (length >= 0 && length <= remaining()) {
-        byte[] bytes = new byte[length];
-        readRawBytesTo(bytes, 0, length);
-        return bytes;
-      }
-
-      if (length <= 0) {
-        if (length == 0) {
-          return EMPTY_BYTE_ARRAY;
-        } else {
-          throw InvalidProtocolBufferException.negativeSize();
-        }
-      }
-
-      throw InvalidProtocolBufferException.truncatedMessage();
-    }
-
-    /**
-     * Try to get raw bytes from {@code input} with the size of {@code length} and copy to {@code
-     * bytes} array. If the size is bigger than the number of remaining bytes in the input, then
-     * throw {@code truncatedMessage} exception.
-     */
-    private void readRawBytesTo(byte[] bytes, int offset, final int length) throws IOException {
-      if (length >= 0 && length <= remaining()) {
-        int l = length;
-        while (l > 0) {
-          if (currentRemaining() == 0) {
-            getNextByteBuffer();
-          }
-          int bytesToCopy = Math.min(l, (int) currentRemaining());
-          UnsafeUtil.copyMemory(currentByteBufferPos, bytes, length - l + offset, bytesToCopy);
-          l -= bytesToCopy;
-          currentByteBufferPos += bytesToCopy;
-        }
-        return;
-      }
-
-      if (length <= 0) {
-        if (length == 0) {
-          return;
-        } else {
-          throw InvalidProtocolBufferException.negativeSize();
-        }
-      }
-      throw InvalidProtocolBufferException.truncatedMessage();
-    }
-
-    @Override
-    public void skipRawBytes(final int length) throws IOException {
-      if (length >= 0
-          && length
-              <= (totalBufferSize
-                  - totalBytesRead
-                  - currentByteBufferPos
-                  + currentByteBufferStartPos)) {
-        // We have all the bytes we need already.
-        int l = length;
-        while (l > 0) {
-          if (currentRemaining() == 0) {
-            getNextByteBuffer();
-          }
-          int rl = Math.min(l, (int) currentRemaining());
-          l -= rl;
-          currentByteBufferPos += rl;
-        }
-        return;
-      }
-
-      if (length < 0) {
-        throw InvalidProtocolBufferException.negativeSize();
-      }
-      throw InvalidProtocolBufferException.truncatedMessage();
-    }
-
-    // TODO: optimize to fastpath
-    private void skipRawVarint() throws IOException {
-      for (int i = 0; i < MAX_VARINT_SIZE; i++) {
-        if (readRawByte() >= 0) {
-          return;
-        }
-      }
-      throw InvalidProtocolBufferException.malformedVarint();
-    }
-
-    /**
-     * Try to get the number of remaining bytes in {@code input}.
-     *
-     * @return the number of remaining bytes in {@code input}.
-     */
-    private int remaining() {
-      return (int)
-          (totalBufferSize - totalBytesRead - currentByteBufferPos + currentByteBufferStartPos);
-    }
-
-    /**
-     * Try to get the number of remaining bytes in {@code currentByteBuffer}.
-     *
-     * @return the number of remaining bytes in {@code currentByteBuffer}
-     */
-    private long currentRemaining() {
-      return (currentByteBufferLimit - currentByteBufferPos);
-    }
-
-    private ByteBuffer slice(int begin, int end) throws IOException {
-      int prevPos = currentByteBuffer.position();
-      int prevLimit = currentByteBuffer.limit();
-      // View ByteBuffer as Buffer to avoid cross-Java version issues.
-      // See https://issues.apache.org/jira/browse/MRESOLVER-85
-      Buffer asBuffer = currentByteBuffer;
-      try {
-        asBuffer.position(begin);
-        asBuffer.limit(end);
-        return currentByteBuffer.slice();
-      } catch (IllegalArgumentException e) {
-        throw InvalidProtocolBufferException.truncatedMessage();
-      } finally {
-        asBuffer.position(prevPos);
-        asBuffer.limit(prevLimit);
-      }
-    }
-  }
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/CodedInputStreamReader.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/CodedInputStreamReader.java
deleted file mode 100644
index c777125..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/CodedInputStreamReader.java
+++ /dev/null
@@ -1,1356 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.protobuf.WireFormat.FIXED32_SIZE;
-import static com.google.protobuf.WireFormat.FIXED64_SIZE;
-import static com.google.protobuf.WireFormat.WIRETYPE_END_GROUP;
-import static com.google.protobuf.WireFormat.WIRETYPE_FIXED32;
-import static com.google.protobuf.WireFormat.WIRETYPE_FIXED64;
-import static com.google.protobuf.WireFormat.WIRETYPE_LENGTH_DELIMITED;
-import static com.google.protobuf.WireFormat.WIRETYPE_START_GROUP;
-import static com.google.protobuf.WireFormat.WIRETYPE_VARINT;
-
-import java.io.IOException;
-import java.util.List;
-import java.util.Map;
-
-/** An adapter between the {@link Reader} interface and {@link CodedInputStream}. */
-@CheckReturnValue
-@ExperimentalApi
-final class CodedInputStreamReader implements Reader {
-  private static final int FIXED32_MULTIPLE_MASK = FIXED32_SIZE - 1;
-  private static final int FIXED64_MULTIPLE_MASK = FIXED64_SIZE - 1;
-  private static final int NEXT_TAG_UNSET = 0;
-
-  private final CodedInputStream input;
-  private int tag;
-  private int endGroupTag;
-  private int nextTag = NEXT_TAG_UNSET;
-
-  public static CodedInputStreamReader forCodedInput(CodedInputStream input) {
-    if (input.wrapper != null) {
-      return input.wrapper;
-    }
-    return new CodedInputStreamReader(input);
-  }
-
-  private CodedInputStreamReader(CodedInputStream input) {
-    this.input = Internal.checkNotNull(input, "input");
-    this.input.wrapper = this;
-  }
-
-  @Override
-  public boolean shouldDiscardUnknownFields() {
-    return input.shouldDiscardUnknownFields();
-  }
-
-  @Override
-  public int getFieldNumber() throws IOException {
-    if (nextTag != NEXT_TAG_UNSET) {
-      tag = nextTag;
-      nextTag = NEXT_TAG_UNSET;
-    } else {
-      tag = input.readTag();
-    }
-    if (tag == 0 || tag == endGroupTag) {
-      return Reader.READ_DONE;
-    }
-    return WireFormat.getTagFieldNumber(tag);
-  }
-
-  @Override
-  public int getTag() {
-    return tag;
-  }
-
-  @Override
-  public boolean skipField() throws IOException {
-    if (input.isAtEnd() || tag == endGroupTag) {
-      return false;
-    }
-    return input.skipField(tag);
-  }
-
-  private void requireWireType(int requiredWireType) throws IOException {
-    if (WireFormat.getTagWireType(tag) != requiredWireType) {
-      throw InvalidProtocolBufferException.invalidWireType();
-    }
-  }
-
-  @Override
-  public double readDouble() throws IOException {
-    requireWireType(WIRETYPE_FIXED64);
-    return input.readDouble();
-  }
-
-  @Override
-  public float readFloat() throws IOException {
-    requireWireType(WIRETYPE_FIXED32);
-    return input.readFloat();
-  }
-
-  @Override
-  public long readUInt64() throws IOException {
-    requireWireType(WIRETYPE_VARINT);
-    return input.readUInt64();
-  }
-
-  @Override
-  public long readInt64() throws IOException {
-    requireWireType(WIRETYPE_VARINT);
-    return input.readInt64();
-  }
-
-  @Override
-  public int readInt32() throws IOException {
-    requireWireType(WIRETYPE_VARINT);
-    return input.readInt32();
-  }
-
-  @Override
-  public long readFixed64() throws IOException {
-    requireWireType(WIRETYPE_FIXED64);
-    return input.readFixed64();
-  }
-
-  @Override
-  public int readFixed32() throws IOException {
-    requireWireType(WIRETYPE_FIXED32);
-    return input.readFixed32();
-  }
-
-  @Override
-  public boolean readBool() throws IOException {
-    requireWireType(WIRETYPE_VARINT);
-    return input.readBool();
-  }
-
-  @Override
-  public String readString() throws IOException {
-    requireWireType(WIRETYPE_LENGTH_DELIMITED);
-    return input.readString();
-  }
-
-  @Override
-  public String readStringRequireUtf8() throws IOException {
-    requireWireType(WIRETYPE_LENGTH_DELIMITED);
-    return input.readStringRequireUtf8();
-  }
-
-  @Override
-  public <T> T readMessage(Class<T> clazz, ExtensionRegistryLite extensionRegistry)
-      throws IOException {
-    requireWireType(WIRETYPE_LENGTH_DELIMITED);
-    return readMessage(Protobuf.getInstance().schemaFor(clazz), extensionRegistry);
-  }
-
-  @SuppressWarnings("unchecked")
-  @Override
-  public <T> T readMessageBySchemaWithCheck(
-      Schema<T> schema, ExtensionRegistryLite extensionRegistry) throws IOException {
-    requireWireType(WIRETYPE_LENGTH_DELIMITED);
-    return readMessage(schema, extensionRegistry);
-  }
-
-  @Deprecated
-  @Override
-  public <T> T readGroup(Class<T> clazz, ExtensionRegistryLite extensionRegistry)
-      throws IOException {
-    requireWireType(WIRETYPE_START_GROUP);
-    return readGroup(Protobuf.getInstance().schemaFor(clazz), extensionRegistry);
-  }
-
-  @Deprecated
-  @Override
-  public <T> T readGroupBySchemaWithCheck(Schema<T> schema, ExtensionRegistryLite extensionRegistry)
-      throws IOException {
-    requireWireType(WIRETYPE_START_GROUP);
-    return readGroup(schema, extensionRegistry);
-  }
-
-  @Override
-  public <T> void mergeMessageField(
-      T target, Schema<T> schema, ExtensionRegistryLite extensionRegistry) throws IOException {
-    requireWireType(WIRETYPE_LENGTH_DELIMITED);
-    mergeMessageFieldInternal(target, schema, extensionRegistry);
-  }
-
-  private <T> void mergeMessageFieldInternal(
-      T target, Schema<T> schema, ExtensionRegistryLite extensionRegistry) throws IOException {
-    int size = input.readUInt32();
-    if (input.recursionDepth >= input.recursionLimit) {
-      throw InvalidProtocolBufferException.recursionLimitExceeded();
-    }
-
-    // Push the new limit.
-    final int prevLimit = input.pushLimit(size);
-    ++input.recursionDepth;
-    schema.mergeFrom(target, this, extensionRegistry);
-    input.checkLastTagWas(0);
-    --input.recursionDepth;
-    // Restore the previous limit.
-    input.popLimit(prevLimit);
-  }
-
-  // Should have the same semantics of CodedInputStream#readMessage()
-  private <T> T readMessage(Schema<T> schema, ExtensionRegistryLite extensionRegistry)
-      throws IOException {
-    T newInstance = schema.newInstance();
-    mergeMessageFieldInternal(newInstance, schema, extensionRegistry);
-    schema.makeImmutable(newInstance);
-    return newInstance;
-  }
-
-  @Override
-  public <T> void mergeGroupField(
-      T target, Schema<T> schema, ExtensionRegistryLite extensionRegistry) throws IOException {
-    requireWireType(WIRETYPE_START_GROUP);
-    mergeGroupFieldInternal(target, schema, extensionRegistry);
-  }
-
-  private <T> void mergeGroupFieldInternal(
-      T target, Schema<T> schema, ExtensionRegistryLite extensionRegistry) throws IOException {
-    int prevEndGroupTag = endGroupTag;
-    endGroupTag = WireFormat.makeTag(WireFormat.getTagFieldNumber(tag), WIRETYPE_END_GROUP);
-
-    try {
-      schema.mergeFrom(target, this, extensionRegistry);
-      if (tag != endGroupTag) {
-        throw InvalidProtocolBufferException.parseFailure();
-      }
-    } finally {
-      // Restore the old end group tag.
-      endGroupTag = prevEndGroupTag;
-    }
-  }
-
-  private <T> T readGroup(Schema<T> schema, ExtensionRegistryLite extensionRegistry)
-      throws IOException {
-    T newInstance = schema.newInstance();
-    mergeGroupFieldInternal(newInstance, schema, extensionRegistry);
-    schema.makeImmutable(newInstance);
-    return newInstance;
-  }
-
-  @Override
-  public ByteString readBytes() throws IOException {
-    requireWireType(WIRETYPE_LENGTH_DELIMITED);
-    return input.readBytes();
-  }
-
-  @Override
-  public int readUInt32() throws IOException {
-    requireWireType(WIRETYPE_VARINT);
-    return input.readUInt32();
-  }
-
-  @Override
-  public int readEnum() throws IOException {
-    requireWireType(WIRETYPE_VARINT);
-    return input.readEnum();
-  }
-
-  @Override
-  public int readSFixed32() throws IOException {
-    requireWireType(WIRETYPE_FIXED32);
-    return input.readSFixed32();
-  }
-
-  @Override
-  public long readSFixed64() throws IOException {
-    requireWireType(WIRETYPE_FIXED64);
-    return input.readSFixed64();
-  }
-
-  @Override
-  public int readSInt32() throws IOException {
-    requireWireType(WIRETYPE_VARINT);
-    return input.readSInt32();
-  }
-
-  @Override
-  public long readSInt64() throws IOException {
-    requireWireType(WIRETYPE_VARINT);
-    return input.readSInt64();
-  }
-
-  @Override
-  public void readDoubleList(List<Double> target) throws IOException {
-    if (target instanceof DoubleArrayList) {
-      DoubleArrayList plist = (DoubleArrayList) target;
-      switch (WireFormat.getTagWireType(tag)) {
-        case WIRETYPE_LENGTH_DELIMITED:
-          final int bytes = input.readUInt32();
-          verifyPackedFixed64Length(bytes);
-          int endPos = input.getTotalBytesRead() + bytes;
-          do {
-            plist.addDouble(input.readDouble());
-          } while (input.getTotalBytesRead() < endPos);
-          break;
-        case WIRETYPE_FIXED64:
-          while (true) {
-            plist.addDouble(input.readDouble());
-            if (input.isAtEnd()) {
-              return;
-            }
-            int nextTag = input.readTag();
-            if (nextTag != tag) {
-              // We've reached the end of the repeated field. Save the next tag value.
-              this.nextTag = nextTag;
-              return;
-            }
-          }
-        default:
-          throw InvalidProtocolBufferException.invalidWireType();
-      }
-    } else {
-      switch (WireFormat.getTagWireType(tag)) {
-        case WIRETYPE_LENGTH_DELIMITED:
-          final int bytes = input.readUInt32();
-          verifyPackedFixed64Length(bytes);
-          int endPos = input.getTotalBytesRead() + bytes;
-          do {
-            target.add(input.readDouble());
-          } while (input.getTotalBytesRead() < endPos);
-          break;
-        case WIRETYPE_FIXED64:
-          while (true) {
-            target.add(input.readDouble());
-            if (input.isAtEnd()) {
-              return;
-            }
-            int nextTag = input.readTag();
-            if (nextTag != tag) {
-              // We've reached the end of the repeated field. Save the next tag value.
-              this.nextTag = nextTag;
-              return;
-            }
-          }
-        default:
-          throw InvalidProtocolBufferException.invalidWireType();
-      }
-    }
-  }
-
-  @Override
-  public void readFloatList(List<Float> target) throws IOException {
-    if (target instanceof FloatArrayList) {
-      FloatArrayList plist = (FloatArrayList) target;
-      switch (WireFormat.getTagWireType(tag)) {
-        case WIRETYPE_LENGTH_DELIMITED:
-          final int bytes = input.readUInt32();
-          verifyPackedFixed32Length(bytes);
-          int endPos = input.getTotalBytesRead() + bytes;
-          do {
-            plist.addFloat(input.readFloat());
-          } while (input.getTotalBytesRead() < endPos);
-          break;
-        case WIRETYPE_FIXED32:
-          while (true) {
-            plist.addFloat(input.readFloat());
-            if (input.isAtEnd()) {
-              return;
-            }
-            int nextTag = input.readTag();
-            if (nextTag != tag) {
-              // We've reached the end of the repeated field. Save the next tag value.
-              this.nextTag = nextTag;
-              return;
-            }
-          }
-        default:
-          throw InvalidProtocolBufferException.invalidWireType();
-      }
-    } else {
-      switch (WireFormat.getTagWireType(tag)) {
-        case WIRETYPE_LENGTH_DELIMITED:
-          final int bytes = input.readUInt32();
-          verifyPackedFixed32Length(bytes);
-          int endPos = input.getTotalBytesRead() + bytes;
-          do {
-            target.add(input.readFloat());
-          } while (input.getTotalBytesRead() < endPos);
-          break;
-        case WIRETYPE_FIXED32:
-          while (true) {
-            target.add(input.readFloat());
-            if (input.isAtEnd()) {
-              return;
-            }
-            int nextTag = input.readTag();
-            if (nextTag != tag) {
-              // We've reached the end of the repeated field. Save the next tag value.
-              this.nextTag = nextTag;
-              return;
-            }
-          }
-        default:
-          throw InvalidProtocolBufferException.invalidWireType();
-      }
-    }
-  }
-
-  @Override
-  public void readUInt64List(List<Long> target) throws IOException {
-    if (target instanceof LongArrayList) {
-      LongArrayList plist = (LongArrayList) target;
-      switch (WireFormat.getTagWireType(tag)) {
-        case WIRETYPE_LENGTH_DELIMITED:
-          final int bytes = input.readUInt32();
-          int endPos = input.getTotalBytesRead() + bytes;
-          do {
-            plist.addLong(input.readUInt64());
-          } while (input.getTotalBytesRead() < endPos);
-          requirePosition(endPos);
-          break;
-        case WIRETYPE_VARINT:
-          while (true) {
-            plist.addLong(input.readUInt64());
-            if (input.isAtEnd()) {
-              return;
-            }
-            int nextTag = input.readTag();
-            if (nextTag != tag) {
-              // We've reached the end of the repeated field. Save the next tag value.
-              this.nextTag = nextTag;
-              return;
-            }
-          }
-        default:
-          throw InvalidProtocolBufferException.invalidWireType();
-      }
-    } else {
-      switch (WireFormat.getTagWireType(tag)) {
-        case WIRETYPE_LENGTH_DELIMITED:
-          final int bytes = input.readUInt32();
-          int endPos = input.getTotalBytesRead() + bytes;
-          do {
-            target.add(input.readUInt64());
-          } while (input.getTotalBytesRead() < endPos);
-          requirePosition(endPos);
-          break;
-        case WIRETYPE_VARINT:
-          while (true) {
-            target.add(input.readUInt64());
-            if (input.isAtEnd()) {
-              return;
-            }
-            int nextTag = input.readTag();
-            if (nextTag != tag) {
-              // We've reached the end of the repeated field. Save the next tag value.
-              this.nextTag = nextTag;
-              return;
-            }
-          }
-        default:
-          throw InvalidProtocolBufferException.invalidWireType();
-      }
-    }
-  }
-
-  @Override
-  public void readInt64List(List<Long> target) throws IOException {
-    if (target instanceof LongArrayList) {
-      LongArrayList plist = (LongArrayList) target;
-      switch (WireFormat.getTagWireType(tag)) {
-        case WIRETYPE_LENGTH_DELIMITED:
-          final int bytes = input.readUInt32();
-          int endPos = input.getTotalBytesRead() + bytes;
-          do {
-            plist.addLong(input.readInt64());
-          } while (input.getTotalBytesRead() < endPos);
-          requirePosition(endPos);
-          break;
-        case WIRETYPE_VARINT:
-          while (true) {
-            plist.addLong(input.readInt64());
-            if (input.isAtEnd()) {
-              return;
-            }
-            int nextTag = input.readTag();
-            if (nextTag != tag) {
-              // We've reached the end of the repeated field. Save the next tag value.
-              this.nextTag = nextTag;
-              return;
-            }
-          }
-        default:
-          throw InvalidProtocolBufferException.invalidWireType();
-      }
-    } else {
-      switch (WireFormat.getTagWireType(tag)) {
-        case WIRETYPE_LENGTH_DELIMITED:
-          final int bytes = input.readUInt32();
-          int endPos = input.getTotalBytesRead() + bytes;
-          do {
-            target.add(input.readInt64());
-          } while (input.getTotalBytesRead() < endPos);
-          requirePosition(endPos);
-          break;
-        case WIRETYPE_VARINT:
-          while (true) {
-            target.add(input.readInt64());
-            if (input.isAtEnd()) {
-              return;
-            }
-            int nextTag = input.readTag();
-            if (nextTag != tag) {
-              // We've reached the end of the repeated field. Save the next tag value.
-              this.nextTag = nextTag;
-              return;
-            }
-          }
-        default:
-          throw InvalidProtocolBufferException.invalidWireType();
-      }
-    }
-  }
-
-  @Override
-  public void readInt32List(List<Integer> target) throws IOException {
-    if (target instanceof IntArrayList) {
-      IntArrayList plist = (IntArrayList) target;
-      switch (WireFormat.getTagWireType(tag)) {
-        case WIRETYPE_LENGTH_DELIMITED:
-          final int bytes = input.readUInt32();
-          int endPos = input.getTotalBytesRead() + bytes;
-          do {
-            plist.addInt(input.readInt32());
-          } while (input.getTotalBytesRead() < endPos);
-          requirePosition(endPos);
-          break;
-        case WIRETYPE_VARINT:
-          while (true) {
-            plist.addInt(input.readInt32());
-            if (input.isAtEnd()) {
-              return;
-            }
-            int nextTag = input.readTag();
-            if (nextTag != tag) {
-              // We've reached the end of the repeated field. Save the next tag value.
-              this.nextTag = nextTag;
-              return;
-            }
-          }
-        default:
-          throw InvalidProtocolBufferException.invalidWireType();
-      }
-    } else {
-      switch (WireFormat.getTagWireType(tag)) {
-        case WIRETYPE_LENGTH_DELIMITED:
-          final int bytes = input.readUInt32();
-          int endPos = input.getTotalBytesRead() + bytes;
-          do {
-            target.add(input.readInt32());
-          } while (input.getTotalBytesRead() < endPos);
-          requirePosition(endPos);
-          break;
-        case WIRETYPE_VARINT:
-          while (true) {
-            target.add(input.readInt32());
-            if (input.isAtEnd()) {
-              return;
-            }
-            int nextTag = input.readTag();
-            if (nextTag != tag) {
-              // We've reached the end of the repeated field. Save the next tag value.
-              this.nextTag = nextTag;
-              return;
-            }
-          }
-        default:
-          throw InvalidProtocolBufferException.invalidWireType();
-      }
-    }
-  }
-
-  @Override
-  public void readFixed64List(List<Long> target) throws IOException {
-    if (target instanceof LongArrayList) {
-      LongArrayList plist = (LongArrayList) target;
-      switch (WireFormat.getTagWireType(tag)) {
-        case WIRETYPE_LENGTH_DELIMITED:
-          final int bytes = input.readUInt32();
-          verifyPackedFixed64Length(bytes);
-          int endPos = input.getTotalBytesRead() + bytes;
-          do {
-            plist.addLong(input.readFixed64());
-          } while (input.getTotalBytesRead() < endPos);
-          break;
-        case WIRETYPE_FIXED64:
-          while (true) {
-            plist.addLong(input.readFixed64());
-            if (input.isAtEnd()) {
-              return;
-            }
-            int nextTag = input.readTag();
-            if (nextTag != tag) {
-              // We've reached the end of the repeated field. Save the next tag value.
-              this.nextTag = nextTag;
-              return;
-            }
-          }
-        default:
-          throw InvalidProtocolBufferException.invalidWireType();
-      }
-    } else {
-      switch (WireFormat.getTagWireType(tag)) {
-        case WIRETYPE_LENGTH_DELIMITED:
-          final int bytes = input.readUInt32();
-          verifyPackedFixed64Length(bytes);
-          int endPos = input.getTotalBytesRead() + bytes;
-          do {
-            target.add(input.readFixed64());
-          } while (input.getTotalBytesRead() < endPos);
-          break;
-        case WIRETYPE_FIXED64:
-          while (true) {
-            target.add(input.readFixed64());
-            if (input.isAtEnd()) {
-              return;
-            }
-            int nextTag = input.readTag();
-            if (nextTag != tag) {
-              // We've reached the end of the repeated field. Save the next tag value.
-              this.nextTag = nextTag;
-              return;
-            }
-          }
-        default:
-          throw InvalidProtocolBufferException.invalidWireType();
-      }
-    }
-  }
-
-  @Override
-  public void readFixed32List(List<Integer> target) throws IOException {
-    if (target instanceof IntArrayList) {
-      IntArrayList plist = (IntArrayList) target;
-      switch (WireFormat.getTagWireType(tag)) {
-        case WIRETYPE_LENGTH_DELIMITED:
-          final int bytes = input.readUInt32();
-          verifyPackedFixed32Length(bytes);
-          int endPos = input.getTotalBytesRead() + bytes;
-          do {
-            plist.addInt(input.readFixed32());
-          } while (input.getTotalBytesRead() < endPos);
-          break;
-        case WIRETYPE_FIXED32:
-          while (true) {
-            plist.addInt(input.readFixed32());
-            if (input.isAtEnd()) {
-              return;
-            }
-            int nextTag = input.readTag();
-            if (nextTag != tag) {
-              // We've reached the end of the repeated field. Save the next tag value.
-              this.nextTag = nextTag;
-              return;
-            }
-          }
-        default:
-          throw InvalidProtocolBufferException.invalidWireType();
-      }
-    } else {
-      switch (WireFormat.getTagWireType(tag)) {
-        case WIRETYPE_LENGTH_DELIMITED:
-          final int bytes = input.readUInt32();
-          verifyPackedFixed32Length(bytes);
-          int endPos = input.getTotalBytesRead() + bytes;
-          do {
-            target.add(input.readFixed32());
-          } while (input.getTotalBytesRead() < endPos);
-          break;
-        case WIRETYPE_FIXED32:
-          while (true) {
-            target.add(input.readFixed32());
-            if (input.isAtEnd()) {
-              return;
-            }
-            int nextTag = input.readTag();
-            if (nextTag != tag) {
-              // We've reached the end of the repeated field. Save the next tag value.
-              this.nextTag = nextTag;
-              return;
-            }
-          }
-        default:
-          throw InvalidProtocolBufferException.invalidWireType();
-      }
-    }
-  }
-
-  @Override
-  public void readBoolList(List<Boolean> target) throws IOException {
-    if (target instanceof BooleanArrayList) {
-      BooleanArrayList plist = (BooleanArrayList) target;
-      switch (WireFormat.getTagWireType(tag)) {
-        case WIRETYPE_LENGTH_DELIMITED:
-          final int bytes = input.readUInt32();
-          int endPos = input.getTotalBytesRead() + bytes;
-          do {
-            plist.addBoolean(input.readBool());
-          } while (input.getTotalBytesRead() < endPos);
-          requirePosition(endPos);
-          break;
-        case WIRETYPE_VARINT:
-          while (true) {
-            plist.addBoolean(input.readBool());
-            if (input.isAtEnd()) {
-              return;
-            }
-            int nextTag = input.readTag();
-            if (nextTag != tag) {
-              // We've reached the end of the repeated field. Save the next tag value.
-              this.nextTag = nextTag;
-              return;
-            }
-          }
-        default:
-          throw InvalidProtocolBufferException.invalidWireType();
-      }
-    } else {
-      switch (WireFormat.getTagWireType(tag)) {
-        case WIRETYPE_LENGTH_DELIMITED:
-          final int bytes = input.readUInt32();
-          int endPos = input.getTotalBytesRead() + bytes;
-          do {
-            target.add(input.readBool());
-          } while (input.getTotalBytesRead() < endPos);
-          requirePosition(endPos);
-          break;
-        case WIRETYPE_VARINT:
-          while (true) {
-            target.add(input.readBool());
-            if (input.isAtEnd()) {
-              return;
-            }
-            int nextTag = input.readTag();
-            if (nextTag != tag) {
-              // We've reached the end of the repeated field. Save the next tag value.
-              this.nextTag = nextTag;
-              return;
-            }
-          }
-        default:
-          throw InvalidProtocolBufferException.invalidWireType();
-      }
-    }
-  }
-
-  @Override
-  public void readStringList(List<String> target) throws IOException {
-    readStringListInternal(target, false);
-  }
-
-  @Override
-  public void readStringListRequireUtf8(List<String> target) throws IOException {
-    readStringListInternal(target, true);
-  }
-
-  public void readStringListInternal(List<String> target, boolean requireUtf8) throws IOException {
-    if (WireFormat.getTagWireType(tag) != WIRETYPE_LENGTH_DELIMITED) {
-      throw InvalidProtocolBufferException.invalidWireType();
-    }
-
-    if (target instanceof LazyStringList && !requireUtf8) {
-      LazyStringList lazyList = (LazyStringList) target;
-      while (true) {
-        lazyList.add(readBytes());
-        if (input.isAtEnd()) {
-          return;
-        }
-        int nextTag = input.readTag();
-        if (nextTag != tag) {
-          // We've reached the end of the repeated field. Save the next tag value.
-          this.nextTag = nextTag;
-          return;
-        }
-      }
-    } else {
-      while (true) {
-        target.add(requireUtf8 ? readStringRequireUtf8() : readString());
-        if (input.isAtEnd()) {
-          return;
-        }
-        int nextTag = input.readTag();
-        if (nextTag != tag) {
-          // We've reached the end of the repeated field. Save the next tag value.
-          this.nextTag = nextTag;
-          return;
-        }
-      }
-    }
-  }
-
-  @Override
-  public <T> void readMessageList(
-      List<T> target, Class<T> targetType, ExtensionRegistryLite extensionRegistry)
-      throws IOException {
-    final Schema<T> schema = Protobuf.getInstance().schemaFor(targetType);
-    readMessageList(target, schema, extensionRegistry);
-  }
-
-  @Override
-  public <T> void readMessageList(
-      List<T> target, Schema<T> schema, ExtensionRegistryLite extensionRegistry)
-      throws IOException {
-    if (WireFormat.getTagWireType(tag) != WIRETYPE_LENGTH_DELIMITED) {
-      throw InvalidProtocolBufferException.invalidWireType();
-    }
-    final int listTag = tag;
-    while (true) {
-      target.add(readMessage(schema, extensionRegistry));
-      if (input.isAtEnd() || nextTag != NEXT_TAG_UNSET) {
-        return;
-      }
-      int nextTag = input.readTag();
-      if (nextTag != listTag) {
-        // We've reached the end of the repeated field. Save the next tag value.
-        this.nextTag = nextTag;
-        return;
-      }
-    }
-  }
-
-  @Deprecated
-  @Override
-  public <T> void readGroupList(
-      List<T> target, Class<T> targetType, ExtensionRegistryLite extensionRegistry)
-      throws IOException {
-    final Schema<T> schema = Protobuf.getInstance().schemaFor(targetType);
-    readGroupList(target, schema, extensionRegistry);
-  }
-
-  @Deprecated
-  @Override
-  public <T> void readGroupList(
-      List<T> target, Schema<T> schema, ExtensionRegistryLite extensionRegistry)
-      throws IOException {
-    if (WireFormat.getTagWireType(tag) != WIRETYPE_START_GROUP) {
-      throw InvalidProtocolBufferException.invalidWireType();
-    }
-    final int listTag = tag;
-    while (true) {
-      target.add(readGroup(schema, extensionRegistry));
-      if (input.isAtEnd() || nextTag != NEXT_TAG_UNSET) {
-        return;
-      }
-      int nextTag = input.readTag();
-      if (nextTag != listTag) {
-        // We've reached the end of the repeated field. Save the next tag value.
-        this.nextTag = nextTag;
-        return;
-      }
-    }
-  }
-
-  @Override
-  public void readBytesList(List<ByteString> target) throws IOException {
-    if (WireFormat.getTagWireType(tag) != WIRETYPE_LENGTH_DELIMITED) {
-      throw InvalidProtocolBufferException.invalidWireType();
-    }
-
-    while (true) {
-      target.add(readBytes());
-      if (input.isAtEnd()) {
-        return;
-      }
-      int nextTag = input.readTag();
-      if (nextTag != tag) {
-        // We've reached the end of the repeated field. Save the next tag value.
-        this.nextTag = nextTag;
-        return;
-      }
-    }
-  }
-
-  @Override
-  public void readUInt32List(List<Integer> target) throws IOException {
-    if (target instanceof IntArrayList) {
-      IntArrayList plist = (IntArrayList) target;
-      switch (WireFormat.getTagWireType(tag)) {
-        case WIRETYPE_LENGTH_DELIMITED:
-          final int bytes = input.readUInt32();
-          int endPos = input.getTotalBytesRead() + bytes;
-          do {
-            plist.addInt(input.readUInt32());
-          } while (input.getTotalBytesRead() < endPos);
-          requirePosition(endPos);
-          break;
-        case WIRETYPE_VARINT:
-          while (true) {
-            plist.addInt(input.readUInt32());
-            if (input.isAtEnd()) {
-              return;
-            }
-            int nextTag = input.readTag();
-            if (nextTag != tag) {
-              // We've reached the end of the repeated field. Save the next tag value.
-              this.nextTag = nextTag;
-              return;
-            }
-          }
-        default:
-          throw InvalidProtocolBufferException.invalidWireType();
-      }
-    } else {
-      switch (WireFormat.getTagWireType(tag)) {
-        case WIRETYPE_LENGTH_DELIMITED:
-          final int bytes = input.readUInt32();
-          int endPos = input.getTotalBytesRead() + bytes;
-          do {
-            target.add(input.readUInt32());
-          } while (input.getTotalBytesRead() < endPos);
-          requirePosition(endPos);
-          break;
-        case WIRETYPE_VARINT:
-          while (true) {
-            target.add(input.readUInt32());
-            if (input.isAtEnd()) {
-              return;
-            }
-            int nextTag = input.readTag();
-            if (nextTag != tag) {
-              // We've reached the end of the repeated field. Save the next tag value.
-              this.nextTag = nextTag;
-              return;
-            }
-          }
-        default:
-          throw InvalidProtocolBufferException.invalidWireType();
-      }
-    }
-  }
-
-  @Override
-  public void readEnumList(List<Integer> target) throws IOException {
-    if (target instanceof IntArrayList) {
-      IntArrayList plist = (IntArrayList) target;
-      switch (WireFormat.getTagWireType(tag)) {
-        case WIRETYPE_LENGTH_DELIMITED:
-          final int bytes = input.readUInt32();
-          int endPos = input.getTotalBytesRead() + bytes;
-          do {
-            plist.addInt(input.readEnum());
-          } while (input.getTotalBytesRead() < endPos);
-          requirePosition(endPos);
-          break;
-        case WIRETYPE_VARINT:
-          while (true) {
-            plist.addInt(input.readEnum());
-            if (input.isAtEnd()) {
-              return;
-            }
-            int nextTag = input.readTag();
-            if (nextTag != tag) {
-              // We've reached the end of the repeated field. Save the next tag value.
-              this.nextTag = nextTag;
-              return;
-            }
-          }
-        default:
-          throw InvalidProtocolBufferException.invalidWireType();
-      }
-    } else {
-      switch (WireFormat.getTagWireType(tag)) {
-        case WIRETYPE_LENGTH_DELIMITED:
-          final int bytes = input.readUInt32();
-          int endPos = input.getTotalBytesRead() + bytes;
-          do {
-            target.add(input.readEnum());
-          } while (input.getTotalBytesRead() < endPos);
-          requirePosition(endPos);
-          break;
-        case WIRETYPE_VARINT:
-          while (true) {
-            target.add(input.readEnum());
-            if (input.isAtEnd()) {
-              return;
-            }
-            int nextTag = input.readTag();
-            if (nextTag != tag) {
-              // We've reached the end of the repeated field. Save the next tag value.
-              this.nextTag = nextTag;
-              return;
-            }
-          }
-        default:
-          throw InvalidProtocolBufferException.invalidWireType();
-      }
-    }
-  }
-
-  @Override
-  public void readSFixed32List(List<Integer> target) throws IOException {
-    if (target instanceof IntArrayList) {
-      IntArrayList plist = (IntArrayList) target;
-      switch (WireFormat.getTagWireType(tag)) {
-        case WIRETYPE_LENGTH_DELIMITED:
-          final int bytes = input.readUInt32();
-          verifyPackedFixed32Length(bytes);
-          int endPos = input.getTotalBytesRead() + bytes;
-          do {
-            plist.addInt(input.readSFixed32());
-          } while (input.getTotalBytesRead() < endPos);
-          break;
-        case WIRETYPE_FIXED32:
-          while (true) {
-            plist.addInt(input.readSFixed32());
-            if (input.isAtEnd()) {
-              return;
-            }
-            int nextTag = input.readTag();
-            if (nextTag != tag) {
-              // We've reached the end of the repeated field. Save the next tag value.
-              this.nextTag = nextTag;
-              return;
-            }
-          }
-        default:
-          throw InvalidProtocolBufferException.invalidWireType();
-      }
-    } else {
-      switch (WireFormat.getTagWireType(tag)) {
-        case WIRETYPE_LENGTH_DELIMITED:
-          final int bytes = input.readUInt32();
-          verifyPackedFixed32Length(bytes);
-          int endPos = input.getTotalBytesRead() + bytes;
-          do {
-            target.add(input.readSFixed32());
-          } while (input.getTotalBytesRead() < endPos);
-          break;
-        case WIRETYPE_FIXED32:
-          while (true) {
-            target.add(input.readSFixed32());
-            if (input.isAtEnd()) {
-              return;
-            }
-            int nextTag = input.readTag();
-            if (nextTag != tag) {
-              // We've reached the end of the repeated field. Save the next tag value.
-              this.nextTag = nextTag;
-              return;
-            }
-          }
-        default:
-          throw InvalidProtocolBufferException.invalidWireType();
-      }
-    }
-  }
-
-  @Override
-  public void readSFixed64List(List<Long> target) throws IOException {
-    if (target instanceof LongArrayList) {
-      LongArrayList plist = (LongArrayList) target;
-      switch (WireFormat.getTagWireType(tag)) {
-        case WIRETYPE_LENGTH_DELIMITED:
-          final int bytes = input.readUInt32();
-          verifyPackedFixed64Length(bytes);
-          int endPos = input.getTotalBytesRead() + bytes;
-          do {
-            plist.addLong(input.readSFixed64());
-          } while (input.getTotalBytesRead() < endPos);
-          break;
-        case WIRETYPE_FIXED64:
-          while (true) {
-            plist.addLong(input.readSFixed64());
-            if (input.isAtEnd()) {
-              return;
-            }
-            int nextTag = input.readTag();
-            if (nextTag != tag) {
-              // We've reached the end of the repeated field. Save the next tag value.
-              this.nextTag = nextTag;
-              return;
-            }
-          }
-        default:
-          throw InvalidProtocolBufferException.invalidWireType();
-      }
-    } else {
-      switch (WireFormat.getTagWireType(tag)) {
-        case WIRETYPE_LENGTH_DELIMITED:
-          final int bytes = input.readUInt32();
-          verifyPackedFixed64Length(bytes);
-          int endPos = input.getTotalBytesRead() + bytes;
-          do {
-            target.add(input.readSFixed64());
-          } while (input.getTotalBytesRead() < endPos);
-          break;
-        case WIRETYPE_FIXED64:
-          while (true) {
-            target.add(input.readSFixed64());
-            if (input.isAtEnd()) {
-              return;
-            }
-            int nextTag = input.readTag();
-            if (nextTag != tag) {
-              // We've reached the end of the repeated field. Save the next tag value.
-              this.nextTag = nextTag;
-              return;
-            }
-          }
-        default:
-          throw InvalidProtocolBufferException.invalidWireType();
-      }
-    }
-  }
-
-  @Override
-  public void readSInt32List(List<Integer> target) throws IOException {
-    if (target instanceof IntArrayList) {
-      IntArrayList plist = (IntArrayList) target;
-      switch (WireFormat.getTagWireType(tag)) {
-        case WIRETYPE_LENGTH_DELIMITED:
-          final int bytes = input.readUInt32();
-          int endPos = input.getTotalBytesRead() + bytes;
-          do {
-            plist.addInt(input.readSInt32());
-          } while (input.getTotalBytesRead() < endPos);
-          requirePosition(endPos);
-          break;
-        case WIRETYPE_VARINT:
-          while (true) {
-            plist.addInt(input.readSInt32());
-            if (input.isAtEnd()) {
-              return;
-            }
-            int nextTag = input.readTag();
-            if (nextTag != tag) {
-              // We've reached the end of the repeated field. Save the next tag value.
-              this.nextTag = nextTag;
-              return;
-            }
-          }
-        default:
-          throw InvalidProtocolBufferException.invalidWireType();
-      }
-    } else {
-      switch (WireFormat.getTagWireType(tag)) {
-        case WIRETYPE_LENGTH_DELIMITED:
-          final int bytes = input.readUInt32();
-          int endPos = input.getTotalBytesRead() + bytes;
-          do {
-            target.add(input.readSInt32());
-          } while (input.getTotalBytesRead() < endPos);
-          requirePosition(endPos);
-          break;
-        case WIRETYPE_VARINT:
-          while (true) {
-            target.add(input.readSInt32());
-            if (input.isAtEnd()) {
-              return;
-            }
-            int nextTag = input.readTag();
-            if (nextTag != tag) {
-              // We've reached the end of the repeated field. Save the next tag value.
-              this.nextTag = nextTag;
-              return;
-            }
-          }
-        default:
-          throw InvalidProtocolBufferException.invalidWireType();
-      }
-    }
-  }
-
-  @Override
-  public void readSInt64List(List<Long> target) throws IOException {
-    if (target instanceof LongArrayList) {
-      LongArrayList plist = (LongArrayList) target;
-      switch (WireFormat.getTagWireType(tag)) {
-        case WIRETYPE_LENGTH_DELIMITED:
-          final int bytes = input.readUInt32();
-          int endPos = input.getTotalBytesRead() + bytes;
-          do {
-            plist.addLong(input.readSInt64());
-          } while (input.getTotalBytesRead() < endPos);
-          requirePosition(endPos);
-          break;
-        case WIRETYPE_VARINT:
-          while (true) {
-            plist.addLong(input.readSInt64());
-            if (input.isAtEnd()) {
-              return;
-            }
-            int nextTag = input.readTag();
-            if (nextTag != tag) {
-              // We've reached the end of the repeated field. Save the next tag value.
-              this.nextTag = nextTag;
-              return;
-            }
-          }
-        default:
-          throw InvalidProtocolBufferException.invalidWireType();
-      }
-    } else {
-      switch (WireFormat.getTagWireType(tag)) {
-        case WIRETYPE_LENGTH_DELIMITED:
-          final int bytes = input.readUInt32();
-          int endPos = input.getTotalBytesRead() + bytes;
-          do {
-            target.add(input.readSInt64());
-          } while (input.getTotalBytesRead() < endPos);
-          requirePosition(endPos);
-          break;
-        case WIRETYPE_VARINT:
-          while (true) {
-            target.add(input.readSInt64());
-            if (input.isAtEnd()) {
-              return;
-            }
-            int nextTag = input.readTag();
-            if (nextTag != tag) {
-              // We've reached the end of the repeated field. Save the next tag value.
-              this.nextTag = nextTag;
-              return;
-            }
-          }
-        default:
-          throw InvalidProtocolBufferException.invalidWireType();
-      }
-    }
-  }
-
-  private void verifyPackedFixed64Length(int bytes) throws IOException {
-    if ((bytes & FIXED64_MULTIPLE_MASK) != 0) {
-      // Require that the number of bytes be a multiple of 8.
-      throw InvalidProtocolBufferException.parseFailure();
-    }
-  }
-
-  @SuppressWarnings("unchecked")
-  @Override
-  public <K, V> void readMap(
-      Map<K, V> target,
-      MapEntryLite.Metadata<K, V> metadata,
-      ExtensionRegistryLite extensionRegistry)
-      throws IOException {
-    requireWireType(WIRETYPE_LENGTH_DELIMITED);
-    int size = input.readUInt32();
-    final int prevLimit = input.pushLimit(size);
-    K key = metadata.defaultKey;
-    V value = metadata.defaultValue;
-    try {
-      while (true) {
-        int number = getFieldNumber();
-        if (number == READ_DONE || input.isAtEnd()) {
-          break;
-        }
-        try {
-          switch (number) {
-            case 1:
-              key = (K) readField(metadata.keyType, null, null);
-              break;
-            case 2:
-              value =
-                  (V)
-                      readField(
-                          metadata.valueType, metadata.defaultValue.getClass(), extensionRegistry);
-              break;
-            default:
-              if (!skipField()) {
-                throw new InvalidProtocolBufferException("Unable to parse map entry.");
-              }
-              break;
-          }
-        } catch (InvalidProtocolBufferException.InvalidWireTypeException ignore) {
-          // the type doesn't match, skip the field.
-          if (!skipField()) {
-            throw new InvalidProtocolBufferException("Unable to parse map entry.");
-          }
-        }
-      }
-      target.put(key, value);
-    } finally {
-      // Restore the previous limit.
-      input.popLimit(prevLimit);
-    }
-  }
-
-  private Object readField(
-      WireFormat.FieldType fieldType, Class<?> messageType, ExtensionRegistryLite extensionRegistry)
-      throws IOException {
-    switch (fieldType) {
-      case BOOL:
-        return readBool();
-      case BYTES:
-        return readBytes();
-      case DOUBLE:
-        return readDouble();
-      case ENUM:
-        return readEnum();
-      case FIXED32:
-        return readFixed32();
-      case FIXED64:
-        return readFixed64();
-      case FLOAT:
-        return readFloat();
-      case INT32:
-        return readInt32();
-      case INT64:
-        return readInt64();
-      case MESSAGE:
-        return readMessage(messageType, extensionRegistry);
-      case SFIXED32:
-        return readSFixed32();
-      case SFIXED64:
-        return readSFixed64();
-      case SINT32:
-        return readSInt32();
-      case SINT64:
-        return readSInt64();
-      case STRING:
-        return readStringRequireUtf8();
-      case UINT32:
-        return readUInt32();
-      case UINT64:
-        return readUInt64();
-      default:
-        throw new IllegalArgumentException("unsupported field type.");
-    }
-  }
-
-  private void verifyPackedFixed32Length(int bytes) throws IOException {
-    if ((bytes & FIXED32_MULTIPLE_MASK) != 0) {
-      // Require that the number of bytes be a multiple of 4.
-      throw InvalidProtocolBufferException.parseFailure();
-    }
-  }
-
-  private void requirePosition(int expectedPosition) throws IOException {
-    if (input.getTotalBytesRead() != expectedPosition) {
-      throw InvalidProtocolBufferException.truncatedMessage();
-    }
-  }
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/CodedOutputStream.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/CodedOutputStream.java
deleted file mode 100644
index 4ad8309..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/CodedOutputStream.java
+++ /dev/null
@@ -1,3045 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.protobuf.WireFormat.FIXED32_SIZE;
-import static com.google.protobuf.WireFormat.FIXED64_SIZE;
-import static com.google.protobuf.WireFormat.MAX_VARINT32_SIZE;
-import static com.google.protobuf.WireFormat.MAX_VARINT_SIZE;
-import static java.lang.Math.max;
-
-import com.google.protobuf.Utf8.UnpairedSurrogateException;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.nio.BufferOverflowException;
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- * Encodes and writes protocol message fields.
- *
- * <p>This class contains two kinds of methods: methods that write specific protocol message
- * constructs and field types (e.g. {@link #writeTag} and {@link #writeInt32}) and methods that
- * write low-level values (e.g. {@link #writeRawVarint32} and {@link #writeRawBytes}). If you are
- * writing encoded protocol messages, you should use the former methods, but if you are writing some
- * other format of your own design, use the latter.
- *
- * <p>This class is totally unsynchronized.
- */
-public abstract class CodedOutputStream extends ByteOutput {
-  private static final Logger logger = Logger.getLogger(CodedOutputStream.class.getName());
-  private static final boolean HAS_UNSAFE_ARRAY_OPERATIONS = UnsafeUtil.hasUnsafeArrayOperations();
-
-  /** Used to adapt to the experimental {@link Writer} interface. */
-  CodedOutputStreamWriter wrapper;
-
-  /** @deprecated Use {@link #computeFixed32SizeNoTag(int)} instead. */
-  @Deprecated public static final int LITTLE_ENDIAN_32_SIZE = FIXED32_SIZE;
-
-  /** The buffer size used in {@link #newInstance(OutputStream)}. */
-  public static final int DEFAULT_BUFFER_SIZE = 4096;
-
-  /**
-   * Returns the buffer size to efficiently write dataLength bytes to this CodedOutputStream. Used
-   * by AbstractMessageLite.
-   *
-   * @return the buffer size to efficiently write dataLength bytes to this CodedOutputStream.
-   */
-  static int computePreferredBufferSize(int dataLength) {
-    if (dataLength > DEFAULT_BUFFER_SIZE) {
-      return DEFAULT_BUFFER_SIZE;
-    }
-    return dataLength;
-  }
-
-  /**
-   * Create a new {@code CodedOutputStream} wrapping the given {@code OutputStream}.
-   *
-   * <p>NOTE: The provided {@link OutputStream} <strong>MUST NOT</strong> retain access or modify
-   * the provided byte arrays. Doing so may result in corrupted data, which would be difficult to
-   * debug.
-   */
-  public static CodedOutputStream newInstance(final OutputStream output) {
-    return newInstance(output, DEFAULT_BUFFER_SIZE);
-  }
-
-  /**
-   * Create a new {@code CodedOutputStream} wrapping the given {@code OutputStream} with a given
-   * buffer size.
-   *
-   * <p>NOTE: The provided {@link OutputStream} <strong>MUST NOT</strong> retain access or modify
-   * the provided byte arrays. Doing so may result in corrupted data, which would be difficult to
-   * debug.
-   */
-  public static CodedOutputStream newInstance(final OutputStream output, final int bufferSize) {
-    return new OutputStreamEncoder(output, bufferSize);
-  }
-
-  /**
-   * Create a new {@code CodedOutputStream} that writes directly to the given byte array. If more
-   * bytes are written than fit in the array, {@link OutOfSpaceException} will be thrown. Writing
-   * directly to a flat array is faster than writing to an {@code OutputStream}. See also {@link
-   * ByteString#newCodedBuilder}.
-   */
-  public static CodedOutputStream newInstance(final byte[] flatArray) {
-    return newInstance(flatArray, 0, flatArray.length);
-  }
-
-  /**
-   * Create a new {@code CodedOutputStream} that writes directly to the given byte array slice. If
-   * more bytes are written than fit in the slice, {@link OutOfSpaceException} will be thrown.
-   * Writing directly to a flat array is faster than writing to an {@code OutputStream}. See also
-   * {@link ByteString#newCodedBuilder}.
-   */
-  public static CodedOutputStream newInstance(
-      final byte[] flatArray, final int offset, final int length) {
-    return new ArrayEncoder(flatArray, offset, length);
-  }
-
-  /** Create a new {@code CodedOutputStream} that writes to the given {@link ByteBuffer}. */
-  public static CodedOutputStream newInstance(ByteBuffer buffer) {
-    if (buffer.hasArray()) {
-      return new HeapNioEncoder(buffer);
-    }
-    if (buffer.isDirect() && !buffer.isReadOnly()) {
-      return UnsafeDirectNioEncoder.isSupported()
-          ? newUnsafeInstance(buffer)
-          : newSafeInstance(buffer);
-    }
-    throw new IllegalArgumentException("ByteBuffer is read-only");
-  }
-
-  /** For testing purposes only. */
-  static CodedOutputStream newUnsafeInstance(ByteBuffer buffer) {
-    return new UnsafeDirectNioEncoder(buffer);
-  }
-
-  /** For testing purposes only. */
-  static CodedOutputStream newSafeInstance(ByteBuffer buffer) {
-    return new SafeDirectNioEncoder(buffer);
-  }
-
-  /**
-   * Configures serialization to be deterministic.
-   *
-   * <p>The deterministic serialization guarantees that for a given binary, equal (defined by the
-   * {@code equals()} methods in protos) messages will always be serialized to the same bytes. This
-   * implies:
-   *
-   * <ul>
-   *   <li>repeated serialization of a message will return the same bytes
-   *   <li>different processes of the same binary (which may be executing on different machines)
-   *       will serialize equal messages to the same bytes.
-   * </ul>
-   *
-   * <p>Note the deterministic serialization is NOT canonical across languages; it is also unstable
-   * across different builds with schema changes due to unknown fields. Users who need canonical
-   * serialization, e.g. persistent storage in a canonical form, fingerprinting, etc, should define
-   * their own canonicalization specification and implement the serializer using reflection APIs
-   * rather than relying on this API.
-   *
-   * <p>Once set, the serializer will: (Note this is an implementation detail and may subject to
-   * change in the future)
-   *
-   * <ul>
-   *   <li>sort map entries by keys in lexicographical order or numerical order. Note: For string
-   *       keys, the order is based on comparing the Unicode value of each character in the strings.
-   *       The order may be different from the deterministic serialization in other languages where
-   *       maps are sorted on the lexicographical order of the UTF8 encoded keys.
-   * </ul>
-   */
-  public void useDeterministicSerialization() {
-    serializationDeterministic = true;
-  }
-
-  boolean isSerializationDeterministic() {
-    return serializationDeterministic;
-  }
-
-  private boolean serializationDeterministic;
-
-  /**
-   * Create a new {@code CodedOutputStream} that writes to the given {@link ByteBuffer}.
-   *
-   * @deprecated the size parameter is no longer used since use of an internal buffer is useless
-   *     (and wasteful) when writing to a {@link ByteBuffer}. Use {@link #newInstance(ByteBuffer)}
-   *     instead.
-   */
-  @Deprecated
-  public static CodedOutputStream newInstance(
-      ByteBuffer byteBuffer, @SuppressWarnings("unused") int unused) {
-    return newInstance(byteBuffer);
-  }
-
-  /**
-   * Create a new {@code CodedOutputStream} that writes to the provided {@link ByteOutput}.
-   *
-   * <p>NOTE: The {@link ByteOutput} <strong>MUST NOT</strong> modify the provided buffers. Doing so
-   * may result in corrupted data, which would be difficult to debug.
-   *
-   * @param byteOutput the output target for encoded bytes.
-   * @param bufferSize the size of the internal scratch buffer to be used for string encoding.
-   *     Setting this to {@code 0} will disable buffering, requiring an allocation for each encoded
-   *     string.
-   */
-  static CodedOutputStream newInstance(ByteOutput byteOutput, int bufferSize) {
-    if (bufferSize < 0) {
-      throw new IllegalArgumentException("bufferSize must be positive");
-    }
-
-    return new ByteOutputEncoder(byteOutput, bufferSize);
-  }
-
-  // Disallow construction outside of this class.
-  private CodedOutputStream() {}
-
-  // -----------------------------------------------------------------
-
-  /** Encode and write a tag. */
-  // Abstract to avoid overhead of additional virtual method calls.
-  public abstract void writeTag(int fieldNumber, int wireType) throws IOException;
-
-  /** Write an {@code int32} field, including tag, to the stream. */
-  // Abstract to avoid overhead of additional virtual method calls.
-  public abstract void writeInt32(int fieldNumber, int value) throws IOException;
-
-  /** Write a {@code uint32} field, including tag, to the stream. */
-  // Abstract to avoid overhead of additional virtual method calls.
-  public abstract void writeUInt32(int fieldNumber, int value) throws IOException;
-
-  /** Write a {@code sint32} field, including tag, to the stream. */
-  public final void writeSInt32(final int fieldNumber, final int value) throws IOException {
-    writeUInt32(fieldNumber, encodeZigZag32(value));
-  }
-
-  /** Write a {@code fixed32} field, including tag, to the stream. */
-  // Abstract to avoid overhead of additional virtual method calls.
-  public abstract void writeFixed32(int fieldNumber, int value) throws IOException;
-
-  /** Write an {@code sfixed32} field, including tag, to the stream. */
-  public final void writeSFixed32(final int fieldNumber, final int value) throws IOException {
-    writeFixed32(fieldNumber, value);
-  }
-
-  /** Write an {@code int64} field, including tag, to the stream. */
-  public final void writeInt64(final int fieldNumber, final long value) throws IOException {
-    writeUInt64(fieldNumber, value);
-  }
-
-  /** Write a {@code uint64} field, including tag, to the stream. */
-  // Abstract to avoid overhead of additional virtual method calls.
-  public abstract void writeUInt64(int fieldNumber, long value) throws IOException;
-
-  /** Write an {@code sint64} field, including tag, to the stream. */
-  public final void writeSInt64(final int fieldNumber, final long value) throws IOException {
-    writeUInt64(fieldNumber, encodeZigZag64(value));
-  }
-
-  /** Write a {@code fixed64} field, including tag, to the stream. */
-  // Abstract to avoid overhead of additional virtual method calls.
-  public abstract void writeFixed64(int fieldNumber, long value) throws IOException;
-
-  /** Write an {@code sfixed64} field, including tag, to the stream. */
-  public final void writeSFixed64(final int fieldNumber, final long value) throws IOException {
-    writeFixed64(fieldNumber, value);
-  }
-
-  /** Write a {@code float} field, including tag, to the stream. */
-  public final void writeFloat(final int fieldNumber, final float value) throws IOException {
-    writeFixed32(fieldNumber, Float.floatToRawIntBits(value));
-  }
-
-  /** Write a {@code double} field, including tag, to the stream. */
-  public final void writeDouble(final int fieldNumber, final double value) throws IOException {
-    writeFixed64(fieldNumber, Double.doubleToRawLongBits(value));
-  }
-
-  /** Write a {@code bool} field, including tag, to the stream. */
-  // Abstract to avoid overhead of additional virtual method calls.
-  public abstract void writeBool(int fieldNumber, boolean value) throws IOException;
-
-  /**
-   * Write an enum field, including tag, to the stream. The provided value is the numeric value used
-   * to represent the enum value on the wire (not the enum ordinal value).
-   */
-  public final void writeEnum(final int fieldNumber, final int value) throws IOException {
-    writeInt32(fieldNumber, value);
-  }
-
-  /** Write a {@code string} field, including tag, to the stream. */
-  // Abstract to avoid overhead of additional virtual method calls.
-  public abstract void writeString(int fieldNumber, String value) throws IOException;
-
-  /** Write a {@code bytes} field, including tag, to the stream. */
-  // Abstract to avoid overhead of additional virtual method calls.
-  public abstract void writeBytes(int fieldNumber, ByteString value) throws IOException;
-
-  /** Write a {@code bytes} field, including tag, to the stream. */
-  // Abstract to avoid overhead of additional virtual method calls.
-  public abstract void writeByteArray(int fieldNumber, byte[] value) throws IOException;
-
-  /** Write a {@code bytes} field, including tag, to the stream. */
-  // Abstract to avoid overhead of additional virtual method calls.
-  public abstract void writeByteArray(int fieldNumber, byte[] value, int offset, int length)
-      throws IOException;
-
-  /**
-   * Write a {@code bytes} field, including tag, to the stream. This method will write all content
-   * of the ByteBuffer regardless of the current position and limit (i.e., the number of bytes to be
-   * written is value.capacity(), not value.remaining()). Furthermore, this method doesn't alter the
-   * state of the passed-in ByteBuffer. Its position, limit, mark, etc. will remain unchanged. If
-   * you only want to write the remaining bytes of a ByteBuffer, you can call {@code
-   * writeByteBuffer(fieldNumber, byteBuffer.slice())}.
-   */
-  // Abstract to avoid overhead of additional virtual method calls.
-  public abstract void writeByteBuffer(int fieldNumber, ByteBuffer value) throws IOException;
-
-  /** Write a single byte. */
-  public final void writeRawByte(final byte value) throws IOException {
-    write(value);
-  }
-
-  /** Write a single byte, represented by an integer value. */
-  public final void writeRawByte(final int value) throws IOException {
-    write((byte) value);
-  }
-
-  /** Write an array of bytes. */
-  public final void writeRawBytes(final byte[] value) throws IOException {
-    write(value, 0, value.length);
-  }
-
-  /** Write part of an array of bytes. */
-  public final void writeRawBytes(final byte[] value, int offset, int length) throws IOException {
-    write(value, offset, length);
-  }
-
-  /** Write a byte string. */
-  public final void writeRawBytes(final ByteString value) throws IOException {
-    value.writeTo(this);
-  }
-
-  /**
-   * Write a ByteBuffer. This method will write all content of the ByteBuffer regardless of the
-   * current position and limit (i.e., the number of bytes to be written is value.capacity(), not
-   * value.remaining()). Furthermore, this method doesn't alter the state of the passed-in
-   * ByteBuffer. Its position, limit, mark, etc. will remain unchanged. If you only want to write
-   * the remaining bytes of a ByteBuffer, you can call {@code writeRawBytes(byteBuffer.slice())}.
-   */
-  // Abstract to avoid overhead of additional virtual method calls.
-  public abstract void writeRawBytes(final ByteBuffer value) throws IOException;
-
-  /** Write an embedded message field, including tag, to the stream. */
-  // Abstract to avoid overhead of additional virtual method calls.
-  public abstract void writeMessage(final int fieldNumber, final MessageLite value)
-      throws IOException;
-
-  /** Write an embedded message field, including tag, to the stream. */
-  // Abstract to avoid overhead of additional virtual method calls.
-  abstract void writeMessage(final int fieldNumber, final MessageLite value, Schema schema)
-      throws IOException;
-
-  /**
-   * Write a MessageSet extension field to the stream. For historical reasons, the wire format
-   * differs from normal fields.
-   */
-  // Abstract to avoid overhead of additional virtual method calls.
-  public abstract void writeMessageSetExtension(final int fieldNumber, final MessageLite value)
-      throws IOException;
-
-  /**
-   * Write an unparsed MessageSet extension field to the stream. For historical reasons, the wire
-   * format differs from normal fields.
-   */
-  // Abstract to avoid overhead of additional virtual method calls.
-  public abstract void writeRawMessageSetExtension(final int fieldNumber, final ByteString value)
-      throws IOException;
-
-  // -----------------------------------------------------------------
-
-  /** Write an {@code int32} field to the stream. */
-  // Abstract to avoid overhead of additional virtual method calls.
-  public abstract void writeInt32NoTag(final int value) throws IOException;
-
-  /** Write a {@code uint32} field to the stream. */
-  // Abstract to avoid overhead of additional virtual method calls.
-  public abstract void writeUInt32NoTag(int value) throws IOException;
-
-  /** Write a {@code sint32} field to the stream. */
-  public final void writeSInt32NoTag(final int value) throws IOException {
-    writeUInt32NoTag(encodeZigZag32(value));
-  }
-
-  /** Write a {@code fixed32} field to the stream. */
-  // Abstract to avoid overhead of additional virtual method calls.
-  public abstract void writeFixed32NoTag(int value) throws IOException;
-
-  /** Write a {@code sfixed32} field to the stream. */
-  public final void writeSFixed32NoTag(final int value) throws IOException {
-    writeFixed32NoTag(value);
-  }
-
-  /** Write an {@code int64} field to the stream. */
-  public final void writeInt64NoTag(final long value) throws IOException {
-    writeUInt64NoTag(value);
-  }
-
-  /** Write a {@code uint64} field to the stream. */
-  // Abstract to avoid overhead of additional virtual method calls.
-  public abstract void writeUInt64NoTag(long value) throws IOException;
-
-  /** Write a {@code sint64} field to the stream. */
-  public final void writeSInt64NoTag(final long value) throws IOException {
-    writeUInt64NoTag(encodeZigZag64(value));
-  }
-
-  /** Write a {@code fixed64} field to the stream. */
-  // Abstract to avoid overhead of additional virtual method calls.
-  public abstract void writeFixed64NoTag(long value) throws IOException;
-
-  /** Write a {@code sfixed64} field to the stream. */
-  public final void writeSFixed64NoTag(final long value) throws IOException {
-    writeFixed64NoTag(value);
-  }
-
-  /** Write a {@code float} field to the stream. */
-  public final void writeFloatNoTag(final float value) throws IOException {
-    writeFixed32NoTag(Float.floatToRawIntBits(value));
-  }
-
-  /** Write a {@code double} field to the stream. */
-  public final void writeDoubleNoTag(final double value) throws IOException {
-    writeFixed64NoTag(Double.doubleToRawLongBits(value));
-  }
-
-  /** Write a {@code bool} field to the stream. */
-  public final void writeBoolNoTag(final boolean value) throws IOException {
-    write((byte) (value ? 1 : 0));
-  }
-
-  /**
-   * Write an enum field to the stream. The provided value is the numeric value used to represent
-   * the enum value on the wire (not the enum ordinal value).
-   */
-  public final void writeEnumNoTag(final int value) throws IOException {
-    writeInt32NoTag(value);
-  }
-
-  /** Write a {@code string} field to the stream. */
-  // TODO(dweis): Document behavior on ill-formed UTF-16 input.
-  // Abstract to avoid overhead of additional virtual method calls.
-  public abstract void writeStringNoTag(String value) throws IOException;
-
-  /** Write a {@code bytes} field to the stream. */
-  // Abstract to avoid overhead of additional virtual method calls.
-  public abstract void writeBytesNoTag(final ByteString value) throws IOException;
-
-  /** Write a {@code bytes} field to the stream. */
-  public final void writeByteArrayNoTag(final byte[] value) throws IOException {
-    writeByteArrayNoTag(value, 0, value.length);
-  }
-
-  /** Write an embedded message field to the stream. */
-  // Abstract to avoid overhead of additional virtual method calls.
-  public abstract void writeMessageNoTag(final MessageLite value) throws IOException;
-
-  /** Write an embedded message field to the stream. */
-  // Abstract to avoid overhead of additional virtual method calls.
-  abstract void writeMessageNoTag(final MessageLite value, Schema schema) throws IOException;
-
-  // =================================================================
-
-  @ExperimentalApi
-  @Override
-  public abstract void write(byte value) throws IOException;
-
-  @ExperimentalApi
-  @Override
-  public abstract void write(byte[] value, int offset, int length) throws IOException;
-
-  @ExperimentalApi
-  @Override
-  public abstract void writeLazy(byte[] value, int offset, int length) throws IOException;
-
-  @Override
-  public abstract void write(ByteBuffer value) throws IOException;
-
-  @ExperimentalApi
-  @Override
-  public abstract void writeLazy(ByteBuffer value) throws IOException;
-
-  // =================================================================
-  // =================================================================
-
-  /**
-   * Compute the number of bytes that would be needed to encode an {@code int32} field, including
-   * tag.
-   */
-  public static int computeInt32Size(final int fieldNumber, final int value) {
-    return computeTagSize(fieldNumber) + computeInt32SizeNoTag(value);
-  }
-
-  /**
-   * Compute the number of bytes that would be needed to encode a {@code uint32} field, including
-   * tag.
-   */
-  public static int computeUInt32Size(final int fieldNumber, final int value) {
-    return computeTagSize(fieldNumber) + computeUInt32SizeNoTag(value);
-  }
-
-  /**
-   * Compute the number of bytes that would be needed to encode an {@code sint32} field, including
-   * tag.
-   */
-  public static int computeSInt32Size(final int fieldNumber, final int value) {
-    return computeTagSize(fieldNumber) + computeSInt32SizeNoTag(value);
-  }
-
-  /**
-   * Compute the number of bytes that would be needed to encode a {@code fixed32} field, including
-   * tag.
-   */
-  public static int computeFixed32Size(final int fieldNumber, final int value) {
-    return computeTagSize(fieldNumber) + computeFixed32SizeNoTag(value);
-  }
-
-  /**
-   * Compute the number of bytes that would be needed to encode an {@code sfixed32} field, including
-   * tag.
-   */
-  public static int computeSFixed32Size(final int fieldNumber, final int value) {
-    return computeTagSize(fieldNumber) + computeSFixed32SizeNoTag(value);
-  }
-
-  /**
-   * Compute the number of bytes that would be needed to encode an {@code int64} field, including
-   * tag.
-   */
-  public static int computeInt64Size(final int fieldNumber, final long value) {
-    return computeTagSize(fieldNumber) + computeInt64SizeNoTag(value);
-  }
-
-  /**
-   * Compute the number of bytes that would be needed to encode a {@code uint64} field, including
-   * tag.
-   */
-  public static int computeUInt64Size(final int fieldNumber, final long value) {
-    return computeTagSize(fieldNumber) + computeUInt64SizeNoTag(value);
-  }
-
-  /**
-   * Compute the number of bytes that would be needed to encode an {@code sint64} field, including
-   * tag.
-   */
-  public static int computeSInt64Size(final int fieldNumber, final long value) {
-    return computeTagSize(fieldNumber) + computeSInt64SizeNoTag(value);
-  }
-
-  /**
-   * Compute the number of bytes that would be needed to encode a {@code fixed64} field, including
-   * tag.
-   */
-  public static int computeFixed64Size(final int fieldNumber, final long value) {
-    return computeTagSize(fieldNumber) + computeFixed64SizeNoTag(value);
-  }
-
-  /**
-   * Compute the number of bytes that would be needed to encode an {@code sfixed64} field, including
-   * tag.
-   */
-  public static int computeSFixed64Size(final int fieldNumber, final long value) {
-    return computeTagSize(fieldNumber) + computeSFixed64SizeNoTag(value);
-  }
-
-  /**
-   * Compute the number of bytes that would be needed to encode a {@code float} field, including
-   * tag.
-   */
-  public static int computeFloatSize(final int fieldNumber, final float value) {
-    return computeTagSize(fieldNumber) + computeFloatSizeNoTag(value);
-  }
-
-  /**
-   * Compute the number of bytes that would be needed to encode a {@code double} field, including
-   * tag.
-   */
-  public static int computeDoubleSize(final int fieldNumber, final double value) {
-    return computeTagSize(fieldNumber) + computeDoubleSizeNoTag(value);
-  }
-
-  /**
-   * Compute the number of bytes that would be needed to encode a {@code bool} field, including tag.
-   */
-  public static int computeBoolSize(final int fieldNumber, final boolean value) {
-    return computeTagSize(fieldNumber) + computeBoolSizeNoTag(value);
-  }
-
-  /**
-   * Compute the number of bytes that would be needed to encode an enum field, including tag. The
-   * provided value is the numeric value used to represent the enum value on the wire (not the enum
-   * ordinal value).
-   */
-  public static int computeEnumSize(final int fieldNumber, final int value) {
-    return computeTagSize(fieldNumber) + computeEnumSizeNoTag(value);
-  }
-
-  /**
-   * Compute the number of bytes that would be needed to encode a {@code string} field, including
-   * tag.
-   */
-  public static int computeStringSize(final int fieldNumber, final String value) {
-    return computeTagSize(fieldNumber) + computeStringSizeNoTag(value);
-  }
-
-  /**
-   * Compute the number of bytes that would be needed to encode a {@code bytes} field, including
-   * tag.
-   */
-  public static int computeBytesSize(final int fieldNumber, final ByteString value) {
-    return computeTagSize(fieldNumber) + computeBytesSizeNoTag(value);
-  }
-
-  /**
-   * Compute the number of bytes that would be needed to encode a {@code bytes} field, including
-   * tag.
-   */
-  public static int computeByteArraySize(final int fieldNumber, final byte[] value) {
-    return computeTagSize(fieldNumber) + computeByteArraySizeNoTag(value);
-  }
-
-  /**
-   * Compute the number of bytes that would be needed to encode a {@code bytes} field, including
-   * tag.
-   */
-  public static int computeByteBufferSize(final int fieldNumber, final ByteBuffer value) {
-    return computeTagSize(fieldNumber) + computeByteBufferSizeNoTag(value);
-  }
-
-  /**
-   * Compute the number of bytes that would be needed to encode an embedded message in lazy field,
-   * including tag.
-   */
-  public static int computeLazyFieldSize(final int fieldNumber, final LazyFieldLite value) {
-    return computeTagSize(fieldNumber) + computeLazyFieldSizeNoTag(value);
-  }
-
-  /**
-   * Compute the number of bytes that would be needed to encode an embedded message field, including
-   * tag.
-   */
-  public static int computeMessageSize(final int fieldNumber, final MessageLite value) {
-    return computeTagSize(fieldNumber) + computeMessageSizeNoTag(value);
-  }
-
-  /**
-   * Compute the number of bytes that would be needed to encode an embedded message field, including
-   * tag.
-   */
-  static int computeMessageSize(
-      final int fieldNumber, final MessageLite value, final Schema schema) {
-    return computeTagSize(fieldNumber) + computeMessageSizeNoTag(value, schema);
-  }
-
-  /**
-   * Compute the number of bytes that would be needed to encode a MessageSet extension to the
-   * stream. For historical reasons, the wire format differs from normal fields.
-   */
-  public static int computeMessageSetExtensionSize(final int fieldNumber, final MessageLite value) {
-    return computeTagSize(WireFormat.MESSAGE_SET_ITEM) * 2
-        + computeUInt32Size(WireFormat.MESSAGE_SET_TYPE_ID, fieldNumber)
-        + computeMessageSize(WireFormat.MESSAGE_SET_MESSAGE, value);
-  }
-
-  /**
-   * Compute the number of bytes that would be needed to encode an unparsed MessageSet extension
-   * field to the stream. For historical reasons, the wire format differs from normal fields.
-   */
-  public static int computeRawMessageSetExtensionSize(
-      final int fieldNumber, final ByteString value) {
-    return computeTagSize(WireFormat.MESSAGE_SET_ITEM) * 2
-        + computeUInt32Size(WireFormat.MESSAGE_SET_TYPE_ID, fieldNumber)
-        + computeBytesSize(WireFormat.MESSAGE_SET_MESSAGE, value);
-  }
-
-  /**
-   * Compute the number of bytes that would be needed to encode a lazily parsed MessageSet
-   * extension field to the stream. For historical reasons, the wire format differs from normal
-   * fields.
-   */
-  public static int computeLazyFieldMessageSetExtensionSize(
-      final int fieldNumber, final LazyFieldLite value) {
-    return computeTagSize(WireFormat.MESSAGE_SET_ITEM) * 2
-        + computeUInt32Size(WireFormat.MESSAGE_SET_TYPE_ID, fieldNumber)
-        + computeLazyFieldSize(WireFormat.MESSAGE_SET_MESSAGE, value);
-  }
-
-  // -----------------------------------------------------------------
-
-  /** Compute the number of bytes that would be needed to encode a tag. */
-  public static int computeTagSize(final int fieldNumber) {
-    return computeUInt32SizeNoTag(WireFormat.makeTag(fieldNumber, 0));
-  }
-
-  /**
-   * Compute the number of bytes that would be needed to encode an {@code int32} field, including
-   * tag.
-   */
-  public static int computeInt32SizeNoTag(final int value) {
-    if (value >= 0) {
-      return computeUInt32SizeNoTag(value);
-    } else {
-      // Must sign-extend.
-      return MAX_VARINT_SIZE;
-    }
-  }
-
-  /** Compute the number of bytes that would be needed to encode a {@code uint32} field. */
-  public static int computeUInt32SizeNoTag(final int value) {
-    if ((value & (~0 << 7)) == 0) {
-      return 1;
-    }
-    if ((value & (~0 << 14)) == 0) {
-      return 2;
-    }
-    if ((value & (~0 << 21)) == 0) {
-      return 3;
-    }
-    if ((value & (~0 << 28)) == 0) {
-      return 4;
-    }
-    return 5;
-  }
-
-  /** Compute the number of bytes that would be needed to encode an {@code sint32} field. */
-  public static int computeSInt32SizeNoTag(final int value) {
-    return computeUInt32SizeNoTag(encodeZigZag32(value));
-  }
-
-  /** Compute the number of bytes that would be needed to encode a {@code fixed32} field. */
-  public static int computeFixed32SizeNoTag(@SuppressWarnings("unused") final int unused) {
-    return FIXED32_SIZE;
-  }
-
-  /** Compute the number of bytes that would be needed to encode an {@code sfixed32} field. */
-  public static int computeSFixed32SizeNoTag(@SuppressWarnings("unused") final int unused) {
-    return FIXED32_SIZE;
-  }
-
-  /**
-   * Compute the number of bytes that would be needed to encode an {@code int64} field, including
-   * tag.
-   */
-  public static int computeInt64SizeNoTag(final long value) {
-    return computeUInt64SizeNoTag(value);
-  }
-
-  /**
-   * Compute the number of bytes that would be needed to encode a {@code uint64} field, including
-   * tag.
-   */
-  public static int computeUInt64SizeNoTag(long value) {
-    // handle two popular special cases up front ...
-    if ((value & (~0L << 7)) == 0L) {
-      return 1;
-    }
-    if (value < 0L) {
-      return 10;
-    }
-    // ... leaving us with 8 remaining, which we can divide and conquer
-    int n = 2;
-    if ((value & (~0L << 35)) != 0L) {
-      n += 4;
-      value >>>= 28;
-    }
-    if ((value & (~0L << 21)) != 0L) {
-      n += 2;
-      value >>>= 14;
-    }
-    if ((value & (~0L << 14)) != 0L) {
-      n += 1;
-    }
-    return n;
-  }
-
-  /** Compute the number of bytes that would be needed to encode an {@code sint64} field. */
-  public static int computeSInt64SizeNoTag(final long value) {
-    return computeUInt64SizeNoTag(encodeZigZag64(value));
-  }
-
-  /** Compute the number of bytes that would be needed to encode a {@code fixed64} field. */
-  public static int computeFixed64SizeNoTag(@SuppressWarnings("unused") final long unused) {
-    return FIXED64_SIZE;
-  }
-
-  /** Compute the number of bytes that would be needed to encode an {@code sfixed64} field. */
-  public static int computeSFixed64SizeNoTag(@SuppressWarnings("unused") final long unused) {
-    return FIXED64_SIZE;
-  }
-
-  /**
-   * Compute the number of bytes that would be needed to encode a {@code float} field, including
-   * tag.
-   */
-  public static int computeFloatSizeNoTag(@SuppressWarnings("unused") final float unused) {
-    return FIXED32_SIZE;
-  }
-
-  /**
-   * Compute the number of bytes that would be needed to encode a {@code double} field, including
-   * tag.
-   */
-  public static int computeDoubleSizeNoTag(@SuppressWarnings("unused") final double unused) {
-    return FIXED64_SIZE;
-  }
-
-  /** Compute the number of bytes that would be needed to encode a {@code bool} field. */
-  public static int computeBoolSizeNoTag(@SuppressWarnings("unused") final boolean unused) {
-    return 1;
-  }
-
-  /**
-   * Compute the number of bytes that would be needed to encode an enum field. The provided value is
-   * the numeric value used to represent the enum value on the wire (not the enum ordinal value).
-   */
-  public static int computeEnumSizeNoTag(final int value) {
-    return computeInt32SizeNoTag(value);
-  }
-
-  /** Compute the number of bytes that would be needed to encode a {@code string} field. */
-  public static int computeStringSizeNoTag(final String value) {
-    int length;
-    try {
-      length = Utf8.encodedLength(value);
-    } catch (UnpairedSurrogateException e) {
-      // TODO(dweis): Consider using nio Charset methods instead.
-      final byte[] bytes = value.getBytes(Internal.UTF_8);
-      length = bytes.length;
-    }
-
-    return computeLengthDelimitedFieldSize(length);
-  }
-
-  /**
-   * Compute the number of bytes that would be needed to encode an embedded message stored in lazy
-   * field.
-   */
-  public static int computeLazyFieldSizeNoTag(final LazyFieldLite value) {
-    return computeLengthDelimitedFieldSize(value.getSerializedSize());
-  }
-
-  /** Compute the number of bytes that would be needed to encode a {@code bytes} field. */
-  public static int computeBytesSizeNoTag(final ByteString value) {
-    return computeLengthDelimitedFieldSize(value.size());
-  }
-
-  /** Compute the number of bytes that would be needed to encode a {@code bytes} field. */
-  public static int computeByteArraySizeNoTag(final byte[] value) {
-    return computeLengthDelimitedFieldSize(value.length);
-  }
-
-  /** Compute the number of bytes that would be needed to encode a {@code bytes} field. */
-  public static int computeByteBufferSizeNoTag(final ByteBuffer value) {
-    return computeLengthDelimitedFieldSize(value.capacity());
-  }
-
-  /** Compute the number of bytes that would be needed to encode an embedded message field. */
-  public static int computeMessageSizeNoTag(final MessageLite value) {
-    return computeLengthDelimitedFieldSize(value.getSerializedSize());
-  }
-
-  /** Compute the number of bytes that would be needed to encode an embedded message field. */
-  static int computeMessageSizeNoTag(final MessageLite value, final Schema schema) {
-    return computeLengthDelimitedFieldSize(((AbstractMessageLite) value).getSerializedSize(schema));
-  }
-
-  static int computeLengthDelimitedFieldSize(int fieldLength) {
-    return computeUInt32SizeNoTag(fieldLength) + fieldLength;
-  }
-
-  /**
-   * Encode a ZigZag-encoded 32-bit value. ZigZag encodes signed integers into values that can be
-   * efficiently encoded with varint. (Otherwise, negative values must be sign-extended to 64 bits
-   * to be varint encoded, thus always taking 10 bytes on the wire.)
-   *
-   * @param n A signed 32-bit integer.
-   * @return An unsigned 32-bit integer, stored in a signed int because Java has no explicit
-   *     unsigned support.
-   */
-  public static int encodeZigZag32(final int n) {
-    // Note:  the right-shift must be arithmetic
-    return (n << 1) ^ (n >> 31);
-  }
-
-  /**
-   * Encode a ZigZag-encoded 64-bit value. ZigZag encodes signed integers into values that can be
-   * efficiently encoded with varint. (Otherwise, negative values must be sign-extended to 64 bits
-   * to be varint encoded, thus always taking 10 bytes on the wire.)
-   *
-   * @param n A signed 64-bit integer.
-   * @return An unsigned 64-bit integer, stored in a signed int because Java has no explicit
-   *     unsigned support.
-   */
-  public static long encodeZigZag64(final long n) {
-    // Note:  the right-shift must be arithmetic
-    return (n << 1) ^ (n >> 63);
-  }
-
-  // =================================================================
-
-  /**
-   * Flushes the stream and forces any buffered bytes to be written. This does not flush the
-   * underlying OutputStream.
-   */
-  public abstract void flush() throws IOException;
-
-  /**
-   * If writing to a flat array, return the space left in the array. Otherwise, throws {@code
-   * UnsupportedOperationException}.
-   */
-  public abstract int spaceLeft();
-
-  /**
-   * Verifies that {@link #spaceLeft()} returns zero. It's common to create a byte array that is
-   * exactly big enough to hold a message, then write to it with a {@code CodedOutputStream}.
-   * Calling {@code checkNoSpaceLeft()} after writing verifies that the message was actually as big
-   * as expected, which can help catch bugs.
-   */
-  public final void checkNoSpaceLeft() {
-    if (spaceLeft() != 0) {
-      throw new IllegalStateException("Did not write as much data as expected.");
-    }
-  }
-
-  /**
-   * If you create a CodedOutputStream around a simple flat array, you must not attempt to write
-   * more bytes than the array has space. Otherwise, this exception will be thrown.
-   */
-  public static class OutOfSpaceException extends IOException {
-    private static final long serialVersionUID = -6947486886997889499L;
-
-    private static final String MESSAGE =
-        "CodedOutputStream was writing to a flat byte array and ran out of space.";
-
-    OutOfSpaceException() {
-      super(MESSAGE);
-    }
-
-    OutOfSpaceException(String explanationMessage) {
-      super(MESSAGE + ": " + explanationMessage);
-    }
-
-    OutOfSpaceException(Throwable cause) {
-      super(MESSAGE, cause);
-    }
-
-    OutOfSpaceException(String explanationMessage, Throwable cause) {
-      super(MESSAGE + ": " + explanationMessage, cause);
-    }
-  }
-
-  /**
-   * Get the total number of bytes successfully written to this stream. The returned value is not
-   * guaranteed to be accurate if exceptions have been found in the middle of writing.
-   */
-  public abstract int getTotalBytesWritten();
-
-  // =================================================================
-
-  /** Write a {@code bytes} field to the stream. Visible for testing. */
-  abstract void writeByteArrayNoTag(final byte[] value, final int offset, final int length)
-      throws IOException;
-
-  final void inefficientWriteStringNoTag(String value, UnpairedSurrogateException cause)
-      throws IOException {
-    logger.log(
-        Level.WARNING,
-        "Converting ill-formed UTF-16. Your Protocol Buffer will not round trip correctly!",
-        cause);
-
-    // Unfortunately there does not appear to be any way to tell Java to encode
-    // UTF-8 directly into our buffer, so we have to let it create its own byte
-    // array and then copy.
-    // TODO(dweis): Consider using nio Charset methods instead.
-    final byte[] bytes = value.getBytes(Internal.UTF_8);
-    try {
-      writeUInt32NoTag(bytes.length);
-      writeLazy(bytes, 0, bytes.length);
-    } catch (IndexOutOfBoundsException e) {
-      throw new OutOfSpaceException(e);
-    }
-  }
-
-  // =================================================================
-
-  /**
-   * Write a {@code group} field, including tag, to the stream.
-   *
-   * @deprecated groups are deprecated.
-   */
-  @Deprecated
-  public final void writeGroup(final int fieldNumber, final MessageLite value) throws IOException {
-    writeTag(fieldNumber, WireFormat.WIRETYPE_START_GROUP);
-    writeGroupNoTag(value);
-    writeTag(fieldNumber, WireFormat.WIRETYPE_END_GROUP);
-  }
-
-  /**
-   * Write a {@code group} field, including tag, to the stream.
-   *
-   * @deprecated groups are deprecated.
-   */
-  @Deprecated
-  final void writeGroup(final int fieldNumber, final MessageLite value, Schema schema)
-      throws IOException {
-    writeTag(fieldNumber, WireFormat.WIRETYPE_START_GROUP);
-    writeGroupNoTag(value, schema);
-    writeTag(fieldNumber, WireFormat.WIRETYPE_END_GROUP);
-  }
-
-  /**
-   * Write a {@code group} field to the stream.
-   *
-   * @deprecated groups are deprecated.
-   */
-  @Deprecated
-  public final void writeGroupNoTag(final MessageLite value) throws IOException {
-    value.writeTo(this);
-  }
-
-  /**
-   * Write a {@code group} field to the stream.
-   *
-   * @deprecated groups are deprecated.
-   */
-  @Deprecated
-  final void writeGroupNoTag(final MessageLite value, Schema schema) throws IOException {
-    schema.writeTo(value, wrapper);
-  }
-
-  /**
-   * Compute the number of bytes that would be needed to encode a {@code group} field, including
-   * tag.
-   *
-   * @deprecated groups are deprecated.
-   */
-  @Deprecated
-  public static int computeGroupSize(final int fieldNumber, final MessageLite value) {
-    return computeTagSize(fieldNumber) * 2 + value.getSerializedSize();
-  }
-
-  /**
-   * Compute the number of bytes that would be needed to encode a {@code group} field, including
-   * tag.
-   *
-   * @deprecated groups are deprecated.
-   */
-  @Deprecated
-  static int computeGroupSize(final int fieldNumber, final MessageLite value, Schema schema) {
-    return computeTagSize(fieldNumber) * 2 + computeGroupSizeNoTag(value, schema);
-  }
-
-  /** Compute the number of bytes that would be needed to encode a {@code group} field. */
-  @Deprecated
-  @InlineMe(replacement = "value.getSerializedSize()")
-  public static int computeGroupSizeNoTag(final MessageLite value) {
-    return value.getSerializedSize();
-  }
-
-  /** Compute the number of bytes that would be needed to encode a {@code group} field. */
-  @Deprecated
-  static int computeGroupSizeNoTag(final MessageLite value, Schema schema) {
-    return ((AbstractMessageLite) value).getSerializedSize(schema);
-  }
-
-  /**
-   * Encode and write a varint. {@code value} is treated as unsigned, so it won't be sign-extended
-   * if negative.
-   *
-   * @deprecated use {@link #writeUInt32NoTag} instead.
-   */
-  @Deprecated
-  @InlineMe(replacement = "this.writeUInt32NoTag(value)")
-  public final void writeRawVarint32(int value) throws IOException {
-    writeUInt32NoTag(value);
-  }
-
-  /**
-   * Encode and write a varint.
-   *
-   * @deprecated use {@link #writeUInt64NoTag} instead.
-   */
-  @Deprecated
-  @InlineMe(replacement = "this.writeUInt64NoTag(value)")
-  public final void writeRawVarint64(long value) throws IOException {
-    writeUInt64NoTag(value);
-  }
-
-  /**
-   * Compute the number of bytes that would be needed to encode a varint. {@code value} is treated
-   * as unsigned, so it won't be sign-extended if negative.
-   *
-   * @deprecated use {@link #computeUInt32SizeNoTag(int)} instead.
-   */
-  @Deprecated
-  @InlineMe(
-      replacement = "CodedOutputStream.computeUInt32SizeNoTag(value)",
-      imports = "com.google.protobuf.CodedOutputStream")
-  public static int computeRawVarint32Size(final int value) {
-    return computeUInt32SizeNoTag(value);
-  }
-
-  /**
-   * Compute the number of bytes that would be needed to encode a varint.
-   *
-   * @deprecated use {@link #computeUInt64SizeNoTag(long)} instead.
-   */
-  @Deprecated
-  @InlineMe(
-      replacement = "CodedOutputStream.computeUInt64SizeNoTag(value)",
-      imports = "com.google.protobuf.CodedOutputStream")
-  public static int computeRawVarint64Size(long value) {
-    return computeUInt64SizeNoTag(value);
-  }
-
-  /**
-   * Write a little-endian 32-bit integer.
-   *
-   * @deprecated Use {@link #writeFixed32NoTag} instead.
-   */
-  @Deprecated
-  @InlineMe(replacement = "this.writeFixed32NoTag(value)")
-  public final void writeRawLittleEndian32(final int value) throws IOException {
-    writeFixed32NoTag(value);
-  }
-
-  /**
-   * Write a little-endian 64-bit integer.
-   *
-   * @deprecated Use {@link #writeFixed64NoTag} instead.
-   */
-  @Deprecated
-  @InlineMe(replacement = "this.writeFixed64NoTag(value)")
-  public final void writeRawLittleEndian64(final long value) throws IOException {
-    writeFixed64NoTag(value);
-  }
-
-  // =================================================================
-
-  /** A {@link CodedOutputStream} that writes directly to a byte array. */
-  private static class ArrayEncoder extends CodedOutputStream {
-    private final byte[] buffer;
-    private final int offset;
-    private final int limit;
-    private int position;
-
-    ArrayEncoder(byte[] buffer, int offset, int length) {
-      if (buffer == null) {
-        throw new NullPointerException("buffer");
-      }
-      if ((offset | length | (buffer.length - (offset + length))) < 0) {
-        throw new IllegalArgumentException(
-            String.format(
-                "Array range is invalid. Buffer.length=%d, offset=%d, length=%d",
-                buffer.length, offset, length));
-      }
-      this.buffer = buffer;
-      this.offset = offset;
-      position = offset;
-      limit = offset + length;
-    }
-
-    @Override
-    public final void writeTag(final int fieldNumber, final int wireType) throws IOException {
-      writeUInt32NoTag(WireFormat.makeTag(fieldNumber, wireType));
-    }
-
-    @Override
-    public final void writeInt32(final int fieldNumber, final int value) throws IOException {
-      writeTag(fieldNumber, WireFormat.WIRETYPE_VARINT);
-      writeInt32NoTag(value);
-    }
-
-    @Override
-    public final void writeUInt32(final int fieldNumber, final int value) throws IOException {
-      writeTag(fieldNumber, WireFormat.WIRETYPE_VARINT);
-      writeUInt32NoTag(value);
-    }
-
-    @Override
-    public final void writeFixed32(final int fieldNumber, final int value) throws IOException {
-      writeTag(fieldNumber, WireFormat.WIRETYPE_FIXED32);
-      writeFixed32NoTag(value);
-    }
-
-    @Override
-    public final void writeUInt64(final int fieldNumber, final long value) throws IOException {
-      writeTag(fieldNumber, WireFormat.WIRETYPE_VARINT);
-      writeUInt64NoTag(value);
-    }
-
-    @Override
-    public final void writeFixed64(final int fieldNumber, final long value) throws IOException {
-      writeTag(fieldNumber, WireFormat.WIRETYPE_FIXED64);
-      writeFixed64NoTag(value);
-    }
-
-    @Override
-    public final void writeBool(final int fieldNumber, final boolean value) throws IOException {
-      writeTag(fieldNumber, WireFormat.WIRETYPE_VARINT);
-      write((byte) (value ? 1 : 0));
-    }
-
-    @Override
-    public final void writeString(final int fieldNumber, final String value) throws IOException {
-      writeTag(fieldNumber, WireFormat.WIRETYPE_LENGTH_DELIMITED);
-      writeStringNoTag(value);
-    }
-
-    @Override
-    public final void writeBytes(final int fieldNumber, final ByteString value) throws IOException {
-      writeTag(fieldNumber, WireFormat.WIRETYPE_LENGTH_DELIMITED);
-      writeBytesNoTag(value);
-    }
-
-    @Override
-    public final void writeByteArray(final int fieldNumber, final byte[] value) throws IOException {
-      writeByteArray(fieldNumber, value, 0, value.length);
-    }
-
-    @Override
-    public final void writeByteArray(
-        final int fieldNumber, final byte[] value, final int offset, final int length)
-        throws IOException {
-      writeTag(fieldNumber, WireFormat.WIRETYPE_LENGTH_DELIMITED);
-      writeByteArrayNoTag(value, offset, length);
-    }
-
-    @Override
-    public final void writeByteBuffer(final int fieldNumber, final ByteBuffer value)
-        throws IOException {
-      writeTag(fieldNumber, WireFormat.WIRETYPE_LENGTH_DELIMITED);
-      writeUInt32NoTag(value.capacity());
-      writeRawBytes(value);
-    }
-
-    @Override
-    public final void writeBytesNoTag(final ByteString value) throws IOException {
-      writeUInt32NoTag(value.size());
-      value.writeTo(this);
-    }
-
-    @Override
-    public final void writeByteArrayNoTag(final byte[] value, int offset, int length)
-        throws IOException {
-      writeUInt32NoTag(length);
-      write(value, offset, length);
-    }
-
-    @Override
-    public final void writeRawBytes(final ByteBuffer value) throws IOException {
-      if (value.hasArray()) {
-        write(value.array(), value.arrayOffset(), value.capacity());
-      } else {
-        ByteBuffer duplicated = value.duplicate();
-        duplicated.clear();
-        write(duplicated);
-      }
-    }
-
-    @Override
-    public final void writeMessage(final int fieldNumber, final MessageLite value)
-        throws IOException {
-      writeTag(fieldNumber, WireFormat.WIRETYPE_LENGTH_DELIMITED);
-      writeMessageNoTag(value);
-    }
-
-    @Override
-    final void writeMessage(final int fieldNumber, final MessageLite value, Schema schema)
-        throws IOException {
-      writeTag(fieldNumber, WireFormat.WIRETYPE_LENGTH_DELIMITED);
-      writeUInt32NoTag(((AbstractMessageLite) value).getSerializedSize(schema));
-      schema.writeTo(value, wrapper);
-    }
-
-    @Override
-    public final void writeMessageSetExtension(final int fieldNumber, final MessageLite value)
-        throws IOException {
-      writeTag(WireFormat.MESSAGE_SET_ITEM, WireFormat.WIRETYPE_START_GROUP);
-      writeUInt32(WireFormat.MESSAGE_SET_TYPE_ID, fieldNumber);
-      writeMessage(WireFormat.MESSAGE_SET_MESSAGE, value);
-      writeTag(WireFormat.MESSAGE_SET_ITEM, WireFormat.WIRETYPE_END_GROUP);
-    }
-
-    @Override
-    public final void writeRawMessageSetExtension(final int fieldNumber, final ByteString value)
-        throws IOException {
-      writeTag(WireFormat.MESSAGE_SET_ITEM, WireFormat.WIRETYPE_START_GROUP);
-      writeUInt32(WireFormat.MESSAGE_SET_TYPE_ID, fieldNumber);
-      writeBytes(WireFormat.MESSAGE_SET_MESSAGE, value);
-      writeTag(WireFormat.MESSAGE_SET_ITEM, WireFormat.WIRETYPE_END_GROUP);
-    }
-
-    @Override
-    public final void writeMessageNoTag(final MessageLite value) throws IOException {
-      writeUInt32NoTag(value.getSerializedSize());
-      value.writeTo(this);
-    }
-
-    @Override
-    final void writeMessageNoTag(final MessageLite value, Schema schema) throws IOException {
-      writeUInt32NoTag(((AbstractMessageLite) value).getSerializedSize(schema));
-      schema.writeTo(value, wrapper);
-    }
-
-    @Override
-    public final void write(byte value) throws IOException {
-      try {
-        buffer[position++] = value;
-      } catch (IndexOutOfBoundsException e) {
-        throw new OutOfSpaceException(
-            String.format("Pos: %d, limit: %d, len: %d", position, limit, 1), e);
-      }
-    }
-
-    @Override
-    public final void writeInt32NoTag(int value) throws IOException {
-      if (value >= 0) {
-        writeUInt32NoTag(value);
-      } else {
-        // Must sign-extend.
-        writeUInt64NoTag(value);
-      }
-    }
-
-    @Override
-    public final void writeUInt32NoTag(int value) throws IOException {
-      try {
-        while (true) {
-          if ((value & ~0x7F) == 0) {
-            buffer[position++] = (byte) value;
-            return;
-          } else {
-            buffer[position++] = (byte) ((value & 0x7F) | 0x80);
-            value >>>= 7;
-          }
-        }
-      } catch (IndexOutOfBoundsException e) {
-        throw new OutOfSpaceException(
-            String.format("Pos: %d, limit: %d, len: %d", position, limit, 1), e);
-      }
-    }
-
-    @Override
-    public final void writeFixed32NoTag(int value) throws IOException {
-      try {
-        buffer[position++] = (byte) (value & 0xFF);
-        buffer[position++] = (byte) ((value >> 8) & 0xFF);
-        buffer[position++] = (byte) ((value >> 16) & 0xFF);
-        buffer[position++] = (byte) ((value >> 24) & 0xFF);
-      } catch (IndexOutOfBoundsException e) {
-        throw new OutOfSpaceException(
-            String.format("Pos: %d, limit: %d, len: %d", position, limit, 1), e);
-      }
-    }
-
-    @Override
-    public final void writeUInt64NoTag(long value) throws IOException {
-      if (HAS_UNSAFE_ARRAY_OPERATIONS && spaceLeft() >= MAX_VARINT_SIZE) {
-        while (true) {
-          if ((value & ~0x7FL) == 0) {
-            UnsafeUtil.putByte(buffer, position++, (byte) value);
-            return;
-          } else {
-            UnsafeUtil.putByte(buffer, position++, (byte) (((int) value & 0x7F) | 0x80));
-            value >>>= 7;
-          }
-        }
-      } else {
-        try {
-          while (true) {
-            if ((value & ~0x7FL) == 0) {
-              buffer[position++] = (byte) value;
-              return;
-            } else {
-              buffer[position++] = (byte) (((int) value & 0x7F) | 0x80);
-              value >>>= 7;
-            }
-          }
-        } catch (IndexOutOfBoundsException e) {
-          throw new OutOfSpaceException(
-              String.format("Pos: %d, limit: %d, len: %d", position, limit, 1), e);
-        }
-      }
-    }
-
-    @Override
-    public final void writeFixed64NoTag(long value) throws IOException {
-      try {
-        buffer[position++] = (byte) ((int) (value) & 0xFF);
-        buffer[position++] = (byte) ((int) (value >> 8) & 0xFF);
-        buffer[position++] = (byte) ((int) (value >> 16) & 0xFF);
-        buffer[position++] = (byte) ((int) (value >> 24) & 0xFF);
-        buffer[position++] = (byte) ((int) (value >> 32) & 0xFF);
-        buffer[position++] = (byte) ((int) (value >> 40) & 0xFF);
-        buffer[position++] = (byte) ((int) (value >> 48) & 0xFF);
-        buffer[position++] = (byte) ((int) (value >> 56) & 0xFF);
-      } catch (IndexOutOfBoundsException e) {
-        throw new OutOfSpaceException(
-            String.format("Pos: %d, limit: %d, len: %d", position, limit, 1), e);
-      }
-    }
-
-    @Override
-    public final void write(byte[] value, int offset, int length) throws IOException {
-      try {
-        System.arraycopy(value, offset, buffer, position, length);
-        position += length;
-      } catch (IndexOutOfBoundsException e) {
-        throw new OutOfSpaceException(
-            String.format("Pos: %d, limit: %d, len: %d", position, limit, length), e);
-      }
-    }
-
-    @Override
-    public final void writeLazy(byte[] value, int offset, int length) throws IOException {
-      write(value, offset, length);
-    }
-
-    @Override
-    public final void write(ByteBuffer value) throws IOException {
-      final int length = value.remaining();
-      try {
-        value.get(buffer, position, length);
-        position += length;
-      } catch (IndexOutOfBoundsException e) {
-        throw new OutOfSpaceException(
-            String.format("Pos: %d, limit: %d, len: %d", position, limit, length), e);
-      }
-    }
-
-    @Override
-    public final void writeLazy(ByteBuffer value) throws IOException {
-      write(value);
-    }
-
-    @Override
-    public final void writeStringNoTag(String value) throws IOException {
-      final int oldPosition = position;
-      try {
-        // UTF-8 byte length of the string is at least its UTF-16 code unit length (value.length()),
-        // and at most 3 times of it. We take advantage of this in both branches below.
-        final int maxLength = value.length() * Utf8.MAX_BYTES_PER_CHAR;
-        final int maxLengthVarIntSize = computeUInt32SizeNoTag(maxLength);
-        final int minLengthVarIntSize = computeUInt32SizeNoTag(value.length());
-        if (minLengthVarIntSize == maxLengthVarIntSize) {
-          position = oldPosition + minLengthVarIntSize;
-          int newPosition = Utf8.encode(value, buffer, position, spaceLeft());
-          // Since this class is stateful and tracks the position, we rewind and store the state,
-          // prepend the length, then reset it back to the end of the string.
-          position = oldPosition;
-          int length = newPosition - oldPosition - minLengthVarIntSize;
-          writeUInt32NoTag(length);
-          position = newPosition;
-        } else {
-          int length = Utf8.encodedLength(value);
-          writeUInt32NoTag(length);
-          position = Utf8.encode(value, buffer, position, spaceLeft());
-        }
-      } catch (UnpairedSurrogateException e) {
-        // Roll back the change - we fall back to inefficient path.
-        position = oldPosition;
-
-        // TODO(nathanmittler): We should throw an IOException here instead.
-        inefficientWriteStringNoTag(value, e);
-      } catch (IndexOutOfBoundsException e) {
-        throw new OutOfSpaceException(e);
-      }
-    }
-
-    @Override
-    public void flush() {
-      // Do nothing.
-    }
-
-    @Override
-    public final int spaceLeft() {
-      return limit - position;
-    }
-
-    @Override
-    public final int getTotalBytesWritten() {
-      return position - offset;
-    }
-  }
-
-  /**
-   * A {@link CodedOutputStream} that writes directly to a heap {@link ByteBuffer}. Writes are done
-   * directly to the underlying array. The buffer position is only updated after a flush.
-   */
-  private static final class HeapNioEncoder extends ArrayEncoder {
-    private final ByteBuffer byteBuffer;
-    private int initialPosition;
-
-    HeapNioEncoder(ByteBuffer byteBuffer) {
-      super(
-          byteBuffer.array(),
-          byteBuffer.arrayOffset() + byteBuffer.position(),
-          byteBuffer.remaining());
-      this.byteBuffer = byteBuffer;
-      this.initialPosition = byteBuffer.position();
-    }
-
-    @Override
-    public void flush() {
-      // Update the position on the buffer.
-      byteBuffer.position(initialPosition + getTotalBytesWritten());
-    }
-  }
-
-  /**
-   * A {@link CodedOutputStream} that writes directly to a direct {@link ByteBuffer}, using only
-   * safe operations..
-   */
-  private static final class SafeDirectNioEncoder extends CodedOutputStream {
-    private final ByteBuffer originalBuffer;
-    private final ByteBuffer buffer;
-    private final int initialPosition;
-
-    SafeDirectNioEncoder(ByteBuffer buffer) {
-      this.originalBuffer = buffer;
-      this.buffer = buffer.duplicate().order(ByteOrder.LITTLE_ENDIAN);
-      initialPosition = buffer.position();
-    }
-
-    @Override
-    public void writeTag(final int fieldNumber, final int wireType) throws IOException {
-      writeUInt32NoTag(WireFormat.makeTag(fieldNumber, wireType));
-    }
-
-    @Override
-    public void writeInt32(final int fieldNumber, final int value) throws IOException {
-      writeTag(fieldNumber, WireFormat.WIRETYPE_VARINT);
-      writeInt32NoTag(value);
-    }
-
-    @Override
-    public void writeUInt32(final int fieldNumber, final int value) throws IOException {
-      writeTag(fieldNumber, WireFormat.WIRETYPE_VARINT);
-      writeUInt32NoTag(value);
-    }
-
-    @Override
-    public void writeFixed32(final int fieldNumber, final int value) throws IOException {
-      writeTag(fieldNumber, WireFormat.WIRETYPE_FIXED32);
-      writeFixed32NoTag(value);
-    }
-
-    @Override
-    public void writeUInt64(final int fieldNumber, final long value) throws IOException {
-      writeTag(fieldNumber, WireFormat.WIRETYPE_VARINT);
-      writeUInt64NoTag(value);
-    }
-
-    @Override
-    public void writeFixed64(final int fieldNumber, final long value) throws IOException {
-      writeTag(fieldNumber, WireFormat.WIRETYPE_FIXED64);
-      writeFixed64NoTag(value);
-    }
-
-    @Override
-    public void writeBool(final int fieldNumber, final boolean value) throws IOException {
-      writeTag(fieldNumber, WireFormat.WIRETYPE_VARINT);
-      write((byte) (value ? 1 : 0));
-    }
-
-    @Override
-    public void writeString(final int fieldNumber, final String value) throws IOException {
-      writeTag(fieldNumber, WireFormat.WIRETYPE_LENGTH_DELIMITED);
-      writeStringNoTag(value);
-    }
-
-    @Override
-    public void writeBytes(final int fieldNumber, final ByteString value) throws IOException {
-      writeTag(fieldNumber, WireFormat.WIRETYPE_LENGTH_DELIMITED);
-      writeBytesNoTag(value);
-    }
-
-    @Override
-    public void writeByteArray(final int fieldNumber, final byte[] value) throws IOException {
-      writeByteArray(fieldNumber, value, 0, value.length);
-    }
-
-    @Override
-    public void writeByteArray(
-        final int fieldNumber, final byte[] value, final int offset, final int length)
-        throws IOException {
-      writeTag(fieldNumber, WireFormat.WIRETYPE_LENGTH_DELIMITED);
-      writeByteArrayNoTag(value, offset, length);
-    }
-
-    @Override
-    public void writeByteBuffer(final int fieldNumber, final ByteBuffer value) throws IOException {
-      writeTag(fieldNumber, WireFormat.WIRETYPE_LENGTH_DELIMITED);
-      writeUInt32NoTag(value.capacity());
-      writeRawBytes(value);
-    }
-
-    @Override
-    public void writeMessage(final int fieldNumber, final MessageLite value) throws IOException {
-      writeTag(fieldNumber, WireFormat.WIRETYPE_LENGTH_DELIMITED);
-      writeMessageNoTag(value);
-    }
-
-    @Override
-    void writeMessage(final int fieldNumber, final MessageLite value, Schema schema)
-        throws IOException {
-      writeTag(fieldNumber, WireFormat.WIRETYPE_LENGTH_DELIMITED);
-      writeMessageNoTag(value, schema);
-    }
-
-    @Override
-    public void writeMessageSetExtension(final int fieldNumber, final MessageLite value)
-        throws IOException {
-      writeTag(WireFormat.MESSAGE_SET_ITEM, WireFormat.WIRETYPE_START_GROUP);
-      writeUInt32(WireFormat.MESSAGE_SET_TYPE_ID, fieldNumber);
-      writeMessage(WireFormat.MESSAGE_SET_MESSAGE, value);
-      writeTag(WireFormat.MESSAGE_SET_ITEM, WireFormat.WIRETYPE_END_GROUP);
-    }
-
-    @Override
-    public void writeRawMessageSetExtension(final int fieldNumber, final ByteString value)
-        throws IOException {
-      writeTag(WireFormat.MESSAGE_SET_ITEM, WireFormat.WIRETYPE_START_GROUP);
-      writeUInt32(WireFormat.MESSAGE_SET_TYPE_ID, fieldNumber);
-      writeBytes(WireFormat.MESSAGE_SET_MESSAGE, value);
-      writeTag(WireFormat.MESSAGE_SET_ITEM, WireFormat.WIRETYPE_END_GROUP);
-    }
-
-    @Override
-    public void writeMessageNoTag(final MessageLite value) throws IOException {
-      writeUInt32NoTag(value.getSerializedSize());
-      value.writeTo(this);
-    }
-
-    @Override
-    void writeMessageNoTag(final MessageLite value, Schema schema) throws IOException {
-      writeUInt32NoTag(((AbstractMessageLite) value).getSerializedSize(schema));
-      schema.writeTo(value, wrapper);
-    }
-
-    @Override
-    public void write(byte value) throws IOException {
-      try {
-        buffer.put(value);
-      } catch (BufferOverflowException e) {
-        throw new OutOfSpaceException(e);
-      }
-    }
-
-    @Override
-    public void writeBytesNoTag(final ByteString value) throws IOException {
-      writeUInt32NoTag(value.size());
-      value.writeTo(this);
-    }
-
-    @Override
-    public void writeByteArrayNoTag(final byte[] value, int offset, int length) throws IOException {
-      writeUInt32NoTag(length);
-      write(value, offset, length);
-    }
-
-    @Override
-    public void writeRawBytes(final ByteBuffer value) throws IOException {
-      if (value.hasArray()) {
-        write(value.array(), value.arrayOffset(), value.capacity());
-      } else {
-        ByteBuffer duplicated = value.duplicate();
-        duplicated.clear();
-        write(duplicated);
-      }
-    }
-
-    @Override
-    public void writeInt32NoTag(int value) throws IOException {
-      if (value >= 0) {
-        writeUInt32NoTag(value);
-      } else {
-        // Must sign-extend.
-        writeUInt64NoTag(value);
-      }
-    }
-
-    @Override
-    public void writeUInt32NoTag(int value) throws IOException {
-      try {
-        while (true) {
-          if ((value & ~0x7F) == 0) {
-            buffer.put((byte) value);
-            return;
-          } else {
-            buffer.put((byte) ((value & 0x7F) | 0x80));
-            value >>>= 7;
-          }
-        }
-      } catch (BufferOverflowException e) {
-        throw new OutOfSpaceException(e);
-      }
-    }
-
-    @Override
-    public void writeFixed32NoTag(int value) throws IOException {
-      try {
-        buffer.putInt(value);
-      } catch (BufferOverflowException e) {
-        throw new OutOfSpaceException(e);
-      }
-    }
-
-    @Override
-    public void writeUInt64NoTag(long value) throws IOException {
-      try {
-        while (true) {
-          if ((value & ~0x7FL) == 0) {
-            buffer.put((byte) value);
-            return;
-          } else {
-            buffer.put((byte) (((int) value & 0x7F) | 0x80));
-            value >>>= 7;
-          }
-        }
-      } catch (BufferOverflowException e) {
-        throw new OutOfSpaceException(e);
-      }
-    }
-
-    @Override
-    public void writeFixed64NoTag(long value) throws IOException {
-      try {
-        buffer.putLong(value);
-      } catch (BufferOverflowException e) {
-        throw new OutOfSpaceException(e);
-      }
-    }
-
-    @Override
-    public void write(byte[] value, int offset, int length) throws IOException {
-      try {
-        buffer.put(value, offset, length);
-      } catch (IndexOutOfBoundsException e) {
-        throw new OutOfSpaceException(e);
-      } catch (BufferOverflowException e) {
-        throw new OutOfSpaceException(e);
-      }
-    }
-
-    @Override
-    public void writeLazy(byte[] value, int offset, int length) throws IOException {
-      write(value, offset, length);
-    }
-
-    @Override
-    public void write(ByteBuffer value) throws IOException {
-      try {
-        buffer.put(value);
-      } catch (BufferOverflowException e) {
-        throw new OutOfSpaceException(e);
-      }
-    }
-
-    @Override
-    public void writeLazy(ByteBuffer value) throws IOException {
-      write(value);
-    }
-
-    @Override
-    public void writeStringNoTag(String value) throws IOException {
-      final int startPos = buffer.position();
-      try {
-        // UTF-8 byte length of the string is at least its UTF-16 code unit length (value.length()),
-        // and at most 3 times of it. We take advantage of this in both branches below.
-        final int maxEncodedSize = value.length() * Utf8.MAX_BYTES_PER_CHAR;
-        final int maxLengthVarIntSize = computeUInt32SizeNoTag(maxEncodedSize);
-        final int minLengthVarIntSize = computeUInt32SizeNoTag(value.length());
-        if (minLengthVarIntSize == maxLengthVarIntSize) {
-          // Save the current position and increment past the length field. We'll come back
-          // and write the length field after the encoding is complete.
-          final int startOfBytes = buffer.position() + minLengthVarIntSize;
-          buffer.position(startOfBytes);
-
-          // Encode the string.
-          encode(value);
-
-          // Now go back to the beginning and write the length.
-          int endOfBytes = buffer.position();
-          buffer.position(startPos);
-          writeUInt32NoTag(endOfBytes - startOfBytes);
-
-          // Reposition the buffer past the written data.
-          buffer.position(endOfBytes);
-        } else {
-          final int length = Utf8.encodedLength(value);
-          writeUInt32NoTag(length);
-          encode(value);
-        }
-      } catch (UnpairedSurrogateException e) {
-        // Roll back the change and convert to an IOException.
-        buffer.position(startPos);
-
-        // TODO(nathanmittler): We should throw an IOException here instead.
-        inefficientWriteStringNoTag(value, e);
-      } catch (IllegalArgumentException e) {
-        // Thrown by buffer.position() if out of range.
-        throw new OutOfSpaceException(e);
-      }
-    }
-
-    @Override
-    public void flush() {
-      // Update the position of the original buffer.
-      originalBuffer.position(buffer.position());
-    }
-
-    @Override
-    public int spaceLeft() {
-      return buffer.remaining();
-    }
-
-    @Override
-    public int getTotalBytesWritten() {
-      return buffer.position() - initialPosition;
-    }
-
-    private void encode(String value) throws IOException {
-      try {
-        Utf8.encodeUtf8(value, buffer);
-      } catch (IndexOutOfBoundsException e) {
-        throw new OutOfSpaceException(e);
-      }
-    }
-  }
-
-  /**
-   * A {@link CodedOutputStream} that writes directly to a direct {@link ByteBuffer} using {@code
-   * sun.misc.Unsafe}.
-   */
-  private static final class UnsafeDirectNioEncoder extends CodedOutputStream {
-    private final ByteBuffer originalBuffer;
-    private final ByteBuffer buffer;
-    private final long address;
-    private final long initialPosition;
-    private final long limit;
-    private final long oneVarintLimit;
-    private long position;
-
-    UnsafeDirectNioEncoder(ByteBuffer buffer) {
-      this.originalBuffer = buffer;
-      this.buffer = buffer.duplicate().order(ByteOrder.LITTLE_ENDIAN);
-      address = UnsafeUtil.addressOffset(buffer);
-      initialPosition = address + buffer.position();
-      limit = address + buffer.limit();
-      oneVarintLimit = limit - MAX_VARINT_SIZE;
-      position = initialPosition;
-    }
-
-    static boolean isSupported() {
-      return UnsafeUtil.hasUnsafeByteBufferOperations();
-    }
-
-    @Override
-    public void writeTag(int fieldNumber, int wireType) throws IOException {
-      writeUInt32NoTag(WireFormat.makeTag(fieldNumber, wireType));
-    }
-
-    @Override
-    public void writeInt32(int fieldNumber, int value) throws IOException {
-      writeTag(fieldNumber, WireFormat.WIRETYPE_VARINT);
-      writeInt32NoTag(value);
-    }
-
-    @Override
-    public void writeUInt32(int fieldNumber, int value) throws IOException {
-      writeTag(fieldNumber, WireFormat.WIRETYPE_VARINT);
-      writeUInt32NoTag(value);
-    }
-
-    @Override
-    public void writeFixed32(int fieldNumber, int value) throws IOException {
-      writeTag(fieldNumber, WireFormat.WIRETYPE_FIXED32);
-      writeFixed32NoTag(value);
-    }
-
-    @Override
-    public void writeUInt64(int fieldNumber, long value) throws IOException {
-      writeTag(fieldNumber, WireFormat.WIRETYPE_VARINT);
-      writeUInt64NoTag(value);
-    }
-
-    @Override
-    public void writeFixed64(int fieldNumber, long value) throws IOException {
-      writeTag(fieldNumber, WireFormat.WIRETYPE_FIXED64);
-      writeFixed64NoTag(value);
-    }
-
-    @Override
-    public void writeBool(int fieldNumber, boolean value) throws IOException {
-      writeTag(fieldNumber, WireFormat.WIRETYPE_VARINT);
-      write((byte) (value ? 1 : 0));
-    }
-
-    @Override
-    public void writeString(int fieldNumber, String value) throws IOException {
-      writeTag(fieldNumber, WireFormat.WIRETYPE_LENGTH_DELIMITED);
-      writeStringNoTag(value);
-    }
-
-    @Override
-    public void writeBytes(int fieldNumber, ByteString value) throws IOException {
-      writeTag(fieldNumber, WireFormat.WIRETYPE_LENGTH_DELIMITED);
-      writeBytesNoTag(value);
-    }
-
-    @Override
-    public void writeByteArray(int fieldNumber, byte[] value) throws IOException {
-      writeByteArray(fieldNumber, value, 0, value.length);
-    }
-
-    @Override
-    public void writeByteArray(int fieldNumber, byte[] value, int offset, int length)
-        throws IOException {
-      writeTag(fieldNumber, WireFormat.WIRETYPE_LENGTH_DELIMITED);
-      writeByteArrayNoTag(value, offset, length);
-    }
-
-    @Override
-    public void writeByteBuffer(int fieldNumber, ByteBuffer value) throws IOException {
-      writeTag(fieldNumber, WireFormat.WIRETYPE_LENGTH_DELIMITED);
-      writeUInt32NoTag(value.capacity());
-      writeRawBytes(value);
-    }
-
-    @Override
-    public void writeMessage(int fieldNumber, MessageLite value) throws IOException {
-      writeTag(fieldNumber, WireFormat.WIRETYPE_LENGTH_DELIMITED);
-      writeMessageNoTag(value);
-    }
-
-    @Override
-    void writeMessage(int fieldNumber, MessageLite value, Schema schema) throws IOException {
-      writeTag(fieldNumber, WireFormat.WIRETYPE_LENGTH_DELIMITED);
-      writeMessageNoTag(value, schema);
-    }
-
-    @Override
-    public void writeMessageSetExtension(int fieldNumber, MessageLite value) throws IOException {
-      writeTag(WireFormat.MESSAGE_SET_ITEM, WireFormat.WIRETYPE_START_GROUP);
-      writeUInt32(WireFormat.MESSAGE_SET_TYPE_ID, fieldNumber);
-      writeMessage(WireFormat.MESSAGE_SET_MESSAGE, value);
-      writeTag(WireFormat.MESSAGE_SET_ITEM, WireFormat.WIRETYPE_END_GROUP);
-    }
-
-    @Override
-    public void writeRawMessageSetExtension(int fieldNumber, ByteString value) throws IOException {
-      writeTag(WireFormat.MESSAGE_SET_ITEM, WireFormat.WIRETYPE_START_GROUP);
-      writeUInt32(WireFormat.MESSAGE_SET_TYPE_ID, fieldNumber);
-      writeBytes(WireFormat.MESSAGE_SET_MESSAGE, value);
-      writeTag(WireFormat.MESSAGE_SET_ITEM, WireFormat.WIRETYPE_END_GROUP);
-    }
-
-    @Override
-    public void writeMessageNoTag(MessageLite value) throws IOException {
-      writeUInt32NoTag(value.getSerializedSize());
-      value.writeTo(this);
-    }
-
-    @Override
-    void writeMessageNoTag(MessageLite value, Schema schema) throws IOException {
-      writeUInt32NoTag(((AbstractMessageLite) value).getSerializedSize(schema));
-      schema.writeTo(value, wrapper);
-    }
-
-    @Override
-    public void write(byte value) throws IOException {
-      if (position >= limit) {
-        throw new OutOfSpaceException(
-            String.format("Pos: %d, limit: %d, len: %d", position, limit, 1));
-      }
-      UnsafeUtil.putByte(position++, value);
-    }
-
-    @Override
-    public void writeBytesNoTag(ByteString value) throws IOException {
-      writeUInt32NoTag(value.size());
-      value.writeTo(this);
-    }
-
-    @Override
-    public void writeByteArrayNoTag(byte[] value, int offset, int length) throws IOException {
-      writeUInt32NoTag(length);
-      write(value, offset, length);
-    }
-
-    @Override
-    public void writeRawBytes(ByteBuffer value) throws IOException {
-      if (value.hasArray()) {
-        write(value.array(), value.arrayOffset(), value.capacity());
-      } else {
-        ByteBuffer duplicated = value.duplicate();
-        duplicated.clear();
-        write(duplicated);
-      }
-    }
-
-    @Override
-    public void writeInt32NoTag(int value) throws IOException {
-      if (value >= 0) {
-        writeUInt32NoTag(value);
-      } else {
-        // Must sign-extend.
-        writeUInt64NoTag(value);
-      }
-    }
-
-    @Override
-    public void writeUInt32NoTag(int value) throws IOException {
-      if (position <= oneVarintLimit) {
-        // Optimization to avoid bounds checks on each iteration.
-        while (true) {
-          if ((value & ~0x7F) == 0) {
-            UnsafeUtil.putByte(position++, (byte) value);
-            return;
-          } else {
-            UnsafeUtil.putByte(position++, (byte) ((value & 0x7F) | 0x80));
-            value >>>= 7;
-          }
-        }
-      } else {
-        while (position < limit) {
-          if ((value & ~0x7F) == 0) {
-            UnsafeUtil.putByte(position++, (byte) value);
-            return;
-          } else {
-            UnsafeUtil.putByte(position++, (byte) ((value & 0x7F) | 0x80));
-            value >>>= 7;
-          }
-        }
-        throw new OutOfSpaceException(
-            String.format("Pos: %d, limit: %d, len: %d", position, limit, 1));
-      }
-    }
-
-    @Override
-    public void writeFixed32NoTag(int value) throws IOException {
-      buffer.putInt(bufferPos(position), value);
-      position += FIXED32_SIZE;
-    }
-
-    @Override
-    public void writeUInt64NoTag(long value) throws IOException {
-      if (position <= oneVarintLimit) {
-        // Optimization to avoid bounds checks on each iteration.
-        while (true) {
-          if ((value & ~0x7FL) == 0) {
-            UnsafeUtil.putByte(position++, (byte) value);
-            return;
-          } else {
-            UnsafeUtil.putByte(position++, (byte) (((int) value & 0x7F) | 0x80));
-            value >>>= 7;
-          }
-        }
-      } else {
-        while (position < limit) {
-          if ((value & ~0x7FL) == 0) {
-            UnsafeUtil.putByte(position++, (byte) value);
-            return;
-          } else {
-            UnsafeUtil.putByte(position++, (byte) (((int) value & 0x7F) | 0x80));
-            value >>>= 7;
-          }
-        }
-        throw new OutOfSpaceException(
-            String.format("Pos: %d, limit: %d, len: %d", position, limit, 1));
-      }
-    }
-
-    @Override
-    public void writeFixed64NoTag(long value) throws IOException {
-      buffer.putLong(bufferPos(position), value);
-      position += FIXED64_SIZE;
-    }
-
-    @Override
-    public void write(byte[] value, int offset, int length) throws IOException {
-      if (value == null
-          || offset < 0
-          || length < 0
-          || (value.length - length) < offset
-          || (limit - length) < position) {
-        if (value == null) {
-          throw new NullPointerException("value");
-        }
-        throw new OutOfSpaceException(
-            String.format("Pos: %d, limit: %d, len: %d", position, limit, length));
-      }
-
-      UnsafeUtil.copyMemory(value, offset, position, length);
-      position += length;
-    }
-
-    @Override
-    public void writeLazy(byte[] value, int offset, int length) throws IOException {
-      write(value, offset, length);
-    }
-
-    @Override
-    public void write(ByteBuffer value) throws IOException {
-      try {
-        int length = value.remaining();
-        repositionBuffer(position);
-        buffer.put(value);
-        position += length;
-      } catch (BufferOverflowException e) {
-        throw new OutOfSpaceException(e);
-      }
-    }
-
-    @Override
-    public void writeLazy(ByteBuffer value) throws IOException {
-      write(value);
-    }
-
-    @Override
-    public void writeStringNoTag(String value) throws IOException {
-      long prevPos = position;
-      try {
-        // UTF-8 byte length of the string is at least its UTF-16 code unit length (value.length()),
-        // and at most 3 times of it. We take advantage of this in both branches below.
-        int maxEncodedSize = value.length() * Utf8.MAX_BYTES_PER_CHAR;
-        int maxLengthVarIntSize = computeUInt32SizeNoTag(maxEncodedSize);
-        int minLengthVarIntSize = computeUInt32SizeNoTag(value.length());
-        if (minLengthVarIntSize == maxLengthVarIntSize) {
-          // Save the current position and increment past the length field. We'll come back
-          // and write the length field after the encoding is complete.
-          int stringStart = bufferPos(position) + minLengthVarIntSize;
-          buffer.position(stringStart);
-
-          // Encode the string.
-          Utf8.encodeUtf8(value, buffer);
-
-          // Write the length and advance the position.
-          int length = buffer.position() - stringStart;
-          writeUInt32NoTag(length);
-          position += length;
-        } else {
-          // Calculate and write the encoded length.
-          int length = Utf8.encodedLength(value);
-          writeUInt32NoTag(length);
-
-          // Write the string and advance the position.
-          repositionBuffer(position);
-          Utf8.encodeUtf8(value, buffer);
-          position += length;
-        }
-      } catch (UnpairedSurrogateException e) {
-        // Roll back the change and convert to an IOException.
-        position = prevPos;
-        repositionBuffer(position);
-
-        // TODO(nathanmittler): We should throw an IOException here instead.
-        inefficientWriteStringNoTag(value, e);
-      } catch (IllegalArgumentException e) {
-        // Thrown by buffer.position() if out of range.
-        throw new OutOfSpaceException(e);
-      } catch (IndexOutOfBoundsException e) {
-        throw new OutOfSpaceException(e);
-      }
-    }
-
-    @Override
-    public void flush() {
-      // Update the position of the original buffer.
-      originalBuffer.position(bufferPos(position));
-    }
-
-    @Override
-    public int spaceLeft() {
-      return (int) (limit - position);
-    }
-
-    @Override
-    public int getTotalBytesWritten() {
-      return (int) (position - initialPosition);
-    }
-
-    private void repositionBuffer(long pos) {
-      buffer.position(bufferPos(pos));
-    }
-
-    private int bufferPos(long pos) {
-      return (int) (pos - address);
-    }
-  }
-
-  /** Abstract base class for buffered encoders. */
-  private abstract static class AbstractBufferedEncoder extends CodedOutputStream {
-    final byte[] buffer;
-    final int limit;
-    int position;
-    int totalBytesWritten;
-
-    AbstractBufferedEncoder(int bufferSize) {
-      if (bufferSize < 0) {
-        throw new IllegalArgumentException("bufferSize must be >= 0");
-      }
-      // As an optimization, we require that the buffer be able to store at least 2
-      // varints so that we can buffer any integer write (tag + value). This reduces the
-      // number of range checks for a single write to 1 (i.e. if there is not enough space
-      // to buffer the tag+value, flush and then buffer it).
-      this.buffer = new byte[max(bufferSize, MAX_VARINT_SIZE * 2)];
-      this.limit = buffer.length;
-    }
-
-    @Override
-    public final int spaceLeft() {
-      throw new UnsupportedOperationException(
-          "spaceLeft() can only be called on CodedOutputStreams that are "
-              + "writing to a flat array or ByteBuffer.");
-    }
-
-    @Override
-    public final int getTotalBytesWritten() {
-      return totalBytesWritten;
-    }
-
-    /**
-     * This method does not perform bounds checking on the array. Checking array bounds is the
-     * responsibility of the caller.
-     */
-    final void buffer(byte value) {
-      buffer[position++] = value;
-      totalBytesWritten++;
-    }
-
-    /**
-     * This method does not perform bounds checking on the array. Checking array bounds is the
-     * responsibility of the caller.
-     */
-    final void bufferTag(final int fieldNumber, final int wireType) {
-      bufferUInt32NoTag(WireFormat.makeTag(fieldNumber, wireType));
-    }
-
-    /**
-     * This method does not perform bounds checking on the array. Checking array bounds is the
-     * responsibility of the caller.
-     */
-    final void bufferInt32NoTag(final int value) {
-      if (value >= 0) {
-        bufferUInt32NoTag(value);
-      } else {
-        // Must sign-extend.
-        bufferUInt64NoTag(value);
-      }
-    }
-
-    /**
-     * This method does not perform bounds checking on the array. Checking array bounds is the
-     * responsibility of the caller.
-     */
-    final void bufferUInt32NoTag(int value) {
-      if (HAS_UNSAFE_ARRAY_OPERATIONS) {
-        final long originalPos = position;
-        while (true) {
-          if ((value & ~0x7F) == 0) {
-            UnsafeUtil.putByte(buffer, position++, (byte) value);
-            break;
-          } else {
-            UnsafeUtil.putByte(buffer, position++, (byte) ((value & 0x7F) | 0x80));
-            value >>>= 7;
-          }
-        }
-        int delta = (int) (position - originalPos);
-        totalBytesWritten += delta;
-      } else {
-        while (true) {
-          if ((value & ~0x7F) == 0) {
-            buffer[position++] = (byte) value;
-            totalBytesWritten++;
-            return;
-          } else {
-            buffer[position++] = (byte) ((value & 0x7F) | 0x80);
-            totalBytesWritten++;
-            value >>>= 7;
-          }
-        }
-      }
-    }
-
-    /**
-     * This method does not perform bounds checking on the array. Checking array bounds is the
-     * responsibility of the caller.
-     */
-    final void bufferUInt64NoTag(long value) {
-      if (HAS_UNSAFE_ARRAY_OPERATIONS) {
-        final long originalPos = position;
-        while (true) {
-          if ((value & ~0x7FL) == 0) {
-            UnsafeUtil.putByte(buffer, position++, (byte) value);
-            break;
-          } else {
-            UnsafeUtil.putByte(buffer, position++, (byte) (((int) value & 0x7F) | 0x80));
-            value >>>= 7;
-          }
-        }
-        int delta = (int) (position - originalPos);
-        totalBytesWritten += delta;
-      } else {
-        while (true) {
-          if ((value & ~0x7FL) == 0) {
-            buffer[position++] = (byte) value;
-            totalBytesWritten++;
-            return;
-          } else {
-            buffer[position++] = (byte) (((int) value & 0x7F) | 0x80);
-            totalBytesWritten++;
-            value >>>= 7;
-          }
-        }
-      }
-    }
-
-    /**
-     * This method does not perform bounds checking on the array. Checking array bounds is the
-     * responsibility of the caller.
-     */
-    final void bufferFixed32NoTag(int value) {
-      buffer[position++] = (byte) (value & 0xFF);
-      buffer[position++] = (byte) ((value >> 8) & 0xFF);
-      buffer[position++] = (byte) ((value >> 16) & 0xFF);
-      buffer[position++] = (byte) ((value >> 24) & 0xFF);
-      totalBytesWritten += FIXED32_SIZE;
-    }
-
-    /**
-     * This method does not perform bounds checking on the array. Checking array bounds is the
-     * responsibility of the caller.
-     */
-    final void bufferFixed64NoTag(long value) {
-      buffer[position++] = (byte) (value & 0xFF);
-      buffer[position++] = (byte) ((value >> 8) & 0xFF);
-      buffer[position++] = (byte) ((value >> 16) & 0xFF);
-      buffer[position++] = (byte) ((value >> 24) & 0xFF);
-      buffer[position++] = (byte) ((int) (value >> 32) & 0xFF);
-      buffer[position++] = (byte) ((int) (value >> 40) & 0xFF);
-      buffer[position++] = (byte) ((int) (value >> 48) & 0xFF);
-      buffer[position++] = (byte) ((int) (value >> 56) & 0xFF);
-      totalBytesWritten += FIXED64_SIZE;
-    }
-  }
-
-  /**
-   * A {@link CodedOutputStream} that decorates a {@link ByteOutput}. It internal buffer only to
-   * support string encoding operations. All other writes are just passed through to the {@link
-   * ByteOutput}.
-   */
-  private static final class ByteOutputEncoder extends AbstractBufferedEncoder {
-    private final ByteOutput out;
-
-    ByteOutputEncoder(ByteOutput out, int bufferSize) {
-      super(bufferSize);
-      if (out == null) {
-        throw new NullPointerException("out");
-      }
-      this.out = out;
-    }
-
-    @Override
-    public void writeTag(final int fieldNumber, final int wireType) throws IOException {
-      writeUInt32NoTag(WireFormat.makeTag(fieldNumber, wireType));
-    }
-
-    @Override
-    public void writeInt32(final int fieldNumber, final int value) throws IOException {
-      flushIfNotAvailable(MAX_VARINT_SIZE * 2);
-      bufferTag(fieldNumber, WireFormat.WIRETYPE_VARINT);
-      bufferInt32NoTag(value);
-    }
-
-    @Override
-    public void writeUInt32(final int fieldNumber, final int value) throws IOException {
-      flushIfNotAvailable(MAX_VARINT_SIZE * 2);
-      bufferTag(fieldNumber, WireFormat.WIRETYPE_VARINT);
-      bufferUInt32NoTag(value);
-    }
-
-    @Override
-    public void writeFixed32(final int fieldNumber, final int value) throws IOException {
-      flushIfNotAvailable(MAX_VARINT_SIZE + FIXED32_SIZE);
-      bufferTag(fieldNumber, WireFormat.WIRETYPE_FIXED32);
-      bufferFixed32NoTag(value);
-    }
-
-    @Override
-    public void writeUInt64(final int fieldNumber, final long value) throws IOException {
-      flushIfNotAvailable(MAX_VARINT_SIZE * 2);
-      bufferTag(fieldNumber, WireFormat.WIRETYPE_VARINT);
-      bufferUInt64NoTag(value);
-    }
-
-    @Override
-    public void writeFixed64(final int fieldNumber, final long value) throws IOException {
-      flushIfNotAvailable(MAX_VARINT_SIZE + FIXED64_SIZE);
-      bufferTag(fieldNumber, WireFormat.WIRETYPE_FIXED64);
-      bufferFixed64NoTag(value);
-    }
-
-    @Override
-    public void writeBool(final int fieldNumber, final boolean value) throws IOException {
-      flushIfNotAvailable(MAX_VARINT_SIZE + 1);
-      bufferTag(fieldNumber, WireFormat.WIRETYPE_VARINT);
-      buffer((byte) (value ? 1 : 0));
-    }
-
-    @Override
-    public void writeString(final int fieldNumber, final String value) throws IOException {
-      writeTag(fieldNumber, WireFormat.WIRETYPE_LENGTH_DELIMITED);
-      writeStringNoTag(value);
-    }
-
-    @Override
-    public void writeBytes(final int fieldNumber, final ByteString value) throws IOException {
-      writeTag(fieldNumber, WireFormat.WIRETYPE_LENGTH_DELIMITED);
-      writeBytesNoTag(value);
-    }
-
-    @Override
-    public void writeByteArray(final int fieldNumber, final byte[] value) throws IOException {
-      writeByteArray(fieldNumber, value, 0, value.length);
-    }
-
-    @Override
-    public void writeByteArray(
-        final int fieldNumber, final byte[] value, final int offset, final int length)
-        throws IOException {
-      writeTag(fieldNumber, WireFormat.WIRETYPE_LENGTH_DELIMITED);
-      writeByteArrayNoTag(value, offset, length);
-    }
-
-    @Override
-    public void writeByteBuffer(final int fieldNumber, final ByteBuffer value) throws IOException {
-      writeTag(fieldNumber, WireFormat.WIRETYPE_LENGTH_DELIMITED);
-      writeUInt32NoTag(value.capacity());
-      writeRawBytes(value);
-    }
-
-    @Override
-    public void writeBytesNoTag(final ByteString value) throws IOException {
-      writeUInt32NoTag(value.size());
-      value.writeTo(this);
-    }
-
-    @Override
-    public void writeByteArrayNoTag(final byte[] value, int offset, int length) throws IOException {
-      writeUInt32NoTag(length);
-      write(value, offset, length);
-    }
-
-    @Override
-    public void writeRawBytes(final ByteBuffer value) throws IOException {
-      if (value.hasArray()) {
-        write(value.array(), value.arrayOffset(), value.capacity());
-      } else {
-        ByteBuffer duplicated = value.duplicate();
-        duplicated.clear();
-        write(duplicated);
-      }
-    }
-
-    @Override
-    public void writeMessage(final int fieldNumber, final MessageLite value) throws IOException {
-      writeTag(fieldNumber, WireFormat.WIRETYPE_LENGTH_DELIMITED);
-      writeMessageNoTag(value);
-    }
-
-    @Override
-    void writeMessage(final int fieldNumber, final MessageLite value, Schema schema)
-        throws IOException {
-      writeTag(fieldNumber, WireFormat.WIRETYPE_LENGTH_DELIMITED);
-      writeMessageNoTag(value, schema);
-    }
-
-    @Override
-    public void writeMessageSetExtension(final int fieldNumber, final MessageLite value)
-        throws IOException {
-      writeTag(WireFormat.MESSAGE_SET_ITEM, WireFormat.WIRETYPE_START_GROUP);
-      writeUInt32(WireFormat.MESSAGE_SET_TYPE_ID, fieldNumber);
-      writeMessage(WireFormat.MESSAGE_SET_MESSAGE, value);
-      writeTag(WireFormat.MESSAGE_SET_ITEM, WireFormat.WIRETYPE_END_GROUP);
-    }
-
-    @Override
-    public void writeRawMessageSetExtension(final int fieldNumber, final ByteString value)
-        throws IOException {
-      writeTag(WireFormat.MESSAGE_SET_ITEM, WireFormat.WIRETYPE_START_GROUP);
-      writeUInt32(WireFormat.MESSAGE_SET_TYPE_ID, fieldNumber);
-      writeBytes(WireFormat.MESSAGE_SET_MESSAGE, value);
-      writeTag(WireFormat.MESSAGE_SET_ITEM, WireFormat.WIRETYPE_END_GROUP);
-    }
-
-    @Override
-    public void writeMessageNoTag(final MessageLite value) throws IOException {
-      writeUInt32NoTag(value.getSerializedSize());
-      value.writeTo(this);
-    }
-
-    @Override
-    void writeMessageNoTag(final MessageLite value, Schema schema) throws IOException {
-      writeUInt32NoTag(((AbstractMessageLite) value).getSerializedSize(schema));
-      schema.writeTo(value, wrapper);
-    }
-
-    @Override
-    public void write(byte value) throws IOException {
-      if (position == limit) {
-        doFlush();
-      }
-
-      buffer(value);
-    }
-
-    @Override
-    public void writeInt32NoTag(int value) throws IOException {
-      if (value >= 0) {
-        writeUInt32NoTag(value);
-      } else {
-        // Must sign-extend.
-        writeUInt64NoTag(value);
-      }
-    }
-
-    @Override
-    public void writeUInt32NoTag(int value) throws IOException {
-      flushIfNotAvailable(MAX_VARINT32_SIZE);
-      bufferUInt32NoTag(value);
-    }
-
-    @Override
-    public void writeFixed32NoTag(final int value) throws IOException {
-      flushIfNotAvailable(FIXED32_SIZE);
-      bufferFixed32NoTag(value);
-    }
-
-    @Override
-    public void writeUInt64NoTag(long value) throws IOException {
-      flushIfNotAvailable(MAX_VARINT_SIZE);
-      bufferUInt64NoTag(value);
-    }
-
-    @Override
-    public void writeFixed64NoTag(final long value) throws IOException {
-      flushIfNotAvailable(FIXED64_SIZE);
-      bufferFixed64NoTag(value);
-    }
-
-    @Override
-    public void writeStringNoTag(String value) throws IOException {
-      // UTF-8 byte length of the string is at least its UTF-16 code unit length (value.length()),
-      // and at most 3 times of it. We take advantage of this in both branches below.
-      final int maxLength = value.length() * Utf8.MAX_BYTES_PER_CHAR;
-      final int maxLengthVarIntSize = computeUInt32SizeNoTag(maxLength);
-
-      // If we are streaming and the potential length is too big to fit in our buffer, we take the
-      // slower path.
-      if (maxLengthVarIntSize + maxLength > limit) {
-        // Allocate a byte[] that we know can fit the string and encode into it. String.getBytes()
-        // does the same internally and then does *another copy* to return a byte[] of exactly the
-        // right size. We can skip that copy and just writeRawBytes up to the actualLength of the
-        // UTF-8 encoded bytes.
-        final byte[] encodedBytes = new byte[maxLength];
-        int actualLength = Utf8.encode(value, encodedBytes, 0, maxLength);
-        writeUInt32NoTag(actualLength);
-        writeLazy(encodedBytes, 0, actualLength);
-        return;
-      }
-
-      // Fast path: we have enough space available in our buffer for the string...
-      if (maxLengthVarIntSize + maxLength > limit - position) {
-        // Flush to free up space.
-        doFlush();
-      }
-
-      final int oldPosition = position;
-      try {
-        // Optimize for the case where we know this length results in a constant varint length as
-        // this saves a pass for measuring the length of the string.
-        final int minLengthVarIntSize = computeUInt32SizeNoTag(value.length());
-
-        if (minLengthVarIntSize == maxLengthVarIntSize) {
-          position = oldPosition + minLengthVarIntSize;
-          int newPosition = Utf8.encode(value, buffer, position, limit - position);
-          // Since this class is stateful and tracks the position, we rewind and store the state,
-          // prepend the length, then reset it back to the end of the string.
-          position = oldPosition;
-          int length = newPosition - oldPosition - minLengthVarIntSize;
-          bufferUInt32NoTag(length);
-          position = newPosition;
-          totalBytesWritten += length;
-        } else {
-          int length = Utf8.encodedLength(value);
-          bufferUInt32NoTag(length);
-          position = Utf8.encode(value, buffer, position, length);
-          totalBytesWritten += length;
-        }
-      } catch (UnpairedSurrogateException e) {
-        // Roll back the change and convert to an IOException.
-        totalBytesWritten -= position - oldPosition;
-        position = oldPosition;
-
-        // TODO(nathanmittler): We should throw an IOException here instead.
-        inefficientWriteStringNoTag(value, e);
-      } catch (IndexOutOfBoundsException e) {
-        throw new OutOfSpaceException(e);
-      }
-    }
-
-    @Override
-    public void flush() throws IOException {
-      if (position > 0) {
-        // Flush the buffer.
-        doFlush();
-      }
-    }
-
-    @Override
-    public void write(byte[] value, int offset, int length) throws IOException {
-      flush();
-      out.write(value, offset, length);
-      totalBytesWritten += length;
-    }
-
-    @Override
-    public void writeLazy(byte[] value, int offset, int length) throws IOException {
-      flush();
-      out.writeLazy(value, offset, length);
-      totalBytesWritten += length;
-    }
-
-    @Override
-    public void write(ByteBuffer value) throws IOException {
-      flush();
-      int length = value.remaining();
-      out.write(value);
-      totalBytesWritten += length;
-    }
-
-    @Override
-    public void writeLazy(ByteBuffer value) throws IOException {
-      flush();
-      int length = value.remaining();
-      out.writeLazy(value);
-      totalBytesWritten += length;
-    }
-
-    private void flushIfNotAvailable(int requiredSize) throws IOException {
-      if (limit - position < requiredSize) {
-        doFlush();
-      }
-    }
-
-    private void doFlush() throws IOException {
-      out.write(buffer, 0, position);
-      position = 0;
-    }
-  }
-
-  /**
-   * An {@link CodedOutputStream} that decorates an {@link OutputStream}. It performs internal
-   * buffering to optimize writes to the {@link OutputStream}.
-   */
-  private static final class OutputStreamEncoder extends AbstractBufferedEncoder {
-    private final OutputStream out;
-
-    OutputStreamEncoder(OutputStream out, int bufferSize) {
-      super(bufferSize);
-      if (out == null) {
-        throw new NullPointerException("out");
-      }
-      this.out = out;
-    }
-
-    @Override
-    public void writeTag(final int fieldNumber, final int wireType) throws IOException {
-      writeUInt32NoTag(WireFormat.makeTag(fieldNumber, wireType));
-    }
-
-    @Override
-    public void writeInt32(final int fieldNumber, final int value) throws IOException {
-      flushIfNotAvailable(MAX_VARINT_SIZE * 2);
-      bufferTag(fieldNumber, WireFormat.WIRETYPE_VARINT);
-      bufferInt32NoTag(value);
-    }
-
-    @Override
-    public void writeUInt32(final int fieldNumber, final int value) throws IOException {
-      flushIfNotAvailable(MAX_VARINT_SIZE * 2);
-      bufferTag(fieldNumber, WireFormat.WIRETYPE_VARINT);
-      bufferUInt32NoTag(value);
-    }
-
-    @Override
-    public void writeFixed32(final int fieldNumber, final int value) throws IOException {
-      flushIfNotAvailable(MAX_VARINT_SIZE + FIXED32_SIZE);
-      bufferTag(fieldNumber, WireFormat.WIRETYPE_FIXED32);
-      bufferFixed32NoTag(value);
-    }
-
-    @Override
-    public void writeUInt64(final int fieldNumber, final long value) throws IOException {
-      flushIfNotAvailable(MAX_VARINT_SIZE * 2);
-      bufferTag(fieldNumber, WireFormat.WIRETYPE_VARINT);
-      bufferUInt64NoTag(value);
-    }
-
-    @Override
-    public void writeFixed64(final int fieldNumber, final long value) throws IOException {
-      flushIfNotAvailable(MAX_VARINT_SIZE + FIXED64_SIZE);
-      bufferTag(fieldNumber, WireFormat.WIRETYPE_FIXED64);
-      bufferFixed64NoTag(value);
-    }
-
-    @Override
-    public void writeBool(final int fieldNumber, final boolean value) throws IOException {
-      flushIfNotAvailable(MAX_VARINT_SIZE + 1);
-      bufferTag(fieldNumber, WireFormat.WIRETYPE_VARINT);
-      buffer((byte) (value ? 1 : 0));
-    }
-
-    @Override
-    public void writeString(final int fieldNumber, final String value) throws IOException {
-      writeTag(fieldNumber, WireFormat.WIRETYPE_LENGTH_DELIMITED);
-      writeStringNoTag(value);
-    }
-
-    @Override
-    public void writeBytes(final int fieldNumber, final ByteString value) throws IOException {
-      writeTag(fieldNumber, WireFormat.WIRETYPE_LENGTH_DELIMITED);
-      writeBytesNoTag(value);
-    }
-
-    @Override
-    public void writeByteArray(final int fieldNumber, final byte[] value) throws IOException {
-      writeByteArray(fieldNumber, value, 0, value.length);
-    }
-
-    @Override
-    public void writeByteArray(
-        final int fieldNumber, final byte[] value, final int offset, final int length)
-        throws IOException {
-      writeTag(fieldNumber, WireFormat.WIRETYPE_LENGTH_DELIMITED);
-      writeByteArrayNoTag(value, offset, length);
-    }
-
-    @Override
-    public void writeByteBuffer(final int fieldNumber, final ByteBuffer value) throws IOException {
-      writeTag(fieldNumber, WireFormat.WIRETYPE_LENGTH_DELIMITED);
-      writeUInt32NoTag(value.capacity());
-      writeRawBytes(value);
-    }
-
-    @Override
-    public void writeBytesNoTag(final ByteString value) throws IOException {
-      writeUInt32NoTag(value.size());
-      value.writeTo(this);
-    }
-
-    @Override
-    public void writeByteArrayNoTag(final byte[] value, int offset, int length) throws IOException {
-      writeUInt32NoTag(length);
-      write(value, offset, length);
-    }
-
-    @Override
-    public void writeRawBytes(final ByteBuffer value) throws IOException {
-      if (value.hasArray()) {
-        write(value.array(), value.arrayOffset(), value.capacity());
-      } else {
-        ByteBuffer duplicated = value.duplicate();
-        duplicated.clear();
-        write(duplicated);
-      }
-    }
-
-    @Override
-    public void writeMessage(final int fieldNumber, final MessageLite value) throws IOException {
-      writeTag(fieldNumber, WireFormat.WIRETYPE_LENGTH_DELIMITED);
-      writeMessageNoTag(value);
-    }
-
-    @Override
-    void writeMessage(final int fieldNumber, final MessageLite value, Schema schema)
-        throws IOException {
-      writeTag(fieldNumber, WireFormat.WIRETYPE_LENGTH_DELIMITED);
-      writeMessageNoTag(value, schema);
-    }
-
-    @Override
-    public void writeMessageSetExtension(final int fieldNumber, final MessageLite value)
-        throws IOException {
-      writeTag(WireFormat.MESSAGE_SET_ITEM, WireFormat.WIRETYPE_START_GROUP);
-      writeUInt32(WireFormat.MESSAGE_SET_TYPE_ID, fieldNumber);
-      writeMessage(WireFormat.MESSAGE_SET_MESSAGE, value);
-      writeTag(WireFormat.MESSAGE_SET_ITEM, WireFormat.WIRETYPE_END_GROUP);
-    }
-
-    @Override
-    public void writeRawMessageSetExtension(final int fieldNumber, final ByteString value)
-        throws IOException {
-      writeTag(WireFormat.MESSAGE_SET_ITEM, WireFormat.WIRETYPE_START_GROUP);
-      writeUInt32(WireFormat.MESSAGE_SET_TYPE_ID, fieldNumber);
-      writeBytes(WireFormat.MESSAGE_SET_MESSAGE, value);
-      writeTag(WireFormat.MESSAGE_SET_ITEM, WireFormat.WIRETYPE_END_GROUP);
-    }
-
-    @Override
-    public void writeMessageNoTag(final MessageLite value) throws IOException {
-      writeUInt32NoTag(value.getSerializedSize());
-      value.writeTo(this);
-    }
-
-    @Override
-    void writeMessageNoTag(final MessageLite value, Schema schema) throws IOException {
-      writeUInt32NoTag(((AbstractMessageLite) value).getSerializedSize(schema));
-      schema.writeTo(value, wrapper);
-    }
-
-    @Override
-    public void write(byte value) throws IOException {
-      if (position == limit) {
-        doFlush();
-      }
-
-      buffer(value);
-    }
-
-    @Override
-    public void writeInt32NoTag(int value) throws IOException {
-      if (value >= 0) {
-        writeUInt32NoTag(value);
-      } else {
-        // Must sign-extend.
-        writeUInt64NoTag(value);
-      }
-    }
-
-    @Override
-    public void writeUInt32NoTag(int value) throws IOException {
-      flushIfNotAvailable(MAX_VARINT32_SIZE);
-      bufferUInt32NoTag(value);
-    }
-
-    @Override
-    public void writeFixed32NoTag(final int value) throws IOException {
-      flushIfNotAvailable(FIXED32_SIZE);
-      bufferFixed32NoTag(value);
-    }
-
-    @Override
-    public void writeUInt64NoTag(long value) throws IOException {
-      flushIfNotAvailable(MAX_VARINT_SIZE);
-      bufferUInt64NoTag(value);
-    }
-
-    @Override
-    public void writeFixed64NoTag(final long value) throws IOException {
-      flushIfNotAvailable(FIXED64_SIZE);
-      bufferFixed64NoTag(value);
-    }
-
-    @Override
-    public void writeStringNoTag(String value) throws IOException {
-      try {
-        // UTF-8 byte length of the string is at least its UTF-16 code unit length (value.length()),
-        // and at most 3 times of it. We take advantage of this in both branches below.
-        final int maxLength = value.length() * Utf8.MAX_BYTES_PER_CHAR;
-        final int maxLengthVarIntSize = computeUInt32SizeNoTag(maxLength);
-
-        // If we are streaming and the potential length is too big to fit in our buffer, we take the
-        // slower path.
-        if (maxLengthVarIntSize + maxLength > limit) {
-          // Allocate a byte[] that we know can fit the string and encode into it. String.getBytes()
-          // does the same internally and then does *another copy* to return a byte[] of exactly the
-          // right size. We can skip that copy and just writeRawBytes up to the actualLength of the
-          // UTF-8 encoded bytes.
-          final byte[] encodedBytes = new byte[maxLength];
-          int actualLength = Utf8.encode(value, encodedBytes, 0, maxLength);
-          writeUInt32NoTag(actualLength);
-          writeLazy(encodedBytes, 0, actualLength);
-          return;
-        }
-
-        // Fast path: we have enough space available in our buffer for the string...
-        if (maxLengthVarIntSize + maxLength > limit - position) {
-          // Flush to free up space.
-          doFlush();
-        }
-
-        // Optimize for the case where we know this length results in a constant varint length as
-        // this saves a pass for measuring the length of the string.
-        final int minLengthVarIntSize = computeUInt32SizeNoTag(value.length());
-        int oldPosition = position;
-        final int length;
-        try {
-          if (minLengthVarIntSize == maxLengthVarIntSize) {
-            position = oldPosition + minLengthVarIntSize;
-            int newPosition = Utf8.encode(value, buffer, position, limit - position);
-            // Since this class is stateful and tracks the position, we rewind and store the
-            // state, prepend the length, then reset it back to the end of the string.
-            position = oldPosition;
-            length = newPosition - oldPosition - minLengthVarIntSize;
-            bufferUInt32NoTag(length);
-            position = newPosition;
-          } else {
-            length = Utf8.encodedLength(value);
-            bufferUInt32NoTag(length);
-            position = Utf8.encode(value, buffer, position, length);
-          }
-          totalBytesWritten += length;
-        } catch (UnpairedSurrogateException e) {
-          // Be extra careful and restore the original position for retrying the write with the
-          // less efficient path.
-          totalBytesWritten -= position - oldPosition;
-          position = oldPosition;
-          throw e;
-        } catch (ArrayIndexOutOfBoundsException e) {
-          throw new OutOfSpaceException(e);
-        }
-      } catch (UnpairedSurrogateException e) {
-        inefficientWriteStringNoTag(value, e);
-      }
-    }
-
-    @Override
-    public void flush() throws IOException {
-      if (position > 0) {
-        // Flush the buffer.
-        doFlush();
-      }
-    }
-
-    @Override
-    public void write(byte[] value, int offset, int length) throws IOException {
-      if (limit - position >= length) {
-        // We have room in the current buffer.
-        System.arraycopy(value, offset, buffer, position, length);
-        position += length;
-        totalBytesWritten += length;
-      } else {
-        // Write extends past current buffer.  Fill the rest of this buffer and
-        // flush.
-        final int bytesWritten = limit - position;
-        System.arraycopy(value, offset, buffer, position, bytesWritten);
-        offset += bytesWritten;
-        length -= bytesWritten;
-        position = limit;
-        totalBytesWritten += bytesWritten;
-        doFlush();
-
-        // Now deal with the rest.
-        // Since we have an output stream, this is our buffer
-        // and buffer offset == 0
-        if (length <= limit) {
-          // Fits in new buffer.
-          System.arraycopy(value, offset, buffer, 0, length);
-          position = length;
-        } else {
-          // Write is very big.  Let's do it all at once.
-          out.write(value, offset, length);
-        }
-        totalBytesWritten += length;
-      }
-    }
-
-    @Override
-    public void writeLazy(byte[] value, int offset, int length) throws IOException {
-      write(value, offset, length);
-    }
-
-    @Override
-    public void write(ByteBuffer value) throws IOException {
-      int length = value.remaining();
-      if (limit - position >= length) {
-        // We have room in the current buffer.
-        value.get(buffer, position, length);
-        position += length;
-        totalBytesWritten += length;
-      } else {
-        // Write extends past current buffer.  Fill the rest of this buffer and
-        // flush.
-        final int bytesWritten = limit - position;
-        value.get(buffer, position, bytesWritten);
-        length -= bytesWritten;
-        position = limit;
-        totalBytesWritten += bytesWritten;
-        doFlush();
-
-        // Now deal with the rest.
-        // Since we have an output stream, this is our buffer
-        // and buffer offset == 0
-        while (length > limit) {
-          // Copy data into the buffer before writing it to OutputStream.
-          value.get(buffer, 0, limit);
-          out.write(buffer, 0, limit);
-          length -= limit;
-          totalBytesWritten += limit;
-        }
-        value.get(buffer, 0, length);
-        position = length;
-        totalBytesWritten += length;
-      }
-    }
-
-    @Override
-    public void writeLazy(ByteBuffer value) throws IOException {
-      write(value);
-    }
-
-    private void flushIfNotAvailable(int requiredSize) throws IOException {
-      if (limit - position < requiredSize) {
-        doFlush();
-      }
-    }
-
-    private void doFlush() throws IOException {
-      out.write(buffer, 0, position);
-      position = 0;
-    }
-  }
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/CodedOutputStreamWriter.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/CodedOutputStreamWriter.java
deleted file mode 100644
index 3f796fa..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/CodedOutputStreamWriter.java
+++ /dev/null
@@ -1,696 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.protobuf.Internal.checkNotNull;
-import static com.google.protobuf.WireFormat.WIRETYPE_LENGTH_DELIMITED;
-
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
-/** An adapter between the {@link Writer} interface and {@link CodedOutputStream}. */
-@CheckReturnValue
-@ExperimentalApi
-final class CodedOutputStreamWriter implements Writer {
-  private final CodedOutputStream output;
-
-  public static CodedOutputStreamWriter forCodedOutput(CodedOutputStream output) {
-    if (output.wrapper != null) {
-      return output.wrapper;
-    }
-    return new CodedOutputStreamWriter(output);
-  }
-
-  private CodedOutputStreamWriter(CodedOutputStream output) {
-    this.output = checkNotNull(output, "output");
-    this.output.wrapper = this;
-  }
-
-  @Override
-  public FieldOrder fieldOrder() {
-    return FieldOrder.ASCENDING;
-  }
-
-  public int getTotalBytesWritten() {
-    return output.getTotalBytesWritten();
-  }
-
-  @Override
-  public void writeSFixed32(int fieldNumber, int value) throws IOException {
-    output.writeSFixed32(fieldNumber, value);
-  }
-
-  @Override
-  public void writeInt64(int fieldNumber, long value) throws IOException {
-    output.writeInt64(fieldNumber, value);
-  }
-
-  @Override
-  public void writeSFixed64(int fieldNumber, long value) throws IOException {
-    output.writeSFixed64(fieldNumber, value);
-  }
-
-  @Override
-  public void writeFloat(int fieldNumber, float value) throws IOException {
-    output.writeFloat(fieldNumber, value);
-  }
-
-  @Override
-  public void writeDouble(int fieldNumber, double value) throws IOException {
-    output.writeDouble(fieldNumber, value);
-  }
-
-  @Override
-  public void writeEnum(int fieldNumber, int value) throws IOException {
-    output.writeEnum(fieldNumber, value);
-  }
-
-  @Override
-  public void writeUInt64(int fieldNumber, long value) throws IOException {
-    output.writeUInt64(fieldNumber, value);
-  }
-
-  @Override
-  public void writeInt32(int fieldNumber, int value) throws IOException {
-    output.writeInt32(fieldNumber, value);
-  }
-
-  @Override
-  public void writeFixed64(int fieldNumber, long value) throws IOException {
-    output.writeFixed64(fieldNumber, value);
-  }
-
-  @Override
-  public void writeFixed32(int fieldNumber, int value) throws IOException {
-    output.writeFixed32(fieldNumber, value);
-  }
-
-  @Override
-  public void writeBool(int fieldNumber, boolean value) throws IOException {
-    output.writeBool(fieldNumber, value);
-  }
-
-  @Override
-  public void writeString(int fieldNumber, String value) throws IOException {
-    output.writeString(fieldNumber, value);
-  }
-
-  @Override
-  public void writeBytes(int fieldNumber, ByteString value) throws IOException {
-    output.writeBytes(fieldNumber, value);
-  }
-
-  @Override
-  public void writeUInt32(int fieldNumber, int value) throws IOException {
-    output.writeUInt32(fieldNumber, value);
-  }
-
-  @Override
-  public void writeSInt32(int fieldNumber, int value) throws IOException {
-    output.writeSInt32(fieldNumber, value);
-  }
-
-  @Override
-  public void writeSInt64(int fieldNumber, long value) throws IOException {
-    output.writeSInt64(fieldNumber, value);
-  }
-
-  @Override
-  public void writeMessage(int fieldNumber, Object value) throws IOException {
-    output.writeMessage(fieldNumber, (MessageLite) value);
-  }
-
-  @Override
-  public void writeMessage(int fieldNumber, Object value, Schema schema) throws IOException {
-    output.writeMessage(fieldNumber, (MessageLite) value, schema);
-  }
-
-  @Deprecated
-  @Override
-  public void writeGroup(int fieldNumber, Object value) throws IOException {
-    output.writeGroup(fieldNumber, (MessageLite) value);
-  }
-
-  @Override
-  public void writeGroup(int fieldNumber, Object value, Schema schema) throws IOException {
-    output.writeGroup(fieldNumber, (MessageLite) value, schema);
-  }
-
-  @Deprecated
-  @Override
-  public void writeStartGroup(int fieldNumber) throws IOException {
-    output.writeTag(fieldNumber, WireFormat.WIRETYPE_START_GROUP);
-  }
-
-  @Deprecated
-  @Override
-  public void writeEndGroup(int fieldNumber) throws IOException {
-    output.writeTag(fieldNumber, WireFormat.WIRETYPE_END_GROUP);
-  }
-
-  @Override
-  public final void writeMessageSetItem(int fieldNumber, Object value) throws IOException {
-    if (value instanceof ByteString) {
-      output.writeRawMessageSetExtension(fieldNumber, (ByteString) value);
-    } else {
-      output.writeMessageSetExtension(fieldNumber, (MessageLite) value);
-    }
-  }
-
-  @Override
-  public void writeInt32List(int fieldNumber, List<Integer> value, boolean packed)
-      throws IOException {
-    if (packed) {
-      output.writeTag(fieldNumber, WIRETYPE_LENGTH_DELIMITED);
-
-      // Compute and write the length of the data.
-      int dataSize = 0;
-      for (int i = 0; i < value.size(); ++i) {
-        dataSize += CodedOutputStream.computeInt32SizeNoTag(value.get(i));
-      }
-      output.writeUInt32NoTag(dataSize);
-
-      // Write the data itself, without any tags.
-      for (int i = 0; i < value.size(); ++i) {
-        output.writeInt32NoTag(value.get(i));
-      }
-    } else {
-      for (int i = 0; i < value.size(); ++i) {
-        output.writeInt32(fieldNumber, value.get(i));
-      }
-    }
-  }
-
-  @Override
-  public void writeFixed32List(int fieldNumber, List<Integer> value, boolean packed)
-      throws IOException {
-    if (packed) {
-      output.writeTag(fieldNumber, WIRETYPE_LENGTH_DELIMITED);
-
-      // Compute and write the length of the data.
-      int dataSize = 0;
-      for (int i = 0; i < value.size(); ++i) {
-        dataSize += CodedOutputStream.computeFixed32SizeNoTag(value.get(i));
-      }
-      output.writeUInt32NoTag(dataSize);
-
-      // Write the data itself, without any tags.
-      for (int i = 0; i < value.size(); ++i) {
-        output.writeFixed32NoTag(value.get(i));
-      }
-    } else {
-      for (int i = 0; i < value.size(); ++i) {
-        output.writeFixed32(fieldNumber, value.get(i));
-      }
-    }
-  }
-
-  @Override
-  public void writeInt64List(int fieldNumber, List<Long> value, boolean packed) throws IOException {
-    if (packed) {
-      output.writeTag(fieldNumber, WIRETYPE_LENGTH_DELIMITED);
-
-      // Compute and write the length of the data.
-      int dataSize = 0;
-      for (int i = 0; i < value.size(); ++i) {
-        dataSize += CodedOutputStream.computeInt64SizeNoTag(value.get(i));
-      }
-      output.writeUInt32NoTag(dataSize);
-
-      // Write the data itself, without any tags.
-      for (int i = 0; i < value.size(); ++i) {
-        output.writeInt64NoTag(value.get(i));
-      }
-    } else {
-      for (int i = 0; i < value.size(); ++i) {
-        output.writeInt64(fieldNumber, value.get(i));
-      }
-    }
-  }
-
-  @Override
-  public void writeUInt64List(int fieldNumber, List<Long> value, boolean packed)
-      throws IOException {
-    if (packed) {
-      output.writeTag(fieldNumber, WIRETYPE_LENGTH_DELIMITED);
-
-      // Compute and write the length of the data.
-      int dataSize = 0;
-      for (int i = 0; i < value.size(); ++i) {
-        dataSize += CodedOutputStream.computeUInt64SizeNoTag(value.get(i));
-      }
-      output.writeUInt32NoTag(dataSize);
-
-      // Write the data itself, without any tags.
-      for (int i = 0; i < value.size(); ++i) {
-        output.writeUInt64NoTag(value.get(i));
-      }
-    } else {
-      for (int i = 0; i < value.size(); ++i) {
-        output.writeUInt64(fieldNumber, value.get(i));
-      }
-    }
-  }
-
-  @Override
-  public void writeFixed64List(int fieldNumber, List<Long> value, boolean packed)
-      throws IOException {
-    if (packed) {
-      output.writeTag(fieldNumber, WIRETYPE_LENGTH_DELIMITED);
-
-      // Compute and write the length of the data.
-      int dataSize = 0;
-      for (int i = 0; i < value.size(); ++i) {
-        dataSize += CodedOutputStream.computeFixed64SizeNoTag(value.get(i));
-      }
-      output.writeUInt32NoTag(dataSize);
-
-      // Write the data itself, without any tags.
-      for (int i = 0; i < value.size(); ++i) {
-        output.writeFixed64NoTag(value.get(i));
-      }
-    } else {
-      for (int i = 0; i < value.size(); ++i) {
-        output.writeFixed64(fieldNumber, value.get(i));
-      }
-    }
-  }
-
-  @Override
-  public void writeFloatList(int fieldNumber, List<Float> value, boolean packed)
-      throws IOException {
-    if (packed) {
-      output.writeTag(fieldNumber, WIRETYPE_LENGTH_DELIMITED);
-
-      // Compute and write the length of the data.
-      int dataSize = 0;
-      for (int i = 0; i < value.size(); ++i) {
-        dataSize += CodedOutputStream.computeFloatSizeNoTag(value.get(i));
-      }
-      output.writeUInt32NoTag(dataSize);
-
-      // Write the data itself, without any tags.
-      for (int i = 0; i < value.size(); ++i) {
-        output.writeFloatNoTag(value.get(i));
-      }
-    } else {
-      for (int i = 0; i < value.size(); ++i) {
-        output.writeFloat(fieldNumber, value.get(i));
-      }
-    }
-  }
-
-  @Override
-  public void writeDoubleList(int fieldNumber, List<Double> value, boolean packed)
-      throws IOException {
-    if (packed) {
-      output.writeTag(fieldNumber, WIRETYPE_LENGTH_DELIMITED);
-
-      // Compute and write the length of the data.
-      int dataSize = 0;
-      for (int i = 0; i < value.size(); ++i) {
-        dataSize += CodedOutputStream.computeDoubleSizeNoTag(value.get(i));
-      }
-      output.writeUInt32NoTag(dataSize);
-
-      // Write the data itself, without any tags.
-      for (int i = 0; i < value.size(); ++i) {
-        output.writeDoubleNoTag(value.get(i));
-      }
-    } else {
-      for (int i = 0; i < value.size(); ++i) {
-        output.writeDouble(fieldNumber, value.get(i));
-      }
-    }
-  }
-
-  @Override
-  public void writeEnumList(int fieldNumber, List<Integer> value, boolean packed)
-      throws IOException {
-    if (packed) {
-      output.writeTag(fieldNumber, WIRETYPE_LENGTH_DELIMITED);
-
-      // Compute and write the length of the data.
-      int dataSize = 0;
-      for (int i = 0; i < value.size(); ++i) {
-        dataSize += CodedOutputStream.computeEnumSizeNoTag(value.get(i));
-      }
-      output.writeUInt32NoTag(dataSize);
-
-      // Write the data itself, without any tags.
-      for (int i = 0; i < value.size(); ++i) {
-        output.writeEnumNoTag(value.get(i));
-      }
-    } else {
-      for (int i = 0; i < value.size(); ++i) {
-        output.writeEnum(fieldNumber, value.get(i));
-      }
-    }
-  }
-
-  @Override
-  public void writeBoolList(int fieldNumber, List<Boolean> value, boolean packed)
-      throws IOException {
-    if (packed) {
-      output.writeTag(fieldNumber, WIRETYPE_LENGTH_DELIMITED);
-
-      // Compute and write the length of the data.
-      int dataSize = 0;
-      for (int i = 0; i < value.size(); ++i) {
-        dataSize += CodedOutputStream.computeBoolSizeNoTag(value.get(i));
-      }
-      output.writeUInt32NoTag(dataSize);
-
-      // Write the data itself, without any tags.
-      for (int i = 0; i < value.size(); ++i) {
-        output.writeBoolNoTag(value.get(i));
-      }
-    } else {
-      for (int i = 0; i < value.size(); ++i) {
-        output.writeBool(fieldNumber, value.get(i));
-      }
-    }
-  }
-
-  @Override
-  public void writeStringList(int fieldNumber, List<String> value) throws IOException {
-    if (value instanceof LazyStringList) {
-      final LazyStringList lazyList = (LazyStringList) value;
-      for (int i = 0; i < value.size(); ++i) {
-        writeLazyString(fieldNumber, lazyList.getRaw(i));
-      }
-    } else {
-      for (int i = 0; i < value.size(); ++i) {
-        output.writeString(fieldNumber, value.get(i));
-      }
-    }
-  }
-
-  private void writeLazyString(int fieldNumber, Object value) throws IOException {
-    if (value instanceof String) {
-      output.writeString(fieldNumber, (String) value);
-    } else {
-      output.writeBytes(fieldNumber, (ByteString) value);
-    }
-  }
-
-  @Override
-  public void writeBytesList(int fieldNumber, List<ByteString> value) throws IOException {
-    for (int i = 0; i < value.size(); ++i) {
-      output.writeBytes(fieldNumber, value.get(i));
-    }
-  }
-
-  @Override
-  public void writeUInt32List(int fieldNumber, List<Integer> value, boolean packed)
-      throws IOException {
-    if (packed) {
-      output.writeTag(fieldNumber, WIRETYPE_LENGTH_DELIMITED);
-
-      // Compute and write the length of the data.
-      int dataSize = 0;
-      for (int i = 0; i < value.size(); ++i) {
-        dataSize += CodedOutputStream.computeUInt32SizeNoTag(value.get(i));
-      }
-      output.writeUInt32NoTag(dataSize);
-
-      // Write the data itself, without any tags.
-      for (int i = 0; i < value.size(); ++i) {
-        output.writeUInt32NoTag(value.get(i));
-      }
-    } else {
-      for (int i = 0; i < value.size(); ++i) {
-        output.writeUInt32(fieldNumber, value.get(i));
-      }
-    }
-  }
-
-  @Override
-  public void writeSFixed32List(int fieldNumber, List<Integer> value, boolean packed)
-      throws IOException {
-    if (packed) {
-      output.writeTag(fieldNumber, WIRETYPE_LENGTH_DELIMITED);
-
-      // Compute and write the length of the data.
-      int dataSize = 0;
-      for (int i = 0; i < value.size(); ++i) {
-        dataSize += CodedOutputStream.computeSFixed32SizeNoTag(value.get(i));
-      }
-      output.writeUInt32NoTag(dataSize);
-
-      // Write the data itself, without any tags.
-      for (int i = 0; i < value.size(); ++i) {
-        output.writeSFixed32NoTag(value.get(i));
-      }
-    } else {
-      for (int i = 0; i < value.size(); ++i) {
-        output.writeSFixed32(fieldNumber, value.get(i));
-      }
-    }
-  }
-
-  @Override
-  public void writeSFixed64List(int fieldNumber, List<Long> value, boolean packed)
-      throws IOException {
-    if (packed) {
-      output.writeTag(fieldNumber, WIRETYPE_LENGTH_DELIMITED);
-
-      // Compute and write the length of the data.
-      int dataSize = 0;
-      for (int i = 0; i < value.size(); ++i) {
-        dataSize += CodedOutputStream.computeSFixed64SizeNoTag(value.get(i));
-      }
-      output.writeUInt32NoTag(dataSize);
-
-      // Write the data itself, without any tags.
-      for (int i = 0; i < value.size(); ++i) {
-        output.writeSFixed64NoTag(value.get(i));
-      }
-    } else {
-      for (int i = 0; i < value.size(); ++i) {
-        output.writeSFixed64(fieldNumber, value.get(i));
-      }
-    }
-  }
-
-  @Override
-  public void writeSInt32List(int fieldNumber, List<Integer> value, boolean packed)
-      throws IOException {
-    if (packed) {
-      output.writeTag(fieldNumber, WIRETYPE_LENGTH_DELIMITED);
-
-      // Compute and write the length of the data.
-      int dataSize = 0;
-      for (int i = 0; i < value.size(); ++i) {
-        dataSize += CodedOutputStream.computeSInt32SizeNoTag(value.get(i));
-      }
-      output.writeUInt32NoTag(dataSize);
-
-      // Write the data itself, without any tags.
-      for (int i = 0; i < value.size(); ++i) {
-        output.writeSInt32NoTag(value.get(i));
-      }
-    } else {
-      for (int i = 0; i < value.size(); ++i) {
-        output.writeSInt32(fieldNumber, value.get(i));
-      }
-    }
-  }
-
-  @Override
-  public void writeSInt64List(int fieldNumber, List<Long> value, boolean packed)
-      throws IOException {
-    if (packed) {
-      output.writeTag(fieldNumber, WIRETYPE_LENGTH_DELIMITED);
-
-      // Compute and write the length of the data.
-      int dataSize = 0;
-      for (int i = 0; i < value.size(); ++i) {
-        dataSize += CodedOutputStream.computeSInt64SizeNoTag(value.get(i));
-      }
-      output.writeUInt32NoTag(dataSize);
-
-      // Write the data itself, without any tags.
-      for (int i = 0; i < value.size(); ++i) {
-        output.writeSInt64NoTag(value.get(i));
-      }
-    } else {
-      for (int i = 0; i < value.size(); ++i) {
-        output.writeSInt64(fieldNumber, value.get(i));
-      }
-    }
-  }
-
-  @Override
-  public void writeMessageList(int fieldNumber, List<?> value) throws IOException {
-    for (int i = 0; i < value.size(); ++i) {
-      writeMessage(fieldNumber, value.get(i));
-    }
-  }
-
-  @Override
-  public void writeMessageList(int fieldNumber, List<?> value, Schema schema) throws IOException {
-    for (int i = 0; i < value.size(); ++i) {
-      writeMessage(fieldNumber, value.get(i), schema);
-    }
-  }
-
-  @Deprecated
-  @Override
-  public void writeGroupList(int fieldNumber, List<?> value) throws IOException {
-    for (int i = 0; i < value.size(); ++i) {
-      writeGroup(fieldNumber, value.get(i));
-    }
-  }
-
-  @Override
-  public void writeGroupList(int fieldNumber, List<?> value, Schema schema) throws IOException {
-    for (int i = 0; i < value.size(); ++i) {
-      writeGroup(fieldNumber, value.get(i), schema);
-    }
-  }
-
-  @Override
-  public <K, V> void writeMap(int fieldNumber, MapEntryLite.Metadata<K, V> metadata, Map<K, V> map)
-      throws IOException {
-    if (output.isSerializationDeterministic()) {
-      writeDeterministicMap(fieldNumber, metadata, map);
-      return;
-    }
-    for (Map.Entry<K, V> entry : map.entrySet()) {
-      output.writeTag(fieldNumber, WIRETYPE_LENGTH_DELIMITED);
-      output.writeUInt32NoTag(
-          MapEntryLite.computeSerializedSize(metadata, entry.getKey(), entry.getValue()));
-      MapEntryLite.writeTo(output, metadata, entry.getKey(), entry.getValue());
-    }
-  }
-
-  @SuppressWarnings("unchecked")
-  private <K, V> void writeDeterministicMap(
-      int fieldNumber, MapEntryLite.Metadata<K, V> metadata, Map<K, V> map) throws IOException {
-    switch (metadata.keyType) {
-      case BOOL:
-        V value;
-        if ((value = map.get(Boolean.FALSE)) != null) {
-          writeDeterministicBooleanMapEntry(
-              fieldNumber, /* key= */ false, value, (MapEntryLite.Metadata<Boolean, V>) metadata);
-        }
-        if ((value = map.get(Boolean.TRUE)) != null) {
-          writeDeterministicBooleanMapEntry(
-              fieldNumber, /* key= */ true, value, (MapEntryLite.Metadata<Boolean, V>) metadata);
-        }
-        break;
-      case FIXED32:
-      case INT32:
-      case SFIXED32:
-      case SINT32:
-      case UINT32:
-        writeDeterministicIntegerMap(
-            fieldNumber, (MapEntryLite.Metadata<Integer, V>) metadata, (Map<Integer, V>) map);
-        break;
-      case FIXED64:
-      case INT64:
-      case SFIXED64:
-      case SINT64:
-      case UINT64:
-        writeDeterministicLongMap(
-            fieldNumber, (MapEntryLite.Metadata<Long, V>) metadata, (Map<Long, V>) map);
-        break;
-      case STRING:
-        writeDeterministicStringMap(
-            fieldNumber, (MapEntryLite.Metadata<String, V>) metadata, (Map<String, V>) map);
-        break;
-      default:
-        throw new IllegalArgumentException("does not support key type: " + metadata.keyType);
-    }
-  }
-
-  private <V> void writeDeterministicBooleanMapEntry(
-      int fieldNumber, boolean key, V value, MapEntryLite.Metadata<Boolean, V> metadata)
-      throws IOException {
-    output.writeTag(fieldNumber, WIRETYPE_LENGTH_DELIMITED);
-    output.writeUInt32NoTag(MapEntryLite.computeSerializedSize(metadata, key, value));
-    MapEntryLite.writeTo(output, metadata, key, value);
-  }
-
-  private <V> void writeDeterministicIntegerMap(
-      int fieldNumber, MapEntryLite.Metadata<Integer, V> metadata, Map<Integer, V> map)
-      throws IOException {
-    int[] keys = new int[map.size()];
-    int index = 0;
-    for (int k : map.keySet()) {
-      keys[index++] = k;
-    }
-    Arrays.sort(keys);
-    for (int key : keys) {
-      V value = map.get(key);
-      output.writeTag(fieldNumber, WIRETYPE_LENGTH_DELIMITED);
-      output.writeUInt32NoTag(MapEntryLite.computeSerializedSize(metadata, key, value));
-      MapEntryLite.writeTo(output, metadata, key, value);
-    }
-  }
-
-  private <V> void writeDeterministicLongMap(
-      int fieldNumber, MapEntryLite.Metadata<Long, V> metadata, Map<Long, V> map)
-      throws IOException {
-    long[] keys = new long[map.size()];
-    int index = 0;
-    for (long k : map.keySet()) {
-      keys[index++] = k;
-    }
-    Arrays.sort(keys);
-    for (long key : keys) {
-      V value = map.get(key);
-      output.writeTag(fieldNumber, WIRETYPE_LENGTH_DELIMITED);
-      output.writeUInt32NoTag(MapEntryLite.computeSerializedSize(metadata, key, value));
-      MapEntryLite.writeTo(output, metadata, key, value);
-    }
-  }
-
-  private <V> void writeDeterministicStringMap(
-      int fieldNumber, MapEntryLite.Metadata<String, V> metadata, Map<String, V> map)
-      throws IOException {
-    String[] keys = new String[map.size()];
-    int index = 0;
-    for (String k : map.keySet()) {
-      keys[index++] = k;
-    }
-    Arrays.sort(keys);
-    for (String key : keys) {
-      V value = map.get(key);
-      output.writeTag(fieldNumber, WIRETYPE_LENGTH_DELIMITED);
-      output.writeUInt32NoTag(MapEntryLite.computeSerializedSize(metadata, key, value));
-      MapEntryLite.writeTo(output, metadata, key, value);
-    }
-  }
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/CompileTimeConstant.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/CompileTimeConstant.java
deleted file mode 100644
index dde7cf1..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/CompileTimeConstant.java
+++ /dev/null
@@ -1,47 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static java.lang.annotation.RetentionPolicy.CLASS;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-/**
- * Annotation for method parameter and class field declarations, which denotes that corresponding
- * actual values must be compile-time constant expressions.
- */
-@Documented
-@Retention(CLASS)
-@Target({ElementType.PARAMETER, ElementType.FIELD})
-@interface CompileTimeConstant {}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/DescriptorMessageInfoFactory.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/DescriptorMessageInfoFactory.java
deleted file mode 100644
index 272c5a1..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/DescriptorMessageInfoFactory.java
+++ /dev/null
@@ -1,798 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.protobuf.FieldInfo.forField;
-import static com.google.protobuf.FieldInfo.forFieldWithEnumVerifier;
-import static com.google.protobuf.FieldInfo.forMapField;
-import static com.google.protobuf.FieldInfo.forOneofMemberField;
-import static com.google.protobuf.FieldInfo.forPackedField;
-import static com.google.protobuf.FieldInfo.forPackedFieldWithEnumVerifier;
-import static com.google.protobuf.FieldInfo.forProto2OptionalField;
-import static com.google.protobuf.FieldInfo.forProto2RequiredField;
-import static com.google.protobuf.FieldInfo.forRepeatedMessageField;
-
-import com.google.protobuf.Descriptors.Descriptor;
-import com.google.protobuf.Descriptors.FieldDescriptor;
-import com.google.protobuf.Descriptors.FieldDescriptor.Type;
-import com.google.protobuf.Descriptors.OneofDescriptor;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.Stack;
-import java.util.concurrent.ConcurrentHashMap;
-
-/** A factory for message info based on protobuf descriptors for a {@link GeneratedMessageV3}. */
-@ExperimentalApi
-final class DescriptorMessageInfoFactory implements MessageInfoFactory {
-  private static final String GET_DEFAULT_INSTANCE_METHOD_NAME = "getDefaultInstance";
-  private static final DescriptorMessageInfoFactory instance = new DescriptorMessageInfoFactory();
-
-  /**
-   * Names that should be avoided (in UpperCamelCase format). Using them causes the compiler to
-   * generate accessors whose names collide with methods defined in base classes.
-   *
-   * <p>Keep this list in sync with kForbiddenWordList in
-   * src/google/protobuf/compiler/java/java_helpers.cc
-   */
-  private static final Set<String> specialFieldNames =
-      new HashSet<>(
-          Arrays.asList(
-              // java.lang.Object:
-              "Class",
-              // com.google.protobuf.MessageLiteOrBuilder:
-              "DefaultInstanceForType",
-              // com.google.protobuf.MessageLite:
-              "ParserForType",
-              "SerializedSize",
-              // com.google.protobuf.MessageOrBuilder:
-              "AllFields",
-              "DescriptorForType",
-              "InitializationErrorString",
-              "UnknownFields",
-              // obsolete. kept for backwards compatibility of generated code
-              "CachedSize"));
-
-  // Disallow construction - it's a singleton.
-  private DescriptorMessageInfoFactory() {}
-
-  public static DescriptorMessageInfoFactory getInstance() {
-    return instance;
-  }
-
-  @Override
-  public boolean isSupported(Class<?> messageType) {
-    return GeneratedMessageV3.class.isAssignableFrom(messageType);
-  }
-
-  @Override
-  public MessageInfo messageInfoFor(Class<?> messageType) {
-    if (!GeneratedMessageV3.class.isAssignableFrom(messageType)) {
-      throw new IllegalArgumentException("Unsupported message type: " + messageType.getName());
-    }
-
-    return convert(messageType, descriptorForType(messageType));
-  }
-
-  private static Message getDefaultInstance(Class<?> messageType) {
-    try {
-      Method method = messageType.getDeclaredMethod(GET_DEFAULT_INSTANCE_METHOD_NAME);
-      return (Message) method.invoke(null);
-    } catch (Exception e) {
-      throw new IllegalArgumentException(
-          "Unable to get default instance for message class " + messageType.getName(), e);
-    }
-  }
-
-  private static Descriptor descriptorForType(Class<?> messageType) {
-    return getDefaultInstance(messageType).getDescriptorForType();
-  }
-
-  private static MessageInfo convert(Class<?> messageType, Descriptor messageDescriptor) {
-    switch (messageDescriptor.getFile().getSyntax()) {
-      case PROTO2:
-        return convertProto2(messageType, messageDescriptor);
-      case PROTO3:
-        return convertProto3(messageType, messageDescriptor);
-      default:
-        throw new IllegalArgumentException(
-            "Unsupported syntax: " + messageDescriptor.getFile().getSyntax());
-    }
-  }
-
-  /**
-   * A helper class to determine whether a message type needs to implement {@code isInitialized()}.
-   *
-   * <p>If a message type doesn't have any required fields or extensions (directly and
-   * transitively), it doesn't need to implement isInitialized() and can always return true there.
-   * It's a bit tricky to determine whether a type has transitive required fields because protobuf
-   * allows cycle references within the same .proto file (e.g., message Foo has a Bar field, and
-   * message Bar has a Foo field). For that we use Tarjan's strongly connected components algorithm
-   * to classify messages into strongly connected groups. Messages in the same group are
-   * transitively including each other, so they should either all have transitive required fields
-   * (or extensions), or none have.
-   *
-   * <p>This class is thread-safe.
-   */
-  // <p>The code is adapted from the C++ implementation:
-  // https://github.com/protocolbuffers/protobuf/blob/main/src/google/protobuf/compiler/java/java_helpers.h
-  static class IsInitializedCheckAnalyzer {
-
-    private final Map<Descriptor, Boolean> resultCache =
-        new ConcurrentHashMap<Descriptor, Boolean>();
-
-    // The following data members are part of Tarjan's SCC algorithm. See:
-    //   https://en.wikipedia.org/wiki/Tarjan%27s_strongly_connected_components_algorithm
-    private int index = 0;
-    private final Stack<Node> stack = new Stack<Node>();
-    private final Map<Descriptor, Node> nodeCache = new HashMap<Descriptor, Node>();
-
-    public boolean needsIsInitializedCheck(Descriptor descriptor) {
-      Boolean cachedValue = resultCache.get(descriptor);
-      if (cachedValue != null) {
-        return cachedValue;
-      }
-      synchronized (this) {
-        // Double-check the cache because some other thread may have updated it while we
-        // were acquiring the lock.
-        cachedValue = resultCache.get(descriptor);
-        if (cachedValue != null) {
-          return cachedValue;
-        }
-        return dfs(descriptor).component.needsIsInitializedCheck;
-      }
-    }
-
-    private static class Node {
-      final Descriptor descriptor;
-      final int index;
-      int lowLink;
-      StronglyConnectedComponent component; // null if the node is still on stack.
-
-      Node(Descriptor descriptor, int index) {
-        this.descriptor = descriptor;
-        this.index = index;
-        this.lowLink = index;
-        this.component = null;
-      }
-    }
-
-    private static class StronglyConnectedComponent {
-      final List<Descriptor> messages = new ArrayList<Descriptor>();
-      boolean needsIsInitializedCheck = false;
-    }
-
-    private Node dfs(Descriptor descriptor) {
-      Node result = new Node(descriptor, index++);
-      stack.push(result);
-      nodeCache.put(descriptor, result);
-
-      // Recurse the fields / nodes in graph
-      for (FieldDescriptor field : descriptor.getFields()) {
-        if (field.getJavaType() == FieldDescriptor.JavaType.MESSAGE) {
-          Node child = nodeCache.get(field.getMessageType());
-          if (child == null) {
-            // Unexplored node
-            child = dfs(field.getMessageType());
-            result.lowLink = Math.min(result.lowLink, child.lowLink);
-          } else {
-            if (child.component == null) {
-              // Still in the stack so we found a back edge.
-              result.lowLink = Math.min(result.lowLink, child.lowLink);
-            }
-          }
-        }
-      }
-
-      if (result.index == result.lowLink) {
-        // This is the root of a strongly connected component.
-        StronglyConnectedComponent component = new StronglyConnectedComponent();
-        while (true) {
-          Node node = stack.pop();
-          node.component = component;
-          component.messages.add(node.descriptor);
-          if (node == result) {
-            break;
-          }
-        }
-
-        analyze(component);
-      }
-
-      return result;
-    }
-
-    // Determine whether messages in this SCC needs isInitialized check.
-    private void analyze(StronglyConnectedComponent component) {
-      boolean needsIsInitializedCheck = false;
-      loop:
-      for (Descriptor descriptor : component.messages) {
-        if (descriptor.isExtendable()) {
-          needsIsInitializedCheck = true;
-          break;
-        }
-
-        for (FieldDescriptor field : descriptor.getFields()) {
-          if (field.isRequired()) {
-            needsIsInitializedCheck = true;
-            break loop;
-          }
-
-          if (field.getJavaType() == FieldDescriptor.JavaType.MESSAGE) {
-            // Since we are analyzing the graph bottom-up, all referenced fields should either be
-            // in this same component or in a different already-analyzed component.
-            Node node = nodeCache.get(field.getMessageType());
-            if (node.component != component) {
-              if (node.component.needsIsInitializedCheck) {
-                needsIsInitializedCheck = true;
-                break loop;
-              }
-            }
-          }
-        }
-      }
-
-      component.needsIsInitializedCheck = needsIsInitializedCheck;
-
-      for (Descriptor descriptor : component.messages) {
-        resultCache.put(descriptor, component.needsIsInitializedCheck);
-      }
-    }
-  }
-
-  private static IsInitializedCheckAnalyzer isInitializedCheckAnalyzer =
-      new IsInitializedCheckAnalyzer();
-
-  private static boolean needsIsInitializedCheck(Descriptor descriptor) {
-    return isInitializedCheckAnalyzer.needsIsInitializedCheck(descriptor);
-  }
-
-  private static StructuralMessageInfo convertProto2(
-      Class<?> messageType, Descriptor messageDescriptor) {
-    List<FieldDescriptor> fieldDescriptors = messageDescriptor.getFields();
-    StructuralMessageInfo.Builder builder =
-        StructuralMessageInfo.newBuilder(fieldDescriptors.size());
-    builder.withDefaultInstance(getDefaultInstance(messageType));
-    builder.withSyntax(ProtoSyntax.PROTO2);
-    builder.withMessageSetWireFormat(messageDescriptor.getOptions().getMessageSetWireFormat());
-
-    OneofState oneofState = new OneofState();
-    int bitFieldIndex = 0;
-    int presenceMask = 1;
-    Field bitField = null;
-
-    // Fields in the descriptor are ordered by the index position in which they appear in the
-    // proto file. This is the same order used to determine the presence mask used in the
-    // bitFields. So to determine the appropriate presence mask to be used for a field, we simply
-    // need to shift the presence mask whenever a presence-checked field is encountered.
-    for (int i = 0; i < fieldDescriptors.size(); ++i) {
-      final FieldDescriptor fd = fieldDescriptors.get(i);
-      boolean enforceUtf8 = fd.getFile().getOptions().getJavaStringCheckUtf8();
-      Internal.EnumVerifier enumVerifier = null;
-      if (fd.getJavaType() == Descriptors.FieldDescriptor.JavaType.ENUM) {
-        enumVerifier =
-            new Internal.EnumVerifier() {
-              @Override
-              public boolean isInRange(int number) {
-                return fd.getEnumType().findValueByNumber(number) != null;
-              }
-            };
-      }
-      if (fd.getContainingOneof() != null) {
-        // Build a oneof member field.
-        builder.withField(buildOneofMember(messageType, fd, oneofState, enforceUtf8, enumVerifier));
-      } else {
-        Field field = field(messageType, fd);
-        int number = fd.getNumber();
-        FieldType type = getFieldType(fd);
-
-        if (fd.isMapField()) {
-          // Map field points to an auto-generated message entry type with the definition:
-          //   message MapEntry {
-          //     K key = 1;
-          //     V value = 2;
-          //   }
-          final FieldDescriptor valueField = fd.getMessageType().findFieldByNumber(2);
-          if (valueField.getJavaType() == Descriptors.FieldDescriptor.JavaType.ENUM) {
-            enumVerifier =
-                new Internal.EnumVerifier() {
-                  @Override
-                  public boolean isInRange(int number) {
-                    return valueField.getEnumType().findValueByNumber(number) != null;
-                  }
-                };
-          }
-          builder.withField(
-              forMapField(
-                  field,
-                  number,
-                  SchemaUtil.getMapDefaultEntry(messageType, fd.getName()),
-                  enumVerifier));
-          continue;
-        }
-
-        if (fd.isRepeated()) {
-          // Repeated fields are not presence-checked.
-          if (enumVerifier != null) {
-            if (fd.isPacked()) {
-              builder.withField(
-                  forPackedFieldWithEnumVerifier(
-                      field, number, type, enumVerifier, cachedSizeField(messageType, fd)));
-            } else {
-              builder.withField(forFieldWithEnumVerifier(field, number, type, enumVerifier));
-            }
-          } else if (fd.getJavaType() == FieldDescriptor.JavaType.MESSAGE) {
-            builder.withField(
-                forRepeatedMessageField(
-                    field, number, type, getTypeForRepeatedMessageField(messageType, fd)));
-          } else {
-            if (fd.isPacked()) {
-              builder.withField(
-                  forPackedField(field, number, type, cachedSizeField(messageType, fd)));
-            } else {
-              builder.withField(forField(field, number, type, enforceUtf8));
-            }
-          }
-          continue;
-        }
-
-        if (bitField == null) {
-          // Lazy-create the next bitfield since we know it must exist.
-          bitField = bitField(messageType, bitFieldIndex);
-        }
-
-        // It's a presence-checked field.
-        if (fd.isRequired()) {
-          builder.withField(
-              forProto2RequiredField(
-                  field, number, type, bitField, presenceMask, enforceUtf8, enumVerifier));
-        } else {
-          builder.withField(
-              forProto2OptionalField(
-                  field, number, type, bitField, presenceMask, enforceUtf8, enumVerifier));
-        }
-      }
-
-      // Update the presence mask for the next iteration. If the shift clears out the mask, we will
-      // go to the next bitField.
-      presenceMask <<= 1;
-      if (presenceMask == 0) {
-        bitField = null;
-        presenceMask = 1;
-        bitFieldIndex++;
-      }
-    }
-
-    List<Integer> fieldsToCheckIsInitialized = new ArrayList<Integer>();
-    for (int i = 0; i < fieldDescriptors.size(); ++i) {
-      FieldDescriptor fd = fieldDescriptors.get(i);
-      if (fd.isRequired()
-          || (fd.getJavaType() == FieldDescriptor.JavaType.MESSAGE
-              && needsIsInitializedCheck(fd.getMessageType()))) {
-        fieldsToCheckIsInitialized.add(fd.getNumber());
-      }
-    }
-    int[] numbers = new int[fieldsToCheckIsInitialized.size()];
-    for (int i = 0; i < fieldsToCheckIsInitialized.size(); i++) {
-      numbers[i] = fieldsToCheckIsInitialized.get(i);
-    }
-    builder.withCheckInitialized(numbers);
-
-    return builder.build();
-  }
-
-  private static StructuralMessageInfo convertProto3(
-      Class<?> messageType, Descriptor messageDescriptor) {
-    List<FieldDescriptor> fieldDescriptors = messageDescriptor.getFields();
-    StructuralMessageInfo.Builder builder =
-        StructuralMessageInfo.newBuilder(fieldDescriptors.size());
-    builder.withDefaultInstance(getDefaultInstance(messageType));
-    builder.withSyntax(ProtoSyntax.PROTO3);
-
-    OneofState oneofState = new OneofState();
-    boolean enforceUtf8 = true;
-    for (int i = 0; i < fieldDescriptors.size(); ++i) {
-      FieldDescriptor fd = fieldDescriptors.get(i);
-      if (fd.getContainingOneof() != null && !fd.getContainingOneof().isSynthetic()) {
-        // Build a oneof member field. But only if it is a real oneof, not a proto3 optional
-        builder.withField(buildOneofMember(messageType, fd, oneofState, enforceUtf8, null));
-        continue;
-      }
-      if (fd.isMapField()) {
-        builder.withField(
-            forMapField(
-                field(messageType, fd),
-                fd.getNumber(),
-                SchemaUtil.getMapDefaultEntry(messageType, fd.getName()),
-                null));
-        continue;
-      }
-      if (fd.isRepeated() && fd.getJavaType() == FieldDescriptor.JavaType.MESSAGE) {
-        builder.withField(
-            forRepeatedMessageField(
-                field(messageType, fd),
-                fd.getNumber(),
-                getFieldType(fd),
-                getTypeForRepeatedMessageField(messageType, fd)));
-        continue;
-      }
-      if (fd.isPacked()) {
-        builder.withField(
-            forPackedField(
-                field(messageType, fd),
-                fd.getNumber(),
-                getFieldType(fd),
-                cachedSizeField(messageType, fd)));
-      } else {
-        builder.withField(
-            forField(field(messageType, fd), fd.getNumber(), getFieldType(fd), enforceUtf8));
-      }
-    }
-
-    return builder.build();
-  }
-
-  /** Builds info for a oneof member field. */
-  private static FieldInfo buildOneofMember(
-      Class<?> messageType,
-      FieldDescriptor fd,
-      OneofState oneofState,
-      boolean enforceUtf8,
-      Internal.EnumVerifier enumVerifier) {
-    OneofInfo oneof = oneofState.getOneof(messageType, fd.getContainingOneof());
-    FieldType type = getFieldType(fd);
-    Class<?> oneofStoredType = getOneofStoredType(messageType, fd, type);
-    return forOneofMemberField(
-        fd.getNumber(), type, oneof, oneofStoredType, enforceUtf8, enumVerifier);
-  }
-
-  private static Class<?> getOneofStoredType(
-      Class<?> messageType, FieldDescriptor fd, FieldType type) {
-    switch (type.getJavaType()) {
-      case BOOLEAN:
-        return Boolean.class;
-      case BYTE_STRING:
-        return ByteString.class;
-      case DOUBLE:
-        return Double.class;
-      case FLOAT:
-        return Float.class;
-      case ENUM:
-      case INT:
-        return Integer.class;
-      case LONG:
-        return Long.class;
-      case STRING:
-        return String.class;
-      case MESSAGE:
-        return getOneofStoredTypeForMessage(messageType, fd);
-      default:
-        throw new IllegalArgumentException("Invalid type for oneof: " + type);
-    }
-  }
-
-  private static FieldType getFieldType(FieldDescriptor fd) {
-    switch (fd.getType()) {
-      case BOOL:
-        if (!fd.isRepeated()) {
-          return FieldType.BOOL;
-        }
-        return fd.isPacked() ? FieldType.BOOL_LIST_PACKED : FieldType.BOOL_LIST;
-      case BYTES:
-        return fd.isRepeated() ? FieldType.BYTES_LIST : FieldType.BYTES;
-      case DOUBLE:
-        if (!fd.isRepeated()) {
-          return FieldType.DOUBLE;
-        }
-        return fd.isPacked() ? FieldType.DOUBLE_LIST_PACKED : FieldType.DOUBLE_LIST;
-      case ENUM:
-        if (!fd.isRepeated()) {
-          return FieldType.ENUM;
-        }
-        return fd.isPacked() ? FieldType.ENUM_LIST_PACKED : FieldType.ENUM_LIST;
-      case FIXED32:
-        if (!fd.isRepeated()) {
-          return FieldType.FIXED32;
-        }
-        return fd.isPacked() ? FieldType.FIXED32_LIST_PACKED : FieldType.FIXED32_LIST;
-      case FIXED64:
-        if (!fd.isRepeated()) {
-          return FieldType.FIXED64;
-        }
-        return fd.isPacked() ? FieldType.FIXED64_LIST_PACKED : FieldType.FIXED64_LIST;
-      case FLOAT:
-        if (!fd.isRepeated()) {
-          return FieldType.FLOAT;
-        }
-        return fd.isPacked() ? FieldType.FLOAT_LIST_PACKED : FieldType.FLOAT_LIST;
-      case GROUP:
-        return fd.isRepeated() ? FieldType.GROUP_LIST : FieldType.GROUP;
-      case INT32:
-        if (!fd.isRepeated()) {
-          return FieldType.INT32;
-        }
-        return fd.isPacked() ? FieldType.INT32_LIST_PACKED : FieldType.INT32_LIST;
-      case INT64:
-        if (!fd.isRepeated()) {
-          return FieldType.INT64;
-        }
-        return fd.isPacked() ? FieldType.INT64_LIST_PACKED : FieldType.INT64_LIST;
-      case MESSAGE:
-        if (fd.isMapField()) {
-          return FieldType.MAP;
-        }
-        return fd.isRepeated() ? FieldType.MESSAGE_LIST : FieldType.MESSAGE;
-      case SFIXED32:
-        if (!fd.isRepeated()) {
-          return FieldType.SFIXED32;
-        }
-        return fd.isPacked() ? FieldType.SFIXED32_LIST_PACKED : FieldType.SFIXED32_LIST;
-      case SFIXED64:
-        if (!fd.isRepeated()) {
-          return FieldType.SFIXED64;
-        }
-        return fd.isPacked() ? FieldType.SFIXED64_LIST_PACKED : FieldType.SFIXED64_LIST;
-      case SINT32:
-        if (!fd.isRepeated()) {
-          return FieldType.SINT32;
-        }
-        return fd.isPacked() ? FieldType.SINT32_LIST_PACKED : FieldType.SINT32_LIST;
-      case SINT64:
-        if (!fd.isRepeated()) {
-          return FieldType.SINT64;
-        }
-        return fd.isPacked() ? FieldType.SINT64_LIST_PACKED : FieldType.SINT64_LIST;
-      case STRING:
-        return fd.isRepeated() ? FieldType.STRING_LIST : FieldType.STRING;
-      case UINT32:
-        if (!fd.isRepeated()) {
-          return FieldType.UINT32;
-        }
-        return fd.isPacked() ? FieldType.UINT32_LIST_PACKED : FieldType.UINT32_LIST;
-      case UINT64:
-        if (!fd.isRepeated()) {
-          return FieldType.UINT64;
-        }
-        return fd.isPacked() ? FieldType.UINT64_LIST_PACKED : FieldType.UINT64_LIST;
-      default:
-        throw new IllegalArgumentException("Unsupported field type: " + fd.getType());
-    }
-  }
-
-  private static Field bitField(Class<?> messageType, int index) {
-    return field(messageType, "bitField" + index + "_");
-  }
-
-  private static Field field(Class<?> messageType, FieldDescriptor fd) {
-    return field(messageType, getFieldName(fd));
-  }
-
-  private static Field cachedSizeField(Class<?> messageType, FieldDescriptor fd) {
-    return field(messageType, getCachedSizeFieldName(fd));
-  }
-
-  private static Field field(Class<?> messageType, String fieldName) {
-    try {
-      return messageType.getDeclaredField(fieldName);
-    } catch (Exception e) {
-      throw new IllegalArgumentException(
-          "Unable to find field " + fieldName + " in message class " + messageType.getName());
-    }
-  }
-
-  static String getFieldName(FieldDescriptor fd) {
-    String name = (fd.getType() == FieldDescriptor.Type.GROUP)
-                  ? fd.getMessageType().getName()
-                  : fd.getName();
-
-    // convert to UpperCamelCase for comparison to the specialFieldNames
-    // (which are in UpperCamelCase)
-    String upperCamelCaseName = snakeCaseToUpperCamelCase(name);
-
-    // Append underscores to match the behavior of the protoc java compiler
-    final String suffix;
-    if (specialFieldNames.contains(upperCamelCaseName)) {
-      // For proto field names that match the specialFieldNames,
-      // the protoc java compiler appends "__" to the java field name
-      // to prevent the field's accessor method names from clashing with other methods.
-      // For example:
-      //     proto field name = "class"
-      //     java field name = "class__"
-      //     accessor method name = "getClass_()"  (so that it does not clash with
-      // Object.getClass())
-      suffix = "__";
-    } else {
-      // For other proto field names,
-      // the protoc java compiler appends "_" to the java field name
-      // to prevent field names from clashing with java keywords.
-      // For example:
-      //     proto field name = "int"
-      //     java field name = "int_" (so that it does not clash with int keyword)
-      //     accessor method name = "getInt()"
-      suffix = "_";
-    }
-    return snakeCaseToLowerCamelCase(name) + suffix;
-  }
-
-  private static String getCachedSizeFieldName(FieldDescriptor fd) {
-    return snakeCaseToLowerCamelCase(fd.getName()) + "MemoizedSerializedSize";
-  }
-
-  /**
-   * Converts a snake case string into lower camel case.
-   *
-   * <p>Some examples:
-   *
-   * <pre>
-   *     snakeCaseToLowerCamelCase("foo_bar") => "fooBar"
-   *     snakeCaseToLowerCamelCase("foo") => "foo"
-   * </pre>
-   *
-   * @param snakeCase the string in snake case to convert
-   * @return the string converted to camel case, with a lowercase first character
-   */
-  private static String snakeCaseToLowerCamelCase(String snakeCase) {
-    return snakeCaseToCamelCase(snakeCase, false);
-  }
-
-  /**
-   * Converts a snake case string into upper camel case.
-   *
-   * <p>Some examples:
-   *
-   * <pre>
-   *     snakeCaseToUpperCamelCase("foo_bar") => "FooBar"
-   *     snakeCaseToUpperCamelCase("foo") => "Foo"
-   * </pre>
-   *
-   * @param snakeCase the string in snake case to convert
-   * @return the string converted to camel case, with an uppercase first character
-   */
-  private static String snakeCaseToUpperCamelCase(String snakeCase) {
-    return snakeCaseToCamelCase(snakeCase, true);
-  }
-
-  /**
-   * Converts a snake case string into camel case.
-   *
-   * <p>For better readability, prefer calling either {@link #snakeCaseToLowerCamelCase(String)} or
-   * {@link #snakeCaseToUpperCamelCase(String)}.
-   *
-   * <p>Some examples:
-   *
-   * <pre>
-   *     snakeCaseToCamelCase("foo_bar", false) => "fooBar"
-   *     snakeCaseToCamelCase("foo_bar", true) => "FooBar"
-   *     snakeCaseToCamelCase("foo", false) => "foo"
-   *     snakeCaseToCamelCase("foo", true) => "Foo"
-   *     snakeCaseToCamelCase("Foo", false) => "foo"
-   *     snakeCaseToCamelCase("fooBar", false) => "fooBar"
-   * </pre>
-   *
-   * <p>This implementation of this method must exactly match the corresponding function in the
-   * protocol compiler. Specifically, the {@code UnderscoresToCamelCase} function in {@code
-   * src/google/protobuf/compiler/java/java_helpers.cc}.
-   *
-   * @param snakeCase the string in snake case to convert
-   * @param capFirst true if the first letter of the returned string should be uppercase. false if
-   *     the first letter of the returned string should be lowercase.
-   * @return the string converted to camel case, with an uppercase or lowercase first character
-   *     depending on if {@code capFirst} is true or false, respectively
-   */
-  private static String snakeCaseToCamelCase(String snakeCase, boolean capFirst) {
-    StringBuilder sb = new StringBuilder(snakeCase.length() + 1);
-    boolean capNext = capFirst;
-    for (int ctr = 0; ctr < snakeCase.length(); ctr++) {
-      char next = snakeCase.charAt(ctr);
-      if (next == '_') {
-        capNext = true;
-      } else if (Character.isDigit(next)) {
-        sb.append(next);
-        capNext = true;
-      } else if (capNext) {
-        sb.append(Character.toUpperCase(next));
-        capNext = false;
-      } else if (ctr == 0) {
-        sb.append(Character.toLowerCase(next));
-      } else {
-        sb.append(next);
-      }
-    }
-    return sb.toString();
-  }
-
-  /**
-   * Inspects the message to identify the stored type for a message field that is part of a oneof.
-   */
-  private static Class<?> getOneofStoredTypeForMessage(Class<?> messageType, FieldDescriptor fd) {
-    try {
-      String name = fd.getType() == Type.GROUP ? fd.getMessageType().getName() : fd.getName();
-      Method getter = messageType.getDeclaredMethod(getterForField(name));
-      return getter.getReturnType();
-    } catch (Exception e) {
-      throw new RuntimeException(e);
-    }
-  }
-
-  /** Inspects the message to identify the message type of a repeated message field. */
-  private static Class<?> getTypeForRepeatedMessageField(Class<?> messageType, FieldDescriptor fd) {
-    try {
-      String name = fd.getType() == Type.GROUP ? fd.getMessageType().getName() : fd.getName();
-      Method getter = messageType.getDeclaredMethod(getterForField(name), int.class);
-      return getter.getReturnType();
-    } catch (Exception e) {
-      throw new RuntimeException(e);
-    }
-  }
-
-  /** Constructs the name of the get method for the given field in the proto. */
-  private static String getterForField(String snakeCase) {
-    String camelCase = snakeCaseToLowerCamelCase(snakeCase);
-    StringBuilder builder = new StringBuilder("get");
-    // Capitalize the first character in the field name.
-    builder.append(Character.toUpperCase(camelCase.charAt(0)));
-    builder.append(camelCase.substring(1, camelCase.length()));
-    return builder.toString();
-  }
-
-  private static final class OneofState {
-    private OneofInfo[] oneofs = new OneofInfo[2];
-
-    OneofInfo getOneof(Class<?> messageType, OneofDescriptor desc) {
-      int index = desc.getIndex();
-      if (index >= oneofs.length) {
-        // Grow the array.
-        oneofs = Arrays.copyOf(oneofs, index * 2);
-      }
-      OneofInfo info = oneofs[index];
-      if (info == null) {
-        info = newInfo(messageType, desc);
-        oneofs[index] = info;
-      }
-      return info;
-    }
-
-    private static OneofInfo newInfo(Class<?> messageType, OneofDescriptor desc) {
-      String camelCase = snakeCaseToLowerCamelCase(desc.getName());
-      String valueFieldName = camelCase + "_";
-      String caseFieldName = camelCase + "Case_";
-
-      return new OneofInfo(
-          desc.getIndex(), field(messageType, caseFieldName), field(messageType, valueFieldName));
-    }
-  }
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/Descriptors.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/Descriptors.java
deleted file mode 100644
index a36195b..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/Descriptors.java
+++ /dev/null
@@ -1,2810 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.protobuf.Internal.checkNotNull;
-
-import com.google.protobuf.DescriptorProtos.DescriptorProto;
-import com.google.protobuf.DescriptorProtos.EnumDescriptorProto;
-import com.google.protobuf.DescriptorProtos.EnumOptions;
-import com.google.protobuf.DescriptorProtos.EnumValueDescriptorProto;
-import com.google.protobuf.DescriptorProtos.EnumValueOptions;
-import com.google.protobuf.DescriptorProtos.FieldDescriptorProto;
-import com.google.protobuf.DescriptorProtos.FieldOptions;
-import com.google.protobuf.DescriptorProtos.FileDescriptorProto;
-import com.google.protobuf.DescriptorProtos.FileOptions;
-import com.google.protobuf.DescriptorProtos.MessageOptions;
-import com.google.protobuf.DescriptorProtos.MethodDescriptorProto;
-import com.google.protobuf.DescriptorProtos.MethodOptions;
-import com.google.protobuf.DescriptorProtos.OneofDescriptorProto;
-import com.google.protobuf.DescriptorProtos.OneofOptions;
-import com.google.protobuf.DescriptorProtos.ServiceDescriptorProto;
-import com.google.protobuf.DescriptorProtos.ServiceOptions;
-import com.google.protobuf.Descriptors.FileDescriptor.Syntax;
-import java.lang.ref.ReferenceQueue;
-import java.lang.ref.WeakReference;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.IdentityHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.logging.Logger;
-
-/**
- * Contains a collection of classes which describe protocol message types.
- *
- * <p>Every message type has a {@link Descriptor}, which lists all its fields and other information
- * about a type. You can get a message type's descriptor by calling {@code
- * MessageType.getDescriptor()}, or (given a message object of the type) {@code
- * message.getDescriptorForType()}. Furthermore, each message is associated with a {@link
- * FileDescriptor} for a relevant {@code .proto} file. You can obtain it by calling {@code
- * Descriptor.getFile()}. A {@link FileDescriptor} contains descriptors for all the messages defined
- * in that file, and file descriptors for all the imported {@code .proto} files.
- *
- * <p>Descriptors are built from DescriptorProtos, as defined in {@code
- * google/protobuf/descriptor.proto}.
- *
- * @author kenton@google.com Kenton Varda
- */
-public final class Descriptors {
-  private static final Logger logger = Logger.getLogger(Descriptors.class.getName());
-  private static final int[] EMPTY_INT_ARRAY = new int[0];
-  private static final Descriptor[] EMPTY_DESCRIPTORS = new Descriptor[0];
-  private static final FieldDescriptor[] EMPTY_FIELD_DESCRIPTORS = new FieldDescriptor[0];
-  private static final EnumDescriptor[] EMPTY_ENUM_DESCRIPTORS = new EnumDescriptor[0];
-  private static final ServiceDescriptor[] EMPTY_SERVICE_DESCRIPTORS = new ServiceDescriptor[0];
-  private static final OneofDescriptor[] EMPTY_ONEOF_DESCRIPTORS = new OneofDescriptor[0];
-
-  /**
-   * Describes a {@code .proto} file, including everything defined within. That includes, in
-   * particular, descriptors for all the messages and file descriptors for all other imported {@code
-   * .proto} files (dependencies).
-   */
-  public static final class FileDescriptor extends GenericDescriptor {
-    /** Convert the descriptor to its protocol message representation. */
-    @Override
-    public FileDescriptorProto toProto() {
-      return proto;
-    }
-
-    /** Get the file name. */
-    @Override
-    public String getName() {
-      return proto.getName();
-    }
-
-    /** Returns this object. */
-    @Override
-    public FileDescriptor getFile() {
-      return this;
-    }
-
-    /** Returns the same as getName(). */
-    @Override
-    public String getFullName() {
-      return proto.getName();
-    }
-
-    /**
-     * Get the proto package name. This is the package name given by the {@code package} statement
-     * in the {@code .proto} file, which differs from the Java package.
-     */
-    public String getPackage() {
-      return proto.getPackage();
-    }
-
-    /** Get the {@code FileOptions}, defined in {@code descriptor.proto}. */
-    public FileOptions getOptions() {
-      return proto.getOptions();
-    }
-
-    /** Get a list of top-level message types declared in this file. */
-    public List<Descriptor> getMessageTypes() {
-      return Collections.unmodifiableList(Arrays.asList(messageTypes));
-    }
-
-    /** Get a list of top-level enum types declared in this file. */
-    public List<EnumDescriptor> getEnumTypes() {
-      return Collections.unmodifiableList(Arrays.asList(enumTypes));
-    }
-
-    /** Get a list of top-level services declared in this file. */
-    public List<ServiceDescriptor> getServices() {
-      return Collections.unmodifiableList(Arrays.asList(services));
-    }
-
-    /** Get a list of top-level extensions declared in this file. */
-    public List<FieldDescriptor> getExtensions() {
-      return Collections.unmodifiableList(Arrays.asList(extensions));
-    }
-
-    /** Get a list of this file's dependencies (imports). */
-    public List<FileDescriptor> getDependencies() {
-      return Collections.unmodifiableList(Arrays.asList(dependencies));
-    }
-
-    /** Get a list of this file's public dependencies (public imports). */
-    public List<FileDescriptor> getPublicDependencies() {
-      return Collections.unmodifiableList(Arrays.asList(publicDependencies));
-    }
-
-    /** The syntax of the .proto file. */
-    public enum Syntax {
-      UNKNOWN("unknown"),
-      PROTO2("proto2"),
-      PROTO3("proto3");
-
-      Syntax(String name) {
-        this.name = name;
-      }
-
-      private final String name;
-    }
-
-    /** Get the syntax of the .proto file. */
-    public Syntax getSyntax() {
-      if (Syntax.PROTO3.name.equals(proto.getSyntax())) {
-        return Syntax.PROTO3;
-      }
-      return Syntax.PROTO2;
-    }
-
-    /**
-     * Find a message type in the file by name. Does not find nested types.
-     *
-     * @param name The unqualified type name to look for.
-     * @return The message type's descriptor, or {@code null} if not found.
-     */
-    public Descriptor findMessageTypeByName(String name) {
-      // Don't allow looking up nested types.  This will make optimization
-      // easier later.
-      if (name.indexOf('.') != -1) {
-        return null;
-      }
-      final String packageName = getPackage();
-      if (!packageName.isEmpty()) {
-        name = packageName + '.' + name;
-      }
-      final GenericDescriptor result = pool.findSymbol(name);
-      if (result instanceof Descriptor && result.getFile() == this) {
-        return (Descriptor) result;
-      } else {
-        return null;
-      }
-    }
-
-    /**
-     * Find an enum type in the file by name. Does not find nested types.
-     *
-     * @param name The unqualified type name to look for.
-     * @return The enum type's descriptor, or {@code null} if not found.
-     */
-    public EnumDescriptor findEnumTypeByName(String name) {
-      // Don't allow looking up nested types.  This will make optimization
-      // easier later.
-      if (name.indexOf('.') != -1) {
-        return null;
-      }
-      final String packageName = getPackage();
-      if (!packageName.isEmpty()) {
-        name = packageName + '.' + name;
-      }
-      final GenericDescriptor result = pool.findSymbol(name);
-      if (result instanceof EnumDescriptor && result.getFile() == this) {
-        return (EnumDescriptor) result;
-      } else {
-        return null;
-      }
-    }
-
-    /**
-     * Find a service type in the file by name.
-     *
-     * @param name The unqualified type name to look for.
-     * @return The service type's descriptor, or {@code null} if not found.
-     */
-    public ServiceDescriptor findServiceByName(String name) {
-      // Don't allow looking up nested types.  This will make optimization
-      // easier later.
-      if (name.indexOf('.') != -1) {
-        return null;
-      }
-      final String packageName = getPackage();
-      if (!packageName.isEmpty()) {
-        name = packageName + '.' + name;
-      }
-      final GenericDescriptor result = pool.findSymbol(name);
-      if (result instanceof ServiceDescriptor && result.getFile() == this) {
-        return (ServiceDescriptor) result;
-      } else {
-        return null;
-      }
-    }
-
-    /**
-     * Find an extension in the file by name. Does not find extensions nested inside message types.
-     *
-     * @param name The unqualified extension name to look for.
-     * @return The extension's descriptor, or {@code null} if not found.
-     */
-    public FieldDescriptor findExtensionByName(String name) {
-      if (name.indexOf('.') != -1) {
-        return null;
-      }
-      final String packageName = getPackage();
-      if (!packageName.isEmpty()) {
-        name = packageName + '.' + name;
-      }
-      final GenericDescriptor result = pool.findSymbol(name);
-      if (result instanceof FieldDescriptor && result.getFile() == this) {
-        return (FieldDescriptor) result;
-      } else {
-        return null;
-      }
-    }
-
-    /**
-     * Construct a {@code FileDescriptor}.
-     *
-     * @param proto the protocol message form of the FileDescriptort
-     * @param dependencies {@code FileDescriptor}s corresponding to all of the file's dependencies
-     * @throws DescriptorValidationException {@code proto} is not a valid descriptor. This can occur
-     *     for a number of reasons; for instance, because a field has an undefined type or because
-     *     two messages were defined with the same name.
-     */
-    public static FileDescriptor buildFrom(FileDescriptorProto proto, FileDescriptor[] dependencies)
-        throws DescriptorValidationException {
-      return buildFrom(proto, dependencies, false);
-    }
-
-    /**
-     * Construct a {@code FileDescriptor}.
-     *
-     * @param proto the protocol message form of the FileDescriptor
-     * @param dependencies {@code FileDescriptor}s corresponding to all of the file's dependencies
-     * @param allowUnknownDependencies if true, non-existing dependencies will be ignored and
-     *     undefined message types will be replaced with a placeholder type. Undefined enum types
-     *     still cause a DescriptorValidationException.
-     * @throws DescriptorValidationException {@code proto} is not a valid descriptor. This can occur
-     *     for a number of reasons; for instance, because a field has an undefined type or because
-     *     two messages were defined with the same name.
-     */
-    public static FileDescriptor buildFrom(
-        FileDescriptorProto proto,
-        FileDescriptor[] dependencies,
-        boolean allowUnknownDependencies)
-        throws DescriptorValidationException {
-      // Building descriptors involves two steps:  translating and linking.
-      // In the translation step (implemented by FileDescriptor's
-      // constructor), we build an object tree mirroring the
-      // FileDescriptorProto's tree and put all of the descriptors into the
-      // DescriptorPool's lookup tables.  In the linking step, we look up all
-      // type references in the DescriptorPool, so that, for example, a
-      // FieldDescriptor for an embedded message contains a pointer directly
-      // to the Descriptor for that message's type.  We also detect undefined
-      // types in the linking step.
-      DescriptorPool pool = new DescriptorPool(dependencies, allowUnknownDependencies);
-      FileDescriptor result =
-          new FileDescriptor(proto, dependencies, pool, allowUnknownDependencies);
-      result.crossLink();
-      return result;
-    }
-
-    private static byte[] latin1Cat(final String[] strings) {
-      // Hack:  We can't embed a raw byte array inside generated Java code
-      //   (at least, not efficiently), but we can embed Strings.  So, the
-      //   protocol compiler embeds the FileDescriptorProto as a giant
-      //   string literal which is passed to this function to construct the
-      //   file's FileDescriptor.  The string literal contains only 8-bit
-      //   characters, each one representing a byte of the FileDescriptorProto's
-      //   serialized form.  So, if we convert it to bytes in ISO-8859-1, we
-      //   should get the original bytes that we want.
-      // Literal strings are limited to 64k, so it may be split into multiple strings.
-      if (strings.length == 1) {
-        return strings[0].getBytes(Internal.ISO_8859_1);
-      }
-      StringBuilder descriptorData = new StringBuilder();
-      for (String part : strings) {
-        descriptorData.append(part);
-      }
-      return descriptorData.toString().getBytes(Internal.ISO_8859_1);
-    }
-
-    private static FileDescriptor[] findDescriptors(
-        final Class<?> descriptorOuterClass,
-        final String[] dependencyClassNames,
-        final String[] dependencyFileNames) {
-      List<FileDescriptor> descriptors = new ArrayList<>();
-      for (int i = 0; i < dependencyClassNames.length; i++) {
-        try {
-          Class<?> clazz = descriptorOuterClass.getClassLoader().loadClass(dependencyClassNames[i]);
-          descriptors.add((FileDescriptor) clazz.getField("descriptor").get(null));
-        } catch (Exception e) {
-          // We allow unknown dependencies by default. If a dependency cannot
-          // be found we only generate a warning.
-          logger.warning("Descriptors for \"" + dependencyFileNames[i] + "\" can not be found.");
-        }
-      }
-      return descriptors.toArray(new FileDescriptor[0]);
-    }
-
-    /**
-     * This method is for backward compatibility with generated code which passed an
-     * InternalDescriptorAssigner.
-     */
-    @Deprecated
-    public static void internalBuildGeneratedFileFrom(
-        final String[] descriptorDataParts,
-        final FileDescriptor[] dependencies,
-        final InternalDescriptorAssigner descriptorAssigner) {
-      final byte[] descriptorBytes = latin1Cat(descriptorDataParts);
-
-      FileDescriptorProto proto;
-      try {
-        proto = FileDescriptorProto.parseFrom(descriptorBytes);
-      } catch (InvalidProtocolBufferException e) {
-        throw new IllegalArgumentException(
-            "Failed to parse protocol buffer descriptor for generated code.", e);
-      }
-
-      final FileDescriptor result;
-      try {
-        // When building descriptors for generated code, we allow unknown
-        // dependencies by default.
-        result = buildFrom(proto, dependencies, true);
-      } catch (DescriptorValidationException e) {
-        throw new IllegalArgumentException(
-            "Invalid embedded descriptor for \"" + proto.getName() + "\".", e);
-      }
-
-      final ExtensionRegistry registry = descriptorAssigner.assignDescriptors(result);
-
-      if (registry != null) {
-        // We must re-parse the proto using the registry.
-        try {
-          proto = FileDescriptorProto.parseFrom(descriptorBytes, registry);
-        } catch (InvalidProtocolBufferException e) {
-          throw new IllegalArgumentException(
-              "Failed to parse protocol buffer descriptor for generated code.", e);
-        }
-
-        result.setProto(proto);
-      }
-    }
-
-    /**
-     * This method is to be called by generated code only. It is equivalent to {@code buildFrom}
-     * except that the {@code FileDescriptorProto} is encoded in protocol buffer wire format.
-     */
-    public static FileDescriptor internalBuildGeneratedFileFrom(
-        final String[] descriptorDataParts, final FileDescriptor[] dependencies) {
-      final byte[] descriptorBytes = latin1Cat(descriptorDataParts);
-
-      FileDescriptorProto proto;
-      try {
-        proto = FileDescriptorProto.parseFrom(descriptorBytes);
-      } catch (InvalidProtocolBufferException e) {
-        throw new IllegalArgumentException(
-            "Failed to parse protocol buffer descriptor for generated code.", e);
-      }
-
-      try {
-        // When building descriptors for generated code, we allow unknown
-        // dependencies by default.
-        return buildFrom(proto, dependencies, true);
-      } catch (DescriptorValidationException e) {
-        throw new IllegalArgumentException(
-            "Invalid embedded descriptor for \"" + proto.getName() + "\".", e);
-      }
-    }
-
-    /**
-     * This method is for backward compatibility with generated code which passed an
-     * InternalDescriptorAssigner.
-     */
-    @Deprecated
-    public static void internalBuildGeneratedFileFrom(
-        final String[] descriptorDataParts,
-        final Class<?> descriptorOuterClass,
-        final String[] dependencyClassNames,
-        final String[] dependencyFileNames,
-        final InternalDescriptorAssigner descriptorAssigner) {
-      FileDescriptor[] dependencies =
-          findDescriptors(descriptorOuterClass, dependencyClassNames, dependencyFileNames);
-      internalBuildGeneratedFileFrom(descriptorDataParts, dependencies, descriptorAssigner);
-    }
-
-    /**
-     * This method is to be called by generated code only. It uses Java reflection to load the
-     * dependencies' descriptors.
-     */
-    public static FileDescriptor internalBuildGeneratedFileFrom(
-        final String[] descriptorDataParts,
-        final Class<?> descriptorOuterClass,
-        final String[] dependencyClassNames,
-        final String[] dependencyFileNames) {
-      FileDescriptor[] dependencies =
-          findDescriptors(descriptorOuterClass, dependencyClassNames, dependencyFileNames);
-      return internalBuildGeneratedFileFrom(descriptorDataParts, dependencies);
-    }
-
-    /**
-     * This method is to be called by generated code only. It is used to update the
-     * FileDescriptorProto associated with the descriptor by parsing it again with the given
-     * ExtensionRegistry. This is needed to recognize custom options.
-     */
-    public static void internalUpdateFileDescriptor(
-        final FileDescriptor descriptor, final ExtensionRegistry registry) {
-      ByteString bytes = descriptor.proto.toByteString();
-      FileDescriptorProto proto;
-      try {
-        proto = FileDescriptorProto.parseFrom(bytes, registry);
-      } catch (InvalidProtocolBufferException e) {
-        throw new IllegalArgumentException(
-            "Failed to parse protocol buffer descriptor for generated code.", e);
-      }
-      descriptor.setProto(proto);
-    }
-
-    /**
-     * This class should be used by generated code only. When calling {@link
-     * FileDescriptor#internalBuildGeneratedFileFrom}, the caller provides a callback implementing
-     * this interface. The callback is called after the FileDescriptor has been constructed, in
-     * order to assign all the global variables defined in the generated code which point at parts
-     * of the FileDescriptor. The callback returns an ExtensionRegistry which contains any
-     * extensions which might be used in the descriptor -- that is, extensions of the various
-     * "Options" messages defined in descriptor.proto. The callback may also return null to indicate
-     * that no extensions are used in the descriptor.
-     *
-     * <p>This interface is deprecated. Use the return value of internalBuildGeneratedFrom()
-     * instead.
-     */
-    @Deprecated
-    public interface InternalDescriptorAssigner {
-      ExtensionRegistry assignDescriptors(FileDescriptor root);
-    }
-
-    private FileDescriptorProto proto;
-    private final Descriptor[] messageTypes;
-    private final EnumDescriptor[] enumTypes;
-    private final ServiceDescriptor[] services;
-    private final FieldDescriptor[] extensions;
-    private final FileDescriptor[] dependencies;
-    private final FileDescriptor[] publicDependencies;
-    private final DescriptorPool pool;
-
-    private FileDescriptor(
-        final FileDescriptorProto proto,
-        final FileDescriptor[] dependencies,
-        final DescriptorPool pool,
-        boolean allowUnknownDependencies)
-        throws DescriptorValidationException {
-      this.pool = pool;
-      this.proto = proto;
-      this.dependencies = dependencies.clone();
-      HashMap<String, FileDescriptor> nameToFileMap = new HashMap<>();
-      for (FileDescriptor file : dependencies) {
-        nameToFileMap.put(file.getName(), file);
-      }
-      List<FileDescriptor> publicDependencies = new ArrayList<>();
-      for (int i = 0; i < proto.getPublicDependencyCount(); i++) {
-        int index = proto.getPublicDependency(i);
-        if (index < 0 || index >= proto.getDependencyCount()) {
-          throw new DescriptorValidationException(this, "Invalid public dependency index.");
-        }
-        String name = proto.getDependency(index);
-        FileDescriptor file = nameToFileMap.get(name);
-        if (file == null) {
-          if (!allowUnknownDependencies) {
-            throw new DescriptorValidationException(this, "Invalid public dependency: " + name);
-          }
-          // Ignore unknown dependencies.
-        } else {
-          publicDependencies.add(file);
-        }
-      }
-      this.publicDependencies = new FileDescriptor[publicDependencies.size()];
-      publicDependencies.toArray(this.publicDependencies);
-
-      pool.addPackage(getPackage(), this);
-
-      messageTypes =
-          (proto.getMessageTypeCount() > 0)
-              ? new Descriptor[proto.getMessageTypeCount()]
-              : EMPTY_DESCRIPTORS;
-      for (int i = 0; i < proto.getMessageTypeCount(); i++) {
-        messageTypes[i] = new Descriptor(proto.getMessageType(i), this, null, i);
-      }
-
-      enumTypes =
-          (proto.getEnumTypeCount() > 0)
-              ? new EnumDescriptor[proto.getEnumTypeCount()]
-              : EMPTY_ENUM_DESCRIPTORS;
-      for (int i = 0; i < proto.getEnumTypeCount(); i++) {
-        enumTypes[i] = new EnumDescriptor(proto.getEnumType(i), this, null, i);
-      }
-
-      services =
-          (proto.getServiceCount() > 0)
-              ? new ServiceDescriptor[proto.getServiceCount()]
-              : EMPTY_SERVICE_DESCRIPTORS;
-      for (int i = 0; i < proto.getServiceCount(); i++) {
-        services[i] = new ServiceDescriptor(proto.getService(i), this, i);
-      }
-
-      extensions =
-          (proto.getExtensionCount() > 0)
-              ? new FieldDescriptor[proto.getExtensionCount()]
-              : EMPTY_FIELD_DESCRIPTORS;
-      for (int i = 0; i < proto.getExtensionCount(); i++) {
-        extensions[i] = new FieldDescriptor(proto.getExtension(i), this, null, i, true);
-      }
-    }
-
-    /** Create a placeholder FileDescriptor for a message Descriptor. */
-    FileDescriptor(String packageName, Descriptor message) throws DescriptorValidationException {
-      this.pool = new DescriptorPool(new FileDescriptor[0], true);
-      this.proto =
-          FileDescriptorProto.newBuilder()
-              .setName(message.getFullName() + ".placeholder.proto")
-              .setPackage(packageName)
-              .addMessageType(message.toProto())
-              .build();
-      this.dependencies = new FileDescriptor[0];
-      this.publicDependencies = new FileDescriptor[0];
-
-      messageTypes = new Descriptor[] {message};
-      enumTypes = EMPTY_ENUM_DESCRIPTORS;
-      services = EMPTY_SERVICE_DESCRIPTORS;
-      extensions = EMPTY_FIELD_DESCRIPTORS;
-
-      pool.addPackage(packageName, this);
-      pool.addSymbol(message);
-    }
-
-    /** Look up and cross-link all field types, etc. */
-    private void crossLink() throws DescriptorValidationException {
-      for (final Descriptor messageType : messageTypes) {
-        messageType.crossLink();
-      }
-
-      for (final ServiceDescriptor service : services) {
-        service.crossLink();
-      }
-
-      for (final FieldDescriptor extension : extensions) {
-        extension.crossLink();
-      }
-    }
-
-    /**
-     * Replace our {@link FileDescriptorProto} with the given one, which is identical except that it
-     * might contain extensions that weren't present in the original. This method is needed for
-     * bootstrapping when a file defines custom options. The options may be defined in the file
-     * itself, so we can't actually parse them until we've constructed the descriptors, but to
-     * construct the descriptors we have to have parsed the descriptor protos. So, we have to parse
-     * the descriptor protos a second time after constructing the descriptors.
-     */
-    private void setProto(final FileDescriptorProto proto) {
-      this.proto = proto;
-
-      for (int i = 0; i < messageTypes.length; i++) {
-        messageTypes[i].setProto(proto.getMessageType(i));
-      }
-
-      for (int i = 0; i < enumTypes.length; i++) {
-        enumTypes[i].setProto(proto.getEnumType(i));
-      }
-
-      for (int i = 0; i < services.length; i++) {
-        services[i].setProto(proto.getService(i));
-      }
-
-      for (int i = 0; i < extensions.length; i++) {
-        extensions[i].setProto(proto.getExtension(i));
-      }
-    }
-
-    boolean supportsUnknownEnumValue() {
-      return getSyntax() == Syntax.PROTO3;
-    }
-  }
-
-  // =================================================================
-
-  /** Describes a message type. */
-  public static final class Descriptor extends GenericDescriptor {
-    /**
-     * Get the index of this descriptor within its parent. In other words, given a {@link
-     * FileDescriptor} {@code file}, the following is true:
-     *
-     * <pre>
-     *   for all i in [0, file.getMessageTypeCount()):
-     *     file.getMessageType(i).getIndex() == i
-     * </pre>
-     *
-     * Similarly, for a {@link Descriptor} {@code messageType}:
-     *
-     * <pre>
-     *   for all i in [0, messageType.getNestedTypeCount()):
-     *     messageType.getNestedType(i).getIndex() == i
-     * </pre>
-     */
-    public int getIndex() {
-      return index;
-    }
-
-    /** Convert the descriptor to its protocol message representation. */
-    @Override
-    public DescriptorProto toProto() {
-      return proto;
-    }
-
-    /** Get the type's unqualified name. */
-    @Override
-    public String getName() {
-      return proto.getName();
-    }
-
-    /**
-     * Get the type's fully-qualified name, within the proto language's namespace. This differs from
-     * the Java name. For example, given this {@code .proto}:
-     *
-     * <pre>
-     *   package foo.bar;
-     *   option java_package = "com.example.protos"
-     *   message Baz {}
-     * </pre>
-     *
-     * {@code Baz}'s full name is "foo.bar.Baz".
-     */
-    @Override
-    public String getFullName() {
-      return fullName;
-    }
-
-    /** Get the {@link FileDescriptor} containing this descriptor. */
-    @Override
-    public FileDescriptor getFile() {
-      return file;
-    }
-
-    /** If this is a nested type, get the outer descriptor, otherwise null. */
-    public Descriptor getContainingType() {
-      return containingType;
-    }
-
-    /** Get the {@code MessageOptions}, defined in {@code descriptor.proto}. */
-    public MessageOptions getOptions() {
-      return proto.getOptions();
-    }
-
-    /** Get a list of this message type's fields. */
-    public List<FieldDescriptor> getFields() {
-      return Collections.unmodifiableList(Arrays.asList(fields));
-    }
-
-    /** Get a list of this message type's oneofs. */
-    public List<OneofDescriptor> getOneofs() {
-      return Collections.unmodifiableList(Arrays.asList(oneofs));
-    }
-
-    /** Get a list of this message type's real oneofs. */
-    public List<OneofDescriptor> getRealOneofs() {
-      return Collections.unmodifiableList(Arrays.asList(oneofs).subList(0, realOneofCount));
-    }
-
-    /** Get a list of this message type's extensions. */
-    public List<FieldDescriptor> getExtensions() {
-      return Collections.unmodifiableList(Arrays.asList(extensions));
-    }
-
-    /** Get a list of message types nested within this one. */
-    public List<Descriptor> getNestedTypes() {
-      return Collections.unmodifiableList(Arrays.asList(nestedTypes));
-    }
-
-    /** Get a list of enum types nested within this one. */
-    public List<EnumDescriptor> getEnumTypes() {
-      return Collections.unmodifiableList(Arrays.asList(enumTypes));
-    }
-
-    /** Determines if the given field number is an extension. */
-    public boolean isExtensionNumber(final int number) {
-      int index = Arrays.binarySearch(extensionRangeLowerBounds, number);
-      if (index < 0) {
-        index = ~index - 1;
-      }
-      // extensionRangeLowerBounds[index] is the biggest value <= number
-      return index >= 0 && number < extensionRangeUpperBounds[index];
-    }
-
-    /** Determines if the given field number is reserved. */
-    public boolean isReservedNumber(final int number) {
-      for (final DescriptorProto.ReservedRange range : proto.getReservedRangeList()) {
-        if (range.getStart() <= number && number < range.getEnd()) {
-          return true;
-        }
-      }
-      return false;
-    }
-
-    /** Determines if the given field name is reserved. */
-    public boolean isReservedName(final String name) {
-      checkNotNull(name);
-      for (final String reservedName : proto.getReservedNameList()) {
-        if (reservedName.equals(name)) {
-          return true;
-        }
-      }
-      return false;
-    }
-
-    /**
-     * Indicates whether the message can be extended. That is, whether it has any "extensions x to
-     * y" ranges declared on it.
-     */
-    public boolean isExtendable() {
-      return !proto.getExtensionRangeList().isEmpty();
-    }
-
-    /**
-     * Finds a field by name.
-     *
-     * @param name The unqualified name of the field (e.g. "foo"). For protocol buffer messages that
-     *     follow <a
-     *     href=https://developers.google.com/protocol-buffers/docs/style#message_and_field_names>Google's
-     *     guidance on naming</a> this will be a snake case string, such as
-     *     <pre>song_name</pre>
-     *     .
-     * @return The field's descriptor, or {@code null} if not found.
-     */
-    public FieldDescriptor findFieldByName(final String name) {
-      final GenericDescriptor result = file.pool.findSymbol(fullName + '.' + name);
-      if (result instanceof FieldDescriptor) {
-        return (FieldDescriptor) result;
-      } else {
-        return null;
-      }
-    }
-
-    /**
-     * Finds a field by field number.
-     *
-     * @param number The field number within this message type.
-     * @return The field's descriptor, or {@code null} if not found.
-     */
-    public FieldDescriptor findFieldByNumber(final int number) {
-      return binarySearch(
-          fieldsSortedByNumber, fieldsSortedByNumber.length, FieldDescriptor.NUMBER_GETTER, number);
-    }
-
-    /**
-     * Finds a nested message type by name.
-     *
-     * @param name The unqualified name of the nested type such as "Foo"
-     * @return The types's descriptor, or {@code null} if not found.
-     */
-    public Descriptor findNestedTypeByName(final String name) {
-      final GenericDescriptor result = file.pool.findSymbol(fullName + '.' + name);
-      if (result instanceof Descriptor) {
-        return (Descriptor) result;
-      } else {
-        return null;
-      }
-    }
-
-    /**
-     * Finds a nested enum type by name.
-     *
-     * @param name The unqualified name of the nested type such as "Foo"
-     * @return The types's descriptor, or {@code null} if not found.
-     */
-    public EnumDescriptor findEnumTypeByName(final String name) {
-      final GenericDescriptor result = file.pool.findSymbol(fullName + '.' + name);
-      if (result instanceof EnumDescriptor) {
-        return (EnumDescriptor) result;
-      } else {
-        return null;
-      }
-    }
-
-    private final int index;
-    private DescriptorProto proto;
-    private final String fullName;
-    private final FileDescriptor file;
-    private final Descriptor containingType;
-    private final Descriptor[] nestedTypes;
-    private final EnumDescriptor[] enumTypes;
-    private final FieldDescriptor[] fields;
-    private final FieldDescriptor[] fieldsSortedByNumber;
-    private final FieldDescriptor[] extensions;
-    private final OneofDescriptor[] oneofs;
-    private final int realOneofCount;
-
-    private final int[] extensionRangeLowerBounds;
-    private final int[] extensionRangeUpperBounds;
-
-    // Used to create a placeholder when the type cannot be found.
-    Descriptor(final String fullname) throws DescriptorValidationException {
-      String name = fullname;
-      String packageName = "";
-      int pos = fullname.lastIndexOf('.');
-      if (pos != -1) {
-        name = fullname.substring(pos + 1);
-        packageName = fullname.substring(0, pos);
-      }
-      this.index = 0;
-      this.proto =
-          DescriptorProto.newBuilder()
-              .setName(name)
-              .addExtensionRange(
-                  DescriptorProto.ExtensionRange.newBuilder().setStart(1).setEnd(536870912).build())
-              .build();
-      this.fullName = fullname;
-      this.containingType = null;
-
-      this.nestedTypes = EMPTY_DESCRIPTORS;
-      this.enumTypes = EMPTY_ENUM_DESCRIPTORS;
-      this.fields = EMPTY_FIELD_DESCRIPTORS;
-      this.fieldsSortedByNumber = EMPTY_FIELD_DESCRIPTORS;
-      this.extensions = EMPTY_FIELD_DESCRIPTORS;
-      this.oneofs = EMPTY_ONEOF_DESCRIPTORS;
-      this.realOneofCount = 0;
-
-      // Create a placeholder FileDescriptor to hold this message.
-      this.file = new FileDescriptor(packageName, this);
-
-      extensionRangeLowerBounds = new int[] {1};
-      extensionRangeUpperBounds = new int[] {536870912};
-    }
-
-    private Descriptor(
-        final DescriptorProto proto,
-        final FileDescriptor file,
-        final Descriptor parent,
-        final int index)
-        throws DescriptorValidationException {
-      this.index = index;
-      this.proto = proto;
-      fullName = computeFullName(file, parent, proto.getName());
-      this.file = file;
-      containingType = parent;
-
-      oneofs =
-          (proto.getOneofDeclCount() > 0)
-              ? new OneofDescriptor[proto.getOneofDeclCount()]
-              : EMPTY_ONEOF_DESCRIPTORS;
-      for (int i = 0; i < proto.getOneofDeclCount(); i++) {
-        oneofs[i] = new OneofDescriptor(proto.getOneofDecl(i), file, this, i);
-      }
-
-      nestedTypes =
-          (proto.getNestedTypeCount() > 0)
-              ? new Descriptor[proto.getNestedTypeCount()]
-              : EMPTY_DESCRIPTORS;
-      for (int i = 0; i < proto.getNestedTypeCount(); i++) {
-        nestedTypes[i] = new Descriptor(proto.getNestedType(i), file, this, i);
-      }
-
-      enumTypes =
-          (proto.getEnumTypeCount() > 0)
-              ? new EnumDescriptor[proto.getEnumTypeCount()]
-              : EMPTY_ENUM_DESCRIPTORS;
-      for (int i = 0; i < proto.getEnumTypeCount(); i++) {
-        enumTypes[i] = new EnumDescriptor(proto.getEnumType(i), file, this, i);
-      }
-
-      fields =
-          (proto.getFieldCount() > 0)
-              ? new FieldDescriptor[proto.getFieldCount()]
-              : EMPTY_FIELD_DESCRIPTORS;
-      for (int i = 0; i < proto.getFieldCount(); i++) {
-        fields[i] = new FieldDescriptor(proto.getField(i), file, this, i, false);
-      }
-      this.fieldsSortedByNumber =
-          (proto.getFieldCount() > 0) ? fields.clone() : EMPTY_FIELD_DESCRIPTORS;
-
-      extensions =
-          (proto.getExtensionCount() > 0)
-              ? new FieldDescriptor[proto.getExtensionCount()]
-              : EMPTY_FIELD_DESCRIPTORS;
-      for (int i = 0; i < proto.getExtensionCount(); i++) {
-        extensions[i] = new FieldDescriptor(proto.getExtension(i), file, this, i, true);
-      }
-
-      for (int i = 0; i < proto.getOneofDeclCount(); i++) {
-        oneofs[i].fields = new FieldDescriptor[oneofs[i].getFieldCount()];
-        oneofs[i].fieldCount = 0;
-      }
-      for (int i = 0; i < proto.getFieldCount(); i++) {
-        OneofDescriptor oneofDescriptor = fields[i].getContainingOneof();
-        if (oneofDescriptor != null) {
-          oneofDescriptor.fields[oneofDescriptor.fieldCount++] = fields[i];
-        }
-      }
-
-      int syntheticOneofCount = 0;
-      for (OneofDescriptor oneof : this.oneofs) {
-        if (oneof.isSynthetic()) {
-          syntheticOneofCount++;
-        } else {
-          if (syntheticOneofCount > 0) {
-            throw new DescriptorValidationException(this, "Synthetic oneofs must come last.");
-          }
-        }
-      }
-      this.realOneofCount = this.oneofs.length - syntheticOneofCount;
-
-      file.pool.addSymbol(this);
-
-      // NOTE: The defined extension ranges are guaranteed to be disjoint.
-      if (proto.getExtensionRangeCount() > 0) {
-        extensionRangeLowerBounds = new int[proto.getExtensionRangeCount()];
-        extensionRangeUpperBounds = new int[proto.getExtensionRangeCount()];
-        int i = 0;
-        for (final DescriptorProto.ExtensionRange range : proto.getExtensionRangeList()) {
-          extensionRangeLowerBounds[i] = range.getStart();
-          extensionRangeUpperBounds[i] = range.getEnd();
-          i++;
-        }
-        // Since the ranges are disjoint, sorting these independently must still produce the correct
-        // order.
-        Arrays.sort(extensionRangeLowerBounds);
-        Arrays.sort(extensionRangeUpperBounds);
-      } else {
-        extensionRangeLowerBounds = EMPTY_INT_ARRAY;
-        extensionRangeUpperBounds = EMPTY_INT_ARRAY;
-      }
-    }
-
-    /** Look up and cross-link all field types, etc. */
-    private void crossLink() throws DescriptorValidationException {
-      for (final Descriptor nestedType : nestedTypes) {
-        nestedType.crossLink();
-      }
-
-      for (final FieldDescriptor field : fields) {
-        field.crossLink();
-      }
-      Arrays.sort(fieldsSortedByNumber);
-      validateNoDuplicateFieldNumbers();
-
-      for (final FieldDescriptor extension : extensions) {
-        extension.crossLink();
-      }
-    }
-
-    private void validateNoDuplicateFieldNumbers() throws DescriptorValidationException {
-      for (int i = 0; i + 1 < fieldsSortedByNumber.length; i++) {
-        FieldDescriptor old = fieldsSortedByNumber[i];
-        FieldDescriptor field = fieldsSortedByNumber[i + 1];
-        if (old.getNumber() == field.getNumber()) {
-          throw new DescriptorValidationException(
-              field,
-              "Field number "
-                  + field.getNumber()
-                  + " has already been used in \""
-                  + field.getContainingType().getFullName()
-                  + "\" by field \""
-                  + old.getName()
-                  + "\".");
-        }
-      }
-    }
-
-    /** See {@link FileDescriptor#setProto}. */
-    private void setProto(final DescriptorProto proto) {
-      this.proto = proto;
-
-      for (int i = 0; i < nestedTypes.length; i++) {
-        nestedTypes[i].setProto(proto.getNestedType(i));
-      }
-
-      for (int i = 0; i < oneofs.length; i++) {
-        oneofs[i].setProto(proto.getOneofDecl(i));
-      }
-
-      for (int i = 0; i < enumTypes.length; i++) {
-        enumTypes[i].setProto(proto.getEnumType(i));
-      }
-
-      for (int i = 0; i < fields.length; i++) {
-        fields[i].setProto(proto.getField(i));
-      }
-
-      for (int i = 0; i < extensions.length; i++) {
-        extensions[i].setProto(proto.getExtension(i));
-      }
-    }
-  }
-
-  // =================================================================
-
-  /** Describes a field of a message type. */
-  public static final class FieldDescriptor extends GenericDescriptor
-      implements Comparable<FieldDescriptor>, FieldSet.FieldDescriptorLite<FieldDescriptor> {
-    private static final NumberGetter<FieldDescriptor> NUMBER_GETTER =
-        new NumberGetter<FieldDescriptor>() {
-          @Override
-          public int getNumber(FieldDescriptor fieldDescriptor) {
-            return fieldDescriptor.getNumber();
-          }
-        };
-
-    /**
-     * Get the index of this descriptor within its parent.
-     *
-     * @see Descriptors.Descriptor#getIndex()
-     */
-    public int getIndex() {
-      return index;
-    }
-
-    /** Convert the descriptor to its protocol message representation. */
-    @Override
-    public FieldDescriptorProto toProto() {
-      return proto;
-    }
-
-    /** Get the field's unqualified name. */
-    @Override
-    public String getName() {
-      return proto.getName();
-    }
-
-    /** Get the field's number. */
-    @Override
-    public int getNumber() {
-      return proto.getNumber();
-    }
-
-    /**
-     * Get the field's fully-qualified name.
-     *
-     * @see Descriptors.Descriptor#getFullName()
-     */
-    @Override
-    public String getFullName() {
-      return fullName;
-    }
-
-    /** Get the JSON name of this field. */
-    public String getJsonName() {
-      String result = jsonName;
-      if (result != null) {
-        return result;
-      } else if (proto.hasJsonName()) {
-        return jsonName = proto.getJsonName();
-      } else {
-        return jsonName = fieldNameToJsonName(proto.getName());
-      }
-    }
-
-    /**
-     * Get the field's java type. This is just for convenience. Every {@code
-     * FieldDescriptorProto.Type} maps to exactly one Java type.
-     */
-    public JavaType getJavaType() {
-      return type.getJavaType();
-    }
-
-    /** For internal use only. */
-    @Override
-    public WireFormat.JavaType getLiteJavaType() {
-      return getLiteType().getJavaType();
-    }
-
-    /** Get the {@code FileDescriptor} containing this descriptor. */
-    @Override
-    public FileDescriptor getFile() {
-      return file;
-    }
-
-    /** Get the field's declared type. */
-    public Type getType() {
-      return type;
-    }
-
-    /** For internal use only. */
-    @Override
-    public WireFormat.FieldType getLiteType() {
-      return table[type.ordinal()];
-    }
-
-    /** For internal use only. */
-    public boolean needsUtf8Check() {
-      if (type != Type.STRING) {
-        return false;
-      }
-      if (getContainingType().getOptions().getMapEntry()) {
-        // Always enforce strict UTF-8 checking for map fields.
-        return true;
-      }
-      if (getFile().getSyntax() == Syntax.PROTO3) {
-        return true;
-      }
-      return getFile().getOptions().getJavaStringCheckUtf8();
-    }
-
-    public boolean isMapField() {
-      return getType() == Type.MESSAGE
-          && isRepeated()
-          && getMessageType().getOptions().getMapEntry();
-    }
-
-    // I'm pretty sure values() constructs a new array every time, since there
-    // is nothing stopping the caller from mutating the array.  Therefore we
-    // make a static copy here.
-    private static final WireFormat.FieldType[] table = WireFormat.FieldType.values();
-
-    /** Is this field declared required? */
-    public boolean isRequired() {
-      return proto.getLabel() == FieldDescriptorProto.Label.LABEL_REQUIRED;
-    }
-
-    /** Is this field declared optional? */
-    public boolean isOptional() {
-      return proto.getLabel() == FieldDescriptorProto.Label.LABEL_OPTIONAL;
-    }
-
-    /** Is this field declared repeated? */
-    @Override
-    public boolean isRepeated() {
-      return proto.getLabel() == FieldDescriptorProto.Label.LABEL_REPEATED;
-    }
-
-    /**
-     * Does this field have the {@code [packed = true]} option or is this field packable in proto3
-     * and not explicitly set to unpacked?
-     */
-    @Override
-    public boolean isPacked() {
-      if (!isPackable()) {
-        return false;
-      }
-      if (getFile().getSyntax() == FileDescriptor.Syntax.PROTO2) {
-        return getOptions().getPacked();
-      } else {
-        return !getOptions().hasPacked() || getOptions().getPacked();
-      }
-    }
-
-    /** Can this field be packed? That is, is it a repeated primitive field? */
-    public boolean isPackable() {
-      return isRepeated() && getLiteType().isPackable();
-    }
-
-    /** Returns true if the field had an explicitly-defined default value. */
-    public boolean hasDefaultValue() {
-      return proto.hasDefaultValue();
-    }
-
-    /**
-     * Returns the field's default value. Valid for all types except for messages and groups. For
-     * all other types, the object returned is of the same class that would returned by
-     * Message.getField(this).
-     */
-    public Object getDefaultValue() {
-      if (getJavaType() == JavaType.MESSAGE) {
-        throw new UnsupportedOperationException(
-            "FieldDescriptor.getDefaultValue() called on an embedded message field.");
-      }
-      return defaultValue;
-    }
-
-    /** Get the {@code FieldOptions}, defined in {@code descriptor.proto}. */
-    public FieldOptions getOptions() {
-      return proto.getOptions();
-    }
-
-    /** Is this field an extension? */
-    public boolean isExtension() {
-      return proto.hasExtendee();
-    }
-
-    /**
-     * Get the field's containing type. For extensions, this is the type being extended, not the
-     * location where the extension was defined. See {@link #getExtensionScope()}.
-     */
-    public Descriptor getContainingType() {
-      return containingType;
-    }
-
-    /** Get the field's containing oneof. */
-    public OneofDescriptor getContainingOneof() {
-      return containingOneof;
-    }
-
-    /** Get the field's containing oneof, only if non-synthetic. */
-    public OneofDescriptor getRealContainingOneof() {
-      return containingOneof != null && !containingOneof.isSynthetic() ? containingOneof : null;
-    }
-
-    /**
-     * Returns true if this field was syntactically written with "optional" in the .proto file.
-     * Excludes singular proto3 fields that do not have a label.
-     */
-    public boolean hasOptionalKeyword() {
-      return isProto3Optional
-          || (file.getSyntax() == Syntax.PROTO2 && isOptional() && getContainingOneof() == null);
-    }
-
-    /**
-     * Returns true if this field tracks presence, ie. does the field distinguish between "unset"
-     * and "present with default value."
-     *
-     * <p>This includes required, optional, and oneof fields. It excludes maps, repeated fields, and
-     * singular proto3 fields without "optional".
-     *
-     * <p>For fields where hasPresence() == true, the return value of msg.hasField() is semantically
-     * meaningful.
-     */
-    public boolean hasPresence() {
-      if (isRepeated()) {
-        return false;
-      }
-      return getType() == Type.MESSAGE
-          || getType() == Type.GROUP
-          || getContainingOneof() != null
-          || file.getSyntax() == Syntax.PROTO2;
-    }
-
-    /**
-     * For extensions defined nested within message types, gets the outer type. Not valid for
-     * non-extension fields. For example, consider this {@code .proto} file:
-     *
-     * <pre>
-     *   message Foo {
-     *     extensions 1000 to max;
-     *   }
-     *   extend Foo {
-     *     optional int32 baz = 1234;
-     *   }
-     *   message Bar {
-     *     extend Foo {
-     *       optional int32 moo = 4321;
-     *     }
-     *   }
-     * </pre>
-     *
-     * Both {@code baz}'s and {@code moo}'s containing type is {@code Foo}. However, {@code baz}'s
-     * extension scope is {@code null} while {@code moo}'s extension scope is {@code Bar}.
-     */
-    public Descriptor getExtensionScope() {
-      if (!isExtension()) {
-        throw new UnsupportedOperationException(
-            String.format("This field is not an extension. (%s)", fullName));
-      }
-      return extensionScope;
-    }
-
-    /** For embedded message and group fields, gets the field's type. */
-    public Descriptor getMessageType() {
-      if (getJavaType() != JavaType.MESSAGE) {
-        throw new UnsupportedOperationException(
-            String.format("This field is not of message type. (%s)", fullName));
-      }
-      return messageType;
-    }
-
-    /** For enum fields, gets the field's type. */
-    @Override
-    public EnumDescriptor getEnumType() {
-      if (getJavaType() != JavaType.ENUM) {
-        throw new UnsupportedOperationException(
-            String.format("This field is not of enum type. (%s)", fullName));
-      }
-      return enumType;
-    }
-
-    /**
-     * Compare with another {@code FieldDescriptor}. This orders fields in "canonical" order, which
-     * simply means ascending order by field number. {@code other} must be a field of the same type.
-     * That is, {@code getContainingType()} must return the same {@code Descriptor} for both fields.
-     *
-     * @return negative, zero, or positive if {@code this} is less than, equal to, or greater than
-     *     {@code other}, respectively
-     */
-    @Override
-    public int compareTo(final FieldDescriptor other) {
-      if (other.containingType != containingType) {
-        throw new IllegalArgumentException(
-            "FieldDescriptors can only be compared to other FieldDescriptors "
-                + "for fields of the same message type.");
-      }
-      return getNumber() - other.getNumber();
-    }
-
-    @Override
-    public String toString() {
-      return getFullName();
-    }
-
-    private final int index;
-
-    private FieldDescriptorProto proto;
-    private final String fullName;
-    private String jsonName;
-    private final FileDescriptor file;
-    private final Descriptor extensionScope;
-    private final boolean isProto3Optional;
-
-    // Possibly initialized during cross-linking.
-    private Type type;
-    private Descriptor containingType;
-    private Descriptor messageType;
-    private OneofDescriptor containingOneof;
-    private EnumDescriptor enumType;
-    private Object defaultValue;
-
-    public enum Type {
-      DOUBLE(JavaType.DOUBLE),
-      FLOAT(JavaType.FLOAT),
-      INT64(JavaType.LONG),
-      UINT64(JavaType.LONG),
-      INT32(JavaType.INT),
-      FIXED64(JavaType.LONG),
-      FIXED32(JavaType.INT),
-      BOOL(JavaType.BOOLEAN),
-      STRING(JavaType.STRING),
-      GROUP(JavaType.MESSAGE),
-      MESSAGE(JavaType.MESSAGE),
-      BYTES(JavaType.BYTE_STRING),
-      UINT32(JavaType.INT),
-      ENUM(JavaType.ENUM),
-      SFIXED32(JavaType.INT),
-      SFIXED64(JavaType.LONG),
-      SINT32(JavaType.INT),
-      SINT64(JavaType.LONG);
-
-      // Private copy to avoid repeated allocations from calls to values() in valueOf().
-      private static final Type[] types = values();
-
-      Type(JavaType javaType) {
-        this.javaType = javaType;
-      }
-
-      private final JavaType javaType;
-
-      public FieldDescriptorProto.Type toProto() {
-        return FieldDescriptorProto.Type.forNumber(ordinal() + 1);
-      }
-
-      public JavaType getJavaType() {
-        return javaType;
-      }
-
-      public static Type valueOf(final FieldDescriptorProto.Type type) {
-        return types[type.getNumber() - 1];
-      }
-    }
-
-    static {
-      // Refuse to init if someone added a new declared type.
-      if (Type.types.length != FieldDescriptorProto.Type.values().length) {
-        throw new RuntimeException(
-            "descriptor.proto has a new declared type but Descriptors.java wasn't updated.");
-      }
-    }
-
-    public enum JavaType {
-      INT(0),
-      LONG(0L),
-      FLOAT(0F),
-      DOUBLE(0D),
-      BOOLEAN(false),
-      STRING(""),
-      BYTE_STRING(ByteString.EMPTY),
-      ENUM(null),
-      MESSAGE(null);
-
-      JavaType(final Object defaultDefault) {
-        this.defaultDefault = defaultDefault;
-      }
-
-      /**
-       * The default default value for fields of this type, if it's a primitive type. This is meant
-       * for use inside this file only, hence is private.
-       */
-      private final Object defaultDefault;
-    }
-
-    // This method should match exactly with the ToJsonName() function in C++
-    // descriptor.cc.
-    private static String fieldNameToJsonName(String name) {
-      final int length = name.length();
-      StringBuilder result = new StringBuilder(length);
-      boolean isNextUpperCase = false;
-      for (int i = 0; i < length; i++) {
-        char ch = name.charAt(i);
-        if (ch == '_') {
-          isNextUpperCase = true;
-        } else if (isNextUpperCase) {
-          // This closely matches the logic for ASCII characters in:
-          // http://google3/google/protobuf/descriptor.cc?l=249-251&rcl=228891689
-          if ('a' <= ch && ch <= 'z') {
-            ch = (char) (ch - 'a' + 'A');
-          }
-          result.append(ch);
-          isNextUpperCase = false;
-        } else {
-          result.append(ch);
-        }
-      }
-      return result.toString();
-    }
-
-    private FieldDescriptor(
-        final FieldDescriptorProto proto,
-        final FileDescriptor file,
-        final Descriptor parent,
-        final int index,
-        final boolean isExtension)
-        throws DescriptorValidationException {
-      this.index = index;
-      this.proto = proto;
-      fullName = computeFullName(file, parent, proto.getName());
-      this.file = file;
-
-      if (proto.hasType()) {
-        type = Type.valueOf(proto.getType());
-      }
-
-      isProto3Optional = proto.getProto3Optional();
-
-      if (getNumber() <= 0) {
-        throw new DescriptorValidationException(this, "Field numbers must be positive integers.");
-      }
-
-      if (isExtension) {
-        if (!proto.hasExtendee()) {
-          throw new DescriptorValidationException(
-              this, "FieldDescriptorProto.extendee not set for extension field.");
-        }
-        containingType = null; // Will be filled in when cross-linking
-        if (parent != null) {
-          extensionScope = parent;
-        } else {
-          extensionScope = null;
-        }
-
-        if (proto.hasOneofIndex()) {
-          throw new DescriptorValidationException(
-              this, "FieldDescriptorProto.oneof_index set for extension field.");
-        }
-        containingOneof = null;
-      } else {
-        if (proto.hasExtendee()) {
-          throw new DescriptorValidationException(
-              this, "FieldDescriptorProto.extendee set for non-extension field.");
-        }
-        containingType = parent;
-
-        if (proto.hasOneofIndex()) {
-          if (proto.getOneofIndex() < 0
-              || proto.getOneofIndex() >= parent.toProto().getOneofDeclCount()) {
-            throw new DescriptorValidationException(
-                this,
-                "FieldDescriptorProto.oneof_index is out of range for type " + parent.getName());
-          }
-          containingOneof = parent.getOneofs().get(proto.getOneofIndex());
-          containingOneof.fieldCount++;
-        } else {
-          containingOneof = null;
-        }
-        extensionScope = null;
-      }
-
-      file.pool.addSymbol(this);
-    }
-
-    /** Look up and cross-link all field types, etc. */
-    private void crossLink() throws DescriptorValidationException {
-      if (proto.hasExtendee()) {
-        final GenericDescriptor extendee =
-            file.pool.lookupSymbol(
-                proto.getExtendee(), this, DescriptorPool.SearchFilter.TYPES_ONLY);
-        if (!(extendee instanceof Descriptor)) {
-          throw new DescriptorValidationException(
-              this, '\"' + proto.getExtendee() + "\" is not a message type.");
-        }
-        containingType = (Descriptor) extendee;
-
-        if (!getContainingType().isExtensionNumber(getNumber())) {
-          throw new DescriptorValidationException(
-              this,
-              '\"'
-                  + getContainingType().getFullName()
-                  + "\" does not declare "
-                  + getNumber()
-                  + " as an extension number.");
-        }
-      }
-
-      if (proto.hasTypeName()) {
-        final GenericDescriptor typeDescriptor =
-            file.pool.lookupSymbol(
-                proto.getTypeName(), this, DescriptorPool.SearchFilter.TYPES_ONLY);
-
-        if (!proto.hasType()) {
-          // Choose field type based on symbol.
-          if (typeDescriptor instanceof Descriptor) {
-            type = Type.MESSAGE;
-          } else if (typeDescriptor instanceof EnumDescriptor) {
-            type = Type.ENUM;
-          } else {
-            throw new DescriptorValidationException(
-                this, '\"' + proto.getTypeName() + "\" is not a type.");
-          }
-        }
-
-        if (getJavaType() == JavaType.MESSAGE) {
-          if (!(typeDescriptor instanceof Descriptor)) {
-            throw new DescriptorValidationException(
-                this, '\"' + proto.getTypeName() + "\" is not a message type.");
-          }
-          messageType = (Descriptor) typeDescriptor;
-
-          if (proto.hasDefaultValue()) {
-            throw new DescriptorValidationException(this, "Messages can't have default values.");
-          }
-        } else if (getJavaType() == JavaType.ENUM) {
-          if (!(typeDescriptor instanceof EnumDescriptor)) {
-            throw new DescriptorValidationException(
-                this, '\"' + proto.getTypeName() + "\" is not an enum type.");
-          }
-          enumType = (EnumDescriptor) typeDescriptor;
-        } else {
-          throw new DescriptorValidationException(this, "Field with primitive type has type_name.");
-        }
-      } else {
-        if (getJavaType() == JavaType.MESSAGE || getJavaType() == JavaType.ENUM) {
-          throw new DescriptorValidationException(
-              this, "Field with message or enum type missing type_name.");
-        }
-      }
-
-      // Only repeated primitive fields may be packed.
-      if (proto.getOptions().getPacked() && !isPackable()) {
-        throw new DescriptorValidationException(
-            this, "[packed = true] can only be specified for repeated primitive fields.");
-      }
-
-      // We don't attempt to parse the default value until here because for
-      // enums we need the enum type's descriptor.
-      if (proto.hasDefaultValue()) {
-        if (isRepeated()) {
-          throw new DescriptorValidationException(
-              this, "Repeated fields cannot have default values.");
-        }
-
-        try {
-          switch (getType()) {
-            case INT32:
-            case SINT32:
-            case SFIXED32:
-              defaultValue = TextFormat.parseInt32(proto.getDefaultValue());
-              break;
-            case UINT32:
-            case FIXED32:
-              defaultValue = TextFormat.parseUInt32(proto.getDefaultValue());
-              break;
-            case INT64:
-            case SINT64:
-            case SFIXED64:
-              defaultValue = TextFormat.parseInt64(proto.getDefaultValue());
-              break;
-            case UINT64:
-            case FIXED64:
-              defaultValue = TextFormat.parseUInt64(proto.getDefaultValue());
-              break;
-            case FLOAT:
-              if (proto.getDefaultValue().equals("inf")) {
-                defaultValue = Float.POSITIVE_INFINITY;
-              } else if (proto.getDefaultValue().equals("-inf")) {
-                defaultValue = Float.NEGATIVE_INFINITY;
-              } else if (proto.getDefaultValue().equals("nan")) {
-                defaultValue = Float.NaN;
-              } else {
-                defaultValue = Float.valueOf(proto.getDefaultValue());
-              }
-              break;
-            case DOUBLE:
-              if (proto.getDefaultValue().equals("inf")) {
-                defaultValue = Double.POSITIVE_INFINITY;
-              } else if (proto.getDefaultValue().equals("-inf")) {
-                defaultValue = Double.NEGATIVE_INFINITY;
-              } else if (proto.getDefaultValue().equals("nan")) {
-                defaultValue = Double.NaN;
-              } else {
-                defaultValue = Double.valueOf(proto.getDefaultValue());
-              }
-              break;
-            case BOOL:
-              defaultValue = Boolean.valueOf(proto.getDefaultValue());
-              break;
-            case STRING:
-              defaultValue = proto.getDefaultValue();
-              break;
-            case BYTES:
-              try {
-                defaultValue = TextFormat.unescapeBytes(proto.getDefaultValue());
-              } catch (TextFormat.InvalidEscapeSequenceException e) {
-                throw new DescriptorValidationException(
-                    this, "Couldn't parse default value: " + e.getMessage(), e);
-              }
-              break;
-            case ENUM:
-              defaultValue = enumType.findValueByName(proto.getDefaultValue());
-              if (defaultValue == null) {
-                throw new DescriptorValidationException(
-                    this, "Unknown enum default value: \"" + proto.getDefaultValue() + '\"');
-              }
-              break;
-            case MESSAGE:
-            case GROUP:
-              throw new DescriptorValidationException(this, "Message type had default value.");
-          }
-        } catch (NumberFormatException e) {
-          throw new DescriptorValidationException(
-              this, "Could not parse default value: \"" + proto.getDefaultValue() + '\"', e);
-        }
-      } else {
-        // Determine the default default for this field.
-        if (isRepeated()) {
-          defaultValue = Collections.emptyList();
-        } else {
-          switch (getJavaType()) {
-            case ENUM:
-              // We guarantee elsewhere that an enum type always has at least
-              // one possible value.
-              defaultValue = enumType.getValues().get(0);
-              break;
-            case MESSAGE:
-              defaultValue = null;
-              break;
-            default:
-              defaultValue = getJavaType().defaultDefault;
-              break;
-          }
-        }
-      }
-
-      if (containingType != null && containingType.getOptions().getMessageSetWireFormat()) {
-        if (isExtension()) {
-          if (!isOptional() || getType() != Type.MESSAGE) {
-            throw new DescriptorValidationException(
-                this, "Extensions of MessageSets must be optional messages.");
-          }
-        } else {
-          throw new DescriptorValidationException(
-              this, "MessageSets cannot have fields, only extensions.");
-        }
-      }
-    }
-
-    /** See {@link FileDescriptor#setProto}. */
-    private void setProto(final FieldDescriptorProto proto) {
-      this.proto = proto;
-    }
-
-    /** For internal use only. This is to satisfy the FieldDescriptorLite interface. */
-    @Override
-    public MessageLite.Builder internalMergeFrom(MessageLite.Builder to, MessageLite from) {
-      // FieldDescriptors are only used with non-lite messages so we can just
-      // down-cast and call mergeFrom directly.
-      return ((Message.Builder) to).mergeFrom((Message) from);
-    }
-
-  }
-
-  // =================================================================
-
-  /** Describes an enum type. */
-  public static final class EnumDescriptor extends GenericDescriptor
-      implements Internal.EnumLiteMap<EnumValueDescriptor> {
-    /**
-     * Get the index of this descriptor within its parent.
-     *
-     * @see Descriptors.Descriptor#getIndex()
-     */
-    public int getIndex() {
-      return index;
-    }
-
-    /** Convert the descriptor to its protocol message representation. */
-    @Override
-    public EnumDescriptorProto toProto() {
-      return proto;
-    }
-
-    /** Get the type's unqualified name. */
-    @Override
-    public String getName() {
-      return proto.getName();
-    }
-
-    /**
-     * Get the type's fully-qualified name.
-     *
-     * @see Descriptors.Descriptor#getFullName()
-     */
-    @Override
-    public String getFullName() {
-      return fullName;
-    }
-
-    /** Get the {@link FileDescriptor} containing this descriptor. */
-    @Override
-    public FileDescriptor getFile() {
-      return file;
-    }
-
-    /** If this is a nested type, get the outer descriptor, otherwise null. */
-    public Descriptor getContainingType() {
-      return containingType;
-    }
-
-    /** Get the {@code EnumOptions}, defined in {@code descriptor.proto}. */
-    public EnumOptions getOptions() {
-      return proto.getOptions();
-    }
-
-    /** Get a list of defined values for this enum. */
-    public List<EnumValueDescriptor> getValues() {
-      return Collections.unmodifiableList(Arrays.asList(values));
-    }
-
-    /**
-     * Find an enum value by name.
-     *
-     * @param name the unqualified name of the value such as "FOO"
-     * @return the value's descriptor, or {@code null} if not found
-     */
-    public EnumValueDescriptor findValueByName(final String name) {
-      final GenericDescriptor result = file.pool.findSymbol(fullName + '.' + name);
-      if (result instanceof EnumValueDescriptor) {
-        return (EnumValueDescriptor) result;
-      } else {
-        return null;
-      }
-    }
-
-    /**
-     * Find an enum value by number. If multiple enum values have the same number, this returns the
-     * first defined value with that number.
-     *
-     * @param number The value's number.
-     * @return the value's descriptor, or {@code null} if not found.
-     */
-    @Override
-    public EnumValueDescriptor findValueByNumber(final int number) {
-      return binarySearch(
-          valuesSortedByNumber, distinctNumbers, EnumValueDescriptor.NUMBER_GETTER, number);
-    }
-
-    private static class UnknownEnumValueReference extends WeakReference<EnumValueDescriptor> {
-      private final int number;
-
-      private UnknownEnumValueReference(int number, EnumValueDescriptor descriptor) {
-        super(descriptor);
-        this.number = number;
-      }
-    }
-
-    /**
-     * Get the enum value for a number. If no enum value has this number, construct an
-     * EnumValueDescriptor for it.
-     */
-    public EnumValueDescriptor findValueByNumberCreatingIfUnknown(final int number) {
-      EnumValueDescriptor result = findValueByNumber(number);
-      if (result != null) {
-        return result;
-      }
-      // The number represents an unknown enum value.
-      synchronized (this) {
-        if (cleanupQueue == null) {
-          cleanupQueue = new ReferenceQueue<>();
-          unknownValues = new HashMap<>();
-        } else {
-          while (true) {
-            UnknownEnumValueReference toClean = (UnknownEnumValueReference) cleanupQueue.poll();
-            if (toClean == null) {
-              break;
-            }
-            unknownValues.remove(toClean.number);
-          }
-        }
-
-        // There are two ways we can be missing a value: it wasn't in the map, or the reference
-        // has been GC'd.  (It may even have been GC'd since we cleaned up the references a few
-        // lines of code ago.)  So get out the reference, if it's still present...
-        WeakReference<EnumValueDescriptor> reference = unknownValues.get(number);
-        result = (reference == null) ? null : reference.get();
-
-        if (result == null) {
-          result = new EnumValueDescriptor(this, number);
-          unknownValues.put(number, new UnknownEnumValueReference(number, result));
-        }
-      }
-      return result;
-    }
-
-    // Used in tests only.
-    int getUnknownEnumValueDescriptorCount() {
-      return unknownValues.size();
-    }
-
-    private final int index;
-    private EnumDescriptorProto proto;
-    private final String fullName;
-    private final FileDescriptor file;
-    private final Descriptor containingType;
-    private final EnumValueDescriptor[] values;
-    private final EnumValueDescriptor[] valuesSortedByNumber;
-    private final int distinctNumbers;
-    private Map<Integer, WeakReference<EnumValueDescriptor>> unknownValues = null;
-    private ReferenceQueue<EnumValueDescriptor> cleanupQueue = null;
-
-    private EnumDescriptor(
-        final EnumDescriptorProto proto,
-        final FileDescriptor file,
-        final Descriptor parent,
-        final int index)
-        throws DescriptorValidationException {
-      this.index = index;
-      this.proto = proto;
-      fullName = computeFullName(file, parent, proto.getName());
-      this.file = file;
-      containingType = parent;
-
-      if (proto.getValueCount() == 0) {
-        // We cannot allow enums with no values because this would mean there
-        // would be no valid default value for fields of this type.
-        throw new DescriptorValidationException(this, "Enums must contain at least one value.");
-      }
-
-      values = new EnumValueDescriptor[proto.getValueCount()];
-      for (int i = 0; i < proto.getValueCount(); i++) {
-        values[i] = new EnumValueDescriptor(proto.getValue(i), file, this, i);
-      }
-      valuesSortedByNumber = values.clone();
-      Arrays.sort(valuesSortedByNumber, EnumValueDescriptor.BY_NUMBER);
-      // deduplicate
-      int j = 0;
-      for (int i = 1; i < proto.getValueCount(); i++) {
-        EnumValueDescriptor oldValue = valuesSortedByNumber[j];
-        EnumValueDescriptor newValue = valuesSortedByNumber[i];
-        if (oldValue.getNumber() != newValue.getNumber()) {
-          valuesSortedByNumber[++j] = newValue;
-        }
-      }
-      this.distinctNumbers = j + 1;
-      Arrays.fill(valuesSortedByNumber, distinctNumbers, proto.getValueCount(), null);
-
-      file.pool.addSymbol(this);
-    }
-
-    /** See {@link FileDescriptor#setProto}. */
-    private void setProto(final EnumDescriptorProto proto) {
-      this.proto = proto;
-
-      for (int i = 0; i < values.length; i++) {
-        values[i].setProto(proto.getValue(i));
-      }
-    }
-  }
-
-  // =================================================================
-
-  /**
-   * Describes one value within an enum type. Note that multiple defined values may have the same
-   * number. In generated Java code, all values with the same number after the first become aliases
-   * of the first. However, they still have independent EnumValueDescriptors.
-   */
-  public static final class EnumValueDescriptor extends GenericDescriptor
-      implements Internal.EnumLite {
-    static final Comparator<EnumValueDescriptor> BY_NUMBER =
-        new Comparator<EnumValueDescriptor>() {
-          @Override
-          public int compare(EnumValueDescriptor o1, EnumValueDescriptor o2) {
-            return Integer.valueOf(o1.getNumber()).compareTo(o2.getNumber());
-          }
-        };
-
-    static final NumberGetter<EnumValueDescriptor> NUMBER_GETTER =
-        new NumberGetter<EnumValueDescriptor>() {
-          @Override
-          public int getNumber(EnumValueDescriptor enumValueDescriptor) {
-            return enumValueDescriptor.getNumber();
-          }
-        };
-
-    /**
-     * Get the index of this descriptor within its parent.
-     *
-     * @see Descriptors.Descriptor#getIndex()
-     */
-    public int getIndex() {
-      return index;
-    }
-
-    /** Convert the descriptor to its protocol message representation. */
-    @Override
-    public EnumValueDescriptorProto toProto() {
-      return proto;
-    }
-
-    /** Get the value's unqualified name. */
-    @Override
-    public String getName() {
-      return proto.getName();
-    }
-
-    /** Get the value's number. */
-    @Override
-    public int getNumber() {
-      return proto.getNumber();
-    }
-
-    @Override
-    public String toString() {
-      return proto.getName();
-    }
-
-    /**
-     * Get the value's fully-qualified name.
-     *
-     * @see Descriptors.Descriptor#getFullName()
-     */
-    @Override
-    public String getFullName() {
-      return fullName;
-    }
-
-    /** Get the {@link FileDescriptor} containing this descriptor. */
-    @Override
-    public FileDescriptor getFile() {
-      return type.file;
-    }
-
-    /** Get the value's enum type. */
-    public EnumDescriptor getType() {
-      return type;
-    }
-
-    /** Get the {@code EnumValueOptions}, defined in {@code descriptor.proto}. */
-    public EnumValueOptions getOptions() {
-      return proto.getOptions();
-    }
-
-    private final int index;
-    private EnumValueDescriptorProto proto;
-    private final String fullName;
-    private final EnumDescriptor type;
-
-    private EnumValueDescriptor(
-        final EnumValueDescriptorProto proto,
-        final FileDescriptor file,
-        final EnumDescriptor parent,
-        final int index)
-        throws DescriptorValidationException {
-      this.index = index;
-      this.proto = proto;
-      type = parent;
-
-      fullName = parent.getFullName() + '.' + proto.getName();
-
-      file.pool.addSymbol(this);
-    }
-
-    // Create an unknown enum value.
-    private EnumValueDescriptor(final EnumDescriptor parent, final Integer number) {
-      String name = "UNKNOWN_ENUM_VALUE_" + parent.getName() + "_" + number;
-      EnumValueDescriptorProto proto =
-          EnumValueDescriptorProto.newBuilder().setName(name).setNumber(number).build();
-      this.index = -1;
-      this.proto = proto;
-      this.type = parent;
-      this.fullName = parent.getFullName() + '.' + proto.getName();
-
-      // Don't add this descriptor into pool.
-    }
-
-    /** See {@link FileDescriptor#setProto}. */
-    private void setProto(final EnumValueDescriptorProto proto) {
-      this.proto = proto;
-    }
-  }
-
-  // =================================================================
-
-  /** Describes a service type. */
-  public static final class ServiceDescriptor extends GenericDescriptor {
-    /**
-     * Get the index of this descriptor within its parent. * @see Descriptors.Descriptor#getIndex()
-     */
-    public int getIndex() {
-      return index;
-    }
-
-    /** Convert the descriptor to its protocol message representation. */
-    @Override
-    public ServiceDescriptorProto toProto() {
-      return proto;
-    }
-
-    /** Get the type's unqualified name. */
-    @Override
-    public String getName() {
-      return proto.getName();
-    }
-
-    /**
-     * Get the type's fully-qualified name.
-     *
-     * @see Descriptors.Descriptor#getFullName()
-     */
-    @Override
-    public String getFullName() {
-      return fullName;
-    }
-
-    /** Get the {@link FileDescriptor} containing this descriptor. */
-    @Override
-    public FileDescriptor getFile() {
-      return file;
-    }
-
-    /** Get the {@code ServiceOptions}, defined in {@code descriptor.proto}. */
-    public ServiceOptions getOptions() {
-      return proto.getOptions();
-    }
-
-    /** Get a list of methods for this service. */
-    public List<MethodDescriptor> getMethods() {
-      return Collections.unmodifiableList(Arrays.asList(methods));
-    }
-
-    /**
-     * Find a method by name.
-     *
-     * @param name the unqualified name of the method such as "Foo"
-     * @return the method's descriptor, or {@code null} if not found
-     */
-    public MethodDescriptor findMethodByName(final String name) {
-      final GenericDescriptor result = file.pool.findSymbol(fullName + '.' + name);
-      if (result instanceof MethodDescriptor) {
-        return (MethodDescriptor) result;
-      } else {
-        return null;
-      }
-    }
-
-    private final int index;
-    private ServiceDescriptorProto proto;
-    private final String fullName;
-    private final FileDescriptor file;
-    private MethodDescriptor[] methods;
-
-    private ServiceDescriptor(
-        final ServiceDescriptorProto proto, final FileDescriptor file, final int index)
-        throws DescriptorValidationException {
-      this.index = index;
-      this.proto = proto;
-      fullName = computeFullName(file, null, proto.getName());
-      this.file = file;
-
-      methods = new MethodDescriptor[proto.getMethodCount()];
-      for (int i = 0; i < proto.getMethodCount(); i++) {
-        methods[i] = new MethodDescriptor(proto.getMethod(i), file, this, i);
-      }
-
-      file.pool.addSymbol(this);
-    }
-
-    private void crossLink() throws DescriptorValidationException {
-      for (final MethodDescriptor method : methods) {
-        method.crossLink();
-      }
-    }
-
-    /** See {@link FileDescriptor#setProto}. */
-    private void setProto(final ServiceDescriptorProto proto) {
-      this.proto = proto;
-
-      for (int i = 0; i < methods.length; i++) {
-        methods[i].setProto(proto.getMethod(i));
-      }
-    }
-  }
-
-  // =================================================================
-
-  /** Describes one method within a service type. */
-  public static final class MethodDescriptor extends GenericDescriptor {
-    /**
-     * Get the index of this descriptor within its parent. * @see Descriptors.Descriptor#getIndex()
-     */
-    public int getIndex() {
-      return index;
-    }
-
-    /** Convert the descriptor to its protocol message representation. */
-    @Override
-    public MethodDescriptorProto toProto() {
-      return proto;
-    }
-
-    /** Get the method's unqualified name. */
-    @Override
-    public String getName() {
-      return proto.getName();
-    }
-
-    /**
-     * Get the method's fully-qualified name.
-     *
-     * @see Descriptors.Descriptor#getFullName()
-     */
-    @Override
-    public String getFullName() {
-      return fullName;
-    }
-
-    /** Get the {@link FileDescriptor} containing this descriptor. */
-    @Override
-    public FileDescriptor getFile() {
-      return file;
-    }
-
-    /** Get the method's service type. */
-    public ServiceDescriptor getService() {
-      return service;
-    }
-
-    /** Get the method's input type. */
-    public Descriptor getInputType() {
-      return inputType;
-    }
-
-    /** Get the method's output type. */
-    public Descriptor getOutputType() {
-      return outputType;
-    }
-
-    /** Get whether or not the inputs are streaming. */
-    public boolean isClientStreaming() {
-      return proto.getClientStreaming();
-    }
-
-    /** Get whether or not the outputs are streaming. */
-    public boolean isServerStreaming() {
-      return proto.getServerStreaming();
-    }
-
-    /** Get the {@code MethodOptions}, defined in {@code descriptor.proto}. */
-    public MethodOptions getOptions() {
-      return proto.getOptions();
-    }
-
-    private final int index;
-    private MethodDescriptorProto proto;
-    private final String fullName;
-    private final FileDescriptor file;
-    private final ServiceDescriptor service;
-
-    // Initialized during cross-linking.
-    private Descriptor inputType;
-    private Descriptor outputType;
-
-    private MethodDescriptor(
-        final MethodDescriptorProto proto,
-        final FileDescriptor file,
-        final ServiceDescriptor parent,
-        final int index)
-        throws DescriptorValidationException {
-      this.index = index;
-      this.proto = proto;
-      this.file = file;
-      service = parent;
-
-      fullName = parent.getFullName() + '.' + proto.getName();
-
-      file.pool.addSymbol(this);
-    }
-
-    private void crossLink() throws DescriptorValidationException {
-      final GenericDescriptor input =
-          getFile()
-              .pool
-              .lookupSymbol(proto.getInputType(), this, DescriptorPool.SearchFilter.TYPES_ONLY);
-      if (!(input instanceof Descriptor)) {
-        throw new DescriptorValidationException(
-            this, '\"' + proto.getInputType() + "\" is not a message type.");
-      }
-      inputType = (Descriptor) input;
-
-      final GenericDescriptor output =
-          getFile()
-              .pool
-              .lookupSymbol(proto.getOutputType(), this, DescriptorPool.SearchFilter.TYPES_ONLY);
-      if (!(output instanceof Descriptor)) {
-        throw new DescriptorValidationException(
-            this, '\"' + proto.getOutputType() + "\" is not a message type.");
-      }
-      outputType = (Descriptor) output;
-    }
-
-    /** See {@link FileDescriptor#setProto}. */
-    private void setProto(final MethodDescriptorProto proto) {
-      this.proto = proto;
-    }
-  }
-
-  // =================================================================
-
-  private static String computeFullName(
-      final FileDescriptor file, final Descriptor parent, final String name) {
-    if (parent != null) {
-      return parent.getFullName() + '.' + name;
-    }
-
-    final String packageName = file.getPackage();
-    if (!packageName.isEmpty()) {
-      return packageName + '.' + name;
-    }
-
-    return name;
-  }
-
-  // =================================================================
-
-  /**
-   * All descriptors implement this to make it easier to implement tools like {@code
-   * DescriptorPool}.
-   */
-  public abstract static class GenericDescriptor {
-
-    // Private constructor to prevent subclasses outside of com.google.protobuf.Descriptors
-    private GenericDescriptor() {}
-
-    public abstract Message toProto();
-
-    public abstract String getName();
-
-    public abstract String getFullName();
-
-    public abstract FileDescriptor getFile();
-  }
-
-  /** Thrown when building descriptors fails because the source DescriptorProtos are not valid. */
-  public static class DescriptorValidationException extends Exception {
-    private static final long serialVersionUID = 5750205775490483148L;
-
-    /** Gets the full name of the descriptor where the error occurred. */
-    public String getProblemSymbolName() {
-      return name;
-    }
-
-    /** Gets the protocol message representation of the invalid descriptor. */
-    public Message getProblemProto() {
-      return proto;
-    }
-
-    /** Gets a human-readable description of the error. */
-    public String getDescription() {
-      return description;
-    }
-
-    private final String name;
-    private final Message proto;
-    private final String description;
-
-    private DescriptorValidationException(
-        final GenericDescriptor problemDescriptor, final String description) {
-      super(problemDescriptor.getFullName() + ": " + description);
-
-      // Note that problemDescriptor may be partially uninitialized, so we
-      // don't want to expose it directly to the user.  So, we only provide
-      // the name and the original proto.
-      name = problemDescriptor.getFullName();
-      proto = problemDescriptor.toProto();
-      this.description = description;
-    }
-
-    private DescriptorValidationException(
-        final GenericDescriptor problemDescriptor,
-        final String description,
-        final Throwable cause) {
-      this(problemDescriptor, description);
-      initCause(cause);
-    }
-
-    private DescriptorValidationException(
-        final FileDescriptor problemDescriptor, final String description) {
-      super(problemDescriptor.getName() + ": " + description);
-
-      // Note that problemDescriptor may be partially uninitialized, so we
-      // don't want to expose it directly to the user.  So, we only provide
-      // the name and the original proto.
-      name = problemDescriptor.getName();
-      proto = problemDescriptor.toProto();
-      this.description = description;
-    }
-  }
-
-  // =================================================================
-
-  /**
-   * A private helper class which contains lookup tables containing all the descriptors defined in a
-   * particular file.
-   */
-  private static final class DescriptorPool {
-
-    /** Defines what subclass of descriptors to search in the descriptor pool. */
-    enum SearchFilter {
-      TYPES_ONLY,
-      AGGREGATES_ONLY,
-      ALL_SYMBOLS
-    }
-
-    DescriptorPool(final FileDescriptor[] dependencies, boolean allowUnknownDependencies) {
-      this.dependencies =
-          Collections.newSetFromMap(
-              new IdentityHashMap<FileDescriptor, Boolean>(dependencies.length));
-      this.allowUnknownDependencies = allowUnknownDependencies;
-
-      for (Descriptors.FileDescriptor dependency : dependencies) {
-        this.dependencies.add(dependency);
-        importPublicDependencies(dependency);
-      }
-
-      for (final FileDescriptor dependency : this.dependencies) {
-        try {
-          addPackage(dependency.getPackage(), dependency);
-        } catch (DescriptorValidationException e) {
-          // Can't happen, because addPackage() only fails when the name
-          // conflicts with a non-package, but we have not yet added any
-          // non-packages at this point.
-          throw new AssertionError(e);
-        }
-      }
-    }
-
-    /** Find and put public dependencies of the file into dependencies set. */
-    private void importPublicDependencies(final FileDescriptor file) {
-      for (FileDescriptor dependency : file.getPublicDependencies()) {
-        if (dependencies.add(dependency)) {
-          importPublicDependencies(dependency);
-        }
-      }
-    }
-
-    private final Set<FileDescriptor> dependencies;
-    private final boolean allowUnknownDependencies;
-
-    private final Map<String, GenericDescriptor> descriptorsByName = new HashMap<>();
-
-    /** Find a generic descriptor by fully-qualified name. */
-    GenericDescriptor findSymbol(final String fullName) {
-      return findSymbol(fullName, SearchFilter.ALL_SYMBOLS);
-    }
-
-    /**
-     * Find a descriptor by fully-qualified name and given option to only search valid field type
-     * descriptors.
-     */
-    GenericDescriptor findSymbol(final String fullName, final SearchFilter filter) {
-      GenericDescriptor result = descriptorsByName.get(fullName);
-      if (result != null) {
-        if ((filter == SearchFilter.ALL_SYMBOLS)
-            || ((filter == SearchFilter.TYPES_ONLY) && isType(result))
-            || ((filter == SearchFilter.AGGREGATES_ONLY) && isAggregate(result))) {
-          return result;
-        }
-      }
-
-      for (final FileDescriptor dependency : dependencies) {
-        result = dependency.pool.descriptorsByName.get(fullName);
-        if (result != null) {
-          if ((filter == SearchFilter.ALL_SYMBOLS)
-              || ((filter == SearchFilter.TYPES_ONLY) && isType(result))
-              || ((filter == SearchFilter.AGGREGATES_ONLY) && isAggregate(result))) {
-            return result;
-          }
-        }
-      }
-
-      return null;
-    }
-
-    /** Checks if the descriptor is a valid type for a message field. */
-    boolean isType(GenericDescriptor descriptor) {
-      return (descriptor instanceof Descriptor) || (descriptor instanceof EnumDescriptor);
-    }
-
-    /** Checks if the descriptor is a valid namespace type. */
-    boolean isAggregate(GenericDescriptor descriptor) {
-      return (descriptor instanceof Descriptor)
-          || (descriptor instanceof EnumDescriptor)
-          || (descriptor instanceof PackageDescriptor)
-          || (descriptor instanceof ServiceDescriptor);
-    }
-
-    /**
-     * Look up a type descriptor by name, relative to some other descriptor. The name may be
-     * fully-qualified (with a leading '.'), partially-qualified, or unqualified. C++-like name
-     * lookup semantics are used to search for the matching descriptor.
-     */
-    GenericDescriptor lookupSymbol(
-        final String name,
-        final GenericDescriptor relativeTo,
-        final DescriptorPool.SearchFilter filter)
-        throws DescriptorValidationException {
-
-      GenericDescriptor result;
-      String fullname;
-      if (name.startsWith(".")) {
-        // Fully-qualified name.
-        fullname = name.substring(1);
-        result = findSymbol(fullname, filter);
-      } else {
-        // If "name" is a compound identifier, we want to search for the
-        // first component of it, then search within it for the rest.
-        // If name is something like "Foo.Bar.baz", and symbols named "Foo" are
-        // defined in multiple parent scopes, we only want to find "Bar.baz" in
-        // the innermost one.  E.g., the following should produce an error:
-        //   message Bar { message Baz {} }
-        //   message Foo {
-        //     message Bar {
-        //     }
-        //     optional Bar.Baz baz = 1;
-        //   }
-        // So, we look for just "Foo" first, then look for "Bar.baz" within it
-        // if found.
-        final int firstPartLength = name.indexOf('.');
-        final String firstPart;
-        if (firstPartLength == -1) {
-          firstPart = name;
-        } else {
-          firstPart = name.substring(0, firstPartLength);
-        }
-
-        // We will search each parent scope of "relativeTo" looking for the
-        // symbol.
-        final StringBuilder scopeToTry = new StringBuilder(relativeTo.getFullName());
-
-        while (true) {
-          // Chop off the last component of the scope.
-          final int dotpos = scopeToTry.lastIndexOf(".");
-          if (dotpos == -1) {
-            fullname = name;
-            result = findSymbol(name, filter);
-            break;
-          } else {
-            scopeToTry.setLength(dotpos + 1);
-
-            // Append firstPart and try to find
-            scopeToTry.append(firstPart);
-            result = findSymbol(scopeToTry.toString(), DescriptorPool.SearchFilter.AGGREGATES_ONLY);
-
-            if (result != null) {
-              if (firstPartLength != -1) {
-                // We only found the first part of the symbol.  Now look for
-                // the whole thing.  If this fails, we *don't* want to keep
-                // searching parent scopes.
-                scopeToTry.setLength(dotpos + 1);
-                scopeToTry.append(name);
-                result = findSymbol(scopeToTry.toString(), filter);
-              }
-              fullname = scopeToTry.toString();
-              break;
-            }
-
-            // Not found.  Remove the name so we can try again.
-            scopeToTry.setLength(dotpos);
-          }
-        }
-      }
-
-      if (result == null) {
-        if (allowUnknownDependencies && filter == SearchFilter.TYPES_ONLY) {
-          logger.warning(
-              "The descriptor for message type \""
-                  + name
-                  + "\" cannot be found and a placeholder is created for it");
-          // We create a dummy message descriptor here regardless of the
-          // expected type. If the type should be message, this dummy
-          // descriptor will work well and if the type should be enum, a
-          // DescriptorValidationException will be thrown later. In either
-          // case, the code works as expected: we allow unknown message types
-          // but not unknown enum types.
-          result = new Descriptor(fullname);
-          // Add the placeholder file as a dependency so we can find the
-          // placeholder symbol when resolving other references.
-          this.dependencies.add(result.getFile());
-          return result;
-        } else {
-          throw new DescriptorValidationException(relativeTo, '\"' + name + "\" is not defined.");
-        }
-      } else {
-        return result;
-      }
-    }
-
-    /**
-     * Adds a symbol to the symbol table. If a symbol with the same name already exists, throws an
-     * error.
-     */
-    void addSymbol(final GenericDescriptor descriptor) throws DescriptorValidationException {
-      validateSymbolName(descriptor);
-
-      final String fullName = descriptor.getFullName();
-
-      final GenericDescriptor old = descriptorsByName.put(fullName, descriptor);
-      if (old != null) {
-        descriptorsByName.put(fullName, old);
-
-        if (descriptor.getFile() == old.getFile()) {
-          final int dotpos = fullName.lastIndexOf('.');
-          if (dotpos == -1) {
-            throw new DescriptorValidationException(
-                descriptor, '\"' + fullName + "\" is already defined.");
-          } else {
-            throw new DescriptorValidationException(
-                descriptor,
-                '\"'
-                    + fullName.substring(dotpos + 1)
-                    + "\" is already defined in \""
-                    + fullName.substring(0, dotpos)
-                    + "\".");
-          }
-        } else {
-          throw new DescriptorValidationException(
-              descriptor,
-              '\"'
-                  + fullName
-                  + "\" is already defined in file \""
-                  + old.getFile().getName()
-                  + "\".");
-        }
-      }
-    }
-
-    /**
-     * Represents a package in the symbol table. We use PackageDescriptors just as placeholders so
-     * that someone cannot define, say, a message type that has the same name as an existing
-     * package.
-     */
-    private static final class PackageDescriptor extends GenericDescriptor {
-      @Override
-      public Message toProto() {
-        return file.toProto();
-      }
-
-      @Override
-      public String getName() {
-        return name;
-      }
-
-      @Override
-      public String getFullName() {
-        return fullName;
-      }
-
-      @Override
-      public FileDescriptor getFile() {
-        return file;
-      }
-
-      PackageDescriptor(final String name, final String fullName, final FileDescriptor file) {
-        this.file = file;
-        this.fullName = fullName;
-        this.name = name;
-      }
-
-      private final String name;
-      private final String fullName;
-      private final FileDescriptor file;
-    }
-
-    /**
-     * Adds a package to the symbol tables. If a package by the same name already exists, that is
-     * fine, but if some other kind of symbol exists under the same name, an exception is thrown. If
-     * the package has multiple components, this also adds the parent package(s).
-     */
-    void addPackage(final String fullName, final FileDescriptor file)
-        throws DescriptorValidationException {
-      final int dotpos = fullName.lastIndexOf('.');
-      final String name;
-      if (dotpos == -1) {
-        name = fullName;
-      } else {
-        addPackage(fullName.substring(0, dotpos), file);
-        name = fullName.substring(dotpos + 1);
-      }
-
-      final GenericDescriptor old =
-          descriptorsByName.put(fullName, new PackageDescriptor(name, fullName, file));
-      if (old != null) {
-        descriptorsByName.put(fullName, old);
-        if (!(old instanceof PackageDescriptor)) {
-          throw new DescriptorValidationException(
-              file,
-              '\"'
-                  + name
-                  + "\" is already defined (as something other than a "
-                  + "package) in file \""
-                  + old.getFile().getName()
-                  + "\".");
-        }
-      }
-    }
-
-    /**
-     * Verifies that the descriptor's name is valid. That is, it contains only letters, digits, and
-     * underscores, and does not start with a digit.
-     */
-    static void validateSymbolName(final GenericDescriptor descriptor)
-        throws DescriptorValidationException {
-      final String name = descriptor.getName();
-      if (name.length() == 0) {
-        throw new DescriptorValidationException(descriptor, "Missing name.");
-      }
-
-      // Non-ASCII characters are not valid in protobuf identifiers, even
-      // if they are letters or digits.
-      // The first character must be a letter or '_'.
-      // Subsequent characters may be letters, numbers, or digits.
-      for (int i = 0; i < name.length(); i++) {
-        final char c = name.charAt(i);
-        if (('a' <= c && c <= 'z')
-            || ('A' <= c && c <= 'Z')
-            || (c == '_')
-            || ('0' <= c && c <= '9' && i > 0)) {
-          // Valid
-          continue;
-        }
-        throw new DescriptorValidationException(
-            descriptor, '\"' + name + "\" is not a valid identifier.");
-      }
-    }
-  }
-
-  /** Describes a oneof of a message type. */
-  public static final class OneofDescriptor extends GenericDescriptor {
-    /** Get the index of this descriptor within its parent. */
-    public int getIndex() {
-      return index;
-    }
-
-    @Override
-    public String getName() {
-      return proto.getName();
-    }
-
-    @Override
-    public FileDescriptor getFile() {
-      return file;
-    }
-
-    @Override
-    public String getFullName() {
-      return fullName;
-    }
-
-    public Descriptor getContainingType() {
-      return containingType;
-    }
-
-    public int getFieldCount() {
-      return fieldCount;
-    }
-
-    public OneofOptions getOptions() {
-      return proto.getOptions();
-    }
-
-    public boolean isSynthetic() {
-      return fields.length == 1 && fields[0].isProto3Optional;
-    }
-
-    /** Get a list of this message type's fields. */
-    public List<FieldDescriptor> getFields() {
-      return Collections.unmodifiableList(Arrays.asList(fields));
-    }
-
-    public FieldDescriptor getField(int index) {
-      return fields[index];
-    }
-
-    @Override
-    public OneofDescriptorProto toProto() {
-      return proto;
-    }
-
-    private void setProto(final OneofDescriptorProto proto) {
-      this.proto = proto;
-    }
-
-    private OneofDescriptor(
-        final OneofDescriptorProto proto,
-        final FileDescriptor file,
-        final Descriptor parent,
-        final int index) {
-      this.proto = proto;
-      fullName = computeFullName(file, parent, proto.getName());
-      this.file = file;
-      this.index = index;
-
-      containingType = parent;
-      fieldCount = 0;
-    }
-
-    private final int index;
-    private OneofDescriptorProto proto;
-    private final String fullName;
-    private final FileDescriptor file;
-
-    private Descriptor containingType;
-    private int fieldCount;
-    private FieldDescriptor[] fields;
-  }
-
-  private static <T> T binarySearch(T[] array, int size, NumberGetter<T> getter, int number) {
-    int left = 0;
-    int right = size - 1;
-
-    while (left <= right) {
-      int mid = (left + right) / 2;
-      T midValue = array[mid];
-      int midValueNumber = getter.getNumber(midValue);
-      if (number < midValueNumber) {
-        right = mid - 1;
-      } else if (number > midValueNumber) {
-        left = mid + 1;
-      } else {
-        return midValue;
-      }
-    }
-    return null;
-  }
-
-  private interface NumberGetter<T> {
-    int getNumber(T t);
-  }
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/DiscardUnknownFieldsParser.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/DiscardUnknownFieldsParser.java
deleted file mode 100644
index c2378ad..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/DiscardUnknownFieldsParser.java
+++ /dev/null
@@ -1,70 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-/** Parsers to discard unknown fields during parsing. */
-public final class DiscardUnknownFieldsParser {
-
-  /**
-   * Wraps a given {@link Parser} into a new {@link Parser} that discards unknown fields during
-   * parsing.
-   *
-   * <p>Usage example:
-   *
-   * <pre>{@code
-   * private final static Parser<Foo> FOO_PARSER = DiscardUnknownFieldsParser.wrap(Foo.parser());
-   * Foo parseFooDiscardUnknown(ByteBuffer input) throws IOException {
-   *   return FOO_PARSER.parseFrom(input);
-   * }
-   * }</pre>
-   *
-   * <p>Like all other implementations of {@code Parser}, this parser is stateless and thread-safe.
-   *
-   * @param parser The delegated parser that parses messages.
-   * @return a {@link Parser} that will discard unknown fields during parsing.
-   */
-  public static final <T extends Message> Parser<T> wrap(final Parser<T> parser) {
-    return new AbstractParser<T>() {
-      @Override
-      public T parsePartialFrom(CodedInputStream input, ExtensionRegistryLite extensionRegistry)
-          throws InvalidProtocolBufferException {
-        try {
-          input.discardUnknownFields();
-          return parser.parsePartialFrom(input, extensionRegistry);
-        } finally {
-          input.unsetDiscardUnknownFields();
-        }
-      }
-    };
-  }
-
-  private DiscardUnknownFieldsParser() {}
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/DoubleArrayList.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/DoubleArrayList.java
deleted file mode 100644
index 4085653..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/DoubleArrayList.java
+++ /dev/null
@@ -1,298 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.protobuf.Internal.checkNotNull;
-
-import com.google.protobuf.Internal.DoubleList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.RandomAccess;
-
-/**
- * An implementation of {@link DoubleList} on top of a primitive array.
- *
- * @author dweis@google.com (Daniel Weis)
- */
-final class DoubleArrayList extends AbstractProtobufList<Double>
-    implements DoubleList, RandomAccess, PrimitiveNonBoxingCollection {
-
-  private static final DoubleArrayList EMPTY_LIST = new DoubleArrayList(new double[0], 0);
-  static {
-    EMPTY_LIST.makeImmutable();
-  }
-
-  public static DoubleArrayList emptyList() {
-    return EMPTY_LIST;
-  }
-
-  /** The backing store for the list. */
-  private double[] array;
-
-  /**
-   * The size of the list distinct from the length of the array. That is, it is the number of
-   * elements set in the list.
-   */
-  private int size;
-
-  /** Constructs a new mutable {@code DoubleArrayList} with default capacity. */
-  DoubleArrayList() {
-    this(new double[DEFAULT_CAPACITY], 0);
-  }
-
-  /**
-   * Constructs a new mutable {@code DoubleArrayList} containing the same elements as {@code other}.
-   */
-  private DoubleArrayList(double[] other, int size) {
-    array = other;
-    this.size = size;
-  }
-
-  @Override
-  protected void removeRange(int fromIndex, int toIndex) {
-    ensureIsMutable();
-    if (toIndex < fromIndex) {
-      throw new IndexOutOfBoundsException("toIndex < fromIndex");
-    }
-
-    System.arraycopy(array, toIndex, array, fromIndex, size - toIndex);
-    size -= (toIndex - fromIndex);
-    modCount++;
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (!(o instanceof DoubleArrayList)) {
-      return super.equals(o);
-    }
-    DoubleArrayList other = (DoubleArrayList) o;
-    if (size != other.size) {
-      return false;
-    }
-
-    final double[] arr = other.array;
-    for (int i = 0; i < size; i++) {
-      if (Double.doubleToLongBits(array[i]) != Double.doubleToLongBits(arr[i])) {
-        return false;
-      }
-    }
-
-    return true;
-  }
-
-  @Override
-  public int hashCode() {
-    int result = 1;
-    for (int i = 0; i < size; i++) {
-      long bits = Double.doubleToLongBits(array[i]);
-      result = (31 * result) + Internal.hashLong(bits);
-    }
-    return result;
-  }
-
-  @Override
-  public DoubleList mutableCopyWithCapacity(int capacity) {
-    if (capacity < size) {
-      throw new IllegalArgumentException();
-    }
-    return new DoubleArrayList(Arrays.copyOf(array, capacity), size);
-  }
-
-  @Override
-  public Double get(int index) {
-    return getDouble(index);
-  }
-
-  @Override
-  public double getDouble(int index) {
-    ensureIndexInRange(index);
-    return array[index];
-  }
-
-  @Override
-  public int indexOf(Object element) {
-    if (!(element instanceof Double)) {
-      return -1;
-    }
-    double unboxedElement = (Double) element;
-    int numElems = size();
-    for (int i = 0; i < numElems; i++) {
-      if (array[i] == unboxedElement) {
-        return i;
-      }
-    }
-    return -1;
-  }
-
-  @Override
-  public boolean contains(Object element) {
-    return indexOf(element) != -1;
-  }
-
-  @Override
-  public int size() {
-    return size;
-  }
-
-  @Override
-  public Double set(int index, Double element) {
-    return setDouble(index, element);
-  }
-
-  @Override
-  public double setDouble(int index, double element) {
-    ensureIsMutable();
-    ensureIndexInRange(index);
-    double previousValue = array[index];
-    array[index] = element;
-    return previousValue;
-  }
-
-  @Override
-  public boolean add(Double element) {
-    addDouble(element);
-    return true;
-  }
-
-  @Override
-  public void add(int index, Double element) {
-    addDouble(index, element);
-  }
-
-  /** Like {@link #add(Double)} but more efficient in that it doesn't box the element. */
-  @Override
-  public void addDouble(double element) {
-    ensureIsMutable();
-    if (size == array.length) {
-      // Resize to 1.5x the size
-      int length = ((size * 3) / 2) + 1;
-      double[] newArray = new double[length];
-
-      System.arraycopy(array, 0, newArray, 0, size);
-      array = newArray;
-    }
-
-    array[size++] = element;
-  }
-
-  /** Like {@link #add(int, Double)} but more efficient in that it doesn't box the element. */
-  private void addDouble(int index, double element) {
-    ensureIsMutable();
-    if (index < 0 || index > size) {
-      throw new IndexOutOfBoundsException(makeOutOfBoundsExceptionMessage(index));
-    }
-
-    if (size < array.length) {
-      // Shift everything over to make room
-      System.arraycopy(array, index, array, index + 1, size - index);
-    } else {
-      // Resize to 1.5x the size
-      int length = ((size * 3) / 2) + 1;
-      double[] newArray = new double[length];
-
-      // Copy the first part directly
-      System.arraycopy(array, 0, newArray, 0, index);
-
-      // Copy the rest shifted over by one to make room
-      System.arraycopy(array, index, newArray, index + 1, size - index);
-      array = newArray;
-    }
-
-    array[index] = element;
-    size++;
-    modCount++;
-  }
-
-  @Override
-  public boolean addAll(Collection<? extends Double> collection) {
-    ensureIsMutable();
-
-    checkNotNull(collection);
-
-    // We specialize when adding another DoubleArrayList to avoid boxing elements.
-    if (!(collection instanceof DoubleArrayList)) {
-      return super.addAll(collection);
-    }
-
-    DoubleArrayList list = (DoubleArrayList) collection;
-    if (list.size == 0) {
-      return false;
-    }
-
-    int overflow = Integer.MAX_VALUE - size;
-    if (overflow < list.size) {
-      // We can't actually represent a list this large.
-      throw new OutOfMemoryError();
-    }
-
-    int newSize = size + list.size;
-    if (newSize > array.length) {
-      array = Arrays.copyOf(array, newSize);
-    }
-
-    System.arraycopy(list.array, 0, array, size, list.size);
-    size = newSize;
-    modCount++;
-    return true;
-  }
-
-  @Override
-  public Double remove(int index) {
-    ensureIsMutable();
-    ensureIndexInRange(index);
-    double value = array[index];
-    if (index < size - 1) {
-      System.arraycopy(array, index + 1, array, index, size - index - 1);
-    }
-    size--;
-    modCount++;
-    return value;
-  }
-
-  /**
-   * Ensures that the provided {@code index} is within the range of {@code [0, size]}. Throws an
-   * {@link IndexOutOfBoundsException} if it is not.
-   *
-   * @param index the index to verify is in range
-   */
-  private void ensureIndexInRange(int index) {
-    if (index < 0 || index >= size) {
-      throw new IndexOutOfBoundsException(makeOutOfBoundsExceptionMessage(index));
-    }
-  }
-
-  private String makeOutOfBoundsExceptionMessage(int index) {
-    return "Index:" + index + ", Size:" + size;
-  }
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/DynamicMessage.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/DynamicMessage.java
deleted file mode 100644
index 87d85a5..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/DynamicMessage.java
+++ /dev/null
@@ -1,738 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.protobuf.Internal.checkNotNull;
-
-import com.google.protobuf.Descriptors.Descriptor;
-import com.google.protobuf.Descriptors.EnumValueDescriptor;
-import com.google.protobuf.Descriptors.FieldDescriptor;
-import com.google.protobuf.Descriptors.OneofDescriptor;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
-/**
- * An implementation of {@link Message} that can represent arbitrary types, given a {@link
- * Descriptors.Descriptor}.
- *
- * @author kenton@google.com Kenton Varda
- */
-public final class DynamicMessage extends AbstractMessage {
-  private final Descriptor type;
-  private final FieldSet<FieldDescriptor> fields;
-  private final FieldDescriptor[] oneofCases;
-  private final UnknownFieldSet unknownFields;
-  private int memoizedSize = -1;
-
-  /**
-   * Construct a {@code DynamicMessage} using the given {@code FieldSet}. oneofCases stores the
-   * FieldDescriptor for each oneof to indicate which field is set. Caller should make sure the
-   * array is immutable.
-   *
-   * <p>This constructor is package private and will be used in {@code DynamicMutableMessage} to
-   * convert a mutable message to an immutable message.
-   */
-  DynamicMessage(
-      Descriptor type,
-      FieldSet<FieldDescriptor> fields,
-      FieldDescriptor[] oneofCases,
-      UnknownFieldSet unknownFields) {
-    this.type = type;
-    this.fields = fields;
-    this.oneofCases = oneofCases;
-    this.unknownFields = unknownFields;
-  }
-
-  /** Get a {@code DynamicMessage} representing the default instance of the given type. */
-  public static DynamicMessage getDefaultInstance(Descriptor type) {
-    int oneofDeclCount = type.toProto().getOneofDeclCount();
-    FieldDescriptor[] oneofCases = new FieldDescriptor[oneofDeclCount];
-    return new DynamicMessage(
-        type,
-        FieldSet.<FieldDescriptor>emptySet(),
-        oneofCases,
-        UnknownFieldSet.getDefaultInstance());
-  }
-
-
-  /** Parse a message of the given type from the given input stream. */
-  public static DynamicMessage parseFrom(Descriptor type, CodedInputStream input)
-      throws IOException {
-    return newBuilder(type).mergeFrom(input).buildParsed();
-  }
-
-  /** Parse a message of the given type from the given input stream. */
-  public static DynamicMessage parseFrom(
-      Descriptor type, CodedInputStream input, ExtensionRegistry extensionRegistry)
-      throws IOException {
-    return newBuilder(type).mergeFrom(input, extensionRegistry).buildParsed();
-  }
-
-  /** Parse {@code data} as a message of the given type and return it. */
-  public static DynamicMessage parseFrom(Descriptor type, ByteString data)
-      throws InvalidProtocolBufferException {
-    return newBuilder(type).mergeFrom(data).buildParsed();
-  }
-
-  /** Parse {@code data} as a message of the given type and return it. */
-  public static DynamicMessage parseFrom(
-      Descriptor type, ByteString data, ExtensionRegistry extensionRegistry)
-      throws InvalidProtocolBufferException {
-    return newBuilder(type).mergeFrom(data, extensionRegistry).buildParsed();
-  }
-
-  /** Parse {@code data} as a message of the given type and return it. */
-  public static DynamicMessage parseFrom(Descriptor type, byte[] data)
-      throws InvalidProtocolBufferException {
-    return newBuilder(type).mergeFrom(data).buildParsed();
-  }
-
-  /** Parse {@code data} as a message of the given type and return it. */
-  public static DynamicMessage parseFrom(
-      Descriptor type, byte[] data, ExtensionRegistry extensionRegistry)
-      throws InvalidProtocolBufferException {
-    return newBuilder(type).mergeFrom(data, extensionRegistry).buildParsed();
-  }
-
-  /** Parse a message of the given type from {@code input} and return it. */
-  public static DynamicMessage parseFrom(Descriptor type, InputStream input) throws IOException {
-    return newBuilder(type).mergeFrom(input).buildParsed();
-  }
-
-  /** Parse a message of the given type from {@code input} and return it. */
-  public static DynamicMessage parseFrom(
-      Descriptor type, InputStream input, ExtensionRegistry extensionRegistry) throws IOException {
-    return newBuilder(type).mergeFrom(input, extensionRegistry).buildParsed();
-  }
-
-  /** Construct a {@link Message.Builder} for the given type. */
-  public static Builder newBuilder(Descriptor type) {
-    return new Builder(type);
-  }
-
-  /**
-   * Construct a {@link Message.Builder} for a message of the same type as {@code prototype}, and
-   * initialize it with {@code prototype}'s contents.
-   */
-  public static Builder newBuilder(Message prototype) {
-    return new Builder(prototype.getDescriptorForType()).mergeFrom(prototype);
-  }
-
-  // -----------------------------------------------------------------
-  // Implementation of Message interface.
-
-  @Override
-  public Descriptor getDescriptorForType() {
-    return type;
-  }
-
-  @Override
-  public DynamicMessage getDefaultInstanceForType() {
-    return getDefaultInstance(type);
-  }
-
-  @Override
-  public Map<FieldDescriptor, Object> getAllFields() {
-    return fields.getAllFields();
-  }
-
-  @Override
-  public boolean hasOneof(OneofDescriptor oneof) {
-    verifyOneofContainingType(oneof);
-    FieldDescriptor field = oneofCases[oneof.getIndex()];
-    if (field == null) {
-      return false;
-    }
-    return true;
-  }
-
-  @Override
-  public FieldDescriptor getOneofFieldDescriptor(OneofDescriptor oneof) {
-    verifyOneofContainingType(oneof);
-    return oneofCases[oneof.getIndex()];
-  }
-
-  @Override
-  public boolean hasField(FieldDescriptor field) {
-    verifyContainingType(field);
-    return fields.hasField(field);
-  }
-
-  @Override
-  public Object getField(FieldDescriptor field) {
-    verifyContainingType(field);
-    Object result = fields.getField(field);
-    if (result == null) {
-      if (field.isRepeated()) {
-        result = Collections.emptyList();
-      } else if (field.getJavaType() == FieldDescriptor.JavaType.MESSAGE) {
-        result = getDefaultInstance(field.getMessageType());
-      } else {
-        result = field.getDefaultValue();
-      }
-    }
-    return result;
-  }
-
-  @Override
-  public int getRepeatedFieldCount(FieldDescriptor field) {
-    verifyContainingType(field);
-    return fields.getRepeatedFieldCount(field);
-  }
-
-  @Override
-  public Object getRepeatedField(FieldDescriptor field, int index) {
-    verifyContainingType(field);
-    return fields.getRepeatedField(field, index);
-  }
-
-  @Override
-  public UnknownFieldSet getUnknownFields() {
-    return unknownFields;
-  }
-
-  static boolean isInitialized(Descriptor type, FieldSet<FieldDescriptor> fields) {
-    // Check that all required fields are present.
-    for (final FieldDescriptor field : type.getFields()) {
-      if (field.isRequired()) {
-        if (!fields.hasField(field)) {
-          return false;
-        }
-      }
-    }
-
-    // Check that embedded messages are initialized.
-    return fields.isInitialized();
-  }
-
-  @Override
-  public boolean isInitialized() {
-    return isInitialized(type, fields);
-  }
-
-  @Override
-  public void writeTo(CodedOutputStream output) throws IOException {
-    if (type.getOptions().getMessageSetWireFormat()) {
-      fields.writeMessageSetTo(output);
-      unknownFields.writeAsMessageSetTo(output);
-    } else {
-      fields.writeTo(output);
-      unknownFields.writeTo(output);
-    }
-  }
-
-  @Override
-  public int getSerializedSize() {
-    int size = memoizedSize;
-    if (size != -1) return size;
-
-    if (type.getOptions().getMessageSetWireFormat()) {
-      size = fields.getMessageSetSerializedSize();
-      size += unknownFields.getSerializedSizeAsMessageSet();
-    } else {
-      size = fields.getSerializedSize();
-      size += unknownFields.getSerializedSize();
-    }
-
-    memoizedSize = size;
-    return size;
-  }
-
-  @Override
-  public Builder newBuilderForType() {
-    return new Builder(type);
-  }
-
-  @Override
-  public Builder toBuilder() {
-    return newBuilderForType().mergeFrom(this);
-  }
-
-  @Override
-  public Parser<DynamicMessage> getParserForType() {
-    return new AbstractParser<DynamicMessage>() {
-      @Override
-      public DynamicMessage parsePartialFrom(
-          CodedInputStream input, ExtensionRegistryLite extensionRegistry)
-          throws InvalidProtocolBufferException {
-        Builder builder = newBuilder(type);
-        try {
-          builder.mergeFrom(input, extensionRegistry);
-        } catch (InvalidProtocolBufferException e) {
-          throw e.setUnfinishedMessage(builder.buildPartial());
-        } catch (IOException e) {
-          throw new InvalidProtocolBufferException(e).setUnfinishedMessage(builder.buildPartial());
-        }
-        return builder.buildPartial();
-      }
-    };
-  }
-
-  /** Verifies that the field is a field of this message. */
-  private void verifyContainingType(FieldDescriptor field) {
-    if (field.getContainingType() != type) {
-      throw new IllegalArgumentException("FieldDescriptor does not match message type.");
-    }
-  }
-
-  /** Verifies that the oneof is an oneof of this message. */
-  private void verifyOneofContainingType(OneofDescriptor oneof) {
-    if (oneof.getContainingType() != type) {
-      throw new IllegalArgumentException("OneofDescriptor does not match message type.");
-    }
-  }
-
-  // =================================================================
-
-  /** Builder for {@link DynamicMessage}s. */
-  public static final class Builder extends AbstractMessage.Builder<Builder> {
-    private final Descriptor type;
-    private FieldSet.Builder<FieldDescriptor> fields;
-    private final FieldDescriptor[] oneofCases;
-    private UnknownFieldSet unknownFields;
-
-    /** Construct a {@code Builder} for the given type. */
-    private Builder(Descriptor type) {
-      this.type = type;
-      this.fields = FieldSet.newBuilder();
-      this.unknownFields = UnknownFieldSet.getDefaultInstance();
-      this.oneofCases = new FieldDescriptor[type.toProto().getOneofDeclCount()];
-    }
-
-    // ---------------------------------------------------------------
-    // Implementation of Message.Builder interface.
-
-    @Override
-    public Builder clear() {
-      fields = FieldSet.newBuilder();
-      unknownFields = UnknownFieldSet.getDefaultInstance();
-      return this;
-    }
-
-    @Override
-    public Builder mergeFrom(Message other) {
-      if (other instanceof DynamicMessage) {
-        // This should be somewhat faster than calling super.mergeFrom().
-        DynamicMessage otherDynamicMessage = (DynamicMessage) other;
-        if (otherDynamicMessage.type != type) {
-          throw new IllegalArgumentException(
-              "mergeFrom(Message) can only merge messages of the same type.");
-        }
-        fields.mergeFrom(otherDynamicMessage.fields);
-        mergeUnknownFields(otherDynamicMessage.unknownFields);
-        for (int i = 0; i < oneofCases.length; i++) {
-          if (oneofCases[i] == null) {
-            oneofCases[i] = otherDynamicMessage.oneofCases[i];
-          } else {
-            if ((otherDynamicMessage.oneofCases[i] != null)
-                && (oneofCases[i] != otherDynamicMessage.oneofCases[i])) {
-              fields.clearField(oneofCases[i]);
-              oneofCases[i] = otherDynamicMessage.oneofCases[i];
-            }
-          }
-        }
-        return this;
-      } else {
-        return super.mergeFrom(other);
-      }
-    }
-
-    @Override
-    public DynamicMessage build() {
-      if (!isInitialized()) {
-        throw newUninitializedMessageException(
-            new DynamicMessage(
-                type, fields.build(), Arrays.copyOf(oneofCases, oneofCases.length), unknownFields));
-      }
-      return buildPartial();
-    }
-
-    /**
-     * Helper for DynamicMessage.parseFrom() methods to call. Throws {@link
-     * InvalidProtocolBufferException} instead of {@link UninitializedMessageException}.
-     */
-    private DynamicMessage buildParsed() throws InvalidProtocolBufferException {
-      if (!isInitialized()) {
-        throw newUninitializedMessageException(
-                new DynamicMessage(
-                    type,
-                    fields.build(),
-                    Arrays.copyOf(oneofCases, oneofCases.length),
-                    unknownFields))
-            .asInvalidProtocolBufferException();
-      }
-      return buildPartial();
-    }
-
-    @Override
-    public DynamicMessage buildPartial() {
-      // Set default values for all fields in a MapEntry.
-      if (type.getOptions().getMapEntry()) {
-        for (FieldDescriptor field : type.getFields()) {
-          if (field.isOptional() && !fields.hasField(field)) {
-            if (field.getJavaType() == FieldDescriptor.JavaType.MESSAGE) {
-              fields.setField(field, getDefaultInstance(field.getMessageType()));
-            } else {
-              fields.setField(field, field.getDefaultValue());
-            }
-          }
-        }
-      }
-
-      DynamicMessage result =
-          new DynamicMessage(
-              type,
-              fields.buildPartial(),
-              Arrays.copyOf(oneofCases, oneofCases.length),
-              unknownFields);
-      return result;
-    }
-
-    @Override
-    public Builder clone() {
-      Builder result = new Builder(type);
-      result.fields.mergeFrom(fields.build());
-      result.mergeUnknownFields(unknownFields);
-      System.arraycopy(oneofCases, 0, result.oneofCases, 0, oneofCases.length);
-      return result;
-    }
-
-    @Override
-    public boolean isInitialized() {
-      // Check that all required fields are present.
-      for (FieldDescriptor field : type.getFields()) {
-        if (field.isRequired()) {
-          if (!fields.hasField(field)) {
-            return false;
-          }
-        }
-      }
-
-      // Check that embedded messages are initialized.
-      return fields.isInitialized();
-    }
-
-    @Override
-    public Descriptor getDescriptorForType() {
-      return type;
-    }
-
-    @Override
-    public DynamicMessage getDefaultInstanceForType() {
-      return getDefaultInstance(type);
-    }
-
-    @Override
-    public Map<FieldDescriptor, Object> getAllFields() {
-      return fields.getAllFields();
-    }
-
-    @Override
-    public Builder newBuilderForField(FieldDescriptor field) {
-      verifyContainingType(field);
-
-      if (field.getJavaType() != FieldDescriptor.JavaType.MESSAGE) {
-        throw new IllegalArgumentException(
-            "newBuilderForField is only valid for fields with message type.");
-      }
-
-      return new Builder(field.getMessageType());
-    }
-
-    @Override
-    public boolean hasOneof(OneofDescriptor oneof) {
-      verifyOneofContainingType(oneof);
-      FieldDescriptor field = oneofCases[oneof.getIndex()];
-      if (field == null) {
-        return false;
-      }
-      return true;
-    }
-
-    @Override
-    public FieldDescriptor getOneofFieldDescriptor(OneofDescriptor oneof) {
-      verifyOneofContainingType(oneof);
-      return oneofCases[oneof.getIndex()];
-    }
-
-    @Override
-    public Builder clearOneof(OneofDescriptor oneof) {
-      verifyOneofContainingType(oneof);
-      FieldDescriptor field = oneofCases[oneof.getIndex()];
-      if (field != null) {
-        clearField(field);
-      }
-      return this;
-    }
-
-    @Override
-    public boolean hasField(FieldDescriptor field) {
-      verifyContainingType(field);
-      return fields.hasField(field);
-    }
-
-    @Override
-    public Object getField(FieldDescriptor field) {
-      verifyContainingType(field);
-      Object result = fields.getField(field);
-      if (result == null) {
-        if (field.isRepeated()) {
-          result = Collections.emptyList();
-        } else if (field.getJavaType() == FieldDescriptor.JavaType.MESSAGE) {
-          result = getDefaultInstance(field.getMessageType());
-        } else {
-          result = field.getDefaultValue();
-        }
-      }
-      return result;
-    }
-
-    @Override
-    public Builder setField(FieldDescriptor field, Object value) {
-      verifyContainingType(field);
-      // TODO(xiaofeng): This check should really be put in FieldSet.setField()
-      // where all other such checks are done. However, currently
-      // FieldSet.setField() permits Integer value for enum fields probably
-      // because of some internal features we support. Should figure it out
-      // and move this check to a more appropriate place.
-      verifyType(field, value);
-      OneofDescriptor oneofDescriptor = field.getContainingOneof();
-      if (oneofDescriptor != null) {
-        int index = oneofDescriptor.getIndex();
-        FieldDescriptor oldField = oneofCases[index];
-        if ((oldField != null) && (oldField != field)) {
-          fields.clearField(oldField);
-        }
-        oneofCases[index] = field;
-      } else if (field.getFile().getSyntax() == Descriptors.FileDescriptor.Syntax.PROTO3) {
-        if (!field.isRepeated()
-            && field.getJavaType() != FieldDescriptor.JavaType.MESSAGE
-            && value.equals(field.getDefaultValue())) {
-          // In proto3, setting a field to its default value is equivalent to clearing the field.
-          fields.clearField(field);
-          return this;
-        }
-      }
-      fields.setField(field, value);
-      return this;
-    }
-
-    @Override
-    public Builder clearField(FieldDescriptor field) {
-      verifyContainingType(field);
-      OneofDescriptor oneofDescriptor = field.getContainingOneof();
-      if (oneofDescriptor != null) {
-        int index = oneofDescriptor.getIndex();
-        if (oneofCases[index] == field) {
-          oneofCases[index] = null;
-        }
-      }
-      fields.clearField(field);
-      return this;
-    }
-
-    @Override
-    public int getRepeatedFieldCount(FieldDescriptor field) {
-      verifyContainingType(field);
-      return fields.getRepeatedFieldCount(field);
-    }
-
-    @Override
-    public Object getRepeatedField(FieldDescriptor field, int index) {
-      verifyContainingType(field);
-      return fields.getRepeatedField(field, index);
-    }
-
-    @Override
-    public Builder setRepeatedField(FieldDescriptor field, int index, Object value) {
-      verifyContainingType(field);
-      verifySingularValueType(field, value);
-      fields.setRepeatedField(field, index, value);
-      return this;
-    }
-
-    @Override
-    public Builder addRepeatedField(FieldDescriptor field, Object value) {
-      verifyContainingType(field);
-      verifySingularValueType(field, value);
-      fields.addRepeatedField(field, value);
-      return this;
-    }
-
-    @Override
-    public UnknownFieldSet getUnknownFields() {
-      return unknownFields;
-    }
-
-    @Override
-    public Builder setUnknownFields(UnknownFieldSet unknownFields) {
-      this.unknownFields = unknownFields;
-      return this;
-    }
-
-    @Override
-    public Builder mergeUnknownFields(UnknownFieldSet unknownFields) {
-      this.unknownFields =
-          UnknownFieldSet.newBuilder(this.unknownFields).mergeFrom(unknownFields).build();
-      return this;
-    }
-
-    /** Verifies that the field is a field of this message. */
-    private void verifyContainingType(FieldDescriptor field) {
-      if (field.getContainingType() != type) {
-        throw new IllegalArgumentException("FieldDescriptor does not match message type.");
-      }
-    }
-
-    /** Verifies that the oneof is an oneof of this message. */
-    private void verifyOneofContainingType(OneofDescriptor oneof) {
-      if (oneof.getContainingType() != type) {
-        throw new IllegalArgumentException("OneofDescriptor does not match message type.");
-      }
-    }
-
-    /**
-     * Verifies that {@code value} is of the appropriate type, in addition to the checks already
-     * performed by {@link FieldSet.Builder}.
-     */
-    private void verifySingularValueType(FieldDescriptor field, Object value) {
-      // Most type checks are performed by FieldSet.Builder, but FieldSet.Builder is more permissive
-      // than generated Message.Builder subclasses, so we perform extra checks in this class so that
-      // DynamicMessage.Builder's semantics more closely match the semantics of generated builders.
-      switch (field.getType()) {
-        case ENUM:
-          checkNotNull(value);
-          // FieldSet.Builder accepts Integer values for enum fields.
-          if (!(value instanceof EnumValueDescriptor)) {
-            throw new IllegalArgumentException(
-                "DynamicMessage should use EnumValueDescriptor to set Enum Value.");
-          }
-          // TODO(xiaofeng): Re-enable this check after Orgstore is fixed to not
-          // set incorrect EnumValueDescriptors.
-          // EnumDescriptor fieldType = field.getEnumType();
-          // EnumDescriptor fieldValueType = ((EnumValueDescriptor) value).getType();
-          // if (fieldType != fieldValueType) {
-          //  throw new IllegalArgumentException(String.format(
-          //      "EnumDescriptor %s of field doesn't match EnumDescriptor %s of field value",
-          //      fieldType.getFullName(), fieldValueType.getFullName()));
-          // }
-          break;
-        case MESSAGE:
-          // FieldSet.Builder accepts Message.Builder values for message fields.
-          if (value instanceof Message.Builder) {
-            throw new IllegalArgumentException(
-                String.format(
-                    "Wrong object type used with protocol message reflection.\n"
-                        + "Field number: %d, field java type: %s, value type: %s\n",
-                    field.getNumber(),
-                    field.getLiteType().getJavaType(),
-                    value.getClass().getName()));
-          }
-          break;
-        default:
-          break;
-      }
-    }
-
-    /**
-     * Verifies that {@code value} is of the appropriate type, in addition to the checks already
-     * performed by {@link FieldSet.Builder}.
-     */
-    private void verifyType(FieldDescriptor field, Object value) {
-      if (field.isRepeated()) {
-        for (Object item : (List<?>) value) {
-          verifySingularValueType(field, item);
-        }
-      } else {
-        verifySingularValueType(field, value);
-      }
-    }
-
-    @Override
-    public com.google.protobuf.Message.Builder getFieldBuilder(FieldDescriptor field) {
-      verifyContainingType(field);
-      // Error messages chosen for parity with GeneratedMessage.getFieldBuilder.
-      if (field.isMapField()) {
-        throw new UnsupportedOperationException("Nested builder not supported for map fields.");
-      }
-      if (field.getJavaType() != FieldDescriptor.JavaType.MESSAGE) {
-        throw new UnsupportedOperationException("getFieldBuilder() called on a non-Message type.");
-      }
-
-      Object existingValue = fields.getFieldAllowBuilders(field);
-      Message.Builder builder =
-          existingValue == null
-              ? new Builder(field.getMessageType())
-              : toMessageBuilder(existingValue);
-      fields.setField(field, builder);
-      return builder;
-    }
-
-    @Override
-    public com.google.protobuf.Message.Builder getRepeatedFieldBuilder(
-        FieldDescriptor field, int index) {
-      verifyContainingType(field);
-      // Error messages chosen for parity with GeneratedMessage.getRepeatedFieldBuilder.
-      if (field.isMapField()) {
-        throw new UnsupportedOperationException("Map fields cannot be repeated");
-      }
-      if (field.getJavaType() != FieldDescriptor.JavaType.MESSAGE) {
-        throw new UnsupportedOperationException(
-            "getRepeatedFieldBuilder() called on a non-Message type.");
-      }
-
-      Message.Builder builder =
-          toMessageBuilder(fields.getRepeatedFieldAllowBuilders(field, index));
-      fields.setRepeatedField(field, index, builder);
-      return builder;
-    }
-
-    private static Message.Builder toMessageBuilder(Object o) {
-      if (o instanceof Message.Builder) {
-        return (Message.Builder) o;
-      }
-
-      if (o instanceof LazyField) {
-        o = ((LazyField) o).getValue();
-      }
-      if (o instanceof Message) {
-        return ((Message) o).toBuilder();
-      }
-
-      throw new IllegalArgumentException(
-          String.format("Cannot convert %s to Message.Builder", o.getClass()));
-    }
-  }
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/ExperimentalApi.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/ExperimentalApi.java
deleted file mode 100644
index d55b278..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/ExperimentalApi.java
+++ /dev/null
@@ -1,65 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Indicates a public API that can change at any time, and has no guarantee of API stability and
- * backward-compatibility.
- *
- * <p>Usage guidelines:
- *
- * <ol>
- *   <li>This annotation is used only on public API. Internal interfaces should not use it.
- *   <li>This annotation should only be added to new APIs. Adding it to an existing API is
- *       considered API-breaking.
- *   <li>Removing this annotation from an API gives it stable status.
- * </ol>
- */
-@Retention(RetentionPolicy.SOURCE)
-@Target({
-  ElementType.ANNOTATION_TYPE,
-  ElementType.CONSTRUCTOR,
-  ElementType.FIELD,
-  ElementType.METHOD,
-  ElementType.PACKAGE,
-  ElementType.TYPE
-})
-@Documented
-public @interface ExperimentalApi {
-  /** Context information such as links to discussion thread, tracking issue etc. */
-  String value() default "";
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/Extension.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/Extension.java
deleted file mode 100644
index 30c828e..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/Extension.java
+++ /dev/null
@@ -1,88 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-// TODO(chrisn): Change ContainingType to extend Message
-/**
- * Interface that generated extensions implement.
- *
- * @author liujisi@google.com (Jisi Liu)
- */
-public abstract class Extension<ContainingType extends MessageLite, Type>
-    extends ExtensionLite<ContainingType, Type> {
-  // TODO(chrisn): Add package-private constructor.
-
-  /** {@inheritDoc} Overridden to return {@link Message} instead of {@link MessageLite}. */
-  @Override
-  public abstract Message getMessageDefaultInstance();
-
-  /** Returns the descriptor of the extension. */
-  public abstract Descriptors.FieldDescriptor getDescriptor();
-
-  /** Returns whether or not this extension is a Lite Extension. */
-  @Override
-  final boolean isLite() {
-    return false;
-  }
-
-  // All the methods below are extension implementation details.
-
-  /** The API type that the extension is used for. */
-  protected enum ExtensionType {
-    IMMUTABLE,
-    MUTABLE,
-    PROTO1,
-  }
-
-  protected abstract ExtensionType getExtensionType();
-
-  /** Type of a message extension. */
-  public enum MessageType {
-    PROTO1,
-    PROTO2,
-  }
-
-  /**
-   * If the extension is a message extension (i.e., getLiteType() == MESSAGE), returns the type of
-   * the message, otherwise undefined.
-   */
-  public MessageType getMessageType() {
-    return MessageType.PROTO2;
-  }
-
-  protected abstract Object fromReflectionType(Object value);
-
-  protected abstract Object singularFromReflectionType(Object value);
-
-  protected abstract Object toReflectionType(Object value);
-
-  protected abstract Object singularToReflectionType(Object value);
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/ExtensionLite.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/ExtensionLite.java
deleted file mode 100644
index 0fb5f49..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/ExtensionLite.java
+++ /dev/null
@@ -1,60 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-/**
- * Lite interface that generated extensions implement.
- *
- * <p>Methods are for use by generated code only. You can hold a reference to extensions using this
- * type name.
- */
-public abstract class ExtensionLite<ContainingType extends MessageLite, Type> {
-
-  /** Returns the field number of the extension. */
-  public abstract int getNumber();
-
-  /** Returns the type of the field. */
-  public abstract WireFormat.FieldType getLiteType();
-
-  /** Returns whether it is a repeated field. */
-  public abstract boolean isRepeated();
-
-  /** Returns the default value of the extension field. */
-  public abstract Type getDefaultValue();
-
-  /** Returns the default instance of the extension field, if it's a message extension. */
-  public abstract MessageLite getMessageDefaultInstance();
-
-  /** Returns whether or not this extension is a Lite Extension. */
-  boolean isLite() {
-    return true;
-  }
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/ExtensionRegistry.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/ExtensionRegistry.java
deleted file mode 100644
index f0f1564..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/ExtensionRegistry.java
+++ /dev/null
@@ -1,366 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import com.google.protobuf.Descriptors.Descriptor;
-import com.google.protobuf.Descriptors.FieldDescriptor;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * A table of known extensions, searchable by name or field number. When parsing a protocol message
- * that might have extensions, you must provide an {@code ExtensionRegistry} in which you have
- * registered any extensions that you want to be able to parse. Otherwise, those extensions will
- * just be treated like unknown fields.
- *
- * <p>For example, if you had the {@code .proto} file:
- *
- * <pre>
- * option java_class = "MyProto";
- *
- * message Foo {
- *   extensions 1000 to max;
- * }
- *
- * extend Foo {
- *   optional int32 bar;
- * }
- * </pre>
- *
- * Then you might write code like:
- *
- * <pre>
- * ExtensionRegistry registry = ExtensionRegistry.newInstance();
- * registry.add(MyProto.bar);
- * MyProto.Foo message = MyProto.Foo.parseFrom(input, registry);
- * </pre>
- *
- * <p>Background:
- *
- * <p>You might wonder why this is necessary. Two alternatives might come to mind. First, you might
- * imagine a system where generated extensions are automatically registered when their containing
- * classes are loaded. This is a popular technique, but is bad design; among other things, it
- * creates a situation where behavior can change depending on what classes happen to be loaded. It
- * also introduces a security vulnerability, because an unprivileged class could cause its code to
- * be called unexpectedly from a privileged class by registering itself as an extension of the right
- * type.
- *
- * <p>Another option you might consider is lazy parsing: do not parse an extension until it is first
- * requested, at which point the caller must provide a type to use. This introduces a different set
- * of problems. First, it would require a mutex lock any time an extension was accessed, which would
- * be slow. Second, corrupt data would not be detected until first access, at which point it would
- * be much harder to deal with it. Third, it could violate the expectation that message objects are
- * immutable, since the type provided could be any arbitrary message class. An unprivileged user
- * could take advantage of this to inject a mutable object into a message belonging to privileged
- * code and create mischief.
- *
- * @author kenton@google.com Kenton Varda
- */
-public class ExtensionRegistry extends ExtensionRegistryLite {
-  /** Construct a new, empty instance. */
-  public static ExtensionRegistry newInstance() {
-    return new ExtensionRegistry();
-  }
-
-  /** Get the unmodifiable singleton empty instance. */
-  public static ExtensionRegistry getEmptyRegistry() {
-    return EMPTY_REGISTRY;
-  }
-
-
-  /** Returns an unmodifiable view of the registry. */
-  @Override
-  public ExtensionRegistry getUnmodifiable() {
-    return new ExtensionRegistry(this);
-  }
-
-  /** A (Descriptor, Message) pair, returned by lookup methods. */
-  public static final class ExtensionInfo {
-    /** The extension's descriptor. */
-    public final FieldDescriptor descriptor;
-
-    /**
-     * A default instance of the extension's type, if it has a message type. Otherwise, {@code
-     * null}.
-     */
-    public final Message defaultInstance;
-
-    private ExtensionInfo(final FieldDescriptor descriptor) {
-      this.descriptor = descriptor;
-      defaultInstance = null;
-    }
-
-    private ExtensionInfo(final FieldDescriptor descriptor, final Message defaultInstance) {
-      this.descriptor = descriptor;
-      this.defaultInstance = defaultInstance;
-    }
-  }
-
-  /** Deprecated. Use {@link #findImmutableExtensionByName(String)} instead. */
-  @Deprecated
-  public ExtensionInfo findExtensionByName(final String fullName) {
-    return findImmutableExtensionByName(fullName);
-  }
-
-  /**
-   * Find an extension for immutable APIs by fully-qualified field name, in the proto namespace.
-   * i.e. {@code result.descriptor.fullName()} will match {@code fullName} if a match is found.
-   *
-   * @return Information about the extension if found, or {@code null} otherwise.
-   */
-  public ExtensionInfo findImmutableExtensionByName(final String fullName) {
-    return immutableExtensionsByName.get(fullName);
-  }
-
-  /**
-   * Find an extension for mutable APIs by fully-qualified field name, in the proto namespace. i.e.
-   * {@code result.descriptor.fullName()} will match {@code fullName} if a match is found.
-   *
-   * @return Information about the extension if found, or {@code null} otherwise.
-   */
-  public ExtensionInfo findMutableExtensionByName(final String fullName) {
-    return mutableExtensionsByName.get(fullName);
-  }
-
-  /** Deprecated. Use {@link #findImmutableExtensionByNumber(Descriptors.Descriptor, int)} */
-  @Deprecated
-  public ExtensionInfo findExtensionByNumber(
-      final Descriptor containingType, final int fieldNumber) {
-    return findImmutableExtensionByNumber(containingType, fieldNumber);
-  }
-
-  /**
-   * Find an extension by containing type and field number for immutable APIs.
-   *
-   * @return Information about the extension if found, or {@code null} otherwise.
-   */
-  public ExtensionInfo findImmutableExtensionByNumber(
-      final Descriptor containingType, final int fieldNumber) {
-    return immutableExtensionsByNumber.get(new DescriptorIntPair(containingType, fieldNumber));
-  }
-
-  /**
-   * Find an extension by containing type and field number for mutable APIs.
-   *
-   * @return Information about the extension if found, or {@code null} otherwise.
-   */
-  public ExtensionInfo findMutableExtensionByNumber(
-      final Descriptor containingType, final int fieldNumber) {
-    return mutableExtensionsByNumber.get(new DescriptorIntPair(containingType, fieldNumber));
-  }
-
-  /**
-   * Find all extensions for mutable APIs by fully-qualified name of extended class. Note that this
-   * method is more computationally expensive than getting a single extension by name or number.
-   *
-   * @return Information about the extensions found, or {@code null} if there are none.
-   */
-  public Set<ExtensionInfo> getAllMutableExtensionsByExtendedType(final String fullName) {
-    HashSet<ExtensionInfo> extensions = new HashSet<ExtensionInfo>();
-    for (DescriptorIntPair pair : mutableExtensionsByNumber.keySet()) {
-      if (pair.descriptor.getFullName().equals(fullName)) {
-        extensions.add(mutableExtensionsByNumber.get(pair));
-      }
-    }
-    return extensions;
-  }
-
-  /**
-   * Find all extensions for immutable APIs by fully-qualified name of extended class. Note that
-   * this method is more computationally expensive than getting a single extension by name or
-   * number.
-   *
-   * @return Information about the extensions found, or {@code null} if there are none.
-   */
-  public Set<ExtensionInfo> getAllImmutableExtensionsByExtendedType(final String fullName) {
-    HashSet<ExtensionInfo> extensions = new HashSet<ExtensionInfo>();
-    for (DescriptorIntPair pair : immutableExtensionsByNumber.keySet()) {
-      if (pair.descriptor.getFullName().equals(fullName)) {
-        extensions.add(immutableExtensionsByNumber.get(pair));
-      }
-    }
-    return extensions;
-  }
-
-  /** Add an extension from a generated file to the registry. */
-  public void add(final Extension<?, ?> extension) {
-    if (extension.getExtensionType() != Extension.ExtensionType.IMMUTABLE
-        && extension.getExtensionType() != Extension.ExtensionType.MUTABLE) {
-      // do not support other extension types. ignore
-      return;
-    }
-    add(newExtensionInfo(extension), extension.getExtensionType());
-  }
-
-  /** Add an extension from a generated file to the registry. */
-  public void add(final GeneratedMessage.GeneratedExtension<?, ?> extension) {
-    add((Extension<?, ?>) extension);
-  }
-
-  static ExtensionInfo newExtensionInfo(final Extension<?, ?> extension) {
-    if (extension.getDescriptor().getJavaType() == FieldDescriptor.JavaType.MESSAGE) {
-      if (extension.getMessageDefaultInstance() == null) {
-        throw new IllegalStateException(
-            "Registered message-type extension had null default instance: "
-                + extension.getDescriptor().getFullName());
-      }
-      return new ExtensionInfo(
-          extension.getDescriptor(), (Message) extension.getMessageDefaultInstance());
-    } else {
-      return new ExtensionInfo(extension.getDescriptor(), null);
-    }
-  }
-
-  /** Add a non-message-type extension to the registry by descriptor. */
-  public void add(final FieldDescriptor type) {
-    if (type.getJavaType() == FieldDescriptor.JavaType.MESSAGE) {
-      throw new IllegalArgumentException(
-          "ExtensionRegistry.add() must be provided a default instance when "
-              + "adding an embedded message extension.");
-    }
-    ExtensionInfo info = new ExtensionInfo(type, null);
-    add(info, Extension.ExtensionType.IMMUTABLE);
-    add(info, Extension.ExtensionType.MUTABLE);
-  }
-
-  /** Add a message-type extension to the registry by descriptor. */
-  public void add(final FieldDescriptor type, final Message defaultInstance) {
-    if (type.getJavaType() != FieldDescriptor.JavaType.MESSAGE) {
-      throw new IllegalArgumentException(
-          "ExtensionRegistry.add() provided a default instance for a non-message extension.");
-    }
-      add(new ExtensionInfo(type, defaultInstance), Extension.ExtensionType.IMMUTABLE);
-  }
-
-  // =================================================================
-  // Private stuff.
-
-  private ExtensionRegistry() {
-    this.immutableExtensionsByName = new HashMap<String, ExtensionInfo>();
-    this.mutableExtensionsByName = new HashMap<String, ExtensionInfo>();
-    this.immutableExtensionsByNumber = new HashMap<DescriptorIntPair, ExtensionInfo>();
-    this.mutableExtensionsByNumber = new HashMap<DescriptorIntPair, ExtensionInfo>();
-  }
-
-  private ExtensionRegistry(ExtensionRegistry other) {
-    super(other);
-    this.immutableExtensionsByName = Collections.unmodifiableMap(other.immutableExtensionsByName);
-    this.mutableExtensionsByName = Collections.unmodifiableMap(other.mutableExtensionsByName);
-    this.immutableExtensionsByNumber =
-        Collections.unmodifiableMap(other.immutableExtensionsByNumber);
-    this.mutableExtensionsByNumber = Collections.unmodifiableMap(other.mutableExtensionsByNumber);
-  }
-
-  private final Map<String, ExtensionInfo> immutableExtensionsByName;
-  private final Map<String, ExtensionInfo> mutableExtensionsByName;
-  private final Map<DescriptorIntPair, ExtensionInfo> immutableExtensionsByNumber;
-  private final Map<DescriptorIntPair, ExtensionInfo> mutableExtensionsByNumber;
-
-  ExtensionRegistry(boolean empty) {
-    super(EMPTY_REGISTRY_LITE);
-    this.immutableExtensionsByName = Collections.<String, ExtensionInfo>emptyMap();
-    this.mutableExtensionsByName = Collections.<String, ExtensionInfo>emptyMap();
-    this.immutableExtensionsByNumber = Collections.<DescriptorIntPair, ExtensionInfo>emptyMap();
-    this.mutableExtensionsByNumber = Collections.<DescriptorIntPair, ExtensionInfo>emptyMap();
-  }
-
-  static final ExtensionRegistry EMPTY_REGISTRY = new ExtensionRegistry(true);
-
-  private void add(final ExtensionInfo extension, final Extension.ExtensionType extensionType) {
-    if (!extension.descriptor.isExtension()) {
-      throw new IllegalArgumentException(
-          "ExtensionRegistry.add() was given a FieldDescriptor for a regular "
-              + "(non-extension) field.");
-    }
-
-    Map<String, ExtensionInfo> extensionsByName;
-    Map<DescriptorIntPair, ExtensionInfo> extensionsByNumber;
-    switch (extensionType) {
-      case IMMUTABLE:
-        extensionsByName = immutableExtensionsByName;
-        extensionsByNumber = immutableExtensionsByNumber;
-        break;
-      case MUTABLE:
-        extensionsByName = mutableExtensionsByName;
-        extensionsByNumber = mutableExtensionsByNumber;
-        break;
-      default:
-        // Ignore the unknown supported type.
-        return;
-    }
-
-    extensionsByName.put(extension.descriptor.getFullName(), extension);
-    extensionsByNumber.put(
-        new DescriptorIntPair(
-            extension.descriptor.getContainingType(), extension.descriptor.getNumber()),
-        extension);
-
-    final FieldDescriptor field = extension.descriptor;
-    if (field.getContainingType().getOptions().getMessageSetWireFormat()
-        && field.getType() == FieldDescriptor.Type.MESSAGE
-        && field.isOptional()
-        && field.getExtensionScope() == field.getMessageType()) {
-      // This is an extension of a MessageSet type defined within the extension
-      // type's own scope.  For backwards-compatibility, allow it to be looked
-      // up by type name.
-      extensionsByName.put(field.getMessageType().getFullName(), extension);
-    }
-  }
-
-  /** A (GenericDescriptor, int) pair, used as a map key. */
-  private static final class DescriptorIntPair {
-    private final Descriptor descriptor;
-    private final int number;
-
-    DescriptorIntPair(final Descriptor descriptor, final int number) {
-      this.descriptor = descriptor;
-      this.number = number;
-    }
-
-    @Override
-    public int hashCode() {
-      return descriptor.hashCode() * ((1 << 16) - 1) + number;
-    }
-
-    @Override
-    public boolean equals(final Object obj) {
-      if (!(obj instanceof DescriptorIntPair)) {
-        return false;
-      }
-      final DescriptorIntPair other = (DescriptorIntPair) obj;
-      return descriptor == other.descriptor && number == other.number;
-    }
-  }
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/ExtensionRegistryFactory.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/ExtensionRegistryFactory.java
deleted file mode 100644
index 0a63fad..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/ExtensionRegistryFactory.java
+++ /dev/null
@@ -1,91 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.protobuf.ExtensionRegistryLite.EMPTY_REGISTRY_LITE;
-
-/**
- * A factory object to create instances of {@link ExtensionRegistryLite}.
- *
- * <p>This factory detects (via reflection) if the full (non-Lite) protocol buffer libraries are
- * available, and if so, the instances returned are actually {@link ExtensionRegistry}.
- */
-final class ExtensionRegistryFactory {
-
-  static final String FULL_REGISTRY_CLASS_NAME = "com.google.protobuf.ExtensionRegistry";
-
-  /* Visible for Testing
-  @Nullable */
-  static final Class<?> EXTENSION_REGISTRY_CLASS = reflectExtensionRegistry();
-
-  static Class<?> reflectExtensionRegistry() {
-    try {
-      return Class.forName(FULL_REGISTRY_CLASS_NAME);
-    } catch (ClassNotFoundException e) {
-      // The exception allocation is potentially expensive on Android (where it can be triggered
-      // many times at start up). Is there a way to ameliorate this?
-      return null;
-    }
-  }
-
-  /** Construct a new, empty instance. */
-  public static ExtensionRegistryLite create() {
-    ExtensionRegistryLite result = invokeSubclassFactory("newInstance");
-
-    return result != null ? result : new ExtensionRegistryLite();
-  }
-
-  /** Get the unmodifiable singleton empty instance. */
-  public static ExtensionRegistryLite createEmpty() {
-    ExtensionRegistryLite result = invokeSubclassFactory("getEmptyRegistry");
-
-    return result != null ? result : EMPTY_REGISTRY_LITE;
-  }
-
-
-  static boolean isFullRegistry(ExtensionRegistryLite registry) {
-    return EXTENSION_REGISTRY_CLASS != null
-        && EXTENSION_REGISTRY_CLASS.isAssignableFrom(registry.getClass());
-  }
-
-  private static final ExtensionRegistryLite invokeSubclassFactory(String methodName) {
-    if (EXTENSION_REGISTRY_CLASS == null) {
-      return null;
-    }
-
-    try {
-      return (ExtensionRegistryLite)
-          EXTENSION_REGISTRY_CLASS.getDeclaredMethod(methodName).invoke(null);
-    } catch (Exception e) {
-      return null;
-    }
-  }
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/ExtensionRegistryLite.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/ExtensionRegistryLite.java
deleted file mode 100644
index caa58e1..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/ExtensionRegistryLite.java
+++ /dev/null
@@ -1,238 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Equivalent to {@link ExtensionRegistry} but supports only "lite" types.
- *
- * <p>If all of your types are lite types, then you only need to use {@code ExtensionRegistryLite}.
- * Similarly, if all your types are regular types, then you only need {@link ExtensionRegistry}.
- * Typically it does not make sense to mix the two, since if you have any regular types in your
- * program, you then require the full runtime and lose all the benefits of the lite runtime, so you
- * might as well make all your types be regular types. However, in some cases (e.g. when depending
- * on multiple third-party libraries where one uses lite types and one uses regular), you may find
- * yourself wanting to mix the two. In this case things get more complicated.
- *
- * <p>There are three factors to consider: Whether the type being extended is lite, whether the
- * embedded type (in the case of a message-typed extension) is lite, and whether the extension
- * itself is lite. Since all three are declared in different files, they could all be different.
- * Here are all the combinations and which type of registry to use:
- *
- * <pre>
- *   Extended type     Inner type    Extension         Use registry
- *   =======================================================================
- *   lite              lite          lite              ExtensionRegistryLite
- *   lite              regular       lite              ExtensionRegistry
- *   regular           regular       regular           ExtensionRegistry
- *   all other combinations                            not supported
- * </pre>
- *
- * <p>Note that just as regular types are not allowed to contain lite-type fields, they are also not
- * allowed to contain lite-type extensions. This is because regular types must be fully accessible
- * via reflection, which in turn means that all the inner messages must also support reflection. On
- * the other hand, since regular types implement the entire lite interface, there is no problem with
- * embedding regular types inside lite types.
- *
- * @author kenton@google.com Kenton Varda
- */
-public class ExtensionRegistryLite {
-
-  // Set true to enable lazy parsing feature for MessageSet.
-  //
-  // TODO(xiangl): Now we use a global flag to control whether enable lazy
-  // parsing feature for MessageSet, which may be too crude for some
-  // applications. Need to support this feature on smaller granularity.
-  private static volatile boolean eagerlyParseMessageSets = false;
-
-  // short circuit the ExtensionRegistryFactory via assumevalues trickery
-  @SuppressWarnings("JavaOptionalSuggestions")
-  private static boolean doFullRuntimeInheritanceCheck = true;
-
-  // Visible for testing.
-  static final String EXTENSION_CLASS_NAME = "com.google.protobuf.Extension";
-
-  private static class ExtensionClassHolder {
-    static final Class<?> INSTANCE = resolveExtensionClass();
-
-    static Class<?> resolveExtensionClass() {
-      try {
-        return Class.forName(EXTENSION_CLASS_NAME);
-      } catch (ClassNotFoundException e) {
-        // See comment in ExtensionRegistryFactory on the potential expense of this.
-        return null;
-      }
-    }
-  }
-
-  public static boolean isEagerlyParseMessageSets() {
-    return eagerlyParseMessageSets;
-  }
-
-  public static void setEagerlyParseMessageSets(boolean isEagerlyParse) {
-    eagerlyParseMessageSets = isEagerlyParse;
-  }
-
-  /**
-   * Construct a new, empty instance.
-   *
-   * <p>This may be an {@code ExtensionRegistry} if the full (non-Lite) proto libraries are
-   * available.
-   */
-  public static ExtensionRegistryLite newInstance() {
-    return doFullRuntimeInheritanceCheck
-        ? ExtensionRegistryFactory.create()
-        : new ExtensionRegistryLite();
-  }
-
-  private static volatile ExtensionRegistryLite emptyRegistry;
-
-  /**
-   * Get the unmodifiable singleton empty instance of either ExtensionRegistryLite or {@code
-   * ExtensionRegistry} (if the full (non-Lite) proto libraries are available).
-   */
-  public static ExtensionRegistryLite getEmptyRegistry() {
-    ExtensionRegistryLite result = emptyRegistry;
-    if (result == null) {
-      synchronized (ExtensionRegistryLite.class) {
-        result = emptyRegistry;
-        if (result == null) {
-          result =
-              emptyRegistry =
-                  doFullRuntimeInheritanceCheck
-                      ? ExtensionRegistryFactory.createEmpty()
-                      : EMPTY_REGISTRY_LITE;
-        }
-      }
-    }
-    return result;
-  }
-
-
-  /** Returns an unmodifiable view of the registry. */
-  public ExtensionRegistryLite getUnmodifiable() {
-    return new ExtensionRegistryLite(this);
-  }
-
-  /**
-   * Find an extension by containing type and field number.
-   *
-   * @return Information about the extension if found, or {@code null} otherwise.
-   */
-  @SuppressWarnings("unchecked")
-  public <ContainingType extends MessageLite>
-      GeneratedMessageLite.GeneratedExtension<ContainingType, ?> findLiteExtensionByNumber(
-          final ContainingType containingTypeDefaultInstance, final int fieldNumber) {
-    return (GeneratedMessageLite.GeneratedExtension<ContainingType, ?>)
-        extensionsByNumber.get(new ObjectIntPair(containingTypeDefaultInstance, fieldNumber));
-  }
-
-  /** Add an extension from a lite generated file to the registry. */
-  public final void add(final GeneratedMessageLite.GeneratedExtension<?, ?> extension) {
-    extensionsByNumber.put(
-        new ObjectIntPair(extension.getContainingTypeDefaultInstance(), extension.getNumber()),
-        extension);
-  }
-
-  /**
-   * Add an extension from a lite generated file to the registry only if it is a non-lite extension
-   * i.e. {@link GeneratedMessageLite.GeneratedExtension}.
-   */
-  public final void add(ExtensionLite<?, ?> extension) {
-    if (GeneratedMessageLite.GeneratedExtension.class.isAssignableFrom(extension.getClass())) {
-      add((GeneratedMessageLite.GeneratedExtension<?, ?>) extension);
-    }
-    if (doFullRuntimeInheritanceCheck && ExtensionRegistryFactory.isFullRegistry(this)) {
-      try {
-        this.getClass().getMethod("add", ExtensionClassHolder.INSTANCE).invoke(this, extension);
-      } catch (Exception e) {
-        throw new IllegalArgumentException(
-            String.format("Could not invoke ExtensionRegistry#add for %s", extension), e);
-      }
-    }
-  }
-
-  // =================================================================
-  // Private stuff.
-
-  // Constructors are package-private so that ExtensionRegistry can subclass
-  // this.
-
-  ExtensionRegistryLite() {
-    this.extensionsByNumber =
-        new HashMap<ObjectIntPair, GeneratedMessageLite.GeneratedExtension<?, ?>>();
-  }
-
-  static final ExtensionRegistryLite EMPTY_REGISTRY_LITE = new ExtensionRegistryLite(true);
-
-  ExtensionRegistryLite(ExtensionRegistryLite other) {
-    if (other == EMPTY_REGISTRY_LITE) {
-      this.extensionsByNumber = Collections.emptyMap();
-    } else {
-      this.extensionsByNumber = Collections.unmodifiableMap(other.extensionsByNumber);
-    }
-  }
-
-  private final Map<ObjectIntPair, GeneratedMessageLite.GeneratedExtension<?, ?>>
-      extensionsByNumber;
-
-  ExtensionRegistryLite(boolean empty) {
-    this.extensionsByNumber = Collections.emptyMap();
-  }
-
-  /** A (Object, int) pair, used as a map key. */
-  private static final class ObjectIntPair {
-    private final Object object;
-    private final int number;
-
-    ObjectIntPair(final Object object, final int number) {
-      this.object = object;
-      this.number = number;
-    }
-
-    @Override
-    public int hashCode() {
-      return System.identityHashCode(object) * ((1 << 16) - 1) + number;
-    }
-
-    @Override
-    public boolean equals(final Object obj) {
-      if (!(obj instanceof ObjectIntPair)) {
-        return false;
-      }
-      final ObjectIntPair other = (ObjectIntPair) obj;
-      return object == other.object && number == other.number;
-    }
-  }
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/ExtensionSchema.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/ExtensionSchema.java
deleted file mode 100644
index b707fef..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/ExtensionSchema.java
+++ /dev/null
@@ -1,100 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import java.io.IOException;
-import java.util.Map;
-
-@CheckReturnValue
-abstract class ExtensionSchema<T extends FieldSet.FieldDescriptorLite<T>> {
-
-  /** Returns true for messages that support extensions. */
-  abstract boolean hasExtensions(MessageLite prototype);
-
-  /** Returns the extension {@link FieldSet} for the message instance. */
-  abstract FieldSet<T> getExtensions(Object message);
-
-  /** Replaces the extension {@link FieldSet} for the message instance. */
-  abstract void setExtensions(Object message, FieldSet<T> extensions);
-
-  /** Returns the extension {@link FieldSet} and ensures it's mutable. */
-  abstract FieldSet<T> getMutableExtensions(Object message);
-
-  /** Marks the extension {@link FieldSet} as immutable. */
-  abstract void makeImmutable(Object message);
-
-  /**
-   * Parses an extension. Returns the passed-in unknownFields parameter if no unknown enum value is
-   * found or a modified unknownFields (a new instance if the passed-in unknownFields is null)
-   * containing unknown enum values found while parsing.
-   *
-   * @param <UT> The type used to store unknown fields. It's either UnknownFieldSet in full runtime
-   *     or UnknownFieldSetLite in lite runtime.
-   */
-  abstract <UT, UB> UB parseExtension(
-      Object containerMessage,
-      Reader reader,
-      Object extension,
-      ExtensionRegistryLite extensionRegistry,
-      FieldSet<T> extensions,
-      UB unknownFields,
-      UnknownFieldSchema<UT, UB> unknownFieldSchema)
-      throws IOException;
-
-  /** Gets the field number of an extension entry. */
-  abstract int extensionNumber(Map.Entry<?, ?> extension);
-
-  /** Serializes one extension entry. */
-  abstract void serializeExtension(Writer writer, Map.Entry<?, ?> extension) throws IOException;
-
-  /** Finds an extension by field number. */
-  abstract Object findExtensionByNumber(
-      ExtensionRegistryLite extensionRegistry, MessageLite defaultInstance, int number);
-
-  /** Parses a length-prefixed MessageSet item from the reader. */
-  abstract void parseLengthPrefixedMessageSetItem(
-      Reader reader,
-      Object extension,
-      ExtensionRegistryLite extensionRegistry,
-      FieldSet<T> extensions)
-      throws IOException;
-
-  /**
-   * Parses the entire content of a {@link ByteString} as one MessageSet item. Unlike {@link
-   * #parseLengthPrefixedMessageSetItem}, there isn't a length-prefix.
-   */
-  abstract void parseMessageSetItem(
-      ByteString data,
-      Object extension,
-      ExtensionRegistryLite extensionRegistry,
-      FieldSet<T> extensions)
-      throws IOException;
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/ExtensionSchemaFull.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/ExtensionSchemaFull.java
deleted file mode 100644
index c5e64a0..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/ExtensionSchemaFull.java
+++ /dev/null
@@ -1,548 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import com.google.protobuf.Descriptors.EnumValueDescriptor;
-import com.google.protobuf.Descriptors.FieldDescriptor;
-import java.io.IOException;
-import java.lang.reflect.Field;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-@SuppressWarnings("unchecked")
-final class ExtensionSchemaFull extends ExtensionSchema<FieldDescriptor> {
-
-  private static final long EXTENSION_FIELD_OFFSET = getExtensionsFieldOffset();
-
-  private static <T> long getExtensionsFieldOffset() {
-    try {
-      Field field = GeneratedMessageV3.ExtendableMessage.class.getDeclaredField("extensions");
-      return UnsafeUtil.objectFieldOffset(field);
-    } catch (Throwable e) {
-      throw new IllegalStateException("Unable to lookup extension field offset");
-    }
-  }
-
-  @Override
-  boolean hasExtensions(MessageLite prototype) {
-    return prototype instanceof GeneratedMessageV3.ExtendableMessage;
-  }
-
-  @Override
-  public FieldSet<FieldDescriptor> getExtensions(Object message) {
-    return (FieldSet<FieldDescriptor>) UnsafeUtil.getObject(message, EXTENSION_FIELD_OFFSET);
-  }
-
-  @Override
-  void setExtensions(Object message, FieldSet<FieldDescriptor> extensions) {
-    UnsafeUtil.putObject(message, EXTENSION_FIELD_OFFSET, extensions);
-  }
-
-  @Override
-  FieldSet<FieldDescriptor> getMutableExtensions(Object message) {
-    FieldSet<FieldDescriptor> extensions = getExtensions(message);
-    if (extensions.isImmutable()) {
-      extensions = extensions.clone();
-      setExtensions(message, extensions);
-    }
-    return extensions;
-  }
-
-  @Override
-  void makeImmutable(Object message) {
-    getExtensions(message).makeImmutable();
-  }
-
-  @Override
-  <UT, UB> UB parseExtension(
-      Object containerMessage,
-      Reader reader,
-      Object extensionObject,
-      ExtensionRegistryLite extensionRegistry,
-      FieldSet<FieldDescriptor> extensions,
-      UB unknownFields,
-      UnknownFieldSchema<UT, UB> unknownFieldSchema)
-      throws IOException {
-    ExtensionRegistry.ExtensionInfo extension = (ExtensionRegistry.ExtensionInfo) extensionObject;
-    int fieldNumber = extension.descriptor.getNumber();
-
-    if (extension.descriptor.isRepeated() && extension.descriptor.isPacked()) {
-      Object value = null;
-      switch (extension.descriptor.getLiteType()) {
-        case DOUBLE:
-          {
-            List<Double> list = new ArrayList<Double>();
-            reader.readDoubleList(list);
-            value = list;
-            break;
-          }
-        case FLOAT:
-          {
-            List<Float> list = new ArrayList<Float>();
-            reader.readFloatList(list);
-            value = list;
-            break;
-          }
-        case INT64:
-          {
-            List<Long> list = new ArrayList<Long>();
-            reader.readInt64List(list);
-            value = list;
-            break;
-          }
-        case UINT64:
-          {
-            List<Long> list = new ArrayList<Long>();
-            reader.readUInt64List(list);
-            value = list;
-            break;
-          }
-        case INT32:
-          {
-            List<Integer> list = new ArrayList<Integer>();
-            reader.readInt32List(list);
-            value = list;
-            break;
-          }
-        case FIXED64:
-          {
-            List<Long> list = new ArrayList<Long>();
-            reader.readFixed64List(list);
-            value = list;
-            break;
-          }
-        case FIXED32:
-          {
-            List<Integer> list = new ArrayList<Integer>();
-            reader.readFixed32List(list);
-            value = list;
-            break;
-          }
-        case BOOL:
-          {
-            List<Boolean> list = new ArrayList<Boolean>();
-            reader.readBoolList(list);
-            value = list;
-            break;
-          }
-        case UINT32:
-          {
-            List<Integer> list = new ArrayList<Integer>();
-            reader.readUInt32List(list);
-            value = list;
-            break;
-          }
-        case SFIXED32:
-          {
-            List<Integer> list = new ArrayList<Integer>();
-            reader.readSFixed32List(list);
-            value = list;
-            break;
-          }
-        case SFIXED64:
-          {
-            List<Long> list = new ArrayList<Long>();
-            reader.readSFixed64List(list);
-            value = list;
-            break;
-          }
-        case SINT32:
-          {
-            List<Integer> list = new ArrayList<Integer>();
-            reader.readSInt32List(list);
-            value = list;
-            break;
-          }
-        case SINT64:
-          {
-            List<Long> list = new ArrayList<Long>();
-            reader.readSInt64List(list);
-            value = list;
-            break;
-          }
-        case ENUM:
-          {
-            List<Integer> list = new ArrayList<Integer>();
-            reader.readEnumList(list);
-            List<EnumValueDescriptor> enumList = new ArrayList<EnumValueDescriptor>();
-            for (int number : list) {
-              EnumValueDescriptor enumDescriptor =
-                  extension.descriptor.getEnumType().findValueByNumber(number);
-              if (enumDescriptor != null) {
-                enumList.add(enumDescriptor);
-              } else {
-                unknownFields =
-                    SchemaUtil.storeUnknownEnum(
-                        containerMessage, fieldNumber, number, unknownFields, unknownFieldSchema);
-              }
-            }
-            value = enumList;
-            break;
-          }
-        default:
-          throw new IllegalStateException(
-              "Type cannot be packed: " + extension.descriptor.getLiteType());
-      }
-      extensions.setField(extension.descriptor, value);
-    } else {
-      Object value = null;
-      // Enum is a special case because unknown enum values will be put into UnknownFieldSetLite.
-      if (extension.descriptor.getLiteType() == WireFormat.FieldType.ENUM) {
-        int number = reader.readInt32();
-        Object enumValue = extension.descriptor.getEnumType().findValueByNumber(number);
-        if (enumValue == null) {
-          return SchemaUtil.storeUnknownEnum(
-              containerMessage, fieldNumber, number, unknownFields, unknownFieldSchema);
-        }
-        value = enumValue;
-      } else {
-        switch (extension.descriptor.getLiteType()) {
-          case DOUBLE:
-            value = reader.readDouble();
-            break;
-          case FLOAT:
-            value = reader.readFloat();
-            break;
-          case INT64:
-            value = reader.readInt64();
-            break;
-          case UINT64:
-            value = reader.readUInt64();
-            break;
-          case INT32:
-            value = reader.readInt32();
-            break;
-          case FIXED64:
-            value = reader.readFixed64();
-            break;
-          case FIXED32:
-            value = reader.readFixed32();
-            break;
-          case BOOL:
-            value = reader.readBool();
-            break;
-          case BYTES:
-            value = reader.readBytes();
-            break;
-          case UINT32:
-            value = reader.readUInt32();
-            break;
-          case SFIXED32:
-            value = reader.readSFixed32();
-            break;
-          case SFIXED64:
-            value = reader.readSFixed64();
-            break;
-          case SINT32:
-            value = reader.readSInt32();
-            break;
-          case SINT64:
-            value = reader.readSInt64();
-            break;
-
-          case STRING:
-            value = reader.readString();
-            break;
-          case GROUP:
-            value = reader.readGroup(extension.defaultInstance.getClass(), extensionRegistry);
-            break;
-
-          case MESSAGE:
-            value = reader.readMessage(extension.defaultInstance.getClass(), extensionRegistry);
-            break;
-
-          case ENUM:
-            throw new IllegalStateException("Shouldn't reach here.");
-        }
-      }
-      if (extension.descriptor.isRepeated()) {
-        extensions.addRepeatedField(extension.descriptor, value);
-      } else {
-        switch (extension.descriptor.getLiteType()) {
-          case MESSAGE:
-          case GROUP:
-            Object oldValue = extensions.getField(extension.descriptor);
-            if (oldValue != null) {
-              value = Internal.mergeMessage(oldValue, value);
-            }
-            break;
-          default:
-            break;
-        }
-        extensions.setField(extension.descriptor, value);
-      }
-    }
-    return unknownFields;
-  }
-
-  @Override
-  int extensionNumber(Map.Entry<?, ?> extension) {
-    FieldDescriptor descriptor = (FieldDescriptor) extension.getKey();
-    return descriptor.getNumber();
-  }
-
-  @Override
-  void serializeExtension(Writer writer, Map.Entry<?, ?> extension) throws IOException {
-    FieldDescriptor descriptor = (FieldDescriptor) extension.getKey();
-    if (descriptor.isRepeated()) {
-      switch (descriptor.getLiteType()) {
-        case DOUBLE:
-          SchemaUtil.writeDoubleList(
-              descriptor.getNumber(),
-              (List<Double>) extension.getValue(),
-              writer,
-              descriptor.isPacked());
-          break;
-        case FLOAT:
-          SchemaUtil.writeFloatList(
-              descriptor.getNumber(),
-              (List<Float>) extension.getValue(),
-              writer,
-              descriptor.isPacked());
-          break;
-        case INT64:
-          SchemaUtil.writeInt64List(
-              descriptor.getNumber(),
-              (List<Long>) extension.getValue(),
-              writer,
-              descriptor.isPacked());
-          break;
-        case UINT64:
-          SchemaUtil.writeUInt64List(
-              descriptor.getNumber(),
-              (List<Long>) extension.getValue(),
-              writer,
-              descriptor.isPacked());
-          break;
-        case INT32:
-          SchemaUtil.writeInt32List(
-              descriptor.getNumber(),
-              (List<Integer>) extension.getValue(),
-              writer,
-              descriptor.isPacked());
-          break;
-        case FIXED64:
-          SchemaUtil.writeFixed64List(
-              descriptor.getNumber(),
-              (List<Long>) extension.getValue(),
-              writer,
-              descriptor.isPacked());
-          break;
-        case FIXED32:
-          SchemaUtil.writeFixed32List(
-              descriptor.getNumber(),
-              (List<Integer>) extension.getValue(),
-              writer,
-              descriptor.isPacked());
-          break;
-        case BOOL:
-          SchemaUtil.writeBoolList(
-              descriptor.getNumber(),
-              (List<Boolean>) extension.getValue(),
-              writer,
-              descriptor.isPacked());
-          break;
-        case BYTES:
-          SchemaUtil.writeBytesList(
-              descriptor.getNumber(), (List<ByteString>) extension.getValue(), writer);
-          break;
-        case UINT32:
-          SchemaUtil.writeUInt32List(
-              descriptor.getNumber(),
-              (List<Integer>) extension.getValue(),
-              writer,
-              descriptor.isPacked());
-          break;
-        case SFIXED32:
-          SchemaUtil.writeSFixed32List(
-              descriptor.getNumber(),
-              (List<Integer>) extension.getValue(),
-              writer,
-              descriptor.isPacked());
-          break;
-        case SFIXED64:
-          SchemaUtil.writeSFixed64List(
-              descriptor.getNumber(),
-              (List<Long>) extension.getValue(),
-              writer,
-              descriptor.isPacked());
-          break;
-        case SINT32:
-          SchemaUtil.writeSInt32List(
-              descriptor.getNumber(),
-              (List<Integer>) extension.getValue(),
-              writer,
-              descriptor.isPacked());
-          break;
-        case SINT64:
-          SchemaUtil.writeSInt64List(
-              descriptor.getNumber(),
-              (List<Long>) extension.getValue(),
-              writer,
-              descriptor.isPacked());
-          break;
-        case ENUM:
-          {
-            List<EnumValueDescriptor> enumList = (List<EnumValueDescriptor>) extension.getValue();
-            List<Integer> list = new ArrayList<Integer>();
-            for (EnumValueDescriptor d : enumList) {
-              list.add(d.getNumber());
-            }
-            SchemaUtil.writeInt32List(descriptor.getNumber(), list, writer, descriptor.isPacked());
-            break;
-          }
-        case STRING:
-          SchemaUtil.writeStringList(
-              descriptor.getNumber(), (List<String>) extension.getValue(), writer);
-          break;
-        case GROUP:
-          SchemaUtil.writeGroupList(descriptor.getNumber(), (List<?>) extension.getValue(), writer);
-          break;
-        case MESSAGE:
-          SchemaUtil.writeMessageList(
-              descriptor.getNumber(), (List<?>) extension.getValue(), writer);
-          break;
-      }
-    } else {
-      switch (descriptor.getLiteType()) {
-        case DOUBLE:
-          writer.writeDouble(descriptor.getNumber(), (Double) extension.getValue());
-          break;
-        case FLOAT:
-          writer.writeFloat(descriptor.getNumber(), (Float) extension.getValue());
-          break;
-        case INT64:
-          writer.writeInt64(descriptor.getNumber(), (Long) extension.getValue());
-          break;
-        case UINT64:
-          writer.writeUInt64(descriptor.getNumber(), (Long) extension.getValue());
-          break;
-        case INT32:
-          writer.writeInt32(descriptor.getNumber(), (Integer) extension.getValue());
-          break;
-        case FIXED64:
-          writer.writeFixed64(descriptor.getNumber(), (Long) extension.getValue());
-          break;
-        case FIXED32:
-          writer.writeFixed32(descriptor.getNumber(), (Integer) extension.getValue());
-          break;
-        case BOOL:
-          writer.writeBool(descriptor.getNumber(), (Boolean) extension.getValue());
-          break;
-        case BYTES:
-          writer.writeBytes(descriptor.getNumber(), (ByteString) extension.getValue());
-          break;
-        case UINT32:
-          writer.writeUInt32(descriptor.getNumber(), (Integer) extension.getValue());
-          break;
-        case SFIXED32:
-          writer.writeSFixed32(descriptor.getNumber(), (Integer) extension.getValue());
-          break;
-        case SFIXED64:
-          writer.writeSFixed64(descriptor.getNumber(), (Long) extension.getValue());
-          break;
-        case SINT32:
-          writer.writeSInt32(descriptor.getNumber(), (Integer) extension.getValue());
-          break;
-        case SINT64:
-          writer.writeSInt64(descriptor.getNumber(), (Long) extension.getValue());
-          break;
-        case ENUM:
-          writer.writeInt32(
-              descriptor.getNumber(), ((EnumValueDescriptor) extension.getValue()).getNumber());
-          break;
-        case STRING:
-          writer.writeString(descriptor.getNumber(), (String) extension.getValue());
-          break;
-        case GROUP:
-          writer.writeGroup(descriptor.getNumber(), extension.getValue());
-          break;
-        case MESSAGE:
-          writer.writeMessage(descriptor.getNumber(), extension.getValue());
-          break;
-      }
-    }
-  }
-
-  @Override
-  Object findExtensionByNumber(
-      ExtensionRegistryLite extensionRegistry, MessageLite defaultInstance, int number) {
-    return ((ExtensionRegistry) extensionRegistry)
-        .findImmutableExtensionByNumber(((Message) defaultInstance).getDescriptorForType(), number);
-  }
-
-  @Override
-  void parseLengthPrefixedMessageSetItem(
-      Reader reader,
-      Object extension,
-      ExtensionRegistryLite extensionRegistry,
-      FieldSet<FieldDescriptor> extensions)
-      throws IOException {
-    ExtensionRegistry.ExtensionInfo extensionInfo = (ExtensionRegistry.ExtensionInfo) extension;
-
-    if (ExtensionRegistryLite.isEagerlyParseMessageSets()) {
-      Object value =
-          reader.readMessage(extensionInfo.defaultInstance.getClass(), extensionRegistry);
-      extensions.setField(extensionInfo.descriptor, value);
-    } else {
-      extensions.setField(
-          extensionInfo.descriptor,
-          new LazyField(extensionInfo.defaultInstance, extensionRegistry, reader.readBytes()));
-    }
-  }
-
-  @Override
-  void parseMessageSetItem(
-      ByteString data,
-      Object extension,
-      ExtensionRegistryLite extensionRegistry,
-      FieldSet<FieldDescriptor> extensions)
-      throws IOException {
-    ExtensionRegistry.ExtensionInfo extensionInfo = (ExtensionRegistry.ExtensionInfo) extension;
-    Object value = extensionInfo.defaultInstance.newBuilderForType().buildPartial();
-
-    if (ExtensionRegistryLite.isEagerlyParseMessageSets()) {
-      Reader reader = BinaryReader.newInstance(ByteBuffer.wrap(data.toByteArray()), true);
-      Protobuf.getInstance().mergeFrom(value, reader, extensionRegistry);
-      extensions.setField(extensionInfo.descriptor, value);
-
-      if (reader.getFieldNumber() != Reader.READ_DONE) {
-        throw InvalidProtocolBufferException.invalidEndTag();
-      }
-    } else {
-      extensions.setField(
-          extensionInfo.descriptor,
-          new LazyField(extensionInfo.defaultInstance, extensionRegistry, data));
-    }
-  }
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/ExtensionSchemaLite.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/ExtensionSchemaLite.java
deleted file mode 100644
index 19cad5f..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/ExtensionSchemaLite.java
+++ /dev/null
@@ -1,576 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import com.google.protobuf.GeneratedMessageLite.ExtensionDescriptor;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-@CheckReturnValue
-@SuppressWarnings("unchecked")
-final class ExtensionSchemaLite extends ExtensionSchema<ExtensionDescriptor> {
-
-  @Override
-  boolean hasExtensions(MessageLite prototype) {
-    return prototype instanceof GeneratedMessageLite.ExtendableMessage;
-  }
-
-  @Override
-  FieldSet<ExtensionDescriptor> getExtensions(Object message) {
-    return ((GeneratedMessageLite.ExtendableMessage<?, ?>) message).extensions;
-  }
-
-  @Override
-  void setExtensions(Object message, FieldSet<ExtensionDescriptor> extensions) {
-    ((GeneratedMessageLite.ExtendableMessage<?, ?>) message).extensions = extensions;
-  }
-
-  @Override
-  FieldSet<ExtensionDescriptor> getMutableExtensions(Object message) {
-    return ((GeneratedMessageLite.ExtendableMessage<?, ?>) message).ensureExtensionsAreMutable();
-  }
-
-  @Override
-  void makeImmutable(Object message) {
-    getExtensions(message).makeImmutable();
-  }
-
-  @Override
-  <UT, UB> UB parseExtension(
-      Object containerMessage,
-      Reader reader,
-      Object extensionObject,
-      ExtensionRegistryLite extensionRegistry,
-      FieldSet<ExtensionDescriptor> extensions,
-      UB unknownFields,
-      UnknownFieldSchema<UT, UB> unknownFieldSchema)
-      throws IOException {
-    GeneratedMessageLite.GeneratedExtension<?, ?> extension =
-        (GeneratedMessageLite.GeneratedExtension<?, ?>) extensionObject;
-    int fieldNumber = extension.getNumber();
-
-    if (extension.descriptor.isRepeated() && extension.descriptor.isPacked()) {
-      Object value = null;
-      switch (extension.getLiteType()) {
-        case DOUBLE:
-          {
-            List<Double> list = new ArrayList<Double>();
-            reader.readDoubleList(list);
-            value = list;
-            break;
-          }
-        case FLOAT:
-          {
-            List<Float> list = new ArrayList<Float>();
-            reader.readFloatList(list);
-            value = list;
-            break;
-          }
-        case INT64:
-          {
-            List<Long> list = new ArrayList<Long>();
-            reader.readInt64List(list);
-            value = list;
-            break;
-          }
-        case UINT64:
-          {
-            List<Long> list = new ArrayList<Long>();
-            reader.readUInt64List(list);
-            value = list;
-            break;
-          }
-        case INT32:
-          {
-            List<Integer> list = new ArrayList<Integer>();
-            reader.readInt32List(list);
-            value = list;
-            break;
-          }
-        case FIXED64:
-          {
-            List<Long> list = new ArrayList<Long>();
-            reader.readFixed64List(list);
-            value = list;
-            break;
-          }
-        case FIXED32:
-          {
-            List<Integer> list = new ArrayList<Integer>();
-            reader.readFixed32List(list);
-            value = list;
-            break;
-          }
-        case BOOL:
-          {
-            List<Boolean> list = new ArrayList<Boolean>();
-            reader.readBoolList(list);
-            value = list;
-            break;
-          }
-        case UINT32:
-          {
-            List<Integer> list = new ArrayList<Integer>();
-            reader.readUInt32List(list);
-            value = list;
-            break;
-          }
-        case SFIXED32:
-          {
-            List<Integer> list = new ArrayList<Integer>();
-            reader.readSFixed32List(list);
-            value = list;
-            break;
-          }
-        case SFIXED64:
-          {
-            List<Long> list = new ArrayList<Long>();
-            reader.readSFixed64List(list);
-            value = list;
-            break;
-          }
-        case SINT32:
-          {
-            List<Integer> list = new ArrayList<Integer>();
-            reader.readSInt32List(list);
-            value = list;
-            break;
-          }
-        case SINT64:
-          {
-            List<Long> list = new ArrayList<Long>();
-            reader.readSInt64List(list);
-            value = list;
-            break;
-          }
-        case ENUM:
-          {
-            List<Integer> list = new ArrayList<Integer>();
-            reader.readEnumList(list);
-            unknownFields =
-                SchemaUtil.filterUnknownEnumList(
-                    containerMessage,
-                    fieldNumber,
-                    list,
-                    extension.descriptor.getEnumType(),
-                    unknownFields,
-                    unknownFieldSchema);
-            value = list;
-            break;
-          }
-        default:
-          throw new IllegalStateException(
-              "Type cannot be packed: " + extension.descriptor.getLiteType());
-      }
-      extensions.setField(extension.descriptor, value);
-    } else {
-      Object value = null;
-      // Enum is a special case because unknown enum values will be put into UnknownFieldSetLite.
-      if (extension.getLiteType() == WireFormat.FieldType.ENUM) {
-        int number = reader.readInt32();
-        Object enumValue = extension.descriptor.getEnumType().findValueByNumber(number);
-        if (enumValue == null) {
-          return SchemaUtil.storeUnknownEnum(
-              containerMessage, fieldNumber, number, unknownFields, unknownFieldSchema);
-        }
-        // Note, we store the integer value instead of the actual enum object in FieldSet.
-        // This is also different from full-runtime where we store EnumValueDescriptor.
-        value = number;
-      } else {
-        switch (extension.getLiteType()) {
-          case DOUBLE:
-            value = reader.readDouble();
-            break;
-          case FLOAT:
-            value = reader.readFloat();
-            break;
-          case INT64:
-            value = reader.readInt64();
-            break;
-          case UINT64:
-            value = reader.readUInt64();
-            break;
-          case INT32:
-            value = reader.readInt32();
-            break;
-          case FIXED64:
-            value = reader.readFixed64();
-            break;
-          case FIXED32:
-            value = reader.readFixed32();
-            break;
-          case BOOL:
-            value = reader.readBool();
-            break;
-          case BYTES:
-            value = reader.readBytes();
-            break;
-          case UINT32:
-            value = reader.readUInt32();
-            break;
-          case SFIXED32:
-            value = reader.readSFixed32();
-            break;
-          case SFIXED64:
-            value = reader.readSFixed64();
-            break;
-          case SINT32:
-            value = reader.readSInt32();
-            break;
-          case SINT64:
-            value = reader.readSInt64();
-            break;
-
-          case STRING:
-            value = reader.readString();
-            break;
-          case GROUP:
-            // Special case handling for non-repeated sub-messages: merge in-place rather than
-            // building up new sub-messages and merging those, which is too slow.
-            // TODO(b/249368670): clean this up
-            if (!extension.isRepeated()) {
-              Object oldValue = extensions.getField(extension.descriptor);
-              if (oldValue instanceof GeneratedMessageLite) {
-                Schema extSchema = Protobuf.getInstance().schemaFor(oldValue);
-                if (!((GeneratedMessageLite<?, ?>) oldValue).isMutable()) {
-                  Object newValue = extSchema.newInstance();
-                  extSchema.mergeFrom(newValue, oldValue);
-                  extensions.setField(extension.descriptor, newValue);
-                  oldValue = newValue;
-                }
-                reader.mergeGroupField(oldValue, extSchema, extensionRegistry);
-                return unknownFields;
-              }
-            }
-            value =
-                reader.readGroup(
-                    extension.getMessageDefaultInstance().getClass(), extensionRegistry);
-            break;
-
-          case MESSAGE:
-            // Special case handling for non-repeated sub-messages: merge in-place rather than
-            // building up new sub-messages and merging those, which is too slow.
-            // TODO(b/249368670): clean this up
-            if (!extension.isRepeated()) {
-              Object oldValue = extensions.getField(extension.descriptor);
-              if (oldValue instanceof GeneratedMessageLite) {
-                Schema extSchema = Protobuf.getInstance().schemaFor(oldValue);
-                if (!((GeneratedMessageLite<?, ?>) oldValue).isMutable()) {
-                  Object newValue = extSchema.newInstance();
-                  extSchema.mergeFrom(newValue, oldValue);
-                  extensions.setField(extension.descriptor, newValue);
-                  oldValue = newValue;
-                }
-                reader.mergeMessageField(oldValue, extSchema, extensionRegistry);
-                return unknownFields;
-              }
-            }
-            value =
-                reader.readMessage(
-                    extension.getMessageDefaultInstance().getClass(), extensionRegistry);
-            break;
-
-          case ENUM:
-            throw new IllegalStateException("Shouldn't reach here.");
-        }
-      }
-      if (extension.isRepeated()) {
-        extensions.addRepeatedField(extension.descriptor, value);
-      } else {
-        switch (extension.getLiteType()) {
-          case MESSAGE:
-          case GROUP:
-            // TODO(b/249368670): this shouldn't be reachable, clean this up
-            Object oldValue = extensions.getField(extension.descriptor);
-            if (oldValue != null) {
-              value = Internal.mergeMessage(oldValue, value);
-            }
-            break;
-          default:
-            break;
-        }
-        extensions.setField(extension.descriptor, value);
-      }
-    }
-    return unknownFields;
-  }
-
-  @Override
-  int extensionNumber(Map.Entry<?, ?> extension) {
-    GeneratedMessageLite.ExtensionDescriptor descriptor =
-        (GeneratedMessageLite.ExtensionDescriptor) extension.getKey();
-    return descriptor.getNumber();
-  }
-
-  @Override
-  void serializeExtension(Writer writer, Map.Entry<?, ?> extension) throws IOException {
-    GeneratedMessageLite.ExtensionDescriptor descriptor =
-        (GeneratedMessageLite.ExtensionDescriptor) extension.getKey();
-    if (descriptor.isRepeated()) {
-      switch (descriptor.getLiteType()) {
-        case DOUBLE:
-          SchemaUtil.writeDoubleList(
-              descriptor.getNumber(),
-              (List<Double>) extension.getValue(),
-              writer,
-              descriptor.isPacked());
-          break;
-        case FLOAT:
-          SchemaUtil.writeFloatList(
-              descriptor.getNumber(),
-              (List<Float>) extension.getValue(),
-              writer,
-              descriptor.isPacked());
-          break;
-        case INT64:
-          SchemaUtil.writeInt64List(
-              descriptor.getNumber(),
-              (List<Long>) extension.getValue(),
-              writer,
-              descriptor.isPacked());
-          break;
-        case UINT64:
-          SchemaUtil.writeUInt64List(
-              descriptor.getNumber(),
-              (List<Long>) extension.getValue(),
-              writer,
-              descriptor.isPacked());
-          break;
-        case INT32:
-          SchemaUtil.writeInt32List(
-              descriptor.getNumber(),
-              (List<Integer>) extension.getValue(),
-              writer,
-              descriptor.isPacked());
-          break;
-        case FIXED64:
-          SchemaUtil.writeFixed64List(
-              descriptor.getNumber(),
-              (List<Long>) extension.getValue(),
-              writer,
-              descriptor.isPacked());
-          break;
-        case FIXED32:
-          SchemaUtil.writeFixed32List(
-              descriptor.getNumber(),
-              (List<Integer>) extension.getValue(),
-              writer,
-              descriptor.isPacked());
-          break;
-        case BOOL:
-          SchemaUtil.writeBoolList(
-              descriptor.getNumber(),
-              (List<Boolean>) extension.getValue(),
-              writer,
-              descriptor.isPacked());
-          break;
-        case BYTES:
-          SchemaUtil.writeBytesList(
-              descriptor.getNumber(), (List<ByteString>) extension.getValue(), writer);
-          break;
-        case UINT32:
-          SchemaUtil.writeUInt32List(
-              descriptor.getNumber(),
-              (List<Integer>) extension.getValue(),
-              writer,
-              descriptor.isPacked());
-          break;
-        case SFIXED32:
-          SchemaUtil.writeSFixed32List(
-              descriptor.getNumber(),
-              (List<Integer>) extension.getValue(),
-              writer,
-              descriptor.isPacked());
-          break;
-        case SFIXED64:
-          SchemaUtil.writeSFixed64List(
-              descriptor.getNumber(),
-              (List<Long>) extension.getValue(),
-              writer,
-              descriptor.isPacked());
-          break;
-        case SINT32:
-          SchemaUtil.writeSInt32List(
-              descriptor.getNumber(),
-              (List<Integer>) extension.getValue(),
-              writer,
-              descriptor.isPacked());
-          break;
-        case SINT64:
-          SchemaUtil.writeSInt64List(
-              descriptor.getNumber(),
-              (List<Long>) extension.getValue(),
-              writer,
-              descriptor.isPacked());
-          break;
-        case ENUM:
-          SchemaUtil.writeInt32List(
-              descriptor.getNumber(),
-              (List<Integer>) extension.getValue(),
-              writer,
-              descriptor.isPacked());
-          break;
-        case STRING:
-          SchemaUtil.writeStringList(
-              descriptor.getNumber(), (List<String>) extension.getValue(), writer);
-          break;
-        case GROUP:
-          {
-            List<?> data = (List<?>) extension.getValue();
-            if (data != null && !data.isEmpty()) {
-              SchemaUtil.writeGroupList(
-                  descriptor.getNumber(),
-                  (List<?>) extension.getValue(),
-                  writer,
-                  Protobuf.getInstance().schemaFor(data.get(0).getClass()));
-            }
-          }
-          break;
-        case MESSAGE:
-          {
-            List<?> data = (List<?>) extension.getValue();
-            if (data != null && !data.isEmpty()) {
-              SchemaUtil.writeMessageList(
-                  descriptor.getNumber(),
-                  (List<?>) extension.getValue(),
-                  writer,
-                  Protobuf.getInstance().schemaFor(data.get(0).getClass()));
-            }
-          }
-          break;
-      }
-    } else {
-      switch (descriptor.getLiteType()) {
-        case DOUBLE:
-          writer.writeDouble(descriptor.getNumber(), (Double) extension.getValue());
-          break;
-        case FLOAT:
-          writer.writeFloat(descriptor.getNumber(), (Float) extension.getValue());
-          break;
-        case INT64:
-          writer.writeInt64(descriptor.getNumber(), (Long) extension.getValue());
-          break;
-        case UINT64:
-          writer.writeUInt64(descriptor.getNumber(), (Long) extension.getValue());
-          break;
-        case INT32:
-          writer.writeInt32(descriptor.getNumber(), (Integer) extension.getValue());
-          break;
-        case FIXED64:
-          writer.writeFixed64(descriptor.getNumber(), (Long) extension.getValue());
-          break;
-        case FIXED32:
-          writer.writeFixed32(descriptor.getNumber(), (Integer) extension.getValue());
-          break;
-        case BOOL:
-          writer.writeBool(descriptor.getNumber(), (Boolean) extension.getValue());
-          break;
-        case BYTES:
-          writer.writeBytes(descriptor.getNumber(), (ByteString) extension.getValue());
-          break;
-        case UINT32:
-          writer.writeUInt32(descriptor.getNumber(), (Integer) extension.getValue());
-          break;
-        case SFIXED32:
-          writer.writeSFixed32(descriptor.getNumber(), (Integer) extension.getValue());
-          break;
-        case SFIXED64:
-          writer.writeSFixed64(descriptor.getNumber(), (Long) extension.getValue());
-          break;
-        case SINT32:
-          writer.writeSInt32(descriptor.getNumber(), (Integer) extension.getValue());
-          break;
-        case SINT64:
-          writer.writeSInt64(descriptor.getNumber(), (Long) extension.getValue());
-          break;
-        case ENUM:
-          writer.writeInt32(descriptor.getNumber(), (Integer) extension.getValue());
-          break;
-        case STRING:
-          writer.writeString(descriptor.getNumber(), (String) extension.getValue());
-          break;
-        case GROUP:
-          writer.writeGroup(
-              descriptor.getNumber(),
-              extension.getValue(),
-              Protobuf.getInstance().schemaFor(extension.getValue().getClass()));
-          break;
-        case MESSAGE:
-          writer.writeMessage(
-              descriptor.getNumber(),
-              extension.getValue(),
-              Protobuf.getInstance().schemaFor(extension.getValue().getClass()));
-          break;
-      }
-    }
-  }
-
-  @Override
-  Object findExtensionByNumber(
-      ExtensionRegistryLite extensionRegistry, MessageLite defaultInstance, int number) {
-    return extensionRegistry.findLiteExtensionByNumber(defaultInstance, number);
-  }
-
-  @Override
-  void parseLengthPrefixedMessageSetItem(
-      Reader reader,
-      Object extensionObject,
-      ExtensionRegistryLite extensionRegistry,
-      FieldSet<ExtensionDescriptor> extensions)
-      throws IOException {
-    GeneratedMessageLite.GeneratedExtension<?, ?> extension =
-        (GeneratedMessageLite.GeneratedExtension<?, ?>) extensionObject;
-    Object value =
-        reader.readMessage(extension.getMessageDefaultInstance().getClass(), extensionRegistry);
-    extensions.setField(extension.descriptor, value);
-  }
-
-  @Override
-  void parseMessageSetItem(
-      ByteString data,
-      Object extensionObject,
-      ExtensionRegistryLite extensionRegistry,
-      FieldSet<ExtensionDescriptor> extensions)
-      throws IOException {
-    GeneratedMessageLite.GeneratedExtension<?, ?> extension =
-        (GeneratedMessageLite.GeneratedExtension<?, ?>) extensionObject;
-
-    MessageLite.Builder builder = extension.getMessageDefaultInstance().newBuilderForType();
-
-    final CodedInputStream input = data.newCodedInput();
-
-    builder.mergeFrom(input, extensionRegistry);
-    extensions.setField(extension.descriptor, builder.buildPartial());
-    input.checkLastTagWas(0);
-  }
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/ExtensionSchemas.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/ExtensionSchemas.java
deleted file mode 100644
index 2652fa5..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/ExtensionSchemas.java
+++ /dev/null
@@ -1,57 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-@CheckReturnValue
-final class ExtensionSchemas {
-  private static final ExtensionSchema<?> LITE_SCHEMA = new ExtensionSchemaLite();
-  private static final ExtensionSchema<?> FULL_SCHEMA = loadSchemaForFullRuntime();
-
-  private static ExtensionSchema<?> loadSchemaForFullRuntime() {
-    try {
-      Class<?> clazz = Class.forName("com.google.protobuf.ExtensionSchemaFull");
-      return (ExtensionSchema) clazz.getDeclaredConstructor().newInstance();
-    } catch (Exception e) {
-      return null;
-    }
-  }
-
-  static ExtensionSchema<?> lite() {
-    return LITE_SCHEMA;
-  }
-
-  static ExtensionSchema<?> full() {
-    if (FULL_SCHEMA == null) {
-      throw new IllegalStateException("Protobuf runtime is not correctly loaded.");
-    }
-    return FULL_SCHEMA;
-  }
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/FieldInfo.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/FieldInfo.java
deleted file mode 100644
index 59472df..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/FieldInfo.java
+++ /dev/null
@@ -1,578 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.protobuf.Internal.checkNotNull;
-
-import com.google.protobuf.Internal.EnumVerifier;
-import java.lang.reflect.Field;
-
-/** Information for a single field in a protobuf message class. */
-@CheckReturnValue
-@ExperimentalApi
-final class FieldInfo implements Comparable<FieldInfo> {
-  private final Field field;
-  private final FieldType type;
-  private final Class<?> messageClass; // The message type for repeated message fields.
-  private final int fieldNumber;
-  private final Field presenceField;
-  private final int presenceMask;
-  private final boolean required;
-  private final boolean enforceUtf8;
-  private final OneofInfo oneof;
-  private final Field cachedSizeField;
-  /**
-   * The actual type stored in the oneof value for this field. Since the oneof value is an {@link
-   * Object}, primitives will store their boxed type. Only valid in conjunction with {@link #oneof}
-   * (both must be either null or non-null.
-   */
-  private final Class<?> oneofStoredType;
-
-  // TODO(liujisi): make map default entry lazy?
-  private final Object mapDefaultEntry;
-
-  private final EnumVerifier enumVerifier;
-
-  /** Constructs a new descriptor for a field. */
-  public static FieldInfo forField(
-      Field field, int fieldNumber, FieldType fieldType, boolean enforceUtf8) {
-    checkFieldNumber(fieldNumber);
-    checkNotNull(field, "field");
-    checkNotNull(fieldType, "fieldType");
-    if (fieldType == FieldType.MESSAGE_LIST || fieldType == FieldType.GROUP_LIST) {
-      throw new IllegalStateException("Shouldn't be called for repeated message fields.");
-    }
-    return new FieldInfo(
-        field,
-        fieldNumber,
-        fieldType,
-        /* messageClass= */ null,
-        /* presenceField= */ null,
-        /* presenceMask= */ 0,
-        /* required= */ false,
-        enforceUtf8,
-        /* oneof= */ null,
-        /* oneofStoredType= */ null,
-        /* mapDefaultEntry= */ null,
-        /* enumVerifier= */ null,
-        /* cachedSizeField= */ null);
-  }
-
-  /** Constructs a new descriptor for a packed field. */
-  public static FieldInfo forPackedField(
-      Field field, int fieldNumber, FieldType fieldType, Field cachedSizeField) {
-    checkFieldNumber(fieldNumber);
-    checkNotNull(field, "field");
-    checkNotNull(fieldType, "fieldType");
-    if (fieldType == FieldType.MESSAGE_LIST || fieldType == FieldType.GROUP_LIST) {
-      throw new IllegalStateException("Shouldn't be called for repeated message fields.");
-    }
-    return new FieldInfo(
-        field,
-        fieldNumber,
-        fieldType,
-        /* messageClass= */ null,
-        /* presenceField= */ null,
-        /* presenceMask= */ 0,
-        /* required= */ false,
-        /* enforceUtf8= */ false,
-        /* oneof= */ null,
-        /* oneofStoredType= */ null,
-        /* mapDefaultEntry= */ null,
-        /* enumVerifier= */ null,
-        cachedSizeField);
-  }
-
-  /** Constructs a new descriptor for a repeated message field. */
-  public static FieldInfo forRepeatedMessageField(
-      Field field, int fieldNumber, FieldType fieldType, Class<?> messageClass) {
-    checkFieldNumber(fieldNumber);
-    checkNotNull(field, "field");
-    checkNotNull(fieldType, "fieldType");
-    checkNotNull(messageClass, "messageClass");
-    return new FieldInfo(
-        field,
-        fieldNumber,
-        fieldType,
-        messageClass,
-        /* presenceField= */ null,
-        /* presenceMask= */ 0,
-        /* required= */ false,
-        /* enforceUtf8= */ false,
-        /* oneof= */ null,
-        /* oneofStoredType= */ null,
-        /* mapDefaultEntry= */ null,
-        /* enumVerifier= */ null,
-        /* cachedSizeField= */ null);
-  }
-
-  public static FieldInfo forFieldWithEnumVerifier(
-      Field field, int fieldNumber, FieldType fieldType, EnumVerifier enumVerifier) {
-    checkFieldNumber(fieldNumber);
-    checkNotNull(field, "field");
-    return new FieldInfo(
-        field,
-        fieldNumber,
-        fieldType,
-        /* messageClass= */ null,
-        /* presenceField= */ null,
-        /* presenceMask= */ 0,
-        /* required= */ false,
-        /* enforceUtf8= */ false,
-        /* oneof= */ null,
-        /* oneofStoredType= */ null,
-        /* mapDefaultEntry= */ null,
-        enumVerifier,
-        /* cachedSizeField= */ null);
-  }
-
-  public static FieldInfo forPackedFieldWithEnumVerifier(
-      Field field,
-      int fieldNumber,
-      FieldType fieldType,
-      EnumVerifier enumVerifier,
-      Field cachedSizeField) {
-    checkFieldNumber(fieldNumber);
-    checkNotNull(field, "field");
-    return new FieldInfo(
-        field,
-        fieldNumber,
-        fieldType,
-        /* messageClass= */ null,
-        /* presenceField= */ null,
-        /* presenceMask= */ 0,
-        /* required= */ false,
-        /* enforceUtf8= */ false,
-        /* oneof= */ null,
-        /* oneofStoredType= */ null,
-        /* mapDefaultEntry= */ null,
-        enumVerifier,
-        cachedSizeField);
-  }
-
-  /** Constructor for a proto2 optional field. */
-  public static FieldInfo forProto2OptionalField(
-      Field field,
-      int fieldNumber,
-      FieldType fieldType,
-      Field presenceField,
-      int presenceMask,
-      boolean enforceUtf8,
-      EnumVerifier enumVerifier) {
-    checkFieldNumber(fieldNumber);
-    checkNotNull(field, "field");
-    checkNotNull(fieldType, "fieldType");
-    checkNotNull(presenceField, "presenceField");
-    if (presenceField != null && !isExactlyOneBitSet(presenceMask)) {
-      throw new IllegalArgumentException(
-          "presenceMask must have exactly one bit set: " + presenceMask);
-    }
-    return new FieldInfo(
-        field,
-        fieldNumber,
-        fieldType,
-        /* messageClass= */ null,
-        presenceField,
-        presenceMask,
-        /* required= */ false,
-        enforceUtf8,
-        /* oneof= */ null,
-        /* oneofStoredType= */ null,
-        /* mapDefaultEntry= */ null,
-        enumVerifier,
-        /* cachedSizeField= */ null);
-  }
-
-  /**
-   * Constructor for a field that is part of a oneof.
-   *
-   * @param fieldNumber the unique field number for this field within the message.
-   * @param fieldType the type of the field (must be non-null).
-   * @param oneof the oneof for which this field is associated (must be non-null).
-   * @param oneofStoredType the actual type stored in the oneof value for this field. Since the
-   *     oneof value is an {@link Object}, primitives will store their boxed type. Must be non-null.
-   * @param enforceUtf8 Only used for string fields. If {@code true}, will enforce UTF-8 on a string
-   *     field.
-   * @return the {@link FieldInfo} describing this field.
-   */
-  public static FieldInfo forOneofMemberField(
-      int fieldNumber,
-      FieldType fieldType,
-      OneofInfo oneof,
-      Class<?> oneofStoredType,
-      boolean enforceUtf8,
-      EnumVerifier enumVerifier) {
-    checkFieldNumber(fieldNumber);
-    checkNotNull(fieldType, "fieldType");
-    checkNotNull(oneof, "oneof");
-    checkNotNull(oneofStoredType, "oneofStoredType");
-    if (!fieldType.isScalar()) {
-      throw new IllegalArgumentException(
-          "Oneof is only supported for scalar fields. Field "
-              + fieldNumber
-              + " is of type "
-              + fieldType);
-    }
-    return new FieldInfo(
-        /* field= */ null,
-        fieldNumber,
-        fieldType,
-        /* messageClass= */ null,
-        /* presenceField= */ null,
-        /* presenceMask= */ 0,
-        /* required= */ false,
-        enforceUtf8,
-        oneof,
-        oneofStoredType,
-        /* mapDefaultEntry= */ null,
-        enumVerifier,
-        /* cachedSizeField= */ null);
-  }
-
-  private static void checkFieldNumber(int fieldNumber) {
-    if (fieldNumber <= 0) {
-      throw new IllegalArgumentException("fieldNumber must be positive: " + fieldNumber);
-    }
-  }
-
-  /** Constructor for a proto2 required field. */
-  public static FieldInfo forProto2RequiredField(
-      Field field,
-      int fieldNumber,
-      FieldType fieldType,
-      Field presenceField,
-      int presenceMask,
-      boolean enforceUtf8,
-      EnumVerifier enumVerifier) {
-    checkFieldNumber(fieldNumber);
-    checkNotNull(field, "field");
-    checkNotNull(fieldType, "fieldType");
-    checkNotNull(presenceField, "presenceField");
-    if (presenceField != null && !isExactlyOneBitSet(presenceMask)) {
-      throw new IllegalArgumentException(
-          "presenceMask must have exactly one bit set: " + presenceMask);
-    }
-    return new FieldInfo(
-        field,
-        fieldNumber,
-        fieldType,
-        /* messageClass= */ null,
-        presenceField,
-        presenceMask,
-        /* required= */ true,
-        enforceUtf8,
-        /* oneof= */ null,
-        /* oneofStoredType= */ null,
-        /* mapDefaultEntry= */ null,
-        /* enumVerifier= */ enumVerifier,
-        /* cachedSizeField= */ null);
-  }
-
-  public static FieldInfo forMapField(
-      Field field, int fieldNumber, Object mapDefaultEntry, EnumVerifier enumVerifier) {
-    checkNotNull(mapDefaultEntry, "mapDefaultEntry");
-    checkFieldNumber(fieldNumber);
-    checkNotNull(field, "field");
-    return new FieldInfo(
-        field,
-        fieldNumber,
-        FieldType.MAP,
-        /* messageClass= */ null,
-        /* presenceField= */ null,
-        /* presenceMask= */ 0,
-        /* required= */ false,
-        /* enforceUtf8= */ true,
-        /* oneof= */ null,
-        /* oneofStoredType= */ null,
-        mapDefaultEntry,
-        enumVerifier,
-        /* cachedSizeField= */ null);
-  }
-
-  private FieldInfo(
-      Field field,
-      int fieldNumber,
-      FieldType type,
-      Class<?> messageClass,
-      Field presenceField,
-      int presenceMask,
-      boolean required,
-      boolean enforceUtf8,
-      OneofInfo oneof,
-      Class<?> oneofStoredType,
-      Object mapDefaultEntry,
-      EnumVerifier enumVerifier,
-      Field cachedSizeField) {
-    this.field = field;
-    this.type = type;
-    this.messageClass = messageClass;
-    this.fieldNumber = fieldNumber;
-    this.presenceField = presenceField;
-    this.presenceMask = presenceMask;
-    this.required = required;
-    this.enforceUtf8 = enforceUtf8;
-    this.oneof = oneof;
-    this.oneofStoredType = oneofStoredType;
-    this.mapDefaultEntry = mapDefaultEntry;
-    this.enumVerifier = enumVerifier;
-    this.cachedSizeField = cachedSizeField;
-  }
-
-  /** Gets the field number for the field. */
-  public int getFieldNumber() {
-    return fieldNumber;
-  }
-
-  /** Gets the subject {@link Field} of this descriptor. */
-  public Field getField() {
-    return field;
-  }
-
-  /** Gets the type information for the field. */
-  public FieldType getType() {
-    return type;
-  }
-
-  /** Gets the oneof for which this field is a member, or {@code null} if not part of a oneof. */
-  public OneofInfo getOneof() {
-    return oneof;
-  }
-
-  /**
-   * Gets the actual type stored in the oneof value by this field. Since the oneof value is an
-   * {@link Object}, primitives will store their boxed type. For non-oneof fields, this will always
-   * be {@code null}.
-   */
-  public Class<?> getOneofStoredType() {
-    return oneofStoredType;
-  }
-
-  /** Gets the {@code EnumVerifier} if the field is an enum field. */
-  public EnumVerifier getEnumVerifier() {
-    return enumVerifier;
-  }
-
-  @Override
-  public int compareTo(FieldInfo o) {
-    return fieldNumber - o.fieldNumber;
-  }
-
-  /**
-   * For repeated message fields, returns the message type of the field. For other fields, returns
-   * {@code null}.
-   */
-  public Class<?> getListElementType() {
-    return messageClass;
-  }
-
-  /** Gets the presence bit field. Only valid for unary fields. For lists, returns {@code null}. */
-  public Field getPresenceField() {
-    return presenceField;
-  }
-
-  public Object getMapDefaultEntry() {
-    return mapDefaultEntry;
-  }
-
-  /**
-   * If {@link #getPresenceField()} is non-{@code null}, returns the mask used to identify the
-   * presence bit for this field in the message.
-   */
-  public int getPresenceMask() {
-    return presenceMask;
-  }
-
-  /** Whether this is a required field. */
-  public boolean isRequired() {
-    return required;
-  }
-
-  /**
-   * Whether a UTF-8 should be enforced on string fields. Only applies to strings and string lists.
-   */
-  public boolean isEnforceUtf8() {
-    return enforceUtf8;
-  }
-
-  public Field getCachedSizeField() {
-    return cachedSizeField;
-  }
-
-  /**
-   * For singular or repeated message fields, returns the message type. For other fields, returns
-   * {@code null}.
-   */
-  public Class<?> getMessageFieldClass() {
-    switch (type) {
-      case MESSAGE:
-      case GROUP:
-        return field != null ? field.getType() : oneofStoredType;
-      case MESSAGE_LIST:
-      case GROUP_LIST:
-        return messageClass;
-      default:
-        return null;
-    }
-  }
-
-  public static Builder newBuilder() {
-    return new Builder();
-  }
-
-  /** A builder for {@link FieldInfo} instances. */
-  public static final class Builder {
-    private Field field;
-    private FieldType type;
-    private int fieldNumber;
-    private Field presenceField;
-    private int presenceMask;
-    private boolean required;
-    private boolean enforceUtf8;
-    private OneofInfo oneof;
-    private Class<?> oneofStoredType;
-    private Object mapDefaultEntry;
-    private EnumVerifier enumVerifier;
-    private Field cachedSizeField;
-
-    private Builder() {}
-
-    /**
-     * Specifies the actual field on the message represented by this field. This should not be
-     * called for oneof member fields.
-     */
-    public Builder withField(Field field) {
-      if (oneof != null) {
-        throw new IllegalStateException("Cannot set field when building a oneof.");
-      }
-      this.field = field;
-      return this;
-    }
-
-    /** Specifies the type of this field. */
-    public Builder withType(FieldType type) {
-      this.type = type;
-      return this;
-    }
-
-    /** Specifies the unique field number for this field within the message. */
-    public Builder withFieldNumber(int fieldNumber) {
-      this.fieldNumber = fieldNumber;
-      return this;
-    }
-
-    /** Specifies proto2 presence information. This should not be called for oneof fields. */
-    public Builder withPresence(Field presenceField, int presenceMask) {
-      this.presenceField = checkNotNull(presenceField, "presenceField");
-      this.presenceMask = presenceMask;
-      return this;
-    }
-
-    /**
-     * Sets the information for building a oneof member field. This is incompatible with {@link
-     * #withField(Field)} and {@link #withPresence(Field, int)}.
-     *
-     * @param oneof the oneof for which this field is associated.
-     * @param oneofStoredType the actual type stored in the oneof value for this field. Since the
-     *     oneof value is an {@link Object}, primitives will store their boxed type.
-     */
-    public Builder withOneof(OneofInfo oneof, Class<?> oneofStoredType) {
-      if (field != null || presenceField != null) {
-        throw new IllegalStateException(
-            "Cannot set oneof when field or presenceField have been provided");
-      }
-      this.oneof = oneof;
-      this.oneofStoredType = oneofStoredType;
-      return this;
-    }
-
-    public Builder withRequired(boolean required) {
-      this.required = required;
-      return this;
-    }
-
-    public Builder withMapDefaultEntry(Object mapDefaultEntry) {
-      this.mapDefaultEntry = mapDefaultEntry;
-      return this;
-    }
-
-    public Builder withEnforceUtf8(boolean enforceUtf8) {
-      this.enforceUtf8 = enforceUtf8;
-      return this;
-    }
-
-    public Builder withEnumVerifier(EnumVerifier enumVerifier) {
-      this.enumVerifier = enumVerifier;
-      return this;
-    }
-
-    public Builder withCachedSizeField(Field cachedSizeField) {
-      this.cachedSizeField = cachedSizeField;
-      return this;
-    }
-
-    public FieldInfo build() {
-      if (oneof != null) {
-        return forOneofMemberField(
-            fieldNumber, type, oneof, oneofStoredType, enforceUtf8, enumVerifier);
-      }
-      if (mapDefaultEntry != null) {
-        return forMapField(field, fieldNumber, mapDefaultEntry, enumVerifier);
-      }
-      if (presenceField != null) {
-        if (required) {
-          return forProto2RequiredField(
-              field, fieldNumber, type, presenceField, presenceMask, enforceUtf8, enumVerifier);
-        } else {
-          return forProto2OptionalField(
-              field, fieldNumber, type, presenceField, presenceMask, enforceUtf8, enumVerifier);
-        }
-      }
-      if (enumVerifier != null) {
-        if (cachedSizeField == null) {
-          return forFieldWithEnumVerifier(field, fieldNumber, type, enumVerifier);
-        } else {
-          return forPackedFieldWithEnumVerifier(
-              field, fieldNumber, type, enumVerifier, cachedSizeField);
-        }
-      } else {
-        if (cachedSizeField == null) {
-          return forField(field, fieldNumber, type, enforceUtf8);
-        } else {
-          return forPackedField(field, fieldNumber, type, cachedSizeField);
-        }
-      }
-    }
-  }
-
-  private static boolean isExactlyOneBitSet(int value) {
-    return value != 0 && (value & (value - 1)) == 0;
-  }
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/FieldSet.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/FieldSet.java
deleted file mode 100644
index b64f63b..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/FieldSet.java
+++ /dev/null
@@ -1,1326 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.protobuf.Internal.checkNotNull;
-
-import com.google.protobuf.LazyField.LazyIterator;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-
-/**
- * A class which represents an arbitrary set of fields of some message type. This is used to
- * implement {@link DynamicMessage}, and also to represent extensions in {@link GeneratedMessage}.
- * This class is package-private, since outside users should probably be using {@link
- * DynamicMessage}.
- *
- * @author kenton@google.com Kenton Varda
- */
-final class FieldSet<T extends FieldSet.FieldDescriptorLite<T>> {
-  /**
-   * Interface for a FieldDescriptor or lite extension descriptor. This prevents FieldSet from
-   * depending on {@link Descriptors.FieldDescriptor}.
-   */
-  public interface FieldDescriptorLite<T extends FieldDescriptorLite<T>> extends Comparable<T> {
-    int getNumber();
-
-    WireFormat.FieldType getLiteType();
-
-    WireFormat.JavaType getLiteJavaType();
-
-    boolean isRepeated();
-
-    boolean isPacked();
-
-    Internal.EnumLiteMap<?> getEnumType();
-
-    // If getLiteJavaType() == MESSAGE, this merges a message object of the
-    // type into a builder of the type.  Returns {@code to}.
-    MessageLite.Builder internalMergeFrom(MessageLite.Builder to, MessageLite from);
-  }
-
-  private static final int DEFAULT_FIELD_MAP_ARRAY_SIZE = 16;
-
-  private final SmallSortedMap<T, Object> fields;
-  private boolean isImmutable;
-  private boolean hasLazyField;
-
-  /** Construct a new FieldSet. */
-  private FieldSet() {
-    this.fields = SmallSortedMap.newFieldMap(DEFAULT_FIELD_MAP_ARRAY_SIZE);
-  }
-
-  /** Construct an empty FieldSet. This is only used to initialize DEFAULT_INSTANCE. */
-  @SuppressWarnings("unused")
-  private FieldSet(final boolean dummy) {
-    this(SmallSortedMap.<T>newFieldMap(0));
-    makeImmutable();
-  }
-
-  private FieldSet(SmallSortedMap<T, Object> fields) {
-    this.fields = fields;
-    makeImmutable();
-  }
-
-  /** Construct a new FieldSet. */
-  public static <T extends FieldSet.FieldDescriptorLite<T>> FieldSet<T> newFieldSet() {
-    return new FieldSet<T>();
-  }
-
-  /** Get an immutable empty FieldSet. */
-  @SuppressWarnings("unchecked")
-  public static <T extends FieldSet.FieldDescriptorLite<T>> FieldSet<T> emptySet() {
-    return DEFAULT_INSTANCE;
-  }
-
-  /** Construct a new Builder. */
-  public static <T extends FieldDescriptorLite<T>> Builder<T> newBuilder() {
-    return new Builder<T>();
-  }
-
-  @SuppressWarnings("rawtypes")
-  private static final FieldSet DEFAULT_INSTANCE = new FieldSet(true);
-
-  /** Returns {@code true} if empty, {@code false} otherwise. */
-  boolean isEmpty() {
-    return fields.isEmpty();
-  }
-
-  /** Make this FieldSet immutable from this point forward. */
-  public void makeImmutable() {
-    if (isImmutable) {
-      return;
-    }
-    for (int i = 0; i < fields.getNumArrayEntries(); ++i) {
-      Entry<T, Object> entry = fields.getArrayEntryAt(i);
-      if (entry.getValue() instanceof GeneratedMessageLite) {
-        ((GeneratedMessageLite<?, ?>) entry.getValue()).makeImmutable();
-      }
-    }
-    fields.makeImmutable();
-    isImmutable = true;
-  }
-
-  /**
-   * Returns whether the FieldSet is immutable. This is true if it is the {@link #emptySet} or if
-   * {@link #makeImmutable} were called.
-   *
-   * @return whether the FieldSet is immutable.
-   */
-  public boolean isImmutable() {
-    return isImmutable;
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
-    }
-
-    if (!(o instanceof FieldSet)) {
-      return false;
-    }
-
-    FieldSet<?> other = (FieldSet<?>) o;
-    return fields.equals(other.fields);
-  }
-
-  @Override
-  public int hashCode() {
-    return fields.hashCode();
-  }
-
-  /**
-   * Clones the FieldSet. The returned FieldSet will be mutable even if the original FieldSet was
-   * immutable.
-   *
-   * @return the newly cloned FieldSet
-   */
-  @Override
-  public FieldSet<T> clone() {
-    // We can't just call fields.clone because List objects in the map
-    // should not be shared.
-    FieldSet<T> clone = FieldSet.newFieldSet();
-    for (int i = 0; i < fields.getNumArrayEntries(); i++) {
-      Map.Entry<T, Object> entry = fields.getArrayEntryAt(i);
-      clone.setField(entry.getKey(), entry.getValue());
-    }
-    for (Map.Entry<T, Object> entry : fields.getOverflowEntries()) {
-      clone.setField(entry.getKey(), entry.getValue());
-    }
-    clone.hasLazyField = hasLazyField;
-    return clone;
-  }
-
-
-  // =================================================================
-
-  /** See {@link Message.Builder#clear()}. */
-  public void clear() {
-    fields.clear();
-    hasLazyField = false;
-  }
-
-  /** Get a simple map containing all the fields. */
-  public Map<T, Object> getAllFields() {
-    if (hasLazyField) {
-      SmallSortedMap<T, Object> result = cloneAllFieldsMap(fields, /* copyList */ false);
-      if (fields.isImmutable()) {
-        result.makeImmutable();
-      }
-      return result;
-    }
-    return fields.isImmutable() ? fields : Collections.unmodifiableMap(fields);
-  }
-
-  private static <T extends FieldDescriptorLite<T>> SmallSortedMap<T, Object> cloneAllFieldsMap(
-      SmallSortedMap<T, Object> fields, boolean copyList) {
-    SmallSortedMap<T, Object> result = SmallSortedMap.newFieldMap(DEFAULT_FIELD_MAP_ARRAY_SIZE);
-    for (int i = 0; i < fields.getNumArrayEntries(); i++) {
-      cloneFieldEntry(result, fields.getArrayEntryAt(i), copyList);
-    }
-    for (Map.Entry<T, Object> entry : fields.getOverflowEntries()) {
-      cloneFieldEntry(result, entry, copyList);
-    }
-    return result;
-  }
-
-  private static <T extends FieldDescriptorLite<T>> void cloneFieldEntry(
-      Map<T, Object> map, Map.Entry<T, Object> entry, boolean copyList) {
-    T key = entry.getKey();
-    Object value = entry.getValue();
-    if (value instanceof LazyField) {
-      map.put(key, ((LazyField) value).getValue());
-    } else if (copyList && value instanceof List) {
-      map.put(key, new ArrayList<>((List<?>) value));
-    } else {
-      map.put(key, value);
-    }
-  }
-
-  /**
-   * Get an iterator to the field map. This iterator should not be leaked out of the protobuf
-   * library as it is not protected from mutation when fields is not immutable.
-   */
-  public Iterator<Map.Entry<T, Object>> iterator() {
-    if (hasLazyField) {
-      return new LazyIterator<T>(fields.entrySet().iterator());
-    }
-    return fields.entrySet().iterator();
-  }
-
-  /**
-   * Get an iterator over the fields in the map in descending (i.e. reverse) order. This iterator
-   * should not be leaked out of the protobuf library as it is not protected from mutation when
-   * fields is not immutable.
-   */
-  Iterator<Map.Entry<T, Object>> descendingIterator() {
-    if (hasLazyField) {
-      return new LazyIterator<T>(fields.descendingEntrySet().iterator());
-    }
-    return fields.descendingEntrySet().iterator();
-  }
-
-  /** Useful for implementing {@link Message#hasField(Descriptors.FieldDescriptor)}. */
-  public boolean hasField(final T descriptor) {
-    if (descriptor.isRepeated()) {
-      throw new IllegalArgumentException("hasField() can only be called on non-repeated fields.");
-    }
-
-    return fields.get(descriptor) != null;
-  }
-
-  /**
-   * Useful for implementing {@link Message#getField(Descriptors.FieldDescriptor)}. This method
-   * returns {@code null} if the field is not set; in this case it is up to the caller to fetch the
-   * field's default value.
-   */
-  public Object getField(final T descriptor) {
-    Object o = fields.get(descriptor);
-    if (o instanceof LazyField) {
-      return ((LazyField) o).getValue();
-    }
-    return o;
-  }
-
-  /**
-   * Useful for implementing {@link Message.Builder#setField(Descriptors.FieldDescriptor,Object)}.
-   */
-  @SuppressWarnings({"unchecked", "rawtypes"})
-  public void setField(final T descriptor, Object value) {
-    if (descriptor.isRepeated()) {
-      if (!(value instanceof List)) {
-        throw new IllegalArgumentException(
-            "Wrong object type used with protocol message reflection.");
-      }
-
-      // Wrap the contents in a new list so that the caller cannot change
-      // the list's contents after setting it.
-      final List newList = new ArrayList<>();
-      newList.addAll((List) value);
-      for (final Object element : newList) {
-        verifyType(descriptor, element);
-      }
-      value = newList;
-    } else {
-      verifyType(descriptor, value);
-    }
-
-    if (value instanceof LazyField) {
-      hasLazyField = true;
-    }
-    fields.put(descriptor, value);
-  }
-
-  /** Useful for implementing {@link Message.Builder#clearField(Descriptors.FieldDescriptor)}. */
-  public void clearField(final T descriptor) {
-    fields.remove(descriptor);
-    if (fields.isEmpty()) {
-      hasLazyField = false;
-    }
-  }
-
-  /** Useful for implementing {@link Message#getRepeatedFieldCount(Descriptors.FieldDescriptor)}. */
-  public int getRepeatedFieldCount(final T descriptor) {
-    if (!descriptor.isRepeated()) {
-      throw new IllegalArgumentException(
-          "getRepeatedField() can only be called on repeated fields.");
-    }
-
-    final Object value = getField(descriptor);
-    if (value == null) {
-      return 0;
-    } else {
-      return ((List<?>) value).size();
-    }
-  }
-
-  /** Useful for implementing {@link Message#getRepeatedField(Descriptors.FieldDescriptor,int)}. */
-  public Object getRepeatedField(final T descriptor, final int index) {
-    if (!descriptor.isRepeated()) {
-      throw new IllegalArgumentException(
-          "getRepeatedField() can only be called on repeated fields.");
-    }
-
-    final Object value = getField(descriptor);
-
-    if (value == null) {
-      throw new IndexOutOfBoundsException();
-    } else {
-      return ((List<?>) value).get(index);
-    }
-  }
-
-  /**
-   * Useful for implementing {@link
-   * Message.Builder#setRepeatedField(Descriptors.FieldDescriptor,int,Object)}.
-   */
-  @SuppressWarnings("unchecked")
-  public void setRepeatedField(final T descriptor, final int index, final Object value) {
-    if (!descriptor.isRepeated()) {
-      throw new IllegalArgumentException(
-          "getRepeatedField() can only be called on repeated fields.");
-    }
-
-    final Object list = getField(descriptor);
-    if (list == null) {
-      throw new IndexOutOfBoundsException();
-    }
-
-    verifyType(descriptor, value);
-    ((List<Object>) list).set(index, value);
-  }
-
-  /**
-   * Useful for implementing {@link
-   * Message.Builder#addRepeatedField(Descriptors.FieldDescriptor,Object)}.
-   */
-  @SuppressWarnings("unchecked")
-  public void addRepeatedField(final T descriptor, final Object value) {
-    if (!descriptor.isRepeated()) {
-      throw new IllegalArgumentException(
-          "addRepeatedField() can only be called on repeated fields.");
-    }
-
-    verifyType(descriptor, value);
-
-    final Object existingValue = getField(descriptor);
-    List<Object> list;
-    if (existingValue == null) {
-      list = new ArrayList<Object>();
-      fields.put(descriptor, list);
-    } else {
-      list = (List<Object>) existingValue;
-    }
-
-    list.add(value);
-  }
-
-  /**
-   * Verifies that the given object is of the correct type to be a valid value for the given field.
-   * (For repeated fields, this checks if the object is the right type to be one element of the
-   * field.)
-   *
-   * @throws IllegalArgumentException the value is not of the right type
-   */
-  private void verifyType(final T descriptor, final Object value) {
-    if (!isValidType(descriptor.getLiteType(), value)) {
-      throw new IllegalArgumentException(
-          String.format(
-              "Wrong object type used with protocol message reflection.\n"
-              + "Field number: %d, field java type: %s, value type: %s\n",
-              descriptor.getNumber(),
-              descriptor.getLiteType().getJavaType(),
-              value.getClass().getName()));
-    }
-  }
-
-
-  private static boolean isValidType(final WireFormat.FieldType type, final Object value) {
-    checkNotNull(value);
-    switch (type.getJavaType()) {
-      case INT:
-        return value instanceof Integer;
-      case LONG:
-        return value instanceof Long;
-      case FLOAT:
-        return value instanceof Float;
-      case DOUBLE:
-        return value instanceof Double;
-      case BOOLEAN:
-        return value instanceof Boolean;
-      case STRING:
-        return value instanceof String;
-      case BYTE_STRING:
-        return value instanceof ByteString || value instanceof byte[];
-      case ENUM:
-        return (value instanceof Integer || value instanceof Internal.EnumLite);
-      case MESSAGE:
-        return (value instanceof MessageLite) || (value instanceof LazyField);
-    }
-    return false;
-  }
-
-  // =================================================================
-  // Parsing and serialization
-
-  /**
-   * See {@link Message#isInitialized()}. Note: Since {@code FieldSet} itself does not have any way
-   * of knowing about required fields that aren't actually present in the set, it is up to the
-   * caller to check that all required fields are present.
-   */
-  public boolean isInitialized() {
-    for (int i = 0; i < fields.getNumArrayEntries(); i++) {
-      if (!isInitialized(fields.getArrayEntryAt(i))) {
-        return false;
-      }
-    }
-    for (final Map.Entry<T, Object> entry : fields.getOverflowEntries()) {
-      if (!isInitialized(entry)) {
-        return false;
-      }
-    }
-    return true;
-  }
-
-  private static <T extends FieldDescriptorLite<T>> boolean isInitialized(
-      final Map.Entry<T, Object> entry) {
-    final T descriptor = entry.getKey();
-    if (descriptor.getLiteJavaType() == WireFormat.JavaType.MESSAGE) {
-      if (descriptor.isRepeated()) {
-        for (final Object element : (List<?>) entry.getValue()) {
-          if (!isMessageFieldValueInitialized(element)) {
-            return false;
-          }
-        }
-      } else {
-        return isMessageFieldValueInitialized(entry.getValue());
-      }
-    }
-    return true;
-  }
-
-  private static boolean isMessageFieldValueInitialized(Object value) {
-    if (value instanceof MessageLiteOrBuilder) {
-      // Message fields cannot have builder values in FieldSet, but can in FieldSet.Builder, and
-      // this method is used by FieldSet.Builder.isInitialized.
-      return ((MessageLiteOrBuilder) value).isInitialized();
-    } else if (value instanceof LazyField) {
-      return true;
-    } else {
-      throw new IllegalArgumentException(
-          "Wrong object type used with protocol message reflection.");
-    }
-  }
-
-  /**
-   * Given a field type, return the wire type.
-   *
-   * @return One of the {@code WIRETYPE_} constants defined in {@link WireFormat}.
-   */
-  static int getWireFormatForFieldType(final WireFormat.FieldType type, boolean isPacked) {
-    if (isPacked) {
-      return WireFormat.WIRETYPE_LENGTH_DELIMITED;
-    } else {
-      return type.getWireType();
-    }
-  }
-
-  /** Like {@link Message.Builder#mergeFrom(Message)}, but merges from another {@link FieldSet}. */
-  public void mergeFrom(final FieldSet<T> other) {
-    for (int i = 0; i < other.fields.getNumArrayEntries(); i++) {
-      mergeFromField(other.fields.getArrayEntryAt(i));
-    }
-    for (final Map.Entry<T, Object> entry : other.fields.getOverflowEntries()) {
-      mergeFromField(entry);
-    }
-  }
-
-  private static Object cloneIfMutable(Object value) {
-    if (value instanceof byte[]) {
-      byte[] bytes = (byte[]) value;
-      byte[] copy = new byte[bytes.length];
-      System.arraycopy(bytes, 0, copy, 0, bytes.length);
-      return copy;
-    } else {
-      return value;
-    }
-  }
-
-  @SuppressWarnings({"unchecked", "rawtypes"})
-  private void mergeFromField(final Map.Entry<T, Object> entry) {
-    final T descriptor = entry.getKey();
-    Object otherValue = entry.getValue();
-    if (otherValue instanceof LazyField) {
-      otherValue = ((LazyField) otherValue).getValue();
-    }
-
-    if (descriptor.isRepeated()) {
-      Object value = getField(descriptor);
-      if (value == null) {
-        value = new ArrayList<>();
-      }
-      for (Object element : (List) otherValue) {
-        ((List) value).add(cloneIfMutable(element));
-      }
-      fields.put(descriptor, value);
-    } else if (descriptor.getLiteJavaType() == WireFormat.JavaType.MESSAGE) {
-      Object value = getField(descriptor);
-      if (value == null) {
-        fields.put(descriptor, cloneIfMutable(otherValue));
-      } else {
-        // Merge the messages.
-          value =
-              descriptor
-                  .internalMergeFrom(((MessageLite) value).toBuilder(), (MessageLite) otherValue)
-                  .build();
-        fields.put(descriptor, value);
-      }
-    } else {
-      fields.put(descriptor, cloneIfMutable(otherValue));
-    }
-  }
-
-  /**
-   * Read a field of any primitive type for immutable messages from a CodedInputStream. Enums,
-   * groups, and embedded messages are not handled by this method.
-   *
-   * @param input the stream from which to read
-   * @param type declared type of the field
-   * @param checkUtf8 When true, check that the input is valid UTF-8
-   * @return an object representing the field's value, of the exact type which would be returned by
-   *     {@link Message#getField(Descriptors.FieldDescriptor)} for this field
-   */
-  public static Object readPrimitiveField(
-      CodedInputStream input, final WireFormat.FieldType type, boolean checkUtf8)
-      throws IOException {
-    if (checkUtf8) {
-      return WireFormat.readPrimitiveField(input, type, WireFormat.Utf8Validation.STRICT);
-    } else {
-      return WireFormat.readPrimitiveField(input, type, WireFormat.Utf8Validation.LOOSE);
-    }
-  }
-
-
-  /** See {@link Message#writeTo(CodedOutputStream)}. */
-  public void writeTo(final CodedOutputStream output) throws IOException {
-    for (int i = 0; i < fields.getNumArrayEntries(); i++) {
-      final Map.Entry<T, Object> entry = fields.getArrayEntryAt(i);
-      writeField(entry.getKey(), entry.getValue(), output);
-    }
-    for (final Map.Entry<T, Object> entry : fields.getOverflowEntries()) {
-      writeField(entry.getKey(), entry.getValue(), output);
-    }
-  }
-
-  /** Like {@link #writeTo} but uses MessageSet wire format. */
-  public void writeMessageSetTo(final CodedOutputStream output) throws IOException {
-    for (int i = 0; i < fields.getNumArrayEntries(); i++) {
-      writeMessageSetTo(fields.getArrayEntryAt(i), output);
-    }
-    for (final Map.Entry<T, Object> entry : fields.getOverflowEntries()) {
-      writeMessageSetTo(entry, output);
-    }
-  }
-
-  private void writeMessageSetTo(final Map.Entry<T, Object> entry, final CodedOutputStream output)
-      throws IOException {
-    final T descriptor = entry.getKey();
-    if (descriptor.getLiteJavaType() == WireFormat.JavaType.MESSAGE
-        && !descriptor.isRepeated()
-        && !descriptor.isPacked()) {
-      Object value = entry.getValue();
-      if (value instanceof LazyField) {
-        value = ((LazyField) value).getValue();
-      }
-      output.writeMessageSetExtension(entry.getKey().getNumber(), (MessageLite) value);
-    } else {
-      writeField(descriptor, entry.getValue(), output);
-    }
-  }
-
-  /**
-   * Write a single tag-value pair to the stream.
-   *
-   * @param output The output stream.
-   * @param type The field's type.
-   * @param number The field's number.
-   * @param value Object representing the field's value. Must be of the exact type which would be
-   *     returned by {@link Message#getField(Descriptors.FieldDescriptor)} for this field.
-   */
-  static void writeElement(
-      final CodedOutputStream output,
-      final WireFormat.FieldType type,
-      final int number,
-      final Object value)
-      throws IOException {
-    // Special case for groups, which need a start and end tag; other fields
-    // can just use writeTag() and writeFieldNoTag().
-    if (type == WireFormat.FieldType.GROUP) {
-        output.writeGroup(number, (MessageLite) value);
-    } else {
-      output.writeTag(number, getWireFormatForFieldType(type, false));
-      writeElementNoTag(output, type, value);
-    }
-  }
-
-  /**
-   * Write a field of arbitrary type, without its tag, to the stream.
-   *
-   * @param output The output stream.
-   * @param type The field's type.
-   * @param value Object representing the field's value. Must be of the exact type which would be
-   *     returned by {@link Message#getField(Descriptors.FieldDescriptor)} for this field.
-   */
-  static void writeElementNoTag(
-      final CodedOutputStream output, final WireFormat.FieldType type, final Object value)
-      throws IOException {
-    switch (type) {
-      case DOUBLE:
-        output.writeDoubleNoTag((Double) value);
-        break;
-      case FLOAT:
-        output.writeFloatNoTag((Float) value);
-        break;
-      case INT64:
-        output.writeInt64NoTag((Long) value);
-        break;
-      case UINT64:
-        output.writeUInt64NoTag((Long) value);
-        break;
-      case INT32:
-        output.writeInt32NoTag((Integer) value);
-        break;
-      case FIXED64:
-        output.writeFixed64NoTag((Long) value);
-        break;
-      case FIXED32:
-        output.writeFixed32NoTag((Integer) value);
-        break;
-      case BOOL:
-        output.writeBoolNoTag((Boolean) value);
-        break;
-      case GROUP:
-        output.writeGroupNoTag((MessageLite) value);
-        break;
-      case MESSAGE:
-        output.writeMessageNoTag((MessageLite) value);
-        break;
-      case STRING:
-        if (value instanceof ByteString) {
-          output.writeBytesNoTag((ByteString) value);
-        } else {
-          output.writeStringNoTag((String) value);
-        }
-        break;
-      case BYTES:
-        if (value instanceof ByteString) {
-          output.writeBytesNoTag((ByteString) value);
-        } else {
-          output.writeByteArrayNoTag((byte[]) value);
-        }
-        break;
-      case UINT32:
-        output.writeUInt32NoTag((Integer) value);
-        break;
-      case SFIXED32:
-        output.writeSFixed32NoTag((Integer) value);
-        break;
-      case SFIXED64:
-        output.writeSFixed64NoTag((Long) value);
-        break;
-      case SINT32:
-        output.writeSInt32NoTag((Integer) value);
-        break;
-      case SINT64:
-        output.writeSInt64NoTag((Long) value);
-        break;
-
-      case ENUM:
-        if (value instanceof Internal.EnumLite) {
-          output.writeEnumNoTag(((Internal.EnumLite) value).getNumber());
-        } else {
-          output.writeEnumNoTag(((Integer) value).intValue());
-        }
-        break;
-    }
-  }
-
-  /** Write a single field. */
-  public static void writeField(
-      final FieldDescriptorLite<?> descriptor, final Object value, final CodedOutputStream output)
-      throws IOException {
-    WireFormat.FieldType type = descriptor.getLiteType();
-    int number = descriptor.getNumber();
-    if (descriptor.isRepeated()) {
-      final List<?> valueList = (List<?>) value;
-      if (descriptor.isPacked()) {
-        output.writeTag(number, WireFormat.WIRETYPE_LENGTH_DELIMITED);
-        // Compute the total data size so the length can be written.
-        int dataSize = 0;
-        for (final Object element : valueList) {
-          dataSize += computeElementSizeNoTag(type, element);
-        }
-        output.writeUInt32NoTag(dataSize);
-        // Write the data itself, without any tags.
-        for (final Object element : valueList) {
-          writeElementNoTag(output, type, element);
-        }
-      } else {
-        for (final Object element : valueList) {
-          writeElement(output, type, number, element);
-        }
-      }
-    } else {
-      if (value instanceof LazyField) {
-        writeElement(output, type, number, ((LazyField) value).getValue());
-      } else {
-        writeElement(output, type, number, value);
-      }
-    }
-  }
-
-  /**
-   * See {@link Message#getSerializedSize()}. It's up to the caller to cache the resulting size if
-   * desired.
-   */
-  public int getSerializedSize() {
-    int size = 0;
-    for (int i = 0; i < fields.getNumArrayEntries(); i++) {
-      final Map.Entry<T, Object> entry = fields.getArrayEntryAt(i);
-      size += computeFieldSize(entry.getKey(), entry.getValue());
-    }
-    for (final Map.Entry<T, Object> entry : fields.getOverflowEntries()) {
-      size += computeFieldSize(entry.getKey(), entry.getValue());
-    }
-    return size;
-  }
-
-  /** Like {@link #getSerializedSize} but uses MessageSet wire format. */
-  public int getMessageSetSerializedSize() {
-    int size = 0;
-    for (int i = 0; i < fields.getNumArrayEntries(); i++) {
-      size += getMessageSetSerializedSize(fields.getArrayEntryAt(i));
-    }
-    for (final Map.Entry<T, Object> entry : fields.getOverflowEntries()) {
-      size += getMessageSetSerializedSize(entry);
-    }
-    return size;
-  }
-
-  private int getMessageSetSerializedSize(final Map.Entry<T, Object> entry) {
-    final T descriptor = entry.getKey();
-    Object value = entry.getValue();
-    if (descriptor.getLiteJavaType() == WireFormat.JavaType.MESSAGE
-        && !descriptor.isRepeated()
-        && !descriptor.isPacked()) {
-      if (value instanceof LazyField) {
-        return CodedOutputStream.computeLazyFieldMessageSetExtensionSize(
-            entry.getKey().getNumber(), (LazyField) value);
-      } else {
-        return CodedOutputStream.computeMessageSetExtensionSize(
-            entry.getKey().getNumber(), (MessageLite) value);
-      }
-    } else {
-      return computeFieldSize(descriptor, value);
-    }
-  }
-
-  /**
-   * Compute the number of bytes that would be needed to encode a single tag/value pair of arbitrary
-   * type.
-   *
-   * @param type The field's type.
-   * @param number The field's number.
-   * @param value Object representing the field's value. Must be of the exact type which would be
-   *     returned by {@link Message#getField(Descriptors.FieldDescriptor)} for this field.
-   */
-  static int computeElementSize(
-      final WireFormat.FieldType type, final int number, final Object value) {
-    int tagSize = CodedOutputStream.computeTagSize(number);
-    if (type == WireFormat.FieldType.GROUP) {
-      // Only count the end group tag for proto2 messages as for proto1 the end
-      // group tag will be counted as a part of getSerializedSize().
-        tagSize *= 2;
-    }
-    return tagSize + computeElementSizeNoTag(type, value);
-  }
-
-  /**
-   * Compute the number of bytes that would be needed to encode a particular value of arbitrary
-   * type, excluding tag.
-   *
-   * @param type The field's type.
-   * @param value Object representing the field's value. Must be of the exact type which would be
-   *     returned by {@link Message#getField(Descriptors.FieldDescriptor)} for this field.
-   */
-  static int computeElementSizeNoTag(final WireFormat.FieldType type, final Object value) {
-    switch (type) {
-      case DOUBLE:
-        return CodedOutputStream.computeDoubleSizeNoTag((Double) value);
-      case FLOAT:
-        return CodedOutputStream.computeFloatSizeNoTag((Float) value);
-      case INT64:
-        return CodedOutputStream.computeInt64SizeNoTag((Long) value);
-      case UINT64:
-        return CodedOutputStream.computeUInt64SizeNoTag((Long) value);
-      case INT32:
-        return CodedOutputStream.computeInt32SizeNoTag((Integer) value);
-      case FIXED64:
-        return CodedOutputStream.computeFixed64SizeNoTag((Long) value);
-      case FIXED32:
-        return CodedOutputStream.computeFixed32SizeNoTag((Integer) value);
-      case BOOL:
-        return CodedOutputStream.computeBoolSizeNoTag((Boolean) value);
-      case GROUP:
-        return CodedOutputStream.computeGroupSizeNoTag((MessageLite) value);
-      case BYTES:
-        if (value instanceof ByteString) {
-          return CodedOutputStream.computeBytesSizeNoTag((ByteString) value);
-        } else {
-          return CodedOutputStream.computeByteArraySizeNoTag((byte[]) value);
-        }
-      case STRING:
-        if (value instanceof ByteString) {
-          return CodedOutputStream.computeBytesSizeNoTag((ByteString) value);
-        } else {
-          return CodedOutputStream.computeStringSizeNoTag((String) value);
-        }
-      case UINT32:
-        return CodedOutputStream.computeUInt32SizeNoTag((Integer) value);
-      case SFIXED32:
-        return CodedOutputStream.computeSFixed32SizeNoTag((Integer) value);
-      case SFIXED64:
-        return CodedOutputStream.computeSFixed64SizeNoTag((Long) value);
-      case SINT32:
-        return CodedOutputStream.computeSInt32SizeNoTag((Integer) value);
-      case SINT64:
-        return CodedOutputStream.computeSInt64SizeNoTag((Long) value);
-
-      case MESSAGE:
-        if (value instanceof LazyField) {
-          return CodedOutputStream.computeLazyFieldSizeNoTag((LazyField) value);
-        } else {
-          return CodedOutputStream.computeMessageSizeNoTag((MessageLite) value);
-        }
-
-      case ENUM:
-        if (value instanceof Internal.EnumLite) {
-          return CodedOutputStream.computeEnumSizeNoTag(((Internal.EnumLite) value).getNumber());
-        } else {
-          return CodedOutputStream.computeEnumSizeNoTag((Integer) value);
-        }
-    }
-
-    throw new RuntimeException("There is no way to get here, but the compiler thinks otherwise.");
-  }
-
-  /** Compute the number of bytes needed to encode a particular field. */
-  public static int computeFieldSize(final FieldDescriptorLite<?> descriptor, final Object value) {
-    WireFormat.FieldType type = descriptor.getLiteType();
-    int number = descriptor.getNumber();
-    if (descriptor.isRepeated()) {
-      if (descriptor.isPacked()) {
-        int dataSize = 0;
-        for (final Object element : (List<?>) value) {
-          dataSize += computeElementSizeNoTag(type, element);
-        }
-        return dataSize
-            + CodedOutputStream.computeTagSize(number)
-            + CodedOutputStream.computeUInt32SizeNoTag(dataSize);
-      } else {
-        int size = 0;
-        for (final Object element : (List<?>) value) {
-          size += computeElementSize(type, number, element);
-        }
-        return size;
-      }
-    } else {
-      return computeElementSize(type, number, value);
-    }
-  }
-
-  /**
-   * A FieldSet Builder that accept a {@link MessageLite.Builder} as a field value. This is useful
-   * for implementing methods in {@link MessageLite.Builder}.
-   */
-  static final class Builder<T extends FieldDescriptorLite<T>> {
-
-    private SmallSortedMap<T, Object> fields;
-    private boolean hasLazyField;
-    private boolean isMutable;
-    private boolean hasNestedBuilders;
-
-    private Builder() {
-      this(SmallSortedMap.<T>newFieldMap(DEFAULT_FIELD_MAP_ARRAY_SIZE));
-    }
-
-    private Builder(SmallSortedMap<T, Object> fields) {
-      this.fields = fields;
-      this.isMutable = true;
-    }
-
-    /**
-     * Creates the FieldSet
-     *
-     * @throws UninitializedMessageException if a message field is missing required fields.
-     */
-    public FieldSet<T> build() {
-      return buildImpl(false);
-    }
-
-    /** Creates the FieldSet but does not validate that all required fields are present. */
-    public FieldSet<T> buildPartial() {
-      return buildImpl(true);
-    }
-
-    /**
-     * Creates the FieldSet.
-     *
-     * @param partial controls whether to do a build() or buildPartial() when converting submessage
-     *     builders to messages.
-     */
-    private FieldSet<T> buildImpl(boolean partial) {
-      if (fields.isEmpty()) {
-        return FieldSet.emptySet();
-      }
-      isMutable = false;
-      SmallSortedMap<T, Object> fieldsForBuild = fields;
-      if (hasNestedBuilders) {
-        // Make a copy of the fields map with all Builders replaced by Message.
-        fieldsForBuild = cloneAllFieldsMap(fields, /* copyList */ false);
-        replaceBuilders(fieldsForBuild, partial);
-      }
-      FieldSet<T> fieldSet = new FieldSet<>(fieldsForBuild);
-      fieldSet.hasLazyField = hasLazyField;
-      return fieldSet;
-    }
-
-    private static <T extends FieldDescriptorLite<T>> void replaceBuilders(
-        SmallSortedMap<T, Object> fieldMap, boolean partial) {
-      for (int i = 0; i < fieldMap.getNumArrayEntries(); i++) {
-        replaceBuilders(fieldMap.getArrayEntryAt(i), partial);
-      }
-      for (Map.Entry<T, Object> entry : fieldMap.getOverflowEntries()) {
-        replaceBuilders(entry, partial);
-      }
-    }
-
-    private static <T extends FieldDescriptorLite<T>> void replaceBuilders(
-        Map.Entry<T, Object> entry, boolean partial) {
-      entry.setValue(replaceBuilders(entry.getKey(), entry.getValue(), partial));
-    }
-
-    private static <T extends FieldDescriptorLite<T>> Object replaceBuilders(
-        T descriptor, Object value, boolean partial) {
-      if (value == null) {
-        return value;
-      }
-      if (descriptor.getLiteJavaType() == WireFormat.JavaType.MESSAGE) {
-        if (descriptor.isRepeated()) {
-          if (!(value instanceof List)) {
-            throw new IllegalStateException(
-                "Repeated field should contains a List but actually contains type: "
-                    + value.getClass());
-          }
-          @SuppressWarnings("unchecked")  // We just check that value is an instance of List above.
-          List<Object> list = (List<Object>) value;
-          for (int i = 0; i < list.size(); i++) {
-            Object oldElement = list.get(i);
-            Object newElement = replaceBuilder(oldElement, partial);
-            if (newElement != oldElement) {
-              // If the list contains a Message.Builder, then make a copy of that list and then
-              // modify the Message.Builder into a Message and return the new list. This way, the
-              // existing Message.Builder will still be able to modify the inner fields of the
-              // original FieldSet.Builder.
-              if (list == value) {
-                list = new ArrayList<>(list);
-              }
-              list.set(i, newElement);
-            }
-          }
-          return list;
-        } else {
-          return replaceBuilder(value, partial);
-        }
-      }
-      return value;
-    }
-
-    private static Object replaceBuilder(Object value, boolean partial) {
-      if (!(value instanceof MessageLite.Builder)) {
-        return value;
-      }
-      MessageLite.Builder builder = (MessageLite.Builder) value;
-      if (partial) {
-        return builder.buildPartial();
-      }
-      return builder.build();
-    }
-
-    /** Returns a new Builder using the fields from {@code fieldSet}. */
-    public static <T extends FieldDescriptorLite<T>> Builder<T> fromFieldSet(FieldSet<T> fieldSet) {
-      Builder<T> builder = new Builder<T>(cloneAllFieldsMap(fieldSet.fields, /* copyList */ true));
-      builder.hasLazyField = fieldSet.hasLazyField;
-      return builder;
-    }
-
-    // =================================================================
-
-    /** Get a simple map containing all the fields. */
-    public Map<T, Object> getAllFields() {
-      if (hasLazyField) {
-        SmallSortedMap<T, Object> result = cloneAllFieldsMap(fields, /* copyList */ false);
-        if (fields.isImmutable()) {
-          result.makeImmutable();
-        } else {
-          replaceBuilders(result, true);
-        }
-        return result;
-      }
-      return fields.isImmutable() ? fields : Collections.unmodifiableMap(fields);
-    }
-
-    /** Useful for implementing {@link Message#hasField(Descriptors.FieldDescriptor)}. */
-    public boolean hasField(final T descriptor) {
-      if (descriptor.isRepeated()) {
-        throw new IllegalArgumentException("hasField() can only be called on non-repeated fields.");
-      }
-
-      return fields.get(descriptor) != null;
-    }
-
-    /**
-     * Useful for implementing {@link Message#getField(Descriptors.FieldDescriptor)}. This method
-     * returns {@code null} if the field is not set; in this case it is up to the caller to fetch
-     * the field's default value.
-     */
-    public Object getField(final T descriptor) {
-      Object value = getFieldAllowBuilders(descriptor);
-      return replaceBuilders(descriptor, value, true);
-    }
-
-    /** Same as {@link #getField(F)}, but allow a {@link MessageLite.Builder} to be returned. */
-    Object getFieldAllowBuilders(final T descriptor) {
-      Object o = fields.get(descriptor);
-      if (o instanceof LazyField) {
-        return ((LazyField) o).getValue();
-      }
-      return o;
-    }
-
-    private void ensureIsMutable() {
-      if (!isMutable) {
-        fields = cloneAllFieldsMap(fields, /* copyList */ true);
-        isMutable = true;
-      }
-    }
-
-    /**
-     * Useful for implementing {@link Message.Builder#setField(Descriptors.FieldDescriptor,
-     * Object)}.
-     */
-    @SuppressWarnings({"unchecked", "rawtypes"})
-    public void setField(final T descriptor, Object value) {
-      ensureIsMutable();
-      if (descriptor.isRepeated()) {
-        if (!(value instanceof List)) {
-          throw new IllegalArgumentException(
-              "Wrong object type used with protocol message reflection.");
-        }
-
-        // Wrap the contents in a new list so that the caller cannot change
-        // the list's contents after setting it.
-        final List newList = new ArrayList((List) value);
-        for (final Object element : newList) {
-          verifyType(descriptor, element);
-          hasNestedBuilders = hasNestedBuilders || element instanceof MessageLite.Builder;
-        }
-        value = newList;
-      } else {
-        verifyType(descriptor, value);
-      }
-
-      if (value instanceof LazyField) {
-        hasLazyField = true;
-      }
-      hasNestedBuilders = hasNestedBuilders || value instanceof MessageLite.Builder;
-
-      fields.put(descriptor, value);
-    }
-
-    /** Useful for implementing {@link Message.Builder#clearField(Descriptors.FieldDescriptor)}. */
-    public void clearField(final T descriptor) {
-      ensureIsMutable();
-      fields.remove(descriptor);
-      if (fields.isEmpty()) {
-        hasLazyField = false;
-      }
-    }
-
-    /**
-     * Useful for implementing {@link Message#getRepeatedFieldCount(Descriptors.FieldDescriptor)}.
-     */
-    public int getRepeatedFieldCount(final T descriptor) {
-      if (!descriptor.isRepeated()) {
-        throw new IllegalArgumentException(
-            "getRepeatedFieldCount() can only be called on repeated fields.");
-      }
-
-      final Object value = getFieldAllowBuilders(descriptor);
-      if (value == null) {
-        return 0;
-      } else {
-        return ((List<?>) value).size();
-      }
-    }
-
-    /**
-     * Useful for implementing {@link Message#getRepeatedField(Descriptors.FieldDescriptor, int)}.
-     */
-    public Object getRepeatedField(final T descriptor, final int index) {
-      if (hasNestedBuilders) {
-        ensureIsMutable();
-      }
-      Object value = getRepeatedFieldAllowBuilders(descriptor, index);
-      return replaceBuilder(value, true);
-    }
-
-    /**
-     * Same as {@link #getRepeatedField(F, int)}, but allow a {@link MessageLite.Builder} to be
-     * returned.
-     */
-    Object getRepeatedFieldAllowBuilders(final T descriptor, final int index) {
-      if (!descriptor.isRepeated()) {
-        throw new IllegalArgumentException(
-            "getRepeatedField() can only be called on repeated fields.");
-      }
-
-      final Object value = getFieldAllowBuilders(descriptor);
-
-      if (value == null) {
-        throw new IndexOutOfBoundsException();
-      } else {
-        return ((List<?>) value).get(index);
-      }
-    }
-
-    /**
-     * Useful for implementing {@link Message.Builder#setRepeatedField(Descriptors.FieldDescriptor,
-     * int, Object)}.
-     */
-    @SuppressWarnings("unchecked")
-    public void setRepeatedField(final T descriptor, final int index, final Object value) {
-      ensureIsMutable();
-      if (!descriptor.isRepeated()) {
-        throw new IllegalArgumentException(
-            "getRepeatedField() can only be called on repeated fields.");
-      }
-
-      hasNestedBuilders = hasNestedBuilders || value instanceof MessageLite.Builder;
-
-      final Object list = getFieldAllowBuilders(descriptor);
-      if (list == null) {
-        throw new IndexOutOfBoundsException();
-      }
-
-      verifyType(descriptor, value);
-      ((List<Object>) list).set(index, value);
-    }
-
-    /**
-     * Useful for implementing {@link Message.Builder#addRepeatedField(Descriptors.FieldDescriptor,
-     * Object)}.
-     */
-    @SuppressWarnings("unchecked")
-    public void addRepeatedField(final T descriptor, final Object value) {
-      ensureIsMutable();
-      if (!descriptor.isRepeated()) {
-        throw new IllegalArgumentException(
-            "addRepeatedField() can only be called on repeated fields.");
-      }
-
-      hasNestedBuilders = hasNestedBuilders || value instanceof MessageLite.Builder;
-
-      verifyType(descriptor, value);
-
-      final Object existingValue = getFieldAllowBuilders(descriptor);
-      List<Object> list;
-      if (existingValue == null) {
-        list = new ArrayList<>();
-        fields.put(descriptor, list);
-      } else {
-        list = (List<Object>) existingValue;
-      }
-
-      list.add(value);
-    }
-
-    /**
-     * Verifies that the given object is of the correct type to be a valid value for the given
-     * field. (For repeated fields, this checks if the object is the right type to be one element of
-     * the field.)
-     *
-     * @throws IllegalArgumentException The value is not of the right type.
-     */
-    private void verifyType(final T descriptor, final Object value) {
-      if (!FieldSet.isValidType(descriptor.getLiteType(), value)) {
-        // Builder can accept Message.Builder values even though FieldSet will reject.
-        if (descriptor.getLiteType().getJavaType() == WireFormat.JavaType.MESSAGE
-            && value instanceof MessageLite.Builder) {
-          return;
-        }
-        throw new IllegalArgumentException(
-            String.format(
-                "Wrong object type used with protocol message reflection.\n"
-                + "Field number: %d, field java type: %s, value type: %s\n",
-                descriptor.getNumber(),
-                descriptor.getLiteType().getJavaType(),
-                value.getClass().getName()));
-      }
-    }
-
-    /**
-     * See {@link Message#isInitialized()}. Note: Since {@code FieldSet} itself does not have any
-     * way of knowing about required fields that aren't actually present in the set, it is up to the
-     * caller to check that all required fields are present.
-     */
-    public boolean isInitialized() {
-      for (int i = 0; i < fields.getNumArrayEntries(); i++) {
-        if (!FieldSet.isInitialized(fields.getArrayEntryAt(i))) {
-          return false;
-        }
-      }
-      for (final Map.Entry<T, Object> entry : fields.getOverflowEntries()) {
-        if (!FieldSet.isInitialized(entry)) {
-          return false;
-        }
-      }
-      return true;
-    }
-
-    /**
-     * Like {@link Message.Builder#mergeFrom(Message)}, but merges from another {@link FieldSet}.
-     */
-    public void mergeFrom(final FieldSet<T> other) {
-      ensureIsMutable();
-      for (int i = 0; i < other.fields.getNumArrayEntries(); i++) {
-        mergeFromField(other.fields.getArrayEntryAt(i));
-      }
-      for (final Map.Entry<T, Object> entry : other.fields.getOverflowEntries()) {
-        mergeFromField(entry);
-      }
-    }
-
-    @SuppressWarnings("unchecked")
-    private void mergeFromField(final Map.Entry<T, Object> entry) {
-      final T descriptor = entry.getKey();
-      Object otherValue = entry.getValue();
-      if (otherValue instanceof LazyField) {
-        otherValue = ((LazyField) otherValue).getValue();
-      }
-
-      if (descriptor.isRepeated()) {
-        List<Object> value = (List<Object>) getFieldAllowBuilders(descriptor);
-        if (value == null) {
-          value = new ArrayList<>();
-          fields.put(descriptor, value);
-        }
-        for (Object element : (List<?>) otherValue) {
-          value.add(FieldSet.cloneIfMutable(element));
-        }
-      } else if (descriptor.getLiteJavaType() == WireFormat.JavaType.MESSAGE) {
-        Object value = getFieldAllowBuilders(descriptor);
-        if (value == null) {
-          fields.put(descriptor, FieldSet.cloneIfMutable(otherValue));
-        } else {
-          // Merge the messages.
-          if (value instanceof MessageLite.Builder) {
-            descriptor.internalMergeFrom((MessageLite.Builder) value, (MessageLite) otherValue);
-          } else {
-            value =
-                descriptor
-                    .internalMergeFrom(((MessageLite) value).toBuilder(), (MessageLite) otherValue)
-                    .build();
-            fields.put(descriptor, value);
-          }
-        }
-      } else {
-        fields.put(descriptor, cloneIfMutable(otherValue));
-      }
-    }
-  }
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/FieldType.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/FieldType.java
deleted file mode 100644
index 7232753..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/FieldType.java
+++ /dev/null
@@ -1,344 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
-import java.lang.reflect.TypeVariable;
-import java.util.List;
-
-/** Enumeration identifying all relevant type information for a protobuf field. */
-@ExperimentalApi
-public enum FieldType {
-  DOUBLE(0, Collection.SCALAR, JavaType.DOUBLE),
-  FLOAT(1, Collection.SCALAR, JavaType.FLOAT),
-  INT64(2, Collection.SCALAR, JavaType.LONG),
-  UINT64(3, Collection.SCALAR, JavaType.LONG),
-  INT32(4, Collection.SCALAR, JavaType.INT),
-  FIXED64(5, Collection.SCALAR, JavaType.LONG),
-  FIXED32(6, Collection.SCALAR, JavaType.INT),
-  BOOL(7, Collection.SCALAR, JavaType.BOOLEAN),
-  STRING(8, Collection.SCALAR, JavaType.STRING),
-  MESSAGE(9, Collection.SCALAR, JavaType.MESSAGE),
-  BYTES(10, Collection.SCALAR, JavaType.BYTE_STRING),
-  UINT32(11, Collection.SCALAR, JavaType.INT),
-  ENUM(12, Collection.SCALAR, JavaType.ENUM),
-  SFIXED32(13, Collection.SCALAR, JavaType.INT),
-  SFIXED64(14, Collection.SCALAR, JavaType.LONG),
-  SINT32(15, Collection.SCALAR, JavaType.INT),
-  SINT64(16, Collection.SCALAR, JavaType.LONG),
-  GROUP(17, Collection.SCALAR, JavaType.MESSAGE),
-  DOUBLE_LIST(18, Collection.VECTOR, JavaType.DOUBLE),
-  FLOAT_LIST(19, Collection.VECTOR, JavaType.FLOAT),
-  INT64_LIST(20, Collection.VECTOR, JavaType.LONG),
-  UINT64_LIST(21, Collection.VECTOR, JavaType.LONG),
-  INT32_LIST(22, Collection.VECTOR, JavaType.INT),
-  FIXED64_LIST(23, Collection.VECTOR, JavaType.LONG),
-  FIXED32_LIST(24, Collection.VECTOR, JavaType.INT),
-  BOOL_LIST(25, Collection.VECTOR, JavaType.BOOLEAN),
-  STRING_LIST(26, Collection.VECTOR, JavaType.STRING),
-  MESSAGE_LIST(27, Collection.VECTOR, JavaType.MESSAGE),
-  BYTES_LIST(28, Collection.VECTOR, JavaType.BYTE_STRING),
-  UINT32_LIST(29, Collection.VECTOR, JavaType.INT),
-  ENUM_LIST(30, Collection.VECTOR, JavaType.ENUM),
-  SFIXED32_LIST(31, Collection.VECTOR, JavaType.INT),
-  SFIXED64_LIST(32, Collection.VECTOR, JavaType.LONG),
-  SINT32_LIST(33, Collection.VECTOR, JavaType.INT),
-  SINT64_LIST(34, Collection.VECTOR, JavaType.LONG),
-  DOUBLE_LIST_PACKED(35, Collection.PACKED_VECTOR, JavaType.DOUBLE),
-  FLOAT_LIST_PACKED(36, Collection.PACKED_VECTOR, JavaType.FLOAT),
-  INT64_LIST_PACKED(37, Collection.PACKED_VECTOR, JavaType.LONG),
-  UINT64_LIST_PACKED(38, Collection.PACKED_VECTOR, JavaType.LONG),
-  INT32_LIST_PACKED(39, Collection.PACKED_VECTOR, JavaType.INT),
-  FIXED64_LIST_PACKED(40, Collection.PACKED_VECTOR, JavaType.LONG),
-  FIXED32_LIST_PACKED(41, Collection.PACKED_VECTOR, JavaType.INT),
-  BOOL_LIST_PACKED(42, Collection.PACKED_VECTOR, JavaType.BOOLEAN),
-  UINT32_LIST_PACKED(43, Collection.PACKED_VECTOR, JavaType.INT),
-  ENUM_LIST_PACKED(44, Collection.PACKED_VECTOR, JavaType.ENUM),
-  SFIXED32_LIST_PACKED(45, Collection.PACKED_VECTOR, JavaType.INT),
-  SFIXED64_LIST_PACKED(46, Collection.PACKED_VECTOR, JavaType.LONG),
-  SINT32_LIST_PACKED(47, Collection.PACKED_VECTOR, JavaType.INT),
-  SINT64_LIST_PACKED(48, Collection.PACKED_VECTOR, JavaType.LONG),
-  GROUP_LIST(49, Collection.VECTOR, JavaType.MESSAGE),
-  MAP(50, Collection.MAP, JavaType.VOID);
-
-  private final JavaType javaType;
-  private final int id;
-  private final Collection collection;
-  private final Class<?> elementType;
-  private final boolean primitiveScalar;
-
-  FieldType(int id, Collection collection, JavaType javaType) {
-    this.id = id;
-    this.collection = collection;
-    this.javaType = javaType;
-
-    switch (collection) {
-      case MAP:
-        elementType = javaType.getBoxedType();
-        break;
-      case VECTOR:
-        elementType = javaType.getBoxedType();
-        break;
-      case SCALAR:
-      default:
-        elementType = null;
-        break;
-    }
-
-    boolean primitiveScalar = false;
-    if (collection == Collection.SCALAR) {
-      switch (javaType) {
-        case BYTE_STRING:
-        case MESSAGE:
-        case STRING:
-          break;
-        default:
-          primitiveScalar = true;
-          break;
-      }
-    }
-    this.primitiveScalar = primitiveScalar;
-  }
-
-  /** A reliable unique identifier for this type. */
-  public int id() {
-    return id;
-  }
-
-  /**
-   * Gets the {@link JavaType} for this field. For lists, this identifies the type of the elements
-   * contained within the list.
-   */
-  public JavaType getJavaType() {
-    return javaType;
-  }
-
-  /** Indicates whether a list field should be represented on the wire in packed form. */
-  public boolean isPacked() {
-    return Collection.PACKED_VECTOR.equals(collection);
-  }
-
-  /**
-   * Indicates whether this field type represents a primitive scalar value. If this is {@code true},
-   * then {@link #isScalar()} will also be {@code true}.
-   */
-  public boolean isPrimitiveScalar() {
-    return primitiveScalar;
-  }
-
-  /** Indicates whether this field type represents a scalar value. */
-  public boolean isScalar() {
-    return collection == Collection.SCALAR;
-  }
-
-  /** Indicates whether this field represents a list of values. */
-  public boolean isList() {
-    return collection.isList();
-  }
-
-  /** Indicates whether this field represents a map. */
-  public boolean isMap() {
-    return collection == Collection.MAP;
-  }
-
-  /** Indicates whether or not this {@link FieldType} can be applied to the given {@link Field}. */
-  public boolean isValidForField(Field field) {
-    if (Collection.VECTOR.equals(collection)) {
-      return isValidForList(field);
-    } else {
-      return javaType.getType().isAssignableFrom(field.getType());
-    }
-  }
-
-  private boolean isValidForList(Field field) {
-    Class<?> clazz = field.getType();
-    if (!javaType.getType().isAssignableFrom(clazz)) {
-      // The field isn't a List type.
-      return false;
-    }
-    Type[] types = EMPTY_TYPES;
-    Type genericType = field.getGenericType();
-    if (genericType instanceof ParameterizedType) {
-      types = ((ParameterizedType) field.getGenericType()).getActualTypeArguments();
-    }
-    Type listParameter = getListParameter(clazz, types);
-    if (!(listParameter instanceof Class)) {
-      // It's a wildcard, we should allow anything in the list.
-      return true;
-    }
-    return elementType.isAssignableFrom((Class<?>) listParameter);
-  }
-
-  /**
-   * Looks up the appropriate {@link FieldType} by it's identifier.
-   *
-   * @return the {@link FieldType} or {@code null} if not found.
-   */
-  public static FieldType forId(int id) {
-    if (id < 0 || id >= VALUES.length) {
-      return null;
-    }
-    return VALUES[id];
-  }
-
-  private static final FieldType[] VALUES;
-  private static final Type[] EMPTY_TYPES = new Type[0];
-
-  static {
-    FieldType[] values = values();
-    VALUES = new FieldType[values.length];
-    for (FieldType type : values) {
-      VALUES[type.id] = type;
-    }
-  }
-
-  /**
-   * Given a class, finds a generic super class or interface that extends {@link List}.
-   *
-   * @return the generic super class/interface, or {@code null} if not found.
-   */
-  private static Type getGenericSuperList(Class<?> clazz) {
-    // First look at interfaces.
-    Type[] genericInterfaces = clazz.getGenericInterfaces();
-    for (Type genericInterface : genericInterfaces) {
-      if (genericInterface instanceof ParameterizedType) {
-        ParameterizedType parameterizedType = (ParameterizedType) genericInterface;
-        Class<?> rawType = (Class<?>) parameterizedType.getRawType();
-        if (List.class.isAssignableFrom(rawType)) {
-          return genericInterface;
-        }
-      }
-    }
-
-    // Try the subclass
-    Type type = clazz.getGenericSuperclass();
-    if (type instanceof ParameterizedType) {
-      ParameterizedType parameterizedType = (ParameterizedType) type;
-      Class<?> rawType = (Class<?>) parameterizedType.getRawType();
-      if (List.class.isAssignableFrom(rawType)) {
-        return type;
-      }
-    }
-
-    // No super class/interface extends List.
-    return null;
-  }
-
-  /**
-   * Inspects the inheritance hierarchy for the given class and finds the generic type parameter for
-   * {@link List}.
-   *
-   * @param clazz the class to begin the search.
-   * @param realTypes the array of actual type parameters for {@code clazz}. These will be used to
-   *     substitute generic parameters up the inheritance hierarchy. If {@code clazz} does not have
-   *     any generic parameters, this list should be empty.
-   * @return the {@link List} parameter.
-   */
-  private static Type getListParameter(Class<?> clazz, Type[] realTypes) {
-    top:
-    while (clazz != List.class) {
-      // First look at generic subclass and interfaces.
-      Type genericType = getGenericSuperList(clazz);
-      if (genericType instanceof ParameterizedType) {
-        // Replace any generic parameters with the real values.
-        ParameterizedType parameterizedType = (ParameterizedType) genericType;
-        Type[] superArgs = parameterizedType.getActualTypeArguments();
-        for (int i = 0; i < superArgs.length; ++i) {
-          Type superArg = superArgs[i];
-          if (superArg instanceof TypeVariable) {
-            // Get the type variables for this class so that we can match them to the variables
-            // used on the super class.
-            TypeVariable<?>[] clazzParams = clazz.getTypeParameters();
-            if (realTypes.length != clazzParams.length) {
-              throw new RuntimeException("Type array mismatch");
-            }
-
-            // Replace the variable parameter with the real type.
-            boolean foundReplacement = false;
-            for (int j = 0; j < clazzParams.length; ++j) {
-              if (superArg == clazzParams[j]) {
-                Type realType = realTypes[j];
-                superArgs[i] = realType;
-                foundReplacement = true;
-                break;
-              }
-            }
-            if (!foundReplacement) {
-              throw new RuntimeException("Unable to find replacement for " + superArg);
-            }
-          }
-        }
-
-        Class<?> parent = (Class<?>) parameterizedType.getRawType();
-
-        realTypes = superArgs;
-        clazz = parent;
-        continue;
-      }
-
-      // None of the parameterized types inherit List. Just continue up the inheritance hierarchy
-      // toward the List interface until we can identify the parameters.
-      realTypes = EMPTY_TYPES;
-      for (Class<?> iface : clazz.getInterfaces()) {
-        if (List.class.isAssignableFrom(iface)) {
-          clazz = iface;
-          continue top;
-        }
-      }
-      clazz = clazz.getSuperclass();
-    }
-
-    if (realTypes.length != 1) {
-      throw new RuntimeException("Unable to identify parameter type for List<T>");
-    }
-    return realTypes[0];
-  }
-
-  enum Collection {
-    SCALAR(false),
-    VECTOR(true),
-    PACKED_VECTOR(true),
-    MAP(false);
-
-    private final boolean isList;
-
-    Collection(boolean isList) {
-      this.isList = isList;
-    }
-
-    /** @return the isList */
-    public boolean isList() {
-      return isList;
-    }
-  }
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/FloatArrayList.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/FloatArrayList.java
deleted file mode 100644
index e6feba8..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/FloatArrayList.java
+++ /dev/null
@@ -1,297 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.protobuf.Internal.checkNotNull;
-
-import com.google.protobuf.Internal.FloatList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.RandomAccess;
-
-/**
- * An implementation of {@link FloatList} on top of a primitive array.
- *
- * @author dweis@google.com (Daniel Weis)
- */
-final class FloatArrayList extends AbstractProtobufList<Float>
-    implements FloatList, RandomAccess, PrimitiveNonBoxingCollection {
-
-  private static final FloatArrayList EMPTY_LIST = new FloatArrayList(new float[0], 0);
-  static {
-    EMPTY_LIST.makeImmutable();
-  }
-
-  public static FloatArrayList emptyList() {
-    return EMPTY_LIST;
-  }
-
-  /** The backing store for the list. */
-  private float[] array;
-
-  /**
-   * The size of the list distinct from the length of the array. That is, it is the number of
-   * elements set in the list.
-   */
-  private int size;
-
-  /** Constructs a new mutable {@code FloatArrayList} with default capacity. */
-  FloatArrayList() {
-    this(new float[DEFAULT_CAPACITY], 0);
-  }
-
-  /**
-   * Constructs a new mutable {@code FloatArrayList} containing the same elements as {@code other}.
-   */
-  private FloatArrayList(float[] other, int size) {
-    array = other;
-    this.size = size;
-  }
-
-  @Override
-  protected void removeRange(int fromIndex, int toIndex) {
-    ensureIsMutable();
-    if (toIndex < fromIndex) {
-      throw new IndexOutOfBoundsException("toIndex < fromIndex");
-    }
-
-    System.arraycopy(array, toIndex, array, fromIndex, size - toIndex);
-    size -= (toIndex - fromIndex);
-    modCount++;
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (!(o instanceof FloatArrayList)) {
-      return super.equals(o);
-    }
-    FloatArrayList other = (FloatArrayList) o;
-    if (size != other.size) {
-      return false;
-    }
-
-    final float[] arr = other.array;
-    for (int i = 0; i < size; i++) {
-      if (Float.floatToIntBits(array[i]) != Float.floatToIntBits(arr[i])) {
-        return false;
-      }
-    }
-
-    return true;
-  }
-
-  @Override
-  public int hashCode() {
-    int result = 1;
-    for (int i = 0; i < size; i++) {
-      result = (31 * result) + Float.floatToIntBits(array[i]);
-    }
-    return result;
-  }
-
-  @Override
-  public FloatList mutableCopyWithCapacity(int capacity) {
-    if (capacity < size) {
-      throw new IllegalArgumentException();
-    }
-    return new FloatArrayList(Arrays.copyOf(array, capacity), size);
-  }
-
-  @Override
-  public Float get(int index) {
-    return getFloat(index);
-  }
-
-  @Override
-  public float getFloat(int index) {
-    ensureIndexInRange(index);
-    return array[index];
-  }
-
-  @Override
-  public int indexOf(Object element) {
-    if (!(element instanceof Float)) {
-      return -1;
-    }
-    float unboxedElement = (Float) element;
-    int numElems = size();
-    for (int i = 0; i < numElems; i++) {
-      if (array[i] == unboxedElement) {
-        return i;
-      }
-    }
-    return -1;
-  }
-
-  @Override
-  public boolean contains(Object element) {
-    return indexOf(element) != -1;
-  }
-
-  @Override
-  public int size() {
-    return size;
-  }
-
-  @Override
-  public Float set(int index, Float element) {
-    return setFloat(index, element);
-  }
-
-  @Override
-  public float setFloat(int index, float element) {
-    ensureIsMutable();
-    ensureIndexInRange(index);
-    float previousValue = array[index];
-    array[index] = element;
-    return previousValue;
-  }
-
-  @Override
-  public boolean add(Float element) {
-    addFloat(element);
-    return true;
-  }
-
-  @Override
-  public void add(int index, Float element) {
-    addFloat(index, element);
-  }
-
-  /** Like {@link #add(Float)} but more efficient in that it doesn't box the element. */
-  @Override
-  public void addFloat(float element) {
-    ensureIsMutable();
-    if (size == array.length) {
-      // Resize to 1.5x the size
-      int length = ((size * 3) / 2) + 1;
-      float[] newArray = new float[length];
-
-      System.arraycopy(array, 0, newArray, 0, size);
-      array = newArray;
-    }
-
-    array[size++] = element;
-  }
-
-  /** Like {@link #add(int, Float)} but more efficient in that it doesn't box the element. */
-  private void addFloat(int index, float element) {
-    ensureIsMutable();
-    if (index < 0 || index > size) {
-      throw new IndexOutOfBoundsException(makeOutOfBoundsExceptionMessage(index));
-    }
-
-    if (size < array.length) {
-      // Shift everything over to make room
-      System.arraycopy(array, index, array, index + 1, size - index);
-    } else {
-      // Resize to 1.5x the size
-      int length = ((size * 3) / 2) + 1;
-      float[] newArray = new float[length];
-
-      // Copy the first part directly
-      System.arraycopy(array, 0, newArray, 0, index);
-
-      // Copy the rest shifted over by one to make room
-      System.arraycopy(array, index, newArray, index + 1, size - index);
-      array = newArray;
-    }
-
-    array[index] = element;
-    size++;
-    modCount++;
-  }
-
-  @Override
-  public boolean addAll(Collection<? extends Float> collection) {
-    ensureIsMutable();
-
-    checkNotNull(collection);
-
-    // We specialize when adding another FloatArrayList to avoid boxing elements.
-    if (!(collection instanceof FloatArrayList)) {
-      return super.addAll(collection);
-    }
-
-    FloatArrayList list = (FloatArrayList) collection;
-    if (list.size == 0) {
-      return false;
-    }
-
-    int overflow = Integer.MAX_VALUE - size;
-    if (overflow < list.size) {
-      // We can't actually represent a list this large.
-      throw new OutOfMemoryError();
-    }
-
-    int newSize = size + list.size;
-    if (newSize > array.length) {
-      array = Arrays.copyOf(array, newSize);
-    }
-
-    System.arraycopy(list.array, 0, array, size, list.size);
-    size = newSize;
-    modCount++;
-    return true;
-  }
-
-  @Override
-  public Float remove(int index) {
-    ensureIsMutable();
-    ensureIndexInRange(index);
-    float value = array[index];
-    if (index < size - 1) {
-      System.arraycopy(array, index + 1, array, index, size - index - 1);
-    }
-    size--;
-    modCount++;
-    return value;
-  }
-
-  /**
-   * Ensures that the provided {@code index} is within the range of {@code [0, size]}. Throws an
-   * {@link IndexOutOfBoundsException} if it is not.
-   *
-   * @param index the index to verify is in range
-   */
-  private void ensureIndexInRange(int index) {
-    if (index < 0 || index >= size) {
-      throw new IndexOutOfBoundsException(makeOutOfBoundsExceptionMessage(index));
-    }
-  }
-
-  private String makeOutOfBoundsExceptionMessage(int index) {
-    return "Index:" + index + ", Size:" + size;
-  }
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/GeneratedMessage.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/GeneratedMessage.java
deleted file mode 100644
index de0ee11..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/GeneratedMessage.java
+++ /dev/null
@@ -1,3051 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import com.google.protobuf.Descriptors.Descriptor;
-import com.google.protobuf.Descriptors.EnumDescriptor;
-import com.google.protobuf.Descriptors.EnumValueDescriptor;
-import com.google.protobuf.Descriptors.FieldDescriptor;
-import com.google.protobuf.Descriptors.FileDescriptor;
-import com.google.protobuf.Descriptors.OneofDescriptor;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.ObjectStreamException;
-import java.io.Serializable;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
-
-/**
- * All generated protocol message classes extend this class.  This class
- * implements most of the Message and Builder interfaces using Java reflection.
- * Users can ignore this class and pretend that generated messages implement
- * the Message interface directly.
- *
- * @author kenton@google.com Kenton Varda
- */
-public abstract class GeneratedMessage extends AbstractMessage
-    implements Serializable {
-  private static final long serialVersionUID = 1L;
-
-  /**
-   * For testing. Allows a test to disable the optimization that avoids using
-   * field builders for nested messages until they are requested. By disabling
-   * this optimization, existing tests can be reused to test the field builders.
-   */
-  protected static boolean alwaysUseFieldBuilders = false;
-
-  /** For use by generated code only.  */
-  protected UnknownFieldSet unknownFields;
-
-  protected GeneratedMessage() {
-    unknownFields = UnknownFieldSet.getDefaultInstance();
-  }
-
-  protected GeneratedMessage(Builder<?> builder) {
-    unknownFields = builder.getUnknownFields();
-  }
-
-  @Override
-  public Parser<? extends GeneratedMessage> getParserForType() {
-    throw new UnsupportedOperationException(
-        "This is supposed to be overridden by subclasses.");
-  }
-
- /**
-  * For testing. Allows a test to disable the optimization that avoids using
-  * field builders for nested messages until they are requested. By disabling
-  * this optimization, existing tests can be reused to test the field builders.
-  * See {@link RepeatedFieldBuilder} and {@link SingleFieldBuilder}.
-  */
-  static void enableAlwaysUseFieldBuildersForTesting() {
-    alwaysUseFieldBuilders = true;
-  }
-
-  /**
-   * Get the FieldAccessorTable for this type.  We can't have the message
-   * class pass this in to the constructor because of bootstrapping trouble
-   * with DescriptorProtos.
-   */
-  protected abstract FieldAccessorTable internalGetFieldAccessorTable();
-
-  @Override
-  public Descriptor getDescriptorForType() {
-    return internalGetFieldAccessorTable().descriptor;
-  }
-
-  /**
-   * Internal helper to return a modifiable map containing all the fields.
-   * The returned Map is modifialbe so that the caller can add additional
-   * extension fields to implement {@link #getAllFields()}.
-   *
-   * @param getBytesForString whether to generate ByteString for string fields
-   */
-  private Map<FieldDescriptor, Object> getAllFieldsMutable(
-      boolean getBytesForString) {
-    final TreeMap<FieldDescriptor, Object> result =
-      new TreeMap<FieldDescriptor, Object>();
-    final Descriptor descriptor = internalGetFieldAccessorTable().descriptor;
-    final List<FieldDescriptor> fields = descriptor.getFields();
-
-    for (int i = 0; i < fields.size(); i++) {
-      FieldDescriptor field = fields.get(i);
-      final OneofDescriptor oneofDescriptor = field.getContainingOneof();
-
-      /*
-       * If the field is part of a Oneof, then at maximum one field in the Oneof is set
-       * and it is not repeated. There is no need to iterate through the others.
-       */
-      if (oneofDescriptor != null) {
-        // Skip other fields in the Oneof we know are not set
-        i += oneofDescriptor.getFieldCount() - 1;
-        if (!hasOneof(oneofDescriptor)) {
-          // If no field is set in the Oneof, skip all the fields in the Oneof
-          continue;
-        }
-        // Get the pointer to the only field which is set in the Oneof
-        field = getOneofFieldDescriptor(oneofDescriptor);
-      } else {
-        // If we are not in a Oneof, we need to check if the field is set and if it is repeated
-        if (field.isRepeated()) {
-          final List<?> value = (List<?>) getField(field);
-          if (!value.isEmpty()) {
-            result.put(field, value);
-          }
-          continue;
-        }
-        if (!hasField(field)) {
-          continue;
-        }
-      }
-      // Add the field to the map
-      if (getBytesForString && field.getJavaType() == FieldDescriptor.JavaType.STRING) {
-        result.put(field, getFieldRaw(field));
-      } else {
-        result.put(field, getField(field));
-      }
-    }
-    return result;
-  }
-
-  @Override
-  public boolean isInitialized() {
-    for (final FieldDescriptor field : getDescriptorForType().getFields()) {
-      // Check that all required fields are present.
-      if (field.isRequired()) {
-        if (!hasField(field)) {
-          return false;
-        }
-      }
-      // Check that embedded messages are initialized.
-      if (field.getJavaType() == FieldDescriptor.JavaType.MESSAGE) {
-        if (field.isRepeated()) {
-          @SuppressWarnings("unchecked") final
-          List<Message> messageList = (List<Message>) getField(field);
-          for (final Message element : messageList) {
-            if (!element.isInitialized()) {
-              return false;
-            }
-          }
-        } else {
-          if (hasField(field) && !((Message) getField(field)).isInitialized()) {
-            return false;
-          }
-        }
-      }
-    }
-
-    return true;
-  }
-
-  @Override
-  public Map<FieldDescriptor, Object> getAllFields() {
-    return Collections.unmodifiableMap(
-        getAllFieldsMutable(/* getBytesForString = */ false));
-  }
-
-  /**
-   * Returns a collection of all the fields in this message which are set
-   * and their corresponding values.  A singular ("required" or "optional")
-   * field is set iff hasField() returns true for that field.  A "repeated"
-   * field is set iff getRepeatedFieldCount() is greater than zero.  The
-   * values are exactly what would be returned by calling
-   * {@link #getFieldRaw(Descriptors.FieldDescriptor)} for each field.  The map
-   * is guaranteed to be a sorted map, so iterating over it will return fields
-   * in order by field number.
-   */
-  Map<FieldDescriptor, Object> getAllFieldsRaw() {
-    return Collections.unmodifiableMap(
-        getAllFieldsMutable(/* getBytesForString = */ true));
-  }
-
-  @Override
-  public boolean hasOneof(final OneofDescriptor oneof) {
-    return internalGetFieldAccessorTable().getOneof(oneof).has(this);
-  }
-
-  @Override
-  public FieldDescriptor getOneofFieldDescriptor(final OneofDescriptor oneof) {
-    return internalGetFieldAccessorTable().getOneof(oneof).get(this);
-  }
-
-  @Override
-  public boolean hasField(final FieldDescriptor field) {
-    return internalGetFieldAccessorTable().getField(field).has(this);
-  }
-
-  @Override
-  public Object getField(final FieldDescriptor field) {
-    return internalGetFieldAccessorTable().getField(field).get(this);
-  }
-
-  /**
-   * Obtains the value of the given field, or the default value if it is
-   * not set.  For primitive fields, the boxed primitive value is returned.
-   * For enum fields, the EnumValueDescriptor for the value is returned. For
-   * embedded message fields, the sub-message is returned.  For repeated
-   * fields, a java.util.List is returned. For present string fields, a
-   * ByteString is returned representing the bytes that the field contains.
-   */
-  Object getFieldRaw(final FieldDescriptor field) {
-    return internalGetFieldAccessorTable().getField(field).getRaw(this);
-  }
-
-  @Override
-  public int getRepeatedFieldCount(final FieldDescriptor field) {
-    return internalGetFieldAccessorTable().getField(field)
-      .getRepeatedCount(this);
-  }
-
-  @Override
-  public Object getRepeatedField(final FieldDescriptor field, final int index) {
-    return internalGetFieldAccessorTable().getField(field)
-      .getRepeated(this, index);
-  }
-
-  @Override
-  public UnknownFieldSet getUnknownFields() {
-    throw new UnsupportedOperationException(
-        "This is supposed to be overridden by subclasses.");
-  }
-
-  /**
-   * Called by subclasses to parse an unknown field.
-   * @return {@code true} unless the tag is an end-group tag.
-   */
-  protected boolean parseUnknownField(
-      CodedInputStream input,
-      UnknownFieldSet.Builder unknownFields,
-      ExtensionRegistryLite extensionRegistry,
-      int tag) throws IOException {
-    return unknownFields.mergeFieldFrom(tag, input);
-  }
-
-  protected static <M extends Message> M parseWithIOException(Parser<M> parser, InputStream input)
-      throws IOException {
-    try {
-      return parser.parseFrom(input);
-    } catch (InvalidProtocolBufferException e) {
-      throw e.unwrapIOException();
-    }
-  }
-
-  protected static <M extends Message> M parseWithIOException(Parser<M> parser, InputStream input,
-      ExtensionRegistryLite extensions) throws IOException {
-    try {
-      return parser.parseFrom(input, extensions);
-    } catch (InvalidProtocolBufferException e) {
-      throw e.unwrapIOException();
-    }
-  }
-
-  protected static <M extends Message> M parseWithIOException(Parser<M> parser,
-      CodedInputStream input) throws IOException {
-    try {
-      return parser.parseFrom(input);
-    } catch (InvalidProtocolBufferException e) {
-      throw e.unwrapIOException();
-    }
-  }
-
-  protected static <M extends Message> M parseWithIOException(Parser<M> parser,
-      CodedInputStream input, ExtensionRegistryLite extensions) throws IOException {
-    try {
-      return parser.parseFrom(input, extensions);
-    } catch (InvalidProtocolBufferException e) {
-      throw e.unwrapIOException();
-    }
-  }
-
-  protected static <M extends Message> M parseDelimitedWithIOException(Parser<M> parser,
-      InputStream input) throws IOException {
-    try {
-      return parser.parseDelimitedFrom(input);
-    } catch (InvalidProtocolBufferException e) {
-      throw e.unwrapIOException();
-    }
-  }
-
-  protected static <M extends Message> M parseDelimitedWithIOException(Parser<M> parser,
-      InputStream input, ExtensionRegistryLite extensions) throws IOException {
-    try {
-      return parser.parseDelimitedFrom(input, extensions);
-    } catch (InvalidProtocolBufferException e) {
-      throw e.unwrapIOException();
-    }
-  }
-
-  @Override
-  public void writeTo(final CodedOutputStream output) throws IOException {
-    MessageReflection.writeMessageTo(this, getAllFieldsRaw(), output, false);
-  }
-
-  @Override
-  public int getSerializedSize() {
-    int size = memoizedSize;
-    if (size != -1) {
-      return size;
-    }
-
-    memoizedSize = MessageReflection.getSerializedSize(
-        this, getAllFieldsRaw());
-    return memoizedSize;
-  }
-
-
-
-  /**
-   * Used by parsing constructors in generated classes.
-   */
-  protected void makeExtensionsImmutable() {
-    // Noop for messages without extensions.
-  }
-
-  /**
-   * TODO(xiaofeng): remove this after b/29368482 is fixed. We need to move this
-   * interface to AbstractMessage in order to versioning GeneratedMessage but
-   * this move breaks binary compatibility for AppEngine. After AppEngine is
-   * fixed we can exclude this from google3.
-   */
-  protected interface BuilderParent extends AbstractMessage.BuilderParent {}
-
-  /**
-   * TODO(xiaofeng): remove this together with GeneratedMessage.BuilderParent.
-   */
-  protected abstract Message.Builder newBuilderForType(BuilderParent parent);
-
-  @Override
-  protected Message.Builder newBuilderForType(final AbstractMessage.BuilderParent parent) {
-    return newBuilderForType(new BuilderParent() {
-      @Override
-      public void markDirty() {
-        parent.markDirty();
-      }
-    });
-  }
-
-
-  @SuppressWarnings("unchecked")
-  public abstract static class Builder <BuilderType extends Builder<BuilderType>>
-      extends AbstractMessage.Builder<BuilderType> {
-
-    private BuilderParent builderParent;
-
-    private BuilderParentImpl meAsParent;
-
-    // Indicates that we've built a message and so we are now obligated
-    // to dispatch dirty invalidations. See GeneratedMessage.BuilderListener.
-    private boolean isClean;
-
-    private UnknownFieldSet unknownFields =
-        UnknownFieldSet.getDefaultInstance();
-
-    protected Builder() {
-      this(null);
-    }
-
-    protected Builder(BuilderParent builderParent) {
-      this.builderParent = builderParent;
-    }
-
-    @Override
-    void dispose() {
-      builderParent = null;
-    }
-
-    /**
-     * Called by the subclass when a message is built.
-     */
-    protected void onBuilt() {
-      if (builderParent != null) {
-        markClean();
-      }
-    }
-
-    /**
-     * Called by the subclass or a builder to notify us that a message was
-     * built and may be cached and therefore invalidations are needed.
-     */
-    @Override
-    protected void markClean() {
-      this.isClean = true;
-    }
-
-    /**
-     * Gets whether invalidations are needed
-     *
-     * @return whether invalidations are needed
-     */
-    protected boolean isClean() {
-      return isClean;
-    }
-
-    @Override
-    public BuilderType clone() {
-      BuilderType builder =
-          (BuilderType) getDefaultInstanceForType().newBuilderForType();
-      builder.mergeFrom(buildPartial());
-      return builder;
-    }
-
-    /**
-     * Called by the initialization and clear code paths to allow subclasses to
-     * reset any of their builtin fields back to the initial values.
-     */
-    @Override
-    public BuilderType clear() {
-      unknownFields = UnknownFieldSet.getDefaultInstance();
-      onChanged();
-      return (BuilderType) this;
-    }
-
-    /**
-     * Get the FieldAccessorTable for this type.  We can't have the message
-     * class pass this in to the constructor because of bootstrapping trouble
-     * with DescriptorProtos.
-     */
-    protected abstract FieldAccessorTable internalGetFieldAccessorTable();
-
-    @Override
-    public Descriptor getDescriptorForType() {
-      return internalGetFieldAccessorTable().descriptor;
-    }
-
-    @Override
-    public Map<FieldDescriptor, Object> getAllFields() {
-      return Collections.unmodifiableMap(getAllFieldsMutable());
-    }
-
-    /** Internal helper which returns a mutable map. */
-    private Map<FieldDescriptor, Object> getAllFieldsMutable() {
-      final TreeMap<FieldDescriptor, Object> result =
-        new TreeMap<FieldDescriptor, Object>();
-      final Descriptor descriptor = internalGetFieldAccessorTable().descriptor;
-      final List<FieldDescriptor> fields = descriptor.getFields();
-
-      for (int i = 0; i < fields.size(); i++) {
-        FieldDescriptor field = fields.get(i);
-        final OneofDescriptor oneofDescriptor = field.getContainingOneof();
-
-        /*
-         * If the field is part of a Oneof, then at maximum one field in the Oneof is set
-         * and it is not repeated. There is no need to iterate through the others.
-         */
-        if (oneofDescriptor != null) {
-          // Skip other fields in the Oneof we know are not set
-          i += oneofDescriptor.getFieldCount() - 1;
-          if (!hasOneof(oneofDescriptor)) {
-            // If no field is set in the Oneof, skip all the fields in the Oneof
-            continue;
-          }
-          // Get the pointer to the only field which is set in the Oneof
-          field = getOneofFieldDescriptor(oneofDescriptor);
-        } else {
-          // If we are not in a Oneof, we need to check if the field is set and if it is repeated
-          if (field.isRepeated()) {
-            final List<?> value = (List<?>) getField(field);
-            if (!value.isEmpty()) {
-              result.put(field, value);
-            }
-            continue;
-          }
-          if (!hasField(field)) {
-            continue;
-          }
-        }
-        // Add the field to the map
-        result.put(field, getField(field));
-      }
-      return result;
-    }
-
-    @Override
-    public Message.Builder newBuilderForField(final FieldDescriptor field) {
-      return internalGetFieldAccessorTable().getField(field).newBuilder();
-    }
-
-    @Override
-    public Message.Builder getFieldBuilder(final FieldDescriptor field) {
-      return internalGetFieldAccessorTable().getField(field).getBuilder(this);
-    }
-
-    @Override
-    public Message.Builder getRepeatedFieldBuilder(final FieldDescriptor field, int index) {
-      return internalGetFieldAccessorTable().getField(field).getRepeatedBuilder(
-          this, index);
-    }
-
-    @Override
-    public boolean hasOneof(final OneofDescriptor oneof) {
-      return internalGetFieldAccessorTable().getOneof(oneof).has(this);
-    }
-
-    @Override
-    public FieldDescriptor getOneofFieldDescriptor(final OneofDescriptor oneof) {
-      return internalGetFieldAccessorTable().getOneof(oneof).get(this);
-    }
-
-    @Override
-    public boolean hasField(final FieldDescriptor field) {
-      return internalGetFieldAccessorTable().getField(field).has(this);
-    }
-
-    @Override
-    public Object getField(final FieldDescriptor field) {
-      Object object = internalGetFieldAccessorTable().getField(field).get(this);
-      if (field.isRepeated()) {
-        // The underlying list object is still modifiable at this point.
-        // Make sure not to expose the modifiable list to the caller.
-        return Collections.unmodifiableList((List) object);
-      } else {
-        return object;
-      }
-    }
-
-    @Override
-    public BuilderType setField(final FieldDescriptor field, final Object value) {
-      internalGetFieldAccessorTable().getField(field).set(this, value);
-      return (BuilderType) this;
-    }
-
-    @Override
-    public BuilderType clearField(final FieldDescriptor field) {
-      internalGetFieldAccessorTable().getField(field).clear(this);
-      return (BuilderType) this;
-    }
-
-    @Override
-    public BuilderType clearOneof(final OneofDescriptor oneof) {
-      internalGetFieldAccessorTable().getOneof(oneof).clear(this);
-      return (BuilderType) this;
-    }
-
-    @Override
-    public int getRepeatedFieldCount(final FieldDescriptor field) {
-      return internalGetFieldAccessorTable().getField(field)
-          .getRepeatedCount(this);
-    }
-
-    @Override
-    public Object getRepeatedField(final FieldDescriptor field, final int index) {
-      return internalGetFieldAccessorTable().getField(field)
-          .getRepeated(this, index);
-    }
-
-    @Override
-    public BuilderType setRepeatedField(
-        final FieldDescriptor field, final int index, final Object value) {
-      internalGetFieldAccessorTable().getField(field)
-        .setRepeated(this, index, value);
-      return (BuilderType) this;
-    }
-
-    @Override
-    public BuilderType addRepeatedField(final FieldDescriptor field, final Object value) {
-      internalGetFieldAccessorTable().getField(field).addRepeated(this, value);
-      return (BuilderType) this;
-    }
-
-    @Override
-    public BuilderType setUnknownFields(final UnknownFieldSet unknownFields) {
-      this.unknownFields = unknownFields;
-      onChanged();
-      return (BuilderType) this;
-    }
-
-    @Override
-    public BuilderType mergeUnknownFields(
-        final UnknownFieldSet unknownFields) {
-      this.unknownFields =
-        UnknownFieldSet.newBuilder(this.unknownFields)
-                       .mergeFrom(unknownFields)
-                       .build();
-      onChanged();
-      return (BuilderType) this;
-    }
-
-    @Override
-    public boolean isInitialized() {
-      for (final FieldDescriptor field : getDescriptorForType().getFields()) {
-        // Check that all required fields are present.
-        if (field.isRequired()) {
-          if (!hasField(field)) {
-            return false;
-          }
-        }
-        // Check that embedded messages are initialized.
-        if (field.getJavaType() == FieldDescriptor.JavaType.MESSAGE) {
-          if (field.isRepeated()) {
-            @SuppressWarnings("unchecked") final
-            List<Message> messageList = (List<Message>) getField(field);
-            for (final Message element : messageList) {
-              if (!element.isInitialized()) {
-                return false;
-              }
-            }
-          } else {
-            if (hasField(field) &&
-                !((Message) getField(field)).isInitialized()) {
-              return false;
-            }
-          }
-        }
-      }
-      return true;
-    }
-
-    @Override
-    public final UnknownFieldSet getUnknownFields() {
-      return unknownFields;
-    }
-
-    /**
-     * Called by subclasses to parse an unknown field.
-     * @return {@code true} unless the tag is an end-group tag.
-     */
-    protected boolean parseUnknownField(
-        final CodedInputStream input,
-        final UnknownFieldSet.Builder unknownFields,
-        final ExtensionRegistryLite extensionRegistry,
-        final int tag) throws IOException {
-      return unknownFields.mergeFieldFrom(tag, input);
-    }
-
-    /**
-     * Implementation of {@link BuilderParent} for giving to our children. This
-     * small inner class makes it so we don't publicly expose the BuilderParent
-     * methods.
-     */
-    private class BuilderParentImpl implements BuilderParent {
-
-      @Override
-      public void markDirty() {
-        onChanged();
-      }
-    }
-
-    /**
-     * Gets the {@link BuilderParent} for giving to our children.
-     * @return The builder parent for our children.
-     */
-    protected BuilderParent getParentForChildren() {
-      if (meAsParent == null) {
-        meAsParent = new BuilderParentImpl();
-      }
-      return meAsParent;
-    }
-
-    /**
-     * Called when a the builder or one of its nested children has changed
-     * and any parent should be notified of its invalidation.
-     */
-    protected final void onChanged() {
-      if (isClean && builderParent != null) {
-        builderParent.markDirty();
-
-        // Don't keep dispatching invalidations until build is called again.
-        isClean = false;
-      }
-    }
-
-    /**
-     * Gets the map field with the given field number. This method should be
-     * overridden in the generated message class if the message contains map
-     * fields.
-     *
-     * Unlike other field types, reflection support for map fields can't be
-     * implemented based on generated public API because we need to access a
-     * map field as a list in reflection API but the generated API only allows
-     * us to access it as a map. This method returns the underlying map field
-     * directly and thus enables us to access the map field as a list.
-     */
-    @SuppressWarnings({"unused", "rawtypes"})
-    protected MapField internalGetMapField(int fieldNumber) {
-      // Note that we can't use descriptor names here because this method will
-      // be called when descriptor is being initialized.
-      throw new RuntimeException(
-          "No map fields found in " + getClass().getName());
-    }
-
-    /** Like {@link #internalGetMapField} but return a mutable version. */
-    @SuppressWarnings({"unused", "rawtypes"})
-    protected MapField internalGetMutableMapField(int fieldNumber) {
-      // Note that we can't use descriptor names here because this method will
-      // be called when descriptor is being initialized.
-      throw new RuntimeException(
-          "No map fields found in " + getClass().getName());
-    }
-  }
-
-  // =================================================================
-  // Extensions-related stuff
-
-  public interface ExtendableMessageOrBuilder<
-      MessageType extends ExtendableMessage> extends MessageOrBuilder {
-    // Re-define for return type covariance.
-    @Override
-    Message getDefaultInstanceForType();
-
-    /** Check if a singular extension is present. */
-    <Type> boolean hasExtension(
-        ExtensionLite<MessageType, Type> extension);
-
-    /** Get the number of elements in a repeated extension. */
-    <Type> int getExtensionCount(
-        ExtensionLite<MessageType, List<Type>> extension);
-
-    /** Get the value of an extension. */
-    <Type> Type getExtension(
-        ExtensionLite<MessageType, Type> extension);
-
-    /** Get one element of a repeated extension. */
-    <Type> Type getExtension(
-        ExtensionLite<MessageType, List<Type>> extension,
-        int index);
-
-    /** Check if a singular extension is present. */
-    <Type> boolean hasExtension(
-        Extension<MessageType, Type> extension);
-    /** Check if a singular extension is present. */
-    <Type> boolean hasExtension(
-        GeneratedExtension<MessageType, Type> extension);
-    /** Get the number of elements in a repeated extension. */
-    <Type> int getExtensionCount(
-        Extension<MessageType, List<Type>> extension);
-    /** Get the number of elements in a repeated extension. */
-    <Type> int getExtensionCount(
-        GeneratedExtension<MessageType, List<Type>> extension);
-    /** Get the value of an extension. */
-    <Type> Type getExtension(
-        Extension<MessageType, Type> extension);
-    /** Get the value of an extension. */
-    <Type> Type getExtension(
-        GeneratedExtension<MessageType, Type> extension);
-    /** Get one element of a repeated extension. */
-    <Type> Type getExtension(
-        Extension<MessageType, List<Type>> extension,
-        int index);
-    /** Get one element of a repeated extension. */
-    <Type> Type getExtension(
-        GeneratedExtension<MessageType, List<Type>> extension,
-        int index);
-  }
-
-  /**
-   * Generated message classes for message types that contain extension ranges
-   * subclass this.
-   *
-   * <p>This class implements type-safe accessors for extensions.  They
-   * implement all the same operations that you can do with normal fields --
-   * e.g. "has", "get", and "getCount" -- but for extensions.  The extensions
-   * are identified using instances of the class {@link GeneratedExtension};
-   * the protocol compiler generates a static instance of this class for every
-   * extension in its input.  Through the magic of generics, all is made
-   * type-safe.
-   *
-   * <p>For example, imagine you have the {@code .proto} file:
-   *
-   * <pre>
-   * option java_class = "MyProto";
-   *
-   * message Foo {
-   *   extensions 1000 to max;
-   * }
-   *
-   * extend Foo {
-   *   optional int32 bar;
-   * }
-   * </pre>
-   *
-   * <p>Then you might write code like:
-   *
-   * <pre>
-   * MyProto.Foo foo = getFoo();
-   * int i = foo.getExtension(MyProto.bar);
-   * </pre>
-   *
-   * <p>See also {@link ExtendableBuilder}.
-   */
-  public abstract static class ExtendableMessage<
-        MessageType extends ExtendableMessage>
-      extends GeneratedMessage
-      implements ExtendableMessageOrBuilder<MessageType> {
-
-    private static final long serialVersionUID = 1L;
-
-    private final FieldSet<FieldDescriptor> extensions;
-
-    protected ExtendableMessage() {
-      this.extensions = FieldSet.newFieldSet();
-    }
-
-    protected ExtendableMessage(
-        ExtendableBuilder<MessageType, ?> builder) {
-      super(builder);
-      this.extensions = builder.buildExtensions();
-    }
-
-    private void verifyExtensionContainingType(
-        final Extension<MessageType, ?> extension) {
-      if (extension.getDescriptor().getContainingType() !=
-          getDescriptorForType()) {
-        // This can only happen if someone uses unchecked operations.
-        throw new IllegalArgumentException(
-          "Extension is for type \"" +
-          extension.getDescriptor().getContainingType().getFullName() +
-          "\" which does not match message type \"" +
-          getDescriptorForType().getFullName() + "\".");
-      }
-    }
-
-    /** Check if a singular extension is present. */
-    @Override
-    @SuppressWarnings("unchecked")
-    public final <Type> boolean hasExtension(final ExtensionLite<MessageType, Type> extensionLite) {
-      Extension<MessageType, Type> extension = checkNotLite(extensionLite);
-
-      verifyExtensionContainingType(extension);
-      return extensions.hasField(extension.getDescriptor());
-    }
-
-    /** Get the number of elements in a repeated extension. */
-    @Override
-    @SuppressWarnings("unchecked")
-    public final <Type> int getExtensionCount(
-        final ExtensionLite<MessageType, List<Type>> extensionLite) {
-      Extension<MessageType, List<Type>> extension = checkNotLite(extensionLite);
-
-      verifyExtensionContainingType(extension);
-      final FieldDescriptor descriptor = extension.getDescriptor();
-      return extensions.getRepeatedFieldCount(descriptor);
-    }
-
-    /** Get the value of an extension. */
-    @Override
-    @SuppressWarnings("unchecked")
-    public final <Type> Type getExtension(final ExtensionLite<MessageType, Type> extensionLite) {
-      Extension<MessageType, Type> extension = checkNotLite(extensionLite);
-
-      verifyExtensionContainingType(extension);
-      FieldDescriptor descriptor = extension.getDescriptor();
-      final Object value = extensions.getField(descriptor);
-      if (value == null) {
-        if (descriptor.isRepeated()) {
-          return (Type) Collections.emptyList();
-        } else if (descriptor.getJavaType() ==
-                   FieldDescriptor.JavaType.MESSAGE) {
-          return (Type) extension.getMessageDefaultInstance();
-        } else {
-          return (Type) extension.fromReflectionType(
-              descriptor.getDefaultValue());
-        }
-      } else {
-        return (Type) extension.fromReflectionType(value);
-      }
-    }
-
-    /** Get one element of a repeated extension. */
-    @Override
-    @SuppressWarnings("unchecked")
-    public final <Type> Type getExtension(
-        final ExtensionLite<MessageType, List<Type>> extensionLite, final int index) {
-      Extension<MessageType, List<Type>> extension = checkNotLite(extensionLite);
-
-      verifyExtensionContainingType(extension);
-      FieldDescriptor descriptor = extension.getDescriptor();
-      return (Type) extension.singularFromReflectionType(
-          extensions.getRepeatedField(descriptor, index));
-    }
-
-    /** Check if a singular extension is present. */
-    @Override
-    public final <Type> boolean hasExtension(final Extension<MessageType, Type> extension) {
-      return hasExtension((ExtensionLite<MessageType, Type>) extension);
-    }
-    /** Check if a singular extension is present. */
-    @Override
-    public final <Type> boolean hasExtension(
-        final GeneratedExtension<MessageType, Type> extension) {
-      return hasExtension((ExtensionLite<MessageType, Type>) extension);
-    }
-    /** Get the number of elements in a repeated extension. */
-    @Override
-    public final <Type> int getExtensionCount(
-        final Extension<MessageType, List<Type>> extension) {
-      return getExtensionCount((ExtensionLite<MessageType, List<Type>>) extension);
-    }
-    /** Get the number of elements in a repeated extension. */
-    @Override
-    public final <Type> int getExtensionCount(
-        final GeneratedExtension<MessageType, List<Type>> extension) {
-      return getExtensionCount((ExtensionLite<MessageType, List<Type>>) extension);
-    }
-    /** Get the value of an extension. */
-    @Override
-    public final <Type> Type getExtension(final Extension<MessageType, Type> extension) {
-      return getExtension((ExtensionLite<MessageType, Type>) extension);
-    }
-    /** Get the value of an extension. */
-    @Override
-    public final <Type> Type getExtension(
-        final GeneratedExtension<MessageType, Type> extension) {
-      return getExtension((ExtensionLite<MessageType, Type>) extension);
-    }
-    /** Get one element of a repeated extension. */
-    @Override
-    public final <Type> Type getExtension(
-        final Extension<MessageType, List<Type>> extension, final int index) {
-      return getExtension((ExtensionLite<MessageType, List<Type>>) extension, index);
-    }
-    /** Get one element of a repeated extension. */
-    @Override
-    public final <Type> Type getExtension(
-        final GeneratedExtension<MessageType, List<Type>> extension, final int index) {
-      return getExtension((ExtensionLite<MessageType, List<Type>>) extension, index);
-    }
-
-    /** Called by subclasses to check if all extensions are initialized. */
-    protected boolean extensionsAreInitialized() {
-      return extensions.isInitialized();
-    }
-
-    @Override
-    public boolean isInitialized() {
-      return super.isInitialized() && extensionsAreInitialized();
-    }
-
-    @Override
-    protected boolean parseUnknownField(
-        CodedInputStream input,
-        UnknownFieldSet.Builder unknownFields,
-        ExtensionRegistryLite extensionRegistry,
-        int tag) throws IOException {
-      return MessageReflection.mergeFieldFrom(
-          input, unknownFields, extensionRegistry, getDescriptorForType(),
-          new MessageReflection.ExtensionAdapter(extensions), tag);
-    }
-
-
-    /**
-     * Used by parsing constructors in generated classes.
-     */
-    @Override
-    protected void makeExtensionsImmutable() {
-      extensions.makeImmutable();
-    }
-
-    /**
-     * Used by subclasses to serialize extensions.  Extension ranges may be
-     * interleaved with field numbers, but we must write them in canonical
-     * (sorted by field number) order.  ExtensionWriter helps us write
-     * individual ranges of extensions at once.
-     */
-    protected class ExtensionWriter {
-      // Imagine how much simpler this code would be if Java iterators had
-      // a way to get the next element without advancing the iterator.
-
-      private final Iterator<Map.Entry<FieldDescriptor, Object>> iter =
-        extensions.iterator();
-      private Map.Entry<FieldDescriptor, Object> next;
-      private final boolean messageSetWireFormat;
-
-      private ExtensionWriter(final boolean messageSetWireFormat) {
-        if (iter.hasNext()) {
-          next = iter.next();
-        }
-        this.messageSetWireFormat = messageSetWireFormat;
-      }
-
-      public void writeUntil(final int end, final CodedOutputStream output)
-                             throws IOException {
-        while (next != null && next.getKey().getNumber() < end) {
-          FieldDescriptor descriptor = next.getKey();
-          if (messageSetWireFormat && descriptor.getLiteJavaType() ==
-                  WireFormat.JavaType.MESSAGE &&
-              !descriptor.isRepeated()) {
-            if (next instanceof LazyField.LazyEntry<?>) {
-              output.writeRawMessageSetExtension(descriptor.getNumber(),
-                  ((LazyField.LazyEntry<?>) next).getField().toByteString());
-            } else {
-              output.writeMessageSetExtension(descriptor.getNumber(),
-                                              (Message) next.getValue());
-            }
-          } else {
-            // TODO(xiangl): Taken care of following code, it may cause
-            // problem when we use LazyField for normal fields/extensions.
-            // Due to the optional field can be duplicated at the end of
-            // serialized bytes, which will make the serialized size change
-            // after lazy field parsed. So when we use LazyField globally,
-            // we need to change the following write method to write cached
-            // bytes directly rather than write the parsed message.
-            FieldSet.writeField(descriptor, next.getValue(), output);
-          }
-          if (iter.hasNext()) {
-            next = iter.next();
-          } else {
-            next = null;
-          }
-        }
-      }
-    }
-
-    protected ExtensionWriter newExtensionWriter() {
-      return new ExtensionWriter(false);
-    }
-    protected ExtensionWriter newMessageSetExtensionWriter() {
-      return new ExtensionWriter(true);
-    }
-
-    /** Called by subclasses to compute the size of extensions. */
-    protected int extensionsSerializedSize() {
-      return extensions.getSerializedSize();
-    }
-    protected int extensionsSerializedSizeAsMessageSet() {
-      return extensions.getMessageSetSerializedSize();
-    }
-
-    // ---------------------------------------------------------------
-    // Reflection
-
-    protected Map<FieldDescriptor, Object> getExtensionFields() {
-      return extensions.getAllFields();
-    }
-
-    @Override
-    public Map<FieldDescriptor, Object> getAllFields() {
-      final Map<FieldDescriptor, Object> result =
-          super.getAllFieldsMutable(/* getBytesForString = */ false);
-      result.putAll(getExtensionFields());
-      return Collections.unmodifiableMap(result);
-    }
-
-    @Override
-    public Map<FieldDescriptor, Object> getAllFieldsRaw() {
-      final Map<FieldDescriptor, Object> result =
-          super.getAllFieldsMutable(/* getBytesForString = */ false);
-      result.putAll(getExtensionFields());
-      return Collections.unmodifiableMap(result);
-    }
-
-    @Override
-    public boolean hasField(final FieldDescriptor field) {
-      if (field.isExtension()) {
-        verifyContainingType(field);
-        return extensions.hasField(field);
-      } else {
-        return super.hasField(field);
-      }
-    }
-
-    @Override
-    public Object getField(final FieldDescriptor field) {
-      if (field.isExtension()) {
-        verifyContainingType(field);
-        final Object value = extensions.getField(field);
-        if (value == null) {
-          if (field.isRepeated()) {
-            return Collections.emptyList();
-          } else if (field.getJavaType() == FieldDescriptor.JavaType.MESSAGE) {
-            // Lacking an ExtensionRegistry, we have no way to determine the
-            // extension's real type, so we return a DynamicMessage.
-            return DynamicMessage.getDefaultInstance(field.getMessageType());
-          } else {
-            return field.getDefaultValue();
-          }
-        } else {
-          return value;
-        }
-      } else {
-        return super.getField(field);
-      }
-    }
-
-    @Override
-    public int getRepeatedFieldCount(final FieldDescriptor field) {
-      if (field.isExtension()) {
-        verifyContainingType(field);
-        return extensions.getRepeatedFieldCount(field);
-      } else {
-        return super.getRepeatedFieldCount(field);
-      }
-    }
-
-    @Override
-    public Object getRepeatedField(final FieldDescriptor field,
-                                   final int index) {
-      if (field.isExtension()) {
-        verifyContainingType(field);
-        return extensions.getRepeatedField(field, index);
-      } else {
-        return super.getRepeatedField(field, index);
-      }
-    }
-
-    private void verifyContainingType(final FieldDescriptor field) {
-      if (field.getContainingType() != getDescriptorForType()) {
-        throw new IllegalArgumentException(
-          "FieldDescriptor does not match message type.");
-      }
-    }
-  }
-
-  /**
-   * Generated message builders for message types that contain extension ranges
-   * subclass this.
-   *
-   * <p>This class implements type-safe accessors for extensions.  They
-   * implement all the same operations that you can do with normal fields --
-   * e.g. "get", "set", and "add" -- but for extensions.  The extensions are
-   * identified using instances of the class {@link GeneratedExtension}; the
-   * protocol compiler generates a static instance of this class for every
-   * extension in its input.  Through the magic of generics, all is made
-   * type-safe.
-   *
-   * <p>For example, imagine you have the {@code .proto} file:
-   *
-   * <pre>
-   * option java_class = "MyProto";
-   *
-   * message Foo {
-   *   extensions 1000 to max;
-   * }
-   *
-   * extend Foo {
-   *   optional int32 bar;
-   * }
-   * </pre>
-   *
-   * <p>Then you might write code like:
-   *
-   * <pre>
-   * MyProto.Foo foo =
-   *   MyProto.Foo.newBuilder()
-   *     .setExtension(MyProto.bar, 123)
-   *     .build();
-   * </pre>
-   *
-   * <p>See also {@link ExtendableMessage}.
-   */
-  @SuppressWarnings("unchecked")
-  public abstract static class ExtendableBuilder<
-        MessageType extends ExtendableMessage,
-        BuilderType extends ExtendableBuilder<MessageType, BuilderType>>
-      extends Builder<BuilderType>
-      implements ExtendableMessageOrBuilder<MessageType> {
-
-    private FieldSet<FieldDescriptor> extensions = FieldSet.emptySet();
-
-    protected ExtendableBuilder() {}
-
-    protected ExtendableBuilder(
-        BuilderParent parent) {
-      super(parent);
-    }
-
-    // For immutable message conversion.
-    void internalSetExtensionSet(FieldSet<FieldDescriptor> extensions) {
-      this.extensions = extensions;
-    }
-
-    @Override
-    public BuilderType clear() {
-      extensions = FieldSet.emptySet();
-      return super.clear();
-    }
-
-    // This is implemented here only to work around an apparent bug in the
-    // Java compiler and/or build system.  See bug #1898463.  The mere presence
-    // of this clone() implementation makes it go away.
-    @Override
-    public BuilderType clone() {
-      return super.clone();
-    }
-
-    private void ensureExtensionsIsMutable() {
-      if (extensions.isImmutable()) {
-        extensions = extensions.clone();
-      }
-    }
-
-    private void verifyExtensionContainingType(
-        final Extension<MessageType, ?> extension) {
-      if (extension.getDescriptor().getContainingType() !=
-          getDescriptorForType()) {
-        // This can only happen if someone uses unchecked operations.
-        throw new IllegalArgumentException(
-          "Extension is for type \"" +
-          extension.getDescriptor().getContainingType().getFullName() +
-          "\" which does not match message type \"" +
-          getDescriptorForType().getFullName() + "\".");
-      }
-    }
-
-    /** Check if a singular extension is present. */
-    @Override
-    public final <Type> boolean hasExtension(final ExtensionLite<MessageType, Type> extensionLite) {
-      Extension<MessageType, Type> extension = checkNotLite(extensionLite);
-
-      verifyExtensionContainingType(extension);
-      return extensions.hasField(extension.getDescriptor());
-    }
-
-    /** Get the number of elements in a repeated extension. */
-    @Override
-    public final <Type> int getExtensionCount(
-        final ExtensionLite<MessageType, List<Type>> extensionLite) {
-      Extension<MessageType, List<Type>> extension = checkNotLite(extensionLite);
-
-      verifyExtensionContainingType(extension);
-      final FieldDescriptor descriptor = extension.getDescriptor();
-      return extensions.getRepeatedFieldCount(descriptor);
-    }
-
-    /** Get the value of an extension. */
-    @Override
-    public final <Type> Type getExtension(final ExtensionLite<MessageType, Type> extensionLite) {
-      Extension<MessageType, Type> extension = checkNotLite(extensionLite);
-
-      verifyExtensionContainingType(extension);
-      FieldDescriptor descriptor = extension.getDescriptor();
-      final Object value = extensions.getField(descriptor);
-      if (value == null) {
-        if (descriptor.isRepeated()) {
-          return (Type) Collections.emptyList();
-        } else if (descriptor.getJavaType() ==
-                   FieldDescriptor.JavaType.MESSAGE) {
-          return (Type) extension.getMessageDefaultInstance();
-        } else {
-          return (Type) extension.fromReflectionType(
-              descriptor.getDefaultValue());
-        }
-      } else {
-        return (Type) extension.fromReflectionType(value);
-      }
-    }
-
-    /** Get one element of a repeated extension. */
-    @Override
-    public final <Type> Type getExtension(
-        final ExtensionLite<MessageType, List<Type>> extensionLite, final int index) {
-      Extension<MessageType, List<Type>> extension = checkNotLite(extensionLite);
-
-      verifyExtensionContainingType(extension);
-      FieldDescriptor descriptor = extension.getDescriptor();
-      return (Type) extension.singularFromReflectionType(
-          extensions.getRepeatedField(descriptor, index));
-    }
-
-    /** Set the value of an extension. */
-    public final <Type> BuilderType setExtension(
-        final ExtensionLite<MessageType, Type> extensionLite,
-        final Type value) {
-      Extension<MessageType, Type> extension = checkNotLite(extensionLite);
-
-      verifyExtensionContainingType(extension);
-      ensureExtensionsIsMutable();
-      final FieldDescriptor descriptor = extension.getDescriptor();
-      extensions.setField(descriptor, extension.toReflectionType(value));
-      onChanged();
-      return (BuilderType) this;
-    }
-
-    /** Set the value of one element of a repeated extension. */
-    public final <Type> BuilderType setExtension(
-        final ExtensionLite<MessageType, List<Type>> extensionLite,
-        final int index, final Type value) {
-      Extension<MessageType, List<Type>> extension = checkNotLite(extensionLite);
-
-      verifyExtensionContainingType(extension);
-      ensureExtensionsIsMutable();
-      final FieldDescriptor descriptor = extension.getDescriptor();
-      extensions.setRepeatedField(
-        descriptor, index,
-        extension.singularToReflectionType(value));
-      onChanged();
-      return (BuilderType) this;
-    }
-
-    /** Append a value to a repeated extension. */
-    public final <Type> BuilderType addExtension(
-        final ExtensionLite<MessageType, List<Type>> extensionLite,
-        final Type value) {
-      Extension<MessageType, List<Type>> extension = checkNotLite(extensionLite);
-
-      verifyExtensionContainingType(extension);
-      ensureExtensionsIsMutable();
-      final FieldDescriptor descriptor = extension.getDescriptor();
-      extensions.addRepeatedField(
-          descriptor, extension.singularToReflectionType(value));
-      onChanged();
-      return (BuilderType) this;
-    }
-
-    /** Clear an extension. */
-    public final <Type> BuilderType clearExtension(
-        final ExtensionLite<MessageType, ?> extensionLite) {
-      Extension<MessageType, ?> extension = checkNotLite(extensionLite);
-
-      verifyExtensionContainingType(extension);
-      ensureExtensionsIsMutable();
-      extensions.clearField(extension.getDescriptor());
-      onChanged();
-      return (BuilderType) this;
-    }
-
-    /** Check if a singular extension is present. */
-    @Override
-    public final <Type> boolean hasExtension(final Extension<MessageType, Type> extension) {
-      return hasExtension((ExtensionLite<MessageType, Type>) extension);
-    }
-    /** Check if a singular extension is present. */
-    @Override
-    public final <Type> boolean hasExtension(
-        final GeneratedExtension<MessageType, Type> extension) {
-      return hasExtension((ExtensionLite<MessageType, Type>) extension);
-    }
-    /** Get the number of elements in a repeated extension. */
-    @Override
-    public final <Type> int getExtensionCount(
-        final Extension<MessageType, List<Type>> extension) {
-      return getExtensionCount((ExtensionLite<MessageType, List<Type>>) extension);
-    }
-    /** Get the number of elements in a repeated extension. */
-    @Override
-    public final <Type> int getExtensionCount(
-        final GeneratedExtension<MessageType, List<Type>> extension) {
-      return getExtensionCount((ExtensionLite<MessageType, List<Type>>) extension);
-    }
-    /** Get the value of an extension. */
-    @Override
-    public final <Type> Type getExtension(final Extension<MessageType, Type> extension) {
-      return getExtension((ExtensionLite<MessageType, Type>) extension);
-    }
-    /** Get the value of an extension. */
-    @Override
-    public final <Type> Type getExtension(
-        final GeneratedExtension<MessageType, Type> extension) {
-      return getExtension((ExtensionLite<MessageType, Type>) extension);
-    }
-    /** Get the value of an extension. */
-    @Override
-    public final <Type> Type getExtension(
-        final Extension<MessageType, List<Type>> extension, final int index) {
-      return getExtension((ExtensionLite<MessageType, List<Type>>) extension, index);
-    }
-    /** Get the value of an extension. */
-    @Override
-    public final <Type> Type getExtension(
-        final GeneratedExtension<MessageType, List<Type>> extension, final int index) {
-      return getExtension((ExtensionLite<MessageType, List<Type>>) extension, index);
-    }
-    /** Set the value of an extension. */
-    public final <Type> BuilderType setExtension(
-        final Extension<MessageType, Type> extension, final Type value) {
-      return setExtension((ExtensionLite<MessageType, Type>) extension, value);
-    }
-    /** Set the value of an extension. */
-    public <Type> BuilderType setExtension(
-        final GeneratedExtension<MessageType, Type> extension, final Type value) {
-      return setExtension((ExtensionLite<MessageType, Type>) extension, value);
-    }
-    /** Set the value of one element of a repeated extension. */
-    public final <Type> BuilderType setExtension(
-        final Extension<MessageType, List<Type>> extension,
-        final int index, final Type value) {
-      return setExtension((ExtensionLite<MessageType, List<Type>>) extension, index, value);
-    }
-    /** Set the value of one element of a repeated extension. */
-    public <Type> BuilderType setExtension(
-        final GeneratedExtension<MessageType, List<Type>> extension,
-        final int index, final Type value) {
-      return setExtension((ExtensionLite<MessageType, List<Type>>) extension, index, value);
-    }
-    /** Append a value to a repeated extension. */
-    public final <Type> BuilderType addExtension(
-        final Extension<MessageType, List<Type>> extension, final Type value) {
-      return addExtension((ExtensionLite<MessageType, List<Type>>) extension, value);
-    }
-    /** Append a value to a repeated extension. */
-    public <Type> BuilderType addExtension(
-        final GeneratedExtension<MessageType, List<Type>> extension, final Type value) {
-      return addExtension((ExtensionLite<MessageType, List<Type>>) extension, value);
-    }
-    /** Clear an extension. */
-    public final <Type> BuilderType clearExtension(
-        final Extension<MessageType, ?> extension) {
-      return clearExtension((ExtensionLite<MessageType, ?>) extension);
-    }
-    /** Clear an extension. */
-    public <Type> BuilderType clearExtension(
-        final GeneratedExtension<MessageType, ?> extension) {
-      return clearExtension((ExtensionLite<MessageType, ?>) extension);
-    }
-
-    /** Called by subclasses to check if all extensions are initialized. */
-    protected boolean extensionsAreInitialized() {
-      return extensions.isInitialized();
-    }
-
-    /**
-     * Called by the build code path to create a copy of the extensions for
-     * building the message.
-     */
-    private FieldSet<FieldDescriptor> buildExtensions() {
-      extensions.makeImmutable();
-      return extensions;
-    }
-
-    @Override
-    public boolean isInitialized() {
-      return super.isInitialized() && extensionsAreInitialized();
-    }
-
-    /**
-     * Called by subclasses to parse an unknown field or an extension.
-     * @return {@code true} unless the tag is an end-group tag.
-     */
-    @Override
-    protected boolean parseUnknownField(
-        final CodedInputStream input,
-        final UnknownFieldSet.Builder unknownFields,
-        final ExtensionRegistryLite extensionRegistry,
-        final int tag) throws IOException {
-      return MessageReflection.mergeFieldFrom(
-          input, unknownFields, extensionRegistry, getDescriptorForType(),
-          new MessageReflection.BuilderAdapter(this), tag);
-    }
-
-    // ---------------------------------------------------------------
-    // Reflection
-
-    @Override
-    public Map<FieldDescriptor, Object> getAllFields() {
-      final Map<FieldDescriptor, Object> result = super.getAllFieldsMutable();
-      result.putAll(extensions.getAllFields());
-      return Collections.unmodifiableMap(result);
-    }
-
-    @Override
-    public Object getField(final FieldDescriptor field) {
-      if (field.isExtension()) {
-        verifyContainingType(field);
-        final Object value = extensions.getField(field);
-        if (value == null) {
-          if (field.getJavaType() == FieldDescriptor.JavaType.MESSAGE) {
-            // Lacking an ExtensionRegistry, we have no way to determine the
-            // extension's real type, so we return a DynamicMessage.
-            return DynamicMessage.getDefaultInstance(field.getMessageType());
-          } else {
-            return field.getDefaultValue();
-          }
-        } else {
-          return value;
-        }
-      } else {
-        return super.getField(field);
-      }
-    }
-
-    @Override
-    public int getRepeatedFieldCount(final FieldDescriptor field) {
-      if (field.isExtension()) {
-        verifyContainingType(field);
-        return extensions.getRepeatedFieldCount(field);
-      } else {
-        return super.getRepeatedFieldCount(field);
-      }
-    }
-
-    @Override
-    public Object getRepeatedField(final FieldDescriptor field,
-                                   final int index) {
-      if (field.isExtension()) {
-        verifyContainingType(field);
-        return extensions.getRepeatedField(field, index);
-      } else {
-        return super.getRepeatedField(field, index);
-      }
-    }
-
-    @Override
-    public boolean hasField(final FieldDescriptor field) {
-      if (field.isExtension()) {
-        verifyContainingType(field);
-        return extensions.hasField(field);
-      } else {
-        return super.hasField(field);
-      }
-    }
-
-    @Override
-    public BuilderType setField(final FieldDescriptor field,
-                                final Object value) {
-      if (field.isExtension()) {
-        verifyContainingType(field);
-        ensureExtensionsIsMutable();
-        extensions.setField(field, value);
-        onChanged();
-        return (BuilderType) this;
-      } else {
-        return super.setField(field, value);
-      }
-    }
-
-    @Override
-    public BuilderType clearField(final FieldDescriptor field) {
-      if (field.isExtension()) {
-        verifyContainingType(field);
-        ensureExtensionsIsMutable();
-        extensions.clearField(field);
-        onChanged();
-        return (BuilderType) this;
-      } else {
-        return super.clearField(field);
-      }
-    }
-
-    @Override
-    public BuilderType setRepeatedField(final FieldDescriptor field,
-                                        final int index, final Object value) {
-      if (field.isExtension()) {
-        verifyContainingType(field);
-        ensureExtensionsIsMutable();
-        extensions.setRepeatedField(field, index, value);
-        onChanged();
-        return (BuilderType) this;
-      } else {
-        return super.setRepeatedField(field, index, value);
-      }
-    }
-
-    @Override
-    public BuilderType addRepeatedField(final FieldDescriptor field,
-                                        final Object value) {
-      if (field.isExtension()) {
-        verifyContainingType(field);
-        ensureExtensionsIsMutable();
-        extensions.addRepeatedField(field, value);
-        onChanged();
-        return (BuilderType) this;
-      } else {
-        return super.addRepeatedField(field, value);
-      }
-    }
-
-    protected final void mergeExtensionFields(final ExtendableMessage other) {
-      ensureExtensionsIsMutable();
-      extensions.mergeFrom(other.extensions);
-      onChanged();
-    }
-
-    private void verifyContainingType(final FieldDescriptor field) {
-      if (field.getContainingType() != getDescriptorForType()) {
-        throw new IllegalArgumentException(
-          "FieldDescriptor does not match message type.");
-      }
-    }
-  }
-
-  // -----------------------------------------------------------------
-
-  /**
-   * Gets the descriptor for an extension. The implementation depends on whether
-   * the extension is scoped in the top level of a file or scoped in a Message.
-   */
-  static interface ExtensionDescriptorRetriever {
-    FieldDescriptor getDescriptor();
-  }
-
-  /** For use by generated code only. */
-  public static <ContainingType extends Message, Type>
-      GeneratedExtension<ContainingType, Type>
-      newMessageScopedGeneratedExtension(final Message scope,
-                                         final int descriptorIndex,
-                                         final Class singularType,
-                                         final Message defaultInstance) {
-    // For extensions scoped within a Message, we use the Message to resolve
-    // the outer class's descriptor, from which the extension descriptor is
-    // obtained.
-    return new GeneratedExtension<ContainingType, Type>(
-        new CachedDescriptorRetriever() {
-          @Override
-          public FieldDescriptor loadDescriptor() {
-            return scope.getDescriptorForType().getExtensions().get(descriptorIndex);
-          }
-        },
-        singularType,
-        defaultInstance,
-        Extension.ExtensionType.IMMUTABLE);
-  }
-
-  /** For use by generated code only. */
-  public static <ContainingType extends Message, Type>
-     GeneratedExtension<ContainingType, Type>
-     newFileScopedGeneratedExtension(final Class singularType,
-                                     final Message defaultInstance) {
-    // For extensions scoped within a file, we rely on the outer class's
-    // static initializer to call internalInit() on the extension when the
-    // descriptor is available.
-    return new GeneratedExtension<ContainingType, Type>(
-        null,  // ExtensionDescriptorRetriever is initialized in internalInit();
-        singularType,
-        defaultInstance,
-        Extension.ExtensionType.IMMUTABLE);
-  }
-
-  private abstract static class CachedDescriptorRetriever
-      implements ExtensionDescriptorRetriever {
-    private volatile FieldDescriptor descriptor;
-    protected abstract FieldDescriptor loadDescriptor();
-
-    @Override
-    public FieldDescriptor getDescriptor() {
-      if (descriptor == null) {
-        synchronized (this) {
-          if (descriptor == null) {
-            descriptor = loadDescriptor();
-          }
-        }
-      }
-      return descriptor;
-    }
-  }
-
-  /**
-   * Used in proto1 generated code only.
-   *
-   * After enabling bridge, we can define proto2 extensions (the extended type
-   * is a proto2 mutable message) in a proto1 .proto file. For these extensions
-   * we should generate proto2 GeneratedExtensions.
-   */
-  public static <ContainingType extends Message, Type>
-      GeneratedExtension<ContainingType, Type>
-      newMessageScopedGeneratedExtension(
-          final Message scope, final String name,
-          final Class singularType, final Message defaultInstance) {
-    // For extensions scoped within a Message, we use the Message to resolve
-    // the outer class's descriptor, from which the extension descriptor is
-    // obtained.
-    return new GeneratedExtension<ContainingType, Type>(
-        new CachedDescriptorRetriever() {
-          @Override
-          protected FieldDescriptor loadDescriptor() {
-            return scope.getDescriptorForType().findFieldByName(name);
-          }
-        },
-        singularType,
-        defaultInstance,
-        Extension.ExtensionType.MUTABLE);
-  }
-
-  /**
-   * Used in proto1 generated code only.
-   *
-   * After enabling bridge, we can define proto2 extensions (the extended type
-   * is a proto2 mutable message) in a proto1 .proto file. For these extensions
-   * we should generate proto2 GeneratedExtensions.
-   */
-  public static <ContainingType extends Message, Type>
-     GeneratedExtension<ContainingType, Type>
-     newFileScopedGeneratedExtension(
-         final Class singularType, final Message defaultInstance,
-         final String descriptorOuterClass, final String extensionName) {
-    // For extensions scoped within a file, we load the descriptor outer
-    // class and rely on it to get the FileDescriptor which then can be
-    // used to obtain the extension's FieldDescriptor.
-    return new GeneratedExtension<ContainingType, Type>(
-        new CachedDescriptorRetriever() {
-          @Override
-          protected FieldDescriptor loadDescriptor() {
-            try {
-              Class clazz = singularType.getClassLoader().loadClass(descriptorOuterClass);
-              FileDescriptor file = (FileDescriptor) clazz.getField("descriptor").get(null);
-              return file.findExtensionByName(extensionName);
-            } catch (Exception e) {
-              throw new RuntimeException(
-                  "Cannot load descriptors: "
-                      + descriptorOuterClass
-                      + " is not a valid descriptor class name",
-                  e);
-            }
-          }
-        },
-        singularType,
-        defaultInstance,
-        Extension.ExtensionType.MUTABLE);
-  }
-
-  /**
-   * Type used to represent generated extensions.  The protocol compiler
-   * generates a static singleton instance of this class for each extension.
-   *
-   * <p>For example, imagine you have the {@code .proto} file:
-   *
-   * <pre>
-   * option java_class = "MyProto";
-   *
-   * message Foo {
-   *   extensions 1000 to max;
-   * }
-   *
-   * extend Foo {
-   *   optional int32 bar;
-   * }
-   * </pre>
-   *
-   * <p>Then, {@code MyProto.Foo.bar} has type
-   * {@code GeneratedExtension<MyProto.Foo, Integer>}.
-   *
-   * <p>In general, users should ignore the details of this type, and simply use
-   * these static singletons as parameters to the extension accessors defined
-   * in {@link ExtendableMessage} and {@link ExtendableBuilder}.
-   */
-  public static class GeneratedExtension<
-      ContainingType extends Message, Type> extends
-      Extension<ContainingType, Type> {
-    // TODO(kenton):  Find ways to avoid using Java reflection within this
-    //   class.  Also try to avoid suppressing unchecked warnings.
-
-    // We can't always initialize the descriptor of a GeneratedExtension when
-    // we first construct it due to initialization order difficulties (namely,
-    // the descriptor may not have been constructed yet, since it is often
-    // constructed by the initializer of a separate module).
-    //
-    // In the case of nested extensions, we initialize the
-    // ExtensionDescriptorRetriever with an instance that uses the scoping
-    // Message's default instance to retrieve the extension's descriptor.
-    //
-    // In the case of non-nested extensions, we initialize the
-    // ExtensionDescriptorRetriever to null and rely on the outer class's static
-    // initializer to call internalInit() after the descriptor has been parsed.
-    GeneratedExtension(ExtensionDescriptorRetriever descriptorRetriever,
-        Class singularType,
-        Message messageDefaultInstance,
-        ExtensionType extensionType) {
-      if (Message.class.isAssignableFrom(singularType) &&
-          !singularType.isInstance(messageDefaultInstance)) {
-        throw new IllegalArgumentException(
-            "Bad messageDefaultInstance for " + singularType.getName());
-      }
-      this.descriptorRetriever = descriptorRetriever;
-      this.singularType = singularType;
-      this.messageDefaultInstance = messageDefaultInstance;
-
-      if (ProtocolMessageEnum.class.isAssignableFrom(singularType)) {
-        this.enumValueOf = getMethodOrDie(singularType, "valueOf",
-                                          EnumValueDescriptor.class);
-        this.enumGetValueDescriptor =
-            getMethodOrDie(singularType, "getValueDescriptor");
-      } else {
-        this.enumValueOf = null;
-        this.enumGetValueDescriptor = null;
-      }
-      this.extensionType = extensionType;
-    }
-
-    /** For use by generated code only. */
-    public void internalInit(final FieldDescriptor descriptor) {
-      if (descriptorRetriever != null) {
-        throw new IllegalStateException("Already initialized.");
-      }
-      descriptorRetriever =
-          new ExtensionDescriptorRetriever() {
-            @Override
-            public FieldDescriptor getDescriptor() {
-              return descriptor;
-            }
-          };
-    }
-
-    private ExtensionDescriptorRetriever descriptorRetriever;
-    private final Class singularType;
-    private final Message messageDefaultInstance;
-    private final Method enumValueOf;
-    private final Method enumGetValueDescriptor;
-    private final ExtensionType extensionType;
-
-    @Override
-    public FieldDescriptor getDescriptor() {
-      if (descriptorRetriever == null) {
-        throw new IllegalStateException(
-            "getDescriptor() called before internalInit()");
-      }
-      return descriptorRetriever.getDescriptor();
-    }
-
-    /**
-     * If the extension is an embedded message or group, returns the default
-     * instance of the message.
-     */
-    @Override
-    public Message getMessageDefaultInstance() {
-      return messageDefaultInstance;
-    }
-
-    @Override
-    protected ExtensionType getExtensionType() {
-      return extensionType;
-    }
-
-    /**
-     * Convert from the type used by the reflection accessors to the type used
-     * by native accessors.  E.g., for enums, the reflection accessors use
-     * EnumValueDescriptors but the native accessors use the generated enum
-     * type.
-     */
-    @Override
-    @SuppressWarnings("unchecked")
-    protected Object fromReflectionType(final Object value) {
-      FieldDescriptor descriptor = getDescriptor();
-      if (descriptor.isRepeated()) {
-        if (descriptor.getJavaType() == FieldDescriptor.JavaType.MESSAGE ||
-            descriptor.getJavaType() == FieldDescriptor.JavaType.ENUM) {
-          // Must convert the whole list.
-          final List result = new ArrayList();
-          for (final Object element : (List) value) {
-            result.add(singularFromReflectionType(element));
-          }
-          return result;
-        } else {
-          return value;
-        }
-      } else {
-        return singularFromReflectionType(value);
-      }
-    }
-
-    /**
-     * Like {@link #fromReflectionType(Object)}, but if the type is a repeated
-     * type, this converts a single element.
-     */
-    @Override
-    protected Object singularFromReflectionType(final Object value) {
-      FieldDescriptor descriptor = getDescriptor();
-      switch (descriptor.getJavaType()) {
-        case MESSAGE:
-          if (singularType.isInstance(value)) {
-            return value;
-          } else {
-            return messageDefaultInstance.newBuilderForType()
-                .mergeFrom((Message) value).build();
-          }
-        case ENUM:
-          return invokeOrDie(enumValueOf, null, (EnumValueDescriptor) value);
-        default:
-          return value;
-      }
-    }
-
-    /**
-     * Convert from the type used by the native accessors to the type used
-     * by reflection accessors.  E.g., for enums, the reflection accessors use
-     * EnumValueDescriptors but the native accessors use the generated enum
-     * type.
-     */
-    @Override
-    @SuppressWarnings("unchecked")
-    protected Object toReflectionType(final Object value) {
-      FieldDescriptor descriptor = getDescriptor();
-      if (descriptor.isRepeated()) {
-        if (descriptor.getJavaType() == FieldDescriptor.JavaType.ENUM) {
-          // Must convert the whole list.
-          final List result = new ArrayList();
-          for (final Object element : (List) value) {
-            result.add(singularToReflectionType(element));
-          }
-          return result;
-        } else {
-          return value;
-        }
-      } else {
-        return singularToReflectionType(value);
-      }
-    }
-
-    /**
-     * Like {@link #toReflectionType(Object)}, but if the type is a repeated
-     * type, this converts a single element.
-     */
-    @Override
-    protected Object singularToReflectionType(final Object value) {
-      FieldDescriptor descriptor = getDescriptor();
-      switch (descriptor.getJavaType()) {
-        case ENUM:
-          return invokeOrDie(enumGetValueDescriptor, value);
-        default:
-          return value;
-      }
-    }
-
-    @Override
-    public int getNumber() {
-      return getDescriptor().getNumber();
-    }
-
-    @Override
-    public WireFormat.FieldType getLiteType() {
-      return getDescriptor().getLiteType();
-    }
-
-    @Override
-    public boolean isRepeated() {
-      return getDescriptor().isRepeated();
-    }
-
-    @Override
-    @SuppressWarnings("unchecked")
-    public Type getDefaultValue() {
-      if (isRepeated()) {
-        return (Type) Collections.emptyList();
-      }
-      if (getDescriptor().getJavaType() == FieldDescriptor.JavaType.MESSAGE) {
-        return (Type) messageDefaultInstance;
-      }
-      return (Type) singularFromReflectionType(
-          getDescriptor().getDefaultValue());
-    }
-  }
-
-  // =================================================================
-
-  /** Calls Class.getMethod and throws a RuntimeException if it fails. */
-  @SuppressWarnings("unchecked")
-  private static Method getMethodOrDie(
-      final Class clazz, final String name, final Class... params) {
-    try {
-      return clazz.getMethod(name, params);
-    } catch (NoSuchMethodException e) {
-      throw new RuntimeException(
-        "Generated message class \"" + clazz.getName() +
-        "\" missing method \"" + name + "\".", e);
-    }
-  }
-
-  /** Calls invoke and throws a RuntimeException if it fails. */
-  private static Object invokeOrDie(
-      final Method method, final Object object, final Object... params) {
-    try {
-      return method.invoke(object, params);
-    } catch (IllegalAccessException e) {
-      throw new RuntimeException(
-        "Couldn't use Java reflection to implement protocol message " +
-        "reflection.", e);
-    } catch (InvocationTargetException e) {
-      final Throwable cause = e.getCause();
-      if (cause instanceof RuntimeException) {
-        throw (RuntimeException) cause;
-      } else if (cause instanceof Error) {
-        throw (Error) cause;
-      } else {
-        throw new RuntimeException(
-          "Unexpected exception thrown by generated accessor method.", cause);
-      }
-    }
-  }
-
-  /**
-   * Gets the map field with the given field number. This method should be
-   * overridden in the generated message class if the message contains map
-   * fields.
-   *
-   * Unlike other field types, reflection support for map fields can't be
-   * implemented based on generated public API because we need to access a
-   * map field as a list in reflection API but the generated API only allows
-   * us to access it as a map. This method returns the underlying map field
-   * directly and thus enables us to access the map field as a list.
-   */
-  @SuppressWarnings({"rawtypes", "unused"})
-  protected MapField internalGetMapField(int fieldNumber) {
-    // Note that we can't use descriptor names here because this method will
-    // be called when descriptor is being initialized.
-    throw new RuntimeException(
-        "No map fields found in " + getClass().getName());
-  }
-
-  /**
-   * Users should ignore this class.  This class provides the implementation
-   * with access to the fields of a message object using Java reflection.
-   */
-  public static final class FieldAccessorTable {
-
-    /**
-     * Construct a FieldAccessorTable for a particular message class.  Only
-     * one FieldAccessorTable should ever be constructed per class.
-     *
-     * @param descriptor     The type's descriptor.
-     * @param camelCaseNames The camelcase names of all fields in the message.
-     *                       These are used to derive the accessor method names.
-     * @param messageClass   The message type.
-     * @param builderClass   The builder type.
-     */
-    public FieldAccessorTable(
-        final Descriptor descriptor,
-        final String[] camelCaseNames,
-        final Class<? extends GeneratedMessage> messageClass,
-        final Class<? extends Builder> builderClass) {
-      this(descriptor, camelCaseNames);
-      ensureFieldAccessorsInitialized(messageClass, builderClass);
-    }
-
-    /**
-     * Construct a FieldAccessorTable for a particular message class without
-     * initializing FieldAccessors.
-     */
-    public FieldAccessorTable(
-        final Descriptor descriptor,
-        final String[] camelCaseNames) {
-      this.descriptor = descriptor;
-      this.camelCaseNames = camelCaseNames;
-      fields = new FieldAccessor[descriptor.getFields().size()];
-      oneofs = new OneofAccessor[descriptor.getOneofs().size()];
-      initialized = false;
-    }
-
-    private boolean isMapFieldEnabled(FieldDescriptor field) {
-      boolean result = true;
-      return result;
-    }
-
-    /**
-     * Ensures the field accessors are initialized. This method is thread-safe.
-     *
-     * @param messageClass   The message type.
-     * @param builderClass   The builder type.
-     * @return this
-     */
-    public FieldAccessorTable ensureFieldAccessorsInitialized(
-        Class<? extends GeneratedMessage> messageClass,
-        Class<? extends Builder> builderClass) {
-      if (initialized) { return this; }
-      synchronized (this) {
-        if (initialized) { return this; }
-        int fieldsSize = fields.length;
-        for (int i = 0; i < fieldsSize; i++) {
-          FieldDescriptor field = descriptor.getFields().get(i);
-          String containingOneofCamelCaseName = null;
-          if (field.getContainingOneof() != null) {
-            containingOneofCamelCaseName =
-                camelCaseNames[fieldsSize + field.getContainingOneof().getIndex()];
-          }
-          if (field.isRepeated()) {
-            if (field.getJavaType() == FieldDescriptor.JavaType.MESSAGE) {
-              if (field.isMapField() && isMapFieldEnabled(field)) {
-                fields[i] = new MapFieldAccessor(
-                    field, camelCaseNames[i], messageClass, builderClass);
-              } else {
-                fields[i] = new RepeatedMessageFieldAccessor(
-                    field, camelCaseNames[i], messageClass, builderClass);
-              }
-            } else if (field.getJavaType() == FieldDescriptor.JavaType.ENUM) {
-              fields[i] = new RepeatedEnumFieldAccessor(
-                  field, camelCaseNames[i], messageClass, builderClass);
-            } else {
-              fields[i] = new RepeatedFieldAccessor(
-                  field, camelCaseNames[i], messageClass, builderClass);
-            }
-          } else {
-            if (field.getJavaType() == FieldDescriptor.JavaType.MESSAGE) {
-              fields[i] = new SingularMessageFieldAccessor(
-                  field, camelCaseNames[i], messageClass, builderClass,
-                  containingOneofCamelCaseName);
-            } else if (field.getJavaType() == FieldDescriptor.JavaType.ENUM) {
-              fields[i] = new SingularEnumFieldAccessor(
-                  field, camelCaseNames[i], messageClass, builderClass,
-                  containingOneofCamelCaseName);
-            } else if (field.getJavaType() == FieldDescriptor.JavaType.STRING) {
-              fields[i] = new SingularStringFieldAccessor(
-                  field, camelCaseNames[i], messageClass, builderClass,
-                  containingOneofCamelCaseName);
-            } else {
-              fields[i] = new SingularFieldAccessor(
-                  field, camelCaseNames[i], messageClass, builderClass,
-                  containingOneofCamelCaseName);
-            }
-          }
-        }
-
-        int oneofsSize = oneofs.length;
-        for (int i = 0; i < oneofsSize; i++) {
-          oneofs[i] = new OneofAccessor(
-              descriptor, camelCaseNames[i + fieldsSize],
-              messageClass, builderClass);
-        }
-        initialized = true;
-        camelCaseNames = null;
-        return this;
-      }
-    }
-
-    private final Descriptor descriptor;
-    private final FieldAccessor[] fields;
-    private String[] camelCaseNames;
-    private final OneofAccessor[] oneofs;
-    private volatile boolean initialized;
-
-    /** Get the FieldAccessor for a particular field. */
-    private FieldAccessor getField(final FieldDescriptor field) {
-      if (field.getContainingType() != descriptor) {
-        throw new IllegalArgumentException(
-          "FieldDescriptor does not match message type.");
-      } else if (field.isExtension()) {
-        // If this type had extensions, it would subclass ExtendableMessage,
-        // which overrides the reflection interface to handle extensions.
-        throw new IllegalArgumentException(
-          "This type does not have extensions.");
-      }
-      return fields[field.getIndex()];
-    }
-
-    /** Get the OneofAccessor for a particular oneof. */
-    private OneofAccessor getOneof(final OneofDescriptor oneof) {
-      if (oneof.getContainingType() != descriptor) {
-        throw new IllegalArgumentException(
-          "OneofDescriptor does not match message type.");
-      }
-      return oneofs[oneof.getIndex()];
-    }
-
-    /**
-     * Abstract interface that provides access to a single field.  This is
-     * implemented differently depending on the field type and cardinality.
-     */
-    private interface FieldAccessor {
-      Object get(GeneratedMessage message);
-      Object get(GeneratedMessage.Builder builder);
-      Object getRaw(GeneratedMessage message);
-      Object getRaw(GeneratedMessage.Builder builder);
-      void set(Builder builder, Object value);
-      Object getRepeated(GeneratedMessage message, int index);
-      Object getRepeated(GeneratedMessage.Builder builder, int index);
-      Object getRepeatedRaw(GeneratedMessage message, int index);
-      Object getRepeatedRaw(GeneratedMessage.Builder builder, int index);
-      void setRepeated(Builder builder,
-                       int index, Object value);
-      void addRepeated(Builder builder, Object value);
-      boolean has(GeneratedMessage message);
-      boolean has(GeneratedMessage.Builder builder);
-      int getRepeatedCount(GeneratedMessage message);
-      int getRepeatedCount(GeneratedMessage.Builder builder);
-      void clear(Builder builder);
-      Message.Builder newBuilder();
-      Message.Builder getBuilder(GeneratedMessage.Builder builder);
-      Message.Builder getRepeatedBuilder(GeneratedMessage.Builder builder,
-                                         int index);
-    }
-
-    /** OneofAccessor provides access to a single oneof. */
-    private static class OneofAccessor {
-      OneofAccessor(
-          final Descriptor descriptor, final String camelCaseName,
-          final Class<? extends GeneratedMessage> messageClass,
-          final Class<? extends Builder> builderClass) {
-        this.descriptor = descriptor;
-        caseMethod =
-            getMethodOrDie(messageClass, "get" + camelCaseName + "Case");
-        caseMethodBuilder =
-            getMethodOrDie(builderClass, "get" + camelCaseName + "Case");
-        clearMethod = getMethodOrDie(builderClass, "clear" + camelCaseName);
-      }
-
-      private final Descriptor descriptor;
-      private final Method caseMethod;
-      private final Method caseMethodBuilder;
-      private final Method clearMethod;
-
-      public boolean has(final GeneratedMessage message) {
-        if (((Internal.EnumLite) invokeOrDie(caseMethod, message)).getNumber() == 0) {
-          return false;
-        }
-        return true;
-      }
-
-      public boolean has(GeneratedMessage.Builder builder) {
-        if (((Internal.EnumLite) invokeOrDie(caseMethodBuilder, builder)).getNumber() == 0) {
-          return false;
-        }
-        return true;
-      }
-
-      public FieldDescriptor get(final GeneratedMessage message) {
-        int fieldNumber = ((Internal.EnumLite) invokeOrDie(caseMethod, message)).getNumber();
-        if (fieldNumber > 0) {
-          return descriptor.findFieldByNumber(fieldNumber);
-        }
-        return null;
-      }
-
-      public FieldDescriptor get(GeneratedMessage.Builder builder) {
-        int fieldNumber = ((Internal.EnumLite) invokeOrDie(caseMethodBuilder, builder)).getNumber();
-        if (fieldNumber > 0) {
-          return descriptor.findFieldByNumber(fieldNumber);
-        }
-        return null;
-      }
-
-      public void clear(final Builder builder) {
-        invokeOrDie(clearMethod, builder);
-      }
-    }
-
-    private static boolean supportFieldPresence(FileDescriptor file) {
-      return file.getSyntax() == FileDescriptor.Syntax.PROTO2;
-    }
-
-    // ---------------------------------------------------------------
-
-    private static class SingularFieldAccessor implements FieldAccessor {
-      SingularFieldAccessor(
-          final FieldDescriptor descriptor, final String camelCaseName,
-          final Class<? extends GeneratedMessage> messageClass,
-          final Class<? extends Builder> builderClass,
-          final String containingOneofCamelCaseName) {
-        field = descriptor;
-        isOneofField = descriptor.getContainingOneof() != null;
-        hasHasMethod = supportFieldPresence(descriptor.getFile())
-            || (!isOneofField && descriptor.getJavaType() == FieldDescriptor.JavaType.MESSAGE);
-        getMethod = getMethodOrDie(messageClass, "get" + camelCaseName);
-        getMethodBuilder = getMethodOrDie(builderClass, "get" + camelCaseName);
-        type = getMethod.getReturnType();
-        setMethod = getMethodOrDie(builderClass, "set" + camelCaseName, type);
-        hasMethod =
-            hasHasMethod ? getMethodOrDie(messageClass, "has" + camelCaseName) : null;
-        hasMethodBuilder =
-            hasHasMethod ? getMethodOrDie(builderClass, "has" + camelCaseName) : null;
-        clearMethod = getMethodOrDie(builderClass, "clear" + camelCaseName);
-        caseMethod = isOneofField ? getMethodOrDie(
-            messageClass, "get" + containingOneofCamelCaseName + "Case") : null;
-        caseMethodBuilder = isOneofField ? getMethodOrDie(
-            builderClass, "get" + containingOneofCamelCaseName + "Case") : null;
-      }
-
-      // Note:  We use Java reflection to call public methods rather than
-      //   access private fields directly as this avoids runtime security
-      //   checks.
-      protected final Class<?> type;
-      protected final Method getMethod;
-      protected final Method getMethodBuilder;
-      protected final Method setMethod;
-      protected final Method hasMethod;
-      protected final Method hasMethodBuilder;
-      protected final Method clearMethod;
-      protected final Method caseMethod;
-      protected final Method caseMethodBuilder;
-      protected final FieldDescriptor field;
-      protected final boolean isOneofField;
-      protected final boolean hasHasMethod;
-
-      private int getOneofFieldNumber(final GeneratedMessage message) {
-        return ((Internal.EnumLite) invokeOrDie(caseMethod, message)).getNumber();
-      }
-
-      private int getOneofFieldNumber(final GeneratedMessage.Builder builder) {
-        return ((Internal.EnumLite) invokeOrDie(caseMethodBuilder, builder)).getNumber();
-      }
-
-      @Override
-      public Object get(final GeneratedMessage message) {
-        return invokeOrDie(getMethod, message);
-      }
-      @Override
-      public Object get(GeneratedMessage.Builder builder) {
-        return invokeOrDie(getMethodBuilder, builder);
-      }
-      @Override
-      public Object getRaw(final GeneratedMessage message) {
-        return get(message);
-      }
-      @Override
-      public Object getRaw(GeneratedMessage.Builder builder) {
-        return get(builder);
-      }
-      @Override
-      public void set(final Builder builder, final Object value) {
-        invokeOrDie(setMethod, builder, value);
-      }
-      @Override
-      public Object getRepeated(final GeneratedMessage message, final int index) {
-        throw new UnsupportedOperationException(
-          "getRepeatedField() called on a singular field.");
-      }
-      @Override
-      public Object getRepeatedRaw(final GeneratedMessage message, final int index) {
-        throw new UnsupportedOperationException(
-          "getRepeatedFieldRaw() called on a singular field.");
-      }
-      @Override
-      public Object getRepeated(GeneratedMessage.Builder builder, int index) {
-        throw new UnsupportedOperationException(
-          "getRepeatedField() called on a singular field.");
-      }
-      @Override
-      public Object getRepeatedRaw(GeneratedMessage.Builder builder, int index) {
-        throw new UnsupportedOperationException(
-          "getRepeatedFieldRaw() called on a singular field.");
-      }
-      @Override
-      public void setRepeated(final Builder builder, final int index, final Object value) {
-        throw new UnsupportedOperationException(
-          "setRepeatedField() called on a singular field.");
-      }
-      @Override
-      public void addRepeated(final Builder builder, final Object value) {
-        throw new UnsupportedOperationException(
-          "addRepeatedField() called on a singular field.");
-      }
-      @Override
-      public boolean has(final GeneratedMessage message) {
-        if (!hasHasMethod) {
-          if (isOneofField) {
-            return getOneofFieldNumber(message) == field.getNumber();
-          }
-          return !get(message).equals(field.getDefaultValue());
-        }
-        return (Boolean) invokeOrDie(hasMethod, message);
-      }
-      @Override
-      public boolean has(GeneratedMessage.Builder builder) {
-        if (!hasHasMethod) {
-          if (isOneofField) {
-            return getOneofFieldNumber(builder) == field.getNumber();
-          }
-          return !get(builder).equals(field.getDefaultValue());
-        }
-        return (Boolean) invokeOrDie(hasMethodBuilder, builder);
-      }
-      @Override
-      public int getRepeatedCount(final GeneratedMessage message) {
-        throw new UnsupportedOperationException(
-          "getRepeatedFieldSize() called on a singular field.");
-      }
-      @Override
-      public int getRepeatedCount(GeneratedMessage.Builder builder) {
-        throw new UnsupportedOperationException(
-          "getRepeatedFieldSize() called on a singular field.");
-      }
-      @Override
-      public void clear(final Builder builder) {
-        invokeOrDie(clearMethod, builder);
-      }
-      @Override
-      public Message.Builder newBuilder() {
-        throw new UnsupportedOperationException(
-          "newBuilderForField() called on a non-Message type.");
-      }
-      @Override
-      public Message.Builder getBuilder(GeneratedMessage.Builder builder) {
-        throw new UnsupportedOperationException(
-          "getFieldBuilder() called on a non-Message type.");
-      }
-      @Override
-      public Message.Builder getRepeatedBuilder(GeneratedMessage.Builder builder, int index) {
-        throw new UnsupportedOperationException(
-          "getRepeatedFieldBuilder() called on a non-Message type.");
-      }
-    }
-
-    private static class RepeatedFieldAccessor implements FieldAccessor {
-      protected final Class type;
-      protected final Method getMethod;
-      protected final Method getMethodBuilder;
-      protected final Method getRepeatedMethod;
-      protected final Method getRepeatedMethodBuilder;
-      protected final Method setRepeatedMethod;
-      protected final Method addRepeatedMethod;
-      protected final Method getCountMethod;
-      protected final Method getCountMethodBuilder;
-      protected final Method clearMethod;
-
-      RepeatedFieldAccessor(
-          final FieldDescriptor descriptor, final String camelCaseName,
-          final Class<? extends GeneratedMessage> messageClass,
-          final Class<? extends Builder> builderClass) {
-        getMethod = getMethodOrDie(messageClass,
-                                   "get" + camelCaseName + "List");
-        getMethodBuilder = getMethodOrDie(builderClass,
-                                   "get" + camelCaseName + "List");
-        getRepeatedMethod =
-            getMethodOrDie(messageClass, "get" + camelCaseName, Integer.TYPE);
-        getRepeatedMethodBuilder =
-            getMethodOrDie(builderClass, "get" + camelCaseName, Integer.TYPE);
-        type = getRepeatedMethod.getReturnType();
-        setRepeatedMethod =
-            getMethodOrDie(builderClass, "set" + camelCaseName,
-                           Integer.TYPE, type);
-        addRepeatedMethod =
-            getMethodOrDie(builderClass, "add" + camelCaseName, type);
-        getCountMethod =
-            getMethodOrDie(messageClass, "get" + camelCaseName + "Count");
-        getCountMethodBuilder =
-            getMethodOrDie(builderClass, "get" + camelCaseName + "Count");
-
-        clearMethod = getMethodOrDie(builderClass, "clear" + camelCaseName);
-      }
-
-      @Override
-      public Object get(final GeneratedMessage message) {
-        return invokeOrDie(getMethod, message);
-      }
-      @Override
-      public Object get(GeneratedMessage.Builder builder) {
-        return invokeOrDie(getMethodBuilder, builder);
-      }
-      @Override
-      public Object getRaw(final GeneratedMessage message) {
-        return get(message);
-      }
-      @Override
-      public Object getRaw(GeneratedMessage.Builder builder) {
-        return get(builder);
-      }
-      @Override
-      public void set(final Builder builder, final Object value) {
-        // Add all the elements individually.  This serves two purposes:
-        // 1) Verifies that each element has the correct type.
-        // 2) Insures that the caller cannot modify the list later on and
-        //    have the modifications be reflected in the message.
-        clear(builder);
-        for (final Object element : (List<?>) value) {
-          addRepeated(builder, element);
-        }
-      }
-      @Override
-      public Object getRepeated(final GeneratedMessage message, final int index) {
-        return invokeOrDie(getRepeatedMethod, message, index);
-      }
-      @Override
-      public Object getRepeated(GeneratedMessage.Builder builder, int index) {
-        return invokeOrDie(getRepeatedMethodBuilder, builder, index);
-      }
-      @Override
-      public Object getRepeatedRaw(GeneratedMessage message, int index) {
-        return getRepeated(message, index);
-      }
-      @Override
-      public Object getRepeatedRaw(GeneratedMessage.Builder builder, int index) {
-        return getRepeated(builder, index);
-      }
-      @Override
-      public void setRepeated(final Builder builder, final int index, final Object value) {
-        invokeOrDie(setRepeatedMethod, builder, index, value);
-      }
-      @Override
-      public void addRepeated(final Builder builder, final Object value) {
-        invokeOrDie(addRepeatedMethod, builder, value);
-      }
-      @Override
-      public boolean has(final GeneratedMessage message) {
-        throw new UnsupportedOperationException(
-          "hasField() called on a repeated field.");
-      }
-      @Override
-      public boolean has(GeneratedMessage.Builder builder) {
-        throw new UnsupportedOperationException(
-          "hasField() called on a repeated field.");
-      }
-      @Override
-      public int getRepeatedCount(final GeneratedMessage message) {
-        return (Integer) invokeOrDie(getCountMethod, message);
-      }
-      @Override
-      public int getRepeatedCount(GeneratedMessage.Builder builder) {
-        return (Integer) invokeOrDie(getCountMethodBuilder, builder);
-      }
-      @Override
-      public void clear(final Builder builder) {
-        invokeOrDie(clearMethod, builder);
-      }
-      @Override
-      public Message.Builder newBuilder() {
-        throw new UnsupportedOperationException(
-          "newBuilderForField() called on a non-Message type.");
-      }
-      @Override
-      public Message.Builder getBuilder(GeneratedMessage.Builder builder) {
-        throw new UnsupportedOperationException(
-          "getFieldBuilder() called on a non-Message type.");
-      }
-      @Override
-      public Message.Builder getRepeatedBuilder(GeneratedMessage.Builder builder, int index) {
-        throw new UnsupportedOperationException(
-          "getRepeatedFieldBuilder() called on a non-Message type.");
-      }
-    }
-
-    private static class MapFieldAccessor implements FieldAccessor {
-      MapFieldAccessor(
-          final FieldDescriptor descriptor, final String camelCaseName,
-          final Class<? extends GeneratedMessage> messageClass,
-          final Class<? extends Builder> builderClass) {
-        field = descriptor;
-        Method getDefaultInstanceMethod =
-            getMethodOrDie(messageClass, "getDefaultInstance");
-        MapField defaultMapField = getMapField(
-            (GeneratedMessage) invokeOrDie(getDefaultInstanceMethod, null));
-        mapEntryMessageDefaultInstance =
-            defaultMapField.getMapEntryMessageDefaultInstance();
-      }
-
-      private final FieldDescriptor field;
-      private final Message mapEntryMessageDefaultInstance;
-
-      private MapField<?, ?> getMapField(GeneratedMessage message) {
-        return (MapField<?, ?>) message.internalGetMapField(field.getNumber());
-      }
-
-      private MapField<?, ?> getMapField(GeneratedMessage.Builder builder) {
-        return (MapField<?, ?>) builder.internalGetMapField(field.getNumber());
-      }
-
-      private MapField<?, ?> getMutableMapField(
-          GeneratedMessage.Builder builder) {
-        return (MapField<?, ?>) builder.internalGetMutableMapField(
-            field.getNumber());
-      }
-
-      @Override
-      @SuppressWarnings("unchecked")
-      public Object get(GeneratedMessage message) {
-        List result = new ArrayList();
-        for (int i = 0; i < getRepeatedCount(message); i++) {
-          result.add(getRepeated(message, i));
-        }
-        return Collections.unmodifiableList(result);
-      }
-
-      @Override
-      @SuppressWarnings("unchecked")
-      public Object get(Builder builder) {
-        List result = new ArrayList();
-        for (int i = 0; i < getRepeatedCount(builder); i++) {
-          result.add(getRepeated(builder, i));
-        }
-        return Collections.unmodifiableList(result);
-      }
-
-      @Override
-      public Object getRaw(GeneratedMessage message) {
-        return get(message);
-      }
-
-      @Override
-      public Object getRaw(GeneratedMessage.Builder builder) {
-        return get(builder);
-      }
-
-      @Override
-      public void set(Builder builder, Object value) {
-        clear(builder);
-        for (Object entry : (List) value) {
-          addRepeated(builder, entry);
-        }
-      }
-
-      @Override
-      public Object getRepeated(GeneratedMessage message, int index) {
-        return getMapField(message).getList().get(index);
-      }
-
-      @Override
-      public Object getRepeated(Builder builder, int index) {
-        return getMapField(builder).getList().get(index);
-      }
-
-      @Override
-      public Object getRepeatedRaw(GeneratedMessage message, int index) {
-        return getRepeated(message, index);
-      }
-
-      @Override
-      public Object getRepeatedRaw(Builder builder, int index) {
-        return getRepeated(builder, index);
-      }
-
-      @Override
-      public void setRepeated(Builder builder, int index, Object value) {
-        getMutableMapField(builder).getMutableList().set(index, (Message) value);
-      }
-
-      @Override
-      public void addRepeated(Builder builder, Object value) {
-        getMutableMapField(builder).getMutableList().add((Message) value);
-      }
-
-      @Override
-      public boolean has(GeneratedMessage message) {
-        throw new UnsupportedOperationException(
-            "hasField() is not supported for repeated fields.");
-      }
-
-      @Override
-      public boolean has(Builder builder) {
-        throw new UnsupportedOperationException(
-            "hasField() is not supported for repeated fields.");
-      }
-
-      @Override
-      public int getRepeatedCount(GeneratedMessage message) {
-        return getMapField(message).getList().size();
-      }
-
-      @Override
-      public int getRepeatedCount(Builder builder) {
-        return getMapField(builder).getList().size();
-      }
-
-      @Override
-      public void clear(Builder builder) {
-        getMutableMapField(builder).getMutableList().clear();
-      }
-
-      @Override
-      public com.google.protobuf.Message.Builder newBuilder() {
-        return mapEntryMessageDefaultInstance.newBuilderForType();
-      }
-
-      @Override
-      public com.google.protobuf.Message.Builder getBuilder(Builder builder) {
-        throw new UnsupportedOperationException(
-            "Nested builder not supported for map fields.");
-      }
-
-      @Override
-      public com.google.protobuf.Message.Builder getRepeatedBuilder(Builder builder, int index) {
-        throw new UnsupportedOperationException(
-            "Nested builder not supported for map fields.");
-      }
-    }
-
-    // ---------------------------------------------------------------
-
-    private static final class SingularEnumFieldAccessor
-        extends SingularFieldAccessor {
-      SingularEnumFieldAccessor(
-          final FieldDescriptor descriptor, final String camelCaseName,
-          final Class<? extends GeneratedMessage> messageClass,
-          final Class<? extends Builder> builderClass,
-          final String containingOneofCamelCaseName) {
-        super(descriptor, camelCaseName, messageClass, builderClass, containingOneofCamelCaseName);
-
-        enumDescriptor = descriptor.getEnumType();
-
-        valueOfMethod = getMethodOrDie(type, "valueOf",
-                                       EnumValueDescriptor.class);
-        getValueDescriptorMethod =
-          getMethodOrDie(type, "getValueDescriptor");
-
-        supportUnknownEnumValue = descriptor.getFile().supportsUnknownEnumValue();
-        if (supportUnknownEnumValue) {
-          getValueMethod =
-              getMethodOrDie(messageClass, "get" + camelCaseName + "Value");
-          getValueMethodBuilder =
-              getMethodOrDie(builderClass, "get" + camelCaseName + "Value");
-          setValueMethod =
-              getMethodOrDie(builderClass, "set" + camelCaseName + "Value", int.class);
-        }
-      }
-
-      private EnumDescriptor enumDescriptor;
-
-      private Method valueOfMethod;
-      private Method getValueDescriptorMethod;
-
-      private boolean supportUnknownEnumValue;
-      private Method getValueMethod;
-      private Method getValueMethodBuilder;
-      private Method setValueMethod;
-
-      @Override
-      public Object get(final GeneratedMessage message) {
-        if (supportUnknownEnumValue) {
-          int value = (Integer) invokeOrDie(getValueMethod, message);
-          return enumDescriptor.findValueByNumberCreatingIfUnknown(value);
-        }
-        return invokeOrDie(getValueDescriptorMethod, super.get(message));
-      }
-
-      @Override
-      public Object get(final GeneratedMessage.Builder builder) {
-        if (supportUnknownEnumValue) {
-          int value = (Integer) invokeOrDie(getValueMethodBuilder, builder);
-          return enumDescriptor.findValueByNumberCreatingIfUnknown(value);
-        }
-        return invokeOrDie(getValueDescriptorMethod, super.get(builder));
-      }
-
-      @Override
-      public void set(final Builder builder, final Object value) {
-        if (supportUnknownEnumValue) {
-          invokeOrDie(setValueMethod, builder,
-              ((EnumValueDescriptor) value).getNumber());
-          return;
-        }
-        super.set(builder, invokeOrDie(valueOfMethod, null, value));
-      }
-    }
-
-    private static final class RepeatedEnumFieldAccessor
-        extends RepeatedFieldAccessor {
-      RepeatedEnumFieldAccessor(
-          final FieldDescriptor descriptor, final String camelCaseName,
-          final Class<? extends GeneratedMessage> messageClass,
-          final Class<? extends Builder> builderClass) {
-        super(descriptor, camelCaseName, messageClass, builderClass);
-
-        enumDescriptor = descriptor.getEnumType();
-
-        valueOfMethod = getMethodOrDie(type, "valueOf",
-                                       EnumValueDescriptor.class);
-        getValueDescriptorMethod =
-          getMethodOrDie(type, "getValueDescriptor");
-
-        supportUnknownEnumValue = descriptor.getFile().supportsUnknownEnumValue();
-        if (supportUnknownEnumValue) {
-          getRepeatedValueMethod =
-              getMethodOrDie(messageClass, "get" + camelCaseName + "Value", int.class);
-          getRepeatedValueMethodBuilder =
-              getMethodOrDie(builderClass, "get" + camelCaseName + "Value", int.class);
-          setRepeatedValueMethod =
-              getMethodOrDie(builderClass, "set" + camelCaseName + "Value", int.class, int.class);
-          addRepeatedValueMethod =
-              getMethodOrDie(builderClass, "add" + camelCaseName + "Value", int.class);
-        }
-      }
-      private EnumDescriptor enumDescriptor;
-
-      private final Method valueOfMethod;
-      private final Method getValueDescriptorMethod;
-
-      private boolean supportUnknownEnumValue;
-      private Method getRepeatedValueMethod;
-      private Method getRepeatedValueMethodBuilder;
-      private Method setRepeatedValueMethod;
-      private Method addRepeatedValueMethod;
-
-      @Override
-      @SuppressWarnings("unchecked")
-      public Object get(final GeneratedMessage message) {
-        final List newList = new ArrayList();
-        final int size = getRepeatedCount(message);
-        for (int i = 0; i < size; i++) {
-          newList.add(getRepeated(message, i));
-        }
-        return Collections.unmodifiableList(newList);
-      }
-
-      @Override
-      @SuppressWarnings("unchecked")
-      public Object get(final GeneratedMessage.Builder builder) {
-        final List newList = new ArrayList();
-        final int size = getRepeatedCount(builder);
-        for (int i = 0; i < size; i++) {
-          newList.add(getRepeated(builder, i));
-        }
-        return Collections.unmodifiableList(newList);
-      }
-
-      @Override
-      public Object getRepeated(final GeneratedMessage message,
-                                final int index) {
-        if (supportUnknownEnumValue) {
-          int value = (Integer) invokeOrDie(getRepeatedValueMethod, message, index);
-          return enumDescriptor.findValueByNumberCreatingIfUnknown(value);
-        }
-        return invokeOrDie(getValueDescriptorMethod,
-          super.getRepeated(message, index));
-      }
-      @Override
-      public Object getRepeated(final GeneratedMessage.Builder builder,
-                                final int index) {
-        if (supportUnknownEnumValue) {
-          int value = (Integer) invokeOrDie(getRepeatedValueMethodBuilder, builder, index);
-          return enumDescriptor.findValueByNumberCreatingIfUnknown(value);
-        }
-        return invokeOrDie(getValueDescriptorMethod,
-          super.getRepeated(builder, index));
-      }
-      @Override
-      public void setRepeated(final Builder builder,
-                              final int index, final Object value) {
-        if (supportUnknownEnumValue) {
-          invokeOrDie(setRepeatedValueMethod, builder, index,
-              ((EnumValueDescriptor) value).getNumber());
-          return;
-        }
-        super.setRepeated(builder, index, invokeOrDie(valueOfMethod, null,
-                          value));
-      }
-      @Override
-      public void addRepeated(final Builder builder, final Object value) {
-        if (supportUnknownEnumValue) {
-          invokeOrDie(addRepeatedValueMethod, builder,
-              ((EnumValueDescriptor) value).getNumber());
-          return;
-        }
-        super.addRepeated(builder, invokeOrDie(valueOfMethod, null, value));
-      }
-    }
-
-    // ---------------------------------------------------------------
-
-    /**
-     * Field accessor for string fields.
-     *
-     * <p>This class makes getFooBytes() and setFooBytes() available for
-     * reflection API so that reflection based serialize/parse functions can
-     * access the raw bytes of the field to preserve non-UTF8 bytes in the
-     * string.
-     *
-     * <p>This ensures the serialize/parse round-trip safety, which is important
-     * for servers which forward messages.
-     */
-    private static final class SingularStringFieldAccessor
-        extends SingularFieldAccessor {
-      SingularStringFieldAccessor(
-          final FieldDescriptor descriptor, final String camelCaseName,
-          final Class<? extends GeneratedMessage> messageClass,
-          final Class<? extends Builder> builderClass,
-          final String containingOneofCamelCaseName) {
-        super(descriptor, camelCaseName, messageClass, builderClass,
-            containingOneofCamelCaseName);
-        getBytesMethod = getMethodOrDie(messageClass,
-            "get" + camelCaseName + "Bytes");
-        getBytesMethodBuilder = getMethodOrDie(builderClass,
-            "get" + camelCaseName + "Bytes");
-        setBytesMethodBuilder = getMethodOrDie(builderClass,
-            "set" + camelCaseName + "Bytes", ByteString.class);
-      }
-
-      private final Method getBytesMethod;
-      private final Method getBytesMethodBuilder;
-      private final Method setBytesMethodBuilder;
-
-      @Override
-      public Object getRaw(final GeneratedMessage message) {
-        return invokeOrDie(getBytesMethod, message);
-      }
-
-      @Override
-      public Object getRaw(GeneratedMessage.Builder builder) {
-        return invokeOrDie(getBytesMethodBuilder, builder);
-      }
-
-      @Override
-      public void set(GeneratedMessage.Builder builder, Object value) {
-        if (value instanceof ByteString) {
-          invokeOrDie(setBytesMethodBuilder, builder, value);
-        } else {
-          super.set(builder, value);
-        }
-      }
-    }
-
-    // ---------------------------------------------------------------
-
-    private static final class SingularMessageFieldAccessor
-        extends SingularFieldAccessor {
-      SingularMessageFieldAccessor(
-          final FieldDescriptor descriptor, final String camelCaseName,
-          final Class<? extends GeneratedMessage> messageClass,
-          final Class<? extends Builder> builderClass,
-          final String containingOneofCamelCaseName) {
-        super(descriptor, camelCaseName, messageClass, builderClass,
-            containingOneofCamelCaseName);
-
-        newBuilderMethod = getMethodOrDie(type, "newBuilder");
-        getBuilderMethodBuilder =
-            getMethodOrDie(builderClass, "get" + camelCaseName + "Builder");
-      }
-
-      private final Method newBuilderMethod;
-      private final Method getBuilderMethodBuilder;
-
-      private Object coerceType(final Object value) {
-        if (type.isInstance(value)) {
-          return value;
-        } else {
-          // The value is not the exact right message type.  However, if it
-          // is an alternative implementation of the same type -- e.g. a
-          // DynamicMessage -- we should accept it.  In this case we can make
-          // a copy of the message.
-          return ((Message.Builder) invokeOrDie(newBuilderMethod, null))
-                  .mergeFrom((Message) value).buildPartial();
-        }
-      }
-
-      @Override
-      public void set(final Builder builder, final Object value) {
-        super.set(builder, coerceType(value));
-      }
-      @Override
-      public Message.Builder newBuilder() {
-        return (Message.Builder) invokeOrDie(newBuilderMethod, null);
-      }
-      @Override
-      public Message.Builder getBuilder(GeneratedMessage.Builder builder) {
-        return (Message.Builder) invokeOrDie(getBuilderMethodBuilder, builder);
-      }
-    }
-
-    private static final class RepeatedMessageFieldAccessor
-        extends RepeatedFieldAccessor {
-      RepeatedMessageFieldAccessor(
-          final FieldDescriptor descriptor, final String camelCaseName,
-          final Class<? extends GeneratedMessage> messageClass,
-          final Class<? extends Builder> builderClass) {
-        super(descriptor, camelCaseName, messageClass, builderClass);
-
-        newBuilderMethod = getMethodOrDie(type, "newBuilder");
-        getBuilderMethodBuilder = getMethodOrDie(builderClass,
-            "get" + camelCaseName + "Builder", Integer.TYPE);
-      }
-
-      private final Method newBuilderMethod;
-      private final Method getBuilderMethodBuilder;
-
-      private Object coerceType(final Object value) {
-        if (type.isInstance(value)) {
-          return value;
-        } else {
-          // The value is not the exact right message type.  However, if it
-          // is an alternative implementation of the same type -- e.g. a
-          // DynamicMessage -- we should accept it.  In this case we can make
-          // a copy of the message.
-          return ((Message.Builder) invokeOrDie(newBuilderMethod, null))
-                  .mergeFrom((Message) value).build();
-        }
-      }
-
-      @Override
-      public void setRepeated(final Builder builder,
-                              final int index, final Object value) {
-        super.setRepeated(builder, index, coerceType(value));
-      }
-      @Override
-      public void addRepeated(final Builder builder, final Object value) {
-        super.addRepeated(builder, coerceType(value));
-      }
-      @Override
-      public Message.Builder newBuilder() {
-        return (Message.Builder) invokeOrDie(newBuilderMethod, null);
-      }
-      @Override
-      public Message.Builder getRepeatedBuilder(
-          final GeneratedMessage.Builder builder, final int index) {
-        return (Message.Builder) invokeOrDie(
-            getBuilderMethodBuilder, builder, index);
-      }
-    }
-  }
-
-  /**
-   * Replaces this object in the output stream with a serialized form.
-   * Part of Java's serialization magic.  Generated sub-classes must override
-   * this method by calling {@code return super.writeReplace();}
-   * @return a SerializedForm of this message
-   */
-  protected Object writeReplace() throws ObjectStreamException {
-    return new GeneratedMessageLite.SerializedForm(this);
-  }
-
-  /**
-   * Checks that the {@link Extension} is non-Lite and returns it as a
-   * {@link GeneratedExtension}.
-   */
-  private static <MessageType extends ExtendableMessage<MessageType>, T>
-    Extension<MessageType, T> checkNotLite(
-        ExtensionLite<MessageType, T> extension) {
-    if (extension.isLite()) {
-      throw new IllegalArgumentException("Expected non-lite extension.");
-    }
-
-    return (Extension<MessageType, T>) extension;
-  }
-
-  protected static int computeStringSize(final int fieldNumber, final Object value) {
-    if (value instanceof String) {
-      return CodedOutputStream.computeStringSize(fieldNumber, (String) value);
-    } else {
-      return CodedOutputStream.computeBytesSize(fieldNumber, (ByteString) value);
-    }
-  }
-
-  protected static int computeStringSizeNoTag(final Object value) {
-    if (value instanceof String) {
-      return CodedOutputStream.computeStringSizeNoTag((String) value);
-    } else {
-      return CodedOutputStream.computeBytesSizeNoTag((ByteString) value);
-    }
-  }
-
-  protected static void writeString(
-      CodedOutputStream output, final int fieldNumber, final Object value) throws IOException {
-    if (value instanceof String) {
-      output.writeString(fieldNumber, (String) value);
-    } else {
-      output.writeBytes(fieldNumber, (ByteString) value);
-    }
-  }
-
-  protected static void writeStringNoTag(
-      CodedOutputStream output, final Object value) throws IOException {
-    if (value instanceof String) {
-      output.writeStringNoTag((String) value);
-    } else {
-      output.writeBytesNoTag((ByteString) value);
-    }
-  }
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/GeneratedMessageInfoFactory.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/GeneratedMessageInfoFactory.java
deleted file mode 100644
index 3e3efb9..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/GeneratedMessageInfoFactory.java
+++ /dev/null
@@ -1,65 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-/** A factory for message info that is generated into the message itself. */
-@ExperimentalApi
-class GeneratedMessageInfoFactory implements MessageInfoFactory {
-
-  private static final GeneratedMessageInfoFactory instance = new GeneratedMessageInfoFactory();
-
-  // Disallow construction - it's a singleton.
-  private GeneratedMessageInfoFactory() {}
-
-  public static GeneratedMessageInfoFactory getInstance() {
-    return instance;
-  }
-
-  @Override
-  public boolean isSupported(Class<?> messageType) {
-    return GeneratedMessageLite.class.isAssignableFrom(messageType);
-  }
-
-  @Override
-  public MessageInfo messageInfoFor(Class<?> messageType) {
-    if (!GeneratedMessageLite.class.isAssignableFrom(messageType)) {
-      throw new IllegalArgumentException("Unsupported message type: " + messageType.getName());
-    }
-
-    try {
-      return (MessageInfo) GeneratedMessageLite.getDefaultInstance(
-          messageType.asSubclass(GeneratedMessageLite.class))
-          .buildMessageInfo();
-    } catch (Exception e) {
-      throw new RuntimeException("Unable to get message info for " + messageType.getName(), e);
-    }
-  }
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/GeneratedMessageLite.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/GeneratedMessageLite.java
deleted file mode 100644
index 1ef2143..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/GeneratedMessageLite.java
+++ /dev/null
@@ -1,1854 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import com.google.protobuf.AbstractMessageLite.Builder.LimitedInputStream;
-import com.google.protobuf.Internal.BooleanList;
-import com.google.protobuf.Internal.DoubleList;
-import com.google.protobuf.Internal.FloatList;
-import com.google.protobuf.Internal.IntList;
-import com.google.protobuf.Internal.LongList;
-import com.google.protobuf.Internal.ProtobufList;
-import com.google.protobuf.WireFormat.FieldType;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.ObjectStreamException;
-import java.io.Serializable;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-/**
- * Lite version of {@link GeneratedMessage}.
- *
- * @author kenton@google.com Kenton Varda
- */
-public abstract class GeneratedMessageLite<
-        MessageType extends GeneratedMessageLite<MessageType, BuilderType>,
-        BuilderType extends GeneratedMessageLite.Builder<MessageType, BuilderType>>
-    extends AbstractMessageLite<MessageType, BuilderType> {
-
-  /* For use by lite runtime only */
-  static final int UNINITIALIZED_SERIALIZED_SIZE = 0x7FFFFFFF;
-  private static final int MUTABLE_FLAG_MASK = 0x80000000;
-  private static final int MEMOIZED_SERIALIZED_SIZE_MASK = 0x7FFFFFFF;
-
-  /**
-   * We use the high bit of memoizedSerializedSize as the explicit mutability flag. It didn't make
-   * sense to have negative sizes anyway. Messages start as mutable.
-   *
-   * <p>Adding a standalone boolean would have added 8 bytes to every message instance.
-   *
-   * <p>We also reserve 0x7FFFFFFF as the "uninitialized" value.
-   */
-  private int memoizedSerializedSize = MUTABLE_FLAG_MASK | UNINITIALIZED_SERIALIZED_SIZE;
-
-  /* For use by the runtime only */
-  static final int UNINITIALIZED_HASH_CODE = 0;
-
-  /** For use by generated code only. Lazily initialized to reduce allocations. */
-  protected UnknownFieldSetLite unknownFields = UnknownFieldSetLite.getDefaultInstance();
-
-  boolean isMutable() {
-    return (memoizedSerializedSize & MUTABLE_FLAG_MASK) != 0;
-  }
-
-  void markImmutable() {
-    memoizedSerializedSize &= ~MUTABLE_FLAG_MASK;
-  }
-
-  int getMemoizedHashCode() {
-    return memoizedHashCode;
-  }
-
-  void setMemoizedHashCode(int value) {
-    memoizedHashCode = value;
-  }
-
-  void clearMemoizedHashCode() {
-    memoizedHashCode = UNINITIALIZED_HASH_CODE;
-  }
-
-  boolean hashCodeIsNotMemoized() {
-    return UNINITIALIZED_HASH_CODE == getMemoizedHashCode();
-  }
-
-  @Override
-  @SuppressWarnings("unchecked") // Guaranteed by runtime.
-  public final Parser<MessageType> getParserForType() {
-    return (Parser<MessageType>) dynamicMethod(MethodToInvoke.GET_PARSER);
-  }
-
-  @Override
-  @SuppressWarnings("unchecked") // Guaranteed by runtime.
-  public final MessageType getDefaultInstanceForType() {
-    return (MessageType) dynamicMethod(MethodToInvoke.GET_DEFAULT_INSTANCE);
-  }
-
-  @Override
-  @SuppressWarnings("unchecked") // Guaranteed by runtime.
-  public final BuilderType newBuilderForType() {
-    return (BuilderType) dynamicMethod(MethodToInvoke.NEW_BUILDER);
-  }
-
-  MessageType newMutableInstance() {
-    return (MessageType) dynamicMethod(MethodToInvoke.NEW_MUTABLE_INSTANCE);
-  }
-
-  /**
-   * A reflective toString function. This is primarily intended as a developer aid, while keeping
-   * binary size down. The first line of the {@code toString()} representation includes a commented
-   * version of {@code super.toString()} to act as an indicator that this should not be relied on
-   * for comparisons.
-   *
-   * <p>NOTE: This method relies on the field getter methods not being stripped or renamed by
-   * proguard. If they are, the fields will not be included in the returned string representation.
-   *
-   * <p>NOTE: This implementation is liable to change in the future, and should not be relied on in
-   * code.
-   */
-  @Override
-  public String toString() {
-    return MessageLiteToString.toString(this, super.toString());
-  }
-
-  @SuppressWarnings("unchecked") // Guaranteed by runtime
-  @Override
-  public int hashCode() {
-    if (isMutable()) {
-      return computeHashCode();
-    }
-
-    if (hashCodeIsNotMemoized()) {
-      setMemoizedHashCode(computeHashCode());
-    }
-
-    return getMemoizedHashCode();
-  }
-
-  int computeHashCode() {
-    return Protobuf.getInstance().schemaFor(this).hashCode(this);
-  }
-
-  @SuppressWarnings("unchecked") // Guaranteed by isInstance + runtime
-  @Override
-  public boolean equals(
-          Object other) {
-    if (this == other) {
-      return true;
-    }
-
-    if (other == null) {
-      return false;
-    }
-
-    if (this.getClass() != other.getClass()) {
-      return false;
-    }
-
-    return Protobuf.getInstance().schemaFor(this).equals(this, (MessageType) other);
-  }
-
-  // The general strategy for unknown fields is to use an UnknownFieldSetLite that is treated as
-  // mutable during the parsing constructor and immutable after. This allows us to avoid
-  // any unnecessary intermediary allocations while reducing the generated code size.
-
-  /** Lazily initializes unknown fields. */
-  private final void ensureUnknownFieldsInitialized() {
-    if (unknownFields == UnknownFieldSetLite.getDefaultInstance()) {
-      unknownFields = UnknownFieldSetLite.newInstance();
-    }
-  }
-
-  /**
-   * Called by subclasses to parse an unknown field. For use by generated code only.
-   *
-   * @return {@code true} unless the tag is an end-group tag.
-   */
-  protected boolean parseUnknownField(int tag, CodedInputStream input) throws IOException {
-    // This will avoid the allocation of unknown fields when a group tag is encountered.
-    if (WireFormat.getTagWireType(tag) == WireFormat.WIRETYPE_END_GROUP) {
-      return false;
-    }
-
-    ensureUnknownFieldsInitialized();
-    return unknownFields.mergeFieldFrom(tag, input);
-  }
-
-  /** Called by subclasses to parse an unknown field. For use by generated code only. */
-  protected void mergeVarintField(int tag, int value) {
-    ensureUnknownFieldsInitialized();
-    unknownFields.mergeVarintField(tag, value);
-  }
-
-  /** Called by subclasses to parse an unknown field. For use by generated code only. */
-  protected void mergeLengthDelimitedField(int fieldNumber, ByteString value) {
-    ensureUnknownFieldsInitialized();
-    unknownFields.mergeLengthDelimitedField(fieldNumber, value);
-  }
-
-  /** Called by subclasses to complete parsing. For use by generated code only. */
-  protected void makeImmutable() {
-    Protobuf.getInstance().schemaFor(this).makeImmutable(this);
-    markImmutable();
-  }
-
-  protected final <
-          MessageType extends GeneratedMessageLite<MessageType, BuilderType>,
-          BuilderType extends GeneratedMessageLite.Builder<MessageType, BuilderType>>
-      BuilderType createBuilder() {
-    return (BuilderType) dynamicMethod(MethodToInvoke.NEW_BUILDER);
-  }
-
-  protected final <
-          MessageType extends GeneratedMessageLite<MessageType, BuilderType>,
-          BuilderType extends GeneratedMessageLite.Builder<MessageType, BuilderType>>
-      BuilderType createBuilder(MessageType prototype) {
-    return ((BuilderType) createBuilder()).mergeFrom(prototype);
-  }
-
-  @Override
-  public final boolean isInitialized() {
-    return isInitialized((MessageType) this, Boolean.TRUE);
-  }
-
-  @Override
-  @SuppressWarnings("unchecked")
-  public final BuilderType toBuilder() {
-    BuilderType builder = (BuilderType) dynamicMethod(MethodToInvoke.NEW_BUILDER);
-    return builder.mergeFrom((MessageType) this);
-  }
-
-  /**
-   * Defines which method path to invoke in {@link GeneratedMessageLite
-   * #dynamicMethod(MethodToInvoke, Object...)}.
-   *
-   * <p>For use by generated code only.
-   */
-  public static enum MethodToInvoke {
-    // Rely on/modify instance state
-    GET_MEMOIZED_IS_INITIALIZED,
-    SET_MEMOIZED_IS_INITIALIZED,
-
-    // Rely on static state
-    BUILD_MESSAGE_INFO,
-    NEW_MUTABLE_INSTANCE,
-    NEW_BUILDER,
-    GET_DEFAULT_INSTANCE,
-    GET_PARSER;
-  }
-
-  /**
-   * A method that implements different types of operations described in {@link MethodToInvoke}.
-   * These different kinds of operations are required to implement message-level operations for
-   * builders in the runtime. This method bundles those operations to reduce the generated methods
-   * count.
-   *
-   * <ul>
-   *   <li>{@code NEW_INSTANCE} returns a new instance of the protocol buffer that has not yet been
-   *       made immutable. See {@code MAKE_IMMUTABLE}.
-   *   <li>{@code IS_INITIALIZED} returns {@code null} for false and the default instance for true.
-   *       It doesn't use or modify any memoized value.
-   *   <li>{@code GET_MEMOIZED_IS_INITIALIZED} returns the memoized {@code isInitialized} byte
-   *       value.
-   *   <li>{@code SET_MEMOIZED_IS_INITIALIZED} sets the memoized {@code isInitialized} byte value to
-   *       1 if the first parameter is not null, or to 0 if the first parameter is null.
-   *   <li>{@code NEW_BUILDER} returns a {@code BuilderType} instance.
-   * </ul>
-   *
-   * This method, plus the implementation of the Builder, enables the Builder class to be proguarded
-   * away entirely on Android.
-   *
-   * <p>For use by generated code only.
-   */
-  protected abstract Object dynamicMethod(MethodToInvoke method, Object arg0, Object arg1);
-
-  /** Same as {@link #dynamicMethod(MethodToInvoke, Object, Object)} with {@code null} padding. */
-  @CanIgnoreReturnValue
-  protected Object dynamicMethod(MethodToInvoke method, Object arg0) {
-    return dynamicMethod(method, arg0, null);
-  }
-
-  /** Same as {@link #dynamicMethod(MethodToInvoke, Object, Object)} with {@code null} padding. */
-  protected Object dynamicMethod(MethodToInvoke method) {
-    return dynamicMethod(method, null, null);
-  }
-
-  void clearMemoizedSerializedSize() {
-    setMemoizedSerializedSize(UNINITIALIZED_SERIALIZED_SIZE);
-  }
-
-  @Override
-  int getMemoizedSerializedSize() {
-    return memoizedSerializedSize & MEMOIZED_SERIALIZED_SIZE_MASK;
-  }
-
-  @Override
-  void setMemoizedSerializedSize(int size) {
-    if (size < 0) {
-      throw new IllegalStateException("serialized size must be non-negative, was " + size);
-    }
-    memoizedSerializedSize =
-        (memoizedSerializedSize & MUTABLE_FLAG_MASK) | (size & MEMOIZED_SERIALIZED_SIZE_MASK);
-  }
-
-  @Override
-  public void writeTo(CodedOutputStream output) throws IOException {
-    Protobuf.getInstance()
-        .schemaFor(this)
-        .writeTo(this, CodedOutputStreamWriter.forCodedOutput(output));
-  }
-
-  @Override
-  int getSerializedSize(Schema schema) {
-    if (isMutable()) {
-      // The serialized size should never be memoized for mutable instances.
-      int size = computeSerializedSize(schema);
-      if (size < 0) {
-        throw new IllegalStateException("serialized size must be non-negative, was " + size);
-      }
-      return size;
-    }
-
-    // If memoizedSerializedSize has already been set, return it.
-    if (getMemoizedSerializedSize() != UNINITIALIZED_SERIALIZED_SIZE) {
-      return getMemoizedSerializedSize();
-    }
-
-    // Need to compute and memoize the serialized size.
-    int size = computeSerializedSize(schema);
-    setMemoizedSerializedSize(size);
-    return size;
-  }
-
-  @Override
-  public int getSerializedSize() {
-    // Calling this with 'null' to delay schema lookup in case the serializedSize is already
-    // memoized.
-    return getSerializedSize(null);
-  }
-
-  private int computeSerializedSize(Schema<?> nullableSchema) {
-    if (nullableSchema == null) {
-      return Protobuf.getInstance().schemaFor(this).getSerializedSize(this);
-    } else {
-      return ((Schema<GeneratedMessageLite<MessageType, BuilderType>>) nullableSchema)
-          .getSerializedSize(this);
-    }
-  }
-
-  /** Constructs a {@link MessageInfo} for this message type. */
-  Object buildMessageInfo() throws Exception {
-    return dynamicMethod(MethodToInvoke.BUILD_MESSAGE_INFO);
-  }
-
-  private static Map<Object, GeneratedMessageLite<?, ?>> defaultInstanceMap =
-      new ConcurrentHashMap<Object, GeneratedMessageLite<?, ?>>();
-
-  @SuppressWarnings("unchecked")
-  static <T extends GeneratedMessageLite<?, ?>> T getDefaultInstance(Class<T> clazz) {
-    T result = (T) defaultInstanceMap.get(clazz);
-    if (result == null) {
-      // Foo.class does not initialize the class so we need to force the initialization in order to
-      // get the default instance registered.
-      try {
-        Class.forName(clazz.getName(), true, clazz.getClassLoader());
-      } catch (ClassNotFoundException e) {
-        throw new IllegalStateException("Class initialization cannot fail.", e);
-      }
-      result = (T) defaultInstanceMap.get(clazz);
-    }
-    if (result == null) {
-      // On some Samsung devices, this still doesn't return a valid value for some reason. We add a
-      // reflective fallback to keep the device running. See b/114675342.
-      result = (T) UnsafeUtil.allocateInstance(clazz).getDefaultInstanceForType();
-      // A sanity check to ensure that <clinit> was actually invoked.
-      if (result == null) {
-        throw new IllegalStateException();
-      }
-      defaultInstanceMap.put(clazz, result);
-    }
-    return result;
-  }
-
-  protected static <T extends GeneratedMessageLite<?, ?>> void registerDefaultInstance(
-      Class<T> clazz, T defaultInstance) {
-    // Default instances must be immutable.
-    // Marking immutable here to avoid extra bytecode in every generated message class.
-    // Only calling "markImmutable" rather than "makeImmutable" because for Default Instances:
-    // 1. All sub-messages are initialized to null / default instances and thus immutable
-    // 2. All lists are initialized to default instance empty lists which are also immutable.
-    defaultInstance.markImmutable();
-    defaultInstanceMap.put(clazz, defaultInstance);
-  }
-
-  protected static Object newMessageInfo(
-      MessageLite defaultInstance, String info, Object[] objects) {
-    return new RawMessageInfo(defaultInstance, info, objects);
-  }
-
-  /**
-   * Merge some unknown fields into the {@link UnknownFieldSetLite} for this message.
-   *
-   * <p>For use by generated code only.
-   */
-  protected final void mergeUnknownFields(UnknownFieldSetLite unknownFields) {
-    this.unknownFields = UnknownFieldSetLite.mutableCopyOf(this.unknownFields, unknownFields);
-  }
-
-  @SuppressWarnings("unchecked")
-  public abstract static class Builder<
-          MessageType extends GeneratedMessageLite<MessageType, BuilderType>,
-          BuilderType extends Builder<MessageType, BuilderType>>
-      extends AbstractMessageLite.Builder<MessageType, BuilderType> {
-
-    private final MessageType defaultInstance;
-    protected MessageType instance;
-
-    protected Builder(MessageType defaultInstance) {
-      this.defaultInstance = defaultInstance;
-      if (defaultInstance.isMutable()) {
-        throw new IllegalArgumentException("Default instance must be immutable.");
-      }
-      // this.instance should be set to defaultInstance but some tests rely on newBuilder().build()
-      // creating unique instances.
-      this.instance = newMutableInstance();
-    }
-
-    private MessageType newMutableInstance() {
-      return defaultInstance.newMutableInstance();
-    }
-
-    /**
-     * Called before any method that would mutate the builder to ensure that it correctly copies any
-     * state before the write happens to preserve immutability guarantees.
-     */
-    protected final void copyOnWrite() {
-      if (!instance.isMutable()) {
-        copyOnWriteInternal();
-      }
-    }
-
-    protected void copyOnWriteInternal() {
-      MessageType newInstance = newMutableInstance();
-      mergeFromInstance(newInstance, instance);
-      instance = newInstance;
-    }
-
-    @Override
-    public final boolean isInitialized() {
-      return GeneratedMessageLite.isInitialized(instance, /* shouldMemoize= */ false);
-    }
-
-    @Override
-    public final BuilderType clear() {
-      // No need to copy on write since we're dropping the instance anyway.
-      if (defaultInstance.isMutable()) {
-        throw new IllegalArgumentException("Default instance must be immutable.");
-      }
-      instance = newMutableInstance(); // should be defaultInstance;
-      return (BuilderType) this;
-    }
-
-    @Override
-    public BuilderType clone() {
-      BuilderType builder = (BuilderType) getDefaultInstanceForType().newBuilderForType();
-      builder.instance = buildPartial();
-      return builder;
-    }
-
-    @Override
-    public MessageType buildPartial() {
-      if (!instance.isMutable()) {
-        return instance;
-      }
-
-      instance.makeImmutable();
-      return instance;
-    }
-
-    @Override
-    public final MessageType build() {
-      MessageType result = buildPartial();
-      if (!result.isInitialized()) {
-        throw newUninitializedMessageException(result);
-      }
-      return result;
-    }
-
-    @Override
-    protected BuilderType internalMergeFrom(MessageType message) {
-      return mergeFrom(message);
-    }
-
-    /** All subclasses implement this. */
-    public BuilderType mergeFrom(MessageType message) {
-      if (getDefaultInstanceForType().equals(message)) {
-        return (BuilderType) this;
-      }
-      copyOnWrite();
-      mergeFromInstance(instance, message);
-      return (BuilderType) this;
-    }
-
-    private static <MessageType> void mergeFromInstance(MessageType dest, MessageType src) {
-      Protobuf.getInstance().schemaFor(dest).mergeFrom(dest, src);
-    }
-
-    @Override
-    public MessageType getDefaultInstanceForType() {
-      return defaultInstance;
-    }
-
-    @Override
-    public BuilderType mergeFrom(
-        byte[] input, int offset, int length, ExtensionRegistryLite extensionRegistry)
-        throws InvalidProtocolBufferException {
-      copyOnWrite();
-      try {
-        Protobuf.getInstance().schemaFor(instance).mergeFrom(
-            instance, input, offset, offset + length,
-            new ArrayDecoders.Registers(extensionRegistry));
-      } catch (InvalidProtocolBufferException e) {
-        throw e;
-      } catch (IndexOutOfBoundsException e) {
-        throw InvalidProtocolBufferException.truncatedMessage();
-      } catch (IOException e) {
-        throw new RuntimeException("Reading from byte array should not throw IOException.", e);
-      }
-      return (BuilderType) this;
-    }
-
-    @Override
-    public BuilderType mergeFrom(
-        byte[] input, int offset, int length)
-        throws InvalidProtocolBufferException {
-      return mergeFrom(input, offset, length, ExtensionRegistryLite.getEmptyRegistry());
-    }
-
-    @Override
-    public BuilderType mergeFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws IOException {
-      copyOnWrite();
-      try {
-        // TODO(yilunchong): Try to make input with type CodedInputStream.ArrayDecoder use
-        // fast path.
-        Protobuf.getInstance().schemaFor(instance).mergeFrom(
-            instance, CodedInputStreamReader.forCodedInput(input), extensionRegistry);
-      } catch (RuntimeException e) {
-        if (e.getCause() instanceof IOException) {
-          throw (IOException) e.getCause();
-        }
-        throw e;
-      }
-      return (BuilderType) this;
-    }
-  }
-
-
-  // =================================================================
-  // Extensions-related stuff
-
-  /** Lite equivalent of {@link com.google.protobuf.GeneratedMessage.ExtendableMessageOrBuilder}. */
-  public interface ExtendableMessageOrBuilder<
-          MessageType extends ExtendableMessage<MessageType, BuilderType>,
-          BuilderType extends ExtendableBuilder<MessageType, BuilderType>>
-      extends MessageLiteOrBuilder {
-
-    /** Check if a singular extension is present. */
-    <Type> boolean hasExtension(ExtensionLite<MessageType, Type> extension);
-
-    /** Get the number of elements in a repeated extension. */
-    <Type> int getExtensionCount(ExtensionLite<MessageType, List<Type>> extension);
-
-    /** Get the value of an extension. */
-    <Type> Type getExtension(ExtensionLite<MessageType, Type> extension);
-
-    /** Get one element of a repeated extension. */
-    <Type> Type getExtension(ExtensionLite<MessageType, List<Type>> extension, int index);
-  }
-
-  /** Lite equivalent of {@link GeneratedMessage.ExtendableMessage}. */
-  public abstract static class ExtendableMessage<
-          MessageType extends ExtendableMessage<MessageType, BuilderType>,
-          BuilderType extends ExtendableBuilder<MessageType, BuilderType>>
-      extends GeneratedMessageLite<MessageType, BuilderType>
-      implements ExtendableMessageOrBuilder<MessageType, BuilderType> {
-
-    /** Represents the set of extensions on this message. For use by generated code only. */
-    protected FieldSet<ExtensionDescriptor> extensions = FieldSet.emptySet();
-
-    @SuppressWarnings("unchecked")
-    protected final void mergeExtensionFields(final MessageType other) {
-      if (extensions.isImmutable()) {
-        extensions = extensions.clone();
-      }
-      extensions.mergeFrom(((ExtendableMessage) other).extensions);
-    }
-
-    /**
-     * Parse an unknown field or an extension. For use by generated code only.
-     *
-     * <p>For use by generated code only.
-     *
-     * @return {@code true} unless the tag is an end-group tag.
-     */
-    protected <MessageType extends MessageLite> boolean parseUnknownField(
-        MessageType defaultInstance,
-        CodedInputStream input,
-        ExtensionRegistryLite extensionRegistry,
-        int tag)
-        throws IOException {
-      int fieldNumber = WireFormat.getTagFieldNumber(tag);
-
-      // TODO(dweis): How much bytecode would be saved by not requiring the generated code to
-      //     provide the default instance?
-      GeneratedExtension<MessageType, ?> extension =
-          extensionRegistry.findLiteExtensionByNumber(defaultInstance, fieldNumber);
-
-      return parseExtension(input, extensionRegistry, extension, tag, fieldNumber);
-    }
-
-    private boolean parseExtension(
-        CodedInputStream input,
-        ExtensionRegistryLite extensionRegistry,
-        GeneratedExtension<?, ?> extension,
-        int tag,
-        int fieldNumber)
-        throws IOException {
-      int wireType = WireFormat.getTagWireType(tag);
-      boolean unknown = false;
-      boolean packed = false;
-      if (extension == null) {
-        unknown = true; // Unknown field.
-      } else if (wireType
-          == FieldSet.getWireFormatForFieldType(
-              extension.descriptor.getLiteType(), /* isPacked= */ false)) {
-        packed = false; // Normal, unpacked value.
-      } else if (extension.descriptor.isRepeated
-          && extension.descriptor.type.isPackable()
-          && wireType
-              == FieldSet.getWireFormatForFieldType(
-                  extension.descriptor.getLiteType(), /* isPacked= */ true)) {
-        packed = true; // Packed value.
-      } else {
-        unknown = true; // Wrong wire type.
-      }
-
-      if (unknown) { // Unknown field or wrong wire type.  Skip.
-        return parseUnknownField(tag, input);
-      }
-
-      // TODO(b/230609037): remove the unused variable
-      FieldSet<ExtensionDescriptor> unused = ensureExtensionsAreMutable();
-
-      if (packed) {
-        int length = input.readRawVarint32();
-        int limit = input.pushLimit(length);
-        if (extension.descriptor.getLiteType() == WireFormat.FieldType.ENUM) {
-          while (input.getBytesUntilLimit() > 0) {
-            int rawValue = input.readEnum();
-            Object value = extension.descriptor.getEnumType().findValueByNumber(rawValue);
-            if (value == null) {
-              // If the number isn't recognized as a valid value for this
-              // enum, drop it (don't even add it to unknownFields).
-              return true;
-            }
-            extensions.addRepeatedField(
-                extension.descriptor, extension.singularToFieldSetType(value));
-          }
-        } else {
-          while (input.getBytesUntilLimit() > 0) {
-            Object value =
-                FieldSet.readPrimitiveField(
-                    input, extension.descriptor.getLiteType(), /*checkUtf8=*/ false);
-            extensions.addRepeatedField(extension.descriptor, value);
-          }
-        }
-        input.popLimit(limit);
-      } else {
-        Object value;
-        switch (extension.descriptor.getLiteJavaType()) {
-          case MESSAGE:
-            {
-              MessageLite.Builder subBuilder = null;
-              if (!extension.descriptor.isRepeated()) {
-                MessageLite existingValue = (MessageLite) extensions.getField(extension.descriptor);
-                if (existingValue != null) {
-                  subBuilder = existingValue.toBuilder();
-                }
-              }
-              if (subBuilder == null) {
-                subBuilder = extension.getMessageDefaultInstance().newBuilderForType();
-              }
-              if (extension.descriptor.getLiteType() == WireFormat.FieldType.GROUP) {
-                input.readGroup(extension.getNumber(), subBuilder, extensionRegistry);
-              } else {
-                input.readMessage(subBuilder, extensionRegistry);
-              }
-              value = subBuilder.build();
-              break;
-            }
-          case ENUM:
-            int rawValue = input.readEnum();
-            value = extension.descriptor.getEnumType().findValueByNumber(rawValue);
-            // If the number isn't recognized as a valid value for this enum,
-            // write it to unknown fields object.
-            if (value == null) {
-              mergeVarintField(fieldNumber, rawValue);
-              return true;
-            }
-            break;
-          default:
-            value =
-                FieldSet.readPrimitiveField(
-                    input, extension.descriptor.getLiteType(), /*checkUtf8=*/ false);
-            break;
-        }
-
-        if (extension.descriptor.isRepeated()) {
-          extensions.addRepeatedField(
-              extension.descriptor, extension.singularToFieldSetType(value));
-        } else {
-          extensions.setField(extension.descriptor, extension.singularToFieldSetType(value));
-        }
-      }
-      return true;
-    }
-
-    /**
-     * Parse an unknown field or an extension. For use by generated code only.
-     *
-     * <p>For use by generated code only.
-     *
-     * @return {@code true} unless the tag is an end-group tag.
-     */
-    protected <MessageType extends MessageLite> boolean parseUnknownFieldAsMessageSet(
-        MessageType defaultInstance,
-        CodedInputStream input,
-        ExtensionRegistryLite extensionRegistry,
-        int tag)
-        throws IOException {
-
-      if (tag == WireFormat.MESSAGE_SET_ITEM_TAG) {
-        mergeMessageSetExtensionFromCodedStream(defaultInstance, input, extensionRegistry);
-        return true;
-      }
-
-      // TODO(dweis): Do we really want to support non message set wire format in message sets?
-      // Full runtime does... So we do for now.
-      int wireType = WireFormat.getTagWireType(tag);
-      if (wireType == WireFormat.WIRETYPE_LENGTH_DELIMITED) {
-        return parseUnknownField(defaultInstance, input, extensionRegistry, tag);
-      } else {
-        // TODO(dweis): Should we throw on invalid input? Full runtime does not...
-        return input.skipField(tag);
-      }
-    }
-
-    /**
-     * Merges the message set from the input stream; requires message set wire format.
-     *
-     * @param defaultInstance the default instance of the containing message we are parsing in
-     * @param input the stream to parse from
-     * @param extensionRegistry the registry to use when parsing
-     */
-    private <MessageType extends MessageLite> void mergeMessageSetExtensionFromCodedStream(
-        MessageType defaultInstance,
-        CodedInputStream input,
-        ExtensionRegistryLite extensionRegistry)
-        throws IOException {
-      // The wire format for MessageSet is:
-      //   message MessageSet {
-      //     repeated group Item = 1 {
-      //       required uint32 typeId = 2;
-      //       required bytes message = 3;
-      //     }
-      //   }
-      // "typeId" is the extension's field number.  The extension can only be
-      // a message type, where "message" contains the encoded bytes of that
-      // message.
-      //
-      // In practice, we will probably never see a MessageSet item in which
-      // the message appears before the type ID, or where either field does not
-      // appear exactly once.  However, in theory such cases are valid, so we
-      // should be prepared to accept them.
-
-      int typeId = 0;
-      ByteString rawBytes = null; // If we encounter "message" before "typeId"
-      GeneratedExtension<?, ?> extension = null;
-
-      // Read bytes from input, if we get it's type first then parse it eagerly,
-      // otherwise we store the raw bytes in a local variable.
-      while (true) {
-        final int tag = input.readTag();
-        if (tag == 0) {
-          break;
-        }
-
-        if (tag == WireFormat.MESSAGE_SET_TYPE_ID_TAG) {
-          typeId = input.readUInt32();
-          if (typeId != 0) {
-            extension = extensionRegistry.findLiteExtensionByNumber(defaultInstance, typeId);
-          }
-
-        } else if (tag == WireFormat.MESSAGE_SET_MESSAGE_TAG) {
-          if (typeId != 0) {
-            if (extension != null) {
-              // We already know the type, so we can parse directly from the
-              // input with no copying.  Hooray!
-              eagerlyMergeMessageSetExtension(input, extension, extensionRegistry, typeId);
-              rawBytes = null;
-              continue;
-            }
-          }
-          // We haven't seen a type ID yet or we want parse message lazily.
-          rawBytes = input.readBytes();
-
-        } else { // Unknown tag. Skip it.
-          if (!input.skipField(tag)) {
-            break; // End of group
-          }
-        }
-      }
-      input.checkLastTagWas(WireFormat.MESSAGE_SET_ITEM_END_TAG);
-
-      // Process the raw bytes.
-      if (rawBytes != null && typeId != 0) { // Zero is not a valid type ID.
-        if (extension != null) { // We known the type
-          mergeMessageSetExtensionFromBytes(rawBytes, extensionRegistry, extension);
-        } else { // We don't know how to parse this. Ignore it.
-          if (rawBytes != null) {
-            mergeLengthDelimitedField(typeId, rawBytes);
-          }
-        }
-      }
-    }
-
-    private void eagerlyMergeMessageSetExtension(
-        CodedInputStream input,
-        GeneratedExtension<?, ?> extension,
-        ExtensionRegistryLite extensionRegistry,
-        int typeId)
-        throws IOException {
-      int fieldNumber = typeId;
-      int tag = WireFormat.makeTag(typeId, WireFormat.WIRETYPE_LENGTH_DELIMITED);
-      // TODO(b/230609037): remove the unused variable
-      boolean unused = parseExtension(input, extensionRegistry, extension, tag, fieldNumber);
-    }
-
-    private void mergeMessageSetExtensionFromBytes(
-        ByteString rawBytes,
-        ExtensionRegistryLite extensionRegistry,
-        GeneratedExtension<?, ?> extension)
-        throws IOException {
-      MessageLite.Builder subBuilder = null;
-      MessageLite existingValue = (MessageLite) extensions.getField(extension.descriptor);
-      if (existingValue != null) {
-        subBuilder = existingValue.toBuilder();
-      }
-      if (subBuilder == null) {
-        subBuilder = extension.getMessageDefaultInstance().newBuilderForType();
-      }
-      subBuilder.mergeFrom(rawBytes, extensionRegistry);
-      MessageLite value = subBuilder.build();
-
-      ensureExtensionsAreMutable()
-          .setField(extension.descriptor, extension.singularToFieldSetType(value));
-    }
-
-    @CanIgnoreReturnValue
-    FieldSet<ExtensionDescriptor> ensureExtensionsAreMutable() {
-      if (extensions.isImmutable()) {
-        extensions = extensions.clone();
-      }
-      return extensions;
-    }
-
-    private void verifyExtensionContainingType(final GeneratedExtension<MessageType, ?> extension) {
-      if (extension.getContainingTypeDefaultInstance() != getDefaultInstanceForType()) {
-        // This can only happen if someone uses unchecked operations.
-        throw new IllegalArgumentException(
-            "This extension is for a different message type.  Please make "
-                + "sure that you are not suppressing any generics type warnings.");
-      }
-    }
-
-    /** Check if a singular extension is present. */
-    @Override
-    public final <Type> boolean hasExtension(final ExtensionLite<MessageType, Type> extension) {
-      GeneratedExtension<MessageType, Type> extensionLite = checkIsLite(extension);
-
-      verifyExtensionContainingType(extensionLite);
-      return extensions.hasField(extensionLite.descriptor);
-    }
-
-    /** Get the number of elements in a repeated extension. */
-    @Override
-    public final <Type> int getExtensionCount(
-        final ExtensionLite<MessageType, List<Type>> extension) {
-      GeneratedExtension<MessageType, List<Type>> extensionLite = checkIsLite(extension);
-
-      verifyExtensionContainingType(extensionLite);
-      return extensions.getRepeatedFieldCount(extensionLite.descriptor);
-    }
-
-    /** Get the value of an extension. */
-    @Override
-    @SuppressWarnings("unchecked")
-    public final <Type> Type getExtension(final ExtensionLite<MessageType, Type> extension) {
-      GeneratedExtension<MessageType, Type> extensionLite = checkIsLite(extension);
-
-      verifyExtensionContainingType(extensionLite);
-      final Object value = extensions.getField(extensionLite.descriptor);
-      if (value == null) {
-        return extensionLite.defaultValue;
-      } else {
-        return (Type) extensionLite.fromFieldSetType(value);
-      }
-    }
-
-    /** Get one element of a repeated extension. */
-    @Override
-    @SuppressWarnings("unchecked")
-    public final <Type> Type getExtension(
-        final ExtensionLite<MessageType, List<Type>> extension, final int index) {
-      GeneratedExtension<MessageType, List<Type>> extensionLite = checkIsLite(extension);
-
-      verifyExtensionContainingType(extensionLite);
-      return (Type)
-          extensionLite.singularFromFieldSetType(
-              extensions.getRepeatedField(extensionLite.descriptor, index));
-    }
-
-    /** Called by subclasses to check if all extensions are initialized. */
-    protected boolean extensionsAreInitialized() {
-      return extensions.isInitialized();
-    }
-
-    /**
-     * Used by subclasses to serialize extensions. Extension ranges may be interleaved with field
-     * numbers, but we must write them in canonical (sorted by field number) order. ExtensionWriter
-     * helps us write individual ranges of extensions at once.
-     */
-    protected class ExtensionWriter {
-      // Imagine how much simpler this code would be if Java iterators had
-      // a way to get the next element without advancing the iterator.
-
-      private final Iterator<Map.Entry<ExtensionDescriptor, Object>> iter = extensions.iterator();
-      private Map.Entry<ExtensionDescriptor, Object> next;
-      private final boolean messageSetWireFormat;
-
-      private ExtensionWriter(boolean messageSetWireFormat) {
-        if (iter.hasNext()) {
-          next = iter.next();
-        }
-        this.messageSetWireFormat = messageSetWireFormat;
-      }
-
-      public void writeUntil(final int end, final CodedOutputStream output) throws IOException {
-        while (next != null && next.getKey().getNumber() < end) {
-          ExtensionDescriptor extension = next.getKey();
-          if (messageSetWireFormat
-              && extension.getLiteJavaType() == WireFormat.JavaType.MESSAGE
-              && !extension.isRepeated()) {
-            output.writeMessageSetExtension(extension.getNumber(), (MessageLite) next.getValue());
-          } else {
-            FieldSet.writeField(extension, next.getValue(), output);
-          }
-          if (iter.hasNext()) {
-            next = iter.next();
-          } else {
-            next = null;
-          }
-        }
-      }
-    }
-
-    protected ExtensionWriter newExtensionWriter() {
-      return new ExtensionWriter(false);
-    }
-
-    protected ExtensionWriter newMessageSetExtensionWriter() {
-      return new ExtensionWriter(true);
-    }
-
-    /** Called by subclasses to compute the size of extensions. */
-    protected int extensionsSerializedSize() {
-      return extensions.getSerializedSize();
-    }
-
-    protected int extensionsSerializedSizeAsMessageSet() {
-      return extensions.getMessageSetSerializedSize();
-    }
-  }
-
-  /** Lite equivalent of {@link GeneratedMessage.ExtendableBuilder}. */
-  @SuppressWarnings("unchecked")
-  public abstract static class ExtendableBuilder<
-          MessageType extends ExtendableMessage<MessageType, BuilderType>,
-          BuilderType extends ExtendableBuilder<MessageType, BuilderType>>
-      extends Builder<MessageType, BuilderType>
-      implements ExtendableMessageOrBuilder<MessageType, BuilderType> {
-    protected ExtendableBuilder(MessageType defaultInstance) {
-      super(defaultInstance);
-    }
-
-    // For immutable message conversion.
-    void internalSetExtensionSet(FieldSet<ExtensionDescriptor> extensions) {
-      copyOnWrite();
-      instance.extensions = extensions;
-    }
-
-    @Override
-    protected void copyOnWriteInternal() {
-      super.copyOnWriteInternal();
-      if (instance.extensions != FieldSet.emptySet()) {
-        instance.extensions = instance.extensions.clone();
-      }
-    }
-
-    private FieldSet<ExtensionDescriptor> ensureExtensionsAreMutable() {
-      FieldSet<ExtensionDescriptor> extensions = instance.extensions;
-      if (extensions.isImmutable()) {
-        extensions = extensions.clone();
-        instance.extensions = extensions;
-      }
-      return extensions;
-    }
-
-    @Override
-    public final MessageType buildPartial() {
-      if (!instance.isMutable()) {
-        return instance;
-      }
-
-      instance.extensions.makeImmutable();
-      return super.buildPartial();
-    }
-
-    private void verifyExtensionContainingType(final GeneratedExtension<MessageType, ?> extension) {
-      if (extension.getContainingTypeDefaultInstance() != getDefaultInstanceForType()) {
-        // This can only happen if someone uses unchecked operations.
-        throw new IllegalArgumentException(
-            "This extension is for a different message type.  Please make "
-                + "sure that you are not suppressing any generics type warnings.");
-      }
-    }
-
-    /** Check if a singular extension is present. */
-    @Override
-    public final <Type> boolean hasExtension(final ExtensionLite<MessageType, Type> extension) {
-      return instance.hasExtension(extension);
-    }
-
-    /** Get the number of elements in a repeated extension. */
-    @Override
-    public final <Type> int getExtensionCount(
-        final ExtensionLite<MessageType, List<Type>> extension) {
-      return instance.getExtensionCount(extension);
-    }
-
-    /** Get the value of an extension. */
-    @Override
-    @SuppressWarnings("unchecked")
-    public final <Type> Type getExtension(final ExtensionLite<MessageType, Type> extension) {
-      return instance.getExtension(extension);
-    }
-
-    /** Get one element of a repeated extension. */
-    @Override
-    public final <Type> Type getExtension(
-        final ExtensionLite<MessageType, List<Type>> extension, final int index) {
-      return instance.getExtension(extension, index);
-    }
-
-    /** Set the value of an extension. */
-    public final <Type> BuilderType setExtension(
-        final ExtensionLite<MessageType, Type> extension, final Type value) {
-      GeneratedExtension<MessageType, Type> extensionLite = checkIsLite(extension);
-
-      verifyExtensionContainingType(extensionLite);
-      copyOnWrite();
-      ensureExtensionsAreMutable()
-          .setField(extensionLite.descriptor, extensionLite.toFieldSetType(value));
-      return (BuilderType) this;
-    }
-
-    /** Set the value of one element of a repeated extension. */
-    public final <Type> BuilderType setExtension(
-        final ExtensionLite<MessageType, List<Type>> extension, final int index, final Type value) {
-      GeneratedExtension<MessageType, List<Type>> extensionLite = checkIsLite(extension);
-
-      verifyExtensionContainingType(extensionLite);
-      copyOnWrite();
-      ensureExtensionsAreMutable()
-          .setRepeatedField(
-              extensionLite.descriptor, index, extensionLite.singularToFieldSetType(value));
-      return (BuilderType) this;
-    }
-
-    /** Append a value to a repeated extension. */
-    public final <Type> BuilderType addExtension(
-        final ExtensionLite<MessageType, List<Type>> extension, final Type value) {
-      GeneratedExtension<MessageType, List<Type>> extensionLite = checkIsLite(extension);
-
-      verifyExtensionContainingType(extensionLite);
-      copyOnWrite();
-      ensureExtensionsAreMutable()
-          .addRepeatedField(extensionLite.descriptor, extensionLite.singularToFieldSetType(value));
-      return (BuilderType) this;
-    }
-
-    /** Clear an extension. */
-    public final BuilderType clearExtension(final ExtensionLite<MessageType, ?> extension) {
-      GeneratedExtension<MessageType, ?> extensionLite = checkIsLite(extension);
-
-      verifyExtensionContainingType(extensionLite);
-      copyOnWrite();
-      ensureExtensionsAreMutable().clearField(extensionLite.descriptor);
-      return (BuilderType) this;
-    }
-  }
-
-  // -----------------------------------------------------------------
-
-  /** For use by generated code only. */
-  public static <ContainingType extends MessageLite, Type>
-      GeneratedExtension<ContainingType, Type> newSingularGeneratedExtension(
-          final ContainingType containingTypeDefaultInstance,
-          final Type defaultValue,
-          final MessageLite messageDefaultInstance,
-          final Internal.EnumLiteMap<?> enumTypeMap,
-          final int number,
-          final WireFormat.FieldType type,
-          final Class singularType) {
-    return new GeneratedExtension<ContainingType, Type>(
-        containingTypeDefaultInstance,
-        defaultValue,
-        messageDefaultInstance,
-        new ExtensionDescriptor(
-            enumTypeMap, number, type, /* isRepeated= */ false, /* isPacked= */ false),
-        singularType);
-  }
-
-  /** For use by generated code only. */
-  public static <ContainingType extends MessageLite, Type>
-      GeneratedExtension<ContainingType, Type> newRepeatedGeneratedExtension(
-          final ContainingType containingTypeDefaultInstance,
-          final MessageLite messageDefaultInstance,
-          final Internal.EnumLiteMap<?> enumTypeMap,
-          final int number,
-          final WireFormat.FieldType type,
-          final boolean isPacked,
-          final Class singularType) {
-    @SuppressWarnings("unchecked") // Subclasses ensure Type is a List
-    Type emptyList = (Type) Collections.emptyList();
-    return new GeneratedExtension<ContainingType, Type>(
-        containingTypeDefaultInstance,
-        emptyList,
-        messageDefaultInstance,
-        new ExtensionDescriptor(enumTypeMap, number, type, /* isRepeated= */ true, isPacked),
-        singularType);
-  }
-
-  static final class ExtensionDescriptor
-      implements FieldSet.FieldDescriptorLite<ExtensionDescriptor> {
-    ExtensionDescriptor(
-        final Internal.EnumLiteMap<?> enumTypeMap,
-        final int number,
-        final WireFormat.FieldType type,
-        final boolean isRepeated,
-        final boolean isPacked) {
-      this.enumTypeMap = enumTypeMap;
-      this.number = number;
-      this.type = type;
-      this.isRepeated = isRepeated;
-      this.isPacked = isPacked;
-    }
-
-    final Internal.EnumLiteMap<?> enumTypeMap;
-    final int number;
-    final WireFormat.FieldType type;
-    final boolean isRepeated;
-    final boolean isPacked;
-
-    @Override
-    public int getNumber() {
-      return number;
-    }
-
-    @Override
-    public WireFormat.FieldType getLiteType() {
-      return type;
-    }
-
-    @Override
-    public WireFormat.JavaType getLiteJavaType() {
-      return type.getJavaType();
-    }
-
-    @Override
-    public boolean isRepeated() {
-      return isRepeated;
-    }
-
-    @Override
-    public boolean isPacked() {
-      return isPacked;
-    }
-
-    @Override
-    public Internal.EnumLiteMap<?> getEnumType() {
-      return enumTypeMap;
-    }
-
-    @Override
-    @SuppressWarnings("unchecked")
-    public MessageLite.Builder internalMergeFrom(MessageLite.Builder to, MessageLite from) {
-      return ((Builder) to).mergeFrom((GeneratedMessageLite) from);
-    }
-
-
-    @Override
-    public int compareTo(ExtensionDescriptor other) {
-      return number - other.number;
-    }
-  }
-
-  // =================================================================
-
-  /** Calls Class.getMethod and throws a RuntimeException if it fails. */
-  @SuppressWarnings("unchecked")
-  static Method getMethodOrDie(Class clazz, String name, Class... params) {
-    try {
-      return clazz.getMethod(name, params);
-    } catch (NoSuchMethodException e) {
-      throw new RuntimeException(
-          "Generated message class \"" + clazz.getName() + "\" missing method \"" + name + "\".",
-          e);
-    }
-  }
-
-  /** Calls invoke and throws a RuntimeException if it fails. */
-  static Object invokeOrDie(Method method, Object object, Object... params) {
-    try {
-      return method.invoke(object, params);
-    } catch (IllegalAccessException e) {
-      throw new RuntimeException(
-          "Couldn't use Java reflection to implement protocol message reflection.", e);
-    } catch (InvocationTargetException e) {
-      final Throwable cause = e.getCause();
-      if (cause instanceof RuntimeException) {
-        throw (RuntimeException) cause;
-      } else if (cause instanceof Error) {
-        throw (Error) cause;
-      } else {
-        throw new RuntimeException(
-            "Unexpected exception thrown by generated accessor method.", cause);
-      }
-    }
-  }
-
-
-  /**
-   * Lite equivalent to {@link GeneratedMessage.GeneratedExtension}.
-   *
-   * <p>Users should ignore the contents of this class and only use objects of this type as
-   * parameters to extension accessors and ExtensionRegistry.add().
-   */
-  public static class GeneratedExtension<ContainingType extends MessageLite, Type>
-      extends ExtensionLite<ContainingType, Type> {
-
-    /**
-     * Create a new instance with the given parameters.
-     *
-     * <p>The last parameter {@code singularType} is only needed for enum types. We store integer
-     * values for enum types in a {@link ExtendableMessage} and use Java reflection to convert an
-     * integer value back into a concrete enum object.
-     */
-    GeneratedExtension(
-        final ContainingType containingTypeDefaultInstance,
-        final Type defaultValue,
-        final MessageLite messageDefaultInstance,
-        final ExtensionDescriptor descriptor,
-        final Class singularType) {
-      // Defensive checks to verify the correct initialization order of
-      // GeneratedExtensions and their related GeneratedMessages.
-      if (containingTypeDefaultInstance == null) {
-        throw new IllegalArgumentException("Null containingTypeDefaultInstance");
-      }
-      if (descriptor.getLiteType() == WireFormat.FieldType.MESSAGE
-          && messageDefaultInstance == null) {
-        throw new IllegalArgumentException("Null messageDefaultInstance");
-      }
-      this.containingTypeDefaultInstance = containingTypeDefaultInstance;
-      this.defaultValue = defaultValue;
-      this.messageDefaultInstance = messageDefaultInstance;
-      this.descriptor = descriptor;
-    }
-
-    final ContainingType containingTypeDefaultInstance;
-    final Type defaultValue;
-    final MessageLite messageDefaultInstance;
-    final ExtensionDescriptor descriptor;
-
-    /** Default instance of the type being extended, used to identify that type. */
-    public ContainingType getContainingTypeDefaultInstance() {
-      return containingTypeDefaultInstance;
-    }
-
-    /** Get the field number. */
-    @Override
-    public int getNumber() {
-      return descriptor.getNumber();
-    }
-
-    /**
-     * If the extension is an embedded message or group, returns the default instance of the
-     * message.
-     */
-    @Override
-    public MessageLite getMessageDefaultInstance() {
-      return messageDefaultInstance;
-    }
-
-    @SuppressWarnings("unchecked")
-    Object fromFieldSetType(final Object value) {
-      if (descriptor.isRepeated()) {
-        if (descriptor.getLiteJavaType() == WireFormat.JavaType.ENUM) {
-          final List result = new ArrayList<>();
-          for (final Object element : (List) value) {
-            result.add(singularFromFieldSetType(element));
-          }
-          return result;
-        } else {
-          return value;
-        }
-      } else {
-        return singularFromFieldSetType(value);
-      }
-    }
-
-    Object singularFromFieldSetType(final Object value) {
-      if (descriptor.getLiteJavaType() == WireFormat.JavaType.ENUM) {
-        return descriptor.enumTypeMap.findValueByNumber((Integer) value);
-      } else {
-        return value;
-      }
-    }
-
-    @SuppressWarnings("unchecked")
-    Object toFieldSetType(final Object value) {
-      if (descriptor.isRepeated()) {
-        if (descriptor.getLiteJavaType() == WireFormat.JavaType.ENUM) {
-          final List result = new ArrayList<>();
-          for (final Object element : (List) value) {
-            result.add(singularToFieldSetType(element));
-          }
-          return result;
-        } else {
-          return value;
-        }
-      } else {
-        return singularToFieldSetType(value);
-      }
-    }
-
-    Object singularToFieldSetType(final Object value) {
-      if (descriptor.getLiteJavaType() == WireFormat.JavaType.ENUM) {
-        return ((Internal.EnumLite) value).getNumber();
-      } else {
-        return value;
-      }
-    }
-
-    @Override
-    public FieldType getLiteType() {
-      return descriptor.getLiteType();
-    }
-
-    @Override
-    public boolean isRepeated() {
-      return descriptor.isRepeated;
-    }
-
-    @Override
-    public Type getDefaultValue() {
-      return defaultValue;
-    }
-  }
-
-  /**
-   * A serialized (serializable) form of the generated message. Stores the message as a class name
-   * and a byte array.
-   */
-  protected static final class SerializedForm implements Serializable {
-
-    public static SerializedForm of(MessageLite message) {
-      return new SerializedForm(message);
-    }
-
-    private static final long serialVersionUID = 0L;
-
-    // since v3.6.1
-    private final Class<?> messageClass;
-    // only included for backwards compatibility before messageClass was added
-    private final String messageClassName;
-    private final byte[] asBytes;
-
-    /**
-     * Creates the serialized form by calling {@link com.google.protobuf.MessageLite#toByteArray}.
-     *
-     * @param regularForm the message to serialize
-     */
-    SerializedForm(MessageLite regularForm) {
-      messageClass = regularForm.getClass();
-      messageClassName = messageClass.getName();
-      asBytes = regularForm.toByteArray();
-    }
-
-    /**
-     * When read from an ObjectInputStream, this method converts this object back to the regular
-     * form. Part of Java's serialization magic.
-     *
-     * @return a GeneratedMessage of the type that was serialized
-     */
-    protected Object readResolve() throws ObjectStreamException {
-      try {
-        Class<?> messageClass = resolveMessageClass();
-        java.lang.reflect.Field defaultInstanceField =
-            messageClass.getDeclaredField("DEFAULT_INSTANCE");
-        defaultInstanceField.setAccessible(true);
-        MessageLite defaultInstance = (MessageLite) defaultInstanceField.get(null);
-        return defaultInstance.newBuilderForType().mergeFrom(asBytes).buildPartial();
-      } catch (ClassNotFoundException e) {
-        throw new RuntimeException("Unable to find proto buffer class: " + messageClassName, e);
-      } catch (NoSuchFieldException e) {
-        return readResolveFallback();
-      } catch (SecurityException e) {
-        throw new RuntimeException("Unable to call DEFAULT_INSTANCE in " + messageClassName, e);
-      } catch (IllegalAccessException e) {
-        throw new RuntimeException("Unable to call parsePartialFrom", e);
-      } catch (InvalidProtocolBufferException e) {
-        throw new RuntimeException("Unable to understand proto buffer", e);
-      }
-    }
-
-    /**
-     * @deprecated from v3.0.0-beta-3+, for compatibility with v2.5.0 and v2.6.1 generated code.
-     */
-    @Deprecated
-    private Object readResolveFallback() throws ObjectStreamException {
-      try {
-        Class<?> messageClass = resolveMessageClass();
-        java.lang.reflect.Field defaultInstanceField =
-            messageClass.getDeclaredField("defaultInstance");
-        defaultInstanceField.setAccessible(true);
-        MessageLite defaultInstance = (MessageLite) defaultInstanceField.get(null);
-        return defaultInstance.newBuilderForType()
-            .mergeFrom(asBytes)
-            .buildPartial();
-      } catch (ClassNotFoundException e) {
-        throw new RuntimeException("Unable to find proto buffer class: " + messageClassName, e);
-      } catch (NoSuchFieldException e) {
-        throw new RuntimeException("Unable to find defaultInstance in " + messageClassName, e);
-      } catch (SecurityException e) {
-        throw new RuntimeException("Unable to call defaultInstance in " + messageClassName, e);
-      } catch (IllegalAccessException e) {
-        throw new RuntimeException("Unable to call parsePartialFrom", e);
-      } catch (InvalidProtocolBufferException e) {
-        throw new RuntimeException("Unable to understand proto buffer", e);
-      }
-    }
-
-    private Class<?> resolveMessageClass() throws ClassNotFoundException {
-      return messageClass != null ? messageClass : Class.forName(messageClassName);
-    }
-  }
-
-  /** Checks that the {@link Extension} is Lite and returns it as a {@link GeneratedExtension}. */
-  private static <
-          MessageType extends ExtendableMessage<MessageType, BuilderType>,
-          BuilderType extends ExtendableBuilder<MessageType, BuilderType>,
-          T>
-      GeneratedExtension<MessageType, T> checkIsLite(ExtensionLite<MessageType, T> extension) {
-    if (!extension.isLite()) {
-      throw new IllegalArgumentException("Expected a lite extension.");
-    }
-
-    return (GeneratedExtension<MessageType, T>) extension;
-  }
-
-  /**
-   * A static helper method for checking if a message is initialized, optionally memoizing.
-   *
-   * <p>For use by generated code only.
-   */
-  protected static final <T extends GeneratedMessageLite<T, ?>> boolean isInitialized(
-      T message, boolean shouldMemoize) {
-    byte memoizedIsInitialized =
-        (Byte) message.dynamicMethod(MethodToInvoke.GET_MEMOIZED_IS_INITIALIZED);
-    if (memoizedIsInitialized == 1) {
-      return true;
-    }
-    if (memoizedIsInitialized == 0) {
-      return false;
-    }
-    boolean isInitialized = Protobuf.getInstance().schemaFor(message).isInitialized(message);
-    if (shouldMemoize) {
-      // TODO(b/230609037): remove the unused variable
-      Object unused =
-          message.dynamicMethod(
-              MethodToInvoke.SET_MEMOIZED_IS_INITIALIZED, isInitialized ? message : null);
-    }
-    return isInitialized;
-  }
-
-  protected static IntList emptyIntList() {
-    return IntArrayList.emptyList();
-  }
-
-  protected static IntList mutableCopy(IntList list) {
-    int size = list.size();
-    return list.mutableCopyWithCapacity(
-        size == 0 ? AbstractProtobufList.DEFAULT_CAPACITY : size * 2);
-  }
-
-  protected static LongList emptyLongList() {
-    return LongArrayList.emptyList();
-  }
-
-  protected static LongList mutableCopy(LongList list) {
-    int size = list.size();
-    return list.mutableCopyWithCapacity(
-        size == 0 ? AbstractProtobufList.DEFAULT_CAPACITY : size * 2);
-  }
-
-  protected static FloatList emptyFloatList() {
-    return FloatArrayList.emptyList();
-  }
-
-  protected static FloatList mutableCopy(FloatList list) {
-    int size = list.size();
-    return list.mutableCopyWithCapacity(
-        size == 0 ? AbstractProtobufList.DEFAULT_CAPACITY : size * 2);
-  }
-
-  protected static DoubleList emptyDoubleList() {
-    return DoubleArrayList.emptyList();
-  }
-
-  protected static DoubleList mutableCopy(DoubleList list) {
-    int size = list.size();
-    return list.mutableCopyWithCapacity(
-        size == 0 ? AbstractProtobufList.DEFAULT_CAPACITY : size * 2);
-  }
-
-  protected static BooleanList emptyBooleanList() {
-    return BooleanArrayList.emptyList();
-  }
-
-  protected static BooleanList mutableCopy(BooleanList list) {
-    int size = list.size();
-    return list.mutableCopyWithCapacity(
-        size == 0 ? AbstractProtobufList.DEFAULT_CAPACITY : size * 2);
-  }
-
-  protected static <E> ProtobufList<E> emptyProtobufList() {
-    return ProtobufArrayList.emptyList();
-  }
-
-  protected static <E> ProtobufList<E> mutableCopy(ProtobufList<E> list) {
-    int size = list.size();
-    return list.mutableCopyWithCapacity(
-        size == 0 ? AbstractProtobufList.DEFAULT_CAPACITY : size * 2);
-  }
-
-  /**
-   * A {@link Parser} implementation that delegates to the default instance.
-   *
-   * <p>For use by generated code only.
-   */
-  protected static class DefaultInstanceBasedParser<T extends GeneratedMessageLite<T, ?>>
-      extends AbstractParser<T> {
-
-    private final T defaultInstance;
-
-    public DefaultInstanceBasedParser(T defaultInstance) {
-      this.defaultInstance = defaultInstance;
-    }
-
-    @Override
-    public T parsePartialFrom(CodedInputStream input, ExtensionRegistryLite extensionRegistry)
-        throws InvalidProtocolBufferException {
-      return GeneratedMessageLite.parsePartialFrom(defaultInstance, input, extensionRegistry);
-    }
-
-    @Override
-    public T parsePartialFrom(
-        byte[] input, int offset, int length, ExtensionRegistryLite extensionRegistry)
-        throws InvalidProtocolBufferException {
-      return GeneratedMessageLite.parsePartialFrom(
-          defaultInstance, input, offset, length, extensionRegistry);
-    }
-  }
-
-  /**
-   * A static helper method for parsing a partial from input using the extension registry and the
-   * instance.
-   */
-  // TODO(dweis): Should this verify that the last tag was 0?
-  static <T extends GeneratedMessageLite<T, ?>> T parsePartialFrom(
-      T instance, CodedInputStream input, ExtensionRegistryLite extensionRegistry)
-      throws InvalidProtocolBufferException {
-    @SuppressWarnings("unchecked") // Guaranteed by protoc
-    T result = instance.newMutableInstance();
-    try {
-      // TODO(yilunchong): Try to make input with type CodedInpuStream.ArrayDecoder use
-      // fast path.
-      Schema<T> schema = Protobuf.getInstance().schemaFor(result);
-      schema.mergeFrom(result, CodedInputStreamReader.forCodedInput(input), extensionRegistry);
-      schema.makeImmutable(result);
-    } catch (InvalidProtocolBufferException e) {
-      if (e.getThrownFromInputStream()) {
-        e = new InvalidProtocolBufferException(e);
-      }
-      throw e.setUnfinishedMessage(result);
-    } catch (UninitializedMessageException e) {
-      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(result);
-    } catch (IOException e) {
-      if (e.getCause() instanceof InvalidProtocolBufferException) {
-        throw (InvalidProtocolBufferException) e.getCause();
-      }
-      throw new InvalidProtocolBufferException(e).setUnfinishedMessage(result);
-    } catch (RuntimeException e) {
-      if (e.getCause() instanceof InvalidProtocolBufferException) {
-        throw (InvalidProtocolBufferException) e.getCause();
-      }
-      throw e;
-    }
-    return result;
-  }
-
-  /** A static helper method for parsing a partial from byte array. */
-  private static <T extends GeneratedMessageLite<T, ?>> T parsePartialFrom(
-      T instance, byte[] input, int offset, int length, ExtensionRegistryLite extensionRegistry)
-      throws InvalidProtocolBufferException {
-    @SuppressWarnings("unchecked") // Guaranteed by protoc
-    T result = instance.newMutableInstance();
-    try {
-      Schema<T> schema = Protobuf.getInstance().schemaFor(result);
-      schema.mergeFrom(
-          result, input, offset, offset + length, new ArrayDecoders.Registers(extensionRegistry));
-      schema.makeImmutable(result);
-    } catch (InvalidProtocolBufferException e) {
-      if (e.getThrownFromInputStream()) {
-        e = new InvalidProtocolBufferException(e);
-      }
-      throw e.setUnfinishedMessage(result);
-    } catch (UninitializedMessageException e) {
-      throw e.asInvalidProtocolBufferException().setUnfinishedMessage(result);
-    } catch (IOException e) {
-      if (e.getCause() instanceof InvalidProtocolBufferException) {
-        throw (InvalidProtocolBufferException) e.getCause();
-      }
-      throw new InvalidProtocolBufferException(e).setUnfinishedMessage(result);
-    } catch (IndexOutOfBoundsException e) {
-      throw InvalidProtocolBufferException.truncatedMessage().setUnfinishedMessage(result);
-    }
-    return result;
-  }
-
-  protected static <T extends GeneratedMessageLite<T, ?>> T parsePartialFrom(
-      T defaultInstance, CodedInputStream input) throws InvalidProtocolBufferException {
-    return parsePartialFrom(defaultInstance, input, ExtensionRegistryLite.getEmptyRegistry());
-  }
-
-  /**
-   * Helper method to check if message is initialized.
-   *
-   * @throws InvalidProtocolBufferException if it is not initialized.
-   * @return The message to check.
-   */
-  private static <T extends GeneratedMessageLite<T, ?>> T checkMessageInitialized(T message)
-      throws InvalidProtocolBufferException {
-    if (message != null && !message.isInitialized()) {
-      throw message
-          .newUninitializedMessageException()
-          .asInvalidProtocolBufferException()
-          .setUnfinishedMessage(message);
-    }
-    return message;
-  }
-
-  // Validates last tag.
-  protected static <T extends GeneratedMessageLite<T, ?>> T parseFrom(
-      T defaultInstance, ByteBuffer data, ExtensionRegistryLite extensionRegistry)
-      throws InvalidProtocolBufferException {
-    return checkMessageInitialized(
-        parseFrom(defaultInstance, CodedInputStream.newInstance(data), extensionRegistry));
-  }
-
-  // Validates last tag.
-  protected static <T extends GeneratedMessageLite<T, ?>> T parseFrom(
-      T defaultInstance, ByteBuffer data) throws InvalidProtocolBufferException {
-    return parseFrom(defaultInstance, data, ExtensionRegistryLite.getEmptyRegistry());
-  }
-
-  // Validates last tag.
-  protected static <T extends GeneratedMessageLite<T, ?>> T parseFrom(
-      T defaultInstance, ByteString data) throws InvalidProtocolBufferException {
-    return checkMessageInitialized(
-        parseFrom(defaultInstance, data, ExtensionRegistryLite.getEmptyRegistry()));
-  }
-
-  // Validates last tag.
-  protected static <T extends GeneratedMessageLite<T, ?>> T parseFrom(
-      T defaultInstance, ByteString data, ExtensionRegistryLite extensionRegistry)
-      throws InvalidProtocolBufferException {
-    return checkMessageInitialized(parsePartialFrom(defaultInstance, data, extensionRegistry));
-  }
-
-  // This is a special case since we want to verify that the last tag is 0. We assume we exhaust the
-  // ByteString.
-  private static <T extends GeneratedMessageLite<T, ?>> T parsePartialFrom(
-      T defaultInstance, ByteString data, ExtensionRegistryLite extensionRegistry)
-      throws InvalidProtocolBufferException {
-    CodedInputStream input = data.newCodedInput();
-    T message = parsePartialFrom(defaultInstance, input, extensionRegistry);
-    try {
-      input.checkLastTagWas(0);
-    } catch (InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(message);
-    }
-    return message;
-  }
-
-  // Validates last tag.
-  protected static <T extends GeneratedMessageLite<T, ?>> T parseFrom(
-      T defaultInstance, byte[] data) throws InvalidProtocolBufferException {
-    return checkMessageInitialized(parsePartialFrom(
-        defaultInstance, data, 0, data.length, ExtensionRegistryLite.getEmptyRegistry()));
-  }
-
-  // Validates last tag.
-  protected static <T extends GeneratedMessageLite<T, ?>> T parseFrom(
-      T defaultInstance, byte[] data, ExtensionRegistryLite extensionRegistry)
-      throws InvalidProtocolBufferException {
-    return checkMessageInitialized(
-        parsePartialFrom(defaultInstance, data, 0, data.length, extensionRegistry));
-  }
-
-  // Does not validate last tag.
-  protected static <T extends GeneratedMessageLite<T, ?>> T parseFrom(
-      T defaultInstance, InputStream input) throws InvalidProtocolBufferException {
-    return checkMessageInitialized(
-        parsePartialFrom(
-            defaultInstance,
-            CodedInputStream.newInstance(input),
-            ExtensionRegistryLite.getEmptyRegistry()));
-  }
-
-  // Does not validate last tag.
-  protected static <T extends GeneratedMessageLite<T, ?>> T parseFrom(
-      T defaultInstance, InputStream input, ExtensionRegistryLite extensionRegistry)
-      throws InvalidProtocolBufferException {
-    return checkMessageInitialized(
-        parsePartialFrom(defaultInstance, CodedInputStream.newInstance(input), extensionRegistry));
-  }
-
-  // Does not validate last tag.
-  protected static <T extends GeneratedMessageLite<T, ?>> T parseFrom(
-      T defaultInstance, CodedInputStream input) throws InvalidProtocolBufferException {
-    return parseFrom(defaultInstance, input, ExtensionRegistryLite.getEmptyRegistry());
-  }
-
-  // Does not validate last tag.
-  protected static <T extends GeneratedMessageLite<T, ?>> T parseFrom(
-      T defaultInstance, CodedInputStream input, ExtensionRegistryLite extensionRegistry)
-      throws InvalidProtocolBufferException {
-    return checkMessageInitialized(parsePartialFrom(defaultInstance, input, extensionRegistry));
-  }
-
-  // Validates last tag.
-  protected static <T extends GeneratedMessageLite<T, ?>> T parseDelimitedFrom(
-      T defaultInstance, InputStream input) throws InvalidProtocolBufferException {
-    return checkMessageInitialized(
-        parsePartialDelimitedFrom(
-            defaultInstance, input, ExtensionRegistryLite.getEmptyRegistry()));
-  }
-
-  // Validates last tag.
-  protected static <T extends GeneratedMessageLite<T, ?>> T parseDelimitedFrom(
-      T defaultInstance, InputStream input, ExtensionRegistryLite extensionRegistry)
-      throws InvalidProtocolBufferException {
-    return checkMessageInitialized(
-        parsePartialDelimitedFrom(defaultInstance, input, extensionRegistry));
-  }
-
-  private static <T extends GeneratedMessageLite<T, ?>> T parsePartialDelimitedFrom(
-      T defaultInstance, InputStream input, ExtensionRegistryLite extensionRegistry)
-      throws InvalidProtocolBufferException {
-    int size;
-    try {
-      int firstByte = input.read();
-      if (firstByte == -1) {
-        return null;
-      }
-      size = CodedInputStream.readRawVarint32(firstByte, input);
-    } catch (InvalidProtocolBufferException e) {
-      if (e.getThrownFromInputStream()) {
-        e = new InvalidProtocolBufferException(e);
-      }
-      throw e;
-    } catch (IOException e) {
-      throw new InvalidProtocolBufferException(e);
-    }
-    InputStream limitedInput = new LimitedInputStream(input, size);
-    CodedInputStream codedInput = CodedInputStream.newInstance(limitedInput);
-    T message = parsePartialFrom(defaultInstance, codedInput, extensionRegistry);
-    try {
-      codedInput.checkLastTagWas(0);
-    } catch (InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(message);
-    }
-    return message;
-  }
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/GeneratedMessageV3.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/GeneratedMessageV3.java
deleted file mode 100644
index 355bf46..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/GeneratedMessageV3.java
+++ /dev/null
@@ -1,3337 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.protobuf.Internal.checkNotNull;
-
-import com.google.protobuf.Descriptors.Descriptor;
-import com.google.protobuf.Descriptors.EnumDescriptor;
-import com.google.protobuf.Descriptors.EnumValueDescriptor;
-import com.google.protobuf.Descriptors.FieldDescriptor;
-import com.google.protobuf.Descriptors.FileDescriptor;
-import com.google.protobuf.Descriptors.OneofDescriptor;
-import com.google.protobuf.Internal.BooleanList;
-import com.google.protobuf.Internal.DoubleList;
-import com.google.protobuf.Internal.FloatList;
-import com.google.protobuf.Internal.IntList;
-import com.google.protobuf.Internal.LongList;
-// In opensource protobuf, we have versioned this GeneratedMessageV3 class to GeneratedMessageV3 and
-// in the future may have GeneratedMessageV4 etc. This allows us to change some aspects of this
-// class without breaking binary compatibility with old generated code that still subclasses
-// the old GeneratedMessageV3 class. To allow these different GeneratedMessageV? classes to
-// interoperate (e.g., a GeneratedMessageV3 object has a message extension field whose class
-// type is GeneratedMessageV4), these classes still share a common parent class AbstractMessage
-// and are using the same GeneratedMessage.GeneratedExtension class for extension definitions.
-// Since this class becomes GeneratedMessageV? in opensource, we have to add an import here
-// to be able to use GeneratedMessage.GeneratedExtension. The GeneratedExtension definition in
-// this file is also excluded from opensource to avoid conflict.
-import com.google.protobuf.GeneratedMessage.GeneratedExtension;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.ObjectStreamException;
-import java.io.Serializable;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
-
-/**
- * All generated protocol message classes extend this class.  This class
- * implements most of the Message and Builder interfaces using Java reflection.
- * Users can ignore this class and pretend that generated messages implement
- * the Message interface directly.
- *
- * @author kenton@google.com Kenton Varda
- */
-public abstract class GeneratedMessageV3 extends AbstractMessage
-    implements Serializable {
-  private static final long serialVersionUID = 1L;
-
-  /**
-   * For testing. Allows a test to disable the optimization that avoids using field builders for
-   * nested messages until they are requested. By disabling this optimization, existing tests can be
-   * reused to test the field builders.
-   */
-  protected static boolean alwaysUseFieldBuilders = false;
-
-  /** For use by generated code only.  */
-  protected UnknownFieldSet unknownFields;
-
-  protected GeneratedMessageV3() {
-    unknownFields = UnknownFieldSet.getDefaultInstance();
-  }
-
-  protected GeneratedMessageV3(Builder<?> builder) {
-    unknownFields = builder.getUnknownFields();
-  }
-
-  @Override
-  public Parser<? extends GeneratedMessageV3> getParserForType() {
-    throw new UnsupportedOperationException(
-        "This is supposed to be overridden by subclasses.");
-  }
-
- /**
-  * @see #setAlwaysUseFieldBuildersForTesting(boolean)
-  */
-  static void enableAlwaysUseFieldBuildersForTesting() {
-    setAlwaysUseFieldBuildersForTesting(true);
-  }
-
-  /**
-   * For testing. Allows a test to disable/re-enable the optimization that avoids
-   * using field builders for nested messages until they are requested. By disabling
-   * this optimization, existing tests can be reused to test the field builders.
-   * See {@link RepeatedFieldBuilder} and {@link SingleFieldBuilder}.
-   */
-  static void setAlwaysUseFieldBuildersForTesting(boolean useBuilders) {
-    alwaysUseFieldBuilders = useBuilders;
-  }
-
-  /**
-   * Get the FieldAccessorTable for this type.  We can't have the message
-   * class pass this in to the constructor because of bootstrapping trouble
-   * with DescriptorProtos.
-   */
-  protected abstract FieldAccessorTable internalGetFieldAccessorTable();
-
-  @Override
-  public Descriptor getDescriptorForType() {
-    return internalGetFieldAccessorTable().descriptor;
-  }
-
-  // TODO(b/248143958): This method should be removed. It enables parsing directly into an
-  // "immutable" message. Have to leave it for now to support old gencode.
-  // @deprecated use newBuilder().mergeFrom() instead
-  @Deprecated
-  protected void mergeFromAndMakeImmutableInternal(
-      CodedInputStream input, ExtensionRegistryLite extensionRegistry)
-      throws InvalidProtocolBufferException {
-    Schema<GeneratedMessageV3> schema =
-        (Schema<GeneratedMessageV3>) Protobuf.getInstance().schemaFor(this);
-    try {
-      schema.mergeFrom(this, CodedInputStreamReader.forCodedInput(input), extensionRegistry);
-    } catch (InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (IOException e) {
-      throw new InvalidProtocolBufferException(e).setUnfinishedMessage(this);
-    }
-    schema.makeImmutable(this);
-  }
-
-  /**
-   * Internal helper to return a modifiable map containing all the fields.
-   * The returned Map is modifiable so that the caller can add additional
-   * extension fields to implement {@link #getAllFields()}.
-   *
-   * @param getBytesForString whether to generate ByteString for string fields
-   */
-  private Map<FieldDescriptor, Object> getAllFieldsMutable(
-      boolean getBytesForString) {
-    final TreeMap<FieldDescriptor, Object> result =
-      new TreeMap<FieldDescriptor, Object>();
-    final Descriptor descriptor = internalGetFieldAccessorTable().descriptor;
-    final List<FieldDescriptor> fields = descriptor.getFields();
-
-    for (int i = 0; i < fields.size(); i++) {
-      FieldDescriptor field = fields.get(i);
-      final OneofDescriptor oneofDescriptor = field.getContainingOneof();
-
-      /*
-       * If the field is part of a Oneof, then at maximum one field in the Oneof is set
-       * and it is not repeated. There is no need to iterate through the others.
-       */
-      if (oneofDescriptor != null) {
-        // Skip other fields in the Oneof we know are not set
-        i += oneofDescriptor.getFieldCount() - 1;
-        if (!hasOneof(oneofDescriptor)) {
-          // If no field is set in the Oneof, skip all the fields in the Oneof
-          continue;
-        }
-        // Get the pointer to the only field which is set in the Oneof
-        field = getOneofFieldDescriptor(oneofDescriptor);
-      } else {
-        // If we are not in a Oneof, we need to check if the field is set and if it is repeated
-        if (field.isRepeated()) {
-          final List<?> value = (List<?>) getField(field);
-          if (!value.isEmpty()) {
-            result.put(field, value);
-          }
-          continue;
-        }
-        if (!hasField(field)) {
-          continue;
-        }
-      }
-      // Add the field to the map
-      if (getBytesForString && field.getJavaType() == FieldDescriptor.JavaType.STRING) {
-        result.put(field, getFieldRaw(field));
-      } else {
-        result.put(field, getField(field));
-      }
-    }
-    return result;
-  }
-
-  @Override
-  public boolean isInitialized() {
-    for (final FieldDescriptor field : getDescriptorForType().getFields()) {
-      // Check that all required fields are present.
-      if (field.isRequired()) {
-        if (!hasField(field)) {
-          return false;
-        }
-      }
-      // Check that embedded messages are initialized.
-      if (field.getJavaType() == FieldDescriptor.JavaType.MESSAGE) {
-        if (field.isRepeated()) {
-          @SuppressWarnings("unchecked") final
-          List<Message> messageList = (List<Message>) getField(field);
-          for (final Message element : messageList) {
-            if (!element.isInitialized()) {
-              return false;
-            }
-          }
-        } else {
-          if (hasField(field) && !((Message) getField(field)).isInitialized()) {
-            return false;
-          }
-        }
-      }
-    }
-
-    return true;
-  }
-
-  @Override
-  public Map<FieldDescriptor, Object> getAllFields() {
-    return Collections.unmodifiableMap(
-        getAllFieldsMutable(/* getBytesForString = */ false));
-  }
-
-  /**
-   * Returns a collection of all the fields in this message which are set
-   * and their corresponding values.  A singular ("required" or "optional")
-   * field is set iff hasField() returns true for that field.  A "repeated"
-   * field is set iff getRepeatedFieldCount() is greater than zero.  The
-   * values are exactly what would be returned by calling
-   * {@link #getFieldRaw(Descriptors.FieldDescriptor)} for each field.  The map
-   * is guaranteed to be a sorted map, so iterating over it will return fields
-   * in order by field number.
-   */
-  Map<FieldDescriptor, Object> getAllFieldsRaw() {
-    return Collections.unmodifiableMap(
-        getAllFieldsMutable(/* getBytesForString = */ true));
-  }
-
-  @Override
-  public boolean hasOneof(final OneofDescriptor oneof) {
-    return internalGetFieldAccessorTable().getOneof(oneof).has(this);
-  }
-
-  @Override
-  public FieldDescriptor getOneofFieldDescriptor(final OneofDescriptor oneof) {
-    return internalGetFieldAccessorTable().getOneof(oneof).get(this);
-  }
-
-  @Override
-  public boolean hasField(final FieldDescriptor field) {
-    return internalGetFieldAccessorTable().getField(field).has(this);
-  }
-
-  @Override
-  public Object getField(final FieldDescriptor field) {
-    return internalGetFieldAccessorTable().getField(field).get(this);
-  }
-
-  /**
-   * Obtains the value of the given field, or the default value if it is
-   * not set.  For primitive fields, the boxed primitive value is returned.
-   * For enum fields, the EnumValueDescriptor for the value is returned. For
-   * embedded message fields, the sub-message is returned.  For repeated
-   * fields, a java.util.List is returned. For present string fields, a
-   * ByteString is returned representing the bytes that the field contains.
-   */
-  Object getFieldRaw(final FieldDescriptor field) {
-    return internalGetFieldAccessorTable().getField(field).getRaw(this);
-  }
-
-  @Override
-  public int getRepeatedFieldCount(final FieldDescriptor field) {
-    return internalGetFieldAccessorTable().getField(field)
-      .getRepeatedCount(this);
-  }
-
-  @Override
-  public Object getRepeatedField(final FieldDescriptor field, final int index) {
-    return internalGetFieldAccessorTable().getField(field)
-      .getRepeated(this, index);
-  }
-
-  @Override
-  public UnknownFieldSet getUnknownFields() {
-    return unknownFields;
-  }
-
-  /**
-   * Called by subclasses to parse an unknown field.
-   *
-   * <p>TODO(b/248153893) remove this method
-   *
-   * @return {@code true} unless the tag is an end-group tag.
-   */
-  protected boolean parseUnknownField(
-      CodedInputStream input,
-      UnknownFieldSet.Builder unknownFields,
-      ExtensionRegistryLite extensionRegistry,
-      int tag)
-      throws IOException {
-    if (input.shouldDiscardUnknownFields()) {
-      return input.skipField(tag);
-    }
-    return unknownFields.mergeFieldFrom(tag, input);
-  }
-
-  /**
-   * Delegates to parseUnknownField. This method is obsolete, but we must retain it for
-   * compatibility with older generated code.
-   *
-   * <p>TODO(b/248153893) remove this method
-   */
-  protected boolean parseUnknownFieldProto3(
-      CodedInputStream input,
-      UnknownFieldSet.Builder unknownFields,
-      ExtensionRegistryLite extensionRegistry,
-      int tag)
-      throws IOException {
-    return parseUnknownField(input, unknownFields, extensionRegistry, tag);
-  }
-
-  protected static <M extends Message> M parseWithIOException(Parser<M> parser, InputStream input)
-      throws IOException {
-    try {
-      return parser.parseFrom(input);
-    } catch (InvalidProtocolBufferException e) {
-      throw e.unwrapIOException();
-    }
-  }
-
-  protected static <M extends Message> M parseWithIOException(Parser<M> parser, InputStream input,
-      ExtensionRegistryLite extensions) throws IOException {
-    try {
-      return parser.parseFrom(input, extensions);
-    } catch (InvalidProtocolBufferException e) {
-      throw e.unwrapIOException();
-    }
-  }
-
-  protected static <M extends Message> M parseWithIOException(Parser<M> parser,
-      CodedInputStream input) throws IOException {
-    try {
-      return parser.parseFrom(input);
-    } catch (InvalidProtocolBufferException e) {
-      throw e.unwrapIOException();
-    }
-  }
-
-  protected static <M extends Message> M parseWithIOException(Parser<M> parser,
-      CodedInputStream input, ExtensionRegistryLite extensions) throws IOException {
-    try {
-      return parser.parseFrom(input, extensions);
-    } catch (InvalidProtocolBufferException e) {
-      throw e.unwrapIOException();
-    }
-  }
-
-  protected static <M extends Message> M parseDelimitedWithIOException(Parser<M> parser,
-      InputStream input) throws IOException {
-    try {
-      return parser.parseDelimitedFrom(input);
-    } catch (InvalidProtocolBufferException e) {
-      throw e.unwrapIOException();
-    }
-  }
-
-  protected static <M extends Message> M parseDelimitedWithIOException(Parser<M> parser,
-      InputStream input, ExtensionRegistryLite extensions) throws IOException {
-    try {
-      return parser.parseDelimitedFrom(input, extensions);
-    } catch (InvalidProtocolBufferException e) {
-      throw e.unwrapIOException();
-    }
-  }
-
-  protected static boolean canUseUnsafe() {
-    return UnsafeUtil.hasUnsafeArrayOperations() && UnsafeUtil.hasUnsafeByteBufferOperations();
-  }
-
-  protected static IntList emptyIntList() {
-    return IntArrayList.emptyList();
-  }
-
-  protected static IntList newIntList() {
-    return new IntArrayList();
-  }
-
-  protected static IntList mutableCopy(IntList list) {
-    int size = list.size();
-    return list.mutableCopyWithCapacity(
-        size == 0 ? AbstractProtobufList.DEFAULT_CAPACITY : size * 2);
-  }
-
-  protected static LongList emptyLongList() {
-    return LongArrayList.emptyList();
-  }
-
-  protected static LongList newLongList() {
-    return new LongArrayList();
-  }
-
-  protected static LongList mutableCopy(LongList list) {
-    int size = list.size();
-    return list.mutableCopyWithCapacity(
-        size == 0 ? AbstractProtobufList.DEFAULT_CAPACITY : size * 2);
-  }
-
-  protected static FloatList emptyFloatList() {
-    return FloatArrayList.emptyList();
-  }
-
-  protected static FloatList newFloatList() {
-    return new FloatArrayList();
-  }
-
-  protected static FloatList mutableCopy(FloatList list) {
-    int size = list.size();
-    return list.mutableCopyWithCapacity(
-        size == 0 ? AbstractProtobufList.DEFAULT_CAPACITY : size * 2);
-  }
-
-  protected static DoubleList emptyDoubleList() {
-    return DoubleArrayList.emptyList();
-  }
-
-  protected static DoubleList newDoubleList() {
-    return new DoubleArrayList();
-  }
-
-  protected static DoubleList mutableCopy(DoubleList list) {
-    int size = list.size();
-    return list.mutableCopyWithCapacity(
-        size == 0 ? AbstractProtobufList.DEFAULT_CAPACITY : size * 2);
-  }
-
-  protected static BooleanList emptyBooleanList() {
-    return BooleanArrayList.emptyList();
-  }
-
-  protected static BooleanList newBooleanList() {
-    return new BooleanArrayList();
-  }
-
-  protected static BooleanList mutableCopy(BooleanList list) {
-    int size = list.size();
-    return list.mutableCopyWithCapacity(
-        size == 0 ? AbstractProtobufList.DEFAULT_CAPACITY : size * 2);
-  }
-
-
-  @Override
-  public void writeTo(final CodedOutputStream output) throws IOException {
-    MessageReflection.writeMessageTo(this, getAllFieldsRaw(), output, false);
-  }
-
-  @Override
-  public int getSerializedSize() {
-    int size = memoizedSize;
-    if (size != -1) {
-      return size;
-    }
-
-    memoizedSize = MessageReflection.getSerializedSize(
-        this, getAllFieldsRaw());
-    return memoizedSize;
-  }
-
-
-
-  /**
-   * This class is used to make a generated protected method inaccessible from user's code (e.g.,
-   * the {@link #newInstance} method below). When this class is used as a parameter's type in a
-   * generated protected method, the method is visible to user's code in the same package, but
-   * since the constructor of this class is private to protobuf runtime, user's code can't obtain
-   * an instance of this class and as such can't actually make a method call on the protected
-   * method.
-   */
-  protected static final class UnusedPrivateParameter {
-    static final UnusedPrivateParameter INSTANCE = new UnusedPrivateParameter();
-
-    private UnusedPrivateParameter() {
-    }
-  }
-
-  /**
-   * Creates a new instance of this message type. Overridden in the generated code.
-   */
-  @SuppressWarnings({"unused"})
-  protected Object newInstance(UnusedPrivateParameter unused) {
-    throw new UnsupportedOperationException("This method must be overridden by the subclass.");
-  }
-
-  /**
-   * Used by parsing constructors in generated classes.
-   */
-  protected void makeExtensionsImmutable() {
-    // Noop for messages without extensions.
-  }
-
-  /**
-   * TODO(xiaofeng): remove this after b/29368482 is fixed. We need to move this
-   * interface to AbstractMessage in order to versioning GeneratedMessageV3 but
-   * this move breaks binary compatibility for AppEngine. After AppEngine is
-   * fixed we can exclude this from google3.
-   */
-  protected interface BuilderParent extends AbstractMessage.BuilderParent {}
-
-  /**
-   * TODO(xiaofeng): remove this together with GeneratedMessageV3.BuilderParent.
-   */
-  protected abstract Message.Builder newBuilderForType(BuilderParent parent);
-
-  @Override
-  protected Message.Builder newBuilderForType(final AbstractMessage.BuilderParent parent) {
-    return newBuilderForType(new BuilderParent() {
-      @Override
-      public void markDirty() {
-        parent.markDirty();
-      }
-    });
-  }
-
-
-  @SuppressWarnings("unchecked")
-  public abstract static class Builder <BuilderType extends Builder<BuilderType>>
-      extends AbstractMessage.Builder<BuilderType> {
-
-    private BuilderParent builderParent;
-
-    private BuilderParentImpl meAsParent;
-
-    // Indicates that we've built a message and so we are now obligated
-    // to dispatch dirty invalidations. See GeneratedMessageV3.BuilderListener.
-    private boolean isClean;
-
-    /**
-     * This field holds either an {@link UnknownFieldSet} or {@link UnknownFieldSet.Builder}.
-     *
-     * <p>We use an object because it should only be one or the other of those things at a time and
-     * Object is the only common base. This also saves space.
-     *
-     * <p>Conversions are lazy: if {@link #setUnknownFields} is called, this will contain {@link
-     * UnknownFieldSet}. If unknown fields are merged into this builder, the current {@link
-     * UnknownFieldSet} will be converted to a {@link UnknownFieldSet.Builder} and left that way
-     * until either {@link #setUnknownFields} or {@link #buildPartial} or {@link #build} is called.
-     */
-    private Object unknownFieldsOrBuilder = UnknownFieldSet.getDefaultInstance();
-
-    protected Builder() {
-      this(null);
-    }
-
-    protected Builder(BuilderParent builderParent) {
-      this.builderParent = builderParent;
-    }
-
-    @Override
-    void dispose() {
-      builderParent = null;
-    }
-
-    /**
-     * Called by the subclass when a message is built.
-     */
-    protected void onBuilt() {
-      if (builderParent != null) {
-        markClean();
-      }
-    }
-
-    /**
-     * Called by the subclass or a builder to notify us that a message was
-     * built and may be cached and therefore invalidations are needed.
-     */
-    @Override
-    protected void markClean() {
-      this.isClean = true;
-    }
-
-    /**
-     * Gets whether invalidations are needed
-     *
-     * @return whether invalidations are needed
-     */
-    protected boolean isClean() {
-      return isClean;
-    }
-
-    @Override
-    public BuilderType clone() {
-      BuilderType builder =
-          (BuilderType) getDefaultInstanceForType().newBuilderForType();
-      builder.mergeFrom(buildPartial());
-      return builder;
-    }
-
-    /**
-     * Called by the initialization and clear code paths to allow subclasses to
-     * reset any of their builtin fields back to the initial values.
-     */
-    @Override
-    public BuilderType clear() {
-      unknownFieldsOrBuilder = UnknownFieldSet.getDefaultInstance();
-      onChanged();
-      return (BuilderType) this;
-    }
-
-    /**
-     * Get the FieldAccessorTable for this type.  We can't have the message
-     * class pass this in to the constructor because of bootstrapping trouble
-     * with DescriptorProtos.
-     */
-    protected abstract FieldAccessorTable internalGetFieldAccessorTable();
-
-    @Override
-    public Descriptor getDescriptorForType() {
-      return internalGetFieldAccessorTable().descriptor;
-    }
-
-    @Override
-    public Map<FieldDescriptor, Object> getAllFields() {
-      return Collections.unmodifiableMap(getAllFieldsMutable());
-    }
-
-    /** Internal helper which returns a mutable map. */
-    private Map<FieldDescriptor, Object> getAllFieldsMutable() {
-      final TreeMap<FieldDescriptor, Object> result =
-        new TreeMap<FieldDescriptor, Object>();
-      final Descriptor descriptor = internalGetFieldAccessorTable().descriptor;
-      final List<FieldDescriptor> fields = descriptor.getFields();
-
-      for (int i = 0; i < fields.size(); i++) {
-        FieldDescriptor field = fields.get(i);
-        final OneofDescriptor oneofDescriptor = field.getContainingOneof();
-
-        /*
-         * If the field is part of a Oneof, then at maximum one field in the Oneof is set
-         * and it is not repeated. There is no need to iterate through the others.
-         */
-        if (oneofDescriptor != null) {
-          // Skip other fields in the Oneof we know are not set
-          i += oneofDescriptor.getFieldCount() - 1;
-          if (!hasOneof(oneofDescriptor)) {
-            // If no field is set in the Oneof, skip all the fields in the Oneof
-            continue;
-          }
-          // Get the pointer to the only field which is set in the Oneof
-          field = getOneofFieldDescriptor(oneofDescriptor);
-        } else {
-          // If we are not in a Oneof, we need to check if the field is set and if it is repeated
-          if (field.isRepeated()) {
-            final List<?> value = (List<?>) getField(field);
-            if (!value.isEmpty()) {
-              result.put(field, value);
-            }
-            continue;
-          }
-          if (!hasField(field)) {
-            continue;
-          }
-        }
-        // Add the field to the map
-        result.put(field, getField(field));
-      }
-      return result;
-    }
-
-    @Override
-    public Message.Builder newBuilderForField(final FieldDescriptor field) {
-      return internalGetFieldAccessorTable().getField(field).newBuilder();
-    }
-
-    @Override
-    public Message.Builder getFieldBuilder(final FieldDescriptor field) {
-      return internalGetFieldAccessorTable().getField(field).getBuilder(this);
-    }
-
-    @Override
-    public Message.Builder getRepeatedFieldBuilder(final FieldDescriptor field, int index) {
-      return internalGetFieldAccessorTable().getField(field).getRepeatedBuilder(
-          this, index);
-    }
-
-    @Override
-    public boolean hasOneof(final OneofDescriptor oneof) {
-      return internalGetFieldAccessorTable().getOneof(oneof).has(this);
-    }
-
-    @Override
-    public FieldDescriptor getOneofFieldDescriptor(final OneofDescriptor oneof) {
-      return internalGetFieldAccessorTable().getOneof(oneof).get(this);
-    }
-
-    @Override
-    public boolean hasField(final FieldDescriptor field) {
-      return internalGetFieldAccessorTable().getField(field).has(this);
-    }
-
-    @Override
-    public Object getField(final FieldDescriptor field) {
-      Object object = internalGetFieldAccessorTable().getField(field).get(this);
-      if (field.isRepeated()) {
-        // The underlying list object is still modifiable at this point.
-        // Make sure not to expose the modifiable list to the caller.
-        return Collections.unmodifiableList((List) object);
-      } else {
-        return object;
-      }
-    }
-
-    @Override
-    public BuilderType setField(final FieldDescriptor field, final Object value) {
-      internalGetFieldAccessorTable().getField(field).set(this, value);
-      return (BuilderType) this;
-    }
-
-    @Override
-    public BuilderType clearField(final FieldDescriptor field) {
-      internalGetFieldAccessorTable().getField(field).clear(this);
-      return (BuilderType) this;
-    }
-
-    @Override
-    public BuilderType clearOneof(final OneofDescriptor oneof) {
-      internalGetFieldAccessorTable().getOneof(oneof).clear(this);
-      return (BuilderType) this;
-    }
-
-    @Override
-    public int getRepeatedFieldCount(final FieldDescriptor field) {
-      return internalGetFieldAccessorTable().getField(field)
-          .getRepeatedCount(this);
-    }
-
-    @Override
-    public Object getRepeatedField(final FieldDescriptor field, final int index) {
-      return internalGetFieldAccessorTable().getField(field)
-          .getRepeated(this, index);
-    }
-
-    @Override
-    public BuilderType setRepeatedField(
-        final FieldDescriptor field, final int index, final Object value) {
-      internalGetFieldAccessorTable().getField(field)
-        .setRepeated(this, index, value);
-      return (BuilderType) this;
-    }
-
-    @Override
-    public BuilderType addRepeatedField(final FieldDescriptor field, final Object value) {
-      internalGetFieldAccessorTable().getField(field).addRepeated(this, value);
-      return (BuilderType) this;
-    }
-
-    private BuilderType setUnknownFieldsInternal(final UnknownFieldSet unknownFields) {
-      unknownFieldsOrBuilder = unknownFields;
-      onChanged();
-      return (BuilderType) this;
-    }
-
-    @Override
-    public BuilderType setUnknownFields(final UnknownFieldSet unknownFields) {
-      return setUnknownFieldsInternal(unknownFields);
-    }
-
-    /**
-     * This method is obsolete, but we must retain it for compatibility with
-     * older generated code.
-     */
-    protected BuilderType setUnknownFieldsProto3(final UnknownFieldSet unknownFields) {
-      return setUnknownFieldsInternal(unknownFields);
-    }
-
-    @Override
-    public BuilderType mergeUnknownFields(final UnknownFieldSet unknownFields) {
-      if (UnknownFieldSet.getDefaultInstance().equals(unknownFields)) {
-        return (BuilderType) this;
-      }
-
-      if (UnknownFieldSet.getDefaultInstance().equals(unknownFieldsOrBuilder)) {
-        unknownFieldsOrBuilder = unknownFields;
-        onChanged();
-        return (BuilderType) this;
-      }
-
-      getUnknownFieldSetBuilder().mergeFrom(unknownFields);
-      onChanged();
-      return (BuilderType) this;
-    }
-
-
-    @Override
-    public boolean isInitialized() {
-      for (final FieldDescriptor field : getDescriptorForType().getFields()) {
-        // Check that all required fields are present.
-        if (field.isRequired()) {
-          if (!hasField(field)) {
-            return false;
-          }
-        }
-        // Check that embedded messages are initialized.
-        if (field.getJavaType() == FieldDescriptor.JavaType.MESSAGE) {
-          if (field.isRepeated()) {
-            @SuppressWarnings("unchecked") final
-            List<Message> messageList = (List<Message>) getField(field);
-            for (final Message element : messageList) {
-              if (!element.isInitialized()) {
-                return false;
-              }
-            }
-          } else {
-            if (hasField(field) &&
-                !((Message) getField(field)).isInitialized()) {
-              return false;
-            }
-          }
-        }
-      }
-      return true;
-    }
-
-    @Override
-    public final UnknownFieldSet getUnknownFields() {
-      if (unknownFieldsOrBuilder instanceof UnknownFieldSet) {
-        return (UnknownFieldSet) unknownFieldsOrBuilder;
-      } else {
-        return ((UnknownFieldSet.Builder) unknownFieldsOrBuilder).buildPartial();
-      }
-    }
-
-    /**
-     * Called by generated subclasses to parse an unknown field.
-     *
-     * @return {@code true} unless the tag is an end-group tag.
-     */
-    protected boolean parseUnknownField(
-        CodedInputStream input, ExtensionRegistryLite extensionRegistry, int tag)
-        throws IOException {
-      if (input.shouldDiscardUnknownFields()) {
-        return input.skipField(tag);
-      }
-      return getUnknownFieldSetBuilder().mergeFieldFrom(tag, input);
-    }
-
-    /** Called by generated subclasses to add to the unknown field set. */
-    protected final void mergeUnknownLengthDelimitedField(int number, ByteString bytes) {
-      getUnknownFieldSetBuilder().mergeLengthDelimitedField(number, bytes);
-    }
-
-    /** Called by generated subclasses to add to the unknown field set. */
-    protected final void mergeUnknownVarintField(int number, int value) {
-      getUnknownFieldSetBuilder().mergeVarintField(number, value);
-    }
-
-    @Override
-    protected UnknownFieldSet.Builder getUnknownFieldSetBuilder() {
-      if (unknownFieldsOrBuilder instanceof UnknownFieldSet) {
-        unknownFieldsOrBuilder = ((UnknownFieldSet) unknownFieldsOrBuilder).toBuilder();
-      }
-      onChanged();
-      return (UnknownFieldSet.Builder) unknownFieldsOrBuilder;
-    }
-
-    @Override
-    protected void setUnknownFieldSetBuilder(UnknownFieldSet.Builder builder) {
-      unknownFieldsOrBuilder = builder;
-      onChanged();
-    }
-
-    /**
-     * Implementation of {@link BuilderParent} for giving to our children. This
-     * small inner class makes it so we don't publicly expose the BuilderParent
-     * methods.
-     */
-    private class BuilderParentImpl implements BuilderParent {
-
-      @Override
-      public void markDirty() {
-        onChanged();
-      }
-    }
-
-    /**
-     * Gets the {@link BuilderParent} for giving to our children.
-     * @return The builder parent for our children.
-     */
-    protected BuilderParent getParentForChildren() {
-      if (meAsParent == null) {
-        meAsParent = new BuilderParentImpl();
-      }
-      return meAsParent;
-    }
-
-    /**
-     * Called when a the builder or one of its nested children has changed
-     * and any parent should be notified of its invalidation.
-     */
-    protected final void onChanged() {
-      if (isClean && builderParent != null) {
-        builderParent.markDirty();
-
-        // Don't keep dispatching invalidations until build is called again.
-        isClean = false;
-      }
-    }
-
-    /**
-     * Gets the map field with the given field number. This method should be
-     * overridden in the generated message class if the message contains map
-     * fields.
-     *
-     * Unlike other field types, reflection support for map fields can't be
-     * implemented based on generated public API because we need to access a
-     * map field as a list in reflection API but the generated API only allows
-     * us to access it as a map. This method returns the underlying map field
-     * directly and thus enables us to access the map field as a list.
-     */
-    @SuppressWarnings({"unused", "rawtypes"})
-    protected MapField internalGetMapField(int fieldNumber) {
-      // Note that we can't use descriptor names here because this method will
-      // be called when descriptor is being initialized.
-      throw new RuntimeException(
-          "No map fields found in " + getClass().getName());
-    }
-
-    /** Like {@link #internalGetMapField} but return a mutable version. */
-    @SuppressWarnings({"unused", "rawtypes"})
-    protected MapField internalGetMutableMapField(int fieldNumber) {
-      // Note that we can't use descriptor names here because this method will
-      // be called when descriptor is being initialized.
-      throw new RuntimeException(
-          "No map fields found in " + getClass().getName());
-    }
-  }
-
-  // =================================================================
-  // Extensions-related stuff
-
-  public interface ExtendableMessageOrBuilder<
-      MessageType extends ExtendableMessage> extends MessageOrBuilder {
-    // Re-define for return type covariance.
-    @Override
-    Message getDefaultInstanceForType();
-
-    /** Check if a singular extension is present. */
-    <Type> boolean hasExtension(
-        ExtensionLite<MessageType, Type> extension);
-
-    /** Get the number of elements in a repeated extension. */
-    <Type> int getExtensionCount(
-        ExtensionLite<MessageType, List<Type>> extension);
-
-    /** Get the value of an extension. */
-    <Type> Type getExtension(
-        ExtensionLite<MessageType, Type> extension);
-
-    /** Get one element of a repeated extension. */
-    <Type> Type getExtension(
-        ExtensionLite<MessageType, List<Type>> extension,
-        int index);
-
-    /** Check if a singular extension is present. */
-    <Type> boolean hasExtension(
-        Extension<MessageType, Type> extension);
-    /** Check if a singular extension is present. */
-    <Type> boolean hasExtension(
-        GeneratedExtension<MessageType, Type> extension);
-    /** Get the number of elements in a repeated extension. */
-    <Type> int getExtensionCount(
-        Extension<MessageType, List<Type>> extension);
-    /** Get the number of elements in a repeated extension. */
-    <Type> int getExtensionCount(
-        GeneratedExtension<MessageType, List<Type>> extension);
-    /** Get the value of an extension. */
-    <Type> Type getExtension(
-        Extension<MessageType, Type> extension);
-    /** Get the value of an extension. */
-    <Type> Type getExtension(
-        GeneratedExtension<MessageType, Type> extension);
-    /** Get one element of a repeated extension. */
-    <Type> Type getExtension(
-        Extension<MessageType, List<Type>> extension,
-        int index);
-    /** Get one element of a repeated extension. */
-    <Type> Type getExtension(
-        GeneratedExtension<MessageType, List<Type>> extension,
-        int index);
-  }
-
-  /**
-   * Generated message classes for message types that contain extension ranges
-   * subclass this.
-   *
-   * <p>This class implements type-safe accessors for extensions.  They
-   * implement all the same operations that you can do with normal fields --
-   * e.g. "has", "get", and "getCount" -- but for extensions.  The extensions
-   * are identified using instances of the class {@link GeneratedExtension};
-   * the protocol compiler generates a static instance of this class for every
-   * extension in its input.  Through the magic of generics, all is made
-   * type-safe.
-   *
-   * <p>For example, imagine you have the {@code .proto} file:
-   *
-   * <pre>
-   * option java_class = "MyProto";
-   *
-   * message Foo {
-   *   extensions 1000 to max;
-   * }
-   *
-   * extend Foo {
-   *   optional int32 bar;
-   * }
-   * </pre>
-   *
-   * <p>Then you might write code like:
-   *
-   * <pre>
-   * MyProto.Foo foo = getFoo();
-   * int i = foo.getExtension(MyProto.bar);
-   * </pre>
-   *
-   * <p>See also {@link ExtendableBuilder}.
-   */
-  public abstract static class ExtendableMessage<
-        MessageType extends ExtendableMessage>
-      extends GeneratedMessageV3
-      implements ExtendableMessageOrBuilder<MessageType> {
-
-    private static final long serialVersionUID = 1L;
-
-    private final FieldSet<FieldDescriptor> extensions;
-
-    protected ExtendableMessage() {
-      this.extensions = FieldSet.newFieldSet();
-    }
-
-    protected ExtendableMessage(
-        ExtendableBuilder<MessageType, ?> builder) {
-      super(builder);
-      this.extensions = builder.buildExtensions();
-    }
-
-    private void verifyExtensionContainingType(
-        final Extension<MessageType, ?> extension) {
-      if (extension.getDescriptor().getContainingType() !=
-          getDescriptorForType()) {
-        // This can only happen if someone uses unchecked operations.
-        throw new IllegalArgumentException(
-          "Extension is for type \"" +
-          extension.getDescriptor().getContainingType().getFullName() +
-          "\" which does not match message type \"" +
-          getDescriptorForType().getFullName() + "\".");
-      }
-    }
-
-    /** Check if a singular extension is present. */
-    @Override
-    @SuppressWarnings("unchecked")
-    public final <Type> boolean hasExtension(final ExtensionLite<MessageType, Type> extensionLite) {
-      Extension<MessageType, Type> extension = checkNotLite(extensionLite);
-
-      verifyExtensionContainingType(extension);
-      return extensions.hasField(extension.getDescriptor());
-    }
-
-    /** Get the number of elements in a repeated extension. */
-    @Override
-    @SuppressWarnings("unchecked")
-    public final <Type> int getExtensionCount(
-        final ExtensionLite<MessageType, List<Type>> extensionLite) {
-      Extension<MessageType, List<Type>> extension = checkNotLite(extensionLite);
-
-      verifyExtensionContainingType(extension);
-      final FieldDescriptor descriptor = extension.getDescriptor();
-      return extensions.getRepeatedFieldCount(descriptor);
-    }
-
-    /** Get the value of an extension. */
-    @Override
-    @SuppressWarnings("unchecked")
-    public final <Type> Type getExtension(final ExtensionLite<MessageType, Type> extensionLite) {
-      Extension<MessageType, Type> extension = checkNotLite(extensionLite);
-
-      verifyExtensionContainingType(extension);
-      FieldDescriptor descriptor = extension.getDescriptor();
-      final Object value = extensions.getField(descriptor);
-      if (value == null) {
-        if (descriptor.isRepeated()) {
-          return (Type) Collections.emptyList();
-        } else if (descriptor.getJavaType() ==
-                   FieldDescriptor.JavaType.MESSAGE) {
-          return (Type) extension.getMessageDefaultInstance();
-        } else {
-          return (Type) extension.fromReflectionType(
-              descriptor.getDefaultValue());
-        }
-      } else {
-        return (Type) extension.fromReflectionType(value);
-      }
-    }
-
-    /** Get one element of a repeated extension. */
-    @Override
-    @SuppressWarnings("unchecked")
-    public final <Type> Type getExtension(
-        final ExtensionLite<MessageType, List<Type>> extensionLite, final int index) {
-      Extension<MessageType, List<Type>> extension = checkNotLite(extensionLite);
-
-      verifyExtensionContainingType(extension);
-      FieldDescriptor descriptor = extension.getDescriptor();
-      return (Type) extension.singularFromReflectionType(
-          extensions.getRepeatedField(descriptor, index));
-    }
-
-    /** Check if a singular extension is present. */
-    @Override
-    public final <Type> boolean hasExtension(final Extension<MessageType, Type> extension) {
-      return hasExtension((ExtensionLite<MessageType, Type>) extension);
-    }
-    /** Check if a singular extension is present. */
-    @Override
-    public final <Type> boolean hasExtension(
-        final GeneratedExtension<MessageType, Type> extension) {
-      return hasExtension((ExtensionLite<MessageType, Type>) extension);
-    }
-    /** Get the number of elements in a repeated extension. */
-    @Override
-    public final <Type> int getExtensionCount(
-        final Extension<MessageType, List<Type>> extension) {
-      return getExtensionCount((ExtensionLite<MessageType, List<Type>>) extension);
-    }
-    /** Get the number of elements in a repeated extension. */
-    @Override
-    public final <Type> int getExtensionCount(
-        final GeneratedExtension<MessageType, List<Type>> extension) {
-      return getExtensionCount((ExtensionLite<MessageType, List<Type>>) extension);
-    }
-    /** Get the value of an extension. */
-    @Override
-    public final <Type> Type getExtension(final Extension<MessageType, Type> extension) {
-      return getExtension((ExtensionLite<MessageType, Type>) extension);
-    }
-    /** Get the value of an extension. */
-    @Override
-    public final <Type> Type getExtension(
-        final GeneratedExtension<MessageType, Type> extension) {
-      return getExtension((ExtensionLite<MessageType, Type>) extension);
-    }
-    /** Get one element of a repeated extension. */
-    @Override
-    public final <Type> Type getExtension(
-        final Extension<MessageType, List<Type>> extension, final int index) {
-      return getExtension((ExtensionLite<MessageType, List<Type>>) extension, index);
-    }
-    /** Get one element of a repeated extension. */
-    @Override
-    public final <Type> Type getExtension(
-        final GeneratedExtension<MessageType, List<Type>> extension, final int index) {
-      return getExtension((ExtensionLite<MessageType, List<Type>>) extension, index);
-    }
-
-    /** Called by subclasses to check if all extensions are initialized. */
-    protected boolean extensionsAreInitialized() {
-      return extensions.isInitialized();
-    }
-
-    @Override
-    public boolean isInitialized() {
-      return super.isInitialized() && extensionsAreInitialized();
-    }
-
-    @Override
-    protected boolean parseUnknownField(
-        CodedInputStream input,
-        UnknownFieldSet.Builder unknownFields,
-        ExtensionRegistryLite extensionRegistry,
-        int tag) throws IOException {
-      return MessageReflection.mergeFieldFrom(
-          input, input.shouldDiscardUnknownFields() ? null : unknownFields, extensionRegistry,
-          getDescriptorForType(), new MessageReflection.ExtensionAdapter(extensions), tag);
-    }
-
-    /**
-     * Delegates to parseUnknownField. This method is obsolete, but we must retain it for
-     * compatibility with older generated code.
-     */
-    @Override
-    protected boolean parseUnknownFieldProto3(
-        CodedInputStream input,
-        UnknownFieldSet.Builder unknownFields,
-        ExtensionRegistryLite extensionRegistry,
-        int tag) throws IOException {
-      return parseUnknownField(input, unknownFields, extensionRegistry, tag);
-    }
-
-
-    /**
-     * Used by parsing constructors in generated classes.
-     */
-    @Override
-    protected void makeExtensionsImmutable() {
-      extensions.makeImmutable();
-    }
-
-    /**
-     * Used by subclasses to serialize extensions.  Extension ranges may be
-     * interleaved with field numbers, but we must write them in canonical
-     * (sorted by field number) order.  ExtensionWriter helps us write
-     * individual ranges of extensions at once.
-     */
-    protected class ExtensionWriter {
-      // Imagine how much simpler this code would be if Java iterators had
-      // a way to get the next element without advancing the iterator.
-
-      private final Iterator<Map.Entry<FieldDescriptor, Object>> iter =
-        extensions.iterator();
-      private Map.Entry<FieldDescriptor, Object> next;
-      private final boolean messageSetWireFormat;
-
-      private ExtensionWriter(final boolean messageSetWireFormat) {
-        if (iter.hasNext()) {
-          next = iter.next();
-        }
-        this.messageSetWireFormat = messageSetWireFormat;
-      }
-
-      public void writeUntil(final int end, final CodedOutputStream output)
-                             throws IOException {
-        while (next != null && next.getKey().getNumber() < end) {
-          FieldDescriptor descriptor = next.getKey();
-          if (messageSetWireFormat && descriptor.getLiteJavaType() ==
-                  WireFormat.JavaType.MESSAGE &&
-              !descriptor.isRepeated()) {
-            if (next instanceof LazyField.LazyEntry<?>) {
-              output.writeRawMessageSetExtension(descriptor.getNumber(),
-                  ((LazyField.LazyEntry<?>) next).getField().toByteString());
-            } else {
-              output.writeMessageSetExtension(descriptor.getNumber(),
-                                              (Message) next.getValue());
-            }
-          } else {
-            // TODO(xiangl): Taken care of following code, it may cause
-            // problem when we use LazyField for normal fields/extensions.
-            // Due to the optional field can be duplicated at the end of
-            // serialized bytes, which will make the serialized size change
-            // after lazy field parsed. So when we use LazyField globally,
-            // we need to change the following write method to write cached
-            // bytes directly rather than write the parsed message.
-            FieldSet.writeField(descriptor, next.getValue(), output);
-          }
-          if (iter.hasNext()) {
-            next = iter.next();
-          } else {
-            next = null;
-          }
-        }
-      }
-    }
-
-    protected ExtensionWriter newExtensionWriter() {
-      return new ExtensionWriter(false);
-    }
-    protected ExtensionWriter newMessageSetExtensionWriter() {
-      return new ExtensionWriter(true);
-    }
-
-    /** Called by subclasses to compute the size of extensions. */
-    protected int extensionsSerializedSize() {
-      return extensions.getSerializedSize();
-    }
-    protected int extensionsSerializedSizeAsMessageSet() {
-      return extensions.getMessageSetSerializedSize();
-    }
-
-    // ---------------------------------------------------------------
-    // Reflection
-
-    protected Map<FieldDescriptor, Object> getExtensionFields() {
-      return extensions.getAllFields();
-    }
-
-    @Override
-    public Map<FieldDescriptor, Object> getAllFields() {
-      final Map<FieldDescriptor, Object> result =
-          super.getAllFieldsMutable(/* getBytesForString = */ false);
-      result.putAll(getExtensionFields());
-      return Collections.unmodifiableMap(result);
-    }
-
-    @Override
-    public Map<FieldDescriptor, Object> getAllFieldsRaw() {
-      final Map<FieldDescriptor, Object> result =
-          super.getAllFieldsMutable(/* getBytesForString = */ false);
-      result.putAll(getExtensionFields());
-      return Collections.unmodifiableMap(result);
-    }
-
-    @Override
-    public boolean hasField(final FieldDescriptor field) {
-      if (field.isExtension()) {
-        verifyContainingType(field);
-        return extensions.hasField(field);
-      } else {
-        return super.hasField(field);
-      }
-    }
-
-    @Override
-    public Object getField(final FieldDescriptor field) {
-      if (field.isExtension()) {
-        verifyContainingType(field);
-        final Object value = extensions.getField(field);
-        if (value == null) {
-          if (field.isRepeated()) {
-            return Collections.emptyList();
-          } else if (field.getJavaType() == FieldDescriptor.JavaType.MESSAGE) {
-            // Lacking an ExtensionRegistry, we have no way to determine the
-            // extension's real type, so we return a DynamicMessage.
-            return DynamicMessage.getDefaultInstance(field.getMessageType());
-          } else {
-            return field.getDefaultValue();
-          }
-        } else {
-          return value;
-        }
-      } else {
-        return super.getField(field);
-      }
-    }
-
-    @Override
-    public int getRepeatedFieldCount(final FieldDescriptor field) {
-      if (field.isExtension()) {
-        verifyContainingType(field);
-        return extensions.getRepeatedFieldCount(field);
-      } else {
-        return super.getRepeatedFieldCount(field);
-      }
-    }
-
-    @Override
-    public Object getRepeatedField(final FieldDescriptor field,
-                                   final int index) {
-      if (field.isExtension()) {
-        verifyContainingType(field);
-        return extensions.getRepeatedField(field, index);
-      } else {
-        return super.getRepeatedField(field, index);
-      }
-    }
-
-    private void verifyContainingType(final FieldDescriptor field) {
-      if (field.getContainingType() != getDescriptorForType()) {
-        throw new IllegalArgumentException(
-          "FieldDescriptor does not match message type.");
-      }
-    }
-  }
-
-  /**
-   * Generated message builders for message types that contain extension ranges
-   * subclass this.
-   *
-   * <p>This class implements type-safe accessors for extensions.  They
-   * implement all the same operations that you can do with normal fields --
-   * e.g. "get", "set", and "add" -- but for extensions.  The extensions are
-   * identified using instances of the class {@link GeneratedExtension}; the
-   * protocol compiler generates a static instance of this class for every
-   * extension in its input.  Through the magic of generics, all is made
-   * type-safe.
-   *
-   * <p>For example, imagine you have the {@code .proto} file:
-   *
-   * <pre>
-   * option java_class = "MyProto";
-   *
-   * message Foo {
-   *   extensions 1000 to max;
-   * }
-   *
-   * extend Foo {
-   *   optional int32 bar;
-   * }
-   * </pre>
-   *
-   * <p>Then you might write code like:
-   *
-   * <pre>
-   * MyProto.Foo foo =
-   *   MyProto.Foo.newBuilder()
-   *     .setExtension(MyProto.bar, 123)
-   *     .build();
-   * </pre>
-   *
-   * <p>See also {@link ExtendableMessage}.
-   */
-  @SuppressWarnings("unchecked")
-  public abstract static class ExtendableBuilder<
-        MessageType extends ExtendableMessage,
-        BuilderType extends ExtendableBuilder<MessageType, BuilderType>>
-      extends Builder<BuilderType>
-      implements ExtendableMessageOrBuilder<MessageType> {
-
-    private FieldSet.Builder<FieldDescriptor> extensions;
-
-    protected ExtendableBuilder() {}
-
-    protected ExtendableBuilder(
-        BuilderParent parent) {
-      super(parent);
-    }
-
-    // For immutable message conversion.
-    void internalSetExtensionSet(FieldSet<FieldDescriptor> extensions) {
-      this.extensions = FieldSet.Builder.fromFieldSet(extensions);
-    }
-
-    @Override
-    public BuilderType clear() {
-      extensions = null;
-      return super.clear();
-    }
-
-    private void ensureExtensionsIsMutable() {
-      if (extensions == null) {
-        extensions = FieldSet.newBuilder();
-      }
-    }
-
-    private void verifyExtensionContainingType(
-        final Extension<MessageType, ?> extension) {
-      if (extension.getDescriptor().getContainingType() !=
-          getDescriptorForType()) {
-        // This can only happen if someone uses unchecked operations.
-        throw new IllegalArgumentException(
-          "Extension is for type \"" +
-          extension.getDescriptor().getContainingType().getFullName() +
-          "\" which does not match message type \"" +
-          getDescriptorForType().getFullName() + "\".");
-      }
-    }
-
-    /** Check if a singular extension is present. */
-    @Override
-    public final <Type> boolean hasExtension(final ExtensionLite<MessageType, Type> extensionLite) {
-      Extension<MessageType, Type> extension = checkNotLite(extensionLite);
-
-      verifyExtensionContainingType(extension);
-      return extensions == null ? false : extensions.hasField(extension.getDescriptor());
-    }
-
-    /** Get the number of elements in a repeated extension. */
-    @Override
-    public final <Type> int getExtensionCount(
-        final ExtensionLite<MessageType, List<Type>> extensionLite) {
-      Extension<MessageType, List<Type>> extension = checkNotLite(extensionLite);
-
-      verifyExtensionContainingType(extension);
-      final FieldDescriptor descriptor = extension.getDescriptor();
-      return extensions == null ? 0 : extensions.getRepeatedFieldCount(descriptor);
-    }
-
-    /** Get the value of an extension. */
-    @Override
-    public final <Type> Type getExtension(final ExtensionLite<MessageType, Type> extensionLite) {
-      Extension<MessageType, Type> extension = checkNotLite(extensionLite);
-
-      verifyExtensionContainingType(extension);
-      FieldDescriptor descriptor = extension.getDescriptor();
-      final Object value = extensions == null ? null : extensions.getField(descriptor);
-      if (value == null) {
-        if (descriptor.isRepeated()) {
-          return (Type) Collections.emptyList();
-        } else if (descriptor.getJavaType() ==
-                   FieldDescriptor.JavaType.MESSAGE) {
-          return (Type) extension.getMessageDefaultInstance();
-        } else {
-          return (Type) extension.fromReflectionType(
-              descriptor.getDefaultValue());
-        }
-      } else {
-        return (Type) extension.fromReflectionType(value);
-      }
-    }
-
-    /** Get one element of a repeated extension. */
-    @Override
-    public final <Type> Type getExtension(
-        final ExtensionLite<MessageType, List<Type>> extensionLite, final int index) {
-      Extension<MessageType, List<Type>> extension = checkNotLite(extensionLite);
-
-      verifyExtensionContainingType(extension);
-      FieldDescriptor descriptor = extension.getDescriptor();
-      if (extensions == null) {
-        throw new IndexOutOfBoundsException();
-      }
-      return (Type)
-          extension.singularFromReflectionType(extensions.getRepeatedField(descriptor, index));
-    }
-
-    /** Set the value of an extension. */
-    public final <Type> BuilderType setExtension(
-        final ExtensionLite<MessageType, Type> extensionLite,
-        final Type value) {
-      Extension<MessageType, Type> extension = checkNotLite(extensionLite);
-
-      verifyExtensionContainingType(extension);
-      ensureExtensionsIsMutable();
-      final FieldDescriptor descriptor = extension.getDescriptor();
-      extensions.setField(descriptor, extension.toReflectionType(value));
-      onChanged();
-      return (BuilderType) this;
-    }
-
-    /** Set the value of one element of a repeated extension. */
-    public final <Type> BuilderType setExtension(
-        final ExtensionLite<MessageType, List<Type>> extensionLite,
-        final int index, final Type value) {
-      Extension<MessageType, List<Type>> extension = checkNotLite(extensionLite);
-
-      verifyExtensionContainingType(extension);
-      ensureExtensionsIsMutable();
-      final FieldDescriptor descriptor = extension.getDescriptor();
-      extensions.setRepeatedField(
-        descriptor, index,
-        extension.singularToReflectionType(value));
-      onChanged();
-      return (BuilderType) this;
-    }
-
-    /** Append a value to a repeated extension. */
-    public final <Type> BuilderType addExtension(
-        final ExtensionLite<MessageType, List<Type>> extensionLite,
-        final Type value) {
-      Extension<MessageType, List<Type>> extension = checkNotLite(extensionLite);
-
-      verifyExtensionContainingType(extension);
-      ensureExtensionsIsMutable();
-      final FieldDescriptor descriptor = extension.getDescriptor();
-      extensions.addRepeatedField(
-          descriptor, extension.singularToReflectionType(value));
-      onChanged();
-      return (BuilderType) this;
-    }
-
-    /** Clear an extension. */
-    public final BuilderType clearExtension(final ExtensionLite<MessageType, ?> extensionLite) {
-      Extension<MessageType, ?> extension = checkNotLite(extensionLite);
-
-      verifyExtensionContainingType(extension);
-      ensureExtensionsIsMutable();
-      extensions.clearField(extension.getDescriptor());
-      onChanged();
-      return (BuilderType) this;
-    }
-
-    /** Check if a singular extension is present. */
-    @Override
-    public final <Type> boolean hasExtension(final Extension<MessageType, Type> extension) {
-      return hasExtension((ExtensionLite<MessageType, Type>) extension);
-    }
-    /** Check if a singular extension is present. */
-    @Override
-    public final <Type> boolean hasExtension(
-        final GeneratedExtension<MessageType, Type> extension) {
-      return hasExtension((ExtensionLite<MessageType, Type>) extension);
-    }
-    /** Get the number of elements in a repeated extension. */
-    @Override
-    public final <Type> int getExtensionCount(
-        final Extension<MessageType, List<Type>> extension) {
-      return getExtensionCount((ExtensionLite<MessageType, List<Type>>) extension);
-    }
-    /** Get the number of elements in a repeated extension. */
-    @Override
-    public final <Type> int getExtensionCount(
-        final GeneratedExtension<MessageType, List<Type>> extension) {
-      return getExtensionCount((ExtensionLite<MessageType, List<Type>>) extension);
-    }
-    /** Get the value of an extension. */
-    @Override
-    public final <Type> Type getExtension(final Extension<MessageType, Type> extension) {
-      return getExtension((ExtensionLite<MessageType, Type>) extension);
-    }
-    /** Get the value of an extension. */
-    @Override
-    public final <Type> Type getExtension(
-        final GeneratedExtension<MessageType, Type> extension) {
-      return getExtension((ExtensionLite<MessageType, Type>) extension);
-    }
-    /** Get the value of an extension. */
-    @Override
-    public final <Type> Type getExtension(
-        final Extension<MessageType, List<Type>> extension, final int index) {
-      return getExtension((ExtensionLite<MessageType, List<Type>>) extension, index);
-    }
-    /** Get the value of an extension. */
-    @Override
-    public final <Type> Type getExtension(
-        final GeneratedExtension<MessageType, List<Type>> extension, final int index) {
-      return getExtension((ExtensionLite<MessageType, List<Type>>) extension, index);
-    }
-    /** Set the value of an extension. */
-    public final <Type> BuilderType setExtension(
-        final Extension<MessageType, Type> extension, final Type value) {
-      return setExtension((ExtensionLite<MessageType, Type>) extension, value);
-    }
-    /** Set the value of an extension. */
-    public <Type> BuilderType setExtension(
-        final GeneratedExtension<MessageType, Type> extension, final Type value) {
-      return setExtension((ExtensionLite<MessageType, Type>) extension, value);
-    }
-    /** Set the value of one element of a repeated extension. */
-    public final <Type> BuilderType setExtension(
-        final Extension<MessageType, List<Type>> extension,
-        final int index, final Type value) {
-      return setExtension((ExtensionLite<MessageType, List<Type>>) extension, index, value);
-    }
-    /** Set the value of one element of a repeated extension. */
-    public <Type> BuilderType setExtension(
-        final GeneratedExtension<MessageType, List<Type>> extension,
-        final int index, final Type value) {
-      return setExtension((ExtensionLite<MessageType, List<Type>>) extension, index, value);
-    }
-    /** Append a value to a repeated extension. */
-    public final <Type> BuilderType addExtension(
-        final Extension<MessageType, List<Type>> extension, final Type value) {
-      return addExtension((ExtensionLite<MessageType, List<Type>>) extension, value);
-    }
-    /** Append a value to a repeated extension. */
-    public <Type> BuilderType addExtension(
-        final GeneratedExtension<MessageType, List<Type>> extension, final Type value) {
-      return addExtension((ExtensionLite<MessageType, List<Type>>) extension, value);
-    }
-    /** Clear an extension. */
-    public final <Type> BuilderType clearExtension(
-        final Extension<MessageType, ?> extension) {
-      return clearExtension((ExtensionLite<MessageType, ?>) extension);
-    }
-    /** Clear an extension. */
-    public <Type> BuilderType clearExtension(
-        final GeneratedExtension<MessageType, ?> extension) {
-      return clearExtension((ExtensionLite<MessageType, ?>) extension);
-    }
-
-    /** Called by subclasses to check if all extensions are initialized. */
-    protected boolean extensionsAreInitialized() {
-      return extensions == null ? true : extensions.isInitialized();
-    }
-
-    /**
-     * Called by the build code path to create a copy of the extensions for
-     * building the message.
-     */
-    private FieldSet<FieldDescriptor> buildExtensions() {
-      return extensions == null
-          ? (FieldSet<FieldDescriptor>) FieldSet.emptySet()
-          : extensions.buildPartial();
-    }
-
-    @Override
-    public boolean isInitialized() {
-      return super.isInitialized() && extensionsAreInitialized();
-    }
-
-    // ---------------------------------------------------------------
-    // Reflection
-
-    @Override
-    public Map<FieldDescriptor, Object> getAllFields() {
-      final Map<FieldDescriptor, Object> result = super.getAllFieldsMutable();
-      if (extensions != null) {
-        result.putAll(extensions.getAllFields());
-      }
-      return Collections.unmodifiableMap(result);
-    }
-
-    @Override
-    public Object getField(final FieldDescriptor field) {
-      if (field.isExtension()) {
-        verifyContainingType(field);
-        final Object value = extensions == null ? null : extensions.getField(field);
-        if (value == null) {
-          if (field.getJavaType() == FieldDescriptor.JavaType.MESSAGE) {
-            // Lacking an ExtensionRegistry, we have no way to determine the
-            // extension's real type, so we return a DynamicMessage.
-            return DynamicMessage.getDefaultInstance(field.getMessageType());
-          } else {
-            return field.getDefaultValue();
-          }
-        } else {
-          return value;
-        }
-      } else {
-        return super.getField(field);
-      }
-    }
-
-    @Override
-    public Message.Builder getFieldBuilder(final FieldDescriptor field) {
-      if (field.isExtension()) {
-        verifyContainingType(field);
-        if (field.getJavaType() != FieldDescriptor.JavaType.MESSAGE) {
-          throw new UnsupportedOperationException(
-              "getFieldBuilder() called on a non-Message type.");
-        }
-        ensureExtensionsIsMutable();
-        final Object value = extensions.getFieldAllowBuilders(field);
-        if (value == null) {
-          Message.Builder builder = DynamicMessage.newBuilder(field.getMessageType());
-          extensions.setField(field, builder);
-          onChanged();
-          return builder;
-        } else {
-          if (value instanceof Message.Builder) {
-            return (Message.Builder) value;
-          } else if (value instanceof Message) {
-            Message.Builder builder = ((Message) value).toBuilder();
-            extensions.setField(field, builder);
-            onChanged();
-            return builder;
-          } else {
-            throw new UnsupportedOperationException(
-                "getRepeatedFieldBuilder() called on a non-Message type.");
-          }
-        }
-      } else {
-        return super.getFieldBuilder(field);
-      }
-    }
-
-    @Override
-    public int getRepeatedFieldCount(final FieldDescriptor field) {
-      if (field.isExtension()) {
-        verifyContainingType(field);
-        return extensions == null ? 0 : extensions.getRepeatedFieldCount(field);
-      } else {
-        return super.getRepeatedFieldCount(field);
-      }
-    }
-
-    @Override
-    public Object getRepeatedField(final FieldDescriptor field,
-                                   final int index) {
-      if (field.isExtension()) {
-        verifyContainingType(field);
-        if (extensions == null) {
-          throw new IndexOutOfBoundsException();
-        }
-        return extensions.getRepeatedField(field, index);
-      } else {
-        return super.getRepeatedField(field, index);
-      }
-    }
-
-    @Override
-    public Message.Builder getRepeatedFieldBuilder(final FieldDescriptor field, final int index) {
-      if (field.isExtension()) {
-        verifyContainingType(field);
-        ensureExtensionsIsMutable();
-        if (field.getJavaType() != FieldDescriptor.JavaType.MESSAGE) {
-          throw new UnsupportedOperationException(
-              "getRepeatedFieldBuilder() called on a non-Message type.");
-        }
-        final Object value = extensions.getRepeatedFieldAllowBuilders(field, index);
-        if (value instanceof Message.Builder) {
-          return (Message.Builder) value;
-        } else if (value instanceof Message) {
-          Message.Builder builder = ((Message) value).toBuilder();
-          extensions.setRepeatedField(field, index, builder);
-          onChanged();
-          return builder;
-        } else {
-          throw new UnsupportedOperationException(
-              "getRepeatedFieldBuilder() called on a non-Message type.");
-        }
-      } else {
-        return super.getRepeatedFieldBuilder(field, index);
-      }
-    }
-
-    @Override
-    public boolean hasField(final FieldDescriptor field) {
-      if (field.isExtension()) {
-        verifyContainingType(field);
-        return extensions == null ? false : extensions.hasField(field);
-      } else {
-        return super.hasField(field);
-      }
-    }
-
-    @Override
-    public BuilderType setField(final FieldDescriptor field,
-                                final Object value) {
-      if (field.isExtension()) {
-        verifyContainingType(field);
-        ensureExtensionsIsMutable();
-        extensions.setField(field, value);
-        onChanged();
-        return (BuilderType) this;
-      } else {
-        return super.setField(field, value);
-      }
-    }
-
-    @Override
-    public BuilderType clearField(final FieldDescriptor field) {
-      if (field.isExtension()) {
-        verifyContainingType(field);
-        ensureExtensionsIsMutable();
-        extensions.clearField(field);
-        onChanged();
-        return (BuilderType) this;
-      } else {
-        return super.clearField(field);
-      }
-    }
-
-    @Override
-    public BuilderType setRepeatedField(final FieldDescriptor field,
-                                        final int index, final Object value) {
-      if (field.isExtension()) {
-        verifyContainingType(field);
-        ensureExtensionsIsMutable();
-        extensions.setRepeatedField(field, index, value);
-        onChanged();
-        return (BuilderType) this;
-      } else {
-        return super.setRepeatedField(field, index, value);
-      }
-    }
-
-    @Override
-    public BuilderType addRepeatedField(final FieldDescriptor field,
-                                        final Object value) {
-      if (field.isExtension()) {
-        verifyContainingType(field);
-        ensureExtensionsIsMutable();
-        extensions.addRepeatedField(field, value);
-        onChanged();
-        return (BuilderType) this;
-      } else {
-        return super.addRepeatedField(field, value);
-      }
-    }
-
-    @Override
-    public Message.Builder newBuilderForField(final FieldDescriptor field) {
-      if (field.isExtension()) {
-        return DynamicMessage.newBuilder(field.getMessageType());
-      } else {
-        return super.newBuilderForField(field);
-      }
-    }
-
-    protected final void mergeExtensionFields(final ExtendableMessage other) {
-      if (other.extensions != null) {
-        ensureExtensionsIsMutable();
-        extensions.mergeFrom(other.extensions);
-        onChanged();
-      }
-    }
-
-    @Override
-    protected boolean parseUnknownField(
-        CodedInputStream input, ExtensionRegistryLite extensionRegistry, int tag)
-        throws IOException {
-      ensureExtensionsIsMutable();
-      return MessageReflection.mergeFieldFrom(
-          input,
-          input.shouldDiscardUnknownFields() ? null : getUnknownFieldSetBuilder(),
-          extensionRegistry,
-          getDescriptorForType(),
-          new MessageReflection.ExtensionBuilderAdapter(extensions),
-          tag);
-    }
-
-    private void verifyContainingType(final FieldDescriptor field) {
-      if (field.getContainingType() != getDescriptorForType()) {
-        throw new IllegalArgumentException(
-          "FieldDescriptor does not match message type.");
-      }
-    }
-  }
-
-  // -----------------------------------------------------------------
-
-  /**
-   * Gets the descriptor for an extension. The implementation depends on whether
-   * the extension is scoped in the top level of a file or scoped in a Message.
-   */
-  static interface ExtensionDescriptorRetriever {
-    FieldDescriptor getDescriptor();
-  }
-
-
-  // =================================================================
-
-  /** Calls Class.getMethod and throws a RuntimeException if it fails. */
-  @SuppressWarnings("unchecked")
-  private static Method getMethodOrDie(
-      final Class clazz, final String name, final Class... params) {
-    try {
-      return clazz.getMethod(name, params);
-    } catch (NoSuchMethodException e) {
-      throw new RuntimeException(
-        "Generated message class \"" + clazz.getName() +
-        "\" missing method \"" + name + "\".", e);
-    }
-  }
-
-  /** Calls invoke and throws a RuntimeException if it fails. */
-  @CanIgnoreReturnValue
-  private static Object invokeOrDie(
-      final Method method, final Object object, final Object... params) {
-    try {
-      return method.invoke(object, params);
-    } catch (IllegalAccessException e) {
-      throw new RuntimeException(
-        "Couldn't use Java reflection to implement protocol message " +
-        "reflection.", e);
-    } catch (InvocationTargetException e) {
-      final Throwable cause = e.getCause();
-      if (cause instanceof RuntimeException) {
-        throw (RuntimeException) cause;
-      } else if (cause instanceof Error) {
-        throw (Error) cause;
-      } else {
-        throw new RuntimeException(
-          "Unexpected exception thrown by generated accessor method.", cause);
-      }
-    }
-  }
-
-  /**
-   * Gets the map field with the given field number. This method should be overridden in the
-   * generated message class if the message contains map fields.
-   *
-   * <p>Unlike other field types, reflection support for map fields can't be implemented based on
-   * generated public API because we need to access a map field as a list in reflection API but the
-   * generated API only allows us to access it as a map. This method returns the underlying map
-   * field directly and thus enables us to access the map field as a list.
-   */
-  @SuppressWarnings({"rawtypes", "unused"})
-  protected MapField internalGetMapField(int fieldNumber) {
-    // Note that we can't use descriptor names here because this method will
-    // be called when descriptor is being initialized.
-    throw new RuntimeException(
-        "No map fields found in " + getClass().getName());
-  }
-
-  /**
-   * Users should ignore this class.  This class provides the implementation
-   * with access to the fields of a message object using Java reflection.
-   */
-  public static final class FieldAccessorTable {
-
-    /**
-     * Construct a FieldAccessorTable for a particular message class.  Only
-     * one FieldAccessorTable should ever be constructed per class.
-     *
-     * @param descriptor     The type's descriptor.
-     * @param camelCaseNames The camelcase names of all fields in the message.
-     *                       These are used to derive the accessor method names.
-     * @param messageClass   The message type.
-     * @param builderClass   The builder type.
-     */
-    public FieldAccessorTable(
-        final Descriptor descriptor,
-        final String[] camelCaseNames,
-        final Class<? extends GeneratedMessageV3> messageClass,
-        final Class<? extends Builder> builderClass) {
-      this(descriptor, camelCaseNames);
-      ensureFieldAccessorsInitialized(messageClass, builderClass);
-    }
-
-    /**
-     * Construct a FieldAccessorTable for a particular message class without
-     * initializing FieldAccessors.
-     */
-    public FieldAccessorTable(
-        final Descriptor descriptor,
-        final String[] camelCaseNames) {
-      this.descriptor = descriptor;
-      this.camelCaseNames = camelCaseNames;
-      fields = new FieldAccessor[descriptor.getFields().size()];
-      oneofs = new OneofAccessor[descriptor.getOneofs().size()];
-      initialized = false;
-    }
-
-    /**
-     * Ensures the field accessors are initialized. This method is thread-safe.
-     *
-     * @param messageClass   The message type.
-     * @param builderClass   The builder type.
-     * @return this
-     */
-    public FieldAccessorTable ensureFieldAccessorsInitialized(
-        Class<? extends GeneratedMessageV3> messageClass,
-        Class<? extends Builder> builderClass) {
-      if (initialized) { return this; }
-      synchronized (this) {
-        if (initialized) { return this; }
-        int fieldsSize = fields.length;
-        for (int i = 0; i < fieldsSize; i++) {
-          FieldDescriptor field = descriptor.getFields().get(i);
-          String containingOneofCamelCaseName = null;
-          if (field.getContainingOneof() != null) {
-            containingOneofCamelCaseName =
-                camelCaseNames[fieldsSize + field.getContainingOneof().getIndex()];
-          }
-          if (field.isRepeated()) {
-            if (field.getJavaType() == FieldDescriptor.JavaType.MESSAGE) {
-              if (field.isMapField()) {
-                fields[i] = new MapFieldAccessor(
-                    field, camelCaseNames[i], messageClass, builderClass);
-              } else {
-                fields[i] = new RepeatedMessageFieldAccessor(
-                    field, camelCaseNames[i], messageClass, builderClass);
-              }
-            } else if (field.getJavaType() == FieldDescriptor.JavaType.ENUM) {
-              fields[i] = new RepeatedEnumFieldAccessor(
-                  field, camelCaseNames[i], messageClass, builderClass);
-            } else {
-              fields[i] = new RepeatedFieldAccessor(
-                  field, camelCaseNames[i], messageClass, builderClass);
-            }
-          } else {
-            if (field.getJavaType() == FieldDescriptor.JavaType.MESSAGE) {
-              fields[i] = new SingularMessageFieldAccessor(
-                  field, camelCaseNames[i], messageClass, builderClass,
-                  containingOneofCamelCaseName);
-            } else if (field.getJavaType() == FieldDescriptor.JavaType.ENUM) {
-              fields[i] = new SingularEnumFieldAccessor(
-                  field, camelCaseNames[i], messageClass, builderClass,
-                  containingOneofCamelCaseName);
-            } else if (field.getJavaType() == FieldDescriptor.JavaType.STRING) {
-              fields[i] = new SingularStringFieldAccessor(
-                  field, camelCaseNames[i], messageClass, builderClass,
-                  containingOneofCamelCaseName);
-            } else {
-              fields[i] = new SingularFieldAccessor(
-                  field, camelCaseNames[i], messageClass, builderClass,
-                  containingOneofCamelCaseName);
-            }
-          }
-        }
-
-        int oneofsSize = oneofs.length;
-        for (int i = 0; i < oneofsSize; i++) {
-          oneofs[i] =
-              new OneofAccessor(
-                  descriptor, i, camelCaseNames[i + fieldsSize], messageClass, builderClass);
-        }
-        initialized = true;
-        camelCaseNames = null;
-        return this;
-      }
-    }
-
-    private final Descriptor descriptor;
-    private final FieldAccessor[] fields;
-    private String[] camelCaseNames;
-    private final OneofAccessor[] oneofs;
-    private volatile boolean initialized;
-
-    /** Get the FieldAccessor for a particular field. */
-    private FieldAccessor getField(final FieldDescriptor field) {
-      if (field.getContainingType() != descriptor) {
-        throw new IllegalArgumentException(
-          "FieldDescriptor does not match message type.");
-      } else if (field.isExtension()) {
-        // If this type had extensions, it would subclass ExtendableMessage,
-        // which overrides the reflection interface to handle extensions.
-        throw new IllegalArgumentException(
-          "This type does not have extensions.");
-      }
-      return fields[field.getIndex()];
-    }
-
-    /** Get the OneofAccessor for a particular oneof. */
-    private OneofAccessor getOneof(final OneofDescriptor oneof) {
-      if (oneof.getContainingType() != descriptor) {
-        throw new IllegalArgumentException(
-          "OneofDescriptor does not match message type.");
-      }
-      return oneofs[oneof.getIndex()];
-    }
-
-    /**
-     * Abstract interface that provides access to a single field.  This is
-     * implemented differently depending on the field type and cardinality.
-     */
-    private interface FieldAccessor {
-      Object get(GeneratedMessageV3 message);
-      Object get(GeneratedMessageV3.Builder builder);
-      Object getRaw(GeneratedMessageV3 message);
-      Object getRaw(GeneratedMessageV3.Builder builder);
-      void set(Builder builder, Object value);
-      Object getRepeated(GeneratedMessageV3 message, int index);
-      Object getRepeated(GeneratedMessageV3.Builder builder, int index);
-      Object getRepeatedRaw(GeneratedMessageV3 message, int index);
-      Object getRepeatedRaw(GeneratedMessageV3.Builder builder, int index);
-      void setRepeated(Builder builder,
-                       int index, Object value);
-      void addRepeated(Builder builder, Object value);
-      boolean has(GeneratedMessageV3 message);
-      boolean has(GeneratedMessageV3.Builder builder);
-      int getRepeatedCount(GeneratedMessageV3 message);
-      int getRepeatedCount(GeneratedMessageV3.Builder builder);
-      void clear(Builder builder);
-      Message.Builder newBuilder();
-      Message.Builder getBuilder(GeneratedMessageV3.Builder builder);
-      Message.Builder getRepeatedBuilder(GeneratedMessageV3.Builder builder,
-                                         int index);
-    }
-
-    /** OneofAccessor provides access to a single oneof. */
-    private static class OneofAccessor {
-      OneofAccessor(
-          final Descriptor descriptor,
-          final int oneofIndex,
-          final String camelCaseName,
-          final Class<? extends GeneratedMessageV3> messageClass,
-          final Class<? extends Builder> builderClass) {
-        this.descriptor = descriptor;
-        OneofDescriptor oneofDescriptor = descriptor.getOneofs().get(oneofIndex);
-        if (oneofDescriptor.isSynthetic()) {
-          caseMethod = null;
-          caseMethodBuilder = null;
-          fieldDescriptor = oneofDescriptor.getFields().get(0);
-        } else {
-          caseMethod = getMethodOrDie(messageClass, "get" + camelCaseName + "Case");
-          caseMethodBuilder = getMethodOrDie(builderClass, "get" + camelCaseName + "Case");
-          fieldDescriptor = null;
-        }
-        clearMethod = getMethodOrDie(builderClass, "clear" + camelCaseName);
-      }
-
-      private final Descriptor descriptor;
-      private final Method caseMethod;
-      private final Method caseMethodBuilder;
-      private final Method clearMethod;
-      private final FieldDescriptor fieldDescriptor;
-
-      public boolean has(final GeneratedMessageV3 message) {
-        if (fieldDescriptor != null) {
-          return message.hasField(fieldDescriptor);
-        } else {
-          if (((Internal.EnumLite) invokeOrDie(caseMethod, message)).getNumber() == 0) {
-            return false;
-          }
-        }
-        return true;
-      }
-
-      public boolean has(GeneratedMessageV3.Builder builder) {
-        if (fieldDescriptor != null) {
-          return builder.hasField(fieldDescriptor);
-        } else {
-          if (((Internal.EnumLite) invokeOrDie(caseMethodBuilder, builder)).getNumber() == 0) {
-            return false;
-          }
-        }
-        return true;
-      }
-
-      public FieldDescriptor get(final GeneratedMessageV3 message) {
-        if (fieldDescriptor != null) {
-          return message.hasField(fieldDescriptor) ? fieldDescriptor : null;
-        } else {
-          int fieldNumber = ((Internal.EnumLite) invokeOrDie(caseMethod, message)).getNumber();
-          if (fieldNumber > 0) {
-            return descriptor.findFieldByNumber(fieldNumber);
-          }
-        }
-        return null;
-      }
-
-      public FieldDescriptor get(GeneratedMessageV3.Builder builder) {
-        if (fieldDescriptor != null) {
-          return builder.hasField(fieldDescriptor) ? fieldDescriptor : null;
-        } else {
-          int fieldNumber =
-              ((Internal.EnumLite) invokeOrDie(caseMethodBuilder, builder)).getNumber();
-          if (fieldNumber > 0) {
-            return descriptor.findFieldByNumber(fieldNumber);
-          }
-        }
-        return null;
-      }
-
-      public void clear(final Builder builder) {
-        // TODO(b/230609037): remove the unused variable
-        Object unused = invokeOrDie(clearMethod, builder);
-      }
-    }
-
-    // ---------------------------------------------------------------
-
-    private static class SingularFieldAccessor implements FieldAccessor {
-      private interface MethodInvoker {
-        Object get(final GeneratedMessageV3 message);
-
-        Object get(GeneratedMessageV3.Builder<?> builder);
-
-        int getOneofFieldNumber(final GeneratedMessageV3 message);
-
-        int getOneofFieldNumber(final GeneratedMessageV3.Builder<?> builder);
-
-        void set(final GeneratedMessageV3.Builder<?> builder, final Object value);
-
-        boolean has(final GeneratedMessageV3 message);
-
-        boolean has(GeneratedMessageV3.Builder<?> builder);
-
-        void clear(final GeneratedMessageV3.Builder<?> builder);
-      }
-
-      private static final class ReflectionInvoker implements MethodInvoker {
-        protected final Method getMethod;
-        protected final Method getMethodBuilder;
-        protected final Method setMethod;
-        protected final Method hasMethod;
-        protected final Method hasMethodBuilder;
-        protected final Method clearMethod;
-        protected final Method caseMethod;
-        protected final Method caseMethodBuilder;
-
-        ReflectionInvoker(
-            final FieldDescriptor descriptor,
-            final String camelCaseName,
-            final Class<? extends GeneratedMessageV3> messageClass,
-            final Class<? extends Builder> builderClass,
-            final String containingOneofCamelCaseName,
-            boolean isOneofField,
-            boolean hasHasMethod) {
-          getMethod = getMethodOrDie(messageClass, "get" + camelCaseName);
-          getMethodBuilder = getMethodOrDie(builderClass, "get" + camelCaseName);
-          Class<?> type = getMethod.getReturnType();
-          setMethod = getMethodOrDie(builderClass, "set" + camelCaseName, type);
-          hasMethod = hasHasMethod ? getMethodOrDie(messageClass, "has" + camelCaseName) : null;
-          hasMethodBuilder =
-              hasHasMethod ? getMethodOrDie(builderClass, "has" + camelCaseName) : null;
-          clearMethod = getMethodOrDie(builderClass, "clear" + camelCaseName);
-          caseMethod =
-              isOneofField
-                  ? getMethodOrDie(messageClass, "get" + containingOneofCamelCaseName + "Case")
-                  : null;
-          caseMethodBuilder =
-              isOneofField
-                  ? getMethodOrDie(builderClass, "get" + containingOneofCamelCaseName + "Case")
-                  : null;
-        }
-
-        @Override
-        public Object get(final GeneratedMessageV3 message) {
-          return invokeOrDie(getMethod, message);
-        }
-
-        @Override
-        public Object get(GeneratedMessageV3.Builder<?> builder) {
-          return invokeOrDie(getMethodBuilder, builder);
-        }
-
-        @Override
-        public int getOneofFieldNumber(final GeneratedMessageV3 message) {
-          return ((Internal.EnumLite) invokeOrDie(caseMethod, message)).getNumber();
-        }
-
-        @Override
-        public int getOneofFieldNumber(final GeneratedMessageV3.Builder<?> builder) {
-          return ((Internal.EnumLite) invokeOrDie(caseMethodBuilder, builder)).getNumber();
-        }
-
-        @Override
-        public void set(final GeneratedMessageV3.Builder<?> builder, final Object value) {
-          // TODO(b/230609037): remove the unused variable
-          Object unused = invokeOrDie(setMethod, builder, value);
-        }
-
-        @Override
-        public boolean has(final GeneratedMessageV3 message) {
-          return (Boolean) invokeOrDie(hasMethod, message);
-        }
-
-        @Override
-        public boolean has(GeneratedMessageV3.Builder<?> builder) {
-          return (Boolean) invokeOrDie(hasMethodBuilder, builder);
-        }
-
-        @Override
-        public void clear(final GeneratedMessageV3.Builder<?> builder) {
-          // TODO(b/230609037): remove the unused variable
-          Object unused = invokeOrDie(clearMethod, builder);
-        }
-      }
-
-      SingularFieldAccessor(
-          final FieldDescriptor descriptor,
-          final String camelCaseName,
-          final Class<? extends GeneratedMessageV3> messageClass,
-          final Class<? extends Builder> builderClass,
-          final String containingOneofCamelCaseName) {
-        isOneofField =
-            descriptor.getContainingOneof() != null
-                && !descriptor.getContainingOneof().isSynthetic();
-        hasHasMethod =
-            descriptor.getFile().getSyntax() == FileDescriptor.Syntax.PROTO2
-                || descriptor.hasOptionalKeyword()
-                || (!isOneofField && descriptor.getJavaType() == FieldDescriptor.JavaType.MESSAGE);
-        ReflectionInvoker reflectionInvoker =
-            new ReflectionInvoker(
-                descriptor,
-                camelCaseName,
-                messageClass,
-                builderClass,
-                containingOneofCamelCaseName,
-                isOneofField,
-                hasHasMethod);
-        field = descriptor;
-        type = reflectionInvoker.getMethod.getReturnType();
-        invoker = getMethodInvoker(reflectionInvoker);
-      }
-
-      static MethodInvoker getMethodInvoker(ReflectionInvoker accessor) {
-        return accessor;
-      }
-
-      // Note:  We use Java reflection to call public methods rather than
-      //   access private fields directly as this avoids runtime security
-      //   checks.
-      protected final Class<?> type;
-      protected final FieldDescriptor field;
-      protected final boolean isOneofField;
-      protected final boolean hasHasMethod;
-      protected final MethodInvoker invoker;
-
-      @Override
-      public Object get(final GeneratedMessageV3 message) {
-        return invoker.get(message);
-      }
-      @Override
-      public Object get(GeneratedMessageV3.Builder builder) {
-        return invoker.get(builder);
-      }
-      @Override
-      public Object getRaw(final GeneratedMessageV3 message) {
-        return get(message);
-      }
-      @Override
-      public Object getRaw(GeneratedMessageV3.Builder builder) {
-        return get(builder);
-      }
-      @Override
-      public void set(final Builder builder, final Object value) {
-        invoker.set(builder, value);
-      }
-      @Override
-      public Object getRepeated(final GeneratedMessageV3 message, final int index) {
-        throw new UnsupportedOperationException("getRepeatedField() called on a singular field.");
-      }
-      @Override
-      public Object getRepeatedRaw(final GeneratedMessageV3 message, final int index) {
-        throw new UnsupportedOperationException(
-            "getRepeatedFieldRaw() called on a singular field.");
-      }
-      @Override
-      public Object getRepeated(GeneratedMessageV3.Builder builder, int index) {
-        throw new UnsupportedOperationException("getRepeatedField() called on a singular field.");
-      }
-      @Override
-      public Object getRepeatedRaw(GeneratedMessageV3.Builder builder, int index) {
-        throw new UnsupportedOperationException(
-            "getRepeatedFieldRaw() called on a singular field.");
-      }
-      @Override
-      public void setRepeated(final Builder builder, final int index, final Object value) {
-        throw new UnsupportedOperationException("setRepeatedField() called on a singular field.");
-      }
-      @Override
-      public void addRepeated(final Builder builder, final Object value) {
-        throw new UnsupportedOperationException("addRepeatedField() called on a singular field.");
-      }
-      @Override
-      public boolean has(final GeneratedMessageV3 message) {
-        if (!hasHasMethod) {
-          if (isOneofField) {
-            return invoker.getOneofFieldNumber(message) == field.getNumber();
-          }
-          return !get(message).equals(field.getDefaultValue());
-        }
-        return invoker.has(message);
-      }
-      @Override
-      public boolean has(GeneratedMessageV3.Builder builder) {
-        if (!hasHasMethod) {
-          if (isOneofField) {
-            return invoker.getOneofFieldNumber(builder) == field.getNumber();
-          }
-          return !get(builder).equals(field.getDefaultValue());
-        }
-        return invoker.has(builder);
-      }
-      @Override
-      public int getRepeatedCount(final GeneratedMessageV3 message) {
-        throw new UnsupportedOperationException(
-            "getRepeatedFieldSize() called on a singular field.");
-      }
-      @Override
-      public int getRepeatedCount(GeneratedMessageV3.Builder builder) {
-        throw new UnsupportedOperationException(
-            "getRepeatedFieldSize() called on a singular field.");
-      }
-      @Override
-      public void clear(final Builder builder) {
-        invoker.clear(builder);
-      }
-      @Override
-      public Message.Builder newBuilder() {
-        throw new UnsupportedOperationException(
-            "newBuilderForField() called on a non-Message type.");
-      }
-      @Override
-      public Message.Builder getBuilder(GeneratedMessageV3.Builder builder) {
-        throw new UnsupportedOperationException("getFieldBuilder() called on a non-Message type.");
-      }
-      @Override
-      public Message.Builder getRepeatedBuilder(GeneratedMessageV3.Builder builder, int index) {
-        throw new UnsupportedOperationException(
-            "getRepeatedFieldBuilder() called on a non-Message type.");
-      }
-    }
-
-    private static class RepeatedFieldAccessor implements FieldAccessor {
-      interface MethodInvoker {
-        public Object get(final GeneratedMessageV3 message);
-
-        public Object get(GeneratedMessageV3.Builder<?> builder);
-
-        Object getRepeated(final GeneratedMessageV3 message, final int index);
-
-        Object getRepeated(GeneratedMessageV3.Builder<?> builder, int index);
-
-        void setRepeated(
-            final GeneratedMessageV3.Builder<?> builder, final int index, final Object value);
-
-        void addRepeated(final GeneratedMessageV3.Builder<?> builder, final Object value);
-
-        int getRepeatedCount(final GeneratedMessageV3 message);
-
-        int getRepeatedCount(GeneratedMessageV3.Builder<?> builder);
-
-        void clear(final GeneratedMessageV3.Builder<?> builder);
-      }
-
-      private static final class ReflectionInvoker implements MethodInvoker {
-        protected final Method getMethod;
-        protected final Method getMethodBuilder;
-        protected final Method getRepeatedMethod;
-        protected final Method getRepeatedMethodBuilder;
-        protected final Method setRepeatedMethod;
-        protected final Method addRepeatedMethod;
-        protected final Method getCountMethod;
-        protected final Method getCountMethodBuilder;
-        protected final Method clearMethod;
-
-        ReflectionInvoker(
-            final FieldDescriptor descriptor,
-            final String camelCaseName,
-            final Class<? extends GeneratedMessageV3> messageClass,
-            final Class<? extends Builder> builderClass) {
-          getMethod = getMethodOrDie(messageClass, "get" + camelCaseName + "List");
-          getMethodBuilder = getMethodOrDie(builderClass, "get" + camelCaseName + "List");
-          getRepeatedMethod = getMethodOrDie(messageClass, "get" + camelCaseName, Integer.TYPE);
-          getRepeatedMethodBuilder =
-              getMethodOrDie(builderClass, "get" + camelCaseName, Integer.TYPE);
-          Class<?> type = getRepeatedMethod.getReturnType();
-          setRepeatedMethod =
-              getMethodOrDie(builderClass, "set" + camelCaseName, Integer.TYPE, type);
-          addRepeatedMethod = getMethodOrDie(builderClass, "add" + camelCaseName, type);
-          getCountMethod = getMethodOrDie(messageClass, "get" + camelCaseName + "Count");
-          getCountMethodBuilder = getMethodOrDie(builderClass, "get" + camelCaseName + "Count");
-          clearMethod = getMethodOrDie(builderClass, "clear" + camelCaseName);
-        }
-
-        @Override
-        public Object get(final GeneratedMessageV3 message) {
-          return invokeOrDie(getMethod, message);
-        }
-
-        @Override
-        public Object get(GeneratedMessageV3.Builder<?> builder) {
-          return invokeOrDie(getMethodBuilder, builder);
-        }
-
-        @Override
-        public Object getRepeated(
-            final GeneratedMessageV3 message, final int index) {
-          return invokeOrDie(getRepeatedMethod, message, index);
-        }
-
-        @Override
-        public Object getRepeated(GeneratedMessageV3.Builder<?> builder, int index) {
-          return invokeOrDie(getRepeatedMethodBuilder, builder, index);
-        }
-
-        @Override
-        public void setRepeated(
-            final GeneratedMessageV3.Builder<?> builder, final int index, final Object value) {
-          // TODO(b/230609037): remove the unused variable
-          Object unused = invokeOrDie(setRepeatedMethod, builder, index, value);
-        }
-
-        @Override
-        public void addRepeated(
-            final GeneratedMessageV3.Builder<?> builder, final Object value) {
-          // TODO(b/230609037): remove the unused variable
-          Object unused = invokeOrDie(addRepeatedMethod, builder, value);
-        }
-
-        @Override
-        public int getRepeatedCount(final GeneratedMessageV3 message) {
-          return (Integer) invokeOrDie(getCountMethod, message);
-        }
-
-        @Override
-        public int getRepeatedCount(GeneratedMessageV3.Builder<?> builder) {
-          return (Integer) invokeOrDie(getCountMethodBuilder, builder);
-        }
-
-        @Override
-        public void clear(final GeneratedMessageV3.Builder<?> builder) {
-          // TODO(b/230609037): remove the unused variable
-          Object unused = invokeOrDie(clearMethod, builder);
-        }
-      }
-
-      protected final Class type;
-      protected final MethodInvoker invoker;
-
-      RepeatedFieldAccessor(
-          final FieldDescriptor descriptor, final String camelCaseName,
-          final Class<? extends GeneratedMessageV3> messageClass,
-          final Class<? extends Builder> builderClass) {
-        ReflectionInvoker reflectionInvoker =
-            new ReflectionInvoker(descriptor, camelCaseName, messageClass, builderClass);
-        type = reflectionInvoker.getRepeatedMethod.getReturnType();
-        invoker = getMethodInvoker(reflectionInvoker);
-      }
-
-      static MethodInvoker getMethodInvoker(ReflectionInvoker accessor) {
-        return accessor;
-      }
-
-      @Override
-      public Object get(final GeneratedMessageV3 message) {
-        return invoker.get(message);
-      }
-      @Override
-      public Object get(GeneratedMessageV3.Builder builder) {
-        return invoker.get(builder);
-      }
-      @Override
-      public Object getRaw(final GeneratedMessageV3 message) {
-        return get(message);
-      }
-      @Override
-      public Object getRaw(GeneratedMessageV3.Builder builder) {
-        return get(builder);
-      }
-      @Override
-      public void set(final Builder builder, final Object value) {
-        // Add all the elements individually.  This serves two purposes:
-        // 1) Verifies that each element has the correct type.
-        // 2) Insures that the caller cannot modify the list later on and
-        //    have the modifications be reflected in the message.
-        clear(builder);
-        for (final Object element : (List<?>) value) {
-          addRepeated(builder, element);
-        }
-      }
-      @Override
-      public Object getRepeated(final GeneratedMessageV3 message, final int index) {
-        return invoker.getRepeated(message, index);
-      }
-      @Override
-      public Object getRepeated(GeneratedMessageV3.Builder builder, int index) {
-        return invoker.getRepeated(builder, index);
-      }
-      @Override
-      public Object getRepeatedRaw(GeneratedMessageV3 message, int index) {
-        return getRepeated(message, index);
-      }
-      @Override
-      public Object getRepeatedRaw(GeneratedMessageV3.Builder builder, int index) {
-        return getRepeated(builder, index);
-      }
-      @Override
-      public void setRepeated(final Builder builder, final int index, final Object value) {
-        invoker.setRepeated(builder, index, value);
-      }
-      @Override
-      public void addRepeated(final Builder builder, final Object value) {
-        invoker.addRepeated(builder, value);
-      }
-      @Override
-      public boolean has(final GeneratedMessageV3 message) {
-        throw new UnsupportedOperationException("hasField() called on a repeated field.");
-      }
-      @Override
-      public boolean has(GeneratedMessageV3.Builder builder) {
-        throw new UnsupportedOperationException("hasField() called on a repeated field.");
-      }
-      @Override
-      public int getRepeatedCount(final GeneratedMessageV3 message) {
-        return invoker.getRepeatedCount(message);
-      }
-      @Override
-      public int getRepeatedCount(GeneratedMessageV3.Builder builder) {
-        return invoker.getRepeatedCount(builder);
-      }
-      @Override
-      public void clear(final Builder builder) {
-        invoker.clear(builder);
-      }
-      @Override
-      public Message.Builder newBuilder() {
-        throw new UnsupportedOperationException(
-            "newBuilderForField() called on a non-Message type.");
-      }
-      @Override
-      public Message.Builder getBuilder(GeneratedMessageV3.Builder builder) {
-        throw new UnsupportedOperationException("getFieldBuilder() called on a non-Message type.");
-      }
-      @Override
-      public Message.Builder getRepeatedBuilder(GeneratedMessageV3.Builder builder, int index) {
-        throw new UnsupportedOperationException(
-            "getRepeatedFieldBuilder() called on a non-Message type.");
-      }
-    }
-
-    private static class MapFieldAccessor implements FieldAccessor {
-      MapFieldAccessor(
-          final FieldDescriptor descriptor, final String camelCaseName,
-          final Class<? extends GeneratedMessageV3> messageClass,
-          final Class<? extends Builder> builderClass) {
-        field = descriptor;
-        Method getDefaultInstanceMethod =
-            getMethodOrDie(messageClass, "getDefaultInstance");
-        MapField defaultMapField = getMapField(
-            (GeneratedMessageV3) invokeOrDie(getDefaultInstanceMethod, null));
-        mapEntryMessageDefaultInstance =
-            defaultMapField.getMapEntryMessageDefaultInstance();
-      }
-
-      private final FieldDescriptor field;
-      private final Message mapEntryMessageDefaultInstance;
-
-      private MapField<?, ?> getMapField(GeneratedMessageV3 message) {
-        return (MapField<?, ?>) message.internalGetMapField(field.getNumber());
-      }
-
-      private MapField<?, ?> getMapField(GeneratedMessageV3.Builder builder) {
-        return (MapField<?, ?>) builder.internalGetMapField(field.getNumber());
-      }
-
-      private MapField<?, ?> getMutableMapField(
-          GeneratedMessageV3.Builder builder) {
-        return (MapField<?, ?>) builder.internalGetMutableMapField(
-            field.getNumber());
-      }
-
-      private Message coerceType(Message value) {
-        if (value == null) {
-          return null;
-        }
-        if (mapEntryMessageDefaultInstance.getClass().isInstance(value)) {
-          return value;
-        }
-        // The value is not the exact right message type.  However, if it
-        // is an alternative implementation of the same type -- e.g. a
-        // DynamicMessage -- we should accept it.  In this case we can make
-        // a copy of the message.
-        return mapEntryMessageDefaultInstance.toBuilder().mergeFrom(value).build();
-      }
-
-      @Override
-      @SuppressWarnings("unchecked")
-      public Object get(GeneratedMessageV3 message) {
-        List result = new ArrayList<>();
-        for (int i = 0; i < getRepeatedCount(message); i++) {
-          result.add(getRepeated(message, i));
-        }
-        return Collections.unmodifiableList(result);
-      }
-
-      @Override
-      @SuppressWarnings("unchecked")
-      public Object get(Builder builder) {
-        List result = new ArrayList<>();
-        for (int i = 0; i < getRepeatedCount(builder); i++) {
-          result.add(getRepeated(builder, i));
-        }
-        return Collections.unmodifiableList(result);
-      }
-
-      @Override
-      public Object getRaw(GeneratedMessageV3 message) {
-        return get(message);
-      }
-
-      @Override
-      public Object getRaw(GeneratedMessageV3.Builder builder) {
-        return get(builder);
-      }
-
-      @Override
-      public void set(Builder builder, Object value) {
-        clear(builder);
-        for (Object entry : (List) value) {
-          addRepeated(builder, entry);
-        }
-      }
-
-      @Override
-      public Object getRepeated(GeneratedMessageV3 message, int index) {
-        return getMapField(message).getList().get(index);
-      }
-
-      @Override
-      public Object getRepeated(Builder builder, int index) {
-        return getMapField(builder).getList().get(index);
-      }
-
-      @Override
-      public Object getRepeatedRaw(GeneratedMessageV3 message, int index) {
-        return getRepeated(message, index);
-      }
-
-      @Override
-      public Object getRepeatedRaw(Builder builder, int index) {
-        return getRepeated(builder, index);
-      }
-
-      @Override
-      public void setRepeated(Builder builder, int index, Object value) {
-        getMutableMapField(builder).getMutableList().set(index, coerceType((Message) value));
-      }
-
-      @Override
-      public void addRepeated(Builder builder, Object value) {
-        getMutableMapField(builder).getMutableList().add(coerceType((Message) value));
-      }
-
-      @Override
-      public boolean has(GeneratedMessageV3 message) {
-        throw new UnsupportedOperationException(
-            "hasField() is not supported for repeated fields.");
-      }
-
-      @Override
-      public boolean has(Builder builder) {
-        throw new UnsupportedOperationException(
-            "hasField() is not supported for repeated fields.");
-      }
-
-      @Override
-      public int getRepeatedCount(GeneratedMessageV3 message) {
-        return getMapField(message).getList().size();
-      }
-
-      @Override
-      public int getRepeatedCount(Builder builder) {
-        return getMapField(builder).getList().size();
-      }
-
-      @Override
-      public void clear(Builder builder) {
-        getMutableMapField(builder).getMutableList().clear();
-      }
-
-      @Override
-      public com.google.protobuf.Message.Builder newBuilder() {
-        return mapEntryMessageDefaultInstance.newBuilderForType();
-      }
-
-      @Override
-      public com.google.protobuf.Message.Builder getBuilder(Builder builder) {
-        throw new UnsupportedOperationException(
-            "Nested builder not supported for map fields.");
-      }
-
-      @Override
-      public com.google.protobuf.Message.Builder getRepeatedBuilder(Builder builder, int index) {
-        throw new UnsupportedOperationException("Map fields cannot be repeated");
-      }
-    }
-
-    // ---------------------------------------------------------------
-
-    private static final class SingularEnumFieldAccessor
-        extends SingularFieldAccessor {
-      SingularEnumFieldAccessor(
-          final FieldDescriptor descriptor, final String camelCaseName,
-          final Class<? extends GeneratedMessageV3> messageClass,
-          final Class<? extends Builder> builderClass,
-          final String containingOneofCamelCaseName) {
-        super(descriptor, camelCaseName, messageClass, builderClass, containingOneofCamelCaseName);
-
-        enumDescriptor = descriptor.getEnumType();
-
-        valueOfMethod = getMethodOrDie(type, "valueOf", EnumValueDescriptor.class);
-        getValueDescriptorMethod = getMethodOrDie(type, "getValueDescriptor");
-
-        supportUnknownEnumValue = descriptor.getFile().supportsUnknownEnumValue();
-        if (supportUnknownEnumValue) {
-          getValueMethod =
-              getMethodOrDie(messageClass, "get" + camelCaseName + "Value");
-          getValueMethodBuilder =
-              getMethodOrDie(builderClass, "get" + camelCaseName + "Value");
-          setValueMethod =
-              getMethodOrDie(builderClass, "set" + camelCaseName + "Value", int.class);
-        }
-      }
-
-      private EnumDescriptor enumDescriptor;
-
-      private Method valueOfMethod;
-      private Method getValueDescriptorMethod;
-
-      private boolean supportUnknownEnumValue;
-      private Method getValueMethod;
-      private Method getValueMethodBuilder;
-      private Method setValueMethod;
-
-      @Override
-      public Object get(final GeneratedMessageV3 message) {
-        if (supportUnknownEnumValue) {
-          int value = (Integer) invokeOrDie(getValueMethod, message);
-          return enumDescriptor.findValueByNumberCreatingIfUnknown(value);
-        }
-        return invokeOrDie(getValueDescriptorMethod, super.get(message));
-      }
-
-      @Override
-      public Object get(final GeneratedMessageV3.Builder builder) {
-        if (supportUnknownEnumValue) {
-          int value = (Integer) invokeOrDie(getValueMethodBuilder, builder);
-          return enumDescriptor.findValueByNumberCreatingIfUnknown(value);
-        }
-        return invokeOrDie(getValueDescriptorMethod, super.get(builder));
-      }
-
-      @Override
-      public void set(final Builder builder, final Object value) {
-        if (supportUnknownEnumValue) {
-          // TODO(b/230609037): remove the unused variable
-          Object unused =
-              invokeOrDie(setValueMethod, builder, ((EnumValueDescriptor) value).getNumber());
-          return;
-        }
-        super.set(builder, invokeOrDie(valueOfMethod, null, value));
-      }
-    }
-
-    private static final class RepeatedEnumFieldAccessor
-        extends RepeatedFieldAccessor {
-      RepeatedEnumFieldAccessor(
-          final FieldDescriptor descriptor, final String camelCaseName,
-          final Class<? extends GeneratedMessageV3> messageClass,
-          final Class<? extends Builder> builderClass) {
-        super(descriptor, camelCaseName, messageClass, builderClass);
-
-        enumDescriptor = descriptor.getEnumType();
-
-        valueOfMethod = getMethodOrDie(type, "valueOf", EnumValueDescriptor.class);
-        getValueDescriptorMethod = getMethodOrDie(type, "getValueDescriptor");
-
-        supportUnknownEnumValue = descriptor.getFile().supportsUnknownEnumValue();
-        if (supportUnknownEnumValue) {
-          getRepeatedValueMethod =
-              getMethodOrDie(messageClass, "get" + camelCaseName + "Value", int.class);
-          getRepeatedValueMethodBuilder =
-              getMethodOrDie(builderClass, "get" + camelCaseName + "Value", int.class);
-          setRepeatedValueMethod =
-              getMethodOrDie(builderClass, "set" + camelCaseName + "Value", int.class, int.class);
-          addRepeatedValueMethod =
-              getMethodOrDie(builderClass, "add" + camelCaseName + "Value", int.class);
-        }
-      }
-      private EnumDescriptor enumDescriptor;
-
-      private final Method valueOfMethod;
-      private final Method getValueDescriptorMethod;
-
-      private boolean supportUnknownEnumValue;
-      private Method getRepeatedValueMethod;
-      private Method getRepeatedValueMethodBuilder;
-      private Method setRepeatedValueMethod;
-      private Method addRepeatedValueMethod;
-
-      @Override
-      @SuppressWarnings("unchecked")
-      public Object get(final GeneratedMessageV3 message) {
-        final List newList = new ArrayList<>();
-        final int size = getRepeatedCount(message);
-        for (int i = 0; i < size; i++) {
-          newList.add(getRepeated(message, i));
-        }
-        return Collections.unmodifiableList(newList);
-      }
-
-      @Override
-      @SuppressWarnings("unchecked")
-      public Object get(final GeneratedMessageV3.Builder builder) {
-        final List newList = new ArrayList<>();
-        final int size = getRepeatedCount(builder);
-        for (int i = 0; i < size; i++) {
-          newList.add(getRepeated(builder, i));
-        }
-        return Collections.unmodifiableList(newList);
-      }
-
-      @Override
-      public Object getRepeated(final GeneratedMessageV3 message, final int index) {
-        if (supportUnknownEnumValue) {
-          int value = (Integer) invokeOrDie(getRepeatedValueMethod, message, index);
-          return enumDescriptor.findValueByNumberCreatingIfUnknown(value);
-        }
-        return invokeOrDie(getValueDescriptorMethod, super.getRepeated(message, index));
-      }
-
-      @Override
-      public Object getRepeated(final GeneratedMessageV3.Builder builder, final int index) {
-        if (supportUnknownEnumValue) {
-          int value = (Integer) invokeOrDie(getRepeatedValueMethodBuilder, builder, index);
-          return enumDescriptor.findValueByNumberCreatingIfUnknown(value);
-        }
-        return invokeOrDie(getValueDescriptorMethod, super.getRepeated(builder, index));
-      }
-
-      @Override
-      public void setRepeated(final Builder builder, final int index, final Object value) {
-        if (supportUnknownEnumValue) {
-          // TODO(b/230609037): remove the unused variable
-          Object unused =
-              invokeOrDie(
-                  setRepeatedValueMethod,
-                  builder,
-                  index,
-                  ((EnumValueDescriptor) value).getNumber());
-          return;
-        }
-        super.setRepeated(builder, index, invokeOrDie(valueOfMethod, null, value));
-      }
-      @Override
-      public void addRepeated(final Builder builder, final Object value) {
-        if (supportUnknownEnumValue) {
-          // TODO(b/230609037): remove the unused variable
-          Object unused =
-              invokeOrDie(
-                  addRepeatedValueMethod, builder, ((EnumValueDescriptor) value).getNumber());
-          return;
-        }
-        super.addRepeated(builder, invokeOrDie(valueOfMethod, null, value));
-      }
-    }
-
-    // ---------------------------------------------------------------
-
-    /**
-     * Field accessor for string fields.
-     *
-     * <p>This class makes getFooBytes() and setFooBytes() available for
-     * reflection API so that reflection based serialize/parse functions can
-     * access the raw bytes of the field to preserve non-UTF8 bytes in the
-     * string.
-     *
-     * <p>This ensures the serialize/parse round-trip safety, which is important
-     * for servers which forward messages.
-     */
-    private static final class SingularStringFieldAccessor
-        extends SingularFieldAccessor {
-      SingularStringFieldAccessor(
-          final FieldDescriptor descriptor, final String camelCaseName,
-          final Class<? extends GeneratedMessageV3> messageClass,
-          final Class<? extends Builder> builderClass,
-          final String containingOneofCamelCaseName) {
-        super(descriptor, camelCaseName, messageClass, builderClass,
-            containingOneofCamelCaseName);
-        getBytesMethod = getMethodOrDie(messageClass,
-            "get" + camelCaseName + "Bytes");
-        getBytesMethodBuilder = getMethodOrDie(builderClass,
-            "get" + camelCaseName + "Bytes");
-        setBytesMethodBuilder = getMethodOrDie(builderClass,
-            "set" + camelCaseName + "Bytes", ByteString.class);
-      }
-
-      private final Method getBytesMethod;
-      private final Method getBytesMethodBuilder;
-      private final Method setBytesMethodBuilder;
-
-      @Override
-      public Object getRaw(final GeneratedMessageV3 message) {
-        return invokeOrDie(getBytesMethod, message);
-      }
-
-      @Override
-      public Object getRaw(GeneratedMessageV3.Builder builder) {
-        return invokeOrDie(getBytesMethodBuilder, builder);
-      }
-
-      @Override
-      public void set(GeneratedMessageV3.Builder builder, Object value) {
-        if (value instanceof ByteString) {
-          // TODO(b/230609037): remove the unused variable
-          Object unused = invokeOrDie(setBytesMethodBuilder, builder, value);
-        } else {
-          super.set(builder, value);
-        }
-      }
-    }
-
-    // ---------------------------------------------------------------
-
-    private static final class SingularMessageFieldAccessor
-        extends SingularFieldAccessor {
-      SingularMessageFieldAccessor(
-          final FieldDescriptor descriptor, final String camelCaseName,
-          final Class<? extends GeneratedMessageV3> messageClass,
-          final Class<? extends Builder> builderClass,
-          final String containingOneofCamelCaseName) {
-        super(descriptor, camelCaseName, messageClass, builderClass,
-            containingOneofCamelCaseName);
-
-        newBuilderMethod = getMethodOrDie(type, "newBuilder");
-        getBuilderMethodBuilder =
-            getMethodOrDie(builderClass, "get" + camelCaseName + "Builder");
-      }
-
-      private final Method newBuilderMethod;
-      private final Method getBuilderMethodBuilder;
-
-      private Object coerceType(final Object value) {
-        if (type.isInstance(value)) {
-          return value;
-        } else {
-          // The value is not the exact right message type.  However, if it
-          // is an alternative implementation of the same type -- e.g. a
-          // DynamicMessage -- we should accept it.  In this case we can make
-          // a copy of the message.
-          return ((Message.Builder) invokeOrDie(newBuilderMethod, null))
-              .mergeFrom((Message) value)
-              .buildPartial();
-        }
-      }
-
-      @Override
-      public void set(final Builder builder, final Object value) {
-        super.set(builder, coerceType(value));
-      }
-      @Override
-      public Message.Builder newBuilder() {
-        return (Message.Builder) invokeOrDie(newBuilderMethod, null);
-      }
-      @Override
-      public Message.Builder getBuilder(GeneratedMessageV3.Builder builder) {
-        return (Message.Builder) invokeOrDie(getBuilderMethodBuilder, builder);
-      }
-    }
-
-    private static final class RepeatedMessageFieldAccessor
-        extends RepeatedFieldAccessor {
-      RepeatedMessageFieldAccessor(
-          final FieldDescriptor descriptor, final String camelCaseName,
-          final Class<? extends GeneratedMessageV3> messageClass,
-          final Class<? extends Builder> builderClass) {
-        super(descriptor, camelCaseName, messageClass, builderClass);
-
-        newBuilderMethod = getMethodOrDie(type, "newBuilder");
-        getBuilderMethodBuilder = getMethodOrDie(builderClass,
-            "get" + camelCaseName + "Builder", Integer.TYPE);
-      }
-
-      private final Method newBuilderMethod;
-      private final Method getBuilderMethodBuilder;
-
-      private Object coerceType(final Object value) {
-        if (type.isInstance(value)) {
-          return value;
-        } else {
-          // The value is not the exact right message type.  However, if it
-          // is an alternative implementation of the same type -- e.g. a
-          // DynamicMessage -- we should accept it.  In this case we can make
-          // a copy of the message.
-          return ((Message.Builder) invokeOrDie(newBuilderMethod, null))
-              .mergeFrom((Message) value)
-              .build();
-        }
-      }
-
-      @Override
-      public void setRepeated(final Builder builder, final int index, final Object value) {
-        super.setRepeated(builder, index, coerceType(value));
-      }
-      @Override
-      public void addRepeated(final Builder builder, final Object value) {
-        super.addRepeated(builder, coerceType(value));
-      }
-      @Override
-      public Message.Builder newBuilder() {
-        return (Message.Builder) invokeOrDie(newBuilderMethod, null);
-      }
-      @Override
-      public Message.Builder getRepeatedBuilder(
-          final GeneratedMessageV3.Builder builder, final int index) {
-        return (Message.Builder) invokeOrDie(
-            getBuilderMethodBuilder, builder, index);
-      }
-    }
-  }
-
-  /**
-   * Replaces this object in the output stream with a serialized form.
-   * Part of Java's serialization magic.  Generated sub-classes must override
-   * this method by calling {@code return super.writeReplace();}
-   * @return a SerializedForm of this message
-   */
-  protected Object writeReplace() throws ObjectStreamException {
-    return new GeneratedMessageLite.SerializedForm(this);
-  }
-
-  /**
-   * Checks that the {@link Extension} is non-Lite and returns it as a {@link GeneratedExtension}.
-   */
-  private static <MessageType extends ExtendableMessage<MessageType>, T>
-      Extension<MessageType, T> checkNotLite(ExtensionLite<MessageType, T> extension) {
-    if (extension.isLite()) {
-      throw new IllegalArgumentException("Expected non-lite extension.");
-    }
-
-    return (Extension<MessageType, T>) extension;
-  }
-
-  protected static boolean isStringEmpty(final Object value) {
-    if (value instanceof String) {
-      return ((String) value).isEmpty();
-    } else {
-      return ((ByteString) value).isEmpty();
-    }
-  }
-
-  protected static int computeStringSize(final int fieldNumber, final Object value) {
-    if (value instanceof String) {
-      return CodedOutputStream.computeStringSize(fieldNumber, (String) value);
-    } else {
-      return CodedOutputStream.computeBytesSize(fieldNumber, (ByteString) value);
-    }
-  }
-
-  protected static int computeStringSizeNoTag(final Object value) {
-    if (value instanceof String) {
-      return CodedOutputStream.computeStringSizeNoTag((String) value);
-    } else {
-      return CodedOutputStream.computeBytesSizeNoTag((ByteString) value);
-    }
-  }
-
-  protected static void writeString(
-      CodedOutputStream output, final int fieldNumber, final Object value) throws IOException {
-    if (value instanceof String) {
-      output.writeString(fieldNumber, (String) value);
-    } else {
-      output.writeBytes(fieldNumber, (ByteString) value);
-    }
-  }
-
-  protected static void writeStringNoTag(
-      CodedOutputStream output, final Object value) throws IOException {
-    if (value instanceof String) {
-      output.writeStringNoTag((String) value);
-    } else {
-      output.writeBytesNoTag((ByteString) value);
-    }
-  }
-
-  protected static <V> void serializeIntegerMapTo(
-      CodedOutputStream out,
-      MapField<Integer, V> field,
-      MapEntry<Integer, V> defaultEntry,
-      int fieldNumber) throws IOException {
-    Map<Integer, V> m = field.getMap();
-    if (!out.isSerializationDeterministic()) {
-      serializeMapTo(out, m, defaultEntry, fieldNumber);
-      return;
-    }
-    // Sorting the unboxed keys and then look up the values during serialization is 2x faster
-    // than sorting map entries with a custom comparator directly.
-    int[] keys = new int[m.size()];
-    int index = 0;
-    for (int k : m.keySet()) {
-      keys[index++] = k;
-    }
-    Arrays.sort(keys);
-    for (int key : keys) {
-      out.writeMessage(fieldNumber,
-          defaultEntry.newBuilderForType()
-              .setKey(key)
-              .setValue(m.get(key))
-              .build());
-    }
-  }
-
-  protected static <V> void serializeLongMapTo(
-      CodedOutputStream out,
-      MapField<Long, V> field,
-      MapEntry<Long, V> defaultEntry,
-      int fieldNumber)
-      throws IOException {
-    Map<Long, V> m = field.getMap();
-    if (!out.isSerializationDeterministic()) {
-      serializeMapTo(out, m, defaultEntry, fieldNumber);
-      return;
-    }
-
-    long[] keys = new long[m.size()];
-    int index = 0;
-    for (long k : m.keySet()) {
-      keys[index++] = k;
-    }
-    Arrays.sort(keys);
-    for (long key : keys) {
-      out.writeMessage(fieldNumber,
-          defaultEntry.newBuilderForType()
-              .setKey(key)
-              .setValue(m.get(key))
-              .build());
-    }
-  }
-
-  protected static <V> void serializeStringMapTo(
-      CodedOutputStream out,
-      MapField<String, V> field,
-      MapEntry<String, V> defaultEntry,
-      int fieldNumber)
-      throws IOException {
-    Map<String, V> m = field.getMap();
-    if (!out.isSerializationDeterministic()) {
-      serializeMapTo(out, m, defaultEntry, fieldNumber);
-      return;
-    }
-
-    // Sorting the String keys and then look up the values during serialization is 25% faster than
-    // sorting map entries with a custom comparator directly.
-    String[] keys = new String[m.size()];
-    keys = m.keySet().toArray(keys);
-    Arrays.sort(keys);
-    for (String key : keys) {
-      out.writeMessage(fieldNumber,
-          defaultEntry.newBuilderForType()
-              .setKey(key)
-              .setValue(m.get(key))
-              .build());
-    }
-  }
-
-  protected static <V> void serializeBooleanMapTo(
-      CodedOutputStream out,
-      MapField<Boolean, V> field,
-      MapEntry<Boolean, V> defaultEntry,
-      int fieldNumber)
-      throws IOException {
-    Map<Boolean, V> m = field.getMap();
-    if (!out.isSerializationDeterministic()) {
-      serializeMapTo(out, m, defaultEntry, fieldNumber);
-      return;
-    }
-    maybeSerializeBooleanEntryTo(out, m, defaultEntry, fieldNumber, false);
-    maybeSerializeBooleanEntryTo(out, m, defaultEntry, fieldNumber, true);
-  }
-
-  private static <V> void maybeSerializeBooleanEntryTo(
-      CodedOutputStream out,
-      Map<Boolean, V> m,
-      MapEntry<Boolean, V> defaultEntry,
-      int fieldNumber,
-      boolean key)
-      throws IOException {
-    if (m.containsKey(key)) {
-      out.writeMessage(fieldNumber,
-          defaultEntry.newBuilderForType()
-              .setKey(key)
-              .setValue(m.get(key))
-              .build());
-    }
-  }
-
-  /** Serialize the map using the iteration order. */
-  private static <K, V> void serializeMapTo(
-      CodedOutputStream out,
-      Map<K, V> m,
-      MapEntry<K, V> defaultEntry,
-      int fieldNumber)
-      throws IOException {
-    for (Map.Entry<K, V> entry : m.entrySet()) {
-      out.writeMessage(fieldNumber,
-          defaultEntry.newBuilderForType()
-              .setKey(entry.getKey())
-              .setValue(entry.getValue())
-              .build());
-    }
-  }
-}
-
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/InlineMe.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/InlineMe.java
deleted file mode 100644
index 6c81d18..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/InlineMe.java
+++ /dev/null
@@ -1,59 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static java.lang.annotation.ElementType.CONSTRUCTOR;
-import static java.lang.annotation.ElementType.METHOD;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.Target;
-
-/**
- * Indicates that callers of this API should be inlined. That is, this API is trivially expressible
- * in terms of another API, for example a method that just calls another method.
- */
-@Documented
-@Target({METHOD, CONSTRUCTOR})
-@interface InlineMe {
-  /**
-   * What the caller should be replaced with. Local parameter names can be used in the replacement
-   * string. If you are invoking an instance method or constructor, you must include the implicit
-   * {@code this} in the replacement body. If you are invoking a static method, you must include the
-   * implicit {@code ClassName} in the replacement body.
-   */
-  String replacement();
-
-  /** The new imports to (optionally) add to the caller. */
-  String[] imports() default {};
-
-  /** The new static imports to (optionally) add to the caller. */
-  String[] staticImports() default {};
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/IntArrayList.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/IntArrayList.java
deleted file mode 100644
index 9daeebe..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/IntArrayList.java
+++ /dev/null
@@ -1,297 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.protobuf.Internal.checkNotNull;
-
-import com.google.protobuf.Internal.IntList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.RandomAccess;
-
-/**
- * An implementation of {@link IntList} on top of a primitive array.
- *
- * @author dweis@google.com (Daniel Weis)
- */
-final class IntArrayList extends AbstractProtobufList<Integer>
-    implements IntList, RandomAccess, PrimitiveNonBoxingCollection {
-
-  private static final IntArrayList EMPTY_LIST = new IntArrayList(new int[0], 0);
-  static {
-    EMPTY_LIST.makeImmutable();
-  }
-
-  public static IntArrayList emptyList() {
-    return EMPTY_LIST;
-  }
-
-  /** The backing store for the list. */
-  private int[] array;
-
-  /**
-   * The size of the list distinct from the length of the array. That is, it is the number of
-   * elements set in the list.
-   */
-  private int size;
-
-  /** Constructs a new mutable {@code IntArrayList} with default capacity. */
-  IntArrayList() {
-    this(new int[DEFAULT_CAPACITY], 0);
-  }
-
-  /**
-   * Constructs a new mutable {@code IntArrayList} containing the same elements as {@code other}.
-   */
-  private IntArrayList(int[] other, int size) {
-    array = other;
-    this.size = size;
-  }
-
-  @Override
-  protected void removeRange(int fromIndex, int toIndex) {
-    ensureIsMutable();
-    if (toIndex < fromIndex) {
-      throw new IndexOutOfBoundsException("toIndex < fromIndex");
-    }
-
-    System.arraycopy(array, toIndex, array, fromIndex, size - toIndex);
-    size -= (toIndex - fromIndex);
-    modCount++;
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (!(o instanceof IntArrayList)) {
-      return super.equals(o);
-    }
-    IntArrayList other = (IntArrayList) o;
-    if (size != other.size) {
-      return false;
-    }
-
-    final int[] arr = other.array;
-    for (int i = 0; i < size; i++) {
-      if (array[i] != arr[i]) {
-        return false;
-      }
-    }
-
-    return true;
-  }
-
-  @Override
-  public int hashCode() {
-    int result = 1;
-    for (int i = 0; i < size; i++) {
-      result = (31 * result) + array[i];
-    }
-    return result;
-  }
-
-  @Override
-  public IntList mutableCopyWithCapacity(int capacity) {
-    if (capacity < size) {
-      throw new IllegalArgumentException();
-    }
-    return new IntArrayList(Arrays.copyOf(array, capacity), size);
-  }
-
-  @Override
-  public Integer get(int index) {
-    return getInt(index);
-  }
-
-  @Override
-  public int getInt(int index) {
-    ensureIndexInRange(index);
-    return array[index];
-  }
-
-  @Override
-  public int indexOf(Object element) {
-    if (!(element instanceof Integer)) {
-      return -1;
-    }
-    int unboxedElement = (Integer) element;
-    int numElems = size();
-    for (int i = 0; i < numElems; i++) {
-      if (array[i] == unboxedElement) {
-        return i;
-      }
-    }
-    return -1;
-  }
-
-  @Override
-  public boolean contains(Object element) {
-    return indexOf(element) != -1;
-  }
-
-  @Override
-  public int size() {
-    return size;
-  }
-
-  @Override
-  public Integer set(int index, Integer element) {
-    return setInt(index, element);
-  }
-
-  @Override
-  public int setInt(int index, int element) {
-    ensureIsMutable();
-    ensureIndexInRange(index);
-    int previousValue = array[index];
-    array[index] = element;
-    return previousValue;
-  }
-
-  @Override
-  public boolean add(Integer element) {
-    addInt(element);
-    return true;
-  }
-
-  @Override
-  public void add(int index, Integer element) {
-    addInt(index, element);
-  }
-
-  /** Like {@link #add(Integer)} but more efficient in that it doesn't box the element. */
-  @Override
-  public void addInt(int element) {
-    ensureIsMutable();
-    if (size == array.length) {
-      // Resize to 1.5x the size
-      int length = ((size * 3) / 2) + 1;
-      int[] newArray = new int[length];
-
-      System.arraycopy(array, 0, newArray, 0, size);
-      array = newArray;
-    }
-
-    array[size++] = element;
-  }
-
-  /** Like {@link #add(int, Integer)} but more efficient in that it doesn't box the element. */
-  private void addInt(int index, int element) {
-    ensureIsMutable();
-    if (index < 0 || index > size) {
-      throw new IndexOutOfBoundsException(makeOutOfBoundsExceptionMessage(index));
-    }
-
-    if (size < array.length) {
-      // Shift everything over to make room
-      System.arraycopy(array, index, array, index + 1, size - index);
-    } else {
-      // Resize to 1.5x the size
-      int length = ((size * 3) / 2) + 1;
-      int[] newArray = new int[length];
-
-      // Copy the first part directly
-      System.arraycopy(array, 0, newArray, 0, index);
-
-      // Copy the rest shifted over by one to make room
-      System.arraycopy(array, index, newArray, index + 1, size - index);
-      array = newArray;
-    }
-
-    array[index] = element;
-    size++;
-    modCount++;
-  }
-
-  @Override
-  public boolean addAll(Collection<? extends Integer> collection) {
-    ensureIsMutable();
-
-    checkNotNull(collection);
-
-    // We specialize when adding another IntArrayList to avoid boxing elements.
-    if (!(collection instanceof IntArrayList)) {
-      return super.addAll(collection);
-    }
-
-    IntArrayList list = (IntArrayList) collection;
-    if (list.size == 0) {
-      return false;
-    }
-
-    int overflow = Integer.MAX_VALUE - size;
-    if (overflow < list.size) {
-      // We can't actually represent a list this large.
-      throw new OutOfMemoryError();
-    }
-
-    int newSize = size + list.size;
-    if (newSize > array.length) {
-      array = Arrays.copyOf(array, newSize);
-    }
-
-    System.arraycopy(list.array, 0, array, size, list.size);
-    size = newSize;
-    modCount++;
-    return true;
-  }
-
-  @Override
-  public Integer remove(int index) {
-    ensureIsMutable();
-    ensureIndexInRange(index);
-    int value = array[index];
-    if (index < size - 1) {
-      System.arraycopy(array, index + 1, array, index, size - index - 1);
-    }
-    size--;
-    modCount++;
-    return value;
-  }
-
-  /**
-   * Ensures that the provided {@code index} is within the range of {@code [0, size]}. Throws an
-   * {@link IndexOutOfBoundsException} if it is not.
-   *
-   * @param index the index to verify is in range
-   */
-  private void ensureIndexInRange(int index) {
-    if (index < 0 || index >= size) {
-      throw new IndexOutOfBoundsException(makeOutOfBoundsExceptionMessage(index));
-    }
-  }
-
-  private String makeOutOfBoundsExceptionMessage(int index) {
-    return "Index:" + index + ", Size:" + size;
-  }
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/Internal.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/Internal.java
deleted file mode 100644
index b6bbcb1..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/Internal.java
+++ /dev/null
@@ -1,690 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import java.lang.reflect.Method;
-import java.nio.Buffer;
-import java.nio.ByteBuffer;
-import java.nio.charset.Charset;
-import java.util.AbstractList;
-import java.util.AbstractMap;
-import java.util.AbstractSet;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.RandomAccess;
-import java.util.Set;
-
-/**
- * The classes contained within are used internally by the Protocol Buffer library and generated
- * message implementations. They are public only because those generated messages do not reside in
- * the {@code protobuf} package. Others should not use this class directly.
- *
- * @author kenton@google.com (Kenton Varda)
- */
-public final class Internal {
-
-  private Internal() {}
-
-  static final Charset US_ASCII = Charset.forName("US-ASCII");
-  static final Charset UTF_8 = Charset.forName("UTF-8");
-  static final Charset ISO_8859_1 = Charset.forName("ISO-8859-1");
-
-  /** Throws an appropriate {@link NullPointerException} if the given objects is {@code null}. */
-  static <T> T checkNotNull(T obj) {
-    if (obj == null) {
-      throw new NullPointerException();
-    }
-    return obj;
-  }
-
-  /** Throws an appropriate {@link NullPointerException} if the given objects is {@code null}. */
-  static <T> T checkNotNull(T obj, String message) {
-    if (obj == null) {
-      throw new NullPointerException(message);
-    }
-    return obj;
-  }
-
-  /**
-   * Helper called by generated code to construct default values for string fields.
-   *
-   * <p>The protocol compiler does not actually contain a UTF-8 decoder -- it just pushes
-   * UTF-8-encoded text around without touching it. The one place where this presents a problem is
-   * when generating Java string literals. Unicode characters in the string literal would normally
-   * need to be encoded using a Unicode escape sequence, which would require decoding them. To get
-   * around this, protoc instead embeds the UTF-8 bytes into the generated code and leaves it to the
-   * runtime library to decode them.
-   *
-   * <p>It gets worse, though. If protoc just generated a byte array, like: new byte[] {0x12, 0x34,
-   * 0x56, 0x78} Java actually generates *code* which allocates an array and then fills in each
-   * value. This is much less efficient than just embedding the bytes directly into the bytecode. To
-   * get around this, we need another work-around. String literals are embedded directly, so protoc
-   * actually generates a string literal corresponding to the bytes. The easiest way to do this is
-   * to use the ISO-8859-1 character set, which corresponds to the first 256 characters of the
-   * Unicode range. Protoc can then use good old CEscape to generate the string.
-   *
-   * <p>So we have a string literal which represents a set of bytes which represents another string.
-   * This function -- stringDefaultValue -- converts from the generated string to the string we
-   * actually want. The generated code calls this automatically.
-   */
-  public static String stringDefaultValue(String bytes) {
-    return new String(bytes.getBytes(ISO_8859_1), UTF_8);
-  }
-
-  /**
-   * Helper called by generated code to construct default values for bytes fields.
-   *
-   * <p>This is a lot like {@link #stringDefaultValue}, but for bytes fields. In this case we only
-   * need the second of the two hacks -- allowing us to embed raw bytes as a string literal with
-   * ISO-8859-1 encoding.
-   */
-  public static ByteString bytesDefaultValue(String bytes) {
-    return ByteString.copyFrom(bytes.getBytes(ISO_8859_1));
-  }
-  /**
-   * Helper called by generated code to construct default values for bytes fields.
-   *
-   * <p>This is like {@link #bytesDefaultValue}, but returns a byte array.
-   */
-  public static byte[] byteArrayDefaultValue(String bytes) {
-    return bytes.getBytes(ISO_8859_1);
-  }
-
-  /**
-   * Helper called by generated code to construct default values for bytes fields.
-   *
-   * <p>This is like {@link #bytesDefaultValue}, but returns a ByteBuffer.
-   */
-  public static ByteBuffer byteBufferDefaultValue(String bytes) {
-    return ByteBuffer.wrap(byteArrayDefaultValue(bytes));
-  }
-
-  /**
-   * Create a new ByteBuffer and copy all the content of {@code source} ByteBuffer to the new
-   * ByteBuffer. The new ByteBuffer's limit and capacity will be source.capacity(), and its position
-   * will be 0. Note that the state of {@code source} ByteBuffer won't be changed.
-   */
-  public static ByteBuffer copyByteBuffer(ByteBuffer source) {
-    // Make a duplicate of the source ByteBuffer and read data from the
-    // duplicate. This is to avoid affecting the source ByteBuffer's state.
-    ByteBuffer temp = source.duplicate();
-    // We want to copy all the data in the source ByteBuffer, not just the
-    // remaining bytes.
-    // View ByteBuffer as Buffer to avoid issue with covariant return types
-    // See https://issues.apache.org/jira/browse/MRESOLVER-85
-    ((Buffer) temp).clear();
-    ByteBuffer result = ByteBuffer.allocate(temp.capacity());
-    result.put(temp);
-    ((Buffer) result).clear();
-    return result;
-  }
-
-  /**
-   * Helper called by generated code to determine if a byte array is a valid UTF-8 encoded string
-   * such that the original bytes can be converted to a String object and then back to a byte array
-   * round tripping the bytes without loss. More precisely, returns {@code true} whenever:
-   *
-   * <pre>{@code
-   * Arrays.equals(byteString.toByteArray(),
-   *     new String(byteString.toByteArray(), "UTF-8").getBytes("UTF-8"))
-   * }</pre>
-   *
-   * <p>This method rejects "overlong" byte sequences, as well as 3-byte sequences that would map to
-   * a surrogate character, in accordance with the restricted definition of UTF-8 introduced in
-   * Unicode 3.1. Note that the UTF-8 decoder included in Oracle's JDK has been modified to also
-   * reject "overlong" byte sequences, but currently (2011) still accepts 3-byte surrogate character
-   * byte sequences.
-   *
-   * <p>See the Unicode Standard,<br>
-   * Table 3-6. <em>UTF-8 Bit Distribution</em>,<br>
-   * Table 3-7. <em>Well Formed UTF-8 Byte Sequences</em>.
-   *
-   * <p>As of 2011-02, this method simply returns the result of {@link ByteString#isValidUtf8()}.
-   * Calling that method directly is preferred.
-   *
-   * @param byteString the string to check
-   * @return whether the byte array is round trippable
-   */
-  public static boolean isValidUtf8(ByteString byteString) {
-    return byteString.isValidUtf8();
-  }
-
-  /** Like {@link #isValidUtf8(ByteString)} but for byte arrays. */
-  public static boolean isValidUtf8(byte[] byteArray) {
-    return Utf8.isValidUtf8(byteArray);
-  }
-
-  /** Helper method to get the UTF-8 bytes of a string. */
-  public static byte[] toByteArray(String value) {
-    return value.getBytes(UTF_8);
-  }
-
-  /** Helper method to convert a byte array to a string using UTF-8 encoding. */
-  public static String toStringUtf8(byte[] bytes) {
-    return new String(bytes, UTF_8);
-  }
-
-  /**
-   * Interface for an enum value or value descriptor, to be used in FieldSet. The lite library
-   * stores enum values directly in FieldSets but the full library stores EnumValueDescriptors in
-   * order to better support reflection.
-   */
-  public interface EnumLite {
-    int getNumber();
-  }
-
-  /**
-   * Interface for an object which maps integers to {@link EnumLite}s. {@link
-   * Descriptors.EnumDescriptor} implements this interface by mapping numbers to {@link
-   * Descriptors.EnumValueDescriptor}s. Additionally, every generated enum type has a static method
-   * internalGetValueMap() which returns an implementation of this type that maps numbers to enum
-   * values.
-   */
-  public interface EnumLiteMap<T extends EnumLite> {
-    T findValueByNumber(int number);
-  }
-
-  /** Interface for an object which verifies integers are in range. */
-  public interface EnumVerifier {
-    boolean isInRange(int number);
-  }
-
-  /**
-   * Helper method for implementing {@link Message#hashCode()} for longs.
-   *
-   * @see Long#hashCode()
-   */
-  public static int hashLong(long n) {
-    return (int) (n ^ (n >>> 32));
-  }
-
-  /**
-   * Helper method for implementing {@link Message#hashCode()} for booleans.
-   *
-   * @see Boolean#hashCode()
-   */
-  public static int hashBoolean(boolean b) {
-    return b ? 1231 : 1237;
-  }
-
-  /**
-   * Helper method for implementing {@link Message#hashCode()} for enums.
-   *
-   * <p>This is needed because {@link java.lang.Enum#hashCode()} is final, but we need to use the
-   * field number as the hash code to ensure compatibility between statically and dynamically
-   * generated enum objects.
-   */
-  public static int hashEnum(EnumLite e) {
-    return e.getNumber();
-  }
-
-  /** Helper method for implementing {@link Message#hashCode()} for enum lists. */
-  public static int hashEnumList(List<? extends EnumLite> list) {
-    int hash = 1;
-    for (EnumLite e : list) {
-      hash = 31 * hash + hashEnum(e);
-    }
-    return hash;
-  }
-
-  /** Helper method for implementing {@link Message#equals(Object)} for bytes field. */
-  public static boolean equals(List<byte[]> a, List<byte[]> b) {
-    if (a.size() != b.size()) {
-      return false;
-    }
-    for (int i = 0; i < a.size(); ++i) {
-      if (!Arrays.equals(a.get(i), b.get(i))) {
-        return false;
-      }
-    }
-    return true;
-  }
-
-  /** Helper method for implementing {@link Message#hashCode()} for bytes field. */
-  public static int hashCode(List<byte[]> list) {
-    int hash = 1;
-    for (byte[] bytes : list) {
-      hash = 31 * hash + hashCode(bytes);
-    }
-    return hash;
-  }
-
-  /** Helper method for implementing {@link Message#hashCode()} for bytes field. */
-  public static int hashCode(byte[] bytes) {
-    // The hash code for a byte array should be the same as the hash code for a
-    // ByteString with the same content. This is to ensure that the generated
-    // hashCode() method will return the same value as the pure reflection
-    // based hashCode() method.
-    return Internal.hashCode(bytes, 0, bytes.length);
-  }
-
-  /** Helper method for implementing {@link LiteralByteString#hashCode()}. */
-  static int hashCode(byte[] bytes, int offset, int length) {
-    // The hash code for a byte array should be the same as the hash code for a
-    // ByteString with the same content. This is to ensure that the generated
-    // hashCode() method will return the same value as the pure reflection
-    // based hashCode() method.
-    int h = Internal.partialHash(length, bytes, offset, length);
-    return h == 0 ? 1 : h;
-  }
-
-  /** Helper method for continuously hashing bytes. */
-  static int partialHash(int h, byte[] bytes, int offset, int length) {
-    for (int i = offset; i < offset + length; i++) {
-      h = h * 31 + bytes[i];
-    }
-    return h;
-  }
-
-  /** Helper method for implementing {@link Message#equals(Object)} for bytes field. */
-  public static boolean equalsByteBuffer(ByteBuffer a, ByteBuffer b) {
-    if (a.capacity() != b.capacity()) {
-      return false;
-    }
-    // ByteBuffer.equals() will only compare the remaining bytes, but we want to
-    // compare all the content.
-    return a.duplicate().clear().equals(b.duplicate().clear());
-  }
-
-  /** Helper method for implementing {@link Message#equals(Object)} for bytes field. */
-  public static boolean equalsByteBuffer(List<ByteBuffer> a, List<ByteBuffer> b) {
-    if (a.size() != b.size()) {
-      return false;
-    }
-    for (int i = 0; i < a.size(); ++i) {
-      if (!equalsByteBuffer(a.get(i), b.get(i))) {
-        return false;
-      }
-    }
-    return true;
-  }
-
-  /** Helper method for implementing {@link Message#hashCode()} for bytes field. */
-  public static int hashCodeByteBuffer(List<ByteBuffer> list) {
-    int hash = 1;
-    for (ByteBuffer bytes : list) {
-      hash = 31 * hash + hashCodeByteBuffer(bytes);
-    }
-    return hash;
-  }
-
-  private static final int DEFAULT_BUFFER_SIZE = 4096;
-
-  /** Helper method for implementing {@link Message#hashCode()} for bytes field. */
-  public static int hashCodeByteBuffer(ByteBuffer bytes) {
-    if (bytes.hasArray()) {
-      // Fast path.
-      int h = partialHash(bytes.capacity(), bytes.array(), bytes.arrayOffset(), bytes.capacity());
-      return h == 0 ? 1 : h;
-    } else {
-      // Read the data into a temporary byte array before calculating the
-      // hash value.
-      final int bufferSize =
-          bytes.capacity() > DEFAULT_BUFFER_SIZE ? DEFAULT_BUFFER_SIZE : bytes.capacity();
-      final byte[] buffer = new byte[bufferSize];
-      final ByteBuffer duplicated = bytes.duplicate();
-      duplicated.clear();
-      int h = bytes.capacity();
-      while (duplicated.remaining() > 0) {
-        final int length =
-            duplicated.remaining() <= bufferSize ? duplicated.remaining() : bufferSize;
-        duplicated.get(buffer, 0, length);
-        h = partialHash(h, buffer, 0, length);
-      }
-      return h == 0 ? 1 : h;
-    }
-  }
-
-  @SuppressWarnings("unchecked")
-  public static <T extends MessageLite> T getDefaultInstance(Class<T> clazz) {
-    try {
-      Method method = clazz.getMethod("getDefaultInstance");
-      return (T) method.invoke(method);
-    } catch (Exception e) {
-      throw new RuntimeException("Failed to get default instance for " + clazz, e);
-    }
-  }
-
-
-  /** An empty byte array constant used in generated code. */
-  public static final byte[] EMPTY_BYTE_ARRAY = new byte[0];
-
-  /** An empty byte array constant used in generated code. */
-  public static final ByteBuffer EMPTY_BYTE_BUFFER = ByteBuffer.wrap(EMPTY_BYTE_ARRAY);
-
-  /** An empty coded input stream constant used in generated code. */
-  public static final CodedInputStream EMPTY_CODED_INPUT_STREAM =
-      CodedInputStream.newInstance(EMPTY_BYTE_ARRAY);
-
-
-  /** Helper method to merge two MessageLite instances. */
-  static Object mergeMessage(Object destination, Object source) {
-    return ((MessageLite) destination).toBuilder().mergeFrom((MessageLite) source).buildPartial();
-  }
-
-  /**
-   * Provides an immutable view of {@code List<T>} around a {@code List<F>}.
-   *
-   * <p>Protobuf internal. Used in protobuf generated code only.
-   */
-  public static class ListAdapter<F, T> extends AbstractList<T> {
-    /** Convert individual elements of the List from F to T. */
-    public interface Converter<F, T> {
-      T convert(F from);
-    }
-
-    private final List<F> fromList;
-    private final Converter<F, T> converter;
-
-    public ListAdapter(List<F> fromList, Converter<F, T> converter) {
-      this.fromList = fromList;
-      this.converter = converter;
-    }
-
-    @Override
-    public T get(int index) {
-      return converter.convert(fromList.get(index));
-    }
-
-    @Override
-    public int size() {
-      return fromList.size();
-    }
-  }
-
-  /** Wrap around a {@code Map<K, RealValue>} and provide a {@code Map<K, V>} interface. */
-  public static class MapAdapter<K, V, RealValue> extends AbstractMap<K, V> {
-    /** An interface used to convert between two types. */
-    public interface Converter<A, B> {
-      B doForward(A object);
-
-      A doBackward(B object);
-    }
-
-    public static <T extends EnumLite> Converter<Integer, T> newEnumConverter(
-        final EnumLiteMap<T> enumMap, final T unrecognizedValue) {
-      return new Converter<Integer, T>() {
-        @Override
-        public T doForward(Integer value) {
-          T result = enumMap.findValueByNumber(value);
-          return result == null ? unrecognizedValue : result;
-        }
-
-        @Override
-        public Integer doBackward(T value) {
-          return value.getNumber();
-        }
-      };
-    }
-
-    private final Map<K, RealValue> realMap;
-    private final Converter<RealValue, V> valueConverter;
-
-    public MapAdapter(Map<K, RealValue> realMap, Converter<RealValue, V> valueConverter) {
-      this.realMap = realMap;
-      this.valueConverter = valueConverter;
-    }
-
-    @Override
-    public V get(Object key) {
-      RealValue result = realMap.get(key);
-      if (result == null) {
-        return null;
-      }
-      return valueConverter.doForward(result);
-    }
-
-    @Override
-    public V put(K key, V value) {
-      RealValue oldValue = realMap.put(key, valueConverter.doBackward(value));
-      if (oldValue == null) {
-        return null;
-      }
-      return valueConverter.doForward(oldValue);
-    }
-
-    @Override
-    public Set<java.util.Map.Entry<K, V>> entrySet() {
-      return new SetAdapter(realMap.entrySet());
-    }
-
-    private class SetAdapter extends AbstractSet<Map.Entry<K, V>> {
-      private final Set<Map.Entry<K, RealValue>> realSet;
-
-      public SetAdapter(Set<Map.Entry<K, RealValue>> realSet) {
-        this.realSet = realSet;
-      }
-
-      @Override
-      public Iterator<java.util.Map.Entry<K, V>> iterator() {
-        return new IteratorAdapter(realSet.iterator());
-      }
-
-      @Override
-      public int size() {
-        return realSet.size();
-      }
-    }
-
-    private class IteratorAdapter implements Iterator<Map.Entry<K, V>> {
-      private final Iterator<Map.Entry<K, RealValue>> realIterator;
-
-      public IteratorAdapter(Iterator<Map.Entry<K, RealValue>> realIterator) {
-        this.realIterator = realIterator;
-      }
-
-      @Override
-      public boolean hasNext() {
-        return realIterator.hasNext();
-      }
-
-      @Override
-      public java.util.Map.Entry<K, V> next() {
-        return new EntryAdapter(realIterator.next());
-      }
-
-      @Override
-      public void remove() {
-        realIterator.remove();
-      }
-    }
-
-    private class EntryAdapter implements Map.Entry<K, V> {
-      private final Map.Entry<K, RealValue> realEntry;
-
-      public EntryAdapter(Map.Entry<K, RealValue> realEntry) {
-        this.realEntry = realEntry;
-      }
-
-      @Override
-      public K getKey() {
-        return realEntry.getKey();
-      }
-
-      @Override
-      public V getValue() {
-        return valueConverter.doForward(realEntry.getValue());
-      }
-
-      @Override
-      public V setValue(V value) {
-        RealValue oldValue = realEntry.setValue(valueConverter.doBackward(value));
-        if (oldValue == null) {
-          return null;
-        }
-        return valueConverter.doForward(oldValue);
-      }
-
-      @Override
-      public boolean equals(Object o) {
-        if (o == this) {
-          return true;
-        }
-        if (!(o instanceof Map.Entry)) {
-          return false;
-        }
-        Map.Entry<?, ?> other = (Map.Entry<?, ?>) o;
-        return getKey().equals(other.getKey()) && getValue().equals(getValue());
-      }
-
-      @Override
-      public int hashCode() {
-        return realEntry.hashCode();
-      }
-    }
-  }
-
-  /**
-   * Extends {@link List} to add the capability to make the list immutable and inspect if it is
-   * modifiable.
-   *
-   * <p>All implementations must support efficient random access.
-   */
-  public static interface ProtobufList<E> extends List<E>, RandomAccess {
-
-    /**
-     * Makes this list immutable. All subsequent modifications will throw an {@link
-     * UnsupportedOperationException}.
-     */
-    void makeImmutable();
-
-    /**
-     * Returns whether this list can be modified via the publicly accessible {@link List} methods.
-     */
-    boolean isModifiable();
-
-    /** Returns a mutable clone of this list with the specified capacity. */
-    ProtobufList<E> mutableCopyWithCapacity(int capacity);
-  }
-
-  /**
-   * A {@link java.util.List} implementation that avoids boxing the elements into Integers if
-   * possible. Does not support null elements.
-   */
-  public static interface IntList extends ProtobufList<Integer> {
-
-    /** Like {@link #get(int)} but more efficient in that it doesn't box the returned value. */
-    int getInt(int index);
-
-    /** Like {@link #add(Object)} but more efficient in that it doesn't box the element. */
-    void addInt(int element);
-
-    /** Like {@link #set(int, Object)} but more efficient in that it doesn't box the element. */
-    int setInt(int index, int element);
-
-    /** Returns a mutable clone of this list with the specified capacity. */
-    @Override
-    IntList mutableCopyWithCapacity(int capacity);
-  }
-
-  /**
-   * A {@link java.util.List} implementation that avoids boxing the elements into Booleans if
-   * possible. Does not support null elements.
-   */
-  public static interface BooleanList extends ProtobufList<Boolean> {
-
-    /** Like {@link #get(int)} but more efficient in that it doesn't box the returned value. */
-    boolean getBoolean(int index);
-
-    /** Like {@link #add(Object)} but more efficient in that it doesn't box the element. */
-    void addBoolean(boolean element);
-
-    /** Like {@link #set(int, Object)} but more efficient in that it doesn't box the element. */
-    boolean setBoolean(int index, boolean element);
-
-    /** Returns a mutable clone of this list with the specified capacity. */
-    @Override
-    BooleanList mutableCopyWithCapacity(int capacity);
-  }
-
-  /**
-   * A {@link java.util.List} implementation that avoids boxing the elements into Longs if possible.
-   * Does not support null elements.
-   */
-  public static interface LongList extends ProtobufList<Long> {
-
-    /** Like {@link #get(int)} but more efficient in that it doesn't box the returned value. */
-    long getLong(int index);
-
-    /** Like {@link #add(Object)} but more efficient in that it doesn't box the element. */
-    void addLong(long element);
-
-    /** Like {@link #set(int, Object)} but more efficient in that it doesn't box the element. */
-    long setLong(int index, long element);
-
-    /** Returns a mutable clone of this list with the specified capacity. */
-    @Override
-    LongList mutableCopyWithCapacity(int capacity);
-  }
-
-  /**
-   * A {@link java.util.List} implementation that avoids boxing the elements into Doubles if
-   * possible. Does not support null elements.
-   */
-  public static interface DoubleList extends ProtobufList<Double> {
-
-    /** Like {@link #get(int)} but more efficient in that it doesn't box the returned value. */
-    double getDouble(int index);
-
-    /** Like {@link #add(Object)} but more efficient in that it doesn't box the element. */
-    void addDouble(double element);
-
-    /** Like {@link #set(int, Object)} but more efficient in that it doesn't box the element. */
-    double setDouble(int index, double element);
-
-    /** Returns a mutable clone of this list with the specified capacity. */
-    @Override
-    DoubleList mutableCopyWithCapacity(int capacity);
-  }
-
-  /**
-   * A {@link java.util.List} implementation that avoids boxing the elements into Floats if
-   * possible. Does not support null elements.
-   */
-  public static interface FloatList extends ProtobufList<Float> {
-
-    /** Like {@link #get(int)} but more efficient in that it doesn't box the returned value. */
-    float getFloat(int index);
-
-    /** Like {@link #add(Object)} but more efficient in that it doesn't box the element. */
-    void addFloat(float element);
-
-    /** Like {@link #set(int, Object)} but more efficient in that it doesn't box the element. */
-    float setFloat(int index, float element);
-
-    /** Returns a mutable clone of this list with the specified capacity. */
-    @Override
-    FloatList mutableCopyWithCapacity(int capacity);
-  }
-
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/InvalidProtocolBufferException.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/InvalidProtocolBufferException.java
deleted file mode 100644
index 7f36e09..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/InvalidProtocolBufferException.java
+++ /dev/null
@@ -1,174 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import java.io.IOException;
-
-/**
- * Thrown when a protocol message being parsed is invalid in some way. For instance,
- * it contains a malformed varint or a negative byte length.
- *
- * @author kenton@google.com Kenton Varda
- */
-public class InvalidProtocolBufferException extends IOException {
-  private static final long serialVersionUID = -1616151763072450476L;
-  private MessageLite unfinishedMessage = null;
-  private boolean wasThrownFromInputStream;
-
-  public InvalidProtocolBufferException(String description) {
-    super(description);
-  }
-
-  public InvalidProtocolBufferException(Exception e) {
-    super(e.getMessage(), e);
-  }
-
-  public InvalidProtocolBufferException(String description, Exception e) {
-    super(description, e);
-  }
-
-  public InvalidProtocolBufferException(IOException e) {
-    super(e.getMessage(), e);
-  }
-
-  public InvalidProtocolBufferException(String description, IOException e) {
-    super(description, e);
-  }
-
-  /**
-   * Attaches an unfinished message to the exception to support best-effort parsing in {@code
-   * Parser} interface.
-   *
-   * @return this
-   */
-  public InvalidProtocolBufferException setUnfinishedMessage(MessageLite unfinishedMessage) {
-    this.unfinishedMessage = unfinishedMessage;
-    return this;
-  }
-
-  /**
-   * Returns the unfinished message attached to the exception, or null if no message is attached.
-   */
-  public MessageLite getUnfinishedMessage() {
-    return unfinishedMessage;
-  }
-
-  /** Set by CodedInputStream */
-  void setThrownFromInputStream() {
-    /* This write can be racy if the same exception is stored and then thrown by multiple custom
-     * InputStreams on different threads. But since it only ever moves from false->true, there's no
-     * problem. A thread checking this condition after catching this exception from a delegate
-     * stream of CodedInputStream is guaranteed to always observe true, because a write on the same
-     * thread set the value when the exception left the delegate. A thread checking the same
-     * condition with an exception created by CodedInputStream is guaranteed to always see false,
-     * because the exception has not been exposed to any code that could publish it to other threads
-     * and cause a write.
-     */
-    wasThrownFromInputStream = true;
-  }
-
-  /**
-   * Allows code catching IOException from CodedInputStream to tell whether this instance was thrown
-   * by a delegate InputStream, rather than directly by a parse failure.
-   */
-  boolean getThrownFromInputStream() {
-    return wasThrownFromInputStream;
-  }
-
-  /**
-   * Unwraps the underlying {@link IOException} if this exception was caused by an I/O problem.
-   * Otherwise, returns {@code this}.
-   */
-  public IOException unwrapIOException() {
-    return getCause() instanceof IOException ? (IOException) getCause() : this;
-  }
-
-  static InvalidProtocolBufferException truncatedMessage() {
-    return new InvalidProtocolBufferException(
-        "While parsing a protocol message, the input ended unexpectedly "
-            + "in the middle of a field.  This could mean either that the "
-            + "input has been truncated or that an embedded message "
-            + "misreported its own length.");
-  }
-
-  static InvalidProtocolBufferException negativeSize() {
-    return new InvalidProtocolBufferException(
-        "CodedInputStream encountered an embedded string or message "
-            + "which claimed to have negative size.");
-  }
-
-  static InvalidProtocolBufferException malformedVarint() {
-    return new InvalidProtocolBufferException("CodedInputStream encountered a malformed varint.");
-  }
-
-  static InvalidProtocolBufferException invalidTag() {
-    return new InvalidProtocolBufferException("Protocol message contained an invalid tag (zero).");
-  }
-
-  static InvalidProtocolBufferException invalidEndTag() {
-    return new InvalidProtocolBufferException(
-        "Protocol message end-group tag did not match expected tag.");
-  }
-
-  static InvalidWireTypeException invalidWireType() {
-    return new InvalidWireTypeException("Protocol message tag had invalid wire type.");
-  }
-
-  /** Exception indicating that an unexpected wire type was encountered for a field. */
-  @ExperimentalApi
-  public static class InvalidWireTypeException extends InvalidProtocolBufferException {
-    private static final long serialVersionUID = 3283890091615336259L;
-
-    public InvalidWireTypeException(String description) {
-      super(description);
-    }
-  }
-
-  static InvalidProtocolBufferException recursionLimitExceeded() {
-    return new InvalidProtocolBufferException(
-        "Protocol message had too many levels of nesting.  May be malicious.  "
-            + "Use CodedInputStream.setRecursionLimit() to increase the depth limit.");
-  }
-
-  static InvalidProtocolBufferException sizeLimitExceeded() {
-    return new InvalidProtocolBufferException(
-        "Protocol message was too large.  May be malicious.  "
-            + "Use CodedInputStream.setSizeLimit() to increase the size limit.");
-  }
-
-  static InvalidProtocolBufferException parseFailure() {
-    return new InvalidProtocolBufferException("Failed to parse the message.");
-  }
-
-  static InvalidProtocolBufferException invalidUtf8() {
-    return new InvalidProtocolBufferException("Protocol message had invalid UTF-8.");
-  }
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/IterableByteBufferInputStream.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/IterableByteBufferInputStream.java
deleted file mode 100644
index 713e806..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/IterableByteBufferInputStream.java
+++ /dev/null
@@ -1,150 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.protobuf.Internal.EMPTY_BYTE_BUFFER;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.ByteBuffer;
-import java.util.Iterator;
-
-class IterableByteBufferInputStream extends InputStream {
-  /** The {@link Iterator} with type {@link ByteBuffer} of {@code input} */
-  private Iterator<ByteBuffer> iterator;
-  /** The current ByteBuffer; */
-  private ByteBuffer currentByteBuffer;
-  /** The number of ByteBuffers in the input data. */
-  private int dataSize;
-  /**
-   * Current {@code ByteBuffer}'s index
-   *
-   * <p>If index equals dataSize, then all the data in the InputStream has been consumed
-   */
-  private int currentIndex;
-  /** The current position for current ByteBuffer */
-  private int currentByteBufferPos;
-  /** Whether current ByteBuffer has an array */
-  private boolean hasArray;
-  /**
-   * If the current ByteBuffer is unsafe-direct based, currentArray is null; otherwise should be the
-   * array inside ByteBuffer.
-   */
-  private byte[] currentArray;
-  /** Current ByteBuffer's array offset */
-  private int currentArrayOffset;
-  /**
-   * If the current ByteBuffer is unsafe-direct based, currentAddress is the start address of this
-   * ByteBuffer; otherwise should be zero.
-   */
-  private long currentAddress;
-
-  IterableByteBufferInputStream(Iterable<ByteBuffer> data) {
-    iterator = data.iterator();
-    dataSize = 0;
-    for (ByteBuffer unused : data) {
-      dataSize++;
-    }
-    currentIndex = -1;
-
-    if (!getNextByteBuffer()) {
-      currentByteBuffer = EMPTY_BYTE_BUFFER;
-      currentIndex = 0;
-      currentByteBufferPos = 0;
-      currentAddress = 0;
-    }
-  }
-
-  private boolean getNextByteBuffer() {
-    currentIndex++;
-    if (!iterator.hasNext()) {
-      return false;
-    }
-    currentByteBuffer = iterator.next();
-    currentByteBufferPos = currentByteBuffer.position();
-    if (currentByteBuffer.hasArray()) {
-      hasArray = true;
-      currentArray = currentByteBuffer.array();
-      currentArrayOffset = currentByteBuffer.arrayOffset();
-    } else {
-      hasArray = false;
-      currentAddress = UnsafeUtil.addressOffset(currentByteBuffer);
-      currentArray = null;
-    }
-    return true;
-  }
-
-  private void updateCurrentByteBufferPos(int numberOfBytesRead) {
-    currentByteBufferPos += numberOfBytesRead;
-    if (currentByteBufferPos == currentByteBuffer.limit()) {
-      getNextByteBuffer();
-    }
-  }
-
-  @Override
-  public int read() throws IOException {
-    if (currentIndex == dataSize) {
-      return -1;
-    }
-    if (hasArray) {
-      int result = currentArray[currentByteBufferPos + currentArrayOffset] & 0xFF;
-      updateCurrentByteBufferPos(1);
-      return result;
-    } else {
-      int result = UnsafeUtil.getByte(currentByteBufferPos + currentAddress) & 0xFF;
-      updateCurrentByteBufferPos(1);
-      return result;
-    }
-  }
-
-  @Override
-  public int read(byte[] output, int offset, int length) throws IOException {
-    if (currentIndex == dataSize) {
-      return -1;
-    }
-    int remaining = currentByteBuffer.limit() - currentByteBufferPos;
-    if (length > remaining) {
-      length = remaining;
-    }
-    if (hasArray) {
-      System.arraycopy(
-          currentArray, currentByteBufferPos + currentArrayOffset, output, offset, length);
-      updateCurrentByteBufferPos(length);
-    } else {
-      int prevPos = currentByteBuffer.position();
-      currentByteBuffer.position(currentByteBufferPos);
-      currentByteBuffer.get(output, offset, length);
-      currentByteBuffer.position(prevPos);
-      updateCurrentByteBufferPos(length);
-    }
-    return length;
-  }
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/JavaType.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/JavaType.java
deleted file mode 100644
index 770aa9e..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/JavaType.java
+++ /dev/null
@@ -1,76 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-/** Enum that identifies the Java types required to store protobuf fields. */
-@ExperimentalApi
-public enum JavaType {
-  VOID(Void.class, Void.class, null),
-  INT(int.class, Integer.class, 0),
-  LONG(long.class, Long.class, 0L),
-  FLOAT(float.class, Float.class, 0F),
-  DOUBLE(double.class, Double.class, 0D),
-  BOOLEAN(boolean.class, Boolean.class, false),
-  STRING(String.class, String.class, ""),
-  BYTE_STRING(ByteString.class, ByteString.class, ByteString.EMPTY),
-  ENUM(int.class, Integer.class, null),
-  MESSAGE(Object.class, Object.class, null);
-
-  private final Class<?> type;
-  private final Class<?> boxedType;
-  private final Object defaultDefault;
-
-  JavaType(Class<?> type, Class<?> boxedType, Object defaultDefault) {
-    this.type = type;
-    this.boxedType = boxedType;
-    this.defaultDefault = defaultDefault;
-  }
-
-  /** The default default value for fields of this type, if it's a primitive type. */
-  public Object getDefaultDefault() {
-    return defaultDefault;
-  }
-
-  /** Gets the required type for a field that would hold a value of this type. */
-  public Class<?> getType() {
-    return type;
-  }
-
-  /** @return the boxedType */
-  public Class<?> getBoxedType() {
-    return boxedType;
-  }
-
-  /** Indicates whether or not this {@link JavaType} can be applied to a field of the given type. */
-  public boolean isValidType(Class<?> t) {
-    return type.isAssignableFrom(t);
-  }
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/LazyField.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/LazyField.java
deleted file mode 100644
index 035ea60..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/LazyField.java
+++ /dev/null
@@ -1,154 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import java.util.Iterator;
-import java.util.Map.Entry;
-
-/**
- * LazyField encapsulates the logic of lazily parsing message fields. It stores the message in a
- * ByteString initially and then parses it on-demand.
- *
- * <p>Most methods are implemented in {@link LazyFieldLite} but this class can contain a
- * default instance of the message to provide {@code hashCode()}, {@code equals()}, and {@code
- * toString()}.
- *
- * @author xiangl@google.com (Xiang Li)
- */
-public class LazyField extends LazyFieldLite {
-
-  /**
-   * Carry a message's default instance which is used by {@code hashCode()}, {@code equals()}, and
-   * {@code toString()}.
-   */
-  private final MessageLite defaultInstance;
-
-  public LazyField(
-      MessageLite defaultInstance, ExtensionRegistryLite extensionRegistry, ByteString bytes) {
-    super(extensionRegistry, bytes);
-
-    this.defaultInstance = defaultInstance;
-  }
-
-  @Override
-  public boolean containsDefaultInstance() {
-    return super.containsDefaultInstance() || value == defaultInstance;
-  }
-
-  public MessageLite getValue() {
-    return getValue(defaultInstance);
-  }
-
-  @Override
-  public int hashCode() {
-    return getValue().hashCode();
-  }
-
-  @Override
-  public boolean equals(Object obj) {
-    return getValue().equals(obj);
-  }
-
-  @Override
-  public String toString() {
-    return getValue().toString();
-  }
-
-  // ====================================================
-
-  /**
-   * LazyEntry and LazyIterator are used to encapsulate the LazyField, when users iterate all fields
-   * from FieldSet.
-   */
-  static class LazyEntry<K> implements Entry<K, Object> {
-    private Entry<K, LazyField> entry;
-
-    private LazyEntry(Entry<K, LazyField> entry) {
-      this.entry = entry;
-    }
-
-    @Override
-    public K getKey() {
-      return entry.getKey();
-    }
-
-    @Override
-    public Object getValue() {
-      LazyField field = entry.getValue();
-      if (field == null) {
-        return null;
-      }
-      return field.getValue();
-    }
-
-    public LazyField getField() {
-      return entry.getValue();
-    }
-
-    @Override
-    public Object setValue(Object value) {
-      if (!(value instanceof MessageLite)) {
-        throw new IllegalArgumentException(
-            "LazyField now only used for MessageSet, "
-                + "and the value of MessageSet must be an instance of MessageLite");
-      }
-      return entry.getValue().setValue((MessageLite) value);
-    }
-  }
-
-  static class LazyIterator<K> implements Iterator<Entry<K, Object>> {
-    private Iterator<Entry<K, Object>> iterator;
-
-    public LazyIterator(Iterator<Entry<K, Object>> iterator) {
-      this.iterator = iterator;
-    }
-
-    @Override
-    public boolean hasNext() {
-      return iterator.hasNext();
-    }
-
-    @Override
-    @SuppressWarnings("unchecked")
-    public Entry<K, Object> next() {
-      Entry<K, ?> entry = iterator.next();
-      if (entry.getValue() instanceof LazyField) {
-        return new LazyEntry<K>((Entry<K, LazyField>) entry);
-      }
-      return (Entry<K, Object>) entry;
-    }
-
-    @Override
-    public void remove() {
-      iterator.remove();
-    }
-  }
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/LazyFieldLite.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/LazyFieldLite.java
deleted file mode 100644
index 6fab26f..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/LazyFieldLite.java
+++ /dev/null
@@ -1,441 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import java.io.IOException;
-
-/**
- * LazyFieldLite encapsulates the logic of lazily parsing message fields. It stores the message in a
- * ByteString initially and then parses it on-demand.
- *
- * <p>LazyFieldLite is thread-compatible: concurrent reads are safe once the proto that this
- * LazyFieldLite is a part of is no longer being mutated by its Builder. However, explicit
- * synchronization is needed under read/write situations.
- *
- * <p>When a LazyFieldLite is used in the context of a MessageLite object, its behavior is
- * considered to be immutable and none of the setter methods in its API are expected to be invoked.
- * All of the getters are expected to be thread-safe. When used in the context of a
- * MessageLite.Builder, setters can be invoked, but there is no guarantee of thread safety.
- *
- * <p>TODO(yatin,dweis): Consider splitting this class's functionality and put the mutable methods
- * into a separate builder class to allow us to give stronger compile-time guarantees.
- *
- * <p>This class is internal implementation detail of the protobuf library, so you don't need to use
- * it directly.
- *
- * @author xiangl@google.com (Xiang Li)
- */
-public class LazyFieldLite {
-  private static final ExtensionRegistryLite EMPTY_REGISTRY =
-      ExtensionRegistryLite.getEmptyRegistry();
-
-  /*
-   * The value associated with the LazyFieldLite object is stored in one or more of the following
-   * three fields (delayedBytes, value, memoizedBytes). They should together be interpreted as
-   * follows.
-   *
-   * 1) delayedBytes can be non-null, while value and memoizedBytes is null. The object will be in
-   * this state while the value for the object has not yet been parsed.
-   *
-   * 2) Both delayedBytes and value are non-null. The object transitions to this state as soon as
-   * some caller needs to access the value (by invoking getValue()).
-   *
-   * 3) memoizedBytes is merely an optimization for calls to LazyFieldLite.toByteString() to avoid
-   * recomputing the ByteString representation on each call. Instead, when the value is parsed from
-   * delayedBytes, we will also assign the contents of delayedBytes to memoizedBytes (since that is
-   * the ByteString representation of value).
-   *
-   * 4) Finally, if the LazyFieldLite was created directly with a parsed MessageLite value, then
-   * delayedBytes will be null, and memoizedBytes will be initialized only upon the first call to
-   * LazyFieldLite.toByteString().
-   *
-   * <p>Given the above conditions, any caller that needs a serialized representation of this object
-   * must first check if the memoizedBytes or delayedBytes ByteString is non-null and use it
-   * directly; if both of those are null, it can look at the parsed value field. Similarly, any
-   * caller that needs a parsed value must first check if the value field is already non-null, if
-   * not it must parse the value from delayedBytes.
-   */
-
-  /**
-   * A delayed-parsed version of the contents of this field. When this field is non-null, then the
-   * "value" field is allowed to be null until the time that the value needs to be read.
-   *
-   * <p>When delayedBytes is non-null then {@code extensionRegistry} is required to also be
-   * non-null. {@code value} and {@code memoizedBytes} will be initialized lazily.
-   */
-  private ByteString delayedBytes;
-
-  /**
-   * An {@code ExtensionRegistryLite} for parsing bytes. It is non-null on a best-effort basis. It
-   * is only guaranteed to be non-null if this message was initialized using bytes and an {@code
-   * ExtensionRegistry}. If it directly had a value set then it will be null, unless it has been
-   * merged with another {@code LazyFieldLite} that had an {@code ExtensionRegistry}.
-   */
-  private ExtensionRegistryLite extensionRegistry;
-
-  /**
-   * The parsed value. When this is null and a caller needs access to the MessageLite value, then
-   * {@code delayedBytes} will be parsed lazily at that time.
-   */
-  protected volatile MessageLite value;
-
-  /**
-   * The memoized bytes for {@code value}. This is an optimization for the toByteString() method to
-   * not have to recompute its return-value on each invocation. TODO(yatin): Figure out whether this
-   * optimization is actually necessary.
-   */
-  private volatile ByteString memoizedBytes;
-
-  /** Constructs a LazyFieldLite with bytes that will be parsed lazily. */
-  public LazyFieldLite(ExtensionRegistryLite extensionRegistry, ByteString bytes) {
-    checkArguments(extensionRegistry, bytes);
-    this.extensionRegistry = extensionRegistry;
-    this.delayedBytes = bytes;
-  }
-
-  /** Constructs a LazyFieldLite with no contents, and no ability to parse extensions. */
-  public LazyFieldLite() {}
-
-  /**
-   * Constructs a LazyFieldLite instance with a value. The LazyFieldLite may not be able to parse
-   * the extensions in the value as it has no ExtensionRegistry.
-   */
-  public static LazyFieldLite fromValue(MessageLite value) {
-    LazyFieldLite lf = new LazyFieldLite();
-    lf.setValue(value);
-    return lf;
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
-    }
-
-    if (!(o instanceof LazyFieldLite)) {
-      return false;
-    }
-
-    LazyFieldLite other = (LazyFieldLite) o;
-
-    // Lazy fields do not work well with equals... If both are delayedBytes, we do not have a
-    // mechanism to deserialize them so we rely on bytes equality. Otherwise we coerce into an
-    // actual message (if necessary) and call equals on the message itself. This implies that two
-    // messages can by unequal but then be turned equal simply be invoking a getter on a lazy field.
-    MessageLite value1 = value;
-    MessageLite value2 = other.value;
-    if (value1 == null && value2 == null) {
-      return toByteString().equals(other.toByteString());
-    } else if (value1 != null && value2 != null) {
-      return value1.equals(value2);
-    } else if (value1 != null) {
-      return value1.equals(other.getValue(value1.getDefaultInstanceForType()));
-    } else {
-      return getValue(value2.getDefaultInstanceForType()).equals(value2);
-    }
-  }
-
-  @Override
-  public int hashCode() {
-    // We can't provide a memoizable hash code for lazy fields. The byte strings may have different
-    // hash codes but evaluate to equivalent messages. And we have no facility for constructing
-    // a message here if we were not already holding a value.
-    return 1;
-  }
-
-  /**
-   * Determines whether this LazyFieldLite instance represents the default instance of this type.
-   */
-  public boolean containsDefaultInstance() {
-    return memoizedBytes == ByteString.EMPTY
-        || value == null && (delayedBytes == null || delayedBytes == ByteString.EMPTY);
-  }
-
-  /**
-   * Clears the value state of this instance.
-   *
-   * <p>LazyField is not thread-safe for write access. Synchronizations are needed under read/write
-   * situations.
-   */
-  public void clear() {
-    // Don't clear the ExtensionRegistry. It might prove useful later on when merging in another
-    // value, but there is no guarantee that it will contain all extensions that were directly set
-    // on the values that need to be merged.
-    delayedBytes = null;
-    value = null;
-    memoizedBytes = null;
-  }
-
-  /**
-   * Overrides the contents of this LazyField.
-   *
-   * <p>LazyField is not thread-safe for write access. Synchronizations are needed under read/write
-   * situations.
-   */
-  public void set(LazyFieldLite other) {
-    this.delayedBytes = other.delayedBytes;
-    this.value = other.value;
-    this.memoizedBytes = other.memoizedBytes;
-    // If the other LazyFieldLite was created by directly setting the value rather than first by
-    // parsing, then it will not have an extensionRegistry. In this case we hold on to the existing
-    // extensionRegistry, which has no guarantees that it has all the extensions that will be
-    // directly set on the value.
-    if (other.extensionRegistry != null) {
-      this.extensionRegistry = other.extensionRegistry;
-    }
-  }
-
-  /**
-   * Returns message instance. It may do some thread-safe delayed parsing of bytes.
-   *
-   * @param defaultInstance its message's default instance. It's also used to get parser for the
-   *     message type.
-   */
-  public MessageLite getValue(MessageLite defaultInstance) {
-    ensureInitialized(defaultInstance);
-    return value;
-  }
-
-  /**
-   * Sets the value of the instance and returns the old value without delay parsing anything.
-   *
-   * <p>LazyField is not thread-safe for write access. Synchronizations are needed under read/write
-   * situations.
-   */
-  public MessageLite setValue(MessageLite value) {
-    MessageLite originalValue = this.value;
-    this.delayedBytes = null;
-    this.memoizedBytes = null;
-    this.value = value;
-    return originalValue;
-  }
-
-  /**
-   * Merges another instance's contents. In some cases may drop some extensions if both fields
-   * contain data. If the other field has an {@code ExtensionRegistry} but this does not, then this
-   * field will copy over that {@code ExtensionRegistry}.
-   *
-   * <p>LazyField is not thread-safe for write access. Synchronizations are needed under read/write
-   * situations.
-   */
-  public void merge(LazyFieldLite other) {
-    if (other.containsDefaultInstance()) {
-      return;
-    }
-
-    if (this.containsDefaultInstance()) {
-      set(other);
-      return;
-    }
-
-    // If the other field has an extension registry but this does not, copy over the other extension
-    // registry.
-    if (this.extensionRegistry == null) {
-      this.extensionRegistry = other.extensionRegistry;
-    }
-
-    // In the case that both of them are not parsed we simply concatenate the bytes to save time. In
-    // the (probably rare) case that they have different extension registries there is a chance that
-    // some of the extensions may be dropped, but the tradeoff of making this operation fast seems
-    // to outway the benefits of combining the extension registries, which is not normally done for
-    // lite protos anyways.
-    if (this.delayedBytes != null && other.delayedBytes != null) {
-      this.delayedBytes = this.delayedBytes.concat(other.delayedBytes);
-      return;
-    }
-
-    // At least one is parsed and both contain data. We won't drop any extensions here directly, but
-    // in the case that the extension registries are not the same then we might in the future if we
-    // need to serialize and parse a message again.
-    if (this.value == null && other.value != null) {
-      setValue(mergeValueAndBytes(other.value, this.delayedBytes, this.extensionRegistry));
-      return;
-    } else if (this.value != null && other.value == null) {
-      setValue(mergeValueAndBytes(this.value, other.delayedBytes, other.extensionRegistry));
-      return;
-    }
-
-    // At this point we have two fully parsed messages.
-    setValue(this.value.toBuilder().mergeFrom(other.value).build());
-  }
-
-  /**
-   * Merges another instance's contents from a stream.
-   *
-   * <p>LazyField is not thread-safe for write access. Synchronizations are needed under read/write
-   * situations.
-   */
-  public void mergeFrom(CodedInputStream input, ExtensionRegistryLite extensionRegistry)
-      throws IOException {
-    if (this.containsDefaultInstance()) {
-      setByteString(input.readBytes(), extensionRegistry);
-      return;
-    }
-
-    // If the other field has an extension registry but this does not, copy over the other extension
-    // registry.
-    if (this.extensionRegistry == null) {
-      this.extensionRegistry = extensionRegistry;
-    }
-
-    // In the case that both of them are not parsed we simply concatenate the bytes to save time. In
-    // the (probably rare) case that they have different extension registries there is a chance that
-    // some of the extensions may be dropped, but the tradeoff of making this operation fast seems
-    // to outway the benefits of combining the extension registries, which is not normally done for
-    // lite protos anyways.
-    if (this.delayedBytes != null) {
-      setByteString(this.delayedBytes.concat(input.readBytes()), this.extensionRegistry);
-      return;
-    }
-
-    // We are parsed and both contain data. We won't drop any extensions here directly, but in the
-    // case that the extension registries are not the same then we might in the future if we
-    // need to serialize and parse a message again.
-    try {
-      setValue(value.toBuilder().mergeFrom(input, extensionRegistry).build());
-    } catch (InvalidProtocolBufferException e) {
-      // Nothing is logged and no exceptions are thrown. Clients will be unaware that a proto
-      // was invalid.
-    }
-  }
-
-  private static MessageLite mergeValueAndBytes(
-      MessageLite value, ByteString otherBytes, ExtensionRegistryLite extensionRegistry) {
-    try {
-      return value.toBuilder().mergeFrom(otherBytes, extensionRegistry).build();
-    } catch (InvalidProtocolBufferException e) {
-      // Nothing is logged and no exceptions are thrown. Clients will be unaware that a proto
-      // was invalid.
-      return value;
-    }
-  }
-
-  /** Sets this field with bytes to delay-parse. */
-  public void setByteString(ByteString bytes, ExtensionRegistryLite extensionRegistry) {
-    checkArguments(extensionRegistry, bytes);
-    this.delayedBytes = bytes;
-    this.extensionRegistry = extensionRegistry;
-    this.value = null;
-    this.memoizedBytes = null;
-  }
-
-  /**
-   * Due to the optional field can be duplicated at the end of serialized bytes, which will make the
-   * serialized size changed after LazyField parsed. Be careful when using this method.
-   */
-  public int getSerializedSize() {
-    // We *must* return delayed bytes size if it was ever set because the dependent messages may
-    // have memoized serialized size based off of it.
-    if (memoizedBytes != null) {
-      return memoizedBytes.size();
-    } else if (delayedBytes != null) {
-      return delayedBytes.size();
-    } else if (value != null) {
-      return value.getSerializedSize();
-    } else {
-      return 0;
-    }
-  }
-
-  /** Returns a BytesString for this field in a thread-safe way. */
-  public ByteString toByteString() {
-    if (memoizedBytes != null) {
-      return memoizedBytes;
-    }
-    // We *must* return delayed bytes if it was set because the dependent messages may have
-    // memoized serialized size based off of it.
-    if (delayedBytes != null) {
-      return delayedBytes;
-    }
-    synchronized (this) {
-      if (memoizedBytes != null) {
-        return memoizedBytes;
-      }
-      if (value == null) {
-        memoizedBytes = ByteString.EMPTY;
-      } else {
-        memoizedBytes = value.toByteString();
-      }
-      return memoizedBytes;
-    }
-  }
-
-  /** Writes this lazy field into a {@link Writer}. */
-  void writeTo(Writer writer, int fieldNumber) throws IOException {
-    if (memoizedBytes != null) {
-      writer.writeBytes(fieldNumber, memoizedBytes);
-    } else if (delayedBytes != null) {
-      writer.writeBytes(fieldNumber, delayedBytes);
-    } else if (value != null) {
-      writer.writeMessage(fieldNumber, value);
-    } else {
-      writer.writeBytes(fieldNumber, ByteString.EMPTY);
-    }
-  }
-
-  /** Might lazily parse the bytes that were previously passed in. Is thread-safe. */
-  protected void ensureInitialized(MessageLite defaultInstance) {
-    if (value != null) {
-      return;
-    }
-    synchronized (this) {
-      if (value != null) {
-        return;
-      }
-      try {
-        if (delayedBytes != null) {
-          // The extensionRegistry shouldn't be null here since we have delayedBytes.
-          MessageLite parsedValue =
-              defaultInstance.getParserForType().parseFrom(delayedBytes, extensionRegistry);
-          this.value = parsedValue;
-          this.memoizedBytes = delayedBytes;
-        } else {
-          this.value = defaultInstance;
-          this.memoizedBytes = ByteString.EMPTY;
-        }
-      } catch (InvalidProtocolBufferException e) {
-        // Nothing is logged and no exceptions are thrown. Clients will be unaware that this proto
-        // was invalid.
-        this.value = defaultInstance;
-        this.memoizedBytes = ByteString.EMPTY;
-      }
-    }
-  }
-
-  private static void checkArguments(ExtensionRegistryLite extensionRegistry, ByteString bytes) {
-    if (extensionRegistry == null) {
-      throw new NullPointerException("found null ExtensionRegistry");
-    }
-    if (bytes == null) {
-      throw new NullPointerException("found null ByteString");
-    }
-  }
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/LazyStringArrayList.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/LazyStringArrayList.java
deleted file mode 100644
index a2de6f9..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/LazyStringArrayList.java
+++ /dev/null
@@ -1,417 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import java.util.AbstractList;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.RandomAccess;
-
-/**
- * An implementation of {@link LazyStringList} that wraps an ArrayList. Each element is one of
- * String, ByteString, or byte[]. It caches the last one requested which is most likely the one
- * needed next. This minimizes memory usage while satisfying the most common use cases.
- *
- * <p><strong>Note that this implementation is not synchronized.</strong> If multiple threads access
- * an <tt>ArrayList</tt> instance concurrently, and at least one of the threads modifies the list
- * structurally, it <i>must</i> be synchronized externally. (A structural modification is any
- * operation that adds or deletes one or more elements, or explicitly resizes the backing array;
- * merely setting the value of an element is not a structural modification.) This is typically
- * accomplished by synchronizing on some object that naturally encapsulates the list.
- *
- * <p>If the implementation is accessed via concurrent reads, this is thread safe. Conversions are
- * done in a thread safe manner. It's possible that the conversion may happen more than once if two
- * threads attempt to access the same element and the modifications were not visible to each other,
- * but this will not result in any corruption of the list or change in behavior other than
- * performance.
- *
- * @author jonp@google.com (Jon Perlow)
- */
-public class LazyStringArrayList extends AbstractProtobufList<String>
-    implements LazyStringList, RandomAccess {
-
-  private static final LazyStringArrayList EMPTY_LIST = new LazyStringArrayList();
-
-  static {
-    EMPTY_LIST.makeImmutable();
-  }
-
-  static LazyStringArrayList emptyList() {
-    return EMPTY_LIST;
-  }
-
-  // For compatibility with older runtimes.
-  public static final LazyStringList EMPTY = EMPTY_LIST;
-
-  private final List<Object> list;
-
-  public LazyStringArrayList() {
-    this(DEFAULT_CAPACITY);
-  }
-
-  public LazyStringArrayList(int initialCapacity) {
-    this(new ArrayList<Object>(initialCapacity));
-  }
-
-  public LazyStringArrayList(LazyStringList from) {
-    list = new ArrayList<Object>(from.size());
-    addAll(from);
-  }
-
-  public LazyStringArrayList(List<String> from) {
-    this(new ArrayList<Object>(from));
-  }
-
-  private LazyStringArrayList(ArrayList<Object> list) {
-    this.list = list;
-  }
-
-  @Override
-  public LazyStringArrayList mutableCopyWithCapacity(int capacity) {
-    if (capacity < size()) {
-      throw new IllegalArgumentException();
-    }
-    ArrayList<Object> newList = new ArrayList<Object>(capacity);
-    newList.addAll(list);
-    return new LazyStringArrayList(newList);
-  }
-
-  @Override
-  public String get(int index) {
-    Object o = list.get(index);
-    if (o instanceof String) {
-      return (String) o;
-    } else if (o instanceof ByteString) {
-      ByteString bs = (ByteString) o;
-      String s = bs.toStringUtf8();
-      if (bs.isValidUtf8()) {
-        list.set(index, s);
-      }
-      return s;
-    } else {
-      byte[] ba = (byte[]) o;
-      String s = Internal.toStringUtf8(ba);
-      if (Internal.isValidUtf8(ba)) {
-        list.set(index, s);
-      }
-      return s;
-    }
-  }
-
-  @Override
-  public int size() {
-    return list.size();
-  }
-
-  @Override
-  public String set(int index, String s) {
-    ensureIsMutable();
-    Object o = list.set(index, s);
-    return asString(o);
-  }
-
-  @Override
-  public void add(int index, String element) {
-    ensureIsMutable();
-    list.add(index, element);
-    modCount++;
-  }
-
-  private void add(int index, ByteString element) {
-    ensureIsMutable();
-    list.add(index, element);
-    modCount++;
-  }
-
-  private void add(int index, byte[] element) {
-    ensureIsMutable();
-    list.add(index, element);
-    modCount++;
-  }
-
-  @Override
-  public boolean addAll(Collection<? extends String> c) {
-    // The default implementation of AbstractCollection.addAll(Collection)
-    // delegates to add(Object). This implementation instead delegates to
-    // addAll(int, Collection), which makes a special case for Collections
-    // which are instances of LazyStringList.
-    return addAll(size(), c);
-  }
-
-  @Override
-  public boolean addAll(int index, Collection<? extends String> c) {
-    ensureIsMutable();
-    // When copying from another LazyStringList, directly copy the underlying
-    // elements rather than forcing each element to be decoded to a String.
-    Collection<?> collection =
-        c instanceof LazyStringList ? ((LazyStringList) c).getUnderlyingElements() : c;
-    boolean ret = list.addAll(index, collection);
-    modCount++;
-    return ret;
-  }
-
-  @Override
-  public boolean addAllByteString(Collection<? extends ByteString> values) {
-    ensureIsMutable();
-    boolean ret = list.addAll(values);
-    modCount++;
-    return ret;
-  }
-
-  @Override
-  public boolean addAllByteArray(Collection<byte[]> c) {
-    ensureIsMutable();
-    boolean ret = list.addAll(c);
-    modCount++;
-    return ret;
-  }
-
-  @Override
-  public String remove(int index) {
-    ensureIsMutable();
-    Object o = list.remove(index);
-    modCount++;
-    return asString(o);
-  }
-
-  @Override
-  public void clear() {
-    ensureIsMutable();
-    list.clear();
-    modCount++;
-  }
-
-  @Override
-  public void add(ByteString element) {
-    ensureIsMutable();
-    list.add(element);
-    modCount++;
-  }
-
-  @Override
-  public void add(byte[] element) {
-    ensureIsMutable();
-    list.add(element);
-    modCount++;
-  }
-
-  @Override
-  public Object getRaw(int index) {
-    return list.get(index);
-  }
-
-  @Override
-  public ByteString getByteString(int index) {
-    Object o = list.get(index);
-    ByteString b = asByteString(o);
-    if (b != o) {
-      list.set(index, b);
-    }
-    return b;
-  }
-
-  @Override
-  public byte[] getByteArray(int index) {
-    Object o = list.get(index);
-    byte[] b = asByteArray(o);
-    if (b != o) {
-      list.set(index, b);
-    }
-    return b;
-  }
-
-  @Override
-  public void set(int index, ByteString s) {
-    setAndReturn(index, s);
-  }
-
-  private Object setAndReturn(int index, ByteString s) {
-    ensureIsMutable();
-    return list.set(index, s);
-  }
-
-  @Override
-  public void set(int index, byte[] s) {
-    setAndReturn(index, s);
-  }
-
-  private Object setAndReturn(int index, byte[] s) {
-    ensureIsMutable();
-    return list.set(index, s);
-  }
-
-  private static String asString(Object o) {
-    if (o instanceof String) {
-      return (String) o;
-    } else if (o instanceof ByteString) {
-      return ((ByteString) o).toStringUtf8();
-    } else {
-      return Internal.toStringUtf8((byte[]) o);
-    }
-  }
-
-  private static ByteString asByteString(Object o) {
-    if (o instanceof ByteString) {
-      return (ByteString) o;
-    } else if (o instanceof String) {
-      return ByteString.copyFromUtf8((String) o);
-    } else {
-      return ByteString.copyFrom((byte[]) o);
-    }
-  }
-
-  private static byte[] asByteArray(Object o) {
-    if (o instanceof byte[]) {
-      return (byte[]) o;
-    } else if (o instanceof String) {
-      return Internal.toByteArray((String) o);
-    } else {
-      return ((ByteString) o).toByteArray();
-    }
-  }
-
-  @Override
-  public List<?> getUnderlyingElements() {
-    return Collections.unmodifiableList(list);
-  }
-
-  @Override
-  public void mergeFrom(LazyStringList other) {
-    ensureIsMutable();
-    for (Object o : other.getUnderlyingElements()) {
-      if (o instanceof byte[]) {
-        byte[] b = (byte[]) o;
-        // Byte array's content is mutable so they should be copied rather than
-        // shared when merging from one message to another.
-        list.add(Arrays.copyOf(b, b.length));
-      } else {
-        list.add(o);
-      }
-    }
-  }
-
-  private static class ByteArrayListView extends AbstractList<byte[]> implements RandomAccess {
-    private final LazyStringArrayList list;
-
-    ByteArrayListView(LazyStringArrayList list) {
-      this.list = list;
-    }
-
-    @Override
-    public byte[] get(int index) {
-      return list.getByteArray(index);
-    }
-
-    @Override
-    public int size() {
-      return list.size();
-    }
-
-    @Override
-    public byte[] set(int index, byte[] s) {
-      Object o = list.setAndReturn(index, s);
-      modCount++;
-      return asByteArray(o);
-    }
-
-    @Override
-    public void add(int index, byte[] s) {
-      list.add(index, s);
-      modCount++;
-    }
-
-    @Override
-    public byte[] remove(int index) {
-      Object o = list.remove(index);
-      modCount++;
-      return asByteArray(o);
-    }
-  }
-
-  @Override
-  public List<byte[]> asByteArrayList() {
-    return new ByteArrayListView(this);
-  }
-
-  private static class ByteStringListView extends AbstractList<ByteString> implements RandomAccess {
-    private final LazyStringArrayList list;
-
-    ByteStringListView(LazyStringArrayList list) {
-      this.list = list;
-    }
-
-    @Override
-    public ByteString get(int index) {
-      return list.getByteString(index);
-    }
-
-    @Override
-    public int size() {
-      return list.size();
-    }
-
-    @Override
-    public ByteString set(int index, ByteString s) {
-      Object o = list.setAndReturn(index, s);
-      modCount++;
-      return asByteString(o);
-    }
-
-    @Override
-    public void add(int index, ByteString s) {
-      list.add(index, s);
-      modCount++;
-    }
-
-    @Override
-    public ByteString remove(int index) {
-      Object o = list.remove(index);
-      modCount++;
-      return asByteString(o);
-    }
-  }
-
-  @Override
-  public List<ByteString> asByteStringList() {
-    return new ByteStringListView(this);
-  }
-
-  @Override
-  public LazyStringList getUnmodifiableView() {
-    if (isModifiable()) {
-      return new UnmodifiableLazyStringList(this);
-    }
-    return this;
-  }
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/LazyStringList.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/LazyStringList.java
deleted file mode 100644
index 6b55022..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/LazyStringList.java
+++ /dev/null
@@ -1,164 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import java.util.Collection;
-import java.util.List;
-
-/**
- * An interface extending {@code List<String>} that also provides access to the items of the list as
- * UTF8-encoded ByteString or byte[] objects. This is used by the protocol buffer implementation to
- * support lazily converting bytes parsed over the wire to String objects until needed and also
- * increases the efficiency of serialization if the String was never requested as the ByteString or
- * byte[] is already cached. The ByteString methods are used in immutable API only and byte[]
- * methods used in mutable API only for they use different representations for string/bytes fields.
- *
- * @author jonp@google.com (Jon Perlow)
- */
-public interface LazyStringList extends ProtocolStringList {
-
-  /**
-   * Returns the element at the specified position in this list as a ByteString.
-   *
-   * @param index index of the element to return
-   * @return the element at the specified position in this list
-   * @throws IndexOutOfBoundsException if the index is out of range ({@code index < 0 || index >=
-   *     size()})
-   */
-  ByteString getByteString(int index);
-
-  /**
-   * Returns the element at the specified position in this list as an Object that will either be a
-   * String or a ByteString.
-   *
-   * @param index index of the element to return
-   * @return the element at the specified position in this list
-   * @throws IndexOutOfBoundsException if the index is out of range ({@code index < 0 || index >=
-   *     size()})
-   */
-  Object getRaw(int index);
-
-  /**
-   * Returns the element at the specified position in this list as byte[].
-   *
-   * @param index index of the element to return
-   * @return the element at the specified position in this list
-   * @throws IndexOutOfBoundsException if the index is out of range ({@code index < 0 || index >=
-   *     size()})
-   */
-  byte[] getByteArray(int index);
-
-  /**
-   * Appends the specified element to the end of this list (optional operation).
-   *
-   * @param element element to be appended to this list
-   * @throws UnsupportedOperationException if the <tt>add</tt> operation is not supported by this
-   *     list
-   */
-  void add(ByteString element);
-
-  /**
-   * Appends the specified element to the end of this list (optional operation).
-   *
-   * @param element element to be appended to this list
-   * @throws UnsupportedOperationException if the <tt>add</tt> operation is not supported by this
-   *     list
-   */
-  void add(byte[] element);
-
-  /**
-   * Replaces the element at the specified position in this list with the specified element
-   * (optional operation).
-   *
-   * @param index index of the element to replace
-   * @param element the element to be stored at the specified position
-   * @throws UnsupportedOperationException if the <tt>set</tt> operation is not supported by this
-   *     list IndexOutOfBoundsException if the index is out of range ({@code index < 0 || index >=
-   *     size()})
-   */
-  void set(int index, ByteString element);
-
-  /**
-   * Replaces the element at the specified position in this list with the specified element
-   * (optional operation).
-   *
-   * @param index index of the element to replace
-   * @param element the element to be stored at the specified position
-   * @throws UnsupportedOperationException if the <tt>set</tt> operation is not supported by this
-   *     list IndexOutOfBoundsException if the index is out of range ({@code index < 0 || index >=
-   *     size()})
-   */
-  void set(int index, byte[] element);
-
-  /**
-   * Appends all elements in the specified ByteString collection to the end of this list.
-   *
-   * @param c collection whose elements are to be added to this list
-   * @return true if this list changed as a result of the call
-   * @throws UnsupportedOperationException if the <tt>addAllByteString</tt> operation is not
-   *     supported by this list
-   */
-  boolean addAllByteString(Collection<? extends ByteString> c);
-
-  /**
-   * Appends all elements in the specified byte[] collection to the end of this list.
-   *
-   * @param c collection whose elements are to be added to this list
-   * @return true if this list changed as a result of the call
-   * @throws UnsupportedOperationException if the <tt>addAllByteArray</tt> operation is not
-   *     supported by this list
-   */
-  boolean addAllByteArray(Collection<byte[]> c);
-
-  /**
-   * Returns an unmodifiable List of the underlying elements, each of which is either a {@code
-   * String} or its equivalent UTF-8 encoded {@code ByteString} or byte[]. It is an error for the
-   * caller to modify the returned List, and attempting to do so will result in an {@link
-   * UnsupportedOperationException}.
-   */
-  List<?> getUnderlyingElements();
-
-  /**
-   * Merges all elements from another LazyStringList into this one. This method differs from {@link
-   * #addAll(Collection)} on that underlying byte arrays are copied instead of reference shared.
-   * Immutable API doesn't need to use this method as byte[] is not used there at all.
-   */
-  void mergeFrom(LazyStringList other);
-
-  /**
-   * Returns a mutable view of this list. Changes to the view will be made into the original list.
-   * This method is used in mutable API only.
-   */
-  List<byte[]> asByteArrayList();
-
-  /** Returns an unmodifiable view of the list. */
-  LazyStringList getUnmodifiableView();
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/ListFieldSchema.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/ListFieldSchema.java
deleted file mode 100644
index 651e5fd..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/ListFieldSchema.java
+++ /dev/null
@@ -1,191 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import com.google.protobuf.Internal.ProtobufList;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-/**
- * Utility class that aids in properly manipulating list fields for either the lite or full runtime.
- */
-@CheckReturnValue
-abstract class ListFieldSchema {
-  // Disallow construction.
-  private ListFieldSchema() {}
-
-  private static final ListFieldSchema FULL_INSTANCE = new ListFieldSchemaFull();
-  private static final ListFieldSchema LITE_INSTANCE = new ListFieldSchemaLite();
-
-  abstract <L> List<L> mutableListAt(Object msg, long offset);
-
-  abstract void makeImmutableListAt(Object msg, long offset);
-
-  abstract <L> void mergeListsAt(Object msg, Object otherMsg, long offset);
-
-  static ListFieldSchema full() {
-    return FULL_INSTANCE;
-  }
-
-  static ListFieldSchema lite() {
-    return LITE_INSTANCE;
-  }
-
-  /** Implementation for the full runtime. */
-  private static final class ListFieldSchemaFull extends ListFieldSchema {
-
-    private static final Class<?> UNMODIFIABLE_LIST_CLASS =
-        Collections.unmodifiableList(Collections.emptyList()).getClass();
-
-    @Override
-    <L> List<L> mutableListAt(Object message, long offset) {
-      return mutableListAt(message, offset, AbstractProtobufList.DEFAULT_CAPACITY);
-    }
-
-    @Override
-    void makeImmutableListAt(Object message, long offset) {
-      List<?> list = (List<?>) UnsafeUtil.getObject(message, offset);
-      Object immutable = null;
-      if (list instanceof LazyStringList) {
-        immutable = ((LazyStringList) list).getUnmodifiableView();
-      } else if (UNMODIFIABLE_LIST_CLASS.isAssignableFrom(list.getClass())) {
-        // already immutable
-        return;
-      } else if (list instanceof PrimitiveNonBoxingCollection && list instanceof ProtobufList) {
-        if (((ProtobufList<?>) list).isModifiable()) {
-          ((ProtobufList<?>) list).makeImmutable();
-        }
-        return;
-      } else {
-        immutable = Collections.unmodifiableList((List<?>) list);
-      }
-      UnsafeUtil.putObject(message, offset, immutable);
-    }
-
-    @SuppressWarnings("unchecked")
-    private static <L> List<L> mutableListAt(Object message, long offset, int additionalCapacity) {
-      List<L> list = getList(message, offset);
-      if (list.isEmpty()) {
-        if (list instanceof LazyStringList) {
-          list = (List<L>) new LazyStringArrayList(additionalCapacity);
-        } else if (list instanceof PrimitiveNonBoxingCollection && list instanceof ProtobufList) {
-          list = ((ProtobufList<L>) list).mutableCopyWithCapacity(additionalCapacity);
-        } else {
-          list = new ArrayList<L>(additionalCapacity);
-        }
-        UnsafeUtil.putObject(message, offset, list);
-      } else if (UNMODIFIABLE_LIST_CLASS.isAssignableFrom(list.getClass())) {
-        ArrayList<L> newList = new ArrayList<L>(list.size() + additionalCapacity);
-        newList.addAll(list);
-        list = newList;
-        UnsafeUtil.putObject(message, offset, list);
-      } else if (list instanceof UnmodifiableLazyStringList) {
-        LazyStringArrayList newList = new LazyStringArrayList(list.size() + additionalCapacity);
-        newList.addAll((UnmodifiableLazyStringList) list);
-        list = (List<L>) newList;
-        UnsafeUtil.putObject(message, offset, list);
-      } else if (list instanceof PrimitiveNonBoxingCollection
-          && list instanceof ProtobufList
-          && !((ProtobufList<L>) list).isModifiable()) {
-        list = ((ProtobufList<L>) list).mutableCopyWithCapacity(list.size() + additionalCapacity);
-        UnsafeUtil.putObject(message, offset, list);
-      }
-      return list;
-    }
-
-    @Override
-    <E> void mergeListsAt(Object msg, Object otherMsg, long offset) {
-      List<E> other = getList(otherMsg, offset);
-      List<E> mine = mutableListAt(msg, offset, other.size());
-
-      int size = mine.size();
-      int otherSize = other.size();
-      if (size > 0 && otherSize > 0) {
-        mine.addAll(other);
-      }
-
-      List<E> merged = size > 0 ? mine : other;
-      UnsafeUtil.putObject(msg, offset, merged);
-    }
-
-    @SuppressWarnings("unchecked")
-    static <E> List<E> getList(Object message, long offset) {
-      return (List<E>) UnsafeUtil.getObject(message, offset);
-    }
-  }
-
-  /** Implementation for the lite runtime. */
-  private static final class ListFieldSchemaLite extends ListFieldSchema {
-
-    @Override
-    <L> List<L> mutableListAt(Object message, long offset) {
-      ProtobufList<L> list = getProtobufList(message, offset);
-      if (!list.isModifiable()) {
-        int size = list.size();
-        list =
-            list.mutableCopyWithCapacity(
-                size == 0 ? AbstractProtobufList.DEFAULT_CAPACITY : size * 2);
-        UnsafeUtil.putObject(message, offset, list);
-      }
-      return list;
-    }
-
-    @Override
-    void makeImmutableListAt(Object message, long offset) {
-      ProtobufList<?> list = getProtobufList(message, offset);
-      list.makeImmutable();
-    }
-
-    @Override
-    <E> void mergeListsAt(Object msg, Object otherMsg, long offset) {
-      ProtobufList<E> mine = getProtobufList(msg, offset);
-      ProtobufList<E> other = getProtobufList(otherMsg, offset);
-
-      int size = mine.size();
-      int otherSize = other.size();
-      if (size > 0 && otherSize > 0) {
-        if (!mine.isModifiable()) {
-          mine = mine.mutableCopyWithCapacity(size + otherSize);
-        }
-        mine.addAll(other);
-      }
-
-      ProtobufList<E> merged = size > 0 ? mine : other;
-      UnsafeUtil.putObject(msg, offset, merged);
-    }
-
-    @SuppressWarnings("unchecked")
-    static <E> ProtobufList<E> getProtobufList(Object message, long offset) {
-      return (ProtobufList<E>) UnsafeUtil.getObject(message, offset);
-    }
-  }
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/LongArrayList.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/LongArrayList.java
deleted file mode 100644
index bda43a4..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/LongArrayList.java
+++ /dev/null
@@ -1,297 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.protobuf.Internal.checkNotNull;
-
-import com.google.protobuf.Internal.LongList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.RandomAccess;
-
-/**
- * An implementation of {@link LongList} on top of a primitive array.
- *
- * @author dweis@google.com (Daniel Weis)
- */
-final class LongArrayList extends AbstractProtobufList<Long>
-    implements LongList, RandomAccess, PrimitiveNonBoxingCollection {
-
-  private static final LongArrayList EMPTY_LIST = new LongArrayList(new long[0], 0);
-  static {
-    EMPTY_LIST.makeImmutable();
-  }
-
-  public static LongArrayList emptyList() {
-    return EMPTY_LIST;
-  }
-
-  /** The backing store for the list. */
-  private long[] array;
-
-  /**
-   * The size of the list distinct from the length of the array. That is, it is the number of
-   * elements set in the list.
-   */
-  private int size;
-
-  /** Constructs a new mutable {@code LongArrayList} with default capacity. */
-  LongArrayList() {
-    this(new long[DEFAULT_CAPACITY], 0);
-  }
-
-  /**
-   * Constructs a new mutable {@code LongArrayList} containing the same elements as {@code other}.
-   */
-  private LongArrayList(long[] other, int size) {
-    array = other;
-    this.size = size;
-  }
-
-  @Override
-  protected void removeRange(int fromIndex, int toIndex) {
-    ensureIsMutable();
-    if (toIndex < fromIndex) {
-      throw new IndexOutOfBoundsException("toIndex < fromIndex");
-    }
-
-    System.arraycopy(array, toIndex, array, fromIndex, size - toIndex);
-    size -= (toIndex - fromIndex);
-    modCount++;
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (!(o instanceof LongArrayList)) {
-      return super.equals(o);
-    }
-    LongArrayList other = (LongArrayList) o;
-    if (size != other.size) {
-      return false;
-    }
-
-    final long[] arr = other.array;
-    for (int i = 0; i < size; i++) {
-      if (array[i] != arr[i]) {
-        return false;
-      }
-    }
-
-    return true;
-  }
-
-  @Override
-  public int hashCode() {
-    int result = 1;
-    for (int i = 0; i < size; i++) {
-      result = (31 * result) + Internal.hashLong(array[i]);
-    }
-    return result;
-  }
-
-  @Override
-  public LongList mutableCopyWithCapacity(int capacity) {
-    if (capacity < size) {
-      throw new IllegalArgumentException();
-    }
-    return new LongArrayList(Arrays.copyOf(array, capacity), size);
-  }
-
-  @Override
-  public Long get(int index) {
-    return getLong(index);
-  }
-
-  @Override
-  public long getLong(int index) {
-    ensureIndexInRange(index);
-    return array[index];
-  }
-
-  @Override
-  public int indexOf(Object element) {
-    if (!(element instanceof Long)) {
-      return -1;
-    }
-    long unboxedElement = (Long) element;
-    int numElems = size();
-    for (int i = 0; i < numElems; i++) {
-      if (array[i] == unboxedElement) {
-        return i;
-      }
-    }
-    return -1;
-  }
-
-  @Override
-  public boolean contains(Object element) {
-    return indexOf(element) != -1;
-  }
-
-  @Override
-  public int size() {
-    return size;
-  }
-
-  @Override
-  public Long set(int index, Long element) {
-    return setLong(index, element);
-  }
-
-  @Override
-  public long setLong(int index, long element) {
-    ensureIsMutable();
-    ensureIndexInRange(index);
-    long previousValue = array[index];
-    array[index] = element;
-    return previousValue;
-  }
-
-  @Override
-  public boolean add(Long element) {
-    addLong(element);
-    return true;
-  }
-
-  @Override
-  public void add(int index, Long element) {
-    addLong(index, element);
-  }
-
-  /** Like {@link #add(Long)} but more efficient in that it doesn't box the element. */
-  @Override
-  public void addLong(long element) {
-    ensureIsMutable();
-    if (size == array.length) {
-      // Resize to 1.5x the size
-      int length = ((size * 3) / 2) + 1;
-      long[] newArray = new long[length];
-
-      System.arraycopy(array, 0, newArray, 0, size);
-      array = newArray;
-    }
-
-    array[size++] = element;
-  }
-
-  /** Like {@link #add(int, Long)} but more efficient in that it doesn't box the element. */
-  private void addLong(int index, long element) {
-    ensureIsMutable();
-    if (index < 0 || index > size) {
-      throw new IndexOutOfBoundsException(makeOutOfBoundsExceptionMessage(index));
-    }
-
-    if (size < array.length) {
-      // Shift everything over to make room
-      System.arraycopy(array, index, array, index + 1, size - index);
-    } else {
-      // Resize to 1.5x the size
-      int length = ((size * 3) / 2) + 1;
-      long[] newArray = new long[length];
-
-      // Copy the first part directly
-      System.arraycopy(array, 0, newArray, 0, index);
-
-      // Copy the rest shifted over by one to make room
-      System.arraycopy(array, index, newArray, index + 1, size - index);
-      array = newArray;
-    }
-
-    array[index] = element;
-    size++;
-    modCount++;
-  }
-
-  @Override
-  public boolean addAll(Collection<? extends Long> collection) {
-    ensureIsMutable();
-
-    checkNotNull(collection);
-
-    // We specialize when adding another LongArrayList to avoid boxing elements.
-    if (!(collection instanceof LongArrayList)) {
-      return super.addAll(collection);
-    }
-
-    LongArrayList list = (LongArrayList) collection;
-    if (list.size == 0) {
-      return false;
-    }
-
-    int overflow = Integer.MAX_VALUE - size;
-    if (overflow < list.size) {
-      // We can't actually represent a list this large.
-      throw new OutOfMemoryError();
-    }
-
-    int newSize = size + list.size;
-    if (newSize > array.length) {
-      array = Arrays.copyOf(array, newSize);
-    }
-
-    System.arraycopy(list.array, 0, array, size, list.size);
-    size = newSize;
-    modCount++;
-    return true;
-  }
-
-  @Override
-  public Long remove(int index) {
-    ensureIsMutable();
-    ensureIndexInRange(index);
-    long value = array[index];
-    if (index < size - 1) {
-      System.arraycopy(array, index + 1, array, index, size - index - 1);
-    }
-    size--;
-    modCount++;
-    return value;
-  }
-
-  /**
-   * Ensures that the provided {@code index} is within the range of {@code [0, size]}. Throws an
-   * {@link IndexOutOfBoundsException} if it is not.
-   *
-   * @param index the index to verify is in range
-   */
-  private void ensureIndexInRange(int index) {
-    if (index < 0 || index >= size) {
-      throw new IndexOutOfBoundsException(makeOutOfBoundsExceptionMessage(index));
-    }
-  }
-
-  private String makeOutOfBoundsExceptionMessage(int index) {
-    return "Index:" + index + ", Size:" + size;
-  }
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/ManifestSchemaFactory.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/ManifestSchemaFactory.java
deleted file mode 100644
index cbd39f5..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/ManifestSchemaFactory.java
+++ /dev/null
@@ -1,173 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.protobuf.Internal.checkNotNull;
-
-/**
- * Dynamically generates a manifest-based (i.e. table-based) schema for a given protobuf message.
- */
-@CheckReturnValue
-@ExperimentalApi
-final class ManifestSchemaFactory implements SchemaFactory {
-
-  private final MessageInfoFactory messageInfoFactory;
-
-  public ManifestSchemaFactory() {
-    this(getDefaultMessageInfoFactory());
-  }
-
-  private ManifestSchemaFactory(MessageInfoFactory messageInfoFactory) {
-    this.messageInfoFactory = checkNotNull(messageInfoFactory, "messageInfoFactory");
-  }
-
-  @Override
-  public <T> Schema<T> createSchema(Class<T> messageType) {
-    SchemaUtil.requireGeneratedMessage(messageType);
-
-    MessageInfo messageInfo = messageInfoFactory.messageInfoFor(messageType);
-
-    // MessageSet has a special schema.
-    if (messageInfo.isMessageSetWireFormat()) {
-      if (GeneratedMessageLite.class.isAssignableFrom(messageType)) {
-        return MessageSetSchema.newSchema(
-            SchemaUtil.unknownFieldSetLiteSchema(),
-            ExtensionSchemas.lite(),
-            messageInfo.getDefaultInstance());
-      }
-      return MessageSetSchema.newSchema(
-          SchemaUtil.proto2UnknownFieldSetSchema(),
-          ExtensionSchemas.full(),
-          messageInfo.getDefaultInstance());
-    }
-
-    return newSchema(messageType, messageInfo);
-  }
-
-  private static <T> Schema<T> newSchema(Class<T> messageType, MessageInfo messageInfo) {
-    if (GeneratedMessageLite.class.isAssignableFrom(messageType)) {
-      return isProto2(messageInfo)
-          ? MessageSchema.newSchema(
-              messageType,
-              messageInfo,
-              NewInstanceSchemas.lite(),
-              ListFieldSchema.lite(),
-              SchemaUtil.unknownFieldSetLiteSchema(),
-              ExtensionSchemas.lite(),
-              MapFieldSchemas.lite())
-          : MessageSchema.newSchema(
-              messageType,
-              messageInfo,
-              NewInstanceSchemas.lite(),
-              ListFieldSchema.lite(),
-              SchemaUtil.unknownFieldSetLiteSchema(),
-              /* extensionSchema= */ null,
-              MapFieldSchemas.lite());
-    }
-    return isProto2(messageInfo)
-        ? MessageSchema.newSchema(
-            messageType,
-            messageInfo,
-            NewInstanceSchemas.full(),
-            ListFieldSchema.full(),
-            SchemaUtil.proto2UnknownFieldSetSchema(),
-            ExtensionSchemas.full(),
-            MapFieldSchemas.full())
-        : MessageSchema.newSchema(
-            messageType,
-            messageInfo,
-            NewInstanceSchemas.full(),
-            ListFieldSchema.full(),
-            SchemaUtil.proto3UnknownFieldSetSchema(),
-            /* extensionSchema= */ null,
-            MapFieldSchemas.full());
-  }
-
-  private static boolean isProto2(MessageInfo messageInfo) {
-    return messageInfo.getSyntax() == ProtoSyntax.PROTO2;
-  }
-
-  private static MessageInfoFactory getDefaultMessageInfoFactory() {
-    return new CompositeMessageInfoFactory(
-        GeneratedMessageInfoFactory.getInstance(), getDescriptorMessageInfoFactory());
-  }
-
-  private static class CompositeMessageInfoFactory implements MessageInfoFactory {
-    private MessageInfoFactory[] factories;
-
-    CompositeMessageInfoFactory(MessageInfoFactory... factories) {
-      this.factories = factories;
-    }
-
-    @Override
-    public boolean isSupported(Class<?> clazz) {
-      for (MessageInfoFactory factory : factories) {
-        if (factory.isSupported(clazz)) {
-          return true;
-        }
-      }
-      return false;
-    }
-
-    @Override
-    public MessageInfo messageInfoFor(Class<?> clazz) {
-      for (MessageInfoFactory factory : factories) {
-        if (factory.isSupported(clazz)) {
-          return factory.messageInfoFor(clazz);
-        }
-      }
-      throw new UnsupportedOperationException(
-          "No factory is available for message type: " + clazz.getName());
-    }
-  }
-
-  private static final MessageInfoFactory EMPTY_FACTORY =
-      new MessageInfoFactory() {
-        @Override
-        public boolean isSupported(Class<?> clazz) {
-          return false;
-        }
-
-        @Override
-        public MessageInfo messageInfoFor(Class<?> clazz) {
-          throw new IllegalStateException("This should never be called.");
-        }
-      };
-
-  private static MessageInfoFactory getDescriptorMessageInfoFactory() {
-    try {
-      Class<?> clazz = Class.forName("com.google.protobuf.DescriptorMessageInfoFactory");
-      return (MessageInfoFactory) clazz.getDeclaredMethod("getInstance").invoke(null);
-    } catch (Exception e) {
-      return EMPTY_FACTORY;
-    }
-  }
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/MapEntry.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/MapEntry.java
deleted file mode 100644
index 8890f22..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/MapEntry.java
+++ /dev/null
@@ -1,460 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import com.google.protobuf.Descriptors.Descriptor;
-import com.google.protobuf.Descriptors.EnumValueDescriptor;
-import com.google.protobuf.Descriptors.FieldDescriptor;
-import java.io.IOException;
-import java.util.Collections;
-import java.util.Map;
-import java.util.TreeMap;
-
-/**
- * Implements MapEntry messages.
- *
- * <p>In reflection API, map fields will be treated as repeated message fields and each map entry is
- * accessed as a message. This MapEntry class is used to represent these map entry messages in
- * reflection API.
- *
- * <p>Protobuf internal. Users shouldn't use this class.
- */
-public final class MapEntry<K, V> extends AbstractMessage {
-
-  private static final class Metadata<K, V> extends MapEntryLite.Metadata<K, V> {
-
-    public final Descriptor descriptor;
-    public final Parser<MapEntry<K, V>> parser;
-
-    public Metadata(
-        Descriptor descriptor,
-        MapEntry<K, V> defaultInstance,
-        WireFormat.FieldType keyType,
-        WireFormat.FieldType valueType) {
-      super(keyType, defaultInstance.key, valueType, defaultInstance.value);
-      this.descriptor = descriptor;
-      this.parser =
-          new AbstractParser<MapEntry<K, V>>() {
-
-            @Override
-            public MapEntry<K, V> parsePartialFrom(
-                CodedInputStream input, ExtensionRegistryLite extensionRegistry)
-                throws InvalidProtocolBufferException {
-              return new MapEntry<K, V>(Metadata.this, input, extensionRegistry);
-            }
-          };
-    }
-  }
-
-  private final K key;
-  private final V value;
-  private final Metadata<K, V> metadata;
-
-  /** Create a default MapEntry instance. */
-  private MapEntry(
-      Descriptor descriptor,
-      WireFormat.FieldType keyType,
-      K defaultKey,
-      WireFormat.FieldType valueType,
-      V defaultValue) {
-    this.key = defaultKey;
-    this.value = defaultValue;
-    this.metadata = new Metadata<K, V>(descriptor, this, keyType, valueType);
-  }
-
-  /** Create a MapEntry with the provided key and value. */
-  @SuppressWarnings("unchecked")
-  private MapEntry(Metadata metadata, K key, V value) {
-    this.key = key;
-    this.value = value;
-    this.metadata = metadata;
-  }
-
-  /** Parsing constructor. */
-  private MapEntry(
-      Metadata<K, V> metadata, CodedInputStream input, ExtensionRegistryLite extensionRegistry)
-      throws InvalidProtocolBufferException {
-    try {
-      this.metadata = metadata;
-      Map.Entry<K, V> entry = MapEntryLite.parseEntry(input, metadata, extensionRegistry);
-      this.key = entry.getKey();
-      this.value = entry.getValue();
-    } catch (InvalidProtocolBufferException e) {
-      throw e.setUnfinishedMessage(this);
-    } catch (IOException e) {
-      throw new InvalidProtocolBufferException(e).setUnfinishedMessage(this);
-    }
-  }
-
-  /**
-   * Create a default MapEntry instance. A default MapEntry instance should be created only once for
-   * each map entry message type. Generated code should store the created default instance and use
-   * it later to create new MapEntry messages of the same type.
-   */
-  public static <K, V> MapEntry<K, V> newDefaultInstance(
-      Descriptor descriptor,
-      WireFormat.FieldType keyType,
-      K defaultKey,
-      WireFormat.FieldType valueType,
-      V defaultValue) {
-    return new MapEntry<K, V>(descriptor, keyType, defaultKey, valueType, defaultValue);
-  }
-
-  public K getKey() {
-    return key;
-  }
-
-  public V getValue() {
-    return value;
-  }
-
-  private volatile int cachedSerializedSize = -1;
-
-  @Override
-  public int getSerializedSize() {
-    if (cachedSerializedSize != -1) {
-      return cachedSerializedSize;
-    }
-
-    int size = MapEntryLite.computeSerializedSize(metadata, key, value);
-    cachedSerializedSize = size;
-    return size;
-  }
-
-  @Override
-  public void writeTo(CodedOutputStream output) throws IOException {
-    MapEntryLite.writeTo(output, metadata, key, value);
-  }
-
-  @Override
-  public boolean isInitialized() {
-    return isInitialized(metadata, value);
-  }
-
-  @Override
-  public Parser<MapEntry<K, V>> getParserForType() {
-    return metadata.parser;
-  }
-
-  @Override
-  public Builder<K, V> newBuilderForType() {
-    return new Builder<K, V>(metadata);
-  }
-
-  @Override
-  public Builder<K, V> toBuilder() {
-    return new Builder<K, V>(metadata, key, value, true, true);
-  }
-
-  @Override
-  public MapEntry<K, V> getDefaultInstanceForType() {
-    return new MapEntry<K, V>(metadata, metadata.defaultKey, metadata.defaultValue);
-  }
-
-  @Override
-  public Descriptor getDescriptorForType() {
-    return metadata.descriptor;
-  }
-
-  @Override
-  public Map<FieldDescriptor, Object> getAllFields() {
-    TreeMap<FieldDescriptor, Object> result = new TreeMap<FieldDescriptor, Object>();
-    for (final FieldDescriptor field : metadata.descriptor.getFields()) {
-      if (hasField(field)) {
-        result.put(field, getField(field));
-      }
-    }
-    return Collections.unmodifiableMap(result);
-  }
-
-  private void checkFieldDescriptor(FieldDescriptor field) {
-    if (field.getContainingType() != metadata.descriptor) {
-      throw new RuntimeException(
-          "Wrong FieldDescriptor \""
-              + field.getFullName()
-              + "\" used in message \""
-              + metadata.descriptor.getFullName());
-    }
-  }
-
-  @Override
-  public boolean hasField(FieldDescriptor field) {
-    checkFieldDescriptor(field);
-    ;
-    // A MapEntry always contains two fields.
-    return true;
-  }
-
-  @Override
-  public Object getField(FieldDescriptor field) {
-    checkFieldDescriptor(field);
-    Object result = field.getNumber() == 1 ? getKey() : getValue();
-    // Convert enums to EnumValueDescriptor.
-    if (field.getType() == FieldDescriptor.Type.ENUM) {
-      result = field.getEnumType().findValueByNumberCreatingIfUnknown((java.lang.Integer) result);
-    }
-    return result;
-  }
-
-  @Override
-  public int getRepeatedFieldCount(FieldDescriptor field) {
-    throw new RuntimeException("There is no repeated field in a map entry message.");
-  }
-
-  @Override
-  public Object getRepeatedField(FieldDescriptor field, int index) {
-    throw new RuntimeException("There is no repeated field in a map entry message.");
-  }
-
-  @Override
-  public UnknownFieldSet getUnknownFields() {
-    return UnknownFieldSet.getDefaultInstance();
-  }
-
-  /** Builder to create {@link MapEntry} messages. */
-  public static class Builder<K, V> extends AbstractMessage.Builder<Builder<K, V>> {
-    private final Metadata<K, V> metadata;
-    private K key;
-    private V value;
-    private boolean hasKey;
-    private boolean hasValue;
-
-    private Builder(Metadata<K, V> metadata) {
-      this(metadata, metadata.defaultKey, metadata.defaultValue, false, false);
-    }
-
-    private Builder(Metadata<K, V> metadata, K key, V value, boolean hasKey, boolean hasValue) {
-      this.metadata = metadata;
-      this.key = key;
-      this.value = value;
-      this.hasKey = hasKey;
-      this.hasValue = hasValue;
-    }
-
-    public K getKey() {
-      return key;
-    }
-
-    public V getValue() {
-      return value;
-    }
-
-    public Builder<K, V> setKey(K key) {
-      this.key = key;
-      this.hasKey = true;
-      return this;
-    }
-
-    public Builder<K, V> clearKey() {
-      this.key = metadata.defaultKey;
-      this.hasKey = false;
-      return this;
-    }
-
-    public Builder<K, V> setValue(V value) {
-      this.value = value;
-      this.hasValue = true;
-      return this;
-    }
-
-    public Builder<K, V> clearValue() {
-      this.value = metadata.defaultValue;
-      this.hasValue = false;
-      return this;
-    }
-
-    @Override
-    public MapEntry<K, V> build() {
-      MapEntry<K, V> result = buildPartial();
-      if (!result.isInitialized()) {
-        throw newUninitializedMessageException(result);
-      }
-      return result;
-    }
-
-    @Override
-    public MapEntry<K, V> buildPartial() {
-      return new MapEntry<K, V>(metadata, key, value);
-    }
-
-    @Override
-    public Descriptor getDescriptorForType() {
-      return metadata.descriptor;
-    }
-
-    private void checkFieldDescriptor(FieldDescriptor field) {
-      if (field.getContainingType() != metadata.descriptor) {
-        throw new RuntimeException(
-            "Wrong FieldDescriptor \""
-                + field.getFullName()
-                + "\" used in message \""
-                + metadata.descriptor.getFullName());
-      }
-    }
-
-    @Override
-    public Message.Builder newBuilderForField(FieldDescriptor field) {
-      checkFieldDescriptor(field);
-      ;
-      // This method should be called for message fields and in a MapEntry
-      // message only the value field can possibly be a message field.
-      if (field.getNumber() != 2 || field.getJavaType() != FieldDescriptor.JavaType.MESSAGE) {
-        throw new RuntimeException("\"" + field.getFullName() + "\" is not a message value field.");
-      }
-      return ((Message) value).newBuilderForType();
-    }
-
-    @SuppressWarnings("unchecked")
-    @Override
-    public Builder<K, V> setField(FieldDescriptor field, Object value) {
-      checkFieldDescriptor(field);
-      if (value == null) {
-        throw new NullPointerException(field.getFullName() + " is null");
-      }
-
-      if (field.getNumber() == 1) {
-        setKey((K) value);
-      } else {
-        if (field.getType() == FieldDescriptor.Type.ENUM) {
-          value = ((EnumValueDescriptor) value).getNumber();
-        } else if (field.getType() == FieldDescriptor.Type.MESSAGE) {
-          if (!metadata.defaultValue.getClass().isInstance(value)) {
-            // The value is not the exact right message type.  However, if it
-            // is an alternative implementation of the same type -- e.g. a
-            // DynamicMessage -- we should accept it.  In this case we can make
-            // a copy of the message.
-            value =
-                ((Message) metadata.defaultValue).toBuilder().mergeFrom((Message) value).build();
-          }
-        }
-        setValue((V) value);
-      }
-      return this;
-    }
-
-    @Override
-    public Builder<K, V> clearField(FieldDescriptor field) {
-      checkFieldDescriptor(field);
-      if (field.getNumber() == 1) {
-        clearKey();
-      } else {
-        clearValue();
-      }
-      return this;
-    }
-
-    @Override
-    public Builder<K, V> setRepeatedField(FieldDescriptor field, int index, Object value) {
-      throw new RuntimeException("There is no repeated field in a map entry message.");
-    }
-
-    @Override
-    public Builder<K, V> addRepeatedField(FieldDescriptor field, Object value) {
-      throw new RuntimeException("There is no repeated field in a map entry message.");
-    }
-
-    @Override
-    public Builder<K, V> setUnknownFields(UnknownFieldSet unknownFields) {
-      // Unknown fields are discarded for MapEntry message.
-      return this;
-    }
-
-    @Override
-    public MapEntry<K, V> getDefaultInstanceForType() {
-      return new MapEntry<K, V>(metadata, metadata.defaultKey, metadata.defaultValue);
-    }
-
-    @Override
-    public boolean isInitialized() {
-      return MapEntry.isInitialized(metadata, value);
-    }
-
-    @Override
-    public Map<FieldDescriptor, Object> getAllFields() {
-      final TreeMap<FieldDescriptor, Object> result = new TreeMap<FieldDescriptor, Object>();
-      for (final FieldDescriptor field : metadata.descriptor.getFields()) {
-        if (hasField(field)) {
-          result.put(field, getField(field));
-        }
-      }
-      return Collections.unmodifiableMap(result);
-    }
-
-    @Override
-    public boolean hasField(FieldDescriptor field) {
-      checkFieldDescriptor(field);
-      return field.getNumber() == 1 ? hasKey : hasValue;
-    }
-
-    @Override
-    public Object getField(FieldDescriptor field) {
-      checkFieldDescriptor(field);
-      Object result = field.getNumber() == 1 ? getKey() : getValue();
-      // Convert enums to EnumValueDescriptor.
-      if (field.getType() == FieldDescriptor.Type.ENUM) {
-        result = field.getEnumType().findValueByNumberCreatingIfUnknown((Integer) result);
-      }
-      return result;
-    }
-
-    @Override
-    public int getRepeatedFieldCount(FieldDescriptor field) {
-      throw new RuntimeException("There is no repeated field in a map entry message.");
-    }
-
-    @Override
-    public Object getRepeatedField(FieldDescriptor field, int index) {
-      throw new RuntimeException("There is no repeated field in a map entry message.");
-    }
-
-    @Override
-    public UnknownFieldSet getUnknownFields() {
-      return UnknownFieldSet.getDefaultInstance();
-    }
-
-    @Override
-    public Builder<K, V> clone() {
-      return new Builder<>(metadata, key, value, hasKey, hasValue);
-    }
-  }
-
-  private static <V> boolean isInitialized(Metadata metadata, V value) {
-    if (metadata.valueType.getJavaType() == WireFormat.JavaType.MESSAGE) {
-      return ((MessageLite) value).isInitialized();
-    }
-    return true;
-  }
-
-  /** Returns the metadata only for experimental runtime. */
-  final Metadata<K, V> getMetadata() {
-    return metadata;
-  }
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/MapEntryLite.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/MapEntryLite.java
deleted file mode 100644
index 81bf4c2..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/MapEntryLite.java
+++ /dev/null
@@ -1,231 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import java.io.IOException;
-import java.util.AbstractMap;
-import java.util.Map;
-
-/**
- * Implements the lite version of map entry messages.
- *
- * <p>This class serves as an utility class to help do serialization/parsing of map entries. It's
- * used in generated code and also in the full version MapEntry message.
- *
- * <p>Protobuf internal. Users shouldn't use.
- */
-public class MapEntryLite<K, V> {
-
-  static class Metadata<K, V> {
-    public final WireFormat.FieldType keyType;
-    public final K defaultKey;
-    public final WireFormat.FieldType valueType;
-    public final V defaultValue;
-
-    public Metadata(
-        WireFormat.FieldType keyType,
-        K defaultKey,
-        WireFormat.FieldType valueType,
-        V defaultValue) {
-      this.keyType = keyType;
-      this.defaultKey = defaultKey;
-      this.valueType = valueType;
-      this.defaultValue = defaultValue;
-    }
-  }
-
-  private static final int KEY_FIELD_NUMBER = 1;
-  private static final int VALUE_FIELD_NUMBER = 2;
-
-  private final Metadata<K, V> metadata;
-  private final K key;
-  private final V value;
-
-  /** Creates a default MapEntryLite message instance. */
-  private MapEntryLite(
-      WireFormat.FieldType keyType, K defaultKey, WireFormat.FieldType valueType, V defaultValue) {
-    this.metadata = new Metadata<K, V>(keyType, defaultKey, valueType, defaultValue);
-    this.key = defaultKey;
-    this.value = defaultValue;
-  }
-
-  /** Creates a new MapEntryLite message. */
-  private MapEntryLite(Metadata<K, V> metadata, K key, V value) {
-    this.metadata = metadata;
-    this.key = key;
-    this.value = value;
-  }
-
-  public K getKey() {
-    return key;
-  }
-
-  public V getValue() {
-    return value;
-  }
-
-  /**
-   * Creates a default MapEntryLite message instance.
-   *
-   * <p>This method is used by generated code to create the default instance for a map entry
-   * message. The created default instance should be used to create new map entry messages of the
-   * same type. For each map entry message, only one default instance should be created.
-   */
-  public static <K, V> MapEntryLite<K, V> newDefaultInstance(
-      WireFormat.FieldType keyType, K defaultKey, WireFormat.FieldType valueType, V defaultValue) {
-    return new MapEntryLite<K, V>(keyType, defaultKey, valueType, defaultValue);
-  }
-
-  static <K, V> void writeTo(CodedOutputStream output, Metadata<K, V> metadata, K key, V value)
-      throws IOException {
-    FieldSet.writeElement(output, metadata.keyType, KEY_FIELD_NUMBER, key);
-    FieldSet.writeElement(output, metadata.valueType, VALUE_FIELD_NUMBER, value);
-  }
-
-  static <K, V> int computeSerializedSize(Metadata<K, V> metadata, K key, V value) {
-    return FieldSet.computeElementSize(metadata.keyType, KEY_FIELD_NUMBER, key)
-        + FieldSet.computeElementSize(metadata.valueType, VALUE_FIELD_NUMBER, value);
-  }
-
-  @SuppressWarnings("unchecked")
-  static <T> T parseField(
-      CodedInputStream input,
-      ExtensionRegistryLite extensionRegistry,
-      WireFormat.FieldType type,
-      T value)
-      throws IOException {
-    switch (type) {
-      case MESSAGE:
-        MessageLite.Builder subBuilder = ((MessageLite) value).toBuilder();
-        input.readMessage(subBuilder, extensionRegistry);
-        return (T) subBuilder.buildPartial();
-      case ENUM:
-        return (T) (java.lang.Integer) input.readEnum();
-      case GROUP:
-        throw new RuntimeException("Groups are not allowed in maps.");
-      default:
-        return (T) FieldSet.readPrimitiveField(input, type, true);
-    }
-  }
-
-  /**
-   * Serializes the provided key and value as though they were wrapped by a {@link MapEntryLite} to
-   * the output stream. This helper method avoids allocation of a {@link MapEntryLite} built with a
-   * key and value and is called from generated code directly.
-   */
-  public void serializeTo(CodedOutputStream output, int fieldNumber, K key, V value)
-      throws IOException {
-    output.writeTag(fieldNumber, WireFormat.WIRETYPE_LENGTH_DELIMITED);
-    output.writeUInt32NoTag(computeSerializedSize(metadata, key, value));
-    writeTo(output, metadata, key, value);
-  }
-
-  /**
-   * Computes the message size for the provided key and value as though they were wrapped by a
-   * {@link MapEntryLite}. This helper method avoids allocation of a {@link MapEntryLite} built with
-   * a key and value and is called from generated code directly.
-   */
-  public int computeMessageSize(int fieldNumber, K key, V value) {
-    return CodedOutputStream.computeTagSize(fieldNumber)
-        + CodedOutputStream.computeLengthDelimitedFieldSize(
-            computeSerializedSize(metadata, key, value));
-  }
-
-  /**
-   * Parses an entry off of the input as a {@link Map.Entry}. This helper requires an allocation so
-   * using {@link #parseInto} is preferred if possible.
-   */
-  public Map.Entry<K, V> parseEntry(ByteString bytes, ExtensionRegistryLite extensionRegistry)
-      throws IOException {
-    return parseEntry(bytes.newCodedInput(), metadata, extensionRegistry);
-  }
-
-  static <K, V> Map.Entry<K, V> parseEntry(
-      CodedInputStream input, Metadata<K, V> metadata, ExtensionRegistryLite extensionRegistry)
-      throws IOException {
-    K key = metadata.defaultKey;
-    V value = metadata.defaultValue;
-    while (true) {
-      int tag = input.readTag();
-      if (tag == 0) {
-        break;
-      }
-      if (tag == WireFormat.makeTag(KEY_FIELD_NUMBER, metadata.keyType.getWireType())) {
-        key = parseField(input, extensionRegistry, metadata.keyType, key);
-      } else if (tag == WireFormat.makeTag(VALUE_FIELD_NUMBER, metadata.valueType.getWireType())) {
-        value = parseField(input, extensionRegistry, metadata.valueType, value);
-      } else {
-        if (!input.skipField(tag)) {
-          break;
-        }
-      }
-    }
-    return new AbstractMap.SimpleImmutableEntry<K, V>(key, value);
-  }
-
-  /**
-   * Parses an entry off of the input into the map. This helper avoids allocation of a {@link
-   * MapEntryLite} by parsing directly into the provided {@link MapFieldLite}.
-   */
-  public void parseInto(
-      MapFieldLite<K, V> map, CodedInputStream input, ExtensionRegistryLite extensionRegistry)
-      throws IOException {
-    int length = input.readRawVarint32();
-    final int oldLimit = input.pushLimit(length);
-    K key = metadata.defaultKey;
-    V value = metadata.defaultValue;
-
-    while (true) {
-      int tag = input.readTag();
-      if (tag == 0) {
-        break;
-      }
-      if (tag == WireFormat.makeTag(KEY_FIELD_NUMBER, metadata.keyType.getWireType())) {
-        key = parseField(input, extensionRegistry, metadata.keyType, key);
-      } else if (tag == WireFormat.makeTag(VALUE_FIELD_NUMBER, metadata.valueType.getWireType())) {
-        value = parseField(input, extensionRegistry, metadata.valueType, value);
-      } else {
-        if (!input.skipField(tag)) {
-          break;
-        }
-      }
-    }
-
-    input.checkLastTagWas(0);
-    input.popLimit(oldLimit);
-    map.put(key, value);
-  }
-
-  /** For experimental runtime internal use only. */
-  Metadata<K, V> getMetadata() {
-    return metadata;
-  }
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/MapField.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/MapField.java
deleted file mode 100644
index 2fe8867..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/MapField.java
+++ /dev/null
@@ -1,615 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.protobuf.Internal.checkNotNull;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * Internal representation of map fields in generated messages.
- *
- * <p>This class supports accessing the map field as a {@link Map} to be used in generated API and
- * also supports accessing the field as a {@link List} to be used in reflection API. It keeps track
- * of where the data is currently stored and do necessary conversions between map and list.
- *
- * <p>This class is a protobuf implementation detail. Users shouldn't use this class directly.
- *
- * <p>THREAD-SAFETY NOTE: Read-only access is thread-safe. Users can call getMap() and getList()
- * concurrently in multiple threads. If write-access is needed, all access must be synchronized.
- */
-public class MapField<K, V> implements MutabilityOracle {
-
-  /**
-   * Indicates where the data of this map field is currently stored.
-   *
-   * <ul>
-   *   <li>MAP: Data is stored in mapData.
-   *   <li>LIST: Data is stored in listData.
-   *   <li>BOTH: mapData and listData have the same data.
-   * </ul>
-   *
-   * <p>When the map field is accessed (through generated API or reflection API), it will shift
-   * between these 3 modes:
-   *
-   * <pre>
-   *          <b>getMap()   getList()    getMutableMap()   getMutableList()</b>
-   * <b>MAP</b>      MAP        BOTH         MAP               LIST
-   * <b>LIST</b>     BOTH       LIST         MAP               LIST
-   * <b>BOTH</b>     BOTH       BOTH         MAP               LIST
-   * </pre>
-   *
-   * <p>As the map field changes its mode, the list/map reference returned in a previous method call
-   * may be invalidated.
-   */
-  private enum StorageMode {
-    MAP,
-    LIST,
-    BOTH
-  }
-
-  private volatile boolean isMutable;
-  private volatile StorageMode mode;
-  private MutabilityAwareMap<K, V> mapData;
-  private List<Message> listData;
-
-  // Convert between a map entry Message and a key-value pair.
-  private static interface Converter<K, V> {
-    Message convertKeyAndValueToMessage(K key, V value);
-
-    void convertMessageToKeyAndValue(Message message, Map<K, V> map);
-
-    Message getMessageDefaultInstance();
-  }
-
-  private static class ImmutableMessageConverter<K, V> implements Converter<K, V> {
-    private final MapEntry<K, V> defaultEntry;
-
-    public ImmutableMessageConverter(MapEntry<K, V> defaultEntry) {
-      this.defaultEntry = defaultEntry;
-    }
-
-    @Override
-    public Message convertKeyAndValueToMessage(K key, V value) {
-      return defaultEntry.newBuilderForType().setKey(key).setValue(value).buildPartial();
-    }
-
-    @Override
-    @SuppressWarnings("unchecked")
-    public void convertMessageToKeyAndValue(Message message, Map<K, V> map) {
-      MapEntry<K, V> entry = (MapEntry<K, V>) message;
-      map.put(entry.getKey(), entry.getValue());
-    }
-
-    @Override
-    public Message getMessageDefaultInstance() {
-      return defaultEntry;
-    }
-  }
-
-
-  private final Converter<K, V> converter;
-
-  private MapField(Converter<K, V> converter, StorageMode mode, Map<K, V> mapData) {
-    this.converter = converter;
-    this.isMutable = true;
-    this.mode = mode;
-    this.mapData = new MutabilityAwareMap<K, V>(this, mapData);
-    this.listData = null;
-  }
-
-  private MapField(MapEntry<K, V> defaultEntry, StorageMode mode, Map<K, V> mapData) {
-    this(new ImmutableMessageConverter<K, V>(defaultEntry), mode, mapData);
-  }
-
-
-  /** Returns an immutable empty MapField. */
-  public static <K, V> MapField<K, V> emptyMapField(MapEntry<K, V> defaultEntry) {
-    return new MapField<K, V>(defaultEntry, StorageMode.MAP, Collections.<K, V>emptyMap());
-  }
-
-
-  /** Creates a new mutable empty MapField. */
-  public static <K, V> MapField<K, V> newMapField(MapEntry<K, V> defaultEntry) {
-    return new MapField<K, V>(defaultEntry, StorageMode.MAP, new LinkedHashMap<K, V>());
-  }
-
-
-  private Message convertKeyAndValueToMessage(K key, V value) {
-    return converter.convertKeyAndValueToMessage(key, value);
-  }
-
-  private void convertMessageToKeyAndValue(Message message, Map<K, V> map) {
-    converter.convertMessageToKeyAndValue(message, map);
-  }
-
-  private List<Message> convertMapToList(MutabilityAwareMap<K, V> mapData) {
-    List<Message> listData = new ArrayList<Message>();
-    for (Map.Entry<K, V> entry : mapData.entrySet()) {
-      listData.add(convertKeyAndValueToMessage(entry.getKey(), entry.getValue()));
-    }
-    return listData;
-  }
-
-  private MutabilityAwareMap<K, V> convertListToMap(List<Message> listData) {
-    Map<K, V> mapData = new LinkedHashMap<K, V>();
-    for (Message item : listData) {
-      convertMessageToKeyAndValue(item, mapData);
-    }
-    return new MutabilityAwareMap<K, V>(this, mapData);
-  }
-
-  /** Returns the content of this MapField as a read-only Map. */
-  public Map<K, V> getMap() {
-    if (mode == StorageMode.LIST) {
-      synchronized (this) {
-        if (mode == StorageMode.LIST) {
-          mapData = convertListToMap(listData);
-          mode = StorageMode.BOTH;
-        }
-      }
-    }
-    return Collections.unmodifiableMap(mapData);
-  }
-
-  /** Gets a mutable Map view of this MapField. */
-  public Map<K, V> getMutableMap() {
-    if (mode != StorageMode.MAP) {
-      if (mode == StorageMode.LIST) {
-        mapData = convertListToMap(listData);
-      }
-      listData = null;
-      mode = StorageMode.MAP;
-    }
-    return mapData;
-  }
-
-  public void mergeFrom(MapField<K, V> other) {
-    getMutableMap().putAll(MapFieldLite.copy(other.getMap()));
-  }
-
-  public void clear() {
-    mapData = new MutabilityAwareMap<K, V>(this, new LinkedHashMap<K, V>());
-    mode = StorageMode.MAP;
-  }
-
-  @SuppressWarnings("unchecked")
-  @Override
-  public boolean equals(Object object) {
-    if (!(object instanceof MapField)) {
-      return false;
-    }
-    MapField<K, V> other = (MapField<K, V>) object;
-    return MapFieldLite.<K, V>equals(getMap(), other.getMap());
-  }
-
-  @Override
-  public int hashCode() {
-    return MapFieldLite.<K, V>calculateHashCodeForMap(getMap());
-  }
-
-  /** Returns a deep copy of this MapField. */
-  public MapField<K, V> copy() {
-    return new MapField<K, V>(converter, StorageMode.MAP, MapFieldLite.copy(getMap()));
-  }
-
-  /** Gets the content of this MapField as a read-only List. */
-  List<Message> getList() {
-    if (mode == StorageMode.MAP) {
-      synchronized (this) {
-        if (mode == StorageMode.MAP) {
-          listData = convertMapToList(mapData);
-          mode = StorageMode.BOTH;
-        }
-      }
-    }
-    return Collections.unmodifiableList(listData);
-  }
-
-  /** Gets a mutable List view of this MapField. */
-  List<Message> getMutableList() {
-    if (mode != StorageMode.LIST) {
-      if (mode == StorageMode.MAP) {
-        listData = convertMapToList(mapData);
-      }
-      mapData = null;
-      mode = StorageMode.LIST;
-    }
-    return listData;
-  }
-
-  /** Gets the default instance of the message stored in the list view of this map field. */
-  Message getMapEntryMessageDefaultInstance() {
-    return converter.getMessageDefaultInstance();
-  }
-
-  /**
-   * Makes this list immutable. All subsequent modifications will throw an {@link
-   * UnsupportedOperationException}.
-   */
-  public void makeImmutable() {
-    isMutable = false;
-  }
-
-  /** Returns whether this field can be modified. */
-  public boolean isMutable() {
-    return isMutable;
-  }
-
-  /* (non-Javadoc)
-   * @see com.google.protobuf.MutabilityOracle#ensureMutable()
-   */
-  @Override
-  public void ensureMutable() {
-    if (!isMutable()) {
-      throw new UnsupportedOperationException();
-    }
-  }
-
-  /** An internal map that checks for mutability before delegating. */
-  private static class MutabilityAwareMap<K, V> implements Map<K, V> {
-    private final MutabilityOracle mutabilityOracle;
-    private final Map<K, V> delegate;
-
-    MutabilityAwareMap(MutabilityOracle mutabilityOracle, Map<K, V> delegate) {
-      this.mutabilityOracle = mutabilityOracle;
-      this.delegate = delegate;
-    }
-
-    @Override
-    public int size() {
-      return delegate.size();
-    }
-
-    @Override
-    public boolean isEmpty() {
-      return delegate.isEmpty();
-    }
-
-    @Override
-    public boolean containsKey(Object key) {
-      return delegate.containsKey(key);
-    }
-
-    @Override
-    public boolean containsValue(Object value) {
-      return delegate.containsValue(value);
-    }
-
-    @Override
-    public V get(Object key) {
-      return delegate.get(key);
-    }
-
-    @Override
-    public V put(K key, V value) {
-      mutabilityOracle.ensureMutable();
-      checkNotNull(key);
-      checkNotNull(value);
-      return delegate.put(key, value);
-    }
-
-    @Override
-    public V remove(Object key) {
-      mutabilityOracle.ensureMutable();
-      return delegate.remove(key);
-    }
-
-    @Override
-    public void putAll(Map<? extends K, ? extends V> m) {
-      mutabilityOracle.ensureMutable();
-      for (K key : m.keySet()) {
-        checkNotNull(key);
-        checkNotNull(m.get(key));
-      }
-      delegate.putAll(m);
-    }
-
-    @Override
-    public void clear() {
-      mutabilityOracle.ensureMutable();
-      delegate.clear();
-    }
-
-    @Override
-    public Set<K> keySet() {
-      return new MutabilityAwareSet<K>(mutabilityOracle, delegate.keySet());
-    }
-
-    @Override
-    public Collection<V> values() {
-      return new MutabilityAwareCollection<V>(mutabilityOracle, delegate.values());
-    }
-
-    @Override
-    public Set<java.util.Map.Entry<K, V>> entrySet() {
-      return new MutabilityAwareSet<Entry<K, V>>(mutabilityOracle, delegate.entrySet());
-    }
-
-    @Override
-    public boolean equals(Object o) {
-      return delegate.equals(o);
-    }
-
-    @Override
-    public int hashCode() {
-      return delegate.hashCode();
-    }
-
-    @Override
-    public String toString() {
-      return delegate.toString();
-    }
-
-    /** An internal collection that checks for mutability before delegating. */
-    private static class MutabilityAwareCollection<E> implements Collection<E> {
-      private final MutabilityOracle mutabilityOracle;
-      private final Collection<E> delegate;
-
-      MutabilityAwareCollection(MutabilityOracle mutabilityOracle, Collection<E> delegate) {
-        this.mutabilityOracle = mutabilityOracle;
-        this.delegate = delegate;
-      }
-
-      @Override
-      public int size() {
-        return delegate.size();
-      }
-
-      @Override
-      public boolean isEmpty() {
-        return delegate.isEmpty();
-      }
-
-      @Override
-      public boolean contains(Object o) {
-        return delegate.contains(o);
-      }
-
-      @Override
-      public Iterator<E> iterator() {
-        return new MutabilityAwareIterator<E>(mutabilityOracle, delegate.iterator());
-      }
-
-      @Override
-      public Object[] toArray() {
-        return delegate.toArray();
-      }
-
-      @Override
-      public <T> T[] toArray(T[] a) {
-        return delegate.toArray(a);
-      }
-
-      @Override
-      public boolean add(E e) {
-        // Unsupported operation in the delegate.
-        throw new UnsupportedOperationException();
-      }
-
-      @Override
-      public boolean remove(Object o) {
-        mutabilityOracle.ensureMutable();
-        return delegate.remove(o);
-      }
-
-      @Override
-      public boolean containsAll(Collection<?> c) {
-        return delegate.containsAll(c);
-      }
-
-      @Override
-      public boolean addAll(Collection<? extends E> c) {
-        // Unsupported operation in the delegate.
-        throw new UnsupportedOperationException();
-      }
-
-      @Override
-      public boolean removeAll(Collection<?> c) {
-        mutabilityOracle.ensureMutable();
-        return delegate.removeAll(c);
-      }
-
-      @Override
-      public boolean retainAll(Collection<?> c) {
-        mutabilityOracle.ensureMutable();
-        return delegate.retainAll(c);
-      }
-
-      @Override
-      public void clear() {
-        mutabilityOracle.ensureMutable();
-        delegate.clear();
-      }
-
-      @Override
-      public boolean equals(Object o) {
-        return delegate.equals(o);
-      }
-
-      @Override
-      public int hashCode() {
-        return delegate.hashCode();
-      }
-
-      @Override
-      public String toString() {
-        return delegate.toString();
-      }
-    }
-
-    /** An internal set that checks for mutability before delegating. */
-    private static class MutabilityAwareSet<E> implements Set<E> {
-      private final MutabilityOracle mutabilityOracle;
-      private final Set<E> delegate;
-
-      MutabilityAwareSet(MutabilityOracle mutabilityOracle, Set<E> delegate) {
-        this.mutabilityOracle = mutabilityOracle;
-        this.delegate = delegate;
-      }
-
-      @Override
-      public int size() {
-        return delegate.size();
-      }
-
-      @Override
-      public boolean isEmpty() {
-        return delegate.isEmpty();
-      }
-
-      @Override
-      public boolean contains(Object o) {
-        return delegate.contains(o);
-      }
-
-      @Override
-      public Iterator<E> iterator() {
-        return new MutabilityAwareIterator<E>(mutabilityOracle, delegate.iterator());
-      }
-
-      @Override
-      public Object[] toArray() {
-        return delegate.toArray();
-      }
-
-      @Override
-      public <T> T[] toArray(T[] a) {
-        return delegate.toArray(a);
-      }
-
-      @Override
-      public boolean add(E e) {
-        mutabilityOracle.ensureMutable();
-        return delegate.add(e);
-      }
-
-      @Override
-      public boolean remove(Object o) {
-        mutabilityOracle.ensureMutable();
-        return delegate.remove(o);
-      }
-
-      @Override
-      public boolean containsAll(Collection<?> c) {
-        return delegate.containsAll(c);
-      }
-
-      @Override
-      public boolean addAll(Collection<? extends E> c) {
-        mutabilityOracle.ensureMutable();
-        return delegate.addAll(c);
-      }
-
-      @Override
-      public boolean retainAll(Collection<?> c) {
-        mutabilityOracle.ensureMutable();
-        return delegate.retainAll(c);
-      }
-
-      @Override
-      public boolean removeAll(Collection<?> c) {
-        mutabilityOracle.ensureMutable();
-        return delegate.removeAll(c);
-      }
-
-      @Override
-      public void clear() {
-        mutabilityOracle.ensureMutable();
-        delegate.clear();
-      }
-
-      @Override
-      public boolean equals(Object o) {
-        return delegate.equals(o);
-      }
-
-      @Override
-      public int hashCode() {
-        return delegate.hashCode();
-      }
-
-      @Override
-      public String toString() {
-        return delegate.toString();
-      }
-    }
-
-    /** An internal iterator that checks for mutability before delegating. */
-    private static class MutabilityAwareIterator<E> implements Iterator<E> {
-      private final MutabilityOracle mutabilityOracle;
-      private final Iterator<E> delegate;
-
-      MutabilityAwareIterator(MutabilityOracle mutabilityOracle, Iterator<E> delegate) {
-        this.mutabilityOracle = mutabilityOracle;
-        this.delegate = delegate;
-      }
-
-      @Override
-      public boolean hasNext() {
-        return delegate.hasNext();
-      }
-
-      @Override
-      public E next() {
-        return delegate.next();
-      }
-
-      @Override
-      public void remove() {
-        mutabilityOracle.ensureMutable();
-        delegate.remove();
-      }
-
-      @Override
-      public boolean equals(Object obj) {
-        return delegate.equals(obj);
-      }
-
-      @Override
-      public int hashCode() {
-        return delegate.hashCode();
-      }
-
-      @Override
-      public String toString() {
-        return delegate.toString();
-      }
-    }
-  }
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/MapFieldLite.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/MapFieldLite.java
deleted file mode 100644
index 72e03d1..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/MapFieldLite.java
+++ /dev/null
@@ -1,233 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.protobuf.Internal.checkNotNull;
-
-import com.google.protobuf.Internal.EnumLite;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * Internal representation of map fields in generated lite-runtime messages.
- *
- * <p>This class is a protobuf implementation detail. Users shouldn't use this class directly.
- */
-public final class MapFieldLite<K, V> extends LinkedHashMap<K, V> {
-
-  private boolean isMutable;
-
-  private MapFieldLite() {
-    this.isMutable = true;
-  }
-
-  private MapFieldLite(Map<K, V> mapData) {
-    super(mapData);
-    this.isMutable = true;
-  }
-
-  private static final MapFieldLite<?, ?> EMPTY_MAP_FIELD = new MapFieldLite<>();
-
-  static {
-    EMPTY_MAP_FIELD.makeImmutable();
-  }
-
-  /** Returns a singleton immutable empty MapFieldLite instance. */
-  @SuppressWarnings("unchecked")
-  public static <K, V> MapFieldLite<K, V> emptyMapField() {
-    return (MapFieldLite<K, V>) EMPTY_MAP_FIELD;
-  }
-
-  public void mergeFrom(MapFieldLite<K, V> other) {
-    ensureMutable();
-    if (!other.isEmpty()) {
-      putAll(other);
-    }
-  }
-
-  @Override
-  public Set<Map.Entry<K, V>> entrySet() {
-    return isEmpty() ? Collections.<Map.Entry<K, V>>emptySet() : super.entrySet();
-  }
-
-  @Override
-  public void clear() {
-    ensureMutable();
-    super.clear();
-  }
-
-  @Override
-  public V put(K key, V value) {
-    ensureMutable();
-    checkNotNull(key);
-
-    checkNotNull(value);
-    return super.put(key, value);
-  }
-
-  public V put(Map.Entry<K, V> entry) {
-    return put(entry.getKey(), entry.getValue());
-  }
-
-  @Override
-  public void putAll(Map<? extends K, ? extends V> m) {
-    ensureMutable();
-    checkForNullKeysAndValues(m);
-    super.putAll(m);
-  }
-
-  @Override
-  public V remove(Object key) {
-    ensureMutable();
-    return super.remove(key);
-  }
-
-  private static void checkForNullKeysAndValues(Map<?, ?> m) {
-    for (Object key : m.keySet()) {
-      checkNotNull(key);
-      checkNotNull(m.get(key));
-    }
-  }
-
-  private static boolean equals(Object a, Object b) {
-    if (a instanceof byte[] && b instanceof byte[]) {
-      return Arrays.equals((byte[]) a, (byte[]) b);
-    }
-    return a.equals(b);
-  }
-
-  /**
-   * Checks whether two {@link Map}s are equal. We don't use the default equals method of {@link
-   * Map} because it compares by identity not by content for byte arrays.
-   */
-  static <K, V> boolean equals(Map<K, V> a, Map<K, V> b) {
-    if (a == b) {
-      return true;
-    }
-    if (a.size() != b.size()) {
-      return false;
-    }
-    for (Map.Entry<K, V> entry : a.entrySet()) {
-      if (!b.containsKey(entry.getKey())) {
-        return false;
-      }
-      if (!equals(entry.getValue(), b.get(entry.getKey()))) {
-        return false;
-      }
-    }
-    return true;
-  }
-
-  /** Checks whether two map fields are equal. */
-  @SuppressWarnings("unchecked")
-  @Override
-  public boolean equals(Object object) {
-    return (object instanceof Map) && equals(this, (Map<K, V>) object);
-  }
-
-  private static int calculateHashCodeForObject(Object a) {
-    if (a instanceof byte[]) {
-      return Internal.hashCode((byte[]) a);
-    }
-    // Enums should be stored as integers internally.
-    if (a instanceof EnumLite) {
-      throw new UnsupportedOperationException();
-    }
-    return a.hashCode();
-  }
-
-  /**
-   * Calculates the hash code for a {@link Map}. We don't use the default hash code method of {@link
-   * Map} because for byte arrays and protobuf enums it use {@link Object#hashCode()}.
-   */
-  static <K, V> int calculateHashCodeForMap(Map<K, V> a) {
-    int result = 0;
-    for (Map.Entry<K, V> entry : a.entrySet()) {
-      result +=
-          calculateHashCodeForObject(entry.getKey()) ^ calculateHashCodeForObject(entry.getValue());
-    }
-    return result;
-  }
-
-  @Override
-  public int hashCode() {
-    return calculateHashCodeForMap(this);
-  }
-
-  private static Object copy(Object object) {
-    if (object instanceof byte[]) {
-      byte[] data = (byte[]) object;
-      return Arrays.copyOf(data, data.length);
-    }
-    return object;
-  }
-
-  /**
-   * Makes a deep copy of a {@link Map}. Immutable objects in the map will be shared (e.g.,
-   * integers, strings, immutable messages) and mutable ones will have a copy (e.g., byte arrays,
-   * mutable messages).
-   */
-  @SuppressWarnings("unchecked")
-  static <K, V> Map<K, V> copy(Map<K, V> map) {
-    Map<K, V> result = new LinkedHashMap<K, V>();
-    for (Map.Entry<K, V> entry : map.entrySet()) {
-      result.put(entry.getKey(), (V) copy(entry.getValue()));
-    }
-    return result;
-  }
-
-  /** Returns a deep copy of this map field. */
-  public MapFieldLite<K, V> mutableCopy() {
-    return isEmpty() ? new MapFieldLite<K, V>() : new MapFieldLite<K, V>(this);
-  }
-
-  /**
-   * Makes this field immutable. All subsequent modifications will throw an {@link
-   * UnsupportedOperationException}.
-   */
-  public void makeImmutable() {
-    isMutable = false;
-  }
-
-  /** Returns whether this field can be modified. */
-  public boolean isMutable() {
-    return isMutable;
-  }
-
-  private void ensureMutable() {
-    if (!isMutable()) {
-      throw new UnsupportedOperationException();
-    }
-  }
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/MapFieldSchema.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/MapFieldSchema.java
deleted file mode 100644
index d92a3bb..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/MapFieldSchema.java
+++ /dev/null
@@ -1,65 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import java.util.Map;
-
-@CheckReturnValue
-interface MapFieldSchema {
-  /** Returns the map data for mutation. */
-  Map<?, ?> forMutableMapData(Object mapField);
-
-  /** Returns the map data for read. */
-  Map<?, ?> forMapData(Object mapField);
-
-  /** Whether toImmutable() has been called on this map field. */
-  boolean isImmutable(Object mapField);
-
-  /**
-   * Returns an immutable instance of the map field. It may make the parameter immutable and return
-   * the parameter, or create an immutable copy. The status of the parameter after the call is
-   * undefined.
-   */
-  Object toImmutable(Object mapField);
-
-  /** Returns a new instance of the map field given a map default entry. */
-  Object newMapField(Object mapDefaultEntry);
-
-  /** Returns the metadata from a default entry. */
-  MapEntryLite.Metadata<?, ?> forMapMetadata(Object mapDefaultEntry);
-
-  /** Merges {@code srcMapField} into {@code destMapField}, and returns the merged instance. */
-  @CanIgnoreReturnValue
-  Object mergeFrom(Object destMapField, Object srcMapField);
-
-  /** Compute the serialized size for the map with a given field number. */
-  int getSerializedSize(int fieldNumber, Object mapField, Object mapDefaultEntry);
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/MapFieldSchemaFull.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/MapFieldSchemaFull.java
deleted file mode 100644
index 1efaab3..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/MapFieldSchemaFull.java
+++ /dev/null
@@ -1,112 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import com.google.protobuf.MapEntryLite.Metadata;
-import java.util.Map;
-
-class MapFieldSchemaFull implements MapFieldSchema {
-  @Override
-  public Map<?, ?> forMutableMapData(Object mapField) {
-    return ((MapField<?, ?>) mapField).getMutableMap();
-  }
-
-  @Override
-  public Map<?, ?> forMapData(Object mapField) {
-    return ((MapField<?, ?>) mapField).getMap();
-  }
-
-  @Override
-  public boolean isImmutable(Object mapField) {
-    return !((MapField<?, ?>) mapField).isMutable();
-  }
-
-  @Override
-  public Object toImmutable(Object mapField) {
-    ((MapField<?, ?>) mapField).makeImmutable();
-    return mapField;
-  }
-
-  @Override
-  public Object newMapField(Object mapDefaultEntry) {
-    return MapField.newMapField((MapEntry<?, ?>) mapDefaultEntry);
-  }
-
-  @Override
-  public Metadata<?, ?> forMapMetadata(Object mapDefaultEntry) {
-    return ((MapEntry<?, ?>) mapDefaultEntry).getMetadata();
-  }
-
-  @Override
-  public Object mergeFrom(Object destMapField, Object srcMapField) {
-    return mergeFromFull(destMapField, srcMapField);
-  }
-
-  @SuppressWarnings("unchecked")
-  private static <K, V> Object mergeFromFull(Object destMapField, Object srcMapField) {
-    MapField<K, V> mine = (MapField<K, V>) destMapField;
-    MapField<K, V> other = (MapField<K, V>) srcMapField;
-    if (!mine.isMutable()) {
-      mine.copy();
-    }
-    mine.mergeFrom(other);
-    return mine;
-  }
-
-  @Override
-  public int getSerializedSize(int number, Object mapField, Object mapDefaultEntry) {
-    return getSerializedSizeFull(number, mapField, mapDefaultEntry);
-  }
-
-  @SuppressWarnings("unchecked")
-  private static <K, V> int getSerializedSizeFull(
-      int number, Object mapField, Object defaultEntryObject) {
-    // Full runtime allocates map fields lazily.
-    if (mapField == null) {
-      return 0;
-    }
-
-    Map<K, V> map = ((MapField<K, V>) mapField).getMap();
-    MapEntry<K, V> defaultEntry = (MapEntry<K, V>) defaultEntryObject;
-    if (map.isEmpty()) {
-      return 0;
-    }
-    int size = 0;
-    for (Map.Entry<K, V> entry : map.entrySet()) {
-      size +=
-          CodedOutputStream.computeTagSize(number)
-              + CodedOutputStream.computeLengthDelimitedFieldSize(
-                  MapEntryLite.computeSerializedSize(
-                      defaultEntry.getMetadata(), entry.getKey(), entry.getValue()));
-    }
-    return size;
-  }
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/MapFieldSchemaLite.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/MapFieldSchemaLite.java
deleted file mode 100644
index aef8ad2..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/MapFieldSchemaLite.java
+++ /dev/null
@@ -1,108 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import com.google.protobuf.MapEntryLite.Metadata;
-import java.util.Map;
-
-@CheckReturnValue
-class MapFieldSchemaLite implements MapFieldSchema {
-
-  @Override
-  public Map<?, ?> forMutableMapData(Object mapField) {
-    return (MapFieldLite<?, ?>) mapField;
-  }
-
-  @Override
-  public Metadata<?, ?> forMapMetadata(Object mapDefaultEntry) {
-    return ((MapEntryLite<?, ?>) mapDefaultEntry).getMetadata();
-  }
-
-  @Override
-  public Map<?, ?> forMapData(Object mapField) {
-    return (MapFieldLite<?, ?>) mapField;
-  }
-
-  @Override
-  public boolean isImmutable(Object mapField) {
-    return !((MapFieldLite<?, ?>) mapField).isMutable();
-  }
-
-  @Override
-  public Object toImmutable(Object mapField) {
-    ((MapFieldLite<?, ?>) mapField).makeImmutable();
-    return mapField;
-  }
-
-  @Override
-  public Object newMapField(Object unused) {
-    return MapFieldLite.emptyMapField().mutableCopy();
-  }
-
-  @Override
-  public Object mergeFrom(Object destMapField, Object srcMapField) {
-    return mergeFromLite(destMapField, srcMapField);
-  }
-
-  @SuppressWarnings("unchecked")
-  private static <K, V> MapFieldLite<K, V> mergeFromLite(Object destMapField, Object srcMapField) {
-    MapFieldLite<K, V> mine = (MapFieldLite<K, V>) destMapField;
-    MapFieldLite<K, V> other = (MapFieldLite<K, V>) srcMapField;
-    if (!other.isEmpty()) {
-      if (!mine.isMutable()) {
-        mine = mine.mutableCopy();
-      }
-      mine.mergeFrom(other);
-    }
-    return mine;
-  }
-
-  @Override
-  public int getSerializedSize(int fieldNumber, Object mapField, Object mapDefaultEntry) {
-    return getSerializedSizeLite(fieldNumber, mapField, mapDefaultEntry);
-  }
-
-  @SuppressWarnings("unchecked")
-  private static <K, V> int getSerializedSizeLite(
-      int fieldNumber, Object mapField, Object defaultEntry) {
-    MapFieldLite<K, V> mapFieldLite = (MapFieldLite<K, V>) mapField;
-    MapEntryLite<K, V> defaultEntryLite = (MapEntryLite<K, V>) defaultEntry;
-
-    if (mapFieldLite.isEmpty()) {
-      return 0;
-    }
-    int size = 0;
-    for (Map.Entry<K, V> entry : mapFieldLite.entrySet()) {
-      size += defaultEntryLite.computeMessageSize(fieldNumber, entry.getKey(), entry.getValue());
-    }
-    return size;
-  }
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/MapFieldSchemas.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/MapFieldSchemas.java
deleted file mode 100644
index 835f95c..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/MapFieldSchemas.java
+++ /dev/null
@@ -1,54 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-@CheckReturnValue
-final class MapFieldSchemas {
-  private static final MapFieldSchema FULL_SCHEMA = loadSchemaForFullRuntime();
-  private static final MapFieldSchema LITE_SCHEMA = new MapFieldSchemaLite();
-
-  static MapFieldSchema full() {
-    return FULL_SCHEMA;
-  }
-
-  static MapFieldSchema lite() {
-    return LITE_SCHEMA;
-  }
-
-  private static MapFieldSchema loadSchemaForFullRuntime() {
-    try {
-      Class<?> clazz = Class.forName("com.google.protobuf.MapFieldSchemaFull");
-      return (MapFieldSchema) clazz.getDeclaredConstructor().newInstance();
-    } catch (Exception e) {
-      return null;
-    }
-  }
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/Message.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/Message.java
deleted file mode 100644
index 3db1c77..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/Message.java
+++ /dev/null
@@ -1,271 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Map;
-
-/**
- * Abstract interface implemented by Protocol Message objects.
- *
- * <p>See also {@link MessageLite}, which defines most of the methods that typical users care about.
- * {@link Message} adds methods that are not available in the "lite" runtime. The biggest added
- * features are introspection and reflection; that is, getting descriptors for the message type
- * and accessing the field values dynamically.
- *
- * @author kenton@google.com Kenton Varda
- */
-public interface Message extends MessageLite, MessageOrBuilder {
-
-  // (From MessageLite, re-declared here only for return type covariance.)
-  @Override
-  Parser<? extends Message> getParserForType();
-
-
-  // -----------------------------------------------------------------
-  // Comparison and hashing
-
-  /**
-   * Compares the specified object with this message for equality. Returns {@code true} if the given
-   * object is a message of the same type (as defined by {@code getDescriptorForType()}) and has
-   * identical values for all of its fields. Subclasses must implement this; inheriting {@code
-   * Object.equals()} is incorrect.
-   *
-   * @param other object to be compared for equality with this message
-   * @return {@code true} if the specified object is equal to this message
-   */
-  @Override
-  boolean equals(Object other);
-
-  /**
-   * Returns the hash code value for this message. The hash code of a message should mix the
-   * message's type (object identity of the descriptor) with its contents (known and unknown field
-   * values). Subclasses must implement this; inheriting {@code Object.hashCode()} is incorrect.
-   *
-   * @return the hash code value for this message
-   * @see Map#hashCode()
-   */
-  @Override
-  int hashCode();
-
-  // -----------------------------------------------------------------
-  // Convenience methods.
-
-  /**
-   * Converts the message to a string in protocol buffer text format. This is just a trivial wrapper
-   * around {@link TextFormat.Printer#printToString(MessageOrBuilder)}.
-   */
-  @Override
-  String toString();
-
-  // =================================================================
-  // Builders
-
-  // (From MessageLite, re-declared here only for return type covariance.)
-  @Override
-  Builder newBuilderForType();
-
-  @Override
-  Builder toBuilder();
-
-  /** Abstract interface implemented by Protocol Message builders. */
-  interface Builder extends MessageLite.Builder, MessageOrBuilder {
-    // (From MessageLite.Builder, re-declared here only for return type
-    // covariance.)
-    @Override
-    Builder clear();
-
-    /**
-     * Merge {@code other} into the message being built. {@code other} must have the exact same type
-     * as {@code this} (i.e. {@code getDescriptorForType() == other.getDescriptorForType()}).
-     *
-     * <p>Merging occurs as follows. For each field:<br>
-     * * For singular primitive fields, if the field is set in {@code other}, then {@code other}'s
-     * value overwrites the value in this message.<br>
-     * * For singular message fields, if the field is set in {@code other}, it is merged into the
-     * corresponding sub-message of this message using the same merging rules.<br>
-     * * For repeated fields, the elements in {@code other} are concatenated with the elements in
-     * this message.<br>
-     * * For oneof groups, if the other message has one of the fields set, the group of this message
-     * is cleared and replaced by the field of the other message, so that the oneof constraint is
-     * preserved.
-     *
-     * <p>This is equivalent to the {@code Message::MergeFrom} method in C++.
-     */
-    Builder mergeFrom(Message other);
-
-    // (From MessageLite.Builder, re-declared here only for return type
-    // covariance.)
-    @Override
-    Message build();
-
-    @Override
-    Message buildPartial();
-
-    @Override
-    Builder clone();
-
-    @Override
-    Builder mergeFrom(CodedInputStream input) throws IOException;
-
-    @Override
-    Builder mergeFrom(CodedInputStream input, ExtensionRegistryLite extensionRegistry)
-        throws IOException;
-
-    /** Get the message's type's descriptor. See {@link Message#getDescriptorForType()}. */
-    @Override
-    Descriptors.Descriptor getDescriptorForType();
-
-    /**
-     * Create a builder for messages of the appropriate type for the given field. The
-     * builder is NOT nested in the current builder. However, messages built with the
-     * builder can then be passed to the {@link #setField(Descriptors.FieldDescriptor, Object)},
-     * {@link #setRepeatedField(Descriptors.FieldDescriptor, int, Object)}, or
-     * {@link #addRepeatedField(Descriptors.FieldDescriptor, Object)}
-     * method of the current builder.
-     *
-     * <p>To obtain a builder nested in the current builder, use
-     * {@link #getFieldBuilder(Descriptors.FieldDescriptor)} instead.
-     */
-    Builder newBuilderForField(Descriptors.FieldDescriptor field);
-
-    /**
-     * Get a nested builder instance for the given field.
-     *
-     * <p>Normally, we hold a reference to the immutable message object for the message type field.
-     * Some implementations (the generated message builders) can also hold a reference to
-     * the builder object (a nested builder) for the field.
-     *
-     * <p>If the field is already backed up by a nested builder, the nested builder is
-     * returned. Otherwise, a new field builder is created and returned. The original message
-     * field (if one exists) is merged into the field builder, which is then nested into its
-     * parent builder.
-     */
-    Builder getFieldBuilder(Descriptors.FieldDescriptor field);
-
-    /**
-     * Get a nested builder instance for the given repeated field instance.
-     *
-     * <p>Normally, we hold a reference to the immutable message object for the message type field.
-     * Some implementations (the generated message builders) can also hold a reference to
-     * the builder object (a nested builder) for the field.
-     *
-     * <p>If the field is already backed up by a nested builder, the nested builder is
-     * returned. Otherwise, a new field builder is created and returned. The original message
-     * field (if one exists) is merged into the field builder, which is then nested into its
-     * parent builder.
-     */
-    Builder getRepeatedFieldBuilder(Descriptors.FieldDescriptor field, int index);
-
-    /**
-     * Sets a field to the given value. The value must be of the correct type for this field, that
-     * is, the same type that {@link Message#getField(Descriptors.FieldDescriptor)} returns.
-     */
-    Builder setField(Descriptors.FieldDescriptor field, Object value);
-
-    /**
-     * Clears the field. This is exactly equivalent to calling the generated "clear" accessor method
-     * corresponding to the field.
-     */
-    Builder clearField(Descriptors.FieldDescriptor field);
-
-    /**
-     * Clears the oneof. This is exactly equivalent to calling the generated "clear" accessor method
-     * corresponding to the oneof.
-     */
-    Builder clearOneof(Descriptors.OneofDescriptor oneof);
-
-    /**
-     * Sets an element of a repeated field to the given value. The value must be of the correct type
-     * for this field; that is, the same type that {@link
-     * Message#getRepeatedField(Descriptors.FieldDescriptor,int)} returns.
-     *
-     * @throws IllegalArgumentException if the field is not a repeated field, or {@code
-     *     field.getContainingType() != getDescriptorForType()}.
-     */
-    Builder setRepeatedField(Descriptors.FieldDescriptor field, int index, Object value);
-
-    /**
-     * Like {@code setRepeatedField}, but appends the value as a new element.
-     *
-     * @throws IllegalArgumentException if the field is not a repeated field, or {@code
-     *     field.getContainingType() != getDescriptorForType()}
-     */
-    Builder addRepeatedField(Descriptors.FieldDescriptor field, Object value);
-
-    /** Set the {@link UnknownFieldSet} for this message. */
-    Builder setUnknownFields(UnknownFieldSet unknownFields);
-
-    /** Merge some unknown fields into the {@link UnknownFieldSet} for this message. */
-    Builder mergeUnknownFields(UnknownFieldSet unknownFields);
-
-    // ---------------------------------------------------------------
-    // Convenience methods.
-
-    // (From MessageLite.Builder, re-declared here only for return type
-    // covariance.)
-    @Override
-    Builder mergeFrom(ByteString data) throws InvalidProtocolBufferException;
-
-    @Override
-    Builder mergeFrom(ByteString data, ExtensionRegistryLite extensionRegistry)
-        throws InvalidProtocolBufferException;
-
-    @Override
-    Builder mergeFrom(byte[] data) throws InvalidProtocolBufferException;
-
-    @Override
-    Builder mergeFrom(byte[] data, int off, int len) throws InvalidProtocolBufferException;
-
-    @Override
-    Builder mergeFrom(byte[] data, ExtensionRegistryLite extensionRegistry)
-        throws InvalidProtocolBufferException;
-
-    @Override
-    Builder mergeFrom(byte[] data, int off, int len, ExtensionRegistryLite extensionRegistry)
-        throws InvalidProtocolBufferException;
-
-    @Override
-    Builder mergeFrom(InputStream input) throws IOException;
-
-    @Override
-    Builder mergeFrom(InputStream input, ExtensionRegistryLite extensionRegistry)
-        throws IOException;
-
-    @Override
-    boolean mergeDelimitedFrom(InputStream input) throws IOException;
-
-    @Override
-    boolean mergeDelimitedFrom(InputStream input, ExtensionRegistryLite extensionRegistry)
-        throws IOException;
-  }
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/MessageInfo.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/MessageInfo.java
deleted file mode 100644
index 399ca62..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/MessageInfo.java
+++ /dev/null
@@ -1,44 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-/** A MessageInfo object describes a proto message type. */
-@CheckReturnValue
-interface MessageInfo {
-  /** Gets syntax for this type. */
-  ProtoSyntax getSyntax();
-
-  /** Whether this type is MessageSet. */
-  boolean isMessageSetWireFormat();
-
-  /** Gets the default instance of this type. */
-  MessageLite getDefaultInstance();
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/MessageInfoFactory.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/MessageInfoFactory.java
deleted file mode 100644
index 3732b8e..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/MessageInfoFactory.java
+++ /dev/null
@@ -1,42 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-/** A factory that creates {@link MessageInfo} instances for message types. */
-@ExperimentalApi
-@CheckReturnValue
-interface MessageInfoFactory {
-  /** Whether the message class is supported by this factory. */
-  boolean isSupported(Class<?> clazz);
-
-  /** Returns a information of the message class. */
-  MessageInfo messageInfoFor(Class<?> clazz);
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/MessageLite.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/MessageLite.java
deleted file mode 100644
index f9b2f66..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/MessageLite.java
+++ /dev/null
@@ -1,349 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-/**
- * Abstract interface implemented by Protocol Message objects.
- *
- * <p>This interface is implemented by all protocol message objects. Non-lite messages additionally
- * implement the Message interface, which is a subclass of MessageLite. Use MessageLite instead when
- * you only need the subset of features which it supports -- namely, nothing that uses descriptors
- * or reflection. You can instruct the protocol compiler to generate classes which implement only
- * MessageLite, not the full Message interface, by adding the follow line to the .proto file:
- *
- * <pre>
- *   option optimize_for = LITE_RUNTIME;
- * </pre>
- *
- * <p>This is particularly useful on resource-constrained systems where the full protocol buffers
- * runtime library is too big.
- *
- * <p>Note that on non-constrained systems (e.g. servers) when you need to link in lots of protocol
- * definitions, a better way to reduce total code footprint is to use {@code optimize_for =
- * CODE_SIZE}. This will make the generated code smaller while still supporting all the same
- * features (at the expense of speed). {@code optimize_for = LITE_RUNTIME} is best when you only
- * have a small number of message types linked into your binary, in which case the size of the
- * protocol buffers runtime itself is the biggest problem.
- *
- * @author kenton@google.com Kenton Varda
- */
-public interface MessageLite extends MessageLiteOrBuilder {
-
-  /**
-   * Serializes the message and writes it to {@code output}. This does not flush or close the
-   * stream.
-   */
-  void writeTo(CodedOutputStream output) throws IOException;
-
-  /**
-   * Get the number of bytes required to encode this message. The result is only computed on the
-   * first call and memoized after that.
-   *
-   * If this message requires more than Integer.MAX_VALUE bytes to encode, the return value will
-   * be smaller than the actual number of bytes required and might be negative.
-   */
-  int getSerializedSize();
-
-  /** Gets the parser for a message of the same type as this message. */
-  Parser<? extends MessageLite> getParserForType();
-
-  // -----------------------------------------------------------------
-  // Convenience methods.
-
-  /**
-   * Serializes the message to a {@code ByteString} and returns it. This is just a trivial wrapper
-   * around {@link #writeTo(CodedOutputStream)}.
-   *
-   * If this message requires more than Integer.MAX_VALUE bytes to encode, the behavior is
-   * unpredictable. It may throw a runtime exception or truncate or slice the data.
-   */
-  ByteString toByteString();
-
-  /**
-   * Serializes the message to a {@code byte} array and returns it. This is just a trivial wrapper
-   * around {@link #writeTo(CodedOutputStream)}.
-   *
-   * If this message requires more than Integer.MAX_VALUE bytes to encode, the behavior is
-   * unpredictable. It may throw a runtime exception or truncate or slice the data.
-   */
-  byte[] toByteArray();
-
-  /**
-   * Serializes the message and writes it to {@code output}. This is just a trivial wrapper around
-   * {@link #writeTo(CodedOutputStream)}. This does not flush or close the stream.
-   *
-   * <p>NOTE: Protocol Buffers are not self-delimiting. Therefore, if you write any more data to the
-   * stream after the message, you must somehow ensure that the parser on the receiving end does not
-   * interpret this as being part of the protocol message. This can be done, for instance, by
-   *  writing the size of the message before the data, then making sure to limit the input to that
-   * size on the receiving end by wrapping the InputStream in one which limits the input.
-   * Alternatively, just use {@link #writeDelimitedTo(OutputStream)}.
-   */
-  void writeTo(OutputStream output) throws IOException;
-
-  /**
-   * Like {@link #writeTo(OutputStream)}, but writes the size of the message as a varint before
-   * writing the data. This allows more data to be written to the stream after the message without
-   * the need to delimit the message data yourself. Use {@link
-   * Builder#mergeDelimitedFrom(InputStream)} (or the static method {@code
-   * YourMessageType.parseDelimitedFrom(InputStream)}) to parse messages written by this method.
-   */
-  void writeDelimitedTo(OutputStream output) throws IOException;
-
-
-  // =================================================================
-  // Builders
-
-  /** Constructs a new builder for a message of the same type as this message. */
-  Builder newBuilderForType();
-
-  /**
-   * Constructs a builder initialized with the current message. Use this to derive a new message
-   * from the current one.
-   */
-  Builder toBuilder();
-
-  /** Abstract interface implemented by Protocol Message builders. */
-  interface Builder extends MessageLiteOrBuilder, Cloneable {
-    /** Resets all fields to their default values. */
-    Builder clear();
-
-    /**
-     * Constructs the message based on the state of the Builder. Subsequent changes to the Builder
-     * will not affect the returned message.
-     *
-     * @throws UninitializedMessageException The message is missing one or more required fields
-     *     (i.e. {@link #isInitialized()} returns false). Use {@link #buildPartial()} to bypass this
-     *     check.
-     */
-    MessageLite build();
-
-    /**
-     * Like {@link #build()}, but does not throw an exception if the message is missing required
-     * fields. Instead, a partial message is returned. Subsequent changes to the Builder will not
-     * affect the returned message.
-     */
-    MessageLite buildPartial();
-
-    /**
-     * Clones the Builder.
-     *
-     * @see Object#clone()
-     */
-    Builder clone();
-
-    /**
-     * Parses a message of this type from the input and merges it with this message.
-     *
-     * <p>Warning: This does not verify that all required fields are present in the input message.
-     * If you call {@link #build()} without setting all required fields, it will throw an {@link
-     * UninitializedMessageException}, which is a {@code RuntimeException} and thus might not be
-     * caught. There are a few good ways to deal with this:
-     *
-     * <ul>
-     *   <li>Call {@link #isInitialized()} to verify that all required fields are set before
-     *       building.
-     *   <li>Use {@code buildPartial()} to build, which ignores missing required fields.
-     * </ul>
-     *
-     * <p>Note: The caller should call {@link CodedInputStream#checkLastTagWas(int)} after calling
-     * this to verify that the last tag seen was the appropriate end-group tag, or zero for EOF.
-     *
-     * @throws InvalidProtocolBufferException the bytes read are not syntactically correct
-     *     according to the protobuf wire format specification. The data is corrupt, incomplete,
-     *     or was never a protobuf in the first place.
-     * @throws IOException an I/O error reading from the stream
-     */
-    Builder mergeFrom(CodedInputStream input) throws IOException;
-
-    /**
-     * Like {@link Builder#mergeFrom(CodedInputStream)}, but also parses extensions. The extensions
-     * that you want to be able to parse must be registered in {@code extensionRegistry}. Extensions
-     * not in the registry will be treated as unknown fields.
-     *
-     * @throws InvalidProtocolBufferException the bytes read are not syntactically correct
-     *     according to the protobuf wire format specification. The data is corrupt, incomplete,
-     *     or was never a protobuf in the first place.
-     * @throws IOException an I/O error reading from the stream
-     */
-    Builder mergeFrom(CodedInputStream input, ExtensionRegistryLite extensionRegistry)
-        throws IOException;
-
-    // ---------------------------------------------------------------
-    // Convenience methods.
-
-    /**
-     * Parse {@code data} as a message of this type and merge it with the message being built. This
-     * is just a small wrapper around {@link #mergeFrom(CodedInputStream)}.
-     *
-     * @throws InvalidProtocolBufferException the bytes in data are not syntactically correct
-     *     according to the protobuf wire format specification. The data is corrupt, incomplete,
-     *     or was never a protobuf in the first place.
-     * @return this
-     */
-    Builder mergeFrom(ByteString data) throws InvalidProtocolBufferException;
-
-    /**
-     * Parse {@code data} as a message of this type and merge it with the message being built. This
-     * is just a small wrapper around {@link #mergeFrom(CodedInputStream,ExtensionRegistryLite)}.
-     *
-     * @throws InvalidProtocolBufferException the bytes in data are not syntactically correct
-     *     according to the protobuf wire format specification. The data is corrupt, incomplete,
-     *     or was never a protobuf in the first place.
-     * @return this
-     */
-    Builder mergeFrom(ByteString data, ExtensionRegistryLite extensionRegistry)
-        throws InvalidProtocolBufferException;
-
-    /**
-     * Parse {@code data} as a message of this type and merge it with the message being built. This
-     * is just a small wrapper around {@link #mergeFrom(CodedInputStream)}.
-     *
-     * @throws InvalidProtocolBufferException the bytes in data are not syntactically correct
-     *     according to the protobuf wire format specification. The data is corrupt, incomplete,
-     *     or was never a protobuf in the first place.
-     * @return this
-     */
-    Builder mergeFrom(byte[] data) throws InvalidProtocolBufferException;
-
-    /**
-     * Parse {@code data} as a message of this type and merge it with the message being built. This
-     * is just a small wrapper around {@link #mergeFrom(CodedInputStream)}.
-     *
-     * @throws InvalidProtocolBufferException the bytes in data are not syntactically correct
-     *     according to the protobuf wire format specification. The data is corrupt, incomplete,
-     *     or was never a protobuf in the first place.
-     * @return this
-     */
-    Builder mergeFrom(byte[] data, int off, int len) throws InvalidProtocolBufferException;
-
-    /**
-     * Parse {@code data} as a message of this type and merge it with the message being built. This
-     * is just a small wrapper around {@link #mergeFrom(CodedInputStream,ExtensionRegistryLite)}.
-     *
-     * @throws InvalidProtocolBufferException the bytes in data are not syntactically correct
-     *     according to the protobuf wire format specification. The data is corrupt, incomplete,
-     *     or was never a protobuf in the first place.
-     * @return this
-     */
-    Builder mergeFrom(byte[] data, ExtensionRegistryLite extensionRegistry)
-        throws InvalidProtocolBufferException;
-
-    /**
-     * Parse {@code data} as a message of this type and merge it with the message being built. This
-     * is just a small wrapper around {@link #mergeFrom(CodedInputStream,ExtensionRegistryLite)}.
-     *
-     * @throws InvalidProtocolBufferException the bytes in data are not syntactically correct
-     *     according to the protobuf wire format specification. The data is corrupt, incomplete,
-     *     or was never a protobuf in the first place.
-     * @return this
-     */
-    Builder mergeFrom(byte[] data, int off, int len, ExtensionRegistryLite extensionRegistry)
-        throws InvalidProtocolBufferException;
-
-    /**
-     * Parse a message of this type from {@code input} and merge it with the message being built.
-     * This is just a small wrapper around {@link #mergeFrom(CodedInputStream)}. Note that this
-     * method always reads the <i>entire</i> input (unless it throws an exception). If you want it
-     * to stop earlier, you will need to wrap your input in some wrapper stream that limits reading.
-     * Or, use {@link MessageLite#writeDelimitedTo(OutputStream)} to write your message and {@link
-     * #mergeDelimitedFrom(InputStream)} to read it.
-     *
-     * <p>Despite usually reading the entire input, this does not close the stream.
-     *
-     * @throws InvalidProtocolBufferException the bytes read are not syntactically correct
-     *     according to the protobuf wire format specification. The data is corrupt, incomplete,
-     *     or was never a protobuf in the first place.
-     * @throws IOException an I/O error reading from the stream
-     * @return this
-     */
-    Builder mergeFrom(InputStream input) throws IOException;
-
-    /**
-     * Parse a message of this type from {@code input} and merge it with the message being built.
-     * This is just a small wrapper around {@link
-     * #mergeFrom(CodedInputStream,ExtensionRegistryLite)}.
-     *
-     * @return this
-     */
-    Builder mergeFrom(InputStream input, ExtensionRegistryLite extensionRegistry)
-        throws IOException;
-
-    /**
-     * Merge {@code other} into the message being built. {@code other} must have the exact same type
-     * as {@code this} (i.e. {@code getClass().equals(getDefaultInstanceForType().getClass())}).
-     *
-     * <p>Merging occurs as follows. For each field:<br>
-     * * For singular primitive fields, if the field is set in {@code other}, then {@code other}'s
-     * value overwrites the value in this message.<br>
-     * * For singular message fields, if the field is set in {@code other}, it is merged into the
-     * corresponding sub-message of this message using the same merging rules.<br>
-     * * For repeated fields, the elements in {@code other} are concatenated with the elements in
-     * this message. * For oneof groups, if the other message has one of the fields set, the group
-     * of this message is cleared and replaced by the field of the other message, so that the oneof
-     * constraint is preserved.
-     *
-     * <p>This is equivalent to the {@code Message::MergeFrom} method in C++.
-     */
-    Builder mergeFrom(MessageLite other);
-
-    /**
-     * Like {@link #mergeFrom(InputStream)}, but does not read until EOF. Instead, the size of the
-     * message (encoded as a varint) is read first, then the message data. Use {@link
-     * MessageLite#writeDelimitedTo(OutputStream)} to write messages in this format.
-     *
-     * @return true if successful, or false if the stream is at EOF when the method starts. Any
-     *     other error (including reaching EOF during parsing) causes an exception to be thrown.
-     * @throws InvalidProtocolBufferException the bytes read are not syntactically correct
-     *     according to the protobuf wire format specification. The data is corrupt, incomplete,
-     *     or was never a protobuf in the first place.
-     * @throws IOException an I/O error reading from the stream
-     */
-    boolean mergeDelimitedFrom(InputStream input) throws IOException;
-
-    /**
-     * Like {@link #mergeDelimitedFrom(InputStream)} but supporting extensions.
-     *
-     * @return true if successful, or false if the stream is at EOF when the method starts. Any
-     *     other error (including reaching EOF during parsing) causes an exception to be thrown.
-     * @throws InvalidProtocolBufferException the bytes read are not syntactically correct
-     *     according to the protobuf wire format specification. The data is corrupt, incomplete,
-     *     or was never a protobuf in the first place.
-     * @throws IOException an I/O error reading from the stream
-     */
-    boolean mergeDelimitedFrom(InputStream input, ExtensionRegistryLite extensionRegistry)
-        throws IOException;
-  }
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/MessageLiteOrBuilder.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/MessageLiteOrBuilder.java
deleted file mode 100644
index 7a5ef3e..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/MessageLiteOrBuilder.java
+++ /dev/null
@@ -1,57 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-/**
- * Base interface for methods common to {@link MessageLite} and {@link MessageLite.Builder} to
- * provide type equivalency.
- *
- * @author jonp@google.com (Jon Perlow)
- */
-public interface MessageLiteOrBuilder {
-  /**
-   * Get an instance of the type with no fields set. Because no fields are set, all getters for
-   * singular fields will return default values and repeated fields will appear empty. This may or
-   * may not be a singleton. This differs from the {@code getDefaultInstance()} method of generated
-   * message classes in that this method is an abstract method of the {@code MessageLite} interface
-   * whereas {@code getDefaultInstance()} is a static method of a specific class. They return the
-   * same thing.
-   */
-  MessageLite getDefaultInstanceForType();
-
-  /**
-   * Returns true if all required fields in the message and all embedded messages are set, false
-   * otherwise.
-   *
-   * <p>See also: {@link MessageOrBuilder#getInitializationErrorString()}
-   */
-  boolean isInitialized();
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/MessageLiteToString.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/MessageLiteToString.java
deleted file mode 100644
index 2123318..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/MessageLiteToString.java
+++ /dev/null
@@ -1,309 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.TreeMap;
-
-/** Helps generate {@link String} representations of {@link MessageLite} protos. */
-final class MessageLiteToString {
-
-  private static final String LIST_SUFFIX = "List";
-  private static final String BUILDER_LIST_SUFFIX = "OrBuilderList";
-  private static final String MAP_SUFFIX = "Map";
-  private static final String BYTES_SUFFIX = "Bytes";
-  private static final char[] INDENT_BUFFER = new char[80];
-
-  static {
-    Arrays.fill(INDENT_BUFFER, ' ');
-  }
-
-  private MessageLiteToString() {
-    // Classes which are not intended to be instantiated should be made non-instantiable with a
-    // private constructor. This includes utility classes (classes with only static members).
-  }
-
-  /**
-   * Returns a {@link String} representation of the {@link MessageLite} object. The first line of
-   * the {@code String} representation includes a comment string to uniquely identify
-   * the object instance. This acts as an indicator that this should not be relied on for
-   * comparisons.
-   */
-  static String toString(MessageLite messageLite, String commentString) {
-    StringBuilder buffer = new StringBuilder();
-    buffer.append("# ").append(commentString);
-    reflectivePrintWithIndent(messageLite, buffer, 0);
-    return buffer.toString();
-  }
-
-  /**
-   * Reflectively prints the {@link MessageLite} to the buffer at given {@code indent} level.
-   *
-   * @param buffer the buffer to write to
-   * @param indent the number of spaces to indent the proto by
-   */
-  private static void reflectivePrintWithIndent(
-      MessageLite messageLite, StringBuilder buffer, int indent) {
-    // Build a map of method name to method. We're looking for methods like getFoo(), hasFoo(),
-    // getFooList() and getFooMap() which might be useful for building an object's string
-    // representation.
-    Set<String> setters = new HashSet<>();
-    Map<String, Method> hazzers = new HashMap<>();
-    Map<String, Method> getters = new TreeMap<>();
-    for (Method method : messageLite.getClass().getDeclaredMethods()) {
-      if (Modifier.isStatic(method.getModifiers())) {
-        continue;
-      }
-      if (method.getName().length() < 3) {
-        continue;
-      }
-
-      if (method.getName().startsWith("set")) {
-        setters.add(method.getName());
-        continue;
-      }
-
-      if (!Modifier.isPublic(method.getModifiers())) {
-        continue;
-      }
-
-      if (method.getParameterTypes().length != 0) {
-        continue;
-      }
-
-      if (method.getName().startsWith("has")) {
-        hazzers.put(method.getName(), method);
-      } else if (method.getName().startsWith("get")) {
-        getters.put(method.getName(), method);
-      }
-    }
-
-    for (Entry<String, Method> getter : getters.entrySet()) {
-      String suffix = getter.getKey().substring(3);
-      if (suffix.endsWith(LIST_SUFFIX)
-          && !suffix.endsWith(BUILDER_LIST_SUFFIX)
-          // Sometimes people have fields named 'list' that aren't repeated.
-          && !suffix.equals(LIST_SUFFIX)) {
-        // Try to reflectively get the value and toString() the field as if it were repeated. This
-        // only works if the method names have not been proguarded out or renamed.
-        Method listMethod = getter.getValue();
-        if (listMethod != null && listMethod.getReturnType().equals(List.class)) {
-          printField(
-              buffer,
-              indent,
-              suffix.substring(0, suffix.length() - LIST_SUFFIX.length()),
-              GeneratedMessageLite.invokeOrDie(listMethod, messageLite));
-          continue;
-        }
-      }
-      if (suffix.endsWith(MAP_SUFFIX)
-          // Sometimes people have fields named 'map' that aren't maps.
-          && !suffix.equals(MAP_SUFFIX)) {
-        // Try to reflectively get the value and toString() the field as if it were a map. This only
-        // works if the method names have not been proguarded out or renamed.
-        Method mapMethod = getter.getValue();
-        if (mapMethod != null
-            && mapMethod.getReturnType().equals(Map.class)
-            // Skip the deprecated getter method with no prefix "Map" when the field name ends with
-            // "map".
-            && !mapMethod.isAnnotationPresent(Deprecated.class)
-            // Skip the internal mutable getter method.
-            && Modifier.isPublic(mapMethod.getModifiers())) {
-          printField(
-              buffer,
-              indent,
-              suffix.substring(0, suffix.length() - MAP_SUFFIX.length()),
-              GeneratedMessageLite.invokeOrDie(mapMethod, messageLite));
-          continue;
-        }
-      }
-
-      if (!setters.contains("set" + suffix)) {
-        continue;
-      }
-      if (suffix.endsWith(BYTES_SUFFIX)
-          && getters.containsKey("get" + suffix.substring(0, suffix.length() - "Bytes".length()))) {
-        // Heuristic to skip bytes based accessors for string fields.
-        continue;
-      }
-
-      // Try to reflectively get the value and toString() the field as if it were optional. This
-      // only works if the method names have not been proguarded out or renamed.
-      Method getMethod = getter.getValue();
-      Method hasMethod = hazzers.get("has" + suffix);
-      // TODO(dweis): Fix proto3 semantics.
-      if (getMethod != null) {
-        Object value = GeneratedMessageLite.invokeOrDie(getMethod, messageLite);
-        final boolean hasValue =
-            hasMethod == null
-                ? !isDefaultValue(value)
-                : (Boolean) GeneratedMessageLite.invokeOrDie(hasMethod, messageLite);
-        // TODO(dweis): This doesn't stop printing oneof case twice: value and enum style.
-        if (hasValue) {
-          printField(buffer, indent, suffix, value);
-        }
-        continue;
-      }
-    }
-
-    if (messageLite instanceof GeneratedMessageLite.ExtendableMessage) {
-      Iterator<Map.Entry<GeneratedMessageLite.ExtensionDescriptor, Object>> iter =
-          ((GeneratedMessageLite.ExtendableMessage<?, ?>) messageLite).extensions.iterator();
-      while (iter.hasNext()) {
-        Map.Entry<GeneratedMessageLite.ExtensionDescriptor, Object> entry = iter.next();
-        printField(buffer, indent, "[" + entry.getKey().getNumber() + "]", entry.getValue());
-      }
-    }
-
-    if (((GeneratedMessageLite<?, ?>) messageLite).unknownFields != null) {
-      ((GeneratedMessageLite<?, ?>) messageLite).unknownFields.printWithIndent(buffer, indent);
-    }
-  }
-
-  private static boolean isDefaultValue(Object o) {
-    if (o instanceof Boolean) {
-      return !((Boolean) o);
-    }
-    if (o instanceof Integer) {
-      return ((Integer) o) == 0;
-    }
-    if (o instanceof Float) {
-      return Float.floatToRawIntBits((Float) o) == 0;
-    }
-    if (o instanceof Double) {
-      return Double.doubleToRawLongBits((Double) o) == 0;
-    }
-    if (o instanceof String) {
-      return o.equals("");
-    }
-    if (o instanceof ByteString) {
-      return o.equals(ByteString.EMPTY);
-    }
-    if (o instanceof MessageLite) { // Can happen in oneofs.
-      return o == ((MessageLite) o).getDefaultInstanceForType();
-    }
-    if (o instanceof java.lang.Enum<?>) { // Catches oneof enums.
-      return ((java.lang.Enum<?>) o).ordinal() == 0;
-    }
-
-    return false;
-  }
-
-  /**
-   * Formats a text proto field.
-   *
-   * <p>For use by generated code only.
-   *
-   * @param buffer the buffer to write to
-   * @param indent the number of spaces the proto should be indented by
-   * @param name the field name (in PascalCase)
-   * @param object the object value of the field
-   */
-  static void printField(StringBuilder buffer, int indent, String name, Object object) {
-    if (object instanceof List<?>) {
-      List<?> list = (List<?>) object;
-      for (Object entry : list) {
-        printField(buffer, indent, name, entry);
-      }
-      return;
-    }
-    if (object instanceof Map<?, ?>) {
-      Map<?, ?> map = (Map<?, ?>) object;
-      for (Map.Entry<?, ?> entry : map.entrySet()) {
-        printField(buffer, indent, name, entry);
-      }
-      return;
-    }
-
-    buffer.append('\n');
-    indent(indent, buffer);
-    buffer.append(pascalCaseToSnakeCase(name));
-
-    if (object instanceof String) {
-      buffer.append(": \"").append(TextFormatEscaper.escapeText((String) object)).append('"');
-    } else if (object instanceof ByteString) {
-      buffer.append(": \"").append(TextFormatEscaper.escapeBytes((ByteString) object)).append('"');
-    } else if (object instanceof GeneratedMessageLite) {
-      buffer.append(" {");
-      reflectivePrintWithIndent((GeneratedMessageLite<?, ?>) object, buffer, indent + 2);
-      buffer.append("\n");
-      indent(indent, buffer);
-      buffer.append("}");
-    } else if (object instanceof Map.Entry<?, ?>) {
-      buffer.append(" {");
-      Map.Entry<?, ?> entry = (Map.Entry<?, ?>) object;
-      printField(buffer, indent + 2, "key", entry.getKey());
-      printField(buffer, indent + 2, "value", entry.getValue());
-      buffer.append("\n");
-      indent(indent, buffer);
-      buffer.append("}");
-    } else {
-      buffer.append(": ").append(object);
-    }
-  }
-
-  private static void indent(int indent, StringBuilder buffer) {
-    while (indent > 0) {
-      int partialIndent = indent;
-      if (partialIndent > INDENT_BUFFER.length) {
-        partialIndent = INDENT_BUFFER.length;
-      }
-      buffer.append(INDENT_BUFFER, 0, partialIndent);
-      indent -= partialIndent;
-    }
-  }
-
-  private static String pascalCaseToSnakeCase(String pascalCase) {
-    if (pascalCase.isEmpty()) {
-      return pascalCase;
-    }
-
-    StringBuilder builder = new StringBuilder();
-    builder.append(Character.toLowerCase(pascalCase.charAt(0)));
-    for (int i = 1; i < pascalCase.length(); i++) {
-      char ch = pascalCase.charAt(i);
-      if (Character.isUpperCase(ch)) {
-        builder.append("_");
-      }
-      builder.append(Character.toLowerCase(ch));
-    }
-    return builder.toString();
-  }
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/MessageOrBuilder.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/MessageOrBuilder.java
deleted file mode 100644
index 0254df9..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/MessageOrBuilder.java
+++ /dev/null
@@ -1,133 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * Base interface for methods common to {@link Message} and {@link Message.Builder} to provide type
- * equivalency.
- *
- * @author jonp@google.com (Jon Perlow)
- */
-public interface MessageOrBuilder extends MessageLiteOrBuilder {
-
-  // (From MessageLite, re-declared here only for return type covariance.)
-  @Override
-  Message getDefaultInstanceForType();
-
-  /**
-   * Returns a list of field paths (e.g. "foo.bar.baz") of required fields which are not set in this
-   * message. You should call {@link MessageLiteOrBuilder#isInitialized()} first to check if there
-   * are any missing fields, as that method is likely to be much faster than this one even when the
-   * message is fully-initialized.
-   */
-  List<String> findInitializationErrors();
-
-  /**
-   * Returns a comma-delimited list of required fields which are not set in this message object. You
-   * should call {@link MessageLiteOrBuilder#isInitialized()} first to check if there are any
-   * missing fields, as that method is likely to be much faster than this one even when the message
-   * is fully-initialized.
-   */
-  String getInitializationErrorString();
-
-  /**
-   * Get the message's type's descriptor. This differs from the {@code getDescriptor()} method of
-   * generated message classes in that this method is an abstract method of the {@code Message}
-   * interface whereas {@code getDescriptor()} is a static method of a specific class. They return
-   * the same thing.
-   */
-  Descriptors.Descriptor getDescriptorForType();
-
-  /**
-   * Returns a collection of all the fields in this message which are set and their corresponding
-   * values. A singular ("required" or "optional") field is set iff hasField() returns true for that
-   * field. A "repeated" field is set iff getRepeatedFieldCount() is greater than zero. The values
-   * are exactly what would be returned by calling {@link #getField(Descriptors.FieldDescriptor)}
-   * for each field. The map is guaranteed to be a sorted map, so iterating over it will return
-   * fields in order by field number. <br>
-   * If this is for a builder, the returned map may or may not reflect future changes to the
-   * builder. Either way, the returned map is itself unmodifiable.
-   */
-  Map<Descriptors.FieldDescriptor, Object> getAllFields();
-
-  /**
-   * Returns true if the given oneof is set.
-   *
-   * @throws IllegalArgumentException if {@code oneof.getContainingType() !=
-   *     getDescriptorForType()}.
-   */
-  boolean hasOneof(Descriptors.OneofDescriptor oneof);
-
-  /** Obtains the FieldDescriptor if the given oneof is set. Returns null if no field is set. */
-  Descriptors.FieldDescriptor getOneofFieldDescriptor(Descriptors.OneofDescriptor oneof);
-
-  /**
-   * Returns true if the given field is set. This is exactly equivalent to calling the generated
-   * "has" accessor method corresponding to the field.
-   *
-   * @throws IllegalArgumentException The field is a repeated field, or {@code
-   *     field.getContainingType() != getDescriptorForType()}.
-   */
-  boolean hasField(Descriptors.FieldDescriptor field);
-
-  /**
-   * Obtains the value of the given field, or the default value if it is not set. For primitive
-   * fields, the boxed primitive value is returned. For enum fields, the EnumValueDescriptor for the
-   * value is returned. For embedded message fields, the sub-message is returned. For repeated
-   * fields, a java.util.List is returned.
-   */
-  Object getField(Descriptors.FieldDescriptor field);
-
-  /**
-   * Gets the number of elements of a repeated field. This is exactly equivalent to calling the
-   * generated "Count" accessor method corresponding to the field.
-   *
-   * @throws IllegalArgumentException The field is not a repeated field, or {@code
-   *     field.getContainingType() != getDescriptorForType()}.
-   */
-  int getRepeatedFieldCount(Descriptors.FieldDescriptor field);
-
-  /**
-   * Gets an element of a repeated field. For primitive fields, the boxed primitive value is
-   * returned. For enum fields, the EnumValueDescriptor for the value is returned. For embedded
-   * message fields, the sub-message is returned.
-   *
-   * @throws IllegalArgumentException The field is not a repeated field, or {@code
-   *     field.getContainingType() != getDescriptorForType()}.
-   */
-  Object getRepeatedField(Descriptors.FieldDescriptor field, int index);
-
-  /** Get the {@link UnknownFieldSet} for this message. */
-  UnknownFieldSet getUnknownFields();
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/MessageReflection.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/MessageReflection.java
deleted file mode 100644
index 294d841..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/MessageReflection.java
+++ /dev/null
@@ -1,1415 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import com.google.protobuf.Descriptors.Descriptor;
-import com.google.protobuf.Descriptors.FieldDescriptor;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
-
-/**
- * Reflection utility methods shared by both mutable and immutable messages.
- *
- * @author liujisi@google.com (Pherl Liu)
- */
-class MessageReflection {
-
-  static void writeMessageTo(
-      Message message,
-      Map<FieldDescriptor, Object> fields,
-      CodedOutputStream output,
-      boolean alwaysWriteRequiredFields)
-      throws IOException {
-    final boolean isMessageSet =
-        message.getDescriptorForType().getOptions().getMessageSetWireFormat();
-    if (alwaysWriteRequiredFields) {
-      fields = new TreeMap<FieldDescriptor, Object>(fields);
-      for (final FieldDescriptor field : message.getDescriptorForType().getFields()) {
-        if (field.isRequired() && !fields.containsKey(field)) {
-          fields.put(field, message.getField(field));
-        }
-      }
-    }
-    for (final Map.Entry<Descriptors.FieldDescriptor, Object> entry : fields.entrySet()) {
-      final Descriptors.FieldDescriptor field = entry.getKey();
-      final Object value = entry.getValue();
-      if (isMessageSet
-          && field.isExtension()
-          && field.getType() == Descriptors.FieldDescriptor.Type.MESSAGE
-          && !field.isRepeated()) {
-        output.writeMessageSetExtension(field.getNumber(), (Message) value);
-      } else {
-        FieldSet.writeField(field, value, output);
-      }
-    }
-
-    final UnknownFieldSet unknownFields = message.getUnknownFields();
-    if (isMessageSet) {
-      unknownFields.writeAsMessageSetTo(output);
-    } else {
-      unknownFields.writeTo(output);
-    }
-  }
-
-  static int getSerializedSize(Message message, Map<FieldDescriptor, Object> fields) {
-    int size = 0;
-    final boolean isMessageSet =
-        message.getDescriptorForType().getOptions().getMessageSetWireFormat();
-
-    for (final Map.Entry<Descriptors.FieldDescriptor, Object> entry : fields.entrySet()) {
-      final Descriptors.FieldDescriptor field = entry.getKey();
-      final Object value = entry.getValue();
-      if (isMessageSet
-          && field.isExtension()
-          && field.getType() == Descriptors.FieldDescriptor.Type.MESSAGE
-          && !field.isRepeated()) {
-        size +=
-            CodedOutputStream.computeMessageSetExtensionSize(field.getNumber(), (Message) value);
-      } else {
-        size += FieldSet.computeFieldSize(field, value);
-      }
-    }
-
-    final UnknownFieldSet unknownFields = message.getUnknownFields();
-    if (isMessageSet) {
-      size += unknownFields.getSerializedSizeAsMessageSet();
-    } else {
-      size += unknownFields.getSerializedSize();
-    }
-    return size;
-  }
-
-  static String delimitWithCommas(List<String> parts) {
-    StringBuilder result = new StringBuilder();
-    for (String part : parts) {
-      if (result.length() > 0) {
-        result.append(", ");
-      }
-      result.append(part);
-    }
-    return result.toString();
-  }
-
-  @SuppressWarnings("unchecked")
-  static boolean isInitialized(MessageOrBuilder message) {
-    // Check that all required fields are present.
-    for (final Descriptors.FieldDescriptor field : message.getDescriptorForType().getFields()) {
-      if (field.isRequired()) {
-        if (!message.hasField(field)) {
-          return false;
-        }
-      }
-    }
-
-    // Check that embedded messages are initialized.
-    for (final Map.Entry<Descriptors.FieldDescriptor, Object> entry :
-        message.getAllFields().entrySet()) {
-      final Descriptors.FieldDescriptor field = entry.getKey();
-      if (field.getJavaType() == Descriptors.FieldDescriptor.JavaType.MESSAGE) {
-        if (field.isRepeated()) {
-          for (final Message element : (List<Message>) entry.getValue()) {
-            if (!element.isInitialized()) {
-              return false;
-            }
-          }
-        } else {
-          if (!((Message) entry.getValue()).isInitialized()) {
-            return false;
-          }
-        }
-      }
-    }
-
-    return true;
-  }
-
-  private static String subMessagePrefix(
-      final String prefix, final Descriptors.FieldDescriptor field, final int index) {
-    final StringBuilder result = new StringBuilder(prefix);
-    if (field.isExtension()) {
-      result.append('(').append(field.getFullName()).append(')');
-    } else {
-      result.append(field.getName());
-    }
-    if (index != -1) {
-      result.append('[').append(index).append(']');
-    }
-    result.append('.');
-    return result.toString();
-  }
-
-  private static void findMissingFields(
-      final MessageOrBuilder message, final String prefix, final List<String> results) {
-    for (final Descriptors.FieldDescriptor field : message.getDescriptorForType().getFields()) {
-      if (field.isRequired() && !message.hasField(field)) {
-        results.add(prefix + field.getName());
-      }
-    }
-
-    for (final Map.Entry<Descriptors.FieldDescriptor, Object> entry :
-        message.getAllFields().entrySet()) {
-      final Descriptors.FieldDescriptor field = entry.getKey();
-      final Object value = entry.getValue();
-
-      if (field.getJavaType() == Descriptors.FieldDescriptor.JavaType.MESSAGE) {
-        if (field.isRepeated()) {
-          int i = 0;
-          for (final Object element : (List) value) {
-            findMissingFields(
-                (MessageOrBuilder) element, subMessagePrefix(prefix, field, i++), results);
-          }
-        } else {
-          if (message.hasField(field)) {
-            findMissingFields(
-                (MessageOrBuilder) value, subMessagePrefix(prefix, field, -1), results);
-          }
-        }
-      }
-    }
-  }
-
-  /**
-   * Populates {@code this.missingFields} with the full "path" of each missing required field in the
-   * given message.
-   */
-  static List<String> findMissingFields(final MessageOrBuilder message) {
-    final List<String> results = new ArrayList<String>();
-    findMissingFields(message, "", results);
-    return results;
-  }
-
-  static interface MergeTarget {
-    enum ContainerType {
-      MESSAGE,
-      EXTENSION_SET
-    }
-
-    /** Returns the descriptor for the target. */
-    public Descriptors.Descriptor getDescriptorForType();
-
-    public ContainerType getContainerType();
-
-    public ExtensionRegistry.ExtensionInfo findExtensionByName(
-        ExtensionRegistry registry, String name);
-
-    public ExtensionRegistry.ExtensionInfo findExtensionByNumber(
-        ExtensionRegistry registry, Descriptors.Descriptor containingType, int fieldNumber);
-
-    /**
-     * Obtains the value of the given field, or the default value if it is not set. For primitive
-     * fields, the boxed primitive value is returned. For enum fields, the EnumValueDescriptor for
-     * the value is returned. For embedded message fields, the sub-message is returned. For repeated
-     * fields, a java.util.List is returned.
-     */
-    public Object getField(Descriptors.FieldDescriptor field);
-
-    /**
-     * Returns true if the given field is set. This is exactly equivalent to calling the generated
-     * "has" accessor method corresponding to the field.
-     *
-     * @throws IllegalArgumentException The field is a repeated field, or {@code
-     *     field.getContainingType() != getDescriptorForType()}.
-     */
-    boolean hasField(Descriptors.FieldDescriptor field);
-
-    /**
-     * Sets a field to the given value. The value must be of the correct type for this field, i.e.
-     * the same type that {@link Message#getField(Descriptors.FieldDescriptor)} would return.
-     */
-    MergeTarget setField(Descriptors.FieldDescriptor field, Object value);
-
-    /**
-     * Clears the field. This is exactly equivalent to calling the generated "clear" accessor method
-     * corresponding to the field.
-     */
-    MergeTarget clearField(Descriptors.FieldDescriptor field);
-
-    /**
-     * Sets an element of a repeated field to the given value. The value must be of the correct type
-     * for this field, i.e. the same type that {@link
-     * Message#getRepeatedField(Descriptors.FieldDescriptor, int)} would return.
-     *
-     * @throws IllegalArgumentException The field is not a repeated field, or {@code
-     *     field.getContainingType() != getDescriptorForType()}.
-     */
-    MergeTarget setRepeatedField(Descriptors.FieldDescriptor field, int index, Object value);
-
-    /**
-     * Like {@code setRepeatedField}, but appends the value as a new element.
-     *
-     * @throws IllegalArgumentException The field is not a repeated field, or {@code
-     *     field.getContainingType() != getDescriptorForType()}.
-     */
-    MergeTarget addRepeatedField(Descriptors.FieldDescriptor field, Object value);
-
-    /**
-     * Returns true if the given oneof is set.
-     *
-     * @throws IllegalArgumentException if {@code oneof.getContainingType() !=
-     *     getDescriptorForType()}.
-     */
-    boolean hasOneof(Descriptors.OneofDescriptor oneof);
-
-    /**
-     * Clears the oneof. This is exactly equivalent to calling the generated "clear" accessor method
-     * corresponding to the oneof.
-     */
-    MergeTarget clearOneof(Descriptors.OneofDescriptor oneof);
-
-    /** Obtains the FieldDescriptor if the given oneof is set. Returns null if no field is set. */
-    Descriptors.FieldDescriptor getOneofFieldDescriptor(Descriptors.OneofDescriptor oneof);
-
-    /**
-     * Parse the input stream into a sub field group defined based on either FieldDescriptor or the
-     * default instance.
-     */
-    Object parseGroup(
-        CodedInputStream input,
-        ExtensionRegistryLite registry,
-        Descriptors.FieldDescriptor descriptor,
-        Message defaultInstance)
-        throws IOException;
-
-    /**
-     * Parse the input stream into a sub field message defined based on either FieldDescriptor or
-     * the default instance.
-     */
-    Object parseMessage(
-        CodedInputStream input,
-        ExtensionRegistryLite registry,
-        Descriptors.FieldDescriptor descriptor,
-        Message defaultInstance)
-        throws IOException;
-
-    /**
-     * Parse from a ByteString into a sub field message defined based on either FieldDescriptor or
-     * the default instance. There isn't a varint indicating the length of the message at the
-     * beginning of the input ByteString.
-     */
-    Object parseMessageFromBytes(
-        ByteString bytes,
-        ExtensionRegistryLite registry,
-        Descriptors.FieldDescriptor descriptor,
-        Message defaultInstance)
-        throws IOException;
-
-    /**
-     * Read the given group field from the wire, merging with the existing field if it is already
-     * present.
-     *
-     * <p>For extensions, defaultInstance must be specified. For regular fields, defaultInstance can
-     * be null.
-     */
-    void mergeGroup(
-        CodedInputStream input,
-        ExtensionRegistryLite extensionRegistry,
-        FieldDescriptor field,
-        Message defaultInstance)
-        throws IOException;
-
-    /**
-     * Read the given message field from the wire, merging with the existing field if it is already
-     * present.
-     *
-     * <p>For extensions, defaultInstance must be specified. For regular fields, defaultInstance can
-     * be null.
-     */
-    void mergeMessage(
-        CodedInputStream input,
-        ExtensionRegistryLite extensionRegistry,
-        FieldDescriptor field,
-        Message defaultInstance)
-        throws IOException;
-
-    /** Returns the UTF8 validation level for the field. */
-    WireFormat.Utf8Validation getUtf8Validation(Descriptors.FieldDescriptor descriptor);
-
-    /**
-     * Returns a new merge target for a sub-field. When defaultInstance is provided, it indicates
-     * the descriptor is for an extension type, and implementations should create a new instance
-     * from the defaultInstance prototype directly.
-     */
-    MergeTarget newMergeTargetForField(
-        Descriptors.FieldDescriptor descriptor, Message defaultInstance);
-
-    /**
-     * Returns an empty merge target for a sub-field. When defaultInstance is provided, it indicates
-     * the descriptor is for an extension type, and implementations should create a new instance
-     * from the defaultInstance prototype directly.
-     */
-    MergeTarget newEmptyTargetForField(
-        Descriptors.FieldDescriptor descriptor, Message defaultInstance);
-
-    /** Finishes the merge and returns the underlying object. */
-    Object finish();
-  }
-
-  static class BuilderAdapter implements MergeTarget {
-
-    private final Message.Builder builder;
-    private boolean hasNestedBuilders = true;
-
-    @Override
-    public Descriptors.Descriptor getDescriptorForType() {
-      return builder.getDescriptorForType();
-    }
-
-    public BuilderAdapter(Message.Builder builder) {
-      this.builder = builder;
-    }
-
-    @Override
-    public Object getField(Descriptors.FieldDescriptor field) {
-      return builder.getField(field);
-    }
-
-    private Message.Builder getFieldBuilder(Descriptors.FieldDescriptor field) {
-      if (hasNestedBuilders) {
-        try {
-          return builder.getFieldBuilder(field);
-        } catch (UnsupportedOperationException e) {
-          hasNestedBuilders = false;
-        }
-      }
-      return null;
-    }
-
-    @Override
-    public boolean hasField(Descriptors.FieldDescriptor field) {
-      return builder.hasField(field);
-    }
-
-    @Override
-    public MergeTarget setField(Descriptors.FieldDescriptor field, Object value) {
-      if (!field.isRepeated() && value instanceof MessageLite.Builder) {
-        if (value != getFieldBuilder(field)) {
-          builder.setField(field, ((MessageLite.Builder) value).buildPartial());
-        }
-        return this;
-      }
-      builder.setField(field, value);
-      return this;
-    }
-
-    @Override
-    public MergeTarget clearField(Descriptors.FieldDescriptor field) {
-      builder.clearField(field);
-      return this;
-    }
-
-    @Override
-    public MergeTarget setRepeatedField(
-        Descriptors.FieldDescriptor field, int index, Object value) {
-      if (value instanceof MessageLite.Builder) {
-        value = ((MessageLite.Builder) value).buildPartial();
-      }
-      builder.setRepeatedField(field, index, value);
-      return this;
-    }
-
-    @Override
-    public MergeTarget addRepeatedField(Descriptors.FieldDescriptor field, Object value) {
-      if (value instanceof MessageLite.Builder) {
-        value = ((MessageLite.Builder) value).buildPartial();
-      }
-      builder.addRepeatedField(field, value);
-      return this;
-    }
-
-    @Override
-    public boolean hasOneof(Descriptors.OneofDescriptor oneof) {
-      return builder.hasOneof(oneof);
-    }
-
-    @Override
-    public MergeTarget clearOneof(Descriptors.OneofDescriptor oneof) {
-      builder.clearOneof(oneof);
-      return this;
-    }
-
-    @Override
-    public Descriptors.FieldDescriptor getOneofFieldDescriptor(Descriptors.OneofDescriptor oneof) {
-      return builder.getOneofFieldDescriptor(oneof);
-    }
-
-    @Override
-    public ContainerType getContainerType() {
-      return ContainerType.MESSAGE;
-    }
-
-    @Override
-    public ExtensionRegistry.ExtensionInfo findExtensionByName(
-        ExtensionRegistry registry, String name) {
-      return registry.findImmutableExtensionByName(name);
-    }
-
-    @Override
-    public ExtensionRegistry.ExtensionInfo findExtensionByNumber(
-        ExtensionRegistry registry, Descriptors.Descriptor containingType, int fieldNumber) {
-      return registry.findImmutableExtensionByNumber(containingType, fieldNumber);
-    }
-
-    @Override
-    public Object parseGroup(
-        CodedInputStream input,
-        ExtensionRegistryLite extensionRegistry,
-        Descriptors.FieldDescriptor field,
-        Message defaultInstance)
-        throws IOException {
-      Message.Builder subBuilder;
-      // When default instance is not null. The field is an extension field.
-      if (defaultInstance != null) {
-        subBuilder = defaultInstance.newBuilderForType();
-      } else {
-        subBuilder = builder.newBuilderForField(field);
-      }
-      if (!field.isRepeated()) {
-        Message originalMessage = (Message) getField(field);
-        if (originalMessage != null) {
-          subBuilder.mergeFrom(originalMessage);
-        }
-      }
-      input.readGroup(field.getNumber(), subBuilder, extensionRegistry);
-      return subBuilder.buildPartial();
-    }
-
-    @Override
-    public Object parseMessage(
-        CodedInputStream input,
-        ExtensionRegistryLite extensionRegistry,
-        Descriptors.FieldDescriptor field,
-        Message defaultInstance)
-        throws IOException {
-      Message.Builder subBuilder;
-      // When default instance is not null. The field is an extension field.
-      if (defaultInstance != null) {
-        subBuilder = defaultInstance.newBuilderForType();
-      } else {
-        subBuilder = builder.newBuilderForField(field);
-      }
-      if (!field.isRepeated()) {
-        Message originalMessage = (Message) getField(field);
-        if (originalMessage != null) {
-          subBuilder.mergeFrom(originalMessage);
-        }
-      }
-      input.readMessage(subBuilder, extensionRegistry);
-      return subBuilder.buildPartial();
-    }
-
-    @Override
-    public Object parseMessageFromBytes(
-        ByteString bytes,
-        ExtensionRegistryLite extensionRegistry,
-        Descriptors.FieldDescriptor field,
-        Message defaultInstance)
-        throws IOException {
-      Message.Builder subBuilder;
-      // When default instance is not null. The field is an extension field.
-      if (defaultInstance != null) {
-        subBuilder = defaultInstance.newBuilderForType();
-      } else {
-        subBuilder = builder.newBuilderForField(field);
-      }
-      if (!field.isRepeated()) {
-        Message originalMessage = (Message) getField(field);
-        if (originalMessage != null) {
-          subBuilder.mergeFrom(originalMessage);
-        }
-      }
-      subBuilder.mergeFrom(bytes, extensionRegistry);
-      return subBuilder.buildPartial();
-    }
-
-    @Override
-    public void mergeGroup(
-        CodedInputStream input,
-        ExtensionRegistryLite extensionRegistry,
-        FieldDescriptor field,
-        Message defaultInstance)
-        throws IOException {
-      if (!field.isRepeated()) {
-        Message.Builder subBuilder;
-        if (hasField(field)) {
-          subBuilder = getFieldBuilder(field);
-          if (subBuilder != null) {
-            input.readGroup(field.getNumber(), subBuilder, extensionRegistry);
-            return;
-          } else {
-            subBuilder = newMessageFieldInstance(field, defaultInstance);
-            subBuilder.mergeFrom((Message) getField(field));
-          }
-        } else {
-          subBuilder = newMessageFieldInstance(field, defaultInstance);
-        }
-        input.readGroup(field.getNumber(), subBuilder, extensionRegistry);
-        Object unused = setField(field, subBuilder.buildPartial());
-      } else {
-        Message.Builder subBuilder = newMessageFieldInstance(field, defaultInstance);
-        input.readGroup(field.getNumber(), subBuilder, extensionRegistry);
-        Object unused = addRepeatedField(field, subBuilder.buildPartial());
-      }
-    }
-
-    @Override
-    public void mergeMessage(
-        CodedInputStream input,
-        ExtensionRegistryLite extensionRegistry,
-        Descriptors.FieldDescriptor field,
-        Message defaultInstance)
-        throws IOException {
-      if (!field.isRepeated()) {
-        Message.Builder subBuilder;
-        if (hasField(field)) {
-          subBuilder = getFieldBuilder(field);
-          if (subBuilder != null) {
-            input.readMessage(subBuilder, extensionRegistry);
-            return;
-          } else {
-            subBuilder = newMessageFieldInstance(field, defaultInstance);
-            subBuilder.mergeFrom((Message) getField(field));
-          }
-        } else {
-          subBuilder = newMessageFieldInstance(field, defaultInstance);
-        }
-        input.readMessage(subBuilder, extensionRegistry);
-        Object unused = setField(field, subBuilder.buildPartial());
-      } else {
-        Message.Builder subBuilder = newMessageFieldInstance(field, defaultInstance);
-        input.readMessage(subBuilder, extensionRegistry);
-        Object unused = addRepeatedField(field, subBuilder.buildPartial());
-      }
-    }
-
-    private Message.Builder newMessageFieldInstance(
-        FieldDescriptor field, Message defaultInstance) {
-      // When default instance is not null. The field is an extension field.
-      if (defaultInstance != null) {
-        return defaultInstance.newBuilderForType();
-      } else {
-        return builder.newBuilderForField(field);
-      }
-    }
-
-    @Override
-    public MergeTarget newMergeTargetForField(
-        Descriptors.FieldDescriptor field, Message defaultInstance) {
-      Message.Builder subBuilder;
-      if (!field.isRepeated() && hasField(field)) {
-        subBuilder = getFieldBuilder(field);
-        if (subBuilder != null) {
-          return new BuilderAdapter(subBuilder);
-        }
-      }
-
-      subBuilder = newMessageFieldInstance(field, defaultInstance);
-      if (!field.isRepeated()) {
-        Message originalMessage = (Message) getField(field);
-        if (originalMessage != null) {
-          subBuilder.mergeFrom(originalMessage);
-        }
-      }
-      return new BuilderAdapter(subBuilder);
-    }
-
-    @Override
-    public MergeTarget newEmptyTargetForField(
-        Descriptors.FieldDescriptor field, Message defaultInstance) {
-      Message.Builder subBuilder;
-      if (defaultInstance != null) {
-        subBuilder = defaultInstance.newBuilderForType();
-      } else {
-        subBuilder = builder.newBuilderForField(field);
-      }
-      return new BuilderAdapter(subBuilder);
-    }
-
-    @Override
-    public WireFormat.Utf8Validation getUtf8Validation(Descriptors.FieldDescriptor descriptor) {
-      if (descriptor.needsUtf8Check()) {
-        return WireFormat.Utf8Validation.STRICT;
-      }
-      // TODO(liujisi): support lazy strings for repeated fields.
-      if (!descriptor.isRepeated() && builder instanceof GeneratedMessage.Builder) {
-        return WireFormat.Utf8Validation.LAZY;
-      }
-      return WireFormat.Utf8Validation.LOOSE;
-    }
-
-    @Override
-    public Object finish() {
-      return builder;
-    }
-  }
-
-
-  static class ExtensionAdapter implements MergeTarget {
-
-    private final FieldSet<Descriptors.FieldDescriptor> extensions;
-
-    ExtensionAdapter(FieldSet<Descriptors.FieldDescriptor> extensions) {
-      this.extensions = extensions;
-    }
-
-    @Override
-    public Descriptors.Descriptor getDescriptorForType() {
-      throw new UnsupportedOperationException("getDescriptorForType() called on FieldSet object");
-    }
-
-    @Override
-    public Object getField(Descriptors.FieldDescriptor field) {
-      return extensions.getField(field);
-    }
-
-    @Override
-    public boolean hasField(Descriptors.FieldDescriptor field) {
-      return extensions.hasField(field);
-    }
-
-    @Override
-    public MergeTarget setField(Descriptors.FieldDescriptor field, Object value) {
-      extensions.setField(field, value);
-      return this;
-    }
-
-    @Override
-    public MergeTarget clearField(Descriptors.FieldDescriptor field) {
-      extensions.clearField(field);
-      return this;
-    }
-
-    @Override
-    public MergeTarget setRepeatedField(
-        Descriptors.FieldDescriptor field, int index, Object value) {
-      extensions.setRepeatedField(field, index, value);
-      return this;
-    }
-
-    @Override
-    public MergeTarget addRepeatedField(Descriptors.FieldDescriptor field, Object value) {
-      extensions.addRepeatedField(field, value);
-      return this;
-    }
-
-    @Override
-    public boolean hasOneof(Descriptors.OneofDescriptor oneof) {
-      return false;
-    }
-
-    @Override
-    public MergeTarget clearOneof(Descriptors.OneofDescriptor oneof) {
-      // Nothing to clear.
-      return this;
-    }
-
-    @Override
-    public Descriptors.FieldDescriptor getOneofFieldDescriptor(Descriptors.OneofDescriptor oneof) {
-      return null;
-    }
-
-    @Override
-    public ContainerType getContainerType() {
-      return ContainerType.EXTENSION_SET;
-    }
-
-    @Override
-    public ExtensionRegistry.ExtensionInfo findExtensionByName(
-        ExtensionRegistry registry, String name) {
-      return registry.findImmutableExtensionByName(name);
-    }
-
-    @Override
-    public ExtensionRegistry.ExtensionInfo findExtensionByNumber(
-        ExtensionRegistry registry, Descriptors.Descriptor containingType, int fieldNumber) {
-      return registry.findImmutableExtensionByNumber(containingType, fieldNumber);
-    }
-
-    @Override
-    public Object parseGroup(
-        CodedInputStream input,
-        ExtensionRegistryLite registry,
-        Descriptors.FieldDescriptor field,
-        Message defaultInstance)
-        throws IOException {
-      Message.Builder subBuilder = defaultInstance.newBuilderForType();
-      if (!field.isRepeated()) {
-        Message originalMessage = (Message) getField(field);
-        if (originalMessage != null) {
-          subBuilder.mergeFrom(originalMessage);
-        }
-      }
-      input.readGroup(field.getNumber(), subBuilder, registry);
-      return subBuilder.buildPartial();
-    }
-
-    @Override
-    public Object parseMessage(
-        CodedInputStream input,
-        ExtensionRegistryLite registry,
-        Descriptors.FieldDescriptor field,
-        Message defaultInstance)
-        throws IOException {
-      Message.Builder subBuilder = defaultInstance.newBuilderForType();
-      if (!field.isRepeated()) {
-        Message originalMessage = (Message) getField(field);
-        if (originalMessage != null) {
-          subBuilder.mergeFrom(originalMessage);
-        }
-      }
-      input.readMessage(subBuilder, registry);
-      return subBuilder.buildPartial();
-    }
-
-    @Override
-    public void mergeGroup(
-        CodedInputStream input,
-        ExtensionRegistryLite extensionRegistry,
-        FieldDescriptor field,
-        Message defaultInstance)
-        throws IOException {
-      if (!field.isRepeated()) {
-        if (hasField(field)) {
-          MessageLite.Builder current = ((MessageLite) getField(field)).toBuilder();
-          input.readGroup(field.getNumber(), current, extensionRegistry);
-          Object unused = setField(field, current.buildPartial());
-          return;
-        }
-        Message.Builder subBuilder = defaultInstance.newBuilderForType();
-        input.readGroup(field.getNumber(), subBuilder, extensionRegistry);
-        Object unused = setField(field, subBuilder.buildPartial());
-      } else {
-        Message.Builder subBuilder = defaultInstance.newBuilderForType();
-        input.readGroup(field.getNumber(), subBuilder, extensionRegistry);
-        Object unused = addRepeatedField(field, subBuilder.buildPartial());
-      }
-    }
-
-    @Override
-    public void mergeMessage(
-        CodedInputStream input,
-        ExtensionRegistryLite extensionRegistry,
-        FieldDescriptor field,
-        Message defaultInstance)
-        throws IOException {
-      if (!field.isRepeated()) {
-        if (hasField(field)) {
-          MessageLite.Builder current = ((MessageLite) getField(field)).toBuilder();
-          input.readMessage(current, extensionRegistry);
-          Object unused = setField(field, current.buildPartial());
-          return;
-        }
-        Message.Builder subBuilder = defaultInstance.newBuilderForType();
-        input.readMessage(subBuilder, extensionRegistry);
-        Object unused = setField(field, subBuilder.buildPartial());
-      } else {
-        Message.Builder subBuilder = defaultInstance.newBuilderForType();
-        input.readMessage(subBuilder, extensionRegistry);
-        Object unused = addRepeatedField(field, subBuilder.buildPartial());
-      }
-    }
-
-    @Override
-    public Object parseMessageFromBytes(
-        ByteString bytes,
-        ExtensionRegistryLite registry,
-        Descriptors.FieldDescriptor field,
-        Message defaultInstance)
-        throws IOException {
-      Message.Builder subBuilder = defaultInstance.newBuilderForType();
-      if (!field.isRepeated()) {
-        Message originalMessage = (Message) getField(field);
-        if (originalMessage != null) {
-          subBuilder.mergeFrom(originalMessage);
-        }
-      }
-      subBuilder.mergeFrom(bytes, registry);
-      return subBuilder.buildPartial();
-    }
-
-    @Override
-    public MergeTarget newMergeTargetForField(
-        Descriptors.FieldDescriptor descriptor, Message defaultInstance) {
-      throw new UnsupportedOperationException("newMergeTargetForField() called on FieldSet object");
-    }
-
-    @Override
-    public MergeTarget newEmptyTargetForField(
-        Descriptors.FieldDescriptor descriptor, Message defaultInstance) {
-      throw new UnsupportedOperationException("newEmptyTargetForField() called on FieldSet object");
-    }
-
-    @Override
-    public WireFormat.Utf8Validation getUtf8Validation(Descriptors.FieldDescriptor descriptor) {
-      if (descriptor.needsUtf8Check()) {
-        return WireFormat.Utf8Validation.STRICT;
-      }
-      // TODO(b/248145492): support lazy strings for ExtesnsionSet.
-      return WireFormat.Utf8Validation.LOOSE;
-    }
-
-    @Override
-    public Object finish() {
-      throw new UnsupportedOperationException("finish() called on FieldSet object");
-    }
-  }
-
-  static class ExtensionBuilderAdapter implements MergeTarget {
-
-    private final FieldSet.Builder<Descriptors.FieldDescriptor> extensions;
-
-    ExtensionBuilderAdapter(FieldSet.Builder<Descriptors.FieldDescriptor> extensions) {
-      this.extensions = extensions;
-    }
-
-    @Override
-    public Descriptors.Descriptor getDescriptorForType() {
-      throw new UnsupportedOperationException("getDescriptorForType() called on FieldSet object");
-    }
-
-    @Override
-    public Object getField(Descriptors.FieldDescriptor field) {
-      return extensions.getField(field);
-    }
-
-    @Override
-    public boolean hasField(Descriptors.FieldDescriptor field) {
-      return extensions.hasField(field);
-    }
-
-    @Override
-    @CanIgnoreReturnValue
-    public MergeTarget setField(Descriptors.FieldDescriptor field, Object value) {
-      extensions.setField(field, value);
-      return this;
-    }
-
-    @Override
-    @CanIgnoreReturnValue
-    public MergeTarget clearField(Descriptors.FieldDescriptor field) {
-      extensions.clearField(field);
-      return this;
-    }
-
-    @Override
-    @CanIgnoreReturnValue
-    public MergeTarget setRepeatedField(
-        Descriptors.FieldDescriptor field, int index, Object value) {
-      extensions.setRepeatedField(field, index, value);
-      return this;
-    }
-
-    @Override
-    @CanIgnoreReturnValue
-    public MergeTarget addRepeatedField(Descriptors.FieldDescriptor field, Object value) {
-      extensions.addRepeatedField(field, value);
-      return this;
-    }
-
-    @Override
-    public boolean hasOneof(Descriptors.OneofDescriptor oneof) {
-      return false;
-    }
-
-    @Override
-    @CanIgnoreReturnValue
-    public MergeTarget clearOneof(Descriptors.OneofDescriptor oneof) {
-      // Nothing to clear.
-      return this;
-    }
-
-    @Override
-    public Descriptors.FieldDescriptor getOneofFieldDescriptor(Descriptors.OneofDescriptor oneof) {
-      return null;
-    }
-
-    @Override
-    public ContainerType getContainerType() {
-      return ContainerType.EXTENSION_SET;
-    }
-
-    @Override
-    public ExtensionRegistry.ExtensionInfo findExtensionByName(
-        ExtensionRegistry registry, String name) {
-      return registry.findImmutableExtensionByName(name);
-    }
-
-    @Override
-    public ExtensionRegistry.ExtensionInfo findExtensionByNumber(
-        ExtensionRegistry registry, Descriptors.Descriptor containingType, int fieldNumber) {
-      return registry.findImmutableExtensionByNumber(containingType, fieldNumber);
-    }
-
-    @Override
-    public Object parseGroup(
-        CodedInputStream input,
-        ExtensionRegistryLite registry,
-        Descriptors.FieldDescriptor field,
-        Message defaultInstance)
-        throws IOException {
-      Message.Builder subBuilder = defaultInstance.newBuilderForType();
-      if (!field.isRepeated()) {
-        Message originalMessage = (Message) getField(field);
-        if (originalMessage != null) {
-          subBuilder.mergeFrom(originalMessage);
-        }
-      }
-      input.readGroup(field.getNumber(), subBuilder, registry);
-      return subBuilder.buildPartial();
-    }
-
-    @Override
-    public Object parseMessage(
-        CodedInputStream input,
-        ExtensionRegistryLite registry,
-        Descriptors.FieldDescriptor field,
-        Message defaultInstance)
-        throws IOException {
-      Message.Builder subBuilder = defaultInstance.newBuilderForType();
-      if (!field.isRepeated()) {
-        Message originalMessage = (Message) getField(field);
-        if (originalMessage != null) {
-          subBuilder.mergeFrom(originalMessage);
-        }
-      }
-      input.readMessage(subBuilder, registry);
-      return subBuilder.buildPartial();
-    }
-
-    @Override
-    public void mergeGroup(
-        CodedInputStream input,
-        ExtensionRegistryLite extensionRegistry,
-        FieldDescriptor field,
-        Message defaultInstance)
-        throws IOException {
-      if (!field.isRepeated()) {
-        if (hasField(field)) {
-          Object fieldOrBuilder = extensions.getFieldAllowBuilders(field);
-          MessageLite.Builder subBuilder;
-          if (fieldOrBuilder instanceof MessageLite.Builder) {
-            subBuilder = (MessageLite.Builder) fieldOrBuilder;
-          } else {
-            subBuilder = ((MessageLite) fieldOrBuilder).toBuilder();
-            extensions.setField(field, subBuilder);
-          }
-          input.readGroup(field.getNumber(), subBuilder, extensionRegistry);
-          return;
-        }
-        Message.Builder subBuilder = defaultInstance.newBuilderForType();
-        input.readGroup(field.getNumber(), subBuilder, extensionRegistry);
-        Object unused = setField(field, subBuilder);
-      } else {
-        Message.Builder subBuilder = defaultInstance.newBuilderForType();
-        input.readGroup(field.getNumber(), subBuilder, extensionRegistry);
-        Object unused = addRepeatedField(field, subBuilder.buildPartial());
-      }
-    }
-
-    @Override
-    public void mergeMessage(
-        CodedInputStream input,
-        ExtensionRegistryLite extensionRegistry,
-        FieldDescriptor field,
-        Message defaultInstance)
-        throws IOException {
-      if (!field.isRepeated()) {
-        if (hasField(field)) {
-          Object fieldOrBuilder = extensions.getFieldAllowBuilders(field);
-          MessageLite.Builder subBuilder;
-          if (fieldOrBuilder instanceof MessageLite.Builder) {
-            subBuilder = (MessageLite.Builder) fieldOrBuilder;
-          } else {
-            subBuilder = ((MessageLite) fieldOrBuilder).toBuilder();
-            extensions.setField(field, subBuilder);
-          }
-          input.readMessage(subBuilder, extensionRegistry);
-          return;
-        }
-        Message.Builder subBuilder = defaultInstance.newBuilderForType();
-        input.readMessage(subBuilder, extensionRegistry);
-        Object unused = setField(field, subBuilder);
-      } else {
-        Message.Builder subBuilder = defaultInstance.newBuilderForType();
-        input.readMessage(subBuilder, extensionRegistry);
-        Object unused = addRepeatedField(field, subBuilder.buildPartial());
-      }
-    }
-
-    @Override
-    public Object parseMessageFromBytes(
-        ByteString bytes,
-        ExtensionRegistryLite registry,
-        Descriptors.FieldDescriptor field,
-        Message defaultInstance)
-        throws IOException {
-      Message.Builder subBuilder = defaultInstance.newBuilderForType();
-      if (!field.isRepeated()) {
-        Message originalMessage = (Message) getField(field);
-        if (originalMessage != null) {
-          subBuilder.mergeFrom(originalMessage);
-        }
-      }
-      subBuilder.mergeFrom(bytes, registry);
-      return subBuilder.buildPartial();
-    }
-
-    @Override
-    public MergeTarget newMergeTargetForField(
-        Descriptors.FieldDescriptor descriptor, Message defaultInstance) {
-      throw new UnsupportedOperationException("newMergeTargetForField() called on FieldSet object");
-    }
-
-    @Override
-    public MergeTarget newEmptyTargetForField(
-        Descriptors.FieldDescriptor descriptor, Message defaultInstance) {
-      throw new UnsupportedOperationException("newEmptyTargetForField() called on FieldSet object");
-    }
-
-    @Override
-    public WireFormat.Utf8Validation getUtf8Validation(Descriptors.FieldDescriptor descriptor) {
-      if (descriptor.needsUtf8Check()) {
-        return WireFormat.Utf8Validation.STRICT;
-      }
-      // TODO(b/248145492): support lazy strings for ExtesnsionSet.
-      return WireFormat.Utf8Validation.LOOSE;
-    }
-
-    @Override
-    public Object finish() {
-      throw new UnsupportedOperationException("finish() called on FieldSet object");
-    }
-  }
-
-  /**
-   * Parses a single field into MergeTarget. The target can be Message.Builder, FieldSet or
-   * MutableMessage.
-   *
-   * <p>Package-private because it is used by GeneratedMessage.ExtendableMessage.
-   *
-   * @param tag The tag, which should have already been read.
-   * @param unknownFields If not null, unknown fields will be merged to this {@link
-   *     UnknownFieldSet}, otherwise unknown fields will be discarded.
-   * @return {@code true} unless the tag is an end-group tag.
-   */
-  static boolean mergeFieldFrom(
-      CodedInputStream input,
-      UnknownFieldSet.Builder unknownFields,
-      ExtensionRegistryLite extensionRegistry,
-      Descriptors.Descriptor type,
-      MergeTarget target,
-      int tag)
-      throws IOException {
-    if (type.getOptions().getMessageSetWireFormat() && tag == WireFormat.MESSAGE_SET_ITEM_TAG) {
-      mergeMessageSetExtensionFromCodedStream(
-          input, unknownFields, extensionRegistry, type, target);
-      return true;
-    }
-
-    final int wireType = WireFormat.getTagWireType(tag);
-    final int fieldNumber = WireFormat.getTagFieldNumber(tag);
-
-    final Descriptors.FieldDescriptor field;
-    Message defaultInstance = null;
-
-    if (type.isExtensionNumber(fieldNumber)) {
-      // extensionRegistry may be either ExtensionRegistry or
-      // ExtensionRegistryLite.  Since the type we are parsing is a full
-      // message, only a full ExtensionRegistry could possibly contain
-      // extensions of it.  Otherwise we will treat the registry as if it
-      // were empty.
-      if (extensionRegistry instanceof ExtensionRegistry) {
-        final ExtensionRegistry.ExtensionInfo extension =
-            target.findExtensionByNumber((ExtensionRegistry) extensionRegistry, type, fieldNumber);
-        if (extension == null) {
-          field = null;
-        } else {
-          field = extension.descriptor;
-          defaultInstance = extension.defaultInstance;
-          if (defaultInstance == null
-              && field.getJavaType() == Descriptors.FieldDescriptor.JavaType.MESSAGE) {
-            throw new IllegalStateException(
-                "Message-typed extension lacked default instance: " + field.getFullName());
-          }
-        }
-      } else {
-        field = null;
-      }
-    } else if (target.getContainerType() == MergeTarget.ContainerType.MESSAGE) {
-      field = type.findFieldByNumber(fieldNumber);
-    } else {
-      field = null;
-    }
-
-    boolean unknown = false;
-    boolean packed = false;
-    if (field == null) {
-      unknown = true; // Unknown field.
-    } else if (wireType
-        == FieldSet.getWireFormatForFieldType(field.getLiteType(), /* isPacked= */ false)) {
-      packed = false;
-    } else if (field.isPackable()
-        && wireType
-            == FieldSet.getWireFormatForFieldType(field.getLiteType(), /* isPacked= */ true)) {
-      packed = true;
-    } else {
-      unknown = true; // Unknown wire type.
-    }
-
-    if (unknown) { // Unknown field or wrong wire type.  Skip.
-      if (unknownFields != null) {
-        return unknownFields.mergeFieldFrom(tag, input);
-      } else {
-        return input.skipField(tag);
-      }
-    }
-
-    if (packed) {
-      final int length = input.readRawVarint32();
-      final int limit = input.pushLimit(length);
-      if (field.getLiteType() == WireFormat.FieldType.ENUM) {
-        while (input.getBytesUntilLimit() > 0) {
-          final int rawValue = input.readEnum();
-          if (field.getFile().supportsUnknownEnumValue()) {
-            target.addRepeatedField(
-                field, field.getEnumType().findValueByNumberCreatingIfUnknown(rawValue));
-          } else {
-            final Object value = field.getEnumType().findValueByNumber(rawValue);
-            // If the number isn't recognized as a valid value for this enum,
-            // add it to the unknown fields.
-            if (value == null) {
-              if (unknownFields != null) {
-                unknownFields.mergeVarintField(fieldNumber, rawValue);
-              }
-            } else {
-              target.addRepeatedField(field, value);
-            }
-          }
-        }
-      } else {
-        while (input.getBytesUntilLimit() > 0) {
-          final Object value =
-              WireFormat.readPrimitiveField(
-                  input, field.getLiteType(), target.getUtf8Validation(field));
-          target.addRepeatedField(field, value);
-        }
-      }
-      input.popLimit(limit);
-    } else {
-      final Object value;
-      switch (field.getType()) {
-        case GROUP:
-          {
-            target.mergeGroup(input, extensionRegistry, field, defaultInstance);
-            return true;
-          }
-        case MESSAGE:
-          {
-            target.mergeMessage(input, extensionRegistry, field, defaultInstance);
-            return true;
-          }
-        case ENUM:
-          final int rawValue = input.readEnum();
-          if (field.getFile().supportsUnknownEnumValue()) {
-            value = field.getEnumType().findValueByNumberCreatingIfUnknown(rawValue);
-          } else {
-            value = field.getEnumType().findValueByNumber(rawValue);
-            // If the number isn't recognized as a valid value for this enum,
-            // add it to the unknown fields.
-            if (value == null) {
-              if (unknownFields != null) {
-                unknownFields.mergeVarintField(fieldNumber, rawValue);
-              }
-              return true;
-            }
-          }
-          break;
-        default:
-          value =
-              WireFormat.readPrimitiveField(
-                  input, field.getLiteType(), target.getUtf8Validation(field));
-          break;
-      }
-
-      if (field.isRepeated()) {
-        target.addRepeatedField(field, value);
-      } else {
-        target.setField(field, value);
-      }
-    }
-
-    return true;
-  }
-
-  /** Read a message from the given input stream into the provided target and UnknownFieldSet. */
-  static void mergeMessageFrom(
-      Message.Builder target,
-      UnknownFieldSet.Builder unknownFields,
-      CodedInputStream input,
-      ExtensionRegistryLite extensionRegistry)
-      throws IOException {
-    BuilderAdapter builderAdapter = new BuilderAdapter(target);
-    Descriptor descriptorForType = target.getDescriptorForType();
-    while (true) {
-      final int tag = input.readTag();
-      if (tag == 0) {
-        break;
-      }
-
-      if (!mergeFieldFrom(
-          input, unknownFields, extensionRegistry, descriptorForType, builderAdapter, tag)) {
-        // end group tag
-        break;
-      }
-    }
-  }
-
-  /** Called by {@code #mergeFieldFrom()} to parse a MessageSet extension into MergeTarget. */
-  private static void mergeMessageSetExtensionFromCodedStream(
-      CodedInputStream input,
-      UnknownFieldSet.Builder unknownFields,
-      ExtensionRegistryLite extensionRegistry,
-      Descriptors.Descriptor type,
-      MergeTarget target)
-      throws IOException {
-
-    // The wire format for MessageSet is:
-    //   message MessageSet {
-    //     repeated group Item = 1 {
-    //       required uint32 typeId = 2;
-    //       required bytes message = 3;
-    //     }
-    //   }
-    // "typeId" is the extension's field number.  The extension can only be
-    // a message type, where "message" contains the encoded bytes of that
-    // message.
-    //
-    // In practice, we will probably never see a MessageSet item in which
-    // the message appears before the type ID, or where either field does not
-    // appear exactly once.  However, in theory such cases are valid, so we
-    // should be prepared to accept them.
-
-    int typeId = 0;
-    ByteString rawBytes = null; // If we encounter "message" before "typeId"
-    ExtensionRegistry.ExtensionInfo extension = null;
-
-    // Read bytes from input, if we get it's type first then parse it eagerly,
-    // otherwise we store the raw bytes in a local variable.
-    while (true) {
-      final int tag = input.readTag();
-      if (tag == 0) {
-        break;
-      }
-
-      if (tag == WireFormat.MESSAGE_SET_TYPE_ID_TAG) {
-        typeId = input.readUInt32();
-        if (typeId != 0) {
-          // extensionRegistry may be either ExtensionRegistry or
-          // ExtensionRegistryLite. Since the type we are parsing is a full
-          // message, only a full ExtensionRegistry could possibly contain
-          // extensions of it. Otherwise we will treat the registry as if it
-          // were empty.
-          if (extensionRegistry instanceof ExtensionRegistry) {
-            extension =
-                target.findExtensionByNumber((ExtensionRegistry) extensionRegistry, type, typeId);
-          }
-        }
-
-      } else if (tag == WireFormat.MESSAGE_SET_MESSAGE_TAG) {
-        if (typeId != 0) {
-          if (extension != null && ExtensionRegistryLite.isEagerlyParseMessageSets()) {
-            // We already know the type, so we can parse directly from the
-            // input with no copying.  Hooray!
-            eagerlyMergeMessageSetExtension(input, extension, extensionRegistry, target);
-            rawBytes = null;
-            continue;
-          }
-        }
-        // We haven't seen a type ID yet or we want parse message lazily.
-        rawBytes = input.readBytes();
-
-      } else { // Unknown tag. Skip it.
-        if (!input.skipField(tag)) {
-          break; // End of group
-        }
-      }
-    }
-    input.checkLastTagWas(WireFormat.MESSAGE_SET_ITEM_END_TAG);
-
-    // Process the raw bytes.
-    if (rawBytes != null && typeId != 0) { // Zero is not a valid type ID.
-      if (extension != null) { // We known the type
-        mergeMessageSetExtensionFromBytes(rawBytes, extension, extensionRegistry, target);
-      } else { // We don't know how to parse this. Ignore it.
-        if (rawBytes != null && unknownFields != null) {
-          unknownFields.mergeField(
-              typeId, UnknownFieldSet.Field.newBuilder().addLengthDelimited(rawBytes).build());
-        }
-      }
-    }
-  }
-
-  private static void mergeMessageSetExtensionFromBytes(
-      ByteString rawBytes,
-      ExtensionRegistry.ExtensionInfo extension,
-      ExtensionRegistryLite extensionRegistry,
-      MergeTarget target)
-      throws IOException {
-
-    Descriptors.FieldDescriptor field = extension.descriptor;
-    boolean hasOriginalValue = target.hasField(field);
-
-    if (hasOriginalValue || ExtensionRegistryLite.isEagerlyParseMessageSets()) {
-      // If the field already exists, we just parse the field.
-      Object value =
-          target.parseMessageFromBytes(
-              rawBytes, extensionRegistry, field, extension.defaultInstance);
-      target.setField(field, value);
-    } else {
-      // Use LazyField to load MessageSet lazily.
-      LazyField lazyField = new LazyField(extension.defaultInstance, extensionRegistry, rawBytes);
-      target.setField(field, lazyField);
-    }
-  }
-
-  private static void eagerlyMergeMessageSetExtension(
-      CodedInputStream input,
-      ExtensionRegistry.ExtensionInfo extension,
-      ExtensionRegistryLite extensionRegistry,
-      MergeTarget target)
-      throws IOException {
-    Descriptors.FieldDescriptor field = extension.descriptor;
-    Object value = target.parseMessage(input, extensionRegistry, field, extension.defaultInstance);
-    target.setField(field, value);
-  }
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/MessageSchema.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/MessageSchema.java
deleted file mode 100644
index 084d687..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/MessageSchema.java
+++ /dev/null
@@ -1,6057 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.protobuf.ArrayDecoders.decodeBoolList;
-import static com.google.protobuf.ArrayDecoders.decodeBytes;
-import static com.google.protobuf.ArrayDecoders.decodeBytesList;
-import static com.google.protobuf.ArrayDecoders.decodeDouble;
-import static com.google.protobuf.ArrayDecoders.decodeDoubleList;
-import static com.google.protobuf.ArrayDecoders.decodeExtensionOrUnknownField;
-import static com.google.protobuf.ArrayDecoders.decodeFixed32;
-import static com.google.protobuf.ArrayDecoders.decodeFixed32List;
-import static com.google.protobuf.ArrayDecoders.decodeFixed64;
-import static com.google.protobuf.ArrayDecoders.decodeFixed64List;
-import static com.google.protobuf.ArrayDecoders.decodeFloat;
-import static com.google.protobuf.ArrayDecoders.decodeFloatList;
-import static com.google.protobuf.ArrayDecoders.decodeGroupList;
-import static com.google.protobuf.ArrayDecoders.decodeMessageField;
-import static com.google.protobuf.ArrayDecoders.decodeMessageList;
-import static com.google.protobuf.ArrayDecoders.decodePackedBoolList;
-import static com.google.protobuf.ArrayDecoders.decodePackedDoubleList;
-import static com.google.protobuf.ArrayDecoders.decodePackedFixed32List;
-import static com.google.protobuf.ArrayDecoders.decodePackedFixed64List;
-import static com.google.protobuf.ArrayDecoders.decodePackedFloatList;
-import static com.google.protobuf.ArrayDecoders.decodePackedSInt32List;
-import static com.google.protobuf.ArrayDecoders.decodePackedSInt64List;
-import static com.google.protobuf.ArrayDecoders.decodePackedVarint32List;
-import static com.google.protobuf.ArrayDecoders.decodePackedVarint64List;
-import static com.google.protobuf.ArrayDecoders.decodeSInt32List;
-import static com.google.protobuf.ArrayDecoders.decodeSInt64List;
-import static com.google.protobuf.ArrayDecoders.decodeString;
-import static com.google.protobuf.ArrayDecoders.decodeStringList;
-import static com.google.protobuf.ArrayDecoders.decodeStringListRequireUtf8;
-import static com.google.protobuf.ArrayDecoders.decodeStringRequireUtf8;
-import static com.google.protobuf.ArrayDecoders.decodeUnknownField;
-import static com.google.protobuf.ArrayDecoders.decodeVarint32;
-import static com.google.protobuf.ArrayDecoders.decodeVarint32List;
-import static com.google.protobuf.ArrayDecoders.decodeVarint64;
-import static com.google.protobuf.ArrayDecoders.decodeVarint64List;
-import static com.google.protobuf.ArrayDecoders.mergeGroupField;
-import static com.google.protobuf.ArrayDecoders.mergeMessageField;
-import static com.google.protobuf.ArrayDecoders.skipField;
-
-import com.google.protobuf.ArrayDecoders.Registers;
-import com.google.protobuf.ByteString.CodedBuilder;
-import com.google.protobuf.FieldSet.FieldDescriptorLite;
-import com.google.protobuf.Internal.EnumVerifier;
-import com.google.protobuf.Internal.ProtobufList;
-import com.google.protobuf.MapEntryLite.Metadata;
-import java.io.IOException;
-import java.lang.reflect.Field;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-/** Schema used for standard messages. */
-@CheckReturnValue
-final class MessageSchema<T> implements Schema<T> {
-  private static final int INTS_PER_FIELD = 3;
-  private static final int OFFSET_BITS = 20;
-  private static final int OFFSET_MASK = 0XFFFFF;
-  private static final int FIELD_TYPE_MASK = 0x0FF00000;
-  private static final int REQUIRED_MASK = 0x10000000;
-  private static final int ENFORCE_UTF8_MASK = 0x20000000;
-  private static final int NO_PRESENCE_SENTINEL = -1 & OFFSET_MASK;
-  private static final int[] EMPTY_INT_ARRAY = new int[0];
-
-  /** An offset applied to the field type ID for scalar fields that are a member of a oneof. */
-  static final int ONEOF_TYPE_OFFSET = 51 /* FieldType.MAP + 1 */;
-
-  /**
-   * Keep a direct reference to the unsafe object so we don't need to go through the UnsafeUtil
-   * wrapper for every call.
-   */
-  private static final sun.misc.Unsafe UNSAFE = UnsafeUtil.getUnsafe();
-
-  /**
-   * Holds all information for accessing the message fields. The layout is as follows (field
-   * positions are relative to the offset of the start of the field in the buffer):
-   *
-   * <p>
-   *
-   * <pre>
-   * [ 0 -    3] unused
-   * [ 4 -   31] field number
-   * [32 -   33] unused
-   * [34 -   34] whether UTF-8 enforcement should be applied to a string field.
-   * [35 -   35] whether the field is required
-   * [36 -   43] field type / for oneof: field type + {@link #ONEOF_TYPE_OFFSET}
-   * [44 -   63] field offset / oneof value field offset
-   * [64 -   69] unused
-   * [70 -   75] field presence mask shift (unused for oneof/repeated fields)
-   * [76 -   95] presence field offset / oneof case field offset / cached size field offset
-   * </pre>
-   *
-   * Note that presence field offset can only use 20 bits - 1. All bits set to 1 is the sentinel
-   * value for non-presence. This is not validated at runtime, we simply assume message layouts
-   * will not exceed 1MB (assuming ~10 bytes per field, that implies 100k fields which should hit
-   * other javac limits first).
-   */
-  private final int[] buffer;
-
-  /**
-   * Holds object references for fields. For each field entry in {@code buffer}, there are two
-   * corresponding entries in this array. The content is different from different field types:
-   *
-   * <pre>
-   *   Map fields:
-   *     objects[pos] = map default entry instance
-   *     objects[pos + 1] = EnumVerifier if map value is enum, or message class reference if map
-   *                        value is message.
-   *   Message fields:
-   *     objects[pos] = null or cached message schema
-   *     objects[pos + 1] = message class reference
-   *   Enum fields:
-   *     objects[pos] = null
-   *     objects[pos + 1] = EnumVerifier
-   * </pre>
-   */
-  private final Object[] objects;
-
-  private final int minFieldNumber;
-  private final int maxFieldNumber;
-
-  private final MessageLite defaultInstance;
-  private final boolean hasExtensions;
-  private final boolean lite;
-  private final boolean proto3;
-  // TODO(xiaofeng): Make both full-runtime and lite-runtime support cached field size.
-  private final boolean useCachedSizeField;
-
-  /** Represents [checkInitialized positions, map field positions, repeated field offsets]. */
-  private final int[] intArray;
-
-  /**
-   * Values at indices 0 -> checkInitializedCount in intArray are positions to check for
-   * initialization.
-   */
-  private final int checkInitializedCount;
-
-  /**
-   * Values at indices checkInitializedCount -> repeatedFieldOffsetStart are map positions.
-   * Everything after that are repeated field offsets.
-   */
-  private final int repeatedFieldOffsetStart;
-
-  private final NewInstanceSchema newInstanceSchema;
-  private final ListFieldSchema listFieldSchema;
-  private final UnknownFieldSchema<?, ?> unknownFieldSchema;
-  private final ExtensionSchema<?> extensionSchema;
-  private final MapFieldSchema mapFieldSchema;
-
-  private MessageSchema(
-      int[] buffer,
-      Object[] objects,
-      int minFieldNumber,
-      int maxFieldNumber,
-      MessageLite defaultInstance,
-      boolean proto3,
-      boolean useCachedSizeField,
-      int[] intArray,
-      int checkInitialized,
-      int mapFieldPositions,
-      NewInstanceSchema newInstanceSchema,
-      ListFieldSchema listFieldSchema,
-      UnknownFieldSchema<?, ?> unknownFieldSchema,
-      ExtensionSchema<?> extensionSchema,
-      MapFieldSchema mapFieldSchema) {
-    this.buffer = buffer;
-    this.objects = objects;
-    this.minFieldNumber = minFieldNumber;
-    this.maxFieldNumber = maxFieldNumber;
-
-    this.lite = defaultInstance instanceof GeneratedMessageLite;
-    this.proto3 = proto3;
-    this.hasExtensions = extensionSchema != null && extensionSchema.hasExtensions(defaultInstance);
-    this.useCachedSizeField = useCachedSizeField;
-
-    this.intArray = intArray;
-    this.checkInitializedCount = checkInitialized;
-    this.repeatedFieldOffsetStart = mapFieldPositions;
-
-    this.newInstanceSchema = newInstanceSchema;
-    this.listFieldSchema = listFieldSchema;
-    this.unknownFieldSchema = unknownFieldSchema;
-    this.extensionSchema = extensionSchema;
-    this.defaultInstance = defaultInstance;
-    this.mapFieldSchema = mapFieldSchema;
-  }
-
-  static <T> MessageSchema<T> newSchema(
-      Class<T> messageClass,
-      MessageInfo messageInfo,
-      NewInstanceSchema newInstanceSchema,
-      ListFieldSchema listFieldSchema,
-      UnknownFieldSchema<?, ?> unknownFieldSchema,
-      ExtensionSchema<?> extensionSchema,
-      MapFieldSchema mapFieldSchema) {
-    if (messageInfo instanceof RawMessageInfo) {
-      return newSchemaForRawMessageInfo(
-          (RawMessageInfo) messageInfo,
-          newInstanceSchema,
-          listFieldSchema,
-          unknownFieldSchema,
-          extensionSchema,
-          mapFieldSchema);
-
-    } else {
-      return newSchemaForMessageInfo(
-          (StructuralMessageInfo) messageInfo,
-          newInstanceSchema,
-          listFieldSchema,
-          unknownFieldSchema,
-          extensionSchema,
-          mapFieldSchema);
-    }
-  }
-
-  static <T> MessageSchema<T> newSchemaForRawMessageInfo(
-      RawMessageInfo messageInfo,
-      NewInstanceSchema newInstanceSchema,
-      ListFieldSchema listFieldSchema,
-      UnknownFieldSchema<?, ?> unknownFieldSchema,
-      ExtensionSchema<?> extensionSchema,
-      MapFieldSchema mapFieldSchema) {
-    final boolean isProto3 = messageInfo.getSyntax() == ProtoSyntax.PROTO3;
-
-    String info = messageInfo.getStringInfo();
-    final int length = info.length();
-    int i = 0;
-
-    int next = info.charAt(i++);
-    if (next >= 0xD800) {
-      int result = next & 0x1FFF;
-      int shift = 13;
-      while ((next = info.charAt(i++)) >= 0xD800) {
-        result |= (next & 0x1FFF) << shift;
-        shift += 13;
-      }
-      next = result | (next << shift);
-    }
-    final int unusedFlags = next;
-
-    next = info.charAt(i++);
-    if (next >= 0xD800) {
-      int result = next & 0x1FFF;
-      int shift = 13;
-      while ((next = info.charAt(i++)) >= 0xD800) {
-        result |= (next & 0x1FFF) << shift;
-        shift += 13;
-      }
-      next = result | (next << shift);
-    }
-    final int fieldCount = next;
-
-    final int oneofCount;
-    final int hasBitsCount;
-    final int minFieldNumber;
-    final int maxFieldNumber;
-    final int numEntries;
-    final int mapFieldCount;
-    final int repeatedFieldCount;
-    final int checkInitialized;
-    final int[] intArray;
-    int objectsPosition;
-    if (fieldCount == 0) {
-      oneofCount = 0;
-      hasBitsCount = 0;
-      minFieldNumber = 0;
-      maxFieldNumber = 0;
-      numEntries = 0;
-      mapFieldCount = 0;
-      repeatedFieldCount = 0;
-      checkInitialized = 0;
-      intArray = EMPTY_INT_ARRAY;
-      objectsPosition = 0;
-    } else {
-      next = info.charAt(i++);
-      if (next >= 0xD800) {
-        int result = next & 0x1FFF;
-        int shift = 13;
-        while ((next = info.charAt(i++)) >= 0xD800) {
-          result |= (next & 0x1FFF) << shift;
-          shift += 13;
-        }
-        next = result | (next << shift);
-      }
-      oneofCount = next;
-
-      next = info.charAt(i++);
-      if (next >= 0xD800) {
-        int result = next & 0x1FFF;
-        int shift = 13;
-        while ((next = info.charAt(i++)) >= 0xD800) {
-          result |= (next & 0x1FFF) << shift;
-          shift += 13;
-        }
-        next = result | (next << shift);
-      }
-      hasBitsCount = next;
-
-      next = info.charAt(i++);
-      if (next >= 0xD800) {
-        int result = next & 0x1FFF;
-        int shift = 13;
-        while ((next = info.charAt(i++)) >= 0xD800) {
-          result |= (next & 0x1FFF) << shift;
-          shift += 13;
-        }
-        next = result | (next << shift);
-      }
-      minFieldNumber = next;
-
-      next = info.charAt(i++);
-      if (next >= 0xD800) {
-        int result = next & 0x1FFF;
-        int shift = 13;
-        while ((next = info.charAt(i++)) >= 0xD800) {
-          result |= (next & 0x1FFF) << shift;
-          shift += 13;
-        }
-        next = result | (next << shift);
-      }
-      maxFieldNumber = next;
-
-      next = info.charAt(i++);
-      if (next >= 0xD800) {
-        int result = next & 0x1FFF;
-        int shift = 13;
-        while ((next = info.charAt(i++)) >= 0xD800) {
-          result |= (next & 0x1FFF) << shift;
-          shift += 13;
-        }
-        next = result | (next << shift);
-      }
-      numEntries = next;
-
-      next = info.charAt(i++);
-      if (next >= 0xD800) {
-        int result = next & 0x1FFF;
-        int shift = 13;
-        while ((next = info.charAt(i++)) >= 0xD800) {
-          result |= (next & 0x1FFF) << shift;
-          shift += 13;
-        }
-        next = result | (next << shift);
-      }
-      mapFieldCount = next;
-
-      next = info.charAt(i++);
-      if (next >= 0xD800) {
-        int result = next & 0x1FFF;
-        int shift = 13;
-        while ((next = info.charAt(i++)) >= 0xD800) {
-          result |= (next & 0x1FFF) << shift;
-          shift += 13;
-        }
-        next = result | (next << shift);
-      }
-      repeatedFieldCount = next;
-
-      next = info.charAt(i++);
-      if (next >= 0xD800) {
-        int result = next & 0x1FFF;
-        int shift = 13;
-        while ((next = info.charAt(i++)) >= 0xD800) {
-          result |= (next & 0x1FFF) << shift;
-          shift += 13;
-        }
-        next = result | (next << shift);
-      }
-      checkInitialized = next;
-      intArray = new int[checkInitialized + mapFieldCount + repeatedFieldCount];
-      // Field objects are after a list of (oneof, oneofCase) pairs  + a list of hasbits fields.
-      objectsPosition = oneofCount * 2 + hasBitsCount;
-    }
-
-    final sun.misc.Unsafe unsafe = UNSAFE;
-    final Object[] messageInfoObjects = messageInfo.getObjects();
-    int checkInitializedPosition = 0;
-    final Class<?> messageClass = messageInfo.getDefaultInstance().getClass();
-    int[] buffer = new int[numEntries * INTS_PER_FIELD];
-    Object[] objects = new Object[numEntries * 2];
-
-    int mapFieldIndex = checkInitialized;
-    int repeatedFieldIndex = checkInitialized + mapFieldCount;
-
-    int bufferIndex = 0;
-    while (i < length) {
-      final int fieldNumber;
-      final int fieldTypeWithExtraBits;
-      final int fieldType;
-
-      next = info.charAt(i++);
-      if (next >= 0xD800) {
-        int result = next & 0x1FFF;
-        int shift = 13;
-        while ((next = info.charAt(i++)) >= 0xD800) {
-          result |= (next & 0x1FFF) << shift;
-          shift += 13;
-        }
-        next = result | (next << shift);
-      }
-      fieldNumber = next;
-
-      next = info.charAt(i++);
-      if (next >= 0xD800) {
-        int result = next & 0x1FFF;
-        int shift = 13;
-        while ((next = info.charAt(i++)) >= 0xD800) {
-          result |= (next & 0x1FFF) << shift;
-          shift += 13;
-        }
-        next = result | (next << shift);
-      }
-      fieldTypeWithExtraBits = next;
-      fieldType = fieldTypeWithExtraBits & 0xFF;
-
-      if ((fieldTypeWithExtraBits & 0x400) != 0) {
-        intArray[checkInitializedPosition++] = bufferIndex;
-      }
-
-      final int fieldOffset;
-      final int presenceMaskShift;
-      final int presenceFieldOffset;
-
-      // Oneof
-      if (fieldType >= ONEOF_TYPE_OFFSET) {
-        next = info.charAt(i++);
-        if (next >= 0xD800) {
-          int result = next & 0x1FFF;
-          int shift = 13;
-          while ((next = info.charAt(i++)) >= 0xD800) {
-            result |= (next & 0x1FFF) << shift;
-            shift += 13;
-          }
-          next = result | (next << shift);
-        }
-        int oneofIndex = next;
-
-        final int oneofFieldType = fieldType - ONEOF_TYPE_OFFSET;
-        if (oneofFieldType == 9 /* FieldType.MESSAGE */
-            || oneofFieldType == 17 /* FieldType.GROUP */) {
-          objects[bufferIndex / INTS_PER_FIELD * 2 + 1] = messageInfoObjects[objectsPosition++];
-        } else if (oneofFieldType == 12 /* FieldType.ENUM */) {
-          if (!isProto3) {
-            objects[bufferIndex / INTS_PER_FIELD * 2 + 1] = messageInfoObjects[objectsPosition++];
-          }
-        }
-
-        final java.lang.reflect.Field oneofField;
-        int index = oneofIndex * 2;
-        Object o = messageInfoObjects[index];
-        if (o instanceof java.lang.reflect.Field) {
-          oneofField = (java.lang.reflect.Field) o;
-        } else {
-          oneofField = reflectField(messageClass, (String) o);
-          // Memoize java.lang.reflect.Field instances for oneof/hasbits fields, since they're
-          // potentially used for many Protobuf fields.  Since there's a 1-1 mapping from the
-          // Protobuf field to the Java Field for non-oneofs, there's no benefit for memoizing
-          // those.
-          messageInfoObjects[index] = oneofField;
-        }
-
-        fieldOffset = (int) unsafe.objectFieldOffset(oneofField);
-
-        final java.lang.reflect.Field oneofCaseField;
-        index++;
-        o = messageInfoObjects[index];
-        if (o instanceof java.lang.reflect.Field) {
-          oneofCaseField = (java.lang.reflect.Field) o;
-        } else {
-          oneofCaseField = reflectField(messageClass, (String) o);
-          messageInfoObjects[index] = oneofCaseField;
-        }
-
-        presenceFieldOffset = (int) unsafe.objectFieldOffset(oneofCaseField);
-        presenceMaskShift = 0;
-      } else {
-        Field field = reflectField(messageClass, (String) messageInfoObjects[objectsPosition++]);
-        if (fieldType == 9 /* FieldType.MESSAGE */ || fieldType == 17 /* FieldType.GROUP */) {
-          objects[bufferIndex / INTS_PER_FIELD * 2 + 1] = field.getType();
-        } else if (fieldType == 27 /* FieldType.MESSAGE_LIST */
-            || fieldType == 49 /* FieldType.GROUP_LIST */) {
-          objects[bufferIndex / INTS_PER_FIELD * 2 + 1] = messageInfoObjects[objectsPosition++];
-        } else if (fieldType == 12 /* FieldType.ENUM */
-            || fieldType == 30 /* FieldType.ENUM_LIST */
-            || fieldType == 44 /* FieldType.ENUM_LIST_PACKED */) {
-          if (!isProto3) {
-            objects[bufferIndex / INTS_PER_FIELD * 2 + 1] = messageInfoObjects[objectsPosition++];
-          }
-        } else if (fieldType == 50 /* FieldType.MAP */) {
-          intArray[mapFieldIndex++] = bufferIndex;
-          objects[bufferIndex / INTS_PER_FIELD * 2] = messageInfoObjects[objectsPosition++];
-          if ((fieldTypeWithExtraBits & 0x800) != 0) {
-            objects[bufferIndex / INTS_PER_FIELD * 2 + 1] = messageInfoObjects[objectsPosition++];
-          }
-        }
-
-        fieldOffset = (int) unsafe.objectFieldOffset(field);
-        boolean hasHasBit = (fieldTypeWithExtraBits & 0x1000) == 0x1000;
-        if (hasHasBit && fieldType <= 17 /* FieldType.GROUP */) {
-          next = info.charAt(i++);
-          if (next >= 0xD800) {
-            int result = next & 0x1FFF;
-            int shift = 13;
-            while ((next = info.charAt(i++)) >= 0xD800) {
-              result |= (next & 0x1FFF) << shift;
-              shift += 13;
-            }
-            next = result | (next << shift);
-          }
-          int hasBitsIndex = next;
-
-          final java.lang.reflect.Field hasBitsField;
-          int index = oneofCount * 2 + hasBitsIndex / 32;
-          Object o = messageInfoObjects[index];
-          if (o instanceof java.lang.reflect.Field) {
-            hasBitsField = (java.lang.reflect.Field) o;
-          } else {
-            hasBitsField = reflectField(messageClass, (String) o);
-            messageInfoObjects[index] = hasBitsField;
-          }
-
-          presenceFieldOffset = (int) unsafe.objectFieldOffset(hasBitsField);
-          presenceMaskShift = hasBitsIndex % 32;
-        } else {
-          presenceFieldOffset = NO_PRESENCE_SENTINEL;
-          presenceMaskShift = 0;
-        }
-
-        if (fieldType >= 18 && fieldType <= 49) {
-          // Field types of repeated fields are in a consecutive range from 18 (DOUBLE_LIST) to
-          // 49 (GROUP_LIST).
-          intArray[repeatedFieldIndex++] = fieldOffset;
-        }
-      }
-
-      buffer[bufferIndex++] = fieldNumber;
-      buffer[bufferIndex++] =
-          ((fieldTypeWithExtraBits & 0x200) != 0 ? ENFORCE_UTF8_MASK : 0)
-              | ((fieldTypeWithExtraBits & 0x100) != 0 ? REQUIRED_MASK : 0)
-              | (fieldType << OFFSET_BITS)
-              | fieldOffset;
-      buffer[bufferIndex++] = (presenceMaskShift << OFFSET_BITS) | presenceFieldOffset;
-    }
-
-    return new MessageSchema<T>(
-        buffer,
-        objects,
-        minFieldNumber,
-        maxFieldNumber,
-        messageInfo.getDefaultInstance(),
-        isProto3,
-        /* useCachedSizeField= */ false,
-        intArray,
-        checkInitialized,
-        checkInitialized + mapFieldCount,
-        newInstanceSchema,
-        listFieldSchema,
-        unknownFieldSchema,
-        extensionSchema,
-        mapFieldSchema);
-  }
-
-  private static java.lang.reflect.Field reflectField(Class<?> messageClass, String fieldName) {
-    try {
-      return messageClass.getDeclaredField(fieldName);
-    } catch (NoSuchFieldException e) {
-      // Some Samsung devices lie about what fields are present via the getDeclaredField API so
-      // we do the for loop properly that they seem to have messed up...
-      java.lang.reflect.Field[] fields = messageClass.getDeclaredFields();
-      for (java.lang.reflect.Field field : fields) {
-        if (fieldName.equals(field.getName())) {
-          return field;
-        }
-      }
-
-      // If we make it here, the runtime still lies about what we know to be true at compile
-      // time. We throw to alert server monitoring for further remediation.
-      throw new RuntimeException(
-          "Field "
-              + fieldName
-              + " for "
-              + messageClass.getName()
-              + " not found. Known fields are "
-              + Arrays.toString(fields));
-    }
-  }
-
-  static <T> MessageSchema<T> newSchemaForMessageInfo(
-      StructuralMessageInfo messageInfo,
-      NewInstanceSchema newInstanceSchema,
-      ListFieldSchema listFieldSchema,
-      UnknownFieldSchema<?, ?> unknownFieldSchema,
-      ExtensionSchema<?> extensionSchema,
-      MapFieldSchema mapFieldSchema) {
-    final boolean isProto3 = messageInfo.getSyntax() == ProtoSyntax.PROTO3;
-    FieldInfo[] fis = messageInfo.getFields();
-    final int minFieldNumber;
-    final int maxFieldNumber;
-    if (fis.length == 0) {
-      minFieldNumber = 0;
-      maxFieldNumber = 0;
-    } else {
-      minFieldNumber = fis[0].getFieldNumber();
-      maxFieldNumber = fis[fis.length - 1].getFieldNumber();
-    }
-
-    final int numEntries = fis.length;
-
-    int[] buffer = new int[numEntries * INTS_PER_FIELD];
-    Object[] objects = new Object[numEntries * 2];
-
-    int mapFieldCount = 0;
-    int repeatedFieldCount = 0;
-    for (FieldInfo fi : fis) {
-      if (fi.getType() == FieldType.MAP) {
-        mapFieldCount++;
-      } else if (fi.getType().id() >= 18 && fi.getType().id() <= 49) {
-        // Field types of repeated fields are in a consecutive range from 18 (DOUBLE_LIST) to
-        // 49 (GROUP_LIST).
-        repeatedFieldCount++;
-      }
-    }
-    int[] mapFieldPositions = mapFieldCount > 0 ? new int[mapFieldCount] : null;
-    int[] repeatedFieldOffsets = repeatedFieldCount > 0 ? new int[repeatedFieldCount] : null;
-    mapFieldCount = 0;
-    repeatedFieldCount = 0;
-
-    int[] checkInitialized = messageInfo.getCheckInitialized();
-    if (checkInitialized == null) {
-      checkInitialized = EMPTY_INT_ARRAY;
-    }
-    int checkInitializedIndex = 0;
-    // Fill in the manifest data from the descriptors.
-    int fieldIndex = 0;
-    for (int bufferIndex = 0; fieldIndex < fis.length; bufferIndex += INTS_PER_FIELD) {
-      final FieldInfo fi = fis[fieldIndex];
-      final int fieldNumber = fi.getFieldNumber();
-
-      // We found the entry for the next field. Store the entry in the manifest for
-      // this field and increment the field index.
-      storeFieldData(fi, buffer, bufferIndex, objects);
-
-      // Convert field number to index
-      if (checkInitializedIndex < checkInitialized.length
-          && checkInitialized[checkInitializedIndex] == fieldNumber) {
-        checkInitialized[checkInitializedIndex++] = bufferIndex;
-      }
-
-      if (fi.getType() == FieldType.MAP) {
-        mapFieldPositions[mapFieldCount++] = bufferIndex;
-      } else if (fi.getType().id() >= 18 && fi.getType().id() <= 49) {
-        // Field types of repeated fields are in a consecutive range from 18 (DOUBLE_LIST) to
-        // 49 (GROUP_LIST).
-        repeatedFieldOffsets[repeatedFieldCount++] =
-            (int) UnsafeUtil.objectFieldOffset(fi.getField());
-      }
-
-      fieldIndex++;
-    }
-
-    if (mapFieldPositions == null) {
-      mapFieldPositions = EMPTY_INT_ARRAY;
-    }
-    if (repeatedFieldOffsets == null) {
-      repeatedFieldOffsets = EMPTY_INT_ARRAY;
-    }
-    int[] combined =
-        new int[checkInitialized.length + mapFieldPositions.length + repeatedFieldOffsets.length];
-    System.arraycopy(checkInitialized, 0, combined, 0, checkInitialized.length);
-    System.arraycopy(
-        mapFieldPositions, 0, combined, checkInitialized.length, mapFieldPositions.length);
-    System.arraycopy(
-        repeatedFieldOffsets,
-        0,
-        combined,
-        checkInitialized.length + mapFieldPositions.length,
-        repeatedFieldOffsets.length);
-
-    return new MessageSchema<T>(
-        buffer,
-        objects,
-        minFieldNumber,
-        maxFieldNumber,
-        messageInfo.getDefaultInstance(),
-        isProto3,
-        /* useCachedSizeField= */ true,
-        combined,
-        checkInitialized.length,
-        checkInitialized.length + mapFieldPositions.length,
-        newInstanceSchema,
-        listFieldSchema,
-        unknownFieldSchema,
-        extensionSchema,
-        mapFieldSchema);
-  }
-
-  private static void storeFieldData(
-      FieldInfo fi, int[] buffer, int bufferIndex, Object[] objects) {
-    final int fieldOffset;
-    final int typeId;
-    final int presenceMaskShift;
-    final int presenceFieldOffset;
-
-    OneofInfo oneof = fi.getOneof();
-    if (oneof != null) {
-      typeId = fi.getType().id() + ONEOF_TYPE_OFFSET;
-      fieldOffset = (int) UnsafeUtil.objectFieldOffset(oneof.getValueField());
-      presenceFieldOffset = (int) UnsafeUtil.objectFieldOffset(oneof.getCaseField());
-      presenceMaskShift = 0;
-    } else {
-      FieldType type = fi.getType();
-      fieldOffset = (int) UnsafeUtil.objectFieldOffset(fi.getField());
-      typeId = type.id();
-      if (!type.isList() && !type.isMap()) {
-        Field presenceField = fi.getPresenceField();
-        if (presenceField == null) {
-          presenceFieldOffset = NO_PRESENCE_SENTINEL;
-        } else {
-          presenceFieldOffset = (int) UnsafeUtil.objectFieldOffset(presenceField);
-        }
-        presenceMaskShift = Integer.numberOfTrailingZeros(fi.getPresenceMask());
-      } else {
-        if (fi.getCachedSizeField() == null) {
-          presenceFieldOffset = 0;
-          presenceMaskShift = 0;
-        } else {
-          presenceFieldOffset = (int) UnsafeUtil.objectFieldOffset(fi.getCachedSizeField());
-          presenceMaskShift = 0;
-        }
-      }
-    }
-
-    buffer[bufferIndex] = fi.getFieldNumber();
-    buffer[bufferIndex + 1] =
-        (fi.isEnforceUtf8() ? ENFORCE_UTF8_MASK : 0)
-            | (fi.isRequired() ? REQUIRED_MASK : 0)
-            | (typeId << OFFSET_BITS)
-            | fieldOffset;
-    buffer[bufferIndex + 2] = (presenceMaskShift << OFFSET_BITS) | presenceFieldOffset;
-
-    Object messageFieldClass = fi.getMessageFieldClass();
-    if (fi.getMapDefaultEntry() != null) {
-      objects[bufferIndex / INTS_PER_FIELD * 2] = fi.getMapDefaultEntry();
-      if (messageFieldClass != null) {
-        objects[bufferIndex / INTS_PER_FIELD * 2 + 1] = messageFieldClass;
-      } else if (fi.getEnumVerifier() != null) {
-        objects[bufferIndex / INTS_PER_FIELD * 2 + 1] = fi.getEnumVerifier();
-      }
-    } else {
-      if (messageFieldClass != null) {
-        objects[bufferIndex / INTS_PER_FIELD * 2 + 1] = messageFieldClass;
-      } else if (fi.getEnumVerifier() != null) {
-        objects[bufferIndex / INTS_PER_FIELD * 2 + 1] = fi.getEnumVerifier();
-      }
-    }
-  }
-
-  @SuppressWarnings("unchecked")
-  @Override
-  public T newInstance() {
-    return (T) newInstanceSchema.newInstance(defaultInstance);
-  }
-
-  @Override
-  public boolean equals(T message, T other) {
-    final int bufferLength = buffer.length;
-    for (int pos = 0; pos < bufferLength; pos += INTS_PER_FIELD) {
-      if (!equals(message, other, pos)) {
-        return false;
-      }
-    }
-
-    Object messageUnknown = unknownFieldSchema.getFromMessage(message);
-    Object otherUnknown = unknownFieldSchema.getFromMessage(other);
-    if (!messageUnknown.equals(otherUnknown)) {
-      return false;
-    }
-
-    if (hasExtensions) {
-      FieldSet<?> messageExtensions = extensionSchema.getExtensions(message);
-      FieldSet<?> otherExtensions = extensionSchema.getExtensions(other);
-      return messageExtensions.equals(otherExtensions);
-    }
-    return true;
-  }
-
-  private boolean equals(T message, T other, int pos) {
-    final int typeAndOffset = typeAndOffsetAt(pos);
-    final long offset = offset(typeAndOffset);
-
-    switch (type(typeAndOffset)) {
-      case 0: // DOUBLE:
-        return arePresentForEquals(message, other, pos)
-            && Double.doubleToLongBits(UnsafeUtil.getDouble(message, offset))
-                == Double.doubleToLongBits(UnsafeUtil.getDouble(other, offset));
-      case 1: // FLOAT:
-        return arePresentForEquals(message, other, pos)
-            && Float.floatToIntBits(UnsafeUtil.getFloat(message, offset))
-                == Float.floatToIntBits(UnsafeUtil.getFloat(other, offset));
-      case 2: // INT64:
-        return arePresentForEquals(message, other, pos)
-            && UnsafeUtil.getLong(message, offset) == UnsafeUtil.getLong(other, offset);
-      case 3: // UINT64:
-        return arePresentForEquals(message, other, pos)
-            && UnsafeUtil.getLong(message, offset) == UnsafeUtil.getLong(other, offset);
-      case 4: // INT32:
-        return arePresentForEquals(message, other, pos)
-            && UnsafeUtil.getInt(message, offset) == UnsafeUtil.getInt(other, offset);
-      case 5: // FIXED64:
-        return arePresentForEquals(message, other, pos)
-            && UnsafeUtil.getLong(message, offset) == UnsafeUtil.getLong(other, offset);
-      case 6: // FIXED32:
-        return arePresentForEquals(message, other, pos)
-            && UnsafeUtil.getInt(message, offset) == UnsafeUtil.getInt(other, offset);
-      case 7: // BOOL:
-        return arePresentForEquals(message, other, pos)
-            && UnsafeUtil.getBoolean(message, offset) == UnsafeUtil.getBoolean(other, offset);
-      case 8: // STRING:
-        return arePresentForEquals(message, other, pos)
-            && SchemaUtil.safeEquals(
-                UnsafeUtil.getObject(message, offset), UnsafeUtil.getObject(other, offset));
-      case 9: // MESSAGE:
-        return arePresentForEquals(message, other, pos)
-            && SchemaUtil.safeEquals(
-                UnsafeUtil.getObject(message, offset), UnsafeUtil.getObject(other, offset));
-      case 10: // BYTES:
-        return arePresentForEquals(message, other, pos)
-            && SchemaUtil.safeEquals(
-                UnsafeUtil.getObject(message, offset), UnsafeUtil.getObject(other, offset));
-      case 11: // UINT32:
-        return arePresentForEquals(message, other, pos)
-            && UnsafeUtil.getInt(message, offset) == UnsafeUtil.getInt(other, offset);
-      case 12: // ENUM:
-        return arePresentForEquals(message, other, pos)
-            && UnsafeUtil.getInt(message, offset) == UnsafeUtil.getInt(other, offset);
-      case 13: // SFIXED32:
-        return arePresentForEquals(message, other, pos)
-            && UnsafeUtil.getInt(message, offset) == UnsafeUtil.getInt(other, offset);
-      case 14: // SFIXED64:
-        return arePresentForEquals(message, other, pos)
-            && UnsafeUtil.getLong(message, offset) == UnsafeUtil.getLong(other, offset);
-      case 15: // SINT32:
-        return arePresentForEquals(message, other, pos)
-            && UnsafeUtil.getInt(message, offset) == UnsafeUtil.getInt(other, offset);
-      case 16: // SINT64:
-        return arePresentForEquals(message, other, pos)
-            && UnsafeUtil.getLong(message, offset) == UnsafeUtil.getLong(other, offset);
-      case 17: // GROUP:
-        return arePresentForEquals(message, other, pos)
-            && SchemaUtil.safeEquals(
-                UnsafeUtil.getObject(message, offset), UnsafeUtil.getObject(other, offset));
-
-      case 18: // DOUBLE_LIST:
-      case 19: // FLOAT_LIST:
-      case 20: // INT64_LIST:
-      case 21: // UINT64_LIST:
-      case 22: // INT32_LIST:
-      case 23: // FIXED64_LIST:
-      case 24: // FIXED32_LIST:
-      case 25: // BOOL_LIST:
-      case 26: // STRING_LIST:
-      case 27: // MESSAGE_LIST:
-      case 28: // BYTES_LIST:
-      case 29: // UINT32_LIST:
-      case 30: // ENUM_LIST:
-      case 31: // SFIXED32_LIST:
-      case 32: // SFIXED64_LIST:
-      case 33: // SINT32_LIST:
-      case 34: // SINT64_LIST:
-      case 35: // DOUBLE_LIST_PACKED:
-      case 36: // FLOAT_LIST_PACKED:
-      case 37: // INT64_LIST_PACKED:
-      case 38: // UINT64_LIST_PACKED:
-      case 39: // INT32_LIST_PACKED:
-      case 40: // FIXED64_LIST_PACKED:
-      case 41: // FIXED32_LIST_PACKED:
-      case 42: // BOOL_LIST_PACKED:
-      case 43: // UINT32_LIST_PACKED:
-      case 44: // ENUM_LIST_PACKED:
-      case 45: // SFIXED32_LIST_PACKED:
-      case 46: // SFIXED64_LIST_PACKED:
-      case 47: // SINT32_LIST_PACKED:
-      case 48: // SINT64_LIST_PACKED:
-      case 49: // GROUP_LIST:
-        return SchemaUtil.safeEquals(
-            UnsafeUtil.getObject(message, offset), UnsafeUtil.getObject(other, offset));
-      case 50: // MAP:
-        return SchemaUtil.safeEquals(
-            UnsafeUtil.getObject(message, offset), UnsafeUtil.getObject(other, offset));
-      case 51: // ONEOF_DOUBLE:
-      case 52: // ONEOF_FLOAT:
-      case 53: // ONEOF_INT64:
-      case 54: // ONEOF_UINT64:
-      case 55: // ONEOF_INT32:
-      case 56: // ONEOF_FIXED64:
-      case 57: // ONEOF_FIXED32:
-      case 58: // ONEOF_BOOL:
-      case 59: // ONEOF_STRING:
-      case 60: // ONEOF_MESSAGE:
-      case 61: // ONEOF_BYTES:
-      case 62: // ONEOF_UINT32:
-      case 63: // ONEOF_ENUM:
-      case 64: // ONEOF_SFIXED32:
-      case 65: // ONEOF_SFIXED64:
-      case 66: // ONEOF_SINT32:
-      case 67: // ONEOF_SINT64:
-      case 68: // ONEOF_GROUP:
-        return isOneofCaseEqual(message, other, pos)
-            && SchemaUtil.safeEquals(
-                UnsafeUtil.getObject(message, offset), UnsafeUtil.getObject(other, offset));
-      default:
-        // Assume it's an empty entry - just go to the next entry.
-        return true;
-    }
-  }
-
-  @Override
-  public int hashCode(T message) {
-    int hashCode = 0;
-    final int bufferLength = buffer.length;
-    for (int pos = 0; pos < bufferLength; pos += INTS_PER_FIELD) {
-      final int typeAndOffset = typeAndOffsetAt(pos);
-      final int entryNumber = numberAt(pos);
-
-      final long offset = offset(typeAndOffset);
-
-      switch (type(typeAndOffset)) {
-        case 0: // DOUBLE:
-          hashCode =
-              (hashCode * 53)
-                  + Internal.hashLong(
-                      Double.doubleToLongBits(UnsafeUtil.getDouble(message, offset)));
-          break;
-        case 1: // FLOAT:
-          hashCode = (hashCode * 53) + Float.floatToIntBits(UnsafeUtil.getFloat(message, offset));
-          break;
-        case 2: // INT64:
-          hashCode = (hashCode * 53) + Internal.hashLong(UnsafeUtil.getLong(message, offset));
-          break;
-        case 3: // UINT64:
-          hashCode = (hashCode * 53) + Internal.hashLong(UnsafeUtil.getLong(message, offset));
-          break;
-        case 4: // INT32:
-          hashCode = (hashCode * 53) + (UnsafeUtil.getInt(message, offset));
-          break;
-        case 5: // FIXED64:
-          hashCode = (hashCode * 53) + Internal.hashLong(UnsafeUtil.getLong(message, offset));
-          break;
-        case 6: // FIXED32:
-          hashCode = (hashCode * 53) + (UnsafeUtil.getInt(message, offset));
-          break;
-        case 7: // BOOL:
-          hashCode = (hashCode * 53) + Internal.hashBoolean(UnsafeUtil.getBoolean(message, offset));
-          break;
-        case 8: // STRING:
-          hashCode = (hashCode * 53) + ((String) UnsafeUtil.getObject(message, offset)).hashCode();
-          break;
-        case 9: // MESSAGE:
-          {
-            int protoHash = 37;
-            Object submessage = UnsafeUtil.getObject(message, offset);
-            if (submessage != null) {
-              protoHash = submessage.hashCode();
-            }
-            hashCode = (53 * hashCode) + protoHash;
-            break;
-          }
-        case 10: // BYTES:
-          hashCode = (hashCode * 53) + UnsafeUtil.getObject(message, offset).hashCode();
-          break;
-        case 11: // UINT32:
-          hashCode = (hashCode * 53) + (UnsafeUtil.getInt(message, offset));
-          break;
-        case 12: // ENUM:
-          hashCode = (hashCode * 53) + (UnsafeUtil.getInt(message, offset));
-          break;
-        case 13: // SFIXED32:
-          hashCode = (hashCode * 53) + (UnsafeUtil.getInt(message, offset));
-          break;
-        case 14: // SFIXED64:
-          hashCode = (hashCode * 53) + Internal.hashLong(UnsafeUtil.getLong(message, offset));
-          break;
-        case 15: // SINT32:
-          hashCode = (hashCode * 53) + (UnsafeUtil.getInt(message, offset));
-          break;
-        case 16: // SINT64:
-          hashCode = (hashCode * 53) + Internal.hashLong(UnsafeUtil.getLong(message, offset));
-          break;
-
-        case 17: // GROUP:
-          {
-            int protoHash = 37;
-            Object submessage = UnsafeUtil.getObject(message, offset);
-            if (submessage != null) {
-              protoHash = submessage.hashCode();
-            }
-            hashCode = (53 * hashCode) + protoHash;
-            break;
-          }
-        case 18: // DOUBLE_LIST:
-        case 19: // FLOAT_LIST:
-        case 20: // INT64_LIST:
-        case 21: // UINT64_LIST:
-        case 22: // INT32_LIST:
-        case 23: // FIXED64_LIST:
-        case 24: // FIXED32_LIST:
-        case 25: // BOOL_LIST:
-        case 26: // STRING_LIST:
-        case 27: // MESSAGE_LIST:
-        case 28: // BYTES_LIST:
-        case 29: // UINT32_LIST:
-        case 30: // ENUM_LIST:
-        case 31: // SFIXED32_LIST:
-        case 32: // SFIXED64_LIST:
-        case 33: // SINT32_LIST:
-        case 34: // SINT64_LIST:
-        case 35: // DOUBLE_LIST_PACKED:
-        case 36: // FLOAT_LIST_PACKED:
-        case 37: // INT64_LIST_PACKED:
-        case 38: // UINT64_LIST_PACKED:
-        case 39: // INT32_LIST_PACKED:
-        case 40: // FIXED64_LIST_PACKED:
-        case 41: // FIXED32_LIST_PACKED:
-        case 42: // BOOL_LIST_PACKED:
-        case 43: // UINT32_LIST_PACKED:
-        case 44: // ENUM_LIST_PACKED:
-        case 45: // SFIXED32_LIST_PACKED:
-        case 46: // SFIXED64_LIST_PACKED:
-        case 47: // SINT32_LIST_PACKED:
-        case 48: // SINT64_LIST_PACKED:
-        case 49: // GROUP_LIST:
-          hashCode = (hashCode * 53) + UnsafeUtil.getObject(message, offset).hashCode();
-          break;
-        case 50: // MAP:
-          hashCode = (hashCode * 53) + UnsafeUtil.getObject(message, offset).hashCode();
-          break;
-        case 51: // ONEOF_DOUBLE:
-          if (isOneofPresent(message, entryNumber, pos)) {
-            hashCode =
-                (hashCode * 53)
-                    + Internal.hashLong(Double.doubleToLongBits(oneofDoubleAt(message, offset)));
-          }
-          break;
-        case 52: // ONEOF_FLOAT:
-          if (isOneofPresent(message, entryNumber, pos)) {
-            hashCode = (hashCode * 53) + Float.floatToIntBits(oneofFloatAt(message, offset));
-          }
-          break;
-        case 53: // ONEOF_INT64:
-          if (isOneofPresent(message, entryNumber, pos)) {
-            hashCode = (hashCode * 53) + Internal.hashLong(oneofLongAt(message, offset));
-          }
-          break;
-        case 54: // ONEOF_UINT64:
-          if (isOneofPresent(message, entryNumber, pos)) {
-            hashCode = (hashCode * 53) + Internal.hashLong(oneofLongAt(message, offset));
-          }
-          break;
-        case 55: // ONEOF_INT32:
-          if (isOneofPresent(message, entryNumber, pos)) {
-            hashCode = (hashCode * 53) + (oneofIntAt(message, offset));
-          }
-          break;
-        case 56: // ONEOF_FIXED64:
-          if (isOneofPresent(message, entryNumber, pos)) {
-            hashCode = (hashCode * 53) + Internal.hashLong(oneofLongAt(message, offset));
-          }
-          break;
-        case 57: // ONEOF_FIXED32:
-          if (isOneofPresent(message, entryNumber, pos)) {
-            hashCode = (hashCode * 53) + (oneofIntAt(message, offset));
-          }
-          break;
-        case 58: // ONEOF_BOOL:
-          if (isOneofPresent(message, entryNumber, pos)) {
-            hashCode = (hashCode * 53) + Internal.hashBoolean(oneofBooleanAt(message, offset));
-          }
-          break;
-        case 59: // ONEOF_STRING:
-          if (isOneofPresent(message, entryNumber, pos)) {
-            hashCode =
-                (hashCode * 53) + ((String) UnsafeUtil.getObject(message, offset)).hashCode();
-          }
-          break;
-        case 60: // ONEOF_MESSAGE:
-          if (isOneofPresent(message, entryNumber, pos)) {
-            Object submessage = UnsafeUtil.getObject(message, offset);
-            hashCode = (53 * hashCode) + submessage.hashCode();
-          }
-          break;
-        case 61: // ONEOF_BYTES:
-          if (isOneofPresent(message, entryNumber, pos)) {
-            hashCode = (hashCode * 53) + UnsafeUtil.getObject(message, offset).hashCode();
-          }
-          break;
-        case 62: // ONEOF_UINT32:
-          if (isOneofPresent(message, entryNumber, pos)) {
-            hashCode = (hashCode * 53) + (oneofIntAt(message, offset));
-          }
-          break;
-        case 63: // ONEOF_ENUM:
-          if (isOneofPresent(message, entryNumber, pos)) {
-            hashCode = (hashCode * 53) + (oneofIntAt(message, offset));
-          }
-          break;
-        case 64: // ONEOF_SFIXED32:
-          if (isOneofPresent(message, entryNumber, pos)) {
-            hashCode = (hashCode * 53) + (oneofIntAt(message, offset));
-          }
-          break;
-        case 65: // ONEOF_SFIXED64:
-          if (isOneofPresent(message, entryNumber, pos)) {
-            hashCode = (hashCode * 53) + Internal.hashLong(oneofLongAt(message, offset));
-          }
-          break;
-        case 66: // ONEOF_SINT32:
-          if (isOneofPresent(message, entryNumber, pos)) {
-            hashCode = (hashCode * 53) + (oneofIntAt(message, offset));
-          }
-          break;
-        case 67: // ONEOF_SINT64:
-          if (isOneofPresent(message, entryNumber, pos)) {
-            hashCode = (hashCode * 53) + Internal.hashLong(oneofLongAt(message, offset));
-          }
-          break;
-        case 68: // ONEOF_GROUP:
-          if (isOneofPresent(message, entryNumber, pos)) {
-            Object submessage = UnsafeUtil.getObject(message, offset);
-            hashCode = (53 * hashCode) + submessage.hashCode();
-          }
-          break;
-        default:
-          // Assume it's an empty entry - just go to the next entry.
-          break;
-      }
-    }
-
-    hashCode = (hashCode * 53) + unknownFieldSchema.getFromMessage(message).hashCode();
-
-    if (hasExtensions) {
-      hashCode = (hashCode * 53) + extensionSchema.getExtensions(message).hashCode();
-    }
-
-    return hashCode;
-  }
-
-  @Override
-  public void mergeFrom(T message, T other) {
-    checkMutable(message);
-    if (other == null) {
-      throw new NullPointerException();
-    }
-    for (int i = 0; i < buffer.length; i += INTS_PER_FIELD) {
-      // A separate method allows for better JIT optimizations
-      mergeSingleField(message, other, i);
-    }
-
-    SchemaUtil.mergeUnknownFields(unknownFieldSchema, message, other);
-
-    if (hasExtensions) {
-      SchemaUtil.mergeExtensions(extensionSchema, message, other);
-    }
-  }
-
-  private void mergeSingleField(T message, T other, int pos) {
-    final int typeAndOffset = typeAndOffsetAt(pos);
-    final long offset = offset(typeAndOffset);
-    final int number = numberAt(pos);
-
-    switch (type(typeAndOffset)) {
-      case 0: // DOUBLE:
-        if (isFieldPresent(other, pos)) {
-          UnsafeUtil.putDouble(message, offset, UnsafeUtil.getDouble(other, offset));
-          setFieldPresent(message, pos);
-        }
-        break;
-      case 1: // FLOAT:
-        if (isFieldPresent(other, pos)) {
-          UnsafeUtil.putFloat(message, offset, UnsafeUtil.getFloat(other, offset));
-          setFieldPresent(message, pos);
-        }
-        break;
-      case 2: // INT64:
-        if (isFieldPresent(other, pos)) {
-          UnsafeUtil.putLong(message, offset, UnsafeUtil.getLong(other, offset));
-          setFieldPresent(message, pos);
-        }
-        break;
-      case 3: // UINT64:
-        if (isFieldPresent(other, pos)) {
-          UnsafeUtil.putLong(message, offset, UnsafeUtil.getLong(other, offset));
-          setFieldPresent(message, pos);
-        }
-        break;
-      case 4: // INT32:
-        if (isFieldPresent(other, pos)) {
-          UnsafeUtil.putInt(message, offset, UnsafeUtil.getInt(other, offset));
-          setFieldPresent(message, pos);
-        }
-        break;
-      case 5: // FIXED64:
-        if (isFieldPresent(other, pos)) {
-          UnsafeUtil.putLong(message, offset, UnsafeUtil.getLong(other, offset));
-          setFieldPresent(message, pos);
-        }
-        break;
-      case 6: // FIXED32:
-        if (isFieldPresent(other, pos)) {
-          UnsafeUtil.putInt(message, offset, UnsafeUtil.getInt(other, offset));
-          setFieldPresent(message, pos);
-        }
-        break;
-      case 7: // BOOL:
-        if (isFieldPresent(other, pos)) {
-          UnsafeUtil.putBoolean(message, offset, UnsafeUtil.getBoolean(other, offset));
-          setFieldPresent(message, pos);
-        }
-        break;
-      case 8: // STRING:
-        if (isFieldPresent(other, pos)) {
-          UnsafeUtil.putObject(message, offset, UnsafeUtil.getObject(other, offset));
-          setFieldPresent(message, pos);
-        }
-        break;
-      case 9: // MESSAGE:
-        mergeMessage(message, other, pos);
-        break;
-      case 10: // BYTES:
-        if (isFieldPresent(other, pos)) {
-          UnsafeUtil.putObject(message, offset, UnsafeUtil.getObject(other, offset));
-          setFieldPresent(message, pos);
-        }
-        break;
-      case 11: // UINT32:
-        if (isFieldPresent(other, pos)) {
-          UnsafeUtil.putInt(message, offset, UnsafeUtil.getInt(other, offset));
-          setFieldPresent(message, pos);
-        }
-        break;
-      case 12: // ENUM:
-        if (isFieldPresent(other, pos)) {
-          UnsafeUtil.putInt(message, offset, UnsafeUtil.getInt(other, offset));
-          setFieldPresent(message, pos);
-        }
-        break;
-      case 13: // SFIXED32:
-        if (isFieldPresent(other, pos)) {
-          UnsafeUtil.putInt(message, offset, UnsafeUtil.getInt(other, offset));
-          setFieldPresent(message, pos);
-        }
-        break;
-      case 14: // SFIXED64:
-        if (isFieldPresent(other, pos)) {
-          UnsafeUtil.putLong(message, offset, UnsafeUtil.getLong(other, offset));
-          setFieldPresent(message, pos);
-        }
-        break;
-      case 15: // SINT32:
-        if (isFieldPresent(other, pos)) {
-          UnsafeUtil.putInt(message, offset, UnsafeUtil.getInt(other, offset));
-          setFieldPresent(message, pos);
-        }
-        break;
-      case 16: // SINT64:
-        if (isFieldPresent(other, pos)) {
-          UnsafeUtil.putLong(message, offset, UnsafeUtil.getLong(other, offset));
-          setFieldPresent(message, pos);
-        }
-        break;
-      case 17: // GROUP:
-        mergeMessage(message, other, pos);
-        break;
-      case 18: // DOUBLE_LIST:
-      case 19: // FLOAT_LIST:
-      case 20: // INT64_LIST:
-      case 21: // UINT64_LIST:
-      case 22: // INT32_LIST:
-      case 23: // FIXED64_LIST:
-      case 24: // FIXED32_LIST:
-      case 25: // BOOL_LIST:
-      case 26: // STRING_LIST:
-      case 27: // MESSAGE_LIST:
-      case 28: // BYTES_LIST:
-      case 29: // UINT32_LIST:
-      case 30: // ENUM_LIST:
-      case 31: // SFIXED32_LIST:
-      case 32: // SFIXED64_LIST:
-      case 33: // SINT32_LIST:
-      case 34: // SINT64_LIST:
-      case 35: // DOUBLE_LIST_PACKED:
-      case 36: // FLOAT_LIST_PACKED:
-      case 37: // INT64_LIST_PACKED:
-      case 38: // UINT64_LIST_PACKED:
-      case 39: // INT32_LIST_PACKED:
-      case 40: // FIXED64_LIST_PACKED:
-      case 41: // FIXED32_LIST_PACKED:
-      case 42: // BOOL_LIST_PACKED:
-      case 43: // UINT32_LIST_PACKED:
-      case 44: // ENUM_LIST_PACKED:
-      case 45: // SFIXED32_LIST_PACKED:
-      case 46: // SFIXED64_LIST_PACKED:
-      case 47: // SINT32_LIST_PACKED:
-      case 48: // SINT64_LIST_PACKED:
-      case 49: // GROUP_LIST:
-        listFieldSchema.mergeListsAt(message, other, offset);
-        break;
-      case 50: // MAP:
-        SchemaUtil.mergeMap(mapFieldSchema, message, other, offset);
-        break;
-      case 51: // ONEOF_DOUBLE:
-      case 52: // ONEOF_FLOAT:
-      case 53: // ONEOF_INT64:
-      case 54: // ONEOF_UINT64:
-      case 55: // ONEOF_INT32:
-      case 56: // ONEOF_FIXED64:
-      case 57: // ONEOF_FIXED32:
-      case 58: // ONEOF_BOOL:
-      case 59: // ONEOF_STRING:
-        if (isOneofPresent(other, number, pos)) {
-          UnsafeUtil.putObject(message, offset, UnsafeUtil.getObject(other, offset));
-          setOneofPresent(message, number, pos);
-        }
-        break;
-
-      case 60: // ONEOF_MESSAGE:
-        mergeOneofMessage(message, other, pos);
-        break;
-      case 61: // ONEOF_BYTES:
-      case 62: // ONEOF_UINT32:
-      case 63: // ONEOF_ENUM:
-      case 64: // ONEOF_SFIXED32:
-      case 65: // ONEOF_SFIXED64:
-      case 66: // ONEOF_SINT32:
-      case 67: // ONEOF_SINT64:
-        if (isOneofPresent(other, number, pos)) {
-          UnsafeUtil.putObject(message, offset, UnsafeUtil.getObject(other, offset));
-          setOneofPresent(message, number, pos);
-        }
-        break;
-      case 68: // ONEOF_GROUP:
-        mergeOneofMessage(message, other, pos);
-        break;
-      default:
-        break;
-    }
-  }
-
-  private void mergeMessage(T targetParent, T sourceParent, int pos) {
-    if (!isFieldPresent(sourceParent, pos)) {
-      return;
-    }
-
-    final int typeAndOffset = typeAndOffsetAt(pos);
-    final long offset = offset(typeAndOffset);
-
-    final Object source = UNSAFE.getObject(sourceParent, offset);
-    if (source == null) {
-      throw new IllegalStateException(
-          "Source subfield " + numberAt(pos) + " is present but null: " + sourceParent);
-    }
-
-    final Schema fieldSchema = getMessageFieldSchema(pos);
-    if (!isFieldPresent(targetParent, pos)) {
-      if (!isMutable(source)) {
-        // Can safely share source if it is immutable
-        UNSAFE.putObject(targetParent, offset, source);
-      } else {
-        // Make a safetey copy of source
-        final Object copyOfSource = fieldSchema.newInstance();
-        fieldSchema.mergeFrom(copyOfSource, source);
-        UNSAFE.putObject(targetParent, offset, copyOfSource);
-      }
-      setFieldPresent(targetParent, pos);
-      return;
-    }
-
-    // Sub-message is present, merge from source
-    Object target = UNSAFE.getObject(targetParent, offset);
-    if (!isMutable(target)) {
-      Object newInstance = fieldSchema.newInstance();
-      fieldSchema.mergeFrom(newInstance, target);
-      UNSAFE.putObject(targetParent, offset, newInstance);
-      target = newInstance;
-    }
-    fieldSchema.mergeFrom(target, source);
-  }
-
-  private void mergeOneofMessage(T targetParent, T sourceParent, int pos) {
-    int number = numberAt(pos);
-    if (!isOneofPresent(sourceParent, number, pos)) {
-      return;
-    }
-
-    long offset = offset(typeAndOffsetAt(pos));
-    final Object source = UNSAFE.getObject(sourceParent, offset);
-    if (source == null) {
-      throw new IllegalStateException(
-          "Source subfield " + numberAt(pos) + " is present but null: " + sourceParent);
-    }
-
-    final Schema fieldSchema = getMessageFieldSchema(pos);
-    if (!isOneofPresent(targetParent, number, pos)) {
-      if (!isMutable(source)) {
-        // Can safely share source if it is immutable
-        UNSAFE.putObject(targetParent, offset, source);
-      } else {
-        // Make a safety copy of theirs
-        final Object copyOfSource = fieldSchema.newInstance();
-        fieldSchema.mergeFrom(copyOfSource, source);
-        UNSAFE.putObject(targetParent, offset, copyOfSource);
-      }
-      setOneofPresent(targetParent, number, pos);
-      return;
-    }
-
-    // Sub-message is present, merge from source
-    Object target = UNSAFE.getObject(targetParent, offset);
-    if (!isMutable(target)) {
-      Object newInstance = fieldSchema.newInstance();
-      fieldSchema.mergeFrom(newInstance, target);
-      UNSAFE.putObject(targetParent, offset, newInstance);
-      target = newInstance;
-    }
-    fieldSchema.mergeFrom(target, source);
-  }
-
-  @Override
-  public int getSerializedSize(T message) {
-    return proto3 ? getSerializedSizeProto3(message) : getSerializedSizeProto2(message);
-  }
-
-  @SuppressWarnings("unchecked")
-  private int getSerializedSizeProto2(T message) {
-    int size = 0;
-
-    final sun.misc.Unsafe unsafe = UNSAFE;
-    int currentPresenceFieldOffset = NO_PRESENCE_SENTINEL;
-    int currentPresenceField = 0;
-    for (int i = 0; i < buffer.length; i += INTS_PER_FIELD) {
-      final int typeAndOffset = typeAndOffsetAt(i);
-      final int number = numberAt(i);
-
-      int fieldType = type(typeAndOffset);
-      int presenceMaskAndOffset = 0;
-      int presenceMask = 0;
-      if (fieldType <= 17) {
-        presenceMaskAndOffset = buffer[i + 2];
-        final int presenceFieldOffset = presenceMaskAndOffset & OFFSET_MASK;
-        presenceMask = 1 << (presenceMaskAndOffset >>> OFFSET_BITS);
-        if (presenceFieldOffset != currentPresenceFieldOffset) {
-          currentPresenceFieldOffset = presenceFieldOffset;
-          currentPresenceField = unsafe.getInt(message, (long) presenceFieldOffset);
-        }
-      } else if (useCachedSizeField
-          && fieldType >= FieldType.DOUBLE_LIST_PACKED.id()
-          && fieldType <= FieldType.SINT64_LIST_PACKED.id()) {
-        presenceMaskAndOffset = buffer[i + 2] & OFFSET_MASK;
-      }
-
-      final long offset = offset(typeAndOffset);
-
-      switch (fieldType) {
-        case 0: // DOUBLE:
-          if ((currentPresenceField & presenceMask) != 0) {
-            size += CodedOutputStream.computeDoubleSize(number, 0);
-          }
-          break;
-        case 1: // FLOAT:
-          if ((currentPresenceField & presenceMask) != 0) {
-            size += CodedOutputStream.computeFloatSize(number, 0);
-          }
-          break;
-        case 2: // INT64:
-          if ((currentPresenceField & presenceMask) != 0) {
-            size += CodedOutputStream.computeInt64Size(number, unsafe.getLong(message, offset));
-          }
-          break;
-        case 3: // UINT64:
-          if ((currentPresenceField & presenceMask) != 0) {
-            size += CodedOutputStream.computeUInt64Size(number, unsafe.getLong(message, offset));
-          }
-          break;
-        case 4: // INT32:
-          if ((currentPresenceField & presenceMask) != 0) {
-            size += CodedOutputStream.computeInt32Size(number, unsafe.getInt(message, offset));
-          }
-          break;
-        case 5: // FIXED64:
-          if ((currentPresenceField & presenceMask) != 0) {
-            size += CodedOutputStream.computeFixed64Size(number, 0);
-          }
-          break;
-        case 6: // FIXED32:
-          if ((currentPresenceField & presenceMask) != 0) {
-            size += CodedOutputStream.computeFixed32Size(number, 0);
-          }
-          break;
-        case 7: // BOOL:
-          if ((currentPresenceField & presenceMask) != 0) {
-            size += CodedOutputStream.computeBoolSize(number, true);
-          }
-          break;
-        case 8: // STRING:
-          if ((currentPresenceField & presenceMask) != 0) {
-            Object value = unsafe.getObject(message, offset);
-            if (value instanceof ByteString) {
-              size += CodedOutputStream.computeBytesSize(number, (ByteString) value);
-            } else {
-              size += CodedOutputStream.computeStringSize(number, (String) value);
-            }
-          }
-          break;
-        case 9: // MESSAGE:
-          if ((currentPresenceField & presenceMask) != 0) {
-            Object value = unsafe.getObject(message, offset);
-            size += SchemaUtil.computeSizeMessage(number, value, getMessageFieldSchema(i));
-          }
-          break;
-        case 10: // BYTES:
-          if ((currentPresenceField & presenceMask) != 0) {
-            ByteString value = (ByteString) unsafe.getObject(message, offset);
-            size += CodedOutputStream.computeBytesSize(number, value);
-          }
-          break;
-        case 11: // UINT32:
-          if ((currentPresenceField & presenceMask) != 0) {
-            size += CodedOutputStream.computeUInt32Size(number, unsafe.getInt(message, offset));
-          }
-          break;
-        case 12: // ENUM:
-          if ((currentPresenceField & presenceMask) != 0) {
-            size += CodedOutputStream.computeEnumSize(number, unsafe.getInt(message, offset));
-          }
-          break;
-        case 13: // SFIXED32:
-          if ((currentPresenceField & presenceMask) != 0) {
-            size += CodedOutputStream.computeSFixed32Size(number, 0);
-          }
-          break;
-        case 14: // SFIXED64:
-          if ((currentPresenceField & presenceMask) != 0) {
-            size += CodedOutputStream.computeSFixed64Size(number, 0);
-          }
-          break;
-        case 15: // SINT32:
-          if ((currentPresenceField & presenceMask) != 0) {
-            size += CodedOutputStream.computeSInt32Size(number, unsafe.getInt(message, offset));
-          }
-          break;
-        case 16: // SINT64:
-          if ((currentPresenceField & presenceMask) != 0) {
-            size += CodedOutputStream.computeSInt64Size(number, unsafe.getLong(message, offset));
-          }
-          break;
-        case 17: // GROUP:
-          if ((currentPresenceField & presenceMask) != 0) {
-            size +=
-                CodedOutputStream.computeGroupSize(
-                    number,
-                    (MessageLite) unsafe.getObject(message, offset),
-                    getMessageFieldSchema(i));
-          }
-          break;
-        case 18: // DOUBLE_LIST:
-          size +=
-              SchemaUtil.computeSizeFixed64List(
-                  number, (List<?>) unsafe.getObject(message, offset), false);
-          break;
-        case 19: // FLOAT_LIST:
-          size +=
-              SchemaUtil.computeSizeFixed32List(
-                  number, (List<?>) unsafe.getObject(message, offset), false);
-          break;
-        case 20: // INT64_LIST:
-          size +=
-              SchemaUtil.computeSizeInt64List(
-                  number, (List<Long>) unsafe.getObject(message, offset), false);
-          break;
-        case 21: // UINT64_LIST:
-          size +=
-              SchemaUtil.computeSizeUInt64List(
-                  number, (List<Long>) unsafe.getObject(message, offset), false);
-          break;
-        case 22: // INT32_LIST:
-          size +=
-              SchemaUtil.computeSizeInt32List(
-                  number, (List<Integer>) unsafe.getObject(message, offset), false);
-          break;
-        case 23: // FIXED64_LIST:
-          size +=
-              SchemaUtil.computeSizeFixed64List(
-                  number, (List<?>) unsafe.getObject(message, offset), false);
-          break;
-        case 24: // FIXED32_LIST:
-          size +=
-              SchemaUtil.computeSizeFixed32List(
-                  number, (List<?>) unsafe.getObject(message, offset), false);
-          break;
-        case 25: // BOOL_LIST:
-          size +=
-              SchemaUtil.computeSizeBoolList(
-                  number, (List<?>) unsafe.getObject(message, offset), false);
-          break;
-        case 26: // STRING_LIST:
-          size +=
-              SchemaUtil.computeSizeStringList(number, (List<?>) unsafe.getObject(message, offset));
-          break;
-        case 27: // MESSAGE_LIST:
-          size +=
-              SchemaUtil.computeSizeMessageList(
-                  number, (List<?>) unsafe.getObject(message, offset), getMessageFieldSchema(i));
-          break;
-        case 28: // BYTES_LIST:
-          size +=
-              SchemaUtil.computeSizeByteStringList(
-                  number, (List<ByteString>) unsafe.getObject(message, offset));
-          break;
-        case 29: // UINT32_LIST:
-          size +=
-              SchemaUtil.computeSizeUInt32List(
-                  number, (List<Integer>) unsafe.getObject(message, offset), false);
-          break;
-        case 30: // ENUM_LIST:
-          size +=
-              SchemaUtil.computeSizeEnumList(
-                  number, (List<Integer>) unsafe.getObject(message, offset), false);
-          break;
-        case 31: // SFIXED32_LIST:
-          size +=
-              SchemaUtil.computeSizeFixed32List(
-                  number, (List<Integer>) unsafe.getObject(message, offset), false);
-          break;
-        case 32: // SFIXED64_LIST:
-          size +=
-              SchemaUtil.computeSizeFixed64List(
-                  number, (List<Long>) unsafe.getObject(message, offset), false);
-          break;
-        case 33: // SINT32_LIST:
-          size +=
-              SchemaUtil.computeSizeSInt32List(
-                  number, (List<Integer>) unsafe.getObject(message, offset), false);
-          break;
-        case 34: // SINT64_LIST:
-          size +=
-              SchemaUtil.computeSizeSInt64List(
-                  number, (List<Long>) unsafe.getObject(message, offset), false);
-          break;
-        case 35:
-          { // DOUBLE_LIST_PACKED:
-            int fieldSize =
-                SchemaUtil.computeSizeFixed64ListNoTag(
-                    (List<Double>) unsafe.getObject(message, offset));
-            if (fieldSize > 0) {
-              if (useCachedSizeField) {
-                unsafe.putInt(message, (long) presenceMaskAndOffset, fieldSize);
-              }
-              size +=
-                  CodedOutputStream.computeTagSize(number)
-                      + CodedOutputStream.computeUInt32SizeNoTag(fieldSize)
-                      + fieldSize;
-            }
-            break;
-          }
-        case 36:
-          { // FLOAT_LIST_PACKED:
-            int fieldSize =
-                SchemaUtil.computeSizeFixed32ListNoTag(
-                    (List<Float>) unsafe.getObject(message, offset));
-            if (fieldSize > 0) {
-              if (useCachedSizeField) {
-                unsafe.putInt(message, (long) presenceMaskAndOffset, fieldSize);
-              }
-              size +=
-                  CodedOutputStream.computeTagSize(number)
-                      + CodedOutputStream.computeUInt32SizeNoTag(fieldSize)
-                      + fieldSize;
-            }
-            break;
-          }
-        case 37:
-          { // INT64_LIST_PACKED:
-            int fieldSize =
-                SchemaUtil.computeSizeInt64ListNoTag(
-                    (List<Long>) unsafe.getObject(message, offset));
-            if (fieldSize > 0) {
-              if (useCachedSizeField) {
-                unsafe.putInt(message, (long) presenceMaskAndOffset, fieldSize);
-              }
-              size +=
-                  CodedOutputStream.computeTagSize(number)
-                      + CodedOutputStream.computeUInt32SizeNoTag(fieldSize)
-                      + fieldSize;
-            }
-            break;
-          }
-        case 38:
-          { // UINT64_LIST_PACKED:
-            int fieldSize =
-                SchemaUtil.computeSizeUInt64ListNoTag(
-                    (List<Long>) unsafe.getObject(message, offset));
-            if (fieldSize > 0) {
-              if (useCachedSizeField) {
-                unsafe.putInt(message, (long) presenceMaskAndOffset, fieldSize);
-              }
-              size +=
-                  CodedOutputStream.computeTagSize(number)
-                      + CodedOutputStream.computeUInt32SizeNoTag(fieldSize)
-                      + fieldSize;
-            }
-            break;
-          }
-        case 39:
-          { // INT32_LIST_PACKED:
-            int fieldSize =
-                SchemaUtil.computeSizeInt32ListNoTag(
-                    (List<Integer>) unsafe.getObject(message, offset));
-            if (fieldSize > 0) {
-              if (useCachedSizeField) {
-                unsafe.putInt(message, (long) presenceMaskAndOffset, fieldSize);
-              }
-              size +=
-                  CodedOutputStream.computeTagSize(number)
-                      + CodedOutputStream.computeUInt32SizeNoTag(fieldSize)
-                      + fieldSize;
-            }
-            break;
-          }
-        case 40:
-          { // FIXED64_LIST_PACKED:
-            int fieldSize =
-                SchemaUtil.computeSizeFixed64ListNoTag(
-                    (List<Long>) unsafe.getObject(message, offset));
-            if (fieldSize > 0) {
-              if (useCachedSizeField) {
-                unsafe.putInt(message, (long) presenceMaskAndOffset, fieldSize);
-              }
-              size +=
-                  CodedOutputStream.computeTagSize(number)
-                      + CodedOutputStream.computeUInt32SizeNoTag(fieldSize)
-                      + fieldSize;
-            }
-            break;
-          }
-        case 41:
-          { // FIXED32_LIST_PACKED:
-            int fieldSize =
-                SchemaUtil.computeSizeFixed32ListNoTag(
-                    (List<Integer>) unsafe.getObject(message, offset));
-            if (fieldSize > 0) {
-              if (useCachedSizeField) {
-                unsafe.putInt(message, (long) presenceMaskAndOffset, fieldSize);
-              }
-              size +=
-                  CodedOutputStream.computeTagSize(number)
-                      + CodedOutputStream.computeUInt32SizeNoTag(fieldSize)
-                      + fieldSize;
-            }
-            break;
-          }
-        case 42:
-          { // BOOL_LIST_PACKED:
-            int fieldSize =
-                SchemaUtil.computeSizeBoolListNoTag(
-                    (List<Boolean>) unsafe.getObject(message, offset));
-            if (fieldSize > 0) {
-              if (useCachedSizeField) {
-                unsafe.putInt(message, (long) presenceMaskAndOffset, fieldSize);
-              }
-              size +=
-                  CodedOutputStream.computeTagSize(number)
-                      + CodedOutputStream.computeUInt32SizeNoTag(fieldSize)
-                      + fieldSize;
-            }
-            break;
-          }
-        case 43:
-          { // UINT32_LIST_PACKED:
-            int fieldSize =
-                SchemaUtil.computeSizeUInt32ListNoTag(
-                    (List<Integer>) unsafe.getObject(message, offset));
-            if (fieldSize > 0) {
-              if (useCachedSizeField) {
-                unsafe.putInt(message, (long) presenceMaskAndOffset, fieldSize);
-              }
-              size +=
-                  CodedOutputStream.computeTagSize(number)
-                      + CodedOutputStream.computeUInt32SizeNoTag(fieldSize)
-                      + fieldSize;
-            }
-            break;
-          }
-        case 44:
-          { // ENUM_LIST_PACKED:
-            int fieldSize =
-                SchemaUtil.computeSizeEnumListNoTag(
-                    (List<Integer>) unsafe.getObject(message, offset));
-            if (fieldSize > 0) {
-              if (useCachedSizeField) {
-                unsafe.putInt(message, (long) presenceMaskAndOffset, fieldSize);
-              }
-              size +=
-                  CodedOutputStream.computeTagSize(number)
-                      + CodedOutputStream.computeUInt32SizeNoTag(fieldSize)
-                      + fieldSize;
-            }
-            break;
-          }
-        case 45:
-          { // SFIXED32_LIST_PACKED:
-            int fieldSize =
-                SchemaUtil.computeSizeFixed32ListNoTag(
-                    (List<Integer>) unsafe.getObject(message, offset));
-            if (fieldSize > 0) {
-              if (useCachedSizeField) {
-                unsafe.putInt(message, (long) presenceMaskAndOffset, fieldSize);
-              }
-              size +=
-                  CodedOutputStream.computeTagSize(number)
-                      + CodedOutputStream.computeUInt32SizeNoTag(fieldSize)
-                      + fieldSize;
-            }
-            break;
-          }
-        case 46:
-          { // SFIXED64_LIST_PACKED:
-            int fieldSize =
-                SchemaUtil.computeSizeFixed64ListNoTag(
-                    (List<Long>) unsafe.getObject(message, offset));
-            if (fieldSize > 0) {
-              if (useCachedSizeField) {
-                unsafe.putInt(message, (long) presenceMaskAndOffset, fieldSize);
-              }
-              size +=
-                  CodedOutputStream.computeTagSize(number)
-                      + CodedOutputStream.computeUInt32SizeNoTag(fieldSize)
-                      + fieldSize;
-            }
-            break;
-          }
-        case 47:
-          { // SINT32_LIST_PACKED:
-            int fieldSize =
-                SchemaUtil.computeSizeSInt32ListNoTag(
-                    (List<Integer>) unsafe.getObject(message, offset));
-            if (fieldSize > 0) {
-              if (useCachedSizeField) {
-                unsafe.putInt(message, (long) presenceMaskAndOffset, fieldSize);
-              }
-              size +=
-                  CodedOutputStream.computeTagSize(number)
-                      + CodedOutputStream.computeUInt32SizeNoTag(fieldSize)
-                      + fieldSize;
-            }
-            break;
-          }
-        case 48:
-          { // SINT64_LIST_PACKED:
-            int fieldSize =
-                SchemaUtil.computeSizeSInt64ListNoTag(
-                    (List<Long>) unsafe.getObject(message, offset));
-            if (fieldSize > 0) {
-              if (useCachedSizeField) {
-                unsafe.putInt(message, (long) presenceMaskAndOffset, fieldSize);
-              }
-              size +=
-                  CodedOutputStream.computeTagSize(number)
-                      + CodedOutputStream.computeUInt32SizeNoTag(fieldSize)
-                      + fieldSize;
-            }
-            break;
-          }
-        case 49: // GROUP_LIST:
-          size +=
-              SchemaUtil.computeSizeGroupList(
-                  number,
-                  (List<MessageLite>) unsafe.getObject(message, offset),
-                  getMessageFieldSchema(i));
-          break;
-        case 50: // MAP:
-          // TODO(dweis): Use schema cache.
-          size +=
-              mapFieldSchema.getSerializedSize(
-                  number, unsafe.getObject(message, offset), getMapFieldDefaultEntry(i));
-          break;
-        case 51: // ONEOF_DOUBLE:
-          if (isOneofPresent(message, number, i)) {
-            size += CodedOutputStream.computeDoubleSize(number, 0);
-          }
-          break;
-        case 52: // ONEOF_FLOAT:
-          if (isOneofPresent(message, number, i)) {
-            size += CodedOutputStream.computeFloatSize(number, 0);
-          }
-          break;
-        case 53: // ONEOF_INT64:
-          if (isOneofPresent(message, number, i)) {
-            size += CodedOutputStream.computeInt64Size(number, oneofLongAt(message, offset));
-          }
-          break;
-        case 54: // ONEOF_UINT64:
-          if (isOneofPresent(message, number, i)) {
-            size += CodedOutputStream.computeUInt64Size(number, oneofLongAt(message, offset));
-          }
-          break;
-        case 55: // ONEOF_INT32:
-          if (isOneofPresent(message, number, i)) {
-            size += CodedOutputStream.computeInt32Size(number, oneofIntAt(message, offset));
-          }
-          break;
-        case 56: // ONEOF_FIXED64:
-          if (isOneofPresent(message, number, i)) {
-            size += CodedOutputStream.computeFixed64Size(number, 0);
-          }
-          break;
-        case 57: // ONEOF_FIXED32:
-          if (isOneofPresent(message, number, i)) {
-            size += CodedOutputStream.computeFixed32Size(number, 0);
-          }
-          break;
-        case 58: // ONEOF_BOOL:
-          if (isOneofPresent(message, number, i)) {
-            size += CodedOutputStream.computeBoolSize(number, true);
-          }
-          break;
-        case 59: // ONEOF_STRING:
-          if (isOneofPresent(message, number, i)) {
-            Object value = unsafe.getObject(message, offset);
-            if (value instanceof ByteString) {
-              size += CodedOutputStream.computeBytesSize(number, (ByteString) value);
-            } else {
-              size += CodedOutputStream.computeStringSize(number, (String) value);
-            }
-          }
-          break;
-        case 60: // ONEOF_MESSAGE:
-          if (isOneofPresent(message, number, i)) {
-            Object value = unsafe.getObject(message, offset);
-            size += SchemaUtil.computeSizeMessage(number, value, getMessageFieldSchema(i));
-          }
-          break;
-        case 61: // ONEOF_BYTES:
-          if (isOneofPresent(message, number, i)) {
-            size +=
-                CodedOutputStream.computeBytesSize(
-                    number, (ByteString) unsafe.getObject(message, offset));
-          }
-          break;
-        case 62: // ONEOF_UINT32:
-          if (isOneofPresent(message, number, i)) {
-            size += CodedOutputStream.computeUInt32Size(number, oneofIntAt(message, offset));
-          }
-          break;
-        case 63: // ONEOF_ENUM:
-          if (isOneofPresent(message, number, i)) {
-            size += CodedOutputStream.computeEnumSize(number, oneofIntAt(message, offset));
-          }
-          break;
-        case 64: // ONEOF_SFIXED32:
-          if (isOneofPresent(message, number, i)) {
-            size += CodedOutputStream.computeSFixed32Size(number, 0);
-          }
-          break;
-        case 65: // ONEOF_SFIXED64:
-          if (isOneofPresent(message, number, i)) {
-            size += CodedOutputStream.computeSFixed64Size(number, 0);
-          }
-          break;
-        case 66: // ONEOF_SINT32:
-          if (isOneofPresent(message, number, i)) {
-            size += CodedOutputStream.computeSInt32Size(number, oneofIntAt(message, offset));
-          }
-          break;
-        case 67: // ONEOF_SINT64:
-          if (isOneofPresent(message, number, i)) {
-            size += CodedOutputStream.computeSInt64Size(number, oneofLongAt(message, offset));
-          }
-          break;
-        case 68: // ONEOF_GROUP:
-          if (isOneofPresent(message, number, i)) {
-            size +=
-                CodedOutputStream.computeGroupSize(
-                    number,
-                    (MessageLite) unsafe.getObject(message, offset),
-                    getMessageFieldSchema(i));
-          }
-          break;
-        default:
-          // Assume it's an empty entry.
-      }
-    }
-
-    size += getUnknownFieldsSerializedSize(unknownFieldSchema, message);
-
-    if (hasExtensions) {
-      size += extensionSchema.getExtensions(message).getSerializedSize();
-    }
-
-    return size;
-  }
-
-  private int getSerializedSizeProto3(T message) {
-    final sun.misc.Unsafe unsafe = UNSAFE;
-    int size = 0;
-    for (int i = 0; i < buffer.length; i += INTS_PER_FIELD) {
-      final int typeAndOffset = typeAndOffsetAt(i);
-      final int fieldType = type(typeAndOffset);
-      final int number = numberAt(i);
-
-      final long offset = offset(typeAndOffset);
-      final int cachedSizeOffset =
-          fieldType >= FieldType.DOUBLE_LIST_PACKED.id()
-                  && fieldType <= FieldType.SINT64_LIST_PACKED.id()
-              ? buffer[i + 2] & OFFSET_MASK
-              : 0;
-
-      switch (fieldType) {
-        case 0: // DOUBLE:
-          if (isFieldPresent(message, i)) {
-            size += CodedOutputStream.computeDoubleSize(number, 0);
-          }
-          break;
-        case 1: // FLOAT:
-          if (isFieldPresent(message, i)) {
-            size += CodedOutputStream.computeFloatSize(number, 0);
-          }
-          break;
-        case 2: // INT64:
-          if (isFieldPresent(message, i)) {
-            size += CodedOutputStream.computeInt64Size(number, UnsafeUtil.getLong(message, offset));
-          }
-          break;
-        case 3: // UINT64:
-          if (isFieldPresent(message, i)) {
-            size +=
-                CodedOutputStream.computeUInt64Size(number, UnsafeUtil.getLong(message, offset));
-          }
-          break;
-        case 4: // INT32:
-          if (isFieldPresent(message, i)) {
-            size += CodedOutputStream.computeInt32Size(number, UnsafeUtil.getInt(message, offset));
-          }
-          break;
-        case 5: // FIXED64:
-          if (isFieldPresent(message, i)) {
-            size += CodedOutputStream.computeFixed64Size(number, 0);
-          }
-          break;
-        case 6: // FIXED32:
-          if (isFieldPresent(message, i)) {
-            size += CodedOutputStream.computeFixed32Size(number, 0);
-          }
-          break;
-        case 7: // BOOL:
-          if (isFieldPresent(message, i)) {
-            size += CodedOutputStream.computeBoolSize(number, true);
-          }
-          break;
-        case 8: // STRING:
-          if (isFieldPresent(message, i)) {
-            Object value = UnsafeUtil.getObject(message, offset);
-            if (value instanceof ByteString) {
-              size += CodedOutputStream.computeBytesSize(number, (ByteString) value);
-            } else {
-              size += CodedOutputStream.computeStringSize(number, (String) value);
-            }
-          }
-          break;
-        case 9: // MESSAGE:
-          if (isFieldPresent(message, i)) {
-            Object value = UnsafeUtil.getObject(message, offset);
-            size += SchemaUtil.computeSizeMessage(number, value, getMessageFieldSchema(i));
-          }
-          break;
-        case 10: // BYTES:
-          if (isFieldPresent(message, i)) {
-            ByteString value = (ByteString) UnsafeUtil.getObject(message, offset);
-            size += CodedOutputStream.computeBytesSize(number, value);
-          }
-          break;
-        case 11: // UINT32:
-          if (isFieldPresent(message, i)) {
-            size += CodedOutputStream.computeUInt32Size(number, UnsafeUtil.getInt(message, offset));
-          }
-          break;
-        case 12: // ENUM:
-          if (isFieldPresent(message, i)) {
-            size += CodedOutputStream.computeEnumSize(number, UnsafeUtil.getInt(message, offset));
-          }
-          break;
-        case 13: // SFIXED32:
-          if (isFieldPresent(message, i)) {
-            size += CodedOutputStream.computeSFixed32Size(number, 0);
-          }
-          break;
-        case 14: // SFIXED64:
-          if (isFieldPresent(message, i)) {
-            size += CodedOutputStream.computeSFixed64Size(number, 0);
-          }
-          break;
-        case 15: // SINT32:
-          if (isFieldPresent(message, i)) {
-            size += CodedOutputStream.computeSInt32Size(number, UnsafeUtil.getInt(message, offset));
-          }
-          break;
-        case 16: // SINT64:
-          if (isFieldPresent(message, i)) {
-            size +=
-                CodedOutputStream.computeSInt64Size(number, UnsafeUtil.getLong(message, offset));
-          }
-          break;
-        case 17: // GROUP:
-          if (isFieldPresent(message, i)) {
-            size +=
-                CodedOutputStream.computeGroupSize(
-                    number,
-                    (MessageLite) UnsafeUtil.getObject(message, offset),
-                    getMessageFieldSchema(i));
-          }
-          break;
-        case 18: // DOUBLE_LIST:
-          size += SchemaUtil.computeSizeFixed64List(number, listAt(message, offset), false);
-          break;
-        case 19: // FLOAT_LIST:
-          size += SchemaUtil.computeSizeFixed32List(number, listAt(message, offset), false);
-          break;
-        case 20: // INT64_LIST:
-          size +=
-              SchemaUtil.computeSizeInt64List(number, (List<Long>) listAt(message, offset), false);
-          break;
-        case 21: // UINT64_LIST:
-          size +=
-              SchemaUtil.computeSizeUInt64List(number, (List<Long>) listAt(message, offset), false);
-          break;
-        case 22: // INT32_LIST:
-          size +=
-              SchemaUtil.computeSizeInt32List(
-                  number, (List<Integer>) listAt(message, offset), false);
-          break;
-        case 23: // FIXED64_LIST:
-          size += SchemaUtil.computeSizeFixed64List(number, listAt(message, offset), false);
-          break;
-        case 24: // FIXED32_LIST:
-          size += SchemaUtil.computeSizeFixed32List(number, listAt(message, offset), false);
-          break;
-        case 25: // BOOL_LIST:
-          size += SchemaUtil.computeSizeBoolList(number, listAt(message, offset), false);
-          break;
-        case 26: // STRING_LIST:
-          size += SchemaUtil.computeSizeStringList(number, listAt(message, offset));
-          break;
-        case 27: // MESSAGE_LIST:
-          size +=
-              SchemaUtil.computeSizeMessageList(
-                  number, listAt(message, offset), getMessageFieldSchema(i));
-          break;
-        case 28: // BYTES_LIST:
-          size +=
-              SchemaUtil.computeSizeByteStringList(
-                  number, (List<ByteString>) listAt(message, offset));
-          break;
-        case 29: // UINT32_LIST:
-          size +=
-              SchemaUtil.computeSizeUInt32List(
-                  number, (List<Integer>) listAt(message, offset), false);
-          break;
-        case 30: // ENUM_LIST:
-          size +=
-              SchemaUtil.computeSizeEnumList(
-                  number, (List<Integer>) listAt(message, offset), false);
-          break;
-        case 31: // SFIXED32_LIST:
-          size += SchemaUtil.computeSizeFixed32List(number, listAt(message, offset), false);
-          break;
-        case 32: // SFIXED64_LIST:
-          size += SchemaUtil.computeSizeFixed64List(number, listAt(message, offset), false);
-          break;
-        case 33: // SINT32_LIST:
-          size +=
-              SchemaUtil.computeSizeSInt32List(
-                  number, (List<Integer>) listAt(message, offset), false);
-          break;
-        case 34: // SINT64_LIST:
-          size +=
-              SchemaUtil.computeSizeSInt64List(number, (List<Long>) listAt(message, offset), false);
-          break;
-        case 35:
-          { // DOUBLE_LIST_PACKED:
-            int fieldSize =
-                SchemaUtil.computeSizeFixed64ListNoTag(
-                    (List<Double>) unsafe.getObject(message, offset));
-            if (fieldSize > 0) {
-              if (useCachedSizeField) {
-                unsafe.putInt(message, (long) cachedSizeOffset, fieldSize);
-              }
-              size +=
-                  CodedOutputStream.computeTagSize(number)
-                      + CodedOutputStream.computeUInt32SizeNoTag(fieldSize)
-                      + fieldSize;
-            }
-            break;
-          }
-        case 36:
-          { // FLOAT_LIST_PACKED:
-            int fieldSize =
-                SchemaUtil.computeSizeFixed32ListNoTag(
-                    (List<Float>) unsafe.getObject(message, offset));
-            if (fieldSize > 0) {
-              if (useCachedSizeField) {
-                unsafe.putInt(message, (long) cachedSizeOffset, fieldSize);
-              }
-              size +=
-                  CodedOutputStream.computeTagSize(number)
-                      + CodedOutputStream.computeUInt32SizeNoTag(fieldSize)
-                      + fieldSize;
-            }
-            break;
-          }
-        case 37:
-          { // INT64_LIST_PACKED:
-            int fieldSize =
-                SchemaUtil.computeSizeInt64ListNoTag(
-                    (List<Long>) unsafe.getObject(message, offset));
-            if (fieldSize > 0) {
-              if (useCachedSizeField) {
-                unsafe.putInt(message, (long) cachedSizeOffset, fieldSize);
-              }
-              size +=
-                  CodedOutputStream.computeTagSize(number)
-                      + CodedOutputStream.computeUInt32SizeNoTag(fieldSize)
-                      + fieldSize;
-            }
-            break;
-          }
-        case 38:
-          { // UINT64_LIST_PACKED:
-            int fieldSize =
-                SchemaUtil.computeSizeUInt64ListNoTag(
-                    (List<Long>) unsafe.getObject(message, offset));
-            if (fieldSize > 0) {
-              if (useCachedSizeField) {
-                unsafe.putInt(message, (long) cachedSizeOffset, fieldSize);
-              }
-              size +=
-                  CodedOutputStream.computeTagSize(number)
-                      + CodedOutputStream.computeUInt32SizeNoTag(fieldSize)
-                      + fieldSize;
-            }
-            break;
-          }
-        case 39:
-          { // INT32_LIST_PACKED:
-            int fieldSize =
-                SchemaUtil.computeSizeInt32ListNoTag(
-                    (List<Integer>) unsafe.getObject(message, offset));
-            if (fieldSize > 0) {
-              if (useCachedSizeField) {
-                unsafe.putInt(message, (long) cachedSizeOffset, fieldSize);
-              }
-              size +=
-                  CodedOutputStream.computeTagSize(number)
-                      + CodedOutputStream.computeUInt32SizeNoTag(fieldSize)
-                      + fieldSize;
-            }
-            break;
-          }
-        case 40:
-          { // FIXED64_LIST_PACKED:
-            int fieldSize =
-                SchemaUtil.computeSizeFixed64ListNoTag(
-                    (List<Long>) unsafe.getObject(message, offset));
-            if (fieldSize > 0) {
-              if (useCachedSizeField) {
-                unsafe.putInt(message, (long) cachedSizeOffset, fieldSize);
-              }
-              size +=
-                  CodedOutputStream.computeTagSize(number)
-                      + CodedOutputStream.computeUInt32SizeNoTag(fieldSize)
-                      + fieldSize;
-            }
-            break;
-          }
-        case 41:
-          { // FIXED32_LIST_PACKED:
-            int fieldSize =
-                SchemaUtil.computeSizeFixed32ListNoTag(
-                    (List<Integer>) unsafe.getObject(message, offset));
-            if (fieldSize > 0) {
-              if (useCachedSizeField) {
-                unsafe.putInt(message, (long) cachedSizeOffset, fieldSize);
-              }
-              size +=
-                  CodedOutputStream.computeTagSize(number)
-                      + CodedOutputStream.computeUInt32SizeNoTag(fieldSize)
-                      + fieldSize;
-            }
-            break;
-          }
-        case 42:
-          { // BOOL_LIST_PACKED:
-            int fieldSize =
-                SchemaUtil.computeSizeBoolListNoTag(
-                    (List<Boolean>) unsafe.getObject(message, offset));
-            if (fieldSize > 0) {
-              if (useCachedSizeField) {
-                unsafe.putInt(message, (long) cachedSizeOffset, fieldSize);
-              }
-              size +=
-                  CodedOutputStream.computeTagSize(number)
-                      + CodedOutputStream.computeUInt32SizeNoTag(fieldSize)
-                      + fieldSize;
-            }
-            break;
-          }
-        case 43:
-          { // UINT32_LIST_PACKED:
-            int fieldSize =
-                SchemaUtil.computeSizeUInt32ListNoTag(
-                    (List<Integer>) unsafe.getObject(message, offset));
-            if (fieldSize > 0) {
-              if (useCachedSizeField) {
-                unsafe.putInt(message, (long) cachedSizeOffset, fieldSize);
-              }
-              size +=
-                  CodedOutputStream.computeTagSize(number)
-                      + CodedOutputStream.computeUInt32SizeNoTag(fieldSize)
-                      + fieldSize;
-            }
-            break;
-          }
-        case 44:
-          { // ENUM_LIST_PACKED:
-            int fieldSize =
-                SchemaUtil.computeSizeEnumListNoTag(
-                    (List<Integer>) unsafe.getObject(message, offset));
-            if (fieldSize > 0) {
-              if (useCachedSizeField) {
-                unsafe.putInt(message, (long) cachedSizeOffset, fieldSize);
-              }
-              size +=
-                  CodedOutputStream.computeTagSize(number)
-                      + CodedOutputStream.computeUInt32SizeNoTag(fieldSize)
-                      + fieldSize;
-            }
-            break;
-          }
-        case 45:
-          { // SFIXED32_LIST_PACKED:
-            int fieldSize =
-                SchemaUtil.computeSizeFixed32ListNoTag(
-                    (List<Integer>) unsafe.getObject(message, offset));
-            if (fieldSize > 0) {
-              if (useCachedSizeField) {
-                unsafe.putInt(message, (long) cachedSizeOffset, fieldSize);
-              }
-              size +=
-                  CodedOutputStream.computeTagSize(number)
-                      + CodedOutputStream.computeUInt32SizeNoTag(fieldSize)
-                      + fieldSize;
-            }
-            break;
-          }
-        case 46:
-          { // SFIXED64_LIST_PACKED:
-            int fieldSize =
-                SchemaUtil.computeSizeFixed64ListNoTag(
-                    (List<Long>) unsafe.getObject(message, offset));
-            if (fieldSize > 0) {
-              if (useCachedSizeField) {
-                unsafe.putInt(message, (long) cachedSizeOffset, fieldSize);
-              }
-              size +=
-                  CodedOutputStream.computeTagSize(number)
-                      + CodedOutputStream.computeUInt32SizeNoTag(fieldSize)
-                      + fieldSize;
-            }
-            break;
-          }
-        case 47:
-          { // SINT32_LIST_PACKED:
-            int fieldSize =
-                SchemaUtil.computeSizeSInt32ListNoTag(
-                    (List<Integer>) unsafe.getObject(message, offset));
-            if (fieldSize > 0) {
-              if (useCachedSizeField) {
-                unsafe.putInt(message, (long) cachedSizeOffset, fieldSize);
-              }
-              size +=
-                  CodedOutputStream.computeTagSize(number)
-                      + CodedOutputStream.computeUInt32SizeNoTag(fieldSize)
-                      + fieldSize;
-            }
-            break;
-          }
-        case 48:
-          { // SINT64_LIST_PACKED:
-            int fieldSize =
-                SchemaUtil.computeSizeSInt64ListNoTag(
-                    (List<Long>) unsafe.getObject(message, offset));
-            if (fieldSize > 0) {
-              if (useCachedSizeField) {
-                unsafe.putInt(message, (long) cachedSizeOffset, fieldSize);
-              }
-              size +=
-                  CodedOutputStream.computeTagSize(number)
-                      + CodedOutputStream.computeUInt32SizeNoTag(fieldSize)
-                      + fieldSize;
-            }
-            break;
-          }
-        case 49: // GROUP_LIST:
-          size +=
-              SchemaUtil.computeSizeGroupList(
-                  number, (List<MessageLite>) listAt(message, offset), getMessageFieldSchema(i));
-          break;
-        case 50: // MAP:
-          // TODO(dweis): Use schema cache.
-          size +=
-              mapFieldSchema.getSerializedSize(
-                  number, UnsafeUtil.getObject(message, offset), getMapFieldDefaultEntry(i));
-          break;
-        case 51: // ONEOF_DOUBLE:
-          if (isOneofPresent(message, number, i)) {
-            size += CodedOutputStream.computeDoubleSize(number, 0);
-          }
-          break;
-        case 52: // ONEOF_FLOAT:
-          if (isOneofPresent(message, number, i)) {
-            size += CodedOutputStream.computeFloatSize(number, 0);
-          }
-          break;
-        case 53: // ONEOF_INT64:
-          if (isOneofPresent(message, number, i)) {
-            size += CodedOutputStream.computeInt64Size(number, oneofLongAt(message, offset));
-          }
-          break;
-        case 54: // ONEOF_UINT64:
-          if (isOneofPresent(message, number, i)) {
-            size += CodedOutputStream.computeUInt64Size(number, oneofLongAt(message, offset));
-          }
-          break;
-        case 55: // ONEOF_INT32:
-          if (isOneofPresent(message, number, i)) {
-            size += CodedOutputStream.computeInt32Size(number, oneofIntAt(message, offset));
-          }
-          break;
-        case 56: // ONEOF_FIXED64:
-          if (isOneofPresent(message, number, i)) {
-            size += CodedOutputStream.computeFixed64Size(number, 0);
-          }
-          break;
-        case 57: // ONEOF_FIXED32:
-          if (isOneofPresent(message, number, i)) {
-            size += CodedOutputStream.computeFixed32Size(number, 0);
-          }
-          break;
-        case 58: // ONEOF_BOOL:
-          if (isOneofPresent(message, number, i)) {
-            size += CodedOutputStream.computeBoolSize(number, true);
-          }
-          break;
-        case 59: // ONEOF_STRING:
-          if (isOneofPresent(message, number, i)) {
-            Object value = UnsafeUtil.getObject(message, offset);
-            if (value instanceof ByteString) {
-              size += CodedOutputStream.computeBytesSize(number, (ByteString) value);
-            } else {
-              size += CodedOutputStream.computeStringSize(number, (String) value);
-            }
-          }
-          break;
-        case 60: // ONEOF_MESSAGE:
-          if (isOneofPresent(message, number, i)) {
-            Object value = UnsafeUtil.getObject(message, offset);
-            size += SchemaUtil.computeSizeMessage(number, value, getMessageFieldSchema(i));
-          }
-          break;
-        case 61: // ONEOF_BYTES:
-          if (isOneofPresent(message, number, i)) {
-            size +=
-                CodedOutputStream.computeBytesSize(
-                    number, (ByteString) UnsafeUtil.getObject(message, offset));
-          }
-          break;
-        case 62: // ONEOF_UINT32:
-          if (isOneofPresent(message, number, i)) {
-            size += CodedOutputStream.computeUInt32Size(number, oneofIntAt(message, offset));
-          }
-          break;
-        case 63: // ONEOF_ENUM:
-          if (isOneofPresent(message, number, i)) {
-            size += CodedOutputStream.computeEnumSize(number, oneofIntAt(message, offset));
-          }
-          break;
-        case 64: // ONEOF_SFIXED32:
-          if (isOneofPresent(message, number, i)) {
-            size += CodedOutputStream.computeSFixed32Size(number, 0);
-          }
-          break;
-        case 65: // ONEOF_SFIXED64:
-          if (isOneofPresent(message, number, i)) {
-            size += CodedOutputStream.computeSFixed64Size(number, 0);
-          }
-          break;
-        case 66: // ONEOF_SINT32:
-          if (isOneofPresent(message, number, i)) {
-            size += CodedOutputStream.computeSInt32Size(number, oneofIntAt(message, offset));
-          }
-          break;
-        case 67: // ONEOF_SINT64:
-          if (isOneofPresent(message, number, i)) {
-            size += CodedOutputStream.computeSInt64Size(number, oneofLongAt(message, offset));
-          }
-          break;
-        case 68: // ONEOF_GROUP:
-          if (isOneofPresent(message, number, i)) {
-            size +=
-                CodedOutputStream.computeGroupSize(
-                    number,
-                    (MessageLite) UnsafeUtil.getObject(message, offset),
-                    getMessageFieldSchema(i));
-          }
-          break;
-        default:
-          // Assume it's an empty entry.
-      }
-    }
-
-    size += getUnknownFieldsSerializedSize(unknownFieldSchema, message);
-
-    return size;
-  }
-
-  private <UT, UB> int getUnknownFieldsSerializedSize(
-      UnknownFieldSchema<UT, UB> schema, T message) {
-    UT unknowns = schema.getFromMessage(message);
-    return schema.getSerializedSize(unknowns);
-  }
-
-  private static List<?> listAt(Object message, long offset) {
-    return (List<?>) UnsafeUtil.getObject(message, offset);
-  }
-
-  @Override
-  // TODO(nathanmittler): Consider serializing oneof fields last so that only one entry per
-  // oneof is actually serialized. This would mean that we would violate the serialization order
-  // contract. It should also be noted that Go currently does this.
-  public void writeTo(T message, Writer writer) throws IOException {
-    if (writer.fieldOrder() == Writer.FieldOrder.DESCENDING) {
-      writeFieldsInDescendingOrder(message, writer);
-    } else {
-      if (proto3) {
-        writeFieldsInAscendingOrderProto3(message, writer);
-      } else {
-        writeFieldsInAscendingOrderProto2(message, writer);
-      }
-    }
-  }
-
-  @SuppressWarnings("unchecked")
-  private void writeFieldsInAscendingOrderProto2(T message, Writer writer) throws IOException {
-    Iterator<? extends Map.Entry<?, ?>> extensionIterator = null;
-    Map.Entry nextExtension = null;
-    if (hasExtensions) {
-      FieldSet<?> extensions = extensionSchema.getExtensions(message);
-      if (!extensions.isEmpty()) {
-        extensionIterator = extensions.iterator();
-        nextExtension = extensionIterator.next();
-      }
-    }
-    int currentPresenceFieldOffset = NO_PRESENCE_SENTINEL;
-    int currentPresenceField = 0;
-    final int bufferLength = buffer.length;
-    final sun.misc.Unsafe unsafe = UNSAFE;
-    for (int pos = 0; pos < bufferLength; pos += INTS_PER_FIELD) {
-      final int typeAndOffset = typeAndOffsetAt(pos);
-      final int number = numberAt(pos);
-      final int fieldType = type(typeAndOffset);
-
-      int presenceMaskAndOffset = 0;
-      int presenceMask = 0;
-      if (fieldType <= 17) {
-        presenceMaskAndOffset = buffer[pos + 2];
-        final int presenceFieldOffset = presenceMaskAndOffset & OFFSET_MASK;
-        if (presenceFieldOffset != currentPresenceFieldOffset) {
-          currentPresenceFieldOffset = presenceFieldOffset;
-          currentPresenceField = unsafe.getInt(message, (long) presenceFieldOffset);
-        }
-        presenceMask = 1 << (presenceMaskAndOffset >>> OFFSET_BITS);
-      }
-
-      // Write any extensions that need to be written before the current field.
-      while (nextExtension != null && extensionSchema.extensionNumber(nextExtension) <= number) {
-        extensionSchema.serializeExtension(writer, nextExtension);
-        nextExtension = extensionIterator.hasNext() ? extensionIterator.next() : null;
-      }
-      final long offset = offset(typeAndOffset);
-
-      switch (fieldType) {
-        case 0: // DOUBLE:
-          if ((currentPresenceField & presenceMask) != 0) {
-            writer.writeDouble(number, doubleAt(message, offset));
-          }
-          break;
-        case 1: // FLOAT:
-          if ((currentPresenceField & presenceMask) != 0) {
-            writer.writeFloat(number, floatAt(message, offset));
-          }
-          break;
-        case 2: // INT64:
-          if ((currentPresenceField & presenceMask) != 0) {
-            writer.writeInt64(number, unsafe.getLong(message, offset));
-          }
-          break;
-        case 3: // UINT64:
-          if ((currentPresenceField & presenceMask) != 0) {
-            writer.writeUInt64(number, unsafe.getLong(message, offset));
-          }
-          break;
-        case 4: // INT32:
-          if ((currentPresenceField & presenceMask) != 0) {
-            writer.writeInt32(number, unsafe.getInt(message, offset));
-          }
-          break;
-        case 5: // FIXED64:
-          if ((currentPresenceField & presenceMask) != 0) {
-            writer.writeFixed64(number, unsafe.getLong(message, offset));
-          }
-          break;
-        case 6: // FIXED32:
-          if ((currentPresenceField & presenceMask) != 0) {
-            writer.writeFixed32(number, unsafe.getInt(message, offset));
-          }
-          break;
-        case 7: // BOOL:
-          if ((currentPresenceField & presenceMask) != 0) {
-            writer.writeBool(number, booleanAt(message, offset));
-          }
-          break;
-        case 8: // STRING:
-          if ((currentPresenceField & presenceMask) != 0) {
-            writeString(number, unsafe.getObject(message, offset), writer);
-          }
-          break;
-        case 9: // MESSAGE:
-          if ((currentPresenceField & presenceMask) != 0) {
-            Object value = unsafe.getObject(message, offset);
-            writer.writeMessage(number, value, getMessageFieldSchema(pos));
-          }
-          break;
-        case 10: // BYTES:
-          if ((currentPresenceField & presenceMask) != 0) {
-            writer.writeBytes(number, (ByteString) unsafe.getObject(message, offset));
-          }
-          break;
-        case 11: // UINT32:
-          if ((currentPresenceField & presenceMask) != 0) {
-            writer.writeUInt32(number, unsafe.getInt(message, offset));
-          }
-          break;
-        case 12: // ENUM:
-          if ((currentPresenceField & presenceMask) != 0) {
-            writer.writeEnum(number, unsafe.getInt(message, offset));
-          }
-          break;
-        case 13: // SFIXED32:
-          if ((currentPresenceField & presenceMask) != 0) {
-            writer.writeSFixed32(number, unsafe.getInt(message, offset));
-          }
-          break;
-        case 14: // SFIXED64:
-          if ((currentPresenceField & presenceMask) != 0) {
-            writer.writeSFixed64(number, unsafe.getLong(message, offset));
-          }
-          break;
-        case 15: // SINT32:
-          if ((currentPresenceField & presenceMask) != 0) {
-            writer.writeSInt32(number, unsafe.getInt(message, offset));
-          }
-          break;
-        case 16: // SINT64:
-          if ((currentPresenceField & presenceMask) != 0) {
-            writer.writeSInt64(number, unsafe.getLong(message, offset));
-          }
-          break;
-        case 17: // GROUP:
-          if ((currentPresenceField & presenceMask) != 0) {
-            writer.writeGroup(
-                number, unsafe.getObject(message, offset), getMessageFieldSchema(pos));
-          }
-          break;
-        case 18: // DOUBLE_LIST:
-          SchemaUtil.writeDoubleList(
-              numberAt(pos), (List<Double>) unsafe.getObject(message, offset), writer, false);
-          break;
-        case 19: // FLOAT_LIST:
-          SchemaUtil.writeFloatList(
-              numberAt(pos), (List<Float>) unsafe.getObject(message, offset), writer, false);
-          break;
-        case 20: // INT64_LIST:
-          SchemaUtil.writeInt64List(
-              numberAt(pos), (List<Long>) unsafe.getObject(message, offset), writer, false);
-          break;
-        case 21: // UINT64_LIST:
-          SchemaUtil.writeUInt64List(
-              numberAt(pos), (List<Long>) unsafe.getObject(message, offset), writer, false);
-          break;
-        case 22: // INT32_LIST:
-          SchemaUtil.writeInt32List(
-              numberAt(pos), (List<Integer>) unsafe.getObject(message, offset), writer, false);
-          break;
-        case 23: // FIXED64_LIST:
-          SchemaUtil.writeFixed64List(
-              numberAt(pos), (List<Long>) unsafe.getObject(message, offset), writer, false);
-          break;
-        case 24: // FIXED32_LIST:
-          SchemaUtil.writeFixed32List(
-              numberAt(pos), (List<Integer>) unsafe.getObject(message, offset), writer, false);
-          break;
-        case 25: // BOOL_LIST:
-          SchemaUtil.writeBoolList(
-              numberAt(pos), (List<Boolean>) unsafe.getObject(message, offset), writer, false);
-          break;
-        case 26: // STRING_LIST:
-          SchemaUtil.writeStringList(
-              numberAt(pos), (List<String>) unsafe.getObject(message, offset), writer);
-          break;
-        case 27: // MESSAGE_LIST:
-          SchemaUtil.writeMessageList(
-              numberAt(pos),
-              (List<?>) unsafe.getObject(message, offset),
-              writer,
-              getMessageFieldSchema(pos));
-          break;
-        case 28: // BYTES_LIST:
-          SchemaUtil.writeBytesList(
-              numberAt(pos), (List<ByteString>) unsafe.getObject(message, offset), writer);
-          break;
-        case 29: // UINT32_LIST:
-          SchemaUtil.writeUInt32List(
-              numberAt(pos), (List<Integer>) unsafe.getObject(message, offset), writer, false);
-          break;
-        case 30: // ENUM_LIST:
-          SchemaUtil.writeEnumList(
-              numberAt(pos), (List<Integer>) unsafe.getObject(message, offset), writer, false);
-          break;
-        case 31: // SFIXED32_LIST:
-          SchemaUtil.writeSFixed32List(
-              numberAt(pos), (List<Integer>) unsafe.getObject(message, offset), writer, false);
-          break;
-        case 32: // SFIXED64_LIST:
-          SchemaUtil.writeSFixed64List(
-              numberAt(pos), (List<Long>) unsafe.getObject(message, offset), writer, false);
-          break;
-        case 33: // SINT32_LIST:
-          SchemaUtil.writeSInt32List(
-              numberAt(pos), (List<Integer>) unsafe.getObject(message, offset), writer, false);
-          break;
-        case 34: // SINT64_LIST:
-          SchemaUtil.writeSInt64List(
-              numberAt(pos), (List<Long>) unsafe.getObject(message, offset), writer, false);
-          break;
-        case 35: // DOUBLE_LIST_PACKED:
-          // TODO(xiaofeng): Make use of cached field size to speed up serialization.
-          SchemaUtil.writeDoubleList(
-              numberAt(pos), (List<Double>) unsafe.getObject(message, offset), writer, true);
-          break;
-        case 36: // FLOAT_LIST_PACKED:
-          SchemaUtil.writeFloatList(
-              numberAt(pos), (List<Float>) unsafe.getObject(message, offset), writer, true);
-          break;
-        case 37: // INT64_LIST_PACKED:
-          SchemaUtil.writeInt64List(
-              numberAt(pos), (List<Long>) unsafe.getObject(message, offset), writer, true);
-          break;
-        case 38: // UINT64_LIST_PACKED:
-          SchemaUtil.writeUInt64List(
-              numberAt(pos), (List<Long>) unsafe.getObject(message, offset), writer, true);
-          break;
-        case 39: // INT32_LIST_PACKED:
-          SchemaUtil.writeInt32List(
-              numberAt(pos), (List<Integer>) unsafe.getObject(message, offset), writer, true);
-          break;
-        case 40: // FIXED64_LIST_PACKED:
-          SchemaUtil.writeFixed64List(
-              numberAt(pos), (List<Long>) unsafe.getObject(message, offset), writer, true);
-          break;
-        case 41: // FIXED32_LIST_PACKED:
-          SchemaUtil.writeFixed32List(
-              numberAt(pos), (List<Integer>) unsafe.getObject(message, offset), writer, true);
-
-          break;
-        case 42: // BOOL_LIST_PACKED:
-          SchemaUtil.writeBoolList(
-              numberAt(pos), (List<Boolean>) unsafe.getObject(message, offset), writer, true);
-          break;
-        case 43: // UINT32_LIST_PACKED:
-          SchemaUtil.writeUInt32List(
-              numberAt(pos), (List<Integer>) unsafe.getObject(message, offset), writer, true);
-          break;
-        case 44: // ENUM_LIST_PACKED:
-          SchemaUtil.writeEnumList(
-              numberAt(pos), (List<Integer>) unsafe.getObject(message, offset), writer, true);
-          break;
-        case 45: // SFIXED32_LIST_PACKED:
-          SchemaUtil.writeSFixed32List(
-              numberAt(pos), (List<Integer>) unsafe.getObject(message, offset), writer, true);
-          break;
-        case 46: // SFIXED64_LIST_PACKED:
-          SchemaUtil.writeSFixed64List(
-              numberAt(pos), (List<Long>) unsafe.getObject(message, offset), writer, true);
-          break;
-        case 47: // SINT32_LIST_PACKED:
-          SchemaUtil.writeSInt32List(
-              numberAt(pos), (List<Integer>) unsafe.getObject(message, offset), writer, true);
-          break;
-        case 48: // SINT64_LIST_PACKED:
-          SchemaUtil.writeSInt64List(
-              numberAt(pos), (List<Long>) unsafe.getObject(message, offset), writer, true);
-          break;
-        case 49: // GROUP_LIST:
-          SchemaUtil.writeGroupList(
-              numberAt(pos),
-              (List<?>) unsafe.getObject(message, offset),
-              writer,
-              getMessageFieldSchema(pos));
-          break;
-        case 50: // MAP:
-          // TODO(dweis): Use schema cache.
-          writeMapHelper(writer, number, unsafe.getObject(message, offset), pos);
-          break;
-        case 51: // ONEOF_DOUBLE:
-          if (isOneofPresent(message, number, pos)) {
-            writer.writeDouble(number, oneofDoubleAt(message, offset));
-          }
-          break;
-        case 52: // ONEOF_FLOAT:
-          if (isOneofPresent(message, number, pos)) {
-            writer.writeFloat(number, oneofFloatAt(message, offset));
-          }
-          break;
-        case 53: // ONEOF_INT64:
-          if (isOneofPresent(message, number, pos)) {
-            writer.writeInt64(number, oneofLongAt(message, offset));
-          }
-          break;
-        case 54: // ONEOF_UINT64:
-          if (isOneofPresent(message, number, pos)) {
-            writer.writeUInt64(number, oneofLongAt(message, offset));
-          }
-          break;
-        case 55: // ONEOF_INT32:
-          if (isOneofPresent(message, number, pos)) {
-            writer.writeInt32(number, oneofIntAt(message, offset));
-          }
-          break;
-        case 56: // ONEOF_FIXED64:
-          if (isOneofPresent(message, number, pos)) {
-            writer.writeFixed64(number, oneofLongAt(message, offset));
-          }
-          break;
-        case 57: // ONEOF_FIXED32:
-          if (isOneofPresent(message, number, pos)) {
-            writer.writeFixed32(number, oneofIntAt(message, offset));
-          }
-          break;
-        case 58: // ONEOF_BOOL:
-          if (isOneofPresent(message, number, pos)) {
-            writer.writeBool(number, oneofBooleanAt(message, offset));
-          }
-          break;
-        case 59: // ONEOF_STRING:
-          if (isOneofPresent(message, number, pos)) {
-            writeString(number, unsafe.getObject(message, offset), writer);
-          }
-          break;
-        case 60: // ONEOF_MESSAGE:
-          if (isOneofPresent(message, number, pos)) {
-            Object value = unsafe.getObject(message, offset);
-            writer.writeMessage(number, value, getMessageFieldSchema(pos));
-          }
-          break;
-        case 61: // ONEOF_BYTES:
-          if (isOneofPresent(message, number, pos)) {
-            writer.writeBytes(number, (ByteString) unsafe.getObject(message, offset));
-          }
-          break;
-        case 62: // ONEOF_UINT32:
-          if (isOneofPresent(message, number, pos)) {
-            writer.writeUInt32(number, oneofIntAt(message, offset));
-          }
-          break;
-        case 63: // ONEOF_ENUM:
-          if (isOneofPresent(message, number, pos)) {
-            writer.writeEnum(number, oneofIntAt(message, offset));
-          }
-          break;
-        case 64: // ONEOF_SFIXED32:
-          if (isOneofPresent(message, number, pos)) {
-            writer.writeSFixed32(number, oneofIntAt(message, offset));
-          }
-          break;
-        case 65: // ONEOF_SFIXED64:
-          if (isOneofPresent(message, number, pos)) {
-            writer.writeSFixed64(number, oneofLongAt(message, offset));
-          }
-          break;
-        case 66: // ONEOF_SINT32:
-          if (isOneofPresent(message, number, pos)) {
-            writer.writeSInt32(number, oneofIntAt(message, offset));
-          }
-          break;
-        case 67: // ONEOF_SINT64:
-          if (isOneofPresent(message, number, pos)) {
-            writer.writeSInt64(number, oneofLongAt(message, offset));
-          }
-          break;
-        case 68: // ONEOF_GROUP:
-          if (isOneofPresent(message, number, pos)) {
-            writer.writeGroup(
-                number, unsafe.getObject(message, offset), getMessageFieldSchema(pos));
-          }
-          break;
-        default:
-          // Assume it's an empty entry - just go to the next entry.
-          break;
-      }
-    }
-    while (nextExtension != null) {
-      extensionSchema.serializeExtension(writer, nextExtension);
-      nextExtension = extensionIterator.hasNext() ? extensionIterator.next() : null;
-    }
-    writeUnknownInMessageTo(unknownFieldSchema, message, writer);
-  }
-
-  @SuppressWarnings("unchecked")
-  private void writeFieldsInAscendingOrderProto3(T message, Writer writer) throws IOException {
-    Iterator<? extends Map.Entry<?, ?>> extensionIterator = null;
-    Map.Entry nextExtension = null;
-    if (hasExtensions) {
-      FieldSet<?> extensions = extensionSchema.getExtensions(message);
-      if (!extensions.isEmpty()) {
-        extensionIterator = extensions.iterator();
-        nextExtension = extensionIterator.next();
-      }
-    }
-    final int bufferLength = buffer.length;
-    for (int pos = 0; pos < bufferLength; pos += INTS_PER_FIELD) {
-      final int typeAndOffset = typeAndOffsetAt(pos);
-      final int number = numberAt(pos);
-
-      // Write any extensions that need to be written before the current field.
-      while (nextExtension != null && extensionSchema.extensionNumber(nextExtension) <= number) {
-        extensionSchema.serializeExtension(writer, nextExtension);
-        nextExtension = extensionIterator.hasNext() ? extensionIterator.next() : null;
-      }
-
-      switch (type(typeAndOffset)) {
-        case 0: // DOUBLE:
-          if (isFieldPresent(message, pos)) {
-            writer.writeDouble(number, doubleAt(message, offset(typeAndOffset)));
-          }
-          break;
-        case 1: // FLOAT:
-          if (isFieldPresent(message, pos)) {
-            writer.writeFloat(number, floatAt(message, offset(typeAndOffset)));
-          }
-          break;
-        case 2: // INT64:
-          if (isFieldPresent(message, pos)) {
-            writer.writeInt64(number, longAt(message, offset(typeAndOffset)));
-          }
-          break;
-        case 3: // UINT64:
-          if (isFieldPresent(message, pos)) {
-            writer.writeUInt64(number, longAt(message, offset(typeAndOffset)));
-          }
-          break;
-        case 4: // INT32:
-          if (isFieldPresent(message, pos)) {
-            writer.writeInt32(number, intAt(message, offset(typeAndOffset)));
-          }
-          break;
-        case 5: // FIXED64:
-          if (isFieldPresent(message, pos)) {
-            writer.writeFixed64(number, longAt(message, offset(typeAndOffset)));
-          }
-          break;
-        case 6: // FIXED32:
-          if (isFieldPresent(message, pos)) {
-            writer.writeFixed32(number, intAt(message, offset(typeAndOffset)));
-          }
-          break;
-        case 7: // BOOL:
-          if (isFieldPresent(message, pos)) {
-            writer.writeBool(number, booleanAt(message, offset(typeAndOffset)));
-          }
-          break;
-        case 8: // STRING:
-          if (isFieldPresent(message, pos)) {
-            writeString(number, UnsafeUtil.getObject(message, offset(typeAndOffset)), writer);
-          }
-          break;
-        case 9: // MESSAGE:
-          if (isFieldPresent(message, pos)) {
-            Object value = UnsafeUtil.getObject(message, offset(typeAndOffset));
-            writer.writeMessage(number, value, getMessageFieldSchema(pos));
-          }
-          break;
-        case 10: // BYTES:
-          if (isFieldPresent(message, pos)) {
-            writer.writeBytes(
-                number, (ByteString) UnsafeUtil.getObject(message, offset(typeAndOffset)));
-          }
-          break;
-        case 11: // UINT32:
-          if (isFieldPresent(message, pos)) {
-            writer.writeUInt32(number, intAt(message, offset(typeAndOffset)));
-          }
-          break;
-        case 12: // ENUM:
-          if (isFieldPresent(message, pos)) {
-            writer.writeEnum(number, intAt(message, offset(typeAndOffset)));
-          }
-          break;
-        case 13: // SFIXED32:
-          if (isFieldPresent(message, pos)) {
-            writer.writeSFixed32(number, intAt(message, offset(typeAndOffset)));
-          }
-          break;
-        case 14: // SFIXED64:
-          if (isFieldPresent(message, pos)) {
-            writer.writeSFixed64(number, longAt(message, offset(typeAndOffset)));
-          }
-          break;
-        case 15: // SINT32:
-          if (isFieldPresent(message, pos)) {
-            writer.writeSInt32(number, intAt(message, offset(typeAndOffset)));
-          }
-          break;
-        case 16: // SINT64:
-          if (isFieldPresent(message, pos)) {
-            writer.writeSInt64(number, longAt(message, offset(typeAndOffset)));
-          }
-          break;
-        case 17: // GROUP:
-          if (isFieldPresent(message, pos)) {
-            writer.writeGroup(
-                number,
-                UnsafeUtil.getObject(message, offset(typeAndOffset)),
-                getMessageFieldSchema(pos));
-          }
-          break;
-        case 18: // DOUBLE_LIST:
-          SchemaUtil.writeDoubleList(
-              numberAt(pos),
-              (List<Double>) UnsafeUtil.getObject(message, offset(typeAndOffset)),
-              writer,
-              false);
-          break;
-        case 19: // FLOAT_LIST:
-          SchemaUtil.writeFloatList(
-              numberAt(pos),
-              (List<Float>) UnsafeUtil.getObject(message, offset(typeAndOffset)),
-              writer,
-              false);
-          break;
-        case 20: // INT64_LIST:
-          SchemaUtil.writeInt64List(
-              numberAt(pos),
-              (List<Long>) UnsafeUtil.getObject(message, offset(typeAndOffset)),
-              writer,
-              false);
-          break;
-        case 21: // UINT64_LIST:
-          SchemaUtil.writeUInt64List(
-              numberAt(pos),
-              (List<Long>) UnsafeUtil.getObject(message, offset(typeAndOffset)),
-              writer,
-              false);
-          break;
-        case 22: // INT32_LIST:
-          SchemaUtil.writeInt32List(
-              numberAt(pos),
-              (List<Integer>) UnsafeUtil.getObject(message, offset(typeAndOffset)),
-              writer,
-              false);
-          break;
-        case 23: // FIXED64_LIST:
-          SchemaUtil.writeFixed64List(
-              numberAt(pos),
-              (List<Long>) UnsafeUtil.getObject(message, offset(typeAndOffset)),
-              writer,
-              false);
-          break;
-        case 24: // FIXED32_LIST:
-          SchemaUtil.writeFixed32List(
-              numberAt(pos),
-              (List<Integer>) UnsafeUtil.getObject(message, offset(typeAndOffset)),
-              writer,
-              false);
-          break;
-        case 25: // BOOL_LIST:
-          SchemaUtil.writeBoolList(
-              numberAt(pos),
-              (List<Boolean>) UnsafeUtil.getObject(message, offset(typeAndOffset)),
-              writer,
-              false);
-          break;
-        case 26: // STRING_LIST:
-          SchemaUtil.writeStringList(
-              numberAt(pos),
-              (List<String>) UnsafeUtil.getObject(message, offset(typeAndOffset)),
-              writer);
-          break;
-        case 27: // MESSAGE_LIST:
-          SchemaUtil.writeMessageList(
-              numberAt(pos),
-              (List<?>) UnsafeUtil.getObject(message, offset(typeAndOffset)),
-              writer,
-              getMessageFieldSchema(pos));
-          break;
-        case 28: // BYTES_LIST:
-          SchemaUtil.writeBytesList(
-              numberAt(pos),
-              (List<ByteString>) UnsafeUtil.getObject(message, offset(typeAndOffset)),
-              writer);
-          break;
-        case 29: // UINT32_LIST:
-          SchemaUtil.writeUInt32List(
-              numberAt(pos),
-              (List<Integer>) UnsafeUtil.getObject(message, offset(typeAndOffset)),
-              writer,
-              false);
-          break;
-        case 30: // ENUM_LIST:
-          SchemaUtil.writeEnumList(
-              numberAt(pos),
-              (List<Integer>) UnsafeUtil.getObject(message, offset(typeAndOffset)),
-              writer,
-              false);
-          break;
-        case 31: // SFIXED32_LIST:
-          SchemaUtil.writeSFixed32List(
-              numberAt(pos),
-              (List<Integer>) UnsafeUtil.getObject(message, offset(typeAndOffset)),
-              writer,
-              false);
-          break;
-        case 32: // SFIXED64_LIST:
-          SchemaUtil.writeSFixed64List(
-              numberAt(pos),
-              (List<Long>) UnsafeUtil.getObject(message, offset(typeAndOffset)),
-              writer,
-              false);
-          break;
-        case 33: // SINT32_LIST:
-          SchemaUtil.writeSInt32List(
-              numberAt(pos),
-              (List<Integer>) UnsafeUtil.getObject(message, offset(typeAndOffset)),
-              writer,
-              false);
-          break;
-        case 34: // SINT64_LIST:
-          SchemaUtil.writeSInt64List(
-              numberAt(pos),
-              (List<Long>) UnsafeUtil.getObject(message, offset(typeAndOffset)),
-              writer,
-              false);
-          break;
-        case 35: // DOUBLE_LIST_PACKED:
-          // TODO(xiaofeng): Make use of cached field size to speed up serialization.
-          SchemaUtil.writeDoubleList(
-              numberAt(pos),
-              (List<Double>) UnsafeUtil.getObject(message, offset(typeAndOffset)),
-              writer,
-              true);
-          break;
-        case 36: // FLOAT_LIST_PACKED:
-          SchemaUtil.writeFloatList(
-              numberAt(pos),
-              (List<Float>) UnsafeUtil.getObject(message, offset(typeAndOffset)),
-              writer,
-              true);
-          break;
-        case 37: // INT64_LIST_PACKED:
-          SchemaUtil.writeInt64List(
-              numberAt(pos),
-              (List<Long>) UnsafeUtil.getObject(message, offset(typeAndOffset)),
-              writer,
-              true);
-          break;
-        case 38: // UINT64_LIST_PACKED:
-          SchemaUtil.writeUInt64List(
-              numberAt(pos),
-              (List<Long>) UnsafeUtil.getObject(message, offset(typeAndOffset)),
-              writer,
-              true);
-          break;
-        case 39: // INT32_LIST_PACKED:
-          SchemaUtil.writeInt32List(
-              numberAt(pos),
-              (List<Integer>) UnsafeUtil.getObject(message, offset(typeAndOffset)),
-              writer,
-              true);
-          break;
-        case 40: // FIXED64_LIST_PACKED:
-          SchemaUtil.writeFixed64List(
-              numberAt(pos),
-              (List<Long>) UnsafeUtil.getObject(message, offset(typeAndOffset)),
-              writer,
-              true);
-          break;
-        case 41: // FIXED32_LIST_PACKED:
-          SchemaUtil.writeFixed32List(
-              numberAt(pos),
-              (List<Integer>) UnsafeUtil.getObject(message, offset(typeAndOffset)),
-              writer,
-              true);
-
-          break;
-        case 42: // BOOL_LIST_PACKED:
-          SchemaUtil.writeBoolList(
-              numberAt(pos),
-              (List<Boolean>) UnsafeUtil.getObject(message, offset(typeAndOffset)),
-              writer,
-              true);
-          break;
-        case 43: // UINT32_LIST_PACKED:
-          SchemaUtil.writeUInt32List(
-              numberAt(pos),
-              (List<Integer>) UnsafeUtil.getObject(message, offset(typeAndOffset)),
-              writer,
-              true);
-          break;
-        case 44: // ENUM_LIST_PACKED:
-          SchemaUtil.writeEnumList(
-              numberAt(pos),
-              (List<Integer>) UnsafeUtil.getObject(message, offset(typeAndOffset)),
-              writer,
-              true);
-          break;
-        case 45: // SFIXED32_LIST_PACKED:
-          SchemaUtil.writeSFixed32List(
-              numberAt(pos),
-              (List<Integer>) UnsafeUtil.getObject(message, offset(typeAndOffset)),
-              writer,
-              true);
-          break;
-        case 46: // SFIXED64_LIST_PACKED:
-          SchemaUtil.writeSFixed64List(
-              numberAt(pos),
-              (List<Long>) UnsafeUtil.getObject(message, offset(typeAndOffset)),
-              writer,
-              true);
-          break;
-        case 47: // SINT32_LIST_PACKED:
-          SchemaUtil.writeSInt32List(
-              numberAt(pos),
-              (List<Integer>) UnsafeUtil.getObject(message, offset(typeAndOffset)),
-              writer,
-              true);
-          break;
-        case 48: // SINT64_LIST_PACKED:
-          SchemaUtil.writeSInt64List(
-              numberAt(pos),
-              (List<Long>) UnsafeUtil.getObject(message, offset(typeAndOffset)),
-              writer,
-              true);
-          break;
-        case 49: // GROUP_LIST:
-          SchemaUtil.writeGroupList(
-              numberAt(pos),
-              (List<?>) UnsafeUtil.getObject(message, offset(typeAndOffset)),
-              writer,
-              getMessageFieldSchema(pos));
-          break;
-        case 50: // MAP:
-          // TODO(dweis): Use schema cache.
-          writeMapHelper(writer, number, UnsafeUtil.getObject(message, offset(typeAndOffset)), pos);
-          break;
-        case 51: // ONEOF_DOUBLE:
-          if (isOneofPresent(message, number, pos)) {
-            writer.writeDouble(number, oneofDoubleAt(message, offset(typeAndOffset)));
-          }
-          break;
-        case 52: // ONEOF_FLOAT:
-          if (isOneofPresent(message, number, pos)) {
-            writer.writeFloat(number, oneofFloatAt(message, offset(typeAndOffset)));
-          }
-          break;
-        case 53: // ONEOF_INT64:
-          if (isOneofPresent(message, number, pos)) {
-            writer.writeInt64(number, oneofLongAt(message, offset(typeAndOffset)));
-          }
-          break;
-        case 54: // ONEOF_UINT64:
-          if (isOneofPresent(message, number, pos)) {
-            writer.writeUInt64(number, oneofLongAt(message, offset(typeAndOffset)));
-          }
-          break;
-        case 55: // ONEOF_INT32:
-          if (isOneofPresent(message, number, pos)) {
-            writer.writeInt32(number, oneofIntAt(message, offset(typeAndOffset)));
-          }
-          break;
-        case 56: // ONEOF_FIXED64:
-          if (isOneofPresent(message, number, pos)) {
-            writer.writeFixed64(number, oneofLongAt(message, offset(typeAndOffset)));
-          }
-          break;
-        case 57: // ONEOF_FIXED32:
-          if (isOneofPresent(message, number, pos)) {
-            writer.writeFixed32(number, oneofIntAt(message, offset(typeAndOffset)));
-          }
-          break;
-        case 58: // ONEOF_BOOL:
-          if (isOneofPresent(message, number, pos)) {
-            writer.writeBool(number, oneofBooleanAt(message, offset(typeAndOffset)));
-          }
-          break;
-        case 59: // ONEOF_STRING:
-          if (isOneofPresent(message, number, pos)) {
-            writeString(number, UnsafeUtil.getObject(message, offset(typeAndOffset)), writer);
-          }
-          break;
-        case 60: // ONEOF_MESSAGE:
-          if (isOneofPresent(message, number, pos)) {
-            Object value = UnsafeUtil.getObject(message, offset(typeAndOffset));
-            writer.writeMessage(number, value, getMessageFieldSchema(pos));
-          }
-          break;
-        case 61: // ONEOF_BYTES:
-          if (isOneofPresent(message, number, pos)) {
-            writer.writeBytes(
-                number, (ByteString) UnsafeUtil.getObject(message, offset(typeAndOffset)));
-          }
-          break;
-        case 62: // ONEOF_UINT32:
-          if (isOneofPresent(message, number, pos)) {
-            writer.writeUInt32(number, oneofIntAt(message, offset(typeAndOffset)));
-          }
-          break;
-        case 63: // ONEOF_ENUM:
-          if (isOneofPresent(message, number, pos)) {
-            writer.writeEnum(number, oneofIntAt(message, offset(typeAndOffset)));
-          }
-          break;
-        case 64: // ONEOF_SFIXED32:
-          if (isOneofPresent(message, number, pos)) {
-            writer.writeSFixed32(number, oneofIntAt(message, offset(typeAndOffset)));
-          }
-          break;
-        case 65: // ONEOF_SFIXED64:
-          if (isOneofPresent(message, number, pos)) {
-            writer.writeSFixed64(number, oneofLongAt(message, offset(typeAndOffset)));
-          }
-          break;
-        case 66: // ONEOF_SINT32:
-          if (isOneofPresent(message, number, pos)) {
-            writer.writeSInt32(number, oneofIntAt(message, offset(typeAndOffset)));
-          }
-          break;
-        case 67: // ONEOF_SINT64:
-          if (isOneofPresent(message, number, pos)) {
-            writer.writeSInt64(number, oneofLongAt(message, offset(typeAndOffset)));
-          }
-          break;
-        case 68: // ONEOF_GROUP:
-          if (isOneofPresent(message, number, pos)) {
-            writer.writeGroup(
-                number,
-                UnsafeUtil.getObject(message, offset(typeAndOffset)),
-                getMessageFieldSchema(pos));
-          }
-          break;
-        default:
-          // Assume it's an empty entry - just go to the next entry.
-          break;
-      }
-    }
-    while (nextExtension != null) {
-      extensionSchema.serializeExtension(writer, nextExtension);
-      nextExtension = extensionIterator.hasNext() ? extensionIterator.next() : null;
-    }
-    writeUnknownInMessageTo(unknownFieldSchema, message, writer);
-  }
-
-  @SuppressWarnings("unchecked")
-  private void writeFieldsInDescendingOrder(T message, Writer writer) throws IOException {
-    writeUnknownInMessageTo(unknownFieldSchema, message, writer);
-
-    Iterator<? extends Map.Entry<?, ?>> extensionIterator = null;
-    Map.Entry nextExtension = null;
-    if (hasExtensions) {
-      FieldSet<?> extensions = extensionSchema.getExtensions(message);
-      if (!extensions.isEmpty()) {
-        extensionIterator = extensions.descendingIterator();
-        nextExtension = extensionIterator.next();
-      }
-    }
-
-    for (int pos = buffer.length - INTS_PER_FIELD; pos >= 0; pos -= INTS_PER_FIELD) {
-      final int typeAndOffset = typeAndOffsetAt(pos);
-      final int number = numberAt(pos);
-
-      // Write any extensions that need to be written before the current field.
-      while (nextExtension != null && extensionSchema.extensionNumber(nextExtension) > number) {
-        extensionSchema.serializeExtension(writer, nextExtension);
-        nextExtension = extensionIterator.hasNext() ? extensionIterator.next() : null;
-      }
-
-      switch (type(typeAndOffset)) {
-        case 0: // DOUBLE:
-          if (isFieldPresent(message, pos)) {
-            writer.writeDouble(number, doubleAt(message, offset(typeAndOffset)));
-          }
-          break;
-        case 1: // FLOAT:
-          if (isFieldPresent(message, pos)) {
-            writer.writeFloat(number, floatAt(message, offset(typeAndOffset)));
-          }
-          break;
-        case 2: // INT64:
-          if (isFieldPresent(message, pos)) {
-            writer.writeInt64(number, longAt(message, offset(typeAndOffset)));
-          }
-          break;
-        case 3: // UINT64:
-          if (isFieldPresent(message, pos)) {
-            writer.writeUInt64(number, longAt(message, offset(typeAndOffset)));
-          }
-          break;
-        case 4: // INT32:
-          if (isFieldPresent(message, pos)) {
-            writer.writeInt32(number, intAt(message, offset(typeAndOffset)));
-          }
-          break;
-        case 5: // FIXED64:
-          if (isFieldPresent(message, pos)) {
-            writer.writeFixed64(number, longAt(message, offset(typeAndOffset)));
-          }
-          break;
-        case 6: // FIXED32:
-          if (isFieldPresent(message, pos)) {
-            writer.writeFixed32(number, intAt(message, offset(typeAndOffset)));
-          }
-          break;
-        case 7: // BOOL:
-          if (isFieldPresent(message, pos)) {
-            writer.writeBool(number, booleanAt(message, offset(typeAndOffset)));
-          }
-          break;
-        case 8: // STRING:
-          if (isFieldPresent(message, pos)) {
-            writeString(number, UnsafeUtil.getObject(message, offset(typeAndOffset)), writer);
-          }
-          break;
-        case 9: // MESSAGE:
-          if (isFieldPresent(message, pos)) {
-            Object value = UnsafeUtil.getObject(message, offset(typeAndOffset));
-            writer.writeMessage(number, value, getMessageFieldSchema(pos));
-          }
-          break;
-        case 10: // BYTES:
-          if (isFieldPresent(message, pos)) {
-            writer.writeBytes(
-                number, (ByteString) UnsafeUtil.getObject(message, offset(typeAndOffset)));
-          }
-          break;
-        case 11: // UINT32:
-          if (isFieldPresent(message, pos)) {
-            writer.writeUInt32(number, intAt(message, offset(typeAndOffset)));
-          }
-          break;
-        case 12: // ENUM:
-          if (isFieldPresent(message, pos)) {
-            writer.writeEnum(number, intAt(message, offset(typeAndOffset)));
-          }
-          break;
-        case 13: // SFIXED32:
-          if (isFieldPresent(message, pos)) {
-            writer.writeSFixed32(number, intAt(message, offset(typeAndOffset)));
-          }
-          break;
-        case 14: // SFIXED64:
-          if (isFieldPresent(message, pos)) {
-            writer.writeSFixed64(number, longAt(message, offset(typeAndOffset)));
-          }
-          break;
-        case 15: // SINT32:
-          if (isFieldPresent(message, pos)) {
-            writer.writeSInt32(number, intAt(message, offset(typeAndOffset)));
-          }
-          break;
-        case 16: // SINT64:
-          if (isFieldPresent(message, pos)) {
-            writer.writeSInt64(number, longAt(message, offset(typeAndOffset)));
-          }
-          break;
-        case 17: // GROUP:
-          if (isFieldPresent(message, pos)) {
-            writer.writeGroup(
-                number,
-                UnsafeUtil.getObject(message, offset(typeAndOffset)),
-                getMessageFieldSchema(pos));
-          }
-          break;
-        case 18: // DOUBLE_LIST:
-          SchemaUtil.writeDoubleList(
-              numberAt(pos),
-              (List<Double>) UnsafeUtil.getObject(message, offset(typeAndOffset)),
-              writer,
-              false);
-          break;
-        case 19: // FLOAT_LIST:
-          SchemaUtil.writeFloatList(
-              numberAt(pos),
-              (List<Float>) UnsafeUtil.getObject(message, offset(typeAndOffset)),
-              writer,
-              false);
-          break;
-        case 20: // INT64_LIST:
-          SchemaUtil.writeInt64List(
-              numberAt(pos),
-              (List<Long>) UnsafeUtil.getObject(message, offset(typeAndOffset)),
-              writer,
-              false);
-          break;
-        case 21: // UINT64_LIST:
-          SchemaUtil.writeUInt64List(
-              numberAt(pos),
-              (List<Long>) UnsafeUtil.getObject(message, offset(typeAndOffset)),
-              writer,
-              false);
-          break;
-        case 22: // INT32_LIST:
-          SchemaUtil.writeInt32List(
-              numberAt(pos),
-              (List<Integer>) UnsafeUtil.getObject(message, offset(typeAndOffset)),
-              writer,
-              false);
-          break;
-        case 23: // FIXED64_LIST:
-          SchemaUtil.writeFixed64List(
-              numberAt(pos),
-              (List<Long>) UnsafeUtil.getObject(message, offset(typeAndOffset)),
-              writer,
-              false);
-          break;
-        case 24: // FIXED32_LIST:
-          SchemaUtil.writeFixed32List(
-              numberAt(pos),
-              (List<Integer>) UnsafeUtil.getObject(message, offset(typeAndOffset)),
-              writer,
-              false);
-          break;
-        case 25: // BOOL_LIST:
-          SchemaUtil.writeBoolList(
-              numberAt(pos),
-              (List<Boolean>) UnsafeUtil.getObject(message, offset(typeAndOffset)),
-              writer,
-              false);
-          break;
-        case 26: // STRING_LIST:
-          SchemaUtil.writeStringList(
-              numberAt(pos),
-              (List<String>) UnsafeUtil.getObject(message, offset(typeAndOffset)),
-              writer);
-          break;
-        case 27: // MESSAGE_LIST:
-          SchemaUtil.writeMessageList(
-              numberAt(pos),
-              (List<?>) UnsafeUtil.getObject(message, offset(typeAndOffset)),
-              writer,
-              getMessageFieldSchema(pos));
-          break;
-        case 28: // BYTES_LIST:
-          SchemaUtil.writeBytesList(
-              numberAt(pos),
-              (List<ByteString>) UnsafeUtil.getObject(message, offset(typeAndOffset)),
-              writer);
-          break;
-        case 29: // UINT32_LIST:
-          SchemaUtil.writeUInt32List(
-              numberAt(pos),
-              (List<Integer>) UnsafeUtil.getObject(message, offset(typeAndOffset)),
-              writer,
-              false);
-          break;
-        case 30: // ENUM_LIST:
-          SchemaUtil.writeEnumList(
-              numberAt(pos),
-              (List<Integer>) UnsafeUtil.getObject(message, offset(typeAndOffset)),
-              writer,
-              false);
-          break;
-        case 31: // SFIXED32_LIST:
-          SchemaUtil.writeSFixed32List(
-              numberAt(pos),
-              (List<Integer>) UnsafeUtil.getObject(message, offset(typeAndOffset)),
-              writer,
-              false);
-          break;
-        case 32: // SFIXED64_LIST:
-          SchemaUtil.writeSFixed64List(
-              numberAt(pos),
-              (List<Long>) UnsafeUtil.getObject(message, offset(typeAndOffset)),
-              writer,
-              false);
-          break;
-        case 33: // SINT32_LIST:
-          SchemaUtil.writeSInt32List(
-              numberAt(pos),
-              (List<Integer>) UnsafeUtil.getObject(message, offset(typeAndOffset)),
-              writer,
-              false);
-          break;
-        case 34: // SINT64_LIST:
-          SchemaUtil.writeSInt64List(
-              numberAt(pos),
-              (List<Long>) UnsafeUtil.getObject(message, offset(typeAndOffset)),
-              writer,
-              false);
-          break;
-        case 35: // DOUBLE_LIST_PACKED:
-          SchemaUtil.writeDoubleList(
-              numberAt(pos),
-              (List<Double>) UnsafeUtil.getObject(message, offset(typeAndOffset)),
-              writer,
-              true);
-          break;
-        case 36: // FLOAT_LIST_PACKED:
-          SchemaUtil.writeFloatList(
-              numberAt(pos),
-              (List<Float>) UnsafeUtil.getObject(message, offset(typeAndOffset)),
-              writer,
-              true);
-          break;
-        case 37: // INT64_LIST_PACKED:
-          SchemaUtil.writeInt64List(
-              numberAt(pos),
-              (List<Long>) UnsafeUtil.getObject(message, offset(typeAndOffset)),
-              writer,
-              true);
-          break;
-        case 38: // UINT64_LIST_PACKED:
-          SchemaUtil.writeUInt64List(
-              numberAt(pos),
-              (List<Long>) UnsafeUtil.getObject(message, offset(typeAndOffset)),
-              writer,
-              true);
-          break;
-        case 39: // INT32_LIST_PACKED:
-          SchemaUtil.writeInt32List(
-              numberAt(pos),
-              (List<Integer>) UnsafeUtil.getObject(message, offset(typeAndOffset)),
-              writer,
-              true);
-          break;
-        case 40: // FIXED64_LIST_PACKED:
-          SchemaUtil.writeFixed64List(
-              numberAt(pos),
-              (List<Long>) UnsafeUtil.getObject(message, offset(typeAndOffset)),
-              writer,
-              true);
-          break;
-        case 41: // FIXED32_LIST_PACKED:
-          SchemaUtil.writeFixed32List(
-              numberAt(pos),
-              (List<Integer>) UnsafeUtil.getObject(message, offset(typeAndOffset)),
-              writer,
-              true);
-
-          break;
-        case 42: // BOOL_LIST_PACKED:
-          SchemaUtil.writeBoolList(
-              numberAt(pos),
-              (List<Boolean>) UnsafeUtil.getObject(message, offset(typeAndOffset)),
-              writer,
-              true);
-          break;
-        case 43: // UINT32_LIST_PACKED:
-          SchemaUtil.writeUInt32List(
-              numberAt(pos),
-              (List<Integer>) UnsafeUtil.getObject(message, offset(typeAndOffset)),
-              writer,
-              true);
-          break;
-        case 44: // ENUM_LIST_PACKED:
-          SchemaUtil.writeEnumList(
-              numberAt(pos),
-              (List<Integer>) UnsafeUtil.getObject(message, offset(typeAndOffset)),
-              writer,
-              true);
-          break;
-        case 45: // SFIXED32_LIST_PACKED:
-          SchemaUtil.writeSFixed32List(
-              numberAt(pos),
-              (List<Integer>) UnsafeUtil.getObject(message, offset(typeAndOffset)),
-              writer,
-              true);
-          break;
-        case 46: // SFIXED64_LIST_PACKED:
-          SchemaUtil.writeSFixed64List(
-              numberAt(pos),
-              (List<Long>) UnsafeUtil.getObject(message, offset(typeAndOffset)),
-              writer,
-              true);
-          break;
-        case 47: // SINT32_LIST_PACKED:
-          SchemaUtil.writeSInt32List(
-              numberAt(pos),
-              (List<Integer>) UnsafeUtil.getObject(message, offset(typeAndOffset)),
-              writer,
-              true);
-          break;
-        case 48: // SINT64_LIST_PACKED:
-          SchemaUtil.writeSInt64List(
-              numberAt(pos),
-              (List<Long>) UnsafeUtil.getObject(message, offset(typeAndOffset)),
-              writer,
-              true);
-          break;
-        case 49: // GROUP_LIST:
-          SchemaUtil.writeGroupList(
-              numberAt(pos),
-              (List<?>) UnsafeUtil.getObject(message, offset(typeAndOffset)),
-              writer,
-              getMessageFieldSchema(pos));
-          break;
-        case 50: // MAP:
-          // TODO(dweis): Use schema cache.
-          writeMapHelper(writer, number, UnsafeUtil.getObject(message, offset(typeAndOffset)), pos);
-          break;
-        case 51: // ONEOF_DOUBLE:
-          if (isOneofPresent(message, number, pos)) {
-            writer.writeDouble(number, oneofDoubleAt(message, offset(typeAndOffset)));
-          }
-          break;
-        case 52: // ONEOF_FLOAT:
-          if (isOneofPresent(message, number, pos)) {
-            writer.writeFloat(number, oneofFloatAt(message, offset(typeAndOffset)));
-          }
-          break;
-        case 53: // ONEOF_INT64:
-          if (isOneofPresent(message, number, pos)) {
-            writer.writeInt64(number, oneofLongAt(message, offset(typeAndOffset)));
-          }
-          break;
-        case 54: // ONEOF_UINT64:
-          if (isOneofPresent(message, number, pos)) {
-            writer.writeUInt64(number, oneofLongAt(message, offset(typeAndOffset)));
-          }
-          break;
-        case 55: // ONEOF_INT32:
-          if (isOneofPresent(message, number, pos)) {
-            writer.writeInt32(number, oneofIntAt(message, offset(typeAndOffset)));
-          }
-          break;
-        case 56: // ONEOF_FIXED64:
-          if (isOneofPresent(message, number, pos)) {
-            writer.writeFixed64(number, oneofLongAt(message, offset(typeAndOffset)));
-          }
-          break;
-        case 57: // ONEOF_FIXED32:
-          if (isOneofPresent(message, number, pos)) {
-            writer.writeFixed32(number, oneofIntAt(message, offset(typeAndOffset)));
-          }
-          break;
-        case 58: // ONEOF_BOOL:
-          if (isOneofPresent(message, number, pos)) {
-            writer.writeBool(number, oneofBooleanAt(message, offset(typeAndOffset)));
-          }
-          break;
-        case 59: // ONEOF_STRING:
-          if (isOneofPresent(message, number, pos)) {
-            writeString(number, UnsafeUtil.getObject(message, offset(typeAndOffset)), writer);
-          }
-          break;
-        case 60: // ONEOF_MESSAGE:
-          if (isOneofPresent(message, number, pos)) {
-            Object value = UnsafeUtil.getObject(message, offset(typeAndOffset));
-            writer.writeMessage(number, value, getMessageFieldSchema(pos));
-          }
-          break;
-        case 61: // ONEOF_BYTES:
-          if (isOneofPresent(message, number, pos)) {
-            writer.writeBytes(
-                number, (ByteString) UnsafeUtil.getObject(message, offset(typeAndOffset)));
-          }
-          break;
-        case 62: // ONEOF_UINT32:
-          if (isOneofPresent(message, number, pos)) {
-            writer.writeUInt32(number, oneofIntAt(message, offset(typeAndOffset)));
-          }
-          break;
-        case 63: // ONEOF_ENUM:
-          if (isOneofPresent(message, number, pos)) {
-            writer.writeEnum(number, oneofIntAt(message, offset(typeAndOffset)));
-          }
-          break;
-        case 64: // ONEOF_SFIXED32:
-          if (isOneofPresent(message, number, pos)) {
-            writer.writeSFixed32(number, oneofIntAt(message, offset(typeAndOffset)));
-          }
-          break;
-        case 65: // ONEOF_SFIXED64:
-          if (isOneofPresent(message, number, pos)) {
-            writer.writeSFixed64(number, oneofLongAt(message, offset(typeAndOffset)));
-          }
-          break;
-        case 66: // ONEOF_SINT32:
-          if (isOneofPresent(message, number, pos)) {
-            writer.writeSInt32(number, oneofIntAt(message, offset(typeAndOffset)));
-          }
-          break;
-        case 67: // ONEOF_SINT64:
-          if (isOneofPresent(message, number, pos)) {
-            writer.writeSInt64(number, oneofLongAt(message, offset(typeAndOffset)));
-          }
-          break;
-        case 68: // ONEOF_GROUP:
-          if (isOneofPresent(message, number, pos)) {
-            writer.writeGroup(
-                number,
-                UnsafeUtil.getObject(message, offset(typeAndOffset)),
-                getMessageFieldSchema(pos));
-          }
-          break;
-        default:
-          break;
-      }
-    }
-    while (nextExtension != null) {
-      extensionSchema.serializeExtension(writer, nextExtension);
-      nextExtension = extensionIterator.hasNext() ? extensionIterator.next() : null;
-    }
-  }
-
-  @SuppressWarnings("unchecked")
-  private <K, V> void writeMapHelper(Writer writer, int number, Object mapField, int pos)
-      throws IOException {
-    if (mapField != null) {
-      writer.writeMap(
-          number,
-          (MapEntryLite.Metadata<K, V>) mapFieldSchema.forMapMetadata(getMapFieldDefaultEntry(pos)),
-          (Map<K, V>) mapFieldSchema.forMapData(mapField));
-    }
-  }
-
-  private <UT, UB> void writeUnknownInMessageTo(
-      UnknownFieldSchema<UT, UB> schema, T message, Writer writer) throws IOException {
-    schema.writeTo(schema.getFromMessage(message), writer);
-  }
-
-  @Override
-  public void mergeFrom(T message, Reader reader, ExtensionRegistryLite extensionRegistry)
-      throws IOException {
-    if (extensionRegistry == null) {
-      throw new NullPointerException();
-    }
-    checkMutable(message);
-    mergeFromHelper(unknownFieldSchema, extensionSchema, message, reader, extensionRegistry);
-  }
-
-  /**
-   * A helper method for wildcard capture of {@code unknownFieldSchema}. See:
-   * https://docs.oracle.com/javase/tutorial/java/generics/capture.html
-   */
-  private <UT, UB, ET extends FieldDescriptorLite<ET>> void mergeFromHelper(
-      UnknownFieldSchema<UT, UB> unknownFieldSchema,
-      ExtensionSchema<ET> extensionSchema,
-      T message,
-      Reader reader,
-      ExtensionRegistryLite extensionRegistry)
-      throws IOException {
-    UB unknownFields = null;
-    FieldSet<ET> extensions = null;
-    try {
-      while (true) {
-        final int number = reader.getFieldNumber();
-        final int pos = positionForFieldNumber(number);
-        if (pos < 0) {
-          if (number == Reader.READ_DONE) {
-            return;
-          }
-          // Check if it's an extension.
-          Object extension =
-              !hasExtensions
-                  ? null
-                  : extensionSchema.findExtensionByNumber(
-                      extensionRegistry, defaultInstance, number);
-          if (extension != null) {
-            if (extensions == null) {
-              extensions = extensionSchema.getMutableExtensions(message);
-            }
-            unknownFields =
-                extensionSchema.parseExtension(
-                    message,
-                    reader,
-                    extension,
-                    extensionRegistry,
-                    extensions,
-                    unknownFields,
-                    unknownFieldSchema);
-            continue;
-          }
-          if (unknownFieldSchema.shouldDiscardUnknownFields(reader)) {
-            if (reader.skipField()) {
-              continue;
-            }
-          } else {
-            if (unknownFields == null) {
-              unknownFields = unknownFieldSchema.getBuilderFromMessage(message);
-            }
-            // Unknown field.
-            if (unknownFieldSchema.mergeOneFieldFrom(unknownFields, reader)) {
-              continue;
-            }
-          }
-          // Done reading.
-          return;
-        }
-        final int typeAndOffset = typeAndOffsetAt(pos);
-
-        try {
-          switch (type(typeAndOffset)) {
-            case 0: // DOUBLE:
-              UnsafeUtil.putDouble(message, offset(typeAndOffset), reader.readDouble());
-              setFieldPresent(message, pos);
-              break;
-            case 1: // FLOAT:
-              UnsafeUtil.putFloat(message, offset(typeAndOffset), reader.readFloat());
-              setFieldPresent(message, pos);
-              break;
-            case 2: // INT64:
-              UnsafeUtil.putLong(message, offset(typeAndOffset), reader.readInt64());
-              setFieldPresent(message, pos);
-              break;
-            case 3: // UINT64:
-              UnsafeUtil.putLong(message, offset(typeAndOffset), reader.readUInt64());
-              setFieldPresent(message, pos);
-              break;
-            case 4: // INT32:
-              UnsafeUtil.putInt(message, offset(typeAndOffset), reader.readInt32());
-              setFieldPresent(message, pos);
-              break;
-            case 5: // FIXED64:
-              UnsafeUtil.putLong(message, offset(typeAndOffset), reader.readFixed64());
-              setFieldPresent(message, pos);
-              break;
-            case 6: // FIXED32:
-              UnsafeUtil.putInt(message, offset(typeAndOffset), reader.readFixed32());
-              setFieldPresent(message, pos);
-              break;
-            case 7: // BOOL:
-              UnsafeUtil.putBoolean(message, offset(typeAndOffset), reader.readBool());
-              setFieldPresent(message, pos);
-              break;
-            case 8: // STRING:
-              readString(message, typeAndOffset, reader);
-              setFieldPresent(message, pos);
-              break;
-            case 9:
-              { // MESSAGE:
-                final MessageLite current = (MessageLite) mutableMessageFieldForMerge(message, pos);
-                reader.mergeMessageField(
-                    current, (Schema<MessageLite>) getMessageFieldSchema(pos), extensionRegistry);
-                storeMessageField(message, pos, current);
-                break;
-              }
-            case 10: // BYTES:
-              UnsafeUtil.putObject(message, offset(typeAndOffset), reader.readBytes());
-              setFieldPresent(message, pos);
-              break;
-            case 11: // UINT32:
-              UnsafeUtil.putInt(message, offset(typeAndOffset), reader.readUInt32());
-              setFieldPresent(message, pos);
-              break;
-            case 12: // ENUM:
-              {
-                int enumValue = reader.readEnum();
-                EnumVerifier enumVerifier = getEnumFieldVerifier(pos);
-                if (enumVerifier == null || enumVerifier.isInRange(enumValue)) {
-                  UnsafeUtil.putInt(message, offset(typeAndOffset), enumValue);
-                  setFieldPresent(message, pos);
-                } else {
-                  unknownFields =
-                      SchemaUtil.storeUnknownEnum(
-                          message, number, enumValue, unknownFields, unknownFieldSchema);
-                }
-                break;
-              }
-            case 13: // SFIXED32:
-              UnsafeUtil.putInt(message, offset(typeAndOffset), reader.readSFixed32());
-              setFieldPresent(message, pos);
-              break;
-            case 14: // SFIXED64:
-              UnsafeUtil.putLong(message, offset(typeAndOffset), reader.readSFixed64());
-              setFieldPresent(message, pos);
-              break;
-            case 15: // SINT32:
-              UnsafeUtil.putInt(message, offset(typeAndOffset), reader.readSInt32());
-              setFieldPresent(message, pos);
-              break;
-            case 16: // SINT64:
-              UnsafeUtil.putLong(message, offset(typeAndOffset), reader.readSInt64());
-              setFieldPresent(message, pos);
-              break;
-            case 17:
-              { // GROUP:
-                final MessageLite current = (MessageLite) mutableMessageFieldForMerge(message, pos);
-                reader.mergeGroupField(
-                    current, (Schema<MessageLite>) getMessageFieldSchema(pos), extensionRegistry);
-                storeMessageField(message, pos, current);
-                break;
-              }
-            case 18: // DOUBLE_LIST:
-              reader.readDoubleList(
-                  listFieldSchema.<Double>mutableListAt(message, offset(typeAndOffset)));
-              break;
-            case 19: // FLOAT_LIST:
-              reader.readFloatList(
-                  listFieldSchema.<Float>mutableListAt(message, offset(typeAndOffset)));
-              break;
-            case 20: // INT64_LIST:
-              reader.readInt64List(
-                  listFieldSchema.<Long>mutableListAt(message, offset(typeAndOffset)));
-              break;
-            case 21: // UINT64_LIST:
-              reader.readUInt64List(
-                  listFieldSchema.<Long>mutableListAt(message, offset(typeAndOffset)));
-              break;
-            case 22: // INT32_LIST:
-              reader.readInt32List(
-                  listFieldSchema.<Integer>mutableListAt(message, offset(typeAndOffset)));
-              break;
-            case 23: // FIXED64_LIST:
-              reader.readFixed64List(
-                  listFieldSchema.<Long>mutableListAt(message, offset(typeAndOffset)));
-              break;
-            case 24: // FIXED32_LIST:
-              reader.readFixed32List(
-                  listFieldSchema.<Integer>mutableListAt(message, offset(typeAndOffset)));
-              break;
-            case 25: // BOOL_LIST:
-              reader.readBoolList(
-                  listFieldSchema.<Boolean>mutableListAt(message, offset(typeAndOffset)));
-              break;
-            case 26: // STRING_LIST:
-              readStringList(message, typeAndOffset, reader);
-              break;
-            case 27:
-              { // MESSAGE_LIST:
-                readMessageList(
-                    message,
-                    typeAndOffset,
-                    reader,
-                    (Schema<T>) getMessageFieldSchema(pos),
-                    extensionRegistry);
-                break;
-              }
-            case 28: // BYTES_LIST:
-              reader.readBytesList(
-                  listFieldSchema.<ByteString>mutableListAt(message, offset(typeAndOffset)));
-              break;
-            case 29: // UINT32_LIST:
-              reader.readUInt32List(
-                  listFieldSchema.<Integer>mutableListAt(message, offset(typeAndOffset)));
-              break;
-            case 30: // ENUM_LIST:
-              {
-                List<Integer> enumList =
-                    listFieldSchema.<Integer>mutableListAt(message, offset(typeAndOffset));
-                reader.readEnumList(enumList);
-                unknownFields =
-                    SchemaUtil.filterUnknownEnumList(
-                        message,
-                        number,
-                        enumList,
-                        getEnumFieldVerifier(pos),
-                        unknownFields,
-                        unknownFieldSchema);
-                break;
-              }
-            case 31: // SFIXED32_LIST:
-              reader.readSFixed32List(
-                  listFieldSchema.<Integer>mutableListAt(message, offset(typeAndOffset)));
-              break;
-            case 32: // SFIXED64_LIST:
-              reader.readSFixed64List(
-                  listFieldSchema.<Long>mutableListAt(message, offset(typeAndOffset)));
-              break;
-            case 33: // SINT32_LIST:
-              reader.readSInt32List(
-                  listFieldSchema.<Integer>mutableListAt(message, offset(typeAndOffset)));
-              break;
-            case 34: // SINT64_LIST:
-              reader.readSInt64List(
-                  listFieldSchema.<Long>mutableListAt(message, offset(typeAndOffset)));
-              break;
-            case 35: // DOUBLE_LIST_PACKED:
-              reader.readDoubleList(
-                  listFieldSchema.<Double>mutableListAt(message, offset(typeAndOffset)));
-              break;
-            case 36: // FLOAT_LIST_PACKED:
-              reader.readFloatList(
-                  listFieldSchema.<Float>mutableListAt(message, offset(typeAndOffset)));
-              break;
-            case 37: // INT64_LIST_PACKED:
-              reader.readInt64List(
-                  listFieldSchema.<Long>mutableListAt(message, offset(typeAndOffset)));
-              break;
-            case 38: // UINT64_LIST_PACKED:
-              reader.readUInt64List(
-                  listFieldSchema.<Long>mutableListAt(message, offset(typeAndOffset)));
-              break;
-            case 39: // INT32_LIST_PACKED:
-              reader.readInt32List(
-                  listFieldSchema.<Integer>mutableListAt(message, offset(typeAndOffset)));
-              break;
-            case 40: // FIXED64_LIST_PACKED:
-              reader.readFixed64List(
-                  listFieldSchema.<Long>mutableListAt(message, offset(typeAndOffset)));
-              break;
-            case 41: // FIXED32_LIST_PACKED:
-              reader.readFixed32List(
-                  listFieldSchema.<Integer>mutableListAt(message, offset(typeAndOffset)));
-              break;
-            case 42: // BOOL_LIST_PACKED:
-              reader.readBoolList(
-                  listFieldSchema.<Boolean>mutableListAt(message, offset(typeAndOffset)));
-              break;
-            case 43: // UINT32_LIST_PACKED:
-              reader.readUInt32List(
-                  listFieldSchema.<Integer>mutableListAt(message, offset(typeAndOffset)));
-              break;
-            case 44: // ENUM_LIST_PACKED:
-              {
-                List<Integer> enumList =
-                    listFieldSchema.<Integer>mutableListAt(message, offset(typeAndOffset));
-                reader.readEnumList(enumList);
-                unknownFields =
-                    SchemaUtil.filterUnknownEnumList(
-                        message,
-                        number,
-                        enumList,
-                        getEnumFieldVerifier(pos),
-                        unknownFields,
-                        unknownFieldSchema);
-                break;
-              }
-            case 45: // SFIXED32_LIST_PACKED:
-              reader.readSFixed32List(
-                  listFieldSchema.<Integer>mutableListAt(message, offset(typeAndOffset)));
-              break;
-            case 46: // SFIXED64_LIST_PACKED:
-              reader.readSFixed64List(
-                  listFieldSchema.<Long>mutableListAt(message, offset(typeAndOffset)));
-              break;
-            case 47: // SINT32_LIST_PACKED:
-              reader.readSInt32List(
-                  listFieldSchema.<Integer>mutableListAt(message, offset(typeAndOffset)));
-              break;
-            case 48: // SINT64_LIST_PACKED:
-              reader.readSInt64List(
-                  listFieldSchema.<Long>mutableListAt(message, offset(typeAndOffset)));
-              break;
-            case 49:
-              { // GROUP_LIST:
-                readGroupList(
-                    message,
-                    offset(typeAndOffset),
-                    reader,
-                    (Schema<T>) getMessageFieldSchema(pos),
-                    extensionRegistry);
-                break;
-              }
-            case 50: // MAP:
-              mergeMap(message, pos, getMapFieldDefaultEntry(pos), extensionRegistry, reader);
-              break;
-            case 51: // ONEOF_DOUBLE:
-              UnsafeUtil.putObject(
-                  message, offset(typeAndOffset), Double.valueOf(reader.readDouble()));
-              setOneofPresent(message, number, pos);
-              break;
-            case 52: // ONEOF_FLOAT:
-              UnsafeUtil.putObject(
-                  message, offset(typeAndOffset), Float.valueOf(reader.readFloat()));
-              setOneofPresent(message, number, pos);
-              break;
-            case 53: // ONEOF_INT64:
-              UnsafeUtil.putObject(
-                  message, offset(typeAndOffset), Long.valueOf(reader.readInt64()));
-              setOneofPresent(message, number, pos);
-              break;
-            case 54: // ONEOF_UINT64:
-              UnsafeUtil.putObject(
-                  message, offset(typeAndOffset), Long.valueOf(reader.readUInt64()));
-              setOneofPresent(message, number, pos);
-              break;
-            case 55: // ONEOF_INT32:
-              UnsafeUtil.putObject(
-                  message, offset(typeAndOffset), Integer.valueOf(reader.readInt32()));
-              setOneofPresent(message, number, pos);
-              break;
-            case 56: // ONEOF_FIXED64:
-              UnsafeUtil.putObject(
-                  message, offset(typeAndOffset), Long.valueOf(reader.readFixed64()));
-              setOneofPresent(message, number, pos);
-              break;
-            case 57: // ONEOF_FIXED32:
-              UnsafeUtil.putObject(
-                  message, offset(typeAndOffset), Integer.valueOf(reader.readFixed32()));
-              setOneofPresent(message, number, pos);
-              break;
-            case 58: // ONEOF_BOOL:
-              UnsafeUtil.putObject(
-                  message, offset(typeAndOffset), Boolean.valueOf(reader.readBool()));
-              setOneofPresent(message, number, pos);
-              break;
-            case 59: // ONEOF_STRING:
-              readString(message, typeAndOffset, reader);
-              setOneofPresent(message, number, pos);
-              break;
-            case 60:
-              { // ONEOF_MESSAGE:
-                final MessageLite current =
-                    (MessageLite) mutableOneofMessageFieldForMerge(message, number, pos);
-                reader.mergeMessageField(
-                    current, (Schema<MessageLite>) getMessageFieldSchema(pos), extensionRegistry);
-                storeOneofMessageField(message, number, pos, current);
-                break;
-              }
-            case 61: // ONEOF_BYTES:
-              UnsafeUtil.putObject(message, offset(typeAndOffset), reader.readBytes());
-              setOneofPresent(message, number, pos);
-              break;
-            case 62: // ONEOF_UINT32:
-              UnsafeUtil.putObject(
-                  message, offset(typeAndOffset), Integer.valueOf(reader.readUInt32()));
-              setOneofPresent(message, number, pos);
-              break;
-            case 63: // ONEOF_ENUM:
-              {
-                int enumValue = reader.readEnum();
-                EnumVerifier enumVerifier = getEnumFieldVerifier(pos);
-                if (enumVerifier == null || enumVerifier.isInRange(enumValue)) {
-                  UnsafeUtil.putObject(message, offset(typeAndOffset), enumValue);
-                  setOneofPresent(message, number, pos);
-                } else {
-                  unknownFields =
-                      SchemaUtil.storeUnknownEnum(
-                          message, number, enumValue, unknownFields, unknownFieldSchema);
-                }
-                break;
-              }
-            case 64: // ONEOF_SFIXED32:
-              UnsafeUtil.putObject(
-                  message, offset(typeAndOffset), Integer.valueOf(reader.readSFixed32()));
-              setOneofPresent(message, number, pos);
-              break;
-            case 65: // ONEOF_SFIXED64:
-              UnsafeUtil.putObject(
-                  message, offset(typeAndOffset), Long.valueOf(reader.readSFixed64()));
-              setOneofPresent(message, number, pos);
-              break;
-            case 66: // ONEOF_SINT32:
-              UnsafeUtil.putObject(
-                  message, offset(typeAndOffset), Integer.valueOf(reader.readSInt32()));
-              setOneofPresent(message, number, pos);
-              break;
-            case 67: // ONEOF_SINT64:
-              UnsafeUtil.putObject(
-                  message, offset(typeAndOffset), Long.valueOf(reader.readSInt64()));
-              setOneofPresent(message, number, pos);
-              break;
-            case 68:
-              { // ONEOF_GROUP:
-                final MessageLite current =
-                    (MessageLite) mutableOneofMessageFieldForMerge(message, number, pos);
-                reader.mergeGroupField(
-                    current, (Schema<MessageLite>) getMessageFieldSchema(pos), extensionRegistry);
-                storeOneofMessageField(message, number, pos, current);
-                break;
-              }
-            default:
-              // Assume we've landed on an empty entry. Treat it as an unknown field.
-              if (unknownFields == null) {
-                unknownFields = unknownFieldSchema.getBuilderFromMessage(message);
-              }
-              if (!unknownFieldSchema.mergeOneFieldFrom(unknownFields, reader)) {
-                return;
-              }
-              break;
-          }
-        } catch (InvalidProtocolBufferException.InvalidWireTypeException e) {
-          // Treat fields with an invalid wire type as unknown fields
-          // (i.e. same as the default case).
-          if (unknownFieldSchema.shouldDiscardUnknownFields(reader)) {
-            if (!reader.skipField()) {
-              return;
-            }
-          } else {
-            if (unknownFields == null) {
-              unknownFields = unknownFieldSchema.getBuilderFromMessage(message);
-            }
-            if (!unknownFieldSchema.mergeOneFieldFrom(unknownFields, reader)) {
-              return;
-            }
-          }
-        }
-      }
-    } finally {
-      for (int i = checkInitializedCount; i < repeatedFieldOffsetStart; i++) {
-        unknownFields =
-            filterMapUnknownEnumValues(
-                message, intArray[i], unknownFields, unknownFieldSchema, message);
-      }
-      if (unknownFields != null) {
-        unknownFieldSchema.setBuilderToMessage(message, unknownFields);
-      }
-    }
-  }
-
-  @SuppressWarnings("ReferenceEquality")
-  static UnknownFieldSetLite getMutableUnknownFields(Object message) {
-    // TODO(b/248560713) decide if we're keeping support for Full in schema classes and handle this
-    // better.
-    UnknownFieldSetLite unknownFields = ((GeneratedMessageLite) message).unknownFields;
-    if (unknownFields == UnknownFieldSetLite.getDefaultInstance()) {
-      unknownFields = UnknownFieldSetLite.newInstance();
-      ((GeneratedMessageLite) message).unknownFields = unknownFields;
-    }
-    return unknownFields;
-  }
-
-  /** Decodes a map entry key or value. Stores result in registers.object1. */
-  private int decodeMapEntryValue(
-      byte[] data,
-      int position,
-      int limit,
-      WireFormat.FieldType fieldType,
-      Class<?> messageType,
-      Registers registers)
-      throws IOException {
-    switch (fieldType) {
-      case BOOL:
-        position = decodeVarint64(data, position, registers);
-        registers.object1 = registers.long1 != 0;
-        break;
-      case BYTES:
-        position = decodeBytes(data, position, registers);
-        break;
-      case DOUBLE:
-        registers.object1 = decodeDouble(data, position);
-        position += 8;
-        break;
-      case FIXED32:
-      case SFIXED32:
-        registers.object1 = decodeFixed32(data, position);
-        position += 4;
-        break;
-      case FIXED64:
-      case SFIXED64:
-        registers.object1 = decodeFixed64(data, position);
-        position += 8;
-        break;
-      case FLOAT:
-        registers.object1 = decodeFloat(data, position);
-        position += 4;
-        break;
-      case ENUM:
-      case INT32:
-      case UINT32:
-        position = decodeVarint32(data, position, registers);
-        registers.object1 = registers.int1;
-        break;
-      case INT64:
-      case UINT64:
-        position = decodeVarint64(data, position, registers);
-        registers.object1 = registers.long1;
-        break;
-      case MESSAGE:
-        position =
-            decodeMessageField(
-                Protobuf.getInstance().schemaFor(messageType), data, position, limit, registers);
-        break;
-      case SINT32:
-        position = decodeVarint32(data, position, registers);
-        registers.object1 = CodedInputStream.decodeZigZag32(registers.int1);
-        break;
-      case SINT64:
-        position = decodeVarint64(data, position, registers);
-        registers.object1 = CodedInputStream.decodeZigZag64(registers.long1);
-        break;
-      case STRING:
-        position = decodeStringRequireUtf8(data, position, registers);
-        break;
-      default:
-        throw new RuntimeException("unsupported field type.");
-    }
-    return position;
-  }
-
-  /** Decodes a map entry. */
-  private <K, V> int decodeMapEntry(
-      byte[] data,
-      int position,
-      int limit,
-      MapEntryLite.Metadata<K, V> metadata,
-      Map<K, V> target,
-      Registers registers)
-      throws IOException {
-    position = decodeVarint32(data, position, registers);
-    final int length = registers.int1;
-    if (length < 0 || length > limit - position) {
-      throw InvalidProtocolBufferException.truncatedMessage();
-    }
-    final int end = position + length;
-    K key = metadata.defaultKey;
-    V value = metadata.defaultValue;
-    while (position < end) {
-      int tag = data[position++];
-      if (tag < 0) {
-        position = decodeVarint32(tag, data, position, registers);
-        tag = registers.int1;
-      }
-      final int fieldNumber = tag >>> 3;
-      final int wireType = tag & 0x7;
-      switch (fieldNumber) {
-        case 1:
-          if (wireType == metadata.keyType.getWireType()) {
-            position =
-                decodeMapEntryValue(data, position, limit, metadata.keyType, null, registers);
-            key = (K) registers.object1;
-            continue;
-          }
-          break;
-        case 2:
-          if (wireType == metadata.valueType.getWireType()) {
-            position =
-                decodeMapEntryValue(
-                    data,
-                    position,
-                    limit,
-                    metadata.valueType,
-                    metadata.defaultValue.getClass(),
-                    registers);
-            value = (V) registers.object1;
-            continue;
-          }
-          break;
-        default:
-          break;
-      }
-      position = skipField(tag, data, position, limit, registers);
-    }
-    if (position != end) {
-      throw InvalidProtocolBufferException.parseFailure();
-    }
-    target.put(key, value);
-    return end;
-  }
-
-  @SuppressWarnings("ReferenceEquality")
-  private int parseRepeatedField(
-      T message,
-      byte[] data,
-      int position,
-      int limit,
-      int tag,
-      int number,
-      int wireType,
-      int bufferPosition,
-      long typeAndOffset,
-      int fieldType,
-      long fieldOffset,
-      Registers registers)
-      throws IOException {
-    ProtobufList<?> list = (ProtobufList<?>) UNSAFE.getObject(message, fieldOffset);
-    if (!list.isModifiable()) {
-      final int size = list.size();
-      list =
-          list.mutableCopyWithCapacity(
-              size == 0 ? AbstractProtobufList.DEFAULT_CAPACITY : size * 2);
-      UNSAFE.putObject(message, fieldOffset, list);
-    }
-    switch (fieldType) {
-      case 18: // DOUBLE_LIST:
-      case 35: // DOUBLE_LIST_PACKED:
-        if (wireType == WireFormat.WIRETYPE_LENGTH_DELIMITED) {
-          position = decodePackedDoubleList(data, position, list, registers);
-        } else if (wireType == WireFormat.WIRETYPE_FIXED64) {
-          position = decodeDoubleList(tag, data, position, limit, list, registers);
-        }
-        break;
-      case 19: // FLOAT_LIST:
-      case 36: // FLOAT_LIST_PACKED:
-        if (wireType == WireFormat.WIRETYPE_LENGTH_DELIMITED) {
-          position = decodePackedFloatList(data, position, list, registers);
-        } else if (wireType == WireFormat.WIRETYPE_FIXED32) {
-          position = decodeFloatList(tag, data, position, limit, list, registers);
-        }
-        break;
-      case 20: // INT64_LIST:
-      case 21: // UINT64_LIST:
-      case 37: // INT64_LIST_PACKED:
-      case 38: // UINT64_LIST_PACKED:
-        if (wireType == WireFormat.WIRETYPE_LENGTH_DELIMITED) {
-          position = decodePackedVarint64List(data, position, list, registers);
-        } else if (wireType == WireFormat.WIRETYPE_VARINT) {
-          position = decodeVarint64List(tag, data, position, limit, list, registers);
-        }
-        break;
-      case 22: // INT32_LIST:
-      case 29: // UINT32_LIST:
-      case 39: // INT32_LIST_PACKED:
-      case 43: // UINT32_LIST_PACKED:
-        if (wireType == WireFormat.WIRETYPE_LENGTH_DELIMITED) {
-          position = decodePackedVarint32List(data, position, list, registers);
-        } else if (wireType == WireFormat.WIRETYPE_VARINT) {
-          position = decodeVarint32List(tag, data, position, limit, list, registers);
-        }
-        break;
-      case 23: // FIXED64_LIST:
-      case 32: // SFIXED64_LIST:
-      case 40: // FIXED64_LIST_PACKED:
-      case 46: // SFIXED64_LIST_PACKED:
-        if (wireType == WireFormat.WIRETYPE_LENGTH_DELIMITED) {
-          position = decodePackedFixed64List(data, position, list, registers);
-        } else if (wireType == WireFormat.WIRETYPE_FIXED64) {
-          position = decodeFixed64List(tag, data, position, limit, list, registers);
-        }
-        break;
-      case 24: // FIXED32_LIST:
-      case 31: // SFIXED32_LIST:
-      case 41: // FIXED32_LIST_PACKED:
-      case 45: // SFIXED32_LIST_PACKED:
-        if (wireType == WireFormat.WIRETYPE_LENGTH_DELIMITED) {
-          position = decodePackedFixed32List(data, position, list, registers);
-        } else if (wireType == WireFormat.WIRETYPE_FIXED32) {
-          position = decodeFixed32List(tag, data, position, limit, list, registers);
-        }
-        break;
-      case 25: // BOOL_LIST:
-      case 42: // BOOL_LIST_PACKED:
-        if (wireType == WireFormat.WIRETYPE_LENGTH_DELIMITED) {
-          position = decodePackedBoolList(data, position, list, registers);
-        } else if (wireType == WireFormat.WIRETYPE_VARINT) {
-          position = decodeBoolList(tag, data, position, limit, list, registers);
-        }
-        break;
-      case 26: // STRING_LIST:
-        if (wireType == WireFormat.WIRETYPE_LENGTH_DELIMITED) {
-          if ((typeAndOffset & ENFORCE_UTF8_MASK) == 0) {
-            position = decodeStringList(tag, data, position, limit, list, registers);
-          } else {
-            position = decodeStringListRequireUtf8(tag, data, position, limit, list, registers);
-          }
-        }
-        break;
-      case 27: // MESSAGE_LIST:
-        if (wireType == WireFormat.WIRETYPE_LENGTH_DELIMITED) {
-          position =
-              decodeMessageList(
-                  getMessageFieldSchema(bufferPosition),
-                  tag,
-                  data,
-                  position,
-                  limit,
-                  list,
-                  registers);
-        }
-        break;
-      case 28: // BYTES_LIST:
-        if (wireType == WireFormat.WIRETYPE_LENGTH_DELIMITED) {
-          position = decodeBytesList(tag, data, position, limit, list, registers);
-        }
-        break;
-      case 30: // ENUM_LIST:
-      case 44: // ENUM_LIST_PACKED:
-        if (wireType == WireFormat.WIRETYPE_LENGTH_DELIMITED) {
-          position = decodePackedVarint32List(data, position, list, registers);
-        } else if (wireType == WireFormat.WIRETYPE_VARINT) {
-          position = decodeVarint32List(tag, data, position, limit, list, registers);
-        } else {
-          break;
-        }
-        SchemaUtil.filterUnknownEnumList(
-            message,
-            number,
-            (ProtobufList<Integer>) list,
-            getEnumFieldVerifier(bufferPosition),
-            null,
-            (UnknownFieldSchema<UnknownFieldSetLite, UnknownFieldSetLite>) unknownFieldSchema);
-        break;
-      case 33: // SINT32_LIST:
-      case 47: // SINT32_LIST_PACKED:
-        if (wireType == WireFormat.WIRETYPE_LENGTH_DELIMITED) {
-          position = decodePackedSInt32List(data, position, list, registers);
-        } else if (wireType == WireFormat.WIRETYPE_VARINT) {
-          position = decodeSInt32List(tag, data, position, limit, list, registers);
-        }
-        break;
-      case 34: // SINT64_LIST:
-      case 48: // SINT64_LIST_PACKED:
-        if (wireType == WireFormat.WIRETYPE_LENGTH_DELIMITED) {
-          position = decodePackedSInt64List(data, position, list, registers);
-        } else if (wireType == WireFormat.WIRETYPE_VARINT) {
-          position = decodeSInt64List(tag, data, position, limit, list, registers);
-        }
-        break;
-      case 49: // GROUP_LIST:
-        if (wireType == WireFormat.WIRETYPE_START_GROUP) {
-          position =
-              decodeGroupList(
-                  getMessageFieldSchema(bufferPosition),
-                  tag,
-                  data,
-                  position,
-                  limit,
-                  list,
-                  registers);
-        }
-        break;
-      default:
-        break;
-    }
-    return position;
-  }
-
-  private <K, V> int parseMapField(
-      T message,
-      byte[] data,
-      int position,
-      int limit,
-      int bufferPosition,
-      long fieldOffset,
-      Registers registers)
-      throws IOException {
-    final sun.misc.Unsafe unsafe = UNSAFE;
-    Object mapDefaultEntry = getMapFieldDefaultEntry(bufferPosition);
-    Object mapField = unsafe.getObject(message, fieldOffset);
-    if (mapFieldSchema.isImmutable(mapField)) {
-      Object oldMapField = mapField;
-      mapField = mapFieldSchema.newMapField(mapDefaultEntry);
-      mapFieldSchema.mergeFrom(mapField, oldMapField);
-      unsafe.putObject(message, fieldOffset, mapField);
-    }
-    return decodeMapEntry(
-        data,
-        position,
-        limit,
-        (Metadata<K, V>) mapFieldSchema.forMapMetadata(mapDefaultEntry),
-        (Map<K, V>) mapFieldSchema.forMutableMapData(mapField),
-        registers);
-  }
-
-  private int parseOneofField(
-      T message,
-      byte[] data,
-      int position,
-      int limit,
-      int tag,
-      int number,
-      int wireType,
-      int typeAndOffset,
-      int fieldType,
-      long fieldOffset,
-      int bufferPosition,
-      Registers registers)
-      throws IOException {
-    final sun.misc.Unsafe unsafe = UNSAFE;
-    final long oneofCaseOffset = buffer[bufferPosition + 2] & OFFSET_MASK;
-    switch (fieldType) {
-      case 51: // ONEOF_DOUBLE:
-        if (wireType == WireFormat.WIRETYPE_FIXED64) {
-          unsafe.putObject(message, fieldOffset, decodeDouble(data, position));
-          position += 8;
-          unsafe.putInt(message, oneofCaseOffset, number);
-        }
-        break;
-      case 52: // ONEOF_FLOAT:
-        if (wireType == WireFormat.WIRETYPE_FIXED32) {
-          unsafe.putObject(message, fieldOffset, decodeFloat(data, position));
-          position += 4;
-          unsafe.putInt(message, oneofCaseOffset, number);
-        }
-        break;
-      case 53: // ONEOF_INT64:
-      case 54: // ONEOF_UINT64:
-        if (wireType == WireFormat.WIRETYPE_VARINT) {
-          position = decodeVarint64(data, position, registers);
-          unsafe.putObject(message, fieldOffset, registers.long1);
-          unsafe.putInt(message, oneofCaseOffset, number);
-        }
-        break;
-      case 55: // ONEOF_INT32:
-      case 62: // ONEOF_UINT32:
-        if (wireType == WireFormat.WIRETYPE_VARINT) {
-          position = decodeVarint32(data, position, registers);
-          unsafe.putObject(message, fieldOffset, registers.int1);
-          unsafe.putInt(message, oneofCaseOffset, number);
-        }
-        break;
-      case 56: // ONEOF_FIXED64:
-      case 65: // ONEOF_SFIXED64:
-        if (wireType == WireFormat.WIRETYPE_FIXED64) {
-          unsafe.putObject(message, fieldOffset, decodeFixed64(data, position));
-          position += 8;
-          unsafe.putInt(message, oneofCaseOffset, number);
-        }
-        break;
-      case 57: // ONEOF_FIXED32:
-      case 64: // ONEOF_SFIXED32:
-        if (wireType == WireFormat.WIRETYPE_FIXED32) {
-          unsafe.putObject(message, fieldOffset, decodeFixed32(data, position));
-          position += 4;
-          unsafe.putInt(message, oneofCaseOffset, number);
-        }
-        break;
-      case 58: // ONEOF_BOOL:
-        if (wireType == WireFormat.WIRETYPE_VARINT) {
-          position = decodeVarint64(data, position, registers);
-          unsafe.putObject(message, fieldOffset, registers.long1 != 0);
-          unsafe.putInt(message, oneofCaseOffset, number);
-        }
-        break;
-      case 59: // ONEOF_STRING:
-        if (wireType == WireFormat.WIRETYPE_LENGTH_DELIMITED) {
-          position = decodeVarint32(data, position, registers);
-          final int length = registers.int1;
-          if (length == 0) {
-            unsafe.putObject(message, fieldOffset, "");
-          } else {
-            if ((typeAndOffset & ENFORCE_UTF8_MASK) != 0
-                && !Utf8.isValidUtf8(data, position, position + length)) {
-              throw InvalidProtocolBufferException.invalidUtf8();
-            }
-            final String value = new String(data, position, length, Internal.UTF_8);
-            unsafe.putObject(message, fieldOffset, value);
-            position += length;
-          }
-          unsafe.putInt(message, oneofCaseOffset, number);
-        }
-        break;
-      case 60: // ONEOF_MESSAGE:
-        if (wireType == WireFormat.WIRETYPE_LENGTH_DELIMITED) {
-          final Object current = mutableOneofMessageFieldForMerge(message, number, bufferPosition);
-          position =
-              mergeMessageField(
-                  current, getMessageFieldSchema(bufferPosition), data, position, limit, registers);
-          storeOneofMessageField(message, number, bufferPosition, current);
-        }
-        break;
-      case 61: // ONEOF_BYTES:
-        if (wireType == WireFormat.WIRETYPE_LENGTH_DELIMITED) {
-          position = decodeBytes(data, position, registers);
-          unsafe.putObject(message, fieldOffset, registers.object1);
-          unsafe.putInt(message, oneofCaseOffset, number);
-        }
-        break;
-      case 63: // ONEOF_ENUM:
-        if (wireType == WireFormat.WIRETYPE_VARINT) {
-          position = decodeVarint32(data, position, registers);
-          final int enumValue = registers.int1;
-          EnumVerifier enumVerifier = getEnumFieldVerifier(bufferPosition);
-          if (enumVerifier == null || enumVerifier.isInRange(enumValue)) {
-            unsafe.putObject(message, fieldOffset, enumValue);
-            unsafe.putInt(message, oneofCaseOffset, number);
-          } else {
-            // UnknownFieldSetLite requires varint to be represented as Long.
-            getMutableUnknownFields(message).storeField(tag, (long) enumValue);
-          }
-        }
-        break;
-      case 66: // ONEOF_SINT32:
-        if (wireType == WireFormat.WIRETYPE_VARINT) {
-          position = decodeVarint32(data, position, registers);
-          unsafe.putObject(message, fieldOffset, CodedInputStream.decodeZigZag32(registers.int1));
-          unsafe.putInt(message, oneofCaseOffset, number);
-        }
-        break;
-      case 67: // ONEOF_SINT64:
-        if (wireType == WireFormat.WIRETYPE_VARINT) {
-          position = decodeVarint64(data, position, registers);
-          unsafe.putObject(message, fieldOffset, CodedInputStream.decodeZigZag64(registers.long1));
-          unsafe.putInt(message, oneofCaseOffset, number);
-        }
-        break;
-      case 68: // ONEOF_GROUP:
-        if (wireType == WireFormat.WIRETYPE_START_GROUP) {
-          final Object current = mutableOneofMessageFieldForMerge(message, number, bufferPosition);
-          final int endTag = (tag & ~0x7) | WireFormat.WIRETYPE_END_GROUP;
-          position =
-              mergeGroupField(
-                  current,
-                  getMessageFieldSchema(bufferPosition),
-                  data,
-                  position,
-                  limit,
-                  endTag,
-                  registers);
-          storeOneofMessageField(message, number, bufferPosition, current);
-        }
-        break;
-      default:
-        break;
-    }
-    return position;
-  }
-
-  private Schema getMessageFieldSchema(int pos) {
-    final int index = pos / INTS_PER_FIELD * 2;
-    Schema schema = (Schema) objects[index];
-    if (schema != null) {
-      return schema;
-    }
-    schema = Protobuf.getInstance().schemaFor((Class) objects[index + 1]);
-    objects[index] = schema;
-    return schema;
-  }
-
-  private Object getMapFieldDefaultEntry(int pos) {
-    return objects[pos / INTS_PER_FIELD * 2];
-  }
-
-  private EnumVerifier getEnumFieldVerifier(int pos) {
-    return (EnumVerifier) objects[pos / INTS_PER_FIELD * 2 + 1];
-  }
-
-  /**
-   * Parses a proto2 message or group and returns the position after the message/group. If it's
-   * parsing a message (endGroup == 0), returns limit if parsing is successful; It it's parsing a
-   * group (endGroup != 0), parsing ends when a tag == endGroup is encountered and the position
-   * after that tag is returned.
-   */
-  @CanIgnoreReturnValue
-  int parseProto2Message(
-      T message, byte[] data, int position, int limit, int endGroup, Registers registers)
-      throws IOException {
-    checkMutable(message);
-    final sun.misc.Unsafe unsafe = UNSAFE;
-    int currentPresenceFieldOffset = NO_PRESENCE_SENTINEL;
-    int currentPresenceField = 0;
-    int tag = 0;
-    int oldNumber = -1;
-    int pos = 0;
-    while (position < limit) {
-      tag = data[position++];
-      if (tag < 0) {
-        position = decodeVarint32(tag, data, position, registers);
-        tag = registers.int1;
-      }
-      final int number = tag >>> 3;
-      final int wireType = tag & 0x7;
-      if (number > oldNumber) {
-        pos = positionForFieldNumber(number, pos / INTS_PER_FIELD);
-      } else {
-        pos = positionForFieldNumber(number);
-      }
-      oldNumber = number;
-      if (pos == -1) {
-        // need to reset
-        pos = 0;
-      } else {
-        final int typeAndOffset = buffer[pos + 1];
-        final int fieldType = type(typeAndOffset);
-        final long fieldOffset = offset(typeAndOffset);
-        if (fieldType <= 17) {
-          // Proto2 optional fields have has-bits.
-          final int presenceMaskAndOffset = buffer[pos + 2];
-          final int presenceMask = 1 << (presenceMaskAndOffset >>> OFFSET_BITS);
-          final int presenceFieldOffset = presenceMaskAndOffset & OFFSET_MASK;
-          // We cache the 32-bit has-bits integer value and only write it back when parsing a field
-          // using a different has-bits integer.
-          if (presenceFieldOffset != currentPresenceFieldOffset) {
-            if (currentPresenceFieldOffset != NO_PRESENCE_SENTINEL) {
-              unsafe.putInt(message, (long) currentPresenceFieldOffset, currentPresenceField);
-            }
-            currentPresenceFieldOffset = presenceFieldOffset;
-            currentPresenceField = unsafe.getInt(message, (long) presenceFieldOffset);
-          }
-          switch (fieldType) {
-            case 0: // DOUBLE
-              if (wireType == WireFormat.WIRETYPE_FIXED64) {
-                UnsafeUtil.putDouble(message, fieldOffset, decodeDouble(data, position));
-                position += 8;
-                currentPresenceField |= presenceMask;
-                continue;
-              }
-              break;
-            case 1: // FLOAT
-              if (wireType == WireFormat.WIRETYPE_FIXED32) {
-                UnsafeUtil.putFloat(message, fieldOffset, decodeFloat(data, position));
-                position += 4;
-                currentPresenceField |= presenceMask;
-                continue;
-              }
-              break;
-            case 2: // INT64
-            case 3: // UINT64
-              if (wireType == WireFormat.WIRETYPE_VARINT) {
-                position = decodeVarint64(data, position, registers);
-                unsafe.putLong(message, fieldOffset, registers.long1);
-                currentPresenceField |= presenceMask;
-                continue;
-              }
-              break;
-            case 4: // INT32
-            case 11: // UINT32
-              if (wireType == WireFormat.WIRETYPE_VARINT) {
-                position = decodeVarint32(data, position, registers);
-                unsafe.putInt(message, fieldOffset, registers.int1);
-                currentPresenceField |= presenceMask;
-                continue;
-              }
-              break;
-            case 5: // FIXED64
-            case 14: // SFIXED64
-              if (wireType == WireFormat.WIRETYPE_FIXED64) {
-                unsafe.putLong(message, fieldOffset, decodeFixed64(data, position));
-                position += 8;
-                currentPresenceField |= presenceMask;
-                continue;
-              }
-              break;
-            case 6: // FIXED32
-            case 13: // SFIXED32
-              if (wireType == WireFormat.WIRETYPE_FIXED32) {
-                unsafe.putInt(message, fieldOffset, decodeFixed32(data, position));
-                position += 4;
-                currentPresenceField |= presenceMask;
-                continue;
-              }
-              break;
-            case 7: // BOOL
-              if (wireType == WireFormat.WIRETYPE_VARINT) {
-                position = decodeVarint64(data, position, registers);
-                UnsafeUtil.putBoolean(message, fieldOffset, registers.long1 != 0);
-                currentPresenceField |= presenceMask;
-                continue;
-              }
-              break;
-            case 8: // STRING
-              if (wireType == WireFormat.WIRETYPE_LENGTH_DELIMITED) {
-                if ((typeAndOffset & ENFORCE_UTF8_MASK) == 0) {
-                  position = decodeString(data, position, registers);
-                } else {
-                  position = decodeStringRequireUtf8(data, position, registers);
-                }
-                unsafe.putObject(message, fieldOffset, registers.object1);
-                currentPresenceField |= presenceMask;
-                continue;
-              }
-              break;
-            case 9: // MESSAGE
-              if (wireType == WireFormat.WIRETYPE_LENGTH_DELIMITED) {
-                final Object current = mutableMessageFieldForMerge(message, pos);
-                position =
-                    mergeMessageField(
-                        current, getMessageFieldSchema(pos), data, position, limit, registers);
-                storeMessageField(message, pos, current);
-                currentPresenceField |= presenceMask;
-                continue;
-              }
-              break;
-            case 10: // BYTES
-              if (wireType == WireFormat.WIRETYPE_LENGTH_DELIMITED) {
-                position = decodeBytes(data, position, registers);
-                unsafe.putObject(message, fieldOffset, registers.object1);
-                currentPresenceField |= presenceMask;
-                continue;
-              }
-              break;
-            case 12: // ENUM
-              if (wireType == WireFormat.WIRETYPE_VARINT) {
-                position = decodeVarint32(data, position, registers);
-                final int enumValue = registers.int1;
-                EnumVerifier enumVerifier = getEnumFieldVerifier(pos);
-                if (enumVerifier == null || enumVerifier.isInRange(enumValue)) {
-                  unsafe.putInt(message, fieldOffset, enumValue);
-                  currentPresenceField |= presenceMask;
-                } else {
-                  // UnknownFieldSetLite requires varint to be represented as Long.
-                  getMutableUnknownFields(message).storeField(tag, (long) enumValue);
-                }
-                continue;
-              }
-              break;
-            case 15: // SINT32
-              if (wireType == WireFormat.WIRETYPE_VARINT) {
-                position = decodeVarint32(data, position, registers);
-                unsafe.putInt(
-                    message, fieldOffset, CodedInputStream.decodeZigZag32(registers.int1));
-                currentPresenceField |= presenceMask;
-                continue;
-              }
-              break;
-            case 16: // SINT64
-              if (wireType == WireFormat.WIRETYPE_VARINT) {
-                position = decodeVarint64(data, position, registers);
-                unsafe.putLong(
-                    message, fieldOffset, CodedInputStream.decodeZigZag64(registers.long1));
-
-                currentPresenceField |= presenceMask;
-                continue;
-              }
-              break;
-            case 17: // GROUP
-              if (wireType == WireFormat.WIRETYPE_START_GROUP) {
-                final Object current = mutableMessageFieldForMerge(message, pos);
-                final int endTag = (number << 3) | WireFormat.WIRETYPE_END_GROUP;
-                position =
-                    mergeGroupField(
-                        current,
-                        getMessageFieldSchema(pos),
-                        data,
-                        position,
-                        limit,
-                        endTag,
-                        registers);
-                storeMessageField(message, pos, current);
-                currentPresenceField |= presenceMask;
-                continue;
-              }
-              break;
-            default:
-              break;
-          }
-        } else if (fieldType == 27) {
-          // Handle repeated message fields.
-          if (wireType == WireFormat.WIRETYPE_LENGTH_DELIMITED) {
-            ProtobufList<?> list = (ProtobufList<?>) unsafe.getObject(message, fieldOffset);
-            if (!list.isModifiable()) {
-              final int size = list.size();
-              list =
-                  list.mutableCopyWithCapacity(
-                      size == 0 ? AbstractProtobufList.DEFAULT_CAPACITY : size * 2);
-              unsafe.putObject(message, fieldOffset, list);
-            }
-            position =
-                decodeMessageList(
-                    getMessageFieldSchema(pos), tag, data, position, limit, list, registers);
-            continue;
-          }
-        } else if (fieldType <= 49) {
-          // Handle all other repeated fields.
-          final int oldPosition = position;
-          position =
-              parseRepeatedField(
-                  message,
-                  data,
-                  position,
-                  limit,
-                  tag,
-                  number,
-                  wireType,
-                  pos,
-                  typeAndOffset,
-                  fieldType,
-                  fieldOffset,
-                  registers);
-          if (position != oldPosition) {
-            continue;
-          }
-        } else if (fieldType == 50) {
-          if (wireType == WireFormat.WIRETYPE_LENGTH_DELIMITED) {
-            final int oldPosition = position;
-            position = parseMapField(message, data, position, limit, pos, fieldOffset, registers);
-            if (position != oldPosition) {
-              continue;
-            }
-          }
-        } else {
-          final int oldPosition = position;
-          position =
-              parseOneofField(
-                  message,
-                  data,
-                  position,
-                  limit,
-                  tag,
-                  number,
-                  wireType,
-                  typeAndOffset,
-                  fieldType,
-                  fieldOffset,
-                  pos,
-                  registers);
-          if (position != oldPosition) {
-            continue;
-          }
-        }
-      }
-      if (tag == endGroup && endGroup != 0) {
-        break;
-      }
-
-      if (hasExtensions
-          && registers.extensionRegistry != ExtensionRegistryLite.getEmptyRegistry()) {
-        position = decodeExtensionOrUnknownField(
-            tag, data, position, limit, message, defaultInstance,
-            (UnknownFieldSchema<UnknownFieldSetLite, UnknownFieldSetLite>) unknownFieldSchema,
-            registers);
-      } else {
-        position = decodeUnknownField(
-            tag, data, position, limit, getMutableUnknownFields(message), registers);
-      }
-    }
-    if (currentPresenceFieldOffset != NO_PRESENCE_SENTINEL) {
-      unsafe.putInt(message, (long) currentPresenceFieldOffset, currentPresenceField);
-    }
-    UnknownFieldSetLite unknownFields = null;
-    for (int i = checkInitializedCount; i < repeatedFieldOffsetStart; i++) {
-      unknownFields =
-          filterMapUnknownEnumValues(
-              message,
-              intArray[i],
-              unknownFields,
-              (UnknownFieldSchema<UnknownFieldSetLite, UnknownFieldSetLite>) unknownFieldSchema,
-              message);
-    }
-    if (unknownFields != null) {
-      ((UnknownFieldSchema<UnknownFieldSetLite, UnknownFieldSetLite>) unknownFieldSchema)
-          .setBuilderToMessage(message, unknownFields);
-    }
-    if (endGroup == 0) {
-      if (position != limit) {
-        throw InvalidProtocolBufferException.parseFailure();
-      }
-    } else {
-      if (position > limit || tag != endGroup) {
-        throw InvalidProtocolBufferException.parseFailure();
-      }
-    }
-    return position;
-  }
-
-  private Object mutableMessageFieldForMerge(T message, int pos) {
-    final Schema fieldSchema = getMessageFieldSchema(pos);
-    final long offset = offset(typeAndOffsetAt(pos));
-
-    // Field not present, create a new one
-    if (!isFieldPresent(message, pos)) {
-      return fieldSchema.newInstance();
-    }
-
-    // Field present, if mutable, ready to merge
-    final Object current = UNSAFE.getObject(message, offset);
-    if (isMutable(current)) {
-      return current;
-    }
-
-    // Field present but immutable, make a new mutable copy
-    final Object newMessage = fieldSchema.newInstance();
-    if (current != null) {
-      fieldSchema.mergeFrom(newMessage, current);
-    }
-    return newMessage;
-  }
-
-  private void storeMessageField(T message, int pos, Object field) {
-    UNSAFE.putObject(message, offset(typeAndOffsetAt(pos)), field);
-    setFieldPresent(message, pos);
-  }
-
-  private Object mutableOneofMessageFieldForMerge(T message, int fieldNumber, int pos) {
-    final Schema fieldSchema = getMessageFieldSchema(pos);
-
-    // Field not present, create it and mark it present
-    if (!isOneofPresent(message, fieldNumber, pos)) {
-      return fieldSchema.newInstance();
-    }
-
-    // Field present, if mutable, ready to merge
-    final Object current = UNSAFE.getObject(message, offset(typeAndOffsetAt(pos)));
-    if (isMutable(current)) {
-      return current;
-    }
-
-    // Field present but immutable, make a new mutable copy
-    final Object newMessage = fieldSchema.newInstance();
-    if (current != null) {
-      fieldSchema.mergeFrom(newMessage, current);
-    }
-    return newMessage;
-  }
-
-  private void storeOneofMessageField(T message, int fieldNumber, int pos, Object field) {
-    UNSAFE.putObject(message, offset(typeAndOffsetAt(pos)), field);
-    setOneofPresent(message, fieldNumber, pos);
-  }
-
-  /** Parses a proto3 message and returns the limit if parsing is successful. */
-  @CanIgnoreReturnValue
-  private int parseProto3Message(
-      T message, byte[] data, int position, int limit, Registers registers) throws IOException {
-    checkMutable(message);
-    final sun.misc.Unsafe unsafe = UNSAFE;
-    int currentPresenceFieldOffset = NO_PRESENCE_SENTINEL;
-    int currentPresenceField = 0;
-    int tag = 0;
-    int oldNumber = -1;
-    int pos = 0;
-    while (position < limit) {
-      tag = data[position++];
-      if (tag < 0) {
-        position = decodeVarint32(tag, data, position, registers);
-        tag = registers.int1;
-      }
-      final int number = tag >>> 3;
-      final int wireType = tag & 0x7;
-      if (number > oldNumber) {
-        pos = positionForFieldNumber(number, pos / INTS_PER_FIELD);
-      } else {
-        pos = positionForFieldNumber(number);
-      }
-      oldNumber = number;
-      if (pos == -1) {
-        // need to reset
-        pos = 0;
-      } else {
-        final int typeAndOffset = buffer[pos + 1];
-        final int fieldType = type(typeAndOffset);
-        final long fieldOffset = offset(typeAndOffset);
-        if (fieldType <= 17) {
-          // Proto3 optional fields have has-bits.
-          final int presenceMaskAndOffset = buffer[pos + 2];
-          final int presenceMask = 1 << (presenceMaskAndOffset >>> OFFSET_BITS);
-          final int presenceFieldOffset = presenceMaskAndOffset & OFFSET_MASK;
-          // We cache the 32-bit has-bits integer value and only write it back when parsing a field
-          // using a different has-bits integer.
-          //
-          // Note that for fields that do not have hasbits, we unconditionally write and discard
-          // the data.
-          if (presenceFieldOffset != currentPresenceFieldOffset) {
-            if (currentPresenceFieldOffset != NO_PRESENCE_SENTINEL) {
-              unsafe.putInt(message, (long) currentPresenceFieldOffset, currentPresenceField);
-            }
-            if (presenceFieldOffset != NO_PRESENCE_SENTINEL) {
-              currentPresenceField = unsafe.getInt(message, (long) presenceFieldOffset);
-            }
-            currentPresenceFieldOffset = presenceFieldOffset;
-          }
-          switch (fieldType) {
-            case 0: // DOUBLE:
-              if (wireType == WireFormat.WIRETYPE_FIXED64) {
-                UnsafeUtil.putDouble(message, fieldOffset, decodeDouble(data, position));
-                position += 8;
-                currentPresenceField |= presenceMask;
-                continue;
-              }
-              break;
-            case 1: // FLOAT:
-              if (wireType == WireFormat.WIRETYPE_FIXED32) {
-                UnsafeUtil.putFloat(message, fieldOffset, decodeFloat(data, position));
-                position += 4;
-                currentPresenceField |= presenceMask;
-                continue;
-              }
-              break;
-            case 2: // INT64:
-            case 3: // UINT64:
-              if (wireType == WireFormat.WIRETYPE_VARINT) {
-                position = decodeVarint64(data, position, registers);
-                unsafe.putLong(message, fieldOffset, registers.long1);
-                currentPresenceField |= presenceMask;
-                continue;
-              }
-              break;
-            case 4: // INT32:
-            case 11: // UINT32:
-              if (wireType == WireFormat.WIRETYPE_VARINT) {
-                position = decodeVarint32(data, position, registers);
-                unsafe.putInt(message, fieldOffset, registers.int1);
-                currentPresenceField |= presenceMask;
-                continue;
-              }
-              break;
-            case 5: // FIXED64:
-            case 14: // SFIXED64:
-              if (wireType == WireFormat.WIRETYPE_FIXED64) {
-                unsafe.putLong(message, fieldOffset, decodeFixed64(data, position));
-                position += 8;
-                currentPresenceField |= presenceMask;
-                continue;
-              }
-              break;
-            case 6: // FIXED32:
-            case 13: // SFIXED32:
-              if (wireType == WireFormat.WIRETYPE_FIXED32) {
-                unsafe.putInt(message, fieldOffset, decodeFixed32(data, position));
-                position += 4;
-                currentPresenceField |= presenceMask;
-                continue;
-              }
-              break;
-            case 7: // BOOL:
-              if (wireType == WireFormat.WIRETYPE_VARINT) {
-                position = decodeVarint64(data, position, registers);
-                UnsafeUtil.putBoolean(message, fieldOffset, registers.long1 != 0);
-                currentPresenceField |= presenceMask;
-                continue;
-              }
-              break;
-            case 8: // STRING:
-              if (wireType == WireFormat.WIRETYPE_LENGTH_DELIMITED) {
-                if ((typeAndOffset & ENFORCE_UTF8_MASK) == 0) {
-                  position = decodeString(data, position, registers);
-                } else {
-                  position = decodeStringRequireUtf8(data, position, registers);
-                }
-                unsafe.putObject(message, fieldOffset, registers.object1);
-                currentPresenceField |= presenceMask;
-                continue;
-              }
-              break;
-            case 9: // MESSAGE:
-              if (wireType == WireFormat.WIRETYPE_LENGTH_DELIMITED) {
-                final Object current = mutableMessageFieldForMerge(message, pos);
-                position =
-                    mergeMessageField(
-                        current, getMessageFieldSchema(pos), data, position, limit, registers);
-                storeMessageField(message, pos, current);
-                currentPresenceField |= presenceMask;
-                continue;
-              }
-              break;
-            case 10: // BYTES:
-              if (wireType == WireFormat.WIRETYPE_LENGTH_DELIMITED) {
-                position = decodeBytes(data, position, registers);
-                unsafe.putObject(message, fieldOffset, registers.object1);
-                currentPresenceField |= presenceMask;
-                continue;
-              }
-              break;
-            case 12: // ENUM:
-              if (wireType == WireFormat.WIRETYPE_VARINT) {
-                position = decodeVarint32(data, position, registers);
-                unsafe.putInt(message, fieldOffset, registers.int1);
-                currentPresenceField |= presenceMask;
-                continue;
-              }
-              break;
-            case 15: // SINT32:
-              if (wireType == WireFormat.WIRETYPE_VARINT) {
-                position = decodeVarint32(data, position, registers);
-                unsafe.putInt(
-                    message, fieldOffset, CodedInputStream.decodeZigZag32(registers.int1));
-                currentPresenceField |= presenceMask;
-                continue;
-              }
-              break;
-            case 16: // SINT64:
-              if (wireType == WireFormat.WIRETYPE_VARINT) {
-                position = decodeVarint64(data, position, registers);
-                unsafe.putLong(
-                    message, fieldOffset, CodedInputStream.decodeZigZag64(registers.long1));
-                currentPresenceField |= presenceMask;
-                continue;
-              }
-              break;
-            default:
-              break;
-          }
-        } else if (fieldType == 27) {
-          // Handle repeated message field.
-          if (wireType == WireFormat.WIRETYPE_LENGTH_DELIMITED) {
-            ProtobufList<?> list = (ProtobufList<?>) unsafe.getObject(message, fieldOffset);
-            if (!list.isModifiable()) {
-              final int size = list.size();
-              list =
-                  list.mutableCopyWithCapacity(
-                      size == 0 ? AbstractProtobufList.DEFAULT_CAPACITY : size * 2);
-              unsafe.putObject(message, fieldOffset, list);
-            }
-            position =
-                decodeMessageList(
-                    getMessageFieldSchema(pos), tag, data, position, limit, list, registers);
-            continue;
-          }
-        } else if (fieldType <= 49) {
-          // Handle all other repeated fields.
-          final int oldPosition = position;
-          position =
-              parseRepeatedField(
-                  message,
-                  data,
-                  position,
-                  limit,
-                  tag,
-                  number,
-                  wireType,
-                  pos,
-                  typeAndOffset,
-                  fieldType,
-                  fieldOffset,
-                  registers);
-          if (position != oldPosition) {
-            continue;
-          }
-        } else if (fieldType == 50) {
-          if (wireType == WireFormat.WIRETYPE_LENGTH_DELIMITED) {
-            final int oldPosition = position;
-            position = parseMapField(message, data, position, limit, pos, fieldOffset, registers);
-            if (position != oldPosition) {
-              continue;
-            }
-          }
-        } else {
-          final int oldPosition = position;
-          position =
-              parseOneofField(
-                  message,
-                  data,
-                  position,
-                  limit,
-                  tag,
-                  number,
-                  wireType,
-                  typeAndOffset,
-                  fieldType,
-                  fieldOffset,
-                  pos,
-                  registers);
-          if (position != oldPosition) {
-            continue;
-          }
-        }
-      }
-      position = decodeUnknownField(
-          tag, data, position, limit, getMutableUnknownFields(message), registers);
-    }
-    if (currentPresenceFieldOffset != NO_PRESENCE_SENTINEL) {
-      unsafe.putInt(message, (long) currentPresenceFieldOffset, currentPresenceField);
-    }
-    if (position != limit) {
-      throw InvalidProtocolBufferException.parseFailure();
-    }
-    return position;
-  }
-
-  @Override
-  public void mergeFrom(T message, byte[] data, int position, int limit, Registers registers)
-      throws IOException {
-    if (proto3) {
-      parseProto3Message(message, data, position, limit, registers);
-    } else {
-      parseProto2Message(message, data, position, limit, 0, registers);
-    }
-  }
-
-  @Override
-  public void makeImmutable(T message) {
-    if (!isMutable(message)) {
-      return;
-    }
-
-    // TODO(b/248560713) decide if we're keeping support for Full in schema classes and handle this
-    // better.
-    if (message instanceof GeneratedMessageLite) {
-      GeneratedMessageLite<?, ?> generatedMessage = ((GeneratedMessageLite<?, ?>) message);
-      generatedMessage.clearMemoizedSerializedSize();
-      generatedMessage.clearMemoizedHashCode();
-      generatedMessage.markImmutable();
-    }
-
-    final int bufferLength = buffer.length;
-    for (int pos = 0; pos < bufferLength; pos += INTS_PER_FIELD) {
-      final int typeAndOffset = typeAndOffsetAt(pos);
-      final long offset = offset(typeAndOffset);
-      switch (type(typeAndOffset)) {
-        case 17: // GROUP
-        case 9: // MESSAGE
-          if (isFieldPresent(message, pos)) {
-            getMessageFieldSchema(pos).makeImmutable(UNSAFE.getObject(message, offset));
-          }
-          break;
-        case 18: // DOUBLE_LIST:
-        case 19: // FLOAT_LIST:
-        case 20: // INT64_LIST:
-        case 21: // UINT64_LIST:
-        case 22: // INT32_LIST:
-        case 23: // FIXED64_LIST:
-        case 24: // FIXED32_LIST:
-        case 25: // BOOL_LIST:
-        case 26: // STRING_LIST:
-        case 27: // MESSAGE_LIST:
-        case 28: // BYTES_LIST:
-        case 29: // UINT32_LIST:
-        case 30: // ENUM_LIST:
-        case 31: // SFIXED32_LIST:
-        case 32: // SFIXED64_LIST:
-        case 33: // SINT32_LIST:
-        case 34: // SINT64_LIST:
-        case 35: // DOUBLE_LIST_PACKED:
-        case 36: // FLOAT_LIST_PACKED:
-        case 37: // INT64_LIST_PACKED:
-        case 38: // UINT64_LIST_PACKED:
-        case 39: // INT32_LIST_PACKED:
-        case 40: // FIXED64_LIST_PACKED:
-        case 41: // FIXED32_LIST_PACKED:
-        case 42: // BOOL_LIST_PACKED:
-        case 43: // UINT32_LIST_PACKED:
-        case 44: // ENUM_LIST_PACKED:
-        case 45: // SFIXED32_LIST_PACKED:
-        case 46: // SFIXED64_LIST_PACKED:
-        case 47: // SINT32_LIST_PACKED:
-        case 48: // SINT64_LIST_PACKED:
-        case 49: // GROUP_LIST:
-          listFieldSchema.makeImmutableListAt(message, offset);
-          break;
-        case 50: // MAP:
-          {
-            Object mapField = UNSAFE.getObject(message, offset);
-            if (mapField != null) {
-              UNSAFE.putObject(message, offset, mapFieldSchema.toImmutable(mapField));
-            }
-          }
-          break;
-      }
-    }
-    unknownFieldSchema.makeImmutable(message);
-    if (hasExtensions) {
-      extensionSchema.makeImmutable(message);
-    }
-  }
-
-  @SuppressWarnings("unchecked")
-  private final <K, V> void mergeMap(
-      Object message,
-      int pos,
-      Object mapDefaultEntry,
-      ExtensionRegistryLite extensionRegistry,
-      Reader reader)
-      throws IOException {
-    long offset = offset(typeAndOffsetAt(pos));
-    Object mapField = UnsafeUtil.getObject(message, offset);
-    // TODO(xiaofeng): Consider creating separate implementations for full and lite. In lite
-    // runtime map field will never be null but here we still need to check null because the
-    // code is shared by both full and lite. It might be better if full/lite uses different
-    // schema implementations.
-    if (mapField == null) {
-      mapField = mapFieldSchema.newMapField(mapDefaultEntry);
-      UnsafeUtil.putObject(message, offset, mapField);
-    } else if (mapFieldSchema.isImmutable(mapField)) {
-      Object oldMapField = mapField;
-      mapField = mapFieldSchema.newMapField(mapDefaultEntry);
-      mapFieldSchema.mergeFrom(mapField, oldMapField);
-      UnsafeUtil.putObject(message, offset, mapField);
-    }
-    reader.readMap(
-        (Map<K, V>) mapFieldSchema.forMutableMapData(mapField),
-        (Metadata<K, V>) mapFieldSchema.forMapMetadata(mapDefaultEntry),
-        extensionRegistry);
-  }
-
-  private <UT, UB> UB filterMapUnknownEnumValues(
-      Object message,
-      int pos,
-      UB unknownFields,
-      UnknownFieldSchema<UT, UB> unknownFieldSchema,
-      Object containerMessage) {
-    int fieldNumber = numberAt(pos);
-    long offset = offset(typeAndOffsetAt(pos));
-    Object mapField = UnsafeUtil.getObject(message, offset);
-    if (mapField == null) {
-      return unknownFields;
-    }
-    EnumVerifier enumVerifier = getEnumFieldVerifier(pos);
-    if (enumVerifier == null) {
-      return unknownFields;
-    }
-    Map<?, ?> mapData = mapFieldSchema.forMutableMapData(mapField);
-    // Filter unknown enum values.
-    unknownFields =
-        filterUnknownEnumMap(
-            pos,
-            fieldNumber,
-            mapData,
-            enumVerifier,
-            unknownFields,
-            unknownFieldSchema,
-            containerMessage);
-    return unknownFields;
-  }
-
-  @SuppressWarnings("unchecked")
-  private <K, V, UT, UB> UB filterUnknownEnumMap(
-      int pos,
-      int number,
-      Map<K, V> mapData,
-      EnumVerifier enumVerifier,
-      UB unknownFields,
-      UnknownFieldSchema<UT, UB> unknownFieldSchema,
-      Object containerMessage) {
-    Metadata<K, V> metadata =
-        (Metadata<K, V>) mapFieldSchema.forMapMetadata(getMapFieldDefaultEntry(pos));
-    for (Iterator<Map.Entry<K, V>> it = mapData.entrySet().iterator(); it.hasNext(); ) {
-      Map.Entry<K, V> entry = it.next();
-      if (!enumVerifier.isInRange((Integer) entry.getValue())) {
-        if (unknownFields == null) {
-          unknownFields = unknownFieldSchema.getBuilderFromMessage(containerMessage);
-        }
-        int entrySize =
-            MapEntryLite.computeSerializedSize(metadata, entry.getKey(), entry.getValue());
-        CodedBuilder codedBuilder = ByteString.newCodedBuilder(entrySize);
-        CodedOutputStream codedOutput = codedBuilder.getCodedOutput();
-        try {
-          MapEntryLite.writeTo(codedOutput, metadata, entry.getKey(), entry.getValue());
-        } catch (IOException e) {
-          // Writing to ByteString CodedOutputStream should not throw IOException.
-          throw new RuntimeException(e);
-        }
-        unknownFieldSchema.addLengthDelimited(unknownFields, number, codedBuilder.build());
-        it.remove();
-      }
-    }
-    return unknownFields;
-  }
-
-  @Override
-  public final boolean isInitialized(T message) {
-    int currentPresenceFieldOffset = NO_PRESENCE_SENTINEL;
-    int currentPresenceField = 0;
-    for (int i = 0; i < checkInitializedCount; i++) {
-      final int pos = intArray[i];
-      final int number = numberAt(pos);
-      final int typeAndOffset = typeAndOffsetAt(pos);
-
-      int presenceMaskAndOffset = buffer[pos + 2];
-      final int presenceFieldOffset = presenceMaskAndOffset & OFFSET_MASK;
-      int presenceMask = 1 << (presenceMaskAndOffset >>> OFFSET_BITS);
-      if (presenceFieldOffset != currentPresenceFieldOffset) {
-        currentPresenceFieldOffset = presenceFieldOffset;
-        if (currentPresenceFieldOffset != NO_PRESENCE_SENTINEL) {
-          currentPresenceField = UNSAFE.getInt(message, (long) presenceFieldOffset);
-        }
-      }
-
-      if (isRequired(typeAndOffset)) {
-        if (!isFieldPresent(
-            message, pos, currentPresenceFieldOffset, currentPresenceField, presenceMask)) {
-          return false;
-        }
-        // If a required message field is set but has no required fields of it's own, we still
-        // proceed and check the message is initialized. It should be fairly cheap to check these
-        // messages but is worth documenting.
-      }
-      // Check nested message and groups.
-      switch (type(typeAndOffset)) {
-        case 9: // MESSAGE
-        case 17: // GROUP
-          if (isFieldPresent(
-                  message, pos, currentPresenceFieldOffset, currentPresenceField, presenceMask)
-              && !isInitialized(message, typeAndOffset, getMessageFieldSchema(pos))) {
-            return false;
-          }
-          break;
-        case 27: // MESSAGE_LIST
-        case 49: // GROUP_LIST
-          if (!isListInitialized(message, typeAndOffset, pos)) {
-            return false;
-          }
-          break;
-        case 60: // ONEOF_MESSAGE
-        case 68: // ONEOF_GROUP
-          if (isOneofPresent(message, number, pos)
-              && !isInitialized(message, typeAndOffset, getMessageFieldSchema(pos))) {
-            return false;
-          }
-          break;
-        case 50: // MAP
-          if (!isMapInitialized(message, typeAndOffset, pos)) {
-            return false;
-          }
-          break;
-        default:
-          break;
-      }
-    }
-
-    if (hasExtensions) {
-      if (!extensionSchema.getExtensions(message).isInitialized()) {
-        return false;
-      }
-    }
-
-    return true;
-  }
-
-  private static boolean isInitialized(Object message, int typeAndOffset, Schema schema) {
-    Object nested = UnsafeUtil.getObject(message, offset(typeAndOffset));
-    return schema.isInitialized(nested);
-  }
-
-  private <N> boolean isListInitialized(Object message, int typeAndOffset, int pos) {
-    @SuppressWarnings("unchecked")
-    List<N> list = (List<N>) UnsafeUtil.getObject(message, offset(typeAndOffset));
-    if (list.isEmpty()) {
-      return true;
-    }
-
-    Schema schema = getMessageFieldSchema(pos);
-    for (int i = 0; i < list.size(); i++) {
-      N nested = list.get(i);
-      if (!schema.isInitialized(nested)) {
-        return false;
-      }
-    }
-    return true;
-  }
-
-  private boolean isMapInitialized(T message, int typeAndOffset, int pos) {
-    Map<?, ?> map = mapFieldSchema.forMapData(UnsafeUtil.getObject(message, offset(typeAndOffset)));
-    if (map.isEmpty()) {
-      return true;
-    }
-    Object mapDefaultEntry = getMapFieldDefaultEntry(pos);
-    MapEntryLite.Metadata<?, ?> metadata = mapFieldSchema.forMapMetadata(mapDefaultEntry);
-    if (metadata.valueType.getJavaType() != WireFormat.JavaType.MESSAGE) {
-      return true;
-    }
-    // TODO(dweis): Use schema cache.
-    Schema schema = null;
-    for (Object nested : map.values()) {
-      if (schema == null) {
-        schema = Protobuf.getInstance().schemaFor(nested.getClass());
-      }
-      if (!schema.isInitialized(nested)) {
-        return false;
-      }
-    }
-    return true;
-  }
-
-  private void writeString(int fieldNumber, Object value, Writer writer) throws IOException {
-    if (value instanceof String) {
-      writer.writeString(fieldNumber, (String) value);
-    } else {
-      writer.writeBytes(fieldNumber, (ByteString) value);
-    }
-  }
-
-  private void readString(Object message, int typeAndOffset, Reader reader) throws IOException {
-    if (isEnforceUtf8(typeAndOffset)) {
-      // Enforce valid UTF-8 on the read.
-      UnsafeUtil.putObject(message, offset(typeAndOffset), reader.readStringRequireUtf8());
-    } else if (lite) {
-      // Lite messages use String fields to store strings. Read a string but do not
-      // enforce UTF-8
-      UnsafeUtil.putObject(message, offset(typeAndOffset), reader.readString());
-    } else {
-      // Full runtime messages use Objects to store either a String or ByteString. Read
-      // the string as a ByteString and do not enforce UTF-8.
-      UnsafeUtil.putObject(message, offset(typeAndOffset), reader.readBytes());
-    }
-  }
-
-  private void readStringList(Object message, int typeAndOffset, Reader reader) throws IOException {
-    if (isEnforceUtf8(typeAndOffset)) {
-      reader.readStringListRequireUtf8(
-          listFieldSchema.<String>mutableListAt(message, offset(typeAndOffset)));
-    } else {
-      reader.readStringList(listFieldSchema.<String>mutableListAt(message, offset(typeAndOffset)));
-    }
-  }
-
-  private <E> void readMessageList(
-      Object message,
-      int typeAndOffset,
-      Reader reader,
-      Schema<E> schema,
-      ExtensionRegistryLite extensionRegistry)
-      throws IOException {
-    long offset = offset(typeAndOffset);
-    reader.readMessageList(
-        listFieldSchema.<E>mutableListAt(message, offset), schema, extensionRegistry);
-  }
-
-  private <E> void readGroupList(
-      Object message,
-      long offset,
-      Reader reader,
-      Schema<E> schema,
-      ExtensionRegistryLite extensionRegistry)
-      throws IOException {
-    reader.readGroupList(
-        listFieldSchema.<E>mutableListAt(message, offset), schema, extensionRegistry);
-  }
-
-  private int numberAt(int pos) {
-    return buffer[pos];
-  }
-
-  private int typeAndOffsetAt(int pos) {
-    return buffer[pos + 1];
-  }
-
-  private int presenceMaskAndOffsetAt(int pos) {
-    return buffer[pos + 2];
-  }
-
-  private static int type(int value) {
-    return (value & FIELD_TYPE_MASK) >>> OFFSET_BITS;
-  }
-
-  private static boolean isRequired(int value) {
-    return (value & REQUIRED_MASK) != 0;
-  }
-
-  private static boolean isEnforceUtf8(int value) {
-    return (value & ENFORCE_UTF8_MASK) != 0;
-  }
-
-  private static long offset(int value) {
-    return value & OFFSET_MASK;
-  }
-
-  private static boolean isMutable(Object message) {
-    if (message == null) {
-      return false;
-    }
-
-    // TODO(b/248560713) decide if we're keeping support for Full in schema classes and handle this
-    // better.
-    if (message instanceof GeneratedMessageLite<?, ?>) {
-      return ((GeneratedMessageLite<?, ?>) message).isMutable();
-    }
-
-    // For other types, we'll assume this is true because that's what was
-    // happening before we started checking.
-    return true;
-  }
-
-  private static void checkMutable(Object message) {
-    if (!isMutable(message)) {
-      throw new IllegalArgumentException("Mutating immutable message: " + message);
-    }
-  }
-
-  private static <T> double doubleAt(T message, long offset) {
-    return UnsafeUtil.getDouble(message, offset);
-  }
-
-  private static <T> float floatAt(T message, long offset) {
-    return UnsafeUtil.getFloat(message, offset);
-  }
-
-  private static <T> int intAt(T message, long offset) {
-    return UnsafeUtil.getInt(message, offset);
-  }
-
-  private static <T> long longAt(T message, long offset) {
-    return UnsafeUtil.getLong(message, offset);
-  }
-
-  private static <T> boolean booleanAt(T message, long offset) {
-    return UnsafeUtil.getBoolean(message, offset);
-  }
-
-  private static <T> double oneofDoubleAt(T message, long offset) {
-    return ((Double) UnsafeUtil.getObject(message, offset)).doubleValue();
-  }
-
-  private static <T> float oneofFloatAt(T message, long offset) {
-    return ((Float) UnsafeUtil.getObject(message, offset)).floatValue();
-  }
-
-  private static <T> int oneofIntAt(T message, long offset) {
-    return ((Integer) UnsafeUtil.getObject(message, offset)).intValue();
-  }
-
-  private static <T> long oneofLongAt(T message, long offset) {
-    return ((Long) UnsafeUtil.getObject(message, offset)).longValue();
-  }
-
-  private static <T> boolean oneofBooleanAt(T message, long offset) {
-    return ((Boolean) UnsafeUtil.getObject(message, offset)).booleanValue();
-  }
-
-  /** Returns true the field is present in both messages, or neither. */
-  private boolean arePresentForEquals(T message, T other, int pos) {
-    return isFieldPresent(message, pos) == isFieldPresent(other, pos);
-  }
-
-  private boolean isFieldPresent(
-      T message, int pos, int presenceFieldOffset, int presenceField, int presenceMask) {
-    if (presenceFieldOffset == NO_PRESENCE_SENTINEL) {
-      return isFieldPresent(message, pos);
-    } else {
-      return (presenceField & presenceMask) != 0;
-    }
-  }
-
-  private boolean isFieldPresent(T message, int pos) {
-    final int presenceMaskAndOffset = presenceMaskAndOffsetAt(pos);
-    final long presenceFieldOffset = presenceMaskAndOffset & OFFSET_MASK;
-    if (presenceFieldOffset == NO_PRESENCE_SENTINEL) {
-      final int typeAndOffset = typeAndOffsetAt(pos);
-      final long offset = offset(typeAndOffset);
-      switch (type(typeAndOffset)) {
-        case 0: // DOUBLE:
-            return Double.doubleToRawLongBits(UnsafeUtil.getDouble(message, offset)) != 0L;
-        case 1: // FLOAT:
-            return Float.floatToRawIntBits(UnsafeUtil.getFloat(message, offset)) != 0;
-        case 2: // INT64:
-          return UnsafeUtil.getLong(message, offset) != 0L;
-        case 3: // UINT64:
-          return UnsafeUtil.getLong(message, offset) != 0L;
-        case 4: // INT32:
-          return UnsafeUtil.getInt(message, offset) != 0;
-        case 5: // FIXED64:
-          return UnsafeUtil.getLong(message, offset) != 0L;
-        case 6: // FIXED32:
-          return UnsafeUtil.getInt(message, offset) != 0;
-        case 7: // BOOL:
-          return UnsafeUtil.getBoolean(message, offset);
-        case 8: // STRING:
-          Object value = UnsafeUtil.getObject(message, offset);
-          if (value instanceof String) {
-            return !((String) value).isEmpty();
-          } else if (value instanceof ByteString) {
-            return !ByteString.EMPTY.equals(value);
-          } else {
-            throw new IllegalArgumentException();
-          }
-        case 9: // MESSAGE:
-          return UnsafeUtil.getObject(message, offset) != null;
-        case 10: // BYTES:
-          return !ByteString.EMPTY.equals(UnsafeUtil.getObject(message, offset));
-        case 11: // UINT32:
-          return UnsafeUtil.getInt(message, offset) != 0;
-        case 12: // ENUM:
-          return UnsafeUtil.getInt(message, offset) != 0;
-        case 13: // SFIXED32:
-          return UnsafeUtil.getInt(message, offset) != 0;
-        case 14: // SFIXED64:
-          return UnsafeUtil.getLong(message, offset) != 0L;
-        case 15: // SINT32:
-          return UnsafeUtil.getInt(message, offset) != 0;
-        case 16: // SINT64:
-          return UnsafeUtil.getLong(message, offset) != 0L;
-        case 17: // GROUP:
-          return UnsafeUtil.getObject(message, offset) != null;
-        default:
-          throw new IllegalArgumentException();
-      }
-    } else {
-      final int presenceMask = 1 << (presenceMaskAndOffset >>> OFFSET_BITS);
-      return (UnsafeUtil.getInt(message, presenceMaskAndOffset & OFFSET_MASK) & presenceMask) != 0;
-    }
-  }
-
-  private void setFieldPresent(T message, int pos) {
-    int presenceMaskAndOffset = presenceMaskAndOffsetAt(pos);
-    final long presenceFieldOffset = presenceMaskAndOffset & OFFSET_MASK;
-    if (presenceFieldOffset == NO_PRESENCE_SENTINEL) {
-      return;
-    }
-    final int presenceMask = 1 << (presenceMaskAndOffset >>> OFFSET_BITS);
-    UnsafeUtil.putInt(
-        message,
-        presenceFieldOffset,
-        UnsafeUtil.getInt(message, presenceFieldOffset) | presenceMask);
-  }
-
-  private boolean isOneofPresent(T message, int fieldNumber, int pos) {
-    int presenceMaskAndOffset = presenceMaskAndOffsetAt(pos);
-    return UnsafeUtil.getInt(message, presenceMaskAndOffset & OFFSET_MASK) == fieldNumber;
-  }
-
-  private boolean isOneofCaseEqual(T message, T other, int pos) {
-    int presenceMaskAndOffset = presenceMaskAndOffsetAt(pos);
-    return UnsafeUtil.getInt(message, presenceMaskAndOffset & OFFSET_MASK)
-        == UnsafeUtil.getInt(other, presenceMaskAndOffset & OFFSET_MASK);
-  }
-
-  private void setOneofPresent(T message, int fieldNumber, int pos) {
-    int presenceMaskAndOffset = presenceMaskAndOffsetAt(pos);
-    UnsafeUtil.putInt(message, presenceMaskAndOffset & OFFSET_MASK, fieldNumber);
-  }
-
-  private int positionForFieldNumber(final int number) {
-    if (number >= minFieldNumber && number <= maxFieldNumber) {
-      return slowPositionForFieldNumber(number, 0);
-    }
-    return -1;
-  }
-
-  private int positionForFieldNumber(final int number, final int min) {
-    if (number >= minFieldNumber && number <= maxFieldNumber) {
-      return slowPositionForFieldNumber(number, min);
-    }
-    return -1;
-  }
-
-  private int slowPositionForFieldNumber(final int number, int min) {
-    int max = buffer.length / INTS_PER_FIELD - 1;
-    while (min <= max) {
-      // Find the midpoint address.
-      final int mid = (max + min) >>> 1;
-      final int pos = mid * INTS_PER_FIELD;
-      final int midFieldNumber = numberAt(pos);
-      if (number == midFieldNumber) {
-        // Found the field.
-        return pos;
-      }
-      if (number < midFieldNumber) {
-        // Search the lower half.
-        max = mid - 1;
-      } else {
-        // Search the upper half.
-        min = mid + 1;
-      }
-    }
-    return -1;
-  }
-
-  int getSchemaSize() {
-    return buffer.length * 3;
-  }
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/MessageSetSchema.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/MessageSetSchema.java
deleted file mode 100644
index 987c086..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/MessageSetSchema.java
+++ /dev/null
@@ -1,403 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import java.io.IOException;
-import java.util.Iterator;
-import java.util.Map.Entry;
-
-/** Schema used for proto2 messages using message_set_wireformat. */
-@CheckReturnValue
-final class MessageSetSchema<T> implements Schema<T> {
-  private final MessageLite defaultInstance;
-  private final UnknownFieldSchema<?, ?> unknownFieldSchema;
-  private final boolean hasExtensions;
-  private final ExtensionSchema<?> extensionSchema;
-
-  private MessageSetSchema(
-      UnknownFieldSchema<?, ?> unknownFieldSchema,
-      ExtensionSchema<?> extensionSchema,
-      MessageLite defaultInstance) {
-    this.unknownFieldSchema = unknownFieldSchema;
-    this.hasExtensions = extensionSchema.hasExtensions(defaultInstance);
-    this.extensionSchema = extensionSchema;
-    this.defaultInstance = defaultInstance;
-  }
-
-  static <T> MessageSetSchema<T> newSchema(
-      UnknownFieldSchema<?, ?> unknownFieldSchema,
-      ExtensionSchema<?> extensionSchema,
-      MessageLite defaultInstance) {
-    return new MessageSetSchema<T>(unknownFieldSchema, extensionSchema, defaultInstance);
-  }
-
-  @SuppressWarnings("unchecked")
-  @Override
-  public T newInstance() {
-    // TODO(b/248560713) decide if we're keeping support for Full in schema classes and handle this
-    // better.
-    if (defaultInstance instanceof GeneratedMessageLite) {
-      return (T) ((GeneratedMessageLite<?, ?>) defaultInstance).newMutableInstance();
-    } else {
-      return (T) defaultInstance.newBuilderForType().buildPartial();
-    }
-  }
-
-  @Override
-  public boolean equals(T message, T other) {
-    Object messageUnknown = unknownFieldSchema.getFromMessage(message);
-    Object otherUnknown = unknownFieldSchema.getFromMessage(other);
-    if (!messageUnknown.equals(otherUnknown)) {
-      return false;
-    }
-    if (hasExtensions) {
-      FieldSet<?> messageExtensions = extensionSchema.getExtensions(message);
-      FieldSet<?> otherExtensions = extensionSchema.getExtensions(other);
-      return messageExtensions.equals(otherExtensions);
-    }
-    return true;
-  }
-
-  @Override
-  public int hashCode(T message) {
-    int hashCode = unknownFieldSchema.getFromMessage(message).hashCode();
-    if (hasExtensions) {
-      FieldSet<?> extensions = extensionSchema.getExtensions(message);
-      hashCode = (hashCode * 53) + extensions.hashCode();
-    }
-    return hashCode;
-  }
-
-  @Override
-  public void mergeFrom(T message, T other) {
-    SchemaUtil.mergeUnknownFields(unknownFieldSchema, message, other);
-    if (hasExtensions) {
-      SchemaUtil.mergeExtensions(extensionSchema, message, other);
-    }
-  }
-
-  @SuppressWarnings("unchecked")
-  @Override
-  public void writeTo(T message, Writer writer) throws IOException {
-    FieldSet<?> extensions = extensionSchema.getExtensions(message);
-    Iterator<?> iterator = extensions.iterator();
-    while (iterator.hasNext()) {
-      Entry<?, ?> extension = (Entry<?, ?>) iterator.next();
-      FieldSet.FieldDescriptorLite<?> fd = (FieldSet.FieldDescriptorLite<?>) extension.getKey();
-      if (fd.getLiteJavaType() != WireFormat.JavaType.MESSAGE || fd.isRepeated() || fd.isPacked()) {
-        throw new IllegalStateException("Found invalid MessageSet item.");
-      }
-      if (extension instanceof LazyField.LazyEntry) {
-        writer.writeMessageSetItem(
-            fd.getNumber(), ((LazyField.LazyEntry) extension).getField().toByteString());
-      } else {
-        writer.writeMessageSetItem(fd.getNumber(), extension.getValue());
-      }
-    }
-    writeUnknownFieldsHelper(unknownFieldSchema, message, writer);
-  }
-
-  /**
-   * A helper method for wildcard capture of {@code unknownFieldSchema}. See:
-   * https://docs.oracle.com/javase/tutorial/java/generics/capture.html
-   */
-  private <UT, UB> void writeUnknownFieldsHelper(
-      UnknownFieldSchema<UT, UB> unknownFieldSchema, T message, Writer writer) throws IOException {
-    unknownFieldSchema.writeAsMessageSetTo(unknownFieldSchema.getFromMessage(message), writer);
-  }
-
-  @SuppressWarnings("ReferenceEquality")
-  @Override
-  public void mergeFrom(
-      T message, byte[] data, int position, int limit, ArrayDecoders.Registers registers)
-      throws IOException {
-    // TODO(b/248560713) decide if we're keeping support for Full in schema classes and handle this
-    // better.
-    UnknownFieldSetLite unknownFields = ((GeneratedMessageLite) message).unknownFields;
-    if (unknownFields == UnknownFieldSetLite.getDefaultInstance()) {
-      unknownFields = UnknownFieldSetLite.newInstance();
-      ((GeneratedMessageLite) message).unknownFields = unknownFields;
-    }
-    final FieldSet<GeneratedMessageLite.ExtensionDescriptor> extensions =
-        ((GeneratedMessageLite.ExtendableMessage<?, ?>) message).ensureExtensionsAreMutable();
-    GeneratedMessageLite.GeneratedExtension<?, ?> extension = null;
-    while (position < limit) {
-      position = ArrayDecoders.decodeVarint32(data, position, registers);
-      final int startTag = registers.int1;
-      if (startTag != WireFormat.MESSAGE_SET_ITEM_TAG) {
-        if (WireFormat.getTagWireType(startTag) == WireFormat.WIRETYPE_LENGTH_DELIMITED) {
-          extension =
-              (GeneratedMessageLite.GeneratedExtension<?, ?>) extensionSchema.findExtensionByNumber(
-                  registers.extensionRegistry, defaultInstance,
-                  WireFormat.getTagFieldNumber(startTag));
-          if (extension != null) {
-            position =
-                ArrayDecoders.decodeMessageField(
-                    Protobuf.getInstance().schemaFor(
-                        extension.getMessageDefaultInstance().getClass()),
-                    data, position, limit, registers);
-            extensions.setField(extension.descriptor, registers.object1);
-          } else {
-            position =
-                ArrayDecoders.decodeUnknownField(
-                    startTag, data, position, limit, unknownFields, registers);
-          }
-        } else {
-          position = ArrayDecoders.skipField(startTag, data, position, limit, registers);
-        }
-        continue;
-      }
-
-      int typeId = 0;
-      ByteString rawBytes = null;
-
-      while (position < limit) {
-        position = ArrayDecoders.decodeVarint32(data, position, registers);
-        final int tag = registers.int1;
-        final int number = WireFormat.getTagFieldNumber(tag);
-        final int wireType = WireFormat.getTagWireType(tag);
-        switch (number) {
-          case WireFormat.MESSAGE_SET_TYPE_ID:
-            if (wireType == WireFormat.WIRETYPE_VARINT) {
-              position = ArrayDecoders.decodeVarint32(data, position, registers);
-              typeId = registers.int1;
-              // TODO(b/248560713) decide if we're keeping support for Full in schema classes and
-              // handle this better.
-              extension =
-                  (GeneratedMessageLite.GeneratedExtension<?, ?>)
-                      extensionSchema.findExtensionByNumber(
-                          registers.extensionRegistry, defaultInstance, typeId);
-              continue;
-            }
-            break;
-          case WireFormat.MESSAGE_SET_MESSAGE:
-            if (extension != null) {
-              position = ArrayDecoders.decodeMessageField(
-                  Protobuf.getInstance().schemaFor(
-                      extension.getMessageDefaultInstance().getClass()),
-                  data, position, limit, registers);
-              extensions.setField(extension.descriptor, registers.object1);
-              continue;
-            } else {
-              if (wireType == WireFormat.WIRETYPE_LENGTH_DELIMITED) {
-                position = ArrayDecoders.decodeBytes(data, position, registers);
-                rawBytes = (ByteString) registers.object1;
-                continue;
-              }
-              break;
-            }
-          default:
-            break;
-        }
-        if (tag == WireFormat.MESSAGE_SET_ITEM_END_TAG) {
-          break;
-        }
-        position = ArrayDecoders.skipField(tag, data, position, limit, registers);
-      }
-
-      if (rawBytes != null) {
-        unknownFields.storeField(
-            WireFormat.makeTag(typeId, WireFormat.WIRETYPE_LENGTH_DELIMITED), rawBytes);
-      }
-    }
-    if (position != limit) {
-      throw InvalidProtocolBufferException.parseFailure();
-    }
-  }
-
-  @Override
-  public void mergeFrom(T message, Reader reader, ExtensionRegistryLite extensionRegistry)
-      throws IOException {
-    mergeFromHelper(unknownFieldSchema, extensionSchema, message, reader, extensionRegistry);
-  }
-
-  /**
-   * A helper method for wildcard capture of {@code unknownFieldSchema}. See:
-   * https://docs.oracle.com/javase/tutorial/java/generics/capture.html
-   */
-  private <UT, UB, ET extends FieldSet.FieldDescriptorLite<ET>> void mergeFromHelper(
-      UnknownFieldSchema<UT, UB> unknownFieldSchema,
-      ExtensionSchema<ET> extensionSchema,
-      T message,
-      Reader reader,
-      ExtensionRegistryLite extensionRegistry)
-      throws IOException {
-    UB unknownFields = unknownFieldSchema.getBuilderFromMessage(message);
-    FieldSet<ET> extensions = extensionSchema.getMutableExtensions(message);
-    try {
-      while (true) {
-        final int number = reader.getFieldNumber();
-        if (number == Reader.READ_DONE) {
-          return;
-        }
-        if (parseMessageSetItemOrUnknownField(
-            reader,
-            extensionRegistry,
-            extensionSchema,
-            extensions,
-            unknownFieldSchema,
-            unknownFields)) {
-          continue;
-        }
-        // Done reading.
-        return;
-      }
-    } finally {
-      unknownFieldSchema.setBuilderToMessage(message, unknownFields);
-    }
-  }
-
-  @Override
-  public void makeImmutable(T message) {
-    unknownFieldSchema.makeImmutable(message);
-    extensionSchema.makeImmutable(message);
-  }
-
-  private <UT, UB, ET extends FieldSet.FieldDescriptorLite<ET>>
-      boolean parseMessageSetItemOrUnknownField(
-          Reader reader,
-          ExtensionRegistryLite extensionRegistry,
-          ExtensionSchema<ET> extensionSchema,
-          FieldSet<ET> extensions,
-          UnknownFieldSchema<UT, UB> unknownFieldSchema,
-          UB unknownFields)
-          throws IOException {
-    int startTag = reader.getTag();
-    if (startTag != WireFormat.MESSAGE_SET_ITEM_TAG) {
-      if (WireFormat.getTagWireType(startTag) == WireFormat.WIRETYPE_LENGTH_DELIMITED) {
-        Object extension =
-            extensionSchema.findExtensionByNumber(
-                extensionRegistry, defaultInstance, WireFormat.getTagFieldNumber(startTag));
-        if (extension != null) {
-          extensionSchema.parseLengthPrefixedMessageSetItem(
-              reader, extension, extensionRegistry, extensions);
-          return true;
-        } else {
-          return unknownFieldSchema.mergeOneFieldFrom(unknownFields, reader);
-        }
-      } else {
-        return reader.skipField();
-      }
-    }
-
-    // The wire format for MessageSet is:
-    //   message MessageSet {
-    //     repeated group Item = 1 {
-    //       required uint32 typeId = 2;
-    //       required bytes message = 3;
-    //     }
-    //   }
-    // "typeId" is the extension's field number.  The extension can only be
-    // a message type, where "message" contains the encoded bytes of that
-    // message.
-    //
-    // In practice, we will probably never see a MessageSet item in which
-    // the message appears before the type ID, or where either field does not
-    // appear exactly once.  However, in theory such cases are valid, so we
-    // should be prepared to accept them.
-
-    int typeId = 0;
-    ByteString rawBytes = null; // If we encounter "message" before "typeId"
-    Object extension = null;
-
-    // Read bytes from input, if we get it's type first then parse it eagerly,
-    // otherwise we store the raw bytes in a local variable.
-    loop:
-    while (true) {
-      final int number = reader.getFieldNumber();
-      if (number == Reader.READ_DONE) {
-        break;
-      }
-
-      final int tag = reader.getTag();
-      if (tag == WireFormat.MESSAGE_SET_TYPE_ID_TAG) {
-        typeId = reader.readUInt32();
-        extension =
-            extensionSchema.findExtensionByNumber(extensionRegistry, defaultInstance, typeId);
-        continue;
-      } else if (tag == WireFormat.MESSAGE_SET_MESSAGE_TAG) {
-        if (extension != null) {
-          extensionSchema.parseLengthPrefixedMessageSetItem(
-              reader, extension, extensionRegistry, extensions);
-          continue;
-        }
-        // We haven't seen a type ID yet or we want parse message lazily.
-        rawBytes = reader.readBytes();
-        continue;
-      } else {
-        if (!reader.skipField()) {
-          break loop; // End of group
-        }
-      }
-    }
-
-    if (reader.getTag() != WireFormat.MESSAGE_SET_ITEM_END_TAG) {
-      throw InvalidProtocolBufferException.invalidEndTag();
-    }
-
-    // If there are any rawBytes left, it means the message content appears before the type ID.
-    if (rawBytes != null) {
-      if (extension != null) { // We known the type
-        // TODO(xiaofeng): Instead of reading into a temporary ByteString, maybe there is a way
-        // to read directly from Reader to the submessage?
-        extensionSchema.parseMessageSetItem(rawBytes, extension, extensionRegistry, extensions);
-      } else {
-        unknownFieldSchema.addLengthDelimited(unknownFields, typeId, rawBytes);
-      }
-    }
-    return true;
-  }
-
-  @Override
-  public final boolean isInitialized(T message) {
-    FieldSet<?> extensions = extensionSchema.getExtensions(message);
-    return extensions.isInitialized();
-  }
-
-  @Override
-  public int getSerializedSize(T message) {
-    int size = 0;
-
-    size += getUnknownFieldsSerializedSize(unknownFieldSchema, message);
-
-    if (hasExtensions) {
-      size += extensionSchema.getExtensions(message).getMessageSetSerializedSize();
-    }
-
-    return size;
-  }
-
-  private <UT, UB> int getUnknownFieldsSerializedSize(
-      UnknownFieldSchema<UT, UB> schema, T message) {
-    UT unknowns = schema.getFromMessage(message);
-    return schema.getSerializedSizeAsMessageSet(unknowns);
-  }
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/MutabilityOracle.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/MutabilityOracle.java
deleted file mode 100644
index 7c2f157..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/MutabilityOracle.java
+++ /dev/null
@@ -1,45 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-/** Verifies that an object is mutable, throwing if not. */
-interface MutabilityOracle {
-  static final MutabilityOracle IMMUTABLE =
-      new MutabilityOracle() {
-        @Override
-        public void ensureMutable() {
-          throw new UnsupportedOperationException();
-        }
-      };
-
-  /** Throws an {@link UnsupportedOperationException} if not mutable. */
-  void ensureMutable();
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/NewInstanceSchema.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/NewInstanceSchema.java
deleted file mode 100644
index 9bffd8e..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/NewInstanceSchema.java
+++ /dev/null
@@ -1,37 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-@CheckReturnValue
-interface NewInstanceSchema {
-  /** Create a new message instance given the default instance of the message type. */
-  Object newInstance(Object defaultInstance);
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/NewInstanceSchemaFull.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/NewInstanceSchemaFull.java
deleted file mode 100644
index 3433b65..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/NewInstanceSchemaFull.java
+++ /dev/null
@@ -1,39 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-final class NewInstanceSchemaFull implements NewInstanceSchema {
-  @Override
-  public Object newInstance(Object defaultInstance) {
-    return ((GeneratedMessageV3) defaultInstance)
-        .newInstance(GeneratedMessageV3.UnusedPrivateParameter.INSTANCE);
-  }
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/NewInstanceSchemaLite.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/NewInstanceSchemaLite.java
deleted file mode 100644
index 1db6ef4..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/NewInstanceSchemaLite.java
+++ /dev/null
@@ -1,41 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-@CheckReturnValue
-final class NewInstanceSchemaLite implements NewInstanceSchema {
-  @Override
-  public Object newInstance(Object defaultInstance) {
-    // TODO(b/248560713) decide if we're keeping support for Full in schema classes and handle this
-    // better.
-    return ((GeneratedMessageLite<?, ?>) defaultInstance).newMutableInstance();
-  }
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/NewInstanceSchemas.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/NewInstanceSchemas.java
deleted file mode 100644
index 6e9031a..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/NewInstanceSchemas.java
+++ /dev/null
@@ -1,54 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-@CheckReturnValue
-final class NewInstanceSchemas {
-  private static final NewInstanceSchema FULL_SCHEMA = loadSchemaForFullRuntime();
-  private static final NewInstanceSchema LITE_SCHEMA = new NewInstanceSchemaLite();
-
-  static NewInstanceSchema full() {
-    return FULL_SCHEMA;
-  }
-
-  static NewInstanceSchema lite() {
-    return LITE_SCHEMA;
-  }
-
-  private static NewInstanceSchema loadSchemaForFullRuntime() {
-    try {
-      Class<?> clazz = Class.forName("com.google.protobuf.NewInstanceSchemaFull");
-      return (NewInstanceSchema) clazz.getDeclaredConstructor().newInstance();
-    } catch (Exception e) {
-      return null;
-    }
-  }
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/NioByteString.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/NioByteString.java
deleted file mode 100644
index 1e594ff..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/NioByteString.java
+++ /dev/null
@@ -1,293 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.protobuf.Internal.checkNotNull;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InvalidObjectException;
-import java.io.ObjectInputStream;
-import java.io.OutputStream;
-import java.nio.Buffer;
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-import java.nio.InvalidMarkException;
-import java.nio.charset.Charset;
-import java.util.Collections;
-import java.util.List;
-
-/** A {@link ByteString} that wraps around a {@link ByteBuffer}. */
-final class NioByteString extends ByteString.LeafByteString {
-  private final ByteBuffer buffer;
-
-  NioByteString(ByteBuffer buffer) {
-    checkNotNull(buffer, "buffer");
-
-    // Use native byte order for fast fixed32/64 operations.
-    this.buffer = buffer.slice().order(ByteOrder.nativeOrder());
-  }
-
-  // =================================================================
-  // Serializable
-
-  /** Magic method that lets us override serialization behavior. */
-  private Object writeReplace() {
-    return ByteString.copyFrom(buffer.slice());
-  }
-
-  /** Magic method that lets us override deserialization behavior. */
-  private void readObject(@SuppressWarnings("unused") ObjectInputStream in) throws IOException {
-    throw new InvalidObjectException("NioByteString instances are not to be serialized directly");
-  }
-
-  // =================================================================
-
-  @Override
-  public byte byteAt(int index) {
-    try {
-      return buffer.get(index);
-    } catch (ArrayIndexOutOfBoundsException e) {
-      throw e;
-    } catch (IndexOutOfBoundsException e) {
-      throw new ArrayIndexOutOfBoundsException(e.getMessage());
-    }
-  }
-
-  @Override
-  public byte internalByteAt(int index) {
-    // it isn't possible to avoid the bounds checking inside of ByteBuffer, so just use the default
-    // implementation.
-    return byteAt(index);
-  }
-
-  @Override
-  public int size() {
-    return buffer.remaining();
-  }
-
-  @Override
-  public ByteString substring(int beginIndex, int endIndex) {
-    try {
-      ByteBuffer slice = slice(beginIndex, endIndex);
-      return new NioByteString(slice);
-    } catch (ArrayIndexOutOfBoundsException e) {
-      throw e;
-    } catch (IndexOutOfBoundsException e) {
-      throw new ArrayIndexOutOfBoundsException(e.getMessage());
-    }
-  }
-
-  @Override
-  protected void copyToInternal(
-      byte[] target, int sourceOffset, int targetOffset, int numberToCopy) {
-    ByteBuffer slice = buffer.slice();
-    ((Buffer) slice).position(sourceOffset);
-    slice.get(target, targetOffset, numberToCopy);
-  }
-
-  @Override
-  public void copyTo(ByteBuffer target) {
-    target.put(buffer.slice());
-  }
-
-  @Override
-  public void writeTo(OutputStream out) throws IOException {
-    out.write(toByteArray());
-  }
-
-  @Override
-  boolean equalsRange(ByteString other, int offset, int length) {
-    return substring(0, length).equals(other.substring(offset, offset + length));
-  }
-
-  @Override
-  void writeToInternal(OutputStream out, int sourceOffset, int numberToWrite) throws IOException {
-    if (buffer.hasArray()) {
-      // Optimized write for array-backed buffers.
-      // Note that we're taking the risk that a malicious OutputStream could modify the array.
-      int bufferOffset = buffer.arrayOffset() + buffer.position() + sourceOffset;
-      out.write(buffer.array(), bufferOffset, numberToWrite);
-      return;
-    }
-
-    ByteBufferWriter.write(slice(sourceOffset, sourceOffset + numberToWrite), out);
-  }
-
-  @Override
-  void writeTo(ByteOutput output) throws IOException {
-    output.writeLazy(buffer.slice());
-  }
-
-  @Override
-  public ByteBuffer asReadOnlyByteBuffer() {
-    return buffer.asReadOnlyBuffer();
-  }
-
-  @Override
-  public List<ByteBuffer> asReadOnlyByteBufferList() {
-    return Collections.singletonList(asReadOnlyByteBuffer());
-  }
-
-  @Override
-  protected String toStringInternal(Charset charset) {
-    final byte[] bytes;
-    final int offset;
-    final int length;
-    if (buffer.hasArray()) {
-      bytes = buffer.array();
-      offset = buffer.arrayOffset() + buffer.position();
-      length = buffer.remaining();
-    } else {
-      // TODO(nathanmittler): Can we optimize this?
-      bytes = toByteArray();
-      offset = 0;
-      length = bytes.length;
-    }
-    return new String(bytes, offset, length, charset);
-  }
-
-  @Override
-  public boolean isValidUtf8() {
-    return Utf8.isValidUtf8(buffer);
-  }
-
-  @Override
-  protected int partialIsValidUtf8(int state, int offset, int length) {
-    return Utf8.partialIsValidUtf8(state, buffer, offset, offset + length);
-  }
-
-  @Override
-  public boolean equals(Object other) {
-    if (other == this) {
-      return true;
-    }
-    if (!(other instanceof ByteString)) {
-      return false;
-    }
-    ByteString otherString = ((ByteString) other);
-    if (size() != otherString.size()) {
-      return false;
-    }
-    if (size() == 0) {
-      return true;
-    }
-    if (other instanceof NioByteString) {
-      return buffer.equals(((NioByteString) other).buffer);
-    }
-    if (other instanceof RopeByteString) {
-      return other.equals(this);
-    }
-    return buffer.equals(otherString.asReadOnlyByteBuffer());
-  }
-
-  @Override
-  protected int partialHash(int h, int offset, int length) {
-    for (int i = offset; i < offset + length; i++) {
-      h = h * 31 + buffer.get(i);
-    }
-    return h;
-  }
-
-  @Override
-  public InputStream newInput() {
-    return new InputStream() {
-      private final ByteBuffer buf = buffer.slice();
-
-      @Override
-      public void mark(int readlimit) {
-        buf.mark();
-      }
-
-      @Override
-      public boolean markSupported() {
-        return true;
-      }
-
-      @Override
-      public void reset() throws IOException {
-        try {
-          buf.reset();
-        } catch (InvalidMarkException e) {
-          throw new IOException(e);
-        }
-      }
-
-      @Override
-      public int available() throws IOException {
-        return buf.remaining();
-      }
-
-      @Override
-      public int read() throws IOException {
-        if (!buf.hasRemaining()) {
-          return -1;
-        }
-        return buf.get() & 0xFF;
-      }
-
-      @Override
-      public int read(byte[] bytes, int off, int len) throws IOException {
-        if (!buf.hasRemaining()) {
-          return -1;
-        }
-
-        len = Math.min(len, buf.remaining());
-        buf.get(bytes, off, len);
-        return len;
-      }
-    };
-  }
-
-  @Override
-  public CodedInputStream newCodedInput() {
-    return CodedInputStream.newInstance(buffer, true);
-  }
-
-  /**
-   * Creates a slice of a range of this buffer.
-   *
-   * @param beginIndex the beginning index of the slice (inclusive).
-   * @param endIndex the end index of the slice (exclusive).
-   * @return the requested slice.
-   */
-  private ByteBuffer slice(int beginIndex, int endIndex) {
-    if (beginIndex < buffer.position() || endIndex > buffer.limit() || beginIndex > endIndex) {
-      throw new IllegalArgumentException(
-          String.format("Invalid indices [%d, %d]", beginIndex, endIndex));
-    }
-
-    ByteBuffer slice = buffer.slice();
-    ((Buffer) slice).position(beginIndex - buffer.position());
-    ((Buffer) slice).limit(endIndex - buffer.position());
-    return slice;
-  }
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/OneofInfo.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/OneofInfo.java
deleted file mode 100644
index 4301055..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/OneofInfo.java
+++ /dev/null
@@ -1,67 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import java.lang.reflect.Field;
-
-/** Information for a oneof within a protobuf message. */
-// TODO(nathanmittler): make this private once all of experimental code is migrated to protobuf.
-@ExperimentalApi
-@CheckReturnValue
-final class OneofInfo {
-  private final int id;
-  private final Field caseField;
-  private final Field valueField;
-
-  public OneofInfo(int id, Field caseField, Field valueField) {
-    this.id = id;
-    this.caseField = caseField;
-    this.valueField = valueField;
-  }
-
-  /**
-   * Returns the unique identifier of the oneof within the message. This is really just an index
-   * starting at zero.
-   */
-  public int getId() {
-    return id;
-  }
-
-  /** The {@code int} field containing the field number of the currently active member. */
-  public Field getCaseField() {
-    return caseField;
-  }
-
-  /** The {@link Object} field containing the value of the currently active member. */
-  public Field getValueField() {
-    return valueField;
-  }
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/Parser.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/Parser.java
deleted file mode 100644
index 22ee99b..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/Parser.java
+++ /dev/null
@@ -1,242 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import java.io.InputStream;
-import java.nio.ByteBuffer;
-
-/**
- * Abstract interface for parsing Protocol Messages.
- *
- * <p>The implementation should be stateless and thread-safe.
- *
- * <p>All methods may throw {@link InvalidProtocolBufferException}. In the event of invalid data,
- * like an encoding error, the cause of the thrown exception will be {@code null}. However, if an
- * I/O problem occurs, an exception is thrown with an {@link java.io.IOException} cause.
- *
- * @author liujisi@google.com (Pherl Liu)
- */
-public interface Parser<MessageType> {
-
-  // NB(jh): Other parts of the protobuf API that parse messages distinguish between an I/O problem
-  // (like failure reading bytes from a socket) and invalid data (encoding error) via the type of
-  // thrown exception. But it would be source-incompatible to make the methods in this interface do
-  // so since they were originally spec'ed to only throw InvalidProtocolBufferException. So callers
-  // must inspect the cause of the exception to distinguish these two cases.
-
-  /**
-   * Parses a message of {@code MessageType} from the input.
-   *
-   * <p>Note: The caller should call {@link CodedInputStream#checkLastTagWas(int)} after calling
-   * this to verify that the last tag seen was the appropriate end-group tag, or zero for EOF.
-   */
-  public MessageType parseFrom(CodedInputStream input) throws InvalidProtocolBufferException;
-
-  /**
-   * Like {@link #parseFrom(CodedInputStream)}, but also parses extensions. The extensions that you
-   * want to be able to parse must be registered in {@code extensionRegistry}. Extensions not in the
-   * registry will be treated as unknown fields.
-   */
-  public MessageType parseFrom(CodedInputStream input, ExtensionRegistryLite extensionRegistry)
-      throws InvalidProtocolBufferException;
-
-  /**
-   * Like {@link #parseFrom(CodedInputStream)}, but does not throw an exception if the message is
-   * missing required fields. Instead, a partial message is returned.
-   */
-  public MessageType parsePartialFrom(CodedInputStream input) throws InvalidProtocolBufferException;
-
-  /**
-   * Like {@link #parseFrom(CodedInputStream input, ExtensionRegistryLite)}, but does not throw an
-   * exception if the message is missing required fields. Instead, a partial message is returned.
-   */
-  public MessageType parsePartialFrom(
-      CodedInputStream input, ExtensionRegistryLite extensionRegistry)
-      throws InvalidProtocolBufferException;
-
-  // ---------------------------------------------------------------
-  // Convenience methods.
-
-  /**
-   * Parses {@code data} as a message of {@code MessageType}. This is just a small wrapper around
-   * {@link #parseFrom(CodedInputStream)}.
-   */
-  public MessageType parseFrom(ByteBuffer data) throws InvalidProtocolBufferException;
-
-  /**
-   * Parses {@code data} as a message of {@code MessageType}. This is just a small wrapper around
-   * {@link #parseFrom(CodedInputStream, ExtensionRegistryLite)}.
-   */
-  public MessageType parseFrom(ByteBuffer data, ExtensionRegistryLite extensionRegistry)
-      throws InvalidProtocolBufferException;
-  /**
-   * Parses {@code data} as a message of {@code MessageType}. This is just a small wrapper around
-   * {@link #parseFrom(CodedInputStream)}.
-   */
-  public MessageType parseFrom(ByteString data) throws InvalidProtocolBufferException;
-
-  /**
-   * Parses {@code data} as a message of {@code MessageType}. This is just a small wrapper around
-   * {@link #parseFrom(CodedInputStream, ExtensionRegistryLite)}.
-   */
-  public MessageType parseFrom(ByteString data, ExtensionRegistryLite extensionRegistry)
-      throws InvalidProtocolBufferException;
-
-  /**
-   * Like {@link #parseFrom(ByteString)}, but does not throw an exception if the message is missing
-   * required fields. Instead, a partial message is returned.
-   */
-  public MessageType parsePartialFrom(ByteString data) throws InvalidProtocolBufferException;
-
-  /**
-   * Like {@link #parseFrom(ByteString, ExtensionRegistryLite)}, but does not throw an exception if
-   * the message is missing required fields. Instead, a partial message is returned.
-   */
-  public MessageType parsePartialFrom(ByteString data, ExtensionRegistryLite extensionRegistry)
-      throws InvalidProtocolBufferException;
-
-  /**
-   * Parses {@code data} as a message of {@code MessageType}. This is just a small wrapper around
-   * {@link #parseFrom(CodedInputStream)}.
-   */
-  public MessageType parseFrom(byte[] data, int off, int len) throws InvalidProtocolBufferException;
-
-  /**
-   * Parses {@code data} as a message of {@code MessageType}. This is just a small wrapper around
-   * {@link #parseFrom(CodedInputStream, ExtensionRegistryLite)}.
-   */
-  public MessageType parseFrom(
-      byte[] data, int off, int len, ExtensionRegistryLite extensionRegistry)
-      throws InvalidProtocolBufferException;
-
-  /**
-   * Parses {@code data} as a message of {@code MessageType}. This is just a small wrapper around
-   * {@link #parseFrom(CodedInputStream)}.
-   */
-  public MessageType parseFrom(byte[] data) throws InvalidProtocolBufferException;
-
-  /**
-   * Parses {@code data} as a message of {@code MessageType}. This is just a small wrapper around
-   * {@link #parseFrom(CodedInputStream, ExtensionRegistryLite)}.
-   */
-  public MessageType parseFrom(byte[] data, ExtensionRegistryLite extensionRegistry)
-      throws InvalidProtocolBufferException;
-
-  /**
-   * Like {@link #parseFrom(byte[], int, int)}, but does not throw an exception if the message is
-   * missing required fields. Instead, a partial message is returned.
-   */
-  public MessageType parsePartialFrom(byte[] data, int off, int len)
-      throws InvalidProtocolBufferException;
-
-  /**
-   * Like {@link #parseFrom(ByteString, ExtensionRegistryLite)}, but does not throw an exception if
-   * the message is missing required fields. Instead, a partial message is returned.
-   */
-  public MessageType parsePartialFrom(
-      byte[] data, int off, int len, ExtensionRegistryLite extensionRegistry)
-      throws InvalidProtocolBufferException;
-
-  /**
-   * Like {@link #parseFrom(byte[])}, but does not throw an exception if the message is missing
-   * required fields. Instead, a partial message is returned.
-   */
-  public MessageType parsePartialFrom(byte[] data) throws InvalidProtocolBufferException;
-
-  /**
-   * Like {@link #parseFrom(byte[], ExtensionRegistryLite)}, but does not throw an exception if the
-   * message is missing required fields. Instead, a partial message is returned.
-   */
-  public MessageType parsePartialFrom(byte[] data, ExtensionRegistryLite extensionRegistry)
-      throws InvalidProtocolBufferException;
-
-  /**
-   * Parse a message of {@code MessageType} from {@code input}. This is just a small wrapper around
-   * {@link #parseFrom(CodedInputStream)}. Note that this method always reads the <i>entire</i>
-   * input (unless it throws an exception). If you want it to stop earlier, you will need to wrap
-   * your input in some wrapper stream that limits reading. Or, use {@link
-   * MessageLite#writeDelimitedTo(java.io.OutputStream)} to write your message and {@link
-   * #parseDelimitedFrom(InputStream)} to read it.
-   *
-   * <p>Despite usually reading the entire input, this does not close the stream.
-   */
-  public MessageType parseFrom(InputStream input) throws InvalidProtocolBufferException;
-
-  /**
-   * Parses a message of {@code MessageType} from {@code input}. This is just a small wrapper around
-   * {@link #parseFrom(CodedInputStream, ExtensionRegistryLite)}.
-   */
-  public MessageType parseFrom(InputStream input, ExtensionRegistryLite extensionRegistry)
-      throws InvalidProtocolBufferException;
-
-  /**
-   * Like {@link #parseFrom(InputStream)}, but does not throw an exception if the message is missing
-   * required fields. Instead, a partial message is returned.
-   */
-  public MessageType parsePartialFrom(InputStream input) throws InvalidProtocolBufferException;
-
-  /**
-   * Like {@link #parseFrom(InputStream, ExtensionRegistryLite)}, but does not throw an exception if
-   * the message is missing required fields. Instead, a partial message is returned.
-   */
-  public MessageType parsePartialFrom(InputStream input, ExtensionRegistryLite extensionRegistry)
-      throws InvalidProtocolBufferException;
-
-  /**
-   * Like {@link #parseFrom(InputStream)}, but does not read until EOF. Instead, the size of message
-   * (encoded as a varint) is read first, then the message data. Use {@link
-   * MessageLite#writeDelimitedTo(java.io.OutputStream)} to write messages in this format.
-   *
-   * @return Parsed message if successful, or null if the stream is at EOF when the method starts.
-   *     Any other error (including reaching EOF during parsing) will cause an exception to be
-   *     thrown.
-   */
-  public MessageType parseDelimitedFrom(InputStream input) throws InvalidProtocolBufferException;
-
-  /** Like {@link #parseDelimitedFrom(InputStream)} but supporting extensions. */
-  public MessageType parseDelimitedFrom(InputStream input, ExtensionRegistryLite extensionRegistry)
-      throws InvalidProtocolBufferException;
-
-  /**
-   * Like {@link #parseDelimitedFrom(InputStream)}, but does not throw an exception if the message
-   * is missing required fields. Instead, a partial message is returned.
-   */
-  public MessageType parsePartialDelimitedFrom(InputStream input)
-      throws InvalidProtocolBufferException;
-
-  /**
-   * Like {@link #parseDelimitedFrom(InputStream, ExtensionRegistryLite)}, but does not throw an
-   * exception if the message is missing required fields. Instead, a partial message is returned.
-   */
-  public MessageType parsePartialDelimitedFrom(
-      InputStream input, ExtensionRegistryLite extensionRegistry)
-      throws InvalidProtocolBufferException;
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/PrimitiveNonBoxingCollection.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/PrimitiveNonBoxingCollection.java
deleted file mode 100644
index 79b5769..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/PrimitiveNonBoxingCollection.java
+++ /dev/null
@@ -1,34 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-/** A marker interface indicating that the collection supports primitives and is non-boxing. */
-interface PrimitiveNonBoxingCollection {}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/ProtoSyntax.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/ProtoSyntax.java
deleted file mode 100644
index 851b839..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/ProtoSyntax.java
+++ /dev/null
@@ -1,38 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-/** Represents the syntax version of the message. */
-@ExperimentalApi
-public enum ProtoSyntax {
-  PROTO2,
-  PROTO3;
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/Protobuf.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/Protobuf.java
deleted file mode 100644
index 74624c3..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/Protobuf.java
+++ /dev/null
@@ -1,151 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.protobuf.Internal.checkNotNull;
-
-import java.io.IOException;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-
-/**
- * Main runtime interface for protobuf. Applications should interact with this interface (rather
- * than directly accessing internal APIs) in order to perform operations on protobuf messages.
- */
-@ExperimentalApi
-@CheckReturnValue
-final class Protobuf {
-  private static final Protobuf INSTANCE = new Protobuf();
-
-  private final SchemaFactory schemaFactory;
-
-  // TODO(nathanmittler): Consider using ClassValue instead.
-  private final ConcurrentMap<Class<?>, Schema<?>> schemaCache =
-      new ConcurrentHashMap<Class<?>, Schema<?>>();
-
-  /** Gets the singleton instance of the Protobuf runtime. */
-  public static Protobuf getInstance() {
-    return INSTANCE;
-  }
-
-  /** Writes the given message to the target {@link Writer}. */
-  public <T> void writeTo(T message, Writer writer) throws IOException {
-    schemaFor(message).writeTo(message, writer);
-  }
-
-  /** Reads fields from the given {@link Reader} and merges them into the message. */
-  public <T> void mergeFrom(T message, Reader reader) throws IOException {
-    mergeFrom(message, reader, ExtensionRegistryLite.getEmptyRegistry());
-  }
-
-  /** Reads fields from the given {@link Reader} and merges them into the message. */
-  public <T> void mergeFrom(T message, Reader reader, ExtensionRegistryLite extensionRegistry)
-      throws IOException {
-    schemaFor(message).mergeFrom(message, reader, extensionRegistry);
-  }
-
-  /** Marks repeated/map/extension/unknown fields as immutable. */
-  public <T> void makeImmutable(T message) {
-    schemaFor(message).makeImmutable(message);
-  }
-
-  /** Checks if all required fields are set. */
-  <T> boolean isInitialized(T message) {
-    return schemaFor(message).isInitialized(message);
-  }
-
-  /** Gets the schema for the given message type. */
-  public <T> Schema<T> schemaFor(Class<T> messageType) {
-    checkNotNull(messageType, "messageType");
-    @SuppressWarnings("unchecked")
-    Schema<T> schema = (Schema<T>) schemaCache.get(messageType);
-    if (schema == null) {
-      schema = schemaFactory.createSchema(messageType);
-      @SuppressWarnings("unchecked")
-      Schema<T> previous = (Schema<T>) registerSchema(messageType, schema);
-      if (previous != null) {
-        // A new schema was registered by another thread.
-        schema = previous;
-      }
-    }
-    return schema;
-  }
-
-  /** Gets the schema for the given message. */
-  @SuppressWarnings("unchecked")
-  public <T> Schema<T> schemaFor(T message) {
-    return schemaFor((Class<T>) message.getClass());
-  }
-
-  /**
-   * Registers the given schema for the message type only if a schema was not already registered.
-   *
-   * @param messageType the type of message on which the schema operates.
-   * @param schema the schema for the message type.
-   * @return the previously registered schema, or {@code null} if the given schema was successfully
-   *     registered.
-   */
-  public Schema<?> registerSchema(Class<?> messageType, Schema<?> schema) {
-    checkNotNull(messageType, "messageType");
-    checkNotNull(schema, "schema");
-    return schemaCache.putIfAbsent(messageType, schema);
-  }
-
-  /**
-   * Visible for testing only. Registers the given schema for the message type. If a schema was
-   * previously registered, it will be replaced by the provided schema.
-   *
-   * @param messageType the type of message on which the schema operates.
-   * @param schema the schema for the message type.
-   * @return the previously registered schema, or {@code null} if no schema was registered
-   *     previously.
-   */
-  @CanIgnoreReturnValue
-  public Schema<?> registerSchemaOverride(Class<?> messageType, Schema<?> schema) {
-    checkNotNull(messageType, "messageType");
-    checkNotNull(schema, "schema");
-    return schemaCache.put(messageType, schema);
-  }
-
-  private Protobuf() {
-    schemaFactory = new ManifestSchemaFactory();
-  }
-
-  int getTotalSchemaSize() {
-    int result = 0;
-    for (Schema<?> schema : schemaCache.values()) {
-      if (schema instanceof MessageSchema) {
-        result += ((MessageSchema) schema).getSchemaSize();
-      }
-    }
-    return result;
-  }
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/ProtobufArrayList.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/ProtobufArrayList.java
deleted file mode 100644
index 33e4bd5..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/ProtobufArrayList.java
+++ /dev/null
@@ -1,175 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import com.google.protobuf.Internal.ProtobufList;
-import java.util.Arrays;
-import java.util.RandomAccess;
-
-/** Implements {@link ProtobufList} for non-primitive and {@link String} types. */
-final class ProtobufArrayList<E> extends AbstractProtobufList<E> implements RandomAccess {
-
-  private static final ProtobufArrayList<Object> EMPTY_LIST =
-      new ProtobufArrayList<Object>(new Object[0], 0);
-
-  static {
-    EMPTY_LIST.makeImmutable();
-  }
-
-  @SuppressWarnings("unchecked") // Guaranteed safe by runtime.
-  public static <E> ProtobufArrayList<E> emptyList() {
-    return (ProtobufArrayList<E>) EMPTY_LIST;
-  }
-
-  private E[] array;
-  private int size;
-
-  @SuppressWarnings("unchecked")
-  ProtobufArrayList() {
-    this((E[]) new Object[DEFAULT_CAPACITY], 0);
-  }
-
-  private ProtobufArrayList(E[] array, int size) {
-    this.array = array;
-    this.size = size;
-  }
-
-  @Override
-  public ProtobufArrayList<E> mutableCopyWithCapacity(int capacity) {
-    if (capacity < size) {
-      throw new IllegalArgumentException();
-    }
-
-    E[] newArray = Arrays.copyOf(array, capacity);
-
-    return new ProtobufArrayList<E>(newArray, size);
-  }
-
-  @Override
-  public boolean add(E element) {
-    ensureIsMutable();
-
-    if (size == array.length) {
-      // Resize to 1.5x the size
-      int length = ((size * 3) / 2) + 1;
-      E[] newArray = Arrays.copyOf(array, length);
-
-      array = newArray;
-    }
-
-    array[size++] = element;
-    modCount++;
-
-    return true;
-  }
-
-  @Override
-  public void add(int index, E element) {
-    ensureIsMutable();
-
-    if (index < 0 || index > size) {
-      throw new IndexOutOfBoundsException(makeOutOfBoundsExceptionMessage(index));
-    }
-
-    if (size < array.length) {
-      // Shift everything over to make room
-      System.arraycopy(array, index, array, index + 1, size - index);
-    } else {
-      // Resize to 1.5x the size
-      int length = ((size * 3) / 2) + 1;
-      E[] newArray = createArray(length);
-
-      // Copy the first part directly
-      System.arraycopy(array, 0, newArray, 0, index);
-
-      // Copy the rest shifted over by one to make room
-      System.arraycopy(array, index, newArray, index + 1, size - index);
-      array = newArray;
-    }
-
-    array[index] = element;
-    size++;
-    modCount++;
-  }
-
-  @Override
-  public E get(int index) {
-    ensureIndexInRange(index);
-    return array[index];
-  }
-
-  @Override
-  public E remove(int index) {
-    ensureIsMutable();
-    ensureIndexInRange(index);
-
-    E value = array[index];
-    if (index < size - 1) {
-      System.arraycopy(array, index + 1, array, index, size - index - 1);
-    }
-
-    size--;
-    modCount++;
-    return value;
-  }
-
-  @Override
-  public E set(int index, E element) {
-    ensureIsMutable();
-    ensureIndexInRange(index);
-
-    E toReturn = array[index];
-    array[index] = element;
-
-    modCount++;
-    return toReturn;
-  }
-
-  @Override
-  public int size() {
-    return size;
-  }
-
-  @SuppressWarnings("unchecked")
-  private static <E> E[] createArray(int capacity) {
-    return (E[]) new Object[capacity];
-  }
-
-  private void ensureIndexInRange(int index) {
-    if (index < 0 || index >= size) {
-      throw new IndexOutOfBoundsException(makeOutOfBoundsExceptionMessage(index));
-    }
-  }
-
-  private String makeOutOfBoundsExceptionMessage(int index) {
-    return "Index:" + index + ", Size:" + size;
-  }
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/ProtobufLists.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/ProtobufLists.java
deleted file mode 100644
index 018c911..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/ProtobufLists.java
+++ /dev/null
@@ -1,95 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import com.google.protobuf.Internal.BooleanList;
-import com.google.protobuf.Internal.DoubleList;
-import com.google.protobuf.Internal.FloatList;
-import com.google.protobuf.Internal.IntList;
-import com.google.protobuf.Internal.LongList;
-import com.google.protobuf.Internal.ProtobufList;
-
-/** Utility class for construction of lists that extend {@link ProtobufList}. */
-@ExperimentalApi
-@CheckReturnValue
-final class ProtobufLists {
-  private ProtobufLists() {}
-
-  public static <E> ProtobufList<E> emptyProtobufList() {
-    return ProtobufArrayList.emptyList();
-  }
-
-  public static <E> ProtobufList<E> mutableCopy(ProtobufList<E> list) {
-    int size = list.size();
-    return list.mutableCopyWithCapacity(
-        size == 0 ? AbstractProtobufList.DEFAULT_CAPACITY : size * 2);
-  }
-
-  public static BooleanList emptyBooleanList() {
-    return BooleanArrayList.emptyList();
-  }
-
-  public static BooleanList newBooleanList() {
-    return new BooleanArrayList();
-  }
-
-  public static IntList emptyIntList() {
-    return IntArrayList.emptyList();
-  }
-
-  public static IntList newIntList() {
-    return new IntArrayList();
-  }
-
-  public static LongList emptyLongList() {
-    return LongArrayList.emptyList();
-  }
-
-  public static LongList newLongList() {
-    return new LongArrayList();
-  }
-
-  public static FloatList emptyFloatList() {
-    return FloatArrayList.emptyList();
-  }
-
-  public static FloatList newFloatList() {
-    return new FloatArrayList();
-  }
-
-  public static DoubleList emptyDoubleList() {
-    return DoubleArrayList.emptyList();
-  }
-
-  public static DoubleList newDoubleList() {
-    return new DoubleArrayList();
-  }
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/ProtocolMessageEnum.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/ProtocolMessageEnum.java
deleted file mode 100644
index 5d6f5ac..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/ProtocolMessageEnum.java
+++ /dev/null
@@ -1,52 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import com.google.protobuf.Descriptors.EnumDescriptor;
-import com.google.protobuf.Descriptors.EnumValueDescriptor;
-
-/** Interface of useful methods added to all enums generated by the protocol compiler. */
-public interface ProtocolMessageEnum extends Internal.EnumLite {
-
-  /** Return the value's numeric value as defined in the .proto file. */
-  @Override
-  int getNumber();
-
-  /**
-   * Return the value's descriptor, which contains information such as value name, number, and type.
-   */
-  EnumValueDescriptor getValueDescriptor();
-
-  /**
-   * Return the enum type's descriptor, which contains information about each defined value, etc.
-   */
-  EnumDescriptor getDescriptorForType();
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/ProtocolStringList.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/ProtocolStringList.java
deleted file mode 100644
index 5df3dbd..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/ProtocolStringList.java
+++ /dev/null
@@ -1,46 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import java.util.List;
-
-/**
- * An interface extending {@code List<String>} used for repeated string fields to provide optional
- * access to the data as a list of ByteStrings. The underlying implementation stores values as
- * either ByteStrings or Strings (see {@link LazyStringArrayList}) depending on how the value was
- * initialized or last read, and it is often more efficient to deal with lists of ByteStrings when
- * handling protos that have been deserialized from bytes.
- */
-public interface ProtocolStringList extends List<String> {
-
-  /** Returns a view of the data as a list of ByteStrings. */
-  List<ByteString> asByteStringList();
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/RawMessageInfo.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/RawMessageInfo.java
deleted file mode 100644
index 2e58574..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/RawMessageInfo.java
+++ /dev/null
@@ -1,222 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-/**
- * RawMessageInfo stores the same amount of information as {@link MessageInfo} but in a more compact
- * format.
- */
-@CheckReturnValue
-final class RawMessageInfo implements MessageInfo {
-
-  private final MessageLite defaultInstance;
-
-  /**
-   * The compact format packs everything in a String object and a Object[] array. The String object
-   * is encoded with field number, field type, hasbits offset, oneof index, etc., whereas the
-   * Object[] array contains field references, class references, instance references, etc.
-   *
-   * <p>The String object encodes a sequence of integers into UTF-16 characters. For each int, it
-   * will be encoding into 1 to 3 UTF-16 characters depending on its unsigned value:
-   *
-   * <ul>
-   *   <li>1 char: [c1: 0x0000 - 0xD7FF] = int of the same value.
-   *   <li>2 chars: [c1: 0xE000 - 0xFFFF], [c2: 0x0000 - 0xD7FF] = (c2 << 13) | (c1 & 0x1FFF)
-   *   <li>3 chars: [c1: 0xE000 - 0xFFFF], [c2: 0xE000 - 0xFFFF], [c3: 0x0000 - 0xD7FF] = (c3 << 26)
-   *       | ((c2 & 0x1FFF) << 13) | (c1 & 0x1FFF)
-   * </ul>
-   *
-   * <p>Note that we don't use UTF-16 surrogate pairs [0xD800 - 0xDFFF] because they have to come in
-   * pairs to form a valid UTF-16char sequence and don't help us encode values more efficiently.
-   *
-   * <p>The integer sequence encoded in the String object has the following layout:
-   *
-   * <ul>
-   *   <li>[0]: flags, flags & 0x1 = is proto2?, flags & 0x2 = is message?.
-   *   <li>[1]: field count, if 0, this is the end of the integer sequence and the corresponding
-   *       Object[] array should be null.
-   *   <li>[2]: oneof count
-   *   <li>[3]: hasbits count, how many hasbits integers are generated.
-   *   <li>[4]: min field number
-   *   <li>[5]: max field number
-   *   <li>[6]: total number of entries need to allocate
-   *   <li>[7]: map field count
-   *   <li>[8]: repeated field count, this doesn't include map fields.
-   *   <li>[9]: size of checkInitialized array
-   *   <li>[...]: field entries
-   * </ul>
-   *
-   * <p>Each field entry starts with a field number and the field type:
-   *
-   * <ul>
-   *   <li>[0]: field number
-   *   <li>[1]: field type with extra bits:
-   *       <ul>
-   *         <li>v & 0xFF = field type as defined in the FieldType class
-   *         <li>v & 0x0100 = is required?
-   *         <li>v & 0x0200 = is checkUtf8?
-   *         <li>v & 0x0400 = needs isInitialized check?
-   *         <li>v & 0x0800 = is map field with proto2 enum value?
-   *         <li>v & 0x1000 = supports presence checking?
-   *       </ul>
-   * </ul>
-   *
-   * If the (singular) field supports presence checking:
-   *
-   * <ul>
-   *   <li>[2]: hasbits offset
-   * </ul>
-   *
-   * If the field is in an oneof:
-   *
-   * <ul>
-   *   <li>[2]: oneof index
-   * </ul>
-   *
-   * For other types, the field entry only has field number and field type.
-   *
-   * <p>The Object[] array has 3 sections:
-   *
-   * <ul>
-   *   <li>---- oneof section ----
-   *       <ul>
-   *         <li>[0]: value field for oneof 1.
-   *         <li>[1]: case field for oneof 1.
-   *         <li>...
-   *         <li>[.]: value field for oneof n.
-   *         <li>[.]: case field for oneof n.
-   *       </ul>
-   *   <li>---- hasbits section ----
-   *       <ul>
-   *         <li>[.]: hasbits field 1
-   *         <li>[.]: hasbits field 2
-   *         <li>...
-   *         <li>[.]: hasbits field n
-   *       </ul>
-   *   <li>---- field section ----
-   *       <ul>
-   *         <li>[...]: field entries
-   *       </ul>
-   * </ul>
-   *
-   * <p>In the Object[] array, field entries are ordered in the same way as field entries in the
-   * String object. The size of each entry is determined by the field type.
-   *
-   * <ul>
-   *   <li>Oneof field:
-   *       <ul>
-   *         <li>Oneof message field:
-   *             <ul>
-   *               <li>[0]: message class reference.
-   *             </ul>
-   *         <li>Oneof enum fieldin proto2:
-   *             <ul>
-   *               <li>[0]: EnumLiteMap
-   *             </ul>
-   *         <li>For all other oneof fields, field entry in the Object[] array is empty.
-   *       </ul>
-   *   <li>Repeated message field:
-   *       <ul>
-   *         <li>[0]: field reference
-   *         <li>[1]: message class reference
-   *       </ul>
-   *   <li>Proto2 singular/repeated enum field:
-   *       <ul>
-   *         <li>[0]: field reference
-   *         <li>[1]: EnumLiteMap
-   *       </ul>
-   *   <li>Map field with a proto2 enum value:
-   *       <ul>
-   *         <li>[0]: field reference
-   *         <li>[1]: map default entry instance
-   *         <li>[2]: EnumLiteMap
-   *       </ul>
-   *   <li>Map field with other value types:
-   *       <ul>
-   *         <li>[0]: field reference
-   *         <li>[1]: map default entry instance
-   *       </ul>
-   *   <li>All other field type:
-   *       <ul>
-   *         <li>[0]: field reference
-   *       </ul>
-   * </ul>
-   *
-   * <p>In order to read the field info from this compact format, a reader needs to progress through
-   * the String object and the Object[] array simultaneously.
-   */
-  private final String info;
-
-  private final Object[] objects;
-  private final int flags;
-
-  RawMessageInfo(MessageLite defaultInstance, String info, Object[] objects) {
-    this.defaultInstance = defaultInstance;
-    this.info = info;
-    this.objects = objects;
-    int position = 0;
-    int value = (int) info.charAt(position++);
-    if (value < 0xD800) {
-      flags = value;
-    } else {
-      int result = value & 0x1FFF;
-      int shift = 13;
-      while ((value = info.charAt(position++)) >= 0xD800) {
-        result |= (value & 0x1FFF) << shift;
-        shift += 13;
-      }
-      flags = result | (value << shift);
-    }
-  }
-
-  String getStringInfo() {
-    return info;
-  }
-
-  Object[] getObjects() {
-    return objects;
-  }
-
-  @Override
-  public MessageLite getDefaultInstance() {
-    return defaultInstance;
-  }
-
-  @Override
-  public ProtoSyntax getSyntax() {
-    return (flags & 0x1) == 0x1 ? ProtoSyntax.PROTO2 : ProtoSyntax.PROTO3;
-  }
-
-  @Override
-  public boolean isMessageSetWireFormat() {
-    return (flags & 0x2) == 0x2;
-  }
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/Reader.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/Reader.java
deleted file mode 100644
index 929fd20..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/Reader.java
+++ /dev/null
@@ -1,388 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import java.io.IOException;
-import java.util.List;
-import java.util.Map;
-
-/** A reader of fields from a serialized protobuf message. */
-// TODO(nathanmittler): Refactor to allow the reader to allocate properly sized lists.
-@ExperimentalApi
-@CheckReturnValue
-interface Reader {
-  /** Value used to indicate that the end of input has been reached. */
-  int READ_DONE = Integer.MAX_VALUE;
-
-  /** Value used to indicate that the reader does not know the tag about the field. */
-  int TAG_UNKNOWN = 0;
-
-  boolean shouldDiscardUnknownFields();
-
-  /**
-   * Gets the field number for the current field being read.
-   *
-   * <p>TODO(liujisi): Rename it to make it more explicit about the side effect on the underlying
-   * buffer.
-   *
-   * @return the current field number or {@link #READ_DONE} if the end of input has been reached.
-   */
-  int getFieldNumber() throws IOException;
-
-  /**
-   * Gets the wire tag of the current field.
-   *
-   * @return the current wire tag or {@link #TAG_UNKNOWN} if the reader does not know the tag of the
-   *     current field.
-   */
-  int getTag();
-
-  /**
-   * Skips the current field and advances the reader to the next field.
-   *
-   * @return {@code true} if there are more fields or {@code false} if the end of input has been
-   *     reached.
-   */
-  boolean skipField() throws IOException;
-
-  /**
-   * Reads and returns the next field of type {@code DOUBLE} and advances the reader to the next
-   * field.
-   */
-  double readDouble() throws IOException;
-
-  /**
-   * Reads and returns the next field of type {@code FLOAT} and advances the reader to the next
-   * field.
-   */
-  float readFloat() throws IOException;
-
-  /**
-   * Reads and returns the next field of type {@code UINT64} and advances the reader to the next
-   * field.
-   */
-  long readUInt64() throws IOException;
-
-  /**
-   * Reads and returns the next field of type {@code INT64} and advances the reader to the next
-   * field.
-   */
-  long readInt64() throws IOException;
-
-  /**
-   * Reads and returns the next field of type {@code INT32} and advances the reader to the next
-   * field.
-   */
-  int readInt32() throws IOException;
-
-  /**
-   * Reads and returns the next field of type {@code FIXED64} and advances the reader to the next
-   * field.
-   */
-  long readFixed64() throws IOException;
-
-  /**
-   * Reads and returns the next field of type {@code FIXED32} and advances the reader to the next
-   * field.
-   */
-  int readFixed32() throws IOException;
-
-  /**
-   * Reads and returns the next field of type {@code BOOL} and advances the reader to the next
-   * field.
-   */
-  boolean readBool() throws IOException;
-
-  /**
-   * Reads and returns the next field of type {@code STRING} and advances the reader to the next
-   * field. If the stream contains malformed UTF-8, replace the offending bytes with the standard
-   * UTF-8 replacement character.
-   */
-  String readString() throws IOException;
-
-  /**
-   * Reads and returns the next field of type {@code STRING} and advances the reader to the next
-   * field. If the stream contains malformed UTF-8, throw exception {@link
-   * InvalidProtocolBufferException}.
-   */
-  String readStringRequireUtf8() throws IOException;
-
-  // TODO(yilunchong): the lack of other opinions for whether to expose this on the interface
-  <T> T readMessageBySchemaWithCheck(Schema<T> schema, ExtensionRegistryLite extensionRegistry)
-      throws IOException;
-
-  /**
-   * Reads and returns the next field of type {@code MESSAGE} and advances the reader to the next
-   * field.
-   */
-  <T> T readMessage(Class<T> clazz, ExtensionRegistryLite extensionRegistry) throws IOException;
-
-  /**
-   * Reads and returns the next field of type {@code GROUP} and advances the reader to the next
-   * field.
-   *
-   * @deprecated groups fields are deprecated.
-   */
-  @Deprecated
-  <T> T readGroup(Class<T> clazz, ExtensionRegistryLite extensionRegistry) throws IOException;
-
-  // TODO(yilunchong): the lack of other opinions for whether to expose this on the interface
-  @Deprecated
-  <T> T readGroupBySchemaWithCheck(Schema<T> schema, ExtensionRegistryLite extensionRegistry)
-      throws IOException;
-
-  /** Read a message field from the wire format and merge the results into the given target. */
-  <T> void mergeMessageField(T target, Schema<T> schema, ExtensionRegistryLite extensionRegistry)
-      throws IOException;
-
-  /** Read a group field from the wire format and merge the results into the given target. */
-  <T> void mergeGroupField(T target, Schema<T> schema, ExtensionRegistryLite extensionRegistry)
-      throws IOException;
-
-  /**
-   * Reads and returns the next field of type {@code BYTES} and advances the reader to the next
-   * field.
-   */
-  ByteString readBytes() throws IOException;
-
-  /**
-   * Reads and returns the next field of type {@code UINT32} and advances the reader to the next
-   * field.
-   */
-  int readUInt32() throws IOException;
-
-  /**
-   * Reads and returns the next field of type {@code ENUM} and advances the reader to the next
-   * field.
-   */
-  int readEnum() throws IOException;
-
-  /**
-   * Reads and returns the next field of type {@code SFIXED32} and advances the reader to the next
-   * field.
-   */
-  int readSFixed32() throws IOException;
-
-  /**
-   * Reads and returns the next field of type {@code SFIXED64} and advances the reader to the next
-   * field.
-   */
-  long readSFixed64() throws IOException;
-
-  /**
-   * Reads and returns the next field of type {@code SINT32} and advances the reader to the next
-   * field.
-   */
-  int readSInt32() throws IOException;
-
-  /**
-   * Reads and returns the next field of type {@code SINT64} and advances the reader to the next
-   * field.
-   */
-  long readSInt64() throws IOException;
-
-  /**
-   * Reads the next field of type {@code DOUBLE_LIST} or {@code DOUBLE_LIST_PACKED} and advances the
-   * reader to the next field.
-   *
-   * @param target the list that will receive the read values.
-   */
-  void readDoubleList(List<Double> target) throws IOException;
-
-  /**
-   * Reads the next field of type {@code FLOAT_LIST} or {@code FLOAT_LIST_PACKED} and advances the
-   * reader to the next field.
-   *
-   * @param target the list that will receive the read values.
-   */
-  void readFloatList(List<Float> target) throws IOException;
-
-  /**
-   * Reads the next field of type {@code UINT64_LIST} or {@code UINT64_LIST_PACKED} and advances the
-   * reader to the next field.
-   *
-   * @param target the list that will receive the read values.
-   */
-  void readUInt64List(List<Long> target) throws IOException;
-
-  /**
-   * Reads the next field of type {@code INT64_LIST} or {@code INT64_LIST_PACKED} and advances the
-   * reader to the next field.
-   *
-   * @param target the list that will receive the read values.
-   */
-  void readInt64List(List<Long> target) throws IOException;
-
-  /**
-   * Reads the next field of type {@code INT32_LIST} or {@code INT32_LIST_PACKED} and advances the
-   * reader to the next field.
-   *
-   * @param target the list that will receive the read values.
-   */
-  void readInt32List(List<Integer> target) throws IOException;
-
-  /**
-   * Reads the next field of type {@code FIXED64_LIST} or {@code FIXED64_LIST_PACKED} and advances
-   * the reader to the next field.
-   *
-   * @param target the list that will receive the read values.
-   */
-  void readFixed64List(List<Long> target) throws IOException;
-
-  /**
-   * Reads the next field of type {@code FIXED32_LIST} or {@code FIXED32_LIST_PACKED} and advances
-   * the reader to the next field.
-   *
-   * @param target the list that will receive the read values.
-   */
-  void readFixed32List(List<Integer> target) throws IOException;
-
-  /**
-   * Reads the next field of type {@code BOOL_LIST} or {@code BOOL_LIST_PACKED} and advances the
-   * reader to the next field.
-   *
-   * @param target the list that will receive the read values.
-   */
-  void readBoolList(List<Boolean> target) throws IOException;
-
-  /**
-   * Reads the next field of type {@code STRING_LIST} and advances the reader to the next field.
-   *
-   * @param target the list that will receive the read values.
-   */
-  void readStringList(List<String> target) throws IOException;
-
-  /**
-   * Reads the next field of type {@code STRING_LIST} and advances the reader to the next field. If
-   * the stream contains malformed UTF-8, throw exception {@link InvalidProtocolBufferException}.
-   *
-   * @param target the list that will receive the read values.
-   */
-  void readStringListRequireUtf8(List<String> target) throws IOException;
-
-  /**
-   * Reads the next field of type {@code MESSAGE_LIST} and advances the reader to the next field.
-   *
-   * @param target the list that will receive the read values.
-   * @param targetType the type of the elements stored in the {@code target} list.
-   */
-  <T> void readMessageList(
-      List<T> target, Schema<T> schema, ExtensionRegistryLite extensionRegistry) throws IOException;
-
-  <T> void readMessageList(
-      List<T> target, Class<T> targetType, ExtensionRegistryLite extensionRegistry)
-      throws IOException;
-
-  /**
-   * Reads the next field of type {@code GROUP_LIST} and advances the reader to the next field.
-   *
-   * @param target the list that will receive the read values.
-   * @param targetType the type of the elements stored in the {@code target} list.
-   * @deprecated groups fields are deprecated.
-   */
-  @Deprecated
-  <T> void readGroupList(
-      List<T> target, Class<T> targetType, ExtensionRegistryLite extensionRegistry)
-      throws IOException;
-
-  @Deprecated
-  <T> void readGroupList(
-      List<T> target, Schema<T> targetType, ExtensionRegistryLite extensionRegistry)
-      throws IOException;
-
-  /**
-   * Reads the next field of type {@code BYTES_LIST} and advances the reader to the next field.
-   *
-   * @param target the list that will receive the read values.
-   */
-  void readBytesList(List<ByteString> target) throws IOException;
-
-  /**
-   * Reads the next field of type {@code UINT32_LIST} or {@code UINT32_LIST_PACKED} and advances the
-   * reader to the next field.
-   *
-   * @param target the list that will receive the read values.
-   */
-  void readUInt32List(List<Integer> target) throws IOException;
-
-  /**
-   * Reads the next field of type {@code ENUM_LIST} or {@code ENUM_LIST_PACKED} and advances the
-   * reader to the next field.
-   *
-   * @param target the list that will receive the read values.
-   */
-  void readEnumList(List<Integer> target) throws IOException;
-
-  /**
-   * Reads the next field of type {@code SFIXED32_LIST} or {@code SFIXED32_LIST_PACKED} and advances
-   * the reader to the next field.
-   *
-   * @param target the list that will receive the read values.
-   */
-  void readSFixed32List(List<Integer> target) throws IOException;
-
-  /**
-   * Reads the next field of type {@code SFIXED64_LIST} or {@code SFIXED64_LIST_PACKED} and advances
-   * the reader to the next field.
-   *
-   * @param target the list that will receive the read values.
-   */
-  void readSFixed64List(List<Long> target) throws IOException;
-
-  /**
-   * Reads the next field of type {@code SINT32_LIST} or {@code SINT32_LIST_PACKED} and advances the
-   * reader to the next field.
-   *
-   * @param target the list that will receive the read values.
-   */
-  void readSInt32List(List<Integer> target) throws IOException;
-
-  /**
-   * Reads the next field of type {@code SINT64_LIST} or {@code SINT64_LIST_PACKED} and advances the
-   * reader to the next field.
-   *
-   * @param target the list that will receive the read values.
-   */
-  void readSInt64List(List<Long> target) throws IOException;
-
-  /**
-   * Reads the next field of type {@code MAP} and advances the reader to the next field.
-   *
-   * @param target the mutable map that will receive the read values.
-   * @param mapDefaultEntry the default entry of the map field.
-   * @param extensionRegistry the extension registry for parsing message value fields.
-   */
-  <K, V> void readMap(
-      Map<K, V> target,
-      MapEntryLite.Metadata<K, V> mapDefaultEntry,
-      ExtensionRegistryLite extensionRegistry)
-      throws IOException;
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/RepeatedFieldBuilder.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/RepeatedFieldBuilder.java
deleted file mode 100644
index d56af6b..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/RepeatedFieldBuilder.java
+++ /dev/null
@@ -1,666 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.protobuf.Internal.checkNotNull;
-
-import java.util.AbstractList;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.RandomAccess;
-
-/**
- * {@code RepeatedFieldBuilder} implements a structure that a protocol message uses to hold a
- * repeated field of other protocol messages. It supports the classical use case of adding immutable
- * {@link Message}'s to the repeated field and is highly optimized around this (no extra memory
- * allocations and sharing of immutable arrays). <br>
- * It also supports the additional use case of adding a {@link Message.Builder} to the repeated
- * field and deferring conversion of that {@code Builder} to an immutable {@code Message}. In this
- * way, it's possible to maintain a tree of {@code Builder}'s that acts as a fully read/write data
- * structure. <br>
- * Logically, one can think of a tree of builders as converting the entire tree to messages when
- * build is called on the root or when any method is called that desires a Message instead of a
- * Builder. In terms of the implementation, the {@code SingleFieldBuilder} and {@code
- * RepeatedFieldBuilder} classes cache messages that were created so that messages only need to be
- * created when some change occurred in its builder or a builder for one of its descendants.
- *
- * @param <MType> the type of message for the field
- * @param <BType> the type of builder for the field
- * @param <IType> the common interface for the message and the builder
- * @author jonp@google.com (Jon Perlow)
- */
-public class RepeatedFieldBuilder<
-        MType extends GeneratedMessage,
-        BType extends GeneratedMessage.Builder,
-        IType extends MessageOrBuilder>
-    implements GeneratedMessage.BuilderParent {
-
-  // Parent to send changes to.
-  private GeneratedMessage.BuilderParent parent;
-
-  // List of messages. Never null. It may be immutable, in which case
-  // isMessagesListMutable will be false. See note below.
-  private List<MType> messages;
-
-  // Whether messages is an mutable array that can be modified.
-  private boolean isMessagesListMutable;
-
-  // List of builders. May be null, in which case, no nested builders were
-  // created. If not null, entries represent the builder for that index.
-  private List<SingleFieldBuilder<MType, BType, IType>> builders;
-
-  // Here are the invariants for messages and builders:
-  // 1. messages is never null and its count corresponds to the number of items
-  //    in the repeated field.
-  // 2. If builders is non-null, messages and builders MUST always
-  //    contain the same number of items.
-  // 3. Entries in either array can be null, but for any index, there MUST be
-  //    either a Message in messages or a builder in builders.
-  // 4. If the builder at an index is non-null, the builder is
-  //    authoritative. This is the case where a Builder was set on the index.
-  //    Any message in the messages array MUST be ignored.
-  // t. If the builder at an index is null, the message in the messages
-  //    list is authoritative. This is the case where a Message (not a Builder)
-  //    was set directly for an index.
-
-  // Indicates that we've built a message and so we are now obligated
-  // to dispatch dirty invalidations. See GeneratedMessage.BuilderListener.
-  private boolean isClean;
-
-  // A view of this builder that exposes a List interface of messages. This is
-  // initialized on demand. This is fully backed by this object and all changes
-  // are reflected in it. Access to any item converts it to a message if it
-  // was a builder.
-  private MessageExternalList<MType, BType, IType> externalMessageList;
-
-  // A view of this builder that exposes a List interface of builders. This is
-  // initialized on demand. This is fully backed by this object and all changes
-  // are reflected in it. Access to any item converts it to a builder if it
-  // was a message.
-  private BuilderExternalList<MType, BType, IType> externalBuilderList;
-
-  // A view of this builder that exposes a List interface of the interface
-  // implemented by messages and builders. This is initialized on demand. This
-  // is fully backed by this object and all changes are reflected in it.
-  // Access to any item returns either a builder or message depending on
-  // what is most efficient.
-  private MessageOrBuilderExternalList<MType, BType, IType> externalMessageOrBuilderList;
-
-  /**
-   * Constructs a new builder with an empty list of messages.
-   *
-   * @param messages the current list of messages
-   * @param isMessagesListMutable Whether the messages list is mutable
-   * @param parent a listener to notify of changes
-   * @param isClean whether the builder is initially marked clean
-   */
-  public RepeatedFieldBuilder(
-      List<MType> messages,
-      boolean isMessagesListMutable,
-      GeneratedMessage.BuilderParent parent,
-      boolean isClean) {
-    this.messages = messages;
-    this.isMessagesListMutable = isMessagesListMutable;
-    this.parent = parent;
-    this.isClean = isClean;
-  }
-
-  public void dispose() {
-    // Null out parent so we stop sending it invalidations.
-    parent = null;
-  }
-
-  /**
-   * Ensures that the list of messages is mutable so it can be updated. If it's immutable, a copy is
-   * made.
-   */
-  private void ensureMutableMessageList() {
-    if (!isMessagesListMutable) {
-      messages = new ArrayList<MType>(messages);
-      isMessagesListMutable = true;
-    }
-  }
-
-  /**
-   * Ensures that the list of builders is not null. If it's null, the list is created and
-   * initialized to be the same size as the messages list with null entries.
-   */
-  private void ensureBuilders() {
-    if (this.builders == null) {
-      this.builders = new ArrayList<SingleFieldBuilder<MType, BType, IType>>(messages.size());
-      for (int i = 0; i < messages.size(); i++) {
-        builders.add(null);
-      }
-    }
-  }
-
-  /**
-   * Gets the count of items in the list.
-   *
-   * @return the count of items in the list.
-   */
-  public int getCount() {
-    return messages.size();
-  }
-
-  /**
-   * Gets whether the list is empty.
-   *
-   * @return whether the list is empty
-   */
-  public boolean isEmpty() {
-    return messages.isEmpty();
-  }
-
-  /**
-   * Get the message at the specified index. If the message is currently stored as a {@code
-   * Builder}, it is converted to a {@code Message} by calling {@link Message.Builder#buildPartial}
-   * on it.
-   *
-   * @param index the index of the message to get
-   * @return the message for the specified index
-   */
-  public MType getMessage(int index) {
-    return getMessage(index, false);
-  }
-
-  /**
-   * Get the message at the specified index. If the message is currently stored as a {@code
-   * Builder}, it is converted to a {@code Message} by calling {@link Message.Builder#buildPartial}
-   * on it.
-   *
-   * @param index the index of the message to get
-   * @param forBuild this is being called for build so we want to make sure we
-   *     SingleFieldBuilder.build to send dirty invalidations
-   * @return the message for the specified index
-   */
-  private MType getMessage(int index, boolean forBuild) {
-    if (this.builders == null) {
-      // We don't have any builders -- return the current Message.
-      // This is the case where no builder was created, so we MUST have a
-      // Message.
-      return messages.get(index);
-    }
-
-    SingleFieldBuilder<MType, BType, IType> builder = builders.get(index);
-    if (builder == null) {
-      // We don't have a builder -- return the current message.
-      // This is the case where no builder was created for the entry at index,
-      // so we MUST have a message.
-      return messages.get(index);
-
-    } else {
-      return forBuild ? builder.build() : builder.getMessage();
-    }
-  }
-
-  /**
-   * Gets a builder for the specified index. If no builder has been created for that index, a
-   * builder is created on demand by calling {@link Message#toBuilder}.
-   *
-   * @param index the index of the message to get
-   * @return The builder for that index
-   */
-  public BType getBuilder(int index) {
-    ensureBuilders();
-    SingleFieldBuilder<MType, BType, IType> builder = builders.get(index);
-    if (builder == null) {
-      MType message = messages.get(index);
-      builder = new SingleFieldBuilder<MType, BType, IType>(message, this, isClean);
-      builders.set(index, builder);
-    }
-    return builder.getBuilder();
-  }
-
-  /**
-   * Gets the base class interface for the specified index. This may either be a builder or a
-   * message. It will return whatever is more efficient.
-   *
-   * @param index the index of the message to get
-   * @return the message or builder for the index as the base class interface
-   */
-  @SuppressWarnings("unchecked")
-  public IType getMessageOrBuilder(int index) {
-    if (this.builders == null) {
-      // We don't have any builders -- return the current Message.
-      // This is the case where no builder was created, so we MUST have a
-      // Message.
-      return (IType) messages.get(index);
-    }
-
-    SingleFieldBuilder<MType, BType, IType> builder = builders.get(index);
-    if (builder == null) {
-      // We don't have a builder -- return the current message.
-      // This is the case where no builder was created for the entry at index,
-      // so we MUST have a message.
-      return (IType) messages.get(index);
-
-    } else {
-      return builder.getMessageOrBuilder();
-    }
-  }
-
-  /**
-   * Sets a message at the specified index replacing the existing item at that index.
-   *
-   * @param index the index to set.
-   * @param message the message to set
-   * @return the builder
-   */
-  public RepeatedFieldBuilder<MType, BType, IType> setMessage(int index, MType message) {
-    checkNotNull(message);
-    ensureMutableMessageList();
-    messages.set(index, message);
-    if (builders != null) {
-      SingleFieldBuilder<MType, BType, IType> entry = builders.set(index, null);
-      if (entry != null) {
-        entry.dispose();
-      }
-    }
-    onChanged();
-    incrementModCounts();
-    return this;
-  }
-
-  /**
-   * Appends the specified element to the end of this list.
-   *
-   * @param message the message to add
-   * @return the builder
-   */
-  public RepeatedFieldBuilder<MType, BType, IType> addMessage(MType message) {
-    checkNotNull(message);
-    ensureMutableMessageList();
-    messages.add(message);
-    if (builders != null) {
-      builders.add(null);
-    }
-    onChanged();
-    incrementModCounts();
-    return this;
-  }
-
-  /**
-   * Inserts the specified message at the specified position in this list. Shifts the element
-   * currently at that position (if any) and any subsequent elements to the right (adds one to their
-   * indices).
-   *
-   * @param index the index at which to insert the message
-   * @param message the message to add
-   * @return the builder
-   */
-  public RepeatedFieldBuilder<MType, BType, IType> addMessage(int index, MType message) {
-    checkNotNull(message);
-    ensureMutableMessageList();
-    messages.add(index, message);
-    if (builders != null) {
-      builders.add(index, null);
-    }
-    onChanged();
-    incrementModCounts();
-    return this;
-  }
-
-  /**
-   * Appends all of the messages in the specified collection to the end of this list, in the order
-   * that they are returned by the specified collection's iterator.
-   *
-   * @param values the messages to add
-   * @return the builder
-   */
-  public RepeatedFieldBuilder<MType, BType, IType> addAllMessages(
-      Iterable<? extends MType> values) {
-    for (final MType value : values) {
-      checkNotNull(value);
-    }
-
-    // If we can inspect the size, we can more efficiently add messages.
-    int size = -1;
-    if (values instanceof Collection) {
-      final Collection<?> collection = (Collection<?>) values;
-      if (collection.isEmpty()) {
-        return this;
-      }
-      size = collection.size();
-    }
-    ensureMutableMessageList();
-
-    if (size >= 0 && messages instanceof ArrayList) {
-      ((ArrayList<MType>) messages).ensureCapacity(messages.size() + size);
-    }
-
-    for (MType value : values) {
-      addMessage(value);
-    }
-
-    onChanged();
-    incrementModCounts();
-    return this;
-  }
-
-  /**
-   * Appends a new builder to the end of this list and returns the builder.
-   *
-   * @param message the message to add which is the basis of the builder
-   * @return the new builder
-   */
-  public BType addBuilder(MType message) {
-    ensureMutableMessageList();
-    ensureBuilders();
-    SingleFieldBuilder<MType, BType, IType> builder =
-        new SingleFieldBuilder<MType, BType, IType>(message, this, isClean);
-    messages.add(null);
-    builders.add(builder);
-    onChanged();
-    incrementModCounts();
-    return builder.getBuilder();
-  }
-
-  /**
-   * Inserts a new builder at the specified position in this list. Shifts the element currently at
-   * that position (if any) and any subsequent elements to the right (adds one to their indices).
-   *
-   * @param index the index at which to insert the builder
-   * @param message the message to add which is the basis of the builder
-   * @return the builder
-   */
-  public BType addBuilder(int index, MType message) {
-    ensureMutableMessageList();
-    ensureBuilders();
-    SingleFieldBuilder<MType, BType, IType> builder =
-        new SingleFieldBuilder<MType, BType, IType>(message, this, isClean);
-    messages.add(index, null);
-    builders.add(index, builder);
-    onChanged();
-    incrementModCounts();
-    return builder.getBuilder();
-  }
-
-  /**
-   * Removes the element at the specified position in this list. Shifts any subsequent elements to
-   * the left (subtracts one from their indices).
-   *
-   * @param index the index at which to remove the message
-   */
-  public void remove(int index) {
-    ensureMutableMessageList();
-    messages.remove(index);
-    if (builders != null) {
-      SingleFieldBuilder<MType, BType, IType> entry = builders.remove(index);
-      if (entry != null) {
-        entry.dispose();
-      }
-    }
-    onChanged();
-    incrementModCounts();
-  }
-
-  /** Removes all of the elements from this list. The list will be empty after this call returns. */
-  public void clear() {
-    messages = Collections.emptyList();
-    isMessagesListMutable = false;
-    if (builders != null) {
-      for (SingleFieldBuilder<MType, BType, IType> entry : builders) {
-        if (entry != null) {
-          entry.dispose();
-        }
-      }
-      builders = null;
-    }
-    onChanged();
-    incrementModCounts();
-  }
-
-  /**
-   * Builds the list of messages from the builder and returns them.
-   *
-   * @return an immutable list of messages
-   */
-  public List<MType> build() {
-    // Now that build has been called, we are required to dispatch
-    // invalidations.
-    isClean = true;
-
-    if (!isMessagesListMutable && builders == null) {
-      // We still have an immutable list and we never created a builder.
-      return messages;
-    }
-
-    boolean allMessagesInSync = true;
-    if (!isMessagesListMutable) {
-      // We still have an immutable list. Let's see if any of them are out
-      // of sync with their builders.
-      for (int i = 0; i < messages.size(); i++) {
-        Message message = messages.get(i);
-        SingleFieldBuilder<MType, BType, IType> builder = builders.get(i);
-        if (builder != null) {
-          if (builder.build() != message) {
-            allMessagesInSync = false;
-            break;
-          }
-        }
-      }
-      if (allMessagesInSync) {
-        // Immutable list is still in sync.
-        return messages;
-      }
-    }
-
-    // Need to make sure messages is up to date
-    ensureMutableMessageList();
-    for (int i = 0; i < messages.size(); i++) {
-      messages.set(i, getMessage(i, true));
-    }
-
-    // We're going to return our list as immutable so we mark that we can
-    // no longer update it.
-    messages = Collections.unmodifiableList(messages);
-    isMessagesListMutable = false;
-    return messages;
-  }
-
-  /**
-   * Gets a view of the builder as a list of messages. The returned list is live and will reflect
-   * any changes to the underlying builder.
-   *
-   * @return the messages in the list
-   */
-  public List<MType> getMessageList() {
-    if (externalMessageList == null) {
-      externalMessageList = new MessageExternalList<MType, BType, IType>(this);
-    }
-    return externalMessageList;
-  }
-
-  /**
-   * Gets a view of the builder as a list of builders. This returned list is live and will reflect
-   * any changes to the underlying builder.
-   *
-   * @return the builders in the list
-   */
-  public List<BType> getBuilderList() {
-    if (externalBuilderList == null) {
-      externalBuilderList = new BuilderExternalList<MType, BType, IType>(this);
-    }
-    return externalBuilderList;
-  }
-
-  /**
-   * Gets a view of the builder as a list of MessageOrBuilders. This returned list is live and will
-   * reflect any changes to the underlying builder.
-   *
-   * @return the builders in the list
-   */
-  public List<IType> getMessageOrBuilderList() {
-    if (externalMessageOrBuilderList == null) {
-      externalMessageOrBuilderList = new MessageOrBuilderExternalList<MType, BType, IType>(this);
-    }
-    return externalMessageOrBuilderList;
-  }
-
-  /**
-   * Called when a the builder or one of its nested children has changed and any parent should be
-   * notified of its invalidation.
-   */
-  private void onChanged() {
-    if (isClean && parent != null) {
-      parent.markDirty();
-
-      // Don't keep dispatching invalidations until build is called again.
-      isClean = false;
-    }
-  }
-
-  @Override
-  public void markDirty() {
-    onChanged();
-  }
-
-  /**
-   * Increments the mod counts so that an ConcurrentModificationException can be thrown if calling
-   * code tries to modify the builder while its iterating the list.
-   */
-  private void incrementModCounts() {
-    if (externalMessageList != null) {
-      externalMessageList.incrementModCount();
-    }
-    if (externalBuilderList != null) {
-      externalBuilderList.incrementModCount();
-    }
-    if (externalMessageOrBuilderList != null) {
-      externalMessageOrBuilderList.incrementModCount();
-    }
-  }
-
-  /**
-   * Provides a live view of the builder as a list of messages.
-   *
-   * @param <MType> the type of message for the field
-   * @param <BType> the type of builder for the field
-   * @param <IType> the common interface for the message and the builder
-   */
-  private static class MessageExternalList<
-          MType extends GeneratedMessage,
-          BType extends GeneratedMessage.Builder,
-          IType extends MessageOrBuilder>
-      extends AbstractList<MType> implements List<MType>, RandomAccess {
-
-    RepeatedFieldBuilder<MType, BType, IType> builder;
-
-    MessageExternalList(RepeatedFieldBuilder<MType, BType, IType> builder) {
-      this.builder = builder;
-    }
-
-    @Override
-    public int size() {
-      return this.builder.getCount();
-    }
-
-    @Override
-    public MType get(int index) {
-      return builder.getMessage(index);
-    }
-
-    void incrementModCount() {
-      modCount++;
-    }
-  }
-
-  /**
-   * Provides a live view of the builder as a list of builders.
-   *
-   * @param <MType> the type of message for the field
-   * @param <BType> the type of builder for the field
-   * @param <IType> the common interface for the message and the builder
-   */
-  private static class BuilderExternalList<
-          MType extends GeneratedMessage,
-          BType extends GeneratedMessage.Builder,
-          IType extends MessageOrBuilder>
-      extends AbstractList<BType> implements List<BType>, RandomAccess {
-
-    RepeatedFieldBuilder<MType, BType, IType> builder;
-
-    BuilderExternalList(RepeatedFieldBuilder<MType, BType, IType> builder) {
-      this.builder = builder;
-    }
-
-    @Override
-    public int size() {
-      return this.builder.getCount();
-    }
-
-    @Override
-    public BType get(int index) {
-      return builder.getBuilder(index);
-    }
-
-    void incrementModCount() {
-      modCount++;
-    }
-  }
-
-  /**
-   * Provides a live view of the builder as a list of builders.
-   *
-   * @param <MType> the type of message for the field
-   * @param <BType> the type of builder for the field
-   * @param <IType> the common interface for the message and the builder
-   */
-  private static class MessageOrBuilderExternalList<
-          MType extends GeneratedMessage,
-          BType extends GeneratedMessage.Builder,
-          IType extends MessageOrBuilder>
-      extends AbstractList<IType> implements List<IType>, RandomAccess {
-
-    RepeatedFieldBuilder<MType, BType, IType> builder;
-
-    MessageOrBuilderExternalList(RepeatedFieldBuilder<MType, BType, IType> builder) {
-      this.builder = builder;
-    }
-
-    @Override
-    public int size() {
-      return this.builder.getCount();
-    }
-
-    @Override
-    public IType get(int index) {
-      return builder.getMessageOrBuilder(index);
-    }
-
-    void incrementModCount() {
-      modCount++;
-    }
-  }
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/RepeatedFieldBuilderV3.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/RepeatedFieldBuilderV3.java
deleted file mode 100644
index f6acc77..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/RepeatedFieldBuilderV3.java
+++ /dev/null
@@ -1,666 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.protobuf.Internal.checkNotNull;
-
-import java.util.AbstractList;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.RandomAccess;
-
-/**
- * {@code RepeatedFieldBuilderV3} implements a structure that a protocol message uses to hold a
- * repeated field of other protocol messages. It supports the classical use case of adding immutable
- * {@link Message}'s to the repeated field and is highly optimized around this (no extra memory
- * allocations and sharing of immutable arrays). <br>
- * It also supports the additional use case of adding a {@link Message.Builder} to the repeated
- * field and deferring conversion of that {@code Builder} to an immutable {@code Message}. In this
- * way, it's possible to maintain a tree of {@code Builder}'s that acts as a fully read/write data
- * structure. <br>
- * Logically, one can think of a tree of builders as converting the entire tree to messages when
- * build is called on the root or when any method is called that desires a Message instead of a
- * Builder. In terms of the implementation, the {@code SingleFieldBuilderV3} and {@code
- * RepeatedFieldBuilderV3} classes cache messages that were created so that messages only need to be
- * created when some change occurred in its builder or a builder for one of its descendants.
- *
- * @param <MType> the type of message for the field
- * @param <BType> the type of builder for the field
- * @param <IType> the common interface for the message and the builder
- * @author jonp@google.com (Jon Perlow)
- */
-public class RepeatedFieldBuilderV3<
-        MType extends AbstractMessage,
-        BType extends AbstractMessage.Builder,
-        IType extends MessageOrBuilder>
-    implements AbstractMessage.BuilderParent {
-
-  // Parent to send changes to.
-  private AbstractMessage.BuilderParent parent;
-
-  // List of messages. Never null. It may be immutable, in which case
-  // isMessagesListMutable will be false. See note below.
-  private List<MType> messages;
-
-  // Whether messages is an mutable array that can be modified.
-  private boolean isMessagesListMutable;
-
-  // List of builders. May be null, in which case, no nested builders were
-  // created. If not null, entries represent the builder for that index.
-  private List<SingleFieldBuilderV3<MType, BType, IType>> builders;
-
-  // Here are the invariants for messages and builders:
-  // 1. messages is never null and its count corresponds to the number of items
-  //    in the repeated field.
-  // 2. If builders is non-null, messages and builders MUST always
-  //    contain the same number of items.
-  // 3. Entries in either array can be null, but for any index, there MUST be
-  //    either a Message in messages or a builder in builders.
-  // 4. If the builder at an index is non-null, the builder is
-  //    authoritative. This is the case where a Builder was set on the index.
-  //    Any message in the messages array MUST be ignored.
-  // t. If the builder at an index is null, the message in the messages
-  //    list is authoritative. This is the case where a Message (not a Builder)
-  //    was set directly for an index.
-
-  // Indicates that we've built a message and so we are now obligated
-  // to dispatch dirty invalidations. See AbstractMessage.BuilderListener.
-  private boolean isClean;
-
-  // A view of this builder that exposes a List interface of messages. This is
-  // initialized on demand. This is fully backed by this object and all changes
-  // are reflected in it. Access to any item converts it to a message if it
-  // was a builder.
-  private MessageExternalList<MType, BType, IType> externalMessageList;
-
-  // A view of this builder that exposes a List interface of builders. This is
-  // initialized on demand. This is fully backed by this object and all changes
-  // are reflected in it. Access to any item converts it to a builder if it
-  // was a message.
-  private BuilderExternalList<MType, BType, IType> externalBuilderList;
-
-  // A view of this builder that exposes a List interface of the interface
-  // implemented by messages and builders. This is initialized on demand. This
-  // is fully backed by this object and all changes are reflected in it.
-  // Access to any item returns either a builder or message depending on
-  // what is most efficient.
-  private MessageOrBuilderExternalList<MType, BType, IType> externalMessageOrBuilderList;
-
-  /**
-   * Constructs a new builder with an empty list of messages.
-   *
-   * @param messages the current list of messages
-   * @param isMessagesListMutable Whether the messages list is mutable
-   * @param parent a listener to notify of changes
-   * @param isClean whether the builder is initially marked clean
-   */
-  public RepeatedFieldBuilderV3(
-      List<MType> messages,
-      boolean isMessagesListMutable,
-      AbstractMessage.BuilderParent parent,
-      boolean isClean) {
-    this.messages = messages;
-    this.isMessagesListMutable = isMessagesListMutable;
-    this.parent = parent;
-    this.isClean = isClean;
-  }
-
-  public void dispose() {
-    // Null out parent so we stop sending it invalidations.
-    parent = null;
-  }
-
-  /**
-   * Ensures that the list of messages is mutable so it can be updated. If it's immutable, a copy is
-   * made.
-   */
-  private void ensureMutableMessageList() {
-    if (!isMessagesListMutable) {
-      messages = new ArrayList<MType>(messages);
-      isMessagesListMutable = true;
-    }
-  }
-
-  /**
-   * Ensures that the list of builders is not null. If it's null, the list is created and
-   * initialized to be the same size as the messages list with null entries.
-   */
-  private void ensureBuilders() {
-    if (this.builders == null) {
-      this.builders = new ArrayList<SingleFieldBuilderV3<MType, BType, IType>>(messages.size());
-      for (int i = 0; i < messages.size(); i++) {
-        builders.add(null);
-      }
-    }
-  }
-
-  /**
-   * Gets the count of items in the list.
-   *
-   * @return the count of items in the list.
-   */
-  public int getCount() {
-    return messages.size();
-  }
-
-  /**
-   * Gets whether the list is empty.
-   *
-   * @return whether the list is empty
-   */
-  public boolean isEmpty() {
-    return messages.isEmpty();
-  }
-
-  /**
-   * Get the message at the specified index. If the message is currently stored as a {@code
-   * Builder}, it is converted to a {@code Message} by calling {@link Message.Builder#buildPartial}
-   * on it.
-   *
-   * @param index the index of the message to get
-   * @return the message for the specified index
-   */
-  public MType getMessage(int index) {
-    return getMessage(index, false);
-  }
-
-  /**
-   * Get the message at the specified index. If the message is currently stored as a {@code
-   * Builder}, it is converted to a {@code Message} by calling {@link Message.Builder#buildPartial}
-   * on it.
-   *
-   * @param index the index of the message to get
-   * @param forBuild this is being called for build so we want to make sure we
-   *     SingleFieldBuilderV3.build to send dirty invalidations
-   * @return the message for the specified index
-   */
-  private MType getMessage(int index, boolean forBuild) {
-    if (this.builders == null) {
-      // We don't have any builders -- return the current Message.
-      // This is the case where no builder was created, so we MUST have a
-      // Message.
-      return messages.get(index);
-    }
-
-    SingleFieldBuilderV3<MType, BType, IType> builder = builders.get(index);
-    if (builder == null) {
-      // We don't have a builder -- return the current message.
-      // This is the case where no builder was created for the entry at index,
-      // so we MUST have a message.
-      return messages.get(index);
-
-    } else {
-      return forBuild ? builder.build() : builder.getMessage();
-    }
-  }
-
-  /**
-   * Gets a builder for the specified index. If no builder has been created for that index, a
-   * builder is created on demand by calling {@link Message#toBuilder}.
-   *
-   * @param index the index of the message to get
-   * @return The builder for that index
-   */
-  public BType getBuilder(int index) {
-    ensureBuilders();
-    SingleFieldBuilderV3<MType, BType, IType> builder = builders.get(index);
-    if (builder == null) {
-      MType message = messages.get(index);
-      builder = new SingleFieldBuilderV3<MType, BType, IType>(message, this, isClean);
-      builders.set(index, builder);
-    }
-    return builder.getBuilder();
-  }
-
-  /**
-   * Gets the base class interface for the specified index. This may either be a builder or a
-   * message. It will return whatever is more efficient.
-   *
-   * @param index the index of the message to get
-   * @return the message or builder for the index as the base class interface
-   */
-  @SuppressWarnings("unchecked")
-  public IType getMessageOrBuilder(int index) {
-    if (this.builders == null) {
-      // We don't have any builders -- return the current Message.
-      // This is the case where no builder was created, so we MUST have a
-      // Message.
-      return (IType) messages.get(index);
-    }
-
-    SingleFieldBuilderV3<MType, BType, IType> builder = builders.get(index);
-    if (builder == null) {
-      // We don't have a builder -- return the current message.
-      // This is the case where no builder was created for the entry at index,
-      // so we MUST have a message.
-      return (IType) messages.get(index);
-
-    } else {
-      return builder.getMessageOrBuilder();
-    }
-  }
-
-  /**
-   * Sets a message at the specified index replacing the existing item at that index.
-   *
-   * @param index the index to set.
-   * @param message the message to set
-   * @return the builder
-   */
-  public RepeatedFieldBuilderV3<MType, BType, IType> setMessage(int index, MType message) {
-    checkNotNull(message);
-    ensureMutableMessageList();
-    messages.set(index, message);
-    if (builders != null) {
-      SingleFieldBuilderV3<MType, BType, IType> entry = builders.set(index, null);
-      if (entry != null) {
-        entry.dispose();
-      }
-    }
-    onChanged();
-    incrementModCounts();
-    return this;
-  }
-
-  /**
-   * Appends the specified element to the end of this list.
-   *
-   * @param message the message to add
-   * @return the builder
-   */
-  public RepeatedFieldBuilderV3<MType, BType, IType> addMessage(MType message) {
-    checkNotNull(message);
-    ensureMutableMessageList();
-    messages.add(message);
-    if (builders != null) {
-      builders.add(null);
-    }
-    onChanged();
-    incrementModCounts();
-    return this;
-  }
-
-  /**
-   * Inserts the specified message at the specified position in this list. Shifts the element
-   * currently at that position (if any) and any subsequent elements to the right (adds one to their
-   * indices).
-   *
-   * @param index the index at which to insert the message
-   * @param message the message to add
-   * @return the builder
-   */
-  public RepeatedFieldBuilderV3<MType, BType, IType> addMessage(int index, MType message) {
-    checkNotNull(message);
-    ensureMutableMessageList();
-    messages.add(index, message);
-    if (builders != null) {
-      builders.add(index, null);
-    }
-    onChanged();
-    incrementModCounts();
-    return this;
-  }
-
-  /**
-   * Appends all of the messages in the specified collection to the end of this list, in the order
-   * that they are returned by the specified collection's iterator.
-   *
-   * @param values the messages to add
-   * @return the builder
-   */
-  public RepeatedFieldBuilderV3<MType, BType, IType> addAllMessages(
-      Iterable<? extends MType> values) {
-    for (final MType value : values) {
-      checkNotNull(value);
-    }
-
-    // If we can inspect the size, we can more efficiently add messages.
-    int size = -1;
-    if (values instanceof Collection) {
-      final Collection<?> collection = (Collection<?>) values;
-      if (collection.isEmpty()) {
-        return this;
-      }
-      size = collection.size();
-    }
-    ensureMutableMessageList();
-
-    if (size >= 0 && messages instanceof ArrayList) {
-      ((ArrayList<MType>) messages).ensureCapacity(messages.size() + size);
-    }
-
-    for (MType value : values) {
-      addMessage(value);
-    }
-
-    onChanged();
-    incrementModCounts();
-    return this;
-  }
-
-  /**
-   * Appends a new builder to the end of this list and returns the builder.
-   *
-   * @param message the message to add which is the basis of the builder
-   * @return the new builder
-   */
-  public BType addBuilder(MType message) {
-    ensureMutableMessageList();
-    ensureBuilders();
-    SingleFieldBuilderV3<MType, BType, IType> builder =
-        new SingleFieldBuilderV3<MType, BType, IType>(message, this, isClean);
-    messages.add(null);
-    builders.add(builder);
-    onChanged();
-    incrementModCounts();
-    return builder.getBuilder();
-  }
-
-  /**
-   * Inserts a new builder at the specified position in this list. Shifts the element currently at
-   * that position (if any) and any subsequent elements to the right (adds one to their indices).
-   *
-   * @param index the index at which to insert the builder
-   * @param message the message to add which is the basis of the builder
-   * @return the builder
-   */
-  public BType addBuilder(int index, MType message) {
-    ensureMutableMessageList();
-    ensureBuilders();
-    SingleFieldBuilderV3<MType, BType, IType> builder =
-        new SingleFieldBuilderV3<MType, BType, IType>(message, this, isClean);
-    messages.add(index, null);
-    builders.add(index, builder);
-    onChanged();
-    incrementModCounts();
-    return builder.getBuilder();
-  }
-
-  /**
-   * Removes the element at the specified position in this list. Shifts any subsequent elements to
-   * the left (subtracts one from their indices).
-   *
-   * @param index the index at which to remove the message
-   */
-  public void remove(int index) {
-    ensureMutableMessageList();
-    messages.remove(index);
-    if (builders != null) {
-      SingleFieldBuilderV3<MType, BType, IType> entry = builders.remove(index);
-      if (entry != null) {
-        entry.dispose();
-      }
-    }
-    onChanged();
-    incrementModCounts();
-  }
-
-  /** Removes all of the elements from this list. The list will be empty after this call returns. */
-  public void clear() {
-    messages = Collections.emptyList();
-    isMessagesListMutable = false;
-    if (builders != null) {
-      for (SingleFieldBuilderV3<MType, BType, IType> entry : builders) {
-        if (entry != null) {
-          entry.dispose();
-        }
-      }
-      builders = null;
-    }
-    onChanged();
-    incrementModCounts();
-  }
-
-  /**
-   * Builds the list of messages from the builder and returns them.
-   *
-   * @return an immutable list of messages
-   */
-  public List<MType> build() {
-    // Now that build has been called, we are required to dispatch
-    // invalidations.
-    isClean = true;
-
-    if (!isMessagesListMutable && builders == null) {
-      // We still have an immutable list and we never created a builder.
-      return messages;
-    }
-
-    boolean allMessagesInSync = true;
-    if (!isMessagesListMutable) {
-      // We still have an immutable list. Let's see if any of them are out
-      // of sync with their builders.
-      for (int i = 0; i < messages.size(); i++) {
-        Message message = messages.get(i);
-        SingleFieldBuilderV3<MType, BType, IType> builder = builders.get(i);
-        if (builder != null) {
-          if (builder.build() != message) {
-            allMessagesInSync = false;
-            break;
-          }
-        }
-      }
-      if (allMessagesInSync) {
-        // Immutable list is still in sync.
-        return messages;
-      }
-    }
-
-    // Need to make sure messages is up to date
-    ensureMutableMessageList();
-    for (int i = 0; i < messages.size(); i++) {
-      messages.set(i, getMessage(i, true));
-    }
-
-    // We're going to return our list as immutable so we mark that we can
-    // no longer update it.
-    messages = Collections.unmodifiableList(messages);
-    isMessagesListMutable = false;
-    return messages;
-  }
-
-  /**
-   * Gets a view of the builder as a list of messages. The returned list is live and will reflect
-   * any changes to the underlying builder.
-   *
-   * @return the messages in the list
-   */
-  public List<MType> getMessageList() {
-    if (externalMessageList == null) {
-      externalMessageList = new MessageExternalList<MType, BType, IType>(this);
-    }
-    return externalMessageList;
-  }
-
-  /**
-   * Gets a view of the builder as a list of builders. This returned list is live and will reflect
-   * any changes to the underlying builder.
-   *
-   * @return the builders in the list
-   */
-  public List<BType> getBuilderList() {
-    if (externalBuilderList == null) {
-      externalBuilderList = new BuilderExternalList<MType, BType, IType>(this);
-    }
-    return externalBuilderList;
-  }
-
-  /**
-   * Gets a view of the builder as a list of MessageOrBuilders. This returned list is live and will
-   * reflect any changes to the underlying builder.
-   *
-   * @return the builders in the list
-   */
-  public List<IType> getMessageOrBuilderList() {
-    if (externalMessageOrBuilderList == null) {
-      externalMessageOrBuilderList = new MessageOrBuilderExternalList<MType, BType, IType>(this);
-    }
-    return externalMessageOrBuilderList;
-  }
-
-  /**
-   * Called when a the builder or one of its nested children has changed and any parent should be
-   * notified of its invalidation.
-   */
-  private void onChanged() {
-    if (isClean && parent != null) {
-      parent.markDirty();
-
-      // Don't keep dispatching invalidations until build is called again.
-      isClean = false;
-    }
-  }
-
-  @Override
-  public void markDirty() {
-    onChanged();
-  }
-
-  /**
-   * Increments the mod counts so that an ConcurrentModificationException can be thrown if calling
-   * code tries to modify the builder while its iterating the list.
-   */
-  private void incrementModCounts() {
-    if (externalMessageList != null) {
-      externalMessageList.incrementModCount();
-    }
-    if (externalBuilderList != null) {
-      externalBuilderList.incrementModCount();
-    }
-    if (externalMessageOrBuilderList != null) {
-      externalMessageOrBuilderList.incrementModCount();
-    }
-  }
-
-  /**
-   * Provides a live view of the builder as a list of messages.
-   *
-   * @param <MType> the type of message for the field
-   * @param <BType> the type of builder for the field
-   * @param <IType> the common interface for the message and the builder
-   */
-  private static class MessageExternalList<
-          MType extends AbstractMessage,
-          BType extends AbstractMessage.Builder,
-          IType extends MessageOrBuilder>
-      extends AbstractList<MType> implements List<MType>, RandomAccess {
-
-    RepeatedFieldBuilderV3<MType, BType, IType> builder;
-
-    MessageExternalList(RepeatedFieldBuilderV3<MType, BType, IType> builder) {
-      this.builder = builder;
-    }
-
-    @Override
-    public int size() {
-      return this.builder.getCount();
-    }
-
-    @Override
-    public MType get(int index) {
-      return builder.getMessage(index);
-    }
-
-    void incrementModCount() {
-      modCount++;
-    }
-  }
-
-  /**
-   * Provides a live view of the builder as a list of builders.
-   *
-   * @param <MType> the type of message for the field
-   * @param <BType> the type of builder for the field
-   * @param <IType> the common interface for the message and the builder
-   */
-  private static class BuilderExternalList<
-          MType extends AbstractMessage,
-          BType extends AbstractMessage.Builder,
-          IType extends MessageOrBuilder>
-      extends AbstractList<BType> implements List<BType>, RandomAccess {
-
-    RepeatedFieldBuilderV3<MType, BType, IType> builder;
-
-    BuilderExternalList(RepeatedFieldBuilderV3<MType, BType, IType> builder) {
-      this.builder = builder;
-    }
-
-    @Override
-    public int size() {
-      return this.builder.getCount();
-    }
-
-    @Override
-    public BType get(int index) {
-      return builder.getBuilder(index);
-    }
-
-    void incrementModCount() {
-      modCount++;
-    }
-  }
-
-  /**
-   * Provides a live view of the builder as a list of builders.
-   *
-   * @param <MType> the type of message for the field
-   * @param <BType> the type of builder for the field
-   * @param <IType> the common interface for the message and the builder
-   */
-  private static class MessageOrBuilderExternalList<
-          MType extends AbstractMessage,
-          BType extends AbstractMessage.Builder,
-          IType extends MessageOrBuilder>
-      extends AbstractList<IType> implements List<IType>, RandomAccess {
-
-    RepeatedFieldBuilderV3<MType, BType, IType> builder;
-
-    MessageOrBuilderExternalList(RepeatedFieldBuilderV3<MType, BType, IType> builder) {
-      this.builder = builder;
-    }
-
-    @Override
-    public int size() {
-      return this.builder.getCount();
-    }
-
-    @Override
-    public IType get(int index) {
-      return builder.getMessageOrBuilder(index);
-    }
-
-    void incrementModCount() {
-      modCount++;
-    }
-  }
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/RopeByteString.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/RopeByteString.java
deleted file mode 100644
index f584164..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/RopeByteString.java
+++ /dev/null
@@ -1,972 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InvalidObjectException;
-import java.io.ObjectInputStream;
-import java.io.OutputStream;
-import java.nio.ByteBuffer;
-import java.nio.charset.Charset;
-import java.util.ArrayDeque;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-import java.util.NoSuchElementException;
-
-/**
- * Class to represent {@code ByteStrings} formed by concatenation of other ByteStrings, without
- * copying the data in the pieces. The concatenation is represented as a tree whose leaf nodes are
- * each a {@link com.google.protobuf.ByteString.LeafByteString}.
- *
- * <p>Most of the operation here is inspired by the now-famous paper <a
- * href="https://web.archive.org/web/20060202015456/http://www.cs.ubc.ca/local/reading/proceedings/spe91-95/spe/vol25/issue12/spe986.pdf">
- * BAP95 </a> Ropes: an Alternative to Strings hans-j. boehm, russ atkinson and michael plass
- *
- * <p>The algorithms described in the paper have been implemented for character strings in {@code
- * com.google.common.string.Rope} and in the c++ class {@code cord.cc}.
- *
- * <p>Fundamentally the Rope algorithm represents the collection of pieces as a binary tree. BAP95
- * uses a Fibonacci bound relating depth to a minimum sequence length, sequences that are too short
- * relative to their depth cause a tree rebalance. More precisely, a tree of depth d is "balanced"
- * in the terminology of BAP95 if its length is at least F(d+2), where F(n) is the n-th Fibonacci
- * number. Thus for depths 0, 1, 2, 3, 4, 5,... we have minimum lengths 1, 2, 3, 5, 8, 13,...
- *
- * @author carlanton@google.com (Carl Haverl)
- */
-final class RopeByteString extends ByteString {
-
-  /**
-   * BAP95. Let Fn be the nth Fibonacci number. A {@link RopeByteString} of depth n is "balanced",
-   * i.e flat enough, if its length is at least Fn+2, e.g. a "balanced" {@link RopeByteString} of
-   * depth 1 must have length at least 2, of depth 4 must have length >= 8, etc.
-   *
-   * <p>There's nothing special about using the Fibonacci numbers for this, but they are a
-   * reasonable sequence for encapsulating the idea that we are OK with longer strings being encoded
-   * in deeper binary trees.
-   *
-   * <p>For 32-bit integers, this array has length 46.
-   *
-   * <p>The correctness of this constant array is validated in tests.
-   */
-  static final int[] minLengthByDepth = {
-    1,
-    1,
-    2,
-    3,
-    5,
-    8,
-    13,
-    21,
-    34,
-    55,
-    89,
-    144,
-    233,
-    377,
-    610,
-    987,
-    1597,
-    2584,
-    4181,
-    6765,
-    10946,
-    17711,
-    28657,
-    46368,
-    75025,
-    121393,
-    196418,
-    317811,
-    514229,
-    832040,
-    1346269,
-    2178309,
-    3524578,
-    5702887,
-    9227465,
-    14930352,
-    24157817,
-    39088169,
-    63245986,
-    102334155,
-    165580141,
-    267914296,
-    433494437,
-    701408733,
-    1134903170,
-    1836311903,
-    Integer.MAX_VALUE
-  };
-
-  private final int totalLength;
-  private final ByteString left;
-  private final ByteString right;
-  private final int leftLength;
-  private final int treeDepth;
-
-  /**
-   * Create a new RopeByteString, which can be thought of as a new tree node, by recording
-   * references to the two given strings.
-   *
-   * @param left string on the left of this node, should have {@code size() > 0}
-   * @param right string on the right of this node, should have {@code size() > 0}
-   */
-  private RopeByteString(ByteString left, ByteString right) {
-    this.left = left;
-    this.right = right;
-    leftLength = left.size();
-    totalLength = leftLength + right.size();
-    treeDepth = Math.max(left.getTreeDepth(), right.getTreeDepth()) + 1;
-  }
-
-  /**
-   * Concatenate the given strings while performing various optimizations to slow the growth rate of
-   * tree depth and tree node count. The result is either a {@link
-   * com.google.protobuf.ByteString.LeafByteString} or a {@link RopeByteString} depending on which
-   * optimizations, if any, were applied.
-   *
-   * <p>Small pieces of length less than {@link ByteString#CONCATENATE_BY_COPY_SIZE} may be copied
-   * by value here, as in BAP95. Large pieces are referenced without copy.
-   *
-   * @param left string on the left
-   * @param right string on the right
-   * @return concatenation representing the same sequence as the given strings
-   */
-  static ByteString concatenate(ByteString left, ByteString right) {
-    if (right.size() == 0) {
-      return left;
-    }
-
-    if (left.size() == 0) {
-      return right;
-    }
-
-    final int newLength = left.size() + right.size();
-    if (newLength < ByteString.CONCATENATE_BY_COPY_SIZE) {
-      // Optimization from BAP95: For short (leaves in paper, but just short
-      // here) total length, do a copy of data to a new leaf.
-      return concatenateBytes(left, right);
-    }
-
-    if (left instanceof RopeByteString) {
-      final RopeByteString leftRope = (RopeByteString) left;
-      if (leftRope.right.size() + right.size() < CONCATENATE_BY_COPY_SIZE) {
-        // Optimization from BAP95: As an optimization of the case where the
-        // ByteString is constructed by repeated concatenate, recognize the case
-        // where a short string is concatenated to a left-hand node whose
-        // right-hand branch is short.  In the paper this applies to leaves, but
-        // we just look at the length here. This has the advantage of shedding
-        // references to unneeded data when substrings have been taken.
-        //
-        // When we recognize this case, we do a copy of the data and create a
-        // new parent node so that the depth of the result is the same as the
-        // given left tree.
-        ByteString newRight = concatenateBytes(leftRope.right, right);
-        return new RopeByteString(leftRope.left, newRight);
-      }
-
-      if (leftRope.left.getTreeDepth() > leftRope.right.getTreeDepth()
-          && leftRope.getTreeDepth() > right.getTreeDepth()) {
-        // Typically for concatenate-built strings the left-side is deeper than
-        // the right.  This is our final attempt to concatenate without
-        // increasing the tree depth.  We'll redo the node on the RHS.  This
-        // is yet another optimization for building the string by repeatedly
-        // concatenating on the right.
-        ByteString newRight = new RopeByteString(leftRope.right, right);
-        return new RopeByteString(leftRope.left, newRight);
-      }
-    }
-
-    // Fine, we'll add a node and increase the tree depth--unless we rebalance ;^)
-    int newDepth = Math.max(left.getTreeDepth(), right.getTreeDepth()) + 1;
-    if (newLength >= minLength(newDepth)) {
-      // The tree is shallow enough, so don't rebalance
-      return new RopeByteString(left, right);
-    }
-
-    return new Balancer().balance(left, right);
-  }
-
-  /**
-   * Concatenates two strings by copying data values. This is called in a few cases in order to
-   * reduce the growth of the number of tree nodes.
-   *
-   * @param left string on the left
-   * @param right string on the right
-   * @return string formed by copying data bytes
-   */
-  private static ByteString concatenateBytes(ByteString left, ByteString right) {
-    int leftSize = left.size();
-    int rightSize = right.size();
-    byte[] bytes = new byte[leftSize + rightSize];
-    left.copyTo(bytes, 0, 0, leftSize);
-    right.copyTo(bytes, 0, leftSize, rightSize);
-    return ByteString.wrap(bytes); // Constructor wraps bytes
-  }
-
-  /**
-   * Create a new RopeByteString for testing only while bypassing all the defenses of {@link
-   * #concatenate(ByteString, ByteString)}. This allows testing trees of specific structure. We are
-   * also able to insert empty leaves, though these are dis-allowed, so that we can make sure the
-   * implementation can withstand their presence.
-   *
-   * @param left string on the left of this node
-   * @param right string on the right of this node
-   * @return an unsafe instance for testing only
-   */
-  static RopeByteString newInstanceForTest(ByteString left, ByteString right) {
-    return new RopeByteString(left, right);
-  }
-
-  /**
-   * Returns the minimum length for which a tree of the given depth is considered balanced according
-   * to BAP95, which means the tree is flat-enough with respect to the bounds. Defaults to {@code
-   * Integer.MAX_VALUE} if {@code depth >= minLengthByDepth.length} in order to avoid an {@code
-   * ArrayIndexOutOfBoundsException}.
-   *
-   * @param depth tree depth
-   * @return minimum balanced length
-   */
-  static int minLength(int depth) {
-    if (depth >= minLengthByDepth.length) {
-      return Integer.MAX_VALUE;
-    }
-    return minLengthByDepth[depth];
-  }
-
-  /**
-   * Gets the byte at the given index. Throws {@link ArrayIndexOutOfBoundsException} for
-   * backwards-compatibility reasons although it would more properly be {@link
-   * IndexOutOfBoundsException}.
-   *
-   * @param index index of byte
-   * @return the value
-   * @throws ArrayIndexOutOfBoundsException {@code index} is < 0 or >= size
-   */
-  @Override
-  public byte byteAt(int index) {
-    checkIndex(index, totalLength);
-    return internalByteAt(index);
-  }
-
-  @Override
-  byte internalByteAt(int index) {
-    // Find the relevant piece by recursive descent
-    if (index < leftLength) {
-      return left.internalByteAt(index);
-    }
-
-    return right.internalByteAt(index - leftLength);
-  }
-
-  @Override
-  public int size() {
-    return totalLength;
-  }
-
-  @Override
-  public ByteIterator iterator() {
-    return new AbstractByteIterator() {
-      final PieceIterator pieces = new PieceIterator(RopeByteString.this);
-      ByteIterator current = nextPiece();
-
-      private ByteIterator nextPiece() {
-        // NOTE: PieceIterator is guaranteed to return non-empty pieces, so this method will always
-        // return non-empty iterators (or null)
-        return pieces.hasNext() ? pieces.next().iterator() : null;
-      }
-
-      @Override
-      public boolean hasNext() {
-        return current != null;
-      }
-
-      @Override
-      public byte nextByte() {
-        if (current == null) {
-          throw new NoSuchElementException();
-        }
-        byte b = current.nextByte();
-        if (!current.hasNext()) {
-          current = nextPiece();
-        }
-        return b;
-      }
-    };
-  }
-
-  // =================================================================
-  // Pieces
-
-  @Override
-  protected int getTreeDepth() {
-    return treeDepth;
-  }
-
-  /**
-   * Determines if the tree is balanced according to BAP95, which means the tree is flat-enough with
-   * respect to the bounds. Note that this definition of balanced is one where sub-trees of balanced
-   * trees are not necessarily balanced.
-   *
-   * @return true if the tree is balanced
-   */
-  @Override
-  protected boolean isBalanced() {
-    return totalLength >= minLength(treeDepth);
-  }
-
-  /**
-   * Takes a substring of this one. This involves recursive descent along the left and right edges
-   * of the substring, and referencing any wholly contained segments in between. Any leaf nodes
-   * entirely uninvolved in the substring will not be referenced by the substring.
-   *
-   * <p>Substrings of {@code length < 2} should result in at most a single recursive call chain,
-   * terminating at a leaf node. Thus the result will be a {@link
-   * com.google.protobuf.ByteString.LeafByteString}.
-   *
-   * @param beginIndex start at this index
-   * @param endIndex the last character is the one before this index
-   * @return substring leaf node or tree
-   */
-  @Override
-  public ByteString substring(int beginIndex, int endIndex) {
-    final int length = checkRange(beginIndex, endIndex, totalLength);
-
-    if (length == 0) {
-      // Empty substring
-      return ByteString.EMPTY;
-    }
-
-    if (length == totalLength) {
-      // The whole string
-      return this;
-    }
-
-    // Proper substring
-    if (endIndex <= leftLength) {
-      // Substring on the left
-      return left.substring(beginIndex, endIndex);
-    }
-
-    if (beginIndex >= leftLength) {
-      // Substring on the right
-      return right.substring(beginIndex - leftLength, endIndex - leftLength);
-    }
-
-    // Split substring
-    ByteString leftSub = left.substring(beginIndex);
-    ByteString rightSub = right.substring(0, endIndex - leftLength);
-    // Intentionally not rebalancing, since in many cases these two
-    // substrings will already be less deep than the top-level
-    // RopeByteString we're taking a substring of.
-    return new RopeByteString(leftSub, rightSub);
-  }
-
-  // =================================================================
-  // ByteString -> byte[]
-
-  @Override
-  protected void copyToInternal(
-      byte[] target, int sourceOffset, int targetOffset, int numberToCopy) {
-    if (sourceOffset + numberToCopy <= leftLength) {
-      left.copyToInternal(target, sourceOffset, targetOffset, numberToCopy);
-    } else if (sourceOffset >= leftLength) {
-      right.copyToInternal(target, sourceOffset - leftLength, targetOffset, numberToCopy);
-    } else {
-      int leftLength = this.leftLength - sourceOffset;
-      left.copyToInternal(target, sourceOffset, targetOffset, leftLength);
-      right.copyToInternal(target, 0, targetOffset + leftLength, numberToCopy - leftLength);
-    }
-  }
-
-  @Override
-  public void copyTo(ByteBuffer target) {
-    left.copyTo(target);
-    right.copyTo(target);
-  }
-
-  @Override
-  public ByteBuffer asReadOnlyByteBuffer() {
-    ByteBuffer byteBuffer = ByteBuffer.wrap(toByteArray());
-    return byteBuffer.asReadOnlyBuffer();
-  }
-
-  @Override
-  public List<ByteBuffer> asReadOnlyByteBufferList() {
-    // Walk through the list of LeafByteString's that make up this
-    // rope, and add each one as a read-only ByteBuffer.
-    List<ByteBuffer> result = new ArrayList<ByteBuffer>();
-    PieceIterator pieces = new PieceIterator(this);
-    while (pieces.hasNext()) {
-      LeafByteString byteString = pieces.next();
-      result.add(byteString.asReadOnlyByteBuffer());
-    }
-    return result;
-  }
-
-  @Override
-  public void writeTo(OutputStream outputStream) throws IOException {
-    left.writeTo(outputStream);
-    right.writeTo(outputStream);
-  }
-
-  @Override
-  void writeToInternal(OutputStream out, int sourceOffset, int numberToWrite) throws IOException {
-    if (sourceOffset + numberToWrite <= leftLength) {
-      left.writeToInternal(out, sourceOffset, numberToWrite);
-    } else if (sourceOffset >= leftLength) {
-      right.writeToInternal(out, sourceOffset - leftLength, numberToWrite);
-    } else {
-      int numberToWriteInLeft = leftLength - sourceOffset;
-      left.writeToInternal(out, sourceOffset, numberToWriteInLeft);
-      right.writeToInternal(out, 0, numberToWrite - numberToWriteInLeft);
-    }
-  }
-
-  @Override
-  void writeTo(ByteOutput output) throws IOException {
-    left.writeTo(output);
-    right.writeTo(output);
-  }
-
-  @Override
-  void writeToReverse(ByteOutput output) throws IOException {
-    right.writeToReverse(output);
-    left.writeToReverse(output);
-  }
-
-  @Override
-  protected String toStringInternal(Charset charset) {
-    return new String(toByteArray(), charset);
-  }
-
-  // =================================================================
-  // UTF-8 decoding
-
-  @Override
-  public boolean isValidUtf8() {
-    int leftPartial = left.partialIsValidUtf8(Utf8.COMPLETE, 0, leftLength);
-    int state = right.partialIsValidUtf8(leftPartial, 0, right.size());
-    return state == Utf8.COMPLETE;
-  }
-
-  @Override
-  protected int partialIsValidUtf8(int state, int offset, int length) {
-    int toIndex = offset + length;
-    if (toIndex <= leftLength) {
-      return left.partialIsValidUtf8(state, offset, length);
-    } else if (offset >= leftLength) {
-      return right.partialIsValidUtf8(state, offset - leftLength, length);
-    } else {
-      int leftLength = this.leftLength - offset;
-      int leftPartial = left.partialIsValidUtf8(state, offset, leftLength);
-      return right.partialIsValidUtf8(leftPartial, 0, length - leftLength);
-    }
-  }
-
-  // =================================================================
-  // equals() and hashCode()
-
-  @Override
-  public boolean equals(Object other) {
-    if (other == this) {
-      return true;
-    }
-    if (!(other instanceof ByteString)) {
-      return false;
-    }
-
-    ByteString otherByteString = (ByteString) other;
-    if (totalLength != otherByteString.size()) {
-      return false;
-    }
-    if (totalLength == 0) {
-      return true;
-    }
-
-    // You don't really want to be calling equals on long strings, but since
-    // we cache the hashCode, we effectively cache inequality. We use the cached
-    // hashCode if it's already computed.  It's arguable we should compute the
-    // hashCode here, and if we're going to be testing a bunch of byteStrings,
-    // it might even make sense.
-    int thisHash = peekCachedHashCode();
-    int thatHash = otherByteString.peekCachedHashCode();
-    if (thisHash != 0 && thatHash != 0 && thisHash != thatHash) {
-      return false;
-    }
-
-    return equalsFragments(otherByteString);
-  }
-
-  /**
-   * Determines if this string is equal to another of the same length by iterating over the leaf
-   * nodes. On each step of the iteration, the overlapping segments of the leaves are compared.
-   *
-   * @param other string of the same length as this one
-   * @return true if the values of this string equals the value of the given one
-   */
-  private boolean equalsFragments(ByteString other) {
-    int thisOffset = 0;
-    Iterator<LeafByteString> thisIter = new PieceIterator(this);
-    LeafByteString thisString = thisIter.next();
-
-    int thatOffset = 0;
-    Iterator<LeafByteString> thatIter = new PieceIterator(other);
-    LeafByteString thatString = thatIter.next();
-
-    int pos = 0;
-    while (true) {
-      int thisRemaining = thisString.size() - thisOffset;
-      int thatRemaining = thatString.size() - thatOffset;
-      int bytesToCompare = Math.min(thisRemaining, thatRemaining);
-
-      // At least one of the offsets will be zero
-      boolean stillEqual =
-          (thisOffset == 0)
-              ? thisString.equalsRange(thatString, thatOffset, bytesToCompare)
-              : thatString.equalsRange(thisString, thisOffset, bytesToCompare);
-      if (!stillEqual) {
-        return false;
-      }
-
-      pos += bytesToCompare;
-      if (pos >= totalLength) {
-        if (pos == totalLength) {
-          return true;
-        }
-        throw new IllegalStateException();
-      }
-      // We always get to the end of at least one of the pieces
-      if (bytesToCompare == thisRemaining) { // If reached end of this
-        thisOffset = 0;
-        thisString = thisIter.next();
-      } else {
-        thisOffset += bytesToCompare;
-      }
-      if (bytesToCompare == thatRemaining) { // If reached end of that
-        thatOffset = 0;
-        thatString = thatIter.next();
-      } else {
-        thatOffset += bytesToCompare;
-      }
-    }
-  }
-
-  @Override
-  protected int partialHash(int h, int offset, int length) {
-    int toIndex = offset + length;
-    if (toIndex <= leftLength) {
-      return left.partialHash(h, offset, length);
-    } else if (offset >= leftLength) {
-      return right.partialHash(h, offset - leftLength, length);
-    } else {
-      int leftLength = this.leftLength - offset;
-      int leftPartial = left.partialHash(h, offset, leftLength);
-      return right.partialHash(leftPartial, 0, length - leftLength);
-    }
-  }
-
-  // =================================================================
-  // Input stream
-
-  @Override
-  public CodedInputStream newCodedInput() {
-    // Passing along direct references to internal ByteBuffers can support more efficient parsing
-    // via aliasing in CodedInputStream for users who wish to use it.
-    //
-    // Otherwise we force data copies, both in copying as an input stream and in buffering in the
-    // CodedInputSteam.
-    return CodedInputStream.newInstance(asReadOnlyByteBufferList(), /* bufferIsImmutable= */ true);
-  }
-
-  @Override
-  public InputStream newInput() {
-    return new RopeInputStream();
-  }
-
-  /**
-   * This class implements the balancing algorithm of BAP95. In the paper the authors use an array
-   * to keep track of pieces, while here we use a stack. The tree is balanced by traversing subtrees
-   * in left to right order, and the stack always contains the part of the string we've traversed so
-   * far.
-   *
-   * <p>One surprising aspect of the algorithm is the result of balancing is not necessarily
-   * balanced, though it is nearly balanced. For details, see BAP95.
-   */
-  private static class Balancer {
-    // Stack containing the part of the string, starting from the left, that
-    // we've already traversed.  The final string should be the equivalent of
-    // concatenating the strings on the stack from bottom to top.
-    private final ArrayDeque<ByteString> prefixesStack = new ArrayDeque<>();
-
-    private ByteString balance(ByteString left, ByteString right) {
-      doBalance(left);
-      doBalance(right);
-
-      // Sweep stack to gather the result
-      ByteString partialString = prefixesStack.pop();
-      while (!prefixesStack.isEmpty()) {
-        ByteString newLeft = prefixesStack.pop();
-        partialString = new RopeByteString(newLeft, partialString);
-      }
-      // We should end up with a RopeByteString since at a minimum we will
-      // create one from concatenating left and right
-      return partialString;
-    }
-
-    private void doBalance(ByteString root) {
-      // BAP95: Insert balanced subtrees whole. This means the result might not
-      // be balanced, leading to repeated rebalancings on concatenate. However,
-      // these rebalancings are shallow due to ignoring balanced subtrees, and
-      // relatively few calls to insert() result.
-      if (root.isBalanced()) {
-        insert(root);
-      } else if (root instanceof RopeByteString) {
-        RopeByteString rbs = (RopeByteString) root;
-        doBalance(rbs.left);
-        doBalance(rbs.right);
-      } else {
-        throw new IllegalArgumentException(
-            "Has a new type of ByteString been created? Found " + root.getClass());
-      }
-    }
-
-    /**
-     * Push a string on the balance stack (BAP95). BAP95 uses an array and calls the elements in the
-     * array 'bins'. We instead use a stack, so the 'bins' of lengths are represented by differences
-     * between the elements of minLengthByDepth.
-     *
-     * <p>If the length bin for our string, and all shorter length bins, are empty, we just push it
-     * on the stack. Otherwise, we need to start concatenating, putting the given string in the
-     * "middle" and continuing until we land in an empty length bin that matches the length of our
-     * concatenation.
-     *
-     * @param byteString string to place on the balance stack
-     */
-    private void insert(ByteString byteString) {
-      int depthBin = getDepthBinForLength(byteString.size());
-      int binEnd = minLength(depthBin + 1);
-
-      // BAP95: Concatenate all trees occupying bins representing the length of
-      // our new piece or of shorter pieces, to the extent that is possible.
-      // The goal is to clear the bin which our piece belongs in, but that may
-      // not be entirely possible if there aren't enough longer bins occupied.
-      if (prefixesStack.isEmpty() || prefixesStack.peek().size() >= binEnd) {
-        prefixesStack.push(byteString);
-      } else {
-        int binStart = minLength(depthBin);
-
-        // Concatenate the subtrees of shorter length
-        ByteString newTree = prefixesStack.pop();
-        while (!prefixesStack.isEmpty() && prefixesStack.peek().size() < binStart) {
-          ByteString left = prefixesStack.pop();
-          newTree = new RopeByteString(left, newTree);
-        }
-
-        // Concatenate the given string
-        newTree = new RopeByteString(newTree, byteString);
-
-        // Continue concatenating until we land in an empty bin
-        while (!prefixesStack.isEmpty()) {
-          depthBin = getDepthBinForLength(newTree.size());
-          binEnd = minLength(depthBin + 1);
-          if (prefixesStack.peek().size() < binEnd) {
-            ByteString left = prefixesStack.pop();
-            newTree = new RopeByteString(left, newTree);
-          } else {
-            break;
-          }
-        }
-        prefixesStack.push(newTree);
-      }
-    }
-
-    private int getDepthBinForLength(int length) {
-      int depth = Arrays.binarySearch(minLengthByDepth, length);
-      if (depth < 0) {
-        // It wasn't an exact match, so convert to the index of the containing
-        // fragment, which is one less even than the insertion point.
-        int insertionPoint = -(depth + 1);
-        depth = insertionPoint - 1;
-      }
-
-      return depth;
-    }
-  }
-
-  /**
-   * This class is a continuable tree traversal, which keeps the state information which would exist
-   * on the stack in a recursive traversal instead on a stack of "Bread Crumbs". The maximum depth
-   * of the stack in this iterator is the same as the depth of the tree being traversed.
-   *
-   * <p>This iterator is used to implement {@link RopeByteString#equalsFragments(ByteString)}.
-   */
-  private static final class PieceIterator implements Iterator<LeafByteString> {
-    private final ArrayDeque<RopeByteString> breadCrumbs;
-    private LeafByteString next;
-
-    private PieceIterator(ByteString root) {
-      if (root instanceof RopeByteString) {
-        RopeByteString rbs = (RopeByteString) root;
-        breadCrumbs = new ArrayDeque<>(rbs.getTreeDepth());
-        breadCrumbs.push(rbs);
-        next = getLeafByLeft(rbs.left);
-      } else {
-        breadCrumbs = null;
-        next = (LeafByteString) root;
-      }
-    }
-
-    private LeafByteString getLeafByLeft(ByteString root) {
-      ByteString pos = root;
-      while (pos instanceof RopeByteString) {
-        RopeByteString rbs = (RopeByteString) pos;
-        breadCrumbs.push(rbs);
-        pos = rbs.left;
-      }
-      return (LeafByteString) pos;
-    }
-
-    private LeafByteString getNextNonEmptyLeaf() {
-      while (true) {
-        // Almost always, we go through this loop exactly once.  However, if
-        // we discover an empty string in the rope, we toss it and try again.
-        if (breadCrumbs == null || breadCrumbs.isEmpty()) {
-          return null;
-        } else {
-          LeafByteString result = getLeafByLeft(breadCrumbs.pop().right);
-          if (!result.isEmpty()) {
-            return result;
-          }
-        }
-      }
-    }
-
-    @Override
-    public boolean hasNext() {
-      return next != null;
-    }
-
-    /**
-     * Returns the next item and advances one {@link com.google.protobuf.ByteString.LeafByteString}.
-     *
-     * @return next non-empty LeafByteString or {@code null}
-     */
-    @Override
-    public LeafByteString next() {
-      if (next == null) {
-        throw new NoSuchElementException();
-      }
-      LeafByteString result = next;
-      next = getNextNonEmptyLeaf();
-      return result;
-    }
-
-    @Override
-    public void remove() {
-      throw new UnsupportedOperationException();
-    }
-  }
-
-  // =================================================================
-  // Serializable
-
-  private static final long serialVersionUID = 1L;
-
-  Object writeReplace() {
-    return ByteString.wrap(toByteArray());
-  }
-
-  private void readObject(@SuppressWarnings("unused") ObjectInputStream in) throws IOException {
-    throw new InvalidObjectException("RopeByteStream instances are not to be serialized directly");
-  }
-
-  /** This class is the {@link RopeByteString} equivalent for {@link ByteArrayInputStream}. */
-  private class RopeInputStream extends InputStream {
-    // Iterates through the pieces of the rope
-    private PieceIterator pieceIterator;
-    // The current piece
-    private LeafByteString currentPiece;
-    // The size of the current piece
-    private int currentPieceSize;
-    // The index of the next byte to read in the current piece
-    private int currentPieceIndex;
-    // The offset of the start of the current piece in the rope byte string
-    private int currentPieceOffsetInRope;
-    // Offset in the buffer at which user called mark();
-    private int mark;
-
-    public RopeInputStream() {
-      initialize();
-    }
-
-    /**
-     * Reads up to {@code len} bytes of data into array {@code b}.
-     *
-     * <p>Note that {@link InputStream#read(byte[], int, int)} and {@link
-     * ByteArrayInputStream#read(byte[], int, int)} behave inconsistently when reading 0 bytes at
-     * EOF; the interface defines the return value to be 0 and the latter returns -1. We use the
-     * latter behavior so that all ByteString streams are consistent.
-     *
-     * @return -1 if at EOF, otherwise the actual number of bytes read.
-     */
-    @Override
-    public int read(byte[] b, int offset, int length) {
-      if (b == null) {
-        throw new NullPointerException();
-      } else if (offset < 0 || length < 0 || length > b.length - offset) {
-        throw new IndexOutOfBoundsException();
-      }
-      int bytesRead = readSkipInternal(b, offset, length);
-      if (bytesRead == 0 && (length > 0 || availableInternal() == 0)) {
-        // Modeling ByteArrayInputStream.read(byte[], int, int) behavior noted above:
-        // It's ok to read 0 bytes on purpose (length == 0) from a stream that isn't at EOF.
-        // It's not ok to try to read bytes (even 0 bytes) from a stream that is at EOF.
-        return -1;
-      } else {
-        return bytesRead;
-      }
-    }
-
-    @Override
-    public long skip(long length) {
-      if (length < 0) {
-        throw new IndexOutOfBoundsException();
-      } else if (length > Integer.MAX_VALUE) {
-        length = Integer.MAX_VALUE;
-      }
-      return readSkipInternal(null, 0, (int) length);
-    }
-
-    /**
-     * Internal implementation of read and skip. If b != null, then read the next {@code length}
-     * bytes into the buffer {@code b} at offset {@code offset}. If b == null, then skip the next
-     * {@code length} bytes.
-     *
-     * <p>This method assumes that all error checking has already happened.
-     *
-     * <p>Returns the actual number of bytes read or skipped.
-     */
-    private int readSkipInternal(byte[] b, int offset, int length) {
-      int bytesRemaining = length;
-      while (bytesRemaining > 0) {
-        advanceIfCurrentPieceFullyRead();
-        if (currentPiece == null) {
-          break;
-        } else {
-          // Copy the bytes from this piece.
-          int currentPieceRemaining = currentPieceSize - currentPieceIndex;
-          int count = Math.min(currentPieceRemaining, bytesRemaining);
-          if (b != null) {
-            currentPiece.copyTo(b, currentPieceIndex, offset, count);
-            offset += count;
-          }
-          currentPieceIndex += count;
-          bytesRemaining -= count;
-        }
-      }
-      // Return the number of bytes read.
-      return length - bytesRemaining;
-    }
-
-    @Override
-    public int read() throws IOException {
-      advanceIfCurrentPieceFullyRead();
-      if (currentPiece == null) {
-        return -1;
-      } else {
-        return currentPiece.byteAt(currentPieceIndex++) & 0xFF;
-      }
-    }
-
-    @Override
-    public int available() throws IOException {
-      return availableInternal();
-    }
-
-    @Override
-    public boolean markSupported() {
-      return true;
-    }
-
-    @Override
-    public void mark(int readAheadLimit) {
-      // Set the mark to our position in the byte string
-      mark = currentPieceOffsetInRope + currentPieceIndex;
-    }
-
-    @Override
-    public synchronized void reset() {
-      // Just reinitialize and skip the specified number of bytes.
-      initialize();
-      readSkipInternal(null, 0, mark);
-    }
-
-    /** Common initialization code used by both the constructor and reset() */
-    private void initialize() {
-      pieceIterator = new PieceIterator(RopeByteString.this);
-      currentPiece = pieceIterator.next();
-      currentPieceSize = currentPiece.size();
-      currentPieceIndex = 0;
-      currentPieceOffsetInRope = 0;
-    }
-
-    /**
-     * Skips to the next piece if we have read all the data in the current piece. Sets currentPiece
-     * to null if we have reached the end of the input.
-     */
-    private void advanceIfCurrentPieceFullyRead() {
-      if (currentPiece != null && currentPieceIndex == currentPieceSize) {
-        // Generally, we can only go through this loop at most once, since
-        // empty strings can't end up in a rope.  But better to test.
-        currentPieceOffsetInRope += currentPieceSize;
-        currentPieceIndex = 0;
-        if (pieceIterator.hasNext()) {
-          currentPiece = pieceIterator.next();
-          currentPieceSize = currentPiece.size();
-        } else {
-          currentPiece = null;
-          currentPieceSize = 0;
-        }
-      }
-    }
-
-    /** Computes the number of bytes still available to read. */
-    private int availableInternal() {
-      int bytesRead = currentPieceOffsetInRope + currentPieceIndex;
-      return RopeByteString.this.size() - bytesRead;
-    }
-  }
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/RpcCallback.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/RpcCallback.java
deleted file mode 100644
index 51a34b6..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/RpcCallback.java
+++ /dev/null
@@ -1,46 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-/**
- * Interface for an RPC callback, normally called when an RPC completes. {@code ParameterType} is
- * normally the method's response message type.
- *
- * <p>Starting with version 2.3.0, RPC implementations should not try to build on this, but should
- * instead provide code generator plugins which generate code specific to the particular RPC
- * implementation. This way the generated code can be more appropriate for the implementation in use
- * and can avoid unnecessary layers of indirection.
- *
- * @author kenton@google.com Kenton Varda
- */
-public interface RpcCallback<ParameterType> {
-  void run(ParameterType parameter);
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/RpcChannel.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/RpcChannel.java
deleted file mode 100644
index 13b5ec1..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/RpcChannel.java
+++ /dev/null
@@ -1,68 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-/**
- * Abstract interface for an RPC channel. An {@code RpcChannel} represents a communication line to a
- * {@link Service} which can be used to call that {@link Service}'s methods. The {@link Service} may
- * be running on another machine. Normally, you should not call an {@code RpcChannel} directly, but
- * instead construct a stub {@link Service} wrapping it. Example:
- *
- * <pre>
- *   RpcChannel channel = rpcImpl.newChannel("remotehost.example.com:1234");
- *   RpcController controller = rpcImpl.newController();
- *   MyService service = MyService.newStub(channel);
- *   service.myMethod(controller, request, callback);
- * </pre>
- *
- * <p>Starting with version 2.3.0, RPC implementations should not try to build on this, but should
- * instead provide code generator plugins which generate code specific to the particular RPC
- * implementation. This way the generated code can be more appropriate for the implementation in use
- * and can avoid unnecessary layers of indirection.
- *
- * @author kenton@google.com Kenton Varda
- */
-public interface RpcChannel {
-  /**
-   * Call the given method of the remote service. This method is similar to {@code
-   * Service.callMethod()} with one important difference: the caller decides the types of the {@code
-   * Message} objects, not the callee. The request may be of any type as long as {@code
-   * request.getDescriptor() == method.getInputType()}. The response passed to the callback will be
-   * of the same type as {@code responsePrototype} (which must have {@code getDescriptor() ==
-   * method.getOutputType()}).
-   */
-  void callMethod(
-      Descriptors.MethodDescriptor method,
-      RpcController controller,
-      Message request,
-      Message responsePrototype,
-      RpcCallback<Message> done);
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/RpcController.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/RpcController.java
deleted file mode 100644
index 073f27a..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/RpcController.java
+++ /dev/null
@@ -1,108 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-/**
- * An {@code RpcController} mediates a single method call. The primary purpose of the controller is
- * to provide a way to manipulate settings specific to the RPC implementation and to find out about
- * RPC-level errors.
- *
- * <p>Starting with version 2.3.0, RPC implementations should not try to build on this, but should
- * instead provide code generator plugins which generate code specific to the particular RPC
- * implementation. This way the generated code can be more appropriate for the implementation in use
- * and can avoid unnecessary layers of indirection.
- *
- * <p>The methods provided by the {@code RpcController} interface are intended to be a "least common
- * denominator" set of features which we expect all implementations to support. Specific
- * implementations may provide more advanced features (e.g. deadline propagation).
- *
- * @author kenton@google.com Kenton Varda
- */
-public interface RpcController {
-  // -----------------------------------------------------------------
-  // These calls may be made from the client side only.  Their results
-  // are undefined on the server side (may throw RuntimeExceptions).
-
-  /**
-   * Resets the RpcController to its initial state so that it may be reused in a new call. This can
-   * be called from the client side only. It must not be called while an RPC is in progress.
-   */
-  void reset();
-
-  /**
-   * After a call has finished, returns true if the call failed. The possible reasons for failure
-   * depend on the RPC implementation. {@code failed()} most only be called on the client side, and
-   * must not be called before a call has finished.
-   */
-  boolean failed();
-
-  /** If {@code failed()} is {@code true}, returns a human-readable description of the error. */
-  String errorText();
-
-  /**
-   * Advises the RPC system that the caller desires that the RPC call be canceled. The RPC system
-   * may cancel it immediately, may wait awhile and then cancel it, or may not even cancel the call
-   * at all. If the call is canceled, the "done" callback will still be called and the RpcController
-   * will indicate that the call failed at that time.
-   */
-  void startCancel();
-
-  // -----------------------------------------------------------------
-  // These calls may be made from the server side only.  Their results
-  // are undefined on the client side (may throw RuntimeExceptions).
-
-  /**
-   * Causes {@code failed()} to return true on the client side. {@code reason} will be incorporated
-   * into the message returned by {@code errorText()}. If you find you need to return
-   * machine-readable information about failures, you should incorporate it into your response
-   * protocol buffer and should NOT call {@code setFailed()}.
-   */
-  void setFailed(String reason);
-
-  /**
-   * If {@code true}, indicates that the client canceled the RPC, so the server may as well give up
-   * on replying to it. This method must be called on the server side only. The server should still
-   * call the final "done" callback.
-   */
-  boolean isCanceled();
-
-  /**
-   * Asks that the given callback be called when the RPC is canceled. The parameter passed to the
-   * callback will always be {@code null}. The callback will always be called exactly once. If the
-   * RPC completes without being canceled, the callback will be called after completion. If the RPC
-   * has already been canceled when NotifyOnCancel() is called, the callback will be called
-   * immediately.
-   *
-   * <p>{@code notifyOnCancel()} must be called no more than once per request. It must be called on
-   * the server side only.
-   */
-  void notifyOnCancel(RpcCallback<Object> callback);
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/RpcUtil.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/RpcUtil.java
deleted file mode 100644
index 7bd056a..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/RpcUtil.java
+++ /dev/null
@@ -1,126 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-/**
- * Grab-bag of utility functions useful when dealing with RPCs.
- *
- * @author kenton@google.com Kenton Varda
- */
-public final class RpcUtil {
-  private RpcUtil() {}
-
-  /**
-   * Take an {@code RpcCallback<Message>} and convert it to an {@code RpcCallback} accepting a
-   * specific message type. This is always type-safe (parameter type contravariance).
-   */
-  @SuppressWarnings("unchecked")
-  public static <Type extends Message> RpcCallback<Type> specializeCallback(
-      final RpcCallback<Message> originalCallback) {
-    return (RpcCallback<Type>) originalCallback;
-    // The above cast works, but only due to technical details of the Java
-    // implementation.  A more theoretically correct -- but less efficient --
-    // implementation would be as follows:
-    //   return new RpcCallback<Type>() {
-    //     public void run(Type parameter) {
-    //       originalCallback.run(parameter);
-    //     }
-    //   };
-  }
-
-  /**
-   * Take an {@code RpcCallback} accepting a specific message type and convert it to an {@code
-   * RpcCallback<Message>}. The generalized callback will accept any message object which has the
-   * same descriptor, and will convert it to the correct class before calling the original callback.
-   * However, if the generalized callback is given a message with a different descriptor, an
-   * exception will be thrown.
-   */
-  public static <Type extends Message> RpcCallback<Message> generalizeCallback(
-      final RpcCallback<Type> originalCallback,
-      final Class<Type> originalClass,
-      final Type defaultInstance) {
-    return new RpcCallback<Message>() {
-      @Override
-      public void run(final Message parameter) {
-        Type typedParameter;
-        try {
-          typedParameter = originalClass.cast(parameter);
-        } catch (ClassCastException ignored) {
-          typedParameter = copyAsType(defaultInstance, parameter);
-        }
-        originalCallback.run(typedParameter);
-      }
-    };
-  }
-
-  /**
-   * Creates a new message of type "Type" which is a copy of "source". "source" must have the same
-   * descriptor but may be a different class (e.g. DynamicMessage).
-   */
-  @SuppressWarnings("unchecked")
-  private static <Type extends Message> Type copyAsType(
-      final Type typeDefaultInstance, final Message source) {
-    return (Type) typeDefaultInstance.newBuilderForType().mergeFrom(source).build();
-  }
-
-  /**
-   * Creates a callback which can only be called once. This may be useful for security, when passing
-   * a callback to untrusted code: most callbacks do not expect to be called more than once, so
-   * doing so may expose bugs if it is not prevented.
-   */
-  public static <ParameterType> RpcCallback<ParameterType> newOneTimeCallback(
-      final RpcCallback<ParameterType> originalCallback) {
-    return new RpcCallback<ParameterType>() {
-      private boolean alreadyCalled = false;
-
-      @Override
-      public void run(final ParameterType parameter) {
-        synchronized (this) {
-          if (alreadyCalled) {
-            throw new AlreadyCalledException();
-          }
-          alreadyCalled = true;
-        }
-
-        originalCallback.run(parameter);
-      }
-    };
-  }
-
-  /** Exception thrown when a one-time callback is called more than once. */
-  public static final class AlreadyCalledException extends RuntimeException {
-    private static final long serialVersionUID = 5469741279507848266L;
-
-    public AlreadyCalledException() {
-      super("This RpcCallback was already called and cannot be called multiple times.");
-    }
-  }
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/Schema.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/Schema.java
deleted file mode 100644
index efb3c1e..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/Schema.java
+++ /dev/null
@@ -1,86 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import com.google.protobuf.ArrayDecoders.Registers;
-import java.io.IOException;
-
-/**
- * A runtime schema for a single protobuf message. A schema provides operations on message instances
- * such as serialization/deserialization.
- */
-@ExperimentalApi
-@CheckReturnValue
-interface Schema<T> {
-  /** Writes the given message to the target {@link Writer}. */
-  void writeTo(T message, Writer writer) throws IOException;
-
-  /**
-   * Reads fields from the given {@link Reader} and merges them into the message. It doesn't make
-   * the message immutable after parsing is done. To make the message immutable, use {@link
-   * #makeImmutable}.
-   */
-  void mergeFrom(T message, Reader reader, ExtensionRegistryLite extensionRegistry)
-      throws IOException;
-
-  /**
-   * Like the above but parses from a byte[] without extensions. Entry point of fast path. Note that
-   * this method may throw IndexOutOfBoundsException if the input data is not valid protobuf wire
-   * format. Protobuf public API methods should catch and convert that exception to
-   * InvalidProtocolBufferException.
-   */
-  void mergeFrom(T message, byte[] data, int position, int limit, Registers registers)
-      throws IOException;
-
-  /** Marks repeated/map/extension/unknown fields as immutable. */
-  void makeImmutable(T message);
-
-  /** Checks whether all required fields are set. */
-  boolean isInitialized(T message);
-
-  /** Creates a new instance of the message class. */
-  T newInstance();
-
-  /** Determine of the two messages are equal. */
-  boolean equals(T message, T other);
-
-  /** Compute a hashCode for the message. */
-  int hashCode(T message);
-
-  /**
-   * Merge values from {@code other} into {@code message}. This method doesn't make the message
-   * immutable. To make the message immutable after merging, use {@link #makeImmutable}.
-   */
-  void mergeFrom(T message, T other);
-
-  /** Compute the serialized size of the message. */
-  int getSerializedSize(T message);
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/SchemaFactory.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/SchemaFactory.java
deleted file mode 100644
index 33d9c9d..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/SchemaFactory.java
+++ /dev/null
@@ -1,39 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-/** A factory that manufactures {@link Schema} instances for protobuf messages. */
-@ExperimentalApi
-@CheckReturnValue
-interface SchemaFactory {
-  /** Creates a schema instance for the given protobuf message type. */
-  <T> Schema<T> createSchema(Class<T> messageType);
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/SchemaUtil.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/SchemaUtil.java
deleted file mode 100644
index dda831f..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/SchemaUtil.java
+++ /dev/null
@@ -1,1013 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import com.google.protobuf.FieldSet.FieldDescriptorLite;
-import com.google.protobuf.Internal.EnumLiteMap;
-import com.google.protobuf.Internal.EnumVerifier;
-import java.io.IOException;
-import java.lang.reflect.Field;
-import java.util.Iterator;
-import java.util.List;
-import java.util.RandomAccess;
-
-/** Helper methods used by schemas. */
-@ExperimentalApi
-@CheckReturnValue
-final class SchemaUtil {
-  private static final Class<?> GENERATED_MESSAGE_CLASS = getGeneratedMessageClass();
-  private static final UnknownFieldSchema<?, ?> PROTO2_UNKNOWN_FIELD_SET_SCHEMA =
-      getUnknownFieldSetSchema(false);
-  private static final UnknownFieldSchema<?, ?> PROTO3_UNKNOWN_FIELD_SET_SCHEMA =
-      getUnknownFieldSetSchema(true);
-  private static final UnknownFieldSchema<?, ?> UNKNOWN_FIELD_SET_LITE_SCHEMA =
-      new UnknownFieldSetLiteSchema();
-
-  private static final int DEFAULT_LOOK_UP_START_NUMBER = 40;
-
-  private SchemaUtil() {}
-
-  /**
-   * Requires that the given message extend {@link com.google.protobuf.GeneratedMessageV3} or {@link
-   * GeneratedMessageLite}.
-   */
-  public static void requireGeneratedMessage(Class<?> messageType) {
-    // TODO(b/248560713) decide if we're keeping support for Full in schema classes and handle this
-    // better.
-    if (!GeneratedMessageLite.class.isAssignableFrom(messageType)
-        && GENERATED_MESSAGE_CLASS != null
-        && !GENERATED_MESSAGE_CLASS.isAssignableFrom(messageType)) {
-      throw new IllegalArgumentException(
-          "Message classes must extend GeneratedMessageV3 or GeneratedMessageLite");
-    }
-  }
-
-  public static void writeDouble(int fieldNumber, double value, Writer writer) throws IOException {
-    if (Double.doubleToRawLongBits(value) != 0) {
-      writer.writeDouble(fieldNumber, value);
-    }
-  }
-
-  public static void writeFloat(int fieldNumber, float value, Writer writer) throws IOException {
-    if (Float.floatToRawIntBits(value) != 0) {
-      writer.writeFloat(fieldNumber, value);
-    }
-  }
-
-  public static void writeInt64(int fieldNumber, long value, Writer writer) throws IOException {
-    if (value != 0) {
-      writer.writeInt64(fieldNumber, value);
-    }
-  }
-
-  public static void writeUInt64(int fieldNumber, long value, Writer writer) throws IOException {
-    if (value != 0) {
-      writer.writeUInt64(fieldNumber, value);
-    }
-  }
-
-  public static void writeSInt64(int fieldNumber, long value, Writer writer) throws IOException {
-    if (value != 0) {
-      writer.writeSInt64(fieldNumber, value);
-    }
-  }
-
-  public static void writeFixed64(int fieldNumber, long value, Writer writer) throws IOException {
-    if (value != 0) {
-      writer.writeFixed64(fieldNumber, value);
-    }
-  }
-
-  public static void writeSFixed64(int fieldNumber, long value, Writer writer) throws IOException {
-    if (value != 0) {
-      writer.writeSFixed64(fieldNumber, value);
-    }
-  }
-
-  public static void writeInt32(int fieldNumber, int value, Writer writer) throws IOException {
-    if (value != 0) {
-      writer.writeInt32(fieldNumber, value);
-    }
-  }
-
-  public static void writeUInt32(int fieldNumber, int value, Writer writer) throws IOException {
-    if (value != 0) {
-      writer.writeUInt32(fieldNumber, value);
-    }
-  }
-
-  public static void writeSInt32(int fieldNumber, int value, Writer writer) throws IOException {
-    if (value != 0) {
-      writer.writeSInt32(fieldNumber, value);
-    }
-  }
-
-  public static void writeFixed32(int fieldNumber, int value, Writer writer) throws IOException {
-    if (value != 0) {
-      writer.writeFixed32(fieldNumber, value);
-    }
-  }
-
-  public static void writeSFixed32(int fieldNumber, int value, Writer writer) throws IOException {
-    if (value != 0) {
-      writer.writeSFixed32(fieldNumber, value);
-    }
-  }
-
-  public static void writeEnum(int fieldNumber, int value, Writer writer) throws IOException {
-    if (value != 0) {
-      writer.writeEnum(fieldNumber, value);
-    }
-  }
-
-  public static void writeBool(int fieldNumber, boolean value, Writer writer) throws IOException {
-    if (value) {
-      writer.writeBool(fieldNumber, true);
-    }
-  }
-
-  public static void writeString(int fieldNumber, Object value, Writer writer) throws IOException {
-    if (value instanceof String) {
-      writeStringInternal(fieldNumber, (String) value, writer);
-    } else {
-      writeBytes(fieldNumber, (ByteString) value, writer);
-    }
-  }
-
-  private static void writeStringInternal(int fieldNumber, String value, Writer writer)
-      throws IOException {
-    if (value != null && !value.isEmpty()) {
-      writer.writeString(fieldNumber, value);
-    }
-  }
-
-  public static void writeBytes(int fieldNumber, ByteString value, Writer writer)
-      throws IOException {
-    if (value != null && !value.isEmpty()) {
-      writer.writeBytes(fieldNumber, value);
-    }
-  }
-
-  public static void writeMessage(int fieldNumber, Object value, Writer writer) throws IOException {
-    if (value != null) {
-      writer.writeMessage(fieldNumber, value);
-    }
-  }
-
-  public static void writeDoubleList(
-      int fieldNumber, List<Double> value, Writer writer, boolean packed) throws IOException {
-    if (value != null && !value.isEmpty()) {
-      writer.writeDoubleList(fieldNumber, value, packed);
-    }
-  }
-
-  public static void writeFloatList(
-      int fieldNumber, List<Float> value, Writer writer, boolean packed) throws IOException {
-    if (value != null && !value.isEmpty()) {
-      writer.writeFloatList(fieldNumber, value, packed);
-    }
-  }
-
-  public static void writeInt64List(
-      int fieldNumber, List<Long> value, Writer writer, boolean packed) throws IOException {
-    if (value != null && !value.isEmpty()) {
-      writer.writeInt64List(fieldNumber, value, packed);
-    }
-  }
-
-  public static void writeUInt64List(
-      int fieldNumber, List<Long> value, Writer writer, boolean packed) throws IOException {
-    if (value != null && !value.isEmpty()) {
-      writer.writeUInt64List(fieldNumber, value, packed);
-    }
-  }
-
-  public static void writeSInt64List(
-      int fieldNumber, List<Long> value, Writer writer, boolean packed) throws IOException {
-    if (value != null && !value.isEmpty()) {
-      writer.writeSInt64List(fieldNumber, value, packed);
-    }
-  }
-
-  public static void writeFixed64List(
-      int fieldNumber, List<Long> value, Writer writer, boolean packed) throws IOException {
-    if (value != null && !value.isEmpty()) {
-      writer.writeFixed64List(fieldNumber, value, packed);
-    }
-  }
-
-  public static void writeSFixed64List(
-      int fieldNumber, List<Long> value, Writer writer, boolean packed) throws IOException {
-    if (value != null && !value.isEmpty()) {
-      writer.writeSFixed64List(fieldNumber, value, packed);
-    }
-  }
-
-  public static void writeInt32List(
-      int fieldNumber, List<Integer> value, Writer writer, boolean packed) throws IOException {
-    if (value != null && !value.isEmpty()) {
-      writer.writeInt32List(fieldNumber, value, packed);
-    }
-  }
-
-  public static void writeUInt32List(
-      int fieldNumber, List<Integer> value, Writer writer, boolean packed) throws IOException {
-    if (value != null && !value.isEmpty()) {
-      writer.writeUInt32List(fieldNumber, value, packed);
-    }
-  }
-
-  public static void writeSInt32List(
-      int fieldNumber, List<Integer> value, Writer writer, boolean packed) throws IOException {
-    if (value != null && !value.isEmpty()) {
-      writer.writeSInt32List(fieldNumber, value, packed);
-    }
-  }
-
-  public static void writeFixed32List(
-      int fieldNumber, List<Integer> value, Writer writer, boolean packed) throws IOException {
-    if (value != null && !value.isEmpty()) {
-      writer.writeFixed32List(fieldNumber, value, packed);
-    }
-  }
-
-  public static void writeSFixed32List(
-      int fieldNumber, List<Integer> value, Writer writer, boolean packed) throws IOException {
-    if (value != null && !value.isEmpty()) {
-      writer.writeSFixed32List(fieldNumber, value, packed);
-    }
-  }
-
-  public static void writeEnumList(
-      int fieldNumber, List<Integer> value, Writer writer, boolean packed) throws IOException {
-    if (value != null && !value.isEmpty()) {
-      writer.writeEnumList(fieldNumber, value, packed);
-    }
-  }
-
-  public static void writeBoolList(
-      int fieldNumber, List<Boolean> value, Writer writer, boolean packed) throws IOException {
-    if (value != null && !value.isEmpty()) {
-      writer.writeBoolList(fieldNumber, value, packed);
-    }
-  }
-
-  public static void writeStringList(int fieldNumber, List<String> value, Writer writer)
-      throws IOException {
-    if (value != null && !value.isEmpty()) {
-      writer.writeStringList(fieldNumber, value);
-    }
-  }
-
-  public static void writeBytesList(int fieldNumber, List<ByteString> value, Writer writer)
-      throws IOException {
-    if (value != null && !value.isEmpty()) {
-      writer.writeBytesList(fieldNumber, value);
-    }
-  }
-
-  public static void writeMessageList(int fieldNumber, List<?> value, Writer writer)
-      throws IOException {
-    if (value != null && !value.isEmpty()) {
-      writer.writeMessageList(fieldNumber, value);
-    }
-  }
-
-  public static void writeMessageList(int fieldNumber, List<?> value, Writer writer, Schema schema)
-      throws IOException {
-    if (value != null && !value.isEmpty()) {
-      writer.writeMessageList(fieldNumber, value, schema);
-    }
-  }
-
-  public static void writeLazyFieldList(int fieldNumber, List<?> value, Writer writer)
-      throws IOException {
-    if (value != null && !value.isEmpty()) {
-      for (Object item : value) {
-        ((LazyFieldLite) item).writeTo(writer, fieldNumber);
-      }
-    }
-  }
-
-  public static void writeGroupList(int fieldNumber, List<?> value, Writer writer)
-      throws IOException {
-    if (value != null && !value.isEmpty()) {
-      writer.writeGroupList(fieldNumber, value);
-    }
-  }
-
-  public static void writeGroupList(int fieldNumber, List<?> value, Writer writer, Schema schema)
-      throws IOException {
-    if (value != null && !value.isEmpty()) {
-      writer.writeGroupList(fieldNumber, value, schema);
-    }
-  }
-
-  static int computeSizeInt64ListNoTag(List<Long> list) {
-    final int length = list.size();
-    if (length == 0) {
-      return 0;
-    }
-
-    int size = 0;
-
-    if (list instanceof LongArrayList) {
-      final LongArrayList primitiveList = (LongArrayList) list;
-      for (int i = 0; i < length; i++) {
-        size += CodedOutputStream.computeInt64SizeNoTag(primitiveList.getLong(i));
-      }
-    } else {
-      for (int i = 0; i < length; i++) {
-        size += CodedOutputStream.computeInt64SizeNoTag(list.get(i));
-      }
-    }
-    return size;
-  }
-
-  static int computeSizeInt64List(int fieldNumber, List<Long> list, boolean packed) {
-    final int length = list.size();
-    if (length == 0) {
-      return 0;
-    }
-    int size = computeSizeInt64ListNoTag(list);
-
-    if (packed) {
-      return CodedOutputStream.computeTagSize(fieldNumber)
-          + CodedOutputStream.computeLengthDelimitedFieldSize(size);
-    } else {
-      return size + (list.size() * CodedOutputStream.computeTagSize(fieldNumber));
-    }
-  }
-
-  static int computeSizeUInt64ListNoTag(List<Long> list) {
-    final int length = list.size();
-    if (length == 0) {
-      return 0;
-    }
-
-    int size = 0;
-
-    if (list instanceof LongArrayList) {
-      final LongArrayList primitiveList = (LongArrayList) list;
-      for (int i = 0; i < length; i++) {
-        size += CodedOutputStream.computeUInt64SizeNoTag(primitiveList.getLong(i));
-      }
-    } else {
-      for (int i = 0; i < length; i++) {
-        size += CodedOutputStream.computeUInt64SizeNoTag(list.get(i));
-      }
-    }
-    return size;
-  }
-
-  static int computeSizeUInt64List(int fieldNumber, List<Long> list, boolean packed) {
-    final int length = list.size();
-    if (length == 0) {
-      return 0;
-    }
-    int size = computeSizeUInt64ListNoTag(list);
-
-    if (packed) {
-      return CodedOutputStream.computeTagSize(fieldNumber)
-          + CodedOutputStream.computeLengthDelimitedFieldSize(size);
-    } else {
-      return size + (length * CodedOutputStream.computeTagSize(fieldNumber));
-    }
-  }
-
-  static int computeSizeSInt64ListNoTag(List<Long> list) {
-    final int length = list.size();
-    if (length == 0) {
-      return 0;
-    }
-
-    int size = 0;
-
-    if (list instanceof LongArrayList) {
-      final LongArrayList primitiveList = (LongArrayList) list;
-      for (int i = 0; i < length; i++) {
-        size += CodedOutputStream.computeSInt64SizeNoTag(primitiveList.getLong(i));
-      }
-    } else {
-      for (int i = 0; i < length; i++) {
-        size += CodedOutputStream.computeSInt64SizeNoTag(list.get(i));
-      }
-    }
-    return size;
-  }
-
-  static int computeSizeSInt64List(int fieldNumber, List<Long> list, boolean packed) {
-    final int length = list.size();
-    if (length == 0) {
-      return 0;
-    }
-    int size = computeSizeSInt64ListNoTag(list);
-
-    if (packed) {
-      return CodedOutputStream.computeTagSize(fieldNumber)
-          + CodedOutputStream.computeLengthDelimitedFieldSize(size);
-    } else {
-      return size + (length * CodedOutputStream.computeTagSize(fieldNumber));
-    }
-  }
-
-  static int computeSizeEnumListNoTag(List<Integer> list) {
-    final int length = list.size();
-    if (length == 0) {
-      return 0;
-    }
-
-    int size = 0;
-
-    if (list instanceof IntArrayList) {
-      final IntArrayList primitiveList = (IntArrayList) list;
-      for (int i = 0; i < length; i++) {
-        size += CodedOutputStream.computeEnumSizeNoTag(primitiveList.getInt(i));
-      }
-    } else {
-      for (int i = 0; i < length; i++) {
-        size += CodedOutputStream.computeEnumSizeNoTag(list.get(i));
-      }
-    }
-    return size;
-  }
-
-  static int computeSizeEnumList(int fieldNumber, List<Integer> list, boolean packed) {
-    final int length = list.size();
-    if (length == 0) {
-      return 0;
-    }
-    int size = computeSizeEnumListNoTag(list);
-
-    if (packed) {
-      return CodedOutputStream.computeTagSize(fieldNumber)
-          + CodedOutputStream.computeLengthDelimitedFieldSize(size);
-    } else {
-      return size + (length * CodedOutputStream.computeTagSize(fieldNumber));
-    }
-  }
-
-  static int computeSizeInt32ListNoTag(List<Integer> list) {
-    final int length = list.size();
-    if (length == 0) {
-      return 0;
-    }
-
-    int size = 0;
-
-    if (list instanceof IntArrayList) {
-      final IntArrayList primitiveList = (IntArrayList) list;
-      for (int i = 0; i < length; i++) {
-        size += CodedOutputStream.computeInt32SizeNoTag(primitiveList.getInt(i));
-      }
-    } else {
-      for (int i = 0; i < length; i++) {
-        size += CodedOutputStream.computeInt32SizeNoTag(list.get(i));
-      }
-    }
-    return size;
-  }
-
-  static int computeSizeInt32List(int fieldNumber, List<Integer> list, boolean packed) {
-    final int length = list.size();
-    if (length == 0) {
-      return 0;
-    }
-    int size = computeSizeInt32ListNoTag(list);
-
-    if (packed) {
-      return CodedOutputStream.computeTagSize(fieldNumber)
-          + CodedOutputStream.computeLengthDelimitedFieldSize(size);
-    } else {
-      return size + (length * CodedOutputStream.computeTagSize(fieldNumber));
-    }
-  }
-
-  static int computeSizeUInt32ListNoTag(List<Integer> list) {
-    final int length = list.size();
-    if (length == 0) {
-      return 0;
-    }
-
-    int size = 0;
-
-    if (list instanceof IntArrayList) {
-      final IntArrayList primitiveList = (IntArrayList) list;
-      for (int i = 0; i < length; i++) {
-        size += CodedOutputStream.computeUInt32SizeNoTag(primitiveList.getInt(i));
-      }
-    } else {
-      for (int i = 0; i < length; i++) {
-        size += CodedOutputStream.computeUInt32SizeNoTag(list.get(i));
-      }
-    }
-    return size;
-  }
-
-  static int computeSizeUInt32List(int fieldNumber, List<Integer> list, boolean packed) {
-    final int length = list.size();
-    if (length == 0) {
-      return 0;
-    }
-    int size = computeSizeUInt32ListNoTag(list);
-
-    if (packed) {
-      return CodedOutputStream.computeTagSize(fieldNumber)
-          + CodedOutputStream.computeLengthDelimitedFieldSize(size);
-    } else {
-      return size + (length * CodedOutputStream.computeTagSize(fieldNumber));
-    }
-  }
-
-  static int computeSizeSInt32ListNoTag(List<Integer> list) {
-    final int length = list.size();
-    if (length == 0) {
-      return 0;
-    }
-
-    int size = 0;
-
-    if (list instanceof IntArrayList) {
-      final IntArrayList primitiveList = (IntArrayList) list;
-      for (int i = 0; i < length; i++) {
-        size += CodedOutputStream.computeSInt32SizeNoTag(primitiveList.getInt(i));
-      }
-    } else {
-      for (int i = 0; i < length; i++) {
-        size += CodedOutputStream.computeSInt32SizeNoTag(list.get(i));
-      }
-    }
-    return size;
-  }
-
-  static int computeSizeSInt32List(int fieldNumber, List<Integer> list, boolean packed) {
-    final int length = list.size();
-    if (length == 0) {
-      return 0;
-    }
-
-    int size = computeSizeSInt32ListNoTag(list);
-
-    if (packed) {
-      return CodedOutputStream.computeTagSize(fieldNumber)
-          + CodedOutputStream.computeLengthDelimitedFieldSize(size);
-    } else {
-      return size + (length * CodedOutputStream.computeTagSize(fieldNumber));
-    }
-  }
-
-  static int computeSizeFixed32ListNoTag(List<?> list) {
-    return list.size() * WireFormat.FIXED32_SIZE;
-  }
-
-  static int computeSizeFixed32List(int fieldNumber, List<?> list, boolean packed) {
-    final int length = list.size();
-    if (length == 0) {
-      return 0;
-    }
-    if (packed) {
-      int dataSize = length * WireFormat.FIXED32_SIZE;
-      return CodedOutputStream.computeTagSize(fieldNumber)
-          + CodedOutputStream.computeLengthDelimitedFieldSize(dataSize);
-    } else {
-      return length * CodedOutputStream.computeFixed32Size(fieldNumber, 0);
-    }
-  }
-
-  static int computeSizeFixed64ListNoTag(List<?> list) {
-    return list.size() * WireFormat.FIXED64_SIZE;
-  }
-
-  static int computeSizeFixed64List(int fieldNumber, List<?> list, boolean packed) {
-    final int length = list.size();
-    if (length == 0) {
-      return 0;
-    }
-    if (packed) {
-      final int dataSize = length * WireFormat.FIXED64_SIZE;
-      return CodedOutputStream.computeTagSize(fieldNumber)
-          + CodedOutputStream.computeLengthDelimitedFieldSize(dataSize);
-    } else {
-      return length * CodedOutputStream.computeFixed64Size(fieldNumber, 0);
-    }
-  }
-
-  static int computeSizeBoolListNoTag(List<?> list) {
-    // bools are 1 byte varints
-    return list.size();
-  }
-
-  static int computeSizeBoolList(int fieldNumber, List<?> list, boolean packed) {
-    final int length = list.size();
-    if (length == 0) {
-      return 0;
-    }
-    if (packed) {
-      // bools are 1 byte varints
-      return CodedOutputStream.computeTagSize(fieldNumber)
-          + CodedOutputStream.computeLengthDelimitedFieldSize(length);
-    } else {
-      return length * CodedOutputStream.computeBoolSize(fieldNumber, true);
-    }
-  }
-
-  static int computeSizeStringList(int fieldNumber, List<?> list) {
-    final int length = list.size();
-    if (length == 0) {
-      return 0;
-    }
-    int size = length * CodedOutputStream.computeTagSize(fieldNumber);
-    if (list instanceof LazyStringList) {
-      LazyStringList lazyList = ((LazyStringList) list);
-      for (int i = 0; i < length; i++) {
-        Object value = lazyList.getRaw(i);
-        if (value instanceof ByteString) {
-          size += CodedOutputStream.computeBytesSizeNoTag((ByteString) value);
-        } else {
-          size += CodedOutputStream.computeStringSizeNoTag((String) value);
-        }
-      }
-    } else {
-      for (int i = 0; i < length; i++) {
-        Object value = list.get(i);
-        if (value instanceof ByteString) {
-          size += CodedOutputStream.computeBytesSizeNoTag((ByteString) value);
-        } else {
-          size += CodedOutputStream.computeStringSizeNoTag((String) value);
-        }
-      }
-    }
-    return size;
-  }
-
-  static int computeSizeMessage(int fieldNumber, Object value, Schema schema) {
-    if (value instanceof LazyFieldLite) {
-      return CodedOutputStream.computeLazyFieldSize(fieldNumber, (LazyFieldLite) value);
-    } else {
-      return CodedOutputStream.computeMessageSize(fieldNumber, (MessageLite) value, schema);
-    }
-  }
-
-  static int computeSizeMessageList(int fieldNumber, List<?> list) {
-    final int length = list.size();
-    if (length == 0) {
-      return 0;
-    }
-    int size = length * CodedOutputStream.computeTagSize(fieldNumber);
-    for (int i = 0; i < length; i++) {
-      Object value = list.get(i);
-      if (value instanceof LazyFieldLite) {
-        size += CodedOutputStream.computeLazyFieldSizeNoTag((LazyFieldLite) value);
-      } else {
-        size += CodedOutputStream.computeMessageSizeNoTag((MessageLite) value);
-      }
-    }
-    return size;
-  }
-
-  static int computeSizeMessageList(int fieldNumber, List<?> list, Schema schema) {
-    final int length = list.size();
-    if (length == 0) {
-      return 0;
-    }
-    int size = length * CodedOutputStream.computeTagSize(fieldNumber);
-    for (int i = 0; i < length; i++) {
-      Object value = list.get(i);
-      if (value instanceof LazyFieldLite) {
-        size += CodedOutputStream.computeLazyFieldSizeNoTag((LazyFieldLite) value);
-      } else {
-        size += CodedOutputStream.computeMessageSizeNoTag((MessageLite) value, schema);
-      }
-    }
-    return size;
-  }
-
-  static int computeSizeByteStringList(int fieldNumber, List<ByteString> list) {
-    final int length = list.size();
-    if (length == 0) {
-      return 0;
-    }
-    int size = length * CodedOutputStream.computeTagSize(fieldNumber);
-    for (int i = 0; i < list.size(); i++) {
-      size += CodedOutputStream.computeBytesSizeNoTag(list.get(i));
-    }
-    return size;
-  }
-
-  static int computeSizeGroupList(int fieldNumber, List<MessageLite> list) {
-    final int length = list.size();
-    if (length == 0) {
-      return 0;
-    }
-    int size = 0;
-    for (int i = 0; i < length; i++) {
-      size += CodedOutputStream.computeGroupSize(fieldNumber, list.get(i));
-    }
-    return size;
-  }
-
-  static int computeSizeGroupList(int fieldNumber, List<MessageLite> list, Schema schema) {
-    final int length = list.size();
-    if (length == 0) {
-      return 0;
-    }
-    int size = 0;
-    for (int i = 0; i < length; i++) {
-      size += CodedOutputStream.computeGroupSize(fieldNumber, list.get(i), schema);
-    }
-    return size;
-  }
-
-  /**
-   * Determines whether to issue tableswitch or lookupswitch for the mergeFrom method.
-   *
-   * @see #shouldUseTableSwitch(int, int, int)
-   */
-  public static boolean shouldUseTableSwitch(FieldInfo[] fields) {
-    // Determine whether to issue a tableswitch or a lookupswitch
-    // instruction.
-    if (fields.length == 0) {
-      return false;
-    }
-
-    int lo = fields[0].getFieldNumber();
-    int hi = fields[fields.length - 1].getFieldNumber();
-    return shouldUseTableSwitch(lo, hi, fields.length);
-  }
-
-  /**
-   * Determines whether to issue tableswitch or lookupswitch for the mergeFrom method. This is based
-   * on the <a href=
-   * "http://hg.openjdk.java.net/jdk8/jdk8/langtools/file/30db5e0aaf83/src/share/classes/com/sun/tools/javac/jvm/Gen.java#l1159">
-   * logic in the JDK</a>.
-   *
-   * @param lo the lowest fieldNumber contained within the message.
-   * @param hi the highest fieldNumber contained within the message.
-   * @param numFields the total number of fields in the message.
-   * @return {@code true} if tableswitch should be used, rather than lookupswitch.
-   */
-  public static boolean shouldUseTableSwitch(int lo, int hi, int numFields) {
-    if (hi < DEFAULT_LOOK_UP_START_NUMBER) {
-      return true;
-    }
-    long tableSpaceCost = ((long) hi - lo + 1); // words
-    long tableTimeCost = 3; // comparisons
-    long lookupSpaceCost = 3 + 2 * (long) numFields;
-    long lookupTimeCost = 3 + (long) numFields;
-    return tableSpaceCost + 3 * tableTimeCost <= lookupSpaceCost + 3 * lookupTimeCost;
-  }
-
-  public static UnknownFieldSchema<?, ?> proto2UnknownFieldSetSchema() {
-    return PROTO2_UNKNOWN_FIELD_SET_SCHEMA;
-  }
-
-  public static UnknownFieldSchema<?, ?> proto3UnknownFieldSetSchema() {
-    return PROTO3_UNKNOWN_FIELD_SET_SCHEMA;
-  }
-
-  public static UnknownFieldSchema<?, ?> unknownFieldSetLiteSchema() {
-    return UNKNOWN_FIELD_SET_LITE_SCHEMA;
-  }
-
-  private static UnknownFieldSchema<?, ?> getUnknownFieldSetSchema(boolean proto3) {
-    try {
-      Class<?> clz = getUnknownFieldSetSchemaClass();
-      if (clz == null) {
-        return null;
-      }
-      return (UnknownFieldSchema) clz.getConstructor(boolean.class).newInstance(proto3);
-    } catch (Throwable t) {
-      return null;
-    }
-  }
-
-  private static Class<?> getGeneratedMessageClass() {
-    try {
-      // TODO(b/248560713) decide if we're keeping support for Full in schema classes and handle
-      // this better.
-      return Class.forName("com.google.protobuf.GeneratedMessageV3");
-    } catch (Throwable e) {
-      return null;
-    }
-  }
-
-  private static Class<?> getUnknownFieldSetSchemaClass() {
-    try {
-      return Class.forName("com.google.protobuf.UnknownFieldSetSchema");
-    } catch (Throwable e) {
-      return null;
-    }
-  }
-
-  static Object getMapDefaultEntry(Class<?> clazz, String name) {
-    try {
-      Class<?> holder =
-          Class.forName(clazz.getName() + "$" + toCamelCase(name, true) + "DefaultEntryHolder");
-      Field[] fields = holder.getDeclaredFields();
-      if (fields.length != 1) {
-        throw new IllegalStateException(
-            "Unable to look up map field default entry holder class for "
-                + name
-                + " in "
-                + clazz.getName());
-      }
-      return UnsafeUtil.getStaticObject(fields[0]);
-    } catch (Throwable t) {
-      throw new RuntimeException(t);
-    }
-  }
-
-  static String toCamelCase(String name, boolean capNext) {
-    StringBuilder sb = new StringBuilder();
-    for (int i = 0; i < name.length(); ++i) {
-      char c = name.charAt(i);
-      // Matches protoc field name function:
-      if ('a' <= c && c <= 'z') {
-        if (capNext) {
-          sb.append((char) (c + ('A' - 'a')));
-        } else {
-          sb.append(c);
-        }
-        capNext = false;
-      } else if ('A' <= c && c <= 'Z') {
-        if (i == 0 && !capNext) {
-          // Force first letter to lower-case unless explicitly told to capitalize it.
-          sb.append((char) (c - ('A' - 'a')));
-        } else {
-          sb.append(c);
-        }
-        capNext = false;
-      } else if ('0' <= c && c <= '9') {
-        sb.append(c);
-        capNext = true;
-      } else {
-        capNext = true;
-      }
-    }
-    return sb.toString();
-  }
-
-  /** Returns true if both are null or both are {@link Object#equals}. */
-  static boolean safeEquals(Object a, Object b) {
-    return a == b || (a != null && a.equals(b));
-  }
-
-  static <T> void mergeMap(MapFieldSchema mapFieldSchema, T message, T o, long offset) {
-    Object merged =
-        mapFieldSchema.mergeFrom(
-            UnsafeUtil.getObject(message, offset), UnsafeUtil.getObject(o, offset));
-    UnsafeUtil.putObject(message, offset, merged);
-  }
-
-  static <T, FT extends FieldDescriptorLite<FT>> void mergeExtensions(
-      ExtensionSchema<FT> schema, T message, T other) {
-    FieldSet<FT> otherExtensions = schema.getExtensions(other);
-    if (!otherExtensions.isEmpty()) {
-      FieldSet<FT> messageExtensions = schema.getMutableExtensions(message);
-      messageExtensions.mergeFrom(otherExtensions);
-    }
-  }
-
-  static <T, UT, UB> void mergeUnknownFields(
-      UnknownFieldSchema<UT, UB> schema, T message, T other) {
-    UT messageUnknowns = schema.getFromMessage(message);
-    UT otherUnknowns = schema.getFromMessage(other);
-    UT merged = schema.merge(messageUnknowns, otherUnknowns);
-    schema.setToMessage(message, merged);
-  }
-
-  /** Filters unrecognized enum values in a list. */
-  @CanIgnoreReturnValue
-  static <UT, UB> UB filterUnknownEnumList(
-      Object containerMessage,
-      int number,
-      List<Integer> enumList,
-      EnumLiteMap<?> enumMap,
-      UB unknownFields,
-      UnknownFieldSchema<UT, UB> unknownFieldSchema) {
-    if (enumMap == null) {
-      return unknownFields;
-    }
-    // TODO(dweis): Specialize for IntArrayList to avoid boxing.
-    if (enumList instanceof RandomAccess) {
-      int writePos = 0;
-      int size = enumList.size();
-      for (int readPos = 0; readPos < size; ++readPos) {
-        int enumValue = enumList.get(readPos);
-        if (enumMap.findValueByNumber(enumValue) != null) {
-          if (readPos != writePos) {
-            enumList.set(writePos, enumValue);
-          }
-          ++writePos;
-        } else {
-          unknownFields =
-              storeUnknownEnum(
-                  containerMessage, number, enumValue, unknownFields, unknownFieldSchema);
-        }
-      }
-      if (writePos != size) {
-        enumList.subList(writePos, size).clear();
-      }
-    } else {
-      for (Iterator<Integer> it = enumList.iterator(); it.hasNext(); ) {
-        int enumValue = it.next();
-        if (enumMap.findValueByNumber(enumValue) == null) {
-          unknownFields =
-              storeUnknownEnum(
-                  containerMessage, number, enumValue, unknownFields, unknownFieldSchema);
-          it.remove();
-        }
-      }
-    }
-    return unknownFields;
-  }
-
-  /** Filters unrecognized enum values in a list. */
-  @CanIgnoreReturnValue
-  static <UT, UB> UB filterUnknownEnumList(
-      Object containerMessage,
-      int number,
-      List<Integer> enumList,
-      EnumVerifier enumVerifier,
-      UB unknownFields,
-      UnknownFieldSchema<UT, UB> unknownFieldSchema) {
-    if (enumVerifier == null) {
-      return unknownFields;
-    }
-    // TODO(dweis): Specialize for IntArrayList to avoid boxing.
-    if (enumList instanceof RandomAccess) {
-      int writePos = 0;
-      int size = enumList.size();
-      for (int readPos = 0; readPos < size; ++readPos) {
-        int enumValue = enumList.get(readPos);
-        if (enumVerifier.isInRange(enumValue)) {
-          if (readPos != writePos) {
-            enumList.set(writePos, enumValue);
-          }
-          ++writePos;
-        } else {
-          unknownFields =
-              storeUnknownEnum(
-                  containerMessage, number, enumValue, unknownFields, unknownFieldSchema);
-        }
-      }
-      if (writePos != size) {
-        enumList.subList(writePos, size).clear();
-      }
-    } else {
-      for (Iterator<Integer> it = enumList.iterator(); it.hasNext(); ) {
-        int enumValue = it.next();
-        if (!enumVerifier.isInRange(enumValue)) {
-          unknownFields =
-              storeUnknownEnum(
-                  containerMessage, number, enumValue, unknownFields, unknownFieldSchema);
-          it.remove();
-        }
-      }
-    }
-    return unknownFields;
-  }
-
-  /** Stores an unrecognized enum value as an unknown value. */
-  @CanIgnoreReturnValue
-  static <UT, UB> UB storeUnknownEnum(
-      Object containerMessage,
-      int number,
-      int enumValue,
-      UB unknownFields,
-      UnknownFieldSchema<UT, UB> unknownFieldSchema) {
-    if (unknownFields == null) {
-      unknownFields = unknownFieldSchema.getBuilderFromMessage(containerMessage);
-    }
-    unknownFieldSchema.addVarint(unknownFields, number, enumValue);
-    return unknownFields;
-  }
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/Service.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/Service.java
deleted file mode 100644
index d45cdae..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/Service.java
+++ /dev/null
@@ -1,109 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-/**
- * Abstract base interface for protocol-buffer-based RPC services. Services themselves are abstract
- * classes (implemented either by servers or as stubs), but they subclass this base interface. The
- * methods of this interface can be used to call the methods of the service without knowing its
- * exact type at compile time (analogous to the Message interface).
- *
- * <p>Starting with version 2.3.0, RPC implementations should not try to build on this, but should
- * instead provide code generator plugins which generate code specific to the particular RPC
- * implementation. This way the generated code can be more appropriate for the implementation in use
- * and can avoid unnecessary layers of indirection.
- *
- * @author kenton@google.com Kenton Varda
- */
-public interface Service {
-  /** Get the {@code ServiceDescriptor} describing this service and its methods. */
-  Descriptors.ServiceDescriptor getDescriptorForType();
-
-  /**
-   * Call a method of the service specified by MethodDescriptor. This is normally implemented as a
-   * simple {@code switch()} that calls the standard definitions of the service's methods.
-   *
-   * <p>Preconditions:
-   *
-   * <ul>
-   *   <li>{@code method.getService() == getDescriptorForType()}
-   *   <li>{@code request} is of the exact same class as the object returned by {@code
-   *       getRequestPrototype(method)}.
-   *   <li>{@code controller} is of the correct type for the RPC implementation being used by this
-   *       Service. For stubs, the "correct type" depends on the RpcChannel which the stub is using.
-   *       Server-side Service implementations are expected to accept whatever type of {@code
-   *       RpcController} the server-side RPC implementation uses.
-   * </ul>
-   *
-   * <p>Postconditions:
-   *
-   * <ul>
-   *   <li>{@code done} will be called when the method is complete. This may be before {@code
-   *       callMethod()} returns or it may be at some point in the future.
-   *   <li>The parameter to {@code done} is the response. It must be of the exact same type as would
-   *       be returned by {@code getResponsePrototype(method)}.
-   *   <li>If the RPC failed, the parameter to {@code done} will be {@code null}. Further details
-   *       about the failure can be found by querying {@code controller}.
-   * </ul>
-   */
-  void callMethod(
-      Descriptors.MethodDescriptor method,
-      RpcController controller,
-      Message request,
-      RpcCallback<Message> done);
-
-  /**
-   * {@code callMethod()} requires that the request passed in is of a particular subclass of {@code
-   * Message}. {@code getRequestPrototype()} gets the default instances of this type for a given
-   * method. You can then call {@code Message.newBuilderForType()} on this instance to construct a
-   * builder to build an object which you can then pass to {@code callMethod()}.
-   *
-   * <p>Example:
-   *
-   * <pre>
-   *   MethodDescriptor method =
-   *     service.getDescriptorForType().findMethodByName("Foo");
-   *   Message request =
-   *     stub.getRequestPrototype(method).newBuilderForType()
-   *         .mergeFrom(input).build();
-   *   service.callMethod(method, request, callback);
-   * </pre>
-   */
-  Message getRequestPrototype(Descriptors.MethodDescriptor method);
-
-  /**
-   * Like {@code getRequestPrototype()}, but gets a prototype of the response message. {@code
-   * getResponsePrototype()} is generally not needed because the {@code Service} implementation
-   * constructs the response message itself, but it may be useful in some cases to know ahead of
-   * time what type of object will be returned.
-   */
-  Message getResponsePrototype(Descriptors.MethodDescriptor method);
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/ServiceException.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/ServiceException.java
deleted file mode 100644
index 00d5707..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/ServiceException.java
+++ /dev/null
@@ -1,52 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-/**
- * Thrown by blocking RPC methods when a failure occurs.
- *
- * @author cpovirk@google.com (Chris Povirk)
- */
-public class ServiceException extends Exception {
-  private static final long serialVersionUID = -1219262335729891920L;
-
-  public ServiceException(final String message) {
-    super(message);
-  }
-
-  public ServiceException(final Throwable cause) {
-    super(cause);
-  }
-
-  public ServiceException(final String message, final Throwable cause) {
-    super(message, cause);
-  }
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/SingleFieldBuilder.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/SingleFieldBuilder.java
deleted file mode 100644
index acdc1de..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/SingleFieldBuilder.java
+++ /dev/null
@@ -1,227 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.protobuf.Internal.checkNotNull;
-
-/**
- * {@code SingleFieldBuilder} implements a structure that a protocol message uses to hold a single
- * field of another protocol message. It supports the classical use case of setting an immutable
- * {@link Message} as the value of the field and is highly optimized around this.
- *
- * <p>It also supports the additional use case of setting a {@link Message.Builder} as the field and
- * deferring conversion of that {@code Builder} to an immutable {@code Message}. In this way, it's
- * possible to maintain a tree of {@code Builder}'s that acts as a fully read/write data structure.
- * <br>
- * Logically, one can think of a tree of builders as converting the entire tree to messages when
- * build is called on the root or when any method is called that desires a Message instead of a
- * Builder. In terms of the implementation, the {@code SingleFieldBuilder} and {@code
- * RepeatedFieldBuilder} classes cache messages that were created so that messages only need to be
- * created when some change occurred in its builder or a builder for one of its descendants.
- *
- * @param <MType> the type of message for the field
- * @param <BType> the type of builder for the field
- * @param <IType> the common interface for the message and the builder
- * @author jonp@google.com (Jon Perlow)
- */
-public class SingleFieldBuilder<
-        MType extends GeneratedMessage,
-        BType extends GeneratedMessage.Builder,
-        IType extends MessageOrBuilder>
-    implements GeneratedMessage.BuilderParent {
-
-  // Parent to send changes to.
-  private GeneratedMessage.BuilderParent parent;
-
-  // Invariant: one of builder or message fields must be non-null.
-
-  // If set, this is the case where we are backed by a builder. In this case,
-  // message field represents a cached message for the builder (or null if
-  // there is no cached message).
-  private BType builder;
-
-  // If builder is non-null, this represents a cached message from the builder.
-  // If builder is null, this is the authoritative message for the field.
-  private MType message;
-
-  // Indicates that we've built a message and so we are now obligated
-  // to dispatch dirty invalidations. See GeneratedMessage.BuilderListener.
-  private boolean isClean;
-
-  public SingleFieldBuilder(MType message, GeneratedMessage.BuilderParent parent, boolean isClean) {
-    this.message = checkNotNull(message);
-    this.parent = parent;
-    this.isClean = isClean;
-  }
-
-  public void dispose() {
-    // Null out parent so we stop sending it invalidations.
-    parent = null;
-  }
-
-  /**
-   * Get the message for the field. If the message is currently stored as a {@code Builder}, it is
-   * converted to a {@code Message} by calling {@link Message.Builder#buildPartial} on it. If no
-   * message has been set, returns the default instance of the message.
-   *
-   * @return the message for the field
-   */
-  @SuppressWarnings("unchecked")
-  public MType getMessage() {
-    if (message == null) {
-      // If message is null, the invariant is that we must be have a builder.
-      message = (MType) builder.buildPartial();
-    }
-    return message;
-  }
-
-  /**
-   * Builds the message and returns it.
-   *
-   * @return the message
-   */
-  public MType build() {
-    // Now that build has been called, we are required to dispatch
-    // invalidations.
-    isClean = true;
-    return getMessage();
-  }
-
-  /**
-   * Gets a builder for the field. If no builder has been created yet, a builder is created on
-   * demand by calling {@link Message#toBuilder}.
-   *
-   * @return The builder for the field
-   */
-  @SuppressWarnings("unchecked")
-  public BType getBuilder() {
-    if (builder == null) {
-      // builder.mergeFrom() on a fresh builder
-      // does not create any sub-objects with independent clean/dirty states,
-      // therefore setting the builder itself to clean without actually calling
-      // build() cannot break any invariants.
-      builder = (BType) message.newBuilderForType(this);
-      builder.mergeFrom(message); // no-op if message is the default message
-      builder.markClean();
-    }
-    return builder;
-  }
-
-  /**
-   * Gets the base class interface for the field. This may either be a builder or a message. It will
-   * return whatever is more efficient.
-   *
-   * @return the message or builder for the field as the base class interface
-   */
-  @SuppressWarnings("unchecked")
-  public IType getMessageOrBuilder() {
-    if (builder != null) {
-      return (IType) builder;
-    } else {
-      return (IType) message;
-    }
-  }
-
-  /**
-   * Sets a message for the field replacing any existing value.
-   *
-   * @param message the message to set
-   * @return the builder
-   */
-  public SingleFieldBuilder<MType, BType, IType> setMessage(MType message) {
-    this.message = checkNotNull(message);
-    if (builder != null) {
-      builder.dispose();
-      builder = null;
-    }
-    onChanged();
-    return this;
-  }
-
-  /**
-   * Merges the field from another field.
-   *
-   * @param value the value to merge from
-   * @return the builder
-   */
-  public SingleFieldBuilder<MType, BType, IType> mergeFrom(MType value) {
-    if (builder == null && message == message.getDefaultInstanceForType()) {
-      message = value;
-    } else {
-      getBuilder().mergeFrom(value);
-    }
-    onChanged();
-    return this;
-  }
-
-  /**
-   * Clears the value of the field.
-   *
-   * @return the builder
-   */
-  @SuppressWarnings("unchecked")
-  public SingleFieldBuilder<MType, BType, IType> clear() {
-    message =
-        (MType)
-            (message != null
-                ? message.getDefaultInstanceForType()
-                : builder.getDefaultInstanceForType());
-    if (builder != null) {
-      builder.dispose();
-      builder = null;
-    }
-    onChanged();
-    return this;
-  }
-
-  /**
-   * Called when a the builder or one of its nested children has changed and any parent should be
-   * notified of its invalidation.
-   */
-  private void onChanged() {
-    // If builder is null, this is the case where onChanged is being called
-    // from setMessage or clear.
-    if (builder != null) {
-      message = null;
-    }
-    if (isClean && parent != null) {
-      parent.markDirty();
-
-      // Don't keep dispatching invalidations until build is called again.
-      isClean = false;
-    }
-  }
-
-  @Override
-  public void markDirty() {
-    onChanged();
-  }
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/SingleFieldBuilderV3.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/SingleFieldBuilderV3.java
deleted file mode 100644
index a6c639c..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/SingleFieldBuilderV3.java
+++ /dev/null
@@ -1,230 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.protobuf.Internal.checkNotNull;
-
-/**
- * {@code SingleFieldBuilderV3} implements a structure that a protocol message uses to hold a single
- * field of another protocol message. It supports the classical use case of setting an immutable
- * {@link Message} as the value of the field and is highly optimized around this.
- *
- * <p>It also supports the additional use case of setting a {@link Message.Builder} as the field and
- * deferring conversion of that {@code Builder} to an immutable {@code Message}. In this way, it's
- * possible to maintain a tree of {@code Builder}'s that acts as a fully read/write data structure.
- * <br>
- * Logically, one can think of a tree of builders as converting the entire tree to messages when
- * build is called on the root or when any method is called that desires a Message instead of a
- * Builder. In terms of the implementation, the {@code SingleFieldBuilderV3} and {@code
- * RepeatedFieldBuilderV3} classes cache messages that were created so that messages only need to be
- * created when some change occurred in its builder or a builder for one of its descendants.
- *
- * @param <MType> the type of message for the field
- * @param <BType> the type of builder for the field
- * @param <IType> the common interface for the message and the builder
- * @author jonp@google.com (Jon Perlow)
- */
-public class SingleFieldBuilderV3<
-        MType extends AbstractMessage,
-        BType extends AbstractMessage.Builder,
-        IType extends MessageOrBuilder>
-    implements AbstractMessage.BuilderParent {
-
-  // Parent to send changes to.
-  private AbstractMessage.BuilderParent parent;
-
-  // Invariant: one of builder or message fields must be non-null.
-
-  // If set, this is the case where we are backed by a builder. In this case,
-  // message field represents a cached message for the builder (or null if
-  // there is no cached message).
-  private BType builder;
-
-  // If builder is non-null, this represents a cached message from the builder.
-  // If builder is null, this is the authoritative message for the field.
-  private MType message;
-
-  // Indicates that we've built a message and so we are now obligated
-  // to dispatch dirty invalidations. See AbstractMessage.BuilderListener.
-  private boolean isClean;
-
-  public SingleFieldBuilderV3(MType message, AbstractMessage.BuilderParent parent, boolean isClean) {
-    this.message = checkNotNull(message);
-    this.parent = parent;
-    this.isClean = isClean;
-  }
-
-  public void dispose() {
-    // Null out parent so we stop sending it invalidations.
-    parent = null;
-  }
-
-  /**
-   * Get the message for the field. If the message is currently stored as a {@code Builder}, it is
-   * converted to a {@code Message} by calling {@link Message.Builder#buildPartial} on it. If no
-   * message has been set, returns the default instance of the message.
-   *
-   * @return the message for the field
-   */
-  @SuppressWarnings("unchecked")
-  public MType getMessage() {
-    if (message == null) {
-      // If message is null, the invariant is that we must be have a builder.
-      message = (MType) builder.buildPartial();
-    }
-    return message;
-  }
-
-  /**
-   * Builds the message and returns it.
-   *
-   * @return the message
-   */
-  public MType build() {
-    // Now that build has been called, we are required to dispatch
-    // invalidations.
-    isClean = true;
-    return getMessage();
-  }
-
-  /**
-   * Gets a builder for the field. If no builder has been created yet, a builder is created on
-   * demand by calling {@link Message#toBuilder}.
-   *
-   * @return The builder for the field
-   */
-  @SuppressWarnings("unchecked")
-  public BType getBuilder() {
-    if (builder == null) {
-      // builder.mergeFrom() on a fresh builder
-      // does not create any sub-objects with independent clean/dirty states,
-      // therefore setting the builder itself to clean without actually calling
-      // build() cannot break any invariants.
-      builder = (BType) message.newBuilderForType(this);
-      builder.mergeFrom(message); // no-op if message is the default message
-      builder.markClean();
-    }
-    return builder;
-  }
-
-  /**
-   * Gets the base class interface for the field. This may either be a builder or a message. It will
-   * return whatever is more efficient.
-   *
-   * @return the message or builder for the field as the base class interface
-   */
-  @SuppressWarnings("unchecked")
-  public IType getMessageOrBuilder() {
-    if (builder != null) {
-      return (IType) builder;
-    } else {
-      return (IType) message;
-    }
-  }
-
-  /**
-   * Sets a message for the field replacing any existing value.
-   *
-   * @param message the message to set
-   * @return the builder
-   */
-  public SingleFieldBuilderV3<MType, BType, IType> setMessage(MType message) {
-    this.message = checkNotNull(message);
-    if (builder != null) {
-      builder.dispose();
-      builder = null;
-    }
-    onChanged();
-    return this;
-  }
-
-  /**
-   * Merges the field from another field.
-   *
-   * @param value the value to merge from
-   * @return the builder
-   */
-  public SingleFieldBuilderV3<MType, BType, IType> mergeFrom(MType value) {
-    if (builder == null && message == message.getDefaultInstanceForType()) {
-      message = value;
-    } else {
-      getBuilder().mergeFrom(value);
-    }
-    onChanged();
-    return this;
-  }
-
-  /**
-   * Clears the value of the field.
-   *
-   * @return the builder
-   */
-  @SuppressWarnings("unchecked")
-  public SingleFieldBuilderV3<MType, BType, IType> clear() {
-    message =
-        (MType)
-            (message != null
-                ? message.getDefaultInstanceForType()
-                : builder.getDefaultInstanceForType());
-    if (builder != null) {
-      builder.dispose();
-      builder = null;
-    }
-    onChanged();
-    // After clearing, parent is dirty, but this field builder is now clean and any changes should
-    // trickle up.
-    isClean = true;
-    return this;
-  }
-
-  /**
-   * Called when a the builder or one of its nested children has changed and any parent should be
-   * notified of its invalidation.
-   */
-  private void onChanged() {
-    // If builder is null, this is the case where onChanged is being called
-    // from setMessage or clear.
-    if (builder != null) {
-      message = null;
-    }
-    if (isClean && parent != null) {
-      parent.markDirty();
-
-      // Don't keep dispatching invalidations until build is called again.
-      isClean = false;
-    }
-  }
-
-  @Override
-  public void markDirty() {
-    onChanged();
-  }
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/SmallSortedMap.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/SmallSortedMap.java
deleted file mode 100644
index db63534..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/SmallSortedMap.java
+++ /dev/null
@@ -1,710 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import java.util.AbstractMap;
-import java.util.AbstractSet;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.NoSuchElementException;
-import java.util.Set;
-import java.util.SortedMap;
-import java.util.TreeMap;
-
-/**
- * A custom map implementation from FieldDescriptor to Object optimized to minimize the number of
- * memory allocations for instances with a small number of mappings. The implementation stores the
- * first {@code k} mappings in an array for a configurable value of {@code k}, allowing direct
- * access to the corresponding {@code Entry}s without the need to create an Iterator. The remaining
- * entries are stored in an overflow map. Iteration over the entries in the map should be done as
- * follows:
- *
- * <pre>{@code
- * for (int i = 0; i < fieldMap.getNumArrayEntries(); i++) {
- *   process(fieldMap.getArrayEntryAt(i));
- * }
- * for (Map.Entry<K, V> entry : fieldMap.getOverflowEntries()) {
- *   process(entry);
- * }
- * }</pre>
- *
- * The resulting iteration is in order of ascending field tag number. The object returned by {@link
- * #entrySet()} adheres to the same contract but is less efficient as it necessarily involves
- * creating an object for iteration.
- *
- * <p>The tradeoff for this memory efficiency is that the worst case running time of the {@code
- * put()} operation is {@code O(k + lg n)}, which happens when entries are added in descending
- * order. {@code k} should be chosen such that it covers enough common cases without adversely
- * affecting larger maps. In practice, the worst case scenario does not happen for extensions
- * because extension fields are serialized and deserialized in order of ascending tag number, but
- * the worst case scenario can happen for DynamicMessages.
- *
- * <p>The running time for all other operations is similar to that of {@code TreeMap}.
- *
- * <p>Instances are not thread-safe until {@link #makeImmutable()} is called, after which any
- * modifying operation will result in an {@link UnsupportedOperationException}.
- *
- * @author darick@google.com Darick Tong
- */
-// This class is final for all intents and purposes because the constructor is
-// private. However, the FieldDescriptor-specific logic is encapsulated in
-// a subclass to aid testability of the core logic.
-class SmallSortedMap<K extends Comparable<K>, V> extends AbstractMap<K, V> {
-
-  /**
-   * Creates a new instance for mapping FieldDescriptors to their values. The {@link
-   * #makeImmutable()} implementation will convert the List values of any repeated fields to
-   * unmodifiable lists.
-   *
-   * @param arraySize The size of the entry array containing the lexicographically smallest
-   *     mappings.
-   */
-  static <FieldDescriptorType extends FieldSet.FieldDescriptorLite<FieldDescriptorType>>
-      SmallSortedMap<FieldDescriptorType, Object> newFieldMap(int arraySize) {
-    return new SmallSortedMap<FieldDescriptorType, Object>(arraySize) {
-      @Override
-      @SuppressWarnings("unchecked")
-      public void makeImmutable() {
-        if (!isImmutable()) {
-          for (int i = 0; i < getNumArrayEntries(); i++) {
-            final Map.Entry<FieldDescriptorType, Object> entry = getArrayEntryAt(i);
-            if (entry.getKey().isRepeated()) {
-              final List value = (List) entry.getValue();
-              entry.setValue(Collections.unmodifiableList(value));
-            }
-          }
-          for (Map.Entry<FieldDescriptorType, Object> entry : getOverflowEntries()) {
-            if (entry.getKey().isRepeated()) {
-              final List value = (List) entry.getValue();
-              entry.setValue(Collections.unmodifiableList(value));
-            }
-          }
-        }
-        super.makeImmutable();
-      }
-    };
-  }
-
-  /**
-   * Creates a new instance for testing.
-   *
-   * @param arraySize The size of the entry array containing the lexicographically smallest
-   *     mappings.
-   */
-  static <K extends Comparable<K>, V> SmallSortedMap<K, V> newInstanceForTest(int arraySize) {
-    return new SmallSortedMap<K, V>(arraySize);
-  }
-
-  private final int maxArraySize;
-  // The "entry array" is actually a List because generic arrays are not
-  // allowed. ArrayList also nicely handles the entry shifting on inserts and
-  // removes.
-  private List<Entry> entryList;
-  private Map<K, V> overflowEntries;
-  private boolean isImmutable;
-  // The EntrySet is a stateless view of the Map. It's initialized the first
-  // time it is requested and reused henceforth.
-  private volatile EntrySet lazyEntrySet;
-  private Map<K, V> overflowEntriesDescending;
-  private volatile DescendingEntrySet lazyDescendingEntrySet;
-
-  /**
-   * @code arraySize Size of the array in which the lexicographically smallest mappings are stored.
-   *     (i.e. the {@code k} referred to in the class documentation).
-   */
-  private SmallSortedMap(int arraySize) {
-    this.maxArraySize = arraySize;
-    this.entryList = Collections.emptyList();
-    this.overflowEntries = Collections.emptyMap();
-    this.overflowEntriesDescending = Collections.emptyMap();
-  }
-
-  /** Make this map immutable from this point forward. */
-  public void makeImmutable() {
-    if (!isImmutable) {
-      // Note: There's no need to wrap the entryList in an unmodifiableList
-      // because none of the list's accessors are exposed. The iterator() of
-      // overflowEntries, on the other hand, is exposed so it must be made
-      // unmodifiable.
-      overflowEntries =
-          overflowEntries.isEmpty()
-              ? Collections.<K, V>emptyMap()
-              : Collections.unmodifiableMap(overflowEntries);
-      overflowEntriesDescending =
-          overflowEntriesDescending.isEmpty()
-              ? Collections.<K, V>emptyMap()
-              : Collections.unmodifiableMap(overflowEntriesDescending);
-      isImmutable = true;
-    }
-  }
-
-  /** @return Whether {@link #makeImmutable()} has been called. */
-  public boolean isImmutable() {
-    return isImmutable;
-  }
-
-  /** @return The number of entries in the entry array. */
-  public int getNumArrayEntries() {
-    return entryList.size();
-  }
-
-  /** @return The array entry at the given {@code index}. */
-  public Map.Entry<K, V> getArrayEntryAt(int index) {
-    return entryList.get(index);
-  }
-
-  /** @return There number of overflow entries. */
-  public int getNumOverflowEntries() {
-    return overflowEntries.size();
-  }
-
-  /** @return An iterable over the overflow entries. */
-  public Iterable<Map.Entry<K, V>> getOverflowEntries() {
-    return overflowEntries.isEmpty()
-        ? EmptySet.<Map.Entry<K, V>>iterable()
-        : overflowEntries.entrySet();
-  }
-
-  Iterable<Map.Entry<K, V>> getOverflowEntriesDescending() {
-    return overflowEntriesDescending.isEmpty()
-        ? EmptySet.<Map.Entry<K, V>>iterable()
-        : overflowEntriesDescending.entrySet();
-  }
-
-  @Override
-  public int size() {
-    return entryList.size() + overflowEntries.size();
-  }
-
-  /**
-   * The implementation throws a {@code ClassCastException} if o is not an object of type {@code K}.
-   *
-   * <p>{@inheritDoc}
-   */
-  @Override
-  public boolean containsKey(Object o) {
-    @SuppressWarnings("unchecked")
-    final K key = (K) o;
-    return binarySearchInArray(key) >= 0 || overflowEntries.containsKey(key);
-  }
-
-  /**
-   * The implementation throws a {@code ClassCastException} if o is not an object of type {@code K}.
-   *
-   * <p>{@inheritDoc}
-   */
-  @Override
-  public V get(Object o) {
-    @SuppressWarnings("unchecked")
-    final K key = (K) o;
-    final int index = binarySearchInArray(key);
-    if (index >= 0) {
-      return entryList.get(index).getValue();
-    }
-    return overflowEntries.get(key);
-  }
-
-  @Override
-  public V put(K key, V value) {
-    checkMutable();
-    final int index = binarySearchInArray(key);
-    if (index >= 0) {
-      // Replace existing array entry.
-      return entryList.get(index).setValue(value);
-    }
-    ensureEntryArrayMutable();
-    final int insertionPoint = -(index + 1);
-    if (insertionPoint >= maxArraySize) {
-      // Put directly in overflow.
-      return getOverflowEntriesMutable().put(key, value);
-    }
-    // Insert new Entry in array.
-    if (entryList.size() == maxArraySize) {
-      // Shift the last array entry into overflow.
-      final Entry lastEntryInArray = entryList.remove(maxArraySize - 1);
-      getOverflowEntriesMutable().put(lastEntryInArray.getKey(), lastEntryInArray.getValue());
-    }
-    entryList.add(insertionPoint, new Entry(key, value));
-    return null;
-  }
-
-  @Override
-  public void clear() {
-    checkMutable();
-    if (!entryList.isEmpty()) {
-      entryList.clear();
-    }
-    if (!overflowEntries.isEmpty()) {
-      overflowEntries.clear();
-    }
-  }
-
-  /**
-   * The implementation throws a {@code ClassCastException} if o is not an object of type {@code K}.
-   *
-   * <p>{@inheritDoc}
-   */
-  @Override
-  public V remove(Object o) {
-    checkMutable();
-    @SuppressWarnings("unchecked")
-    final K key = (K) o;
-    final int index = binarySearchInArray(key);
-    if (index >= 0) {
-      return removeArrayEntryAt(index);
-    }
-    // overflowEntries might be Collections.unmodifiableMap(), so only
-    // call remove() if it is non-empty.
-    if (overflowEntries.isEmpty()) {
-      return null;
-    } else {
-      return overflowEntries.remove(key);
-    }
-  }
-
-  private V removeArrayEntryAt(int index) {
-    checkMutable();
-    final V removed = entryList.remove(index).getValue();
-    if (!overflowEntries.isEmpty()) {
-      // Shift the first entry in the overflow to be the last entry in the
-      // array.
-      final Iterator<Map.Entry<K, V>> iterator = getOverflowEntriesMutable().entrySet().iterator();
-      entryList.add(new Entry(iterator.next()));
-      iterator.remove();
-    }
-    return removed;
-  }
-
-  /**
-   * @param key The key to find in the entry array.
-   * @return The returned integer position follows the same semantics as the value returned by
-   *     {@link java.util.Arrays#binarySearch()}.
-   */
-  private int binarySearchInArray(K key) {
-    int left = 0;
-    int right = entryList.size() - 1;
-
-    // Optimization: For the common case in which entries are added in
-    // ascending tag order, check the largest element in the array before
-    // doing a full binary search.
-    if (right >= 0) {
-      int cmp = key.compareTo(entryList.get(right).getKey());
-      if (cmp > 0) {
-        return -(right + 2); // Insert point is after "right".
-      } else if (cmp == 0) {
-        return right;
-      }
-    }
-
-    while (left <= right) {
-      int mid = (left + right) / 2;
-      int cmp = key.compareTo(entryList.get(mid).getKey());
-      if (cmp < 0) {
-        right = mid - 1;
-      } else if (cmp > 0) {
-        left = mid + 1;
-      } else {
-        return mid;
-      }
-    }
-    return -(left + 1);
-  }
-
-  /**
-   * Similar to the AbstractMap implementation of {@code keySet()} and {@code values()}, the entry
-   * set is created the first time this method is called, and returned in response to all subsequent
-   * calls.
-   *
-   * <p>{@inheritDoc}
-   */
-  @Override
-  public Set<Map.Entry<K, V>> entrySet() {
-    if (lazyEntrySet == null) {
-      lazyEntrySet = new EntrySet();
-    }
-    return lazyEntrySet;
-  }
-
-  Set<Map.Entry<K, V>> descendingEntrySet() {
-    if (lazyDescendingEntrySet == null) {
-      lazyDescendingEntrySet = new DescendingEntrySet();
-    }
-    return lazyDescendingEntrySet;
-  }
-
-  /** @throws UnsupportedOperationException if {@link #makeImmutable()} has has been called. */
-  private void checkMutable() {
-    if (isImmutable) {
-      throw new UnsupportedOperationException();
-    }
-  }
-
-  /**
-   * @return a {@link SortedMap} to which overflow entries mappings can be added or removed.
-   * @throws UnsupportedOperationException if {@link #makeImmutable()} has been called.
-   */
-  private SortedMap<K, V> getOverflowEntriesMutable() {
-    checkMutable();
-    if (overflowEntries.isEmpty() && !(overflowEntries instanceof TreeMap)) {
-      overflowEntries = new TreeMap<K, V>();
-      overflowEntriesDescending = ((TreeMap<K, V>) overflowEntries).descendingMap();
-    }
-    return (SortedMap<K, V>) overflowEntries;
-  }
-
-  /** Lazily creates the entry list. Any code that adds to the list must first call this method. */
-  private void ensureEntryArrayMutable() {
-    checkMutable();
-    if (entryList.isEmpty() && !(entryList instanceof ArrayList)) {
-      entryList = new ArrayList<Entry>(maxArraySize);
-    }
-  }
-
-  /**
-   * Entry implementation that implements Comparable in order to support binary search within the
-   * entry array. Also checks mutability in {@link #setValue()}.
-   */
-  private class Entry implements Map.Entry<K, V>, Comparable<Entry> {
-
-    private final K key;
-    private V value;
-
-    Entry(Map.Entry<K, V> copy) {
-      this(copy.getKey(), copy.getValue());
-    }
-
-    Entry(K key, V value) {
-      this.key = key;
-      this.value = value;
-    }
-
-    @Override
-    public K getKey() {
-      return key;
-    }
-
-    @Override
-    public V getValue() {
-      return value;
-    }
-
-    @Override
-    public int compareTo(Entry other) {
-      return getKey().compareTo(other.getKey());
-    }
-
-    @Override
-    public V setValue(V newValue) {
-      checkMutable();
-      final V oldValue = this.value;
-      this.value = newValue;
-      return oldValue;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-      if (o == this) {
-        return true;
-      }
-      if (!(o instanceof Map.Entry)) {
-        return false;
-      }
-      Map.Entry<?, ?> other = (Map.Entry<?, ?>) o;
-      return equals(key, other.getKey()) && equals(value, other.getValue());
-    }
-
-    @Override
-    public int hashCode() {
-      return (key == null ? 0 : key.hashCode()) ^ (value == null ? 0 : value.hashCode());
-    }
-
-    @Override
-    public String toString() {
-      return key + "=" + value;
-    }
-
-    /** equals() that handles null values. */
-    private boolean equals(Object o1, Object o2) {
-      return o1 == null ? o2 == null : o1.equals(o2);
-    }
-  }
-
-  /** Stateless view of the entries in the field map. */
-  private class EntrySet extends AbstractSet<Map.Entry<K, V>> {
-
-    @Override
-    public Iterator<Map.Entry<K, V>> iterator() {
-      return new EntryIterator();
-    }
-
-    @Override
-    public int size() {
-      return SmallSortedMap.this.size();
-    }
-
-    /**
-     * Throws a {@link ClassCastException} if o is not of the expected type.
-     *
-     * <p>{@inheritDoc}
-     */
-    @Override
-    public boolean contains(Object o) {
-      @SuppressWarnings("unchecked")
-      final Map.Entry<K, V> entry = (Map.Entry<K, V>) o;
-      final V existing = get(entry.getKey());
-      final V value = entry.getValue();
-      return existing == value || (existing != null && existing.equals(value));
-    }
-
-    @Override
-    public boolean add(Map.Entry<K, V> entry) {
-      if (!contains(entry)) {
-        put(entry.getKey(), entry.getValue());
-        return true;
-      }
-      return false;
-    }
-
-    /**
-     * Throws a {@link ClassCastException} if o is not of the expected type.
-     *
-     * <p>{@inheritDoc}
-     */
-    @Override
-    public boolean remove(Object o) {
-      @SuppressWarnings("unchecked")
-      final Map.Entry<K, V> entry = (Map.Entry<K, V>) o;
-      if (contains(entry)) {
-        SmallSortedMap.this.remove(entry.getKey());
-        return true;
-      }
-      return false;
-    }
-
-    @Override
-    public void clear() {
-      SmallSortedMap.this.clear();
-    }
-  }
-
-  private class DescendingEntrySet extends EntrySet {
-    @Override
-    public Iterator<java.util.Map.Entry<K, V>> iterator() {
-      return new DescendingEntryIterator();
-    }
-  }
-
-  /**
-   * Iterator implementation that switches from the entry array to the overflow entries
-   * appropriately.
-   */
-  private class EntryIterator implements Iterator<Map.Entry<K, V>> {
-
-    private int pos = -1;
-    private boolean nextCalledBeforeRemove;
-    private Iterator<Map.Entry<K, V>> lazyOverflowIterator;
-
-    @Override
-    public boolean hasNext() {
-      return (pos + 1) < entryList.size()
-          || (!overflowEntries.isEmpty() && getOverflowIterator().hasNext());
-    }
-
-    @Override
-    public Map.Entry<K, V> next() {
-      nextCalledBeforeRemove = true;
-      // Always increment pos so that we know whether the last returned value
-      // was from the array or from overflow.
-      if (++pos < entryList.size()) {
-        return entryList.get(pos);
-      }
-      return getOverflowIterator().next();
-    }
-
-    @Override
-    public void remove() {
-      if (!nextCalledBeforeRemove) {
-        throw new IllegalStateException("remove() was called before next()");
-      }
-      nextCalledBeforeRemove = false;
-      checkMutable();
-
-      if (pos < entryList.size()) {
-        removeArrayEntryAt(pos--);
-      } else {
-        getOverflowIterator().remove();
-      }
-    }
-
-    /**
-     * It is important to create the overflow iterator only after the array entries have been
-     * iterated over because the overflow entry set changes when the client calls remove() on the
-     * array entries, which invalidates any existing iterators.
-     */
-    private Iterator<Map.Entry<K, V>> getOverflowIterator() {
-      if (lazyOverflowIterator == null) {
-        lazyOverflowIterator = overflowEntries.entrySet().iterator();
-      }
-      return lazyOverflowIterator;
-    }
-  }
-
-  /**
-   * Reverse Iterator implementation that switches from the entry array to the overflow entries
-   * appropriately.
-   */
-  private class DescendingEntryIterator implements Iterator<Map.Entry<K, V>> {
-
-    private int pos = entryList.size();
-    private Iterator<Map.Entry<K, V>> lazyOverflowIterator;
-
-    @Override
-    public boolean hasNext() {
-      return (pos > 0 && pos <= entryList.size()) || getOverflowIterator().hasNext();
-    }
-
-    @Override
-    public Map.Entry<K, V> next() {
-      if (getOverflowIterator().hasNext()) {
-        return getOverflowIterator().next();
-      }
-      return entryList.get(--pos);
-    }
-
-    @Override
-    public void remove() {
-      throw new UnsupportedOperationException();
-    }
-
-    /**
-     * It is important to create the overflow iterator only after the array entries have been
-     * iterated over because the overflow entry set changes when the client calls remove() on the
-     * array entries, which invalidates any existing iterators.
-     */
-    private Iterator<Map.Entry<K, V>> getOverflowIterator() {
-      if (lazyOverflowIterator == null) {
-        lazyOverflowIterator = overflowEntriesDescending.entrySet().iterator();
-      }
-      return lazyOverflowIterator;
-    }
-  }
-
-  /**
-   * Helper class that holds immutable instances of an Iterable/Iterator that we return when the
-   * overflow entries is empty. This eliminates the creation of an Iterator object when there is
-   * nothing to iterate over.
-   */
-  private static class EmptySet {
-
-    private static final Iterator<Object> ITERATOR =
-        new Iterator<Object>() {
-          @Override
-          public boolean hasNext() {
-            return false;
-          }
-
-          @Override
-          public Object next() {
-            throw new NoSuchElementException();
-          }
-
-          @Override
-          public void remove() {
-            throw new UnsupportedOperationException();
-          }
-        };
-
-    private static final Iterable<Object> ITERABLE =
-        new Iterable<Object>() {
-          @Override
-          public Iterator<Object> iterator() {
-            return ITERATOR;
-          }
-        };
-
-    @SuppressWarnings("unchecked")
-    static <T> Iterable<T> iterable() {
-      return (Iterable<T>) ITERABLE;
-    }
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) {
-      return true;
-    }
-
-    if (!(o instanceof SmallSortedMap)) {
-      return super.equals(o);
-    }
-
-    SmallSortedMap<?, ?> other = (SmallSortedMap<?, ?>) o;
-    final int size = size();
-    if (size != other.size()) {
-      return false;
-    }
-
-    // Best effort try to avoid allocating an entry set.
-    final int numArrayEntries = getNumArrayEntries();
-    if (numArrayEntries != other.getNumArrayEntries()) {
-      return entrySet().equals(other.entrySet());
-    }
-
-    for (int i = 0; i < numArrayEntries; i++) {
-      if (!getArrayEntryAt(i).equals(other.getArrayEntryAt(i))) {
-        return false;
-      }
-    }
-
-    if (numArrayEntries != size) {
-      return overflowEntries.equals(other.overflowEntries);
-    }
-
-    return true;
-  }
-
-  @Override
-  public int hashCode() {
-    int h = 0;
-    final int listSize = getNumArrayEntries();
-    for (int i = 0; i < listSize; i++) {
-      h += entryList.get(i).hashCode();
-    }
-    // Avoid the iterator allocation if possible.
-    if (getNumOverflowEntries() > 0) {
-      h += overflowEntries.hashCode();
-    }
-    return h;
-  }
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/StructuralMessageInfo.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/StructuralMessageInfo.java
deleted file mode 100644
index defb53e..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/StructuralMessageInfo.java
+++ /dev/null
@@ -1,168 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.protobuf.Internal.checkNotNull;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-/**
- * Information for the layout of a protobuf message class. This describes all of the fields
- * contained within a message.
- */
-@ExperimentalApi
-@CheckReturnValue
-final class StructuralMessageInfo implements MessageInfo {
-  private final ProtoSyntax syntax;
-  private final boolean messageSetWireFormat;
-  private final int[] checkInitialized;
-  private final FieldInfo[] fields;
-  private final MessageLite defaultInstance;
-
-  /**
-   * Constructor.
-   *
-   * @param checkInitialized fields to check in isInitialized().
-   * @param fields the set of fields for the message, in field number order.
-   */
-  StructuralMessageInfo(
-      ProtoSyntax syntax,
-      boolean messageSetWireFormat,
-      int[] checkInitialized,
-      FieldInfo[] fields,
-      Object defaultInstance) {
-    this.syntax = syntax;
-    this.messageSetWireFormat = messageSetWireFormat;
-    this.checkInitialized = checkInitialized;
-    this.fields = fields;
-    this.defaultInstance = (MessageLite) checkNotNull(defaultInstance, "defaultInstance");
-  }
-
-  /** Gets the syntax for the message (e.g. PROTO2, PROTO3). */
-  @Override
-  public ProtoSyntax getSyntax() {
-    return syntax;
-  }
-
-  /** Indicates whether or not the message should be represented with message set wire format. */
-  @Override
-  public boolean isMessageSetWireFormat() {
-    return messageSetWireFormat;
-  }
-
-  /** An array of field numbers that need to be checked for isInitialized(). */
-  public int[] getCheckInitialized() {
-    return checkInitialized;
-  }
-
-  /**
-   * Gets the information for all fields within this message, sorted in ascending order by their
-   * field number.
-   */
-  public FieldInfo[] getFields() {
-    return fields;
-  }
-
-  @Override
-  public MessageLite getDefaultInstance() {
-    return defaultInstance;
-  }
-
-  /** Helper method for creating a new builder for {@link MessageInfo}. */
-  public static Builder newBuilder() {
-    return new Builder();
-  }
-
-  /** Helper method for creating a new builder for {@link MessageInfo}. */
-  public static Builder newBuilder(int numFields) {
-    return new Builder(numFields);
-  }
-
-  /** A builder of {@link MessageInfo} instances. */
-  public static final class Builder {
-    private final List<FieldInfo> fields;
-    private ProtoSyntax syntax;
-    private boolean wasBuilt;
-    private boolean messageSetWireFormat;
-    private int[] checkInitialized = null;
-    private Object defaultInstance;
-
-    public Builder() {
-      fields = new ArrayList<FieldInfo>();
-    }
-
-    public Builder(int numFields) {
-      fields = new ArrayList<FieldInfo>(numFields);
-    }
-
-    public void withDefaultInstance(Object defaultInstance) {
-      this.defaultInstance = defaultInstance;
-    }
-
-    public void withSyntax(ProtoSyntax syntax) {
-      this.syntax = checkNotNull(syntax, "syntax");
-    }
-
-    public void withMessageSetWireFormat(boolean messageSetWireFormat) {
-      this.messageSetWireFormat = messageSetWireFormat;
-    }
-
-    public void withCheckInitialized(int[] checkInitialized) {
-      this.checkInitialized = checkInitialized;
-    }
-
-    public void withField(FieldInfo field) {
-      if (wasBuilt) {
-        throw new IllegalStateException("Builder can only build once");
-      }
-      fields.add(field);
-    }
-
-    public StructuralMessageInfo build() {
-      if (wasBuilt) {
-        throw new IllegalStateException("Builder can only build once");
-      }
-      if (syntax == null) {
-        throw new IllegalStateException("Must specify a proto syntax");
-      }
-      wasBuilt = true;
-      Collections.sort(fields);
-      return new StructuralMessageInfo(
-          syntax,
-          messageSetWireFormat,
-          checkInitialized,
-          fields.toArray(new FieldInfo[0]),
-          defaultInstance);
-    }
-  }
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/TextFormat.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/TextFormat.java
deleted file mode 100644
index a8af845..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/TextFormat.java
+++ /dev/null
@@ -1,2688 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import com.google.protobuf.Descriptors.Descriptor;
-import com.google.protobuf.Descriptors.EnumDescriptor;
-import com.google.protobuf.Descriptors.EnumValueDescriptor;
-import com.google.protobuf.Descriptors.FieldDescriptor;
-import com.google.protobuf.MessageReflection.MergeTarget;
-import java.io.IOException;
-import java.math.BigInteger;
-import java.nio.CharBuffer;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.logging.Logger;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * Provide text parsing and formatting support for proto2 instances. The implementation largely
- * follows text_format.cc.
- *
- * @author wenboz@google.com Wenbo Zhu
- * @author kenton@google.com Kenton Varda
- */
-public final class TextFormat {
-  private TextFormat() {}
-
-  private static final Logger logger = Logger.getLogger(TextFormat.class.getName());
-
-  private static final String DEBUG_STRING_SILENT_MARKER = "\t ";
-
-
-  /**
-   * Outputs a textual representation of the Protocol Message supplied into the parameter output.
-   * (This representation is the new version of the classic "ProtocolPrinter" output from the
-   * original Protocol Buffer system)
-   *
-   * @deprecated Use {@code printer().print(MessageOrBuilder, Appendable)}
-   */
-  @Deprecated
-  @InlineMe(
-      replacement = "TextFormat.printer().print(message, output)",
-      imports = "com.google.protobuf.TextFormat")
-  public static void print(final MessageOrBuilder message, final Appendable output)
-      throws IOException {
-    printer().print(message, output);
-  }
-
-  /**
-   * Outputs a textual representation of {@code fields} to {@code output}.
-   *
-   * @deprecated Use {@code printer().print(UnknownFieldSet, Appendable)}
-   */
-  @Deprecated
-  public static void print(final UnknownFieldSet fields, final Appendable output)
-      throws IOException {
-    printer().print(fields, output);
-  }
-
-  /**
-   * Same as {@code print()}, except that non-ASCII characters are not escaped.
-   *
-   * @deprecated Use {@code printer().escapingNonAscii(false).print(MessageOrBuilder, Appendable)}
-   */
-  @Deprecated
-  @InlineMe(
-      replacement = "TextFormat.printer().escapingNonAscii(false).print(message, output)",
-      imports = "com.google.protobuf.TextFormat")
-  public static void printUnicode(final MessageOrBuilder message, final Appendable output)
-      throws IOException {
-    printer().escapingNonAscii(false).print(message, output);
-  }
-
-  /**
-   * Same as {@code print()}, except that non-ASCII characters are not escaped.
-   *
-   * @deprecated Use {@code printer().escapingNonAscii(false).print(UnknownFieldSet, Appendable)}
-   */
-  @Deprecated
-  public static void printUnicode(final UnknownFieldSet fields, final Appendable output)
-      throws IOException {
-    printer().escapingNonAscii(false).print(fields, output);
-  }
-
-  /**
-   * Generates a human readable form of this message, useful for debugging and other purposes, with
-   * no newline characters. This is just a trivial wrapper around
-   * {@link TextFormat.Printer#shortDebugString(MessageOrBuilder)}.
-   */
-  public static String shortDebugString(final MessageOrBuilder message) {
-    return printer().shortDebugString(message);
-  }
-
-  /**
-   * Generates a human readable form of the field, useful for debugging and other purposes, with
-   * no newline characters.
-   *
-   * @deprecated Use {@code printer().shortDebugString(FieldDescriptor, Object)}
-   */
-  @Deprecated
-  public static String shortDebugString(final FieldDescriptor field, final Object value) {
-    return printer().shortDebugString(field, value);
-  }
-  //
-  /**
-   * Generates a human readable form of the unknown fields, useful for debugging and other
-   * purposes, with no newline characters.
-   *
-   * @deprecated Use {@code printer().shortDebugString(UnknownFieldSet)}
-   */
-  @Deprecated
-  public static String shortDebugString(final UnknownFieldSet fields) {
-    return printer().shortDebugString(fields);
-  }
-
-  /**
-   * Like {@code print()}, but writes directly to a {@code String} and returns it.
-   *
-   * @deprecated Use {@code message.toString()}
-   */
-  @Deprecated
-  @InlineMe(
-      replacement = "TextFormat.printer().printToString(message)",
-      imports = "com.google.protobuf.TextFormat")
-  public static String printToString(final MessageOrBuilder message) {
-    return printer().printToString(message);
-  }
-
-  /**
-   * Like {@code print()}, but writes directly to a {@code String} and returns it.
-   *
-   * @deprecated Use {@link UnknownFieldSet#toString()}
-   */
-  @Deprecated
-  public static String printToString(final UnknownFieldSet fields) {
-    return printer().printToString(fields);
-  }
-
-  /**
-   * Same as {@code printToString()}, except that non-ASCII characters in string type fields are not
-   * escaped in backslash+octals.
-   *
-   * @deprecated Use {@code printer().escapingNonAscii(false).printToString(MessageOrBuilder)}
-   */
-  @Deprecated
-  @InlineMe(
-      replacement = "TextFormat.printer().escapingNonAscii(false).printToString(message)",
-      imports = "com.google.protobuf.TextFormat")
-  public static String printToUnicodeString(final MessageOrBuilder message) {
-    return printer().escapingNonAscii(false).printToString(message);
-  }
-
-  /**
-   * Same as {@code printToString()}, except that non-ASCII characters in string type fields are
-   * not escaped in backslash+octals.
-   *
-   * @deprecated Use {@code printer().escapingNonAscii(false).printToString(UnknownFieldSet)}
-   */
-  @Deprecated
-  public static String printToUnicodeString(final UnknownFieldSet fields) {
-    return printer().escapingNonAscii(false).printToString(fields);
-  }
-  //
-  /** @deprecated Use {@code printer().printField(FieldDescriptor, Object, Appendable)} */
-  @Deprecated
-  public static void printField(
-      final FieldDescriptor field, final Object value, final Appendable output)
-      throws IOException {
-    printer().printField(field, value, output);
-  }
-  //
-  /** @deprecated Use {@code printer().printFieldToString(FieldDescriptor, Object)} */
-  @Deprecated
-  public static String printFieldToString(final FieldDescriptor field, final Object value) {
-    return printer().printFieldToString(field, value);
-  }
-  //
-  /**
-   * Outputs a unicode textual representation of the value of given field value.
-   *
-   * <p>Same as {@code printFieldValue()}, except that non-ASCII characters in string type fields
-   * are not escaped in backslash+octals.
-   *
-   * @deprecated Use {@code printer().escapingNonAscii(false).printFieldValue(FieldDescriptor,
-   *     Object, Appendable)}
-   * @param field the descriptor of the field
-   * @param value the value of the field
-   * @param output the output to which to append the formatted value
-   * @throws ClassCastException if the value is not appropriate for the given field descriptor
-   * @throws IOException if there is an exception writing to the output
-   */
-  @Deprecated
-  public static void printUnicodeFieldValue(
-      final FieldDescriptor field, final Object value, final Appendable output)
-      throws IOException {
-    printer().escapingNonAscii(false).printFieldValue(field, value, output);
-  }
-
-  /**
-   * Outputs a textual representation of the value of given field value.
-   *
-   * @deprecated Use {@code printer().printFieldValue(FieldDescriptor, Object, Appendable)}
-   * @param field the descriptor of the field
-   * @param value the value of the field
-   * @param output the output to which to append the formatted value
-   * @throws ClassCastException if the value is not appropriate for the given field descriptor
-   * @throws IOException if there is an exception writing to the output
-   */
-  @Deprecated
-  @InlineMe(
-      replacement = "TextFormat.printer().printFieldValue(field, value, output)",
-      imports = "com.google.protobuf.TextFormat")
-  public static void printFieldValue(
-      final FieldDescriptor field, final Object value, final Appendable output) throws IOException {
-    printer().printFieldValue(field, value, output);
-  }
-
-  /**
-   * Outputs a textual representation of the value of an unknown field.
-   *
-   * @param tag the field's tag number
-   * @param value the value of the field
-   * @param output the output to which to append the formatted value
-   * @throws ClassCastException if the value is not appropriate for the given field descriptor
-   * @throws IOException if there is an exception writing to the output
-   */
-  public static void printUnknownFieldValue(
-      final int tag, final Object value, final Appendable output) throws IOException {
-    printUnknownFieldValue(tag, value, multiLineOutput(output));
-  }
-
-  private static void printUnknownFieldValue(
-      final int tag, final Object value, final TextGenerator generator) throws IOException {
-    switch (WireFormat.getTagWireType(tag)) {
-      case WireFormat.WIRETYPE_VARINT:
-        generator.print(unsignedToString((Long) value));
-        break;
-      case WireFormat.WIRETYPE_FIXED32:
-        generator.print(String.format((Locale) null, "0x%08x", (Integer) value));
-        break;
-      case WireFormat.WIRETYPE_FIXED64:
-        generator.print(String.format((Locale) null, "0x%016x", (Long) value));
-        break;
-      case WireFormat.WIRETYPE_LENGTH_DELIMITED:
-        try {
-          // Try to parse and print the field as an embedded message
-          UnknownFieldSet message = UnknownFieldSet.parseFrom((ByteString) value);
-          generator.print("{");
-          generator.eol();
-          generator.indent();
-          Printer.printUnknownFields(message, generator);
-          generator.outdent();
-          generator.print("}");
-        } catch (InvalidProtocolBufferException e) {
-          // If not parseable as a message, print as a String
-          generator.print("\"");
-          generator.print(escapeBytes((ByteString) value));
-          generator.print("\"");
-        }
-        break;
-      case WireFormat.WIRETYPE_START_GROUP:
-        Printer.printUnknownFields((UnknownFieldSet) value, generator);
-        break;
-      default:
-        throw new IllegalArgumentException("Bad tag: " + tag);
-    }
-  }
-
-  /** Printer instance which escapes non-ASCII characters. */
-  public static Printer printer() {
-    return Printer.DEFAULT;
-  }
-
-  /** Helper class for converting protobufs to text. */
-  public static final class Printer {
-
-    // Printer instance which escapes non-ASCII characters.
-    private static final Printer DEFAULT = new Printer(true, TypeRegistry.getEmptyTypeRegistry());
-
-    /** Whether to escape non ASCII characters with backslash and octal. */
-    private final boolean escapeNonAscii;
-
-    private final TypeRegistry typeRegistry;
-
-    private Printer(boolean escapeNonAscii, TypeRegistry typeRegistry) {
-      this.escapeNonAscii = escapeNonAscii;
-      this.typeRegistry = typeRegistry;
-    }
-
-    /**
-     * Return a new Printer instance with the specified escape mode.
-     *
-     * @param escapeNonAscii If true, the new Printer will escape non-ASCII characters (this is the
-     *     default behavior. If false, the new Printer will print non-ASCII characters as is. In
-     *     either case, the new Printer still escapes newlines and quotes in strings.
-     * @return a new Printer that clones all other configurations from the current {@link Printer},
-     *     with the escape mode set to the given parameter.
-     */
-    public Printer escapingNonAscii(boolean escapeNonAscii) {
-      return new Printer(escapeNonAscii, typeRegistry);
-    }
-
-    /**
-     * Creates a new {@link Printer} using the given typeRegistry. The new Printer clones all other
-     * configurations from the current {@link Printer}.
-     *
-     * @throws IllegalArgumentException if a registry is already set.
-     */
-    public Printer usingTypeRegistry(TypeRegistry typeRegistry) {
-      if (this.typeRegistry != TypeRegistry.getEmptyTypeRegistry()) {
-        throw new IllegalArgumentException("Only one typeRegistry is allowed.");
-      }
-      return new Printer(escapeNonAscii, typeRegistry);
-    }
-
-    /**
-     * Outputs a textual representation of the Protocol Message supplied into the parameter output.
-     * (This representation is the new version of the classic "ProtocolPrinter" output from the
-     * original Protocol Buffer system)
-     */
-    public void print(final MessageOrBuilder message, final Appendable output) throws IOException {
-      print(message, multiLineOutput(output));
-    }
-
-    /** Outputs a textual representation of {@code fields} to {@code output}. */
-    public void print(final UnknownFieldSet fields, final Appendable output) throws IOException {
-      printUnknownFields(fields, multiLineOutput(output));
-    }
-
-    private void print(final MessageOrBuilder message, final TextGenerator generator)
-        throws IOException {
-      if (message.getDescriptorForType().getFullName().equals("google.protobuf.Any")
-          && printAny(message, generator)) {
-        return;
-      }
-      printMessage(message, generator);
-    }
-
-    /**
-     * Attempt to print the 'google.protobuf.Any' message in a human-friendly format. Returns false
-     * if the message isn't a valid 'google.protobuf.Any' message (in which case the message should
-     * be rendered just like a regular message to help debugging).
-     */
-    private boolean printAny(final MessageOrBuilder message, final TextGenerator generator)
-        throws IOException {
-      Descriptor messageType = message.getDescriptorForType();
-      FieldDescriptor typeUrlField = messageType.findFieldByNumber(1);
-      FieldDescriptor valueField = messageType.findFieldByNumber(2);
-      if (typeUrlField == null
-          || typeUrlField.getType() != FieldDescriptor.Type.STRING
-          || valueField == null
-          || valueField.getType() != FieldDescriptor.Type.BYTES) {
-        // The message may look like an Any but isn't actually an Any message (might happen if the
-        // user tries to use DynamicMessage to construct an Any from incomplete Descriptor).
-        return false;
-      }
-      String typeUrl = (String) message.getField(typeUrlField);
-      // If type_url is not set, we will not be able to decode the content of the value, so just
-      // print out the Any like a regular message.
-      if (typeUrl.isEmpty()) {
-        return false;
-      }
-      Object value = message.getField(valueField);
-
-      Message.Builder contentBuilder = null;
-      try {
-        Descriptor contentType = typeRegistry.getDescriptorForTypeUrl(typeUrl);
-        if (contentType == null) {
-          return false;
-        }
-        contentBuilder = DynamicMessage.getDefaultInstance(contentType).newBuilderForType();
-        contentBuilder.mergeFrom((ByteString) value);
-      } catch (InvalidProtocolBufferException e) {
-        // The value of Any is malformed. We cannot print it out nicely, so fallback to printing out
-        // the type_url and value as bytes. Note that we fail open here to be consistent with
-        // text_format.cc, and also to allow a way for users to inspect the content of the broken
-        // message.
-        return false;
-      }
-      generator.print("[");
-      generator.print(typeUrl);
-      generator.print("] {");
-      generator.eol();
-      generator.indent();
-      print(contentBuilder, generator);
-      generator.outdent();
-      generator.print("}");
-      generator.eol();
-      return true;
-    }
-
-    public String printFieldToString(final FieldDescriptor field, final Object value) {
-      try {
-        final StringBuilder text = new StringBuilder();
-        printField(field, value, text);
-        return text.toString();
-      } catch (IOException e) {
-        throw new IllegalStateException(e);
-      }
-    }
-
-    public void printField(final FieldDescriptor field, final Object value, final Appendable output)
-        throws IOException {
-      printField(field, value, multiLineOutput(output));
-    }
-
-    private void printField(
-        final FieldDescriptor field, final Object value, final TextGenerator generator)
-        throws IOException {
-      // Sort map field entries by key
-      if (field.isMapField()) {
-        List<MapEntryAdapter> adapters = new ArrayList<>();
-        for (Object entry : (List<?>) value) {
-          adapters.add(new MapEntryAdapter(entry, field));
-        }
-        Collections.sort(adapters);
-        for (MapEntryAdapter adapter : adapters) {
-          printSingleField(field, adapter.getEntry(), generator);
-        }
-      } else if (field.isRepeated()) {
-        // Repeated field.  Print each element.
-        for (Object element : (List<?>) value) {
-          printSingleField(field, element, generator);
-        }
-      } else {
-        printSingleField(field, value, generator);
-      }
-    }
-
-    /**
-     * An adapter class that can take a {@link MapEntry} and returns its key and entry.
-     */
-    private static class MapEntryAdapter implements Comparable<MapEntryAdapter> {
-      private Object entry;
-
-      @SuppressWarnings({"rawtypes"})
-      private MapEntry mapEntry;
-
-
-      private final FieldDescriptor.JavaType fieldType;
-
-      MapEntryAdapter(Object entry, FieldDescriptor fieldDescriptor) {
-        if (entry instanceof MapEntry) {
-          this.mapEntry = (MapEntry) entry;
-        } else {
-          this.entry = entry;
-        }
-        this.fieldType = extractFieldType(fieldDescriptor);
-      }
-
-      private static FieldDescriptor.JavaType extractFieldType(FieldDescriptor fieldDescriptor) {
-        return fieldDescriptor.getMessageType().getFields().get(0).getJavaType();
-      }
-
-      Object getKey() {
-        if (mapEntry != null) {
-          return mapEntry.getKey();
-        }
-        return null;
-      }
-
-      Object getEntry() {
-        if (mapEntry != null) {
-          return mapEntry;
-        }
-        return entry;
-      }
-
-      @Override
-      public int compareTo(MapEntryAdapter b) {
-        if (getKey() == null || b.getKey() == null) {
-          logger.info("Invalid key for map field.");
-          return -1;
-        }
-        switch (fieldType) {
-          case BOOLEAN:
-            return Boolean.valueOf((boolean) getKey()).compareTo((boolean) b.getKey());
-          case LONG:
-            return Long.valueOf((long) getKey()).compareTo((long) b.getKey());
-          case INT:
-            return Integer.valueOf((int) getKey()).compareTo((int) b.getKey());
-          case STRING:
-            String aString = (String) getKey();
-            String bString = (String) b.getKey();
-            if (aString == null && bString == null) {
-              return 0;
-            } else if (aString == null && bString != null) {
-              return -1;
-            } else if (aString != null && bString == null) {
-              return 1;
-            } else {
-              return aString.compareTo(bString);
-            }
-          default:
-            return 0;
-        }
-      }
-    }
-
-    /**
-     * Outputs a textual representation of the value of given field value.
-     *
-     * @param field the descriptor of the field
-     * @param value the value of the field
-     * @param output the output to which to append the formatted value
-     * @throws ClassCastException if the value is not appropriate for the given field descriptor
-     * @throws IOException if there is an exception writing to the output
-     */
-    public void printFieldValue(
-        final FieldDescriptor field, final Object value, final Appendable output)
-        throws IOException {
-      printFieldValue(field, value, multiLineOutput(output));
-    }
-
-    private void printFieldValue(
-        final FieldDescriptor field, final Object value, final TextGenerator generator)
-        throws IOException {
-      switch (field.getType()) {
-        case INT32:
-        case SINT32:
-        case SFIXED32:
-          generator.print(((Integer) value).toString());
-          break;
-
-        case INT64:
-        case SINT64:
-        case SFIXED64:
-          generator.print(((Long) value).toString());
-          break;
-
-        case BOOL:
-          generator.print(((Boolean) value).toString());
-          break;
-
-        case FLOAT:
-          generator.print(((Float) value).toString());
-          break;
-
-        case DOUBLE:
-          generator.print(((Double) value).toString());
-          break;
-
-        case UINT32:
-        case FIXED32:
-          generator.print(unsignedToString((Integer) value));
-          break;
-
-        case UINT64:
-        case FIXED64:
-          generator.print(unsignedToString((Long) value));
-          break;
-
-        case STRING:
-          generator.print("\"");
-          generator.print(
-              escapeNonAscii
-                  ? TextFormatEscaper.escapeText((String) value)
-                  : escapeDoubleQuotesAndBackslashes((String) value).replace("\n", "\\n"));
-          generator.print("\"");
-          break;
-
-        case BYTES:
-          generator.print("\"");
-          if (value instanceof ByteString) {
-            generator.print(escapeBytes((ByteString) value));
-          } else {
-            generator.print(escapeBytes((byte[]) value));
-          }
-          generator.print("\"");
-          break;
-
-        case ENUM:
-          generator.print(((EnumValueDescriptor) value).getName());
-          break;
-
-        case MESSAGE:
-        case GROUP:
-          print((MessageOrBuilder) value, generator);
-          break;
-      }
-    }
-
-    /** Like {@code print()}, but writes directly to a {@code String} and returns it. */
-    public String printToString(final MessageOrBuilder message) {
-      try {
-        final StringBuilder text = new StringBuilder();
-        print(message, text);
-        return text.toString();
-      } catch (IOException e) {
-        throw new IllegalStateException(e);
-      }
-    }
-    /** Like {@code print()}, but writes directly to a {@code String} and returns it. */
-    public String printToString(final UnknownFieldSet fields) {
-      try {
-        final StringBuilder text = new StringBuilder();
-        print(fields, text);
-        return text.toString();
-      } catch (IOException e) {
-        throw new IllegalStateException(e);
-      }
-    }
-
-    /**
-     * Generates a human readable form of this message, useful for debugging and other purposes,
-     * with no newline characters.
-     */
-    public String shortDebugString(final MessageOrBuilder message) {
-      try {
-        final StringBuilder text = new StringBuilder();
-        print(message, singleLineOutput(text));
-        return text.toString();
-      } catch (IOException e) {
-        throw new IllegalStateException(e);
-      }
-    }
-
-    /**
-     * Generates a human readable form of the field, useful for debugging and other purposes, with
-     * no newline characters.
-     */
-    public String shortDebugString(final FieldDescriptor field, final Object value) {
-      try {
-        final StringBuilder text = new StringBuilder();
-        printField(field, value, singleLineOutput(text));
-        return text.toString();
-      } catch (IOException e) {
-        throw new IllegalStateException(e);
-      }
-    }
-
-    /**
-     * Generates a human readable form of the unknown fields, useful for debugging and other
-     * purposes, with no newline characters.
-     */
-    public String shortDebugString(final UnknownFieldSet fields) {
-      try {
-        final StringBuilder text = new StringBuilder();
-        printUnknownFields(fields, singleLineOutput(text));
-        return text.toString();
-      } catch (IOException e) {
-        throw new IllegalStateException(e);
-      }
-    }
-
-    private static void printUnknownFieldValue(
-        final int tag, final Object value, final TextGenerator generator) throws IOException {
-      switch (WireFormat.getTagWireType(tag)) {
-        case WireFormat.WIRETYPE_VARINT:
-          generator.print(unsignedToString((Long) value));
-          break;
-        case WireFormat.WIRETYPE_FIXED32:
-          generator.print(String.format((Locale) null, "0x%08x", (Integer) value));
-          break;
-        case WireFormat.WIRETYPE_FIXED64:
-          generator.print(String.format((Locale) null, "0x%016x", (Long) value));
-          break;
-        case WireFormat.WIRETYPE_LENGTH_DELIMITED:
-          try {
-            // Try to parse and print the field as an embedded message
-            UnknownFieldSet message = UnknownFieldSet.parseFrom((ByteString) value);
-            generator.print("{");
-            generator.eol();
-            generator.indent();
-            printUnknownFields(message, generator);
-            generator.outdent();
-            generator.print("}");
-          } catch (InvalidProtocolBufferException e) {
-            // If not parseable as a message, print as a String
-            generator.print("\"");
-            generator.print(escapeBytes((ByteString) value));
-            generator.print("\"");
-          }
-          break;
-        case WireFormat.WIRETYPE_START_GROUP:
-          printUnknownFields((UnknownFieldSet) value, generator);
-          break;
-        default:
-          throw new IllegalArgumentException("Bad tag: " + tag);
-      }
-    }
-
-    private void printMessage(final MessageOrBuilder message, final TextGenerator generator)
-        throws IOException {
-      for (Map.Entry<FieldDescriptor, Object> field : message.getAllFields().entrySet()) {
-        printField(field.getKey(), field.getValue(), generator);
-      }
-      printUnknownFields(message.getUnknownFields(), generator);
-    }
-
-    private void printSingleField(
-        final FieldDescriptor field, final Object value, final TextGenerator generator)
-        throws IOException {
-      if (field.isExtension()) {
-        generator.print("[");
-        // We special-case MessageSet elements for compatibility with proto1.
-        if (field.getContainingType().getOptions().getMessageSetWireFormat()
-            && (field.getType() == FieldDescriptor.Type.MESSAGE)
-            && (field.isOptional())
-            // object equality
-            && (field.getExtensionScope() == field.getMessageType())) {
-          generator.print(field.getMessageType().getFullName());
-        } else {
-          generator.print(field.getFullName());
-        }
-        generator.print("]");
-      } else {
-        if (field.getType() == FieldDescriptor.Type.GROUP) {
-          // Groups must be serialized with their original capitalization.
-          generator.print(field.getMessageType().getName());
-        } else {
-            generator.print(field.getName());
-          }
-        }
-
-      if (field.getJavaType() == FieldDescriptor.JavaType.MESSAGE) {
-        generator.print(" {");
-        generator.eol();
-        generator.indent();
-      } else {
-        generator.print(": ");
-      }
-
-      printFieldValue(field, value, generator);
-
-      if (field.getJavaType() == FieldDescriptor.JavaType.MESSAGE) {
-        generator.outdent();
-        generator.print("}");
-      }
-      generator.eol();
-    }
-
-    private static void printUnknownFields(
-        final UnknownFieldSet unknownFields, final TextGenerator generator) throws IOException {
-      for (Map.Entry<Integer, UnknownFieldSet.Field> entry : unknownFields.asMap().entrySet()) {
-        final int number = entry.getKey();
-        final UnknownFieldSet.Field field = entry.getValue();
-        printUnknownField(number, WireFormat.WIRETYPE_VARINT, field.getVarintList(), generator);
-        printUnknownField(number, WireFormat.WIRETYPE_FIXED32, field.getFixed32List(), generator);
-        printUnknownField(number, WireFormat.WIRETYPE_FIXED64, field.getFixed64List(), generator);
-        printUnknownField(
-            number,
-            WireFormat.WIRETYPE_LENGTH_DELIMITED,
-            field.getLengthDelimitedList(),
-            generator);
-        for (final UnknownFieldSet value : field.getGroupList()) {
-          generator.print(entry.getKey().toString());
-          generator.print(" {");
-          generator.eol();
-          generator.indent();
-          printUnknownFields(value, generator);
-          generator.outdent();
-          generator.print("}");
-          generator.eol();
-        }
-      }
-    }
-
-    private static void printUnknownField(
-        final int number, final int wireType, final List<?> values, final TextGenerator generator)
-        throws IOException {
-      for (final Object value : values) {
-        generator.print(String.valueOf(number));
-        generator.print(": ");
-        printUnknownFieldValue(wireType, value, generator);
-        generator.eol();
-      }
-    }
-  }
-
-  /** Convert an unsigned 32-bit integer to a string. */
-  public static String unsignedToString(final int value) {
-    if (value >= 0) {
-      return Integer.toString(value);
-    } else {
-      return Long.toString(value & 0x00000000FFFFFFFFL);
-    }
-  }
-
-  /** Convert an unsigned 64-bit integer to a string. */
-  public static String unsignedToString(final long value) {
-    if (value >= 0) {
-      return Long.toString(value);
-    } else {
-      // Pull off the most-significant bit so that BigInteger doesn't think
-      // the number is negative, then set it again using setBit().
-      return BigInteger.valueOf(value & 0x7FFFFFFFFFFFFFFFL).setBit(63).toString();
-    }
-  }
-
-  private static TextGenerator multiLineOutput(Appendable output) {
-    return new TextGenerator(output, false);
-  }
-
-  private static TextGenerator singleLineOutput(Appendable output) {
-    return new TextGenerator(output, true);
-  }
-
-  /** An inner class for writing text to the output stream. */
-  private static final class TextGenerator {
-    private final Appendable output;
-    private final StringBuilder indent = new StringBuilder();
-    private final boolean singleLineMode;
-    // While technically we are "at the start of a line" at the very beginning of the output, all
-    // we would do in response to this is emit the (zero length) indentation, so it has no effect.
-    // Setting it false here does however suppress an unwanted leading space in single-line mode.
-    private boolean atStartOfLine = false;
-
-    private TextGenerator(final Appendable output, boolean singleLineMode) {
-      this.output = output;
-      this.singleLineMode = singleLineMode;
-    }
-
-    /**
-     * Indent text by two spaces. After calling Indent(), two spaces will be inserted at the
-     * beginning of each line of text. Indent() may be called multiple times to produce deeper
-     * indents.
-     */
-    public void indent() {
-      indent.append("  ");
-    }
-
-    /** Reduces the current indent level by two spaces, or crashes if the indent level is zero. */
-    public void outdent() {
-      final int length = indent.length();
-      if (length == 0) {
-        throw new IllegalArgumentException(" Outdent() without matching Indent().");
-      }
-      indent.setLength(length - 2);
-    }
-
-    /**
-     * Print text to the output stream. Bare newlines are never expected to be passed to this
-     * method; to indicate the end of a line, call "eol()".
-     */
-    public void print(final CharSequence text) throws IOException {
-      if (atStartOfLine) {
-        atStartOfLine = false;
-        output.append(singleLineMode ? " " : indent);
-      }
-      output.append(text);
-    }
-
-    /**
-     * Signifies reaching the "end of the current line" in the output. In single-line mode, this
-     * does not result in a newline being emitted, but ensures that a separating space is written
-     * before the next output.
-     */
-    public void eol() throws IOException {
-      if (!singleLineMode) {
-        output.append("\n");
-      }
-      atStartOfLine = true;
-    }
-  }
-
-  // =================================================================
-  // Parsing
-
-  /**
-   * Represents a stream of tokens parsed from a {@code String}.
-   *
-   * <p>The Java standard library provides many classes that you might think would be useful for
-   * implementing this, but aren't. For example:
-   *
-   * <ul>
-   *   <li>{@code java.io.StreamTokenizer}: This almost does what we want -- or, at least, something
-   *       that would get us close to what we want -- except for one fatal flaw: It automatically
-   *       un-escapes strings using Java escape sequences, which do not include all the escape
-   *       sequences we need to support (e.g. '\x').
-   *   <li>{@code java.util.Scanner}: This seems like a great way at least to parse regular
-   *       expressions out of a stream (so we wouldn't have to load the entire input into a single
-   *       string before parsing). Sadly, {@code Scanner} requires that tokens be delimited with
-   *       some delimiter. Thus, although the text "foo:" should parse to two tokens ("foo" and
-   *       ":"), {@code Scanner} would recognize it only as a single token. Furthermore, {@code
-   *       Scanner} provides no way to inspect the contents of delimiters, making it impossible to
-   *       keep track of line and column numbers.
-   * </ul>
-   *
-   * <p>Luckily, Java's regular expression support does manage to be useful to us. (Barely: We need
-   * {@code Matcher.usePattern()}, which is new in Java 1.5.) So, we can use that, at least.
-   * Unfortunately, this implies that we need to have the entire input in one contiguous string.
-   */
-  private static final class Tokenizer {
-    private final CharSequence text;
-    private final Matcher matcher;
-    private String currentToken;
-
-    // The character index within this.text at which the current token begins.
-    private int pos = 0;
-
-    // The line and column numbers of the current token.
-    private int line = 0;
-    private int column = 0;
-
-    // The line and column numbers of the previous token (allows throwing
-    // errors *after* consuming).
-    private int previousLine = 0;
-    private int previousColumn = 0;
-
-    // We use possessive quantifiers (*+ and ++) because otherwise the Java
-    // regex matcher has stack overflows on large inputs.
-    private static final Pattern WHITESPACE = Pattern.compile("(\\s|(#.*$))++", Pattern.MULTILINE);
-    private static final Pattern TOKEN =
-        Pattern.compile(
-            "[a-zA-Z_][0-9a-zA-Z_+-]*+|" // an identifier
-                + "[.]?[0-9+-][0-9a-zA-Z_.+-]*+|" // a number
-                + "\"([^\"\n\\\\]|\\\\.)*+(\"|\\\\?$)|" // a double-quoted string
-                + "\'([^\'\n\\\\]|\\\\.)*+(\'|\\\\?$)", // a single-quoted string
-            Pattern.MULTILINE);
-
-    private static final Pattern DOUBLE_INFINITY =
-        Pattern.compile("-?inf(inity)?", Pattern.CASE_INSENSITIVE);
-    private static final Pattern FLOAT_INFINITY =
-        Pattern.compile("-?inf(inity)?f?", Pattern.CASE_INSENSITIVE);
-    private static final Pattern FLOAT_NAN = Pattern.compile("nanf?", Pattern.CASE_INSENSITIVE);
-
-    /**
-     * {@link containsSilentMarkerAfterCurrentToken} indicates if there is a silent marker after the
-     * current token. This value is moved to {@link containsSilentMarkerAfterPrevToken} every time
-     * the next token is parsed.
-     */
-    private boolean containsSilentMarkerAfterCurrentToken = false;
-    private boolean containsSilentMarkerAfterPrevToken = false;
-
-    /** Construct a tokenizer that parses tokens from the given text. */
-    private Tokenizer(final CharSequence text) {
-      this.text = text;
-      this.matcher = WHITESPACE.matcher(text);
-      skipWhitespace();
-      nextToken();
-    }
-
-    int getPreviousLine() {
-      return previousLine;
-    }
-
-    int getPreviousColumn() {
-      return previousColumn;
-    }
-
-    int getLine() {
-      return line;
-    }
-
-    int getColumn() {
-      return column;
-    }
-
-    boolean getContainsSilentMarkerAfterCurrentToken() {
-      return containsSilentMarkerAfterCurrentToken;
-    }
-
-    boolean getContainsSilentMarkerAfterPrevToken() {
-      return containsSilentMarkerAfterPrevToken;
-    }
-
-    /** Are we at the end of the input? */
-    boolean atEnd() {
-      return currentToken.length() == 0;
-    }
-
-    /** Advance to the next token. */
-    void nextToken() {
-      previousLine = line;
-      previousColumn = column;
-
-      // Advance the line counter to the current position.
-      while (pos < matcher.regionStart()) {
-        if (text.charAt(pos) == '\n') {
-          ++line;
-          column = 0;
-        } else {
-          ++column;
-        }
-        ++pos;
-      }
-
-      // Match the next token.
-      if (matcher.regionStart() == matcher.regionEnd()) {
-        // EOF
-        currentToken = "";
-      } else {
-        matcher.usePattern(TOKEN);
-        if (matcher.lookingAt()) {
-          currentToken = matcher.group();
-          matcher.region(matcher.end(), matcher.regionEnd());
-        } else {
-          // Take one character.
-          currentToken = String.valueOf(text.charAt(pos));
-          matcher.region(pos + 1, matcher.regionEnd());
-        }
-
-        skipWhitespace();
-      }
-    }
-
-    /** Skip over any whitespace so that the matcher region starts at the next token. */
-    private void skipWhitespace() {
-      matcher.usePattern(WHITESPACE);
-      if (matcher.lookingAt()) {
-        matcher.region(matcher.end(), matcher.regionEnd());
-      }
-    }
-
-    /**
-     * If the next token exactly matches {@code token}, consume it and return {@code true}.
-     * Otherwise, return {@code false} without doing anything.
-     */
-    boolean tryConsume(final String token) {
-      if (currentToken.equals(token)) {
-        nextToken();
-        return true;
-      } else {
-        return false;
-      }
-    }
-
-    /**
-     * If the next token exactly matches {@code token}, consume it. Otherwise, throw a {@link
-     * ParseException}.
-     */
-    void consume(final String token) throws ParseException {
-      if (!tryConsume(token)) {
-        throw parseException("Expected \"" + token + "\".");
-      }
-    }
-
-    /** Returns {@code true} if the next token is an integer, but does not consume it. */
-    boolean lookingAtInteger() {
-      if (currentToken.length() == 0) {
-        return false;
-      }
-
-      final char c = currentToken.charAt(0);
-      return ('0' <= c && c <= '9') || c == '-' || c == '+';
-    }
-
-    /** Returns {@code true} if the current token's text is equal to that specified. */
-    boolean lookingAt(String text) {
-      return currentToken.equals(text);
-    }
-
-    /**
-     * If the next token is an identifier, consume it and return its value. Otherwise, throw a
-     * {@link ParseException}.
-     */
-    String consumeIdentifier() throws ParseException {
-      for (int i = 0; i < currentToken.length(); i++) {
-        final char c = currentToken.charAt(i);
-        if (('a' <= c && c <= 'z')
-            || ('A' <= c && c <= 'Z')
-            || ('0' <= c && c <= '9')
-            || (c == '_')
-            || (c == '.')) {
-          // OK
-        } else {
-          throw parseException("Expected identifier. Found '" + currentToken + "'");
-        }
-      }
-
-      final String result = currentToken;
-      nextToken();
-      return result;
-    }
-
-    /**
-     * If the next token is an identifier, consume it and return {@code true}. Otherwise, return
-     * {@code false} without doing anything.
-     */
-    boolean tryConsumeIdentifier() {
-      try {
-        consumeIdentifier();
-        return true;
-      } catch (ParseException e) {
-        return false;
-      }
-    }
-
-    /**
-     * If the next token is a 32-bit signed integer, consume it and return its value. Otherwise,
-     * throw a {@link ParseException}.
-     */
-    int consumeInt32() throws ParseException {
-      try {
-        final int result = parseInt32(currentToken);
-        nextToken();
-        return result;
-      } catch (NumberFormatException e) {
-        throw integerParseException(e);
-      }
-    }
-
-    /**
-     * If the next token is a 32-bit unsigned integer, consume it and return its value. Otherwise,
-     * throw a {@link ParseException}.
-     */
-    int consumeUInt32() throws ParseException {
-      try {
-        final int result = parseUInt32(currentToken);
-        nextToken();
-        return result;
-      } catch (NumberFormatException e) {
-        throw integerParseException(e);
-      }
-    }
-
-    /**
-     * If the next token is a 64-bit signed integer, consume it and return its value. Otherwise,
-     * throw a {@link ParseException}.
-     */
-    long consumeInt64() throws ParseException {
-      try {
-        final long result = parseInt64(currentToken);
-        nextToken();
-        return result;
-      } catch (NumberFormatException e) {
-        throw integerParseException(e);
-      }
-    }
-
-    /**
-     * If the next token is a 64-bit signed integer, consume it and return {@code true}. Otherwise,
-     * return {@code false} without doing anything.
-     */
-    boolean tryConsumeInt64() {
-      try {
-        consumeInt64();
-        return true;
-      } catch (ParseException e) {
-        return false;
-      }
-    }
-
-    /**
-     * If the next token is a 64-bit unsigned integer, consume it and return its value. Otherwise,
-     * throw a {@link ParseException}.
-     */
-    long consumeUInt64() throws ParseException {
-      try {
-        final long result = parseUInt64(currentToken);
-        nextToken();
-        return result;
-      } catch (NumberFormatException e) {
-        throw integerParseException(e);
-      }
-    }
-
-    /**
-     * If the next token is a 64-bit unsigned integer, consume it and return {@code true}.
-     * Otherwise, return {@code false} without doing anything.
-     */
-    public boolean tryConsumeUInt64() {
-      try {
-        consumeUInt64();
-        return true;
-      } catch (ParseException e) {
-        return false;
-      }
-    }
-
-    /**
-     * If the next token is a double, consume it and return its value. Otherwise, throw a {@link
-     * ParseException}.
-     */
-    public double consumeDouble() throws ParseException {
-      // We need to parse infinity and nan separately because
-      // Double.parseDouble() does not accept "inf", "infinity", or "nan".
-      if (DOUBLE_INFINITY.matcher(currentToken).matches()) {
-        final boolean negative = currentToken.startsWith("-");
-        nextToken();
-        return negative ? Double.NEGATIVE_INFINITY : Double.POSITIVE_INFINITY;
-      }
-      if (currentToken.equalsIgnoreCase("nan")) {
-        nextToken();
-        return Double.NaN;
-      }
-      try {
-        final double result = Double.parseDouble(currentToken);
-        nextToken();
-        return result;
-      } catch (NumberFormatException e) {
-        throw floatParseException(e);
-      }
-    }
-
-    /**
-     * If the next token is a double, consume it and return {@code true}. Otherwise, return {@code
-     * false} without doing anything.
-     */
-    public boolean tryConsumeDouble() {
-      try {
-        consumeDouble();
-        return true;
-      } catch (ParseException e) {
-        return false;
-      }
-    }
-
-    /**
-     * If the next token is a float, consume it and return its value. Otherwise, throw a {@link
-     * ParseException}.
-     */
-    public float consumeFloat() throws ParseException {
-      // We need to parse infinity and nan separately because
-      // Float.parseFloat() does not accept "inf", "infinity", or "nan".
-      if (FLOAT_INFINITY.matcher(currentToken).matches()) {
-        final boolean negative = currentToken.startsWith("-");
-        nextToken();
-        return negative ? Float.NEGATIVE_INFINITY : Float.POSITIVE_INFINITY;
-      }
-      if (FLOAT_NAN.matcher(currentToken).matches()) {
-        nextToken();
-        return Float.NaN;
-      }
-      try {
-        final float result = Float.parseFloat(currentToken);
-        nextToken();
-        return result;
-      } catch (NumberFormatException e) {
-        throw floatParseException(e);
-      }
-    }
-
-    /**
-     * If the next token is a float, consume it and return {@code true}. Otherwise, return {@code
-     * false} without doing anything.
-     */
-    public boolean tryConsumeFloat() {
-      try {
-        consumeFloat();
-        return true;
-      } catch (ParseException e) {
-        return false;
-      }
-    }
-
-    /**
-     * If the next token is a boolean, consume it and return its value. Otherwise, throw a {@link
-     * ParseException}.
-     */
-    public boolean consumeBoolean() throws ParseException {
-      if (currentToken.equals("true")
-          || currentToken.equals("True")
-          || currentToken.equals("t")
-          || currentToken.equals("1")) {
-        nextToken();
-        return true;
-      } else if (currentToken.equals("false")
-          || currentToken.equals("False")
-          || currentToken.equals("f")
-          || currentToken.equals("0")) {
-        nextToken();
-        return false;
-      } else {
-        throw parseException("Expected \"true\" or \"false\". Found \"" + currentToken + "\".");
-      }
-    }
-
-    /**
-     * If the next token is a string, consume it and return its (unescaped) value. Otherwise, throw
-     * a {@link ParseException}.
-     */
-    public String consumeString() throws ParseException {
-      return consumeByteString().toStringUtf8();
-    }
-
-    /** If the next token is a string, consume it and return true. Otherwise, return false. */
-    boolean tryConsumeString() {
-      try {
-        consumeString();
-        return true;
-      } catch (ParseException e) {
-        return false;
-      }
-    }
-
-    /**
-     * If the next token is a string, consume it, unescape it as a {@link ByteString}, and return
-     * it. Otherwise, throw a {@link ParseException}.
-     */
-    ByteString consumeByteString() throws ParseException {
-      List<ByteString> list = new ArrayList<ByteString>();
-      consumeByteString(list);
-      while (currentToken.startsWith("'") || currentToken.startsWith("\"")) {
-        consumeByteString(list);
-      }
-      return ByteString.copyFrom(list);
-    }
-
-    /**
-     * Like {@link #consumeByteString()} but adds each token of the string to the given list. String
-     * literals (whether bytes or text) may come in multiple adjacent tokens which are automatically
-     * concatenated, like in C or Python.
-     */
-    private void consumeByteString(List<ByteString> list) throws ParseException {
-      final char quote = currentToken.length() > 0 ? currentToken.charAt(0) : '\0';
-      if (quote != '\"' && quote != '\'') {
-        throw parseException("Expected string.");
-      }
-
-      if (currentToken.length() < 2 || currentToken.charAt(currentToken.length() - 1) != quote) {
-        throw parseException("String missing ending quote.");
-      }
-
-      try {
-        final String escaped = currentToken.substring(1, currentToken.length() - 1);
-        final ByteString result = unescapeBytes(escaped);
-        nextToken();
-        list.add(result);
-      } catch (InvalidEscapeSequenceException e) {
-        throw parseException(e.getMessage());
-      }
-    }
-
-    /**
-     * Returns a {@link ParseException} with the current line and column numbers in the description,
-     * suitable for throwing.
-     */
-    ParseException parseException(final String description) {
-      // Note:  People generally prefer one-based line and column numbers.
-      return new ParseException(line + 1, column + 1, description);
-    }
-
-    /**
-     * Returns a {@link ParseException} with the line and column numbers of the previous token in
-     * the description, suitable for throwing.
-     */
-    ParseException parseExceptionPreviousToken(final String description) {
-      // Note:  People generally prefer one-based line and column numbers.
-      return new ParseException(previousLine + 1, previousColumn + 1, description);
-    }
-
-    /**
-     * Constructs an appropriate {@link ParseException} for the given {@code NumberFormatException}
-     * when trying to parse an integer.
-     */
-    private ParseException integerParseException(final NumberFormatException e) {
-      return parseException("Couldn't parse integer: " + e.getMessage());
-    }
-
-    /**
-     * Constructs an appropriate {@link ParseException} for the given {@code NumberFormatException}
-     * when trying to parse a float or double.
-     */
-    private ParseException floatParseException(final NumberFormatException e) {
-      return parseException("Couldn't parse number: " + e.getMessage());
-    }
-
-  }
-
-  /** Thrown when parsing an invalid text format message. */
-  public static class ParseException extends IOException {
-    private static final long serialVersionUID = 3196188060225107702L;
-
-    private final int line;
-    private final int column;
-
-    /** Create a new instance, with -1 as the line and column numbers. */
-    public ParseException(final String message) {
-      this(-1, -1, message);
-    }
-
-    /**
-     * Create a new instance
-     *
-     * @param line the line number where the parse error occurred, using 1-offset.
-     * @param column the column number where the parser error occurred, using 1-offset.
-     */
-    public ParseException(final int line, final int column, final String message) {
-      super(Integer.toString(line) + ":" + column + ": " + message);
-      this.line = line;
-      this.column = column;
-    }
-
-    /**
-     * Return the line where the parse exception occurred, or -1 when none is provided. The value is
-     * specified as 1-offset, so the first line is line 1.
-     */
-    public int getLine() {
-      return line;
-    }
-
-    /**
-     * Return the column where the parse exception occurred, or -1 when none is provided. The value
-     * is specified as 1-offset, so the first line is line 1.
-     */
-    public int getColumn() {
-      return column;
-    }
-  }
-
-  /** Thrown when encountering an unknown field while parsing a text format message. */
-  public static class UnknownFieldParseException extends ParseException {
-    private final String unknownField;
-
-    /**
-     * Create a new instance, with -1 as the line and column numbers, and an empty unknown field
-     * name.
-     */
-    public UnknownFieldParseException(final String message) {
-      this(-1, -1, "", message);
-    }
-
-    /**
-     * Create a new instance
-     *
-     * @param line the line number where the parse error occurred, using 1-offset.
-     * @param column the column number where the parser error occurred, using 1-offset.
-     * @param unknownField the name of the unknown field found while parsing.
-     */
-    public UnknownFieldParseException(
-        final int line, final int column, final String unknownField, final String message) {
-      super(line, column, message);
-      this.unknownField = unknownField;
-    }
-
-    /**
-     * Return the name of the unknown field encountered while parsing the protocol buffer string.
-     */
-    public String getUnknownField() {
-      return unknownField;
-    }
-  }
-
-  private static final Parser PARSER = Parser.newBuilder().build();
-
-  /**
-   * Return a {@link Parser} instance which can parse text-format messages. The returned instance is
-   * thread-safe.
-   */
-  public static Parser getParser() {
-    return PARSER;
-  }
-
-  /** Parse a text-format message from {@code input} and merge the contents into {@code builder}. */
-  public static void merge(final Readable input, final Message.Builder builder) throws IOException {
-    PARSER.merge(input, builder);
-  }
-
-  /** Parse a text-format message from {@code input} and merge the contents into {@code builder}. */
-  public static void merge(final CharSequence input, final Message.Builder builder)
-      throws ParseException {
-    PARSER.merge(input, builder);
-  }
-
-  /**
-   * Parse a text-format message from {@code input}.
-   *
-   * @return the parsed message, guaranteed initialized
-   */
-  public static <T extends Message> T parse(final CharSequence input, final Class<T> protoClass)
-      throws ParseException {
-    Message.Builder builder = Internal.getDefaultInstance(protoClass).newBuilderForType();
-    merge(input, builder);
-    @SuppressWarnings("unchecked")
-    T output = (T) builder.build();
-    return output;
-  }
-
-  /**
-   * Parse a text-format message from {@code input} and merge the contents into {@code builder}.
-   * Extensions will be recognized if they are registered in {@code extensionRegistry}.
-   */
-  public static void merge(
-      final Readable input,
-      final ExtensionRegistry extensionRegistry,
-      final Message.Builder builder)
-      throws IOException {
-    PARSER.merge(input, extensionRegistry, builder);
-  }
-
-
-  /**
-   * Parse a text-format message from {@code input} and merge the contents into {@code builder}.
-   * Extensions will be recognized if they are registered in {@code extensionRegistry}.
-   */
-  public static void merge(
-      final CharSequence input,
-      final ExtensionRegistry extensionRegistry,
-      final Message.Builder builder)
-      throws ParseException {
-    PARSER.merge(input, extensionRegistry, builder);
-  }
-
-  /**
-   * Parse a text-format message from {@code input}. Extensions will be recognized if they are
-   * registered in {@code extensionRegistry}.
-   *
-   * @return the parsed message, guaranteed initialized
-   */
-  public static <T extends Message> T parse(
-      final CharSequence input,
-      final ExtensionRegistry extensionRegistry,
-      final Class<T> protoClass)
-      throws ParseException {
-    Message.Builder builder = Internal.getDefaultInstance(protoClass).newBuilderForType();
-    merge(input, extensionRegistry, builder);
-    @SuppressWarnings("unchecked")
-    T output = (T) builder.build();
-    return output;
-  }
-
-
-  /**
-   * Parser for text-format proto2 instances. This class is thread-safe. The implementation largely
-   * follows google/protobuf/text_format.cc.
-   *
-   * <p>Use {@link TextFormat#getParser()} to obtain the default parser, or {@link Builder} to
-   * control the parser behavior.
-   */
-  public static class Parser {
-
-    /**
-     * A valid silent marker appears between a field name and its value. If there is a ":" in
-     * between, the silent marker will only appear after the colon. This is called after a field
-     * name is parsed, and before the ":" if it exists. If the current token is ":", then
-     * containsSilentMarkerAfterCurrentToken indicates if there is a valid silent marker. Otherwise,
-     * the current token is part of the field value, so the silent marker is indicated by
-     * containsSilentMarkerAfterPrevToken.
-     */
-    private void detectSilentMarker(Tokenizer tokenizer) {
-    }
-
-    /**
-     * Determines if repeated values for non-repeated fields and oneofs are permitted. For example,
-     * given required/optional field "foo" and a oneof containing "baz" and "moo":
-     *
-     * <ul>
-     *   <li>"foo: 1 foo: 2"
-     *   <li>"baz: 1 moo: 2"
-     *   <li>merging "foo: 2" into a proto in which foo is already set, or
-     *   <li>merging "moo: 2" into a proto in which baz is already set.
-     * </ul>
-     */
-    public enum SingularOverwritePolicy {
-      /**
-       * Later values are merged with earlier values. For primitive fields or conflicting oneofs,
-       * the last value is retained.
-       */
-      ALLOW_SINGULAR_OVERWRITES,
-      /** An error is issued. */
-      FORBID_SINGULAR_OVERWRITES
-    }
-
-    private final TypeRegistry typeRegistry;
-    private final boolean allowUnknownFields;
-    private final boolean allowUnknownEnumValues;
-    private final boolean allowUnknownExtensions;
-    private final SingularOverwritePolicy singularOverwritePolicy;
-    private TextFormatParseInfoTree.Builder parseInfoTreeBuilder;
-
-    private Parser(
-        TypeRegistry typeRegistry,
-        boolean allowUnknownFields,
-        boolean allowUnknownEnumValues,
-        boolean allowUnknownExtensions,
-        SingularOverwritePolicy singularOverwritePolicy,
-        TextFormatParseInfoTree.Builder parseInfoTreeBuilder) {
-      this.typeRegistry = typeRegistry;
-      this.allowUnknownFields = allowUnknownFields;
-      this.allowUnknownEnumValues = allowUnknownEnumValues;
-      this.allowUnknownExtensions = allowUnknownExtensions;
-      this.singularOverwritePolicy = singularOverwritePolicy;
-      this.parseInfoTreeBuilder = parseInfoTreeBuilder;
-    }
-
-    /** Returns a new instance of {@link Builder}. */
-    public static Builder newBuilder() {
-      return new Builder();
-    }
-
-    /** Builder that can be used to obtain new instances of {@link Parser}. */
-    public static class Builder {
-      private boolean allowUnknownFields = false;
-      private boolean allowUnknownEnumValues = false;
-      private boolean allowUnknownExtensions = false;
-      private SingularOverwritePolicy singularOverwritePolicy =
-          SingularOverwritePolicy.ALLOW_SINGULAR_OVERWRITES;
-      private TextFormatParseInfoTree.Builder parseInfoTreeBuilder = null;
-      private TypeRegistry typeRegistry = TypeRegistry.getEmptyTypeRegistry();
-
-      /**
-       * Sets the TypeRegistry for resolving Any. If this is not set, TextFormat will not be able to
-       * parse Any unless Any is write as bytes.
-       *
-       * @throws IllegalArgumentException if a registry is already set.
-       */
-      public Builder setTypeRegistry(TypeRegistry typeRegistry) {
-        this.typeRegistry = typeRegistry;
-        return this;
-      }
-
-      /**
-       * Set whether this parser will allow unknown fields. By default, an exception is thrown if an
-       * unknown field is encountered. If this is set, the parser will only log a warning. Allow
-       * unknown fields will also allow unknown extensions.
-       *
-       * <p>Use of this parameter is discouraged which may hide some errors (e.g.
-       * spelling error on field name).
-       */
-      public Builder setAllowUnknownFields(boolean allowUnknownFields) {
-        this.allowUnknownFields = allowUnknownFields;
-        return this;
-      }
-
-      /**
-       * Set whether this parser will allow unknown extensions. By default, an
-       * exception is thrown if unknown extension is encountered. If this is set true,
-       * the parser will only log a warning. Allow unknown extensions does not mean
-       * allow normal unknown fields.
-       */
-      public Builder setAllowUnknownExtensions(boolean allowUnknownExtensions) {
-        this.allowUnknownExtensions = allowUnknownExtensions;
-        return this;
-      }
-
-      /** Sets parser behavior when a non-repeated field appears more than once. */
-      public Builder setSingularOverwritePolicy(SingularOverwritePolicy p) {
-        this.singularOverwritePolicy = p;
-        return this;
-      }
-
-      public Builder setParseInfoTreeBuilder(TextFormatParseInfoTree.Builder parseInfoTreeBuilder) {
-        this.parseInfoTreeBuilder = parseInfoTreeBuilder;
-        return this;
-      }
-
-      public Parser build() {
-        return new Parser(
-            typeRegistry,
-            allowUnknownFields,
-            allowUnknownEnumValues,
-            allowUnknownExtensions,
-            singularOverwritePolicy,
-            parseInfoTreeBuilder);
-      }
-    }
-
-    /**
-     * Parse a text-format message from {@code input} and merge the contents into {@code builder}.
-     */
-    public void merge(final Readable input, final Message.Builder builder) throws IOException {
-      merge(input, ExtensionRegistry.getEmptyRegistry(), builder);
-    }
-
-    /**
-     * Parse a text-format message from {@code input} and merge the contents into {@code builder}.
-     */
-    public void merge(final CharSequence input, final Message.Builder builder)
-        throws ParseException {
-      merge(input, ExtensionRegistry.getEmptyRegistry(), builder);
-    }
-
-    /**
-     * Parse a text-format message from {@code input} and merge the contents into {@code builder}.
-     * Extensions will be recognized if they are registered in {@code extensionRegistry}.
-     */
-    public void merge(
-        final Readable input,
-        final ExtensionRegistry extensionRegistry,
-        final Message.Builder builder)
-        throws IOException {
-      // Read the entire input to a String then parse that.
-
-      // If StreamTokenizer was not so limited, or if there were a kind
-      // of Reader that could read in chunks that match some particular regex,
-      // or if we wanted to write a custom Reader to tokenize our stream, then
-      // we would not have to read to one big String.  Alas, none of these is
-      // the case.  Oh well.
-
-      merge(toStringBuilder(input), extensionRegistry, builder);
-    }
-
-
-    private static final int BUFFER_SIZE = 4096;
-
-    // TODO(chrisn): See if working around java.io.Reader#read(CharBuffer)
-    // overhead is worthwhile
-    private static StringBuilder toStringBuilder(final Readable input) throws IOException {
-      final StringBuilder text = new StringBuilder();
-      final CharBuffer buffer = CharBuffer.allocate(BUFFER_SIZE);
-      while (true) {
-        final int n = input.read(buffer);
-        if (n == -1) {
-          break;
-        }
-        buffer.flip();
-        text.append(buffer, 0, n);
-      }
-      return text;
-    }
-
-    static final class UnknownField {
-      static enum Type {
-        FIELD, EXTENSION;
-      }
-
-      final String message;
-      final Type type;
-
-      UnknownField(String message, Type type) {
-        this.message = message;
-        this.type = type;
-      }
-    }
-
-    // Check both unknown fields and unknown extensions and log warning messages
-    // or throw exceptions according to the flag.
-    private void checkUnknownFields(final List<UnknownField> unknownFields) throws ParseException {
-      if (unknownFields.isEmpty()) {
-        return;
-      }
-
-      StringBuilder msg = new StringBuilder("Input contains unknown fields and/or extensions:");
-      for (UnknownField field : unknownFields) {
-        msg.append('\n').append(field.message);
-      }
-
-      if (allowUnknownFields) {
-        logger.warning(msg.toString());
-        return;
-      }
-
-      int firstErrorIndex = 0;
-      if (allowUnknownExtensions) {
-        boolean allUnknownExtensions = true;
-        for (UnknownField field : unknownFields) {
-          if (field.type == UnknownField.Type.FIELD) {
-            allUnknownExtensions = false;
-            break;
-          }
-          ++firstErrorIndex;
-        }
-        if (allUnknownExtensions) {
-          logger.warning(msg.toString());
-          return;
-        }
-      }
-
-      String[] lineColumn = unknownFields.get(firstErrorIndex).message.split(":");
-      throw new ParseException(
-          Integer.parseInt(lineColumn[0]), Integer.parseInt(lineColumn[1]), msg.toString());
-    }
-
-    /**
-     * Parse a text-format message from {@code input} and merge the contents into {@code builder}.
-     * Extensions will be recognized if they are registered in {@code extensionRegistry}.
-     */
-    public void merge(
-        final CharSequence input,
-        final ExtensionRegistry extensionRegistry,
-        final Message.Builder builder)
-        throws ParseException {
-      final Tokenizer tokenizer = new Tokenizer(input);
-      MessageReflection.BuilderAdapter target = new MessageReflection.BuilderAdapter(builder);
-
-      List<UnknownField> unknownFields = new ArrayList<UnknownField>();
-
-      while (!tokenizer.atEnd()) {
-        mergeField(tokenizer, extensionRegistry, target, unknownFields);
-      }
-      checkUnknownFields(unknownFields);
-    }
-
-
-    /** Parse a single field from {@code tokenizer} and merge it into {@code builder}. */
-    private void mergeField(
-        final Tokenizer tokenizer,
-        final ExtensionRegistry extensionRegistry,
-        final MessageReflection.MergeTarget target,
-        List<UnknownField> unknownFields)
-        throws ParseException {
-      mergeField(
-          tokenizer,
-          extensionRegistry,
-          target,
-          parseInfoTreeBuilder,
-          unknownFields);
-    }
-
-    /** Parse a single field from {@code tokenizer} and merge it into {@code target}. */
-    private void mergeField(
-        final Tokenizer tokenizer,
-        final ExtensionRegistry extensionRegistry,
-        final MessageReflection.MergeTarget target,
-        TextFormatParseInfoTree.Builder parseTreeBuilder,
-        List<UnknownField> unknownFields)
-        throws ParseException {
-      FieldDescriptor field = null;
-      int startLine = tokenizer.getLine();
-      int startColumn = tokenizer.getColumn();
-      final Descriptor type = target.getDescriptorForType();
-      ExtensionRegistry.ExtensionInfo extension = null;
-
-      if ("google.protobuf.Any".equals(type.getFullName()) && tokenizer.tryConsume("[")) {
-        mergeAnyFieldValue(tokenizer, extensionRegistry, target, parseTreeBuilder, unknownFields,
-            type);
-        return;
-      }
-
-      if (tokenizer.tryConsume("[")) {
-        // An extension.
-        final StringBuilder name = new StringBuilder(tokenizer.consumeIdentifier());
-        while (tokenizer.tryConsume(".")) {
-          name.append('.');
-          name.append(tokenizer.consumeIdentifier());
-        }
-
-        extension = target.findExtensionByName(extensionRegistry, name.toString());
-
-        if (extension == null) {
-            String message =
-                (tokenizer.getPreviousLine() + 1)
-                    + ":"
-                    + (tokenizer.getPreviousColumn() + 1)
-                    + ":\t"
-                    + type.getFullName()
-                    + ".["
-                    + name
-                    + "]";
-            unknownFields.add(new UnknownField(message, UnknownField.Type.EXTENSION));
-        } else {
-          if (extension.descriptor.getContainingType() != type) {
-            throw tokenizer.parseExceptionPreviousToken(
-                "Extension \""
-                    + name
-                    + "\" does not extend message type \""
-                    + type.getFullName()
-                    + "\".");
-          }
-          field = extension.descriptor;
-        }
-
-        tokenizer.consume("]");
-      } else {
-        final String name = tokenizer.consumeIdentifier();
-        field = type.findFieldByName(name);
-
-        // Group names are expected to be capitalized as they appear in the
-        // .proto file, which actually matches their type names, not their field
-        // names.
-        if (field == null) {
-          // Explicitly specify US locale so that this code does not break when
-          // executing in Turkey.
-          final String lowerName = name.toLowerCase(Locale.US);
-          field = type.findFieldByName(lowerName);
-          // If the case-insensitive match worked but the field is NOT a group,
-          if (field != null && field.getType() != FieldDescriptor.Type.GROUP) {
-            field = null;
-          }
-        }
-        // Again, special-case group names as described above.
-        if (field != null
-            && field.getType() == FieldDescriptor.Type.GROUP
-            && !field.getMessageType().getName().equals(name)) {
-          field = null;
-        }
-
-        if (field == null) {
-          String message = (tokenizer.getPreviousLine() + 1)
-                           + ":"
-                           + (tokenizer.getPreviousColumn() + 1)
-                           + ":\t"
-                           + type.getFullName()
-                           + "."
-                           + name;
-          unknownFields.add(new UnknownField(message, UnknownField.Type.FIELD));
-        }
-      }
-
-      // Skips unknown fields.
-      if (field == null) {
-        // Try to guess the type of this field.
-        // If this field is not a message, there should be a ":" between the
-        // field name and the field value and also the field value should not
-        // start with "{" or "<" which indicates the beginning of a message body.
-        // If there is no ":" or there is a "{" or "<" after ":", this field has
-        // to be a message or the input is ill-formed.
-        detectSilentMarker(tokenizer);
-        if (tokenizer.tryConsume(":") && !tokenizer.lookingAt("{") && !tokenizer.lookingAt("<")) {
-          skipFieldValue(tokenizer);
-        } else {
-          skipFieldMessage(tokenizer);
-        }
-        return;
-      }
-
-      // Handle potential ':'.
-      if (field.getJavaType() == FieldDescriptor.JavaType.MESSAGE) {
-        detectSilentMarker(tokenizer);
-        tokenizer.tryConsume(":"); // optional
-        if (parseTreeBuilder != null) {
-          TextFormatParseInfoTree.Builder childParseTreeBuilder =
-              parseTreeBuilder.getBuilderForSubMessageField(field);
-          consumeFieldValues(
-              tokenizer,
-              extensionRegistry,
-              target,
-              field,
-              extension,
-              childParseTreeBuilder,
-              unknownFields);
-        } else {
-          consumeFieldValues(
-              tokenizer,
-              extensionRegistry,
-              target,
-              field,
-              extension,
-              parseTreeBuilder,
-              unknownFields);
-        }
-      } else {
-        detectSilentMarker(tokenizer);
-        tokenizer.consume(":"); // required
-        consumeFieldValues(
-            tokenizer,
-            extensionRegistry,
-            target,
-            field,
-            extension,
-            parseTreeBuilder,
-            unknownFields);
-      }
-
-      if (parseTreeBuilder != null) {
-        parseTreeBuilder.setLocation(field, TextFormatParseLocation.create(startLine, startColumn));
-      }
-
-      // For historical reasons, fields may optionally be separated by commas or
-      // semicolons.
-      if (!tokenizer.tryConsume(";")) {
-        tokenizer.tryConsume(",");
-      }
-    }
-
-    /**
-     * Parse a one or more field values from {@code tokenizer} and merge it into {@code builder}.
-     */
-    private void consumeFieldValues(
-        final Tokenizer tokenizer,
-        final ExtensionRegistry extensionRegistry,
-        final MessageReflection.MergeTarget target,
-        final FieldDescriptor field,
-        final ExtensionRegistry.ExtensionInfo extension,
-        final TextFormatParseInfoTree.Builder parseTreeBuilder,
-        List<UnknownField> unknownFields)
-        throws ParseException {
-      // Support specifying repeated field values as a comma-separated list.
-      // Ex."foo: [1, 2, 3]"
-      if (field.isRepeated() && tokenizer.tryConsume("[")) {
-        if (!tokenizer.tryConsume("]")) { // Allow "foo: []" to be treated as empty.
-          while (true) {
-            consumeFieldValue(
-                tokenizer,
-                extensionRegistry,
-                target,
-                field,
-                extension,
-                parseTreeBuilder,
-                unknownFields);
-            if (tokenizer.tryConsume("]")) {
-              // End of list.
-              break;
-            }
-            tokenizer.consume(",");
-          }
-        }
-      } else {
-        consumeFieldValue(
-            tokenizer,
-            extensionRegistry,
-            target,
-            field,
-            extension,
-            parseTreeBuilder,
-            unknownFields);
-      }
-    }
-
-    /** Parse a single field value from {@code tokenizer} and merge it into {@code builder}. */
-    private void consumeFieldValue(
-        final Tokenizer tokenizer,
-        final ExtensionRegistry extensionRegistry,
-        final MessageReflection.MergeTarget target,
-        final FieldDescriptor field,
-        final ExtensionRegistry.ExtensionInfo extension,
-        final TextFormatParseInfoTree.Builder parseTreeBuilder,
-        List<UnknownField> unknownFields)
-        throws ParseException {
-      if (singularOverwritePolicy == SingularOverwritePolicy.FORBID_SINGULAR_OVERWRITES
-          && !field.isRepeated()) {
-        if (target.hasField(field)) {
-          throw tokenizer.parseExceptionPreviousToken(
-              "Non-repeated field \"" + field.getFullName() + "\" cannot be overwritten.");
-        } else if (field.getContainingOneof() != null
-            && target.hasOneof(field.getContainingOneof())) {
-          Descriptors.OneofDescriptor oneof = field.getContainingOneof();
-          throw tokenizer.parseExceptionPreviousToken(
-              "Field \""
-                  + field.getFullName()
-                  + "\" is specified along with field \""
-                  + target.getOneofFieldDescriptor(oneof).getFullName()
-                  + "\", another member of oneof \""
-                  + oneof.getName()
-                  + "\".");
-        }
-      }
-
-      Object value = null;
-
-      if (field.getJavaType() == FieldDescriptor.JavaType.MESSAGE) {
-        final String endToken;
-        if (tokenizer.tryConsume("<")) {
-          endToken = ">";
-        } else {
-          tokenizer.consume("{");
-          endToken = "}";
-        }
-
-        // Try to parse human readable format of Any in the form: [type_url]: { ... }
-        if (field.getMessageType().getFullName().equals("google.protobuf.Any")
-            && tokenizer.tryConsume("[")) {
-          // Use Proto reflection here since depending on Any would intoduce a cyclic dependency
-          // (java_proto_library for any_java_proto depends on the protobuf_impl).
-          Message anyBuilder = DynamicMessage.getDefaultInstance(field.getMessageType());
-          MessageReflection.MergeTarget anyField = target.newMergeTargetForField(field, anyBuilder);
-          mergeAnyFieldValue(tokenizer, extensionRegistry, anyField, parseTreeBuilder,
-              unknownFields, field.getMessageType());
-          value = anyField.finish();
-          tokenizer.consume(endToken);
-        } else {
-          Message defaultInstance = (extension == null) ? null : extension.defaultInstance;
-          MessageReflection.MergeTarget subField =
-              target.newMergeTargetForField(field, defaultInstance);
-
-          while (!tokenizer.tryConsume(endToken)) {
-            if (tokenizer.atEnd()) {
-              throw tokenizer.parseException("Expected \"" + endToken + "\".");
-            }
-            mergeField(tokenizer, extensionRegistry, subField, parseTreeBuilder, unknownFields);
-          }
-
-          value = subField.finish();
-        }
-
-      } else {
-        switch (field.getType()) {
-          case INT32:
-          case SINT32:
-          case SFIXED32:
-            value = tokenizer.consumeInt32();
-            break;
-
-          case INT64:
-          case SINT64:
-          case SFIXED64:
-            value = tokenizer.consumeInt64();
-            break;
-
-          case UINT32:
-          case FIXED32:
-            value = tokenizer.consumeUInt32();
-            break;
-
-          case UINT64:
-          case FIXED64:
-            value = tokenizer.consumeUInt64();
-            break;
-
-          case FLOAT:
-            value = tokenizer.consumeFloat();
-            break;
-
-          case DOUBLE:
-            value = tokenizer.consumeDouble();
-            break;
-
-          case BOOL:
-            value = tokenizer.consumeBoolean();
-            break;
-
-          case STRING:
-            value = tokenizer.consumeString();
-            break;
-
-          case BYTES:
-            value = tokenizer.consumeByteString();
-            break;
-
-          case ENUM:
-            final EnumDescriptor enumType = field.getEnumType();
-
-            if (tokenizer.lookingAtInteger()) {
-              final int number = tokenizer.consumeInt32();
-              value = enumType.findValueByNumber(number);
-              if (value == null) {
-                String unknownValueMsg =
-                    "Enum type \""
-                        + enumType.getFullName()
-                        + "\" has no value with number "
-                        + number
-                        + '.';
-                if (allowUnknownEnumValues) {
-                  logger.warning(unknownValueMsg);
-                  return;
-                } else {
-                  throw tokenizer.parseExceptionPreviousToken(
-                      "Enum type \""
-                          + enumType.getFullName()
-                          + "\" has no value with number "
-                          + number
-                          + '.');
-                }
-              }
-            } else {
-              final String id = tokenizer.consumeIdentifier();
-              value = enumType.findValueByName(id);
-              if (value == null) {
-                String unknownValueMsg =
-                    "Enum type \""
-                        + enumType.getFullName()
-                        + "\" has no value named \""
-                        + id
-                        + "\".";
-                if (allowUnknownEnumValues) {
-                  logger.warning(unknownValueMsg);
-                  return;
-                } else {
-                  throw tokenizer.parseExceptionPreviousToken(unknownValueMsg);
-                }
-              }
-            }
-
-            break;
-
-          case MESSAGE:
-          case GROUP:
-            throw new RuntimeException("Can't get here.");
-        }
-      }
-
-      if (field.isRepeated()) {
-        // TODO(b/29122459): If field.isMapField() and FORBID_SINGULAR_OVERWRITES mode,
-        //     check for duplicate map keys here.
-        target.addRepeatedField(field, value);
-      } else {
-        target.setField(field, value);
-      }
-    }
-
-    private void mergeAnyFieldValue(
-        final Tokenizer tokenizer,
-        final ExtensionRegistry extensionRegistry,
-        MergeTarget target,
-        final TextFormatParseInfoTree.Builder parseTreeBuilder,
-        List<UnknownField> unknownFields,
-        Descriptor anyDescriptor)
-        throws ParseException {
-      // Try to parse human readable format of Any in the form: [type_url]: { ... }
-      StringBuilder typeUrlBuilder = new StringBuilder();
-      // Parse the type_url inside [].
-      while (true) {
-        typeUrlBuilder.append(tokenizer.consumeIdentifier());
-        if (tokenizer.tryConsume("]")) {
-          break;
-        }
-        if (tokenizer.tryConsume("/")) {
-          typeUrlBuilder.append("/");
-        } else if (tokenizer.tryConsume(".")) {
-          typeUrlBuilder.append(".");
-        } else {
-          throw tokenizer.parseExceptionPreviousToken("Expected a valid type URL.");
-        }
-      }
-      detectSilentMarker(tokenizer);
-      tokenizer.tryConsume(":");
-      final String anyEndToken;
-      if (tokenizer.tryConsume("<")) {
-        anyEndToken = ">";
-      } else {
-        tokenizer.consume("{");
-        anyEndToken = "}";
-      }
-      String typeUrl = typeUrlBuilder.toString();
-      Descriptor contentType = null;
-      try {
-        contentType = typeRegistry.getDescriptorForTypeUrl(typeUrl);
-      } catch (InvalidProtocolBufferException e) {
-        throw tokenizer.parseException("Invalid valid type URL. Found: " + typeUrl);
-      }
-      if (contentType == null) {
-        throw tokenizer.parseException(
-            "Unable to parse Any of type: "
-                + typeUrl
-                + ". Please make sure that the TypeRegistry contains the descriptors for the given"
-                + " types.");
-      }
-      Message.Builder contentBuilder =
-          DynamicMessage.getDefaultInstance(contentType).newBuilderForType();
-      MessageReflection.BuilderAdapter contentTarget =
-          new MessageReflection.BuilderAdapter(contentBuilder);
-      while (!tokenizer.tryConsume(anyEndToken)) {
-        mergeField(tokenizer, extensionRegistry, contentTarget, parseTreeBuilder, unknownFields);
-      }
-
-      target.setField(anyDescriptor.findFieldByName("type_url"), typeUrlBuilder.toString());
-      target.setField(
-          anyDescriptor.findFieldByName("value"), contentBuilder.build().toByteString());
-    }
-
-    /** Skips the next field including the field's name and value. */
-    private void skipField(Tokenizer tokenizer) throws ParseException {
-      if (tokenizer.tryConsume("[")) {
-        // Extension name.
-        do {
-          tokenizer.consumeIdentifier();
-        } while (tokenizer.tryConsume("."));
-        tokenizer.consume("]");
-      } else {
-        tokenizer.consumeIdentifier();
-      }
-
-      // Try to guess the type of this field.
-      // If this field is not a message, there should be a ":" between the
-      // field name and the field value and also the field value should not
-      // start with "{" or "<" which indicates the beginning of a message body.
-      // If there is no ":" or there is a "{" or "<" after ":", this field has
-      // to be a message or the input is ill-formed.
-      detectSilentMarker(tokenizer);
-      if (tokenizer.tryConsume(":") && !tokenizer.lookingAt("<") && !tokenizer.lookingAt("{")) {
-        skipFieldValue(tokenizer);
-      } else {
-        skipFieldMessage(tokenizer);
-      }
-      // For historical reasons, fields may optionally be separated by commas or
-      // semicolons.
-      if (!tokenizer.tryConsume(";")) {
-        tokenizer.tryConsume(",");
-      }
-    }
-
-    /**
-     * Skips the whole body of a message including the beginning delimiter and the ending delimiter.
-     */
-    private void skipFieldMessage(Tokenizer tokenizer) throws ParseException {
-      final String delimiter;
-      if (tokenizer.tryConsume("<")) {
-        delimiter = ">";
-      } else {
-        tokenizer.consume("{");
-        delimiter = "}";
-      }
-      while (!tokenizer.lookingAt(">") && !tokenizer.lookingAt("}")) {
-        skipField(tokenizer);
-      }
-      tokenizer.consume(delimiter);
-    }
-
-    /** Skips a field value. */
-    private void skipFieldValue(Tokenizer tokenizer) throws ParseException {
-      if (tokenizer.tryConsumeString()) {
-        while (tokenizer.tryConsumeString()) {}
-        return;
-      }
-      if (!tokenizer.tryConsumeIdentifier() // includes enum & boolean
-          && !tokenizer.tryConsumeInt64() // includes int32
-          && !tokenizer.tryConsumeUInt64() // includes uint32
-          && !tokenizer.tryConsumeDouble()
-          && !tokenizer.tryConsumeFloat()) {
-        throw tokenizer.parseException("Invalid field value: " + tokenizer.currentToken);
-      }
-    }
-  }
-
-  // =================================================================
-  // Utility functions
-  //
-  // Some of these methods are package-private because Descriptors.java uses
-  // them.
-
-  /**
-   * Escapes bytes in the format used in protocol buffer text format, which is the same as the
-   * format used for C string literals. All bytes that are not printable 7-bit ASCII characters are
-   * escaped, as well as backslash, single-quote, and double-quote characters. Characters for which
-   * no defined short-hand escape sequence is defined will be escaped using 3-digit octal sequences.
-   */
-  public static String escapeBytes(ByteString input) {
-    return TextFormatEscaper.escapeBytes(input);
-  }
-
-  /** Like {@link #escapeBytes(ByteString)}, but used for byte array. */
-  public static String escapeBytes(byte[] input) {
-    return TextFormatEscaper.escapeBytes(input);
-  }
-
-  /**
-   * Un-escape a byte sequence as escaped using {@link #escapeBytes(ByteString)}. Two-digit hex
-   * escapes (starting with "\x") are also recognized.
-   */
-  public static ByteString unescapeBytes(CharSequence charString)
-      throws InvalidEscapeSequenceException {
-    // First convert the Java character sequence to UTF-8 bytes.
-    ByteString input = ByteString.copyFromUtf8(charString.toString());
-    // Then unescape certain byte sequences introduced by ASCII '\\'.  The valid
-    // escapes can all be expressed with ASCII characters, so it is safe to
-    // operate on bytes here.
-    //
-    // Unescaping the input byte array will result in a byte sequence that's no
-    // longer than the input.  That's because each escape sequence is between
-    // two and four bytes long and stands for a single byte.
-    final byte[] result = new byte[input.size()];
-    int pos = 0;
-    for (int i = 0; i < input.size(); i++) {
-      byte c = input.byteAt(i);
-      if (c == '\\') {
-        if (i + 1 < input.size()) {
-          ++i;
-          c = input.byteAt(i);
-          if (isOctal(c)) {
-            // Octal escape.
-            int code = digitValue(c);
-            if (i + 1 < input.size() && isOctal(input.byteAt(i + 1))) {
-              ++i;
-              code = code * 8 + digitValue(input.byteAt(i));
-            }
-            if (i + 1 < input.size() && isOctal(input.byteAt(i + 1))) {
-              ++i;
-              code = code * 8 + digitValue(input.byteAt(i));
-            }
-            // TODO: Check that 0 <= code && code <= 0xFF.
-            result[pos++] = (byte) code;
-          } else {
-            switch (c) {
-              case 'a':
-                result[pos++] = 0x07;
-                break;
-              case 'b':
-                result[pos++] = '\b';
-                break;
-              case 'f':
-                result[pos++] = '\f';
-                break;
-              case 'n':
-                result[pos++] = '\n';
-                break;
-              case 'r':
-                result[pos++] = '\r';
-                break;
-              case 't':
-                result[pos++] = '\t';
-                break;
-              case 'v':
-                result[pos++] = 0x0b;
-                break;
-              case '\\':
-                result[pos++] = '\\';
-                break;
-              case '\'':
-                result[pos++] = '\'';
-                break;
-              case '"':
-                result[pos++] = '\"';
-                break;
-              case '?':
-                result[pos++] = '?';
-                break;
-
-              case 'x':
-                // hex escape
-                int code = 0;
-                if (i + 1 < input.size() && isHex(input.byteAt(i + 1))) {
-                  ++i;
-                  code = digitValue(input.byteAt(i));
-                } else {
-                  throw new InvalidEscapeSequenceException(
-                      "Invalid escape sequence: '\\x' with no digits");
-                }
-                if (i + 1 < input.size() && isHex(input.byteAt(i + 1))) {
-                  ++i;
-                  code = code * 16 + digitValue(input.byteAt(i));
-                }
-                result[pos++] = (byte) code;
-                break;
-
-              case 'u':
-                // Unicode escape
-                ++i;
-                if (i + 3 < input.size()
-                    && isHex(input.byteAt(i))
-                    && isHex(input.byteAt(i + 1))
-                    && isHex(input.byteAt(i + 2))
-                    && isHex(input.byteAt(i + 3))) {
-                  char ch =
-                      (char)
-                          (digitValue(input.byteAt(i)) << 12
-                              | digitValue(input.byteAt(i + 1)) << 8
-                              | digitValue(input.byteAt(i + 2)) << 4
-                              | digitValue(input.byteAt(i + 3)));
-
-                  if (ch >= Character.MIN_SURROGATE && ch <= Character.MAX_SURROGATE) {
-                    throw new InvalidEscapeSequenceException(
-                        "Invalid escape sequence: '\\u' refers to a surrogate");
-                  }
-                  byte[] chUtf8 = Character.toString(ch).getBytes(Internal.UTF_8);
-                  System.arraycopy(chUtf8, 0, result, pos, chUtf8.length);
-                  pos += chUtf8.length;
-                  i += 3;
-                } else {
-                  throw new InvalidEscapeSequenceException(
-                      "Invalid escape sequence: '\\u' with too few hex chars");
-                }
-                break;
-
-              case 'U':
-                // Unicode escape
-                ++i;
-                if (i + 7 >= input.size()) {
-                  throw new InvalidEscapeSequenceException(
-                      "Invalid escape sequence: '\\U' with too few hex chars");
-                }
-                int codepoint = 0;
-                for (int offset = i; offset < i + 8; offset++) {
-                  byte b = input.byteAt(offset);
-                  if (!isHex(b)) {
-                    throw new InvalidEscapeSequenceException(
-                        "Invalid escape sequence: '\\U' with too few hex chars");
-                  }
-                  codepoint = (codepoint << 4) | digitValue(b);
-                }
-                if (!Character.isValidCodePoint(codepoint)) {
-                  throw new InvalidEscapeSequenceException(
-                      "Invalid escape sequence: '\\U"
-                          + input.substring(i, i + 8).toStringUtf8()
-                          + "' is not a valid code point value");
-                }
-                Character.UnicodeBlock unicodeBlock = Character.UnicodeBlock.of(codepoint);
-                if (unicodeBlock != null
-                        && (unicodeBlock.equals(Character.UnicodeBlock.LOW_SURROGATES)
-                    || unicodeBlock.equals(Character.UnicodeBlock.HIGH_SURROGATES)
-                    || unicodeBlock.equals(Character.UnicodeBlock.HIGH_PRIVATE_USE_SURROGATES))) {
-                  throw new InvalidEscapeSequenceException(
-                      "Invalid escape sequence: '\\U"
-                          + input.substring(i, i + 8).toStringUtf8()
-                          + "' refers to a surrogate code unit");
-                }
-                int[] codepoints = new int[1];
-                codepoints[0] = codepoint;
-                byte[] chUtf8 = new String(codepoints, 0, 1).getBytes(Internal.UTF_8);
-                System.arraycopy(chUtf8, 0, result, pos, chUtf8.length);
-                pos += chUtf8.length;
-                i += 7;
-                break;
-
-              default:
-                throw new InvalidEscapeSequenceException(
-                    "Invalid escape sequence: '\\" + (char) c + '\'');
-            }
-          }
-        } else {
-          throw new InvalidEscapeSequenceException(
-              "Invalid escape sequence: '\\' at end of string.");
-        }
-      } else {
-        result[pos++] = c;
-      }
-    }
-
-    return result.length == pos
-        ? ByteString.wrap(result) // This reference has not been out of our control.
-        : ByteString.copyFrom(result, 0, pos);
-  }
-
-  /**
-   * Thrown by {@link TextFormat#unescapeBytes} and {@link TextFormat#unescapeText} when an invalid
-   * escape sequence is seen.
-   */
-  public static class InvalidEscapeSequenceException extends IOException {
-    private static final long serialVersionUID = -8164033650142593304L;
-
-    InvalidEscapeSequenceException(final String description) {
-      super(description);
-    }
-  }
-
-  /**
-   * Like {@link #escapeBytes(ByteString)}, but escapes a text string. Non-ASCII characters are
-   * first encoded as UTF-8, then each byte is escaped individually as a 3-digit octal escape. Yes,
-   * it's weird.
-   */
-  static String escapeText(final String input) {
-    return escapeBytes(ByteString.copyFromUtf8(input));
-  }
-
-  /** Escape double quotes and backslashes in a String for emittingUnicode output of a message. */
-  public static String escapeDoubleQuotesAndBackslashes(final String input) {
-    return TextFormatEscaper.escapeDoubleQuotesAndBackslashes(input);
-  }
-
-  /**
-   * Un-escape a text string as escaped using {@link #escapeText(String)}. Two-digit hex escapes
-   * (starting with "\x") are also recognized.
-   */
-  static String unescapeText(final String input) throws InvalidEscapeSequenceException {
-    return unescapeBytes(input).toStringUtf8();
-  }
-
-  /** Is this an octal digit? */
-  private static boolean isOctal(final byte c) {
-    return '0' <= c && c <= '7';
-  }
-
-  /** Is this a hex digit? */
-  private static boolean isHex(final byte c) {
-    return ('0' <= c && c <= '9') || ('a' <= c && c <= 'f') || ('A' <= c && c <= 'F');
-  }
-
-  /**
-   * Interpret a character as a digit (in any base up to 36) and return the numeric value. This is
-   * like {@code Character.digit()} but we don't accept non-ASCII digits.
-   */
-  private static int digitValue(final byte c) {
-    if ('0' <= c && c <= '9') {
-      return c - '0';
-    } else if ('a' <= c && c <= 'z') {
-      return c - 'a' + 10;
-    } else {
-      return c - 'A' + 10;
-    }
-  }
-
-  /**
-   * Parse a 32-bit signed integer from the text. Unlike the Java standard {@code
-   * Integer.parseInt()}, this function recognizes the prefixes "0x" and "0" to signify hexadecimal
-   * and octal numbers, respectively.
-   */
-  static int parseInt32(final String text) throws NumberFormatException {
-    return (int) parseInteger(text, true, false);
-  }
-
-  /**
-   * Parse a 32-bit unsigned integer from the text. Unlike the Java standard {@code
-   * Integer.parseInt()}, this function recognizes the prefixes "0x" and "0" to signify hexadecimal
-   * and octal numbers, respectively. The result is coerced to a (signed) {@code int} when returned
-   * since Java has no unsigned integer type.
-   */
-  static int parseUInt32(final String text) throws NumberFormatException {
-    return (int) parseInteger(text, false, false);
-  }
-
-  /**
-   * Parse a 64-bit signed integer from the text. Unlike the Java standard {@code
-   * Integer.parseInt()}, this function recognizes the prefixes "0x" and "0" to signify hexadecimal
-   * and octal numbers, respectively.
-   */
-  static long parseInt64(final String text) throws NumberFormatException {
-    return parseInteger(text, true, true);
-  }
-
-  /**
-   * Parse a 64-bit unsigned integer from the text. Unlike the Java standard {@code
-   * Integer.parseInt()}, this function recognizes the prefixes "0x" and "0" to signify hexadecimal
-   * and octal numbers, respectively. The result is coerced to a (signed) {@code long} when returned
-   * since Java has no unsigned long type.
-   */
-  static long parseUInt64(final String text) throws NumberFormatException {
-    return parseInteger(text, false, true);
-  }
-
-  private static long parseInteger(final String text, final boolean isSigned, final boolean isLong)
-      throws NumberFormatException {
-    int pos = 0;
-
-    boolean negative = false;
-    if (text.startsWith("-", pos)) {
-      if (!isSigned) {
-        throw new NumberFormatException("Number must be positive: " + text);
-      }
-      ++pos;
-      negative = true;
-    }
-
-    int radix = 10;
-    if (text.startsWith("0x", pos)) {
-      pos += 2;
-      radix = 16;
-    } else if (text.startsWith("0", pos)) {
-      radix = 8;
-    }
-
-    final String numberText = text.substring(pos);
-
-    long result = 0;
-    if (numberText.length() < 16) {
-      // Can safely assume no overflow.
-      result = Long.parseLong(numberText, radix);
-      if (negative) {
-        result = -result;
-      }
-
-      // Check bounds.
-      // No need to check for 64-bit numbers since they'd have to be 16 chars
-      // or longer to overflow.
-      if (!isLong) {
-        if (isSigned) {
-          if (result > Integer.MAX_VALUE || result < Integer.MIN_VALUE) {
-            throw new NumberFormatException(
-                "Number out of range for 32-bit signed integer: " + text);
-          }
-        } else {
-          if (result >= (1L << 32) || result < 0) {
-            throw new NumberFormatException(
-                "Number out of range for 32-bit unsigned integer: " + text);
-          }
-        }
-      }
-    } else {
-      BigInteger bigValue = new BigInteger(numberText, radix);
-      if (negative) {
-        bigValue = bigValue.negate();
-      }
-
-      // Check bounds.
-      if (!isLong) {
-        if (isSigned) {
-          if (bigValue.bitLength() > 31) {
-            throw new NumberFormatException(
-                "Number out of range for 32-bit signed integer: " + text);
-          }
-        } else {
-          if (bigValue.bitLength() > 32) {
-            throw new NumberFormatException(
-                "Number out of range for 32-bit unsigned integer: " + text);
-          }
-        }
-      } else {
-        if (isSigned) {
-          if (bigValue.bitLength() > 63) {
-            throw new NumberFormatException(
-                "Number out of range for 64-bit signed integer: " + text);
-          }
-        } else {
-          if (bigValue.bitLength() > 64) {
-            throw new NumberFormatException(
-                "Number out of range for 64-bit unsigned integer: " + text);
-          }
-        }
-      }
-
-      result = bigValue.longValue();
-    }
-
-    return result;
-  }
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/TextFormatEscaper.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/TextFormatEscaper.java
deleted file mode 100644
index 4e3eb76..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/TextFormatEscaper.java
+++ /dev/null
@@ -1,160 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-/**
- * Provide text format escaping of proto instances. These ASCII characters are escaped:
- *
- * ASCII #7   (bell) --> \a
- * ASCII #8   (backspace) --> \b
- * ASCII #9   (horizontal tab) --> \t
- * ASCII #10  (linefeed) --> \n
- * ASCII #11  (vertical tab) --> \v
- * ASCII #13  (carriage return) --> \r
- * ASCII #12  (formfeed) --> \f
- * ASCII #34  (apostrophe) --> \'
- * ASCII #39  (straight double quote) --> \"
- * ASCII #92  (backslash) --> \\
- *
- * Other printable ASCII characters between 32 and 127 inclusive are output as is, unescaped.
- * Other ASCII characters less than 32 and all Unicode characters 128 or greater are
- * first encoded as UTF-8, then each byte is escaped individually as a 3-digit octal escape.
- */
-final class TextFormatEscaper {
-  private TextFormatEscaper() {}
-
-  private interface ByteSequence {
-    int size();
-
-    byte byteAt(int offset);
-  }
-
-  /**
-   * Backslash escapes bytes in the format used in protocol buffer text format.
-   */
-  static String escapeBytes(ByteSequence input) {
-    final StringBuilder builder = new StringBuilder(input.size());
-    for (int i = 0; i < input.size(); i++) {
-      byte b = input.byteAt(i);
-      switch (b) {
-        case 0x07:
-          builder.append("\\a");
-          break;
-        case '\b':
-          builder.append("\\b");
-          break;
-        case '\f':
-          builder.append("\\f");
-          break;
-        case '\n':
-          builder.append("\\n");
-          break;
-        case '\r':
-          builder.append("\\r");
-          break;
-        case '\t':
-          builder.append("\\t");
-          break;
-        case 0x0b:
-          builder.append("\\v");
-          break;
-        case '\\':
-          builder.append("\\\\");
-          break;
-        case '\'':
-          builder.append("\\\'");
-          break;
-        case '"':
-          builder.append("\\\"");
-          break;
-        default:
-          // Only ASCII characters between 0x20 (space) and 0x7e (tilde) are
-          // printable.  Other byte values must be escaped.
-          if (b >= 0x20 && b <= 0x7e) {
-            builder.append((char) b);
-          } else {
-            builder.append('\\');
-            builder.append((char) ('0' + ((b >>> 6) & 3)));
-            builder.append((char) ('0' + ((b >>> 3) & 7)));
-            builder.append((char) ('0' + (b & 7)));
-          }
-          break;
-      }
-    }
-    return builder.toString();
-  }
-
-  /**
-   * Backslash escapes bytes in the format used in protocol buffer text format.
-   */
-  static String escapeBytes(final ByteString input) {
-    return escapeBytes(
-        new ByteSequence() {
-          @Override
-          public int size() {
-            return input.size();
-          }
-
-          @Override
-          public byte byteAt(int offset) {
-            return input.byteAt(offset);
-          }
-        });
-  }
-
-  /** Like {@link #escapeBytes(ByteString)}, but used for byte array. */
-  static String escapeBytes(final byte[] input) {
-    return escapeBytes(
-        new ByteSequence() {
-          @Override
-          public int size() {
-            return input.length;
-          }
-
-          @Override
-          public byte byteAt(int offset) {
-            return input[offset];
-          }
-        });
-  }
-
-  /**
-   * Like {@link #escapeBytes(ByteString)}, but escapes a text string.
-   */
-  static String escapeText(String input) {
-    return escapeBytes(ByteString.copyFromUtf8(input));
-  }
-
-  /** Escape double quotes and backslashes in a String for unicode output of a message. */
-  static String escapeDoubleQuotesAndBackslashes(String input) {
-    return input.replace("\\", "\\\\").replace("\"", "\\\"");
-  }
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/TextFormatParseInfoTree.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/TextFormatParseInfoTree.java
deleted file mode 100644
index 36232e9..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/TextFormatParseInfoTree.java
+++ /dev/null
@@ -1,221 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import com.google.protobuf.Descriptors.FieldDescriptor;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-
-/**
- * Data structure which is populated with the locations of each field value parsed from the text.
- *
- * <p>The locations of primary fields values are retrieved by {@code getLocation} or {@code
- * getLocations}. The locations of sub message values are within nested {@code
- * TextFormatParseInfoTree}s and are retrieve by {@code getNestedTree} or {@code getNestedTrees}.
- *
- * <p>The {@code TextFormatParseInfoTree} is created by a Builder.
- */
-public class TextFormatParseInfoTree {
-
-  // Defines a mapping between each field's descriptor to the list of locations where
-  // its value(s) were was encountered.
-  private Map<FieldDescriptor, List<TextFormatParseLocation>> locationsFromField;
-
-  // Defines a mapping between a field's descriptor to a list of TextFormatParseInfoTrees for
-  // sub message location information.
-  Map<FieldDescriptor, List<TextFormatParseInfoTree>> subtreesFromField;
-
-  /**
-   * Construct a {@code TextFormatParseInfoTree}.
-   *
-   * @param locationsFromField a map of fields to location in the source code
-   * @param subtreeBuildersFromField a map of fields to parse tree location information builders
-   */
-  private TextFormatParseInfoTree(
-      Map<FieldDescriptor, List<TextFormatParseLocation>> locationsFromField,
-      Map<FieldDescriptor, List<TextFormatParseInfoTree.Builder>> subtreeBuildersFromField) {
-
-    // The maps are unmodifiable.  The values in the maps are unmodifiable.
-    Map<FieldDescriptor, List<TextFormatParseLocation>> locs =
-        new HashMap<FieldDescriptor, List<TextFormatParseLocation>>();
-    for (Entry<FieldDescriptor, List<TextFormatParseLocation>> kv : locationsFromField.entrySet()) {
-      locs.put(kv.getKey(), Collections.unmodifiableList(kv.getValue()));
-    }
-    this.locationsFromField = Collections.unmodifiableMap(locs);
-
-    Map<FieldDescriptor, List<TextFormatParseInfoTree>> subs =
-        new HashMap<FieldDescriptor, List<TextFormatParseInfoTree>>();
-    for (Entry<FieldDescriptor, List<Builder>> kv : subtreeBuildersFromField.entrySet()) {
-      List<TextFormatParseInfoTree> submessagesOfField = new ArrayList<TextFormatParseInfoTree>();
-      for (Builder subBuilder : kv.getValue()) {
-        submessagesOfField.add(subBuilder.build());
-      }
-      subs.put(kv.getKey(), Collections.unmodifiableList(submessagesOfField));
-    }
-    this.subtreesFromField = Collections.unmodifiableMap(subs);
-  }
-
-  /**
-   * Retrieve all the locations of a field.
-   *
-   * @param fieldDescriptor the {@link FieldDescriptor} of the desired field
-   * @return a list of the locations of values of the field. If there are not values or the field
-   *     doesn't exist, an empty list is returned.
-   */
-  public List<TextFormatParseLocation> getLocations(final FieldDescriptor fieldDescriptor) {
-    List<TextFormatParseLocation> result = locationsFromField.get(fieldDescriptor);
-    return (result == null) ? Collections.<TextFormatParseLocation>emptyList() : result;
-  }
-
-  /**
-   * Get the location in the source of a field's value.
-   *
-   * <p>Returns the {@link TextFormatParseLocation} for index-th value of the field in the parsed
-   * text.
-   *
-   * @param fieldDescriptor the {@link FieldDescriptor} of the desired field
-   * @param index the index of the value.
-   * @return the {@link TextFormatParseLocation} of the value
-   * @throws IllegalArgumentException index is out of range
-   */
-  public TextFormatParseLocation getLocation(final FieldDescriptor fieldDescriptor, int index) {
-    return getFromList(getLocations(fieldDescriptor), index, fieldDescriptor);
-  }
-
-  /**
-   * Retrieve a list of all the location information trees for a sub message field.
-   *
-   * @param fieldDescriptor the {@link FieldDescriptor} of the desired field
-   * @return A list of {@link TextFormatParseInfoTree}
-   */
-  public List<TextFormatParseInfoTree> getNestedTrees(final FieldDescriptor fieldDescriptor) {
-    List<TextFormatParseInfoTree> result = subtreesFromField.get(fieldDescriptor);
-    return result == null ? Collections.<TextFormatParseInfoTree>emptyList() : result;
-  }
-
-  /**
-   * Returns the parse info tree for the given field, which must be a message type.
-   *
-   * @param fieldDescriptor the {@link FieldDescriptor} of the desired sub message
-   * @param index the index of message value.
-   * @return the {@code ParseInfoTree} of the message value. {@code null} is returned if the field
-   *     doesn't exist or the index is out of range.
-   * @throws IllegalArgumentException if index is out of range
-   */
-  public TextFormatParseInfoTree getNestedTree(final FieldDescriptor fieldDescriptor, int index) {
-    return getFromList(getNestedTrees(fieldDescriptor), index, fieldDescriptor);
-  }
-
-  /**
-   * Create a builder for a {@code ParseInfoTree}.
-   *
-   * @return the builder
-   */
-  public static Builder builder() {
-    return new Builder();
-  }
-
-  private static <T> T getFromList(List<T> list, int index, FieldDescriptor fieldDescriptor) {
-    if (index >= list.size() || index < 0) {
-      throw new IllegalArgumentException(
-          String.format(
-              "Illegal index field: %s, index %d",
-              fieldDescriptor == null ? "<null>" : fieldDescriptor.getName(), index));
-    }
-    return list.get(index);
-  }
-
-  /** Builder for a {@link TextFormatParseInfoTree}. */
-  public static class Builder {
-
-    private Map<FieldDescriptor, List<TextFormatParseLocation>> locationsFromField;
-
-    // Defines a mapping between a field's descriptor to a list of ParseInfoTrees builders for
-    // sub message location information.
-    private Map<FieldDescriptor, List<Builder>> subtreeBuildersFromField;
-
-    /** Create a root level {@ParseInfoTree} builder. */
-    private Builder() {
-      locationsFromField = new HashMap<FieldDescriptor, List<TextFormatParseLocation>>();
-      subtreeBuildersFromField = new HashMap<FieldDescriptor, List<Builder>>();
-    }
-
-    /**
-     * Record the starting location of a single value for a field.
-     *
-     * @param fieldDescriptor the field
-     * @param location source code location information
-     */
-    public Builder setLocation(
-        final FieldDescriptor fieldDescriptor, TextFormatParseLocation location) {
-      List<TextFormatParseLocation> fieldLocations = locationsFromField.get(fieldDescriptor);
-      if (fieldLocations == null) {
-        fieldLocations = new ArrayList<TextFormatParseLocation>();
-        locationsFromField.put(fieldDescriptor, fieldLocations);
-      }
-      fieldLocations.add(location);
-      return this;
-    }
-
-    /**
-     * Set for a sub message.
-     *
-     * <p>A new builder is created for a sub message. The builder that is returned is a new builder.
-     * The return is <em>not</em> the invoked {@code builder.getBuilderForSubMessageField}.
-     *
-     * @param fieldDescriptor the field whose value is the submessage
-     * @return a new Builder for the sub message
-     */
-    public Builder getBuilderForSubMessageField(final FieldDescriptor fieldDescriptor) {
-      List<Builder> submessageBuilders = subtreeBuildersFromField.get(fieldDescriptor);
-      if (submessageBuilders == null) {
-        submessageBuilders = new ArrayList<Builder>();
-        subtreeBuildersFromField.put(fieldDescriptor, submessageBuilders);
-      }
-      Builder subtreeBuilder = new Builder();
-      submessageBuilders.add(subtreeBuilder);
-      return subtreeBuilder;
-    }
-
-    /**
-     * Build the {@code TextFormatParseInfoTree}.
-     *
-     * @return the {@code TextFormatParseInfoTree}
-     */
-    public TextFormatParseInfoTree build() {
-      return new TextFormatParseInfoTree(locationsFromField, subtreeBuildersFromField);
-    }
-  }
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/TextFormatParseLocation.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/TextFormatParseLocation.java
deleted file mode 100644
index eebfb1b..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/TextFormatParseLocation.java
+++ /dev/null
@@ -1,101 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import java.util.Arrays;
-
-/**
- * A location in the source code.
- *
- * <p>A location is the starting line number and starting column number.
- */
-public final class TextFormatParseLocation {
-
-  /** The empty location. */
-  public static final TextFormatParseLocation EMPTY = new TextFormatParseLocation(-1, -1);
-
-  /**
-   * Create a location.
-   *
-   * @param line the starting line number
-   * @param column the starting column number
-   * @return a {@code ParseLocation}
-   */
-  static TextFormatParseLocation create(int line, int column) {
-    if (line == -1 && column == -1) {
-      return EMPTY;
-    }
-    if (line < 0 || column < 0) {
-      throw new IllegalArgumentException(
-          String.format("line and column values must be >= 0: line %d, column: %d", line, column));
-    }
-    return new TextFormatParseLocation(line, column);
-  }
-
-  private final int line;
-  private final int column;
-
-  private TextFormatParseLocation(int line, int column) {
-    this.line = line;
-    this.column = column;
-  }
-
-  public int getLine() {
-    return line;
-  }
-
-  public int getColumn() {
-    return column;
-  }
-
-  @Override
-  public String toString() {
-    return String.format("ParseLocation{line=%d, column=%d}", line, column);
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (o == this) {
-      return true;
-    }
-    if (!(o instanceof TextFormatParseLocation)) {
-      return false;
-    }
-    TextFormatParseLocation that = (TextFormatParseLocation) o;
-    return (this.line == that.getLine()) && (this.column == that.getColumn());
-  }
-
-  @Override
-  public int hashCode() {
-    int[] values = {line, column};
-    return Arrays.hashCode(values);
-  }
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/TypeRegistry.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/TypeRegistry.java
deleted file mode 100644
index 422ff1f..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/TypeRegistry.java
+++ /dev/null
@@ -1,159 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import com.google.protobuf.Descriptors.Descriptor;
-import com.google.protobuf.Descriptors.FileDescriptor;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.logging.Logger;
-
-/**
- * A TypeRegistry is used to resolve Any messages. You must provide a TypeRegistry containing all
- * message types used in Any message fields.
- */
-public class TypeRegistry {
-  private static final Logger logger = Logger.getLogger(TypeRegistry.class.getName());
-
-  private static class EmptyTypeRegistryHolder {
-    private static final TypeRegistry EMPTY =
-        new TypeRegistry(Collections.<String, Descriptor>emptyMap());
-  }
-
-  public static TypeRegistry getEmptyTypeRegistry() {
-    return EmptyTypeRegistryHolder.EMPTY;
-  }
-
-
-  public static Builder newBuilder() {
-    return new Builder();
-  }
-
-  /**
-   * Find a type by its full name. Returns null if it cannot be found in this {@link TypeRegistry}.
-   */
-  public Descriptor find(String name) {
-    return types.get(name);
-  }
-
-  /**
-   * Find a type by its typeUrl. Returns null if it cannot be found in this {@link TypeRegistry}.
-   */
-  public final Descriptor getDescriptorForTypeUrl(String typeUrl)
-      throws InvalidProtocolBufferException {
-    return find(getTypeName(typeUrl));
-  }
-
-  private final Map<String, Descriptor> types;
-
-  TypeRegistry(Map<String, Descriptor> types) {
-    this.types = types;
-  }
-
-  private static String getTypeName(String typeUrl) throws InvalidProtocolBufferException {
-    String[] parts = typeUrl.split("/");
-    if (parts.length == 1) {
-      throw new InvalidProtocolBufferException("Invalid type url found: " + typeUrl);
-    }
-    return parts[parts.length - 1];
-  }
-
-  /** A Builder is used to build {@link TypeRegistry}. */
-  public static final class Builder {
-    private Builder() {}
-
-    /**
-     * Adds a message type and all types defined in the same .proto file as well as all transitively
-     * imported .proto files to this {@link Builder}.
-     */
-    public Builder add(Descriptor messageType) {
-      if (types == null) {
-        throw new IllegalStateException("A TypeRegistry.Builder can only be used once.");
-      }
-      addFile(messageType.getFile());
-      return this;
-    }
-
-    /**
-     * Adds message types and all types defined in the same .proto file as well as all transitively
-     * imported .proto files to this {@link Builder}.
-     */
-    public Builder add(Iterable<Descriptor> messageTypes) {
-      if (types == null) {
-        throw new IllegalStateException("A TypeRegistry.Builder can only be used once.");
-      }
-      for (Descriptor type : messageTypes) {
-        addFile(type.getFile());
-      }
-      return this;
-    }
-
-    /** Builds a {@link TypeRegistry}. This method can only be called once for one Builder. */
-    public TypeRegistry build() {
-      TypeRegistry result = new TypeRegistry(types);
-      // Make sure the built {@link TypeRegistry} is immutable.
-      types = null;
-      return result;
-    }
-
-    private void addFile(FileDescriptor file) {
-      // Skip the file if it's already added.
-      if (!files.add(file.getFullName())) {
-        return;
-      }
-      for (FileDescriptor dependency : file.getDependencies()) {
-        addFile(dependency);
-      }
-      for (Descriptor message : file.getMessageTypes()) {
-        addMessage(message);
-      }
-    }
-
-    private void addMessage(Descriptor message) {
-      for (Descriptor nestedType : message.getNestedTypes()) {
-        addMessage(nestedType);
-      }
-
-      if (types.containsKey(message.getFullName())) {
-        logger.warning("Type " + message.getFullName() + " is added multiple times.");
-        return;
-      }
-
-      types.put(message.getFullName(), message);
-    }
-
-    private final Set<String> files = new HashSet<>();
-    private Map<String, Descriptor> types = new HashMap<>();
-  }
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/UninitializedMessageException.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/UninitializedMessageException.java
deleted file mode 100644
index c633a4e..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/UninitializedMessageException.java
+++ /dev/null
@@ -1,96 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import java.util.Collections;
-import java.util.List;
-
-/**
- * Thrown when attempting to build a protocol message that is missing required fields. This is a
- * {@code RuntimeException} because it normally represents a programming error: it happens when some
- * code which constructs a message fails to set all the fields. {@code parseFrom()} methods <b>do
- * not</b> throw this; they throw an {@link InvalidProtocolBufferException} if required fields are
- * missing, because it is not a programming error to receive an incomplete message. In other words,
- * {@code UninitializedMessageException} should never be thrown by correct code, but {@code
- * InvalidProtocolBufferException} might be.
- *
- * @author kenton@google.com Kenton Varda
- */
-public class UninitializedMessageException extends RuntimeException {
-  private static final long serialVersionUID = -7466929953374883507L;
-
-  public UninitializedMessageException(final MessageLite message) {
-    super(
-        "Message was missing required fields.  (Lite runtime could not "
-            + "determine which fields were missing).");
-    missingFields = null;
-  }
-
-  public UninitializedMessageException(final List<String> missingFields) {
-    super(buildDescription(missingFields));
-    this.missingFields = missingFields;
-  }
-
-  private final List<String> missingFields;
-
-  /**
-   * Get a list of human-readable names of required fields missing from this message. Each name is a
-   * full path to a field, e.g. "foo.bar[5].baz". Returns null if the lite runtime was used, since
-   * it lacks the ability to find missing fields.
-   */
-  public List<String> getMissingFields() {
-    return Collections.unmodifiableList(missingFields);
-  }
-
-  /**
-   * Converts this exception to an {@link InvalidProtocolBufferException}. When a parsed message is
-   * missing required fields, this should be thrown instead of {@code
-   * UninitializedMessageException}.
-   */
-  public InvalidProtocolBufferException asInvalidProtocolBufferException() {
-    return new InvalidProtocolBufferException(getMessage());
-  }
-
-  /** Construct the description string for this exception. */
-  private static String buildDescription(final List<String> missingFields) {
-    final StringBuilder description = new StringBuilder("Message missing required fields: ");
-    boolean first = true;
-    for (final String field : missingFields) {
-      if (first) {
-        first = false;
-      } else {
-        description.append(", ");
-      }
-      description.append(field);
-    }
-    return description.toString();
-  }
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/UnknownFieldSchema.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/UnknownFieldSchema.java
deleted file mode 100644
index 681b824..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/UnknownFieldSchema.java
+++ /dev/null
@@ -1,134 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import java.io.IOException;
-
-@ExperimentalApi
-@CheckReturnValue
-abstract class UnknownFieldSchema<T, B> {
-
-  /** Whether unknown fields should be dropped. */
-  abstract boolean shouldDiscardUnknownFields(Reader reader);
-
-  /** Adds a varint value to the unknown fields. */
-  abstract void addVarint(B fields, int number, long value);
-
-  /** Adds a fixed32 value to the unknown fields. */
-  abstract void addFixed32(B fields, int number, int value);
-
-  /** Adds a fixed64 value to the unknown fields. */
-  abstract void addFixed64(B fields, int number, long value);
-
-  /** Adds a length delimited value to the unknown fields. */
-  abstract void addLengthDelimited(B fields, int number, ByteString value);
-
-  /** Adds a group value to the unknown fields. */
-  abstract void addGroup(B fields, int number, T subFieldSet);
-
-  /** Create a new builder for unknown fields. */
-  abstract B newBuilder();
-
-  /** Returns an immutable instance of the field container. */
-  abstract T toImmutable(B fields);
-
-  /**
-   * Sets the unknown fields into the message. Caller must take care of the mutability of the
-   * fields.
-   */
-  abstract void setToMessage(Object message, T fields);
-
-  /** Get the unknown fields from the message. */
-  abstract T getFromMessage(Object message);
-
-  /** Returns a builder for unknown fields in the message. */
-  abstract B getBuilderFromMessage(Object message);
-
-  /** Sets an unknown field builder into the message. */
-  abstract void setBuilderToMessage(Object message, B builder);
-
-  /** Marks unknown fields as immutable. */
-  abstract void makeImmutable(Object message);
-
-  /** Merges one field into the unknown fields. */
-  final boolean mergeOneFieldFrom(B unknownFields, Reader reader) throws IOException {
-    int tag = reader.getTag();
-    int fieldNumber = WireFormat.getTagFieldNumber(tag);
-    switch (WireFormat.getTagWireType(tag)) {
-      case WireFormat.WIRETYPE_VARINT:
-        addVarint(unknownFields, fieldNumber, reader.readInt64());
-        return true;
-      case WireFormat.WIRETYPE_FIXED32:
-        addFixed32(unknownFields, fieldNumber, reader.readFixed32());
-        return true;
-      case WireFormat.WIRETYPE_FIXED64:
-        addFixed64(unknownFields, fieldNumber, reader.readFixed64());
-        return true;
-      case WireFormat.WIRETYPE_LENGTH_DELIMITED:
-        addLengthDelimited(unknownFields, fieldNumber, reader.readBytes());
-        return true;
-      case WireFormat.WIRETYPE_START_GROUP:
-        final B subFields = newBuilder();
-        int endGroupTag = WireFormat.makeTag(fieldNumber, WireFormat.WIRETYPE_END_GROUP);
-        mergeFrom(subFields, reader);
-        if (endGroupTag != reader.getTag()) {
-          throw InvalidProtocolBufferException.invalidEndTag();
-        }
-        addGroup(unknownFields, fieldNumber, toImmutable(subFields));
-        return true;
-      case WireFormat.WIRETYPE_END_GROUP:
-        return false;
-      default:
-        throw InvalidProtocolBufferException.invalidWireType();
-    }
-  }
-
-  final void mergeFrom(B unknownFields, Reader reader) throws IOException {
-    while (true) {
-      if (reader.getFieldNumber() == Reader.READ_DONE
-          || !mergeOneFieldFrom(unknownFields, reader)) {
-        break;
-      }
-    }
-  }
-
-  abstract void writeTo(T unknownFields, Writer writer) throws IOException;
-
-  abstract void writeAsMessageSetTo(T unknownFields, Writer writer) throws IOException;
-
-  /** Merges {@code source} into {@code destination} and returns the merged instance. */
-  abstract T merge(T destination, T source);
-
-  /** Get the serialized size for message set serialization. */
-  abstract int getSerializedSizeAsMessageSet(T message);
-
-  abstract int getSerializedSize(T unknowns);
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/UnknownFieldSet.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/UnknownFieldSet.java
deleted file mode 100644
index 45b5a6b..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/UnknownFieldSet.java
+++ /dev/null
@@ -1,1081 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import com.google.protobuf.AbstractMessageLite.Builder.LimitedInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.Map;
-import java.util.TreeMap;
-
-/**
- * {@code UnknownFieldSet} keeps track of fields which were seen when parsing a protocol
- * message but whose field numbers or types are unrecognized. This most frequently occurs when new
- * fields are added to a message type and then messages containing those fields are read by old
- * software that was compiled before the new types were added.
- *
- * <p>Every {@link Message} contains an {@code UnknownFieldSet} (and every {@link Message.Builder}
- * contains a {@link Builder}).
- *
- * <p>Most users will never need to use this class.
- *
- * @author kenton@google.com Kenton Varda
- */
-public final class UnknownFieldSet implements MessageLite {
-
-  private final TreeMap<Integer, Field> fields;
-
-  /**
-   * Construct an {@code UnknownFieldSet} around the given map.
-   */
-  private UnknownFieldSet(TreeMap<Integer, Field> fields) {
-    this.fields = fields;
-  }
-
-  /** Create a new {@link Builder}. */
-  public static Builder newBuilder() {
-    return Builder.create();
-  }
-
-  /** Create a new {@link Builder} and initialize it to be a copy of {@code copyFrom}. */
-  public static Builder newBuilder(UnknownFieldSet copyFrom) {
-    return newBuilder().mergeFrom(copyFrom);
-  }
-
-  /** Get an empty {@code UnknownFieldSet}. */
-  public static UnknownFieldSet getDefaultInstance() {
-    return defaultInstance;
-  }
-
-  @Override
-  public UnknownFieldSet getDefaultInstanceForType() {
-    return defaultInstance;
-  }
-
-  private static final UnknownFieldSet defaultInstance =
-      new UnknownFieldSet(new TreeMap<Integer, Field>());
-
-
-  @Override
-  public boolean equals(Object other) {
-    if (this == other) {
-      return true;
-    }
-    return (other instanceof UnknownFieldSet) && fields.equals(((UnknownFieldSet) other).fields);
-  }
-
-  @Override
-  public int hashCode() {
-    if (fields.isEmpty()) { // avoid allocation of iterator.
-      // This optimization may not be helpful but it is needed for the allocation tests to pass.
-      return 0;
-    }
-    return fields.hashCode();
-  }
-
-  /** Get a map of fields in the set by number. */
-  public Map<Integer, Field> asMap() {
-    return (Map<Integer, Field>) fields.clone();
-  }
-
-  /** Check if the given field number is present in the set. */
-  public boolean hasField(int number) {
-    return fields.containsKey(number);
-  }
-
-  /** Get a field by number. Returns an empty field if not present. Never returns {@code null}. */
-  public Field getField(int number) {
-    Field result = fields.get(number);
-    return (result == null) ? Field.getDefaultInstance() : result;
-  }
-
-  /** Serializes the set and writes it to {@code output}. */
-  @Override
-  public void writeTo(CodedOutputStream output) throws IOException {
-    for (Map.Entry<Integer, Field> entry : fields.entrySet()) {
-      Field field = entry.getValue();
-      field.writeTo(entry.getKey(), output);
-    }
-  }
-
-  /**
-   * Converts the set to a string in protocol buffer text format. This is just a trivial wrapper
-   * around {@link TextFormat.Printer#printToString(UnknownFieldSet)}.
-   */
-  @Override
-  public String toString() {
-    return TextFormat.printer().printToString(this);
-  }
-
-  /**
-   * Serializes the message to a {@code ByteString} and returns it. This is just a trivial wrapper
-   * around {@link #writeTo(CodedOutputStream)}.
-   */
-  @Override
-  public ByteString toByteString() {
-    try {
-      ByteString.CodedBuilder out = ByteString.newCodedBuilder(getSerializedSize());
-      writeTo(out.getCodedOutput());
-      return out.build();
-    } catch (IOException e) {
-      throw new RuntimeException(
-          "Serializing to a ByteString threw an IOException (should never happen).", e);
-    }
-  }
-
-  /**
-   * Serializes the message to a {@code byte} array and returns it. This is just a trivial wrapper
-   * around {@link #writeTo(CodedOutputStream)}.
-   */
-  @Override
-  public byte[] toByteArray() {
-    try {
-      byte[] result = new byte[getSerializedSize()];
-      CodedOutputStream output = CodedOutputStream.newInstance(result);
-      writeTo(output);
-      output.checkNoSpaceLeft();
-      return result;
-    } catch (IOException e) {
-      throw new RuntimeException(
-          "Serializing to a byte array threw an IOException (should never happen).", e);
-    }
-  }
-
-  /**
-   * Serializes the message and writes it to {@code output}. This is just a trivial wrapper around
-   * {@link #writeTo(CodedOutputStream)}.
-   */
-  @Override
-  public void writeTo(OutputStream output) throws IOException {
-    CodedOutputStream codedOutput = CodedOutputStream.newInstance(output);
-    writeTo(codedOutput);
-    codedOutput.flush();
-  }
-
-  @Override
-  public void writeDelimitedTo(OutputStream output) throws IOException {
-    CodedOutputStream codedOutput = CodedOutputStream.newInstance(output);
-    codedOutput.writeUInt32NoTag(getSerializedSize());
-    writeTo(codedOutput);
-    codedOutput.flush();
-  }
-
-  /** Get the number of bytes required to encode this set. */
-  @Override
-  public int getSerializedSize() {
-    int result = 0;
-    if (!fields.isEmpty()) {
-      for (Map.Entry<Integer, Field> entry : fields.entrySet()) {
-        result += entry.getValue().getSerializedSize(entry.getKey());
-      }
-    }
-    return result;
-  }
-
-  /** Serializes the set and writes it to {@code output} using {@code MessageSet} wire format. */
-  public void writeAsMessageSetTo(CodedOutputStream output) throws IOException {
-    for (Map.Entry<Integer, Field> entry : fields.entrySet()) {
-      entry.getValue().writeAsMessageSetExtensionTo(entry.getKey(), output);
-    }
-  }
-
-  /** Serializes the set and writes it to {@code writer}. */
-  void writeTo(Writer writer) throws IOException {
-    if (writer.fieldOrder() == Writer.FieldOrder.DESCENDING) {
-      // Write fields in descending order.
-      for (Map.Entry<Integer, Field> entry : fields.descendingMap().entrySet()) {
-        entry.getValue().writeTo(entry.getKey(), writer);
-      }
-    } else {
-      // Write fields in ascending order.
-      for (Map.Entry<Integer, Field> entry : fields.entrySet()) {
-        entry.getValue().writeTo(entry.getKey(), writer);
-      }
-    }
-  }
-
-  /** Serializes the set and writes it to {@code writer} using {@code MessageSet} wire format. */
-  void writeAsMessageSetTo(Writer writer) throws IOException {
-    if (writer.fieldOrder() == Writer.FieldOrder.DESCENDING) {
-      // Write fields in descending order.
-      for (Map.Entry<Integer, Field> entry : fields.descendingMap().entrySet()) {
-        entry.getValue().writeAsMessageSetExtensionTo(entry.getKey(), writer);
-      }
-    } else {
-      // Write fields in ascending order.
-      for (Map.Entry<Integer, Field> entry : fields.entrySet()) {
-        entry.getValue().writeAsMessageSetExtensionTo(entry.getKey(), writer);
-      }
-    }
-  }
-
-  /** Get the number of bytes required to encode this set using {@code MessageSet} wire format. */
-  public int getSerializedSizeAsMessageSet() {
-    int result = 0;
-    for (Map.Entry<Integer, Field> entry : fields.entrySet()) {
-      result += entry.getValue().getSerializedSizeAsMessageSetExtension(entry.getKey());
-    }
-    return result;
-  }
-
-  @Override
-  public boolean isInitialized() {
-    // UnknownFieldSets do not have required fields, so they are always
-    // initialized.
-    return true;
-  }
-
-  /** Parse an {@code UnknownFieldSet} from the given input stream. */
-  public static UnknownFieldSet parseFrom(CodedInputStream input) throws IOException {
-    return newBuilder().mergeFrom(input).build();
-  }
-
-  /** Parse {@code data} as an {@code UnknownFieldSet} and return it. */
-  public static UnknownFieldSet parseFrom(ByteString data)
-      throws InvalidProtocolBufferException {
-    return newBuilder().mergeFrom(data).build();
-  }
-
-  /** Parse {@code data} as an {@code UnknownFieldSet} and return it. */
-  public static UnknownFieldSet parseFrom(byte[] data) throws InvalidProtocolBufferException {
-    return newBuilder().mergeFrom(data).build();
-  }
-
-  /** Parse an {@code UnknownFieldSet} from {@code input} and return it. */
-  public static UnknownFieldSet parseFrom(InputStream input) throws IOException {
-    return newBuilder().mergeFrom(input).build();
-  }
-
-  @Override
-  public Builder newBuilderForType() {
-    return newBuilder();
-  }
-
-  @Override
-  public Builder toBuilder() {
-    return newBuilder().mergeFrom(this);
-  }
-
-  /**
-   * Builder for {@link UnknownFieldSet}s.
-   *
-   * <p>Note that this class maintains {@link Field.Builder}s for all fields in the set. Thus,
-   * adding one element to an existing {@link Field} does not require making a copy. This is
-   * important for efficient parsing of unknown repeated fields. However, it implies that {@link
-   * Field}s cannot be constructed independently, nor can two {@link UnknownFieldSet}s share the
-   * same {@code Field} object.
-   *
-   * <p>Use {@link UnknownFieldSet#newBuilder()} to construct a {@code Builder}.
-   */
-  public static final class Builder implements MessageLite.Builder {
-    // This constructor should never be called directly (except from 'create').
-    private Builder() {}
-
-    private TreeMap<Integer, Field.Builder> fieldBuilders = new TreeMap<>();
-
-    private static Builder create() {
-      return new Builder();
-    }
-
-    /**
-     * Get a field builder for the given field number which includes any values that already exist.
-     */
-    private Field.Builder getFieldBuilder(int number) {
-      if (number == 0) {
-        return null;
-      } else {
-        Field.Builder builder = fieldBuilders.get(number);
-        if (builder == null) {
-          builder = Field.newBuilder();
-          fieldBuilders.put(number, builder);
-        }
-        return builder;
-      }
-    }
-
-    /**
-     * Build the {@link UnknownFieldSet} and return it.
-     */
-    @Override
-    public UnknownFieldSet build() {
-      UnknownFieldSet result;
-      if (fieldBuilders.isEmpty()) {
-        result = getDefaultInstance();
-      } else {
-        TreeMap<Integer, Field> fields = new TreeMap<>();
-        for (Map.Entry<Integer, Field.Builder> entry : fieldBuilders.entrySet()) {
-          fields.put(entry.getKey(), entry.getValue().build());
-        }
-        result = new UnknownFieldSet(fields);
-      }
-      return result;
-    }
-
-    @Override
-    public UnknownFieldSet buildPartial() {
-      // No required fields, so this is the same as build().
-      return build();
-    }
-
-    @Override
-    public Builder clone() {
-      Builder clone = UnknownFieldSet.newBuilder();
-      for (Map.Entry<Integer, Field.Builder> entry : fieldBuilders.entrySet()) {
-        Integer key = entry.getKey();
-        Field.Builder value = entry.getValue();
-        clone.fieldBuilders.put(key, value.clone());
-      }
-      return clone;
-    }
-
-    @Override
-    public UnknownFieldSet getDefaultInstanceForType() {
-      return UnknownFieldSet.getDefaultInstance();
-    }
-
-    /** Reset the builder to an empty set. */
-    @Override
-    public Builder clear() {
-      fieldBuilders = new TreeMap<>();
-      return this;
-    }
-
-    /**
-     * Clear fields from the set with a given field number.
-     *
-     * @throws IllegalArgumentException if number is not positive
-     */
-    public Builder clearField(int number) {
-      if (number <= 0) {
-        throw new IllegalArgumentException(number + " is not a valid field number.");
-      }
-      if (fieldBuilders.containsKey(number)) {
-        fieldBuilders.remove(number);
-      }
-      return this;
-    }
-
-    /**
-     * Merge the fields from {@code other} into this set. If a field number exists in both sets,
-     * {@code other}'s values for that field will be appended to the values in this set.
-     */
-    public Builder mergeFrom(UnknownFieldSet other) {
-      if (other != getDefaultInstance()) {
-        for (Map.Entry<Integer, Field> entry : other.fields.entrySet()) {
-          mergeField(entry.getKey(), entry.getValue());
-        }
-      }
-      return this;
-    }
-
-    /**
-     * Add a field to the {@code UnknownFieldSet}. If a field with the same number already exists,
-     * the two are merged.
-     *
-     * @throws IllegalArgumentException if number is not positive
-     */
-    public Builder mergeField(int number, final Field field) {
-      if (number <= 0) {
-        throw new IllegalArgumentException(number + " is not a valid field number.");
-      }
-      if (hasField(number)) {
-        getFieldBuilder(number).mergeFrom(field);
-      } else {
-        // Optimization:  We could call getFieldBuilder(number).mergeFrom(field)
-        // in this case, but that would create a copy of the Field object.
-        // We'd rather reuse the one passed to us, so call addField() instead.
-        addField(number, field);
-      }
-      return this;
-    }
-
-    /**
-     * Convenience method for merging a new field containing a single varint value. This is used in
-     * particular when an unknown enum value is encountered.
-     *
-     * @throws IllegalArgumentException if number is not positive
-     */
-    public Builder mergeVarintField(int number, int value) {
-      if (number <= 0) {
-        throw new IllegalArgumentException(number + " is not a valid field number.");
-      }
-      getFieldBuilder(number).addVarint(value);
-      return this;
-    }
-
-    /**
-     * Convenience method for merging a length-delimited field.
-     *
-     * <p>For use by generated code only.
-     *
-     * @throws IllegalArgumentException if number is not positive
-     */
-    public Builder mergeLengthDelimitedField(int number, ByteString value) {
-      if (number <= 0) {
-        throw new IllegalArgumentException(number + " is not a valid field number.");
-      }
-      getFieldBuilder(number).addLengthDelimited(value);
-      return this;
-    }
-
-    /** Check if the given field number is present in the set. */
-    public boolean hasField(int number) {
-      return fieldBuilders.containsKey(number);
-    }
-
-    /**
-     * Add a field to the {@code UnknownFieldSet}. If a field with the same number already exists,
-     * it is removed.
-     *
-     * @throws IllegalArgumentException if number is not positive
-     */
-    public Builder addField(int number, Field field) {
-      if (number <= 0) {
-        throw new IllegalArgumentException(number + " is not a valid field number.");
-      }
-      fieldBuilders.put(number, Field.newBuilder(field));
-      return this;
-    }
-
-    /**
-     * Get all present {@code Field}s as an immutable {@code Map}. If more fields are added, the
-     * changes may or may not be reflected in this map.
-     */
-    public Map<Integer, Field> asMap() {
-      TreeMap<Integer, Field> fields = new TreeMap<>();
-      for (Map.Entry<Integer, Field.Builder> entry : fieldBuilders.entrySet()) {
-        fields.put(entry.getKey(), entry.getValue().build());
-      }
-      return Collections.unmodifiableMap(fields);
-    }
-
-    /** Parse an entire message from {@code input} and merge its fields into this set. */
-    @Override
-    public Builder mergeFrom(CodedInputStream input) throws IOException {
-      while (true) {
-        int tag = input.readTag();
-        if (tag == 0 || !mergeFieldFrom(tag, input)) {
-          break;
-        }
-      }
-      return this;
-    }
-
-    /**
-     * Parse a single field from {@code input} and merge it into this set.
-     *
-     * @param tag The field's tag number, which was already parsed.
-     * @return {@code false} if the tag is an end group tag.
-     */
-    public boolean mergeFieldFrom(int tag, CodedInputStream input) throws IOException {
-      int number = WireFormat.getTagFieldNumber(tag);
-      switch (WireFormat.getTagWireType(tag)) {
-        case WireFormat.WIRETYPE_VARINT:
-          getFieldBuilder(number).addVarint(input.readInt64());
-          return true;
-        case WireFormat.WIRETYPE_FIXED64:
-          getFieldBuilder(number).addFixed64(input.readFixed64());
-          return true;
-        case WireFormat.WIRETYPE_LENGTH_DELIMITED:
-          getFieldBuilder(number).addLengthDelimited(input.readBytes());
-          return true;
-        case WireFormat.WIRETYPE_START_GROUP:
-          Builder subBuilder = newBuilder();
-          input.readGroup(number, subBuilder, ExtensionRegistry.getEmptyRegistry());
-          getFieldBuilder(number).addGroup(subBuilder.build());
-          return true;
-        case WireFormat.WIRETYPE_END_GROUP:
-          return false;
-        case WireFormat.WIRETYPE_FIXED32:
-          getFieldBuilder(number).addFixed32(input.readFixed32());
-          return true;
-        default:
-          throw InvalidProtocolBufferException.invalidWireType();
-      }
-    }
-
-    /**
-     * Parse {@code data} as an {@code UnknownFieldSet} and merge it with the set being built. This
-     * is just a small wrapper around {@link #mergeFrom(CodedInputStream)}.
-     */
-    @Override
-    public Builder mergeFrom(ByteString data) throws InvalidProtocolBufferException {
-      try {
-        CodedInputStream input = data.newCodedInput();
-        mergeFrom(input);
-        input.checkLastTagWas(0);
-        return this;
-      } catch (InvalidProtocolBufferException e) {
-        throw e;
-      } catch (IOException e) {
-        throw new RuntimeException(
-            "Reading from a ByteString threw an IOException (should never happen).", e);
-      }
-    }
-
-    /**
-     * Parse {@code data} as an {@code UnknownFieldSet} and merge it with the set being built. This
-     * is just a small wrapper around {@link #mergeFrom(CodedInputStream)}.
-     */
-    @Override
-    public Builder mergeFrom(byte[] data) throws InvalidProtocolBufferException {
-      try {
-        CodedInputStream input = CodedInputStream.newInstance(data);
-        mergeFrom(input);
-        input.checkLastTagWas(0);
-        return this;
-      } catch (InvalidProtocolBufferException e) {
-        throw e;
-      } catch (IOException e) {
-        throw new RuntimeException(
-            "Reading from a byte array threw an IOException (should never happen).", e);
-      }
-    }
-
-    /**
-     * Parse an {@code UnknownFieldSet} from {@code input} and merge it with the set being built.
-     * This is just a small wrapper around {@link #mergeFrom(CodedInputStream)}.
-     */
-    @Override
-    public Builder mergeFrom(InputStream input) throws IOException {
-      CodedInputStream codedInput = CodedInputStream.newInstance(input);
-      mergeFrom(codedInput);
-      codedInput.checkLastTagWas(0);
-      return this;
-    }
-
-    @Override
-    public boolean mergeDelimitedFrom(InputStream input) throws IOException {
-      int firstByte = input.read();
-      if (firstByte == -1) {
-        return false;
-      }
-      int size = CodedInputStream.readRawVarint32(firstByte, input);
-      InputStream limitedInput = new LimitedInputStream(input, size);
-      mergeFrom(limitedInput);
-      return true;
-    }
-
-    @Override
-    public boolean mergeDelimitedFrom(InputStream input, ExtensionRegistryLite extensionRegistry)
-        throws IOException {
-      // UnknownFieldSet has no extensions.
-      return mergeDelimitedFrom(input);
-    }
-
-    @Override
-    public Builder mergeFrom(CodedInputStream input, ExtensionRegistryLite extensionRegistry)
-        throws IOException {
-      // UnknownFieldSet has no extensions.
-      return mergeFrom(input);
-    }
-
-    @Override
-    public Builder mergeFrom(ByteString data, ExtensionRegistryLite extensionRegistry)
-        throws InvalidProtocolBufferException {
-      // UnknownFieldSet has no extensions.
-      return mergeFrom(data);
-    }
-
-    @Override
-    public Builder mergeFrom(byte[] data, int off, int len) throws InvalidProtocolBufferException {
-      try {
-        CodedInputStream input = CodedInputStream.newInstance(data, off, len);
-        mergeFrom(input);
-        input.checkLastTagWas(0);
-        return this;
-      } catch (InvalidProtocolBufferException e) {
-        throw e;
-      } catch (IOException e) {
-        throw new RuntimeException(
-            "Reading from a byte array threw an IOException (should never happen).", e);
-      }
-    }
-
-    @Override
-    public Builder mergeFrom(byte[] data, ExtensionRegistryLite extensionRegistry)
-        throws InvalidProtocolBufferException {
-      // UnknownFieldSet has no extensions.
-      return mergeFrom(data);
-    }
-
-    @Override
-    public Builder mergeFrom(byte[] data, int off, int len, ExtensionRegistryLite extensionRegistry)
-        throws InvalidProtocolBufferException {
-      // UnknownFieldSet has no extensions.
-      return mergeFrom(data, off, len);
-    }
-
-    @Override
-    public Builder mergeFrom(InputStream input, ExtensionRegistryLite extensionRegistry)
-        throws IOException {
-      // UnknownFieldSet has no extensions.
-      return mergeFrom(input);
-    }
-
-    @Override
-    public Builder mergeFrom(MessageLite m) {
-      if (m instanceof UnknownFieldSet) {
-        return mergeFrom((UnknownFieldSet) m);
-      }
-      throw new IllegalArgumentException(
-          "mergeFrom(MessageLite) can only merge messages of the same type.");
-    }
-
-    @Override
-    public boolean isInitialized() {
-      // UnknownFieldSets do not have required fields, so they are always
-      // initialized.
-      return true;
-    }
-  }
-
-  /**
-   * Represents a single field in an {@code UnknownFieldSet}.
-   *
-   * <p>A {@code Field} consists of five lists of values. The lists correspond to the five "wire
-   * types" used in the protocol buffer binary format. The wire type of each field can be determined
-   * from the encoded form alone, without knowing the field's declared type. So, we are able to
-   * parse unknown values at least this far and separate them. Normally, only one of the five lists
-   * will contain any values, since it is impossible to define a valid message type that declares
-   * two different types for the same field number. However, the code is designed to allow for the
-   * case where the same unknown field number is encountered using multiple different wire types.
-   *
-   * <p>{@code Field} is an immutable class. To construct one, you must use a {@link Builder}.
-   *
-   * @see UnknownFieldSet
-   */
-  public static final class Field {
-    private Field() {}
-
-    /** Construct a new {@link Builder}. */
-    public static Builder newBuilder() {
-      return Builder.create();
-    }
-
-    /** Construct a new {@link Builder} and initialize it to a copy of {@code copyFrom}. */
-    public static Builder newBuilder(Field copyFrom) {
-      return newBuilder().mergeFrom(copyFrom);
-    }
-
-    /** Get an empty {@code Field}. */
-    public static Field getDefaultInstance() {
-      return fieldDefaultInstance;
-    }
-
-    private static final Field fieldDefaultInstance = newBuilder().build();
-
-    /** Get the list of varint values for this field. */
-    public List<Long> getVarintList() {
-      return varint;
-    }
-
-    /** Get the list of fixed32 values for this field. */
-    public List<Integer> getFixed32List() {
-      return fixed32;
-    }
-
-    /** Get the list of fixed64 values for this field. */
-    public List<Long> getFixed64List() {
-      return fixed64;
-    }
-
-    /** Get the list of length-delimited values for this field. */
-    public List<ByteString> getLengthDelimitedList() {
-      return lengthDelimited;
-    }
-
-    /**
-     * Get the list of embedded group values for this field. These are represented using {@link
-     * UnknownFieldSet}s rather than {@link Message}s since the group's type is presumably unknown.
-     */
-    public List<UnknownFieldSet> getGroupList() {
-      return group;
-    }
-
-    @Override
-    public boolean equals(Object other) {
-      if (this == other) {
-        return true;
-      }
-      if (!(other instanceof Field)) {
-        return false;
-      }
-      return Arrays.equals(getIdentityArray(), ((Field) other).getIdentityArray());
-    }
-
-    @Override
-    public int hashCode() {
-      return Arrays.hashCode(getIdentityArray());
-    }
-
-    /** Returns the array of objects to be used to uniquely identify this {@link Field} instance. */
-    private Object[] getIdentityArray() {
-      return new Object[] {varint, fixed32, fixed64, lengthDelimited, group};
-    }
-
-    /**
-     * Serializes the message to a {@code ByteString} and returns it. This is just a trivial wrapper
-     * around {@link #writeTo(int, CodedOutputStream)}.
-     */
-    public ByteString toByteString(int fieldNumber) {
-      try {
-        // TODO(lukes): consider caching serialized size in a volatile long
-        ByteString.CodedBuilder out =
-            ByteString.newCodedBuilder(getSerializedSize(fieldNumber));
-        writeTo(fieldNumber, out.getCodedOutput());
-        return out.build();
-      } catch (IOException e) {
-        throw new RuntimeException(
-            "Serializing to a ByteString should never fail with an IOException", e);
-      }
-    }
-
-    /** Serializes the field, including field number, and writes it to {@code output}. */
-    public void writeTo(int fieldNumber, CodedOutputStream output) throws IOException {
-      for (long value : varint) {
-        output.writeUInt64(fieldNumber, value);
-      }
-      for (int value : fixed32) {
-        output.writeFixed32(fieldNumber, value);
-      }
-      for (long value : fixed64) {
-        output.writeFixed64(fieldNumber, value);
-      }
-      for (ByteString value : lengthDelimited) {
-        output.writeBytes(fieldNumber, value);
-      }
-      for (UnknownFieldSet value : group) {
-        output.writeGroup(fieldNumber, value);
-      }
-    }
-
-    /** Get the number of bytes required to encode this field, including field number. */
-    public int getSerializedSize(int fieldNumber) {
-      int result = 0;
-      for (long value : varint) {
-        result += CodedOutputStream.computeUInt64Size(fieldNumber, value);
-      }
-      for (int value : fixed32) {
-        result += CodedOutputStream.computeFixed32Size(fieldNumber, value);
-      }
-      for (long value : fixed64) {
-        result += CodedOutputStream.computeFixed64Size(fieldNumber, value);
-      }
-      for (ByteString value : lengthDelimited) {
-        result += CodedOutputStream.computeBytesSize(fieldNumber, value);
-      }
-      for (UnknownFieldSet value : group) {
-        result += CodedOutputStream.computeGroupSize(fieldNumber, value);
-      }
-      return result;
-    }
-
-    /**
-     * Serializes the field, including field number, and writes it to {@code output}, using {@code
-     * MessageSet} wire format.
-     */
-    public void writeAsMessageSetExtensionTo(int fieldNumber, CodedOutputStream output)
-        throws IOException {
-      for (ByteString value : lengthDelimited) {
-        output.writeRawMessageSetExtension(fieldNumber, value);
-      }
-    }
-
-    /** Serializes the field, including field number, and writes it to {@code writer}. */
-    void writeTo(int fieldNumber, Writer writer) throws IOException {
-      writer.writeInt64List(fieldNumber, varint, false);
-      writer.writeFixed32List(fieldNumber, fixed32, false);
-      writer.writeFixed64List(fieldNumber, fixed64, false);
-      writer.writeBytesList(fieldNumber, lengthDelimited);
-
-      if (writer.fieldOrder() == Writer.FieldOrder.ASCENDING) {
-        for (int i = 0; i < group.size(); i++) {
-          writer.writeStartGroup(fieldNumber);
-          group.get(i).writeTo(writer);
-          writer.writeEndGroup(fieldNumber);
-        }
-      } else {
-        for (int i = group.size() - 1; i >= 0; i--) {
-          writer.writeEndGroup(fieldNumber);
-          group.get(i).writeTo(writer);
-          writer.writeStartGroup(fieldNumber);
-        }
-      }
-    }
-
-    /**
-     * Serializes the field, including field number, and writes it to {@code writer}, using {@code
-     * MessageSet} wire format.
-     */
-    private void writeAsMessageSetExtensionTo(int fieldNumber, Writer writer)
-        throws IOException {
-      if (writer.fieldOrder() == Writer.FieldOrder.DESCENDING) {
-        // Write in descending field order.
-        ListIterator<ByteString> iter = lengthDelimited.listIterator(lengthDelimited.size());
-        while (iter.hasPrevious()) {
-          writer.writeMessageSetItem(fieldNumber, iter.previous());
-        }
-      } else {
-        // Write in ascending field order.
-        for (ByteString value : lengthDelimited) {
-          writer.writeMessageSetItem(fieldNumber, value);
-        }
-      }
-    }
-
-    /**
-     * Get the number of bytes required to encode this field, including field number, using {@code
-     * MessageSet} wire format.
-     */
-    public int getSerializedSizeAsMessageSetExtension(int fieldNumber) {
-      int result = 0;
-      for (ByteString value : lengthDelimited) {
-        result += CodedOutputStream.computeRawMessageSetExtensionSize(fieldNumber, value);
-      }
-      return result;
-    }
-
-    private List<Long> varint;
-    private List<Integer> fixed32;
-    private List<Long> fixed64;
-    private List<ByteString> lengthDelimited;
-    private List<UnknownFieldSet> group;
-
-    /**
-     * Used to build a {@link Field} within an {@link UnknownFieldSet}.
-     *
-     * <p>Use {@link Field#newBuilder()} to construct a {@code Builder}.
-     */
-    public static final class Builder {
-      // This constructor should only be called directly from 'create' and 'clone'.
-      private Builder() {
-        result = new Field();
-      }
-
-      private static Builder create() {
-        Builder builder = new Builder();
-        return builder;
-      }
-
-      private Field result;
-
-      @Override
-      public Builder clone() {
-        Field copy = new Field();
-        if (result.varint == null) {
-          copy.varint = null;
-        } else {
-          copy.varint = new ArrayList<>(result.varint);
-        }
-        if (result.fixed32 == null) {
-          copy.fixed32 = null;
-        } else {
-          copy.fixed32 = new ArrayList<>(result.fixed32);
-        }
-        if (result.fixed64 == null) {
-          copy.fixed64 = null;
-        } else {
-          copy.fixed64 = new ArrayList<>(result.fixed64);
-        }
-        if (result.lengthDelimited == null) {
-          copy.lengthDelimited = null;
-        } else {
-          copy.lengthDelimited = new ArrayList<>(result.lengthDelimited);
-        }
-        if (result.group == null) {
-          copy.group = null;
-        } else {
-          copy.group = new ArrayList<>(result.group);
-        }
-
-        Builder clone = new Builder();
-        clone.result = copy;
-        return clone;
-      }
-
-      /**
-       * Build the field.
-       */
-      public Field build() {
-        Field built = new Field();
-        if (result.varint == null) {
-          built.varint = Collections.emptyList();
-        } else {
-          built.varint = Collections.unmodifiableList(new ArrayList<>(result.varint));
-        }
-        if (result.fixed32 == null) {
-          built.fixed32 = Collections.emptyList();
-        } else {
-          built.fixed32 = Collections.unmodifiableList(new ArrayList<>(result.fixed32));
-        }
-        if (result.fixed64 == null) {
-          built.fixed64 = Collections.emptyList();
-        } else {
-          built.fixed64 = Collections.unmodifiableList(new ArrayList<>(result.fixed64));
-        }
-        if (result.lengthDelimited == null) {
-          built.lengthDelimited = Collections.emptyList();
-        } else {
-          built.lengthDelimited = Collections.unmodifiableList(
-              new ArrayList<>(result.lengthDelimited));
-        }
-        if (result.group == null) {
-          built.group = Collections.emptyList();
-        } else {
-          built.group = Collections.unmodifiableList(new ArrayList<>(result.group));
-        }
-
-        return built;
-      }
-
-      /** Discard the field's contents. */
-      public Builder clear() {
-        result = new Field();
-        return this;
-      }
-
-      /**
-       * Merge the values in {@code other} into this field. For each list of values, {@code other}'s
-       * values are append to the ones in this field.
-       */
-      public Builder mergeFrom(Field other) {
-        if (!other.varint.isEmpty()) {
-          if (result.varint == null) {
-            result.varint = new ArrayList<Long>();
-          }
-          result.varint.addAll(other.varint);
-        }
-        if (!other.fixed32.isEmpty()) {
-          if (result.fixed32 == null) {
-            result.fixed32 = new ArrayList<Integer>();
-          }
-          result.fixed32.addAll(other.fixed32);
-        }
-        if (!other.fixed64.isEmpty()) {
-          if (result.fixed64 == null) {
-            result.fixed64 = new ArrayList<>();
-          }
-          result.fixed64.addAll(other.fixed64);
-        }
-        if (!other.lengthDelimited.isEmpty()) {
-          if (result.lengthDelimited == null) {
-            result.lengthDelimited = new ArrayList<>();
-          }
-          result.lengthDelimited.addAll(other.lengthDelimited);
-        }
-        if (!other.group.isEmpty()) {
-          if (result.group == null) {
-            result.group = new ArrayList<>();
-          }
-          result.group.addAll(other.group);
-        }
-        return this;
-      }
-
-      /** Add a varint value. */
-      public Builder addVarint(long value) {
-        if (result.varint == null) {
-          result.varint = new ArrayList<>();
-        }
-        result.varint.add(value);
-        return this;
-      }
-
-      /** Add a fixed32 value. */
-      public Builder addFixed32(int value) {
-        if (result.fixed32 == null) {
-          result.fixed32 = new ArrayList<>();
-        }
-        result.fixed32.add(value);
-        return this;
-      }
-
-      /** Add a fixed64 value. */
-      public Builder addFixed64(long value) {
-        if (result.fixed64 == null) {
-          result.fixed64 = new ArrayList<>();
-        }
-        result.fixed64.add(value);
-        return this;
-      }
-
-      /** Add a length-delimited value. */
-      public Builder addLengthDelimited(ByteString value) {
-        if (result.lengthDelimited == null) {
-          result.lengthDelimited = new ArrayList<>();
-        }
-        result.lengthDelimited.add(value);
-        return this;
-      }
-
-      /** Add an embedded group. */
-      public Builder addGroup(UnknownFieldSet value) {
-        if (result.group == null) {
-          result.group = new ArrayList<>();
-        }
-        result.group.add(value);
-        return this;
-      }
-    }
-  }
-
-  /** Parser to implement MessageLite interface. */
-  public static final class Parser extends AbstractParser<UnknownFieldSet> {
-    @Override
-    public UnknownFieldSet parsePartialFrom(
-        CodedInputStream input, ExtensionRegistryLite extensionRegistry)
-        throws InvalidProtocolBufferException {
-      Builder builder = newBuilder();
-      try {
-        builder.mergeFrom(input);
-      } catch (InvalidProtocolBufferException e) {
-        throw e.setUnfinishedMessage(builder.buildPartial());
-      } catch (IOException e) {
-        throw new InvalidProtocolBufferException(e).setUnfinishedMessage(builder.buildPartial());
-      }
-      return builder.buildPartial();
-    }
-  }
-
-  private static final Parser PARSER = new Parser();
-
-  @Override
-  public final Parser getParserForType() {
-    return PARSER;
-  }
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/UnknownFieldSetLite.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/UnknownFieldSetLite.java
deleted file mode 100644
index 85a773a..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/UnknownFieldSetLite.java
+++ /dev/null
@@ -1,515 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import java.io.IOException;
-import java.util.Arrays;
-
-/**
- * {@code UnknownFieldSetLite} is used to keep track of fields which were seen when parsing a
- * protocol message but whose field numbers or types are unrecognized. This most frequently occurs
- * when new fields are added to a message type and then messages containing those fields are read by
- * old software that was compiled before the new types were added.
- *
- * <p>For use by generated code only.
- *
- * @author dweis@google.com (Daniel Weis)
- */
-public final class UnknownFieldSetLite {
-
-  // Arbitrarily chosen.
-  // TODO(dweis): Tune this number?
-  private static final int MIN_CAPACITY = 8;
-
-  private static final UnknownFieldSetLite DEFAULT_INSTANCE =
-      new UnknownFieldSetLite(0, new int[0], new Object[0], /* isMutable= */ false);
-
-  /**
-   * Get an empty {@code UnknownFieldSetLite}.
-   *
-   * <p>For use by generated code only.
-   */
-  public static UnknownFieldSetLite getDefaultInstance() {
-    return DEFAULT_INSTANCE;
-  }
-
-  /** Returns a new mutable instance. */
-  static UnknownFieldSetLite newInstance() {
-    return new UnknownFieldSetLite();
-  }
-
-  /**
-   * Returns a mutable {@code UnknownFieldSetLite} that is the composite of {@code first} and {@code
-   * second}.
-   */
-  static UnknownFieldSetLite mutableCopyOf(UnknownFieldSetLite first, UnknownFieldSetLite second) {
-    int count = first.count + second.count;
-    int[] tags = Arrays.copyOf(first.tags, count);
-    System.arraycopy(second.tags, 0, tags, first.count, second.count);
-    Object[] objects = Arrays.copyOf(first.objects, count);
-    System.arraycopy(second.objects, 0, objects, first.count, second.count);
-    return new UnknownFieldSetLite(count, tags, objects, /* isMutable= */ true);
-  }
-
-  /** The number of elements in the set. */
-  private int count;
-
-  /** The tag numbers for the elements in the set. */
-  private int[] tags;
-
-  /** The boxed values of the elements in the set. */
-  private Object[] objects;
-
-  /** The lazily computed serialized size of the set. */
-  private int memoizedSerializedSize = -1;
-
-  /** Indicates that this object is mutable. */
-  private boolean isMutable;
-
-  /** Constructs a mutable {@code UnknownFieldSetLite}. */
-  private UnknownFieldSetLite() {
-    this(0, new int[MIN_CAPACITY], new Object[MIN_CAPACITY], /* isMutable= */ true);
-  }
-
-  /** Constructs the {@code UnknownFieldSetLite}. */
-  private UnknownFieldSetLite(int count, int[] tags, Object[] objects, boolean isMutable) {
-    this.count = count;
-    this.tags = tags;
-    this.objects = objects;
-    this.isMutable = isMutable;
-  }
-
-  /**
-   * Marks this object as immutable.
-   *
-   * <p>Future calls to methods that attempt to modify this object will throw.
-   */
-  public void makeImmutable() {
-    this.isMutable = false;
-  }
-
-  /** Throws an {@link UnsupportedOperationException} if immutable. */
-  void checkMutable() {
-    if (!isMutable) {
-      throw new UnsupportedOperationException();
-    }
-  }
-
-  /**
-   * Serializes the set and writes it to {@code output}.
-   *
-   * <p>For use by generated code only.
-   */
-  public void writeTo(CodedOutputStream output) throws IOException {
-    for (int i = 0; i < count; i++) {
-      int tag = tags[i];
-      int fieldNumber = WireFormat.getTagFieldNumber(tag);
-      switch (WireFormat.getTagWireType(tag)) {
-        case WireFormat.WIRETYPE_VARINT:
-          output.writeUInt64(fieldNumber, (Long) objects[i]);
-          break;
-        case WireFormat.WIRETYPE_FIXED32:
-          output.writeFixed32(fieldNumber, (Integer) objects[i]);
-          break;
-        case WireFormat.WIRETYPE_FIXED64:
-          output.writeFixed64(fieldNumber, (Long) objects[i]);
-          break;
-        case WireFormat.WIRETYPE_LENGTH_DELIMITED:
-          output.writeBytes(fieldNumber, (ByteString) objects[i]);
-          break;
-        case WireFormat.WIRETYPE_START_GROUP:
-          output.writeTag(fieldNumber, WireFormat.WIRETYPE_START_GROUP);
-          ((UnknownFieldSetLite) objects[i]).writeTo(output);
-          output.writeTag(fieldNumber, WireFormat.WIRETYPE_END_GROUP);
-          break;
-        default:
-          throw InvalidProtocolBufferException.invalidWireType();
-      }
-    }
-  }
-
-  /**
-   * Serializes the set and writes it to {@code output} using {@code MessageSet} wire format.
-   *
-   * <p>For use by generated code only.
-   */
-  public void writeAsMessageSetTo(CodedOutputStream output) throws IOException {
-    for (int i = 0; i < count; i++) {
-      int fieldNumber = WireFormat.getTagFieldNumber(tags[i]);
-      output.writeRawMessageSetExtension(fieldNumber, (ByteString) objects[i]);
-    }
-  }
-
-  /** Serializes the set and writes it to {@code writer} using {@code MessageSet} wire format. */
-  void writeAsMessageSetTo(Writer writer) throws IOException {
-    if (writer.fieldOrder() == Writer.FieldOrder.DESCENDING) {
-      // Write fields in descending order.
-      for (int i = count - 1; i >= 0; i--) {
-        int fieldNumber = WireFormat.getTagFieldNumber(tags[i]);
-        writer.writeMessageSetItem(fieldNumber, objects[i]);
-      }
-    } else {
-      // Write fields in ascending order.
-      for (int i = 0; i < count; i++) {
-        int fieldNumber = WireFormat.getTagFieldNumber(tags[i]);
-        writer.writeMessageSetItem(fieldNumber, objects[i]);
-      }
-    }
-  }
-
-  /** Serializes the set and writes it to {@code writer}. */
-  public void writeTo(Writer writer) throws IOException {
-    if (count == 0) {
-      return;
-    }
-
-    // TODO: tags are not sorted, so there's no write order guarantees
-    if (writer.fieldOrder() == Writer.FieldOrder.ASCENDING) {
-      for (int i = 0; i < count; ++i) {
-        writeField(tags[i], objects[i], writer);
-      }
-    } else {
-      for (int i = count - 1; i >= 0; --i) {
-        writeField(tags[i], objects[i], writer);
-      }
-    }
-  }
-
-  private static void writeField(int tag, Object object, Writer writer) throws IOException {
-    int fieldNumber = WireFormat.getTagFieldNumber(tag);
-    switch (WireFormat.getTagWireType(tag)) {
-      case WireFormat.WIRETYPE_VARINT:
-        writer.writeInt64(fieldNumber, (Long) object);
-        break;
-      case WireFormat.WIRETYPE_FIXED32:
-        writer.writeFixed32(fieldNumber, (Integer) object);
-        break;
-      case WireFormat.WIRETYPE_FIXED64:
-        writer.writeFixed64(fieldNumber, (Long) object);
-        break;
-      case WireFormat.WIRETYPE_LENGTH_DELIMITED:
-        writer.writeBytes(fieldNumber, (ByteString) object);
-        break;
-      case WireFormat.WIRETYPE_START_GROUP:
-        if (writer.fieldOrder() == Writer.FieldOrder.ASCENDING) {
-          writer.writeStartGroup(fieldNumber);
-          ((UnknownFieldSetLite) object).writeTo(writer);
-          writer.writeEndGroup(fieldNumber);
-        } else {
-          writer.writeEndGroup(fieldNumber);
-          ((UnknownFieldSetLite) object).writeTo(writer);
-          writer.writeStartGroup(fieldNumber);
-        }
-        break;
-      default:
-        // TODO(liujisi): Change writeTo to throw IOException?
-        throw new RuntimeException(InvalidProtocolBufferException.invalidWireType());
-    }
-  }
-
-  /**
-   * Get the number of bytes required to encode this field, including field number, using {@code
-   * MessageSet} wire format.
-   */
-  public int getSerializedSizeAsMessageSet() {
-    int size = memoizedSerializedSize;
-    if (size != -1) {
-      return size;
-    }
-
-    size = 0;
-    for (int i = 0; i < count; i++) {
-      int tag = tags[i];
-      int fieldNumber = WireFormat.getTagFieldNumber(tag);
-      size +=
-          CodedOutputStream.computeRawMessageSetExtensionSize(fieldNumber, (ByteString) objects[i]);
-    }
-
-    memoizedSerializedSize = size;
-
-    return size;
-  }
-
-  /**
-   * Get the number of bytes required to encode this set.
-   *
-   * <p>For use by generated code only.
-   */
-  public int getSerializedSize() {
-    int size = memoizedSerializedSize;
-    if (size != -1) {
-      return size;
-    }
-
-    size = 0;
-    for (int i = 0; i < count; i++) {
-      int tag = tags[i];
-      int fieldNumber = WireFormat.getTagFieldNumber(tag);
-      switch (WireFormat.getTagWireType(tag)) {
-        case WireFormat.WIRETYPE_VARINT:
-          size += CodedOutputStream.computeUInt64Size(fieldNumber, (Long) objects[i]);
-          break;
-        case WireFormat.WIRETYPE_FIXED32:
-          size += CodedOutputStream.computeFixed32Size(fieldNumber, (Integer) objects[i]);
-          break;
-        case WireFormat.WIRETYPE_FIXED64:
-          size += CodedOutputStream.computeFixed64Size(fieldNumber, (Long) objects[i]);
-          break;
-        case WireFormat.WIRETYPE_LENGTH_DELIMITED:
-          size += CodedOutputStream.computeBytesSize(fieldNumber, (ByteString) objects[i]);
-          break;
-        case WireFormat.WIRETYPE_START_GROUP:
-          size +=
-              CodedOutputStream.computeTagSize(fieldNumber) * 2
-                  + ((UnknownFieldSetLite) objects[i]).getSerializedSize();
-          break;
-        default:
-          throw new IllegalStateException(InvalidProtocolBufferException.invalidWireType());
-      }
-    }
-
-    memoizedSerializedSize = size;
-
-    return size;
-  }
-
-  private static boolean tagsEquals(int[] tags1, int[] tags2, int count) {
-    for (int i = 0; i < count; ++i) {
-      if (tags1[i] != tags2[i]) {
-        return false;
-      }
-    }
-    return true;
-  }
-
-  private static boolean objectsEquals(Object[] objects1, Object[] objects2, int count) {
-    for (int i = 0; i < count; ++i) {
-      if (!objects1[i].equals(objects2[i])) {
-        return false;
-      }
-    }
-    return true;
-  }
-
-  @Override
-  public boolean equals(Object obj) {
-    if (this == obj) {
-      return true;
-    }
-
-    if (obj == null) {
-      return false;
-    }
-
-    if (!(obj instanceof UnknownFieldSetLite)) {
-      return false;
-    }
-
-    UnknownFieldSetLite other = (UnknownFieldSetLite) obj;
-    if (count != other.count
-        || !tagsEquals(tags, other.tags, count)
-        || !objectsEquals(objects, other.objects, count)) {
-      return false;
-    }
-
-    return true;
-  }
-
-  private static int hashCode(int[] tags, int count) {
-    int hashCode = 17;
-    for (int i = 0; i < count; ++i) {
-      hashCode = 31 * hashCode + tags[i];
-    }
-    return hashCode;
-  }
-
-  private static int hashCode(Object[] objects, int count) {
-    int hashCode = 17;
-    for (int i = 0; i < count; ++i) {
-      hashCode = 31 * hashCode + objects[i].hashCode();
-    }
-    return hashCode;
-  }
-
-  @Override
-  public int hashCode() {
-    int hashCode = 17;
-
-    hashCode = 31 * hashCode + count;
-    hashCode = 31 * hashCode + hashCode(tags, count);
-    hashCode = 31 * hashCode + hashCode(objects, count);
-
-    return hashCode;
-  }
-
-  /**
-   * Prints a String representation of the unknown field set.
-   *
-   * <p>For use by generated code only.
-   *
-   * @param buffer the buffer to write to
-   * @param indent the number of spaces the fields should be indented by
-   */
-  final void printWithIndent(StringBuilder buffer, int indent) {
-    for (int i = 0; i < count; i++) {
-      int fieldNumber = WireFormat.getTagFieldNumber(tags[i]);
-      MessageLiteToString.printField(buffer, indent, String.valueOf(fieldNumber), objects[i]);
-    }
-  }
-
-  // Package private for unsafe experimental runtime.
-  void storeField(int tag, Object value) {
-    checkMutable();
-    ensureCapacity(count + 1);
-
-    tags[count] = tag;
-    objects[count] = value;
-    count++;
-  }
-
-  /** Ensures that our arrays are long enough to store more metadata. */
-  private void ensureCapacity(int minCapacity) {
-    if (minCapacity > this.tags.length) {
-      // Increase by at least 50%
-      int newCapacity = count + count / 2;
-
-      // Or new capacity if higher
-      if (newCapacity < minCapacity) {
-        newCapacity = minCapacity;
-      }
-
-      // And never less than MIN_CAPACITY
-      if (newCapacity < MIN_CAPACITY) {
-        newCapacity = MIN_CAPACITY;
-      }
-
-      this.tags = Arrays.copyOf(this.tags, newCapacity);
-      this.objects = Arrays.copyOf(this.objects, newCapacity);
-    }
-  }
-
-  /**
-   * Parse a single field from {@code input} and merge it into this set.
-   *
-   * <p>For use by generated code only.
-   *
-   * @param tag The field's tag number, which was already parsed.
-   * @return {@code false} if the tag is an end group tag.
-   */
-  boolean mergeFieldFrom(final int tag, final CodedInputStream input) throws IOException {
-    checkMutable();
-    final int fieldNumber = WireFormat.getTagFieldNumber(tag);
-    switch (WireFormat.getTagWireType(tag)) {
-      case WireFormat.WIRETYPE_VARINT:
-        storeField(tag, input.readInt64());
-        return true;
-      case WireFormat.WIRETYPE_FIXED32:
-        storeField(tag, input.readFixed32());
-        return true;
-      case WireFormat.WIRETYPE_FIXED64:
-        storeField(tag, input.readFixed64());
-        return true;
-      case WireFormat.WIRETYPE_LENGTH_DELIMITED:
-        storeField(tag, input.readBytes());
-        return true;
-      case WireFormat.WIRETYPE_START_GROUP:
-        final UnknownFieldSetLite subFieldSet = new UnknownFieldSetLite();
-        subFieldSet.mergeFrom(input);
-        input.checkLastTagWas(WireFormat.makeTag(fieldNumber, WireFormat.WIRETYPE_END_GROUP));
-        storeField(tag, subFieldSet);
-        return true;
-      case WireFormat.WIRETYPE_END_GROUP:
-        return false;
-      default:
-        throw InvalidProtocolBufferException.invalidWireType();
-    }
-  }
-
-  /**
-   * Convenience method for merging a new field containing a single varint value. This is used in
-   * particular when an unknown enum value is encountered.
-   *
-   * <p>For use by generated code only.
-   */
-  UnknownFieldSetLite mergeVarintField(int fieldNumber, int value) {
-    checkMutable();
-    if (fieldNumber == 0) {
-      throw new IllegalArgumentException("Zero is not a valid field number.");
-    }
-
-    storeField(WireFormat.makeTag(fieldNumber, WireFormat.WIRETYPE_VARINT), (long) value);
-
-    return this;
-  }
-
-  /**
-   * Convenience method for merging a length-delimited field.
-   *
-   * <p>For use by generated code only.
-   */
-  UnknownFieldSetLite mergeLengthDelimitedField(final int fieldNumber, final ByteString value) {
-    checkMutable();
-    if (fieldNumber == 0) {
-      throw new IllegalArgumentException("Zero is not a valid field number.");
-    }
-
-    storeField(WireFormat.makeTag(fieldNumber, WireFormat.WIRETYPE_LENGTH_DELIMITED), value);
-
-    return this;
-  }
-
-  /** Parse an entire message from {@code input} and merge its fields into this set. */
-  private UnknownFieldSetLite mergeFrom(final CodedInputStream input) throws IOException {
-    // Ensures initialization in mergeFieldFrom.
-    while (true) {
-      final int tag = input.readTag();
-      if (tag == 0 || !mergeFieldFrom(tag, input)) {
-        break;
-      }
-    }
-    return this;
-  }
-
-  @CanIgnoreReturnValue
-  UnknownFieldSetLite mergeFrom(UnknownFieldSetLite other) {
-    if (other.equals(getDefaultInstance())) {
-      return this;
-    }
-
-    checkMutable();
-    int newCount = this.count + other.count;
-    ensureCapacity(newCount);
-    System.arraycopy(other.tags, 0, tags, this.count, other.count);
-    System.arraycopy(other.objects, 0, objects, this.count, other.count);
-    this.count = newCount;
-    return this;
-  }
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/UnknownFieldSetLiteSchema.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/UnknownFieldSetLiteSchema.java
deleted file mode 100644
index de59f96..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/UnknownFieldSetLiteSchema.java
+++ /dev/null
@@ -1,145 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import java.io.IOException;
-
-@CheckReturnValue
-class UnknownFieldSetLiteSchema
-    extends UnknownFieldSchema<UnknownFieldSetLite, UnknownFieldSetLite> {
-
-  UnknownFieldSetLiteSchema() {}
-
-  @Override
-  boolean shouldDiscardUnknownFields(Reader reader) {
-    // We never drop unknown fields in lite.
-    return false;
-  }
-
-  @Override
-  UnknownFieldSetLite newBuilder() {
-    return UnknownFieldSetLite.newInstance();
-  }
-
-  @Override
-  void addVarint(UnknownFieldSetLite fields, int number, long value) {
-    fields.storeField(WireFormat.makeTag(number, WireFormat.WIRETYPE_VARINT), value);
-  }
-
-  @Override
-  void addFixed32(UnknownFieldSetLite fields, int number, int value) {
-    fields.storeField(WireFormat.makeTag(number, WireFormat.WIRETYPE_FIXED32), value);
-  }
-
-  @Override
-  void addFixed64(UnknownFieldSetLite fields, int number, long value) {
-    fields.storeField(WireFormat.makeTag(number, WireFormat.WIRETYPE_FIXED64), value);
-  }
-
-  @Override
-  void addLengthDelimited(UnknownFieldSetLite fields, int number, ByteString value) {
-    fields.storeField(WireFormat.makeTag(number, WireFormat.WIRETYPE_LENGTH_DELIMITED), value);
-  }
-
-  @Override
-  void addGroup(UnknownFieldSetLite fields, int number, UnknownFieldSetLite subFieldSet) {
-    fields.storeField(WireFormat.makeTag(number, WireFormat.WIRETYPE_START_GROUP), subFieldSet);
-  }
-
-  @Override
-  UnknownFieldSetLite toImmutable(UnknownFieldSetLite fields) {
-    fields.makeImmutable();
-    return fields;
-  }
-
-  @Override
-  void setToMessage(Object message, UnknownFieldSetLite fields) {
-    ((GeneratedMessageLite<?, ?>) message).unknownFields = fields;
-  }
-
-  @Override
-  UnknownFieldSetLite getFromMessage(Object message) {
-    return ((GeneratedMessageLite<?, ?>) message).unknownFields;
-  }
-
-  @Override
-  UnknownFieldSetLite getBuilderFromMessage(Object message) {
-    UnknownFieldSetLite unknownFields = getFromMessage(message);
-    // When parsing into a lite message object, its UnknownFieldSet is either the default instance
-    // or mutable. It can't be in a state where it's immutable but not default instance.
-    if (unknownFields == UnknownFieldSetLite.getDefaultInstance()) {
-      unknownFields = UnknownFieldSetLite.newInstance();
-      setToMessage(message, unknownFields);
-    }
-    return unknownFields;
-  }
-
-  @Override
-  void setBuilderToMessage(Object message, UnknownFieldSetLite fields) {
-    setToMessage(message, fields);
-  }
-
-  @Override
-  void makeImmutable(Object message) {
-    getFromMessage(message).makeImmutable();
-  }
-
-  @Override
-  void writeTo(UnknownFieldSetLite fields, Writer writer) throws IOException {
-    fields.writeTo(writer);
-  }
-
-  @Override
-  void writeAsMessageSetTo(UnknownFieldSetLite fields, Writer writer) throws IOException {
-    fields.writeAsMessageSetTo(writer);
-  }
-
-  @Override
-  UnknownFieldSetLite merge(UnknownFieldSetLite target, UnknownFieldSetLite source) {
-    if (UnknownFieldSetLite.getDefaultInstance().equals(source)) {
-      return target;
-    }
-    if (UnknownFieldSetLite.getDefaultInstance().equals(target)) {
-      return UnknownFieldSetLite.mutableCopyOf(target, source);
-    }
-    return target.mergeFrom(source);
-  }
-
-  @Override
-  int getSerializedSize(UnknownFieldSetLite unknowns) {
-    return unknowns.getSerializedSize();
-  }
-
-  @Override
-  int getSerializedSizeAsMessageSet(UnknownFieldSetLite unknowns) {
-    return unknowns.getSerializedSizeAsMessageSet();
-  }
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/UnknownFieldSetSchema.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/UnknownFieldSetSchema.java
deleted file mode 100644
index b838c4b..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/UnknownFieldSetSchema.java
+++ /dev/null
@@ -1,132 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import java.io.IOException;
-
-class UnknownFieldSetSchema extends UnknownFieldSchema<UnknownFieldSet, UnknownFieldSet.Builder> {
-
-  private final boolean proto3;
-
-  public UnknownFieldSetSchema(boolean proto3) {
-    this.proto3 = proto3;
-  }
-
-  @Override
-  boolean shouldDiscardUnknownFields(Reader reader) {
-    return reader.shouldDiscardUnknownFields();
-  }
-
-  @Override
-  UnknownFieldSet.Builder newBuilder() {
-    return UnknownFieldSet.newBuilder();
-  }
-
-  @Override
-  void addVarint(UnknownFieldSet.Builder fields, int number, long value) {
-    fields.mergeField(number, UnknownFieldSet.Field.newBuilder().addVarint(value).build());
-  }
-
-  @Override
-  void addFixed32(UnknownFieldSet.Builder fields, int number, int value) {
-    fields.mergeField(number, UnknownFieldSet.Field.newBuilder().addFixed32(value).build());
-  }
-
-  @Override
-  void addFixed64(UnknownFieldSet.Builder fields, int number, long value) {
-    fields.mergeField(number, UnknownFieldSet.Field.newBuilder().addFixed64(value).build());
-  }
-
-  @Override
-  void addLengthDelimited(UnknownFieldSet.Builder fields, int number, ByteString value) {
-    fields.mergeField(number, UnknownFieldSet.Field.newBuilder().addLengthDelimited(value).build());
-  }
-
-  @Override
-  void addGroup(UnknownFieldSet.Builder fields, int number, UnknownFieldSet subFieldSet) {
-    fields.mergeField(number, UnknownFieldSet.Field.newBuilder().addGroup(subFieldSet).build());
-  }
-
-  @Override
-  UnknownFieldSet toImmutable(UnknownFieldSet.Builder fields) {
-    return fields.build();
-  }
-
-  @Override
-  void writeTo(UnknownFieldSet message, Writer writer) throws IOException {
-    message.writeTo(writer);
-  }
-
-  @Override
-  void writeAsMessageSetTo(UnknownFieldSet message, Writer writer) throws IOException {
-    message.writeAsMessageSetTo(writer);
-  }
-
-  @Override
-  UnknownFieldSet getFromMessage(Object message) {
-    return ((GeneratedMessageV3) message).unknownFields;
-  }
-
-  @Override
-  void setToMessage(Object message, UnknownFieldSet fields) {
-    ((GeneratedMessageV3) message).unknownFields = fields;
-  }
-
-  @Override
-  UnknownFieldSet.Builder getBuilderFromMessage(Object message) {
-    return ((GeneratedMessageV3) message).unknownFields.toBuilder();
-  }
-
-  @Override
-  void setBuilderToMessage(Object message, UnknownFieldSet.Builder builder) {
-    ((GeneratedMessageV3) message).unknownFields = builder.build();
-  }
-
-  @Override
-  void makeImmutable(Object message) {
-    // Already immutable.
-  }
-
-  @Override
-  UnknownFieldSet merge(UnknownFieldSet message, UnknownFieldSet other) {
-    return message.toBuilder().mergeFrom(other).build();
-  }
-
-  @Override
-  int getSerializedSize(UnknownFieldSet message) {
-    return message.getSerializedSize();
-  }
-
-  @Override
-  int getSerializedSizeAsMessageSet(UnknownFieldSet unknowns) {
-    return unknowns.getSerializedSizeAsMessageSet();
-  }
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/UnmodifiableLazyStringList.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/UnmodifiableLazyStringList.java
deleted file mode 100644
index 415b2cd..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/UnmodifiableLazyStringList.java
+++ /dev/null
@@ -1,210 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import java.util.AbstractList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.RandomAccess;
-
-/**
- * An implementation of {@link LazyStringList} that wraps another {@link LazyStringList} such that
- * it cannot be modified via the wrapper.
- *
- * @author jonp@google.com (Jon Perlow)
- */
-public class UnmodifiableLazyStringList extends AbstractList<String>
-    implements LazyStringList, RandomAccess {
-
-  private final LazyStringList list;
-
-  public UnmodifiableLazyStringList(LazyStringList list) {
-    this.list = list;
-  }
-
-  @Override
-  public String get(int index) {
-    return list.get(index);
-  }
-
-  @Override
-  public Object getRaw(int index) {
-    return list.getRaw(index);
-  }
-
-  @Override
-  public int size() {
-    return list.size();
-  }
-
-  @Override
-  public ByteString getByteString(int index) {
-    return list.getByteString(index);
-  }
-
-  @Override
-  public void add(ByteString element) {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public void set(int index, ByteString element) {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public boolean addAllByteString(Collection<? extends ByteString> element) {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public byte[] getByteArray(int index) {
-    return list.getByteArray(index);
-  }
-
-  @Override
-  public void add(byte[] element) {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public void set(int index, byte[] element) {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public boolean addAllByteArray(Collection<byte[]> element) {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public ListIterator<String> listIterator(final int index) {
-    return new ListIterator<String>() {
-      ListIterator<String> iter = list.listIterator(index);
-
-      @Override
-      public boolean hasNext() {
-        return iter.hasNext();
-      }
-
-      @Override
-      public String next() {
-        return iter.next();
-      }
-
-      @Override
-      public boolean hasPrevious() {
-        return iter.hasPrevious();
-      }
-
-      @Override
-      public String previous() {
-        return iter.previous();
-      }
-
-      @Override
-      public int nextIndex() {
-        return iter.nextIndex();
-      }
-
-      @Override
-      public int previousIndex() {
-        return iter.previousIndex();
-      }
-
-      @Override
-      public void remove() {
-        throw new UnsupportedOperationException();
-      }
-
-      @Override
-      public void set(String o) {
-        throw new UnsupportedOperationException();
-      }
-
-      @Override
-      public void add(String o) {
-        throw new UnsupportedOperationException();
-      }
-    };
-  }
-
-  @Override
-  public Iterator<String> iterator() {
-    return new Iterator<String>() {
-      Iterator<String> iter = list.iterator();
-
-      @Override
-      public boolean hasNext() {
-        return iter.hasNext();
-      }
-
-      @Override
-      public String next() {
-        return iter.next();
-      }
-
-      @Override
-      public void remove() {
-        throw new UnsupportedOperationException();
-      }
-    };
-  }
-
-  @Override
-  public List<?> getUnderlyingElements() {
-    // The returned value is already unmodifiable.
-    return list.getUnderlyingElements();
-  }
-
-  @Override
-  public void mergeFrom(LazyStringList other) {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public List<byte[]> asByteArrayList() {
-    return Collections.unmodifiableList(list.asByteArrayList());
-  }
-
-  @Override
-  public List<ByteString> asByteStringList() {
-    return Collections.unmodifiableList(list.asByteStringList());
-  }
-
-  @Override
-  public LazyStringList getUnmodifiableView() {
-    return this;
-  }
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/UnsafeByteOperations.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/UnsafeByteOperations.java
deleted file mode 100644
index 16521e1..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/UnsafeByteOperations.java
+++ /dev/null
@@ -1,121 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import java.io.IOException;
-import java.nio.ByteBuffer;
-
-/**
- * Provides a number of unsafe byte operations to be used by advanced applications with high
- * performance requirements. These methods are referred to as "unsafe" because they
- * potentially expose the backing buffer of a {@link ByteString} to the application.
- *
- * <p><strong>DISCLAIMER:</strong> The methods in this class should only be called if it is
- * guaranteed that the buffer backing the {@link ByteString} will never change! Mutation of a {@link
- * ByteString} can lead to unexpected and undesirable consequences in your application, and will
- * likely be difficult to debug. Proceed with caution!
- *
- * <p>This can have a number of significant side affects that have spooky-action-at-a-distance-like
- * behavior. In particular, if the bytes value changes out from under a Protocol Buffer:
- *
- * <ul>
- *   <li>serialization may throw
- *   <li>serialization may succeed but the wrong bytes may be written out
- *   <li>messages are no longer threadsafe
- *   <li>hashCode may be incorrect
- *       <ul>
- *         <li>can result in a permanent memory leak when used as a key in a long-lived HashMap
- *         <li>the semantics of many programs may be violated if this is the case
- *       </ul>
- * </ul>
- *
- * Each of these issues will occur in parts of the code base that are entirely distinct from the
- * parts of the code base modifying the buffer. In fact, both parts of the code base may be correct
- * - it is the bridging with the unsafe operations that was in error!
- */
-@ExperimentalApi
-public final class UnsafeByteOperations {
-  private UnsafeByteOperations() {}
-
-  /**
-   * An unsafe operation that returns a {@link ByteString} that is backed by the provided buffer.
-   *
-   * @param buffer the buffer to be wrapped
-   * @return a {@link ByteString} backed by the provided buffer
-   */
-  public static ByteString unsafeWrap(byte[] buffer) {
-    return ByteString.wrap(buffer);
-  }
-
-  /**
-   * An unsafe operation that returns a {@link ByteString} that is backed by a subregion of the
-   * provided buffer.
-   *
-   * @param buffer the buffer to be wrapped
-   * @param offset the offset of the wrapped region
-   * @param length the number of bytes of the wrapped region
-   * @return a {@link ByteString} backed by the provided buffer
-   */
-  public static ByteString unsafeWrap(byte[] buffer, int offset, int length) {
-    return ByteString.wrap(buffer, offset, length);
-  }
-
-  /**
-   * An unsafe operation that returns a {@link ByteString} that is backed by the provided buffer.
-   *
-   * @param buffer the Java NIO buffer to be wrapped
-   * @return a {@link ByteString} backed by the provided buffer
-   */
-  public static ByteString unsafeWrap(ByteBuffer buffer) {
-    return ByteString.wrap(buffer);
-  }
-
-  /**
-   * Writes the given {@link ByteString} to the provided {@link ByteOutput}. Calling this method may
-   * result in multiple operations on the target {@link ByteOutput} (i.e. for roped {@link
-   * ByteString}s).
-   *
-   * <p>This method exposes the internal backing buffer(s) of the {@link ByteString} to the {@link
-   * ByteOutput} in order to avoid additional copying overhead. It would be possible for a malicious
-   * {@link ByteOutput} to corrupt the {@link ByteString}. Use with caution!
-   *
-   * <p>NOTE: The {@link ByteOutput} <strong>MUST NOT</strong> modify the provided buffers. Doing so
-   * may result in corrupted data, which would be difficult to debug.
-   *
-   * @param bytes the {@link ByteString} to be written
-   * @param output the output to receive the bytes
-   * @throws IOException if an I/O error occurs
-   */
-  public static void unsafeWriteTo(ByteString bytes, ByteOutput output) throws IOException {
-    bytes.writeTo(output);
-  }
-
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/UnsafeUtil.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/UnsafeUtil.java
deleted file mode 100644
index dd459f0..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/UnsafeUtil.java
+++ /dev/null
@@ -1,1036 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import java.lang.reflect.Field;
-import java.nio.Buffer;
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-import java.security.AccessController;
-import java.security.PrivilegedExceptionAction;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/** Utility class for working with unsafe operations. */
-final class UnsafeUtil {
-  private static final sun.misc.Unsafe UNSAFE = getUnsafe();
-  private static final Class<?> MEMORY_CLASS = Android.getMemoryClass();
-  private static final boolean IS_ANDROID_64 = determineAndroidSupportByAddressSize(long.class);
-  private static final boolean IS_ANDROID_32 = determineAndroidSupportByAddressSize(int.class);
-  private static final MemoryAccessor MEMORY_ACCESSOR = getMemoryAccessor();
-  private static final boolean HAS_UNSAFE_BYTEBUFFER_OPERATIONS =
-      supportsUnsafeByteBufferOperations();
-  private static final boolean HAS_UNSAFE_ARRAY_OPERATIONS = supportsUnsafeArrayOperations();
-
-  static final long BYTE_ARRAY_BASE_OFFSET = arrayBaseOffset(byte[].class);
-  // Micro-optimization: we can assume a scale of 1 and skip the multiply
-  // private static final long BYTE_ARRAY_INDEX_SCALE = 1;
-
-  private static final long BOOLEAN_ARRAY_BASE_OFFSET = arrayBaseOffset(boolean[].class);
-  private static final long BOOLEAN_ARRAY_INDEX_SCALE = arrayIndexScale(boolean[].class);
-
-  private static final long INT_ARRAY_BASE_OFFSET = arrayBaseOffset(int[].class);
-  private static final long INT_ARRAY_INDEX_SCALE = arrayIndexScale(int[].class);
-
-  private static final long LONG_ARRAY_BASE_OFFSET = arrayBaseOffset(long[].class);
-  private static final long LONG_ARRAY_INDEX_SCALE = arrayIndexScale(long[].class);
-
-  private static final long FLOAT_ARRAY_BASE_OFFSET = arrayBaseOffset(float[].class);
-  private static final long FLOAT_ARRAY_INDEX_SCALE = arrayIndexScale(float[].class);
-
-  private static final long DOUBLE_ARRAY_BASE_OFFSET = arrayBaseOffset(double[].class);
-  private static final long DOUBLE_ARRAY_INDEX_SCALE = arrayIndexScale(double[].class);
-
-  private static final long OBJECT_ARRAY_BASE_OFFSET = arrayBaseOffset(Object[].class);
-  private static final long OBJECT_ARRAY_INDEX_SCALE = arrayIndexScale(Object[].class);
-
-  private static final long BUFFER_ADDRESS_OFFSET = fieldOffset(bufferAddressField());
-
-  private static final int STRIDE = 8;
-  private static final int STRIDE_ALIGNMENT_MASK = STRIDE - 1;
-  private static final int BYTE_ARRAY_ALIGNMENT =
-      (int) (BYTE_ARRAY_BASE_OFFSET & STRIDE_ALIGNMENT_MASK);
-
-  static final boolean IS_BIG_ENDIAN = ByteOrder.nativeOrder() == ByteOrder.BIG_ENDIAN;
-
-  private UnsafeUtil() {}
-
-  static boolean hasUnsafeArrayOperations() {
-    return HAS_UNSAFE_ARRAY_OPERATIONS;
-  }
-
-  static boolean hasUnsafeByteBufferOperations() {
-    return HAS_UNSAFE_BYTEBUFFER_OPERATIONS;
-  }
-
-  static boolean isAndroid64() {
-    return IS_ANDROID_64;
-  }
-
-  @SuppressWarnings("unchecked") // safe by method contract
-  static <T> T allocateInstance(Class<T> clazz) {
-    try {
-      return (T) UNSAFE.allocateInstance(clazz);
-    } catch (InstantiationException e) {
-      throw new IllegalStateException(e);
-    }
-  }
-
-  static long objectFieldOffset(Field field) {
-    return MEMORY_ACCESSOR.objectFieldOffset(field);
-  }
-
-  private static int arrayBaseOffset(Class<?> clazz) {
-    return HAS_UNSAFE_ARRAY_OPERATIONS ? MEMORY_ACCESSOR.arrayBaseOffset(clazz) : -1;
-  }
-
-  private static int arrayIndexScale(Class<?> clazz) {
-    return HAS_UNSAFE_ARRAY_OPERATIONS ? MEMORY_ACCESSOR.arrayIndexScale(clazz) : -1;
-  }
-
-  static byte getByte(Object target, long offset) {
-    return MEMORY_ACCESSOR.getByte(target, offset);
-  }
-
-  static void putByte(Object target, long offset, byte value) {
-    MEMORY_ACCESSOR.putByte(target, offset, value);
-  }
-
-  static int getInt(Object target, long offset) {
-    return MEMORY_ACCESSOR.getInt(target, offset);
-  }
-
-  static void putInt(Object target, long offset, int value) {
-    MEMORY_ACCESSOR.putInt(target, offset, value);
-  }
-
-  static long getLong(Object target, long offset) {
-    return MEMORY_ACCESSOR.getLong(target, offset);
-  }
-
-  static void putLong(Object target, long offset, long value) {
-    MEMORY_ACCESSOR.putLong(target, offset, value);
-  }
-
-  static boolean getBoolean(Object target, long offset) {
-    return MEMORY_ACCESSOR.getBoolean(target, offset);
-  }
-
-  static void putBoolean(Object target, long offset, boolean value) {
-    MEMORY_ACCESSOR.putBoolean(target, offset, value);
-  }
-
-  static float getFloat(Object target, long offset) {
-    return MEMORY_ACCESSOR.getFloat(target, offset);
-  }
-
-  static void putFloat(Object target, long offset, float value) {
-    MEMORY_ACCESSOR.putFloat(target, offset, value);
-  }
-
-  static double getDouble(Object target, long offset) {
-    return MEMORY_ACCESSOR.getDouble(target, offset);
-  }
-
-  static void putDouble(Object target, long offset, double value) {
-    MEMORY_ACCESSOR.putDouble(target, offset, value);
-  }
-
-  static Object getObject(Object target, long offset) {
-    return MEMORY_ACCESSOR.getObject(target, offset);
-  }
-
-  static void putObject(Object target, long offset, Object value) {
-    MEMORY_ACCESSOR.putObject(target, offset, value);
-  }
-
-  static byte getByte(byte[] target, long index) {
-    return MEMORY_ACCESSOR.getByte(target, BYTE_ARRAY_BASE_OFFSET + index);
-  }
-
-  static void putByte(byte[] target, long index, byte value) {
-    MEMORY_ACCESSOR.putByte(target, BYTE_ARRAY_BASE_OFFSET + index, value);
-  }
-
-  static int getInt(int[] target, long index) {
-    return MEMORY_ACCESSOR.getInt(target, INT_ARRAY_BASE_OFFSET + (index * INT_ARRAY_INDEX_SCALE));
-  }
-
-  static void putInt(int[] target, long index, int value) {
-    MEMORY_ACCESSOR.putInt(target, INT_ARRAY_BASE_OFFSET + (index * INT_ARRAY_INDEX_SCALE), value);
-  }
-
-  static long getLong(long[] target, long index) {
-    return MEMORY_ACCESSOR.getLong(
-        target, LONG_ARRAY_BASE_OFFSET + (index * LONG_ARRAY_INDEX_SCALE));
-  }
-
-  static void putLong(long[] target, long index, long value) {
-    MEMORY_ACCESSOR.putLong(
-        target, LONG_ARRAY_BASE_OFFSET + (index * LONG_ARRAY_INDEX_SCALE), value);
-  }
-
-  static boolean getBoolean(boolean[] target, long index) {
-    return MEMORY_ACCESSOR.getBoolean(
-        target, BOOLEAN_ARRAY_BASE_OFFSET + (index * BOOLEAN_ARRAY_INDEX_SCALE));
-  }
-
-  static void putBoolean(boolean[] target, long index, boolean value) {
-    MEMORY_ACCESSOR.putBoolean(
-        target, BOOLEAN_ARRAY_BASE_OFFSET + (index * BOOLEAN_ARRAY_INDEX_SCALE), value);
-  }
-
-  static float getFloat(float[] target, long index) {
-    return MEMORY_ACCESSOR.getFloat(
-        target, FLOAT_ARRAY_BASE_OFFSET + (index * FLOAT_ARRAY_INDEX_SCALE));
-  }
-
-  static void putFloat(float[] target, long index, float value) {
-    MEMORY_ACCESSOR.putFloat(
-        target, FLOAT_ARRAY_BASE_OFFSET + (index * FLOAT_ARRAY_INDEX_SCALE), value);
-  }
-
-  static double getDouble(double[] target, long index) {
-    return MEMORY_ACCESSOR.getDouble(
-        target, DOUBLE_ARRAY_BASE_OFFSET + (index * DOUBLE_ARRAY_INDEX_SCALE));
-  }
-
-  static void putDouble(double[] target, long index, double value) {
-    MEMORY_ACCESSOR.putDouble(
-        target, DOUBLE_ARRAY_BASE_OFFSET + (index * DOUBLE_ARRAY_INDEX_SCALE), value);
-  }
-
-  static Object getObject(Object[] target, long index) {
-    return MEMORY_ACCESSOR.getObject(
-        target, OBJECT_ARRAY_BASE_OFFSET + (index * OBJECT_ARRAY_INDEX_SCALE));
-  }
-
-  static void putObject(Object[] target, long index, Object value) {
-    MEMORY_ACCESSOR.putObject(
-        target, OBJECT_ARRAY_BASE_OFFSET + (index * OBJECT_ARRAY_INDEX_SCALE), value);
-  }
-
-  static void copyMemory(byte[] src, long srcIndex, long targetOffset, long length) {
-    MEMORY_ACCESSOR.copyMemory(src, srcIndex, targetOffset, length);
-  }
-
-  static void copyMemory(long srcOffset, byte[] target, long targetIndex, long length) {
-    MEMORY_ACCESSOR.copyMemory(srcOffset, target, targetIndex, length);
-  }
-
-  static void copyMemory(byte[] src, long srcIndex, byte[] target, long targetIndex, long length) {
-    System.arraycopy(src, (int) srcIndex, target, (int) targetIndex, (int) length);
-  }
-
-  static byte getByte(long address) {
-    return MEMORY_ACCESSOR.getByte(address);
-  }
-
-  static void putByte(long address, byte value) {
-    MEMORY_ACCESSOR.putByte(address, value);
-  }
-
-  static int getInt(long address) {
-    return MEMORY_ACCESSOR.getInt(address);
-  }
-
-  static void putInt(long address, int value) {
-    MEMORY_ACCESSOR.putInt(address, value);
-  }
-
-  static long getLong(long address) {
-    return MEMORY_ACCESSOR.getLong(address);
-  }
-
-  static void putLong(long address, long value) {
-    MEMORY_ACCESSOR.putLong(address, value);
-  }
-
-  /** Gets the offset of the {@code address} field of the given direct {@link ByteBuffer}. */
-  static long addressOffset(ByteBuffer buffer) {
-    return MEMORY_ACCESSOR.getLong(buffer, BUFFER_ADDRESS_OFFSET);
-  }
-
-  static Object getStaticObject(Field field) {
-    return MEMORY_ACCESSOR.getStaticObject(field);
-  }
-
-  /**
-   * Gets the {@code sun.misc.Unsafe} instance, or {@code null} if not available on this platform.
-   */
-  static sun.misc.Unsafe getUnsafe() {
-    sun.misc.Unsafe unsafe = null;
-    try {
-      unsafe =
-          AccessController.doPrivileged(
-              new PrivilegedExceptionAction<sun.misc.Unsafe>() {
-                @Override
-                public sun.misc.Unsafe run() throws Exception {
-                  Class<sun.misc.Unsafe> k = sun.misc.Unsafe.class;
-
-                  for (Field f : k.getDeclaredFields()) {
-                    f.setAccessible(true);
-                    Object x = f.get(null);
-                    if (k.isInstance(x)) {
-                      return k.cast(x);
-                    }
-                  }
-                  // The sun.misc.Unsafe field does not exist.
-                  return null;
-                }
-              });
-    } catch (Throwable e) {
-      // Catching Throwable here due to the fact that Google AppEngine raises NoClassDefFoundError
-      // for Unsafe.
-    }
-    return unsafe;
-  }
-
-  /** Get a {@link MemoryAccessor} appropriate for the platform, or null if not supported. */
-  private static MemoryAccessor getMemoryAccessor() {
-    if (UNSAFE == null) {
-      return null;
-    }
-    if (Android.isOnAndroidDevice()) {
-      if (IS_ANDROID_64) {
-        return new Android64MemoryAccessor(UNSAFE);
-      } else if (IS_ANDROID_32) {
-        return new Android32MemoryAccessor(UNSAFE);
-      } else {
-        return null;
-      }
-    }
-
-    return new JvmMemoryAccessor(UNSAFE);
-  }
-
-  private static boolean supportsUnsafeArrayOperations() {
-    if (MEMORY_ACCESSOR == null) {
-      return false;
-    }
-    return MEMORY_ACCESSOR.supportsUnsafeArrayOperations();
-  }
-
-  private static boolean supportsUnsafeByteBufferOperations() {
-    if (MEMORY_ACCESSOR == null) {
-      return false;
-    }
-    return MEMORY_ACCESSOR.supportsUnsafeByteBufferOperations();
-  }
-
-  static boolean determineAndroidSupportByAddressSize(Class<?> addressClass) {
-    if (!Android.isOnAndroidDevice()) {
-      return false;
-    }
-    try {
-      Class<?> clazz = MEMORY_CLASS;
-      clazz.getMethod("peekLong", addressClass, boolean.class);
-      clazz.getMethod("pokeLong", addressClass, long.class, boolean.class);
-      clazz.getMethod("pokeInt", addressClass, int.class, boolean.class);
-      clazz.getMethod("peekInt", addressClass, boolean.class);
-      clazz.getMethod("pokeByte", addressClass, byte.class);
-      clazz.getMethod("peekByte", addressClass);
-      clazz.getMethod("pokeByteArray", addressClass, byte[].class, int.class, int.class);
-      clazz.getMethod("peekByteArray", addressClass, byte[].class, int.class, int.class);
-      return true;
-    } catch (Throwable t) {
-      return false;
-    }
-  }
-
-  /** Finds the address field within a direct {@link Buffer}. */
-  private static Field bufferAddressField() {
-    if (Android.isOnAndroidDevice()) {
-      // Old versions of Android had renamed the address field to 'effectiveDirectAddress', but
-      // recent versions of Android (>M?) use the OpenJDK implementation. Fall through in that case.
-      Field field = field(Buffer.class, "effectiveDirectAddress");
-      if (field != null) {
-        return field;
-      }
-    }
-    Field field = field(Buffer.class, "address");
-    return field != null && field.getType() == long.class ? field : null;
-  }
-
-  /**
-   * Returns the index of the first byte where left and right differ, in the range [0, 8]. If {@code
-   * left == right}, the result will be 8, otherwise less than 8.
-   *
-   * <p>This counts from the *first* byte, which may be the most or least significant byte depending
-   * on the system endianness.
-   */
-  private static int firstDifferingByteIndexNativeEndian(long left, long right) {
-    int n =
-        IS_BIG_ENDIAN
-            ? Long.numberOfLeadingZeros(left ^ right)
-            : Long.numberOfTrailingZeros(left ^ right);
-    return n >> 3;
-  }
-
-  /**
-   * Returns the lowest {@code index} such that {@code 0 <= index < length} and {@code left[leftOff
-   * + index] != right[rightOff + index]}. If no such value exists -- if {@code left} and {@code
-   * right} match up to {@code length} bytes from their respective offsets -- returns -1.
-   *
-   * <p>{@code leftOff + length} must be less than or equal to {@code left.length}, and the same for
-   * {@code right}.
-   */
-  static int mismatch(byte[] left, int leftOff, byte[] right, int rightOff, int length) {
-    if (leftOff < 0
-        || rightOff < 0
-        || length < 0
-        || leftOff + length > left.length
-        || rightOff + length > right.length) {
-      throw new IndexOutOfBoundsException();
-    }
-
-    int index = 0;
-    if (HAS_UNSAFE_ARRAY_OPERATIONS) {
-      int leftAlignment = (BYTE_ARRAY_ALIGNMENT + leftOff) & STRIDE_ALIGNMENT_MASK;
-
-      // Most CPUs handle getting chunks of bytes better on addresses that are a multiple of 4
-      // or 8.
-      // We walk one byte at a time until the left address, at least, is a multiple of 8.
-      // If the right address is, too, so much the better.
-      for (;
-          index < length && (leftAlignment & STRIDE_ALIGNMENT_MASK) != 0;
-          index++, leftAlignment++) {
-        if (left[leftOff + index] != right[rightOff + index]) {
-          return index;
-        }
-      }
-
-      // Stride!  Grab eight bytes at a time from left and right and check them for equality.
-
-      int strideLength = ((length - index) & ~STRIDE_ALIGNMENT_MASK) + index;
-      // strideLength is the point where we want to stop striding: it differs from index by
-      // a multiple of STRIDE, and it's the largest such number <= length.
-
-      for (; index < strideLength; index += STRIDE) {
-        long leftLongWord = getLong(left, BYTE_ARRAY_BASE_OFFSET + leftOff + index);
-        long rightLongWord = getLong(right, BYTE_ARRAY_BASE_OFFSET + rightOff + index);
-        if (leftLongWord != rightLongWord) {
-          // one of these eight bytes differ!  use a helper to find out which one
-          return index + firstDifferingByteIndexNativeEndian(leftLongWord, rightLongWord);
-        }
-      }
-    }
-
-    // If we were able to stride, there are at most STRIDE - 1 bytes left to compare.
-    // If we weren't, then this loop covers the whole thing.
-    for (; index < length; index++) {
-      if (left[leftOff + index] != right[rightOff + index]) {
-        return index;
-      }
-    }
-    return -1;
-  }
-
-  /**
-   * Returns the offset of the provided field, or {@code -1} if {@code sun.misc.Unsafe} is not
-   * available.
-   */
-  private static long fieldOffset(Field field) {
-    return field == null || MEMORY_ACCESSOR == null ? -1 : MEMORY_ACCESSOR.objectFieldOffset(field);
-  }
-
-  /**
-   * Gets the field with the given name within the class, or {@code null} if not found.
-   */
-  private static Field field(Class<?> clazz, String fieldName) {
-    Field field;
-    try {
-      field = clazz.getDeclaredField(fieldName);
-    } catch (Throwable t) {
-      // Failed to access the fields.
-      field = null;
-    }
-    return field;
-  }
-
-  private abstract static class MemoryAccessor {
-
-    sun.misc.Unsafe unsafe;
-
-    MemoryAccessor(sun.misc.Unsafe unsafe) {
-      this.unsafe = unsafe;
-    }
-
-    public final long objectFieldOffset(Field field) {
-      return unsafe.objectFieldOffset(field);
-    }
-
-    public final int arrayBaseOffset(Class<?> clazz) {
-      return unsafe.arrayBaseOffset(clazz);
-    }
-
-    public final int arrayIndexScale(Class<?> clazz) {
-      return unsafe.arrayIndexScale(clazz);
-    }
-
-    public abstract Object getStaticObject(Field field);
-
-    // Relative Address Operations ---------------------------------------------
-
-    // Indicates whether the following relative address operations are supported
-    // by this memory accessor.
-    public boolean supportsUnsafeArrayOperations() {
-      if (unsafe == null) {
-        return false;
-      }
-      try {
-        Class<?> clazz = unsafe.getClass();
-        clazz.getMethod("objectFieldOffset", Field.class);
-        clazz.getMethod("arrayBaseOffset", Class.class);
-        clazz.getMethod("arrayIndexScale", Class.class);
-        clazz.getMethod("getInt", Object.class, long.class);
-        clazz.getMethod("putInt", Object.class, long.class, int.class);
-        clazz.getMethod("getLong", Object.class, long.class);
-        clazz.getMethod("putLong", Object.class, long.class, long.class);
-        clazz.getMethod("getObject", Object.class, long.class);
-        clazz.getMethod("putObject", Object.class, long.class, Object.class);
-
-        return true;
-      } catch (Throwable e) {
-        logMissingMethod(e);
-      }
-      return false;
-    }
-
-    public abstract byte getByte(Object target, long offset);
-
-    public abstract void putByte(Object target, long offset, byte value);
-
-    public final int getInt(Object target, long offset) {
-      return unsafe.getInt(target, offset);
-    }
-
-    public final void putInt(Object target, long offset, int value) {
-      unsafe.putInt(target, offset, value);
-    }
-
-    public final long getLong(Object target, long offset) {
-      return unsafe.getLong(target, offset);
-    }
-
-    public final void putLong(Object target, long offset, long value) {
-      unsafe.putLong(target, offset, value);
-    }
-
-    public abstract boolean getBoolean(Object target, long offset);
-
-    public abstract void putBoolean(Object target, long offset, boolean value);
-
-    public abstract float getFloat(Object target, long offset);
-
-    public abstract void putFloat(Object target, long offset, float value);
-
-    public abstract double getDouble(Object target, long offset);
-
-    public abstract void putDouble(Object target, long offset, double value);
-
-    public final Object getObject(Object target, long offset) {
-      return unsafe.getObject(target, offset);
-    }
-
-    public final void putObject(Object target, long offset, Object value) {
-      unsafe.putObject(target, offset, value);
-    }
-
-    // Absolute Address Operations --------------------------------------------
-
-    // Indicates whether the following absolute address operations are
-    // supported by this memory accessor.
-    public boolean supportsUnsafeByteBufferOperations() {
-      if (unsafe == null) {
-        return false;
-      }
-      try {
-        Class<?> clazz = unsafe.getClass();
-        // Methods for getting direct buffer address.
-        clazz.getMethod("objectFieldOffset", Field.class);
-        clazz.getMethod("getLong", Object.class, long.class);
-
-        if (bufferAddressField() == null) {
-          return false;
-        }
-
-        return true;
-      } catch (Throwable e) {
-        logMissingMethod(e);
-      }
-      return false;
-    }
-
-    public abstract byte getByte(long address);
-
-    public abstract void putByte(long address, byte value);
-
-    public abstract int getInt(long address);
-
-    public abstract void putInt(long address, int value);
-
-    public abstract long getLong(long address);
-
-    public abstract void putLong(long address, long value);
-
-    public abstract void copyMemory(long srcOffset, byte[] target, long targetIndex, long length);
-
-    public abstract void copyMemory(byte[] src, long srcIndex, long targetOffset, long length);
-  }
-
-  private static final class JvmMemoryAccessor extends MemoryAccessor {
-
-    JvmMemoryAccessor(sun.misc.Unsafe unsafe) {
-      super(unsafe);
-    }
-
-    @Override
-    public Object getStaticObject(Field field) {
-      return getObject(unsafe.staticFieldBase(field), unsafe.staticFieldOffset(field));
-    }
-
-    @Override
-    public boolean supportsUnsafeArrayOperations() {
-      if (!super.supportsUnsafeArrayOperations()) {
-        return false;
-      }
-
-      try {
-        Class<?> clazz = unsafe.getClass();
-        clazz.getMethod("getByte", Object.class, long.class);
-        clazz.getMethod("putByte", Object.class, long.class, byte.class);
-        clazz.getMethod("getBoolean", Object.class, long.class);
-        clazz.getMethod("putBoolean", Object.class, long.class, boolean.class);
-        clazz.getMethod("getFloat", Object.class, long.class);
-        clazz.getMethod("putFloat", Object.class, long.class, float.class);
-        clazz.getMethod("getDouble", Object.class, long.class);
-        clazz.getMethod("putDouble", Object.class, long.class, double.class);
-
-        return true;
-      } catch (Throwable e) {
-        logMissingMethod(e);
-      }
-      return false;
-    }
-
-    @Override
-    public byte getByte(Object target, long offset) {
-      return unsafe.getByte(target, offset);
-    }
-
-    @Override
-    public void putByte(Object target, long offset, byte value) {
-      unsafe.putByte(target, offset, value);
-    }
-
-    @Override
-    public boolean getBoolean(Object target, long offset) {
-      return unsafe.getBoolean(target, offset);
-    }
-
-    @Override
-    public void putBoolean(Object target, long offset, boolean value) {
-      unsafe.putBoolean(target, offset, value);
-    }
-
-    @Override
-    public float getFloat(Object target, long offset) {
-      return unsafe.getFloat(target, offset);
-    }
-
-    @Override
-    public void putFloat(Object target, long offset, float value) {
-      unsafe.putFloat(target, offset, value);
-    }
-
-    @Override
-    public double getDouble(Object target, long offset) {
-      return unsafe.getDouble(target, offset);
-    }
-
-    @Override
-    public void putDouble(Object target, long offset, double value) {
-      unsafe.putDouble(target, offset, value);
-    }
-
-    @Override
-    public boolean supportsUnsafeByteBufferOperations() {
-      if (!super.supportsUnsafeByteBufferOperations()) {
-        return false;
-      }
-
-      try {
-        Class<?> clazz = unsafe.getClass();
-        clazz.getMethod("getByte", long.class);
-        clazz.getMethod("putByte", long.class, byte.class);
-        clazz.getMethod("getInt", long.class);
-        clazz.getMethod("putInt", long.class, int.class);
-        clazz.getMethod("getLong", long.class);
-        clazz.getMethod("putLong", long.class, long.class);
-        clazz.getMethod("copyMemory", long.class, long.class, long.class);
-        clazz.getMethod(
-            "copyMemory", Object.class, long.class, Object.class, long.class, long.class);
-        return true;
-      } catch (Throwable e) {
-        logMissingMethod(e);
-      }
-      return false;
-    }
-
-    @Override
-    public byte getByte(long address) {
-      return unsafe.getByte(address);
-    }
-
-    @Override
-    public void putByte(long address, byte value) {
-      unsafe.putByte(address, value);
-    }
-
-    @Override
-    public int getInt(long address) {
-      return unsafe.getInt(address);
-    }
-
-    @Override
-    public void putInt(long address, int value) {
-      unsafe.putInt(address, value);
-    }
-
-    @Override
-    public long getLong(long address) {
-      return unsafe.getLong(address);
-    }
-
-    @Override
-    public void putLong(long address, long value) {
-      unsafe.putLong(address, value);
-    }
-
-    @Override
-    public void copyMemory(long srcOffset, byte[] target, long targetIndex, long length) {
-      unsafe.copyMemory(null, srcOffset, target, BYTE_ARRAY_BASE_OFFSET + targetIndex, length);
-    }
-
-    @Override
-    public void copyMemory(byte[] src, long srcIndex, long targetOffset, long length) {
-      unsafe.copyMemory(src, BYTE_ARRAY_BASE_OFFSET + srcIndex, null, targetOffset, length);
-    }
-  }
-
-  private static final class Android64MemoryAccessor extends MemoryAccessor {
-
-    Android64MemoryAccessor(sun.misc.Unsafe unsafe) {
-      super(unsafe);
-    }
-
-    @Override
-    public Object getStaticObject(Field field) {
-      try {
-        return field.get(null);
-      } catch (IllegalAccessException e) {
-        return null;
-      }
-    }
-
-    @Override
-    public byte getByte(Object target, long offset) {
-      if (IS_BIG_ENDIAN) {
-        return getByteBigEndian(target, offset);
-      } else {
-        return getByteLittleEndian(target, offset);
-      }
-    }
-
-    @Override
-    public void putByte(Object target, long offset, byte value) {
-      if (IS_BIG_ENDIAN) {
-        putByteBigEndian(target, offset, value);
-      } else {
-        putByteLittleEndian(target, offset, value);
-      }
-    }
-
-    @Override
-    public boolean getBoolean(Object target, long offset) {
-      if (IS_BIG_ENDIAN) {
-        return getBooleanBigEndian(target, offset);
-      } else {
-        return getBooleanLittleEndian(target, offset);
-      }
-    }
-
-    @Override
-    public void putBoolean(Object target, long offset, boolean value) {
-      if (IS_BIG_ENDIAN) {
-        putBooleanBigEndian(target, offset, value);
-      } else {
-        putBooleanLittleEndian(target, offset, value);
-      }
-    }
-
-    @Override
-    public float getFloat(Object target, long offset) {
-      return Float.intBitsToFloat(getInt(target, offset));
-    }
-
-    @Override
-    public void putFloat(Object target, long offset, float value) {
-      putInt(target, offset, Float.floatToIntBits(value));
-    }
-
-    @Override
-    public double getDouble(Object target, long offset) {
-      return Double.longBitsToDouble(getLong(target, offset));
-    }
-
-    @Override
-    public void putDouble(Object target, long offset, double value) {
-      putLong(target, offset, Double.doubleToLongBits(value));
-    }
-
-    @Override
-    public boolean supportsUnsafeByteBufferOperations() {
-      return false;
-    }
-
-    @Override
-    public byte getByte(long address) {
-      throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void putByte(long address, byte value) {
-      throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public int getInt(long address) {
-      throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void putInt(long address, int value) {
-      throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public long getLong(long address) {
-      throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void putLong(long address, long value) {
-      throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void copyMemory(long srcOffset, byte[] target, long targetIndex, long length) {
-      throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void copyMemory(byte[] src, long srcIndex, long targetOffset, long length) {
-      throw new UnsupportedOperationException();
-    }
-  }
-
-  private static final class Android32MemoryAccessor extends MemoryAccessor {
-
-    /** Mask used to convert a 64 bit memory address to a 32 bit address. */
-    private static final long SMALL_ADDRESS_MASK = 0x00000000FFFFFFFF;
-
-    /** Truncate a {@code long} address into a short {@code int} address. */
-    private static int smallAddress(long address) {
-      return (int) (SMALL_ADDRESS_MASK & address);
-    }
-
-    Android32MemoryAccessor(sun.misc.Unsafe unsafe) {
-      super(unsafe);
-    }
-
-    @Override
-    public Object getStaticObject(Field field) {
-      try {
-        return field.get(null);
-      } catch (IllegalAccessException e) {
-        return null;
-      }
-    }
-
-    @Override
-    public byte getByte(Object target, long offset) {
-      if (IS_BIG_ENDIAN) {
-        return getByteBigEndian(target, offset);
-      } else {
-        return getByteLittleEndian(target, offset);
-      }
-    }
-
-    @Override
-    public void putByte(Object target, long offset, byte value) {
-      if (IS_BIG_ENDIAN) {
-        putByteBigEndian(target, offset, value);
-      } else {
-        putByteLittleEndian(target, offset, value);
-      }
-    }
-
-    @Override
-    public boolean getBoolean(Object target, long offset) {
-      if (IS_BIG_ENDIAN) {
-        return getBooleanBigEndian(target, offset);
-      } else {
-        return getBooleanLittleEndian(target, offset);
-      }
-    }
-
-    @Override
-    public void putBoolean(Object target, long offset, boolean value) {
-      if (IS_BIG_ENDIAN) {
-        putBooleanBigEndian(target, offset, value);
-      } else {
-        putBooleanLittleEndian(target, offset, value);
-      }
-    }
-
-    @Override
-    public float getFloat(Object target, long offset) {
-      return Float.intBitsToFloat(getInt(target, offset));
-    }
-
-    @Override
-    public void putFloat(Object target, long offset, float value) {
-      putInt(target, offset, Float.floatToIntBits(value));
-    }
-
-    @Override
-    public double getDouble(Object target, long offset) {
-      return Double.longBitsToDouble(getLong(target, offset));
-    }
-
-    @Override
-    public void putDouble(Object target, long offset, double value) {
-      putLong(target, offset, Double.doubleToLongBits(value));
-    }
-
-    @Override
-    public boolean supportsUnsafeByteBufferOperations() {
-      return false;
-    }
-
-    @Override
-    public byte getByte(long address) {
-      throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void putByte(long address, byte value) {
-      throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public int getInt(long address) {
-      throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void putInt(long address, int value) {
-      throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public long getLong(long address) {
-      throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void putLong(long address, long value) {
-      throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void copyMemory(long srcOffset, byte[] target, long targetIndex, long length) {
-      throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void copyMemory(byte[] src, long srcIndex, long targetOffset, long length) {
-      throw new UnsupportedOperationException();
-    }
-  }
-
-  private static byte getByteBigEndian(Object target, long offset) {
-    return (byte) ((getInt(target, offset & ~3) >>> ((~offset & 3) << 3)) & 0xFF);
-  }
-
-  private static byte getByteLittleEndian(Object target, long offset) {
-    return (byte) ((getInt(target, offset & ~3) >>> ((offset & 3) << 3)) & 0xFF);
-  }
-
-  private static void putByteBigEndian(Object target, long offset, byte value) {
-    int intValue = getInt(target, offset & ~3);
-    int shift = ((~(int) offset) & 3) << 3;
-    int output = (intValue & ~(0xFF << shift)) | ((0xFF & value) << shift);
-    putInt(target, offset & ~3, output);
-  }
-
-  private static void putByteLittleEndian(Object target, long offset, byte value) {
-    int intValue = getInt(target, offset & ~3);
-    int shift = (((int) offset) & 3) << 3;
-    int output = (intValue & ~(0xFF << shift)) | ((0xFF & value) << shift);
-    putInt(target, offset & ~3, output);
-  }
-
-  private static boolean getBooleanBigEndian(Object target, long offset) {
-    return getByteBigEndian(target, offset) != 0;
-  }
-
-  private static boolean getBooleanLittleEndian(Object target, long offset) {
-    return getByteLittleEndian(target, offset) != 0;
-  }
-
-  private static void putBooleanBigEndian(Object target, long offset, boolean value) {
-    putByteBigEndian(target, offset, (byte) (value ? 1 : 0));
-  }
-
-  private static void putBooleanLittleEndian(Object target, long offset, boolean value) {
-    putByteLittleEndian(target, offset, (byte) (value ? 1 : 0));
-  }
-
-  private static void logMissingMethod(Throwable e) {
-    Logger.getLogger(UnsafeUtil.class.getName())
-        .log(
-            Level.WARNING,
-            "platform method missing - proto runtime falling back to safer methods: " + e);
-  }
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/Utf8.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/Utf8.java
deleted file mode 100644
index c74497c..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/Utf8.java
+++ /dev/null
@@ -1,1959 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.protobuf.UnsafeUtil.addressOffset;
-import static com.google.protobuf.UnsafeUtil.hasUnsafeArrayOperations;
-import static com.google.protobuf.UnsafeUtil.hasUnsafeByteBufferOperations;
-import static java.lang.Character.MAX_SURROGATE;
-import static java.lang.Character.MIN_HIGH_SURROGATE;
-import static java.lang.Character.MIN_LOW_SURROGATE;
-import static java.lang.Character.MIN_SUPPLEMENTARY_CODE_POINT;
-import static java.lang.Character.MIN_SURROGATE;
-import static java.lang.Character.isSurrogatePair;
-import static java.lang.Character.toCodePoint;
-
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-
-/**
- * A set of low-level, high-performance static utility methods related to the UTF-8 character
- * encoding. This class has no dependencies outside of the core JDK libraries.
- *
- * <p>There are several variants of UTF-8. The one implemented by this class is the restricted
- * definition of UTF-8 introduced in Unicode 3.1, which mandates the rejection of "overlong" byte
- * sequences as well as rejection of 3-byte surrogate codepoint byte sequences. Note that the UTF-8
- * decoder included in Oracle's JDK has been modified to also reject "overlong" byte sequences, but
- * (as of 2011) still accepts 3-byte surrogate codepoint byte sequences.
- *
- * <p>The byte sequences considered valid by this class are exactly those that can be roundtrip
- * converted to Strings and back to bytes using the UTF-8 charset, without loss:
- *
- * <pre>{@code
- * Arrays.equals(bytes, new String(bytes, Internal.UTF_8).getBytes(Internal.UTF_8))
- * }</pre>
- *
- * <p>See the Unicode Standard,</br> Table 3-6. <em>UTF-8 Bit Distribution</em>,</br> Table 3-7.
- * <em>Well Formed UTF-8 Byte Sequences</em>.
- *
- * <p>This class supports decoding of partial byte sequences, so that the bytes in a complete UTF-8
- * byte sequence can be stored in multiple segments. Methods typically return {@link #MALFORMED} if
- * the partial byte sequence is definitely not well-formed; {@link #COMPLETE} if it is well-formed
- * in the absence of additional input; or, if the byte sequence apparently terminated in the middle
- * of a character, an opaque integer "state" value containing enough information to decode the
- * character when passed to a subsequent invocation of a partial decoding method.
- *
- * @author martinrb@google.com (Martin Buchholz)
- */
-// TODO(nathanmittler): Copy changes in this class back to Guava
-final class Utf8 {
-
-  /**
-   * UTF-8 is a runtime hot spot so we attempt to provide heavily optimized implementations
-   * depending on what is available on the platform. The processor is the platform-optimized
-   * delegate for which all methods are delegated directly to.
-   */
-  private static final Processor processor =
-      (UnsafeProcessor.isAvailable() && !Android.isOnAndroidDevice())
-          ? new UnsafeProcessor()
-          : new SafeProcessor();
-
-  /**
-   * A mask used when performing unsafe reads to determine if a long value contains any non-ASCII
-   * characters (i.e. any byte >= 0x80).
-   */
-  private static final long ASCII_MASK_LONG = 0x8080808080808080L;
-
-  /**
-   * Maximum number of bytes per Java UTF-16 char in UTF-8.
-   *
-   * @see java.nio.charset.CharsetEncoder#maxBytesPerChar()
-   */
-  static final int MAX_BYTES_PER_CHAR = 3;
-
-  /**
-   * State value indicating that the byte sequence is well-formed and complete (no further bytes are
-   * needed to complete a character).
-   */
-  static final int COMPLETE = 0;
-
-  /** State value indicating that the byte sequence is definitely not well-formed. */
-  static final int MALFORMED = -1;
-
-  /**
-   * Used by {@code Unsafe} UTF-8 string validation logic to determine the minimum string length
-   * above which to employ an optimized algorithm for counting ASCII characters. The reason for this
-   * threshold is that for small strings, the optimization may not be beneficial or may even
-   * negatively impact performance since it requires additional logic to avoid unaligned reads (when
-   * calling {@code Unsafe.getLong}). This threshold guarantees that even if the initial offset is
-   * unaligned, we're guaranteed to make at least one call to {@code Unsafe.getLong()} which
-   * provides a performance improvement that entirely subsumes the cost of the additional logic.
-   */
-  private static final int UNSAFE_COUNT_ASCII_THRESHOLD = 16;
-
-  // Other state values include the partial bytes of the incomplete
-  // character to be decoded in the simplest way: we pack the bytes
-  // into the state int in little-endian order.  For example:
-  //
-  // int state = byte1 ^ (byte2 << 8) ^ (byte3 << 16);
-  //
-  // Such a state is unpacked thus (note the ~ operation for byte2 to
-  // undo byte1's sign-extension bits):
-  //
-  // int byte1 = (byte) state;
-  // int byte2 = (byte) ~(state >> 8);
-  // int byte3 = (byte) (state >> 16);
-  //
-  // We cannot store a zero byte in the state because it would be
-  // indistinguishable from the absence of a byte.  But we don't need
-  // to, because partial bytes must always be negative.  When building
-  // a state, we ensure that byte1 is negative and subsequent bytes
-  // are valid trailing bytes.
-
-  /**
-   * Returns {@code true} if the given byte array is a well-formed UTF-8 byte sequence.
-   *
-   * <p>This is a convenience method, equivalent to a call to {@code isValidUtf8(bytes, 0,
-   * bytes.length)}.
-   */
-  static boolean isValidUtf8(byte[] bytes) {
-    return processor.isValidUtf8(bytes, 0, bytes.length);
-  }
-
-  /**
-   * Returns {@code true} if the given byte array slice is a well-formed UTF-8 byte sequence. The
-   * range of bytes to be checked extends from index {@code index}, inclusive, to {@code limit},
-   * exclusive.
-   *
-   * <p>This is a convenience method, equivalent to {@code partialIsValidUtf8(bytes, index, limit)
-   * == Utf8.COMPLETE}.
-   */
-  static boolean isValidUtf8(byte[] bytes, int index, int limit) {
-    return processor.isValidUtf8(bytes, index, limit);
-  }
-
-  /**
-   * Tells whether the given byte array slice is a well-formed, malformed, or incomplete UTF-8 byte
-   * sequence. The range of bytes to be checked extends from index {@code index}, inclusive, to
-   * {@code limit}, exclusive.
-   *
-   * @param state either {@link Utf8#COMPLETE} (if this is the initial decoding operation) or the
-   *     value returned from a call to a partial decoding method for the previous bytes
-   * @return {@link #MALFORMED} if the partial byte sequence is definitely not well-formed, {@link
-   *     #COMPLETE} if it is well-formed (no additional input needed), or if the byte sequence is
-   *     "incomplete", i.e. apparently terminated in the middle of a character, an opaque integer
-   *     "state" value containing enough information to decode the character when passed to a
-   *     subsequent invocation of a partial decoding method.
-   */
-  static int partialIsValidUtf8(int state, byte[] bytes, int index, int limit) {
-    return processor.partialIsValidUtf8(state, bytes, index, limit);
-  }
-
-  private static int incompleteStateFor(int byte1) {
-    return (byte1 > (byte) 0xF4) ? MALFORMED : byte1;
-  }
-
-  private static int incompleteStateFor(int byte1, int byte2) {
-    return (byte1 > (byte) 0xF4 || byte2 > (byte) 0xBF) ? MALFORMED : byte1 ^ (byte2 << 8);
-  }
-
-  private static int incompleteStateFor(int byte1, int byte2, int byte3) {
-    return (byte1 > (byte) 0xF4 || byte2 > (byte) 0xBF || byte3 > (byte) 0xBF)
-        ? MALFORMED
-        : byte1 ^ (byte2 << 8) ^ (byte3 << 16);
-  }
-
-  private static int incompleteStateFor(byte[] bytes, int index, int limit) {
-    int byte1 = bytes[index - 1];
-    switch (limit - index) {
-      case 0:
-        return incompleteStateFor(byte1);
-      case 1:
-        return incompleteStateFor(byte1, bytes[index]);
-      case 2:
-        return incompleteStateFor(byte1, bytes[index], bytes[index + 1]);
-      default:
-        throw new AssertionError();
-    }
-  }
-
-  private static int incompleteStateFor(
-      final ByteBuffer buffer, final int byte1, final int index, final int remaining) {
-    switch (remaining) {
-      case 0:
-        return incompleteStateFor(byte1);
-      case 1:
-        return incompleteStateFor(byte1, buffer.get(index));
-      case 2:
-        return incompleteStateFor(byte1, buffer.get(index), buffer.get(index + 1));
-      default:
-        throw new AssertionError();
-    }
-  }
-
-  // These UTF-8 handling methods are copied from Guava's Utf8 class with a modification to throw
-  // a protocol buffer local exception. This exception is then caught in CodedOutputStream so it can
-  // fallback to more lenient behavior.
-
-  static class UnpairedSurrogateException extends IllegalArgumentException {
-    UnpairedSurrogateException(int index, int length) {
-      super("Unpaired surrogate at index " + index + " of " + length);
-    }
-  }
-
-  /**
-   * Returns the number of bytes in the UTF-8-encoded form of {@code sequence}. For a string, this
-   * method is equivalent to {@code string.getBytes(UTF_8).length}, but is more efficient in both
-   * time and space.
-   *
-   * @throws IllegalArgumentException if {@code sequence} contains ill-formed UTF-16 (unpaired
-   *     surrogates)
-   */
-  static int encodedLength(CharSequence sequence) {
-    // Warning to maintainers: this implementation is highly optimized.
-    int utf16Length = sequence.length();
-    int utf8Length = utf16Length;
-    int i = 0;
-
-    // This loop optimizes for pure ASCII.
-    while (i < utf16Length && sequence.charAt(i) < 0x80) {
-      i++;
-    }
-
-    // This loop optimizes for chars less than 0x800.
-    for (; i < utf16Length; i++) {
-      char c = sequence.charAt(i);
-      if (c < 0x800) {
-        utf8Length += ((0x7f - c) >>> 31); // branch free!
-      } else {
-        utf8Length += encodedLengthGeneral(sequence, i);
-        break;
-      }
-    }
-
-    if (utf8Length < utf16Length) {
-      // Necessary and sufficient condition for overflow because of maximum 3x expansion
-      throw new IllegalArgumentException(
-          "UTF-8 length does not fit in int: " + (utf8Length + (1L << 32)));
-    }
-    return utf8Length;
-  }
-
-  private static int encodedLengthGeneral(CharSequence sequence, int start) {
-    int utf16Length = sequence.length();
-    int utf8Length = 0;
-    for (int i = start; i < utf16Length; i++) {
-      char c = sequence.charAt(i);
-      if (c < 0x800) {
-        utf8Length += (0x7f - c) >>> 31; // branch free!
-      } else {
-        utf8Length += 2;
-        // jdk7+: if (Character.isSurrogate(c)) {
-        if (Character.MIN_SURROGATE <= c && c <= Character.MAX_SURROGATE) {
-          // Check that we have a well-formed surrogate pair.
-          int cp = Character.codePointAt(sequence, i);
-          if (cp < MIN_SUPPLEMENTARY_CODE_POINT) {
-            throw new UnpairedSurrogateException(i, utf16Length);
-          }
-          i++;
-        }
-      }
-    }
-    return utf8Length;
-  }
-
-  static int encode(CharSequence in, byte[] out, int offset, int length) {
-    return processor.encodeUtf8(in, out, offset, length);
-  }
-  // End Guava UTF-8 methods.
-
-  /**
-   * Determines if the given {@link ByteBuffer} is a valid UTF-8 string.
-   *
-   * <p>Selects an optimal algorithm based on the type of {@link ByteBuffer} (i.e. heap or direct)
-   * and the capabilities of the platform.
-   *
-   * @param buffer the buffer to check.
-   * @see Utf8#isValidUtf8(byte[], int, int)
-   */
-  static boolean isValidUtf8(ByteBuffer buffer) {
-    return processor.isValidUtf8(buffer, buffer.position(), buffer.remaining());
-  }
-
-  /**
-   * Determines if the given {@link ByteBuffer} is a partially valid UTF-8 string.
-   *
-   * <p>Selects an optimal algorithm based on the type of {@link ByteBuffer} (i.e. heap or direct)
-   * and the capabilities of the platform.
-   *
-   * @param buffer the buffer to check.
-   * @see Utf8#partialIsValidUtf8(int, byte[], int, int)
-   */
-  static int partialIsValidUtf8(int state, ByteBuffer buffer, int index, int limit) {
-    return processor.partialIsValidUtf8(state, buffer, index, limit);
-  }
-
-  /**
-   * Decodes the given UTF-8 portion of the {@link ByteBuffer} into a {@link String}.
-   *
-   * @throws InvalidProtocolBufferException if the input is not valid UTF-8.
-   */
-  static String decodeUtf8(ByteBuffer buffer, int index, int size)
-      throws InvalidProtocolBufferException {
-    return processor.decodeUtf8(buffer, index, size);
-  }
-
-  /**
-   * Decodes the given UTF-8 encoded byte array slice into a {@link String}.
-   *
-   * @throws InvalidProtocolBufferException if the input is not valid UTF-8.
-   */
-  static String decodeUtf8(byte[] bytes, int index, int size)
-      throws InvalidProtocolBufferException {
-    return processor.decodeUtf8(bytes, index, size);
-  }
-
-  /**
-   * Encodes the given characters to the target {@link ByteBuffer} using UTF-8 encoding.
-   *
-   * <p>Selects an optimal algorithm based on the type of {@link ByteBuffer} (i.e. heap or direct)
-   * and the capabilities of the platform.
-   *
-   * @param in the source string to be encoded
-   * @param out the target buffer to receive the encoded string.
-   * @see Utf8#encode(CharSequence, byte[], int, int)
-   */
-  static void encodeUtf8(CharSequence in, ByteBuffer out) {
-    processor.encodeUtf8(in, out);
-  }
-
-  /**
-   * Counts (approximately) the number of consecutive ASCII characters in the given buffer. The byte
-   * order of the {@link ByteBuffer} does not matter, so performance can be improved if native byte
-   * order is used (i.e. no byte-swapping in {@link ByteBuffer#getLong(int)}).
-   *
-   * @param buffer the buffer to be scanned for ASCII chars
-   * @param index the starting index of the scan
-   * @param limit the limit within buffer for the scan
-   * @return the number of ASCII characters found. The stopping position will be at or before the
-   *     first non-ASCII byte.
-   */
-  private static int estimateConsecutiveAscii(ByteBuffer buffer, int index, int limit) {
-    int i = index;
-    final int lim = limit - 7;
-    // This simple loop stops when we encounter a byte >= 0x80 (i.e. non-ASCII).
-    // To speed things up further, we're reading longs instead of bytes so we use a mask to
-    // determine if any byte in the current long is non-ASCII.
-    for (; i < lim && (buffer.getLong(i) & ASCII_MASK_LONG) == 0; i += 8) {}
-    return i - index;
-  }
-
-  /** A processor of UTF-8 strings, providing methods for checking validity and encoding. */
-  // TODO(nathanmittler): Add support for Memory/MemoryBlock on Android.
-  abstract static class Processor {
-    /**
-     * Returns {@code true} if the given byte array slice is a well-formed UTF-8 byte sequence. The
-     * range of bytes to be checked extends from index {@code index}, inclusive, to {@code limit},
-     * exclusive.
-     *
-     * <p>This is a convenience method, equivalent to {@code partialIsValidUtf8(bytes, index, limit)
-     * == Utf8.COMPLETE}.
-     */
-    final boolean isValidUtf8(byte[] bytes, int index, int limit) {
-      return partialIsValidUtf8(COMPLETE, bytes, index, limit) == COMPLETE;
-    }
-
-    /**
-     * Tells whether the given byte array slice is a well-formed, malformed, or incomplete UTF-8
-     * byte sequence. The range of bytes to be checked extends from index {@code index}, inclusive,
-     * to {@code limit}, exclusive.
-     *
-     * @param state either {@link Utf8#COMPLETE} (if this is the initial decoding operation) or the
-     *     value returned from a call to a partial decoding method for the previous bytes
-     * @return {@link #MALFORMED} if the partial byte sequence is definitely not well-formed, {@link
-     *     #COMPLETE} if it is well-formed (no additional input needed), or if the byte sequence is
-     *     "incomplete", i.e. apparently terminated in the middle of a character, an opaque integer
-     *     "state" value containing enough information to decode the character when passed to a
-     *     subsequent invocation of a partial decoding method.
-     */
-    abstract int partialIsValidUtf8(int state, byte[] bytes, int index, int limit);
-
-    /**
-     * Returns {@code true} if the given portion of the {@link ByteBuffer} is a well-formed UTF-8
-     * byte sequence. The range of bytes to be checked extends from index {@code index}, inclusive,
-     * to {@code limit}, exclusive.
-     *
-     * <p>This is a convenience method, equivalent to {@code partialIsValidUtf8(bytes, index, limit)
-     * == Utf8.COMPLETE}.
-     */
-    final boolean isValidUtf8(ByteBuffer buffer, int index, int limit) {
-      return partialIsValidUtf8(COMPLETE, buffer, index, limit) == COMPLETE;
-    }
-
-    /**
-     * Indicates whether or not the given buffer contains a valid UTF-8 string.
-     *
-     * @param buffer the buffer to check.
-     * @return {@code true} if the given buffer contains a valid UTF-8 string.
-     */
-    final int partialIsValidUtf8(
-        final int state, final ByteBuffer buffer, int index, final int limit) {
-      if (buffer.hasArray()) {
-        final int offset = buffer.arrayOffset();
-        return partialIsValidUtf8(state, buffer.array(), offset + index, offset + limit);
-      } else if (buffer.isDirect()) {
-        return partialIsValidUtf8Direct(state, buffer, index, limit);
-      }
-      return partialIsValidUtf8Default(state, buffer, index, limit);
-    }
-
-    /** Performs validation for direct {@link ByteBuffer} instances. */
-    abstract int partialIsValidUtf8Direct(
-        final int state, final ByteBuffer buffer, int index, final int limit);
-
-    /**
-     * Performs validation for {@link ByteBuffer} instances using the {@link ByteBuffer} API rather
-     * than potentially faster approaches. This first completes validation for the current character
-     * (provided by {@code state}) and then finishes validation for the sequence.
-     */
-    final int partialIsValidUtf8Default(
-        final int state, final ByteBuffer buffer, int index, final int limit) {
-      if (state != COMPLETE) {
-        // The previous decoding operation was incomplete (or malformed).
-        // We look for a well-formed sequence consisting of bytes from
-        // the previous decoding operation (stored in state) together
-        // with bytes from the array slice.
-        //
-        // We expect such "straddler characters" to be rare.
-
-        if (index >= limit) { // No bytes? No progress.
-          return state;
-        }
-
-        byte byte1 = (byte) state;
-        // byte1 is never ASCII.
-        if (byte1 < (byte) 0xE0) {
-          // two-byte form
-
-          // Simultaneously checks for illegal trailing-byte in
-          // leading position and overlong 2-byte form.
-          if (byte1 < (byte) 0xC2
-              // byte2 trailing-byte test
-              || buffer.get(index++) > (byte) 0xBF) {
-            return MALFORMED;
-          }
-        } else if (byte1 < (byte) 0xF0) {
-          // three-byte form
-
-          // Get byte2 from saved state or array
-          byte byte2 = (byte) ~(state >> 8);
-          if (byte2 == 0) {
-            byte2 = buffer.get(index++);
-            if (index >= limit) {
-              return incompleteStateFor(byte1, byte2);
-            }
-          }
-          if (byte2 > (byte) 0xBF
-              // overlong? 5 most significant bits must not all be zero
-              || (byte1 == (byte) 0xE0 && byte2 < (byte) 0xA0)
-              // illegal surrogate codepoint?
-              || (byte1 == (byte) 0xED && byte2 >= (byte) 0xA0)
-              // byte3 trailing-byte test
-              || buffer.get(index++) > (byte) 0xBF) {
-            return MALFORMED;
-          }
-        } else {
-          // four-byte form
-
-          // Get byte2 and byte3 from saved state or array
-          byte byte2 = (byte) ~(state >> 8);
-          byte byte3 = 0;
-          if (byte2 == 0) {
-            byte2 = buffer.get(index++);
-            if (index >= limit) {
-              return incompleteStateFor(byte1, byte2);
-            }
-          } else {
-            byte3 = (byte) (state >> 16);
-          }
-          if (byte3 == 0) {
-            byte3 = buffer.get(index++);
-            if (index >= limit) {
-              return incompleteStateFor(byte1, byte2, byte3);
-            }
-          }
-
-          // If we were called with state == MALFORMED, then byte1 is 0xFF,
-          // which never occurs in well-formed UTF-8, and so we will return
-          // MALFORMED again below.
-
-          if (byte2 > (byte) 0xBF
-              // Check that 1 <= plane <= 16.  Tricky optimized form of:
-              // if (byte1 > (byte) 0xF4 ||
-              //     byte1 == (byte) 0xF0 && byte2 < (byte) 0x90 ||
-              //     byte1 == (byte) 0xF4 && byte2 > (byte) 0x8F)
-              || (((byte1 << 28) + (byte2 - (byte) 0x90)) >> 30) != 0
-              // byte3 trailing-byte test
-              || byte3 > (byte) 0xBF
-              // byte4 trailing-byte test
-              || buffer.get(index++) > (byte) 0xBF) {
-            return MALFORMED;
-          }
-        }
-      }
-
-      // Finish validation for the sequence.
-      return partialIsValidUtf8(buffer, index, limit);
-    }
-
-    /**
-     * Performs validation for {@link ByteBuffer} instances using the {@link ByteBuffer} API rather
-     * than potentially faster approaches.
-     */
-    private static int partialIsValidUtf8(final ByteBuffer buffer, int index, final int limit) {
-      index += estimateConsecutiveAscii(buffer, index, limit);
-
-      for (; ; ) {
-        // Optimize for interior runs of ASCII bytes.
-        // TODO(nathanmittler): Consider checking 8 bytes at a time after some threshold?
-        // Maybe after seeing a few in a row that are ASCII, go back to fast mode?
-        int byte1;
-        do {
-          if (index >= limit) {
-            return COMPLETE;
-          }
-        } while ((byte1 = buffer.get(index++)) >= 0);
-
-        // If we're here byte1 is not ASCII. Only need to handle 2-4 byte forms.
-        if (byte1 < (byte) 0xE0) {
-          // Two-byte form (110xxxxx 10xxxxxx)
-          if (index >= limit) {
-            // Incomplete sequence
-            return byte1;
-          }
-
-          // Simultaneously checks for illegal trailing-byte in
-          // leading position and overlong 2-byte form.
-          if (byte1 < (byte) 0xC2 || buffer.get(index) > (byte) 0xBF) {
-            return MALFORMED;
-          }
-          index++;
-        } else if (byte1 < (byte) 0xF0) {
-          // Three-byte form (1110xxxx 10xxxxxx 10xxxxxx)
-          if (index >= limit - 1) {
-            // Incomplete sequence
-            return incompleteStateFor(buffer, byte1, index, limit - index);
-          }
-
-          byte byte2 = buffer.get(index++);
-          if (byte2 > (byte) 0xBF
-              // overlong? 5 most significant bits must not all be zero
-              || (byte1 == (byte) 0xE0 && byte2 < (byte) 0xA0)
-              // check for illegal surrogate codepoints
-              || (byte1 == (byte) 0xED && byte2 >= (byte) 0xA0)
-              // byte3 trailing-byte test
-              || buffer.get(index) > (byte) 0xBF) {
-            return MALFORMED;
-          }
-          index++;
-        } else {
-          // Four-byte form (1110xxxx 10xxxxxx 10xxxxxx 10xxxxxx)
-          if (index >= limit - 2) {
-            // Incomplete sequence
-            return incompleteStateFor(buffer, byte1, index, limit - index);
-          }
-
-          // TODO(nathanmittler): Consider using getInt() to improve performance.
-          int byte2 = buffer.get(index++);
-          if (byte2 > (byte) 0xBF
-              // Check that 1 <= plane <= 16.  Tricky optimized form of:
-              // if (byte1 > (byte) 0xF4 ||
-              //     byte1 == (byte) 0xF0 && byte2 < (byte) 0x90 ||
-              //     byte1 == (byte) 0xF4 && byte2 > (byte) 0x8F)
-              || (((byte1 << 28) + (byte2 - (byte) 0x90)) >> 30) != 0
-              // byte3 trailing-byte test
-              || buffer.get(index++) > (byte) 0xBF
-              // byte4 trailing-byte test
-              || buffer.get(index++) > (byte) 0xBF) {
-            return MALFORMED;
-          }
-        }
-      }
-    }
-
-    /**
-     * Decodes the given byte array slice into a {@link String}.
-     *
-     * @throws InvalidProtocolBufferException if the byte array slice is not valid UTF-8
-     */
-    abstract String decodeUtf8(byte[] bytes, int index, int size)
-        throws InvalidProtocolBufferException;
-
-    /**
-     * Decodes the given portion of the {@link ByteBuffer} into a {@link String}.
-     *
-     * @throws InvalidProtocolBufferException if the portion of the buffer is not valid UTF-8
-     */
-    final String decodeUtf8(ByteBuffer buffer, int index, int size)
-        throws InvalidProtocolBufferException {
-      if (buffer.hasArray()) {
-        final int offset = buffer.arrayOffset();
-        return decodeUtf8(buffer.array(), offset + index, size);
-      } else if (buffer.isDirect()) {
-        return decodeUtf8Direct(buffer, index, size);
-      }
-      return decodeUtf8Default(buffer, index, size);
-    }
-
-    /** Decodes direct {@link ByteBuffer} instances into {@link String}. */
-    abstract String decodeUtf8Direct(ByteBuffer buffer, int index, int size)
-        throws InvalidProtocolBufferException;
-
-    /**
-     * Decodes {@link ByteBuffer} instances using the {@link ByteBuffer} API rather than potentially
-     * faster approaches.
-     */
-    final String decodeUtf8Default(ByteBuffer buffer, int index, int size)
-        throws InvalidProtocolBufferException {
-      // Bitwise OR combines the sign bits so any negative value fails the check.
-      if ((index | size | buffer.limit() - index - size) < 0) {
-        throw new ArrayIndexOutOfBoundsException(
-            String.format("buffer limit=%d, index=%d, limit=%d", buffer.limit(), index, size));
-      }
-
-      int offset = index;
-      int limit = offset + size;
-
-      // The longest possible resulting String is the same as the number of input bytes, when it is
-      // all ASCII. For other cases, this over-allocates and we will truncate in the end.
-      char[] resultArr = new char[size];
-      int resultPos = 0;
-
-      // Optimize for 100% ASCII (Hotspot loves small simple top-level loops like this).
-      // This simple loop stops when we encounter a byte >= 0x80 (i.e. non-ASCII).
-      while (offset < limit) {
-        byte b = buffer.get(offset);
-        if (!DecodeUtil.isOneByte(b)) {
-          break;
-        }
-        offset++;
-        DecodeUtil.handleOneByte(b, resultArr, resultPos++);
-      }
-
-      while (offset < limit) {
-        byte byte1 = buffer.get(offset++);
-        if (DecodeUtil.isOneByte(byte1)) {
-          DecodeUtil.handleOneByte(byte1, resultArr, resultPos++);
-          // It's common for there to be multiple ASCII characters in a run mixed in, so add an
-          // extra optimized loop to take care of these runs.
-          while (offset < limit) {
-            byte b = buffer.get(offset);
-            if (!DecodeUtil.isOneByte(b)) {
-              break;
-            }
-            offset++;
-            DecodeUtil.handleOneByte(b, resultArr, resultPos++);
-          }
-        } else if (DecodeUtil.isTwoBytes(byte1)) {
-          if (offset >= limit) {
-            throw InvalidProtocolBufferException.invalidUtf8();
-          }
-          DecodeUtil.handleTwoBytes(
-              byte1, /* byte2 */ buffer.get(offset++), resultArr, resultPos++);
-        } else if (DecodeUtil.isThreeBytes(byte1)) {
-          if (offset >= limit - 1) {
-            throw InvalidProtocolBufferException.invalidUtf8();
-          }
-          DecodeUtil.handleThreeBytes(
-              byte1,
-              /* byte2 */ buffer.get(offset++),
-              /* byte3 */ buffer.get(offset++),
-              resultArr,
-              resultPos++);
-        } else {
-          if (offset >= limit - 2) {
-            throw InvalidProtocolBufferException.invalidUtf8();
-          }
-          DecodeUtil.handleFourBytes(
-              byte1,
-              /* byte2 */ buffer.get(offset++),
-              /* byte3 */ buffer.get(offset++),
-              /* byte4 */ buffer.get(offset++),
-              resultArr,
-              resultPos++);
-          // 4-byte case requires two chars.
-          resultPos++;
-        }
-      }
-
-      return new String(resultArr, 0, resultPos);
-    }
-
-    /**
-     * Encodes an input character sequence ({@code in}) to UTF-8 in the target array ({@code out}).
-     * For a string, this method is similar to
-     *
-     * <pre>{@code
-     * byte[] a = string.getBytes(UTF_8);
-     * System.arraycopy(a, 0, bytes, offset, a.length);
-     * return offset + a.length;
-     * }</pre>
-     *
-     * but is more efficient in both time and space. One key difference is that this method requires
-     * paired surrogates, and therefore does not support chunking. While {@code
-     * String.getBytes(UTF_8)} replaces unpaired surrogates with the default replacement character,
-     * this method throws {@link UnpairedSurrogateException}.
-     *
-     * <p>To ensure sufficient space in the output buffer, either call {@link #encodedLength} to
-     * compute the exact amount needed, or leave room for {@code Utf8.MAX_BYTES_PER_CHAR *
-     * sequence.length()}, which is the largest possible number of bytes that any input can be
-     * encoded to.
-     *
-     * @param in the input character sequence to be encoded
-     * @param out the target array
-     * @param offset the starting offset in {@code bytes} to start writing at
-     * @param length the length of the {@code bytes}, starting from {@code offset}
-     * @throws UnpairedSurrogateException if {@code sequence} contains ill-formed UTF-16 (unpaired
-     *     surrogates)
-     * @throws ArrayIndexOutOfBoundsException if {@code sequence} encoded in UTF-8 is longer than
-     *     {@code bytes.length - offset}
-     * @return the new offset, equivalent to {@code offset + Utf8.encodedLength(sequence)}
-     */
-    abstract int encodeUtf8(CharSequence in, byte[] out, int offset, int length);
-
-    /**
-     * Encodes an input character sequence ({@code in}) to UTF-8 in the target buffer ({@code out}).
-     * Upon returning from this method, the {@code out} position will point to the position after
-     * the last encoded byte. This method requires paired surrogates, and therefore does not support
-     * chunking.
-     *
-     * <p>To ensure sufficient space in the output buffer, either call {@link #encodedLength} to
-     * compute the exact amount needed, or leave room for {@code Utf8.MAX_BYTES_PER_CHAR *
-     * in.length()}, which is the largest possible number of bytes that any input can be encoded to.
-     *
-     * @param in the source character sequence to be encoded
-     * @param out the target buffer
-     * @throws UnpairedSurrogateException if {@code in} contains ill-formed UTF-16 (unpaired
-     *     surrogates)
-     * @throws ArrayIndexOutOfBoundsException if {@code in} encoded in UTF-8 is longer than {@code
-     *     out.remaining()}
-     */
-    final void encodeUtf8(CharSequence in, ByteBuffer out) {
-      if (out.hasArray()) {
-        final int offset = out.arrayOffset();
-        int endIndex = Utf8.encode(in, out.array(), offset + out.position(), out.remaining());
-        out.position(endIndex - offset);
-      } else if (out.isDirect()) {
-        encodeUtf8Direct(in, out);
-      } else {
-        encodeUtf8Default(in, out);
-      }
-    }
-
-    /** Encodes the input character sequence to a direct {@link ByteBuffer} instance. */
-    abstract void encodeUtf8Direct(CharSequence in, ByteBuffer out);
-
-    /**
-     * Encodes the input character sequence to a {@link ByteBuffer} instance using the {@link
-     * ByteBuffer} API, rather than potentially faster approaches.
-     */
-    final void encodeUtf8Default(CharSequence in, ByteBuffer out) {
-      final int inLength = in.length();
-      int outIx = out.position();
-      int inIx = 0;
-
-      // Since ByteBuffer.putXXX() already checks boundaries for us, no need to explicitly check
-      // access. Assume the buffer is big enough and let it handle the out of bounds exception
-      // if it occurs.
-      try {
-        // Designed to take advantage of
-        // https://wiki.openjdk.java.net/display/HotSpotInternals/RangeCheckElimination
-        for (char c; inIx < inLength && (c = in.charAt(inIx)) < 0x80; ++inIx) {
-          out.put(outIx + inIx, (byte) c);
-        }
-        if (inIx == inLength) {
-          // Successfully encoded the entire string.
-          out.position(outIx + inIx);
-          return;
-        }
-
-        outIx += inIx;
-        for (char c; inIx < inLength; ++inIx, ++outIx) {
-          c = in.charAt(inIx);
-          if (c < 0x80) {
-            // One byte (0xxx xxxx)
-            out.put(outIx, (byte) c);
-          } else if (c < 0x800) {
-            // Two bytes (110x xxxx 10xx xxxx)
-
-            // Benchmarks show put performs better than putShort here (for HotSpot).
-            out.put(outIx++, (byte) (0xC0 | (c >>> 6)));
-            out.put(outIx, (byte) (0x80 | (0x3F & c)));
-          } else if (c < MIN_SURROGATE || MAX_SURROGATE < c) {
-            // Three bytes (1110 xxxx 10xx xxxx 10xx xxxx)
-            // Maximum single-char code point is 0xFFFF, 16 bits.
-
-            // Benchmarks show put performs better than putShort here (for HotSpot).
-            out.put(outIx++, (byte) (0xE0 | (c >>> 12)));
-            out.put(outIx++, (byte) (0x80 | (0x3F & (c >>> 6))));
-            out.put(outIx, (byte) (0x80 | (0x3F & c)));
-          } else {
-            // Four bytes (1111 xxxx 10xx xxxx 10xx xxxx 10xx xxxx)
-
-            // Minimum code point represented by a surrogate pair is 0x10000, 17 bits, four UTF-8
-            // bytes
-            final char low;
-            if (inIx + 1 == inLength || !isSurrogatePair(c, (low = in.charAt(++inIx)))) {
-              throw new UnpairedSurrogateException(inIx, inLength);
-            }
-            // TODO(nathanmittler): Consider using putInt() to improve performance.
-            int codePoint = toCodePoint(c, low);
-            out.put(outIx++, (byte) ((0xF << 4) | (codePoint >>> 18)));
-            out.put(outIx++, (byte) (0x80 | (0x3F & (codePoint >>> 12))));
-            out.put(outIx++, (byte) (0x80 | (0x3F & (codePoint >>> 6))));
-            out.put(outIx, (byte) (0x80 | (0x3F & codePoint)));
-          }
-        }
-
-        // Successfully encoded the entire string.
-        out.position(outIx);
-      } catch (IndexOutOfBoundsException e) {
-        // TODO(nathanmittler): Consider making the API throw IndexOutOfBoundsException instead.
-
-        // If we failed in the outer ASCII loop, outIx will not have been updated. In this case,
-        // use inIx to determine the bad write index.
-        int badWriteIndex = out.position() + Math.max(inIx, outIx - out.position() + 1);
-        throw new ArrayIndexOutOfBoundsException(
-            "Failed writing " + in.charAt(inIx) + " at index " + badWriteIndex);
-      }
-    }
-  }
-
-  /** {@link Processor} implementation that does not use any {@code sun.misc.Unsafe} methods. */
-  static final class SafeProcessor extends Processor {
-    @Override
-    int partialIsValidUtf8(int state, byte[] bytes, int index, int limit) {
-      if (state != COMPLETE) {
-        // The previous decoding operation was incomplete (or malformed).
-        // We look for a well-formed sequence consisting of bytes from
-        // the previous decoding operation (stored in state) together
-        // with bytes from the array slice.
-        //
-        // We expect such "straddler characters" to be rare.
-
-        if (index >= limit) { // No bytes? No progress.
-          return state;
-        }
-        int byte1 = (byte) state;
-        // byte1 is never ASCII.
-        if (byte1 < (byte) 0xE0) {
-          // two-byte form
-
-          // Simultaneously checks for illegal trailing-byte in
-          // leading position and overlong 2-byte form.
-          if (byte1 < (byte) 0xC2
-              // byte2 trailing-byte test
-              || bytes[index++] > (byte) 0xBF) {
-            return MALFORMED;
-          }
-        } else if (byte1 < (byte) 0xF0) {
-          // three-byte form
-
-          // Get byte2 from saved state or array
-          int byte2 = (byte) ~(state >> 8);
-          if (byte2 == 0) {
-            byte2 = bytes[index++];
-            if (index >= limit) {
-              return incompleteStateFor(byte1, byte2);
-            }
-          }
-          if (byte2 > (byte) 0xBF
-              // overlong? 5 most significant bits must not all be zero
-              || (byte1 == (byte) 0xE0 && byte2 < (byte) 0xA0)
-              // illegal surrogate codepoint?
-              || (byte1 == (byte) 0xED && byte2 >= (byte) 0xA0)
-              // byte3 trailing-byte test
-              || bytes[index++] > (byte) 0xBF) {
-            return MALFORMED;
-          }
-        } else {
-          // four-byte form
-
-          // Get byte2 and byte3 from saved state or array
-          int byte2 = (byte) ~(state >> 8);
-          int byte3 = 0;
-          if (byte2 == 0) {
-            byte2 = bytes[index++];
-            if (index >= limit) {
-              return incompleteStateFor(byte1, byte2);
-            }
-          } else {
-            byte3 = (byte) (state >> 16);
-          }
-          if (byte3 == 0) {
-            byte3 = bytes[index++];
-            if (index >= limit) {
-              return incompleteStateFor(byte1, byte2, byte3);
-            }
-          }
-
-          // If we were called with state == MALFORMED, then byte1 is 0xFF,
-          // which never occurs in well-formed UTF-8, and so we will return
-          // MALFORMED again below.
-
-          if (byte2 > (byte) 0xBF
-              // Check that 1 <= plane <= 16.  Tricky optimized form of:
-              // if (byte1 > (byte) 0xF4 ||
-              //     byte1 == (byte) 0xF0 && byte2 < (byte) 0x90 ||
-              //     byte1 == (byte) 0xF4 && byte2 > (byte) 0x8F)
-              || (((byte1 << 28) + (byte2 - (byte) 0x90)) >> 30) != 0
-              // byte3 trailing-byte test
-              || byte3 > (byte) 0xBF
-              // byte4 trailing-byte test
-              || bytes[index++] > (byte) 0xBF) {
-            return MALFORMED;
-          }
-        }
-      }
-
-      return partialIsValidUtf8(bytes, index, limit);
-    }
-
-    @Override
-    int partialIsValidUtf8Direct(int state, ByteBuffer buffer, int index, int limit) {
-      // For safe processing, we have to use the ByteBuffer API.
-      return partialIsValidUtf8Default(state, buffer, index, limit);
-    }
-
-    @Override
-    String decodeUtf8(byte[] bytes, int index, int size) throws InvalidProtocolBufferException {
-      // Bitwise OR combines the sign bits so any negative value fails the check.
-      if ((index | size | bytes.length - index - size) < 0) {
-        throw new ArrayIndexOutOfBoundsException(
-            String.format("buffer length=%d, index=%d, size=%d", bytes.length, index, size));
-      }
-
-      int offset = index;
-      final int limit = offset + size;
-
-      // The longest possible resulting String is the same as the number of input bytes, when it is
-      // all ASCII. For other cases, this over-allocates and we will truncate in the end.
-      char[] resultArr = new char[size];
-      int resultPos = 0;
-
-      // Optimize for 100% ASCII (Hotspot loves small simple top-level loops like this).
-      // This simple loop stops when we encounter a byte >= 0x80 (i.e. non-ASCII).
-      while (offset < limit) {
-        byte b = bytes[offset];
-        if (!DecodeUtil.isOneByte(b)) {
-          break;
-        }
-        offset++;
-        DecodeUtil.handleOneByte(b, resultArr, resultPos++);
-      }
-
-      while (offset < limit) {
-        byte byte1 = bytes[offset++];
-        if (DecodeUtil.isOneByte(byte1)) {
-          DecodeUtil.handleOneByte(byte1, resultArr, resultPos++);
-          // It's common for there to be multiple ASCII characters in a run mixed in, so add an
-          // extra optimized loop to take care of these runs.
-          while (offset < limit) {
-            byte b = bytes[offset];
-            if (!DecodeUtil.isOneByte(b)) {
-              break;
-            }
-            offset++;
-            DecodeUtil.handleOneByte(b, resultArr, resultPos++);
-          }
-        } else if (DecodeUtil.isTwoBytes(byte1)) {
-          if (offset >= limit) {
-            throw InvalidProtocolBufferException.invalidUtf8();
-          }
-          DecodeUtil.handleTwoBytes(byte1, /* byte2 */ bytes[offset++], resultArr, resultPos++);
-        } else if (DecodeUtil.isThreeBytes(byte1)) {
-          if (offset >= limit - 1) {
-            throw InvalidProtocolBufferException.invalidUtf8();
-          }
-          DecodeUtil.handleThreeBytes(
-              byte1,
-              /* byte2 */ bytes[offset++],
-              /* byte3 */ bytes[offset++],
-              resultArr,
-              resultPos++);
-        } else {
-          if (offset >= limit - 2) {
-            throw InvalidProtocolBufferException.invalidUtf8();
-          }
-          DecodeUtil.handleFourBytes(
-              byte1,
-              /* byte2 */ bytes[offset++],
-              /* byte3 */ bytes[offset++],
-              /* byte4 */ bytes[offset++],
-              resultArr,
-              resultPos++);
-          // 4-byte case requires two chars.
-          resultPos++;
-        }
-      }
-
-      return new String(resultArr, 0, resultPos);
-    }
-
-    @Override
-    String decodeUtf8Direct(ByteBuffer buffer, int index, int size)
-        throws InvalidProtocolBufferException {
-      // For safe processing, we have to use the ByteBufferAPI.
-      return decodeUtf8Default(buffer, index, size);
-    }
-
-    @Override
-    int encodeUtf8(CharSequence in, byte[] out, int offset, int length) {
-      int utf16Length = in.length();
-      int j = offset;
-      int i = 0;
-      int limit = offset + length;
-      // Designed to take advantage of
-      // https://wiki.openjdk.java.net/display/HotSpotInternals/RangeCheckElimination
-      for (char c; i < utf16Length && i + j < limit && (c = in.charAt(i)) < 0x80; i++) {
-        out[j + i] = (byte) c;
-      }
-      if (i == utf16Length) {
-        return j + utf16Length;
-      }
-      j += i;
-      for (char c; i < utf16Length; i++) {
-        c = in.charAt(i);
-        if (c < 0x80 && j < limit) {
-          out[j++] = (byte) c;
-        } else if (c < 0x800 && j <= limit - 2) { // 11 bits, two UTF-8 bytes
-          out[j++] = (byte) ((0xF << 6) | (c >>> 6));
-          out[j++] = (byte) (0x80 | (0x3F & c));
-        } else if ((c < Character.MIN_SURROGATE || Character.MAX_SURROGATE < c) && j <= limit - 3) {
-          // Maximum single-char code point is 0xFFFF, 16 bits, three UTF-8 bytes
-          out[j++] = (byte) ((0xF << 5) | (c >>> 12));
-          out[j++] = (byte) (0x80 | (0x3F & (c >>> 6)));
-          out[j++] = (byte) (0x80 | (0x3F & c));
-        } else if (j <= limit - 4) {
-          // Minimum code point represented by a surrogate pair is 0x10000, 17 bits,
-          // four UTF-8 bytes
-          final char low;
-          if (i + 1 == in.length() || !Character.isSurrogatePair(c, (low = in.charAt(++i)))) {
-            throw new UnpairedSurrogateException((i - 1), utf16Length);
-          }
-          int codePoint = Character.toCodePoint(c, low);
-          out[j++] = (byte) ((0xF << 4) | (codePoint >>> 18));
-          out[j++] = (byte) (0x80 | (0x3F & (codePoint >>> 12)));
-          out[j++] = (byte) (0x80 | (0x3F & (codePoint >>> 6)));
-          out[j++] = (byte) (0x80 | (0x3F & codePoint));
-        } else {
-          // If we are surrogates and we're not a surrogate pair, always throw an
-          // UnpairedSurrogateException instead of an ArrayOutOfBoundsException.
-          if ((Character.MIN_SURROGATE <= c && c <= Character.MAX_SURROGATE)
-              && (i + 1 == in.length() || !Character.isSurrogatePair(c, in.charAt(i + 1)))) {
-            throw new UnpairedSurrogateException(i, utf16Length);
-          }
-          throw new ArrayIndexOutOfBoundsException("Failed writing " + c + " at index " + j);
-        }
-      }
-      return j;
-    }
-
-    @Override
-    void encodeUtf8Direct(CharSequence in, ByteBuffer out) {
-      // For safe processing, we have to use the ByteBuffer API.
-      encodeUtf8Default(in, out);
-    }
-
-    private static int partialIsValidUtf8(byte[] bytes, int index, int limit) {
-      // Optimize for 100% ASCII (Hotspot loves small simple top-level loops like this).
-      // This simple loop stops when we encounter a byte >= 0x80 (i.e. non-ASCII).
-      while (index < limit && bytes[index] >= 0) {
-        index++;
-      }
-
-      return (index >= limit) ? COMPLETE : partialIsValidUtf8NonAscii(bytes, index, limit);
-    }
-
-    private static int partialIsValidUtf8NonAscii(byte[] bytes, int index, int limit) {
-      for (; ; ) {
-        int byte1;
-        int byte2;
-
-        // Optimize for interior runs of ASCII bytes.
-        do {
-          if (index >= limit) {
-            return COMPLETE;
-          }
-        } while ((byte1 = bytes[index++]) >= 0);
-
-        if (byte1 < (byte) 0xE0) {
-          // two-byte form
-
-          if (index >= limit) {
-            // Incomplete sequence
-            return byte1;
-          }
-
-          // Simultaneously checks for illegal trailing-byte in
-          // leading position and overlong 2-byte form.
-          if (byte1 < (byte) 0xC2 || bytes[index++] > (byte) 0xBF) {
-            return MALFORMED;
-          }
-        } else if (byte1 < (byte) 0xF0) {
-          // three-byte form
-
-          if (index >= limit - 1) { // incomplete sequence
-            return incompleteStateFor(bytes, index, limit);
-          }
-          if ((byte2 = bytes[index++]) > (byte) 0xBF
-              // overlong? 5 most significant bits must not all be zero
-              || (byte1 == (byte) 0xE0 && byte2 < (byte) 0xA0)
-              // check for illegal surrogate codepoints
-              || (byte1 == (byte) 0xED && byte2 >= (byte) 0xA0)
-              // byte3 trailing-byte test
-              || bytes[index++] > (byte) 0xBF) {
-            return MALFORMED;
-          }
-        } else {
-          // four-byte form
-
-          if (index >= limit - 2) { // incomplete sequence
-            return incompleteStateFor(bytes, index, limit);
-          }
-          if ((byte2 = bytes[index++]) > (byte) 0xBF
-              // Check that 1 <= plane <= 16.  Tricky optimized form of:
-              // if (byte1 > (byte) 0xF4 ||
-              //     byte1 == (byte) 0xF0 && byte2 < (byte) 0x90 ||
-              //     byte1 == (byte) 0xF4 && byte2 > (byte) 0x8F)
-              || (((byte1 << 28) + (byte2 - (byte) 0x90)) >> 30) != 0
-              // byte3 trailing-byte test
-              || bytes[index++] > (byte) 0xBF
-              // byte4 trailing-byte test
-              || bytes[index++] > (byte) 0xBF) {
-            return MALFORMED;
-          }
-        }
-      }
-    }
-  }
-
-  /** {@link Processor} that uses {@code sun.misc.Unsafe} where possible to improve performance. */
-  static final class UnsafeProcessor extends Processor {
-    /** Indicates whether or not all required unsafe operations are supported on this platform. */
-    static boolean isAvailable() {
-      return hasUnsafeArrayOperations() && hasUnsafeByteBufferOperations();
-    }
-
-    @Override
-    int partialIsValidUtf8(int state, byte[] bytes, final int index, final int limit) {
-      // Bitwise OR combines the sign bits so any negative value fails the check.
-      if ((index | limit | bytes.length - limit) < 0) {
-        throw new ArrayIndexOutOfBoundsException(
-            String.format("Array length=%d, index=%d, limit=%d", bytes.length, index, limit));
-      }
-      long offset = index;
-      final long offsetLimit = limit;
-      if (state != COMPLETE) {
-        // The previous decoding operation was incomplete (or malformed).
-        // We look for a well-formed sequence consisting of bytes from
-        // the previous decoding operation (stored in state) together
-        // with bytes from the array slice.
-        //
-        // We expect such "straddler characters" to be rare.
-
-        if (offset >= offsetLimit) { // No bytes? No progress.
-          return state;
-        }
-        int byte1 = (byte) state;
-        // byte1 is never ASCII.
-        if (byte1 < (byte) 0xE0) {
-          // two-byte form
-
-          // Simultaneously checks for illegal trailing-byte in
-          // leading position and overlong 2-byte form.
-          if (byte1 < (byte) 0xC2
-              // byte2 trailing-byte test
-              || UnsafeUtil.getByte(bytes, offset++) > (byte) 0xBF) {
-            return MALFORMED;
-          }
-        } else if (byte1 < (byte) 0xF0) {
-          // three-byte form
-
-          // Get byte2 from saved state or array
-          int byte2 = (byte) ~(state >> 8);
-          if (byte2 == 0) {
-            byte2 = UnsafeUtil.getByte(bytes, offset++);
-            if (offset >= offsetLimit) {
-              return incompleteStateFor(byte1, byte2);
-            }
-          }
-          if (byte2 > (byte) 0xBF
-              // overlong? 5 most significant bits must not all be zero
-              || (byte1 == (byte) 0xE0 && byte2 < (byte) 0xA0)
-              // illegal surrogate codepoint?
-              || (byte1 == (byte) 0xED && byte2 >= (byte) 0xA0)
-              // byte3 trailing-byte test
-              || UnsafeUtil.getByte(bytes, offset++) > (byte) 0xBF) {
-            return MALFORMED;
-          }
-        } else {
-          // four-byte form
-
-          // Get byte2 and byte3 from saved state or array
-          int byte2 = (byte) ~(state >> 8);
-          int byte3 = 0;
-          if (byte2 == 0) {
-            byte2 = UnsafeUtil.getByte(bytes, offset++);
-            if (offset >= offsetLimit) {
-              return incompleteStateFor(byte1, byte2);
-            }
-          } else {
-            byte3 = (byte) (state >> 16);
-          }
-          if (byte3 == 0) {
-            byte3 = UnsafeUtil.getByte(bytes, offset++);
-            if (offset >= offsetLimit) {
-              return incompleteStateFor(byte1, byte2, byte3);
-            }
-          }
-
-          // If we were called with state == MALFORMED, then byte1 is 0xFF,
-          // which never occurs in well-formed UTF-8, and so we will return
-          // MALFORMED again below.
-
-          if (byte2 > (byte) 0xBF
-              // Check that 1 <= plane <= 16.  Tricky optimized form of:
-              // if (byte1 > (byte) 0xF4 ||
-              //     byte1 == (byte) 0xF0 && byte2 < (byte) 0x90 ||
-              //     byte1 == (byte) 0xF4 && byte2 > (byte) 0x8F)
-              || (((byte1 << 28) + (byte2 - (byte) 0x90)) >> 30) != 0
-              // byte3 trailing-byte test
-              || byte3 > (byte) 0xBF
-              // byte4 trailing-byte test
-              || UnsafeUtil.getByte(bytes, offset++) > (byte) 0xBF) {
-            return MALFORMED;
-          }
-        }
-      }
-
-      return partialIsValidUtf8(bytes, offset, (int) (offsetLimit - offset));
-    }
-
-    @Override
-    int partialIsValidUtf8Direct(
-        final int state, ByteBuffer buffer, final int index, final int limit) {
-      // Bitwise OR combines the sign bits so any negative value fails the check.
-      if ((index | limit | buffer.limit() - limit) < 0) {
-        throw new ArrayIndexOutOfBoundsException(
-            String.format("buffer limit=%d, index=%d, limit=%d", buffer.limit(), index, limit));
-      }
-      long address = addressOffset(buffer) + index;
-      final long addressLimit = address + (limit - index);
-      if (state != COMPLETE) {
-        // The previous decoding operation was incomplete (or malformed).
-        // We look for a well-formed sequence consisting of bytes from
-        // the previous decoding operation (stored in state) together
-        // with bytes from the array slice.
-        //
-        // We expect such "straddler characters" to be rare.
-
-        if (address >= addressLimit) { // No bytes? No progress.
-          return state;
-        }
-
-        final int byte1 = (byte) state;
-        // byte1 is never ASCII.
-        if (byte1 < (byte) 0xE0) {
-          // two-byte form
-
-          // Simultaneously checks for illegal trailing-byte in
-          // leading position and overlong 2-byte form.
-          if (byte1 < (byte) 0xC2
-              // byte2 trailing-byte test
-              || UnsafeUtil.getByte(address++) > (byte) 0xBF) {
-            return MALFORMED;
-          }
-        } else if (byte1 < (byte) 0xF0) {
-          // three-byte form
-
-          // Get byte2 from saved state or array
-          int byte2 = (byte) ~(state >> 8);
-          if (byte2 == 0) {
-            byte2 = UnsafeUtil.getByte(address++);
-            if (address >= addressLimit) {
-              return incompleteStateFor(byte1, byte2);
-            }
-          }
-          if (byte2 > (byte) 0xBF
-              // overlong? 5 most significant bits must not all be zero
-              || (byte1 == (byte) 0xE0 && byte2 < (byte) 0xA0)
-              // illegal surrogate codepoint?
-              || (byte1 == (byte) 0xED && byte2 >= (byte) 0xA0)
-              // byte3 trailing-byte test
-              || UnsafeUtil.getByte(address++) > (byte) 0xBF) {
-            return MALFORMED;
-          }
-        } else {
-          // four-byte form
-
-          // Get byte2 and byte3 from saved state or array
-          int byte2 = (byte) ~(state >> 8);
-          int byte3 = 0;
-          if (byte2 == 0) {
-            byte2 = UnsafeUtil.getByte(address++);
-            if (address >= addressLimit) {
-              return incompleteStateFor(byte1, byte2);
-            }
-          } else {
-            byte3 = (byte) (state >> 16);
-          }
-          if (byte3 == 0) {
-            byte3 = UnsafeUtil.getByte(address++);
-            if (address >= addressLimit) {
-              return incompleteStateFor(byte1, byte2, byte3);
-            }
-          }
-
-          // If we were called with state == MALFORMED, then byte1 is 0xFF,
-          // which never occurs in well-formed UTF-8, and so we will return
-          // MALFORMED again below.
-
-          if (byte2 > (byte) 0xBF
-              // Check that 1 <= plane <= 16.  Tricky optimized form of:
-              // if (byte1 > (byte) 0xF4 ||
-              //     byte1 == (byte) 0xF0 && byte2 < (byte) 0x90 ||
-              //     byte1 == (byte) 0xF4 && byte2 > (byte) 0x8F)
-              || (((byte1 << 28) + (byte2 - (byte) 0x90)) >> 30) != 0
-              // byte3 trailing-byte test
-              || byte3 > (byte) 0xBF
-              // byte4 trailing-byte test
-              || UnsafeUtil.getByte(address++) > (byte) 0xBF) {
-            return MALFORMED;
-          }
-        }
-      }
-
-      return partialIsValidUtf8(address, (int) (addressLimit - address));
-    }
-
-    @Override
-    String decodeUtf8(byte[] bytes, int index, int size) throws InvalidProtocolBufferException {
-      String s = new String(bytes, index, size, Internal.UTF_8);
-
-      // "\uFFFD" is UTF-8 default replacement string, which illegal byte sequences get replaced
-      // with.
-      if (!s.contains("\uFFFD")) {
-        return s;
-      }
-
-      // Since s contains "\uFFFD" there are 2 options:
-      // 1) The byte array slice is invalid UTF-8.
-      // 2) The byte array slice is valid UTF-8 and contains encodings for "\uFFFD".
-      // To rule out (1), we encode s and compare it to the byte array slice.
-      // If the byte array slice was invalid UTF-8, then we would get a different sequence of bytes.
-      if (Arrays.equals(
-          s.getBytes(Internal.UTF_8), Arrays.copyOfRange(bytes, index, index + size))) {
-        return s;
-      }
-
-      throw InvalidProtocolBufferException.invalidUtf8();
-    }
-
-    @Override
-    String decodeUtf8Direct(ByteBuffer buffer, int index, int size)
-        throws InvalidProtocolBufferException {
-      // Bitwise OR combines the sign bits so any negative value fails the check.
-      if ((index | size | buffer.limit() - index - size) < 0) {
-        throw new ArrayIndexOutOfBoundsException(
-            String.format("buffer limit=%d, index=%d, limit=%d", buffer.limit(), index, size));
-      }
-      long address = UnsafeUtil.addressOffset(buffer) + index;
-      final long addressLimit = address + size;
-
-      // The longest possible resulting String is the same as the number of input bytes, when it is
-      // all ASCII. For other cases, this over-allocates and we will truncate in the end.
-      char[] resultArr = new char[size];
-      int resultPos = 0;
-
-      // Optimize for 100% ASCII (Hotspot loves small simple top-level loops like this).
-      // This simple loop stops when we encounter a byte >= 0x80 (i.e. non-ASCII).
-      while (address < addressLimit) {
-        byte b = UnsafeUtil.getByte(address);
-        if (!DecodeUtil.isOneByte(b)) {
-          break;
-        }
-        address++;
-        DecodeUtil.handleOneByte(b, resultArr, resultPos++);
-      }
-
-      while (address < addressLimit) {
-        byte byte1 = UnsafeUtil.getByte(address++);
-        if (DecodeUtil.isOneByte(byte1)) {
-          DecodeUtil.handleOneByte(byte1, resultArr, resultPos++);
-          // It's common for there to be multiple ASCII characters in a run mixed in, so add an
-          // extra optimized loop to take care of these runs.
-          while (address < addressLimit) {
-            byte b = UnsafeUtil.getByte(address);
-            if (!DecodeUtil.isOneByte(b)) {
-              break;
-            }
-            address++;
-            DecodeUtil.handleOneByte(b, resultArr, resultPos++);
-          }
-        } else if (DecodeUtil.isTwoBytes(byte1)) {
-          if (address >= addressLimit) {
-            throw InvalidProtocolBufferException.invalidUtf8();
-          }
-          DecodeUtil.handleTwoBytes(
-              byte1, /* byte2 */ UnsafeUtil.getByte(address++), resultArr, resultPos++);
-        } else if (DecodeUtil.isThreeBytes(byte1)) {
-          if (address >= addressLimit - 1) {
-            throw InvalidProtocolBufferException.invalidUtf8();
-          }
-          DecodeUtil.handleThreeBytes(
-              byte1,
-              /* byte2 */ UnsafeUtil.getByte(address++),
-              /* byte3 */ UnsafeUtil.getByte(address++),
-              resultArr,
-              resultPos++);
-        } else {
-          if (address >= addressLimit - 2) {
-            throw InvalidProtocolBufferException.invalidUtf8();
-          }
-          DecodeUtil.handleFourBytes(
-              byte1,
-              /* byte2 */ UnsafeUtil.getByte(address++),
-              /* byte3 */ UnsafeUtil.getByte(address++),
-              /* byte4 */ UnsafeUtil.getByte(address++),
-              resultArr,
-              resultPos++);
-          // 4-byte case requires two chars.
-          resultPos++;
-        }
-      }
-
-      return new String(resultArr, 0, resultPos);
-    }
-
-    @Override
-    int encodeUtf8(final CharSequence in, final byte[] out, final int offset, final int length) {
-      long outIx = offset;
-      final long outLimit = outIx + length;
-      final int inLimit = in.length();
-      if (inLimit > length || out.length - length < offset) {
-        // Not even enough room for an ASCII-encoded string.
-        throw new ArrayIndexOutOfBoundsException(
-            "Failed writing " + in.charAt(inLimit - 1) + " at index " + (offset + length));
-      }
-
-      // Designed to take advantage of
-      // https://wiki.openjdk.java.net/display/HotSpotInternals/RangeCheckElimination
-      int inIx = 0;
-      for (char c; inIx < inLimit && (c = in.charAt(inIx)) < 0x80; ++inIx) {
-        UnsafeUtil.putByte(out, outIx++, (byte) c);
-      }
-      if (inIx == inLimit) {
-        // We're done, it was ASCII encoded.
-        return (int) outIx;
-      }
-
-      for (char c; inIx < inLimit; ++inIx) {
-        c = in.charAt(inIx);
-        if (c < 0x80 && outIx < outLimit) {
-          UnsafeUtil.putByte(out, outIx++, (byte) c);
-        } else if (c < 0x800 && outIx <= outLimit - 2L) { // 11 bits, two UTF-8 bytes
-          UnsafeUtil.putByte(out, outIx++, (byte) ((0xF << 6) | (c >>> 6)));
-          UnsafeUtil.putByte(out, outIx++, (byte) (0x80 | (0x3F & c)));
-        } else if ((c < MIN_SURROGATE || MAX_SURROGATE < c) && outIx <= outLimit - 3L) {
-          // Maximum single-char code point is 0xFFFF, 16 bits, three UTF-8 bytes
-          UnsafeUtil.putByte(out, outIx++, (byte) ((0xF << 5) | (c >>> 12)));
-          UnsafeUtil.putByte(out, outIx++, (byte) (0x80 | (0x3F & (c >>> 6))));
-          UnsafeUtil.putByte(out, outIx++, (byte) (0x80 | (0x3F & c)));
-        } else if (outIx <= outLimit - 4L) {
-          // Minimum code point represented by a surrogate pair is 0x10000, 17 bits, four UTF-8
-          // bytes
-          final char low;
-          if (inIx + 1 == inLimit || !isSurrogatePair(c, (low = in.charAt(++inIx)))) {
-            throw new UnpairedSurrogateException((inIx - 1), inLimit);
-          }
-          int codePoint = toCodePoint(c, low);
-          UnsafeUtil.putByte(out, outIx++, (byte) ((0xF << 4) | (codePoint >>> 18)));
-          UnsafeUtil.putByte(out, outIx++, (byte) (0x80 | (0x3F & (codePoint >>> 12))));
-          UnsafeUtil.putByte(out, outIx++, (byte) (0x80 | (0x3F & (codePoint >>> 6))));
-          UnsafeUtil.putByte(out, outIx++, (byte) (0x80 | (0x3F & codePoint)));
-        } else {
-          if ((MIN_SURROGATE <= c && c <= MAX_SURROGATE)
-              && (inIx + 1 == inLimit || !isSurrogatePair(c, in.charAt(inIx + 1)))) {
-            // We are surrogates and we're not a surrogate pair.
-            throw new UnpairedSurrogateException(inIx, inLimit);
-          }
-          // Not enough space in the output buffer.
-          throw new ArrayIndexOutOfBoundsException("Failed writing " + c + " at index " + outIx);
-        }
-      }
-
-      // All bytes have been encoded.
-      return (int) outIx;
-    }
-
-    @Override
-    void encodeUtf8Direct(CharSequence in, ByteBuffer out) {
-      final long address = addressOffset(out);
-      long outIx = address + out.position();
-      final long outLimit = address + out.limit();
-      final int inLimit = in.length();
-      if (inLimit > outLimit - outIx) {
-        // Not even enough room for an ASCII-encoded string.
-        throw new ArrayIndexOutOfBoundsException(
-            "Failed writing " + in.charAt(inLimit - 1) + " at index " + out.limit());
-      }
-
-      // Designed to take advantage of
-      // https://wiki.openjdk.java.net/display/HotSpotInternals/RangeCheckElimination
-      int inIx = 0;
-      for (char c; inIx < inLimit && (c = in.charAt(inIx)) < 0x80; ++inIx) {
-        UnsafeUtil.putByte(outIx++, (byte) c);
-      }
-      if (inIx == inLimit) {
-        // We're done, it was ASCII encoded.
-        out.position((int) (outIx - address));
-        return;
-      }
-
-      for (char c; inIx < inLimit; ++inIx) {
-        c = in.charAt(inIx);
-        if (c < 0x80 && outIx < outLimit) {
-          UnsafeUtil.putByte(outIx++, (byte) c);
-        } else if (c < 0x800 && outIx <= outLimit - 2L) { // 11 bits, two UTF-8 bytes
-          UnsafeUtil.putByte(outIx++, (byte) ((0xF << 6) | (c >>> 6)));
-          UnsafeUtil.putByte(outIx++, (byte) (0x80 | (0x3F & c)));
-        } else if ((c < MIN_SURROGATE || MAX_SURROGATE < c) && outIx <= outLimit - 3L) {
-          // Maximum single-char code point is 0xFFFF, 16 bits, three UTF-8 bytes
-          UnsafeUtil.putByte(outIx++, (byte) ((0xF << 5) | (c >>> 12)));
-          UnsafeUtil.putByte(outIx++, (byte) (0x80 | (0x3F & (c >>> 6))));
-          UnsafeUtil.putByte(outIx++, (byte) (0x80 | (0x3F & c)));
-        } else if (outIx <= outLimit - 4L) {
-          // Minimum code point represented by a surrogate pair is 0x10000, 17 bits, four UTF-8
-          // bytes
-          final char low;
-          if (inIx + 1 == inLimit || !isSurrogatePair(c, (low = in.charAt(++inIx)))) {
-            throw new UnpairedSurrogateException((inIx - 1), inLimit);
-          }
-          int codePoint = toCodePoint(c, low);
-          UnsafeUtil.putByte(outIx++, (byte) ((0xF << 4) | (codePoint >>> 18)));
-          UnsafeUtil.putByte(outIx++, (byte) (0x80 | (0x3F & (codePoint >>> 12))));
-          UnsafeUtil.putByte(outIx++, (byte) (0x80 | (0x3F & (codePoint >>> 6))));
-          UnsafeUtil.putByte(outIx++, (byte) (0x80 | (0x3F & codePoint)));
-        } else {
-          if ((MIN_SURROGATE <= c && c <= MAX_SURROGATE)
-              && (inIx + 1 == inLimit || !isSurrogatePair(c, in.charAt(inIx + 1)))) {
-            // We are surrogates and we're not a surrogate pair.
-            throw new UnpairedSurrogateException(inIx, inLimit);
-          }
-          // Not enough space in the output buffer.
-          throw new ArrayIndexOutOfBoundsException("Failed writing " + c + " at index " + outIx);
-        }
-      }
-
-      // All bytes have been encoded.
-      out.position((int) (outIx - address));
-    }
-
-    /**
-     * Counts (approximately) the number of consecutive ASCII characters starting from the given
-     * position, using the most efficient method available to the platform.
-     *
-     * @param bytes the array containing the character sequence
-     * @param offset the offset position of the index (same as index + arrayBaseOffset)
-     * @param maxChars the maximum number of characters to count
-     * @return the number of ASCII characters found. The stopping position will be at or before the
-     *     first non-ASCII byte.
-     */
-    private static int unsafeEstimateConsecutiveAscii(
-        byte[] bytes, long offset, final int maxChars) {
-      if (maxChars < UNSAFE_COUNT_ASCII_THRESHOLD) {
-        // Don't bother with small strings.
-        return 0;
-      }
-
-      // Read bytes until 8-byte aligned so that we can read longs in the loop below.
-      // Byte arrays are already either 8 or 16-byte aligned, so we just need to make sure that
-      // the index (relative to the start of the array) is also 8-byte aligned. We do this by
-      // ANDing the index with 7 to determine the number of bytes that need to be read before
-      // we're 8-byte aligned.
-      final int unaligned = 8 - ((int) offset & 7);
-      int i;
-      for (i = 0; i < unaligned; i++) {
-        if (UnsafeUtil.getByte(bytes, offset++) < 0) {
-          return i;
-        }
-      }
-
-      for (; i + 8 <= maxChars; i += 8) {
-        if ((UnsafeUtil.getLong(bytes, UnsafeUtil.BYTE_ARRAY_BASE_OFFSET + offset)
-                & ASCII_MASK_LONG)
-            != 0L) {
-          break;
-        }
-        offset += 8;
-      }
-
-      for (; i < maxChars; i++) {
-        if (UnsafeUtil.getByte(bytes, offset++) < 0) {
-          return i;
-        }
-      }
-      return maxChars;
-    }
-
-    /**
-     * Same as {@link Utf8#estimateConsecutiveAscii(ByteBuffer, int, int)} except that it uses the
-     * most efficient method available to the platform.
-     */
-    private static int unsafeEstimateConsecutiveAscii(long address, final int maxChars) {
-      int remaining = maxChars;
-      if (remaining < UNSAFE_COUNT_ASCII_THRESHOLD) {
-        // Don't bother with small strings.
-        return 0;
-      }
-
-      // Read bytes until 8-byte aligned so that we can read longs in the loop below.
-      // This is equivalent to (8-address) mod 8, the number of bytes we need to read before we're
-      // 8-byte aligned.
-      final int unaligned = (int) (-address & 7);
-      for (int j = unaligned; j > 0; j--) {
-        if (UnsafeUtil.getByte(address++) < 0) {
-          return unaligned - j;
-        }
-      }
-
-      // This simple loop stops when we encounter a byte >= 0x80 (i.e. non-ASCII).
-      // To speed things up further, we're reading longs instead of bytes so we use a mask to
-      // determine if any byte in the current long is non-ASCII.
-      remaining -= unaligned;
-      for (;
-          remaining >= 8 && (UnsafeUtil.getLong(address) & ASCII_MASK_LONG) == 0;
-          address += 8, remaining -= 8) {}
-      return maxChars - remaining;
-    }
-
-    private static int partialIsValidUtf8(final byte[] bytes, long offset, int remaining) {
-      // Skip past ASCII characters as quickly as possible.
-      final int skipped = unsafeEstimateConsecutiveAscii(bytes, offset, remaining);
-      remaining -= skipped;
-      offset += skipped;
-
-      for (; ; ) {
-        // Optimize for interior runs of ASCII bytes.
-        // TODO(nathanmittler): Consider checking 8 bytes at a time after some threshold?
-        // Maybe after seeing a few in a row that are ASCII, go back to fast mode?
-        int byte1 = 0;
-        for (; remaining > 0 && (byte1 = UnsafeUtil.getByte(bytes, offset++)) >= 0; --remaining) {}
-        if (remaining == 0) {
-          return COMPLETE;
-        }
-        remaining--;
-
-        // If we're here byte1 is not ASCII. Only need to handle 2-4 byte forms.
-        if (byte1 < (byte) 0xE0) {
-          // Two-byte form (110xxxxx 10xxxxxx)
-          if (remaining == 0) {
-            // Incomplete sequence
-            return byte1;
-          }
-          remaining--;
-
-          // Simultaneously checks for illegal trailing-byte in
-          // leading position and overlong 2-byte form.
-          if (byte1 < (byte) 0xC2 || UnsafeUtil.getByte(bytes, offset++) > (byte) 0xBF) {
-            return MALFORMED;
-          }
-        } else if (byte1 < (byte) 0xF0) {
-          // Three-byte form (1110xxxx 10xxxxxx 10xxxxxx)
-          if (remaining < 2) {
-            // Incomplete sequence
-            return unsafeIncompleteStateFor(bytes, byte1, offset, remaining);
-          }
-          remaining -= 2;
-
-          final int byte2;
-          if ((byte2 = UnsafeUtil.getByte(bytes, offset++)) > (byte) 0xBF
-              // overlong? 5 most significant bits must not all be zero
-              || (byte1 == (byte) 0xE0 && byte2 < (byte) 0xA0)
-              // check for illegal surrogate codepoints
-              || (byte1 == (byte) 0xED && byte2 >= (byte) 0xA0)
-              // byte3 trailing-byte test
-              || UnsafeUtil.getByte(bytes, offset++) > (byte) 0xBF) {
-            return MALFORMED;
-          }
-        } else {
-          // Four-byte form (1110xxxx 10xxxxxx 10xxxxxx 10xxxxxx)
-          if (remaining < 3) {
-            // Incomplete sequence
-            return unsafeIncompleteStateFor(bytes, byte1, offset, remaining);
-          }
-          remaining -= 3;
-
-          final int byte2;
-          if ((byte2 = UnsafeUtil.getByte(bytes, offset++)) > (byte) 0xBF
-              // Check that 1 <= plane <= 16.  Tricky optimized form of:
-              // if (byte1 > (byte) 0xF4 ||
-              //     byte1 == (byte) 0xF0 && byte2 < (byte) 0x90 ||
-              //     byte1 == (byte) 0xF4 && byte2 > (byte) 0x8F)
-              || (((byte1 << 28) + (byte2 - (byte) 0x90)) >> 30) != 0
-              // byte3 trailing-byte test
-              || UnsafeUtil.getByte(bytes, offset++) > (byte) 0xBF
-              // byte4 trailing-byte test
-              || UnsafeUtil.getByte(bytes, offset++) > (byte) 0xBF) {
-            return MALFORMED;
-          }
-        }
-      }
-    }
-
-    private static int partialIsValidUtf8(long address, int remaining) {
-      // Skip past ASCII characters as quickly as possible.
-      final int skipped = unsafeEstimateConsecutiveAscii(address, remaining);
-      address += skipped;
-      remaining -= skipped;
-
-      for (; ; ) {
-        // Optimize for interior runs of ASCII bytes.
-        // TODO(nathanmittler): Consider checking 8 bytes at a time after some threshold?
-        // Maybe after seeing a few in a row that are ASCII, go back to fast mode?
-        int byte1 = 0;
-        for (; remaining > 0 && (byte1 = UnsafeUtil.getByte(address++)) >= 0; --remaining) {}
-        if (remaining == 0) {
-          return COMPLETE;
-        }
-        remaining--;
-
-        if (byte1 < (byte) 0xE0) {
-          // Two-byte form
-
-          if (remaining == 0) {
-            // Incomplete sequence
-            return byte1;
-          }
-          remaining--;
-
-          // Simultaneously checks for illegal trailing-byte in
-          // leading position and overlong 2-byte form.
-          if (byte1 < (byte) 0xC2 || UnsafeUtil.getByte(address++) > (byte) 0xBF) {
-            return MALFORMED;
-          }
-        } else if (byte1 < (byte) 0xF0) {
-          // Three-byte form
-
-          if (remaining < 2) {
-            // Incomplete sequence
-            return unsafeIncompleteStateFor(address, byte1, remaining);
-          }
-          remaining -= 2;
-
-          final byte byte2 = UnsafeUtil.getByte(address++);
-          if (byte2 > (byte) 0xBF
-              // overlong? 5 most significant bits must not all be zero
-              || (byte1 == (byte) 0xE0 && byte2 < (byte) 0xA0)
-              // check for illegal surrogate codepoints
-              || (byte1 == (byte) 0xED && byte2 >= (byte) 0xA0)
-              // byte3 trailing-byte test
-              || UnsafeUtil.getByte(address++) > (byte) 0xBF) {
-            return MALFORMED;
-          }
-        } else {
-          // Four-byte form
-
-          if (remaining < 3) {
-            // Incomplete sequence
-            return unsafeIncompleteStateFor(address, byte1, remaining);
-          }
-          remaining -= 3;
-
-          final byte byte2 = UnsafeUtil.getByte(address++);
-          if (byte2 > (byte) 0xBF
-              // Check that 1 <= plane <= 16.  Tricky optimized form of:
-              // if (byte1 > (byte) 0xF4 ||
-              //     byte1 == (byte) 0xF0 && byte2 < (byte) 0x90 ||
-              //     byte1 == (byte) 0xF4 && byte2 > (byte) 0x8F)
-              || (((byte1 << 28) + (byte2 - (byte) 0x90)) >> 30) != 0
-              // byte3 trailing-byte test
-              || UnsafeUtil.getByte(address++) > (byte) 0xBF
-              // byte4 trailing-byte test
-              || UnsafeUtil.getByte(address++) > (byte) 0xBF) {
-            return MALFORMED;
-          }
-        }
-      }
-    }
-
-    private static int unsafeIncompleteStateFor(
-        byte[] bytes, int byte1, long offset, int remaining) {
-      switch (remaining) {
-        case 0:
-          return incompleteStateFor(byte1);
-        case 1:
-          return incompleteStateFor(byte1, UnsafeUtil.getByte(bytes, offset));
-        case 2:
-          return incompleteStateFor(
-              byte1, UnsafeUtil.getByte(bytes, offset), UnsafeUtil.getByte(bytes, offset + 1));
-        default:
-          throw new AssertionError();
-      }
-    }
-
-    private static int unsafeIncompleteStateFor(long address, final int byte1, int remaining) {
-      switch (remaining) {
-        case 0:
-          return incompleteStateFor(byte1);
-        case 1:
-          return incompleteStateFor(byte1, UnsafeUtil.getByte(address));
-        case 2:
-          return incompleteStateFor(
-              byte1, UnsafeUtil.getByte(address), UnsafeUtil.getByte(address + 1));
-        default:
-          throw new AssertionError();
-      }
-    }
-  }
-
-  /**
-   * Utility methods for decoding bytes into {@link String}. Callers are responsible for extracting
-   * bytes (possibly using Unsafe methods), and checking remaining bytes. All other UTF-8 validity
-   * checks and codepoint conversion happen in this class.
-   */
-  private static class DecodeUtil {
-
-    /** Returns whether this is a single-byte codepoint (i.e., ASCII) with the form '0XXXXXXX'. */
-    private static boolean isOneByte(byte b) {
-      return b >= 0;
-    }
-
-    /**
-     * Returns whether this is a two-byte codepoint with the form '10XXXXXX' iff
-     * {@link #isOneByte(byte)} is false. This private method works in the limited use in
-     * this class where this method is only called when {@link #isOneByte(byte)} has already
-     * returned false. It is not suitable for general or public use.
-     */
-    private static boolean isTwoBytes(byte b) {
-      return b < (byte) 0xE0;
-    }
-
-    /**
-     * Returns whether this is a three-byte codepoint with the form '110XXXXX' iff
-     * {@link #isOneByte(byte)} and {@link #isTwoBytes(byte)} are false.
-     * This private method works in the limited use in
-     * this class where this method is only called when {@link #isOneByte(byte)} an
-     * {@link #isTwoBytes(byte)} have already returned false. It is not suitable for general
-     * or public use.
-     */
-    private static boolean isThreeBytes(byte b) {
-      return b < (byte) 0xF0;
-    }
-
-    private static void handleOneByte(byte byte1, char[] resultArr, int resultPos) {
-      resultArr[resultPos] = (char) byte1;
-    }
-
-    private static void handleTwoBytes(byte byte1, byte byte2, char[] resultArr, int resultPos)
-        throws InvalidProtocolBufferException {
-      // Simultaneously checks for illegal trailing-byte in leading position (<= '11000000') and
-      // overlong 2-byte, '11000001'.
-      if (byte1 < (byte) 0xC2 || isNotTrailingByte(byte2)) {
-        throw InvalidProtocolBufferException.invalidUtf8();
-      }
-      resultArr[resultPos] = (char) (((byte1 & 0x1F) << 6) | trailingByteValue(byte2));
-    }
-
-    private static void handleThreeBytes(
-        byte byte1, byte byte2, byte byte3, char[] resultArr, int resultPos)
-        throws InvalidProtocolBufferException {
-      if (isNotTrailingByte(byte2)
-          // overlong? 5 most significant bits must not all be zero
-          || (byte1 == (byte) 0xE0 && byte2 < (byte) 0xA0)
-          // check for illegal surrogate codepoints
-          || (byte1 == (byte) 0xED && byte2 >= (byte) 0xA0)
-          || isNotTrailingByte(byte3)) {
-        throw InvalidProtocolBufferException.invalidUtf8();
-      }
-      resultArr[resultPos] =
-          (char)
-              (((byte1 & 0x0F) << 12) | (trailingByteValue(byte2) << 6) | trailingByteValue(byte3));
-    }
-
-    private static void handleFourBytes(
-        byte byte1, byte byte2, byte byte3, byte byte4, char[] resultArr, int resultPos)
-        throws InvalidProtocolBufferException {
-      if (isNotTrailingByte(byte2)
-          // Check that 1 <= plane <= 16.  Tricky optimized form of:
-          //   valid 4-byte leading byte?
-          // if (byte1 > (byte) 0xF4 ||
-          //   overlong? 4 most significant bits must not all be zero
-          //     byte1 == (byte) 0xF0 && byte2 < (byte) 0x90 ||
-          //   codepoint larger than the highest code point (U+10FFFF)?
-          //     byte1 == (byte) 0xF4 && byte2 > (byte) 0x8F)
-          || (((byte1 << 28) + (byte2 - (byte) 0x90)) >> 30) != 0
-          || isNotTrailingByte(byte3)
-          || isNotTrailingByte(byte4)) {
-        throw InvalidProtocolBufferException.invalidUtf8();
-      }
-      int codepoint =
-          ((byte1 & 0x07) << 18)
-              | (trailingByteValue(byte2) << 12)
-              | (trailingByteValue(byte3) << 6)
-              | trailingByteValue(byte4);
-      resultArr[resultPos] = DecodeUtil.highSurrogate(codepoint);
-      resultArr[resultPos + 1] = DecodeUtil.lowSurrogate(codepoint);
-    }
-
-    /** Returns whether the byte is not a valid continuation of the form '10XXXXXX'. */
-    private static boolean isNotTrailingByte(byte b) {
-      return b > (byte) 0xBF;
-    }
-
-    /** Returns the actual value of the trailing byte (removes the prefix '10') for composition. */
-    private static int trailingByteValue(byte b) {
-      return b & 0x3F;
-    }
-
-    private static char highSurrogate(int codePoint) {
-      return (char)
-          ((MIN_HIGH_SURROGATE - (MIN_SUPPLEMENTARY_CODE_POINT >>> 10)) + (codePoint >>> 10));
-    }
-
-    private static char lowSurrogate(int codePoint) {
-      return (char) (MIN_LOW_SURROGATE + (codePoint & 0x3ff));
-    }
-  }
-
-  private Utf8() {}
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/WireFormat.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/WireFormat.java
deleted file mode 100644
index 3c6e8dd..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/WireFormat.java
+++ /dev/null
@@ -1,271 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import java.io.IOException;
-
-/**
- * This class is used internally by the Protocol Buffer library and generated message
- * implementations. It is public only because those generated messages do not reside in the {@code
- * protobuf} package. Others should not use this class directly.
- *
- * <p>This class contains constants and helper functions useful for dealing with the Protocol Buffer
- * wire format.
- *
- * @author kenton@google.com Kenton Varda
- */
-public final class WireFormat {
-  // Do not allow instantiation.
-  private WireFormat() {}
-
-  static final int FIXED32_SIZE = 4;
-  static final int FIXED64_SIZE = 8;
-  static final int MAX_VARINT32_SIZE = 5;
-  static final int MAX_VARINT64_SIZE = 10;
-  static final int MAX_VARINT_SIZE = 10;
-
-  public static final int WIRETYPE_VARINT = 0;
-  public static final int WIRETYPE_FIXED64 = 1;
-  public static final int WIRETYPE_LENGTH_DELIMITED = 2;
-  public static final int WIRETYPE_START_GROUP = 3;
-  public static final int WIRETYPE_END_GROUP = 4;
-  public static final int WIRETYPE_FIXED32 = 5;
-
-  static final int TAG_TYPE_BITS = 3;
-  static final int TAG_TYPE_MASK = (1 << TAG_TYPE_BITS) - 1;
-
-  /** Given a tag value, determines the wire type (the lower 3 bits). */
-  public static int getTagWireType(final int tag) {
-    return tag & TAG_TYPE_MASK;
-  }
-
-  /** Given a tag value, determines the field number (the upper 29 bits). */
-  public static int getTagFieldNumber(final int tag) {
-    return tag >>> TAG_TYPE_BITS;
-  }
-
-  /** Makes a tag value given a field number and wire type. */
-  static int makeTag(final int fieldNumber, final int wireType) {
-    return (fieldNumber << TAG_TYPE_BITS) | wireType;
-  }
-
-  /**
-   * Lite equivalent to {@link Descriptors.FieldDescriptor.JavaType}. This is only here to support
-   * the lite runtime and should not be used by users.
-   */
-  public enum JavaType {
-    INT(0),
-    LONG(0L),
-    FLOAT(0F),
-    DOUBLE(0D),
-    BOOLEAN(false),
-    STRING(""),
-    BYTE_STRING(ByteString.EMPTY),
-    ENUM(null),
-    MESSAGE(null);
-
-    JavaType(final Object defaultDefault) {
-      this.defaultDefault = defaultDefault;
-    }
-
-    /** The default default value for fields of this type, if it's a primitive type. */
-    Object getDefaultDefault() {
-      return defaultDefault;
-    }
-
-    private final Object defaultDefault;
-  }
-
-  /**
-   * Lite equivalent to {@link Descriptors.FieldDescriptor.Type}. This is only here to support the
-   * lite runtime and should not be used by users.
-   */
-  public enum FieldType {
-    DOUBLE(JavaType.DOUBLE, WIRETYPE_FIXED64),
-    FLOAT(JavaType.FLOAT, WIRETYPE_FIXED32),
-    INT64(JavaType.LONG, WIRETYPE_VARINT),
-    UINT64(JavaType.LONG, WIRETYPE_VARINT),
-    INT32(JavaType.INT, WIRETYPE_VARINT),
-    FIXED64(JavaType.LONG, WIRETYPE_FIXED64),
-    FIXED32(JavaType.INT, WIRETYPE_FIXED32),
-    BOOL(JavaType.BOOLEAN, WIRETYPE_VARINT),
-    STRING(JavaType.STRING, WIRETYPE_LENGTH_DELIMITED) {
-      @Override
-      public boolean isPackable() {
-        return false;
-      }
-    },
-    GROUP(JavaType.MESSAGE, WIRETYPE_START_GROUP) {
-      @Override
-      public boolean isPackable() {
-        return false;
-      }
-    },
-    MESSAGE(JavaType.MESSAGE, WIRETYPE_LENGTH_DELIMITED) {
-      @Override
-      public boolean isPackable() {
-        return false;
-      }
-    },
-    BYTES(JavaType.BYTE_STRING, WIRETYPE_LENGTH_DELIMITED) {
-      @Override
-      public boolean isPackable() {
-        return false;
-      }
-    },
-    UINT32(JavaType.INT, WIRETYPE_VARINT),
-    ENUM(JavaType.ENUM, WIRETYPE_VARINT),
-    SFIXED32(JavaType.INT, WIRETYPE_FIXED32),
-    SFIXED64(JavaType.LONG, WIRETYPE_FIXED64),
-    SINT32(JavaType.INT, WIRETYPE_VARINT),
-    SINT64(JavaType.LONG, WIRETYPE_VARINT);
-
-    FieldType(final JavaType javaType, final int wireType) {
-      this.javaType = javaType;
-      this.wireType = wireType;
-    }
-
-    private final JavaType javaType;
-    private final int wireType;
-
-    public JavaType getJavaType() {
-      return javaType;
-    }
-
-    public int getWireType() {
-      return wireType;
-    }
-
-    public boolean isPackable() {
-      return true;
-    }
-  }
-
-  // Field numbers for fields in MessageSet wire format.
-  static final int MESSAGE_SET_ITEM = 1;
-  static final int MESSAGE_SET_TYPE_ID = 2;
-  static final int MESSAGE_SET_MESSAGE = 3;
-
-  // Tag numbers.
-  static final int MESSAGE_SET_ITEM_TAG = makeTag(MESSAGE_SET_ITEM, WIRETYPE_START_GROUP);
-  static final int MESSAGE_SET_ITEM_END_TAG = makeTag(MESSAGE_SET_ITEM, WIRETYPE_END_GROUP);
-  static final int MESSAGE_SET_TYPE_ID_TAG = makeTag(MESSAGE_SET_TYPE_ID, WIRETYPE_VARINT);
-  static final int MESSAGE_SET_MESSAGE_TAG =
-      makeTag(MESSAGE_SET_MESSAGE, WIRETYPE_LENGTH_DELIMITED);
-
-  /**
-   * Validation level for handling incoming string field data which potentially contain non-UTF8
-   * bytes.
-   */
-  enum Utf8Validation {
-    /** Eagerly parses to String; silently accepts invalid UTF8 bytes. */
-    LOOSE {
-      @Override
-      Object readString(CodedInputStream input) throws IOException {
-        return input.readString();
-      }
-    },
-    /** Eagerly parses to String; throws an IOException on invalid bytes. */
-    STRICT {
-      @Override
-      Object readString(CodedInputStream input) throws IOException {
-        return input.readStringRequireUtf8();
-      }
-    },
-    /** Keep data as ByteString; validation/conversion to String is lazy. */
-    LAZY {
-      @Override
-      Object readString(CodedInputStream input) throws IOException {
-        return input.readBytes();
-      }
-    };
-
-    /** Read a string field from the input with the proper UTF8 validation. */
-    abstract Object readString(CodedInputStream input) throws IOException;
-  }
-
-  /**
-   * Read a field of any primitive type for immutable messages from a CodedInputStream. Enums,
-   * groups, and embedded messages are not handled by this method.
-   *
-   * @param input The stream from which to read.
-   * @param type Declared type of the field.
-   * @param utf8Validation Different string UTF8 validation level for handling string fields.
-   * @return An object representing the field's value, of the exact type which would be returned by
-   *     {@link Message#getField(Descriptors.FieldDescriptor)} for this field.
-   */
-  static Object readPrimitiveField(
-      CodedInputStream input, FieldType type, Utf8Validation utf8Validation) throws IOException {
-    switch (type) {
-      case DOUBLE:
-        return input.readDouble();
-      case FLOAT:
-        return input.readFloat();
-      case INT64:
-        return input.readInt64();
-      case UINT64:
-        return input.readUInt64();
-      case INT32:
-        return input.readInt32();
-      case FIXED64:
-        return input.readFixed64();
-      case FIXED32:
-        return input.readFixed32();
-      case BOOL:
-        return input.readBool();
-      case BYTES:
-        return input.readBytes();
-      case UINT32:
-        return input.readUInt32();
-      case SFIXED32:
-        return input.readSFixed32();
-      case SFIXED64:
-        return input.readSFixed64();
-      case SINT32:
-        return input.readSInt32();
-      case SINT64:
-        return input.readSInt64();
-
-      case STRING:
-        return utf8Validation.readString(input);
-      case GROUP:
-        throw new IllegalArgumentException("readPrimitiveField() cannot handle nested groups.");
-      case MESSAGE:
-        throw new IllegalArgumentException("readPrimitiveField() cannot handle embedded messages.");
-      case ENUM:
-        // We don't handle enums because we don't know what to do if the
-        // value is not recognized.
-        throw new IllegalArgumentException("readPrimitiveField() cannot handle enums.");
-    }
-
-    throw new RuntimeException("There is no way to get here, but the compiler thinks otherwise.");
-  }
-}
diff --git a/libs/protobuf/java/core/src/main/java/com/google/protobuf/Writer.java b/libs/protobuf/java/core/src/main/java/com/google/protobuf/Writer.java
deleted file mode 100644
index 3550058..0000000
--- a/libs/protobuf/java/core/src/main/java/com/google/protobuf/Writer.java
+++ /dev/null
@@ -1,220 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import java.io.IOException;
-import java.util.List;
-import java.util.Map;
-
-/** A writer that performs serialization of protobuf message fields. */
-@ExperimentalApi
-@CheckReturnValue
-interface Writer {
-
-  /** The order in which the fields are written by a {@link Writer}. */
-  enum FieldOrder {
-    /** Fields are written in ascending order by field number. */
-    ASCENDING,
-
-    /** Fields are written in descending order by field number. */
-    DESCENDING
-  }
-
-  /** Indicates the order in which the fields are written by this {@link Writer}. */
-  FieldOrder fieldOrder();
-
-  /** Writes a field of type {@link FieldType#SFIXED32}. */
-  void writeSFixed32(int fieldNumber, int value) throws IOException;
-
-  /** Writes a field of type {@link FieldType#INT64}. */
-  void writeInt64(int fieldNumber, long value) throws IOException;
-
-  /** Writes a field of type {@link FieldType#SFIXED64}. */
-  void writeSFixed64(int fieldNumber, long value) throws IOException;
-
-  /** Writes a field of type {@link FieldType#FLOAT}. */
-  void writeFloat(int fieldNumber, float value) throws IOException;
-
-  /** Writes a field of type {@link FieldType#DOUBLE}. */
-  void writeDouble(int fieldNumber, double value) throws IOException;
-
-  /** Writes a field of type {@link FieldType#ENUM}. */
-  void writeEnum(int fieldNumber, int value) throws IOException;
-
-  /** Writes a field of type {@link FieldType#UINT64}. */
-  void writeUInt64(int fieldNumber, long value) throws IOException;
-
-  /** Writes a field of type {@link FieldType#INT32}. */
-  void writeInt32(int fieldNumber, int value) throws IOException;
-
-  /** Writes a field of type {@link FieldType#FIXED64}. */
-  void writeFixed64(int fieldNumber, long value) throws IOException;
-
-  /** Writes a field of type {@link FieldType#FIXED32}. */
-  void writeFixed32(int fieldNumber, int value) throws IOException;
-
-  /** Writes a field of type {@link FieldType#BOOL}. */
-  void writeBool(int fieldNumber, boolean value) throws IOException;
-
-  /** Writes a field of type {@link FieldType#STRING}. */
-  void writeString(int fieldNumber, String value) throws IOException;
-
-  /** Writes a field of type {@link FieldType#BYTES}. */
-  void writeBytes(int fieldNumber, ByteString value) throws IOException;
-
-  /** Writes a field of type {@link FieldType#UINT32}. */
-  void writeUInt32(int fieldNumber, int value) throws IOException;
-
-  /** Writes a field of type {@link FieldType#SINT32}. */
-  void writeSInt32(int fieldNumber, int value) throws IOException;
-
-  /** Writes a field of type {@link FieldType#SINT64}. */
-  void writeSInt64(int fieldNumber, long value) throws IOException;
-
-  /** Writes a field of type {@link FieldType#MESSAGE}. */
-  void writeMessage(int fieldNumber, Object value) throws IOException;
-
-  /** Writes a field of type {@link FieldType#MESSAGE}. */
-  void writeMessage(int fieldNumber, Object value, Schema schema) throws IOException;
-
-  /**
-   * Writes a field of type {@link FieldType#GROUP}.
-   *
-   * @deprecated groups fields are deprecated.
-   */
-  @Deprecated
-  void writeGroup(int fieldNumber, Object value) throws IOException;
-
-  /**
-   * Writes a field of type {@link FieldType#GROUP}.
-   *
-   * @deprecated groups fields are deprecated.
-   */
-  @Deprecated
-  void writeGroup(int fieldNumber, Object value, Schema schema) throws IOException;
-
-  /**
-   * Writes a single start group tag.
-   *
-   * @deprecated groups fields are deprecated.
-   */
-  @Deprecated
-  void writeStartGroup(int fieldNumber) throws IOException;
-
-  /**
-   * Writes a single end group tag.
-   *
-   * @deprecated groups fields are deprecated.
-   */
-  @Deprecated
-  void writeEndGroup(int fieldNumber) throws IOException;
-
-  /** Writes a list field of type {@link FieldType#INT32}. */
-  void writeInt32List(int fieldNumber, List<Integer> value, boolean packed) throws IOException;
-
-  /** Writes a list field of type {@link FieldType#FIXED32}. */
-  void writeFixed32List(int fieldNumber, List<Integer> value, boolean packed) throws IOException;
-
-  /** Writes a list field of type {@link FieldType#INT64}. */
-  void writeInt64List(int fieldNumber, List<Long> value, boolean packed) throws IOException;
-
-  /** Writes a list field of type {@link FieldType#UINT64}. */
-  void writeUInt64List(int fieldNumber, List<Long> value, boolean packed) throws IOException;
-
-  /** Writes a list field of type {@link FieldType#FIXED64}. */
-  void writeFixed64List(int fieldNumber, List<Long> value, boolean packed) throws IOException;
-
-  /** Writes a list field of type {@link FieldType#FLOAT}. */
-  void writeFloatList(int fieldNumber, List<Float> value, boolean packed) throws IOException;
-
-  /** Writes a list field of type {@link FieldType#DOUBLE}. */
-  void writeDoubleList(int fieldNumber, List<Double> value, boolean packed) throws IOException;
-
-  /** Writes a list field of type {@link FieldType#ENUM}. */
-  void writeEnumList(int fieldNumber, List<Integer> value, boolean packed) throws IOException;
-
-  /** Writes a list field of type {@link FieldType#BOOL}. */
-  void writeBoolList(int fieldNumber, List<Boolean> value, boolean packed) throws IOException;
-
-  /** Writes a list field of type {@link FieldType#STRING}. */
-  void writeStringList(int fieldNumber, List<String> value) throws IOException;
-
-  /** Writes a list field of type {@link FieldType#BYTES}. */
-  void writeBytesList(int fieldNumber, List<ByteString> value) throws IOException;
-
-  /** Writes a list field of type {@link FieldType#UINT32}. */
-  void writeUInt32List(int fieldNumber, List<Integer> value, boolean packed) throws IOException;
-
-  /** Writes a list field of type {@link FieldType#SFIXED32}. */
-  void writeSFixed32List(int fieldNumber, List<Integer> value, boolean packed) throws IOException;
-
-  /** Writes a list field of type {@link FieldType#SFIXED64}. */
-  void writeSFixed64List(int fieldNumber, List<Long> value, boolean packed) throws IOException;
-
-  /** Writes a list field of type {@link FieldType#SINT32}. */
-  void writeSInt32List(int fieldNumber, List<Integer> value, boolean packed) throws IOException;
-
-  /** Writes a list field of type {@link FieldType#SINT64}. */
-  void writeSInt64List(int fieldNumber, List<Long> value, boolean packed) throws IOException;
-
-  /** Writes a list field of type {@link FieldType#MESSAGE}. */
-  void writeMessageList(int fieldNumber, List<?> value) throws IOException;
-
-  /** Writes a list field of type {@link FieldType#MESSAGE}. */
-  void writeMessageList(int fieldNumber, List<?> value, Schema schema) throws IOException;
-
-  /**
-   * Writes a list field of type {@link FieldType#GROUP}.
-   *
-   * @deprecated groups fields are deprecated.
-   */
-  @Deprecated
-  void writeGroupList(int fieldNumber, List<?> value) throws IOException;
-
-  /**
-   * Writes a list field of type {@link FieldType#GROUP}.
-   *
-   * @deprecated groups fields are deprecated.
-   */
-  @Deprecated
-  void writeGroupList(int fieldNumber, List<?> value, Schema schema) throws IOException;
-
-  /**
-   * Writes a message field in {@code MessageSet} wire-format.
-   *
-   * @param value A message instance or an opaque {@link ByteString} for an unknown field.
-   */
-  void writeMessageSetItem(int fieldNumber, Object value) throws IOException;
-
-  /** Writes a map field. */
-  <K, V> void writeMap(int fieldNumber, MapEntryLite.Metadata<K, V> metadata, Map<K, V> map)
-      throws IOException;
-}
diff --git a/libs/protobuf/java/core/src/test/java/com/google/protobuf/AbstractMessageTest.java b/libs/protobuf/java/core/src/test/java/com/google/protobuf/AbstractMessageTest.java
deleted file mode 100644
index 5588b06..0000000
--- a/libs/protobuf/java/core/src/test/java/com/google/protobuf/AbstractMessageTest.java
+++ /dev/null
@@ -1,602 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.common.truth.Truth.assertThat;
-import static com.google.common.truth.Truth.assertWithMessage;
-import static com.google.protobuf.TestUtil.TEST_REQUIRED_INITIALIZED;
-import static com.google.protobuf.TestUtil.TEST_REQUIRED_UNINITIALIZED;
-
-import com.google.protobuf.Descriptors.FieldDescriptor;
-import protobuf_unittest.UnittestOptimizeFor.TestOptimizedForSize;
-import protobuf_unittest.UnittestProto;
-import protobuf_unittest.UnittestProto.ForeignMessage;
-import protobuf_unittest.UnittestProto.TestAllExtensions;
-import protobuf_unittest.UnittestProto.TestAllTypes;
-import protobuf_unittest.UnittestProto.TestPackedTypes;
-import protobuf_unittest.UnittestProto.TestRequired;
-import protobuf_unittest.UnittestProto.TestRequiredForeign;
-import protobuf_unittest.UnittestProto.TestUnpackedTypes;
-import java.util.Map;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-/** Unit test for {@link AbstractMessage}. */
-@RunWith(JUnit4.class)
-public class AbstractMessageTest {
-  /**
-   * Extends AbstractMessage and wraps some other message object. The methods of the Message
-   * interface which aren't explicitly implemented by AbstractMessage are forwarded to the wrapped
-   * object. This allows us to test that AbstractMessage's implementations work even if the wrapped
-   * object does not use them.
-   */
-  private static class AbstractMessageWrapper extends AbstractMessage {
-    private final Message wrappedMessage;
-
-    public AbstractMessageWrapper(Message wrappedMessage) {
-      this.wrappedMessage = wrappedMessage;
-    }
-
-    @Override
-    public Descriptors.Descriptor getDescriptorForType() {
-      return wrappedMessage.getDescriptorForType();
-    }
-
-    @Override
-    public AbstractMessageWrapper getDefaultInstanceForType() {
-      return new AbstractMessageWrapper(wrappedMessage.getDefaultInstanceForType());
-    }
-
-    @Override
-    public Map<Descriptors.FieldDescriptor, Object> getAllFields() {
-      return wrappedMessage.getAllFields();
-    }
-
-    @Override
-    public boolean hasField(Descriptors.FieldDescriptor field) {
-      return wrappedMessage.hasField(field);
-    }
-
-    @Override
-    public Object getField(Descriptors.FieldDescriptor field) {
-      return wrappedMessage.getField(field);
-    }
-
-    @Override
-    public int getRepeatedFieldCount(Descriptors.FieldDescriptor field) {
-      return wrappedMessage.getRepeatedFieldCount(field);
-    }
-
-    @Override
-    public Object getRepeatedField(Descriptors.FieldDescriptor field, int index) {
-      return wrappedMessage.getRepeatedField(field, index);
-    }
-
-    @Override
-    public UnknownFieldSet getUnknownFields() {
-      return wrappedMessage.getUnknownFields();
-    }
-
-    @Override
-    public Builder newBuilderForType() {
-      return new Builder(wrappedMessage.newBuilderForType());
-    }
-
-    @Override
-    public Builder toBuilder() {
-      return new Builder(wrappedMessage.toBuilder());
-    }
-
-    static class Builder extends AbstractMessage.Builder<Builder> {
-      private final Message.Builder wrappedBuilder;
-
-      public Builder(Message.Builder wrappedBuilder) {
-        this.wrappedBuilder = wrappedBuilder;
-      }
-
-      @Override
-      public AbstractMessageWrapper build() {
-        return new AbstractMessageWrapper(wrappedBuilder.build());
-      }
-
-      @Override
-      public AbstractMessageWrapper buildPartial() {
-        return new AbstractMessageWrapper(wrappedBuilder.buildPartial());
-      }
-
-      @Override
-      public Builder clone() {
-        return new Builder(wrappedBuilder.clone());
-      }
-
-      @Override
-      public boolean isInitialized() {
-        return clone().buildPartial().isInitialized();
-      }
-
-      @Override
-      public Descriptors.Descriptor getDescriptorForType() {
-        return wrappedBuilder.getDescriptorForType();
-      }
-
-      @Override
-      public AbstractMessageWrapper getDefaultInstanceForType() {
-        return new AbstractMessageWrapper(wrappedBuilder.getDefaultInstanceForType());
-      }
-
-      @Override
-      public Map<Descriptors.FieldDescriptor, Object> getAllFields() {
-        return wrappedBuilder.getAllFields();
-      }
-
-      @Override
-      public Builder newBuilderForField(Descriptors.FieldDescriptor field) {
-        return new Builder(wrappedBuilder.newBuilderForField(field));
-      }
-
-      @Override
-      public boolean hasField(Descriptors.FieldDescriptor field) {
-        return wrappedBuilder.hasField(field);
-      }
-
-      @Override
-      public Object getField(Descriptors.FieldDescriptor field) {
-        return wrappedBuilder.getField(field);
-      }
-
-      @Override
-      public Builder setField(Descriptors.FieldDescriptor field, Object value) {
-        wrappedBuilder.setField(field, value);
-        return this;
-      }
-
-      @Override
-      public Builder clearField(Descriptors.FieldDescriptor field) {
-        wrappedBuilder.clearField(field);
-        return this;
-      }
-
-      @Override
-      public int getRepeatedFieldCount(Descriptors.FieldDescriptor field) {
-        return wrappedBuilder.getRepeatedFieldCount(field);
-      }
-
-      @Override
-      public Object getRepeatedField(Descriptors.FieldDescriptor field, int index) {
-        return wrappedBuilder.getRepeatedField(field, index);
-      }
-
-      @Override
-      public Builder setRepeatedField(Descriptors.FieldDescriptor field, int index, Object value) {
-        wrappedBuilder.setRepeatedField(field, index, value);
-        return this;
-      }
-
-      @Override
-      public Builder addRepeatedField(Descriptors.FieldDescriptor field, Object value) {
-        wrappedBuilder.addRepeatedField(field, value);
-        return this;
-      }
-
-      @Override
-      public UnknownFieldSet getUnknownFields() {
-        return wrappedBuilder.getUnknownFields();
-      }
-
-      @Override
-      public Builder setUnknownFields(UnknownFieldSet unknownFields) {
-        wrappedBuilder.setUnknownFields(unknownFields);
-        return this;
-      }
-
-      @Override
-      public Message.Builder getFieldBuilder(FieldDescriptor field) {
-        return wrappedBuilder.getFieldBuilder(field);
-      }
-    }
-
-    @Override
-    public Parser<? extends Message> getParserForType() {
-      return wrappedMessage.getParserForType();
-    }
-  }
-
-  // =================================================================
-
-  TestUtil.ReflectionTester reflectionTester =
-      new TestUtil.ReflectionTester(TestAllTypes.getDescriptor(), null);
-
-  TestUtil.ReflectionTester extensionsReflectionTester =
-      new TestUtil.ReflectionTester(
-          TestAllExtensions.getDescriptor(), TestUtil.getFullExtensionRegistry());
-
-  @Test
-  public void testClear() throws Exception {
-    AbstractMessageWrapper message =
-        new AbstractMessageWrapper.Builder(TestAllTypes.newBuilder(TestUtil.getAllSet()))
-            .clear()
-            .build();
-    TestUtil.assertClear((TestAllTypes) message.wrappedMessage);
-  }
-
-  @Test
-  public void testCopy() throws Exception {
-    AbstractMessageWrapper message =
-        new AbstractMessageWrapper.Builder(TestAllTypes.newBuilder())
-            .mergeFrom(TestUtil.getAllSet())
-            .build();
-    TestUtil.assertAllFieldsSet((TestAllTypes) message.wrappedMessage);
-  }
-
-  @Test
-  public void testSerializedSize() throws Exception {
-    TestAllTypes message = TestUtil.getAllSet();
-    Message abstractMessage = new AbstractMessageWrapper(TestUtil.getAllSet());
-    assertThat(message.getSerializedSize()).isEqualTo(abstractMessage.getSerializedSize());
-  }
-
-  @Test
-  public void testSerialization() throws Exception {
-    Message abstractMessage = new AbstractMessageWrapper(TestUtil.getAllSet());
-    TestUtil.assertAllFieldsSet(
-        TestAllTypes.parseFrom(
-            abstractMessage.toByteString(), ExtensionRegistryLite.getEmptyRegistry()));
-    assertThat(TestUtil.getAllSet().toByteString()).isEqualTo(abstractMessage.toByteString());
-  }
-
-  @Test
-  public void testParsing() throws Exception {
-    AbstractMessageWrapper.Builder builder =
-        new AbstractMessageWrapper.Builder(TestAllTypes.newBuilder());
-    AbstractMessageWrapper message =
-        builder
-            .mergeFrom(
-                TestUtil.getAllSet().toByteString(), ExtensionRegistryLite.getEmptyRegistry())
-            .build();
-    TestUtil.assertAllFieldsSet((TestAllTypes) message.wrappedMessage);
-  }
-
-  @Test
-  public void testParsingUninitialized() throws Exception {
-    TestRequiredForeign.Builder builder = TestRequiredForeign.newBuilder();
-    builder.getOptionalMessageBuilder().setDummy2(10);
-    ByteString bytes = builder.buildPartial().toByteString();
-    Message.Builder abstractMessageBuilder =
-        new AbstractMessageWrapper.Builder(TestRequiredForeign.newBuilder());
-    // mergeFrom() should not throw initialization error.
-    Message unused1 =
-        abstractMessageBuilder
-            .mergeFrom(bytes, ExtensionRegistryLite.getEmptyRegistry())
-            .buildPartial();
-    try {
-      abstractMessageBuilder.mergeFrom(bytes, ExtensionRegistryLite.getEmptyRegistry()).build();
-      assertWithMessage("shouldn't pass").fail();
-    } catch (UninitializedMessageException ex) {
-      // pass
-    }
-
-    // test DynamicMessage directly.
-    Message.Builder dynamicMessageBuilder =
-        DynamicMessage.newBuilder(TestRequiredForeign.getDescriptor());
-    // mergeFrom() should not throw initialization error.
-    Message unused2 =
-        dynamicMessageBuilder
-            .mergeFrom(bytes, ExtensionRegistryLite.getEmptyRegistry())
-            .buildPartial();
-    try {
-      dynamicMessageBuilder.mergeFrom(bytes, ExtensionRegistryLite.getEmptyRegistry()).build();
-      assertWithMessage("shouldn't pass").fail();
-    } catch (UninitializedMessageException ex) {
-      // pass
-    }
-  }
-
-  @Test
-  public void testPackedSerialization() throws Exception {
-    Message abstractMessage = new AbstractMessageWrapper(TestUtil.getPackedSet());
-    TestUtil.assertPackedFieldsSet(
-        TestPackedTypes.parseFrom(
-            abstractMessage.toByteString(), ExtensionRegistryLite.getEmptyRegistry()));
-    assertThat(TestUtil.getPackedSet().toByteString()).isEqualTo(abstractMessage.toByteString());
-  }
-
-  @Test
-  public void testPackedParsing() throws Exception {
-    AbstractMessageWrapper.Builder builder =
-        new AbstractMessageWrapper.Builder(TestPackedTypes.newBuilder());
-    AbstractMessageWrapper message =
-        builder
-            .mergeFrom(
-                TestUtil.getPackedSet().toByteString(), ExtensionRegistryLite.getEmptyRegistry())
-            .build();
-    TestUtil.assertPackedFieldsSet((TestPackedTypes) message.wrappedMessage);
-  }
-
-  @Test
-  public void testUnpackedSerialization() throws Exception {
-    Message abstractMessage = new AbstractMessageWrapper(TestUtil.getUnpackedSet());
-    TestUtil.assertUnpackedFieldsSet(
-        TestUnpackedTypes.parseFrom(
-            abstractMessage.toByteString(), ExtensionRegistryLite.getEmptyRegistry()));
-    assertThat(TestUtil.getUnpackedSet().toByteString()).isEqualTo(abstractMessage.toByteString());
-  }
-
-  @Test
-  public void testParsePackedToUnpacked() throws Exception {
-    AbstractMessageWrapper.Builder builder =
-        new AbstractMessageWrapper.Builder(TestUnpackedTypes.newBuilder());
-    AbstractMessageWrapper message =
-        builder
-            .mergeFrom(
-                TestUtil.getPackedSet().toByteString(), ExtensionRegistryLite.getEmptyRegistry())
-            .build();
-    TestUtil.assertUnpackedFieldsSet((TestUnpackedTypes) message.wrappedMessage);
-  }
-
-  @Test
-  public void testParseUnpackedToPacked() throws Exception {
-    AbstractMessageWrapper.Builder builder =
-        new AbstractMessageWrapper.Builder(TestPackedTypes.newBuilder());
-    AbstractMessageWrapper message =
-        builder
-            .mergeFrom(
-                TestUtil.getUnpackedSet().toByteString(), ExtensionRegistryLite.getEmptyRegistry())
-            .build();
-    TestUtil.assertPackedFieldsSet((TestPackedTypes) message.wrappedMessage);
-  }
-
-  @Test
-  public void testUnpackedParsing() throws Exception {
-    AbstractMessageWrapper.Builder builder =
-        new AbstractMessageWrapper.Builder(TestUnpackedTypes.newBuilder());
-    AbstractMessageWrapper message =
-        builder
-            .mergeFrom(
-                TestUtil.getUnpackedSet().toByteString(), ExtensionRegistryLite.getEmptyRegistry())
-            .build();
-    TestUtil.assertUnpackedFieldsSet((TestUnpackedTypes) message.wrappedMessage);
-  }
-
-  @Test
-  public void testOptimizedForSize() throws Exception {
-    // We're mostly only checking that this class was compiled successfully.
-    TestOptimizedForSize message = TestOptimizedForSize.newBuilder().setI(1).build();
-    message =
-        TestOptimizedForSize.parseFrom(
-            message.toByteString(), ExtensionRegistryLite.getEmptyRegistry());
-    assertThat(message.getSerializedSize()).isEqualTo(2);
-  }
-
-  // -----------------------------------------------------------------
-  // Tests for isInitialized().
-
-  @Test
-  public void testIsInitialized() throws Exception {
-    TestRequired.Builder builder = TestRequired.newBuilder();
-    AbstractMessageWrapper.Builder abstractBuilder = new AbstractMessageWrapper.Builder(builder);
-
-    assertThat(abstractBuilder.isInitialized()).isFalse();
-    assertThat(abstractBuilder.getInitializationErrorString()).isEqualTo("a, b, c");
-    builder.setA(1);
-    assertThat(abstractBuilder.isInitialized()).isFalse();
-    assertThat(abstractBuilder.getInitializationErrorString()).isEqualTo("b, c");
-    builder.setB(1);
-    assertThat(abstractBuilder.isInitialized()).isFalse();
-    assertThat(abstractBuilder.getInitializationErrorString()).isEqualTo("c");
-    builder.setC(1);
-    assertThat(abstractBuilder.isInitialized()).isTrue();
-    assertThat(abstractBuilder.getInitializationErrorString()).isEmpty();
-  }
-
-  @Test
-  public void testForeignIsInitialized() throws Exception {
-    TestRequiredForeign.Builder builder = TestRequiredForeign.newBuilder();
-    AbstractMessageWrapper.Builder abstractBuilder = new AbstractMessageWrapper.Builder(builder);
-
-    assertThat(abstractBuilder.isInitialized()).isTrue();
-    assertThat(abstractBuilder.getInitializationErrorString()).isEmpty();
-
-    builder.setOptionalMessage(TEST_REQUIRED_UNINITIALIZED);
-    assertThat(abstractBuilder.isInitialized()).isFalse();
-    assertThat(abstractBuilder.getInitializationErrorString())
-        .isEqualTo("optional_message.b, optional_message.c");
-
-    builder.setOptionalMessage(TEST_REQUIRED_INITIALIZED);
-    assertThat(abstractBuilder.isInitialized()).isTrue();
-    assertThat(abstractBuilder.getInitializationErrorString()).isEmpty();
-
-    builder.addRepeatedMessage(TEST_REQUIRED_UNINITIALIZED);
-    assertThat(abstractBuilder.isInitialized()).isFalse();
-    assertThat(abstractBuilder.getInitializationErrorString())
-        .isEqualTo("repeated_message[0].b, repeated_message[0].c");
-
-    builder.setRepeatedMessage(0, TEST_REQUIRED_INITIALIZED);
-    assertThat(abstractBuilder.isInitialized()).isTrue();
-    assertThat(abstractBuilder.getInitializationErrorString()).isEmpty();
-  }
-
-  // -----------------------------------------------------------------
-  // Tests for mergeFrom
-
-  static final TestAllTypes MERGE_SOURCE =
-      TestAllTypes.newBuilder()
-          .setOptionalInt32(1)
-          .setOptionalString("foo")
-          .setOptionalForeignMessage(ForeignMessage.getDefaultInstance())
-          .addRepeatedString("bar")
-          .build();
-
-  static final TestAllTypes MERGE_DEST =
-      TestAllTypes.newBuilder()
-          .setOptionalInt64(2)
-          .setOptionalString("baz")
-          .setOptionalForeignMessage(ForeignMessage.newBuilder().setC(3).build())
-          .addRepeatedString("qux")
-          .build();
-
-  static final String MERGE_RESULT_TEXT =
-      ""
-          + "optional_int32: 1\n"
-          + "optional_int64: 2\n"
-          + "optional_string: \"foo\"\n"
-          + "optional_foreign_message {\n"
-          + "  c: 3\n"
-          + "}\n"
-          + "repeated_string: \"qux\"\n"
-          + "repeated_string: \"bar\"\n";
-
-  @Test
-  public void testMergeFrom() throws Exception {
-    AbstractMessageWrapper result =
-        new AbstractMessageWrapper.Builder(TestAllTypes.newBuilder(MERGE_DEST))
-            .mergeFrom(MERGE_SOURCE)
-            .build();
-
-    assertThat(result.toString()).isEqualTo(MERGE_RESULT_TEXT);
-  }
-
-  // -----------------------------------------------------------------
-  // Tests for equals and hashCode
-
-  @Test
-  public void testEqualsAndHashCode() throws Exception {
-    TestAllTypes a = TestUtil.getAllSet();
-    TestAllTypes b = TestAllTypes.getDefaultInstance();
-    TestAllTypes c = TestAllTypes.newBuilder(b).addRepeatedString("x").build();
-    TestAllTypes d = TestAllTypes.newBuilder(c).addRepeatedString("y").build();
-    TestAllExtensions e = TestUtil.getAllExtensionsSet();
-    TestAllExtensions f =
-        TestAllExtensions.newBuilder(e)
-            .addExtension(UnittestProto.repeatedInt32Extension, 999)
-            .build();
-
-    checkEqualsIsConsistent(a);
-    checkEqualsIsConsistent(b);
-    checkEqualsIsConsistent(c);
-    checkEqualsIsConsistent(d);
-    checkEqualsIsConsistent(e);
-    checkEqualsIsConsistent(f);
-
-    checkNotEqual(a, b);
-    checkNotEqual(a, c);
-    checkNotEqual(a, d);
-    checkNotEqual(a, e);
-    checkNotEqual(a, f);
-
-    checkNotEqual(b, c);
-    checkNotEqual(b, d);
-    checkNotEqual(b, e);
-    checkNotEqual(b, f);
-
-    checkNotEqual(c, d);
-    checkNotEqual(c, e);
-    checkNotEqual(c, f);
-
-    checkNotEqual(d, e);
-    checkNotEqual(d, f);
-
-    checkNotEqual(e, f);
-
-    // Deserializing into the TestEmptyMessage such that every field
-    // is an {@link UnknownFieldSet.Field}.
-    UnittestProto.TestEmptyMessage eUnknownFields =
-        UnittestProto.TestEmptyMessage.parseFrom(
-            e.toByteArray(), ExtensionRegistryLite.getEmptyRegistry());
-    UnittestProto.TestEmptyMessage fUnknownFields =
-        UnittestProto.TestEmptyMessage.parseFrom(
-            f.toByteArray(), ExtensionRegistryLite.getEmptyRegistry());
-    checkNotEqual(eUnknownFields, fUnknownFields);
-    checkEqualsIsConsistent(eUnknownFields);
-    checkEqualsIsConsistent(fUnknownFields);
-
-    // Subsequent reconstitutions should be identical
-    UnittestProto.TestEmptyMessage eUnknownFields2 =
-        UnittestProto.TestEmptyMessage.parseFrom(
-            e.toByteArray(), ExtensionRegistryLite.getEmptyRegistry());
-    checkEqualsIsConsistent(eUnknownFields, eUnknownFields2);
-  }
-
-  /** Asserts that the given proto has symmetric equals and hashCode methods. */
-  private void checkEqualsIsConsistent(Message message) {
-    // Test equals explicitly.
-    assertThat(message.equals(message)).isTrue();
-
-    // Object should be equal to a dynamic copy of itself.
-    DynamicMessage dynamic = DynamicMessage.newBuilder(message).build();
-    checkEqualsIsConsistent(message, dynamic);
-  }
-
-  /** Asserts that the given protos are equal and have the same hash code. */
-  private void checkEqualsIsConsistent(Message message1, Message message2) {
-    assertThat(message1).isEqualTo(message2);
-    assertThat(message2).isEqualTo(message1);
-    assertThat(message2.hashCode()).isEqualTo(message1.hashCode());
-  }
-
-  /**
-   * Asserts that the given protos are not equal and have different hash codes.
-   *
-   * <p><b>Note:</b> It's valid for non-equal objects to have the same hash code, so this test is
-   * stricter than it needs to be. However, this should happen relatively rarely.
-   */
-  private void checkNotEqual(Message m1, Message m2) {
-    String equalsError = String.format("%s should not be equal to %s", m1, m2);
-    assertWithMessage(equalsError).that(m1.equals(m2)).isFalse();
-    assertWithMessage(equalsError).that(m2.equals(m1)).isFalse();
-
-    assertWithMessage(String.format("%s should have a different hash code from %s", m1, m2))
-        .that(m1.hashCode())
-        .isNotEqualTo(m2.hashCode());
-  }
-
-  @Test
-  public void testCheckByteStringIsUtf8OnUtf8() {
-    ByteString byteString = ByteString.copyFromUtf8("some text");
-    AbstractMessageLite.checkByteStringIsUtf8(byteString);
-    // No exception thrown.
-  }
-
-  @Test
-  public void testCheckByteStringIsUtf8OnNonUtf8() {
-    ByteString byteString =
-        ByteString.copyFrom(new byte[] {(byte) 0x80}); // A lone continuation byte.
-    try {
-      AbstractMessageLite.checkByteStringIsUtf8(byteString);
-      assertWithMessage(
-              "Expected AbstractMessageLite.checkByteStringIsUtf8 to throw"
-                  + " IllegalArgumentException")
-          .fail();
-    } catch (IllegalArgumentException exception) {
-      assertThat(exception).hasMessageThat().isEqualTo("Byte string is not UTF-8.");
-    }
-  }
-}
diff --git a/libs/protobuf/java/core/src/test/java/com/google/protobuf/AbstractProto2LiteSchemaTest.java b/libs/protobuf/java/core/src/test/java/com/google/protobuf/AbstractProto2LiteSchemaTest.java
deleted file mode 100644
index 7eb0ace..0000000
--- a/libs/protobuf/java/core/src/test/java/com/google/protobuf/AbstractProto2LiteSchemaTest.java
+++ /dev/null
@@ -1,200 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.common.truth.Truth.assertThat;
-import static com.google.common.truth.Truth.assertWithMessage;
-
-import com.google.protobuf.testing.Proto2TestingLite.Proto2EmptyLite;
-import com.google.protobuf.testing.Proto2TestingLite.Proto2MessageLite;
-import com.google.protobuf.testing.Proto2TestingLite.Proto2MessageLite.TestEnum;
-import com.google.protobuf.testing.Proto2TestingLite.Proto2MessageLiteWithMaps;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.util.List;
-import org.junit.Test;
-
-/** Base class for tests using {@link Proto2MessageLite}. */
-public abstract class AbstractProto2LiteSchemaTest extends AbstractSchemaTest<Proto2MessageLite> {
-
-  @Override
-  protected Proto2MessageLiteFactory messageFactory() {
-    return new Proto2MessageLiteFactory(10, 20, 2, 2);
-  }
-
-  @Test
-  public void mergeOptionalMessageFields() throws Exception {
-    Proto2MessageLite message1 =
-        newBuilder()
-            .setFieldMessage10(newBuilder().setFieldInt643(123).clearFieldInt325().build())
-            .build();
-    Proto2MessageLite message2 =
-        newBuilder()
-            .setFieldMessage10(newBuilder().clearFieldInt643().setFieldInt325(456).build())
-            .build();
-    Proto2MessageLite message3 =
-        newBuilder()
-            .setFieldMessage10(newBuilder().setFieldInt643(789).clearFieldInt325().build())
-            .build();
-    ByteArrayOutputStream output = new ByteArrayOutputStream();
-    message1.writeTo(output);
-    message2.writeTo(output);
-    message3.writeTo(output);
-    byte[] data = output.toByteArray();
-
-    Proto2MessageLite merged =
-        ExperimentalSerializationUtil.fromByteArray(data, Proto2MessageLite.class);
-    assertThat(merged.getFieldMessage10().getFieldInt643()).isEqualTo(789);
-    assertThat(merged.getFieldMessage10().getFieldInt325()).isEqualTo(456);
-  }
-
-  @Test
-  public void oneofFieldsShouldRoundtrip() throws IOException {
-    roundtrip("Field 53", newBuilder().setFieldDouble53(100).build());
-    roundtrip("Field 54", newBuilder().setFieldFloat54(100).build());
-    roundtrip("Field 55", newBuilder().setFieldInt6455(100).build());
-    roundtrip("Field 56", newBuilder().setFieldUint6456(100L).build());
-    roundtrip("Field 57", newBuilder().setFieldInt3257(100).build());
-    roundtrip("Field 58", newBuilder().setFieldFixed6458(100).build());
-    roundtrip("Field 59", newBuilder().setFieldFixed3259(100).build());
-    roundtrip("Field 60", newBuilder().setFieldBool60(true).build());
-    roundtrip("Field 61", newBuilder().setFieldString61(data().getString()).build());
-    roundtrip(
-        "Field 62", newBuilder().setFieldMessage62(newBuilder().setFieldDouble1(100)).build());
-    roundtrip("Field 63", newBuilder().setFieldBytes63(data().getBytes()).build());
-    roundtrip("Field 64", newBuilder().setFieldUint3264(100).build());
-    roundtrip("Field 65", newBuilder().setFieldSfixed3265(100).build());
-    roundtrip("Field 66", newBuilder().setFieldSfixed6466(100).build());
-    roundtrip("Field 67", newBuilder().setFieldSint3267(100).build());
-    roundtrip("Field 68", newBuilder().setFieldSint6468(100).build());
-    roundtrip(
-        "Field 69",
-        newBuilder()
-            .setFieldGroup69(
-                Proto2MessageLite.FieldGroup69.newBuilder().setFieldInt3270(data().getInt()))
-            .build());
-  }
-
-  private Proto2MessageLite.Builder newBuilder() {
-    return messageFactory().newMessage().toBuilder();
-  }
-
-  @Override
-  protected List<Proto2MessageLite> newMessagesMissingRequiredFields() {
-    return messageFactory().newMessagesMissingRequiredFields();
-  }
-
-  @Test
-  public void mapsShouldRoundtrip() throws IOException {
-    roundtrip(
-        "Proto2MessageLiteWithMaps",
-        new Proto2MessageLiteFactory(2, 10, 2, 2).newMessageWithMaps(),
-        Protobuf.getInstance().schemaFor(Proto2MessageLiteWithMaps.class));
-  }
-
-  @Test
-  public void unknownFieldsUnrecognized() throws Exception {
-    Proto2MessageLite expectedMessage = messageFactory().newMessage();
-    byte[] serializedBytes = expectedMessage.toByteArray();
-    Proto2EmptyLite empty =
-        ExperimentalSerializationUtil.fromByteArray(serializedBytes, Proto2EmptyLite.class);
-
-    // Merge serialized bytes into an empty message, then reserialize and merge it to a new
-    // Proto2Message. Make sure the two messages equal.
-    byte[] roundtripBytes = ExperimentalSerializationUtil.toByteArray(empty);
-    Proto2MessageLite roundtripMessage =
-        ExperimentalSerializationUtil.fromByteArray(roundtripBytes, Proto2MessageLite.class);
-    assertThat(roundtripMessage).isEqualTo(expectedMessage);
-  }
-
-  @Test
-  public void unknownEnum() throws IOException {
-    // Use unknown fields to hold invalid enum values.
-    UnknownFieldSetLite unknowns = UnknownFieldSetLite.newInstance();
-    final int outOfRange = 1000;
-    assertThat(TestEnum.forNumber(outOfRange)).isNull();
-    unknowns.storeField(
-        WireFormat.makeTag(
-            Proto2MessageLite.FIELD_ENUM_13_FIELD_NUMBER, WireFormat.WIRETYPE_VARINT),
-        (long) outOfRange);
-    unknowns.storeField(
-        WireFormat.makeTag(
-            Proto2MessageLite.FIELD_ENUM_LIST_30_FIELD_NUMBER, WireFormat.WIRETYPE_VARINT),
-        (long) TestEnum.ONE_VALUE);
-    unknowns.storeField(
-        WireFormat.makeTag(
-            Proto2MessageLite.FIELD_ENUM_LIST_30_FIELD_NUMBER, WireFormat.WIRETYPE_VARINT),
-        (long) outOfRange);
-    unknowns.storeField(
-        WireFormat.makeTag(
-            Proto2MessageLite.FIELD_ENUM_LIST_30_FIELD_NUMBER, WireFormat.WIRETYPE_VARINT),
-        (long) TestEnum.TWO_VALUE);
-
-    {
-      // Construct a packed enum list.
-      int packedSize =
-          CodedOutputStream.computeUInt32SizeNoTag(TestEnum.ONE_VALUE)
-              + CodedOutputStream.computeUInt32SizeNoTag(outOfRange)
-              + CodedOutputStream.computeUInt32SizeNoTag(TestEnum.ONE_VALUE);
-      ByteString.CodedBuilder packedBuilder = ByteString.newCodedBuilder(packedSize);
-      CodedOutputStream packedOut = packedBuilder.getCodedOutput();
-      packedOut.writeEnumNoTag(TestEnum.ONE_VALUE);
-      packedOut.writeEnumNoTag(outOfRange);
-      packedOut.writeEnumNoTag(TestEnum.TWO_VALUE);
-      unknowns.storeField(
-          WireFormat.makeTag(
-              Proto2MessageLite.FIELD_ENUM_LIST_PACKED_44_FIELD_NUMBER,
-              WireFormat.WIRETYPE_LENGTH_DELIMITED),
-          packedBuilder.build());
-    }
-    int size = unknowns.getSerializedSize();
-    byte[] output = new byte[size];
-    CodedOutputStream codedOutput = CodedOutputStream.newInstance(output);
-    unknowns.writeTo(codedOutput);
-    codedOutput.flush();
-
-    Proto2MessageLite parsed =
-        ExperimentalSerializationUtil.fromByteArray(output, Proto2MessageLite.class);
-    assertWithMessage("out-of-range singular enum should not be in message")
-        .that(parsed.hasFieldEnum13())
-        .isFalse();
-    assertWithMessage("out-of-range repeated enum should not be in message")
-        .that(parsed.getFieldEnumList30Count())
-        .isEqualTo(2);
-    assertThat(parsed.getFieldEnumList30(0)).isEqualTo(TestEnum.ONE);
-    assertThat(parsed.getFieldEnumList30(1)).isEqualTo(TestEnum.TWO);
-    assertWithMessage("out-of-range packed repeated enum should not be in message")
-        .that(parsed.getFieldEnumListPacked44Count())
-        .isEqualTo(2);
-    assertThat(parsed.getFieldEnumListPacked44(0)).isEqualTo(TestEnum.ONE);
-    assertThat(parsed.getFieldEnumListPacked44(1)).isEqualTo(TestEnum.TWO);
-  }
-}
diff --git a/libs/protobuf/java/core/src/test/java/com/google/protobuf/AbstractProto2SchemaTest.java b/libs/protobuf/java/core/src/test/java/com/google/protobuf/AbstractProto2SchemaTest.java
deleted file mode 100644
index 39980a7..0000000
--- a/libs/protobuf/java/core/src/test/java/com/google/protobuf/AbstractProto2SchemaTest.java
+++ /dev/null
@@ -1,225 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.common.truth.Truth.assertThat;
-import static com.google.common.truth.Truth.assertWithMessage;
-
-import com.google.protobuf.testing.Proto2Testing.Proto2Empty;
-import com.google.protobuf.testing.Proto2Testing.Proto2Message;
-import com.google.protobuf.testing.Proto2Testing.Proto2Message.TestEnum;
-import com.google.protobuf.testing.Proto2Testing.Proto2MessageWithMaps;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.util.List;
-import org.junit.Test;
-
-/** Base class for tests using {@link Proto2Message}. */
-public abstract class AbstractProto2SchemaTest extends AbstractSchemaTest<Proto2Message> {
-
-  @Override
-  protected Proto2MessageFactory messageFactory() {
-    return new Proto2MessageFactory(10, 20, 2, 2);
-  }
-
-  @Test
-  public void mergeOptionalMessageFields() throws Exception {
-    Proto2Message message1 =
-        newBuilder()
-            .setFieldMessage10(newBuilder().setFieldInt643(123).clearFieldInt325().build())
-            .build();
-    Proto2Message message2 =
-        newBuilder()
-            .setFieldMessage10(newBuilder().clearFieldInt643().setFieldInt325(456).build())
-            .build();
-    Proto2Message message3 =
-        newBuilder()
-            .setFieldMessage10(newBuilder().setFieldInt643(789).clearFieldInt325().build())
-            .build();
-    ByteArrayOutputStream output = new ByteArrayOutputStream();
-    message1.writeTo(output);
-    message2.writeTo(output);
-    message3.writeTo(output);
-    byte[] data = output.toByteArray();
-
-    Proto2Message merged = ExperimentalSerializationUtil.fromByteArray(data, Proto2Message.class);
-    assertThat(merged.getFieldMessage10().getFieldInt643()).isEqualTo(789);
-    assertThat(merged.getFieldMessage10().getFieldInt325()).isEqualTo(456);
-  }
-
-  @Test
-  public void oneofFieldsShouldRoundtrip() throws IOException {
-    roundtrip("Field 53", newBuilder().setFieldDouble53(100).build());
-    roundtrip("Field 54", newBuilder().setFieldFloat54(100).build());
-    roundtrip("Field 55", newBuilder().setFieldInt6455(100).build());
-    roundtrip("Field 56", newBuilder().setFieldUint6456(100L).build());
-    roundtrip("Field 57", newBuilder().setFieldInt3257(100).build());
-    roundtrip("Field 58", newBuilder().setFieldFixed6458(100).build());
-    roundtrip("Field 59", newBuilder().setFieldFixed3259(100).build());
-    roundtrip("Field 60", newBuilder().setFieldBool60(true).build());
-    roundtrip("Field 61", newBuilder().setFieldString61(data().getString()).build());
-    roundtrip(
-        "Field 62", newBuilder().setFieldMessage62(newBuilder().setFieldDouble1(100)).build());
-    roundtrip("Field 63", newBuilder().setFieldBytes63(data().getBytes()).build());
-    roundtrip("Field 64", newBuilder().setFieldUint3264(100).build());
-    roundtrip("Field 65", newBuilder().setFieldSfixed3265(100).build());
-    roundtrip("Field 66", newBuilder().setFieldSfixed6466(100).build());
-    roundtrip("Field 67", newBuilder().setFieldSint3267(100).build());
-    roundtrip("Field 68", newBuilder().setFieldSint6468(100).build());
-    roundtrip(
-        "Field 69",
-        newBuilder()
-            .setFieldGroup69(
-                Proto2Message.FieldGroup69.newBuilder().setFieldInt3270(data().getInt()))
-            .build());
-  }
-
-  private Proto2Message.Builder newBuilder() {
-    return messageFactory().newMessage().toBuilder();
-  }
-
-  @Test
-  public void mapsShouldRoundtrip() throws IOException {
-    roundtrip(
-        "Proto2MessageWithMaps",
-        new Proto2MessageFactory(2, 10, 2, 2).newMessageWithMaps(),
-        Protobuf.getInstance().schemaFor(Proto2MessageWithMaps.class));
-  }
-
-  @Test
-  public void unknownFieldsUnrecognized() throws Exception {
-    Proto2Message expectedMessage = messageFactory().newMessage();
-    byte[] serializedBytes = expectedMessage.toByteArray();
-    Proto2Empty empty =
-        ExperimentalSerializationUtil.fromByteArray(serializedBytes, Proto2Empty.class);
-
-    // Merge serialized bytes into an empty message, then reserialize and merge it to a new
-    // Proto2Message. Make sure the two messages equal.
-    byte[] roundtripBytes = ExperimentalSerializationUtil.toByteArray(empty);
-    assertThat(serializedBytes).hasLength(roundtripBytes.length);
-    Proto2Message roundtripMessage =
-        ExperimentalSerializationUtil.fromByteArray(roundtripBytes, Proto2Message.class);
-    assertThat(roundtripMessage).isEqualTo(expectedMessage);
-  }
-
-  @Test
-  public void unknownEnum() throws IOException {
-    // Use unknown fields to hold invalid enum values.
-    UnknownFieldSetLite unknowns = UnknownFieldSetLite.newInstance();
-    final int outOfRange = 1000;
-    assertThat(TestEnum.forNumber(outOfRange)).isNull();
-    unknowns.storeField(
-        WireFormat.makeTag(Proto2Message.FIELD_ENUM_13_FIELD_NUMBER, WireFormat.WIRETYPE_VARINT),
-        (long) outOfRange);
-    unknowns.storeField(
-        WireFormat.makeTag(
-            Proto2Message.FIELD_ENUM_LIST_30_FIELD_NUMBER, WireFormat.WIRETYPE_VARINT),
-        (long) TestEnum.ONE_VALUE);
-    unknowns.storeField(
-        WireFormat.makeTag(
-            Proto2Message.FIELD_ENUM_LIST_30_FIELD_NUMBER, WireFormat.WIRETYPE_VARINT),
-        (long) outOfRange);
-    unknowns.storeField(
-        WireFormat.makeTag(
-            Proto2Message.FIELD_ENUM_LIST_30_FIELD_NUMBER, WireFormat.WIRETYPE_VARINT),
-        (long) TestEnum.TWO_VALUE);
-
-    {
-      // Construct a packed enum list.
-      int packedSize =
-          CodedOutputStream.computeUInt32SizeNoTag(TestEnum.ONE_VALUE)
-              + CodedOutputStream.computeUInt32SizeNoTag(outOfRange)
-              + CodedOutputStream.computeUInt32SizeNoTag(TestEnum.ONE_VALUE);
-      ByteString.CodedBuilder packedBuilder = ByteString.newCodedBuilder(packedSize);
-      CodedOutputStream packedOut = packedBuilder.getCodedOutput();
-      packedOut.writeEnumNoTag(TestEnum.ONE_VALUE);
-      packedOut.writeEnumNoTag(outOfRange);
-      packedOut.writeEnumNoTag(TestEnum.TWO_VALUE);
-      unknowns.storeField(
-          WireFormat.makeTag(
-              Proto2Message.FIELD_ENUM_LIST_PACKED_44_FIELD_NUMBER,
-              WireFormat.WIRETYPE_LENGTH_DELIMITED),
-          packedBuilder.build());
-    }
-    int size = unknowns.getSerializedSize();
-    byte[] output = new byte[size];
-    CodedOutputStream codedOutput = CodedOutputStream.newInstance(output);
-    unknowns.writeTo(codedOutput);
-    codedOutput.flush();
-
-    Proto2Message parsed = ExperimentalSerializationUtil.fromByteArray(output, Proto2Message.class);
-    assertWithMessage("out-of-range singular enum should not be in message")
-        .that(parsed.hasFieldEnum13())
-        .isFalse();
-    {
-      List<Long> singularEnum =
-          parsed
-              .getUnknownFields()
-              .getField(Proto2Message.FIELD_ENUM_13_FIELD_NUMBER)
-              .getVarintList();
-      assertThat(singularEnum).hasSize(1);
-      assertThat((Long) (long) outOfRange).isEqualTo(singularEnum.get(0));
-    }
-    {
-      List<Long> repeatedEnum =
-          parsed
-              .getUnknownFields()
-              .getField(Proto2Message.FIELD_ENUM_LIST_30_FIELD_NUMBER)
-              .getVarintList();
-      assertThat(repeatedEnum).hasSize(1);
-      assertThat((Long) (long) outOfRange).isEqualTo(repeatedEnum.get(0));
-    }
-    {
-      List<Long> packedRepeatedEnum =
-          parsed
-              .getUnknownFields()
-              .getField(Proto2Message.FIELD_ENUM_LIST_PACKED_44_FIELD_NUMBER)
-              .getVarintList();
-      assertThat(packedRepeatedEnum).hasSize(1);
-      assertThat((Long) (long) outOfRange).isEqualTo(packedRepeatedEnum.get(0));
-    }
-    assertWithMessage("out-of-range repeated enum should not be in message")
-        .that(parsed.getFieldEnumList30Count())
-        .isEqualTo(2);
-    assertThat(parsed.getFieldEnumList30(0)).isEqualTo(TestEnum.ONE);
-    assertThat(parsed.getFieldEnumList30(1)).isEqualTo(TestEnum.TWO);
-    assertWithMessage("out-of-range packed repeated enum should not be in message")
-        .that(parsed.getFieldEnumListPacked44Count())
-        .isEqualTo(2);
-    assertThat(parsed.getFieldEnumListPacked44(0)).isEqualTo(TestEnum.ONE);
-    assertThat(parsed.getFieldEnumListPacked44(1)).isEqualTo(TestEnum.TWO);
-  }
-
-  @Override
-  protected List<Proto2Message> newMessagesMissingRequiredFields() {
-    return messageFactory().newMessagesMissingRequiredFields();
-  }
-}
diff --git a/libs/protobuf/java/core/src/test/java/com/google/protobuf/AbstractProto3LiteSchemaTest.java b/libs/protobuf/java/core/src/test/java/com/google/protobuf/AbstractProto3LiteSchemaTest.java
deleted file mode 100644
index ea53a17..0000000
--- a/libs/protobuf/java/core/src/test/java/com/google/protobuf/AbstractProto3LiteSchemaTest.java
+++ /dev/null
@@ -1,143 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import com.google.protobuf.testing.Proto3TestingLite.Proto3EmptyLite;
-import com.google.protobuf.testing.Proto3TestingLite.Proto3MessageLite;
-import com.google.protobuf.testing.Proto3TestingLite.Proto3MessageLiteWithMaps;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.List;
-import org.junit.Test;
-
-/** Base class for tests using {@link Proto3MessageLite}. */
-public abstract class AbstractProto3LiteSchemaTest extends AbstractSchemaTest<Proto3MessageLite> {
-  @Override
-  protected Proto3MessageLiteFactory messageFactory() {
-    return new Proto3MessageLiteFactory(10, 20, 2, 2);
-  }
-
-  @Override
-  protected List<ByteBuffer> serializedBytesWithInvalidUtf8() throws IOException {
-    List<ByteBuffer> invalidBytes = new ArrayList<>();
-    byte[] invalid = new byte[] {(byte) 0x80};
-    {
-      ByteBuffer buffer = ByteBuffer.allocate(100);
-      CodedOutputStream codedOutput = CodedOutputStream.newInstance(buffer);
-      codedOutput.writeByteArray(Proto3MessageLite.FIELD_STRING_9_FIELD_NUMBER, invalid);
-      codedOutput.flush();
-      buffer.flip();
-      invalidBytes.add(buffer);
-    }
-    {
-      ByteBuffer buffer = ByteBuffer.allocate(100);
-      CodedOutputStream codedOutput = CodedOutputStream.newInstance(buffer);
-      codedOutput.writeByteArray(Proto3MessageLite.FIELD_STRING_LIST_26_FIELD_NUMBER, invalid);
-      codedOutput.flush();
-      buffer.flip();
-      invalidBytes.add(buffer);
-    }
-    return invalidBytes;
-  }
-
-  @Test
-  public void mergeOptionalMessageFields() throws Exception {
-    Proto3MessageLite message1 =
-        newBuilder()
-            .setFieldMessage10(newBuilder().setFieldInt643(123).clearFieldInt325().build())
-            .build();
-    Proto3MessageLite message2 =
-        newBuilder()
-            .setFieldMessage10(newBuilder().clearFieldInt643().setFieldInt325(456).build())
-            .build();
-    Proto3MessageLite message3 =
-        newBuilder()
-            .setFieldMessage10(newBuilder().setFieldInt643(789).clearFieldInt325().build())
-            .build();
-    ByteArrayOutputStream output = new ByteArrayOutputStream();
-    message1.writeTo(output);
-    message2.writeTo(output);
-    message3.writeTo(output);
-    byte[] data = output.toByteArray();
-
-    Proto3MessageLite merged =
-        ExperimentalSerializationUtil.fromByteArray(data, Proto3MessageLite.class);
-    assertThat(merged.getFieldMessage10().getFieldInt643()).isEqualTo(789);
-    assertThat(merged.getFieldMessage10().getFieldInt325()).isEqualTo(456);
-  }
-
-  @Test
-  public void oneofFieldsShouldRoundtrip() throws IOException {
-    roundtrip("Field 53", newBuilder().setFieldDouble53(100).build());
-    roundtrip("Field 54", newBuilder().setFieldFloat54(100).build());
-    roundtrip("Field 55", newBuilder().setFieldInt6455(100).build());
-    roundtrip("Field 56", newBuilder().setFieldUint6456(100L).build());
-    roundtrip("Field 57", newBuilder().setFieldInt3257(100).build());
-    roundtrip("Field 58", newBuilder().setFieldFixed6458(100).build());
-    roundtrip("Field 59", newBuilder().setFieldFixed3259(100).build());
-    roundtrip("Field 60", newBuilder().setFieldBool60(true).build());
-    roundtrip("Field 61", newBuilder().setFieldString61(data().getString()).build());
-    roundtrip(
-        "Field 62", newBuilder().setFieldMessage62(newBuilder().setFieldDouble1(100)).build());
-    roundtrip("Field 63", newBuilder().setFieldBytes63(data().getBytes()).build());
-    roundtrip("Field 64", newBuilder().setFieldUint3264(100).build());
-    roundtrip("Field 65", newBuilder().setFieldSfixed3265(100).build());
-    roundtrip("Field 66", newBuilder().setFieldSfixed6466(100).build());
-    roundtrip("Field 67", newBuilder().setFieldSint3267(100).build());
-    roundtrip("Field 68", newBuilder().setFieldSint6468(100).build());
-  }
-
-  @Test
-  public void retainUnknownFields() {
-    // Unknown fields are retained in lite runtime.
-    Proto3MessageLite expectedMessage = messageFactory().newMessage();
-    Proto3EmptyLite empty =
-        ExperimentalSerializationUtil.fromByteArray(
-            expectedMessage.toByteArray(), Proto3EmptyLite.class);
-    assertThat(empty.getSerializedSize()).isEqualTo(expectedMessage.getSerializedSize());
-  }
-
-  @Test
-  public void mapsShouldRoundtrip() throws IOException {
-    roundtrip(
-        "Proto3MessageLiteWithMaps",
-        new Proto3MessageLiteFactory(2, 10, 2, 2).newMessageWithMaps(),
-        Protobuf.getInstance().schemaFor(Proto3MessageLiteWithMaps.class));
-  }
-
-  private static Proto3MessageLite.Builder newBuilder() {
-    return Proto3MessageLite.newBuilder();
-  }
-}
diff --git a/libs/protobuf/java/core/src/test/java/com/google/protobuf/AbstractProto3SchemaTest.java b/libs/protobuf/java/core/src/test/java/com/google/protobuf/AbstractProto3SchemaTest.java
deleted file mode 100644
index 5d9883f..0000000
--- a/libs/protobuf/java/core/src/test/java/com/google/protobuf/AbstractProto3SchemaTest.java
+++ /dev/null
@@ -1,151 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import com.google.protobuf.testing.Proto3Testing.Proto3Empty;
-import com.google.protobuf.testing.Proto3Testing.Proto3Message;
-import com.google.protobuf.testing.Proto3Testing.Proto3MessageWithMaps;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.List;
-import org.junit.Test;
-
-/** Base class for tests using {@link Proto3Message}. */
-public abstract class AbstractProto3SchemaTest extends AbstractSchemaTest<Proto3Message> {
-  @Override
-  protected Proto3MessageFactory messageFactory() {
-    return new Proto3MessageFactory(10, 20, 2, 2);
-  }
-
-  @Override
-  protected List<ByteBuffer> serializedBytesWithInvalidUtf8() throws IOException {
-    List<ByteBuffer> invalidBytes = new ArrayList<>();
-    byte[] invalid = new byte[] {(byte) 0x80};
-    {
-      ByteBuffer buffer = ByteBuffer.allocate(100);
-      CodedOutputStream codedOutput = CodedOutputStream.newInstance(buffer);
-      codedOutput.writeByteArray(Proto3Message.FIELD_STRING_9_FIELD_NUMBER, invalid);
-      codedOutput.flush();
-      buffer.flip();
-      invalidBytes.add(buffer);
-    }
-    {
-      ByteBuffer buffer = ByteBuffer.allocate(100);
-      CodedOutputStream codedOutput = CodedOutputStream.newInstance(buffer);
-      codedOutput.writeByteArray(Proto3Message.FIELD_STRING_LIST_26_FIELD_NUMBER, invalid);
-      codedOutput.flush();
-      buffer.flip();
-      invalidBytes.add(buffer);
-    }
-    return invalidBytes;
-  }
-
-  @Test
-  public void mergeOptionalMessageFields() throws Exception {
-    Proto3Message message1 =
-        newBuilder()
-            .setFieldMessage10(newBuilder().setFieldInt643(123).clearFieldInt325().build())
-            .build();
-    Proto3Message message2 =
-        newBuilder()
-            .setFieldMessage10(newBuilder().clearFieldInt643().setFieldInt325(456).build())
-            .build();
-    Proto3Message message3 =
-        newBuilder()
-            .setFieldMessage10(newBuilder().setFieldInt643(789).clearFieldInt325().build())
-            .build();
-    ByteArrayOutputStream output = new ByteArrayOutputStream();
-    message1.writeTo(output);
-    message2.writeTo(output);
-    message3.writeTo(output);
-    byte[] data = output.toByteArray();
-
-    Proto3Message merged = ExperimentalSerializationUtil.fromByteArray(data, Proto3Message.class);
-    assertThat(merged.getFieldMessage10().getFieldInt643()).isEqualTo(789);
-    assertThat(merged.getFieldMessage10().getFieldInt325()).isEqualTo(456);
-  }
-
-  @Test
-  public void oneofFieldsShouldRoundtrip() throws IOException {
-    roundtrip("Field 53", newBuilder().setFieldDouble53(100).build());
-    roundtrip("Field 54", newBuilder().setFieldFloat54(100).build());
-    roundtrip("Field 55", newBuilder().setFieldInt6455(100).build());
-    roundtrip("Field 56", newBuilder().setFieldUint6456(100L).build());
-    roundtrip("Field 57", newBuilder().setFieldInt3257(100).build());
-    roundtrip("Field 58", newBuilder().setFieldFixed6458(100).build());
-    roundtrip("Field 59", newBuilder().setFieldFixed3259(100).build());
-    roundtrip("Field 60", newBuilder().setFieldBool60(true).build());
-    roundtrip("Field 61", newBuilder().setFieldString61(data().getString()).build());
-    roundtrip(
-        "Field 62", newBuilder().setFieldMessage62(newBuilder().setFieldDouble1(100)).build());
-    roundtrip("Field 63", newBuilder().setFieldBytes63(data().getBytes()).build());
-    roundtrip("Field 64", newBuilder().setFieldUint3264(100).build());
-    roundtrip("Field 65", newBuilder().setFieldSfixed3265(100).build());
-    roundtrip("Field 66", newBuilder().setFieldSfixed6466(100).build());
-    roundtrip("Field 67", newBuilder().setFieldSint3267(100).build());
-    roundtrip("Field 68", newBuilder().setFieldSint6468(100).build());
-  }
-
-  @Test
-  public void preserveUnknownFields() {
-    Proto3Message expectedMessage = messageFactory().newMessage();
-    Proto3Empty empty =
-        ExperimentalSerializationUtil.fromByteArray(
-            expectedMessage.toByteArray(), Proto3Empty.class);
-    assertThat(empty.getSerializedSize()).isEqualTo(expectedMessage.getSerializedSize());
-    assertThat(empty.toByteString()).isEqualTo(expectedMessage.toByteString());
-  }
-
-  @Test
-  public void preserveUnknownFieldsProto2() {
-    // Make sure we will be able to preserve valid proto2 wireformat, including those that are not
-    // supported in proto3, e.g. groups.
-    byte[] payload = new Proto2MessageFactory(10, 20, 2, 2).newMessage().toByteArray();
-    Proto3Empty empty = ExperimentalSerializationUtil.fromByteArray(payload, Proto3Empty.class);
-    assertThat(empty.getSerializedSize()).isEqualTo(payload.length);
-  }
-
-  @Test
-  public void mapsShouldRoundtrip() throws IOException {
-    roundtrip(
-        "Proto3MessageWithMaps",
-        new Proto3MessageFactory(2, 10, 2, 2).newMessageWithMaps(),
-        Protobuf.getInstance().schemaFor(Proto3MessageWithMaps.class));
-  }
-
-  private static Proto3Message.Builder newBuilder() {
-    return Proto3Message.newBuilder();
-  }
-}
diff --git a/libs/protobuf/java/core/src/test/java/com/google/protobuf/AbstractSchemaTest.java b/libs/protobuf/java/core/src/test/java/com/google/protobuf/AbstractSchemaTest.java
deleted file mode 100644
index 7ca5e03..0000000
--- a/libs/protobuf/java/core/src/test/java/com/google/protobuf/AbstractSchemaTest.java
+++ /dev/null
@@ -1,157 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.common.truth.Truth.assertThat;
-import static com.google.common.truth.Truth.assertWithMessage;
-
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import org.junit.Before;
-import org.junit.Test;
-
-public abstract class AbstractSchemaTest<T extends MessageLite> {
-  private Schema<T> schema;
-
-  @Before
-  public void setup() {
-    schema = schema();
-    registerSchemas();
-  }
-
-  // Subclass should override this method if it needs to register more than one schemas.
-  protected void registerSchemas() {
-    // Register this schema with the runtime to support processing of nested messages.
-    Protobuf.getInstance().registerSchemaOverride(schema.newInstance().getClass(), schema);
-  }
-
-  protected abstract Schema<T> schema();
-
-  protected abstract ExperimentalMessageFactory<? extends T> messageFactory();
-
-  @SuppressWarnings("unused")
-  protected List<ByteBuffer> serializedBytesWithInvalidUtf8() throws IOException {
-    return Collections.emptyList();
-  }
-
-  @Test
-  public void randomMessageShouldRoundtrip() throws IOException {
-    roundtrip("", messageFactory().newMessage());
-  }
-
-  @Test
-  public void invalidUtf8StringParsing() throws IOException {
-    for (ByteBuffer invalidUtf8Bytes : serializedBytesWithInvalidUtf8()) {
-      Reader reader = BinaryReader.newInstance(invalidUtf8Bytes, /* bufferIsImmutable= */ true);
-
-      T newMsg = schema.newInstance();
-      try {
-        schema.mergeFrom(newMsg, reader, ExtensionRegistryLite.getEmptyRegistry());
-        assertWithMessage("should throw invalid").fail();
-      } catch (InvalidProtocolBufferException expected) {
-      }
-    }
-  }
-
-  @Test
-  public void mergeFromByteArrayFastPathMayThrowIndexOutOfBoundsException() throws IOException {
-    if (!Android.isOnAndroidDevice()) {
-      // Skip this test if not on Android.
-      return;
-    }
-    byte[] data = messageFactory().newMessage().toByteArray();
-    int exceptionCount = 0;
-    for (int i = 0; i <= data.length; i++) {
-      byte[] truncatedData = Arrays.copyOf(data, i);
-      try {
-        T message = schema.newInstance();
-        // Test that this method throws the expected exceptions.
-        schema.mergeFrom(message, truncatedData, 0, i, new ArrayDecoders.Registers());
-      } catch (InvalidProtocolBufferException e) {
-        // Ignore expected exceptions.
-      } catch (IndexOutOfBoundsException e) {
-        exceptionCount += 1;
-      }
-    }
-    assertThat(exceptionCount).isNotEqualTo(0);
-  }
-
-  protected static final <M extends MessageLite> void roundtrip(
-      String failureMessage, M msg, Schema<M> schema) throws IOException {
-    byte[] serializedBytes = ExperimentalSerializationUtil.toByteArray(msg, schema);
-    assertWithMessage(failureMessage)
-        .that(serializedBytes.length)
-        .isEqualTo(msg.getSerializedSize());
-
-    // Now read it back in and verify it matches the original.
-    if (Android.isOnAndroidDevice()) {
-      // Test the fast path on Android.
-      M newMsg = schema.newInstance();
-      schema.mergeFrom(
-          newMsg, serializedBytes, 0, serializedBytes.length, new ArrayDecoders.Registers());
-      schema.makeImmutable(newMsg);
-      assertWithMessage(failureMessage).that(newMsg).isEqualTo(msg);
-    }
-    M newMsg = schema.newInstance();
-    Reader reader = BinaryReader.newInstance(ByteBuffer.wrap(serializedBytes), true);
-    schema.mergeFrom(newMsg, reader, ExtensionRegistryLite.getEmptyRegistry());
-    schema.makeImmutable(newMsg);
-
-    assertWithMessage(failureMessage).that(newMsg).isEqualTo(msg);
-  }
-
-  protected final void roundtrip(String failureMessage, T msg) throws IOException {
-    roundtrip(failureMessage, msg, schema);
-  }
-
-  protected final ExperimentalTestDataProvider data() {
-    return messageFactory().dataProvider();
-  }
-
-  protected List<T> newMessagesMissingRequiredFields() {
-    return Collections.emptyList();
-  }
-
-  @SuppressWarnings("unchecked")
-  @Test
-  public void testRequiredFields() throws Exception {
-    for (T msg : newMessagesMissingRequiredFields()) {
-      if (schema.isInitialized(msg)) {
-        assertThat(msg.toString()).isEmpty();
-        msg = (T) msg.toBuilder().build();
-      }
-      assertThat(schema.isInitialized(msg)).isFalse();
-    }
-  }
-}
diff --git a/libs/protobuf/java/core/src/test/java/com/google/protobuf/AnyTest.java b/libs/protobuf/java/core/src/test/java/com/google/protobuf/AnyTest.java
deleted file mode 100644
index ee13ef1..0000000
--- a/libs/protobuf/java/core/src/test/java/com/google/protobuf/AnyTest.java
+++ /dev/null
@@ -1,136 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.common.truth.Truth.assertThat;
-import static com.google.common.truth.Truth.assertWithMessage;
-
-import any_test.AnyTestProto.TestAny;
-import protobuf_unittest.UnittestProto.TestAllTypes;
-import java.util.Objects;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-/** Unit tests for Any message. */
-@RunWith(JUnit4.class)
-public class AnyTest {
-
-  @Test
-  public void testAnyGeneratedApi() throws Exception {
-    TestAllTypes.Builder builder = TestAllTypes.newBuilder();
-    TestUtil.setAllFields(builder);
-    TestAllTypes message = builder.build();
-
-    TestAny container = TestAny.newBuilder().setValue(Any.pack(message)).build();
-
-    assertThat(container.getValue().is(TestAllTypes.class)).isTrue();
-    assertThat(container.getValue().is(TestAny.class)).isFalse();
-
-    TestAllTypes result = container.getValue().unpack(TestAllTypes.class);
-    TestUtil.assertAllFieldsSet(result);
-
-
-    // Unpacking to a wrong type will throw an exception.
-    try {
-      container.getValue().unpack(TestAny.class);
-      assertWithMessage("Exception is expected.").fail();
-    } catch (InvalidProtocolBufferException e) {
-      // expected.
-    }
-
-    // Test that unpacking throws an exception if parsing fails.
-    TestAny.Builder containerBuilder = container.toBuilder();
-    containerBuilder.getValueBuilder().setValue(ByteString.copyFrom(new byte[] {0x11}));
-    container = containerBuilder.build();
-    try {
-      container.getValue().unpack(TestAllTypes.class);
-      assertWithMessage("Exception is expected.").fail();
-    } catch (InvalidProtocolBufferException e) {
-      // expected.
-    }
-  }
-
-  @Test
-  public void testCustomTypeUrls() throws Exception {
-    TestAllTypes.Builder builder = TestAllTypes.newBuilder();
-    TestUtil.setAllFields(builder);
-    TestAllTypes message = builder.build();
-
-    TestAny container = TestAny.newBuilder().setValue(Any.pack(message, "xxx.com")).build();
-
-    assertThat(container.getValue().getTypeUrl())
-        .isEqualTo("xxx.com/" + TestAllTypes.getDescriptor().getFullName());
-
-    assertThat(container.getValue().is(TestAllTypes.class)).isTrue();
-    assertThat(container.getValue().is(TestAny.class)).isFalse();
-
-    TestAllTypes result = container.getValue().unpack(TestAllTypes.class);
-    TestUtil.assertAllFieldsSet(result);
-
-    container = TestAny.newBuilder().setValue(Any.pack(message, "yyy.com/")).build();
-
-    assertThat(container.getValue().getTypeUrl())
-        .isEqualTo("yyy.com/" + TestAllTypes.getDescriptor().getFullName());
-
-    assertThat(container.getValue().is(TestAllTypes.class)).isTrue();
-    assertThat(container.getValue().is(TestAny.class)).isFalse();
-
-    result = container.getValue().unpack(TestAllTypes.class);
-    TestUtil.assertAllFieldsSet(result);
-
-    container = TestAny.newBuilder().setValue(Any.pack(message, "")).build();
-
-    assertThat(container.getValue().getTypeUrl())
-        .isEqualTo("/" + TestAllTypes.getDescriptor().getFullName());
-
-    assertThat(container.getValue().is(TestAllTypes.class)).isTrue();
-    assertThat(container.getValue().is(TestAny.class)).isFalse();
-
-    result = container.getValue().unpack(TestAllTypes.class);
-    TestUtil.assertAllFieldsSet(result);
-  }
-
-  @Test
-  public void testCachedUnpackResult() throws Exception {
-    TestAllTypes.Builder builder = TestAllTypes.newBuilder();
-    TestUtil.setAllFields(builder);
-    TestAllTypes message = builder.build();
-
-    TestAny container = TestAny.newBuilder().setValue(Any.pack(message)).build();
-
-    assertThat(container.getValue().is(TestAllTypes.class)).isTrue();
-
-    TestAllTypes result1 = container.getValue().unpack(TestAllTypes.class);
-    TestAllTypes result2 = container.getValue().unpack(TestAllTypes.class);
-    assertThat(Objects.equals(result1, result2)).isTrue();
-  }
-}
diff --git a/libs/protobuf/java/core/src/test/java/com/google/protobuf/ArrayDecodersTest.java b/libs/protobuf/java/core/src/test/java/com/google/protobuf/ArrayDecodersTest.java
deleted file mode 100644
index 895c9bd..0000000
--- a/libs/protobuf/java/core/src/test/java/com/google/protobuf/ArrayDecodersTest.java
+++ /dev/null
@@ -1,253 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.common.truth.Truth.assertWithMessage;
-
-import com.google.protobuf.ArrayDecoders.Registers;
-import java.io.IOException;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-@RunWith(JUnit4.class)
-public class ArrayDecodersTest {
-
-  private static final int TAG = WireFormat.makeTag(1, WireFormat.WIRETYPE_LENGTH_DELIMITED);
-  private static final ByteString NEGATIVE_SIZE_0 = generateNegativeLength(0);
-  private static final ByteString NEGATIVE_SIZE_1 = generateNegativeLength(1);
-
-  private Registers registers;
-
-  @Before
-  public void setUp() {
-    registers = new Registers();
-    registers.int1 = TAG;
-  }
-
-  @Test
-  public void testException_decodeString() {
-    try {
-      ArrayDecoders.decodeString(NEGATIVE_SIZE_0.toByteArray(), 0, registers);
-      assertWithMessage("should throw exception").fail();
-    } catch (InvalidProtocolBufferException expected) {
-    }
-  }
-
-  @Test
-  public void testException_decodeStringRequireUtf8() {
-    try {
-      ArrayDecoders.decodeStringRequireUtf8(NEGATIVE_SIZE_0.toByteArray(), 0, registers);
-      assertWithMessage("should throw an exception").fail();
-    } catch (InvalidProtocolBufferException expected) {
-    }
-  }
-
-  @Test
-  public void testException_decodeBytes() {
-    try {
-      ArrayDecoders.decodeBytes(NEGATIVE_SIZE_0.toByteArray(), 0, registers);
-      assertWithMessage("should throw an exception").fail();
-    } catch (InvalidProtocolBufferException expected) {
-    }
-  }
-
-  @Test
-  public void testException_decodeStringList_first() {
-    try {
-      ArrayDecoders.decodeStringList(
-          TAG,
-          NEGATIVE_SIZE_0.toByteArray(),
-          0,
-          NEGATIVE_SIZE_0.size(),
-          new ProtobufArrayList<Object>(),
-          registers);
-      assertWithMessage("should throw an exception").fail();
-    } catch (InvalidProtocolBufferException expected) {
-    }
-  }
-
-  @Test
-  public void testException_decodeStringList_second() {
-    try {
-      ArrayDecoders.decodeStringList(
-          TAG,
-          NEGATIVE_SIZE_1.toByteArray(),
-          0,
-          NEGATIVE_SIZE_1.size(),
-          new ProtobufArrayList<Object>(),
-          registers);
-      assertWithMessage("should throw an exception").fail();
-    } catch (InvalidProtocolBufferException expected) {
-    }
-  }
-
-  @Test
-  public void testException_decodeStringListRequireUtf8_first() {
-    try {
-      ArrayDecoders.decodeStringListRequireUtf8(
-          TAG,
-          NEGATIVE_SIZE_0.toByteArray(),
-          0,
-          NEGATIVE_SIZE_0.size(),
-          new ProtobufArrayList<Object>(),
-          registers);
-      assertWithMessage("should throw an exception").fail();
-    } catch (InvalidProtocolBufferException expected) {
-    }
-  }
-
-  @Test
-  public void testException_decodeStringListRequireUtf8_second() {
-    try {
-      ArrayDecoders.decodeStringListRequireUtf8(
-          TAG,
-          NEGATIVE_SIZE_1.toByteArray(),
-          0,
-          NEGATIVE_SIZE_1.size(),
-          new ProtobufArrayList<Object>(),
-          registers);
-      assertWithMessage("should throw an exception").fail();
-    } catch (InvalidProtocolBufferException expected) {
-    }
-  }
-
-  @Test
-  public void testException_decodeBytesList_first() {
-    try {
-      ArrayDecoders.decodeBytesList(
-          TAG,
-          NEGATIVE_SIZE_0.toByteArray(),
-          0,
-          NEGATIVE_SIZE_0.size(),
-          new ProtobufArrayList<Object>(),
-          registers);
-      assertWithMessage("should throw an exception").fail();
-    } catch (InvalidProtocolBufferException expected) {
-    }
-  }
-
-  @Test
-  public void testException_decodeBytesList_second() {
-    try {
-      ArrayDecoders.decodeBytesList(
-          TAG,
-          NEGATIVE_SIZE_1.toByteArray(),
-          0,
-          NEGATIVE_SIZE_1.size(),
-          new ProtobufArrayList<Object>(),
-          registers);
-      assertWithMessage("should throw an exception").fail();
-    } catch (InvalidProtocolBufferException expected) {
-    }
-  }
-
-  @Test
-  public void testException_decodeUnknownField() {
-    try {
-      ArrayDecoders.decodeUnknownField(
-          TAG,
-          NEGATIVE_SIZE_0.toByteArray(),
-          0,
-          NEGATIVE_SIZE_0.size(),
-          UnknownFieldSetLite.newInstance(),
-          registers);
-      assertWithMessage("should throw an exception").fail();
-    } catch (InvalidProtocolBufferException expected) {
-    }
-  }
-
-  @Test
-  public void testException_decodeHugeField() {
-    byte[] badBytes =
-        new byte[] {
-          (byte) 0x80, (byte) 0xFF, (byte) 0xFF, (byte) 0xEF, 0x73, 0x74, 0x69, 0x6E, 0x67
-        };
-    try {
-      ArrayDecoders.decodeUnknownField(
-          TAG, badBytes, 0, badBytes.length, UnknownFieldSetLite.newInstance(), registers);
-      assertWithMessage("should throw an exception").fail();
-    } catch (InvalidProtocolBufferException expected) {
-    }
-
-    try {
-      ArrayDecoders.decodeBytes(badBytes, 0, registers);
-      assertWithMessage("should throw an exception").fail();
-    } catch (InvalidProtocolBufferException expected) {
-    }
-
-    byte[] badBytesList =
-        new byte[] {
-          0x01,
-          0x77,
-          0x0A,
-          (byte) 0x80,
-          (byte) 0xFF,
-          (byte) 0xFF,
-          (byte) 0xEF,
-          0x73,
-          0x74,
-          0x69,
-          0x6E,
-          0x67
-        };
-    try {
-      ArrayDecoders.decodeBytesList(
-          TAG, badBytesList, 0, badBytes.length, new ProtobufArrayList<>(), registers);
-      assertWithMessage("should throw an exception").fail();
-    } catch (InvalidProtocolBufferException expected) {
-    }
-  }
-
-  private static ByteString generateNegativeLength(int count) {
-    try {
-      ByteString.Output byteStringOutput = ByteString.newOutput();
-      CodedOutputStream codedOutput = CodedOutputStream.newInstance(byteStringOutput);
-
-      // Write out count - 1 valid 0 length fields; we only write out tags after the field since
-      // ArrayDecoders expects the first tag to already have been parsed.
-      for (int i = 0; i < count; i++) {
-        codedOutput.writeInt32NoTag(0);
-        codedOutput.writeInt32NoTag(TAG);
-      }
-
-      // Write out a negative length
-      codedOutput.writeInt32NoTag(-1);
-
-      codedOutput.flush();
-
-      return byteStringOutput.toByteString();
-    } catch (IOException e) {
-      throw new RuntimeException(e);
-    }
-  }
-}
diff --git a/libs/protobuf/java/core/src/test/java/com/google/protobuf/BinaryProtocolTest.java b/libs/protobuf/java/core/src/test/java/com/google/protobuf/BinaryProtocolTest.java
deleted file mode 100644
index 0853b9a..0000000
--- a/libs/protobuf/java/core/src/test/java/com/google/protobuf/BinaryProtocolTest.java
+++ /dev/null
@@ -1,89 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import com.google.protobuf.testing.Proto2Testing.Proto2Message;
-import com.google.protobuf.testing.Proto3Testing.Proto3Message;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-@RunWith(JUnit4.class)
-public final class BinaryProtocolTest {
-  @Before
-  public void setup() {
-    TestSchemas.registerGenericProto2Schemas();
-
-    Protobuf.getInstance()
-        .registerSchemaOverride(Proto3Message.class, TestSchemas.genericProto3Schema);
-  }
-
-  @Test
-  public void proto3Roundtrip() throws Exception {
-    Proto3Message expected = new Proto3MessageFactory(5, 10, 2, 2).newMessage();
-    byte[] expectedBytes = expected.toByteArray();
-
-    // Deserialize with BinaryReader and verify that the message matches the original.
-    Proto3Message result =
-        ExperimentalSerializationUtil.fromByteArray(expectedBytes, Proto3Message.class);
-    assertThat(result).isEqualTo(expected);
-
-    // Now write it back out using BinaryWriter and verify the output length.
-    byte[] actualBytes = ExperimentalSerializationUtil.toByteArray(result);
-    assertThat(actualBytes).hasLength(expectedBytes.length);
-
-    // Read back in the bytes and verify that it matches the original message.
-    Proto3Message actual = Proto3Message.parseFrom(actualBytes);
-    assertThat(actual).isEqualTo(expected);
-  }
-
-  @Test
-  public void proto2Roundtrip() throws Exception {
-    Proto2Message expected = new Proto2MessageFactory(5, 10, 2, 2).newMessage();
-    byte[] expectedBytes = expected.toByteArray();
-
-    // Deserialize with BinaryReader and verify that the message matches the original.
-    Proto2Message result =
-        ExperimentalSerializationUtil.fromByteArray(expectedBytes, Proto2Message.class);
-    assertThat(result).isEqualTo(expected);
-
-    // Now write it back out using BinaryWriter and verify the output length.
-    byte[] actualBytes = ExperimentalSerializationUtil.toByteArray(result);
-    assertThat(actualBytes).hasLength(expectedBytes.length);
-
-    // Read back in the bytes and verify that it matches the original message.
-    Proto2Message actual = Proto2Message.parseFrom(actualBytes);
-    assertThat(actual).isEqualTo(expected);
-  }
-}
diff --git a/libs/protobuf/java/core/src/test/java/com/google/protobuf/BooleanArrayListTest.java b/libs/protobuf/java/core/src/test/java/com/google/protobuf/BooleanArrayListTest.java
deleted file mode 100644
index 2050507..0000000
--- a/libs/protobuf/java/core/src/test/java/com/google/protobuf/BooleanArrayListTest.java
+++ /dev/null
@@ -1,586 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.common.truth.Truth.assertThat;
-import static com.google.common.truth.Truth.assertWithMessage;
-import static java.util.Arrays.asList;
-
-import com.google.protobuf.Internal.BooleanList;
-import java.util.Collections;
-import java.util.ConcurrentModificationException;
-import java.util.Iterator;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-/** Tests for {@link BooleanArrayList}. */
-@RunWith(JUnit4.class)
-public class BooleanArrayListTest {
-
-  private static final BooleanArrayList UNARY_LIST = newImmutableBooleanArrayList(true);
-  private static final BooleanArrayList TERTIARY_LIST =
-      newImmutableBooleanArrayList(true, false, true);
-
-  private BooleanArrayList list;
-
-  @Before
-  public void setUp() throws Exception {
-    list = new BooleanArrayList();
-  }
-
-  @Test
-  public void testEmptyListReturnsSameInstance() {
-    assertThat(BooleanArrayList.emptyList()).isSameInstanceAs(BooleanArrayList.emptyList());
-  }
-
-  @Test
-  public void testEmptyListIsImmutable() {
-    assertImmutable(BooleanArrayList.emptyList());
-  }
-
-  @Test
-  public void testMakeImmutable() {
-    list.addBoolean(true);
-    list.addBoolean(false);
-    list.addBoolean(true);
-    list.addBoolean(true);
-    list.makeImmutable();
-    assertImmutable(list);
-  }
-
-  @Test
-  public void testModificationWithIteration() {
-    list.addAll(asList(true, false, true, false));
-    Iterator<Boolean> iterator = list.iterator();
-    assertThat(list).hasSize(4);
-    assertThat((boolean) list.get(0)).isEqualTo(true);
-    assertThat((boolean) iterator.next()).isEqualTo(true);
-    list.set(0, true);
-    assertThat((boolean) iterator.next()).isEqualTo(false);
-
-    list.remove(0);
-    try {
-      iterator.next();
-      assertWithMessage("expected exception").fail();
-    } catch (ConcurrentModificationException e) {
-      // expected
-    }
-
-    iterator = list.iterator();
-    list.add(0, false);
-    try {
-      iterator.next();
-      assertWithMessage("expected exception").fail();
-    } catch (ConcurrentModificationException e) {
-      // expected
-    }
-  }
-
-  @Test
-  public void testGet() {
-    assertThat((boolean) TERTIARY_LIST.get(0)).isEqualTo(true);
-    assertThat((boolean) TERTIARY_LIST.get(1)).isEqualTo(false);
-    assertThat((boolean) TERTIARY_LIST.get(2)).isEqualTo(true);
-
-    try {
-      TERTIARY_LIST.get(-1);
-      assertWithMessage("expected exception").fail();
-    } catch (IndexOutOfBoundsException e) {
-      // expected
-    }
-
-    try {
-      TERTIARY_LIST.get(3);
-      assertWithMessage("expected exception").fail();
-    } catch (IndexOutOfBoundsException e) {
-      // expected
-    }
-  }
-
-  @Test
-  public void testGetBoolean() {
-    assertThat(TERTIARY_LIST.getBoolean(0)).isEqualTo(true);
-    assertThat(TERTIARY_LIST.getBoolean(1)).isEqualTo(false);
-    assertThat(TERTIARY_LIST.getBoolean(2)).isEqualTo(true);
-
-    try {
-      TERTIARY_LIST.get(-1);
-      assertWithMessage("expected exception").fail();
-    } catch (IndexOutOfBoundsException e) {
-      // expected
-    }
-
-    try {
-      TERTIARY_LIST.get(3);
-      assertWithMessage("expected exception").fail();
-    } catch (IndexOutOfBoundsException e) {
-      // expected
-    }
-  }
-
-  @Test
-  public void testIndexOf_nullElement() {
-    assertThat(TERTIARY_LIST.indexOf(null)).isEqualTo(-1);
-  }
-
-  @Test
-  public void testIndexOf_incompatibleElementType() {
-    assertThat(TERTIARY_LIST.indexOf(new Object())).isEqualTo(-1);
-  }
-
-  @Test
-  public void testIndexOf_notInList() {
-    assertThat(UNARY_LIST.indexOf(false)).isEqualTo(-1);
-  }
-
-  @Test
-  public void testIndexOf_notInListWithDuplicates() {
-    BooleanArrayList listWithDupes = newImmutableBooleanArrayList(true, true);
-    assertThat(listWithDupes.indexOf(false)).isEqualTo(-1);
-  }
-
-  @Test
-  public void testIndexOf_inList() {
-    assertThat(TERTIARY_LIST.indexOf(false)).isEqualTo(1);
-  }
-
-  @Test
-  public void testIndexOf_inListWithDuplicates_matchAtHead() {
-    BooleanArrayList listWithDupes = newImmutableBooleanArrayList(true, true, false);
-    assertThat(listWithDupes.indexOf(true)).isEqualTo(0);
-  }
-
-  @Test
-  public void testIndexOf_inListWithDuplicates_matchMidList() {
-    BooleanArrayList listWithDupes = newImmutableBooleanArrayList(false, true, true, false);
-    assertThat(listWithDupes.indexOf(true)).isEqualTo(1);
-  }
-
-  @Test
-  public void testContains_nullElement() {
-    assertThat(TERTIARY_LIST).doesNotContain(null);
-  }
-
-  @Test
-  public void testContains_incompatibleElementType() {
-    assertThat(TERTIARY_LIST).doesNotContain(new Object());
-  }
-
-  @Test
-  public void testContains_notInList() {
-    assertThat(UNARY_LIST).doesNotContain(false);
-  }
-
-  @Test
-  public void testContains_notInListWithDuplicates() {
-    BooleanArrayList listWithDupes = newImmutableBooleanArrayList(true, true);
-    assertThat(listWithDupes).doesNotContain(false);
-  }
-
-  @Test
-  public void testContains_inList() {
-    assertThat(TERTIARY_LIST).contains(false);
-  }
-
-  @Test
-  public void testContains_inListWithDuplicates_matchAtHead() {
-    BooleanArrayList listWithDupes = newImmutableBooleanArrayList(true, true, false);
-    assertThat(listWithDupes).contains(true);
-  }
-
-  @Test
-  public void testContains_inListWithDuplicates_matchMidList() {
-    BooleanArrayList listWithDupes = newImmutableBooleanArrayList(false, true, true, false);
-    assertThat(listWithDupes).contains(true);
-  }
-
-  @Test
-  public void testSize() {
-    assertThat(BooleanArrayList.emptyList()).isEmpty();
-    assertThat(UNARY_LIST).hasSize(1);
-    assertThat(TERTIARY_LIST).hasSize(3);
-
-    list.addBoolean(true);
-    list.addBoolean(false);
-    list.addBoolean(false);
-    list.addBoolean(false);
-    assertThat(list).hasSize(4);
-
-    list.remove(0);
-    assertThat(list).hasSize(3);
-
-    list.add(true);
-    assertThat(list).hasSize(4);
-  }
-
-  @Test
-  public void testSet() {
-    list.addBoolean(false);
-    list.addBoolean(false);
-
-    assertThat((boolean) list.set(0, true)).isEqualTo(false);
-    assertThat(list.getBoolean(0)).isEqualTo(true);
-
-    assertThat((boolean) list.set(1, false)).isEqualTo(false);
-    assertThat(list.getBoolean(1)).isEqualTo(false);
-
-    try {
-      list.set(-1, false);
-      assertWithMessage("expected exception").fail();
-    } catch (IndexOutOfBoundsException e) {
-      // expected
-    }
-
-    try {
-      list.set(2, false);
-      assertWithMessage("expected exception").fail();
-    } catch (IndexOutOfBoundsException e) {
-      // expected
-    }
-  }
-
-  @Test
-  public void testSetBoolean() {
-    list.addBoolean(true);
-    list.addBoolean(true);
-
-    assertThat(list.setBoolean(0, false)).isEqualTo(true);
-    assertThat(list.getBoolean(0)).isEqualTo(false);
-
-    assertThat(list.setBoolean(1, false)).isEqualTo(true);
-    assertThat(list.getBoolean(1)).isEqualTo(false);
-
-    try {
-      list.setBoolean(-1, false);
-      assertWithMessage("expected exception").fail();
-    } catch (IndexOutOfBoundsException e) {
-      // expected
-    }
-
-    try {
-      list.setBoolean(2, false);
-      assertWithMessage("expected exception").fail();
-    } catch (IndexOutOfBoundsException e) {
-      // expected
-    }
-  }
-
-  @Test
-  public void testAdd() {
-    assertThat(list).isEmpty();
-
-    assertThat(list.add(false)).isTrue();
-    assertThat(list).containsExactly(false);
-
-    assertThat(list.add(true)).isTrue();
-    list.add(0, false);
-    assertThat(list).containsExactly(false, false, true).inOrder();
-
-    list.add(0, true);
-    list.add(0, false);
-    // Force a resize by getting up to 11 elements.
-    for (int i = 0; i < 6; i++) {
-      list.add(i % 2 == 0);
-    }
-    assertThat(list)
-        .containsExactly(false, true, false, false, true, true, false, true, false, true, false)
-        .inOrder();
-
-    try {
-      list.add(-1, true);
-    } catch (IndexOutOfBoundsException e) {
-      // expected
-    }
-
-    try {
-      list.add(4, true);
-    } catch (IndexOutOfBoundsException e) {
-      // expected
-    }
-  }
-
-  @Test
-  public void testAddBoolean() {
-    assertThat(list).isEmpty();
-
-    list.addBoolean(false);
-    assertThat(list).containsExactly(false);
-
-    list.addBoolean(true);
-    assertThat(list).containsExactly(false, true).inOrder();
-  }
-
-  @Test
-  public void testAddAll() {
-    assertThat(list).isEmpty();
-
-    assertThat(list.addAll(Collections.singleton(true))).isTrue();
-    assertThat(list).hasSize(1);
-    assertThat((boolean) list.get(0)).isEqualTo(true);
-    assertThat(list.getBoolean(0)).isEqualTo(true);
-
-    assertThat(list.addAll(asList(false, true, false, true, false))).isTrue();
-    assertThat(list).containsExactly(true, false, true, false, true, false).inOrder();
-
-    assertThat(list.addAll(TERTIARY_LIST)).isTrue();
-    assertThat(list)
-        .containsExactly(true, false, true, false, true, false, true, false, true)
-        .inOrder();
-
-    assertThat(list.addAll(Collections.<Boolean>emptyList())).isFalse();
-    assertThat(list.addAll(BooleanArrayList.emptyList())).isFalse();
-  }
-
-  @Test
-  public void testEquals() {
-    BooleanArrayList list1 = new BooleanArrayList();
-    BooleanArrayList list2 = new BooleanArrayList();
-
-    assertThat(list1).isEqualTo(list2);
-  }
-
-  @Test
-  public void testRemove() {
-    list.addAll(TERTIARY_LIST);
-    assertThat((boolean) list.remove(0)).isEqualTo(true);
-    assertThat(list).containsExactly(false, true).inOrder();
-
-    assertThat(list.remove(Boolean.TRUE)).isTrue();
-    assertThat(list).containsExactly(false);
-
-    assertThat(list.remove(Boolean.TRUE)).isFalse();
-    assertThat(list).containsExactly(false);
-
-    assertThat((boolean) list.remove(0)).isEqualTo(false);
-    assertThat(list).isEmpty();
-
-    try {
-      list.remove(-1);
-      assertWithMessage("expected exception").fail();
-    } catch (IndexOutOfBoundsException e) {
-      // expected
-    }
-
-    try {
-      list.remove(0);
-      assertWithMessage("expected exception").fail();
-    } catch (IndexOutOfBoundsException e) {
-      // expected
-    }
-  }
-
-  @Test
-  public void testRemoveEnd_listAtCapacity() {
-    BooleanList toRemove = BooleanArrayList.emptyList().mutableCopyWithCapacity(1);
-    toRemove.addBoolean(true);
-    toRemove.remove(0);
-    assertThat(toRemove).isEmpty();
-  }
-
-  @Test
-  public void testRemove_listAtCapacity() {
-    BooleanList toRemove = BooleanArrayList.emptyList().mutableCopyWithCapacity(2);
-    toRemove.addBoolean(true);
-    toRemove.addBoolean(false);
-    toRemove.remove(0);
-    assertThat(toRemove).hasSize(1);
-    assertThat((boolean) toRemove.get(0)).isEqualTo(false);
-  }
-
-  @Test
-  public void testSublistRemoveEndOfCapacity() {
-    BooleanList toRemove = BooleanArrayList.emptyList().mutableCopyWithCapacity(1);
-    toRemove.addBoolean(true);
-    toRemove.subList(0, 1).clear();
-    assertThat(toRemove).isEmpty();
-  }
-
-  private void assertImmutable(BooleanList list) {
-
-    try {
-      list.add(true);
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.add(0, true);
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.addAll(Collections.<Boolean>emptyList());
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.addAll(Collections.singletonList(true));
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.addAll(new BooleanArrayList());
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.addAll(UNARY_LIST);
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.addAll(0, Collections.singleton(true));
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.addAll(0, UNARY_LIST);
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.addAll(0, Collections.<Boolean>emptyList());
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.addBoolean(false);
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.clear();
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.remove(1);
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.remove(new Object());
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.removeAll(Collections.<Boolean>emptyList());
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.removeAll(Collections.singleton(Boolean.TRUE));
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.removeAll(UNARY_LIST);
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.retainAll(Collections.<Boolean>emptyList());
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.removeAll(Collections.singleton(Boolean.TRUE));
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.retainAll(UNARY_LIST);
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.set(0, false);
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.setBoolean(0, false);
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-  }
-
-  private static BooleanArrayList newImmutableBooleanArrayList(boolean... elements) {
-    BooleanArrayList list = new BooleanArrayList();
-    for (boolean element : elements) {
-      list.addBoolean(element);
-    }
-    list.makeImmutable();
-    return list;
-  }
-}
diff --git a/libs/protobuf/java/core/src/test/java/com/google/protobuf/BoundedByteStringTest.java b/libs/protobuf/java/core/src/test/java/com/google/protobuf/BoundedByteStringTest.java
deleted file mode 100644
index 656d2c3..0000000
--- a/libs/protobuf/java/core/src/test/java/com/google/protobuf/BoundedByteStringTest.java
+++ /dev/null
@@ -1,113 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.common.truth.Truth.assertWithMessage;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.io.UnsupportedEncodingException;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-/**
- * This class tests {@link BoundedByteString}, which extends {@link LiteralByteString}, by
- * inheriting the tests from {@link LiteralByteStringTest}. The only method which is strange enough
- * that it needs to be overridden here is {@link #testToString()}.
- */
-@RunWith(JUnit4.class)
-public class BoundedByteStringTest extends LiteralByteStringTest {
-
-  @Override
-  @Before
-  public void setUp() throws Exception {
-    classUnderTest = "BoundedByteString";
-    byte[] sourceBytes = ByteStringTest.getTestBytes(2341, 11337766L);
-    int from = 100;
-    int to = sourceBytes.length - 100;
-    stringUnderTest = ByteString.copyFrom(sourceBytes).substring(from, to);
-    referenceBytes = new byte[to - from];
-    System.arraycopy(sourceBytes, from, referenceBytes, 0, to - from);
-    expectedHashCode = 727575887;
-  }
-
-  @Override
-  @Test
-  public void testToString() throws UnsupportedEncodingException {
-    String testString = "I love unicode \u1234\u5678 characters";
-    ByteString unicode = ByteString.wrap(testString.getBytes(Internal.UTF_8));
-    ByteString chopped = unicode.substring(2, unicode.size() - 6);
-    assertWithMessage("%s.substring() must have the expected type", classUnderTest)
-        .that(classUnderTest)
-        .isEqualTo(getActualClassName(chopped));
-
-    String roundTripString = chopped.toString(UTF_8);
-    assertWithMessage("%s unicode bytes must match", classUnderTest)
-        .that(testString.substring(2, testString.length() - 6))
-        .isEqualTo(roundTripString);
-  }
-
-  @Override
-  @Test
-  public void testCharsetToString() {
-    String testString = "I love unicode \u1234\u5678 characters";
-    ByteString unicode = ByteString.wrap(testString.getBytes(Internal.UTF_8));
-    ByteString chopped = unicode.substring(2, unicode.size() - 6);
-    assertWithMessage("%s.substring() must have the expected type", classUnderTest)
-        .that(classUnderTest)
-        .isEqualTo(getActualClassName(chopped));
-
-    String roundTripString = chopped.toString(Internal.UTF_8);
-    assertWithMessage("%s unicode bytes must match", classUnderTest)
-        .that(testString.substring(2, testString.length() - 6))
-        .isEqualTo(roundTripString);
-  }
-
-  @Override
-  @Test
-  public void testJavaSerialization() throws Exception {
-    ByteArrayOutputStream out = new ByteArrayOutputStream();
-    ObjectOutputStream oos = new ObjectOutputStream(out);
-    oos.writeObject(stringUnderTest);
-    oos.close();
-    byte[] pickled = out.toByteArray();
-    InputStream in = new ByteArrayInputStream(pickled);
-    ObjectInputStream ois = new ObjectInputStream(in);
-    Object o = ois.readObject();
-    assertWithMessage("Didn't get a ByteString back").that(o).isInstanceOf(ByteString.class);
-    assertWithMessage("Should get an equal ByteString back").that(stringUnderTest).isEqualTo(o);
-  }
-}
diff --git a/libs/protobuf/java/core/src/test/java/com/google/protobuf/ByteBufferWriterTest.java b/libs/protobuf/java/core/src/test/java/com/google/protobuf/ByteBufferWriterTest.java
deleted file mode 100644
index 11cdb02..0000000
--- a/libs/protobuf/java/core/src/test/java/com/google/protobuf/ByteBufferWriterTest.java
+++ /dev/null
@@ -1,85 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import java.util.Random;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-/** Tests for {@link ByteBufferWriter}. */
-@RunWith(JUnit4.class)
-public class ByteBufferWriterTest {
-
-  @Test
-  public void testHeapBuffer() throws IOException {
-    // Test a small and large buffer.
-    testWrite(ByteBuffer.allocate(100));
-    testWrite(ByteBuffer.allocate(1024 * 100));
-  }
-
-  @Test
-  public void testDirectBuffer() throws IOException {
-    // Test a small and large buffer.
-    testWrite(ByteBuffer.allocateDirect(100));
-    testWrite(ByteBuffer.allocateDirect(1024 * 100));
-  }
-
-  private void testWrite(ByteBuffer buffer) throws IOException {
-    fillRandom(buffer);
-    ByteArrayOutputStream os = new ByteArrayOutputStream(buffer.remaining());
-    ByteBufferWriter.write(buffer, os);
-    assertThat(buffer.position()).isEqualTo(0);
-    assertThat(Arrays.equals(toArray(buffer), os.toByteArray())).isTrue();
-  }
-
-  private void fillRandom(ByteBuffer buf) {
-    byte[] bytes = new byte[buf.remaining()];
-    new Random().nextBytes(bytes);
-    buf.put(bytes);
-    buf.flip();
-    return;
-  }
-
-  private byte[] toArray(ByteBuffer buf) {
-    int originalPosition = buf.position();
-    byte[] bytes = new byte[buf.remaining()];
-    buf.get(bytes);
-    buf.position(originalPosition);
-    return bytes;
-  }
-}
diff --git a/libs/protobuf/java/core/src/test/java/com/google/protobuf/ByteStringTest.java b/libs/protobuf/java/core/src/test/java/com/google/protobuf/ByteStringTest.java
deleted file mode 100644
index f0035be..0000000
--- a/libs/protobuf/java/core/src/test/java/com/google/protobuf/ByteStringTest.java
+++ /dev/null
@@ -1,1004 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.common.truth.Truth.assertThat;
-import static com.google.common.truth.Truth.assertWithMessage;
-
-import com.google.protobuf.ByteString.Output;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.lang.reflect.Field;
-import java.nio.ByteBuffer;
-import java.nio.charset.Charset;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.Iterator;
-import java.util.List;
-import java.util.NoSuchElementException;
-import java.util.Random;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-/**
- * Test methods with implementations in {@link ByteString}, plus do some top-level "integration"
- * tests.
- */
-@RunWith(JUnit4.class)
-public class ByteStringTest {
-
-  private static final Charset UTF_16 = Charset.forName("UTF-16");
-
-  static byte[] getTestBytes(int size, long seed) {
-    Random random = new Random(seed);
-    byte[] result = new byte[size];
-    random.nextBytes(result);
-    return result;
-  }
-
-  private static byte[] getTestBytes(int size) {
-    return getTestBytes(size, 445566L);
-  }
-
-  private static byte[] getTestBytes() {
-    return getTestBytes(1000);
-  }
-
-  // Compare the entire left array with a subset of the right array.
-  private static boolean isArrayRange(byte[] left, byte[] right, int rightOffset, int length) {
-    boolean stillEqual = (left.length == length);
-    for (int i = 0; (stillEqual && i < length); ++i) {
-      stillEqual = (left[i] == right[rightOffset + i]);
-    }
-    return stillEqual;
-  }
-
-  // Returns true only if the given two arrays have identical contents.
-  private static boolean isArray(byte[] left, byte[] right) {
-    return left.length == right.length && isArrayRange(left, right, 0, left.length);
-  }
-
-  @Test
-  public void testCompare_equalByteStrings_compareEqual() throws Exception {
-    byte[] referenceBytes = getTestBytes();
-    ByteString string1 = ByteString.copyFrom(referenceBytes);
-    ByteString string2 = ByteString.copyFrom(referenceBytes);
-
-    assertWithMessage("ByteString instances containing the same data must compare equal.")
-        .that(ByteString.unsignedLexicographicalComparator().compare(string1, string2))
-        .isEqualTo(0);
-  }
-
-  @Test
-  public void testCompare_byteStringsSortLexicographically() throws Exception {
-    ByteString app = ByteString.copyFromUtf8("app");
-    ByteString apple = ByteString.copyFromUtf8("apple");
-    ByteString banana = ByteString.copyFromUtf8("banana");
-
-    Comparator<ByteString> comparator = ByteString.unsignedLexicographicalComparator();
-
-    assertWithMessage("ByteString(app) < ByteString(apple)")
-        .that(comparator.compare(app, apple) < 0)
-        .isTrue();
-    assertWithMessage("ByteString(app) < ByteString(banana)")
-        .that(comparator.compare(app, banana) < 0)
-        .isTrue();
-    assertWithMessage("ByteString(apple) < ByteString(banana)")
-        .that(comparator.compare(apple, banana) < 0)
-        .isTrue();
-  }
-
-  @Test
-  public void testCompare_interpretsByteValuesAsUnsigned() throws Exception {
-    // Two's compliment of `-1` == 0b11111111 == 255
-    ByteString twoHundredFiftyFive = ByteString.copyFrom(new byte[] {-1});
-    // 0b00000001 == 1
-    ByteString one = ByteString.copyFrom(new byte[] {1});
-
-    assertWithMessage("ByteString comparison treats bytes as unsigned values")
-        .that(ByteString.unsignedLexicographicalComparator().compare(one, twoHundredFiftyFive) < 0)
-        .isTrue();
-  }
-
-  @Test
-  public void testSubstring_beginIndex() {
-    byte[] bytes = getTestBytes();
-    ByteString substring = ByteString.copyFrom(bytes).substring(500);
-    assertWithMessage("substring must contain the tail of the string")
-        .that(isArrayRange(substring.toByteArray(), bytes, 500, bytes.length - 500))
-        .isTrue();
-  }
-
-  @Test
-  public void testEmpty_isEmpty() {
-    ByteString byteString = ByteString.empty();
-    assertThat(byteString.isEmpty()).isTrue();
-    assertWithMessage("ByteString.empty() must return empty byte array")
-        .that(isArray(byteString.toByteArray(), new byte[] {}))
-        .isTrue();
-  }
-
-  @Test
-  public void testEmpty_referenceEquality() {
-    assertThat(ByteString.empty()).isSameInstanceAs(ByteString.EMPTY);
-    assertThat(ByteString.empty()).isSameInstanceAs(ByteString.empty());
-  }
-
-  @Test
-  public void testFromHex_hexString() {
-    ByteString byteString;
-    byteString = ByteString.fromHex("0a0b0c");
-    assertWithMessage("fromHex must contain the expected bytes")
-        .that(isArray(byteString.toByteArray(), new byte[] {0x0a, 0x0b, 0x0c}))
-        .isTrue();
-
-    byteString = ByteString.fromHex("0A0B0C");
-    assertWithMessage("fromHex must contain the expected bytes")
-        .that(isArray(byteString.toByteArray(), new byte[] {0x0a, 0x0b, 0x0c}))
-        .isTrue();
-
-    byteString = ByteString.fromHex("0a0b0c0d0e0f");
-    assertWithMessage("fromHex must contain the expected bytes")
-        .that(isArray(byteString.toByteArray(), new byte[] {0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f}))
-        .isTrue();
-  }
-
-  @Test
-  @SuppressWarnings("AlwaysThrows") // Verifying that indeed these calls do throw.
-  public void testFromHex_invalidHexString() {
-    try {
-      ByteString.fromHex("a0b0c");
-      assertWithMessage("Should throw").fail();
-    } catch (NumberFormatException expected) {
-      assertThat(expected).hasMessageThat().contains("even");
-    }
-
-    try {
-      ByteString.fromHex("0x0y0z");
-      assertWithMessage("Should throw").fail();
-    } catch (NumberFormatException expected) {
-      assertThat(expected).hasMessageThat().contains("[0-9a-fA-F]");
-    }
-
-    try {
-      ByteString.fromHex("0à««");
-      assertWithMessage("Should throw").fail();
-    } catch (NumberFormatException expected) {
-      assertThat(expected).hasMessageThat().contains("[0-9a-fA-F]");
-    }
-  }
-
-  @Test
-  public void testCopyFrom_bytesOffsetSize() {
-    byte[] bytes = getTestBytes();
-    ByteString byteString = ByteString.copyFrom(bytes, 500, 200);
-    assertWithMessage("copyFrom sub-range must contain the expected bytes")
-        .that(isArrayRange(byteString.toByteArray(), bytes, 500, 200))
-        .isTrue();
-  }
-
-  @Test
-  public void testCopyFrom_bytes() {
-    byte[] bytes = getTestBytes();
-    ByteString byteString = ByteString.copyFrom(bytes);
-    assertWithMessage("copyFrom must contain the expected bytes")
-        .that(isArray(byteString.toByteArray(), bytes))
-        .isTrue();
-  }
-
-  @Test
-  public void testCopyFrom_byteBufferSize() {
-    byte[] bytes = getTestBytes();
-    ByteBuffer byteBuffer = ByteBuffer.allocate(bytes.length);
-    byteBuffer.put(bytes);
-    byteBuffer.position(500);
-    ByteString byteString = ByteString.copyFrom(byteBuffer, 200);
-    assertWithMessage("copyFrom byteBuffer sub-range must contain the expected bytes")
-        .that(isArrayRange(byteString.toByteArray(), bytes, 500, 200))
-        .isTrue();
-  }
-
-  @Test
-  public void testCopyFrom_byteBuffer() {
-    byte[] bytes = getTestBytes();
-    ByteBuffer byteBuffer = ByteBuffer.allocate(bytes.length);
-    byteBuffer.put(bytes);
-    byteBuffer.position(500);
-    ByteString byteString = ByteString.copyFrom(byteBuffer);
-    assertWithMessage("copyFrom byteBuffer sub-range must contain the expected bytes")
-        .that(isArrayRange(byteString.toByteArray(), bytes, 500, bytes.length - 500))
-        .isTrue();
-  }
-
-  @Test
-  public void testCopyFrom_stringEncoding() {
-    String testString = "I love unicode \u1234\u5678 characters";
-    ByteString byteString = ByteString.copyFrom(testString, UTF_16);
-    byte[] testBytes = testString.getBytes(UTF_16);
-    assertWithMessage("copyFrom string must respect the charset")
-        .that(isArrayRange(byteString.toByteArray(), testBytes, 0, testBytes.length))
-        .isTrue();
-  }
-
-  @Test
-  public void testCopyFrom_utf8() {
-    String testString = "I love unicode \u1234\u5678 characters";
-    ByteString byteString = ByteString.copyFromUtf8(testString);
-    byte[] testBytes = testString.getBytes(Internal.UTF_8);
-    assertWithMessage("copyFromUtf8 string must respect the charset")
-        .that(isArrayRange(byteString.toByteArray(), testBytes, 0, testBytes.length))
-        .isTrue();
-  }
-
-  @Test
-  public void testCopyFrom_iterable() {
-    byte[] testBytes = getTestBytes(77777, 113344L);
-    final List<ByteString> pieces = makeConcretePieces(testBytes);
-    // Call copyFrom() on a Collection
-    ByteString byteString = ByteString.copyFrom(pieces);
-    assertWithMessage("copyFrom a List must contain the expected bytes")
-        .that(isArrayRange(byteString.toByteArray(), testBytes, 0, testBytes.length))
-        .isTrue();
-    // Call copyFrom on an iteration that's not a collection
-    ByteString byteStringAlt =
-        ByteString.copyFrom(
-            new Iterable<ByteString>() {
-              @Override
-              public Iterator<ByteString> iterator() {
-                return pieces.iterator();
-              }
-            });
-    assertWithMessage("copyFrom from an Iteration must contain the expected bytes")
-        .that(byteString)
-        .isEqualTo(byteStringAlt);
-  }
-
-  @Test
-  public void testCopyFrom_lengthTooBig() {
-    byte[] testBytes = getTestBytes(100);
-    try {
-      ByteString.copyFrom(testBytes, 0, 200);
-      assertWithMessage("Should throw").fail();
-    } catch (IndexOutOfBoundsException expected) {
-    }
-
-    try {
-      ByteString.copyFrom(testBytes, 99, 2);
-      assertWithMessage("Should throw").fail();
-    } catch (IndexOutOfBoundsException expected) {
-    }
-
-    ByteBuffer buf = ByteBuffer.wrap(testBytes);
-    try {
-      ByteString.copyFrom(buf, 101);
-      assertWithMessage("Should throw").fail();
-    } catch (IndexOutOfBoundsException expected) {
-    }
-
-    try {
-      ByteString.copyFrom(testBytes, -1, 10);
-      assertWithMessage("Should throw").fail();
-    } catch (IndexOutOfBoundsException expected) {
-    }
-  }
-
-  @Test
-  public void testCopyTo_targetOffset() {
-    byte[] bytes = getTestBytes();
-    ByteString byteString = ByteString.copyFrom(bytes);
-    byte[] target = new byte[bytes.length + 1000];
-    byteString.copyTo(target, 400);
-    assertWithMessage("copyFrom byteBuffer sub-range must contain the expected bytes")
-        .that(isArrayRange(bytes, target, 400, bytes.length))
-        .isTrue();
-  }
-
-  @Test
-  public void testReadFrom_emptyStream() throws IOException {
-    ByteString byteString = ByteString.readFrom(new ByteArrayInputStream(new byte[0]));
-    assertWithMessage("reading an empty stream must result in the EMPTY constant byte string")
-        .that(ByteString.EMPTY)
-        .isSameInstanceAs(byteString);
-  }
-
-  @Test
-  public void testReadFrom_smallStream() throws IOException {
-    assertReadFrom(getTestBytes(10));
-  }
-
-  @Test
-  public void testReadFrom_mutating() throws IOException {
-    EvilInputStream eis = new EvilInputStream();
-    ByteString byteString = ByteString.readFrom(eis);
-    byte[] capturedArray = eis.capturedArray;
-
-    byte[] originalValue = byteString.toByteArray();
-    for (int x = 0; x < capturedArray.length; ++x) {
-      capturedArray[x] = (byte) 0;
-    }
-
-    byte[] newValue = byteString.toByteArray();
-    assertWithMessage("copyFrom byteBuffer must not grant access to underlying array")
-        .that(Arrays.equals(originalValue, newValue))
-        .isTrue();
-  }
-
-  // Tests sizes that are near the rope copy-out threshold.
-  @Test
-  public void testReadFrom_mediumStream() throws IOException {
-    assertReadFrom(getTestBytes(ByteString.CONCATENATE_BY_COPY_SIZE - 1));
-    assertReadFrom(getTestBytes(ByteString.CONCATENATE_BY_COPY_SIZE));
-    assertReadFrom(getTestBytes(ByteString.CONCATENATE_BY_COPY_SIZE + 1));
-    assertReadFrom(getTestBytes(200));
-  }
-
-  // Tests sizes that are over multi-segment rope threshold.
-  @Test
-  public void testReadFrom_largeStream() throws IOException {
-    assertReadFrom(getTestBytes(0x100));
-    assertReadFrom(getTestBytes(0x101));
-    assertReadFrom(getTestBytes(0x110));
-    assertReadFrom(getTestBytes(0x1000));
-    assertReadFrom(getTestBytes(0x1001));
-    assertReadFrom(getTestBytes(0x1010));
-    assertReadFrom(getTestBytes(0x10000));
-    assertReadFrom(getTestBytes(0x10001));
-    assertReadFrom(getTestBytes(0x10010));
-  }
-
-  // Tests sizes that are near the read buffer size.
-  @Test
-  public void testReadFrom_byteBoundaries() throws IOException {
-    final int min = ByteString.MIN_READ_FROM_CHUNK_SIZE;
-    final int max = ByteString.MAX_READ_FROM_CHUNK_SIZE;
-
-    assertReadFrom(getTestBytes(min - 1));
-    assertReadFrom(getTestBytes(min));
-    assertReadFrom(getTestBytes(min + 1));
-
-    assertReadFrom(getTestBytes(min * 2 - 1));
-    assertReadFrom(getTestBytes(min * 2));
-    assertReadFrom(getTestBytes(min * 2 + 1));
-
-    assertReadFrom(getTestBytes(min * 4 - 1));
-    assertReadFrom(getTestBytes(min * 4));
-    assertReadFrom(getTestBytes(min * 4 + 1));
-
-    assertReadFrom(getTestBytes(min * 8 - 1));
-    assertReadFrom(getTestBytes(min * 8));
-    assertReadFrom(getTestBytes(min * 8 + 1));
-
-    assertReadFrom(getTestBytes(max - 1));
-    assertReadFrom(getTestBytes(max));
-    assertReadFrom(getTestBytes(max + 1));
-
-    assertReadFrom(getTestBytes(max * 2 - 1));
-    assertReadFrom(getTestBytes(max * 2));
-    assertReadFrom(getTestBytes(max * 2 + 1));
-  }
-
-  // Tests that IOExceptions propagate through ByteString.readFrom().
-  @Test
-  public void testReadFrom_iOExceptions() {
-    try {
-      ByteString.readFrom(new FailStream());
-      assertWithMessage("readFrom must throw the underlying IOException").fail();
-
-    } catch (IOException e) {
-      assertWithMessage("readFrom must throw the expected exception")
-          .that(e)
-          .hasMessageThat()
-          .isEqualTo("synthetic failure");
-    }
-  }
-
-  // Tests that ByteString.readFrom works with streams that don't
-  // always fill their buffers.
-  @Test
-  public void testReadFrom_reluctantStream() throws IOException {
-    final byte[] data = getTestBytes(0x1000);
-
-    ByteString byteString = ByteString.readFrom(new ReluctantStream(data));
-    assertWithMessage("readFrom byte stream must contain the expected bytes")
-        .that(isArray(byteString.toByteArray(), data))
-        .isTrue();
-
-    // Same test as above, but with some specific chunk sizes.
-    assertReadFromReluctantStream(data, 100);
-    assertReadFromReluctantStream(data, 248);
-    assertReadFromReluctantStream(data, 249);
-    assertReadFromReluctantStream(data, 250);
-    assertReadFromReluctantStream(data, 251);
-    assertReadFromReluctantStream(data, 0x1000);
-    assertReadFromReluctantStream(data, 0x1001);
-  }
-
-  // Fails unless ByteString.readFrom reads the bytes correctly from a
-  // reluctant stream with the given chunkSize parameter.
-  private void assertReadFromReluctantStream(byte[] bytes, int chunkSize) throws IOException {
-    ByteString b = ByteString.readFrom(new ReluctantStream(bytes), chunkSize);
-    assertWithMessage("readFrom byte stream must contain the expected bytes")
-        .that(isArray(b.toByteArray(), bytes))
-        .isTrue();
-  }
-
-  // Tests that ByteString.readFrom works with streams that implement
-  // available().
-  @Test
-  public void testReadFrom_available() throws IOException {
-    final byte[] data = getTestBytes(0x1001);
-
-    ByteString byteString = ByteString.readFrom(new AvailableStream(data));
-    assertWithMessage("readFrom byte stream must contain the expected bytes")
-        .that(isArray(byteString.toByteArray(), data))
-        .isTrue();
-  }
-
-  // Fails unless ByteString.readFrom reads the bytes correctly.
-  private void assertReadFrom(byte[] bytes) throws IOException {
-    ByteString byteString = ByteString.readFrom(new ByteArrayInputStream(bytes));
-    assertWithMessage("readFrom byte stream must contain the expected bytes")
-        .that(isArray(byteString.toByteArray(), bytes))
-        .isTrue();
-  }
-
-  // A stream that fails when read.
-  private static final class FailStream extends InputStream {
-    @Override
-    public int read() throws IOException {
-      throw new IOException("synthetic failure");
-    }
-  }
-
-  // A stream that simulates blocking by only producing 250 characters
-  // per call to read(byte[]).
-  private static class ReluctantStream extends InputStream {
-    protected final byte[] data;
-    protected int pos = 0;
-
-    public ReluctantStream(byte[] data) {
-      this.data = data;
-    }
-
-    @Override
-    public int read() {
-      if (pos == data.length) {
-        return -1;
-      } else {
-        return data[pos++];
-      }
-    }
-
-    @Override
-    public int read(byte[] buf) {
-      return read(buf, 0, buf.length);
-    }
-
-    @Override
-    public int read(byte[] buf, int offset, int size) {
-      if (pos == data.length) {
-        return -1;
-      }
-      int count = Math.min(Math.min(size, data.length - pos), 250);
-      System.arraycopy(data, pos, buf, offset, count);
-      pos += count;
-      return count;
-    }
-  }
-
-  // Same as above, but also implements available().
-  private static final class AvailableStream extends ReluctantStream {
-    public AvailableStream(byte[] data) {
-      super(data);
-    }
-
-    @Override
-    public int available() {
-      return Math.min(250, data.length - pos);
-    }
-  }
-
-  // A stream which exposes the byte array passed into read(byte[], int, int).
-  private static class EvilInputStream extends InputStream {
-    public byte[] capturedArray = null;
-
-    @Override
-    public int read(byte[] buf, int off, int len) {
-      if (capturedArray != null) {
-        return -1;
-      } else {
-        capturedArray = buf;
-        for (int x = 0; x < len; ++x) {
-          buf[x] = (byte) x;
-        }
-        return len;
-      }
-    }
-
-    @Override
-    public int read() {
-      // Purposefully do nothing.
-      return -1;
-    }
-  }
-
-  // A stream which exposes the byte array passed into write(byte[], int, int).
-  private static class EvilOutputStream extends OutputStream {
-    public byte[] capturedArray = null;
-
-    @Override
-    public void write(byte[] buf, int off, int len) {
-      if (capturedArray == null) {
-        capturedArray = buf;
-      }
-    }
-
-    @Override
-    public void write(int ignored) {
-      // Purposefully do nothing.
-    }
-  }
-
-  @Test
-  public void testToStringUtf8() {
-    String testString = "I love unicode \u1234\u5678 characters";
-    byte[] testBytes = testString.getBytes(Internal.UTF_8);
-    ByteString byteString = ByteString.copyFrom(testBytes);
-    assertWithMessage("copyToStringUtf8 must respect the charset")
-        .that(testString)
-        .isEqualTo(byteString.toStringUtf8());
-  }
-
-  @Test
-  public void testToString() {
-    String toString =
-        ByteString.copyFrom("Here are some bytes: \t\u00a1".getBytes(Internal.UTF_8)).toString();
-    assertWithMessage(toString).that(toString.contains("size=24")).isTrue();
-    assertWithMessage(toString)
-        .that(toString.contains("contents=\"Here are some bytes: \\t\\302\\241\""))
-        .isTrue();
-  }
-
-  @Test
-  public void testToString_long() {
-    String toString =
-        ByteString.copyFrom(
-                "123456789012345678901234567890123456789012345678901234567890"
-                    .getBytes(Internal.UTF_8))
-            .toString();
-    assertWithMessage(toString).that(toString.contains("size=60")).isTrue();
-    assertWithMessage(toString)
-        .that(toString.contains("contents=\"12345678901234567890123456789012345678901234567...\""))
-        .isTrue();
-  }
-
-  @Test
-  public void testNewOutput_initialCapacity() throws IOException {
-    byte[] bytes = getTestBytes();
-    ByteString.Output output = ByteString.newOutput(bytes.length + 100);
-    output.write(bytes);
-    ByteString byteString = output.toByteString();
-    assertWithMessage("String built from newOutput(int) must contain the expected bytes")
-        .that(isArrayRange(bytes, byteString.toByteArray(), 0, bytes.length))
-        .isTrue();
-  }
-
-  // Test newOutput() using a variety of buffer sizes and a variety of (fixed)
-  // write sizes
-  @Test
-  public void testNewOutput_arrayWrite() {
-    byte[] bytes = getTestBytes();
-    int length = bytes.length;
-    int[] bufferSizes = {
-      128, 256, length / 2, length - 1, length, length + 1, 2 * length, 3 * length
-    };
-    int[] writeSizes = {1, 4, 5, 7, 23, bytes.length};
-
-    for (int bufferSize : bufferSizes) {
-      for (int writeSize : writeSizes) {
-        // Test writing the entire output writeSize bytes at a time.
-        ByteString.Output output = ByteString.newOutput(bufferSize);
-        for (int i = 0; i < length; i += writeSize) {
-          output.write(bytes, i, Math.min(writeSize, length - i));
-        }
-        ByteString byteString = output.toByteString();
-        assertWithMessage("String built from newOutput() must contain the expected bytes")
-            .that(isArrayRange(bytes, byteString.toByteArray(), 0, bytes.length))
-            .isTrue();
-      }
-    }
-  }
-
-  // Test newOutput() using a variety of buffer sizes, but writing all the
-  // characters using write(byte);
-  @Test
-  public void testNewOutput_writeChar() {
-    byte[] bytes = getTestBytes();
-    int length = bytes.length;
-    int[] bufferSizes = {
-      0, 1, 128, 256, length / 2, length - 1, length, length + 1, 2 * length, 3 * length
-    };
-    for (int bufferSize : bufferSizes) {
-      ByteString.Output output = ByteString.newOutput(bufferSize);
-      for (byte byteValue : bytes) {
-        output.write(byteValue);
-      }
-      ByteString byteString = output.toByteString();
-      assertWithMessage("String built from newOutput() must contain the expected bytes")
-          .that(isArrayRange(bytes, byteString.toByteArray(), 0, bytes.length))
-          .isTrue();
-    }
-  }
-
-  // Test newOutput() in which we write the bytes using a variety of methods
-  // and sizes, and in which we repeatedly call toByteString() in the middle.
-  @Test
-  public void testNewOutput_mixed() {
-    Random rng = new Random(1);
-    byte[] bytes = getTestBytes();
-    int length = bytes.length;
-    int[] bufferSizes = {
-      0, 1, 128, 256, length / 2, length - 1, length, length + 1, 2 * length, 3 * length
-    };
-
-    for (int bufferSize : bufferSizes) {
-      // Test writing the entire output using a mixture of write sizes and
-      // methods;
-      ByteString.Output output = ByteString.newOutput(bufferSize);
-      int position = 0;
-      while (position < bytes.length) {
-        if (rng.nextBoolean()) {
-          int count = 1 + rng.nextInt(bytes.length - position);
-          output.write(bytes, position, count);
-          position += count;
-        } else {
-          output.write(bytes[position]);
-          position++;
-        }
-        assertWithMessage("size() returns the right value").that(position).isEqualTo(output.size());
-        assertWithMessage("newOutput() substring must have correct bytes")
-            .that(isArrayRange(output.toByteString().toByteArray(), bytes, 0, position))
-            .isTrue();
-      }
-      ByteString byteString = output.toByteString();
-      assertWithMessage("String built from newOutput() must contain the expected bytes")
-          .that(isArrayRange(bytes, byteString.toByteArray(), 0, bytes.length))
-          .isTrue();
-    }
-  }
-
-  @Test
-  public void testNewOutputEmpty() {
-    // Make sure newOutput() correctly builds empty byte strings
-    ByteString byteString = ByteString.newOutput().toByteString();
-    assertThat(ByteString.EMPTY).isEqualTo(byteString);
-  }
-
-  @Test
-  public void testNewOutput_mutating() throws IOException {
-    Output os = ByteString.newOutput(5);
-    os.write(new byte[] {1, 2, 3, 4, 5});
-    EvilOutputStream eos = new EvilOutputStream();
-    os.writeTo(eos);
-    byte[] capturedArray = eos.capturedArray;
-    ByteString byteString = os.toByteString();
-    byte[] oldValue = byteString.toByteArray();
-    Arrays.fill(capturedArray, (byte) 0);
-    byte[] newValue = byteString.toByteArray();
-    assertWithMessage("Output must not provide access to the underlying byte array")
-        .that(Arrays.equals(oldValue, newValue))
-        .isTrue();
-  }
-
-  @Test
-  public void testNewCodedBuilder() throws IOException {
-    byte[] bytes = getTestBytes();
-    ByteString.CodedBuilder builder = ByteString.newCodedBuilder(bytes.length);
-    builder.getCodedOutput().writeRawBytes(bytes);
-    ByteString byteString = builder.build();
-    assertWithMessage("String built from newCodedBuilder() must contain the expected bytes")
-        .that(isArrayRange(bytes, byteString.toByteArray(), 0, bytes.length))
-        .isTrue();
-  }
-
-  @Test
-  public void testSubstringParity() {
-    byte[] bigBytes = getTestBytes(2048 * 1024, 113344L);
-    int start = 512 * 1024 - 3333;
-    int end = 512 * 1024 + 7777;
-    ByteString concreteSubstring = ByteString.copyFrom(bigBytes).substring(start, end);
-    boolean ok = true;
-    for (int i = start; ok && i < end; ++i) {
-      ok = (bigBytes[i] == concreteSubstring.byteAt(i - start));
-    }
-    assertWithMessage("Concrete substring didn't capture the right bytes").that(ok).isTrue();
-
-    ByteString literalString = ByteString.copyFrom(bigBytes, start, end - start);
-    assertWithMessage("Substring must be equal to literal string")
-        .that(literalString)
-        .isEqualTo(concreteSubstring);
-    assertWithMessage("Substring must have same hashcode as literal string")
-        .that(literalString.hashCode())
-        .isEqualTo(concreteSubstring.hashCode());
-  }
-
-  @Test
-  public void testCompositeSubstring() {
-    byte[] referenceBytes = getTestBytes(77748, 113344L);
-
-    List<ByteString> pieces = makeConcretePieces(referenceBytes);
-    ByteString listString = ByteString.copyFrom(pieces);
-
-    int from = 1000;
-    int to = 40000;
-    ByteString compositeSubstring = listString.substring(from, to);
-    byte[] substringBytes = compositeSubstring.toByteArray();
-    boolean stillEqual = true;
-    for (int i = 0; stillEqual && i < to - from; ++i) {
-      stillEqual = referenceBytes[from + i] == substringBytes[i];
-    }
-    assertWithMessage("Substring must return correct bytes").that(stillEqual).isTrue();
-
-    stillEqual = true;
-    for (int i = 0; stillEqual && i < to - from; ++i) {
-      stillEqual = referenceBytes[from + i] == compositeSubstring.byteAt(i);
-    }
-    assertWithMessage("Substring must support byteAt() correctly").that(stillEqual).isTrue();
-
-    ByteString literalSubstring = ByteString.copyFrom(referenceBytes, from, to - from);
-    assertWithMessage("Composite substring must equal a literal substring over the same bytes")
-        .that(literalSubstring)
-        .isEqualTo(compositeSubstring);
-    assertWithMessage("Literal substring must equal a composite substring over the same bytes")
-        .that(compositeSubstring)
-        .isEqualTo(literalSubstring);
-
-    assertWithMessage("We must get the same hashcodes for composite and literal substrings")
-        .that(literalSubstring.hashCode())
-        .isEqualTo(compositeSubstring.hashCode());
-
-    assertWithMessage("We can't be equal to a proper substring")
-        .that(compositeSubstring.equals(literalSubstring.substring(0, literalSubstring.size() - 1)))
-        .isFalse();
-  }
-
-  @Test
-  public void testCopyFromList() {
-    byte[] referenceBytes = getTestBytes(77748, 113344L);
-    ByteString literalString = ByteString.copyFrom(referenceBytes);
-
-    List<ByteString> pieces = makeConcretePieces(referenceBytes);
-    ByteString listString = ByteString.copyFrom(pieces);
-
-    assertWithMessage("Composite string must be equal to literal string")
-        .that(literalString)
-        .isEqualTo(listString);
-    assertWithMessage("Composite string must have same hashcode as literal string")
-        .that(literalString.hashCode())
-        .isEqualTo(listString.hashCode());
-  }
-
-  @Test
-  public void testConcat() {
-    byte[] referenceBytes = getTestBytes(77748, 113344L);
-    ByteString literalString = ByteString.copyFrom(referenceBytes);
-
-    List<ByteString> pieces = makeConcretePieces(referenceBytes);
-
-    Iterator<ByteString> iter = pieces.iterator();
-    ByteString concatenatedString = iter.next();
-    while (iter.hasNext()) {
-      concatenatedString = concatenatedString.concat(iter.next());
-    }
-
-    assertWithMessage("Concatenated string must be equal to literal string")
-        .that(literalString)
-        .isEqualTo(concatenatedString);
-    assertWithMessage("Concatenated string must have same hashcode as literal string")
-        .that(literalString.hashCode())
-        .isEqualTo(concatenatedString.hashCode());
-  }
-
-  /**
-   * Test the Rope implementation can deal with Empty nodes, even though we guard against them. See
-   * also {@link LiteralByteStringTest#testConcat_empty()}.
-   */
-  @Test
-  public void testConcat_empty() {
-    byte[] referenceBytes = getTestBytes(7748, 113344L);
-    ByteString literalString = ByteString.copyFrom(referenceBytes);
-
-    ByteString duo = RopeByteString.newInstanceForTest(literalString, literalString);
-    ByteString temp =
-        RopeByteString.newInstanceForTest(
-            RopeByteString.newInstanceForTest(literalString, ByteString.EMPTY),
-            RopeByteString.newInstanceForTest(ByteString.EMPTY, literalString));
-    ByteString quintet = RopeByteString.newInstanceForTest(temp, ByteString.EMPTY);
-
-    assertWithMessage("String with concatenated nulls must equal simple concatenate")
-        .that(quintet)
-        .isEqualTo(duo);
-    assertWithMessage("String with concatenated nulls have same hashcode as simple concatenate")
-        .that(duo.hashCode())
-        .isEqualTo(quintet.hashCode());
-
-    ByteString.ByteIterator duoIter = duo.iterator();
-    ByteString.ByteIterator quintetIter = quintet.iterator();
-    boolean stillEqual = true;
-    while (stillEqual && quintetIter.hasNext()) {
-      stillEqual = (duoIter.nextByte() == quintetIter.nextByte());
-    }
-    assertWithMessage("We must get the same characters by iterating").that(stillEqual).isTrue();
-    assertWithMessage("Iterator must be exhausted").that(duoIter.hasNext()).isFalse();
-    try {
-      duoIter.nextByte();
-      assertWithMessage("Should have thrown an exception.").fail();
-    } catch (NoSuchElementException e) {
-      // This is success
-    }
-    try {
-      quintetIter.nextByte();
-      assertWithMessage("Should have thrown an exception.").fail();
-    } catch (NoSuchElementException e) {
-      // This is success
-    }
-
-    // Test that even if we force empty strings in as rope leaves in this
-    // configuration, we always get a (possibly Bounded) LiteralByteString
-    // for a length 1 substring.
-    //
-    // It is possible, using the testing factory method to create deeply nested
-    // trees of empty leaves, to make a string that will fail this test.
-    for (int i = 1; i < duo.size(); ++i) {
-      assertWithMessage("Substrings of size() < 2 must not be RopeByteStrings")
-          .that(duo.substring(i - 1, i) instanceof ByteString.LeafByteString)
-          .isTrue();
-    }
-    for (int i = 1; i < quintet.size(); ++i) {
-      assertWithMessage("Substrings of size() < 2 must not be RopeByteStrings")
-          .that(quintet.substring(i - 1, i) instanceof ByteString.LeafByteString)
-          .isTrue();
-    }
-  }
-
-  @Test
-  public void testStartsWith() {
-    byte[] bytes = getTestBytes(1000, 1234L);
-    ByteString string = ByteString.copyFrom(bytes);
-    ByteString prefix = ByteString.copyFrom(bytes, 0, 500);
-    ByteString suffix = ByteString.copyFrom(bytes, 400, 600);
-    assertThat(string.startsWith(ByteString.EMPTY)).isTrue();
-    assertThat(string.startsWith(string)).isTrue();
-    assertThat(string.startsWith(prefix)).isTrue();
-    assertThat(string.startsWith(suffix)).isFalse();
-    assertThat(prefix.startsWith(suffix)).isFalse();
-    assertThat(suffix.startsWith(prefix)).isFalse();
-    assertThat(ByteString.EMPTY.startsWith(prefix)).isFalse();
-    assertThat(ByteString.EMPTY.startsWith(ByteString.EMPTY)).isTrue();
-  }
-
-  @Test
-  public void testEndsWith() {
-    byte[] bytes = getTestBytes(1000, 1234L);
-    ByteString string = ByteString.copyFrom(bytes);
-    ByteString prefix = ByteString.copyFrom(bytes, 0, 500);
-    ByteString suffix = ByteString.copyFrom(bytes, 400, 600);
-    assertThat(string.endsWith(ByteString.EMPTY)).isTrue();
-    assertThat(string.endsWith(string)).isTrue();
-    assertThat(string.endsWith(suffix)).isTrue();
-    assertThat(string.endsWith(prefix)).isFalse();
-    assertThat(suffix.endsWith(prefix)).isFalse();
-    assertThat(prefix.endsWith(suffix)).isFalse();
-    assertThat(ByteString.EMPTY.endsWith(suffix)).isFalse();
-    assertThat(ByteString.EMPTY.endsWith(ByteString.EMPTY)).isTrue();
-  }
-
-  static List<ByteString> makeConcretePieces(byte[] referenceBytes) {
-    List<ByteString> pieces = new ArrayList<ByteString>();
-    // Starting length should be small enough that we'll do some concatenating by
-    // copying if we just concatenate all these pieces together.
-    for (int start = 0, length = 16; start < referenceBytes.length; start += length) {
-      length = (length << 1) - 1;
-      if (start + length > referenceBytes.length) {
-        length = referenceBytes.length - start;
-      }
-      pieces.add(ByteString.copyFrom(referenceBytes, start, length));
-    }
-    return pieces;
-  }
-
-  private byte[] substringUsingWriteTo(ByteString data, int offset, int length) throws IOException {
-    ByteArrayOutputStream output = new ByteArrayOutputStream();
-    data.writeTo(output, offset, length);
-    return output.toByteArray();
-  }
-
-  @Test
-  public void testWriteToOutputStream() throws Exception {
-    // Choose a size large enough so when two ByteStrings are concatenated they
-    // won't be merged into one byte array due to some optimizations.
-    final int dataSize = ByteString.CONCATENATE_BY_COPY_SIZE + 1;
-    byte[] data1 = new byte[dataSize];
-    Arrays.fill(data1, (byte) 1);
-    data1[1] = (byte) 11;
-    // Test LiteralByteString.writeTo(OutputStream,int,int)
-    ByteString left = ByteString.wrap(data1);
-    byte[] result = substringUsingWriteTo(left, 1, 1);
-    assertThat(result).hasLength(1);
-    assertThat(result[0]).isEqualTo((byte) 11);
-
-    byte[] data2 = new byte[dataSize];
-    Arrays.fill(data2, 0, data1.length, (byte) 2);
-    ByteString right = ByteString.wrap(data2);
-    // Concatenate two ByteStrings to create a RopeByteString.
-    ByteString root = left.concat(right);
-    // Make sure we are actually testing a RopeByteString with a simple tree
-    // structure.
-    assertThat(root.getTreeDepth()).isEqualTo(1);
-    // Write parts of the left node.
-    result = substringUsingWriteTo(root, 0, dataSize);
-    assertThat(result).hasLength(dataSize);
-    assertThat(result[0]).isEqualTo((byte) 1);
-    assertThat(result[dataSize - 1]).isEqualTo((byte) 1);
-    // Write parts of the right node.
-    result = substringUsingWriteTo(root, dataSize, dataSize);
-    assertThat(result).hasLength(dataSize);
-    assertThat(result[0]).isEqualTo((byte) 2);
-    assertThat(result[dataSize - 1]).isEqualTo((byte) 2);
-    // Write a segment of bytes that runs across both nodes.
-    result = substringUsingWriteTo(root, dataSize / 2, dataSize);
-    assertThat(result).hasLength(dataSize);
-    assertThat(result[0]).isEqualTo((byte) 1);
-    assertThat(result[dataSize - dataSize / 2 - 1]).isEqualTo((byte) 1);
-    assertThat(result[dataSize - dataSize / 2]).isEqualTo((byte) 2);
-    assertThat(result[dataSize - 1]).isEqualTo((byte) 2);
-  }
-
-  /** Tests ByteString uses Arrays based byte copier when running under Hotstop VM. */
-  @Test
-  public void testByteArrayCopier() throws Exception {
-    if (Android.isOnAndroidDevice()) {
-      return;
-    }
-    Field field = ByteString.class.getDeclaredField("byteArrayCopier");
-    field.setAccessible(true);
-    Object byteArrayCopier = field.get(null);
-    assertThat(byteArrayCopier).isNotNull();
-    assertWithMessage(byteArrayCopier.toString())
-        .that(byteArrayCopier.getClass().getSimpleName().endsWith("ArraysByteArrayCopier"))
-        .isTrue();
-  }
-}
diff --git a/libs/protobuf/java/core/src/test/java/com/google/protobuf/CachedFieldSizeTest.java b/libs/protobuf/java/core/src/test/java/com/google/protobuf/CachedFieldSizeTest.java
deleted file mode 100644
index d6f299a..0000000
--- a/libs/protobuf/java/core/src/test/java/com/google/protobuf/CachedFieldSizeTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import protobuf_unittest.UnittestProto.TestPackedTypes;
-import proto3_unittest.UnittestProto3;
-import protobuf_unittest.TestCachedFieldSizeMessage;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-@RunWith(JUnit4.class)
-public final class CachedFieldSizeTest {
-  // Regression test for b/74087933
-  @Test
-  public void testCachedFieldSize() throws Exception {
-    TestCachedFieldSizeMessage.Builder builder = TestCachedFieldSizeMessage.newBuilder();
-    builder.setProto2Child(TestUtil.getPackedSet());
-    builder.setProto3Child(
-        UnittestProto3.TestPackedTypes.parseFrom(TestUtil.getPackedSet().toByteArray()));
-    TestCachedFieldSizeMessage message = builder.build();
-
-    // Serialize once to cache all field sizes. This will use the experimental runtime because
-    // the proto has optimize_for = CODE_SIZE.
-    byte[] unused = message.toByteArray();
-    // Serialize individual submessages. This will use the generated implementation. If the
-    // experimental runtime hasn't set the correct cached size, this will throw an exception.
-    byte[] data2 = message.getProto2Child().toByteArray();
-    byte[] data3 = message.getProto3Child().toByteArray();
-
-    // Make sure the serialized data is correct.
-    assertThat(TestPackedTypes.parseFrom(data2)).isEqualTo(message.getProto2Child());
-    assertThat(UnittestProto3.TestPackedTypes.parseFrom(data3)).isEqualTo(message.getProto3Child());
-  }
-}
diff --git a/libs/protobuf/java/core/src/test/java/com/google/protobuf/CheckUtf8Test.java b/libs/protobuf/java/core/src/test/java/com/google/protobuf/CheckUtf8Test.java
deleted file mode 100644
index 6518372..0000000
--- a/libs/protobuf/java/core/src/test/java/com/google/protobuf/CheckUtf8Test.java
+++ /dev/null
@@ -1,175 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.common.truth.Truth.assertThat;
-import static com.google.common.truth.Truth.assertWithMessage;
-
-import proto2_test_check_utf8.TestCheckUtf8.BytesWrapper;
-import proto2_test_check_utf8.TestCheckUtf8.StringWrapper;
-import proto2_test_check_utf8_size.TestCheckUtf8Size.BytesWrapperSize;
-import proto2_test_check_utf8_size.TestCheckUtf8Size.StringWrapperSize;
-import java.io.ByteArrayInputStream;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-/**
- * Test that protos generated with file option java_string_check_utf8 do in fact perform appropriate
- * UTF-8 checks.
- */
-@RunWith(JUnit4.class)
-public class CheckUtf8Test {
-
-  private static final String UTF8_BYTE_STRING_TEXT = "some text π \uD83D\uDE00";
-  private static final ByteString UTF8_BYTE_STRING = ByteString.copyFromUtf8(UTF8_BYTE_STRING_TEXT);
-  private static final ByteString NON_UTF8_BYTE_STRING =
-      ByteString.copyFrom(new byte[] {(byte) 0x80}); // A lone continuation byte.
-
-  @Test
-  public void testBuildRequiredStringWithGoodUtf8() throws Exception {
-    assertThat(StringWrapper.newBuilder().setReqBytes(UTF8_BYTE_STRING).getReq())
-        .isEqualTo(UTF8_BYTE_STRING_TEXT);
-  }
-
-  @Test
-  public void testParseRequiredStringWithGoodUtf8() throws Exception {
-    ByteString serialized =
-        BytesWrapper.newBuilder().setReq(UTF8_BYTE_STRING).build().toByteString();
-    assertThat(StringWrapper.parseFrom(serialized).getReq()).isEqualTo(UTF8_BYTE_STRING_TEXT);
-  }
-
-  @Test
-  public void testBuildRequiredStringWithBadUtf8() throws Exception {
-    try {
-      StringWrapper.newBuilder().setReqBytes(NON_UTF8_BYTE_STRING);
-      assertWithMessage("Expected IllegalArgumentException for non UTF-8 byte string.").fail();
-    } catch (IllegalArgumentException exception) {
-      assertThat(exception).hasMessageThat().isEqualTo("Byte string is not UTF-8.");
-    }
-  }
-
-  @Test
-  public void testBuildOptionalStringWithBadUtf8() throws Exception {
-    try {
-      StringWrapper.newBuilder().setOptBytes(NON_UTF8_BYTE_STRING);
-      assertWithMessage("Expected IllegalArgumentException for non UTF-8 byte string.").fail();
-    } catch (IllegalArgumentException exception) {
-      assertThat(exception).hasMessageThat().isEqualTo("Byte string is not UTF-8.");
-    }
-  }
-
-  @Test
-  public void testBuildRepeatedStringWithBadUtf8() throws Exception {
-    try {
-      StringWrapper.newBuilder().addRepBytes(NON_UTF8_BYTE_STRING);
-      assertWithMessage("Expected IllegalArgumentException for non UTF-8 byte string.").fail();
-    } catch (IllegalArgumentException exception) {
-      assertThat(exception).hasMessageThat().isEqualTo("Byte string is not UTF-8.");
-    }
-  }
-
-  @Test
-  public void testParseRequiredStringWithBadUtf8() throws Exception {
-    byte[] serialized =
-        BytesWrapper.newBuilder().setReq(NON_UTF8_BYTE_STRING).build().toByteArray();
-    assertParseBadUtf8(StringWrapper.getDefaultInstance(), serialized);
-  }
-
-  @Test
-  public void testBuildRequiredStringWithBadUtf8Size() throws Exception {
-    try {
-      StringWrapperSize.newBuilder().setReqBytes(NON_UTF8_BYTE_STRING);
-      assertWithMessage("Expected IllegalArgumentException for non UTF-8 byte string.").fail();
-    } catch (IllegalArgumentException exception) {
-      assertThat(exception).hasMessageThat().isEqualTo("Byte string is not UTF-8.");
-    }
-  }
-
-  @Test
-  public void testBuildOptionalStringWithBadUtf8Size() throws Exception {
-    try {
-      StringWrapperSize.newBuilder().setOptBytes(NON_UTF8_BYTE_STRING);
-      assertWithMessage("Expected IllegalArgumentException for non UTF-8 byte string.").fail();
-    } catch (IllegalArgumentException exception) {
-      assertThat(exception).hasMessageThat().isEqualTo("Byte string is not UTF-8.");
-    }
-  }
-
-  @Test
-  public void testBuildRepeatedStringWithBadUtf8Size() throws Exception {
-    try {
-      StringWrapperSize.newBuilder().addRepBytes(NON_UTF8_BYTE_STRING);
-      assertWithMessage("Expected IllegalArgumentException for non UTF-8 byte string.").fail();
-    } catch (IllegalArgumentException exception) {
-      assertThat(exception).hasMessageThat().isEqualTo("Byte string is not UTF-8.");
-    }
-  }
-
-  @Test
-  public void testParseRequiredStringWithBadUtf8Size() throws Exception {
-    byte[] serialized =
-        BytesWrapperSize.newBuilder().setReq(NON_UTF8_BYTE_STRING).build().toByteArray();
-    assertParseBadUtf8(StringWrapperSize.getDefaultInstance(), serialized);
-  }
-
-  private void assertParseBadUtf8(MessageLite defaultInstance, byte[] data) throws Exception {
-    // Check combinations of (parser vs. builder) x (byte[] vs. InputStream)
-    try {
-      defaultInstance.getParserForType().parseFrom(data);
-      assertWithMessage("Expected InvalidProtocolBufferException for non UTF-8 byte string.")
-          .fail();
-    } catch (InvalidProtocolBufferException exception) {
-      assertThat(exception).hasMessageThat().isEqualTo("Protocol message had invalid UTF-8.");
-    }
-    try {
-      defaultInstance.newBuilderForType().mergeFrom(data);
-      assertWithMessage("Expected InvalidProtocolBufferException for non UTF-8 byte string.")
-          .fail();
-    } catch (InvalidProtocolBufferException exception) {
-      assertThat(exception).hasMessageThat().isEqualTo("Protocol message had invalid UTF-8.");
-    }
-    try {
-      defaultInstance.getParserForType().parseFrom(new ByteArrayInputStream(data));
-      assertWithMessage("Expected InvalidProtocolBufferException for non UTF-8 byte string.")
-          .fail();
-    } catch (InvalidProtocolBufferException exception) {
-      assertThat(exception).hasMessageThat().isEqualTo("Protocol message had invalid UTF-8.");
-    }
-    try {
-      defaultInstance.newBuilderForType().mergeFrom(new ByteArrayInputStream(data));
-      assertWithMessage("Expected InvalidProtocolBufferException for non UTF-8 byte string.")
-          .fail();
-    } catch (InvalidProtocolBufferException exception) {
-      assertThat(exception).hasMessageThat().isEqualTo("Protocol message had invalid UTF-8.");
-    }
-  }
-}
diff --git a/libs/protobuf/java/core/src/test/java/com/google/protobuf/CodedAdapterTest.java b/libs/protobuf/java/core/src/test/java/com/google/protobuf/CodedAdapterTest.java
deleted file mode 100644
index 6f5bf0c..0000000
--- a/libs/protobuf/java/core/src/test/java/com/google/protobuf/CodedAdapterTest.java
+++ /dev/null
@@ -1,110 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import com.google.protobuf.testing.Proto2Testing.Proto2Message;
-import com.google.protobuf.testing.Proto3Testing.Proto3Message;
-import java.io.IOException;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-@RunWith(JUnit4.class)
-public final class CodedAdapterTest {
-  @Before
-  public void setup() {
-    TestSchemas.registerGenericProto2Schemas();
-
-    Protobuf.getInstance()
-        .registerSchemaOverride(Proto3Message.class, TestSchemas.genericProto3Schema);
-  }
-
-  @Test
-  public void proto3Roundtrip() throws Exception {
-    Proto3Message expected = new Proto3MessageFactory(5, 10, 2, 2).newMessage();
-    byte[] expectedBytes = expected.toByteArray();
-
-    // Deserialize with BinaryReader and verify that the message matches the original.
-    Proto3Message result = fromByteArray(expectedBytes, Proto3Message.class);
-    assertThat(result).isEqualTo(expected);
-
-    // Now write it back out using BinaryWriter and verify the output length.
-    byte[] actualBytes = toByteArray(result, expectedBytes.length);
-
-    // Read back in the bytes and verify that it matches the original message.
-    Proto3Message actual = Proto3Message.parseFrom(actualBytes);
-    assertThat(actual).isEqualTo(expected);
-  }
-
-  @Test
-  public void proto2Roundtrip() throws Exception {
-    Proto2Message expected = new Proto2MessageFactory(5, 10, 2, 2).newMessage();
-    byte[] expectedBytes = expected.toByteArray();
-
-    // Deserialize with BinaryReader and verify that the message matches the original.
-    Proto2Message result = fromByteArray(expectedBytes, Proto2Message.class);
-    assertThat(result).isEqualTo(expected);
-
-    // Now write it back out using BinaryWriter and verify the output length.
-    byte[] actualBytes = toByteArray(result, expectedBytes.length);
-
-    // Read back in the bytes and verify that it matches the original message.
-    Proto2Message actual = Proto2Message.parseFrom(actualBytes);
-    assertThat(actual).isEqualTo(expected);
-  }
-
-  public static <T> byte[] toByteArray(T msg, int size) throws Exception {
-    Schema<T> schema = Protobuf.getInstance().schemaFor(msg);
-    byte[] out = new byte[size];
-    CodedOutputStreamWriter writer =
-        CodedOutputStreamWriter.forCodedOutput(CodedOutputStream.newInstance(out));
-    schema.writeTo(msg, writer);
-    assertThat(writer.getTotalBytesWritten()).isEqualTo(out.length);
-    return out;
-  }
-
-  public static <T> T fromByteArray(byte[] data, Class<T> messageType) {
-    Schema<T> schema = Protobuf.getInstance().schemaFor(messageType);
-    try {
-      T msg = schema.newInstance();
-      schema.mergeFrom(
-          msg,
-          CodedInputStreamReader.forCodedInput(CodedInputStream.newInstance(data)),
-          ExtensionRegistryLite.EMPTY_REGISTRY_LITE);
-      return msg;
-    } catch (IOException e) {
-      throw new RuntimeException(e);
-    }
-  }
-}
diff --git a/libs/protobuf/java/core/src/test/java/com/google/protobuf/CodedInputStreamTest.java b/libs/protobuf/java/core/src/test/java/com/google/protobuf/CodedInputStreamTest.java
deleted file mode 100644
index db3a0c2..0000000
--- a/libs/protobuf/java/core/src/test/java/com/google/protobuf/CodedInputStreamTest.java
+++ /dev/null
@@ -1,1372 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.common.truth.Truth.assertThat;
-import static com.google.common.truth.Truth.assertWithMessage;
-import static org.junit.Assert.assertArrayEquals;
-import protobuf_unittest.UnittestProto.BoolMessage;
-import protobuf_unittest.UnittestProto.Int32Message;
-import protobuf_unittest.UnittestProto.Int64Message;
-import protobuf_unittest.UnittestProto.TestAllTypes;
-import protobuf_unittest.UnittestProto.TestRecursiveMessage;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.FilterInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-/** Unit test for {@link CodedInputStream}. */
-@RunWith(JUnit4.class)
-public class CodedInputStreamTest {
-
-  private static final int DEFAULT_BLOCK_SIZE = 4096;
-
-  private enum InputType {
-    ARRAY {
-      @Override
-      CodedInputStream newDecoder(byte[] data, int blockSize) {
-        return CodedInputStream.newInstance(data);
-      }
-    },
-    NIO_HEAP {
-      @Override
-      CodedInputStream newDecoder(byte[] data, int blockSize) {
-        return CodedInputStream.newInstance(ByteBuffer.wrap(data));
-      }
-    },
-    NIO_DIRECT {
-      @Override
-      CodedInputStream newDecoder(byte[] data, int blockSize) {
-        ByteBuffer buffer = ByteBuffer.allocateDirect(data.length);
-        buffer.put(data);
-        buffer.flip();
-        return CodedInputStream.newInstance(buffer);
-      }
-    },
-    STREAM {
-      @Override
-      CodedInputStream newDecoder(byte[] data, int blockSize) {
-        return CodedInputStream.newInstance(new SmallBlockInputStream(data, blockSize));
-      }
-    },
-    ITER_DIRECT {
-      @Override
-      CodedInputStream newDecoder(byte[] data, int blockSize) {
-        if (blockSize > DEFAULT_BLOCK_SIZE) {
-          blockSize = DEFAULT_BLOCK_SIZE;
-        }
-        ArrayList<ByteBuffer> input = new ArrayList<ByteBuffer>();
-        for (int i = 0; i < data.length; i += blockSize) {
-          int rl = Math.min(blockSize, data.length - i);
-          ByteBuffer rb = ByteBuffer.allocateDirect(rl);
-          rb.put(data, i, rl);
-          rb.flip();
-          input.add(rb);
-        }
-        return CodedInputStream.newInstance(input);
-      }
-    },
-    STREAM_ITER_DIRECT {
-      @Override
-      CodedInputStream newDecoder(byte[] data, int blockSize) {
-        if (blockSize > DEFAULT_BLOCK_SIZE) {
-          blockSize = DEFAULT_BLOCK_SIZE;
-        }
-        ArrayList<ByteBuffer> input = new ArrayList<ByteBuffer>();
-        for (int i = 0; i < data.length; i += blockSize) {
-          int rl = Math.min(blockSize, data.length - i);
-          ByteBuffer rb = ByteBuffer.allocateDirect(rl);
-          rb.put(data, i, rl);
-          rb.flip();
-          input.add(rb);
-        }
-        return CodedInputStream.newInstance(new IterableByteBufferInputStream(input));
-      }
-    };
-
-    CodedInputStream newDecoder(byte[] data) {
-      return newDecoder(data, data.length);
-    }
-
-    abstract CodedInputStream newDecoder(byte[] data, int blockSize);
-  }
-
-  /**
-   * Helper to construct a byte array from a bunch of bytes. The inputs are actually ints so that I
-   * can use hex notation and not get stupid errors about precision.
-   */
-  private byte[] bytes(int... bytesAsInts) {
-    byte[] bytes = new byte[bytesAsInts.length];
-    for (int i = 0; i < bytesAsInts.length; i++) {
-      bytes[i] = (byte) bytesAsInts[i];
-    }
-    return bytes;
-  }
-
-  /**
-   * An InputStream which limits the number of bytes it reads at a time. We use this to make sure
-   * that CodedInputStream doesn't screw up when reading in small blocks.
-   */
-  private static final class SmallBlockInputStream extends FilterInputStream {
-    private final int blockSize;
-    private int skipCalls;
-    private int readCalls;
-
-    public SmallBlockInputStream(byte[] data, int blockSize) {
-      super(new ByteArrayInputStream(data));
-      this.blockSize = blockSize;
-    }
-
-    @Override
-    public int read() throws IOException {
-      readCalls++;
-      return super.read();
-    }
-
-    @Override
-    public int read(byte[] b) throws IOException {
-      readCalls++;
-      return super.read(b, 0, Math.min(b.length, blockSize));
-    }
-
-    @Override
-    public int read(byte[] b, int off, int len) throws IOException {
-      readCalls++;
-      return super.read(b, off, Math.min(len, blockSize));
-    }
-
-    @Override
-    public long skip(long len) throws IOException {
-      skipCalls++;
-      return super.skip(Math.min(len, blockSize));
-    }
-  }
-
-  private void assertDataConsumed(String msg, byte[] data, CodedInputStream input)
-      throws IOException {
-    assertWithMessage(msg).that(data).hasLength(input.getTotalBytesRead());
-    assertWithMessage(msg).that(input.isAtEnd()).isTrue();
-  }
-
-  /**
-   * Parses the given bytes using readRawVarint32() and readRawVarint64() and checks that the result
-   * matches the given value.
-   */
-  private void assertReadVarint(byte[] data, long value) throws Exception {
-    for (InputType inputType : InputType.values()) {
-      // Try different block sizes.
-      for (int blockSize = 1; blockSize <= 16; blockSize *= 2) {
-        CodedInputStream input = inputType.newDecoder(data, blockSize);
-        assertWithMessage(inputType.name()).that(input.readRawVarint32()).isEqualTo((int) value);
-        assertDataConsumed(inputType.name(), data, input);
-
-        input = inputType.newDecoder(data, blockSize);
-        assertWithMessage(inputType.name()).that(input.readRawVarint64()).isEqualTo(value);
-        assertDataConsumed(inputType.name(), data, input);
-
-        input = inputType.newDecoder(data, blockSize);
-        assertWithMessage(inputType.name()).that(input.readRawVarint64SlowPath()).isEqualTo(value);
-        assertDataConsumed(inputType.name(), data, input);
-
-        input = inputType.newDecoder(data, blockSize);
-        assertWithMessage(inputType.name())
-            .that(input.skipField(WireFormat.WIRETYPE_VARINT))
-            .isTrue();
-        assertDataConsumed(inputType.name(), data, input);
-      }
-    }
-
-    // Try reading direct from an InputStream.  We want to verify that it
-    // doesn't read past the end of the input, so we copy to a new, bigger
-    // array first.
-    byte[] longerData = new byte[data.length + 1];
-    System.arraycopy(data, 0, longerData, 0, data.length);
-    InputStream rawInput = new ByteArrayInputStream(longerData);
-    assertThat(CodedInputStream.readRawVarint32(rawInput)).isEqualTo((int) value);
-    assertThat(rawInput.available()).isEqualTo(1);
-  }
-
-  /**
-   * Parses the given bytes using readRawVarint32() and readRawVarint64() and expects them to fail
-   * with an InvalidProtocolBufferException whose description matches the given one.
-   */
-  private void assertReadVarintFailure(InvalidProtocolBufferException expected, byte[] data)
-      throws Exception {
-    for (InputType inputType : InputType.values()) {
-      try {
-        CodedInputStream input = inputType.newDecoder(data);
-        input.readRawVarint32();
-        assertWithMessage("%s: Should have thrown an exception.", inputType.name()).fail();
-      } catch (InvalidProtocolBufferException e) {
-        assertWithMessage(inputType.name())
-            .that(e)
-            .hasMessageThat()
-            .isEqualTo(expected.getMessage());
-      }
-      try {
-        CodedInputStream input = inputType.newDecoder(data);
-        input.readRawVarint64();
-        assertWithMessage("%s: Should have thrown an exception.", inputType.name()).fail();
-      } catch (InvalidProtocolBufferException e) {
-        assertWithMessage(inputType.name())
-            .that(e)
-            .hasMessageThat()
-            .isEqualTo(expected.getMessage());
-      }
-    }
-
-    // Make sure we get the same error when reading direct from an InputStream.
-    try {
-      CodedInputStream.readRawVarint32(new ByteArrayInputStream(data));
-      assertWithMessage("Should have thrown an exception.").fail();
-    } catch (InvalidProtocolBufferException e) {
-      assertThat(e).hasMessageThat().isEqualTo(expected.getMessage());
-    }
-  }
-
-  /** Tests readRawVarint32() and readRawVarint64(). */
-  @Test
-  public void testReadVarint() throws Exception {
-    assertReadVarint(bytes(0x00), 0);
-    assertReadVarint(bytes(0x01), 1);
-    assertReadVarint(bytes(0x7f), 127);
-    // 14882
-    assertReadVarint(bytes(0xa2, 0x74), (0x22 << 0) | (0x74 << 7));
-    // 2961488830
-    assertReadVarint(
-        bytes(0xbe, 0xf7, 0x92, 0x84, 0x0b),
-        (0x3e << 0) | (0x77 << 7) | (0x12 << 14) | (0x04 << 21) | (0x0bL << 28));
-
-    // 64-bit
-    // 7256456126
-    assertReadVarint(
-        bytes(0xbe, 0xf7, 0x92, 0x84, 0x1b),
-        (0x3e << 0) | (0x77 << 7) | (0x12 << 14) | (0x04 << 21) | (0x1bL << 28));
-    // 41256202580718336
-    assertReadVarint(
-        bytes(0x80, 0xe6, 0xeb, 0x9c, 0xc3, 0xc9, 0xa4, 0x49),
-        (0x00 << 0)
-            | (0x66 << 7)
-            | (0x6b << 14)
-            | (0x1c << 21)
-            | (0x43L << 28)
-            | (0x49L << 35)
-            | (0x24L << 42)
-            | (0x49L << 49));
-    // 11964378330978735131
-    assertReadVarint(
-        bytes(0x9b, 0xa8, 0xf9, 0xc2, 0xbb, 0xd6, 0x80, 0x85, 0xa6, 0x01),
-        (0x1b << 0)
-            | (0x28 << 7)
-            | (0x79 << 14)
-            | (0x42 << 21)
-            | (0x3bL << 28)
-            | (0x56L << 35)
-            | (0x00L << 42)
-            | (0x05L << 49)
-            | (0x26L << 56)
-            | (0x01L << 63));
-
-    // Failures
-    assertReadVarintFailure(
-        InvalidProtocolBufferException.malformedVarint(),
-        bytes(0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x00));
-    assertReadVarintFailure(InvalidProtocolBufferException.truncatedMessage(), bytes(0x80));
-  }
-
-  /**
-   * Parses the given bytes using readRawLittleEndian32() and checks that the result matches the
-   * given value.
-   */
-  private void assertReadLittleEndian32(byte[] data, int value) throws Exception {
-    for (InputType inputType : InputType.values()) {
-      // Try different block sizes.
-      for (int blockSize = 1; blockSize <= 16; blockSize *= 2) {
-        CodedInputStream input = inputType.newDecoder(data, blockSize);
-        assertWithMessage(inputType.name()).that(input.readRawLittleEndian32()).isEqualTo(value);
-        assertWithMessage(inputType.name()).that(input.isAtEnd()).isTrue();
-      }
-    }
-  }
-
-  /**
-   * Parses the given bytes using readRawLittleEndian64() and checks that the result matches the
-   * given value.
-   */
-  private void assertReadLittleEndian64(byte[] data, long value) throws Exception {
-    for (InputType inputType : InputType.values()) {
-      // Try different block sizes.
-      for (int blockSize = 1; blockSize <= 16; blockSize *= 2) {
-        CodedInputStream input = inputType.newDecoder(data, blockSize);
-        assertWithMessage(inputType.name()).that(input.readRawLittleEndian64()).isEqualTo(value);
-        assertWithMessage(inputType.name()).that(input.isAtEnd()).isTrue();
-      }
-    }
-  }
-
-  /** Tests readRawLittleEndian32() and readRawLittleEndian64(). */
-  @Test
-  public void testReadLittleEndian() throws Exception {
-    assertReadLittleEndian32(bytes(0x78, 0x56, 0x34, 0x12), 0x12345678);
-    assertReadLittleEndian32(bytes(0xf0, 0xde, 0xbc, 0x9a), 0x9abcdef0);
-
-    assertReadLittleEndian64(
-        bytes(0xf0, 0xde, 0xbc, 0x9a, 0x78, 0x56, 0x34, 0x12), 0x123456789abcdef0L);
-    assertReadLittleEndian64(
-        bytes(0x78, 0x56, 0x34, 0x12, 0xf0, 0xde, 0xbc, 0x9a), 0x9abcdef012345678L);
-  }
-
-  /** Test decodeZigZag32() and decodeZigZag64(). */
-  @Test
-  public void testDecodeZigZag() throws Exception {
-    assertThat(CodedInputStream.decodeZigZag32(0)).isEqualTo(0);
-    assertThat(CodedInputStream.decodeZigZag32(1)).isEqualTo(-1);
-    assertThat(CodedInputStream.decodeZigZag32(2)).isEqualTo(1);
-    assertThat(CodedInputStream.decodeZigZag32(3)).isEqualTo(-2);
-    assertThat(CodedInputStream.decodeZigZag32(0x7FFFFFFE)).isEqualTo(0x3FFFFFFF);
-    assertThat(CodedInputStream.decodeZigZag32(0x7FFFFFFF)).isEqualTo(0xC0000000);
-    assertThat(CodedInputStream.decodeZigZag32(0xFFFFFFFE)).isEqualTo(0x7FFFFFFF);
-    assertThat(CodedInputStream.decodeZigZag32(0xFFFFFFFF)).isEqualTo(0x80000000);
-
-    assertThat(CodedInputStream.decodeZigZag64(0)).isEqualTo(0);
-    assertThat(CodedInputStream.decodeZigZag64(1)).isEqualTo(-1);
-    assertThat(CodedInputStream.decodeZigZag64(2)).isEqualTo(1);
-    assertThat(CodedInputStream.decodeZigZag64(3)).isEqualTo(-2);
-    assertThat(CodedInputStream.decodeZigZag64(0x000000007FFFFFFEL)).isEqualTo(0x000000003FFFFFFFL);
-    assertThat(CodedInputStream.decodeZigZag64(0x000000007FFFFFFFL)).isEqualTo(0xFFFFFFFFC0000000L);
-    assertThat(CodedInputStream.decodeZigZag64(0x00000000FFFFFFFEL)).isEqualTo(0x000000007FFFFFFFL);
-    assertThat(CodedInputStream.decodeZigZag64(0x00000000FFFFFFFFL)).isEqualTo(0xFFFFFFFF80000000L);
-    assertThat(CodedInputStream.decodeZigZag64(0xFFFFFFFFFFFFFFFEL)).isEqualTo(0x7FFFFFFFFFFFFFFFL);
-    assertThat(CodedInputStream.decodeZigZag64(0xFFFFFFFFFFFFFFFFL)).isEqualTo(0x8000000000000000L);
-  }
-
-  /** Tests reading and parsing a whole message with every field type. */
-  @Test
-  public void testReadWholeMessage() throws Exception {
-    TestAllTypes message = TestUtil.getAllSet();
-
-    byte[] rawBytes = message.toByteArray();
-    assertThat(rawBytes).hasLength(message.getSerializedSize());
-
-    for (InputType inputType : InputType.values()) {
-      // Try different block sizes.
-      for (int blockSize = 1; blockSize < 256; blockSize *= 2) {
-        TestAllTypes message2 = TestAllTypes.parseFrom(inputType.newDecoder(rawBytes, blockSize));
-        TestUtil.assertAllFieldsSet(message2);
-      }
-    }
-  }
-
-  /** Tests skipField(). */
-  @Test
-  public void testSkipWholeMessage() throws Exception {
-    TestAllTypes message = TestUtil.getAllSet();
-    byte[] rawBytes = message.toByteArray();
-
-    InputType[] inputTypes = InputType.values();
-    CodedInputStream[] inputs = new CodedInputStream[inputTypes.length];
-    for (int i = 0; i < inputs.length; ++i) {
-      inputs[i] = inputTypes[i].newDecoder(rawBytes);
-    }
-    UnknownFieldSet.Builder unknownFields = UnknownFieldSet.newBuilder();
-
-    while (true) {
-      CodedInputStream input1 = inputs[0];
-      int tag = input1.readTag();
-      // Ensure that the rest match.
-      for (int i = 1; i < inputs.length; ++i) {
-        assertWithMessage(inputTypes[i].name()).that(inputs[i].readTag()).isEqualTo(tag);
-      }
-      if (tag == 0) {
-        break;
-      }
-      unknownFields.mergeFieldFrom(tag, input1);
-      // Skip the field for the rest of the inputs.
-      for (int i = 1; i < inputs.length; ++i) {
-        inputs[i].skipField(tag);
-      }
-    }
-  }
-
-
-  /**
-   * Test that a bug in skipRawBytes() has been fixed: if the skip skips exactly up to a limit, this
-   * should not break things.
-   */
-  @Test
-  public void testSkipRawBytesBug() throws Exception {
-    byte[] rawBytes = new byte[] {1, 2};
-    for (InputType inputType : InputType.values()) {
-      CodedInputStream input = inputType.newDecoder(rawBytes);
-      int limit = input.pushLimit(1);
-      input.skipRawBytes(1);
-      input.popLimit(limit);
-      assertWithMessage(inputType.name()).that(input.readRawByte()).isEqualTo(2);
-    }
-  }
-
-  /**
-   * Test that a bug in skipRawBytes() has been fixed: if the skip skips past the end of a buffer
-   * with a limit that has been set past the end of that buffer, this should not break things.
-   */
-  @Test
-  public void testSkipRawBytesPastEndOfBufferWithLimit() throws Exception {
-    byte[] rawBytes = new byte[] {1, 2, 3, 4, 5};
-    for (InputType inputType : InputType.values()) {
-      CodedInputStream input = inputType.newDecoder(rawBytes);
-      int limit = input.pushLimit(4);
-      // In order to expose the bug we need to read at least one byte to prime the
-      // buffer inside the CodedInputStream.
-      assertWithMessage(inputType.name()).that(input.readRawByte()).isEqualTo(1);
-      // Skip to the end of the limit.
-      input.skipRawBytes(3);
-      assertWithMessage(inputType.name()).that(input.isAtEnd()).isTrue();
-      input.popLimit(limit);
-      assertWithMessage(inputType.name()).that(input.readRawByte()).isEqualTo(5);
-    }
-  }
-
-  /**
-   * Test that calling skipRawBytes (when not merging a message) actually skips from the underlying
-   * inputstream, regardless of the buffer size used.
-   */
-  @Test
-  public void testSkipRawBytesActuallySkips() throws Exception {
-    SmallBlockInputStream bytes = new SmallBlockInputStream(new byte[] {1, 2, 3, 4, 5}, 3);
-    CodedInputStream input = CodedInputStream.newInstance(bytes, 1); // Tiny buffer
-    input.skipRawBytes(3);
-    input.skipRawBytes(2);
-    assertThat(bytes.skipCalls).isEqualTo(2);
-    assertThat(bytes.readCalls).isEqualTo(0);
-  }
-
-  @Test
-  public void testSkipHugeBlob() throws Exception {
-    // Allocate and initialize a 1MB blob.
-    int blobSize = 1 << 20;
-    byte[] blob = new byte[blobSize];
-    for (int i = 0; i < blob.length; i++) {
-      blob[i] = (byte) i;
-    }
-
-    for (InputType inputType : InputType.values()) {
-      CodedInputStream decoder = inputType.newDecoder(blob);
-      decoder.skipRawBytes(blobSize - 10);
-      byte[] remaining = decoder.readRawBytes(10);
-      assertArrayEquals(Arrays.copyOfRange(blob, blobSize - 10, blobSize), remaining);
-    }
-  }
-
-  /** Skipping a huge blob should not allocate excessive memory, so there should be no limit */
-  @Test
-  public void testSkipMaliciouslyHugeBlob() throws Exception {
-    InputStream is = new RepeatingInputStream(new byte[]{1}, Integer.MAX_VALUE);
-    CodedInputStream.newInstance(is).skipRawBytes(Integer.MAX_VALUE);
-  }
-
-  @Test
-  public void testReadHugeBlob() throws Exception {
-    // Allocate and initialize a 1MB blob.
-    byte[] blob = new byte[1 << 20];
-    for (int i = 0; i < blob.length; i++) {
-      blob[i] = (byte) i;
-    }
-
-    // Make a message containing it.
-    TestAllTypes.Builder builder = TestAllTypes.newBuilder();
-    TestUtil.setAllFields(builder);
-    builder.setOptionalBytes(ByteString.copyFrom(blob));
-    TestAllTypes message = builder.build();
-
-    byte[] data = message.toByteArray();
-    for (InputType inputType : InputType.values()) {
-      // Serialize and parse it.  Make sure to parse from an InputStream, not
-      // directly from a ByteString, so that CodedInputStream uses buffered
-      // reading.
-      TestAllTypes message2 = TestAllTypes.parseFrom(inputType.newDecoder(data));
-
-      assertWithMessage(inputType.name())
-          .that(message.getOptionalBytes())
-          .isEqualTo(message2.getOptionalBytes());
-
-      // Make sure all the other fields were parsed correctly.
-      TestAllTypes message3 =
-          TestAllTypes.newBuilder(message2)
-              .setOptionalBytes(TestUtil.getAllSet().getOptionalBytes())
-              .build();
-      TestUtil.assertAllFieldsSet(message3);
-    }
-  }
-
-  @Test
-  public void testReadMaliciouslyLargeBlob() throws Exception {
-    ByteString.Output rawOutput = ByteString.newOutput();
-    CodedOutputStream output = CodedOutputStream.newInstance(rawOutput);
-
-    int tag = WireFormat.makeTag(1, WireFormat.WIRETYPE_LENGTH_DELIMITED);
-    output.writeUInt32NoTag(tag);
-    output.writeUInt32NoTag(0x7FFFFFFF);
-    output.writeRawBytes(new byte[32]); // Pad with a few random bytes.
-    output.flush();
-
-    byte[] data = rawOutput.toByteString().toByteArray();
-    for (InputType inputType : InputType.values()) {
-      CodedInputStream input = inputType.newDecoder(data);
-      assertThat(input.readTag()).isEqualTo(tag);
-      try {
-        input.readBytes();
-        assertWithMessage("%s: Should have thrown an exception!", inputType.name()).fail();
-      } catch (InvalidProtocolBufferException e) {
-        // success.
-      }
-    }
-  }
-
-  /**
-   * Test we can do messages that are up to CodedInputStream#DEFAULT_SIZE_LIMIT in size (2G or
-   * Integer#MAX_SIZE).
-   *
-   * @throws IOException
-   */
-  @Test
-  public void testParseMessagesCloseTo2G() throws IOException {
-    byte[] serializedMessage = getBigSerializedMessage();
-    // How many of these big messages do we need to take us near our 2G limit?
-    int count = Integer.MAX_VALUE / serializedMessage.length;
-    // Now make an inputstream that will fake a near 2G message of messages
-    // returning our big serialized message 'count' times.
-    InputStream is = new RepeatingInputStream(serializedMessage, count);
-    // Parse should succeed!
-    TestAllTypes unused = TestAllTypes.parseFrom(is);
-  }
-
-  /**
-   * Test there is an exception if a message exceeds CodedInputStream#DEFAULT_SIZE_LIMIT in size (2G
-   * or Integer#MAX_SIZE).
-   *
-   * @throws IOException
-   */
-  @Test
-  public void testParseMessagesOver2G() throws IOException {
-    byte[] serializedMessage = getBigSerializedMessage();
-    // How many of these big messages do we need to take us near our 2G limit?
-    int count = Integer.MAX_VALUE / serializedMessage.length;
-    // Now add one to take us over the limit
-    count++;
-    // Now make an inputstream that will fake a near 2G message of messages
-    // returning our big serialized message 'count' times.
-    InputStream is = new RepeatingInputStream(serializedMessage, count);
-    try {
-      TestAllTypes.parseFrom(is);
-      assertWithMessage("Should have thrown an exception!").fail();
-    } catch (InvalidProtocolBufferException e) {
-      assertThat(e).hasMessageThat().contains("too large");
-    }
-  }
-
-  /*
-   * @return A serialized big message.
-   */
-  private static byte[] getBigSerializedMessage() {
-    byte[] value = new byte[16 * 1024 * 1024];
-    ByteString bsValue = ByteString.wrap(value);
-    return TestAllTypes.newBuilder().setOptionalBytes(bsValue).build().toByteArray();
-  }
-
-  /*
-   * An input stream that repeats a byte arrays' content a number of times.
-   * Simulates really large input without consuming loads of memory. Used above
-   * to test the parsing behavior when the input size exceeds 2G or close to it.
-   */
-  private static class RepeatingInputStream extends InputStream {
-    private final byte[] serializedMessage;
-    private final int count;
-    private int index = 0;
-    private int offset = 0;
-
-    RepeatingInputStream(byte[] serializedMessage, int count) {
-      this.serializedMessage = serializedMessage;
-      this.count = count;
-    }
-
-    @Override
-    public int read() throws IOException {
-      if (this.offset == this.serializedMessage.length) {
-        this.index++;
-        this.offset = 0;
-      }
-      if (this.index == this.count) {
-        return -1;
-      }
-      return this.serializedMessage[offset++];
-    }
-  }
-
-  private TestRecursiveMessage makeRecursiveMessage(int depth) {
-    if (depth == 0) {
-      return TestRecursiveMessage.newBuilder().setI(5).build();
-    } else {
-      return TestRecursiveMessage.newBuilder().setA(makeRecursiveMessage(depth - 1)).build();
-    }
-  }
-
-  private void assertMessageDepth(String msg, TestRecursiveMessage message, int depth) {
-    if (depth == 0) {
-      assertWithMessage(msg).that(message.hasA()).isFalse();
-      assertWithMessage(msg).that(message.getI()).isEqualTo(5);
-    } else {
-      assertWithMessage(msg).that(message.hasA()).isTrue();
-      assertMessageDepth(msg, message.getA(), depth - 1);
-    }
-  }
-
-  @Test
-  public void testMaliciousRecursion() throws Exception {
-    byte[] data100 = makeRecursiveMessage(100).toByteArray();
-    byte[] data101 = makeRecursiveMessage(101).toByteArray();
-
-    for (InputType inputType : InputType.values()) {
-      assertMessageDepth(
-          inputType.name(), TestRecursiveMessage.parseFrom(inputType.newDecoder(data100)), 100);
-
-      try {
-        TestRecursiveMessage.parseFrom(inputType.newDecoder(data101));
-        assertWithMessage("Should have thrown an exception!").fail();
-      } catch (InvalidProtocolBufferException e) {
-        // success.
-      }
-
-
-      CodedInputStream input = inputType.newDecoder(data100);
-      input.setRecursionLimit(8);
-      try {
-        TestRecursiveMessage.parseFrom(input);
-        assertWithMessage("%s: Should have thrown an exception!", inputType.name()).fail();
-      } catch (InvalidProtocolBufferException e) {
-        // success.
-      }
-    }
-  }
-
-  private void checkSizeLimitExceeded(InvalidProtocolBufferException e) {
-    assertThat(e)
-        .hasMessageThat()
-        .isEqualTo(InvalidProtocolBufferException.sizeLimitExceeded().getMessage());
-  }
-
-  @Test
-  public void testSizeLimit() throws Exception {
-    // NOTE: Size limit only applies to the stream-backed CIS.
-    CodedInputStream input =
-        CodedInputStream.newInstance(
-            new SmallBlockInputStream(TestUtil.getAllSet().toByteArray(), 16));
-    input.setSizeLimit(16);
-
-    try {
-      TestAllTypes.parseFrom(input);
-      assertWithMessage("Should have thrown an exception!").fail();
-    } catch (InvalidProtocolBufferException expected) {
-      checkSizeLimitExceeded(expected);
-    }
-  }
-
-  @Test
-  public void testResetSizeCounter() throws Exception {
-    // NOTE: Size limit only applies to the stream-backed CIS.
-    CodedInputStream input =
-        CodedInputStream.newInstance(new SmallBlockInputStream(new byte[256], 8));
-    input.setSizeLimit(16);
-    input.readRawBytes(16);
-    assertThat(input.getTotalBytesRead()).isEqualTo(16);
-
-    try {
-      input.readRawByte();
-      assertWithMessage("Should have thrown an exception!").fail();
-    } catch (InvalidProtocolBufferException expected) {
-      checkSizeLimitExceeded(expected);
-    }
-
-    input.resetSizeCounter();
-    assertThat(input.getTotalBytesRead()).isEqualTo(0);
-    input.readRawByte(); // No exception thrown.
-    input.resetSizeCounter();
-    assertThat(input.getTotalBytesRead()).isEqualTo(0);
-    input.readRawBytes(16);
-    assertThat(input.getTotalBytesRead()).isEqualTo(16);
-    input.resetSizeCounter();
-
-    try {
-      input.readRawBytes(17); // Hits limit again.
-      assertWithMessage("Should have thrown an exception!").fail();
-    } catch (InvalidProtocolBufferException expected) {
-      checkSizeLimitExceeded(expected);
-    }
-  }
-
-  @Test
-  public void testRefillBufferWithCorrectSize() throws Exception {
-    // NOTE: refillBuffer only applies to the stream-backed CIS.
-    byte[] bytes = "123456789".getBytes("UTF-8");
-    ByteArrayOutputStream rawOutput = new ByteArrayOutputStream();
-    CodedOutputStream output = CodedOutputStream.newInstance(rawOutput, bytes.length);
-
-    int tag = WireFormat.makeTag(1, WireFormat.WIRETYPE_LENGTH_DELIMITED);
-    output.writeUInt32NoTag(tag);
-    output.writeUInt32NoTag(bytes.length);
-    output.writeRawBytes(bytes);
-    output.writeUInt32NoTag(tag);
-    output.writeUInt32NoTag(bytes.length);
-    output.writeRawBytes(bytes);
-    output.writeRawByte(4);
-    output.flush();
-
-    // Input is two string with length 9 and one raw byte.
-    byte[] rawInput = rawOutput.toByteArray();
-    for (int inputStreamBufferLength = 8;
-        inputStreamBufferLength <= rawInput.length + 1;
-        inputStreamBufferLength++) {
-      CodedInputStream input =
-          CodedInputStream.newInstance(new ByteArrayInputStream(rawInput), inputStreamBufferLength);
-      input.setSizeLimit(rawInput.length - 1);
-      input.readString();
-      input.readString();
-      try {
-        input.readRawByte(); // Hits limit.
-        assertWithMessage("Should have thrown an exception!").fail();
-      } catch (InvalidProtocolBufferException expected) {
-        checkSizeLimitExceeded(expected);
-      }
-    }
-  }
-
-  @Test
-  public void testIsAtEnd() throws Exception {
-    CodedInputStream input = CodedInputStream.newInstance(new ByteArrayInputStream(new byte[5]));
-    try {
-      for (int i = 0; i < 5; i++) {
-        assertThat(input.isAtEnd()).isFalse();
-        input.readRawByte();
-      }
-      assertThat(input.isAtEnd()).isTrue();
-    } catch (Exception e) {
-      throw new AssertionError("Catch exception in the testIsAtEnd", e);
-    }
-  }
-
-  @Test
-  public void testCurrentLimitExceeded() throws Exception {
-    byte[] bytes = "123456789".getBytes("UTF-8");
-    ByteArrayOutputStream rawOutput = new ByteArrayOutputStream();
-    CodedOutputStream output = CodedOutputStream.newInstance(rawOutput, bytes.length);
-
-    int tag = WireFormat.makeTag(1, WireFormat.WIRETYPE_LENGTH_DELIMITED);
-    output.writeUInt32NoTag(tag);
-    output.writeUInt32NoTag(bytes.length);
-    output.writeRawBytes(bytes);
-    output.flush();
-
-    byte[] rawInput = rawOutput.toByteArray();
-    CodedInputStream input = CodedInputStream.newInstance(new ByteArrayInputStream(rawInput));
-    // The length of the whole rawInput
-    input.setSizeLimit(11);
-    // Some number that is smaller than the rawInput's length
-    // but larger than 2
-    input.pushLimit(5);
-    try {
-      input.readString();
-      assertWithMessage("Should have thrown an exception").fail();
-    } catch (InvalidProtocolBufferException expected) {
-      assertThat(expected)
-          .hasMessageThat()
-          .isEqualTo(InvalidProtocolBufferException.truncatedMessage().getMessage());
-    }
-  }
-
-  @Test
-  public void testSizeLimitMultipleMessages() throws Exception {
-    // NOTE: Size limit only applies to the stream-backed CIS.
-    byte[] bytes = new byte[256];
-    for (int i = 0; i < bytes.length; i++) {
-      bytes[i] = (byte) i;
-    }
-    CodedInputStream input = CodedInputStream.newInstance(new SmallBlockInputStream(bytes, 7));
-    input.setSizeLimit(16);
-    for (int i = 0; i < 256 / 16; i++) {
-      byte[] message = input.readRawBytes(16);
-      for (int j = 0; j < message.length; j++) {
-        assertThat(message[j] & 0xff).isEqualTo(i * 16 + j);
-      }
-      assertThat(input.getTotalBytesRead()).isEqualTo(16);
-      input.resetSizeCounter();
-      assertThat(input.getTotalBytesRead()).isEqualTo(0);
-    }
-  }
-
-  @Test
-  public void testReadString() throws Exception {
-    String lorem = "Lorem ipsum dolor sit amet ";
-    StringBuilder builder = new StringBuilder();
-    for (int i = 0; i < 4096; i += lorem.length()) {
-      builder.append(lorem);
-    }
-    lorem = builder.toString().substring(0, 4096);
-    byte[] bytes = lorem.getBytes("UTF-8");
-    ByteString.Output rawOutput = ByteString.newOutput();
-    CodedOutputStream output = CodedOutputStream.newInstance(rawOutput, bytes.length);
-
-    int tag = WireFormat.makeTag(1, WireFormat.WIRETYPE_LENGTH_DELIMITED);
-    output.writeUInt32NoTag(tag);
-    output.writeUInt32NoTag(bytes.length);
-    output.writeRawBytes(bytes);
-    output.flush();
-
-    byte[] rawInput = rawOutput.toByteString().toByteArray();
-    for (InputType inputType : InputType.values()) {
-      CodedInputStream input = inputType.newDecoder(rawInput);
-      assertWithMessage(inputType.name()).that(tag).isEqualTo(input.readTag());
-      String text = input.readString();
-      assertWithMessage(inputType.name()).that(lorem).isEqualTo(text);
-    }
-  }
-
-  @Test
-  public void testReadStringRequireUtf8() throws Exception {
-    String lorem = "Lorem ipsum dolor sit amet ";
-    StringBuilder builder = new StringBuilder();
-    for (int i = 0; i < 4096; i += lorem.length()) {
-      builder.append(lorem);
-    }
-    lorem = builder.toString().substring(0, 4096);
-    byte[] bytes = lorem.getBytes("UTF-8");
-    ByteString.Output rawOutput = ByteString.newOutput();
-    CodedOutputStream output = CodedOutputStream.newInstance(rawOutput, bytes.length);
-
-    int tag = WireFormat.makeTag(1, WireFormat.WIRETYPE_LENGTH_DELIMITED);
-    output.writeUInt32NoTag(tag);
-    output.writeUInt32NoTag(bytes.length);
-    output.writeRawBytes(bytes);
-    output.flush();
-
-    byte[] rawInput = rawOutput.toByteString().toByteArray();
-    for (InputType inputType : InputType.values()) {
-      CodedInputStream input = inputType.newDecoder(rawInput);
-      assertWithMessage(inputType.name()).that(tag).isEqualTo(input.readTag());
-      String text = input.readStringRequireUtf8();
-      assertWithMessage(inputType.name()).that(lorem).isEqualTo(text);
-    }
-  }
-
-  /**
-   * Tests that if we readString invalid UTF-8 bytes, no exception is thrown. Instead, the invalid
-   * bytes are replaced with the Unicode "replacement character" U+FFFD.
-   */
-  @Test
-  public void testReadStringInvalidUtf8() throws Exception {
-    ByteString.Output rawOutput = ByteString.newOutput();
-    CodedOutputStream output = CodedOutputStream.newInstance(rawOutput);
-
-    int tag = WireFormat.makeTag(1, WireFormat.WIRETYPE_LENGTH_DELIMITED);
-    output.writeUInt32NoTag(tag);
-    output.writeUInt32NoTag(1);
-    output.writeRawBytes(new byte[] {(byte) 0x80});
-    output.flush();
-
-    byte[] rawInput = rawOutput.toByteString().toByteArray();
-    for (InputType inputType : InputType.values()) {
-      CodedInputStream input = inputType.newDecoder(rawInput);
-      assertWithMessage(inputType.name()).that(input.readTag()).isEqualTo(tag);
-      String text = input.readString();
-      assertWithMessage(inputType.name()).that(text.charAt(0)).isEqualTo(0xfffd);
-    }
-  }
-
-  /**
-   * Tests that if we readStringRequireUtf8 invalid UTF-8 bytes, an InvalidProtocolBufferException
-   * is thrown.
-   */
-  @Test
-  public void testReadStringRequireUtf8InvalidUtf8() throws Exception {
-    ByteString.Output rawOutput = ByteString.newOutput();
-    CodedOutputStream output = CodedOutputStream.newInstance(rawOutput);
-
-    int tag = WireFormat.makeTag(1, WireFormat.WIRETYPE_LENGTH_DELIMITED);
-    output.writeUInt32NoTag(tag);
-    output.writeUInt32NoTag(1);
-    output.writeRawBytes(new byte[] {(byte) 0x80});
-    output.flush();
-
-    byte[] rawInput = rawOutput.toByteString().toByteArray();
-    for (InputType inputType : InputType.values()) {
-      CodedInputStream input = inputType.newDecoder(rawInput);
-      assertThat(input.readTag()).isEqualTo(tag);
-      try {
-        input.readStringRequireUtf8();
-        assertWithMessage("%s: Expected invalid UTF-8 exception.", inputType.name()).fail();
-      } catch (InvalidProtocolBufferException exception) {
-        assertWithMessage(inputType.name())
-            .that(exception)
-            .hasMessageThat()
-            .isEqualTo("Protocol message had invalid UTF-8.");
-      }
-    }
-  }
-
-  @Test
-  public void testReadFromSlice() throws Exception {
-    byte[] bytes = bytes(0, 1, 2, 3, 4, 5, 6, 7, 8, 9);
-    CodedInputStream in = CodedInputStream.newInstance(bytes, 3, 5);
-    assertThat(in.getTotalBytesRead()).isEqualTo(0);
-    for (int i = 3; i < 8; i++) {
-      assertThat(in.readRawByte()).isEqualTo(i);
-      assertThat(in.getTotalBytesRead()).isEqualTo(i - 2);
-    }
-    // eof
-    assertThat(in.readTag()).isEqualTo(0);
-    assertThat(in.getTotalBytesRead()).isEqualTo(5);
-  }
-
-  @Test
-  public void testInvalidTag() throws Exception {
-    // Any tag number which corresponds to field number zero is invalid and
-    // should throw InvalidProtocolBufferException.
-    for (InputType inputType : InputType.values()) {
-      for (int i = 0; i < 8; i++) {
-        try {
-          inputType.newDecoder(bytes(i)).readTag();
-          assertWithMessage("%s: Should have thrown an exception.", inputType.name()).fail();
-        } catch (InvalidProtocolBufferException e) {
-          assertWithMessage(inputType.name())
-              .that(e)
-              .hasMessageThat()
-              .isEqualTo(InvalidProtocolBufferException.invalidTag().getMessage());
-        }
-      }
-    }
-  }
-
-  @Test
-  public void testReadByteArray() throws Exception {
-    ByteString.Output rawOutput = ByteString.newOutput();
-    CodedOutputStream output = CodedOutputStream.newInstance(rawOutput);
-    // Zero-sized bytes field.
-    output.writeUInt32NoTag(0);
-    // One one-byte bytes field
-    output.writeUInt32NoTag(1);
-    output.writeRawBytes(new byte[] {(byte) 23});
-    // Another one-byte bytes field
-    output.writeUInt32NoTag(1);
-    output.writeRawBytes(new byte[] {(byte) 45});
-    // A bytes field large enough that won't fit into the 4K buffer.
-    final int bytesLength = 16 * 1024;
-    byte[] bytes = new byte[bytesLength];
-    bytes[0] = (byte) 67;
-    bytes[bytesLength - 1] = (byte) 89;
-    output.writeUInt32NoTag(bytesLength);
-    output.writeRawBytes(bytes);
-
-    output.flush();
-
-    byte[] rawInput = rawOutput.toByteString().toByteArray();
-    for (InputType inputType : InputType.values()) {
-      CodedInputStream inputStream = inputType.newDecoder(rawInput);
-
-      byte[] result = inputStream.readByteArray();
-      assertWithMessage(inputType.name()).that(result).isEmpty();
-      result = inputStream.readByteArray();
-      assertWithMessage(inputType.name()).that(result).hasLength(1);
-      assertWithMessage(inputType.name()).that(result[0]).isEqualTo((byte) 23);
-      result = inputStream.readByteArray();
-      assertWithMessage(inputType.name()).that(result).hasLength(1);
-      assertWithMessage(inputType.name()).that(result[0]).isEqualTo((byte) 45);
-      result = inputStream.readByteArray();
-      assertWithMessage(inputType.name()).that(result).hasLength(bytesLength);
-      assertWithMessage(inputType.name()).that(result[0]).isEqualTo((byte) 67);
-      assertWithMessage(inputType.name()).that(result[bytesLength - 1]).isEqualTo((byte) 89);
-    }
-  }
-
-  @Test
-  public void testReadLargeByteStringFromInputStream() throws Exception {
-    byte[] bytes = new byte[1024 * 1024];
-    for (int i = 0; i < bytes.length; i++) {
-      bytes[i] = (byte) (i & 0xFF);
-    }
-    ByteString.Output rawOutput = ByteString.newOutput();
-    CodedOutputStream output = CodedOutputStream.newInstance(rawOutput);
-    output.writeUInt32NoTag(bytes.length);
-    output.writeRawBytes(bytes);
-    output.flush();
-    byte[] data = rawOutput.toByteString().toByteArray();
-
-    CodedInputStream input =
-        CodedInputStream.newInstance(
-            new ByteArrayInputStream(data) {
-              @Override
-              public synchronized int available() {
-                return 0;
-              }
-            });
-    ByteString result = input.readBytes();
-    assertThat(ByteString.copyFrom(bytes)).isEqualTo(result);
-  }
-
-  @Test
-  public void testReadLargeByteArrayFromInputStream() throws Exception {
-    byte[] bytes = new byte[1024 * 1024];
-    for (int i = 0; i < bytes.length; i++) {
-      bytes[i] = (byte) (i & 0xFF);
-    }
-    ByteString.Output rawOutput = ByteString.newOutput();
-    CodedOutputStream output = CodedOutputStream.newInstance(rawOutput);
-    output.writeUInt32NoTag(bytes.length);
-    output.writeRawBytes(bytes);
-    output.flush();
-    byte[] data = rawOutput.toByteString().toByteArray();
-
-    CodedInputStream input =
-        CodedInputStream.newInstance(
-            new ByteArrayInputStream(data) {
-              @Override
-              public synchronized int available() {
-                return 0;
-              }
-            });
-    byte[] result = input.readByteArray();
-    assertThat(Arrays.equals(bytes, result)).isTrue();
-  }
-
-  @Test
-  public void testReadByteBuffer() throws Exception {
-    ByteString.Output rawOutput = ByteString.newOutput();
-    CodedOutputStream output = CodedOutputStream.newInstance(rawOutput);
-    // Zero-sized bytes field.
-    output.writeUInt32NoTag(0);
-    // One one-byte bytes field
-    output.writeUInt32NoTag(1);
-    output.writeRawBytes(new byte[] {(byte) 23});
-    // Another one-byte bytes field
-    output.writeUInt32NoTag(1);
-    output.writeRawBytes(new byte[] {(byte) 45});
-    // A bytes field large enough that won't fit into the 4K buffer.
-    final int bytesLength = 16 * 1024;
-    byte[] bytes = new byte[bytesLength];
-    bytes[0] = (byte) 67;
-    bytes[bytesLength - 1] = (byte) 89;
-    output.writeUInt32NoTag(bytesLength);
-    output.writeRawBytes(bytes);
-
-    output.flush();
-
-    byte[] rawInput = rawOutput.toByteString().toByteArray();
-    for (InputType inputType : InputType.values()) {
-      CodedInputStream inputStream = inputType.newDecoder(rawInput);
-
-      ByteBuffer result = inputStream.readByteBuffer();
-      assertWithMessage(inputType.name()).that(result.capacity()).isEqualTo(0);
-      result = inputStream.readByteBuffer();
-      assertWithMessage(inputType.name()).that(result.capacity()).isEqualTo(1);
-      assertWithMessage(inputType.name()).that(result.get()).isEqualTo((byte) 23);
-      result = inputStream.readByteBuffer();
-      assertWithMessage(inputType.name()).that(result.capacity()).isEqualTo(1);
-      assertWithMessage(inputType.name()).that(result.get()).isEqualTo((byte) 45);
-      result = inputStream.readByteBuffer();
-      assertWithMessage(inputType.name()).that(result.capacity()).isEqualTo(bytesLength);
-      assertWithMessage(inputType.name()).that(result.get()).isEqualTo((byte) 67);
-      result.position(bytesLength - 1);
-      assertWithMessage(inputType.name()).that(result.get()).isEqualTo((byte) 89);
-    }
-  }
-
-  @Test
-  public void testReadByteBufferAliasing() throws Exception {
-    ByteArrayOutputStream byteArrayStream = new ByteArrayOutputStream();
-    CodedOutputStream output = CodedOutputStream.newInstance(byteArrayStream);
-    // Zero-sized bytes field.
-    output.writeUInt32NoTag(0);
-    // One one-byte bytes field
-    output.writeUInt32NoTag(1);
-    output.writeRawBytes(new byte[] {(byte) 23});
-    // Another one-byte bytes field
-    output.writeUInt32NoTag(1);
-    output.writeRawBytes(new byte[] {(byte) 45});
-    // A bytes field large enough that won't fit into the 4K buffer.
-    final int bytesLength = 16 * 1024;
-    byte[] bytes = new byte[bytesLength];
-    bytes[0] = (byte) 67;
-    bytes[bytesLength - 1] = (byte) 89;
-    output.writeUInt32NoTag(bytesLength);
-    output.writeRawBytes(bytes);
-    output.flush();
-
-    byte[] data = byteArrayStream.toByteArray();
-
-    for (InputType inputType : InputType.values()) {
-      if (inputType == InputType.STREAM
-          || inputType == InputType.STREAM_ITER_DIRECT
-          || inputType == InputType.ITER_DIRECT) {
-        // Aliasing doesn't apply to stream-backed CIS.
-        continue;
-      }
-
-      // Without aliasing
-      CodedInputStream inputStream = inputType.newDecoder(data);
-      ByteBuffer result = inputStream.readByteBuffer();
-      assertWithMessage(inputType.name()).that(result.capacity()).isEqualTo(0);
-      result = inputStream.readByteBuffer();
-      assertWithMessage(inputType.name()).that(result.array() != data).isTrue();
-      assertWithMessage(inputType.name()).that(result.capacity()).isEqualTo(1);
-      assertWithMessage(inputType.name()).that(result.get()).isEqualTo((byte) 23);
-      result = inputStream.readByteBuffer();
-      assertWithMessage(inputType.name()).that(result.array() != data).isTrue();
-      assertWithMessage(inputType.name()).that(result.capacity()).isEqualTo(1);
-      assertWithMessage(inputType.name()).that(result.get()).isEqualTo((byte) 45);
-      result = inputStream.readByteBuffer();
-      assertWithMessage(inputType.name()).that(result.array() != data).isTrue();
-      assertWithMessage(inputType.name()).that(result.capacity()).isEqualTo(bytesLength);
-      assertWithMessage(inputType.name()).that(result.get()).isEqualTo((byte) 67);
-      result.position(bytesLength - 1);
-      assertWithMessage(inputType.name()).that(result.get()).isEqualTo((byte) 89);
-
-      // Enable aliasing
-      inputStream = inputType.newDecoder(data, data.length);
-      inputStream.enableAliasing(true);
-      result = inputStream.readByteBuffer();
-      assertWithMessage(inputType.name()).that(result.capacity()).isEqualTo(0);
-      result = inputStream.readByteBuffer();
-      if (result.hasArray()) {
-        assertWithMessage(inputType.name()).that(result.array() == data).isTrue();
-      }
-      assertWithMessage(inputType.name()).that(result.capacity()).isEqualTo(1);
-      assertWithMessage(inputType.name()).that(result.get()).isEqualTo((byte) 23);
-      result = inputStream.readByteBuffer();
-      if (result.hasArray()) {
-        assertWithMessage(inputType.name()).that(result.array() == data).isTrue();
-      }
-      assertWithMessage(inputType.name()).that(result.capacity()).isEqualTo(1);
-      assertWithMessage(inputType.name()).that(result.get()).isEqualTo((byte) 45);
-      result = inputStream.readByteBuffer();
-      if (result.hasArray()) {
-        assertWithMessage(inputType.name()).that(result.array() == data).isTrue();
-      }
-      assertWithMessage(inputType.name()).that(result.capacity()).isEqualTo(bytesLength);
-      assertWithMessage(inputType.name()).that(result.get()).isEqualTo((byte) 67);
-      result.position(bytesLength - 1);
-      assertWithMessage(inputType.name()).that(result.get()).isEqualTo((byte) 89);
-    }
-  }
-
-  @Test
-  public void testIterableByteBufferInputStreamReadBytesWithAlias() throws Exception {
-    ByteArrayOutputStream byteArrayStream = new ByteArrayOutputStream();
-    CodedOutputStream output = CodedOutputStream.newInstance(byteArrayStream);
-    // A bytes field large enough that won't fit into the default block buffer.
-    // 4.5 is to test the case where the total size of input is not aligned with DEFAULT_BLOCK_SIZE.
-    final int bytesLength = DEFAULT_BLOCK_SIZE * 4 + (DEFAULT_BLOCK_SIZE / 2);
-    byte[] bytes = new byte[bytesLength];
-    for (int i = 0; i < bytesLength; i++) {
-      bytes[i] = (byte) (i % 256);
-    }
-    output.writeByteArrayNoTag(bytes);
-    output.flush();
-
-    // Input data is split into multiple ByteBuffers so that a single bytes spans across them.
-    // CodedInputStream with aliasing will decode it as a consequent rope by wrapping ByteBuffers.
-    byte[] data = byteArrayStream.toByteArray();
-    ArrayList<ByteBuffer> input = new ArrayList<>();
-    for (int i = 0; i < data.length; i += DEFAULT_BLOCK_SIZE) {
-      int rl = Math.min(DEFAULT_BLOCK_SIZE, data.length - i);
-      ByteBuffer rb = ByteBuffer.allocateDirect(rl);
-      rb.put(data, i, rl);
-      rb.flip();
-      input.add(rb);
-    }
-    final CodedInputStream inputStream = CodedInputStream.newInstance(input, true);
-    inputStream.enableAliasing(true);
-
-    ByteString result = inputStream.readBytes();
-    for (int i = 0; i < bytesLength; i++) {
-      assertThat(result.byteAt(i)).isEqualTo((byte) (i % 256));
-    }
-  }
-
-  @Test
-  public void testCompatibleTypes() throws Exception {
-    long data = 0x100000000L;
-    Int64Message message = Int64Message.newBuilder().setData(data).build();
-    byte[] serialized = message.toByteArray();
-    for (InputType inputType : InputType.values()) {
-      CodedInputStream inputStream = inputType.newDecoder(serialized);
-
-      // Test int64(long) is compatible with bool(boolean)
-      BoolMessage msg2 = BoolMessage.parseFrom(inputStream);
-      assertThat(msg2.getData()).isTrue();
-
-      // Test int64(long) is compatible with int32(int)
-      inputStream = inputType.newDecoder(serialized);
-      Int32Message msg3 = Int32Message.parseFrom(inputStream);
-      assertThat(msg3.getData()).isEqualTo((int) data);
-    }
-  }
-
-  @Test
-  public void testSkipInvalidVarint_FastPath() throws Exception {
-    // Fast path: We have >= 10 bytes available. Ensure we properly recognize a non-ending varint.
-    byte[] data = new byte[] {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0};
-    for (InputType inputType : InputType.values()) {
-      try {
-        CodedInputStream input = inputType.newDecoder(data);
-        input.skipField(WireFormat.makeTag(1, WireFormat.WIRETYPE_VARINT));
-        assertWithMessage("%s: Should have thrown an exception.", inputType.name()).fail();
-      } catch (InvalidProtocolBufferException e) {
-        // Expected
-      }
-    }
-  }
-
-  @Test
-  public void testSkipInvalidVarint_SlowPath() throws Exception {
-    // Slow path: < 10 bytes available. Ensure we properly recognize a non-ending varint.
-    byte[] data = new byte[] {-1, -1, -1, -1, -1, -1, -1, -1, -1};
-    for (InputType inputType : InputType.values()) {
-      try {
-        CodedInputStream input = inputType.newDecoder(data);
-        input.skipField(WireFormat.makeTag(1, WireFormat.WIRETYPE_VARINT));
-        assertWithMessage("%s: Should have thrown an exception.", inputType.name()).fail();
-      } catch (InvalidProtocolBufferException e) {
-        // Expected
-      }
-    }
-  }
-
-  @Test
-  public void testSkipPastEndOfByteArrayInput() throws Exception {
-    try {
-      CodedInputStream.newInstance(new ByteArrayInputStream(new byte[100])).skipRawBytes(101);
-      assertWithMessage("Should have thrown an exception").fail();
-    } catch (InvalidProtocolBufferException e) {
-      // Expected
-    }
-  }
-
-  @Test
-  public void testMaliciousInputStream() throws Exception {
-    ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-    CodedOutputStream codedOutputStream = CodedOutputStream.newInstance(outputStream);
-    codedOutputStream.writeByteArrayNoTag(new byte[] { 0x0, 0x1, 0x2, 0x3, 0x4, 0x5 });
-    codedOutputStream.flush();
-    final List<byte[]> maliciousCapture = new ArrayList<>();
-    InputStream inputStream = new ByteArrayInputStream(outputStream.toByteArray()) {
-      @Override
-      public synchronized int read(byte[] b, int off, int len) {
-        maliciousCapture.add(b);
-        return super.read(b, off, len);
-      }
-    };
-
-    // test ByteString
-
-    CodedInputStream codedInputStream = CodedInputStream.newInstance(inputStream, 1);
-    ByteString byteString = codedInputStream.readBytes();
-    assertThat(byteString.byteAt(0)).isEqualTo(0x0);
-    maliciousCapture.get(1)[0] = 0x9;
-    assertThat(byteString.byteAt(0)).isEqualTo(0x0);
-
-    // test ByteBuffer
-
-    inputStream.reset();
-    maliciousCapture.clear();
-    codedInputStream = CodedInputStream.newInstance(inputStream, 1);
-    ByteBuffer byteBuffer = codedInputStream.readByteBuffer();
-    assertThat(byteBuffer.get(0)).isEqualTo(0x0);
-    maliciousCapture.get(1)[0] = 0x9;
-    assertThat(byteBuffer.get(0)).isEqualTo(0x0);
-
-    // test byte[]
-
-    inputStream.reset();
-    maliciousCapture.clear();
-    codedInputStream = CodedInputStream.newInstance(inputStream, 1);
-    byte[] byteArray = codedInputStream.readByteArray();
-    assertThat(byteArray[0]).isEqualTo(0x0);
-    maliciousCapture.get(1)[0] = 0x9;
-    assertThat(byteArray[0]).isEqualTo(0x9); // MODIFICATION! Should we fix?
-
-    // test rawBytes
-
-    inputStream.reset();
-    maliciousCapture.clear();
-    codedInputStream = CodedInputStream.newInstance(inputStream, 1);
-    int length = codedInputStream.readRawVarint32();
-    byteArray = codedInputStream.readRawBytes(length);
-    assertThat(byteArray[0]).isEqualTo(0x0);
-    maliciousCapture.get(1)[0] = 0x9;
-    assertThat(byteArray[0]).isEqualTo(0x9); // MODIFICATION! Should we fix?
-  }
-
-  @Test
-  public void testInvalidInputYieldsInvalidProtocolBufferException_readTag() throws Exception {
-    byte[] input = new byte[] {0x0a, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, 0x77};
-    CodedInputStream inputStream = CodedInputStream.newInstance(input);
-    try {
-      inputStream.readTag();
-      int size = inputStream.readRawVarint32();
-      inputStream.pushLimit(size);
-      inputStream.readTag();
-      assertWithMessage("Should have thrown an exception").fail();
-    } catch (InvalidProtocolBufferException ex) {
-      // Expected.
-    }
-  }
-
-  @Test
-  public void testInvalidInputYieldsInvalidProtocolBufferException_readBytes() throws Exception {
-    byte[] input =
-        new byte[] {0x0a, (byte) 0xff, (byte) 0xff, (byte) 0xff, (byte) 0xff, 0x67, 0x1a, 0x1a};
-    CodedInputStream inputStream = CodedInputStream.newInstance(input);
-    try {
-      inputStream.readTag();
-      int size = inputStream.readRawVarint32();
-      inputStream.pushLimit(size);
-      inputStream.readBytes();
-      assertWithMessage("Should have thrown an exception").fail();
-    } catch (InvalidProtocolBufferException ex) {
-      // Expected.
-    }
-  }
-}
diff --git a/libs/protobuf/java/core/src/test/java/com/google/protobuf/CodedOutputStreamTest.java b/libs/protobuf/java/core/src/test/java/com/google/protobuf/CodedOutputStreamTest.java
deleted file mode 100644
index ef27323..0000000
--- a/libs/protobuf/java/core/src/test/java/com/google/protobuf/CodedOutputStreamTest.java
+++ /dev/null
@@ -1,842 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.common.truth.Truth.assertThat;
-import static com.google.common.truth.Truth.assertWithMessage;
-
-import com.google.protobuf.CodedOutputStream.OutOfSpaceException;
-import protobuf_unittest.UnittestProto.SparseEnumMessage;
-import protobuf_unittest.UnittestProto.TestAllTypes;
-import protobuf_unittest.UnittestProto.TestPackedTypes;
-import protobuf_unittest.UnittestProto.TestSparseEnum;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-/** Unit test for {@link CodedOutputStream}. */
-@RunWith(JUnit4.class)
-public class CodedOutputStreamTest {
-  private interface Coder {
-    CodedOutputStream stream();
-
-    byte[] toByteArray();
-
-    OutputType getOutputType();
-  }
-
-  private static final class OutputStreamCoder implements Coder {
-    private final CodedOutputStream stream;
-    private final ByteArrayOutputStream output;
-
-    OutputStreamCoder(int size) {
-      output = new ByteArrayOutputStream();
-      stream = CodedOutputStream.newInstance(output, size);
-    }
-
-    @Override
-    public CodedOutputStream stream() {
-      return stream;
-    }
-
-    @Override
-    public byte[] toByteArray() {
-      return output.toByteArray();
-    }
-
-    @Override
-    public OutputType getOutputType() {
-      return OutputType.STREAM;
-    }
-  }
-
-  private static final class ArrayCoder implements Coder {
-    private final CodedOutputStream stream;
-    private final byte[] bytes;
-
-    ArrayCoder(int size) {
-      bytes = new byte[size];
-      stream = CodedOutputStream.newInstance(bytes);
-    }
-
-    @Override
-    public CodedOutputStream stream() {
-      return stream;
-    }
-
-    @Override
-    public byte[] toByteArray() {
-      return Arrays.copyOf(bytes, stream.getTotalBytesWritten());
-    }
-
-    @Override
-    public OutputType getOutputType() {
-      return OutputType.ARRAY;
-    }
-  }
-
-  private static final class NioHeapCoder implements Coder {
-    private final CodedOutputStream stream;
-    private final ByteBuffer buffer;
-    private final int initialPosition;
-
-    NioHeapCoder(int size) {
-      this(size, 0);
-    }
-
-    NioHeapCoder(int size, int initialPosition) {
-      this.initialPosition = initialPosition;
-      buffer = ByteBuffer.allocate(size);
-      buffer.position(initialPosition);
-      stream = CodedOutputStream.newInstance(buffer);
-    }
-
-    @Override
-    public CodedOutputStream stream() {
-      return stream;
-    }
-
-    @Override
-    public byte[] toByteArray() {
-      ByteBuffer dup = buffer.duplicate();
-      dup.position(initialPosition);
-      dup.limit(buffer.position());
-
-      byte[] bytes = new byte[dup.remaining()];
-      dup.get(bytes);
-      return bytes;
-    }
-
-    @Override
-    public OutputType getOutputType() {
-      return OutputType.NIO_HEAP;
-    }
-  }
-
-  private static final class NioDirectCoder implements Coder {
-    private final int initialPosition;
-    private final CodedOutputStream stream;
-    private final ByteBuffer buffer;
-    private final boolean unsafe;
-
-    NioDirectCoder(int size, boolean unsafe) {
-      this(size, 0, unsafe);
-    }
-
-    NioDirectCoder(int size, int initialPosition, boolean unsafe) {
-      this.unsafe = unsafe;
-      this.initialPosition = initialPosition;
-      buffer = ByteBuffer.allocateDirect(size);
-      buffer.position(initialPosition);
-      stream =
-          unsafe
-              ? CodedOutputStream.newUnsafeInstance(buffer)
-              : CodedOutputStream.newSafeInstance(buffer);
-    }
-
-    @Override
-    public CodedOutputStream stream() {
-      return stream;
-    }
-
-    @Override
-    public byte[] toByteArray() {
-      ByteBuffer dup = buffer.duplicate();
-      dup.position(initialPosition);
-      dup.limit(buffer.position());
-
-      byte[] bytes = new byte[dup.remaining()];
-      dup.get(bytes);
-      return bytes;
-    }
-
-    @Override
-    public OutputType getOutputType() {
-      return unsafe ? OutputType.NIO_DIRECT_SAFE : OutputType.NIO_DIRECT_UNSAFE;
-    }
-  }
-
-  private enum OutputType {
-    ARRAY() {
-      @Override
-      Coder newCoder(int size) {
-        return new ArrayCoder(size);
-      }
-    },
-    NIO_HEAP() {
-      @Override
-      Coder newCoder(int size) {
-        return new NioHeapCoder(size);
-      }
-    },
-    NIO_DIRECT_SAFE() {
-      @Override
-      Coder newCoder(int size) {
-        return new NioDirectCoder(size, false);
-      }
-    },
-    NIO_DIRECT_UNSAFE() {
-      @Override
-      Coder newCoder(int size) {
-        return new NioDirectCoder(size, true);
-      }
-    },
-    STREAM() {
-      @Override
-      Coder newCoder(int size) {
-        return new OutputStreamCoder(size);
-      }
-    };
-
-    abstract Coder newCoder(int size);
-  }
-
-  /** Checks that invariants are maintained for varint round trip input and output. */
-  @Test
-  public void testVarintRoundTrips() throws Exception {
-    for (OutputType outputType : OutputType.values()) {
-      assertVarintRoundTrip(outputType, 0L);
-      for (int bits = 0; bits < 64; bits++) {
-        long value = 1L << bits;
-        assertVarintRoundTrip(outputType, value);
-        assertVarintRoundTrip(outputType, value + 1);
-        assertVarintRoundTrip(outputType, value - 1);
-        assertVarintRoundTrip(outputType, -value);
-      }
-    }
-  }
-
-  /** Tests writeRawVarint32() and writeRawVarint64(). */
-  @Test
-  public void testWriteVarint() throws Exception {
-    assertWriteVarint(bytes(0x00), 0);
-    assertWriteVarint(bytes(0x01), 1);
-    assertWriteVarint(bytes(0x7f), 127);
-    // 14882
-    assertWriteVarint(bytes(0xa2, 0x74), (0x22 << 0) | (0x74 << 7));
-    // 2961488830
-    assertWriteVarint(
-        bytes(0xbe, 0xf7, 0x92, 0x84, 0x0b),
-        (0x3e << 0) | (0x77 << 7) | (0x12 << 14) | (0x04 << 21) | (0x0bL << 28));
-
-    // 64-bit
-    // 7256456126
-    assertWriteVarint(
-        bytes(0xbe, 0xf7, 0x92, 0x84, 0x1b),
-        (0x3e << 0) | (0x77 << 7) | (0x12 << 14) | (0x04 << 21) | (0x1bL << 28));
-    // 41256202580718336
-    assertWriteVarint(
-        bytes(0x80, 0xe6, 0xeb, 0x9c, 0xc3, 0xc9, 0xa4, 0x49),
-        (0x00 << 0)
-            | (0x66 << 7)
-            | (0x6b << 14)
-            | (0x1c << 21)
-            | (0x43L << 28)
-            | (0x49L << 35)
-            | (0x24L << 42)
-            | (0x49L << 49));
-    // 11964378330978735131
-    assertWriteVarint(
-        bytes(0x9b, 0xa8, 0xf9, 0xc2, 0xbb, 0xd6, 0x80, 0x85, 0xa6, 0x01),
-        (0x1b << 0)
-            | (0x28 << 7)
-            | (0x79 << 14)
-            | (0x42 << 21)
-            | (0x3bL << 28)
-            | (0x56L << 35)
-            | (0x00L << 42)
-            | (0x05L << 49)
-            | (0x26L << 56)
-            | (0x01L << 63));
-  }
-
-  /** Tests writeRawLittleEndian32() and writeRawLittleEndian64(). */
-  @Test
-  public void testWriteLittleEndian() throws Exception {
-    assertWriteLittleEndian32(bytes(0x78, 0x56, 0x34, 0x12), 0x12345678);
-    assertWriteLittleEndian32(bytes(0xf0, 0xde, 0xbc, 0x9a), 0x9abcdef0);
-
-    assertWriteLittleEndian64(
-        bytes(0xf0, 0xde, 0xbc, 0x9a, 0x78, 0x56, 0x34, 0x12), 0x123456789abcdef0L);
-    assertWriteLittleEndian64(
-        bytes(0x78, 0x56, 0x34, 0x12, 0xf0, 0xde, 0xbc, 0x9a), 0x9abcdef012345678L);
-  }
-
-  /** Test encodeZigZag32() and encodeZigZag64(). */
-  @Test
-  public void testEncodeZigZag() throws Exception {
-    assertThat(CodedOutputStream.encodeZigZag32(0)).isEqualTo(0);
-    assertThat(CodedOutputStream.encodeZigZag32(-1)).isEqualTo(1);
-    assertThat(CodedOutputStream.encodeZigZag32(1)).isEqualTo(2);
-    assertThat(CodedOutputStream.encodeZigZag32(-2)).isEqualTo(3);
-    assertThat(CodedOutputStream.encodeZigZag32(0x3FFFFFFF)).isEqualTo(0x7FFFFFFE);
-    assertThat(CodedOutputStream.encodeZigZag32(0xC0000000)).isEqualTo(0x7FFFFFFF);
-    assertThat(CodedOutputStream.encodeZigZag32(0x7FFFFFFF)).isEqualTo(0xFFFFFFFE);
-    assertThat(CodedOutputStream.encodeZigZag32(0x80000000)).isEqualTo(0xFFFFFFFF);
-
-    assertThat(CodedOutputStream.encodeZigZag64(0)).isEqualTo(0);
-    assertThat(CodedOutputStream.encodeZigZag64(-1)).isEqualTo(1);
-    assertThat(CodedOutputStream.encodeZigZag64(1)).isEqualTo(2);
-    assertThat(CodedOutputStream.encodeZigZag64(-2)).isEqualTo(3);
-    assertThat(CodedOutputStream.encodeZigZag64(0x000000003FFFFFFFL))
-        .isEqualTo(0x000000007FFFFFFEL);
-    assertThat(CodedOutputStream.encodeZigZag64(0xFFFFFFFFC0000000L))
-        .isEqualTo(0x000000007FFFFFFFL);
-    assertThat(CodedOutputStream.encodeZigZag64(0x000000007FFFFFFFL))
-        .isEqualTo(0x00000000FFFFFFFEL);
-    assertThat(CodedOutputStream.encodeZigZag64(0xFFFFFFFF80000000L))
-        .isEqualTo(0x00000000FFFFFFFFL);
-    assertThat(CodedOutputStream.encodeZigZag64(0x7FFFFFFFFFFFFFFFL))
-        .isEqualTo(0xFFFFFFFFFFFFFFFEL);
-    assertThat(CodedOutputStream.encodeZigZag64(0x8000000000000000L))
-        .isEqualTo(0xFFFFFFFFFFFFFFFFL);
-
-    // Some easier-to-verify round-trip tests.  The inputs (other than 0, 1, -1)
-    // were chosen semi-randomly via keyboard bashing.
-    assertThat(CodedOutputStream.encodeZigZag32(CodedInputStream.decodeZigZag32(0))).isEqualTo(0);
-    assertThat(CodedOutputStream.encodeZigZag32(CodedInputStream.decodeZigZag32(1))).isEqualTo(1);
-    assertThat(CodedOutputStream.encodeZigZag32(CodedInputStream.decodeZigZag32(-1))).isEqualTo(-1);
-    assertThat(CodedOutputStream.encodeZigZag32(CodedInputStream.decodeZigZag32(14927)))
-        .isEqualTo(14927);
-    assertThat(CodedOutputStream.encodeZigZag32(CodedInputStream.decodeZigZag32(-3612)))
-        .isEqualTo(-3612);
-
-    assertThat(CodedOutputStream.encodeZigZag64(CodedInputStream.decodeZigZag64(0))).isEqualTo(0);
-    assertThat(CodedOutputStream.encodeZigZag64(CodedInputStream.decodeZigZag64(1))).isEqualTo(1);
-    assertThat(CodedOutputStream.encodeZigZag64(CodedInputStream.decodeZigZag64(-1))).isEqualTo(-1);
-    assertThat(CodedOutputStream.encodeZigZag64(CodedInputStream.decodeZigZag64(14927)))
-        .isEqualTo(14927);
-    assertThat(CodedOutputStream.encodeZigZag64(CodedInputStream.decodeZigZag64(-3612)))
-        .isEqualTo(-3612);
-
-    assertThat(CodedOutputStream.encodeZigZag64(CodedInputStream.decodeZigZag64(856912304801416L)))
-        .isEqualTo(856912304801416L);
-    assertThat(
-            CodedOutputStream.encodeZigZag64(CodedInputStream.decodeZigZag64(-75123905439571256L)))
-        .isEqualTo(-75123905439571256L);
-  }
-
-  /** Tests writing a whole message with every field type. */
-  @Test
-  public void testWriteWholeMessage() throws Exception {
-    final byte[] expectedBytes = TestUtil.getGoldenMessage().toByteArray();
-    TestAllTypes message = TestUtil.getAllSet();
-
-    for (OutputType outputType : OutputType.values()) {
-      Coder coder = outputType.newCoder(message.getSerializedSize());
-      message.writeTo(coder.stream());
-      coder.stream().flush();
-      byte[] rawBytes = coder.toByteArray();
-      assertEqualBytes(outputType, expectedBytes, rawBytes);
-    }
-
-    // Try different block sizes.
-    for (int blockSize = 1; blockSize < 256; blockSize *= 2) {
-      Coder coder = OutputType.STREAM.newCoder(blockSize);
-      message.writeTo(coder.stream());
-      coder.stream().flush();
-      assertEqualBytes(OutputType.STREAM, expectedBytes, coder.toByteArray());
-    }
-  }
-
-  /**
-   * Tests writing a whole message with every packed field type. Ensures the wire format of packed
-   * fields is compatible with C++.
-   */
-  @Test
-  public void testWriteWholePackedFieldsMessage() throws Exception {
-    byte[] expectedBytes = TestUtil.getGoldenPackedFieldsMessage().toByteArray();
-    TestPackedTypes message = TestUtil.getPackedSet();
-
-    for (OutputType outputType : OutputType.values()) {
-      Coder coder = outputType.newCoder(message.getSerializedSize());
-      message.writeTo(coder.stream());
-      coder.stream().flush();
-      byte[] rawBytes = coder.toByteArray();
-      assertEqualBytes(outputType, expectedBytes, rawBytes);
-    }
-  }
-
-  /**
-   * Test writing a message containing a negative enum value. This used to fail because the size was
-   * not properly computed as a sign-extended varint.
-   */
-  @Test
-  public void testWriteMessageWithNegativeEnumValue() throws Exception {
-    SparseEnumMessage message =
-        SparseEnumMessage.newBuilder().setSparseEnum(TestSparseEnum.SPARSE_E).build();
-    assertThat(message.getSparseEnum().getNumber()).isLessThan(0);
-    for (OutputType outputType : OutputType.values()) {
-      Coder coder = outputType.newCoder(message.getSerializedSize());
-      message.writeTo(coder.stream());
-      coder.stream().flush();
-      byte[] rawBytes = coder.toByteArray();
-      SparseEnumMessage message2 = SparseEnumMessage.parseFrom(rawBytes);
-      assertThat(message2.getSparseEnum()).isEqualTo(TestSparseEnum.SPARSE_E);
-    }
-  }
-
-  /** Test getTotalBytesWritten() */
-  @Test
-  public void testGetTotalBytesWritten() throws Exception {
-    Coder coder = OutputType.STREAM.newCoder(4 * 1024);
-
-    // Write some some bytes (more than the buffer can hold) and verify that totalWritten
-    // is correct.
-    byte[] value = "abcde".getBytes(Internal.UTF_8);
-    for (int i = 0; i < 1024; ++i) {
-      coder.stream().writeRawBytes(value, 0, value.length);
-    }
-    assertThat(coder.stream().getTotalBytesWritten()).isEqualTo(value.length * 1024);
-
-    // Now write an encoded string.
-    String string =
-        "abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz";
-    // Ensure we take the slower fast path.
-    assertThat(CodedOutputStream.computeUInt32SizeNoTag(string.length()))
-        .isNotEqualTo(
-            CodedOutputStream.computeUInt32SizeNoTag(string.length() * Utf8.MAX_BYTES_PER_CHAR));
-
-    coder.stream().writeStringNoTag(string);
-    coder.stream().flush();
-    int stringSize = CodedOutputStream.computeStringSizeNoTag(string);
-
-    // Verify that the total bytes written is correct
-    assertThat(coder.stream().getTotalBytesWritten()).isEqualTo((value.length * 1024) + stringSize);
-  }
-
-  // TODO(dweis): Write a comprehensive test suite for CodedOutputStream that covers more than just
-  //    this case.
-  @Test
-  public void testWriteStringNoTag_fastpath() throws Exception {
-    int bufferSize = 153;
-    String threeBytesPer = "\u0981";
-    String string = threeBytesPer;
-    for (int i = 0; i < 50; i++) {
-      string += threeBytesPer;
-    }
-    // These checks ensure we will tickle the slower fast path.
-    assertThat(CodedOutputStream.computeUInt32SizeNoTag(string.length())).isEqualTo(1);
-    assertThat(CodedOutputStream.computeUInt32SizeNoTag(string.length() * Utf8.MAX_BYTES_PER_CHAR))
-        .isEqualTo(2);
-    assertThat(bufferSize).isEqualTo(string.length() * Utf8.MAX_BYTES_PER_CHAR);
-
-    for (OutputType outputType : OutputType.values()) {
-      Coder coder = outputType.newCoder(bufferSize + 2);
-      coder.stream().writeStringNoTag(string);
-      coder.stream().flush();
-    }
-  }
-
-  @Test
-  public void testWriteToByteBuffer() throws Exception {
-    final int bufferSize = 16 * 1024;
-    ByteBuffer buffer = ByteBuffer.allocate(bufferSize);
-    CodedOutputStream codedStream = CodedOutputStream.newInstance(buffer);
-    // Write raw bytes into the ByteBuffer.
-    final int length1 = 5000;
-    for (int i = 0; i < length1; i++) {
-      codedStream.writeRawByte((byte) 1);
-    }
-    final int length2 = 8 * 1024;
-    byte[] data = new byte[length2];
-    Arrays.fill(data, 0, length2, (byte) 2);
-    codedStream.writeRawBytes(data);
-    final int length3 = bufferSize - length1 - length2;
-    for (int i = 0; i < length3; i++) {
-      codedStream.writeRawByte((byte) 3);
-    }
-    codedStream.flush();
-
-    // Check that data is correctly written to the ByteBuffer.
-    assertThat(buffer.remaining()).isEqualTo(0);
-    buffer.flip();
-    for (int i = 0; i < length1; i++) {
-      assertThat(buffer.get()).isEqualTo((byte) 1);
-    }
-    for (int i = 0; i < length2; i++) {
-      assertThat(buffer.get()).isEqualTo((byte) 2);
-    }
-    for (int i = 0; i < length3; i++) {
-      assertThat(buffer.get()).isEqualTo((byte) 3);
-    }
-  }
-
-  @Test
-  public void testWriteByteBuffer() throws Exception {
-    byte[] value = "abcde".getBytes(Internal.UTF_8);
-    ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-    CodedOutputStream codedStream = CodedOutputStream.newInstance(outputStream);
-    ByteBuffer byteBuffer = ByteBuffer.wrap(value, 0, 1);
-    // This will actually write 5 bytes into the CodedOutputStream as the
-    // ByteBuffer's capacity() is 5.
-    codedStream.writeRawBytes(byteBuffer);
-    // The above call shouldn't affect the ByteBuffer's state.
-    assertThat(byteBuffer.position()).isEqualTo(0);
-    assertThat(byteBuffer.limit()).isEqualTo(1);
-
-    // The correct way to write part of an array using ByteBuffer.
-    codedStream.writeRawBytes(ByteBuffer.wrap(value, 2, 1).slice());
-
-    codedStream.flush();
-    byte[] result = outputStream.toByteArray();
-    assertThat(result).hasLength(6);
-    for (int i = 0; i < 5; i++) {
-      assertThat(value[i]).isEqualTo(result[i]);
-    }
-    assertThat(value[2]).isEqualTo(result[5]);
-  }
-
-  @Test
-  public void testWriteByteArrayWithOffsets() throws Exception {
-    byte[] fullArray = bytes(0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88);
-    for (OutputType type : new OutputType[] {OutputType.ARRAY}) {
-      Coder coder = type.newCoder(4);
-      coder.stream().writeByteArrayNoTag(fullArray, 2, 2);
-      assertEqualBytes(type, bytes(0x02, 0x33, 0x44), coder.toByteArray());
-      assertThat(coder.stream().getTotalBytesWritten()).isEqualTo(3);
-    }
-  }
-
-  @Test
-  public void testSerializeUtf8_MultipleSmallWrites() throws Exception {
-    final String source = "abcdefghijklmnopqrstuvwxyz";
-
-    // Generate the expected output if the source string is written 2 bytes at a time.
-    ByteArrayOutputStream expectedBytesStream = new ByteArrayOutputStream();
-    for (int pos = 0; pos < source.length(); pos += 2) {
-      String substr = source.substring(pos, pos + 2);
-      expectedBytesStream.write(2);
-      expectedBytesStream.write(substr.getBytes(Internal.UTF_8));
-    }
-    final byte[] expectedBytes = expectedBytesStream.toByteArray();
-
-    // For each output type, write the source string 2 bytes at a time and verify the output.
-    for (OutputType outputType : OutputType.values()) {
-      Coder coder = outputType.newCoder(expectedBytes.length);
-      for (int pos = 0; pos < source.length(); pos += 2) {
-        String substr = source.substring(pos, pos + 2);
-        coder.stream().writeStringNoTag(substr);
-      }
-      coder.stream().flush();
-      assertEqualBytes(outputType, expectedBytes, coder.toByteArray());
-    }
-  }
-
-  @Test
-  public void testSerializeInvalidUtf8() throws Exception {
-    String[] invalidStrings =
-        new String[] {
-          newString(Character.MIN_HIGH_SURROGATE),
-          "foobar" + newString(Character.MIN_HIGH_SURROGATE),
-          newString(Character.MIN_LOW_SURROGATE),
-          "foobar" + newString(Character.MIN_LOW_SURROGATE),
-          newString(Character.MIN_HIGH_SURROGATE, Character.MIN_HIGH_SURROGATE)
-        };
-
-    CodedOutputStream outputWithStream = CodedOutputStream.newInstance(new ByteArrayOutputStream());
-    CodedOutputStream outputWithArray = CodedOutputStream.newInstance(new byte[10000]);
-    CodedOutputStream outputWithByteBuffer =
-        CodedOutputStream.newInstance(ByteBuffer.allocate(10000));
-    for (String s : invalidStrings) {
-      // TODO(dweis): These should all fail; instead they are corrupting data.
-      CodedOutputStream.computeStringSizeNoTag(s);
-      outputWithStream.writeStringNoTag(s);
-      outputWithArray.writeStringNoTag(s);
-      outputWithByteBuffer.writeStringNoTag(s);
-    }
-  }
-
-  // TODO(nathanmittler): This test can be deleted once we properly throw IOException while
-  // encoding invalid UTF-8 strings.
-  @Test
-  public void testSerializeInvalidUtf8FollowedByOutOfSpace() throws Exception {
-    final int notEnoughBytes = 4;
-    CodedOutputStream outputWithArray = CodedOutputStream.newInstance(new byte[notEnoughBytes]);
-    CodedOutputStream outputWithByteBuffer =
-        CodedOutputStream.newInstance(ByteBuffer.allocate(notEnoughBytes));
-
-    String invalidString = newString(Character.MIN_HIGH_SURROGATE, 'f', 'o', 'o', 'b', 'a', 'r');
-    try {
-      outputWithArray.writeStringNoTag(invalidString);
-      assertWithMessage("Expected OutOfSpaceException").fail();
-    } catch (OutOfSpaceException e) {
-      assertThat(e).hasCauseThat().isInstanceOf(IndexOutOfBoundsException.class);
-    }
-    try {
-      outputWithByteBuffer.writeStringNoTag(invalidString);
-      assertWithMessage("Expected OutOfSpaceException").fail();
-    } catch (OutOfSpaceException e) {
-      assertThat(e).hasCauseThat().isInstanceOf(IndexOutOfBoundsException.class);
-    }
-  }
-
-  /** Regression test for https://github.com/protocolbuffers/protobuf/issues/292 */
-  @Test
-  public void testCorrectExceptionThrowWhenEncodingStringsWithoutEnoughSpace() throws Exception {
-    String testCase = "Foooooooo";
-    assertThat(CodedOutputStream.computeUInt32SizeNoTag(testCase.length()))
-        .isEqualTo(CodedOutputStream.computeUInt32SizeNoTag(testCase.length() * 3));
-    assertThat(CodedOutputStream.computeStringSize(1, testCase)).isEqualTo(11);
-    // Tag is one byte, varint describing string length is 1 byte, string length is 9 bytes.
-    // An array of size 1 will cause a failure when trying to write the varint.
-    for (OutputType outputType :
-        new OutputType[] {
-          OutputType.ARRAY,
-          OutputType.NIO_HEAP,
-          OutputType.NIO_DIRECT_SAFE,
-          OutputType.NIO_DIRECT_UNSAFE
-        }) {
-      for (int i = 0; i < 11; i++) {
-        Coder coder = outputType.newCoder(i);
-        try {
-          coder.stream().writeString(1, testCase);
-          assertWithMessage("Should have thrown an out of space exception").fail();
-        } catch (CodedOutputStream.OutOfSpaceException expected) {
-        }
-      }
-    }
-  }
-
-  @Test
-  public void testDifferentStringLengths() throws Exception {
-    // Test string serialization roundtrip using strings of the following lengths,
-    // with ASCII and Unicode characters requiring different UTF-8 byte counts per
-    // char, hence causing the length delimiter varint to sometimes require more
-    // bytes for the Unicode strings than the ASCII string of the same length.
-    int[] lengths =
-        new int[] {
-          0,
-          1,
-          (1 << 4) - 1, // 1 byte for ASCII and Unicode
-          (1 << 7) - 1, // 1 byte for ASCII, 2 bytes for Unicode
-          (1 << 11) - 1, // 2 bytes for ASCII and Unicode
-          (1 << 14) - 1, // 2 bytes for ASCII, 3 bytes for Unicode
-          (1 << 17) - 1,
-          // 3 bytes for ASCII and Unicode
-        };
-    for (OutputType outputType : OutputType.values()) {
-      for (int i : lengths) {
-        testEncodingOfString(outputType, 'q', i); // 1 byte per char
-        testEncodingOfString(outputType, '\u07FF', i); // 2 bytes per char
-        testEncodingOfString(outputType, '\u0981', i); // 3 bytes per char
-      }
-    }
-  }
-
-  @Test
-  public void testNioEncodersWithInitialOffsets() throws Exception {
-    String value = "abc";
-    for (Coder coder :
-        new Coder[] {
-          new NioHeapCoder(10, 2), new NioDirectCoder(10, 2, false), new NioDirectCoder(10, 2, true)
-        }) {
-      coder.stream().writeStringNoTag(value);
-      coder.stream().flush();
-      assertEqualBytes(coder.getOutputType(), new byte[] {3, 'a', 'b', 'c'}, coder.toByteArray());
-    }
-  }
-
-  /**
-   * Parses the given bytes using writeRawLittleEndian32() and checks that the result matches the
-   * given value.
-   */
-  private static void assertWriteLittleEndian32(byte[] data, int value) throws Exception {
-    for (OutputType outputType : OutputType.values()) {
-      Coder coder = outputType.newCoder(data.length);
-      coder.stream().writeFixed32NoTag(value);
-      coder.stream().flush();
-      assertEqualBytes(outputType, data, coder.toByteArray());
-    }
-
-    // Try different block sizes.
-    for (int blockSize = 1; blockSize <= 16; blockSize *= 2) {
-      Coder coder = OutputType.STREAM.newCoder(blockSize);
-      coder.stream().writeFixed32NoTag(value);
-      coder.stream().flush();
-      assertEqualBytes(OutputType.STREAM, data, coder.toByteArray());
-    }
-  }
-
-  /**
-   * Parses the given bytes using writeRawLittleEndian64() and checks that the result matches the
-   * given value.
-   */
-  private static void assertWriteLittleEndian64(byte[] data, long value) throws Exception {
-    for (OutputType outputType : OutputType.values()) {
-      Coder coder = outputType.newCoder(data.length);
-      coder.stream().writeFixed64NoTag(value);
-      coder.stream().flush();
-      assertEqualBytes(outputType, data, coder.toByteArray());
-    }
-
-    // Try different block sizes.
-    for (int blockSize = 1; blockSize <= 16; blockSize *= 2) {
-      Coder coder = OutputType.STREAM.newCoder(blockSize);
-      coder.stream().writeFixed64NoTag(value);
-      coder.stream().flush();
-      assertEqualBytes(OutputType.STREAM, data, coder.toByteArray());
-    }
-  }
-
-  private static String newString(char... chars) {
-    return new String(chars);
-  }
-
-  private static void testEncodingOfString(OutputType outputType, char c, int length)
-      throws Exception {
-    String fullString = fullString(c, length);
-    TestAllTypes testAllTypes = TestAllTypes.newBuilder().setOptionalString(fullString).build();
-    Coder coder = outputType.newCoder(testAllTypes.getSerializedSize());
-    testAllTypes.writeTo(coder.stream());
-    coder.stream().flush();
-    assertWithMessage("OuputType: " + outputType)
-        .that(fullString)
-        .isEqualTo(TestAllTypes.parseFrom(coder.toByteArray()).getOptionalString());
-  }
-
-  private static String fullString(char c, int length) {
-    char[] result = new char[length];
-    Arrays.fill(result, c);
-    return new String(result);
-  }
-
-  /**
-   * Helper to construct a byte array from a bunch of bytes. The inputs are actually ints so that I
-   * can use hex notation and not get stupid errors about precision.
-   */
-  private static byte[] bytes(int... bytesAsInts) {
-    byte[] bytes = new byte[bytesAsInts.length];
-    for (int i = 0; i < bytesAsInts.length; i++) {
-      bytes[i] = (byte) bytesAsInts[i];
-    }
-    return bytes;
-  }
-
-  /** Arrays.asList() does not work with arrays of primitives. :( */
-  private static List<Byte> toList(byte[] bytes) {
-    List<Byte> result = new ArrayList<Byte>();
-    for (byte b : bytes) {
-      result.add(b);
-    }
-    return result;
-  }
-
-  private static void assertEqualBytes(OutputType outputType, byte[] a, byte[] b) {
-    assertWithMessage(outputType.name()).that(toList(a)).isEqualTo(toList(b));
-  }
-
-  /**
-   * Writes the given value using writeRawVarint32() and writeRawVarint64() and checks that the
-   * result matches the given bytes.
-   */
-  @SuppressWarnings("UnnecessaryLongToIntConversion") // Intentionally tests 32-bit int values.
-  private static void assertWriteVarint(byte[] data, long value) throws Exception {
-    for (OutputType outputType : OutputType.values()) {
-      // Only test 32-bit write if the value fits into an int.
-      if (value == (int) value) {
-        Coder coder = outputType.newCoder(10);
-        coder.stream().writeUInt32NoTag((int) value);
-        coder.stream().flush();
-        assertEqualBytes(outputType, data, coder.toByteArray());
-
-        // Also try computing size.
-        assertThat(data).hasLength(CodedOutputStream.computeUInt32SizeNoTag((int) value));
-      }
-
-      {
-        Coder coder = outputType.newCoder(10);
-        coder.stream().writeUInt64NoTag(value);
-        coder.stream().flush();
-        assertEqualBytes(outputType, data, coder.toByteArray());
-
-        // Also try computing size.
-        assertThat(data).hasLength(CodedOutputStream.computeUInt64SizeNoTag(value));
-      }
-    }
-
-    // Try different block sizes.
-    for (int blockSize = 1; blockSize <= 16; blockSize *= 2) {
-      // Only test 32-bit write if the value fits into an int.
-      if (value == (int) value) {
-        Coder coder = OutputType.STREAM.newCoder(blockSize);
-        coder.stream().writeUInt64NoTag((int) value);
-        coder.stream().flush();
-        assertEqualBytes(OutputType.STREAM, data, coder.toByteArray());
-
-        ByteArrayOutputStream rawOutput = new ByteArrayOutputStream();
-        CodedOutputStream output = CodedOutputStream.newInstance(rawOutput, blockSize);
-        output.writeUInt32NoTag((int) value);
-        output.flush();
-        assertEqualBytes(OutputType.STREAM, data, rawOutput.toByteArray());
-      }
-
-      {
-        Coder coder = OutputType.STREAM.newCoder(blockSize);
-        coder.stream().writeUInt64NoTag(value);
-        coder.stream().flush();
-        assertEqualBytes(OutputType.STREAM, data, coder.toByteArray());
-      }
-    }
-  }
-
-  private static void assertVarintRoundTrip(OutputType outputType, long value) throws Exception {
-    {
-      Coder coder = outputType.newCoder(10);
-      coder.stream().writeUInt64NoTag(value);
-      coder.stream().flush();
-      byte[] bytes = coder.toByteArray();
-      assertWithMessage(outputType.name())
-          .that(bytes)
-          .hasLength(CodedOutputStream.computeUInt64SizeNoTag(value));
-      CodedInputStream input = CodedInputStream.newInstance(new ByteArrayInputStream(bytes));
-      assertWithMessage(outputType.name()).that(input.readRawVarint64()).isEqualTo(value);
-    }
-
-    if (value == (int) value) {
-      Coder coder = outputType.newCoder(10);
-      coder.stream().writeUInt32NoTag((int) value);
-      coder.stream().flush();
-      byte[] bytes = coder.toByteArray();
-      assertWithMessage(outputType.name())
-          .that(bytes)
-          .hasLength(CodedOutputStream.computeUInt32SizeNoTag((int) value));
-      CodedInputStream input = CodedInputStream.newInstance(new ByteArrayInputStream(bytes));
-      assertWithMessage(outputType.name()).that(input.readRawVarint32()).isEqualTo(value);
-    }
-  }
-}
diff --git a/libs/protobuf/java/core/src/test/java/com/google/protobuf/DecodeUtf8Test.java b/libs/protobuf/java/core/src/test/java/com/google/protobuf/DecodeUtf8Test.java
deleted file mode 100644
index 4cffd4c..0000000
--- a/libs/protobuf/java/core/src/test/java/com/google/protobuf/DecodeUtf8Test.java
+++ /dev/null
@@ -1,349 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import com.google.protobuf.Utf8.Processor;
-import com.google.protobuf.Utf8.SafeProcessor;
-import com.google.protobuf.Utf8.UnsafeProcessor;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.logging.Logger;
-import junit.framework.TestCase;
-
-public class DecodeUtf8Test extends TestCase {
-  private static Logger logger = Logger.getLogger(DecodeUtf8Test.class.getName());
-
-  private static final Processor SAFE_PROCESSOR = new SafeProcessor();
-  private static final Processor UNSAFE_PROCESSOR = new UnsafeProcessor();
-
-  public void testRoundTripAllValidChars() throws Exception {
-    for (int i = Character.MIN_CODE_POINT; i < Character.MAX_CODE_POINT; i++) {
-      if (i < Character.MIN_SURROGATE || i > Character.MAX_SURROGATE) {
-        String str = new String(Character.toChars(i));
-        assertRoundTrips(str);
-      }
-    }
-  }
-
-  // Test all 1, 2, 3 invalid byte combinations. Valid ones would have been covered above.
-
-  public void testOneByte() throws Exception {
-    int valid = 0;
-    ByteBuffer buffer = ByteBuffer.allocateDirect(1);
-    for (int i = Byte.MIN_VALUE; i <= Byte.MAX_VALUE; i++) {
-      ByteString bs = ByteString.copyFrom(new byte[] {(byte) i});
-      if (bs.isValidUtf8()) {
-        valid++;
-      } else {
-        assertInvalid(bs.toByteArray(), buffer);
-      }
-    }
-    assertEquals(IsValidUtf8TestUtil.EXPECTED_ONE_BYTE_ROUNDTRIPPABLE_COUNT, valid);
-  }
-
-  public void testTwoBytes() throws Exception {
-    int valid = 0;
-    ByteBuffer buffer = ByteBuffer.allocateDirect(2);
-    for (int i = Byte.MIN_VALUE; i <= Byte.MAX_VALUE; i++) {
-      for (int j = Byte.MIN_VALUE; j <= Byte.MAX_VALUE; j++) {
-        ByteString bs = ByteString.copyFrom(new byte[] {(byte) i, (byte) j});
-        if (bs.isValidUtf8()) {
-          valid++;
-        } else {
-          assertInvalid(bs.toByteArray(), buffer);
-        }
-      }
-    }
-    assertEquals(IsValidUtf8TestUtil.EXPECTED_TWO_BYTE_ROUNDTRIPPABLE_COUNT, valid);
-  }
-
-  public void testThreeBytes() throws Exception {
-    int count = 0;
-    int valid = 0;
-    ByteBuffer buffer = ByteBuffer.allocateDirect(3);
-    for (int i = Byte.MIN_VALUE; i <= Byte.MAX_VALUE; i++) {
-      for (int j = Byte.MIN_VALUE; j <= Byte.MAX_VALUE; j++) {
-        for (int k = Byte.MIN_VALUE; k <= Byte.MAX_VALUE; k++) {
-          byte[] bytes = new byte[] {(byte) i, (byte) j, (byte) k};
-          ByteString bs = ByteString.copyFrom(bytes);
-          if (bs.isValidUtf8()) {
-            valid++;
-          } else {
-            assertInvalid(bytes, buffer);
-          }
-          count++;
-          if (count % 1000000L == 0) {
-            logger.info("Processed " + (count / 1000000L) + " million characters");
-          }
-        }
-      }
-    }
-    assertEquals(IsValidUtf8TestUtil.EXPECTED_THREE_BYTE_ROUNDTRIPPABLE_COUNT, valid);
-  }
-
-  /** Tests that round tripping of a sample of four byte permutations work. */
-  public void testInvalid_4BytesSamples() throws Exception {
-    // Bad trailing bytes
-    assertInvalid(0xF0, 0xA4, 0xAD, 0x7F);
-    assertInvalid(0xF0, 0xA4, 0xAD, 0xC0);
-
-    // Special cases for byte2
-    assertInvalid(0xF0, 0x8F, 0xAD, 0xA2);
-    assertInvalid(0xF4, 0x90, 0xAD, 0xA2);
-  }
-
-  public void testRealStrings() throws Exception {
-    // English
-    assertRoundTrips("The quick brown fox jumps over the lazy dog");
-    // German
-    assertRoundTrips("Quizdeltagerne spiste jordb\u00e6r med fl\u00f8de, mens cirkusklovnen");
-    // Japanese
-    assertRoundTrips("\u3044\u308d\u306f\u306b\u307b\u3078\u3068\u3061\u308a\u306c\u308b\u3092");
-    // Hebrew
-    assertRoundTrips(
-        "\u05d3\u05d2 \u05e1\u05e7\u05e8\u05df \u05e9\u05d8 \u05d1\u05d9\u05dd "
-            + "\u05de\u05d0\u05d5\u05db\u05d6\u05d1 \u05d5\u05dc\u05e4\u05ea\u05e2"
-            + " \u05de\u05e6\u05d0 \u05dc\u05d5 \u05d7\u05d1\u05e8\u05d4 "
-            + "\u05d0\u05d9\u05da \u05d4\u05e7\u05dc\u05d9\u05d8\u05d4");
-    // Thai
-    assertRoundTrips(
-        " \u0e08\u0e07\u0e1d\u0e48\u0e32\u0e1f\u0e31\u0e19\u0e1e\u0e31\u0e12"
-            + "\u0e19\u0e32\u0e27\u0e34\u0e0a\u0e32\u0e01\u0e32\u0e23");
-    // Chinese
-    assertRoundTrips(
-        "\u8fd4\u56de\u94fe\u4e2d\u7684\u4e0b\u4e00\u4e2a\u4ee3\u7406\u9879\u9009\u62e9\u5668");
-    // Chinese with 4-byte chars
-    assertRoundTrips(
-        "\uD841\uDF0E\uD841\uDF31\uD841\uDF79\uD843\uDC53\uD843\uDC78"
-            + "\uD843\uDC96\uD843\uDCCF\uD843\uDCD5\uD843\uDD15\uD843\uDD7C\uD843\uDD7F"
-            + "\uD843\uDE0E\uD843\uDE0F\uD843\uDE77\uD843\uDE9D\uD843\uDEA2");
-    // Mixed
-    assertRoundTrips(
-        "The quick brown \u3044\u308d\u306f\u306b\u307b\u3078\u8fd4\u56de\u94fe"
-            + "\u4e2d\u7684\u4e0b\u4e00");
-  }
-
-  public void testOverlong() throws Exception {
-    assertInvalid(0xc0, 0xaf);
-    assertInvalid(0xe0, 0x80, 0xaf);
-    assertInvalid(0xf0, 0x80, 0x80, 0xaf);
-
-    // Max overlong
-    assertInvalid(0xc1, 0xbf);
-    assertInvalid(0xe0, 0x9f, 0xbf);
-    assertInvalid(0xf0, 0x8f, 0xbf, 0xbf);
-
-    // null overlong
-    assertInvalid(0xc0, 0x80);
-    assertInvalid(0xe0, 0x80, 0x80);
-    assertInvalid(0xf0, 0x80, 0x80, 0x80);
-  }
-
-  public void testIllegalCodepoints() throws Exception {
-    // Single surrogate
-    assertInvalid(0xed, 0xa0, 0x80);
-    assertInvalid(0xed, 0xad, 0xbf);
-    assertInvalid(0xed, 0xae, 0x80);
-    assertInvalid(0xed, 0xaf, 0xbf);
-    assertInvalid(0xed, 0xb0, 0x80);
-    assertInvalid(0xed, 0xbe, 0x80);
-    assertInvalid(0xed, 0xbf, 0xbf);
-
-    // Paired surrogates
-    assertInvalid(0xed, 0xa0, 0x80, 0xed, 0xb0, 0x80);
-    assertInvalid(0xed, 0xa0, 0x80, 0xed, 0xbf, 0xbf);
-    assertInvalid(0xed, 0xad, 0xbf, 0xed, 0xb0, 0x80);
-    assertInvalid(0xed, 0xad, 0xbf, 0xed, 0xbf, 0xbf);
-    assertInvalid(0xed, 0xae, 0x80, 0xed, 0xb0, 0x80);
-    assertInvalid(0xed, 0xae, 0x80, 0xed, 0xbf, 0xbf);
-    assertInvalid(0xed, 0xaf, 0xbf, 0xed, 0xb0, 0x80);
-    assertInvalid(0xed, 0xaf, 0xbf, 0xed, 0xbf, 0xbf);
-  }
-
-  public void testBufferSlice() throws Exception {
-    String str = "The quick brown fox jumps over the lazy dog";
-    assertRoundTrips(str, 10, 4);
-    assertRoundTrips(str, str.length(), 0);
-  }
-
-  public void testInvalidBufferSlice() throws Exception {
-    byte[] bytes = "The quick brown fox jumps over the lazy dog".getBytes(Internal.UTF_8);
-    assertInvalidSlice(bytes, bytes.length - 3, 4);
-    assertInvalidSlice(bytes, bytes.length, 1);
-    assertInvalidSlice(bytes, bytes.length + 1, 0);
-    assertInvalidSlice(bytes, 0, bytes.length + 1);
-  }
-
-  private void assertInvalid(int... bytesAsInt) throws Exception {
-    byte[] bytes = new byte[bytesAsInt.length];
-    for (int i = 0; i < bytesAsInt.length; i++) {
-      bytes[i] = (byte) bytesAsInt[i];
-    }
-    assertInvalid(bytes, null);
-  }
-
-  // Attempts to decode the byte array in several ways and asserts that it always generates an
-  // exception. Allocating a direct ByteBuffer is slow, so the caller can optionally provide a
-  // buffer to reuse. If buffer is non-null, it must be a direct-allocated ByteBuffer of the
-  // appropriate size.
-  private void assertInvalid(byte[] bytes, ByteBuffer buffer) throws Exception {
-    try {
-      UNSAFE_PROCESSOR.decodeUtf8(bytes, 0, bytes.length);
-      fail();
-    } catch (InvalidProtocolBufferException e) {
-      // Expected.
-    }
-    try {
-      SAFE_PROCESSOR.decodeUtf8(bytes, 0, bytes.length);
-      fail();
-    } catch (InvalidProtocolBufferException e) {
-      // Expected.
-    }
-
-    if (buffer == null) {
-      buffer = ByteBuffer.allocateDirect(bytes.length);
-    }
-    buffer.put(bytes);
-    buffer.flip();
-    try {
-      UNSAFE_PROCESSOR.decodeUtf8(buffer, 0, bytes.length);
-      fail();
-    } catch (InvalidProtocolBufferException e) {
-      // Expected.
-    }
-    try {
-      SAFE_PROCESSOR.decodeUtf8(buffer, 0, bytes.length);
-      fail();
-    } catch (InvalidProtocolBufferException e) {
-      // Expected.
-    }
-    buffer.clear();
-  }
-
-  private void assertInvalidSlice(byte[] bytes, int index, int size) throws Exception {
-    try {
-      UNSAFE_PROCESSOR.decodeUtf8(bytes, index, size);
-      fail();
-    } catch (IndexOutOfBoundsException e) {
-      // Expected.
-    }
-    try {
-      SAFE_PROCESSOR.decodeUtf8(bytes, index, size);
-      fail();
-    } catch (IndexOutOfBoundsException e) {
-      // Expected.
-    }
-
-    ByteBuffer direct = ByteBuffer.allocateDirect(bytes.length);
-    direct.put(bytes);
-    direct.flip();
-    try {
-      UNSAFE_PROCESSOR.decodeUtf8(direct, index, size);
-      fail();
-    } catch (IndexOutOfBoundsException e) {
-      // Expected.
-    }
-    try {
-      SAFE_PROCESSOR.decodeUtf8(direct, index, size);
-      fail();
-    } catch (IndexOutOfBoundsException e) {
-      // Expected.
-    }
-
-    ByteBuffer heap = ByteBuffer.allocate(bytes.length);
-    heap.put(bytes);
-    heap.flip();
-    try {
-      UNSAFE_PROCESSOR.decodeUtf8(heap, index, size);
-      fail();
-    } catch (IndexOutOfBoundsException e) {
-      // Expected.
-    }
-    try {
-      SAFE_PROCESSOR.decodeUtf8(heap, index, size);
-      fail();
-    } catch (IndexOutOfBoundsException e) {
-      // Expected.
-    }
-  }
-
-  private void assertRoundTrips(String str) throws Exception {
-    assertRoundTrips(str, 0, -1);
-  }
-
-  private void assertRoundTrips(String str, int index, int size) throws Exception {
-    byte[] bytes = str.getBytes(Internal.UTF_8);
-    if (size == -1) {
-      size = bytes.length;
-    }
-    assertDecode(
-        new String(bytes, index, size, Internal.UTF_8),
-        UNSAFE_PROCESSOR.decodeUtf8(bytes, index, size));
-    assertDecode(
-        new String(bytes, index, size, Internal.UTF_8),
-        SAFE_PROCESSOR.decodeUtf8(bytes, index, size));
-
-    ByteBuffer direct = ByteBuffer.allocateDirect(bytes.length);
-    direct.put(bytes);
-    direct.flip();
-    assertDecode(
-        new String(bytes, index, size, Internal.UTF_8),
-        UNSAFE_PROCESSOR.decodeUtf8(direct, index, size));
-    assertDecode(
-        new String(bytes, index, size, Internal.UTF_8),
-        SAFE_PROCESSOR.decodeUtf8(direct, index, size));
-
-    ByteBuffer heap = ByteBuffer.allocate(bytes.length);
-    heap.put(bytes);
-    heap.flip();
-    assertDecode(
-        new String(bytes, index, size, Internal.UTF_8),
-        UNSAFE_PROCESSOR.decodeUtf8(heap, index, size));
-    assertDecode(
-        new String(bytes, index, size, Internal.UTF_8),
-        SAFE_PROCESSOR.decodeUtf8(heap, index, size));
-  }
-
-  private void assertDecode(String expected, String actual) {
-    if (!expected.equals(actual)) {
-      fail("Failure: Expected (" + codepoints(expected) + ") Actual (" + codepoints(actual) + ")");
-    }
-  }
-
-  private List<String> codepoints(String str) {
-    List<String> codepoints = new ArrayList<String>();
-    for (int i = 0; i < str.length(); i++) {
-      codepoints.add(Long.toHexString(str.charAt(i)));
-    }
-    return codepoints;
-  }
-}
diff --git a/libs/protobuf/java/core/src/test/java/com/google/protobuf/DeprecatedFieldTest.java b/libs/protobuf/java/core/src/test/java/com/google/protobuf/DeprecatedFieldTest.java
deleted file mode 100644
index fac6949..0000000
--- a/libs/protobuf/java/core/src/test/java/com/google/protobuf/DeprecatedFieldTest.java
+++ /dev/null
@@ -1,84 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.common.truth.Truth.assertWithMessage;
-
-import protobuf_unittest.UnittestProto.TestDeprecatedFields;
-import java.lang.reflect.AnnotatedElement;
-import java.lang.reflect.Method;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-/** Test field deprecation. */
-@RunWith(JUnit4.class)
-public class DeprecatedFieldTest {
-  private final String[] deprecatedGetterNames = {"hasDeprecatedInt32", "getDeprecatedInt32"};
-
-  private final String[] deprecatedBuilderGetterNames = {
-    "hasDeprecatedInt32", "getDeprecatedInt32", "clearDeprecatedInt32"
-  };
-
-  private final String[] deprecatedBuilderSetterNames = {"setDeprecatedInt32"};
-
-  @Test
-  public void testDeprecatedField() throws Exception {
-    Class<?> deprecatedFields = TestDeprecatedFields.class;
-    Class<?> deprecatedFieldsBuilder = TestDeprecatedFields.Builder.class;
-    for (String name : deprecatedGetterNames) {
-      Method method = deprecatedFields.getMethod(name);
-      assertWithMessage("Method %s should be deprecated", name).that(isDeprecated(method)).isTrue();
-    }
-    for (String name : deprecatedBuilderGetterNames) {
-      Method method = deprecatedFieldsBuilder.getMethod(name);
-      assertWithMessage("Method %s should be deprecated", name).that(isDeprecated(method)).isTrue();
-    }
-    for (String name : deprecatedBuilderSetterNames) {
-      Method method = deprecatedFieldsBuilder.getMethod(name, int.class);
-      assertWithMessage("Method %s should be deprecated", name).that(isDeprecated(method)).isTrue();
-    }
-  }
-
-  @Test
-  public void testDeprecatedFieldInOneof() throws Exception {
-    Class<?> oneofCase = TestDeprecatedFields.OneofFieldsCase.class;
-    String name = "DEPRECATED_INT32_IN_ONEOF";
-    java.lang.reflect.Field enumValue = oneofCase.getField(name);
-    assertWithMessage("Enum value %s should be deprecated.", name)
-        .that(isDeprecated(enumValue))
-        .isTrue();
-  }
-
-  private boolean isDeprecated(AnnotatedElement annotated) {
-    return annotated.isAnnotationPresent(Deprecated.class);
-  }
-}
diff --git a/libs/protobuf/java/core/src/test/java/com/google/protobuf/DescriptorsTest.java b/libs/protobuf/java/core/src/test/java/com/google/protobuf/DescriptorsTest.java
deleted file mode 100644
index a88baca..0000000
--- a/libs/protobuf/java/core/src/test/java/com/google/protobuf/DescriptorsTest.java
+++ /dev/null
@@ -1,869 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.common.truth.Truth.assertThat;
-import static com.google.common.truth.Truth.assertWithMessage;
-
-import com.google.protobuf.DescriptorProtos.DescriptorProto;
-import com.google.protobuf.DescriptorProtos.EnumDescriptorProto;
-import com.google.protobuf.DescriptorProtos.EnumValueDescriptorProto;
-import com.google.protobuf.DescriptorProtos.FieldDescriptorProto;
-import com.google.protobuf.DescriptorProtos.FileDescriptorProto;
-import com.google.protobuf.Descriptors.Descriptor;
-import com.google.protobuf.Descriptors.DescriptorValidationException;
-import com.google.protobuf.Descriptors.EnumDescriptor;
-import com.google.protobuf.Descriptors.EnumValueDescriptor;
-import com.google.protobuf.Descriptors.FieldDescriptor;
-import com.google.protobuf.Descriptors.FileDescriptor;
-import com.google.protobuf.Descriptors.MethodDescriptor;
-import com.google.protobuf.Descriptors.OneofDescriptor;
-import com.google.protobuf.Descriptors.ServiceDescriptor;
-import com.google.protobuf.test.UnittestImport;
-import com.google.protobuf.test.UnittestImport.ImportEnum;
-import com.google.protobuf.test.UnittestImport.ImportEnumForMap;
-import protobuf_unittest.TestCustomOptions;
-import protobuf_unittest.UnittestCustomOptions;
-import protobuf_unittest.UnittestProto;
-import protobuf_unittest.UnittestProto.ForeignEnum;
-import protobuf_unittest.UnittestProto.ForeignMessage;
-import protobuf_unittest.UnittestProto.TestAllExtensions;
-import protobuf_unittest.UnittestProto.TestAllTypes;
-import protobuf_unittest.UnittestProto.TestExtremeDefaultValues;
-import protobuf_unittest.UnittestProto.TestJsonName;
-import protobuf_unittest.UnittestProto.TestMultipleExtensionRanges;
-import protobuf_unittest.UnittestProto.TestRequired;
-import protobuf_unittest.UnittestProto.TestReservedFields;
-import protobuf_unittest.UnittestProto.TestService;
-import java.util.Collections;
-import java.util.List;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-import protobuf_unittest.NestedExtension;
-import protobuf_unittest.NonNestedExtension;
-
-/** Unit test for {@link Descriptors}. */
-@RunWith(JUnit4.class)
-public class DescriptorsTest {
-
-  // Regression test for bug where referencing a FieldDescriptor.Type value
-  // before a FieldDescriptorProto.Type value would yield a
-  // ExceptionInInitializerError.
-  @SuppressWarnings("unused")
-  private static final Object STATIC_INIT_TEST = FieldDescriptor.Type.BOOL;
-
-  @Test
-  public void testFieldTypeEnumMapping() throws Exception {
-    assertThat(FieldDescriptor.Type.values()).hasLength(FieldDescriptorProto.Type.values().length);
-    for (FieldDescriptor.Type type : FieldDescriptor.Type.values()) {
-      FieldDescriptorProto.Type protoType = type.toProto();
-      assertThat(protoType.name()).isEqualTo("TYPE_" + type.name());
-      assertThat(FieldDescriptor.Type.valueOf(protoType)).isEqualTo(type);
-    }
-  }
-
-  @Test
-  public void testFileDescriptor() throws Exception {
-    FileDescriptor file = UnittestProto.getDescriptor();
-
-    assertThat(file.getName()).isEqualTo("google/protobuf/unittest.proto");
-    assertThat(file.getPackage()).isEqualTo("protobuf_unittest");
-    assertThat(file.getOptions().getJavaOuterClassname()).isEqualTo("UnittestProto");
-    assertThat(file.toProto().getName()).isEqualTo("google/protobuf/unittest.proto");
-
-    assertThat(file.getDependencies()).containsExactly(UnittestImport.getDescriptor());
-
-    Descriptor messageType = TestAllTypes.getDescriptor();
-    assertThat(file.getMessageTypes().get(0)).isEqualTo(messageType);
-    assertThat(file.findMessageTypeByName("TestAllTypes")).isEqualTo(messageType);
-    assertThat(file.findMessageTypeByName("NoSuchType")).isNull();
-    assertThat(file.findMessageTypeByName("protobuf_unittest.TestAllTypes")).isNull();
-    for (int i = 0; i < file.getMessageTypes().size(); i++) {
-      assertThat(file.getMessageTypes().get(i).getIndex()).isEqualTo(i);
-    }
-
-    EnumDescriptor enumType = ForeignEnum.getDescriptor();
-    assertThat(file.getEnumTypes().get(0)).isEqualTo(enumType);
-    assertThat(file.findEnumTypeByName("ForeignEnum")).isEqualTo(enumType);
-    assertThat(file.findEnumTypeByName("NoSuchType")).isNull();
-    assertThat(file.findEnumTypeByName("protobuf_unittest.ForeignEnum")).isNull();
-    assertThat(UnittestImport.getDescriptor().getEnumTypes())
-        .containsExactly(ImportEnum.getDescriptor(), ImportEnumForMap.getDescriptor())
-        .inOrder();
-    for (int i = 0; i < file.getEnumTypes().size(); i++) {
-      assertThat(file.getEnumTypes().get(i).getIndex()).isEqualTo(i);
-    }
-
-    ServiceDescriptor service = TestService.getDescriptor();
-    assertThat(file.getServices().get(0)).isEqualTo(service);
-    assertThat(file.findServiceByName("TestService")).isEqualTo(service);
-    assertThat(file.findServiceByName("NoSuchType")).isNull();
-    assertThat(file.findServiceByName("protobuf_unittest.TestService")).isNull();
-    assertThat(UnittestImport.getDescriptor().getServices()).isEqualTo(Collections.emptyList());
-    for (int i = 0; i < file.getServices().size(); i++) {
-      assertThat(file.getServices().get(i).getIndex()).isEqualTo(i);
-    }
-
-    FieldDescriptor extension = UnittestProto.optionalInt32Extension.getDescriptor();
-    assertThat(file.getExtensions().get(0)).isEqualTo(extension);
-    assertThat(file.findExtensionByName("optional_int32_extension")).isEqualTo(extension);
-    assertThat(file.findExtensionByName("no_such_ext")).isNull();
-    assertThat(file.findExtensionByName("protobuf_unittest.optional_int32_extension")).isNull();
-    assertThat(UnittestImport.getDescriptor().getExtensions()).isEqualTo(Collections.emptyList());
-    for (int i = 0; i < file.getExtensions().size(); i++) {
-      assertThat(file.getExtensions().get(i).getIndex()).isEqualTo(i);
-    }
-  }
-
-  @Test
-  public void testDescriptor() throws Exception {
-    Descriptor messageType = TestAllTypes.getDescriptor();
-    Descriptor nestedType = TestAllTypes.NestedMessage.getDescriptor();
-
-    assertThat(messageType.getName()).isEqualTo("TestAllTypes");
-    assertThat(messageType.getFullName()).isEqualTo("protobuf_unittest.TestAllTypes");
-    assertThat(messageType.getFile()).isEqualTo(UnittestProto.getDescriptor());
-    assertThat(messageType.getContainingType()).isNull();
-    assertThat(messageType.getOptions())
-        .isEqualTo(DescriptorProtos.MessageOptions.getDefaultInstance());
-    assertThat(messageType.toProto().getName()).isEqualTo("TestAllTypes");
-
-    assertThat(nestedType.getName()).isEqualTo("NestedMessage");
-    assertThat(nestedType.getFullName()).isEqualTo("protobuf_unittest.TestAllTypes.NestedMessage");
-    assertThat(nestedType.getFile()).isEqualTo(UnittestProto.getDescriptor());
-    assertThat(nestedType.getContainingType()).isEqualTo(messageType);
-
-    FieldDescriptor field = messageType.getFields().get(0);
-    assertThat(field.getName()).isEqualTo("optional_int32");
-    assertThat(messageType.findFieldByName("optional_int32")).isEqualTo(field);
-    assertThat(messageType.findFieldByName("no_such_field")).isNull();
-    assertThat(messageType.findFieldByNumber(1)).isEqualTo(field);
-    assertThat(messageType.findFieldByNumber(571283)).isNull();
-    for (int i = 0; i < messageType.getFields().size(); i++) {
-      assertThat(messageType.getFields().get(i).getIndex()).isEqualTo(i);
-    }
-
-    assertThat(messageType.getNestedTypes().get(0)).isEqualTo(nestedType);
-    assertThat(messageType.findNestedTypeByName("NestedMessage")).isEqualTo(nestedType);
-    assertThat(messageType.findNestedTypeByName("NoSuchType")).isNull();
-    for (int i = 0; i < messageType.getNestedTypes().size(); i++) {
-      assertThat(messageType.getNestedTypes().get(i).getIndex()).isEqualTo(i);
-    }
-
-    EnumDescriptor enumType = TestAllTypes.NestedEnum.getDescriptor();
-    assertThat(messageType.getEnumTypes().get(0)).isEqualTo(enumType);
-    assertThat(messageType.findEnumTypeByName("NestedEnum")).isEqualTo(enumType);
-    assertThat(messageType.findEnumTypeByName("NoSuchType")).isNull();
-    for (int i = 0; i < messageType.getEnumTypes().size(); i++) {
-      assertThat(messageType.getEnumTypes().get(i).getIndex()).isEqualTo(i);
-    }
-  }
-
-  @Test
-  public void testFieldDescriptor() throws Exception {
-    Descriptor messageType = TestAllTypes.getDescriptor();
-    FieldDescriptor primitiveField = messageType.findFieldByName("optional_int32");
-    FieldDescriptor enumField = messageType.findFieldByName("optional_nested_enum");
-    FieldDescriptor messageField = messageType.findFieldByName("optional_foreign_message");
-    FieldDescriptor cordField = messageType.findFieldByName("optional_cord");
-    FieldDescriptor extension = UnittestProto.optionalInt32Extension.getDescriptor();
-    FieldDescriptor nestedExtension = TestRequired.single.getDescriptor();
-
-    assertThat(primitiveField.getName()).isEqualTo("optional_int32");
-    assertThat(primitiveField.getFullName())
-        .isEqualTo("protobuf_unittest.TestAllTypes.optional_int32");
-    assertThat(primitiveField.getNumber()).isEqualTo(1);
-    assertThat(primitiveField.getContainingType()).isEqualTo(messageType);
-    assertThat(primitiveField.getFile()).isEqualTo(UnittestProto.getDescriptor());
-    assertThat(primitiveField.getType()).isEqualTo(FieldDescriptor.Type.INT32);
-    assertThat(primitiveField.getJavaType()).isEqualTo(FieldDescriptor.JavaType.INT);
-    assertThat(primitiveField.getOptions())
-        .isEqualTo(DescriptorProtos.FieldOptions.getDefaultInstance());
-    assertThat(primitiveField.isExtension()).isFalse();
-    assertThat(primitiveField.toProto().getName()).isEqualTo("optional_int32");
-
-    assertThat(enumField.getName()).isEqualTo("optional_nested_enum");
-    assertThat(enumField.getType()).isEqualTo(FieldDescriptor.Type.ENUM);
-    assertThat(enumField.getJavaType()).isEqualTo(FieldDescriptor.JavaType.ENUM);
-    assertThat(enumField.getEnumType()).isEqualTo(TestAllTypes.NestedEnum.getDescriptor());
-
-    assertThat(messageField.getName()).isEqualTo("optional_foreign_message");
-    assertThat(messageField.getType()).isEqualTo(FieldDescriptor.Type.MESSAGE);
-    assertThat(messageField.getJavaType()).isEqualTo(FieldDescriptor.JavaType.MESSAGE);
-    assertThat(messageField.getMessageType()).isEqualTo(ForeignMessage.getDescriptor());
-
-    assertThat(cordField.getName()).isEqualTo("optional_cord");
-    assertThat(cordField.getType()).isEqualTo(FieldDescriptor.Type.STRING);
-    assertThat(cordField.getJavaType()).isEqualTo(FieldDescriptor.JavaType.STRING);
-    assertThat(cordField.getOptions().getCtype())
-        .isEqualTo(DescriptorProtos.FieldOptions.CType.CORD);
-
-    assertThat(extension.getName()).isEqualTo("optional_int32_extension");
-    assertThat(extension.getFullName()).isEqualTo("protobuf_unittest.optional_int32_extension");
-    assertThat(extension.getNumber()).isEqualTo(1);
-    assertThat(extension.getContainingType()).isEqualTo(TestAllExtensions.getDescriptor());
-    assertThat(extension.getFile()).isEqualTo(UnittestProto.getDescriptor());
-    assertThat(extension.getType()).isEqualTo(FieldDescriptor.Type.INT32);
-    assertThat(extension.getJavaType()).isEqualTo(FieldDescriptor.JavaType.INT);
-    assertThat(extension.getOptions())
-        .isEqualTo(DescriptorProtos.FieldOptions.getDefaultInstance());
-    assertThat(extension.isExtension()).isTrue();
-    assertThat(extension.getExtensionScope()).isNull();
-    assertThat(extension.toProto().getName()).isEqualTo("optional_int32_extension");
-
-    assertThat(nestedExtension.getName()).isEqualTo("single");
-    assertThat(nestedExtension.getFullName()).isEqualTo("protobuf_unittest.TestRequired.single");
-    assertThat(nestedExtension.getExtensionScope()).isEqualTo(TestRequired.getDescriptor());
-  }
-
-  @Test
-  public void testFieldDescriptorLabel() throws Exception {
-    FieldDescriptor requiredField = TestRequired.getDescriptor().findFieldByName("a");
-    FieldDescriptor optionalField = TestAllTypes.getDescriptor().findFieldByName("optional_int32");
-    FieldDescriptor repeatedField = TestAllTypes.getDescriptor().findFieldByName("repeated_int32");
-
-    assertThat(requiredField.isRequired()).isTrue();
-    assertThat(requiredField.isRepeated()).isFalse();
-    assertThat(optionalField.isRequired()).isFalse();
-    assertThat(optionalField.isRepeated()).isFalse();
-    assertThat(repeatedField.isRequired()).isFalse();
-    assertThat(repeatedField.isRepeated()).isTrue();
-  }
-
-  @Test
-  public void testFieldDescriptorJsonName() throws Exception {
-    FieldDescriptor requiredField = TestRequired.getDescriptor().findFieldByName("a");
-    FieldDescriptor optionalField = TestAllTypes.getDescriptor().findFieldByName("optional_int32");
-    FieldDescriptor repeatedField = TestAllTypes.getDescriptor().findFieldByName("repeated_int32");
-    assertThat(requiredField.getJsonName()).isEqualTo("a");
-    assertThat(optionalField.getJsonName()).isEqualTo("optionalInt32");
-    assertThat(repeatedField.getJsonName()).isEqualTo("repeatedInt32");
-  }
-
-  @Test
-  public void testFieldDescriptorDefault() throws Exception {
-    Descriptor d = TestAllTypes.getDescriptor();
-    assertThat(d.findFieldByName("optional_int32").hasDefaultValue()).isFalse();
-    assertThat(d.findFieldByName("optional_int32").getDefaultValue()).isEqualTo(0);
-    assertThat(d.findFieldByName("default_int32").hasDefaultValue()).isTrue();
-    assertThat(d.findFieldByName("default_int32").getDefaultValue()).isEqualTo(41);
-
-    d = TestExtremeDefaultValues.getDescriptor();
-    assertThat(d.findFieldByName("escaped_bytes").getDefaultValue())
-        .isEqualTo(
-            ByteString.copyFrom(
-                "\0\001\007\b\f\n\r\t\013\\\'\"\u00fe".getBytes(Internal.ISO_8859_1)));
-    assertThat(d.findFieldByName("large_uint32").getDefaultValue()).isEqualTo(-1);
-    assertThat(d.findFieldByName("large_uint64").getDefaultValue()).isEqualTo(-1L);
-  }
-
-  @Test
-  public void testEnumDescriptor() throws Exception {
-    EnumDescriptor enumType = ForeignEnum.getDescriptor();
-    EnumDescriptor nestedType = TestAllTypes.NestedEnum.getDescriptor();
-
-    assertThat(enumType.getName()).isEqualTo("ForeignEnum");
-    assertThat(enumType.getFullName()).isEqualTo("protobuf_unittest.ForeignEnum");
-    assertThat(enumType.getFile()).isEqualTo(UnittestProto.getDescriptor());
-    assertThat(enumType.getContainingType()).isNull();
-    assertThat(enumType.getOptions()).isEqualTo(DescriptorProtos.EnumOptions.getDefaultInstance());
-
-    assertThat(nestedType.getName()).isEqualTo("NestedEnum");
-    assertThat(nestedType.getFullName()).isEqualTo("protobuf_unittest.TestAllTypes.NestedEnum");
-    assertThat(nestedType.getFile()).isEqualTo(UnittestProto.getDescriptor());
-    assertThat(nestedType.getContainingType()).isEqualTo(TestAllTypes.getDescriptor());
-
-    EnumValueDescriptor value = ForeignEnum.FOREIGN_FOO.getValueDescriptor();
-    assertThat(enumType.getValues().get(0)).isEqualTo(value);
-    assertThat(value.getName()).isEqualTo("FOREIGN_FOO");
-    assertThat(value.toString()).isEqualTo("FOREIGN_FOO");
-    assertThat(value.getNumber()).isEqualTo(4);
-    assertThat(enumType.findValueByName("FOREIGN_FOO")).isEqualTo(value);
-    assertThat(enumType.findValueByNumber(4)).isEqualTo(value);
-    assertThat(enumType.findValueByName("NO_SUCH_VALUE")).isNull();
-    for (int i = 0; i < enumType.getValues().size(); i++) {
-      assertThat(enumType.getValues().get(i).getIndex()).isEqualTo(i);
-    }
-  }
-
-  @Test
-  public void testServiceDescriptor() throws Exception {
-    ServiceDescriptor service = TestService.getDescriptor();
-
-    assertThat(service.getName()).isEqualTo("TestService");
-    assertThat(service.getFullName()).isEqualTo("protobuf_unittest.TestService");
-    assertThat(service.getFile()).isEqualTo(UnittestProto.getDescriptor());
-
-
-    MethodDescriptor fooMethod = service.getMethods().get(0);
-    assertThat(fooMethod.getName()).isEqualTo("Foo");
-    assertThat(fooMethod.getInputType()).isEqualTo(UnittestProto.FooRequest.getDescriptor());
-    assertThat(fooMethod.getOutputType()).isEqualTo(UnittestProto.FooResponse.getDescriptor());
-    assertThat(service.findMethodByName("Foo")).isEqualTo(fooMethod);
-
-    MethodDescriptor barMethod = service.getMethods().get(1);
-    assertThat(barMethod.getName()).isEqualTo("Bar");
-    assertThat(barMethod.getInputType()).isEqualTo(UnittestProto.BarRequest.getDescriptor());
-    assertThat(barMethod.getOutputType()).isEqualTo(UnittestProto.BarResponse.getDescriptor());
-    assertThat(service.findMethodByName("Bar")).isEqualTo(barMethod);
-
-
-    assertThat(service.findMethodByName("NoSuchMethod")).isNull();
-
-    for (int i = 0; i < service.getMethods().size(); i++) {
-      assertThat(service.getMethods().get(i).getIndex()).isEqualTo(i);
-    }
-  }
-
-
-  @Test
-  public void testCustomOptions() throws Exception {
-    // Get the descriptor indirectly from a dependent proto class. This is to
-    // ensure that when a proto class is loaded, custom options defined in its
-    // dependencies are also properly initialized.
-    Descriptor descriptor =
-        TestCustomOptions.TestMessageWithCustomOptionsContainer.getDescriptor()
-            .findFieldByName("field")
-            .getMessageType();
-
-    assertThat(descriptor.getOptions().hasExtension(UnittestCustomOptions.messageOpt1)).isTrue();
-    assertThat(descriptor.getOptions().getExtension(UnittestCustomOptions.messageOpt1))
-        .isEqualTo(Integer.valueOf(-56));
-
-    FieldDescriptor field = descriptor.findFieldByName("field1");
-    assertThat(field).isNotNull();
-
-    assertThat(field.getOptions().hasExtension(UnittestCustomOptions.fieldOpt1)).isTrue();
-    assertThat(field.getOptions().getExtension(UnittestCustomOptions.fieldOpt1))
-        .isEqualTo(Long.valueOf(8765432109L));
-
-    OneofDescriptor oneof = descriptor.getOneofs().get(0);
-    assertThat(oneof).isNotNull();
-
-    assertThat(oneof.getOptions().hasExtension(UnittestCustomOptions.oneofOpt1)).isTrue();
-    assertThat(oneof.getOptions().getExtension(UnittestCustomOptions.oneofOpt1))
-        .isEqualTo(Integer.valueOf(-99));
-
-    EnumDescriptor enumType =
-        UnittestCustomOptions.TestMessageWithCustomOptions.AnEnum.getDescriptor();
-
-    assertThat(enumType.getOptions().hasExtension(UnittestCustomOptions.enumOpt1)).isTrue();
-    assertThat(enumType.getOptions().getExtension(UnittestCustomOptions.enumOpt1))
-        .isEqualTo(Integer.valueOf(-789));
-
-    ServiceDescriptor service = UnittestCustomOptions.TestServiceWithCustomOptions.getDescriptor();
-
-    assertThat(service.getOptions().hasExtension(UnittestCustomOptions.serviceOpt1)).isTrue();
-    assertThat(service.getOptions().getExtension(UnittestCustomOptions.serviceOpt1))
-        .isEqualTo(Long.valueOf(-9876543210L));
-
-    MethodDescriptor method = service.findMethodByName("Foo");
-    assertThat(method).isNotNull();
-
-    assertThat(method.getOptions().hasExtension(UnittestCustomOptions.methodOpt1)).isTrue();
-    assertThat(method.getOptions().getExtension(UnittestCustomOptions.methodOpt1))
-        .isEqualTo(UnittestCustomOptions.MethodOpt1.METHODOPT1_VAL2);
-  }
-
-  /** Test that the FieldDescriptor.Type enum is the same as the WireFormat.FieldType enum. */
-  @Test
-  public void testFieldTypeTablesMatch() throws Exception {
-    FieldDescriptor.Type[] values1 = FieldDescriptor.Type.values();
-    WireFormat.FieldType[] values2 = WireFormat.FieldType.values();
-
-    assertThat(values1).hasLength(values2.length);
-
-    for (int i = 0; i < values1.length; i++) {
-      assertThat(values1[i].toString()).isEqualTo(values2[i].toString());
-    }
-  }
-
-  /** Test that the FieldDescriptor.JavaType enum is the same as the WireFormat.JavaType enum. */
-  @Test
-  public void testJavaTypeTablesMatch() throws Exception {
-    FieldDescriptor.JavaType[] values1 = FieldDescriptor.JavaType.values();
-    WireFormat.JavaType[] values2 = WireFormat.JavaType.values();
-
-    assertThat(values1).hasLength(values2.length);
-
-    for (int i = 0; i < values1.length; i++) {
-      assertThat(values1[i].toString()).isEqualTo(values2[i].toString());
-    }
-  }
-
-  @Test
-  public void testEnormousDescriptor() throws Exception {
-    // The descriptor for this file is larger than 64k, yet it did not cause
-    // a compiler error due to an over-long string literal.
-    assertThat(UnittestEnormousDescriptor.getDescriptor().toProto().getSerializedSize())
-        .isGreaterThan(65536);
-  }
-
-  /** Tests that the DescriptorValidationException works as intended. */
-  @Test
-  public void testDescriptorValidatorException() throws Exception {
-    FileDescriptorProto fileDescriptorProto =
-        FileDescriptorProto.newBuilder()
-            .setName("foo.proto")
-            .addMessageType(
-                DescriptorProto.newBuilder()
-                    .setName("Foo")
-                    .addField(
-                        FieldDescriptorProto.newBuilder()
-                            .setLabel(FieldDescriptorProto.Label.LABEL_OPTIONAL)
-                            .setType(FieldDescriptorProto.Type.TYPE_INT32)
-                            .setName("foo")
-                            .setNumber(1)
-                            .setDefaultValue("invalid")
-                            .build())
-                    .build())
-            .build();
-    try {
-      Descriptors.FileDescriptor.buildFrom(fileDescriptorProto, new FileDescriptor[0]);
-      assertWithMessage("DescriptorValidationException expected").fail();
-    } catch (DescriptorValidationException e) {
-      // Expected; check that the error message contains some useful hints
-      assertThat(e).hasMessageThat().contains("foo");
-      assertThat(e).hasMessageThat().contains("Foo");
-      assertThat(e).hasMessageThat().contains("invalid");
-      assertThat(e).hasCauseThat().isInstanceOf(NumberFormatException.class);
-      assertThat(e).hasCauseThat().hasMessageThat().contains("invalid");
-    }
-  }
-
-  /** Tests that parsing an unknown enum throws an exception */
-  @Test
-  public void testParseUnknownEnum() {
-    FieldDescriptorProto.Builder field = FieldDescriptorProto.newBuilder()
-        .setLabel(FieldDescriptorProto.Label.LABEL_OPTIONAL)
-        .setTypeName("UnknownEnum")
-        .setType(FieldDescriptorProto.Type.TYPE_ENUM)
-        .setName("bar")
-        .setNumber(1);
-    DescriptorProto.Builder messageType = DescriptorProto.newBuilder()
-        .setName("Foo")
-        .addField(field);
-    FileDescriptorProto fooProto =
-        FileDescriptorProto.newBuilder()
-            .setName("foo.proto")
-            .addDependency("bar.proto")
-            .addMessageType(messageType)
-            .build();
-    try {
-      Descriptors.FileDescriptor.buildFrom(fooProto, new FileDescriptor[0], true);
-      assertWithMessage("DescriptorValidationException expected").fail();
-    } catch (DescriptorValidationException expected) {
-      assertThat(expected.getMessage()).contains("\"UnknownEnum\" is not an enum type.");
-    }
-  }
-
-
-  /**
-   * Tests the translate/crosslink for an example where a message field's name and type name are the
-   * same.
-   */
-  @Test
-  public void testDescriptorComplexCrosslink() throws Exception {
-    FileDescriptorProto fileDescriptorProto =
-        FileDescriptorProto.newBuilder()
-            .setName("foo.proto")
-            .addMessageType(
-                DescriptorProto.newBuilder()
-                    .setName("Foo")
-                    .addField(
-                        FieldDescriptorProto.newBuilder()
-                            .setLabel(FieldDescriptorProto.Label.LABEL_OPTIONAL)
-                            .setType(FieldDescriptorProto.Type.TYPE_INT32)
-                            .setName("foo")
-                            .setNumber(1)
-                            .build())
-                    .build())
-            .addMessageType(
-                DescriptorProto.newBuilder()
-                    .setName("Bar")
-                    .addField(
-                        FieldDescriptorProto.newBuilder()
-                            .setLabel(FieldDescriptorProto.Label.LABEL_OPTIONAL)
-                            .setTypeName("Foo")
-                            .setName("Foo")
-                            .setNumber(1)
-                            .build())
-                    .build())
-            .build();
-    // translate and crosslink
-    FileDescriptor file =
-        Descriptors.FileDescriptor.buildFrom(fileDescriptorProto, new FileDescriptor[0]);
-    // verify resulting descriptors
-    assertThat(file).isNotNull();
-    List<Descriptor> msglist = file.getMessageTypes();
-    assertThat(msglist).isNotNull();
-    assertThat(msglist).hasSize(2);
-    boolean barFound = false;
-    for (Descriptor desc : msglist) {
-      if (desc.getName().equals("Bar")) {
-        barFound = true;
-        assertThat(desc.getFields()).isNotNull();
-        List<FieldDescriptor> fieldlist = desc.getFields();
-        assertThat(fieldlist).isNotNull();
-        assertThat(fieldlist).hasSize(1);
-        assertThat(fieldlist.get(0).getType()).isSameInstanceAs(FieldDescriptor.Type.MESSAGE);
-        assertThat(fieldlist.get(0).getMessageType().getName().equals("Foo")).isTrue();
-      }
-    }
-    assertThat(barFound).isTrue();
-  }
-
-  @Test
-  public void testDependencyOrder() throws Exception {
-    FileDescriptorProto fooProto = FileDescriptorProto.newBuilder().setName("foo.proto").build();
-    FileDescriptorProto barProto =
-        FileDescriptorProto.newBuilder().setName("bar.proto").addDependency("foo.proto").build();
-    FileDescriptorProto bazProto =
-        FileDescriptorProto.newBuilder()
-            .setName("baz.proto")
-            .addDependency("foo.proto")
-            .addDependency("bar.proto")
-            .addPublicDependency(0)
-            .addPublicDependency(1)
-            .build();
-    FileDescriptor fooFile = Descriptors.FileDescriptor.buildFrom(fooProto, new FileDescriptor[0]);
-    FileDescriptor barFile =
-        Descriptors.FileDescriptor.buildFrom(barProto, new FileDescriptor[] {fooFile});
-
-    // Items in the FileDescriptor array can be in any order.
-    Descriptors.FileDescriptor.buildFrom(bazProto, new FileDescriptor[] {fooFile, barFile});
-    Descriptors.FileDescriptor.buildFrom(bazProto, new FileDescriptor[] {barFile, fooFile});
-  }
-
-  @Test
-  public void testInvalidPublicDependency() throws Exception {
-    FileDescriptorProto fooProto = FileDescriptorProto.newBuilder().setName("foo.proto").build();
-    FileDescriptorProto barProto =
-        FileDescriptorProto.newBuilder()
-            .setName("boo.proto")
-            .addDependency("foo.proto")
-            .addPublicDependency(1) // Error, should be 0.
-            .build();
-    FileDescriptor fooFile = Descriptors.FileDescriptor.buildFrom(fooProto, new FileDescriptor[0]);
-    try {
-      Descriptors.FileDescriptor.buildFrom(barProto, new FileDescriptor[] {fooFile});
-      assertWithMessage("DescriptorValidationException expected").fail();
-    } catch (DescriptorValidationException e) {
-      assertThat(e).hasMessageThat().contains("Invalid public dependency index.");
-    }
-  }
-
-  @Test
-  public void testUnknownFieldsDenied() throws Exception {
-    FileDescriptorProto fooProto =
-        FileDescriptorProto.newBuilder()
-            .setName("foo.proto")
-            .addMessageType(
-                DescriptorProto.newBuilder()
-                    .setName("Foo")
-                    .addField(
-                        FieldDescriptorProto.newBuilder()
-                            .setLabel(FieldDescriptorProto.Label.LABEL_OPTIONAL)
-                            .setTypeName("Bar")
-                            .setName("bar")
-                            .setNumber(1)))
-            .build();
-
-    try {
-      Descriptors.FileDescriptor.buildFrom(fooProto, new FileDescriptor[0]);
-      assertWithMessage("DescriptorValidationException expected").fail();
-    } catch (DescriptorValidationException e) {
-      assertThat(e).hasMessageThat().contains("Bar");
-      assertThat(e).hasMessageThat().contains("is not defined");
-    }
-  }
-
-  @Test
-  public void testUnknownFieldsAllowed() throws Exception {
-    FileDescriptorProto fooProto =
-        FileDescriptorProto.newBuilder()
-            .setName("foo.proto")
-            .addDependency("bar.proto")
-            .addMessageType(
-                DescriptorProto.newBuilder()
-                    .setName("Foo")
-                    .addField(
-                        FieldDescriptorProto.newBuilder()
-                            .setLabel(FieldDescriptorProto.Label.LABEL_OPTIONAL)
-                            .setTypeName("Bar")
-                            .setName("bar")
-                            .setNumber(1)))
-            .build();
-    Descriptors.FileDescriptor.buildFrom(fooProto, new FileDescriptor[0], true);
-  }
-
-  @Test
-  public void testHiddenDependency() throws Exception {
-    FileDescriptorProto barProto =
-        FileDescriptorProto.newBuilder()
-            .setName("bar.proto")
-            .addMessageType(DescriptorProto.newBuilder().setName("Bar"))
-            .build();
-    FileDescriptorProto forwardProto =
-        FileDescriptorProto.newBuilder()
-            .setName("forward.proto")
-            .addDependency("bar.proto")
-            .build();
-    FileDescriptorProto fooProto =
-        FileDescriptorProto.newBuilder()
-            .setName("foo.proto")
-            .addDependency("forward.proto")
-            .addMessageType(
-                DescriptorProto.newBuilder()
-                    .setName("Foo")
-                    .addField(
-                        FieldDescriptorProto.newBuilder()
-                            .setLabel(FieldDescriptorProto.Label.LABEL_OPTIONAL)
-                            .setTypeName("Bar")
-                            .setName("bar")
-                            .setNumber(1)))
-            .build();
-    FileDescriptor barFile = Descriptors.FileDescriptor.buildFrom(barProto, new FileDescriptor[0]);
-    FileDescriptor forwardFile =
-        Descriptors.FileDescriptor.buildFrom(forwardProto, new FileDescriptor[] {barFile});
-
-    try {
-      Descriptors.FileDescriptor.buildFrom(fooProto, new FileDescriptor[] {forwardFile});
-      assertWithMessage("DescriptorValidationException expected").fail();
-    } catch (DescriptorValidationException e) {
-      assertThat(e).hasMessageThat().contains("Bar");
-      assertThat(e).hasMessageThat().contains("is not defined");
-    }
-  }
-
-  @Test
-  public void testPublicDependency() throws Exception {
-    FileDescriptorProto barProto =
-        FileDescriptorProto.newBuilder()
-            .setName("bar.proto")
-            .addMessageType(DescriptorProto.newBuilder().setName("Bar"))
-            .build();
-    FileDescriptorProto forwardProto =
-        FileDescriptorProto.newBuilder()
-            .setName("forward.proto")
-            .addDependency("bar.proto")
-            .addPublicDependency(0)
-            .build();
-    FileDescriptorProto fooProto =
-        FileDescriptorProto.newBuilder()
-            .setName("foo.proto")
-            .addDependency("forward.proto")
-            .addMessageType(
-                DescriptorProto.newBuilder()
-                    .setName("Foo")
-                    .addField(
-                        FieldDescriptorProto.newBuilder()
-                            .setLabel(FieldDescriptorProto.Label.LABEL_OPTIONAL)
-                            .setTypeName("Bar")
-                            .setName("bar")
-                            .setNumber(1)))
-            .build();
-    FileDescriptor barFile = Descriptors.FileDescriptor.buildFrom(barProto, new FileDescriptor[0]);
-    FileDescriptor forwardFile =
-        Descriptors.FileDescriptor.buildFrom(forwardProto, new FileDescriptor[] {barFile});
-    Descriptors.FileDescriptor.buildFrom(fooProto, new FileDescriptor[] {forwardFile});
-  }
-
-  /** Tests the translate/crosslink for an example with a more complex namespace referencing. */
-  @Test
-  public void testComplexNamespacePublicDependency() throws Exception {
-    FileDescriptorProto fooProto =
-        FileDescriptorProto.newBuilder()
-            .setName("bar.proto")
-            .setPackage("a.b.c.d.bar.shared")
-            .addEnumType(
-                EnumDescriptorProto.newBuilder()
-                    .setName("MyEnum")
-                    .addValue(EnumValueDescriptorProto.newBuilder().setName("BLAH").setNumber(1)))
-            .build();
-    FileDescriptorProto barProto =
-        FileDescriptorProto.newBuilder()
-            .setName("foo.proto")
-            .addDependency("bar.proto")
-            .setPackage("a.b.c.d.foo.shared")
-            .addMessageType(
-                DescriptorProto.newBuilder()
-                    .setName("MyMessage")
-                    .addField(
-                        FieldDescriptorProto.newBuilder()
-                            .setLabel(FieldDescriptorProto.Label.LABEL_REPEATED)
-                            .setTypeName("bar.shared.MyEnum")
-                            .setName("MyField")
-                            .setNumber(1)))
-            .build();
-    // translate and crosslink
-    FileDescriptor fooFile = Descriptors.FileDescriptor.buildFrom(fooProto, new FileDescriptor[0]);
-    FileDescriptor barFile =
-        Descriptors.FileDescriptor.buildFrom(barProto, new FileDescriptor[] {fooFile});
-    // verify resulting descriptors
-    assertThat(barFile).isNotNull();
-    List<Descriptor> msglist = barFile.getMessageTypes();
-    assertThat(msglist).isNotNull();
-    assertThat(msglist).hasSize(1);
-    Descriptor desc = msglist.get(0);
-    if (desc.getName().equals("MyMessage")) {
-      assertThat(desc.getFields()).isNotNull();
-      List<FieldDescriptor> fieldlist = desc.getFields();
-      assertThat(fieldlist).isNotNull();
-      assertThat(fieldlist).hasSize(1);
-      FieldDescriptor field = fieldlist.get(0);
-      assertThat(field.getType()).isSameInstanceAs(FieldDescriptor.Type.ENUM);
-      assertThat(field.getEnumType().getName().equals("MyEnum")).isTrue();
-      assertThat(field.getEnumType().getFile().getName().equals("bar.proto")).isTrue();
-      assertThat(field.getEnumType().getFile().getPackage().equals("a.b.c.d.bar.shared")).isTrue();
-    }
-  }
-
-  @Test
-  public void testOneofDescriptor() throws Exception {
-    Descriptor messageType = TestAllTypes.getDescriptor();
-    FieldDescriptor field = messageType.findFieldByName("oneof_nested_message");
-    OneofDescriptor oneofDescriptor = field.getContainingOneof();
-    assertThat(oneofDescriptor).isNotNull();
-    assertThat(messageType.getOneofs().get(0)).isSameInstanceAs(oneofDescriptor);
-    assertThat(oneofDescriptor.getName()).isEqualTo("oneof_field");
-
-    assertThat(oneofDescriptor.getFieldCount()).isEqualTo(4);
-    assertThat(field).isSameInstanceAs(oneofDescriptor.getField(1));
-
-    assertThat(oneofDescriptor.getFields()).hasSize(4);
-    assertThat(field).isEqualTo(oneofDescriptor.getFields().get(1));
-  }
-
-  @Test
-  public void testMessageDescriptorExtensions() throws Exception {
-    assertThat(TestAllTypes.getDescriptor().isExtendable()).isFalse();
-    assertThat(TestAllExtensions.getDescriptor().isExtendable()).isTrue();
-    assertThat(TestMultipleExtensionRanges.getDescriptor().isExtendable()).isTrue();
-
-    assertThat(TestAllTypes.getDescriptor().isExtensionNumber(3)).isFalse();
-    assertThat(TestAllExtensions.getDescriptor().isExtensionNumber(3)).isTrue();
-    assertThat(TestMultipleExtensionRanges.getDescriptor().isExtensionNumber(42)).isTrue();
-    assertThat(TestMultipleExtensionRanges.getDescriptor().isExtensionNumber(43)).isFalse();
-    assertThat(TestMultipleExtensionRanges.getDescriptor().isExtensionNumber(4142)).isFalse();
-    assertThat(TestMultipleExtensionRanges.getDescriptor().isExtensionNumber(4143)).isTrue();
-  }
-
-  @Test
-  public void testReservedFields() {
-    Descriptor d = TestReservedFields.getDescriptor();
-    assertThat(d.isReservedNumber(2)).isTrue();
-    assertThat(d.isReservedNumber(8)).isFalse();
-    assertThat(d.isReservedNumber(9)).isTrue();
-    assertThat(d.isReservedNumber(10)).isTrue();
-    assertThat(d.isReservedNumber(11)).isTrue();
-    assertThat(d.isReservedNumber(12)).isFalse();
-    assertThat(d.isReservedName("foo")).isFalse();
-    assertThat(d.isReservedName("bar")).isTrue();
-    assertThat(d.isReservedName("baz")).isTrue();
-  }
-
-  @Test
-  public void testToString() {
-    assertThat(
-            UnittestProto.TestAllTypes.getDescriptor()
-                .findFieldByNumber(UnittestProto.TestAllTypes.OPTIONAL_UINT64_FIELD_NUMBER)
-                .toString())
-        .isEqualTo("protobuf_unittest.TestAllTypes.optional_uint64");
-  }
-
-  @Test
-  public void testPackedEnumField() throws Exception {
-    FileDescriptorProto fileDescriptorProto =
-        FileDescriptorProto.newBuilder()
-            .setName("foo.proto")
-            .addEnumType(
-                EnumDescriptorProto.newBuilder()
-                    .setName("Enum")
-                    .addValue(
-                        EnumValueDescriptorProto.newBuilder().setName("FOO").setNumber(1).build())
-                    .build())
-            .addMessageType(
-                DescriptorProto.newBuilder()
-                    .setName("Message")
-                    .addField(
-                        FieldDescriptorProto.newBuilder()
-                            .setName("foo")
-                            .setTypeName("Enum")
-                            .setNumber(1)
-                            .setLabel(FieldDescriptorProto.Label.LABEL_REPEATED)
-                            .setOptions(
-                                DescriptorProtos.FieldOptions.newBuilder().setPacked(true).build())
-                            .build())
-                    .build())
-            .build();
-    Descriptors.FileDescriptor.buildFrom(fileDescriptorProto, new FileDescriptor[0]);
-  }
-
-  @Test
-  public void testFieldJsonName() throws Exception {
-    Descriptor d = TestJsonName.getDescriptor();
-    assertThat(d.getFields()).hasSize(7);
-    assertThat(d.getFields().get(0).getJsonName()).isEqualTo("fieldName1");
-    assertThat(d.getFields().get(1).getJsonName()).isEqualTo("fieldName2");
-    assertThat(d.getFields().get(2).getJsonName()).isEqualTo("FieldName3");
-    assertThat(d.getFields().get(3).getJsonName()).isEqualTo("FieldName4");
-    assertThat(d.getFields().get(4).getJsonName()).isEqualTo("FIELDNAME5");
-    assertThat(d.getFields().get(5).getJsonName()).isEqualTo("@type");
-    assertThat(d.getFields().get(6).getJsonName()).isEqualTo("fieldname7");
-  }
-
-  @Test
-  public void testExtensionRenamesKeywords() {
-    assertThat(NonNestedExtension.if_).isInstanceOf(GeneratedMessage.GeneratedExtension.class);
-    assertThat(NestedExtension.MyNestedExtension.default_)
-        .isInstanceOf(GeneratedMessage.GeneratedExtension.class);
-
-    NonNestedExtension.MessageToBeExtended msg =
-        NonNestedExtension.MessageToBeExtended.newBuilder()
-            .setExtension(NonNestedExtension.if_, "!fi")
-            .build();
-    assertThat(msg.getExtension(NonNestedExtension.if_)).isEqualTo("!fi");
-
-    msg =
-        NonNestedExtension.MessageToBeExtended.newBuilder()
-            .setExtension(NestedExtension.MyNestedExtension.default_, 8)
-            .build();
-    assertThat(msg.getExtension(NestedExtension.MyNestedExtension.default_).intValue())
-        .isEqualTo(8);
-  }
-
-  @Test
-  public void testDefaultDescriptorExtensionRange() throws Exception {
-    assertThat(new Descriptor("default").isExtensionNumber(1)).isTrue();
-  }
-}
diff --git a/libs/protobuf/java/core/src/test/java/com/google/protobuf/DiscardUnknownFieldsTest.java b/libs/protobuf/java/core/src/test/java/com/google/protobuf/DiscardUnknownFieldsTest.java
deleted file mode 100644
index a130545..0000000
--- a/libs/protobuf/java/core/src/test/java/com/google/protobuf/DiscardUnknownFieldsTest.java
+++ /dev/null
@@ -1,120 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.common.truth.Truth.assertWithMessage;
-
-import protobuf_unittest.UnittestProto;
-import proto3_unittest.UnittestProto3;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-/** Unit tests for discard or preserve unknown fields. */
-@RunWith(JUnit4.class)
-public class DiscardUnknownFieldsTest {
-  @Test
-  public void testProto2() throws Exception {
-    testProto2Message(UnittestProto.TestEmptyMessage.getDefaultInstance());
-    testProto2Message(UnittestProto.TestEmptyMessageWithExtensions.getDefaultInstance());
-    testProto2Message(
-        DynamicMessage.getDefaultInstance(UnittestProto.TestEmptyMessage.getDescriptor()));
-    testProto2Message(
-        DynamicMessage.getDefaultInstance(
-            UnittestProto.TestEmptyMessageWithExtensions.getDescriptor()));
-  }
-
-  @Test
-  public void testProto3() throws Exception {
-    testProto3Message(UnittestProto3.TestEmptyMessage.getDefaultInstance());
-    testProto3Message(
-        DynamicMessage.getDefaultInstance(UnittestProto3.TestEmptyMessage.getDescriptor()));
-  }
-
-  private static void testProto2Message(Message message) throws Exception {
-    assertUnknownFieldsPreserved(message);
-    assertUnknownFieldsExplicitlyDiscarded(message);
-    assertReuseCodedInputStreamPreserve(message);
-    assertUnknownFieldsInUnknownFieldSetArePreserve(message);
-  }
-
-  private static void testProto3Message(Message message) throws Exception {
-    assertUnknownFieldsPreserved(message);
-    assertUnknownFieldsExplicitlyDiscarded(message);
-    assertReuseCodedInputStreamPreserve(message);
-    assertUnknownFieldsInUnknownFieldSetArePreserve(message);
-  }
-
-  private static void assertReuseCodedInputStreamPreserve(Message message) throws Exception {
-    final int messageSize = payload.size();
-    byte[] copied = new byte[messageSize * 2];
-    payload.copyTo(copied, 0);
-    payload.copyTo(copied, messageSize);
-    CodedInputStream input = CodedInputStream.newInstance(copied);
-
-    // Use DiscardUnknownFieldsParser to parse the first payload.
-    int oldLimit = input.pushLimit(messageSize);
-    Message parsed = DiscardUnknownFieldsParser.wrap(message.getParserForType()).parseFrom(input);
-    assertWithMessage(message.getClass().getName()).that(parsed.getSerializedSize()).isEqualTo(0);
-    input.popLimit(oldLimit);
-
-    // Use the normal parser to parse the remaining payload should have unknown fields preserved.
-    parsed = message.getParserForType().parseFrom(input);
-    assertWithMessage(message.getClass().getName()).that(parsed.toByteString()).isEqualTo(payload);
-  }
-
-  /**
-   * {@link Message.Builder#setUnknownFields(UnknownFieldSet)} and {@link
-   * Message.Builder#mergeUnknownFields(UnknownFieldSet)} should preserve the unknown fields.
-   */
-  private static void assertUnknownFieldsInUnknownFieldSetArePreserve(Message message)
-      throws Exception {
-    UnknownFieldSet unknownFields = UnknownFieldSet.newBuilder().mergeFrom(payload).build();
-    Message built = message.newBuilderForType().setUnknownFields(unknownFields).build();
-    assertWithMessage(message.getClass().getName()).that(built.toByteString()).isEqualTo(payload);
-  }
-
-  private static void assertUnknownFieldsPreserved(MessageLite message) throws Exception {
-    MessageLite parsed = message.getParserForType().parseFrom(payload);
-    assertWithMessage(message.getClass().getName()).that(parsed.toByteString()).isEqualTo(payload);
-
-    parsed = message.newBuilderForType().mergeFrom(payload).build();
-    assertWithMessage(message.getClass().getName()).that(parsed.toByteString()).isEqualTo(payload);
-  }
-
-  private static void assertUnknownFieldsExplicitlyDiscarded(Message message) throws Exception {
-    Message parsed = DiscardUnknownFieldsParser.wrap(message.getParserForType()).parseFrom(payload);
-    assertWithMessage(message.getClass().getName()).that(parsed.getSerializedSize()).isEqualTo(0);
-  }
-
-  private static final ByteString payload =
-      TestUtilLite.getAllLiteSetBuilder().build().toByteString();
-}
diff --git a/libs/protobuf/java/core/src/test/java/com/google/protobuf/DoubleArrayListTest.java b/libs/protobuf/java/core/src/test/java/com/google/protobuf/DoubleArrayListTest.java
deleted file mode 100644
index 28c05a3..0000000
--- a/libs/protobuf/java/core/src/test/java/com/google/protobuf/DoubleArrayListTest.java
+++ /dev/null
@@ -1,586 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.common.truth.Truth.assertThat;
-import static com.google.common.truth.Truth.assertWithMessage;
-import static java.util.Arrays.asList;
-
-import com.google.protobuf.Internal.DoubleList;
-import java.util.Collections;
-import java.util.ConcurrentModificationException;
-import java.util.Iterator;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-/** Tests for {@link DoubleArrayList}. */
-@RunWith(JUnit4.class)
-public class DoubleArrayListTest {
-
-  private static final DoubleArrayList UNARY_LIST = newImmutableDoubleArrayList(1);
-  private static final DoubleArrayList TERTIARY_LIST = newImmutableDoubleArrayList(1, 2, 3);
-
-  private DoubleArrayList list;
-
-  @Before
-  public void setUp() throws Exception {
-    list = new DoubleArrayList();
-  }
-
-  @Test
-  public void testEmptyListReturnsSameInstance() {
-    assertThat(DoubleArrayList.emptyList()).isSameInstanceAs(DoubleArrayList.emptyList());
-  }
-
-  @Test
-  public void testEmptyListIsImmutable() {
-    assertImmutable(DoubleArrayList.emptyList());
-  }
-
-  @Test
-  public void testMakeImmutable() {
-    list.addDouble(3);
-    list.addDouble(4);
-    list.addDouble(5);
-    list.addDouble(7);
-    list.makeImmutable();
-    assertImmutable(list);
-  }
-
-  @Test
-  public void testModificationWithIteration() {
-    list.addAll(asList(1D, 2D, 3D, 4D));
-    Iterator<Double> iterator = list.iterator();
-    assertThat(list).hasSize(4);
-    assertThat((double) list.get(0)).isEqualTo(1D);
-    assertThat((double) iterator.next()).isEqualTo(1D);
-    list.set(0, 1D);
-    assertThat((double) iterator.next()).isEqualTo(2D);
-
-    list.remove(0);
-    try {
-      iterator.next();
-      assertWithMessage("expected exception").fail();
-    } catch (ConcurrentModificationException e) {
-      // expected
-    }
-
-    iterator = list.iterator();
-    list.add(0, 0D);
-    try {
-      iterator.next();
-      assertWithMessage("expected exception").fail();
-    } catch (ConcurrentModificationException e) {
-      // expected
-    }
-  }
-
-  @Test
-  public void testGet() {
-    assertThat((double) TERTIARY_LIST.get(0)).isEqualTo(1D);
-    assertThat((double) TERTIARY_LIST.get(1)).isEqualTo(2D);
-    assertThat((double) TERTIARY_LIST.get(2)).isEqualTo(3D);
-
-    try {
-      TERTIARY_LIST.get(-1);
-      assertWithMessage("expected exception").fail();
-    } catch (IndexOutOfBoundsException e) {
-      // expected
-    }
-
-    try {
-      TERTIARY_LIST.get(3);
-      assertWithMessage("expected exception").fail();
-    } catch (IndexOutOfBoundsException e) {
-      // expected
-    }
-  }
-
-  @Test
-  public void testGetDouble() {
-    assertThat(TERTIARY_LIST.getDouble(0)).isEqualTo(1D);
-    assertThat(TERTIARY_LIST.getDouble(1)).isEqualTo(2D);
-    assertThat(TERTIARY_LIST.getDouble(2)).isEqualTo(3D);
-
-    try {
-      TERTIARY_LIST.get(-1);
-      assertWithMessage("expected exception").fail();
-    } catch (IndexOutOfBoundsException e) {
-      // expected
-    }
-
-    try {
-      TERTIARY_LIST.get(3);
-      assertWithMessage("expected exception").fail();
-    } catch (IndexOutOfBoundsException e) {
-      // expected
-    }
-  }
-
-  @Test
-  public void testIndexOf_nullElement() {
-    assertThat(TERTIARY_LIST.indexOf(null)).isEqualTo(-1);
-  }
-
-  @Test
-  public void testIndexOf_incompatibleElementType() {
-    assertThat(TERTIARY_LIST.indexOf(new Object())).isEqualTo(-1);
-  }
-
-  @Test
-  public void testIndexOf_notInList() {
-    assertThat(UNARY_LIST.indexOf(2D)).isEqualTo(-1);
-  }
-
-  @Test
-  public void testIndexOf_notInListWithDuplicates() {
-    DoubleArrayList listWithDupes = newImmutableDoubleArrayList(1D, 1D);
-    assertThat(listWithDupes.indexOf(2D)).isEqualTo(-1);
-  }
-
-  @Test
-  public void testIndexOf_inList() {
-    assertThat(TERTIARY_LIST.indexOf(2D)).isEqualTo(1);
-  }
-
-  @Test
-  public void testIndexOf_inListWithDuplicates_matchAtHead() {
-    DoubleArrayList listWithDupes = newImmutableDoubleArrayList(1D, 1D, 2D);
-    assertThat(listWithDupes.indexOf(1D)).isEqualTo(0);
-  }
-
-  @Test
-  public void testIndexOf_inListWithDuplicates_matchMidList() {
-    DoubleArrayList listWithDupes = newImmutableDoubleArrayList(2D, 1D, 1D, 2D);
-    assertThat(listWithDupes.indexOf(1D)).isEqualTo(1);
-  }
-
-  @Test
-  public void testContains_nullElement() {
-    assertThat(TERTIARY_LIST).doesNotContain(null);
-  }
-
-  @Test
-  public void testContains_incompatibleElementType() {
-    assertThat(TERTIARY_LIST).doesNotContain(new Object());
-  }
-
-  @Test
-  public void testContains_notInList() {
-    assertThat(UNARY_LIST).doesNotContain(2D);
-  }
-
-  @Test
-  public void testContains_notInListWithDuplicates() {
-    DoubleArrayList listWithDupes = newImmutableDoubleArrayList(1D, 1D);
-    assertThat(listWithDupes).doesNotContain(2D);
-  }
-
-  @Test
-  public void testContains_inList() {
-    assertThat(TERTIARY_LIST).contains(2D);
-  }
-
-  @Test
-  public void testContains_inListWithDuplicates_matchAtHead() {
-    DoubleArrayList listWithDupes = newImmutableDoubleArrayList(1D, 1D, 2D);
-    assertThat(listWithDupes).contains(1D);
-  }
-
-  @Test
-  public void testContains_inListWithDuplicates_matchMidList() {
-    DoubleArrayList listWithDupes = newImmutableDoubleArrayList(2D, 1D, 1D, 2D);
-    assertThat(listWithDupes).contains(1D);
-  }
-
-  @Test
-  public void testSize() {
-    assertThat(DoubleArrayList.emptyList()).isEmpty();
-    assertThat(UNARY_LIST).hasSize(1);
-    assertThat(TERTIARY_LIST).hasSize(3);
-
-    list.addDouble(3);
-    list.addDouble(4);
-    list.addDouble(6);
-    list.addDouble(8);
-    assertThat(list).hasSize(4);
-
-    list.remove(0);
-    assertThat(list).hasSize(3);
-
-    list.add(17D);
-    assertThat(list).hasSize(4);
-  }
-
-  @Test
-  public void testSet() {
-    list.addDouble(2);
-    list.addDouble(4);
-
-    assertThat((double) list.set(0, 3D)).isEqualTo(2D);
-    assertThat(list.getDouble(0)).isEqualTo(3D);
-
-    assertThat((double) list.set(1, 0D)).isEqualTo(4D);
-    assertThat(list.getDouble(1)).isEqualTo(0D);
-
-    try {
-      list.set(-1, 0D);
-      assertWithMessage("expected exception").fail();
-    } catch (IndexOutOfBoundsException e) {
-      // expected
-    }
-
-    try {
-      list.set(2, 0D);
-      assertWithMessage("expected exception").fail();
-    } catch (IndexOutOfBoundsException e) {
-      // expected
-    }
-  }
-
-  @Test
-  public void testSetDouble() {
-    list.addDouble(1);
-    list.addDouble(3);
-
-    assertThat(list.setDouble(0, 0)).isEqualTo(1D);
-    assertThat(list.getDouble(0)).isEqualTo(0D);
-
-    assertThat(list.setDouble(1, 0)).isEqualTo(3D);
-    assertThat(list.getDouble(1)).isEqualTo(0D);
-
-    try {
-      list.setDouble(-1, 0);
-      assertWithMessage("expected exception").fail();
-    } catch (IndexOutOfBoundsException e) {
-      // expected
-    }
-
-    try {
-      list.setDouble(2, 0);
-      assertWithMessage("expected exception").fail();
-    } catch (IndexOutOfBoundsException e) {
-      // expected
-    }
-  }
-
-  @Test
-  public void testAdd() {
-    assertThat(list).isEmpty();
-
-    assertThat(list.add(2D)).isTrue();
-    assertThat(list).containsExactly(2D);
-
-    assertThat(list.add(3D)).isTrue();
-    list.add(0, 4D);
-    assertThat(list).containsExactly(4D, 2D, 3D).inOrder();
-
-    list.add(0, 1D);
-    list.add(0, 0D);
-    // Force a resize by getting up to 11 elements.
-    for (int i = 0; i < 6; i++) {
-      list.add(Double.valueOf(5 + i));
-    }
-    assertThat(list).containsExactly(0D, 1D, 4D, 2D, 3D, 5D, 6D, 7D, 8D, 9D, 10D).inOrder();
-
-    try {
-      list.add(-1, 5D);
-    } catch (IndexOutOfBoundsException e) {
-      // expected
-    }
-
-    try {
-      list.add(4, 5D);
-    } catch (IndexOutOfBoundsException e) {
-      // expected
-    }
-  }
-
-  @Test
-  public void testAddDouble() {
-    assertThat(list).isEmpty();
-
-    list.addDouble(2);
-    assertThat(list).containsExactly(2D);
-
-    list.addDouble(3);
-    assertThat(list).containsExactly(2D, 3D).inOrder();
-  }
-
-  @Test
-  public void testAddAll() {
-    assertThat(list).isEmpty();
-
-    assertThat(list.addAll(Collections.singleton(1D))).isTrue();
-    assertThat(list).hasSize(1);
-    assertThat((double) list.get(0)).isEqualTo(1D);
-    assertThat(list.getDouble(0)).isEqualTo(1D);
-
-    assertThat(list.addAll(asList(2D, 3D, 4D, 5D, 6D))).isTrue();
-    assertThat(list).containsExactly(1D, 2D, 3D, 4D, 5D, 6D).inOrder();
-
-    assertThat(list.addAll(TERTIARY_LIST)).isTrue();
-    assertThat(list).containsExactly(1D, 2D, 3D, 4D, 5D, 6D, 1D, 2D, 3D).inOrder();
-
-    assertThat(list.addAll(Collections.<Double>emptyList())).isFalse();
-    assertThat(list.addAll(DoubleArrayList.emptyList())).isFalse();
-  }
-
-  @Test
-  public void testEquals() {
-    DoubleArrayList list1 = new DoubleArrayList();
-    DoubleArrayList list2 = new DoubleArrayList();
-
-    list1.addDouble(Double.longBitsToDouble(0x7ff0000000000001L));
-    list2.addDouble(Double.longBitsToDouble(0x7ff0000000000002L));
-    assertThat(list1).isEqualTo(list2);
-  }
-
-  @Test
-  public void testRemove() {
-    list.addAll(TERTIARY_LIST);
-    assertThat((double) list.remove(0)).isEqualTo(1D);
-    assertThat(list).containsExactly(2D, 3D).inOrder();
-
-    assertThat(list.remove(Double.valueOf(3))).isTrue();
-    assertThat(list).containsExactly(2D);
-
-    assertThat(list.remove(Double.valueOf(3))).isFalse();
-    assertThat(list).containsExactly(2D);
-
-    assertThat((double) list.remove(0)).isEqualTo(2D);
-    assertThat(list).isEmpty();
-
-    try {
-      list.remove(-1);
-      assertWithMessage("expected exception").fail();
-    } catch (IndexOutOfBoundsException e) {
-      // expected
-    }
-
-    try {
-      list.remove(0);
-      assertWithMessage("expected exception").fail();
-    } catch (IndexOutOfBoundsException e) {
-      // expected
-    }
-  }
-
-  @Test
-  public void testRemoveEnd_listAtCapacity() {
-    DoubleList toRemove = DoubleArrayList.emptyList().mutableCopyWithCapacity(1);
-    toRemove.addDouble(3);
-    toRemove.remove(0);
-    assertThat(toRemove).isEmpty();
-  }
-
-  @Test
-  public void testRemove_listAtCapacity() {
-    DoubleList toRemove = DoubleArrayList.emptyList().mutableCopyWithCapacity(2);
-    toRemove.addDouble(3);
-    toRemove.addDouble(4);
-    toRemove.remove(0);
-    assertThat(toRemove).hasSize(1);
-    assertThat((double) toRemove.get(0)).isEqualTo(4D);
-  }
-
-  @Test
-  public void testSublistRemoveEndOfCapacity() {
-    DoubleList toRemove = DoubleArrayList.emptyList().mutableCopyWithCapacity(1);
-    toRemove.addDouble(3);
-    toRemove.subList(0, 1).clear();
-    assertThat(toRemove).isEmpty();
-  }
-
-  private void assertImmutable(DoubleList list) {
-    if (list.contains(1D)) {
-      throw new RuntimeException("Cannot test the immutability of lists that contain 1.");
-    }
-
-    try {
-      list.add(1D);
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.add(0, 1D);
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.addAll(Collections.<Double>emptyList());
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.addAll(Collections.singletonList(1D));
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.addAll(new DoubleArrayList());
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.addAll(UNARY_LIST);
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.addAll(0, Collections.singleton(1D));
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.addAll(0, UNARY_LIST);
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.addAll(0, Collections.<Double>emptyList());
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.addDouble(0);
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.clear();
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.remove(1);
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.remove(new Object());
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.removeAll(Collections.<Double>emptyList());
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.removeAll(Collections.singleton(1D));
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.removeAll(UNARY_LIST);
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.retainAll(Collections.<Double>emptyList());
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.retainAll(Collections.singleton(1D));
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.retainAll(UNARY_LIST);
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.set(0, 0D);
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.setDouble(0, 0);
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-  }
-
-  private static DoubleArrayList newImmutableDoubleArrayList(double... elements) {
-    DoubleArrayList list = new DoubleArrayList();
-    for (double element : elements) {
-      list.addDouble(element);
-    }
-    list.makeImmutable();
-    return list;
-  }
-}
diff --git a/libs/protobuf/java/core/src/test/java/com/google/protobuf/DynamicMessageTest.java b/libs/protobuf/java/core/src/test/java/com/google/protobuf/DynamicMessageTest.java
deleted file mode 100644
index 8e1abc0..0000000
--- a/libs/protobuf/java/core/src/test/java/com/google/protobuf/DynamicMessageTest.java
+++ /dev/null
@@ -1,390 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.junit.Assert.assertThrows;
-
-import com.google.protobuf.Descriptors.EnumDescriptor;
-import com.google.protobuf.Descriptors.FieldDescriptor;
-import com.google.protobuf.Descriptors.OneofDescriptor;
-import dynamicmessagetest.DynamicMessageTestProto.EmptyMessage;
-import dynamicmessagetest.DynamicMessageTestProto.MessageWithMapFields;
-import protobuf_unittest.UnittestProto;
-import protobuf_unittest.UnittestProto.TestAllExtensions;
-import protobuf_unittest.UnittestProto.TestAllTypes;
-import protobuf_unittest.UnittestProto.TestAllTypes.NestedMessage;
-import protobuf_unittest.UnittestProto.TestEmptyMessage;
-import protobuf_unittest.UnittestProto.TestPackedTypes;
-import org.junit.Test;
-import org.junit.function.ThrowingRunnable;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-/**
- * Unit test for {@link DynamicMessage}. See also {@link MessageTest}, which tests some {@link
- * DynamicMessage} functionality.
- */
-@RunWith(JUnit4.class)
-public class DynamicMessageTest {
-  TestUtil.ReflectionTester reflectionTester =
-      new TestUtil.ReflectionTester(TestAllTypes.getDescriptor(), null);
-
-  TestUtil.ReflectionTester extensionsReflectionTester =
-      new TestUtil.ReflectionTester(
-          TestAllExtensions.getDescriptor(), TestUtil.getFullExtensionRegistry());
-  TestUtil.ReflectionTester packedReflectionTester =
-      new TestUtil.ReflectionTester(TestPackedTypes.getDescriptor(), null);
-
-  @Test
-  public void testDynamicMessageAccessors() throws Exception {
-    Message.Builder builder = DynamicMessage.newBuilder(TestAllTypes.getDescriptor());
-    reflectionTester.setAllFieldsViaReflection(builder);
-    Message message = builder.build();
-    reflectionTester.assertAllFieldsSetViaReflection(message);
-  }
-
-  @Test
-  public void testSettersAfterBuild() throws Exception {
-    Message.Builder builder = DynamicMessage.newBuilder(TestAllTypes.getDescriptor());
-    Message firstMessage = builder.build();
-    // double build()
-    Message unused = builder.build();
-    // clear() after build()
-    builder.clear();
-    // setters after build()
-    reflectionTester.setAllFieldsViaReflection(builder);
-    Message message = builder.build();
-    reflectionTester.assertAllFieldsSetViaReflection(message);
-    // repeated setters after build()
-    reflectionTester.modifyRepeatedFieldsViaReflection(builder);
-    message = builder.build();
-    reflectionTester.assertRepeatedFieldsModifiedViaReflection(message);
-    // firstMessage shouldn't have been modified.
-    reflectionTester.assertClearViaReflection(firstMessage);
-  }
-
-  @Test
-  public void testUnknownFields() throws Exception {
-    Message.Builder builder = DynamicMessage.newBuilder(TestEmptyMessage.getDescriptor());
-    builder.setUnknownFields(
-        UnknownFieldSet.newBuilder()
-            .addField(1, UnknownFieldSet.Field.newBuilder().addVarint(1).build())
-            .addField(2, UnknownFieldSet.Field.newBuilder().addFixed32(1).build())
-            .build());
-    Message message = builder.build();
-    assertThat(builder.getUnknownFields().asMap()).hasSize(2);
-    // clone() with unknown fields
-    Message.Builder newBuilder = builder.clone();
-    assertThat(newBuilder.getUnknownFields().asMap()).hasSize(2);
-    // clear() with unknown fields
-    newBuilder.clear();
-    assertThat(newBuilder.getUnknownFields().asMap()).isEmpty();
-    // serialize/parse with unknown fields
-    newBuilder.mergeFrom(message.toByteString());
-    assertThat(newBuilder.getUnknownFields().asMap()).hasSize(2);
-  }
-
-  @Test
-  public void testDynamicMessageSettersRejectNull() throws Exception {
-    Message.Builder builder = DynamicMessage.newBuilder(TestAllTypes.getDescriptor());
-    reflectionTester.assertReflectionSettersRejectNull(builder);
-  }
-
-  @Test
-  public void testDynamicMessageExtensionAccessors() throws Exception {
-    // We don't need to extensively test DynamicMessage's handling of
-    // extensions because, frankly, it doesn't do anything special with them.
-    // It treats them just like any other fields.
-    Message.Builder builder = DynamicMessage.newBuilder(TestAllExtensions.getDescriptor());
-    extensionsReflectionTester.setAllFieldsViaReflection(builder);
-    Message message = builder.build();
-    extensionsReflectionTester.assertAllFieldsSetViaReflection(message);
-  }
-
-  @Test
-  public void testDynamicMessageExtensionSettersRejectNull() throws Exception {
-    Message.Builder builder = DynamicMessage.newBuilder(TestAllExtensions.getDescriptor());
-    extensionsReflectionTester.assertReflectionSettersRejectNull(builder);
-  }
-
-  @Test
-  public void testDynamicMessageRepeatedSetters() throws Exception {
-    Message.Builder builder = DynamicMessage.newBuilder(TestAllTypes.getDescriptor());
-    reflectionTester.setAllFieldsViaReflection(builder);
-    reflectionTester.modifyRepeatedFieldsViaReflection(builder);
-    Message message = builder.build();
-    reflectionTester.assertRepeatedFieldsModifiedViaReflection(message);
-  }
-
-  @Test
-  public void testDynamicMessageRepeatedSettersRejectNull() throws Exception {
-    Message.Builder builder = DynamicMessage.newBuilder(TestAllTypes.getDescriptor());
-    reflectionTester.assertReflectionRepeatedSettersRejectNull(builder);
-  }
-
-  @Test
-  public void testDynamicMessageDefaults() throws Exception {
-    reflectionTester.assertClearViaReflection(
-        DynamicMessage.getDefaultInstance(TestAllTypes.getDescriptor()));
-    reflectionTester.assertClearViaReflection(
-        DynamicMessage.newBuilder(TestAllTypes.getDescriptor()).build());
-  }
-
-  @Test
-  public void testDynamicMessageSerializedSize() throws Exception {
-    TestAllTypes message = TestUtil.getAllSet();
-
-    Message.Builder dynamicBuilder = DynamicMessage.newBuilder(TestAllTypes.getDescriptor());
-    reflectionTester.setAllFieldsViaReflection(dynamicBuilder);
-    Message dynamicMessage = dynamicBuilder.build();
-
-    assertThat(message.getSerializedSize()).isEqualTo(dynamicMessage.getSerializedSize());
-  }
-
-  @Test
-  public void testDynamicMessageSerialization() throws Exception {
-    Message.Builder builder = DynamicMessage.newBuilder(TestAllTypes.getDescriptor());
-    reflectionTester.setAllFieldsViaReflection(builder);
-    Message message = builder.build();
-
-    ByteString rawBytes = message.toByteString();
-    TestAllTypes message2 = TestAllTypes.parseFrom(rawBytes);
-
-    TestUtil.assertAllFieldsSet(message2);
-
-    // In fact, the serialized forms should be exactly the same, byte-for-byte.
-    assertThat(rawBytes).isEqualTo(TestUtil.getAllSet().toByteString());
-  }
-
-  @Test
-  public void testDynamicMessageParsing() throws Exception {
-    TestAllTypes.Builder builder = TestAllTypes.newBuilder();
-    TestUtil.setAllFields(builder);
-    TestAllTypes message = builder.build();
-
-    ByteString rawBytes = message.toByteString();
-
-    Message message2 = DynamicMessage.parseFrom(TestAllTypes.getDescriptor(), rawBytes);
-    reflectionTester.assertAllFieldsSetViaReflection(message2);
-
-    // Test Parser interface.
-    Message message3 = message2.getParserForType().parseFrom(rawBytes);
-    reflectionTester.assertAllFieldsSetViaReflection(message3);
-  }
-
-  @Test
-  public void testDynamicMessageExtensionParsing() throws Exception {
-    ByteString rawBytes = TestUtil.getAllExtensionsSet().toByteString();
-    Message message =
-        DynamicMessage.parseFrom(
-            TestAllExtensions.getDescriptor(), rawBytes, TestUtil.getFullExtensionRegistry());
-    extensionsReflectionTester.assertAllFieldsSetViaReflection(message);
-
-    // Test Parser interface.
-    Message message2 =
-        message.getParserForType().parseFrom(rawBytes, TestUtil.getExtensionRegistry());
-    extensionsReflectionTester.assertAllFieldsSetViaReflection(message2);
-  }
-
-  @Test
-  public void testDynamicMessagePackedSerialization() throws Exception {
-    Message.Builder builder = DynamicMessage.newBuilder(TestPackedTypes.getDescriptor());
-    packedReflectionTester.setPackedFieldsViaReflection(builder);
-    Message message = builder.build();
-
-    ByteString rawBytes = message.toByteString();
-    TestPackedTypes message2 = TestPackedTypes.parseFrom(rawBytes);
-
-    TestUtil.assertPackedFieldsSet(message2);
-
-    // In fact, the serialized forms should be exactly the same, byte-for-byte.
-    assertThat(rawBytes).isEqualTo(TestUtil.getPackedSet().toByteString());
-  }
-
-  @Test
-  public void testDynamicMessagePackedParsing() throws Exception {
-    TestPackedTypes.Builder builder = TestPackedTypes.newBuilder();
-    TestUtil.setPackedFields(builder);
-    TestPackedTypes message = builder.build();
-
-    ByteString rawBytes = message.toByteString();
-
-    Message message2 = DynamicMessage.parseFrom(TestPackedTypes.getDescriptor(), rawBytes);
-    packedReflectionTester.assertPackedFieldsSetViaReflection(message2);
-
-    // Test Parser interface.
-    Message message3 = message2.getParserForType().parseFrom(rawBytes);
-    packedReflectionTester.assertPackedFieldsSetViaReflection(message3);
-  }
-
-  @Test
-  public void testGetBuilderForExtensionField() {
-    DynamicMessage.Builder builder = DynamicMessage.newBuilder(TestAllExtensions.getDescriptor());
-    Message.Builder fieldBuilder =
-        builder.newBuilderForField(UnittestProto.optionalNestedMessageExtension.getDescriptor());
-    final int expected = 7432;
-    FieldDescriptor field =
-        NestedMessage.getDescriptor().findFieldByNumber(NestedMessage.BB_FIELD_NUMBER);
-    fieldBuilder.setField(field, expected);
-    assertThat(fieldBuilder.build().getField(field)).isEqualTo(expected);
-  }
-
-  @Test
-  public void testDynamicMessageCopy() throws Exception {
-    TestAllTypes.Builder builder = TestAllTypes.newBuilder();
-    TestUtil.setAllFields(builder);
-    TestAllTypes message = builder.build();
-
-    DynamicMessage copy = DynamicMessage.newBuilder(message).build();
-    reflectionTester.assertAllFieldsSetViaReflection(copy);
-
-    // Test oneof behavior
-    FieldDescriptor bytesField = TestAllTypes.getDescriptor().findFieldByName("oneof_bytes");
-    FieldDescriptor uint32Field = TestAllTypes.getDescriptor().findFieldByName("oneof_uint32");
-    assertThat(copy.hasField(bytesField)).isTrue();
-    assertThat(copy.hasField(uint32Field)).isFalse();
-    DynamicMessage copy2 = DynamicMessage.newBuilder(message).setField(uint32Field, 123).build();
-    assertThat(copy2.hasField(bytesField)).isFalse();
-    assertThat(copy2.hasField(uint32Field)).isTrue();
-    assertThat(copy2.getField(uint32Field)).isEqualTo(123);
-  }
-
-  @Test
-  public void testToBuilder() throws Exception {
-    DynamicMessage.Builder builder = DynamicMessage.newBuilder(TestAllTypes.getDescriptor());
-    reflectionTester.setAllFieldsViaReflection(builder);
-    int unknownFieldNum = 9;
-    long unknownFieldVal = 90;
-    builder.setUnknownFields(
-        UnknownFieldSet.newBuilder()
-            .addField(
-                unknownFieldNum,
-                UnknownFieldSet.Field.newBuilder().addVarint(unknownFieldVal).build())
-            .build());
-    DynamicMessage message = builder.build();
-
-    DynamicMessage derived = message.toBuilder().build();
-    reflectionTester.assertAllFieldsSetViaReflection(derived);
-    assertThat(derived.getUnknownFields().getField(unknownFieldNum).getVarintList())
-        .containsExactly(unknownFieldVal);
-  }
-
-  @Test
-  public void testDynamicOneofMessage() throws Exception {
-    DynamicMessage.Builder builder = DynamicMessage.newBuilder(TestAllTypes.getDescriptor());
-    OneofDescriptor oneof = TestAllTypes.getDescriptor().getOneofs().get(0);
-    assertThat(builder.hasOneof(oneof)).isFalse();
-    assertThat(builder.getOneofFieldDescriptor(oneof)).isNull();
-
-    reflectionTester.setAllFieldsViaReflection(builder);
-    assertThat(builder.hasOneof(oneof)).isTrue();
-    FieldDescriptor field = oneof.getField(3);
-    assertThat(builder.getOneofFieldDescriptor(oneof)).isSameInstanceAs(field);
-
-    DynamicMessage message = builder.buildPartial();
-    assertThat(message.hasOneof(oneof)).isTrue();
-
-    DynamicMessage.Builder mergedBuilder = DynamicMessage.newBuilder(TestAllTypes.getDescriptor());
-    FieldDescriptor mergedField = oneof.getField(0);
-    mergedBuilder.setField(mergedField, 123);
-    assertThat(mergedBuilder.hasField(mergedField)).isTrue();
-    mergedBuilder.mergeFrom(message);
-    assertThat(mergedBuilder.hasField(field)).isTrue();
-    assertThat(mergedBuilder.hasField(mergedField)).isFalse();
-
-    builder.clearOneof(oneof);
-    assertThat(builder.getOneofFieldDescriptor(oneof)).isNull();
-    message = builder.build();
-    assertThat(message.getOneofFieldDescriptor(oneof)).isNull();
-  }
-
-  // Regression test for a bug that makes setField() not work for repeated
-  // enum fields.
-  @Test
-  public void testSettersForRepeatedEnumField() throws Exception {
-    DynamicMessage.Builder builder = DynamicMessage.newBuilder(TestAllTypes.getDescriptor());
-    FieldDescriptor repeatedEnumField =
-        TestAllTypes.getDescriptor().findFieldByName("repeated_nested_enum");
-    EnumDescriptor enumDescriptor = TestAllTypes.NestedEnum.getDescriptor();
-    builder.setField(repeatedEnumField, enumDescriptor.getValues());
-    DynamicMessage message = builder.build();
-    assertThat(message.getField(repeatedEnumField)).isEqualTo(enumDescriptor.getValues());
-  }
-
-  @Test
-  public void testBuilderGetFieldBuilder_mapField_throwsUnsupportedOperationException() {
-    final DynamicMessage.Builder builder =
-        DynamicMessage.newBuilder(MessageWithMapFields.getDescriptor());
-    final FieldDescriptor mapField =
-        MessageWithMapFields.getDescriptor().findFieldByName("string_message_map");
-
-    Message.Builder entryBuilder = builder.newBuilderForField(mapField);
-    entryBuilder.setField(entryBuilder.getDescriptorForType().findFieldByNumber(1), "foo");
-    entryBuilder.setField(
-        entryBuilder.getDescriptorForType().findFieldByNumber(2),
-        EmptyMessage.getDefaultInstance());
-    builder.addRepeatedField(mapField, entryBuilder.build());
-
-    assertThrows(
-        UnsupportedOperationException.class,
-        new ThrowingRunnable() {
-          @Override
-          public void run() throws Throwable {
-            builder.getFieldBuilder(mapField);
-          }
-        });
-  }
-
-  @Test
-  public void testBuilderGetRepeatedFieldBuilder_mapField_throwsUnsupportedOperationException() {
-    final DynamicMessage.Builder builder =
-        DynamicMessage.newBuilder(MessageWithMapFields.getDescriptor());
-    final FieldDescriptor mapField =
-        MessageWithMapFields.getDescriptor().findFieldByName("string_message_map");
-
-    Message.Builder entryBuilder = builder.newBuilderForField(mapField);
-    entryBuilder.setField(entryBuilder.getDescriptorForType().findFieldByNumber(1), "foo");
-    entryBuilder.setField(
-        entryBuilder.getDescriptorForType().findFieldByNumber(2),
-        EmptyMessage.getDefaultInstance());
-    builder.addRepeatedField(mapField, entryBuilder.build());
-
-    assertThrows(
-        UnsupportedOperationException.class,
-        new ThrowingRunnable() {
-          @Override
-          public void run() throws Throwable {
-            builder.getFieldBuilder(mapField);
-          }
-        });
-  }
-}
diff --git a/libs/protobuf/java/core/src/test/java/com/google/protobuf/EnumTest.java b/libs/protobuf/java/core/src/test/java/com/google/protobuf/EnumTest.java
deleted file mode 100644
index 6287a23..0000000
--- a/libs/protobuf/java/core/src/test/java/com/google/protobuf/EnumTest.java
+++ /dev/null
@@ -1,85 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import com.google.protobuf.UnittestLite.ForeignEnumLite;
-import com.google.protobuf.UnittestLite.TestAllTypesLite;
-import protobuf_unittest.UnittestProto.ForeignEnum;
-import protobuf_unittest.UnittestProto.TestAllTypes;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-@RunWith(JUnit4.class)
-public class EnumTest {
-
-  @Test
-  public void testForNumber() {
-    ForeignEnum e = ForeignEnum.forNumber(ForeignEnum.FOREIGN_BAR.getNumber());
-    assertThat(e).isEqualTo(ForeignEnum.FOREIGN_BAR);
-
-    e = ForeignEnum.forNumber(1000);
-    assertThat(e).isNull();
-  }
-
-  @Test
-  public void testForNumber_oneof() {
-    TestAllTypes.OneofFieldCase e =
-        TestAllTypes.OneofFieldCase.forNumber(
-            TestAllTypes.OneofFieldCase.ONEOF_NESTED_MESSAGE.getNumber());
-    assertThat(e).isEqualTo(TestAllTypes.OneofFieldCase.ONEOF_NESTED_MESSAGE);
-
-    e = TestAllTypes.OneofFieldCase.forNumber(1000);
-    assertThat(e).isNull();
-  }
-
-  @Test
-  public void testForNumberLite() {
-    ForeignEnumLite e = ForeignEnumLite.forNumber(ForeignEnumLite.FOREIGN_LITE_BAR.getNumber());
-    assertThat(e).isEqualTo(ForeignEnumLite.FOREIGN_LITE_BAR);
-
-    e = ForeignEnumLite.forNumber(1000);
-    assertThat(e).isNull();
-  }
-
-  @Test
-  public void testForNumberLite_oneof() {
-    TestAllTypesLite.OneofFieldCase e =
-        TestAllTypesLite.OneofFieldCase.forNumber(
-            TestAllTypesLite.OneofFieldCase.ONEOF_NESTED_MESSAGE.getNumber());
-    assertThat(e).isEqualTo(TestAllTypesLite.OneofFieldCase.ONEOF_NESTED_MESSAGE);
-
-    e = TestAllTypesLite.OneofFieldCase.forNumber(1000);
-    assertThat(e).isNull();
-  }
-}
diff --git a/libs/protobuf/java/core/src/test/java/com/google/protobuf/ExperimentalMessageFactory.java b/libs/protobuf/java/core/src/test/java/com/google/protobuf/ExperimentalMessageFactory.java
deleted file mode 100644
index 60c8609..0000000
--- a/libs/protobuf/java/core/src/test/java/com/google/protobuf/ExperimentalMessageFactory.java
+++ /dev/null
@@ -1,40 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-/** Interface for a test factory for messages. */
-public interface ExperimentalMessageFactory<T extends MessageLite> {
-  /** Creates a new random message instance. */
-  T newMessage();
-
-  /** Gets the underlying data provider. */
-  ExperimentalTestDataProvider dataProvider();
-}
diff --git a/libs/protobuf/java/core/src/test/java/com/google/protobuf/ExperimentalSerializationUtil.java b/libs/protobuf/java/core/src/test/java/com/google/protobuf/ExperimentalSerializationUtil.java
deleted file mode 100644
index 05aaa67..0000000
--- a/libs/protobuf/java/core/src/test/java/com/google/protobuf/ExperimentalSerializationUtil.java
+++ /dev/null
@@ -1,113 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.util.Queue;
-
-/** Utilities for serialization. */
-public class ExperimentalSerializationUtil {
-
-  /**
-   * Serializes the given message to a byte array using {@link com.google.protobuf.BinaryWriter}.
-   */
-  public static <T> byte[] toByteArray(T msg) throws IOException {
-    return toByteArray(msg, Protobuf.getInstance().schemaFor(msg));
-  }
-
-  /**
-   * Serializes the given message to a byte array using {@link com.google.protobuf.BinaryWriter}
-   * with a customized Schema.
-   */
-  public static <T> byte[] toByteArray(T msg, Schema<T> schema) throws IOException {
-    BinaryWriter writer = BinaryWriter.newHeapInstance(BufferAllocator.unpooled());
-    schema.writeTo(msg, writer);
-
-    byte[] out = new byte[writer.getTotalBytesWritten()];
-    int outPos = 0;
-    Queue<AllocatedBuffer> buffers = writer.complete();
-    while (true) {
-      AllocatedBuffer buffer = buffers.poll();
-      if (buffer == null) {
-        break;
-      }
-      int length = buffer.limit() - buffer.position();
-      System.arraycopy(
-          buffer.array(), buffer.arrayOffset() + buffer.position(), out, outPos, length);
-      outPos += length;
-    }
-    if (out.length != outPos) {
-      throw new IllegalArgumentException("Failed to serialize test message");
-    }
-    return out;
-  }
-
-  /** Deserializes a message from the given byte array. */
-  public static <T> T fromByteArray(byte[] data, Class<T> messageType) {
-    if (Android.isOnAndroidDevice()) {
-      return fromByteArrayFastPath(data, messageType);
-    } else {
-      return fromByteArray(data, messageType, ExtensionRegistryLite.getEmptyRegistry());
-    }
-  }
-
-  /**
-   * Deserializes a message from the given byte array using {@link com.google.protobuf.BinaryReader}
-   * with an extension registry and a customized Schema.
-   */
-  public static <T> T fromByteArray(
-      byte[] data, Class<T> messageType, ExtensionRegistryLite extensionRegistry) {
-    try {
-      Schema<T> schema = Protobuf.getInstance().schemaFor(messageType);
-      T msg = schema.newInstance();
-      schema.mergeFrom(
-          msg, BinaryReader.newInstance(ByteBuffer.wrap(data), true), extensionRegistry);
-      schema.makeImmutable(msg);
-      return msg;
-    } catch (IOException e) {
-      throw new RuntimeException(e);
-    }
-  }
-
-  /** Deserializes a lite message from the given byte array using fast path. */
-  private static <T> T fromByteArrayFastPath(byte[] data, Class<T> messageType) {
-    try {
-      Schema<T> schema = Protobuf.getInstance().schemaFor(messageType);
-      T msg = schema.newInstance();
-      schema.mergeFrom(msg, data, 0, data.length, new ArrayDecoders.Registers());
-      schema.makeImmutable(msg);
-      return msg;
-    } catch (IOException e) {
-      throw new RuntimeException(e);
-    }
-  }
-}
diff --git a/libs/protobuf/java/core/src/test/java/com/google/protobuf/ExperimentalTestDataProvider.java b/libs/protobuf/java/core/src/test/java/com/google/protobuf/ExperimentalTestDataProvider.java
deleted file mode 100644
index 3ef93ac..0000000
--- a/libs/protobuf/java/core/src/test/java/com/google/protobuf/ExperimentalTestDataProvider.java
+++ /dev/null
@@ -1,189 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import java.util.Random;
-
-/** Utility class that provides data primitives for filling out protobuf messages. */
-public final class ExperimentalTestDataProvider {
-  private static final Random RANDOM = new Random(100);
-
-  private final Varint32Provider varint32s = new Varint32Provider();
-  private final Varint64Provider varint64s = new Varint64Provider();
-  private final int stringLength;
-
-  public ExperimentalTestDataProvider(int stringLength) {
-    this.stringLength = stringLength;
-  }
-
-  public double getDouble() {
-    double value = 0.0;
-    while (Double.compare(0.0, value) == 0) {
-      value = RANDOM.nextDouble();
-    }
-    return value;
-  }
-
-  public float getFloat() {
-    float value = 0.0f;
-    while (Float.compare(0.0f, value) == 0) {
-      value = RANDOM.nextFloat();
-    }
-    return value;
-  }
-
-  public long getLong() {
-    return varint64s.getLong();
-  }
-
-  public int getInt() {
-    return varint32s.getInt();
-  }
-
-  public boolean getBool() {
-    return true;
-  }
-
-  public int getEnum() {
-    return Math.abs(getInt()) % 3;
-  }
-
-  public String getString() {
-    StringBuilder builder = new StringBuilder(stringLength);
-    for (int i = 0; i < stringLength; ++i) {
-      builder.append((char) (RANDOM.nextInt('z' - 'a') + 'a'));
-    }
-    return builder.toString();
-  }
-
-  public ByteString getBytes() {
-    return ByteString.copyFromUtf8(getString());
-  }
-
-  /**
-   * Iterator over integer values. Uses a simple distribution over 32-bit varints (generally
-   * favoring smaller values).
-   */
-  private static final class Varint32Provider {
-    private static final int[][] VALUES = {
-      new int[] {1, 50, 100, 127}, // 1 byte values
-      new int[] {128, 500, 10000, 16383}, // 2 bytes values
-      new int[] {16384, 50000, 1000000, 2097151}, // 3 bytes values
-      new int[] {2097152, 10000000, 200000000, 268435455}, // 4 bytes values
-      new int[] {268435456, 0x30000000, 0x7FFFFFFF, 0xFFFFFFFF} // 5 bytes values
-    };
-
-    /** Number of samples that should be taken from each value array. */
-    private static final int[] NUM_SAMPLES = {3, 2, 1, 1, 2};
-
-    /**
-     * The index into the {@link #VALUES} array that identifies the list of samples currently being
-     * iterated over.
-     */
-    private int listIndex;
-
-    /** The index of the next sample within a list. */
-    private int sampleIndex;
-
-    /** The number of successive samples that have been taken from the current list. */
-    private int samplesTaken;
-
-    public int getInt() {
-      if (samplesTaken++ > NUM_SAMPLES[listIndex]) {
-        // Done taking samples from this list. Go to the next one.
-        listIndex = (listIndex + 1) % VALUES.length;
-        sampleIndex = 0;
-        samplesTaken = 0;
-      }
-
-      int value = VALUES[listIndex][sampleIndex];
-
-      // All lists are exactly 4 long (i.e. power of 2), so we can optimize the mod operation
-      // with masking.
-      sampleIndex = (sampleIndex + 1) & 3;
-
-      return value;
-    }
-  }
-
-  /**
-   * Iterator over integer values. Uses a simple distribution over 64-bit varints (generally
-   * favoring smaller values).
-   */
-  private static final class Varint64Provider {
-    private static final long[][] VALUES = {
-      new long[] {1, 50, 100, 127},
-      new long[] {128, 500, 10000, 16383},
-      new long[] {16384, 50000, 1000000, 2097151},
-      new long[] {2097152, 10000000, 200000000, 268435455},
-      new long[] {268435456, 0x30000000, 0x7FFFFFFF, 34359738367L},
-      new long[] {34359738368L, 2000000000000L, 4000000000000L, 4398046511103L},
-      new long[] {4398046511104L, 200000000000000L, 500000000000000L, 562949953421311L},
-      new long[] {0x4000000000000L, 0x5000000000000L, 0x6000000000000L, 0x0FFFFFFFFFFFFFFL},
-      new long[] {0x100000000000000L, 0x3FFFFFFFFFFFFFFFL, 0x5FFFFFFFFFFFFFFL, 0x7FFFFFFFFFFFFFFFL},
-      new long[] {
-        0xFFFFFFFFFFFFFFFFL, 0xFFFFFFFFFFFFFFFFL, 0xFFFFFFFFFFFFFFFFL, 0xFFFFFFFFFFFFFFFFL
-      }
-    };
-
-    /** Number of samples that should be taken from each value array. */
-    private static final int[] NUM_SAMPLES = {4, 2, 2, 1, 1, 1, 1, 2, 2, 4};
-
-    /**
-     * The index into the {@link #VALUES} array that identifies the list of samples currently being
-     * iterated over.
-     */
-    private int listIndex;
-
-    /** The index of the next sample within a list. */
-    private int sampleIndex;
-
-    /** The number of successive samples that have been taken from the current list. */
-    private int samplesTaken;
-
-    public long getLong() {
-      if (samplesTaken++ > NUM_SAMPLES[listIndex]) {
-        // Done taking samples from this list. Go to the next one.
-        listIndex = (listIndex + 1) % VALUES.length;
-        sampleIndex = 0;
-        samplesTaken = 0;
-      }
-
-      long value = VALUES[listIndex][sampleIndex];
-
-      // All lists are exactly 4 long (i.e. power of 2), so we can optimize the mod operation
-      // with masking.
-      sampleIndex = (sampleIndex + 1) & 3;
-
-      return value;
-    }
-  }
-}
diff --git a/libs/protobuf/java/core/src/test/java/com/google/protobuf/ExtensionRegistryFactoryTest.java b/libs/protobuf/java/core/src/test/java/com/google/protobuf/ExtensionRegistryFactoryTest.java
deleted file mode 100644
index 064aa3f..0000000
--- a/libs/protobuf/java/core/src/test/java/com/google/protobuf/ExtensionRegistryFactoryTest.java
+++ /dev/null
@@ -1,301 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.common.truth.Truth.assertThat;
-import static com.google.common.truth.Truth.assertWithMessage;
-
-import com.google.common.collect.ImmutableSet;
-import com.google.common.reflect.ClassPath;
-import protobuf_unittest.NonNestedExtension;
-import protobuf_unittest.NonNestedExtensionLite;
-import java.io.IOException;
-import java.lang.reflect.Method;
-import java.net.URL;
-import java.net.URLClassLoader;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import org.junit.Ignore;
-
-/**
- * Tests for {@link ExtensionRegistryFactory} and the {@link ExtensionRegistry} instances it
- * creates.
- *
- * <p>This test simulates the runtime behaviour of the ExtensionRegistryFactory by delegating test
- * definitions to two inner classes {@link InnerTest} and {@link InnerLiteTest}, the latter of which
- * is executed using a custom ClassLoader, simulating the ProtoLite environment.
- *
- * <p>The test mechanism employed here is based on the pattern in {@code
- * com.google.common.util.concurrent.AbstractFutureFallbackAtomicHelperTest}
- *
- * <p>This test is temporarily disabled while we figure out how to fix the class loading used for
- * testing lite functionality.
- */
-@SuppressWarnings("JUnit4ClassUsedInJUnit3")
-@Ignore
-public class ExtensionRegistryFactoryTest extends TestCase {
-
-  // A classloader which blacklists some non-Lite classes.
-  private static final ClassLoader LITE_CLASS_LOADER = getLiteOnlyClassLoader();
-
-  /** Defines the set of test methods which will be run. */
-  static interface RegistryTests {
-    void testCreate();
-
-    void testEmpty();
-
-    void testIsFullRegistry();
-
-    void testAdd();
-
-    void testAdd_immutable();
-  }
-
-  /** Test implementations for the non-Lite usage of ExtensionRegistryFactory. */
-  public static class InnerTest implements RegistryTests {
-
-    @Override
-    public void testCreate() {
-      ExtensionRegistryLite registry = ExtensionRegistryFactory.create();
-
-      assertThat(registry.getClass()).isEqualTo(ExtensionRegistry.class);
-    }
-
-    @Override
-    public void testEmpty() {
-      ExtensionRegistryLite emptyRegistry = ExtensionRegistryFactory.createEmpty();
-
-      assertThat(emptyRegistry.getClass()).isEqualTo(ExtensionRegistry.class);
-      assertThat(emptyRegistry).isEqualTo(ExtensionRegistry.EMPTY_REGISTRY);
-    }
-
-    @Override
-    public void testIsFullRegistry() {
-      ExtensionRegistryLite registry = ExtensionRegistryFactory.create();
-      assertThat(ExtensionRegistryFactory.isFullRegistry(registry)).isTrue();
-    }
-
-    @Override
-    public void testAdd() {
-      ExtensionRegistryLite registry1 = ExtensionRegistryLite.newInstance();
-      NonNestedExtensionLite.registerAllExtensions(registry1);
-      registry1.add(NonNestedExtensionLite.nonNestedExtensionLite);
-
-      ExtensionRegistryLite registry2 = ExtensionRegistryLite.newInstance();
-      NonNestedExtension.registerAllExtensions((ExtensionRegistry) registry2);
-      registry2.add(NonNestedExtension.nonNestedExtension);
-
-      ExtensionRegistry fullRegistry1 = (ExtensionRegistry) registry1;
-      ExtensionRegistry fullRegistry2 = (ExtensionRegistry) registry2;
-
-      assertWithMessage("Test is using a non-lite extension")
-          .that(NonNestedExtensionLite.nonNestedExtensionLite.getClass())
-          .isInstanceOf(GeneratedMessageLite.GeneratedExtension.class);
-      assertWithMessage("Extension is not registered in masqueraded full registry")
-          .that(fullRegistry1.findImmutableExtensionByName("protobuf_unittest.nonNestedExtension"))
-          .isNull();
-      GeneratedMessageLite.GeneratedExtension<NonNestedExtensionLite.MessageLiteToBeExtended, ?>
-          extension =
-              registry1.findLiteExtensionByNumber(
-                  NonNestedExtensionLite.MessageLiteToBeExtended.getDefaultInstance(), 1);
-      assertWithMessage("Extension registered in lite registry").that(extension).isNotNull();
-
-      assertWithMessage("Test is using a non-lite extension")
-          .that(Extension.class.isAssignableFrom(NonNestedExtension.nonNestedExtension.getClass()))
-          .isTrue();
-      assertWithMessage("Extension is registered in masqueraded full registry")
-          .that(fullRegistry2.findImmutableExtensionByName("protobuf_unittest.nonNestedExtension"))
-          .isNotNull();
-    }
-
-    @Override
-    public void testAdd_immutable() {
-      ExtensionRegistryLite registry1 = ExtensionRegistryLite.newInstance().getUnmodifiable();
-      try {
-        NonNestedExtensionLite.registerAllExtensions(registry1);
-        assertWithMessage("expected exception").fail();
-      } catch (UnsupportedOperationException expected) {
-      }
-      try {
-        registry1.add(NonNestedExtensionLite.nonNestedExtensionLite);
-        assertWithMessage("expected exception").fail();
-      } catch (UnsupportedOperationException expected) {
-      }
-
-      ExtensionRegistryLite registry2 = ExtensionRegistryLite.newInstance().getUnmodifiable();
-      try {
-        NonNestedExtension.registerAllExtensions((ExtensionRegistry) registry2);
-        assertWithMessage("expected exception").fail();
-      } catch (IllegalArgumentException expected) {
-      }
-      try {
-        registry2.add(NonNestedExtension.nonNestedExtension);
-        assertWithMessage("expected exception").fail();
-      } catch (IllegalArgumentException expected) {
-      }
-    }
-  }
-
-  /** Test implementations for the Lite usage of ExtensionRegistryFactory. */
-  public static final class InnerLiteTest implements RegistryTests {
-
-    @Override
-    public void testCreate() {
-      ExtensionRegistryLite registry = ExtensionRegistryFactory.create();
-
-      assertThat(registry.getClass()).isEqualTo(ExtensionRegistryLite.class);
-    }
-
-    @Override
-    public void testEmpty() {
-      ExtensionRegistryLite emptyRegistry = ExtensionRegistryFactory.createEmpty();
-
-      assertThat(emptyRegistry.getClass()).isEqualTo(ExtensionRegistryLite.class);
-      assertThat(emptyRegistry).isEqualTo(ExtensionRegistryLite.EMPTY_REGISTRY_LITE);
-    }
-
-    @Override
-    public void testIsFullRegistry() {
-      ExtensionRegistryLite registry = ExtensionRegistryFactory.create();
-      assertThat(ExtensionRegistryFactory.isFullRegistry(registry)).isFalse();
-    }
-
-    @Override
-    public void testAdd() {
-      ExtensionRegistryLite registry = ExtensionRegistryLite.newInstance();
-      NonNestedExtensionLite.registerAllExtensions(registry);
-      GeneratedMessageLite.GeneratedExtension<NonNestedExtensionLite.MessageLiteToBeExtended, ?>
-          extension =
-              registry.findLiteExtensionByNumber(
-                  NonNestedExtensionLite.MessageLiteToBeExtended.getDefaultInstance(), 1);
-      assertWithMessage("Extension is registered in Lite registry").that(extension).isNotNull();
-    }
-
-    @Override
-    public void testAdd_immutable() {
-      ExtensionRegistryLite registry = ExtensionRegistryLite.newInstance().getUnmodifiable();
-      try {
-        NonNestedExtensionLite.registerAllExtensions(registry);
-        assertWithMessage("expected exception").fail();
-      } catch (UnsupportedOperationException expected) {
-      }
-    }
-  }
-
-  /** Defines a suite of tests which the JUnit3 runner retrieves by reflection. */
-  public static Test suite() {
-    TestSuite suite = new TestSuite();
-    for (Method method : RegistryTests.class.getMethods()) {
-      suite.addTest(TestSuite.createTest(ExtensionRegistryFactoryTest.class, method.getName()));
-    }
-    return suite;
-  }
-
-  /**
-   * Sequentially runs first the Lite and then the non-Lite test variant via classloader
-   * manipulation.
-   */
-  @Override
-  public void runTest() throws Exception {
-    ClassLoader storedClassLoader = Thread.currentThread().getContextClassLoader();
-    Thread.currentThread().setContextClassLoader(LITE_CLASS_LOADER);
-    try {
-      runTestMethod(LITE_CLASS_LOADER, InnerLiteTest.class);
-    } finally {
-      Thread.currentThread().setContextClassLoader(storedClassLoader);
-    }
-    try {
-      runTestMethod(storedClassLoader, InnerTest.class);
-    } finally {
-      Thread.currentThread().setContextClassLoader(storedClassLoader);
-    }
-  }
-
-  private void runTestMethod(ClassLoader classLoader, Class<? extends RegistryTests> testClass)
-      throws Exception {
-    classLoader.loadClass(ExtensionRegistryFactory.class.getName());
-    Class<?> test = classLoader.loadClass(testClass.getName());
-    String testName = getName();
-    test.getMethod(testName).invoke(test.getDeclaredConstructor().newInstance());
-  }
-
-  /**
-   * Constructs a custom ClassLoader blacklisting the classes which are inspected in the SUT to
-   * determine the Lite/non-Lite runtime.
-   */
-  private static ClassLoader getLiteOnlyClassLoader() {
-
-    ImmutableSet<ClassPath.ClassInfo> classes = ImmutableSet.of();
-    try {
-      classes = ClassPath.from(ExtensionRegistryFactoryTest.class.getClassLoader()).getAllClasses();
-    } catch (IOException ex) {
-      throw new RuntimeException(ex);
-    }
-    URL[] urls = new URL[classes.size()];
-    int i = 0;
-    for (ClassPath.ClassInfo classInfo : classes) {
-      urls[i++] = classInfo.url();
-    }
-    final ImmutableSet<String> classNamesNotInLite =
-        ImmutableSet.of(
-            ExtensionRegistryFactory.FULL_REGISTRY_CLASS_NAME,
-            ExtensionRegistry.EXTENSION_CLASS_NAME);
-
-    // Construct a URLClassLoader delegating to the system ClassLoader, and looking up classes
-    // in jar files based on the URLs already configured for this test's UrlClassLoader.
-    // Certain classes throw a ClassNotFoundException by design.
-    return new URLClassLoader(urls, ClassLoader.getSystemClassLoader()) {
-      @Override
-      public Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException {
-        if (classNamesNotInLite.contains(name)) {
-          throw new ClassNotFoundException("Class deliberately blacklisted by test.");
-        }
-        Class<?> loadedClass = null;
-        try {
-          loadedClass = findLoadedClass(name);
-          if (loadedClass == null) {
-            loadedClass = findClass(name);
-            if (resolve) {
-              resolveClass(loadedClass);
-            }
-          }
-        } catch (ClassNotFoundException | SecurityException e) {
-          // Java 8+ would throw a SecurityException if we attempt to find a loaded class from
-          // java.lang.* package. We don't really care about those anyway, so just delegate to the
-          // parent class loader.
-          loadedClass = super.loadClass(name, resolve);
-        }
-        return loadedClass;
-      }
-    };
-  }
-}
diff --git a/libs/protobuf/java/core/src/test/java/com/google/protobuf/FieldPresenceTest.java b/libs/protobuf/java/core/src/test/java/com/google/protobuf/FieldPresenceTest.java
deleted file mode 100644
index c4830af..0000000
--- a/libs/protobuf/java/core/src/test/java/com/google/protobuf/FieldPresenceTest.java
+++ /dev/null
@@ -1,504 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import com.google.protobuf.Descriptors.Descriptor;
-import com.google.protobuf.Descriptors.EnumDescriptor;
-import com.google.protobuf.Descriptors.EnumValueDescriptor;
-import com.google.protobuf.Descriptors.FieldDescriptor;
-import com.google.protobuf.Descriptors.OneofDescriptor;
-import com.google.protobuf.FieldPresenceTestProto.TestAllTypes;
-import com.google.protobuf.FieldPresenceTestProto.TestOptionalFieldsOnly;
-import com.google.protobuf.FieldPresenceTestProto.TestRepeatedFieldsOnly;
-import com.google.protobuf.testing.proto.TestProto3Optional;
-import protobuf_unittest.UnittestProto;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-/**
- * Unit tests for protos that doesn't support field presence test for optional non-message fields.
- */
-@RunWith(JUnit4.class)
-public class FieldPresenceTest {
-  private static boolean hasMethod(Class<?> clazz, String name) {
-    try {
-      if (clazz.getMethod(name) != null) {
-        return true;
-      } else {
-        return false;
-      }
-    } catch (NoSuchMethodException e) {
-      return false;
-    }
-  }
-
-  private static void assertHasMethodRemoved(
-      Class<?> classWithFieldPresence, Class<?> classWithoutFieldPresence, String camelName) {
-    assertThat(hasMethod(classWithFieldPresence, "get" + camelName)).isTrue();
-    assertThat(hasMethod(classWithFieldPresence, "has" + camelName)).isTrue();
-    assertThat(hasMethod(classWithoutFieldPresence, "get" + camelName)).isTrue();
-    assertThat(hasMethod(classWithoutFieldPresence, "has" + camelName)).isFalse();
-  }
-
-  private static void assertHasMethodExisting(Class<?> clazz, String camelName) {
-    assertThat(hasMethod(clazz, "get" + camelName)).isTrue();
-    assertThat(hasMethod(clazz, "has" + camelName)).isTrue();
-  }
-
-  @Test
-  public void testHasMethod() {
-    // Optional non-message fields don't have a hasFoo() method generated.
-    assertHasMethodRemoved(UnittestProto.TestAllTypes.class, TestAllTypes.class, "OptionalInt32");
-    assertHasMethodRemoved(UnittestProto.TestAllTypes.class, TestAllTypes.class, "OptionalString");
-    assertHasMethodRemoved(UnittestProto.TestAllTypes.class, TestAllTypes.class, "OptionalBytes");
-    assertHasMethodRemoved(
-        UnittestProto.TestAllTypes.class, TestAllTypes.class, "OptionalNestedEnum");
-
-    assertHasMethodRemoved(
-        UnittestProto.TestAllTypes.Builder.class, TestAllTypes.Builder.class, "OptionalInt32");
-    assertHasMethodRemoved(
-        UnittestProto.TestAllTypes.Builder.class, TestAllTypes.Builder.class, "OptionalString");
-    assertHasMethodRemoved(
-        UnittestProto.TestAllTypes.Builder.class, TestAllTypes.Builder.class, "OptionalBytes");
-    assertHasMethodRemoved(
-        UnittestProto.TestAllTypes.Builder.class, TestAllTypes.Builder.class, "OptionalNestedEnum");
-
-    // message fields still have the hasFoo() method generated.
-    assertThat(TestAllTypes.getDefaultInstance().hasOptionalNestedMessage()).isFalse();
-    assertThat(TestAllTypes.newBuilder().hasOptionalNestedMessage()).isFalse();
-
-    // oneof fields support hasFoo() methods for non-message types.
-    assertHasMethodExisting(TestAllTypes.class, "OneofUint32");
-    assertHasMethodExisting(TestAllTypes.class, "OneofString");
-    assertHasMethodExisting(TestAllTypes.class, "OneofBytes");
-    assertThat(TestAllTypes.getDefaultInstance().hasOneofNestedMessage()).isFalse();
-    assertThat(TestAllTypes.newBuilder().hasOneofNestedMessage()).isFalse();
-
-    assertHasMethodExisting(TestAllTypes.Builder.class, "OneofUint32");
-    assertHasMethodExisting(TestAllTypes.Builder.class, "OneofString");
-    assertHasMethodExisting(TestAllTypes.Builder.class, "OneofBytes");
-  }
-
-  @Test
-  public void testHasMethodForProto3Optional() throws Exception {
-    assertThat(TestProto3Optional.getDefaultInstance().hasOptionalInt32()).isFalse();
-    assertThat(TestProto3Optional.getDefaultInstance().hasOptionalInt64()).isFalse();
-    assertThat(TestProto3Optional.getDefaultInstance().hasOptionalUint32()).isFalse();
-    assertThat(TestProto3Optional.getDefaultInstance().hasOptionalUint64()).isFalse();
-    assertThat(TestProto3Optional.getDefaultInstance().hasOptionalSint32()).isFalse();
-    assertThat(TestProto3Optional.getDefaultInstance().hasOptionalSint64()).isFalse();
-    assertThat(TestProto3Optional.getDefaultInstance().hasOptionalFixed32()).isFalse();
-    assertThat(TestProto3Optional.getDefaultInstance().hasOptionalFixed64()).isFalse();
-    assertThat(TestProto3Optional.getDefaultInstance().hasOptionalFloat()).isFalse();
-    assertThat(TestProto3Optional.getDefaultInstance().hasOptionalDouble()).isFalse();
-    assertThat(TestProto3Optional.getDefaultInstance().hasOptionalBool()).isFalse();
-    assertThat(TestProto3Optional.getDefaultInstance().hasOptionalString()).isFalse();
-    assertThat(TestProto3Optional.getDefaultInstance().hasOptionalBytes()).isFalse();
-
-    TestProto3Optional.Builder builder = TestProto3Optional.newBuilder().setOptionalInt32(0);
-    assertThat(builder.hasOptionalInt32()).isTrue();
-    assertThat(builder.build().hasOptionalInt32()).isTrue();
-
-    TestProto3Optional.Builder otherBuilder = TestProto3Optional.newBuilder().setOptionalInt32(1);
-    otherBuilder.mergeFrom(builder.build());
-    assertThat(otherBuilder.hasOptionalInt32()).isTrue();
-    assertThat(otherBuilder.getOptionalInt32()).isEqualTo(0);
-
-    TestProto3Optional.Builder builder3 =
-        TestProto3Optional.newBuilder().setOptionalNestedEnumValue(5);
-    assertThat(builder3.hasOptionalNestedEnum()).isTrue();
-
-    TestProto3Optional.Builder builder4 =
-        TestProto3Optional.newBuilder().setOptionalNestedEnum(TestProto3Optional.NestedEnum.FOO);
-    assertThat(builder4.hasOptionalNestedEnum()).isTrue();
-
-    TestProto3Optional proto = TestProto3Optional.parseFrom(builder.build().toByteArray());
-    assertThat(proto.hasOptionalInt32()).isTrue();
-    assertThat(proto.toBuilder().hasOptionalInt32()).isTrue();
-  }
-
-  private static void assertProto3OptionalReflection(String name) throws Exception {
-    FieldDescriptor fieldDescriptor = TestProto3Optional.getDescriptor().findFieldByName(name);
-    OneofDescriptor oneofDescriptor = fieldDescriptor.getContainingOneof();
-    assertThat(fieldDescriptor.getContainingOneof()).isNotNull();
-    assertThat(fieldDescriptor.hasOptionalKeyword()).isTrue();
-    assertThat(fieldDescriptor.hasPresence()).isTrue();
-
-    assertThat(TestProto3Optional.getDefaultInstance().hasOneof(oneofDescriptor)).isFalse();
-    assertThat(TestProto3Optional.getDefaultInstance().getOneofFieldDescriptor(oneofDescriptor))
-        .isNull();
-
-    TestProto3Optional.Builder builder = TestProto3Optional.newBuilder();
-    builder.setField(fieldDescriptor, fieldDescriptor.getDefaultValue());
-    assertThat(builder.hasField(fieldDescriptor)).isTrue();
-    assertThat(builder.getField(fieldDescriptor)).isEqualTo(fieldDescriptor.getDefaultValue());
-    assertThat(builder.build().hasField(fieldDescriptor)).isTrue();
-    assertThat(builder.build().getField(fieldDescriptor))
-        .isEqualTo(fieldDescriptor.getDefaultValue());
-    assertThat(builder.hasOneof(oneofDescriptor)).isTrue();
-    assertThat(builder.getOneofFieldDescriptor(oneofDescriptor)).isEqualTo(fieldDescriptor);
-    assertThat(builder.build().hasOneof(oneofDescriptor)).isTrue();
-    assertThat(builder.build().getOneofFieldDescriptor(oneofDescriptor)).isEqualTo(fieldDescriptor);
-
-    TestProto3Optional.Builder otherBuilder = TestProto3Optional.newBuilder();
-    otherBuilder.mergeFrom(builder.build());
-    assertThat(otherBuilder.hasField(fieldDescriptor)).isTrue();
-    assertThat(otherBuilder.getField(fieldDescriptor)).isEqualTo(fieldDescriptor.getDefaultValue());
-
-    TestProto3Optional proto = TestProto3Optional.parseFrom(builder.build().toByteArray());
-    assertThat(proto.hasField(fieldDescriptor)).isTrue();
-    assertThat(proto.toBuilder().hasField(fieldDescriptor)).isTrue();
-
-    DynamicMessage.Builder dynamicBuilder =
-        DynamicMessage.newBuilder(TestProto3Optional.getDescriptor());
-    dynamicBuilder.setField(fieldDescriptor, fieldDescriptor.getDefaultValue());
-    assertThat(dynamicBuilder.hasField(fieldDescriptor)).isTrue();
-    assertThat(dynamicBuilder.getField(fieldDescriptor))
-        .isEqualTo(fieldDescriptor.getDefaultValue());
-    assertThat(dynamicBuilder.build().hasField(fieldDescriptor)).isTrue();
-    assertThat(dynamicBuilder.build().getField(fieldDescriptor))
-        .isEqualTo(fieldDescriptor.getDefaultValue());
-    assertThat(dynamicBuilder.hasOneof(oneofDescriptor)).isTrue();
-    assertThat(dynamicBuilder.getOneofFieldDescriptor(oneofDescriptor)).isEqualTo(fieldDescriptor);
-    assertThat(dynamicBuilder.build().hasOneof(oneofDescriptor)).isTrue();
-    assertThat(dynamicBuilder.build().getOneofFieldDescriptor(oneofDescriptor))
-        .isEqualTo(fieldDescriptor);
-
-    DynamicMessage.Builder otherDynamicBuilder =
-        DynamicMessage.newBuilder(TestProto3Optional.getDescriptor());
-    otherDynamicBuilder.mergeFrom(dynamicBuilder.build());
-    assertThat(otherDynamicBuilder.hasField(fieldDescriptor)).isTrue();
-    assertThat(otherDynamicBuilder.getField(fieldDescriptor))
-        .isEqualTo(fieldDescriptor.getDefaultValue());
-
-    DynamicMessage dynamicProto =
-        DynamicMessage.parseFrom(TestProto3Optional.getDescriptor(), builder.build().toByteArray());
-    assertThat(dynamicProto.hasField(fieldDescriptor)).isTrue();
-    assertThat(dynamicProto.toBuilder().hasField(fieldDescriptor)).isTrue();
-  }
-
-  @Test
-  public void testProto3Optional_reflection() throws Exception {
-    assertProto3OptionalReflection("optional_int32");
-    assertProto3OptionalReflection("optional_int64");
-    assertProto3OptionalReflection("optional_uint32");
-    assertProto3OptionalReflection("optional_uint64");
-    assertProto3OptionalReflection("optional_sint32");
-    assertProto3OptionalReflection("optional_sint64");
-    assertProto3OptionalReflection("optional_fixed32");
-    assertProto3OptionalReflection("optional_fixed64");
-    assertProto3OptionalReflection("optional_float");
-    assertProto3OptionalReflection("optional_double");
-    assertProto3OptionalReflection("optional_bool");
-    assertProto3OptionalReflection("optional_string");
-    assertProto3OptionalReflection("optional_bytes");
-  }
-
-  @Test
-  public void testOneofEquals() throws Exception {
-    TestAllTypes.Builder builder = TestAllTypes.newBuilder();
-    TestAllTypes message1 = builder.build();
-    // Set message2's oneof_uint32 field to default value. The two
-    // messages should be different when check with oneof case.
-    builder.setOneofUint32(0);
-    TestAllTypes message2 = builder.build();
-    assertThat(message1.equals(message2)).isFalse();
-  }
-
-  @Test
-  public void testLazyField() throws Exception {
-    // Test default constructed message.
-    TestAllTypes.Builder builder = TestAllTypes.newBuilder();
-    TestAllTypes message = builder.build();
-    assertThat(message.hasOptionalLazyMessage()).isFalse();
-    assertThat(message.getSerializedSize()).isEqualTo(0);
-    assertThat(message.toByteString()).isEqualTo(ByteString.EMPTY);
-
-    // Set default instance to the field.
-    builder.setOptionalLazyMessage(TestAllTypes.NestedMessage.getDefaultInstance());
-    message = builder.build();
-    assertThat(message.hasOptionalLazyMessage()).isTrue();
-    assertThat(message.getSerializedSize()).isEqualTo(2);
-
-    // Test parse zero-length from wire sets the presence.
-    TestAllTypes parsed = TestAllTypes.parseFrom(message.toByteString());
-    assertThat(parsed.hasOptionalLazyMessage()).isTrue();
-    assertThat(parsed.getOptionalLazyMessage()).isEqualTo(message.getOptionalLazyMessage());
-  }
-
-  @Test
-  public void testFieldPresence() {
-    // Optional non-message fields set to their default value are treated the
-    // same way as not set.
-
-    // Serialization will ignore such fields.
-    TestAllTypes.Builder builder = TestAllTypes.newBuilder();
-    builder.setOptionalInt32(0);
-    builder.setOptionalString("");
-    builder.setOptionalBytes(ByteString.EMPTY);
-    builder.setOptionalNestedEnum(TestAllTypes.NestedEnum.FOO);
-    TestAllTypes message = builder.build();
-    assertThat(message.getSerializedSize()).isEqualTo(0);
-
-    // mergeFrom() will ignore such fields.
-    TestAllTypes.Builder a = TestAllTypes.newBuilder();
-    a.setOptionalInt32(1);
-    a.setOptionalString("x");
-    a.setOptionalBytes(ByteString.copyFromUtf8("y"));
-    a.setOptionalNestedEnum(TestAllTypes.NestedEnum.BAR);
-    TestAllTypes.Builder b = TestAllTypes.newBuilder();
-    b.setOptionalInt32(0);
-    b.setOptionalString("");
-    b.setOptionalBytes(ByteString.EMPTY);
-    b.setOptionalNestedEnum(TestAllTypes.NestedEnum.FOO);
-    a.mergeFrom(b.build());
-    message = a.build();
-    assertThat(message.getOptionalInt32()).isEqualTo(1);
-    assertThat(message.getOptionalString()).isEqualTo("x");
-    assertThat(message.getOptionalBytes()).isEqualTo(ByteString.copyFromUtf8("y"));
-    assertThat(message.getOptionalNestedEnum()).isEqualTo(TestAllTypes.NestedEnum.BAR);
-
-    // equals()/hashCode() should produce the same results.
-    TestAllTypes empty = TestAllTypes.getDefaultInstance();
-    message = builder.build();
-    assertThat(empty).isEqualTo(message);
-    assertThat(message).isEqualTo(empty);
-    assertThat(message.hashCode()).isEqualTo(empty.hashCode());
-  }
-
-  @Test
-  public void testFieldPresenceByReflection() {
-    Descriptor descriptor = TestAllTypes.getDescriptor();
-    FieldDescriptor optionalInt32Field = descriptor.findFieldByName("optional_int32");
-    FieldDescriptor optionalStringField = descriptor.findFieldByName("optional_string");
-    FieldDescriptor optionalBytesField = descriptor.findFieldByName("optional_bytes");
-    FieldDescriptor optionalNestedEnumField = descriptor.findFieldByName("optional_nested_enum");
-
-    // Field not present.
-    TestAllTypes message = TestAllTypes.getDefaultInstance();
-    assertThat(message.hasField(optionalInt32Field)).isFalse();
-    assertThat(message.hasField(optionalStringField)).isFalse();
-    assertThat(message.hasField(optionalBytesField)).isFalse();
-    assertThat(message.hasField(optionalNestedEnumField)).isFalse();
-    assertThat(message.getAllFields()).isEmpty();
-
-    // Field set to default value is seen as not present.
-    message =
-        TestAllTypes.newBuilder()
-            .setOptionalInt32(0)
-            .setOptionalString("")
-            .setOptionalBytes(ByteString.EMPTY)
-            .setOptionalNestedEnum(TestAllTypes.NestedEnum.FOO)
-            .build();
-    assertThat(message.hasField(optionalInt32Field)).isFalse();
-    assertThat(message.hasField(optionalStringField)).isFalse();
-    assertThat(message.hasField(optionalBytesField)).isFalse();
-    assertThat(message.hasField(optionalNestedEnumField)).isFalse();
-    assertThat(message.getAllFields()).isEmpty();
-
-    // Field set to non-default value is seen as present.
-    message =
-        TestAllTypes.newBuilder()
-            .setOptionalInt32(1)
-            .setOptionalString("x")
-            .setOptionalBytes(ByteString.copyFromUtf8("y"))
-            .setOptionalNestedEnum(TestAllTypes.NestedEnum.BAR)
-            .build();
-    assertThat(message.hasField(optionalInt32Field)).isTrue();
-    assertThat(message.hasField(optionalStringField)).isTrue();
-    assertThat(message.hasField(optionalBytesField)).isTrue();
-    assertThat(message.hasField(optionalNestedEnumField)).isTrue();
-    assertThat(message.getAllFields()).hasSize(4);
-  }
-
-  @Test
-  public void testFieldPresenceDynamicMessage() {
-    Descriptor descriptor = TestAllTypes.getDescriptor();
-    FieldDescriptor optionalInt32Field = descriptor.findFieldByName("optional_int32");
-    FieldDescriptor optionalStringField = descriptor.findFieldByName("optional_string");
-    FieldDescriptor optionalBytesField = descriptor.findFieldByName("optional_bytes");
-    FieldDescriptor optionalNestedEnumField = descriptor.findFieldByName("optional_nested_enum");
-    EnumDescriptor enumDescriptor = optionalNestedEnumField.getEnumType();
-    EnumValueDescriptor defaultEnumValueDescriptor = enumDescriptor.getValues().get(0);
-    EnumValueDescriptor nonDefaultEnumValueDescriptor = enumDescriptor.getValues().get(1);
-
-    DynamicMessage defaultInstance = DynamicMessage.getDefaultInstance(descriptor);
-    // Field not present.
-    DynamicMessage message = defaultInstance.newBuilderForType().build();
-    assertThat(message.hasField(optionalInt32Field)).isFalse();
-    assertThat(message.hasField(optionalStringField)).isFalse();
-    assertThat(message.hasField(optionalBytesField)).isFalse();
-    assertThat(message.hasField(optionalNestedEnumField)).isFalse();
-    assertThat(message.getAllFields()).isEmpty();
-
-    // Field set to non-default value is seen as present.
-    message =
-        defaultInstance
-            .newBuilderForType()
-            .setField(optionalInt32Field, 1)
-            .setField(optionalStringField, "x")
-            .setField(optionalBytesField, ByteString.copyFromUtf8("y"))
-            .setField(optionalNestedEnumField, nonDefaultEnumValueDescriptor)
-            .build();
-    assertThat(message.hasField(optionalInt32Field)).isTrue();
-    assertThat(message.hasField(optionalStringField)).isTrue();
-    assertThat(message.hasField(optionalBytesField)).isTrue();
-    assertThat(message.hasField(optionalNestedEnumField)).isTrue();
-    assertThat(message.getAllFields()).hasSize(4);
-
-    // Field set to default value is seen as not present.
-    message =
-        message
-            .toBuilder()
-            .setField(optionalInt32Field, 0)
-            .setField(optionalStringField, "")
-            .setField(optionalBytesField, ByteString.EMPTY)
-            .setField(optionalNestedEnumField, defaultEnumValueDescriptor)
-            .build();
-    assertThat(message.hasField(optionalInt32Field)).isFalse();
-    assertThat(message.hasField(optionalStringField)).isFalse();
-    assertThat(message.hasField(optionalBytesField)).isFalse();
-    assertThat(message.hasField(optionalNestedEnumField)).isFalse();
-    assertThat(message.getAllFields()).isEmpty();
-  }
-
-  @Test
-  public void testMessageField() {
-    TestAllTypes.Builder builder = TestAllTypes.newBuilder();
-    assertThat(builder.hasOptionalNestedMessage()).isFalse();
-    assertThat(builder.build().hasOptionalNestedMessage()).isFalse();
-
-    TestAllTypes.NestedMessage.Builder nestedBuilder = builder.getOptionalNestedMessageBuilder();
-    assertThat(builder.hasOptionalNestedMessage()).isTrue();
-    assertThat(builder.build().hasOptionalNestedMessage()).isTrue();
-
-    nestedBuilder.setValue(1);
-    assertThat(builder.build().getOptionalNestedMessage().getValue()).isEqualTo(1);
-
-    builder.clearOptionalNestedMessage();
-    assertThat(builder.hasOptionalNestedMessage()).isFalse();
-    assertThat(builder.build().hasOptionalNestedMessage()).isFalse();
-
-    // Unlike non-message fields, if we set a message field to its default value (i.e.,
-    // default instance), the field should be seen as present.
-    builder.setOptionalNestedMessage(TestAllTypes.NestedMessage.getDefaultInstance());
-    assertThat(builder.hasOptionalNestedMessage()).isTrue();
-    assertThat(builder.build().hasOptionalNestedMessage()).isTrue();
-  }
-
-  @Test
-  public void testSerializeAndParse() throws Exception {
-    TestAllTypes.Builder builder = TestAllTypes.newBuilder();
-    builder.setOptionalInt32(1234);
-    builder.setOptionalString("hello");
-    builder.setOptionalNestedMessage(TestAllTypes.NestedMessage.getDefaultInstance());
-    // Set an oneof field to its default value and expect it to be serialized (i.e.,
-    // an oneof field set to the default value should be treated as present).
-    builder.setOneofInt32(0);
-    ByteString data = builder.build().toByteString();
-
-    TestAllTypes message = TestAllTypes.parseFrom(data);
-    assertThat(message.getOptionalInt32()).isEqualTo(1234);
-    assertThat(message.getOptionalString()).isEqualTo("hello");
-    // Fields not set will have the default value.
-    assertThat(message.getOptionalBytes()).isEqualTo(ByteString.EMPTY);
-    assertThat(message.getOptionalNestedEnum()).isEqualTo(TestAllTypes.NestedEnum.FOO);
-    // The message field is set despite that it's set with a default instance.
-    assertThat(message.hasOptionalNestedMessage()).isTrue();
-    assertThat(message.getOptionalNestedMessage().getValue()).isEqualTo(0);
-    // The oneof field set to its default value is also present.
-    assertThat(message.getOneofFieldCase()).isEqualTo(TestAllTypes.OneofFieldCase.ONEOF_INT32);
-  }
-
-  // Regression test for b/16173397
-  // Make sure we haven't screwed up the code generation for repeated fields.
-  @Test
-  public void testRepeatedFields() throws Exception {
-    TestAllTypes.Builder builder = TestAllTypes.newBuilder();
-    builder.setOptionalInt32(1234);
-    builder.setOptionalString("hello");
-    builder.setOptionalNestedMessage(TestAllTypes.NestedMessage.getDefaultInstance());
-    builder.addRepeatedInt32(4321);
-    builder.addRepeatedString("world");
-    builder.addRepeatedNestedMessage(TestAllTypes.NestedMessage.getDefaultInstance());
-    ByteString data = builder.build().toByteString();
-
-    TestOptionalFieldsOnly optionalOnlyMessage = TestOptionalFieldsOnly.parseFrom(data);
-    assertThat(optionalOnlyMessage.getOptionalInt32()).isEqualTo(1234);
-    assertThat(optionalOnlyMessage.getOptionalString()).isEqualTo("hello");
-    assertThat(optionalOnlyMessage.hasOptionalNestedMessage()).isTrue();
-    assertThat(optionalOnlyMessage.getOptionalNestedMessage().getValue()).isEqualTo(0);
-
-    TestRepeatedFieldsOnly repeatedOnlyMessage = TestRepeatedFieldsOnly.parseFrom(data);
-    assertThat(repeatedOnlyMessage.getRepeatedInt32Count()).isEqualTo(1);
-    assertThat(repeatedOnlyMessage.getRepeatedInt32(0)).isEqualTo(4321);
-    assertThat(repeatedOnlyMessage.getRepeatedStringCount()).isEqualTo(1);
-    assertThat(repeatedOnlyMessage.getRepeatedString(0)).isEqualTo("world");
-    assertThat(repeatedOnlyMessage.getRepeatedNestedMessageCount()).isEqualTo(1);
-    assertThat(repeatedOnlyMessage.getRepeatedNestedMessage(0).getValue()).isEqualTo(0);
-  }
-
-  @Test
-  public void testIsInitialized() throws Exception {
-    TestAllTypes.Builder builder = TestAllTypes.newBuilder();
-
-    // Test optional proto2 message fields.
-    UnittestProto.TestRequired.Builder proto2Builder = builder.getOptionalProto2MessageBuilder();
-    assertThat(builder.isInitialized()).isFalse();
-    assertThat(builder.buildPartial().isInitialized()).isFalse();
-
-    proto2Builder.setA(1).setB(2).setC(3);
-    assertThat(builder.isInitialized()).isTrue();
-    assertThat(builder.buildPartial().isInitialized()).isTrue();
-
-    // Test oneof proto2 message fields.
-    proto2Builder = builder.getOneofProto2MessageBuilder();
-    assertThat(builder.isInitialized()).isFalse();
-    assertThat(builder.buildPartial().isInitialized()).isFalse();
-
-    proto2Builder.setA(1).setB(2).setC(3);
-    assertThat(builder.isInitialized()).isTrue();
-    assertThat(builder.buildPartial().isInitialized()).isTrue();
-
-    // Test repeated proto2 message fields.
-    proto2Builder = builder.addRepeatedProto2MessageBuilder();
-    assertThat(builder.isInitialized()).isFalse();
-    assertThat(builder.buildPartial().isInitialized()).isFalse();
-
-    proto2Builder.setA(1).setB(2).setC(3);
-    assertThat(builder.isInitialized()).isTrue();
-    assertThat(builder.buildPartial().isInitialized()).isTrue();
-  }
-
-}
diff --git a/libs/protobuf/java/core/src/test/java/com/google/protobuf/FloatArrayListTest.java b/libs/protobuf/java/core/src/test/java/com/google/protobuf/FloatArrayListTest.java
deleted file mode 100644
index 8fe8508..0000000
--- a/libs/protobuf/java/core/src/test/java/com/google/protobuf/FloatArrayListTest.java
+++ /dev/null
@@ -1,586 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.common.truth.Truth.assertThat;
-import static com.google.common.truth.Truth.assertWithMessage;
-import static java.util.Arrays.asList;
-
-import com.google.protobuf.Internal.FloatList;
-import java.util.Collections;
-import java.util.ConcurrentModificationException;
-import java.util.Iterator;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-/** Tests for {@link FloatArrayList}. */
-@RunWith(JUnit4.class)
-public class FloatArrayListTest {
-
-  private static final FloatArrayList UNARY_LIST = newImmutableFloatArrayList(1);
-  private static final FloatArrayList TERTIARY_LIST = newImmutableFloatArrayList(1, 2, 3);
-
-  private FloatArrayList list;
-
-  @Before
-  public void setUp() throws Exception {
-    list = new FloatArrayList();
-  }
-
-  @Test
-  public void testEmptyListReturnsSameInstance() {
-    assertThat(FloatArrayList.emptyList()).isSameInstanceAs(FloatArrayList.emptyList());
-  }
-
-  @Test
-  public void testEmptyListIsImmutable() {
-    assertImmutable(FloatArrayList.emptyList());
-  }
-
-  @Test
-  public void testMakeImmutable() {
-    list.addFloat(3);
-    list.addFloat(4);
-    list.addFloat(5);
-    list.addFloat(7);
-    list.makeImmutable();
-    assertImmutable(list);
-  }
-
-  @Test
-  public void testModificationWithIteration() {
-    list.addAll(asList(1F, 2F, 3F, 4F));
-    Iterator<Float> iterator = list.iterator();
-    assertThat(list).hasSize(4);
-    assertThat((float) list.get(0)).isEqualTo(1F);
-    assertThat((float) iterator.next()).isEqualTo(1F);
-    list.set(0, 1F);
-    assertThat((float) iterator.next()).isEqualTo(2F);
-
-    list.remove(0);
-    try {
-      iterator.next();
-      assertWithMessage("expected exception").fail();
-    } catch (ConcurrentModificationException e) {
-      // expected
-    }
-
-    iterator = list.iterator();
-    list.add(0, 0F);
-    try {
-      iterator.next();
-      assertWithMessage("expected exception").fail();
-    } catch (ConcurrentModificationException e) {
-      // expected
-    }
-  }
-
-  @Test
-  public void testGet() {
-    assertThat((float) TERTIARY_LIST.get(0)).isEqualTo(1F);
-    assertThat((float) TERTIARY_LIST.get(1)).isEqualTo(2F);
-    assertThat((float) TERTIARY_LIST.get(2)).isEqualTo(3F);
-
-    try {
-      TERTIARY_LIST.get(-1);
-      assertWithMessage("expected exception").fail();
-    } catch (IndexOutOfBoundsException e) {
-      // expected
-    }
-
-    try {
-      TERTIARY_LIST.get(3);
-      assertWithMessage("expected exception").fail();
-    } catch (IndexOutOfBoundsException e) {
-      // expected
-    }
-  }
-
-  @Test
-  public void testGetFloat() {
-    assertThat(TERTIARY_LIST.getFloat(0)).isEqualTo(1F);
-    assertThat(TERTIARY_LIST.getFloat(1)).isEqualTo(2F);
-    assertThat(TERTIARY_LIST.getFloat(2)).isEqualTo(3F);
-
-    try {
-      TERTIARY_LIST.get(-1);
-      assertWithMessage("expected exception").fail();
-    } catch (IndexOutOfBoundsException e) {
-      // expected
-    }
-
-    try {
-      TERTIARY_LIST.get(3);
-      assertWithMessage("expected exception").fail();
-    } catch (IndexOutOfBoundsException e) {
-      // expected
-    }
-  }
-
-  @Test
-  public void testIndexOf_nullElement() {
-    assertThat(TERTIARY_LIST.indexOf(null)).isEqualTo(-1);
-  }
-
-  @Test
-  public void testIndexOf_incompatibleElementType() {
-    assertThat(TERTIARY_LIST.indexOf(new Object())).isEqualTo(-1);
-  }
-
-  @Test
-  public void testIndexOf_notInList() {
-    assertThat(UNARY_LIST.indexOf(2F)).isEqualTo(-1);
-  }
-
-  @Test
-  public void testIndexOf_notInListWithDuplicates() {
-    FloatArrayList listWithDupes = newImmutableFloatArrayList(1F, 1F);
-    assertThat(listWithDupes.indexOf(2F)).isEqualTo(-1);
-  }
-
-  @Test
-  public void testIndexOf_inList() {
-    assertThat(TERTIARY_LIST.indexOf(2F)).isEqualTo(1);
-  }
-
-  @Test
-  public void testIndexOf_inListWithDuplicates_matchAtHead() {
-    FloatArrayList listWithDupes = newImmutableFloatArrayList(1F, 1F, 2F);
-    assertThat(listWithDupes.indexOf(1F)).isEqualTo(0);
-  }
-
-  @Test
-  public void testIndexOf_inListWithDuplicates_matchMidList() {
-    FloatArrayList listWithDupes = newImmutableFloatArrayList(2F, 1F, 1F, 2F);
-    assertThat(listWithDupes.indexOf(1F)).isEqualTo(1);
-  }
-
-  @Test
-  public void testContains_nullElement() {
-    assertThat(TERTIARY_LIST).doesNotContain(null);
-  }
-
-  @Test
-  public void testContains_incompatibleElementType() {
-    assertThat(TERTIARY_LIST).doesNotContain(new Object());
-  }
-
-  @Test
-  public void testContains_notInList() {
-    assertThat(UNARY_LIST).doesNotContain(2F);
-  }
-
-  @Test
-  public void testContains_notInListWithDuplicates() {
-    FloatArrayList listWithDupes = newImmutableFloatArrayList(1F, 1F);
-    assertThat(listWithDupes).doesNotContain(2F);
-  }
-
-  @Test
-  public void testContains_inList() {
-    assertThat(TERTIARY_LIST).contains(2F);
-  }
-
-  @Test
-  public void testContains_inListWithDuplicates_matchAtHead() {
-    FloatArrayList listWithDupes = newImmutableFloatArrayList(1F, 1F, 2F);
-    assertThat(listWithDupes).contains(1F);
-  }
-
-  @Test
-  public void testContains_inListWithDuplicates_matchMidList() {
-    FloatArrayList listWithDupes = newImmutableFloatArrayList(2F, 1F, 1F, 2F);
-    assertThat(listWithDupes).contains(1F);
-  }
-
-  @Test
-  public void testSize() {
-    assertThat(FloatArrayList.emptyList()).isEmpty();
-    assertThat(UNARY_LIST).hasSize(1);
-    assertThat(TERTIARY_LIST).hasSize(3);
-
-    list.addFloat(3);
-    list.addFloat(4);
-    list.addFloat(6);
-    list.addFloat(8);
-    assertThat(list).hasSize(4);
-
-    list.remove(0);
-    assertThat(list).hasSize(3);
-
-    list.add(17F);
-    assertThat(list).hasSize(4);
-  }
-
-  @Test
-  public void testSet() {
-    list.addFloat(2);
-    list.addFloat(4);
-
-    assertThat((float) list.set(0, 3F)).isEqualTo(2F);
-    assertThat(list.getFloat(0)).isEqualTo(3F);
-
-    assertThat((float) list.set(1, 0F)).isEqualTo(4F);
-    assertThat(list.getFloat(1)).isEqualTo(0F);
-
-    try {
-      list.set(-1, 0F);
-      assertWithMessage("expected exception").fail();
-    } catch (IndexOutOfBoundsException e) {
-      // expected
-    }
-
-    try {
-      list.set(2, 0F);
-      assertWithMessage("expected exception").fail();
-    } catch (IndexOutOfBoundsException e) {
-      // expected
-    }
-  }
-
-  @Test
-  public void testSetFloat() {
-    list.addFloat(1);
-    list.addFloat(3);
-
-    assertThat(list.setFloat(0, 0)).isEqualTo(1F);
-    assertThat(list.getFloat(0)).isEqualTo(0F);
-
-    assertThat(list.setFloat(1, 0)).isEqualTo(3F);
-    assertThat(list.getFloat(1)).isEqualTo(0F);
-
-    try {
-      list.setFloat(-1, 0);
-      assertWithMessage("expected exception").fail();
-    } catch (IndexOutOfBoundsException e) {
-      // expected
-    }
-
-    try {
-      list.setFloat(2, 0);
-      assertWithMessage("expected exception").fail();
-    } catch (IndexOutOfBoundsException e) {
-      // expected
-    }
-  }
-
-  @Test
-  public void testAdd() {
-    assertThat(list).isEmpty();
-
-    assertThat(list.add(2F)).isTrue();
-    assertThat(list).containsExactly(2F);
-
-    assertThat(list.add(3F)).isTrue();
-    list.add(0, 4F);
-    assertThat(list).containsExactly(4F, 2F, 3F).inOrder();
-
-    list.add(0, 1F);
-    list.add(0, 0F);
-    // Force a resize by getting up to 11 elements.
-    for (int i = 0; i < 6; i++) {
-      list.add(Float.valueOf(5 + i));
-    }
-    assertThat(list).containsExactly(0F, 1F, 4F, 2F, 3F, 5F, 6F, 7F, 8F, 9F, 10F).inOrder();
-
-    try {
-      list.add(-1, 5F);
-    } catch (IndexOutOfBoundsException e) {
-      // expected
-    }
-
-    try {
-      list.add(4, 5F);
-    } catch (IndexOutOfBoundsException e) {
-      // expected
-    }
-  }
-
-  @Test
-  public void testAddFloat() {
-    assertThat(list).isEmpty();
-
-    list.addFloat(2);
-    assertThat(list).containsExactly(2F);
-
-    list.addFloat(3);
-    assertThat(list).containsExactly(2F, 3F).inOrder();
-  }
-
-  @Test
-  public void testAddAll() {
-    assertThat(list).isEmpty();
-
-    assertThat(list.addAll(Collections.singleton(1F))).isTrue();
-    assertThat(list).hasSize(1);
-    assertThat((float) list.get(0)).isEqualTo(1F);
-    assertThat(list.getFloat(0)).isEqualTo(1F);
-
-    assertThat(list.addAll(asList(2F, 3F, 4F, 5F, 6F))).isTrue();
-    assertThat(list).containsExactly(1F, 2F, 3F, 4F, 5F, 6F).inOrder();
-
-    assertThat(list.addAll(TERTIARY_LIST)).isTrue();
-    assertThat(list).containsExactly(1F, 2F, 3F, 4F, 5F, 6F, 1F, 2F, 3F).inOrder();
-
-    assertThat(list.addAll(Collections.<Float>emptyList())).isFalse();
-    assertThat(list.addAll(FloatArrayList.emptyList())).isFalse();
-  }
-
-  @Test
-  public void testEquals() {
-    FloatArrayList list1 = new FloatArrayList();
-    FloatArrayList list2 = new FloatArrayList();
-
-    list1.addFloat(Float.intBitsToFloat(0xff800001));
-    list2.addFloat(Float.intBitsToFloat(0xff800002));
-    assertThat(list1).isEqualTo(list2);
-  }
-
-  @Test
-  public void testRemove() {
-    list.addAll(TERTIARY_LIST);
-    assertThat((float) list.remove(0)).isEqualTo(1F);
-    assertThat(list).containsExactly(2F, 3F).inOrder();
-
-    assertThat(list.remove(Float.valueOf(3))).isTrue();
-    assertThat(list).containsExactly(2F);
-
-    assertThat(list.remove(Float.valueOf(3))).isFalse();
-    assertThat(list).containsExactly(2F);
-
-    assertThat((float) list.remove(0)).isEqualTo(2F);
-    assertThat(list).isEmpty();
-
-    try {
-      list.remove(-1);
-      assertWithMessage("expected exception").fail();
-    } catch (IndexOutOfBoundsException e) {
-      // expected
-    }
-
-    try {
-      list.remove(0);
-      assertWithMessage("expected exception").fail();
-    } catch (IndexOutOfBoundsException e) {
-      // expected
-    }
-  }
-
-  @Test
-  public void testRemoveEnd_listAtCapacity() {
-    FloatList toRemove = FloatArrayList.emptyList().mutableCopyWithCapacity(1);
-    toRemove.addFloat(3);
-    toRemove.remove(0);
-    assertThat(toRemove).isEmpty();
-  }
-
-  @Test
-  public void testRemove_listAtCapacity() {
-    FloatList toRemove = FloatArrayList.emptyList().mutableCopyWithCapacity(2);
-    toRemove.addFloat(3);
-    toRemove.addFloat(4);
-    toRemove.remove(0);
-    assertThat(toRemove).hasSize(1);
-    assertThat((float) toRemove.get(0)).isEqualTo(4F);
-  }
-
-  @Test
-  public void testSublistRemoveEndOfCapacity() {
-    FloatList toRemove = FloatArrayList.emptyList().mutableCopyWithCapacity(1);
-    toRemove.addFloat(3);
-    toRemove.subList(0, 1).clear();
-    assertThat(toRemove).isEmpty();
-  }
-
-  private void assertImmutable(FloatList list) {
-    if (list.contains(1F)) {
-      throw new RuntimeException("Cannot test the immutability of lists that contain 1.");
-    }
-
-    try {
-      list.add(1F);
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.add(0, 1F);
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.addAll(Collections.<Float>emptyList());
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.addAll(Collections.singletonList(1F));
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.addAll(new FloatArrayList());
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.addAll(UNARY_LIST);
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.addAll(0, Collections.singleton(1F));
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.addAll(0, UNARY_LIST);
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.addAll(0, Collections.<Float>emptyList());
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.addFloat(0);
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.clear();
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.remove(1);
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.remove(new Object());
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.removeAll(Collections.<Float>emptyList());
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.removeAll(Collections.singleton(1F));
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.removeAll(UNARY_LIST);
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.retainAll(Collections.<Float>emptyList());
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.retainAll(Collections.singleton(1F));
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.retainAll(UNARY_LIST);
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.set(0, 0F);
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.setFloat(0, 0);
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-  }
-
-  private static FloatArrayList newImmutableFloatArrayList(float... elements) {
-    FloatArrayList list = new FloatArrayList();
-    for (float element : elements) {
-      list.addFloat(element);
-    }
-    list.makeImmutable();
-    return list;
-  }
-}
diff --git a/libs/protobuf/java/core/src/test/java/com/google/protobuf/GeneratedMessageTest.java b/libs/protobuf/java/core/src/test/java/com/google/protobuf/GeneratedMessageTest.java
deleted file mode 100644
index 55864af..0000000
--- a/libs/protobuf/java/core/src/test/java/com/google/protobuf/GeneratedMessageTest.java
+++ /dev/null
@@ -1,2026 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.common.truth.Truth.assertThat;
-import static com.google.common.truth.Truth.assertWithMessage;
-
-import com.google.protobuf.Descriptors.Descriptor;
-import com.google.protobuf.Descriptors.FieldDescriptor;
-import com.google.protobuf.test.UnittestImport;
-import protobuf_unittest.EnumWithNoOuter;
-import protobuf_unittest.MessageWithNoOuter;
-import protobuf_unittest.MultipleFilesTestProto;
-import protobuf_unittest.NestedExtension.MyNestedExtension;
-import protobuf_unittest.NonNestedExtension;
-import protobuf_unittest.NonNestedExtension.MessageToBeExtended;
-import protobuf_unittest.NonNestedExtension.MyNonNestedExtension;
-import protobuf_unittest.OuterClassNameTest2OuterClass;
-import protobuf_unittest.OuterClassNameTest3OuterClass;
-import protobuf_unittest.OuterClassNameTestOuterClass;
-import protobuf_unittest.ServiceWithNoOuter;
-import protobuf_unittest.UnittestOptimizeFor.TestOptimizedForSize;
-import protobuf_unittest.UnittestOptimizeFor.TestOptionalOptimizedForSize;
-import protobuf_unittest.UnittestOptimizeFor.TestRequiredOptimizedForSize;
-import protobuf_unittest.UnittestProto;
-import protobuf_unittest.UnittestProto.ForeignEnum;
-import protobuf_unittest.UnittestProto.ForeignMessage;
-import protobuf_unittest.UnittestProto.ForeignMessageOrBuilder;
-import protobuf_unittest.UnittestProto.NestedTestAllTypes;
-import protobuf_unittest.UnittestProto.TestAllExtensions;
-import protobuf_unittest.UnittestProto.TestAllTypes;
-import protobuf_unittest.UnittestProto.TestAllTypes.NestedMessage;
-import protobuf_unittest.UnittestProto.TestAllTypesOrBuilder;
-import protobuf_unittest.UnittestProto.TestExtremeDefaultValues;
-import protobuf_unittest.UnittestProto.TestOneof2;
-import protobuf_unittest.UnittestProto.TestPackedTypes;
-import protobuf_unittest.UnittestProto.TestUnpackedTypes;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import org.junit.After;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-/**
- * Unit test for generated messages and generated code. See also {@link MessageTest}, which tests
- * some generated message functionality.
- */
-@SuppressWarnings({"ProtoBuilderReturnValueIgnored", "ReturnValueIgnored"})
-@RunWith(JUnit4.class)
-public class GeneratedMessageTest {
-
-  private static final TestOneof2 EXPECTED_MERGED_MESSAGE =
-      TestOneof2.newBuilder()
-          .setFooMessage(TestOneof2.NestedMessage.newBuilder().addCorgeInt(1).addCorgeInt(2))
-          .build();
-
-  private static final TestOneof2 MESSAGE_TO_MERGE_FROM =
-      TestOneof2.newBuilder()
-          .setFooMessage(TestOneof2.NestedMessage.newBuilder().addCorgeInt(2))
-          .build();
-
-  private static final FieldDescriptor NESTED_MESSAGE_BB_FIELD =
-      UnittestProto.TestAllTypes.NestedMessage.getDescriptor().findFieldByName("bb");
-
-  TestUtil.ReflectionTester reflectionTester =
-      new TestUtil.ReflectionTester(TestAllTypes.getDescriptor(), null);
-
-  @After
-  public void tearDown() {
-    GeneratedMessageV3.setAlwaysUseFieldBuildersForTesting(false);
-  }
-
-  @Test
-  public void testGetFieldBuilderForExtensionField() {
-    TestAllExtensions.Builder builder = TestAllExtensions.newBuilder();
-    Message.Builder fieldBuilder =
-        builder.getFieldBuilder(UnittestProto.optionalNestedMessageExtension.getDescriptor());
-    int expected = 7432;
-    FieldDescriptor field =
-        NestedMessage.getDescriptor().findFieldByNumber(NestedMessage.BB_FIELD_NUMBER);
-    fieldBuilder.setField(field, expected);
-    assertThat(builder.build().getExtension(UnittestProto.optionalNestedMessageExtension).getBb())
-        .isEqualTo(expected);
-
-    // fieldBuilder still updates the builder after builder build() has been called.
-    expected += 100;
-    fieldBuilder.setField(field, expected);
-    assertThat(builder.build().getExtension(UnittestProto.optionalNestedMessageExtension).getBb())
-        .isEqualTo(expected);
-  }
-
-  @Test
-  public void testGetFieldBuilderWithExistingMessage() {
-    TestAllExtensions.Builder builder = TestAllExtensions.newBuilder();
-    builder.setExtension(
-        UnittestProto.optionalNestedMessageExtension,
-        NestedMessage.newBuilder().setBb(123).build());
-    Message.Builder fieldBuilder =
-        builder.getFieldBuilder(UnittestProto.optionalNestedMessageExtension.getDescriptor());
-    int expected = 7432;
-    FieldDescriptor field =
-        NestedMessage.getDescriptor().findFieldByNumber(NestedMessage.BB_FIELD_NUMBER);
-    fieldBuilder.setField(field, expected);
-    assertThat(builder.build().getExtension(UnittestProto.optionalNestedMessageExtension).getBb())
-        .isEqualTo(expected);
-
-    // fieldBuilder still updates the builder after builder build() has been called.
-    expected += 100;
-    fieldBuilder.setField(field, expected);
-    assertThat(builder.build().getExtension(UnittestProto.optionalNestedMessageExtension).getBb())
-        .isEqualTo(expected);
-  }
-
-  @Test
-  public void testGetFieldBuilderWithExistingBuilder() {
-    TestAllExtensions.Builder builder = TestAllExtensions.newBuilder();
-    NestedMessage.Builder nestedMessageBuilder = NestedMessage.newBuilder().setBb(123);
-    builder.setField(
-        UnittestProto.optionalNestedMessageExtension.getDescriptor(), nestedMessageBuilder);
-    Message.Builder fieldBuilder =
-        builder.getFieldBuilder(UnittestProto.optionalNestedMessageExtension.getDescriptor());
-    int expected = 7432;
-    FieldDescriptor field =
-        NestedMessage.getDescriptor().findFieldByNumber(NestedMessage.BB_FIELD_NUMBER);
-    fieldBuilder.setField(field, expected);
-    assertThat(builder.build().getExtension(UnittestProto.optionalNestedMessageExtension).getBb())
-        .isEqualTo(expected);
-
-    // Existing nestedMessageBuilder will also update builder.
-    expected += 100;
-    nestedMessageBuilder.setBb(expected);
-    assertThat(builder.build().getExtension(UnittestProto.optionalNestedMessageExtension).getBb())
-        .isEqualTo(expected);
-
-    // fieldBuilder still updates the builder.
-    expected += 100;
-    fieldBuilder.setField(field, expected);
-    assertThat(builder.build().getExtension(UnittestProto.optionalNestedMessageExtension).getBb())
-        .isEqualTo(expected);
-  }
-
-  @Test
-  public void testGetRepeatedFieldBuilderForExtensionField() {
-    TestAllExtensions.Builder builder = TestAllExtensions.newBuilder();
-    builder.addExtension(
-        UnittestProto.repeatedNestedMessageExtension,
-        NestedMessage.newBuilder().setBb(123).build());
-    Message.Builder fieldBuilder =
-        builder.getRepeatedFieldBuilder(
-            UnittestProto.repeatedNestedMessageExtension.getDescriptor(), 0);
-    int expected = 7432;
-    FieldDescriptor field =
-        NestedMessage.getDescriptor().findFieldByNumber(NestedMessage.BB_FIELD_NUMBER);
-    fieldBuilder.setField(field, expected);
-    assertThat(
-            builder.build().getExtension(UnittestProto.repeatedNestedMessageExtension, 0).getBb())
-        .isEqualTo(expected);
-
-    // fieldBuilder still updates the builder after builder build() has been called.
-    expected += 100;
-    fieldBuilder.setField(field, expected);
-    assertThat(
-            builder.build().getExtension(UnittestProto.repeatedNestedMessageExtension, 0).getBb())
-        .isEqualTo(expected);
-  }
-
-  @Test
-  public void testGetRepeatedFieldBuilderForExistingBuilder() {
-    TestAllExtensions.Builder builder = TestAllExtensions.newBuilder();
-    NestedMessage.Builder nestedMessageBuilder = NestedMessage.newBuilder().setBb(123);
-    builder.addRepeatedField(
-        UnittestProto.repeatedNestedMessageExtension.getDescriptor(), nestedMessageBuilder);
-    Message.Builder fieldBuilder =
-        builder.getRepeatedFieldBuilder(
-            UnittestProto.repeatedNestedMessageExtension.getDescriptor(), 0);
-    int expected = 7432;
-    FieldDescriptor field =
-        NestedMessage.getDescriptor().findFieldByNumber(NestedMessage.BB_FIELD_NUMBER);
-    fieldBuilder.setField(field, expected);
-    assertThat(
-            builder.build().getExtension(UnittestProto.repeatedNestedMessageExtension, 0).getBb())
-        .isEqualTo(expected);
-
-    // Existing nestedMessageBuilder will also update builder.
-    expected += 100;
-    nestedMessageBuilder.setBb(expected);
-    assertThat(
-            builder.build().getExtension(UnittestProto.repeatedNestedMessageExtension, 0).getBb())
-        .isEqualTo(expected);
-
-    // fieldBuilder still updates the builder.
-    expected += 100;
-    fieldBuilder.setField(field, expected);
-    assertThat(
-            builder.build().getExtension(UnittestProto.repeatedNestedMessageExtension, 0).getBb())
-        .isEqualTo(expected);
-  }
-
-  @Test
-  public void testGetExtensionFieldOutOfBound() {
-    TestAllExtensions.Builder builder = TestAllExtensions.newBuilder();
-    try {
-      builder.getRepeatedField(UnittestProto.repeatedNestedMessageExtension.getDescriptor(), 0);
-      assertWithMessage("Expected IndexOutOfBoundsException to be thrown").fail();
-    } catch (IndexOutOfBoundsException expected) {
-    }
-    try {
-      builder.getExtension(UnittestProto.repeatedNestedMessageExtension, 0);
-      assertWithMessage("Expected IndexOutOfBoundsException to be thrown").fail();
-    } catch (IndexOutOfBoundsException expected) {
-    }
-    TestAllExtensions extensionsMessage = builder.build();
-    try {
-      extensionsMessage.getRepeatedField(
-          UnittestProto.repeatedNestedMessageExtension.getDescriptor(), 0);
-      assertWithMessage("Expected IndexOutOfBoundsException to be thrown").fail();
-    } catch (IndexOutOfBoundsException expected) {
-    }
-    try {
-      extensionsMessage.getExtension(UnittestProto.repeatedNestedMessageExtension, 0);
-      assertWithMessage("Expected IndexOutOfBoundsException to be thrown").fail();
-    } catch (IndexOutOfBoundsException expected) {
-    }
-  }
-
-  @Test
-  public void testDefaultInstance() throws Exception {
-    assertThat(TestAllTypes.getDefaultInstance())
-        .isSameInstanceAs(TestAllTypes.getDefaultInstance().getDefaultInstanceForType());
-    assertThat(TestAllTypes.getDefaultInstance())
-        .isSameInstanceAs(TestAllTypes.newBuilder().getDefaultInstanceForType());
-  }
-
-  @Test
-  public void testMessageOrBuilder() throws Exception {
-    TestAllTypes.Builder builder = TestAllTypes.newBuilder();
-    TestUtil.setAllFields(builder);
-    TestAllTypes message = builder.build();
-    TestUtil.assertAllFieldsSet(message);
-  }
-
-  @Test
-  public void testUsingBuilderMultipleTimes() throws Exception {
-    TestAllTypes.Builder builder = TestAllTypes.newBuilder();
-    // primitive field scalar and repeated
-    builder.setOptionalSfixed64(100);
-    builder.addRepeatedInt32(100);
-    // enum field scalar and repeated
-    builder.setOptionalImportEnum(UnittestImport.ImportEnum.IMPORT_BAR);
-    builder.addRepeatedImportEnum(UnittestImport.ImportEnum.IMPORT_BAR);
-    // proto field scalar and repeated
-    builder.setOptionalForeignMessage(ForeignMessage.newBuilder().setC(1));
-    builder.addRepeatedForeignMessage(ForeignMessage.newBuilder().setC(1));
-
-    TestAllTypes value1 = builder.build();
-
-    assertThat(value1.getOptionalSfixed64()).isEqualTo(100);
-    assertThat(value1.getRepeatedInt32(0)).isEqualTo(100);
-    assertThat(value1.getOptionalImportEnum()).isEqualTo(UnittestImport.ImportEnum.IMPORT_BAR);
-    assertThat(value1.getRepeatedImportEnum(0)).isEqualTo(UnittestImport.ImportEnum.IMPORT_BAR);
-    assertThat(value1.getOptionalForeignMessage().getC()).isEqualTo(1);
-    assertThat(value1.getRepeatedForeignMessage(0).getC()).isEqualTo(1);
-
-    // Make sure that builder didn't update previously created values
-    builder.setOptionalSfixed64(200);
-    builder.setRepeatedInt32(0, 200);
-    builder.setOptionalImportEnum(UnittestImport.ImportEnum.IMPORT_FOO);
-    builder.setRepeatedImportEnum(0, UnittestImport.ImportEnum.IMPORT_FOO);
-    builder.setOptionalForeignMessage(ForeignMessage.newBuilder().setC(2));
-    builder.setRepeatedForeignMessage(0, ForeignMessage.newBuilder().setC(2));
-
-    TestAllTypes value2 = builder.build();
-
-    // Make sure value1 didn't change.
-    assertThat(value1.getOptionalSfixed64()).isEqualTo(100);
-    assertThat(value1.getRepeatedInt32(0)).isEqualTo(100);
-    assertThat(value1.getOptionalImportEnum()).isEqualTo(UnittestImport.ImportEnum.IMPORT_BAR);
-    assertThat(value1.getRepeatedImportEnum(0)).isEqualTo(UnittestImport.ImportEnum.IMPORT_BAR);
-    assertThat(value1.getOptionalForeignMessage().getC()).isEqualTo(1);
-    assertThat(value1.getRepeatedForeignMessage(0).getC()).isEqualTo(1);
-
-    // Make sure value2 is correct
-    assertThat(value2.getOptionalSfixed64()).isEqualTo(200);
-    assertThat(value2.getRepeatedInt32(0)).isEqualTo(200);
-    assertThat(value2.getOptionalImportEnum()).isEqualTo(UnittestImport.ImportEnum.IMPORT_FOO);
-    assertThat(value2.getRepeatedImportEnum(0)).isEqualTo(UnittestImport.ImportEnum.IMPORT_FOO);
-    assertThat(value2.getOptionalForeignMessage().getC()).isEqualTo(2);
-    assertThat(value2.getRepeatedForeignMessage(0).getC()).isEqualTo(2);
-  }
-
-  @Test
-  public void testProtosShareRepeatedArraysIfDidntChange() throws Exception {
-    TestAllTypes.Builder builder = TestAllTypes.newBuilder();
-    builder.addRepeatedInt32(100);
-    builder.addRepeatedForeignMessage(ForeignMessage.getDefaultInstance());
-
-    TestAllTypes value1 = builder.build();
-    TestAllTypes value2 = value1.toBuilder().build();
-
-    assertThat(value1.getRepeatedInt32List()).isSameInstanceAs(value2.getRepeatedInt32List());
-    assertThat(value1.getRepeatedForeignMessageList())
-        .isSameInstanceAs(value2.getRepeatedForeignMessageList());
-  }
-
-  @Test
-  public void testRepeatedArraysAreImmutable() throws Exception {
-    TestAllTypes.Builder builder = TestAllTypes.newBuilder();
-    builder.addRepeatedInt32(100);
-    builder.addRepeatedImportEnum(UnittestImport.ImportEnum.IMPORT_BAR);
-    builder.addRepeatedForeignMessage(ForeignMessage.getDefaultInstance());
-    assertIsUnmodifiable(builder.getRepeatedInt32List());
-    assertIsUnmodifiable(builder.getRepeatedImportEnumList());
-    assertIsUnmodifiable(builder.getRepeatedForeignMessageList());
-    assertIsUnmodifiable(builder.getRepeatedFloatList());
-
-    TestAllTypes value = builder.build();
-    assertIsUnmodifiable(value.getRepeatedInt32List());
-    assertIsUnmodifiable(value.getRepeatedImportEnumList());
-    assertIsUnmodifiable(value.getRepeatedForeignMessageList());
-    assertIsUnmodifiable(value.getRepeatedFloatList());
-  }
-
-  @Test
-  public void testParsedMessagesAreImmutable() throws Exception {
-    TestAllTypes value = TestAllTypes.parseFrom(TestUtil.getAllSet().toByteString());
-    assertIsUnmodifiable(value.getRepeatedInt32List());
-    assertIsUnmodifiable(value.getRepeatedInt64List());
-    assertIsUnmodifiable(value.getRepeatedUint32List());
-    assertIsUnmodifiable(value.getRepeatedUint64List());
-    assertIsUnmodifiable(value.getRepeatedSint32List());
-    assertIsUnmodifiable(value.getRepeatedSint64List());
-    assertIsUnmodifiable(value.getRepeatedFixed32List());
-    assertIsUnmodifiable(value.getRepeatedFixed64List());
-    assertIsUnmodifiable(value.getRepeatedSfixed32List());
-    assertIsUnmodifiable(value.getRepeatedSfixed64List());
-    assertIsUnmodifiable(value.getRepeatedFloatList());
-    assertIsUnmodifiable(value.getRepeatedDoubleList());
-    assertIsUnmodifiable(value.getRepeatedBoolList());
-    assertIsUnmodifiable(value.getRepeatedStringList());
-    assertIsUnmodifiable(value.getRepeatedBytesList());
-    assertIsUnmodifiable(value.getRepeatedGroupList());
-    assertIsUnmodifiable(value.getRepeatedNestedMessageList());
-    assertIsUnmodifiable(value.getRepeatedForeignMessageList());
-    assertIsUnmodifiable(value.getRepeatedImportMessageList());
-    assertIsUnmodifiable(value.getRepeatedNestedEnumList());
-    assertIsUnmodifiable(value.getRepeatedForeignEnumList());
-    assertIsUnmodifiable(value.getRepeatedImportEnumList());
-  }
-
-  private void assertIsUnmodifiable(List<?> list) {
-    if (list == Collections.emptyList()) {
-      // OKAY -- Need to check this b/c EmptyList allows you to call clear.
-    } else {
-      try {
-        list.clear();
-        assertWithMessage("List wasn't immutable").fail();
-      } catch (UnsupportedOperationException e) {
-        // good
-      }
-    }
-  }
-
-  @Test
-  public void testSettersRejectNull() throws Exception {
-    TestAllTypes.Builder builder = TestAllTypes.newBuilder();
-    try {
-      builder.setOptionalString(null);
-      assertWithMessage("Exception was not thrown").fail();
-    } catch (NullPointerException e) {
-      // We expect this exception.
-    }
-    try {
-      builder.setOptionalBytes(null);
-      assertWithMessage("Exception was not thrown").fail();
-    } catch (NullPointerException e) {
-      // We expect this exception.
-    }
-    try {
-      builder.setOptionalNestedMessage((TestAllTypes.NestedMessage) null);
-      assertWithMessage("Exception was not thrown").fail();
-    } catch (NullPointerException e) {
-      // We expect this exception.
-    }
-    try {
-      builder.setOptionalNestedMessage((TestAllTypes.NestedMessage.Builder) null);
-      assertWithMessage("Exception was not thrown").fail();
-    } catch (NullPointerException e) {
-      // We expect this exception.
-    }
-    try {
-      builder.setOptionalNestedEnum(null);
-      assertWithMessage("Exception was not thrown").fail();
-    } catch (NullPointerException e) {
-      // We expect this exception.
-    }
-    try {
-      builder.addRepeatedString(null);
-      assertWithMessage("Exception was not thrown").fail();
-    } catch (NullPointerException e) {
-      // We expect this exception.
-    }
-    try {
-      builder.addRepeatedBytes(null);
-      assertWithMessage("Exception was not thrown").fail();
-    } catch (NullPointerException e) {
-      // We expect this exception.
-    }
-    try {
-      builder.addRepeatedNestedMessage((TestAllTypes.NestedMessage) null);
-      assertWithMessage("Exception was not thrown").fail();
-    } catch (NullPointerException e) {
-      // We expect this exception.
-    }
-    try {
-      builder.addRepeatedNestedMessage((TestAllTypes.NestedMessage.Builder) null);
-      assertWithMessage("Exception was not thrown").fail();
-    } catch (NullPointerException e) {
-      // We expect this exception.
-    }
-    try {
-      builder.addRepeatedNestedEnum(null);
-      assertWithMessage("Exception was not thrown").fail();
-    } catch (NullPointerException e) {
-      // We expect this exception.
-    }
-  }
-
-  @Test
-  public void testRepeatedSetters() throws Exception {
-    TestAllTypes.Builder builder = TestAllTypes.newBuilder();
-    TestUtil.setAllFields(builder);
-    TestUtil.modifyRepeatedFields(builder);
-    TestAllTypes message = builder.build();
-    TestUtil.assertRepeatedFieldsModified(message);
-  }
-
-  @Test
-  public void testRepeatedSettersRejectNull() throws Exception {
-    TestAllTypes.Builder builder = TestAllTypes.newBuilder();
-
-    builder.addRepeatedString("one");
-    builder.addRepeatedString("two");
-    try {
-      builder.setRepeatedString(1, null);
-      assertWithMessage("Exception was not thrown").fail();
-    } catch (NullPointerException e) {
-      // We expect this exception.
-    }
-
-    builder.addRepeatedBytes(TestUtil.toBytes("one"));
-    builder.addRepeatedBytes(TestUtil.toBytes("two"));
-    try {
-      builder.setRepeatedBytes(1, null);
-      assertWithMessage("Exception was not thrown").fail();
-    } catch (NullPointerException e) {
-      // We expect this exception.
-    }
-
-    builder.addRepeatedNestedMessage(TestAllTypes.NestedMessage.newBuilder().setBb(218).build());
-    builder.addRepeatedNestedMessage(TestAllTypes.NestedMessage.newBuilder().setBb(456).build());
-    try {
-      builder.setRepeatedNestedMessage(1, (TestAllTypes.NestedMessage) null);
-      assertWithMessage("Exception was not thrown").fail();
-    } catch (NullPointerException e) {
-      // We expect this exception.
-    }
-    try {
-      builder.setRepeatedNestedMessage(1, (TestAllTypes.NestedMessage.Builder) null);
-      assertWithMessage("Exception was not thrown").fail();
-    } catch (NullPointerException e) {
-      // We expect this exception.
-    }
-
-    builder.addRepeatedNestedEnum(TestAllTypes.NestedEnum.FOO);
-    builder.addRepeatedNestedEnum(TestAllTypes.NestedEnum.BAR);
-    try {
-      builder.setRepeatedNestedEnum(1, null);
-      assertWithMessage("Exception was not thrown").fail();
-    } catch (NullPointerException e) {
-      // We expect this exception.
-    }
-  }
-
-  @Test
-  public void testRepeatedAppend() throws Exception {
-    TestAllTypes.Builder builder = TestAllTypes.newBuilder();
-
-    builder.addAllRepeatedInt32(Arrays.asList(1, 2, 3, 4));
-    builder.addAllRepeatedForeignEnum(Arrays.asList(ForeignEnum.FOREIGN_BAZ));
-
-    ForeignMessage foreignMessage = ForeignMessage.newBuilder().setC(12).build();
-    builder.addAllRepeatedForeignMessage(Arrays.asList(foreignMessage));
-
-    TestAllTypes message = builder.build();
-    assertThat(Arrays.asList(1, 2, 3, 4)).isEqualTo(message.getRepeatedInt32List());
-    assertThat(Arrays.asList(ForeignEnum.FOREIGN_BAZ))
-        .isEqualTo(message.getRepeatedForeignEnumList());
-    assertThat(message.getRepeatedForeignMessageCount()).isEqualTo(1);
-    assertThat(message.getRepeatedForeignMessage(0).getC()).isEqualTo(12);
-  }
-
-  @Test
-  public void testRepeatedAppendRejectsNull() throws Exception {
-    TestAllTypes.Builder builder = TestAllTypes.newBuilder();
-
-    ForeignMessage foreignMessage = ForeignMessage.newBuilder().setC(12).build();
-    try {
-      builder.addAllRepeatedForeignMessage(Arrays.asList(foreignMessage, (ForeignMessage) null));
-      assertWithMessage("Exception was not thrown").fail();
-    } catch (NullPointerException e) {
-      // We expect this exception.
-    }
-
-    try {
-      builder.addAllRepeatedForeignEnum(Arrays.asList(ForeignEnum.FOREIGN_BAZ, null));
-      assertWithMessage("Exception was not thrown").fail();
-    } catch (NullPointerException e) {
-      // We expect this exception.
-    }
-
-    try {
-      builder.addAllRepeatedString(Arrays.asList("one", null));
-      assertWithMessage("Exception was not thrown").fail();
-    } catch (NullPointerException e) {
-      // We expect this exception.
-    }
-
-    try {
-      builder.addAllRepeatedBytes(Arrays.asList(TestUtil.toBytes("one"), null));
-      assertWithMessage("Exception was not thrown").fail();
-    } catch (NullPointerException e) {
-      // We expect this exception.
-    }
-  }
-
-  @Test
-  public void testRepeatedAppendIterateOnlyOnce() throws Exception {
-    // Create a Iterable that can only be iterated once.
-    Iterable<String> stringIterable =
-        new Iterable<String>() {
-          private boolean called = false;
-
-          @Override
-          public Iterator<String> iterator() {
-            if (called) {
-              throw new IllegalStateException();
-            }
-            called = true;
-            return Arrays.asList("one", "two", "three").iterator();
-          }
-        };
-    TestAllTypes.Builder builder = TestAllTypes.newBuilder();
-    builder.addAllRepeatedString(stringIterable);
-    assertThat(builder.getRepeatedStringCount()).isEqualTo(3);
-    assertThat(builder.getRepeatedString(0)).isEqualTo("one");
-    assertThat(builder.getRepeatedString(1)).isEqualTo("two");
-    assertThat(builder.getRepeatedString(2)).isEqualTo("three");
-
-    try {
-      builder.addAllRepeatedString(stringIterable);
-      assertWithMessage("Exception was not thrown").fail();
-    } catch (IllegalStateException e) {
-      // We expect this exception.
-    }
-  }
-
-  @Test
-  public void testMergeFromOtherRejectsNull() throws Exception {
-    try {
-      TestAllTypes.Builder builder = TestAllTypes.newBuilder();
-      builder.mergeFrom((TestAllTypes) null);
-      assertWithMessage("Exception was not thrown").fail();
-    } catch (NullPointerException e) {
-      // We expect this exception.
-    }
-  }
-
-  @Test
-  public void testSettingForeignMessageUsingBuilder() throws Exception {
-    TestAllTypes message =
-        TestAllTypes.newBuilder()
-            // Pass builder for foreign message instance.
-            .setOptionalForeignMessage(ForeignMessage.newBuilder().setC(123))
-            .build();
-    TestAllTypes expectedMessage =
-        TestAllTypes.newBuilder()
-            // Create expected version passing foreign message instance explicitly.
-            .setOptionalForeignMessage(ForeignMessage.newBuilder().setC(123).build())
-            .build();
-    // TODO(ngd): Upgrade to using real #equals method once implemented
-    assertThat(message.toString()).isEqualTo(expectedMessage.toString());
-  }
-
-  @Test
-  public void testSettingRepeatedForeignMessageUsingBuilder() throws Exception {
-    TestAllTypes message =
-        TestAllTypes.newBuilder()
-            // Pass builder for foreign message instance.
-            .addRepeatedForeignMessage(ForeignMessage.newBuilder().setC(456))
-            .build();
-    TestAllTypes expectedMessage =
-        TestAllTypes.newBuilder()
-            // Create expected version passing foreign message instance explicitly.
-            .addRepeatedForeignMessage(ForeignMessage.newBuilder().setC(456).build())
-            .build();
-    assertThat(message.toString()).isEqualTo(expectedMessage.toString());
-  }
-
-  @Test
-  public void testDefaults() throws Exception {
-    TestUtil.assertClear(TestAllTypes.getDefaultInstance());
-    TestUtil.assertClear(TestAllTypes.newBuilder().build());
-
-    TestExtremeDefaultValues message = TestExtremeDefaultValues.getDefaultInstance();
-    assertThat(message.getUtf8String()).isEqualTo("\u1234");
-    assertThat(message.getInfDouble()).isEqualTo(Double.POSITIVE_INFINITY);
-    assertThat(message.getNegInfDouble()).isEqualTo(Double.NEGATIVE_INFINITY);
-    assertThat(Double.isNaN(message.getNanDouble())).isTrue();
-    assertThat(message.getInfFloat()).isEqualTo(Float.POSITIVE_INFINITY);
-    assertThat(message.getNegInfFloat()).isEqualTo(Float.NEGATIVE_INFINITY);
-    assertThat(Float.isNaN(message.getNanFloat())).isTrue();
-    assertThat(message.getCppTrigraph()).isEqualTo("? ? ?? ?? ??? ??/ ??-");
-  }
-
-  @Test
-  public void testClear() throws Exception {
-    TestAllTypes.Builder builder = TestAllTypes.newBuilder();
-    TestUtil.assertClear(builder);
-    TestUtil.setAllFields(builder);
-    builder.clear();
-    TestUtil.assertClear(builder);
-  }
-
-  @Test
-  public void testReflectionGetters() throws Exception {
-    TestAllTypes.Builder builder = TestAllTypes.newBuilder();
-    TestUtil.setAllFields(builder);
-    reflectionTester.assertAllFieldsSetViaReflection(builder);
-
-    TestAllTypes message = builder.build();
-    reflectionTester.assertAllFieldsSetViaReflection(message);
-  }
-
-  @Test
-  public void testReflectionSetters() throws Exception {
-    TestAllTypes.Builder builder = TestAllTypes.newBuilder();
-    reflectionTester.setAllFieldsViaReflection(builder);
-    TestUtil.assertAllFieldsSet(builder);
-
-    TestAllTypes message = builder.build();
-    TestUtil.assertAllFieldsSet(message);
-  }
-
-  @Test
-  public void testReflectionSettersRejectNull() throws Exception {
-    TestAllTypes.Builder builder = TestAllTypes.newBuilder();
-    reflectionTester.assertReflectionSettersRejectNull(builder);
-  }
-
-  @Test
-  public void testReflectionRepeatedSetters() throws Exception {
-    TestAllTypes.Builder builder = TestAllTypes.newBuilder();
-    reflectionTester.setAllFieldsViaReflection(builder);
-    reflectionTester.modifyRepeatedFieldsViaReflection(builder);
-    TestUtil.assertRepeatedFieldsModified(builder);
-
-    TestAllTypes message = builder.build();
-    TestUtil.assertRepeatedFieldsModified(message);
-  }
-
-  @Test
-  public void testReflectionRepeatedSettersRejectNull() throws Exception {
-    TestAllTypes.Builder builder = TestAllTypes.newBuilder();
-    reflectionTester.assertReflectionRepeatedSettersRejectNull(builder);
-  }
-
-  @Test
-  public void testReflectionDefaults() throws Exception {
-    reflectionTester.assertClearViaReflection(TestAllTypes.getDefaultInstance());
-    reflectionTester.assertClearViaReflection(TestAllTypes.newBuilder().build());
-  }
-
-  @Test
-  public void testReflectionGetOneof() throws Exception {
-    TestAllTypes.Builder builder = TestAllTypes.newBuilder();
-    reflectionTester.setAllFieldsViaReflection(builder);
-    Descriptors.OneofDescriptor oneof = TestAllTypes.getDescriptor().getOneofs().get(0);
-    Descriptors.FieldDescriptor field = TestAllTypes.getDescriptor().findFieldByName("oneof_bytes");
-    assertThat(field).isSameInstanceAs(builder.getOneofFieldDescriptor(oneof));
-
-    TestAllTypes message = builder.build();
-    assertThat(field).isSameInstanceAs(message.getOneofFieldDescriptor(oneof));
-  }
-
-  @Test
-  public void testReflectionClearOneof() throws Exception {
-    TestAllTypes.Builder builder = TestAllTypes.newBuilder();
-    reflectionTester.setAllFieldsViaReflection(builder);
-    Descriptors.OneofDescriptor oneof = TestAllTypes.getDescriptor().getOneofs().get(0);
-    Descriptors.FieldDescriptor field = TestAllTypes.getDescriptor().findFieldByName("oneof_bytes");
-
-    assertThat(builder.hasOneof(oneof)).isTrue();
-    assertThat(builder.hasField(field)).isTrue();
-    builder.clearOneof(oneof);
-    assertThat(builder.hasOneof(oneof)).isFalse();
-    assertThat(builder.hasField(field)).isFalse();
-  }
-
-  @Test
-  public void testEnumInterface() throws Exception {
-    assertThat(TestAllTypes.getDefaultInstance().getDefaultNestedEnum())
-        .isInstanceOf(ProtocolMessageEnum.class);
-  }
-
-  @Test
-  public void testEnumMap() throws Exception {
-    Internal.EnumLiteMap<ForeignEnum> map = ForeignEnum.internalGetValueMap();
-
-    for (ForeignEnum value : ForeignEnum.values()) {
-      assertThat(map.findValueByNumber(value.getNumber())).isEqualTo(value);
-    }
-
-    assertThat(map.findValueByNumber(12345) == null).isTrue();
-  }
-
-  @Test
-  public void testParsePackedToUnpacked() throws Exception {
-    TestUnpackedTypes.Builder builder = TestUnpackedTypes.newBuilder();
-    TestUnpackedTypes message = builder.mergeFrom(TestUtil.getPackedSet().toByteString()).build();
-    TestUtil.assertUnpackedFieldsSet(message);
-  }
-
-  @Test
-  public void testParseUnpackedToPacked() throws Exception {
-    TestPackedTypes.Builder builder = TestPackedTypes.newBuilder();
-    TestPackedTypes message = builder.mergeFrom(TestUtil.getUnpackedSet().toByteString()).build();
-    TestUtil.assertPackedFieldsSet(message);
-  }
-
-  // =================================================================
-  // Extensions.
-
-  TestUtil.ReflectionTester extensionsReflectionTester =
-      new TestUtil.ReflectionTester(
-          TestAllExtensions.getDescriptor(), TestUtil.getFullExtensionRegistry());
-
-  @Test
-  public void testExtensionMessageOrBuilder() throws Exception {
-    TestAllExtensions.Builder builder = TestAllExtensions.newBuilder();
-    TestUtil.setAllExtensions(builder);
-    TestAllExtensions message = builder.build();
-    TestUtil.assertAllExtensionsSet(message);
-  }
-
-  @Test
-  public void testGetBuilderForExtensionField() {
-    TestAllExtensions.Builder builder = TestAllExtensions.newBuilder();
-    Message.Builder fieldBuilder =
-        builder.newBuilderForField(UnittestProto.optionalNestedMessageExtension.getDescriptor());
-    final int expected = 7432;
-    FieldDescriptor field =
-        NestedMessage.getDescriptor().findFieldByNumber(NestedMessage.BB_FIELD_NUMBER);
-    fieldBuilder.setField(field, expected);
-    assertThat(fieldBuilder.build().getField(field)).isEqualTo(expected);
-  }
-
-
-  @Test
-  public void testGetBuilderForNonMessageExtensionField() {
-    TestAllExtensions.Builder builder = TestAllExtensions.newBuilder();
-    try {
-      // This should throw an exception because the extension field is not a message.
-      builder.newBuilderForField(UnittestProto.optionalInt32Extension.getDescriptor());
-      assertWithMessage("Exception was not thrown").fail();
-    } catch (UnsupportedOperationException e) {
-      // This exception is expected.
-    }
-  }
-
-  @Test
-  public void testExtensionRepeatedSetters() throws Exception {
-    TestAllExtensions.Builder builder = TestAllExtensions.newBuilder();
-    TestUtil.setAllExtensions(builder);
-    TestUtil.modifyRepeatedExtensions(builder);
-    TestAllExtensions message = builder.build();
-    TestUtil.assertRepeatedExtensionsModified(message);
-  }
-
-  @Test
-  public void testExtensionDefaults() throws Exception {
-    TestUtil.assertExtensionsClear(TestAllExtensions.getDefaultInstance());
-    TestUtil.assertExtensionsClear(TestAllExtensions.newBuilder().build());
-  }
-
-  @Test
-  public void testUnsetRepeatedExtensionGetField() {
-    TestAllExtensions message = TestAllExtensions.getDefaultInstance();
-    Object value;
-
-    value = message.getField(UnittestProto.repeatedStringExtension.getDescriptor());
-    assertThat(value instanceof List).isTrue();
-    assertThat(((List<?>) value).isEmpty()).isTrue();
-    assertIsUnmodifiable((List<?>) value);
-
-    value = message.getField(UnittestProto.repeatedNestedMessageExtension.getDescriptor());
-    assertThat(value instanceof List).isTrue();
-    assertThat(((List<?>) value).isEmpty()).isTrue();
-    assertIsUnmodifiable((List<?>) value);
-  }
-
-  @Test
-  public void testExtensionReflectionGetters() throws Exception {
-    TestAllExtensions.Builder builder = TestAllExtensions.newBuilder();
-    TestUtil.setAllExtensions(builder);
-    extensionsReflectionTester.assertAllFieldsSetViaReflection(builder);
-
-    TestAllExtensions message = builder.build();
-    extensionsReflectionTester.assertAllFieldsSetViaReflection(message);
-  }
-
-  @Test
-  public void testExtensionReflectionSetters() throws Exception {
-    TestAllExtensions.Builder builder = TestAllExtensions.newBuilder();
-    extensionsReflectionTester.setAllFieldsViaReflection(builder);
-    TestUtil.assertAllExtensionsSet(builder);
-
-    TestAllExtensions message = builder.build();
-    TestUtil.assertAllExtensionsSet(message);
-  }
-
-  @Test
-  public void testExtensionReflectionSettersRejectNull() throws Exception {
-    TestAllExtensions.Builder builder = TestAllExtensions.newBuilder();
-    extensionsReflectionTester.assertReflectionSettersRejectNull(builder);
-  }
-
-  @Test
-  public void testExtensionReflectionRepeatedSetters() throws Exception {
-    TestAllExtensions.Builder builder = TestAllExtensions.newBuilder();
-    extensionsReflectionTester.setAllFieldsViaReflection(builder);
-    extensionsReflectionTester.modifyRepeatedFieldsViaReflection(builder);
-    TestUtil.assertRepeatedExtensionsModified(builder);
-
-    TestAllExtensions message = builder.build();
-    TestUtil.assertRepeatedExtensionsModified(message);
-  }
-
-  @Test
-  public void testExtensionReflectionRepeatedSettersRejectNull() throws Exception {
-    TestAllExtensions.Builder builder = TestAllExtensions.newBuilder();
-    extensionsReflectionTester.assertReflectionRepeatedSettersRejectNull(builder);
-  }
-
-  @Test
-  public void testExtensionReflectionDefaults() throws Exception {
-    extensionsReflectionTester.assertClearViaReflection(TestAllExtensions.getDefaultInstance());
-    extensionsReflectionTester.assertClearViaReflection(TestAllExtensions.newBuilder().build());
-  }
-
-  @Test
-  public void testClearExtension() throws Exception {
-    // clearExtension() is not actually used in TestUtil, so try it manually.
-    assertThat(
-            TestAllExtensions.newBuilder()
-                .setExtension(UnittestProto.optionalInt32Extension, 1)
-                .clearExtension(UnittestProto.optionalInt32Extension)
-                .hasExtension(UnittestProto.optionalInt32Extension))
-        .isFalse();
-    assertThat(
-            TestAllExtensions.newBuilder()
-                .addExtension(UnittestProto.repeatedInt32Extension, 1)
-                .clearExtension(UnittestProto.repeatedInt32Extension)
-                .getExtensionCount(UnittestProto.repeatedInt32Extension))
-        .isEqualTo(0);
-  }
-
-  @Test
-  public void testExtensionCopy() throws Exception {
-    TestAllExtensions original = TestUtil.getAllExtensionsSet();
-    TestAllExtensions copy = TestAllExtensions.newBuilder(original).build();
-    TestUtil.assertAllExtensionsSet(copy);
-  }
-
-  @Test
-  public void testExtensionMergeFrom() throws Exception {
-    TestAllExtensions original =
-        TestAllExtensions.newBuilder()
-            .setExtension(UnittestProto.optionalInt32Extension, 1)
-            .build();
-    TestAllExtensions merged = TestAllExtensions.newBuilder().mergeFrom(original).build();
-    assertThat(merged.hasExtension(UnittestProto.optionalInt32Extension)).isTrue();
-    assertThat((int) merged.getExtension(UnittestProto.optionalInt32Extension)).isEqualTo(1);
-  }
-
-  // =================================================================
-  // multiple_files_test
-
-  // Test that custom options of an file level enum are properly initialized.
-  // This test needs to be put before any other access to MultipleFilesTestProto
-  // or messages defined in multiple_files_test.proto because the class loading
-  // order affects initialization process of custom options.
-  @Test
-  public void testEnumValueOptionsInMultipleFilesMode() throws Exception {
-    assertThat(
-            EnumWithNoOuter.FOO
-                .getValueDescriptor()
-                .getOptions()
-                .getExtension(MultipleFilesTestProto.enumValueOption)
-                .intValue())
-        .isEqualTo(12345);
-  }
-
-  @Test
-  public void testMultipleFilesOption() throws Exception {
-    // We mostly just want to check that things compile.
-    MessageWithNoOuter message =
-        MessageWithNoOuter.newBuilder()
-            .setNested(MessageWithNoOuter.NestedMessage.newBuilder().setI(1))
-            .addForeign(TestAllTypes.newBuilder().setOptionalInt32(1))
-            .setNestedEnum(MessageWithNoOuter.NestedEnum.BAZ)
-            .setForeignEnum(EnumWithNoOuter.BAR)
-            .build();
-    assertThat(MessageWithNoOuter.parseFrom(message.toByteString())).isEqualTo(message);
-
-    assertThat(MessageWithNoOuter.getDescriptor().getFile())
-        .isEqualTo(MultipleFilesTestProto.getDescriptor());
-
-    Descriptors.FieldDescriptor field =
-        MessageWithNoOuter.getDescriptor().findFieldByName("foreign_enum");
-    assertThat(message.getField(field)).isEqualTo(EnumWithNoOuter.BAR.getValueDescriptor());
-
-    assertThat(ServiceWithNoOuter.getDescriptor().getFile())
-        .isEqualTo(MultipleFilesTestProto.getDescriptor());
-
-    assertThat(
-            TestAllExtensions.getDefaultInstance()
-                .hasExtension(MultipleFilesTestProto.extensionWithOuter))
-        .isFalse();
-  }
-
-  @Test
-  public void testOptionalFieldWithRequiredSubfieldsOptimizedForSize() throws Exception {
-    TestOptionalOptimizedForSize message = TestOptionalOptimizedForSize.getDefaultInstance();
-    assertThat(message.isInitialized()).isTrue();
-
-    message =
-        TestOptionalOptimizedForSize.newBuilder()
-            .setO(TestRequiredOptimizedForSize.newBuilder().buildPartial())
-            .buildPartial();
-    assertThat(message.isInitialized()).isFalse();
-
-    message =
-        TestOptionalOptimizedForSize.newBuilder()
-            .setO(TestRequiredOptimizedForSize.newBuilder().setX(5).buildPartial())
-            .buildPartial();
-    assertThat(message.isInitialized()).isTrue();
-  }
-
-  @Test
-  public void testUninitializedExtensionInOptimizedForSize() throws Exception {
-    TestOptimizedForSize.Builder builder = TestOptimizedForSize.newBuilder();
-    builder.setExtension(
-        TestOptimizedForSize.testExtension2,
-        TestRequiredOptimizedForSize.newBuilder().buildPartial());
-    assertThat(builder.isInitialized()).isFalse();
-    assertThat(builder.buildPartial().isInitialized()).isFalse();
-
-    builder = TestOptimizedForSize.newBuilder();
-    builder.setExtension(
-        TestOptimizedForSize.testExtension2,
-        TestRequiredOptimizedForSize.newBuilder().setX(10).buildPartial());
-    assertThat(builder.isInitialized()).isTrue();
-    assertThat(builder.buildPartial().isInitialized()).isTrue();
-  }
-
-  @Test
-  public void testToBuilder() throws Exception {
-    TestAllTypes.Builder builder = TestAllTypes.newBuilder();
-    TestUtil.setAllFields(builder);
-    TestAllTypes message = builder.build();
-    TestUtil.assertAllFieldsSet(message);
-    TestUtil.assertAllFieldsSet(message.toBuilder().build());
-  }
-
-  @Test
-  public void testFieldConstantValues() throws Exception {
-    assertThat(TestAllTypes.NestedMessage.BB_FIELD_NUMBER).isEqualTo(1);
-    assertThat(TestAllTypes.OPTIONAL_INT32_FIELD_NUMBER).isEqualTo(1);
-    assertThat(TestAllTypes.OPTIONALGROUP_FIELD_NUMBER).isEqualTo(16);
-    assertThat(TestAllTypes.OPTIONAL_NESTED_MESSAGE_FIELD_NUMBER).isEqualTo(18);
-    assertThat(TestAllTypes.OPTIONAL_NESTED_ENUM_FIELD_NUMBER).isEqualTo(21);
-    assertThat(TestAllTypes.REPEATED_INT32_FIELD_NUMBER).isEqualTo(31);
-    assertThat(TestAllTypes.REPEATEDGROUP_FIELD_NUMBER).isEqualTo(46);
-    assertThat(TestAllTypes.REPEATED_NESTED_MESSAGE_FIELD_NUMBER).isEqualTo(48);
-    assertThat(TestAllTypes.REPEATED_NESTED_ENUM_FIELD_NUMBER).isEqualTo(51);
-  }
-
-  @Test
-  public void testExtensionConstantValues() throws Exception {
-    assertThat(UnittestProto.TestRequired.SINGLE_FIELD_NUMBER).isEqualTo(1000);
-    assertThat(UnittestProto.TestRequired.MULTI_FIELD_NUMBER).isEqualTo(1001);
-    assertThat(UnittestProto.OPTIONAL_INT32_EXTENSION_FIELD_NUMBER).isEqualTo(1);
-    assertThat(UnittestProto.OPTIONALGROUP_EXTENSION_FIELD_NUMBER).isEqualTo(16);
-    assertThat(UnittestProto.OPTIONAL_NESTED_MESSAGE_EXTENSION_FIELD_NUMBER).isEqualTo(18);
-    assertThat(UnittestProto.OPTIONAL_NESTED_ENUM_EXTENSION_FIELD_NUMBER).isEqualTo(21);
-    assertThat(UnittestProto.REPEATED_INT32_EXTENSION_FIELD_NUMBER).isEqualTo(31);
-    assertThat(UnittestProto.REPEATEDGROUP_EXTENSION_FIELD_NUMBER).isEqualTo(46);
-    assertThat(UnittestProto.REPEATED_NESTED_MESSAGE_EXTENSION_FIELD_NUMBER).isEqualTo(48);
-    assertThat(UnittestProto.REPEATED_NESTED_ENUM_EXTENSION_FIELD_NUMBER).isEqualTo(51);
-  }
-
-  @Test
-  public void testRecursiveMessageDefaultInstance() throws Exception {
-    UnittestProto.TestRecursiveMessage message =
-        UnittestProto.TestRecursiveMessage.getDefaultInstance();
-    assertThat(message).isNotNull();
-    assertThat(message.getA()).isEqualTo(message);
-  }
-
-  @Test
-  public void testSerialize() throws Exception {
-    ByteArrayOutputStream baos = new ByteArrayOutputStream();
-    TestAllTypes.Builder builder = TestAllTypes.newBuilder();
-    TestUtil.setAllFields(builder);
-    TestAllTypes expected = builder.build();
-    try (ObjectOutputStream out = new ObjectOutputStream(baos)) {
-      out.writeObject(expected);
-    }
-    ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
-    ObjectInputStream in = new ObjectInputStream(bais);
-    TestAllTypes actual = (TestAllTypes) in.readObject();
-    assertThat(actual).isEqualTo(expected);
-  }
-
-  @Test
-  public void testSerializePartial() throws Exception {
-    ByteArrayOutputStream baos = new ByteArrayOutputStream();
-    TestAllTypes.Builder builder = TestAllTypes.newBuilder();
-    TestAllTypes expected = builder.buildPartial();
-    ObjectOutputStream out = new ObjectOutputStream(baos);
-    try {
-      out.writeObject(expected);
-    } finally {
-      out.close();
-    }
-    ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
-    ObjectInputStream in = new ObjectInputStream(bais);
-    TestAllTypes actual = (TestAllTypes) in.readObject();
-    assertThat(actual).isEqualTo(expected);
-  }
-
-  @Test
-  public void testDeserializeWithoutClassField() throws Exception {
-    // serialized form for version <=3.6.0
-    // just includes messageClassName and asBytes
-
-    // Int32Value.newBuilder().setValue(123).build()
-    byte[] int32ValueBytes =
-        new byte[] {
-          -84, -19, 0, 5, 115, 114, 0, 55, 99, 111, 109, 46, 103, 111, 111, 103, 108, 101, 46, 112,
-          114, 111, 116, 111, 98, 117, 102, 46, 71, 101, 110, 101, 114, 97, 116, 101, 100, 77, 101,
-          115, 115, 97, 103, 101, 76, 105, 116, 101, 36, 83, 101, 114, 105, 97, 108, 105, 122, 101,
-          100, 70, 111, 114, 109, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 2, 91, 0, 7, 97, 115, 66, 121, 116,
-          101, 115, 116, 0, 2, 91, 66, 76, 0, 16, 109, 101, 115, 115, 97, 103, 101, 67, 108, 97,
-          115, 115, 78, 97, 109, 101, 116, 0, 18, 76, 106, 97, 118, 97, 47, 108, 97, 110, 103, 47,
-          83, 116, 114, 105, 110, 103, 59, 120, 112, 117, 114, 0, 2, 91, 66, -84, -13, 23, -8, 6, 8,
-          84, -32, 2, 0, 0, 120, 112, 0, 0, 0, 2, 8, 123, 116, 0, 30, 99, 111, 109, 46, 103, 111,
-          111, 103, 108, 101, 46, 112, 114, 111, 116, 111, 98, 117, 102, 46, 73, 110, 116, 51, 50,
-          86, 97, 108, 117, 101
-        };
-
-    ByteArrayInputStream bais = new ByteArrayInputStream(int32ValueBytes);
-    ObjectInputStream in = new ObjectInputStream(bais);
-    Int32Value int32Value = (Int32Value) in.readObject();
-    assertThat(int32Value.getValue()).isEqualTo(123);
-  }
-
-  @Test
-  public void testDeserializeWithClassField() throws Exception {
-    // serialized form for version > 3.6.0
-    // includes messageClass, messageClassName (for compatibility), and asBytes
-
-    // Int32Value.newBuilder().setValue(123).build()
-    byte[] int32ValueBytes =
-        new byte[] {
-          -84, -19, 0, 5, 115, 114, 0, 55, 99, 111, 109, 46, 103, 111, 111, 103, 108, 101, 46, 112,
-          114, 111, 116, 111, 98, 117, 102, 46, 71, 101, 110, 101, 114, 97, 116, 101, 100, 77, 101,
-          115, 115, 97, 103, 101, 76, 105, 116, 101, 36, 83, 101, 114, 105, 97, 108, 105, 122, 101,
-          100, 70, 111, 114, 109, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 3, 91, 0, 7, 97, 115, 66, 121, 116,
-          101, 115, 116, 0, 2, 91, 66, 76, 0, 12, 109, 101, 115, 115, 97, 103, 101, 67, 108, 97,
-          115, 115, 116, 0, 17, 76, 106, 97, 118, 97, 47, 108, 97, 110, 103, 47, 67, 108, 97, 115,
-          115, 59, 76, 0, 16, 109, 101, 115, 115, 97, 103, 101, 67, 108, 97, 115, 115, 78, 97, 109,
-          101, 116, 0, 18, 76, 106, 97, 118, 97, 47, 108, 97, 110, 103, 47, 83, 116, 114, 105, 110,
-          103, 59, 120, 112, 117, 114, 0, 2, 91, 66, -84, -13, 23, -8, 6, 8, 84, -32, 2, 0, 0, 120,
-          112, 0, 0, 0, 2, 8, 123, 118, 114, 0, 30, 99, 111, 109, 46, 103, 111, 111, 103, 108, 101,
-          46, 112, 114, 111, 116, 111, 98, 117, 102, 46, 73, 110, 116, 51, 50, 86, 97, 108, 117,
-          101, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 2, 66, 0, 21, 109, 101, 109, 111, 105, 122, 101, 100,
-          73, 115, 73, 110, 105, 116, 105, 97, 108, 105, 122, 101, 100, 73, 0, 6, 118, 97, 108, 117,
-          101, 95, 120, 114, 0, 38, 99, 111, 109, 46, 103, 111, 111, 103, 108, 101, 46, 112, 114,
-          111, 116, 111, 98, 117, 102, 46, 71, 101, 110, 101, 114, 97, 116, 101, 100, 77, 101, 115,
-          115, 97, 103, 101, 86, 51, 0, 0, 0, 0, 0, 0, 0, 1, 2, 0, 1, 76, 0, 13, 117, 110, 107, 110,
-          111, 119, 110, 70, 105, 101, 108, 100, 115, 116, 0, 37, 76, 99, 111, 109, 47, 103, 111,
-          111, 103, 108, 101, 47, 112, 114, 111, 116, 111, 98, 117, 102, 47, 85, 110, 107, 110, 111,
-          119, 110, 70, 105, 101, 108, 100, 83, 101, 116, 59, 120, 112, 116, 0, 30, 99, 111, 109,
-          46, 103, 111, 111, 103, 108, 101, 46, 112, 114, 111, 116, 111, 98, 117, 102, 46, 73, 110,
-          116, 51, 50, 86, 97, 108, 117, 101
-        };
-
-    ByteArrayInputStream bais = new ByteArrayInputStream(int32ValueBytes);
-    ObjectInputStream in = new ObjectInputStream(bais);
-    Int32Value int32Value = (Int32Value) in.readObject();
-    assertThat(int32Value.getValue()).isEqualTo(123);
-  }
-
-  @Test
-  public void testEnumValues() {
-    assertThat(TestAllTypes.NestedEnum.BAR.getNumber())
-        .isEqualTo(TestAllTypes.NestedEnum.BAR_VALUE);
-    assertThat(TestAllTypes.NestedEnum.BAZ.getNumber())
-        .isEqualTo(TestAllTypes.NestedEnum.BAZ_VALUE);
-    assertThat(TestAllTypes.NestedEnum.FOO.getNumber())
-        .isEqualTo(TestAllTypes.NestedEnum.FOO_VALUE);
-  }
-
-  @Test
-  public void testNonNestedExtensionInitialization() {
-    assertThat(NonNestedExtension.nonNestedExtension.getMessageDefaultInstance())
-        .isInstanceOf(MyNonNestedExtension.class);
-    assertThat(NonNestedExtension.nonNestedExtension.getDescriptor().getName())
-        .isEqualTo("nonNestedExtension");
-  }
-
-  @Test
-  public void testNestedExtensionInitialization() {
-    assertThat(MyNestedExtension.recursiveExtension.getMessageDefaultInstance())
-        .isInstanceOf(MessageToBeExtended.class);
-    assertThat(MyNestedExtension.recursiveExtension.getDescriptor().getName())
-        .isEqualTo("recursiveExtension");
-  }
-
-  @Test
-  public void testInvalidations() throws Exception {
-    GeneratedMessageV3.setAlwaysUseFieldBuildersForTesting(true);
-    TestAllTypes.NestedMessage nestedMessage1 = TestAllTypes.NestedMessage.newBuilder().build();
-    TestAllTypes.NestedMessage nestedMessage2 = TestAllTypes.NestedMessage.newBuilder().build();
-
-    // Set all three flavors (enum, primitive, message and singular/repeated)
-    // and verify no invalidations fired
-    TestUtil.MockBuilderParent mockParent = new TestUtil.MockBuilderParent();
-
-    TestAllTypes.Builder builder =
-        (TestAllTypes.Builder)
-            ((AbstractMessage) TestAllTypes.getDefaultInstance()).newBuilderForType(mockParent);
-    builder.setOptionalInt32(1);
-    builder.setOptionalNestedEnum(TestAllTypes.NestedEnum.BAR);
-    builder.setOptionalNestedMessage(nestedMessage1);
-    builder.addRepeatedInt32(1);
-    builder.addRepeatedNestedEnum(TestAllTypes.NestedEnum.BAR);
-    builder.addRepeatedNestedMessage(nestedMessage1);
-    assertThat(mockParent.getInvalidationCount()).isEqualTo(0);
-
-    // Now tell it we want changes and make sure it's only fired once
-    // And do this for each flavor
-
-    // primitive single
-    builder.buildPartial();
-    builder.setOptionalInt32(2);
-    builder.setOptionalInt32(3);
-    assertThat(mockParent.getInvalidationCount()).isEqualTo(1);
-
-    // enum single
-    builder.buildPartial();
-    builder.setOptionalNestedEnum(TestAllTypes.NestedEnum.BAZ);
-    builder.setOptionalNestedEnum(TestAllTypes.NestedEnum.BAR);
-    assertThat(mockParent.getInvalidationCount()).isEqualTo(2);
-
-    // message single
-    builder.buildPartial();
-    builder.setOptionalNestedMessage(nestedMessage2);
-    builder.setOptionalNestedMessage(nestedMessage1);
-    assertThat(mockParent.getInvalidationCount()).isEqualTo(3);
-
-    // primitive repeated
-    builder.buildPartial();
-    builder.addRepeatedInt32(2);
-    builder.addRepeatedInt32(3);
-    assertThat(mockParent.getInvalidationCount()).isEqualTo(4);
-
-    // enum repeated
-    builder.buildPartial();
-    builder.addRepeatedNestedEnum(TestAllTypes.NestedEnum.BAZ);
-    builder.addRepeatedNestedEnum(TestAllTypes.NestedEnum.BAZ);
-    assertThat(mockParent.getInvalidationCount()).isEqualTo(5);
-
-    // message repeated
-    builder.buildPartial();
-    builder.addRepeatedNestedMessage(nestedMessage2);
-    builder.addRepeatedNestedMessage(nestedMessage1);
-    assertThat(mockParent.getInvalidationCount()).isEqualTo(6);
-  }
-
-  @Test
-  public void testInvalidations_Extensions() throws Exception {
-    TestUtil.MockBuilderParent mockParent = new TestUtil.MockBuilderParent();
-
-    TestAllExtensions.Builder builder =
-        (TestAllExtensions.Builder)
-            ((AbstractMessage) TestAllExtensions.getDefaultInstance())
-                .newBuilderForType(mockParent);
-
-    builder.addExtension(UnittestProto.repeatedInt32Extension, 1);
-    builder.setExtension(UnittestProto.repeatedInt32Extension, 0, 2);
-    builder.clearExtension(UnittestProto.repeatedInt32Extension);
-    assertThat(mockParent.getInvalidationCount()).isEqualTo(0);
-
-    // Now tell it we want changes and make sure it's only fired once
-    builder.buildPartial();
-    builder.addExtension(UnittestProto.repeatedInt32Extension, 2);
-    builder.addExtension(UnittestProto.repeatedInt32Extension, 3);
-    assertThat(mockParent.getInvalidationCount()).isEqualTo(1);
-
-    builder.buildPartial();
-    builder.setExtension(UnittestProto.repeatedInt32Extension, 0, 4);
-    builder.setExtension(UnittestProto.repeatedInt32Extension, 1, 5);
-    assertThat(mockParent.getInvalidationCount()).isEqualTo(2);
-
-    builder.buildPartial();
-    builder.clearExtension(UnittestProto.repeatedInt32Extension);
-    builder.clearExtension(UnittestProto.repeatedInt32Extension);
-    assertThat(mockParent.getInvalidationCount()).isEqualTo(3);
-  }
-
-  @Test
-  public void testBaseMessageOrBuilder() {
-    // Mostly just makes sure the base interface exists and has some methods.
-    TestAllTypes.Builder builder = TestAllTypes.newBuilder();
-    TestAllTypes message = builder.buildPartial();
-    TestAllTypesOrBuilder messageAsInterface = (TestAllTypesOrBuilder) message;
-
-    assertThat(messageAsInterface.getDefaultBool()).isEqualTo(messageAsInterface.getDefaultBool());
-    assertThat(messageAsInterface.getOptionalDouble())
-        .isEqualTo(messageAsInterface.getOptionalDouble());
-  }
-
-  @Test
-  public void testMessageOrBuilderGetters() {
-    TestAllTypes.Builder builder = TestAllTypes.newBuilder();
-
-    // single fields
-    assertThat(ForeignMessage.getDefaultInstance())
-        .isSameInstanceAs(builder.getOptionalForeignMessageOrBuilder());
-    ForeignMessage.Builder subBuilder = builder.getOptionalForeignMessageBuilder();
-    assertThat(subBuilder).isSameInstanceAs(builder.getOptionalForeignMessageOrBuilder());
-
-    // repeated fields
-    ForeignMessage m0 = ForeignMessage.newBuilder().buildPartial();
-    ForeignMessage m1 = ForeignMessage.newBuilder().buildPartial();
-    ForeignMessage m2 = ForeignMessage.newBuilder().buildPartial();
-    builder.addRepeatedForeignMessage(m0);
-    builder.addRepeatedForeignMessage(m1);
-    builder.addRepeatedForeignMessage(m2);
-    assertThat(m0).isSameInstanceAs(builder.getRepeatedForeignMessageOrBuilder(0));
-    assertThat(m1).isSameInstanceAs(builder.getRepeatedForeignMessageOrBuilder(1));
-    assertThat(m2).isSameInstanceAs(builder.getRepeatedForeignMessageOrBuilder(2));
-    ForeignMessage.Builder b0 = builder.getRepeatedForeignMessageBuilder(0);
-    ForeignMessage.Builder b1 = builder.getRepeatedForeignMessageBuilder(1);
-    assertThat(b0).isSameInstanceAs(builder.getRepeatedForeignMessageOrBuilder(0));
-    assertThat(b1).isSameInstanceAs(builder.getRepeatedForeignMessageOrBuilder(1));
-    assertThat(m2).isSameInstanceAs(builder.getRepeatedForeignMessageOrBuilder(2));
-
-    List<? extends ForeignMessageOrBuilder> messageOrBuilderList =
-        builder.getRepeatedForeignMessageOrBuilderList();
-    assertThat(b0).isSameInstanceAs(messageOrBuilderList.get(0));
-    assertThat(b1).isSameInstanceAs(messageOrBuilderList.get(1));
-    assertThat(m2).isSameInstanceAs(messageOrBuilderList.get(2));
-  }
-
-  @Test
-  public void testGetFieldBuilder() {
-    Descriptor descriptor = TestAllTypes.getDescriptor();
-
-    FieldDescriptor fieldDescriptor = descriptor.findFieldByName("optional_nested_message");
-    FieldDescriptor foreignFieldDescriptor = descriptor.findFieldByName("optional_foreign_message");
-    FieldDescriptor importFieldDescriptor = descriptor.findFieldByName("optional_import_message");
-
-    // Mutate the message with new field builder
-    // Mutate nested message
-    TestAllTypes.Builder builder1 = TestAllTypes.newBuilder();
-    Message.Builder fieldBuilder1 =
-        builder1
-            .newBuilderForField(fieldDescriptor)
-            .mergeFrom((Message) builder1.getField(fieldDescriptor));
-    fieldBuilder1.setField(NESTED_MESSAGE_BB_FIELD, 1);
-    builder1.setField(fieldDescriptor, fieldBuilder1.build());
-
-    // Mutate foreign message
-    Message.Builder foreignFieldBuilder1 =
-        builder1
-            .newBuilderForField(foreignFieldDescriptor)
-            .mergeFrom((Message) builder1.getField(foreignFieldDescriptor));
-    FieldDescriptor subForeignFieldDescriptor1 =
-        foreignFieldBuilder1.getDescriptorForType().findFieldByName("c");
-    foreignFieldBuilder1.setField(subForeignFieldDescriptor1, 2);
-    builder1.setField(foreignFieldDescriptor, foreignFieldBuilder1.build());
-
-    // Mutate import message
-    Message.Builder importFieldBuilder1 =
-        builder1
-            .newBuilderForField(importFieldDescriptor)
-            .mergeFrom((Message) builder1.getField(importFieldDescriptor));
-    FieldDescriptor subImportFieldDescriptor1 =
-        importFieldBuilder1.getDescriptorForType().findFieldByName("d");
-    importFieldBuilder1.setField(subImportFieldDescriptor1, 3);
-    builder1.setField(importFieldDescriptor, importFieldBuilder1.build());
-
-    Message newMessage1 = builder1.build();
-
-    // Mutate the message with existing field builder
-    // Mutate nested message
-    TestAllTypes.Builder builder2 = TestAllTypes.newBuilder();
-    Message.Builder fieldBuilder2 = builder2.getFieldBuilder(fieldDescriptor);
-    fieldBuilder2.setField(NESTED_MESSAGE_BB_FIELD, 1);
-    builder2.setField(fieldDescriptor, fieldBuilder2.build());
-
-    // Mutate foreign message
-    Message.Builder foreignFieldBuilder2 =
-        builder2
-            .newBuilderForField(foreignFieldDescriptor)
-            .mergeFrom((Message) builder2.getField(foreignFieldDescriptor));
-    FieldDescriptor subForeignFieldDescriptor2 =
-        foreignFieldBuilder2.getDescriptorForType().findFieldByName("c");
-    foreignFieldBuilder2.setField(subForeignFieldDescriptor2, 2);
-    builder2.setField(foreignFieldDescriptor, foreignFieldBuilder2.build());
-
-    // Mutate import message
-    Message.Builder importFieldBuilder2 =
-        builder2
-            .newBuilderForField(importFieldDescriptor)
-            .mergeFrom((Message) builder2.getField(importFieldDescriptor));
-    FieldDescriptor subImportFieldDescriptor2 =
-        importFieldBuilder2.getDescriptorForType().findFieldByName("d");
-    importFieldBuilder2.setField(subImportFieldDescriptor2, 3);
-    builder2.setField(importFieldDescriptor, importFieldBuilder2.build());
-
-    Message newMessage2 = builder2.build();
-
-    // These two messages should be equal.
-    assertThat(newMessage1).isEqualTo(newMessage2);
-  }
-
-  @Test
-  public void testGetFieldBuilderWithInitializedValue() {
-    Descriptor descriptor = TestAllTypes.getDescriptor();
-    FieldDescriptor fieldDescriptor = descriptor.findFieldByName("optional_nested_message");
-
-    // Before setting field, builder is initialized by default value.
-    TestAllTypes.Builder builder = TestAllTypes.newBuilder();
-    NestedMessage.Builder fieldBuilder =
-        (NestedMessage.Builder) builder.getFieldBuilder(fieldDescriptor);
-    assertThat(fieldBuilder.getBb()).isEqualTo(0);
-
-    // Setting field value with new field builder instance.
-    builder = TestAllTypes.newBuilder();
-    NestedMessage.Builder newFieldBuilder = builder.getOptionalNestedMessageBuilder();
-    newFieldBuilder.setBb(2);
-    // Then get the field builder instance by getFieldBuilder().
-    fieldBuilder = (NestedMessage.Builder) builder.getFieldBuilder(fieldDescriptor);
-    // It should contain new value.
-    assertThat(fieldBuilder.getBb()).isEqualTo(2);
-    // These two builder should be equal.
-    assertThat(fieldBuilder).isSameInstanceAs(newFieldBuilder);
-  }
-
-  @Test
-  public void testGetFieldBuilderNotSupportedException() {
-    Descriptor descriptor = TestAllTypes.getDescriptor();
-    TestAllTypes.Builder builder = TestAllTypes.newBuilder();
-    try {
-      builder.getFieldBuilder(descriptor.findFieldByName("optional_int32"));
-      assertWithMessage("Exception was not thrown").fail();
-    } catch (UnsupportedOperationException e) {
-      // We expect this exception.
-    }
-    try {
-      builder.getFieldBuilder(descriptor.findFieldByName("optional_nested_enum"));
-      assertWithMessage("Exception was not thrown").fail();
-    } catch (UnsupportedOperationException e) {
-      // We expect this exception.
-    }
-    try {
-      builder.getFieldBuilder(descriptor.findFieldByName("repeated_int32"));
-      assertWithMessage("Exception was not thrown").fail();
-    } catch (UnsupportedOperationException e) {
-      // We expect this exception.
-    }
-    try {
-      builder.getFieldBuilder(descriptor.findFieldByName("repeated_nested_enum"));
-      assertWithMessage("Exception was not thrown").fail();
-    } catch (UnsupportedOperationException e) {
-      // We expect this exception.
-    }
-    try {
-      builder.getFieldBuilder(descriptor.findFieldByName("repeated_nested_message"));
-      assertWithMessage("Exception was not thrown").fail();
-    } catch (UnsupportedOperationException e) {
-      // We expect this exception.
-    }
-  }
-
-  // Test that when the default outer class name conflicts with another type
-  // defined in the proto the compiler will append a suffix to avoid the
-  // conflict.
-  @Test
-  public void testConflictingOuterClassName() {
-    // We just need to make sure we can refer to the outer class with the
-    // expected name. There is nothing else to test.
-    OuterClassNameTestOuterClass.OuterClassNameTest message =
-        OuterClassNameTestOuterClass.OuterClassNameTest.newBuilder().build();
-    assertThat(message.getDescriptorForType())
-        .isSameInstanceAs(OuterClassNameTestOuterClass.OuterClassNameTest.getDescriptor());
-
-    OuterClassNameTest2OuterClass.TestMessage2.NestedMessage.OuterClassNameTest2 message2 =
-        OuterClassNameTest2OuterClass.TestMessage2.NestedMessage.OuterClassNameTest2.newBuilder()
-            .build();
-    assertThat(message2.getSerializedSize()).isEqualTo(0);
-
-    OuterClassNameTest3OuterClass.TestMessage3.NestedMessage.OuterClassNameTest3 enumValue =
-        OuterClassNameTest3OuterClass.TestMessage3.NestedMessage.OuterClassNameTest3.DUMMY_VALUE;
-    assertThat(enumValue.getNumber()).isEqualTo(1);
-  }
-
-  // =================================================================
-  // oneof generated code test
-  @Test
-  public void testOneofEnumCase() throws Exception {
-    TestOneof2 message =
-        TestOneof2.newBuilder().setFooInt(123).setFooString("foo").setFooCord("bar").build();
-    TestUtil.assertAtMostOneFieldSetOneof(message);
-  }
-
-  @Test
-  public void testClearOneof() throws Exception {
-    TestOneof2.Builder builder = TestOneof2.newBuilder().setFooInt(123);
-    assertThat(builder.getFooCase()).isEqualTo(TestOneof2.FooCase.FOO_INT);
-    builder.clearFoo();
-    assertThat(builder.getFooCase()).isEqualTo(TestOneof2.FooCase.FOO_NOT_SET);
-  }
-
-  @Test
-  public void testSetOneofClearsOthers() throws Exception {
-    TestOneof2.Builder builder = TestOneof2.newBuilder();
-    TestOneof2 message = builder.setFooInt(123).setFooString("foo").buildPartial();
-    assertThat(message.hasFooString()).isTrue();
-    TestUtil.assertAtMostOneFieldSetOneof(message);
-
-    message = builder.setFooCord("bar").buildPartial();
-    assertThat(message.hasFooCord()).isTrue();
-    TestUtil.assertAtMostOneFieldSetOneof(message);
-
-    message = builder.setFooStringPiece("baz").buildPartial();
-    assertThat(message.hasFooStringPiece()).isTrue();
-    TestUtil.assertAtMostOneFieldSetOneof(message);
-
-    message = builder.setFooBytes(TestUtil.toBytes("moo")).buildPartial();
-    assertThat(message.hasFooBytes()).isTrue();
-    TestUtil.assertAtMostOneFieldSetOneof(message);
-
-    message = builder.setFooEnum(TestOneof2.NestedEnum.FOO).buildPartial();
-    assertThat(message.hasFooEnum()).isTrue();
-    TestUtil.assertAtMostOneFieldSetOneof(message);
-
-    message =
-        builder
-            .setFooMessage(TestOneof2.NestedMessage.newBuilder().setMooInt(234).build())
-            .buildPartial();
-    assertThat(message.hasFooMessage()).isTrue();
-    TestUtil.assertAtMostOneFieldSetOneof(message);
-
-    message = builder.setFooInt(123).buildPartial();
-    assertThat(message.hasFooInt()).isTrue();
-    TestUtil.assertAtMostOneFieldSetOneof(message);
-  }
-
-  @Test
-  public void testOneofTypes() throws Exception {
-    // Primitive
-    {
-      TestOneof2.Builder builder = TestOneof2.newBuilder();
-      assertThat(builder.getFooInt()).isEqualTo(0);
-      assertThat(builder.hasFooInt()).isFalse();
-      assertThat(builder.setFooInt(123).hasFooInt()).isTrue();
-      assertThat(builder.getFooInt()).isEqualTo(123);
-      TestOneof2 message = builder.buildPartial();
-      assertThat(message.hasFooInt()).isTrue();
-      assertThat(123).isEqualTo(message.getFooInt());
-
-      assertThat(builder.clearFooInt().hasFooInt()).isFalse();
-      TestOneof2 message2 = builder.build();
-      assertThat(message2.hasFooInt()).isFalse();
-      assertThat(message2.getFooInt()).isEqualTo(0);
-    }
-
-    // Enum
-    {
-      TestOneof2.Builder builder = TestOneof2.newBuilder();
-      assertThat(builder.getFooEnum()).isEqualTo(TestOneof2.NestedEnum.FOO);
-      assertThat(builder.setFooEnum(TestOneof2.NestedEnum.BAR).hasFooEnum()).isTrue();
-      assertThat(builder.getFooEnum()).isEqualTo(TestOneof2.NestedEnum.BAR);
-      TestOneof2 message = builder.buildPartial();
-      assertThat(message.hasFooEnum()).isTrue();
-      assertThat(message.getFooEnum()).isEqualTo(TestOneof2.NestedEnum.BAR);
-
-      assertThat(builder.clearFooEnum().hasFooEnum()).isFalse();
-      TestOneof2 message2 = builder.build();
-      assertThat(message2.hasFooEnum()).isFalse();
-      assertThat(message2.getFooEnum()).isEqualTo(TestOneof2.NestedEnum.FOO);
-    }
-
-    // String
-    {
-      TestOneof2.Builder builder = TestOneof2.newBuilder();
-      assertThat(builder.getFooString()).isEmpty();
-      builder.setFooString("foo");
-      assertThat(builder.hasFooString()).isTrue();
-      assertThat(builder.getFooString()).isEqualTo("foo");
-      TestOneof2 message = builder.buildPartial();
-      assertThat(message.hasFooString()).isTrue();
-      assertThat(message.getFooString()).isEqualTo("foo");
-      assertThat(TestUtil.toBytes("foo")).isEqualTo(message.getFooStringBytes());
-
-      assertThat(builder.clearFooString().hasFooString()).isFalse();
-      TestOneof2 message2 = builder.buildPartial();
-      assertThat(message2.hasFooString()).isFalse();
-      assertThat(message2.getFooString()).isEmpty();
-      assertThat(message2.getFooStringBytes()).isEqualTo(TestUtil.toBytes(""));
-
-      // Get method should not change the oneof value.
-      builder.setFooInt(123);
-      assertThat(builder.getFooString()).isEmpty();
-      assertThat(builder.getFooStringBytes()).isEqualTo(TestUtil.toBytes(""));
-      assertThat(builder.getFooInt()).isEqualTo(123);
-
-      message = builder.build();
-      assertThat(message.getFooString()).isEmpty();
-      assertThat(TestUtil.toBytes("")).isEqualTo(message.getFooStringBytes());
-      assertThat(message.getFooInt()).isEqualTo(123);
-    }
-
-    // Cord
-    {
-      TestOneof2.Builder builder = TestOneof2.newBuilder();
-      assertThat(builder.getFooCord()).isEmpty();
-      builder.setFooCord("foo");
-      assertThat(builder.hasFooCord()).isTrue();
-      assertThat(builder.getFooCord()).isEqualTo("foo");
-      TestOneof2 message = builder.buildPartial();
-      assertThat(message.hasFooCord()).isTrue();
-      assertThat(message.getFooCord()).isEqualTo("foo");
-      assertThat(TestUtil.toBytes("foo")).isEqualTo(message.getFooCordBytes());
-
-      assertThat(builder.clearFooCord().hasFooCord()).isFalse();
-      TestOneof2 message2 = builder.build();
-      assertThat(message2.hasFooCord()).isFalse();
-      assertThat(message2.getFooCord()).isEmpty();
-      assertThat(message2.getFooCordBytes()).isEqualTo(TestUtil.toBytes(""));
-    }
-
-    // StringPiece
-    {
-      TestOneof2.Builder builder = TestOneof2.newBuilder();
-      assertThat(builder.getFooStringPiece()).isEmpty();
-      builder.setFooStringPiece("foo");
-      assertThat(builder.hasFooStringPiece()).isTrue();
-      assertThat(builder.getFooStringPiece()).isEqualTo("foo");
-      TestOneof2 message = builder.buildPartial();
-      assertThat(message.hasFooStringPiece()).isTrue();
-      assertThat(message.getFooStringPiece()).isEqualTo("foo");
-      assertThat(TestUtil.toBytes("foo")).isEqualTo(message.getFooStringPieceBytes());
-
-      assertThat(builder.clearFooStringPiece().hasFooStringPiece()).isFalse();
-      TestOneof2 message2 = builder.build();
-      assertThat(message2.hasFooStringPiece()).isFalse();
-      assertThat(message2.getFooStringPiece()).isEmpty();
-      assertThat(message2.getFooStringPieceBytes()).isEqualTo(TestUtil.toBytes(""));
-    }
-
-    // Message
-    {
-      // set
-      TestOneof2.Builder builder = TestOneof2.newBuilder();
-      assertThat(builder.getFooMessage().getMooInt()).isEqualTo(0);
-      builder.setFooMessage(TestOneof2.NestedMessage.newBuilder().setMooInt(234).build());
-      assertThat(builder.hasFooMessage()).isTrue();
-      assertThat(builder.getFooMessage().getMooInt()).isEqualTo(234);
-      TestOneof2 message = builder.buildPartial();
-      assertThat(message.hasFooMessage()).isTrue();
-      assertThat(message.getFooMessage().getMooInt()).isEqualTo(234);
-
-      // clear
-      assertThat(builder.clearFooMessage().hasFooString()).isFalse();
-      message = builder.build();
-      assertThat(message.hasFooMessage()).isFalse();
-      assertThat(message.getFooMessage().getMooInt()).isEqualTo(0);
-
-      // nested builder
-      builder = TestOneof2.newBuilder();
-      assertThat(builder.getFooMessageOrBuilder())
-          .isSameInstanceAs(TestOneof2.NestedMessage.getDefaultInstance());
-      assertThat(builder.hasFooMessage()).isFalse();
-      builder.getFooMessageBuilder().setMooInt(123);
-      assertThat(builder.hasFooMessage()).isTrue();
-      assertThat(builder.getFooMessage().getMooInt()).isEqualTo(123);
-      message = builder.build();
-      assertThat(message.hasFooMessage()).isTrue();
-      assertThat(message.getFooMessage().getMooInt()).isEqualTo(123);
-    }
-
-    // LazyMessage is tested in LazyMessageLiteTest.java
-  }
-
-  @Test
-  public void testOneofMergeNonMessage() throws Exception {
-    // Primitive Type
-    {
-      TestOneof2.Builder builder = TestOneof2.newBuilder();
-      TestOneof2 message = builder.setFooInt(123).build();
-      TestOneof2 message2 = TestOneof2.newBuilder().mergeFrom(message).build();
-      assertThat(message2.hasFooInt()).isTrue();
-      assertThat(message2.getFooInt()).isEqualTo(123);
-    }
-
-    // String
-    {
-      TestOneof2.Builder builder = TestOneof2.newBuilder();
-      TestOneof2 message = builder.setFooString("foo").build();
-      TestOneof2 message2 = TestOneof2.newBuilder().mergeFrom(message).build();
-      assertThat(message2.hasFooString()).isTrue();
-      assertThat(message2.getFooString()).isEqualTo("foo");
-    }
-
-    // Enum
-    {
-      TestOneof2.Builder builder = TestOneof2.newBuilder();
-      TestOneof2 message = builder.setFooEnum(TestOneof2.NestedEnum.BAR).build();
-      TestOneof2 message2 = TestOneof2.newBuilder().mergeFrom(message).build();
-      assertThat(message2.hasFooEnum()).isTrue();
-      assertThat(message2.getFooEnum()).isEqualTo(TestOneof2.NestedEnum.BAR);
-    }
-  }
-
-  @Test
-  public void testOneofMergeMessage_mergeIntoNewBuilder() {
-    TestOneof2.Builder builder = TestOneof2.newBuilder();
-    TestOneof2 message =
-        builder.setFooMessage(TestOneof2.NestedMessage.newBuilder().setMooInt(234).build()).build();
-    TestOneof2 message2 = TestOneof2.newBuilder().mergeFrom(message).build();
-    assertThat(message2.hasFooMessage()).isTrue();
-    assertThat(message2.getFooMessage().getMooInt()).isEqualTo(234);
-  }
-
-  @Test
-  public void testOneofMergeMessage_mergeWithGetMessageBuilder() {
-    TestOneof2.Builder builder = TestOneof2.newBuilder();
-    builder.getFooMessageBuilder().addCorgeInt(1);
-    assertThat(builder.mergeFrom(MESSAGE_TO_MERGE_FROM).build()).isEqualTo(EXPECTED_MERGED_MESSAGE);
-  }
-
-  @Test
-  public void testOneofMergeMessage_mergeIntoMessageBuiltWithGetMessageBuilder() {
-    TestOneof2.Builder builder = TestOneof2.newBuilder();
-    builder.getFooMessageBuilder().addCorgeInt(1);
-    TestOneof2 message = builder.build();
-    assertThat(message.toBuilder().mergeFrom(MESSAGE_TO_MERGE_FROM).build())
-        .isEqualTo(EXPECTED_MERGED_MESSAGE);
-  }
-
-  @Test
-  public void testOneofMergeMessage_mergeWithoutGetMessageBuilder() {
-    TestOneof2.Builder builder =
-        TestOneof2.newBuilder().setFooMessage(TestOneof2.NestedMessage.newBuilder().addCorgeInt(1));
-    assertThat(builder.mergeFrom(MESSAGE_TO_MERGE_FROM).build()).isEqualTo(EXPECTED_MERGED_MESSAGE);
-  }
-
-  @Test
-  public void testOneofSerialization() throws Exception {
-    // Primitive Type
-    {
-      TestOneof2.Builder builder = TestOneof2.newBuilder();
-      TestOneof2 message = builder.setFooInt(123).build();
-      ByteString serialized = message.toByteString();
-      TestOneof2 message2 = TestOneof2.parseFrom(serialized);
-      assertThat(message2.hasFooInt()).isTrue();
-      assertThat(message2.getFooInt()).isEqualTo(123);
-    }
-
-    // String
-    {
-      TestOneof2.Builder builder = TestOneof2.newBuilder();
-      TestOneof2 message = builder.setFooString("foo").build();
-      ByteString serialized = message.toByteString();
-      TestOneof2 message2 = TestOneof2.parseFrom(serialized);
-      assertThat(message2.hasFooString()).isTrue();
-      assertThat(message2.getFooString()).isEqualTo("foo");
-    }
-
-    // Enum
-    {
-      TestOneof2.Builder builder = TestOneof2.newBuilder();
-      TestOneof2 message = builder.setFooEnum(TestOneof2.NestedEnum.BAR).build();
-      ByteString serialized = message.toByteString();
-      TestOneof2 message2 = TestOneof2.parseFrom(serialized);
-      assertThat(message2.hasFooEnum()).isTrue();
-      assertThat(message2.getFooEnum()).isEqualTo(TestOneof2.NestedEnum.BAR);
-    }
-
-    // Message
-    {
-      TestOneof2.Builder builder = TestOneof2.newBuilder();
-      TestOneof2 message =
-          builder
-              .setFooMessage(TestOneof2.NestedMessage.newBuilder().setMooInt(234).build())
-              .build();
-      ByteString serialized = message.toByteString();
-      TestOneof2 message2 = TestOneof2.parseFrom(serialized);
-      assertThat(message2.hasFooMessage()).isTrue();
-      assertThat(message2.getFooMessage().getMooInt()).isEqualTo(234);
-    }
-  }
-
-  @Test
-  public void testOneofNestedBuilderOnChangePropagation() {
-    NestedTestAllTypes.Builder parentBuilder = NestedTestAllTypes.newBuilder();
-    TestAllTypes.Builder builder = parentBuilder.getPayloadBuilder();
-    builder.getOneofNestedMessageBuilder();
-    assertThat(builder.hasOneofNestedMessage()).isTrue();
-    assertThat(parentBuilder.hasPayload()).isTrue();
-    NestedTestAllTypes message = parentBuilder.build();
-    assertThat(message.hasPayload()).isTrue();
-    assertThat(message.getPayload().hasOneofNestedMessage()).isTrue();
-  }
-
-  @Test
-  public void testOneofParseFailurePropagatesUnderlyingException() {
-    final byte[] bytes = TestOneof2.newBuilder().setFooInt(123).build().toByteArray();
-    final IOException injectedException = new IOException("oh no");
-    CodedInputStream failingInputStream =
-        CodedInputStream.newInstance(
-            new InputStream() {
-              boolean first = true;
-
-              @Override
-              public int read(byte[] b, int off, int len) throws IOException {
-                if (!first) {
-                  throw injectedException;
-                }
-                first = false;
-                System.arraycopy(bytes, 0, b, off, len);
-                return len;
-              }
-
-              @Override
-              public int read() {
-                throw new UnsupportedOperationException();
-              }
-            },
-            bytes.length - 1);
-    TestOneof2.Builder builder = TestOneof2.newBuilder();
-
-    try {
-      builder.mergeFrom(failingInputStream, ExtensionRegistry.getEmptyRegistry());
-      assertWithMessage("Expected mergeFrom to fail").fail();
-    } catch (IOException e) {
-      assertThat(e).isSameInstanceAs(injectedException);
-    }
-  }
-
-  @Test
-  public void testGetRepeatedFieldBuilder() {
-    Descriptor descriptor = TestAllTypes.getDescriptor();
-
-    FieldDescriptor fieldDescriptor = descriptor.findFieldByName("repeated_nested_message");
-    FieldDescriptor foreignFieldDescriptor = descriptor.findFieldByName("repeated_foreign_message");
-    FieldDescriptor importFieldDescriptor = descriptor.findFieldByName("repeated_import_message");
-
-    // Mutate the message with new field builder
-    // Mutate nested message
-    TestAllTypes.Builder builder1 = TestAllTypes.newBuilder();
-    Message.Builder fieldBuilder1 = builder1.newBuilderForField(fieldDescriptor);
-    fieldBuilder1.setField(NESTED_MESSAGE_BB_FIELD, 1);
-    builder1.addRepeatedField(fieldDescriptor, fieldBuilder1.build());
-
-    // Mutate foreign message
-    Message.Builder foreignFieldBuilder1 = builder1.newBuilderForField(foreignFieldDescriptor);
-    FieldDescriptor subForeignFieldDescriptor1 =
-        foreignFieldBuilder1.getDescriptorForType().findFieldByName("c");
-    foreignFieldBuilder1.setField(subForeignFieldDescriptor1, 2);
-    builder1.addRepeatedField(foreignFieldDescriptor, foreignFieldBuilder1.build());
-
-    // Mutate import message
-    Message.Builder importFieldBuilder1 = builder1.newBuilderForField(importFieldDescriptor);
-    FieldDescriptor subImportFieldDescriptor1 =
-        importFieldBuilder1.getDescriptorForType().findFieldByName("d");
-    importFieldBuilder1.setField(subImportFieldDescriptor1, 3);
-    builder1.addRepeatedField(importFieldDescriptor, importFieldBuilder1.build());
-
-    Message newMessage1 = builder1.build();
-
-    // Mutate the message with existing field builder
-    // Mutate nested message
-    TestAllTypes.Builder builder2 = TestAllTypes.newBuilder();
-    builder2.addRepeatedNestedMessageBuilder();
-    Message.Builder fieldBuilder2 = builder2.getRepeatedFieldBuilder(fieldDescriptor, 0);
-    fieldBuilder2.setField(NESTED_MESSAGE_BB_FIELD, 1);
-
-    // Mutate foreign message
-    Message.Builder foreignFieldBuilder2 = builder2.newBuilderForField(foreignFieldDescriptor);
-    FieldDescriptor subForeignFieldDescriptor2 =
-        foreignFieldBuilder2.getDescriptorForType().findFieldByName("c");
-    foreignFieldBuilder2.setField(subForeignFieldDescriptor2, 2);
-    builder2.addRepeatedField(foreignFieldDescriptor, foreignFieldBuilder2.build());
-
-    // Mutate import message
-    Message.Builder importFieldBuilder2 = builder2.newBuilderForField(importFieldDescriptor);
-    FieldDescriptor subImportFieldDescriptor2 =
-        importFieldBuilder2.getDescriptorForType().findFieldByName("d");
-    importFieldBuilder2.setField(subImportFieldDescriptor2, 3);
-    builder2.addRepeatedField(importFieldDescriptor, importFieldBuilder2.build());
-
-    Message newMessage2 = builder2.build();
-
-    // These two messages should be equal.
-    assertThat(newMessage1).isEqualTo(newMessage2);
-  }
-
-  @Test
-  public void testGetRepeatedFieldBuilderWithInitializedValue() {
-    Descriptor descriptor = TestAllTypes.getDescriptor();
-    FieldDescriptor fieldDescriptor = descriptor.findFieldByName("repeated_nested_message");
-
-    // Before setting field, builder is initialized by default value.
-    TestAllTypes.Builder builder = TestAllTypes.newBuilder();
-    builder.addRepeatedNestedMessageBuilder();
-    NestedMessage.Builder fieldBuilder =
-        (NestedMessage.Builder) builder.getRepeatedFieldBuilder(fieldDescriptor, 0);
-    assertThat(fieldBuilder.getBb()).isEqualTo(0);
-
-    // Setting field value with new field builder instance.
-    builder = TestAllTypes.newBuilder();
-    NestedMessage.Builder newFieldBuilder = builder.addRepeatedNestedMessageBuilder();
-    newFieldBuilder.setBb(2);
-    // Then get the field builder instance by getRepeatedFieldBuilder().
-    fieldBuilder = (NestedMessage.Builder) builder.getRepeatedFieldBuilder(fieldDescriptor, 0);
-    // It should contain new value.
-    assertThat(fieldBuilder.getBb()).isEqualTo(2);
-    // These two builder should be equal.
-    assertThat(fieldBuilder).isSameInstanceAs(newFieldBuilder);
-  }
-
-  @Test
-  public void testGetRepeatedFieldBuilderNotSupportedException() {
-    Descriptor descriptor = TestAllTypes.getDescriptor();
-    TestAllTypes.Builder builder = TestAllTypes.newBuilder();
-    try {
-      builder.getRepeatedFieldBuilder(descriptor.findFieldByName("repeated_int32"), 0);
-      assertWithMessage("Exception was not thrown").fail();
-    } catch (UnsupportedOperationException e) {
-      // We expect this exception.
-    }
-    try {
-      builder.getRepeatedFieldBuilder(descriptor.findFieldByName("repeated_nested_enum"), 0);
-      assertWithMessage("Exception was not thrown").fail();
-    } catch (UnsupportedOperationException e) {
-      // We expect this exception.
-    }
-    try {
-      builder.getRepeatedFieldBuilder(descriptor.findFieldByName("optional_int32"), 0);
-      assertWithMessage("Exception was not thrown").fail();
-    } catch (UnsupportedOperationException e) {
-      // We expect this exception.
-    }
-    try {
-      builder.getRepeatedFieldBuilder(descriptor.findFieldByName("optional_nested_enum"), 0);
-      assertWithMessage("Exception was not thrown").fail();
-    } catch (UnsupportedOperationException e) {
-      // We expect this exception.
-    }
-    try {
-      builder.getRepeatedFieldBuilder(descriptor.findFieldByName("optional_nested_message"), 0);
-      assertWithMessage("Exception was not thrown").fail();
-    } catch (UnsupportedOperationException e) {
-      // We expect this exception.
-    }
-  }
-
-  private static final FieldDescriptor OPTIONAL_NESTED_MESSAGE_EXTENSION =
-      UnittestProto.getDescriptor().findExtensionByName("optional_nested_message_extension");
-  private static final FieldDescriptor REPEATED_NESTED_MESSAGE_EXTENSION =
-      UnittestProto.getDescriptor().findExtensionByName("repeated_nested_message_extension");
-  // A compile-time check that TestAllExtensions.Builder does in fact extend
-  // GeneratedMessageV3.ExtendableBuilder. The tests below assume that it does.
-  static {
-    @SuppressWarnings("unused")
-    Class<? extends GeneratedMessageV3.ExtendableBuilder<?, ?>> ignored =
-        TestAllExtensions.Builder.class;
-  }
-
-  @Test
-  public void
-  extendableBuilder_extensionFieldContainingBuilder_setRepeatedFieldOverwritesElement() {
-    TestAllExtensions.Builder builder = TestAllExtensions.newBuilder();
-    builder.addRepeatedField(REPEATED_NESTED_MESSAGE_EXTENSION, NestedMessage.getDefaultInstance());
-    // Calling getRepeatedFieldBuilder and ignoring the returned Builder should have no
-    // externally-visible effect, but internally it sets the stored field element to a builder.
-    builder.getRepeatedFieldBuilder(REPEATED_NESTED_MESSAGE_EXTENSION, 0);
-
-    NestedMessage setNestedMessage = NestedMessage.newBuilder().setBb(100).build();
-    builder.setRepeatedField(REPEATED_NESTED_MESSAGE_EXTENSION, 0, setNestedMessage);
-
-    assertThat(builder.getRepeatedField(REPEATED_NESTED_MESSAGE_EXTENSION, 0))
-        .isEqualTo(setNestedMessage);
-  }
-
-  @Test
-  public void extendableBuilder_extensionFieldContainingBuilder_addRepeatedFieldAppendsToField() {
-    TestAllExtensions.Builder builder = TestAllExtensions.newBuilder();
-    builder.addRepeatedField(REPEATED_NESTED_MESSAGE_EXTENSION, NestedMessage.getDefaultInstance());
-    // Calling getRepeatedFieldBuilder and ignoring the returned Builder should have no
-    // externally-visible effect, but internally it sets the stored field element to a builder.
-    builder.getRepeatedFieldBuilder(REPEATED_NESTED_MESSAGE_EXTENSION, 0);
-
-    builder.addRepeatedField(REPEATED_NESTED_MESSAGE_EXTENSION, NestedMessage.getDefaultInstance());
-
-    assertThat((List<?>) builder.getField(REPEATED_NESTED_MESSAGE_EXTENSION)).hasSize(2);
-  }
-
-  @Test
-  public void extendableBuilder_mergeFrom_optionalField_changesReflectedInExistingBuilder() {
-    TestAllExtensions.Builder builder = TestAllExtensions.newBuilder();
-    Message.Builder nestedMessageBuilder =
-        builder.getFieldBuilder(OPTIONAL_NESTED_MESSAGE_EXTENSION);
-
-    builder.mergeFrom(
-        TestAllExtensions.newBuilder()
-            .setField(OPTIONAL_NESTED_MESSAGE_EXTENSION, NestedMessage.newBuilder().setBb(100))
-            .build());
-
-    assertThat(nestedMessageBuilder.getField(NESTED_MESSAGE_BB_FIELD)).isEqualTo(100);
-  }
-
-  @Test
-  public void extendableBuilder_mergeFrom_optionalField_doesNotInvalidateExistingBuilder() {
-    TestAllExtensions.Builder builder = TestAllExtensions.newBuilder();
-    Message.Builder nestedMessageBuilder =
-        builder.getFieldBuilder(OPTIONAL_NESTED_MESSAGE_EXTENSION);
-
-    builder.mergeFrom(
-        TestAllExtensions.newBuilder()
-            .setField(OPTIONAL_NESTED_MESSAGE_EXTENSION, NestedMessage.newBuilder().setBb(100))
-            .build());
-
-    // Changes to nestedMessageBuilder should still be reflected in the parent builder.
-    nestedMessageBuilder.setField(NESTED_MESSAGE_BB_FIELD, 200);
-
-    assertThat(builder.build())
-        .isEqualTo(
-            TestAllExtensions.newBuilder()
-                .setField(OPTIONAL_NESTED_MESSAGE_EXTENSION, NestedMessage.newBuilder().setBb(200))
-                .build());
-  }
-
-  @Test
-  public void extendableBuilder_mergeFrom_repeatedField_doesNotInvalidateExistingBuilder() {
-    TestAllExtensions.Builder builder = TestAllExtensions.newBuilder();
-    builder.addRepeatedField(REPEATED_NESTED_MESSAGE_EXTENSION, NestedMessage.getDefaultInstance());
-    Message.Builder nestedMessageBuilder =
-        builder.getRepeatedFieldBuilder(REPEATED_NESTED_MESSAGE_EXTENSION, 0);
-
-    builder.mergeFrom(
-        TestAllExtensions.newBuilder()
-            .addRepeatedField(REPEATED_NESTED_MESSAGE_EXTENSION, NestedMessage.getDefaultInstance())
-            .build());
-
-    // Changes to nestedMessageBuilder should still be reflected in the parent builder.
-    nestedMessageBuilder.setField(NESTED_MESSAGE_BB_FIELD, 100);
-
-    assertThat(builder.getRepeatedField(REPEATED_NESTED_MESSAGE_EXTENSION, 0))
-        .isEqualTo(NestedMessage.newBuilder().setBb(100).build());
-  }
-}
diff --git a/libs/protobuf/java/core/src/test/java/com/google/protobuf/IntArrayListTest.java b/libs/protobuf/java/core/src/test/java/com/google/protobuf/IntArrayListTest.java
deleted file mode 100644
index 15bbda9..0000000
--- a/libs/protobuf/java/core/src/test/java/com/google/protobuf/IntArrayListTest.java
+++ /dev/null
@@ -1,584 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.common.truth.Truth.assertThat;
-import static com.google.common.truth.Truth.assertWithMessage;
-import static java.util.Arrays.asList;
-
-import com.google.protobuf.Internal.IntList;
-import java.util.Collections;
-import java.util.ConcurrentModificationException;
-import java.util.Iterator;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-/** Tests for {@link IntArrayList}. */
-@RunWith(JUnit4.class)
-public class IntArrayListTest {
-
-  private static final IntArrayList UNARY_LIST = newImmutableIntArrayList(1);
-  private static final IntArrayList TERTIARY_LIST = newImmutableIntArrayList(1, 2, 3);
-
-  private IntArrayList list;
-
-  @Before
-  public void setUp() throws Exception {
-    list = new IntArrayList();
-  }
-
-  @Test
-  public void testEmptyListReturnsSameInstance() {
-    assertThat(IntArrayList.emptyList()).isSameInstanceAs(IntArrayList.emptyList());
-  }
-
-  @Test
-  public void testEmptyListIsImmutable() {
-    assertImmutable(IntArrayList.emptyList());
-  }
-
-  @Test
-  public void testMakeImmutable() {
-    list.addInt(3);
-    list.addInt(4);
-    list.addInt(5);
-    list.addInt(7);
-    list.makeImmutable();
-    assertImmutable(list);
-  }
-
-  @Test
-  public void testModificationWithIteration() {
-    list.addAll(asList(1, 2, 3, 4));
-    Iterator<Integer> iterator = list.iterator();
-    assertThat(list).hasSize(4);
-    assertThat((int) list.get(0)).isEqualTo(1);
-    assertThat((int) iterator.next()).isEqualTo(1);
-    list.set(0, 1);
-    assertThat((int) iterator.next()).isEqualTo(2);
-
-    list.remove(0);
-    try {
-      iterator.next();
-      assertWithMessage("expected exception").fail();
-    } catch (ConcurrentModificationException e) {
-      // expected
-    }
-
-    iterator = list.iterator();
-    list.add(0, 0);
-    try {
-      iterator.next();
-      assertWithMessage("expected exception").fail();
-    } catch (ConcurrentModificationException e) {
-      // expected
-    }
-  }
-
-  @Test
-  public void testGet() {
-    assertThat((int) TERTIARY_LIST.get(0)).isEqualTo(1);
-    assertThat((int) TERTIARY_LIST.get(1)).isEqualTo(2);
-    assertThat((int) TERTIARY_LIST.get(2)).isEqualTo(3);
-
-    try {
-      TERTIARY_LIST.get(-1);
-      assertWithMessage("expected exception").fail();
-    } catch (IndexOutOfBoundsException e) {
-      // expected
-    }
-
-    try {
-      TERTIARY_LIST.get(3);
-      assertWithMessage("expected exception").fail();
-    } catch (IndexOutOfBoundsException e) {
-      // expected
-    }
-  }
-
-  @Test
-  public void testGetInt() {
-    assertThat(TERTIARY_LIST.getInt(0)).isEqualTo(1);
-    assertThat(TERTIARY_LIST.getInt(1)).isEqualTo(2);
-    assertThat(TERTIARY_LIST.getInt(2)).isEqualTo(3);
-
-    try {
-      TERTIARY_LIST.get(-1);
-      assertWithMessage("expected exception").fail();
-    } catch (IndexOutOfBoundsException e) {
-      // expected
-    }
-
-    try {
-      TERTIARY_LIST.get(3);
-      assertWithMessage("expected exception").fail();
-    } catch (IndexOutOfBoundsException e) {
-      // expected
-    }
-  }
-
-  @Test
-  public void testIndexOf_nullElement() {
-    assertThat(TERTIARY_LIST.indexOf(null)).isEqualTo(-1);
-  }
-
-  @Test
-  public void testIndexOf_incompatibleElementType() {
-    assertThat(TERTIARY_LIST.indexOf(new Object())).isEqualTo(-1);
-  }
-
-  @Test
-  public void testIndexOf_notInList() {
-    assertThat(UNARY_LIST.indexOf(2)).isEqualTo(-1);
-  }
-
-  @Test
-  public void testIndexOf_notInListWithDuplicates() {
-    IntArrayList listWithDupes = newImmutableIntArrayList(1, 1);
-    assertThat(listWithDupes.indexOf(2)).isEqualTo(-1);
-  }
-
-  @Test
-  public void testIndexOf_inList() {
-    assertThat(TERTIARY_LIST.indexOf(2)).isEqualTo(1);
-  }
-
-  @Test
-  public void testIndexOf_inListWithDuplicates_matchAtHead() {
-    IntArrayList listWithDupes = newImmutableIntArrayList(1, 1, 2);
-    assertThat(listWithDupes.indexOf(1)).isEqualTo(0);
-  }
-
-  @Test
-  public void testIndexOf_inListWithDuplicates_matchMidList() {
-    IntArrayList listWithDupes = newImmutableIntArrayList(2, 1, 1, 2);
-    assertThat(listWithDupes.indexOf(1)).isEqualTo(1);
-  }
-
-  @Test
-  public void testContains_nullElement() {
-    assertThat(TERTIARY_LIST).doesNotContain(null);
-  }
-
-  @Test
-  public void testContains_incompatibleElementType() {
-    assertThat(TERTIARY_LIST).doesNotContain(new Object());
-  }
-
-  @Test
-  public void testContains_notInList() {
-    assertThat(UNARY_LIST).doesNotContain(2);
-  }
-
-  @Test
-  public void testContains_notInListWithDuplicates() {
-    IntArrayList listWithDupes = newImmutableIntArrayList(1, 1);
-    assertThat(listWithDupes).doesNotContain(2);
-  }
-
-  @Test
-  public void testContains_inList() {
-    assertThat(TERTIARY_LIST).contains(2);
-  }
-
-  @Test
-  public void testContains_inListWithDuplicates_matchAtHead() {
-    IntArrayList listWithDupes = newImmutableIntArrayList(1, 1, 2);
-    assertThat(listWithDupes).contains(1);
-  }
-
-  @Test
-  public void testContains_inListWithDuplicates_matchMidList() {
-    IntArrayList listWithDupes = newImmutableIntArrayList(2, 1, 1, 2);
-    assertThat(listWithDupes).contains(1);
-  }
-
-  @Test
-  public void testSize() {
-    assertThat(IntArrayList.emptyList()).isEmpty();
-    assertThat(UNARY_LIST).hasSize(1);
-    assertThat(TERTIARY_LIST).hasSize(3);
-
-    list.addInt(3);
-    list.addInt(4);
-    list.addInt(6);
-    list.addInt(8);
-    assertThat(list).hasSize(4);
-
-    list.remove(0);
-    assertThat(list).hasSize(3);
-
-    list.add(17);
-    assertThat(list).hasSize(4);
-  }
-
-  @Test
-  public void testSet() {
-    list.addInt(2);
-    list.addInt(4);
-
-    assertThat((int) list.set(0, 3)).isEqualTo(2);
-    assertThat(list.getInt(0)).isEqualTo(3);
-
-    assertThat((int) list.set(1, 0)).isEqualTo(4);
-    assertThat(list.getInt(1)).isEqualTo(0);
-
-    try {
-      list.set(-1, 0);
-      assertWithMessage("expected exception").fail();
-    } catch (IndexOutOfBoundsException e) {
-      // expected
-    }
-
-    try {
-      list.set(2, 0);
-      assertWithMessage("expected exception").fail();
-    } catch (IndexOutOfBoundsException e) {
-      // expected
-    }
-  }
-
-  @Test
-  public void testSetInt() {
-    list.addInt(1);
-    list.addInt(3);
-
-    assertThat(list.setInt(0, 0)).isEqualTo(1);
-    assertThat(list.getInt(0)).isEqualTo(0);
-
-    assertThat(list.setInt(1, 0)).isEqualTo(3);
-    assertThat(list.getInt(1)).isEqualTo(0);
-
-    try {
-      list.setInt(-1, 0);
-      assertWithMessage("expected exception").fail();
-    } catch (IndexOutOfBoundsException e) {
-      // expected
-    }
-
-    try {
-      list.setInt(2, 0);
-      assertWithMessage("expected exception").fail();
-    } catch (IndexOutOfBoundsException e) {
-      // expected
-    }
-  }
-
-  @Test
-  public void testAdd() {
-    assertThat(list).isEmpty();
-
-    assertThat(list.add(2)).isTrue();
-    assertThat(list).containsExactly(2);
-
-    assertThat(list.add(3)).isTrue();
-    list.add(0, 4);
-    assertThat(list).containsExactly(4, 2, 3).inOrder();
-
-    list.add(0, 1);
-    list.add(0, 0);
-    // Force a resize by getting up to 11 elements.
-    for (int i = 0; i < 6; i++) {
-      list.add(Integer.valueOf(5 + i));
-    }
-    assertThat(list).containsExactly(0, 1, 4, 2, 3, 5, 6, 7, 8, 9, 10).inOrder();
-
-    try {
-      list.add(-1, 5);
-    } catch (IndexOutOfBoundsException e) {
-      // expected
-    }
-
-    try {
-      list.add(4, 5);
-    } catch (IndexOutOfBoundsException e) {
-      // expected
-    }
-  }
-
-  @Test
-  public void testAddInt() {
-    assertThat(list).isEmpty();
-
-    list.addInt(2);
-    assertThat(list).containsExactly(2);
-
-    list.addInt(3);
-    assertThat(list).containsExactly(2, 3).inOrder();
-  }
-
-  @Test
-  public void testAddAll() {
-    assertThat(list).isEmpty();
-
-    assertThat(list.addAll(Collections.singleton(1))).isTrue();
-    assertThat(list).hasSize(1);
-    assertThat((int) list.get(0)).isEqualTo(1);
-    assertThat(list.getInt(0)).isEqualTo(1);
-
-    assertThat(list.addAll(asList(2, 3, 4, 5, 6))).isTrue();
-    assertThat(list).containsExactly(1, 2, 3, 4, 5, 6).inOrder();
-
-    assertThat(list.addAll(TERTIARY_LIST)).isTrue();
-    assertThat(list).containsExactly(1, 2, 3, 4, 5, 6, 1, 2, 3).inOrder();
-
-    assertThat(list.addAll(Collections.<Integer>emptyList())).isFalse();
-    assertThat(list.addAll(IntArrayList.emptyList())).isFalse();
-  }
-
-  @Test
-  public void testEquals() {
-    IntArrayList list1 = new IntArrayList();
-    IntArrayList list2 = new IntArrayList();
-
-    assertThat(list1).isEqualTo(list2);
-  }
-
-  @Test
-  public void testRemove() {
-    list.addAll(TERTIARY_LIST);
-    assertThat((int) list.remove(0)).isEqualTo(1);
-    assertThat(list).containsExactly(2, 3).inOrder();
-
-    assertThat(list.remove(Integer.valueOf(3))).isTrue();
-    assertThat(list).containsExactly(2);
-
-    assertThat(list.remove(Integer.valueOf(3))).isFalse();
-    assertThat(list).containsExactly(2);
-
-    assertThat((int) list.remove(0)).isEqualTo(2);
-    assertThat(list).isEmpty();
-
-    try {
-      list.remove(-1);
-      assertWithMessage("expected exception").fail();
-    } catch (IndexOutOfBoundsException e) {
-      // expected
-    }
-
-    try {
-      list.remove(0);
-      assertWithMessage("expected exception").fail();
-    } catch (IndexOutOfBoundsException e) {
-      // expected
-    }
-  }
-
-  @Test
-  public void testRemoveEnd_listAtCapacity() {
-    IntList toRemove = IntArrayList.emptyList().mutableCopyWithCapacity(1);
-    toRemove.addInt(3);
-    toRemove.remove(0);
-    assertThat(toRemove).isEmpty();
-  }
-
-  @Test
-  public void testRemove_listAtCapacity() {
-    IntList toRemove = IntArrayList.emptyList().mutableCopyWithCapacity(2);
-    toRemove.addInt(3);
-    toRemove.addInt(4);
-    toRemove.remove(0);
-    assertThat(toRemove).hasSize(1);
-    assertThat((int) toRemove.get(0)).isEqualTo(4);
-  }
-
-  @Test
-  public void testSublistRemoveEndOfCapacity() {
-    IntList toRemove = IntArrayList.emptyList().mutableCopyWithCapacity(1);
-    toRemove.addInt(3);
-    toRemove.subList(0, 1).clear();
-    assertThat(toRemove).isEmpty();
-  }
-
-  private void assertImmutable(IntList list) {
-    if (list.contains(1)) {
-      throw new RuntimeException("Cannot test the immutability of lists that contain 1.");
-    }
-
-    try {
-      list.add(1);
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.add(0, 1);
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.addAll(Collections.<Integer>emptyList());
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.addAll(Collections.singletonList(1));
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.addAll(new IntArrayList());
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.addAll(UNARY_LIST);
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.addAll(0, Collections.singleton(1));
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.addAll(0, UNARY_LIST);
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.addAll(0, Collections.<Integer>emptyList());
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.addInt(0);
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.clear();
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.remove(1);
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.remove(new Object());
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.removeAll(Collections.<Integer>emptyList());
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.removeAll(Collections.singleton(1));
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.removeAll(UNARY_LIST);
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.retainAll(Collections.<Integer>emptyList());
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.retainAll(Collections.singleton(1));
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.retainAll(UNARY_LIST);
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.set(0, 0);
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.setInt(0, 0);
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-  }
-
-  private static IntArrayList newImmutableIntArrayList(int... elements) {
-    IntArrayList list = new IntArrayList();
-    for (int element : elements) {
-      list.addInt(element);
-    }
-    list.makeImmutable();
-    return list;
-  }
-}
diff --git a/libs/protobuf/java/core/src/test/java/com/google/protobuf/InvalidProtocolBufferExceptionTest.java b/libs/protobuf/java/core/src/test/java/com/google/protobuf/InvalidProtocolBufferExceptionTest.java
deleted file mode 100644
index 564b8c2..0000000
--- a/libs/protobuf/java/core/src/test/java/com/google/protobuf/InvalidProtocolBufferExceptionTest.java
+++ /dev/null
@@ -1,49 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-@RunWith(JUnit4.class)
-public class InvalidProtocolBufferExceptionTest {
-
-  @Test
-  public void testWrapRuntimeException() {
-    ArrayIndexOutOfBoundsException root = new ArrayIndexOutOfBoundsException();
-    InvalidProtocolBufferException wrapper = new InvalidProtocolBufferException(root);
-    assertThat(wrapper).hasCauseThat().isEqualTo(root);
-  }
-
-}
diff --git a/libs/protobuf/java/core/src/test/java/com/google/protobuf/IsValidUtf8Test.java b/libs/protobuf/java/core/src/test/java/com/google/protobuf/IsValidUtf8Test.java
deleted file mode 100644
index 46e56a9..0000000
--- a/libs/protobuf/java/core/src/test/java/com/google/protobuf/IsValidUtf8Test.java
+++ /dev/null
@@ -1,185 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.common.truth.Truth.assertThat;
-import static com.google.protobuf.IsValidUtf8TestUtil.DIRECT_NIO_FACTORY;
-import static com.google.protobuf.IsValidUtf8TestUtil.EXPECTED_ONE_BYTE_ROUNDTRIPPABLE_COUNT;
-import static com.google.protobuf.IsValidUtf8TestUtil.EXPECTED_THREE_BYTE_ROUNDTRIPPABLE_COUNT;
-import static com.google.protobuf.IsValidUtf8TestUtil.HEAP_NIO_FACTORY;
-import static com.google.protobuf.IsValidUtf8TestUtil.LITERAL_FACTORY;
-import static com.google.protobuf.IsValidUtf8TestUtil.ROPE_FACTORY;
-import static com.google.protobuf.IsValidUtf8TestUtil.testBytes;
-
-import com.google.protobuf.IsValidUtf8TestUtil.ByteStringFactory;
-import com.google.protobuf.IsValidUtf8TestUtil.Shard;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-/**
- * Tests cases for {@link ByteString#isValidUtf8()}. This includes three brute force tests that
- * actually test every permutation of one byte, two byte, and three byte sequences to ensure that
- * the method produces the right result for every possible byte encoding where "right" means it's
- * consistent with java's UTF-8 string encoding/decoding such that the method returns true for any
- * sequence that will round trip when converted to a String and then back to bytes and will return
- * false for any sequence that will not round trip. See also {@link IsValidUtf8FourByteTest}. It
- * also includes some other more targeted tests.
- */
-@RunWith(JUnit4.class)
-public class IsValidUtf8Test {
-  /** Tests that round tripping of all two byte permutations work. */
-  @Test
-  public void testIsValidUtf8_1Byte() {
-    testBytes(LITERAL_FACTORY, 1, EXPECTED_ONE_BYTE_ROUNDTRIPPABLE_COUNT);
-    testBytes(HEAP_NIO_FACTORY, 1, EXPECTED_ONE_BYTE_ROUNDTRIPPABLE_COUNT);
-    testBytes(DIRECT_NIO_FACTORY, 1, EXPECTED_ONE_BYTE_ROUNDTRIPPABLE_COUNT);
-    testBytes(ROPE_FACTORY, 1, EXPECTED_ONE_BYTE_ROUNDTRIPPABLE_COUNT);
-  }
-
-  /** Tests that round tripping of all two byte permutations work. */
-  @Test
-  public void testIsValidUtf8_2Bytes() {
-    testBytes(LITERAL_FACTORY, 2, IsValidUtf8TestUtil.EXPECTED_TWO_BYTE_ROUNDTRIPPABLE_COUNT);
-    testBytes(HEAP_NIO_FACTORY, 2, IsValidUtf8TestUtil.EXPECTED_TWO_BYTE_ROUNDTRIPPABLE_COUNT);
-    testBytes(DIRECT_NIO_FACTORY, 2, IsValidUtf8TestUtil.EXPECTED_TWO_BYTE_ROUNDTRIPPABLE_COUNT);
-    testBytes(ROPE_FACTORY, 2, IsValidUtf8TestUtil.EXPECTED_TWO_BYTE_ROUNDTRIPPABLE_COUNT);
-  }
-
-  /** Tests that round tripping of all three byte permutations work. */
-  @Test
-  public void testIsValidUtf8_3Bytes() {
-    testBytes(LITERAL_FACTORY, 3, EXPECTED_THREE_BYTE_ROUNDTRIPPABLE_COUNT);
-    testBytes(HEAP_NIO_FACTORY, 3, EXPECTED_THREE_BYTE_ROUNDTRIPPABLE_COUNT);
-    testBytes(DIRECT_NIO_FACTORY, 3, EXPECTED_THREE_BYTE_ROUNDTRIPPABLE_COUNT);
-    testBytes(ROPE_FACTORY, 3, EXPECTED_THREE_BYTE_ROUNDTRIPPABLE_COUNT);
-  }
-
-  /**
-   * Tests that round tripping of a sample of four byte permutations work. All permutations are
-   * prohibitively expensive to test for automated runs; {@link IsValidUtf8FourByteTest} is used for
-   * full coverage. This method tests specific four-byte cases.
-   */
-  @Test
-  public void testIsValidUtf8_4BytesSamples() {
-    // Valid 4 byte.
-    assertValidUtf8(0xF0, 0xA4, 0xAD, 0xA2);
-
-    // Bad trailing bytes
-    assertInvalidUtf8(0xF0, 0xA4, 0xAD, 0x7F);
-    assertInvalidUtf8(0xF0, 0xA4, 0xAD, 0xC0);
-
-    // Special cases for byte2
-    assertInvalidUtf8(0xF0, 0x8F, 0xAD, 0xA2);
-    assertInvalidUtf8(0xF4, 0x90, 0xAD, 0xA2);
-  }
-
-  /** Tests some hard-coded test cases. */
-  @Test
-  public void testSomeSequences() {
-    // Empty
-    assertThat(asBytes("").isValidUtf8()).isTrue();
-
-    // One-byte characters, including control characters
-    assertThat(asBytes("\u0000abc\u007f").isValidUtf8()).isTrue();
-
-    // Two-byte characters
-    assertThat(asBytes("\u00a2\u00a2").isValidUtf8()).isTrue();
-
-    // Three-byte characters
-    assertThat(asBytes("\u020ac\u020ac").isValidUtf8()).isTrue();
-
-    // Four-byte characters
-    assertThat(asBytes("\u024B62\u024B62").isValidUtf8()).isTrue();
-
-    // Mixed string
-    assertThat(asBytes("a\u020ac\u00a2b\\u024B62u020acc\u00a2de\u024B62").isValidUtf8()).isTrue();
-
-    // Not a valid string
-    assertInvalidUtf8(-1, 0, -1, 0);
-  }
-
-  @Test
-  public void testShardsHaveExpectedRoundTrippables() {
-    // A sanity check.
-    int actual = 0;
-    for (Shard shard : IsValidUtf8TestUtil.FOUR_BYTE_SHARDS) {
-      actual = (int) (actual + shard.expected);
-    }
-    assertThat(actual).isEqualTo(IsValidUtf8TestUtil.EXPECTED_FOUR_BYTE_ROUNDTRIPPABLE_COUNT);
-  }
-
-  private byte[] toByteArray(int... bytes) {
-    byte[] realBytes = new byte[bytes.length];
-    for (int i = 0; i < bytes.length; i++) {
-      realBytes[i] = (byte) bytes[i];
-    }
-    return realBytes;
-  }
-
-  private void assertValidUtf8(ByteStringFactory factory, int[] bytes, boolean not) {
-    byte[] realBytes = toByteArray(bytes);
-    assertThat(not ^ Utf8.isValidUtf8(realBytes)).isTrue();
-    assertThat(not ^ Utf8.isValidUtf8(realBytes, 0, bytes.length)).isTrue();
-    ByteString leaf = factory.newByteString(realBytes);
-    ByteString sub = leaf.substring(0, bytes.length);
-    assertThat(not ^ leaf.isValidUtf8()).isTrue();
-    assertThat(not ^ sub.isValidUtf8()).isTrue();
-    ByteString[] ropes = {
-      RopeByteString.newInstanceForTest(ByteString.EMPTY, leaf),
-      RopeByteString.newInstanceForTest(ByteString.EMPTY, sub),
-      RopeByteString.newInstanceForTest(leaf, ByteString.EMPTY),
-      RopeByteString.newInstanceForTest(sub, ByteString.EMPTY),
-      RopeByteString.newInstanceForTest(sub, leaf)
-    };
-    for (ByteString rope : ropes) {
-      assertThat(not ^ rope.isValidUtf8()).isTrue();
-    }
-  }
-
-  private void assertValidUtf8(int... bytes) {
-    assertValidUtf8(LITERAL_FACTORY, bytes, false);
-    assertValidUtf8(HEAP_NIO_FACTORY, bytes, false);
-    assertValidUtf8(DIRECT_NIO_FACTORY, bytes, false);
-    assertValidUtf8(ROPE_FACTORY, bytes, false);
-  }
-
-  private void assertInvalidUtf8(int... bytes) {
-    assertValidUtf8(LITERAL_FACTORY, bytes, true);
-    assertValidUtf8(HEAP_NIO_FACTORY, bytes, true);
-    assertValidUtf8(DIRECT_NIO_FACTORY, bytes, true);
-    assertValidUtf8(ROPE_FACTORY, bytes, true);
-  }
-
-  private static ByteString asBytes(String s) {
-    return ByteString.copyFromUtf8(s);
-  }
-}
diff --git a/libs/protobuf/java/core/src/test/java/com/google/protobuf/IsValidUtf8TestUtil.java b/libs/protobuf/java/core/src/test/java/com/google/protobuf/IsValidUtf8TestUtil.java
deleted file mode 100644
index f1a6711..0000000
--- a/libs/protobuf/java/core/src/test/java/com/google/protobuf/IsValidUtf8TestUtil.java
+++ /dev/null
@@ -1,322 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.common.truth.Truth.assertThat;
-import static com.google.common.truth.Truth.assertWithMessage;
-
-import java.lang.ref.SoftReference;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Random;
-
-/**
- * Shared testing code for {@link IsValidUtf8Test} and {@link IsValidUtf8FourByteTest}.
- *
- * @author jonp@google.com (Jon Perlow)
- * @author martinrb@google.com (Martin Buchholz)
- */
-final class IsValidUtf8TestUtil {
-  private IsValidUtf8TestUtil() {}
-
-  static interface ByteStringFactory {
-    ByteString newByteString(byte[] bytes);
-  }
-
-  static final ByteStringFactory LITERAL_FACTORY =
-      new ByteStringFactory() {
-        @Override
-        public ByteString newByteString(byte[] bytes) {
-          return ByteString.wrap(bytes);
-        }
-      };
-
-  static final ByteStringFactory HEAP_NIO_FACTORY =
-      new ByteStringFactory() {
-        @Override
-        public ByteString newByteString(byte[] bytes) {
-          return new NioByteString(ByteBuffer.wrap(bytes));
-        }
-      };
-
-  private static final ThreadLocal<SoftReference<ByteBuffer>> directBuffer = new ThreadLocal<>();
-
-  /**
-   * Factory for direct {@link ByteBuffer} instances. To reduce direct memory usage, this uses a
-   * thread local direct buffer. This means that each call will overwrite the buffer's contents from
-   * the previous call, so the calling code must be careful not to continue using a buffer returned
-   * from a previous invocation.
-   */
-  static final ByteStringFactory DIRECT_NIO_FACTORY =
-      new ByteStringFactory() {
-        @Override
-        public ByteString newByteString(byte[] bytes) {
-          SoftReference<ByteBuffer> ref = directBuffer.get();
-          ByteBuffer buffer = ref == null ? null : ref.get();
-          if (buffer == null || buffer.capacity() < bytes.length) {
-            buffer = ByteBuffer.allocateDirect(bytes.length);
-            directBuffer.set(new SoftReference<ByteBuffer>(buffer));
-          }
-          buffer.clear();
-          buffer.put(bytes);
-          buffer.flip();
-          return new NioByteString(buffer);
-        }
-      };
-
-  static final ByteStringFactory ROPE_FACTORY =
-      new ByteStringFactory() {
-        // Seed the random number generator with 0 so that the tests are deterministic.
-        private final Random random = new Random(0);
-
-        @Override
-        public ByteString newByteString(byte[] bytes) {
-          // We split the byte array into three pieces (some possibly empty) by choosing two random
-          // cut points i and j.
-          int i = random.nextInt(bytes.length);
-          int j = random.nextInt(bytes.length);
-          if (j < i) {
-            int tmp = i;
-            i = j;
-            j = tmp;
-          }
-          return RopeByteString.newInstanceForTest(
-              ByteString.wrap(bytes, 0, i),
-              RopeByteString.newInstanceForTest(
-                  ByteString.wrap(bytes, i, j - i), ByteString.wrap(bytes, j, bytes.length - j)));
-        }
-      };
-
-  // 128 - [chars 0x0000 to 0x007f]
-  static final long ONE_BYTE_ROUNDTRIPPABLE_CHARACTERS = 0x007f - 0x0000 + 1;
-
-  // 128
-  static final long EXPECTED_ONE_BYTE_ROUNDTRIPPABLE_COUNT = ONE_BYTE_ROUNDTRIPPABLE_CHARACTERS;
-
-  // 1920 [chars 0x0080 to 0x07FF]
-  static final long TWO_BYTE_ROUNDTRIPPABLE_CHARACTERS = 0x07FF - 0x0080 + 1;
-
-  // 18,304
-  static final long EXPECTED_TWO_BYTE_ROUNDTRIPPABLE_COUNT =
-      // Both bytes are one byte characters
-      (long) Math.pow(EXPECTED_ONE_BYTE_ROUNDTRIPPABLE_COUNT, 2)
-          +
-          // The possible number of two byte characters
-          TWO_BYTE_ROUNDTRIPPABLE_CHARACTERS;
-
-  // 2048
-  static final long THREE_BYTE_SURROGATES = 2 * 1024;
-
-  // 61,440 [chars 0x0800 to 0xFFFF, minus surrogates]
-  static final long THREE_BYTE_ROUNDTRIPPABLE_CHARACTERS =
-      0xFFFF - 0x0800 + 1 - THREE_BYTE_SURROGATES;
-
-  // 2,650,112
-  static final long EXPECTED_THREE_BYTE_ROUNDTRIPPABLE_COUNT =
-      // All one byte characters
-      (long) Math.pow(EXPECTED_ONE_BYTE_ROUNDTRIPPABLE_COUNT, 3)
-          +
-          // One two byte character and a one byte character
-          2 * TWO_BYTE_ROUNDTRIPPABLE_CHARACTERS * ONE_BYTE_ROUNDTRIPPABLE_CHARACTERS
-          +
-          // Three byte characters
-          THREE_BYTE_ROUNDTRIPPABLE_CHARACTERS;
-
-  // 1,048,576 [chars 0x10000L to 0x10FFFF]
-  static final long FOUR_BYTE_ROUNDTRIPPABLE_CHARACTERS = 0x10FFFF - 0x10000L + 1;
-
-  // 289,571,839
-  static final long EXPECTED_FOUR_BYTE_ROUNDTRIPPABLE_COUNT =
-      // All one byte characters
-      (long) Math.pow(EXPECTED_ONE_BYTE_ROUNDTRIPPABLE_COUNT, 4)
-          +
-          // One and three byte characters
-          2 * THREE_BYTE_ROUNDTRIPPABLE_CHARACTERS * ONE_BYTE_ROUNDTRIPPABLE_CHARACTERS
-          +
-          // Two two byte characters
-          TWO_BYTE_ROUNDTRIPPABLE_CHARACTERS * TWO_BYTE_ROUNDTRIPPABLE_CHARACTERS
-          +
-          // Permutations of one and two byte characters
-          3
-              * TWO_BYTE_ROUNDTRIPPABLE_CHARACTERS
-              * ONE_BYTE_ROUNDTRIPPABLE_CHARACTERS
-              * ONE_BYTE_ROUNDTRIPPABLE_CHARACTERS
-          +
-          // Four byte characters
-          FOUR_BYTE_ROUNDTRIPPABLE_CHARACTERS;
-
-  static final class Shard {
-    final long index;
-    final long start;
-    final long lim;
-    final long expected;
-
-    public Shard(long index, long start, long lim, long expected) {
-      assertThat(start).isLessThan(lim);
-      this.index = index;
-      this.start = start;
-      this.lim = lim;
-      this.expected = expected;
-    }
-  }
-
-  static final long[] FOUR_BYTE_SHARDS_EXPECTED_ROUNTRIPPABLES =
-      generateFourByteShardsExpectedRunnables();
-
-  private static long[] generateFourByteShardsExpectedRunnables() {
-    long[] expected = new long[128];
-
-    // 0-63 are all 5300224
-    for (int i = 0; i <= 63; i++) {
-      expected[i] = 5300224;
-    }
-
-    // 97-111 are all 2342912
-    for (int i = 97; i <= 111; i++) {
-      expected[i] = 2342912;
-    }
-
-    // 113-117 are all 1048576
-    for (int i = 113; i <= 117; i++) {
-      expected[i] = 1048576;
-    }
-
-    // One offs
-    expected[112] = 786432;
-    expected[118] = 786432;
-    expected[119] = 1048576;
-    expected[120] = 458752;
-    expected[121] = 524288;
-    expected[122] = 65536;
-
-    // Anything not assigned was the default 0.
-    return expected;
-  }
-
-  static final List<Shard> FOUR_BYTE_SHARDS =
-      generateFourByteShards(128, FOUR_BYTE_SHARDS_EXPECTED_ROUNTRIPPABLES);
-
-  private static List<Shard> generateFourByteShards(int numShards, long[] expected) {
-    assertThat(expected).hasLength(numShards);
-    List<Shard> shards = new ArrayList<>(numShards);
-    long lim = 1L << 32;
-    long increment = lim / numShards;
-    assertThat(lim % numShards).isEqualTo(0);
-    for (int i = 0; i < numShards; i++) {
-      shards.add(new Shard(i, increment * i, increment * (i + 1), expected[i]));
-    }
-    return shards;
-  }
-
-  /**
-   * Helper to run the loop to test all the permutations for the number of bytes specified.
-   *
-   * @param factory the factory for {@link ByteString} instances.
-   * @param numBytes the number of bytes in the byte array
-   * @param expectedCount the expected number of roundtrippable permutations
-   */
-  static void testBytes(ByteStringFactory factory, int numBytes, long expectedCount) {
-    testBytes(factory, numBytes, expectedCount, 0, -1);
-  }
-
-  /**
-   * Helper to run the loop to test all the permutations for the number of bytes specified. This
-   * overload is useful for debugging to get the loop to start at a certain character.
-   *
-   * @param factory the factory for {@link ByteString} instances.
-   * @param numBytes the number of bytes in the byte array
-   * @param expectedCount the expected number of roundtrippable permutations
-   * @param start the starting bytes encoded as a long as big-endian
-   * @param lim the limit of bytes to process encoded as a long as big-endian, or -1 to mean the max
-   *     limit for numBytes
-   */
-  static void testBytes(
-      ByteStringFactory factory, int numBytes, long expectedCount, long start, long lim) {
-    byte[] bytes = new byte[numBytes];
-
-    if (lim == -1) {
-      lim = 1L << (numBytes * 8);
-    }
-    long countRoundTripped = 0;
-    for (long byteChar = start; byteChar < lim; byteChar++) {
-      long tmpByteChar = byteChar;
-      for (int i = 0; i < numBytes; i++) {
-        bytes[bytes.length - i - 1] = (byte) tmpByteChar;
-        tmpByteChar = tmpByteChar >> 8;
-      }
-      ByteString bs = factory.newByteString(bytes);
-      boolean isRoundTrippable = bs.isValidUtf8();
-      String s = new String(bytes, Internal.UTF_8);
-      byte[] bytesReencoded = s.getBytes(Internal.UTF_8);
-      boolean bytesEqual = Arrays.equals(bytes, bytesReencoded);
-
-      if (bytesEqual != isRoundTrippable) {
-        outputFailure(byteChar, bytes, bytesReencoded);
-      }
-
-      // Check agreement with Utf8.isValidUtf8.
-      assertThat(Utf8.isValidUtf8(bytes)).isEqualTo(isRoundTrippable);
-
-      if (isRoundTrippable) {
-        countRoundTripped++;
-      }
-    }
-    assertThat(countRoundTripped).isEqualTo(expectedCount);
-  }
-
-  private static void outputFailure(long byteChar, byte[] bytes, byte[] after) {
-    outputFailure(byteChar, bytes, after, after.length);
-  }
-
-  private static void outputFailure(long byteChar, byte[] bytes, byte[] after, int len) {
-    assertWithMessage("Failure: (%s) %s => %s",
-            Long.toHexString(byteChar), toHexString(bytes), toHexString(after, len)).fail();
-  }
-
-  private static String toHexString(byte[] b) {
-    return toHexString(b, b.length);
-  }
-
-  private static String toHexString(byte[] b, int len) {
-    StringBuilder s = new StringBuilder();
-    s.append("\"");
-    for (int i = 0; i < len; i++) {
-      if (i > 0) {
-        s.append(" ");
-      }
-      s.append(String.format("%02x", b[i] & 0xFF));
-    }
-    s.append("\"");
-    return s.toString();
-  }
-}
diff --git a/libs/protobuf/java/core/src/test/java/com/google/protobuf/LazyFieldLiteTest.java b/libs/protobuf/java/core/src/test/java/com/google/protobuf/LazyFieldLiteTest.java
deleted file mode 100644
index 98cee80..0000000
--- a/libs/protobuf/java/core/src/test/java/com/google/protobuf/LazyFieldLiteTest.java
+++ /dev/null
@@ -1,266 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.common.truth.Truth.assertThat;
-import static protobuf_unittest.UnittestProto.optionalInt32Extension;
-
-import protobuf_unittest.UnittestProto.TestAllExtensions;
-import protobuf_unittest.UnittestProto.TestAllTypes;
-import java.io.IOException;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-/** Unit test for {@link LazyFieldLite}. */
-@RunWith(JUnit4.class)
-public class LazyFieldLiteTest {
-
-  @Test
-  public void testGetValue() {
-    MessageLite message = TestUtil.getAllSet();
-    LazyFieldLite lazyField = createLazyFieldLiteFromMessage(message);
-    assertThat(message).isEqualTo(lazyField.getValue(TestAllTypes.getDefaultInstance()));
-    changeValue(lazyField);
-    assertNotEqual(message, lazyField.getValue(TestAllTypes.getDefaultInstance()));
-  }
-
-  @Test
-  public void testGetValueEx() throws Exception {
-    TestAllExtensions message = TestUtil.getAllExtensionsSet();
-    LazyFieldLite lazyField = createLazyFieldLiteFromMessage(message);
-    assertThat(message).isEqualTo(lazyField.getValue(TestAllExtensions.getDefaultInstance()));
-    changeValue(lazyField);
-    assertNotEqual(message, lazyField.getValue(TestAllExtensions.getDefaultInstance()));
-  }
-
-  @Test
-  public void testSetValue() {
-    MessageLite message = TestUtil.getAllSet();
-    LazyFieldLite lazyField = createLazyFieldLiteFromMessage(message);
-    changeValue(lazyField);
-    assertNotEqual(message, lazyField.getValue(TestAllTypes.getDefaultInstance()));
-    message = lazyField.getValue(TestAllTypes.getDefaultInstance());
-    changeValue(lazyField);
-    assertThat(message).isEqualTo(lazyField.getValue(TestAllTypes.getDefaultInstance()));
-  }
-
-  @Test
-  public void testSetValueEx() throws Exception {
-    TestAllExtensions message = TestUtil.getAllExtensionsSet();
-    LazyFieldLite lazyField = createLazyFieldLiteFromMessage(message);
-    changeValue(lazyField);
-    assertNotEqual(message, lazyField.getValue(TestAllExtensions.getDefaultInstance()));
-    MessageLite value = lazyField.getValue(TestAllExtensions.getDefaultInstance());
-    changeValue(lazyField);
-    assertThat(value).isEqualTo(lazyField.getValue(TestAllExtensions.getDefaultInstance()));
-  }
-
-  @Test
-  public void testGetSerializedSize() {
-    MessageLite message = TestUtil.getAllSet();
-    LazyFieldLite lazyField = createLazyFieldLiteFromMessage(message);
-    assertThat(message.getSerializedSize()).isEqualTo(lazyField.getSerializedSize());
-    changeValue(lazyField);
-    assertNotEqual(message.getSerializedSize(), lazyField.getSerializedSize());
-  }
-
-  @Test
-  public void testGetSerializedSizeEx() throws Exception {
-    TestAllExtensions message = TestUtil.getAllExtensionsSet();
-    LazyFieldLite lazyField = createLazyFieldLiteFromMessage(message);
-    assertThat(message.getSerializedSize()).isEqualTo(lazyField.getSerializedSize());
-    changeValue(lazyField);
-    assertNotEqual(message.getSerializedSize(), lazyField.getSerializedSize());
-  }
-
-  @Test
-  public void testGetByteString() {
-    MessageLite message = TestUtil.getAllSet();
-    LazyFieldLite lazyField = createLazyFieldLiteFromMessage(message);
-    assertThat(message.toByteString()).isEqualTo(lazyField.toByteString());
-    changeValue(lazyField);
-    assertNotEqual(message.toByteString(), lazyField.toByteString());
-  }
-
-  @Test
-  public void testGetByteStringEx() throws Exception {
-    TestAllExtensions message = TestUtil.getAllExtensionsSet();
-    LazyFieldLite lazyField = createLazyFieldLiteFromMessage(message);
-    assertThat(message.toByteString()).isEqualTo(lazyField.toByteString());
-    changeValue(lazyField);
-    assertNotEqual(message.toByteString(), lazyField.toByteString());
-  }
-
-  @Test
-  public void testMergeExtensions() throws Exception {
-    TestAllExtensions message = TestUtil.getAllExtensionsSet();
-    LazyFieldLite original = createLazyFieldLiteFromMessage(message);
-    LazyFieldLite merged = new LazyFieldLite();
-    merged.merge(original);
-    TestAllExtensions value =
-        (TestAllExtensions) merged.getValue(TestAllExtensions.getDefaultInstance());
-    assertThat(message).isEqualTo(value);
-  }
-
-  @Test
-  public void testEmptyLazyField() throws Exception {
-    LazyFieldLite field = new LazyFieldLite();
-    assertThat(field.getSerializedSize()).isEqualTo(0);
-    assertThat(field.toByteString()).isEqualTo(ByteString.EMPTY);
-  }
-
-  @Test
-  public void testInvalidProto() throws Exception {
-    // Silently fails and uses the default instance.
-    LazyFieldLite field =
-        new LazyFieldLite(TestUtil.getExtensionRegistry(), ByteString.copyFromUtf8("invalid"));
-    assertThat(
-        field.getValue(TestAllTypes.getDefaultInstance()))
-            .isEqualTo(TestAllTypes.getDefaultInstance());
-    assertThat(field.getSerializedSize()).isEqualTo(0);
-    assertThat(field.toByteString()).isEqualTo(ByteString.EMPTY);
-  }
-
-  @Test
-  public void testMergeBeforeParsing() throws Exception {
-    TestAllTypes message1 = TestAllTypes.newBuilder().setOptionalInt32(1).build();
-    LazyFieldLite field1 = createLazyFieldLiteFromMessage(message1);
-    TestAllTypes message2 = TestAllTypes.newBuilder().setOptionalInt64(2).build();
-    LazyFieldLite field2 = createLazyFieldLiteFromMessage(message2);
-
-    field1.merge(field2);
-    TestAllTypes expected =
-        TestAllTypes.newBuilder().setOptionalInt32(1).setOptionalInt64(2).build();
-    assertThat(field1.getValue(TestAllTypes.getDefaultInstance())).isEqualTo(expected);
-  }
-
-  @Test
-  public void testMergeOneNotParsed() throws Exception {
-    // Test a few different paths that involve one message that was not parsed.
-    TestAllTypes message1 = TestAllTypes.newBuilder().setOptionalInt32(1).build();
-    TestAllTypes message2 = TestAllTypes.newBuilder().setOptionalInt64(2).build();
-    TestAllTypes expected =
-        TestAllTypes.newBuilder().setOptionalInt32(1).setOptionalInt64(2).build();
-
-    LazyFieldLite field1 = LazyFieldLite.fromValue(message1);
-    field1.getValue(TestAllTypes.getDefaultInstance()); // Force parsing.
-    LazyFieldLite field2 = createLazyFieldLiteFromMessage(message2);
-    field1.merge(field2);
-    assertThat(field1.getValue(TestAllTypes.getDefaultInstance())).isEqualTo(expected);
-
-    // Now reverse which one is parsed first.
-    field1 = LazyFieldLite.fromValue(message1);
-    field2 = createLazyFieldLiteFromMessage(message2);
-    field2.getValue(TestAllTypes.getDefaultInstance()); // Force parsing.
-    field1.merge(field2);
-    assertThat(field1.getValue(TestAllTypes.getDefaultInstance())).isEqualTo(expected);
-  }
-
-  @Test
-  public void testMergeInvalid() throws Exception {
-    // Test a few different paths that involve one message that was not parsed.
-    TestAllTypes message = TestAllTypes.newBuilder().setOptionalInt32(1).build();
-    LazyFieldLite valid = LazyFieldLite.fromValue(message);
-    LazyFieldLite invalid =
-        new LazyFieldLite(TestUtil.getExtensionRegistry(), ByteString.copyFromUtf8("invalid"));
-    invalid.merge(valid);
-
-    // We swallow the exception and just use the set field.
-    assertThat(invalid.getValue(TestAllTypes.getDefaultInstance())).isEqualTo(message);
-  }
-
-  @Test
-  public void testMergeKeepsExtensionsWhenPossible() throws Exception {
-    // In this test we attempt to only use the empty registry, which will strip out all extensions
-    // when serializing and then parsing. We verify that each code path will attempt to not
-    // serialize and parse a message that was set directly without going through the
-    // extensionRegistry.
-    TestAllExtensions messageWithExtensions =
-        TestAllExtensions.newBuilder().setExtension(optionalInt32Extension, 42).build();
-    TestAllExtensions emptyMessage = TestAllExtensions.getDefaultInstance();
-
-    ExtensionRegistryLite emptyRegistry = ExtensionRegistryLite.getEmptyRegistry();
-
-    LazyFieldLite field = LazyFieldLite.fromValue(messageWithExtensions);
-    field.merge(createLazyFieldLiteFromMessage(emptyRegistry, emptyMessage));
-    assertThat(field.getValue(TestAllExtensions.getDefaultInstance()))
-        .isEqualTo(messageWithExtensions);
-
-    // Now reverse the order of the merging.
-    field = createLazyFieldLiteFromMessage(emptyRegistry, emptyMessage);
-    field.merge(LazyFieldLite.fromValue(messageWithExtensions));
-    assertThat(field.getValue(TestAllExtensions.getDefaultInstance()))
-        .isEqualTo(messageWithExtensions);
-
-    // Now try parsing the empty field first.
-    field = LazyFieldLite.fromValue(messageWithExtensions);
-    LazyFieldLite other = createLazyFieldLiteFromMessage(emptyRegistry, emptyMessage);
-    other.getValue(TestAllExtensions.getDefaultInstance()); // Force parsing.
-    field.merge(other);
-    assertThat(field.getValue(TestAllExtensions.getDefaultInstance()))
-        .isEqualTo(messageWithExtensions);
-
-    // And again reverse.
-    field = createLazyFieldLiteFromMessage(emptyRegistry, emptyMessage);
-    field.getValue(TestAllExtensions.getDefaultInstance()); // Force parsing.
-    other = LazyFieldLite.fromValue(messageWithExtensions);
-    field.merge(other);
-    assertThat(field.getValue(TestAllExtensions.getDefaultInstance()))
-        .isEqualTo(messageWithExtensions);
-  }
-
-
-  // Help methods.
-
-  private LazyFieldLite createLazyFieldLiteFromMessage(MessageLite message) {
-    return createLazyFieldLiteFromMessage(TestUtil.getExtensionRegistry(), message);
-  }
-
-  private LazyFieldLite createLazyFieldLiteFromMessage(
-      ExtensionRegistryLite extensionRegistry, MessageLite message) {
-    ByteString bytes = message.toByteString();
-    return new LazyFieldLite(extensionRegistry, bytes);
-  }
-
-  private void changeValue(LazyFieldLite lazyField) {
-    TestAllTypes.Builder builder = TestUtil.getAllSet().toBuilder();
-    builder.addRepeatedBool(true);
-    MessageLite newMessage = builder.build();
-    lazyField.setValue(newMessage);
-  }
-
-  private void assertNotEqual(Object unexpected, Object actual) {
-    assertThat(unexpected).isNotSameInstanceAs(actual);
-    assertThat((unexpected != null && unexpected.equals(actual))).isFalse();
-  }
-
-}
diff --git a/libs/protobuf/java/core/src/test/java/com/google/protobuf/LazyFieldTest.java b/libs/protobuf/java/core/src/test/java/com/google/protobuf/LazyFieldTest.java
deleted file mode 100644
index dbda3bd..0000000
--- a/libs/protobuf/java/core/src/test/java/com/google/protobuf/LazyFieldTest.java
+++ /dev/null
@@ -1,127 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import protobuf_unittest.UnittestProto.TestAllExtensions;
-import protobuf_unittest.UnittestProto.TestAllTypes;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-/** Unit test for {@link LazyField}. */
-@RunWith(JUnit4.class)
-public class LazyFieldTest {
-
-  @Test
-  public void testHashCode() {
-    MessageLite message = TestUtil.getAllSet();
-    LazyField lazyField = createLazyFieldFromMessage(message);
-    assertThat(message.hashCode()).isEqualTo(lazyField.hashCode());
-    lazyField.getValue();
-    assertThat(message.hashCode()).isEqualTo(lazyField.hashCode());
-    changeValue(lazyField);
-    // make sure two messages have different hash code
-    assertNotEqual(message.hashCode(), lazyField.hashCode());
-  }
-
-  @Test
-  public void testHashCodeEx() throws Exception {
-    TestAllExtensions message = TestUtil.getAllExtensionsSet();
-    LazyField lazyField = createLazyFieldFromMessage(message);
-    assertThat(message.hashCode()).isEqualTo(lazyField.hashCode());
-    lazyField.getValue();
-    assertThat(message.hashCode()).isEqualTo(lazyField.hashCode());
-    changeValue(lazyField);
-    // make sure two messages have different hash code
-    assertNotEqual(message.hashCode(), lazyField.hashCode());
-  }
-
-  @Test
-  public void testGetValue() {
-    MessageLite message = TestUtil.getAllSet();
-    LazyField lazyField = createLazyFieldFromMessage(message);
-    assertThat(message).isEqualTo(lazyField.getValue());
-    changeValue(lazyField);
-    assertNotEqual(message, lazyField.getValue());
-  }
-
-  @Test
-  public void testGetValueEx() throws Exception {
-    TestAllExtensions message = TestUtil.getAllExtensionsSet();
-    LazyField lazyField = createLazyFieldFromMessage(message);
-    assertThat(message).isEqualTo(lazyField.getValue());
-    changeValue(lazyField);
-    assertNotEqual(message, lazyField.getValue());
-  }
-
-  @Test
-  public void testEqualsObject() {
-    MessageLite message = TestUtil.getAllSet();
-    LazyField lazyField = createLazyFieldFromMessage(message);
-    assertThat(lazyField).isEqualTo(message);
-    changeValue(lazyField);
-    assertThat(lazyField).isNotEqualTo(message);
-    assertThat(message).isNotEqualTo(lazyField.getValue());
-  }
-
-  @Test
-  @SuppressWarnings("TruthIncompatibleType") // LazyField.equals() is not symmetric
-  public void testEqualsObjectEx() throws Exception {
-    TestAllExtensions message = TestUtil.getAllExtensionsSet();
-    LazyField lazyField = createLazyFieldFromMessage(message);
-    assertThat(lazyField).isEqualTo(message);
-    changeValue(lazyField);
-    assertThat(lazyField).isNotEqualTo(message);
-    assertThat(message).isNotEqualTo(lazyField.getValue());
-  }
-
-  // Help methods.
-
-  private LazyField createLazyFieldFromMessage(MessageLite message) {
-    ByteString bytes = message.toByteString();
-    return new LazyField(
-        message.getDefaultInstanceForType(), TestUtil.getExtensionRegistry(), bytes);
-  }
-
-  private void changeValue(LazyField lazyField) {
-    TestAllTypes.Builder builder = TestUtil.getAllSet().toBuilder();
-    builder.addRepeatedBool(true);
-    MessageLite newMessage = builder.build();
-    lazyField.setValue(newMessage);
-  }
-
-  private void assertNotEqual(Object unexpected, Object actual) {
-    assertThat(unexpected).isNotSameInstanceAs(actual);
-    assertThat((unexpected != null && unexpected.equals(actual))).isFalse();
-  }
-}
diff --git a/libs/protobuf/java/core/src/test/java/com/google/protobuf/LazyMessageLiteTest.java b/libs/protobuf/java/core/src/test/java/com/google/protobuf/LazyMessageLiteTest.java
deleted file mode 100644
index 7d6b0d6..0000000
--- a/libs/protobuf/java/core/src/test/java/com/google/protobuf/LazyMessageLiteTest.java
+++ /dev/null
@@ -1,314 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.common.truth.Truth.assertThat;
-import static com.google.common.truth.Truth.assertWithMessage;
-
-import protobuf_unittest.LazyFieldsLite.LazyExtension;
-import protobuf_unittest.LazyFieldsLite.LazyInnerMessageLite;
-import protobuf_unittest.LazyFieldsLite.LazyMessageLite;
-import protobuf_unittest.LazyFieldsLite.LazyNestedInnerMessageLite;
-import java.util.ArrayList;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-/** Unit test for messages with lazy fields. */
-@RunWith(JUnit4.class)
-public class LazyMessageLiteTest {
-
-  @Test
-  public void testSetValues() {
-    LazyNestedInnerMessageLite nested = LazyNestedInnerMessageLite.newBuilder().setNum(3).build();
-    LazyInnerMessageLite inner =
-        LazyInnerMessageLite.newBuilder().setNum(2).setNested(nested).build();
-    LazyMessageLite outer =
-        LazyMessageLite.newBuilder()
-            .setNum(1)
-            .setInner(inner)
-            .setOneofNum(123)
-            .setOneofInner(inner)
-            .build();
-
-    assertThat(outer.getNum()).isEqualTo(1);
-    assertThat(outer.getNumWithDefault()).isEqualTo(421);
-
-    assertThat(outer.getInner().getNum()).isEqualTo(2);
-    assertThat(outer.getInner().getNumWithDefault()).isEqualTo(42);
-
-    assertThat(outer.getInner().getNum()).isEqualTo(2);
-    assertThat(outer.getInner().getNumWithDefault()).isEqualTo(42);
-
-    assertThat(outer.getInner().getNested().getNum()).isEqualTo(3);
-    assertThat(outer.getInner().getNested().getNumWithDefault()).isEqualTo(4);
-
-    assertThat(outer.hasOneofNum()).isFalse();
-    assertThat(outer.hasOneofInner()).isTrue();
-
-    assertThat(outer.getOneofInner().getNum()).isEqualTo(2);
-    assertThat(outer.getOneofInner().getNumWithDefault()).isEqualTo(42);
-    assertThat(outer.getOneofInner().getNested().getNum()).isEqualTo(3);
-    assertThat(outer.getOneofInner().getNested().getNumWithDefault()).isEqualTo(4);
-  }
-
-  @Test
-  public void testSetRepeatedValues() {
-    LazyMessageLite outer =
-        LazyMessageLite.newBuilder()
-            .setNum(1)
-            .addRepeatedInner(LazyInnerMessageLite.newBuilder().setNum(119))
-            .addRepeatedInner(LazyInnerMessageLite.newBuilder().setNum(122))
-            .build();
-
-    assertThat(outer.getNum()).isEqualTo(1);
-    assertThat(outer.getRepeatedInnerCount()).isEqualTo(2);
-    assertThat(outer.getRepeatedInner(0).getNum()).isEqualTo(119);
-    assertThat(outer.getRepeatedInner(1).getNum()).isEqualTo(122);
-  }
-
-  @Test
-  public void testRepeatedMutability() throws Exception {
-    LazyMessageLite outer =
-        LazyMessageLite.newBuilder()
-            .addRepeatedInner(LazyInnerMessageLite.newBuilder().setNum(119))
-            .addRepeatedInner(LazyInnerMessageLite.newBuilder().setNum(122))
-            .build();
-
-    outer =
-        LazyMessageLite.parseFrom(outer.toByteArray(),
-            ExtensionRegistryLite.getEmptyRegistry());
-    try {
-      outer.getRepeatedInnerList().set(1, null);
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException expected) {
-    }
-  }
-
-  @Test
-  public void testAddAll() {
-    ArrayList<LazyInnerMessageLite> inners = new ArrayList<>();
-    int count = 4;
-    for (int i = 0; i < count; i++) {
-      LazyInnerMessageLite inner = LazyInnerMessageLite.newBuilder().setNum(i).build();
-      inners.add(inner);
-    }
-
-    LazyMessageLite outer = LazyMessageLite.newBuilder().addAllRepeatedInner(inners).build();
-    assertThat(outer.getRepeatedInnerCount()).isEqualTo(count);
-    for (int i = 0; i < count; i++) {
-      assertThat(outer.getRepeatedInner(i).getNum()).isEqualTo(i);
-    }
-  }
-
-  @Test
-  public void testGetDefaultValues() {
-    LazyMessageLite outer = LazyMessageLite.getDefaultInstance();
-
-    assertThat(outer.getNum()).isEqualTo(0);
-    assertThat(outer.getNumWithDefault()).isEqualTo(421);
-
-    assertThat(outer.getInner().getNum()).isEqualTo(0);
-    assertThat(outer.getInner().getNumWithDefault()).isEqualTo(42);
-
-    assertThat(outer.getInner().getNested().getNum()).isEqualTo(0);
-    assertThat(outer.getInner().getNested().getNumWithDefault()).isEqualTo(4);
-
-    assertThat(outer.getOneofNum()).isEqualTo(0);
-
-    assertThat(outer.getOneofInner().getNum()).isEqualTo(0);
-    assertThat(outer.getOneofInner().getNumWithDefault()).isEqualTo(42);
-    assertThat(outer.getOneofInner().getNested().getNum()).isEqualTo(0);
-    assertThat(outer.getOneofInner().getNested().getNumWithDefault()).isEqualTo(4);
-  }
-
-  @Test
-  public void testClearValues() {
-    LazyInnerMessageLite inner = LazyInnerMessageLite.newBuilder().setNum(115).build();
-
-    LazyMessageLite.Builder outerBuilder = LazyMessageLite.newBuilder();
-
-    assertThat(outerBuilder.build().getNum()).isEqualTo(0);
-
-    // Set/Clear num
-    outerBuilder.setNum(100);
-
-    assertThat(outerBuilder.build().getNum()).isEqualTo(100);
-    assertThat(outerBuilder.build().getNumWithDefault()).isEqualTo(421);
-    assertThat(outerBuilder.build().hasInner()).isFalse();
-
-    outerBuilder.clearNum();
-
-    assertThat(outerBuilder.build().getNum()).isEqualTo(0);
-    assertThat(outerBuilder.build().getNumWithDefault()).isEqualTo(421);
-    assertThat(outerBuilder.build().hasInner()).isFalse();
-
-    // Set/Clear all
-    outerBuilder
-        .setNum(100)
-        .setInner(inner)
-        .addRepeatedInner(LazyInnerMessageLite.newBuilder().setNum(119))
-        .addRepeatedInner(LazyInnerMessageLite.newBuilder().setNum(122))
-        .setOneofInner(LazyInnerMessageLite.newBuilder().setNum(123));
-
-    LazyMessageLite outer = outerBuilder.build();
-    assertThat(outer.getNum()).isEqualTo(100);
-    assertThat(outer.getNumWithDefault()).isEqualTo(421);
-    assertThat(outer.hasInner()).isTrue();
-    assertThat(outer.getInner().getNum()).isEqualTo(115);
-    assertThat(outer.getRepeatedInnerCount()).isEqualTo(2);
-    assertThat(outer.getRepeatedInner(0).getNum()).isEqualTo(119);
-    assertThat(outer.getRepeatedInner(1).getNum()).isEqualTo(122);
-    assertThat(outer.hasOneofInner()).isTrue();
-    assertThat(outer.getOneofInner().getNum()).isEqualTo(123);
-
-    outerBuilder.clear();
-
-    outer = outerBuilder.build();
-
-    assertThat(outer.getNum()).isEqualTo(0);
-    assertThat(outer.getNumWithDefault()).isEqualTo(421);
-    assertThat(outer.hasInner()).isFalse();
-    assertThat(outer.getRepeatedInnerCount()).isEqualTo(0);
-    assertThat(outer.hasOneofInner()).isFalse();
-    assertThat(outer.getOneofInner().getNum()).isEqualTo(0);
-  }
-
-  @Test
-  public void testMergeValues() {
-    LazyMessageLite outerBase = LazyMessageLite.newBuilder().setNumWithDefault(122).build();
-
-    LazyInnerMessageLite innerMerging = LazyInnerMessageLite.newBuilder().setNum(115).build();
-    LazyMessageLite outerMerging =
-        LazyMessageLite.newBuilder()
-            .setNum(119)
-            .setInner(innerMerging)
-            .setOneofInner(innerMerging)
-            .build();
-
-    LazyMessageLite merged = LazyMessageLite.newBuilder(outerBase).mergeFrom(outerMerging).build();
-    assertThat(merged.getNum()).isEqualTo(119);
-    assertThat(merged.getNumWithDefault()).isEqualTo(122);
-    assertThat(merged.getInner().getNum()).isEqualTo(115);
-    assertThat(merged.getInner().getNumWithDefault()).isEqualTo(42);
-    assertThat(merged.getOneofInner().getNum()).isEqualTo(115);
-    assertThat(merged.getOneofInner().getNumWithDefault()).isEqualTo(42);
-  }
-
-  @Test
-  public void testMergeDefaultValues() {
-    LazyInnerMessageLite innerBase = LazyInnerMessageLite.newBuilder().setNum(115).build();
-    LazyMessageLite outerBase =
-        LazyMessageLite.newBuilder()
-            .setNum(119)
-            .setNumWithDefault(122)
-            .setInner(innerBase)
-            .setOneofInner(innerBase)
-            .build();
-
-    LazyMessageLite outerMerging = LazyMessageLite.getDefaultInstance();
-
-    LazyMessageLite merged = LazyMessageLite.newBuilder(outerBase).mergeFrom(outerMerging).build();
-    // Merging default-instance shouldn't overwrite values in the base message.
-    assertThat(merged.getNum()).isEqualTo(119);
-    assertThat(merged.getNumWithDefault()).isEqualTo(122);
-    assertThat(merged.getInner().getNum()).isEqualTo(115);
-    assertThat(merged.getInner().getNumWithDefault()).isEqualTo(42);
-    assertThat(merged.getOneofInner().getNum()).isEqualTo(115);
-    assertThat(merged.getOneofInner().getNumWithDefault()).isEqualTo(42);
-  }
-
-  // Regression test for b/28198805.
-  @Test
-  public void testMergeOneofMessages() throws Exception {
-    LazyInnerMessageLite inner = LazyInnerMessageLite.getDefaultInstance();
-    LazyMessageLite outer = LazyMessageLite.newBuilder().setOneofInner(inner).build();
-    ByteString data1 = outer.toByteString();
-
-    // The following should not alter the content of the 'outer' message.
-    LazyMessageLite.Builder merged = outer.toBuilder();
-    LazyInnerMessageLite anotherInner = LazyInnerMessageLite.newBuilder().setNum(12345).build();
-    merged.setOneofInner(anotherInner);
-
-    // Check that the 'outer' stays the same.
-    ByteString data2 = outer.toByteString();
-    assertThat(data1).isEqualTo(data2);
-    assertThat(outer.getOneofInner().getNum()).isEqualTo(0);
-  }
-
-  @Test
-  public void testSerialize() throws InvalidProtocolBufferException {
-    LazyNestedInnerMessageLite nested = LazyNestedInnerMessageLite.newBuilder().setNum(3).build();
-    LazyInnerMessageLite inner =
-        LazyInnerMessageLite.newBuilder().setNum(2).setNested(nested).build();
-    LazyMessageLite outer =
-        LazyMessageLite.newBuilder().setNum(1).setInner(inner).setOneofInner(inner).build();
-
-    ByteString bytes = outer.toByteString();
-    assertThat(bytes.size()).isEqualTo(outer.getSerializedSize());
-
-    LazyMessageLite deserialized =
-        LazyMessageLite.parseFrom(bytes, ExtensionRegistryLite.getEmptyRegistry());
-
-    assertThat(deserialized.getNum()).isEqualTo(1);
-    assertThat(deserialized.getNumWithDefault()).isEqualTo(421);
-
-    assertThat(deserialized.getInner().getNum()).isEqualTo(2);
-    assertThat(deserialized.getInner().getNumWithDefault()).isEqualTo(42);
-
-    assertThat(deserialized.getInner().getNested().getNum()).isEqualTo(3);
-    assertThat(deserialized.getInner().getNested().getNumWithDefault()).isEqualTo(4);
-
-    assertThat(deserialized.getOneofInner().getNum()).isEqualTo(2);
-    assertThat(deserialized.getOneofInner().getNumWithDefault()).isEqualTo(42);
-    assertThat(deserialized.getOneofInner().getNested().getNum()).isEqualTo(3);
-    assertThat(deserialized.getOneofInner().getNested().getNumWithDefault()).isEqualTo(4);
-
-    assertThat(deserialized.toByteString()).isEqualTo(bytes);
-  }
-
-  @Test
-  public void testExtensions() throws Exception {
-    LazyInnerMessageLite.Builder innerBuilder = LazyInnerMessageLite.newBuilder();
-    innerBuilder.setExtension(
-        LazyExtension.extension, LazyExtension.newBuilder().setName("name").build());
-    assertThat(innerBuilder.hasExtension(LazyExtension.extension)).isTrue();
-    assertThat(innerBuilder.getExtension(LazyExtension.extension).getName()).isEqualTo("name");
-
-    LazyInnerMessageLite innerMessage = innerBuilder.build();
-    assertThat(innerMessage.hasExtension(LazyExtension.extension)).isTrue();
-    assertThat(innerMessage.getExtension(LazyExtension.extension).getName()).isEqualTo("name");
-
-    LazyMessageLite lite = LazyMessageLite.newBuilder().setInner(innerMessage).build();
-    assertThat(lite.getInner().hasExtension(LazyExtension.extension)).isTrue();
-    assertThat(lite.getInner().getExtension(LazyExtension.extension).getName()).isEqualTo("name");
-  }
-}
diff --git a/libs/protobuf/java/core/src/test/java/com/google/protobuf/LazyStringArrayListTest.java b/libs/protobuf/java/core/src/test/java/com/google/protobuf/LazyStringArrayListTest.java
deleted file mode 100644
index 1ef03ce..0000000
--- a/libs/protobuf/java/core/src/test/java/com/google/protobuf/LazyStringArrayListTest.java
+++ /dev/null
@@ -1,372 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.common.truth.Truth.assertThat;
-import static com.google.common.truth.Truth.assertWithMessage;
-import static java.util.Arrays.asList;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.ConcurrentModificationException;
-import java.util.Iterator;
-import java.util.List;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-/** Tests for {@link LazyStringArrayList}. */
-@RunWith(JUnit4.class)
-public class LazyStringArrayListTest {
-
-  private static final String STRING_A = "A";
-  private static final String STRING_B = "B";
-  private static final String STRING_C = "C";
-
-  private static final ByteString BYTE_STRING_A = ByteString.copyFromUtf8("A");
-  private static final ByteString BYTE_STRING_B = ByteString.copyFromUtf8("B");
-  private static final ByteString BYTE_STRING_C = ByteString.copyFromUtf8("C");
-
-  @Test
-  public void testJustStrings() {
-    LazyStringArrayList list = new LazyStringArrayList();
-    list.add(STRING_A);
-    list.add(STRING_B);
-    list.add(STRING_C);
-
-    assertThat(list).hasSize(3);
-    assertThat(list.get(0)).isSameInstanceAs(STRING_A);
-    assertThat(list.get(1)).isSameInstanceAs(STRING_B);
-    assertThat(list.get(2)).isSameInstanceAs(STRING_C);
-
-    list.set(1, STRING_C);
-    assertThat(list.get(1)).isSameInstanceAs(STRING_C);
-
-    list.remove(1);
-    assertThat(list.get(0)).isSameInstanceAs(STRING_A);
-    assertThat(list.get(1)).isSameInstanceAs(STRING_C);
-
-    List<ByteString> byteStringList = list.asByteStringList();
-    assertThat(byteStringList.get(0)).isEqualTo(BYTE_STRING_A);
-    assertThat(byteStringList.get(1)).isEqualTo(BYTE_STRING_C);
-
-    // Underlying list should be transformed.
-    assertThat(byteStringList.get(0)).isSameInstanceAs(list.getByteString(0));
-    assertThat(byteStringList.get(1)).isSameInstanceAs(list.getByteString(1));
-  }
-
-  @Test
-  public void testJustByteString() {
-    LazyStringArrayList list = new LazyStringArrayList();
-    list.add(BYTE_STRING_A);
-    list.add(BYTE_STRING_B);
-    list.add(BYTE_STRING_C);
-
-    assertThat(list).hasSize(3);
-    assertThat(list.getByteString(0)).isSameInstanceAs(BYTE_STRING_A);
-    assertThat(list.getByteString(1)).isSameInstanceAs(BYTE_STRING_B);
-    assertThat(list.getByteString(2)).isSameInstanceAs(BYTE_STRING_C);
-
-    list.remove(1);
-    assertThat(list.getByteString(0)).isSameInstanceAs(BYTE_STRING_A);
-    assertThat(list.getByteString(1)).isSameInstanceAs(BYTE_STRING_C);
-
-    List<ByteString> byteStringList = list.asByteStringList();
-    assertThat(byteStringList.get(0)).isSameInstanceAs(BYTE_STRING_A);
-    assertThat(byteStringList.get(1)).isSameInstanceAs(BYTE_STRING_C);
-  }
-
-  @Test
-  public void testConversionBackAndForth() {
-    LazyStringArrayList list = new LazyStringArrayList();
-    list.add(STRING_A);
-    list.add(BYTE_STRING_B);
-    list.add(BYTE_STRING_C);
-
-    // String a should be the same because it was originally a string
-    assertThat(list.get(0)).isSameInstanceAs(STRING_A);
-
-    // String b and c should be different because the string has to be computed
-    // from the ByteString
-    String bPrime = list.get(1);
-    assertThat(bPrime).isNotSameInstanceAs(STRING_B);
-    assertThat(bPrime).isEqualTo(STRING_B);
-    String cPrime = list.get(2);
-    assertThat(cPrime).isNotSameInstanceAs(STRING_C);
-    assertThat(cPrime).isEqualTo(STRING_C);
-
-    // String c and c should stay the same once cached.
-    assertThat(list.get(1)).isSameInstanceAs(bPrime);
-    assertThat(list.get(2)).isSameInstanceAs(cPrime);
-
-    // ByteString needs to be computed from string for both a and b
-    ByteString aPrimeByteString = list.getByteString(0);
-    assertThat(aPrimeByteString).isEqualTo(BYTE_STRING_A);
-    ByteString bPrimeByteString = list.getByteString(1);
-    assertThat(bPrimeByteString).isNotSameInstanceAs(BYTE_STRING_B);
-    assertThat(list.getByteString(1)).isEqualTo(BYTE_STRING_B);
-
-    // Once cached, ByteString should stay cached.
-    assertThat(list.getByteString(0)).isSameInstanceAs(aPrimeByteString);
-    assertThat(list.getByteString(1)).isSameInstanceAs(bPrimeByteString);
-  }
-
-  @Test
-  public void testCopyConstructorCopiesByReference() {
-    LazyStringArrayList list1 = new LazyStringArrayList();
-    list1.add(STRING_A);
-    list1.add(BYTE_STRING_B);
-    list1.add(BYTE_STRING_C);
-
-    LazyStringArrayList list2 = new LazyStringArrayList(list1);
-    assertThat(list2).hasSize(3);
-    assertThat(list2.get(0)).isSameInstanceAs(STRING_A);
-    assertThat(list2.getByteString(1)).isSameInstanceAs(BYTE_STRING_B);
-    assertThat(list2.getByteString(2)).isSameInstanceAs(BYTE_STRING_C);
-  }
-
-  @Test
-  public void testListCopyConstructor() {
-    List<String> list1 = new ArrayList<>();
-    list1.add(STRING_A);
-    list1.add(STRING_B);
-    list1.add(STRING_C);
-
-    LazyStringArrayList list2 = new LazyStringArrayList(list1);
-    assertThat(list2).hasSize(3);
-    assertThat(list2.get(0)).isSameInstanceAs(STRING_A);
-    assertThat(list2.get(1)).isSameInstanceAs(STRING_B);
-    assertThat(list2.get(2)).isSameInstanceAs(STRING_C);
-  }
-
-  @Test
-  public void testAddAllCopiesByReferenceIfPossible() {
-    LazyStringArrayList list1 = new LazyStringArrayList();
-    list1.add(STRING_A);
-    list1.add(BYTE_STRING_B);
-    list1.add(BYTE_STRING_C);
-
-    LazyStringArrayList list2 = new LazyStringArrayList();
-    list2.addAll(list1);
-
-    assertThat(list2).hasSize(3);
-    assertThat(list2.get(0)).isSameInstanceAs(STRING_A);
-    assertThat(list2.getByteString(1)).isSameInstanceAs(BYTE_STRING_B);
-    assertThat(list2.getByteString(2)).isSameInstanceAs(BYTE_STRING_C);
-  }
-
-  @Test
-  public void testModificationWithIteration() {
-    LazyStringArrayList list = new LazyStringArrayList();
-    list.addAll(asList(STRING_A, STRING_B, STRING_C));
-    Iterator<String> iterator = list.iterator();
-    assertThat(list).hasSize(3);
-    assertThat(list.get(0)).isEqualTo(STRING_A);
-    assertThat(iterator.next()).isSameInstanceAs(STRING_A);
-
-    // Does not structurally modify.
-    iterator = list.iterator();
-    list.set(0, STRING_B);
-    iterator.next();
-
-    list.remove(0);
-    try {
-      iterator.next();
-      assertWithMessage("expected exception").fail();;
-    } catch (ConcurrentModificationException e) {
-      // expected
-    }
-
-    iterator = list.iterator();
-    list.add(0, STRING_C);
-    try {
-      iterator.next();
-      assertWithMessage("expected exception").fail();;
-    } catch (ConcurrentModificationException e) {
-      // expected
-    }
-  }
-
-  @Test
-  public void testMakeImmutable() {
-    LazyStringArrayList list = new LazyStringArrayList();
-    list.add(STRING_A);
-    list.add(STRING_B);
-    list.add(STRING_C);
-    list.makeImmutable();
-    assertGenericListImmutable(list, STRING_A);
-
-    // LazyStringArrayList has extra methods not covered in the generic
-    // assertion.
-
-    try {
-      list.add(BYTE_STRING_A.toByteArray());
-      assertWithMessage("expected exception").fail();;
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.add(BYTE_STRING_A);
-      assertWithMessage("expected exception").fail();;
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.addAllByteArray(Collections.singletonList(BYTE_STRING_A.toByteArray()));
-      assertWithMessage("expected exception").fail();;
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.addAllByteString(asList(BYTE_STRING_A));
-      assertWithMessage("expected exception").fail();;
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.mergeFrom(new LazyStringArrayList());
-      assertWithMessage("expected exception").fail();;
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.set(0, BYTE_STRING_A.toByteArray());
-      assertWithMessage("expected exception").fail();;
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.set(0, BYTE_STRING_A);
-      assertWithMessage("expected exception").fail();;
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-  }
-
-  @Test
-  public void testImmutabilityPropagation() {
-    LazyStringArrayList list = new LazyStringArrayList();
-    list.add(STRING_A);
-    list.makeImmutable();
-
-    assertGenericListImmutable(list.asByteStringList(), BYTE_STRING_A);
-
-    // Arrays use reference equality so need to retrieve the underlying value
-    // to properly test deep immutability.
-    List<byte[]> byteArrayList = list.asByteArrayList();
-    assertGenericListImmutable(byteArrayList, byteArrayList.get(0));
-  }
-
-  private static <T> void assertGenericListImmutable(List<T> list, T value) {
-    try {
-      list.add(value);
-      assertWithMessage("expected exception").fail();;
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.add(0, value);
-      assertWithMessage("expected exception").fail();;
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.addAll(asList(value));
-      assertWithMessage("expected exception").fail();;
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.addAll(0, asList(value));
-      assertWithMessage("expected exception").fail();;
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.clear();
-      assertWithMessage("expected exception").fail();;
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.remove(0);
-      assertWithMessage("expected exception").fail();;
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.remove(value);
-      assertWithMessage("expected exception").fail();;
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.removeAll(asList(value));
-      assertWithMessage("expected exception").fail();;
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.retainAll(asList());
-      assertWithMessage("expected exception").fail();;
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.retainAll(asList());
-      assertWithMessage("expected exception").fail();;
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.set(0, value);
-      assertWithMessage("expected exception").fail();;
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-  }
-}
diff --git a/libs/protobuf/java/core/src/test/java/com/google/protobuf/LazyStringEndToEndTest.java b/libs/protobuf/java/core/src/test/java/com/google/protobuf/LazyStringEndToEndTest.java
deleted file mode 100644
index e91911f..0000000
--- a/libs/protobuf/java/core/src/test/java/com/google/protobuf/LazyStringEndToEndTest.java
+++ /dev/null
@@ -1,139 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import protobuf_unittest.UnittestProto;
-import java.io.IOException;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-/**
- * Tests to make sure the lazy conversion of UTF8-encoded byte arrays to strings works
- * correctly.
- */
-@RunWith(JUnit4.class)
-public class LazyStringEndToEndTest {
-
-  private static final ByteString TEST_ALL_TYPES_SERIALIZED_WITH_ILLEGAL_UTF8 =
-      ByteString.copyFrom(
-          new byte[] {
-            114, 4, -1, 0, -1, 0, -30, 2, 4, -1,
-            0, -1, 0, -30, 2, 4, -1, 0, -1, 0,
-          });
-
-  private ByteString encodedTestAllTypes;
-
-  @Before
-  public void setUp() throws Exception {
-    this.encodedTestAllTypes =
-        UnittestProto.TestAllTypes.newBuilder()
-            .setOptionalString("foo")
-            .addRepeatedString("bar")
-            .addRepeatedString("baz")
-            .build()
-            .toByteString();
-  }
-
-  /** Tests that an invalid UTF8 string will roundtrip through a parse and serialization. */
-  @Test
-  public void testParseAndSerialize() throws InvalidProtocolBufferException {
-    UnittestProto.TestAllTypes tV2 =
-        UnittestProto.TestAllTypes.parseFrom(
-            TEST_ALL_TYPES_SERIALIZED_WITH_ILLEGAL_UTF8,
-            ExtensionRegistryLite.getEmptyRegistry());
-    ByteString bytes = tV2.toByteString();
-    assertThat(bytes).isEqualTo(TEST_ALL_TYPES_SERIALIZED_WITH_ILLEGAL_UTF8);
-
-    String unused = tV2.getOptionalString();
-    bytes = tV2.toByteString();
-    assertThat(bytes).isEqualTo(TEST_ALL_TYPES_SERIALIZED_WITH_ILLEGAL_UTF8);
-  }
-
-  @Test
-  public void testParseAndWrite() throws IOException {
-    UnittestProto.TestAllTypes tV2 =
-        UnittestProto.TestAllTypes.parseFrom(
-            TEST_ALL_TYPES_SERIALIZED_WITH_ILLEGAL_UTF8,
-            ExtensionRegistryLite.getEmptyRegistry());
-    byte[] sink = new byte[TEST_ALL_TYPES_SERIALIZED_WITH_ILLEGAL_UTF8.size()];
-    CodedOutputStream outputStream = CodedOutputStream.newInstance(sink);
-    tV2.writeTo(outputStream);
-    outputStream.flush();
-    assertThat(ByteString.copyFrom(sink)).isEqualTo(TEST_ALL_TYPES_SERIALIZED_WITH_ILLEGAL_UTF8);
-  }
-
-  @Test
-  public void testCaching() {
-    String a = "a";
-    String b = "b";
-    String c = "c";
-    UnittestProto.TestAllTypes proto =
-        UnittestProto.TestAllTypes.newBuilder()
-            .setOptionalString(a)
-            .addRepeatedString(b)
-            .addRepeatedString(c)
-            .build();
-
-    // String should be the one we passed it.
-    assertThat(proto.getOptionalString()).isSameInstanceAs(a);
-    assertThat(proto.getRepeatedString(0)).isSameInstanceAs(b);
-    assertThat(proto.getRepeatedString(1)).isSameInstanceAs(c);
-
-    // Ensure serialization keeps strings cached.
-    ByteString unused = proto.toByteString();
-
-    // And now the string should stay cached.
-    assertThat(proto.getOptionalString()).isSameInstanceAs(a);
-    assertThat(proto.getRepeatedString(0)).isSameInstanceAs(b);
-    assertThat(proto.getRepeatedString(1)).isSameInstanceAs(c);
-  }
-
-  @Test
-  public void testNoStringCachingIfOnlyBytesAccessed() throws Exception {
-    UnittestProto.TestAllTypes proto =
-        UnittestProto.TestAllTypes.parseFrom(
-            encodedTestAllTypes, ExtensionRegistryLite.getEmptyRegistry());
-    ByteString optional = proto.getOptionalStringBytes();
-    assertThat(proto.getOptionalStringBytes()).isSameInstanceAs(optional);
-    assertThat(proto.toBuilder().getOptionalStringBytes()).isSameInstanceAs(optional);
-
-    ByteString repeated0 = proto.getRepeatedStringBytes(0);
-    ByteString repeated1 = proto.getRepeatedStringBytes(1);
-    assertThat(proto.getRepeatedStringBytes(0)).isSameInstanceAs(repeated0);
-    assertThat(proto.getRepeatedStringBytes(1)).isSameInstanceAs(repeated1);
-    assertThat(proto.toBuilder().getRepeatedStringBytes(0)).isSameInstanceAs(repeated0);
-    assertThat(proto.toBuilder().getRepeatedStringBytes(1)).isSameInstanceAs(repeated1);
-  }
-}
diff --git a/libs/protobuf/java/core/src/test/java/com/google/protobuf/LiteEqualsAndHashTest.java b/libs/protobuf/java/core/src/test/java/com/google/protobuf/LiteEqualsAndHashTest.java
deleted file mode 100644
index 1270ef0..0000000
--- a/libs/protobuf/java/core/src/test/java/com/google/protobuf/LiteEqualsAndHashTest.java
+++ /dev/null
@@ -1,125 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import protobuf_unittest.lite_equals_and_hash.LiteEqualsAndHash.Bar;
-import protobuf_unittest.lite_equals_and_hash.LiteEqualsAndHash.BarPrime;
-import protobuf_unittest.lite_equals_and_hash.LiteEqualsAndHash.Foo;
-import protobuf_unittest.lite_equals_and_hash.LiteEqualsAndHash.TestOneofEquals;
-import protobuf_unittest.lite_equals_and_hash.LiteEqualsAndHash.TestRecursiveOneof;
-
-import junit.framework.TestCase;
-
-/**
- * Test generate equal and hash methods for the lite runtime.
- *
- * @author pbogle@google.com Phil Bogle
- */
-public class LiteEqualsAndHashTest extends TestCase {
-
-  public void testEquals() throws Exception {
-    // Since the generated equals and hashCode methods for lite messages are a
-    // mostly complete subset of those for regular messages, we can mostly assume
-    // that the generated methods are already thoroughly tested by the regular tests.
-
-    // This test mostly just verifies is that a proto with
-    // optimize_for = LITE_RUNTIME and java_generates_equals_and_hash_compiles
-    // correctly when linked only against the lite library.
-
-    // We do however do some basic testing to make sure that equals is actually
-    // overridden to test for value equality rather than simple object equality.
-
-    // Check that two identical objs are equal.
-    Foo foo1a = Foo.newBuilder()
-        .setValue(1)
-        .addBar(Bar.newBuilder().setName("foo1"))
-        .build();
-    Foo foo1b = Foo.newBuilder()
-        .setValue(1)
-        .addBar(Bar.newBuilder().setName("foo1"))
-        .build();
-    Foo foo2 = Foo.newBuilder()
-        .setValue(1)
-        .addBar(Bar.newBuilder().setName("foo2"))
-        .build();
-
-    // Check that equals is doing value rather than object equality.
-    assertEquals(foo1a, foo1b);
-    assertEquals(foo1a.hashCode(), foo1b.hashCode());
-
-    // Check that a different object is not equal.
-    assertFalse(foo1a.equals(foo2));
-
-    // Check that two objects which have different types but the same field values are not
-    // considered to be equal.
-    Bar bar = Bar.newBuilder().setName("bar").build();
-    BarPrime barPrime = BarPrime.newBuilder().setName("bar").build();
-    assertFalse(bar.equals(barPrime));
-  }
-
-  public void testOneofEquals() throws Exception {
-    TestOneofEquals.Builder builder = TestOneofEquals.newBuilder();
-    TestOneofEquals message1 = builder.build();
-    // Set message2's name field to default value. The two messages should be different when we
-    // check with the oneof case.
-    builder.setName("");
-    TestOneofEquals message2 = builder.build();
-    assertFalse(message1.equals(message2));
-  }
-
-  public void testEqualsAndHashCodeWithUnknownFields() throws InvalidProtocolBufferException {
-    Foo fooWithOnlyValue = Foo.newBuilder()
-        .setValue(1)
-        .build();
-
-    Foo fooWithValueAndExtension = fooWithOnlyValue.toBuilder()
-        .setValue(1)
-        .setExtension(Bar.fooExt, Bar.newBuilder()
-            .setName("name")
-            .build())
-        .build();
-
-    Foo fooWithValueAndUnknownFields = Foo.parseFrom(fooWithValueAndExtension.toByteArray());
-
-    assertEqualsAndHashCodeAreFalse(fooWithOnlyValue, fooWithValueAndUnknownFields);
-    assertEqualsAndHashCodeAreFalse(fooWithValueAndExtension, fooWithValueAndUnknownFields);
-  }
-
-  private void assertEqualsAndHashCodeAreFalse(Object o1, Object o2) {
-    assertFalse(o1.equals(o2));
-    assertFalse(o1.hashCode() == o2.hashCode());
-  }
-
-  public void testRecursiveHashcode() {
-    // This tests that we don't infinite loop.
-    TestRecursiveOneof.getDefaultInstance().hashCode();
-  }
-}
diff --git a/libs/protobuf/java/core/src/test/java/com/google/protobuf/LiteralByteStringTest.java b/libs/protobuf/java/core/src/test/java/com/google/protobuf/LiteralByteStringTest.java
deleted file mode 100644
index 5ec4a93..0000000
--- a/libs/protobuf/java/core/src/test/java/com/google/protobuf/LiteralByteStringTest.java
+++ /dev/null
@@ -1,683 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.common.truth.Truth.assertThat;
-import static com.google.common.truth.Truth.assertWithMessage;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.EOFException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import java.util.List;
-import java.util.NoSuchElementException;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-/**
- * Test {@code LiteralByteString} by setting up a reference string in {@link #setUp()}. This class
- * is designed to be extended for testing extensions of {@code LiteralByteString} such as {@code
- * BoundedByteString}, see {@link BoundedByteStringTest}.
- */
-@RunWith(JUnit4.class)
-public class LiteralByteStringTest {
-  protected static final String UTF_8 = "UTF-8";
-
-  protected String classUnderTest;
-  protected byte[] referenceBytes;
-  protected ByteString stringUnderTest;
-  protected int expectedHashCode;
-
-  @Before
-  public void setUp() throws Exception {
-    classUnderTest = "LiteralByteString";
-    referenceBytes = ByteStringTest.getTestBytes(1234, 11337766L);
-    stringUnderTest = ByteString.copyFrom(referenceBytes);
-    expectedHashCode = 331161852;
-  }
-
-  @Test
-  public void testExpectedType() {
-    String actualClassName = getActualClassName(stringUnderTest);
-    assertWithMessage("%s should match type exactly", classUnderTest)
-        .that(classUnderTest)
-        .isEqualTo(actualClassName);
-  }
-
-  protected String getActualClassName(Object object) {
-    return object.getClass().getSimpleName();
-  }
-
-  @Test
-  public void testByteAt() {
-    boolean stillEqual = true;
-    for (int i = 0; stillEqual && i < referenceBytes.length; ++i) {
-      stillEqual = (referenceBytes[i] == stringUnderTest.byteAt(i));
-    }
-    assertWithMessage("%s must capture the right bytes", classUnderTest).that(stillEqual).isTrue();
-  }
-
-  @Test
-  public void testByteIterator() {
-    boolean stillEqual = true;
-    ByteString.ByteIterator iter = stringUnderTest.iterator();
-    for (int i = 0; stillEqual && i < referenceBytes.length; ++i) {
-      stillEqual = (iter.hasNext() && referenceBytes[i] == iter.nextByte());
-    }
-    assertWithMessage("%s must capture the right bytes", classUnderTest).that(stillEqual).isTrue();
-    assertWithMessage("%s must have exhausted the iterator", classUnderTest)
-        .that(iter.hasNext())
-        .isFalse();
-
-    try {
-      iter.nextByte();
-      assertWithMessage("Should have thrown an exception.").fail();
-    } catch (NoSuchElementException e) {
-      // This is success
-    }
-  }
-
-  @Test
-  public void testByteIterable() {
-    boolean stillEqual = true;
-    int j = 0;
-    for (byte quantum : stringUnderTest) {
-      stillEqual = (referenceBytes[j] == quantum);
-      ++j;
-    }
-    assertWithMessage("%s must capture the right bytes as Bytes", classUnderTest)
-        .that(stillEqual)
-        .isTrue();
-    assertWithMessage("%s iterable character count", classUnderTest)
-        .that(referenceBytes)
-        .hasLength(j);
-  }
-
-  @Test
-  public void testSize() {
-    assertWithMessage("%s must have the expected size", classUnderTest)
-        .that(referenceBytes.length)
-        .isEqualTo(stringUnderTest.size());
-  }
-
-  @Test
-  public void testGetTreeDepth() {
-    assertWithMessage("%s must have depth 0", classUnderTest)
-        .that(stringUnderTest.getTreeDepth())
-        .isEqualTo(0);
-  }
-
-  @Test
-  public void testIsBalanced() {
-    assertWithMessage("%s is technically balanced", classUnderTest)
-        .that(stringUnderTest.isBalanced())
-        .isTrue();
-  }
-
-  @Test
-  public void testCopyTo_ByteArrayOffsetLength() {
-    int destinationOffset = 50;
-    int length = 100;
-    byte[] destination = new byte[destinationOffset + length];
-    int sourceOffset = 213;
-    stringUnderTest.copyTo(destination, sourceOffset, destinationOffset, length);
-    boolean stillEqual = true;
-    for (int i = 0; stillEqual && i < length; ++i) {
-      stillEqual = referenceBytes[i + sourceOffset] == destination[i + destinationOffset];
-    }
-    assertWithMessage("%s.copyTo(4 arg) must give the expected bytes", classUnderTest)
-        .that(stillEqual)
-        .isTrue();
-  }
-
-  @Test
-  public void testCopyTo_ByteArrayOffsetLengthErrors() {
-    int destinationOffset = 50;
-    int length = 100;
-    byte[] destination = new byte[destinationOffset + length];
-
-    try {
-      // Copy one too many bytes
-      stringUnderTest.copyTo(
-          destination, stringUnderTest.size() + 1 - length, destinationOffset, length);
-      assertWithMessage(
-              "Should have thrown an exception when copying too many bytes of a %s", classUnderTest)
-          .fail();
-    } catch (IndexOutOfBoundsException expected) {
-      // This is success
-    }
-
-    try {
-      // Copy with illegal negative sourceOffset
-      stringUnderTest.copyTo(destination, -1, destinationOffset, length);
-      assertWithMessage(
-              "Should have thrown an exception when given a negative sourceOffset in %s",
-              classUnderTest)
-          .fail();
-    } catch (IndexOutOfBoundsException expected) {
-      // This is success
-    }
-
-    try {
-      // Copy with illegal negative destinationOffset
-      stringUnderTest.copyTo(destination, 0, -1, length);
-      assertWithMessage(
-              "Should have thrown an exception when given a negative destinationOffset in %s",
-              classUnderTest)
-          .fail();
-    } catch (IndexOutOfBoundsException expected) {
-      // This is success
-    }
-
-    try {
-      // Copy with illegal negative size
-      stringUnderTest.copyTo(destination, 0, 0, -1);
-      assertWithMessage(
-              "Should have thrown an exception when given a negative size in %s", classUnderTest)
-          .fail();
-    } catch (IndexOutOfBoundsException expected) {
-      // This is success
-    }
-
-    try {
-      // Copy with illegal too-large sourceOffset
-      stringUnderTest.copyTo(destination, 2 * stringUnderTest.size(), 0, length);
-      assertWithMessage(
-              "Should have thrown an exception when the destinationOffset is too large in %s",
-              classUnderTest)
-          .fail();
-    } catch (IndexOutOfBoundsException expected) {
-      // This is success
-    }
-
-    try {
-      // Copy with illegal too-large destinationOffset
-      stringUnderTest.copyTo(destination, 0, 2 * destination.length, length);
-      assertWithMessage(
-              "Should have thrown an exception when the destinationOffset is too large in %s",
-              classUnderTest)
-          .fail();
-    } catch (IndexOutOfBoundsException expected) {
-      // This is success
-    }
-  }
-
-  @Test
-  public void testCopyTo_ByteBuffer() {
-    ByteBuffer myBuffer = ByteBuffer.allocate(referenceBytes.length);
-    stringUnderTest.copyTo(myBuffer);
-    assertWithMessage("%s.copyTo(ByteBuffer) must give back the same bytes", classUnderTest)
-        .that(Arrays.equals(referenceBytes, myBuffer.array()))
-        .isTrue();
-  }
-
-  @Test
-  public void testMarkSupported() {
-    InputStream stream = stringUnderTest.newInput();
-    assertWithMessage("%s.newInput() must support marking", classUnderTest)
-        .that(stream.markSupported())
-        .isTrue();
-  }
-
-  @Test
-  public void testMarkAndReset() throws IOException {
-    int fraction = stringUnderTest.size() / 3;
-
-    InputStream stream = stringUnderTest.newInput();
-    stream.mark(stringUnderTest.size()); // First, mark() the end.
-
-    skipFully(stream, fraction); // Skip a large fraction, but not all.
-    int available = stream.available();
-    assertWithMessage(
-            "%s: after skipping to the 'middle', half the bytes are available", classUnderTest)
-        .that((stringUnderTest.size() - fraction) == available)
-        .isTrue();
-    stream.reset();
-
-    skipFully(stream, stringUnderTest.size()); // Skip to the end.
-    available = stream.available();
-    assertWithMessage("%s: after skipping to the end, no more bytes are available", classUnderTest)
-        .that(0 == available)
-        .isTrue();
-  }
-
-  /**
-   * Discards {@code n} bytes of data from the input stream. This method will block until the full
-   * amount has been skipped. Does not close the stream.
-   *
-   * <p>Copied from com.google.common.io.ByteStreams to avoid adding dependency.
-   *
-   * @param in the input stream to read from
-   * @param n the number of bytes to skip
-   * @throws EOFException if this stream reaches the end before skipping all the bytes
-   * @throws IOException if an I/O error occurs, or the stream does not support skipping
-   */
-  static void skipFully(InputStream in, long n) throws IOException {
-    long toSkip = n;
-    while (n > 0) {
-      long amt = in.skip(n);
-      if (amt == 0) {
-        // Force a blocking read to avoid infinite loop
-        if (in.read() == -1) {
-          long skipped = toSkip - n;
-          throw new EOFException(
-              "reached end of stream after skipping "
-                  + skipped
-                  + " bytes; "
-                  + toSkip
-                  + " bytes expected");
-        }
-        n--;
-      } else {
-        n -= amt;
-      }
-    }
-  }
-
-  @Test
-  public void testAsReadOnlyByteBuffer() {
-    ByteBuffer byteBuffer = stringUnderTest.asReadOnlyByteBuffer();
-    byte[] roundTripBytes = new byte[referenceBytes.length];
-    assertThat(byteBuffer.remaining() == referenceBytes.length).isTrue();
-    assertThat(byteBuffer.isReadOnly()).isTrue();
-    byteBuffer.get(roundTripBytes);
-    assertWithMessage("%s.asReadOnlyByteBuffer() must give back the same bytes", classUnderTest)
-        .that(Arrays.equals(referenceBytes, roundTripBytes))
-        .isTrue();
-  }
-
-  @Test
-  public void testAsReadOnlyByteBufferList() {
-    List<ByteBuffer> byteBuffers = stringUnderTest.asReadOnlyByteBufferList();
-    int bytesSeen = 0;
-    byte[] roundTripBytes = new byte[referenceBytes.length];
-    for (ByteBuffer byteBuffer : byteBuffers) {
-      int thisLength = byteBuffer.remaining();
-      assertThat(byteBuffer.isReadOnly()).isTrue();
-      assertThat(bytesSeen + thisLength <= referenceBytes.length).isTrue();
-      byteBuffer.get(roundTripBytes, bytesSeen, thisLength);
-      bytesSeen += thisLength;
-    }
-    assertThat(bytesSeen == referenceBytes.length).isTrue();
-    assertWithMessage("%s.asReadOnlyByteBufferTest() must give back the same bytes", classUnderTest)
-        .that(Arrays.equals(referenceBytes, roundTripBytes))
-        .isTrue();
-  }
-
-  @Test
-  public void testToByteArray() {
-    byte[] roundTripBytes = stringUnderTest.toByteArray();
-    assertWithMessage("%s.toByteArray() must give back the same bytes", classUnderTest)
-        .that(Arrays.equals(referenceBytes, roundTripBytes))
-        .isTrue();
-  }
-
-  @Test
-  public void testWriteTo() throws IOException {
-    ByteArrayOutputStream bos = new ByteArrayOutputStream();
-    stringUnderTest.writeTo(bos);
-    byte[] roundTripBytes = bos.toByteArray();
-    assertWithMessage("%s.writeTo() must give back the same bytes", classUnderTest)
-        .that(Arrays.equals(referenceBytes, roundTripBytes))
-        .isTrue();
-  }
-
-  @Test
-  public void testWriteToShouldNotExposeInternalBufferToOutputStream() throws IOException {
-    OutputStream os =
-        new OutputStream() {
-          @Override
-          public void write(byte[] b, int off, int len) {
-            Arrays.fill(b, off, off + len, (byte) 0);
-          }
-
-          @Override
-          public void write(int b) {
-            throw new UnsupportedOperationException();
-          }
-        };
-
-    stringUnderTest.writeTo(os);
-    assertWithMessage("%s.writeTo() must not grant access to underlying array", classUnderTest)
-        .that(Arrays.equals(referenceBytes, stringUnderTest.toByteArray()))
-        .isTrue();
-  }
-
-  @Test
-  public void testWriteToInternalShouldExposeInternalBufferToOutputStream() throws IOException {
-    OutputStream os =
-        new OutputStream() {
-          @Override
-          public void write(byte[] b, int off, int len) {
-            Arrays.fill(b, off, off + len, (byte) 0);
-          }
-
-          @Override
-          public void write(int b) {
-            throw new UnsupportedOperationException();
-          }
-        };
-
-    stringUnderTest.writeToInternal(os, 0, stringUnderTest.size());
-    byte[] allZeros = new byte[stringUnderTest.size()];
-    assertWithMessage("%s.writeToInternal() must grant access to underlying array", classUnderTest)
-        .that(Arrays.equals(allZeros, stringUnderTest.toByteArray()))
-        .isTrue();
-  }
-
-  @Test
-  public void testWriteToShouldExposeInternalBufferToByteOutput() throws IOException {
-    ByteOutput out =
-        new ByteOutput() {
-          @Override
-          public void write(byte value) throws IOException {
-            throw new UnsupportedOperationException();
-          }
-
-          @Override
-          public void write(byte[] value, int offset, int length) throws IOException {
-            throw new UnsupportedOperationException();
-          }
-
-          @Override
-          public void write(ByteBuffer value) throws IOException {
-            throw new UnsupportedOperationException();
-          }
-
-          @Override
-          public void writeLazy(byte[] value, int offset, int length) throws IOException {
-            Arrays.fill(value, offset, offset + length, (byte) 0);
-          }
-
-          @Override
-          public void writeLazy(ByteBuffer value) throws IOException {
-            throw new UnsupportedOperationException();
-          }
-        };
-
-    stringUnderTest.writeTo(out);
-    byte[] allZeros = new byte[stringUnderTest.size()];
-    assertWithMessage("%s.writeToInternal() must grant access to underlying array", classUnderTest)
-        .that(Arrays.equals(allZeros, stringUnderTest.toByteArray()))
-        .isTrue();
-  }
-
-  @Test
-  public void testNewOutput() throws IOException {
-    ByteArrayOutputStream bos = new ByteArrayOutputStream();
-    ByteString.Output output = ByteString.newOutput();
-    stringUnderTest.writeTo(output);
-    assertWithMessage("Output Size returns correct result")
-        .that(output.size())
-        .isEqualTo(stringUnderTest.size());
-    output.writeTo(bos);
-    assertWithMessage("Output.writeTo() must give back the same bytes")
-        .that(Arrays.equals(referenceBytes, bos.toByteArray()))
-        .isTrue();
-
-    // write the output stream to itself! This should cause it to double
-    output.writeTo(output);
-    assertWithMessage("Writing an output stream to itself is successful")
-        .that(stringUnderTest.concat(stringUnderTest))
-        .isEqualTo(output.toByteString());
-
-    output.reset();
-    assertWithMessage("Output.reset() resets the output").that(output.size()).isEqualTo(0);
-    assertWithMessage("Output.reset() resets the output")
-        .that(output.toByteString())
-        .isEqualTo(ByteString.EMPTY);
-  }
-
-  @Test
-  public void testToString() throws UnsupportedEncodingException {
-    String testString = "I love unicode \u1234\u5678 characters";
-    ByteString unicode = ByteString.wrap(testString.getBytes(Internal.UTF_8));
-    String roundTripString = unicode.toString(UTF_8);
-    assertWithMessage("%s unicode must match", classUnderTest)
-        .that(testString)
-        .isEqualTo(roundTripString);
-  }
-
-  @Test
-  public void testCharsetToString() {
-    String testString = "I love unicode \u1234\u5678 characters";
-    ByteString unicode = ByteString.wrap(testString.getBytes(Internal.UTF_8));
-    String roundTripString = unicode.toString(Internal.UTF_8);
-    assertWithMessage("%s unicode must match", classUnderTest)
-        .that(testString)
-        .isEqualTo(roundTripString);
-  }
-
-  @Test
-  public void testToString_returnsCanonicalEmptyString() {
-    assertWithMessage("%s must be the same string references", classUnderTest)
-        .that(ByteString.EMPTY.toString(Internal.UTF_8))
-        .isSameInstanceAs(ByteString.wrap(new byte[] {}).toString(Internal.UTF_8));
-  }
-
-  @Test
-  public void testToString_raisesException() {
-    try {
-      ByteString.EMPTY.toString("invalid");
-      assertWithMessage("Should have thrown an exception.").fail();
-    } catch (UnsupportedEncodingException expected) {
-      // This is success
-    }
-
-    try {
-      ByteString.wrap(referenceBytes).toString("invalid");
-      assertWithMessage("Should have thrown an exception.").fail();
-    } catch (UnsupportedEncodingException expected) {
-      // This is success
-    }
-  }
-
-  @Test
-  @SuppressWarnings("SelfEquals")
-  public void testEquals() {
-    assertWithMessage("%s must not equal null", classUnderTest)
-        .that(stringUnderTest)
-        .isNotEqualTo(null);
-    assertWithMessage("%s must equal self", classUnderTest)
-        .that(stringUnderTest.equals(stringUnderTest))
-        .isTrue();
-    assertWithMessage("%s must not equal the empty string", classUnderTest)
-        .that(stringUnderTest)
-        .isNotEqualTo(ByteString.EMPTY);
-    assertWithMessage("%s empty strings must be equal", classUnderTest)
-        .that(ByteString.wrap(new byte[] {}))
-        .isEqualTo(stringUnderTest.substring(55, 55));
-    assertWithMessage("%s must equal another string with the same value", classUnderTest)
-        .that(stringUnderTest)
-        .isEqualTo(ByteString.wrap(referenceBytes));
-
-    byte[] mungedBytes = new byte[referenceBytes.length];
-    System.arraycopy(referenceBytes, 0, mungedBytes, 0, referenceBytes.length);
-    mungedBytes[mungedBytes.length - 5] = (byte) (mungedBytes[mungedBytes.length - 5] ^ 0xFF);
-    assertWithMessage("%s must not equal every string with the same length", classUnderTest)
-        .that(stringUnderTest)
-        .isNotEqualTo(ByteString.wrap(mungedBytes));
-  }
-
-  @Test
-  public void testHashCode() {
-    int hash = stringUnderTest.hashCode();
-    assertWithMessage("%s must have expected hashCode", classUnderTest)
-        .that(hash)
-        .isEqualTo(expectedHashCode);
-  }
-
-  @Test
-  public void testPeekCachedHashCode() {
-    assertWithMessage("%s.peekCachedHashCode() should return zero at first", classUnderTest)
-        .that(stringUnderTest.peekCachedHashCode())
-        .isEqualTo(0);
-    int unused = stringUnderTest.hashCode();
-    assertWithMessage("%s.peekCachedHashCode should return zero at first", classUnderTest)
-        .that(stringUnderTest.peekCachedHashCode())
-        .isEqualTo(expectedHashCode);
-  }
-
-  @Test
-  public void testPartialHash() {
-    // partialHash() is more strenuously tested elsewhere by testing hashes of substrings.
-    // This test would fail if the expected hash were 1.  It's not.
-    int hash = stringUnderTest.partialHash(stringUnderTest.size(), 0, stringUnderTest.size());
-    assertWithMessage("%s.partialHash() must yield expected hashCode", classUnderTest)
-        .that(hash)
-        .isEqualTo(expectedHashCode);
-  }
-
-  @Test
-  public void testNewInput() throws IOException {
-    InputStream input = stringUnderTest.newInput();
-    assertWithMessage("InputStream.available() returns correct value")
-        .that(stringUnderTest.size())
-        .isEqualTo(input.available());
-    boolean stillEqual = true;
-    for (byte referenceByte : referenceBytes) {
-      int expectedInt = (referenceByte & 0xFF);
-      stillEqual = (expectedInt == input.read());
-    }
-    assertWithMessage("InputStream.available() returns correct value")
-        .that(input.available())
-        .isEqualTo(0);
-    assertWithMessage("%s must give the same bytes from the InputStream", classUnderTest)
-        .that(stillEqual)
-        .isTrue();
-    assertWithMessage("%s InputStream must now be exhausted", classUnderTest)
-        .that(input.read())
-        .isEqualTo(-1);
-  }
-
-  @Test
-  public void testNewInput_readZeroBytes() throws IOException {
-    InputStream input = stringUnderTest.newInput();
-    assertWithMessage(
-            "%s InputStream.read() returns 0 when told to read 0 bytes and not at EOF",
-            classUnderTest)
-        .that(input.read(new byte[0]))
-        .isEqualTo(0);
-
-    input.skip(input.available());
-    assertWithMessage(
-            "%s InputStream.read() returns -1 when told to read 0 bytes at EOF", classUnderTest)
-        .that(input.read(new byte[0]))
-        .isEqualTo(-1);
-  }
-
-  @Test
-  public void testNewInput_skip() throws IOException {
-    InputStream input = stringUnderTest.newInput();
-    int stringSize = stringUnderTest.size();
-    int nearEndIndex = stringSize * 2 / 3;
-
-    long skipped1 = input.skip(nearEndIndex);
-    assertWithMessage("InputStream.skip()").that(skipped1).isEqualTo(nearEndIndex);
-    assertWithMessage("InputStream.available()")
-        .that(input.available())
-        .isEqualTo(stringSize - skipped1);
-    assertWithMessage("InputStream.mark() is available").that(input.markSupported()).isTrue();
-    input.mark(0);
-    assertWithMessage("InputStream.skip(), read()")
-        .that(stringUnderTest.byteAt(nearEndIndex) & 0xFF)
-        .isEqualTo(input.read());
-    assertWithMessage("InputStream.available()")
-        .that(input.available())
-        .isEqualTo(stringSize - skipped1 - 1);
-
-    long skipped2 = input.skip(stringSize);
-    assertWithMessage("InputStream.skip() incomplete")
-        .that(skipped2)
-        .isEqualTo(stringSize - skipped1 - 1);
-    assertWithMessage("InputStream.skip(), no more input").that(input.available()).isEqualTo(0);
-    assertWithMessage("InputStream.skip(), no more input").that(input.read()).isEqualTo(-1);
-    assertThat(input.skip(1)).isEqualTo(0);
-    assertThat(input.read(new byte[1], /* off= */ 0, /*len=*/ 0)).isEqualTo(-1);
-
-    input.reset();
-    assertWithMessage("InputStream.reset() succeeded")
-        .that(input.available())
-        .isEqualTo(stringSize - skipped1);
-    assertWithMessage("InputStream.reset(), read()")
-        .that(input.read())
-        .isEqualTo(stringUnderTest.byteAt(nearEndIndex) & 0xFF);
-  }
-
-  @Test
-  public void testNewCodedInput() throws IOException {
-    CodedInputStream cis = stringUnderTest.newCodedInput();
-    byte[] roundTripBytes = cis.readRawBytes(referenceBytes.length);
-    assertWithMessage("%s must give the same bytes back from the CodedInputStream", classUnderTest)
-        .that(Arrays.equals(referenceBytes, roundTripBytes))
-        .isTrue();
-    assertWithMessage(" %s CodedInputStream must now be exhausted", classUnderTest)
-        .that(cis.isAtEnd())
-        .isTrue();
-  }
-
-  /**
-   * Make sure we keep things simple when concatenating with empty. See also {@link
-   * ByteStringTest#testConcat_empty()}.
-   */
-  @Test
-  public void testConcat_empty() {
-    assertWithMessage("%s concatenated with empty must give %s ", classUnderTest, classUnderTest)
-        .that(stringUnderTest.concat(ByteString.EMPTY))
-        .isSameInstanceAs(stringUnderTest);
-    assertWithMessage("empty concatenated with %s must give %s", classUnderTest, classUnderTest)
-        .that(ByteString.EMPTY.concat(stringUnderTest))
-        .isSameInstanceAs(stringUnderTest);
-  }
-
-  @Test
-  public void testJavaSerialization() throws Exception {
-    ByteArrayOutputStream out = new ByteArrayOutputStream();
-    ObjectOutputStream oos = new ObjectOutputStream(out);
-    oos.writeObject(stringUnderTest);
-    oos.close();
-    byte[] pickled = out.toByteArray();
-    InputStream in = new ByteArrayInputStream(pickled);
-    ObjectInputStream ois = new ObjectInputStream(in);
-    Object o = ois.readObject();
-    assertWithMessage("Didn't get a ByteString back").that(o).isInstanceOf(ByteString.class);
-    assertWithMessage("Should get an equal ByteString back").that(o).isEqualTo(stringUnderTest);
-  }
-}
diff --git a/libs/protobuf/java/core/src/test/java/com/google/protobuf/LongArrayListTest.java b/libs/protobuf/java/core/src/test/java/com/google/protobuf/LongArrayListTest.java
deleted file mode 100644
index 2982e0c..0000000
--- a/libs/protobuf/java/core/src/test/java/com/google/protobuf/LongArrayListTest.java
+++ /dev/null
@@ -1,584 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.common.truth.Truth.assertThat;
-import static com.google.common.truth.Truth.assertWithMessage;
-import static java.util.Arrays.asList;
-
-import com.google.protobuf.Internal.LongList;
-import java.util.Collections;
-import java.util.ConcurrentModificationException;
-import java.util.Iterator;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-/** Tests for {@link LongArrayList}. */
-@RunWith(JUnit4.class)
-public class LongArrayListTest {
-
-  private static final LongArrayList UNARY_LIST = newImmutableLongArrayList(1);
-  private static final LongArrayList TERTIARY_LIST = newImmutableLongArrayList(1, 2, 3);
-
-  private LongArrayList list;
-
-  @Before
-  public void setUp() throws Exception {
-    list = new LongArrayList();
-  }
-
-  @Test
-  public void testEmptyListReturnsSameInstance() {
-    assertThat(LongArrayList.emptyList()).isSameInstanceAs(LongArrayList.emptyList());
-  }
-
-  @Test
-  public void testEmptyListIsImmutable() {
-    assertImmutable(LongArrayList.emptyList());
-  }
-
-  @Test
-  public void testMakeImmutable() {
-    list.addLong(3);
-    list.addLong(4);
-    list.addLong(5);
-    list.addLong(7);
-    list.makeImmutable();
-    assertImmutable(list);
-  }
-
-  @Test
-  public void testModificationWithIteration() {
-    list.addAll(asList(1L, 2L, 3L, 4L));
-    Iterator<Long> iterator = list.iterator();
-    assertThat(list).hasSize(4);
-    assertThat((long) list.get(0)).isEqualTo(1L);
-    assertThat((long) iterator.next()).isEqualTo(1L);
-    list.set(0, 1L);
-    assertThat((long) iterator.next()).isEqualTo(2L);
-
-    list.remove(0);
-    try {
-      iterator.next();
-      assertWithMessage("expected exception").fail();
-    } catch (ConcurrentModificationException e) {
-      // expected
-    }
-
-    iterator = list.iterator();
-    list.add(0, 0L);
-    try {
-      iterator.next();
-      assertWithMessage("expected exception").fail();
-    } catch (ConcurrentModificationException e) {
-      // expected
-    }
-  }
-
-  @Test
-  public void testGet() {
-    assertThat((long) TERTIARY_LIST.get(0)).isEqualTo(1L);
-    assertThat((long) TERTIARY_LIST.get(1)).isEqualTo(2L);
-    assertThat((long) TERTIARY_LIST.get(2)).isEqualTo(3L);
-
-    try {
-      TERTIARY_LIST.get(-1);
-      assertWithMessage("expected exception").fail();
-    } catch (IndexOutOfBoundsException e) {
-      // expected
-    }
-
-    try {
-      TERTIARY_LIST.get(3);
-      assertWithMessage("expected exception").fail();
-    } catch (IndexOutOfBoundsException e) {
-      // expected
-    }
-  }
-
-  @Test
-  public void testGetLong() {
-    assertThat(TERTIARY_LIST.getLong(0)).isEqualTo(1L);
-    assertThat(TERTIARY_LIST.getLong(1)).isEqualTo(2L);
-    assertThat(TERTIARY_LIST.getLong(2)).isEqualTo(3L);
-
-    try {
-      TERTIARY_LIST.get(-1);
-      assertWithMessage("expected exception").fail();
-    } catch (IndexOutOfBoundsException e) {
-      // expected
-    }
-
-    try {
-      TERTIARY_LIST.get(3);
-      assertWithMessage("expected exception").fail();
-    } catch (IndexOutOfBoundsException e) {
-      // expected
-    }
-  }
-
-  @Test
-  public void testIndexOf_nullElement() {
-    assertThat(TERTIARY_LIST.indexOf(null)).isEqualTo(-1);
-  }
-
-  @Test
-  public void testIndexOf_incompatibleElementType() {
-    assertThat(TERTIARY_LIST.indexOf(new Object())).isEqualTo(-1);
-  }
-
-  @Test
-  public void testIndexOf_notInList() {
-    assertThat(UNARY_LIST.indexOf(2L)).isEqualTo(-1);
-  }
-
-  @Test
-  public void testIndexOf_notInListWithDuplicates() {
-    LongArrayList listWithDupes = newImmutableLongArrayList(1L, 1L);
-    assertThat(listWithDupes.indexOf(2L)).isEqualTo(-1);
-  }
-
-  @Test
-  public void testIndexOf_inList() {
-    assertThat(TERTIARY_LIST.indexOf(2L)).isEqualTo(1);
-  }
-
-  @Test
-  public void testIndexOf_inListWithDuplicates_matchAtHead() {
-    LongArrayList listWithDupes = newImmutableLongArrayList(1L, 1L, 2L);
-    assertThat(listWithDupes.indexOf(1L)).isEqualTo(0);
-  }
-
-  @Test
-  public void testIndexOf_inListWithDuplicates_matchMidList() {
-    LongArrayList listWithDupes = newImmutableLongArrayList(2L, 1L, 1L, 2L);
-    assertThat(listWithDupes.indexOf(1L)).isEqualTo(1);
-  }
-
-  @Test
-  public void testContains_nullElement() {
-    assertThat(TERTIARY_LIST).doesNotContain(null);
-  }
-
-  @Test
-  public void testContains_incompatibleElementType() {
-    assertThat(TERTIARY_LIST).doesNotContain(new Object());
-  }
-
-  @Test
-  public void testContains_notInList() {
-    assertThat(UNARY_LIST).doesNotContain(2L);
-  }
-
-  @Test
-  public void testContains_notInListWithDuplicates() {
-    LongArrayList listWithDupes = newImmutableLongArrayList(1L, 1L);
-    assertThat(listWithDupes).doesNotContain(2L);
-  }
-
-  @Test
-  public void testContains_inList() {
-    assertThat(TERTIARY_LIST).contains(2L);
-  }
-
-  @Test
-  public void testContains_inListWithDuplicates_matchAtHead() {
-    LongArrayList listWithDupes = newImmutableLongArrayList(1L, 1L, 2L);
-    assertThat(listWithDupes).contains(1L);
-  }
-
-  @Test
-  public void testContains_inListWithDuplicates_matchMidList() {
-    LongArrayList listWithDupes = newImmutableLongArrayList(2L, 1L, 1L, 2L);
-    assertThat(listWithDupes).contains(1L);
-  }
-
-  @Test
-  public void testSize() {
-    assertThat(LongArrayList.emptyList()).isEmpty();
-    assertThat(UNARY_LIST).hasSize(1);
-    assertThat(TERTIARY_LIST).hasSize(3);
-
-    list.addLong(3);
-    list.addLong(4);
-    list.addLong(6);
-    list.addLong(8);
-    assertThat(list).hasSize(4);
-
-    list.remove(0);
-    assertThat(list).hasSize(3);
-
-    list.add(17L);
-    assertThat(list).hasSize(4);
-  }
-
-  @Test
-  public void testSet() {
-    list.addLong(2);
-    list.addLong(4);
-
-    assertThat((long) list.set(0, 3L)).isEqualTo(2L);
-    assertThat(list.getLong(0)).isEqualTo(3L);
-
-    assertThat((long) list.set(1, 0L)).isEqualTo(4L);
-    assertThat(list.getLong(1)).isEqualTo(0L);
-
-    try {
-      list.set(-1, 0L);
-      assertWithMessage("expected exception").fail();
-    } catch (IndexOutOfBoundsException e) {
-      // expected
-    }
-
-    try {
-      list.set(2, 0L);
-      assertWithMessage("expected exception").fail();
-    } catch (IndexOutOfBoundsException e) {
-      // expected
-    }
-  }
-
-  @Test
-  public void testSetLong() {
-    list.addLong(1);
-    list.addLong(3);
-
-    assertThat(list.setLong(0, 0)).isEqualTo(1L);
-    assertThat(list.getLong(0)).isEqualTo(0L);
-
-    assertThat(list.setLong(1, 0)).isEqualTo(3L);
-    assertThat(list.getLong(1)).isEqualTo(0L);
-
-    try {
-      list.setLong(-1, 0);
-      assertWithMessage("expected exception").fail();
-    } catch (IndexOutOfBoundsException e) {
-      // expected
-    }
-
-    try {
-      list.setLong(2, 0);
-      assertWithMessage("expected exception").fail();
-    } catch (IndexOutOfBoundsException e) {
-      // expected
-    }
-  }
-
-  @Test
-  public void testAdd() {
-    assertThat(list).isEmpty();
-
-    assertThat(list.add(2L)).isTrue();
-    assertThat(list).containsExactly(2L);
-
-    assertThat(list.add(3L)).isTrue();
-    list.add(0, 4L);
-    assertThat(list).containsExactly(4L, 2L, 3L).inOrder();
-
-    list.add(0, 1L);
-    list.add(0, 0L);
-    // Force a resize by getting up to 11 elements.
-    for (int i = 0; i < 6; i++) {
-      list.add(Long.valueOf(5 + i));
-    }
-    assertThat(list).containsExactly(0L, 1L, 4L, 2L, 3L, 5L, 6L, 7L, 8L, 9L, 10L).inOrder();
-
-    try {
-      list.add(-1, 5L);
-    } catch (IndexOutOfBoundsException e) {
-      // expected
-    }
-
-    try {
-      list.add(4, 5L);
-    } catch (IndexOutOfBoundsException e) {
-      // expected
-    }
-  }
-
-  @Test
-  public void testAddLong() {
-    assertThat(list).isEmpty();
-
-    list.addLong(2);
-    assertThat(list).containsExactly(2L);
-
-    list.addLong(3);
-    assertThat(list).containsExactly(2L, 3L).inOrder();
-  }
-
-  @Test
-  public void testAddAll() {
-    assertThat(list).isEmpty();
-
-    assertThat(list.addAll(Collections.singleton(1L))).isTrue();
-    assertThat(list).hasSize(1);
-    assertThat((long) list.get(0)).isEqualTo(1L);
-    assertThat(list.getLong(0)).isEqualTo(1L);
-
-    assertThat(list.addAll(asList(2L, 3L, 4L, 5L, 6L))).isTrue();
-    assertThat(list).containsExactly(1L, 2L, 3L, 4L, 5L, 6L).inOrder();
-
-    assertThat(list.addAll(TERTIARY_LIST)).isTrue();
-    assertThat(list).containsExactly(1L, 2L, 3L, 4L, 5L, 6L, 1L, 2L, 3L).inOrder();
-
-    assertThat(list.addAll(Collections.<Long>emptyList())).isFalse();
-    assertThat(list.addAll(LongArrayList.emptyList())).isFalse();
-  }
-
-  @Test
-  public void testEquals() {
-    LongArrayList list1 = new LongArrayList();
-    LongArrayList list2 = new LongArrayList();
-
-    assertThat(list1).isEqualTo(list2);
-  }
-
-  @Test
-  public void testRemove() {
-    list.addAll(TERTIARY_LIST);
-    assertThat((long) list.remove(0)).isEqualTo(1L);
-    assertThat(list).containsExactly(2L, 3L).inOrder();
-
-    assertThat(list.remove(Long.valueOf(3))).isTrue();
-    assertThat(list).containsExactly(2L);
-
-    assertThat(list.remove(Long.valueOf(3))).isFalse();
-    assertThat(list).containsExactly(2L);
-
-    assertThat((long) list.remove(0)).isEqualTo(2L);
-    assertThat(list).isEmpty();
-
-    try {
-      list.remove(-1);
-      assertWithMessage("expected exception").fail();
-    } catch (IndexOutOfBoundsException e) {
-      // expected
-    }
-
-    try {
-      list.remove(0);
-      assertWithMessage("expected exception").fail();
-    } catch (IndexOutOfBoundsException e) {
-      // expected
-    }
-  }
-
-  @Test
-  public void testRemoveEnd_listAtCapacity() {
-    LongList toRemove = LongArrayList.emptyList().mutableCopyWithCapacity(1);
-    toRemove.addLong(3);
-    toRemove.remove(0);
-    assertThat(toRemove).isEmpty();
-  }
-
-  @Test
-  public void testRemove_listAtCapacity() {
-    LongList toRemove = LongArrayList.emptyList().mutableCopyWithCapacity(2);
-    toRemove.addLong(3);
-    toRemove.addLong(4);
-    toRemove.remove(0);
-    assertThat(toRemove).hasSize(1);
-    assertThat((long) toRemove.get(0)).isEqualTo(4L);
-  }
-
-  @Test
-  public void testSublistRemoveEndOfCapacity() {
-    LongList toRemove = LongArrayList.emptyList().mutableCopyWithCapacity(1);
-    toRemove.addLong(3);
-    toRemove.subList(0, 1).clear();
-    assertThat(toRemove).isEmpty();
-  }
-
-  private void assertImmutable(LongList list) {
-    if (list.contains(1L)) {
-      throw new RuntimeException("Cannot test the immutability of lists that contain 1.");
-    }
-
-    try {
-      list.add(1L);
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.add(0, 1L);
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.addAll(Collections.<Long>emptyList());
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.addAll(Collections.singletonList(1L));
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.addAll(new LongArrayList());
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.addAll(UNARY_LIST);
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.addAll(0, Collections.singleton(1L));
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.addAll(0, UNARY_LIST);
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.addAll(0, Collections.<Long>emptyList());
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.addLong(0);
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.clear();
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.remove(1);
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.remove(new Object());
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.removeAll(Collections.<Long>emptyList());
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.removeAll(Collections.singleton(1L));
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.removeAll(UNARY_LIST);
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.retainAll(Collections.<Long>emptyList());
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.retainAll(Collections.singleton(1L));
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.retainAll(UNARY_LIST);
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.set(0, 0L);
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.setLong(0, 0);
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-  }
-
-  private static LongArrayList newImmutableLongArrayList(long... elements) {
-    LongArrayList list = new LongArrayList();
-    for (long element : elements) {
-      list.addLong(element);
-    }
-    list.makeImmutable();
-    return list;
-  }
-}
diff --git a/libs/protobuf/java/core/src/test/java/com/google/protobuf/MapForProto2LiteTest.java b/libs/protobuf/java/core/src/test/java/com/google/protobuf/MapForProto2LiteTest.java
deleted file mode 100644
index e8b1503..0000000
--- a/libs/protobuf/java/core/src/test/java/com/google/protobuf/MapForProto2LiteTest.java
+++ /dev/null
@@ -1,869 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.common.truth.Truth.assertThat;
-import static com.google.common.truth.Truth.assertWithMessage;
-import static org.junit.Assert.fail;
-
-import map_lite_test.MapForProto2TestProto.BizarroTestMap;
-import map_lite_test.MapForProto2TestProto.TestMap;
-import map_lite_test.MapForProto2TestProto.TestMap.MessageValue;
-import map_lite_test.MapForProto2TestProto.TestMapOrBuilder;
-import map_lite_test.MapForProto2TestProto.TestUnknownEnumValue;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-/** Unit tests for map fields. */
-@RunWith(JUnit4.class)
-public final class MapForProto2LiteTest {
-
-  private void setMapValues(TestMap.Builder builder) {
-    builder
-        .putInt32ToInt32Field(1, 11)
-        .putInt32ToInt32Field(2, 22)
-        .putInt32ToInt32Field(3, 33)
-        .putInt32ToStringField(1, "11")
-        .putInt32ToStringField(2, "22")
-        .putInt32ToStringField(3, "33")
-        .putInt32ToBytesField(1, TestUtil.toBytes("11"))
-        .putInt32ToBytesField(2, TestUtil.toBytes("22"))
-        .putInt32ToBytesField(3, TestUtil.toBytes("33"))
-        .putInt32ToEnumField(1, TestMap.EnumValue.FOO)
-        .putInt32ToEnumField(2, TestMap.EnumValue.BAR)
-        .putInt32ToEnumField(3, TestMap.EnumValue.BAZ)
-        .putInt32ToMessageField(1, MessageValue.newBuilder().setValue(11).build())
-        .putInt32ToMessageField(2, MessageValue.newBuilder().setValue(22).build())
-        .putInt32ToMessageField(3, MessageValue.newBuilder().setValue(33).build())
-        .putStringToInt32Field("1", 11)
-        .putStringToInt32Field("2", 22)
-        .putStringToInt32Field("3", 33);
-  }
-
-  @Test
-  public void testSetMapValues() {
-    TestMap.Builder mapBuilder = TestMap.newBuilder();
-    setMapValues(mapBuilder);
-    TestMap map = mapBuilder.build();
-    assertMapValuesSet(map);
-  }
-
-  private void copyMapValues(TestMap source, TestMap.Builder destination) {
-    destination
-        .putAllInt32ToInt32Field(source.getInt32ToInt32FieldMap())
-        .putAllInt32ToStringField(source.getInt32ToStringFieldMap())
-        .putAllInt32ToBytesField(source.getInt32ToBytesFieldMap())
-        .putAllInt32ToEnumField(source.getInt32ToEnumFieldMap())
-        .putAllInt32ToMessageField(source.getInt32ToMessageFieldMap())
-        .putAllStringToInt32Field(source.getStringToInt32FieldMap());
-  }
-
-  private void assertMapValuesSet(TestMap message) {
-    assertThat(message.getInt32ToInt32FieldMap()).hasSize(3);
-    assertThat(message.getInt32ToInt32FieldMap().get(1).intValue()).isEqualTo(11);
-    assertThat(message.getInt32ToInt32FieldMap().get(2).intValue()).isEqualTo(22);
-    assertThat(message.getInt32ToInt32FieldMap().get(3).intValue()).isEqualTo(33);
-
-    assertThat(message.getInt32ToStringFieldMap()).hasSize(3);
-    assertThat(message.getInt32ToStringFieldMap()).containsEntry(1, "11");
-    assertThat(message.getInt32ToStringFieldMap()).containsEntry(2, "22");
-    assertThat(message.getInt32ToStringFieldMap()).containsEntry(3, "33");
-
-    assertThat(message.getInt32ToBytesFieldMap()).hasSize(3);
-    assertThat(message.getInt32ToBytesFieldMap()).containsEntry(1, TestUtil.toBytes("11"));
-    assertThat(message.getInt32ToBytesFieldMap()).containsEntry(2, TestUtil.toBytes("22"));
-    assertThat(message.getInt32ToBytesFieldMap()).containsEntry(3, TestUtil.toBytes("33"));
-
-    assertThat(message.getInt32ToEnumFieldMap()).hasSize(3);
-    assertThat(message.getInt32ToEnumFieldMap()).containsEntry(1, TestMap.EnumValue.FOO);
-    assertThat(message.getInt32ToEnumFieldMap()).containsEntry(2, TestMap.EnumValue.BAR);
-    assertThat(message.getInt32ToEnumFieldMap()).containsEntry(3, TestMap.EnumValue.BAZ);
-
-    assertThat(message.getInt32ToMessageFieldMap()).hasSize(3);
-    assertThat(message.getInt32ToMessageFieldMap().get(1).getValue()).isEqualTo(11);
-    assertThat(message.getInt32ToMessageFieldMap().get(2).getValue()).isEqualTo(22);
-    assertThat(message.getInt32ToMessageFieldMap().get(3).getValue()).isEqualTo(33);
-
-    assertThat(message.getStringToInt32FieldMap()).hasSize(3);
-    assertThat(message.getStringToInt32FieldMap().get("1").intValue()).isEqualTo(11);
-    assertThat(message.getStringToInt32FieldMap().get("2").intValue()).isEqualTo(22);
-    assertThat(message.getStringToInt32FieldMap().get("3").intValue()).isEqualTo(33);
-  }
-
-  private void updateMapValues(TestMap.Builder builder) {
-    builder
-        .putInt32ToInt32Field(1, 111)
-        .removeInt32ToInt32Field(2)
-        .putInt32ToInt32Field(4, 44)
-        .putInt32ToStringField(1, "111")
-        .removeInt32ToStringField(2)
-        .putInt32ToStringField(4, "44")
-        .putInt32ToBytesField(1, TestUtil.toBytes("111"))
-        .removeInt32ToBytesField(2)
-        .putInt32ToBytesField(4, TestUtil.toBytes("44"))
-        .putInt32ToEnumField(1, TestMap.EnumValue.BAR)
-        .removeInt32ToEnumField(2)
-        .putInt32ToEnumField(4, TestMap.EnumValue.QUX)
-        .putInt32ToMessageField(1, MessageValue.newBuilder().setValue(111).build())
-        .removeInt32ToMessageField(2)
-        .putInt32ToMessageField(4, MessageValue.newBuilder().setValue(44).build())
-        .putStringToInt32Field("1", 111)
-        .removeStringToInt32Field("2")
-        .putStringToInt32Field("4", 44);
-  }
-
-  @Test
-  public void testUpdateMapValues() {
-    TestMap.Builder mapBuilder = TestMap.newBuilder();
-    setMapValues(mapBuilder);
-    TestMap map = mapBuilder.build();
-    assertMapValuesSet(map);
-
-    mapBuilder = map.toBuilder();
-    updateMapValues(mapBuilder);
-    map = mapBuilder.build();
-    assertMapValuesUpdated(map);
-  }
-
-  private void assertMapValuesUpdated(TestMap message) {
-    assertThat(message.getInt32ToInt32FieldMap()).hasSize(3);
-    assertThat(message.getInt32ToInt32FieldMap().get(1).intValue()).isEqualTo(111);
-    assertThat(message.getInt32ToInt32FieldMap().get(3).intValue()).isEqualTo(33);
-    assertThat(message.getInt32ToInt32FieldMap().get(4).intValue()).isEqualTo(44);
-
-    assertThat(message.getInt32ToStringFieldMap()).hasSize(3);
-    assertThat(message.getInt32ToStringFieldMap()).containsEntry(1, "111");
-    assertThat(message.getInt32ToStringFieldMap()).containsEntry(3, "33");
-    assertThat(message.getInt32ToStringFieldMap()).containsEntry(4, "44");
-
-    assertThat(message.getInt32ToBytesFieldMap()).hasSize(3);
-    assertThat(message.getInt32ToBytesFieldMap()).containsEntry(1, TestUtil.toBytes("111"));
-    assertThat(message.getInt32ToBytesFieldMap()).containsEntry(3, TestUtil.toBytes("33"));
-    assertThat(message.getInt32ToBytesFieldMap()).containsEntry(4, TestUtil.toBytes("44"));
-
-    assertThat(message.getInt32ToEnumFieldMap()).hasSize(3);
-    assertThat(message.getInt32ToEnumFieldMap()).containsEntry(1, TestMap.EnumValue.BAR);
-    assertThat(message.getInt32ToEnumFieldMap()).containsEntry(3, TestMap.EnumValue.BAZ);
-    assertThat(message.getInt32ToEnumFieldMap()).containsEntry(4, TestMap.EnumValue.QUX);
-
-    assertThat(message.getInt32ToMessageFieldMap()).hasSize(3);
-    assertThat(message.getInt32ToMessageFieldMap().get(1).getValue()).isEqualTo(111);
-    assertThat(message.getInt32ToMessageFieldMap().get(3).getValue()).isEqualTo(33);
-    assertThat(message.getInt32ToMessageFieldMap().get(4).getValue()).isEqualTo(44);
-
-    assertThat(message.getStringToInt32FieldMap()).hasSize(3);
-    assertThat(message.getStringToInt32FieldMap().get("1").intValue()).isEqualTo(111);
-    assertThat(message.getStringToInt32FieldMap().get("3").intValue()).isEqualTo(33);
-    assertThat(message.getStringToInt32FieldMap().get("4").intValue()).isEqualTo(44);
-  }
-
-  private void assertMapValuesCleared(TestMapOrBuilder testMapOrBuilder) {
-    assertThat(testMapOrBuilder.getInt32ToInt32FieldMap()).isEmpty();
-    assertThat(testMapOrBuilder.getInt32ToInt32FieldCount()).isEqualTo(0);
-    assertThat(testMapOrBuilder.getInt32ToStringFieldMap()).isEmpty();
-    assertThat(testMapOrBuilder.getInt32ToStringFieldCount()).isEqualTo(0);
-    assertThat(testMapOrBuilder.getInt32ToBytesFieldMap()).isEmpty();
-    assertThat(testMapOrBuilder.getInt32ToBytesFieldCount()).isEqualTo(0);
-    assertThat(testMapOrBuilder.getInt32ToEnumFieldMap()).isEmpty();
-    assertThat(testMapOrBuilder.getInt32ToEnumFieldCount()).isEqualTo(0);
-    assertThat(testMapOrBuilder.getInt32ToMessageFieldMap()).isEmpty();
-    assertThat(testMapOrBuilder.getInt32ToMessageFieldCount()).isEqualTo(0);
-    assertThat(testMapOrBuilder.getStringToInt32FieldMap()).isEmpty();
-    assertThat(testMapOrBuilder.getStringToInt32FieldCount()).isEqualTo(0);
-  }
-
-  @Test
-  public void testSanityCopyOnWrite() throws InvalidProtocolBufferException {
-    // Since builders are implemented as a thin wrapper around a message
-    // instance, we attempt to verify that we can't cause the builder to modify
-    // a produced message.
-
-    TestMap.Builder builder = TestMap.newBuilder();
-    TestMap message = builder.build();
-    builder.putInt32ToInt32Field(1, 2);
-    assertThat(message.getInt32ToInt32FieldMap()).isEmpty();
-    message = builder.build();
-    assertThat(message.getInt32ToInt32FieldMap()).isEqualTo(newMap(1, 2));
-    assertThat(builder.getInt32ToInt32FieldMap()).isEqualTo(newMap(1, 2));
-    builder.putInt32ToInt32Field(2, 3);
-    assertThat(message.getInt32ToInt32FieldMap()).isEqualTo(newMap(1, 2));
-    assertThat(builder.getInt32ToInt32FieldMap()).isEqualTo(newMap(1, 2, 2, 3));
-  }
-
-  @Test
-  public void testGetMapIsImmutable() {
-    TestMap.Builder builder = TestMap.newBuilder();
-    assertMapsAreImmutable(builder);
-    assertMapsAreImmutable(builder.build());
-
-    setMapValues(builder);
-    assertMapsAreImmutable(builder);
-    assertMapsAreImmutable(builder.build());
-  }
-
-  private void assertMapsAreImmutable(TestMapOrBuilder testMapOrBuilder) {
-    assertImmutable(testMapOrBuilder.getInt32ToInt32FieldMap(), 1, 2);
-    assertImmutable(testMapOrBuilder.getInt32ToStringFieldMap(), 1, "2");
-    assertImmutable(testMapOrBuilder.getInt32ToBytesFieldMap(), 1, TestUtil.toBytes("2"));
-    assertImmutable(testMapOrBuilder.getInt32ToEnumFieldMap(), 1, TestMap.EnumValue.FOO);
-    assertImmutable(
-        testMapOrBuilder.getInt32ToMessageFieldMap(), 1, MessageValue.getDefaultInstance());
-    assertImmutable(testMapOrBuilder.getStringToInt32FieldMap(), "1", 2);
-  }
-
-  private <K, V> void assertImmutable(Map<K, V> map, K key, V value) {
-    try {
-      map.put(key, value);
-      assertWithMessage("Expected UnsupportedOperationException").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-    if (!map.isEmpty()) {
-      try {
-        map.entrySet().remove(map.entrySet().iterator().next());
-        assertWithMessage("Expected UnsupportedOperationException").fail();
-      } catch (UnsupportedOperationException e) {
-        // expected
-      }
-    }
-  }
-
-  @Test
-  public void testMutableMapLifecycle() {
-    TestMap.Builder builder = TestMap.newBuilder().putInt32ToInt32Field(1, 2);
-    assertThat(builder.build().getInt32ToInt32FieldMap()).isEqualTo(newMap(1, 2));
-    assertThat(builder.getInt32ToInt32FieldMap()).isEqualTo(newMap(1, 2));
-    builder.putInt32ToInt32Field(2, 3);
-    assertThat(builder.getInt32ToInt32FieldMap()).isEqualTo(newMap(1, 2, 2, 3));
-
-    builder.putInt32ToEnumField(1, TestMap.EnumValue.BAR);
-    assertThat(builder.build().getInt32ToEnumFieldMap())
-        .isEqualTo(newMap(1, TestMap.EnumValue.BAR));
-    assertThat(builder.getInt32ToEnumFieldMap()).isEqualTo(newMap(1, TestMap.EnumValue.BAR));
-    builder.putInt32ToEnumField(2, TestMap.EnumValue.FOO);
-    assertThat(builder.getInt32ToEnumFieldMap())
-        .isEqualTo(newMap(1, TestMap.EnumValue.BAR, 2, TestMap.EnumValue.FOO));
-
-    builder.putInt32ToStringField(1, "1");
-    assertThat(builder.build().getInt32ToStringFieldMap()).isEqualTo(newMap(1, "1"));
-    assertThat(builder.getInt32ToStringFieldMap()).isEqualTo(newMap(1, "1"));
-    builder.putInt32ToStringField(2, "2");
-    assertThat(builder.getInt32ToStringFieldMap()).isEqualTo(newMap(1, "1", 2, "2"));
-
-    builder.putInt32ToMessageField(1, TestMap.MessageValue.getDefaultInstance());
-    assertThat(builder.build().getInt32ToMessageFieldMap())
-        .isEqualTo(newMap(1, TestMap.MessageValue.getDefaultInstance()));
-    assertThat(builder.getInt32ToMessageFieldMap())
-        .isEqualTo(newMap(1, TestMap.MessageValue.getDefaultInstance()));
-    builder.putInt32ToMessageField(2, TestMap.MessageValue.getDefaultInstance());
-    assertThat(builder.getInt32ToMessageFieldMap())
-        .isEqualTo(
-            newMap(
-                1,
-                TestMap.MessageValue.getDefaultInstance(),
-                2,
-                TestMap.MessageValue.getDefaultInstance()));
-  }
-
-  @Test
-  public void testGettersAndSetters() throws Exception {
-    TestMap.Builder builder = TestMap.newBuilder();
-    TestMap message = builder.build();
-    assertMapValuesCleared(message);
-
-    builder = message.toBuilder();
-    setMapValues(builder);
-    message = builder.build();
-    assertMapValuesSet(message);
-
-    builder = message.toBuilder();
-    updateMapValues(builder);
-    message = builder.build();
-    assertMapValuesUpdated(message);
-
-    builder = message.toBuilder();
-    builder.clear();
-    assertMapValuesCleared(builder);
-    message = builder.build();
-    assertMapValuesCleared(message);
-  }
-
-  @Test
-  public void testPutAll() throws Exception {
-    TestMap.Builder sourceBuilder = TestMap.newBuilder();
-    setMapValues(sourceBuilder);
-    TestMap source = sourceBuilder.build();
-    assertMapValuesSet(source);
-
-    TestMap.Builder destination = TestMap.newBuilder();
-    copyMapValues(source, destination);
-    assertMapValuesSet(destination.build());
-  }
-
-    @Test
-  public void testPutChecksNullKey() throws Exception {
-    TestMap.Builder builder = TestMap.newBuilder();
-
-    try {
-      builder.putStringToInt32Field(null, 1);
-      assertWithMessage("expected exception").fail();
-    } catch (NullPointerException expected) {
-    }
-  }
-
-  @Test
-  public void testPutChecksNullValues() throws Exception {
-    TestMap.Builder builder = TestMap.newBuilder();
-
-    try {
-      builder.putInt32ToStringField(1, null);
-      assertWithMessage("Expected NullPointerException").fail();
-    } catch (NullPointerException e) {
-      // expected.
-    }
-
-    try {
-      builder.putInt32ToBytesField(1, null);
-      assertWithMessage("Expected NullPointerException").fail();
-    } catch (NullPointerException e) {
-      // expected.
-    }
-
-    try {
-      builder.putInt32ToEnumField(1, null);
-      assertWithMessage("Expected NullPointerException").fail();
-    } catch (NullPointerException e) {
-      // expected.
-    }
-
-    try {
-      builder.putInt32ToMessageField(1, null);
-      assertWithMessage("Expected NullPointerException").fail();
-    } catch (NullPointerException e) {
-      // expected.
-    }
-
-    try {
-      builder.putStringToInt32Field(null, 1);
-      assertWithMessage("Expected NullPointerException").fail();;
-    } catch (NullPointerException e) {
-      // expected.
-    }
-  }
-
-  @Test
-  public void testSerializeAndParse() throws Exception {
-    TestMap.Builder builder = TestMap.newBuilder();
-    setMapValues(builder);
-    TestMap message = builder.build();
-    assertThat(message.toByteString().size()).isEqualTo(message.getSerializedSize());
-    message = TestMap.parseFrom(message.toByteString());
-    assertMapValuesSet(message);
-
-    builder = message.toBuilder();
-    updateMapValues(builder);
-    message = builder.build();
-    assertThat(message.toByteString().size()).isEqualTo(message.getSerializedSize());
-    message = TestMap.parseFrom(message.toByteString());
-    assertMapValuesUpdated(message);
-
-    builder = message.toBuilder();
-    builder.clear();
-    message = builder.build();
-    assertThat(message.toByteString().size()).isEqualTo(message.getSerializedSize());
-    message = TestMap.parseFrom(message.toByteString());
-    assertMapValuesCleared(message);
-  }
-
-  private TestMap tryParseTestMap(BizarroTestMap bizarroMap) throws IOException {
-    ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
-    CodedOutputStream output = CodedOutputStream.newInstance(byteArrayOutputStream);
-    bizarroMap.writeTo(output);
-    output.flush();
-    return TestMap.parseFrom(ByteString.copyFrom(byteArrayOutputStream.toByteArray()));
-  }
-
-  @Test
-  public void testParseError() throws Exception {
-    ByteString bytes = TestUtil.toBytes("SOME BYTES");
-    String stringKey = "a string key";
-
-    TestMap map =
-        tryParseTestMap(BizarroTestMap.newBuilder().putInt32ToInt32Field(5, bytes).build());
-    assertThat(map.getInt32ToInt32FieldOrDefault(5, -1)).isEqualTo(0);
-
-    map = tryParseTestMap(BizarroTestMap.newBuilder().putInt32ToStringField(stringKey, 5).build());
-    assertThat(map.getInt32ToStringFieldOrDefault(0, null)).isEmpty();
-
-    map = tryParseTestMap(BizarroTestMap.newBuilder().putInt32ToBytesField(stringKey, 5).build());
-    assertThat(ByteString.EMPTY).isEqualTo(map.getInt32ToBytesFieldOrDefault(0, null));
-
-    map =
-        tryParseTestMap(BizarroTestMap.newBuilder().putInt32ToEnumField(stringKey, bytes).build());
-    assertThat(map.getInt32ToEnumFieldOrDefault(0, null)).isEqualTo(TestMap.EnumValue.FOO);
-
-    try {
-      tryParseTestMap(BizarroTestMap.newBuilder().putInt32ToMessageField(stringKey, bytes).build());
-      assertWithMessage("Expected InvalidProtocolBufferException").fail();
-    } catch (InvalidProtocolBufferException expected) {
-      assertThat(expected.getUnfinishedMessage()).isInstanceOf(TestMap.class);
-      map = (TestMap) expected.getUnfinishedMessage();
-      assertThat(map.getInt32ToMessageFieldMap()).isEmpty();
-    }
-
-    map =
-        tryParseTestMap(
-            BizarroTestMap.newBuilder().putStringToInt32Field(stringKey, bytes).build());
-    assertThat(map.getStringToInt32FieldOrDefault(stringKey, -1)).isEqualTo(0);
-  }
-
-  @Test
-  public void testMergeFrom() throws Exception {
-    TestMap.Builder builder = TestMap.newBuilder();
-    setMapValues(builder);
-    TestMap message = builder.build();
-
-    TestMap.Builder other = TestMap.newBuilder();
-    other.mergeFrom(message);
-    assertMapValuesSet(other.build());
-  }
-
-  @Test
-  public void testEqualsAndHashCode() throws Exception {
-    // Test that generated equals() and hashCode() will disregard the order
-    // of map entries when comparing/hashing map fields.
-
-    // We can't control the order of elements in a HashMap. The best we can do
-    // here is to add elements in different order.
-    TestMap m1 =
-        TestMap.newBuilder()
-            .putInt32ToInt32Field(1, 2)
-            .putInt32ToInt32Field(3, 4)
-            .putInt32ToInt32Field(5, 6)
-            .build();
-
-    TestMap.Builder b2 =
-        TestMap.newBuilder()
-            .putInt32ToInt32Field(5, 6)
-            .putInt32ToInt32Field(1, 2)
-            .putInt32ToInt32Field(3, 4);
-    TestMap m2 = b2.build();
-
-    assertThat(m2).isEqualTo(m1);
-    assertThat(m2.hashCode()).isEqualTo(m1.hashCode());
-
-    // Make sure we did compare map fields.
-    b2.putInt32ToInt32Field(1, 0);
-    m2 = b2.build();
-    assertThat(m1.equals(m2)).isFalse();
-    // Don't check m1.hashCode() != m2.hashCode() because it's not guaranteed
-    // to be different.
-  }
-
-  @Test
-  public void testUnknownEnumValues() throws Exception {
-    ByteString data =
-        TestUnknownEnumValue.newBuilder()
-            .putInt32ToInt32Field(1, 1)
-            .putInt32ToInt32Field(2, 54321)
-            .build()
-            .toByteString();
-
-    TestMap message = TestMap.parseFrom(data, ExtensionRegistryLite.getEmptyRegistry());
-    // Entries with unknown enum values will be stored into UnknownFieldSet so
-    // there is only one entry in the map.
-    assertThat(message.getInt32ToEnumFieldMap()).hasSize(1);
-    assertThat(message.getInt32ToEnumFieldMap()).containsEntry(1, TestMap.EnumValue.BAR);
-    // Serializing and parsing should preserve the unknown entry.
-    data = message.toByteString();
-    TestUnknownEnumValue messageWithUnknownEnums =
-        TestUnknownEnumValue.parseFrom(data, ExtensionRegistryLite.getEmptyRegistry());
-    assertThat(messageWithUnknownEnums.getInt32ToInt32FieldMap()).hasSize(2);
-    assertThat(messageWithUnknownEnums.getInt32ToInt32FieldMap().get(1).intValue()).isEqualTo(1);
-    assertThat(messageWithUnknownEnums.getInt32ToInt32FieldMap().get(2).intValue())
-        .isEqualTo(54321);
-  }
-
-  @Test
-  public void testIterationOrder() throws Exception {
-    TestMap.Builder builder = TestMap.newBuilder();
-    setMapValues(builder);
-    TestMap message = builder.build();
-
-    assertThat(new ArrayList<String>(message.getStringToInt32FieldMap().keySet()))
-        .containsExactly("1", "2", "3")
-        .inOrder();
-  }
-
-  private static <K, V> Map<K, V> newMap(K key1, V value1) {
-    Map<K, V> map = new HashMap<>();
-    map.put(key1, value1);
-    return map;
-  }
-
-  private static <K, V> Map<K, V> newMap(K key1, V value1, K key2, V value2) {
-    Map<K, V> map = new HashMap<>();
-    map.put(key1, value1);
-    map.put(key2, value2);
-    return map;
-  }
-
-  @Test
-  public void testGetMap() {
-    TestMap.Builder builder = TestMap.newBuilder();
-    setMapValues(builder);
-    TestMap message = builder.build();
-    assertThat(message.getStringToInt32FieldMap()).isEqualTo(message.getStringToInt32FieldMap());
-    assertThat(message.getInt32ToBytesFieldMap()).isEqualTo(message.getInt32ToBytesFieldMap());
-    assertThat(message.getInt32ToEnumFieldMap()).isEqualTo(message.getInt32ToEnumFieldMap());
-    assertThat(message.getInt32ToMessageFieldMap()).isEqualTo(message.getInt32ToMessageFieldMap());
-  }
-
-  @Test
-  public void testContains() {
-    TestMap.Builder builder = TestMap.newBuilder();
-    setMapValues(builder);
-    assertMapContainsSetValues(builder);
-    assertMapContainsSetValues(builder.build());
-  }
-
-  private void assertMapContainsSetValues(TestMapOrBuilder testMapOrBuilder) {
-    assertThat(testMapOrBuilder.containsInt32ToInt32Field(1)).isTrue();
-    assertThat(testMapOrBuilder.containsInt32ToInt32Field(2)).isTrue();
-    assertThat(testMapOrBuilder.containsInt32ToInt32Field(3)).isTrue();
-    assertThat(testMapOrBuilder.containsInt32ToInt32Field(-1)).isFalse();
-
-    assertThat(testMapOrBuilder.containsInt32ToStringField(1)).isTrue();
-    assertThat(testMapOrBuilder.containsInt32ToStringField(2)).isTrue();
-    assertThat(testMapOrBuilder.containsInt32ToStringField(3)).isTrue();
-    assertThat(testMapOrBuilder.containsInt32ToStringField(-1)).isFalse();
-
-    assertThat(testMapOrBuilder.containsInt32ToBytesField(1)).isTrue();
-    assertThat(testMapOrBuilder.containsInt32ToBytesField(2)).isTrue();
-    assertThat(testMapOrBuilder.containsInt32ToBytesField(3)).isTrue();
-    assertThat(testMapOrBuilder.containsInt32ToBytesField(-1)).isFalse();
-
-    assertThat(testMapOrBuilder.containsInt32ToEnumField(1)).isTrue();
-    assertThat(testMapOrBuilder.containsInt32ToEnumField(2)).isTrue();
-    assertThat(testMapOrBuilder.containsInt32ToEnumField(3)).isTrue();
-    assertThat(testMapOrBuilder.containsInt32ToEnumField(-1)).isFalse();
-
-    assertThat(testMapOrBuilder.containsInt32ToMessageField(1)).isTrue();
-    assertThat(testMapOrBuilder.containsInt32ToMessageField(2)).isTrue();
-    assertThat(testMapOrBuilder.containsInt32ToMessageField(3)).isTrue();
-    assertThat(testMapOrBuilder.containsInt32ToMessageField(-1)).isFalse();
-
-    assertThat(testMapOrBuilder.containsStringToInt32Field("1")).isTrue();
-    assertThat(testMapOrBuilder.containsStringToInt32Field("2")).isTrue();
-    assertThat(testMapOrBuilder.containsStringToInt32Field("3")).isTrue();
-    assertThat(testMapOrBuilder.containsStringToInt32Field("-1")).isFalse();
-  }
-
-  @Test
-  public void testCount() {
-    TestMap.Builder builder = TestMap.newBuilder();
-    assertMapCounts(0, builder);
-
-    setMapValues(builder);
-    assertMapCounts(3, builder);
-
-    TestMap message = builder.build();
-    assertMapCounts(3, message);
-
-    builder = message.toBuilder().putInt32ToInt32Field(4, 44);
-    assertThat(builder.getInt32ToInt32FieldCount()).isEqualTo(4);
-    assertThat(builder.build().getInt32ToInt32FieldCount()).isEqualTo(4);
-
-    // already present - should be unchanged
-    builder.putInt32ToInt32Field(4, 44);
-    assertThat(builder.getInt32ToInt32FieldCount()).isEqualTo(4);
-  }
-
-  private void assertMapCounts(int expectedCount, TestMapOrBuilder testMapOrBuilder) {
-    assertThat(testMapOrBuilder.getInt32ToInt32FieldCount()).isEqualTo(expectedCount);
-    assertThat(testMapOrBuilder.getInt32ToStringFieldCount()).isEqualTo(expectedCount);
-    assertThat(testMapOrBuilder.getInt32ToBytesFieldCount()).isEqualTo(expectedCount);
-    assertThat(testMapOrBuilder.getInt32ToEnumFieldCount()).isEqualTo(expectedCount);
-    assertThat(testMapOrBuilder.getInt32ToMessageFieldCount()).isEqualTo(expectedCount);
-    assertThat(testMapOrBuilder.getStringToInt32FieldCount()).isEqualTo(expectedCount);
-  }
-
-  @Test
-  public void testGetOrDefault() {
-    TestMap.Builder builder = TestMap.newBuilder();
-    assertMapCounts(0, builder);
-    setMapValues(builder);
-    doTestGetOrDefault(builder);
-    doTestGetOrDefault(builder.build());
-  }
-
-  public void doTestGetOrDefault(TestMapOrBuilder testMapOrBuilder) {
-    assertThat(testMapOrBuilder.getInt32ToInt32FieldOrDefault(1, -11)).isEqualTo(11);
-    assertThat(testMapOrBuilder.getInt32ToInt32FieldOrDefault(-1, -11)).isEqualTo(-11);
-
-    assertThat(testMapOrBuilder.getInt32ToStringFieldOrDefault(1, "-11")).isEqualTo("11");
-    assertWithMessage("-11")
-        .that(testMapOrBuilder.getInt32ToStringFieldOrDefault(-1, null))
-        .isNull();
-
-    assertThat(testMapOrBuilder.getInt32ToBytesFieldOrDefault(1, null))
-        .isEqualTo(TestUtil.toBytes("11"));
-    assertThat(testMapOrBuilder.getInt32ToBytesFieldOrDefault(-1, null)).isNull();
-
-    assertThat(testMapOrBuilder.getInt32ToEnumFieldOrDefault(1, null))
-        .isEqualTo(TestMap.EnumValue.FOO);
-    assertThat(testMapOrBuilder.getInt32ToEnumFieldOrDefault(-1, null)).isNull();
-
-    assertThat(testMapOrBuilder.getInt32ToMessageFieldOrDefault(1, null))
-        .isEqualTo(MessageValue.newBuilder().setValue(11).build());
-    assertThat(testMapOrBuilder.getInt32ToMessageFieldOrDefault(-1, null)).isNull();
-
-    assertThat(testMapOrBuilder.getStringToInt32FieldOrDefault("1", -11)).isEqualTo(11);
-    assertThat(testMapOrBuilder.getStringToInt32FieldOrDefault("-1", -11)).isEqualTo(-11);
-
-    try {
-      testMapOrBuilder.getStringToInt32FieldOrDefault(null, -11);
-      assertWithMessage("Expected NullPointerException").fail();
-    } catch (NullPointerException e) {
-      // expected
-    }
-  }
-
-  @Test
-  public void testGetOrThrow() {
-    TestMap.Builder builder = TestMap.newBuilder();
-    assertMapCounts(0, builder);
-    setMapValues(builder);
-    doTestGetOrDefault(builder);
-    doTestGetOrDefault(builder.build());
-  }
-
-  public void doTestGetOrThrow(TestMapOrBuilder testMapOrBuilder) {
-    assertThat(testMapOrBuilder.getInt32ToInt32FieldOrThrow(1)).isEqualTo(11);
-    try {
-      testMapOrBuilder.getInt32ToInt32FieldOrThrow(-1);
-      assertWithMessage("Expected IllegalArgumentException").fail();
-    } catch (IllegalArgumentException e) {
-      // expected
-    }
-
-    assertThat(testMapOrBuilder.getInt32ToStringFieldOrThrow(1)).isEqualTo("11");
-
-    try {
-      testMapOrBuilder.getInt32ToStringFieldOrThrow(-1);
-      assertWithMessage("Expected IllegalArgumentException").fail();
-    } catch (IllegalArgumentException e) {
-      // expected
-    }
-
-    assertThat(testMapOrBuilder.getInt32ToBytesFieldOrThrow(1)).isEqualTo(TestUtil.toBytes("11"));
-
-    try {
-      testMapOrBuilder.getInt32ToBytesFieldOrThrow(-1);
-      assertWithMessage("Expected IllegalArgumentException").fail();
-    } catch (IllegalArgumentException e) {
-      // expected
-    }
-
-    assertThat(testMapOrBuilder.getInt32ToEnumFieldOrThrow(1)).isEqualTo(TestMap.EnumValue.FOO);
-    try {
-      testMapOrBuilder.getInt32ToEnumFieldOrThrow(-1);
-      assertWithMessage("Expected IllegalArgumentException").fail();
-    } catch (IllegalArgumentException e) {
-      // expected
-    }
-
-    assertThat(testMapOrBuilder.getInt32ToMessageFieldOrThrow(1))
-        .isEqualTo(MessageValue.newBuilder().setValue(11).build());
-    try {
-      testMapOrBuilder.getInt32ToMessageFieldOrThrow(-1);
-      assertWithMessage("Expected IllegalArgumentException").fail();
-    } catch (IllegalArgumentException e) {
-      // expected
-    }
-
-    assertThat(testMapOrBuilder.getStringToInt32FieldOrThrow("1")).isEqualTo(11);
-    try {
-      testMapOrBuilder.getStringToInt32FieldOrThrow("-1");
-      assertWithMessage("Expected IllegalArgumentException").fail();
-    } catch (IllegalArgumentException e) {
-      // expected
-    }
-
-    try {
-      testMapOrBuilder.getStringToInt32FieldOrThrow(null);
-      assertWithMessage("Expected NullPointerException").fail();
-    } catch (NullPointerException e) {
-      // expected
-    }
-  }
-
-  @Test
-  public void testPut() {
-    TestMap.Builder builder = TestMap.newBuilder();
-    builder.putInt32ToInt32Field(1, 11);
-    assertThat(builder.getInt32ToInt32FieldOrThrow(1)).isEqualTo(11);
-
-    builder.putInt32ToStringField(1, "a");
-    assertThat(builder.getInt32ToStringFieldOrThrow(1)).isEqualTo("a");
-    try {
-      builder.putInt32ToStringField(1, null);
-      assertWithMessage("Expected NullPointerException").fail();
-    } catch (NullPointerException e) {
-      // expected
-    }
-
-    builder.putInt32ToBytesField(1, TestUtil.toBytes("11"));
-    assertThat(builder.getInt32ToBytesFieldOrThrow(1)).isEqualTo(TestUtil.toBytes("11"));
-    try {
-      builder.putInt32ToBytesField(1, null);
-      assertWithMessage("Expected NullPointerException").fail();
-    } catch (NullPointerException e) {
-      // expected
-    }
-
-    builder.putInt32ToEnumField(1, TestMap.EnumValue.FOO);
-    assertThat(builder.getInt32ToEnumFieldOrThrow(1)).isEqualTo(TestMap.EnumValue.FOO);
-    try {
-      builder.putInt32ToEnumField(1, null);
-      assertWithMessage("Expected NullPointerException").fail();
-    } catch (NullPointerException e) {
-      // expected
-    }
-
-    builder.putStringToInt32Field("a", 1);
-    assertThat(builder.getStringToInt32FieldOrThrow("a")).isEqualTo(1);
-    try {
-      builder.putStringToInt32Field(null, -1);
-    } catch (NullPointerException e) {
-      // expected
-    }
-  }
-
-  @Test
-  public void testRemove() {
-    TestMap.Builder builder = TestMap.newBuilder();
-    setMapValues(builder);
-    assertThat(builder.getInt32ToInt32FieldOrThrow(1)).isEqualTo(11);
-    for (int times = 0; times < 2; times++) {
-      builder.removeInt32ToInt32Field(1);
-      assertThat(builder.getInt32ToInt32FieldOrDefault(1, -1)).isEqualTo(-1);
-    }
-
-    assertThat(builder.getInt32ToStringFieldOrThrow(1)).isEqualTo("11");
-    for (int times = 0; times < 2; times++) {
-      builder.removeInt32ToStringField(1);
-      assertThat(builder.getInt32ToStringFieldOrDefault(1, null)).isNull();
-    }
-
-    assertThat(builder.getInt32ToBytesFieldOrThrow(1)).isEqualTo(TestUtil.toBytes("11"));
-    for (int times = 0; times < 2; times++) {
-      builder.removeInt32ToBytesField(1);
-      assertThat(builder.getInt32ToBytesFieldOrDefault(1, null)).isNull();
-    }
-
-    assertThat(builder.getInt32ToEnumFieldOrThrow(1)).isEqualTo(TestMap.EnumValue.FOO);
-    for (int times = 0; times < 2; times++) {
-      builder.removeInt32ToEnumField(1);
-      assertThat(builder.getInt32ToEnumFieldOrDefault(1, null)).isNull();
-    }
-
-    assertThat(builder.getStringToInt32FieldOrThrow("1")).isEqualTo(11);
-    for (int times = 0; times < 2; times++) {
-      builder.removeStringToInt32Field("1");
-      assertThat(builder.getStringToInt32FieldOrDefault("1", -1)).isEqualTo(-1);
-    }
-
-    try {
-      builder.removeStringToInt32Field(null);
-      assertWithMessage("Expected NullPointerException").fail();
-    } catch (NullPointerException e) {
-      // expected
-    }
-  }
-
-  @Test
-  public void testPutAllWithNullStringKey() throws Exception {
-    TestMap.Builder sourceBuilder = TestMap.newBuilder();
-
-    // order preserving map used here to help test rollback
-    Map<Integer, String> data = new LinkedHashMap<>();
-    data.put(7, "foo");
-    data.put(null, "bar");
-    data.put(9, "baz");
-    try {
-      sourceBuilder.putAllInt32ToStringField(data);
-      fail("allowed null string key");
-    } catch (NullPointerException expected) {
-      // Verify rollback of previously added values.
-      // They all go in or none do.
-      assertThat(sourceBuilder.getInt32ToStringFieldMap()).isEmpty();
-    }
-  }
-
-  @Test
-  public void testPutAllWithNullStringValue() throws Exception {
-    TestMap.Builder sourceBuilder = TestMap.newBuilder();
-
-    // order preserving map used here to help test rollback
-    Map<Integer, String> data = new LinkedHashMap<>();
-    data.put(7, "foo");
-    data.put(8, "bar");
-    data.put(9, null);
-    try {
-      sourceBuilder.putAllInt32ToStringField(data);
-      fail("allowed null string value");
-    } catch (NullPointerException expected) {
-      // Verify rollback of previously added values.
-      // They all go in or none do.
-      assertThat(sourceBuilder.getInt32ToStringFieldMap()).isEmpty();
-    }
-  }
-
-  @Test
-  public void testPutNullStringValue() throws Exception {
-    TestMap.Builder sourceBuilder = TestMap.newBuilder();
-
-    try {
-      sourceBuilder.putInt32ToStringField(8, null);
-      fail("allowed null string value");
-    } catch (NullPointerException expected) {
-    }
-  }
-
-}
diff --git a/libs/protobuf/java/core/src/test/java/com/google/protobuf/MapForProto2Test.java b/libs/protobuf/java/core/src/test/java/com/google/protobuf/MapForProto2Test.java
deleted file mode 100644
index 2f74f96..0000000
--- a/libs/protobuf/java/core/src/test/java/com/google/protobuf/MapForProto2Test.java
+++ /dev/null
@@ -1,1279 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.common.truth.Truth.assertThat;
-import static com.google.common.truth.Truth.assertWithMessage;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
-
-import com.google.protobuf.Descriptors.FieldDescriptor;
-import map_test.MapForProto2TestProto.BizarroTestMap;
-import map_test.MapForProto2TestProto.ReservedAsMapField;
-import map_test.MapForProto2TestProto.ReservedAsMapFieldWithEnumValue;
-import map_test.MapForProto2TestProto.TestMap;
-import map_test.MapForProto2TestProto.TestMap.MessageValue;
-import map_test.MapForProto2TestProto.TestMap.MessageWithRequiredFields;
-import map_test.MapForProto2TestProto.TestMapOrBuilder;
-import map_test.MapForProto2TestProto.TestRecursiveMap;
-import map_test.MapForProto2TestProto.TestUnknownEnumValue;
-import map_test.Message1;
-import map_test.RedactAllTypes;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-/** Unit tests for map fields in proto2 protos. */
-@RunWith(JUnit4.class)
-public class MapForProto2Test {
-
-  private void setMapValuesUsingMutableMap(TestMap.Builder builder) {
-    builder.getMutableInt32ToInt32Field().put(1, 11);
-    builder.getMutableInt32ToInt32Field().put(2, 22);
-    builder.getMutableInt32ToInt32Field().put(3, 33);
-  //
-    builder.getMutableInt32ToStringField().put(1, "11");
-    builder.getMutableInt32ToStringField().put(2, "22");
-    builder.getMutableInt32ToStringField().put(3, "33");
-  //
-    builder.getMutableInt32ToBytesField().put(1, TestUtil.toBytes("11"));
-    builder.getMutableInt32ToBytesField().put(2, TestUtil.toBytes("22"));
-    builder.getMutableInt32ToBytesField().put(3, TestUtil.toBytes("33"));
-  //
-    builder.getMutableInt32ToEnumField().put(1, TestMap.EnumValue.FOO);
-    builder.getMutableInt32ToEnumField().put(2, TestMap.EnumValue.BAR);
-    builder.getMutableInt32ToEnumField().put(3, TestMap.EnumValue.BAZ);
-  //
-    builder.getMutableInt32ToMessageField().put(
-        1, MessageValue.newBuilder().setValue(11).build());
-    builder.getMutableInt32ToMessageField().put(
-        2, MessageValue.newBuilder().setValue(22).build());
-    builder.getMutableInt32ToMessageField().put(
-        3, MessageValue.newBuilder().setValue(33).build());
-  //
-    builder.getMutableStringToInt32Field().put("1", 11);
-    builder.getMutableStringToInt32Field().put("2", 22);
-    builder.getMutableStringToInt32Field().put("3", 33);
-  }
-
-  private void setMapValuesUsingAccessors(TestMap.Builder builder) {
-    builder
-        .putInt32ToInt32Field(1, 11)
-        .putInt32ToInt32Field(2, 22)
-        .putInt32ToInt32Field(3, 33)
-        .putInt32ToStringField(1, "11")
-        .putInt32ToStringField(2, "22")
-        .putInt32ToStringField(3, "33")
-        .putInt32ToBytesField(1, TestUtil.toBytes("11"))
-        .putInt32ToBytesField(2, TestUtil.toBytes("22"))
-        .putInt32ToBytesField(3, TestUtil.toBytes("33"))
-        .putInt32ToEnumField(1, TestMap.EnumValue.FOO)
-        .putInt32ToEnumField(2, TestMap.EnumValue.BAR)
-        .putInt32ToEnumField(3, TestMap.EnumValue.BAZ)
-        .putInt32ToMessageField(1, MessageValue.newBuilder().setValue(11).build())
-        .putInt32ToMessageField(2, MessageValue.newBuilder().setValue(22).build())
-        .putInt32ToMessageField(3, MessageValue.newBuilder().setValue(33).build())
-        .putStringToInt32Field("1", 11)
-        .putStringToInt32Field("2", 22)
-        .putStringToInt32Field("3", 33);
-  }
-
-  @Test
-  public void testSetMapValues() {
-    TestMap.Builder usingMutableMapBuilder = TestMap.newBuilder();
-    setMapValuesUsingMutableMap(usingMutableMapBuilder);
-    TestMap usingMutableMap = usingMutableMapBuilder.build();
-    assertMapValuesSet(usingMutableMap);
-
-    TestMap.Builder usingAccessorsBuilder = TestMap.newBuilder();
-    setMapValuesUsingAccessors(usingAccessorsBuilder);
-    TestMap usingAccessors = usingAccessorsBuilder.build();
-    assertMapValuesSet(usingAccessors);
-
-    assertThat(usingAccessors).isEqualTo(usingMutableMap);
-  }
-
-  private void copyMapValues(TestMap source, TestMap.Builder destination) {
-    destination
-        .putAllInt32ToInt32Field(source.getInt32ToInt32FieldMap())
-        .putAllInt32ToStringField(source.getInt32ToStringFieldMap())
-        .putAllInt32ToBytesField(source.getInt32ToBytesFieldMap())
-        .putAllInt32ToEnumField(source.getInt32ToEnumFieldMap())
-        .putAllInt32ToMessageField(source.getInt32ToMessageFieldMap())
-        .putAllStringToInt32Field(source.getStringToInt32FieldMap());
-  }
-
-  private void assertMapValuesSet(TestMapOrBuilder message) {
-    assertThat(message.getInt32ToInt32FieldMap()).hasSize(3);
-    assertThat(message.getInt32ToInt32FieldMap().get(1).intValue()).isEqualTo(11);
-    assertThat(message.getInt32ToInt32FieldMap().get(2).intValue()).isEqualTo(22);
-    assertThat(message.getInt32ToInt32FieldMap().get(3).intValue()).isEqualTo(33);
-
-    assertThat(message.getInt32ToStringFieldMap()).hasSize(3);
-    assertThat(message.getInt32ToStringFieldMap()).containsEntry(1, "11");
-    assertThat(message.getInt32ToStringFieldMap()).containsEntry(2, "22");
-    assertThat(message.getInt32ToStringFieldMap()).containsEntry(3, "33");
-
-    assertThat(message.getInt32ToBytesFieldMap()).hasSize(3);
-    assertThat(message.getInt32ToBytesFieldMap()).containsEntry(1, TestUtil.toBytes("11"));
-    assertThat(message.getInt32ToBytesFieldMap()).containsEntry(2, TestUtil.toBytes("22"));
-    assertThat(message.getInt32ToBytesFieldMap()).containsEntry(3, TestUtil.toBytes("33"));
-
-    assertThat(message.getInt32ToEnumFieldMap()).hasSize(3);
-    assertThat(message.getInt32ToEnumFieldMap()).containsEntry(1, TestMap.EnumValue.FOO);
-    assertThat(message.getInt32ToEnumFieldMap()).containsEntry(2, TestMap.EnumValue.BAR);
-    assertThat(message.getInt32ToEnumFieldMap()).containsEntry(3, TestMap.EnumValue.BAZ);
-
-    assertThat(message.getInt32ToMessageFieldMap()).hasSize(3);
-    assertThat(message.getInt32ToMessageFieldMap().get(1).getValue()).isEqualTo(11);
-    assertThat(message.getInt32ToMessageFieldMap().get(2).getValue()).isEqualTo(22);
-    assertThat(message.getInt32ToMessageFieldMap().get(3).getValue()).isEqualTo(33);
-
-    assertThat(message.getStringToInt32FieldMap()).hasSize(3);
-    assertThat(message.getStringToInt32FieldMap().get("1").intValue()).isEqualTo(11);
-    assertThat(message.getStringToInt32FieldMap().get("2").intValue()).isEqualTo(22);
-    assertThat(message.getStringToInt32FieldMap().get("3").intValue()).isEqualTo(33);
-  }
-
-  private void updateMapValuesUsingMutableMap(TestMap.Builder builder) {
-    builder.getMutableInt32ToInt32Field().put(1, 111);
-    builder.getMutableInt32ToInt32Field().remove(2);
-    builder.getMutableInt32ToInt32Field().put(4, 44);
-  //
-    builder.getMutableInt32ToStringField().put(1, "111");
-    builder.getMutableInt32ToStringField().remove(2);
-    builder.getMutableInt32ToStringField().put(4, "44");
-  //
-    builder.getMutableInt32ToBytesField().put(1, TestUtil.toBytes("111"));
-    builder.getMutableInt32ToBytesField().remove(2);
-    builder.getMutableInt32ToBytesField().put(4, TestUtil.toBytes("44"));
-  //
-    builder.getMutableInt32ToEnumField().put(1, TestMap.EnumValue.BAR);
-    builder.getMutableInt32ToEnumField().remove(2);
-    builder.getMutableInt32ToEnumField().put(4, TestMap.EnumValue.QUX);
-  //
-    builder.getMutableInt32ToMessageField().put(
-        1, MessageValue.newBuilder().setValue(111).build());
-    builder.getMutableInt32ToMessageField().remove(2);
-    builder.getMutableInt32ToMessageField().put(
-        4, MessageValue.newBuilder().setValue(44).build());
-  //
-    builder.getMutableStringToInt32Field().put("1", 111);
-    builder.getMutableStringToInt32Field().remove("2");
-    builder.getMutableStringToInt32Field().put("4", 44);
-  }
-
-  private void updateMapValuesUsingAccessors(TestMap.Builder builder) {
-    builder
-        .putInt32ToInt32Field(1, 111)
-        .removeInt32ToInt32Field(2)
-        .putInt32ToInt32Field(4, 44)
-        .putInt32ToStringField(1, "111")
-        .removeInt32ToStringField(2)
-        .putInt32ToStringField(4, "44")
-        .putInt32ToBytesField(1, TestUtil.toBytes("111"))
-        .removeInt32ToBytesField(2)
-        .putInt32ToBytesField(4, TestUtil.toBytes("44"))
-        .putInt32ToEnumField(1, TestMap.EnumValue.BAR)
-        .removeInt32ToEnumField(2)
-        .putInt32ToEnumField(4, TestMap.EnumValue.QUX)
-        .putInt32ToMessageField(1, MessageValue.newBuilder().setValue(111).build())
-        .removeInt32ToMessageField(2)
-        .putInt32ToMessageField(4, MessageValue.newBuilder().setValue(44).build())
-        .putStringToInt32Field("1", 111)
-        .removeStringToInt32Field("2")
-        .putStringToInt32Field("4", 44);
-  }
-
-  @Test
-  public void testUpdateMapValues() {
-    TestMap.Builder usingMutableMapBuilder = TestMap.newBuilder();
-    setMapValuesUsingMutableMap(usingMutableMapBuilder);
-    TestMap usingMutableMap = usingMutableMapBuilder.build();
-    assertMapValuesSet(usingMutableMap);
-
-    TestMap.Builder usingAccessorsBuilder = TestMap.newBuilder();
-    setMapValuesUsingAccessors(usingAccessorsBuilder);
-    TestMap usingAccessors = usingAccessorsBuilder.build();
-    assertMapValuesSet(usingAccessors);
-
-    assertThat(usingAccessors).isEqualTo(usingMutableMap);
-    //
-    usingMutableMapBuilder = usingMutableMap.toBuilder();
-    updateMapValuesUsingMutableMap(usingMutableMapBuilder);
-    usingMutableMap = usingMutableMapBuilder.build();
-    assertMapValuesUpdated(usingMutableMap);
-
-    usingAccessorsBuilder = usingAccessors.toBuilder();
-    updateMapValuesUsingAccessors(usingAccessorsBuilder);
-    usingAccessors = usingAccessorsBuilder.build();
-    assertMapValuesUpdated(usingAccessors);
-
-    assertThat(usingAccessors).isEqualTo(usingMutableMap);
-  }
-
-  private void assertMapValuesUpdated(TestMap message) {
-    assertThat(message.getInt32ToInt32FieldMap()).hasSize(3);
-    assertThat(message.getInt32ToInt32FieldMap().get(1).intValue()).isEqualTo(111);
-    assertThat(message.getInt32ToInt32FieldMap().get(3).intValue()).isEqualTo(33);
-    assertThat(message.getInt32ToInt32FieldMap().get(4).intValue()).isEqualTo(44);
-
-    assertThat(message.getInt32ToStringFieldMap()).hasSize(3);
-    assertThat(message.getInt32ToStringFieldMap()).containsEntry(1, "111");
-    assertThat(message.getInt32ToStringFieldMap()).containsEntry(3, "33");
-    assertThat(message.getInt32ToStringFieldMap()).containsEntry(4, "44");
-
-    assertThat(message.getInt32ToBytesFieldMap()).hasSize(3);
-    assertThat(message.getInt32ToBytesFieldMap()).containsEntry(1, TestUtil.toBytes("111"));
-    assertThat(message.getInt32ToBytesFieldMap()).containsEntry(3, TestUtil.toBytes("33"));
-    assertThat(message.getInt32ToBytesFieldMap()).containsEntry(4, TestUtil.toBytes("44"));
-
-    assertThat(message.getInt32ToEnumFieldMap()).hasSize(3);
-    assertThat(message.getInt32ToEnumFieldMap()).containsEntry(1, TestMap.EnumValue.BAR);
-    assertThat(message.getInt32ToEnumFieldMap()).containsEntry(3, TestMap.EnumValue.BAZ);
-    assertThat(message.getInt32ToEnumFieldMap()).containsEntry(4, TestMap.EnumValue.QUX);
-
-    assertThat(message.getInt32ToMessageFieldMap()).hasSize(3);
-    assertThat(message.getInt32ToMessageFieldMap().get(1).getValue()).isEqualTo(111);
-    assertThat(message.getInt32ToMessageFieldMap().get(3).getValue()).isEqualTo(33);
-    assertThat(message.getInt32ToMessageFieldMap().get(4).getValue()).isEqualTo(44);
-
-    assertThat(message.getStringToInt32FieldMap()).hasSize(3);
-    assertThat(message.getStringToInt32FieldMap().get("1").intValue()).isEqualTo(111);
-    assertThat(message.getStringToInt32FieldMap().get("3").intValue()).isEqualTo(33);
-    assertThat(message.getStringToInt32FieldMap().get("4").intValue()).isEqualTo(44);
-  }
-
-  private void assertMapValuesCleared(TestMapOrBuilder testMapOrBuilder) {
-    assertThat(testMapOrBuilder.getInt32ToInt32FieldMap()).isEmpty();
-    assertThat(testMapOrBuilder.getInt32ToInt32FieldCount()).isEqualTo(0);
-    assertThat(testMapOrBuilder.getInt32ToStringFieldMap()).isEmpty();
-    assertThat(testMapOrBuilder.getInt32ToStringFieldCount()).isEqualTo(0);
-    assertThat(testMapOrBuilder.getInt32ToBytesFieldMap()).isEmpty();
-    assertThat(testMapOrBuilder.getInt32ToBytesFieldCount()).isEqualTo(0);
-    assertThat(testMapOrBuilder.getInt32ToEnumFieldMap()).isEmpty();
-    assertThat(testMapOrBuilder.getInt32ToEnumFieldCount()).isEqualTo(0);
-    assertThat(testMapOrBuilder.getInt32ToMessageFieldMap()).isEmpty();
-    assertThat(testMapOrBuilder.getInt32ToMessageFieldCount()).isEqualTo(0);
-    assertThat(testMapOrBuilder.getStringToInt32FieldMap()).isEmpty();
-    assertThat(testMapOrBuilder.getStringToInt32FieldCount()).isEqualTo(0);
-  }
-
-  @Test
-  public void testGetMapIsImmutable() {
-    TestMap.Builder builder = TestMap.newBuilder();
-    assertMapsAreImmutable(builder);
-    assertMapsAreImmutable(builder.build());
-
-    setMapValuesUsingAccessors(builder);
-    assertMapsAreImmutable(builder);
-    assertMapsAreImmutable(builder.build());
-  }
-
-  private void assertMapsAreImmutable(TestMapOrBuilder testMapOrBuilder) {
-    assertImmutable(testMapOrBuilder.getInt32ToInt32FieldMap(), 1, 2);
-    assertImmutable(testMapOrBuilder.getInt32ToStringFieldMap(), 1, "2");
-    assertImmutable(testMapOrBuilder.getInt32ToBytesFieldMap(), 1, TestUtil.toBytes("2"));
-    assertImmutable(testMapOrBuilder.getInt32ToEnumFieldMap(), 1, TestMap.EnumValue.FOO);
-    assertImmutable(
-        testMapOrBuilder.getInt32ToMessageFieldMap(), 1, MessageValue.getDefaultInstance());
-    assertImmutable(testMapOrBuilder.getStringToInt32FieldMap(), "1", 2);
-  }
-
-  private <K, V> void assertImmutable(Map<K, V> map, K key, V value) {
-    try {
-      map.put(key, value);
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-  }
-
-  @Test
-  public void testMutableMapLifecycle() {
-    TestMap.Builder builder = TestMap.newBuilder();
-    Map<Integer, Integer> intMap = builder.getMutableInt32ToInt32Field();
-    intMap.put(1, 2);
-    assertThat(builder.build().getInt32ToInt32Field()).isEqualTo(newMap(1, 2));
-    try {
-      intMap.put(2, 3);
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-    assertThat(builder.getInt32ToInt32Field()).isEqualTo(newMap(1, 2));
-    builder.getMutableInt32ToInt32Field().put(2, 3);
-    assertThat(builder.getInt32ToInt32Field()).isEqualTo(newMap(1, 2, 2, 3));
-  //
-    Map<Integer, TestMap.EnumValue> enumMap = builder.getMutableInt32ToEnumField();
-    enumMap.put(1, TestMap.EnumValue.BAR);
-    assertThat(builder.build().getInt32ToEnumField())
-        .isEqualTo(newMap(1, TestMap.EnumValue.BAR));
-    try {
-      enumMap.put(2, TestMap.EnumValue.FOO);
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-    assertThat(builder.getInt32ToEnumField()).isEqualTo(newMap(1, TestMap.EnumValue.BAR));
-    builder.getMutableInt32ToEnumField().put(2, TestMap.EnumValue.FOO);
-    assertThat(builder.getInt32ToEnumField())
-            .isEqualTo(newMap(1, TestMap.EnumValue.BAR, 2, TestMap.EnumValue.FOO));
-  //
-    Map<Integer, String> stringMap = builder.getMutableInt32ToStringField();
-    stringMap.put(1, "1");
-    assertThat(builder.build().getInt32ToStringField()).isEqualTo(newMap(1, "1"));
-    try {
-      stringMap.put(2, "2");
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-    assertThat(builder.getInt32ToStringField()).isEqualTo(newMap(1, "1"));
-    builder.getMutableInt32ToStringField().put(2, "2");
-    assertThat(builder.getInt32ToStringField()).isEqualTo(newMap(1, "1", 2, "2"));
-  //
-    Map<Integer, TestMap.MessageValue> messageMap = builder.getMutableInt32ToMessageField();
-    messageMap.put(1, TestMap.MessageValue.getDefaultInstance());
-    assertThat(builder.build().getInt32ToMessageField())
-        .isEqualTo(newMap(1, TestMap.MessageValue.getDefaultInstance()));
-    try {
-      messageMap.put(2, TestMap.MessageValue.getDefaultInstance());
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-    assertThat(builder.getInt32ToMessageField())
-        .isEqualTo(newMap(1, TestMap.MessageValue.getDefaultInstance()));
-    builder.getMutableInt32ToMessageField().put(2, TestMap.MessageValue.getDefaultInstance());
-    assertThat(builder.getInt32ToMessageField()).isEqualTo(
-        newMap(1, TestMap.MessageValue.getDefaultInstance(),
-            2, TestMap.MessageValue.getDefaultInstance()));
-  }
-  //
-  @Test
-  public void testMutableMapLifecycle_collections() {
-    TestMap.Builder builder = TestMap.newBuilder();
-    Map<Integer, Integer> intMap = builder.getMutableInt32ToInt32Field();
-    intMap.put(1, 2);
-    assertThat(builder.build().getInt32ToInt32Field()).isEqualTo(newMap(1, 2));
-    try {
-      intMap.remove(2);
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-    try {
-      intMap.entrySet().remove(new Object());
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-    try {
-      intMap.entrySet().iterator().remove();
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-    try {
-      intMap.keySet().remove(new Object());
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-    try {
-      intMap.values().remove(new Object());
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-    try {
-      intMap.values().iterator().remove();
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-    assertThat(intMap).isEqualTo(newMap(1, 2));
-    assertThat(builder.getInt32ToInt32Field()).isEqualTo(newMap(1, 2));
-    assertThat(builder.build().getInt32ToInt32Field()).isEqualTo(newMap(1, 2));
-  }
-  //
-  private static <K, V> Map<K, V> newMap(K key1, V value1) {
-    Map<K, V> map = new HashMap<K, V>();
-    map.put(key1, value1);
-    return map;
-  }
-  //
-  private static <K, V> Map<K, V> newMap(K key1, V value1, K key2, V value2) {
-    Map<K, V> map = new HashMap<K, V>();
-    map.put(key1, value1);
-    map.put(key2, value2);
-    return map;
-  }
-
-  @Test
-  public void testGettersAndSetters() throws Exception {
-    TestMap.Builder builder = TestMap.newBuilder();
-    TestMap message = builder.build();
-    assertMapValuesCleared(message);
-
-    builder = message.toBuilder();
-    setMapValuesUsingAccessors(builder);
-    message = builder.build();
-    assertMapValuesSet(message);
-
-    builder = message.toBuilder();
-    updateMapValuesUsingAccessors(builder);
-    message = builder.build();
-    assertMapValuesUpdated(message);
-
-    builder = message.toBuilder();
-    builder.clear();
-    assertMapValuesCleared(builder);
-    message = builder.build();
-    assertMapValuesCleared(message);
-  }
-
-  @Test
-  public void testPutAll() throws Exception {
-    TestMap.Builder sourceBuilder = TestMap.newBuilder();
-    setMapValuesUsingAccessors(sourceBuilder);
-    TestMap source = sourceBuilder.build();
-    assertMapValuesSet(source);
-
-    TestMap.Builder destination = TestMap.newBuilder();
-    copyMapValues(source, destination);
-    assertMapValuesSet(destination.build());
-
-    assertThat(destination.getInt32ToEnumFieldCount()).isEqualTo(3);
-  }
-
-  @Test
-  public void testPutChecksNullValues() throws Exception {
-    TestMap.Builder builder = TestMap.newBuilder();
-
-    try {
-      builder.putInt32ToBytesField(1, null);
-      assertWithMessage("expected exception").fail();
-    } catch (NullPointerException e) {
-      // expected.
-    }
-
-    try {
-      builder.putInt32ToEnumField(1, null);
-      assertWithMessage("expected exception").fail();
-    } catch (NullPointerException e) {
-      // expected.
-    }
-
-    try {
-      builder.putInt32ToMessageField(1, null);
-      assertWithMessage("expected exception").fail();
-    } catch (NullPointerException e) {
-      // expected.
-    }
-
-    try {
-      builder.putStringToInt32Field(null, 1);
-      assertWithMessage("expected exception").fail();
-    } catch (NullPointerException e) {
-      // expected.
-    }
-  }
-
-  @Test
-  public void testPutChecksNullKey() throws Exception {
-    TestMap.Builder builder = TestMap.newBuilder();
-
-    try {
-      builder.putStringToInt32Field(null, 1);
-      assertWithMessage("expected exception").fail();
-    } catch (NullPointerException expected) {
-    }
-  }
-
-  @Test
-  public void testSerializeAndParse() throws Exception {
-    TestMap.Builder builder = TestMap.newBuilder();
-    setMapValuesUsingAccessors(builder);
-    TestMap message = builder.build();
-    assertThat(message.toByteString().size()).isEqualTo(message.getSerializedSize());
-    message = TestMap.parseFrom(message.toByteString());
-    assertMapValuesSet(message);
-
-    builder = message.toBuilder();
-    updateMapValuesUsingAccessors(builder);
-    message = builder.build();
-    assertThat(message.toByteString().size()).isEqualTo(message.getSerializedSize());
-    message = TestMap.parseFrom(message.toByteString());
-    assertMapValuesUpdated(message);
-
-    builder = message.toBuilder();
-    builder.clear();
-    message = builder.build();
-    assertThat(message.toByteString().size()).isEqualTo(message.getSerializedSize());
-    message = TestMap.parseFrom(message.toByteString());
-    assertMapValuesCleared(message);
-  }
-
-  private TestMap tryParseTestMap(BizarroTestMap bizarroMap) throws IOException {
-    ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
-    CodedOutputStream output = CodedOutputStream.newInstance(byteArrayOutputStream);
-    bizarroMap.writeTo(output);
-    output.flush();
-    return TestMap.parseFrom(ByteString.copyFrom(byteArrayOutputStream.toByteArray()));
-  }
-
-  @Test
-  public void testParseError() throws Exception {
-    ByteString bytes = TestUtil.toBytes("SOME BYTES");
-    String stringKey = "a string key";
-
-    TestMap map =
-        tryParseTestMap(BizarroTestMap.newBuilder().putInt32ToInt32Field(5, bytes).build());
-    assertThat(map.getInt32ToInt32FieldOrDefault(5, -1)).isEqualTo(0);
-
-    map = tryParseTestMap(BizarroTestMap.newBuilder().putInt32ToStringField(stringKey, 5).build());
-    assertThat(map.getInt32ToStringFieldOrDefault(0, null)).isEmpty();
-
-    map = tryParseTestMap(BizarroTestMap.newBuilder().putInt32ToBytesField(stringKey, 5).build());
-    assertThat(ByteString.EMPTY).isEqualTo(map.getInt32ToBytesFieldOrDefault(0, null));
-
-    map =
-        tryParseTestMap(BizarroTestMap.newBuilder().putInt32ToEnumField(stringKey, bytes).build());
-    assertThat(map.getInt32ToEnumFieldOrDefault(0, null)).isEqualTo(TestMap.EnumValue.FOO);
-
-    try {
-      tryParseTestMap(BizarroTestMap.newBuilder().putInt32ToMessageField(stringKey, bytes).build());
-      assertWithMessage("expected exception").fail();
-    } catch (InvalidProtocolBufferException expected) {
-      assertThat(expected.getUnfinishedMessage()).isInstanceOf(TestMap.class);
-      map = (TestMap) expected.getUnfinishedMessage();
-      assertThat(map.getInt32ToMessageFieldMap()).isEmpty();
-    }
-
-    map =
-        tryParseTestMap(
-            BizarroTestMap.newBuilder().putStringToInt32Field(stringKey, bytes).build());
-    assertThat(map.getStringToInt32FieldOrDefault(stringKey, -1)).isEqualTo(0);
-  }
-
-  @Test
-  public void testMergeFrom() throws Exception {
-    TestMap.Builder builder = TestMap.newBuilder();
-    setMapValuesUsingAccessors(builder);
-    TestMap message = builder.build();
-
-    TestMap.Builder other = TestMap.newBuilder();
-    other.mergeFrom(message);
-    assertMapValuesSet(other.build());
-  }
-
-  @Test
-  public void testEqualsAndHashCode() throws Exception {
-    // Test that generated equals() and hashCode() will disregard the order
-    // of map entries when comparing/hashing map fields.
-
-    // We can't control the order of elements in a HashMap. The best we can do
-    // here is to add elements in different order.
-    TestMap.Builder b1 = TestMap.newBuilder();
-    b1.putInt32ToInt32Field(1, 2);
-    b1.putInt32ToInt32Field(3, 4);
-    b1.putInt32ToInt32Field(5, 6);
-    TestMap m1 = b1.build();
-
-    TestMap.Builder b2 = TestMap.newBuilder();
-    b2.putInt32ToInt32Field(5, 6);
-    b2.putInt32ToInt32Field(1, 2);
-    b2.putInt32ToInt32Field(3, 4);
-    TestMap m2 = b2.build();
-
-    assertThat(m2).isEqualTo(m1);
-    assertThat(m2.hashCode()).isEqualTo(m1.hashCode());
-
-    // Make sure we did compare map fields.
-    b2.putInt32ToInt32Field(1, 0);
-    m2 = b2.build();
-    assertThat(m1.equals(m2)).isFalse();
-    // Don't check m1.hashCode() != m2.hashCode() because it's not guaranteed
-    // to be different.
-  }
-
-
-  // The following methods are used to test reflection API.
-
-  private static FieldDescriptor f(String name) {
-    return TestMap.getDescriptor().findFieldByName(name);
-  }
-
-  private static Object getFieldValue(Message mapEntry, String name) {
-    FieldDescriptor field = mapEntry.getDescriptorForType().findFieldByName(name);
-    return mapEntry.getField(field);
-  }
-
-  private static Message.Builder setFieldValue(
-      Message.Builder mapEntry, String name, Object value) {
-    FieldDescriptor field = mapEntry.getDescriptorForType().findFieldByName(name);
-    mapEntry.setField(field, value);
-    return mapEntry;
-  }
-
-  private static void assertHasMapValues(Message message, String name, Map<?, ?> values) {
-    FieldDescriptor field = f(name);
-    for (Object entry : (List<?>) message.getField(field)) {
-      Message mapEntry = (Message) entry;
-      Object key = getFieldValue(mapEntry, "key");
-      Object value = getFieldValue(mapEntry, "value");
-      assertThat(values.containsKey(key)).isTrue();
-      assertThat(values.get(key)).isEqualTo(value);
-    }
-    assertThat(message.getRepeatedFieldCount(field)).isEqualTo(values.size());
-    for (int i = 0; i < message.getRepeatedFieldCount(field); i++) {
-      Message mapEntry = (Message) message.getRepeatedField(field, i);
-      Object key = getFieldValue(mapEntry, "key");
-      Object value = getFieldValue(mapEntry, "value");
-      assertThat(values.containsKey(key)).isTrue();
-      assertThat(values.get(key)).isEqualTo(value);
-    }
-  }
-
-  private static <K, V> Message newMapEntry(Message.Builder builder, String name, K key, V value) {
-    FieldDescriptor field = builder.getDescriptorForType().findFieldByName(name);
-    Message.Builder entryBuilder = builder.newBuilderForField(field);
-    FieldDescriptor keyField = entryBuilder.getDescriptorForType().findFieldByName("key");
-    FieldDescriptor valueField = entryBuilder.getDescriptorForType().findFieldByName("value");
-    entryBuilder.setField(keyField, key);
-    entryBuilder.setField(valueField, value);
-    return entryBuilder.build();
-  }
-
-  private static void setMapValues(Message.Builder builder, String name, Map<?, ?> values) {
-    List<Message> entryList = new ArrayList<>();
-    for (Map.Entry<?, ?> entry : values.entrySet()) {
-      entryList.add(newMapEntry(builder, name, entry.getKey(), entry.getValue()));
-    }
-    FieldDescriptor field = builder.getDescriptorForType().findFieldByName(name);
-    builder.setField(field, entryList);
-  }
-
-  private static <K, V> Map<K, V> mapForValues(K key1, V value1, K key2, V value2) {
-    Map<K, V> map = new HashMap<>();
-    map.put(key1, value1);
-    map.put(key2, value2);
-    return map;
-  }
-
-  @Test
-  public void testReflectionApi() throws Exception {
-    // In reflection API, map fields are just repeated message fields.
-    TestMap.Builder builder =
-        TestMap.newBuilder()
-            .putInt32ToInt32Field(1, 2)
-            .putInt32ToInt32Field(3, 4)
-            .putInt32ToMessageField(11, MessageValue.newBuilder().setValue(22).build())
-            .putInt32ToMessageField(33, MessageValue.newBuilder().setValue(44).build());
-    TestMap message = builder.build();
-
-    // Test getField(), getRepeatedFieldCount(), getRepeatedField().
-    assertHasMapValues(message, "int32_to_int32_field", mapForValues(1, 2, 3, 4));
-    assertHasMapValues(
-        message,
-        "int32_to_message_field",
-        mapForValues(
-            11, MessageValue.newBuilder().setValue(22).build(),
-            33, MessageValue.newBuilder().setValue(44).build()));
-
-    // Test clearField()
-    builder.clearField(f("int32_to_int32_field"));
-    builder.clearField(f("int32_to_message_field"));
-    message = builder.build();
-    assertThat(message.getInt32ToInt32FieldMap()).isEmpty();
-    assertThat(message.getInt32ToMessageFieldMap()).isEmpty();
-
-    // Test setField()
-    setMapValues(builder, "int32_to_int32_field", mapForValues(11, 22, 33, 44));
-    setMapValues(
-        builder,
-        "int32_to_message_field",
-        mapForValues(
-            111, MessageValue.newBuilder().setValue(222).build(),
-            333, MessageValue.newBuilder().setValue(444).build()));
-    message = builder.build();
-    assertThat(message.getInt32ToInt32FieldMap().get(11).intValue()).isEqualTo(22);
-    assertThat(message.getInt32ToInt32FieldMap().get(33).intValue()).isEqualTo(44);
-    assertThat(message.getInt32ToMessageFieldMap().get(111).getValue()).isEqualTo(222);
-    assertThat(message.getInt32ToMessageFieldMap().get(333).getValue()).isEqualTo(444);
-
-    // Test addRepeatedField
-    builder.addRepeatedField(
-        f("int32_to_int32_field"), newMapEntry(builder, "int32_to_int32_field", 55, 66));
-    builder.addRepeatedField(
-        f("int32_to_message_field"),
-        newMapEntry(
-            builder,
-            "int32_to_message_field",
-            555,
-            MessageValue.newBuilder().setValue(666).build()));
-    message = builder.build();
-    assertThat(message.getInt32ToInt32FieldMap().get(55).intValue()).isEqualTo(66);
-    assertThat(message.getInt32ToMessageFieldMap().get(555).getValue()).isEqualTo(666);
-
-    // Test addRepeatedField (overriding existing values)
-    builder.addRepeatedField(
-        f("int32_to_int32_field"), newMapEntry(builder, "int32_to_int32_field", 55, 55));
-    builder.addRepeatedField(
-        f("int32_to_message_field"),
-        newMapEntry(
-            builder,
-            "int32_to_message_field",
-            555,
-            MessageValue.newBuilder().setValue(555).build()));
-    message = builder.build();
-    assertThat(message.getInt32ToInt32FieldMap().get(55).intValue()).isEqualTo(55);
-    assertThat(message.getInt32ToMessageFieldMap().get(555).getValue()).isEqualTo(555);
-
-    // Test setRepeatedField
-    for (int i = 0; i < builder.getRepeatedFieldCount(f("int32_to_int32_field")); i++) {
-      Message mapEntry = (Message) builder.getRepeatedField(f("int32_to_int32_field"), i);
-      int oldKey = ((Integer) getFieldValue(mapEntry, "key")).intValue();
-      int oldValue = ((Integer) getFieldValue(mapEntry, "value")).intValue();
-      // Swap key with value for each entry.
-      Message.Builder mapEntryBuilder = mapEntry.toBuilder();
-      setFieldValue(mapEntryBuilder, "key", oldValue);
-      setFieldValue(mapEntryBuilder, "value", oldKey);
-      builder.setRepeatedField(f("int32_to_int32_field"), i, mapEntryBuilder.build());
-    }
-    message = builder.build();
-    assertThat(message.getInt32ToInt32FieldMap().get(22).intValue()).isEqualTo(11);
-    assertThat(message.getInt32ToInt32FieldMap().get(44).intValue()).isEqualTo(33);
-    assertThat(message.getInt32ToInt32FieldMap().get(55).intValue()).isEqualTo(55);
-  }
-
-  // See additional coverage in TextFormatTest.java.
-  @Test
-  public void testTextFormat() throws Exception {
-    TestMap.Builder builder = TestMap.newBuilder();
-    setMapValuesUsingAccessors(builder);
-    TestMap message = builder.build();
-
-    String textData = TextFormat.printer().printToString(message);
-
-    builder = TestMap.newBuilder();
-    TextFormat.merge(textData, builder);
-    message = builder.build();
-
-    assertMapValuesSet(message);
-  }
-
-  @Test
-  public void testDynamicMessage() throws Exception {
-    TestMap.Builder builder = TestMap.newBuilder();
-    setMapValuesUsingAccessors(builder);
-    TestMap message = builder.build();
-
-    Message dynamicDefaultInstance = DynamicMessage.getDefaultInstance(TestMap.getDescriptor());
-    Message dynamicMessage =
-        dynamicDefaultInstance
-            .newBuilderForType()
-            .mergeFrom(message.toByteString(), ExtensionRegistry.getEmptyRegistry())
-            .build();
-
-    assertThat(dynamicMessage).isEqualTo(message);
-    assertThat(dynamicMessage.hashCode()).isEqualTo(message.hashCode());
-  }
-
-  // Check that DynamicMessage handles map field serialization the same way as generated code
-  // regarding unset key and value field in a map entry.
-  @Test
-  public void testDynamicMessageUnsetKeyAndValue() throws Exception {
-    FieldDescriptor field = f("int32_to_int32_field");
-
-    Message dynamicDefaultInstance = DynamicMessage.getDefaultInstance(TestMap.getDescriptor());
-    Message.Builder builder = dynamicDefaultInstance.newBuilderForType();
-    // Add an entry without key and value.
-    builder.addRepeatedField(field, builder.newBuilderForField(field).build());
-    Message message = builder.build();
-    ByteString bytes = message.toByteString();
-    // Parse it back to the same generated type.
-    Message generatedMessage = TestMap.parseFrom(bytes, ExtensionRegistry.getEmptyRegistry());
-    // Assert the serialized bytes are equivalent.
-    assertThat(bytes).isEqualTo(generatedMessage.toByteString());
-  }
-
-  @Test
-  public void testReflectionEqualsAndHashCode() throws Exception {
-    // Test that generated equals() and hashCode() will disregard the order
-    // of map entries when comparing/hashing map fields.
-
-    // We use DynamicMessage to test reflection based equals()/hashCode().
-    Message dynamicDefaultInstance = DynamicMessage.getDefaultInstance(TestMap.getDescriptor());
-    FieldDescriptor field = f("int32_to_int32_field");
-
-    Message.Builder b1 = dynamicDefaultInstance.newBuilderForType();
-    b1.addRepeatedField(field, newMapEntry(b1, "int32_to_int32_field", 1, 2));
-    b1.addRepeatedField(field, newMapEntry(b1, "int32_to_int32_field", 3, 4));
-    b1.addRepeatedField(field, newMapEntry(b1, "int32_to_int32_field", 5, 6));
-    Message m1 = b1.build();
-
-    Message.Builder b2 = dynamicDefaultInstance.newBuilderForType();
-    b2.addRepeatedField(field, newMapEntry(b2, "int32_to_int32_field", 5, 6));
-    b2.addRepeatedField(field, newMapEntry(b2, "int32_to_int32_field", 1, 2));
-    b2.addRepeatedField(field, newMapEntry(b2, "int32_to_int32_field", 3, 4));
-    Message m2 = b2.build();
-
-    assertThat(m2).isEqualTo(m1);
-    assertThat(m2.hashCode()).isEqualTo(m1.hashCode());
-
-    // Make sure we did compare map fields.
-    b2.setRepeatedField(field, 0, newMapEntry(b1, "int32_to_int32_field", 0, 0));
-    m2 = b2.build();
-    assertThat(m1.equals(m2)).isFalse();
-    // Don't check m1.hashCode() != m2.hashCode() because it's not guaranteed
-    // to be different.
-  }
-
-  @Test
-  public void testUnknownEnumValues() throws Exception {
-    TestUnknownEnumValue builder =
-        TestUnknownEnumValue.newBuilder()
-            .putInt32ToInt32Field(1, 1)
-            .putInt32ToInt32Field(2, 54321)
-            .build();
-    ByteString data = builder.toByteString();
-
-    TestMap message = TestMap.parseFrom(data, ExtensionRegistry.getEmptyRegistry());
-    // Entries with unknown enum values will be stored into UnknownFieldSet so
-    // there is only one entry in the map.
-    assertThat(message.getInt32ToEnumFieldMap()).hasSize(1);
-    assertThat(message.getInt32ToEnumFieldMap()).containsEntry(1, TestMap.EnumValue.BAR);
-    // UnknownFieldSet should not be empty.
-    assertThat(message.getUnknownFields().asMap()).isNotEmpty();
-    // Serializing and parsing should preserve the unknown entry.
-    data = message.toByteString();
-    TestUnknownEnumValue messageWithUnknownEnums =
-        TestUnknownEnumValue.parseFrom(data, ExtensionRegistry.getEmptyRegistry());
-    assertThat(messageWithUnknownEnums.getInt32ToInt32FieldMap()).hasSize(2);
-    assertThat(messageWithUnknownEnums.getInt32ToInt32FieldMap().get(1).intValue()).isEqualTo(1);
-    assertThat(messageWithUnknownEnums.getInt32ToInt32FieldMap().get(2).intValue())
-        .isEqualTo(54321);
-  }
-
-  @Test
-  public void testRequiredMessage() throws Exception {
-    TestMap.Builder builder = TestMap.newBuilder();
-    builder.putRequiredMessageMap(0, MessageWithRequiredFields.newBuilder().buildPartial());
-    TestMap message = builder.buildPartial();
-    assertThat(message.isInitialized()).isFalse();
-
-    builder.putRequiredMessageMap(0, MessageWithRequiredFields.newBuilder().setValue(1).build());
-    message = builder.build();
-    assertThat(message.isInitialized()).isTrue();
-  }
-
-  @Test
-  public void testRecursiveMap() throws Exception {
-    TestRecursiveMap.Builder builder = TestRecursiveMap.newBuilder();
-    builder.putRecursiveMapField(1, TestRecursiveMap.newBuilder().setValue(2).build());
-    builder.putRecursiveMapField(3, TestRecursiveMap.newBuilder().setValue(4).build());
-    ByteString data = builder.build().toByteString();
-
-    TestRecursiveMap message =
-        TestRecursiveMap.parseFrom(data, ExtensionRegistry.getEmptyRegistry());
-    assertThat(message.getRecursiveMapFieldMap().get(1).getValue()).isEqualTo(2);
-    assertThat(message.getRecursiveMapFieldMap().get(3).getValue()).isEqualTo(4);
-  }
-
-  @Test
-  public void testIterationOrder() throws Exception {
-    TestMap.Builder builder = TestMap.newBuilder();
-    setMapValuesUsingAccessors(builder);
-    TestMap message = builder.build();
-
-    assertThat(new ArrayList<String>(message.getStringToInt32FieldMap().keySet()))
-        .containsExactly("1", "2", "3")
-        .inOrder();
-  }
-
-  @Test
-  public void testContains() {
-    TestMap.Builder builder = TestMap.newBuilder();
-    setMapValuesUsingAccessors(builder);
-    assertMapContainsSetValues(builder);
-    assertMapContainsSetValues(builder.build());
-  }
-
-  private void assertMapContainsSetValues(TestMapOrBuilder testMapOrBuilder) {
-    assertThat(testMapOrBuilder.containsInt32ToInt32Field(1)).isTrue();
-    assertThat(testMapOrBuilder.containsInt32ToInt32Field(2)).isTrue();
-    assertThat(testMapOrBuilder.containsInt32ToInt32Field(3)).isTrue();
-    assertThat(testMapOrBuilder.containsInt32ToInt32Field(-1)).isFalse();
-
-    assertThat(testMapOrBuilder.containsInt32ToStringField(1)).isTrue();
-    assertThat(testMapOrBuilder.containsInt32ToStringField(2)).isTrue();
-    assertThat(testMapOrBuilder.containsInt32ToStringField(3)).isTrue();
-    assertThat(testMapOrBuilder.containsInt32ToStringField(-1)).isFalse();
-
-    assertThat(testMapOrBuilder.containsInt32ToBytesField(1)).isTrue();
-    assertThat(testMapOrBuilder.containsInt32ToBytesField(2)).isTrue();
-    assertThat(testMapOrBuilder.containsInt32ToBytesField(3)).isTrue();
-    assertThat(testMapOrBuilder.containsInt32ToBytesField(-1)).isFalse();
-
-    assertThat(testMapOrBuilder.containsInt32ToEnumField(1)).isTrue();
-    assertThat(testMapOrBuilder.containsInt32ToEnumField(2)).isTrue();
-    assertThat(testMapOrBuilder.containsInt32ToEnumField(3)).isTrue();
-    assertThat(testMapOrBuilder.containsInt32ToEnumField(-1)).isFalse();
-
-    assertThat(testMapOrBuilder.containsInt32ToMessageField(1)).isTrue();
-    assertThat(testMapOrBuilder.containsInt32ToMessageField(2)).isTrue();
-    assertThat(testMapOrBuilder.containsInt32ToMessageField(3)).isTrue();
-    assertThat(testMapOrBuilder.containsInt32ToMessageField(-1)).isFalse();
-
-    assertThat(testMapOrBuilder.containsStringToInt32Field("1")).isTrue();
-    assertThat(testMapOrBuilder.containsStringToInt32Field("2")).isTrue();
-    assertThat(testMapOrBuilder.containsStringToInt32Field("3")).isTrue();
-    assertThat(testMapOrBuilder.containsStringToInt32Field("-1")).isFalse();
-  }
-
-  @Test
-  public void testCount() {
-    TestMap.Builder builder = TestMap.newBuilder();
-    assertMapCounts(0, builder);
-
-    setMapValuesUsingAccessors(builder);
-    assertMapCounts(3, builder);
-
-    TestMap message = builder.build();
-    assertMapCounts(3, message);
-
-    builder = message.toBuilder().putInt32ToInt32Field(4, 44);
-    assertThat(builder.getInt32ToInt32FieldCount()).isEqualTo(4);
-    assertThat(builder.build().getInt32ToInt32FieldCount()).isEqualTo(4);
-
-    // already present - should be unchanged
-    builder.putInt32ToInt32Field(4, 44);
-    assertThat(builder.getInt32ToInt32FieldCount()).isEqualTo(4);
-  }
-
-  private void assertMapCounts(int expectedCount, TestMapOrBuilder testMapOrBuilder) {
-    assertThat(testMapOrBuilder.getInt32ToInt32FieldCount()).isEqualTo(expectedCount);
-    assertThat(testMapOrBuilder.getInt32ToStringFieldCount()).isEqualTo(expectedCount);
-    assertThat(testMapOrBuilder.getInt32ToBytesFieldCount()).isEqualTo(expectedCount);
-    assertThat(testMapOrBuilder.getInt32ToEnumFieldCount()).isEqualTo(expectedCount);
-    assertThat(testMapOrBuilder.getInt32ToMessageFieldCount()).isEqualTo(expectedCount);
-    assertThat(testMapOrBuilder.getStringToInt32FieldCount()).isEqualTo(expectedCount);
-  }
-
-  @Test
-  public void testGetOrDefault() {
-    TestMap.Builder builder = TestMap.newBuilder();
-    assertMapCounts(0, builder);
-    setMapValuesUsingAccessors(builder);
-    doTestGetOrDefault(builder);
-    doTestGetOrDefault(builder.build());
-  }
-
-  public void doTestGetOrDefault(TestMapOrBuilder testMapOrBuilder) {
-    assertThat(testMapOrBuilder.getInt32ToInt32FieldOrDefault(1, -11)).isEqualTo(11);
-    assertThat(testMapOrBuilder.getInt32ToInt32FieldOrDefault(-1, -11)).isEqualTo(-11);
-
-    assertThat(testMapOrBuilder.getInt32ToStringFieldOrDefault(1, "-11")).isEqualTo("11");
-    assertWithMessage("-11")
-        .that(testMapOrBuilder.getInt32ToStringFieldOrDefault(-1, null))
-        .isNull();
-
-    assertThat(testMapOrBuilder.getInt32ToBytesFieldOrDefault(1, null))
-        .isEqualTo(TestUtil.toBytes("11"));
-    assertThat(testMapOrBuilder.getInt32ToBytesFieldOrDefault(-1, null)).isNull();
-
-    assertThat(testMapOrBuilder.getInt32ToEnumFieldOrDefault(1, null))
-        .isEqualTo(TestMap.EnumValue.FOO);
-    assertThat(testMapOrBuilder.getInt32ToEnumFieldOrDefault(-1, null)).isNull();
-
-    assertThat(testMapOrBuilder.getInt32ToMessageFieldOrDefault(1, null))
-        .isEqualTo(MessageValue.newBuilder().setValue(11).build());
-    assertThat(testMapOrBuilder.getInt32ToMessageFieldOrDefault(-1, null)).isNull();
-
-    assertThat(testMapOrBuilder.getStringToInt32FieldOrDefault("1", -11)).isEqualTo(11);
-    assertThat(testMapOrBuilder.getStringToInt32FieldOrDefault("-1", -11)).isEqualTo(-11);
-
-    try {
-      testMapOrBuilder.getStringToInt32FieldOrDefault(null, -11);
-      assertWithMessage("expected exception").fail();
-    } catch (NullPointerException e) {
-      // expected
-    }
-  }
-
-  @Test
-  public void testGetOrThrow() {
-    TestMap.Builder builder = TestMap.newBuilder();
-    assertMapCounts(0, builder);
-    setMapValuesUsingAccessors(builder);
-    doTestGetOrDefault(builder);
-    doTestGetOrDefault(builder.build());
-  }
-
-  public void doTestGetOrThrow(TestMapOrBuilder testMapOrBuilder) {
-    assertThat(testMapOrBuilder.getInt32ToInt32FieldOrThrow(1)).isEqualTo(11);
-    try {
-      testMapOrBuilder.getInt32ToInt32FieldOrThrow(-1);
-      assertWithMessage("expected exception").fail();
-    } catch (IllegalArgumentException e) {
-      // expected
-    }
-
-    assertThat(testMapOrBuilder.getInt32ToStringFieldOrThrow(1)).isEqualTo("11");
-
-    try {
-      testMapOrBuilder.getInt32ToStringFieldOrThrow(-1);
-      assertWithMessage("expected exception").fail();
-    } catch (IllegalArgumentException e) {
-      // expected
-    }
-
-    assertThat(testMapOrBuilder.getInt32ToBytesFieldOrThrow(1)).isEqualTo(TestUtil.toBytes("11"));
-
-    try {
-      testMapOrBuilder.getInt32ToBytesFieldOrThrow(-1);
-      assertWithMessage("expected exception").fail();
-    } catch (IllegalArgumentException e) {
-      // expected
-    }
-
-    assertThat(testMapOrBuilder.getInt32ToEnumFieldOrThrow(1)).isEqualTo(TestMap.EnumValue.FOO);
-    try {
-      testMapOrBuilder.getInt32ToEnumFieldOrThrow(-1);
-      assertWithMessage("expected exception").fail();
-    } catch (IllegalArgumentException e) {
-      // expected
-    }
-
-    assertThat(testMapOrBuilder.getInt32ToMessageFieldOrThrow(1))
-        .isEqualTo(MessageValue.newBuilder().setValue(11).build());
-    try {
-      testMapOrBuilder.getInt32ToMessageFieldOrThrow(-1);
-      assertWithMessage("expected exception").fail();
-    } catch (IllegalArgumentException e) {
-      // expected
-    }
-
-    assertThat(testMapOrBuilder.getStringToInt32FieldOrThrow("1")).isEqualTo(11);
-    try {
-      testMapOrBuilder.getStringToInt32FieldOrThrow("-1");
-      assertWithMessage("expected exception").fail();
-    } catch (IllegalArgumentException e) {
-      // expected
-    }
-
-    try {
-      testMapOrBuilder.getStringToInt32FieldOrThrow(null);
-      assertWithMessage("expected exception").fail();
-    } catch (NullPointerException e) {
-      // expected
-    }
-  }
-
-  @Test
-  public void testPut() {
-    TestMap.Builder builder = TestMap.newBuilder();
-    builder.putInt32ToInt32Field(1, 11);
-    assertThat(builder.getInt32ToInt32FieldOrThrow(1)).isEqualTo(11);
-
-    builder.putInt32ToStringField(1, "a");
-    assertThat(builder.getInt32ToStringFieldOrThrow(1)).isEqualTo("a");
-    try {
-      builder.putInt32ToStringField(1, null);
-      assertWithMessage("expected exception").fail();
-    } catch (NullPointerException e) {
-      // expected
-    }
-
-    builder.putInt32ToBytesField(1, TestUtil.toBytes("11"));
-    assertThat(builder.getInt32ToBytesFieldOrThrow(1)).isEqualTo(TestUtil.toBytes("11"));
-    try {
-      builder.putInt32ToBytesField(1, null);
-      assertWithMessage("expected exception").fail();
-    } catch (NullPointerException e) {
-      // expected
-    }
-
-    builder.putInt32ToEnumField(1, TestMap.EnumValue.FOO);
-    assertThat(builder.getInt32ToEnumFieldOrThrow(1)).isEqualTo(TestMap.EnumValue.FOO);
-    try {
-      builder.putInt32ToEnumField(1, null);
-      assertWithMessage("expected exception").fail();
-    } catch (NullPointerException e) {
-      // expected
-    }
-
-    builder.putStringToInt32Field("a", 1);
-    assertThat(builder.getStringToInt32FieldOrThrow("a")).isEqualTo(1);
-    try {
-      builder.putStringToInt32Field(null, -1);
-    } catch (NullPointerException e) {
-      // expected
-    }
-  }
-
-  @Test
-  public void testRemove() {
-    TestMap.Builder builder = TestMap.newBuilder();
-    setMapValuesUsingAccessors(builder);
-    assertThat(builder.getInt32ToInt32FieldOrThrow(1)).isEqualTo(11);
-    for (int times = 0; times < 2; times++) {
-      builder.removeInt32ToInt32Field(1);
-      assertThat(builder.getInt32ToInt32FieldOrDefault(1, -1)).isEqualTo(-1);
-    }
-
-    assertThat(builder.getInt32ToStringFieldOrThrow(1)).isEqualTo("11");
-    for (int times = 0; times < 2; times++) {
-      builder.removeInt32ToStringField(1);
-      assertThat(builder.getInt32ToStringFieldOrDefault(1, null)).isNull();
-    }
-
-    assertThat(builder.getInt32ToBytesFieldOrThrow(1)).isEqualTo(TestUtil.toBytes("11"));
-    for (int times = 0; times < 2; times++) {
-      builder.removeInt32ToBytesField(1);
-      assertThat(builder.getInt32ToBytesFieldOrDefault(1, null)).isNull();
-    }
-
-    assertThat(builder.getInt32ToEnumFieldOrThrow(1)).isEqualTo(TestMap.EnumValue.FOO);
-    for (int times = 0; times < 2; times++) {
-      builder.removeInt32ToEnumField(1);
-      assertThat(builder.getInt32ToEnumFieldOrDefault(1, null)).isNull();
-    }
-
-    assertThat(builder.getStringToInt32FieldOrThrow("1")).isEqualTo(11);
-    for (int times = 0; times < 2; times++) {
-      builder.removeStringToInt32Field("1");
-      assertThat(builder.getStringToInt32FieldOrDefault("1", -1)).isEqualTo(-1);
-    }
-
-    try {
-      builder.removeStringToInt32Field(null);
-      assertWithMessage("expected exception").fail();
-    } catch (NullPointerException e) {
-      // expected
-    }
-  }
-
-  // Regression test for b/20494788
-  @Test
-  public void testMapInitializationOrder() throws Exception {
-    assertThat(RedactAllTypes.getDefaultInstance().getDescriptorForType().getName())
-        .isEqualTo("RedactAllTypes");
-
-    Message1.Builder builder = Message1.newBuilder();
-    builder.putMapField("key", true);
-    Message1 message = builder.build();
-    Message mapEntry =
-        (Message)
-            message.getRepeatedField(
-                message.getDescriptorForType().findFieldByName("map_field"), 0);
-    assertThat(mapEntry.getAllFields()).hasSize(2);
-  }
-
-  @Test
-  public void testReservedWordsFieldNames() {
-    ReservedAsMapField unused1 = ReservedAsMapField.getDefaultInstance();
-    ReservedAsMapFieldWithEnumValue unused2 = ReservedAsMapFieldWithEnumValue.getDefaultInstance();
-  }
-
-  @Test
-  public void testGetMap() {
-    TestMap.Builder builder = TestMap.newBuilder();
-    setMapValuesUsingAccessors(builder);
-    assertMapValuesSet(builder);
-    TestMap message = builder.build();
-    assertThat(message.getStringToInt32FieldMap()).isEqualTo(message.getStringToInt32FieldMap());
-    assertThat(message.getInt32ToBytesFieldMap()).isEqualTo(message.getInt32ToBytesFieldMap());
-    assertThat(message.getInt32ToEnumFieldMap()).isEqualTo(message.getInt32ToEnumFieldMap());
-    assertThat(message.getInt32ToMessageFieldMap()).isEqualTo(message.getInt32ToMessageFieldMap());
-  }
-
-  @Test
-  public void testPutAllWithNullStringValue() throws Exception {
-    TestMap.Builder sourceBuilder = TestMap.newBuilder();
-
-    // order preserving map used here to help test rollback
-    Map<Integer, String> data = new TreeMap<>();
-    data.put(7, "foo");
-    data.put(8, "bar");
-    data.put(9, null);
-    try {
-      sourceBuilder.putAllInt32ToStringField(data);
-      fail("allowed null string value");
-    } catch (NullPointerException expected) {
-      // Verify rollback of previously added values.
-      // They all go in or none do.
-      assertThat(sourceBuilder.getInt32ToStringFieldMap()).isEmpty();
-    }
-  }
-
-  @Test
-  public void testPutAllWithNullStringKey() throws Exception {
-    TestMap.Builder sourceBuilder = TestMap.newBuilder();
-
-    // order preserving map used here to help test rollback
-    Map<Integer, String> data = new LinkedHashMap<>();
-    data.put(7, "foo");
-    data.put(null, "bar");
-    data.put(9, "baz");
-    try {
-      sourceBuilder.putAllInt32ToStringField(data);
-      fail("allowed null string key");
-    } catch (NullPointerException expected) {
-      // Verify rollback of previously added values.
-      // They all go in or none do.
-      assertThat(sourceBuilder.getInt32ToStringFieldMap()).isEmpty();
-    }
-  }
-
-  @Test
-  public void testPutNullStringValue() throws Exception {
-    TestMap.Builder sourceBuilder = TestMap.newBuilder();
-
-    try {
-      sourceBuilder.putInt32ToStringField(8, null);
-      fail("allowed null string value");
-    } catch (NullPointerException expected) {
-      assertNotNull(expected.getMessage());
-    }
-  }
-}
diff --git a/libs/protobuf/java/core/src/test/java/com/google/protobuf/MapLiteTest.java b/libs/protobuf/java/core/src/test/java/com/google/protobuf/MapLiteTest.java
deleted file mode 100644
index d763f9d..0000000
--- a/libs/protobuf/java/core/src/test/java/com/google/protobuf/MapLiteTest.java
+++ /dev/null
@@ -1,928 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.common.truth.Truth.assertThat;
-import static com.google.common.truth.Truth.assertWithMessage;
-
-import map_lite_test.MapTestProto.BizarroTestMap;
-import map_lite_test.MapTestProto.TestMap;
-import map_lite_test.MapTestProto.TestMap.MessageValue;
-import map_lite_test.MapTestProto.TestMapOrBuilder;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-/** Unit tests for map fields. */
-@RunWith(JUnit4.class)
-public final class MapLiteTest {
-
-  private void setMapValues(TestMap.Builder builder) {
-    builder
-        .putInt32ToInt32Field(1, 11)
-        .putInt32ToInt32Field(2, 22)
-        .putInt32ToInt32Field(3, 33)
-        .putInt32ToStringField(1, "11")
-        .putInt32ToStringField(2, "22")
-        .putInt32ToStringField(3, "33")
-        .putInt32ToBytesField(1, TestUtil.toBytes("11"))
-        .putInt32ToBytesField(2, TestUtil.toBytes("22"))
-        .putInt32ToBytesField(3, TestUtil.toBytes("33"))
-        .putInt32ToEnumField(1, TestMap.EnumValue.FOO)
-        .putInt32ToEnumField(2, TestMap.EnumValue.BAR)
-        .putInt32ToEnumField(3, TestMap.EnumValue.BAZ)
-        .putInt32ToMessageField(1, MessageValue.newBuilder().setValue(11).build())
-        .putInt32ToMessageField(2, MessageValue.newBuilder().setValue(22).build())
-        .putInt32ToMessageField(3, MessageValue.newBuilder().setValue(33).build())
-        .putStringToInt32Field("1", 11)
-        .putStringToInt32Field("2", 22)
-        .putStringToInt32Field("3", 33);
-  }
-
-  @Test
-  public void testSetMapValues() {
-    TestMap.Builder usingMutableMapBuilder = TestMap.newBuilder();
-    setMapValues(usingMutableMapBuilder);
-    TestMap usingMutableMap = usingMutableMapBuilder.build();
-    assertMapValuesSet(usingMutableMap);
-
-    TestMap.Builder usingAccessorsBuilder = TestMap.newBuilder();
-    setMapValues(usingAccessorsBuilder);
-    TestMap usingAccessors = usingAccessorsBuilder.build();
-    assertMapValuesSet(usingAccessors);
-    assertThat(usingMutableMap).isEqualTo(usingAccessors);
-  }
-
-  private void copyMapValues(TestMap source, TestMap.Builder destination) {
-    destination
-        .putAllInt32ToInt32Field(source.getInt32ToInt32FieldMap())
-        .putAllInt32ToStringField(source.getInt32ToStringFieldMap())
-        .putAllInt32ToBytesField(source.getInt32ToBytesFieldMap())
-        .putAllInt32ToEnumField(source.getInt32ToEnumFieldMap())
-        .putAllInt32ToMessageField(source.getInt32ToMessageFieldMap())
-        .putAllStringToInt32Field(source.getStringToInt32FieldMap());
-  }
-
-  private void assertMapValuesSet(TestMap message) {
-    assertThat(message.getInt32ToInt32FieldMap()).hasSize(3);
-    assertThat(message.getInt32ToInt32FieldMap().get(1).intValue()).isEqualTo(11);
-    assertThat(message.getInt32ToInt32FieldMap().get(2).intValue()).isEqualTo(22);
-    assertThat(message.getInt32ToInt32FieldMap().get(3).intValue()).isEqualTo(33);
-
-    assertThat(message.getInt32ToStringFieldMap()).hasSize(3);
-    assertThat(message.getInt32ToStringFieldMap()).containsEntry(1, "11");
-    assertThat(message.getInt32ToStringFieldMap()).containsEntry(2, "22");
-    assertThat(message.getInt32ToStringFieldMap()).containsEntry(3, "33");
-
-    assertThat(message.getInt32ToBytesFieldMap()).hasSize(3);
-    assertThat(message.getInt32ToBytesFieldMap()).containsEntry(1, TestUtil.toBytes("11"));
-    assertThat(message.getInt32ToBytesFieldMap()).containsEntry(2, TestUtil.toBytes("22"));
-    assertThat(message.getInt32ToBytesFieldMap()).containsEntry(3, TestUtil.toBytes("33"));
-
-    assertThat(message.getInt32ToEnumFieldMap()).hasSize(3);
-    assertThat(message.getInt32ToEnumFieldMap()).containsEntry(1, TestMap.EnumValue.FOO);
-    assertThat(message.getInt32ToEnumFieldMap()).containsEntry(2, TestMap.EnumValue.BAR);
-    assertThat(message.getInt32ToEnumFieldMap()).containsEntry(3, TestMap.EnumValue.BAZ);
-
-    assertThat(message.getInt32ToMessageFieldMap()).hasSize(3);
-    assertThat(message.getInt32ToMessageFieldMap().get(1).getValue()).isEqualTo(11);
-    assertThat(message.getInt32ToMessageFieldMap().get(2).getValue()).isEqualTo(22);
-    assertThat(message.getInt32ToMessageFieldMap().get(3).getValue()).isEqualTo(33);
-
-    assertThat(message.getStringToInt32FieldMap()).hasSize(3);
-    assertThat(message.getStringToInt32FieldMap().get("1").intValue()).isEqualTo(11);
-    assertThat(message.getStringToInt32FieldMap().get("2").intValue()).isEqualTo(22);
-    assertThat(message.getStringToInt32FieldMap().get("3").intValue()).isEqualTo(33);
-  }
-
-  private void updateMapValues(TestMap.Builder builder) {
-    builder
-        .putInt32ToInt32Field(1, 111)
-        .removeInt32ToInt32Field(2)
-        .putInt32ToInt32Field(4, 44)
-        .putInt32ToStringField(1, "111")
-        .removeInt32ToStringField(2)
-        .putInt32ToStringField(4, "44")
-        .putInt32ToBytesField(1, TestUtil.toBytes("111"))
-        .removeInt32ToBytesField(2)
-        .putInt32ToBytesField(4, TestUtil.toBytes("44"))
-        .putInt32ToEnumField(1, TestMap.EnumValue.BAR)
-        .removeInt32ToEnumField(2)
-        .putInt32ToEnumField(4, TestMap.EnumValue.QUX)
-        .putInt32ToMessageField(1, MessageValue.newBuilder().setValue(111).build())
-        .removeInt32ToMessageField(2)
-        .putInt32ToMessageField(4, MessageValue.newBuilder().setValue(44).build())
-        .putStringToInt32Field("1", 111)
-        .removeStringToInt32Field("2")
-        .putStringToInt32Field("4", 44);
-  }
-
-  @Test
-  public void testUpdateMapValues() {
-    TestMap.Builder mapBuilder = TestMap.newBuilder();
-    setMapValues(mapBuilder);
-    TestMap map = mapBuilder.build();
-    assertMapValuesSet(map);
-
-    mapBuilder = map.toBuilder();
-    updateMapValues(mapBuilder);
-    map = mapBuilder.build();
-    assertMapValuesUpdated(map);
-  }
-
-  private void assertMapValuesUpdated(TestMap message) {
-    assertThat(message.getInt32ToInt32FieldMap()).hasSize(3);
-    assertThat(message.getInt32ToInt32FieldMap().get(1).intValue()).isEqualTo(111);
-    assertThat(message.getInt32ToInt32FieldMap().get(3).intValue()).isEqualTo(33);
-    assertThat(message.getInt32ToInt32FieldMap().get(4).intValue()).isEqualTo(44);
-
-    assertThat(message.getInt32ToStringFieldMap()).hasSize(3);
-    assertThat(message.getInt32ToStringFieldMap()).containsEntry(1, "111");
-    assertThat(message.getInt32ToStringFieldMap()).containsEntry(3, "33");
-    assertThat(message.getInt32ToStringFieldMap()).containsEntry(4, "44");
-
-    assertThat(message.getInt32ToBytesFieldMap()).hasSize(3);
-    assertThat(message.getInt32ToBytesFieldMap()).containsEntry(1, TestUtil.toBytes("111"));
-    assertThat(message.getInt32ToBytesFieldMap()).containsEntry(3, TestUtil.toBytes("33"));
-    assertThat(message.getInt32ToBytesFieldMap()).containsEntry(4, TestUtil.toBytes("44"));
-
-    assertThat(message.getInt32ToEnumFieldMap()).hasSize(3);
-    assertThat(message.getInt32ToEnumFieldMap()).containsEntry(1, TestMap.EnumValue.BAR);
-    assertThat(message.getInt32ToEnumFieldMap()).containsEntry(3, TestMap.EnumValue.BAZ);
-    assertThat(message.getInt32ToEnumFieldMap()).containsEntry(4, TestMap.EnumValue.QUX);
-
-    assertThat(message.getInt32ToMessageFieldMap()).hasSize(3);
-    assertThat(message.getInt32ToMessageFieldMap().get(1).getValue()).isEqualTo(111);
-    assertThat(message.getInt32ToMessageFieldMap().get(3).getValue()).isEqualTo(33);
-    assertThat(message.getInt32ToMessageFieldMap().get(4).getValue()).isEqualTo(44);
-
-    assertThat(message.getStringToInt32FieldMap()).hasSize(3);
-    assertThat(message.getStringToInt32FieldMap().get("1").intValue()).isEqualTo(111);
-    assertThat(message.getStringToInt32FieldMap().get("3").intValue()).isEqualTo(33);
-    assertThat(message.getStringToInt32FieldMap().get("4").intValue()).isEqualTo(44);
-  }
-
-  private void assertMapValuesCleared(TestMapOrBuilder testMapOrBuilder) {
-    assertThat(testMapOrBuilder.getInt32ToInt32FieldMap()).isEmpty();
-    assertThat(testMapOrBuilder.getInt32ToInt32FieldCount()).isEqualTo(0);
-    assertThat(testMapOrBuilder.getInt32ToStringFieldMap()).isEmpty();
-    assertThat(testMapOrBuilder.getInt32ToStringFieldCount()).isEqualTo(0);
-    assertThat(testMapOrBuilder.getInt32ToBytesFieldMap()).isEmpty();
-    assertThat(testMapOrBuilder.getInt32ToBytesFieldCount()).isEqualTo(0);
-    assertThat(testMapOrBuilder.getInt32ToEnumFieldMap()).isEmpty();
-    assertThat(testMapOrBuilder.getInt32ToEnumFieldCount()).isEqualTo(0);
-    assertThat(testMapOrBuilder.getInt32ToMessageFieldMap()).isEmpty();
-    assertThat(testMapOrBuilder.getInt32ToMessageFieldCount()).isEqualTo(0);
-    assertThat(testMapOrBuilder.getStringToInt32FieldMap()).isEmpty();
-    assertThat(testMapOrBuilder.getStringToInt32FieldCount()).isEqualTo(0);
-  }
-
-  @Test
-  public void testSanityCopyOnWrite() throws InvalidProtocolBufferException {
-    // Since builders are implemented as a thin wrapper around a message
-    // instance, we attempt to verify that we can't cause the builder to modify
-    // a produced message.
-
-    TestMap.Builder builder = TestMap.newBuilder();
-    TestMap message = builder.build();
-    builder.putInt32ToInt32Field(1, 2);
-    assertThat(message.getInt32ToInt32FieldMap()).isEmpty();
-    assertThat(builder.getInt32ToInt32FieldMap()).isEqualTo(newMap(1, 2));
-    message = builder.build();
-    builder.putInt32ToInt32Field(2, 3);
-    assertThat(message.getInt32ToInt32FieldMap()).isEqualTo(newMap(1, 2));
-    assertThat(builder.getInt32ToInt32FieldMap()).isEqualTo(newMap(1, 2, 2, 3));
-  }
-
-  @Test
-  public void testGetMapIsImmutable() {
-    TestMap.Builder builder = TestMap.newBuilder();
-    assertMapsAreImmutable(builder);
-    assertMapsAreImmutable(builder.build());
-
-    setMapValues(builder);
-    assertMapsAreImmutable(builder);
-    assertMapsAreImmutable(builder.build());
-  }
-
-  private void assertMapsAreImmutable(TestMapOrBuilder testMapOrBuilder) {
-    assertImmutable(testMapOrBuilder.getInt32ToInt32FieldMap(), 1, 2);
-    assertImmutable(testMapOrBuilder.getInt32ToStringFieldMap(), 1, "2");
-    assertImmutable(testMapOrBuilder.getInt32ToBytesFieldMap(), 1, TestUtil.toBytes("2"));
-    assertImmutable(testMapOrBuilder.getInt32ToEnumFieldMap(), 1, TestMap.EnumValue.FOO);
-    assertImmutable(
-        testMapOrBuilder.getInt32ToMessageFieldMap(), 1, MessageValue.getDefaultInstance());
-    assertImmutable(testMapOrBuilder.getStringToInt32FieldMap(), "1", 2);
-  }
-
-  private <K, V> void assertImmutable(Map<K, V> map, K key, V value) {
-    try {
-      map.put(key, value);
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-    if (!map.isEmpty()) {
-      try {
-        map.entrySet().remove(map.entrySet().iterator().next());
-        assertWithMessage("expected exception").fail();
-      } catch (UnsupportedOperationException e) {
-        // expected
-      }
-    }
-  }
-
-  @Test
-  public void testMapFieldClear() {
-    TestMap.Builder builder = TestMap.newBuilder().putInt32ToInt32Field(1, 2);
-    builder.clearInt32ToInt32Field();
-    assertThat(builder.getInt32ToInt32FieldCount()).isEqualTo(0);
-  }
-
-  @Test
-  public void testMutableMapLifecycle() {
-    TestMap.Builder builder = TestMap.newBuilder().putInt32ToInt32Field(1, 2);
-    assertThat(builder.build().getInt32ToInt32FieldMap()).isEqualTo(newMap(1, 2));
-    assertThat(builder.getInt32ToInt32FieldMap()).isEqualTo(newMap(1, 2));
-    builder.putInt32ToInt32Field(2, 3);
-    assertThat(builder.getInt32ToInt32FieldMap()).isEqualTo(newMap(1, 2, 2, 3));
-
-    builder.putInt32ToEnumField(1, TestMap.EnumValue.BAR);
-    assertThat(builder.build().getInt32ToEnumFieldMap())
-        .isEqualTo(newMap(1, TestMap.EnumValue.BAR));
-    assertThat(builder.getInt32ToEnumFieldMap()).isEqualTo(newMap(1, TestMap.EnumValue.BAR));
-    builder.putInt32ToEnumField(2, TestMap.EnumValue.FOO);
-    assertThat(builder.getInt32ToEnumFieldMap())
-        .isEqualTo(newMap(1, TestMap.EnumValue.BAR, 2, TestMap.EnumValue.FOO));
-
-    builder.putInt32ToStringField(1, "1");
-    assertThat(builder.build().getInt32ToStringFieldMap()).isEqualTo(newMap(1, "1"));
-    assertThat(builder.getInt32ToStringFieldMap()).isEqualTo(newMap(1, "1"));
-    builder.putInt32ToStringField(2, "2");
-    assertThat(builder.getInt32ToStringFieldMap()).isEqualTo(newMap(1, "1", 2, "2"));
-
-    builder.putInt32ToMessageField(1, TestMap.MessageValue.getDefaultInstance());
-    assertThat(builder.build().getInt32ToMessageFieldMap())
-        .isEqualTo(newMap(1, TestMap.MessageValue.getDefaultInstance()));
-    assertThat(builder.getInt32ToMessageFieldMap())
-        .isEqualTo(newMap(1, TestMap.MessageValue.getDefaultInstance()));
-    builder.putInt32ToMessageField(2, TestMap.MessageValue.getDefaultInstance());
-    assertThat(builder.getInt32ToMessageFieldMap())
-        .isEqualTo(
-            newMap(
-                1,
-                TestMap.MessageValue.getDefaultInstance(),
-                2,
-                TestMap.MessageValue.getDefaultInstance()));
-  }
-
-  @Test
-  public void testGettersAndSetters() throws Exception {
-    TestMap.Builder builder = TestMap.newBuilder();
-    TestMap message = builder.build();
-    assertMapValuesCleared(message);
-
-    builder = message.toBuilder();
-    setMapValues(builder);
-    message = builder.build();
-    assertMapValuesSet(message);
-
-    builder = message.toBuilder();
-    updateMapValues(builder);
-    message = builder.build();
-    assertMapValuesUpdated(message);
-
-    builder = message.toBuilder();
-    builder.clear();
-    assertMapValuesCleared(builder);
-    message = builder.build();
-    assertMapValuesCleared(message);
-  }
-
-  @Test
-  public void testPutAll() throws Exception {
-    TestMap.Builder sourceBuilder = TestMap.newBuilder();
-    setMapValues(sourceBuilder);
-    TestMap source = sourceBuilder.build();
-    assertMapValuesSet(source);
-
-    TestMap.Builder destination = TestMap.newBuilder();
-    copyMapValues(source, destination);
-    assertMapValuesSet(destination.build());
-  }
-
-  @Test
-  public void testPutAllForUnknownEnumValues() throws Exception {
-    TestMap.Builder sourceBuilder =
-        TestMap.newBuilder()
-            .putInt32ToEnumFieldValue(0, 0)
-            .putInt32ToEnumFieldValue(1, 1)
-            .putAllInt32ToEnumFieldValue(newMap(2, 1000)); // unknown value.
-    TestMap source = sourceBuilder.build();
-
-    TestMap.Builder destinationBuilder = TestMap.newBuilder();
-    destinationBuilder.putAllInt32ToEnumFieldValue(source.getInt32ToEnumFieldValueMap());
-    TestMap destination = destinationBuilder.build();
-
-    assertThat(destination.getInt32ToEnumFieldValueMap().get(0).intValue()).isEqualTo(0);
-    assertThat(destination.getInt32ToEnumFieldValueMap().get(1).intValue()).isEqualTo(1);
-    assertThat(destination.getInt32ToEnumFieldValueMap().get(2).intValue()).isEqualTo(1000);
-    assertThat(destination.getInt32ToEnumFieldCount()).isEqualTo(3);
-  }
-
-  @Test
-  public void testPutForUnknownEnumValues() throws Exception {
-    TestMap builder =
-        TestMap.newBuilder()
-            .putInt32ToEnumFieldValue(0, 0)
-            .putInt32ToEnumFieldValue(1, 1)
-            .putInt32ToEnumFieldValue(2, 1000)
-            .build(); // unknown value.
-    TestMap message = builder;
-
-    assertThat(message.getInt32ToEnumFieldValueOrThrow(0)).isEqualTo(0);
-    assertThat(message.getInt32ToEnumFieldValueOrThrow(1)).isEqualTo(1);
-    assertThat(message.getInt32ToEnumFieldValueOrThrow(2)).isEqualTo(1000);
-    assertThat(message.getInt32ToEnumFieldCount()).isEqualTo(3);
-  }
-
-  @Test
-  public void testPutChecksNullKeysAndValues() throws Exception {
-    TestMap.Builder builder = TestMap.newBuilder();
-
-    try {
-      builder.putInt32ToStringField(1, null);
-      assertWithMessage("expected exception").fail();
-    } catch (NullPointerException e) {
-      // expected.
-    }
-
-    try {
-      builder.putInt32ToBytesField(1, null);
-      assertWithMessage("expected exception").fail();
-    } catch (NullPointerException e) {
-      // expected.
-    }
-
-    try {
-      builder.putInt32ToEnumField(1, null);
-      assertWithMessage("expected exception").fail();
-    } catch (NullPointerException e) {
-      // expected.
-    }
-
-    try {
-      builder.putInt32ToMessageField(1, null);
-      assertWithMessage("expected exception").fail();
-    } catch (NullPointerException e) {
-      // expected.
-    }
-
-    try {
-      builder.putStringToInt32Field(null, 1);
-      assertWithMessage("expected exception").fail();
-    } catch (NullPointerException e) {
-      // expected.
-    }
-  }
-
-  @Test
-  public void testSerializeAndParse() throws Exception {
-    TestMap.Builder builder = TestMap.newBuilder();
-    setMapValues(builder);
-    TestMap message = builder.build();
-    assertThat(message.toByteString().size()).isEqualTo(message.getSerializedSize());
-    message = TestMap.parseFrom(message.toByteString());
-    assertMapValuesSet(message);
-
-    builder = message.toBuilder();
-    updateMapValues(builder);
-    message = builder.build();
-    assertThat(message.toByteString().size()).isEqualTo(message.getSerializedSize());
-    message = TestMap.parseFrom(message.toByteString());
-    assertMapValuesUpdated(message);
-
-    builder = message.toBuilder();
-    builder.clear();
-    message = builder.build();
-    assertThat(message.toByteString().size()).isEqualTo(message.getSerializedSize());
-    message = TestMap.parseFrom(message.toByteString());
-    assertMapValuesCleared(message);
-  }
-
-  private TestMap tryParseTestMap(BizarroTestMap bizarroMap) throws IOException {
-    ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
-    CodedOutputStream output = CodedOutputStream.newInstance(byteArrayOutputStream);
-    bizarroMap.writeTo(output);
-    output.flush();
-    return TestMap.parseFrom(ByteString.copyFrom(byteArrayOutputStream.toByteArray()));
-  }
-
-  @Test
-  public void testParseError() throws Exception {
-    ByteString bytes = TestUtil.toBytes("SOME BYTES");
-    String stringKey = "a string key";
-
-    TestMap map =
-        tryParseTestMap(BizarroTestMap.newBuilder().putInt32ToInt32Field(5, bytes).build());
-    assertThat(map.getInt32ToInt32FieldOrDefault(5, -1)).isEqualTo(0);
-
-    map = tryParseTestMap(BizarroTestMap.newBuilder().putInt32ToStringField(stringKey, 5).build());
-    assertThat(map.getInt32ToStringFieldOrDefault(0, null)).isEmpty();
-
-    map = tryParseTestMap(BizarroTestMap.newBuilder().putInt32ToBytesField(stringKey, 5).build());
-    assertThat(ByteString.EMPTY).isEqualTo(map.getInt32ToBytesFieldOrDefault(0, null));
-
-    map =
-        tryParseTestMap(BizarroTestMap.newBuilder().putInt32ToEnumField(stringKey, bytes).build());
-    assertThat(map.getInt32ToEnumFieldOrDefault(0, null)).isEqualTo(TestMap.EnumValue.FOO);
-
-    try {
-      tryParseTestMap(BizarroTestMap.newBuilder().putInt32ToMessageField(stringKey, bytes).build());
-      assertWithMessage("expected exception").fail();
-    } catch (InvalidProtocolBufferException expected) {
-      assertThat(expected.getUnfinishedMessage()).isInstanceOf(TestMap.class);
-      map = (TestMap) expected.getUnfinishedMessage();
-      assertThat(map.getInt32ToMessageFieldMap()).isEmpty();
-    }
-
-    map =
-        tryParseTestMap(
-            BizarroTestMap.newBuilder().putStringToInt32Field(stringKey, bytes).build());
-    assertThat(map.getStringToInt32FieldOrDefault(stringKey, -1)).isEqualTo(0);
-  }
-
-  @Test
-  public void testMergeFrom() throws Exception {
-    TestMap.Builder builder = TestMap.newBuilder();
-    setMapValues(builder);
-    TestMap message = builder.build();
-
-    TestMap.Builder other = TestMap.newBuilder();
-    other.mergeFrom(message);
-    assertMapValuesSet(other.build());
-  }
-
-  @Test
-  public void testEqualsAndHashCode() throws Exception {
-    // Test that generated equals() and hashCode() will disregard the order
-    // of map entries when comparing/hashing map fields.
-
-    // We can't control the order of elements in a HashMap. The best we can do
-    // here is to add elements in different order.
-    TestMap b1 =
-        TestMap.newBuilder()
-            .putInt32ToInt32Field(1, 2)
-            .putInt32ToInt32Field(3, 4)
-            .putInt32ToInt32Field(5, 6)
-            .build();
-    TestMap m1 = b1;
-
-    TestMap.Builder b2 =
-        TestMap.newBuilder()
-            .putInt32ToInt32Field(5, 6)
-            .putInt32ToInt32Field(1, 2)
-            .putInt32ToInt32Field(3, 4);
-    TestMap m2 = b2.build();
-
-    assertThat(m2).isEqualTo(m1);
-    assertThat(m2.hashCode()).isEqualTo(m1.hashCode());
-
-    // Make sure we did compare map fields.
-    b2.putInt32ToInt32Field(1, 0);
-    m2 = b2.build();
-    assertThat(m1.equals(m2)).isFalse();
-    // Don't check m1.hashCode() != m2.hashCode() because it's not guaranteed
-    // to be different.
-
-    // Regression test for b/18549190: if a map is a subset of the other map,
-    // equals() should return false.
-    b2.removeInt32ToInt32Field(1);
-    m2 = b2.build();
-    assertThat(m1.equals(m2)).isFalse();
-    assertThat(m2.equals(m1)).isFalse();
-  }
-
-  @Test
-  @SuppressWarnings("ProtoNewBuilderMergeFrom")
-  public void testUnknownEnumValues() throws Exception {
-    TestMap.Builder builder =
-        TestMap.newBuilder()
-            .putInt32ToEnumFieldValue(0, 0)
-            .putInt32ToEnumFieldValue(1, 1)
-            .putInt32ToEnumFieldValue(2, 1000); // unknown value.
-    TestMap message = builder.build();
-
-    assertThat(message.getInt32ToEnumFieldMap()).containsEntry(0, TestMap.EnumValue.FOO);
-    assertThat(message.getInt32ToEnumFieldMap()).containsEntry(1, TestMap.EnumValue.BAR);
-    assertThat(message.getInt32ToEnumFieldMap()).containsEntry(2, TestMap.EnumValue.UNRECOGNIZED);
-
-    builder.putAllInt32ToEnumFieldValue(newMap(2, 1000)); // unknown value.
-    message = builder.build();
-    assertThat(message.getInt32ToEnumFieldMap()).containsEntry(2, TestMap.EnumValue.UNRECOGNIZED);
-
-    // Unknown enum values should be preserved after:
-    //   1. Serialization and parsing.
-    //   2. toBuild().
-    //   3. mergeFrom().
-    message = TestMap.parseFrom(message.toByteString(), ExtensionRegistryLite.getEmptyRegistry());
-    assertThat(message.getInt32ToEnumFieldValueMap().get(2).intValue()).isEqualTo(1000);
-    builder = message.toBuilder();
-    assertThat(builder.getInt32ToEnumFieldValueMap().get(2).intValue()).isEqualTo(1000);
-    builder = TestMap.newBuilder().mergeFrom(message);
-    assertThat(builder.getInt32ToEnumFieldValueMap().get(2).intValue()).isEqualTo(1000);
-
-    // hashCode()/equals() should take unknown enum values into account.
-    builder.putAllInt32ToEnumFieldValue(newMap(2, 1001));
-    TestMap message2 = builder.build();
-    assertThat(message.hashCode()).isNotEqualTo(message2.hashCode());
-    assertThat(message.equals(message2)).isFalse();
-    // Unknown values will be converted to UNRECOGNIZED so the resulted enum map
-    // should be the same.
-    assertThat(message.getInt32ToEnumFieldMap()).isEqualTo(message2.getInt32ToEnumFieldMap());
-  }
-
-  @Test
-  public void testIterationOrder() throws Exception {
-    TestMap.Builder builder = TestMap.newBuilder();
-    setMapValues(builder);
-    TestMap message = builder.build();
-
-    assertThat(new ArrayList<>(message.getStringToInt32FieldMap().keySet()))
-        .containsExactly("1", "2", "3")
-        .inOrder();
-  }
-
-  @Test
-  public void testGetMap() {
-    TestMap.Builder builder = TestMap.newBuilder();
-    setMapValues(builder);
-    TestMap message = builder.build();
-    assertThat(message.getStringToInt32FieldMap()).isEqualTo(message.getStringToInt32FieldMap());
-    assertThat(message.getInt32ToBytesFieldMap()).isEqualTo(message.getInt32ToBytesFieldMap());
-    assertThat(message.getInt32ToEnumFieldMap()).isEqualTo(message.getInt32ToEnumFieldMap());
-    assertThat(message.getInt32ToEnumFieldValueMap())
-        .isEqualTo(message.getInt32ToEnumFieldValueMap());
-    assertThat(message.getInt32ToMessageFieldMap()).isEqualTo(message.getInt32ToMessageFieldMap());
-  }
-
-  @Test
-  public void testContains() {
-    TestMap.Builder builder = TestMap.newBuilder();
-    setMapValues(builder);
-    assertMapContainsSetValues(builder);
-    assertMapContainsSetValues(builder.build());
-  }
-
-  private void assertMapContainsSetValues(TestMapOrBuilder testMapOrBuilder) {
-    assertThat(testMapOrBuilder.containsInt32ToInt32Field(1)).isTrue();
-    assertThat(testMapOrBuilder.containsInt32ToInt32Field(2)).isTrue();
-    assertThat(testMapOrBuilder.containsInt32ToInt32Field(3)).isTrue();
-    assertThat(testMapOrBuilder.containsInt32ToInt32Field(-1)).isFalse();
-
-    assertThat(testMapOrBuilder.containsInt32ToStringField(1)).isTrue();
-    assertThat(testMapOrBuilder.containsInt32ToStringField(2)).isTrue();
-    assertThat(testMapOrBuilder.containsInt32ToStringField(3)).isTrue();
-    assertThat(testMapOrBuilder.containsInt32ToStringField(-1)).isFalse();
-
-    assertThat(testMapOrBuilder.containsInt32ToBytesField(1)).isTrue();
-    assertThat(testMapOrBuilder.containsInt32ToBytesField(2)).isTrue();
-    assertThat(testMapOrBuilder.containsInt32ToBytesField(3)).isTrue();
-    assertThat(testMapOrBuilder.containsInt32ToBytesField(-1)).isFalse();
-
-    assertThat(testMapOrBuilder.containsInt32ToEnumField(1)).isTrue();
-    assertThat(testMapOrBuilder.containsInt32ToEnumField(2)).isTrue();
-    assertThat(testMapOrBuilder.containsInt32ToEnumField(3)).isTrue();
-    assertThat(testMapOrBuilder.containsInt32ToEnumField(-1)).isFalse();
-
-    assertThat(testMapOrBuilder.containsInt32ToMessageField(1)).isTrue();
-    assertThat(testMapOrBuilder.containsInt32ToMessageField(2)).isTrue();
-    assertThat(testMapOrBuilder.containsInt32ToMessageField(3)).isTrue();
-    assertThat(testMapOrBuilder.containsInt32ToMessageField(-1)).isFalse();
-
-    assertThat(testMapOrBuilder.containsStringToInt32Field("1")).isTrue();
-    assertThat(testMapOrBuilder.containsStringToInt32Field("2")).isTrue();
-    assertThat(testMapOrBuilder.containsStringToInt32Field("3")).isTrue();
-    assertThat(testMapOrBuilder.containsStringToInt32Field("-1")).isFalse();
-  }
-
-  @Test
-  public void testCount() {
-    TestMap.Builder builder = TestMap.newBuilder();
-    assertMapCounts(0, builder);
-
-    setMapValues(builder);
-    assertMapCounts(3, builder);
-
-    TestMap message = builder.build();
-    assertMapCounts(3, message);
-
-    builder = message.toBuilder().putInt32ToInt32Field(4, 44);
-    assertThat(builder.getInt32ToInt32FieldCount()).isEqualTo(4);
-    assertThat(builder.build().getInt32ToInt32FieldCount()).isEqualTo(4);
-
-    // already present - should be unchanged
-    builder.putInt32ToInt32Field(4, 44);
-    assertThat(builder.getInt32ToInt32FieldCount()).isEqualTo(4);
-  }
-
-  private void assertMapCounts(int expectedCount, TestMapOrBuilder testMapOrBuilder) {
-    assertThat(testMapOrBuilder.getInt32ToInt32FieldCount()).isEqualTo(expectedCount);
-    assertThat(testMapOrBuilder.getInt32ToStringFieldCount()).isEqualTo(expectedCount);
-    assertThat(testMapOrBuilder.getInt32ToBytesFieldCount()).isEqualTo(expectedCount);
-    assertThat(testMapOrBuilder.getInt32ToEnumFieldCount()).isEqualTo(expectedCount);
-    assertThat(testMapOrBuilder.getInt32ToMessageFieldCount()).isEqualTo(expectedCount);
-    assertThat(testMapOrBuilder.getStringToInt32FieldCount()).isEqualTo(expectedCount);
-  }
-
-  @Test
-  public void testGetOrDefault() {
-    TestMap.Builder builder = TestMap.newBuilder();
-    assertMapCounts(0, builder);
-    setMapValues(builder);
-    doTestGetOrDefault(builder);
-    doTestGetOrDefault(builder.build());
-  }
-
-  public void doTestGetOrDefault(TestMapOrBuilder testMapOrBuilder) {
-    assertThat(testMapOrBuilder.getInt32ToInt32FieldOrDefault(1, -11)).isEqualTo(11);
-    assertThat(testMapOrBuilder.getInt32ToInt32FieldOrDefault(-1, -11)).isEqualTo(-11);
-
-    assertThat(testMapOrBuilder.getInt32ToStringFieldOrDefault(1, "-11")).isEqualTo("11");
-    assertWithMessage("-11")
-        .that(testMapOrBuilder.getInt32ToStringFieldOrDefault(-1, null))
-        .isNull();
-
-    assertThat(testMapOrBuilder.getInt32ToBytesFieldOrDefault(1, null))
-        .isEqualTo(TestUtil.toBytes("11"));
-    assertThat(testMapOrBuilder.getInt32ToBytesFieldOrDefault(-1, null)).isNull();
-
-    assertThat(testMapOrBuilder.getInt32ToEnumFieldOrDefault(1, null))
-        .isEqualTo(TestMap.EnumValue.FOO);
-    assertThat(testMapOrBuilder.getInt32ToEnumFieldOrDefault(-1, null)).isNull();
-
-    assertThat(testMapOrBuilder.getInt32ToEnumFieldValueOrDefault(2, -1))
-        .isEqualTo(TestMap.EnumValue.BAR.getNumber());
-    assertThat(testMapOrBuilder.getInt32ToEnumFieldValueOrDefault(-1000, -1)).isEqualTo(-1);
-
-    assertThat(testMapOrBuilder.getInt32ToMessageFieldOrDefault(1, null))
-        .isEqualTo(MessageValue.newBuilder().setValue(11).build());
-    assertThat(testMapOrBuilder.getInt32ToMessageFieldOrDefault(-1, null)).isNull();
-
-    assertThat(testMapOrBuilder.getStringToInt32FieldOrDefault("1", -11)).isEqualTo(11);
-    assertThat(testMapOrBuilder.getStringToInt32FieldOrDefault("-1", -11)).isEqualTo(-11);
-
-    try {
-      testMapOrBuilder.getStringToInt32FieldOrDefault(null, -11);
-      assertWithMessage("expected exception").fail();
-    } catch (NullPointerException e) {
-      // expected
-    }
-  }
-
-  @Test
-  public void testGetOrThrow() {
-    TestMap.Builder builder = TestMap.newBuilder();
-    assertMapCounts(0, builder);
-    setMapValues(builder);
-    doTestGetOrDefault(builder);
-    doTestGetOrDefault(builder.build());
-  }
-
-  public void doTestGetOrThrow(TestMapOrBuilder testMapOrBuilder) {
-    assertThat(testMapOrBuilder.getInt32ToInt32FieldOrThrow(1)).isEqualTo(11);
-    try {
-      testMapOrBuilder.getInt32ToInt32FieldOrThrow(-1);
-      assertWithMessage("expected exception").fail();
-    } catch (IllegalArgumentException e) {
-      // expected
-    }
-
-    assertThat(testMapOrBuilder.getInt32ToStringFieldOrThrow(1)).isEqualTo("11");
-
-    try {
-      testMapOrBuilder.getInt32ToStringFieldOrThrow(-1);
-      assertWithMessage("expected exception").fail();
-    } catch (IllegalArgumentException e) {
-      // expected
-    }
-
-    assertThat(testMapOrBuilder.getInt32ToBytesFieldOrThrow(1)).isEqualTo(TestUtil.toBytes("11"));
-
-    try {
-      testMapOrBuilder.getInt32ToBytesFieldOrThrow(-1);
-      assertWithMessage("expected exception").fail();
-    } catch (IllegalArgumentException e) {
-      // expected
-    }
-
-    assertThat(testMapOrBuilder.getInt32ToEnumFieldOrThrow(1)).isEqualTo(TestMap.EnumValue.FOO);
-    try {
-      testMapOrBuilder.getInt32ToEnumFieldOrThrow(-1);
-      assertWithMessage("expected exception").fail();
-    } catch (IllegalArgumentException e) {
-      // expected
-    }
-
-    assertThat(testMapOrBuilder.getInt32ToEnumFieldValueOrThrow(2))
-        .isEqualTo(TestMap.EnumValue.BAR.getNumber());
-    try {
-      testMapOrBuilder.getInt32ToEnumFieldValueOrThrow(-1);
-      assertWithMessage("expected exception").fail();
-    } catch (IllegalArgumentException e) {
-      // expected
-    }
-
-    assertThat(testMapOrBuilder.getInt32ToMessageFieldOrThrow(1))
-        .isEqualTo(MessageValue.newBuilder().setValue(11).build());
-    try {
-      testMapOrBuilder.getInt32ToMessageFieldOrThrow(-1);
-      assertWithMessage("expected exception").fail();
-    } catch (IllegalArgumentException e) {
-      // expected
-    }
-
-    assertThat(testMapOrBuilder.getStringToInt32FieldOrThrow("1")).isEqualTo(11);
-    try {
-      testMapOrBuilder.getStringToInt32FieldOrThrow("-1");
-      assertWithMessage("expected exception").fail();
-    } catch (IllegalArgumentException e) {
-      // expected
-    }
-
-    try {
-      testMapOrBuilder.getStringToInt32FieldOrThrow(null);
-      assertWithMessage("expected exception").fail();
-    } catch (NullPointerException e) {
-      // expected
-    }
-  }
-
-  @Test
-  public void testPut() {
-    TestMap.Builder builder = TestMap.newBuilder();
-    builder.putInt32ToInt32Field(1, 11);
-    assertThat(builder.getInt32ToInt32FieldOrThrow(1)).isEqualTo(11);
-
-    builder.putInt32ToStringField(1, "a");
-    assertThat(builder.getInt32ToStringFieldOrThrow(1)).isEqualTo("a");
-    try {
-      builder.putInt32ToStringField(1, null);
-      assertWithMessage("expected exception").fail();
-    } catch (NullPointerException e) {
-      // expected
-    }
-
-    builder.putInt32ToBytesField(1, TestUtil.toBytes("11"));
-    assertThat(builder.getInt32ToBytesFieldOrThrow(1)).isEqualTo(TestUtil.toBytes("11"));
-    try {
-      builder.putInt32ToBytesField(1, null);
-      assertWithMessage("expected exception").fail();
-    } catch (NullPointerException e) {
-      // expected
-    }
-
-    builder.putInt32ToEnumField(1, TestMap.EnumValue.FOO);
-    assertThat(builder.getInt32ToEnumFieldOrThrow(1)).isEqualTo(TestMap.EnumValue.FOO);
-    try {
-      builder.putInt32ToEnumField(1, null);
-      assertWithMessage("expected exception").fail();
-    } catch (NullPointerException e) {
-      // expected
-    }
-
-    builder.putStringToInt32Field("a", 1);
-    assertThat(builder.getStringToInt32FieldOrThrow("a")).isEqualTo(1);
-    try {
-      builder.putStringToInt32Field(null, -1);
-    } catch (NullPointerException e) {
-      // expected
-    }
-  }
-
-  @Test
-  public void testRemove() {
-    TestMap.Builder builder = TestMap.newBuilder();
-    setMapValues(builder);
-    assertThat(builder.getInt32ToInt32FieldOrThrow(1)).isEqualTo(11);
-    for (int times = 0; times < 2; times++) {
-      builder.removeInt32ToInt32Field(1);
-      assertThat(builder.getInt32ToInt32FieldOrDefault(1, -1)).isEqualTo(-1);
-    }
-
-    assertThat(builder.getInt32ToStringFieldOrThrow(1)).isEqualTo("11");
-    for (int times = 0; times < 2; times++) {
-      builder.removeInt32ToStringField(1);
-      assertThat(builder.getInt32ToStringFieldOrDefault(1, null)).isNull();
-    }
-
-    assertThat(builder.getInt32ToBytesFieldOrThrow(1)).isEqualTo(TestUtil.toBytes("11"));
-    for (int times = 0; times < 2; times++) {
-      builder.removeInt32ToBytesField(1);
-      assertThat(builder.getInt32ToBytesFieldOrDefault(1, null)).isNull();
-    }
-
-    assertThat(builder.getInt32ToEnumFieldOrThrow(1)).isEqualTo(TestMap.EnumValue.FOO);
-    for (int times = 0; times < 2; times++) {
-      builder.removeInt32ToEnumField(1);
-      assertThat(builder.getInt32ToEnumFieldOrDefault(1, null)).isNull();
-    }
-
-    assertThat(builder.getStringToInt32FieldOrThrow("1")).isEqualTo(11);
-    for (int times = 0; times < 2; times++) {
-      builder.removeStringToInt32Field("1");
-      assertThat(builder.getStringToInt32FieldOrDefault("1", -1)).isEqualTo(-1);
-    }
-
-    try {
-      builder.removeStringToInt32Field(null);
-      assertWithMessage("expected exception").fail();
-    } catch (NullPointerException e) {
-      // expected
-    }
-  }
-
-  private static <K, V> Map<K, V> newMap(K key1, V value1) {
-    Map<K, V> map = new HashMap<>();
-    map.put(key1, value1);
-    return map;
-  }
-
-  private static <K, V> Map<K, V> newMap(K key1, V value1, K key2, V value2) {
-    Map<K, V> map = new HashMap<>();
-    map.put(key1, value1);
-    map.put(key2, value2);
-    return map;
-  }
-
-  @Test
-  public void testMap_withNulls() {
-    TestMap.Builder builder = TestMap.newBuilder();
-
-    try {
-      builder.putStringToInt32Field(null, 3);
-      assertWithMessage("expected exception").fail();
-    } catch (NullPointerException expected) {
-    }
-
-    try {
-      builder.putAllStringToInt32Field(newMap(null, 3, "hi", 4));
-      assertWithMessage("expected exception").fail();
-    } catch (NullPointerException expected) {
-    }
-
-    try {
-      builder.putInt32ToMessageField(3, null);
-      assertWithMessage("expected exception").fail();
-    } catch (NullPointerException expected) {
-    }
-
-    try {
-      builder.putAllInt32ToMessageField(
-          MapLiteTest.<Integer, MessageValue>newMap(4, null, 5, null));
-      assertWithMessage("expected exception").fail();
-    } catch (NullPointerException expected) {
-    }
-
-    try {
-      builder.putAllInt32ToMessageField(null);
-      assertWithMessage("expected exception").fail();
-    } catch (NullPointerException expected) {
-    }
-
-    assertThat(builder.build().toByteArray()).isEqualTo(new byte[0]);
-  }
-}
diff --git a/libs/protobuf/java/core/src/test/java/com/google/protobuf/MapTest.java b/libs/protobuf/java/core/src/test/java/com/google/protobuf/MapTest.java
deleted file mode 100644
index 1bb7166..0000000
--- a/libs/protobuf/java/core/src/test/java/com/google/protobuf/MapTest.java
+++ /dev/null
@@ -1,1605 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.common.truth.Truth.assertThat;
-import static com.google.common.truth.Truth.assertWithMessage;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
-
-import com.google.protobuf.Descriptors.Descriptor;
-import com.google.protobuf.Descriptors.EnumDescriptor;
-import com.google.protobuf.Descriptors.EnumValueDescriptor;
-import com.google.protobuf.Descriptors.FieldDescriptor;
-import map_test.MapTestProto.BizarroTestMap;
-import map_test.MapTestProto.MapContainer;
-import map_test.MapTestProto.ReservedAsMapField;
-import map_test.MapTestProto.ReservedAsMapFieldWithEnumValue;
-import map_test.MapTestProto.TestMap;
-import map_test.MapTestProto.TestMap.MessageValue;
-import map_test.MapTestProto.TestMapOrBuilder;
-import map_test.MapTestProto.TestOnChangeEventPropagation;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-/** Unit tests for map fields. */
-@RunWith(JUnit4.class)
-public class MapTest {
-
-  private void setMapValuesUsingMutableMap(TestMap.Builder builder) {
-    builder.getMutableInt32ToInt32Field().put(1, 11);
-    builder.getMutableInt32ToInt32Field().put(2, 22);
-    builder.getMutableInt32ToInt32Field().put(3, 33);
-  //
-    builder.getMutableInt32ToStringField().put(1, "11");
-    builder.getMutableInt32ToStringField().put(2, "22");
-    builder.getMutableInt32ToStringField().put(3, "33");
-  //
-    builder.getMutableInt32ToBytesField().put(1, TestUtil.toBytes("11"));
-    builder.getMutableInt32ToBytesField().put(2, TestUtil.toBytes("22"));
-    builder.getMutableInt32ToBytesField().put(3, TestUtil.toBytes("33"));
-  //
-    builder.getMutableInt32ToEnumField().put(1, TestMap.EnumValue.FOO);
-    builder.getMutableInt32ToEnumField().put(2, TestMap.EnumValue.BAR);
-    builder.getMutableInt32ToEnumField().put(3, TestMap.EnumValue.BAZ);
-  //
-    builder.getMutableInt32ToMessageField().put(
-        1, MessageValue.newBuilder().setValue(11).build());
-    builder.getMutableInt32ToMessageField().put(
-        2, MessageValue.newBuilder().setValue(22).build());
-    builder.getMutableInt32ToMessageField().put(
-        3, MessageValue.newBuilder().setValue(33).build());
-  //
-    builder.getMutableStringToInt32Field().put("1", 11);
-    builder.getMutableStringToInt32Field().put("2", 22);
-    builder.getMutableStringToInt32Field().put("3", 33);
-  }
-
-  private void setMapValuesUsingAccessors(TestMap.Builder builder) {
-    builder
-        .putInt32ToInt32Field(1, 11)
-        .putInt32ToInt32Field(2, 22)
-        .putInt32ToInt32Field(3, 33)
-        .putInt32ToStringField(1, "11")
-        .putInt32ToStringField(2, "22")
-        .putInt32ToStringField(3, "33")
-        .putInt32ToBytesField(1, TestUtil.toBytes("11"))
-        .putInt32ToBytesField(2, TestUtil.toBytes("22"))
-        .putInt32ToBytesField(3, TestUtil.toBytes("33"))
-        .putInt32ToEnumField(1, TestMap.EnumValue.FOO)
-        .putInt32ToEnumField(2, TestMap.EnumValue.BAR)
-        .putInt32ToEnumField(3, TestMap.EnumValue.BAZ)
-        .putInt32ToMessageField(1, MessageValue.newBuilder().setValue(11).build())
-        .putInt32ToMessageField(2, MessageValue.newBuilder().setValue(22).build())
-        .putInt32ToMessageField(3, MessageValue.newBuilder().setValue(33).build())
-        .putStringToInt32Field("1", 11)
-        .putStringToInt32Field("2", 22)
-        .putStringToInt32Field("3", 33);
-  }
-
-  @Test
-  public void testSetMapValues() {
-    TestMap.Builder usingMutableMapBuilder = TestMap.newBuilder();
-    setMapValuesUsingMutableMap(usingMutableMapBuilder);
-    TestMap usingMutableMap = usingMutableMapBuilder.build();
-    assertMapValuesSet(usingMutableMap);
-
-    TestMap.Builder usingAccessorsBuilder = TestMap.newBuilder();
-    setMapValuesUsingAccessors(usingAccessorsBuilder);
-    TestMap usingAccessors = usingAccessorsBuilder.build();
-    assertMapValuesSet(usingAccessors);
-
-    assertThat(usingAccessors).isEqualTo(usingMutableMap);
-  }
-
-  private void copyMapValues(TestMap source, TestMap.Builder destination) {
-    destination
-        .putAllInt32ToInt32Field(source.getInt32ToInt32FieldMap())
-        .putAllInt32ToStringField(source.getInt32ToStringFieldMap())
-        .putAllInt32ToBytesField(source.getInt32ToBytesFieldMap())
-        .putAllInt32ToEnumField(source.getInt32ToEnumFieldMap())
-        .putAllInt32ToMessageField(source.getInt32ToMessageFieldMap())
-        .putAllStringToInt32Field(source.getStringToInt32FieldMap());
-  }
-
-  private void assertMapValuesSet(TestMap message) {
-    assertThat(message.getInt32ToInt32FieldMap()).hasSize(3);
-    assertThat(message.getInt32ToInt32FieldMap().get(1).intValue()).isEqualTo(11);
-    assertThat(message.getInt32ToInt32FieldMap().get(2).intValue()).isEqualTo(22);
-    assertThat(message.getInt32ToInt32FieldMap().get(3).intValue()).isEqualTo(33);
-
-    assertThat(message.getInt32ToStringFieldMap()).hasSize(3);
-    assertThat(message.getInt32ToStringFieldMap()).containsEntry(1, "11");
-    assertThat(message.getInt32ToStringFieldMap()).containsEntry(2, "22");
-    assertThat(message.getInt32ToStringFieldMap()).containsEntry(3, "33");
-
-    assertThat(message.getInt32ToBytesFieldMap()).hasSize(3);
-    assertThat(message.getInt32ToBytesFieldMap()).containsEntry(1, TestUtil.toBytes("11"));
-    assertThat(message.getInt32ToBytesFieldMap()).containsEntry(2, TestUtil.toBytes("22"));
-    assertThat(message.getInt32ToBytesFieldMap()).containsEntry(3, TestUtil.toBytes("33"));
-
-    assertThat(message.getInt32ToEnumFieldMap()).hasSize(3);
-    assertThat(message.getInt32ToEnumFieldMap()).containsEntry(1, TestMap.EnumValue.FOO);
-    assertThat(message.getInt32ToEnumFieldMap()).containsEntry(2, TestMap.EnumValue.BAR);
-    assertThat(message.getInt32ToEnumFieldMap()).containsEntry(3, TestMap.EnumValue.BAZ);
-
-    assertThat(message.getInt32ToMessageFieldMap()).hasSize(3);
-    assertThat(message.getInt32ToMessageFieldMap().get(1).getValue()).isEqualTo(11);
-    assertThat(message.getInt32ToMessageFieldMap().get(2).getValue()).isEqualTo(22);
-    assertThat(message.getInt32ToMessageFieldMap().get(3).getValue()).isEqualTo(33);
-
-    assertThat(message.getStringToInt32FieldMap()).hasSize(3);
-    assertThat(message.getStringToInt32FieldMap().get("1").intValue()).isEqualTo(11);
-    assertThat(message.getStringToInt32FieldMap().get("2").intValue()).isEqualTo(22);
-    assertThat(message.getStringToInt32FieldMap().get("3").intValue()).isEqualTo(33);
-  }
-
-  private void updateMapValuesUsingMutableMap(TestMap.Builder builder) {
-    builder.getMutableInt32ToInt32Field().put(1, 111);
-    builder.getMutableInt32ToInt32Field().remove(2);
-    builder.getMutableInt32ToInt32Field().put(4, 44);
-  //
-    builder.getMutableInt32ToStringField().put(1, "111");
-    builder.getMutableInt32ToStringField().remove(2);
-    builder.getMutableInt32ToStringField().put(4, "44");
-  //
-    builder.getMutableInt32ToBytesField().put(1, TestUtil.toBytes("111"));
-    builder.getMutableInt32ToBytesField().remove(2);
-    builder.getMutableInt32ToBytesField().put(4, TestUtil.toBytes("44"));
-  //
-    builder.getMutableInt32ToEnumField().put(1, TestMap.EnumValue.BAR);
-    builder.getMutableInt32ToEnumField().remove(2);
-    builder.getMutableInt32ToEnumField().put(4, TestMap.EnumValue.QUX);
-  //
-    builder.getMutableInt32ToMessageField().put(
-        1, MessageValue.newBuilder().setValue(111).build());
-    builder.getMutableInt32ToMessageField().remove(2);
-    builder.getMutableInt32ToMessageField().put(
-        4, MessageValue.newBuilder().setValue(44).build());
-  //
-    builder.getMutableStringToInt32Field().put("1", 111);
-    builder.getMutableStringToInt32Field().remove("2");
-    builder.getMutableStringToInt32Field().put("4", 44);
-  }
-
-  private void updateMapValuesUsingAccessors(TestMap.Builder builder) {
-    builder
-        .putInt32ToInt32Field(1, 111)
-        .removeInt32ToInt32Field(2)
-        .putInt32ToInt32Field(4, 44)
-        .putInt32ToStringField(1, "111")
-        .removeInt32ToStringField(2)
-        .putInt32ToStringField(4, "44")
-        .putInt32ToBytesField(1, TestUtil.toBytes("111"))
-        .removeInt32ToBytesField(2)
-        .putInt32ToBytesField(4, TestUtil.toBytes("44"))
-        .putInt32ToEnumField(1, TestMap.EnumValue.BAR)
-        .removeInt32ToEnumField(2)
-        .putInt32ToEnumField(4, TestMap.EnumValue.QUX)
-        .putInt32ToMessageField(1, MessageValue.newBuilder().setValue(111).build())
-        .removeInt32ToMessageField(2)
-        .putInt32ToMessageField(4, MessageValue.newBuilder().setValue(44).build())
-        .putStringToInt32Field("1", 111)
-        .removeStringToInt32Field("2")
-        .putStringToInt32Field("4", 44);
-  }
-
-  @Test
-  public void testUpdateMapValues() {
-    TestMap.Builder usingMutableMapBuilder = TestMap.newBuilder();
-    setMapValuesUsingMutableMap(usingMutableMapBuilder);
-    TestMap usingMutableMap = usingMutableMapBuilder.build();
-    assertMapValuesSet(usingMutableMap);
-
-    TestMap.Builder usingAccessorsBuilder = TestMap.newBuilder();
-    setMapValuesUsingAccessors(usingAccessorsBuilder);
-    TestMap usingAccessors = usingAccessorsBuilder.build();
-    assertMapValuesSet(usingAccessors);
-
-    assertThat(usingAccessors).isEqualTo(usingMutableMap);
-    //
-    usingMutableMapBuilder = usingMutableMap.toBuilder();
-    updateMapValuesUsingMutableMap(usingMutableMapBuilder);
-    usingMutableMap = usingMutableMapBuilder.build();
-    assertMapValuesUpdated(usingMutableMap);
-
-    usingAccessorsBuilder = usingAccessors.toBuilder();
-    updateMapValuesUsingAccessors(usingAccessorsBuilder);
-    usingAccessors = usingAccessorsBuilder.build();
-    assertMapValuesUpdated(usingAccessors);
-
-    assertThat(usingAccessors).isEqualTo(usingMutableMap);
-  }
-
-  private void assertMapValuesUpdated(TestMap message) {
-    assertThat(message.getInt32ToInt32FieldMap()).hasSize(3);
-    assertThat(message.getInt32ToInt32FieldMap().get(1).intValue()).isEqualTo(111);
-    assertThat(message.getInt32ToInt32FieldMap().get(3).intValue()).isEqualTo(33);
-    assertThat(message.getInt32ToInt32FieldMap().get(4).intValue()).isEqualTo(44);
-
-    assertThat(message.getInt32ToStringFieldMap()).hasSize(3);
-    assertThat(message.getInt32ToStringFieldMap()).containsEntry(1, "111");
-    assertThat(message.getInt32ToStringFieldMap()).containsEntry(3, "33");
-    assertThat(message.getInt32ToStringFieldMap()).containsEntry(4, "44");
-
-    assertThat(message.getInt32ToBytesFieldMap()).hasSize(3);
-    assertThat(message.getInt32ToBytesFieldMap()).containsEntry(1, TestUtil.toBytes("111"));
-    assertThat(message.getInt32ToBytesFieldMap()).containsEntry(3, TestUtil.toBytes("33"));
-    assertThat(message.getInt32ToBytesFieldMap()).containsEntry(4, TestUtil.toBytes("44"));
-
-    assertThat(message.getInt32ToEnumFieldMap()).hasSize(3);
-    assertThat(message.getInt32ToEnumFieldMap()).containsEntry(1, TestMap.EnumValue.BAR);
-    assertThat(message.getInt32ToEnumFieldMap()).containsEntry(3, TestMap.EnumValue.BAZ);
-    assertThat(message.getInt32ToEnumFieldMap()).containsEntry(4, TestMap.EnumValue.QUX);
-
-    assertThat(message.getInt32ToMessageFieldMap()).hasSize(3);
-    assertThat(message.getInt32ToMessageFieldMap().get(1).getValue()).isEqualTo(111);
-    assertThat(message.getInt32ToMessageFieldMap().get(3).getValue()).isEqualTo(33);
-    assertThat(message.getInt32ToMessageFieldMap().get(4).getValue()).isEqualTo(44);
-
-    assertThat(message.getStringToInt32FieldMap()).hasSize(3);
-    assertThat(message.getStringToInt32FieldMap().get("1").intValue()).isEqualTo(111);
-    assertThat(message.getStringToInt32FieldMap().get("3").intValue()).isEqualTo(33);
-    assertThat(message.getStringToInt32FieldMap().get("4").intValue()).isEqualTo(44);
-  }
-
-  private void assertMapValuesCleared(TestMapOrBuilder testMapOrBuilder) {
-    assertThat(testMapOrBuilder.getInt32ToInt32FieldMap()).isEmpty();
-    assertThat(testMapOrBuilder.getInt32ToInt32FieldCount()).isEqualTo(0);
-    assertThat(testMapOrBuilder.getInt32ToStringFieldMap()).isEmpty();
-    assertThat(testMapOrBuilder.getInt32ToStringFieldCount()).isEqualTo(0);
-    assertThat(testMapOrBuilder.getInt32ToBytesFieldMap()).isEmpty();
-    assertThat(testMapOrBuilder.getInt32ToBytesFieldCount()).isEqualTo(0);
-    assertThat(testMapOrBuilder.getInt32ToEnumFieldMap()).isEmpty();
-    assertThat(testMapOrBuilder.getInt32ToEnumFieldCount()).isEqualTo(0);
-    assertThat(testMapOrBuilder.getInt32ToMessageFieldMap()).isEmpty();
-    assertThat(testMapOrBuilder.getInt32ToMessageFieldCount()).isEqualTo(0);
-    assertThat(testMapOrBuilder.getStringToInt32FieldMap()).isEmpty();
-    assertThat(testMapOrBuilder.getStringToInt32FieldCount()).isEqualTo(0);
-  }
-
-  @Test
-  public void testGetMapIsImmutable() {
-    TestMap.Builder builder = TestMap.newBuilder();
-    assertMapsAreImmutable(builder);
-    assertMapsAreImmutable(builder.build());
-
-    setMapValuesUsingAccessors(builder);
-    assertMapsAreImmutable(builder);
-    assertMapsAreImmutable(builder.build());
-  }
-
-  private void assertMapsAreImmutable(TestMapOrBuilder testMapOrBuilder) {
-    assertImmutable(testMapOrBuilder.getInt32ToInt32FieldMap(), 1, 2);
-    assertImmutable(testMapOrBuilder.getInt32ToStringFieldMap(), 1, "2");
-    assertImmutable(testMapOrBuilder.getInt32ToBytesFieldMap(), 1, TestUtil.toBytes("2"));
-    assertImmutable(testMapOrBuilder.getInt32ToEnumFieldMap(), 1, TestMap.EnumValue.FOO);
-    assertImmutable(
-        testMapOrBuilder.getInt32ToMessageFieldMap(), 1, MessageValue.getDefaultInstance());
-    assertImmutable(testMapOrBuilder.getStringToInt32FieldMap(), "1", 2);
-  }
-
-  private <K, V> void assertImmutable(Map<K, V> map, K key, V value) {
-    try {
-      map.put(key, value);
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-  }
-
-  @Test
-  public void testMutableMapLifecycle() {
-    TestMap.Builder builder = TestMap.newBuilder();
-    Map<Integer, Integer> intMap = builder.getMutableInt32ToInt32Field();
-    intMap.put(1, 2);
-    assertThat(builder.build().getInt32ToInt32Field()).isEqualTo(newMap(1, 2));
-    try {
-      intMap.put(2, 3);
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-    assertThat(builder.getInt32ToInt32Field()).isEqualTo(newMap(1, 2));
-    builder.getMutableInt32ToInt32Field().put(2, 3);
-    assertThat(builder.getInt32ToInt32Field()).isEqualTo(newMap(1, 2, 2, 3));
-  //
-    Map<Integer, TestMap.EnumValue> enumMap = builder.getMutableInt32ToEnumField();
-    enumMap.put(1, TestMap.EnumValue.BAR);
-    assertThat(builder.build().getInt32ToEnumField())
-        .isEqualTo(newMap(1, TestMap.EnumValue.BAR));
-    try {
-      enumMap.put(2, TestMap.EnumValue.FOO);
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-    assertThat(builder.getInt32ToEnumField()).isEqualTo(newMap(1, TestMap.EnumValue.BAR));
-    builder.getMutableInt32ToEnumField().put(2, TestMap.EnumValue.FOO);
-    assertThat(builder.getInt32ToEnumField()).isEqualTo(
-        newMap(1, TestMap.EnumValue.BAR, 2, TestMap.EnumValue.FOO));
-  //
-    Map<Integer, String> stringMap = builder.getMutableInt32ToStringField();
-    stringMap.put(1, "1");
-    assertThat(builder.build().getInt32ToStringField()).isEqualTo(newMap(1, "1"));
-    try {
-      stringMap.put(2, "2");
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-    assertThat(builder.getInt32ToStringField()).isEqualTo(newMap(1, "1"));
-    builder.putInt32ToStringField(2, "2");
-    assertThat(builder.getInt32ToStringField()).isEqualTo(newMap(1, "1", 2, "2"));
-  //
-    Map<Integer, TestMap.MessageValue> messageMap = builder.getMutableInt32ToMessageField();
-    messageMap.put(1, TestMap.MessageValue.getDefaultInstance());
-    assertThat( builder.build().getInt32ToMessageField())
-        .isEqualTo(newMap(1, TestMap.MessageValue.getDefaultInstance()));
-    try {
-      messageMap.put(2, TestMap.MessageValue.getDefaultInstance());
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-    assertThat(builder.getInt32ToMessageField())
-        .isEqualTo(newMap(1, TestMap.MessageValue.getDefaultInstance()));
-    builder.putInt32ToMessageField(2, TestMap.MessageValue.getDefaultInstance());
-    assertThat(builder.getInt32ToMessageField()).isEqualTo(
-        newMap(1, TestMap.MessageValue.getDefaultInstance(),
-            2, TestMap.MessageValue.getDefaultInstance()));
-  }
-  //
-  @Test
-  public void testMutableMapLifecycle_collections() {
-    TestMap.Builder builder = TestMap.newBuilder();
-    Map<Integer, Integer> intMap = builder.getMutableInt32ToInt32Field();
-    intMap.put(1, 2);
-    assertThat(builder.build().getInt32ToInt32Field()).isEqualTo(newMap(1, 2));
-    try {
-      intMap.remove(2);
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-    try {
-      intMap.entrySet().remove(new Object());
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-    try {
-      intMap.entrySet().iterator().remove();
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-    try {
-      intMap.keySet().remove(new Object());
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-    try {
-      intMap.values().remove(new Object());
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-    try {
-      intMap.values().iterator().remove();
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-    assertThat(intMap).isEqualTo(newMap(1, 2));
-    assertThat(builder.getInt32ToInt32Field()).isEqualTo(newMap(1, 2));
-    assertThat(builder.build().getInt32ToInt32Field()).isEqualTo(newMap(1, 2));
-  }
-
-  @Test
-  public void testGettersAndSetters() throws Exception {
-    TestMap.Builder builder = TestMap.newBuilder();
-    TestMap message = builder.build();
-    assertMapValuesCleared(message);
-
-    builder = message.toBuilder();
-    setMapValuesUsingAccessors(builder);
-    message = builder.build();
-    assertMapValuesSet(message);
-
-    builder = message.toBuilder();
-    updateMapValuesUsingAccessors(builder);
-    message = builder.build();
-    assertMapValuesUpdated(message);
-
-    builder = message.toBuilder();
-    builder.clear();
-    assertMapValuesCleared(builder);
-    message = builder.build();
-    assertMapValuesCleared(message);
-  }
-
-  @Test
-  public void testPutAll() throws Exception {
-    TestMap.Builder sourceBuilder = TestMap.newBuilder();
-    setMapValuesUsingAccessors(sourceBuilder);
-    TestMap source = sourceBuilder.build();
-    assertMapValuesSet(source);
-
-    TestMap.Builder destination = TestMap.newBuilder();
-    copyMapValues(source, destination);
-    assertMapValuesSet(destination.build());
-  }
-
-  @Test
-  public void testPutAllWithNullStringValue() throws Exception {
-    TestMap.Builder sourceBuilder = TestMap.newBuilder();
-
-    // order preserving map used here to help test rollback
-    Map<Integer, String> data = new TreeMap<>();
-    data.put(7, "foo");
-    data.put(8, "bar");
-    data.put(9, null);
-    try {
-      sourceBuilder.putAllInt32ToStringField(data);
-      fail("allowed null string value");
-    } catch (NullPointerException expected) {
-      // Verify rollback of previously added values.
-      // They all go in or none do.
-      assertThat(sourceBuilder.getInt32ToStringFieldMap()).isEmpty();
-    }
-  }
-
-  @Test
-  public void testPutNullStringValue() throws Exception {
-    TestMap.Builder sourceBuilder = TestMap.newBuilder();
-
-    try {
-      sourceBuilder.putInt32ToStringField(8, null);
-      fail("allowed null string value");
-    } catch (NullPointerException expected) {
-      assertNotNull(expected.getMessage());
-    }
-  }
-
-  @Test
-  public void testPutAllForUnknownEnumValues() throws Exception {
-    TestMap source =
-        TestMap.newBuilder()
-            .putAllInt32ToEnumFieldValue(
-                newMap(
-                    0, 0,
-                    1, 1,
-                    2, 1000)) // unknown value.
-            .build();
-
-    TestMap destination =
-        TestMap.newBuilder()
-            .putAllInt32ToEnumFieldValue(source.getInt32ToEnumFieldValueMap())
-            .build();
-
-    assertThat(destination.getInt32ToEnumFieldValueMap().get(0).intValue()).isEqualTo(0);
-    assertThat(destination.getInt32ToEnumFieldValueMap().get(1).intValue()).isEqualTo(1);
-    assertThat(destination.getInt32ToEnumFieldValueMap().get(2).intValue()).isEqualTo(1000);
-    assertThat(destination.getInt32ToEnumFieldCount()).isEqualTo(3);
-  }
-
-  @Test
-  public void testPutForUnknownEnumValues() throws Exception {
-    TestMap message =
-        TestMap.newBuilder()
-            .putInt32ToEnumFieldValue(0, 0)
-            .putInt32ToEnumFieldValue(1, 1)
-            .putInt32ToEnumFieldValue(2, 1000) // unknown value.
-            .build();
-    assertThat(message.getInt32ToEnumFieldValueOrThrow(0)).isEqualTo(0);
-    assertThat(message.getInt32ToEnumFieldValueOrThrow(1)).isEqualTo(1);
-    assertThat(message.getInt32ToEnumFieldValueOrThrow(2)).isEqualTo(1000);
-    assertThat(message.getInt32ToEnumFieldCount()).isEqualTo(3);
-  }
-
-  @Test
-  public void testPutChecksNullKeysAndValues() throws Exception {
-    TestMap.Builder builder = TestMap.newBuilder();
-
-    try {
-      builder.putInt32ToStringField(1, null);
-      assertWithMessage("expected exception").fail();
-    } catch (NullPointerException e) {
-      // expected.
-    }
-
-    try {
-      builder.putInt32ToBytesField(1, null);
-      assertWithMessage("expected exception").fail();
-    } catch (NullPointerException e) {
-      // expected.
-    }
-
-    try {
-      builder.putInt32ToEnumField(1, null);
-      assertWithMessage("expected exception").fail();
-    } catch (NullPointerException e) {
-      // expected.
-    }
-
-    try {
-      builder.putInt32ToMessageField(1, null);
-      assertWithMessage("expected exception").fail();
-    } catch (NullPointerException e) {
-      // expected.
-    }
-
-    try {
-      builder.putStringToInt32Field(null, 1);
-      assertWithMessage("expected exception").fail();
-    } catch (NullPointerException e) {
-      // expected.
-    }
-  }
-
-  @Test
-  public void testSerializeAndParse() throws Exception {
-    TestMap.Builder builder = TestMap.newBuilder();
-    setMapValuesUsingAccessors(builder);
-    TestMap message = builder.build();
-    assertThat(message.toByteString().size()).isEqualTo(message.getSerializedSize());
-    message = TestMap.parseFrom(message.toByteString());
-    assertMapValuesSet(message);
-
-    builder = message.toBuilder();
-    updateMapValuesUsingAccessors(builder);
-    message = builder.build();
-    assertThat(message.toByteString().size()).isEqualTo(message.getSerializedSize());
-    message = TestMap.parseFrom(message.toByteString());
-    assertMapValuesUpdated(message);
-
-    builder = message.toBuilder();
-    builder.clear();
-    message = builder.build();
-    assertThat(message.toByteString().size()).isEqualTo(message.getSerializedSize());
-    message = TestMap.parseFrom(message.toByteString());
-    assertMapValuesCleared(message);
-  }
-
-  private TestMap tryParseTestMap(BizarroTestMap bizarroMap) throws IOException {
-    ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
-    CodedOutputStream output = CodedOutputStream.newInstance(byteArrayOutputStream);
-    bizarroMap.writeTo(output);
-    output.flush();
-    return TestMap.parseFrom(ByteString.copyFrom(byteArrayOutputStream.toByteArray()));
-  }
-
-  @Test
-  public void testParseError() throws Exception {
-    ByteString bytes = TestUtil.toBytes("SOME BYTES");
-    String stringKey = "a string key";
-
-    TestMap map =
-        tryParseTestMap(BizarroTestMap.newBuilder().putInt32ToInt32Field(5, bytes).build());
-    assertThat(map.getInt32ToInt32FieldOrDefault(5, -1)).isEqualTo(0);
-
-    map = tryParseTestMap(BizarroTestMap.newBuilder().putInt32ToStringField(stringKey, 5).build());
-    assertThat(map.getInt32ToStringFieldOrDefault(0, null)).isEmpty();
-
-    map = tryParseTestMap(BizarroTestMap.newBuilder().putInt32ToBytesField(stringKey, 5).build());
-    assertThat(ByteString.EMPTY).isEqualTo(map.getInt32ToBytesFieldOrDefault(0, null));
-
-    map =
-        tryParseTestMap(BizarroTestMap.newBuilder().putInt32ToEnumField(stringKey, bytes).build());
-    assertThat(map.getInt32ToEnumFieldOrDefault(0, null)).isEqualTo(TestMap.EnumValue.FOO);
-
-    try {
-      tryParseTestMap(BizarroTestMap.newBuilder().putInt32ToMessageField(stringKey, bytes).build());
-      assertWithMessage("expected exception").fail();
-    } catch (InvalidProtocolBufferException expected) {
-      assertThat(expected.getUnfinishedMessage()).isInstanceOf(TestMap.class);
-      map = (TestMap) expected.getUnfinishedMessage();
-      assertThat(map.getInt32ToMessageFieldMap()).isEmpty();
-    }
-
-    map =
-        tryParseTestMap(
-            BizarroTestMap.newBuilder().putStringToInt32Field(stringKey, bytes).build());
-    assertThat(map.getStringToInt32FieldOrDefault(stringKey, -1)).isEqualTo(0);
-  }
-
-  @Test
-  public void testMergeFrom() throws Exception {
-    TestMap.Builder builder = TestMap.newBuilder();
-    setMapValuesUsingAccessors(builder);
-    TestMap message = builder.build();
-
-    TestMap.Builder other = TestMap.newBuilder();
-    other.mergeFrom(message);
-    assertMapValuesSet(other.build());
-  }
-
-  @Test
-  public void testEqualsAndHashCode() throws Exception {
-    // Test that generated equals() and hashCode() will disregard the order
-    // of map entries when comparing/hashing map fields.
-
-    // We can't control the order of elements in a HashMap. The best we can do
-    // here is to add elements in different order.
-    TestMap m1 =
-        TestMap.newBuilder()
-            .putInt32ToInt32Field(1, 2)
-            .putInt32ToInt32Field(3, 4)
-            .putInt32ToInt32Field(5, 6)
-            .build();
-
-    TestMap.Builder b2 =
-        TestMap.newBuilder()
-            .putInt32ToInt32Field(5, 6)
-            .putInt32ToInt32Field(1, 2)
-            .putInt32ToInt32Field(3, 4);
-    TestMap m2 = b2.build();
-
-    assertThat(m2).isEqualTo(m1);
-    assertThat(m2.hashCode()).isEqualTo(m1.hashCode());
-
-    // Make sure we did compare map fields.
-    b2.putInt32ToInt32Field(1, 0);
-    m2 = b2.build();
-    assertThat(m1.equals(m2)).isFalse();
-    // Don't check m1.hashCode() != m2.hashCode() because it's not guaranteed
-    // to be different.
-
-    // Regression test for b/18549190: if a map is a subset of the other map,
-    // equals() should return false.
-    b2.removeInt32ToInt32Field(1);
-    m2 = b2.build();
-    assertThat(m1.equals(m2)).isFalse();
-    assertThat(m2.equals(m1)).isFalse();
-  }
-
-  @Test
-  public void testNestedBuilderOnChangeEventPropagation() {
-    TestOnChangeEventPropagation.Builder parent = TestOnChangeEventPropagation.newBuilder();
-    parent.getOptionalMessageBuilder().putInt32ToInt32Field(1, 2);
-    TestOnChangeEventPropagation message = parent.build();
-    assertThat(message.getOptionalMessage().getInt32ToInt32FieldMap().get(1).intValue())
-        .isEqualTo(2);
-
-    // Make a change using nested builder.
-    parent.getOptionalMessageBuilder().putInt32ToInt32Field(1, 3);
-
-    // Should be able to observe the change.
-    message = parent.build();
-    assertThat(message.getOptionalMessage().getInt32ToInt32FieldMap().get(1).intValue())
-        .isEqualTo(3);
-
-    // Make another change using mergeFrom()
-    TestMap other = TestMap.newBuilder().putInt32ToInt32Field(1, 4).build();
-    parent.getOptionalMessageBuilder().mergeFrom(other);
-
-    // Should be able to observe the change.
-    message = parent.build();
-    assertThat(message.getOptionalMessage().getInt32ToInt32FieldMap().get(1).intValue())
-        .isEqualTo(4);
-
-    // Make yet another change by clearing the nested builder.
-    parent.getOptionalMessageBuilder().clear();
-
-    // Should be able to observe the change.
-    message = parent.build();
-    assertThat(message.getOptionalMessage().getInt32ToInt32FieldMap()).isEmpty();
-  }
-
-  @Test
-  public void testNestedBuilderOnChangeEventPropagationReflection() {
-    FieldDescriptor intMapField = f("int32_to_int32_field");
-    // Create an outer message builder with nested builder.
-    TestOnChangeEventPropagation.Builder parentBuilder = TestOnChangeEventPropagation.newBuilder();
-    TestMap.Builder testMapBuilder = parentBuilder.getOptionalMessageBuilder();
-
-    // Create a map entry message.
-    TestMap.Builder entryBuilder = TestMap.newBuilder().putInt32ToInt32Field(1, 1);
-
-    // Put the entry into the nested builder.
-    testMapBuilder.addRepeatedField(intMapField, entryBuilder.getRepeatedField(intMapField, 0));
-
-    // Should be able to observe the change.
-    TestOnChangeEventPropagation message = parentBuilder.build();
-    assertThat(message.getOptionalMessage().getInt32ToInt32FieldMap()).hasSize(1);
-
-    // Change the entry value.
-    entryBuilder.putInt32ToInt32Field(1, 4);
-    testMapBuilder = parentBuilder.getOptionalMessageBuilder();
-    testMapBuilder.setRepeatedField(intMapField, 0, entryBuilder.getRepeatedField(intMapField, 0));
-
-    // Should be able to observe the change.
-    message = parentBuilder.build();
-    assertThat(message.getOptionalMessage().getInt32ToInt32FieldMap().get(1).intValue())
-        .isEqualTo(4);
-
-    // Clear the nested builder.
-    testMapBuilder = parentBuilder.getOptionalMessageBuilder();
-    testMapBuilder.clearField(intMapField);
-
-    // Should be able to observe the change.
-    message = parentBuilder.build();
-    assertThat(message.getOptionalMessage().getInt32ToInt32FieldMap()).isEmpty();
-  }
-
-  // The following methods are used to test reflection API.
-
-  private static FieldDescriptor f(String name) {
-    return TestMap.getDescriptor().findFieldByName(name);
-  }
-
-  private static Object getFieldValue(Message mapEntry, String name) {
-    FieldDescriptor field = mapEntry.getDescriptorForType().findFieldByName(name);
-    return mapEntry.getField(field);
-  }
-
-  private static Message.Builder setFieldValue(
-      Message.Builder mapEntry, String name, Object value) {
-    FieldDescriptor field = mapEntry.getDescriptorForType().findFieldByName(name);
-    mapEntry.setField(field, value);
-    return mapEntry;
-  }
-
-  private static void assertHasMapValues(Message message, String name, Map<?, ?> values) {
-    FieldDescriptor field = f(name);
-    for (Object entry : (List<?>) message.getField(field)) {
-      Message mapEntry = (Message) entry;
-      Object key = getFieldValue(mapEntry, "key");
-      Object value = getFieldValue(mapEntry, "value");
-      assertThat(values.containsKey(key)).isTrue();
-      assertThat(values.get(key)).isEqualTo(value);
-    }
-    assertThat(message.getRepeatedFieldCount(field)).isEqualTo(values.size());
-    for (int i = 0; i < message.getRepeatedFieldCount(field); i++) {
-      Message mapEntry = (Message) message.getRepeatedField(field, i);
-      Object key = getFieldValue(mapEntry, "key");
-      Object value = getFieldValue(mapEntry, "value");
-      assertThat(values.containsKey(key)).isTrue();
-      assertThat(values.get(key)).isEqualTo(value);
-    }
-  }
-
-  private static <K, V> Message newMapEntry(Message.Builder builder, String name, K key, V value) {
-    FieldDescriptor field = builder.getDescriptorForType().findFieldByName(name);
-    Message.Builder entryBuilder = builder.newBuilderForField(field);
-    FieldDescriptor keyField = entryBuilder.getDescriptorForType().findFieldByName("key");
-    FieldDescriptor valueField = entryBuilder.getDescriptorForType().findFieldByName("value");
-    entryBuilder.setField(keyField, key);
-    entryBuilder.setField(valueField, value);
-    return entryBuilder.build();
-  }
-
-  private static void setMapValues(Message.Builder builder, String name, Map<?, ?> values) {
-    List<Message> entryList = new ArrayList<>();
-    for (Map.Entry<?, ?> entry : values.entrySet()) {
-      entryList.add(newMapEntry(builder, name, entry.getKey(), entry.getValue()));
-    }
-    FieldDescriptor field = builder.getDescriptorForType().findFieldByName(name);
-    builder.setField(field, entryList);
-  }
-
-  private static <K, V> Map<K, V> mapForValues(K key1, V value1, K key2, V value2) {
-    Map<K, V> map = new HashMap<>();
-    map.put(key1, value1);
-    map.put(key2, value2);
-    return map;
-  }
-
-  @Test
-  public void testReflectionApi() throws Exception {
-    // In reflection API, map fields are just repeated message fields.
-    TestMap.Builder builder =
-        TestMap.newBuilder()
-            .putInt32ToInt32Field(1, 2)
-            .putInt32ToInt32Field(3, 4)
-            .putInt32ToMessageField(11, MessageValue.newBuilder().setValue(22).build())
-            .putInt32ToMessageField(33, MessageValue.newBuilder().setValue(44).build());
-    TestMap message = builder.build();
-
-    // Test getField(), getRepeatedFieldCount(), getRepeatedField().
-    assertHasMapValues(message, "int32_to_int32_field", mapForValues(1, 2, 3, 4));
-    assertHasMapValues(
-        message,
-        "int32_to_message_field",
-        mapForValues(
-            11, MessageValue.newBuilder().setValue(22).build(),
-            33, MessageValue.newBuilder().setValue(44).build()));
-
-    // Test clearField()
-    builder.clearField(f("int32_to_int32_field"));
-    builder.clearField(f("int32_to_message_field"));
-    message = builder.build();
-    assertThat(message.getInt32ToInt32FieldMap()).isEmpty();
-    assertThat(message.getInt32ToMessageFieldMap()).isEmpty();
-
-    // Test setField()
-    setMapValues(builder, "int32_to_int32_field", mapForValues(11, 22, 33, 44));
-    setMapValues(
-        builder,
-        "int32_to_message_field",
-        mapForValues(
-            111, MessageValue.newBuilder().setValue(222).build(),
-            333, MessageValue.newBuilder().setValue(444).build()));
-    message = builder.build();
-    assertThat(message.getInt32ToInt32FieldMap().get(11).intValue()).isEqualTo(22);
-    assertThat(message.getInt32ToInt32FieldMap().get(33).intValue()).isEqualTo(44);
-    assertThat(message.getInt32ToMessageFieldMap().get(111).getValue()).isEqualTo(222);
-    assertThat(message.getInt32ToMessageFieldMap().get(333).getValue()).isEqualTo(444);
-
-    // Test addRepeatedField
-    builder.addRepeatedField(
-        f("int32_to_int32_field"), newMapEntry(builder, "int32_to_int32_field", 55, 66));
-    builder.addRepeatedField(
-        f("int32_to_message_field"),
-        newMapEntry(
-            builder,
-            "int32_to_message_field",
-            555,
-            MessageValue.newBuilder().setValue(666).build()));
-    message = builder.build();
-    assertThat(message.getInt32ToInt32FieldMap().get(55).intValue()).isEqualTo(66);
-    assertThat(message.getInt32ToMessageFieldMap().get(555).getValue()).isEqualTo(666);
-
-    // Test addRepeatedField (overriding existing values)
-    builder.addRepeatedField(
-        f("int32_to_int32_field"), newMapEntry(builder, "int32_to_int32_field", 55, 55));
-    builder.addRepeatedField(
-        f("int32_to_message_field"),
-        newMapEntry(
-            builder,
-            "int32_to_message_field",
-            555,
-            MessageValue.newBuilder().setValue(555).build()));
-    message = builder.build();
-    assertThat(message.getInt32ToInt32FieldMap().get(55).intValue()).isEqualTo(55);
-    assertThat(message.getInt32ToMessageFieldMap().get(555).getValue()).isEqualTo(555);
-
-    // Test setRepeatedField
-    for (int i = 0; i < builder.getRepeatedFieldCount(f("int32_to_int32_field")); i++) {
-      Message mapEntry = (Message) builder.getRepeatedField(f("int32_to_int32_field"), i);
-      int oldKey = ((Integer) getFieldValue(mapEntry, "key")).intValue();
-      int oldValue = ((Integer) getFieldValue(mapEntry, "value")).intValue();
-      // Swap key with value for each entry.
-      Message.Builder mapEntryBuilder = mapEntry.toBuilder();
-      setFieldValue(mapEntryBuilder, "key", oldValue);
-      setFieldValue(mapEntryBuilder, "value", oldKey);
-      builder.setRepeatedField(f("int32_to_int32_field"), i, mapEntryBuilder.build());
-    }
-    message = builder.build();
-    assertThat(message.getInt32ToInt32FieldMap().get(22).intValue()).isEqualTo(11);
-    assertThat(message.getInt32ToInt32FieldMap().get(44).intValue()).isEqualTo(33);
-    assertThat(message.getInt32ToInt32FieldMap().get(55).intValue()).isEqualTo(55);
-  }
-
-  // See additional coverage in TextFormatTest.java.
-  @Test
-  public void testTextFormat() throws Exception {
-    TestMap.Builder builder = TestMap.newBuilder();
-    setMapValuesUsingAccessors(builder);
-    TestMap message = builder.build();
-
-    String textData = TextFormat.printer().printToString(message);
-
-    builder = TestMap.newBuilder();
-    TextFormat.merge(textData, builder);
-    message = builder.build();
-
-    assertMapValuesSet(message);
-  }
-
-  @Test
-  public void testDynamicMessage() throws Exception {
-    TestMap.Builder builder = TestMap.newBuilder();
-    setMapValuesUsingAccessors(builder);
-    TestMap message = builder.build();
-
-    Message dynamicDefaultInstance = DynamicMessage.getDefaultInstance(TestMap.getDescriptor());
-    Message dynamicMessage =
-        dynamicDefaultInstance
-            .newBuilderForType()
-            .mergeFrom(message.toByteString(), ExtensionRegistry.getEmptyRegistry())
-            .build();
-
-    assertThat(dynamicMessage).isEqualTo(message);
-    assertThat(dynamicMessage.hashCode()).isEqualTo(message.hashCode());
-  }
-
-  // Check that DynamicMessage handles map field serialization the same way as generated code
-  // regarding unset key and value field in a map entry.
-  @Test
-  public void testDynamicMessageUnsetKeyAndValue() throws Exception {
-    FieldDescriptor field = f("int32_to_int32_field");
-
-    Message dynamicDefaultInstance = DynamicMessage.getDefaultInstance(TestMap.getDescriptor());
-    Message.Builder builder = dynamicDefaultInstance.newBuilderForType();
-    // Add an entry without key and value.
-    builder.addRepeatedField(field, builder.newBuilderForField(field).build());
-    Message message = builder.build();
-    ByteString bytes = message.toByteString();
-    // Parse it back to the same generated type.
-    Message generatedMessage = TestMap.parseFrom(bytes, ExtensionRegistry.getEmptyRegistry());
-    // Assert the serialized bytes are equivalent.
-    assertThat(bytes).isEqualTo(generatedMessage.toByteString());
-  }
-
-  @Test
-  public void testReflectionEqualsAndHashCode() throws Exception {
-    // Test that generated equals() and hashCode() will disregard the order
-    // of map entries when comparing/hashing map fields.
-
-    // We use DynamicMessage to test reflection based equals()/hashCode().
-    Message dynamicDefaultInstance = DynamicMessage.getDefaultInstance(TestMap.getDescriptor());
-    FieldDescriptor field = f("int32_to_int32_field");
-
-    Message.Builder b1 = dynamicDefaultInstance.newBuilderForType();
-    b1.addRepeatedField(field, newMapEntry(b1, "int32_to_int32_field", 1, 2));
-    b1.addRepeatedField(field, newMapEntry(b1, "int32_to_int32_field", 3, 4));
-    b1.addRepeatedField(field, newMapEntry(b1, "int32_to_int32_field", 5, 6));
-    Message m1 = b1.build();
-
-    Message.Builder b2 = dynamicDefaultInstance.newBuilderForType();
-    b2.addRepeatedField(field, newMapEntry(b2, "int32_to_int32_field", 5, 6));
-    b2.addRepeatedField(field, newMapEntry(b2, "int32_to_int32_field", 1, 2));
-    b2.addRepeatedField(field, newMapEntry(b2, "int32_to_int32_field", 3, 4));
-    Message m2 = b2.build();
-
-    assertThat(m2).isEqualTo(m1);
-    assertThat(m2.hashCode()).isEqualTo(m1.hashCode());
-
-    // Make sure we did compare map fields.
-    b2.setRepeatedField(field, 0, newMapEntry(b1, "int32_to_int32_field", 0, 0));
-    m2 = b2.build();
-    assertThat(m1).isNotEqualTo(m2);
-    // Don't check m1.hashCode() != m2.hashCode() because it's not guaranteed
-    // to be different.
-  }
-
-  @Test
-  @SuppressWarnings("ProtoNewBuilderMergeFrom")
-  public void testUnknownEnumValues() throws Exception {
-    TestMap.Builder builder =
-        TestMap.newBuilder()
-            .putAllInt32ToEnumFieldValue(
-                newMap(
-                    0, 0,
-                    1, 1,
-                    2, 1000)); // unknown value.
-    TestMap message = builder.build();
-
-    assertThat(message.getInt32ToEnumFieldMap()).containsEntry(0, TestMap.EnumValue.FOO);
-    assertThat(message.getInt32ToEnumFieldMap()).containsEntry(1, TestMap.EnumValue.BAR);
-    assertThat(message.getInt32ToEnumFieldMap()).containsEntry(2, TestMap.EnumValue.UNRECOGNIZED);
-    assertThat(message.getInt32ToEnumFieldValueMap().get(2).intValue()).isEqualTo(1000);
-
-    // Unknown enum values should be preserved after:
-    //   1. Serialization and parsing.
-    //   2. toBuild().
-    //   3. mergeFrom().
-    message = TestMap.parseFrom(message.toByteString(), ExtensionRegistry.getEmptyRegistry());
-    assertThat(message.getInt32ToEnumFieldValueMap().get(2).intValue()).isEqualTo(1000);
-    builder = message.toBuilder();
-    assertThat(builder.getInt32ToEnumFieldValueMap().get(2).intValue()).isEqualTo(1000);
-    builder = TestMap.newBuilder().mergeFrom(message);
-    assertThat(builder.getInt32ToEnumFieldValueMap().get(2).intValue()).isEqualTo(1000);
-
-    // hashCode()/equals() should take unknown enum values into account.
-    builder.putAllInt32ToEnumFieldValue(newMap(2, 1001));
-    TestMap message2 = builder.build();
-    assertThat(message.hashCode()).isNotEqualTo(message2.hashCode());
-    assertThat(message.equals(message2)).isFalse();
-    // Unknown values will be converted to UNRECOGNIZED so the resulted enum map
-    // should be the same.
-    assertThat(message.getInt32ToEnumFieldMap()).isEqualTo(message2.getInt32ToEnumFieldMap());
-  }
-
-  @Test
-  public void testUnknownEnumValuesInReflectionApi() throws Exception {
-    Descriptor descriptor = TestMap.getDescriptor();
-    EnumDescriptor enumDescriptor = TestMap.EnumValue.getDescriptor();
-    FieldDescriptor field = descriptor.findFieldByName("int32_to_enum_field");
-
-    Map<Integer, Integer> data =
-        newMap(
-            0, 0,
-            1, 1,
-            2, 1000); // unknown value
-
-    TestMap.Builder builder = TestMap.newBuilder().putAllInt32ToEnumFieldValue(data);
-
-    // Try to read unknown enum values using reflection API.
-    for (int i = 0; i < builder.getRepeatedFieldCount(field); i++) {
-      Message mapEntry = (Message) builder.getRepeatedField(field, i);
-      int key = ((Integer) getFieldValue(mapEntry, "key")).intValue();
-      int value = ((EnumValueDescriptor) getFieldValue(mapEntry, "value")).getNumber();
-      assertThat(value).isEqualTo(data.get(key).intValue());
-      Message.Builder mapEntryBuilder = mapEntry.toBuilder();
-      // Increase the value by 1.
-      setFieldValue(
-          mapEntryBuilder, "value", enumDescriptor.findValueByNumberCreatingIfUnknown(value + 1));
-      builder.setRepeatedField(field, i, mapEntryBuilder.build());
-    }
-
-    // Verify that enum values have been successfully updated.
-    TestMap message = builder.build();
-    for (Map.Entry<Integer, Integer> entry : message.getInt32ToEnumFieldValueMap().entrySet()) {
-      assertThat(entry.getValue().intValue()).isEqualTo(data.get(entry.getKey()) + 1);
-    }
-  }
-
-  @Test
-  public void testIterationOrder() throws Exception {
-    TestMap.Builder builder = TestMap.newBuilder();
-    setMapValuesUsingAccessors(builder);
-    TestMap message = builder.build();
-
-    assertThat(new ArrayList<>(message.getStringToInt32FieldMap().keySet()))
-        .containsExactly("1", "2", "3")
-        .inOrder();
-  }
-
-  @Test
-  public void testGetMap() {
-    TestMap.Builder builder = TestMap.newBuilder();
-    setMapValuesUsingAccessors(builder);
-    TestMap message = builder.build();
-    assertThat(message.getStringToInt32FieldMap()).isEqualTo(message.getStringToInt32FieldMap());
-    assertThat(message.getInt32ToBytesFieldMap()).isEqualTo(message.getInt32ToBytesFieldMap());
-    assertThat(message.getInt32ToEnumFieldMap()).isEqualTo(message.getInt32ToEnumFieldMap());
-    assertThat(message.getInt32ToEnumFieldValueMap())
-        .isEqualTo(message.getInt32ToEnumFieldValueMap());
-    assertThat(message.getInt32ToMessageFieldMap()).isEqualTo(message.getInt32ToMessageFieldMap());
-  }
-
-  @Test
-  public void testContains() {
-    TestMap.Builder builder = TestMap.newBuilder();
-    setMapValuesUsingAccessors(builder);
-    assertMapContainsSetValues(builder);
-    assertMapContainsSetValues(builder.build());
-  }
-
-  private void assertMapContainsSetValues(TestMapOrBuilder testMapOrBuilder) {
-    assertThat(testMapOrBuilder.containsInt32ToInt32Field(1)).isTrue();
-    assertThat(testMapOrBuilder.containsInt32ToInt32Field(2)).isTrue();
-    assertThat(testMapOrBuilder.containsInt32ToInt32Field(3)).isTrue();
-    assertThat(testMapOrBuilder.containsInt32ToInt32Field(-1)).isFalse();
-
-    assertThat(testMapOrBuilder.containsInt32ToStringField(1)).isTrue();
-    assertThat(testMapOrBuilder.containsInt32ToStringField(2)).isTrue();
-    assertThat(testMapOrBuilder.containsInt32ToStringField(3)).isTrue();
-    assertThat(testMapOrBuilder.containsInt32ToStringField(-1)).isFalse();
-
-    assertThat(testMapOrBuilder.containsInt32ToBytesField(1)).isTrue();
-    assertThat(testMapOrBuilder.containsInt32ToBytesField(2)).isTrue();
-    assertThat(testMapOrBuilder.containsInt32ToBytesField(3)).isTrue();
-    assertThat(testMapOrBuilder.containsInt32ToBytesField(-1)).isFalse();
-
-    assertThat(testMapOrBuilder.containsInt32ToEnumField(1)).isTrue();
-    assertThat(testMapOrBuilder.containsInt32ToEnumField(2)).isTrue();
-    assertThat(testMapOrBuilder.containsInt32ToEnumField(3)).isTrue();
-    assertThat(testMapOrBuilder.containsInt32ToEnumField(-1)).isFalse();
-
-    assertThat(testMapOrBuilder.containsInt32ToMessageField(1)).isTrue();
-    assertThat(testMapOrBuilder.containsInt32ToMessageField(2)).isTrue();
-    assertThat(testMapOrBuilder.containsInt32ToMessageField(3)).isTrue();
-    assertThat(testMapOrBuilder.containsInt32ToMessageField(-1)).isFalse();
-
-    assertThat(testMapOrBuilder.containsStringToInt32Field("1")).isTrue();
-    assertThat(testMapOrBuilder.containsStringToInt32Field("2")).isTrue();
-    assertThat(testMapOrBuilder.containsStringToInt32Field("3")).isTrue();
-    assertThat(testMapOrBuilder.containsStringToInt32Field("-1")).isFalse();
-  }
-
-  @Test
-  public void testCount() {
-    TestMap.Builder builder = TestMap.newBuilder();
-    assertMapCounts(0, builder);
-
-    setMapValuesUsingAccessors(builder);
-    assertMapCounts(3, builder);
-
-    TestMap message = builder.build();
-    assertMapCounts(3, message);
-
-    builder = message.toBuilder().putInt32ToInt32Field(4, 44);
-    assertThat(builder.getInt32ToInt32FieldCount()).isEqualTo(4);
-    assertThat(builder.build().getInt32ToInt32FieldCount()).isEqualTo(4);
-
-    // already present - should be unchanged
-    builder.putInt32ToInt32Field(4, 44);
-    assertThat(builder.getInt32ToInt32FieldCount()).isEqualTo(4);
-  }
-
-  private void assertMapCounts(int expectedCount, TestMapOrBuilder testMapOrBuilder) {
-    assertThat(testMapOrBuilder.getInt32ToInt32FieldCount()).isEqualTo(expectedCount);
-    assertThat(testMapOrBuilder.getInt32ToStringFieldCount()).isEqualTo(expectedCount);
-    assertThat(testMapOrBuilder.getInt32ToBytesFieldCount()).isEqualTo(expectedCount);
-    assertThat(testMapOrBuilder.getInt32ToEnumFieldCount()).isEqualTo(expectedCount);
-    assertThat(testMapOrBuilder.getInt32ToMessageFieldCount()).isEqualTo(expectedCount);
-    assertThat(testMapOrBuilder.getStringToInt32FieldCount()).isEqualTo(expectedCount);
-  }
-
-  @Test
-  public void testGetOrDefault() {
-    TestMap.Builder builder = TestMap.newBuilder();
-    assertMapCounts(0, builder);
-    setMapValuesUsingAccessors(builder);
-    doTestGetOrDefault(builder);
-    doTestGetOrDefault(builder.build());
-  }
-
-  public void doTestGetOrDefault(TestMapOrBuilder testMapOrBuilder) {
-    assertThat(testMapOrBuilder.getInt32ToInt32FieldOrDefault(1, -11)).isEqualTo(11);
-    assertThat(testMapOrBuilder.getInt32ToInt32FieldOrDefault(-1, -11)).isEqualTo(-11);
-
-    assertThat(testMapOrBuilder.getInt32ToStringFieldOrDefault(1, "-11")).isEqualTo("11");
-    assertWithMessage("-11")
-        .that(testMapOrBuilder.getInt32ToStringFieldOrDefault(-1, null))
-        .isNull();
-
-    assertThat(testMapOrBuilder.getInt32ToBytesFieldOrDefault(1, null))
-        .isEqualTo(TestUtil.toBytes("11"));
-    assertThat(testMapOrBuilder.getInt32ToBytesFieldOrDefault(-1, null)).isNull();
-
-    assertThat(testMapOrBuilder.getInt32ToEnumFieldOrDefault(1, null))
-        .isEqualTo(TestMap.EnumValue.FOO);
-    assertThat(testMapOrBuilder.getInt32ToEnumFieldOrDefault(-1, null)).isNull();
-
-    assertThat(testMapOrBuilder.getInt32ToEnumFieldValueOrDefault(2, -1))
-        .isEqualTo(TestMap.EnumValue.BAR.getNumber());
-    assertThat(testMapOrBuilder.getInt32ToEnumFieldValueOrDefault(-1000, -1)).isEqualTo(-1);
-
-    assertThat(testMapOrBuilder.getInt32ToMessageFieldOrDefault(1, null))
-        .isEqualTo(MessageValue.newBuilder().setValue(11).build());
-    assertThat(testMapOrBuilder.getInt32ToMessageFieldOrDefault(-1, null)).isNull();
-
-    assertThat(testMapOrBuilder.getStringToInt32FieldOrDefault("1", -11)).isEqualTo(11);
-    assertThat(testMapOrBuilder.getStringToInt32FieldOrDefault("-1", -11)).isEqualTo(-11);
-
-    try {
-      testMapOrBuilder.getStringToInt32FieldOrDefault(null, -11);
-      assertWithMessage("expected exception").fail();
-    } catch (NullPointerException e) {
-      // expected
-    }
-  }
-
-  @Test
-  public void testGetOrThrow() {
-    TestMap.Builder builder = TestMap.newBuilder();
-    assertMapCounts(0, builder);
-    setMapValuesUsingAccessors(builder);
-    doTestGetOrDefault(builder);
-    doTestGetOrDefault(builder.build());
-  }
-
-  public void doTestGetOrThrow(TestMapOrBuilder testMapOrBuilder) {
-    assertThat(testMapOrBuilder.getInt32ToInt32FieldOrThrow(1)).isEqualTo(11);
-    try {
-      testMapOrBuilder.getInt32ToInt32FieldOrThrow(-1);
-      assertWithMessage("expected exception").fail();
-    } catch (IllegalArgumentException e) {
-      // expected
-    }
-
-    assertThat(testMapOrBuilder.getInt32ToStringFieldOrThrow(1)).isEqualTo("11");
-
-    try {
-      testMapOrBuilder.getInt32ToStringFieldOrThrow(-1);
-      assertWithMessage("expected exception").fail();
-    } catch (IllegalArgumentException e) {
-      // expected
-    }
-
-    assertThat(testMapOrBuilder.getInt32ToBytesFieldOrThrow(1)).isEqualTo(TestUtil.toBytes("11"));
-
-    try {
-      testMapOrBuilder.getInt32ToBytesFieldOrThrow(-1);
-      assertWithMessage("expected exception").fail();
-    } catch (IllegalArgumentException e) {
-      // expected
-    }
-
-    assertThat(testMapOrBuilder.getInt32ToEnumFieldOrThrow(1)).isEqualTo(TestMap.EnumValue.FOO);
-    try {
-      testMapOrBuilder.getInt32ToEnumFieldOrThrow(-1);
-      assertWithMessage("expected exception").fail();
-    } catch (IllegalArgumentException e) {
-      // expected
-    }
-
-    assertThat(testMapOrBuilder.getInt32ToEnumFieldValueOrThrow(2))
-        .isEqualTo(TestMap.EnumValue.BAR.getNumber());
-    try {
-      testMapOrBuilder.getInt32ToEnumFieldValueOrThrow(-1);
-      assertWithMessage("expected exception").fail();
-    } catch (IllegalArgumentException e) {
-      // expected
-    }
-
-    assertThat(testMapOrBuilder.getInt32ToMessageFieldOrThrow(1))
-        .isEqualTo(MessageValue.newBuilder().setValue(11).build());
-    try {
-      testMapOrBuilder.getInt32ToMessageFieldOrThrow(-1);
-      assertWithMessage("expected exception").fail();
-    } catch (IllegalArgumentException e) {
-      // expected
-    }
-
-    assertThat(testMapOrBuilder.getStringToInt32FieldOrThrow("1")).isEqualTo(11);
-    try {
-      testMapOrBuilder.getStringToInt32FieldOrThrow("-1");
-      assertWithMessage("expected exception").fail();
-    } catch (IllegalArgumentException e) {
-      // expected
-    }
-
-    try {
-      testMapOrBuilder.getStringToInt32FieldOrThrow(null);
-      assertWithMessage("expected exception").fail();
-    } catch (NullPointerException e) {
-      // expected
-    }
-  }
-
-  @Test
-  public void testPut() {
-    TestMap.Builder builder = TestMap.newBuilder();
-    builder.putInt32ToInt32Field(1, 11);
-    assertThat(builder.getInt32ToInt32FieldOrThrow(1)).isEqualTo(11);
-
-    builder.putInt32ToStringField(1, "a");
-    assertThat(builder.getInt32ToStringFieldOrThrow(1)).isEqualTo("a");
-    try {
-      builder.putInt32ToStringField(1, null);
-      assertWithMessage("expected exception").fail();
-    } catch (NullPointerException e) {
-      // expected
-    }
-
-    builder.putInt32ToBytesField(1, TestUtil.toBytes("11"));
-    assertThat(builder.getInt32ToBytesFieldOrThrow(1)).isEqualTo(TestUtil.toBytes("11"));
-    try {
-      builder.putInt32ToBytesField(1, null);
-      assertWithMessage("expected exception").fail();
-    } catch (NullPointerException e) {
-      // expected
-    }
-
-    builder.putInt32ToEnumField(1, TestMap.EnumValue.FOO);
-    assertThat(builder.getInt32ToEnumFieldOrThrow(1)).isEqualTo(TestMap.EnumValue.FOO);
-    try {
-      builder.putInt32ToEnumField(1, null);
-      assertWithMessage("expected exception").fail();
-    } catch (NullPointerException e) {
-      // expected
-    }
-
-    builder.putInt32ToEnumFieldValue(1, TestMap.EnumValue.BAR.getNumber());
-    assertThat(builder.getInt32ToEnumFieldValueOrThrow(1))
-        .isEqualTo(TestMap.EnumValue.BAR.getNumber());
-    builder.putInt32ToEnumFieldValue(1, -1);
-    assertThat(builder.getInt32ToEnumFieldValueOrThrow(1)).isEqualTo(-1);
-    assertThat(builder.getInt32ToEnumFieldOrThrow(1)).isEqualTo(TestMap.EnumValue.UNRECOGNIZED);
-
-    builder.putStringToInt32Field("a", 1);
-    assertThat(builder.getStringToInt32FieldOrThrow("a")).isEqualTo(1);
-    try {
-      builder.putStringToInt32Field(null, -1);
-    } catch (NullPointerException e) {
-      // expected
-    }
-  }
-
-  @Test
-  public void testRemove() {
-    TestMap.Builder builder = TestMap.newBuilder();
-    setMapValuesUsingAccessors(builder);
-    assertThat(builder.getInt32ToInt32FieldOrThrow(1)).isEqualTo(11);
-    for (int times = 0; times < 2; times++) {
-      builder.removeInt32ToInt32Field(1);
-      assertThat(builder.getInt32ToInt32FieldOrDefault(1, -1)).isEqualTo(-1);
-    }
-
-    assertThat(builder.getInt32ToStringFieldOrThrow(1)).isEqualTo("11");
-    for (int times = 0; times < 2; times++) {
-      builder.removeInt32ToStringField(1);
-      assertThat(builder.getInt32ToStringFieldOrDefault(1, null)).isNull();
-    }
-
-    assertThat(builder.getInt32ToBytesFieldOrThrow(1)).isEqualTo(TestUtil.toBytes("11"));
-    for (int times = 0; times < 2; times++) {
-      builder.removeInt32ToBytesField(1);
-      assertThat(builder.getInt32ToBytesFieldOrDefault(1, null)).isNull();
-    }
-
-    assertThat(builder.getInt32ToEnumFieldOrThrow(1)).isEqualTo(TestMap.EnumValue.FOO);
-    for (int times = 0; times < 2; times++) {
-      builder.removeInt32ToEnumField(1);
-      assertThat(builder.getInt32ToEnumFieldOrDefault(1, null)).isNull();
-    }
-
-    assertThat(builder.getStringToInt32FieldOrThrow("1")).isEqualTo(11);
-    for (int times = 0; times < 2; times++) {
-      builder.removeStringToInt32Field("1");
-      assertThat(builder.getStringToInt32FieldOrDefault("1", -1)).isEqualTo(-1);
-    }
-
-    try {
-      builder.removeStringToInt32Field(null);
-      assertWithMessage("expected exception").fail();
-    } catch (NullPointerException e) {
-      // expected
-    }
-  }
-
-  @Test
-  public void testReservedWordsFieldNames() {
-    ReservedAsMapField unused1 = ReservedAsMapField.getDefaultInstance();
-    ReservedAsMapFieldWithEnumValue unused2 = ReservedAsMapFieldWithEnumValue.getDefaultInstance();
-  }
-
-  @Test
-  public void testDeterministicSerialization() throws Exception {
-    TestMap.Builder builder = TestMap.newBuilder();
-    // int32->int32
-    builder.putInt32ToInt32Field(5, 1);
-    builder.putInt32ToInt32Field(1, 1);
-    builder.putInt32ToInt32Field(4, 1);
-    builder.putInt32ToInt32Field(-2, 1);
-    builder.putInt32ToInt32Field(0, 1);
-
-    // uint32->int32
-    builder.putUint32ToInt32Field(5, 1);
-    builder.putUint32ToInt32Field(1, 1);
-    builder.putUint32ToInt32Field(4, 1);
-    builder.putUint32ToInt32Field(-2, 1);
-    builder.putUint32ToInt32Field(0, 1);
-
-    // int64->int32
-    builder.putInt64ToInt32Field(5L, 1);
-    builder.putInt64ToInt32Field(1L, 1);
-    builder.putInt64ToInt32Field(4L, 1);
-    builder.putInt64ToInt32Field(-2L, 1);
-    builder.putInt64ToInt32Field(0L, 1);
-
-    // string->int32
-    builder.putStringToInt32Field("baz", 1);
-    builder.putStringToInt32Field("foo", 1);
-    builder.putStringToInt32Field("bar", 1);
-    builder.putStringToInt32Field("", 1);
-    builder.putStringToInt32Field("hello", 1);
-    builder.putStringToInt32Field("world", 1);
-
-    TestMap message = builder.build();
-    byte[] serialized = new byte[message.getSerializedSize()];
-    CodedOutputStream output = CodedOutputStream.newInstance(serialized);
-    output.useDeterministicSerialization();
-    message.writeTo(output);
-    output.flush();
-
-    CodedInputStream input = CodedInputStream.newInstance(serialized);
-    List<Integer> int32Keys = new ArrayList<>();
-    List<Integer> uint32Keys = new ArrayList<>();
-    List<Long> int64Keys = new ArrayList<>();
-    List<String> stringKeys = new ArrayList<>();
-    int tag;
-    while (true) {
-      tag = input.readTag();
-      if (tag == 0) {
-        break;
-      }
-      int length = input.readRawVarint32();
-      int oldLimit = input.pushLimit(length);
-      switch (WireFormat.getTagFieldNumber(tag)) {
-        case TestMap.STRING_TO_INT32_FIELD_FIELD_NUMBER:
-          stringKeys.add(readMapStringKey(input));
-          break;
-        case TestMap.INT32_TO_INT32_FIELD_FIELD_NUMBER:
-          int32Keys.add(readMapIntegerKey(input));
-          break;
-        case TestMap.UINT32_TO_INT32_FIELD_FIELD_NUMBER:
-          uint32Keys.add(readMapIntegerKey(input));
-          break;
-        case TestMap.INT64_TO_INT32_FIELD_FIELD_NUMBER:
-          int64Keys.add(readMapLongKey(input));
-          break;
-        default:
-          assertWithMessage("Unexpected fields.").fail();
-      }
-      input.popLimit(oldLimit);
-    }
-    assertThat(int32Keys).containsExactly(-2, 0, 1, 4, 5).inOrder();
-    assertThat(uint32Keys).containsExactly(-2, 0, 1, 4, 5).inOrder();
-    assertThat(int64Keys).containsExactly(-2L, 0L, 1L, 4L, 5L).inOrder();
-    assertThat(stringKeys).containsExactly("", "bar", "baz", "foo", "hello", "world").inOrder();
-  }
-
-  @Test
-  public void testInitFromPartialDynamicMessage() {
-    FieldDescriptor fieldDescriptor =
-        TestMap.getDescriptor().findFieldByNumber(TestMap.INT32_TO_MESSAGE_FIELD_FIELD_NUMBER);
-    Descriptor mapEntryType = fieldDescriptor.getMessageType();
-    FieldDescriptor keyField = mapEntryType.findFieldByNumber(1);
-    FieldDescriptor valueField = mapEntryType.findFieldByNumber(2);
-    DynamicMessage dynamicMessage =
-        DynamicMessage.newBuilder(TestMap.getDescriptor())
-            .addRepeatedField(
-                fieldDescriptor,
-                DynamicMessage.newBuilder(mapEntryType)
-                    .setField(keyField, 10)
-                    .setField(valueField, TestMap.MessageValue.newBuilder().setValue(10).build())
-                    .build())
-            .build();
-    TestMap message = TestMap.newBuilder().mergeFrom(dynamicMessage).build();
-    assertThat(message.getInt32ToMessageFieldMap())
-        .containsEntry(10, TestMap.MessageValue.newBuilder().setValue(10).build());
-  }
-
-  @Test
-  public void testInitFromFullyDynamicMessage() {
-    FieldDescriptor fieldDescriptor =
-        TestMap.getDescriptor().findFieldByNumber(TestMap.INT32_TO_MESSAGE_FIELD_FIELD_NUMBER);
-    Descriptor mapEntryType = fieldDescriptor.getMessageType();
-    FieldDescriptor keyField = mapEntryType.findFieldByNumber(1);
-    FieldDescriptor valueField = mapEntryType.findFieldByNumber(2);
-    DynamicMessage dynamicMessage =
-        DynamicMessage.newBuilder(TestMap.getDescriptor())
-            .addRepeatedField(
-                fieldDescriptor,
-                DynamicMessage.newBuilder(mapEntryType)
-                    .setField(keyField, 10)
-                    .setField(
-                        valueField,
-                        DynamicMessage.newBuilder(TestMap.MessageValue.getDescriptor())
-                            .setField(
-                                TestMap.MessageValue.getDescriptor().findFieldByName("value"), 10)
-                            .build())
-                    .build())
-            .build();
-    TestMap message = TestMap.newBuilder().mergeFrom(dynamicMessage).build();
-    assertThat(message.getInt32ToMessageFieldMap())
-        .containsEntry(10, TestMap.MessageValue.newBuilder().setValue(10).build());
-  }
-
-  private int readMapIntegerKey(CodedInputStream input) throws IOException {
-    int tag = input.readTag();
-    assertThat(tag).isEqualTo(WireFormat.makeTag(1, WireFormat.WIRETYPE_VARINT));
-    int ret = input.readInt32();
-    // skip the value field.
-    input.skipField(input.readTag());
-    assertThat(input.isAtEnd()).isTrue();
-    return ret;
-  }
-
-  private long readMapLongKey(CodedInputStream input) throws IOException {
-    int tag = input.readTag();
-    assertThat(tag).isEqualTo(WireFormat.makeTag(1, WireFormat.WIRETYPE_VARINT));
-    long ret = input.readInt64();
-    // skip the value field.
-    input.skipField(input.readTag());
-    assertThat(input.isAtEnd()).isTrue();
-    return ret;
-  }
-
-  private String readMapStringKey(CodedInputStream input) throws IOException {
-    int tag = input.readTag();
-    assertThat(tag).isEqualTo(WireFormat.makeTag(1, WireFormat.WIRETYPE_LENGTH_DELIMITED));
-    String ret = input.readString();
-    // skip the value field.
-    input.skipField(input.readTag());
-    assertThat(input.isAtEnd()).isTrue();
-    return ret;
-  }
-
-  private static <K, V> Map<K, V> newMap(K key1, V value1) {
-    Map<K, V> map = new HashMap<>();
-    map.put(key1, value1);
-    return map;
-  }
-
-  private static <K, V> Map<K, V> newMap(K key1, V value1, K key2, V value2) {
-    Map<K, V> map = new HashMap<>();
-    map.put(key1, value1);
-    map.put(key2, value2);
-    return map;
-  }
-
-  private static <K, V> Map<K, V> newMap(K key1, V value1, K key2, V value2, K key3, V value3) {
-    Map<K, V> map = new HashMap<>();
-    map.put(key1, value1);
-    map.put(key2, value2);
-    map.put(key3, value3);
-    return map;
-  }
-
-  @Test
-  public void testMap_withNulls() {
-    TestMap.Builder builder = TestMap.newBuilder();
-
-    try {
-      builder.putStringToInt32Field(null, 3);
-      assertWithMessage("expected exception").fail();
-    } catch (NullPointerException expected) {
-    }
-
-    try {
-      builder.putAllStringToInt32Field(newMap(null, 3, "hi", 4));
-      assertWithMessage("expected exception").fail();
-    } catch (NullPointerException expected) {
-    }
-
-    try {
-      builder.putInt32ToMessageField(3, null);
-      assertWithMessage("expected exception").fail();
-    } catch (NullPointerException expected) {
-    }
-
-    try {
-      builder.putAllInt32ToMessageField(MapTest.<Integer, MessageValue>newMap(4, null, 5, null));
-      assertWithMessage("expected exception").fail();
-    } catch (NullPointerException expected) {
-    }
-
-    try {
-      builder.putAllInt32ToMessageField(null);
-      assertWithMessage("expected exception").fail();
-    } catch (NullPointerException expected) {
-    }
-
-    assertThat(builder.build().toByteArray()).isEqualTo(new byte[0]);
-  }
-
-  @Test
-  // https://github.com/protocolbuffers/protobuf/issues/9785
-  public void testContainer() {
-    FieldDescriptor field = MapContainer.getDescriptor().findFieldByName("my_map");
-    Descriptor entryDescriptor = field.getMessageType();
-    FieldDescriptor valueDescriptor = entryDescriptor.findFieldByName("value");
-    Message.Builder builder = MapContainer.newBuilder().newBuilderForField(field);
-    try {
-      builder.setField(valueDescriptor, null);
-      fail("Allowed null field value");
-    } catch (NullPointerException expected) {
-      assertThat(expected).hasMessageThat().isNotNull();
-    }
-  }
-}
diff --git a/libs/protobuf/java/core/src/test/java/com/google/protobuf/MessageTest.java b/libs/protobuf/java/core/src/test/java/com/google/protobuf/MessageTest.java
deleted file mode 100644
index 86e077e..0000000
--- a/libs/protobuf/java/core/src/test/java/com/google/protobuf/MessageTest.java
+++ /dev/null
@@ -1,413 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.common.truth.Truth.assertThat;
-import static com.google.common.truth.Truth.assertWithMessage;
-
-import protobuf_unittest.UnittestProto.ForeignMessage;
-import protobuf_unittest.UnittestProto.TestAllExtensions;
-import protobuf_unittest.UnittestProto.TestAllTypes;
-import protobuf_unittest.UnittestProto.TestRequired;
-import protobuf_unittest.UnittestProto.TestRequiredForeign;
-import java.util.List;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-/** Misc. unit tests for message operations that apply to both generated and dynamic messages. */
-@RunWith(JUnit4.class)
-public class MessageTest {
-  // =================================================================
-  // Message-merging tests.
-
-  static final TestAllTypes MERGE_SOURCE =
-      TestAllTypes.newBuilder()
-          .setOptionalInt32(1)
-          .setOptionalString("foo")
-          .setOptionalForeignMessage(ForeignMessage.getDefaultInstance())
-          .addRepeatedString("bar")
-          .build();
-
-  static final TestAllTypes MERGE_DEST =
-      TestAllTypes.newBuilder()
-          .setOptionalInt64(2)
-          .setOptionalString("baz")
-          .setOptionalForeignMessage(ForeignMessage.newBuilder().setC(3).build())
-          .addRepeatedString("qux")
-          .build();
-
-  static final String MERGE_RESULT_TEXT =
-      ""
-          + "optional_int32: 1\n"
-          + "optional_int64: 2\n"
-          + "optional_string: \"foo\"\n"
-          + "optional_foreign_message {\n"
-          + "  c: 3\n"
-          + "}\n"
-          + "repeated_string: \"qux\"\n"
-          + "repeated_string: \"bar\"\n";
-
-  @Test
-  public void testParsingWithNullExtensionRegistry() throws Exception {
-    try {
-      TestAllTypes.parseFrom(new byte[] {}, null);
-      assertWithMessage("Expected exception").fail();
-    } catch (NullPointerException expected) {
-    }
-  }
-
-  @Test
-  public void testMergeFrom() throws Exception {
-    TestAllTypes result = TestAllTypes.newBuilder(MERGE_DEST).mergeFrom(MERGE_SOURCE).build();
-
-    assertThat(result.toString()).isEqualTo(MERGE_RESULT_TEXT);
-  }
-
-  /**
-   * Test merging a DynamicMessage into a GeneratedMessage. As long as they have the same
-   * descriptor, this should work, but it is an entirely different code path.
-   */
-  @Test
-  public void testMergeFromDynamic() throws Exception {
-    TestAllTypes result =
-        TestAllTypes.newBuilder(MERGE_DEST)
-            .mergeFrom(DynamicMessage.newBuilder(MERGE_SOURCE).build())
-            .build();
-
-    assertThat(result.toString()).isEqualTo(MERGE_RESULT_TEXT);
-  }
-
-  /** Test merging two DynamicMessages. */
-  @Test
-  public void testDynamicMergeFrom() throws Exception {
-    DynamicMessage result =
-        DynamicMessage.newBuilder(MERGE_DEST)
-            .mergeFrom(DynamicMessage.newBuilder(MERGE_SOURCE).build())
-            .build();
-
-    assertThat(result.toString()).isEqualTo(MERGE_RESULT_TEXT);
-  }
-
-  // =================================================================
-  // Required-field-related tests.
-
-  private static final TestRequired TEST_REQUIRED_UNINITIALIZED = TestRequired.getDefaultInstance();
-  private static final TestRequired TEST_REQUIRED_INITIALIZED =
-      TestRequired.newBuilder().setA(1).setB(2).setC(3).build();
-
-  @Test
-  public void testRequired() throws Exception {
-    TestRequired.Builder builder = TestRequired.newBuilder();
-
-    assertThat(builder.isInitialized()).isFalse();
-    builder.setA(1);
-    assertThat(builder.isInitialized()).isFalse();
-    builder.setB(1);
-    assertThat(builder.isInitialized()).isFalse();
-    builder.setC(1);
-    assertThat(builder.isInitialized()).isTrue();
-  }
-
-  @Test
-  public void testRequiredForeign() throws Exception {
-    TestRequiredForeign.Builder builder = TestRequiredForeign.newBuilder();
-
-    assertThat(builder.isInitialized()).isTrue();
-
-    builder.setOptionalMessage(TEST_REQUIRED_UNINITIALIZED);
-    assertThat(builder.isInitialized()).isFalse();
-
-    builder.setOptionalMessage(TEST_REQUIRED_INITIALIZED);
-    assertThat(builder.isInitialized()).isTrue();
-
-    builder.addRepeatedMessage(TEST_REQUIRED_UNINITIALIZED);
-    assertThat(builder.isInitialized()).isFalse();
-
-    builder.setRepeatedMessage(0, TEST_REQUIRED_INITIALIZED);
-    assertThat(builder.isInitialized()).isTrue();
-  }
-
-  @Test
-  public void testRequiredExtension() throws Exception {
-    TestAllExtensions.Builder builder = TestAllExtensions.newBuilder();
-
-    assertThat(builder.isInitialized()).isTrue();
-
-    builder.setExtension(TestRequired.single, TEST_REQUIRED_UNINITIALIZED);
-    assertThat(builder.isInitialized()).isFalse();
-
-    builder.setExtension(TestRequired.single, TEST_REQUIRED_INITIALIZED);
-    assertThat(builder.isInitialized()).isTrue();
-
-    builder.addExtension(TestRequired.multi, TEST_REQUIRED_UNINITIALIZED);
-    assertThat(builder.isInitialized()).isFalse();
-
-    builder.setExtension(TestRequired.multi, 0, TEST_REQUIRED_INITIALIZED);
-    assertThat(builder.isInitialized()).isTrue();
-  }
-
-  @Test
-  public void testRequiredDynamic() throws Exception {
-    Descriptors.Descriptor descriptor = TestRequired.getDescriptor();
-    DynamicMessage.Builder builder = DynamicMessage.newBuilder(descriptor);
-
-    assertThat(builder.isInitialized()).isFalse();
-    builder.setField(descriptor.findFieldByName("a"), 1);
-    assertThat(builder.isInitialized()).isFalse();
-    builder.setField(descriptor.findFieldByName("b"), 1);
-    assertThat(builder.isInitialized()).isFalse();
-    builder.setField(descriptor.findFieldByName("c"), 1);
-    assertThat(builder.isInitialized()).isTrue();
-  }
-
-  @Test
-  public void testRequiredDynamicForeign() throws Exception {
-    Descriptors.Descriptor descriptor = TestRequiredForeign.getDescriptor();
-    DynamicMessage.Builder builder = DynamicMessage.newBuilder(descriptor);
-
-    assertThat(builder.isInitialized()).isTrue();
-
-    builder.setField(descriptor.findFieldByName("optional_message"), TEST_REQUIRED_UNINITIALIZED);
-    assertThat(builder.isInitialized()).isFalse();
-
-    builder.setField(descriptor.findFieldByName("optional_message"), TEST_REQUIRED_INITIALIZED);
-    assertThat(builder.isInitialized()).isTrue();
-
-    builder.addRepeatedField(
-        descriptor.findFieldByName("repeated_message"), TEST_REQUIRED_UNINITIALIZED);
-    assertThat(builder.isInitialized()).isFalse();
-
-    builder.setRepeatedField(
-        descriptor.findFieldByName("repeated_message"), 0, TEST_REQUIRED_INITIALIZED);
-    assertThat(builder.isInitialized()).isTrue();
-  }
-
-  @Test
-  public void testUninitializedException() throws Exception {
-    try {
-      TestRequired.newBuilder().build();
-      assertWithMessage("Should have thrown an exception.").fail();
-    } catch (UninitializedMessageException e) {
-      assertThat(e).hasMessageThat().isEqualTo("Message missing required fields: a, b, c");
-    }
-  }
-
-  @Test
-  public void testBuildPartial() throws Exception {
-    // We're mostly testing that no exception is thrown.
-    TestRequired message = TestRequired.newBuilder().buildPartial();
-    assertThat(message.isInitialized()).isFalse();
-  }
-
-  @Test
-  public void testNestedUninitializedException() throws Exception {
-    try {
-      TestRequiredForeign.newBuilder()
-          .setOptionalMessage(TEST_REQUIRED_UNINITIALIZED)
-          .addRepeatedMessage(TEST_REQUIRED_UNINITIALIZED)
-          .addRepeatedMessage(TEST_REQUIRED_UNINITIALIZED)
-          .build();
-      assertWithMessage("Should have thrown an exception.").fail();
-    } catch (UninitializedMessageException e) {
-      assertThat(e)
-          .hasMessageThat()
-          .isEqualTo(
-              "Message missing required fields: "
-                  + "optional_message.a, "
-                  + "optional_message.b, "
-                  + "optional_message.c, "
-                  + "repeated_message[0].a, "
-                  + "repeated_message[0].b, "
-                  + "repeated_message[0].c, "
-                  + "repeated_message[1].a, "
-                  + "repeated_message[1].b, "
-                  + "repeated_message[1].c");
-    }
-  }
-
-  @Test
-  public void testBuildNestedPartial() throws Exception {
-    // We're mostly testing that no exception is thrown.
-    TestRequiredForeign message =
-        TestRequiredForeign.newBuilder()
-            .setOptionalMessage(TEST_REQUIRED_UNINITIALIZED)
-            .addRepeatedMessage(TEST_REQUIRED_UNINITIALIZED)
-            .addRepeatedMessage(TEST_REQUIRED_UNINITIALIZED)
-            .buildPartial();
-    assertThat(message.isInitialized()).isFalse();
-  }
-
-  @Test
-  public void testParseUnititialized() throws Exception {
-    try {
-      TestRequired.parseFrom(ByteString.EMPTY);
-      assertWithMessage("Should have thrown an exception.").fail();
-    } catch (InvalidProtocolBufferException e) {
-      assertThat(e).hasMessageThat().isEqualTo("Message missing required fields: a, b, c");
-    }
-  }
-
-  @Test
-  public void testParseNestedUnititialized() throws Exception {
-    ByteString data =
-        TestRequiredForeign.newBuilder()
-            .setOptionalMessage(TEST_REQUIRED_UNINITIALIZED)
-            .addRepeatedMessage(TEST_REQUIRED_UNINITIALIZED)
-            .addRepeatedMessage(TEST_REQUIRED_UNINITIALIZED)
-            .buildPartial()
-            .toByteString();
-
-    try {
-      TestRequiredForeign.parseFrom(data);
-      assertWithMessage("Should have thrown an exception.").fail();
-    } catch (InvalidProtocolBufferException e) {
-      assertThat(e)
-          .hasMessageThat()
-          .isEqualTo(
-              "Message missing required fields: "
-                  + "optional_message.a, "
-                  + "optional_message.b, "
-                  + "optional_message.c, "
-                  + "repeated_message[0].a, "
-                  + "repeated_message[0].b, "
-                  + "repeated_message[0].c, "
-                  + "repeated_message[1].a, "
-                  + "repeated_message[1].b, "
-                  + "repeated_message[1].c");
-    }
-  }
-
-  @Test
-  public void testDynamicUninitializedException() throws Exception {
-    try {
-      DynamicMessage.newBuilder(TestRequired.getDescriptor()).build();
-      assertWithMessage("Should have thrown an exception.").fail();
-    } catch (UninitializedMessageException e) {
-      assertThat(e).hasMessageThat().isEqualTo("Message missing required fields: a, b, c");
-    }
-  }
-
-  @Test
-  public void testDynamicBuildPartial() throws Exception {
-    // We're mostly testing that no exception is thrown.
-    DynamicMessage message = DynamicMessage.newBuilder(TestRequired.getDescriptor()).buildPartial();
-    assertThat(message.isInitialized()).isFalse();
-  }
-
-  @Test
-  public void testDynamicParseUnititialized() throws Exception {
-    try {
-      Descriptors.Descriptor descriptor = TestRequired.getDescriptor();
-      DynamicMessage.parseFrom(descriptor, ByteString.EMPTY);
-      assertWithMessage("Should have thrown an exception.").fail();
-    } catch (InvalidProtocolBufferException e) {
-      assertThat(e).hasMessageThat().isEqualTo("Message missing required fields: a, b, c");
-    }
-  }
-
-  /** Test reading unset repeated message from DynamicMessage. */
-  @Test
-  public void testDynamicRepeatedMessageNull() throws Exception {
-    Descriptors.Descriptor unused = TestRequired.getDescriptor();
-    DynamicMessage result =
-        DynamicMessage.newBuilder(TestAllTypes.getDescriptor())
-            .mergeFrom(DynamicMessage.newBuilder(MERGE_SOURCE).build())
-            .build();
-
-    assertThat(
-            result.getField(
-                result.getDescriptorForType().findFieldByName("repeated_foreign_message")))
-        .isInstanceOf(List.class);
-    assertThat(
-            result.getRepeatedFieldCount(
-                result.getDescriptorForType().findFieldByName("repeated_foreign_message")))
-        .isEqualTo(0);
-  }
-
-  /** Test reading repeated message from DynamicMessage. */
-  @Test
-  public void testDynamicRepeatedMessageNotNull() throws Exception {
-    TestAllTypes repeatedNested =
-        TestAllTypes.newBuilder()
-            .setOptionalInt32(1)
-            .setOptionalString("foo")
-            .setOptionalForeignMessage(ForeignMessage.getDefaultInstance())
-            .addRepeatedString("bar")
-            .addRepeatedForeignMessage(ForeignMessage.getDefaultInstance())
-            .addRepeatedForeignMessage(ForeignMessage.getDefaultInstance())
-            .build();
-    Descriptors.Descriptor unused = TestRequired.getDescriptor();
-    DynamicMessage result =
-        DynamicMessage.newBuilder(TestAllTypes.getDescriptor())
-            .mergeFrom(DynamicMessage.newBuilder(repeatedNested).build())
-            .build();
-
-    assertThat(
-            result.getField(
-                result.getDescriptorForType().findFieldByName("repeated_foreign_message")))
-        .isInstanceOf(List.class);
-    assertThat(
-            result.getRepeatedFieldCount(
-                result.getDescriptorForType().findFieldByName("repeated_foreign_message")))
-        .isEqualTo(2);
-  }
-
-  @Test
-  public void testPreservesFloatingPointNegative0() throws Exception {
-    proto3_unittest.UnittestProto3.TestAllTypes message =
-        proto3_unittest.UnittestProto3.TestAllTypes.newBuilder()
-            .setOptionalFloat(-0.0f)
-            .setOptionalDouble(-0.0)
-            .build();
-    assertThat(
-            proto3_unittest.UnittestProto3.TestAllTypes.parseFrom(
-                message.toByteString(), ExtensionRegistry.getEmptyRegistry()))
-        .isEqualTo(message);
-  }
-
-  @Test
-  public void testNegative0FloatingPointEquality() throws Exception {
-    // Like Double#equals and Float#equals, we treat -0.0 as not being equal to +0.0 even though
-    // IEEE 754 mandates that they are equivalent. This test asserts that behavior.
-    proto3_unittest.UnittestProto3.TestAllTypes message1 =
-        proto3_unittest.UnittestProto3.TestAllTypes.newBuilder()
-            .setOptionalFloat(-0.0f)
-            .setOptionalDouble(-0.0)
-            .build();
-    proto3_unittest.UnittestProto3.TestAllTypes message2 =
-        proto3_unittest.UnittestProto3.TestAllTypes.newBuilder()
-            .setOptionalFloat(0.0f)
-            .setOptionalDouble(0.0)
-            .build();
-    assertThat(message1).isNotEqualTo(message2);
-  }
-}
diff --git a/libs/protobuf/java/core/src/test/java/com/google/protobuf/NestedBuildersTest.java b/libs/protobuf/java/core/src/test/java/com/google/protobuf/NestedBuildersTest.java
deleted file mode 100644
index a3637f9..0000000
--- a/libs/protobuf/java/core/src/test/java/com/google/protobuf/NestedBuildersTest.java
+++ /dev/null
@@ -1,189 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import protobuf_unittest.Engine;
-import protobuf_unittest.TimingBelt;
-import protobuf_unittest.Vehicle;
-import protobuf_unittest.Wheel;
-import java.util.ArrayList;
-import java.util.List;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-/**
- * Test cases that exercise end-to-end use cases involving {@link SingleFieldBuilder} and {@link
- * RepeatedFieldBuilder}.
- */
-@RunWith(JUnit4.class)
-public class NestedBuildersTest {
-
-  @Test
-  public void test3LayerPropagationWithIntermediateClear() {
-    Vehicle.Builder vehicleBuilder = Vehicle.newBuilder();
-    vehicleBuilder.getEngineBuilder().getTimingBeltBuilder();
-
-    // This step detaches the TimingBelt.Builder (though it leaves a SingleFieldBuilder in place)
-    vehicleBuilder.getEngineBuilder().clear();
-
-    // These steps build the middle and top level messages, it used to leave the vestigial
-    // TimingBelt.Builder in a state where further changes didn't propagate anymore
-    Object unused = vehicleBuilder.getEngineBuilder().build();
-    unused = vehicleBuilder.build();
-
-    TimingBelt expected = TimingBelt.newBuilder().setNumberOfTeeth(124).build();
-    vehicleBuilder.getEngineBuilder().setTimingBelt(expected);
-    // Testing that b/254158939 is fixed. It used to be that the setTimingBelt call above didn't
-    // propagate a change notification and the call below would return a stale version of the timing
-    // belt.
-    assertThat(vehicleBuilder.getEngine().getTimingBelt()).isEqualTo(expected);
-  }
-  
-  @Test
-  public void testMessagesAndBuilders() {
-    Vehicle.Builder vehicleBuilder = Vehicle.newBuilder();
-    vehicleBuilder.addWheelBuilder().setRadius(4).setWidth(1);
-    vehicleBuilder.addWheelBuilder().setRadius(4).setWidth(2);
-    vehicleBuilder.addWheelBuilder().setRadius(4).setWidth(3);
-    vehicleBuilder.addWheelBuilder().setRadius(4).setWidth(4);
-    vehicleBuilder.getEngineBuilder().setLiters(10);
-
-    Vehicle vehicle = vehicleBuilder.build();
-    assertThat(vehicle.getWheelCount()).isEqualTo(4);
-    for (int i = 0; i < 4; i++) {
-      Wheel wheel = vehicle.getWheel(i);
-      assertThat(wheel.getRadius()).isEqualTo(4);
-      assertThat(wheel.getWidth()).isEqualTo(i + 1);
-    }
-    assertThat(vehicle.getEngine().getLiters()).isEqualTo(10);
-
-    for (int i = 0; i < 4; i++) {
-      vehicleBuilder.getWheelBuilder(i).setRadius(5).setWidth(i + 10);
-    }
-    Engine.Builder engineBuilder = vehicleBuilder.getEngineBuilder().setLiters(20);
-
-    vehicle = vehicleBuilder.build();
-    for (int i = 0; i < 4; i++) {
-      Wheel wheel = vehicle.getWheel(i);
-      assertThat(wheel.getRadius()).isEqualTo(5);
-      assertThat(wheel.getWidth()).isEqualTo(i + 10);
-    }
-    assertThat(vehicle.getEngine().getLiters()).isEqualTo(20);
-    assertThat(vehicle.hasEngine()).isTrue();
-
-    engineBuilder.setLiters(50);
-    assertThat(vehicleBuilder.getEngine().getLiters()).isEqualTo(50);
-  }
-
-  @Test
-  public void testMessagesAreCached() {
-    Vehicle.Builder vehicleBuilder = Vehicle.newBuilder();
-    vehicleBuilder.addWheelBuilder().setRadius(1).setWidth(2);
-    vehicleBuilder.addWheelBuilder().setRadius(3).setWidth(4);
-    vehicleBuilder.addWheelBuilder().setRadius(5).setWidth(6);
-    vehicleBuilder.addWheelBuilder().setRadius(7).setWidth(8);
-
-    // Make sure messages are cached.
-    List<Wheel> wheels = new ArrayList<Wheel>(vehicleBuilder.getWheelList());
-    for (int i = 0; i < wheels.size(); i++) {
-      assertThat(wheels.get(i)).isSameInstanceAs(vehicleBuilder.getWheel(i));
-    }
-
-    // Now get builders and check they didn't change.
-    for (int i = 0; i < wheels.size(); i++) {
-      vehicleBuilder.getWheel(i);
-    }
-    for (int i = 0; i < wheels.size(); i++) {
-      assertThat(wheels.get(i)).isSameInstanceAs(vehicleBuilder.getWheel(i));
-    }
-
-    // Change just one
-    vehicleBuilder.getWheelBuilder(3).setRadius(20).setWidth(20);
-
-    // Now get wheels and check that only that one changed
-    for (int i = 0; i < wheels.size(); i++) {
-      if (i < 3) {
-        assertThat(wheels.get(i)).isSameInstanceAs(vehicleBuilder.getWheel(i));
-      } else {
-        assertThat(wheels.get(i)).isNotSameInstanceAs(vehicleBuilder.getWheel(i));
-      }
-    }
-  }
-
-  @Test
-  public void testRemove_WithNestedBuilders() {
-    Vehicle.Builder vehicleBuilder = Vehicle.newBuilder();
-    vehicleBuilder.addWheelBuilder().setRadius(1).setWidth(1);
-    vehicleBuilder.addWheelBuilder().setRadius(2).setWidth(2);
-    vehicleBuilder.removeWheel(0);
-
-    assertThat(vehicleBuilder.getWheelCount()).isEqualTo(1);
-    assertThat(vehicleBuilder.getWheel(0).getRadius()).isEqualTo(2);
-  }
-
-  @Test
-  public void testRemove_WithNestedMessages() {
-    Vehicle.Builder vehicleBuilder = Vehicle.newBuilder();
-    vehicleBuilder.addWheel(Wheel.newBuilder().setRadius(1).setWidth(1));
-    vehicleBuilder.addWheel(Wheel.newBuilder().setRadius(2).setWidth(2));
-    vehicleBuilder.removeWheel(0);
-
-    assertThat(vehicleBuilder.getWheelCount()).isEqualTo(1);
-    assertThat(vehicleBuilder.getWheel(0).getRadius()).isEqualTo(2);
-  }
-
-  @Test
-  public void testMerge() {
-    Vehicle vehicle1 =
-        Vehicle.newBuilder()
-            .addWheel(Wheel.newBuilder().setRadius(1).build())
-            .addWheel(Wheel.newBuilder().setRadius(2).build())
-            .build();
-
-    Vehicle vehicle2 = Vehicle.newBuilder().mergeFrom(vehicle1).build();
-    // List should be the same -- no allocation
-    assertThat(vehicle1.getWheelList()).isSameInstanceAs(vehicle2.getWheelList());
-
-    Vehicle vehicle3 = vehicle1.toBuilder().build();
-    assertThat(vehicle1.getWheelList()).isSameInstanceAs(vehicle3.getWheelList());
-  }
-
-  @Test
-  public void testGettingBuilderMarksFieldAsHaving() {
-    Vehicle.Builder vehicleBuilder = Vehicle.newBuilder();
-    vehicleBuilder.getEngineBuilder();
-    Vehicle vehicle = vehicleBuilder.buildPartial();
-    assertThat(vehicle.hasEngine()).isTrue();
-  }
-}
diff --git a/libs/protobuf/java/core/src/test/java/com/google/protobuf/NioByteStringTest.java b/libs/protobuf/java/core/src/test/java/com/google/protobuf/NioByteStringTest.java
deleted file mode 100644
index 1f14271..0000000
--- a/libs/protobuf/java/core/src/test/java/com/google/protobuf/NioByteStringTest.java
+++ /dev/null
@@ -1,746 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.common.truth.Truth.assertThat;
-import static com.google.common.truth.Truth.assertWithMessage;
-import static com.google.protobuf.Internal.UTF_8;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.EOFException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
-import java.nio.BufferOverflowException;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import java.util.List;
-import java.util.NoSuchElementException;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-/** Tests for {@link NioByteString}. */
-@RunWith(JUnit4.class)
-public class NioByteStringTest {
-  private static final ByteString EMPTY = new NioByteString(ByteBuffer.wrap(new byte[0]));
-  private static final String CLASSNAME = NioByteString.class.getSimpleName();
-  private static final byte[] BYTES = ByteStringTest.getTestBytes(1234, 11337766L);
-  private static final int EXPECTED_HASH = ByteString.wrap(BYTES).hashCode();
-
-  private final ByteBuffer backingBuffer = ByteBuffer.wrap(BYTES.clone());
-  private final ByteString testString = new NioByteString(backingBuffer);
-
-  @Test
-  public void testExpectedType() {
-    String actualClassName = getActualClassName(testString);
-    assertWithMessage("%s should match type exactly", CLASSNAME)
-        .that(CLASSNAME)
-        .isEqualTo(actualClassName);
-  }
-
-  protected String getActualClassName(Object object) {
-    String actualClassName = object.getClass().getName();
-    actualClassName = actualClassName.substring(actualClassName.lastIndexOf('.') + 1);
-    return actualClassName;
-  }
-
-  @Test
-  public void testByteAt() {
-    boolean stillEqual = true;
-    for (int i = 0; stillEqual && i < BYTES.length; ++i) {
-      stillEqual = (BYTES[i] == testString.byteAt(i));
-    }
-    assertWithMessage("%s must capture the right bytes", CLASSNAME).that(stillEqual).isTrue();
-  }
-
-  @Test
-  public void testByteIterator() {
-    boolean stillEqual = true;
-    ByteString.ByteIterator iter = testString.iterator();
-    for (int i = 0; stillEqual && i < BYTES.length; ++i) {
-      stillEqual = (iter.hasNext() && BYTES[i] == iter.nextByte());
-    }
-    assertWithMessage("%s must capture the right bytes", CLASSNAME).that(stillEqual).isTrue();
-    assertWithMessage("%s must have exhausted the iterator", CLASSNAME)
-        .that(iter.hasNext())
-        .isFalse();
-
-    try {
-      iter.nextByte();
-      assertWithMessage("Should have thrown an exception.").fail();
-    } catch (NoSuchElementException e) {
-      // This is success
-    }
-  }
-
-  @Test
-  public void testByteIterable() {
-    boolean stillEqual = true;
-    int j = 0;
-    for (byte quantum : testString) {
-      stillEqual = (BYTES[j] == quantum);
-      ++j;
-    }
-    assertWithMessage("%s must capture the right bytes as Bytes", CLASSNAME)
-        .that(stillEqual)
-        .isTrue();
-    assertWithMessage("%s iterable character count", CLASSNAME).that(BYTES).hasLength(j);
-  }
-
-  @Test
-  public void testSize() {
-    assertWithMessage("%s must have the expected size", CLASSNAME)
-        .that(BYTES)
-        .hasLength(testString.size());
-  }
-
-  @Test
-  public void testGetTreeDepth() {
-    assertWithMessage("%s must have depth 0", CLASSNAME)
-        .that(testString.getTreeDepth())
-        .isEqualTo(0);
-  }
-
-  @Test
-  public void testIsBalanced() {
-    assertWithMessage("%s is technically balanced", CLASSNAME)
-        .that(testString.isBalanced())
-        .isTrue();
-  }
-
-  @Test
-  public void testCopyTo_ByteArrayOffsetLength() {
-    int destinationOffset = 50;
-    int length = 100;
-    byte[] destination = new byte[destinationOffset + length];
-    int sourceOffset = 213;
-    testString.copyTo(destination, sourceOffset, destinationOffset, length);
-    boolean stillEqual = true;
-    for (int i = 0; stillEqual && i < length; ++i) {
-      stillEqual = BYTES[i + sourceOffset] == destination[i + destinationOffset];
-    }
-    assertWithMessage("%s.copyTo(4 arg) must give the expected bytes", CLASSNAME)
-        .that(stillEqual)
-        .isTrue();
-  }
-
-  @Test
-  public void testCopyTo_ByteArrayOffsetLengthErrors() {
-    int destinationOffset = 50;
-    int length = 100;
-    byte[] destination = new byte[destinationOffset + length];
-
-    try {
-      // Copy one too many bytes
-      testString.copyTo(destination, testString.size() + 1 - length, destinationOffset, length);
-      assertWithMessage(
-              "Should have thrown an exception when copying too many bytes of a %s", CLASSNAME)
-          .fail();
-    } catch (IndexOutOfBoundsException expected) {
-      // This is success
-    }
-
-    try {
-      // Copy with illegal negative sourceOffset
-      testString.copyTo(destination, -1, destinationOffset, length);
-      assertWithMessage(
-              "Should have thrown an exception when given a negative sourceOffset in %s ",
-              CLASSNAME)
-          .fail();
-    } catch (IndexOutOfBoundsException expected) {
-      // This is success
-    }
-
-    try {
-      // Copy with illegal negative destinationOffset
-      testString.copyTo(destination, 0, -1, length);
-      assertWithMessage(
-              "Should have thrown an exception when given a negative destinationOffset in %s",
-              CLASSNAME)
-          .fail();
-    } catch (IndexOutOfBoundsException expected) {
-      // This is success
-    }
-
-    try {
-      // Copy with illegal negative size
-      testString.copyTo(destination, 0, 0, -1);
-      assertWithMessage(
-              "Should have thrown an exception when given a negative size in %s", CLASSNAME)
-          .fail();
-    } catch (IndexOutOfBoundsException expected) {
-      // This is success
-    }
-
-    try {
-      // Copy with illegal too-large sourceOffset
-      testString.copyTo(destination, 2 * testString.size(), 0, length);
-      assertWithMessage(
-              "Should have thrown an exception when the destinationOffset is too large in %s",
-              CLASSNAME)
-          .fail();
-    } catch (IndexOutOfBoundsException expected) {
-      // This is success
-    }
-
-    try {
-      // Copy with illegal too-large destinationOffset
-      testString.copyTo(destination, 0, 2 * destination.length, length);
-      assertWithMessage(
-              "Should have thrown an exception when the destinationOffset is too large in %s",
-              CLASSNAME)
-          .fail();
-    } catch (IndexOutOfBoundsException expected) {
-      // This is success
-    }
-  }
-
-  @Test
-  public void testCopyTo_ByteBuffer() {
-    // Same length.
-    ByteBuffer myBuffer = ByteBuffer.allocate(BYTES.length);
-    testString.copyTo(myBuffer);
-    myBuffer.flip();
-    assertWithMessage("%s.copyTo(ByteBuffer) must give back the same bytes", CLASSNAME)
-        .that(backingBuffer)
-        .isEqualTo(myBuffer);
-
-    // Target buffer bigger than required.
-    myBuffer = ByteBuffer.allocate(testString.size() + 1);
-    testString.copyTo(myBuffer);
-    myBuffer.flip();
-    assertThat(backingBuffer).isEqualTo(myBuffer);
-
-    // Target buffer has no space.
-    myBuffer = ByteBuffer.allocate(0);
-    try {
-      testString.copyTo(myBuffer);
-      assertWithMessage(
-              "Should have thrown an exception when target ByteBuffer has insufficient capacity")
-          .fail();
-    } catch (BufferOverflowException e) {
-      // Expected.
-    }
-
-    // Target buffer too small.
-    myBuffer = ByteBuffer.allocate(1);
-    try {
-      testString.copyTo(myBuffer);
-      assertWithMessage(
-              "Should have thrown an exception when target ByteBuffer has insufficient capacity")
-          .fail();
-    } catch (BufferOverflowException e) {
-      // Expected.
-    }
-  }
-
-  @Test
-  public void testMarkSupported() {
-    InputStream stream = testString.newInput();
-    assertWithMessage("%s.newInput() must support marking", CLASSNAME)
-        .that(stream.markSupported())
-        .isTrue();
-  }
-
-  @Test
-  public void testMarkAndReset() throws IOException {
-    int fraction = testString.size() / 3;
-
-    InputStream stream = testString.newInput();
-    stream.mark(testString.size()); // First, mark() the end.
-
-    skipFully(stream, fraction); // Skip a large fraction, but not all.
-    assertWithMessage("%s: after skipping to the 'middle', half the bytes are available", CLASSNAME)
-        .that((testString.size() - fraction))
-        .isEqualTo(stream.available());
-    stream.reset();
-    assertWithMessage("%s: after resetting, all bytes are available", CLASSNAME)
-        .that(testString.size())
-        .isEqualTo(stream.available());
-
-    skipFully(stream, testString.size()); // Skip to the end.
-    assertWithMessage("%s: after skipping to the end, no more bytes are available", CLASSNAME)
-        .that(stream.available())
-        .isEqualTo(0);
-  }
-
-  /**
-   * Discards {@code n} bytes of data from the input stream. This method will block until the full
-   * amount has been skipped. Does not close the stream.
-   *
-   * <p>Copied from com.google.common.io.ByteStreams to avoid adding dependency.
-   *
-   * @param in the input stream to read from
-   * @param n the number of bytes to skip
-   * @throws EOFException if this stream reaches the end before skipping all the bytes
-   * @throws IOException if an I/O error occurs, or the stream does not support skipping
-   */
-  static void skipFully(InputStream in, long n) throws IOException {
-    long toSkip = n;
-    while (n > 0) {
-      long amt = in.skip(n);
-      if (amt == 0) {
-        // Force a blocking read to avoid infinite loop
-        if (in.read() == -1) {
-          long skipped = toSkip - n;
-          throw new EOFException(
-              "reached end of stream after skipping "
-                  + skipped
-                  + " bytes; "
-                  + toSkip
-                  + " bytes expected");
-        }
-        n--;
-      } else {
-        n -= amt;
-      }
-    }
-  }
-
-  @Test
-  public void testAsReadOnlyByteBuffer() {
-    ByteBuffer byteBuffer = testString.asReadOnlyByteBuffer();
-    byte[] roundTripBytes = new byte[BYTES.length];
-    assertThat(byteBuffer.remaining() == BYTES.length).isTrue();
-    assertThat(byteBuffer.isReadOnly()).isTrue();
-    byteBuffer.get(roundTripBytes);
-    assertWithMessage("%s.asReadOnlyByteBuffer() must give back the same bytes", CLASSNAME)
-        .that(Arrays.equals(BYTES, roundTripBytes))
-        .isTrue();
-  }
-
-  @Test
-  public void testAsReadOnlyByteBufferList() {
-    List<ByteBuffer> byteBuffers = testString.asReadOnlyByteBufferList();
-    int bytesSeen = 0;
-    byte[] roundTripBytes = new byte[BYTES.length];
-    for (ByteBuffer byteBuffer : byteBuffers) {
-      int thisLength = byteBuffer.remaining();
-      assertThat(byteBuffer.isReadOnly()).isTrue();
-      assertThat(bytesSeen + thisLength <= BYTES.length).isTrue();
-      byteBuffer.get(roundTripBytes, bytesSeen, thisLength);
-      bytesSeen += thisLength;
-    }
-    assertThat(BYTES).hasLength(bytesSeen);
-    assertWithMessage("%s.asReadOnlyByteBufferTest() must give back the same bytes", CLASSNAME)
-        .that(Arrays.equals(BYTES, roundTripBytes))
-        .isTrue();
-  }
-
-  @Test
-  public void testToByteArray() {
-    byte[] roundTripBytes = testString.toByteArray();
-    assertWithMessage("%s.toByteArray() must give back the same bytes", CLASSNAME)
-        .that(Arrays.equals(BYTES, roundTripBytes))
-        .isTrue();
-  }
-
-  @Test
-  public void testWriteTo() throws IOException {
-    ByteArrayOutputStream bos = new ByteArrayOutputStream();
-    testString.writeTo(bos);
-    byte[] roundTripBytes = bos.toByteArray();
-    assertWithMessage("%s.writeTo() must give back the same bytes", CLASSNAME)
-        .that(Arrays.equals(BYTES, roundTripBytes))
-        .isTrue();
-  }
-
-  @Test
-  public void testWriteToShouldNotExposeInternalBufferToOutputStream() throws IOException {
-    OutputStream os =
-        new OutputStream() {
-          @Override
-          public void write(byte[] b, int off, int len) {
-            Arrays.fill(b, off, off + len, (byte) 0);
-          }
-
-          @Override
-          public void write(int b) {
-            throw new UnsupportedOperationException();
-          }
-        };
-
-    byte[] original = Arrays.copyOf(BYTES, BYTES.length);
-    testString.writeTo(os);
-    assertWithMessage("%s.writeTo() must NOT grant access to underlying buffer", CLASSNAME)
-        .that(Arrays.equals(original, BYTES))
-        .isTrue();
-  }
-
-  @Test
-  public void testWriteToInternalShouldExposeInternalBufferToOutputStream() throws IOException {
-    OutputStream os =
-        new OutputStream() {
-          @Override
-          public void write(byte[] b, int off, int len) {
-            Arrays.fill(b, off, off + len, (byte) 0);
-          }
-
-          @Override
-          public void write(int b) {
-            throw new UnsupportedOperationException();
-          }
-        };
-
-    testString.writeToInternal(os, 0, testString.size());
-    byte[] allZeros = new byte[testString.size()];
-    assertWithMessage("%s.writeToInternal() must grant access to underlying buffer", CLASSNAME)
-        .that(Arrays.equals(allZeros, backingBuffer.array()))
-        .isTrue();
-  }
-
-  @Test
-  public void testWriteToShouldExposeInternalBufferToByteOutput() throws IOException {
-    ByteOutput out =
-        new ByteOutput() {
-          @Override
-          public void write(byte value) throws IOException {
-            throw new UnsupportedOperationException();
-          }
-
-          @Override
-          public void write(byte[] value, int offset, int length) throws IOException {
-            throw new UnsupportedOperationException();
-          }
-
-          @Override
-          public void write(ByteBuffer value) throws IOException {
-            throw new UnsupportedOperationException();
-          }
-
-          @Override
-          public void writeLazy(byte[] value, int offset, int length) throws IOException {
-            throw new UnsupportedOperationException();
-          }
-
-          @Override
-          public void writeLazy(ByteBuffer value) throws IOException {
-            Arrays.fill(
-                value.array(), value.arrayOffset(), value.arrayOffset() + value.limit(), (byte) 0);
-          }
-        };
-
-    testString.writeTo(out);
-    byte[] allZeros = new byte[testString.size()];
-    assertWithMessage("%s.writeTo() must grant access to underlying buffer", CLASSNAME)
-        .that(Arrays.equals(allZeros, backingBuffer.array()))
-        .isTrue();
-  }
-
-  @Test
-  public void testNewOutput() throws IOException {
-    ByteArrayOutputStream bos = new ByteArrayOutputStream();
-    ByteString.Output output = ByteString.newOutput();
-    testString.writeTo(output);
-    assertWithMessage("Output Size returns correct result")
-        .that(output.size())
-        .isEqualTo(testString.size());
-    output.writeTo(bos);
-    assertWithMessage("Output.writeTo() must give back the same bytes")
-        .that(Arrays.equals(BYTES, bos.toByteArray()))
-        .isTrue();
-
-    // write the output stream to itself! This should cause it to double
-    output.writeTo(output);
-    assertWithMessage("Writing an output stream to itself is successful")
-        .that(testString.concat(testString))
-        .isEqualTo(output.toByteString());
-
-    output.reset();
-    assertWithMessage("Output.reset() resets the output").that(output.size()).isEqualTo(0);
-    assertWithMessage("Output.reset() resets the output")
-        .that(output.toByteString())
-        .isEqualTo(EMPTY);
-  }
-
-  @Test
-  public void testToString() {
-    String testString = "I love unicode \u1234\u5678 characters";
-    ByteString unicode = forString(testString);
-    String roundTripString = unicode.toString(UTF_8);
-    assertWithMessage("%s unicode must match", CLASSNAME)
-        .that(testString)
-        .isEqualTo(roundTripString);
-  }
-
-  @Test
-  public void testCharsetToString() {
-    String testString = "I love unicode \u1234\u5678 characters";
-    ByteString unicode = forString(testString);
-    String roundTripString = unicode.toString(UTF_8);
-    assertWithMessage("%s unicode must match", CLASSNAME)
-        .that(testString)
-        .isEqualTo(roundTripString);
-  }
-
-  @Test
-  public void testToString_returnsCanonicalEmptyString() {
-    assertWithMessage("%s must be the same string references", CLASSNAME)
-        .that(EMPTY.toString(UTF_8))
-        .isSameInstanceAs(new NioByteString(ByteBuffer.wrap(new byte[0])).toString(UTF_8));
-  }
-
-  @Test
-  public void testToString_raisesException() {
-    try {
-      EMPTY.toString("invalid");
-      assertWithMessage("Should have thrown an exception.").fail();
-    } catch (UnsupportedEncodingException expected) {
-      // This is success
-    }
-
-    try {
-      testString.toString("invalid");
-      assertWithMessage("Should have thrown an exception.").fail();
-    } catch (UnsupportedEncodingException expected) {
-      // This is success
-    }
-  }
-
-  @Test
-  @SuppressWarnings("TruthSelfEquals")
-  public void testEquals() {
-    assertWithMessage("%s must not equal null", CLASSNAME).that(testString).isNotEqualTo(null);
-    assertWithMessage("%s must equal self", CLASSNAME).that(testString).isEqualTo(testString);
-    assertWithMessage("%s must not equal the empty string", CLASSNAME)
-        .that(testString)
-        .isNotEqualTo(EMPTY);
-    assertWithMessage("%s empty strings must be equal", CLASSNAME)
-        .that(EMPTY)
-        .isEqualTo(testString.substring(55, 55));
-    assertWithMessage("%s must equal another string with the same value", CLASSNAME)
-        .that(testString)
-        .isEqualTo(new NioByteString(backingBuffer));
-
-    byte[] mungedBytes = mungedBytes();
-    assertWithMessage("%s must not equal every string with the same length", CLASSNAME)
-        .that(testString.equals(new NioByteString(ByteBuffer.wrap(mungedBytes))))
-        .isFalse();
-  }
-
-  @Test
-  public void testEqualsLiteralByteString() {
-    ByteString literal = ByteString.copyFrom(BYTES);
-    assertWithMessage("%s must equal LiteralByteString with same value", CLASSNAME)
-        .that(literal)
-        .isEqualTo(testString);
-    assertWithMessage("%s must equal LiteralByteString with same value", CLASSNAME)
-        .that(testString)
-        .isEqualTo(literal);
-    assertWithMessage("%s must not equal the empty string", CLASSNAME)
-        .that(testString)
-        .isNotEqualTo(ByteString.EMPTY);
-    assertWithMessage("%s empty strings must be equal", CLASSNAME)
-        .that(ByteString.EMPTY)
-        .isEqualTo(testString.substring(55, 55));
-
-    literal = ByteString.copyFrom(mungedBytes());
-    assertWithMessage("%s must not equal every LiteralByteString with the same length", CLASSNAME)
-        .that(testString)
-        .isNotEqualTo(literal);
-    assertWithMessage("%s must not equal every LiteralByteString with the same length", CLASSNAME)
-        .that(literal)
-        .isNotEqualTo(testString);
-  }
-
-  @Test
-  public void testEqualsRopeByteString() {
-    ByteString p1 = ByteString.copyFrom(BYTES, 0, 5);
-    ByteString p2 = ByteString.copyFrom(BYTES, 5, BYTES.length - 5);
-    ByteString rope = p1.concat(p2);
-
-    assertWithMessage("%s must equal RopeByteString with same value", CLASSNAME)
-        .that(rope)
-        .isEqualTo(testString);
-    assertWithMessage("%s must equal RopeByteString with same value", CLASSNAME)
-        .that(testString)
-        .isEqualTo(rope);
-    assertWithMessage("%s must not equal the empty string", CLASSNAME)
-        .that(testString)
-        .isNotEqualTo(ByteString.EMPTY.concat(ByteString.EMPTY));
-    assertWithMessage("%s empty strings must be equal", CLASSNAME)
-        .that(ByteString.EMPTY.concat(ByteString.EMPTY))
-        .isEqualTo(testString.substring(55, 55));
-
-    byte[] mungedBytes = mungedBytes();
-    p1 = ByteString.copyFrom(mungedBytes, 0, 5);
-    p2 = ByteString.copyFrom(mungedBytes, 5, mungedBytes.length - 5);
-    rope = p1.concat(p2);
-    assertWithMessage("%s must not equal every RopeByteString with the same length", CLASSNAME)
-        .that(testString)
-        .isNotEqualTo(rope);
-
-    assertWithMessage("%s must not equal every RopeByteString with the same length", CLASSNAME)
-        .that(rope)
-        .isNotEqualTo(testString);
-  }
-
-  private byte[] mungedBytes() {
-    byte[] mungedBytes = new byte[BYTES.length];
-    System.arraycopy(BYTES, 0, mungedBytes, 0, BYTES.length);
-    mungedBytes[mungedBytes.length - 5] = (byte) (mungedBytes[mungedBytes.length - 5] ^ 0xFF);
-    return mungedBytes;
-  }
-
-  @Test
-  public void testHashCode() {
-    int hash = testString.hashCode();
-    assertWithMessage("%s must have expected hashCode", CLASSNAME)
-        .that(hash)
-        .isEqualTo(EXPECTED_HASH);
-  }
-
-  @Test
-  public void testPeekCachedHashCode() {
-    ByteString newString = new NioByteString(backingBuffer);
-    assertWithMessage("%s.peekCachedHashCode() should return zero at first", CLASSNAME)
-        .that(newString.peekCachedHashCode())
-        .isEqualTo(0);
-    int unused = newString.hashCode();
-    assertWithMessage("%s.peekCachedHashCode should return zero at first", CLASSNAME)
-        .that(newString.peekCachedHashCode())
-        .isEqualTo(EXPECTED_HASH);
-  }
-
-  @Test
-  public void testPartialHash() {
-    // partialHash() is more strenuously tested elsewhere by testing hashes of substrings.
-    // This test would fail if the expected hash were 1.  It's not.
-    int hash = testString.partialHash(testString.size(), 0, testString.size());
-    assertWithMessage("%s.partialHash() must yield expected hashCode", CLASSNAME)
-        .that(hash)
-        .isEqualTo(EXPECTED_HASH);
-  }
-
-  @Test
-  public void testNewInput() throws IOException {
-    InputStream input = testString.newInput();
-    assertWithMessage("InputStream.available() returns correct value")
-        .that(testString.size())
-        .isEqualTo(input.available());
-    boolean stillEqual = true;
-    for (byte referenceByte : BYTES) {
-      int expectedInt = (referenceByte & 0xFF);
-      stillEqual = (expectedInt == input.read());
-    }
-    assertWithMessage("InputStream.available() returns correct value")
-        .that(input.available())
-        .isEqualTo(0);
-    assertWithMessage("%s must give the same bytes from the InputStream", CLASSNAME)
-        .that(stillEqual)
-        .isTrue();
-    assertWithMessage("%s InputStream must now be exhausted", CLASSNAME)
-        .that(input.read())
-        .isEqualTo(-1);
-  }
-
-  @Test
-  public void testNewInput_skip() throws IOException {
-    InputStream input = testString.newInput();
-    int stringSize = testString.size();
-    int nearEndIndex = stringSize * 2 / 3;
-    long skipped1 = input.skip(nearEndIndex);
-    assertWithMessage("InputStream.skip()").that(skipped1).isEqualTo(nearEndIndex);
-    assertWithMessage("InputStream.available()")
-        .that(input.available())
-        .isEqualTo(stringSize - skipped1);
-    assertWithMessage("InputStream.mark() is available").that(input.markSupported()).isTrue();
-    input.mark(0);
-    assertWithMessage("InputStream.skip(), read()")
-        .that(input.read())
-        .isEqualTo(testString.byteAt(nearEndIndex) & 0xFF);
-    assertWithMessage("InputStream.available()")
-        .that(input.available())
-        .isEqualTo(stringSize - skipped1 - 1);
-    long skipped2 = input.skip(stringSize);
-    assertWithMessage("InputStream.skip() incomplete")
-        .that(skipped2)
-        .isEqualTo(stringSize - skipped1 - 1);
-    assertWithMessage("InputStream.skip(), no more input").that(input.available()).isEqualTo(0);
-    assertWithMessage("InputStream.skip(), no more input").that(input.read()).isEqualTo(-1);
-    input.reset();
-    assertWithMessage("InputStream.reset() succeeded")
-        .that(input.available())
-        .isEqualTo(stringSize - skipped1);
-    assertWithMessage("InputStream.reset(), read()")
-        .that(input.read())
-        .isEqualTo(testString.byteAt(nearEndIndex) & 0xFF);
-  }
-
-  @Test
-  public void testNewCodedInput() throws IOException {
-    CodedInputStream cis = testString.newCodedInput();
-    byte[] roundTripBytes = cis.readRawBytes(BYTES.length);
-    assertWithMessage("%s must give the same bytes back from the CodedInputStream", CLASSNAME)
-        .that(Arrays.equals(BYTES, roundTripBytes))
-        .isTrue();
-    assertWithMessage("%s CodedInputStream must now be exhausted", CLASSNAME)
-        .that(cis.isAtEnd())
-        .isTrue();
-  }
-
-  /**
-   * Make sure we keep things simple when concatenating with empty. See also {@link
-   * ByteStringTest#testConcat_empty()}.
-   */
-  @Test
-  public void testConcat_empty() {
-    assertWithMessage("%s concatenated with empty must give %s", CLASSNAME, CLASSNAME)
-        .that(testString.concat(EMPTY))
-        .isSameInstanceAs(testString);
-    assertWithMessage("empty concatenated with %s must give %s", CLASSNAME, CLASSNAME)
-        .that(EMPTY.concat(testString))
-        .isSameInstanceAs(testString);
-  }
-
-  @Test
-  public void testJavaSerialization() throws Exception {
-    ByteArrayOutputStream out = new ByteArrayOutputStream();
-    ObjectOutputStream oos = new ObjectOutputStream(out);
-    oos.writeObject(testString);
-    oos.close();
-    byte[] pickled = out.toByteArray();
-    InputStream in = new ByteArrayInputStream(pickled);
-    ObjectInputStream ois = new ObjectInputStream(in);
-    Object o = ois.readObject();
-    assertWithMessage("Didn't get a ByteString back").that(o).isInstanceOf(ByteString.class);
-    assertWithMessage("Should get an equal ByteString back").that(o).isEqualTo(testString);
-  }
-
-  private static ByteString forString(String str) {
-    return new NioByteString(ByteBuffer.wrap(str.getBytes(UTF_8)));
-  }
-}
diff --git a/libs/protobuf/java/core/src/test/java/com/google/protobuf/PackedFieldTest.java b/libs/protobuf/java/core/src/test/java/com/google/protobuf/PackedFieldTest.java
deleted file mode 100644
index ce77baa..0000000
--- a/libs/protobuf/java/core/src/test/java/com/google/protobuf/PackedFieldTest.java
+++ /dev/null
@@ -1,242 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import com.google.protobuf.PackedFieldTestProto.TestAllTypes;
-import com.google.protobuf.PackedFieldTestProto.TestAllTypes.NestedEnum;
-import com.google.protobuf.PackedFieldTestProto.TestUnpackedTypes;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-/** Tests primitive repeated fields in proto3 are packed in wire format. */
-@RunWith(JUnit4.class)
-public class PackedFieldTest {
-  static final ByteString expectedPackedRawBytes =
-      ByteString.copyFrom(
-          new byte[] {
-            (byte) 0xFA,
-            0x01,
-            0x01,
-            0x01, // repeated int32
-            (byte) 0x82,
-            0x02,
-            0x01,
-            0x01, // repeated int64
-            (byte) 0x8A,
-            0x02,
-            0x01,
-            0x01, // repeated uint32
-            (byte) 0x92,
-            0x02,
-            0x01,
-            0x01, // repeated uint64
-            (byte) 0x9A,
-            0x02,
-            0x01,
-            0x02, // repeated sint32
-            (byte) 0xA2,
-            0x02,
-            0x01,
-            0x02, // repeated sint64
-            (byte) 0xAA,
-            0x02,
-            0x04,
-            0x01,
-            0x00,
-            0x00,
-            0x00, // repeated fixed32
-            (byte) 0xB2,
-            0x02,
-            0x08,
-            0x01,
-            0x00,
-            0x00,
-            0x00, // repeated fixed64
-            0x00,
-            0x00,
-            0x00,
-            0x00,
-            (byte) 0xBA,
-            0x02,
-            0x04,
-            0x01,
-            0x00,
-            0x00,
-            0x00, // repeated sfixed32
-            (byte) 0xC2,
-            0x02,
-            0x08,
-            0x01,
-            0x00,
-            0x00,
-            0x00, // repeated sfixed64
-            0x00,
-            0x00,
-            0x00,
-            0x00,
-            (byte) 0xCA,
-            0x02,
-            0x04,
-            0x00,
-            0x00,
-            (byte) 0x80,
-            0x3f, // repeated float
-            (byte) 0xD2,
-            0x02,
-            0x08,
-            0x00,
-            0x00,
-            0x00,
-            0x00, // repeated double
-            0x00,
-            0x00,
-            (byte) 0xf0,
-            0x3f,
-            (byte) 0xDA,
-            0x02,
-            0x01,
-            0x01, // repeated bool
-            (byte) 0x9A,
-            0x03,
-            0x01,
-            0x01 // repeated nested enum
-          });
-
-  static final ByteString expectedUnpackedRawBytes =
-      ByteString.copyFrom(
-          new byte[] {
-            0x08,
-            0x01, // repeated int32
-            0x10,
-            0x01, // repeated int64
-            0x18,
-            0x01, // repeated uint32
-            0x20,
-            0x01, // repeated uint64
-            0x28,
-            0x02, // repeated sint32
-            0x30,
-            0x02, // repeated sint64
-            0x3D,
-            0x01,
-            0x00,
-            0x00,
-            0x00, // repeated fixed32
-            0x41,
-            0x01,
-            0x00,
-            0x00,
-            0x00, // repeated fixed64
-            0x00,
-            0x00,
-            0x00,
-            0x00,
-            0x4D,
-            0x01,
-            0x00,
-            0x00,
-            0x00, // repeated sfixed32
-            0x51,
-            0x01,
-            0x00,
-            0x00,
-            0x00, // repeated sfixed64
-            0x00,
-            0x00,
-            0x00,
-            0x00,
-            0x5D,
-            0x00,
-            0x00,
-            (byte) 0x80,
-            0x3f, // repeated float
-            0x61,
-            0x00,
-            0x00,
-            0x00,
-            0x00, // repeated double
-            0x00,
-            0x00,
-            (byte) 0xf0,
-            0x3f,
-            0x68,
-            0x01, // repeated bool
-            0x70,
-            0x01, // repeated nested enum
-          });
-
-  @Test
-  public void testPackedGeneratedMessage() throws Exception {
-    TestAllTypes message = TestAllTypes.parseFrom(expectedPackedRawBytes);
-    assertThat(message.toByteString()).isEqualTo(expectedPackedRawBytes);
-  }
-
-  @Test
-  public void testPackedDynamicMessageSerialize() throws Exception {
-    DynamicMessage message =
-        DynamicMessage.parseFrom(TestAllTypes.getDescriptor(), expectedPackedRawBytes);
-    assertThat(message.toByteString()).isEqualTo(expectedPackedRawBytes);
-  }
-
-  @Test
-  public void testUnpackedGeneratedMessage() throws Exception {
-    TestUnpackedTypes message = TestUnpackedTypes.parseFrom(expectedUnpackedRawBytes);
-    assertThat(message.toByteString()).isEqualTo(expectedUnpackedRawBytes);
-  }
-
-  @Test
-  public void testUnPackedDynamicMessageSerialize() throws Exception {
-    DynamicMessage message =
-        DynamicMessage.parseFrom(TestUnpackedTypes.getDescriptor(), expectedUnpackedRawBytes);
-    assertThat(message.toByteString()).isEqualTo(expectedUnpackedRawBytes);
-  }
-
-  // Make sure we haven't screwed up the code generation for packing fields by default.
-  @Test
-  public void testPackedSerialization() throws Exception {
-    TestAllTypes message =
-        TestAllTypes.newBuilder()
-            .addRepeatedInt32(1234)
-            .addRepeatedNestedEnum(NestedEnum.BAR)
-            .build();
-
-    CodedInputStream in = CodedInputStream.newInstance(message.toByteArray());
-
-    while (!in.isAtEnd()) {
-      int tag = in.readTag();
-      assertThat(WireFormat.getTagWireType(tag)).isEqualTo(WireFormat.WIRETYPE_LENGTH_DELIMITED);
-      in.skipField(tag);
-    }
-  }
-}
diff --git a/libs/protobuf/java/core/src/test/java/com/google/protobuf/ParseExceptionsTest.java b/libs/protobuf/java/core/src/test/java/com/google/protobuf/ParseExceptionsTest.java
deleted file mode 100644
index 81ced78..0000000
--- a/libs/protobuf/java/core/src/test/java/com/google/protobuf/ParseExceptionsTest.java
+++ /dev/null
@@ -1,300 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.junit.Assert.fail;
-
-import com.google.protobuf.DescriptorProtos.DescriptorProto;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.FilterInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-/**
- * Tests the exceptions thrown when parsing from a stream. The methods on the {@link Parser}
- * interface are specified to only throw {@link InvalidProtocolBufferException}. But we really want
- * to distinguish between invalid protos vs. actual I/O errors (like failures reading from a socket,
- * etc.). So, when we're not using the parser directly, an {@link IOException} should be thrown
- * where appropriate, instead of always an {@link InvalidProtocolBufferException}.
- *
- * @author jh@squareup.com (Joshua Humphries)
- */
-@RunWith(JUnit4.class)
-public class ParseExceptionsTest {
-
-  private interface ParseTester {
-    DescriptorProto parse(InputStream in) throws IOException;
-  }
-
-  private byte[] serializedProto;
-
-  private void setup() {
-    serializedProto = DescriptorProto.getDescriptor().toProto().toByteArray();
-  }
-
-  private void setupDelimited() {
-    ByteArrayOutputStream bos = new ByteArrayOutputStream();
-    try {
-      DescriptorProto.getDescriptor().toProto().writeDelimitedTo(bos);
-    } catch (IOException e) {
-      fail("Exception not expected: " + e);
-    }
-    serializedProto = bos.toByteArray();
-  }
-
-  @Test
-  public void message_parseFrom_InputStream() {
-    setup();
-    verifyExceptions(
-        new ParseTester() {
-          @Override
-          public DescriptorProto parse(InputStream in) throws IOException {
-            return DescriptorProto.parseFrom(in);
-          }
-        });
-  }
-
-  @Test
-  public void message_parseFrom_InputStreamAndExtensionRegistry() {
-    setup();
-    verifyExceptions(
-        new ParseTester() {
-          @Override
-          public DescriptorProto parse(InputStream in) throws IOException {
-            return DescriptorProto.parseFrom(in, ExtensionRegistry.newInstance());
-          }
-        });
-  }
-
-  @Test
-  public void message_parseFrom_CodedInputStream() {
-    setup();
-    verifyExceptions(
-        new ParseTester() {
-          @Override
-          public DescriptorProto parse(InputStream in) throws IOException {
-            return DescriptorProto.parseFrom(CodedInputStream.newInstance(in));
-          }
-        });
-  }
-
-  @Test
-  public void message_parseFrom_CodedInputStreamAndExtensionRegistry() {
-    setup();
-    verifyExceptions(
-        new ParseTester() {
-          @Override
-          public DescriptorProto parse(InputStream in) throws IOException {
-            return DescriptorProto.parseFrom(
-                CodedInputStream.newInstance(in), ExtensionRegistry.newInstance());
-          }
-        });
-  }
-
-  @Test
-  public void message_parseDelimitedFrom_InputStream() {
-    setupDelimited();
-    verifyExceptions(
-        new ParseTester() {
-          @Override
-          public DescriptorProto parse(InputStream in) throws IOException {
-            return DescriptorProto.parseDelimitedFrom(in);
-          }
-        });
-  }
-
-  @Test
-  public void message_parseDelimitedFrom_InputStreamAndExtensionRegistry() {
-    setupDelimited();
-    verifyExceptions(
-        new ParseTester() {
-          @Override
-          public DescriptorProto parse(InputStream in) throws IOException {
-            return DescriptorProto.parseDelimitedFrom(in, ExtensionRegistry.newInstance());
-          }
-        });
-  }
-
-  @Test
-  public void messageBuilder_mergeFrom_InputStream() {
-    setup();
-    verifyExceptions(
-        new ParseTester() {
-          @Override
-          public DescriptorProto parse(InputStream in) throws IOException {
-            return DescriptorProto.newBuilder().mergeFrom(in).build();
-          }
-        });
-  }
-
-  @Test
-  public void messageBuilder_mergeFrom_InputStreamAndExtensionRegistry() {
-    setup();
-    verifyExceptions(
-        new ParseTester() {
-          @Override
-          public DescriptorProto parse(InputStream in) throws IOException {
-            return DescriptorProto.newBuilder()
-                .mergeFrom(in, ExtensionRegistry.newInstance())
-                .build();
-          }
-        });
-  }
-
-  @Test
-  public void messageBuilder_mergeFrom_CodedInputStream() {
-    setup();
-    verifyExceptions(
-        new ParseTester() {
-          @Override
-          public DescriptorProto parse(InputStream in) throws IOException {
-            return DescriptorProto.newBuilder().mergeFrom(CodedInputStream.newInstance(in)).build();
-          }
-        });
-  }
-
-  @Test
-  public void messageBuilder_mergeFrom_CodedInputStreamAndExtensionRegistry() {
-    setup();
-    verifyExceptions(
-        new ParseTester() {
-          @Override
-          public DescriptorProto parse(InputStream in) throws IOException {
-            return DescriptorProto.newBuilder()
-                .mergeFrom(CodedInputStream.newInstance(in), ExtensionRegistry.newInstance())
-                .build();
-          }
-        });
-  }
-
-  @Test
-  public void messageBuilder_mergeDelimitedFrom_InputStream() {
-    setupDelimited();
-    verifyExceptions(
-        new ParseTester() {
-          @Override
-          public DescriptorProto parse(InputStream in) throws IOException {
-            DescriptorProto.Builder builder = DescriptorProto.newBuilder();
-            builder.mergeDelimitedFrom(in);
-            return builder.build();
-          }
-        });
-  }
-
-  @Test
-  public void messageBuilder_mergeDelimitedFrom_InputStream_malformed() throws Exception {
-    byte[] body = new byte[80];
-    CodedOutputStream cos = CodedOutputStream.newInstance(body);
-    cos.writeUInt32NoTag(90); // Greater than bytes in stream
-    cos.writeTag(DescriptorProto.ENUM_TYPE_FIELD_NUMBER, WireFormat.WIRETYPE_LENGTH_DELIMITED);
-    cos.writeUInt32NoTag(98); // Nested message with size larger than parent
-    cos.writeTag(1000, WireFormat.WIRETYPE_LENGTH_DELIMITED);
-    cos.writeUInt32NoTag(100); // Unknown field with size larger than parent
-    ByteArrayInputStream bais = new ByteArrayInputStream(body);
-    try {
-      DescriptorProto.parseDelimitedFrom(bais);
-      fail();
-    } catch (InvalidProtocolBufferException expected) {
-    }
-  }
-
-  @Test
-  public void messageBuilder_mergeDelimitedFrom_InputStreamAndExtensionRegistry() {
-    setupDelimited();
-    verifyExceptions(
-        new ParseTester() {
-          @Override
-          public DescriptorProto parse(InputStream in) throws IOException {
-            DescriptorProto.Builder builder = DescriptorProto.newBuilder();
-            builder.mergeDelimitedFrom(in, ExtensionRegistry.newInstance());
-            return builder.build();
-          }
-        });
-  }
-
-  private void verifyExceptions(ParseTester parseTester) {
-    // No exception
-    try {
-      assertThat(parseTester.parse(new ByteArrayInputStream(serializedProto)))
-          .isEqualTo(DescriptorProto.getDescriptor().toProto());
-    } catch (IOException e) {
-      fail("No exception expected: " + e);
-    }
-
-    // IOException
-    try {
-      // using a "broken" stream that will throw part-way through reading the message
-      parseTester.parse(broken(new ByteArrayInputStream(serializedProto)));
-      fail("IOException expected but not thrown");
-    } catch (IOException e) {
-      assertThat(e).isNotInstanceOf(InvalidProtocolBufferException.class);
-    }
-
-    // InvalidProtocolBufferException
-    try {
-      // make the serialized proto invalid
-      for (int i = 0; i < 50; i++) {
-        serializedProto[i] = -1;
-      }
-      parseTester.parse(new ByteArrayInputStream(serializedProto));
-      fail("InvalidProtocolBufferException expected but not thrown");
-    } catch (IOException e) {
-      assertThat(e).isInstanceOf(InvalidProtocolBufferException.class);
-    }
-  }
-
-  private InputStream broken(InputStream i) {
-    return new FilterInputStream(i) {
-      int count = 0;
-
-      @Override
-      public int read() throws IOException {
-        if (count++ >= 50) {
-          throw new IOException("I'm broken!");
-        }
-        return super.read();
-      }
-
-      @Override
-      public int read(byte[] b, int off, int len) throws IOException {
-        if ((count += len) >= 50) {
-          throw new IOException("I'm broken!");
-        }
-        return super.read(b, off, len);
-      }
-    };
-  }
-}
diff --git a/libs/protobuf/java/core/src/test/java/com/google/protobuf/ParserLiteTest.java b/libs/protobuf/java/core/src/test/java/com/google/protobuf/ParserLiteTest.java
deleted file mode 100644
index dc31b38..0000000
--- a/libs/protobuf/java/core/src/test/java/com/google/protobuf/ParserLiteTest.java
+++ /dev/null
@@ -1,274 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.common.truth.Truth.assertThat;
-import static com.google.common.truth.Truth.assertWithMessage;
-
-import com.google.protobuf.UnittestLite.TestAllExtensionsLite;
-import com.google.protobuf.UnittestLite.TestAllTypesLite;
-import com.google.protobuf.UnittestLite.TestMergeExceptionLite;
-import com.google.protobuf.UnittestLite.TestPackedExtensionsLite;
-import com.google.protobuf.UnittestLite.TestParsingMergeLite;
-import protobuf_unittest.MapLiteUnittest;
-import protobuf_unittest.MapLiteUnittest.TestRequiredLite;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-@RunWith(JUnit4.class)
-public class ParserLiteTest {
-
-  private void assertRoundTripEquals(MessageLite message, ExtensionRegistryLite registry)
-      throws Exception {
-    final byte[] data = message.toByteArray();
-    final int offset = 20;
-    final int length = data.length;
-    final int padding = 30;
-    Parser<? extends MessageLite> parser = message.getParserForType();
-    assertThat(message).isEqualTo(parser.parseFrom(data, registry));
-    assertThat(message)
-        .isEqualTo(
-            parser.parseFrom(
-                generatePaddingArray(data, offset, padding), offset, length, registry));
-    assertThat(message).isEqualTo(parser.parseFrom(message.toByteString(), registry));
-    assertThat(message).isEqualTo(parser.parseFrom(new ByteArrayInputStream(data), registry));
-    assertThat(message).isEqualTo(parser.parseFrom(CodedInputStream.newInstance(data), registry));
-    assertThat(message)
-        .isEqualTo(parser.parseFrom(message.toByteString().asReadOnlyByteBuffer(), registry));
-  }
-
-  @SuppressWarnings("unchecked")
-  private void assertRoundTripEquals(MessageLite message) throws Exception {
-    final byte[] data = message.toByteArray();
-    final int offset = 20;
-    final int length = data.length;
-    final int padding = 30;
-
-    Parser<MessageLite> parser = (Parser<MessageLite>) message.getParserForType();
-    assertThat(message).isEqualTo(parser.parseFrom(data));
-    assertThat(message)
-        .isEqualTo(parser.parseFrom(generatePaddingArray(data, offset, padding), offset, length));
-    assertThat(message).isEqualTo(parser.parseFrom(message.toByteString()));
-    assertThat(message).isEqualTo(parser.parseFrom(new ByteArrayInputStream(data)));
-    assertThat(message).isEqualTo(parser.parseFrom(CodedInputStream.newInstance(data)));
-    assertThat(message).isEqualTo(parser.parseFrom(message.toByteString().asReadOnlyByteBuffer()));
-  }
-
-  private byte[] generatePaddingArray(byte[] data, int offset, int padding) {
-    byte[] result = new byte[offset + data.length + padding];
-    System.arraycopy(data, 0, result, offset, data.length);
-    return result;
-  }
-
-  @Test
-  public void testParseExtensionsLite() throws Exception {
-    assertRoundTripEquals(
-        TestUtilLite.getAllLiteExtensionsSet(), TestUtilLite.getExtensionRegistryLite());
-  }
-
-  @Test
-  public void testParsePacked() throws Exception {
-    assertRoundTripEquals(TestUtil.getPackedSet());
-    assertRoundTripEquals(TestUtil.getPackedExtensionsSet(), TestUtil.getExtensionRegistry());
-  }
-
-  @Test
-  public void testParsePackedLite() throws Exception {
-    assertRoundTripEquals(
-        TestUtilLite.getLitePackedExtensionsSet(), TestUtilLite.getExtensionRegistryLite());
-  }
-
-  @Test
-  public void testParseDelimitedToLite() throws Exception {
-    // Write MessageLite with packed extension fields.
-    TestPackedExtensionsLite packedMessage = TestUtilLite.getLitePackedExtensionsSet();
-    ByteArrayOutputStream output = new ByteArrayOutputStream();
-    packedMessage.writeDelimitedTo(output);
-    packedMessage.writeDelimitedTo(output);
-
-    InputStream input = new ByteArrayInputStream(output.toByteArray());
-    assertThat(packedMessage)
-        .isEqualTo(
-            packedMessage
-                .getParserForType()
-                .parseDelimitedFrom(input, TestUtilLite.getExtensionRegistryLite()));
-    assertThat(packedMessage)
-        .isEqualTo(
-            packedMessage
-                .getParserForType()
-                .parseDelimitedFrom(input, TestUtilLite.getExtensionRegistryLite()));
-  }
-
-  /** Helper method for {@link #testParsingMergeLite()}. */
-  private void assertMessageMerged(TestAllTypesLite allTypes) throws Exception {
-    assertThat(allTypes.getOptionalInt32()).isEqualTo(3);
-    assertThat(allTypes.getOptionalInt64()).isEqualTo(2);
-    assertThat(allTypes.getOptionalString()).isEqualTo("hello");
-  }
-
-  @Test
-  public void testParsingMergeLite() throws Exception {
-    // Build messages.
-    TestAllTypesLite.Builder builder = TestAllTypesLite.newBuilder();
-    TestAllTypesLite msg1 = builder.setOptionalInt32(1).build();
-    builder.clear();
-    TestAllTypesLite msg2 = builder.setOptionalInt64(2).build();
-    builder.clear();
-    TestAllTypesLite msg3 = builder.setOptionalInt32(3).setOptionalString("hello").build();
-
-    // Build groups.
-    TestParsingMergeLite.RepeatedFieldsGenerator.Group1 optionalG1 =
-        TestParsingMergeLite.RepeatedFieldsGenerator.Group1.newBuilder().setField1(msg1).build();
-    TestParsingMergeLite.RepeatedFieldsGenerator.Group1 optionalG2 =
-        TestParsingMergeLite.RepeatedFieldsGenerator.Group1.newBuilder().setField1(msg2).build();
-    TestParsingMergeLite.RepeatedFieldsGenerator.Group1 optionalG3 =
-        TestParsingMergeLite.RepeatedFieldsGenerator.Group1.newBuilder().setField1(msg3).build();
-    TestParsingMergeLite.RepeatedFieldsGenerator.Group2 repeatedG1 =
-        TestParsingMergeLite.RepeatedFieldsGenerator.Group2.newBuilder().setField1(msg1).build();
-    TestParsingMergeLite.RepeatedFieldsGenerator.Group2 repeatedG2 =
-        TestParsingMergeLite.RepeatedFieldsGenerator.Group2.newBuilder().setField1(msg2).build();
-    TestParsingMergeLite.RepeatedFieldsGenerator.Group2 repeatedG3 =
-        TestParsingMergeLite.RepeatedFieldsGenerator.Group2.newBuilder().setField1(msg3).build();
-
-    // Assign and serialize RepeatedFieldsGenerator.
-    ByteString data =
-        TestParsingMergeLite.RepeatedFieldsGenerator.newBuilder()
-            .addField1(msg1)
-            .addField1(msg2)
-            .addField1(msg3)
-            .addField2(msg1)
-            .addField2(msg2)
-            .addField2(msg3)
-            .addField3(msg1)
-            .addField3(msg2)
-            .addField3(msg3)
-            .addGroup1(optionalG1)
-            .addGroup1(optionalG2)
-            .addGroup1(optionalG3)
-            .addGroup2(repeatedG1)
-            .addGroup2(repeatedG2)
-            .addGroup2(repeatedG3)
-            .addExt1(msg1)
-            .addExt1(msg2)
-            .addExt1(msg3)
-            .addExt2(msg1)
-            .addExt2(msg2)
-            .addExt2(msg3)
-            .build()
-            .toByteString();
-
-    // Parse TestParsingMergeLite.
-    ExtensionRegistryLite registry = ExtensionRegistryLite.newInstance();
-    UnittestLite.registerAllExtensions(registry);
-    TestParsingMergeLite parsingMerge = TestParsingMergeLite.parseFrom(data, registry);
-
-    // Required and optional fields should be merged.
-    assertMessageMerged(parsingMerge.getRequiredAllTypes());
-    assertMessageMerged(parsingMerge.getOptionalAllTypes());
-    assertMessageMerged(parsingMerge.getOptionalGroup().getOptionalGroupAllTypes());
-    assertMessageMerged(parsingMerge.getExtension(TestParsingMergeLite.optionalExt));
-
-    // Repeated fields should not be merged.
-    assertThat(parsingMerge.getRepeatedAllTypesCount()).isEqualTo(3);
-    assertThat(parsingMerge.getRepeatedGroupCount()).isEqualTo(3);
-    assertThat(parsingMerge.getExtensionCount(TestParsingMergeLite.repeatedExt)).isEqualTo(3);
-  }
-
-  @Test
-  public void testExceptionWhenMergingExtendedMessagesMissingRequiredFieldsLite() {
-    // create a TestMergeExceptionLite message (missing required fields) that looks like
-    //   all_extensions {
-    //     [TestRequiredLite.single] {
-    //     }
-    //   }
-    TestMergeExceptionLite.Builder message = TestMergeExceptionLite.newBuilder();
-    message.setAllExtensions(
-        TestAllExtensionsLite.newBuilder()
-            .setExtension(TestRequiredLite.single, TestRequiredLite.newBuilder().buildPartial())
-            .buildPartial());
-    ByteString byteString = message.buildPartial().toByteString();
-
-    // duplicate the bytestring to make the `all_extensions` field repeat twice, so that it will
-    // need merging when parsing back
-    ByteString duplicatedByteString = byteString.concat(byteString);
-
-    byte[] bytes = duplicatedByteString.toByteArray();
-    ExtensionRegistryLite registry = ExtensionRegistryLite.newInstance();
-    MapLiteUnittest.registerAllExtensions(registry);
-
-    // `parseFrom` should throw InvalidProtocolBufferException, not UninitializedMessageException,
-    // for each of the 5 possible input types:
-
-    // parseFrom(ByteString)
-    try {
-      TestMergeExceptionLite.parseFrom(duplicatedByteString, registry);
-      assertWithMessage("Expected InvalidProtocolBufferException").fail();
-    } catch (Exception e) {
-      assertThat(e.getClass()).isEqualTo(InvalidProtocolBufferException.class);
-    }
-
-    // parseFrom(ByteArray)
-    try {
-      TestMergeExceptionLite.parseFrom(bytes, registry);
-      assertWithMessage("Expected InvalidProtocolBufferException").fail();
-    } catch (Exception e) {
-      assertThat(e.getClass()).isEqualTo(InvalidProtocolBufferException.class);
-    }
-
-    // parseFrom(InputStream)
-    try {
-      TestMergeExceptionLite.parseFrom(new ByteArrayInputStream(bytes), registry);
-      assertWithMessage("Expected InvalidProtocolBufferException").fail();
-    } catch (Exception e) {
-      assertThat(e.getClass()).isEqualTo(InvalidProtocolBufferException.class);
-    }
-
-    // parseFrom(CodedInputStream)
-    try {
-      TestMergeExceptionLite.parseFrom(CodedInputStream.newInstance(bytes), registry);
-      assertWithMessage("Expected InvalidProtocolBufferException").fail();
-    } catch (Exception e) {
-      assertThat(e.getClass()).isEqualTo(InvalidProtocolBufferException.class);
-    }
-
-    // parseFrom(ByteBuffer)
-    try {
-      TestMergeExceptionLite.parseFrom(duplicatedByteString.asReadOnlyByteBuffer(), registry);
-      assertWithMessage("Expected InvalidProtocolBufferException").fail();
-    } catch (Exception e) {
-      assertThat(e.getClass()).isEqualTo(InvalidProtocolBufferException.class);
-    }
-  }
-}
diff --git a/libs/protobuf/java/core/src/test/java/com/google/protobuf/ParserTest.java b/libs/protobuf/java/core/src/test/java/com/google/protobuf/ParserTest.java
deleted file mode 100644
index 69c5795..0000000
--- a/libs/protobuf/java/core/src/test/java/com/google/protobuf/ParserTest.java
+++ /dev/null
@@ -1,399 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.common.truth.Truth.assertThat;
-import static com.google.common.truth.Truth.assertWithMessage;
-
-import protobuf_unittest.UnittestOptimizeFor;
-import protobuf_unittest.UnittestOptimizeFor.TestOptimizedForSize;
-import protobuf_unittest.UnittestOptimizeFor.TestRequiredOptimizedForSize;
-import protobuf_unittest.UnittestProto;
-import protobuf_unittest.UnittestProto.ForeignMessage;
-import protobuf_unittest.UnittestProto.TestAllTypes;
-import protobuf_unittest.UnittestProto.TestEmptyMessage;
-import protobuf_unittest.UnittestProto.TestMergeException;
-import protobuf_unittest.UnittestProto.TestParsingMerge;
-import protobuf_unittest.UnittestProto.TestRequired;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InterruptedIOException;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-/** Unit test for {@link Parser}. */
-@RunWith(JUnit4.class)
-public class ParserTest {
-
-  @Test
-  public void testGeneratedMessageParserSingleton() throws Exception {
-    for (int i = 0; i < 10; i++) {
-      assertThat(TestUtil.getAllSet().getParserForType()).isEqualTo(TestAllTypes.parser());
-    }
-  }
-
-  private void assertRoundTripEquals(MessageLite message, ExtensionRegistryLite registry)
-      throws Exception {
-    final byte[] data = message.toByteArray();
-    final int offset = 20;
-    final int length = data.length;
-    final int padding = 30;
-    Parser<? extends MessageLite> parser = message.getParserForType();
-    assertMessageEquals(message, parser.parseFrom(data, registry));
-    assertMessageEquals(
-        message,
-        parser.parseFrom(generatePaddingArray(data, offset, padding), offset, length, registry));
-    assertMessageEquals(message, parser.parseFrom(message.toByteString(), registry));
-    assertMessageEquals(message, parser.parseFrom(new ByteArrayInputStream(data), registry));
-    assertMessageEquals(message, parser.parseFrom(CodedInputStream.newInstance(data), registry));
-    assertMessageEquals(
-        message, parser.parseFrom(message.toByteString().asReadOnlyByteBuffer(), registry));
-  }
-
-  @SuppressWarnings("unchecked")
-  private void assertRoundTripEquals(MessageLite message) throws Exception {
-    final byte[] data = message.toByteArray();
-    final int offset = 20;
-    final int length = data.length;
-    final int padding = 30;
-
-    Parser<MessageLite> parser = (Parser<MessageLite>) message.getParserForType();
-    assertMessageEquals(message, parser.parseFrom(data));
-    assertMessageEquals(
-        message, parser.parseFrom(generatePaddingArray(data, offset, padding), offset, length));
-    assertMessageEquals(message, parser.parseFrom(message.toByteString()));
-    assertMessageEquals(message, parser.parseFrom(new ByteArrayInputStream(data)));
-    assertMessageEquals(message, parser.parseFrom(CodedInputStream.newInstance(data)));
-    assertMessageEquals(message, parser.parseFrom(message.toByteString().asReadOnlyByteBuffer()));
-  }
-
-  private void assertMessageEquals(MessageLite expected, MessageLite actual) throws Exception {
-    if (expected instanceof Message) {
-      assertThat(actual).isEqualTo(expected);
-    } else {
-      assertThat(actual.toByteString()).isEqualTo(expected.toByteString());
-    }
-  }
-
-  private byte[] generatePaddingArray(byte[] data, int offset, int padding) {
-    byte[] result = new byte[offset + data.length + padding];
-    System.arraycopy(data, 0, result, offset, data.length);
-    return result;
-  }
-
-  @Test
-  public void testNormalMessage() throws Exception {
-    assertRoundTripEquals(TestUtil.getAllSet());
-  }
-
-
-  @Test
-  public void testParsePartial() throws Exception {
-    assertParsePartial(TestRequired.parser(), TestRequired.newBuilder().setA(1).buildPartial());
-  }
-
-  private <T extends MessageLite> void assertParsePartial(Parser<T> parser, T partialMessage)
-      throws Exception {
-    final String errorString = "Should throw exceptions when the parsed message isn't initialized.";
-
-    // parsePartialFrom should pass.
-    byte[] data = partialMessage.toByteArray();
-    assertThat(parser.parsePartialFrom(data)).isEqualTo(partialMessage);
-    assertThat(parser.parsePartialFrom(partialMessage.toByteString())).isEqualTo(partialMessage);
-    assertThat(parser.parsePartialFrom(new ByteArrayInputStream(data))).isEqualTo(partialMessage);
-    assertThat(parser.parsePartialFrom(CodedInputStream.newInstance(data)))
-        .isEqualTo(partialMessage);
-
-    // parseFrom(ByteArray)
-    try {
-      parser.parseFrom(partialMessage.toByteArray());
-      assertWithMessage(errorString).fail();
-    } catch (InvalidProtocolBufferException e) {
-      // pass.
-    }
-
-    // parseFrom(ByteString)
-    try {
-      parser.parseFrom(partialMessage.toByteString());
-      assertWithMessage(errorString).fail();
-    } catch (InvalidProtocolBufferException e) {
-      // pass.
-    }
-
-    // parseFrom(InputStream)
-    try {
-      parser.parseFrom(new ByteArrayInputStream(partialMessage.toByteArray()));
-      assertWithMessage(errorString).fail();
-    } catch (IOException e) {
-      // pass.
-    }
-
-    // parseFrom(CodedInputStream)
-    try {
-      parser.parseFrom(CodedInputStream.newInstance(partialMessage.toByteArray()));
-      assertWithMessage(errorString).fail();
-    } catch (IOException e) {
-      // pass.
-    }
-  }
-
-  @Test
-  public void testParseExtensions() throws Exception {
-    assertRoundTripEquals(TestUtil.getAllExtensionsSet(), TestUtil.getExtensionRegistry());
-  }
-
-  @Test
-  public void testParsePacked() throws Exception {
-    assertRoundTripEquals(TestUtil.getPackedSet());
-    assertRoundTripEquals(TestUtil.getPackedExtensionsSet(), TestUtil.getExtensionRegistry());
-  }
-
-  @Test
-  public void testParseDelimitedTo() throws Exception {
-    // Write normal Message.
-    TestAllTypes normalMessage = TestUtil.getAllSet();
-    ByteArrayOutputStream output = new ByteArrayOutputStream();
-    normalMessage.writeDelimitedTo(output);
-    normalMessage.writeDelimitedTo(output);
-
-    InputStream input = new ByteArrayInputStream(output.toByteArray());
-    assertMessageEquals(normalMessage, normalMessage.getParserForType().parseDelimitedFrom(input));
-    assertMessageEquals(normalMessage, normalMessage.getParserForType().parseDelimitedFrom(input));
-  }
-
-  @Test
-  public void testParseUnknownFields() throws Exception {
-    // All fields will be treated as unknown fields in emptyMessage.
-    TestEmptyMessage emptyMessage = TestEmptyMessage.parseFrom(TestUtil.getAllSet().toByteString());
-    assertThat(emptyMessage.toByteString()).isEqualTo(TestUtil.getAllSet().toByteString());
-  }
-
-
-  @Test
-  public void testOptimizeForSize() throws Exception {
-    TestOptimizedForSize.Builder builder = TestOptimizedForSize.newBuilder();
-    builder.setI(12).setMsg(ForeignMessage.newBuilder().setC(34).build());
-    builder.setExtension(TestOptimizedForSize.testExtension, 56);
-    builder.setExtension(
-        TestOptimizedForSize.testExtension2,
-        TestRequiredOptimizedForSize.newBuilder().setX(78).build());
-
-    TestOptimizedForSize message = builder.build();
-    ExtensionRegistry registry = ExtensionRegistry.newInstance();
-    UnittestOptimizeFor.registerAllExtensions(registry);
-
-    assertRoundTripEquals(message, registry);
-  }
-
-  /** Helper method for {@link #testParsingMerge()}. */
-  private void assertMessageMerged(TestAllTypes allTypes) throws Exception {
-    assertThat(allTypes.getOptionalInt32()).isEqualTo(3);
-    assertThat(allTypes.getOptionalInt64()).isEqualTo(2);
-    assertThat(allTypes.getOptionalString()).isEqualTo("hello");
-  }
-
-  @Test
-  public void testParsingMerge() throws Exception {
-    // Build messages.
-    TestAllTypes.Builder builder = TestAllTypes.newBuilder();
-    TestAllTypes msg1 = builder.setOptionalInt32(1).build();
-    builder.clear();
-    TestAllTypes msg2 = builder.setOptionalInt64(2).build();
-    builder.clear();
-    TestAllTypes msg3 = builder.setOptionalInt32(3).setOptionalString("hello").build();
-
-    // Build groups.
-    TestParsingMerge.RepeatedFieldsGenerator.Group1 optionalG1 =
-        TestParsingMerge.RepeatedFieldsGenerator.Group1.newBuilder().setField1(msg1).build();
-    TestParsingMerge.RepeatedFieldsGenerator.Group1 optionalG2 =
-        TestParsingMerge.RepeatedFieldsGenerator.Group1.newBuilder().setField1(msg2).build();
-    TestParsingMerge.RepeatedFieldsGenerator.Group1 optionalG3 =
-        TestParsingMerge.RepeatedFieldsGenerator.Group1.newBuilder().setField1(msg3).build();
-    TestParsingMerge.RepeatedFieldsGenerator.Group2 repeatedG1 =
-        TestParsingMerge.RepeatedFieldsGenerator.Group2.newBuilder().setField1(msg1).build();
-    TestParsingMerge.RepeatedFieldsGenerator.Group2 repeatedG2 =
-        TestParsingMerge.RepeatedFieldsGenerator.Group2.newBuilder().setField1(msg2).build();
-    TestParsingMerge.RepeatedFieldsGenerator.Group2 repeatedG3 =
-        TestParsingMerge.RepeatedFieldsGenerator.Group2.newBuilder().setField1(msg3).build();
-
-    // Assign and serialize RepeatedFieldsGenerator.
-    ByteString data =
-        TestParsingMerge.RepeatedFieldsGenerator.newBuilder()
-            .addField1(msg1)
-            .addField1(msg2)
-            .addField1(msg3)
-            .addField2(msg1)
-            .addField2(msg2)
-            .addField2(msg3)
-            .addField3(msg1)
-            .addField3(msg2)
-            .addField3(msg3)
-            .addGroup1(optionalG1)
-            .addGroup1(optionalG2)
-            .addGroup1(optionalG3)
-            .addGroup2(repeatedG1)
-            .addGroup2(repeatedG2)
-            .addGroup2(repeatedG3)
-            .addExt1(msg1)
-            .addExt1(msg2)
-            .addExt1(msg3)
-            .addExt2(msg1)
-            .addExt2(msg2)
-            .addExt2(msg3)
-            .build()
-            .toByteString();
-
-    // Parse TestParsingMerge.
-    ExtensionRegistry registry = ExtensionRegistry.newInstance();
-    UnittestProto.registerAllExtensions(registry);
-    TestParsingMerge parsingMerge = TestParsingMerge.parseFrom(data, registry);
-
-    // Required and optional fields should be merged.
-    assertMessageMerged(parsingMerge.getRequiredAllTypes());
-    assertMessageMerged(parsingMerge.getOptionalAllTypes());
-    assertMessageMerged(parsingMerge.getOptionalGroup().getOptionalGroupAllTypes());
-    assertMessageMerged(parsingMerge.getExtension(TestParsingMerge.optionalExt));
-
-    // Repeated fields should not be merged.
-    assertThat(parsingMerge.getRepeatedAllTypesCount()).isEqualTo(3);
-    assertThat(parsingMerge.getRepeatedGroupCount()).isEqualTo(3);
-    assertThat(parsingMerge.getExtensionCount(TestParsingMerge.repeatedExt)).isEqualTo(3);
-  }
-
-  @Test
-  public void testExceptionWhenMergingExtendedMessagesMissingRequiredFields() {
-    // create a TestMergeException message (missing required fields) that looks like
-    //   all_extensions {
-    //     [TestRequired.single] {
-    //     }
-    //   }
-    TestMergeException.Builder message = TestMergeException.newBuilder();
-    message
-        .getAllExtensionsBuilder()
-        .setExtension(TestRequired.single, TestRequired.newBuilder().buildPartial());
-    ByteString byteString = message.buildPartial().toByteString();
-
-    // duplicate the bytestring to make the `all_extensions` field repeat twice, so that it will
-    // need merging when parsing back
-    ByteString duplicatedByteString = byteString.concat(byteString);
-
-    byte[] bytes = duplicatedByteString.toByteArray();
-    ExtensionRegistry registry = ExtensionRegistry.newInstance();
-    UnittestProto.registerAllExtensions(registry);
-
-    // `parseFrom` should throw InvalidProtocolBufferException, not UninitializedMessageException,
-    // for each of the 5 possible input types:
-
-    // parseFrom(ByteString)
-    try {
-      TestMergeException.parseFrom(duplicatedByteString, registry);
-      assertWithMessage("Expected InvalidProtocolBufferException").fail();
-    } catch (Exception e) {
-      assertThat(e.getClass()).isEqualTo(InvalidProtocolBufferException.class);
-    }
-
-    // parseFrom(ByteArray)
-    try {
-      TestMergeException.parseFrom(bytes, registry);
-      assertWithMessage("Expected InvalidProtocolBufferException").fail();
-    } catch (Exception e) {
-      assertThat(e.getClass()).isEqualTo(InvalidProtocolBufferException.class);
-    }
-
-    // parseFrom(InputStream)
-    try {
-      TestMergeException.parseFrom(new ByteArrayInputStream(bytes), registry);
-      assertWithMessage("Expected InvalidProtocolBufferException").fail();
-    } catch (Exception e) {
-      assertThat(e.getClass()).isEqualTo(InvalidProtocolBufferException.class);
-    }
-
-    // parseFrom(CodedInputStream)
-    try {
-      TestMergeException.parseFrom(CodedInputStream.newInstance(bytes), registry);
-      assertWithMessage("Expected InvalidProtocolBufferException").fail();
-    } catch (Exception e) {
-      assertThat(e.getClass()).isEqualTo(InvalidProtocolBufferException.class);
-    }
-
-    // parseFrom(ByteBuffer)
-    try {
-      TestMergeException.parseFrom(duplicatedByteString.asReadOnlyByteBuffer(), registry);
-      assertWithMessage("Expected InvalidProtocolBufferException").fail();
-    } catch (Exception e) {
-      assertThat(e.getClass()).isEqualTo(InvalidProtocolBufferException.class);
-    }
-  }
-
-  @Test
-  public void testParseDelimitedFrom_firstByteInterrupted_preservesCause() {
-    try {
-      TestAllTypes.parseDelimitedFrom(
-          new InputStream() {
-            @Override
-            public int read() throws IOException {
-              throw new InterruptedIOException();
-            }
-          });
-      assertWithMessage("Expected InterruptedIOException").fail();
-    } catch (Exception e) {
-      assertThat(e.getClass()).isEqualTo(InterruptedIOException.class);
-    }
-  }
-
-  @Test
-  public void testParseDelimitedFrom_secondByteInterrupted_preservesCause() {
-    try {
-      TestAllTypes.parseDelimitedFrom(
-          new InputStream() {
-            private int i;
-
-            @Override
-            public int read() throws IOException {
-              switch (i++) {
-                case 0:
-                  return 1;
-                case 1:
-                  throw new InterruptedIOException();
-                default:
-                  throw new AssertionError();
-              }
-            }
-          });
-      assertWithMessage("Expected InterruptedIOException").fail();
-    } catch (Exception e) {
-      assertThat(e.getClass()).isEqualTo(InterruptedIOException.class);
-    }
-  }
-}
diff --git a/libs/protobuf/java/core/src/test/java/com/google/protobuf/Proto2ExtensionLookupSchemaTest.java b/libs/protobuf/java/core/src/test/java/com/google/protobuf/Proto2ExtensionLookupSchemaTest.java
deleted file mode 100644
index 15097a0..0000000
--- a/libs/protobuf/java/core/src/test/java/com/google/protobuf/Proto2ExtensionLookupSchemaTest.java
+++ /dev/null
@@ -1,167 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.common.truth.Truth.assertThat;
-import static com.google.common.truth.Truth.assertWithMessage;
-
-import com.google.protobuf.testing.Proto2Testing;
-import com.google.protobuf.testing.Proto2Testing.Proto2Message;
-import com.google.protobuf.testing.Proto2Testing.Proto2Message.TestEnum;
-import com.google.protobuf.testing.Proto2Testing.Proto2MessageWithExtensions;
-import java.util.List;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-@RunWith(JUnit4.class)
-public class Proto2ExtensionLookupSchemaTest {
-  private byte[] data;
-  private ExtensionRegistry extensionRegistry;
-
-  @Before
-  public void setup() {
-    TestSchemas.registerGenericProto2Schemas();
-
-    data = new Proto2MessageFactory(10, 20, 1, 1).newMessage().toByteArray();
-    extensionRegistry = ExtensionRegistry.newInstance();
-    Proto2Testing.registerAllExtensions(extensionRegistry);
-  }
-
-  @Test
-  public void testExtensions() throws Exception {
-    Proto2MessageWithExtensions base =
-        Proto2MessageWithExtensions.parseFrom(data, extensionRegistry);
-
-    Proto2MessageWithExtensions message =
-        ExperimentalSerializationUtil.fromByteArray(
-            data, Proto2MessageWithExtensions.class, extensionRegistry);
-    assertThat(message).isEqualTo(base);
-
-    Proto2MessageWithExtensions roundtripMessage =
-        ExperimentalSerializationUtil.fromByteArray(
-            ExperimentalSerializationUtil.toByteArray(message),
-            Proto2MessageWithExtensions.class,
-            extensionRegistry);
-    assertThat(roundtripMessage).isEqualTo(base);
-  }
-
-  @Test
-  public void testUnknownEnum() throws Exception {
-    // Use unknown fields to hold invalid enum values.
-    UnknownFieldSetLite unknowns = UnknownFieldSetLite.newInstance();
-    final int outOfRange = 1000;
-    assertThat(TestEnum.forNumber(outOfRange)).isNull();
-    unknowns.storeField(
-        WireFormat.makeTag(Proto2Message.FIELD_ENUM_13_FIELD_NUMBER, WireFormat.WIRETYPE_VARINT),
-        (long) outOfRange);
-    unknowns.storeField(
-        WireFormat.makeTag(
-            Proto2Message.FIELD_ENUM_LIST_30_FIELD_NUMBER, WireFormat.WIRETYPE_VARINT),
-        (long) TestEnum.ONE_VALUE);
-    unknowns.storeField(
-        WireFormat.makeTag(
-            Proto2Message.FIELD_ENUM_LIST_30_FIELD_NUMBER, WireFormat.WIRETYPE_VARINT),
-        (long) outOfRange);
-    unknowns.storeField(
-        WireFormat.makeTag(
-            Proto2Message.FIELD_ENUM_LIST_30_FIELD_NUMBER, WireFormat.WIRETYPE_VARINT),
-        (long) TestEnum.TWO_VALUE);
-
-    {
-      // Construct a packed enum list.
-      int packedSize =
-          CodedOutputStream.computeUInt32SizeNoTag(TestEnum.ONE_VALUE)
-              + CodedOutputStream.computeUInt32SizeNoTag(outOfRange)
-              + CodedOutputStream.computeUInt32SizeNoTag(TestEnum.ONE_VALUE);
-      ByteString.CodedBuilder packedBuilder = ByteString.newCodedBuilder(packedSize);
-      CodedOutputStream packedOut = packedBuilder.getCodedOutput();
-      packedOut.writeEnumNoTag(TestEnum.ONE_VALUE);
-      packedOut.writeEnumNoTag(outOfRange);
-      packedOut.writeEnumNoTag(TestEnum.TWO_VALUE);
-      unknowns.storeField(
-          WireFormat.makeTag(
-              Proto2Message.FIELD_ENUM_LIST_PACKED_44_FIELD_NUMBER,
-              WireFormat.WIRETYPE_LENGTH_DELIMITED),
-          packedBuilder.build());
-    }
-    int size = unknowns.getSerializedSize();
-    byte[] output = new byte[size];
-    CodedOutputStream codedOutput = CodedOutputStream.newInstance(output);
-    unknowns.writeTo(codedOutput);
-    codedOutput.flush();
-
-    Proto2MessageWithExtensions parsed =
-        ExperimentalSerializationUtil.fromByteArray(
-            output, Proto2MessageWithExtensions.class, extensionRegistry);
-    assertWithMessage("out-of-range singular enum should not be in message")
-        .that(parsed.hasExtension(Proto2Testing.fieldEnum13))
-        .isFalse();
-    {
-      List<Long> singularEnum =
-          parsed
-              .getUnknownFields()
-              .getField(Proto2Message.FIELD_ENUM_13_FIELD_NUMBER)
-              .getVarintList();
-      assertThat(singularEnum).hasSize(1);
-      assertThat(singularEnum.get(0)).isEqualTo((Long) (long) outOfRange);
-    }
-    {
-      List<Long> repeatedEnum =
-          parsed
-              .getUnknownFields()
-              .getField(Proto2Message.FIELD_ENUM_LIST_30_FIELD_NUMBER)
-              .getVarintList();
-      assertThat(repeatedEnum).hasSize(1);
-      assertThat(repeatedEnum.get(0)).isEqualTo((Long) (long) outOfRange);
-    }
-    {
-      List<Long> packedRepeatedEnum =
-          parsed
-              .getUnknownFields()
-              .getField(Proto2Message.FIELD_ENUM_LIST_PACKED_44_FIELD_NUMBER)
-              .getVarintList();
-      assertThat(packedRepeatedEnum).hasSize(1);
-      assertThat(packedRepeatedEnum.get(0)).isEqualTo((Long) (long) outOfRange);
-    }
-    assertWithMessage("out-of-range repeated enum should not be in message")
-        .that(parsed.getExtension(Proto2Testing.fieldEnumList30).size())
-        .isEqualTo(2);
-    assertThat(parsed.getExtension(Proto2Testing.fieldEnumList30, 0)).isEqualTo(TestEnum.ONE);
-    assertThat(parsed.getExtension(Proto2Testing.fieldEnumList30, 1)).isEqualTo(TestEnum.TWO);
-    assertWithMessage("out-of-range packed repeated enum should not be in message")
-        .that(parsed.getExtension(Proto2Testing.fieldEnumListPacked44).size())
-        .isEqualTo(2);
-    assertThat(parsed.getExtension(Proto2Testing.fieldEnumListPacked44, 0)).isEqualTo(TestEnum.ONE);
-    assertThat(parsed.getExtension(Proto2Testing.fieldEnumListPacked44, 1)).isEqualTo(TestEnum.TWO);
-  }
-}
diff --git a/libs/protobuf/java/core/src/test/java/com/google/protobuf/Proto2LiteSchemaTest.java b/libs/protobuf/java/core/src/test/java/com/google/protobuf/Proto2LiteSchemaTest.java
deleted file mode 100644
index 8242f84..0000000
--- a/libs/protobuf/java/core/src/test/java/com/google/protobuf/Proto2LiteSchemaTest.java
+++ /dev/null
@@ -1,49 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import com.google.protobuf.testing.Proto2TestingLite.Proto2MessageLite;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-@RunWith(JUnit4.class)
-public class Proto2LiteSchemaTest extends AbstractProto2LiteSchemaTest {
-
-  @Override
-  protected Schema<Proto2MessageLite> schema() {
-    return TestSchemasLite.genericProto2LiteSchema;
-  }
-
-  @Override
-  protected void registerSchemas() {
-    TestSchemasLite.registerGenericProto2LiteSchemas();
-  }
-}
diff --git a/libs/protobuf/java/core/src/test/java/com/google/protobuf/Proto2MessageFactory.java b/libs/protobuf/java/core/src/test/java/com/google/protobuf/Proto2MessageFactory.java
deleted file mode 100644
index b5c61ed..0000000
--- a/libs/protobuf/java/core/src/test/java/com/google/protobuf/Proto2MessageFactory.java
+++ /dev/null
@@ -1,555 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import com.google.protobuf.testing.Proto2Testing.Proto2Message;
-import com.google.protobuf.testing.Proto2Testing.Proto2MessageWithMaps;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/** Creates instances of {@link Proto2Message} based on the tree configuration. */
-public final class Proto2MessageFactory implements ExperimentalMessageFactory<Proto2Message> {
-  private final int numRepeatedFields;
-  private final int branchingFactor;
-  private final Proto2MessageFactory nextLevel;
-  private final ExperimentalTestDataProvider data;
-
-  public Proto2MessageFactory(
-      int numRepeatedFields, int stringLength, int branchingFactor, int treeDepth) {
-    this(
-        new ExperimentalTestDataProvider(stringLength),
-        numRepeatedFields,
-        branchingFactor,
-        treeDepth);
-  }
-
-  private Proto2MessageFactory(
-      ExperimentalTestDataProvider data,
-      int numRepeatedFields,
-      int branchingFactor,
-      int treeDepth) {
-    this.numRepeatedFields = numRepeatedFields;
-    this.branchingFactor = branchingFactor;
-    this.data = data;
-    if (treeDepth > 0) {
-      nextLevel = new Proto2MessageFactory(data, numRepeatedFields, branchingFactor, treeDepth - 1);
-    } else {
-      nextLevel = null;
-    }
-  }
-
-  @Override
-  public ExperimentalTestDataProvider dataProvider() {
-    return data;
-  }
-
-  @Override
-  public Proto2Message newMessage() {
-    Proto2Message.Builder builder = Proto2Message.newBuilder();
-    builder.setFieldDouble1(data.getDouble());
-    builder.setFieldFloat2(data.getFloat());
-    builder.setFieldInt643(data.getLong());
-    builder.setFieldUint644(data.getLong());
-    builder.setFieldInt325(data.getInt());
-    builder.setFieldFixed646(data.getLong());
-    builder.setFieldFixed327(data.getInt());
-    builder.setFieldBool8(data.getBool());
-    builder.setFieldString9(data.getString());
-    // We don't populate the message field. Instead we apply the branching factor to the
-    // repeated message field below.
-    builder.setFieldBytes11(data.getBytes());
-    builder.setFieldUint3212(data.getInt());
-    builder.setFieldEnum13(Proto2Message.TestEnum.forNumber(data.getEnum()));
-    builder.setFieldSfixed3214(data.getInt());
-    builder.setFieldSfixed6415(data.getLong());
-    builder.setFieldSint3216(data.getInt());
-    builder.setFieldSint6417(data.getLong());
-
-    for (int i = 0; i < numRepeatedFields; ++i) {
-      builder.addFieldDoubleList18(data.getDouble());
-      builder.addFieldFloatList19(data.getFloat());
-      builder.addFieldInt64List20(data.getLong());
-      builder.addFieldUint64List21(data.getLong());
-      builder.addFieldInt32List22(data.getInt());
-      builder.addFieldFixed64List23(data.getLong());
-      builder.addFieldFixed32List24(data.getInt());
-      builder.addFieldBoolList25(data.getBool());
-      builder.addFieldStringList26(data.getString());
-      // Repeated message field is controlled by the branching factor below.
-      builder.addFieldBytesList28(data.getBytes());
-      builder.addFieldUint32List29(data.getInt());
-      builder.addFieldEnumList30(Proto2Message.TestEnum.forNumber(data.getEnum()));
-      builder.addFieldSfixed32List31(data.getInt());
-      builder.addFieldSfixed64List32(data.getLong());
-      builder.addFieldSint32List33(data.getInt());
-      builder.addFieldSint64List34(data.getLong());
-
-      builder.addFieldDoubleListPacked35(data.getDouble());
-      builder.addFieldFloatListPacked36(data.getFloat());
-      builder.addFieldInt64ListPacked37(data.getLong());
-      builder.addFieldUint64ListPacked38(data.getLong());
-      builder.addFieldInt32ListPacked39(data.getInt());
-      builder.addFieldFixed64ListPacked40(data.getLong());
-      builder.addFieldFixed32ListPacked41(data.getInt());
-      builder.addFieldBoolListPacked42(data.getBool());
-      builder.addFieldUint32ListPacked43(data.getInt());
-      builder.addFieldEnumListPacked44(Proto2Message.TestEnum.forNumber(data.getEnum()));
-      builder.addFieldSfixed32ListPacked45(data.getInt());
-      builder.addFieldSfixed64ListPacked46(data.getLong());
-      builder.addFieldSint32ListPacked47(data.getInt());
-      builder.addFieldSint64ListPacked48(data.getLong());
-    }
-
-    builder.setFieldGroup49(Proto2Message.FieldGroup49.newBuilder().setFieldInt3250(data.getInt()));
-
-    for (int i = 0; i < branchingFactor; ++i) {
-      builder.addFieldGroupList51(
-          Proto2Message.FieldGroupList51.newBuilder().setFieldInt3252(data.getInt()));
-    }
-
-    // Set all required fields.
-    populateRequiredFields(builder, INCLUDE_ALL_REQUIRED_FIELDS);
-
-    // Handle the branching factor.
-    if (nextLevel != null) {
-      for (int i = 0; i < branchingFactor; ++i) {
-        builder.addFieldMessageList27(nextLevel.newMessage());
-      }
-    }
-
-    return builder.build();
-  }
-
-  private interface MapValueProvider<T> {
-    public T getValue();
-  }
-
-  private final MapValueProvider<Integer> integerProvider =
-      new MapValueProvider<Integer>() {
-        @Override
-        public Integer getValue() {
-          return data.getInt();
-        }
-      };
-  private final MapValueProvider<Long> longProvider =
-      new MapValueProvider<Long>() {
-        @Override
-        public Long getValue() {
-          return data.getLong();
-        }
-      };
-  private final MapValueProvider<String> stringProvider =
-      new MapValueProvider<String>() {
-        @Override
-        public String getValue() {
-          return data.getString();
-        }
-      };
-  private final MapValueProvider<ByteString> bytesProvider =
-      new MapValueProvider<ByteString>() {
-        @Override
-        public ByteString getValue() {
-          return data.getBytes();
-        }
-      };
-  private final MapValueProvider<Boolean> booleanProvider =
-      new MapValueProvider<Boolean>() {
-        @Override
-        public Boolean getValue() {
-          return data.getBool();
-        }
-      };
-  private final MapValueProvider<Float> floatProvider =
-      new MapValueProvider<Float>() {
-        @Override
-        public Float getValue() {
-          return data.getFloat();
-        }
-      };
-  private final MapValueProvider<Double> doubleProvider =
-      new MapValueProvider<Double>() {
-        @Override
-        public Double getValue() {
-          return data.getDouble();
-        }
-      };
-  private final MapValueProvider<Proto2Message> messageProvider =
-      new MapValueProvider<Proto2Message>() {
-        @Override
-        public Proto2Message getValue() {
-          return newMessage();
-        }
-      };
-  private final MapValueProvider<Proto2Message.TestEnum> enumProvider =
-      new MapValueProvider<Proto2Message.TestEnum>() {
-        @Override
-        public Proto2Message.TestEnum getValue() {
-          return Proto2Message.TestEnum.forNumber(data.getEnum());
-        }
-      };
-
-  private <V> Map<Integer, V> populateIntegerMap(MapValueProvider<V> provider) {
-    Map<Integer, V> map = new HashMap<>();
-    for (int i = 0; i < numRepeatedFields; ++i) {
-      map.put(data.getInt(), provider.getValue());
-    }
-    return map;
-  }
-
-  private <V> Map<Long, V> populateLongMap(MapValueProvider<V> provider) {
-    Map<Long, V> map = new HashMap<>();
-    for (int i = 0; i < numRepeatedFields; ++i) {
-      map.put(data.getLong(), provider.getValue());
-    }
-    return map;
-  }
-
-  private <V> Map<String, V> populateStringMap(MapValueProvider<V> provider) {
-    Map<String, V> map = new HashMap<>();
-    for (int i = 0; i < numRepeatedFields; ++i) {
-      map.put(data.getString(), provider.getValue());
-    }
-    return map;
-  }
-
-  private <V> Map<Boolean, V> populateBooleanMap(MapValueProvider<V> provider) {
-    Map<Boolean, V> map = new HashMap<>();
-    map.put(false, provider.getValue());
-    map.put(true, provider.getValue());
-    return map;
-  }
-
-  public Proto2MessageWithMaps newMessageWithMaps() {
-    Proto2MessageWithMaps.Builder builder = Proto2MessageWithMaps.newBuilder();
-
-    builder.putAllFieldMapBoolBool1(populateBooleanMap(booleanProvider));
-    builder.putAllFieldMapBoolBytes2(populateBooleanMap(bytesProvider));
-    builder.putAllFieldMapBoolDouble3(populateBooleanMap(doubleProvider));
-    builder.putAllFieldMapBoolEnum4(populateBooleanMap(enumProvider));
-    builder.putAllFieldMapBoolFixed325(populateBooleanMap(integerProvider));
-    builder.putAllFieldMapBoolFixed646(populateBooleanMap(longProvider));
-    builder.putAllFieldMapBoolFloat7(populateBooleanMap(floatProvider));
-    builder.putAllFieldMapBoolInt328(populateBooleanMap(integerProvider));
-    builder.putAllFieldMapBoolInt649(populateBooleanMap(longProvider));
-    builder.putAllFieldMapBoolMessage10(populateBooleanMap(messageProvider));
-    builder.putAllFieldMapBoolSfixed3211(populateBooleanMap(integerProvider));
-    builder.putAllFieldMapBoolSfixed6412(populateBooleanMap(longProvider));
-    builder.putAllFieldMapBoolSint3213(populateBooleanMap(integerProvider));
-    builder.putAllFieldMapBoolSint6414(populateBooleanMap(longProvider));
-    builder.putAllFieldMapBoolString15(populateBooleanMap(stringProvider));
-    builder.putAllFieldMapBoolUint3216(populateBooleanMap(integerProvider));
-    builder.putAllFieldMapBoolUint6417(populateBooleanMap(longProvider));
-    builder.putAllFieldMapFixed32Bool18(populateIntegerMap(booleanProvider));
-    builder.putAllFieldMapFixed32Bytes19(populateIntegerMap(bytesProvider));
-    builder.putAllFieldMapFixed32Double20(populateIntegerMap(doubleProvider));
-    builder.putAllFieldMapFixed32Enum21(populateIntegerMap(enumProvider));
-    builder.putAllFieldMapFixed32Fixed3222(populateIntegerMap(integerProvider));
-    builder.putAllFieldMapFixed32Fixed6423(populateIntegerMap(longProvider));
-    builder.putAllFieldMapFixed32Float24(populateIntegerMap(floatProvider));
-    builder.putAllFieldMapFixed32Int3225(populateIntegerMap(integerProvider));
-    builder.putAllFieldMapFixed32Int6426(populateIntegerMap(longProvider));
-    builder.putAllFieldMapFixed32Message27(populateIntegerMap(messageProvider));
-    builder.putAllFieldMapFixed32Sfixed3228(populateIntegerMap(integerProvider));
-    builder.putAllFieldMapFixed32Sfixed6429(populateIntegerMap(longProvider));
-    builder.putAllFieldMapFixed32Sint3230(populateIntegerMap(integerProvider));
-    builder.putAllFieldMapFixed32Sint6431(populateIntegerMap(longProvider));
-    builder.putAllFieldMapFixed32String32(populateIntegerMap(stringProvider));
-    builder.putAllFieldMapFixed32Uint3233(populateIntegerMap(integerProvider));
-    builder.putAllFieldMapFixed32Uint6434(populateIntegerMap(longProvider));
-    builder.putAllFieldMapFixed64Bool35(populateLongMap(booleanProvider));
-    builder.putAllFieldMapFixed64Bytes36(populateLongMap(bytesProvider));
-    builder.putAllFieldMapFixed64Double37(populateLongMap(doubleProvider));
-    builder.putAllFieldMapFixed64Enum38(populateLongMap(enumProvider));
-    builder.putAllFieldMapFixed64Fixed3239(populateLongMap(integerProvider));
-    builder.putAllFieldMapFixed64Fixed6440(populateLongMap(longProvider));
-    builder.putAllFieldMapFixed64Float41(populateLongMap(floatProvider));
-    builder.putAllFieldMapFixed64Int3242(populateLongMap(integerProvider));
-    builder.putAllFieldMapFixed64Int6443(populateLongMap(longProvider));
-    builder.putAllFieldMapFixed64Message44(populateLongMap(messageProvider));
-    builder.putAllFieldMapFixed64Sfixed3245(populateLongMap(integerProvider));
-    builder.putAllFieldMapFixed64Sfixed6446(populateLongMap(longProvider));
-    builder.putAllFieldMapFixed64Sint3247(populateLongMap(integerProvider));
-    builder.putAllFieldMapFixed64Sint6448(populateLongMap(longProvider));
-    builder.putAllFieldMapFixed64String49(populateLongMap(stringProvider));
-    builder.putAllFieldMapFixed64Uint3250(populateLongMap(integerProvider));
-    builder.putAllFieldMapFixed64Uint6451(populateLongMap(longProvider));
-    builder.putAllFieldMapInt32Bool52(populateIntegerMap(booleanProvider));
-    builder.putAllFieldMapInt32Bytes53(populateIntegerMap(bytesProvider));
-    builder.putAllFieldMapInt32Double54(populateIntegerMap(doubleProvider));
-    builder.putAllFieldMapInt32Enum55(populateIntegerMap(enumProvider));
-    builder.putAllFieldMapInt32Fixed3256(populateIntegerMap(integerProvider));
-    builder.putAllFieldMapInt32Fixed6457(populateIntegerMap(longProvider));
-    builder.putAllFieldMapInt32Float58(populateIntegerMap(floatProvider));
-    builder.putAllFieldMapInt32Int3259(populateIntegerMap(integerProvider));
-    builder.putAllFieldMapInt32Int6460(populateIntegerMap(longProvider));
-    builder.putAllFieldMapInt32Message61(populateIntegerMap(messageProvider));
-    builder.putAllFieldMapInt32Sfixed3262(populateIntegerMap(integerProvider));
-    builder.putAllFieldMapInt32Sfixed6463(populateIntegerMap(longProvider));
-    builder.putAllFieldMapInt32Sint3264(populateIntegerMap(integerProvider));
-    builder.putAllFieldMapInt32Sint6465(populateIntegerMap(longProvider));
-    builder.putAllFieldMapInt32String66(populateIntegerMap(stringProvider));
-    builder.putAllFieldMapInt32Uint3267(populateIntegerMap(integerProvider));
-    builder.putAllFieldMapInt32Uint6468(populateIntegerMap(longProvider));
-    builder.putAllFieldMapInt64Bool69(populateLongMap(booleanProvider));
-    builder.putAllFieldMapInt64Bytes70(populateLongMap(bytesProvider));
-    builder.putAllFieldMapInt64Double71(populateLongMap(doubleProvider));
-    builder.putAllFieldMapInt64Enum72(populateLongMap(enumProvider));
-    builder.putAllFieldMapInt64Fixed3273(populateLongMap(integerProvider));
-    builder.putAllFieldMapInt64Fixed6474(populateLongMap(longProvider));
-    builder.putAllFieldMapInt64Float75(populateLongMap(floatProvider));
-    builder.putAllFieldMapInt64Int3276(populateLongMap(integerProvider));
-    builder.putAllFieldMapInt64Int6477(populateLongMap(longProvider));
-    builder.putAllFieldMapInt64Message78(populateLongMap(messageProvider));
-    builder.putAllFieldMapInt64Sfixed3279(populateLongMap(integerProvider));
-    builder.putAllFieldMapInt64Sfixed6480(populateLongMap(longProvider));
-    builder.putAllFieldMapInt64Sint3281(populateLongMap(integerProvider));
-    builder.putAllFieldMapInt64Sint6482(populateLongMap(longProvider));
-    builder.putAllFieldMapInt64String83(populateLongMap(stringProvider));
-    builder.putAllFieldMapInt64Uint3284(populateLongMap(integerProvider));
-    builder.putAllFieldMapInt64Uint6485(populateLongMap(longProvider));
-    builder.putAllFieldMapSfixed32Bool86(populateIntegerMap(booleanProvider));
-    builder.putAllFieldMapSfixed32Bytes87(populateIntegerMap(bytesProvider));
-    builder.putAllFieldMapSfixed32Double88(populateIntegerMap(doubleProvider));
-    builder.putAllFieldMapSfixed32Enum89(populateIntegerMap(enumProvider));
-    builder.putAllFieldMapSfixed32Fixed3290(populateIntegerMap(integerProvider));
-    builder.putAllFieldMapSfixed32Fixed6491(populateIntegerMap(longProvider));
-    builder.putAllFieldMapSfixed32Float92(populateIntegerMap(floatProvider));
-    builder.putAllFieldMapSfixed32Int3293(populateIntegerMap(integerProvider));
-    builder.putAllFieldMapSfixed32Int6494(populateIntegerMap(longProvider));
-    builder.putAllFieldMapSfixed32Message95(populateIntegerMap(messageProvider));
-    builder.putAllFieldMapSfixed32Sfixed3296(populateIntegerMap(integerProvider));
-    builder.putAllFieldMapSfixed32Sfixed6497(populateIntegerMap(longProvider));
-    builder.putAllFieldMapSfixed32Sint3298(populateIntegerMap(integerProvider));
-    builder.putAllFieldMapSfixed32Sint6499(populateIntegerMap(longProvider));
-    builder.putAllFieldMapSfixed32String100(populateIntegerMap(stringProvider));
-    builder.putAllFieldMapSfixed32Uint32101(populateIntegerMap(integerProvider));
-    builder.putAllFieldMapSfixed32Uint64102(populateIntegerMap(longProvider));
-    builder.putAllFieldMapSfixed64Bool103(populateLongMap(booleanProvider));
-    builder.putAllFieldMapSfixed64Bytes104(populateLongMap(bytesProvider));
-    builder.putAllFieldMapSfixed64Double105(populateLongMap(doubleProvider));
-    builder.putAllFieldMapSfixed64Enum106(populateLongMap(enumProvider));
-    builder.putAllFieldMapSfixed64Fixed32107(populateLongMap(integerProvider));
-    builder.putAllFieldMapSfixed64Fixed64108(populateLongMap(longProvider));
-    builder.putAllFieldMapSfixed64Float109(populateLongMap(floatProvider));
-    builder.putAllFieldMapSfixed64Int32110(populateLongMap(integerProvider));
-    builder.putAllFieldMapSfixed64Int64111(populateLongMap(longProvider));
-    builder.putAllFieldMapSfixed64Message112(populateLongMap(messageProvider));
-    builder.putAllFieldMapSfixed64Sfixed32113(populateLongMap(integerProvider));
-    builder.putAllFieldMapSfixed64Sfixed64114(populateLongMap(longProvider));
-    builder.putAllFieldMapSfixed64Sint32115(populateLongMap(integerProvider));
-    builder.putAllFieldMapSfixed64Sint64116(populateLongMap(longProvider));
-    builder.putAllFieldMapSfixed64String117(populateLongMap(stringProvider));
-    builder.putAllFieldMapSfixed64Uint32118(populateLongMap(integerProvider));
-    builder.putAllFieldMapSfixed64Uint64119(populateLongMap(longProvider));
-    builder.putAllFieldMapSint32Bool120(populateIntegerMap(booleanProvider));
-    builder.putAllFieldMapSint32Bytes121(populateIntegerMap(bytesProvider));
-    builder.putAllFieldMapSint32Double122(populateIntegerMap(doubleProvider));
-    builder.putAllFieldMapSint32Enum123(populateIntegerMap(enumProvider));
-    builder.putAllFieldMapSint32Fixed32124(populateIntegerMap(integerProvider));
-    builder.putAllFieldMapSint32Fixed64125(populateIntegerMap(longProvider));
-    builder.putAllFieldMapSint32Float126(populateIntegerMap(floatProvider));
-    builder.putAllFieldMapSint32Int32127(populateIntegerMap(integerProvider));
-    builder.putAllFieldMapSint32Int64128(populateIntegerMap(longProvider));
-    builder.putAllFieldMapSint32Message129(populateIntegerMap(messageProvider));
-    builder.putAllFieldMapSint32Sfixed32130(populateIntegerMap(integerProvider));
-    builder.putAllFieldMapSint32Sfixed64131(populateIntegerMap(longProvider));
-    builder.putAllFieldMapSint32Sint32132(populateIntegerMap(integerProvider));
-    builder.putAllFieldMapSint32Sint64133(populateIntegerMap(longProvider));
-    builder.putAllFieldMapSint32String134(populateIntegerMap(stringProvider));
-    builder.putAllFieldMapSint32Uint32135(populateIntegerMap(integerProvider));
-    builder.putAllFieldMapSint32Uint64136(populateIntegerMap(longProvider));
-    builder.putAllFieldMapSint64Bool137(populateLongMap(booleanProvider));
-    builder.putAllFieldMapSint64Bytes138(populateLongMap(bytesProvider));
-    builder.putAllFieldMapSint64Double139(populateLongMap(doubleProvider));
-    builder.putAllFieldMapSint64Enum140(populateLongMap(enumProvider));
-    builder.putAllFieldMapSint64Fixed32141(populateLongMap(integerProvider));
-    builder.putAllFieldMapSint64Fixed64142(populateLongMap(longProvider));
-    builder.putAllFieldMapSint64Float143(populateLongMap(floatProvider));
-    builder.putAllFieldMapSint64Int32144(populateLongMap(integerProvider));
-    builder.putAllFieldMapSint64Int64145(populateLongMap(longProvider));
-    builder.putAllFieldMapSint64Message146(populateLongMap(messageProvider));
-    builder.putAllFieldMapSint64Sfixed32147(populateLongMap(integerProvider));
-    builder.putAllFieldMapSint64Sfixed64148(populateLongMap(longProvider));
-    builder.putAllFieldMapSint64Sint32149(populateLongMap(integerProvider));
-    builder.putAllFieldMapSint64Sint64150(populateLongMap(longProvider));
-    builder.putAllFieldMapSint64String151(populateLongMap(stringProvider));
-    builder.putAllFieldMapSint64Uint32152(populateLongMap(integerProvider));
-    builder.putAllFieldMapSint64Uint64153(populateLongMap(longProvider));
-    builder.putAllFieldMapStringBool154(populateStringMap(booleanProvider));
-    builder.putAllFieldMapStringBytes155(populateStringMap(bytesProvider));
-    builder.putAllFieldMapStringDouble156(populateStringMap(doubleProvider));
-    builder.putAllFieldMapStringEnum157(populateStringMap(enumProvider));
-    builder.putAllFieldMapStringFixed32158(populateStringMap(integerProvider));
-    builder.putAllFieldMapStringFixed64159(populateStringMap(longProvider));
-    builder.putAllFieldMapStringFloat160(populateStringMap(floatProvider));
-    builder.putAllFieldMapStringInt32161(populateStringMap(integerProvider));
-    builder.putAllFieldMapStringInt64162(populateStringMap(longProvider));
-    builder.putAllFieldMapStringMessage163(populateStringMap(messageProvider));
-    builder.putAllFieldMapStringSfixed32164(populateStringMap(integerProvider));
-    builder.putAllFieldMapStringSfixed64165(populateStringMap(longProvider));
-    builder.putAllFieldMapStringSint32166(populateStringMap(integerProvider));
-    builder.putAllFieldMapStringSint64167(populateStringMap(longProvider));
-    builder.putAllFieldMapStringString168(populateStringMap(stringProvider));
-    builder.putAllFieldMapStringUint32169(populateStringMap(integerProvider));
-    builder.putAllFieldMapStringUint64170(populateStringMap(longProvider));
-    builder.putAllFieldMapUint32Bool171(populateIntegerMap(booleanProvider));
-    builder.putAllFieldMapUint32Bytes172(populateIntegerMap(bytesProvider));
-    builder.putAllFieldMapUint32Double173(populateIntegerMap(doubleProvider));
-    builder.putAllFieldMapUint32Enum174(populateIntegerMap(enumProvider));
-    builder.putAllFieldMapUint32Fixed32175(populateIntegerMap(integerProvider));
-    builder.putAllFieldMapUint32Fixed64176(populateIntegerMap(longProvider));
-    builder.putAllFieldMapUint32Float177(populateIntegerMap(floatProvider));
-    builder.putAllFieldMapUint32Int32178(populateIntegerMap(integerProvider));
-    builder.putAllFieldMapUint32Int64179(populateIntegerMap(longProvider));
-    builder.putAllFieldMapUint32Message180(populateIntegerMap(messageProvider));
-    builder.putAllFieldMapUint32Sfixed32181(populateIntegerMap(integerProvider));
-    builder.putAllFieldMapUint32Sfixed64182(populateIntegerMap(longProvider));
-    builder.putAllFieldMapUint32Sint32183(populateIntegerMap(integerProvider));
-    builder.putAllFieldMapUint32Sint64184(populateIntegerMap(longProvider));
-    builder.putAllFieldMapUint32String185(populateIntegerMap(stringProvider));
-    builder.putAllFieldMapUint32Uint32186(populateIntegerMap(integerProvider));
-    builder.putAllFieldMapUint32Uint64187(populateIntegerMap(longProvider));
-    builder.putAllFieldMapUint64Bool188(populateLongMap(booleanProvider));
-    builder.putAllFieldMapUint64Bytes189(populateLongMap(bytesProvider));
-    builder.putAllFieldMapUint64Double190(populateLongMap(doubleProvider));
-    builder.putAllFieldMapUint64Enum191(populateLongMap(enumProvider));
-    builder.putAllFieldMapUint64Fixed32192(populateLongMap(integerProvider));
-    builder.putAllFieldMapUint64Fixed64193(populateLongMap(longProvider));
-    builder.putAllFieldMapUint64Float194(populateLongMap(floatProvider));
-    builder.putAllFieldMapUint64Int32195(populateLongMap(integerProvider));
-    builder.putAllFieldMapUint64Int64196(populateLongMap(longProvider));
-    builder.putAllFieldMapUint64Message197(populateLongMap(messageProvider));
-    builder.putAllFieldMapUint64Sfixed32198(populateLongMap(integerProvider));
-    builder.putAllFieldMapUint64Sfixed64199(populateLongMap(longProvider));
-    builder.putAllFieldMapUint64Sint32200(populateLongMap(integerProvider));
-    builder.putAllFieldMapUint64Sint64201(populateLongMap(longProvider));
-    builder.putAllFieldMapUint64String202(populateLongMap(stringProvider));
-    builder.putAllFieldMapUint64Uint32203(populateLongMap(integerProvider));
-    builder.putAllFieldMapUint64Uint64204(populateLongMap(longProvider));
-
-    return builder.build();
-  }
-
-  public List<Proto2Message> newMessagesMissingRequiredFields() {
-    List<Proto2Message> results = new ArrayList<>();
-    for (int i = 71; i <= 88; ++i) {
-      Proto2Message.Builder builder = Proto2Message.newBuilder();
-      populateRequiredFields(builder, i);
-      results.add(builder.buildPartial());
-    }
-    {
-      // A nested optional message field is missing required fields.
-      Proto2Message.Builder builder = Proto2Message.newBuilder();
-      populateRequiredFields(builder, INCLUDE_ALL_REQUIRED_FIELDS);
-      builder.setFieldMessage10(Proto2Message.getDefaultInstance());
-      results.add(builder.buildPartial());
-    }
-    {
-      // A nested repeated message field is missing required fields.
-      Proto2Message.Builder builder = Proto2Message.newBuilder();
-      populateRequiredFields(builder, INCLUDE_ALL_REQUIRED_FIELDS);
-      builder.addFieldMessageList27(Proto2Message.getDefaultInstance());
-      results.add(builder.buildPartial());
-    }
-    {
-      // A nested oneof message field is missing required fields.
-      Proto2Message.Builder builder = Proto2Message.newBuilder();
-      populateRequiredFields(builder, INCLUDE_ALL_REQUIRED_FIELDS);
-      builder.setFieldMessage62(Proto2Message.getDefaultInstance());
-      results.add(builder.buildPartial());
-    }
-    return results;
-  }
-
-  // 0 is not a valid field number so we use it to mean no fields are excluded.
-  private static final int INCLUDE_ALL_REQUIRED_FIELDS = 0;
-
-  private void populateRequiredFields(Proto2Message.Builder builder, int excludedFieldNumber) {
-    if (excludedFieldNumber != 71) {
-      builder.setFieldRequiredDouble71(data.getDouble());
-    }
-    if (excludedFieldNumber != 72) {
-      builder.setFieldRequiredFloat72(data.getFloat());
-    }
-    if (excludedFieldNumber != 73) {
-      builder.setFieldRequiredInt6473(data.getLong());
-    }
-    if (excludedFieldNumber != 74) {
-      builder.setFieldRequiredUint6474(data.getLong());
-    }
-    if (excludedFieldNumber != 75) {
-      builder.setFieldRequiredInt3275(data.getInt());
-    }
-    if (excludedFieldNumber != 76) {
-      builder.setFieldRequiredFixed6476(data.getLong());
-    }
-    if (excludedFieldNumber != 77) {
-      builder.setFieldRequiredFixed3277(data.getInt());
-    }
-    if (excludedFieldNumber != 78) {
-      builder.setFieldRequiredBool78(data.getBool());
-    }
-    if (excludedFieldNumber != 79) {
-      builder.setFieldRequiredString79(data.getString());
-    }
-    if (excludedFieldNumber != 80) {
-      builder.setFieldRequiredMessage80(
-          Proto2Message.RequiredNestedMessage.newBuilder().setValue(data.getInt()));
-    }
-    if (excludedFieldNumber != 81) {
-      builder.setFieldRequiredBytes81(data.getBytes());
-    }
-    if (excludedFieldNumber != 82) {
-      builder.setFieldRequiredUint3282(data.getInt());
-    }
-    if (excludedFieldNumber != 83) {
-      builder.setFieldRequiredEnum83(Proto2Message.TestEnum.forNumber(data.getEnum()));
-    }
-    if (excludedFieldNumber != 84) {
-      builder.setFieldRequiredSfixed3284(data.getInt());
-    }
-    if (excludedFieldNumber != 85) {
-      builder.setFieldRequiredSfixed6485(data.getLong());
-    }
-    if (excludedFieldNumber != 86) {
-      builder.setFieldRequiredSint3286(data.getInt());
-    }
-    if (excludedFieldNumber != 87) {
-      builder.setFieldRequiredSint6487(data.getLong());
-    }
-    if (excludedFieldNumber != 88) {
-      builder.setFieldRequiredGroup88(
-          Proto2Message.FieldRequiredGroup88.newBuilder().setFieldInt3289(data.getInt()));
-    }
-  }
-}
diff --git a/libs/protobuf/java/core/src/test/java/com/google/protobuf/Proto2MessageLiteFactory.java b/libs/protobuf/java/core/src/test/java/com/google/protobuf/Proto2MessageLiteFactory.java
deleted file mode 100644
index 2da3494..0000000
--- a/libs/protobuf/java/core/src/test/java/com/google/protobuf/Proto2MessageLiteFactory.java
+++ /dev/null
@@ -1,558 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import com.google.protobuf.testing.Proto2TestingLite.Proto2MessageLite;
-import com.google.protobuf.testing.Proto2TestingLite.Proto2MessageLiteWithMaps;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/** Creates instances of {@link Proto2MessageLite} based on the tree configuration. */
-public final class Proto2MessageLiteFactory
-    implements ExperimentalMessageFactory<Proto2MessageLite> {
-  private final int numRepeatedFields;
-  private final int branchingFactor;
-  private final Proto2MessageLiteFactory nextLevel;
-  private final ExperimentalTestDataProvider data;
-
-  public Proto2MessageLiteFactory(
-      int numRepeatedFields, int stringLength, int branchingFactor, int treeDepth) {
-    this(
-        new ExperimentalTestDataProvider(stringLength),
-        numRepeatedFields,
-        branchingFactor,
-        treeDepth);
-  }
-
-  private Proto2MessageLiteFactory(
-      ExperimentalTestDataProvider data,
-      int numRepeatedFields,
-      int branchingFactor,
-      int treeDepth) {
-    this.numRepeatedFields = numRepeatedFields;
-    this.branchingFactor = branchingFactor;
-    this.data = data;
-    if (treeDepth > 0) {
-      nextLevel =
-          new Proto2MessageLiteFactory(data, numRepeatedFields, branchingFactor, treeDepth - 1);
-    } else {
-      nextLevel = null;
-    }
-  }
-
-  @Override
-  public ExperimentalTestDataProvider dataProvider() {
-    return data;
-  }
-
-  @Override
-  public Proto2MessageLite newMessage() {
-    Proto2MessageLite.Builder builder = Proto2MessageLite.newBuilder();
-    builder.setFieldDouble1(data.getDouble());
-    builder.setFieldFloat2(data.getFloat());
-    builder.setFieldInt643(data.getLong());
-    builder.setFieldUint644(data.getLong());
-    builder.setFieldInt325(data.getInt());
-    builder.setFieldFixed646(data.getLong());
-    builder.setFieldFixed327(data.getInt());
-    builder.setFieldBool8(data.getBool());
-    builder.setFieldString9(data.getString());
-    // We don't populate the message field. Instead we apply the branching factor to the
-    // repeated message field below.
-    builder.setFieldBytes11(data.getBytes());
-    builder.setFieldUint3212(data.getInt());
-    builder.setFieldEnum13(Proto2MessageLite.TestEnum.forNumber(data.getEnum()));
-    builder.setFieldSfixed3214(data.getInt());
-    builder.setFieldSfixed6415(data.getLong());
-    builder.setFieldSint3216(data.getInt());
-    builder.setFieldSint6417(data.getLong());
-
-    for (int i = 0; i < numRepeatedFields; ++i) {
-      builder.addFieldDoubleList18(data.getDouble());
-      builder.addFieldFloatList19(data.getFloat());
-      builder.addFieldInt64List20(data.getLong());
-      builder.addFieldUint64List21(data.getLong());
-      builder.addFieldInt32List22(data.getInt());
-      builder.addFieldFixed64List23(data.getLong());
-      builder.addFieldFixed32List24(data.getInt());
-      builder.addFieldBoolList25(data.getBool());
-      builder.addFieldStringList26(data.getString());
-      // Repeated message field is controlled by the branching factor below.
-      builder.addFieldBytesList28(data.getBytes());
-      builder.addFieldUint32List29(data.getInt());
-      builder.addFieldEnumList30(Proto2MessageLite.TestEnum.forNumber(data.getEnum()));
-      builder.addFieldSfixed32List31(data.getInt());
-      builder.addFieldSfixed64List32(data.getLong());
-      builder.addFieldSint32List33(data.getInt());
-      builder.addFieldSint64List34(data.getLong());
-
-      builder.addFieldDoubleListPacked35(data.getDouble());
-      builder.addFieldFloatListPacked36(data.getFloat());
-      builder.addFieldInt64ListPacked37(data.getLong());
-      builder.addFieldUint64ListPacked38(data.getLong());
-      builder.addFieldInt32ListPacked39(data.getInt());
-      builder.addFieldFixed64ListPacked40(data.getLong());
-      builder.addFieldFixed32ListPacked41(data.getInt());
-      builder.addFieldBoolListPacked42(data.getBool());
-      builder.addFieldUint32ListPacked43(data.getInt());
-      builder.addFieldEnumListPacked44(Proto2MessageLite.TestEnum.forNumber(data.getEnum()));
-      builder.addFieldSfixed32ListPacked45(data.getInt());
-      builder.addFieldSfixed64ListPacked46(data.getLong());
-      builder.addFieldSint32ListPacked47(data.getInt());
-      builder.addFieldSint64ListPacked48(data.getLong());
-    }
-
-    builder.setFieldGroup49(
-        Proto2MessageLite.FieldGroup49.newBuilder().setFieldInt3250(data.getInt()));
-
-    for (int i = 0; i < branchingFactor; ++i) {
-      builder.addFieldGroupList51(
-          Proto2MessageLite.FieldGroupList51.newBuilder().setFieldInt3252(data.getInt()));
-    }
-
-    // Set all required fields.
-    populateRequiredFields(builder, INCLUDE_ALL_REQUIRED_FIELDS);
-
-    // Handle the branching factor.
-    if (nextLevel != null) {
-      for (int i = 0; i < branchingFactor; ++i) {
-        builder.addFieldMessageList27(nextLevel.newMessage());
-      }
-    }
-
-    return builder.build();
-  }
-
-  private interface MapValueProvider<T> {
-    public T getValue();
-  }
-
-  private final MapValueProvider<Integer> integerProvider =
-      new MapValueProvider<Integer>() {
-        @Override
-        public Integer getValue() {
-          return data.getInt();
-        }
-      };
-  private final MapValueProvider<Long> longProvider =
-      new MapValueProvider<Long>() {
-        @Override
-        public Long getValue() {
-          return data.getLong();
-        }
-      };
-  private final MapValueProvider<String> stringProvider =
-      new MapValueProvider<String>() {
-        @Override
-        public String getValue() {
-          return data.getString();
-        }
-      };
-  private final MapValueProvider<ByteString> bytesProvider =
-      new MapValueProvider<ByteString>() {
-        @Override
-        public ByteString getValue() {
-          return data.getBytes();
-        }
-      };
-  private final MapValueProvider<Boolean> booleanProvider =
-      new MapValueProvider<Boolean>() {
-        @Override
-        public Boolean getValue() {
-          return data.getBool();
-        }
-      };
-  private final MapValueProvider<Float> floatProvider =
-      new MapValueProvider<Float>() {
-        @Override
-        public Float getValue() {
-          return data.getFloat();
-        }
-      };
-  private final MapValueProvider<Double> doubleProvider =
-      new MapValueProvider<Double>() {
-        @Override
-        public Double getValue() {
-          return data.getDouble();
-        }
-      };
-  private final MapValueProvider<Proto2MessageLite> messageProvider =
-      new MapValueProvider<Proto2MessageLite>() {
-        @Override
-        public Proto2MessageLite getValue() {
-          return newMessage();
-        }
-      };
-  private final MapValueProvider<Proto2MessageLite.TestEnum> enumProvider =
-      new MapValueProvider<Proto2MessageLite.TestEnum>() {
-        @Override
-        public Proto2MessageLite.TestEnum getValue() {
-          return Proto2MessageLite.TestEnum.forNumber(data.getEnum());
-        }
-      };
-
-  private <V> Map<Integer, V> populateIntegerMap(MapValueProvider<V> provider) {
-    Map<Integer, V> map = new HashMap<>();
-    for (int i = 0; i < numRepeatedFields; ++i) {
-      map.put(data.getInt(), provider.getValue());
-    }
-    return map;
-  }
-
-  private <V> Map<Long, V> populateLongMap(MapValueProvider<V> provider) {
-    Map<Long, V> map = new HashMap<>();
-    for (int i = 0; i < numRepeatedFields; ++i) {
-      map.put(data.getLong(), provider.getValue());
-    }
-    return map;
-  }
-
-  private <V> Map<String, V> populateStringMap(MapValueProvider<V> provider) {
-    Map<String, V> map = new HashMap<>();
-    for (int i = 0; i < numRepeatedFields; ++i) {
-      map.put(data.getString(), provider.getValue());
-    }
-    return map;
-  }
-
-  private <V> Map<Boolean, V> populateBooleanMap(MapValueProvider<V> provider) {
-    Map<Boolean, V> map = new HashMap<>();
-    map.put(false, provider.getValue());
-    map.put(true, provider.getValue());
-    return map;
-  }
-
-  public Proto2MessageLiteWithMaps newMessageWithMaps() {
-    Proto2MessageLiteWithMaps.Builder builder = Proto2MessageLiteWithMaps.newBuilder();
-
-    builder.putAllFieldMapBoolBool1(populateBooleanMap(booleanProvider));
-    builder.putAllFieldMapBoolBytes2(populateBooleanMap(bytesProvider));
-    builder.putAllFieldMapBoolDouble3(populateBooleanMap(doubleProvider));
-    builder.putAllFieldMapBoolEnum4(populateBooleanMap(enumProvider));
-    builder.putAllFieldMapBoolFixed325(populateBooleanMap(integerProvider));
-    builder.putAllFieldMapBoolFixed646(populateBooleanMap(longProvider));
-    builder.putAllFieldMapBoolFloat7(populateBooleanMap(floatProvider));
-    builder.putAllFieldMapBoolInt328(populateBooleanMap(integerProvider));
-    builder.putAllFieldMapBoolInt649(populateBooleanMap(longProvider));
-    builder.putAllFieldMapBoolMessage10(populateBooleanMap(messageProvider));
-    builder.putAllFieldMapBoolSfixed3211(populateBooleanMap(integerProvider));
-    builder.putAllFieldMapBoolSfixed6412(populateBooleanMap(longProvider));
-    builder.putAllFieldMapBoolSint3213(populateBooleanMap(integerProvider));
-    builder.putAllFieldMapBoolSint6414(populateBooleanMap(longProvider));
-    builder.putAllFieldMapBoolString15(populateBooleanMap(stringProvider));
-    builder.putAllFieldMapBoolUint3216(populateBooleanMap(integerProvider));
-    builder.putAllFieldMapBoolUint6417(populateBooleanMap(longProvider));
-    builder.putAllFieldMapFixed32Bool18(populateIntegerMap(booleanProvider));
-    builder.putAllFieldMapFixed32Bytes19(populateIntegerMap(bytesProvider));
-    builder.putAllFieldMapFixed32Double20(populateIntegerMap(doubleProvider));
-    builder.putAllFieldMapFixed32Enum21(populateIntegerMap(enumProvider));
-    builder.putAllFieldMapFixed32Fixed3222(populateIntegerMap(integerProvider));
-    builder.putAllFieldMapFixed32Fixed6423(populateIntegerMap(longProvider));
-    builder.putAllFieldMapFixed32Float24(populateIntegerMap(floatProvider));
-    builder.putAllFieldMapFixed32Int3225(populateIntegerMap(integerProvider));
-    builder.putAllFieldMapFixed32Int6426(populateIntegerMap(longProvider));
-    builder.putAllFieldMapFixed32Message27(populateIntegerMap(messageProvider));
-    builder.putAllFieldMapFixed32Sfixed3228(populateIntegerMap(integerProvider));
-    builder.putAllFieldMapFixed32Sfixed6429(populateIntegerMap(longProvider));
-    builder.putAllFieldMapFixed32Sint3230(populateIntegerMap(integerProvider));
-    builder.putAllFieldMapFixed32Sint6431(populateIntegerMap(longProvider));
-    builder.putAllFieldMapFixed32String32(populateIntegerMap(stringProvider));
-    builder.putAllFieldMapFixed32Uint3233(populateIntegerMap(integerProvider));
-    builder.putAllFieldMapFixed32Uint6434(populateIntegerMap(longProvider));
-    builder.putAllFieldMapFixed64Bool35(populateLongMap(booleanProvider));
-    builder.putAllFieldMapFixed64Bytes36(populateLongMap(bytesProvider));
-    builder.putAllFieldMapFixed64Double37(populateLongMap(doubleProvider));
-    builder.putAllFieldMapFixed64Enum38(populateLongMap(enumProvider));
-    builder.putAllFieldMapFixed64Fixed3239(populateLongMap(integerProvider));
-    builder.putAllFieldMapFixed64Fixed6440(populateLongMap(longProvider));
-    builder.putAllFieldMapFixed64Float41(populateLongMap(floatProvider));
-    builder.putAllFieldMapFixed64Int3242(populateLongMap(integerProvider));
-    builder.putAllFieldMapFixed64Int6443(populateLongMap(longProvider));
-    builder.putAllFieldMapFixed64Message44(populateLongMap(messageProvider));
-    builder.putAllFieldMapFixed64Sfixed3245(populateLongMap(integerProvider));
-    builder.putAllFieldMapFixed64Sfixed6446(populateLongMap(longProvider));
-    builder.putAllFieldMapFixed64Sint3247(populateLongMap(integerProvider));
-    builder.putAllFieldMapFixed64Sint6448(populateLongMap(longProvider));
-    builder.putAllFieldMapFixed64String49(populateLongMap(stringProvider));
-    builder.putAllFieldMapFixed64Uint3250(populateLongMap(integerProvider));
-    builder.putAllFieldMapFixed64Uint6451(populateLongMap(longProvider));
-    builder.putAllFieldMapInt32Bool52(populateIntegerMap(booleanProvider));
-    builder.putAllFieldMapInt32Bytes53(populateIntegerMap(bytesProvider));
-    builder.putAllFieldMapInt32Double54(populateIntegerMap(doubleProvider));
-    builder.putAllFieldMapInt32Enum55(populateIntegerMap(enumProvider));
-    builder.putAllFieldMapInt32Fixed3256(populateIntegerMap(integerProvider));
-    builder.putAllFieldMapInt32Fixed6457(populateIntegerMap(longProvider));
-    builder.putAllFieldMapInt32Float58(populateIntegerMap(floatProvider));
-    builder.putAllFieldMapInt32Int3259(populateIntegerMap(integerProvider));
-    builder.putAllFieldMapInt32Int6460(populateIntegerMap(longProvider));
-    builder.putAllFieldMapInt32Message61(populateIntegerMap(messageProvider));
-    builder.putAllFieldMapInt32Sfixed3262(populateIntegerMap(integerProvider));
-    builder.putAllFieldMapInt32Sfixed6463(populateIntegerMap(longProvider));
-    builder.putAllFieldMapInt32Sint3264(populateIntegerMap(integerProvider));
-    builder.putAllFieldMapInt32Sint6465(populateIntegerMap(longProvider));
-    builder.putAllFieldMapInt32String66(populateIntegerMap(stringProvider));
-    builder.putAllFieldMapInt32Uint3267(populateIntegerMap(integerProvider));
-    builder.putAllFieldMapInt32Uint6468(populateIntegerMap(longProvider));
-    builder.putAllFieldMapInt64Bool69(populateLongMap(booleanProvider));
-    builder.putAllFieldMapInt64Bytes70(populateLongMap(bytesProvider));
-    builder.putAllFieldMapInt64Double71(populateLongMap(doubleProvider));
-    builder.putAllFieldMapInt64Enum72(populateLongMap(enumProvider));
-    builder.putAllFieldMapInt64Fixed3273(populateLongMap(integerProvider));
-    builder.putAllFieldMapInt64Fixed6474(populateLongMap(longProvider));
-    builder.putAllFieldMapInt64Float75(populateLongMap(floatProvider));
-    builder.putAllFieldMapInt64Int3276(populateLongMap(integerProvider));
-    builder.putAllFieldMapInt64Int6477(populateLongMap(longProvider));
-    builder.putAllFieldMapInt64Message78(populateLongMap(messageProvider));
-    builder.putAllFieldMapInt64Sfixed3279(populateLongMap(integerProvider));
-    builder.putAllFieldMapInt64Sfixed6480(populateLongMap(longProvider));
-    builder.putAllFieldMapInt64Sint3281(populateLongMap(integerProvider));
-    builder.putAllFieldMapInt64Sint6482(populateLongMap(longProvider));
-    builder.putAllFieldMapInt64String83(populateLongMap(stringProvider));
-    builder.putAllFieldMapInt64Uint3284(populateLongMap(integerProvider));
-    builder.putAllFieldMapInt64Uint6485(populateLongMap(longProvider));
-    builder.putAllFieldMapSfixed32Bool86(populateIntegerMap(booleanProvider));
-    builder.putAllFieldMapSfixed32Bytes87(populateIntegerMap(bytesProvider));
-    builder.putAllFieldMapSfixed32Double88(populateIntegerMap(doubleProvider));
-    builder.putAllFieldMapSfixed32Enum89(populateIntegerMap(enumProvider));
-    builder.putAllFieldMapSfixed32Fixed3290(populateIntegerMap(integerProvider));
-    builder.putAllFieldMapSfixed32Fixed6491(populateIntegerMap(longProvider));
-    builder.putAllFieldMapSfixed32Float92(populateIntegerMap(floatProvider));
-    builder.putAllFieldMapSfixed32Int3293(populateIntegerMap(integerProvider));
-    builder.putAllFieldMapSfixed32Int6494(populateIntegerMap(longProvider));
-    builder.putAllFieldMapSfixed32Message95(populateIntegerMap(messageProvider));
-    builder.putAllFieldMapSfixed32Sfixed3296(populateIntegerMap(integerProvider));
-    builder.putAllFieldMapSfixed32Sfixed6497(populateIntegerMap(longProvider));
-    builder.putAllFieldMapSfixed32Sint3298(populateIntegerMap(integerProvider));
-    builder.putAllFieldMapSfixed32Sint6499(populateIntegerMap(longProvider));
-    builder.putAllFieldMapSfixed32String100(populateIntegerMap(stringProvider));
-    builder.putAllFieldMapSfixed32Uint32101(populateIntegerMap(integerProvider));
-    builder.putAllFieldMapSfixed32Uint64102(populateIntegerMap(longProvider));
-    builder.putAllFieldMapSfixed64Bool103(populateLongMap(booleanProvider));
-    builder.putAllFieldMapSfixed64Bytes104(populateLongMap(bytesProvider));
-    builder.putAllFieldMapSfixed64Double105(populateLongMap(doubleProvider));
-    builder.putAllFieldMapSfixed64Enum106(populateLongMap(enumProvider));
-    builder.putAllFieldMapSfixed64Fixed32107(populateLongMap(integerProvider));
-    builder.putAllFieldMapSfixed64Fixed64108(populateLongMap(longProvider));
-    builder.putAllFieldMapSfixed64Float109(populateLongMap(floatProvider));
-    builder.putAllFieldMapSfixed64Int32110(populateLongMap(integerProvider));
-    builder.putAllFieldMapSfixed64Int64111(populateLongMap(longProvider));
-    builder.putAllFieldMapSfixed64Message112(populateLongMap(messageProvider));
-    builder.putAllFieldMapSfixed64Sfixed32113(populateLongMap(integerProvider));
-    builder.putAllFieldMapSfixed64Sfixed64114(populateLongMap(longProvider));
-    builder.putAllFieldMapSfixed64Sint32115(populateLongMap(integerProvider));
-    builder.putAllFieldMapSfixed64Sint64116(populateLongMap(longProvider));
-    builder.putAllFieldMapSfixed64String117(populateLongMap(stringProvider));
-    builder.putAllFieldMapSfixed64Uint32118(populateLongMap(integerProvider));
-    builder.putAllFieldMapSfixed64Uint64119(populateLongMap(longProvider));
-    builder.putAllFieldMapSint32Bool120(populateIntegerMap(booleanProvider));
-    builder.putAllFieldMapSint32Bytes121(populateIntegerMap(bytesProvider));
-    builder.putAllFieldMapSint32Double122(populateIntegerMap(doubleProvider));
-    builder.putAllFieldMapSint32Enum123(populateIntegerMap(enumProvider));
-    builder.putAllFieldMapSint32Fixed32124(populateIntegerMap(integerProvider));
-    builder.putAllFieldMapSint32Fixed64125(populateIntegerMap(longProvider));
-    builder.putAllFieldMapSint32Float126(populateIntegerMap(floatProvider));
-    builder.putAllFieldMapSint32Int32127(populateIntegerMap(integerProvider));
-    builder.putAllFieldMapSint32Int64128(populateIntegerMap(longProvider));
-    builder.putAllFieldMapSint32Message129(populateIntegerMap(messageProvider));
-    builder.putAllFieldMapSint32Sfixed32130(populateIntegerMap(integerProvider));
-    builder.putAllFieldMapSint32Sfixed64131(populateIntegerMap(longProvider));
-    builder.putAllFieldMapSint32Sint32132(populateIntegerMap(integerProvider));
-    builder.putAllFieldMapSint32Sint64133(populateIntegerMap(longProvider));
-    builder.putAllFieldMapSint32String134(populateIntegerMap(stringProvider));
-    builder.putAllFieldMapSint32Uint32135(populateIntegerMap(integerProvider));
-    builder.putAllFieldMapSint32Uint64136(populateIntegerMap(longProvider));
-    builder.putAllFieldMapSint64Bool137(populateLongMap(booleanProvider));
-    builder.putAllFieldMapSint64Bytes138(populateLongMap(bytesProvider));
-    builder.putAllFieldMapSint64Double139(populateLongMap(doubleProvider));
-    builder.putAllFieldMapSint64Enum140(populateLongMap(enumProvider));
-    builder.putAllFieldMapSint64Fixed32141(populateLongMap(integerProvider));
-    builder.putAllFieldMapSint64Fixed64142(populateLongMap(longProvider));
-    builder.putAllFieldMapSint64Float143(populateLongMap(floatProvider));
-    builder.putAllFieldMapSint64Int32144(populateLongMap(integerProvider));
-    builder.putAllFieldMapSint64Int64145(populateLongMap(longProvider));
-    builder.putAllFieldMapSint64Message146(populateLongMap(messageProvider));
-    builder.putAllFieldMapSint64Sfixed32147(populateLongMap(integerProvider));
-    builder.putAllFieldMapSint64Sfixed64148(populateLongMap(longProvider));
-    builder.putAllFieldMapSint64Sint32149(populateLongMap(integerProvider));
-    builder.putAllFieldMapSint64Sint64150(populateLongMap(longProvider));
-    builder.putAllFieldMapSint64String151(populateLongMap(stringProvider));
-    builder.putAllFieldMapSint64Uint32152(populateLongMap(integerProvider));
-    builder.putAllFieldMapSint64Uint64153(populateLongMap(longProvider));
-    builder.putAllFieldMapStringBool154(populateStringMap(booleanProvider));
-    builder.putAllFieldMapStringBytes155(populateStringMap(bytesProvider));
-    builder.putAllFieldMapStringDouble156(populateStringMap(doubleProvider));
-    builder.putAllFieldMapStringEnum157(populateStringMap(enumProvider));
-    builder.putAllFieldMapStringFixed32158(populateStringMap(integerProvider));
-    builder.putAllFieldMapStringFixed64159(populateStringMap(longProvider));
-    builder.putAllFieldMapStringFloat160(populateStringMap(floatProvider));
-    builder.putAllFieldMapStringInt32161(populateStringMap(integerProvider));
-    builder.putAllFieldMapStringInt64162(populateStringMap(longProvider));
-    builder.putAllFieldMapStringMessage163(populateStringMap(messageProvider));
-    builder.putAllFieldMapStringSfixed32164(populateStringMap(integerProvider));
-    builder.putAllFieldMapStringSfixed64165(populateStringMap(longProvider));
-    builder.putAllFieldMapStringSint32166(populateStringMap(integerProvider));
-    builder.putAllFieldMapStringSint64167(populateStringMap(longProvider));
-    builder.putAllFieldMapStringString168(populateStringMap(stringProvider));
-    builder.putAllFieldMapStringUint32169(populateStringMap(integerProvider));
-    builder.putAllFieldMapStringUint64170(populateStringMap(longProvider));
-    builder.putAllFieldMapUint32Bool171(populateIntegerMap(booleanProvider));
-    builder.putAllFieldMapUint32Bytes172(populateIntegerMap(bytesProvider));
-    builder.putAllFieldMapUint32Double173(populateIntegerMap(doubleProvider));
-    builder.putAllFieldMapUint32Enum174(populateIntegerMap(enumProvider));
-    builder.putAllFieldMapUint32Fixed32175(populateIntegerMap(integerProvider));
-    builder.putAllFieldMapUint32Fixed64176(populateIntegerMap(longProvider));
-    builder.putAllFieldMapUint32Float177(populateIntegerMap(floatProvider));
-    builder.putAllFieldMapUint32Int32178(populateIntegerMap(integerProvider));
-    builder.putAllFieldMapUint32Int64179(populateIntegerMap(longProvider));
-    builder.putAllFieldMapUint32Message180(populateIntegerMap(messageProvider));
-    builder.putAllFieldMapUint32Sfixed32181(populateIntegerMap(integerProvider));
-    builder.putAllFieldMapUint32Sfixed64182(populateIntegerMap(longProvider));
-    builder.putAllFieldMapUint32Sint32183(populateIntegerMap(integerProvider));
-    builder.putAllFieldMapUint32Sint64184(populateIntegerMap(longProvider));
-    builder.putAllFieldMapUint32String185(populateIntegerMap(stringProvider));
-    builder.putAllFieldMapUint32Uint32186(populateIntegerMap(integerProvider));
-    builder.putAllFieldMapUint32Uint64187(populateIntegerMap(longProvider));
-    builder.putAllFieldMapUint64Bool188(populateLongMap(booleanProvider));
-    builder.putAllFieldMapUint64Bytes189(populateLongMap(bytesProvider));
-    builder.putAllFieldMapUint64Double190(populateLongMap(doubleProvider));
-    builder.putAllFieldMapUint64Enum191(populateLongMap(enumProvider));
-    builder.putAllFieldMapUint64Fixed32192(populateLongMap(integerProvider));
-    builder.putAllFieldMapUint64Fixed64193(populateLongMap(longProvider));
-    builder.putAllFieldMapUint64Float194(populateLongMap(floatProvider));
-    builder.putAllFieldMapUint64Int32195(populateLongMap(integerProvider));
-    builder.putAllFieldMapUint64Int64196(populateLongMap(longProvider));
-    builder.putAllFieldMapUint64Message197(populateLongMap(messageProvider));
-    builder.putAllFieldMapUint64Sfixed32198(populateLongMap(integerProvider));
-    builder.putAllFieldMapUint64Sfixed64199(populateLongMap(longProvider));
-    builder.putAllFieldMapUint64Sint32200(populateLongMap(integerProvider));
-    builder.putAllFieldMapUint64Sint64201(populateLongMap(longProvider));
-    builder.putAllFieldMapUint64String202(populateLongMap(stringProvider));
-    builder.putAllFieldMapUint64Uint32203(populateLongMap(integerProvider));
-    builder.putAllFieldMapUint64Uint64204(populateLongMap(longProvider));
-
-    return builder.build();
-  }
-
-  public List<Proto2MessageLite> newMessagesMissingRequiredFields() {
-    List<Proto2MessageLite> results = new ArrayList<>();
-    for (int i = 71; i <= 88; ++i) {
-      Proto2MessageLite.Builder builder = Proto2MessageLite.newBuilder();
-      populateRequiredFields(builder, i);
-      results.add(builder.buildPartial());
-    }
-    {
-      // A nested optional message field is missing required fields.
-      Proto2MessageLite.Builder builder = Proto2MessageLite.newBuilder();
-      populateRequiredFields(builder, INCLUDE_ALL_REQUIRED_FIELDS);
-      builder.setFieldMessage10(Proto2MessageLite.getDefaultInstance());
-      results.add(builder.buildPartial());
-    }
-    {
-      // A nested repeated message field is missing required fields.
-      Proto2MessageLite.Builder builder = Proto2MessageLite.newBuilder();
-      populateRequiredFields(builder, INCLUDE_ALL_REQUIRED_FIELDS);
-      builder.addFieldMessageList27(Proto2MessageLite.getDefaultInstance());
-      results.add(builder.buildPartial());
-    }
-    {
-      // A nested oneof message field is missing required fields.
-      Proto2MessageLite.Builder builder = Proto2MessageLite.newBuilder();
-      populateRequiredFields(builder, INCLUDE_ALL_REQUIRED_FIELDS);
-      builder.setFieldMessage62(Proto2MessageLite.getDefaultInstance());
-      results.add(builder.buildPartial());
-    }
-    return results;
-  }
-
-  // 0 is not a valid field number so we use it to mean no fields are excluded.
-  private static final int INCLUDE_ALL_REQUIRED_FIELDS = 0;
-
-  private void populateRequiredFields(Proto2MessageLite.Builder builder, int excludedFieldNumber) {
-    if (excludedFieldNumber != 71) {
-      builder.setFieldRequiredDouble71(data.getDouble());
-    }
-    if (excludedFieldNumber != 72) {
-      builder.setFieldRequiredFloat72(data.getFloat());
-    }
-    if (excludedFieldNumber != 73) {
-      builder.setFieldRequiredInt6473(data.getLong());
-    }
-    if (excludedFieldNumber != 74) {
-      builder.setFieldRequiredUint6474(data.getLong());
-    }
-    if (excludedFieldNumber != 75) {
-      builder.setFieldRequiredInt3275(data.getInt());
-    }
-    if (excludedFieldNumber != 76) {
-      builder.setFieldRequiredFixed6476(data.getLong());
-    }
-    if (excludedFieldNumber != 77) {
-      builder.setFieldRequiredFixed3277(data.getInt());
-    }
-    if (excludedFieldNumber != 78) {
-      builder.setFieldRequiredBool78(data.getBool());
-    }
-    if (excludedFieldNumber != 79) {
-      builder.setFieldRequiredString79(data.getString());
-    }
-    if (excludedFieldNumber != 80) {
-      builder.setFieldRequiredMessage80(
-          Proto2MessageLite.RequiredNestedMessage.newBuilder().setValue(data.getInt()));
-    }
-    if (excludedFieldNumber != 81) {
-      builder.setFieldRequiredBytes81(data.getBytes());
-    }
-    if (excludedFieldNumber != 82) {
-      builder.setFieldRequiredUint3282(data.getInt());
-    }
-    if (excludedFieldNumber != 83) {
-      builder.setFieldRequiredEnum83(Proto2MessageLite.TestEnum.forNumber(data.getEnum()));
-    }
-    if (excludedFieldNumber != 84) {
-      builder.setFieldRequiredSfixed3284(data.getInt());
-    }
-    if (excludedFieldNumber != 85) {
-      builder.setFieldRequiredSfixed6485(data.getLong());
-    }
-    if (excludedFieldNumber != 86) {
-      builder.setFieldRequiredSint3286(data.getInt());
-    }
-    if (excludedFieldNumber != 87) {
-      builder.setFieldRequiredSint6487(data.getLong());
-    }
-    if (excludedFieldNumber != 88) {
-      builder.setFieldRequiredGroup88(
-          Proto2MessageLite.FieldRequiredGroup88.newBuilder().setFieldInt3289(data.getInt()));
-    }
-  }
-}
diff --git a/libs/protobuf/java/core/src/test/java/com/google/protobuf/Proto2SchemaTest.java b/libs/protobuf/java/core/src/test/java/com/google/protobuf/Proto2SchemaTest.java
deleted file mode 100644
index 098e7fe..0000000
--- a/libs/protobuf/java/core/src/test/java/com/google/protobuf/Proto2SchemaTest.java
+++ /dev/null
@@ -1,49 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import com.google.protobuf.testing.Proto2Testing.Proto2Message;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-@RunWith(JUnit4.class)
-public class Proto2SchemaTest extends AbstractProto2SchemaTest {
-
-  @Override
-  protected Schema<Proto2Message> schema() {
-    return TestSchemas.genericProto2Schema;
-  }
-
-  @Override
-  protected void registerSchemas() {
-    TestSchemas.registerGenericProto2Schemas();
-  }
-}
diff --git a/libs/protobuf/java/core/src/test/java/com/google/protobuf/Proto2UnknownEnumValueTest.java b/libs/protobuf/java/core/src/test/java/com/google/protobuf/Proto2UnknownEnumValueTest.java
deleted file mode 100644
index d1e4a90..0000000
--- a/libs/protobuf/java/core/src/test/java/com/google/protobuf/Proto2UnknownEnumValueTest.java
+++ /dev/null
@@ -1,115 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import com.google.protobuf.Descriptors.FieldDescriptor;
-import protobuf_unittest.UnittestProto;
-import protobuf_unittest.UnittestProto.TestAllExtensions;
-import protobuf_unittest.UnittestProto.TestAllTypes;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-/** Unit tests for proto2 that treats unknown enum values as unknown fields. */
-@RunWith(JUnit4.class)
-public class Proto2UnknownEnumValueTest {
-  FieldDescriptor singularField =
-      TestAllTypes.getDescriptor().findFieldByName("optional_nested_enum");
-  FieldDescriptor repeatedField =
-      TestAllTypes.getDescriptor().findFieldByName("repeated_nested_enum");
-  byte[] payload = buildPayloadWithUnknownEnumValues();
-
-  private byte[] buildPayloadWithUnknownEnumValues() {
-    // Builds a payload with unknown enum values.
-    UnknownFieldSet.Builder builder = UnknownFieldSet.newBuilder();
-    builder.addField(
-        singularField.getNumber(),
-        UnknownFieldSet.Field.newBuilder()
-            .addVarint(TestAllTypes.NestedEnum.BAR.getNumber())
-            .addVarint(1901 /* unknown enum value */)
-            .build());
-    builder.addField(
-        repeatedField.getNumber(),
-        UnknownFieldSet.Field.newBuilder()
-            .addVarint(TestAllTypes.NestedEnum.FOO.getNumber())
-            .addVarint(1902 /* unknown enum value */)
-            .addVarint(TestAllTypes.NestedEnum.BAZ.getNumber())
-            .addVarint(1903 /* unknown enum value */)
-            .build());
-    return builder.build().toByteArray();
-  }
-
-  @Test
-  public void testUnknownEnumValues() throws Exception {
-    TestAllTypes message = TestAllTypes.parseFrom(payload);
-
-    // Known enum values should be preserved.
-    assertThat(message.getOptionalNestedEnum()).isEqualTo(TestAllTypes.NestedEnum.BAR);
-    assertThat(message.getRepeatedNestedEnumList().size()).isEqualTo(2);
-    assertThat(message.getRepeatedNestedEnum(0)).isEqualTo(TestAllTypes.NestedEnum.FOO);
-    assertThat(message.getRepeatedNestedEnum(1)).isEqualTo(TestAllTypes.NestedEnum.BAZ);
-
-    // Unknown enum values should be found in UnknownFieldSet.
-    UnknownFieldSet unknown = message.getUnknownFields();
-    assertThat(unknown.getField(singularField.getNumber()).getVarintList().get(0).longValue())
-        .isEqualTo(1901);
-    assertThat(unknown.getField(repeatedField.getNumber()).getVarintList().get(0).longValue())
-        .isEqualTo(1902);
-    assertThat(unknown.getField(repeatedField.getNumber()).getVarintList().get(1).longValue())
-        .isEqualTo(1903);
-  }
-
-  @Test
-  public void testExtensionUnknownEnumValues() throws Exception {
-    ExtensionRegistry registry = ExtensionRegistry.newInstance();
-    UnittestProto.registerAllExtensions(registry);
-    TestAllExtensions message = TestAllExtensions.parseFrom(payload, registry);
-
-    assertThat(message.getExtension(UnittestProto.optionalNestedEnumExtension))
-        .isEqualTo(TestAllTypes.NestedEnum.BAR);
-    assertThat(message.getExtension(UnittestProto.repeatedNestedEnumExtension).size()).isEqualTo(2);
-    assertThat(message.getExtension(UnittestProto.repeatedNestedEnumExtension, 0))
-        .isEqualTo(TestAllTypes.NestedEnum.FOO);
-    assertThat(message.getExtension(UnittestProto.repeatedNestedEnumExtension, 1))
-        .isEqualTo(TestAllTypes.NestedEnum.BAZ);
-
-    // Unknown enum values should be found in UnknownFieldSet.
-    UnknownFieldSet unknown = message.getUnknownFields();
-    assertThat(unknown.getField(singularField.getNumber()).getVarintList().get(0).longValue())
-        .isEqualTo(1901);
-    assertThat(unknown.getField(repeatedField.getNumber()).getVarintList().get(0).longValue())
-        .isEqualTo(1902);
-    assertThat(unknown.getField(repeatedField.getNumber()).getVarintList().get(1).longValue())
-        .isEqualTo(1903);
-  }
-}
diff --git a/libs/protobuf/java/core/src/test/java/com/google/protobuf/Proto3LiteSchemaTest.java b/libs/protobuf/java/core/src/test/java/com/google/protobuf/Proto3LiteSchemaTest.java
deleted file mode 100644
index ac9d6df..0000000
--- a/libs/protobuf/java/core/src/test/java/com/google/protobuf/Proto3LiteSchemaTest.java
+++ /dev/null
@@ -1,49 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import com.google.protobuf.testing.Proto3TestingLite.Proto3MessageLite;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-@RunWith(JUnit4.class)
-public class Proto3LiteSchemaTest extends AbstractProto3LiteSchemaTest {
-
-  @Override
-  protected Schema<Proto3MessageLite> schema() {
-    return TestSchemasLite.genericProto3LiteSchema;
-  }
-
-  @Override
-  protected void registerSchemas() {
-    TestSchemasLite.registerGenericProto3LiteSchemas();
-  }
-}
diff --git a/libs/protobuf/java/core/src/test/java/com/google/protobuf/Proto3MessageFactory.java b/libs/protobuf/java/core/src/test/java/com/google/protobuf/Proto3MessageFactory.java
deleted file mode 100644
index 33d5fe0..0000000
--- a/libs/protobuf/java/core/src/test/java/com/google/protobuf/Proto3MessageFactory.java
+++ /dev/null
@@ -1,450 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import com.google.protobuf.testing.Proto3Testing.Proto3Message;
-import com.google.protobuf.testing.Proto3Testing.Proto3MessageWithMaps;
-import java.util.HashMap;
-import java.util.Map;
-
-/** Creates instances of {@link Proto3Message} based on the tree configuration. */
-public final class Proto3MessageFactory implements ExperimentalMessageFactory<Proto3Message> {
-  private final int numRepeatedFields;
-  private final int branchingFactor;
-  private final Proto3MessageFactory nextLevel;
-  private final ExperimentalTestDataProvider data;
-
-  public Proto3MessageFactory(
-      int numRepeatedFields, int stringLength, int branchingFactor, int treeDepth) {
-    this(
-        new ExperimentalTestDataProvider(stringLength),
-        numRepeatedFields,
-        branchingFactor,
-        treeDepth);
-  }
-
-  private Proto3MessageFactory(
-      ExperimentalTestDataProvider data,
-      int numRepeatedFields,
-      int branchingFactor,
-      int treeDepth) {
-    this.numRepeatedFields = numRepeatedFields;
-    this.branchingFactor = branchingFactor;
-    this.data = data;
-    if (treeDepth > 0) {
-      nextLevel = new Proto3MessageFactory(data, numRepeatedFields, branchingFactor, treeDepth - 1);
-    } else {
-      nextLevel = null;
-    }
-  }
-
-  @Override
-  public ExperimentalTestDataProvider dataProvider() {
-    return data;
-  }
-
-  @Override
-  public Proto3Message newMessage() {
-    Proto3Message.Builder builder = Proto3Message.newBuilder();
-    builder.setFieldDouble1(data.getDouble());
-    builder.setFieldFloat2(data.getFloat());
-    builder.setFieldInt643(data.getLong());
-    builder.setFieldUint644(data.getLong());
-    builder.setFieldInt325(data.getInt());
-    builder.setFieldFixed646(data.getLong());
-    builder.setFieldFixed327(data.getInt());
-    builder.setFieldBool8(data.getBool());
-    builder.setFieldString9(data.getString());
-    // We don't populate the message field. Instead we apply the branching factor to the
-    // repeated message field below.
-    builder.setFieldBytes11(data.getBytes());
-    builder.setFieldUint3212(data.getInt());
-    builder.setFieldEnum13Value(data.getEnum());
-    builder.setFieldSfixed3214(data.getInt());
-    builder.setFieldSfixed6415(data.getLong());
-    builder.setFieldSint3216(data.getInt());
-    builder.setFieldSint6417(data.getLong());
-
-    for (int i = 0; i < numRepeatedFields; ++i) {
-      builder.addFieldDoubleList18(data.getDouble());
-      builder.addFieldFloatList19(data.getFloat());
-      builder.addFieldInt64List20(data.getLong());
-      builder.addFieldUint64List21(data.getLong());
-      builder.addFieldInt32List22(data.getInt());
-      builder.addFieldFixed64List23(data.getLong());
-      builder.addFieldFixed32List24(data.getInt());
-      builder.addFieldBoolList25(data.getBool());
-      builder.addFieldStringList26(data.getString());
-      // Repeated message field is controlled by the branching factor below.
-      builder.addFieldBytesList28(data.getBytes());
-      builder.addFieldUint32List29(data.getInt());
-      builder.addFieldEnumList30Value(data.getEnum());
-      builder.addFieldSfixed32List31(data.getInt());
-      builder.addFieldSfixed64List32(data.getLong());
-      builder.addFieldSint32List33(data.getInt());
-      builder.addFieldSint64List34(data.getLong());
-
-      builder.addFieldDoubleListPacked35(data.getDouble());
-      builder.addFieldFloatListPacked36(data.getFloat());
-      builder.addFieldInt64ListPacked37(data.getLong());
-      builder.addFieldUint64ListPacked38(data.getLong());
-      builder.addFieldInt32ListPacked39(data.getInt());
-      builder.addFieldFixed64ListPacked40(data.getLong());
-      builder.addFieldFixed32ListPacked41(data.getInt());
-      builder.addFieldBoolListPacked42(data.getBool());
-      builder.addFieldUint32ListPacked43(data.getInt());
-      builder.addFieldEnumListPacked44Value(data.getEnum());
-      builder.addFieldSfixed32ListPacked45(data.getInt());
-      builder.addFieldSfixed64ListPacked46(data.getLong());
-      builder.addFieldSint32ListPacked47(data.getInt());
-      builder.addFieldSint64ListPacked48(data.getLong());
-    }
-
-    // Handle the branching factor.
-    if (nextLevel != null) {
-      for (int i = 0; i < branchingFactor; ++i) {
-        builder.addFieldMessageList27(nextLevel.newMessage());
-      }
-    }
-
-    return builder.build();
-  }
-
-  private interface MapValueProvider<T> {
-    public T getValue();
-  }
-
-  private final MapValueProvider<Integer> integerProvider =
-      new MapValueProvider<Integer>() {
-        @Override
-        public Integer getValue() {
-          return data.getInt();
-        }
-      };
-  private final MapValueProvider<Long> longProvider =
-      new MapValueProvider<Long>() {
-        @Override
-        public Long getValue() {
-          return data.getLong();
-        }
-      };
-  private final MapValueProvider<String> stringProvider =
-      new MapValueProvider<String>() {
-        @Override
-        public String getValue() {
-          return data.getString();
-        }
-      };
-  private final MapValueProvider<ByteString> bytesProvider =
-      new MapValueProvider<ByteString>() {
-        @Override
-        public ByteString getValue() {
-          return data.getBytes();
-        }
-      };
-  private final MapValueProvider<Boolean> booleanProvider =
-      new MapValueProvider<Boolean>() {
-        @Override
-        public Boolean getValue() {
-          return data.getBool();
-        }
-      };
-  private final MapValueProvider<Float> floatProvider =
-      new MapValueProvider<Float>() {
-        @Override
-        public Float getValue() {
-          return data.getFloat();
-        }
-      };
-  private final MapValueProvider<Double> doubleProvider =
-      new MapValueProvider<Double>() {
-        @Override
-        public Double getValue() {
-          return data.getDouble();
-        }
-      };
-  private final MapValueProvider<Proto3Message> messageProvider =
-      new MapValueProvider<Proto3Message>() {
-        @Override
-        public Proto3Message getValue() {
-          return newMessage();
-        }
-      };
-  private final MapValueProvider<Proto3Message.TestEnum> enumProvider =
-      new MapValueProvider<Proto3Message.TestEnum>() {
-        @Override
-        public Proto3Message.TestEnum getValue() {
-          return Proto3Message.TestEnum.forNumber(data.getEnum());
-        }
-      };
-
-  private <V> Map<Integer, V> populateIntegerMap(MapValueProvider<V> provider) {
-    Map<Integer, V> map = new HashMap<>();
-    for (int i = 0; i < numRepeatedFields; ++i) {
-      map.put(data.getInt(), provider.getValue());
-    }
-    return map;
-  }
-
-  private <V> Map<Long, V> populateLongMap(MapValueProvider<V> provider) {
-    Map<Long, V> map = new HashMap<>();
-    for (int i = 0; i < numRepeatedFields; ++i) {
-      map.put(data.getLong(), provider.getValue());
-    }
-    return map;
-  }
-
-  private <V> Map<String, V> populateStringMap(MapValueProvider<V> provider) {
-    Map<String, V> map = new HashMap<>();
-    for (int i = 0; i < numRepeatedFields; ++i) {
-      map.put(data.getString(), provider.getValue());
-    }
-    return map;
-  }
-
-  private <V> Map<Boolean, V> populateBooleanMap(MapValueProvider<V> provider) {
-    Map<Boolean, V> map = new HashMap<>();
-    map.put(false, provider.getValue());
-    map.put(true, provider.getValue());
-    return map;
-  }
-
-  public Proto3MessageWithMaps newMessageWithMaps() {
-    Proto3MessageWithMaps.Builder builder = Proto3MessageWithMaps.newBuilder();
-
-    builder.putAllFieldMapBoolBool1(populateBooleanMap(booleanProvider));
-    builder.putAllFieldMapBoolBytes2(populateBooleanMap(bytesProvider));
-    builder.putAllFieldMapBoolDouble3(populateBooleanMap(doubleProvider));
-    builder.putAllFieldMapBoolEnum4(populateBooleanMap(enumProvider));
-    builder.putAllFieldMapBoolFixed325(populateBooleanMap(integerProvider));
-    builder.putAllFieldMapBoolFixed646(populateBooleanMap(longProvider));
-    builder.putAllFieldMapBoolFloat7(populateBooleanMap(floatProvider));
-    builder.putAllFieldMapBoolInt328(populateBooleanMap(integerProvider));
-    builder.putAllFieldMapBoolInt649(populateBooleanMap(longProvider));
-    builder.putAllFieldMapBoolMessage10(populateBooleanMap(messageProvider));
-    builder.putAllFieldMapBoolSfixed3211(populateBooleanMap(integerProvider));
-    builder.putAllFieldMapBoolSfixed6412(populateBooleanMap(longProvider));
-    builder.putAllFieldMapBoolSint3213(populateBooleanMap(integerProvider));
-    builder.putAllFieldMapBoolSint6414(populateBooleanMap(longProvider));
-    builder.putAllFieldMapBoolString15(populateBooleanMap(stringProvider));
-    builder.putAllFieldMapBoolUint3216(populateBooleanMap(integerProvider));
-    builder.putAllFieldMapBoolUint6417(populateBooleanMap(longProvider));
-    builder.putAllFieldMapFixed32Bool18(populateIntegerMap(booleanProvider));
-    builder.putAllFieldMapFixed32Bytes19(populateIntegerMap(bytesProvider));
-    builder.putAllFieldMapFixed32Double20(populateIntegerMap(doubleProvider));
-    builder.putAllFieldMapFixed32Enum21(populateIntegerMap(enumProvider));
-    builder.putAllFieldMapFixed32Fixed3222(populateIntegerMap(integerProvider));
-    builder.putAllFieldMapFixed32Fixed6423(populateIntegerMap(longProvider));
-    builder.putAllFieldMapFixed32Float24(populateIntegerMap(floatProvider));
-    builder.putAllFieldMapFixed32Int3225(populateIntegerMap(integerProvider));
-    builder.putAllFieldMapFixed32Int6426(populateIntegerMap(longProvider));
-    builder.putAllFieldMapFixed32Message27(populateIntegerMap(messageProvider));
-    builder.putAllFieldMapFixed32Sfixed3228(populateIntegerMap(integerProvider));
-    builder.putAllFieldMapFixed32Sfixed6429(populateIntegerMap(longProvider));
-    builder.putAllFieldMapFixed32Sint3230(populateIntegerMap(integerProvider));
-    builder.putAllFieldMapFixed32Sint6431(populateIntegerMap(longProvider));
-    builder.putAllFieldMapFixed32String32(populateIntegerMap(stringProvider));
-    builder.putAllFieldMapFixed32Uint3233(populateIntegerMap(integerProvider));
-    builder.putAllFieldMapFixed32Uint6434(populateIntegerMap(longProvider));
-    builder.putAllFieldMapFixed64Bool35(populateLongMap(booleanProvider));
-    builder.putAllFieldMapFixed64Bytes36(populateLongMap(bytesProvider));
-    builder.putAllFieldMapFixed64Double37(populateLongMap(doubleProvider));
-    builder.putAllFieldMapFixed64Enum38(populateLongMap(enumProvider));
-    builder.putAllFieldMapFixed64Fixed3239(populateLongMap(integerProvider));
-    builder.putAllFieldMapFixed64Fixed6440(populateLongMap(longProvider));
-    builder.putAllFieldMapFixed64Float41(populateLongMap(floatProvider));
-    builder.putAllFieldMapFixed64Int3242(populateLongMap(integerProvider));
-    builder.putAllFieldMapFixed64Int6443(populateLongMap(longProvider));
-    builder.putAllFieldMapFixed64Message44(populateLongMap(messageProvider));
-    builder.putAllFieldMapFixed64Sfixed3245(populateLongMap(integerProvider));
-    builder.putAllFieldMapFixed64Sfixed6446(populateLongMap(longProvider));
-    builder.putAllFieldMapFixed64Sint3247(populateLongMap(integerProvider));
-    builder.putAllFieldMapFixed64Sint6448(populateLongMap(longProvider));
-    builder.putAllFieldMapFixed64String49(populateLongMap(stringProvider));
-    builder.putAllFieldMapFixed64Uint3250(populateLongMap(integerProvider));
-    builder.putAllFieldMapFixed64Uint6451(populateLongMap(longProvider));
-    builder.putAllFieldMapInt32Bool52(populateIntegerMap(booleanProvider));
-    builder.putAllFieldMapInt32Bytes53(populateIntegerMap(bytesProvider));
-    builder.putAllFieldMapInt32Double54(populateIntegerMap(doubleProvider));
-    builder.putAllFieldMapInt32Enum55(populateIntegerMap(enumProvider));
-    builder.putAllFieldMapInt32Fixed3256(populateIntegerMap(integerProvider));
-    builder.putAllFieldMapInt32Fixed6457(populateIntegerMap(longProvider));
-    builder.putAllFieldMapInt32Float58(populateIntegerMap(floatProvider));
-    builder.putAllFieldMapInt32Int3259(populateIntegerMap(integerProvider));
-    builder.putAllFieldMapInt32Int6460(populateIntegerMap(longProvider));
-    builder.putAllFieldMapInt32Message61(populateIntegerMap(messageProvider));
-    builder.putAllFieldMapInt32Sfixed3262(populateIntegerMap(integerProvider));
-    builder.putAllFieldMapInt32Sfixed6463(populateIntegerMap(longProvider));
-    builder.putAllFieldMapInt32Sint3264(populateIntegerMap(integerProvider));
-    builder.putAllFieldMapInt32Sint6465(populateIntegerMap(longProvider));
-    builder.putAllFieldMapInt32String66(populateIntegerMap(stringProvider));
-    builder.putAllFieldMapInt32Uint3267(populateIntegerMap(integerProvider));
-    builder.putAllFieldMapInt32Uint6468(populateIntegerMap(longProvider));
-    builder.putAllFieldMapInt64Bool69(populateLongMap(booleanProvider));
-    builder.putAllFieldMapInt64Bytes70(populateLongMap(bytesProvider));
-    builder.putAllFieldMapInt64Double71(populateLongMap(doubleProvider));
-    builder.putAllFieldMapInt64Enum72(populateLongMap(enumProvider));
-    builder.putAllFieldMapInt64Fixed3273(populateLongMap(integerProvider));
-    builder.putAllFieldMapInt64Fixed6474(populateLongMap(longProvider));
-    builder.putAllFieldMapInt64Float75(populateLongMap(floatProvider));
-    builder.putAllFieldMapInt64Int3276(populateLongMap(integerProvider));
-    builder.putAllFieldMapInt64Int6477(populateLongMap(longProvider));
-    builder.putAllFieldMapInt64Message78(populateLongMap(messageProvider));
-    builder.putAllFieldMapInt64Sfixed3279(populateLongMap(integerProvider));
-    builder.putAllFieldMapInt64Sfixed6480(populateLongMap(longProvider));
-    builder.putAllFieldMapInt64Sint3281(populateLongMap(integerProvider));
-    builder.putAllFieldMapInt64Sint6482(populateLongMap(longProvider));
-    builder.putAllFieldMapInt64String83(populateLongMap(stringProvider));
-    builder.putAllFieldMapInt64Uint3284(populateLongMap(integerProvider));
-    builder.putAllFieldMapInt64Uint6485(populateLongMap(longProvider));
-    builder.putAllFieldMapSfixed32Bool86(populateIntegerMap(booleanProvider));
-    builder.putAllFieldMapSfixed32Bytes87(populateIntegerMap(bytesProvider));
-    builder.putAllFieldMapSfixed32Double88(populateIntegerMap(doubleProvider));
-    builder.putAllFieldMapSfixed32Enum89(populateIntegerMap(enumProvider));
-    builder.putAllFieldMapSfixed32Fixed3290(populateIntegerMap(integerProvider));
-    builder.putAllFieldMapSfixed32Fixed6491(populateIntegerMap(longProvider));
-    builder.putAllFieldMapSfixed32Float92(populateIntegerMap(floatProvider));
-    builder.putAllFieldMapSfixed32Int3293(populateIntegerMap(integerProvider));
-    builder.putAllFieldMapSfixed32Int6494(populateIntegerMap(longProvider));
-    builder.putAllFieldMapSfixed32Message95(populateIntegerMap(messageProvider));
-    builder.putAllFieldMapSfixed32Sfixed3296(populateIntegerMap(integerProvider));
-    builder.putAllFieldMapSfixed32Sfixed6497(populateIntegerMap(longProvider));
-    builder.putAllFieldMapSfixed32Sint3298(populateIntegerMap(integerProvider));
-    builder.putAllFieldMapSfixed32Sint6499(populateIntegerMap(longProvider));
-    builder.putAllFieldMapSfixed32String100(populateIntegerMap(stringProvider));
-    builder.putAllFieldMapSfixed32Uint32101(populateIntegerMap(integerProvider));
-    builder.putAllFieldMapSfixed32Uint64102(populateIntegerMap(longProvider));
-    builder.putAllFieldMapSfixed64Bool103(populateLongMap(booleanProvider));
-    builder.putAllFieldMapSfixed64Bytes104(populateLongMap(bytesProvider));
-    builder.putAllFieldMapSfixed64Double105(populateLongMap(doubleProvider));
-    builder.putAllFieldMapSfixed64Enum106(populateLongMap(enumProvider));
-    builder.putAllFieldMapSfixed64Fixed32107(populateLongMap(integerProvider));
-    builder.putAllFieldMapSfixed64Fixed64108(populateLongMap(longProvider));
-    builder.putAllFieldMapSfixed64Float109(populateLongMap(floatProvider));
-    builder.putAllFieldMapSfixed64Int32110(populateLongMap(integerProvider));
-    builder.putAllFieldMapSfixed64Int64111(populateLongMap(longProvider));
-    builder.putAllFieldMapSfixed64Message112(populateLongMap(messageProvider));
-    builder.putAllFieldMapSfixed64Sfixed32113(populateLongMap(integerProvider));
-    builder.putAllFieldMapSfixed64Sfixed64114(populateLongMap(longProvider));
-    builder.putAllFieldMapSfixed64Sint32115(populateLongMap(integerProvider));
-    builder.putAllFieldMapSfixed64Sint64116(populateLongMap(longProvider));
-    builder.putAllFieldMapSfixed64String117(populateLongMap(stringProvider));
-    builder.putAllFieldMapSfixed64Uint32118(populateLongMap(integerProvider));
-    builder.putAllFieldMapSfixed64Uint64119(populateLongMap(longProvider));
-    builder.putAllFieldMapSint32Bool120(populateIntegerMap(booleanProvider));
-    builder.putAllFieldMapSint32Bytes121(populateIntegerMap(bytesProvider));
-    builder.putAllFieldMapSint32Double122(populateIntegerMap(doubleProvider));
-    builder.putAllFieldMapSint32Enum123(populateIntegerMap(enumProvider));
-    builder.putAllFieldMapSint32Fixed32124(populateIntegerMap(integerProvider));
-    builder.putAllFieldMapSint32Fixed64125(populateIntegerMap(longProvider));
-    builder.putAllFieldMapSint32Float126(populateIntegerMap(floatProvider));
-    builder.putAllFieldMapSint32Int32127(populateIntegerMap(integerProvider));
-    builder.putAllFieldMapSint32Int64128(populateIntegerMap(longProvider));
-    builder.putAllFieldMapSint32Message129(populateIntegerMap(messageProvider));
-    builder.putAllFieldMapSint32Sfixed32130(populateIntegerMap(integerProvider));
-    builder.putAllFieldMapSint32Sfixed64131(populateIntegerMap(longProvider));
-    builder.putAllFieldMapSint32Sint32132(populateIntegerMap(integerProvider));
-    builder.putAllFieldMapSint32Sint64133(populateIntegerMap(longProvider));
-    builder.putAllFieldMapSint32String134(populateIntegerMap(stringProvider));
-    builder.putAllFieldMapSint32Uint32135(populateIntegerMap(integerProvider));
-    builder.putAllFieldMapSint32Uint64136(populateIntegerMap(longProvider));
-    builder.putAllFieldMapSint64Bool137(populateLongMap(booleanProvider));
-    builder.putAllFieldMapSint64Bytes138(populateLongMap(bytesProvider));
-    builder.putAllFieldMapSint64Double139(populateLongMap(doubleProvider));
-    builder.putAllFieldMapSint64Enum140(populateLongMap(enumProvider));
-    builder.putAllFieldMapSint64Fixed32141(populateLongMap(integerProvider));
-    builder.putAllFieldMapSint64Fixed64142(populateLongMap(longProvider));
-    builder.putAllFieldMapSint64Float143(populateLongMap(floatProvider));
-    builder.putAllFieldMapSint64Int32144(populateLongMap(integerProvider));
-    builder.putAllFieldMapSint64Int64145(populateLongMap(longProvider));
-    builder.putAllFieldMapSint64Message146(populateLongMap(messageProvider));
-    builder.putAllFieldMapSint64Sfixed32147(populateLongMap(integerProvider));
-    builder.putAllFieldMapSint64Sfixed64148(populateLongMap(longProvider));
-    builder.putAllFieldMapSint64Sint32149(populateLongMap(integerProvider));
-    builder.putAllFieldMapSint64Sint64150(populateLongMap(longProvider));
-    builder.putAllFieldMapSint64String151(populateLongMap(stringProvider));
-    builder.putAllFieldMapSint64Uint32152(populateLongMap(integerProvider));
-    builder.putAllFieldMapSint64Uint64153(populateLongMap(longProvider));
-    builder.putAllFieldMapStringBool154(populateStringMap(booleanProvider));
-    builder.putAllFieldMapStringBytes155(populateStringMap(bytesProvider));
-    builder.putAllFieldMapStringDouble156(populateStringMap(doubleProvider));
-    builder.putAllFieldMapStringEnum157(populateStringMap(enumProvider));
-    builder.putAllFieldMapStringFixed32158(populateStringMap(integerProvider));
-    builder.putAllFieldMapStringFixed64159(populateStringMap(longProvider));
-    builder.putAllFieldMapStringFloat160(populateStringMap(floatProvider));
-    builder.putAllFieldMapStringInt32161(populateStringMap(integerProvider));
-    builder.putAllFieldMapStringInt64162(populateStringMap(longProvider));
-    builder.putAllFieldMapStringMessage163(populateStringMap(messageProvider));
-    builder.putAllFieldMapStringSfixed32164(populateStringMap(integerProvider));
-    builder.putAllFieldMapStringSfixed64165(populateStringMap(longProvider));
-    builder.putAllFieldMapStringSint32166(populateStringMap(integerProvider));
-    builder.putAllFieldMapStringSint64167(populateStringMap(longProvider));
-    builder.putAllFieldMapStringString168(populateStringMap(stringProvider));
-    builder.putAllFieldMapStringUint32169(populateStringMap(integerProvider));
-    builder.putAllFieldMapStringUint64170(populateStringMap(longProvider));
-    builder.putAllFieldMapUint32Bool171(populateIntegerMap(booleanProvider));
-    builder.putAllFieldMapUint32Bytes172(populateIntegerMap(bytesProvider));
-    builder.putAllFieldMapUint32Double173(populateIntegerMap(doubleProvider));
-    builder.putAllFieldMapUint32Enum174(populateIntegerMap(enumProvider));
-    builder.putAllFieldMapUint32Fixed32175(populateIntegerMap(integerProvider));
-    builder.putAllFieldMapUint32Fixed64176(populateIntegerMap(longProvider));
-    builder.putAllFieldMapUint32Float177(populateIntegerMap(floatProvider));
-    builder.putAllFieldMapUint32Int32178(populateIntegerMap(integerProvider));
-    builder.putAllFieldMapUint32Int64179(populateIntegerMap(longProvider));
-    builder.putAllFieldMapUint32Message180(populateIntegerMap(messageProvider));
-    builder.putAllFieldMapUint32Sfixed32181(populateIntegerMap(integerProvider));
-    builder.putAllFieldMapUint32Sfixed64182(populateIntegerMap(longProvider));
-    builder.putAllFieldMapUint32Sint32183(populateIntegerMap(integerProvider));
-    builder.putAllFieldMapUint32Sint64184(populateIntegerMap(longProvider));
-    builder.putAllFieldMapUint32String185(populateIntegerMap(stringProvider));
-    builder.putAllFieldMapUint32Uint32186(populateIntegerMap(integerProvider));
-    builder.putAllFieldMapUint32Uint64187(populateIntegerMap(longProvider));
-    builder.putAllFieldMapUint64Bool188(populateLongMap(booleanProvider));
-    builder.putAllFieldMapUint64Bytes189(populateLongMap(bytesProvider));
-    builder.putAllFieldMapUint64Double190(populateLongMap(doubleProvider));
-    builder.putAllFieldMapUint64Enum191(populateLongMap(enumProvider));
-    builder.putAllFieldMapUint64Fixed32192(populateLongMap(integerProvider));
-    builder.putAllFieldMapUint64Fixed64193(populateLongMap(longProvider));
-    builder.putAllFieldMapUint64Float194(populateLongMap(floatProvider));
-    builder.putAllFieldMapUint64Int32195(populateLongMap(integerProvider));
-    builder.putAllFieldMapUint64Int64196(populateLongMap(longProvider));
-    builder.putAllFieldMapUint64Message197(populateLongMap(messageProvider));
-    builder.putAllFieldMapUint64Sfixed32198(populateLongMap(integerProvider));
-    builder.putAllFieldMapUint64Sfixed64199(populateLongMap(longProvider));
-    builder.putAllFieldMapUint64Sint32200(populateLongMap(integerProvider));
-    builder.putAllFieldMapUint64Sint64201(populateLongMap(longProvider));
-    builder.putAllFieldMapUint64String202(populateLongMap(stringProvider));
-    builder.putAllFieldMapUint64Uint32203(populateLongMap(integerProvider));
-    builder.putAllFieldMapUint64Uint64204(populateLongMap(longProvider));
-
-    return builder.build();
-  }
-}
diff --git a/libs/protobuf/java/core/src/test/java/com/google/protobuf/Proto3MessageLiteFactory.java b/libs/protobuf/java/core/src/test/java/com/google/protobuf/Proto3MessageLiteFactory.java
deleted file mode 100644
index 2f6947d..0000000
--- a/libs/protobuf/java/core/src/test/java/com/google/protobuf/Proto3MessageLiteFactory.java
+++ /dev/null
@@ -1,452 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import com.google.protobuf.testing.Proto3TestingLite.Proto3MessageLite;
-import com.google.protobuf.testing.Proto3TestingLite.Proto3MessageLiteWithMaps;
-import java.util.HashMap;
-import java.util.Map;
-
-/** Creates instances of {@link Proto3MessageLite} based on the tree configuration. */
-public final class Proto3MessageLiteFactory
-    implements ExperimentalMessageFactory<Proto3MessageLite> {
-  private final int numRepeatedFields;
-  private final int branchingFactor;
-  private final Proto3MessageLiteFactory nextLevel;
-  private final ExperimentalTestDataProvider data;
-
-  public Proto3MessageLiteFactory(
-      int numRepeatedFields, int stringLength, int branchingFactor, int treeDepth) {
-    this(
-        new ExperimentalTestDataProvider(stringLength),
-        numRepeatedFields,
-        branchingFactor,
-        treeDepth);
-  }
-
-  private Proto3MessageLiteFactory(
-      ExperimentalTestDataProvider data,
-      int numRepeatedFields,
-      int branchingFactor,
-      int treeDepth) {
-    this.numRepeatedFields = numRepeatedFields;
-    this.branchingFactor = branchingFactor;
-    this.data = data;
-    if (treeDepth > 0) {
-      nextLevel =
-          new Proto3MessageLiteFactory(data, numRepeatedFields, branchingFactor, treeDepth - 1);
-    } else {
-      nextLevel = null;
-    }
-  }
-
-  @Override
-  public ExperimentalTestDataProvider dataProvider() {
-    return data;
-  }
-
-  @Override
-  public Proto3MessageLite newMessage() {
-    Proto3MessageLite.Builder builder = Proto3MessageLite.newBuilder();
-    builder.setFieldDouble1(data.getDouble());
-    builder.setFieldFloat2(data.getFloat());
-    builder.setFieldInt643(data.getLong());
-    builder.setFieldUint644(data.getLong());
-    builder.setFieldInt325(data.getInt());
-    builder.setFieldFixed646(data.getLong());
-    builder.setFieldFixed327(data.getInt());
-    builder.setFieldBool8(data.getBool());
-    builder.setFieldString9(data.getString());
-    // We don't populate the message field. Instead we apply the branching factor to the
-    // repeated message field below.
-    builder.setFieldBytes11(data.getBytes());
-    builder.setFieldUint3212(data.getInt());
-    builder.setFieldEnum13Value(data.getEnum());
-    builder.setFieldSfixed3214(data.getInt());
-    builder.setFieldSfixed6415(data.getLong());
-    builder.setFieldSint3216(data.getInt());
-    builder.setFieldSint6417(data.getLong());
-
-    for (int i = 0; i < numRepeatedFields; ++i) {
-      builder.addFieldDoubleList18(data.getDouble());
-      builder.addFieldFloatList19(data.getFloat());
-      builder.addFieldInt64List20(data.getLong());
-      builder.addFieldUint64List21(data.getLong());
-      builder.addFieldInt32List22(data.getInt());
-      builder.addFieldFixed64List23(data.getLong());
-      builder.addFieldFixed32List24(data.getInt());
-      builder.addFieldBoolList25(data.getBool());
-      builder.addFieldStringList26(data.getString());
-      // Repeated message field is controlled by the branching factor below.
-      builder.addFieldBytesList28(data.getBytes());
-      builder.addFieldUint32List29(data.getInt());
-      builder.addFieldEnumList30Value(data.getEnum());
-      builder.addFieldSfixed32List31(data.getInt());
-      builder.addFieldSfixed64List32(data.getLong());
-      builder.addFieldSint32List33(data.getInt());
-      builder.addFieldSint64List34(data.getLong());
-
-      builder.addFieldDoubleListPacked35(data.getDouble());
-      builder.addFieldFloatListPacked36(data.getFloat());
-      builder.addFieldInt64ListPacked37(data.getLong());
-      builder.addFieldUint64ListPacked38(data.getLong());
-      builder.addFieldInt32ListPacked39(data.getInt());
-      builder.addFieldFixed64ListPacked40(data.getLong());
-      builder.addFieldFixed32ListPacked41(data.getInt());
-      builder.addFieldBoolListPacked42(data.getBool());
-      builder.addFieldUint32ListPacked43(data.getInt());
-      builder.addFieldEnumListPacked44Value(data.getEnum());
-      builder.addFieldSfixed32ListPacked45(data.getInt());
-      builder.addFieldSfixed64ListPacked46(data.getLong());
-      builder.addFieldSint32ListPacked47(data.getInt());
-      builder.addFieldSint64ListPacked48(data.getLong());
-    }
-
-    // Handle the branching factor.
-    if (nextLevel != null) {
-      for (int i = 0; i < branchingFactor; ++i) {
-        builder.addFieldMessageList27(nextLevel.newMessage());
-      }
-    }
-
-    return builder.build();
-  }
-
-  private interface MapValueProvider<T> {
-    public T getValue();
-  }
-
-  private final MapValueProvider<Integer> integerProvider =
-      new MapValueProvider<Integer>() {
-        @Override
-        public Integer getValue() {
-          return data.getInt();
-        }
-      };
-  private final MapValueProvider<Long> longProvider =
-      new MapValueProvider<Long>() {
-        @Override
-        public Long getValue() {
-          return data.getLong();
-        }
-      };
-  private final MapValueProvider<String> stringProvider =
-      new MapValueProvider<String>() {
-        @Override
-        public String getValue() {
-          return data.getString();
-        }
-      };
-  private final MapValueProvider<ByteString> bytesProvider =
-      new MapValueProvider<ByteString>() {
-        @Override
-        public ByteString getValue() {
-          return data.getBytes();
-        }
-      };
-  private final MapValueProvider<Boolean> booleanProvider =
-      new MapValueProvider<Boolean>() {
-        @Override
-        public Boolean getValue() {
-          return data.getBool();
-        }
-      };
-  private final MapValueProvider<Float> floatProvider =
-      new MapValueProvider<Float>() {
-        @Override
-        public Float getValue() {
-          return data.getFloat();
-        }
-      };
-  private final MapValueProvider<Double> doubleProvider =
-      new MapValueProvider<Double>() {
-        @Override
-        public Double getValue() {
-          return data.getDouble();
-        }
-      };
-  private final MapValueProvider<Proto3MessageLite> messageProvider =
-      new MapValueProvider<Proto3MessageLite>() {
-        @Override
-        public Proto3MessageLite getValue() {
-          return newMessage();
-        }
-      };
-  private final MapValueProvider<Proto3MessageLite.TestEnum> enumProvider =
-      new MapValueProvider<Proto3MessageLite.TestEnum>() {
-        @Override
-        public Proto3MessageLite.TestEnum getValue() {
-          return Proto3MessageLite.TestEnum.forNumber(data.getEnum());
-        }
-      };
-
-  private <V> Map<Integer, V> populateIntegerMap(MapValueProvider<V> provider) {
-    Map<Integer, V> map = new HashMap<>();
-    for (int i = 0; i < numRepeatedFields; ++i) {
-      map.put(data.getInt(), provider.getValue());
-    }
-    return map;
-  }
-
-  private <V> Map<Long, V> populateLongMap(MapValueProvider<V> provider) {
-    Map<Long, V> map = new HashMap<>();
-    for (int i = 0; i < numRepeatedFields; ++i) {
-      map.put(data.getLong(), provider.getValue());
-    }
-    return map;
-  }
-
-  private <V> Map<String, V> populateStringMap(MapValueProvider<V> provider) {
-    Map<String, V> map = new HashMap<>();
-    for (int i = 0; i < numRepeatedFields; ++i) {
-      map.put(data.getString(), provider.getValue());
-    }
-    return map;
-  }
-
-  private <V> Map<Boolean, V> populateBooleanMap(MapValueProvider<V> provider) {
-    Map<Boolean, V> map = new HashMap<>();
-    map.put(false, provider.getValue());
-    map.put(true, provider.getValue());
-    return map;
-  }
-
-  public Proto3MessageLiteWithMaps newMessageWithMaps() {
-    Proto3MessageLiteWithMaps.Builder builder = Proto3MessageLiteWithMaps.newBuilder();
-
-    builder.putAllFieldMapBoolBool1(populateBooleanMap(booleanProvider));
-    builder.putAllFieldMapBoolBytes2(populateBooleanMap(bytesProvider));
-    builder.putAllFieldMapBoolDouble3(populateBooleanMap(doubleProvider));
-    builder.putAllFieldMapBoolEnum4(populateBooleanMap(enumProvider));
-    builder.putAllFieldMapBoolFixed325(populateBooleanMap(integerProvider));
-    builder.putAllFieldMapBoolFixed646(populateBooleanMap(longProvider));
-    builder.putAllFieldMapBoolFloat7(populateBooleanMap(floatProvider));
-    builder.putAllFieldMapBoolInt328(populateBooleanMap(integerProvider));
-    builder.putAllFieldMapBoolInt649(populateBooleanMap(longProvider));
-    builder.putAllFieldMapBoolMessage10(populateBooleanMap(messageProvider));
-    builder.putAllFieldMapBoolSfixed3211(populateBooleanMap(integerProvider));
-    builder.putAllFieldMapBoolSfixed6412(populateBooleanMap(longProvider));
-    builder.putAllFieldMapBoolSint3213(populateBooleanMap(integerProvider));
-    builder.putAllFieldMapBoolSint6414(populateBooleanMap(longProvider));
-    builder.putAllFieldMapBoolString15(populateBooleanMap(stringProvider));
-    builder.putAllFieldMapBoolUint3216(populateBooleanMap(integerProvider));
-    builder.putAllFieldMapBoolUint6417(populateBooleanMap(longProvider));
-    builder.putAllFieldMapFixed32Bool18(populateIntegerMap(booleanProvider));
-    builder.putAllFieldMapFixed32Bytes19(populateIntegerMap(bytesProvider));
-    builder.putAllFieldMapFixed32Double20(populateIntegerMap(doubleProvider));
-    builder.putAllFieldMapFixed32Enum21(populateIntegerMap(enumProvider));
-    builder.putAllFieldMapFixed32Fixed3222(populateIntegerMap(integerProvider));
-    builder.putAllFieldMapFixed32Fixed6423(populateIntegerMap(longProvider));
-    builder.putAllFieldMapFixed32Float24(populateIntegerMap(floatProvider));
-    builder.putAllFieldMapFixed32Int3225(populateIntegerMap(integerProvider));
-    builder.putAllFieldMapFixed32Int6426(populateIntegerMap(longProvider));
-    builder.putAllFieldMapFixed32Message27(populateIntegerMap(messageProvider));
-    builder.putAllFieldMapFixed32Sfixed3228(populateIntegerMap(integerProvider));
-    builder.putAllFieldMapFixed32Sfixed6429(populateIntegerMap(longProvider));
-    builder.putAllFieldMapFixed32Sint3230(populateIntegerMap(integerProvider));
-    builder.putAllFieldMapFixed32Sint6431(populateIntegerMap(longProvider));
-    builder.putAllFieldMapFixed32String32(populateIntegerMap(stringProvider));
-    builder.putAllFieldMapFixed32Uint3233(populateIntegerMap(integerProvider));
-    builder.putAllFieldMapFixed32Uint6434(populateIntegerMap(longProvider));
-    builder.putAllFieldMapFixed64Bool35(populateLongMap(booleanProvider));
-    builder.putAllFieldMapFixed64Bytes36(populateLongMap(bytesProvider));
-    builder.putAllFieldMapFixed64Double37(populateLongMap(doubleProvider));
-    builder.putAllFieldMapFixed64Enum38(populateLongMap(enumProvider));
-    builder.putAllFieldMapFixed64Fixed3239(populateLongMap(integerProvider));
-    builder.putAllFieldMapFixed64Fixed6440(populateLongMap(longProvider));
-    builder.putAllFieldMapFixed64Float41(populateLongMap(floatProvider));
-    builder.putAllFieldMapFixed64Int3242(populateLongMap(integerProvider));
-    builder.putAllFieldMapFixed64Int6443(populateLongMap(longProvider));
-    builder.putAllFieldMapFixed64Message44(populateLongMap(messageProvider));
-    builder.putAllFieldMapFixed64Sfixed3245(populateLongMap(integerProvider));
-    builder.putAllFieldMapFixed64Sfixed6446(populateLongMap(longProvider));
-    builder.putAllFieldMapFixed64Sint3247(populateLongMap(integerProvider));
-    builder.putAllFieldMapFixed64Sint6448(populateLongMap(longProvider));
-    builder.putAllFieldMapFixed64String49(populateLongMap(stringProvider));
-    builder.putAllFieldMapFixed64Uint3250(populateLongMap(integerProvider));
-    builder.putAllFieldMapFixed64Uint6451(populateLongMap(longProvider));
-    builder.putAllFieldMapInt32Bool52(populateIntegerMap(booleanProvider));
-    builder.putAllFieldMapInt32Bytes53(populateIntegerMap(bytesProvider));
-    builder.putAllFieldMapInt32Double54(populateIntegerMap(doubleProvider));
-    builder.putAllFieldMapInt32Enum55(populateIntegerMap(enumProvider));
-    builder.putAllFieldMapInt32Fixed3256(populateIntegerMap(integerProvider));
-    builder.putAllFieldMapInt32Fixed6457(populateIntegerMap(longProvider));
-    builder.putAllFieldMapInt32Float58(populateIntegerMap(floatProvider));
-    builder.putAllFieldMapInt32Int3259(populateIntegerMap(integerProvider));
-    builder.putAllFieldMapInt32Int6460(populateIntegerMap(longProvider));
-    builder.putAllFieldMapInt32Message61(populateIntegerMap(messageProvider));
-    builder.putAllFieldMapInt32Sfixed3262(populateIntegerMap(integerProvider));
-    builder.putAllFieldMapInt32Sfixed6463(populateIntegerMap(longProvider));
-    builder.putAllFieldMapInt32Sint3264(populateIntegerMap(integerProvider));
-    builder.putAllFieldMapInt32Sint6465(populateIntegerMap(longProvider));
-    builder.putAllFieldMapInt32String66(populateIntegerMap(stringProvider));
-    builder.putAllFieldMapInt32Uint3267(populateIntegerMap(integerProvider));
-    builder.putAllFieldMapInt32Uint6468(populateIntegerMap(longProvider));
-    builder.putAllFieldMapInt64Bool69(populateLongMap(booleanProvider));
-    builder.putAllFieldMapInt64Bytes70(populateLongMap(bytesProvider));
-    builder.putAllFieldMapInt64Double71(populateLongMap(doubleProvider));
-    builder.putAllFieldMapInt64Enum72(populateLongMap(enumProvider));
-    builder.putAllFieldMapInt64Fixed3273(populateLongMap(integerProvider));
-    builder.putAllFieldMapInt64Fixed6474(populateLongMap(longProvider));
-    builder.putAllFieldMapInt64Float75(populateLongMap(floatProvider));
-    builder.putAllFieldMapInt64Int3276(populateLongMap(integerProvider));
-    builder.putAllFieldMapInt64Int6477(populateLongMap(longProvider));
-    builder.putAllFieldMapInt64Message78(populateLongMap(messageProvider));
-    builder.putAllFieldMapInt64Sfixed3279(populateLongMap(integerProvider));
-    builder.putAllFieldMapInt64Sfixed6480(populateLongMap(longProvider));
-    builder.putAllFieldMapInt64Sint3281(populateLongMap(integerProvider));
-    builder.putAllFieldMapInt64Sint6482(populateLongMap(longProvider));
-    builder.putAllFieldMapInt64String83(populateLongMap(stringProvider));
-    builder.putAllFieldMapInt64Uint3284(populateLongMap(integerProvider));
-    builder.putAllFieldMapInt64Uint6485(populateLongMap(longProvider));
-    builder.putAllFieldMapSfixed32Bool86(populateIntegerMap(booleanProvider));
-    builder.putAllFieldMapSfixed32Bytes87(populateIntegerMap(bytesProvider));
-    builder.putAllFieldMapSfixed32Double88(populateIntegerMap(doubleProvider));
-    builder.putAllFieldMapSfixed32Enum89(populateIntegerMap(enumProvider));
-    builder.putAllFieldMapSfixed32Fixed3290(populateIntegerMap(integerProvider));
-    builder.putAllFieldMapSfixed32Fixed6491(populateIntegerMap(longProvider));
-    builder.putAllFieldMapSfixed32Float92(populateIntegerMap(floatProvider));
-    builder.putAllFieldMapSfixed32Int3293(populateIntegerMap(integerProvider));
-    builder.putAllFieldMapSfixed32Int6494(populateIntegerMap(longProvider));
-    builder.putAllFieldMapSfixed32Message95(populateIntegerMap(messageProvider));
-    builder.putAllFieldMapSfixed32Sfixed3296(populateIntegerMap(integerProvider));
-    builder.putAllFieldMapSfixed32Sfixed6497(populateIntegerMap(longProvider));
-    builder.putAllFieldMapSfixed32Sint3298(populateIntegerMap(integerProvider));
-    builder.putAllFieldMapSfixed32Sint6499(populateIntegerMap(longProvider));
-    builder.putAllFieldMapSfixed32String100(populateIntegerMap(stringProvider));
-    builder.putAllFieldMapSfixed32Uint32101(populateIntegerMap(integerProvider));
-    builder.putAllFieldMapSfixed32Uint64102(populateIntegerMap(longProvider));
-    builder.putAllFieldMapSfixed64Bool103(populateLongMap(booleanProvider));
-    builder.putAllFieldMapSfixed64Bytes104(populateLongMap(bytesProvider));
-    builder.putAllFieldMapSfixed64Double105(populateLongMap(doubleProvider));
-    builder.putAllFieldMapSfixed64Enum106(populateLongMap(enumProvider));
-    builder.putAllFieldMapSfixed64Fixed32107(populateLongMap(integerProvider));
-    builder.putAllFieldMapSfixed64Fixed64108(populateLongMap(longProvider));
-    builder.putAllFieldMapSfixed64Float109(populateLongMap(floatProvider));
-    builder.putAllFieldMapSfixed64Int32110(populateLongMap(integerProvider));
-    builder.putAllFieldMapSfixed64Int64111(populateLongMap(longProvider));
-    builder.putAllFieldMapSfixed64Message112(populateLongMap(messageProvider));
-    builder.putAllFieldMapSfixed64Sfixed32113(populateLongMap(integerProvider));
-    builder.putAllFieldMapSfixed64Sfixed64114(populateLongMap(longProvider));
-    builder.putAllFieldMapSfixed64Sint32115(populateLongMap(integerProvider));
-    builder.putAllFieldMapSfixed64Sint64116(populateLongMap(longProvider));
-    builder.putAllFieldMapSfixed64String117(populateLongMap(stringProvider));
-    builder.putAllFieldMapSfixed64Uint32118(populateLongMap(integerProvider));
-    builder.putAllFieldMapSfixed64Uint64119(populateLongMap(longProvider));
-    builder.putAllFieldMapSint32Bool120(populateIntegerMap(booleanProvider));
-    builder.putAllFieldMapSint32Bytes121(populateIntegerMap(bytesProvider));
-    builder.putAllFieldMapSint32Double122(populateIntegerMap(doubleProvider));
-    builder.putAllFieldMapSint32Enum123(populateIntegerMap(enumProvider));
-    builder.putAllFieldMapSint32Fixed32124(populateIntegerMap(integerProvider));
-    builder.putAllFieldMapSint32Fixed64125(populateIntegerMap(longProvider));
-    builder.putAllFieldMapSint32Float126(populateIntegerMap(floatProvider));
-    builder.putAllFieldMapSint32Int32127(populateIntegerMap(integerProvider));
-    builder.putAllFieldMapSint32Int64128(populateIntegerMap(longProvider));
-    builder.putAllFieldMapSint32Message129(populateIntegerMap(messageProvider));
-    builder.putAllFieldMapSint32Sfixed32130(populateIntegerMap(integerProvider));
-    builder.putAllFieldMapSint32Sfixed64131(populateIntegerMap(longProvider));
-    builder.putAllFieldMapSint32Sint32132(populateIntegerMap(integerProvider));
-    builder.putAllFieldMapSint32Sint64133(populateIntegerMap(longProvider));
-    builder.putAllFieldMapSint32String134(populateIntegerMap(stringProvider));
-    builder.putAllFieldMapSint32Uint32135(populateIntegerMap(integerProvider));
-    builder.putAllFieldMapSint32Uint64136(populateIntegerMap(longProvider));
-    builder.putAllFieldMapSint64Bool137(populateLongMap(booleanProvider));
-    builder.putAllFieldMapSint64Bytes138(populateLongMap(bytesProvider));
-    builder.putAllFieldMapSint64Double139(populateLongMap(doubleProvider));
-    builder.putAllFieldMapSint64Enum140(populateLongMap(enumProvider));
-    builder.putAllFieldMapSint64Fixed32141(populateLongMap(integerProvider));
-    builder.putAllFieldMapSint64Fixed64142(populateLongMap(longProvider));
-    builder.putAllFieldMapSint64Float143(populateLongMap(floatProvider));
-    builder.putAllFieldMapSint64Int32144(populateLongMap(integerProvider));
-    builder.putAllFieldMapSint64Int64145(populateLongMap(longProvider));
-    builder.putAllFieldMapSint64Message146(populateLongMap(messageProvider));
-    builder.putAllFieldMapSint64Sfixed32147(populateLongMap(integerProvider));
-    builder.putAllFieldMapSint64Sfixed64148(populateLongMap(longProvider));
-    builder.putAllFieldMapSint64Sint32149(populateLongMap(integerProvider));
-    builder.putAllFieldMapSint64Sint64150(populateLongMap(longProvider));
-    builder.putAllFieldMapSint64String151(populateLongMap(stringProvider));
-    builder.putAllFieldMapSint64Uint32152(populateLongMap(integerProvider));
-    builder.putAllFieldMapSint64Uint64153(populateLongMap(longProvider));
-    builder.putAllFieldMapStringBool154(populateStringMap(booleanProvider));
-    builder.putAllFieldMapStringBytes155(populateStringMap(bytesProvider));
-    builder.putAllFieldMapStringDouble156(populateStringMap(doubleProvider));
-    builder.putAllFieldMapStringEnum157(populateStringMap(enumProvider));
-    builder.putAllFieldMapStringFixed32158(populateStringMap(integerProvider));
-    builder.putAllFieldMapStringFixed64159(populateStringMap(longProvider));
-    builder.putAllFieldMapStringFloat160(populateStringMap(floatProvider));
-    builder.putAllFieldMapStringInt32161(populateStringMap(integerProvider));
-    builder.putAllFieldMapStringInt64162(populateStringMap(longProvider));
-    builder.putAllFieldMapStringMessage163(populateStringMap(messageProvider));
-    builder.putAllFieldMapStringSfixed32164(populateStringMap(integerProvider));
-    builder.putAllFieldMapStringSfixed64165(populateStringMap(longProvider));
-    builder.putAllFieldMapStringSint32166(populateStringMap(integerProvider));
-    builder.putAllFieldMapStringSint64167(populateStringMap(longProvider));
-    builder.putAllFieldMapStringString168(populateStringMap(stringProvider));
-    builder.putAllFieldMapStringUint32169(populateStringMap(integerProvider));
-    builder.putAllFieldMapStringUint64170(populateStringMap(longProvider));
-    builder.putAllFieldMapUint32Bool171(populateIntegerMap(booleanProvider));
-    builder.putAllFieldMapUint32Bytes172(populateIntegerMap(bytesProvider));
-    builder.putAllFieldMapUint32Double173(populateIntegerMap(doubleProvider));
-    builder.putAllFieldMapUint32Enum174(populateIntegerMap(enumProvider));
-    builder.putAllFieldMapUint32Fixed32175(populateIntegerMap(integerProvider));
-    builder.putAllFieldMapUint32Fixed64176(populateIntegerMap(longProvider));
-    builder.putAllFieldMapUint32Float177(populateIntegerMap(floatProvider));
-    builder.putAllFieldMapUint32Int32178(populateIntegerMap(integerProvider));
-    builder.putAllFieldMapUint32Int64179(populateIntegerMap(longProvider));
-    builder.putAllFieldMapUint32Message180(populateIntegerMap(messageProvider));
-    builder.putAllFieldMapUint32Sfixed32181(populateIntegerMap(integerProvider));
-    builder.putAllFieldMapUint32Sfixed64182(populateIntegerMap(longProvider));
-    builder.putAllFieldMapUint32Sint32183(populateIntegerMap(integerProvider));
-    builder.putAllFieldMapUint32Sint64184(populateIntegerMap(longProvider));
-    builder.putAllFieldMapUint32String185(populateIntegerMap(stringProvider));
-    builder.putAllFieldMapUint32Uint32186(populateIntegerMap(integerProvider));
-    builder.putAllFieldMapUint32Uint64187(populateIntegerMap(longProvider));
-    builder.putAllFieldMapUint64Bool188(populateLongMap(booleanProvider));
-    builder.putAllFieldMapUint64Bytes189(populateLongMap(bytesProvider));
-    builder.putAllFieldMapUint64Double190(populateLongMap(doubleProvider));
-    builder.putAllFieldMapUint64Enum191(populateLongMap(enumProvider));
-    builder.putAllFieldMapUint64Fixed32192(populateLongMap(integerProvider));
-    builder.putAllFieldMapUint64Fixed64193(populateLongMap(longProvider));
-    builder.putAllFieldMapUint64Float194(populateLongMap(floatProvider));
-    builder.putAllFieldMapUint64Int32195(populateLongMap(integerProvider));
-    builder.putAllFieldMapUint64Int64196(populateLongMap(longProvider));
-    builder.putAllFieldMapUint64Message197(populateLongMap(messageProvider));
-    builder.putAllFieldMapUint64Sfixed32198(populateLongMap(integerProvider));
-    builder.putAllFieldMapUint64Sfixed64199(populateLongMap(longProvider));
-    builder.putAllFieldMapUint64Sint32200(populateLongMap(integerProvider));
-    builder.putAllFieldMapUint64Sint64201(populateLongMap(longProvider));
-    builder.putAllFieldMapUint64String202(populateLongMap(stringProvider));
-    builder.putAllFieldMapUint64Uint32203(populateLongMap(integerProvider));
-    builder.putAllFieldMapUint64Uint64204(populateLongMap(longProvider));
-
-    return builder.build();
-  }
-}
diff --git a/libs/protobuf/java/core/src/test/java/com/google/protobuf/Proto3SchemaTest.java b/libs/protobuf/java/core/src/test/java/com/google/protobuf/Proto3SchemaTest.java
deleted file mode 100644
index 5cd145b..0000000
--- a/libs/protobuf/java/core/src/test/java/com/google/protobuf/Proto3SchemaTest.java
+++ /dev/null
@@ -1,48 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import com.google.protobuf.testing.Proto3Testing.Proto3Message;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-@RunWith(JUnit4.class)
-public class Proto3SchemaTest extends AbstractProto3SchemaTest {
-  @Override
-  protected void registerSchemas() {
-    TestSchemas.registerGenericProto3Schemas();
-  }
-
-  @Override
-  protected Schema<Proto3Message> schema() {
-    return TestSchemas.genericProto3Schema;
-  }
-}
diff --git a/libs/protobuf/java/core/src/test/java/com/google/protobuf/ProtobufArrayListTest.java b/libs/protobuf/java/core/src/test/java/com/google/protobuf/ProtobufArrayListTest.java
deleted file mode 100644
index 67b2881..0000000
--- a/libs/protobuf/java/core/src/test/java/com/google/protobuf/ProtobufArrayListTest.java
+++ /dev/null
@@ -1,392 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static java.util.Arrays.asList;
-
-import java.util.Collections;
-import java.util.ConcurrentModificationException;
-import java.util.Iterator;
-import java.util.List;
-import junit.framework.TestCase;
-
-/** Tests for {@link ProtobufArrayList}. */
-public class ProtobufArrayListTest extends TestCase {
-
-  private static final ProtobufArrayList<Integer> UNARY_LIST = newImmutableProtoArrayList(1);
-  private static final ProtobufArrayList<Integer> TERTIARY_LIST =
-      newImmutableProtoArrayList(1, 2, 3);
-
-  private ProtobufArrayList<Integer> list;
-
-  @Override
-  protected void setUp() throws Exception {
-    list = new ProtobufArrayList<Integer>();
-  }
-
-  public void testEmptyListReturnsSameInstance() {
-    assertSame(ProtobufArrayList.emptyList(), ProtobufArrayList.emptyList());
-  }
-
-  public void testEmptyListIsImmutable() {
-    assertImmutable(ProtobufArrayList.<Integer>emptyList());
-  }
-
-  public void testModificationWithIteration() {
-    list.addAll(asList(1, 2, 3, 4));
-    Iterator<Integer> iterator = list.iterator();
-    assertEquals(4, list.size());
-    assertEquals(1, (int) list.get(0));
-    assertEquals(1, (int) iterator.next());
-
-    list.remove(0);
-    try {
-      iterator.next();
-      fail();
-    } catch (ConcurrentModificationException e) {
-      // expected
-    }
-
-    iterator = list.iterator();
-    list.set(0, 1);
-    try {
-      iterator.next();
-      fail();
-    } catch (ConcurrentModificationException e) {
-      // expected
-    }
-
-    iterator = list.iterator();
-    list.add(0, 0);
-    try {
-      iterator.next();
-      fail();
-    } catch (ConcurrentModificationException e) {
-      // expected
-    }
-  }
-
-  public void testMakeImmutable() {
-    list.add(2);
-    list.add(4);
-    list.add(6);
-    list.add(8);
-    list.makeImmutable();
-    assertImmutable(list);
-  }
-
-  public void testRemove() {
-    list.addAll(TERTIARY_LIST);
-    assertEquals(1, (int) list.remove(0));
-    assertEquals(asList(2, 3), list);
-
-    assertTrue(list.remove(Integer.valueOf(3)));
-    assertEquals(asList(2), list);
-
-    assertFalse(list.remove(Integer.valueOf(3)));
-    assertEquals(asList(2), list);
-
-    assertEquals(2, (int) list.remove(0));
-    assertEquals(asList(), list);
-
-    try {
-      list.remove(-1);
-      fail();
-    } catch (IndexOutOfBoundsException e) {
-      // expected
-    }
-
-    try {
-      list.remove(0);
-    } catch (IndexOutOfBoundsException e) {
-      // expected
-    }
-  }
-
-  public void testGet() {
-    assertEquals(1, (int) TERTIARY_LIST.get(0));
-    assertEquals(2, (int) TERTIARY_LIST.get(1));
-    assertEquals(3, (int) TERTIARY_LIST.get(2));
-
-    try {
-      TERTIARY_LIST.get(-1);
-      fail();
-    } catch (IndexOutOfBoundsException e) {
-      // expected
-    }
-
-    try {
-      TERTIARY_LIST.get(3);
-      fail();
-    } catch (IndexOutOfBoundsException e) {
-      // expected
-    }
-  }
-
-  public void testSet() {
-    list.add(2);
-    list.add(4);
-
-    assertEquals(2, (int) list.set(0, 3));
-    assertEquals(3, (int) list.get(0));
-
-    assertEquals(4, (int) list.set(1, 0));
-    assertEquals(0, (int) list.get(1));
-
-    try {
-      list.set(-1, 0);
-      fail();
-    } catch (IndexOutOfBoundsException e) {
-      // expected
-    }
-
-    try {
-      list.set(2, 0);
-      fail();
-    } catch (IndexOutOfBoundsException e) {
-      // expected
-    }
-  }
-
-  public void testAdd() {
-    assertEquals(0, list.size());
-
-    assertTrue(list.add(2));
-    assertEquals(asList(2), list);
-
-    assertTrue(list.add(3));
-    list.add(0, 4);
-    assertEquals(asList(4, 2, 3), list);
-
-    list.add(0, 1);
-    list.add(0, 0);
-    // Force a resize by getting up to 11 elements.
-    for (int i = 0; i < 6; i++) {
-      list.add(Integer.valueOf(5 + i));
-    }
-    assertEquals(asList(0, 1, 4, 2, 3, 5, 6, 7, 8, 9, 10), list);
-
-    try {
-      list.add(-1, 5);
-    } catch (IndexOutOfBoundsException e) {
-      // expected
-    }
-
-    try {
-      list.add(4, 5);
-    } catch (IndexOutOfBoundsException e) {
-      // expected
-    }
-  }
-
-  public void testAddAll() {
-    assertEquals(0, list.size());
-
-    assertTrue(list.addAll(Collections.singleton(1)));
-    assertEquals(1, list.size());
-    assertEquals(1, (int) list.get(0));
-
-    assertTrue(list.addAll(asList(2, 3, 4, 5, 6)));
-    assertEquals(asList(1, 2, 3, 4, 5, 6), list);
-
-    assertTrue(list.addAll(TERTIARY_LIST));
-    assertEquals(asList(1, 2, 3, 4, 5, 6, 1, 2, 3), list);
-
-    assertFalse(list.addAll(Collections.<Integer>emptyList()));
-    assertFalse(list.addAll(IntArrayList.emptyList()));
-  }
-
-  public void testSize() {
-    assertEquals(0, ProtobufArrayList.emptyList().size());
-    assertEquals(1, UNARY_LIST.size());
-    assertEquals(3, TERTIARY_LIST.size());
-
-    list.add(3);
-    list.add(4);
-    list.add(6);
-    list.add(8);
-    assertEquals(4, list.size());
-
-    list.remove(0);
-    assertEquals(3, list.size());
-
-    list.add(17);
-    assertEquals(4, list.size());
-  }
-
-  private void assertImmutable(List<Integer> list) {
-    if (list.contains(1)) {
-      throw new RuntimeException("Cannot test the immutability of lists that contain 1.");
-    }
-
-    try {
-      list.add(1);
-      fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.add(0, 1);
-      fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.addAll(Collections.<Integer>emptyList());
-      fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.addAll(Collections.singletonList(1));
-      fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.addAll(new ProtobufArrayList<Integer>());
-      fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.addAll(UNARY_LIST);
-      fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.addAll(0, Collections.singleton(1));
-      fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.addAll(0, UNARY_LIST);
-      fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.addAll(0, Collections.<Integer>emptyList());
-      fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.clear();
-      fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.remove(1);
-      fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.remove(new Object());
-      fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.removeAll(Collections.emptyList());
-      fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.removeAll(Collections.singleton(1));
-      fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.removeAll(UNARY_LIST);
-      fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.retainAll(Collections.emptyList());
-      fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.retainAll(Collections.singleton(1));
-      fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.retainAll(UNARY_LIST);
-      fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-
-    try {
-      list.set(0, 0);
-      fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-  }
-
-  private static ProtobufArrayList<Integer> newImmutableProtoArrayList(int... elements) {
-    ProtobufArrayList<Integer> list = new ProtobufArrayList<Integer>();
-    for (int element : elements) {
-      list.add(element);
-    }
-    list.makeImmutable();
-    return list;
-  }
-}
diff --git a/libs/protobuf/java/core/src/test/java/com/google/protobuf/RepeatedFieldBuilderV3Test.java b/libs/protobuf/java/core/src/test/java/com/google/protobuf/RepeatedFieldBuilderV3Test.java
deleted file mode 100644
index bb95e2a..0000000
--- a/libs/protobuf/java/core/src/test/java/com/google/protobuf/RepeatedFieldBuilderV3Test.java
+++ /dev/null
@@ -1,191 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.common.truth.Truth.assertThat;
-import static com.google.common.truth.Truth.assertWithMessage;
-
-import protobuf_unittest.UnittestProto.TestAllTypes;
-import protobuf_unittest.UnittestProto.TestAllTypesOrBuilder;
-import java.util.Collections;
-import java.util.List;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-/**
- * Tests for {@link RepeatedFieldBuilderV3}. This tests basic functionality. More extensive testing is
- * provided via other tests that exercise the builder.
- */
-@RunWith(JUnit4.class)
-public class RepeatedFieldBuilderV3Test {
-
-  @Test
-  public void testBasicUse() {
-    TestUtil.MockBuilderParent mockParent = new TestUtil.MockBuilderParent();
-    RepeatedFieldBuilderV3<TestAllTypes, TestAllTypes.Builder, TestAllTypesOrBuilder> builder =
-        newRepeatedFieldBuilderV3(mockParent);
-    builder.addMessage(TestAllTypes.newBuilder().setOptionalInt32(0).build());
-    builder.addMessage(TestAllTypes.newBuilder().setOptionalInt32(1).build());
-    assertThat(builder.getMessage(0).getOptionalInt32()).isEqualTo(0);
-    assertThat(builder.getMessage(1).getOptionalInt32()).isEqualTo(1);
-
-    List<TestAllTypes> list = builder.build();
-    assertThat(list).hasSize(2);
-    assertThat(list.get(0).getOptionalInt32()).isEqualTo(0);
-    assertThat(list.get(1).getOptionalInt32()).isEqualTo(1);
-    assertIsUnmodifiable(list);
-
-    // Make sure it doesn't change.
-    List<TestAllTypes> list2 = builder.build();
-    assertThat(list).isSameInstanceAs(list2);
-    assertThat(mockParent.getInvalidationCount()).isEqualTo(0);
-  }
-
-  @Test
-  public void testGoingBackAndForth() {
-    TestUtil.MockBuilderParent mockParent = new TestUtil.MockBuilderParent();
-    RepeatedFieldBuilderV3<TestAllTypes, TestAllTypes.Builder, TestAllTypesOrBuilder> builder =
-        newRepeatedFieldBuilderV3(mockParent);
-    builder.addMessage(TestAllTypes.newBuilder().setOptionalInt32(0).build());
-    builder.addMessage(TestAllTypes.newBuilder().setOptionalInt32(1).build());
-    assertThat(builder.getMessage(0).getOptionalInt32()).isEqualTo(0);
-    assertThat(builder.getMessage(1).getOptionalInt32()).isEqualTo(1);
-
-    // Convert to list
-    List<TestAllTypes> list = builder.build();
-    assertThat(list).hasSize(2);
-    assertThat(list.get(0).getOptionalInt32()).isEqualTo(0);
-    assertThat(list.get(1).getOptionalInt32()).isEqualTo(1);
-    assertIsUnmodifiable(list);
-
-    // Update 0th item
-    assertThat(mockParent.getInvalidationCount()).isEqualTo(0);
-    builder.getBuilder(0).setOptionalString("foo");
-    assertThat(mockParent.getInvalidationCount()).isEqualTo(1);
-    list = builder.build();
-    assertThat(list).hasSize(2);
-    assertThat(list.get(0).getOptionalInt32()).isEqualTo(0);
-    assertThat(list.get(0).getOptionalString()).isEqualTo("foo");
-    assertThat(list.get(1).getOptionalInt32()).isEqualTo(1);
-    assertIsUnmodifiable(list);
-    assertThat(mockParent.getInvalidationCount()).isEqualTo(1);
-  }
-
-  @Test
-  public void testVariousMethods() {
-    TestUtil.MockBuilderParent mockParent = new TestUtil.MockBuilderParent();
-    RepeatedFieldBuilderV3<TestAllTypes, TestAllTypes.Builder, TestAllTypesOrBuilder> builder =
-        newRepeatedFieldBuilderV3(mockParent);
-    builder.addMessage(TestAllTypes.newBuilder().setOptionalInt32(1).build());
-    builder.addMessage(TestAllTypes.newBuilder().setOptionalInt32(2).build());
-    builder.addBuilder(0, TestAllTypes.getDefaultInstance()).setOptionalInt32(0);
-    builder.addBuilder(TestAllTypes.getDefaultInstance()).setOptionalInt32(3);
-
-    assertThat(builder.getMessage(0).getOptionalInt32()).isEqualTo(0);
-    assertThat(builder.getMessage(1).getOptionalInt32()).isEqualTo(1);
-    assertThat(builder.getMessage(2).getOptionalInt32()).isEqualTo(2);
-    assertThat(builder.getMessage(3).getOptionalInt32()).isEqualTo(3);
-
-    assertThat(mockParent.getInvalidationCount()).isEqualTo(0);
-    List<TestAllTypes> messages = builder.build();
-    assertThat(messages).hasSize(4);
-    assertThat(messages).isSameInstanceAs(builder.build()); // expect same list
-
-    // Remove a message.
-    builder.remove(2);
-    assertThat(mockParent.getInvalidationCount()).isEqualTo(1);
-    assertThat(builder.getCount()).isEqualTo(3);
-    assertThat(builder.getMessage(0).getOptionalInt32()).isEqualTo(0);
-    assertThat(builder.getMessage(1).getOptionalInt32()).isEqualTo(1);
-    assertThat(builder.getMessage(2).getOptionalInt32()).isEqualTo(3);
-
-    // Remove a builder.
-    builder.remove(0);
-    assertThat(mockParent.getInvalidationCount()).isEqualTo(1);
-    assertThat(builder.getCount()).isEqualTo(2);
-    assertThat(builder.getMessage(0).getOptionalInt32()).isEqualTo(1);
-    assertThat(builder.getMessage(1).getOptionalInt32()).isEqualTo(3);
-
-    // Test clear.
-    builder.clear();
-    assertThat(mockParent.getInvalidationCount()).isEqualTo(1);
-    assertThat(builder.getCount()).isEqualTo(0);
-    assertThat(builder.isEmpty()).isTrue();
-  }
-
-  @Test
-  public void testLists() {
-    TestUtil.MockBuilderParent mockParent = new TestUtil.MockBuilderParent();
-    RepeatedFieldBuilderV3<TestAllTypes, TestAllTypes.Builder, TestAllTypesOrBuilder> builder =
-        newRepeatedFieldBuilderV3(mockParent);
-    builder.addMessage(TestAllTypes.newBuilder().setOptionalInt32(1).build());
-    builder.addMessage(0, TestAllTypes.newBuilder().setOptionalInt32(0).build());
-    assertThat(builder.getMessage(0).getOptionalInt32()).isEqualTo(0);
-    assertThat(builder.getMessage(1).getOptionalInt32()).isEqualTo(1);
-
-    // Use list of builders.
-    List<TestAllTypes.Builder> builders = builder.getBuilderList();
-    assertThat(builders.get(0).getOptionalInt32()).isEqualTo(0);
-    assertThat(builders.get(1).getOptionalInt32()).isEqualTo(1);
-    builders.get(0).setOptionalInt32(10);
-    builders.get(1).setOptionalInt32(11);
-
-    // Use list of protos
-    List<TestAllTypes> protos = builder.getMessageList();
-    assertThat(protos.get(0).getOptionalInt32()).isEqualTo(10);
-    assertThat(protos.get(1).getOptionalInt32()).isEqualTo(11);
-
-    // Add an item to the builders and verify it's updated in both
-    builder.addMessage(TestAllTypes.newBuilder().setOptionalInt32(12).build());
-    assertThat(builders).hasSize(3);
-    assertThat(protos).hasSize(3);
-  }
-
-  private void assertIsUnmodifiable(List<?> list) {
-    if (list == Collections.emptyList()) {
-      // OKAY -- Need to check this b/c EmptyList allows you to call clear.
-    } else {
-      try {
-        list.clear();
-        assertWithMessage("List wasn't immutable").fail();
-      } catch (UnsupportedOperationException e) {
-        // good
-      }
-    }
-  }
-
-  private RepeatedFieldBuilderV3<TestAllTypes, TestAllTypes.Builder, TestAllTypesOrBuilder>
-      newRepeatedFieldBuilderV3(AbstractMessage.BuilderParent parent) {
-    return new RepeatedFieldBuilderV3<TestAllTypes, TestAllTypes.Builder, TestAllTypesOrBuilder>(
-        Collections.<TestAllTypes>emptyList(), false, parent, false);
-  }
-}
diff --git a/libs/protobuf/java/core/src/test/java/com/google/protobuf/RopeByteStringSubstringTest.java b/libs/protobuf/java/core/src/test/java/com/google/protobuf/RopeByteStringSubstringTest.java
deleted file mode 100644
index 0bfc0be..0000000
--- a/libs/protobuf/java/core/src/test/java/com/google/protobuf/RopeByteStringSubstringTest.java
+++ /dev/null
@@ -1,147 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.common.truth.Truth.assertWithMessage;
-
-import java.io.UnsupportedEncodingException;
-import java.util.Iterator;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-/**
- * This class tests {@link RopeByteString#substring(int, int)} by inheriting the tests from {@link
- * LiteralByteStringTest}. Only a couple of methods are overridden.
- */
-@RunWith(JUnit4.class)
-public class RopeByteStringSubstringTest extends LiteralByteStringTest {
-
-  @Override
-  @Before
-  public void setUp() throws Exception {
-    classUnderTest = "RopeByteString";
-    byte[] sourceBytes = ByteStringTest.getTestBytes(22341, 22337766L);
-    Iterator<ByteString> iter = ByteStringTest.makeConcretePieces(sourceBytes).iterator();
-    ByteString sourceString = iter.next();
-    while (iter.hasNext()) {
-      sourceString = sourceString.concat(iter.next());
-    }
-
-    int from = 1130;
-    int to = sourceBytes.length - 5555;
-    stringUnderTest = sourceString.substring(from, to);
-    referenceBytes = new byte[to - from];
-    System.arraycopy(sourceBytes, from, referenceBytes, 0, to - from);
-    expectedHashCode = -1259260680;
-  }
-
-  @Override
-  @Test
-  public void testGetTreeDepth() {
-    assertWithMessage("%s must have the expected tree depth", classUnderTest)
-        .that(stringUnderTest.getTreeDepth())
-        .isEqualTo(3);
-  }
-
-  @Override
-  @Test
-  public void testToString() throws UnsupportedEncodingException {
-    String sourceString = "I love unicode \u1234\u5678 characters";
-    ByteString sourceByteString = ByteString.copyFromUtf8(sourceString);
-    int copies = 250;
-
-    // By building the RopeByteString by concatenating, this is actually a fairly strenuous test.
-    StringBuilder builder = new StringBuilder(copies * sourceString.length());
-    ByteString unicode = ByteString.EMPTY;
-    for (int i = 0; i < copies; ++i) {
-      builder.append(sourceString);
-      unicode = RopeByteString.concatenate(unicode, sourceByteString);
-    }
-    String testString = builder.toString();
-
-    // Do the substring part
-    testString = testString.substring(2, testString.length() - 6);
-    unicode = unicode.substring(2, unicode.size() - 6);
-
-    assertWithMessage("%s from string must have the expected type", classUnderTest)
-        .that(classUnderTest)
-        .isEqualTo(getActualClassName(unicode));
-    String roundTripString = unicode.toString(UTF_8);
-    assertWithMessage("%s unicode bytes must match", classUnderTest)
-        .that(testString)
-        .isEqualTo(roundTripString);
-    ByteString flatString = ByteString.copyFromUtf8(testString);
-    assertWithMessage("%s string must equal the flat string", classUnderTest)
-        .that(flatString)
-        .isEqualTo(unicode);
-    assertWithMessage("%s string must must have same hashCode as the flat string", classUnderTest)
-        .that(flatString.hashCode())
-        .isEqualTo(unicode.hashCode());
-  }
-
-  @Override
-  @Test
-  public void testCharsetToString() {
-    String sourceString = "I love unicode \u1234\u5678 characters";
-    ByteString sourceByteString = ByteString.copyFromUtf8(sourceString);
-    int copies = 250;
-
-    // By building the RopeByteString by concatenating, this is actually a fairly strenuous test.
-    StringBuilder builder = new StringBuilder(copies * sourceString.length());
-    ByteString unicode = ByteString.EMPTY;
-    for (int i = 0; i < copies; ++i) {
-      builder.append(sourceString);
-      unicode = RopeByteString.concatenate(unicode, sourceByteString);
-    }
-    String testString = builder.toString();
-
-    // Do the substring part
-    testString = testString.substring(2, testString.length() - 6);
-    unicode = unicode.substring(2, unicode.size() - 6);
-
-    assertWithMessage("%s from string must have the expected type", classUnderTest)
-        .that(classUnderTest)
-        .isEqualTo(getActualClassName(unicode));
-    String roundTripString = unicode.toString(Internal.UTF_8);
-    assertWithMessage("%s unicode bytes must match", classUnderTest)
-        .that(testString)
-        .isEqualTo(roundTripString);
-    ByteString flatString = ByteString.copyFromUtf8(testString);
-    assertWithMessage("%s string must equal the flat string", classUnderTest)
-        .that(flatString)
-        .isEqualTo(unicode);
-    assertWithMessage("%s string must must have same hashCode as the flat string", classUnderTest)
-        .that(flatString.hashCode())
-        .isEqualTo(unicode.hashCode());
-  }
-}
diff --git a/libs/protobuf/java/core/src/test/java/com/google/protobuf/RopeByteStringTest.java b/libs/protobuf/java/core/src/test/java/com/google/protobuf/RopeByteStringTest.java
deleted file mode 100644
index bdb8132..0000000
--- a/libs/protobuf/java/core/src/test/java/com/google/protobuf/RopeByteStringTest.java
+++ /dev/null
@@ -1,237 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.common.truth.Truth.assertThat;
-import static com.google.common.truth.Truth.assertWithMessage;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.io.UnsupportedEncodingException;
-import java.util.Arrays;
-import java.util.Iterator;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-/**
- * This class tests {@link RopeByteString} by inheriting the tests from {@link
- * LiteralByteStringTest}. Only a couple of methods are overridden.
- *
- * <p>A full test of the result of {@link RopeByteString#substring(int, int)} is found in the
- * separate class {@link RopeByteStringSubstringTest}.
- */
-@RunWith(JUnit4.class)
-public class RopeByteStringTest extends LiteralByteStringTest {
-
-  @Override
-  @Before
-  public void setUp() throws Exception {
-    classUnderTest = "RopeByteString";
-    referenceBytes = ByteStringTest.getTestBytes(22341, 22337766L);
-    Iterator<ByteString> iter = ByteStringTest.makeConcretePieces(referenceBytes).iterator();
-    stringUnderTest = iter.next();
-    while (iter.hasNext()) {
-      stringUnderTest = stringUnderTest.concat(iter.next());
-    }
-    expectedHashCode = -1214197238;
-  }
-
-  @Test
-  public void testMinLength() {
-    // minLength should match the Fibonacci sequence
-    int a = 1;
-    int b = 1;
-    int i;
-    for (i = 0; a > 0; i++) {
-      assertThat(a).isEqualTo(RopeByteString.minLength(i));
-      int c = a + b;
-      a = b;
-      b = c;
-    }
-    assertThat(RopeByteString.minLength(i)).isEqualTo(Integer.MAX_VALUE);
-    assertThat(RopeByteString.minLength(i + 1)).isEqualTo(Integer.MAX_VALUE);
-    assertThat(RopeByteString.minLengthByDepth).hasLength(i + 1);
-  }
-
-  @Override
-  @Test
-  public void testGetTreeDepth() {
-    assertWithMessage("%s must have the expected tree depth", classUnderTest)
-        .that(stringUnderTest.getTreeDepth())
-        .isEqualTo(4);
-  }
-
-  @Test
-  public void testBalance() {
-    int numberOfPieces = 10000;
-    int pieceSize = 64;
-    byte[] testBytes = ByteStringTest.getTestBytes(numberOfPieces * pieceSize, 113377L);
-
-    // Build up a big ByteString from smaller pieces to force a rebalance
-    ByteString concatenated = ByteString.EMPTY;
-    for (int i = 0; i < numberOfPieces; ++i) {
-      concatenated = concatenated.concat(ByteString.copyFrom(testBytes, i * pieceSize, pieceSize));
-    }
-
-    assertWithMessage("%s from string must have the expected type", classUnderTest)
-        .that(classUnderTest)
-        .isEqualTo(getActualClassName(concatenated));
-    assertWithMessage("%s underlying bytes must match after balancing", classUnderTest)
-        .that(Arrays.equals(testBytes, concatenated.toByteArray()))
-        .isTrue();
-    ByteString testString = ByteString.copyFrom(testBytes);
-    assertWithMessage("%s balanced string must equal flat string", classUnderTest)
-        .that(testString)
-        .isEqualTo(concatenated);
-    assertWithMessage("%s flat string must equal balanced string", classUnderTest)
-        .that(concatenated)
-        .isEqualTo(testString);
-    assertWithMessage("%s balanced string must have same hash code as flat string", classUnderTest)
-        .that(testString.hashCode())
-        .isEqualTo(concatenated.hashCode());
-  }
-
-  @Override
-  @Test
-  public void testToString() throws UnsupportedEncodingException {
-    String sourceString = "I love unicode \u1234\u5678 characters";
-    ByteString sourceByteString = ByteString.copyFromUtf8(sourceString);
-    int copies = 250;
-
-    // By building the RopeByteString by concatenating, this is actually a fairly strenuous test.
-    StringBuilder builder = new StringBuilder(copies * sourceString.length());
-    ByteString unicode = ByteString.EMPTY;
-    for (int i = 0; i < copies; ++i) {
-      builder.append(sourceString);
-      unicode = RopeByteString.concatenate(unicode, sourceByteString);
-    }
-    String testString = builder.toString();
-
-    assertWithMessage("%s from string must have the expected type", classUnderTest)
-        .that(classUnderTest)
-        .isEqualTo(getActualClassName(unicode));
-    String roundTripString = unicode.toString(UTF_8);
-    assertWithMessage("%s unicode bytes must match", classUnderTest)
-        .that(testString)
-        .isEqualTo(roundTripString);
-    ByteString flatString = ByteString.copyFromUtf8(testString);
-    assertWithMessage("%s string must equal the flat string", classUnderTest)
-        .that(flatString)
-        .isEqualTo(unicode);
-    assertWithMessage("%s string must must have same hashCode as the flat string", classUnderTest)
-        .that(flatString.hashCode())
-        .isEqualTo(unicode.hashCode());
-  }
-
-  @Override
-  @Test
-  public void testCharsetToString() {
-    String sourceString = "I love unicode \u1234\u5678 characters";
-    ByteString sourceByteString = ByteString.copyFromUtf8(sourceString);
-    int copies = 250;
-
-    // By building the RopeByteString by concatenating, this is actually a fairly strenuous test.
-    StringBuilder builder = new StringBuilder(copies * sourceString.length());
-    ByteString unicode = ByteString.EMPTY;
-    for (int i = 0; i < copies; ++i) {
-      builder.append(sourceString);
-      unicode = RopeByteString.concatenate(unicode, sourceByteString);
-    }
-    String testString = builder.toString();
-
-    assertWithMessage("%s from string must have the expected type", classUnderTest)
-        .that(classUnderTest)
-        .isEqualTo(getActualClassName(unicode));
-    String roundTripString = unicode.toString(Internal.UTF_8);
-    assertWithMessage("%s unicode bytes must match", classUnderTest)
-        .that(testString)
-        .isEqualTo(roundTripString);
-    ByteString flatString = ByteString.copyFromUtf8(testString);
-    assertWithMessage("%s string must equal the flat string", classUnderTest)
-        .that(flatString)
-        .isEqualTo(unicode);
-    assertWithMessage("%s string must must have same hashCode as the flat string", classUnderTest)
-        .that(flatString.hashCode())
-        .isEqualTo(unicode.hashCode());
-  }
-
-  @Override
-  @Test
-  public void testToString_returnsCanonicalEmptyString() {
-    RopeByteString ropeByteString =
-        RopeByteString.newInstanceForTest(ByteString.EMPTY, ByteString.EMPTY);
-    assertWithMessage("%s must be the same string references", classUnderTest)
-        .that(ByteString.EMPTY.toString(Internal.UTF_8))
-        .isSameInstanceAs(ropeByteString.toString(Internal.UTF_8));
-  }
-
-  @Override
-  @Test
-  public void testToString_raisesException() {
-    try {
-      ByteString byteString = RopeByteString.newInstanceForTest(ByteString.EMPTY, ByteString.EMPTY);
-      byteString.toString("invalid");
-      assertWithMessage("Should have thrown an exception.").fail();
-    } catch (UnsupportedEncodingException expected) {
-      // This is success
-    }
-
-    try {
-      ByteString byteString =
-          RopeByteString.concatenate(
-              ByteString.copyFromUtf8("foo"), ByteString.copyFromUtf8("bar"));
-      byteString.toString("invalid");
-      assertWithMessage("Should have thrown an exception.").fail();
-    } catch (UnsupportedEncodingException expected) {
-      // This is success
-    }
-  }
-
-  @Override
-  @Test
-  public void testJavaSerialization() throws Exception {
-    ByteArrayOutputStream out = new ByteArrayOutputStream();
-    ObjectOutputStream oos = new ObjectOutputStream(out);
-    oos.writeObject(stringUnderTest);
-    oos.close();
-    byte[] pickled = out.toByteArray();
-    InputStream in = new ByteArrayInputStream(pickled);
-    ObjectInputStream ois = new ObjectInputStream(in);
-    Object o = ois.readObject();
-    assertWithMessage("Didn't get a ByteString back").that(o).isInstanceOf(ByteString.class);
-    assertWithMessage("Should get an equal ByteString back").that(o).isEqualTo(stringUnderTest);
-  }
-}
diff --git a/libs/protobuf/java/core/src/test/java/com/google/protobuf/ServiceTest.java b/libs/protobuf/java/core/src/test/java/com/google/protobuf/ServiceTest.java
deleted file mode 100644
index cdb5deb..0000000
--- a/libs/protobuf/java/core/src/test/java/com/google/protobuf/ServiceTest.java
+++ /dev/null
@@ -1,254 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.common.truth.Truth.assertThat;
-import static com.google.common.truth.Truth.assertWithMessage;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import com.google.protobuf.Descriptors.FileDescriptor;
-import com.google.protobuf.Descriptors.MethodDescriptor;
-import protobuf_unittest.MessageWithNoOuter;
-import protobuf_unittest.ServiceWithNoOuter;
-import protobuf_unittest.UnittestProto.BarRequest;
-import protobuf_unittest.UnittestProto.BarResponse;
-import protobuf_unittest.UnittestProto.FooRequest;
-import protobuf_unittest.UnittestProto.FooResponse;
-import protobuf_unittest.UnittestProto.TestAllTypes;
-import protobuf_unittest.UnittestProto.TestService;
-import protobuf_unittest.no_generic_services_test.UnittestNoGenericServices;
-import java.util.HashSet;
-import java.util.Set;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-import org.mockito.InOrder;
-import org.mockito.Mockito;
-
-@RunWith(JUnit4.class)
-public class ServiceTest {
-  private final Descriptors.MethodDescriptor fooDescriptor =
-      TestService.getDescriptor().getMethods().get(0);
-  private final Descriptors.MethodDescriptor barDescriptor =
-      TestService.getDescriptor().getMethods().get(1);
-  private static final FooRequest FOO_REQUEST = FooRequest.getDefaultInstance();
-  private static final BarRequest BAR_REQUEST = BarRequest.getDefaultInstance();
-  private static final RpcController MOCK_RPC_CONTROLLER = Mockito.mock(RpcController.class);
-  private static final FooResponse FOO_RESPONSE = FooResponse.getDefaultInstance();
-  private static final BarResponse BAR_RESPONSE = BarResponse.getDefaultInstance();
-  private static final MessageWithNoOuter MESSAGE_WITH_NO_OUTER =
-      MessageWithNoOuter.getDefaultInstance();
-
-  /** Tests Service.callMethod(). */
-  @Test
-  @SuppressWarnings({"unchecked", "rawtypes"})
-  public void testCallMethod() throws Exception {
-    TestService mockService = Mockito.mock(TestService.class);
-    RpcCallback mockFooRpcCallback = Mockito.mock(RpcCallback.class);
-    RpcCallback mockBarRpcCallback = Mockito.mock(RpcCallback.class);
-    InOrder order = Mockito.inOrder(mockService);
-
-    mockService.callMethod(fooDescriptor, MOCK_RPC_CONTROLLER, FOO_REQUEST, mockFooRpcCallback);
-    mockService.callMethod(barDescriptor, MOCK_RPC_CONTROLLER, BAR_REQUEST, mockBarRpcCallback);
-    order
-        .verify(mockService)
-        .foo(
-            Mockito.same(MOCK_RPC_CONTROLLER),
-            Mockito.same(FOO_REQUEST),
-            Mockito.same(mockFooRpcCallback));
-    order
-        .verify(mockService)
-        .bar(
-            Mockito.same(MOCK_RPC_CONTROLLER),
-            Mockito.same(BAR_REQUEST),
-            Mockito.same(mockBarRpcCallback));
-  }
-
-  /** Tests Service.get{Request,Response}Prototype(). */
-  @Test
-  public void testGetPrototype() throws Exception {
-    Descriptors.MethodDescriptor fooDescriptor = TestService.getDescriptor().getMethods().get(0);
-    Descriptors.MethodDescriptor barDescriptor = TestService.getDescriptor().getMethods().get(1);
-    TestService mockService = Mockito.mock(TestService.class);
-
-    assertThat(mockService.getRequestPrototype(fooDescriptor)).isSameInstanceAs(FOO_REQUEST);
-    assertThat(mockService.getResponsePrototype(fooDescriptor)).isSameInstanceAs(FOO_RESPONSE);
-    assertThat(mockService.getRequestPrototype(barDescriptor)).isSameInstanceAs(BAR_REQUEST);
-    assertThat(mockService.getResponsePrototype(barDescriptor)).isSameInstanceAs(BAR_RESPONSE);
-  }
-
-  /** Tests generated stubs. */
-  @Test
-  @SuppressWarnings({"unchecked", "rawtypes"})
-  public void testStub() throws Exception {
-    RpcCallback mockFooRpcCallback = Mockito.mock(RpcCallback.class);
-    RpcCallback mockBarRpcCallback = Mockito.mock(RpcCallback.class);
-    RpcChannel mockRpcChannel = Mockito.mock(RpcChannel.class);
-    InOrder order = Mockito.inOrder(mockRpcChannel);
-    TestService stub = TestService.newStub(mockRpcChannel);
-
-    stub.foo(MOCK_RPC_CONTROLLER, FOO_REQUEST, mockFooRpcCallback);
-    stub.bar(MOCK_RPC_CONTROLLER, BAR_REQUEST, mockBarRpcCallback);
-
-    order
-        .verify(mockRpcChannel)
-        .callMethod(
-            Mockito.same(fooDescriptor),
-            Mockito.same(MOCK_RPC_CONTROLLER),
-            Mockito.same(FOO_REQUEST),
-            Mockito.same(FOO_RESPONSE),
-            Mockito.any(RpcCallback.class));
-    order
-        .verify(mockRpcChannel)
-        .callMethod(
-            Mockito.same(barDescriptor),
-            Mockito.same(MOCK_RPC_CONTROLLER),
-            Mockito.same(BAR_REQUEST),
-            Mockito.same(BAR_RESPONSE),
-            Mockito.any(RpcCallback.class));
-  }
-
-  /** Tests generated blocking stubs. */
-  @Test
-  public void testBlockingStub() throws Exception {
-    BlockingRpcChannel mockBlockingRpcChannel = Mockito.mock(BlockingRpcChannel.class);
-    TestService.BlockingInterface stub = TestService.newBlockingStub(mockBlockingRpcChannel);
-
-    when(mockBlockingRpcChannel.callBlockingMethod(
-            Mockito.same(fooDescriptor),
-            Mockito.same(MOCK_RPC_CONTROLLER),
-            Mockito.same(FOO_REQUEST),
-            Mockito.same(FOO_RESPONSE)))
-        .thenReturn(FOO_RESPONSE);
-    when(mockBlockingRpcChannel.callBlockingMethod(
-            Mockito.same(barDescriptor),
-            Mockito.same(MOCK_RPC_CONTROLLER),
-            Mockito.same(BAR_REQUEST),
-            Mockito.same(BAR_RESPONSE)))
-        .thenReturn(BAR_RESPONSE);
-
-    assertThat(FOO_RESPONSE).isSameInstanceAs(stub.foo(MOCK_RPC_CONTROLLER, FOO_REQUEST));
-    assertThat(BAR_RESPONSE).isSameInstanceAs(stub.bar(MOCK_RPC_CONTROLLER, BAR_REQUEST));
-  }
-
-  @Test
-  public void testNewReflectiveService() {
-    ServiceWithNoOuter.Interface impl = Mockito.mock(ServiceWithNoOuter.Interface.class);
-    Service service = ServiceWithNoOuter.newReflectiveService(impl);
-
-    MethodDescriptor fooMethod = ServiceWithNoOuter.getDescriptor().findMethodByName("Foo");
-    RpcCallback<Message> callback =
-        new RpcCallback<Message>() {
-          @Override
-          public void run(Message parameter) {
-            // No reason this should be run.
-            assertWithMessage("should not run").fail();
-          }
-        };
-    RpcCallback<TestAllTypes> specializedCallback = RpcUtil.specializeCallback(callback);
-
-    service.callMethod(fooMethod, MOCK_RPC_CONTROLLER, MESSAGE_WITH_NO_OUTER, callback);
-    verify(impl)
-        .foo(
-            Mockito.same(MOCK_RPC_CONTROLLER),
-            Mockito.same(MESSAGE_WITH_NO_OUTER),
-            Mockito.same(specializedCallback));
-  }
-
-  @Test
-  public void testNewReflectiveBlockingService() throws ServiceException {
-    ServiceWithNoOuter.BlockingInterface impl =
-        Mockito.mock(ServiceWithNoOuter.BlockingInterface.class);
-
-    BlockingService service = ServiceWithNoOuter.newReflectiveBlockingService(impl);
-
-    MethodDescriptor fooMethod = ServiceWithNoOuter.getDescriptor().findMethodByName("Foo");
-
-    TestAllTypes expectedResponse = TestAllTypes.getDefaultInstance();
-
-    when(impl.foo(Mockito.same(MOCK_RPC_CONTROLLER), Mockito.same(MESSAGE_WITH_NO_OUTER)))
-        .thenReturn(expectedResponse);
-    Message response =
-        service.callBlockingMethod(fooMethod, MOCK_RPC_CONTROLLER, MESSAGE_WITH_NO_OUTER);
-    assertThat(response).isEqualTo(expectedResponse);
-  }
-
-  @Test
-  public void testNoGenericServices() throws Exception {
-    // Non-services should be usable.
-    UnittestNoGenericServices.TestMessage message =
-        UnittestNoGenericServices.TestMessage.newBuilder()
-            .setA(123)
-            .setExtension(UnittestNoGenericServices.testExtension, 456)
-            .build();
-    assertThat(message.getA()).isEqualTo(123);
-    assertThat(UnittestNoGenericServices.TestEnum.FOO.getNumber()).isEqualTo(1);
-
-    // Build a list of the class names nested in UnittestNoGenericServices.
-    String outerName =
-        "protobuf_unittest.no_generic_services_test.UnittestNoGenericServices";
-    Class<?> outerClass = Class.forName(outerName);
-
-    Set<String> innerClassNames = new HashSet<>();
-    for (Class<?> innerClass : outerClass.getClasses()) {
-      String fullName = innerClass.getName();
-      // Figure out the unqualified name of the inner class.
-      // Note:  Surprisingly, the full name of an inner class will be separated
-      //   from the outer class name by a '$' rather than a '.'.  This is not
-      //   mentioned in the documentation for java.lang.Class.  I don't want to
-      //   make assumptions, so I'm just going to accept any character as the
-      //   separator.
-      assertThat(fullName).startsWith(outerName);
-
-      if (!Service.class.isAssignableFrom(innerClass)
-          && !Message.class.isAssignableFrom(innerClass)
-          && !ProtocolMessageEnum.class.isAssignableFrom(innerClass)) {
-        // Ignore any classes not generated by the base code generator.
-        continue;
-      }
-
-      innerClassNames.add(fullName.substring(outerName.length() + 1));
-    }
-
-    // No service class should have been generated.
-    assertThat(innerClassNames).contains("TestMessage");
-    assertThat(innerClassNames).contains("TestEnum");
-    assertThat(innerClassNames).doesNotContain("TestService");
-
-    // But descriptors are there.
-    FileDescriptor file = UnittestNoGenericServices.getDescriptor();
-    assertThat(file.getServices()).hasSize(1);
-    assertThat(file.getServices().get(0).getName()).isEqualTo("TestService");
-    assertThat(file.getServices().get(0).getMethods()).hasSize(1);
-    assertThat(file.getServices().get(0).getMethods().get(0).getName()).isEqualTo("Foo");
-  }
-}
diff --git a/libs/protobuf/java/core/src/test/java/com/google/protobuf/SingleFieldBuilderV3Test.java b/libs/protobuf/java/core/src/test/java/com/google/protobuf/SingleFieldBuilderV3Test.java
deleted file mode 100644
index d2215b0..0000000
--- a/libs/protobuf/java/core/src/test/java/com/google/protobuf/SingleFieldBuilderV3Test.java
+++ /dev/null
@@ -1,132 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import protobuf_unittest.UnittestProto.TestAllTypes;
-import protobuf_unittest.UnittestProto.TestAllTypesOrBuilder;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-/**
- * Tests for {@link SingleFieldBuilderV3}. This tests basic functionality. More extensive testing is
- * provided via other tests that exercise the builder.
- */
-@RunWith(JUnit4.class)
-public class SingleFieldBuilderV3Test {
-
-  @Test
-  public void testBasicUseAndInvalidations() {
-    TestUtil.MockBuilderParent mockParent = new TestUtil.MockBuilderParent();
-    SingleFieldBuilderV3<TestAllTypes, TestAllTypes.Builder, TestAllTypesOrBuilder> builder =
-        new SingleFieldBuilderV3<>(TestAllTypes.getDefaultInstance(), mockParent, false);
-    assertThat(builder.getMessage()).isSameInstanceAs(TestAllTypes.getDefaultInstance());
-    assertThat(builder.getBuilder().buildPartial()).isEqualTo(TestAllTypes.getDefaultInstance());
-    assertThat(mockParent.getInvalidationCount()).isEqualTo(0);
-
-    builder.getBuilder().setOptionalInt32(10);
-    assertThat(mockParent.getInvalidationCount()).isEqualTo(0);
-    TestAllTypes message = builder.build();
-    assertThat(message.getOptionalInt32()).isEqualTo(10);
-
-    // Test that we receive invalidations now that build has been called.
-    assertThat(mockParent.getInvalidationCount()).isEqualTo(0);
-    builder.getBuilder().setOptionalInt32(20);
-    assertThat(mockParent.getInvalidationCount()).isEqualTo(1);
-
-    // Test that we don't keep getting invalidations on every change
-    builder.getBuilder().setOptionalInt32(30);
-    assertThat(mockParent.getInvalidationCount()).isEqualTo(1);
-  }
-
-  @Test
-  public void testSetMessage() {
-    TestUtil.MockBuilderParent mockParent = new TestUtil.MockBuilderParent();
-    SingleFieldBuilderV3<TestAllTypes, TestAllTypes.Builder, TestAllTypesOrBuilder> builder =
-        new SingleFieldBuilderV3<>(TestAllTypes.getDefaultInstance(), mockParent, false);
-    builder.setMessage(TestAllTypes.newBuilder().setOptionalInt32(0).build());
-    assertThat(builder.getMessage().getOptionalInt32()).isEqualTo(0);
-
-    // Update message using the builder
-    builder.getBuilder().setOptionalInt32(1);
-    assertThat(mockParent.getInvalidationCount()).isEqualTo(0);
-    assertThat(builder.getBuilder().getOptionalInt32()).isEqualTo(1);
-    assertThat(builder.getMessage().getOptionalInt32()).isEqualTo(1);
-    builder.build();
-    builder.getBuilder().setOptionalInt32(2);
-    assertThat(builder.getBuilder().getOptionalInt32()).isEqualTo(2);
-    assertThat(builder.getMessage().getOptionalInt32()).isEqualTo(2);
-
-    // Make sure message stays cached
-    assertThat(builder.getMessage()).isSameInstanceAs(builder.getMessage());
-  }
-
-  @Test
-  public void testClear() {
-    TestUtil.MockBuilderParent mockParent = new TestUtil.MockBuilderParent();
-    SingleFieldBuilderV3<TestAllTypes, TestAllTypes.Builder, TestAllTypesOrBuilder> builder =
-        new SingleFieldBuilderV3<>(TestAllTypes.getDefaultInstance(), mockParent, false);
-    builder.setMessage(TestAllTypes.newBuilder().setOptionalInt32(0).build());
-    assertThat(TestAllTypes.getDefaultInstance()).isNotSameInstanceAs(builder.getMessage());
-    builder.clear();
-    assertThat(builder.getMessage()).isSameInstanceAs(TestAllTypes.getDefaultInstance());
-
-    builder.getBuilder().setOptionalInt32(1);
-    assertThat(TestAllTypes.getDefaultInstance()).isNotSameInstanceAs(builder.getMessage());
-    builder.clear();
-    assertThat(builder.getMessage()).isSameInstanceAs(TestAllTypes.getDefaultInstance());
-  }
-
-  @Test
-  public void testMerge() {
-    TestUtil.MockBuilderParent mockParent = new TestUtil.MockBuilderParent();
-    SingleFieldBuilderV3<TestAllTypes, TestAllTypes.Builder, TestAllTypesOrBuilder> builder =
-        new SingleFieldBuilderV3<>(TestAllTypes.getDefaultInstance(), mockParent, false);
-
-    // Merge into default field.
-    builder.mergeFrom(TestAllTypes.getDefaultInstance());
-    assertThat(builder.getMessage()).isSameInstanceAs(TestAllTypes.getDefaultInstance());
-
-    // Merge into non-default field on existing builder.
-    builder.getBuilder().setOptionalInt32(2);
-    builder.mergeFrom(TestAllTypes.newBuilder().setOptionalDouble(4.0).buildPartial());
-    assertThat(builder.getMessage().getOptionalInt32()).isEqualTo(2);
-    assertThat(builder.getMessage().getOptionalDouble()).isEqualTo(4.0);
-
-    // Merge into non-default field on existing message
-    builder.setMessage(TestAllTypes.newBuilder().setOptionalInt32(10).buildPartial());
-    builder.mergeFrom(TestAllTypes.newBuilder().setOptionalDouble(5.0).buildPartial());
-    assertThat(builder.getMessage().getOptionalInt32()).isEqualTo(10);
-    assertThat(builder.getMessage().getOptionalDouble()).isEqualTo(5.0);
-  }
-}
diff --git a/libs/protobuf/java/core/src/test/java/com/google/protobuf/SmallSortedMapTest.java b/libs/protobuf/java/core/src/test/java/com/google/protobuf/SmallSortedMapTest.java
deleted file mode 100644
index fdeccc2..0000000
--- a/libs/protobuf/java/core/src/test/java/com/google/protobuf/SmallSortedMapTest.java
+++ /dev/null
@@ -1,430 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.common.truth.Truth.assertThat;
-import static com.google.common.truth.Truth.assertWithMessage;
-import static java.lang.Math.min;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeSet;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-@RunWith(JUnit4.class)
-public class SmallSortedMapTest {
-  // java.util.AbstractMap.SimpleEntry is private in JDK 1.5. We re-implement it
-  // here for JDK 1.5 users.
-  private static class SimpleEntry<K, V> implements Map.Entry<K, V> {
-    private final K key;
-    private V value;
-
-    SimpleEntry(K key, V value) {
-      this.key = key;
-      this.value = value;
-    }
-
-    @Override
-    public K getKey() {
-      return key;
-    }
-
-    @Override
-    public V getValue() {
-      return value;
-    }
-
-    @Override
-    public V setValue(V value) {
-      V oldValue = this.value;
-      this.value = value;
-      return oldValue;
-    }
-
-    private static boolean eq(Object o1, Object o2) {
-      return o1 == null ? o2 == null : o1.equals(o2);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-      if (!(o instanceof Map.Entry)) {
-        return false;
-      }
-      Map.Entry<?, ?> e = (Map.Entry<?, ?>) o;
-      return eq(key, e.getKey()) && eq(value, e.getValue());
-    }
-
-    @Override
-    public int hashCode() {
-      return ((key == null) ? 0 : key.hashCode()) ^ ((value == null) ? 0 : value.hashCode());
-    }
-  }
-
-  @Test
-  public void testPutAndGetArrayEntriesOnly() {
-    runPutAndGetTest(3);
-  }
-
-  @Test
-  public void testPutAndGetOverflowEntries() {
-    runPutAndGetTest(6);
-  }
-
-  private void runPutAndGetTest(int numElements) {
-    // Test with even and odd arraySize
-    SmallSortedMap<Integer, Integer> map1 = SmallSortedMap.newInstanceForTest(3);
-    SmallSortedMap<Integer, Integer> map2 = SmallSortedMap.newInstanceForTest(4);
-    SmallSortedMap<Integer, Integer> map3 = SmallSortedMap.newInstanceForTest(3);
-    SmallSortedMap<Integer, Integer> map4 = SmallSortedMap.newInstanceForTest(4);
-
-    // Test with puts in ascending order.
-    for (int i = 0; i < numElements; i++) {
-      assertThat(map1.put(i, i + 1)).isNull();
-      assertThat(map2.put(i, i + 1)).isNull();
-    }
-    // Test with puts in descending order.
-    for (int i = numElements - 1; i >= 0; i--) {
-      assertThat(map3.put(i, i + 1)).isNull();
-      assertThat(map4.put(i, i + 1)).isNull();
-    }
-
-    assertThat(map1.getNumArrayEntries()).isEqualTo(min(3, numElements));
-    assertThat(map2.getNumArrayEntries()).isEqualTo(min(4, numElements));
-    assertThat(map3.getNumArrayEntries()).isEqualTo(min(3, numElements));
-    assertThat(map4.getNumArrayEntries()).isEqualTo(min(4, numElements));
-
-    List<SmallSortedMap<Integer, Integer>> allMaps = new ArrayList<>();
-    allMaps.add(map1);
-    allMaps.add(map2);
-    allMaps.add(map3);
-    allMaps.add(map4);
-
-    for (SmallSortedMap<Integer, Integer> map : allMaps) {
-      assertThat(map).hasSize(numElements);
-      for (int i = 0; i < numElements; i++) {
-        assertThat(map).containsEntry(i, Integer.valueOf(i + 1));
-      }
-    }
-
-    assertThat(map1).isEqualTo(map2);
-    assertThat(map2).isEqualTo(map3);
-    assertThat(map3).isEqualTo(map4);
-  }
-
-  @Test
-  public void testReplacingPut() {
-    SmallSortedMap<Integer, Integer> map = SmallSortedMap.newInstanceForTest(3);
-    for (int i = 0; i < 6; i++) {
-      assertThat(map.put(i, i + 1)).isNull();
-      assertThat(map.remove(i + 1)).isNull();
-    }
-    for (int i = 0; i < 6; i++) {
-      assertThat(map.put(i, i + 2)).isEqualTo(Integer.valueOf(i + 1));
-    }
-  }
-
-  @Test
-  public void testRemove() {
-    SmallSortedMap<Integer, Integer> map = SmallSortedMap.newInstanceForTest(3);
-    for (int i = 0; i < 6; i++) {
-      assertThat(map.put(i, i + 1)).isNull();
-      assertThat(map.remove(i + 1)).isNull();
-    }
-
-    assertThat(map.getNumArrayEntries()).isEqualTo(3);
-    assertThat(map.getNumOverflowEntries()).isEqualTo(3);
-    assertThat(map).hasSize(6);
-    assertThat(map.keySet()).isEqualTo(makeSortedKeySet(0, 1, 2, 3, 4, 5));
-
-    assertThat(map.remove(1)).isEqualTo(Integer.valueOf(2));
-    assertThat(map.getNumArrayEntries()).isEqualTo(3);
-    assertThat(map.getNumOverflowEntries()).isEqualTo(2);
-    assertThat(map).hasSize(5);
-    assertThat(map.keySet()).isEqualTo(makeSortedKeySet(0, 2, 3, 4, 5));
-
-    assertThat(map.remove(4)).isEqualTo(Integer.valueOf(5));
-    assertThat(map.getNumArrayEntries()).isEqualTo(3);
-    assertThat(map.getNumOverflowEntries()).isEqualTo(1);
-    assertThat(map).hasSize(4);
-    assertThat(map.keySet()).isEqualTo(makeSortedKeySet(0, 2, 3, 5));
-
-    assertThat(map.remove(3)).isEqualTo(Integer.valueOf(4));
-    assertThat(map.getNumArrayEntries()).isEqualTo(3);
-    assertThat(map.getNumOverflowEntries()).isEqualTo(0);
-    assertThat(map).hasSize(3);
-    assertThat(map.keySet()).isEqualTo(makeSortedKeySet(0, 2, 5));
-
-    assertThat(map.remove(3)).isNull();
-    assertThat(map.getNumArrayEntries()).isEqualTo(3);
-    assertThat(map.getNumOverflowEntries()).isEqualTo(0);
-    assertThat(map).hasSize(3);
-
-    assertThat(map.remove(0)).isEqualTo(Integer.valueOf(1));
-    assertThat(map.getNumArrayEntries()).isEqualTo(2);
-    assertThat(map.getNumOverflowEntries()).isEqualTo(0);
-    assertThat(map).hasSize(2);
-  }
-
-  @Test
-  public void testClear() {
-    SmallSortedMap<Integer, Integer> map = SmallSortedMap.newInstanceForTest(3);
-    for (int i = 0; i < 6; i++) {
-      assertThat(map.put(i, i + 1)).isNull();
-    }
-    map.clear();
-    assertThat(map.getNumArrayEntries()).isEqualTo(0);
-    assertThat(map.getNumOverflowEntries()).isEqualTo(0);
-    assertThat(map).isEmpty();
-  }
-
-  @Test
-  public void testGetArrayEntryAndOverflowEntries() {
-    SmallSortedMap<Integer, Integer> map = SmallSortedMap.newInstanceForTest(3);
-    for (int i = 0; i < 6; i++) {
-      assertThat(map.put(i, i + 1)).isNull();
-    }
-    assertThat(map.getNumArrayEntries()).isEqualTo(3);
-    for (int i = 0; i < 3; i++) {
-      Map.Entry<Integer, Integer> entry = map.getArrayEntryAt(i);
-      assertThat(entry.getKey()).isEqualTo(Integer.valueOf(i));
-      assertThat(entry.getValue()).isEqualTo(Integer.valueOf(i + 1));
-    }
-    Iterator<Map.Entry<Integer, Integer>> it = map.getOverflowEntries().iterator();
-    for (int i = 3; i < 6; i++) {
-      assertThat(it.hasNext()).isTrue();
-      Map.Entry<Integer, Integer> entry = it.next();
-      assertThat(entry.getKey()).isEqualTo(Integer.valueOf(i));
-      assertThat(entry.getValue()).isEqualTo(Integer.valueOf(i + 1));
-    }
-    assertThat(it.hasNext()).isFalse();
-  }
-
-  @Test
-  public void testEntrySetContains() {
-    SmallSortedMap<Integer, Integer> map = SmallSortedMap.newInstanceForTest(3);
-    for (int i = 0; i < 6; i++) {
-      assertThat(map.put(i, i + 1)).isNull();
-    }
-    Set<Map.Entry<Integer, Integer>> entrySet = map.entrySet();
-    for (int i = 0; i < 6; i++) {
-      assertThat(entrySet).contains(new SimpleEntry<Integer, Integer>(i, i + 1));
-      assertThat(entrySet).doesNotContain(new SimpleEntry<Integer, Integer>(i, i));
-    }
-  }
-
-  @Test
-  public void testEntrySetAdd() {
-    SmallSortedMap<Integer, Integer> map = SmallSortedMap.newInstanceForTest(3);
-    Set<Map.Entry<Integer, Integer>> entrySet = map.entrySet();
-    for (int i = 0; i < 6; i++) {
-      Map.Entry<Integer, Integer> entry = new SimpleEntry<>(i, i + 1);
-      assertThat(entrySet.add(entry)).isTrue();
-      assertThat(entrySet.add(entry)).isFalse();
-    }
-    for (int i = 0; i < 6; i++) {
-      assertThat(map).containsEntry(i, Integer.valueOf(i + 1));
-    }
-    assertThat(map.getNumArrayEntries()).isEqualTo(3);
-    assertThat(map.getNumOverflowEntries()).isEqualTo(3);
-    assertThat(map).hasSize(6);
-  }
-
-  @Test
-  public void testEntrySetRemove() {
-    SmallSortedMap<Integer, Integer> map = SmallSortedMap.newInstanceForTest(3);
-    Set<Map.Entry<Integer, Integer>> entrySet = map.entrySet();
-    for (int i = 0; i < 6; i++) {
-      assertThat(map.put(i, i + 1)).isNull();
-    }
-    for (int i = 0; i < 6; i++) {
-      Map.Entry<Integer, Integer> entry = new SimpleEntry<>(i, i + 1);
-      assertThat(entrySet.remove(entry)).isTrue();
-      assertThat(entrySet.remove(entry)).isFalse();
-    }
-    assertThat(map).isEmpty();
-    assertThat(map.getNumArrayEntries()).isEqualTo(0);
-    assertThat(map.getNumOverflowEntries()).isEqualTo(0);
-    assertThat(map).isEmpty();
-  }
-
-  @Test
-  public void testEntrySetClear() {
-    SmallSortedMap<Integer, Integer> map = SmallSortedMap.newInstanceForTest(3);
-    for (int i = 0; i < 6; i++) {
-      assertThat(map.put(i, i + 1)).isNull();
-    }
-    map.clear();
-    assertThat(map).isEmpty();
-    assertThat(map.getNumArrayEntries()).isEqualTo(0);
-    assertThat(map.getNumOverflowEntries()).isEqualTo(0);
-    assertThat(map).isEmpty();
-  }
-
-  @Test
-  public void testEntrySetIteratorNext() {
-    SmallSortedMap<Integer, Integer> map = SmallSortedMap.newInstanceForTest(3);
-    for (int i = 0; i < 6; i++) {
-      assertThat(map.put(i, i + 1)).isNull();
-    }
-    Iterator<Map.Entry<Integer, Integer>> it = map.entrySet().iterator();
-    for (int i = 0; i < 6; i++) {
-      assertThat(it.hasNext()).isTrue();
-      Map.Entry<Integer, Integer> entry = it.next();
-      assertThat(entry.getKey()).isEqualTo(Integer.valueOf(i));
-      assertThat(entry.getValue()).isEqualTo(Integer.valueOf(i + 1));
-    }
-    assertThat(it.hasNext()).isFalse();
-  }
-
-  @Test
-  public void testEntrySetIteratorRemove() {
-    SmallSortedMap<Integer, Integer> map = SmallSortedMap.newInstanceForTest(3);
-    for (int i = 0; i < 6; i++) {
-      assertThat(map.put(i, i + 1)).isNull();
-    }
-    Iterator<Map.Entry<Integer, Integer>> it = map.entrySet().iterator();
-    for (int i = 0; i < 6; i++) {
-      assertThat(map).containsKey(i);
-      it.next();
-      it.remove();
-      assertThat(map).doesNotContainKey(i);
-      assertThat(map).hasSize(6 - i - 1);
-    }
-  }
-
-  @Test
-  public void testMapEntryModification() {
-    SmallSortedMap<Integer, Integer> map = SmallSortedMap.newInstanceForTest(3);
-    for (int i = 0; i < 6; i++) {
-      assertThat(map.put(i, i + 1)).isNull();
-    }
-    Iterator<Map.Entry<Integer, Integer>> it = map.entrySet().iterator();
-    for (int i = 0; i < 6; i++) {
-      Map.Entry<Integer, Integer> entry = it.next();
-      entry.setValue(i + 23);
-    }
-    for (int i = 0; i < 6; i++) {
-      assertThat(map).containsEntry(i, Integer.valueOf(i + 23));
-    }
-  }
-
-  @Test
-  public void testMakeImmutable() {
-    SmallSortedMap<Integer, Integer> map = SmallSortedMap.newInstanceForTest(3);
-    for (int i = 0; i < 6; i++) {
-      assertThat(map.put(i, i + 1)).isNull();
-    }
-    map.makeImmutable();
-    assertThat(map).containsEntry(0, Integer.valueOf(1));
-    assertThat(map).hasSize(6);
-
-    try {
-      map.put(23, 23);
-      assertWithMessage("Expected UnsupportedOperationException").fail();
-    } catch (UnsupportedOperationException expected) {
-    }
-
-    Map<Integer, Integer> other = new HashMap<>();
-    other.put(23, 23);
-    try {
-      map.putAll(other);
-      assertWithMessage("Expected UnsupportedOperationException").fail();
-    } catch (UnsupportedOperationException expected) {
-    }
-
-    try {
-      map.remove(0);
-      assertWithMessage("Expected UnsupportedOperationException").fail();
-    } catch (UnsupportedOperationException expected) {
-    }
-
-    try {
-      map.clear();
-      assertWithMessage("Expected UnsupportedOperationException").fail();
-    } catch (UnsupportedOperationException expected) {
-    }
-
-    Set<Map.Entry<Integer, Integer>> entrySet = map.entrySet();
-    try {
-      entrySet.clear();
-      assertWithMessage("Expected UnsupportedOperationException").fail();
-    } catch (UnsupportedOperationException expected) {
-    }
-
-    Iterator<Map.Entry<Integer, Integer>> it = entrySet.iterator();
-    while (it.hasNext()) {
-      Map.Entry<Integer, Integer> entry = it.next();
-      try {
-        entry.setValue(0);
-        assertWithMessage("Expected UnsupportedOperationException").fail();
-      } catch (UnsupportedOperationException expected) {
-      }
-      try {
-        it.remove();
-        assertWithMessage("Expected UnsupportedOperationException").fail();
-      } catch (UnsupportedOperationException expected) {
-      }
-    }
-
-    Set<Integer> keySet = map.keySet();
-    try {
-      keySet.clear();
-      assertWithMessage("Expected UnsupportedOperationException").fail();
-    } catch (UnsupportedOperationException expected) {
-    }
-
-    Iterator<Integer> keys = keySet.iterator();
-    while (keys.hasNext()) {
-      Integer key = keys.next();
-      try {
-        keySet.remove(key);
-        assertWithMessage("Expected UnsupportedOperationException").fail();
-      } catch (UnsupportedOperationException expected) {
-      }
-      try {
-        keys.remove();
-        assertWithMessage("Expected UnsupportedOperationException").fail();
-      } catch (UnsupportedOperationException expected) {
-      }
-    }
-  }
-
-  private Set<Integer> makeSortedKeySet(Integer... keys) {
-    return new TreeSet<>(Arrays.<Integer>asList(keys));
-  }
-}
diff --git a/libs/protobuf/java/core/src/test/java/com/google/protobuf/TestBadIdentifiers.java b/libs/protobuf/java/core/src/test/java/com/google/protobuf/TestBadIdentifiers.java
deleted file mode 100644
index 38d2471..0000000
--- a/libs/protobuf/java/core/src/test/java/com/google/protobuf/TestBadIdentifiers.java
+++ /dev/null
@@ -1,125 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import junit.framework.TestCase;
-
-/**
- * Tests that proto2 api generation doesn't cause compile errors when compiling protocol buffers
- * that have names that would otherwise conflict if not fully qualified (like @Deprecated
- * and @Override).
- *
- * @author jonp@google.com (Jon Perlow)
- */
-public class TestBadIdentifiers extends TestCase {
-
-  public void testCompilation() {
-    // If this compiles, it means the generation was correct.
-    TestBadIdentifiersProto.Deprecated unused1 =
-        TestBadIdentifiersProto.Deprecated.newBuilder().build();
-    TestBadIdentifiersProto.Override unused2 =
-        TestBadIdentifiersProto.Override.getDefaultInstance();
-  }
-
-  @SuppressWarnings("IgnoredPureGetter") // TODO(b/221602772): Fix this
-  public void testGetDescriptor() {
-    TestBadIdentifiersProto.getDescriptor();
-    TestBadIdentifiersProto.Descriptor.getDefaultInstance().getDescriptor();
-    TestBadIdentifiersProto.Descriptor.getDefaultInstance().getDescriptorForType();
-    TestBadIdentifiersProto.Descriptor.NestedDescriptor.getDefaultInstance().getDescriptor();
-    TestBadIdentifiersProto.Descriptor.NestedDescriptor.getDefaultInstance().getDescriptorForType();
-  }
-
-  public void testConflictingFieldNames() throws Exception {
-    TestBadIdentifiersProto.TestConflictingFieldNames message =
-        TestBadIdentifiersProto.TestConflictingFieldNames.getDefaultInstance();
-    // Make sure generated accessors are properly named.
-    assertEquals(0, message.getInt32Field1Count());
-    assertEquals(0, message.getEnumField2Count());
-    assertEquals(0, message.getStringField3Count());
-    assertEquals(0, message.getBytesField4Count());
-    assertEquals(0, message.getMessageField5Count());
-
-    assertEquals(0, message.getInt32FieldCount11());
-    assertEquals(0, message.getEnumFieldCount12().getNumber());
-    assertEquals("", message.getStringFieldCount13());
-    assertEquals(ByteString.EMPTY, message.getBytesFieldCount14());
-    assertEquals(0, message.getMessageFieldCount15().getSerializedSize());
-
-    assertEquals(0, message.getInt32Field21Count());
-    assertEquals(0, message.getEnumField22Count());
-    assertEquals(0, message.getStringField23Count());
-    assertEquals(0, message.getBytesField24Count());
-    assertEquals(0, message.getMessageField25Count());
-
-    assertEquals(0, message.getInt32Field1List().size());
-    assertEquals(0, message.getInt32FieldList31());
-
-    assertEquals(0, message.getInt64FieldCount());
-    assertEquals(
-        0L,
-        message
-            .getExtension(TestBadIdentifiersProto.TestConflictingFieldNames.int64FieldCount)
-            .longValue());
-    assertEquals(
-        0L,
-        message
-            .getExtension(TestBadIdentifiersProto.TestConflictingFieldNames.int64FieldList)
-            .longValue());
-
-    assertEquals("", message.getFieldName32());
-    assertEquals("", message.getFieldName33());
-    assertEquals(0, message.get2Conflict34());
-    assertEquals(0, message.get2Conflict35());
-
-  }
-
-  public void testNumberFields() throws Exception {
-    TestBadIdentifiersProto.TestLeadingNumberFields message =
-        TestBadIdentifiersProto.TestLeadingNumberFields.getDefaultInstance();
-    // Make sure generated accessors are properly named.
-    assertFalse(message.has30DayImpressions());
-    assertEquals(0, message.get30DayImpressions());
-    assertEquals(0, message.get60DayImpressionsCount());
-    assertEquals(0, message.get60DayImpressionsList().size());
-
-    assertFalse(message.has2Underscores());
-    assertEquals("", message.get2Underscores());
-    assertEquals(0, message.get2RepeatedUnderscoresCount());
-    assertEquals(0, message.get2RepeatedUnderscoresList().size());
-
-    assertFalse(message.has32());
-    assertEquals(0, message.get32());
-    assertEquals(0, message.get64Count());
-    assertEquals(0, message.get64List().size());
-
-  }
-}
diff --git a/libs/protobuf/java/core/src/test/java/com/google/protobuf/TestBadIdentifiersLite.java b/libs/protobuf/java/core/src/test/java/com/google/protobuf/TestBadIdentifiersLite.java
deleted file mode 100644
index ab32e2a..0000000
--- a/libs/protobuf/java/core/src/test/java/com/google/protobuf/TestBadIdentifiersLite.java
+++ /dev/null
@@ -1,93 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import junit.framework.TestCase;
-
-/**
- * Tests that proto2 api generation doesn't cause compile errors when compiling protocol buffers
- * that have names that would otherwise conflict if not fully qualified (like @Deprecated
- * and @Override).
- *
- * <p>Forked from {@link TestBadIdentifiers}.
- *
- * @author jonp@google.com (Jon Perlow)
- */
-public final class TestBadIdentifiersLite extends TestCase {
-
-  public void testCompilation() {
-    // If this compiles, it means the generation was correct.
-    TestBadIdentifiersProto.Deprecated.Builder builder1 =
-        TestBadIdentifiersProto.Deprecated.newBuilder();
-    TestBadIdentifiersProto.Override.Builder builder2 =
-        TestBadIdentifiersProto.Override.newBuilder();
-  }
-
-  public void testConflictingFieldNames() throws Exception {
-    TestBadIdentifiersProto.TestConflictingFieldNames message =
-        TestBadIdentifiersProto.TestConflictingFieldNames.getDefaultInstance();
-    // Make sure generated accessors are properly named.
-    assertThat(message.getInt32Field1Count()).isEqualTo(0);
-    assertThat(message.getEnumField2Count()).isEqualTo(0);
-    assertThat(message.getStringField3Count()).isEqualTo(0);
-    assertThat(message.getBytesField4Count()).isEqualTo(0);
-    assertThat(message.getMessageField5Count()).isEqualTo(0);
-
-    assertThat(message.getInt32FieldCount11()).isEqualTo(0);
-    assertThat(message.getEnumFieldCount12().getNumber()).isEqualTo(0);
-    assertThat(message.getStringFieldCount13()).isEmpty();
-    assertThat(message.getBytesFieldCount14()).isEqualTo(ByteString.EMPTY);
-    assertThat(message.getMessageFieldCount15().getSerializedSize()).isEqualTo(0);
-
-    assertThat(message.getInt32Field21Count()).isEqualTo(0);
-    assertThat(message.getEnumField22Count()).isEqualTo(0);
-    assertThat(message.getStringField23Count()).isEqualTo(0);
-    assertThat(message.getBytesField24Count()).isEqualTo(0);
-    assertThat(message.getMessageField25Count()).isEqualTo(0);
-
-    assertThat(message.getInt32Field1List()).isEmpty();
-    assertThat(message.getInt32FieldList31()).isEqualTo(0);
-
-    assertThat(message.getInt64FieldCount()).isEqualTo(0);
-    assertThat(
-            message
-                .getExtension(TestBadIdentifiersProto.TestConflictingFieldNames.int64FieldCount)
-                .longValue())
-        .isEqualTo(0L);
-    assertThat(
-            message
-                .getExtension(TestBadIdentifiersProto.TestConflictingFieldNames.int64FieldList)
-                .longValue())
-        .isEqualTo(0L);
-  }
-}
diff --git a/libs/protobuf/java/core/src/test/java/com/google/protobuf/TestSchemas.java b/libs/protobuf/java/core/src/test/java/com/google/protobuf/TestSchemas.java
deleted file mode 100644
index 639583d..0000000
--- a/libs/protobuf/java/core/src/test/java/com/google/protobuf/TestSchemas.java
+++ /dev/null
@@ -1,98 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import com.google.protobuf.testing.Proto2Testing;
-import com.google.protobuf.testing.Proto2Testing.Proto2Empty;
-import com.google.protobuf.testing.Proto2Testing.Proto2Message;
-import com.google.protobuf.testing.Proto2Testing.Proto2MessageWithExtensions;
-import com.google.protobuf.testing.Proto2Testing.Proto2MessageWithMaps;
-import com.google.protobuf.testing.Proto3Testing.Proto3Empty;
-import com.google.protobuf.testing.Proto3Testing.Proto3Message;
-import com.google.protobuf.testing.Proto3Testing.Proto3MessageWithMaps;
-
-/** Schemas to support testing. */
-public class TestSchemas {
-
-  private TestSchemas() {
-  }
-
-  public static final Schema<Proto2Message> genericProto2Schema =
-      new ManifestSchemaFactory().createSchema(Proto2Message.class);
-  public static final Schema<Proto3Message> genericProto3Schema =
-      new ManifestSchemaFactory().createSchema(Proto3Message.class);
-
-  public static void registerGenericProto2Schemas() {
-    registerProto2Schemas();
-  }
-
-  public static void registerGenericProto3Schemas() {
-    registerProto3Schemas();
-  }
-
-  private static void registerProto2Schemas() {
-    Protobuf protobuf = Protobuf.getInstance();
-    ManifestSchemaFactory factory = new ManifestSchemaFactory();
-    protobuf.registerSchemaOverride(Proto2Message.class, factory.createSchema(Proto2Message.class));
-    protobuf.registerSchemaOverride(
-        Proto2Message.FieldGroup49.class, factory.createSchema(Proto2Message.FieldGroup49.class));
-    protobuf.registerSchemaOverride(
-        Proto2Message.FieldGroupList51.class,
-        factory.createSchema(Proto2Message.FieldGroupList51.class));
-    protobuf.registerSchemaOverride(
-        Proto2Message.FieldGroup69.class, factory.createSchema(Proto2Message.FieldGroup69.class));
-    protobuf.registerSchemaOverride(
-        Proto2Message.RequiredNestedMessage.class,
-        factory.createSchema(Proto2Message.RequiredNestedMessage.class));
-    protobuf.registerSchemaOverride(
-        Proto2Message.FieldRequiredGroup88.class,
-        factory.createSchema(Proto2Message.FieldRequiredGroup88.class));
-    protobuf.registerSchemaOverride(Proto2Empty.class, factory.createSchema(Proto2Empty.class));
-    protobuf.registerSchemaOverride(
-        Proto2MessageWithExtensions.class, factory.createSchema(Proto2MessageWithExtensions.class));
-    protobuf.registerSchemaOverride(
-        Proto2Testing.FieldGroup49.class, factory.createSchema(Proto2Testing.FieldGroup49.class));
-    protobuf.registerSchemaOverride(
-        Proto2Testing.FieldGroupList51.class,
-        factory.createSchema(Proto2Testing.FieldGroupList51.class));
-    protobuf.registerSchemaOverride(
-        Proto2MessageWithMaps.class, factory.createSchema(Proto2MessageWithMaps.class));
-  }
-
-  private static void registerProto3Schemas() {
-    Protobuf protobuf = Protobuf.getInstance();
-    ManifestSchemaFactory factory = new ManifestSchemaFactory();
-    protobuf.registerSchemaOverride(Proto3Message.class, factory.createSchema(Proto3Message.class));
-    protobuf.registerSchemaOverride(Proto3Empty.class, factory.createSchema(Proto3Empty.class));
-    protobuf.registerSchemaOverride(
-        Proto3MessageWithMaps.class, factory.createSchema(Proto3MessageWithMaps.class));
-  }
-}
diff --git a/libs/protobuf/java/core/src/test/java/com/google/protobuf/TestSchemasLite.java b/libs/protobuf/java/core/src/test/java/com/google/protobuf/TestSchemasLite.java
deleted file mode 100644
index 28a89d7..0000000
--- a/libs/protobuf/java/core/src/test/java/com/google/protobuf/TestSchemasLite.java
+++ /dev/null
@@ -1,103 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import com.google.protobuf.testing.Proto2TestingLite;
-import com.google.protobuf.testing.Proto2TestingLite.Proto2EmptyLite;
-import com.google.protobuf.testing.Proto2TestingLite.Proto2MessageLite;
-import com.google.protobuf.testing.Proto2TestingLite.Proto2MessageLiteWithExtensions;
-import com.google.protobuf.testing.Proto2TestingLite.Proto2MessageLiteWithMaps;
-import com.google.protobuf.testing.Proto3TestingLite.Proto3EmptyLite;
-import com.google.protobuf.testing.Proto3TestingLite.Proto3MessageLite;
-import com.google.protobuf.testing.Proto3TestingLite.Proto3MessageLiteWithMaps;
-
-/** Schemas to support testing. */
-public final class TestSchemasLite {
-
-  public static final Schema<Proto2MessageLite> genericProto2LiteSchema =
-      new ManifestSchemaFactory().createSchema(Proto2MessageLite.class);
-  public static final Schema<Proto3MessageLite> genericProto3LiteSchema =
-      new ManifestSchemaFactory().createSchema(Proto3MessageLite.class);
-
-  public static void registerGenericProto2LiteSchemas() {
-    registerProto2LiteSchemas();
-  }
-
-  public static void registerGenericProto3LiteSchemas() {
-    registerProto3LiteSchemas();
-  }
-
-  private static void registerProto2LiteSchemas() {
-    Protobuf protobuf = Protobuf.getInstance();
-    ManifestSchemaFactory factory = new ManifestSchemaFactory();
-    protobuf.registerSchemaOverride(
-        Proto2MessageLite.class, factory.createSchema(Proto2MessageLite.class));
-    protobuf.registerSchemaOverride(
-        Proto2MessageLite.FieldGroup49.class,
-        factory.createSchema(Proto2MessageLite.FieldGroup49.class));
-    protobuf.registerSchemaOverride(
-        Proto2MessageLite.FieldGroupList51.class,
-        factory.createSchema(Proto2MessageLite.FieldGroupList51.class));
-    protobuf.registerSchemaOverride(
-        Proto2MessageLite.FieldGroup69.class,
-        factory.createSchema(Proto2MessageLite.FieldGroup69.class));
-    protobuf.registerSchemaOverride(
-        Proto2MessageLite.RequiredNestedMessage.class,
-        factory.createSchema(Proto2MessageLite.RequiredNestedMessage.class));
-    protobuf.registerSchemaOverride(
-        Proto2MessageLite.FieldRequiredGroup88.class,
-        factory.createSchema(Proto2MessageLite.FieldRequiredGroup88.class));
-    protobuf.registerSchemaOverride(
-        Proto2EmptyLite.class, factory.createSchema(Proto2EmptyLite.class));
-    protobuf.registerSchemaOverride(
-        Proto2MessageLiteWithExtensions.class,
-        factory.createSchema(Proto2MessageLiteWithExtensions.class));
-    protobuf.registerSchemaOverride(
-        Proto2TestingLite.FieldGroup49.class,
-        factory.createSchema(Proto2TestingLite.FieldGroup49.class));
-    protobuf.registerSchemaOverride(
-        Proto2TestingLite.FieldGroupList51.class,
-        factory.createSchema(Proto2TestingLite.FieldGroupList51.class));
-    protobuf.registerSchemaOverride(
-        Proto2MessageLiteWithMaps.class, factory.createSchema(Proto2MessageLiteWithMaps.class));
-  }
-
-  private static void registerProto3LiteSchemas() {
-    Protobuf protobuf = Protobuf.getInstance();
-    ManifestSchemaFactory factory = new ManifestSchemaFactory();
-    protobuf.registerSchemaOverride(
-        Proto3MessageLite.class, factory.createSchema(Proto3MessageLite.class));
-    protobuf.registerSchemaOverride(
-        Proto3EmptyLite.class, factory.createSchema(Proto3EmptyLite.class));
-    protobuf.registerSchemaOverride(
-        Proto3MessageLiteWithMaps.class, factory.createSchema(Proto3MessageLiteWithMaps.class));
-  }
-}
diff --git a/libs/protobuf/java/core/src/test/java/com/google/protobuf/TestUtil.java b/libs/protobuf/java/core/src/test/java/com/google/protobuf/TestUtil.java
deleted file mode 100644
index 46a4d17..0000000
--- a/libs/protobuf/java/core/src/test/java/com/google/protobuf/TestUtil.java
+++ /dev/null
@@ -1,3927 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.protobuf.UnittestLite.defaultBoolExtensionLite;
-import static com.google.protobuf.UnittestLite.defaultBytesExtensionLite;
-import static com.google.protobuf.UnittestLite.defaultCordExtensionLite;
-import static com.google.protobuf.UnittestLite.defaultDoubleExtensionLite;
-import static com.google.protobuf.UnittestLite.defaultFixed32ExtensionLite;
-import static com.google.protobuf.UnittestLite.defaultFixed64ExtensionLite;
-import static com.google.protobuf.UnittestLite.defaultFloatExtensionLite;
-import static com.google.protobuf.UnittestLite.defaultForeignEnumExtensionLite;
-import static com.google.protobuf.UnittestLite.defaultImportEnumExtensionLite;
-import static com.google.protobuf.UnittestLite.defaultInt32ExtensionLite;
-import static com.google.protobuf.UnittestLite.defaultInt64ExtensionLite;
-import static com.google.protobuf.UnittestLite.defaultNestedEnumExtensionLite;
-import static com.google.protobuf.UnittestLite.defaultSfixed32ExtensionLite;
-import static com.google.protobuf.UnittestLite.defaultSfixed64ExtensionLite;
-import static com.google.protobuf.UnittestLite.defaultSint32ExtensionLite;
-import static com.google.protobuf.UnittestLite.defaultSint64ExtensionLite;
-import static com.google.protobuf.UnittestLite.defaultStringExtensionLite;
-import static com.google.protobuf.UnittestLite.defaultStringPieceExtensionLite;
-import static com.google.protobuf.UnittestLite.defaultUint32ExtensionLite;
-import static com.google.protobuf.UnittestLite.defaultUint64ExtensionLite;
-import static com.google.protobuf.UnittestLite.oneofBytesExtensionLite;
-import static com.google.protobuf.UnittestLite.oneofNestedMessageExtensionLite;
-import static com.google.protobuf.UnittestLite.oneofStringExtensionLite;
-import static com.google.protobuf.UnittestLite.oneofUint32ExtensionLite;
-import static com.google.protobuf.UnittestLite.optionalBoolExtensionLite;
-import static com.google.protobuf.UnittestLite.optionalBytesExtensionLite;
-import static com.google.protobuf.UnittestLite.optionalCordExtensionLite;
-import static com.google.protobuf.UnittestLite.optionalDoubleExtensionLite;
-import static com.google.protobuf.UnittestLite.optionalFixed32ExtensionLite;
-import static com.google.protobuf.UnittestLite.optionalFixed64ExtensionLite;
-import static com.google.protobuf.UnittestLite.optionalFloatExtensionLite;
-import static com.google.protobuf.UnittestLite.optionalForeignEnumExtensionLite;
-import static com.google.protobuf.UnittestLite.optionalForeignMessageExtensionLite;
-import static com.google.protobuf.UnittestLite.optionalGroupExtensionLite;
-import static com.google.protobuf.UnittestLite.optionalImportEnumExtensionLite;
-import static com.google.protobuf.UnittestLite.optionalImportMessageExtensionLite;
-import static com.google.protobuf.UnittestLite.optionalInt32ExtensionLite;
-import static com.google.protobuf.UnittestLite.optionalInt64ExtensionLite;
-import static com.google.protobuf.UnittestLite.optionalLazyMessageExtensionLite;
-import static com.google.protobuf.UnittestLite.optionalNestedEnumExtensionLite;
-import static com.google.protobuf.UnittestLite.optionalNestedMessageExtensionLite;
-import static com.google.protobuf.UnittestLite.optionalPublicImportMessageExtensionLite;
-import static com.google.protobuf.UnittestLite.optionalSfixed32ExtensionLite;
-import static com.google.protobuf.UnittestLite.optionalSfixed64ExtensionLite;
-import static com.google.protobuf.UnittestLite.optionalSint32ExtensionLite;
-import static com.google.protobuf.UnittestLite.optionalSint64ExtensionLite;
-import static com.google.protobuf.UnittestLite.optionalStringExtensionLite;
-import static com.google.protobuf.UnittestLite.optionalStringPieceExtensionLite;
-import static com.google.protobuf.UnittestLite.optionalUint32ExtensionLite;
-import static com.google.protobuf.UnittestLite.optionalUint64ExtensionLite;
-import static com.google.protobuf.UnittestLite.optionalUnverifiedLazyMessageExtensionLite;
-import static com.google.protobuf.UnittestLite.packedBoolExtensionLite;
-import static com.google.protobuf.UnittestLite.packedDoubleExtensionLite;
-import static com.google.protobuf.UnittestLite.packedEnumExtensionLite;
-import static com.google.protobuf.UnittestLite.packedFixed32ExtensionLite;
-import static com.google.protobuf.UnittestLite.packedFixed64ExtensionLite;
-import static com.google.protobuf.UnittestLite.packedFloatExtensionLite;
-import static com.google.protobuf.UnittestLite.packedInt32ExtensionLite;
-import static com.google.protobuf.UnittestLite.packedInt64ExtensionLite;
-import static com.google.protobuf.UnittestLite.packedSfixed32ExtensionLite;
-import static com.google.protobuf.UnittestLite.packedSfixed64ExtensionLite;
-import static com.google.protobuf.UnittestLite.packedSint32ExtensionLite;
-import static com.google.protobuf.UnittestLite.packedSint64ExtensionLite;
-import static com.google.protobuf.UnittestLite.packedUint32ExtensionLite;
-import static com.google.protobuf.UnittestLite.packedUint64ExtensionLite;
-import static com.google.protobuf.UnittestLite.repeatedBoolExtensionLite;
-import static com.google.protobuf.UnittestLite.repeatedBytesExtensionLite;
-import static com.google.protobuf.UnittestLite.repeatedCordExtensionLite;
-import static com.google.protobuf.UnittestLite.repeatedDoubleExtensionLite;
-import static com.google.protobuf.UnittestLite.repeatedFixed32ExtensionLite;
-import static com.google.protobuf.UnittestLite.repeatedFixed64ExtensionLite;
-import static com.google.protobuf.UnittestLite.repeatedFloatExtensionLite;
-import static com.google.protobuf.UnittestLite.repeatedForeignEnumExtensionLite;
-import static com.google.protobuf.UnittestLite.repeatedForeignMessageExtensionLite;
-import static com.google.protobuf.UnittestLite.repeatedGroupExtensionLite;
-import static com.google.protobuf.UnittestLite.repeatedImportEnumExtensionLite;
-import static com.google.protobuf.UnittestLite.repeatedImportMessageExtensionLite;
-import static com.google.protobuf.UnittestLite.repeatedInt32ExtensionLite;
-import static com.google.protobuf.UnittestLite.repeatedInt64ExtensionLite;
-import static com.google.protobuf.UnittestLite.repeatedLazyMessageExtensionLite;
-import static com.google.protobuf.UnittestLite.repeatedNestedEnumExtensionLite;
-import static com.google.protobuf.UnittestLite.repeatedNestedMessageExtensionLite;
-import static com.google.protobuf.UnittestLite.repeatedSfixed32ExtensionLite;
-import static com.google.protobuf.UnittestLite.repeatedSfixed64ExtensionLite;
-import static com.google.protobuf.UnittestLite.repeatedSint32ExtensionLite;
-import static com.google.protobuf.UnittestLite.repeatedSint64ExtensionLite;
-import static com.google.protobuf.UnittestLite.repeatedStringExtensionLite;
-import static com.google.protobuf.UnittestLite.repeatedStringPieceExtensionLite;
-import static com.google.protobuf.UnittestLite.repeatedUint32ExtensionLite;
-import static com.google.protobuf.UnittestLite.repeatedUint64ExtensionLite;
-import static protobuf_unittest.UnittestProto.defaultBoolExtension;
-import static protobuf_unittest.UnittestProto.defaultBytesExtension;
-import static protobuf_unittest.UnittestProto.defaultCordExtension;
-import static protobuf_unittest.UnittestProto.defaultDoubleExtension;
-import static protobuf_unittest.UnittestProto.defaultFixed32Extension;
-import static protobuf_unittest.UnittestProto.defaultFixed64Extension;
-import static protobuf_unittest.UnittestProto.defaultFloatExtension;
-import static protobuf_unittest.UnittestProto.defaultForeignEnumExtension;
-import static protobuf_unittest.UnittestProto.defaultImportEnumExtension;
-import static protobuf_unittest.UnittestProto.defaultInt32Extension;
-import static protobuf_unittest.UnittestProto.defaultInt64Extension;
-import static protobuf_unittest.UnittestProto.defaultNestedEnumExtension;
-import static protobuf_unittest.UnittestProto.defaultSfixed32Extension;
-import static protobuf_unittest.UnittestProto.defaultSfixed64Extension;
-import static protobuf_unittest.UnittestProto.defaultSint32Extension;
-import static protobuf_unittest.UnittestProto.defaultSint64Extension;
-import static protobuf_unittest.UnittestProto.defaultStringExtension;
-import static protobuf_unittest.UnittestProto.defaultStringPieceExtension;
-import static protobuf_unittest.UnittestProto.defaultUint32Extension;
-import static protobuf_unittest.UnittestProto.defaultUint64Extension;
-import static protobuf_unittest.UnittestProto.oneofBytesExtension;
-import static protobuf_unittest.UnittestProto.oneofNestedMessageExtension;
-import static protobuf_unittest.UnittestProto.oneofStringExtension;
-import static protobuf_unittest.UnittestProto.oneofUint32Extension;
-import static protobuf_unittest.UnittestProto.optionalBoolExtension;
-import static protobuf_unittest.UnittestProto.optionalBytesExtension;
-import static protobuf_unittest.UnittestProto.optionalCordExtension;
-import static protobuf_unittest.UnittestProto.optionalDoubleExtension;
-import static protobuf_unittest.UnittestProto.optionalFixed32Extension;
-import static protobuf_unittest.UnittestProto.optionalFixed64Extension;
-import static protobuf_unittest.UnittestProto.optionalFloatExtension;
-import static protobuf_unittest.UnittestProto.optionalForeignEnumExtension;
-import static protobuf_unittest.UnittestProto.optionalForeignMessageExtension;
-import static protobuf_unittest.UnittestProto.optionalGroupExtension;
-import static protobuf_unittest.UnittestProto.optionalImportEnumExtension;
-import static protobuf_unittest.UnittestProto.optionalImportMessageExtension;
-import static protobuf_unittest.UnittestProto.optionalInt32Extension;
-import static protobuf_unittest.UnittestProto.optionalInt64Extension;
-import static protobuf_unittest.UnittestProto.optionalLazyMessageExtension;
-import static protobuf_unittest.UnittestProto.optionalNestedEnumExtension;
-import static protobuf_unittest.UnittestProto.optionalNestedMessageExtension;
-import static protobuf_unittest.UnittestProto.optionalPublicImportMessageExtension;
-import static protobuf_unittest.UnittestProto.optionalSfixed32Extension;
-import static protobuf_unittest.UnittestProto.optionalSfixed64Extension;
-import static protobuf_unittest.UnittestProto.optionalSint32Extension;
-import static protobuf_unittest.UnittestProto.optionalSint64Extension;
-import static protobuf_unittest.UnittestProto.optionalStringExtension;
-import static protobuf_unittest.UnittestProto.optionalStringPieceExtension;
-import static protobuf_unittest.UnittestProto.optionalUint32Extension;
-import static protobuf_unittest.UnittestProto.optionalUint64Extension;
-import static protobuf_unittest.UnittestProto.optionalUnverifiedLazyMessageExtension;
-import static protobuf_unittest.UnittestProto.packedBoolExtension;
-import static protobuf_unittest.UnittestProto.packedDoubleExtension;
-import static protobuf_unittest.UnittestProto.packedEnumExtension;
-import static protobuf_unittest.UnittestProto.packedFixed32Extension;
-import static protobuf_unittest.UnittestProto.packedFixed64Extension;
-import static protobuf_unittest.UnittestProto.packedFloatExtension;
-import static protobuf_unittest.UnittestProto.packedInt32Extension;
-import static protobuf_unittest.UnittestProto.packedInt64Extension;
-import static protobuf_unittest.UnittestProto.packedSfixed32Extension;
-import static protobuf_unittest.UnittestProto.packedSfixed64Extension;
-import static protobuf_unittest.UnittestProto.packedSint32Extension;
-import static protobuf_unittest.UnittestProto.packedSint64Extension;
-import static protobuf_unittest.UnittestProto.packedUint32Extension;
-import static protobuf_unittest.UnittestProto.packedUint64Extension;
-import static protobuf_unittest.UnittestProto.repeatedBoolExtension;
-import static protobuf_unittest.UnittestProto.repeatedBytesExtension;
-import static protobuf_unittest.UnittestProto.repeatedCordExtension;
-import static protobuf_unittest.UnittestProto.repeatedDoubleExtension;
-import static protobuf_unittest.UnittestProto.repeatedFixed32Extension;
-import static protobuf_unittest.UnittestProto.repeatedFixed64Extension;
-import static protobuf_unittest.UnittestProto.repeatedFloatExtension;
-import static protobuf_unittest.UnittestProto.repeatedForeignEnumExtension;
-import static protobuf_unittest.UnittestProto.repeatedForeignMessageExtension;
-import static protobuf_unittest.UnittestProto.repeatedGroupExtension;
-import static protobuf_unittest.UnittestProto.repeatedImportEnumExtension;
-import static protobuf_unittest.UnittestProto.repeatedImportMessageExtension;
-import static protobuf_unittest.UnittestProto.repeatedInt32Extension;
-import static protobuf_unittest.UnittestProto.repeatedInt64Extension;
-import static protobuf_unittest.UnittestProto.repeatedLazyMessageExtension;
-import static protobuf_unittest.UnittestProto.repeatedNestedEnumExtension;
-import static protobuf_unittest.UnittestProto.repeatedNestedMessageExtension;
-import static protobuf_unittest.UnittestProto.repeatedSfixed32Extension;
-import static protobuf_unittest.UnittestProto.repeatedSfixed64Extension;
-import static protobuf_unittest.UnittestProto.repeatedSint32Extension;
-import static protobuf_unittest.UnittestProto.repeatedSint64Extension;
-import static protobuf_unittest.UnittestProto.repeatedStringExtension;
-import static protobuf_unittest.UnittestProto.repeatedStringPieceExtension;
-import static protobuf_unittest.UnittestProto.repeatedUint32Extension;
-import static protobuf_unittest.UnittestProto.repeatedUint64Extension;
-
-import com.google.protobuf.UnittestImportLite.ImportEnumLite;
-import com.google.protobuf.UnittestLite.ForeignEnumLite;
-import com.google.protobuf.UnittestLite.TestAllExtensionsLiteOrBuilder;
-import com.google.protobuf.UnittestLite.TestAllTypesLite;
-import com.google.protobuf.UnittestLite.TestPackedExtensionsLite;
-import com.google.protobuf.test.UnittestImport.ImportEnum;
-import com.google.protobuf.test.UnittestImport.ImportMessage;
-import com.google.protobuf.test.UnittestImportPublic.PublicImportMessage;
-import protobuf_unittest.UnittestProto;
-import protobuf_unittest.UnittestProto.ForeignEnum;
-import protobuf_unittest.UnittestProto.ForeignMessage;
-import protobuf_unittest.UnittestProto.OptionalGroup_extension;
-import protobuf_unittest.UnittestProto.RepeatedGroup_extension;
-import protobuf_unittest.UnittestProto.TestAllExtensions;
-import protobuf_unittest.UnittestProto.TestAllExtensionsOrBuilder;
-import protobuf_unittest.UnittestProto.TestAllTypes;
-import protobuf_unittest.UnittestProto.TestAllTypesOrBuilder;
-import protobuf_unittest.UnittestProto.TestOneof2;
-import protobuf_unittest.UnittestProto.TestPackedExtensions;
-import protobuf_unittest.UnittestProto.TestPackedTypes;
-import protobuf_unittest.UnittestProto.TestRequired;
-import protobuf_unittest.UnittestProto.TestUnpackedTypes;
-import java.io.File;
-import java.io.IOException;
-import java.io.RandomAccessFile;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.logging.Handler;
-import java.util.logging.LogRecord;
-import org.junit.Assert;
-
-/**
- * Contains methods for setting all fields of {@code TestAllTypes} to some values as well as
- * checking that all the fields are set to those values. These are useful for testing various
- * protocol message features, e.g. set all fields of a message, serialize it, parse it, and check
- * that all fields are set.
- *
- * <p>This code is not to be used outside of {@code com.google.protobuf} and subpackages.
- *
- * @author kenton@google.com Kenton Varda
- */
-public final class TestUtil {
-  private TestUtil() {}
-
-  public static final TestRequired TEST_REQUIRED_UNINITIALIZED =
-      TestRequired.newBuilder().setA(1).buildPartial();
-  public static final TestRequired TEST_REQUIRED_INITIALIZED =
-      TestRequired.newBuilder().setA(1).setB(2).setC(3).build();
-
-  /** Helper to convert a String to ByteString. */
-  public static ByteString toBytes(String str) {
-    return ByteString.copyFromUtf8(str);
-  }
-
-  // BEGIN FULL-RUNTIME
-  /** Dirties the message by resetting the momoized serialized size. */
-  public static void resetMemoizedSize(AbstractMessage message) {
-    message.memoizedSize = -1;
-  }
-  // END FULL-RUNTIME
-
-  /**
-   * Get a {@code TestAllTypes} with all fields set as they would be by {@link
-   * #setAllFields(TestAllTypes.Builder)}.
-   */
-  public static TestAllTypes getAllSet() {
-    TestAllTypes.Builder builder = TestAllTypes.newBuilder();
-    setAllFields(builder);
-    return builder.build();
-  }
-
-  /**
-   * Get a {@code TestAllTypes.Builder} with all fields set as they would be by {@link
-   * #setAllFields(TestAllTypes.Builder)}.
-   */
-  public static TestAllTypes.Builder getAllSetBuilder() {
-    TestAllTypes.Builder builder = TestAllTypes.newBuilder();
-    setAllFields(builder);
-    return builder;
-  }
-
-  /**
-   * Get a {@code TestAllExtensions} with all fields set as they would be by {@link
-   * #setAllExtensions(TestAllExtensions.Builder)}.
-   */
-  public static TestAllExtensions getAllExtensionsSet() {
-    TestAllExtensions.Builder builder = TestAllExtensions.newBuilder();
-    setAllExtensions(builder);
-    return builder.build();
-  }
-
-  public static TestPackedTypes getPackedSet() {
-    TestPackedTypes.Builder builder = TestPackedTypes.newBuilder();
-    setPackedFields(builder);
-    return builder.build();
-  }
-
-  public static TestUnpackedTypes getUnpackedSet() {
-    TestUnpackedTypes.Builder builder = TestUnpackedTypes.newBuilder();
-    setUnpackedFields(builder);
-    return builder.build();
-  }
-
-  public static TestPackedExtensions getPackedExtensionsSet() {
-    TestPackedExtensions.Builder builder = TestPackedExtensions.newBuilder();
-    setPackedExtensions(builder);
-    return builder.build();
-  }
-
-  /** Set every field of {@code message} to the values expected by {@code assertAllFieldsSet()}. */
-  public static void setAllFields(TestAllTypes.Builder message) {
-    message.setOptionalInt32(101);
-    message.setOptionalInt64(102);
-    message.setOptionalUint32(103);
-    message.setOptionalUint64(104);
-    message.setOptionalSint32(105);
-    message.setOptionalSint64(106);
-    message.setOptionalFixed32(107);
-    message.setOptionalFixed64(108);
-    message.setOptionalSfixed32(109);
-    message.setOptionalSfixed64(110);
-    message.setOptionalFloat(111);
-    message.setOptionalDouble(112);
-    message.setOptionalBool(true);
-    message.setOptionalString("115");
-    message.setOptionalBytes(toBytes("116"));
-
-    message.setOptionalGroup(TestAllTypes.OptionalGroup.newBuilder().setA(117).build());
-    message.setOptionalNestedMessage(TestAllTypes.NestedMessage.newBuilder().setBb(118).build());
-    message.setOptionalForeignMessage(ForeignMessage.newBuilder().setC(119).build());
-    message.setOptionalImportMessage(ImportMessage.newBuilder().setD(120).build());
-    message.setOptionalPublicImportMessage(PublicImportMessage.newBuilder().setE(126).build());
-    message.setOptionalLazyMessage(TestAllTypes.NestedMessage.newBuilder().setBb(127).build());
-    message.setOptionalUnverifiedLazyMessage(
-        TestAllTypes.NestedMessage.newBuilder().setBb(128).build());
-
-    message.setOptionalNestedEnum(TestAllTypes.NestedEnum.BAZ);
-    message.setOptionalForeignEnum(ForeignEnum.FOREIGN_BAZ);
-    message.setOptionalImportEnum(ImportEnum.IMPORT_BAZ);
-
-    message.setOptionalStringPiece("124");
-    message.setOptionalCord("125");
-
-    // -----------------------------------------------------------------
-
-    message.addRepeatedInt32(201);
-    message.addRepeatedInt64(202);
-    message.addRepeatedUint32(203);
-    message.addRepeatedUint64(204);
-    message.addRepeatedSint32(205);
-    message.addRepeatedSint64(206);
-    message.addRepeatedFixed32(207);
-    message.addRepeatedFixed64(208);
-    message.addRepeatedSfixed32(209);
-    message.addRepeatedSfixed64(210);
-    message.addRepeatedFloat(211);
-    message.addRepeatedDouble(212);
-    message.addRepeatedBool(true);
-    message.addRepeatedString("215");
-    message.addRepeatedBytes(toBytes("216"));
-
-    message.addRepeatedGroup(TestAllTypes.RepeatedGroup.newBuilder().setA(217).build());
-    message.addRepeatedNestedMessage(TestAllTypes.NestedMessage.newBuilder().setBb(218).build());
-    message.addRepeatedForeignMessage(ForeignMessage.newBuilder().setC(219).build());
-    message.addRepeatedImportMessage(ImportMessage.newBuilder().setD(220).build());
-    message.addRepeatedLazyMessage(TestAllTypes.NestedMessage.newBuilder().setBb(227).build());
-
-    message.addRepeatedNestedEnum(TestAllTypes.NestedEnum.BAR);
-    message.addRepeatedForeignEnum(ForeignEnum.FOREIGN_BAR);
-    message.addRepeatedImportEnum(ImportEnum.IMPORT_BAR);
-
-    message.addRepeatedStringPiece("224");
-    message.addRepeatedCord("225");
-
-    // Add a second one of each field.
-    message.addRepeatedInt32(301);
-    message.addRepeatedInt64(302);
-    message.addRepeatedUint32(303);
-    message.addRepeatedUint64(304);
-    message.addRepeatedSint32(305);
-    message.addRepeatedSint64(306);
-    message.addRepeatedFixed32(307);
-    message.addRepeatedFixed64(308);
-    message.addRepeatedSfixed32(309);
-    message.addRepeatedSfixed64(310);
-    message.addRepeatedFloat(311);
-    message.addRepeatedDouble(312);
-    message.addRepeatedBool(false);
-    message.addRepeatedString("315");
-    message.addRepeatedBytes(toBytes("316"));
-
-    message.addRepeatedGroup(TestAllTypes.RepeatedGroup.newBuilder().setA(317).build());
-    message.addRepeatedNestedMessage(TestAllTypes.NestedMessage.newBuilder().setBb(318).build());
-    message.addRepeatedForeignMessage(ForeignMessage.newBuilder().setC(319).build());
-    message.addRepeatedImportMessage(ImportMessage.newBuilder().setD(320).build());
-    message.addRepeatedLazyMessage(TestAllTypes.NestedMessage.newBuilder().setBb(327).build());
-
-    message.addRepeatedNestedEnum(TestAllTypes.NestedEnum.BAZ);
-    message.addRepeatedForeignEnum(ForeignEnum.FOREIGN_BAZ);
-    message.addRepeatedImportEnum(ImportEnum.IMPORT_BAZ);
-
-    message.addRepeatedStringPiece("324");
-    message.addRepeatedCord("325");
-
-    // -----------------------------------------------------------------
-
-    message.setDefaultInt32(401);
-    message.setDefaultInt64(402);
-    message.setDefaultUint32(403);
-    message.setDefaultUint64(404);
-    message.setDefaultSint32(405);
-    message.setDefaultSint64(406);
-    message.setDefaultFixed32(407);
-    message.setDefaultFixed64(408);
-    message.setDefaultSfixed32(409);
-    message.setDefaultSfixed64(410);
-    message.setDefaultFloat(411);
-    message.setDefaultDouble(412);
-    message.setDefaultBool(false);
-    message.setDefaultString("415");
-    message.setDefaultBytes(toBytes("416"));
-
-    message.setDefaultNestedEnum(TestAllTypes.NestedEnum.FOO);
-    message.setDefaultForeignEnum(ForeignEnum.FOREIGN_FOO);
-    message.setDefaultImportEnum(ImportEnum.IMPORT_FOO);
-
-    message.setDefaultStringPiece("424");
-    message.setDefaultCord("425");
-
-    message.setOneofUint32(601);
-    message.setOneofNestedMessage(TestAllTypes.NestedMessage.newBuilder().setBb(602).build());
-    message.setOneofString("603");
-    message.setOneofBytes(toBytes("604"));
-  }
-
-  // -------------------------------------------------------------------
-
-  /**
-   * Modify the repeated fields of {@code message} to contain the values expected by {@code
-   * assertRepeatedFieldsModified()}.
-   */
-  public static void modifyRepeatedFields(TestAllTypes.Builder message) {
-    message.setRepeatedInt32(1, 501);
-    message.setRepeatedInt64(1, 502);
-    message.setRepeatedUint32(1, 503);
-    message.setRepeatedUint64(1, 504);
-    message.setRepeatedSint32(1, 505);
-    message.setRepeatedSint64(1, 506);
-    message.setRepeatedFixed32(1, 507);
-    message.setRepeatedFixed64(1, 508);
-    message.setRepeatedSfixed32(1, 509);
-    message.setRepeatedSfixed64(1, 510);
-    message.setRepeatedFloat(1, 511);
-    message.setRepeatedDouble(1, 512);
-    message.setRepeatedBool(1, true);
-    message.setRepeatedString(1, "515");
-    message.setRepeatedBytes(1, toBytes("516"));
-
-    message.setRepeatedGroup(1, TestAllTypes.RepeatedGroup.newBuilder().setA(517).build());
-    message.setRepeatedNestedMessage(1, TestAllTypes.NestedMessage.newBuilder().setBb(518).build());
-    message.setRepeatedForeignMessage(1, ForeignMessage.newBuilder().setC(519).build());
-    message.setRepeatedImportMessage(1, ImportMessage.newBuilder().setD(520).build());
-    message.setRepeatedLazyMessage(1, TestAllTypes.NestedMessage.newBuilder().setBb(527).build());
-
-    message.setRepeatedNestedEnum(1, TestAllTypes.NestedEnum.FOO);
-    message.setRepeatedForeignEnum(1, ForeignEnum.FOREIGN_FOO);
-    message.setRepeatedImportEnum(1, ImportEnum.IMPORT_FOO);
-
-    message.setRepeatedStringPiece(1, "524");
-    message.setRepeatedCord(1, "525");
-  }
-
-  // -------------------------------------------------------------------
-
-  /**
-   * Assert (using {@code junit.framework.Assert}} that all fields of {@code message} are set to the
-   * values assigned by {@code setAllFields}.
-   */
-  public static void assertAllFieldsSet(TestAllTypesOrBuilder message) {
-    Assert.assertTrue(message.hasOptionalInt32());
-    Assert.assertTrue(message.hasOptionalInt64());
-    Assert.assertTrue(message.hasOptionalUint32());
-    Assert.assertTrue(message.hasOptionalUint64());
-    Assert.assertTrue(message.hasOptionalSint32());
-    Assert.assertTrue(message.hasOptionalSint64());
-    Assert.assertTrue(message.hasOptionalFixed32());
-    Assert.assertTrue(message.hasOptionalFixed64());
-    Assert.assertTrue(message.hasOptionalSfixed32());
-    Assert.assertTrue(message.hasOptionalSfixed64());
-    Assert.assertTrue(message.hasOptionalFloat());
-    Assert.assertTrue(message.hasOptionalDouble());
-    Assert.assertTrue(message.hasOptionalBool());
-    Assert.assertTrue(message.hasOptionalString());
-    Assert.assertTrue(message.hasOptionalBytes());
-
-    Assert.assertTrue(message.hasOptionalGroup());
-    Assert.assertTrue(message.hasOptionalNestedMessage());
-    Assert.assertTrue(message.hasOptionalForeignMessage());
-    Assert.assertTrue(message.hasOptionalImportMessage());
-
-    Assert.assertTrue(message.getOptionalGroup().hasA());
-    Assert.assertTrue(message.getOptionalNestedMessage().hasBb());
-    Assert.assertTrue(message.getOptionalForeignMessage().hasC());
-    Assert.assertTrue(message.getOptionalImportMessage().hasD());
-
-    Assert.assertTrue(message.hasOptionalNestedEnum());
-    Assert.assertTrue(message.hasOptionalForeignEnum());
-    Assert.assertTrue(message.hasOptionalImportEnum());
-
-    Assert.assertTrue(message.hasOptionalStringPiece());
-    Assert.assertTrue(message.hasOptionalCord());
-
-    Assert.assertEquals(101, message.getOptionalInt32());
-    Assert.assertEquals(102, message.getOptionalInt64());
-    Assert.assertEquals(103, message.getOptionalUint32());
-    Assert.assertEquals(104, message.getOptionalUint64());
-    Assert.assertEquals(105, message.getOptionalSint32());
-    Assert.assertEquals(106, message.getOptionalSint64());
-    Assert.assertEquals(107, message.getOptionalFixed32());
-    Assert.assertEquals(108, message.getOptionalFixed64());
-    Assert.assertEquals(109, message.getOptionalSfixed32());
-    Assert.assertEquals(110, message.getOptionalSfixed64());
-    Assert.assertEquals(111, message.getOptionalFloat(), 0.0);
-    Assert.assertEquals(112, message.getOptionalDouble(), 0.0);
-    Assert.assertEquals(true, message.getOptionalBool());
-    Assert.assertEquals("115", message.getOptionalString());
-    Assert.assertEquals(toBytes("116"), message.getOptionalBytes());
-
-    Assert.assertEquals(117, message.getOptionalGroup().getA());
-    Assert.assertEquals(118, message.getOptionalNestedMessage().getBb());
-    Assert.assertEquals(119, message.getOptionalForeignMessage().getC());
-    Assert.assertEquals(120, message.getOptionalImportMessage().getD());
-    Assert.assertEquals(126, message.getOptionalPublicImportMessage().getE());
-    Assert.assertEquals(127, message.getOptionalLazyMessage().getBb());
-
-    Assert.assertEquals(TestAllTypes.NestedEnum.BAZ, message.getOptionalNestedEnum());
-    Assert.assertEquals(ForeignEnum.FOREIGN_BAZ, message.getOptionalForeignEnum());
-    Assert.assertEquals(ImportEnum.IMPORT_BAZ, message.getOptionalImportEnum());
-
-    Assert.assertEquals("124", message.getOptionalStringPiece());
-    Assert.assertEquals("125", message.getOptionalCord());
-
-    // -----------------------------------------------------------------
-
-    Assert.assertEquals(2, message.getRepeatedInt32Count());
-    Assert.assertEquals(2, message.getRepeatedInt64Count());
-    Assert.assertEquals(2, message.getRepeatedUint32Count());
-    Assert.assertEquals(2, message.getRepeatedUint64Count());
-    Assert.assertEquals(2, message.getRepeatedSint32Count());
-    Assert.assertEquals(2, message.getRepeatedSint64Count());
-    Assert.assertEquals(2, message.getRepeatedFixed32Count());
-    Assert.assertEquals(2, message.getRepeatedFixed64Count());
-    Assert.assertEquals(2, message.getRepeatedSfixed32Count());
-    Assert.assertEquals(2, message.getRepeatedSfixed64Count());
-    Assert.assertEquals(2, message.getRepeatedFloatCount());
-    Assert.assertEquals(2, message.getRepeatedDoubleCount());
-    Assert.assertEquals(2, message.getRepeatedBoolCount());
-    Assert.assertEquals(2, message.getRepeatedStringCount());
-    Assert.assertEquals(2, message.getRepeatedBytesCount());
-
-    Assert.assertEquals(2, message.getRepeatedGroupCount());
-    Assert.assertEquals(2, message.getRepeatedNestedMessageCount());
-    Assert.assertEquals(2, message.getRepeatedForeignMessageCount());
-    Assert.assertEquals(2, message.getRepeatedImportMessageCount());
-    Assert.assertEquals(2, message.getRepeatedLazyMessageCount());
-    Assert.assertEquals(2, message.getRepeatedNestedEnumCount());
-    Assert.assertEquals(2, message.getRepeatedForeignEnumCount());
-    Assert.assertEquals(2, message.getRepeatedImportEnumCount());
-
-    Assert.assertEquals(2, message.getRepeatedStringPieceCount());
-    Assert.assertEquals(2, message.getRepeatedCordCount());
-
-    Assert.assertEquals(201, message.getRepeatedInt32(0));
-    Assert.assertEquals(202, message.getRepeatedInt64(0));
-    Assert.assertEquals(203, message.getRepeatedUint32(0));
-    Assert.assertEquals(204, message.getRepeatedUint64(0));
-    Assert.assertEquals(205, message.getRepeatedSint32(0));
-    Assert.assertEquals(206, message.getRepeatedSint64(0));
-    Assert.assertEquals(207, message.getRepeatedFixed32(0));
-    Assert.assertEquals(208, message.getRepeatedFixed64(0));
-    Assert.assertEquals(209, message.getRepeatedSfixed32(0));
-    Assert.assertEquals(210, message.getRepeatedSfixed64(0));
-    Assert.assertEquals(211, message.getRepeatedFloat(0), 0.0);
-    Assert.assertEquals(212, message.getRepeatedDouble(0), 0.0);
-    Assert.assertEquals(true, message.getRepeatedBool(0));
-    Assert.assertEquals("215", message.getRepeatedString(0));
-    Assert.assertEquals(toBytes("216"), message.getRepeatedBytes(0));
-
-    Assert.assertEquals(217, message.getRepeatedGroup(0).getA());
-    Assert.assertEquals(218, message.getRepeatedNestedMessage(0).getBb());
-    Assert.assertEquals(219, message.getRepeatedForeignMessage(0).getC());
-    Assert.assertEquals(220, message.getRepeatedImportMessage(0).getD());
-    Assert.assertEquals(227, message.getRepeatedLazyMessage(0).getBb());
-
-    Assert.assertEquals(TestAllTypes.NestedEnum.BAR, message.getRepeatedNestedEnum(0));
-    Assert.assertEquals(ForeignEnum.FOREIGN_BAR, message.getRepeatedForeignEnum(0));
-    Assert.assertEquals(ImportEnum.IMPORT_BAR, message.getRepeatedImportEnum(0));
-
-    Assert.assertEquals("224", message.getRepeatedStringPiece(0));
-    Assert.assertEquals("225", message.getRepeatedCord(0));
-
-    Assert.assertEquals(301, message.getRepeatedInt32(1));
-    Assert.assertEquals(302, message.getRepeatedInt64(1));
-    Assert.assertEquals(303, message.getRepeatedUint32(1));
-    Assert.assertEquals(304, message.getRepeatedUint64(1));
-    Assert.assertEquals(305, message.getRepeatedSint32(1));
-    Assert.assertEquals(306, message.getRepeatedSint64(1));
-    Assert.assertEquals(307, message.getRepeatedFixed32(1));
-    Assert.assertEquals(308, message.getRepeatedFixed64(1));
-    Assert.assertEquals(309, message.getRepeatedSfixed32(1));
-    Assert.assertEquals(310, message.getRepeatedSfixed64(1));
-    Assert.assertEquals(311, message.getRepeatedFloat(1), 0.0);
-    Assert.assertEquals(312, message.getRepeatedDouble(1), 0.0);
-    Assert.assertEquals(false, message.getRepeatedBool(1));
-    Assert.assertEquals("315", message.getRepeatedString(1));
-    Assert.assertEquals(toBytes("316"), message.getRepeatedBytes(1));
-
-    Assert.assertEquals(317, message.getRepeatedGroup(1).getA());
-    Assert.assertEquals(318, message.getRepeatedNestedMessage(1).getBb());
-    Assert.assertEquals(319, message.getRepeatedForeignMessage(1).getC());
-    Assert.assertEquals(320, message.getRepeatedImportMessage(1).getD());
-    Assert.assertEquals(327, message.getRepeatedLazyMessage(1).getBb());
-
-    Assert.assertEquals(TestAllTypes.NestedEnum.BAZ, message.getRepeatedNestedEnum(1));
-    Assert.assertEquals(ForeignEnum.FOREIGN_BAZ, message.getRepeatedForeignEnum(1));
-    Assert.assertEquals(ImportEnum.IMPORT_BAZ, message.getRepeatedImportEnum(1));
-
-    Assert.assertEquals("324", message.getRepeatedStringPiece(1));
-    Assert.assertEquals("325", message.getRepeatedCord(1));
-
-    // -----------------------------------------------------------------
-
-    Assert.assertTrue(message.hasDefaultInt32());
-    Assert.assertTrue(message.hasDefaultInt64());
-    Assert.assertTrue(message.hasDefaultUint32());
-    Assert.assertTrue(message.hasDefaultUint64());
-    Assert.assertTrue(message.hasDefaultSint32());
-    Assert.assertTrue(message.hasDefaultSint64());
-    Assert.assertTrue(message.hasDefaultFixed32());
-    Assert.assertTrue(message.hasDefaultFixed64());
-    Assert.assertTrue(message.hasDefaultSfixed32());
-    Assert.assertTrue(message.hasDefaultSfixed64());
-    Assert.assertTrue(message.hasDefaultFloat());
-    Assert.assertTrue(message.hasDefaultDouble());
-    Assert.assertTrue(message.hasDefaultBool());
-    Assert.assertTrue(message.hasDefaultString());
-    Assert.assertTrue(message.hasDefaultBytes());
-
-    Assert.assertTrue(message.hasDefaultNestedEnum());
-    Assert.assertTrue(message.hasDefaultForeignEnum());
-    Assert.assertTrue(message.hasDefaultImportEnum());
-
-    Assert.assertTrue(message.hasDefaultStringPiece());
-    Assert.assertTrue(message.hasDefaultCord());
-
-    Assert.assertEquals(401, message.getDefaultInt32());
-    Assert.assertEquals(402, message.getDefaultInt64());
-    Assert.assertEquals(403, message.getDefaultUint32());
-    Assert.assertEquals(404, message.getDefaultUint64());
-    Assert.assertEquals(405, message.getDefaultSint32());
-    Assert.assertEquals(406, message.getDefaultSint64());
-    Assert.assertEquals(407, message.getDefaultFixed32());
-    Assert.assertEquals(408, message.getDefaultFixed64());
-    Assert.assertEquals(409, message.getDefaultSfixed32());
-    Assert.assertEquals(410, message.getDefaultSfixed64());
-    Assert.assertEquals(411, message.getDefaultFloat(), 0.0);
-    Assert.assertEquals(412, message.getDefaultDouble(), 0.0);
-    Assert.assertEquals(false, message.getDefaultBool());
-    Assert.assertEquals("415", message.getDefaultString());
-    Assert.assertEquals(toBytes("416"), message.getDefaultBytes());
-
-    Assert.assertEquals(TestAllTypes.NestedEnum.FOO, message.getDefaultNestedEnum());
-    Assert.assertEquals(ForeignEnum.FOREIGN_FOO, message.getDefaultForeignEnum());
-    Assert.assertEquals(ImportEnum.IMPORT_FOO, message.getDefaultImportEnum());
-
-    Assert.assertEquals("424", message.getDefaultStringPiece());
-    Assert.assertEquals("425", message.getDefaultCord());
-
-    Assert.assertEquals(TestAllTypes.OneofFieldCase.ONEOF_BYTES, message.getOneofFieldCase());
-    Assert.assertFalse(message.hasOneofUint32());
-    Assert.assertFalse(message.hasOneofNestedMessage());
-    Assert.assertFalse(message.hasOneofString());
-    Assert.assertTrue(message.hasOneofBytes());
-
-    Assert.assertEquals(toBytes("604"), message.getOneofBytes());
-  }
-
-  // -------------------------------------------------------------------
-  /**
-   * Assert (using {@code junit.framework.Assert}} that all fields of {@code message} are cleared,
-   * and that getting the fields returns their default values.
-   */
-  public static void assertClear(TestAllTypesOrBuilder message) {
-    // hasBlah() should initially be false for all optional fields.
-    Assert.assertFalse(message.hasOptionalInt32());
-    Assert.assertFalse(message.hasOptionalInt64());
-    Assert.assertFalse(message.hasOptionalUint32());
-    Assert.assertFalse(message.hasOptionalUint64());
-    Assert.assertFalse(message.hasOptionalSint32());
-    Assert.assertFalse(message.hasOptionalSint64());
-    Assert.assertFalse(message.hasOptionalFixed32());
-    Assert.assertFalse(message.hasOptionalFixed64());
-    Assert.assertFalse(message.hasOptionalSfixed32());
-    Assert.assertFalse(message.hasOptionalSfixed64());
-    Assert.assertFalse(message.hasOptionalFloat());
-    Assert.assertFalse(message.hasOptionalDouble());
-    Assert.assertFalse(message.hasOptionalBool());
-    Assert.assertFalse(message.hasOptionalString());
-    Assert.assertFalse(message.hasOptionalBytes());
-
-    Assert.assertFalse(message.hasOptionalGroup());
-    Assert.assertFalse(message.hasOptionalNestedMessage());
-    Assert.assertFalse(message.hasOptionalForeignMessage());
-    Assert.assertFalse(message.hasOptionalImportMessage());
-
-    Assert.assertFalse(message.hasOptionalNestedEnum());
-    Assert.assertFalse(message.hasOptionalForeignEnum());
-    Assert.assertFalse(message.hasOptionalImportEnum());
-
-    Assert.assertFalse(message.hasOptionalStringPiece());
-    Assert.assertFalse(message.hasOptionalCord());
-
-    // Optional fields without defaults are set to zero or something like it.
-    Assert.assertEquals(0, message.getOptionalInt32());
-    Assert.assertEquals(0, message.getOptionalInt64());
-    Assert.assertEquals(0, message.getOptionalUint32());
-    Assert.assertEquals(0, message.getOptionalUint64());
-    Assert.assertEquals(0, message.getOptionalSint32());
-    Assert.assertEquals(0, message.getOptionalSint64());
-    Assert.assertEquals(0, message.getOptionalFixed32());
-    Assert.assertEquals(0, message.getOptionalFixed64());
-    Assert.assertEquals(0, message.getOptionalSfixed32());
-    Assert.assertEquals(0, message.getOptionalSfixed64());
-    Assert.assertEquals(0, message.getOptionalFloat(), 0.0);
-    Assert.assertEquals(0, message.getOptionalDouble(), 0.0);
-    Assert.assertEquals(false, message.getOptionalBool());
-    Assert.assertEquals("", message.getOptionalString());
-    Assert.assertEquals(ByteString.EMPTY, message.getOptionalBytes());
-
-    // Embedded messages should also be clear.
-    Assert.assertFalse(message.getOptionalGroup().hasA());
-    Assert.assertFalse(message.getOptionalNestedMessage().hasBb());
-    Assert.assertFalse(message.getOptionalForeignMessage().hasC());
-    Assert.assertFalse(message.getOptionalImportMessage().hasD());
-    Assert.assertFalse(message.getOptionalPublicImportMessage().hasE());
-    Assert.assertFalse(message.getOptionalLazyMessage().hasBb());
-
-    Assert.assertEquals(0, message.getOptionalGroup().getA());
-    Assert.assertEquals(0, message.getOptionalNestedMessage().getBb());
-    Assert.assertEquals(0, message.getOptionalForeignMessage().getC());
-    Assert.assertEquals(0, message.getOptionalImportMessage().getD());
-    Assert.assertEquals(0, message.getOptionalPublicImportMessage().getE());
-    Assert.assertEquals(0, message.getOptionalLazyMessage().getBb());
-
-    // Enums without defaults are set to the first value in the enum.
-    Assert.assertEquals(TestAllTypes.NestedEnum.FOO, message.getOptionalNestedEnum());
-    Assert.assertEquals(ForeignEnum.FOREIGN_FOO, message.getOptionalForeignEnum());
-    Assert.assertEquals(ImportEnum.IMPORT_FOO, message.getOptionalImportEnum());
-
-    Assert.assertEquals("", message.getOptionalStringPiece());
-    Assert.assertEquals("", message.getOptionalCord());
-
-    // Repeated fields are empty.
-    Assert.assertEquals(0, message.getRepeatedInt32Count());
-    Assert.assertEquals(0, message.getRepeatedInt64Count());
-    Assert.assertEquals(0, message.getRepeatedUint32Count());
-    Assert.assertEquals(0, message.getRepeatedUint64Count());
-    Assert.assertEquals(0, message.getRepeatedSint32Count());
-    Assert.assertEquals(0, message.getRepeatedSint64Count());
-    Assert.assertEquals(0, message.getRepeatedFixed32Count());
-    Assert.assertEquals(0, message.getRepeatedFixed64Count());
-    Assert.assertEquals(0, message.getRepeatedSfixed32Count());
-    Assert.assertEquals(0, message.getRepeatedSfixed64Count());
-    Assert.assertEquals(0, message.getRepeatedFloatCount());
-    Assert.assertEquals(0, message.getRepeatedDoubleCount());
-    Assert.assertEquals(0, message.getRepeatedBoolCount());
-    Assert.assertEquals(0, message.getRepeatedStringCount());
-    Assert.assertEquals(0, message.getRepeatedBytesCount());
-
-    Assert.assertEquals(0, message.getRepeatedGroupCount());
-    Assert.assertEquals(0, message.getRepeatedNestedMessageCount());
-    Assert.assertEquals(0, message.getRepeatedForeignMessageCount());
-    Assert.assertEquals(0, message.getRepeatedImportMessageCount());
-    Assert.assertEquals(0, message.getRepeatedLazyMessageCount());
-    Assert.assertEquals(0, message.getRepeatedNestedEnumCount());
-    Assert.assertEquals(0, message.getRepeatedForeignEnumCount());
-    Assert.assertEquals(0, message.getRepeatedImportEnumCount());
-
-    Assert.assertEquals(0, message.getRepeatedStringPieceCount());
-    Assert.assertEquals(0, message.getRepeatedCordCount());
-
-    // hasBlah() should also be false for all default fields.
-    Assert.assertFalse(message.hasDefaultInt32());
-    Assert.assertFalse(message.hasDefaultInt64());
-    Assert.assertFalse(message.hasDefaultUint32());
-    Assert.assertFalse(message.hasDefaultUint64());
-    Assert.assertFalse(message.hasDefaultSint32());
-    Assert.assertFalse(message.hasDefaultSint64());
-    Assert.assertFalse(message.hasDefaultFixed32());
-    Assert.assertFalse(message.hasDefaultFixed64());
-    Assert.assertFalse(message.hasDefaultSfixed32());
-    Assert.assertFalse(message.hasDefaultSfixed64());
-    Assert.assertFalse(message.hasDefaultFloat());
-    Assert.assertFalse(message.hasDefaultDouble());
-    Assert.assertFalse(message.hasDefaultBool());
-    Assert.assertFalse(message.hasDefaultString());
-    Assert.assertFalse(message.hasDefaultBytes());
-
-    Assert.assertFalse(message.hasDefaultNestedEnum());
-    Assert.assertFalse(message.hasDefaultForeignEnum());
-    Assert.assertFalse(message.hasDefaultImportEnum());
-
-    Assert.assertFalse(message.hasDefaultStringPiece());
-    Assert.assertFalse(message.hasDefaultCord());
-
-    // Fields with defaults have their default values (duh).
-    Assert.assertEquals(41, message.getDefaultInt32());
-    Assert.assertEquals(42, message.getDefaultInt64());
-    Assert.assertEquals(43, message.getDefaultUint32());
-    Assert.assertEquals(44, message.getDefaultUint64());
-    Assert.assertEquals(-45, message.getDefaultSint32());
-    Assert.assertEquals(46, message.getDefaultSint64());
-    Assert.assertEquals(47, message.getDefaultFixed32());
-    Assert.assertEquals(48, message.getDefaultFixed64());
-    Assert.assertEquals(49, message.getDefaultSfixed32());
-    Assert.assertEquals(-50, message.getDefaultSfixed64());
-    Assert.assertEquals(51.5, message.getDefaultFloat(), 0.0);
-    Assert.assertEquals(52e3, message.getDefaultDouble(), 0.0);
-    Assert.assertEquals(true, message.getDefaultBool());
-    Assert.assertEquals("hello", message.getDefaultString());
-    Assert.assertEquals(toBytes("world"), message.getDefaultBytes());
-
-    Assert.assertEquals(TestAllTypes.NestedEnum.BAR, message.getDefaultNestedEnum());
-    Assert.assertEquals(ForeignEnum.FOREIGN_BAR, message.getDefaultForeignEnum());
-    Assert.assertEquals(ImportEnum.IMPORT_BAR, message.getDefaultImportEnum());
-
-    Assert.assertEquals("abc", message.getDefaultStringPiece());
-    Assert.assertEquals("123", message.getDefaultCord());
-
-    Assert.assertFalse(message.hasOneofUint32());
-    Assert.assertFalse(message.hasOneofNestedMessage());
-    Assert.assertFalse(message.hasOneofString());
-    Assert.assertFalse(message.hasOneofBytes());
-  }
-
-  // -------------------------------------------------------------------
-
-  /**
-   * Assert (using {@code junit.framework.Assert}} that all fields of {@code message} are set to the
-   * values assigned by {@code setAllFields} followed by {@code modifyRepeatedFields}.
-   */
-  public static void assertRepeatedFieldsModified(TestAllTypesOrBuilder message) {
-    // ModifyRepeatedFields only sets the second repeated element of each
-    // field.  In addition to verifying this, we also verify that the first
-    // element and size were *not* modified.
-    Assert.assertEquals(2, message.getRepeatedInt32Count());
-    Assert.assertEquals(2, message.getRepeatedInt64Count());
-    Assert.assertEquals(2, message.getRepeatedUint32Count());
-    Assert.assertEquals(2, message.getRepeatedUint64Count());
-    Assert.assertEquals(2, message.getRepeatedSint32Count());
-    Assert.assertEquals(2, message.getRepeatedSint64Count());
-    Assert.assertEquals(2, message.getRepeatedFixed32Count());
-    Assert.assertEquals(2, message.getRepeatedFixed64Count());
-    Assert.assertEquals(2, message.getRepeatedSfixed32Count());
-    Assert.assertEquals(2, message.getRepeatedSfixed64Count());
-    Assert.assertEquals(2, message.getRepeatedFloatCount());
-    Assert.assertEquals(2, message.getRepeatedDoubleCount());
-    Assert.assertEquals(2, message.getRepeatedBoolCount());
-    Assert.assertEquals(2, message.getRepeatedStringCount());
-    Assert.assertEquals(2, message.getRepeatedBytesCount());
-
-    Assert.assertEquals(2, message.getRepeatedGroupCount());
-    Assert.assertEquals(2, message.getRepeatedNestedMessageCount());
-    Assert.assertEquals(2, message.getRepeatedForeignMessageCount());
-    Assert.assertEquals(2, message.getRepeatedImportMessageCount());
-    Assert.assertEquals(2, message.getRepeatedLazyMessageCount());
-    Assert.assertEquals(2, message.getRepeatedNestedEnumCount());
-    Assert.assertEquals(2, message.getRepeatedForeignEnumCount());
-    Assert.assertEquals(2, message.getRepeatedImportEnumCount());
-
-    Assert.assertEquals(2, message.getRepeatedStringPieceCount());
-    Assert.assertEquals(2, message.getRepeatedCordCount());
-
-    Assert.assertEquals(201, message.getRepeatedInt32(0));
-    Assert.assertEquals(202L, message.getRepeatedInt64(0));
-    Assert.assertEquals(203, message.getRepeatedUint32(0));
-    Assert.assertEquals(204L, message.getRepeatedUint64(0));
-    Assert.assertEquals(205, message.getRepeatedSint32(0));
-    Assert.assertEquals(206L, message.getRepeatedSint64(0));
-    Assert.assertEquals(207, message.getRepeatedFixed32(0));
-    Assert.assertEquals(208L, message.getRepeatedFixed64(0));
-    Assert.assertEquals(209, message.getRepeatedSfixed32(0));
-    Assert.assertEquals(210L, message.getRepeatedSfixed64(0));
-    Assert.assertEquals(211F, message.getRepeatedFloat(0), 0.0);
-    Assert.assertEquals(212D, message.getRepeatedDouble(0), 0.0);
-    Assert.assertEquals(true, message.getRepeatedBool(0));
-    Assert.assertEquals("215", message.getRepeatedString(0));
-    Assert.assertEquals(toBytes("216"), message.getRepeatedBytes(0));
-
-    Assert.assertEquals(217, message.getRepeatedGroup(0).getA());
-    Assert.assertEquals(218, message.getRepeatedNestedMessage(0).getBb());
-    Assert.assertEquals(219, message.getRepeatedForeignMessage(0).getC());
-    Assert.assertEquals(220, message.getRepeatedImportMessage(0).getD());
-    Assert.assertEquals(227, message.getRepeatedLazyMessage(0).getBb());
-
-    Assert.assertEquals(TestAllTypes.NestedEnum.BAR, message.getRepeatedNestedEnum(0));
-    Assert.assertEquals(ForeignEnum.FOREIGN_BAR, message.getRepeatedForeignEnum(0));
-    Assert.assertEquals(ImportEnum.IMPORT_BAR, message.getRepeatedImportEnum(0));
-
-    Assert.assertEquals("224", message.getRepeatedStringPiece(0));
-    Assert.assertEquals("225", message.getRepeatedCord(0));
-
-    // Actually verify the second (modified) elements now.
-    Assert.assertEquals(501, message.getRepeatedInt32(1));
-    Assert.assertEquals(502L, message.getRepeatedInt64(1));
-    Assert.assertEquals(503, message.getRepeatedUint32(1));
-    Assert.assertEquals(504L, message.getRepeatedUint64(1));
-    Assert.assertEquals(505, message.getRepeatedSint32(1));
-    Assert.assertEquals(506L, message.getRepeatedSint64(1));
-    Assert.assertEquals(507, message.getRepeatedFixed32(1));
-    Assert.assertEquals(508L, message.getRepeatedFixed64(1));
-    Assert.assertEquals(509, message.getRepeatedSfixed32(1));
-    Assert.assertEquals(510L, message.getRepeatedSfixed64(1));
-    Assert.assertEquals(511F, message.getRepeatedFloat(1), 0.0);
-    Assert.assertEquals(512D, message.getRepeatedDouble(1), 0.0);
-    Assert.assertEquals(true, message.getRepeatedBool(1));
-    Assert.assertEquals("515", message.getRepeatedString(1));
-    Assert.assertEquals(toBytes("516"), message.getRepeatedBytes(1));
-
-    Assert.assertEquals(517, message.getRepeatedGroup(1).getA());
-    Assert.assertEquals(518, message.getRepeatedNestedMessage(1).getBb());
-    Assert.assertEquals(519, message.getRepeatedForeignMessage(1).getC());
-    Assert.assertEquals(520, message.getRepeatedImportMessage(1).getD());
-    Assert.assertEquals(527, message.getRepeatedLazyMessage(1).getBb());
-
-    Assert.assertEquals(TestAllTypes.NestedEnum.FOO, message.getRepeatedNestedEnum(1));
-    Assert.assertEquals(ForeignEnum.FOREIGN_FOO, message.getRepeatedForeignEnum(1));
-    Assert.assertEquals(ImportEnum.IMPORT_FOO, message.getRepeatedImportEnum(1));
-
-    Assert.assertEquals("524", message.getRepeatedStringPiece(1));
-    Assert.assertEquals("525", message.getRepeatedCord(1));
-  }
-
-  /** Set every field of {@code message} to a unique value. */
-  public static void setPackedFields(TestPackedTypes.Builder message) {
-    message.addPackedInt32(601);
-    message.addPackedInt64(602);
-    message.addPackedUint32(603);
-    message.addPackedUint64(604);
-    message.addPackedSint32(605);
-    message.addPackedSint64(606);
-    message.addPackedFixed32(607);
-    message.addPackedFixed64(608);
-    message.addPackedSfixed32(609);
-    message.addPackedSfixed64(610);
-    message.addPackedFloat(611);
-    message.addPackedDouble(612);
-    message.addPackedBool(true);
-    message.addPackedEnum(ForeignEnum.FOREIGN_BAR);
-    // Add a second one of each field.
-    message.addPackedInt32(701);
-    message.addPackedInt64(702);
-    message.addPackedUint32(703);
-    message.addPackedUint64(704);
-    message.addPackedSint32(705);
-    message.addPackedSint64(706);
-    message.addPackedFixed32(707);
-    message.addPackedFixed64(708);
-    message.addPackedSfixed32(709);
-    message.addPackedSfixed64(710);
-    message.addPackedFloat(711);
-    message.addPackedDouble(712);
-    message.addPackedBool(false);
-    message.addPackedEnum(ForeignEnum.FOREIGN_BAZ);
-  }
-
-  /**
-   * Set every field of {@code message} to a unique value. Must correspond with the values applied
-   * by {@code setPackedFields}.
-   */
-  public static void setUnpackedFields(TestUnpackedTypes.Builder message) {
-    message.addUnpackedInt32(601);
-    message.addUnpackedInt64(602);
-    message.addUnpackedUint32(603);
-    message.addUnpackedUint64(604);
-    message.addUnpackedSint32(605);
-    message.addUnpackedSint64(606);
-    message.addUnpackedFixed32(607);
-    message.addUnpackedFixed64(608);
-    message.addUnpackedSfixed32(609);
-    message.addUnpackedSfixed64(610);
-    message.addUnpackedFloat(611);
-    message.addUnpackedDouble(612);
-    message.addUnpackedBool(true);
-    message.addUnpackedEnum(ForeignEnum.FOREIGN_BAR);
-    // Add a second one of each field.
-    message.addUnpackedInt32(701);
-    message.addUnpackedInt64(702);
-    message.addUnpackedUint32(703);
-    message.addUnpackedUint64(704);
-    message.addUnpackedSint32(705);
-    message.addUnpackedSint64(706);
-    message.addUnpackedFixed32(707);
-    message.addUnpackedFixed64(708);
-    message.addUnpackedSfixed32(709);
-    message.addUnpackedSfixed64(710);
-    message.addUnpackedFloat(711);
-    message.addUnpackedDouble(712);
-    message.addUnpackedBool(false);
-    message.addUnpackedEnum(ForeignEnum.FOREIGN_BAZ);
-  }
-
-  /**
-   * Assert (using {@code junit.framework.Assert}} that all fields of {@code message} are set to the
-   * values assigned by {@code setPackedFields}.
-   */
-  public static void assertPackedFieldsSet(TestPackedTypes message) {
-    Assert.assertEquals(2, message.getPackedInt32Count());
-    Assert.assertEquals(2, message.getPackedInt64Count());
-    Assert.assertEquals(2, message.getPackedUint32Count());
-    Assert.assertEquals(2, message.getPackedUint64Count());
-    Assert.assertEquals(2, message.getPackedSint32Count());
-    Assert.assertEquals(2, message.getPackedSint64Count());
-    Assert.assertEquals(2, message.getPackedFixed32Count());
-    Assert.assertEquals(2, message.getPackedFixed64Count());
-    Assert.assertEquals(2, message.getPackedSfixed32Count());
-    Assert.assertEquals(2, message.getPackedSfixed64Count());
-    Assert.assertEquals(2, message.getPackedFloatCount());
-    Assert.assertEquals(2, message.getPackedDoubleCount());
-    Assert.assertEquals(2, message.getPackedBoolCount());
-    Assert.assertEquals(2, message.getPackedEnumCount());
-    Assert.assertEquals(601, message.getPackedInt32(0));
-    Assert.assertEquals(602, message.getPackedInt64(0));
-    Assert.assertEquals(603, message.getPackedUint32(0));
-    Assert.assertEquals(604, message.getPackedUint64(0));
-    Assert.assertEquals(605, message.getPackedSint32(0));
-    Assert.assertEquals(606, message.getPackedSint64(0));
-    Assert.assertEquals(607, message.getPackedFixed32(0));
-    Assert.assertEquals(608, message.getPackedFixed64(0));
-    Assert.assertEquals(609, message.getPackedSfixed32(0));
-    Assert.assertEquals(610, message.getPackedSfixed64(0));
-    Assert.assertEquals(611, message.getPackedFloat(0), 0.0);
-    Assert.assertEquals(612, message.getPackedDouble(0), 0.0);
-    Assert.assertEquals(true, message.getPackedBool(0));
-    Assert.assertEquals(ForeignEnum.FOREIGN_BAR, message.getPackedEnum(0));
-    Assert.assertEquals(701, message.getPackedInt32(1));
-    Assert.assertEquals(702, message.getPackedInt64(1));
-    Assert.assertEquals(703, message.getPackedUint32(1));
-    Assert.assertEquals(704, message.getPackedUint64(1));
-    Assert.assertEquals(705, message.getPackedSint32(1));
-    Assert.assertEquals(706, message.getPackedSint64(1));
-    Assert.assertEquals(707, message.getPackedFixed32(1));
-    Assert.assertEquals(708, message.getPackedFixed64(1));
-    Assert.assertEquals(709, message.getPackedSfixed32(1));
-    Assert.assertEquals(710, message.getPackedSfixed64(1));
-    Assert.assertEquals(711, message.getPackedFloat(1), 0.0);
-    Assert.assertEquals(712, message.getPackedDouble(1), 0.0);
-    Assert.assertEquals(false, message.getPackedBool(1));
-    Assert.assertEquals(ForeignEnum.FOREIGN_BAZ, message.getPackedEnum(1));
-  }
-
-  /**
-   * Assert (using {@code junit.framework.Assert}} that all fields of {@code message} are set to the
-   * values assigned by {@code setUnpackedFields}.
-   */
-  public static void assertUnpackedFieldsSet(TestUnpackedTypes message) {
-    Assert.assertEquals(2, message.getUnpackedInt32Count());
-    Assert.assertEquals(2, message.getUnpackedInt64Count());
-    Assert.assertEquals(2, message.getUnpackedUint32Count());
-    Assert.assertEquals(2, message.getUnpackedUint64Count());
-    Assert.assertEquals(2, message.getUnpackedSint32Count());
-    Assert.assertEquals(2, message.getUnpackedSint64Count());
-    Assert.assertEquals(2, message.getUnpackedFixed32Count());
-    Assert.assertEquals(2, message.getUnpackedFixed64Count());
-    Assert.assertEquals(2, message.getUnpackedSfixed32Count());
-    Assert.assertEquals(2, message.getUnpackedSfixed64Count());
-    Assert.assertEquals(2, message.getUnpackedFloatCount());
-    Assert.assertEquals(2, message.getUnpackedDoubleCount());
-    Assert.assertEquals(2, message.getUnpackedBoolCount());
-    Assert.assertEquals(2, message.getUnpackedEnumCount());
-    Assert.assertEquals(601, message.getUnpackedInt32(0));
-    Assert.assertEquals(602, message.getUnpackedInt64(0));
-    Assert.assertEquals(603, message.getUnpackedUint32(0));
-    Assert.assertEquals(604, message.getUnpackedUint64(0));
-    Assert.assertEquals(605, message.getUnpackedSint32(0));
-    Assert.assertEquals(606, message.getUnpackedSint64(0));
-    Assert.assertEquals(607, message.getUnpackedFixed32(0));
-    Assert.assertEquals(608, message.getUnpackedFixed64(0));
-    Assert.assertEquals(609, message.getUnpackedSfixed32(0));
-    Assert.assertEquals(610, message.getUnpackedSfixed64(0));
-    Assert.assertEquals(611, message.getUnpackedFloat(0), 0.0);
-    Assert.assertEquals(612, message.getUnpackedDouble(0), 0.0);
-    Assert.assertEquals(true, message.getUnpackedBool(0));
-    Assert.assertEquals(ForeignEnum.FOREIGN_BAR, message.getUnpackedEnum(0));
-    Assert.assertEquals(701, message.getUnpackedInt32(1));
-    Assert.assertEquals(702, message.getUnpackedInt64(1));
-    Assert.assertEquals(703, message.getUnpackedUint32(1));
-    Assert.assertEquals(704, message.getUnpackedUint64(1));
-    Assert.assertEquals(705, message.getUnpackedSint32(1));
-    Assert.assertEquals(706, message.getUnpackedSint64(1));
-    Assert.assertEquals(707, message.getUnpackedFixed32(1));
-    Assert.assertEquals(708, message.getUnpackedFixed64(1));
-    Assert.assertEquals(709, message.getUnpackedSfixed32(1));
-    Assert.assertEquals(710, message.getUnpackedSfixed64(1));
-    Assert.assertEquals(711, message.getUnpackedFloat(1), 0.0);
-    Assert.assertEquals(712, message.getUnpackedDouble(1), 0.0);
-    Assert.assertEquals(false, message.getUnpackedBool(1));
-    Assert.assertEquals(ForeignEnum.FOREIGN_BAZ, message.getUnpackedEnum(1));
-  }
-
-  // ===================================================================
-  // Like above, but for extensions
-
-  // Java gets confused with things like assertEquals(int, Integer):  it can't
-  // decide whether to call assertEquals(int, int) or assertEquals(Object,
-  // Object).  So we define these methods to help it.
-  private static void assertEqualsExactType(int a, int b) {
-    Assert.assertEquals(a, b);
-  }
-
-  private static void assertEqualsExactType(long a, long b) {
-    Assert.assertEquals(a, b);
-  }
-
-  private static void assertEqualsExactType(float a, float b) {
-    Assert.assertEquals(a, b, 0.0);
-  }
-
-  private static void assertEqualsExactType(double a, double b) {
-    Assert.assertEquals(a, b, 0.0);
-  }
-
-  private static void assertEqualsExactType(boolean a, boolean b) {
-    Assert.assertEquals(a, b);
-  }
-
-  private static void assertEqualsExactType(String a, String b) {
-    Assert.assertEquals(a, b);
-  }
-
-  private static void assertEqualsExactType(ByteString a, ByteString b) {
-    Assert.assertEquals(a, b);
-  }
-
-  private static void assertEqualsExactType(TestAllTypes.NestedEnum a, TestAllTypes.NestedEnum b) {
-    Assert.assertEquals(a, b);
-  }
-
-  private static void assertEqualsExactType(ForeignEnum a, ForeignEnum b) {
-    Assert.assertEquals(a, b);
-  }
-
-  private static void assertEqualsExactType(ImportEnum a, ImportEnum b) {
-    Assert.assertEquals(a, b);
-  }
-
-  private static void assertEqualsExactType(
-      TestAllTypesLite.NestedEnum a, TestAllTypesLite.NestedEnum b) {
-    Assert.assertEquals(a, b);
-  }
-
-  private static void assertEqualsExactType(ForeignEnumLite a, ForeignEnumLite b) {
-    Assert.assertEquals(a, b);
-  }
-
-  private static void assertEqualsExactType(ImportEnumLite a, ImportEnumLite b) {
-    Assert.assertEquals(a, b);
-  }
-
-  /**
-   * Get an unmodifiable {@link ExtensionRegistry} containing all the extensions of {@code
-   * TestAllExtensions}.
-   */
-  public static ExtensionRegistryLite getExtensionRegistry() {
-    ExtensionRegistryLite registry = ExtensionRegistryLite.newInstance();
-    registerAllExtensions(registry);
-    return registry.getUnmodifiable();
-  }
-
-  // BEGIN FULL-RUNTIME
-  /**
-   * Get an unmodifiable {@link ExtensionRegistry} containing all the extensions of {@code
-   * TestAllExtensions}.
-   */
-  public static ExtensionRegistry getFullExtensionRegistry() {
-    ExtensionRegistry registry = ExtensionRegistry.newInstance();
-    registerAllExtensions(registry);
-    return registry.getUnmodifiable();
-  }
-  // END FULL-RUNTIME
-
-  /**
-   * Register all of {@code TestAllExtensions}'s extensions with the given {@link
-   * ExtensionRegistry}.
-   */
-  public static void registerAllExtensions(ExtensionRegistryLite registry) {
-    UnittestProto.registerAllExtensions(registry);
-    TestUtilLite.registerAllExtensionsLite(registry);
-  }
-
-  /**
-   * Set every field of {@code message} to the values expected by {@code assertAllExtensionsSet()}.
-   */
-  public static void setAllExtensions(TestAllExtensions.Builder message) {
-    message.setExtension(optionalInt32Extension, 101);
-    message.setExtension(optionalInt64Extension, 102L);
-    message.setExtension(optionalUint32Extension, 103);
-    message.setExtension(optionalUint64Extension, 104L);
-    message.setExtension(optionalSint32Extension, 105);
-    message.setExtension(optionalSint64Extension, 106L);
-    message.setExtension(optionalFixed32Extension, 107);
-    message.setExtension(optionalFixed64Extension, 108L);
-    message.setExtension(optionalSfixed32Extension, 109);
-    message.setExtension(optionalSfixed64Extension, 110L);
-    message.setExtension(optionalFloatExtension, 111F);
-    message.setExtension(optionalDoubleExtension, 112D);
-    message.setExtension(optionalBoolExtension, true);
-    message.setExtension(optionalStringExtension, "115");
-    message.setExtension(optionalBytesExtension, toBytes("116"));
-
-    message.setExtension(
-        optionalGroupExtension, OptionalGroup_extension.newBuilder().setA(117).build());
-    message.setExtension(
-        optionalNestedMessageExtension, TestAllTypes.NestedMessage.newBuilder().setBb(118).build());
-    message.setExtension(
-        optionalForeignMessageExtension, ForeignMessage.newBuilder().setC(119).build());
-    message.setExtension(
-        optionalImportMessageExtension, ImportMessage.newBuilder().setD(120).build());
-    message.setExtension(
-        optionalPublicImportMessageExtension, PublicImportMessage.newBuilder().setE(126).build());
-    message.setExtension(
-        optionalLazyMessageExtension, TestAllTypes.NestedMessage.newBuilder().setBb(127).build());
-    message.setExtension(
-        optionalUnverifiedLazyMessageExtension,
-        TestAllTypes.NestedMessage.newBuilder().setBb(128).build());
-
-    message.setExtension(optionalNestedEnumExtension, TestAllTypes.NestedEnum.BAZ);
-    message.setExtension(optionalForeignEnumExtension, ForeignEnum.FOREIGN_BAZ);
-    message.setExtension(optionalImportEnumExtension, ImportEnum.IMPORT_BAZ);
-
-    message.setExtension(optionalStringPieceExtension, "124");
-    message.setExtension(optionalCordExtension, "125");
-
-    // -----------------------------------------------------------------
-
-    message.addExtension(repeatedInt32Extension, 201);
-    message.addExtension(repeatedInt64Extension, 202L);
-    message.addExtension(repeatedUint32Extension, 203);
-    message.addExtension(repeatedUint64Extension, 204L);
-    message.addExtension(repeatedSint32Extension, 205);
-    message.addExtension(repeatedSint64Extension, 206L);
-    message.addExtension(repeatedFixed32Extension, 207);
-    message.addExtension(repeatedFixed64Extension, 208L);
-    message.addExtension(repeatedSfixed32Extension, 209);
-    message.addExtension(repeatedSfixed64Extension, 210L);
-    message.addExtension(repeatedFloatExtension, 211F);
-    message.addExtension(repeatedDoubleExtension, 212D);
-    message.addExtension(repeatedBoolExtension, true);
-    message.addExtension(repeatedStringExtension, "215");
-    message.addExtension(repeatedBytesExtension, toBytes("216"));
-
-    message.addExtension(
-        repeatedGroupExtension, RepeatedGroup_extension.newBuilder().setA(217).build());
-    message.addExtension(
-        repeatedNestedMessageExtension, TestAllTypes.NestedMessage.newBuilder().setBb(218).build());
-    message.addExtension(
-        repeatedForeignMessageExtension, ForeignMessage.newBuilder().setC(219).build());
-    message.addExtension(
-        repeatedImportMessageExtension, ImportMessage.newBuilder().setD(220).build());
-    message.addExtension(
-        repeatedLazyMessageExtension, TestAllTypes.NestedMessage.newBuilder().setBb(227).build());
-
-    message.addExtension(repeatedNestedEnumExtension, TestAllTypes.NestedEnum.BAR);
-    message.addExtension(repeatedForeignEnumExtension, ForeignEnum.FOREIGN_BAR);
-    message.addExtension(repeatedImportEnumExtension, ImportEnum.IMPORT_BAR);
-
-    message.addExtension(repeatedStringPieceExtension, "224");
-    message.addExtension(repeatedCordExtension, "225");
-
-    // Add a second one of each field.
-    message.addExtension(repeatedInt32Extension, 301);
-    message.addExtension(repeatedInt64Extension, 302L);
-    message.addExtension(repeatedUint32Extension, 303);
-    message.addExtension(repeatedUint64Extension, 304L);
-    message.addExtension(repeatedSint32Extension, 305);
-    message.addExtension(repeatedSint64Extension, 306L);
-    message.addExtension(repeatedFixed32Extension, 307);
-    message.addExtension(repeatedFixed64Extension, 308L);
-    message.addExtension(repeatedSfixed32Extension, 309);
-    message.addExtension(repeatedSfixed64Extension, 310L);
-    message.addExtension(repeatedFloatExtension, 311F);
-    message.addExtension(repeatedDoubleExtension, 312D);
-    message.addExtension(repeatedBoolExtension, false);
-    message.addExtension(repeatedStringExtension, "315");
-    message.addExtension(repeatedBytesExtension, toBytes("316"));
-
-    message.addExtension(
-        repeatedGroupExtension, RepeatedGroup_extension.newBuilder().setA(317).build());
-    message.addExtension(
-        repeatedNestedMessageExtension, TestAllTypes.NestedMessage.newBuilder().setBb(318).build());
-    message.addExtension(
-        repeatedForeignMessageExtension, ForeignMessage.newBuilder().setC(319).build());
-    message.addExtension(
-        repeatedImportMessageExtension, ImportMessage.newBuilder().setD(320).build());
-    message.addExtension(
-        repeatedLazyMessageExtension, TestAllTypes.NestedMessage.newBuilder().setBb(327).build());
-
-    message.addExtension(repeatedNestedEnumExtension, TestAllTypes.NestedEnum.BAZ);
-    message.addExtension(repeatedForeignEnumExtension, ForeignEnum.FOREIGN_BAZ);
-    message.addExtension(repeatedImportEnumExtension, ImportEnum.IMPORT_BAZ);
-
-    message.addExtension(repeatedStringPieceExtension, "324");
-    message.addExtension(repeatedCordExtension, "325");
-
-    // -----------------------------------------------------------------
-
-    message.setExtension(defaultInt32Extension, 401);
-    message.setExtension(defaultInt64Extension, 402L);
-    message.setExtension(defaultUint32Extension, 403);
-    message.setExtension(defaultUint64Extension, 404L);
-    message.setExtension(defaultSint32Extension, 405);
-    message.setExtension(defaultSint64Extension, 406L);
-    message.setExtension(defaultFixed32Extension, 407);
-    message.setExtension(defaultFixed64Extension, 408L);
-    message.setExtension(defaultSfixed32Extension, 409);
-    message.setExtension(defaultSfixed64Extension, 410L);
-    message.setExtension(defaultFloatExtension, 411F);
-    message.setExtension(defaultDoubleExtension, 412D);
-    message.setExtension(defaultBoolExtension, false);
-    message.setExtension(defaultStringExtension, "415");
-    message.setExtension(defaultBytesExtension, toBytes("416"));
-
-    message.setExtension(defaultNestedEnumExtension, TestAllTypes.NestedEnum.FOO);
-    message.setExtension(defaultForeignEnumExtension, ForeignEnum.FOREIGN_FOO);
-    message.setExtension(defaultImportEnumExtension, ImportEnum.IMPORT_FOO);
-
-    message.setExtension(defaultStringPieceExtension, "424");
-    message.setExtension(defaultCordExtension, "425");
-
-    message.setExtension(oneofUint32Extension, 601);
-    message.setExtension(
-        oneofNestedMessageExtension, TestAllTypes.NestedMessage.newBuilder().setBb(602).build());
-    message.setExtension(oneofStringExtension, "603");
-    message.setExtension(oneofBytesExtension, toBytes("604"));
-  }
-
-  // -------------------------------------------------------------------
-
-  /**
-   * Modify the repeated extensions of {@code message} to contain the values expected by {@code
-   * assertRepeatedExtensionsModified()}.
-   */
-  public static void modifyRepeatedExtensions(TestAllExtensions.Builder message) {
-    message.setExtension(repeatedInt32Extension, 1, 501);
-    message.setExtension(repeatedInt64Extension, 1, 502L);
-    message.setExtension(repeatedUint32Extension, 1, 503);
-    message.setExtension(repeatedUint64Extension, 1, 504L);
-    message.setExtension(repeatedSint32Extension, 1, 505);
-    message.setExtension(repeatedSint64Extension, 1, 506L);
-    message.setExtension(repeatedFixed32Extension, 1, 507);
-    message.setExtension(repeatedFixed64Extension, 1, 508L);
-    message.setExtension(repeatedSfixed32Extension, 1, 509);
-    message.setExtension(repeatedSfixed64Extension, 1, 510L);
-    message.setExtension(repeatedFloatExtension, 1, 511F);
-    message.setExtension(repeatedDoubleExtension, 1, 512D);
-    message.setExtension(repeatedBoolExtension, 1, true);
-    message.setExtension(repeatedStringExtension, 1, "515");
-    message.setExtension(repeatedBytesExtension, 1, toBytes("516"));
-
-    message.setExtension(
-        repeatedGroupExtension, 1, RepeatedGroup_extension.newBuilder().setA(517).build());
-    message.setExtension(
-        repeatedNestedMessageExtension,
-        1,
-        TestAllTypes.NestedMessage.newBuilder().setBb(518).build());
-    message.setExtension(
-        repeatedForeignMessageExtension, 1, ForeignMessage.newBuilder().setC(519).build());
-    message.setExtension(
-        repeatedImportMessageExtension, 1, ImportMessage.newBuilder().setD(520).build());
-    message.setExtension(
-        repeatedLazyMessageExtension,
-        1,
-        TestAllTypes.NestedMessage.newBuilder().setBb(527).build());
-
-    message.setExtension(repeatedNestedEnumExtension, 1, TestAllTypes.NestedEnum.FOO);
-    message.setExtension(repeatedForeignEnumExtension, 1, ForeignEnum.FOREIGN_FOO);
-    message.setExtension(repeatedImportEnumExtension, 1, ImportEnum.IMPORT_FOO);
-
-    message.setExtension(repeatedStringPieceExtension, 1, "524");
-    message.setExtension(repeatedCordExtension, 1, "525");
-  }
-
-  // -------------------------------------------------------------------
-
-  /**
-   * Assert (using {@code junit.framework.Assert}} that all extensions of {@code message} are set to
-   * the values assigned by {@code setAllExtensions}.
-   */
-  public static void assertAllExtensionsSet(TestAllExtensionsOrBuilder message) {
-    Assert.assertTrue(message.hasExtension(optionalInt32Extension));
-    Assert.assertTrue(message.hasExtension(optionalInt64Extension));
-    Assert.assertTrue(message.hasExtension(optionalUint32Extension));
-    Assert.assertTrue(message.hasExtension(optionalUint64Extension));
-    Assert.assertTrue(message.hasExtension(optionalSint32Extension));
-    Assert.assertTrue(message.hasExtension(optionalSint64Extension));
-    Assert.assertTrue(message.hasExtension(optionalFixed32Extension));
-    Assert.assertTrue(message.hasExtension(optionalFixed64Extension));
-    Assert.assertTrue(message.hasExtension(optionalSfixed32Extension));
-    Assert.assertTrue(message.hasExtension(optionalSfixed64Extension));
-    Assert.assertTrue(message.hasExtension(optionalFloatExtension));
-    Assert.assertTrue(message.hasExtension(optionalDoubleExtension));
-    Assert.assertTrue(message.hasExtension(optionalBoolExtension));
-    Assert.assertTrue(message.hasExtension(optionalStringExtension));
-    Assert.assertTrue(message.hasExtension(optionalBytesExtension));
-
-    Assert.assertTrue(message.hasExtension(optionalGroupExtension));
-    Assert.assertTrue(message.hasExtension(optionalNestedMessageExtension));
-    Assert.assertTrue(message.hasExtension(optionalForeignMessageExtension));
-    Assert.assertTrue(message.hasExtension(optionalImportMessageExtension));
-
-    Assert.assertTrue(message.getExtension(optionalGroupExtension).hasA());
-    Assert.assertTrue(message.getExtension(optionalNestedMessageExtension).hasBb());
-    Assert.assertTrue(message.getExtension(optionalForeignMessageExtension).hasC());
-    Assert.assertTrue(message.getExtension(optionalImportMessageExtension).hasD());
-
-    Assert.assertTrue(message.hasExtension(optionalNestedEnumExtension));
-    Assert.assertTrue(message.hasExtension(optionalForeignEnumExtension));
-    Assert.assertTrue(message.hasExtension(optionalImportEnumExtension));
-
-    Assert.assertTrue(message.hasExtension(optionalStringPieceExtension));
-    Assert.assertTrue(message.hasExtension(optionalCordExtension));
-
-    assertEqualsExactType(101, message.getExtension(optionalInt32Extension));
-    assertEqualsExactType(102L, message.getExtension(optionalInt64Extension));
-    assertEqualsExactType(103, message.getExtension(optionalUint32Extension));
-    assertEqualsExactType(104L, message.getExtension(optionalUint64Extension));
-    assertEqualsExactType(105, message.getExtension(optionalSint32Extension));
-    assertEqualsExactType(106L, message.getExtension(optionalSint64Extension));
-    assertEqualsExactType(107, message.getExtension(optionalFixed32Extension));
-    assertEqualsExactType(108L, message.getExtension(optionalFixed64Extension));
-    assertEqualsExactType(109, message.getExtension(optionalSfixed32Extension));
-    assertEqualsExactType(110L, message.getExtension(optionalSfixed64Extension));
-    assertEqualsExactType(111F, message.getExtension(optionalFloatExtension));
-    assertEqualsExactType(112D, message.getExtension(optionalDoubleExtension));
-    assertEqualsExactType(true, message.getExtension(optionalBoolExtension));
-    assertEqualsExactType("115", message.getExtension(optionalStringExtension));
-    assertEqualsExactType(toBytes("116"), message.getExtension(optionalBytesExtension));
-
-    assertEqualsExactType(117, message.getExtension(optionalGroupExtension).getA());
-    assertEqualsExactType(118, message.getExtension(optionalNestedMessageExtension).getBb());
-    assertEqualsExactType(119, message.getExtension(optionalForeignMessageExtension).getC());
-    assertEqualsExactType(120, message.getExtension(optionalImportMessageExtension).getD());
-    assertEqualsExactType(126, message.getExtension(optionalPublicImportMessageExtension).getE());
-    assertEqualsExactType(127, message.getExtension(optionalLazyMessageExtension).getBb());
-    assertEqualsExactType(
-        128, message.getExtension(optionalUnverifiedLazyMessageExtension).getBb());
-
-    assertEqualsExactType(
-        TestAllTypes.NestedEnum.BAZ, message.getExtension(optionalNestedEnumExtension));
-    assertEqualsExactType(
-        ForeignEnum.FOREIGN_BAZ, message.getExtension(optionalForeignEnumExtension));
-    assertEqualsExactType(ImportEnum.IMPORT_BAZ, message.getExtension(optionalImportEnumExtension));
-
-    assertEqualsExactType("124", message.getExtension(optionalStringPieceExtension));
-    assertEqualsExactType("125", message.getExtension(optionalCordExtension));
-
-    // -----------------------------------------------------------------
-
-    Assert.assertEquals(2, message.getExtensionCount(repeatedInt32Extension));
-    Assert.assertEquals(2, message.getExtensionCount(repeatedInt64Extension));
-    Assert.assertEquals(2, message.getExtensionCount(repeatedUint32Extension));
-    Assert.assertEquals(2, message.getExtensionCount(repeatedUint64Extension));
-    Assert.assertEquals(2, message.getExtensionCount(repeatedSint32Extension));
-    Assert.assertEquals(2, message.getExtensionCount(repeatedSint64Extension));
-    Assert.assertEquals(2, message.getExtensionCount(repeatedFixed32Extension));
-    Assert.assertEquals(2, message.getExtensionCount(repeatedFixed64Extension));
-    Assert.assertEquals(2, message.getExtensionCount(repeatedSfixed32Extension));
-    Assert.assertEquals(2, message.getExtensionCount(repeatedSfixed64Extension));
-    Assert.assertEquals(2, message.getExtensionCount(repeatedFloatExtension));
-    Assert.assertEquals(2, message.getExtensionCount(repeatedDoubleExtension));
-    Assert.assertEquals(2, message.getExtensionCount(repeatedBoolExtension));
-    Assert.assertEquals(2, message.getExtensionCount(repeatedStringExtension));
-    Assert.assertEquals(2, message.getExtensionCount(repeatedBytesExtension));
-
-    Assert.assertEquals(2, message.getExtensionCount(repeatedGroupExtension));
-    Assert.assertEquals(2, message.getExtensionCount(repeatedNestedMessageExtension));
-    Assert.assertEquals(2, message.getExtensionCount(repeatedForeignMessageExtension));
-    Assert.assertEquals(2, message.getExtensionCount(repeatedImportMessageExtension));
-    Assert.assertEquals(2, message.getExtensionCount(repeatedLazyMessageExtension));
-    Assert.assertEquals(2, message.getExtensionCount(repeatedNestedEnumExtension));
-    Assert.assertEquals(2, message.getExtensionCount(repeatedForeignEnumExtension));
-    Assert.assertEquals(2, message.getExtensionCount(repeatedImportEnumExtension));
-
-    Assert.assertEquals(2, message.getExtensionCount(repeatedStringPieceExtension));
-    Assert.assertEquals(2, message.getExtensionCount(repeatedCordExtension));
-
-    assertEqualsExactType(201, message.getExtension(repeatedInt32Extension, 0));
-    assertEqualsExactType(202L, message.getExtension(repeatedInt64Extension, 0));
-    assertEqualsExactType(203, message.getExtension(repeatedUint32Extension, 0));
-    assertEqualsExactType(204L, message.getExtension(repeatedUint64Extension, 0));
-    assertEqualsExactType(205, message.getExtension(repeatedSint32Extension, 0));
-    assertEqualsExactType(206L, message.getExtension(repeatedSint64Extension, 0));
-    assertEqualsExactType(207, message.getExtension(repeatedFixed32Extension, 0));
-    assertEqualsExactType(208L, message.getExtension(repeatedFixed64Extension, 0));
-    assertEqualsExactType(209, message.getExtension(repeatedSfixed32Extension, 0));
-    assertEqualsExactType(210L, message.getExtension(repeatedSfixed64Extension, 0));
-    assertEqualsExactType(211F, message.getExtension(repeatedFloatExtension, 0));
-    assertEqualsExactType(212D, message.getExtension(repeatedDoubleExtension, 0));
-    assertEqualsExactType(true, message.getExtension(repeatedBoolExtension, 0));
-    assertEqualsExactType("215", message.getExtension(repeatedStringExtension, 0));
-    assertEqualsExactType(toBytes("216"), message.getExtension(repeatedBytesExtension, 0));
-
-    assertEqualsExactType(217, message.getExtension(repeatedGroupExtension, 0).getA());
-    assertEqualsExactType(218, message.getExtension(repeatedNestedMessageExtension, 0).getBb());
-    assertEqualsExactType(219, message.getExtension(repeatedForeignMessageExtension, 0).getC());
-    assertEqualsExactType(220, message.getExtension(repeatedImportMessageExtension, 0).getD());
-    assertEqualsExactType(227, message.getExtension(repeatedLazyMessageExtension, 0).getBb());
-
-    assertEqualsExactType(
-        TestAllTypes.NestedEnum.BAR, message.getExtension(repeatedNestedEnumExtension, 0));
-    assertEqualsExactType(
-        ForeignEnum.FOREIGN_BAR, message.getExtension(repeatedForeignEnumExtension, 0));
-    assertEqualsExactType(
-        ImportEnum.IMPORT_BAR, message.getExtension(repeatedImportEnumExtension, 0));
-
-    assertEqualsExactType("224", message.getExtension(repeatedStringPieceExtension, 0));
-    assertEqualsExactType("225", message.getExtension(repeatedCordExtension, 0));
-
-    assertEqualsExactType(301, message.getExtension(repeatedInt32Extension, 1));
-    assertEqualsExactType(302L, message.getExtension(repeatedInt64Extension, 1));
-    assertEqualsExactType(303, message.getExtension(repeatedUint32Extension, 1));
-    assertEqualsExactType(304L, message.getExtension(repeatedUint64Extension, 1));
-    assertEqualsExactType(305, message.getExtension(repeatedSint32Extension, 1));
-    assertEqualsExactType(306L, message.getExtension(repeatedSint64Extension, 1));
-    assertEqualsExactType(307, message.getExtension(repeatedFixed32Extension, 1));
-    assertEqualsExactType(308L, message.getExtension(repeatedFixed64Extension, 1));
-    assertEqualsExactType(309, message.getExtension(repeatedSfixed32Extension, 1));
-    assertEqualsExactType(310L, message.getExtension(repeatedSfixed64Extension, 1));
-    assertEqualsExactType(311F, message.getExtension(repeatedFloatExtension, 1));
-    assertEqualsExactType(312D, message.getExtension(repeatedDoubleExtension, 1));
-    assertEqualsExactType(false, message.getExtension(repeatedBoolExtension, 1));
-    assertEqualsExactType("315", message.getExtension(repeatedStringExtension, 1));
-    assertEqualsExactType(toBytes("316"), message.getExtension(repeatedBytesExtension, 1));
-
-    assertEqualsExactType(317, message.getExtension(repeatedGroupExtension, 1).getA());
-    assertEqualsExactType(318, message.getExtension(repeatedNestedMessageExtension, 1).getBb());
-    assertEqualsExactType(319, message.getExtension(repeatedForeignMessageExtension, 1).getC());
-    assertEqualsExactType(320, message.getExtension(repeatedImportMessageExtension, 1).getD());
-    assertEqualsExactType(327, message.getExtension(repeatedLazyMessageExtension, 1).getBb());
-
-    assertEqualsExactType(
-        TestAllTypes.NestedEnum.BAZ, message.getExtension(repeatedNestedEnumExtension, 1));
-    assertEqualsExactType(
-        ForeignEnum.FOREIGN_BAZ, message.getExtension(repeatedForeignEnumExtension, 1));
-    assertEqualsExactType(
-        ImportEnum.IMPORT_BAZ, message.getExtension(repeatedImportEnumExtension, 1));
-
-    assertEqualsExactType("324", message.getExtension(repeatedStringPieceExtension, 1));
-    assertEqualsExactType("325", message.getExtension(repeatedCordExtension, 1));
-
-    // -----------------------------------------------------------------
-
-    Assert.assertTrue(message.hasExtension(defaultInt32Extension));
-    Assert.assertTrue(message.hasExtension(defaultInt64Extension));
-    Assert.assertTrue(message.hasExtension(defaultUint32Extension));
-    Assert.assertTrue(message.hasExtension(defaultUint64Extension));
-    Assert.assertTrue(message.hasExtension(defaultSint32Extension));
-    Assert.assertTrue(message.hasExtension(defaultSint64Extension));
-    Assert.assertTrue(message.hasExtension(defaultFixed32Extension));
-    Assert.assertTrue(message.hasExtension(defaultFixed64Extension));
-    Assert.assertTrue(message.hasExtension(defaultSfixed32Extension));
-    Assert.assertTrue(message.hasExtension(defaultSfixed64Extension));
-    Assert.assertTrue(message.hasExtension(defaultFloatExtension));
-    Assert.assertTrue(message.hasExtension(defaultDoubleExtension));
-    Assert.assertTrue(message.hasExtension(defaultBoolExtension));
-    Assert.assertTrue(message.hasExtension(defaultStringExtension));
-    Assert.assertTrue(message.hasExtension(defaultBytesExtension));
-
-    Assert.assertTrue(message.hasExtension(defaultNestedEnumExtension));
-    Assert.assertTrue(message.hasExtension(defaultForeignEnumExtension));
-    Assert.assertTrue(message.hasExtension(defaultImportEnumExtension));
-
-    Assert.assertTrue(message.hasExtension(defaultStringPieceExtension));
-    Assert.assertTrue(message.hasExtension(defaultCordExtension));
-
-    assertEqualsExactType(401, message.getExtension(defaultInt32Extension));
-    assertEqualsExactType(402L, message.getExtension(defaultInt64Extension));
-    assertEqualsExactType(403, message.getExtension(defaultUint32Extension));
-    assertEqualsExactType(404L, message.getExtension(defaultUint64Extension));
-    assertEqualsExactType(405, message.getExtension(defaultSint32Extension));
-    assertEqualsExactType(406L, message.getExtension(defaultSint64Extension));
-    assertEqualsExactType(407, message.getExtension(defaultFixed32Extension));
-    assertEqualsExactType(408L, message.getExtension(defaultFixed64Extension));
-    assertEqualsExactType(409, message.getExtension(defaultSfixed32Extension));
-    assertEqualsExactType(410L, message.getExtension(defaultSfixed64Extension));
-    assertEqualsExactType(411F, message.getExtension(defaultFloatExtension));
-    assertEqualsExactType(412D, message.getExtension(defaultDoubleExtension));
-    assertEqualsExactType(false, message.getExtension(defaultBoolExtension));
-    assertEqualsExactType("415", message.getExtension(defaultStringExtension));
-    assertEqualsExactType(toBytes("416"), message.getExtension(defaultBytesExtension));
-
-    assertEqualsExactType(
-        TestAllTypes.NestedEnum.FOO, message.getExtension(defaultNestedEnumExtension));
-    assertEqualsExactType(
-        ForeignEnum.FOREIGN_FOO, message.getExtension(defaultForeignEnumExtension));
-    assertEqualsExactType(ImportEnum.IMPORT_FOO, message.getExtension(defaultImportEnumExtension));
-
-    assertEqualsExactType("424", message.getExtension(defaultStringPieceExtension));
-    assertEqualsExactType("425", message.getExtension(defaultCordExtension));
-
-    Assert.assertTrue(message.hasExtension(oneofBytesExtension));
-
-    assertEqualsExactType(toBytes("604"), message.getExtension(oneofBytesExtension));
-  }
-
-  // -------------------------------------------------------------------
-
-  /**
-   * Assert (using {@code junit.framework.Assert}} that all extensions of {@code message} are
-   * cleared, and that getting the extensions returns their default values.
-   */
-  public static void assertExtensionsClear(TestAllExtensionsOrBuilder message) {
-    // hasBlah() should initially be false for all optional fields.
-    Assert.assertFalse(message.hasExtension(optionalInt32Extension));
-    Assert.assertFalse(message.hasExtension(optionalInt64Extension));
-    Assert.assertFalse(message.hasExtension(optionalUint32Extension));
-    Assert.assertFalse(message.hasExtension(optionalUint64Extension));
-    Assert.assertFalse(message.hasExtension(optionalSint32Extension));
-    Assert.assertFalse(message.hasExtension(optionalSint64Extension));
-    Assert.assertFalse(message.hasExtension(optionalFixed32Extension));
-    Assert.assertFalse(message.hasExtension(optionalFixed64Extension));
-    Assert.assertFalse(message.hasExtension(optionalSfixed32Extension));
-    Assert.assertFalse(message.hasExtension(optionalSfixed64Extension));
-    Assert.assertFalse(message.hasExtension(optionalFloatExtension));
-    Assert.assertFalse(message.hasExtension(optionalDoubleExtension));
-    Assert.assertFalse(message.hasExtension(optionalBoolExtension));
-    Assert.assertFalse(message.hasExtension(optionalStringExtension));
-    Assert.assertFalse(message.hasExtension(optionalBytesExtension));
-
-    Assert.assertFalse(message.hasExtension(optionalGroupExtension));
-    Assert.assertFalse(message.hasExtension(optionalNestedMessageExtension));
-    Assert.assertFalse(message.hasExtension(optionalForeignMessageExtension));
-    Assert.assertFalse(message.hasExtension(optionalImportMessageExtension));
-
-    Assert.assertFalse(message.hasExtension(optionalNestedEnumExtension));
-    Assert.assertFalse(message.hasExtension(optionalForeignEnumExtension));
-    Assert.assertFalse(message.hasExtension(optionalImportEnumExtension));
-
-    Assert.assertFalse(message.hasExtension(optionalStringPieceExtension));
-    Assert.assertFalse(message.hasExtension(optionalCordExtension));
-
-    // Optional fields without defaults are set to zero or something like it.
-    assertEqualsExactType(0, message.getExtension(optionalInt32Extension));
-    assertEqualsExactType(0L, message.getExtension(optionalInt64Extension));
-    assertEqualsExactType(0, message.getExtension(optionalUint32Extension));
-    assertEqualsExactType(0L, message.getExtension(optionalUint64Extension));
-    assertEqualsExactType(0, message.getExtension(optionalSint32Extension));
-    assertEqualsExactType(0L, message.getExtension(optionalSint64Extension));
-    assertEqualsExactType(0, message.getExtension(optionalFixed32Extension));
-    assertEqualsExactType(0L, message.getExtension(optionalFixed64Extension));
-    assertEqualsExactType(0, message.getExtension(optionalSfixed32Extension));
-    assertEqualsExactType(0L, message.getExtension(optionalSfixed64Extension));
-    assertEqualsExactType(0F, message.getExtension(optionalFloatExtension));
-    assertEqualsExactType(0D, message.getExtension(optionalDoubleExtension));
-    assertEqualsExactType(false, message.getExtension(optionalBoolExtension));
-    assertEqualsExactType("", message.getExtension(optionalStringExtension));
-    assertEqualsExactType(ByteString.EMPTY, message.getExtension(optionalBytesExtension));
-
-    // Embedded messages should also be clear.
-    Assert.assertFalse(message.getExtension(optionalGroupExtension).hasA());
-    Assert.assertFalse(message.getExtension(optionalNestedMessageExtension).hasBb());
-    Assert.assertFalse(message.getExtension(optionalForeignMessageExtension).hasC());
-    Assert.assertFalse(message.getExtension(optionalImportMessageExtension).hasD());
-
-    assertEqualsExactType(0, message.getExtension(optionalGroupExtension).getA());
-    assertEqualsExactType(0, message.getExtension(optionalNestedMessageExtension).getBb());
-    assertEqualsExactType(0, message.getExtension(optionalForeignMessageExtension).getC());
-    assertEqualsExactType(0, message.getExtension(optionalImportMessageExtension).getD());
-
-    // Enums without defaults are set to the first value in the enum.
-    assertEqualsExactType(
-        TestAllTypes.NestedEnum.FOO, message.getExtension(optionalNestedEnumExtension));
-    assertEqualsExactType(
-        ForeignEnum.FOREIGN_FOO, message.getExtension(optionalForeignEnumExtension));
-    assertEqualsExactType(ImportEnum.IMPORT_FOO, message.getExtension(optionalImportEnumExtension));
-
-    assertEqualsExactType("", message.getExtension(optionalStringPieceExtension));
-    assertEqualsExactType("", message.getExtension(optionalCordExtension));
-
-    // Repeated fields are empty.
-    Assert.assertEquals(0, message.getExtensionCount(repeatedInt32Extension));
-    Assert.assertEquals(0, message.getExtensionCount(repeatedInt64Extension));
-    Assert.assertEquals(0, message.getExtensionCount(repeatedUint32Extension));
-    Assert.assertEquals(0, message.getExtensionCount(repeatedUint64Extension));
-    Assert.assertEquals(0, message.getExtensionCount(repeatedSint32Extension));
-    Assert.assertEquals(0, message.getExtensionCount(repeatedSint64Extension));
-    Assert.assertEquals(0, message.getExtensionCount(repeatedFixed32Extension));
-    Assert.assertEquals(0, message.getExtensionCount(repeatedFixed64Extension));
-    Assert.assertEquals(0, message.getExtensionCount(repeatedSfixed32Extension));
-    Assert.assertEquals(0, message.getExtensionCount(repeatedSfixed64Extension));
-    Assert.assertEquals(0, message.getExtensionCount(repeatedFloatExtension));
-    Assert.assertEquals(0, message.getExtensionCount(repeatedDoubleExtension));
-    Assert.assertEquals(0, message.getExtensionCount(repeatedBoolExtension));
-    Assert.assertEquals(0, message.getExtensionCount(repeatedStringExtension));
-    Assert.assertEquals(0, message.getExtensionCount(repeatedBytesExtension));
-
-    Assert.assertEquals(0, message.getExtensionCount(repeatedGroupExtension));
-    Assert.assertEquals(0, message.getExtensionCount(repeatedNestedMessageExtension));
-    Assert.assertEquals(0, message.getExtensionCount(repeatedForeignMessageExtension));
-    Assert.assertEquals(0, message.getExtensionCount(repeatedImportMessageExtension));
-    Assert.assertEquals(0, message.getExtensionCount(repeatedLazyMessageExtension));
-    Assert.assertEquals(0, message.getExtensionCount(repeatedNestedEnumExtension));
-    Assert.assertEquals(0, message.getExtensionCount(repeatedForeignEnumExtension));
-    Assert.assertEquals(0, message.getExtensionCount(repeatedImportEnumExtension));
-
-    Assert.assertEquals(0, message.getExtensionCount(repeatedStringPieceExtension));
-    Assert.assertEquals(0, message.getExtensionCount(repeatedCordExtension));
-
-    // Repeated fields are empty via getExtension().size().
-    Assert.assertEquals(0, message.getExtension(repeatedInt32Extension).size());
-    Assert.assertEquals(0, message.getExtension(repeatedInt64Extension).size());
-    Assert.assertEquals(0, message.getExtension(repeatedUint32Extension).size());
-    Assert.assertEquals(0, message.getExtension(repeatedUint64Extension).size());
-    Assert.assertEquals(0, message.getExtension(repeatedSint32Extension).size());
-    Assert.assertEquals(0, message.getExtension(repeatedSint64Extension).size());
-    Assert.assertEquals(0, message.getExtension(repeatedFixed32Extension).size());
-    Assert.assertEquals(0, message.getExtension(repeatedFixed64Extension).size());
-    Assert.assertEquals(0, message.getExtension(repeatedSfixed32Extension).size());
-    Assert.assertEquals(0, message.getExtension(repeatedSfixed64Extension).size());
-    Assert.assertEquals(0, message.getExtension(repeatedFloatExtension).size());
-    Assert.assertEquals(0, message.getExtension(repeatedDoubleExtension).size());
-    Assert.assertEquals(0, message.getExtension(repeatedBoolExtension).size());
-    Assert.assertEquals(0, message.getExtension(repeatedStringExtension).size());
-    Assert.assertEquals(0, message.getExtension(repeatedBytesExtension).size());
-
-    Assert.assertEquals(0, message.getExtension(repeatedGroupExtension).size());
-    Assert.assertEquals(0, message.getExtension(repeatedNestedMessageExtension).size());
-    Assert.assertEquals(0, message.getExtension(repeatedForeignMessageExtension).size());
-    Assert.assertEquals(0, message.getExtension(repeatedImportMessageExtension).size());
-    Assert.assertEquals(0, message.getExtension(repeatedLazyMessageExtension).size());
-    Assert.assertEquals(0, message.getExtension(repeatedNestedEnumExtension).size());
-    Assert.assertEquals(0, message.getExtension(repeatedForeignEnumExtension).size());
-    Assert.assertEquals(0, message.getExtension(repeatedImportEnumExtension).size());
-
-    Assert.assertEquals(0, message.getExtension(repeatedStringPieceExtension).size());
-    Assert.assertEquals(0, message.getExtension(repeatedCordExtension).size());
-
-    // hasBlah() should also be false for all default fields.
-    Assert.assertFalse(message.hasExtension(defaultInt32Extension));
-    Assert.assertFalse(message.hasExtension(defaultInt64Extension));
-    Assert.assertFalse(message.hasExtension(defaultUint32Extension));
-    Assert.assertFalse(message.hasExtension(defaultUint64Extension));
-    Assert.assertFalse(message.hasExtension(defaultSint32Extension));
-    Assert.assertFalse(message.hasExtension(defaultSint64Extension));
-    Assert.assertFalse(message.hasExtension(defaultFixed32Extension));
-    Assert.assertFalse(message.hasExtension(defaultFixed64Extension));
-    Assert.assertFalse(message.hasExtension(defaultSfixed32Extension));
-    Assert.assertFalse(message.hasExtension(defaultSfixed64Extension));
-    Assert.assertFalse(message.hasExtension(defaultFloatExtension));
-    Assert.assertFalse(message.hasExtension(defaultDoubleExtension));
-    Assert.assertFalse(message.hasExtension(defaultBoolExtension));
-    Assert.assertFalse(message.hasExtension(defaultStringExtension));
-    Assert.assertFalse(message.hasExtension(defaultBytesExtension));
-
-    Assert.assertFalse(message.hasExtension(defaultNestedEnumExtension));
-    Assert.assertFalse(message.hasExtension(defaultForeignEnumExtension));
-    Assert.assertFalse(message.hasExtension(defaultImportEnumExtension));
-
-    Assert.assertFalse(message.hasExtension(defaultStringPieceExtension));
-    Assert.assertFalse(message.hasExtension(defaultCordExtension));
-
-    // Fields with defaults have their default values (duh).
-    assertEqualsExactType(41, message.getExtension(defaultInt32Extension));
-    assertEqualsExactType(42L, message.getExtension(defaultInt64Extension));
-    assertEqualsExactType(43, message.getExtension(defaultUint32Extension));
-    assertEqualsExactType(44L, message.getExtension(defaultUint64Extension));
-    assertEqualsExactType(-45, message.getExtension(defaultSint32Extension));
-    assertEqualsExactType(46L, message.getExtension(defaultSint64Extension));
-    assertEqualsExactType(47, message.getExtension(defaultFixed32Extension));
-    assertEqualsExactType(48L, message.getExtension(defaultFixed64Extension));
-    assertEqualsExactType(49, message.getExtension(defaultSfixed32Extension));
-    assertEqualsExactType(-50L, message.getExtension(defaultSfixed64Extension));
-    assertEqualsExactType(51.5F, message.getExtension(defaultFloatExtension));
-    assertEqualsExactType(52e3D, message.getExtension(defaultDoubleExtension));
-    assertEqualsExactType(true, message.getExtension(defaultBoolExtension));
-    assertEqualsExactType("hello", message.getExtension(defaultStringExtension));
-    assertEqualsExactType(toBytes("world"), message.getExtension(defaultBytesExtension));
-
-    assertEqualsExactType(
-        TestAllTypes.NestedEnum.BAR, message.getExtension(defaultNestedEnumExtension));
-    assertEqualsExactType(
-        ForeignEnum.FOREIGN_BAR, message.getExtension(defaultForeignEnumExtension));
-    assertEqualsExactType(ImportEnum.IMPORT_BAR, message.getExtension(defaultImportEnumExtension));
-
-    assertEqualsExactType("abc", message.getExtension(defaultStringPieceExtension));
-    assertEqualsExactType("123", message.getExtension(defaultCordExtension));
-
-    Assert.assertFalse(message.hasExtension(oneofUint32Extension));
-    Assert.assertFalse(message.hasExtension(oneofNestedMessageExtension));
-    Assert.assertFalse(message.hasExtension(oneofStringExtension));
-    Assert.assertFalse(message.hasExtension(oneofBytesExtension));
-  }
-
-  // -------------------------------------------------------------------
-
-  /**
-   * Assert (using {@code junit.framework.Assert}} that all extensions of {@code message} are set to
-   * the values assigned by {@code setAllExtensions} followed by {@code modifyRepeatedExtensions}.
-   */
-  public static void assertRepeatedExtensionsModified(TestAllExtensionsOrBuilder message) {
-    // ModifyRepeatedFields only sets the second repeated element of each
-    // field.  In addition to verifying this, we also verify that the first
-    // element and size were *not* modified.
-    Assert.assertEquals(2, message.getExtensionCount(repeatedInt32Extension));
-    Assert.assertEquals(2, message.getExtensionCount(repeatedInt64Extension));
-    Assert.assertEquals(2, message.getExtensionCount(repeatedUint32Extension));
-    Assert.assertEquals(2, message.getExtensionCount(repeatedUint64Extension));
-    Assert.assertEquals(2, message.getExtensionCount(repeatedSint32Extension));
-    Assert.assertEquals(2, message.getExtensionCount(repeatedSint64Extension));
-    Assert.assertEquals(2, message.getExtensionCount(repeatedFixed32Extension));
-    Assert.assertEquals(2, message.getExtensionCount(repeatedFixed64Extension));
-    Assert.assertEquals(2, message.getExtensionCount(repeatedSfixed32Extension));
-    Assert.assertEquals(2, message.getExtensionCount(repeatedSfixed64Extension));
-    Assert.assertEquals(2, message.getExtensionCount(repeatedFloatExtension));
-    Assert.assertEquals(2, message.getExtensionCount(repeatedDoubleExtension));
-    Assert.assertEquals(2, message.getExtensionCount(repeatedBoolExtension));
-    Assert.assertEquals(2, message.getExtensionCount(repeatedStringExtension));
-    Assert.assertEquals(2, message.getExtensionCount(repeatedBytesExtension));
-
-    Assert.assertEquals(2, message.getExtensionCount(repeatedGroupExtension));
-    Assert.assertEquals(2, message.getExtensionCount(repeatedNestedMessageExtension));
-    Assert.assertEquals(2, message.getExtensionCount(repeatedForeignMessageExtension));
-    Assert.assertEquals(2, message.getExtensionCount(repeatedImportMessageExtension));
-    Assert.assertEquals(2, message.getExtensionCount(repeatedLazyMessageExtension));
-    Assert.assertEquals(2, message.getExtensionCount(repeatedNestedEnumExtension));
-    Assert.assertEquals(2, message.getExtensionCount(repeatedForeignEnumExtension));
-    Assert.assertEquals(2, message.getExtensionCount(repeatedImportEnumExtension));
-
-    Assert.assertEquals(2, message.getExtensionCount(repeatedStringPieceExtension));
-    Assert.assertEquals(2, message.getExtensionCount(repeatedCordExtension));
-
-    assertEqualsExactType(201, message.getExtension(repeatedInt32Extension, 0));
-    assertEqualsExactType(202L, message.getExtension(repeatedInt64Extension, 0));
-    assertEqualsExactType(203, message.getExtension(repeatedUint32Extension, 0));
-    assertEqualsExactType(204L, message.getExtension(repeatedUint64Extension, 0));
-    assertEqualsExactType(205, message.getExtension(repeatedSint32Extension, 0));
-    assertEqualsExactType(206L, message.getExtension(repeatedSint64Extension, 0));
-    assertEqualsExactType(207, message.getExtension(repeatedFixed32Extension, 0));
-    assertEqualsExactType(208L, message.getExtension(repeatedFixed64Extension, 0));
-    assertEqualsExactType(209, message.getExtension(repeatedSfixed32Extension, 0));
-    assertEqualsExactType(210L, message.getExtension(repeatedSfixed64Extension, 0));
-    assertEqualsExactType(211F, message.getExtension(repeatedFloatExtension, 0));
-    assertEqualsExactType(212D, message.getExtension(repeatedDoubleExtension, 0));
-    assertEqualsExactType(true, message.getExtension(repeatedBoolExtension, 0));
-    assertEqualsExactType("215", message.getExtension(repeatedStringExtension, 0));
-    assertEqualsExactType(toBytes("216"), message.getExtension(repeatedBytesExtension, 0));
-
-    assertEqualsExactType(217, message.getExtension(repeatedGroupExtension, 0).getA());
-    assertEqualsExactType(218, message.getExtension(repeatedNestedMessageExtension, 0).getBb());
-    assertEqualsExactType(219, message.getExtension(repeatedForeignMessageExtension, 0).getC());
-    assertEqualsExactType(220, message.getExtension(repeatedImportMessageExtension, 0).getD());
-    assertEqualsExactType(227, message.getExtension(repeatedLazyMessageExtension, 0).getBb());
-
-    assertEqualsExactType(
-        TestAllTypes.NestedEnum.BAR, message.getExtension(repeatedNestedEnumExtension, 0));
-    assertEqualsExactType(
-        ForeignEnum.FOREIGN_BAR, message.getExtension(repeatedForeignEnumExtension, 0));
-    assertEqualsExactType(
-        ImportEnum.IMPORT_BAR, message.getExtension(repeatedImportEnumExtension, 0));
-
-    assertEqualsExactType("224", message.getExtension(repeatedStringPieceExtension, 0));
-    assertEqualsExactType("225", message.getExtension(repeatedCordExtension, 0));
-
-    // Actually verify the second (modified) elements now.
-    assertEqualsExactType(501, message.getExtension(repeatedInt32Extension, 1));
-    assertEqualsExactType(502L, message.getExtension(repeatedInt64Extension, 1));
-    assertEqualsExactType(503, message.getExtension(repeatedUint32Extension, 1));
-    assertEqualsExactType(504L, message.getExtension(repeatedUint64Extension, 1));
-    assertEqualsExactType(505, message.getExtension(repeatedSint32Extension, 1));
-    assertEqualsExactType(506L, message.getExtension(repeatedSint64Extension, 1));
-    assertEqualsExactType(507, message.getExtension(repeatedFixed32Extension, 1));
-    assertEqualsExactType(508L, message.getExtension(repeatedFixed64Extension, 1));
-    assertEqualsExactType(509, message.getExtension(repeatedSfixed32Extension, 1));
-    assertEqualsExactType(510L, message.getExtension(repeatedSfixed64Extension, 1));
-    assertEqualsExactType(511F, message.getExtension(repeatedFloatExtension, 1));
-    assertEqualsExactType(512D, message.getExtension(repeatedDoubleExtension, 1));
-    assertEqualsExactType(true, message.getExtension(repeatedBoolExtension, 1));
-    assertEqualsExactType("515", message.getExtension(repeatedStringExtension, 1));
-    assertEqualsExactType(toBytes("516"), message.getExtension(repeatedBytesExtension, 1));
-
-    assertEqualsExactType(517, message.getExtension(repeatedGroupExtension, 1).getA());
-    assertEqualsExactType(518, message.getExtension(repeatedNestedMessageExtension, 1).getBb());
-    assertEqualsExactType(519, message.getExtension(repeatedForeignMessageExtension, 1).getC());
-    assertEqualsExactType(520, message.getExtension(repeatedImportMessageExtension, 1).getD());
-    assertEqualsExactType(527, message.getExtension(repeatedLazyMessageExtension, 1).getBb());
-
-    assertEqualsExactType(
-        TestAllTypes.NestedEnum.FOO, message.getExtension(repeatedNestedEnumExtension, 1));
-    assertEqualsExactType(
-        ForeignEnum.FOREIGN_FOO, message.getExtension(repeatedForeignEnumExtension, 1));
-    assertEqualsExactType(
-        ImportEnum.IMPORT_FOO, message.getExtension(repeatedImportEnumExtension, 1));
-
-    assertEqualsExactType("524", message.getExtension(repeatedStringPieceExtension, 1));
-    assertEqualsExactType("525", message.getExtension(repeatedCordExtension, 1));
-  }
-
-  public static void setPackedExtensions(TestPackedExtensions.Builder message) {
-    message.addExtension(packedInt32Extension, 601);
-    message.addExtension(packedInt64Extension, 602L);
-    message.addExtension(packedUint32Extension, 603);
-    message.addExtension(packedUint64Extension, 604L);
-    message.addExtension(packedSint32Extension, 605);
-    message.addExtension(packedSint64Extension, 606L);
-    message.addExtension(packedFixed32Extension, 607);
-    message.addExtension(packedFixed64Extension, 608L);
-    message.addExtension(packedSfixed32Extension, 609);
-    message.addExtension(packedSfixed64Extension, 610L);
-    message.addExtension(packedFloatExtension, 611F);
-    message.addExtension(packedDoubleExtension, 612D);
-    message.addExtension(packedBoolExtension, true);
-    message.addExtension(packedEnumExtension, ForeignEnum.FOREIGN_BAR);
-    // Add a second one of each field.
-    message.addExtension(packedInt32Extension, 701);
-    message.addExtension(packedInt64Extension, 702L);
-    message.addExtension(packedUint32Extension, 703);
-    message.addExtension(packedUint64Extension, 704L);
-    message.addExtension(packedSint32Extension, 705);
-    message.addExtension(packedSint64Extension, 706L);
-    message.addExtension(packedFixed32Extension, 707);
-    message.addExtension(packedFixed64Extension, 708L);
-    message.addExtension(packedSfixed32Extension, 709);
-    message.addExtension(packedSfixed64Extension, 710L);
-    message.addExtension(packedFloatExtension, 711F);
-    message.addExtension(packedDoubleExtension, 712D);
-    message.addExtension(packedBoolExtension, false);
-    message.addExtension(packedEnumExtension, ForeignEnum.FOREIGN_BAZ);
-  }
-
-  public static void assertPackedExtensionsSet(TestPackedExtensions message) {
-    Assert.assertEquals(2, message.getExtensionCount(packedInt32Extension));
-    Assert.assertEquals(2, message.getExtensionCount(packedInt64Extension));
-    Assert.assertEquals(2, message.getExtensionCount(packedUint32Extension));
-    Assert.assertEquals(2, message.getExtensionCount(packedUint64Extension));
-    Assert.assertEquals(2, message.getExtensionCount(packedSint32Extension));
-    Assert.assertEquals(2, message.getExtensionCount(packedSint64Extension));
-    Assert.assertEquals(2, message.getExtensionCount(packedFixed32Extension));
-    Assert.assertEquals(2, message.getExtensionCount(packedFixed64Extension));
-    Assert.assertEquals(2, message.getExtensionCount(packedSfixed32Extension));
-    Assert.assertEquals(2, message.getExtensionCount(packedSfixed64Extension));
-    Assert.assertEquals(2, message.getExtensionCount(packedFloatExtension));
-    Assert.assertEquals(2, message.getExtensionCount(packedDoubleExtension));
-    Assert.assertEquals(2, message.getExtensionCount(packedBoolExtension));
-    Assert.assertEquals(2, message.getExtensionCount(packedEnumExtension));
-    assertEqualsExactType(601, message.getExtension(packedInt32Extension, 0));
-    assertEqualsExactType(602L, message.getExtension(packedInt64Extension, 0));
-    assertEqualsExactType(603, message.getExtension(packedUint32Extension, 0));
-    assertEqualsExactType(604L, message.getExtension(packedUint64Extension, 0));
-    assertEqualsExactType(605, message.getExtension(packedSint32Extension, 0));
-    assertEqualsExactType(606L, message.getExtension(packedSint64Extension, 0));
-    assertEqualsExactType(607, message.getExtension(packedFixed32Extension, 0));
-    assertEqualsExactType(608L, message.getExtension(packedFixed64Extension, 0));
-    assertEqualsExactType(609, message.getExtension(packedSfixed32Extension, 0));
-    assertEqualsExactType(610L, message.getExtension(packedSfixed64Extension, 0));
-    assertEqualsExactType(611F, message.getExtension(packedFloatExtension, 0));
-    assertEqualsExactType(612D, message.getExtension(packedDoubleExtension, 0));
-    assertEqualsExactType(true, message.getExtension(packedBoolExtension, 0));
-    assertEqualsExactType(ForeignEnum.FOREIGN_BAR, message.getExtension(packedEnumExtension, 0));
-    assertEqualsExactType(701, message.getExtension(packedInt32Extension, 1));
-    assertEqualsExactType(702L, message.getExtension(packedInt64Extension, 1));
-    assertEqualsExactType(703, message.getExtension(packedUint32Extension, 1));
-    assertEqualsExactType(704L, message.getExtension(packedUint64Extension, 1));
-    assertEqualsExactType(705, message.getExtension(packedSint32Extension, 1));
-    assertEqualsExactType(706L, message.getExtension(packedSint64Extension, 1));
-    assertEqualsExactType(707, message.getExtension(packedFixed32Extension, 1));
-    assertEqualsExactType(708L, message.getExtension(packedFixed64Extension, 1));
-    assertEqualsExactType(709, message.getExtension(packedSfixed32Extension, 1));
-    assertEqualsExactType(710L, message.getExtension(packedSfixed64Extension, 1));
-    assertEqualsExactType(711F, message.getExtension(packedFloatExtension, 1));
-    assertEqualsExactType(712D, message.getExtension(packedDoubleExtension, 1));
-    assertEqualsExactType(false, message.getExtension(packedBoolExtension, 1));
-    assertEqualsExactType(ForeignEnum.FOREIGN_BAZ, message.getExtension(packedEnumExtension, 1));
-  }
-
-  // ===================================================================
-  // Lite extensions
-
-  /**
-   * Assert (using {@code junit.framework.Assert}} that all extensions of {@code message} are set to
-   * the values assigned by {@code setAllExtensions}.
-   */
-  public static void assertAllExtensionsSet(TestAllExtensionsLiteOrBuilder message) {
-    Assert.assertTrue(message.hasExtension(optionalInt32ExtensionLite));
-    Assert.assertTrue(message.hasExtension(optionalInt64ExtensionLite));
-    Assert.assertTrue(message.hasExtension(optionalUint32ExtensionLite));
-    Assert.assertTrue(message.hasExtension(optionalUint64ExtensionLite));
-    Assert.assertTrue(message.hasExtension(optionalSint32ExtensionLite));
-    Assert.assertTrue(message.hasExtension(optionalSint64ExtensionLite));
-    Assert.assertTrue(message.hasExtension(optionalFixed32ExtensionLite));
-    Assert.assertTrue(message.hasExtension(optionalFixed64ExtensionLite));
-    Assert.assertTrue(message.hasExtension(optionalSfixed32ExtensionLite));
-    Assert.assertTrue(message.hasExtension(optionalSfixed64ExtensionLite));
-    Assert.assertTrue(message.hasExtension(optionalFloatExtensionLite));
-    Assert.assertTrue(message.hasExtension(optionalDoubleExtensionLite));
-    Assert.assertTrue(message.hasExtension(optionalBoolExtensionLite));
-    Assert.assertTrue(message.hasExtension(optionalStringExtensionLite));
-    Assert.assertTrue(message.hasExtension(optionalBytesExtensionLite));
-
-    Assert.assertTrue(message.hasExtension(optionalGroupExtensionLite));
-    Assert.assertTrue(message.hasExtension(optionalNestedMessageExtensionLite));
-    Assert.assertTrue(message.hasExtension(optionalForeignMessageExtensionLite));
-    Assert.assertTrue(message.hasExtension(optionalImportMessageExtensionLite));
-
-    Assert.assertTrue(message.getExtension(optionalGroupExtensionLite).hasA());
-    Assert.assertTrue(message.getExtension(optionalNestedMessageExtensionLite).hasBb());
-    Assert.assertTrue(message.getExtension(optionalForeignMessageExtensionLite).hasC());
-    Assert.assertTrue(message.getExtension(optionalImportMessageExtensionLite).hasD());
-
-    Assert.assertTrue(message.hasExtension(optionalNestedEnumExtensionLite));
-    Assert.assertTrue(message.hasExtension(optionalForeignEnumExtensionLite));
-    Assert.assertTrue(message.hasExtension(optionalImportEnumExtensionLite));
-
-    Assert.assertTrue(message.hasExtension(optionalStringPieceExtensionLite));
-    Assert.assertTrue(message.hasExtension(optionalCordExtensionLite));
-
-    assertEqualsExactType(101, message.getExtension(optionalInt32ExtensionLite));
-    assertEqualsExactType(102L, message.getExtension(optionalInt64ExtensionLite));
-    assertEqualsExactType(103, message.getExtension(optionalUint32ExtensionLite));
-    assertEqualsExactType(104L, message.getExtension(optionalUint64ExtensionLite));
-    assertEqualsExactType(105, message.getExtension(optionalSint32ExtensionLite));
-    assertEqualsExactType(106L, message.getExtension(optionalSint64ExtensionLite));
-    assertEqualsExactType(107, message.getExtension(optionalFixed32ExtensionLite));
-    assertEqualsExactType(108L, message.getExtension(optionalFixed64ExtensionLite));
-    assertEqualsExactType(109, message.getExtension(optionalSfixed32ExtensionLite));
-    assertEqualsExactType(110L, message.getExtension(optionalSfixed64ExtensionLite));
-    assertEqualsExactType(111F, message.getExtension(optionalFloatExtensionLite));
-    assertEqualsExactType(112D, message.getExtension(optionalDoubleExtensionLite));
-    assertEqualsExactType(true, message.getExtension(optionalBoolExtensionLite));
-    assertEqualsExactType("115", message.getExtension(optionalStringExtensionLite));
-    assertEqualsExactType(toBytes("116"), message.getExtension(optionalBytesExtensionLite));
-
-    assertEqualsExactType(117, message.getExtension(optionalGroupExtensionLite).getA());
-    assertEqualsExactType(118, message.getExtension(optionalNestedMessageExtensionLite).getBb());
-    assertEqualsExactType(119, message.getExtension(optionalForeignMessageExtensionLite).getC());
-    assertEqualsExactType(120, message.getExtension(optionalImportMessageExtensionLite).getD());
-    assertEqualsExactType(
-        126, message.getExtension(optionalPublicImportMessageExtensionLite).getE());
-    assertEqualsExactType(127, message.getExtension(optionalLazyMessageExtensionLite).getBb());
-    assertEqualsExactType(
-        128, message.getExtension(optionalUnverifiedLazyMessageExtensionLite).getBb());
-
-    assertEqualsExactType(
-        TestAllTypesLite.NestedEnum.BAZ, message.getExtension(optionalNestedEnumExtensionLite));
-    assertEqualsExactType(
-        ForeignEnumLite.FOREIGN_LITE_BAZ, message.getExtension(optionalForeignEnumExtensionLite));
-    assertEqualsExactType(
-        ImportEnumLite.IMPORT_LITE_BAZ, message.getExtension(optionalImportEnumExtensionLite));
-
-    assertEqualsExactType("124", message.getExtension(optionalStringPieceExtensionLite));
-    assertEqualsExactType("125", message.getExtension(optionalCordExtensionLite));
-
-    // -----------------------------------------------------------------
-
-    Assert.assertEquals(2, message.getExtensionCount(repeatedInt32ExtensionLite));
-    Assert.assertEquals(2, message.getExtensionCount(repeatedInt64ExtensionLite));
-    Assert.assertEquals(2, message.getExtensionCount(repeatedUint32ExtensionLite));
-    Assert.assertEquals(2, message.getExtensionCount(repeatedUint64ExtensionLite));
-    Assert.assertEquals(2, message.getExtensionCount(repeatedSint32ExtensionLite));
-    Assert.assertEquals(2, message.getExtensionCount(repeatedSint64ExtensionLite));
-    Assert.assertEquals(2, message.getExtensionCount(repeatedFixed32ExtensionLite));
-    Assert.assertEquals(2, message.getExtensionCount(repeatedFixed64ExtensionLite));
-    Assert.assertEquals(2, message.getExtensionCount(repeatedSfixed32ExtensionLite));
-    Assert.assertEquals(2, message.getExtensionCount(repeatedSfixed64ExtensionLite));
-    Assert.assertEquals(2, message.getExtensionCount(repeatedFloatExtensionLite));
-    Assert.assertEquals(2, message.getExtensionCount(repeatedDoubleExtensionLite));
-    Assert.assertEquals(2, message.getExtensionCount(repeatedBoolExtensionLite));
-    Assert.assertEquals(2, message.getExtensionCount(repeatedStringExtensionLite));
-    Assert.assertEquals(2, message.getExtensionCount(repeatedBytesExtensionLite));
-
-    Assert.assertEquals(2, message.getExtensionCount(repeatedGroupExtensionLite));
-    Assert.assertEquals(2, message.getExtensionCount(repeatedNestedMessageExtensionLite));
-    Assert.assertEquals(2, message.getExtensionCount(repeatedForeignMessageExtensionLite));
-    Assert.assertEquals(2, message.getExtensionCount(repeatedImportMessageExtensionLite));
-    Assert.assertEquals(2, message.getExtensionCount(repeatedLazyMessageExtensionLite));
-    Assert.assertEquals(2, message.getExtensionCount(repeatedNestedEnumExtensionLite));
-    Assert.assertEquals(2, message.getExtensionCount(repeatedForeignEnumExtensionLite));
-    Assert.assertEquals(2, message.getExtensionCount(repeatedImportEnumExtensionLite));
-
-    Assert.assertEquals(2, message.getExtensionCount(repeatedStringPieceExtensionLite));
-    Assert.assertEquals(2, message.getExtensionCount(repeatedCordExtensionLite));
-
-    assertEqualsExactType(201, message.getExtension(repeatedInt32ExtensionLite, 0));
-    assertEqualsExactType(202L, message.getExtension(repeatedInt64ExtensionLite, 0));
-    assertEqualsExactType(203, message.getExtension(repeatedUint32ExtensionLite, 0));
-    assertEqualsExactType(204L, message.getExtension(repeatedUint64ExtensionLite, 0));
-    assertEqualsExactType(205, message.getExtension(repeatedSint32ExtensionLite, 0));
-    assertEqualsExactType(206L, message.getExtension(repeatedSint64ExtensionLite, 0));
-    assertEqualsExactType(207, message.getExtension(repeatedFixed32ExtensionLite, 0));
-    assertEqualsExactType(208L, message.getExtension(repeatedFixed64ExtensionLite, 0));
-    assertEqualsExactType(209, message.getExtension(repeatedSfixed32ExtensionLite, 0));
-    assertEqualsExactType(210L, message.getExtension(repeatedSfixed64ExtensionLite, 0));
-    assertEqualsExactType(211F, message.getExtension(repeatedFloatExtensionLite, 0));
-    assertEqualsExactType(212D, message.getExtension(repeatedDoubleExtensionLite, 0));
-    assertEqualsExactType(true, message.getExtension(repeatedBoolExtensionLite, 0));
-    assertEqualsExactType("215", message.getExtension(repeatedStringExtensionLite, 0));
-    assertEqualsExactType(toBytes("216"), message.getExtension(repeatedBytesExtensionLite, 0));
-
-    assertEqualsExactType(217, message.getExtension(repeatedGroupExtensionLite, 0).getA());
-    assertEqualsExactType(218, message.getExtension(repeatedNestedMessageExtensionLite, 0).getBb());
-    assertEqualsExactType(219, message.getExtension(repeatedForeignMessageExtensionLite, 0).getC());
-    assertEqualsExactType(220, message.getExtension(repeatedImportMessageExtensionLite, 0).getD());
-    assertEqualsExactType(227, message.getExtension(repeatedLazyMessageExtensionLite, 0).getBb());
-
-    assertEqualsExactType(
-        TestAllTypesLite.NestedEnum.BAR, message.getExtension(repeatedNestedEnumExtensionLite, 0));
-    assertEqualsExactType(
-        ForeignEnumLite.FOREIGN_LITE_BAR,
-        message.getExtension(repeatedForeignEnumExtensionLite, 0));
-    assertEqualsExactType(
-        ImportEnumLite.IMPORT_LITE_BAR, message.getExtension(repeatedImportEnumExtensionLite, 0));
-
-    assertEqualsExactType("224", message.getExtension(repeatedStringPieceExtensionLite, 0));
-    assertEqualsExactType("225", message.getExtension(repeatedCordExtensionLite, 0));
-
-    assertEqualsExactType(301, message.getExtension(repeatedInt32ExtensionLite, 1));
-    assertEqualsExactType(302L, message.getExtension(repeatedInt64ExtensionLite, 1));
-    assertEqualsExactType(303, message.getExtension(repeatedUint32ExtensionLite, 1));
-    assertEqualsExactType(304L, message.getExtension(repeatedUint64ExtensionLite, 1));
-    assertEqualsExactType(305, message.getExtension(repeatedSint32ExtensionLite, 1));
-    assertEqualsExactType(306L, message.getExtension(repeatedSint64ExtensionLite, 1));
-    assertEqualsExactType(307, message.getExtension(repeatedFixed32ExtensionLite, 1));
-    assertEqualsExactType(308L, message.getExtension(repeatedFixed64ExtensionLite, 1));
-    assertEqualsExactType(309, message.getExtension(repeatedSfixed32ExtensionLite, 1));
-    assertEqualsExactType(310L, message.getExtension(repeatedSfixed64ExtensionLite, 1));
-    assertEqualsExactType(311F, message.getExtension(repeatedFloatExtensionLite, 1));
-    assertEqualsExactType(312D, message.getExtension(repeatedDoubleExtensionLite, 1));
-    assertEqualsExactType(false, message.getExtension(repeatedBoolExtensionLite, 1));
-    assertEqualsExactType("315", message.getExtension(repeatedStringExtensionLite, 1));
-    assertEqualsExactType(toBytes("316"), message.getExtension(repeatedBytesExtensionLite, 1));
-
-    assertEqualsExactType(317, message.getExtension(repeatedGroupExtensionLite, 1).getA());
-    assertEqualsExactType(318, message.getExtension(repeatedNestedMessageExtensionLite, 1).getBb());
-    assertEqualsExactType(319, message.getExtension(repeatedForeignMessageExtensionLite, 1).getC());
-    assertEqualsExactType(320, message.getExtension(repeatedImportMessageExtensionLite, 1).getD());
-    assertEqualsExactType(327, message.getExtension(repeatedLazyMessageExtensionLite, 1).getBb());
-
-    assertEqualsExactType(
-        TestAllTypesLite.NestedEnum.BAZ, message.getExtension(repeatedNestedEnumExtensionLite, 1));
-    assertEqualsExactType(
-        ForeignEnumLite.FOREIGN_LITE_BAZ,
-        message.getExtension(repeatedForeignEnumExtensionLite, 1));
-    assertEqualsExactType(
-        ImportEnumLite.IMPORT_LITE_BAZ, message.getExtension(repeatedImportEnumExtensionLite, 1));
-
-    assertEqualsExactType("324", message.getExtension(repeatedStringPieceExtensionLite, 1));
-    assertEqualsExactType("325", message.getExtension(repeatedCordExtensionLite, 1));
-
-    // -----------------------------------------------------------------
-
-    Assert.assertTrue(message.hasExtension(defaultInt32ExtensionLite));
-    Assert.assertTrue(message.hasExtension(defaultInt64ExtensionLite));
-    Assert.assertTrue(message.hasExtension(defaultUint32ExtensionLite));
-    Assert.assertTrue(message.hasExtension(defaultUint64ExtensionLite));
-    Assert.assertTrue(message.hasExtension(defaultSint32ExtensionLite));
-    Assert.assertTrue(message.hasExtension(defaultSint64ExtensionLite));
-    Assert.assertTrue(message.hasExtension(defaultFixed32ExtensionLite));
-    Assert.assertTrue(message.hasExtension(defaultFixed64ExtensionLite));
-    Assert.assertTrue(message.hasExtension(defaultSfixed32ExtensionLite));
-    Assert.assertTrue(message.hasExtension(defaultSfixed64ExtensionLite));
-    Assert.assertTrue(message.hasExtension(defaultFloatExtensionLite));
-    Assert.assertTrue(message.hasExtension(defaultDoubleExtensionLite));
-    Assert.assertTrue(message.hasExtension(defaultBoolExtensionLite));
-    Assert.assertTrue(message.hasExtension(defaultStringExtensionLite));
-    Assert.assertTrue(message.hasExtension(defaultBytesExtensionLite));
-
-    Assert.assertTrue(message.hasExtension(defaultNestedEnumExtensionLite));
-    Assert.assertTrue(message.hasExtension(defaultForeignEnumExtensionLite));
-    Assert.assertTrue(message.hasExtension(defaultImportEnumExtensionLite));
-
-    Assert.assertTrue(message.hasExtension(defaultStringPieceExtensionLite));
-    Assert.assertTrue(message.hasExtension(defaultCordExtensionLite));
-
-    assertEqualsExactType(401, message.getExtension(defaultInt32ExtensionLite));
-    assertEqualsExactType(402L, message.getExtension(defaultInt64ExtensionLite));
-    assertEqualsExactType(403, message.getExtension(defaultUint32ExtensionLite));
-    assertEqualsExactType(404L, message.getExtension(defaultUint64ExtensionLite));
-    assertEqualsExactType(405, message.getExtension(defaultSint32ExtensionLite));
-    assertEqualsExactType(406L, message.getExtension(defaultSint64ExtensionLite));
-    assertEqualsExactType(407, message.getExtension(defaultFixed32ExtensionLite));
-    assertEqualsExactType(408L, message.getExtension(defaultFixed64ExtensionLite));
-    assertEqualsExactType(409, message.getExtension(defaultSfixed32ExtensionLite));
-    assertEqualsExactType(410L, message.getExtension(defaultSfixed64ExtensionLite));
-    assertEqualsExactType(411F, message.getExtension(defaultFloatExtensionLite));
-    assertEqualsExactType(412D, message.getExtension(defaultDoubleExtensionLite));
-    assertEqualsExactType(false, message.getExtension(defaultBoolExtensionLite));
-    assertEqualsExactType("415", message.getExtension(defaultStringExtensionLite));
-    assertEqualsExactType(toBytes("416"), message.getExtension(defaultBytesExtensionLite));
-
-    assertEqualsExactType(
-        TestAllTypesLite.NestedEnum.FOO, message.getExtension(defaultNestedEnumExtensionLite));
-    assertEqualsExactType(
-        ForeignEnumLite.FOREIGN_LITE_FOO, message.getExtension(defaultForeignEnumExtensionLite));
-    assertEqualsExactType(
-        ImportEnumLite.IMPORT_LITE_FOO, message.getExtension(defaultImportEnumExtensionLite));
-
-    assertEqualsExactType("424", message.getExtension(defaultStringPieceExtensionLite));
-    assertEqualsExactType("425", message.getExtension(defaultCordExtensionLite));
-
-    Assert.assertTrue(message.hasExtension(oneofBytesExtensionLite));
-
-    assertEqualsExactType(toBytes("604"), message.getExtension(oneofBytesExtensionLite));
-  }
-
-  // -------------------------------------------------------------------
-
-  /**
-   * Assert (using {@code junit.framework.Assert}} that all extensions of {@code message} are
-   * cleared, and that getting the extensions returns their default values.
-   */
-  public static void assertExtensionsClear(TestAllExtensionsLiteOrBuilder message) {
-    // hasBlah() should initially be false for all optional fields.
-    Assert.assertFalse(message.hasExtension(optionalInt32ExtensionLite));
-    Assert.assertFalse(message.hasExtension(optionalInt64ExtensionLite));
-    Assert.assertFalse(message.hasExtension(optionalUint32ExtensionLite));
-    Assert.assertFalse(message.hasExtension(optionalUint64ExtensionLite));
-    Assert.assertFalse(message.hasExtension(optionalSint32ExtensionLite));
-    Assert.assertFalse(message.hasExtension(optionalSint64ExtensionLite));
-    Assert.assertFalse(message.hasExtension(optionalFixed32ExtensionLite));
-    Assert.assertFalse(message.hasExtension(optionalFixed64ExtensionLite));
-    Assert.assertFalse(message.hasExtension(optionalSfixed32ExtensionLite));
-    Assert.assertFalse(message.hasExtension(optionalSfixed64ExtensionLite));
-    Assert.assertFalse(message.hasExtension(optionalFloatExtensionLite));
-    Assert.assertFalse(message.hasExtension(optionalDoubleExtensionLite));
-    Assert.assertFalse(message.hasExtension(optionalBoolExtensionLite));
-    Assert.assertFalse(message.hasExtension(optionalStringExtensionLite));
-    Assert.assertFalse(message.hasExtension(optionalBytesExtensionLite));
-
-    Assert.assertFalse(message.hasExtension(optionalGroupExtensionLite));
-    Assert.assertFalse(message.hasExtension(optionalNestedMessageExtensionLite));
-    Assert.assertFalse(message.hasExtension(optionalForeignMessageExtensionLite));
-    Assert.assertFalse(message.hasExtension(optionalImportMessageExtensionLite));
-    Assert.assertFalse(message.hasExtension(optionalPublicImportMessageExtensionLite));
-    Assert.assertFalse(message.hasExtension(optionalLazyMessageExtensionLite));
-    Assert.assertFalse(message.hasExtension(optionalUnverifiedLazyMessageExtensionLite));
-
-    Assert.assertFalse(message.hasExtension(optionalNestedEnumExtensionLite));
-    Assert.assertFalse(message.hasExtension(optionalForeignEnumExtensionLite));
-    Assert.assertFalse(message.hasExtension(optionalImportEnumExtensionLite));
-
-    Assert.assertFalse(message.hasExtension(optionalStringPieceExtensionLite));
-    Assert.assertFalse(message.hasExtension(optionalCordExtensionLite));
-
-    // Optional fields without defaults are set to zero or something like it.
-    assertEqualsExactType(0, message.getExtension(optionalInt32ExtensionLite));
-    assertEqualsExactType(0L, message.getExtension(optionalInt64ExtensionLite));
-    assertEqualsExactType(0, message.getExtension(optionalUint32ExtensionLite));
-    assertEqualsExactType(0L, message.getExtension(optionalUint64ExtensionLite));
-    assertEqualsExactType(0, message.getExtension(optionalSint32ExtensionLite));
-    assertEqualsExactType(0L, message.getExtension(optionalSint64ExtensionLite));
-    assertEqualsExactType(0, message.getExtension(optionalFixed32ExtensionLite));
-    assertEqualsExactType(0L, message.getExtension(optionalFixed64ExtensionLite));
-    assertEqualsExactType(0, message.getExtension(optionalSfixed32ExtensionLite));
-    assertEqualsExactType(0L, message.getExtension(optionalSfixed64ExtensionLite));
-    assertEqualsExactType(0F, message.getExtension(optionalFloatExtensionLite));
-    assertEqualsExactType(0D, message.getExtension(optionalDoubleExtensionLite));
-    assertEqualsExactType(false, message.getExtension(optionalBoolExtensionLite));
-    assertEqualsExactType("", message.getExtension(optionalStringExtensionLite));
-    assertEqualsExactType(ByteString.EMPTY, message.getExtension(optionalBytesExtensionLite));
-
-    // Embedded messages should also be clear.
-    Assert.assertFalse(message.getExtension(optionalGroupExtensionLite).hasA());
-    Assert.assertFalse(message.getExtension(optionalNestedMessageExtensionLite).hasBb());
-    Assert.assertFalse(message.getExtension(optionalForeignMessageExtensionLite).hasC());
-    Assert.assertFalse(message.getExtension(optionalImportMessageExtensionLite).hasD());
-    Assert.assertFalse(message.getExtension(optionalPublicImportMessageExtensionLite).hasE());
-    Assert.assertFalse(message.getExtension(optionalLazyMessageExtensionLite).hasBb());
-    Assert.assertFalse(message.getExtension(optionalUnverifiedLazyMessageExtensionLite).hasBb());
-
-    assertEqualsExactType(0, message.getExtension(optionalGroupExtensionLite).getA());
-    assertEqualsExactType(0, message.getExtension(optionalNestedMessageExtensionLite).getBb());
-    assertEqualsExactType(0, message.getExtension(optionalForeignMessageExtensionLite).getC());
-    assertEqualsExactType(0, message.getExtension(optionalImportMessageExtensionLite).getD());
-    assertEqualsExactType(0, message.getExtension(optionalPublicImportMessageExtensionLite).getE());
-    assertEqualsExactType(0, message.getExtension(optionalLazyMessageExtensionLite).getBb());
-    assertEqualsExactType(
-        0, message.getExtension(optionalUnverifiedLazyMessageExtensionLite).getBb());
-
-    // Enums without defaults are set to the first value in the enum.
-    assertEqualsExactType(
-        TestAllTypesLite.NestedEnum.FOO, message.getExtension(optionalNestedEnumExtensionLite));
-    assertEqualsExactType(
-        ForeignEnumLite.FOREIGN_LITE_FOO, message.getExtension(optionalForeignEnumExtensionLite));
-    assertEqualsExactType(
-        ImportEnumLite.IMPORT_LITE_FOO, message.getExtension(optionalImportEnumExtensionLite));
-
-    assertEqualsExactType("", message.getExtension(optionalStringPieceExtensionLite));
-    assertEqualsExactType("", message.getExtension(optionalCordExtensionLite));
-
-    // Repeated fields are empty.
-    Assert.assertEquals(0, message.getExtensionCount(repeatedInt32ExtensionLite));
-    Assert.assertEquals(0, message.getExtensionCount(repeatedInt64ExtensionLite));
-    Assert.assertEquals(0, message.getExtensionCount(repeatedUint32ExtensionLite));
-    Assert.assertEquals(0, message.getExtensionCount(repeatedUint64ExtensionLite));
-    Assert.assertEquals(0, message.getExtensionCount(repeatedSint32ExtensionLite));
-    Assert.assertEquals(0, message.getExtensionCount(repeatedSint64ExtensionLite));
-    Assert.assertEquals(0, message.getExtensionCount(repeatedFixed32ExtensionLite));
-    Assert.assertEquals(0, message.getExtensionCount(repeatedFixed64ExtensionLite));
-    Assert.assertEquals(0, message.getExtensionCount(repeatedSfixed32ExtensionLite));
-    Assert.assertEquals(0, message.getExtensionCount(repeatedSfixed64ExtensionLite));
-    Assert.assertEquals(0, message.getExtensionCount(repeatedFloatExtensionLite));
-    Assert.assertEquals(0, message.getExtensionCount(repeatedDoubleExtensionLite));
-    Assert.assertEquals(0, message.getExtensionCount(repeatedBoolExtensionLite));
-    Assert.assertEquals(0, message.getExtensionCount(repeatedStringExtensionLite));
-    Assert.assertEquals(0, message.getExtensionCount(repeatedBytesExtensionLite));
-
-    Assert.assertEquals(0, message.getExtensionCount(repeatedGroupExtensionLite));
-    Assert.assertEquals(0, message.getExtensionCount(repeatedNestedMessageExtensionLite));
-    Assert.assertEquals(0, message.getExtensionCount(repeatedForeignMessageExtensionLite));
-    Assert.assertEquals(0, message.getExtensionCount(repeatedImportMessageExtensionLite));
-    Assert.assertEquals(0, message.getExtensionCount(repeatedLazyMessageExtensionLite));
-    Assert.assertEquals(0, message.getExtensionCount(repeatedNestedEnumExtensionLite));
-    Assert.assertEquals(0, message.getExtensionCount(repeatedForeignEnumExtensionLite));
-    Assert.assertEquals(0, message.getExtensionCount(repeatedImportEnumExtensionLite));
-
-    Assert.assertEquals(0, message.getExtensionCount(repeatedStringPieceExtensionLite));
-    Assert.assertEquals(0, message.getExtensionCount(repeatedCordExtensionLite));
-
-    // hasBlah() should also be false for all default fields.
-    Assert.assertFalse(message.hasExtension(defaultInt32ExtensionLite));
-    Assert.assertFalse(message.hasExtension(defaultInt64ExtensionLite));
-    Assert.assertFalse(message.hasExtension(defaultUint32ExtensionLite));
-    Assert.assertFalse(message.hasExtension(defaultUint64ExtensionLite));
-    Assert.assertFalse(message.hasExtension(defaultSint32ExtensionLite));
-    Assert.assertFalse(message.hasExtension(defaultSint64ExtensionLite));
-    Assert.assertFalse(message.hasExtension(defaultFixed32ExtensionLite));
-    Assert.assertFalse(message.hasExtension(defaultFixed64ExtensionLite));
-    Assert.assertFalse(message.hasExtension(defaultSfixed32ExtensionLite));
-    Assert.assertFalse(message.hasExtension(defaultSfixed64ExtensionLite));
-    Assert.assertFalse(message.hasExtension(defaultFloatExtensionLite));
-    Assert.assertFalse(message.hasExtension(defaultDoubleExtensionLite));
-    Assert.assertFalse(message.hasExtension(defaultBoolExtensionLite));
-    Assert.assertFalse(message.hasExtension(defaultStringExtensionLite));
-    Assert.assertFalse(message.hasExtension(defaultBytesExtensionLite));
-
-    Assert.assertFalse(message.hasExtension(defaultNestedEnumExtensionLite));
-    Assert.assertFalse(message.hasExtension(defaultForeignEnumExtensionLite));
-    Assert.assertFalse(message.hasExtension(defaultImportEnumExtensionLite));
-
-    Assert.assertFalse(message.hasExtension(defaultStringPieceExtensionLite));
-    Assert.assertFalse(message.hasExtension(defaultCordExtensionLite));
-
-    // Fields with defaults have their default values (duh).
-    assertEqualsExactType(41, message.getExtension(defaultInt32ExtensionLite));
-    assertEqualsExactType(42L, message.getExtension(defaultInt64ExtensionLite));
-    assertEqualsExactType(43, message.getExtension(defaultUint32ExtensionLite));
-    assertEqualsExactType(44L, message.getExtension(defaultUint64ExtensionLite));
-    assertEqualsExactType(-45, message.getExtension(defaultSint32ExtensionLite));
-    assertEqualsExactType(46L, message.getExtension(defaultSint64ExtensionLite));
-    assertEqualsExactType(47, message.getExtension(defaultFixed32ExtensionLite));
-    assertEqualsExactType(48L, message.getExtension(defaultFixed64ExtensionLite));
-    assertEqualsExactType(49, message.getExtension(defaultSfixed32ExtensionLite));
-    assertEqualsExactType(-50L, message.getExtension(defaultSfixed64ExtensionLite));
-    assertEqualsExactType(51.5F, message.getExtension(defaultFloatExtensionLite));
-    assertEqualsExactType(52e3D, message.getExtension(defaultDoubleExtensionLite));
-    assertEqualsExactType(true, message.getExtension(defaultBoolExtensionLite));
-    assertEqualsExactType("hello", message.getExtension(defaultStringExtensionLite));
-    assertEqualsExactType(toBytes("world"), message.getExtension(defaultBytesExtensionLite));
-
-    assertEqualsExactType(
-        TestAllTypesLite.NestedEnum.BAR, message.getExtension(defaultNestedEnumExtensionLite));
-    assertEqualsExactType(
-        ForeignEnumLite.FOREIGN_LITE_BAR, message.getExtension(defaultForeignEnumExtensionLite));
-    assertEqualsExactType(
-        ImportEnumLite.IMPORT_LITE_BAR, message.getExtension(defaultImportEnumExtensionLite));
-
-    assertEqualsExactType("abc", message.getExtension(defaultStringPieceExtensionLite));
-    assertEqualsExactType("123", message.getExtension(defaultCordExtensionLite));
-
-    Assert.assertFalse(message.hasExtension(oneofUint32ExtensionLite));
-    Assert.assertFalse(message.hasExtension(oneofNestedMessageExtensionLite));
-    Assert.assertFalse(message.hasExtension(oneofStringExtensionLite));
-    Assert.assertFalse(message.hasExtension(oneofBytesExtensionLite));
-  }
-
-  // -------------------------------------------------------------------
-
-  /**
-   * Assert (using {@code junit.framework.Assert}} that all extensions of {@code message} are set to
-   * the values assigned by {@code setAllExtensions} followed by {@code modifyRepeatedExtensions}.
-   */
-  public static void assertRepeatedExtensionsModified(TestAllExtensionsLiteOrBuilder message) {
-    // ModifyRepeatedFields only sets the second repeated element of each
-    // field.  In addition to verifying this, we also verify that the first
-    // element and size were *not* modified.
-    Assert.assertEquals(2, message.getExtensionCount(repeatedInt32ExtensionLite));
-    Assert.assertEquals(2, message.getExtensionCount(repeatedInt64ExtensionLite));
-    Assert.assertEquals(2, message.getExtensionCount(repeatedUint32ExtensionLite));
-    Assert.assertEquals(2, message.getExtensionCount(repeatedUint64ExtensionLite));
-    Assert.assertEquals(2, message.getExtensionCount(repeatedSint32ExtensionLite));
-    Assert.assertEquals(2, message.getExtensionCount(repeatedSint64ExtensionLite));
-    Assert.assertEquals(2, message.getExtensionCount(repeatedFixed32ExtensionLite));
-    Assert.assertEquals(2, message.getExtensionCount(repeatedFixed64ExtensionLite));
-    Assert.assertEquals(2, message.getExtensionCount(repeatedSfixed32ExtensionLite));
-    Assert.assertEquals(2, message.getExtensionCount(repeatedSfixed64ExtensionLite));
-    Assert.assertEquals(2, message.getExtensionCount(repeatedFloatExtensionLite));
-    Assert.assertEquals(2, message.getExtensionCount(repeatedDoubleExtensionLite));
-    Assert.assertEquals(2, message.getExtensionCount(repeatedBoolExtensionLite));
-    Assert.assertEquals(2, message.getExtensionCount(repeatedStringExtensionLite));
-    Assert.assertEquals(2, message.getExtensionCount(repeatedBytesExtensionLite));
-
-    Assert.assertEquals(2, message.getExtensionCount(repeatedGroupExtensionLite));
-    Assert.assertEquals(2, message.getExtensionCount(repeatedNestedMessageExtensionLite));
-    Assert.assertEquals(2, message.getExtensionCount(repeatedForeignMessageExtensionLite));
-    Assert.assertEquals(2, message.getExtensionCount(repeatedImportMessageExtensionLite));
-    Assert.assertEquals(2, message.getExtensionCount(repeatedLazyMessageExtensionLite));
-    Assert.assertEquals(2, message.getExtensionCount(repeatedNestedEnumExtensionLite));
-    Assert.assertEquals(2, message.getExtensionCount(repeatedForeignEnumExtensionLite));
-    Assert.assertEquals(2, message.getExtensionCount(repeatedImportEnumExtensionLite));
-
-    Assert.assertEquals(2, message.getExtensionCount(repeatedStringPieceExtensionLite));
-    Assert.assertEquals(2, message.getExtensionCount(repeatedCordExtensionLite));
-
-    assertEqualsExactType(201, message.getExtension(repeatedInt32ExtensionLite, 0));
-    assertEqualsExactType(202L, message.getExtension(repeatedInt64ExtensionLite, 0));
-    assertEqualsExactType(203, message.getExtension(repeatedUint32ExtensionLite, 0));
-    assertEqualsExactType(204L, message.getExtension(repeatedUint64ExtensionLite, 0));
-    assertEqualsExactType(205, message.getExtension(repeatedSint32ExtensionLite, 0));
-    assertEqualsExactType(206L, message.getExtension(repeatedSint64ExtensionLite, 0));
-    assertEqualsExactType(207, message.getExtension(repeatedFixed32ExtensionLite, 0));
-    assertEqualsExactType(208L, message.getExtension(repeatedFixed64ExtensionLite, 0));
-    assertEqualsExactType(209, message.getExtension(repeatedSfixed32ExtensionLite, 0));
-    assertEqualsExactType(210L, message.getExtension(repeatedSfixed64ExtensionLite, 0));
-    assertEqualsExactType(211F, message.getExtension(repeatedFloatExtensionLite, 0));
-    assertEqualsExactType(212D, message.getExtension(repeatedDoubleExtensionLite, 0));
-    assertEqualsExactType(true, message.getExtension(repeatedBoolExtensionLite, 0));
-    assertEqualsExactType("215", message.getExtension(repeatedStringExtensionLite, 0));
-    assertEqualsExactType(toBytes("216"), message.getExtension(repeatedBytesExtensionLite, 0));
-
-    assertEqualsExactType(217, message.getExtension(repeatedGroupExtensionLite, 0).getA());
-    assertEqualsExactType(218, message.getExtension(repeatedNestedMessageExtensionLite, 0).getBb());
-    assertEqualsExactType(219, message.getExtension(repeatedForeignMessageExtensionLite, 0).getC());
-    assertEqualsExactType(220, message.getExtension(repeatedImportMessageExtensionLite, 0).getD());
-    assertEqualsExactType(227, message.getExtension(repeatedLazyMessageExtensionLite, 0).getBb());
-
-    assertEqualsExactType(
-        TestAllTypesLite.NestedEnum.BAR, message.getExtension(repeatedNestedEnumExtensionLite, 0));
-    assertEqualsExactType(
-        ForeignEnumLite.FOREIGN_LITE_BAR,
-        message.getExtension(repeatedForeignEnumExtensionLite, 0));
-    assertEqualsExactType(
-        ImportEnumLite.IMPORT_LITE_BAR, message.getExtension(repeatedImportEnumExtensionLite, 0));
-
-    assertEqualsExactType("224", message.getExtension(repeatedStringPieceExtensionLite, 0));
-    assertEqualsExactType("225", message.getExtension(repeatedCordExtensionLite, 0));
-
-    // Actually verify the second (modified) elements now.
-    assertEqualsExactType(501, message.getExtension(repeatedInt32ExtensionLite, 1));
-    assertEqualsExactType(502L, message.getExtension(repeatedInt64ExtensionLite, 1));
-    assertEqualsExactType(503, message.getExtension(repeatedUint32ExtensionLite, 1));
-    assertEqualsExactType(504L, message.getExtension(repeatedUint64ExtensionLite, 1));
-    assertEqualsExactType(505, message.getExtension(repeatedSint32ExtensionLite, 1));
-    assertEqualsExactType(506L, message.getExtension(repeatedSint64ExtensionLite, 1));
-    assertEqualsExactType(507, message.getExtension(repeatedFixed32ExtensionLite, 1));
-    assertEqualsExactType(508L, message.getExtension(repeatedFixed64ExtensionLite, 1));
-    assertEqualsExactType(509, message.getExtension(repeatedSfixed32ExtensionLite, 1));
-    assertEqualsExactType(510L, message.getExtension(repeatedSfixed64ExtensionLite, 1));
-    assertEqualsExactType(511F, message.getExtension(repeatedFloatExtensionLite, 1));
-    assertEqualsExactType(512D, message.getExtension(repeatedDoubleExtensionLite, 1));
-    assertEqualsExactType(true, message.getExtension(repeatedBoolExtensionLite, 1));
-    assertEqualsExactType("515", message.getExtension(repeatedStringExtensionLite, 1));
-    assertEqualsExactType(toBytes("516"), message.getExtension(repeatedBytesExtensionLite, 1));
-
-    assertEqualsExactType(517, message.getExtension(repeatedGroupExtensionLite, 1).getA());
-    assertEqualsExactType(518, message.getExtension(repeatedNestedMessageExtensionLite, 1).getBb());
-    assertEqualsExactType(519, message.getExtension(repeatedForeignMessageExtensionLite, 1).getC());
-    assertEqualsExactType(520, message.getExtension(repeatedImportMessageExtensionLite, 1).getD());
-    assertEqualsExactType(527, message.getExtension(repeatedLazyMessageExtensionLite, 1).getBb());
-
-    assertEqualsExactType(
-        TestAllTypesLite.NestedEnum.FOO, message.getExtension(repeatedNestedEnumExtensionLite, 1));
-    assertEqualsExactType(
-        ForeignEnumLite.FOREIGN_LITE_FOO,
-        message.getExtension(repeatedForeignEnumExtensionLite, 1));
-    assertEqualsExactType(
-        ImportEnumLite.IMPORT_LITE_FOO, message.getExtension(repeatedImportEnumExtensionLite, 1));
-
-    assertEqualsExactType("524", message.getExtension(repeatedStringPieceExtensionLite, 1));
-    assertEqualsExactType("525", message.getExtension(repeatedCordExtensionLite, 1));
-  }
-
-  public static void assertPackedExtensionsSet(TestPackedExtensionsLite message) {
-    Assert.assertEquals(2, message.getExtensionCount(packedInt32ExtensionLite));
-    Assert.assertEquals(2, message.getExtensionCount(packedInt64ExtensionLite));
-    Assert.assertEquals(2, message.getExtensionCount(packedUint32ExtensionLite));
-    Assert.assertEquals(2, message.getExtensionCount(packedUint64ExtensionLite));
-    Assert.assertEquals(2, message.getExtensionCount(packedSint32ExtensionLite));
-    Assert.assertEquals(2, message.getExtensionCount(packedSint64ExtensionLite));
-    Assert.assertEquals(2, message.getExtensionCount(packedFixed32ExtensionLite));
-    Assert.assertEquals(2, message.getExtensionCount(packedFixed64ExtensionLite));
-    Assert.assertEquals(2, message.getExtensionCount(packedSfixed32ExtensionLite));
-    Assert.assertEquals(2, message.getExtensionCount(packedSfixed64ExtensionLite));
-    Assert.assertEquals(2, message.getExtensionCount(packedFloatExtensionLite));
-    Assert.assertEquals(2, message.getExtensionCount(packedDoubleExtensionLite));
-    Assert.assertEquals(2, message.getExtensionCount(packedBoolExtensionLite));
-    Assert.assertEquals(2, message.getExtensionCount(packedEnumExtensionLite));
-    assertEqualsExactType(601, message.getExtension(packedInt32ExtensionLite, 0));
-    assertEqualsExactType(602L, message.getExtension(packedInt64ExtensionLite, 0));
-    assertEqualsExactType(603, message.getExtension(packedUint32ExtensionLite, 0));
-    assertEqualsExactType(604L, message.getExtension(packedUint64ExtensionLite, 0));
-    assertEqualsExactType(605, message.getExtension(packedSint32ExtensionLite, 0));
-    assertEqualsExactType(606L, message.getExtension(packedSint64ExtensionLite, 0));
-    assertEqualsExactType(607, message.getExtension(packedFixed32ExtensionLite, 0));
-    assertEqualsExactType(608L, message.getExtension(packedFixed64ExtensionLite, 0));
-    assertEqualsExactType(609, message.getExtension(packedSfixed32ExtensionLite, 0));
-    assertEqualsExactType(610L, message.getExtension(packedSfixed64ExtensionLite, 0));
-    assertEqualsExactType(611F, message.getExtension(packedFloatExtensionLite, 0));
-    assertEqualsExactType(612D, message.getExtension(packedDoubleExtensionLite, 0));
-    assertEqualsExactType(true, message.getExtension(packedBoolExtensionLite, 0));
-    assertEqualsExactType(
-        ForeignEnumLite.FOREIGN_LITE_BAR, message.getExtension(packedEnumExtensionLite, 0));
-    assertEqualsExactType(701, message.getExtension(packedInt32ExtensionLite, 1));
-    assertEqualsExactType(702L, message.getExtension(packedInt64ExtensionLite, 1));
-    assertEqualsExactType(703, message.getExtension(packedUint32ExtensionLite, 1));
-    assertEqualsExactType(704L, message.getExtension(packedUint64ExtensionLite, 1));
-    assertEqualsExactType(705, message.getExtension(packedSint32ExtensionLite, 1));
-    assertEqualsExactType(706L, message.getExtension(packedSint64ExtensionLite, 1));
-    assertEqualsExactType(707, message.getExtension(packedFixed32ExtensionLite, 1));
-    assertEqualsExactType(708L, message.getExtension(packedFixed64ExtensionLite, 1));
-    assertEqualsExactType(709, message.getExtension(packedSfixed32ExtensionLite, 1));
-    assertEqualsExactType(710L, message.getExtension(packedSfixed64ExtensionLite, 1));
-    assertEqualsExactType(711F, message.getExtension(packedFloatExtensionLite, 1));
-    assertEqualsExactType(712D, message.getExtension(packedDoubleExtensionLite, 1));
-    assertEqualsExactType(false, message.getExtension(packedBoolExtensionLite, 1));
-    assertEqualsExactType(
-        ForeignEnumLite.FOREIGN_LITE_BAZ, message.getExtension(packedEnumExtensionLite, 1));
-  }
-
-  // ===================================================================
-  // oneof
-  public static void setOneof(TestOneof2.Builder message) {
-    message.setFooLazyMessage(TestOneof2.NestedMessage.newBuilder().setMooInt(100).build());
-    message.setBarString("101");
-    message.setBazInt(102);
-    message.setBazString("103");
-  }
-
-  public static void assertOneofSet(TestOneof2 message) {
-    Assert.assertTrue(message.hasFooLazyMessage());
-    Assert.assertTrue(message.getFooLazyMessage().hasMooInt());
-
-    Assert.assertTrue(message.hasBarString());
-    Assert.assertTrue(message.hasBazInt());
-    Assert.assertTrue(message.hasBazString());
-
-    Assert.assertEquals(100, message.getFooLazyMessage().getMooInt());
-    Assert.assertEquals("101", message.getBarString());
-    Assert.assertEquals(102, message.getBazInt());
-    Assert.assertEquals("103", message.getBazString());
-  }
-
-  public static void assertAtMostOneFieldSetOneof(TestOneof2 message) {
-    int count = 0;
-    if (message.hasFooInt()) {
-      ++count;
-    }
-    if (message.hasFooString()) {
-      ++count;
-    }
-    if (message.hasFooCord()) {
-      ++count;
-    }
-    if (message.hasFooStringPiece()) {
-      ++count;
-    }
-    if (message.hasFooBytes()) {
-      ++count;
-    }
-    if (message.hasFooEnum()) {
-      ++count;
-    }
-    if (message.hasFooMessage()) {
-      ++count;
-    }
-    if (message.hasFooGroup()) {
-      ++count;
-    }
-    if (message.hasFooLazyMessage()) {
-      ++count;
-    }
-    Assert.assertTrue(count <= 1);
-
-    count = 0;
-    if (message.hasBarInt()) {
-      ++count;
-    }
-    if (message.hasBarString()) {
-      ++count;
-    }
-    if (message.hasBarCord()) {
-      ++count;
-    }
-    if (message.hasBarStringPiece()) {
-      ++count;
-    }
-    if (message.hasBarBytes()) {
-      ++count;
-    }
-    if (message.hasBarEnum()) {
-      ++count;
-    }
-    Assert.assertTrue(count <= 1);
-
-    switch (message.getFooCase()) {
-      case FOO_INT:
-        Assert.assertTrue(message.hasFooInt());
-        break;
-      case FOO_STRING:
-        Assert.assertTrue(message.hasFooString());
-        break;
-      case FOO_CORD:
-        Assert.assertTrue(message.hasFooCord());
-        break;
-      case FOO_STRING_PIECE:
-        Assert.assertTrue(message.hasFooStringPiece());
-        break;
-      case FOO_BYTES:
-        Assert.assertTrue(message.hasFooBytes());
-        break;
-      case FOO_ENUM:
-        Assert.assertTrue(message.hasFooEnum());
-        break;
-      case FOO_MESSAGE:
-        Assert.assertTrue(message.hasFooMessage());
-        break;
-      case FOOGROUP:
-        Assert.assertTrue(message.hasFooGroup());
-        break;
-      case FOO_LAZY_MESSAGE:
-        Assert.assertTrue(message.hasFooLazyMessage());
-        break;
-      case FOO_NOT_SET:
-        break;
-        // TODO(b/18683919): go/enum-switch-lsc
-    }
-  }
-
-  // =================================================================
-  // BEGIN FULL-RUNTIME
-
-  /**
-   * Performs the same things that the methods of {@code TestUtil} do, but via the reflection
-   * interface. This is its own class because it needs to know what descriptor to use.
-   */
-  public static class ReflectionTester {
-    private final Descriptors.Descriptor baseDescriptor;
-    private final ExtensionRegistry extensionRegistry;
-
-    private final Descriptors.FileDescriptor file;
-    private final Descriptors.FileDescriptor importFile;
-    private final Descriptors.FileDescriptor publicImportFile;
-
-    private final Descriptors.Descriptor optionalGroup;
-    private final Descriptors.Descriptor repeatedGroup;
-    private final Descriptors.Descriptor nestedMessage;
-    private final Descriptors.Descriptor foreignMessage;
-    private final Descriptors.Descriptor importMessage;
-    private final Descriptors.Descriptor publicImportMessage;
-
-    private final Descriptors.FieldDescriptor groupA;
-    private final Descriptors.FieldDescriptor repeatedGroupA;
-    private final Descriptors.FieldDescriptor nestedB;
-    private final Descriptors.FieldDescriptor foreignC;
-    private final Descriptors.FieldDescriptor importD;
-    private final Descriptors.FieldDescriptor importE;
-
-    private final Descriptors.EnumDescriptor nestedEnum;
-    private final Descriptors.EnumDescriptor foreignEnum;
-    private final Descriptors.EnumDescriptor importEnum;
-
-    private final Descriptors.EnumValueDescriptor nestedFoo;
-    private final Descriptors.EnumValueDescriptor nestedBar;
-    private final Descriptors.EnumValueDescriptor nestedBaz;
-    private final Descriptors.EnumValueDescriptor foreignFoo;
-    private final Descriptors.EnumValueDescriptor foreignBar;
-    private final Descriptors.EnumValueDescriptor foreignBaz;
-    private final Descriptors.EnumValueDescriptor importFoo;
-    private final Descriptors.EnumValueDescriptor importBar;
-    private final Descriptors.EnumValueDescriptor importBaz;
-
-    /**
-     * Construct a {@code ReflectionTester} that will expect messages using the given descriptor.
-     *
-     * <p>Normally {@code baseDescriptor} should be a descriptor for the type {@code TestAllTypes},
-     * defined in {@code google/protobuf/unittest.proto}. However, if {@code extensionRegistry}
-     * is non-null, then {@code baseDescriptor} should be for {@code TestAllExtensions} instead, and
-     * instead of reading and writing normal fields, the tester will read and write extensions. All
-     * of {@code TestAllExtensions}' extensions must be registered in the registry.
-     */
-    public ReflectionTester(
-        Descriptors.Descriptor baseDescriptor, ExtensionRegistry extensionRegistry) {
-      this.baseDescriptor = baseDescriptor;
-      this.extensionRegistry = extensionRegistry;
-
-      this.file = baseDescriptor.getFile();
-      Assert.assertEquals(1, file.getDependencies().size());
-      this.importFile = file.getDependencies().get(0);
-      this.publicImportFile = importFile.getDependencies().get(0);
-
-      Descriptors.Descriptor testAllTypes;
-      if ("TestAllTypes".equals(baseDescriptor.getName())) {
-        testAllTypes = baseDescriptor;
-      } else {
-        testAllTypes = file.findMessageTypeByName("TestAllTypes");
-        Assert.assertNotNull(testAllTypes);
-      }
-
-      if (extensionRegistry == null) {
-        // Use testAllTypes, rather than baseDescriptor, to allow
-        // initialization using TestPackedTypes descriptors. These objects
-        // won't be used by the methods for packed fields.
-        this.optionalGroup = testAllTypes.findNestedTypeByName("OptionalGroup");
-        this.repeatedGroup = testAllTypes.findNestedTypeByName("RepeatedGroup");
-      } else {
-        this.optionalGroup = file.findMessageTypeByName("OptionalGroup_extension");
-        this.repeatedGroup = file.findMessageTypeByName("RepeatedGroup_extension");
-      }
-      this.nestedMessage = testAllTypes.findNestedTypeByName("NestedMessage");
-      this.foreignMessage = file.findMessageTypeByName("ForeignMessage");
-      this.importMessage = importFile.findMessageTypeByName("ImportMessage");
-      this.publicImportMessage = publicImportFile.findMessageTypeByName("PublicImportMessage");
-
-      this.nestedEnum = testAllTypes.findEnumTypeByName("NestedEnum");
-      this.foreignEnum = file.findEnumTypeByName("ForeignEnum");
-      this.importEnum = importFile.findEnumTypeByName("ImportEnum");
-
-      Assert.assertNotNull(optionalGroup);
-      Assert.assertNotNull(repeatedGroup);
-      Assert.assertNotNull(nestedMessage);
-      Assert.assertNotNull(foreignMessage);
-      Assert.assertNotNull(importMessage);
-      Assert.assertNotNull(nestedEnum);
-      Assert.assertNotNull(foreignEnum);
-      Assert.assertNotNull(importEnum);
-
-      this.nestedB = nestedMessage.findFieldByName("bb");
-      this.foreignC = foreignMessage.findFieldByName("c");
-      this.importD = importMessage.findFieldByName("d");
-      this.importE = publicImportMessage.findFieldByName("e");
-      this.nestedFoo = nestedEnum.findValueByName("FOO");
-      this.nestedBar = nestedEnum.findValueByName("BAR");
-      this.nestedBaz = nestedEnum.findValueByName("BAZ");
-      this.foreignFoo = foreignEnum.findValueByName("FOREIGN_FOO");
-      this.foreignBar = foreignEnum.findValueByName("FOREIGN_BAR");
-      this.foreignBaz = foreignEnum.findValueByName("FOREIGN_BAZ");
-      this.importFoo = importEnum.findValueByName("IMPORT_FOO");
-      this.importBar = importEnum.findValueByName("IMPORT_BAR");
-      this.importBaz = importEnum.findValueByName("IMPORT_BAZ");
-
-      this.groupA = optionalGroup.findFieldByName("a");
-      this.repeatedGroupA = repeatedGroup.findFieldByName("a");
-
-      Assert.assertNotNull(groupA);
-      Assert.assertNotNull(repeatedGroupA);
-      Assert.assertNotNull(nestedB);
-      Assert.assertNotNull(foreignC);
-      Assert.assertNotNull(importD);
-      Assert.assertNotNull(importE);
-      Assert.assertNotNull(nestedFoo);
-      Assert.assertNotNull(nestedBar);
-      Assert.assertNotNull(nestedBaz);
-      Assert.assertNotNull(foreignFoo);
-      Assert.assertNotNull(foreignBar);
-      Assert.assertNotNull(foreignBaz);
-      Assert.assertNotNull(importFoo);
-      Assert.assertNotNull(importBar);
-      Assert.assertNotNull(importBaz);
-    }
-
-    /** Shorthand to get a FieldDescriptor for a field of unittest::TestAllTypes. */
-    Descriptors.FieldDescriptor f(String name) {
-      Descriptors.FieldDescriptor result;
-      if (extensionRegistry == null) {
-        result = baseDescriptor.findFieldByName(name);
-      } else {
-        result = file.findExtensionByName(name + "_extension");
-      }
-      Assert.assertNotNull(result);
-      return result;
-    }
-
-    /**
-     * Calls {@code parent.newBuilderForField()} or uses the {@code ExtensionRegistry} to find an
-     * appropriate builder, depending on what type is being tested.
-     */
-    private Message.Builder newBuilderForField(
-        Message.Builder parent, Descriptors.FieldDescriptor field) {
-      if (extensionRegistry == null) {
-        return parent.newBuilderForField(field);
-      } else {
-        ExtensionRegistry.ExtensionInfo extension =
-            extensionRegistry.findImmutableExtensionByNumber(
-                field.getContainingType(), field.getNumber());
-        Assert.assertNotNull(extension);
-        Assert.assertNotNull(extension.defaultInstance);
-        return extension.defaultInstance.newBuilderForType();
-      }
-    }
-
-    // -------------------------------------------------------------------
-
-    /**
-     * Set every field of {@code message} to the values expected by {@code assertAllFieldsSet()},
-     * using the {@link Message.Builder} reflection interface.
-     */
-    void setAllFieldsViaReflection(Message.Builder message) {
-      message.setField(f("optional_int32"), 101);
-      message.setField(f("optional_int64"), 102L);
-      message.setField(f("optional_uint32"), 103);
-      message.setField(f("optional_uint64"), 104L);
-      message.setField(f("optional_sint32"), 105);
-      message.setField(f("optional_sint64"), 106L);
-      message.setField(f("optional_fixed32"), 107);
-      message.setField(f("optional_fixed64"), 108L);
-      message.setField(f("optional_sfixed32"), 109);
-      message.setField(f("optional_sfixed64"), 110L);
-      message.setField(f("optional_float"), 111F);
-      message.setField(f("optional_double"), 112D);
-      message.setField(f("optional_bool"), true);
-      message.setField(f("optional_string"), "115");
-      message.setField(f("optional_bytes"), toBytes("116"));
-
-      message.setField(
-          f("optionalgroup"),
-          newBuilderForField(message, f("optionalgroup")).setField(groupA, 117).build());
-      message.setField(
-          f("optional_nested_message"),
-          newBuilderForField(message, f("optional_nested_message")).setField(nestedB, 118).build());
-      message.setField(
-          f("optional_foreign_message"),
-          newBuilderForField(message, f("optional_foreign_message"))
-              .setField(foreignC, 119)
-              .build());
-      message.setField(
-          f("optional_import_message"),
-          newBuilderForField(message, f("optional_import_message")).setField(importD, 120).build());
-      message.setField(
-          f("optional_public_import_message"),
-          newBuilderForField(message, f("optional_public_import_message"))
-              .setField(importE, 126)
-              .build());
-      message.setField(
-          f("optional_lazy_message"),
-          newBuilderForField(message, f("optional_lazy_message")).setField(nestedB, 127).build());
-      message.setField(
-          f("optional_unverified_lazy_message"),
-          newBuilderForField(message, f("optional_unverified_lazy_message"))
-              .setField(nestedB, 128)
-              .build());
-
-      message.setField(f("optional_nested_enum"), nestedBaz);
-      message.setField(f("optional_foreign_enum"), foreignBaz);
-      message.setField(f("optional_import_enum"), importBaz);
-
-      message.setField(f("optional_string_piece"), "124");
-      message.setField(f("optional_cord"), "125");
-
-      // -----------------------------------------------------------------
-
-      message.addRepeatedField(f("repeated_int32"), 201);
-      message.addRepeatedField(f("repeated_int64"), 202L);
-      message.addRepeatedField(f("repeated_uint32"), 203);
-      message.addRepeatedField(f("repeated_uint64"), 204L);
-      message.addRepeatedField(f("repeated_sint32"), 205);
-      message.addRepeatedField(f("repeated_sint64"), 206L);
-      message.addRepeatedField(f("repeated_fixed32"), 207);
-      message.addRepeatedField(f("repeated_fixed64"), 208L);
-      message.addRepeatedField(f("repeated_sfixed32"), 209);
-      message.addRepeatedField(f("repeated_sfixed64"), 210L);
-      message.addRepeatedField(f("repeated_float"), 211F);
-      message.addRepeatedField(f("repeated_double"), 212D);
-      message.addRepeatedField(f("repeated_bool"), true);
-      message.addRepeatedField(f("repeated_string"), "215");
-      message.addRepeatedField(f("repeated_bytes"), toBytes("216"));
-
-      message.addRepeatedField(
-          f("repeatedgroup"),
-          newBuilderForField(message, f("repeatedgroup")).setField(repeatedGroupA, 217).build());
-      message.addRepeatedField(
-          f("repeated_nested_message"),
-          newBuilderForField(message, f("repeated_nested_message")).setField(nestedB, 218).build());
-      message.addRepeatedField(
-          f("repeated_foreign_message"),
-          newBuilderForField(message, f("repeated_foreign_message"))
-              .setField(foreignC, 219)
-              .build());
-      message.addRepeatedField(
-          f("repeated_import_message"),
-          newBuilderForField(message, f("repeated_import_message")).setField(importD, 220).build());
-      message.addRepeatedField(
-          f("repeated_lazy_message"),
-          newBuilderForField(message, f("repeated_lazy_message")).setField(nestedB, 227).build());
-
-      message.addRepeatedField(f("repeated_nested_enum"), nestedBar);
-      message.addRepeatedField(f("repeated_foreign_enum"), foreignBar);
-      message.addRepeatedField(f("repeated_import_enum"), importBar);
-
-      message.addRepeatedField(f("repeated_string_piece"), "224");
-      message.addRepeatedField(f("repeated_cord"), "225");
-
-      // Add a second one of each field.
-      message.addRepeatedField(f("repeated_int32"), 301);
-      message.addRepeatedField(f("repeated_int64"), 302L);
-      message.addRepeatedField(f("repeated_uint32"), 303);
-      message.addRepeatedField(f("repeated_uint64"), 304L);
-      message.addRepeatedField(f("repeated_sint32"), 305);
-      message.addRepeatedField(f("repeated_sint64"), 306L);
-      message.addRepeatedField(f("repeated_fixed32"), 307);
-      message.addRepeatedField(f("repeated_fixed64"), 308L);
-      message.addRepeatedField(f("repeated_sfixed32"), 309);
-      message.addRepeatedField(f("repeated_sfixed64"), 310L);
-      message.addRepeatedField(f("repeated_float"), 311F);
-      message.addRepeatedField(f("repeated_double"), 312D);
-      message.addRepeatedField(f("repeated_bool"), false);
-      message.addRepeatedField(f("repeated_string"), "315");
-      message.addRepeatedField(f("repeated_bytes"), toBytes("316"));
-
-      message.addRepeatedField(
-          f("repeatedgroup"),
-          newBuilderForField(message, f("repeatedgroup")).setField(repeatedGroupA, 317).build());
-      message.addRepeatedField(
-          f("repeated_nested_message"),
-          newBuilderForField(message, f("repeated_nested_message")).setField(nestedB, 318).build());
-      message.addRepeatedField(
-          f("repeated_foreign_message"),
-          newBuilderForField(message, f("repeated_foreign_message"))
-              .setField(foreignC, 319)
-              .build());
-      message.addRepeatedField(
-          f("repeated_import_message"),
-          newBuilderForField(message, f("repeated_import_message")).setField(importD, 320).build());
-      message.addRepeatedField(
-          f("repeated_lazy_message"),
-          newBuilderForField(message, f("repeated_lazy_message")).setField(nestedB, 327).build());
-
-      message.addRepeatedField(f("repeated_nested_enum"), nestedBaz);
-      message.addRepeatedField(f("repeated_foreign_enum"), foreignBaz);
-      message.addRepeatedField(f("repeated_import_enum"), importBaz);
-
-      message.addRepeatedField(f("repeated_string_piece"), "324");
-      message.addRepeatedField(f("repeated_cord"), "325");
-
-      // -----------------------------------------------------------------
-
-      message.setField(f("default_int32"), 401);
-      message.setField(f("default_int64"), 402L);
-      message.setField(f("default_uint32"), 403);
-      message.setField(f("default_uint64"), 404L);
-      message.setField(f("default_sint32"), 405);
-      message.setField(f("default_sint64"), 406L);
-      message.setField(f("default_fixed32"), 407);
-      message.setField(f("default_fixed64"), 408L);
-      message.setField(f("default_sfixed32"), 409);
-      message.setField(f("default_sfixed64"), 410L);
-      message.setField(f("default_float"), 411F);
-      message.setField(f("default_double"), 412D);
-      message.setField(f("default_bool"), false);
-      message.setField(f("default_string"), "415");
-      message.setField(f("default_bytes"), toBytes("416"));
-
-      message.setField(f("default_nested_enum"), nestedFoo);
-      message.setField(f("default_foreign_enum"), foreignFoo);
-      message.setField(f("default_import_enum"), importFoo);
-
-      message.setField(f("default_string_piece"), "424");
-      message.setField(f("default_cord"), "425");
-
-      message.setField(f("oneof_uint32"), 601);
-      message.setField(
-          f("oneof_nested_message"),
-          newBuilderForField(message, f("oneof_nested_message")).setField(nestedB, 602).build());
-      message.setField(f("oneof_string"), "603");
-      message.setField(f("oneof_bytes"), toBytes("604"));
-    }
-
-    // -------------------------------------------------------------------
-
-    /**
-     * Modify the repeated fields of {@code message} to contain the values expected by {@code
-     * assertRepeatedFieldsModified()}, using the {@link Message.Builder} reflection interface.
-     */
-    void modifyRepeatedFieldsViaReflection(Message.Builder message) {
-      message.setRepeatedField(f("repeated_int32"), 1, 501);
-      message.setRepeatedField(f("repeated_int64"), 1, 502L);
-      message.setRepeatedField(f("repeated_uint32"), 1, 503);
-      message.setRepeatedField(f("repeated_uint64"), 1, 504L);
-      message.setRepeatedField(f("repeated_sint32"), 1, 505);
-      message.setRepeatedField(f("repeated_sint64"), 1, 506L);
-      message.setRepeatedField(f("repeated_fixed32"), 1, 507);
-      message.setRepeatedField(f("repeated_fixed64"), 1, 508L);
-      message.setRepeatedField(f("repeated_sfixed32"), 1, 509);
-      message.setRepeatedField(f("repeated_sfixed64"), 1, 510L);
-      message.setRepeatedField(f("repeated_float"), 1, 511F);
-      message.setRepeatedField(f("repeated_double"), 1, 512D);
-      message.setRepeatedField(f("repeated_bool"), 1, true);
-      message.setRepeatedField(f("repeated_string"), 1, "515");
-      message.setRepeatedField(f("repeated_bytes"), 1, toBytes("516"));
-
-      message.setRepeatedField(
-          f("repeatedgroup"),
-          1,
-          newBuilderForField(message, f("repeatedgroup")).setField(repeatedGroupA, 517).build());
-      message.setRepeatedField(
-          f("repeated_nested_message"),
-          1,
-          newBuilderForField(message, f("repeated_nested_message")).setField(nestedB, 518).build());
-      message.setRepeatedField(
-          f("repeated_foreign_message"),
-          1,
-          newBuilderForField(message, f("repeated_foreign_message"))
-              .setField(foreignC, 519)
-              .build());
-      message.setRepeatedField(
-          f("repeated_import_message"),
-          1,
-          newBuilderForField(message, f("repeated_import_message")).setField(importD, 520).build());
-      message.setRepeatedField(
-          f("repeated_lazy_message"),
-          1,
-          newBuilderForField(message, f("repeated_lazy_message")).setField(nestedB, 527).build());
-
-      message.setRepeatedField(f("repeated_nested_enum"), 1, nestedFoo);
-      message.setRepeatedField(f("repeated_foreign_enum"), 1, foreignFoo);
-      message.setRepeatedField(f("repeated_import_enum"), 1, importFoo);
-
-      message.setRepeatedField(f("repeated_string_piece"), 1, "524");
-      message.setRepeatedField(f("repeated_cord"), 1, "525");
-    }
-
-    // -------------------------------------------------------------------
-
-    /**
-     * Assert (using {@code junit.framework.Assert}} that all fields of {@code message} are set to
-     * the values assigned by {@code setAllFields}, using the {@link Message} reflection interface.
-     */
-    public void assertAllFieldsSetViaReflection(MessageOrBuilder message) {
-      Assert.assertTrue(message.hasField(f("optional_int32")));
-      Assert.assertTrue(message.hasField(f("optional_int64")));
-      Assert.assertTrue(message.hasField(f("optional_uint32")));
-      Assert.assertTrue(message.hasField(f("optional_uint64")));
-      Assert.assertTrue(message.hasField(f("optional_sint32")));
-      Assert.assertTrue(message.hasField(f("optional_sint64")));
-      Assert.assertTrue(message.hasField(f("optional_fixed32")));
-      Assert.assertTrue(message.hasField(f("optional_fixed64")));
-      Assert.assertTrue(message.hasField(f("optional_sfixed32")));
-      Assert.assertTrue(message.hasField(f("optional_sfixed64")));
-      Assert.assertTrue(message.hasField(f("optional_float")));
-      Assert.assertTrue(message.hasField(f("optional_double")));
-      Assert.assertTrue(message.hasField(f("optional_bool")));
-      Assert.assertTrue(message.hasField(f("optional_string")));
-      Assert.assertTrue(message.hasField(f("optional_bytes")));
-
-      Assert.assertTrue(message.hasField(f("optionalgroup")));
-      Assert.assertTrue(message.hasField(f("optional_nested_message")));
-      Assert.assertTrue(message.hasField(f("optional_foreign_message")));
-      Assert.assertTrue(message.hasField(f("optional_import_message")));
-
-      Assert.assertTrue(((Message) message.getField(f("optionalgroup"))).hasField(groupA));
-      Assert.assertTrue(
-          ((Message) message.getField(f("optional_nested_message"))).hasField(nestedB));
-      Assert.assertTrue(
-          ((Message) message.getField(f("optional_foreign_message"))).hasField(foreignC));
-      Assert.assertTrue(
-          ((Message) message.getField(f("optional_import_message"))).hasField(importD));
-
-      Assert.assertTrue(message.hasField(f("optional_nested_enum")));
-      Assert.assertTrue(message.hasField(f("optional_foreign_enum")));
-      Assert.assertTrue(message.hasField(f("optional_import_enum")));
-
-      Assert.assertTrue(message.hasField(f("optional_string_piece")));
-      Assert.assertTrue(message.hasField(f("optional_cord")));
-
-      Assert.assertEquals(101, message.getField(f("optional_int32")));
-      Assert.assertEquals(102L, message.getField(f("optional_int64")));
-      Assert.assertEquals(103, message.getField(f("optional_uint32")));
-      Assert.assertEquals(104L, message.getField(f("optional_uint64")));
-      Assert.assertEquals(105, message.getField(f("optional_sint32")));
-      Assert.assertEquals(106L, message.getField(f("optional_sint64")));
-      Assert.assertEquals(107, message.getField(f("optional_fixed32")));
-      Assert.assertEquals(108L, message.getField(f("optional_fixed64")));
-      Assert.assertEquals(109, message.getField(f("optional_sfixed32")));
-      Assert.assertEquals(110L, message.getField(f("optional_sfixed64")));
-      Assert.assertEquals(111F, message.getField(f("optional_float")));
-      Assert.assertEquals(112D, message.getField(f("optional_double")));
-      Assert.assertEquals(true, message.getField(f("optional_bool")));
-      Assert.assertEquals("115", message.getField(f("optional_string")));
-      Assert.assertEquals(toBytes("116"), message.getField(f("optional_bytes")));
-
-      Assert.assertEquals(117, ((Message) message.getField(f("optionalgroup"))).getField(groupA));
-      Assert.assertEquals(
-          118, ((Message) message.getField(f("optional_nested_message"))).getField(nestedB));
-      Assert.assertEquals(
-          119, ((Message) message.getField(f("optional_foreign_message"))).getField(foreignC));
-      Assert.assertEquals(
-          120, ((Message) message.getField(f("optional_import_message"))).getField(importD));
-      Assert.assertEquals(
-          126, ((Message) message.getField(f("optional_public_import_message"))).getField(importE));
-      Assert.assertEquals(
-          127, ((Message) message.getField(f("optional_lazy_message"))).getField(nestedB));
-      Assert.assertEquals(
-          128,
-          ((Message) message.getField(f("optional_unverified_lazy_message"))).getField(nestedB));
-
-      Assert.assertEquals(nestedBaz, message.getField(f("optional_nested_enum")));
-      Assert.assertEquals(foreignBaz, message.getField(f("optional_foreign_enum")));
-      Assert.assertEquals(importBaz, message.getField(f("optional_import_enum")));
-
-      Assert.assertEquals("124", message.getField(f("optional_string_piece")));
-      Assert.assertEquals("125", message.getField(f("optional_cord")));
-
-      // -----------------------------------------------------------------
-
-      Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_int32")));
-      Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_int64")));
-      Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_uint32")));
-      Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_uint64")));
-      Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_sint32")));
-      Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_sint64")));
-      Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_fixed32")));
-      Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_fixed64")));
-      Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_sfixed32")));
-      Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_sfixed64")));
-      Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_float")));
-      Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_double")));
-      Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_bool")));
-      Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_string")));
-      Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_bytes")));
-
-      Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeatedgroup")));
-      Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_nested_message")));
-      Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_foreign_message")));
-      Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_import_message")));
-      Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_lazy_message")));
-      Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_nested_enum")));
-      Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_foreign_enum")));
-      Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_import_enum")));
-
-      Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_string_piece")));
-      Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_cord")));
-
-      Assert.assertEquals(201, message.getRepeatedField(f("repeated_int32"), 0));
-      Assert.assertEquals(202L, message.getRepeatedField(f("repeated_int64"), 0));
-      Assert.assertEquals(203, message.getRepeatedField(f("repeated_uint32"), 0));
-      Assert.assertEquals(204L, message.getRepeatedField(f("repeated_uint64"), 0));
-      Assert.assertEquals(205, message.getRepeatedField(f("repeated_sint32"), 0));
-      Assert.assertEquals(206L, message.getRepeatedField(f("repeated_sint64"), 0));
-      Assert.assertEquals(207, message.getRepeatedField(f("repeated_fixed32"), 0));
-      Assert.assertEquals(208L, message.getRepeatedField(f("repeated_fixed64"), 0));
-      Assert.assertEquals(209, message.getRepeatedField(f("repeated_sfixed32"), 0));
-      Assert.assertEquals(210L, message.getRepeatedField(f("repeated_sfixed64"), 0));
-      Assert.assertEquals(211F, message.getRepeatedField(f("repeated_float"), 0));
-      Assert.assertEquals(212D, message.getRepeatedField(f("repeated_double"), 0));
-      Assert.assertEquals(true, message.getRepeatedField(f("repeated_bool"), 0));
-      Assert.assertEquals("215", message.getRepeatedField(f("repeated_string"), 0));
-      Assert.assertEquals(toBytes("216"), message.getRepeatedField(f("repeated_bytes"), 0));
-
-      Assert.assertEquals(
-          217,
-          ((Message) message.getRepeatedField(f("repeatedgroup"), 0)).getField(repeatedGroupA));
-      Assert.assertEquals(
-          218,
-          ((Message) message.getRepeatedField(f("repeated_nested_message"), 0)).getField(nestedB));
-      Assert.assertEquals(
-          219,
-          ((Message) message.getRepeatedField(f("repeated_foreign_message"), 0))
-              .getField(foreignC));
-      Assert.assertEquals(
-          220,
-          ((Message) message.getRepeatedField(f("repeated_import_message"), 0)).getField(importD));
-      Assert.assertEquals(
-          227,
-          ((Message) message.getRepeatedField(f("repeated_lazy_message"), 0)).getField(nestedB));
-
-      Assert.assertEquals(nestedBar, message.getRepeatedField(f("repeated_nested_enum"), 0));
-      Assert.assertEquals(foreignBar, message.getRepeatedField(f("repeated_foreign_enum"), 0));
-      Assert.assertEquals(importBar, message.getRepeatedField(f("repeated_import_enum"), 0));
-
-      Assert.assertEquals("224", message.getRepeatedField(f("repeated_string_piece"), 0));
-      Assert.assertEquals("225", message.getRepeatedField(f("repeated_cord"), 0));
-
-      Assert.assertEquals(301, message.getRepeatedField(f("repeated_int32"), 1));
-      Assert.assertEquals(302L, message.getRepeatedField(f("repeated_int64"), 1));
-      Assert.assertEquals(303, message.getRepeatedField(f("repeated_uint32"), 1));
-      Assert.assertEquals(304L, message.getRepeatedField(f("repeated_uint64"), 1));
-      Assert.assertEquals(305, message.getRepeatedField(f("repeated_sint32"), 1));
-      Assert.assertEquals(306L, message.getRepeatedField(f("repeated_sint64"), 1));
-      Assert.assertEquals(307, message.getRepeatedField(f("repeated_fixed32"), 1));
-      Assert.assertEquals(308L, message.getRepeatedField(f("repeated_fixed64"), 1));
-      Assert.assertEquals(309, message.getRepeatedField(f("repeated_sfixed32"), 1));
-      Assert.assertEquals(310L, message.getRepeatedField(f("repeated_sfixed64"), 1));
-      Assert.assertEquals(311F, message.getRepeatedField(f("repeated_float"), 1));
-      Assert.assertEquals(312D, message.getRepeatedField(f("repeated_double"), 1));
-      Assert.assertEquals(false, message.getRepeatedField(f("repeated_bool"), 1));
-      Assert.assertEquals("315", message.getRepeatedField(f("repeated_string"), 1));
-      Assert.assertEquals(toBytes("316"), message.getRepeatedField(f("repeated_bytes"), 1));
-
-      Assert.assertEquals(
-          317,
-          ((Message) message.getRepeatedField(f("repeatedgroup"), 1)).getField(repeatedGroupA));
-      Assert.assertEquals(
-          318,
-          ((Message) message.getRepeatedField(f("repeated_nested_message"), 1)).getField(nestedB));
-      Assert.assertEquals(
-          319,
-          ((Message) message.getRepeatedField(f("repeated_foreign_message"), 1))
-              .getField(foreignC));
-      Assert.assertEquals(
-          320,
-          ((Message) message.getRepeatedField(f("repeated_import_message"), 1)).getField(importD));
-      Assert.assertEquals(
-          327,
-          ((Message) message.getRepeatedField(f("repeated_lazy_message"), 1)).getField(nestedB));
-
-      Assert.assertEquals(nestedBaz, message.getRepeatedField(f("repeated_nested_enum"), 1));
-      Assert.assertEquals(foreignBaz, message.getRepeatedField(f("repeated_foreign_enum"), 1));
-      Assert.assertEquals(importBaz, message.getRepeatedField(f("repeated_import_enum"), 1));
-
-      Assert.assertEquals("324", message.getRepeatedField(f("repeated_string_piece"), 1));
-      Assert.assertEquals("325", message.getRepeatedField(f("repeated_cord"), 1));
-
-      // -----------------------------------------------------------------
-
-      Assert.assertTrue(message.hasField(f("default_int32")));
-      Assert.assertTrue(message.hasField(f("default_int64")));
-      Assert.assertTrue(message.hasField(f("default_uint32")));
-      Assert.assertTrue(message.hasField(f("default_uint64")));
-      Assert.assertTrue(message.hasField(f("default_sint32")));
-      Assert.assertTrue(message.hasField(f("default_sint64")));
-      Assert.assertTrue(message.hasField(f("default_fixed32")));
-      Assert.assertTrue(message.hasField(f("default_fixed64")));
-      Assert.assertTrue(message.hasField(f("default_sfixed32")));
-      Assert.assertTrue(message.hasField(f("default_sfixed64")));
-      Assert.assertTrue(message.hasField(f("default_float")));
-      Assert.assertTrue(message.hasField(f("default_double")));
-      Assert.assertTrue(message.hasField(f("default_bool")));
-      Assert.assertTrue(message.hasField(f("default_string")));
-      Assert.assertTrue(message.hasField(f("default_bytes")));
-
-      Assert.assertTrue(message.hasField(f("default_nested_enum")));
-      Assert.assertTrue(message.hasField(f("default_foreign_enum")));
-      Assert.assertTrue(message.hasField(f("default_import_enum")));
-
-      Assert.assertTrue(message.hasField(f("default_string_piece")));
-      Assert.assertTrue(message.hasField(f("default_cord")));
-
-      Assert.assertEquals(401, message.getField(f("default_int32")));
-      Assert.assertEquals(402L, message.getField(f("default_int64")));
-      Assert.assertEquals(403, message.getField(f("default_uint32")));
-      Assert.assertEquals(404L, message.getField(f("default_uint64")));
-      Assert.assertEquals(405, message.getField(f("default_sint32")));
-      Assert.assertEquals(406L, message.getField(f("default_sint64")));
-      Assert.assertEquals(407, message.getField(f("default_fixed32")));
-      Assert.assertEquals(408L, message.getField(f("default_fixed64")));
-      Assert.assertEquals(409, message.getField(f("default_sfixed32")));
-      Assert.assertEquals(410L, message.getField(f("default_sfixed64")));
-      Assert.assertEquals(411F, message.getField(f("default_float")));
-      Assert.assertEquals(412D, message.getField(f("default_double")));
-      Assert.assertEquals(false, message.getField(f("default_bool")));
-      Assert.assertEquals("415", message.getField(f("default_string")));
-      Assert.assertEquals(toBytes("416"), message.getField(f("default_bytes")));
-
-      Assert.assertEquals(nestedFoo, message.getField(f("default_nested_enum")));
-      Assert.assertEquals(foreignFoo, message.getField(f("default_foreign_enum")));
-      Assert.assertEquals(importFoo, message.getField(f("default_import_enum")));
-
-      Assert.assertEquals("424", message.getField(f("default_string_piece")));
-      Assert.assertEquals("425", message.getField(f("default_cord")));
-
-      Assert.assertTrue(message.hasField(f("oneof_bytes")));
-      Assert.assertEquals(toBytes("604"), message.getField(f("oneof_bytes")));
-
-      if (extensionRegistry == null) {
-        Assert.assertFalse(message.hasField(f("oneof_uint32")));
-        Assert.assertFalse(message.hasField(f("oneof_nested_message")));
-        Assert.assertFalse(message.hasField(f("oneof_string")));
-      } else {
-        Assert.assertTrue(message.hasField(f("oneof_uint32")));
-        Assert.assertTrue(message.hasField(f("oneof_nested_message")));
-        Assert.assertTrue(message.hasField(f("oneof_string")));
-        Assert.assertEquals(601, message.getField(f("oneof_uint32")));
-        Assert.assertEquals(
-            602,
-            ((MessageOrBuilder) message.getField(f("oneof_nested_message"))).getField(nestedB));
-        Assert.assertEquals("603", message.getField(f("oneof_string")));
-      }
-    }
-
-    // -------------------------------------------------------------------
-
-    /**
-     * Assert (using {@code junit.framework.Assert}} that all fields of {@code message} are cleared,
-     * and that getting the fields returns their default values, using the {@link Message}
-     * reflection interface.
-     */
-    public void assertClearViaReflection(MessageOrBuilder message) {
-      // has_blah() should initially be false for all optional fields.
-      Assert.assertFalse(message.hasField(f("optional_int32")));
-      Assert.assertFalse(message.hasField(f("optional_int64")));
-      Assert.assertFalse(message.hasField(f("optional_uint32")));
-      Assert.assertFalse(message.hasField(f("optional_uint64")));
-      Assert.assertFalse(message.hasField(f("optional_sint32")));
-      Assert.assertFalse(message.hasField(f("optional_sint64")));
-      Assert.assertFalse(message.hasField(f("optional_fixed32")));
-      Assert.assertFalse(message.hasField(f("optional_fixed64")));
-      Assert.assertFalse(message.hasField(f("optional_sfixed32")));
-      Assert.assertFalse(message.hasField(f("optional_sfixed64")));
-      Assert.assertFalse(message.hasField(f("optional_float")));
-      Assert.assertFalse(message.hasField(f("optional_double")));
-      Assert.assertFalse(message.hasField(f("optional_bool")));
-      Assert.assertFalse(message.hasField(f("optional_string")));
-      Assert.assertFalse(message.hasField(f("optional_bytes")));
-
-      Assert.assertFalse(message.hasField(f("optionalgroup")));
-      Assert.assertFalse(message.hasField(f("optional_nested_message")));
-      Assert.assertFalse(message.hasField(f("optional_foreign_message")));
-      Assert.assertFalse(message.hasField(f("optional_import_message")));
-
-      Assert.assertFalse(message.hasField(f("optional_nested_enum")));
-      Assert.assertFalse(message.hasField(f("optional_foreign_enum")));
-      Assert.assertFalse(message.hasField(f("optional_import_enum")));
-
-      Assert.assertFalse(message.hasField(f("optional_string_piece")));
-      Assert.assertFalse(message.hasField(f("optional_cord")));
-
-      // Optional fields without defaults are set to zero or something like it.
-      Assert.assertEquals(0, message.getField(f("optional_int32")));
-      Assert.assertEquals(0L, message.getField(f("optional_int64")));
-      Assert.assertEquals(0, message.getField(f("optional_uint32")));
-      Assert.assertEquals(0L, message.getField(f("optional_uint64")));
-      Assert.assertEquals(0, message.getField(f("optional_sint32")));
-      Assert.assertEquals(0L, message.getField(f("optional_sint64")));
-      Assert.assertEquals(0, message.getField(f("optional_fixed32")));
-      Assert.assertEquals(0L, message.getField(f("optional_fixed64")));
-      Assert.assertEquals(0, message.getField(f("optional_sfixed32")));
-      Assert.assertEquals(0L, message.getField(f("optional_sfixed64")));
-      Assert.assertEquals(0F, message.getField(f("optional_float")));
-      Assert.assertEquals(0D, message.getField(f("optional_double")));
-      Assert.assertEquals(false, message.getField(f("optional_bool")));
-      Assert.assertEquals("", message.getField(f("optional_string")));
-      Assert.assertEquals(ByteString.EMPTY, message.getField(f("optional_bytes")));
-
-      // Embedded messages should also be clear.
-      Assert.assertFalse(((Message) message.getField(f("optionalgroup"))).hasField(groupA));
-      Assert.assertFalse(
-          ((Message) message.getField(f("optional_nested_message"))).hasField(nestedB));
-      Assert.assertFalse(
-          ((Message) message.getField(f("optional_foreign_message"))).hasField(foreignC));
-      Assert.assertFalse(
-          ((Message) message.getField(f("optional_import_message"))).hasField(importD));
-      Assert.assertFalse(
-          ((Message) message.getField(f("optional_public_import_message"))).hasField(importE));
-      Assert.assertFalse(
-          ((Message) message.getField(f("optional_lazy_message"))).hasField(nestedB));
-      Assert.assertFalse(
-          ((Message) message.getField(f("optional_unverified_lazy_message"))).hasField(nestedB));
-
-      Assert.assertEquals(0, ((Message) message.getField(f("optionalgroup"))).getField(groupA));
-      Assert.assertEquals(
-          0, ((Message) message.getField(f("optional_nested_message"))).getField(nestedB));
-      Assert.assertEquals(
-          0, ((Message) message.getField(f("optional_foreign_message"))).getField(foreignC));
-      Assert.assertEquals(
-          0, ((Message) message.getField(f("optional_import_message"))).getField(importD));
-      Assert.assertEquals(
-          0, ((Message) message.getField(f("optional_public_import_message"))).getField(importE));
-      Assert.assertEquals(
-          0, ((Message) message.getField(f("optional_lazy_message"))).getField(nestedB));
-      Assert.assertEquals(
-          0, ((Message) message.getField(f("optional_unverified_lazy_message"))).getField(nestedB));
-
-      // Enums without defaults are set to the first value in the enum.
-      Assert.assertEquals(nestedFoo, message.getField(f("optional_nested_enum")));
-      Assert.assertEquals(foreignFoo, message.getField(f("optional_foreign_enum")));
-      Assert.assertEquals(importFoo, message.getField(f("optional_import_enum")));
-
-      Assert.assertEquals("", message.getField(f("optional_string_piece")));
-      Assert.assertEquals("", message.getField(f("optional_cord")));
-
-      // Repeated fields are empty.
-      Assert.assertEquals(0, message.getRepeatedFieldCount(f("repeated_int32")));
-      Assert.assertEquals(0, message.getRepeatedFieldCount(f("repeated_int64")));
-      Assert.assertEquals(0, message.getRepeatedFieldCount(f("repeated_uint32")));
-      Assert.assertEquals(0, message.getRepeatedFieldCount(f("repeated_uint64")));
-      Assert.assertEquals(0, message.getRepeatedFieldCount(f("repeated_sint32")));
-      Assert.assertEquals(0, message.getRepeatedFieldCount(f("repeated_sint64")));
-      Assert.assertEquals(0, message.getRepeatedFieldCount(f("repeated_fixed32")));
-      Assert.assertEquals(0, message.getRepeatedFieldCount(f("repeated_fixed64")));
-      Assert.assertEquals(0, message.getRepeatedFieldCount(f("repeated_sfixed32")));
-      Assert.assertEquals(0, message.getRepeatedFieldCount(f("repeated_sfixed64")));
-      Assert.assertEquals(0, message.getRepeatedFieldCount(f("repeated_float")));
-      Assert.assertEquals(0, message.getRepeatedFieldCount(f("repeated_double")));
-      Assert.assertEquals(0, message.getRepeatedFieldCount(f("repeated_bool")));
-      Assert.assertEquals(0, message.getRepeatedFieldCount(f("repeated_string")));
-      Assert.assertEquals(0, message.getRepeatedFieldCount(f("repeated_bytes")));
-
-      Assert.assertEquals(0, message.getRepeatedFieldCount(f("repeatedgroup")));
-      Assert.assertEquals(0, message.getRepeatedFieldCount(f("repeated_nested_message")));
-      Assert.assertEquals(0, message.getRepeatedFieldCount(f("repeated_foreign_message")));
-      Assert.assertEquals(0, message.getRepeatedFieldCount(f("repeated_import_message")));
-      Assert.assertEquals(0, message.getRepeatedFieldCount(f("repeated_lazy_message")));
-      Assert.assertEquals(0, message.getRepeatedFieldCount(f("repeated_nested_enum")));
-      Assert.assertEquals(0, message.getRepeatedFieldCount(f("repeated_foreign_enum")));
-      Assert.assertEquals(0, message.getRepeatedFieldCount(f("repeated_import_enum")));
-
-      Assert.assertEquals(0, message.getRepeatedFieldCount(f("repeated_string_piece")));
-      Assert.assertEquals(0, message.getRepeatedFieldCount(f("repeated_cord")));
-
-      // has_blah() should also be false for all default fields.
-      Assert.assertFalse(message.hasField(f("default_int32")));
-      Assert.assertFalse(message.hasField(f("default_int64")));
-      Assert.assertFalse(message.hasField(f("default_uint32")));
-      Assert.assertFalse(message.hasField(f("default_uint64")));
-      Assert.assertFalse(message.hasField(f("default_sint32")));
-      Assert.assertFalse(message.hasField(f("default_sint64")));
-      Assert.assertFalse(message.hasField(f("default_fixed32")));
-      Assert.assertFalse(message.hasField(f("default_fixed64")));
-      Assert.assertFalse(message.hasField(f("default_sfixed32")));
-      Assert.assertFalse(message.hasField(f("default_sfixed64")));
-      Assert.assertFalse(message.hasField(f("default_float")));
-      Assert.assertFalse(message.hasField(f("default_double")));
-      Assert.assertFalse(message.hasField(f("default_bool")));
-      Assert.assertFalse(message.hasField(f("default_string")));
-      Assert.assertFalse(message.hasField(f("default_bytes")));
-
-      Assert.assertFalse(message.hasField(f("default_nested_enum")));
-      Assert.assertFalse(message.hasField(f("default_foreign_enum")));
-      Assert.assertFalse(message.hasField(f("default_import_enum")));
-
-      Assert.assertFalse(message.hasField(f("default_string_piece")));
-      Assert.assertFalse(message.hasField(f("default_cord")));
-
-      // Fields with defaults have their default values (duh).
-      Assert.assertEquals(41, message.getField(f("default_int32")));
-      Assert.assertEquals(42L, message.getField(f("default_int64")));
-      Assert.assertEquals(43, message.getField(f("default_uint32")));
-      Assert.assertEquals(44L, message.getField(f("default_uint64")));
-      Assert.assertEquals(-45, message.getField(f("default_sint32")));
-      Assert.assertEquals(46L, message.getField(f("default_sint64")));
-      Assert.assertEquals(47, message.getField(f("default_fixed32")));
-      Assert.assertEquals(48L, message.getField(f("default_fixed64")));
-      Assert.assertEquals(49, message.getField(f("default_sfixed32")));
-      Assert.assertEquals(-50L, message.getField(f("default_sfixed64")));
-      Assert.assertEquals(51.5F, message.getField(f("default_float")));
-      Assert.assertEquals(52e3D, message.getField(f("default_double")));
-      Assert.assertEquals(true, message.getField(f("default_bool")));
-      Assert.assertEquals("hello", message.getField(f("default_string")));
-      Assert.assertEquals(toBytes("world"), message.getField(f("default_bytes")));
-
-      Assert.assertEquals(nestedBar, message.getField(f("default_nested_enum")));
-      Assert.assertEquals(foreignBar, message.getField(f("default_foreign_enum")));
-      Assert.assertEquals(importBar, message.getField(f("default_import_enum")));
-
-      Assert.assertEquals("abc", message.getField(f("default_string_piece")));
-      Assert.assertEquals("123", message.getField(f("default_cord")));
-
-      Assert.assertFalse(message.hasField(f("oneof_uint32")));
-      Assert.assertFalse(message.hasField(f("oneof_nested_message")));
-      Assert.assertFalse(message.hasField(f("oneof_string")));
-      Assert.assertFalse(message.hasField(f("oneof_bytes")));
-
-      Assert.assertEquals(0, message.getField(f("oneof_uint32")));
-      Assert.assertEquals("", message.getField(f("oneof_string")));
-      Assert.assertEquals(toBytes(""), message.getField(f("oneof_bytes")));
-    }
-
-    // ---------------------------------------------------------------
-
-    public void assertRepeatedFieldsModifiedViaReflection(MessageOrBuilder message) {
-      // ModifyRepeatedFields only sets the second repeated element of each
-      // field.  In addition to verifying this, we also verify that the first
-      // element and size were *not* modified.
-      Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_int32")));
-      Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_int64")));
-      Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_uint32")));
-      Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_uint64")));
-      Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_sint32")));
-      Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_sint64")));
-      Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_fixed32")));
-      Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_fixed64")));
-      Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_sfixed32")));
-      Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_sfixed64")));
-      Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_float")));
-      Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_double")));
-      Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_bool")));
-      Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_string")));
-      Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_bytes")));
-
-      Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeatedgroup")));
-      Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_nested_message")));
-      Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_foreign_message")));
-      Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_import_message")));
-      Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_lazy_message")));
-      Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_nested_enum")));
-      Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_foreign_enum")));
-      Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_import_enum")));
-
-      Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_string_piece")));
-      Assert.assertEquals(2, message.getRepeatedFieldCount(f("repeated_cord")));
-
-      Assert.assertEquals(201, message.getRepeatedField(f("repeated_int32"), 0));
-      Assert.assertEquals(202L, message.getRepeatedField(f("repeated_int64"), 0));
-      Assert.assertEquals(203, message.getRepeatedField(f("repeated_uint32"), 0));
-      Assert.assertEquals(204L, message.getRepeatedField(f("repeated_uint64"), 0));
-      Assert.assertEquals(205, message.getRepeatedField(f("repeated_sint32"), 0));
-      Assert.assertEquals(206L, message.getRepeatedField(f("repeated_sint64"), 0));
-      Assert.assertEquals(207, message.getRepeatedField(f("repeated_fixed32"), 0));
-      Assert.assertEquals(208L, message.getRepeatedField(f("repeated_fixed64"), 0));
-      Assert.assertEquals(209, message.getRepeatedField(f("repeated_sfixed32"), 0));
-      Assert.assertEquals(210L, message.getRepeatedField(f("repeated_sfixed64"), 0));
-      Assert.assertEquals(211F, message.getRepeatedField(f("repeated_float"), 0));
-      Assert.assertEquals(212D, message.getRepeatedField(f("repeated_double"), 0));
-      Assert.assertEquals(true, message.getRepeatedField(f("repeated_bool"), 0));
-      Assert.assertEquals("215", message.getRepeatedField(f("repeated_string"), 0));
-      Assert.assertEquals(toBytes("216"), message.getRepeatedField(f("repeated_bytes"), 0));
-
-      Assert.assertEquals(
-          217,
-          ((Message) message.getRepeatedField(f("repeatedgroup"), 0)).getField(repeatedGroupA));
-      Assert.assertEquals(
-          218,
-          ((Message) message.getRepeatedField(f("repeated_nested_message"), 0)).getField(nestedB));
-      Assert.assertEquals(
-          219,
-          ((Message) message.getRepeatedField(f("repeated_foreign_message"), 0))
-              .getField(foreignC));
-      Assert.assertEquals(
-          220,
-          ((Message) message.getRepeatedField(f("repeated_import_message"), 0)).getField(importD));
-      Assert.assertEquals(
-          227,
-          ((Message) message.getRepeatedField(f("repeated_lazy_message"), 0)).getField(nestedB));
-
-      Assert.assertEquals(nestedBar, message.getRepeatedField(f("repeated_nested_enum"), 0));
-      Assert.assertEquals(foreignBar, message.getRepeatedField(f("repeated_foreign_enum"), 0));
-      Assert.assertEquals(importBar, message.getRepeatedField(f("repeated_import_enum"), 0));
-
-      Assert.assertEquals("224", message.getRepeatedField(f("repeated_string_piece"), 0));
-      Assert.assertEquals("225", message.getRepeatedField(f("repeated_cord"), 0));
-
-      Assert.assertEquals(501, message.getRepeatedField(f("repeated_int32"), 1));
-      Assert.assertEquals(502L, message.getRepeatedField(f("repeated_int64"), 1));
-      Assert.assertEquals(503, message.getRepeatedField(f("repeated_uint32"), 1));
-      Assert.assertEquals(504L, message.getRepeatedField(f("repeated_uint64"), 1));
-      Assert.assertEquals(505, message.getRepeatedField(f("repeated_sint32"), 1));
-      Assert.assertEquals(506L, message.getRepeatedField(f("repeated_sint64"), 1));
-      Assert.assertEquals(507, message.getRepeatedField(f("repeated_fixed32"), 1));
-      Assert.assertEquals(508L, message.getRepeatedField(f("repeated_fixed64"), 1));
-      Assert.assertEquals(509, message.getRepeatedField(f("repeated_sfixed32"), 1));
-      Assert.assertEquals(510L, message.getRepeatedField(f("repeated_sfixed64"), 1));
-      Assert.assertEquals(511F, message.getRepeatedField(f("repeated_float"), 1));
-      Assert.assertEquals(512D, message.getRepeatedField(f("repeated_double"), 1));
-      Assert.assertEquals(true, message.getRepeatedField(f("repeated_bool"), 1));
-      Assert.assertEquals("515", message.getRepeatedField(f("repeated_string"), 1));
-      Assert.assertEquals(toBytes("516"), message.getRepeatedField(f("repeated_bytes"), 1));
-
-      Assert.assertEquals(
-          517,
-          ((Message) message.getRepeatedField(f("repeatedgroup"), 1)).getField(repeatedGroupA));
-      Assert.assertEquals(
-          518,
-          ((Message) message.getRepeatedField(f("repeated_nested_message"), 1)).getField(nestedB));
-      Assert.assertEquals(
-          519,
-          ((Message) message.getRepeatedField(f("repeated_foreign_message"), 1))
-              .getField(foreignC));
-      Assert.assertEquals(
-          520,
-          ((Message) message.getRepeatedField(f("repeated_import_message"), 1)).getField(importD));
-      Assert.assertEquals(
-          527,
-          ((Message) message.getRepeatedField(f("repeated_lazy_message"), 1)).getField(nestedB));
-
-      Assert.assertEquals(nestedFoo, message.getRepeatedField(f("repeated_nested_enum"), 1));
-      Assert.assertEquals(foreignFoo, message.getRepeatedField(f("repeated_foreign_enum"), 1));
-      Assert.assertEquals(importFoo, message.getRepeatedField(f("repeated_import_enum"), 1));
-
-      Assert.assertEquals("524", message.getRepeatedField(f("repeated_string_piece"), 1));
-      Assert.assertEquals("525", message.getRepeatedField(f("repeated_cord"), 1));
-    }
-
-    public void setPackedFieldsViaReflection(Message.Builder message) {
-      message.addRepeatedField(f("packed_int32"), 601);
-      message.addRepeatedField(f("packed_int64"), 602L);
-      message.addRepeatedField(f("packed_uint32"), 603);
-      message.addRepeatedField(f("packed_uint64"), 604L);
-      message.addRepeatedField(f("packed_sint32"), 605);
-      message.addRepeatedField(f("packed_sint64"), 606L);
-      message.addRepeatedField(f("packed_fixed32"), 607);
-      message.addRepeatedField(f("packed_fixed64"), 608L);
-      message.addRepeatedField(f("packed_sfixed32"), 609);
-      message.addRepeatedField(f("packed_sfixed64"), 610L);
-      message.addRepeatedField(f("packed_float"), 611F);
-      message.addRepeatedField(f("packed_double"), 612D);
-      message.addRepeatedField(f("packed_bool"), true);
-      message.addRepeatedField(f("packed_enum"), foreignBar);
-      // Add a second one of each field.
-      message.addRepeatedField(f("packed_int32"), 701);
-      message.addRepeatedField(f("packed_int64"), 702L);
-      message.addRepeatedField(f("packed_uint32"), 703);
-      message.addRepeatedField(f("packed_uint64"), 704L);
-      message.addRepeatedField(f("packed_sint32"), 705);
-      message.addRepeatedField(f("packed_sint64"), 706L);
-      message.addRepeatedField(f("packed_fixed32"), 707);
-      message.addRepeatedField(f("packed_fixed64"), 708L);
-      message.addRepeatedField(f("packed_sfixed32"), 709);
-      message.addRepeatedField(f("packed_sfixed64"), 710L);
-      message.addRepeatedField(f("packed_float"), 711F);
-      message.addRepeatedField(f("packed_double"), 712D);
-      message.addRepeatedField(f("packed_bool"), false);
-      message.addRepeatedField(f("packed_enum"), foreignBaz);
-    }
-
-    public void assertPackedFieldsSetViaReflection(MessageOrBuilder message) {
-      Assert.assertEquals(2, message.getRepeatedFieldCount(f("packed_int32")));
-      Assert.assertEquals(2, message.getRepeatedFieldCount(f("packed_int64")));
-      Assert.assertEquals(2, message.getRepeatedFieldCount(f("packed_uint32")));
-      Assert.assertEquals(2, message.getRepeatedFieldCount(f("packed_uint64")));
-      Assert.assertEquals(2, message.getRepeatedFieldCount(f("packed_sint32")));
-      Assert.assertEquals(2, message.getRepeatedFieldCount(f("packed_sint64")));
-      Assert.assertEquals(2, message.getRepeatedFieldCount(f("packed_fixed32")));
-      Assert.assertEquals(2, message.getRepeatedFieldCount(f("packed_fixed64")));
-      Assert.assertEquals(2, message.getRepeatedFieldCount(f("packed_sfixed32")));
-      Assert.assertEquals(2, message.getRepeatedFieldCount(f("packed_sfixed64")));
-      Assert.assertEquals(2, message.getRepeatedFieldCount(f("packed_float")));
-      Assert.assertEquals(2, message.getRepeatedFieldCount(f("packed_double")));
-      Assert.assertEquals(2, message.getRepeatedFieldCount(f("packed_bool")));
-      Assert.assertEquals(2, message.getRepeatedFieldCount(f("packed_enum")));
-      Assert.assertEquals(601, message.getRepeatedField(f("packed_int32"), 0));
-      Assert.assertEquals(602L, message.getRepeatedField(f("packed_int64"), 0));
-      Assert.assertEquals(603, message.getRepeatedField(f("packed_uint32"), 0));
-      Assert.assertEquals(604L, message.getRepeatedField(f("packed_uint64"), 0));
-      Assert.assertEquals(605, message.getRepeatedField(f("packed_sint32"), 0));
-      Assert.assertEquals(606L, message.getRepeatedField(f("packed_sint64"), 0));
-      Assert.assertEquals(607, message.getRepeatedField(f("packed_fixed32"), 0));
-      Assert.assertEquals(608L, message.getRepeatedField(f("packed_fixed64"), 0));
-      Assert.assertEquals(609, message.getRepeatedField(f("packed_sfixed32"), 0));
-      Assert.assertEquals(610L, message.getRepeatedField(f("packed_sfixed64"), 0));
-      Assert.assertEquals(611F, message.getRepeatedField(f("packed_float"), 0));
-      Assert.assertEquals(612D, message.getRepeatedField(f("packed_double"), 0));
-      Assert.assertEquals(true, message.getRepeatedField(f("packed_bool"), 0));
-      Assert.assertEquals(foreignBar, message.getRepeatedField(f("packed_enum"), 0));
-      Assert.assertEquals(701, message.getRepeatedField(f("packed_int32"), 1));
-      Assert.assertEquals(702L, message.getRepeatedField(f("packed_int64"), 1));
-      Assert.assertEquals(703, message.getRepeatedField(f("packed_uint32"), 1));
-      Assert.assertEquals(704L, message.getRepeatedField(f("packed_uint64"), 1));
-      Assert.assertEquals(705, message.getRepeatedField(f("packed_sint32"), 1));
-      Assert.assertEquals(706L, message.getRepeatedField(f("packed_sint64"), 1));
-      Assert.assertEquals(707, message.getRepeatedField(f("packed_fixed32"), 1));
-      Assert.assertEquals(708L, message.getRepeatedField(f("packed_fixed64"), 1));
-      Assert.assertEquals(709, message.getRepeatedField(f("packed_sfixed32"), 1));
-      Assert.assertEquals(710L, message.getRepeatedField(f("packed_sfixed64"), 1));
-      Assert.assertEquals(711F, message.getRepeatedField(f("packed_float"), 1));
-      Assert.assertEquals(712D, message.getRepeatedField(f("packed_double"), 1));
-      Assert.assertEquals(false, message.getRepeatedField(f("packed_bool"), 1));
-      Assert.assertEquals(foreignBaz, message.getRepeatedField(f("packed_enum"), 1));
-    }
-
-    /**
-     * Verifies that the reflection setters for the given.Builder object throw a
-     * NullPointerException if they are passed a null value. Uses Assert to throw an appropriate
-     * assertion failure, if the condition is not verified.
-     */
-    public void assertReflectionSettersRejectNull(Message.Builder builder) throws Exception {
-      try {
-        builder.setField(f("optional_string"), null);
-        Assert.fail("Exception was not thrown");
-      } catch (NullPointerException e) {
-        // We expect this exception.
-      }
-      try {
-        builder.setField(f("optional_bytes"), null);
-        Assert.fail("Exception was not thrown");
-      } catch (NullPointerException e) {
-        // We expect this exception.
-      }
-      try {
-        builder.setField(f("optional_nested_enum"), null);
-        Assert.fail("Exception was not thrown");
-      } catch (NullPointerException e) {
-        // We expect this exception.
-      }
-      try {
-        builder.setField(f("optional_nested_message"), (TestAllTypes.NestedMessage) null);
-        Assert.fail("Exception was not thrown");
-      } catch (NullPointerException e) {
-        // We expect this exception.
-      }
-      try {
-        builder.setField(f("optional_nested_message"), (TestAllTypes.NestedMessage.Builder) null);
-        Assert.fail("Exception was not thrown");
-      } catch (NullPointerException e) {
-        // We expect this exception.
-      }
-
-      try {
-        builder.addRepeatedField(f("repeated_string"), null);
-        Assert.fail("Exception was not thrown");
-      } catch (NullPointerException e) {
-        // We expect this exception.
-      }
-      try {
-        builder.addRepeatedField(f("repeated_bytes"), null);
-        Assert.fail("Exception was not thrown");
-      } catch (NullPointerException e) {
-        // We expect this exception.
-      }
-      try {
-        builder.addRepeatedField(f("repeated_nested_enum"), null);
-        Assert.fail("Exception was not thrown");
-      } catch (NullPointerException e) {
-        // We expect this exception.
-      }
-      try {
-        builder.addRepeatedField(f("repeated_nested_message"), null);
-        Assert.fail("Exception was not thrown");
-      } catch (NullPointerException e) {
-        // We expect this exception.
-      }
-    }
-
-    /**
-     * Verifies that the reflection repeated setters for the given Builder object throw a
-     * NullPointerException if they are passed a null value. Uses Assert to throw an appropriate
-     * assertion failure, if the condition is not verified.
-     */
-    public void assertReflectionRepeatedSettersRejectNull(Message.Builder builder)
-        throws Exception {
-      builder.addRepeatedField(f("repeated_string"), "one");
-      try {
-        builder.setRepeatedField(f("repeated_string"), 0, null);
-        Assert.fail("Exception was not thrown");
-      } catch (NullPointerException e) {
-        // We expect this exception.
-      }
-
-      builder.addRepeatedField(f("repeated_bytes"), toBytes("one"));
-      try {
-        builder.setRepeatedField(f("repeated_bytes"), 0, null);
-        Assert.fail("Exception was not thrown");
-      } catch (NullPointerException e) {
-        // We expect this exception.
-      }
-
-      builder.addRepeatedField(f("repeated_nested_enum"), nestedBaz);
-      try {
-        builder.setRepeatedField(f("repeated_nested_enum"), 0, null);
-        Assert.fail("Exception was not thrown");
-      } catch (NullPointerException e) {
-        // We expect this exception.
-      }
-
-      builder.addRepeatedField(
-          f("repeated_nested_message"), TestAllTypes.NestedMessage.newBuilder().setBb(218).build());
-      try {
-        builder.setRepeatedField(f("repeated_nested_message"), 0, null);
-        Assert.fail("Exception was not thrown");
-      } catch (NullPointerException e) {
-        // We expect this exception.
-      }
-    }
-  }
-
-  /** @param filePath The path relative to {@link #getTestDataDir}. */
-  public static String readTextFromFile(String filePath) {
-    return readBytesFromFile(filePath)
-        .toStringUtf8()
-        .replace(System.getProperty("line.separator"), "\n");
-  }
-
-  private static File getTestDataDir() {
-    // Search each parent directory looking for "src/google/protobuf".
-    File ancestor = new File(System.getProperty("protobuf.dir", "."));
-    String initialPath = ancestor.getAbsolutePath();
-    try {
-      ancestor = ancestor.getCanonicalFile();
-    } catch (IOException e) {
-      throw new RuntimeException("Couldn't get canonical name of working directory.", e);
-    }
-
-    String srcRootCheck = "src/google/protobuf";
-
-    // If we're running w/ Bazel on Windows, we're not in a sandbox, so we
-    // we must change our source root check condition to find the true test data dir.
-    String testBinaryName = System.getenv("TEST_BINARY");
-    if (testBinaryName != null && testBinaryName.endsWith(".exe")) {
-      srcRootCheck = srcRootCheck + "/descriptor.cc";
-    }
-
-    while (ancestor != null && ancestor.exists()) {
-      // Identify the true source root.
-      if (new File(ancestor, srcRootCheck).exists()) {
-        return new File(ancestor, "src/google/protobuf/testdata");
-      }
-      ancestor = ancestor.getParentFile();
-    }
-
-    throw new RuntimeException(
-        "Could not find golden files.  This test must be run from within the "
-            + "protobuf source package so that it can read test data files from the "
-            + "C++ source tree: "
-            + initialPath);
-  }
-
-  /** @param filename The path relative to {@link #getTestDataDir}. */
-  public static ByteString readBytesFromFile(String filename) {
-    File fullPath = new File(getTestDataDir(), filename);
-    try {
-      RandomAccessFile file = new RandomAccessFile(fullPath, "r");
-      byte[] content = new byte[(int) file.length()];
-      file.readFully(content);
-      return ByteString.copyFrom(content);
-    } catch (IOException e) {
-      // Throw a RuntimeException here so that we can call this function from
-      // static initializers.
-      throw new IllegalArgumentException("Couldn't read file: " + fullPath.getPath(), e);
-    }
-  }
-  // END FULL-RUNTIME
-
-  private static ByteString readBytesFromResource(String name) {
-    try {
-      return ByteString.readFrom(TestUtil.class.getResourceAsStream(name));
-    } catch (IOException e) {
-      throw new RuntimeException(e);
-    }
-  }
-
-  /**
-   * Get the bytes of the "golden message". This is a serialized TestAllTypes with all fields set as
-   * they would be by {@link #setAllFields(TestAllTypes.Builder)}, but it is loaded from a file on
-   * disk rather than generated dynamically. The file is actually generated by C++ code, so testing
-   * against it verifies compatibility with C++.
-   */
-  public static ByteString getGoldenMessage() {
-    if (goldenMessage == null) {
-      goldenMessage =
-          readBytesFromResource("/google/protobuf/testdata/golden_message_oneof_implemented");
-    }
-    return goldenMessage;
-  }
-
-  private static ByteString goldenMessage = null;
-
-  /**
-   * Get the bytes of the "golden packed fields message". This is a serialized TestPackedTypes with
-   * all fields set as they would be by {@link #setPackedFields(TestPackedTypes.Builder)}, but it is
-   * loaded from a file on disk rather than generated dynamically. The file is actually generated by
-   * C++ code, so testing against it verifies compatibility with C++.
-   */
-  public static ByteString getGoldenPackedFieldsMessage() {
-    if (goldenPackedFieldsMessage == null) {
-      goldenPackedFieldsMessage =
-          readBytesFromResource("/google/protobuf/testdata/golden_packed_fields_message");
-    }
-    return goldenPackedFieldsMessage;
-  }
-
-  private static ByteString goldenPackedFieldsMessage = null;
-
-  // BEGIN FULL-RUNTIME
-  /**
-   * Mock implementation of {@link GeneratedMessage.BuilderParent} for testing.
-   *
-   * @author jonp@google.com (Jon Perlow)
-   */
-  public static class MockBuilderParent implements GeneratedMessage.BuilderParent {
-
-    private int invalidations;
-
-    @Override
-    public void markDirty() {
-      invalidations++;
-    }
-
-    public int getInvalidationCount() {
-      return invalidations;
-    }
-  }
-  // END FULL-RUNTIME
-
-  /** Helper class to test logged messages */
-  public static class TestLogHandler extends Handler {
-    /** We will keep a private list of all logged records */
-    private final List<LogRecord> list = new ArrayList<>();
-
-    /** Adds the most recently logged record to our list. */
-    @Override
-    public synchronized void publish(LogRecord record) {
-      list.add(record);
-    }
-
-    @Override
-    public void flush() {}
-
-    @Override
-    public void close() {}
-
-    /** Returns a snapshot of the logged records. */
-    public synchronized List<LogRecord> getStoredLogRecords() {
-      List<LogRecord> result = new ArrayList<>(list);
-      return Collections.unmodifiableList(result);
-    }
-  }
-}
diff --git a/libs/protobuf/java/core/src/test/java/com/google/protobuf/TestUtilLite.java b/libs/protobuf/java/core/src/test/java/com/google/protobuf/TestUtilLite.java
deleted file mode 100644
index dd8c11a..0000000
--- a/libs/protobuf/java/core/src/test/java/com/google/protobuf/TestUtilLite.java
+++ /dev/null
@@ -1,557 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.protobuf.UnittestLite.defaultBoolExtensionLite;
-import static com.google.protobuf.UnittestLite.defaultBytesExtensionLite;
-import static com.google.protobuf.UnittestLite.defaultCordExtensionLite;
-import static com.google.protobuf.UnittestLite.defaultDoubleExtensionLite;
-import static com.google.protobuf.UnittestLite.defaultFixed32ExtensionLite;
-import static com.google.protobuf.UnittestLite.defaultFixed64ExtensionLite;
-import static com.google.protobuf.UnittestLite.defaultFloatExtensionLite;
-import static com.google.protobuf.UnittestLite.defaultForeignEnumExtensionLite;
-import static com.google.protobuf.UnittestLite.defaultImportEnumExtensionLite;
-import static com.google.protobuf.UnittestLite.defaultInt32ExtensionLite;
-import static com.google.protobuf.UnittestLite.defaultInt64ExtensionLite;
-import static com.google.protobuf.UnittestLite.defaultNestedEnumExtensionLite;
-import static com.google.protobuf.UnittestLite.defaultSfixed32ExtensionLite;
-import static com.google.protobuf.UnittestLite.defaultSfixed64ExtensionLite;
-import static com.google.protobuf.UnittestLite.defaultSint32ExtensionLite;
-import static com.google.protobuf.UnittestLite.defaultSint64ExtensionLite;
-import static com.google.protobuf.UnittestLite.defaultStringExtensionLite;
-import static com.google.protobuf.UnittestLite.defaultStringPieceExtensionLite;
-import static com.google.protobuf.UnittestLite.defaultUint32ExtensionLite;
-import static com.google.protobuf.UnittestLite.defaultUint64ExtensionLite;
-import static com.google.protobuf.UnittestLite.oneofBytesExtensionLite;
-import static com.google.protobuf.UnittestLite.oneofNestedMessageExtensionLite;
-import static com.google.protobuf.UnittestLite.oneofStringExtensionLite;
-import static com.google.protobuf.UnittestLite.oneofUint32ExtensionLite;
-import static com.google.protobuf.UnittestLite.optionalBoolExtensionLite;
-import static com.google.protobuf.UnittestLite.optionalBytesExtensionLite;
-import static com.google.protobuf.UnittestLite.optionalCordExtensionLite;
-import static com.google.protobuf.UnittestLite.optionalDoubleExtensionLite;
-import static com.google.protobuf.UnittestLite.optionalFixed32ExtensionLite;
-import static com.google.protobuf.UnittestLite.optionalFixed64ExtensionLite;
-import static com.google.protobuf.UnittestLite.optionalFloatExtensionLite;
-import static com.google.protobuf.UnittestLite.optionalForeignEnumExtensionLite;
-import static com.google.protobuf.UnittestLite.optionalForeignMessageExtensionLite;
-import static com.google.protobuf.UnittestLite.optionalGroupExtensionLite;
-import static com.google.protobuf.UnittestLite.optionalImportEnumExtensionLite;
-import static com.google.protobuf.UnittestLite.optionalImportMessageExtensionLite;
-import static com.google.protobuf.UnittestLite.optionalInt32ExtensionLite;
-import static com.google.protobuf.UnittestLite.optionalInt64ExtensionLite;
-import static com.google.protobuf.UnittestLite.optionalLazyMessageExtensionLite;
-import static com.google.protobuf.UnittestLite.optionalNestedEnumExtensionLite;
-import static com.google.protobuf.UnittestLite.optionalNestedMessageExtensionLite;
-import static com.google.protobuf.UnittestLite.optionalPublicImportMessageExtensionLite;
-import static com.google.protobuf.UnittestLite.optionalSfixed32ExtensionLite;
-import static com.google.protobuf.UnittestLite.optionalSfixed64ExtensionLite;
-import static com.google.protobuf.UnittestLite.optionalSint32ExtensionLite;
-import static com.google.protobuf.UnittestLite.optionalSint64ExtensionLite;
-import static com.google.protobuf.UnittestLite.optionalStringExtensionLite;
-import static com.google.protobuf.UnittestLite.optionalStringPieceExtensionLite;
-import static com.google.protobuf.UnittestLite.optionalUint32ExtensionLite;
-import static com.google.protobuf.UnittestLite.optionalUint64ExtensionLite;
-import static com.google.protobuf.UnittestLite.optionalUnverifiedLazyMessageExtensionLite;
-import static com.google.protobuf.UnittestLite.packedBoolExtensionLite;
-import static com.google.protobuf.UnittestLite.packedDoubleExtensionLite;
-import static com.google.protobuf.UnittestLite.packedEnumExtensionLite;
-import static com.google.protobuf.UnittestLite.packedFixed32ExtensionLite;
-import static com.google.protobuf.UnittestLite.packedFixed64ExtensionLite;
-import static com.google.protobuf.UnittestLite.packedFloatExtensionLite;
-import static com.google.protobuf.UnittestLite.packedInt32ExtensionLite;
-import static com.google.protobuf.UnittestLite.packedInt64ExtensionLite;
-import static com.google.protobuf.UnittestLite.packedSfixed32ExtensionLite;
-import static com.google.protobuf.UnittestLite.packedSfixed64ExtensionLite;
-import static com.google.protobuf.UnittestLite.packedSint32ExtensionLite;
-import static com.google.protobuf.UnittestLite.packedSint64ExtensionLite;
-import static com.google.protobuf.UnittestLite.packedUint32ExtensionLite;
-import static com.google.protobuf.UnittestLite.packedUint64ExtensionLite;
-import static com.google.protobuf.UnittestLite.repeatedBoolExtensionLite;
-import static com.google.protobuf.UnittestLite.repeatedBytesExtensionLite;
-import static com.google.protobuf.UnittestLite.repeatedCordExtensionLite;
-import static com.google.protobuf.UnittestLite.repeatedDoubleExtensionLite;
-import static com.google.protobuf.UnittestLite.repeatedFixed32ExtensionLite;
-import static com.google.protobuf.UnittestLite.repeatedFixed64ExtensionLite;
-import static com.google.protobuf.UnittestLite.repeatedFloatExtensionLite;
-import static com.google.protobuf.UnittestLite.repeatedForeignEnumExtensionLite;
-import static com.google.protobuf.UnittestLite.repeatedForeignMessageExtensionLite;
-import static com.google.protobuf.UnittestLite.repeatedGroupExtensionLite;
-import static com.google.protobuf.UnittestLite.repeatedImportEnumExtensionLite;
-import static com.google.protobuf.UnittestLite.repeatedImportMessageExtensionLite;
-import static com.google.protobuf.UnittestLite.repeatedInt32ExtensionLite;
-import static com.google.protobuf.UnittestLite.repeatedInt64ExtensionLite;
-import static com.google.protobuf.UnittestLite.repeatedLazyMessageExtensionLite;
-import static com.google.protobuf.UnittestLite.repeatedNestedEnumExtensionLite;
-import static com.google.protobuf.UnittestLite.repeatedNestedMessageExtensionLite;
-import static com.google.protobuf.UnittestLite.repeatedSfixed32ExtensionLite;
-import static com.google.protobuf.UnittestLite.repeatedSfixed64ExtensionLite;
-import static com.google.protobuf.UnittestLite.repeatedSint32ExtensionLite;
-import static com.google.protobuf.UnittestLite.repeatedSint64ExtensionLite;
-import static com.google.protobuf.UnittestLite.repeatedStringExtensionLite;
-import static com.google.protobuf.UnittestLite.repeatedStringPieceExtensionLite;
-import static com.google.protobuf.UnittestLite.repeatedUint32ExtensionLite;
-import static com.google.protobuf.UnittestLite.repeatedUint64ExtensionLite;
-
-import com.google.protobuf.UnittestImportLite.ImportEnumLite;
-import com.google.protobuf.UnittestImportLite.ImportMessageLite;
-import com.google.protobuf.UnittestImportPublicLite.PublicImportMessageLite;
-import com.google.protobuf.UnittestLite.ForeignEnumLite;
-import com.google.protobuf.UnittestLite.ForeignMessageLite;
-import com.google.protobuf.UnittestLite.OptionalGroup_extension_lite;
-import com.google.protobuf.UnittestLite.RepeatedGroup_extension_lite;
-import com.google.protobuf.UnittestLite.TestAllExtensionsLite;
-import com.google.protobuf.UnittestLite.TestAllTypesLite;
-import com.google.protobuf.UnittestLite.TestPackedExtensionsLite;
-
-/**
- * Contains methods for setting fields of {@code TestAllTypesLite}, {@code TestAllExtensionsLite},
- * and {@code TestPackedExtensionsLite}. This is analogous to the functionality in TestUtil.java but
- * does not depend on the presence of any non-lite protos.
- *
- * <p>This code is not to be used outside of {@code com.google.protobuf} and subpackages.
- */
-public final class TestUtilLite {
-  private TestUtilLite() {}
-
-  /** Helper to convert a String to ByteString. */
-  public static ByteString toBytes(String str) {
-    return ByteString.copyFromUtf8(str);
-  }
-
-  /**
-   * Get a {@code TestAllTypesLite.Builder} with all fields set as they would be by {@link
-   * #setAllFields(TestAllTypesLite.Builder)}.
-   */
-  public static TestAllTypesLite.Builder getAllLiteSetBuilder() {
-    TestAllTypesLite.Builder builder = TestAllTypesLite.newBuilder();
-    setAllFields(builder);
-    return builder;
-  }
-
-  /**
-   * Get a {@code TestAllExtensionsLite} with all fields set as they would be by {@link
-   * #setAllExtensions(TestAllExtensionsLite.Builder)}.
-   */
-  public static TestAllExtensionsLite getAllLiteExtensionsSet() {
-    TestAllExtensionsLite.Builder builder = TestAllExtensionsLite.newBuilder();
-    setAllExtensions(builder);
-    return builder.build();
-  }
-
-  public static TestPackedExtensionsLite getLitePackedExtensionsSet() {
-    TestPackedExtensionsLite.Builder builder = TestPackedExtensionsLite.newBuilder();
-    setPackedExtensions(builder);
-    return builder.build();
-  }
-
-  /** Set every field of {@code builder} to the values expected by {@code assertAllFieldsSet()}. */
-  public static void setAllFields(TestAllTypesLite.Builder builder) {
-    builder.setOptionalInt32(101);
-    builder.setOptionalInt64(102);
-    builder.setOptionalUint32(103);
-    builder.setOptionalUint64(104);
-    builder.setOptionalSint32(105);
-    builder.setOptionalSint64(106);
-    builder.setOptionalFixed32(107);
-    builder.setOptionalFixed64(108);
-    builder.setOptionalSfixed32(109);
-    builder.setOptionalSfixed64(110);
-    builder.setOptionalFloat(111);
-    builder.setOptionalDouble(112);
-    builder.setOptionalBool(true);
-    builder.setOptionalString("115");
-    builder.setOptionalBytes(toBytes("116"));
-
-    builder.setOptionalGroup(TestAllTypesLite.OptionalGroup.newBuilder().setA(117).build());
-    builder.setOptionalNestedMessage(
-        TestAllTypesLite.NestedMessage.newBuilder().setBb(118).build());
-    builder.setOptionalForeignMessage(ForeignMessageLite.newBuilder().setC(119).build());
-    builder.setOptionalImportMessage(ImportMessageLite.newBuilder().setD(120).build());
-    builder.setOptionalPublicImportMessage(PublicImportMessageLite.newBuilder().setE(126).build());
-    builder.setOptionalLazyMessage(TestAllTypesLite.NestedMessage.newBuilder().setBb(127).build());
-    builder.setOptionalUnverifiedLazyMessage(
-        TestAllTypesLite.NestedMessage.newBuilder().setBb(128).build());
-
-    builder.setOptionalNestedEnum(TestAllTypesLite.NestedEnum.BAZ);
-    builder.setOptionalForeignEnum(ForeignEnumLite.FOREIGN_LITE_BAZ);
-    builder.setOptionalImportEnum(ImportEnumLite.IMPORT_LITE_BAZ);
-
-    builder.setOptionalStringPiece("124");
-    builder.setOptionalCord("125");
-
-    // -----------------------------------------------------------------
-
-    builder.addRepeatedInt32(201);
-    builder.addRepeatedInt64(202);
-    builder.addRepeatedUint32(203);
-    builder.addRepeatedUint64(204);
-    builder.addRepeatedSint32(205);
-    builder.addRepeatedSint64(206);
-    builder.addRepeatedFixed32(207);
-    builder.addRepeatedFixed64(208);
-    builder.addRepeatedSfixed32(209);
-    builder.addRepeatedSfixed64(210);
-    builder.addRepeatedFloat(211);
-    builder.addRepeatedDouble(212);
-    builder.addRepeatedBool(true);
-    builder.addRepeatedString("215");
-    builder.addRepeatedBytes(toBytes("216"));
-
-    builder.addRepeatedGroup(TestAllTypesLite.RepeatedGroup.newBuilder().setA(217).build());
-    builder.addRepeatedNestedMessage(
-        TestAllTypesLite.NestedMessage.newBuilder().setBb(218).build());
-    builder.addRepeatedForeignMessage(ForeignMessageLite.newBuilder().setC(219).build());
-    builder.addRepeatedImportMessage(ImportMessageLite.newBuilder().setD(220).build());
-    builder.addRepeatedLazyMessage(TestAllTypesLite.NestedMessage.newBuilder().setBb(227).build());
-
-    builder.addRepeatedNestedEnum(TestAllTypesLite.NestedEnum.BAR);
-    builder.addRepeatedForeignEnum(ForeignEnumLite.FOREIGN_LITE_BAR);
-    builder.addRepeatedImportEnum(ImportEnumLite.IMPORT_LITE_BAR);
-
-    builder.addRepeatedStringPiece("224");
-    builder.addRepeatedCord("225");
-
-    // Add a second one of each field.
-    builder.addRepeatedInt32(301);
-    builder.addRepeatedInt64(302);
-    builder.addRepeatedUint32(303);
-    builder.addRepeatedUint64(304);
-    builder.addRepeatedSint32(305);
-    builder.addRepeatedSint64(306);
-    builder.addRepeatedFixed32(307);
-    builder.addRepeatedFixed64(308);
-    builder.addRepeatedSfixed32(309);
-    builder.addRepeatedSfixed64(310);
-    builder.addRepeatedFloat(311);
-    builder.addRepeatedDouble(312);
-    builder.addRepeatedBool(false);
-    builder.addRepeatedString("315");
-    builder.addRepeatedBytes(toBytes("316"));
-
-    builder.addRepeatedGroup(TestAllTypesLite.RepeatedGroup.newBuilder().setA(317).build());
-    builder.addRepeatedNestedMessage(
-        TestAllTypesLite.NestedMessage.newBuilder().setBb(318).build());
-    builder.addRepeatedForeignMessage(ForeignMessageLite.newBuilder().setC(319).build());
-    builder.addRepeatedImportMessage(ImportMessageLite.newBuilder().setD(320).build());
-    builder.addRepeatedLazyMessage(TestAllTypesLite.NestedMessage.newBuilder().setBb(327).build());
-
-    builder.addRepeatedNestedEnum(TestAllTypesLite.NestedEnum.BAZ);
-    builder.addRepeatedForeignEnum(ForeignEnumLite.FOREIGN_LITE_BAZ);
-    builder.addRepeatedImportEnum(ImportEnumLite.IMPORT_LITE_BAZ);
-
-    builder.addRepeatedStringPiece("324");
-    builder.addRepeatedCord("325");
-
-    // -----------------------------------------------------------------
-
-    builder.setDefaultInt32(401);
-    builder.setDefaultInt64(402);
-    builder.setDefaultUint32(403);
-    builder.setDefaultUint64(404);
-    builder.setDefaultSint32(405);
-    builder.setDefaultSint64(406);
-    builder.setDefaultFixed32(407);
-    builder.setDefaultFixed64(408);
-    builder.setDefaultSfixed32(409);
-    builder.setDefaultSfixed64(410);
-    builder.setDefaultFloat(411);
-    builder.setDefaultDouble(412);
-    builder.setDefaultBool(false);
-    builder.setDefaultString("415");
-    builder.setDefaultBytes(toBytes("416"));
-
-    builder.setDefaultNestedEnum(TestAllTypesLite.NestedEnum.FOO);
-    builder.setDefaultForeignEnum(ForeignEnumLite.FOREIGN_LITE_FOO);
-    builder.setDefaultImportEnum(ImportEnumLite.IMPORT_LITE_FOO);
-
-    builder.setDefaultStringPiece("424");
-    builder.setDefaultCord("425");
-
-    builder.setOneofUint32(601);
-    builder.setOneofNestedMessage(TestAllTypesLite.NestedMessage.newBuilder().setBb(602).build());
-    builder.setOneofString("603");
-    builder.setOneofBytes(toBytes("604"));
-  }
-
-  /**
-   * Get an unmodifiable {@link ExtensionRegistryLite} containing all the extensions of {@code
-   * TestAllExtensionsLite}.
-   */
-  public static ExtensionRegistryLite getExtensionRegistryLite() {
-    ExtensionRegistryLite registry = ExtensionRegistryLite.newInstance();
-    registerAllExtensionsLite(registry);
-    return registry.getUnmodifiable();
-  }
-
-  /**
-   * Register all of {@code TestAllExtensionsLite}'s extensions with the given {@link
-   * ExtensionRegistryLite}.
-   */
-  public static void registerAllExtensionsLite(ExtensionRegistryLite registry) {
-    UnittestLite.registerAllExtensions(registry);
-  }
-
-  // ===================================================================
-  // Lite extensions
-
-  /**
-   * Set every field of {@code message} to the values expected by {@code assertAllExtensionsSet()}.
-   */
-  public static void setAllExtensions(TestAllExtensionsLite.Builder message) {
-    message.setExtension(optionalInt32ExtensionLite, 101);
-    message.setExtension(optionalInt64ExtensionLite, 102L);
-    message.setExtension(optionalUint32ExtensionLite, 103);
-    message.setExtension(optionalUint64ExtensionLite, 104L);
-    message.setExtension(optionalSint32ExtensionLite, 105);
-    message.setExtension(optionalSint64ExtensionLite, 106L);
-    message.setExtension(optionalFixed32ExtensionLite, 107);
-    message.setExtension(optionalFixed64ExtensionLite, 108L);
-    message.setExtension(optionalSfixed32ExtensionLite, 109);
-    message.setExtension(optionalSfixed64ExtensionLite, 110L);
-    message.setExtension(optionalFloatExtensionLite, 111F);
-    message.setExtension(optionalDoubleExtensionLite, 112D);
-    message.setExtension(optionalBoolExtensionLite, true);
-    message.setExtension(optionalStringExtensionLite, "115");
-    message.setExtension(optionalBytesExtensionLite, toBytes("116"));
-
-    message.setExtension(
-        optionalGroupExtensionLite, OptionalGroup_extension_lite.newBuilder().setA(117).build());
-    message.setExtension(
-        optionalNestedMessageExtensionLite,
-        TestAllTypesLite.NestedMessage.newBuilder().setBb(118).build());
-    message.setExtension(
-        optionalForeignMessageExtensionLite, ForeignMessageLite.newBuilder().setC(119).build());
-    message.setExtension(
-        optionalImportMessageExtensionLite, ImportMessageLite.newBuilder().setD(120).build());
-    message.setExtension(
-        optionalPublicImportMessageExtensionLite,
-        PublicImportMessageLite.newBuilder().setE(126).build());
-    message.setExtension(
-        optionalLazyMessageExtensionLite,
-        TestAllTypesLite.NestedMessage.newBuilder().setBb(127).build());
-    message.setExtension(
-        optionalUnverifiedLazyMessageExtensionLite,
-        TestAllTypesLite.NestedMessage.newBuilder().setBb(128).build());
-
-    message.setExtension(optionalNestedEnumExtensionLite, TestAllTypesLite.NestedEnum.BAZ);
-    message.setExtension(optionalForeignEnumExtensionLite, ForeignEnumLite.FOREIGN_LITE_BAZ);
-    message.setExtension(optionalImportEnumExtensionLite, ImportEnumLite.IMPORT_LITE_BAZ);
-
-    message.setExtension(optionalStringPieceExtensionLite, "124");
-    message.setExtension(optionalCordExtensionLite, "125");
-
-    // -----------------------------------------------------------------
-
-    message.addExtension(repeatedInt32ExtensionLite, 201);
-    message.addExtension(repeatedInt64ExtensionLite, 202L);
-    message.addExtension(repeatedUint32ExtensionLite, 203);
-    message.addExtension(repeatedUint64ExtensionLite, 204L);
-    message.addExtension(repeatedSint32ExtensionLite, 205);
-    message.addExtension(repeatedSint64ExtensionLite, 206L);
-    message.addExtension(repeatedFixed32ExtensionLite, 207);
-    message.addExtension(repeatedFixed64ExtensionLite, 208L);
-    message.addExtension(repeatedSfixed32ExtensionLite, 209);
-    message.addExtension(repeatedSfixed64ExtensionLite, 210L);
-    message.addExtension(repeatedFloatExtensionLite, 211F);
-    message.addExtension(repeatedDoubleExtensionLite, 212D);
-    message.addExtension(repeatedBoolExtensionLite, true);
-    message.addExtension(repeatedStringExtensionLite, "215");
-    message.addExtension(repeatedBytesExtensionLite, toBytes("216"));
-
-    message.addExtension(
-        repeatedGroupExtensionLite, RepeatedGroup_extension_lite.newBuilder().setA(217).build());
-    message.addExtension(
-        repeatedNestedMessageExtensionLite,
-        TestAllTypesLite.NestedMessage.newBuilder().setBb(218).build());
-    message.addExtension(
-        repeatedForeignMessageExtensionLite, ForeignMessageLite.newBuilder().setC(219).build());
-    message.addExtension(
-        repeatedImportMessageExtensionLite, ImportMessageLite.newBuilder().setD(220).build());
-    message.addExtension(
-        repeatedLazyMessageExtensionLite,
-        TestAllTypesLite.NestedMessage.newBuilder().setBb(227).build());
-
-    message.addExtension(repeatedNestedEnumExtensionLite, TestAllTypesLite.NestedEnum.BAR);
-    message.addExtension(repeatedForeignEnumExtensionLite, ForeignEnumLite.FOREIGN_LITE_BAR);
-    message.addExtension(repeatedImportEnumExtensionLite, ImportEnumLite.IMPORT_LITE_BAR);
-
-    message.addExtension(repeatedStringPieceExtensionLite, "224");
-    message.addExtension(repeatedCordExtensionLite, "225");
-
-    // Add a second one of each field.
-    message.addExtension(repeatedInt32ExtensionLite, 301);
-    message.addExtension(repeatedInt64ExtensionLite, 302L);
-    message.addExtension(repeatedUint32ExtensionLite, 303);
-    message.addExtension(repeatedUint64ExtensionLite, 304L);
-    message.addExtension(repeatedSint32ExtensionLite, 305);
-    message.addExtension(repeatedSint64ExtensionLite, 306L);
-    message.addExtension(repeatedFixed32ExtensionLite, 307);
-    message.addExtension(repeatedFixed64ExtensionLite, 308L);
-    message.addExtension(repeatedSfixed32ExtensionLite, 309);
-    message.addExtension(repeatedSfixed64ExtensionLite, 310L);
-    message.addExtension(repeatedFloatExtensionLite, 311F);
-    message.addExtension(repeatedDoubleExtensionLite, 312D);
-    message.addExtension(repeatedBoolExtensionLite, false);
-    message.addExtension(repeatedStringExtensionLite, "315");
-    message.addExtension(repeatedBytesExtensionLite, toBytes("316"));
-
-    message.addExtension(
-        repeatedGroupExtensionLite, RepeatedGroup_extension_lite.newBuilder().setA(317).build());
-    message.addExtension(
-        repeatedNestedMessageExtensionLite,
-        TestAllTypesLite.NestedMessage.newBuilder().setBb(318).build());
-    message.addExtension(
-        repeatedForeignMessageExtensionLite, ForeignMessageLite.newBuilder().setC(319).build());
-    message.addExtension(
-        repeatedImportMessageExtensionLite, ImportMessageLite.newBuilder().setD(320).build());
-    message.addExtension(
-        repeatedLazyMessageExtensionLite,
-        TestAllTypesLite.NestedMessage.newBuilder().setBb(327).build());
-
-    message.addExtension(repeatedNestedEnumExtensionLite, TestAllTypesLite.NestedEnum.BAZ);
-    message.addExtension(repeatedForeignEnumExtensionLite, ForeignEnumLite.FOREIGN_LITE_BAZ);
-    message.addExtension(repeatedImportEnumExtensionLite, ImportEnumLite.IMPORT_LITE_BAZ);
-
-    message.addExtension(repeatedStringPieceExtensionLite, "324");
-    message.addExtension(repeatedCordExtensionLite, "325");
-
-    // -----------------------------------------------------------------
-
-    message.setExtension(defaultInt32ExtensionLite, 401);
-    message.setExtension(defaultInt64ExtensionLite, 402L);
-    message.setExtension(defaultUint32ExtensionLite, 403);
-    message.setExtension(defaultUint64ExtensionLite, 404L);
-    message.setExtension(defaultSint32ExtensionLite, 405);
-    message.setExtension(defaultSint64ExtensionLite, 406L);
-    message.setExtension(defaultFixed32ExtensionLite, 407);
-    message.setExtension(defaultFixed64ExtensionLite, 408L);
-    message.setExtension(defaultSfixed32ExtensionLite, 409);
-    message.setExtension(defaultSfixed64ExtensionLite, 410L);
-    message.setExtension(defaultFloatExtensionLite, 411F);
-    message.setExtension(defaultDoubleExtensionLite, 412D);
-    message.setExtension(defaultBoolExtensionLite, false);
-    message.setExtension(defaultStringExtensionLite, "415");
-    message.setExtension(defaultBytesExtensionLite, toBytes("416"));
-
-    message.setExtension(defaultNestedEnumExtensionLite, TestAllTypesLite.NestedEnum.FOO);
-    message.setExtension(defaultForeignEnumExtensionLite, ForeignEnumLite.FOREIGN_LITE_FOO);
-    message.setExtension(defaultImportEnumExtensionLite, ImportEnumLite.IMPORT_LITE_FOO);
-
-    message.setExtension(defaultStringPieceExtensionLite, "424");
-    message.setExtension(defaultCordExtensionLite, "425");
-
-    message.setExtension(oneofUint32ExtensionLite, 601);
-    message.setExtension(
-        oneofNestedMessageExtensionLite,
-        TestAllTypesLite.NestedMessage.newBuilder().setBb(602).build());
-    message.setExtension(oneofStringExtensionLite, "603");
-    message.setExtension(oneofBytesExtensionLite, toBytes("604"));
-  }
-
-  // -------------------------------------------------------------------
-
-  /**
-   * Modify the repeated extensions of {@code message} to contain the values expected by {@code
-   * assertRepeatedExtensionsModified()}.
-   */
-  public static void modifyRepeatedExtensions(TestAllExtensionsLite.Builder message) {
-    message.setExtension(repeatedInt32ExtensionLite, 1, 501);
-    message.setExtension(repeatedInt64ExtensionLite, 1, 502L);
-    message.setExtension(repeatedUint32ExtensionLite, 1, 503);
-    message.setExtension(repeatedUint64ExtensionLite, 1, 504L);
-    message.setExtension(repeatedSint32ExtensionLite, 1, 505);
-    message.setExtension(repeatedSint64ExtensionLite, 1, 506L);
-    message.setExtension(repeatedFixed32ExtensionLite, 1, 507);
-    message.setExtension(repeatedFixed64ExtensionLite, 1, 508L);
-    message.setExtension(repeatedSfixed32ExtensionLite, 1, 509);
-    message.setExtension(repeatedSfixed64ExtensionLite, 1, 510L);
-    message.setExtension(repeatedFloatExtensionLite, 1, 511F);
-    message.setExtension(repeatedDoubleExtensionLite, 1, 512D);
-    message.setExtension(repeatedBoolExtensionLite, 1, true);
-    message.setExtension(repeatedStringExtensionLite, 1, "515");
-    message.setExtension(repeatedBytesExtensionLite, 1, toBytes("516"));
-
-    message.setExtension(
-        repeatedGroupExtensionLite, 1, RepeatedGroup_extension_lite.newBuilder().setA(517).build());
-    message.setExtension(
-        repeatedNestedMessageExtensionLite,
-        1,
-        TestAllTypesLite.NestedMessage.newBuilder().setBb(518).build());
-    message.setExtension(
-        repeatedForeignMessageExtensionLite, 1, ForeignMessageLite.newBuilder().setC(519).build());
-    message.setExtension(
-        repeatedImportMessageExtensionLite, 1, ImportMessageLite.newBuilder().setD(520).build());
-    message.setExtension(
-        repeatedLazyMessageExtensionLite,
-        1,
-        TestAllTypesLite.NestedMessage.newBuilder().setBb(527).build());
-
-    message.setExtension(repeatedNestedEnumExtensionLite, 1, TestAllTypesLite.NestedEnum.FOO);
-    message.setExtension(repeatedForeignEnumExtensionLite, 1, ForeignEnumLite.FOREIGN_LITE_FOO);
-    message.setExtension(repeatedImportEnumExtensionLite, 1, ImportEnumLite.IMPORT_LITE_FOO);
-
-    message.setExtension(repeatedStringPieceExtensionLite, 1, "524");
-    message.setExtension(repeatedCordExtensionLite, 1, "525");
-  }
-
-  public static void setPackedExtensions(TestPackedExtensionsLite.Builder message) {
-    message.addExtension(packedInt32ExtensionLite, 601);
-    message.addExtension(packedInt64ExtensionLite, 602L);
-    message.addExtension(packedUint32ExtensionLite, 603);
-    message.addExtension(packedUint64ExtensionLite, 604L);
-    message.addExtension(packedSint32ExtensionLite, 605);
-    message.addExtension(packedSint64ExtensionLite, 606L);
-    message.addExtension(packedFixed32ExtensionLite, 607);
-    message.addExtension(packedFixed64ExtensionLite, 608L);
-    message.addExtension(packedSfixed32ExtensionLite, 609);
-    message.addExtension(packedSfixed64ExtensionLite, 610L);
-    message.addExtension(packedFloatExtensionLite, 611F);
-    message.addExtension(packedDoubleExtensionLite, 612D);
-    message.addExtension(packedBoolExtensionLite, true);
-    message.addExtension(packedEnumExtensionLite, ForeignEnumLite.FOREIGN_LITE_BAR);
-    // Add a second one of each field.
-    message.addExtension(packedInt32ExtensionLite, 701);
-    message.addExtension(packedInt64ExtensionLite, 702L);
-    message.addExtension(packedUint32ExtensionLite, 703);
-    message.addExtension(packedUint64ExtensionLite, 704L);
-    message.addExtension(packedSint32ExtensionLite, 705);
-    message.addExtension(packedSint64ExtensionLite, 706L);
-    message.addExtension(packedFixed32ExtensionLite, 707);
-    message.addExtension(packedFixed64ExtensionLite, 708L);
-    message.addExtension(packedSfixed32ExtensionLite, 709);
-    message.addExtension(packedSfixed64ExtensionLite, 710L);
-    message.addExtension(packedFloatExtensionLite, 711F);
-    message.addExtension(packedDoubleExtensionLite, 712D);
-    message.addExtension(packedBoolExtensionLite, false);
-    message.addExtension(packedEnumExtensionLite, ForeignEnumLite.FOREIGN_LITE_BAZ);
-  }
-}
diff --git a/libs/protobuf/java/core/src/test/java/com/google/protobuf/TextFormatParseInfoTreeTest.java b/libs/protobuf/java/core/src/test/java/com/google/protobuf/TextFormatParseInfoTreeTest.java
deleted file mode 100644
index b624191..0000000
--- a/libs/protobuf/java/core/src/test/java/com/google/protobuf/TextFormatParseInfoTreeTest.java
+++ /dev/null
@@ -1,197 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.common.truth.Truth.assertThat;
-import static com.google.common.truth.Truth.assertWithMessage;
-
-import com.google.protobuf.Descriptors.Descriptor;
-import com.google.protobuf.Descriptors.FieldDescriptor;
-import protobuf_unittest.UnittestProto.TestAllTypes;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-/** Test {@link TextFormatParseInfoTree}. */
-@RunWith(JUnit4.class)
-public class TextFormatParseInfoTreeTest {
-
-  private static final Descriptor DESCRIPTOR = TestAllTypes.getDescriptor();
-  private static final FieldDescriptor OPTIONAL_INT32 =
-      DESCRIPTOR.findFieldByName("optional_int32");
-  private static final FieldDescriptor OPTIONAL_BOOLEAN =
-      DESCRIPTOR.findFieldByName("optional_boolean");
-  private static final FieldDescriptor REPEATED_INT32 =
-      DESCRIPTOR.findFieldByName("repeated_int32");
-  private static final FieldDescriptor OPTIONAL_NESTED_MESSAGE =
-      DESCRIPTOR.findFieldByName("optional_nested_message");
-  private static final FieldDescriptor REPEATED_NESTED_MESSAGE =
-      DESCRIPTOR.findFieldByName("repeated_nested_message");
-  private static final FieldDescriptor FIELD_BB =
-      TestAllTypes.NestedMessage.getDescriptor().findFieldByName("bb");
-
-  private static final TextFormatParseLocation LOC0 = TextFormatParseLocation.create(1, 2);
-  private static final TextFormatParseLocation LOC1 = TextFormatParseLocation.create(2, 3);
-
-  private TextFormatParseInfoTree.Builder rootBuilder;
-
-  @Before
-  public void setUp() {
-    rootBuilder = TextFormatParseInfoTree.builder();
-  }
-
-  @Test
-  public void testBuildEmptyParseTree() {
-    TextFormatParseInfoTree tree = rootBuilder.build();
-    assertThat(tree.getLocations(null)).isEmpty();
-  }
-
-  @Test
-  public void testGetLocationReturnsSingleLocation() {
-    rootBuilder.setLocation(OPTIONAL_INT32, LOC0);
-    TextFormatParseInfoTree root = rootBuilder.build();
-    assertThat(root.getLocation(OPTIONAL_INT32, 0)).isEqualTo(LOC0);
-    assertThat(root.getLocations(OPTIONAL_INT32)).hasSize(1);
-  }
-
-  @Test
-  public void testGetLocationsReturnsNoParseLocationsForUnknownField() {
-    assertThat(rootBuilder.build().getLocations(OPTIONAL_INT32)).isEmpty();
-    rootBuilder.setLocation(OPTIONAL_BOOLEAN, LOC0);
-    TextFormatParseInfoTree root = rootBuilder.build();
-    assertThat(root.getLocations(OPTIONAL_INT32)).isEmpty();
-    assertThat(root.getLocations(OPTIONAL_BOOLEAN).get(0)).isEqualTo(LOC0);
-  }
-
-  @Test
-  public void testGetLocationThrowsIllegalArgumentExceptionForUnknownField() {
-    rootBuilder.setLocation(REPEATED_INT32, LOC0);
-    TextFormatParseInfoTree root = rootBuilder.build();
-    try {
-      root.getNestedTree(OPTIONAL_INT32, 0);
-      assertWithMessage("Did not detect unknown field").fail();
-    } catch (IllegalArgumentException expected) {
-      // pass
-    }
-  }
-
-  @Test
-  public void testGetLocationThrowsIllegalArgumentExceptionForInvalidIndex() {
-    TextFormatParseInfoTree root = rootBuilder.setLocation(OPTIONAL_INT32, LOC0).build();
-    try {
-      root.getLocation(OPTIONAL_INT32, 1);
-      assertWithMessage("Invalid index not detected").fail();
-    } catch (IllegalArgumentException expected) {
-      // pass
-    }
-    try {
-      root.getLocation(OPTIONAL_INT32, -1);
-      assertWithMessage("Negative index not detected").fail();
-    } catch (IllegalArgumentException expected) {
-      // pass
-    }
-  }
-
-  @Test
-  public void testGetLocationsReturnsMultipleLocations() {
-    rootBuilder.setLocation(REPEATED_INT32, LOC0);
-    rootBuilder.setLocation(REPEATED_INT32, LOC1);
-    TextFormatParseInfoTree root = rootBuilder.build();
-    assertThat(root.getLocation(REPEATED_INT32, 0)).isEqualTo(LOC0);
-    assertThat(root.getLocation(REPEATED_INT32, 1)).isEqualTo(LOC1);
-    assertThat(root.getLocations(REPEATED_INT32)).hasSize(2);
-  }
-
-  @Test
-  public void testGetNestedTreeThrowsIllegalArgumentExceptionForUnknownField() {
-    rootBuilder.setLocation(REPEATED_INT32, LOC0);
-    TextFormatParseInfoTree root = rootBuilder.build();
-    try {
-      root.getNestedTree(OPTIONAL_NESTED_MESSAGE, 0);
-      assertWithMessage("Did not detect unknown field").fail();
-    } catch (IllegalArgumentException expected) {
-      // pass
-    }
-  }
-
-  @Test
-  public void testGetNestedTreesReturnsNoParseInfoTreesForUnknownField() {
-    rootBuilder.setLocation(REPEATED_INT32, LOC0);
-    TextFormatParseInfoTree root = rootBuilder.build();
-    assertThat(root.getNestedTrees(OPTIONAL_NESTED_MESSAGE)).isEmpty();
-  }
-
-  @Test
-  public void testGetNestedTreeThrowsIllegalArgumentExceptionForInvalidIndex() {
-    rootBuilder.setLocation(REPEATED_INT32, LOC0);
-    rootBuilder.getBuilderForSubMessageField(OPTIONAL_NESTED_MESSAGE);
-    TextFormatParseInfoTree root = rootBuilder.build();
-    try {
-      root.getNestedTree(OPTIONAL_NESTED_MESSAGE, 1);
-      assertWithMessage("Submessage index that is too large not detected").fail();
-    } catch (IllegalArgumentException expected) {
-      // pass
-    }
-    try {
-      rootBuilder.build().getNestedTree(OPTIONAL_NESTED_MESSAGE, -1);
-      assertWithMessage("Invalid submessage index (-1) not detected").fail();
-    } catch (IllegalArgumentException expected) {
-      // pass
-    }
-  }
-
-  @Test
-  public void testGetNestedTreesReturnsSingleTree() {
-    rootBuilder.getBuilderForSubMessageField(OPTIONAL_NESTED_MESSAGE);
-    TextFormatParseInfoTree root = rootBuilder.build();
-    assertThat(root.getNestedTrees(OPTIONAL_NESTED_MESSAGE)).hasSize(1);
-    TextFormatParseInfoTree subtree = root.getNestedTrees(OPTIONAL_NESTED_MESSAGE).get(0);
-    assertThat(subtree).isNotNull();
-  }
-
-  @Test
-  public void testGetNestedTreesReturnsMultipleTrees() {
-    TextFormatParseInfoTree.Builder subtree1Builder =
-        rootBuilder.getBuilderForSubMessageField(REPEATED_NESTED_MESSAGE);
-    subtree1Builder.getBuilderForSubMessageField(FIELD_BB);
-    subtree1Builder.getBuilderForSubMessageField(FIELD_BB);
-    TextFormatParseInfoTree.Builder subtree2Builder =
-        rootBuilder.getBuilderForSubMessageField(REPEATED_NESTED_MESSAGE);
-    subtree2Builder.getBuilderForSubMessageField(FIELD_BB);
-    TextFormatParseInfoTree root = rootBuilder.build();
-    assertThat(root.getNestedTrees(REPEATED_NESTED_MESSAGE)).hasSize(2);
-    assertThat(root.getNestedTrees(REPEATED_NESTED_MESSAGE).get(0).getNestedTrees(FIELD_BB))
-        .hasSize(2);
-    assertThat(root.getNestedTrees(REPEATED_NESTED_MESSAGE).get(1).getNestedTrees(FIELD_BB))
-        .hasSize(1);
-  }
-}
diff --git a/libs/protobuf/java/core/src/test/java/com/google/protobuf/TextFormatParseLocationTest.java b/libs/protobuf/java/core/src/test/java/com/google/protobuf/TextFormatParseLocationTest.java
deleted file mode 100644
index f85ee6c..0000000
--- a/libs/protobuf/java/core/src/test/java/com/google/protobuf/TextFormatParseLocationTest.java
+++ /dev/null
@@ -1,95 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.common.truth.Truth.assertThat;
-import static com.google.common.truth.Truth.assertWithMessage;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-/** Test {@link TextFormatParseLocation}. */
-@RunWith(JUnit4.class)
-public class TextFormatParseLocationTest {
-
-  @Test
-  public void testCreateEmpty() {
-    TextFormatParseLocation location = TextFormatParseLocation.create(-1, -1);
-    assertThat(location).isEqualTo(TextFormatParseLocation.EMPTY);
-  }
-
-  @Test
-  public void testCreate() {
-    TextFormatParseLocation location = TextFormatParseLocation.create(2, 1);
-    assertThat(location.getLine()).isEqualTo(2);
-    assertThat(location.getColumn()).isEqualTo(1);
-  }
-
-  @Test
-  public void testCreateThrowsIllegalArgumentExceptionForInvalidIndex() {
-    try {
-      TextFormatParseLocation.create(-1, 0);
-      assertWithMessage("Should throw IllegalArgumentException if line is less than 0").fail();
-    } catch (IllegalArgumentException unused) {
-      // pass
-    }
-    try {
-      TextFormatParseLocation.create(0, -1);
-      assertWithMessage("Should throw, column < 0").fail();
-    } catch (IllegalArgumentException unused) {
-      // pass
-    }
-  }
-
-  @Test
-  public void testHashCode() {
-    TextFormatParseLocation loc0 = TextFormatParseLocation.create(2, 1);
-    TextFormatParseLocation loc1 = TextFormatParseLocation.create(2, 1);
-
-    assertThat(loc0.hashCode()).isEqualTo(loc1.hashCode());
-    assertThat(TextFormatParseLocation.EMPTY.hashCode())
-        .isEqualTo(TextFormatParseLocation.EMPTY.hashCode());
-  }
-
-  @Test
-  public void testEquals() {
-    TextFormatParseLocation loc0 = TextFormatParseLocation.create(2, 1);
-    TextFormatParseLocation loc1 = TextFormatParseLocation.create(1, 2);
-    TextFormatParseLocation loc2 = TextFormatParseLocation.create(2, 2);
-    TextFormatParseLocation loc3 = TextFormatParseLocation.create(2, 1);
-
-    assertThat(loc0).isEqualTo(loc3);
-    assertThat(loc0).isNotSameInstanceAs(loc1);
-    assertThat(loc0).isNotSameInstanceAs(loc2);
-    assertThat(loc1).isNotSameInstanceAs(loc2);
-  }
-}
diff --git a/libs/protobuf/java/core/src/test/java/com/google/protobuf/TextFormatTest.java b/libs/protobuf/java/core/src/test/java/com/google/protobuf/TextFormatTest.java
deleted file mode 100644
index cde1776..0000000
--- a/libs/protobuf/java/core/src/test/java/com/google/protobuf/TextFormatTest.java
+++ /dev/null
@@ -1,1835 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.common.truth.Truth.assertThat;
-import static com.google.common.truth.Truth.assertWithMessage;
-import static com.google.protobuf.TestUtil.TEST_REQUIRED_INITIALIZED;
-import static com.google.protobuf.TestUtil.TEST_REQUIRED_UNINITIALIZED;
-import static org.junit.Assert.assertThrows;
-
-import com.google.protobuf.DescriptorProtos.DescriptorProto;
-import com.google.protobuf.DescriptorProtos.FieldDescriptorProto;
-import com.google.protobuf.DescriptorProtos.FileDescriptorProto;
-import com.google.protobuf.Descriptors.Descriptor;
-import com.google.protobuf.Descriptors.FieldDescriptor;
-import com.google.protobuf.Descriptors.FileDescriptor;
-import com.google.protobuf.TextFormat.InvalidEscapeSequenceException;
-import com.google.protobuf.TextFormat.Parser.SingularOverwritePolicy;
-import com.google.protobuf.testing.proto.TestProto3Optional;
-import com.google.protobuf.testing.proto.TestProto3Optional.NestedEnum;
-import any_test.AnyTestProto.TestAny;
-import map_test.MapTestProto.TestMap;
-import protobuf_unittest.UnittestMset.TestMessageSetExtension1;
-import protobuf_unittest.UnittestMset.TestMessageSetExtension2;
-import protobuf_unittest.UnittestProto.OneString;
-import protobuf_unittest.UnittestProto.TestAllExtensions;
-import protobuf_unittest.UnittestProto.TestAllTypes;
-import protobuf_unittest.UnittestProto.TestAllTypes.NestedMessage;
-import protobuf_unittest.UnittestProto.TestEmptyMessage;
-import protobuf_unittest.UnittestProto.TestOneof2;
-import protobuf_unittest.UnittestProto.TestRequired;
-import proto2_wireformat_unittest.UnittestMsetWireFormat.TestMessageSet;
-import java.io.StringReader;
-import java.util.Arrays;
-import java.util.List;
-import java.util.logging.Logger;
-import org.junit.Test;
-import org.junit.function.ThrowingRunnable;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-/**
- * Test case for {@link TextFormat}.
- */
-@RunWith(JUnit4.class)
-public class TextFormatTest {
-
-  // A basic string with different escapable characters for testing.
-  private static final String ESCAPE_TEST_STRING =
-      "\"A string with ' characters \n and \r newlines and \t tabs and \001 slashes \\";
-
-  // A representation of the above string with all the characters escaped.
-  private static final String ESCAPE_TEST_STRING_ESCAPED =
-      "\\\"A string with \\' characters \\n and \\r newlines "
-          + "and \\t tabs and \\001 slashes \\\\";
-
-  private static final String ALL_FIELDS_SET_TEXT =
-      TestUtil.readTextFromFile("text_format_unittest_data_oneof_implemented.txt");
-  private static final String ALL_EXTENSIONS_SET_TEXT =
-      TestUtil.readTextFromFile("text_format_unittest_extensions_data.txt");
-
-  private static final String EXOTIC_TEXT =
-      ""
-          + "repeated_int32: -1\n"
-          + "repeated_int32: -2147483648\n"
-          + "repeated_int64: -1,\n"
-          + "repeated_int64: -9223372036854775808\n"
-          + "repeated_uint32: 4294967295\n"
-          + "repeated_uint32: 2147483648\n"
-          + "repeated_uint64: 18446744073709551615\n"
-          + "repeated_uint64: 9223372036854775808\n"
-          + "repeated_double: 123.0\n"
-          + "repeated_double: 123.5\n"
-          + "repeated_double: 0.125\n"
-          + "repeated_double: .125\n"
-          + "repeated_double: -.125\n"
-          + "repeated_double: 1.23E17\n"
-          + "repeated_double: 1.23E+17\n"
-          + "repeated_double: -1.23e-17\n"
-          + "repeated_double: .23e+17\n"
-          + "repeated_double: -.23E17\n"
-          + "repeated_double: 1.235E22\n"
-          + "repeated_double: 1.235E-18\n"
-          + "repeated_double: 123.456789\n"
-          + "repeated_double: Infinity\n"
-          + "repeated_double: -Infinity\n"
-          + "repeated_double: NaN\n"
-          + "repeated_string: \"\\000\\001\\a\\b\\f\\n\\r\\t\\v\\\\\\'\\\""
-          + "\\341\\210\\264\"\n"
-          + "repeated_bytes: \"\\000\\001\\a\\b\\f\\n\\r\\t\\v\\\\\\'\\\"\\376\"\n";
-
-  private static final String CANONICAL_EXOTIC_TEXT =
-      EXOTIC_TEXT
-          .replace(": .", ": 0.")
-          .replace(": -.", ": -0.") // short-form double
-          .replace("23e", "23E")
-          .replace("E+", "E")
-          .replace("0.23E17", "2.3E16")
-          .replace(",", "");
-
-  private static final String MESSAGE_SET_TEXT =
-      ""
-          + "[protobuf_unittest.TestMessageSetExtension1] {\n"
-          + "  i: 123\n"
-          + "}\n"
-          + "[protobuf_unittest.TestMessageSetExtension2] {\n"
-          + "  str: \"foo\"\n"
-          + "}\n";
-
-  private static final String MESSAGE_SET_TEXT_WITH_REPEATED_EXTENSION =
-      ""
-          + "[protobuf_unittest.TestMessageSetExtension1] {\n"
-          + "  i: 123\n"
-          + "}\n"
-          + "[protobuf_unittest.TestMessageSetExtension1] {\n"
-          + "  i: 456\n"
-          + "}\n";
-
-  private static final TextFormat.Parser PARSER_ALLOWING_UNKNOWN_FIELDS =
-      TextFormat.Parser.newBuilder().setAllowUnknownFields(true).build();
-
-  private static final TextFormat.Parser PARSER_ALLOWING_UNKNOWN_EXTENSIONS =
-      TextFormat.Parser.newBuilder().setAllowUnknownExtensions(true).build();
-
-  private static final TextFormat.Parser PARSER_WITH_OVERWRITE_FORBIDDEN =
-      TextFormat.Parser.newBuilder()
-          .setSingularOverwritePolicy(SingularOverwritePolicy.FORBID_SINGULAR_OVERWRITES)
-          .build();
-
-  private static final TextFormat.Parser DEFAULT_PARSER = TextFormat.Parser.newBuilder().build();
-
-  /** Print TestAllTypes and compare with golden file. */
-  @Test
-  public void testPrintMessage() throws Exception {
-    String javaText = TextFormat.printer().printToString(TestUtil.getAllSet());
-
-    // Java likes to add a trailing ".0" to floats and doubles.  C printf
-    // (with %g format) does not.  Our golden files are used for both
-    // C++ and Java TextFormat classes, so we need to conform.
-    javaText = javaText.replace(".0\n", "\n");
-
-    assertThat(javaText).isEqualTo(ALL_FIELDS_SET_TEXT);
-  }
-
-  @Test
-  // https://github.com/protocolbuffers/protobuf/issues/9447
-  public void testCharacterNotInUnicodeBlock() throws TextFormat.InvalidEscapeSequenceException {
-    ByteString actual = TextFormat.unescapeBytes("\\U000358da");
-    assertThat(actual.size()).isEqualTo(4);
-  }
-
-  /** Print TestAllTypes as Builder and compare with golden file. */
-  @Test
-  public void testPrintMessageBuilder() throws Exception {
-    String javaText = TextFormat.printer().printToString(TestUtil.getAllSetBuilder());
-
-    // Java likes to add a trailing ".0" to floats and doubles.  C printf
-    // (with %g format) does not.  Our golden files are used for both
-    // C++ and Java TextFormat classes, so we need to conform.
-    javaText = javaText.replace(".0\n", "\n");
-
-    assertThat(javaText).isEqualTo(ALL_FIELDS_SET_TEXT);
-  }
-
-  /** Print TestAllExtensions and compare with golden file. */
-  @Test
-  public void testPrintExtensions() throws Exception {
-    String javaText = TextFormat.printer().printToString(TestUtil.getAllExtensionsSet());
-
-    // Java likes to add a trailing ".0" to floats and doubles.  C printf
-    // (with %g format) does not.  Our golden files are used for both
-    // C++ and Java TextFormat classes, so we need to conform.
-    javaText = javaText.replace(".0\n", "\n");
-
-    assertThat(javaText).isEqualTo(ALL_EXTENSIONS_SET_TEXT);
-  }
-
-  // Creates an example unknown field set.
-  private UnknownFieldSet makeUnknownFieldSet() {
-
-    return UnknownFieldSet.newBuilder()
-        .addField(
-            5,
-            UnknownFieldSet.Field.newBuilder()
-                .addVarint(1)
-                .addFixed32(2)
-                .addFixed64(3)
-                .addLengthDelimited(ByteString.copyFromUtf8("4"))
-                .addLengthDelimited(
-                    UnknownFieldSet.newBuilder()
-                        .addField(12, UnknownFieldSet.Field.newBuilder().addVarint(6).build())
-                        .build()
-                        .toByteString())
-                .addGroup(
-                    UnknownFieldSet.newBuilder()
-                        .addField(10, UnknownFieldSet.Field.newBuilder().addVarint(5).build())
-                        .build())
-                .build())
-        .addField(
-            8, UnknownFieldSet.Field.newBuilder().addVarint(1).addVarint(2).addVarint(3).build())
-        .addField(
-            15,
-            UnknownFieldSet.Field.newBuilder()
-                .addVarint(0xABCDEF1234567890L)
-                .addFixed32(0xABCD1234)
-                .addFixed64(0xABCDEF1234567890L)
-                .build())
-        .build();
-  }
-
-  @Test
-  public void testPrintUnknownFields() throws Exception {
-    // Test printing of unknown fields in a message.
-
-    TestEmptyMessage message =
-        TestEmptyMessage.newBuilder().setUnknownFields(makeUnknownFieldSet()).build();
-
-    assertThat(TextFormat.printer().printToString(message))
-        .isEqualTo(
-            "5: 1\n"
-                + "5: 0x00000002\n"
-                + "5: 0x0000000000000003\n"
-                + "5: \"4\"\n"
-                + "5: {\n"
-                + "  12: 6\n"
-                + "}\n"
-                + "5 {\n"
-                + "  10: 5\n"
-                + "}\n"
-                + "8: 1\n"
-                + "8: 2\n"
-                + "8: 3\n"
-                + "15: 12379813812177893520\n"
-                + "15: 0xabcd1234\n"
-                + "15: 0xabcdef1234567890\n");
-  }
-
-  @Test
-  public void testPrintField() throws Exception {
-    final FieldDescriptor dataField = OneString.getDescriptor().findFieldByName("data");
-    assertThat(TextFormat.printer().printFieldToString(dataField, "test data"))
-        .isEqualTo("data: \"test data\"\n");
-
-    final FieldDescriptor optionalField =
-        TestAllTypes.getDescriptor().findFieldByName("optional_nested_message");
-    final Object value = NestedMessage.newBuilder().setBb(42).build();
-
-    assertThat(TextFormat.printer().printFieldToString(optionalField, value))
-        .isEqualTo("optional_nested_message {\n  bb: 42\n}\n");
-  }
-
-  /**
-   * Helper to construct a ByteString from a String containing only 8-bit characters. The characters
-   * are converted directly to bytes, *not* encoded using UTF-8.
-   */
-  private ByteString bytes(String str) {
-    return ByteString.copyFrom(str.getBytes(Internal.ISO_8859_1));
-  }
-
-  /**
-   * Helper to construct a ByteString from a bunch of bytes. The inputs are actually ints so that I
-   * can use hex notation and not get stupid errors about precision.
-   */
-  private ByteString bytes(int... bytesAsInts) {
-    byte[] bytes = new byte[bytesAsInts.length];
-    for (int i = 0; i < bytesAsInts.length; i++) {
-      bytes[i] = (byte) bytesAsInts[i];
-    }
-    return ByteString.copyFrom(bytes);
-  }
-
-  @Test
-  public void testPrintExotic() throws Exception {
-    Message message =
-        TestAllTypes.newBuilder()
-            // Signed vs. unsigned numbers.
-            .addRepeatedInt32(-1)
-            .addRepeatedUint32(-1)
-            .addRepeatedInt64(-1)
-            .addRepeatedUint64(-1)
-            .addRepeatedInt32(1 << 31)
-            .addRepeatedUint32(1 << 31)
-            .addRepeatedInt64(1L << 63)
-            .addRepeatedUint64(1L << 63)
-
-            // Floats of various precisions and exponents.
-            .addRepeatedDouble(123)
-            .addRepeatedDouble(123.5)
-            .addRepeatedDouble(0.125)
-            .addRepeatedDouble(.125)
-            .addRepeatedDouble(-.125)
-            .addRepeatedDouble(123e15)
-            .addRepeatedDouble(123e15)
-            .addRepeatedDouble(-1.23e-17)
-            .addRepeatedDouble(.23e17)
-            .addRepeatedDouble(-23e15)
-            .addRepeatedDouble(123.5e20)
-            .addRepeatedDouble(123.5e-20)
-            .addRepeatedDouble(123.456789)
-            .addRepeatedDouble(Double.POSITIVE_INFINITY)
-            .addRepeatedDouble(Double.NEGATIVE_INFINITY)
-            .addRepeatedDouble(Double.NaN)
-
-            // Strings and bytes that needing escaping.
-            .addRepeatedString("\0\001\007\b\f\n\r\t\013\\\'\"\u1234")
-            .addRepeatedBytes(bytes("\0\001\007\b\f\n\r\t\013\\\'\"\u00fe"))
-            .build();
-
-    assertThat(message.toString()).isEqualTo(CANONICAL_EXOTIC_TEXT);
-  }
-
-  @Test
-  public void testRoundtripProto3Optional() throws Exception {
-    Message message =
-        TestProto3Optional.newBuilder()
-            .setOptionalInt32(1)
-            .setOptionalInt64(2)
-            .setOptionalNestedEnum(NestedEnum.BAZ)
-            .build();
-    TestProto3Optional.Builder message2 = TestProto3Optional.newBuilder();
-    TextFormat.merge(message.toString(), message2);
-
-    assertThat(message2.hasOptionalInt32()).isTrue();
-    assertThat(message2.hasOptionalInt64()).isTrue();
-    assertThat(message2.hasOptionalNestedEnum()).isTrue();
-    assertThat(message2.getOptionalInt32()).isEqualTo(1);
-    assertThat(message2.getOptionalInt64()).isEqualTo(2);
-    assertThat(message2.getOptionalNestedEnum()).isEqualTo(NestedEnum.BAZ);
-  }
-
-  @Test
-  public void testPrintMessageSet() throws Exception {
-    TestMessageSet messageSet =
-        TestMessageSet.newBuilder()
-            .setExtension(
-                TestMessageSetExtension1.messageSetExtension,
-                TestMessageSetExtension1.newBuilder().setI(123).build())
-            .setExtension(
-                TestMessageSetExtension2.messageSetExtension,
-                TestMessageSetExtension2.newBuilder().setStr("foo").build())
-            .build();
-
-    assertThat(messageSet.toString()).isEqualTo(MESSAGE_SET_TEXT);
-  }
-
-  // =================================================================
-
-  @Test
-  public void testMerge() throws Exception {
-    TestAllTypes.Builder builder = TestAllTypes.newBuilder();
-    TextFormat.merge(ALL_FIELDS_SET_TEXT, builder);
-    TestUtil.assertAllFieldsSet(builder.build());
-  }
-
-  @Test
-  public void testParse() throws Exception {
-    TestUtil.assertAllFieldsSet(TextFormat.parse(ALL_FIELDS_SET_TEXT, TestAllTypes.class));
-  }
-
-  @Test
-  public void testMergeInitialized() throws Exception {
-    TestRequired.Builder builder = TestRequired.newBuilder();
-    TextFormat.merge(TEST_REQUIRED_INITIALIZED.toString(), builder);
-    assertThat(builder.buildPartial().toString()).isEqualTo(TEST_REQUIRED_INITIALIZED.toString());
-    assertThat(builder.isInitialized()).isTrue();
-  }
-
-  @Test
-  public void testParseInitialized() throws Exception {
-    TestRequired parsed =
-        TextFormat.parse(TEST_REQUIRED_INITIALIZED.toString(), TestRequired.class);
-    assertThat(parsed.toString()).isEqualTo(TEST_REQUIRED_INITIALIZED.toString());
-    assertThat(parsed.isInitialized()).isTrue();
-  }
-
-  @Test
-  public void testMergeUninitialized() throws Exception {
-    TestRequired.Builder builder = TestRequired.newBuilder();
-    TextFormat.merge(TEST_REQUIRED_UNINITIALIZED.toString(), builder);
-    assertThat(builder.buildPartial().toString()).isEqualTo(TEST_REQUIRED_UNINITIALIZED.toString());
-    assertThat(builder.isInitialized()).isFalse();
-  }
-
-  @Test
-  public void testParseUninitialized() throws Exception {
-    try {
-      TextFormat.parse(TEST_REQUIRED_UNINITIALIZED.toString(), TestRequired.class);
-      assertWithMessage("Expected UninitializedMessageException.").fail();
-    } catch (UninitializedMessageException e) {
-      assertThat(e).hasMessageThat().isEqualTo("Message missing required fields: b, c");
-    }
-  }
-
-  @Test
-  public void testMergeReader() throws Exception {
-    TestAllTypes.Builder builder = TestAllTypes.newBuilder();
-    TextFormat.merge(new StringReader(ALL_FIELDS_SET_TEXT), builder);
-    TestUtil.assertAllFieldsSet(builder.build());
-  }
-
-  @Test
-  public void testMergeExtensions() throws Exception {
-    TestAllExtensions.Builder builder = TestAllExtensions.newBuilder();
-    TextFormat.merge(ALL_EXTENSIONS_SET_TEXT, TestUtil.getFullExtensionRegistry(), builder);
-    TestUtil.assertAllExtensionsSet(builder.build());
-  }
-
-  @Test
-  public void testParseExtensions() throws Exception {
-    TestUtil.assertAllExtensionsSet(
-        TextFormat.parse(
-            ALL_EXTENSIONS_SET_TEXT, TestUtil.getFullExtensionRegistry(), TestAllExtensions.class));
-  }
-
-  @Test
-  public void testMergeAndParseCompatibility() throws Exception {
-    String original =
-        "repeated_float: inf\n"
-            + "repeated_float: -inf\n"
-            + "repeated_float: nan\n"
-            + "repeated_float: inff\n"
-            + "repeated_float: -inff\n"
-            + "repeated_float: nanf\n"
-            + "repeated_float: 1.0f\n"
-            + "repeated_float: infinityf\n"
-            + "repeated_float: -Infinityf\n"
-            + "repeated_double: infinity\n"
-            + "repeated_double: -infinity\n"
-            + "repeated_double: nan\n";
-    String canonical =
-        "repeated_float: Infinity\n"
-            + "repeated_float: -Infinity\n"
-            + "repeated_float: NaN\n"
-            + "repeated_float: Infinity\n"
-            + "repeated_float: -Infinity\n"
-            + "repeated_float: NaN\n"
-            + "repeated_float: 1.0\n"
-            + "repeated_float: Infinity\n"
-            + "repeated_float: -Infinity\n"
-            + "repeated_double: Infinity\n"
-            + "repeated_double: -Infinity\n"
-            + "repeated_double: NaN\n";
-
-    // Test merge().
-    TestAllTypes.Builder builder = TestAllTypes.newBuilder();
-    TextFormat.merge(original, builder);
-    assertThat(builder.build().toString()).isEqualTo(canonical);
-
-    // Test parse().
-    assertThat(TextFormat.parse(original, TestAllTypes.class).toString()).isEqualTo(canonical);
-  }
-
-  @Test
-  public void testMergeAndParseExotic() throws Exception {
-    TestAllTypes.Builder builder = TestAllTypes.newBuilder();
-    TextFormat.merge(EXOTIC_TEXT, builder);
-
-    // Too lazy to check things individually.  Don't try to debug this
-    // if testPrintExotic() is failing.
-    assertThat(builder.build().toString()).isEqualTo(CANONICAL_EXOTIC_TEXT);
-    assertThat(TextFormat.parse(EXOTIC_TEXT, TestAllTypes.class).toString())
-        .isEqualTo(CANONICAL_EXOTIC_TEXT);
-  }
-
-  @Test
-  public void testMergeMessageSet() throws Exception {
-    ExtensionRegistry extensionRegistry = ExtensionRegistry.newInstance();
-    extensionRegistry.add(TestMessageSetExtension1.messageSetExtension);
-    extensionRegistry.add(TestMessageSetExtension2.messageSetExtension);
-
-    TestMessageSet.Builder builder = TestMessageSet.newBuilder();
-    TextFormat.merge(MESSAGE_SET_TEXT, extensionRegistry, builder);
-    TestMessageSet messageSet = builder.build();
-
-    assertThat(messageSet.hasExtension(TestMessageSetExtension1.messageSetExtension)).isTrue();
-    assertThat(messageSet.getExtension(TestMessageSetExtension1.messageSetExtension).getI())
-        .isEqualTo(123);
-    assertThat(messageSet.hasExtension(TestMessageSetExtension2.messageSetExtension)).isTrue();
-    assertThat(messageSet.getExtension(TestMessageSetExtension2.messageSetExtension).getStr())
-        .isEqualTo("foo");
-
-    builder = TestMessageSet.newBuilder();
-    TextFormat.merge(MESSAGE_SET_TEXT_WITH_REPEATED_EXTENSION, extensionRegistry, builder);
-    messageSet = builder.build();
-    assertThat(messageSet.getExtension(TestMessageSetExtension1.messageSetExtension).getI())
-        .isEqualTo(456);
-  }
-
-  @Test
-  public void testMergeMessageSetWithOverwriteForbidden() throws Exception {
-    ExtensionRegistry extensionRegistry = ExtensionRegistry.newInstance();
-    extensionRegistry.add(TestMessageSetExtension1.messageSetExtension);
-    extensionRegistry.add(TestMessageSetExtension2.messageSetExtension);
-
-    TestMessageSet.Builder builder = TestMessageSet.newBuilder();
-    PARSER_WITH_OVERWRITE_FORBIDDEN.merge(MESSAGE_SET_TEXT, extensionRegistry, builder);
-    TestMessageSet messageSet = builder.build();
-    assertThat(messageSet.getExtension(TestMessageSetExtension1.messageSetExtension).getI())
-        .isEqualTo(123);
-    assertThat(messageSet.getExtension(TestMessageSetExtension2.messageSetExtension).getStr())
-        .isEqualTo("foo");
-
-    builder = TestMessageSet.newBuilder();
-    try {
-      PARSER_WITH_OVERWRITE_FORBIDDEN.merge(
-          MESSAGE_SET_TEXT_WITH_REPEATED_EXTENSION, extensionRegistry, builder);
-      assertWithMessage("expected parse exception").fail();
-    } catch (TextFormat.ParseException e) {
-      assertThat(e)
-          .hasMessageThat()
-          .isEqualTo(
-              "4:44: Non-repeated field "
-                  + "\"protobuf_unittest.TestMessageSetExtension1.message_set_extension\""
-                  + " cannot be overwritten.");
-    }
-  }
-
-  @Test
-  public void testMergeNumericEnum() throws Exception {
-    TestAllTypes.Builder builder = TestAllTypes.newBuilder();
-    TextFormat.merge("optional_nested_enum: 2", builder);
-    assertThat(builder.getOptionalNestedEnum()).isEqualTo(TestAllTypes.NestedEnum.BAR);
-  }
-
-  @Test
-  public void testMergeAngleBrackets() throws Exception {
-    TestAllTypes.Builder builder = TestAllTypes.newBuilder();
-    TextFormat.merge("OptionalGroup: < a: 1 >", builder);
-    assertThat(builder.hasOptionalGroup()).isTrue();
-    assertThat(builder.getOptionalGroup().getA()).isEqualTo(1);
-  }
-
-  @Test
-  public void testMergeComment() throws Exception {
-    TestAllTypes.Builder builder = TestAllTypes.newBuilder();
-    TextFormat.merge(
-        "# this is a comment\n"
-            + "optional_int32: 1  # another comment\n"
-            + "optional_int64: 2\n"
-            + "# EOF comment",
-        builder);
-    assertThat(builder.getOptionalInt32()).isEqualTo(1);
-    assertThat(builder.getOptionalInt64()).isEqualTo(2);
-  }
-
-  @Test
-  public void testPrintAny_customBuiltTypeRegistry() throws Exception {
-    TestAny testAny =
-        TestAny.newBuilder()
-            .setValue(
-                Any.newBuilder()
-                    .setTypeUrl("type.googleapis.com/" + TestAllTypes.getDescriptor().getFullName())
-                    .setValue(
-                        TestAllTypes.newBuilder().setOptionalInt32(12345).build().toByteString())
-                    .build())
-            .build();
-    String actual =
-        TextFormat.printer()
-            .usingTypeRegistry(TypeRegistry.newBuilder().add(TestAllTypes.getDescriptor()).build())
-            .printToString(testAny);
-    String expected =
-        "value {\n"
-            + "  [type.googleapis.com/protobuf_unittest.TestAllTypes] {\n"
-            + "    optional_int32: 12345\n"
-            + "  }\n"
-            + "}\n";
-    assertThat(actual).isEqualTo(expected);
-  }
-
-  private static Descriptor createDescriptorForAny(FieldDescriptorProto... fields)
-      throws Exception {
-    FileDescriptor fileDescriptor =
-        FileDescriptor.buildFrom(
-            FileDescriptorProto.newBuilder()
-                .setName("any.proto")
-                .setPackage("google.protobuf")
-                .setSyntax("proto3")
-                .addMessageType(
-                    DescriptorProto.newBuilder().setName("Any").addAllField(Arrays.asList(fields)))
-                .build(),
-            new FileDescriptor[0]);
-    return fileDescriptor.getMessageTypes().get(0);
-  }
-
-  @Test
-  public void testPrintAny_anyWithDynamicMessage() throws Exception {
-    Descriptor descriptor =
-        createDescriptorForAny(
-            FieldDescriptorProto.newBuilder()
-                .setName("type_url")
-                .setNumber(1)
-                .setLabel(FieldDescriptorProto.Label.LABEL_OPTIONAL)
-                .setType(FieldDescriptorProto.Type.TYPE_STRING)
-                .build(),
-            FieldDescriptorProto.newBuilder()
-                .setName("value")
-                .setNumber(2)
-                .setLabel(FieldDescriptorProto.Label.LABEL_OPTIONAL)
-                .setType(FieldDescriptorProto.Type.TYPE_BYTES)
-                .build());
-    DynamicMessage testAny =
-        DynamicMessage.newBuilder(descriptor)
-            .setField(
-                descriptor.findFieldByNumber(1),
-                "type.googleapis.com/" + TestAllTypes.getDescriptor().getFullName())
-            .setField(
-                descriptor.findFieldByNumber(2),
-                TestAllTypes.newBuilder().setOptionalInt32(12345).build().toByteString())
-            .build();
-    String actual =
-        TextFormat.printer()
-            .usingTypeRegistry(TypeRegistry.newBuilder().add(TestAllTypes.getDescriptor()).build())
-            .printToString(testAny);
-    String expected =
-        "[type.googleapis.com/protobuf_unittest.TestAllTypes] {\n"
-            + "  optional_int32: 12345\n"
-            + "}\n";
-    assertThat(actual).isEqualTo(expected);
-  }
-
-  @Test
-  public void testPrintAny_anyFromWithNoValueField() throws Exception {
-    Descriptor descriptor =
-        createDescriptorForAny(
-            FieldDescriptorProto.newBuilder()
-                .setName("type_url")
-                .setNumber(1)
-                .setLabel(FieldDescriptorProto.Label.LABEL_OPTIONAL)
-                .setType(FieldDescriptorProto.Type.TYPE_STRING)
-                .build());
-    DynamicMessage testAny =
-        DynamicMessage.newBuilder(descriptor)
-            .setField(
-                descriptor.findFieldByNumber(1),
-                "type.googleapis.com/" + TestAllTypes.getDescriptor().getFullName())
-            .build();
-    String actual =
-        TextFormat.printer()
-            .usingTypeRegistry(TypeRegistry.newBuilder().add(TestAllTypes.getDescriptor()).build())
-            .printToString(testAny);
-    String expected = "type_url: \"type.googleapis.com/protobuf_unittest.TestAllTypes\"\n";
-    assertThat(actual).isEqualTo(expected);
-  }
-
-  @Test
-  public void testPrintAny_anyFromWithNoTypeUrlField() throws Exception {
-    Descriptor descriptor =
-        createDescriptorForAny(
-            FieldDescriptorProto.newBuilder()
-                .setName("value")
-                .setNumber(2)
-                .setLabel(FieldDescriptorProto.Label.LABEL_OPTIONAL)
-                .setType(FieldDescriptorProto.Type.TYPE_BYTES)
-                .build());
-    DynamicMessage testAny =
-        DynamicMessage.newBuilder(descriptor)
-            .setField(
-                descriptor.findFieldByNumber(2),
-                TestAllTypes.newBuilder().setOptionalInt32(12345).build().toByteString())
-            .build();
-    String actual =
-        TextFormat.printer()
-            .usingTypeRegistry(TypeRegistry.newBuilder().add(TestAllTypes.getDescriptor()).build())
-            .printToString(testAny);
-    String expected = "value: \"\\b\\271`\"\n";
-    assertThat(actual).isEqualTo(expected);
-  }
-
-  @Test
-  public void testPrintAny_anyWithInvalidFieldType() throws Exception {
-    Descriptor descriptor =
-        createDescriptorForAny(
-            FieldDescriptorProto.newBuilder()
-                .setName("type_url")
-                .setNumber(1)
-                .setLabel(FieldDescriptorProto.Label.LABEL_OPTIONAL)
-                .setType(FieldDescriptorProto.Type.TYPE_STRING)
-                .build(),
-            FieldDescriptorProto.newBuilder()
-                .setName("value")
-                .setNumber(2)
-                .setLabel(FieldDescriptorProto.Label.LABEL_OPTIONAL)
-                .setType(FieldDescriptorProto.Type.TYPE_STRING)
-                .build());
-    DynamicMessage testAny =
-        DynamicMessage.newBuilder(descriptor)
-            .setField(
-                descriptor.findFieldByNumber(1),
-                "type.googleapis.com/" + TestAllTypes.getDescriptor().getFullName())
-            .setField(descriptor.findFieldByNumber(2), "test")
-            .build();
-    String actual =
-        TextFormat.printer()
-            .usingTypeRegistry(TypeRegistry.newBuilder().add(TestAllTypes.getDescriptor()).build())
-            .printToString(testAny);
-    String expected =
-        "type_url: \"type.googleapis.com/protobuf_unittest.TestAllTypes\"\n" + "value: \"test\"\n";
-    assertThat(actual).isEqualTo(expected);
-  }
-
-
-  @Test
-  public void testMergeAny_customBuiltTypeRegistry() throws Exception {
-    TestAny.Builder builder = TestAny.newBuilder();
-    TextFormat.Parser.newBuilder()
-        .setTypeRegistry(TypeRegistry.newBuilder().add(TestAllTypes.getDescriptor()).build())
-        .build()
-        .merge(
-            "value: {\n"
-                + "[type.googleapis.com/protobuf_unittest.TestAllTypes] {\n"
-                + "optional_int32: 12345\n"
-                + "optional_nested_message {\n"
-                + "  bb: 123\n"
-                + "}\n"
-                + "}\n"
-                + "}",
-            builder);
-    assertThat(builder.build())
-        .isEqualTo(
-            TestAny.newBuilder()
-                .setValue(
-                    Any.newBuilder()
-                        .setTypeUrl(
-                            "type.googleapis.com/" + TestAllTypes.getDescriptor().getFullName())
-                        .setValue(
-                            TestAllTypes.newBuilder()
-                                .setOptionalInt32(12345)
-                                .setOptionalNestedMessage(
-                                    TestAllTypes.NestedMessage.newBuilder().setBb(123))
-                                .build()
-                                .toByteString())
-                        .build())
-                .build());
-  }
-
-
-  private void assertParseError(String error, String text) {
-    // Test merge().
-    TestAllTypes.Builder builder = TestAllTypes.newBuilder();
-    try {
-      TextFormat.merge(text, TestUtil.getFullExtensionRegistry(), builder);
-      assertWithMessage("Expected parse exception.").fail();
-    } catch (TextFormat.ParseException e) {
-      assertThat(e).hasMessageThat().isEqualTo(error);
-    }
-
-    // Test parse().
-    try {
-      TextFormat.parse(text, TestUtil.getFullExtensionRegistry(), TestAllTypes.class);
-      assertWithMessage("Expected parse exception.").fail();
-    } catch (TextFormat.ParseException e) {
-      assertThat(e).hasMessageThat().isEqualTo(error);
-    }
-  }
-
-  private void assertParseErrorWithUnknownFields(String error, String text) {
-    TestAllTypes.Builder builder = TestAllTypes.newBuilder();
-    try {
-      PARSER_ALLOWING_UNKNOWN_FIELDS.merge(text, TestUtil.getFullExtensionRegistry(), builder);
-      assertWithMessage("Expected parse exception.").fail();
-    } catch (TextFormat.ParseException e) {
-      assertThat(e).hasMessageThat().isEqualTo(error);
-    }
-  }
-
-  private TestAllTypes assertParseSuccessWithUnknownFields(String text)
-      throws TextFormat.ParseException {
-    TestAllTypes.Builder builder = TestAllTypes.newBuilder();
-    PARSER_ALLOWING_UNKNOWN_FIELDS.merge(text, TestUtil.getFullExtensionRegistry(), builder);
-    return builder.build();
-  }
-
-  private void assertParseErrorWithUnknownExtensions(String error, String text) {
-    TestAllTypes.Builder builder = TestAllTypes.newBuilder();
-    try {
-      PARSER_ALLOWING_UNKNOWN_EXTENSIONS.merge(text, builder);
-      assertWithMessage("Expected parse exception.").fail();
-    } catch (TextFormat.ParseException e) {
-      assertThat(e).hasMessageThat().isEqualTo(error);
-    }
-  }
-
-  private TestAllTypes assertParseSuccessWithUnknownExtensions(String text)
-      throws TextFormat.ParseException {
-    TestAllTypes.Builder builder = TestAllTypes.newBuilder();
-    PARSER_ALLOWING_UNKNOWN_EXTENSIONS.merge(text, builder);
-    return builder.build();
-  }
-
-  private void assertParseErrorWithOverwriteForbidden(String error, String text) {
-    TestAllTypes.Builder builder = TestAllTypes.newBuilder();
-    try {
-      PARSER_WITH_OVERWRITE_FORBIDDEN.merge(text, TestUtil.getFullExtensionRegistry(), builder);
-      assertWithMessage("Expected parse exception.").fail();
-    } catch (TextFormat.ParseException e) {
-      assertThat(e).hasMessageThat().isEqualTo(error);
-    }
-  }
-
-  private TestAllTypes assertParseSuccessWithOverwriteForbidden(String text)
-      throws TextFormat.ParseException {
-    TestAllTypes.Builder builder = TestAllTypes.newBuilder();
-    PARSER_WITH_OVERWRITE_FORBIDDEN.merge(text, TestUtil.getFullExtensionRegistry(), builder);
-    return builder.build();
-  }
-
-  @Test
-  public void testParseErrors() throws Exception {
-    assertParseError("1:16: Expected \":\".", "optional_int32 123");
-    assertParseError("1:23: Expected identifier. Found '?'", "optional_nested_enum: ?");
-    assertParseError(
-        "1:18: Couldn't parse integer: Number must be positive: -1", "optional_uint32: -1");
-    assertParseError(
-        "1:17: Couldn't parse integer: Number out of range for 32-bit signed "
-            + "integer: 82301481290849012385230157",
-        "optional_int32: 82301481290849012385230157");
-    assertParseError(
-        "1:16: Expected \"true\" or \"false\". Found \"maybe\".", "optional_bool: maybe");
-    assertParseError("1:16: Expected \"true\" or \"false\". Found \"2\".", "optional_bool: 2");
-    assertParseError("1:18: Expected string.", "optional_string: 123");
-    assertParseError("1:18: String missing ending quote.", "optional_string: \"ueoauaoe");
-    assertParseError(
-        "1:18: String missing ending quote.", "optional_string: \"ueoauaoe\noptional_int32: 123");
-    assertParseError("1:18: Invalid escape sequence: '\\z'", "optional_string: \"\\z\"");
-    assertParseError(
-        "1:18: String missing ending quote.", "optional_string: \"ueoauaoe\noptional_int32: 123");
-    assertParseError(
-        "1:2: Input contains unknown fields and/or extensions:\n"
-            + "1:2:\tprotobuf_unittest.TestAllTypes.[nosuchext]",
-        "[nosuchext]: 123");
-    assertParseError(
-        "1:20: Extension \"protobuf_unittest.optional_int32_extension\" does "
-            + "not extend message type \"protobuf_unittest.TestAllTypes\".",
-        "[protobuf_unittest.optional_int32_extension]: 123");
-    assertParseError(
-        "1:1: Input contains unknown fields and/or extensions:\n"
-            + "1:1:\tprotobuf_unittest.TestAllTypes.nosuchfield",
-        "nosuchfield: 123");
-    assertParseError("1:21: Expected \">\".", "OptionalGroup < a: 1");
-    assertParseError(
-        "1:23: Enum type \"protobuf_unittest.TestAllTypes.NestedEnum\" has no "
-            + "value named \"NO_SUCH_VALUE\".",
-        "optional_nested_enum: NO_SUCH_VALUE");
-    assertParseError(
-        "1:23: Enum type \"protobuf_unittest.TestAllTypes.NestedEnum\" has no "
-            + "value with number 123.",
-        "optional_nested_enum: 123");
-
-    // Delimiters must match.
-    assertParseError("1:22: Expected identifier. Found '}'", "OptionalGroup < a: 1 }");
-    assertParseError("1:22: Expected identifier. Found '>'", "OptionalGroup { a: 1 >");
-  }
-
-  // =================================================================
-  @Test
-  public void testEscapeQuestionMark() throws InvalidEscapeSequenceException {
-    assertThat(TextFormat.unescapeText("?")).isEqualTo("?");
-    assertThat(TextFormat.unescapeText("\\?")).isEqualTo("?");
-  }
-
-  @Test
-  public void testEscape() throws Exception {
-    // Escape sequences.
-    assertThat(TextFormat.escapeBytes(bytes("\0\001\007\b\f\n\r\t\013\\\'\"\177")))
-        .isEqualTo("\\000\\001\\a\\b\\f\\n\\r\\t\\v\\\\\\'\\\"\\177");
-    assertThat(TextFormat.escapeText("\0\001\007\b\f\n\r\t\013\\\'\"\177"))
-        .isEqualTo("\\000\\001\\a\\b\\f\\n\\r\\t\\v\\\\\\'\\\"\\177");
-    assertThat(TextFormat.unescapeBytes("\\000\\001\\a\\b\\f\\n\\r\\t\\v\\\\\\'\\\""))
-        .isEqualTo(bytes("\0\001\007\b\f\n\r\t\013\\\'\""));
-    assertThat(TextFormat.unescapeText("\\000\\001\\a\\b\\f\\n\\r\\t\\v\\\\\\'\\\""))
-        .isEqualTo("\0\001\007\b\f\n\r\t\013\\\'\"");
-    assertThat(TextFormat.escapeText(ESCAPE_TEST_STRING)).isEqualTo(ESCAPE_TEST_STRING_ESCAPED);
-    assertThat(TextFormat.unescapeText(ESCAPE_TEST_STRING_ESCAPED)).isEqualTo(ESCAPE_TEST_STRING);
-
-    // Invariant
-    assertThat(TextFormat.escapeBytes(bytes("hello"))).isEqualTo("hello");
-    assertThat(TextFormat.escapeText("hello")).isEqualTo("hello");
-    assertThat(TextFormat.unescapeBytes("hello")).isEqualTo(bytes("hello"));
-    assertThat(TextFormat.unescapeText("hello")).isEqualTo("hello");
-
-    // Unicode handling.
-    assertThat(TextFormat.escapeText("\u1234")).isEqualTo("\\341\\210\\264");
-    assertThat(TextFormat.escapeBytes(bytes(0xe1, 0x88, 0xb4))).isEqualTo("\\341\\210\\264");
-    assertThat(TextFormat.unescapeText("\\341\\210\\264")).isEqualTo("\u1234");
-    assertThat(TextFormat.unescapeBytes("\\341\\210\\264")).isEqualTo(bytes(0xe1, 0x88, 0xb4));
-    assertThat(TextFormat.unescapeText("\\xe1\\x88\\xb4")).isEqualTo("\u1234");
-    assertThat(TextFormat.unescapeBytes("\\xe1\\x88\\xb4")).isEqualTo(bytes(0xe1, 0x88, 0xb4));
-    assertThat(TextFormat.unescapeText("\\u1234")).isEqualTo("\u1234");
-    assertThat(TextFormat.unescapeBytes("\\u1234")).isEqualTo(bytes(0xe1, 0x88, 0xb4));
-    assertThat(TextFormat.unescapeBytes("\\U00001234")).isEqualTo(bytes(0xe1, 0x88, 0xb4));
-    assertThat(TextFormat.unescapeText("\\xf0\\x90\\x90\\xb7"))
-        .isEqualTo(new String(new int[] {0x10437}, 0, 1));
-    assertThat(TextFormat.unescapeBytes("\\U00010437")).isEqualTo(bytes(0xf0, 0x90, 0x90, 0xb7));
-
-    // Handling of strings with unescaped Unicode characters > 255.
-    final String zh = "\u9999\u6e2f\u4e0a\u6d77\ud84f\udf80\u8c50\u9280\u884c";
-    ByteString zhByteString = ByteString.copyFromUtf8(zh);
-    assertThat(TextFormat.unescapeBytes(zh)).isEqualTo(zhByteString);
-
-    // Errors.
-    try {
-      TextFormat.unescapeText("\\x");
-      assertWithMessage("Should have thrown an exception.").fail();
-    } catch (TextFormat.InvalidEscapeSequenceException e) {
-      // success
-    }
-
-    try {
-      TextFormat.unescapeText("\\z");
-      assertWithMessage("Should have thrown an exception.").fail();
-    } catch (TextFormat.InvalidEscapeSequenceException e) {
-      // success
-    }
-
-    try {
-      TextFormat.unescapeText("\\");
-      assertWithMessage("Should have thrown an exception.").fail();
-    } catch (TextFormat.InvalidEscapeSequenceException e) {
-      // success
-    }
-
-    try {
-      TextFormat.unescapeText("\\u");
-      assertWithMessage("Should have thrown an exception.").fail();
-    } catch (TextFormat.InvalidEscapeSequenceException e) {
-      assertThat(e)
-          .hasMessageThat()
-          .isEqualTo("Invalid escape sequence: '\\u' with too few hex chars");
-    }
-
-    try {
-      TextFormat.unescapeText("\\ud800");
-      assertWithMessage("Should have thrown an exception.").fail();
-    } catch (TextFormat.InvalidEscapeSequenceException e) {
-      assertThat(e)
-          .hasMessageThat()
-          .isEqualTo("Invalid escape sequence: '\\u' refers to a surrogate");
-    }
-
-    try {
-      TextFormat.unescapeText("\\ud800\\u1234");
-      assertWithMessage("Should have thrown an exception.").fail();
-    } catch (TextFormat.InvalidEscapeSequenceException e) {
-      assertThat(e)
-          .hasMessageThat()
-          .isEqualTo("Invalid escape sequence: '\\u' refers to a surrogate");
-    }
-
-    try {
-      TextFormat.unescapeText("\\udc00");
-      assertWithMessage("Should have thrown an exception.").fail();
-    } catch (TextFormat.InvalidEscapeSequenceException e) {
-      assertThat(e)
-          .hasMessageThat()
-          .isEqualTo("Invalid escape sequence: '\\u' refers to a surrogate");
-    }
-
-    try {
-      TextFormat.unescapeText("\\ud801\\udc37");
-      assertWithMessage("Should have thrown an exception.").fail();
-    } catch (TextFormat.InvalidEscapeSequenceException e) {
-      assertThat(e)
-          .hasMessageThat()
-          .isEqualTo("Invalid escape sequence: '\\u' refers to a surrogate");
-    }
-
-    try {
-      TextFormat.unescapeText("\\U1234");
-      assertWithMessage("Should have thrown an exception.").fail();
-    } catch (TextFormat.InvalidEscapeSequenceException e) {
-      assertThat(e)
-          .hasMessageThat()
-          .isEqualTo("Invalid escape sequence: '\\U' with too few hex chars");
-    }
-
-    try {
-      TextFormat.unescapeText("\\U1234no more hex");
-      assertWithMessage("Should have thrown an exception.").fail();
-    } catch (TextFormat.InvalidEscapeSequenceException e) {
-      assertThat(e)
-          .hasMessageThat()
-          .isEqualTo("Invalid escape sequence: '\\U' with too few hex chars");
-    }
-
-    try {
-      TextFormat.unescapeText("\\U00110000");
-      assertWithMessage("Should have thrown an exception.").fail();
-    } catch (TextFormat.InvalidEscapeSequenceException e) {
-      assertThat(e)
-          .hasMessageThat()
-          .isEqualTo("Invalid escape sequence: '\\U00110000' is not a valid code point value");
-    }
-
-    try {
-      TextFormat.unescapeText("\\U0000d801\\U00000dc37");
-      assertWithMessage("Should have thrown an exception.").fail();
-    } catch (TextFormat.InvalidEscapeSequenceException e) {
-      assertThat(e)
-          .hasMessageThat()
-          .isEqualTo("Invalid escape sequence: '\\U0000d801' refers to a surrogate code unit");
-    }
-  }
-
-  @Test
-  public void testParseInteger() throws Exception {
-    assertThat(TextFormat.parseInt32("0")).isEqualTo(0);
-    assertThat(TextFormat.parseInt32("1")).isEqualTo(1);
-    assertThat(TextFormat.parseInt32("-1")).isEqualTo(-1);
-    assertThat(TextFormat.parseInt32("12345")).isEqualTo(12345);
-    assertThat(TextFormat.parseInt32("-12345")).isEqualTo(-12345);
-    assertThat(TextFormat.parseInt32("2147483647")).isEqualTo(2147483647);
-    assertThat(TextFormat.parseInt32("-2147483648")).isEqualTo(-2147483648);
-
-    assertThat(TextFormat.parseUInt32("0")).isEqualTo(0);
-    assertThat(TextFormat.parseUInt32("1")).isEqualTo(1);
-    assertThat(TextFormat.parseUInt32("12345")).isEqualTo(12345);
-    assertThat(TextFormat.parseUInt32("2147483647")).isEqualTo(2147483647);
-    assertThat(TextFormat.parseUInt32("2147483648")).isEqualTo((int) 2147483648L);
-    assertThat(TextFormat.parseUInt32("4294967295")).isEqualTo((int) 4294967295L);
-
-    assertThat(TextFormat.parseInt64("0")).isEqualTo(0L);
-    assertThat(TextFormat.parseInt64("1")).isEqualTo(1L);
-    assertThat(TextFormat.parseInt64("-1")).isEqualTo(-1L);
-    assertThat(TextFormat.parseInt64("12345")).isEqualTo(12345L);
-    assertThat(TextFormat.parseInt64("-12345")).isEqualTo(-12345L);
-    assertThat(TextFormat.parseInt64("2147483647")).isEqualTo(2147483647L);
-    assertThat(TextFormat.parseInt64("-2147483648")).isEqualTo(-2147483648L);
-    assertThat(TextFormat.parseInt64("4294967295")).isEqualTo(4294967295L);
-    assertThat(TextFormat.parseInt64("4294967296")).isEqualTo(4294967296L);
-    assertThat(TextFormat.parseInt64("9223372036854775807")).isEqualTo(9223372036854775807L);
-    assertThat(TextFormat.parseInt64("-9223372036854775808")).isEqualTo(-9223372036854775808L);
-
-    assertThat(TextFormat.parseUInt64("0")).isEqualTo(0L);
-    assertThat(TextFormat.parseUInt64("1")).isEqualTo(1L);
-    assertThat(TextFormat.parseUInt64("12345")).isEqualTo(12345L);
-    assertThat(TextFormat.parseUInt64("2147483647")).isEqualTo(2147483647L);
-    assertThat(TextFormat.parseUInt64("4294967295")).isEqualTo(4294967295L);
-    assertThat(TextFormat.parseUInt64("4294967296")).isEqualTo(4294967296L);
-    assertThat(TextFormat.parseUInt64("9223372036854775807")).isEqualTo(9223372036854775807L);
-    assertThat(TextFormat.parseUInt64("9223372036854775808")).isEqualTo(-9223372036854775808L);
-    assertThat(TextFormat.parseUInt64("18446744073709551615")).isEqualTo(-1L);
-
-    // Hex
-    assertThat(TextFormat.parseInt32("0x1234abcd")).isEqualTo(0x1234abcd);
-    assertThat(TextFormat.parseInt32("-0x1234abcd")).isEqualTo(-0x1234abcd);
-    assertThat(TextFormat.parseUInt64("0xffffffffffffffff")).isEqualTo(-1);
-    assertThat(TextFormat.parseInt64("0x7fffffffffffffff")).isEqualTo(0x7fffffffffffffffL);
-
-    // Octal
-    assertThat(TextFormat.parseInt32("01234567")).isEqualTo(01234567);
-
-    // Out-of-range
-    try {
-      TextFormat.parseInt32("2147483648");
-      assertWithMessage("Should have thrown an exception.").fail();
-    } catch (NumberFormatException e) {
-      // success
-    }
-
-    try {
-      TextFormat.parseInt32("-2147483649");
-      assertWithMessage("Should have thrown an exception.").fail();
-    } catch (NumberFormatException e) {
-      // success
-    }
-
-    try {
-      TextFormat.parseUInt32("4294967296");
-      assertWithMessage("Should have thrown an exception.").fail();
-    } catch (NumberFormatException e) {
-      // success
-    }
-
-    try {
-      TextFormat.parseUInt32("-1");
-      assertWithMessage("Should have thrown an exception.").fail();
-    } catch (NumberFormatException e) {
-      // success
-    }
-
-    try {
-      TextFormat.parseInt64("9223372036854775808");
-      assertWithMessage("Should have thrown an exception.").fail();
-    } catch (NumberFormatException e) {
-      // success
-    }
-
-    try {
-      TextFormat.parseInt64("-9223372036854775809");
-      assertWithMessage("Should have thrown an exception.").fail();
-    } catch (NumberFormatException e) {
-      // success
-    }
-
-    try {
-      TextFormat.parseUInt64("18446744073709551616");
-      assertWithMessage("Should have thrown an exception.").fail();
-    } catch (NumberFormatException e) {
-      // success
-    }
-
-    try {
-      TextFormat.parseUInt64("-1");
-      assertWithMessage("Should have thrown an exception.").fail();
-    } catch (NumberFormatException e) {
-      // success
-    }
-
-    // Not a number.
-    try {
-      TextFormat.parseInt32("abcd");
-      assertWithMessage("Should have thrown an exception.").fail();
-    } catch (NumberFormatException e) {
-      // success
-    }
-  }
-
-  @Test
-  public void testParseString() throws Exception {
-    final String zh = "\u9999\u6e2f\u4e0a\u6d77\ud84f\udf80\u8c50\u9280\u884c";
-    TestAllTypes.Builder builder = TestAllTypes.newBuilder();
-    TextFormat.merge("optional_string: \"" + zh + "\"", builder);
-    assertThat(builder.getOptionalString()).isEqualTo(zh);
-  }
-
-  @Test
-  public void testParseLongString() throws Exception {
-    String longText =
-        "123456789012345678901234567890123456789012345678901234567890"
-            + "123456789012345678901234567890123456789012345678901234567890"
-            + "123456789012345678901234567890123456789012345678901234567890"
-            + "123456789012345678901234567890123456789012345678901234567890"
-            + "123456789012345678901234567890123456789012345678901234567890"
-            + "123456789012345678901234567890123456789012345678901234567890"
-            + "123456789012345678901234567890123456789012345678901234567890"
-            + "123456789012345678901234567890123456789012345678901234567890"
-            + "123456789012345678901234567890123456789012345678901234567890"
-            + "123456789012345678901234567890123456789012345678901234567890"
-            + "123456789012345678901234567890123456789012345678901234567890"
-            + "123456789012345678901234567890123456789012345678901234567890"
-            + "123456789012345678901234567890123456789012345678901234567890"
-            + "123456789012345678901234567890123456789012345678901234567890"
-            + "123456789012345678901234567890123456789012345678901234567890"
-            + "123456789012345678901234567890123456789012345678901234567890"
-            + "123456789012345678901234567890123456789012345678901234567890"
-            + "123456789012345678901234567890123456789012345678901234567890"
-            + "123456789012345678901234567890123456789012345678901234567890"
-            + "123456789012345678901234567890123456789012345678901234567890";
-
-    TestAllTypes.Builder builder = TestAllTypes.newBuilder();
-    TextFormat.merge("optional_string: \"" + longText + "\"", builder);
-    assertThat(builder.getOptionalString()).isEqualTo(longText);
-  }
-
-  @Test
-  public void testParseBoolean() throws Exception {
-    String goodText =
-        "repeated_bool: t  repeated_bool : 0\n"
-            + "repeated_bool :f repeated_bool:1\n"
-            + "repeated_bool: False repeated_bool: True";
-    String goodTextCanonical =
-        "repeated_bool: true\n"
-            + "repeated_bool: false\n"
-            + "repeated_bool: false\n"
-            + "repeated_bool: true\n"
-            + "repeated_bool: false\n"
-            + "repeated_bool: true\n";
-    TestAllTypes.Builder builder = TestAllTypes.newBuilder();
-    TextFormat.merge(goodText, builder);
-    assertThat(builder.build().toString()).isEqualTo(goodTextCanonical);
-
-    try {
-      TestAllTypes.Builder badBuilder = TestAllTypes.newBuilder();
-      TextFormat.merge("optional_bool:2", badBuilder);
-      assertWithMessage("Should have thrown an exception.").fail();
-    } catch (TextFormat.ParseException e) {
-      // success
-    }
-    try {
-      TestAllTypes.Builder badBuilder = TestAllTypes.newBuilder();
-      TextFormat.merge("optional_bool: foo", badBuilder);
-      assertWithMessage("Should have thrown an exception.").fail();
-    } catch (TextFormat.ParseException e) {
-      // success
-    }
-  }
-
-  @Test
-  public void testParseAdjacentStringLiterals() throws Exception {
-    TestAllTypes.Builder builder = TestAllTypes.newBuilder();
-    TextFormat.merge("optional_string: \"foo\" 'corge' \"grault\"", builder);
-    assertThat(builder.getOptionalString()).isEqualTo("foocorgegrault");
-  }
-
-  @Test
-  public void testPrintFieldValue() throws Exception {
-    assertPrintFieldValue("\"Hello\"", "Hello", "repeated_string");
-    assertPrintFieldValue("123.0", 123f, "repeated_float");
-    assertPrintFieldValue("123.0", 123d, "repeated_double");
-    assertPrintFieldValue("123", 123, "repeated_int32");
-    assertPrintFieldValue("123", 123L, "repeated_int64");
-    assertPrintFieldValue("true", true, "repeated_bool");
-    assertPrintFieldValue("4294967295", 0xFFFFFFFF, "repeated_uint32");
-    assertPrintFieldValue("18446744073709551615", 0xFFFFFFFFFFFFFFFFL, "repeated_uint64");
-    assertPrintFieldValue(
-        "\"\\001\\002\\003\"", ByteString.copyFrom(new byte[] {1, 2, 3}), "repeated_bytes");
-  }
-
-  private void assertPrintFieldValue(String expect, Object value, String fieldName)
-      throws Exception {
-    StringBuilder sb = new StringBuilder();
-    TextFormat.printer()
-        .printFieldValue(TestAllTypes.getDescriptor().findFieldByName(fieldName), value, sb);
-    assertThat(sb.toString()).isEqualTo(expect);
-  }
-
-  @Test
-  public void testPrintFieldValueThrows() throws Exception {
-    assertPrintFieldThrowsClassCastException(5, "repeated_string");
-    assertPrintFieldThrowsClassCastException(5L, "repeated_string");
-    assertPrintFieldThrowsClassCastException(ByteString.EMPTY, "repeated_string");
-    assertPrintFieldThrowsClassCastException(5, "repeated_float");
-    assertPrintFieldThrowsClassCastException(5D, "repeated_float");
-    assertPrintFieldThrowsClassCastException("text", "repeated_float");
-    assertPrintFieldThrowsClassCastException(5, "repeated_double");
-    assertPrintFieldThrowsClassCastException(5F, "repeated_double");
-    assertPrintFieldThrowsClassCastException("text", "repeated_double");
-    assertPrintFieldThrowsClassCastException(123L, "repeated_int32");
-    assertPrintFieldThrowsClassCastException(123, "repeated_int64");
-    assertPrintFieldThrowsClassCastException(1, "repeated_bytes");
-  }
-
-  private void assertPrintFieldThrowsClassCastException(final Object value, String fieldName)
-      throws Exception {
-    final StringBuilder stringBuilder = new StringBuilder();
-    final FieldDescriptor fieldDescriptor = TestAllTypes.getDescriptor().findFieldByName(fieldName);
-    assertThrows(
-        ClassCastException.class,
-        new ThrowingRunnable() {
-          @Override
-          public void run() throws Throwable {
-            TextFormat.printer().printFieldValue(fieldDescriptor, value, stringBuilder);
-          }
-        });
-  }
-
-  @Test
-  public void testShortDebugString() {
-    assertThat(
-            TextFormat.shortDebugString(
-                TestAllTypes.newBuilder()
-                    .addRepeatedInt32(1)
-                    .addRepeatedUint32(2)
-                    .setOptionalNestedMessage(NestedMessage.newBuilder().setBb(42).build())
-                    .build()))
-        .isEqualTo("optional_nested_message { bb: 42 } repeated_int32: 1 repeated_uint32: 2");
-  }
-
-  @Test
-  public void testShortDebugString_field() {
-    final FieldDescriptor dataField = OneString.getDescriptor().findFieldByName("data");
-    assertThat(TextFormat.printer().shortDebugString(dataField, "test data"))
-        .isEqualTo("data: \"test data\"");
-
-    final FieldDescriptor optionalField =
-        TestAllTypes.getDescriptor().findFieldByName("optional_nested_message");
-    final Object value = NestedMessage.newBuilder().setBb(42).build();
-
-    assertThat(TextFormat.printer().shortDebugString(optionalField, value))
-        .isEqualTo("optional_nested_message { bb: 42 }");
-  }
-
-  @Test
-  public void testShortDebugString_unknown() {
-    assertThat(TextFormat.printer().shortDebugString(makeUnknownFieldSet()))
-        .isEqualTo(
-            "5: 1 5: 0x00000002 5: 0x0000000000000003 5: \"4\" 5: { 12: 6 } 5 { 10: 5 }"
-                + " 8: 1 8: 2 8: 3 15: 12379813812177893520 15: 0xabcd1234 15:"
-                + " 0xabcdef1234567890");
-  }
-
-  @Test
-  public void testPrintToUnicodeString() throws Exception {
-    assertThat(
-            TextFormat.printer()
-                .escapingNonAscii(false)
-                .printToString(
-                    TestAllTypes.newBuilder()
-                        .setOptionalString("abc\u3042efg")
-                        .setOptionalBytes(bytes(0xe3, 0x81, 0x82))
-                        .addRepeatedString("\u3093XYZ")
-                        .build()))
-        .isEqualTo(
-            "optional_string: \"abc\u3042efg\"\n"
-                + "optional_bytes: \"\\343\\201\\202\"\n"
-                + "repeated_string: \"\u3093XYZ\"\n");
-
-    // Double quotes and backslashes should be escaped
-    assertThat(
-            TextFormat.printer()
-                .escapingNonAscii(false)
-                .printToString(TestAllTypes.newBuilder().setOptionalString("a\\bc\"ef\"g").build()))
-        .isEqualTo("optional_string: \"a\\\\bc\\\"ef\\\"g\"\n");
-
-    // Test escaping roundtrip
-    TestAllTypes message = TestAllTypes.newBuilder().setOptionalString("a\\bc\\\"ef\"g").build();
-    TestAllTypes.Builder builder = TestAllTypes.newBuilder();
-    TextFormat.merge(TextFormat.printer().escapingNonAscii(false).printToString(message), builder);
-    assertThat(builder.getOptionalString()).isEqualTo(message.getOptionalString());
-  }
-
-  @Test
-  public void testPrintToUnicodeStringWithNewlines() throws Exception {
-    // No newlines at start and end
-    assertThat(
-            TextFormat.printer()
-                .escapingNonAscii(false)
-                .printToString(
-                    TestAllTypes.newBuilder()
-                        .setOptionalString("test newlines\n\nin\nstring")
-                        .build()))
-        .isEqualTo("optional_string: \"test newlines\\n\\nin\\nstring\"\n");
-
-    // Newlines at start and end
-    assertThat(
-            TextFormat.printer()
-                .escapingNonAscii(false)
-                .printToString(
-                    TestAllTypes.newBuilder()
-                        .setOptionalString("\ntest\nnewlines\n\nin\nstring\n")
-                        .build()))
-        .isEqualTo("optional_string: \"\\ntest\\nnewlines\\n\\nin\\nstring\\n\"\n");
-
-    // Strings with 0, 1 and 2 newlines.
-    assertThat(
-            TextFormat.printer()
-                .escapingNonAscii(false)
-                .printToString(TestAllTypes.newBuilder().setOptionalString("").build()))
-        .isEqualTo("optional_string: \"\"\n");
-    assertThat(
-            TextFormat.printer()
-                .escapingNonAscii(false)
-                .printToString(TestAllTypes.newBuilder().setOptionalString("\n").build()))
-        .isEqualTo("optional_string: \"\\n\"\n");
-    assertThat(
-            TextFormat.printer()
-                .escapingNonAscii(false)
-                .printToString(TestAllTypes.newBuilder().setOptionalString("\n\n").build()))
-        .isEqualTo("optional_string: \"\\n\\n\"\n");
-
-    // Test escaping roundtrip
-    TestAllTypes message =
-        TestAllTypes.newBuilder().setOptionalString("\ntest\nnewlines\n\nin\nstring\n").build();
-    TestAllTypes.Builder builder = TestAllTypes.newBuilder();
-    TextFormat.merge(TextFormat.printer().escapingNonAscii(false).printToString(message), builder);
-    assertThat(builder.getOptionalString()).isEqualTo(message.getOptionalString());
-  }
-
-  @Test
-  public void testPrintToUnicodeString_unknown() {
-    assertThat(
-            TextFormat.printer()
-                .escapingNonAscii(false)
-                .printToString(
-                    UnknownFieldSet.newBuilder()
-                        .addField(
-                            1,
-                            UnknownFieldSet.Field.newBuilder()
-                                .addLengthDelimited(bytes(0xe3, 0x81, 0x82))
-                                .build())
-                        .build()))
-        .isEqualTo("1: \"\\343\\201\\202\"\n");
-  }
-
-
-  @Test
-  public void testParseUnknownExtensions() throws Exception {
-    TestUtil.TestLogHandler logHandler = new TestUtil.TestLogHandler();
-    Logger logger = Logger.getLogger(TextFormat.class.getName());
-    logger.addHandler(logHandler);
-    // Test unknown extension can pass.
-    assertParseSuccessWithUnknownExtensions("[unknown_extension]: 123");
-    assertParseSuccessWithUnknownExtensions(
-        "[unknown_extension]: 123\n" + "[unknown_ext]: inf\n" + "[unknown]: 1.234");
-    // Test warning messages.
-    assertThat(logHandler.getStoredLogRecords().get(0).getMessage())
-        .isEqualTo(
-            "Input contains unknown fields and/or extensions:\n"
-                + "1:2:\tprotobuf_unittest.TestAllTypes.[unknown_extension]");
-    assertThat(logHandler.getStoredLogRecords().get(1).getMessage())
-        .isEqualTo(
-            "Input contains unknown fields and/or extensions:\n"
-                + "1:2:\tprotobuf_unittest.TestAllTypes.[unknown_extension]\n"
-                + "2:2:\tprotobuf_unittest.TestAllTypes.[unknown_ext]\n"
-                + "3:2:\tprotobuf_unittest.TestAllTypes.[unknown]");
-
-    // Test unknown field can not pass.
-    assertParseErrorWithUnknownExtensions(
-        "2:1: Input contains unknown fields and/or extensions:\n"
-            + "1:2:\tprotobuf_unittest.TestAllTypes.[unknown_extension]\n"
-            + "2:1:\tprotobuf_unittest.TestAllTypes.unknown_field",
-        "[unknown_extension]: 1\n" + "unknown_field: 12345");
-    assertParseErrorWithUnknownExtensions(
-        "3:1: Input contains unknown fields and/or extensions:\n"
-            + "1:2:\tprotobuf_unittest.TestAllTypes.[unknown_extension1]\n"
-            + "2:2:\tprotobuf_unittest.TestAllTypes.[unknown_extension2]\n"
-            + "3:1:\tprotobuf_unittest.TestAllTypes.unknown_field\n"
-            + "4:2:\tprotobuf_unittest.TestAllTypes.[unknown_extension3]",
-        "[unknown_extension1]: 1\n"
-            + "[unknown_extension2]: 2\n"
-            + "unknown_field: 12345\n"
-            + "[unknown_extension3]: 3\n");
-    assertParseErrorWithUnknownExtensions(
-        "1:1: Input contains unknown fields and/or extensions:\n"
-            + "1:1:\tprotobuf_unittest.TestAllTypes.unknown_field1\n"
-            + "2:1:\tprotobuf_unittest.TestAllTypes.unknown_field2\n"
-            + "3:2:\tprotobuf_unittest.TestAllTypes.[unknown_extension]\n"
-            + "4:1:\tprotobuf_unittest.TestAllTypes.unknown_field3",
-        "unknown_field1: 1\n"
-            + "unknown_field2: 2\n"
-            + "[unknown_extension]: 12345\n"
-            + "unknown_field3: 3\n");
-  }
-
-  // See additional coverage in testOneofOverwriteForbidden and testMapOverwriteForbidden.
-  @Test
-  public void testParseNonRepeatedFields() throws Exception {
-    assertParseSuccessWithOverwriteForbidden("repeated_int32: 1\nrepeated_int32: 2\n");
-    assertParseSuccessWithOverwriteForbidden("RepeatedGroup { a: 1 }\nRepeatedGroup { a: 2 }\n");
-    assertParseSuccessWithOverwriteForbidden(
-        "repeated_nested_message { bb: 1 }\nrepeated_nested_message { bb: 2 }\n");
-
-    assertParseErrorWithOverwriteForbidden(
-        "3:15: Non-repeated field "
-            + "\"protobuf_unittest.TestAllTypes.optional_int32\" "
-            + "cannot be overwritten.",
-        "optional_int32: 1\noptional_bool: true\noptional_int32: 1\n");
-    assertParseErrorWithOverwriteForbidden(
-        "2:1: Non-repeated field "
-            + "\"protobuf_unittest.TestAllTypes.optionalgroup\" "
-            + "cannot be overwritten.",
-        "OptionalGroup { a: 1 }\nOptionalGroup { }\n");
-    assertParseErrorWithOverwriteForbidden(
-        "2:1: Non-repeated field "
-            + "\"protobuf_unittest.TestAllTypes.optional_nested_message\" "
-            + "cannot be overwritten.",
-        "optional_nested_message { }\noptional_nested_message { bb: 3 }\n");
-    assertParseErrorWithOverwriteForbidden(
-        "2:14: Non-repeated field "
-            + "\"protobuf_unittest.TestAllTypes.default_int32\" "
-            + "cannot be overwritten.",
-        "default_int32: 41\n"
-            + // the default value
-            "default_int32: 41\n");
-    assertParseErrorWithOverwriteForbidden(
-        "2:15: Non-repeated field "
-            + "\"protobuf_unittest.TestAllTypes.default_string\" "
-            + "cannot be overwritten.",
-        "default_string: \"zxcv\"\ndefault_string: \"asdf\"\n");
-  }
-
-  @Test
-  public void testParseShortRepeatedFormOfRepeatedFields() throws Exception {
-    assertParseSuccessWithOverwriteForbidden("repeated_foreign_enum: [FOREIGN_FOO, FOREIGN_BAR]");
-    assertParseSuccessWithOverwriteForbidden("repeated_int32: [ 1, 2 ]\n");
-    assertParseSuccessWithOverwriteForbidden("RepeatedGroup [{ a: 1 },{ a: 2 }]\n");
-    assertParseSuccessWithOverwriteForbidden("repeated_nested_message [{ bb: 1 }, { bb: 2 }]\n");
-    // See also testMapShortForm.
-  }
-
-  @Test
-  public void testParseShortRepeatedFormOfEmptyRepeatedFields() throws Exception {
-    assertParseSuccessWithOverwriteForbidden("repeated_foreign_enum: []");
-    assertParseSuccessWithOverwriteForbidden("repeated_int32: []\n");
-    assertParseSuccessWithOverwriteForbidden("RepeatedGroup []\n");
-    assertParseSuccessWithOverwriteForbidden("repeated_nested_message []\n");
-    // See also testMapShortFormEmpty.
-  }
-
-  @Test
-  public void testParseShortRepeatedFormWithTrailingComma() throws Exception {
-    assertParseErrorWithOverwriteForbidden(
-        "1:38: Expected identifier. Found \']\'", "repeated_foreign_enum: [FOREIGN_FOO, ]\n");
-    assertParseErrorWithOverwriteForbidden(
-        "1:22: Couldn't parse integer: For input string: \"]\"", "repeated_int32: [ 1, ]\n");
-    assertParseErrorWithOverwriteForbidden("1:25: Expected \"{\".", "RepeatedGroup [{ a: 1 },]\n");
-    assertParseErrorWithOverwriteForbidden(
-        "1:37: Expected \"{\".", "repeated_nested_message [{ bb: 1 }, ]\n");
-    // See also testMapShortFormTrailingComma.
-  }
-
-  @Test
-  public void testParseShortRepeatedFormOfNonRepeatedFields() throws Exception {
-    assertParseErrorWithOverwriteForbidden(
-        "1:17: Couldn't parse integer: For input string: \"[\"", "optional_int32: [1]\n");
-    assertParseErrorWithOverwriteForbidden(
-        "1:17: Couldn't parse integer: For input string: \"[\"", "optional_int32: []\n");
-  }
-
-  // =======================================================================
-  // test oneof
-
-  @Test
-  public void testOneofTextFormat() throws Exception {
-    TestOneof2.Builder builder = TestOneof2.newBuilder();
-    TestUtil.setOneof(builder);
-    TestOneof2 message = builder.build();
-    TestOneof2.Builder dest = TestOneof2.newBuilder();
-    TextFormat.merge(TextFormat.printer().escapingNonAscii(false).printToString(message), dest);
-    TestUtil.assertOneofSet(dest.build());
-  }
-
-  @Test
-  public void testOneofOverwriteForbidden() throws Exception {
-    String input = "foo_string: \"stringvalue\" foo_int: 123";
-    TestOneof2.Builder builder = TestOneof2.newBuilder();
-    try {
-      PARSER_WITH_OVERWRITE_FORBIDDEN.merge(input, TestUtil.getFullExtensionRegistry(), builder);
-      assertWithMessage("Expected parse exception.").fail();
-    } catch (TextFormat.ParseException e) {
-      assertThat(e)
-          .hasMessageThat()
-          .isEqualTo(
-              "1:34: Field \"protobuf_unittest.TestOneof2.foo_int\""
-                  + " is specified along with field \"protobuf_unittest.TestOneof2.foo_string\","
-                  + " another member of oneof \"foo\".");
-    }
-  }
-
-  @Test
-  public void testOneofOverwriteAllowed() throws Exception {
-    String input = "foo_string: \"stringvalue\" foo_int: 123";
-    TestOneof2.Builder builder = TestOneof2.newBuilder();
-    DEFAULT_PARSER.merge(input, TestUtil.getFullExtensionRegistry(), builder);
-    // Only the last value sticks.
-    TestOneof2 oneof = builder.build();
-    assertThat(oneof.hasFooString()).isFalse();
-    assertThat(oneof.hasFooInt()).isTrue();
-  }
-
-  // =======================================================================
-  // test map
-
-  @Test
-  public void testMapTextFormat() throws Exception {
-    TestMap message =
-        TestMap.newBuilder()
-            .putInt32ToStringField(10, "apple")
-            .putInt32ToStringField(20, "banana")
-            .putInt32ToStringField(30, "cherry")
-            .build();
-    String text = TextFormat.printer().escapingNonAscii(false).printToString(message);
-    {
-      TestMap.Builder dest = TestMap.newBuilder();
-      TextFormat.merge(text, dest);
-      assertThat(dest.build()).isEqualTo(message);
-    }
-    {
-      TestMap.Builder dest = TestMap.newBuilder();
-      PARSER_WITH_OVERWRITE_FORBIDDEN.merge(text, dest);
-      assertThat(dest.build()).isEqualTo(message);
-    }
-  }
-
-  @Test
-  public void testMapDuplicateKeys() throws Exception {
-    String input =
-        "int32_to_int32_field: {\n"
-            + "  key: 1\n"
-            + "  value: 1\n"
-            + "}\n"
-            + "int32_to_int32_field: {\n"
-            + "  key: -2147483647\n"
-            + "  value: 5\n"
-            + "}\n"
-            + "int32_to_int32_field: {\n"
-            + "  key: 1\n"
-            + "  value: -1\n"
-            + "}\n";
-    TestMap msg = TextFormat.parse(input, TestMap.class);
-    int i1 = msg.getInt32ToInt32FieldMap().get(1);
-    TestMap msg2 = TextFormat.parse(msg.toString(), TestMap.class);
-    int i2 = msg2.getInt32ToInt32FieldMap().get(1);
-    assertThat(i1).isEqualTo(i2);
-  }
-
-  @Test
-  public void testMapShortForm() throws Exception {
-    String text =
-        "string_to_int32_field [{ key: 'x' value: 10 }, { key: 'y' value: 20 }]\n"
-            + "int32_to_message_field "
-            + "[{ key: 1 value { value: 100 } }, { key: 2 value: { value: 200 } }]\n";
-    TestMap.Builder dest = TestMap.newBuilder();
-    PARSER_WITH_OVERWRITE_FORBIDDEN.merge(text, dest);
-    TestMap message = dest.build();
-    assertThat(message.getStringToInt32FieldMap()).hasSize(2);
-    assertThat(message.getInt32ToMessageFieldMap()).hasSize(2);
-    assertThat(message.getStringToInt32FieldMap().get("x").intValue()).isEqualTo(10);
-    assertThat(message.getInt32ToMessageFieldMap().get(2).getValue()).isEqualTo(200);
-  }
-
-  @Test
-  public void testMapShortFormEmpty() throws Exception {
-    String text = "string_to_int32_field []\nint32_to_message_field: []\n";
-    TestMap.Builder dest = TestMap.newBuilder();
-    PARSER_WITH_OVERWRITE_FORBIDDEN.merge(text, dest);
-    TestMap message = dest.build();
-    assertThat(message.getStringToInt32FieldMap()).isEmpty();
-    assertThat(message.getInt32ToMessageFieldMap()).isEmpty();
-  }
-
-  @Test
-  public void testMapShortFormTrailingComma() throws Exception {
-    String text = "string_to_int32_field [{ key: 'x' value: 10 }, ]\n";
-    TestMap.Builder dest = TestMap.newBuilder();
-    try {
-      PARSER_WITH_OVERWRITE_FORBIDDEN.merge(text, dest);
-      assertWithMessage("Expected parse exception.").fail();
-    } catch (TextFormat.ParseException e) {
-      assertThat(e).hasMessageThat().isEqualTo("1:48: Expected \"{\".");
-    }
-  }
-
-  @Test
-  public void testMapOverwrite() throws Exception {
-    String text =
-        "int32_to_int32_field { key: 1 value: 10 }\n"
-            + "int32_to_int32_field { key: 2 value: 20 }\n"
-            + "int32_to_int32_field { key: 1 value: 30 }\n";
-
-    {
-      // With default parser, last value set for the key holds.
-      TestMap.Builder builder = TestMap.newBuilder();
-      DEFAULT_PARSER.merge(text, builder);
-      TestMap map = builder.build();
-      assertThat(map.getInt32ToInt32FieldMap()).hasSize(2);
-      assertThat(map.getInt32ToInt32FieldMap().get(1).intValue()).isEqualTo(30);
-    }
-
-    {
-      // With overwrite forbidden, same behavior.
-      // TODO(b/29122459): Expect parse exception here.
-      TestMap.Builder builder = TestMap.newBuilder();
-      PARSER_WITH_OVERWRITE_FORBIDDEN.merge(text, builder);
-      TestMap map = builder.build();
-      assertThat(map.getInt32ToInt32FieldMap()).hasSize(2);
-      assertThat(map.getInt32ToInt32FieldMap().get(1).intValue()).isEqualTo(30);
-    }
-
-    {
-      // With overwrite forbidden and a dynamic message, same behavior.
-      // TODO(b/29122459): Expect parse exception here.
-      Message.Builder builder = DynamicMessage.newBuilder(TestMap.getDescriptor());
-      PARSER_WITH_OVERWRITE_FORBIDDEN.merge(text, builder);
-      TestMap map =
-          TestMap.parseFrom(
-              builder.build().toByteString(), ExtensionRegistryLite.getEmptyRegistry());
-      assertThat(map.getInt32ToInt32FieldMap()).hasSize(2);
-      assertThat(map.getInt32ToInt32FieldMap().get(1).intValue()).isEqualTo(30);
-    }
-  }
-
-  // =======================================================================
-  // test location information
-
-  @Test
-  public void testParseInfoTreeBuilding() throws Exception {
-    TestAllTypes.Builder builder = TestAllTypes.newBuilder();
-
-    Descriptor descriptor = TestAllTypes.getDescriptor();
-    TextFormatParseInfoTree.Builder treeBuilder = TextFormatParseInfoTree.builder();
-    // Set to allow unknown fields
-    TextFormat.Parser parser =
-        TextFormat.Parser.newBuilder()
-            .setAllowUnknownFields(true)
-            .setParseInfoTreeBuilder(treeBuilder)
-            .build();
-
-    final String stringData =
-        "optional_int32: 1\n"
-            + "optional_int64: 2\n"
-            + "  optional_double: 2.4\n"
-            + "repeated_int32: 5\n"
-            + "repeated_int32: 10\n"
-            + "optional_nested_message <\n"
-            + "  bb: 78\n"
-            + ">\n"
-            + "repeated_nested_message <\n"
-            + "  bb: 79\n"
-            + ">\n"
-            + "repeated_nested_message <\n"
-            + "  bb: 80\n"
-            + ">";
-
-    parser.merge(stringData, builder);
-    TextFormatParseInfoTree tree = treeBuilder.build();
-
-    // Verify that the tree has the correct positions.
-    assertLocation(tree, descriptor, "optional_int32", 0, 0, 0);
-    assertLocation(tree, descriptor, "optional_int64", 0, 1, 0);
-    assertLocation(tree, descriptor, "optional_double", 0, 2, 2);
-
-    assertLocation(tree, descriptor, "repeated_int32", 0, 3, 0);
-    assertLocation(tree, descriptor, "repeated_int32", 1, 4, 0);
-
-    assertLocation(tree, descriptor, "optional_nested_message", 0, 5, 0);
-    assertLocation(tree, descriptor, "repeated_nested_message", 0, 8, 0);
-    assertLocation(tree, descriptor, "repeated_nested_message", 1, 11, 0);
-
-    // Check for fields not set. For an invalid field, the location returned should be -1, -1.
-    assertLocation(tree, descriptor, "repeated_int64", 0, -1, -1);
-    assertLocation(tree, descriptor, "repeated_int32", 6, -1, -1);
-
-    // Verify inside the nested message.
-    FieldDescriptor nestedField = descriptor.findFieldByName("optional_nested_message");
-
-    TextFormatParseInfoTree nestedTree = tree.getNestedTrees(nestedField).get(0);
-    assertLocation(nestedTree, nestedField.getMessageType(), "bb", 0, 6, 2);
-
-    // Verify inside another nested message.
-    nestedField = descriptor.findFieldByName("repeated_nested_message");
-    nestedTree = tree.getNestedTrees(nestedField).get(0);
-    assertLocation(nestedTree, nestedField.getMessageType(), "bb", 0, 9, 2);
-
-    nestedTree = tree.getNestedTrees(nestedField).get(1);
-    assertLocation(nestedTree, nestedField.getMessageType(), "bb", 0, 12, 2);
-
-    // Verify a NULL tree for an unknown nested field.
-    try {
-      tree.getNestedTree(nestedField, 2);
-      assertWithMessage("unknown nested field should throw").fail();
-    } catch (IllegalArgumentException unused) {
-      // pass
-    }
-  }
-
-  private void assertLocation(
-      TextFormatParseInfoTree tree,
-      final Descriptor descriptor,
-      final String fieldName,
-      int index,
-      int line,
-      int column) {
-    List<TextFormatParseLocation> locs = tree.getLocations(descriptor.findFieldByName(fieldName));
-    if (index < locs.size()) {
-      TextFormatParseLocation location = locs.get(index);
-      TextFormatParseLocation expected = TextFormatParseLocation.create(line, column);
-      assertThat(location).isEqualTo(expected);
-    } else if (line != -1 && column != -1) {
-      assertWithMessage(
-              "Tree/descriptor/fieldname did not contain index %d, line %d column %d expected",
-              index, line, column)
-          .fail();
-    }
-  }
-
-  @Test
-  public void testSortMapFields() throws Exception {
-    TestMap message =
-        TestMap.newBuilder()
-            .putStringToInt32Field("cherry", 30)
-            .putStringToInt32Field("banana", 20)
-            .putStringToInt32Field("apple", 10)
-            .putInt32ToStringField(30, "cherry")
-            .putInt32ToStringField(20, "banana")
-            .putInt32ToStringField(10, "apple")
-            .build();
-    String text =
-        "int32_to_string_field {\n"
-            + "  key: 10\n"
-            + "  value: \"apple\"\n"
-            + "}\n"
-            + "int32_to_string_field {\n"
-            + "  key: 20\n"
-            + "  value: \"banana\"\n"
-            + "}\n"
-            + "int32_to_string_field {\n"
-            + "  key: 30\n"
-            + "  value: \"cherry\"\n"
-            + "}\n"
-            + "string_to_int32_field {\n"
-            + "  key: \"apple\"\n"
-            + "  value: 10\n"
-            + "}\n"
-            + "string_to_int32_field {\n"
-            + "  key: \"banana\"\n"
-            + "  value: 20\n"
-            + "}\n"
-            + "string_to_int32_field {\n"
-            + "  key: \"cherry\"\n"
-            + "  value: 30\n"
-            + "}\n";
-    assertThat(TextFormat.printer().printToString(message)).isEqualTo(text);
-  }
-
-  @Test
-  public void testPreservesFloatingPointNegative0() throws Exception {
-    proto3_unittest.UnittestProto3.TestAllTypes message =
-        proto3_unittest.UnittestProto3.TestAllTypes.newBuilder()
-            .setOptionalFloat(-0.0f)
-            .setOptionalDouble(-0.0)
-            .build();
-    assertThat(TextFormat.printer().printToString(message))
-        .isEqualTo("optional_float: -0.0\noptional_double: -0.0\n");
-  }
-
-}
diff --git a/libs/protobuf/java/core/src/test/java/com/google/protobuf/TypeRegistryTest.java b/libs/protobuf/java/core/src/test/java/com/google/protobuf/TypeRegistryTest.java
deleted file mode 100644
index c9defb3..0000000
--- a/libs/protobuf/java/core/src/test/java/com/google/protobuf/TypeRegistryTest.java
+++ /dev/null
@@ -1,69 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import com.google.protobuf.Descriptors.Descriptor;
-import protobuf_unittest.UnittestProto;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-@RunWith(JUnit4.class)
-public final class TypeRegistryTest {
-
-  @Test
-  public void findDescriptorByFullName() throws Exception {
-    Descriptor descriptor = UnittestProto.TestAllTypes.getDescriptor();
-    assertThat(TypeRegistry.getEmptyTypeRegistry().find(descriptor.getFullName())).isNull();
-
-    assertThat(TypeRegistry.newBuilder().add(descriptor).build().find(descriptor.getFullName()))
-        .isSameInstanceAs(descriptor);
-  }
-
-  @Test
-  public void findDescriptorByTypeUrl() throws Exception {
-    Descriptor descriptor = UnittestProto.TestAllTypes.getDescriptor();
-    assertThat(
-            TypeRegistry.getEmptyTypeRegistry()
-                .getDescriptorForTypeUrl("type.googleapis.com/" + descriptor.getFullName()))
-        .isNull();
-
-    assertThat(
-            TypeRegistry.newBuilder()
-                .add(descriptor)
-                .build()
-                .getDescriptorForTypeUrl("type.googleapis.com/" + descriptor.getFullName()))
-        .isSameInstanceAs(descriptor);
-  }
-
-}
diff --git a/libs/protobuf/java/core/src/test/java/com/google/protobuf/UnknownEnumValueTest.java b/libs/protobuf/java/core/src/test/java/com/google/protobuf/UnknownEnumValueTest.java
deleted file mode 100644
index e66967d..0000000
--- a/libs/protobuf/java/core/src/test/java/com/google/protobuf/UnknownEnumValueTest.java
+++ /dev/null
@@ -1,330 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.common.truth.Truth.assertThat;
-import static com.google.common.truth.Truth.assertWithMessage;
-
-import com.google.protobuf.Descriptors.Descriptor;
-import com.google.protobuf.Descriptors.EnumDescriptor;
-import com.google.protobuf.Descriptors.EnumValueDescriptor;
-import com.google.protobuf.Descriptors.FieldDescriptor;
-import com.google.protobuf.FieldPresenceTestProto.TestAllTypes;
-import com.google.protobuf.Proto2UnknownEnumValuesTestProto.Proto2EnumMessage;
-import com.google.protobuf.Proto2UnknownEnumValuesTestProto.Proto2EnumMessageWithEnumSubset;
-import com.google.protobuf.Proto2UnknownEnumValuesTestProto.Proto2TestEnum;
-import com.google.protobuf.Proto2UnknownEnumValuesTestProto.Proto2TestEnumSubset;
-import com.google.protobuf.TextFormat.ParseException;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-/**
- * Unit tests for protos that keep unknown enum values rather than discard them as unknown fields.
- */
-@RunWith(JUnit4.class)
-public class UnknownEnumValueTest {
-
-  @Test
-  @SuppressWarnings("ProtoNewBuilderMergeFrom")
-  public void testUnknownEnumValues() throws Exception {
-    TestAllTypes.Builder builder = TestAllTypes.newBuilder();
-    builder.setOptionalNestedEnumValue(4321);
-    builder.addRepeatedNestedEnumValue(5432);
-    builder.addPackedNestedEnumValue(6543);
-    TestAllTypes message = builder.build();
-    assertThat(message.getOptionalNestedEnumValue()).isEqualTo(4321);
-    assertThat(message.getRepeatedNestedEnumValue(0)).isEqualTo(5432);
-    assertThat(message.getRepeatedNestedEnumValueList().get(0).intValue()).isEqualTo(5432);
-    assertThat(message.getPackedNestedEnumValue(0)).isEqualTo(6543);
-    // Returns UNRECOGNIZED if an enum type is requested.
-    assertThat(message.getOptionalNestedEnum()).isEqualTo(TestAllTypes.NestedEnum.UNRECOGNIZED);
-    assertThat(message.getRepeatedNestedEnum(0)).isEqualTo(TestAllTypes.NestedEnum.UNRECOGNIZED);
-    assertThat(message.getRepeatedNestedEnumList().get(0))
-        .isEqualTo(TestAllTypes.NestedEnum.UNRECOGNIZED);
-    assertThat(message.getPackedNestedEnum(0)).isEqualTo(TestAllTypes.NestedEnum.UNRECOGNIZED);
-
-    // Test serialization and parsing.
-    ByteString data = message.toByteString();
-    message = TestAllTypes.parseFrom(data);
-    assertThat(message.getOptionalNestedEnumValue()).isEqualTo(4321);
-    assertThat(message.getRepeatedNestedEnumValue(0)).isEqualTo(5432);
-    assertThat(message.getRepeatedNestedEnumValueList().get(0).intValue()).isEqualTo(5432);
-    assertThat(message.getPackedNestedEnumValue(0)).isEqualTo(6543);
-    // Returns UNRECOGNIZED if an enum type is requested.
-    assertThat(message.getOptionalNestedEnum()).isEqualTo(TestAllTypes.NestedEnum.UNRECOGNIZED);
-    assertThat(message.getRepeatedNestedEnum(0)).isEqualTo(TestAllTypes.NestedEnum.UNRECOGNIZED);
-    assertThat(message.getRepeatedNestedEnumList().get(0))
-        .isEqualTo(TestAllTypes.NestedEnum.UNRECOGNIZED);
-    assertThat(message.getPackedNestedEnum(0)).isEqualTo(TestAllTypes.NestedEnum.UNRECOGNIZED);
-
-    // Test toBuilder().
-    builder = message.toBuilder();
-    assertThat(builder.getOptionalNestedEnumValue()).isEqualTo(4321);
-    assertThat(builder.getRepeatedNestedEnumValue(0)).isEqualTo(5432);
-    assertThat(builder.getRepeatedNestedEnumValueList().get(0).intValue()).isEqualTo(5432);
-    assertThat(builder.getPackedNestedEnumValue(0)).isEqualTo(6543);
-    // Returns UNRECOGNIZED if an enum type is requested.
-    assertThat(builder.getOptionalNestedEnum()).isEqualTo(TestAllTypes.NestedEnum.UNRECOGNIZED);
-    assertThat(builder.getRepeatedNestedEnum(0)).isEqualTo(TestAllTypes.NestedEnum.UNRECOGNIZED);
-    assertThat(builder.getRepeatedNestedEnumList().get(0))
-        .isEqualTo(TestAllTypes.NestedEnum.UNRECOGNIZED);
-    assertThat(builder.getPackedNestedEnum(0)).isEqualTo(TestAllTypes.NestedEnum.UNRECOGNIZED);
-
-    // Test mergeFrom().
-    builder = TestAllTypes.newBuilder().mergeFrom(message);
-    assertThat(builder.getOptionalNestedEnumValue()).isEqualTo(4321);
-    assertThat(builder.getRepeatedNestedEnumValue(0)).isEqualTo(5432);
-    assertThat(builder.getRepeatedNestedEnumValueList().get(0).intValue()).isEqualTo(5432);
-    assertThat(builder.getPackedNestedEnumValue(0)).isEqualTo(6543);
-    // Returns UNRECOGNIZED if an enum type is requested.
-    assertThat(builder.getOptionalNestedEnum()).isEqualTo(TestAllTypes.NestedEnum.UNRECOGNIZED);
-    assertThat(builder.getRepeatedNestedEnum(0)).isEqualTo(TestAllTypes.NestedEnum.UNRECOGNIZED);
-    assertThat(builder.getRepeatedNestedEnumList().get(0))
-        .isEqualTo(TestAllTypes.NestedEnum.UNRECOGNIZED);
-    assertThat(builder.getPackedNestedEnum(0)).isEqualTo(TestAllTypes.NestedEnum.UNRECOGNIZED);
-
-    // Test equals() and hashCode()
-    TestAllTypes sameMessage = builder.build();
-    assertThat(sameMessage).isEqualTo(message);
-    assertThat(sameMessage.hashCode()).isEqualTo(message.hashCode());
-
-    // Getting the numeric value of UNRECOGNIZED will throw an exception.
-    try {
-      TestAllTypes.NestedEnum.UNRECOGNIZED.getNumber();
-      assertWithMessage("Exception is expected.").fail();
-    } catch (IllegalArgumentException e) {
-      // Expected.
-    }
-
-    // Setting an enum field to an UNRECOGNIZED value will throw an exception.
-    try {
-      builder.setOptionalNestedEnum(builder.getOptionalNestedEnum());
-      assertWithMessage("Exception is expected.").fail();
-    } catch (IllegalArgumentException e) {
-      // Expected.
-    }
-    try {
-      builder.addRepeatedNestedEnum(builder.getOptionalNestedEnum());
-      assertWithMessage("Exception is expected.").fail();
-    } catch (IllegalArgumentException e) {
-      // Expected.
-    }
-  }
-
-  @Test
-  public void testUnknownEnumValueInReflectionApi() throws Exception {
-    Descriptor descriptor = TestAllTypes.getDescriptor();
-    FieldDescriptor optionalNestedEnumField = descriptor.findFieldByName("optional_nested_enum");
-    FieldDescriptor repeatedNestedEnumField = descriptor.findFieldByName("repeated_nested_enum");
-    FieldDescriptor packedNestedEnumField = descriptor.findFieldByName("packed_nested_enum");
-    EnumDescriptor enumType = TestAllTypes.NestedEnum.getDescriptor();
-
-    TestAllTypes.Builder builder = TestAllTypes.newBuilder();
-    builder.setField(optionalNestedEnumField, enumType.findValueByNumberCreatingIfUnknown(4321));
-    builder.addRepeatedField(
-        repeatedNestedEnumField, enumType.findValueByNumberCreatingIfUnknown(5432));
-    builder.addRepeatedField(
-        packedNestedEnumField, enumType.findValueByNumberCreatingIfUnknown(6543));
-    TestAllTypes message = builder.build();
-
-    // Getters will return unknown enum values as EnumValueDescriptor.
-    EnumValueDescriptor unknown4321 =
-        (EnumValueDescriptor) message.getField(optionalNestedEnumField);
-    EnumValueDescriptor unknown5432 =
-        (EnumValueDescriptor) message.getRepeatedField(repeatedNestedEnumField, 0);
-    EnumValueDescriptor unknown6543 =
-        (EnumValueDescriptor) message.getRepeatedField(packedNestedEnumField, 0);
-    assertThat(unknown4321.getNumber()).isEqualTo(4321);
-    assertThat(unknown5432.getNumber()).isEqualTo(5432);
-    assertThat(unknown6543.getNumber()).isEqualTo(6543);
-
-    // Unknown EnumValueDescriptor will map to UNRECOGNIZED.
-    assertThat(TestAllTypes.NestedEnum.valueOf(unknown4321))
-        .isEqualTo(TestAllTypes.NestedEnum.UNRECOGNIZED);
-    assertThat(TestAllTypes.NestedEnum.valueOf(unknown5432))
-        .isEqualTo(TestAllTypes.NestedEnum.UNRECOGNIZED);
-    assertThat(TestAllTypes.NestedEnum.valueOf(unknown6543))
-        .isEqualTo(TestAllTypes.NestedEnum.UNRECOGNIZED);
-
-    // Setters also accept unknown EnumValueDescriptor.
-    builder.setField(optionalNestedEnumField, unknown6543);
-    builder.setRepeatedField(repeatedNestedEnumField, 0, unknown4321);
-    builder.setRepeatedField(packedNestedEnumField, 0, unknown5432);
-    message = builder.build();
-    // Like other descriptors, unknown EnumValueDescriptor can be compared by
-    // object identity.
-    assertThat(unknown6543).isSameInstanceAs(message.getField(optionalNestedEnumField));
-    assertThat(unknown4321).isSameInstanceAs(message.getRepeatedField(repeatedNestedEnumField, 0));
-    assertThat(unknown5432).isSameInstanceAs(message.getRepeatedField(packedNestedEnumField, 0));
-  }
-
-  @Test
-  public void testUnknownEnumValueWithDynamicMessage() throws Exception {
-    Descriptor descriptor = TestAllTypes.getDescriptor();
-    FieldDescriptor optionalNestedEnumField = descriptor.findFieldByName("optional_nested_enum");
-    FieldDescriptor repeatedNestedEnumField = descriptor.findFieldByName("repeated_nested_enum");
-    FieldDescriptor packedNestedEnumField = descriptor.findFieldByName("packed_nested_enum");
-    EnumDescriptor enumType = TestAllTypes.NestedEnum.getDescriptor();
-
-    Message dynamicMessageDefaultInstance = DynamicMessage.getDefaultInstance(descriptor);
-
-    Message.Builder builder = dynamicMessageDefaultInstance.newBuilderForType();
-    builder.setField(optionalNestedEnumField, enumType.findValueByNumberCreatingIfUnknown(4321));
-    builder.addRepeatedField(
-        repeatedNestedEnumField, enumType.findValueByNumberCreatingIfUnknown(5432));
-    builder.addRepeatedField(
-        packedNestedEnumField, enumType.findValueByNumberCreatingIfUnknown(6543));
-    Message message = builder.build();
-    assertThat(((EnumValueDescriptor) message.getField(optionalNestedEnumField)).getNumber())
-        .isEqualTo(4321);
-    assertThat(
-            ((EnumValueDescriptor) message.getRepeatedField(repeatedNestedEnumField, 0))
-                .getNumber())
-        .isEqualTo(5432);
-    assertThat(
-            ((EnumValueDescriptor) message.getRepeatedField(packedNestedEnumField, 0)).getNumber())
-        .isEqualTo(6543);
-
-    // Test reflection based serialization/parsing implementation.
-    ByteString data = message.toByteString();
-    message = dynamicMessageDefaultInstance.newBuilderForType().mergeFrom(data).build();
-    assertThat(((EnumValueDescriptor) message.getField(optionalNestedEnumField)).getNumber())
-        .isEqualTo(4321);
-    assertThat(
-            ((EnumValueDescriptor) message.getRepeatedField(repeatedNestedEnumField, 0))
-                .getNumber())
-        .isEqualTo(5432);
-    assertThat(
-            ((EnumValueDescriptor) message.getRepeatedField(packedNestedEnumField, 0)).getNumber())
-        .isEqualTo(6543);
-
-    // Test reflection based equals()/hashCode().
-    builder = dynamicMessageDefaultInstance.newBuilderForType();
-    builder.setField(optionalNestedEnumField, enumType.findValueByNumberCreatingIfUnknown(4321));
-    builder.addRepeatedField(
-        repeatedNestedEnumField, enumType.findValueByNumberCreatingIfUnknown(5432));
-    builder.addRepeatedField(
-        packedNestedEnumField, enumType.findValueByNumberCreatingIfUnknown(6543));
-    Message sameMessage = builder.build();
-    assertThat(sameMessage).isEqualTo(message);
-    assertThat(sameMessage.hashCode()).isEqualTo(message.hashCode());
-    builder.setField(optionalNestedEnumField, enumType.findValueByNumberCreatingIfUnknown(0));
-    Message differentMessage = builder.build();
-    assertThat(message.equals(differentMessage)).isFalse();
-  }
-
-  @Test
-  public void testUnknownEnumValuesInTextFormat() {
-    TestAllTypes.Builder builder = TestAllTypes.newBuilder();
-    builder.setOptionalNestedEnumValue(4321);
-    builder.addRepeatedNestedEnumValue(5432);
-    builder.addPackedNestedEnumValue(6543);
-    TestAllTypes message = builder.build();
-
-    // We can print a message with unknown enum values.
-    String textData = TextFormat.printer().printToString(message);
-    assertThat(textData)
-        .isEqualTo(
-            "optional_nested_enum: UNKNOWN_ENUM_VALUE_NestedEnum_4321\n"
-                + "repeated_nested_enum: UNKNOWN_ENUM_VALUE_NestedEnum_5432\n"
-                + "packed_nested_enum: UNKNOWN_ENUM_VALUE_NestedEnum_6543\n");
-
-    // Parsing unknown enum values will fail just like parsing other kinds of
-    // unknown fields.
-    try {
-      TextFormat.merge(textData, builder);
-      assertWithMessage("Expected exception").fail();
-    } catch (ParseException e) {
-      // expected.
-    }
-  }
-
-  @Test
-  public void testUnknownEnumValuesInProto2() throws Exception {
-    Proto2EnumMessage.Builder sourceMessage = Proto2EnumMessage.newBuilder();
-    sourceMessage
-        .addRepeatedPackedEnum(Proto2TestEnum.ZERO)
-        .addRepeatedPackedEnum(Proto2TestEnum.TWO) // Unknown in parsed proto
-        .addRepeatedPackedEnum(Proto2TestEnum.ONE);
-
-    Proto2EnumMessageWithEnumSubset destMessage =
-        Proto2EnumMessageWithEnumSubset.parseFrom(sourceMessage.build().toByteArray());
-
-    // Known enum values should be preserved.
-    assertThat(destMessage.getRepeatedPackedEnumCount()).isEqualTo(2);
-    assertThat(destMessage.getRepeatedPackedEnum(0))
-        .isEqualTo(Proto2TestEnumSubset.TESTENUM_SUBSET_ZERO);
-    assertThat(destMessage.getRepeatedPackedEnum(1))
-        .isEqualTo(Proto2TestEnumSubset.TESTENUM_SUBSET_ONE);
-
-    // Unknown enum values should be found in UnknownFieldSet.
-    UnknownFieldSet unknown = destMessage.getUnknownFields();
-    assertThat(
-            unknown
-                .getField(Proto2EnumMessageWithEnumSubset.REPEATED_PACKED_ENUM_FIELD_NUMBER)
-                .getVarintList()
-                .get(0)
-                .longValue())
-        .isEqualTo(Proto2TestEnum.TWO_VALUE);
-  }
-
-  @Test
-  public void testUnknownEnumValuesInProto2WithDynamicMessage() throws Exception {
-    Descriptor descriptor = Proto2EnumMessageWithEnumSubset.getDescriptor();
-    FieldDescriptor repeatedPackedField = descriptor.findFieldByName("repeated_packed_enum");
-
-    Proto2EnumMessage.Builder sourceMessage = Proto2EnumMessage.newBuilder();
-    sourceMessage
-        .addRepeatedPackedEnum(Proto2TestEnum.ZERO)
-        .addRepeatedPackedEnum(Proto2TestEnum.TWO) // Unknown in parsed proto
-        .addRepeatedPackedEnum(Proto2TestEnum.ONE);
-
-    DynamicMessage message =
-        DynamicMessage.parseFrom(
-            Proto2EnumMessageWithEnumSubset.getDescriptor(), sourceMessage.build().toByteArray());
-
-    // Known enum values should be preserved.
-    assertThat(message.getRepeatedFieldCount(repeatedPackedField)).isEqualTo(2);
-    EnumValueDescriptor enumValue0 =
-        (EnumValueDescriptor) message.getRepeatedField(repeatedPackedField, 0);
-    EnumValueDescriptor enumValue1 =
-        (EnumValueDescriptor) message.getRepeatedField(repeatedPackedField, 1);
-
-    assertThat(enumValue0.getNumber()).isEqualTo(Proto2TestEnumSubset.TESTENUM_SUBSET_ZERO_VALUE);
-    assertThat(enumValue1.getNumber()).isEqualTo(Proto2TestEnumSubset.TESTENUM_SUBSET_ONE_VALUE);
-
-    // Unknown enum values should be found in UnknownFieldSet.
-    UnknownFieldSet unknown = message.getUnknownFields();
-    assertThat(unknown.getField(repeatedPackedField.getNumber()).getVarintList().get(0).longValue())
-        .isEqualTo(Proto2TestEnum.TWO_VALUE);
-  }
-}
diff --git a/libs/protobuf/java/core/src/test/java/com/google/protobuf/UnknownFieldSetPerformanceTest.java b/libs/protobuf/java/core/src/test/java/com/google/protobuf/UnknownFieldSetPerformanceTest.java
deleted file mode 100644
index 6ce0fc7..0000000
--- a/libs/protobuf/java/core/src/test/java/com/google/protobuf/UnknownFieldSetPerformanceTest.java
+++ /dev/null
@@ -1,78 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-@RunWith(JUnit4.class)
-public final class UnknownFieldSetPerformanceTest {
-
-  private static byte[] generateBytes(int length) {
-    assertThat(length % 4).isEqualTo(0);
-    byte[] input = new byte[length];
-    for (int i = 0; i < length; i += 4) {
-        input[i] =     (byte) 0x08; // field 1, wiretype 0
-        input[i + 1] = (byte) 0x08; // field 1, payload 8
-        input[i + 2] = (byte) 0x20; // field 4, wiretype 0
-        input[i + 3] = (byte) 0x20; // field 4, payload 32
-    }
-    return input;
-  }
-
-  @Test
-  // This is a performance test. Failure here is a timeout.
-  public void testAlternatingFieldNumbers() throws IOException {
-    byte[] input = generateBytes(800000);
-    InputStream in = new ByteArrayInputStream(input);
-    UnknownFieldSet.Builder builder = UnknownFieldSet.newBuilder();
-    CodedInputStream codedInput = CodedInputStream.newInstance(in);
-    builder.mergeFrom(codedInput);
-  }
-
-  @Test
-  // This is a performance test. Failure here is a timeout.
-  public void testAddField() {
-    UnknownFieldSet.Builder builder = UnknownFieldSet.newBuilder();
-    for (int i = 1; i <= 100000; i++) {
-      UnknownFieldSet.Field field = UnknownFieldSet.Field.newBuilder().addFixed32(i).build();
-      builder.addField(i, field);
-    }
-    UnknownFieldSet fieldSet = builder.build();
-    assertThat(fieldSet.getField(100000).getFixed32List().get(0)).isEqualTo(100000);
-  }
-}
diff --git a/libs/protobuf/java/core/src/test/java/com/google/protobuf/UnknownFieldSetTest.java b/libs/protobuf/java/core/src/test/java/com/google/protobuf/UnknownFieldSetTest.java
deleted file mode 100644
index fbc3bb8..0000000
--- a/libs/protobuf/java/core/src/test/java/com/google/protobuf/UnknownFieldSetTest.java
+++ /dev/null
@@ -1,607 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.common.truth.Truth.assertThat;
-import static com.google.common.truth.Truth.assertWithMessage;
-
-import protobuf_unittest.UnittestProto;
-import protobuf_unittest.UnittestProto.ForeignEnum;
-import protobuf_unittest.UnittestProto.TestAllExtensions;
-import protobuf_unittest.UnittestProto.TestAllTypes;
-import protobuf_unittest.UnittestProto.TestEmptyMessage;
-import protobuf_unittest.UnittestProto.TestEmptyMessageWithExtensions;
-import protobuf_unittest.UnittestProto.TestPackedExtensions;
-import protobuf_unittest.UnittestProto.TestPackedTypes;
-import proto3_unittest.UnittestProto3;
-import java.util.List;
-import java.util.Map;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-/** Tests related to unknown field handling. */
-@RunWith(JUnit4.class)
-public class UnknownFieldSetTest {
-
-  @Before
-  public void setUp() throws Exception {
-    descriptor = TestAllTypes.getDescriptor();
-    allFields = TestUtil.getAllSet();
-    allFieldsData = allFields.toByteString();
-    emptyMessage = TestEmptyMessage.parseFrom(allFieldsData);
-    unknownFields = emptyMessage.getUnknownFields();
-  }
-
-  private UnknownFieldSet.Field getField(String name) {
-    Descriptors.FieldDescriptor field = descriptor.findFieldByName(name);
-    assertThat(field).isNotNull();
-    return unknownFields.getField(field.getNumber());
-  }
-
-  // Constructs a protocol buffer which contains fields with all the same
-  // numbers as allFieldsData except that each field is some other wire
-  // type.
-  ByteString getBizarroData() throws Exception {
-    UnknownFieldSet.Builder bizarroFields = UnknownFieldSet.newBuilder();
-
-    UnknownFieldSet.Field varintField = UnknownFieldSet.Field.newBuilder().addVarint(1).build();
-    UnknownFieldSet.Field fixed32Field = UnknownFieldSet.Field.newBuilder().addFixed32(1).build();
-
-    for (Map.Entry<Integer, UnknownFieldSet.Field> entry : unknownFields.asMap().entrySet()) {
-      if (entry.getValue().getVarintList().isEmpty()) {
-        // Original field is not a varint, so use a varint.
-        bizarroFields.addField(entry.getKey(), varintField);
-      } else {
-        // Original field *is* a varint, so use something else.
-        bizarroFields.addField(entry.getKey(), fixed32Field);
-      }
-    }
-
-    return bizarroFields.build().toByteString();
-  }
-
-  Descriptors.Descriptor descriptor;
-  TestAllTypes allFields;
-  ByteString allFieldsData;
-
-  // An empty message that has been parsed from allFieldsData.  So, it has
-  // unknown fields of every type.
-  TestEmptyMessage emptyMessage;
-  UnknownFieldSet unknownFields;
-
-  // =================================================================
-
-  @Test
-  public void testFieldBuildersAreReusable() {
-    UnknownFieldSet.Field.Builder fieldBuilder = UnknownFieldSet.Field.newBuilder();
-    fieldBuilder.addFixed32(10);
-    UnknownFieldSet.Field first = fieldBuilder.build();
-    UnknownFieldSet.Field second = fieldBuilder.build();
-    fieldBuilder.addFixed32(11);
-    UnknownFieldSet.Field third = fieldBuilder.build();
-
-    assertThat(first).isEqualTo(second);
-    assertThat(first).isNotEqualTo(third);
-  }
-
-  @Test
-  public void testClone() {
-    UnknownFieldSet.Builder unknownSetBuilder = UnknownFieldSet.newBuilder();
-    UnknownFieldSet.Field.Builder fieldBuilder = UnknownFieldSet.Field.newBuilder();
-    fieldBuilder.addFixed32(10);
-    unknownSetBuilder.addField(8, fieldBuilder.build());
-    // necessary to call clone twice to expose the bug
-    UnknownFieldSet.Builder clone1 = unknownSetBuilder.clone();
-    UnknownFieldSet.Builder clone2 = unknownSetBuilder.clone(); // failure is a NullPointerException
-    assertThat(clone1).isNotSameInstanceAs(clone2);
-  }
-
-  @Test
-  public void testClone_lengthDelimited() {
-    UnknownFieldSet.Builder destUnknownFieldSet =
-        UnknownFieldSet.newBuilder()
-            .addField(997, UnknownFieldSet.Field.newBuilder().addVarint(99).build())
-            .addField(
-                999,
-                UnknownFieldSet.Field.newBuilder()
-                    .addLengthDelimited(ByteString.copyFromUtf8("some data"))
-                    .addLengthDelimited(ByteString.copyFromUtf8("some more data"))
-                    .build());
-    UnknownFieldSet clone = destUnknownFieldSet.clone().build();
-    assertThat(clone.getField(997)).isNotNull();
-    UnknownFieldSet.Field field999 = clone.getField(999);
-    List<ByteString> lengthDelimited = field999.getLengthDelimitedList();
-    assertThat(lengthDelimited.get(0).toStringUtf8()).isEqualTo("some data");
-    assertThat(lengthDelimited.get(1).toStringUtf8()).isEqualTo("some more data");
-
-    UnknownFieldSet clone2 = destUnknownFieldSet.clone().build();
-    assertThat(clone2.getField(997)).isNotNull();
-    UnknownFieldSet.Field secondField = clone2.getField(999);
-    List<ByteString> lengthDelimited2 = secondField.getLengthDelimitedList();
-    assertThat(lengthDelimited2.get(0).toStringUtf8()).isEqualTo("some data");
-    assertThat(lengthDelimited2.get(1).toStringUtf8()).isEqualTo("some more data");
-  }
-
-  @Test
-  public void testReuse() {
-    UnknownFieldSet.Builder builder =
-        UnknownFieldSet.newBuilder()
-            .addField(997, UnknownFieldSet.Field.newBuilder().addVarint(99).build())
-            .addField(
-                999,
-                UnknownFieldSet.Field.newBuilder()
-                    .addLengthDelimited(ByteString.copyFromUtf8("some data"))
-                    .addLengthDelimited(ByteString.copyFromUtf8("some more data"))
-                    .build());
-
-    UnknownFieldSet fieldSet1 = builder.build();
-    UnknownFieldSet fieldSet2 = builder.build();
-    builder.addField(1000, UnknownFieldSet.Field.newBuilder().addVarint(-90).build());
-    UnknownFieldSet fieldSet3 = builder.build();
-
-    assertThat(fieldSet1).isEqualTo(fieldSet2);
-    assertThat(fieldSet1).isNotEqualTo(fieldSet3);
-  }
-
-  @Test
-  @SuppressWarnings("ModifiedButNotUsed")
-  public void testAddField_zero() {
-    UnknownFieldSet.Field field = getField("optional_int32");
-    try {
-      UnknownFieldSet.newBuilder().addField(0, field);
-      Assert.fail();
-    } catch (IllegalArgumentException expected) {
-      assertThat(expected).hasMessageThat().isEqualTo("0 is not a valid field number.");
-    }
-  }
-
-  @Test
-  @SuppressWarnings("ModifiedButNotUsed")
-  public void testAddField_negative() {
-    UnknownFieldSet.Field field = getField("optional_int32");
-    try {
-      UnknownFieldSet.newBuilder().addField(-2, field);
-      Assert.fail();
-    } catch (IllegalArgumentException expected) {
-      assertThat(expected).hasMessageThat().isEqualTo("-2 is not a valid field number.");
-    }
-  }
-
-  @Test
-  @SuppressWarnings("ModifiedButNotUsed")
-  public void testClearField_negative() {
-    try {
-      UnknownFieldSet.newBuilder().clearField(-28);
-      Assert.fail();
-    } catch (IllegalArgumentException expected) {
-      assertThat(expected).hasMessageThat().isEqualTo("-28 is not a valid field number.");
-    }
-  }
-
-  @Test
-  @SuppressWarnings("ModifiedButNotUsed")
-  public void testMergeField_negative() {
-    UnknownFieldSet.Field field = getField("optional_int32");
-    try {
-      UnknownFieldSet.newBuilder().mergeField(-2, field);
-      Assert.fail();
-    } catch (IllegalArgumentException expected) {
-      assertThat(expected).hasMessageThat().isEqualTo("-2 is not a valid field number.");
-    }
-  }
-
-  @Test
-  @SuppressWarnings("ModifiedButNotUsed")
-  public void testMergeVarintField_negative() {
-    try {
-      UnknownFieldSet.newBuilder().mergeVarintField(-2, 78);
-      Assert.fail();
-    } catch (IllegalArgumentException expected) {
-      assertThat(expected).hasMessageThat().isEqualTo("-2 is not a valid field number.");
-    }
-  }
-
-  @Test
-  @SuppressWarnings("ModifiedButNotUsed")
-  public void testHasField_negative() {
-    assertThat(UnknownFieldSet.newBuilder().hasField(-2)).isFalse();
-  }
-
-  @Test
-  @SuppressWarnings("ModifiedButNotUsed")
-  public void testMergeLengthDelimitedField_negative() {
-    ByteString byteString = ByteString.copyFromUtf8("some data");
-    try {
-      UnknownFieldSet.newBuilder().mergeLengthDelimitedField(-2, byteString);
-      Assert.fail();
-    } catch (IllegalArgumentException expected) {
-      assertThat(expected).hasMessageThat().isEqualTo("-2 is not a valid field number.");
-    }
-  }
-
-  @Test
-  public void testAddField() {
-    UnknownFieldSet.Field field = getField("optional_int32");
-    UnknownFieldSet fieldSet = UnknownFieldSet.newBuilder().addField(1, field).build();
-    assertThat(fieldSet.getField(1)).isEqualTo(field);
-  }
-
-  @Test
-  public void testAddField_withReplacement() {
-    UnknownFieldSet.Field first = UnknownFieldSet.Field.newBuilder().addFixed32(56).build();
-    UnknownFieldSet.Field second = UnknownFieldSet.Field.newBuilder().addFixed32(25).build();
-    UnknownFieldSet fieldSet = UnknownFieldSet.newBuilder()
-        .addField(1, first)
-        .addField(1, second)
-        .build();
-    List<Integer> list = fieldSet.getField(1).getFixed32List();
-    assertThat(list).hasSize(1);
-    assertThat(list.get(0)).isEqualTo(25);
-  }
-
-  @Test
-  public void testVarint() throws Exception {
-    UnknownFieldSet.Field field = getField("optional_int32");
-    assertThat(field.getVarintList()).hasSize(1);
-    assertThat((long) field.getVarintList().get(0)).isEqualTo(allFields.getOptionalInt32());
-  }
-
-  @Test
-  public void testFixed32() throws Exception {
-    UnknownFieldSet.Field field = getField("optional_fixed32");
-    assertThat(field.getFixed32List()).hasSize(1);
-    assertThat((int) field.getFixed32List().get(0)).isEqualTo(allFields.getOptionalFixed32());
-  }
-
-  @Test
-  public void testFixed64() throws Exception {
-    UnknownFieldSet.Field field = getField("optional_fixed64");
-    assertThat(field.getFixed64List()).hasSize(1);
-    assertThat((long) field.getFixed64List().get(0)).isEqualTo(allFields.getOptionalFixed64());
-  }
-
-  @Test
-  public void testLengthDelimited() throws Exception {
-    UnknownFieldSet.Field field = getField("optional_bytes");
-    assertThat(field.getLengthDelimitedList()).hasSize(1);
-    assertThat(field.getLengthDelimitedList().get(0)).isEqualTo(allFields.getOptionalBytes());
-  }
-
-  @Test
-  public void testGroup() throws Exception {
-    Descriptors.FieldDescriptor nestedFieldDescriptor =
-        TestAllTypes.OptionalGroup.getDescriptor().findFieldByName("a");
-    assertThat(nestedFieldDescriptor).isNotNull();
-
-    UnknownFieldSet.Field field = getField("optionalgroup");
-    assertThat(field.getGroupList()).hasSize(1);
-
-    UnknownFieldSet group = field.getGroupList().get(0);
-    assertThat(group.asMap()).hasSize(1);
-    assertThat(group.hasField(nestedFieldDescriptor.getNumber())).isTrue();
-
-    UnknownFieldSet.Field nestedField = group.getField(nestedFieldDescriptor.getNumber());
-    assertThat(nestedField.getVarintList()).hasSize(1);
-    assertThat((long) nestedField.getVarintList().get(0))
-        .isEqualTo(allFields.getOptionalGroup().getA());
-  }
-
-  @Test
-  public void testSerialize() throws Exception {
-    // Check that serializing the UnknownFieldSet produces the original data
-    // again.
-    ByteString data = emptyMessage.toByteString();
-    assertThat(data).isEqualTo(allFieldsData);
-  }
-
-  @Test
-  public void testCopyFrom() throws Exception {
-    TestEmptyMessage message = TestEmptyMessage.newBuilder().mergeFrom(emptyMessage).build();
-
-    assertThat(message.toString()).isEqualTo(emptyMessage.toString());
-  }
-
-  @Test
-  public void testMergeFrom() throws Exception {
-    TestEmptyMessage source =
-        TestEmptyMessage.newBuilder()
-            .setUnknownFields(
-                UnknownFieldSet.newBuilder()
-                    .addField(2, UnknownFieldSet.Field.newBuilder().addVarint(2).build())
-                    .addField(3, UnknownFieldSet.Field.newBuilder().addVarint(4).build())
-                    .build())
-            .build();
-    TestEmptyMessage destination =
-        TestEmptyMessage.newBuilder()
-            .setUnknownFields(
-                UnknownFieldSet.newBuilder()
-                    .addField(1, UnknownFieldSet.Field.newBuilder().addVarint(1).build())
-                    .addField(3, UnknownFieldSet.Field.newBuilder().addVarint(3).build())
-                    .build())
-            .mergeFrom(source)
-            .build();
-
-    assertThat(destination.toString()).isEqualTo("1: 1\n2: 2\n3: 3\n3: 4\n");
-  }
-
-  @Test
-  public void testAsMap() throws Exception {
-    UnknownFieldSet.Builder builder = UnknownFieldSet.newBuilder().mergeFrom(unknownFields);
-    Map<Integer, UnknownFieldSet.Field> mapFromBuilder = builder.asMap();
-    assertThat(mapFromBuilder).isNotEmpty();
-    UnknownFieldSet fields = builder.build();
-    Map<Integer, UnknownFieldSet.Field> mapFromFieldSet = fields.asMap();
-    assertThat(mapFromFieldSet).containsExactlyEntriesIn(mapFromBuilder);
-  }
-
-  @Test
-  public void testClear() throws Exception {
-    UnknownFieldSet fields = UnknownFieldSet.newBuilder().mergeFrom(unknownFields).clear().build();
-    assertThat(fields.asMap()).isEmpty();
-  }
-
-  @Test
-  public void testClearMessage() throws Exception {
-    TestEmptyMessage message =
-        TestEmptyMessage.newBuilder().mergeFrom(emptyMessage).clear().build();
-    assertThat(message.getSerializedSize()).isEqualTo(0);
-  }
-
-  @Test
-  public void testClearField() throws Exception {
-    int fieldNumber = unknownFields.asMap().keySet().iterator().next();
-    UnknownFieldSet fields =
-        UnknownFieldSet.newBuilder().mergeFrom(unknownFields).clearField(fieldNumber).build();
-    assertThat(fields.hasField(fieldNumber)).isFalse();
-  }
-
-  @Test
-  public void testParseKnownAndUnknown() throws Exception {
-    // Test mixing known and unknown fields when parsing.
-
-    UnknownFieldSet fields =
-        UnknownFieldSet.newBuilder(unknownFields)
-            .addField(123456, UnknownFieldSet.Field.newBuilder().addVarint(654321).build())
-            .build();
-
-    ByteString data = fields.toByteString();
-    TestAllTypes destination = TestAllTypes.parseFrom(data);
-
-    TestUtil.assertAllFieldsSet(destination);
-    assertThat(destination.getUnknownFields().asMap()).hasSize(1);
-
-    UnknownFieldSet.Field field = destination.getUnknownFields().getField(123456);
-    assertThat(field.getVarintList()).hasSize(1);
-    assertThat((long) field.getVarintList().get(0)).isEqualTo(654321);
-  }
-
-  @Test
-  public void testWrongTypeTreatedAsUnknown() throws Exception {
-    // Test that fields of the wrong wire type are treated like unknown fields
-    // when parsing.
-
-    ByteString bizarroData = getBizarroData();
-    TestAllTypes allTypesMessage = TestAllTypes.parseFrom(bizarroData);
-    TestEmptyMessage emptyMessage = TestEmptyMessage.parseFrom(bizarroData);
-
-    // All fields should have been interpreted as unknown, so the debug strings
-    // should be the same.
-    assertThat(emptyMessage.toString()).isEqualTo(allTypesMessage.toString());
-  }
-
-  @Test
-  public void testUnknownExtensions() throws Exception {
-    // Make sure fields are properly parsed to the UnknownFieldSet even when
-    // they are declared as extension numbers.
-
-    TestEmptyMessageWithExtensions message =
-        TestEmptyMessageWithExtensions.parseFrom(allFieldsData);
-
-    assertThat(unknownFields.asMap()).hasSize(message.getUnknownFields().asMap().size());
-    assertThat(allFieldsData).isEqualTo(message.toByteString());
-  }
-
-  @Test
-  public void testWrongExtensionTypeTreatedAsUnknown() throws Exception {
-    // Test that fields of the wrong wire type are treated like unknown fields
-    // when parsing extensions.
-
-    ByteString bizarroData = getBizarroData();
-    TestAllExtensions allExtensionsMessage = TestAllExtensions.parseFrom(bizarroData);
-    TestEmptyMessage emptyMessage = TestEmptyMessage.parseFrom(bizarroData);
-
-    // All fields should have been interpreted as unknown, so the debug strings
-    // should be the same.
-    assertThat(emptyMessage.toString()).isEqualTo(allExtensionsMessage.toString());
-  }
-
-  @Test
-  public void testParseUnknownEnumValue() throws Exception {
-    Descriptors.FieldDescriptor singularField =
-        TestAllTypes.getDescriptor().findFieldByName("optional_nested_enum");
-    Descriptors.FieldDescriptor repeatedField =
-        TestAllTypes.getDescriptor().findFieldByName("repeated_nested_enum");
-    assertThat(singularField).isNotNull();
-    assertThat(repeatedField).isNotNull();
-
-    ByteString data =
-        UnknownFieldSet.newBuilder()
-            .addField(
-                singularField.getNumber(),
-                UnknownFieldSet.Field.newBuilder()
-                    .addVarint(TestAllTypes.NestedEnum.BAR.getNumber())
-                    .addVarint(5) // not valid
-                    .build())
-            .addField(
-                repeatedField.getNumber(),
-                UnknownFieldSet.Field.newBuilder()
-                    .addVarint(TestAllTypes.NestedEnum.FOO.getNumber())
-                    .addVarint(4) // not valid
-                    .addVarint(TestAllTypes.NestedEnum.BAZ.getNumber())
-                    .addVarint(6) // not valid
-                    .build())
-            .build()
-            .toByteString();
-
-    {
-      TestAllTypes message = TestAllTypes.parseFrom(data);
-      assertThat(message.getOptionalNestedEnum()).isEqualTo(TestAllTypes.NestedEnum.BAR);
-      assertThat(message.getRepeatedNestedEnumList())
-          .containsExactly(TestAllTypes.NestedEnum.FOO, TestAllTypes.NestedEnum.BAZ)
-          .inOrder();
-      assertThat(message.getUnknownFields().getField(singularField.getNumber()).getVarintList())
-          .containsExactly(5L);
-      assertThat(message.getUnknownFields().getField(repeatedField.getNumber()).getVarintList())
-          .containsExactly(4L, 6L)
-          .inOrder();
-    }
-
-    {
-      TestAllExtensions message =
-          TestAllExtensions.parseFrom(data, TestUtil.getExtensionRegistry());
-      assertThat(message.getExtension(UnittestProto.optionalNestedEnumExtension))
-          .isEqualTo(TestAllTypes.NestedEnum.BAR);
-      assertThat(message.getExtension(UnittestProto.repeatedNestedEnumExtension))
-          .containsExactly(TestAllTypes.NestedEnum.FOO, TestAllTypes.NestedEnum.BAZ)
-          .inOrder();
-      assertThat(message.getUnknownFields().getField(singularField.getNumber()).getVarintList())
-          .containsExactly(5L);
-      assertThat(message.getUnknownFields().getField(repeatedField.getNumber()).getVarintList())
-          .containsExactly(4L, 6L)
-          .inOrder();
-    }
-  }
-
-  @Test
-  public void testLargeVarint() throws Exception {
-    ByteString data =
-        UnknownFieldSet.newBuilder()
-            .addField(1, UnknownFieldSet.Field.newBuilder().addVarint(0x7FFFFFFFFFFFFFFFL).build())
-            .build()
-            .toByteString();
-    UnknownFieldSet parsed = UnknownFieldSet.parseFrom(data);
-    UnknownFieldSet.Field field = parsed.getField(1);
-    assertThat(field.getVarintList()).hasSize(1);
-    assertThat((long) field.getVarintList().get(0)).isEqualTo(0x7FFFFFFFFFFFFFFFL);
-  }
-
-  @Test
-  public void testEqualsAndHashCode() {
-    UnknownFieldSet.Field fixed32Field = UnknownFieldSet.Field.newBuilder().addFixed32(1).build();
-    UnknownFieldSet.Field fixed64Field = UnknownFieldSet.Field.newBuilder().addFixed64(1).build();
-    UnknownFieldSet.Field varIntField = UnknownFieldSet.Field.newBuilder().addVarint(1).build();
-    UnknownFieldSet.Field lengthDelimitedField =
-        UnknownFieldSet.Field.newBuilder().addLengthDelimited(ByteString.EMPTY).build();
-    UnknownFieldSet.Field groupField =
-        UnknownFieldSet.Field.newBuilder().addGroup(unknownFields).build();
-
-    UnknownFieldSet a = UnknownFieldSet.newBuilder().addField(1, fixed32Field).build();
-    UnknownFieldSet b = UnknownFieldSet.newBuilder().addField(1, fixed64Field).build();
-    UnknownFieldSet c = UnknownFieldSet.newBuilder().addField(1, varIntField).build();
-    UnknownFieldSet d = UnknownFieldSet.newBuilder().addField(1, lengthDelimitedField).build();
-    UnknownFieldSet e = UnknownFieldSet.newBuilder().addField(1, groupField).build();
-
-    checkEqualsIsConsistent(a);
-    checkEqualsIsConsistent(b);
-    checkEqualsIsConsistent(c);
-    checkEqualsIsConsistent(d);
-    checkEqualsIsConsistent(e);
-
-    checkNotEqual(a, b);
-    checkNotEqual(a, c);
-    checkNotEqual(a, d);
-    checkNotEqual(a, e);
-    checkNotEqual(b, c);
-    checkNotEqual(b, d);
-    checkNotEqual(b, e);
-    checkNotEqual(c, d);
-    checkNotEqual(c, e);
-    checkNotEqual(d, e);
-  }
-
-  /**
-   * Asserts that the given field sets are not equal and have different hash codes.
-   *
-   * <p><b>Note:</b> It's valid for non-equal objects to have the same hash code, so this test is
-   * stricter than it needs to be. However, this should happen relatively rarely.
-   */
-  private void checkNotEqual(UnknownFieldSet s1, UnknownFieldSet s2) {
-    String equalsError = String.format("%s should not be equal to %s", s1, s2);
-    assertWithMessage(equalsError).that(s1).isNotEqualTo(s2);
-    assertWithMessage(equalsError).that(s2).isNotEqualTo(s1);
-
-    assertWithMessage("%s should have a different hash code from %s", s1, s2)
-        .that(s1.hashCode())
-        .isNotEqualTo(s2.hashCode());
-  }
-
-  /** Asserts that the given field sets are equal and have identical hash codes. */
-  private void checkEqualsIsConsistent(UnknownFieldSet set) {
-    // Object should be equal to itself.
-    assertThat(set.equals(set)).isTrue();
-
-    // Object should be equal to a copy of itself.
-    UnknownFieldSet copy = UnknownFieldSet.newBuilder(set).build();
-    assertThat(copy).isEqualTo(set);
-    assertThat(set).isEqualTo(copy);
-    assertThat(set.hashCode()).isEqualTo(copy.hashCode());
-  }
-
-  // =================================================================
-
-  @Test
-  public void testProto3RoundTrip() throws Exception {
-    ByteString data = getBizarroData();
-
-    UnittestProto3.TestEmptyMessage message =
-        UnittestProto3.TestEmptyMessage.parseFrom(data, ExtensionRegistryLite.getEmptyRegistry());
-    assertThat(message.toByteString()).isEqualTo(data);
-
-    message = UnittestProto3.TestEmptyMessage.newBuilder().mergeFrom(message).build();
-    assertThat(message.toByteString()).isEqualTo(data);
-
-    assertThat(data)
-        .isEqualTo(
-            UnittestProto3.TestMessageWithDummy.parseFrom(
-                    data, ExtensionRegistryLite.getEmptyRegistry())
-                .toBuilder()
-                // force copy-on-write
-                .setDummy(true)
-                .build()
-                .toBuilder()
-                .clearDummy()
-                .build()
-                .toByteString());
-  }
-}
diff --git a/libs/protobuf/java/core/src/test/java/com/google/protobuf/UnmodifiableLazyStringListTest.java b/libs/protobuf/java/core/src/test/java/com/google/protobuf/UnmodifiableLazyStringListTest.java
deleted file mode 100644
index d5d9195..0000000
--- a/libs/protobuf/java/core/src/test/java/com/google/protobuf/UnmodifiableLazyStringListTest.java
+++ /dev/null
@@ -1,232 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.common.truth.Truth.assertThat;
-import static com.google.common.truth.Truth.assertWithMessage;
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.ListIterator;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-/** Tests for {@link UnmodifiableLazyStringList}. */
-@RunWith(JUnit4.class)
-public class UnmodifiableLazyStringListTest {
-
-  private static final String STRING_A = "A";
-  private static final String STRING_B = "B";
-  private static final String STRING_C = "C";
-
-  private static final ByteString BYTE_STRING_A = ByteString.copyFromUtf8("A");
-  private static final ByteString BYTE_STRING_B = ByteString.copyFromUtf8("B");
-  private static final ByteString BYTE_STRING_C = ByteString.copyFromUtf8("C");
-
-  @Test
-  public void testReadOnlyMethods() {
-    LazyStringArrayList rawList = createSampleList();
-    UnmodifiableLazyStringList list = new UnmodifiableLazyStringList(rawList);
-    assertThat(list).hasSize(3);
-    assertThat(list.get(0)).isSameInstanceAs(STRING_A);
-    assertThat(list.get(1)).isSameInstanceAs(STRING_B);
-    assertThat(list.get(2)).isSameInstanceAs(STRING_C);
-    assertThat(list.getByteString(0)).isEqualTo(BYTE_STRING_A);
-    assertThat(list.getByteString(1)).isEqualTo(BYTE_STRING_B);
-    assertThat(list.getByteString(2)).isEqualTo(BYTE_STRING_C);
-
-    List<ByteString> byteStringList = list.asByteStringList();
-    assertThat(byteStringList.get(0)).isSameInstanceAs(list.getByteString(0));
-    assertThat(byteStringList.get(1)).isSameInstanceAs(list.getByteString(1));
-    assertThat(byteStringList.get(2)).isSameInstanceAs(list.getByteString(2));
-  }
-
-  @Test
-  public void testModifyMethods() {
-    LazyStringArrayList rawList = createSampleList();
-    UnmodifiableLazyStringList list = new UnmodifiableLazyStringList(rawList);
-
-    try {
-      list.remove(0);
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-    assertThat(list).hasSize(3);
-
-    try {
-      list.add(STRING_B);
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-    assertThat(list).hasSize(3);
-
-    try {
-      list.set(1, STRING_B);
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-    assertThat(list).hasSize(3);
-
-    List<ByteString> byteStringList = list.asByteStringList();
-    try {
-      byteStringList.remove(0);
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-    assertThat(list).hasSize(3);
-    assertThat(byteStringList).hasSize(3);
-
-    try {
-      byteStringList.add(BYTE_STRING_B);
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-    assertThat(list).hasSize(3);
-    assertThat(byteStringList).hasSize(3);
-
-    try {
-      byteStringList.set(1, BYTE_STRING_B);
-      assertWithMessage("expected exception").fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
-    assertThat(list).hasSize(3);
-    assertThat(byteStringList).hasSize(3);
-  }
-
-  @Test
-  public void testIterator() {
-    LazyStringArrayList rawList = createSampleList();
-    UnmodifiableLazyStringList list = new UnmodifiableLazyStringList(rawList);
-
-    Iterator<String> iter = list.iterator();
-    int count = 0;
-    while (iter.hasNext()) {
-      iter.next();
-      count++;
-      try {
-        iter.remove();
-        assertWithMessage("expected exception").fail();
-      } catch (UnsupportedOperationException e) {
-        // expected
-      }
-    }
-    assertThat(count).isEqualTo(3);
-
-    List<ByteString> byteStringList = list.asByteStringList();
-    Iterator<ByteString> byteIter = byteStringList.iterator();
-    count = 0;
-    while (byteIter.hasNext()) {
-      byteIter.next();
-      count++;
-      try {
-        byteIter.remove();
-        assertWithMessage("expected exception").fail();
-      } catch (UnsupportedOperationException e) {
-        // expected
-      }
-    }
-    assertThat(count).isEqualTo(3);
-  }
-
-  @Test
-  public void testListIterator() {
-    LazyStringArrayList rawList = createSampleList();
-    UnmodifiableLazyStringList list = new UnmodifiableLazyStringList(rawList);
-
-    ListIterator<String> iter = list.listIterator();
-    int count = 0;
-    while (iter.hasNext()) {
-      iter.next();
-      count++;
-      try {
-        iter.remove();
-        assertWithMessage("expected exception").fail();
-      } catch (UnsupportedOperationException e) {
-        // expected
-      }
-      try {
-        iter.set("bar");
-        assertWithMessage("expected exception").fail();
-      } catch (UnsupportedOperationException e) {
-        // expected
-      }
-      try {
-        iter.add("bar");
-        assertWithMessage("expected exception").fail();
-      } catch (UnsupportedOperationException e) {
-        // expected
-      }
-    }
-    assertThat(count).isEqualTo(3);
-
-    List<ByteString> byteStringList = list.asByteStringList();
-    ListIterator<ByteString> byteIter = byteStringList.listIterator();
-    count = 0;
-    while (byteIter.hasNext()) {
-      byteIter.next();
-      count++;
-      try {
-        byteIter.remove();
-        assertWithMessage("expected exception").fail();
-      } catch (UnsupportedOperationException e) {
-        // expected
-      }
-      try {
-        byteIter.set(BYTE_STRING_A);
-        assertWithMessage("expected exception").fail();
-      } catch (UnsupportedOperationException e) {
-        // expected
-      }
-      try {
-        byteIter.add(BYTE_STRING_A);
-        assertWithMessage("expected exception").fail();
-      } catch (UnsupportedOperationException e) {
-        // expected
-      }
-    }
-    assertThat(count).isEqualTo(3);
-  }
-
-  private LazyStringArrayList createSampleList() {
-    LazyStringArrayList rawList = new LazyStringArrayList();
-    rawList.add(STRING_A);
-    rawList.add(STRING_B);
-    rawList.add(STRING_C);
-    return rawList;
-  }
-}
diff --git a/libs/protobuf/java/core/src/test/java/com/google/protobuf/Utf8Test.java b/libs/protobuf/java/core/src/test/java/com/google/protobuf/Utf8Test.java
deleted file mode 100644
index 44f7cf1..0000000
--- a/libs/protobuf/java/core/src/test/java/com/google/protobuf/Utf8Test.java
+++ /dev/null
@@ -1,236 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.common.truth.Truth.assertThat;
-import static com.google.common.truth.Truth.assertWithMessage;
-
-import java.nio.ByteBuffer;
-import java.util.Random;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-@RunWith(JUnit4.class)
-public class Utf8Test {
-  private static final int NUM_CHARS = 16384;
-
-  private static final Utf8.Processor safeProcessor = new Utf8.SafeProcessor();
-  private static final Utf8.Processor unsafeProcessor = new Utf8.UnsafeProcessor();
-
-  @Test
-  public void testEncode() {
-    assertEncoding(randomString(0x80));
-    assertEncoding(randomString(0x90));
-    assertEncoding(randomString(0x800));
-    assertEncoding(randomString(0x10000));
-    assertEncoding(randomString(0x10ffff));
-  }
-
-  @Test
-  public void testEncode_insufficientSpace() {
-    assertEncoding_insufficientSpace(randomString(0x80));
-    assertEncoding_insufficientSpace(randomString(0x90));
-    assertEncoding_insufficientSpace(randomString(0x800));
-    assertEncoding_insufficientSpace(randomString(0x10000));
-    assertEncoding_insufficientSpace(randomString(0x10ffff));
-  }
-
-  @Test
-  public void testValid() {
-    assertIsValid(new byte[] {(byte) 0xE0, (byte) 0xB9, (byte) 0x96}, true);
-    assertIsValid(new byte[] {(byte) 0xF0, (byte) 0xB2, (byte) 0x83, (byte) 0xBC}, true);
-  }
-
-  @Test
-  public void testOverlongIsInvalid() {
-    assertIsValid(new byte[] {(byte) 0xC0, (byte) 0x81}, false);
-    assertIsValid(new byte[] {(byte) 0xE0, (byte) 0x81, (byte) 0x81}, false);
-    assertIsValid(new byte[] {(byte) 0xF0, (byte) 0x81, (byte) 0x81, (byte) 0x81}, false);
-  }
-
-  @Test
-  public void testMaxCodepointExceeded() {
-    // byte1 > 0xF4
-    assertIsValid(new byte[] {(byte) 0xF5, (byte) 0x81, (byte) 0x81, (byte) 0x81}, false);
-  }
-
-  @Test
-  public void testInvalidSurrogateCodepoint() {
-    assertIsValid(new byte[] {(byte) 0xED, (byte) 0xA1, (byte) 0x81}, false);
-
-    // byte1 == 0xF0 && byte2 < 0x90
-    assertIsValid(new byte[] {(byte) 0xF0, (byte) 0x81, (byte) 0x81, (byte) 0x81}, false);
-    // byte1 == 0xF4 && byte2 > 0x8F
-    assertIsValid(new byte[] {(byte) 0xF4, (byte) 0x90, (byte) 0x81, (byte) 0x81}, false);
-  }
-
-  private static String randomString(int maxCodePoint) {
-    final long seed = 99;
-    final Random rnd = new Random(seed);
-    StringBuilder sb = new StringBuilder();
-    for (int j = 0; j < NUM_CHARS; j++) {
-      int codePoint;
-      do {
-        codePoint = rnd.nextInt(maxCodePoint);
-      } while (Character.isSurrogate((char) codePoint));
-      sb.appendCodePoint(codePoint);
-    }
-    return sb.toString();
-  }
-
-  private static void assertIsValid(byte[] data, boolean valid) {
-    assertWithMessage("isValidUtf8[ARRAY]")
-        .that(safeProcessor.isValidUtf8(data, 0, data.length))
-        .isEqualTo(valid);
-    assertWithMessage("isValidUtf8[ARRAY_UNSAFE]")
-        .that(unsafeProcessor.isValidUtf8(data, 0, data.length))
-        .isEqualTo(valid);
-
-    ByteBuffer buffer = ByteBuffer.wrap(data);
-    assertWithMessage("isValidUtf8[NIO_HEAP]")
-        .that(safeProcessor.isValidUtf8(buffer, buffer.position(), buffer.remaining()))
-        .isEqualTo(valid);
-
-    // Direct buffers.
-    buffer = ByteBuffer.allocateDirect(data.length);
-    buffer.put(data);
-    buffer.flip();
-    assertWithMessage("isValidUtf8[NIO_DEFAULT]")
-        .that(safeProcessor.isValidUtf8(buffer, buffer.position(), buffer.remaining()))
-        .isEqualTo(valid);
-    assertWithMessage("isValidUtf8[NIO_UNSAFE]")
-        .that(unsafeProcessor.isValidUtf8(buffer, buffer.position(), buffer.remaining()))
-        .isEqualTo(valid);
-  }
-
-  private static void assertEncoding(String message) {
-    byte[] expected = message.getBytes(Internal.UTF_8);
-    byte[] output = encodeToByteArray(message, expected.length, safeProcessor);
-    assertWithMessage("encodeUtf8[ARRAY]")
-        .that(output).isEqualTo(expected);
-
-    output = encodeToByteArray(message, expected.length, unsafeProcessor);
-    assertWithMessage("encodeUtf8[ARRAY_UNSAFE]")
-        .that(output).isEqualTo(expected);
-
-    output = encodeToByteBuffer(message, expected.length, false, safeProcessor);
-    assertWithMessage("encodeUtf8[NIO_HEAP]")
-        .that(output).isEqualTo(expected);
-
-    output = encodeToByteBuffer(message, expected.length, true, safeProcessor);
-    assertWithMessage("encodeUtf8[NIO_DEFAULT]")
-        .that(output).isEqualTo(expected);
-
-    output = encodeToByteBuffer(message, expected.length, true, unsafeProcessor);
-    assertWithMessage("encodeUtf8[NIO_UNSAFE]")
-        .that(output).isEqualTo(expected);
-  }
-
-  private void assertEncoding_insufficientSpace(String message) {
-    final int length = message.length() - 1;
-    Class<ArrayIndexOutOfBoundsException> clazz = ArrayIndexOutOfBoundsException.class;
-
-    try {
-      encodeToByteArray(message, length, safeProcessor);
-      assertWithMessage("Expected " + clazz.getSimpleName()).fail();
-    } catch (Throwable t) {
-      // Expected
-      assertThat(t).isInstanceOf(clazz);
-      // byte[] + safeProcessor will not exit early. We can't match the message since we don't
-      // know which char/index due to random input.
-    }
-
-    try {
-      encodeToByteArray(message, length, unsafeProcessor);
-      assertWithMessage("Expected " + clazz.getSimpleName()).fail();
-    } catch (Throwable t) {
-      assertThat(t).isInstanceOf(clazz);
-      // byte[] + unsafeProcessor will exit early, so we have can match the message.
-      String pattern = "Failed writing (.) at index " + length;
-      assertThat(t).hasMessageThat().matches(pattern);
-    }
-
-    try {
-      encodeToByteBuffer(message, length, false, safeProcessor);
-      assertWithMessage("Expected " + clazz.getSimpleName()).fail();
-    } catch (Throwable t) {
-      // Expected
-      assertThat(t).isInstanceOf(clazz);
-      // ByteBuffer + safeProcessor will not exit early. We can't match the message since we don't
-      // know which char/index due to random input.
-    }
-
-    try {
-      encodeToByteBuffer(message, length, true, safeProcessor);
-      assertWithMessage("Expected " + clazz.getSimpleName()).fail();
-    } catch (Throwable t) {
-      // Expected
-      assertThat(t).isInstanceOf(clazz);
-      // ByteBuffer + safeProcessor will not exit early. We can't match the message since we don't
-      // know which char/index due to random input.
-    }
-
-    try {
-      encodeToByteBuffer(message, length, true, unsafeProcessor);
-      assertWithMessage("Expected " + clazz.getSimpleName()).fail();
-    } catch (Throwable t) {
-      // Expected
-      assertThat(t).isInstanceOf(clazz);
-      // Direct ByteBuffer + unsafeProcessor will exit early if it's not on Android, so we can
-      // match the message. On Android, a direct ByteBuffer will have hasArray() being true and
-      // it will take a different code path and produces a different message.
-      if (!Android.isOnAndroidDevice()) {
-        String pattern = "Failed writing (.) at index " + length;
-        assertThat(t).hasMessageThat().matches(pattern);
-      }
-    }
-  }
-
-  private static byte[] encodeToByteArray(String message, int length, Utf8.Processor processor) {
-    byte[] output = new byte[length];
-    processor.encodeUtf8(message, output, 0, output.length);
-    return output;
-  }
-
-  private static byte[] encodeToByteBuffer(
-      String message, int length, boolean direct, Utf8.Processor processor) {
-    ByteBuffer buffer = direct ? ByteBuffer.allocateDirect(length) : ByteBuffer.allocate(length);
-
-    processor.encodeUtf8(message, buffer);
-    buffer.flip();
-
-    byte[] output = new byte[buffer.remaining()];
-    buffer.get(output);
-    return output;
-  }
-
-}
diff --git a/libs/protobuf/java/core/src/test/java/com/google/protobuf/WellKnownTypesTest.java b/libs/protobuf/java/core/src/test/java/com/google/protobuf/WellKnownTypesTest.java
deleted file mode 100644
index 982e200..0000000
--- a/libs/protobuf/java/core/src/test/java/com/google/protobuf/WellKnownTypesTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import com.google.protobuf.Descriptors.Descriptor;
-import com.google.protobuf.Descriptors.EnumDescriptor;
-import com.google.protobuf.Descriptors.EnumValueDescriptor;
-import com.google.protobuf.Descriptors.FieldDescriptor;
-import com.google.protobuf.test.TestWellKnownTypes;
-
-import junit.framework.TestCase;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * This test ensures that well-known types are included in protobuf Java
- * runtime library.
- */
-public class WellKnownTypesTest extends TestCase {
-  public void testWellKnownTypes() {
-    // The test passes if it compiles.
-    TestWellKnownTypes message = TestWellKnownTypes.newBuilder().build();
-    assertEquals(0, message.getAnyField().getSerializedSize());
-    assertEquals(0, message.getApiField().getSerializedSize());
-    assertEquals(0, message.getDurationField().getSerializedSize());
-    assertEquals(0, message.getEmptyField().getSerializedSize());
-    assertEquals(0, message.getFieldMaskField().getSerializedSize());
-    assertEquals(0, message.getSourceContextField().getSerializedSize());
-    assertEquals(0, message.getStructField().getSerializedSize());
-    assertEquals(0, message.getTimestampField().getSerializedSize());
-    assertEquals(0, message.getTypeField().getSerializedSize());
-    assertEquals(0, message.getInt32Field().getSerializedSize());
-  }
-}
diff --git a/libs/protobuf/java/core/src/test/java/com/google/protobuf/WireFormatLiteTest.java b/libs/protobuf/java/core/src/test/java/com/google/protobuf/WireFormatLiteTest.java
deleted file mode 100644
index cbed9fc..0000000
--- a/libs/protobuf/java/core/src/test/java/com/google/protobuf/WireFormatLiteTest.java
+++ /dev/null
@@ -1,1084 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.common.truth.Truth.assertThat;
-import static com.google.common.truth.Truth.assertWithMessage;
-import static com.google.protobuf.UnittestLite.optionalForeignEnumExtensionLite;
-
-import com.google.protobuf.UnittestLite.ForeignEnumLite;
-import com.google.protobuf.UnittestLite.TestAllExtensionsLite;
-import com.google.protobuf.UnittestLite.TestPackedExtensionsLite;
-import map_test.MapForProto2TestProto;
-import map_test.MapTestProto.TestMap;
-import protobuf_unittest.UnittestMset.RawMessageSet;
-import protobuf_unittest.UnittestMset.TestMessageSetExtension1;
-import protobuf_unittest.UnittestMset.TestMessageSetExtension2;
-import protobuf_unittest.UnittestProto;
-import protobuf_unittest.UnittestProto.TestAllExtensions;
-import protobuf_unittest.UnittestProto.TestAllTypes;
-import protobuf_unittest.UnittestProto.TestExtensionInsideTable;
-import protobuf_unittest.UnittestProto.TestFieldOrderings;
-import protobuf_unittest.UnittestProto.TestOneof2;
-import protobuf_unittest.UnittestProto.TestOneofBackwardsCompatible;
-import protobuf_unittest.UnittestProto.TestPackedExtensions;
-import protobuf_unittest.UnittestProto.TestPackedTypes;
-import proto2_wireformat_unittest.UnittestMsetWireFormat.TestMessageSet;
-import proto3_unittest.UnittestProto3;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.List;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-@RunWith(JUnit4.class)
-public class WireFormatLiteTest {
-
-  @Test
-  public void testSerializeExtensionsLite() throws Exception {
-    // TestAllTypes and TestAllExtensions should have compatible wire formats,
-    // so if we serialize a TestAllExtensions then parse it as TestAllTypes
-    // it should work.
-
-    TestAllExtensionsLite message = TestUtilLite.getAllLiteExtensionsSet();
-    ByteString rawBytes = message.toByteString();
-    assertThat(message.getSerializedSize()).isEqualTo(rawBytes.size());
-
-    TestAllTypes message2 = TestAllTypes.parseFrom(rawBytes);
-
-    TestUtil.assertAllFieldsSet(message2);
-  }
-
-  @Test
-  public void testSerializePackedExtensionsLite() throws Exception {
-    // TestPackedTypes and TestPackedExtensions should have compatible wire
-    // formats; check that they serialize to the same string.
-    TestPackedExtensionsLite message = TestUtilLite.getLitePackedExtensionsSet();
-    ByteString rawBytes = message.toByteString();
-
-    TestPackedTypes message2 = TestUtil.getPackedSet();
-    ByteString rawBytes2 = message2.toByteString();
-
-    assertThat(rawBytes2).isEqualTo(rawBytes);
-  }
-
-  @Test
-  public void testParseExtensionsLite() throws Exception {
-    // TestAllTypes and TestAllExtensions should have compatible wire formats,
-    // so if we serialize a TestAllTypes then parse it as TestAllExtensions
-    // it should work.
-
-    TestAllTypes message = TestUtil.getAllSet();
-    ByteString rawBytes = message.toByteString();
-
-    ExtensionRegistryLite registryLite = TestUtilLite.getExtensionRegistryLite();
-
-    TestAllExtensionsLite message2 = TestAllExtensionsLite.parseFrom(rawBytes, registryLite);
-    TestUtil.assertAllExtensionsSet(message2);
-    message2 = TestAllExtensionsLite.parseFrom(message.toByteArray(), registryLite);
-    TestUtil.assertAllExtensionsSet(message2);
-  }
-
-  @Test
-  public void testParsePackedExtensionsLite() throws Exception {
-    // Ensure that packed extensions can be properly parsed.
-    TestPackedExtensionsLite message = TestUtilLite.getLitePackedExtensionsSet();
-    ByteString rawBytes = message.toByteString();
-
-    ExtensionRegistryLite registry = TestUtilLite.getExtensionRegistryLite();
-
-    TestPackedExtensionsLite message2 = TestPackedExtensionsLite.parseFrom(rawBytes, registry);
-    TestUtil.assertPackedExtensionsSet(message2);
-    message2 = TestPackedExtensionsLite.parseFrom(message.toByteArray(), registry);
-    TestUtil.assertPackedExtensionsSet(message2);
-  }
-
-  @Test
-  public void testSerialization() throws Exception {
-    TestAllTypes message = TestUtil.getAllSet();
-
-    ByteString rawBytes = message.toByteString();
-    assertThat(message.getSerializedSize()).isEqualTo(rawBytes.size());
-
-    TestAllTypes message2 = TestAllTypes.parseFrom(rawBytes);
-
-    TestUtil.assertAllFieldsSet(message2);
-  }
-
-  @Test
-  public void testSerializationPacked() throws Exception {
-    TestPackedTypes message = TestUtil.getPackedSet();
-
-    ByteString rawBytes = message.toByteString();
-    assertThat(message.getSerializedSize()).isEqualTo(rawBytes.size());
-
-    TestPackedTypes message2 = TestPackedTypes.parseFrom(rawBytes);
-
-    TestUtil.assertPackedFieldsSet(message2);
-  }
-
-  @Test
-  public void testSerializeExtensions() throws Exception {
-    // TestAllTypes and TestAllExtensions should have compatible wire formats,
-    // so if we serialize a TestAllExtensions then parse it as TestAllTypes
-    // it should work.
-
-    TestAllExtensions message = TestUtil.getAllExtensionsSet();
-    ByteString rawBytes = message.toByteString();
-    assertThat(message.getSerializedSize()).isEqualTo(rawBytes.size());
-
-    TestAllTypes message2 = TestAllTypes.parseFrom(rawBytes);
-
-    TestUtil.assertAllFieldsSet(message2);
-  }
-
-  @Test
-  public void testSerializePackedExtensions() throws Exception {
-    // TestPackedTypes and TestPackedExtensions should have compatible wire
-    // formats; check that they serialize to the same string.
-    TestPackedExtensions message = TestUtil.getPackedExtensionsSet();
-    ByteString rawBytes = message.toByteString();
-
-    TestPackedTypes message2 = TestUtil.getPackedSet();
-    ByteString rawBytes2 = message2.toByteString();
-
-    assertThat(rawBytes2).isEqualTo(rawBytes);
-  }
-
-  @Test
-  public void testSerializationPackedWithoutGetSerializedSize() throws Exception {
-    // Write directly to an OutputStream, without invoking getSerializedSize()
-    // This used to be a bug where the size of a packed field was incorrect,
-    // since getSerializedSize() was never invoked.
-    TestPackedTypes message = TestUtil.getPackedSet();
-
-    // Directly construct a CodedOutputStream around the actual OutputStream,
-    // in case writeTo(OutputStream output) invokes getSerializedSize();
-    ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-    CodedOutputStream codedOutput = CodedOutputStream.newInstance(outputStream);
-
-    message.writeTo(codedOutput);
-
-    codedOutput.flush();
-
-    TestPackedTypes message2 = TestPackedTypes.parseFrom(outputStream.toByteArray());
-
-    TestUtil.assertPackedFieldsSet(message2);
-  }
-
-  @Test
-  public void testParseExtensions() throws Exception {
-    // TestAllTypes and TestAllExtensions should have compatible wire formats,
-    // so if we serialize a TestAllTypes then parse it as TestAllExtensions
-    // it should work.
-
-    TestAllTypes message = TestUtil.getAllSet();
-    ByteString rawBytes = message.toByteString();
-
-    ExtensionRegistryLite registry = TestUtil.getExtensionRegistry();
-
-    TestAllExtensions message2 = TestAllExtensions.parseFrom(rawBytes, registry);
-
-    TestUtil.assertAllExtensionsSet(message2);
-  }
-
-  @Test
-  public void testParsePackedExtensions() throws Exception {
-    // Ensure that packed extensions can be properly parsed.
-    TestPackedExtensions message = TestUtil.getPackedExtensionsSet();
-    ByteString rawBytes = message.toByteString();
-
-    ExtensionRegistryLite registry = TestUtil.getExtensionRegistry();
-
-    TestPackedExtensions message2 = TestPackedExtensions.parseFrom(rawBytes, registry);
-
-    TestUtil.assertPackedExtensionsSet(message2);
-  }
-
-  @Test
-  public void testSerializeDelimited() throws Exception {
-    ByteArrayOutputStream output = new ByteArrayOutputStream();
-    TestUtil.getAllSet().writeDelimitedTo(output);
-    output.write(12);
-    TestUtil.getPackedSet().writeDelimitedTo(output);
-    output.write(34);
-
-    ByteArrayInputStream input = new ByteArrayInputStream(output.toByteArray());
-
-    TestUtil.assertAllFieldsSet(TestAllTypes.parseDelimitedFrom(input));
-    assertThat(input.read()).isEqualTo(12);
-    TestUtil.assertPackedFieldsSet(TestPackedTypes.parseDelimitedFrom(input));
-    assertThat(input.read()).isEqualTo(34);
-    assertThat(input.read()).isEqualTo(-1);
-
-    // We're at EOF, so parsing again should return null.
-    assertThat(TestAllTypes.parseDelimitedFrom(input)).isNull();
-  }
-
-  private ExtensionRegistryLite getTestFieldOrderingsRegistry() {
-    ExtensionRegistryLite result = ExtensionRegistryLite.newInstance();
-    result.add(UnittestProto.myExtensionInt);
-    result.add(UnittestProto.myExtensionString);
-    return result;
-  }
-
-  @Test
-  public void testParseMultipleExtensionRanges() throws Exception {
-    // Make sure we can parse a message that contains multiple extensions
-    // ranges.
-    TestFieldOrderings source =
-        TestFieldOrderings.newBuilder()
-            .setMyInt(1)
-            .setMyString("foo")
-            .setMyFloat(1.0F)
-            .setExtension(UnittestProto.myExtensionInt, 23)
-            .setExtension(UnittestProto.myExtensionString, "bar")
-            .build();
-    TestFieldOrderings dest =
-        TestFieldOrderings.parseFrom(source.toByteString(), getTestFieldOrderingsRegistry());
-    assertThat(dest).isEqualTo(source);
-  }
-
-  private static ExtensionRegistryLite getTestExtensionInsideTableRegistry() {
-    ExtensionRegistryLite result = ExtensionRegistryLite.newInstance();
-    result.add(UnittestProto.testExtensionInsideTableExtension);
-    return result;
-  }
-
-  @Test
-  public void testExtensionInsideTable() throws Exception {
-    // Make sure the extension within the range of table is parsed correctly in experimental
-    // runtime.
-    TestExtensionInsideTable source =
-        TestExtensionInsideTable.newBuilder()
-            .setField1(1)
-            .setExtension(UnittestProto.testExtensionInsideTableExtension, 23)
-            .build();
-    TestExtensionInsideTable dest =
-        TestExtensionInsideTable.parseFrom(
-            source.toByteString(), getTestExtensionInsideTableRegistry());
-    assertThat(dest).isEqualTo(source);
-  }
-
-  private static final int UNKNOWN_TYPE_ID = 1550055;
-  private static final int TYPE_ID_1 = 1545008;
-  private static final int TYPE_ID_2 = 1547769;
-
-  @Test
-  public void testSerializeMessageSetEagerly() throws Exception {
-    testSerializeMessageSetWithFlag(true);
-  }
-
-  @Test
-  public void testSerializeMessageSetNotEagerly() throws Exception {
-    testSerializeMessageSetWithFlag(false);
-  }
-
-  private void testSerializeMessageSetWithFlag(boolean eagerParsing) throws Exception {
-    ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
-    CodedOutputStream output = CodedOutputStream.newInstance(byteArrayOutputStream);
-    output.writeRawMessageSetExtension(UNKNOWN_TYPE_ID, ByteString.copyFromUtf8("bar"));
-    output.flush();
-    byte[] messageSetBytes = byteArrayOutputStream.toByteArray();
-
-    ExtensionRegistryLite.setEagerlyParseMessageSets(eagerParsing);
-    // Set up a TestMessageSet with two known messages and an unknown one.
-    TestMessageSet messageSet =
-        TestMessageSet.newBuilder()
-            .setExtension(
-                TestMessageSetExtension1.messageSetExtension,
-                TestMessageSetExtension1.newBuilder().setI(123).build())
-            .setExtension(
-                TestMessageSetExtension2.messageSetExtension,
-                TestMessageSetExtension2.newBuilder().setStr("foo").build())
-            .mergeFrom(messageSetBytes)
-            .build();
-
-    ByteString data = messageSet.toByteString();
-
-    // Parse back using RawMessageSet and check the contents.
-    RawMessageSet raw = RawMessageSet.parseFrom(data);
-
-    assertThat(raw.getItemCount()).isEqualTo(3);
-    assertThat(raw.getItem(0).getTypeId()).isEqualTo(TYPE_ID_1);
-    assertThat(raw.getItem(1).getTypeId()).isEqualTo(TYPE_ID_2);
-    assertThat(raw.getItem(2).getTypeId()).isEqualTo(UNKNOWN_TYPE_ID);
-
-    TestMessageSetExtension1 message1 =
-        TestMessageSetExtension1.parseFrom(raw.getItem(0).getMessage());
-    assertThat(message1.getI()).isEqualTo(123);
-
-    TestMessageSetExtension2 message2 =
-        TestMessageSetExtension2.parseFrom(raw.getItem(1).getMessage());
-    assertThat(message2.getStr()).isEqualTo("foo");
-
-    assertThat(raw.getItem(2).getMessage().toStringUtf8()).isEqualTo("bar");
-  }
-
-  @Test
-  public void testParseMessageSetEagerly() throws Exception {
-    testParseMessageSetWithFlag(true);
-  }
-
-  @Test
-  public void testParseMessageSetNotEagerly() throws Exception {
-    testParseMessageSetWithFlag(false);
-  }
-
-  private void testParseMessageSetWithFlag(boolean eagerParsing) throws Exception {
-    ExtensionRegistryLite.setEagerlyParseMessageSets(eagerParsing);
-    ExtensionRegistryLite extensionRegistry = ExtensionRegistryLite.newInstance();
-    extensionRegistry.add(TestMessageSetExtension1.messageSetExtension);
-    extensionRegistry.add(TestMessageSetExtension2.messageSetExtension);
-
-    // Set up a RawMessageSet with two known messages and an unknown one.
-    RawMessageSet raw =
-        RawMessageSet.newBuilder()
-            .addItem(
-                RawMessageSet.Item.newBuilder()
-                    .setTypeId(TYPE_ID_1)
-                    .setMessage(
-                        TestMessageSetExtension1.newBuilder().setI(123).build().toByteString())
-                    .build())
-            .addItem(
-                RawMessageSet.Item.newBuilder()
-                    .setTypeId(TYPE_ID_2)
-                    .setMessage(
-                        TestMessageSetExtension2.newBuilder().setStr("foo").build().toByteString())
-                    .build())
-            .addItem(
-                RawMessageSet.Item.newBuilder()
-                    .setTypeId(UNKNOWN_TYPE_ID)
-                    .setMessage(ByteString.copyFromUtf8("bar"))
-                    .build())
-            .build();
-
-    ByteString data = raw.toByteString();
-
-    // Parse as a TestMessageSet and check the contents.
-    TestMessageSet messageSet = TestMessageSet.parseFrom(data, extensionRegistry);
-
-    assertThat(messageSet.getExtension(TestMessageSetExtension1.messageSetExtension).getI())
-        .isEqualTo(123);
-    assertThat(messageSet.getExtension(TestMessageSetExtension2.messageSetExtension).getStr())
-        .isEqualTo("foo");
-  }
-
-  @Test
-  public void testParseMessageSetExtensionEagerly() throws Exception {
-    testParseMessageSetExtensionWithFlag(true);
-  }
-
-  @Test
-  public void testParseMessageSetExtensionNotEagerly() throws Exception {
-    testParseMessageSetExtensionWithFlag(false);
-  }
-
-  private void testParseMessageSetExtensionWithFlag(boolean eagerParsing) throws Exception {
-    ExtensionRegistryLite.setEagerlyParseMessageSets(eagerParsing);
-    ExtensionRegistryLite extensionRegistry = ExtensionRegistryLite.newInstance();
-    extensionRegistry.add(TestMessageSetExtension1.messageSetExtension);
-
-    // Set up a RawMessageSet with a known messages.
-    int typeId1 = 1545008;
-    RawMessageSet raw =
-        RawMessageSet.newBuilder()
-            .addItem(
-                RawMessageSet.Item.newBuilder()
-                    .setTypeId(typeId1)
-                    .setMessage(
-                        TestMessageSetExtension1.newBuilder().setI(123).build().toByteString())
-                    .build())
-            .build();
-
-    ByteString data = raw.toByteString();
-
-    // Parse as a TestMessageSet and check the contents.
-    TestMessageSet messageSet = TestMessageSet.parseFrom(data, extensionRegistry);
-    assertThat(messageSet.getExtension(TestMessageSetExtension1.messageSetExtension).getI())
-        .isEqualTo(123);
-  }
-
-  @Test
-  public void testMergeLazyMessageSetExtensionEagerly() throws Exception {
-    testMergeLazyMessageSetExtensionWithFlag(true);
-  }
-
-  @Test
-  public void testMergeLazyMessageSetExtensionNotEagerly() throws Exception {
-    testMergeLazyMessageSetExtensionWithFlag(false);
-  }
-
-  private void testMergeLazyMessageSetExtensionWithFlag(boolean eagerParsing) throws Exception {
-    ExtensionRegistryLite.setEagerlyParseMessageSets(eagerParsing);
-    ExtensionRegistryLite extensionRegistry = ExtensionRegistryLite.newInstance();
-    extensionRegistry.add(TestMessageSetExtension1.messageSetExtension);
-
-    // Set up a RawMessageSet with a known messages.
-    int typeId1 = 1545008;
-    RawMessageSet raw =
-        RawMessageSet.newBuilder()
-            .addItem(
-                RawMessageSet.Item.newBuilder()
-                    .setTypeId(typeId1)
-                    .setMessage(
-                        TestMessageSetExtension1.newBuilder().setI(123).build().toByteString())
-                    .build())
-            .build();
-
-    ByteString data = raw.toByteString();
-
-    // Parse as a TestMessageSet and store value into lazy field
-    TestMessageSet messageSet = TestMessageSet.parseFrom(data, extensionRegistry);
-    // Merge lazy field check the contents.
-    messageSet = messageSet.toBuilder().mergeFrom(data, extensionRegistry).build();
-    assertThat(messageSet.getExtension(TestMessageSetExtension1.messageSetExtension).getI())
-        .isEqualTo(123);
-  }
-
-  @Test
-  public void testMergeMessageSetExtensionEagerly() throws Exception {
-    testMergeMessageSetExtensionWithFlag(true);
-  }
-
-  @Test
-  public void testMergeMessageSetExtensionNotEagerly() throws Exception {
-    testMergeMessageSetExtensionWithFlag(false);
-  }
-
-  private void testMergeMessageSetExtensionWithFlag(boolean eagerParsing) throws Exception {
-    ExtensionRegistryLite.setEagerlyParseMessageSets(eagerParsing);
-    ExtensionRegistryLite extensionRegistry = ExtensionRegistryLite.newInstance();
-    extensionRegistry.add(TestMessageSetExtension1.messageSetExtension);
-
-    // Set up a RawMessageSet with a known messages.
-    int typeId1 = 1545008;
-    RawMessageSet raw =
-        RawMessageSet.newBuilder()
-            .addItem(
-                RawMessageSet.Item.newBuilder()
-                    .setTypeId(typeId1)
-                    .setMessage(
-                        TestMessageSetExtension1.newBuilder().setI(123).build().toByteString())
-                    .build())
-            .build();
-
-    // Serialize RawMessageSet unnormally (message value before type id)
-    ByteString.CodedBuilder out = ByteString.newCodedBuilder(raw.getSerializedSize());
-    CodedOutputStream output = out.getCodedOutput();
-    List<RawMessageSet.Item> items = raw.getItemList();
-    for (RawMessageSet.Item item : items) {
-      output.writeTag(1, WireFormat.WIRETYPE_START_GROUP);
-      output.writeBytes(3, item.getMessage());
-      output.writeInt32(2, item.getTypeId());
-      output.writeTag(1, WireFormat.WIRETYPE_END_GROUP);
-    }
-    ByteString data = out.build();
-
-    // Merge bytes into TestMessageSet and check the contents.
-    TestMessageSet messageSet =
-        TestMessageSet.newBuilder().mergeFrom(data, extensionRegistry).build();
-    assertThat(messageSet.getExtension(TestMessageSetExtension1.messageSetExtension).getI())
-        .isEqualTo(123);
-  }
-
-  // ================================================================
-  // oneof
-  @Test
-  public void testOneofWireFormat() throws Exception {
-    TestOneof2.Builder builder = TestOneof2.newBuilder();
-    TestUtil.setOneof(builder);
-    TestOneof2 message = builder.build();
-    ByteString rawBytes = message.toByteString();
-
-    assertThat(message.getSerializedSize()).isEqualTo(rawBytes.size());
-
-    TestOneof2 message2 = TestOneof2.parseFrom(rawBytes);
-    TestUtil.assertOneofSet(message2);
-  }
-
-  @Test
-  public void testOneofOnlyLastSet() throws Exception {
-    TestOneofBackwardsCompatible source =
-        TestOneofBackwardsCompatible.newBuilder().setFooInt(100).setFooString("101").build();
-
-    ByteString rawBytes = source.toByteString();
-    TestOneof2 message = TestOneof2.parseFrom(rawBytes);
-    assertThat(message.hasFooInt()).isFalse();
-    assertThat(message.hasFooString()).isTrue();
-  }
-
-  private void assertInvalidWireFormat(
-      MessageLite defaultInstance, byte[] data, int offset, int length) {
-    // Test all combinations: (builder vs parser) x (byte[] vs. InputStream).
-    try {
-      defaultInstance.newBuilderForType().mergeFrom(data, offset, length);
-      assertWithMessage("Expected exception").fail();
-    } catch (InvalidProtocolBufferException e) {
-      // Pass.
-    }
-    try {
-      defaultInstance.getParserForType().parseFrom(data, offset, length);
-      assertWithMessage("Expected exception").fail();
-    } catch (InvalidProtocolBufferException e) {
-      // Pass.
-    }
-    try {
-      InputStream input = new ByteArrayInputStream(data, offset, length);
-      defaultInstance.newBuilderForType().mergeFrom(input);
-      assertWithMessage("Expected exception").fail();
-    } catch (IOException e) {
-      // Pass.
-    }
-    try {
-      InputStream input = new ByteArrayInputStream(data, offset, length);
-      defaultInstance.getParserForType().parseFrom(input);
-      assertWithMessage("Expected exception").fail();
-    } catch (IOException e) {
-      // Pass.
-    }
-  }
-
-  private void assertInvalidWireFormat(MessageLite defaultInstance, byte[] data) {
-    assertInvalidWireFormat(defaultInstance, data, 0, data.length);
-  }
-
-  private void assertInvalidWireFormat(byte[] data) {
-    assertInvalidWireFormat(TestAllTypes.getDefaultInstance(), data);
-    assertInvalidWireFormat(UnittestProto3.TestAllTypes.getDefaultInstance(), data);
-  }
-
-  @Test
-  public void testParserRejectInvalidTag() throws Exception {
-    byte[] invalidTags =
-        new byte[] {
-          // Zero tag is not allowed.
-          0,
-          // Invalid wire types.
-          (byte) WireFormat.makeTag(1, 6),
-          (byte) WireFormat.makeTag(1, 7),
-          // Field number 0 is not allowed.
-          (byte) WireFormat.makeTag(0, WireFormat.WIRETYPE_VARINT),
-        };
-    for (byte invalidTag : invalidTags) {
-      // Add a trailing 0 to make sure the parsing actually fails on the tag.
-      byte[] data = new byte[] {invalidTag, 0};
-      assertInvalidWireFormat(data);
-
-      // Invalid tag in an unknown group field.
-      data =
-          new byte[] {
-            (byte) WireFormat.makeTag(1, WireFormat.WIRETYPE_START_GROUP),
-            invalidTag,
-            0,
-            (byte) WireFormat.makeTag(1, WireFormat.WIRETYPE_END_GROUP),
-          };
-      assertInvalidWireFormat(data);
-
-      // Invalid tag in a MessageSet item.
-      data =
-          new byte[] {
-            (byte) WireFormat.MESSAGE_SET_ITEM_TAG,
-            (byte) WireFormat.MESSAGE_SET_TYPE_ID_TAG,
-            100, // TYPE_ID = 100
-            (byte) WireFormat.MESSAGE_SET_MESSAGE_TAG,
-            0, // empty payload
-            invalidTag,
-            0,
-            (byte) WireFormat.MESSAGE_SET_ITEM_END_TAG,
-          };
-      assertInvalidWireFormat(TestMessageSet.getDefaultInstance(), data);
-
-      // Invalid tag inside a MessageSet item's unknown group.
-      data =
-          new byte[] {
-            (byte) WireFormat.MESSAGE_SET_ITEM_TAG,
-            (byte) WireFormat.MESSAGE_SET_TYPE_ID_TAG,
-            100, // TYPE_ID = 100
-            (byte) WireFormat.MESSAGE_SET_MESSAGE_TAG,
-            0, // empty payload
-            (byte) WireFormat.makeTag(4, WireFormat.WIRETYPE_START_GROUP),
-            invalidTag,
-            0,
-            (byte) WireFormat.makeTag(4, WireFormat.WIRETYPE_END_GROUP),
-            (byte) WireFormat.MESSAGE_SET_ITEM_END_TAG,
-          };
-      assertInvalidWireFormat(TestMessageSet.getDefaultInstance(), data);
-
-      // Invalid tag inside a map field.
-      data =
-          new byte[] {
-            (byte) WireFormat.makeTag(1, WireFormat.WIRETYPE_LENGTH_DELIMITED), 2, invalidTag, 0,
-          };
-      assertInvalidWireFormat(TestMap.getDefaultInstance(), data);
-    }
-  }
-
-  @Test
-  public void testUnmatchedGroupTag() throws Exception {
-    int startTag = WireFormat.makeTag(16, WireFormat.WIRETYPE_START_GROUP);
-    byte[] data =
-        new byte[] {
-          (byte) ((startTag & 0x7F) | 0x80), (byte) ((startTag >>> 7) & 0x7F),
-        };
-    assertInvalidWireFormat(data);
-
-    // Unmatched group tags inside a MessageSet item.
-    data =
-        new byte[] {
-          (byte) WireFormat.MESSAGE_SET_ITEM_TAG,
-          (byte) WireFormat.MESSAGE_SET_TYPE_ID_TAG,
-          100, // TYPE_ID = 100
-          (byte) WireFormat.MESSAGE_SET_MESSAGE_TAG,
-          0, // empty payload
-          (byte) WireFormat.makeTag(4, WireFormat.WIRETYPE_START_GROUP),
-        };
-    assertInvalidWireFormat(TestMessageSet.getDefaultInstance(), data);
-  }
-
-  private void assertAccepted(MessageLite defaultInstance, byte[] data) throws Exception {
-    MessageLite message1 = defaultInstance.newBuilderForType().mergeFrom(data).build();
-    MessageLite message2 = defaultInstance.getParserForType().parseFrom(data);
-    MessageLite message3 =
-        defaultInstance.newBuilderForType().mergeFrom(new ByteArrayInputStream(data)).build();
-    MessageLite message4 =
-        defaultInstance.getParserForType().parseFrom(new ByteArrayInputStream(data));
-    assertThat(message2).isEqualTo(message1);
-    assertThat(message3).isEqualTo(message2);
-    assertThat(message4).isEqualTo(message3);
-  }
-
-  @Test
-  public void testUnmatchedWireType() throws Exception {
-    // Build a payload with all fields from 1 to 128 being varints. Parsing it into TestAllTypes
-    // or other message types should succeed even though the wire type doesn't match for some
-    // fields.
-    ByteArrayOutputStream output = new ByteArrayOutputStream();
-    CodedOutputStream codedOutput = CodedOutputStream.newInstance(output);
-    for (int i = 1; i <= 128; i++) {
-      codedOutput.writeInt32(i, 0);
-    }
-    codedOutput.flush();
-    byte[] data = output.toByteArray();
-    // It can be parsed into any message type that doesn't have required fields.
-    assertAccepted(TestAllTypes.getDefaultInstance(), data);
-    assertAccepted(UnittestProto3.TestAllTypes.getDefaultInstance(), data);
-    assertAccepted(TestMap.getDefaultInstance(), data);
-    assertAccepted(MapForProto2TestProto.TestMap.getDefaultInstance(), data);
-  }
-
-  @Test
-  public void testParseTruncatedPackedFields() throws Exception {
-    TestPackedTypes all = TestUtil.getPackedSet();
-    TestPackedTypes[] messages =
-        new TestPackedTypes[] {
-          TestPackedTypes.newBuilder().addAllPackedInt32(all.getPackedInt32List()).build(),
-          TestPackedTypes.newBuilder().addAllPackedInt64(all.getPackedInt64List()).build(),
-          TestPackedTypes.newBuilder().addAllPackedUint32(all.getPackedUint32List()).build(),
-          TestPackedTypes.newBuilder().addAllPackedUint64(all.getPackedUint64List()).build(),
-          TestPackedTypes.newBuilder().addAllPackedSint32(all.getPackedSint32List()).build(),
-          TestPackedTypes.newBuilder().addAllPackedSint64(all.getPackedSint64List()).build(),
-          TestPackedTypes.newBuilder().addAllPackedFixed32(all.getPackedFixed32List()).build(),
-          TestPackedTypes.newBuilder().addAllPackedFixed64(all.getPackedFixed64List()).build(),
-          TestPackedTypes.newBuilder().addAllPackedSfixed32(all.getPackedSfixed32List()).build(),
-          TestPackedTypes.newBuilder().addAllPackedSfixed64(all.getPackedSfixed64List()).build(),
-          TestPackedTypes.newBuilder().addAllPackedFloat(all.getPackedFloatList()).build(),
-          TestPackedTypes.newBuilder().addAllPackedDouble(all.getPackedDoubleList()).build(),
-          TestPackedTypes.newBuilder().addAllPackedEnum(all.getPackedEnumList()).build(),
-        };
-    for (TestPackedTypes message : messages) {
-      byte[] data = message.toByteArray();
-      // Parsing truncated payload should fail.
-      for (int i = 1; i < data.length; i++) {
-        assertInvalidWireFormat(TestPackedTypes.getDefaultInstance(), data, 0, i);
-      }
-    }
-  }
-
-  @Test
-  public void testParsePackedFieldsWithIncorrectLength() throws Exception {
-    // Set the length-prefix to 1 with a 4-bytes payload to test what happens when reading a packed
-    // element moves the reading position past the given length limit. It should result in an
-    // InvalidProtocolBufferException but an implementation may forget to check it especially for
-    // packed varint fields.
-    byte[] data =
-        new byte[] {
-          0,
-          0, // first two bytes is reserved for the tag.
-          1, // length is 1
-          (byte) 0x80,
-          (byte) 0x80,
-          (byte) 0x80,
-          (byte) 0x01, // a 4-bytes varint
-        };
-    // All fields that can read a 4-bytes varint (all varint fields and fixed 32-bit fields).
-    int[] fieldNumbers =
-        new int[] {
-          TestPackedTypes.PACKED_INT32_FIELD_NUMBER,
-          TestPackedTypes.PACKED_INT64_FIELD_NUMBER,
-          TestPackedTypes.PACKED_UINT32_FIELD_NUMBER,
-          TestPackedTypes.PACKED_UINT64_FIELD_NUMBER,
-          TestPackedTypes.PACKED_SINT32_FIELD_NUMBER,
-          TestPackedTypes.PACKED_SINT64_FIELD_NUMBER,
-          TestPackedTypes.PACKED_FIXED32_FIELD_NUMBER,
-          TestPackedTypes.PACKED_SFIXED32_FIELD_NUMBER,
-          TestPackedTypes.PACKED_FLOAT_FIELD_NUMBER,
-          TestPackedTypes.PACKED_BOOL_FIELD_NUMBER,
-          TestPackedTypes.PACKED_ENUM_FIELD_NUMBER,
-        };
-    for (int number : fieldNumbers) {
-      // Set the tag.
-      data[0] =
-          (byte) ((WireFormat.makeTag(number, WireFormat.WIRETYPE_LENGTH_DELIMITED) & 0x7F) | 0x80);
-      data[1] =
-          (byte) ((WireFormat.makeTag(number, WireFormat.WIRETYPE_LENGTH_DELIMITED) >>> 7) & 0x7F);
-      assertInvalidWireFormat(TestPackedTypes.getDefaultInstance(), data);
-    }
-
-    // Data with 8-bytes payload to test some fixed 64-bit fields.
-    byte[] data8Bytes =
-        new byte[] {
-          0,
-          0, // first two bytes is reserved for the tag.
-          1, // length is 1
-          (byte) 0x80,
-          (byte) 0x80,
-          (byte) 0x80,
-          (byte) 0x80,
-          (byte) 0x80,
-          (byte) 0x80,
-          (byte) 0x80,
-          (byte) 0x01, // a 8-bytes varint
-        };
-    // All fields that can only read 8-bytes data.
-    int[] fieldNumbers8Bytes =
-        new int[] {
-          TestPackedTypes.PACKED_FIXED64_FIELD_NUMBER,
-          TestPackedTypes.PACKED_SFIXED64_FIELD_NUMBER,
-          TestPackedTypes.PACKED_DOUBLE_FIELD_NUMBER,
-        };
-    for (int number : fieldNumbers8Bytes) {
-      // Set the tag.
-      data8Bytes[0] =
-          (byte) ((WireFormat.makeTag(number, WireFormat.WIRETYPE_LENGTH_DELIMITED) & 0x7F) | 0x80);
-      data8Bytes[1] =
-          (byte) ((WireFormat.makeTag(number, WireFormat.WIRETYPE_LENGTH_DELIMITED) >>> 7) & 0x7F);
-      assertInvalidWireFormat(TestPackedTypes.getDefaultInstance(), data8Bytes);
-    }
-  }
-
-  @Test
-  public void testParseVarintMinMax() throws Exception {
-    TestAllTypes message =
-        TestAllTypes.newBuilder()
-            .setOptionalInt32(Integer.MIN_VALUE)
-            .addRepeatedInt32(Integer.MAX_VALUE)
-            .setOptionalInt64(Long.MIN_VALUE)
-            .addRepeatedInt64(Long.MAX_VALUE)
-            .build();
-    TestAllTypes parsed = TestAllTypes.parseFrom(message.toByteArray());
-    assertThat(parsed.getOptionalInt32()).isEqualTo(Integer.MIN_VALUE);
-    assertThat(parsed.getRepeatedInt32(0)).isEqualTo(Integer.MAX_VALUE);
-    assertThat(parsed.getOptionalInt64()).isEqualTo(Long.MIN_VALUE);
-    assertThat(parsed.getRepeatedInt64(0)).isEqualTo(Long.MAX_VALUE);
-  }
-
-  @Test
-  public void testParseAllVarintBits() throws Exception {
-    for (int i = 0; i < 32; i++) {
-      final int value = 1 << i;
-      TestAllTypes message = TestAllTypes.newBuilder().setOptionalInt32(value).build();
-      TestAllTypes parsed = TestAllTypes.parseFrom(message.toByteArray());
-      assertThat(parsed.getOptionalInt32()).isEqualTo(value);
-    }
-    for (int i = 0; i < 64; i++) {
-      final long value = 1L << i;
-      TestAllTypes message = TestAllTypes.newBuilder().setOptionalInt64(value).build();
-      TestAllTypes parsed = TestAllTypes.parseFrom(message.toByteArray());
-      assertThat(parsed.getOptionalInt64()).isEqualTo(value);
-    }
-  }
-
-  @Test
-  public void testParseEmptyUnknownLengthDelimitedField() throws Exception {
-    byte[] data =
-        new byte[] {(byte) WireFormat.makeTag(1, WireFormat.WIRETYPE_LENGTH_DELIMITED), 0};
-    TestAllTypes parsed = TestAllTypes.parseFrom(data);
-    assertThat(parsed.toByteArray()).isEqualTo(data);
-  }
-
-  @Test
-  public void testParseEmptyString() throws Exception {
-    TestAllTypes message = TestAllTypes.newBuilder().setOptionalString("").build();
-    TestAllTypes parsed = TestAllTypes.parseFrom(message.toByteArray());
-    assertThat(parsed.getOptionalString()).isEmpty();
-  }
-
-  @Test
-  public void testParseEmptyStringProto3() throws Exception {
-    TestAllTypes message = TestAllTypes.newBuilder().setOptionalString("").build();
-    // Note that we are parsing from a proto2 proto to a proto3 proto because empty string field is
-    // not serialized in proto3.
-    UnittestProto3.TestAllTypes parsed =
-        UnittestProto3.TestAllTypes.parseFrom(message.toByteArray());
-    assertThat(parsed.getOptionalString()).isEmpty();
-  }
-
-  @Test
-  public void testParseEmptyBytes() throws Exception {
-    TestAllTypes message = TestAllTypes.newBuilder().setOptionalBytes(ByteString.EMPTY).build();
-    TestAllTypes parsed = TestAllTypes.parseFrom(message.toByteArray());
-    assertThat(parsed.getOptionalBytes()).isEqualTo(ByteString.EMPTY);
-  }
-
-  @Test
-  public void testParseEmptyRepeatedStringField() throws Exception {
-    TestAllTypes message =
-        TestAllTypes.newBuilder()
-            .addRepeatedString("")
-            .addRepeatedString("")
-            .addRepeatedString("0")
-            .build();
-    TestAllTypes parsed = TestAllTypes.parseFrom(message.toByteArray());
-    assertThat(parsed.getRepeatedStringCount()).isEqualTo(3);
-    assertThat(parsed.getRepeatedString(0)).isEmpty();
-    assertThat(parsed.getRepeatedString(1)).isEmpty();
-    assertThat(parsed.getRepeatedString(2)).isEqualTo("0");
-  }
-
-  @Test
-  public void testParseEmptyRepeatedStringFieldProto3() throws Exception {
-    TestAllTypes message =
-        TestAllTypes.newBuilder()
-            .addRepeatedString("")
-            .addRepeatedString("")
-            .addRepeatedString("0")
-            .addRepeatedBytes(ByteString.EMPTY)
-            .build();
-    UnittestProto3.TestAllTypes parsed =
-        UnittestProto3.TestAllTypes.parseFrom(message.toByteArray());
-    assertThat(parsed.getRepeatedStringCount()).isEqualTo(3);
-    assertThat(parsed.getRepeatedString(0)).isEmpty();
-    assertThat(parsed.getRepeatedString(1)).isEmpty();
-    assertThat(parsed.getRepeatedString(2)).isEqualTo("0");
-  }
-
-  @Test
-  public void testParseEmptyRepeatedBytesField() throws Exception {
-    ByteString oneByte = ByteString.copyFrom(new byte[] {1});
-    TestAllTypes message =
-        TestAllTypes.newBuilder()
-            .addRepeatedBytes(ByteString.EMPTY)
-            .addRepeatedBytes(ByteString.EMPTY)
-            .addRepeatedBytes(oneByte)
-            .build();
-    TestAllTypes parsed = TestAllTypes.parseFrom(message.toByteArray());
-    assertThat(parsed.getRepeatedBytesCount()).isEqualTo(3);
-    assertThat(parsed.getRepeatedBytes(0)).isEqualTo(ByteString.EMPTY);
-    assertThat(parsed.getRepeatedBytes(1)).isEqualTo(ByteString.EMPTY);
-    assertThat(parsed.getRepeatedBytes(2)).isEqualTo(oneByte);
-  }
-
-  @Test
-  public void testSkipUnknownFieldInMessageSetItem() throws Exception {
-    ByteArrayOutputStream output = new ByteArrayOutputStream();
-    // MessageSet item's start tag.
-    output.write((byte) WireFormat.MESSAGE_SET_ITEM_TAG);
-    // Put all field types into the item.
-    TestUtil.getAllSet().writeTo(output);
-    // Closing the item with the real payload and closing tag.
-    output.write(
-        new byte[] {
-          (byte) WireFormat.MESSAGE_SET_TYPE_ID_TAG,
-          100, // TYPE_ID = 100
-          (byte) WireFormat.MESSAGE_SET_MESSAGE_TAG,
-          0, // empty payload
-          (byte) WireFormat.MESSAGE_SET_ITEM_END_TAG,
-        });
-    byte[] data = output.toByteArray();
-    TestMessageSet parsed = TestMessageSet.parseFrom(data);
-
-    // Convert to RawMessageSet for inspection.
-    RawMessageSet raw = RawMessageSet.parseFrom(parsed.toByteArray());
-    assertThat(raw.getItemCount()).isEqualTo(1);
-    assertThat(raw.getItem(0).getTypeId()).isEqualTo(100);
-    assertThat(raw.getItem(0).getMessage().size()).isEqualTo(0);
-  }
-
-  @Test
-  public void testProto2UnknownEnumValuesInOptionalField() throws Exception {
-    // Proto2 doesn't allow setting unknown enum values so we use proto3 to build a message with
-    // unknown enum values
-    UnittestProto3.TestAllTypes message =
-        UnittestProto3.TestAllTypes.newBuilder().setOptionalNestedEnumValue(4321).build();
-    TestAllTypes parsed = TestAllTypes.parseFrom(message.toByteArray());
-    assertThat(parsed.hasOptionalNestedEnum()).isFalse();
-    // Make sure unknown enum values are preserved.
-    UnittestProto3.TestAllTypes actual =
-        UnittestProto3.TestAllTypes.parseFrom(parsed.toByteArray());
-    assertThat(actual.getOptionalNestedEnumValue()).isEqualTo(4321);
-  }
-
-  @Test
-  public void testProto2UnknownEnumValuesInRepeatedField() throws Exception {
-    // Proto2 doesn't allow setting unknown enum values so we use proto3 to build a message with
-    // unknown enum values
-    UnittestProto3.TestAllTypes message =
-        UnittestProto3.TestAllTypes.newBuilder().addRepeatedNestedEnumValue(5432).build();
-    TestAllTypes parsed = TestAllTypes.parseFrom(message.toByteArray());
-    assertThat(parsed.getRepeatedNestedEnumCount()).isEqualTo(0);
-    // Make sure unknown enum values are preserved.
-    UnittestProto3.TestAllTypes actual =
-        UnittestProto3.TestAllTypes.parseFrom(parsed.toByteArray());
-    assertThat(actual.getRepeatedNestedEnumCount()).isEqualTo(1);
-    assertThat(actual.getRepeatedNestedEnumValue(0)).isEqualTo(5432);
-  }
-
-  @Test
-  public void testProto2UnknownEnumValuesInMapField() throws Exception {
-    // Proto2 doesn't allow setting unknown enum values so we use proto3 to build a message with
-    // unknown enum values
-    TestMap message = TestMap.newBuilder().putInt32ToEnumFieldValue(1, 4321).build();
-    MapForProto2TestProto.TestMap parsed =
-        MapForProto2TestProto.TestMap.parseFrom(message.toByteArray());
-    assertThat(parsed.getInt32ToEnumFieldMap()).isEmpty();
-    // Make sure unknown enum values are preserved.
-    TestMap actual = TestMap.parseFrom(parsed.toByteArray());
-    assertThat(actual.getInt32ToEnumFieldMap()).hasSize(1);
-    assertThat(actual.getInt32ToEnumFieldValueOrThrow(1)).isEqualTo(4321);
-  }
-
-  @Test
-  public void testProto2UnknownEnumValuesInOneof() throws Exception {
-    // Proto2 doesn't allow setting unknown enum values so we use proto3 to build a message with
-    // unknown enum values
-    UnittestProto3.TestOneof2 message =
-        UnittestProto3.TestOneof2.newBuilder().setFooEnumValue(1234).build();
-    TestOneof2 parsed = TestOneof2.parseFrom(message.toByteArray());
-    assertThat(parsed.hasFooEnum()).isFalse();
-    // Make sure unknown enum values are preserved.
-    UnittestProto3.TestOneof2 actual = UnittestProto3.TestOneof2.parseFrom(parsed.toByteArray());
-    assertThat(actual.getFooEnumValue()).isEqualTo(1234);
-  }
-
-  @Test
-  public void testProto2UnknownEnumValuesInExtension() throws Exception {
-    ExtensionRegistryLite extensionRegistry = TestUtilLite.getExtensionRegistryLite();
-    // Raw bytes for "[.optional_foreign_enum_extension_lite]: 10"
-    final byte[] rawBytes = new byte[]{-80, 1, 10};
-    TestAllExtensionsLite testAllExtensionsLite =
-        TestAllExtensionsLite.parseFrom(rawBytes, extensionRegistry);
-    assertThat(testAllExtensionsLite.getExtension(optionalForeignEnumExtensionLite))
-        .isEqualTo(ForeignEnumLite.FOREIGN_LITE_FOO);
-    final byte[] resultRawBytes = testAllExtensionsLite.toByteArray();
-    assertThat(resultRawBytes).hasLength(rawBytes.length);
-    for (int i = 0; i < rawBytes.length; i++) {
-      assertThat(resultRawBytes[i]).isEqualTo(rawBytes[i]);
-    }
-  }
-
-  @Test
-  public void testProto3UnknownEnumValuesInOptionalField() throws Exception {
-    UnittestProto3.TestAllTypes message =
-        UnittestProto3.TestAllTypes.newBuilder().setOptionalNestedEnumValue(4321).build();
-    UnittestProto3.TestAllTypes parsed =
-        UnittestProto3.TestAllTypes.parseFrom(message.toByteArray());
-    assertThat(parsed.getOptionalNestedEnumValue()).isEqualTo(4321);
-  }
-
-  @Test
-  public void testProto3UnknownEnumValuesInRepeatedField() throws Exception {
-    UnittestProto3.TestAllTypes message =
-        UnittestProto3.TestAllTypes.newBuilder().addRepeatedNestedEnumValue(5432).build();
-    UnittestProto3.TestAllTypes parsed =
-        UnittestProto3.TestAllTypes.parseFrom(message.toByteArray());
-    assertThat(parsed.getRepeatedNestedEnumCount()).isEqualTo(1);
-    assertThat(parsed.getRepeatedNestedEnumValue(0)).isEqualTo(5432);
-  }
-
-  @Test
-  public void testProto3UnknownEnumValuesInMapField() throws Exception {
-    TestMap message = TestMap.newBuilder().putInt32ToEnumFieldValue(1, 4321).build();
-    TestMap parsed = TestMap.parseFrom(message.toByteArray());
-    assertThat(parsed.getInt32ToEnumFieldMap()).hasSize(1);
-    assertThat(parsed.getInt32ToEnumFieldValueOrThrow(1)).isEqualTo(4321);
-  }
-
-  @Test
-  public void testProto3UnknownEnumValuesInOneof() throws Exception {
-    UnittestProto3.TestOneof2 message =
-        UnittestProto3.TestOneof2.newBuilder().setFooEnumValue(1234).build();
-    UnittestProto3.TestOneof2 parsed = UnittestProto3.TestOneof2.parseFrom(message.toByteArray());
-    assertThat(parsed.getFooEnumValue()).isEqualTo(1234);
-  }
-
-  @Test
-  public void testProto3MessageFieldMergeBehavior() throws Exception {
-    UnittestProto3.NestedTestAllTypes message1 =
-        UnittestProto3.NestedTestAllTypes.newBuilder()
-            .setPayload(
-                UnittestProto3.TestAllTypes.newBuilder()
-                    .setOptionalInt32(1234)
-                    .setOptionalInt64(5678))
-            .build();
-    UnittestProto3.NestedTestAllTypes message2 =
-        UnittestProto3.NestedTestAllTypes.newBuilder()
-            .setPayload(
-                UnittestProto3.TestAllTypes.newBuilder()
-                    .setOptionalInt32(4321)
-                    .setOptionalUint32(8765))
-            .build();
-
-    UnittestProto3.NestedTestAllTypes merged =
-        UnittestProto3.NestedTestAllTypes.newBuilder()
-            .mergeFrom(message1.toByteArray())
-            .mergeFrom(message2.toByteArray())
-            .build();
-    // Field values coming later in the stream override earlier values.
-    assertThat(merged.getPayload().getOptionalInt32()).isEqualTo(4321);
-    // Field values present in either message should be present in the merged result.
-    assertThat(merged.getPayload().getOptionalInt64()).isEqualTo(5678);
-    assertThat(merged.getPayload().getOptionalUint32()).isEqualTo(8765);
-  }
-
-  @Test
-  public void testMergeFromPartialByteArray() throws Exception {
-    byte[] data = TestUtil.getAllSet().toByteArray();
-    byte[] dataWithPaddings = new byte[data.length + 2];
-    System.arraycopy(data, 0, dataWithPaddings, 1, data.length);
-    // Parsing will fail if the builder (or parser) interprets offset or length incorrectly.
-    TestAllTypes.newBuilder().mergeFrom(dataWithPaddings, 1, data.length);
-    TestAllTypes.parser().parseFrom(dataWithPaddings, 1, data.length);
-  }
-}
diff --git a/libs/protobuf/java/core/src/test/java/com/google/protobuf/WireFormatTest.java b/libs/protobuf/java/core/src/test/java/com/google/protobuf/WireFormatTest.java
deleted file mode 100644
index e072eb8..0000000
--- a/libs/protobuf/java/core/src/test/java/com/google/protobuf/WireFormatTest.java
+++ /dev/null
@@ -1,548 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import protobuf_unittest.UnittestMset.RawMessageSet;
-import protobuf_unittest.UnittestMset.TestMessageSetExtension1;
-import protobuf_unittest.UnittestMset.TestMessageSetExtension2;
-import protobuf_unittest.UnittestProto;
-import protobuf_unittest.UnittestProto.TestAllExtensions;
-import protobuf_unittest.UnittestProto.TestAllTypes;
-import protobuf_unittest.UnittestProto.TestExtensionInsideTable;
-import protobuf_unittest.UnittestProto.TestFieldOrderings;
-import protobuf_unittest.UnittestProto.TestOneof2;
-import protobuf_unittest.UnittestProto.TestOneofBackwardsCompatible;
-import protobuf_unittest.UnittestProto.TestPackedExtensions;
-import protobuf_unittest.UnittestProto.TestPackedTypes;
-import proto2_wireformat_unittest.UnittestMsetWireFormat.TestMessageSet;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.util.List;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-/** Tests related to parsing and serialization. */
-@RunWith(JUnit4.class)
-public class WireFormatTest {
-
-  private static final int TYPE_ID_1 =
-      TestMessageSetExtension1.getDescriptor().getExtensions().get(0).getNumber();
-  private static final int TYPE_ID_2 =
-      TestMessageSetExtension2.getDescriptor().getExtensions().get(0).getNumber();
-  private static final int UNKNOWN_TYPE_ID = 1550055;
-
-  @Test
-  public void testSerialization() throws Exception {
-    TestAllTypes message = TestUtil.getAllSet();
-
-    ByteString rawBytes = message.toByteString();
-    assertThat(rawBytes.size()).isEqualTo(message.getSerializedSize());
-
-    TestAllTypes message2 = TestAllTypes.parseFrom(rawBytes);
-
-    TestUtil.assertAllFieldsSet(message2);
-  }
-
-  @Test
-  public void testSerializationPacked() throws Exception {
-    TestPackedTypes message = TestUtil.getPackedSet();
-
-    ByteString rawBytes = message.toByteString();
-    assertThat(message.getSerializedSize()).isEqualTo(rawBytes.size());
-
-    TestPackedTypes message2 = TestPackedTypes.parseFrom(rawBytes);
-
-    TestUtil.assertPackedFieldsSet(message2);
-  }
-
-  @Test
-  public void testSerializeExtensions() throws Exception {
-    // TestAllTypes and TestAllExtensions should have compatible wire formats,
-    // so if we serialize a TestAllExtensions then parse it as TestAllTypes
-    // it should work.
-
-    TestAllExtensions message = TestUtil.getAllExtensionsSet();
-    ByteString rawBytes = message.toByteString();
-    assertThat(message.getSerializedSize()).isEqualTo(rawBytes.size());
-
-    TestAllTypes message2 = TestAllTypes.parseFrom(rawBytes);
-
-    TestUtil.assertAllFieldsSet(message2);
-  }
-
-  @Test
-  public void testSerializePackedExtensions() throws Exception {
-    // TestPackedTypes and TestPackedExtensions should have compatible wire
-    // formats; check that they serialize to the same string.
-    TestPackedExtensions message = TestUtil.getPackedExtensionsSet();
-    ByteString rawBytes = message.toByteString();
-
-    TestPackedTypes message2 = TestUtil.getPackedSet();
-    ByteString rawBytes2 = message2.toByteString();
-
-    assertThat(rawBytes).isEqualTo(rawBytes2);
-  }
-
-  @Test
-  public void testSerializationPackedWithoutGetSerializedSize() throws Exception {
-    // Write directly to an OutputStream, without invoking getSerializedSize()
-    // This used to be a bug where the size of a packed field was incorrect,
-    // since getSerializedSize() was never invoked.
-    TestPackedTypes message = TestUtil.getPackedSet();
-
-    // Directly construct a CodedOutputStream around the actual OutputStream,
-    // in case writeTo(OutputStream output) invokes getSerializedSize();
-    ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-    CodedOutputStream codedOutput = CodedOutputStream.newInstance(outputStream);
-
-    message.writeTo(codedOutput);
-
-    codedOutput.flush();
-
-    TestPackedTypes message2 = TestPackedTypes.parseFrom(outputStream.toByteArray());
-
-    TestUtil.assertPackedFieldsSet(message2);
-  }
-
-  @Test
-  public void testParseExtensions() throws Exception {
-    // TestAllTypes and TestAllExtensions should have compatible wire formats,
-    // so if we serialize a TestAllTypes then parse it as TestAllExtensions
-    // it should work.
-
-    TestAllTypes message = TestUtil.getAllSet();
-    ByteString rawBytes = message.toByteString();
-
-    ExtensionRegistryLite registry = TestUtil.getExtensionRegistry();
-
-    TestAllExtensions message2 = TestAllExtensions.parseFrom(rawBytes, registry);
-
-    TestUtil.assertAllExtensionsSet(message2);
-  }
-
-  @Test
-  public void testParsePackedExtensions() throws Exception {
-    // Ensure that packed extensions can be properly parsed.
-    TestPackedExtensions message = TestUtil.getPackedExtensionsSet();
-    ByteString rawBytes = message.toByteString();
-
-    ExtensionRegistryLite registry = TestUtil.getExtensionRegistry();
-
-    TestPackedExtensions message2 = TestPackedExtensions.parseFrom(rawBytes, registry);
-
-    TestUtil.assertPackedExtensionsSet(message2);
-  }
-
-  @Test
-  public void testSerializeDelimited() throws Exception {
-    ByteArrayOutputStream output = new ByteArrayOutputStream();
-    TestUtil.getAllSet().writeDelimitedTo(output);
-    output.write(12);
-    TestUtil.getPackedSet().writeDelimitedTo(output);
-    output.write(34);
-
-    ByteArrayInputStream input = new ByteArrayInputStream(output.toByteArray());
-
-    TestUtil.assertAllFieldsSet(TestAllTypes.parseDelimitedFrom(input));
-    assertThat(input.read()).isEqualTo(12);
-    TestUtil.assertPackedFieldsSet(TestPackedTypes.parseDelimitedFrom(input));
-    assertThat(input.read()).isEqualTo(34);
-    assertThat(input.read()).isEqualTo(-1);
-
-    // We're at EOF, so parsing again should return null.
-    assertThat(TestAllTypes.parseDelimitedFrom(input)).isNull();
-  }
-
-  private void assertFieldsInOrder(ByteString data) throws Exception {
-    CodedInputStream input = data.newCodedInput();
-    int previousTag = 0;
-
-    while (true) {
-      int tag = input.readTag();
-      if (tag == 0) {
-        break;
-      }
-
-      assertThat(tag).isGreaterThan(previousTag);
-      previousTag = tag;
-      input.skipField(tag);
-    }
-  }
-
-  @Test
-  public void testInterleavedFieldsAndExtensions() throws Exception {
-    // Tests that fields are written in order even when extension ranges
-    // are interleaved with field numbers.
-    ByteString data =
-        TestFieldOrderings.newBuilder()
-            .setMyInt(1)
-            .setMyString("foo")
-            .setMyFloat(1.0F)
-            .setExtension(UnittestProto.myExtensionInt, 23)
-            .setExtension(UnittestProto.myExtensionString, "bar")
-            .build()
-            .toByteString();
-    assertFieldsInOrder(data);
-
-    Descriptors.Descriptor descriptor = TestFieldOrderings.getDescriptor();
-    ByteString dynamicData =
-        DynamicMessage.newBuilder(TestFieldOrderings.getDescriptor())
-            .setField(descriptor.findFieldByName("my_int"), 1L)
-            .setField(descriptor.findFieldByName("my_string"), "foo")
-            .setField(descriptor.findFieldByName("my_float"), 1.0F)
-            .setField(UnittestProto.myExtensionInt.getDescriptor(), 23)
-            .setField(UnittestProto.myExtensionString.getDescriptor(), "bar")
-            .build()
-            .toByteString();
-    assertFieldsInOrder(dynamicData);
-  }
-
-  private ExtensionRegistry getTestFieldOrderingsRegistry() {
-    ExtensionRegistry result = ExtensionRegistry.newInstance();
-    result.add(UnittestProto.myExtensionInt);
-    result.add(UnittestProto.myExtensionString);
-    return result;
-  }
-
-  @Test
-  public void testParseMultipleExtensionRanges() throws Exception {
-    // Make sure we can parse a message that contains multiple extensions
-    // ranges.
-    TestFieldOrderings source =
-        TestFieldOrderings.newBuilder()
-            .setMyInt(1)
-            .setMyString("foo")
-            .setMyFloat(1.0F)
-            .setExtension(UnittestProto.myExtensionInt, 23)
-            .setExtension(UnittestProto.myExtensionString, "bar")
-            .build();
-    TestFieldOrderings dest =
-        TestFieldOrderings.parseFrom(source.toByteString(), getTestFieldOrderingsRegistry());
-    assertThat(source).isEqualTo(dest);
-  }
-
-  private static ExtensionRegistry getTestExtensionInsideTableRegistry() {
-    ExtensionRegistry result = ExtensionRegistry.newInstance();
-    result.add(UnittestProto.testExtensionInsideTableExtension);
-    return result;
-  }
-
-  @Test
-  public void testExtensionInsideTable() throws Exception {
-    // Make sure the extension within the range of table is parsed correctly in experimental
-    // runtime.
-    TestExtensionInsideTable source =
-        TestExtensionInsideTable.newBuilder()
-            .setField1(1)
-            .setExtension(UnittestProto.testExtensionInsideTableExtension, 23)
-            .build();
-    TestExtensionInsideTable dest =
-        TestExtensionInsideTable.parseFrom(
-            source.toByteString(), getTestExtensionInsideTableRegistry());
-    assertThat(source).isEqualTo(dest);
-  }
-
-  @Test
-  public void testParseMultipleExtensionRangesDynamic() throws Exception {
-    // Same as above except with DynamicMessage.
-    Descriptors.Descriptor descriptor = TestFieldOrderings.getDescriptor();
-    DynamicMessage source =
-        DynamicMessage.newBuilder(TestFieldOrderings.getDescriptor())
-            .setField(descriptor.findFieldByName("my_int"), 1L)
-            .setField(descriptor.findFieldByName("my_string"), "foo")
-            .setField(descriptor.findFieldByName("my_float"), 1.0F)
-            .setField(UnittestProto.myExtensionInt.getDescriptor(), 23)
-            .setField(UnittestProto.myExtensionString.getDescriptor(), "bar")
-            .build();
-    DynamicMessage dest =
-        DynamicMessage.parseFrom(
-            descriptor, source.toByteString(), getTestFieldOrderingsRegistry());
-    assertThat(source).isEqualTo(dest);
-  }
-
-  @Test
-  public void testSerializeMessageSetEagerly() throws Exception {
-    testSerializeMessageSetWithFlag(true);
-  }
-
-  @Test
-  public void testSerializeMessageSetNotEagerly() throws Exception {
-    testSerializeMessageSetWithFlag(false);
-  }
-
-  private void testSerializeMessageSetWithFlag(boolean eagerParsing) throws Exception {
-    ExtensionRegistryLite.setEagerlyParseMessageSets(eagerParsing);
-    // Set up a TestMessageSet with two known messages and an unknown one.
-    TestMessageSet messageSet =
-        TestMessageSet.newBuilder()
-            .setExtension(
-                TestMessageSetExtension1.messageSetExtension,
-                TestMessageSetExtension1.newBuilder().setI(123).build())
-            .setExtension(
-                TestMessageSetExtension2.messageSetExtension,
-                TestMessageSetExtension2.newBuilder().setStr("foo").build())
-            .setUnknownFields(
-                UnknownFieldSet.newBuilder()
-                    .addField(
-                        UNKNOWN_TYPE_ID,
-                        UnknownFieldSet.Field.newBuilder()
-                            .addLengthDelimited(ByteString.copyFromUtf8("bar"))
-                            .build())
-                    .build())
-            .build();
-
-    ByteString data = messageSet.toByteString();
-
-    // Parse back using RawMessageSet and check the contents.
-    RawMessageSet raw = RawMessageSet.parseFrom(data);
-
-    assertThat(raw.getUnknownFields().asMap()).isEmpty();
-
-    assertThat(raw.getItemCount()).isEqualTo(3);
-    assertThat(raw.getItem(0).getTypeId()).isEqualTo(TYPE_ID_1);
-    assertThat(raw.getItem(1).getTypeId()).isEqualTo(TYPE_ID_2);
-    assertThat(raw.getItem(2).getTypeId()).isEqualTo(UNKNOWN_TYPE_ID);
-
-    TestMessageSetExtension1 message1 =
-        TestMessageSetExtension1.parseFrom(raw.getItem(0).getMessage());
-    assertThat(message1.getI()).isEqualTo(123);
-
-    TestMessageSetExtension2 message2 =
-        TestMessageSetExtension2.parseFrom(raw.getItem(1).getMessage());
-    assertThat(message2.getStr()).isEqualTo("foo");
-
-    assertThat(raw.getItem(2).getMessage().toStringUtf8()).isEqualTo("bar");
-  }
-
-  @Test
-  public void testParseMessageSetEagerly() throws Exception {
-    testParseMessageSetWithFlag(true);
-  }
-
-  @Test
-  public void testParseMessageSetNotEagerly() throws Exception {
-    testParseMessageSetWithFlag(false);
-  }
-
-  private void testParseMessageSetWithFlag(boolean eagerParsing) throws Exception {
-    ExtensionRegistryLite.setEagerlyParseMessageSets(eagerParsing);
-    ExtensionRegistry extensionRegistry = ExtensionRegistry.newInstance();
-    extensionRegistry.add(TestMessageSetExtension1.messageSetExtension);
-    extensionRegistry.add(TestMessageSetExtension2.messageSetExtension);
-
-    // Set up a RawMessageSet with two known messages and an unknown one.
-    RawMessageSet raw =
-        RawMessageSet.newBuilder()
-            .addItem(
-                RawMessageSet.Item.newBuilder()
-                    .setTypeId(TYPE_ID_1)
-                    .setMessage(
-                        TestMessageSetExtension1.newBuilder().setI(123).build().toByteString())
-                    .build())
-            .addItem(
-                RawMessageSet.Item.newBuilder()
-                    .setTypeId(TYPE_ID_2)
-                    .setMessage(
-                        TestMessageSetExtension2.newBuilder().setStr("foo").build().toByteString())
-                    .build())
-            .addItem(
-                RawMessageSet.Item.newBuilder()
-                    .setTypeId(UNKNOWN_TYPE_ID)
-                    .setMessage(ByteString.copyFromUtf8("bar"))
-                    .build())
-            .build();
-
-    ByteString data = raw.toByteString();
-
-    // Parse as a TestMessageSet and check the contents.
-    TestMessageSet messageSet = TestMessageSet.parseFrom(data, extensionRegistry);
-
-    assertThat(messageSet.getExtension(TestMessageSetExtension1.messageSetExtension).getI())
-        .isEqualTo(123);
-    assertThat(messageSet.getExtension(TestMessageSetExtension2.messageSetExtension).getStr())
-        .isEqualTo("foo");
-
-    // Check for unknown field with type LENGTH_DELIMITED,
-    //   number UNKNOWN_TYPE_ID, and contents "bar".
-    UnknownFieldSet unknownFields = messageSet.getUnknownFields();
-    assertThat(unknownFields.asMap()).hasSize(1);
-    assertThat(unknownFields.hasField(UNKNOWN_TYPE_ID)).isTrue();
-
-    UnknownFieldSet.Field field = unknownFields.getField(UNKNOWN_TYPE_ID);
-    assertThat(field.getLengthDelimitedList()).hasSize(1);
-    assertThat(field.getLengthDelimitedList().get(0).toStringUtf8()).isEqualTo("bar");
-  }
-
-  @Test
-  public void testParseMessageSetExtensionEagerly() throws Exception {
-    testParseMessageSetExtensionWithFlag(true);
-  }
-
-  @Test
-  public void testParseMessageSetExtensionNotEagerly() throws Exception {
-    testParseMessageSetExtensionWithFlag(false);
-  }
-
-  private void testParseMessageSetExtensionWithFlag(boolean eagerParsing) throws Exception {
-    ExtensionRegistryLite.setEagerlyParseMessageSets(eagerParsing);
-    ExtensionRegistry extensionRegistry = ExtensionRegistry.newInstance();
-    extensionRegistry.add(TestMessageSetExtension1.messageSetExtension);
-
-    // Set up a RawMessageSet with a known messages.
-    RawMessageSet raw =
-        RawMessageSet.newBuilder()
-            .addItem(
-                RawMessageSet.Item.newBuilder()
-                    .setTypeId(TYPE_ID_1)
-                    .setMessage(
-                        TestMessageSetExtension1.newBuilder().setI(123).build().toByteString())
-                    .build())
-            .build();
-
-    ByteString data = raw.toByteString();
-
-    // Parse as a TestMessageSet and check the contents.
-    TestMessageSet messageSet = TestMessageSet.parseFrom(data, extensionRegistry);
-    assertThat(messageSet.getExtension(TestMessageSetExtension1.messageSetExtension).getI())
-        .isEqualTo(123);
-  }
-
-  @Test
-  public void testMergeLazyMessageSetExtensionEagerly() throws Exception {
-    testMergeLazyMessageSetExtensionWithFlag(true);
-  }
-
-  @Test
-  public void testMergeLazyMessageSetExtensionNotEagerly() throws Exception {
-    testMergeLazyMessageSetExtensionWithFlag(false);
-  }
-
-  private void testMergeLazyMessageSetExtensionWithFlag(boolean eagerParsing) throws Exception {
-    ExtensionRegistryLite.setEagerlyParseMessageSets(eagerParsing);
-    ExtensionRegistry extensionRegistry = ExtensionRegistry.newInstance();
-    extensionRegistry.add(TestMessageSetExtension1.messageSetExtension);
-
-    // Set up a RawMessageSet with a known messages.
-    RawMessageSet raw =
-        RawMessageSet.newBuilder()
-            .addItem(
-                RawMessageSet.Item.newBuilder()
-                    .setTypeId(TYPE_ID_1)
-                    .setMessage(
-                        TestMessageSetExtension1.newBuilder().setI(123).build().toByteString())
-                    .build())
-            .build();
-
-    ByteString data = raw.toByteString();
-
-    // Parse as a TestMessageSet and store value into lazy field
-    TestMessageSet messageSet = TestMessageSet.parseFrom(data, extensionRegistry);
-    // Merge lazy field check the contents.
-    messageSet = messageSet.toBuilder().mergeFrom(data, extensionRegistry).build();
-    assertThat(messageSet.getExtension(TestMessageSetExtension1.messageSetExtension).getI())
-        .isEqualTo(123);
-  }
-
-  @Test
-  public void testMergeMessageSetExtensionEagerly() throws Exception {
-    testMergeMessageSetExtensionWithFlag(true);
-  }
-
-  @Test
-  public void testMergeMessageSetExtensionNotEagerly() throws Exception {
-    testMergeMessageSetExtensionWithFlag(false);
-  }
-
-  private void testMergeMessageSetExtensionWithFlag(boolean eagerParsing) throws Exception {
-    ExtensionRegistryLite.setEagerlyParseMessageSets(eagerParsing);
-    ExtensionRegistry extensionRegistry = ExtensionRegistry.newInstance();
-    extensionRegistry.add(TestMessageSetExtension1.messageSetExtension);
-
-    // Set up a RawMessageSet with a known messages.
-    RawMessageSet raw =
-        RawMessageSet.newBuilder()
-            .addItem(
-                RawMessageSet.Item.newBuilder()
-                    .setTypeId(TYPE_ID_1)
-                    .setMessage(
-                        TestMessageSetExtension1.newBuilder().setI(123).build().toByteString())
-                    .build())
-            .build();
-
-    // Serialize RawMessageSet unnormally (message value before type id)
-    ByteString.CodedBuilder out = ByteString.newCodedBuilder(raw.getSerializedSize());
-    CodedOutputStream output = out.getCodedOutput();
-    List<RawMessageSet.Item> items = raw.getItemList();
-    for (int i = 0; i < items.size(); i++) {
-      RawMessageSet.Item item = items.get(i);
-      output.writeTag(1, WireFormat.WIRETYPE_START_GROUP);
-      output.writeBytes(3, item.getMessage());
-      output.writeInt32(2, item.getTypeId());
-      output.writeTag(1, WireFormat.WIRETYPE_END_GROUP);
-    }
-    ByteString data = out.build();
-
-    // Merge bytes into TestMessageSet and check the contents.
-    TestMessageSet messageSet =
-        TestMessageSet.newBuilder().mergeFrom(data, extensionRegistry).build();
-    assertThat(messageSet.getExtension(TestMessageSetExtension1.messageSetExtension).getI())
-        .isEqualTo(123);
-  }
-
-  // ================================================================
-  // oneof
-  @Test
-  public void testOneofWireFormat() throws Exception {
-    TestOneof2.Builder builder = TestOneof2.newBuilder();
-    TestUtil.setOneof(builder);
-    TestOneof2 message = builder.build();
-    ByteString rawBytes = message.toByteString();
-
-    assertThat(message.getSerializedSize()).isEqualTo(rawBytes.size());
-
-    TestOneof2 message2 = TestOneof2.parseFrom(rawBytes);
-    TestUtil.assertOneofSet(message2);
-  }
-
-  @Test
-  public void testOneofOnlyLastSet() throws Exception {
-    TestOneofBackwardsCompatible source =
-        TestOneofBackwardsCompatible.newBuilder().setFooInt(100).setFooString("101").build();
-
-    ByteString rawBytes = source.toByteString();
-    TestOneof2 message = TestOneof2.parseFrom(rawBytes);
-    assertThat(message.hasFooInt()).isFalse();
-    assertThat(message.hasFooString()).isTrue();
-  }
-}
diff --git a/libs/protobuf/java/core/src/test/java/com/google/protobuf/WrappersLiteOfMethodTest.java b/libs/protobuf/java/core/src/test/java/com/google/protobuf/WrappersLiteOfMethodTest.java
deleted file mode 100644
index fc1e09f..0000000
--- a/libs/protobuf/java/core/src/test/java/com/google/protobuf/WrappersLiteOfMethodTest.java
+++ /dev/null
@@ -1,67 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import com.google.protobuf.wrapperstest.WrappersTestProto.TopLevelMessage;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-@RunWith(JUnit4.class)
-public class WrappersLiteOfMethodTest {
-
-  @Test
-  public void testOf() throws Exception {
-    TopLevelMessage.Builder builder = TopLevelMessage.newBuilder();
-    builder.setFieldDouble(DoubleValue.of(2.333));
-    builder.setFieldFloat(FloatValue.of(2.333f));
-    builder.setFieldInt32(Int32Value.of(2333));
-    builder.setFieldInt64(Int64Value.of(23333333333333L));
-    builder.setFieldUint32(UInt32Value.of(2333));
-    builder.setFieldUint64(UInt64Value.of(23333333333333L));
-    builder.setFieldBool(BoolValue.of(true));
-    builder.setFieldString(StringValue.of("23333"));
-    builder.setFieldBytes(BytesValue.of(ByteString.wrap("233".getBytes(Internal.UTF_8))));
-
-    TopLevelMessage message = builder.build();
-    assertThat(message.getFieldDouble().getValue()).isEqualTo(2.333);
-    assertThat(message.getFieldFloat().getValue()).isEqualTo(2.333F);
-    assertThat(message.getFieldInt32().getValue()).isEqualTo(2333);
-    assertThat(message.getFieldInt64().getValue()).isEqualTo(23333333333333L);
-    assertThat(message.getFieldUint32().getValue()).isEqualTo(2333);
-    assertThat(message.getFieldUint64().getValue()).isEqualTo(23333333333333L);
-    assertThat(true).isSameInstanceAs(message.getFieldBool().getValue());
-    assertThat(message.getFieldString().getValue().equals("23333")).isTrue();
-    assertThat(message.getFieldBytes().getValue().toStringUtf8().equals("233")).isTrue();
-  }
-}
diff --git a/libs/protobuf/java/core/src/test/java/com/google/protobuf/WrappersOfMethodTest.java b/libs/protobuf/java/core/src/test/java/com/google/protobuf/WrappersOfMethodTest.java
deleted file mode 100644
index 44c4ad6..0000000
--- a/libs/protobuf/java/core/src/test/java/com/google/protobuf/WrappersOfMethodTest.java
+++ /dev/null
@@ -1,67 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import com.google.protobuf.wrapperstest.WrappersTestProto.TopLevelMessage;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-@RunWith(JUnit4.class)
-public class WrappersOfMethodTest {
-
-  @Test
-  public void testOf() throws Exception {
-    TopLevelMessage.Builder builder = TopLevelMessage.newBuilder();
-    builder.setFieldDouble(DoubleValue.of(2.333));
-    builder.setFieldFloat(FloatValue.of(2.333f));
-    builder.setFieldInt32(Int32Value.of(2333));
-    builder.setFieldInt64(Int64Value.of(23333333333333L));
-    builder.setFieldUint32(UInt32Value.of(2333));
-    builder.setFieldUint64(UInt64Value.of(23333333333333L));
-    builder.setFieldBool(BoolValue.of(true));
-    builder.setFieldString(StringValue.of("23333"));
-    builder.setFieldBytes(BytesValue.of(ByteString.wrap("233".getBytes(Internal.UTF_8))));
-
-    TopLevelMessage message = builder.build();
-    assertThat(message.getFieldDouble().getValue()).isEqualTo(2.333);
-    assertThat(message.getFieldFloat().getValue()).isEqualTo(2.333F);
-    assertThat(message.getFieldInt32().getValue()).isEqualTo(2333);
-    assertThat(message.getFieldInt64().getValue()).isEqualTo(23333333333333L);
-    assertThat(message.getFieldUint32().getValue()).isEqualTo(2333);
-    assertThat(message.getFieldUint64().getValue()).isEqualTo(23333333333333L);
-    assertThat(true).isSameInstanceAs(message.getFieldBool().getValue());
-    assertThat(message.getFieldString().getValue().equals("23333")).isTrue();
-    assertThat(message.getFieldBytes().getValue().toStringUtf8().equals("233")).isTrue();
-  }
-}
diff --git a/libs/protobuf/java/core/src/test/proto/com/google/protobuf/any_test.proto b/libs/protobuf/java/core/src/test/proto/com/google/protobuf/any_test.proto
deleted file mode 100644
index 99d52b7..0000000
--- a/libs/protobuf/java/core/src/test/proto/com/google/protobuf/any_test.proto
+++ /dev/null
@@ -1,42 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto3";
-
-package any_test;
-
-import "google/protobuf/any.proto";
-
-option java_package = "any_test";
-option java_outer_classname = "AnyTestProto";
-
-message TestAny {
-  google.protobuf.Any value = 1;
-}
diff --git a/libs/protobuf/java/core/src/test/proto/com/google/protobuf/cached_field_size_test.proto b/libs/protobuf/java/core/src/test/proto/com/google/protobuf/cached_field_size_test.proto
deleted file mode 100644
index 9579a0a..0000000
--- a/libs/protobuf/java/core/src/test/proto/com/google/protobuf/cached_field_size_test.proto
+++ /dev/null
@@ -1,45 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// A regression test for b/74087933
-syntax = "proto2";
-
-package protobuf_unittest;
-
-import "google/protobuf/unittest.proto";
-import "google/protobuf/unittest_proto3.proto";
-
-option optimize_for = CODE_SIZE;
-option java_multiple_files = true;
-
-message TestCachedFieldSizeMessage {
-  optional protobuf_unittest.TestPackedTypes proto2_child = 1;
-  optional proto3_unittest.TestPackedTypes proto3_child = 2;
-}
diff --git a/libs/protobuf/java/core/src/test/proto/com/google/protobuf/deprecated_file.proto b/libs/protobuf/java/core/src/test/proto/com/google/protobuf/deprecated_file.proto
deleted file mode 100644
index ca90e92..0000000
--- a/libs/protobuf/java/core/src/test/proto/com/google/protobuf/deprecated_file.proto
+++ /dev/null
@@ -1,38 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto3";
-
-package deprecated_file;
-
-option deprecated = true;
-
-// TODO (liujisi): Add deprecation options on messages, enums fields as well and
-// add tests to verify those annotations are actually generated.
diff --git a/libs/protobuf/java/core/src/test/proto/com/google/protobuf/dynamic_message_test.proto b/libs/protobuf/java/core/src/test/proto/com/google/protobuf/dynamic_message_test.proto
deleted file mode 100644
index a0f28ac..0000000
--- a/libs/protobuf/java/core/src/test/proto/com/google/protobuf/dynamic_message_test.proto
+++ /dev/null
@@ -1,42 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto2";
-
-package dynamic_message_test;
-
-option java_package = "dynamicmessagetest";
-option java_outer_classname = "DynamicMessageTestProto";
-
-message EmptyMessage {}
-
-message MessageWithMapFields {
-  map<string, EmptyMessage> string_message_map = 1;
-}
diff --git a/libs/protobuf/java/core/src/test/proto/com/google/protobuf/field_presence_test.proto b/libs/protobuf/java/core/src/test/proto/com/google/protobuf/field_presence_test.proto
deleted file mode 100644
index 28f3658..0000000
--- a/libs/protobuf/java/core/src/test/proto/com/google/protobuf/field_presence_test.proto
+++ /dev/null
@@ -1,94 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto3";
-
-package field_presence_test;
-
-import "google/protobuf/unittest.proto";
-
-option java_package = "com.google.protobuf";
-option java_outer_classname = "FieldPresenceTestProto";
-
-message TestAllTypes {
-  enum NestedEnum {
-    FOO = 0;
-    BAR = 1;
-    BAZ = 2;
-  }
-  message NestedMessage {
-    int32 value = 1;
-  }
-
-  int32 optional_int32 = 1;
-  string optional_string = 2;
-  bytes optional_bytes = 3;
-  NestedEnum optional_nested_enum = 4;
-  NestedMessage optional_nested_message = 5;
-  protobuf_unittest.TestRequired optional_proto2_message = 6;
-  NestedMessage optional_lazy_message = 7 [lazy = true];
-
-  oneof oneof_field {
-    int32 oneof_int32 = 11;
-    uint32 oneof_uint32 = 12;
-    string oneof_string = 13;
-    bytes oneof_bytes = 14;
-    NestedEnum oneof_nested_enum = 15;
-    NestedMessage oneof_nested_message = 16;
-    protobuf_unittest.TestRequired oneof_proto2_message = 17;
-  }
-
-  repeated int32 repeated_int32 = 21;
-  repeated string repeated_string = 22;
-  repeated bytes repeated_bytes = 23;
-  repeated NestedEnum repeated_nested_enum = 24;
-  repeated NestedMessage repeated_nested_message = 25;
-  repeated protobuf_unittest.TestRequired repeated_proto2_message = 26;
-  repeated NestedEnum packed_nested_enum = 27 [packed = true];
-}
-
-message TestOptionalFieldsOnly {
-  int32 optional_int32 = 1;
-  string optional_string = 2;
-  bytes optional_bytes = 3;
-  TestAllTypes.NestedEnum optional_nested_enum = 4;
-  TestAllTypes.NestedMessage optional_nested_message = 5;
-  protobuf_unittest.TestRequired optional_proto2_message = 6;
-  TestAllTypes.NestedMessage optional_lazy_message = 7 [lazy = true];
-}
-
-message TestRepeatedFieldsOnly {
-  repeated int32 repeated_int32 = 21;
-  repeated string repeated_string = 22;
-  repeated bytes repeated_bytes = 23;
-  repeated TestAllTypes.NestedEnum repeated_nested_enum = 24;
-  repeated TestAllTypes.NestedMessage repeated_nested_message = 25;
-  repeated protobuf_unittest.TestRequired repeated_proto2_message = 26;
-}
diff --git a/libs/protobuf/java/core/src/test/proto/com/google/protobuf/lazy_fields_lite.proto b/libs/protobuf/java/core/src/test/proto/com/google/protobuf/lazy_fields_lite.proto
deleted file mode 100644
index 736a344..0000000
--- a/libs/protobuf/java/core/src/test/proto/com/google/protobuf/lazy_fields_lite.proto
+++ /dev/null
@@ -1,69 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: Naoki Iwasaki (niwasaki@google.com)
-//
-// A proto file with lazy fields
-
-syntax = "proto2";
-
-package protobuf_unittest;
-
-message LazyMessageLite {
-  optional int32 num = 1;
-  optional int32 num_with_default = 2 [default = 421];
-  optional LazyInnerMessageLite inner = 3 [lazy = true];
-  repeated LazyInnerMessageLite repeated_inner = 4 [lazy = true];
-
-  oneof oneof_field {
-    int32 oneof_num = 5;
-    LazyInnerMessageLite oneof_inner = 6 [lazy = true];
-  }
-}
-
-message LazyInnerMessageLite {
-  optional int32 num = 1;
-  optional int32 num_with_default = 2 [default = 42];
-  optional LazyNestedInnerMessageLite nested = 3 [lazy = true];
-
-  extensions 1000 to max;
-}
-
-message LazyExtension {
-  extend LazyInnerMessageLite {
-    optional LazyExtension extension = 1000;
-  }
-  optional string name = 1;
-}
-
-message LazyNestedInnerMessageLite {
-  optional int32 num = 1;
-  optional int32 num_with_default = 2 [default = 4];
-}
diff --git a/libs/protobuf/java/core/src/test/proto/com/google/protobuf/lite_equals_and_hash.proto b/libs/protobuf/java/core/src/test/proto/com/google/protobuf/lite_equals_and_hash.proto
deleted file mode 100644
index 080c519..0000000
--- a/libs/protobuf/java/core/src/test/proto/com/google/protobuf/lite_equals_and_hash.proto
+++ /dev/null
@@ -1,87 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: pbogle@google.com (Phil Bogle)
-
-syntax = "proto2";
-
-package protobuf_unittest.lite_equals_and_hash;
-
-
-message TestOneofEquals {
-  oneof oneof_field {
-    string name = 1;
-    int32 value = 2;
-  }
-}
-
-message Foo {
-  optional int32 value = 1;
-  repeated Bar bar = 2;
-  map<string, string> my_map = 3;
-  oneof Single {
-    sint64 sint64 = 4;
-    // LINT: ALLOW_GROUPS
-    group MyGroup = 5 {
-      optional int32 value = 1;
-    }
-  }
-
-  extensions 100 to max;
-}
-
-message Bar {
-  extend Foo {
-    optional Bar foo_ext = 100;
-  }
-
-  optional string name = 1;
-}
-
-message BarPrime {
-  optional string name = 1;
-}
-
-message Empty {}
-
-extend Foo {
-  optional int32 varint = 101;
-  optional fixed32 fixed32 = 102;
-  optional fixed64 fixed64 = 103;
-  optional group MyGroup = 104 {
-    optional string group_value = 1;
-  }
-}
-
-message TestRecursiveOneof {
-  oneof Foo {
-    TestRecursiveOneof r = 1;
-  }
-}
diff --git a/libs/protobuf/java/core/src/test/proto/com/google/protobuf/map_for_proto2_lite_test.proto b/libs/protobuf/java/core/src/test/proto/com/google/protobuf/map_for_proto2_lite_test.proto
deleted file mode 100644
index 4ec9688..0000000
--- a/libs/protobuf/java/core/src/test/proto/com/google/protobuf/map_for_proto2_lite_test.proto
+++ /dev/null
@@ -1,130 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto2";
-
-
-option java_outer_classname = "MapForProto2TestProto";
-
-message TestMap {
-  message MessageValue {
-    optional int32 value = 1;
-  }
-  enum EnumValue {
-    FOO = 0;
-    BAR = 1;
-    BAZ = 2;
-    QUX = 3;
-  }
-
-  map<int32, int32> int32_to_int32_field = 1;
-  map<int32, string> int32_to_string_field = 2;
-  map<int32, bytes> int32_to_bytes_field = 3;
-  map<int32, EnumValue> int32_to_enum_field = 4;
-  map<int32, MessageValue> int32_to_message_field = 5;
-  map<string, int32> string_to_int32_field = 6;
-
-  message MessageWithRequiredFields {
-    required int32 value = 1;
-  }
-  map<int32, MessageWithRequiredFields> required_message_map = 11;
-}
-
-message TestUnknownEnumValue {
-  // Wire-compatible with TestMap.int32_to_enum_field so we can test the
-  // parsing behavior of TestMap regarding unknown enum values.
-  map<int32, int32> int32_to_int32_field = 4;
-}
-
-// Test that the maps initialization code works correctly when the map field
-// references the containing message.
-message TestRecursiveMap {
-  optional int32 value = 1;
-  map<int32, TestRecursiveMap> recursive_map_field = 2;
-}
-
-// a decoy of TestMap for testing parsing errors
-message BizarroTestMap {
-  // same key type, different value
-  map<int32, bytes> int32_to_int32_field = 1;
-  // different key and value types
-  map<string, int32> int32_to_string_field = 2;
-  // different key types, same value
-  map<string, int32> int32_to_bytes_field = 3;
-  // different key and value types
-  map<string, bytes> int32_to_enum_field = 4;
-  // different key and value types
-  map<string, bytes> int32_to_message_field = 5;
-  // same key type, different value
-  map<string, bytes> string_to_int32_field = 6;
-}
-
-// Used to test that java reserved words can be used as protobuf field names
-// Not all reserved words are tested (to avoid bloat) but instead an arbitrary
-// subset of them chosen to cover various keyword categories like
-// type, modifier, declaration, etc.
-message ReservedAsMapField {
-  map<string, uint32> if = 1;
-  map<string, uint32> const = 2;
-  map<string, uint32> private = 3;
-  map<string, uint32> class = 4;
-  map<string, uint32> int = 5;
-  map<string, uint32> void = 6;
-  // These are also proto keywords
-  map<string, uint32> string = 7;
-  map<string, uint32> package = 8;
-  // Most recent Java reserved word
-  map<string, uint32> enum = 9;
-  // null is not a 'reserved word' per se but as a literal needs similar care
-  map<string, uint32> null = 10;
-}
-
-message ReservedAsMapFieldWithEnumValue {
-  enum SampleEnum {
-    A = 0;
-    B = 1;
-  }
-  map<string, SampleEnum> if = 1;
-  map<string, SampleEnum> const = 2;
-  map<string, SampleEnum> private = 3;
-  map<string, SampleEnum> class = 4;
-  map<string, SampleEnum> int = 5;
-  map<string, SampleEnum> void = 6;
-  // These are also proto keywords
-  map<string, SampleEnum> string = 7;
-  map<string, SampleEnum> package = 8;
-  // Most recent Java reserved word
-  map<string, SampleEnum> enum = 9;
-  // null is not a 'reserved word' per se but as a literal needs similar care
-  map<string, SampleEnum> null = 10;
-}
-package map_for_proto2_lite_test;
-option java_package = "map_lite_test";
-option optimize_for = LITE_RUNTIME;
diff --git a/libs/protobuf/java/core/src/test/proto/com/google/protobuf/map_for_proto2_test.proto b/libs/protobuf/java/core/src/test/proto/com/google/protobuf/map_for_proto2_test.proto
deleted file mode 100644
index f73bd63..0000000
--- a/libs/protobuf/java/core/src/test/proto/com/google/protobuf/map_for_proto2_test.proto
+++ /dev/null
@@ -1,129 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto2";
-
-package map_for_proto2_test;
-
-option java_package = "map_test";
-option java_outer_classname = "MapForProto2TestProto";
-
-message TestMap {
-  message MessageValue {
-    optional int32 value = 1;
-  }
-  enum EnumValue {
-    FOO = 0;
-    BAR = 1;
-    BAZ = 2;
-    QUX = 3;
-  }
-
-  map<int32, int32> int32_to_int32_field = 1;
-  map<int32, string> int32_to_string_field = 2;
-  map<int32, bytes> int32_to_bytes_field = 3;
-  map<int32, EnumValue> int32_to_enum_field = 4;
-  map<int32, MessageValue> int32_to_message_field = 5;
-  map<string, int32> string_to_int32_field = 6;
-
-  message MessageWithRequiredFields {
-    required int32 value = 1;
-  }
-  map<int32, MessageWithRequiredFields> required_message_map = 11;
-}
-
-message TestUnknownEnumValue {
-  // Wire-compatible with TestMap.int32_to_enum_field so we can test the
-  // parsing behavior of TestMap regarding unknown enum values.
-  map<int32, int32> int32_to_int32_field = 4;
-}
-
-// Test that the maps initialization code works correctly when the map field
-// references the containing message.
-message TestRecursiveMap {
-  optional int32 value = 1;
-  map<int32, TestRecursiveMap> recursive_map_field = 2;
-}
-
-// a decoy of TestMap for testing parsing errors
-message BizarroTestMap {
-  // same key type, different value
-  map<int32, bytes> int32_to_int32_field = 1;
-  // different key and value types
-  map<string, int32> int32_to_string_field = 2;
-  // different key types, same value
-  map<string, int32> int32_to_bytes_field = 3;
-  // different key and value types
-  map<string, bytes> int32_to_enum_field = 4;
-  // different key and value types
-  map<string, bytes> int32_to_message_field = 5;
-  // same key type, different value
-  map<string, bytes> string_to_int32_field = 6;
-}
-
-// Used to test that java reserved words can be used as protobuf field names
-// Not all reserved words are tested (to avoid bloat) but instead an arbitrary
-// subset of them chosen to cover various keyword categories like
-// type, modifier, declaration, etc.
-message ReservedAsMapField {
-  map<string, uint32> if = 1;
-  map<string, uint32> const = 2;
-  map<string, uint32> private = 3;
-  map<string, uint32> class = 4;
-  map<string, uint32> int = 5;
-  map<string, uint32> void = 6;
-  // These are also proto keywords
-  map<string, uint32> string = 7;
-  map<string, uint32> package = 8;
-  // Most recent Java reserved word
-  map<string, uint32> enum = 9;
-  // null is not a 'reserved word' per se but as a literal needs similar care
-  map<string, uint32> null = 10;
-}
-
-message ReservedAsMapFieldWithEnumValue {
-  enum SampleEnum {
-    A = 0;
-    B = 1;
-  }
-  map<string, SampleEnum> if = 1;
-  map<string, SampleEnum> const = 2;
-  map<string, SampleEnum> private = 3;
-  map<string, SampleEnum> class = 4;
-  map<string, SampleEnum> int = 5;
-  map<string, SampleEnum> void = 6;
-  // These are also proto keywords
-  map<string, SampleEnum> string = 7;
-  map<string, SampleEnum> package = 8;
-  // Most recent Java reserved word
-  map<string, SampleEnum> enum = 9;
-  // null is not a 'reserved word' per se but as a literal needs similar care
-  map<string, SampleEnum> null = 10;
-}
diff --git a/libs/protobuf/java/core/src/test/proto/com/google/protobuf/map_initialization_order_test.proto b/libs/protobuf/java/core/src/test/proto/com/google/protobuf/map_initialization_order_test.proto
deleted file mode 100644
index ab99e5f..0000000
--- a/libs/protobuf/java/core/src/test/proto/com/google/protobuf/map_initialization_order_test.proto
+++ /dev/null
@@ -1,60 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Regression test for a map initialization order bug. The bug only manifests
-// when:
-//   1. A message contains map fields and is also extendable.
-//   2. There is a file-level extension defined in the same file referencing
-//      the above message as the extension type.
-//   3. The program executes in the following order:
-//        a. getDescriptor() is called on another message in the same file.
-//        b. use protobuf reflection to access the map field.
-// The symptom is a NullPointerException being thrown.
-syntax = "proto2";
-
-package map_test;
-
-option java_package = "map_test";
-option java_outer_classname = "MapInitializationOrderTest";
-option java_multiple_files = true;
-
-// Mirrors the structure of
-// javatests/com/google/cloud/common/logging/logging_test.proto.
-
-message Message1 {
-  map<string, bool> map_field = 1;
-  extensions 1000 to max;
-}
-
-extend Message1 {
-  optional Message1 recursive_extension = 1001;
-}
-
-message RedactAllTypes {}
diff --git a/libs/protobuf/java/core/src/test/proto/com/google/protobuf/map_lite_test.proto b/libs/protobuf/java/core/src/test/proto/com/google/protobuf/map_lite_test.proto
deleted file mode 100644
index ee291e9..0000000
--- a/libs/protobuf/java/core/src/test/proto/com/google/protobuf/map_lite_test.proto
+++ /dev/null
@@ -1,126 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto3";
-
-package map_lite_test;
-
-option optimize_for = LITE_RUNTIME;
-option java_package = "map_lite_test";
-option java_outer_classname = "MapTestProto";
-
-message TestMap {
-  message MessageValue {
-    int32 value = 1;
-  }
-  enum EnumValue {
-    FOO = 0;
-    BAR = 1;
-    BAZ = 2;
-    QUX = 3;
-  }
-
-  map<int32, int32> int32_to_int32_field = 1;
-  map<int32, string> int32_to_string_field = 2;
-  map<int32, bytes> int32_to_bytes_field = 3;
-  map<int32, EnumValue> int32_to_enum_field = 4;
-  map<int32, MessageValue> int32_to_message_field = 5;
-  map<string, int32> string_to_int32_field = 6;
-  map<uint32, int32> uint32_to_int32_field = 7;
-  map<int64, int32> int64_to_int32_field = 8;
-}
-
-// Used to test that a nested builder containing map fields will properly
-// propagate the onChange event and mark its parent dirty when a change
-// is made to a map field.
-message TestOnChangeEventPropagation {
-  TestMap optional_message = 1;
-}
-
-// a decoy of TestMap for testing parsing errors
-message BizarroTestMap {
-  // same key type, different value
-  map<int32, bytes> int32_to_int32_field = 1;
-  // different key and value types
-  map<string, int32> int32_to_string_field = 2;
-  // different key types, same value
-  map<string, int32> int32_to_bytes_field = 3;
-  // different key and value types
-  map<string, bytes> int32_to_enum_field = 4;
-  // different key and value types
-  map<string, bytes> int32_to_message_field = 5;
-  // same key type, different value
-  map<string, bytes> string_to_int32_field = 6;
-}
-
-// Used to test that java reserved words can be used as protobuf field names
-// Not all reserved words are tested (to avoid bloat) but instead an arbitrary
-// subset of them chosen to cover various keyword categories like
-// type, modifier, declaration, etc.
-message ReservedAsMapField {
-  map<string, uint32> if = 1;
-  map<string, uint32> const = 2;
-  map<string, uint32> private = 3;
-  map<string, uint32> class = 4;
-  map<string, uint32> int = 5;
-  map<string, uint32> void = 6;
-  // These are also proto keywords
-  map<string, uint32> string = 7;
-  map<string, uint32> package = 8;
-  // Most recent Java reserved word
-  map<string, uint32> enum = 9;
-  // null is not a 'reserved word' per se but as a literal needs similar care
-  map<string, uint32> null = 10;
-}
-
-message ReservedAsMapFieldWithEnumValue {
-  enum SampleEnum {
-    A = 0;
-    B = 1;
-  }
-  map<string, SampleEnum> if = 1;
-  map<string, SampleEnum> const = 2;
-  map<string, SampleEnum> private = 3;
-  map<string, SampleEnum> class = 4;
-  map<string, SampleEnum> int = 5;
-  map<string, SampleEnum> void = 6;
-  // These are also proto keywords
-  map<string, SampleEnum> string = 7;
-  map<string, SampleEnum> package = 8;
-  // Most recent Java reserved word
-  map<string, SampleEnum> enum = 9;
-  // null is not a 'reserved word' per se but as a literal needs similar care
-  map<string, SampleEnum> null = 10;
-}
-
-// https://github.com/protocolbuffers/protobuf/issues/9785
-message MapContainer {
-  map<string,string> my_map = 1;
-}
diff --git a/libs/protobuf/java/core/src/test/proto/com/google/protobuf/map_test.proto b/libs/protobuf/java/core/src/test/proto/com/google/protobuf/map_test.proto
deleted file mode 100644
index 872f4ec..0000000
--- a/libs/protobuf/java/core/src/test/proto/com/google/protobuf/map_test.proto
+++ /dev/null
@@ -1,125 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto3";
-
-package map_test;
-
-option java_package = "map_test";
-option java_outer_classname = "MapTestProto";
-
-message TestMap {
-  message MessageValue {
-    int32 value = 1;
-  }
-  enum EnumValue {
-    FOO = 0;
-    BAR = 1;
-    BAZ = 2;
-    QUX = 3;
-  }
-
-  map<int32, int32> int32_to_int32_field = 1;
-  map<int32, string> int32_to_string_field = 2;
-  map<int32, bytes> int32_to_bytes_field = 3;
-  map<int32, EnumValue> int32_to_enum_field = 4;
-  map<int32, MessageValue> int32_to_message_field = 5;
-  map<string, int32> string_to_int32_field = 6;
-  map<uint32, int32> uint32_to_int32_field = 7;
-  map<int64, int32> int64_to_int32_field = 8;
-}
-
-// Used to test that a nested builder containing map fields will properly
-// propagate the onChange event and mark its parent dirty when a change
-// is made to a map field.
-message TestOnChangeEventPropagation {
-  TestMap optional_message = 1;
-}
-
-// a decoy of TestMap for testing parsing errors
-message BizarroTestMap {
-  // same key type, different value
-  map<int32, bytes> int32_to_int32_field = 1;
-  // different key and value types
-  map<string, int32> int32_to_string_field = 2;
-  // different key types, same value
-  map<string, int32> int32_to_bytes_field = 3;
-  // different key and value types
-  map<string, bytes> int32_to_enum_field = 4;
-  // different key and value types
-  map<string, bytes> int32_to_message_field = 5;
-  // same key type, different value
-  map<string, bytes> string_to_int32_field = 6;
-}
-
-// Used to test that java reserved words can be used as protobuf field names
-// Not all reserved words are tested (to avoid bloat) but instead an arbitrary
-// subset of them chosen to cover various keyword categories like
-// type, modifier, declaration, etc.
-message ReservedAsMapField {
-  map<string, uint32> if = 1;
-  map<string, uint32> const = 2;
-  map<string, uint32> private = 3;
-  map<string, uint32> class = 4;
-  map<string, uint32> int = 5;
-  map<string, uint32> void = 6;
-  // These are also proto keywords
-  map<string, uint32> string = 7;
-  map<string, uint32> package = 8;
-  // Most recent Java reserved word
-  map<string, uint32> enum = 9;
-  // null is not a 'reserved word' per se but as a literal needs similar care
-  map<string, uint32> null = 10;
-}
-
-message ReservedAsMapFieldWithEnumValue {
-  enum SampleEnum {
-    A = 0;
-    B = 1;
-  }
-  map<string, SampleEnum> if = 1;
-  map<string, SampleEnum> const = 2;
-  map<string, SampleEnum> private = 3;
-  map<string, SampleEnum> class = 4;
-  map<string, SampleEnum> int = 5;
-  map<string, SampleEnum> void = 6;
-  // These are also proto keywords
-  map<string, SampleEnum> string = 7;
-  map<string, SampleEnum> package = 8;
-  // Most recent Java reserved word
-  map<string, SampleEnum> enum = 9;
-  // null is not a 'reserved word' per se but as a literal needs similar care
-  map<string, SampleEnum> null = 10;
-}
-
-// https://github.com/protocolbuffers/protobuf/issues/9785
-message MapContainer {
-  map<string,string> my_map = 1;
-}
diff --git a/libs/protobuf/java/core/src/test/proto/com/google/protobuf/multiple_files_test.proto b/libs/protobuf/java/core/src/test/proto/com/google/protobuf/multiple_files_test.proto
deleted file mode 100644
index 0de6f7b..0000000
--- a/libs/protobuf/java/core/src/test/proto/com/google/protobuf/multiple_files_test.proto
+++ /dev/null
@@ -1,74 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//
-// A proto file which tests the java_multiple_files option.
-
-syntax = "proto2";
-
-// Some generic_services option(s) added automatically.
-// See:  http://go/proto2-generic-services-default
-package protobuf_unittest;
-
-import "google/protobuf/unittest.proto";
-import "google/protobuf/descriptor.proto";
-
-option java_generic_services = true;  // auto-added
-option java_multiple_files = true;
-option java_outer_classname = "MultipleFilesTestProto";
-
-message MessageWithNoOuter {
-  message NestedMessage {
-    optional int32 i = 1;
-  }
-  enum NestedEnum { BAZ = 3; }
-  optional NestedMessage nested = 1;
-  repeated TestAllTypes foreign = 2;
-  optional NestedEnum nested_enum = 3;
-  optional EnumWithNoOuter foreign_enum = 4;
-}
-
-extend google.protobuf.EnumValueOptions {
-  optional int32 enum_value_option = 7654321;
-}
-
-enum EnumWithNoOuter {
-  FOO = 1 [(enum_value_option) = 12345];
-  BAR = 2;
-}
-
-service ServiceWithNoOuter {
-  rpc Foo(MessageWithNoOuter) returns (TestAllTypes);
-}
-
-extend TestAllExtensions {
-  optional int32 extension_with_outer = 1234567;
-}
diff --git a/libs/protobuf/java/core/src/test/proto/com/google/protobuf/nested_builders_test.proto b/libs/protobuf/java/core/src/test/proto/com/google/protobuf/nested_builders_test.proto
deleted file mode 100644
index 319e32c..0000000
--- a/libs/protobuf/java/core/src/test/proto/com/google/protobuf/nested_builders_test.proto
+++ /dev/null
@@ -1,58 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: jonp@google.com (Jon Perlow)
-//
-syntax = "proto2";
-
-package protobuf_unittest;
-
-option java_multiple_files = true;
-option java_outer_classname = "NestedBuilders";
-
-message Vehicle {
-  optional Engine engine = 1;
-  repeated Wheel wheel = 2;
-}
-
-message Engine {
-  optional int32 cylinder = 1;
-  optional int32 liters = 2;
-  optional TimingBelt timing_belt = 3;
-}
-
-message TimingBelt {
-  optional int32 number_of_teeth = 1;
-}
-
-message Wheel {
-  optional int32 radius = 1;
-  optional int32 width = 2;
-}
diff --git a/libs/protobuf/java/core/src/test/proto/com/google/protobuf/nested_extension.proto b/libs/protobuf/java/core/src/test/proto/com/google/protobuf/nested_extension.proto
deleted file mode 100644
index 2da6d08..0000000
--- a/libs/protobuf/java/core/src/test/proto/com/google/protobuf/nested_extension.proto
+++ /dev/null
@@ -1,48 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: Darick Tong (darick@google.com)
-//
-// A proto file with nested extensions. Note that this must be defined in
-// a separate file to properly test the initialization of the outer class.
-
-syntax = "proto2";
-
-package protobuf_unittest;
-
-import "com/google/protobuf/non_nested_extension.proto";
-
-
-message MyNestedExtension {
-  extend MessageToBeExtended {
-    optional MessageToBeExtended recursiveExtension = 2;
-    optional int32 default = 2002;
-  }
-}
diff --git a/libs/protobuf/java/core/src/test/proto/com/google/protobuf/nested_extension_lite.proto b/libs/protobuf/java/core/src/test/proto/com/google/protobuf/nested_extension_lite.proto
deleted file mode 100644
index 024097c..0000000
--- a/libs/protobuf/java/core/src/test/proto/com/google/protobuf/nested_extension_lite.proto
+++ /dev/null
@@ -1,50 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: Darick Tong (darick@google.com)
-//
-// A proto file with nested extensions for a MessageLite messages. Note that
-// this must be defined in a separate file to properly test the initialization
-// of the outer class.
-
-syntax = "proto2";
-
-package protobuf_unittest;
-
-import "com/google/protobuf/non_nested_extension_lite.proto";
-
-option optimize_for = LITE_RUNTIME;
-
-message MyNestedExtensionLite {
-  extend MessageLiteToBeExtended {
-    optional MessageLiteToBeExtended recursiveExtensionLite = 3;
-    optional double private = 2004;
-  }
-}
diff --git a/libs/protobuf/java/core/src/test/proto/com/google/protobuf/non_nested_extension.proto b/libs/protobuf/java/core/src/test/proto/com/google/protobuf/non_nested_extension.proto
deleted file mode 100644
index 45395a3..0000000
--- a/libs/protobuf/java/core/src/test/proto/com/google/protobuf/non_nested_extension.proto
+++ /dev/null
@@ -1,49 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: Darick Tong (darick@google.com)
-//
-// A proto file with extensions.
-
-syntax = "proto2";
-
-package protobuf_unittest;
-
-
-message MessageToBeExtended {
-  extensions 1 to max;
-}
-
-message MyNonNestedExtension {}
-
-extend MessageToBeExtended {
-  optional MyNonNestedExtension nonNestedExtension = 1;
-  optional string if = 2000;
-}
diff --git a/libs/protobuf/java/core/src/test/proto/com/google/protobuf/non_nested_extension_lite.proto b/libs/protobuf/java/core/src/test/proto/com/google/protobuf/non_nested_extension_lite.proto
deleted file mode 100644
index 782a1e6..0000000
--- a/libs/protobuf/java/core/src/test/proto/com/google/protobuf/non_nested_extension_lite.proto
+++ /dev/null
@@ -1,50 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: Darick Tong (darick@google.com)
-//
-// A proto file with extensions for a MessageLite messages.
-
-syntax = "proto2";
-
-package protobuf_unittest;
-
-option optimize_for = LITE_RUNTIME;
-
-message MessageLiteToBeExtended {
-  extensions 1 to max;
-}
-
-message MyNonNestedExtensionLite {}
-
-extend MessageLiteToBeExtended {
-  optional MyNonNestedExtensionLite nonNestedExtensionLite = 1;
-  optional bool package = 2006;
-}
diff --git a/libs/protobuf/java/core/src/test/proto/com/google/protobuf/outer_class_name_test.proto b/libs/protobuf/java/core/src/test/proto/com/google/protobuf/outer_class_name_test.proto
deleted file mode 100644
index 28b8bb5..0000000
--- a/libs/protobuf/java/core/src/test/proto/com/google/protobuf/outer_class_name_test.proto
+++ /dev/null
@@ -1,39 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto2";
-
-package protobuf_unittest;
-
-
-// This message's name is the same with the default outer class name of this
-// proto file. It's used to test if the compiler can avoid this conflict
-// correctly.
-message OuterClassNameTest {}
diff --git a/libs/protobuf/java/core/src/test/proto/com/google/protobuf/outer_class_name_test2.proto b/libs/protobuf/java/core/src/test/proto/com/google/protobuf/outer_class_name_test2.proto
deleted file mode 100644
index b475510..0000000
--- a/libs/protobuf/java/core/src/test/proto/com/google/protobuf/outer_class_name_test2.proto
+++ /dev/null
@@ -1,43 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto2";
-
-package protobuf_unittest;
-
-
-message TestMessage2 {
-  message NestedMessage {
-    // This message's name is the same with the default outer class name of this
-    // proto file. It's used to test if the compiler can avoid this conflict
-    // correctly.
-    message OuterClassNameTest2 {}
-  }
-}
diff --git a/libs/protobuf/java/core/src/test/proto/com/google/protobuf/outer_class_name_test3.proto b/libs/protobuf/java/core/src/test/proto/com/google/protobuf/outer_class_name_test3.proto
deleted file mode 100644
index e5ef2f0..0000000
--- a/libs/protobuf/java/core/src/test/proto/com/google/protobuf/outer_class_name_test3.proto
+++ /dev/null
@@ -1,43 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto2";
-
-package protobuf_unittest;
-
-
-message TestMessage3 {
-  message NestedMessage {
-    // This enum's name is the same with the default outer class name of this
-    // proto file. It's used to test if the compiler can avoid this conflict
-    // correctly.
-    enum OuterClassNameTest3 { DUMMY_VALUE = 1; }
-  }
-}
diff --git a/libs/protobuf/java/core/src/test/proto/com/google/protobuf/packed_field_test.proto b/libs/protobuf/java/core/src/test/proto/com/google/protobuf/packed_field_test.proto
deleted file mode 100644
index 7935322..0000000
--- a/libs/protobuf/java/core/src/test/proto/com/google/protobuf/packed_field_test.proto
+++ /dev/null
@@ -1,76 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto3";
-
-package packed_field_test;
-
-option java_package = "com.google.protobuf";
-option java_outer_classname = "PackedFieldTestProto";
-
-message TestAllTypes {
-  enum NestedEnum {
-    FOO = 0;
-    BAR = 1;
-    BAZ = 2;
-  }
-
-  repeated int32 repeated_int32 = 31;
-  repeated int64 repeated_int64 = 32;
-  repeated uint32 repeated_uint32 = 33;
-  repeated uint64 repeated_uint64 = 34;
-  repeated sint32 repeated_sint32 = 35;
-  repeated sint64 repeated_sint64 = 36;
-  repeated fixed32 repeated_fixed32 = 37;
-  repeated fixed64 repeated_fixed64 = 38;
-  repeated sfixed32 repeated_sfixed32 = 39;
-  repeated sfixed64 repeated_sfixed64 = 40;
-  repeated float repeated_float = 41;
-  repeated double repeated_double = 42;
-  repeated bool repeated_bool = 43;
-  repeated NestedEnum repeated_nested_enum = 51;
-}
-
-message TestUnpackedTypes {
-  repeated int32 repeated_int32 = 1 [packed = false];
-  repeated int64 repeated_int64 = 2 [packed = false];
-  repeated uint32 repeated_uint32 = 3 [packed = false];
-  repeated uint64 repeated_uint64 = 4 [packed = false];
-  repeated sint32 repeated_sint32 = 5 [packed = false];
-  repeated sint64 repeated_sint64 = 6 [packed = false];
-  repeated fixed32 repeated_fixed32 = 7 [packed = false];
-  repeated fixed64 repeated_fixed64 = 8 [packed = false];
-  repeated sfixed32 repeated_sfixed32 = 9 [packed = false];
-  repeated sfixed64 repeated_sfixed64 = 10 [packed = false];
-  repeated float repeated_float = 11 [packed = false];
-  repeated double repeated_double = 12 [packed = false];
-  repeated bool repeated_bool = 13 [packed = false];
-  repeated TestAllTypes.NestedEnum repeated_nested_enum = 14 [packed = false];
-}
diff --git a/libs/protobuf/java/core/src/test/proto/com/google/protobuf/proto2_message.proto b/libs/protobuf/java/core/src/test/proto/com/google/protobuf/proto2_message.proto
deleted file mode 100644
index 86c48b0..0000000
--- a/libs/protobuf/java/core/src/test/proto/com/google/protobuf/proto2_message.proto
+++ /dev/null
@@ -1,430 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// LINT: ALLOW_GROUPS
-syntax = "proto2";
-
-package protobuf.experimental;
-
-option java_package = "com.google.protobuf.testing";
-option java_outer_classname = "Proto2Testing";
-
-
-message Proto2SpecialFieldName {
-  optional double regular_name = 1;
-  optional int32 cached_size = 2;
-  optional int64 serialized_size = 3;
-  optional string class = 4;
-}
-
-message Proto2Message {
-
-  enum TestEnum {
-    ZERO = 0;
-    ONE = 1;
-    TWO = 2;
-  }
-
-  optional double field_double_1 = 1;
-  optional float field_float_2 = 2;
-  optional int64 field_int64_3 = 3;
-  optional uint64 field_uint64_4 = 4;
-  optional int32 field_int32_5 = 5;
-  optional fixed64 field_fixed64_6 = 6;
-  optional fixed32 field_fixed32_7 = 7;
-  optional bool field_bool_8 = 8;
-  optional string field_string_9 = 9;
-  optional Proto2Message field_message_10 = 10;
-  optional bytes field_bytes_11 = 11;
-  optional uint32 field_uint32_12 = 12;
-  optional TestEnum field_enum_13 = 13;
-  optional sfixed32 field_sfixed32_14 = 14;
-  optional sfixed64 field_sfixed64_15 = 15;
-  optional sint32 field_sint32_16 = 16;
-  optional sint64 field_sint64_17 = 17;
-  repeated double field_double_list_18 = 18 [packed = false];
-  repeated float field_float_list_19 = 19 [packed = false];
-  repeated int64 field_int64_list_20 = 20 [packed = false];
-  repeated uint64 field_uint64_list_21 = 21 [packed = false];
-  repeated int32 field_int32_list_22 = 22 [packed = false];
-  repeated fixed64 field_fixed64_list_23 = 23 [packed = false];
-  repeated fixed32 field_fixed32_list_24 = 24 [packed = false];
-  repeated bool field_bool_list_25 = 25 [packed = false];
-  repeated string field_string_list_26 = 26 [packed = false];
-  repeated Proto2Message field_message_list_27 = 27 [packed = false];
-  repeated bytes field_bytes_list_28 = 28 [packed = false];
-  repeated uint32 field_uint32_list_29 = 29 [packed = false];
-  repeated TestEnum field_enum_list_30 = 30 [packed = false];
-  repeated sfixed32 field_sfixed32_list_31 = 31 [packed = false];
-  repeated sfixed64 field_sfixed64_list_32 = 32 [packed = false];
-  repeated sint32 field_sint32_list_33 = 33 [packed = false];
-  repeated sint64 field_sint64_list_34 = 34 [packed = false];
-  repeated double field_double_list_packed_35 = 35 [packed = true];
-  repeated float field_float_list_packed_36 = 36 [packed = true];
-  repeated int64 field_int64_list_packed_37 = 37 [packed = true];
-  repeated uint64 field_uint64_list_packed_38 = 38 [packed = true];
-  repeated int32 field_int32_list_packed_39 = 39 [packed = true];
-  repeated fixed64 field_fixed64_list_packed_40 = 40 [packed = true];
-  repeated fixed32 field_fixed32_list_packed_41 = 41 [packed = true];
-  repeated bool field_bool_list_packed_42 = 42 [packed = true];
-  repeated uint32 field_uint32_list_packed_43 = 43 [packed = true];
-  repeated TestEnum field_enum_list_packed_44 = 44 [packed = true];
-  repeated sfixed32 field_sfixed32_list_packed_45 = 45 [packed = true];
-  repeated sfixed64 field_sfixed64_list_packed_46 = 46 [packed = true];
-  repeated sint32 field_sint32_list_packed_47 = 47 [packed = true];
-  repeated sint64 field_sint64_list_packed_48 = 48 [packed = true];
-  optional group FieldGroup49 = 49 {
-    optional int32 field_int32_50 = 50;
-  }
-  repeated group FieldGroupList51 = 51 {
-    optional int32 field_int32_52 = 52;
-  }
-  oneof test_oneof {
-    double field_double_53 = 53;
-    float field_float_54 = 54;
-    int64 field_int64_55 = 55;
-    uint64 field_uint64_56 = 56;
-    int32 field_int32_57 = 57;
-    fixed64 field_fixed64_58 = 58;
-    fixed32 field_fixed32_59 = 59;
-    bool field_bool_60 = 60;
-    string field_string_61 = 61;
-    Proto2Message field_message_62 = 62;
-    bytes field_bytes_63 = 63;
-    uint32 field_uint32_64 = 64;
-    sfixed32 field_sfixed32_65 = 65;
-    sfixed64 field_sfixed64_66 = 66;
-    sint32 field_sint32_67 = 67;
-    sint64 field_sint64_68 = 68;
-    group FieldGroup69 = 69 {
-      optional int32 field_int32_70 = 70;
-    }
-  }
-
-  message RequiredNestedMessage {
-    optional int32 value = 1;
-  }
-
-  required double field_required_double_71 = 71;
-  required float field_required_float_72 = 72;
-  required int64 field_required_int64_73 = 73;
-  required uint64 field_required_uint64_74 = 74;
-  required int32 field_required_int32_75 = 75;
-  required fixed64 field_required_fixed64_76 = 76;
-  required fixed32 field_required_fixed32_77 = 77;
-  required bool field_required_bool_78 = 78;
-  required string field_required_string_79 = 79;
-  required RequiredNestedMessage field_required_message_80 = 80;
-  required bytes field_required_bytes_81 = 81;
-  required uint32 field_required_uint32_82 = 82;
-  required TestEnum field_required_enum_83 = 83;
-  required sfixed32 field_required_sfixed32_84 = 84;
-  required sfixed64 field_required_sfixed64_85 = 85;
-  required sint32 field_required_sint32_86 = 86;
-  required sint64 field_required_sint64_87 = 87;
-  required group FieldRequiredGroup88 = 88 {
-    optional int32 field_int32_89 = 89;
-  }
-}
-
-message Proto2Empty {}
-
-message Proto2MessageWithExtensions {
-  extensions 1 to 10000;
-}
-
-extend Proto2MessageWithExtensions {
-  optional double field_double_1 = 1;
-  optional float field_float_2 = 2;
-  optional int64 field_int64_3 = 3;
-  optional uint64 field_uint64_4 = 4;
-  optional int32 field_int32_5 = 5;
-  optional fixed64 field_fixed64_6 = 6;
-  optional fixed32 field_fixed32_7 = 7;
-  optional bool field_bool_8 = 8;
-  optional string field_string_9 = 9;
-  optional Proto2Message field_message_10 = 10;
-  optional bytes field_bytes_11 = 11;
-  optional uint32 field_uint32_12 = 12;
-  optional Proto2Message.TestEnum field_enum_13 = 13;
-  optional sfixed32 field_sfixed32_14 = 14;
-  optional sfixed64 field_sfixed64_15 = 15;
-  optional sint32 field_sint32_16 = 16;
-  optional sint64 field_sint64_17 = 17;
-
-  repeated double field_double_list_18 = 18 [packed = false];
-  repeated float field_float_list_19 = 19 [packed = false];
-  repeated int64 field_int64_list_20 = 20 [packed = false];
-  repeated uint64 field_uint64_list_21 = 21 [packed = false];
-  repeated int32 field_int32_list_22 = 22 [packed = false];
-  repeated fixed64 field_fixed64_list_23 = 23 [packed = false];
-  repeated fixed32 field_fixed32_list_24 = 24 [packed = false];
-  repeated bool field_bool_list_25 = 25 [packed = false];
-  repeated string field_string_list_26 = 26 [packed = false];
-  repeated Proto2Message field_message_list_27 = 27 [packed = false];
-  repeated bytes field_bytes_list_28 = 28 [packed = false];
-  repeated uint32 field_uint32_list_29 = 29 [packed = false];
-  repeated Proto2Message.TestEnum field_enum_list_30 = 30 [packed = false];
-  repeated sfixed32 field_sfixed32_list_31 = 31 [packed = false];
-  repeated sfixed64 field_sfixed64_list_32 = 32 [packed = false];
-  repeated sint32 field_sint32_list_33 = 33 [packed = false];
-  repeated sint64 field_sint64_list_34 = 34 [packed = false];
-
-  repeated double field_double_list_packed_35 = 35 [packed = true];
-  repeated float field_float_list_packed_36 = 36 [packed = true];
-  repeated int64 field_int64_list_packed_37 = 37 [packed = true];
-  repeated uint64 field_uint64_list_packed_38 = 38 [packed = true];
-  repeated int32 field_int32_list_packed_39 = 39 [packed = true];
-  repeated fixed64 field_fixed64_list_packed_40 = 40 [packed = true];
-  repeated fixed32 field_fixed32_list_packed_41 = 41 [packed = true];
-  repeated bool field_bool_list_packed_42 = 42 [packed = true];
-  repeated uint32 field_uint32_list_packed_43 = 43 [packed = true];
-  repeated Proto2Message.TestEnum field_enum_list_packed_44 = 44
-      [packed = true];
-  repeated sfixed32 field_sfixed32_list_packed_45 = 45 [packed = true];
-  repeated sfixed64 field_sfixed64_list_packed_46 = 46 [packed = true];
-  repeated sint32 field_sint32_list_packed_47 = 47 [packed = true];
-  repeated sint64 field_sint64_list_packed_48 = 48 [packed = true];
-
-  optional group FieldGroup49 = 49 {
-    optional int32 field_int32_50 = 50;
-  }
-
-  repeated group FieldGroupList51 = 51 {
-    optional int32 field_int32_52 = 52;
-  }
-}
-
-message Proto2MessageWithMaps {
-  map<bool, bool> field_map_bool_bool_1 = 1;
-  map<bool, bytes> field_map_bool_bytes_2 = 2;
-  map<bool, double> field_map_bool_double_3 = 3;
-  map<bool, Proto2Message.TestEnum> field_map_bool_enum_4 = 4;
-  map<bool, fixed32> field_map_bool_fixed32_5 = 5;
-  map<bool, fixed64> field_map_bool_fixed64_6 = 6;
-  map<bool, float> field_map_bool_float_7 = 7;
-  map<bool, int32> field_map_bool_int32_8 = 8;
-  map<bool, int64> field_map_bool_int64_9 = 9;
-  map<bool, Proto2Message> field_map_bool_message_10 = 10;
-  map<bool, sfixed32> field_map_bool_sfixed32_11 = 11;
-  map<bool, sfixed64> field_map_bool_sfixed64_12 = 12;
-  map<bool, sint32> field_map_bool_sint32_13 = 13;
-  map<bool, sint64> field_map_bool_sint64_14 = 14;
-  map<bool, string> field_map_bool_string_15 = 15;
-  map<bool, uint32> field_map_bool_uint32_16 = 16;
-  map<bool, uint64> field_map_bool_uint64_17 = 17;
-  map<fixed32, bool> field_map_fixed32_bool_18 = 18;
-  map<fixed32, bytes> field_map_fixed32_bytes_19 = 19;
-  map<fixed32, double> field_map_fixed32_double_20 = 20;
-  map<fixed32, Proto2Message.TestEnum> field_map_fixed32_enum_21 = 21;
-  map<fixed32, fixed32> field_map_fixed32_fixed32_22 = 22;
-  map<fixed32, fixed64> field_map_fixed32_fixed64_23 = 23;
-  map<fixed32, float> field_map_fixed32_float_24 = 24;
-  map<fixed32, int32> field_map_fixed32_int32_25 = 25;
-  map<fixed32, int64> field_map_fixed32_int64_26 = 26;
-  map<fixed32, Proto2Message> field_map_fixed32_message_27 = 27;
-  map<fixed32, sfixed32> field_map_fixed32_sfixed32_28 = 28;
-  map<fixed32, sfixed64> field_map_fixed32_sfixed64_29 = 29;
-  map<fixed32, sint32> field_map_fixed32_sint32_30 = 30;
-  map<fixed32, sint64> field_map_fixed32_sint64_31 = 31;
-  map<fixed32, string> field_map_fixed32_string_32 = 32;
-  map<fixed32, uint32> field_map_fixed32_uint32_33 = 33;
-  map<fixed32, uint64> field_map_fixed32_uint64_34 = 34;
-  map<fixed64, bool> field_map_fixed64_bool_35 = 35;
-  map<fixed64, bytes> field_map_fixed64_bytes_36 = 36;
-  map<fixed64, double> field_map_fixed64_double_37 = 37;
-  map<fixed64, Proto2Message.TestEnum> field_map_fixed64_enum_38 = 38;
-  map<fixed64, fixed32> field_map_fixed64_fixed32_39 = 39;
-  map<fixed64, fixed64> field_map_fixed64_fixed64_40 = 40;
-  map<fixed64, float> field_map_fixed64_float_41 = 41;
-  map<fixed64, int32> field_map_fixed64_int32_42 = 42;
-  map<fixed64, int64> field_map_fixed64_int64_43 = 43;
-  map<fixed64, Proto2Message> field_map_fixed64_message_44 = 44;
-  map<fixed64, sfixed32> field_map_fixed64_sfixed32_45 = 45;
-  map<fixed64, sfixed64> field_map_fixed64_sfixed64_46 = 46;
-  map<fixed64, sint32> field_map_fixed64_sint32_47 = 47;
-  map<fixed64, sint64> field_map_fixed64_sint64_48 = 48;
-  map<fixed64, string> field_map_fixed64_string_49 = 49;
-  map<fixed64, uint32> field_map_fixed64_uint32_50 = 50;
-  map<fixed64, uint64> field_map_fixed64_uint64_51 = 51;
-  map<int32, bool> field_map_int32_bool_52 = 52;
-  map<int32, bytes> field_map_int32_bytes_53 = 53;
-  map<int32, double> field_map_int32_double_54 = 54;
-  map<int32, Proto2Message.TestEnum> field_map_int32_enum_55 = 55;
-  map<int32, fixed32> field_map_int32_fixed32_56 = 56;
-  map<int32, fixed64> field_map_int32_fixed64_57 = 57;
-  map<int32, float> field_map_int32_float_58 = 58;
-  map<int32, int32> field_map_int32_int32_59 = 59;
-  map<int32, int64> field_map_int32_int64_60 = 60;
-  map<int32, Proto2Message> field_map_int32_message_61 = 61;
-  map<int32, sfixed32> field_map_int32_sfixed32_62 = 62;
-  map<int32, sfixed64> field_map_int32_sfixed64_63 = 63;
-  map<int32, sint32> field_map_int32_sint32_64 = 64;
-  map<int32, sint64> field_map_int32_sint64_65 = 65;
-  map<int32, string> field_map_int32_string_66 = 66;
-  map<int32, uint32> field_map_int32_uint32_67 = 67;
-  map<int32, uint64> field_map_int32_uint64_68 = 68;
-  map<int64, bool> field_map_int64_bool_69 = 69;
-  map<int64, bytes> field_map_int64_bytes_70 = 70;
-  map<int64, double> field_map_int64_double_71 = 71;
-  map<int64, Proto2Message.TestEnum> field_map_int64_enum_72 = 72;
-  map<int64, fixed32> field_map_int64_fixed32_73 = 73;
-  map<int64, fixed64> field_map_int64_fixed64_74 = 74;
-  map<int64, float> field_map_int64_float_75 = 75;
-  map<int64, int32> field_map_int64_int32_76 = 76;
-  map<int64, int64> field_map_int64_int64_77 = 77;
-  map<int64, Proto2Message> field_map_int64_message_78 = 78;
-  map<int64, sfixed32> field_map_int64_sfixed32_79 = 79;
-  map<int64, sfixed64> field_map_int64_sfixed64_80 = 80;
-  map<int64, sint32> field_map_int64_sint32_81 = 81;
-  map<int64, sint64> field_map_int64_sint64_82 = 82;
-  map<int64, string> field_map_int64_string_83 = 83;
-  map<int64, uint32> field_map_int64_uint32_84 = 84;
-  map<int64, uint64> field_map_int64_uint64_85 = 85;
-  map<sfixed32, bool> field_map_sfixed32_bool_86 = 86;
-  map<sfixed32, bytes> field_map_sfixed32_bytes_87 = 87;
-  map<sfixed32, double> field_map_sfixed32_double_88 = 88;
-  map<sfixed32, Proto2Message.TestEnum> field_map_sfixed32_enum_89 = 89;
-  map<sfixed32, fixed32> field_map_sfixed32_fixed32_90 = 90;
-  map<sfixed32, fixed64> field_map_sfixed32_fixed64_91 = 91;
-  map<sfixed32, float> field_map_sfixed32_float_92 = 92;
-  map<sfixed32, int32> field_map_sfixed32_int32_93 = 93;
-  map<sfixed32, int64> field_map_sfixed32_int64_94 = 94;
-  map<sfixed32, Proto2Message> field_map_sfixed32_message_95 = 95;
-  map<sfixed32, sfixed32> field_map_sfixed32_sfixed32_96 = 96;
-  map<sfixed32, sfixed64> field_map_sfixed32_sfixed64_97 = 97;
-  map<sfixed32, sint32> field_map_sfixed32_sint32_98 = 98;
-  map<sfixed32, sint64> field_map_sfixed32_sint64_99 = 99;
-  map<sfixed32, string> field_map_sfixed32_string_100 = 100;
-  map<sfixed32, uint32> field_map_sfixed32_uint32_101 = 101;
-  map<sfixed32, uint64> field_map_sfixed32_uint64_102 = 102;
-  map<sfixed64, bool> field_map_sfixed64_bool_103 = 103;
-  map<sfixed64, bytes> field_map_sfixed64_bytes_104 = 104;
-  map<sfixed64, double> field_map_sfixed64_double_105 = 105;
-  map<sfixed64, Proto2Message.TestEnum> field_map_sfixed64_enum_106 = 106;
-  map<sfixed64, fixed32> field_map_sfixed64_fixed32_107 = 107;
-  map<sfixed64, fixed64> field_map_sfixed64_fixed64_108 = 108;
-  map<sfixed64, float> field_map_sfixed64_float_109 = 109;
-  map<sfixed64, int32> field_map_sfixed64_int32_110 = 110;
-  map<sfixed64, int64> field_map_sfixed64_int64_111 = 111;
-  map<sfixed64, Proto2Message> field_map_sfixed64_message_112 = 112;
-  map<sfixed64, sfixed32> field_map_sfixed64_sfixed32_113 = 113;
-  map<sfixed64, sfixed64> field_map_sfixed64_sfixed64_114 = 114;
-  map<sfixed64, sint32> field_map_sfixed64_sint32_115 = 115;
-  map<sfixed64, sint64> field_map_sfixed64_sint64_116 = 116;
-  map<sfixed64, string> field_map_sfixed64_string_117 = 117;
-  map<sfixed64, uint32> field_map_sfixed64_uint32_118 = 118;
-  map<sfixed64, uint64> field_map_sfixed64_uint64_119 = 119;
-  map<sint32, bool> field_map_sint32_bool_120 = 120;
-  map<sint32, bytes> field_map_sint32_bytes_121 = 121;
-  map<sint32, double> field_map_sint32_double_122 = 122;
-  map<sint32, Proto2Message.TestEnum> field_map_sint32_enum_123 = 123;
-  map<sint32, fixed32> field_map_sint32_fixed32_124 = 124;
-  map<sint32, fixed64> field_map_sint32_fixed64_125 = 125;
-  map<sint32, float> field_map_sint32_float_126 = 126;
-  map<sint32, int32> field_map_sint32_int32_127 = 127;
-  map<sint32, int64> field_map_sint32_int64_128 = 128;
-  map<sint32, Proto2Message> field_map_sint32_message_129 = 129;
-  map<sint32, sfixed32> field_map_sint32_sfixed32_130 = 130;
-  map<sint32, sfixed64> field_map_sint32_sfixed64_131 = 131;
-  map<sint32, sint32> field_map_sint32_sint32_132 = 132;
-  map<sint32, sint64> field_map_sint32_sint64_133 = 133;
-  map<sint32, string> field_map_sint32_string_134 = 134;
-  map<sint32, uint32> field_map_sint32_uint32_135 = 135;
-  map<sint32, uint64> field_map_sint32_uint64_136 = 136;
-  map<sint64, bool> field_map_sint64_bool_137 = 137;
-  map<sint64, bytes> field_map_sint64_bytes_138 = 138;
-  map<sint64, double> field_map_sint64_double_139 = 139;
-  map<sint64, Proto2Message.TestEnum> field_map_sint64_enum_140 = 140;
-  map<sint64, fixed32> field_map_sint64_fixed32_141 = 141;
-  map<sint64, fixed64> field_map_sint64_fixed64_142 = 142;
-  map<sint64, float> field_map_sint64_float_143 = 143;
-  map<sint64, int32> field_map_sint64_int32_144 = 144;
-  map<sint64, int64> field_map_sint64_int64_145 = 145;
-  map<sint64, Proto2Message> field_map_sint64_message_146 = 146;
-  map<sint64, sfixed32> field_map_sint64_sfixed32_147 = 147;
-  map<sint64, sfixed64> field_map_sint64_sfixed64_148 = 148;
-  map<sint64, sint32> field_map_sint64_sint32_149 = 149;
-  map<sint64, sint64> field_map_sint64_sint64_150 = 150;
-  map<sint64, string> field_map_sint64_string_151 = 151;
-  map<sint64, uint32> field_map_sint64_uint32_152 = 152;
-  map<sint64, uint64> field_map_sint64_uint64_153 = 153;
-  map<string, bool> field_map_string_bool_154 = 154;
-  map<string, bytes> field_map_string_bytes_155 = 155;
-  map<string, double> field_map_string_double_156 = 156;
-  map<string, Proto2Message.TestEnum> field_map_string_enum_157 = 157;
-  map<string, fixed32> field_map_string_fixed32_158 = 158;
-  map<string, fixed64> field_map_string_fixed64_159 = 159;
-  map<string, float> field_map_string_float_160 = 160;
-  map<string, int32> field_map_string_int32_161 = 161;
-  map<string, int64> field_map_string_int64_162 = 162;
-  map<string, Proto2Message> field_map_string_message_163 = 163;
-  map<string, sfixed32> field_map_string_sfixed32_164 = 164;
-  map<string, sfixed64> field_map_string_sfixed64_165 = 165;
-  map<string, sint32> field_map_string_sint32_166 = 166;
-  map<string, sint64> field_map_string_sint64_167 = 167;
-  map<string, string> field_map_string_string_168 = 168;
-  map<string, uint32> field_map_string_uint32_169 = 169;
-  map<string, uint64> field_map_string_uint64_170 = 170;
-  map<uint32, bool> field_map_uint32_bool_171 = 171;
-  map<uint32, bytes> field_map_uint32_bytes_172 = 172;
-  map<uint32, double> field_map_uint32_double_173 = 173;
-  map<uint32, Proto2Message.TestEnum> field_map_uint32_enum_174 = 174;
-  map<uint32, fixed32> field_map_uint32_fixed32_175 = 175;
-  map<uint32, fixed64> field_map_uint32_fixed64_176 = 176;
-  map<uint32, float> field_map_uint32_float_177 = 177;
-  map<uint32, int32> field_map_uint32_int32_178 = 178;
-  map<uint32, int64> field_map_uint32_int64_179 = 179;
-  map<uint32, Proto2Message> field_map_uint32_message_180 = 180;
-  map<uint32, sfixed32> field_map_uint32_sfixed32_181 = 181;
-  map<uint32, sfixed64> field_map_uint32_sfixed64_182 = 182;
-  map<uint32, sint32> field_map_uint32_sint32_183 = 183;
-  map<uint32, sint64> field_map_uint32_sint64_184 = 184;
-  map<uint32, string> field_map_uint32_string_185 = 185;
-  map<uint32, uint32> field_map_uint32_uint32_186 = 186;
-  map<uint32, uint64> field_map_uint32_uint64_187 = 187;
-  map<uint64, bool> field_map_uint64_bool_188 = 188;
-  map<uint64, bytes> field_map_uint64_bytes_189 = 189;
-  map<uint64, double> field_map_uint64_double_190 = 190;
-  map<uint64, Proto2Message.TestEnum> field_map_uint64_enum_191 = 191;
-  map<uint64, fixed32> field_map_uint64_fixed32_192 = 192;
-  map<uint64, fixed64> field_map_uint64_fixed64_193 = 193;
-  map<uint64, float> field_map_uint64_float_194 = 194;
-  map<uint64, int32> field_map_uint64_int32_195 = 195;
-  map<uint64, int64> field_map_uint64_int64_196 = 196;
-  map<uint64, Proto2Message> field_map_uint64_message_197 = 197;
-  map<uint64, sfixed32> field_map_uint64_sfixed32_198 = 198;
-  map<uint64, sfixed64> field_map_uint64_sfixed64_199 = 199;
-  map<uint64, sint32> field_map_uint64_sint32_200 = 200;
-  map<uint64, sint64> field_map_uint64_sint64_201 = 201;
-  map<uint64, string> field_map_uint64_string_202 = 202;
-  map<uint64, uint32> field_map_uint64_uint32_203 = 203;
-  map<uint64, uint64> field_map_uint64_uint64_204 = 204;
-}
diff --git a/libs/protobuf/java/core/src/test/proto/com/google/protobuf/proto2_message_lite.proto b/libs/protobuf/java/core/src/test/proto/com/google/protobuf/proto2_message_lite.proto
deleted file mode 100644
index 7dfd40e..0000000
--- a/libs/protobuf/java/core/src/test/proto/com/google/protobuf/proto2_message_lite.proto
+++ /dev/null
@@ -1,423 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// LINT: ALLOW_GROUPS
-syntax = "proto2";
-
-package protobuf.experimental.lite;
-
-option java_package = "com.google.protobuf.testing";
-option java_outer_classname = "Proto2TestingLite";
-
-
-message Proto2MessageLite {
-
-  enum TestEnum {
-    ZERO = 0;
-    ONE = 1;
-    TWO = 2;
-  }
-
-  optional double field_double_1 = 1;
-  optional float field_float_2 = 2;
-  optional int64 field_int64_3 = 3;
-  optional uint64 field_uint64_4 = 4;
-  optional int32 field_int32_5 = 5;
-  optional fixed64 field_fixed64_6 = 6;
-  optional fixed32 field_fixed32_7 = 7;
-  optional bool field_bool_8 = 8;
-  optional string field_string_9 = 9;
-  optional Proto2MessageLite field_message_10 = 10;
-  optional bytes field_bytes_11 = 11;
-  optional uint32 field_uint32_12 = 12;
-  optional TestEnum field_enum_13 = 13;
-  optional sfixed32 field_sfixed32_14 = 14;
-  optional sfixed64 field_sfixed64_15 = 15;
-  optional sint32 field_sint32_16 = 16;
-  optional sint64 field_sint64_17 = 17;
-  repeated double field_double_list_18 = 18 [packed = false];
-  repeated float field_float_list_19 = 19 [packed = false];
-  repeated int64 field_int64_list_20 = 20 [packed = false];
-  repeated uint64 field_uint64_list_21 = 21 [packed = false];
-  repeated int32 field_int32_list_22 = 22 [packed = false];
-  repeated fixed64 field_fixed64_list_23 = 23 [packed = false];
-  repeated fixed32 field_fixed32_list_24 = 24 [packed = false];
-  repeated bool field_bool_list_25 = 25 [packed = false];
-  repeated string field_string_list_26 = 26 [packed = false];
-  repeated Proto2MessageLite field_message_list_27 = 27 [packed = false];
-  repeated bytes field_bytes_list_28 = 28 [packed = false];
-  repeated uint32 field_uint32_list_29 = 29 [packed = false];
-  repeated TestEnum field_enum_list_30 = 30 [packed = false];
-  repeated sfixed32 field_sfixed32_list_31 = 31 [packed = false];
-  repeated sfixed64 field_sfixed64_list_32 = 32 [packed = false];
-  repeated sint32 field_sint32_list_33 = 33 [packed = false];
-  repeated sint64 field_sint64_list_34 = 34 [packed = false];
-  repeated double field_double_list_packed_35 = 35 [packed = true];
-  repeated float field_float_list_packed_36 = 36 [packed = true];
-  repeated int64 field_int64_list_packed_37 = 37 [packed = true];
-  repeated uint64 field_uint64_list_packed_38 = 38 [packed = true];
-  repeated int32 field_int32_list_packed_39 = 39 [packed = true];
-  repeated fixed64 field_fixed64_list_packed_40 = 40 [packed = true];
-  repeated fixed32 field_fixed32_list_packed_41 = 41 [packed = true];
-  repeated bool field_bool_list_packed_42 = 42 [packed = true];
-  repeated uint32 field_uint32_list_packed_43 = 43 [packed = true];
-  repeated TestEnum field_enum_list_packed_44 = 44 [packed = true];
-  repeated sfixed32 field_sfixed32_list_packed_45 = 45 [packed = true];
-  repeated sfixed64 field_sfixed64_list_packed_46 = 46 [packed = true];
-  repeated sint32 field_sint32_list_packed_47 = 47 [packed = true];
-  repeated sint64 field_sint64_list_packed_48 = 48 [packed = true];
-  optional group FieldGroup49 = 49 {
-    optional int32 field_int32_50 = 50;
-  }
-  repeated group FieldGroupList51 = 51 {
-    optional int32 field_int32_52 = 52;
-  }
-  oneof test_oneof {
-    double field_double_53 = 53;
-    float field_float_54 = 54;
-    int64 field_int64_55 = 55;
-    uint64 field_uint64_56 = 56;
-    int32 field_int32_57 = 57;
-    fixed64 field_fixed64_58 = 58;
-    fixed32 field_fixed32_59 = 59;
-    bool field_bool_60 = 60;
-    string field_string_61 = 61;
-    Proto2MessageLite field_message_62 = 62;
-    bytes field_bytes_63 = 63;
-    uint32 field_uint32_64 = 64;
-    sfixed32 field_sfixed32_65 = 65;
-    sfixed64 field_sfixed64_66 = 66;
-    sint32 field_sint32_67 = 67;
-    sint64 field_sint64_68 = 68;
-    group FieldGroup69 = 69 {
-      optional int32 field_int32_70 = 70;
-    }
-  }
-
-  message RequiredNestedMessage {
-    optional int32 value = 1;
-  }
-
-  required double field_required_double_71 = 71;
-  required float field_required_float_72 = 72;
-  required int64 field_required_int64_73 = 73;
-  required uint64 field_required_uint64_74 = 74;
-  required int32 field_required_int32_75 = 75;
-  required fixed64 field_required_fixed64_76 = 76;
-  required fixed32 field_required_fixed32_77 = 77;
-  required bool field_required_bool_78 = 78;
-  required string field_required_string_79 = 79;
-  required RequiredNestedMessage field_required_message_80 = 80;
-  required bytes field_required_bytes_81 = 81;
-  required uint32 field_required_uint32_82 = 82;
-  required TestEnum field_required_enum_83 = 83;
-  required sfixed32 field_required_sfixed32_84 = 84;
-  required sfixed64 field_required_sfixed64_85 = 85;
-  required sint32 field_required_sint32_86 = 86;
-  required sint64 field_required_sint64_87 = 87;
-  required group FieldRequiredGroup88 = 88 {
-    optional int32 field_int32_89 = 89;
-  }
-}
-
-message Proto2EmptyLite {}
-
-message Proto2MessageLiteWithExtensions {
-  extensions 1 to max;
-}
-
-extend Proto2MessageLiteWithExtensions {
-  optional double field_double_1 = 1;
-  optional float field_float_2 = 2;
-  optional int64 field_int64_3 = 3;
-  optional uint64 field_uint64_4 = 4;
-  optional int32 field_int32_5 = 5;
-  optional fixed64 field_fixed64_6 = 6;
-  optional fixed32 field_fixed32_7 = 7;
-  optional bool field_bool_8 = 8;
-  optional string field_string_9 = 9;
-  optional Proto2MessageLite field_message_10 = 10;
-  optional bytes field_bytes_11 = 11;
-  optional uint32 field_uint32_12 = 12;
-  optional Proto2MessageLite.TestEnum field_enum_13 = 13;
-  optional sfixed32 field_sfixed32_14 = 14;
-  optional sfixed64 field_sfixed64_15 = 15;
-  optional sint32 field_sint32_16 = 16;
-  optional sint64 field_sint64_17 = 17;
-
-  repeated double field_double_list_18 = 18 [packed = false];
-  repeated float field_float_list_19 = 19 [packed = false];
-  repeated int64 field_int64_list_20 = 20 [packed = false];
-  repeated uint64 field_uint64_list_21 = 21 [packed = false];
-  repeated int32 field_int32_list_22 = 22 [packed = false];
-  repeated fixed64 field_fixed64_list_23 = 23 [packed = false];
-  repeated fixed32 field_fixed32_list_24 = 24 [packed = false];
-  repeated bool field_bool_list_25 = 25 [packed = false];
-  repeated string field_string_list_26 = 26 [packed = false];
-  repeated Proto2MessageLite field_message_list_27 = 27 [packed = false];
-  repeated bytes field_bytes_list_28 = 28 [packed = false];
-  repeated uint32 field_uint32_list_29 = 29 [packed = false];
-  repeated Proto2MessageLite.TestEnum field_enum_list_30 = 30 [packed = false];
-  repeated sfixed32 field_sfixed32_list_31 = 31 [packed = false];
-  repeated sfixed64 field_sfixed64_list_32 = 32 [packed = false];
-  repeated sint32 field_sint32_list_33 = 33 [packed = false];
-  repeated sint64 field_sint64_list_34 = 34 [packed = false];
-
-  repeated double field_double_list_packed_35 = 35 [packed = true];
-  repeated float field_float_list_packed_36 = 36 [packed = true];
-  repeated int64 field_int64_list_packed_37 = 37 [packed = true];
-  repeated uint64 field_uint64_list_packed_38 = 38 [packed = true];
-  repeated int32 field_int32_list_packed_39 = 39 [packed = true];
-  repeated fixed64 field_fixed64_list_packed_40 = 40 [packed = true];
-  repeated fixed32 field_fixed32_list_packed_41 = 41 [packed = true];
-  repeated bool field_bool_list_packed_42 = 42 [packed = true];
-  repeated uint32 field_uint32_list_packed_43 = 43 [packed = true];
-  repeated Proto2MessageLite.TestEnum field_enum_list_packed_44 = 44
-      [packed = true];
-  repeated sfixed32 field_sfixed32_list_packed_45 = 45 [packed = true];
-  repeated sfixed64 field_sfixed64_list_packed_46 = 46 [packed = true];
-  repeated sint32 field_sint32_list_packed_47 = 47 [packed = true];
-  repeated sint64 field_sint64_list_packed_48 = 48 [packed = true];
-
-  optional group FieldGroup49 = 49 {
-    optional int32 field_int32_50 = 50;
-  }
-
-  repeated group FieldGroupList51 = 51 {
-    optional int32 field_int32_52 = 52;
-  }
-}
-
-message Proto2MessageLiteWithMaps {
-  map<bool, bool> field_map_bool_bool_1 = 1;
-  map<bool, bytes> field_map_bool_bytes_2 = 2;
-  map<bool, double> field_map_bool_double_3 = 3;
-  map<bool, Proto2MessageLite.TestEnum> field_map_bool_enum_4 = 4;
-  map<bool, fixed32> field_map_bool_fixed32_5 = 5;
-  map<bool, fixed64> field_map_bool_fixed64_6 = 6;
-  map<bool, float> field_map_bool_float_7 = 7;
-  map<bool, int32> field_map_bool_int32_8 = 8;
-  map<bool, int64> field_map_bool_int64_9 = 9;
-  map<bool, Proto2MessageLite> field_map_bool_message_10 = 10;
-  map<bool, sfixed32> field_map_bool_sfixed32_11 = 11;
-  map<bool, sfixed64> field_map_bool_sfixed64_12 = 12;
-  map<bool, sint32> field_map_bool_sint32_13 = 13;
-  map<bool, sint64> field_map_bool_sint64_14 = 14;
-  map<bool, string> field_map_bool_string_15 = 15;
-  map<bool, uint32> field_map_bool_uint32_16 = 16;
-  map<bool, uint64> field_map_bool_uint64_17 = 17;
-  map<fixed32, bool> field_map_fixed32_bool_18 = 18;
-  map<fixed32, bytes> field_map_fixed32_bytes_19 = 19;
-  map<fixed32, double> field_map_fixed32_double_20 = 20;
-  map<fixed32, Proto2MessageLite.TestEnum> field_map_fixed32_enum_21 = 21;
-  map<fixed32, fixed32> field_map_fixed32_fixed32_22 = 22;
-  map<fixed32, fixed64> field_map_fixed32_fixed64_23 = 23;
-  map<fixed32, float> field_map_fixed32_float_24 = 24;
-  map<fixed32, int32> field_map_fixed32_int32_25 = 25;
-  map<fixed32, int64> field_map_fixed32_int64_26 = 26;
-  map<fixed32, Proto2MessageLite> field_map_fixed32_message_27 = 27;
-  map<fixed32, sfixed32> field_map_fixed32_sfixed32_28 = 28;
-  map<fixed32, sfixed64> field_map_fixed32_sfixed64_29 = 29;
-  map<fixed32, sint32> field_map_fixed32_sint32_30 = 30;
-  map<fixed32, sint64> field_map_fixed32_sint64_31 = 31;
-  map<fixed32, string> field_map_fixed32_string_32 = 32;
-  map<fixed32, uint32> field_map_fixed32_uint32_33 = 33;
-  map<fixed32, uint64> field_map_fixed32_uint64_34 = 34;
-  map<fixed64, bool> field_map_fixed64_bool_35 = 35;
-  map<fixed64, bytes> field_map_fixed64_bytes_36 = 36;
-  map<fixed64, double> field_map_fixed64_double_37 = 37;
-  map<fixed64, Proto2MessageLite.TestEnum> field_map_fixed64_enum_38 = 38;
-  map<fixed64, fixed32> field_map_fixed64_fixed32_39 = 39;
-  map<fixed64, fixed64> field_map_fixed64_fixed64_40 = 40;
-  map<fixed64, float> field_map_fixed64_float_41 = 41;
-  map<fixed64, int32> field_map_fixed64_int32_42 = 42;
-  map<fixed64, int64> field_map_fixed64_int64_43 = 43;
-  map<fixed64, Proto2MessageLite> field_map_fixed64_message_44 = 44;
-  map<fixed64, sfixed32> field_map_fixed64_sfixed32_45 = 45;
-  map<fixed64, sfixed64> field_map_fixed64_sfixed64_46 = 46;
-  map<fixed64, sint32> field_map_fixed64_sint32_47 = 47;
-  map<fixed64, sint64> field_map_fixed64_sint64_48 = 48;
-  map<fixed64, string> field_map_fixed64_string_49 = 49;
-  map<fixed64, uint32> field_map_fixed64_uint32_50 = 50;
-  map<fixed64, uint64> field_map_fixed64_uint64_51 = 51;
-  map<int32, bool> field_map_int32_bool_52 = 52;
-  map<int32, bytes> field_map_int32_bytes_53 = 53;
-  map<int32, double> field_map_int32_double_54 = 54;
-  map<int32, Proto2MessageLite.TestEnum> field_map_int32_enum_55 = 55;
-  map<int32, fixed32> field_map_int32_fixed32_56 = 56;
-  map<int32, fixed64> field_map_int32_fixed64_57 = 57;
-  map<int32, float> field_map_int32_float_58 = 58;
-  map<int32, int32> field_map_int32_int32_59 = 59;
-  map<int32, int64> field_map_int32_int64_60 = 60;
-  map<int32, Proto2MessageLite> field_map_int32_message_61 = 61;
-  map<int32, sfixed32> field_map_int32_sfixed32_62 = 62;
-  map<int32, sfixed64> field_map_int32_sfixed64_63 = 63;
-  map<int32, sint32> field_map_int32_sint32_64 = 64;
-  map<int32, sint64> field_map_int32_sint64_65 = 65;
-  map<int32, string> field_map_int32_string_66 = 66;
-  map<int32, uint32> field_map_int32_uint32_67 = 67;
-  map<int32, uint64> field_map_int32_uint64_68 = 68;
-  map<int64, bool> field_map_int64_bool_69 = 69;
-  map<int64, bytes> field_map_int64_bytes_70 = 70;
-  map<int64, double> field_map_int64_double_71 = 71;
-  map<int64, Proto2MessageLite.TestEnum> field_map_int64_enum_72 = 72;
-  map<int64, fixed32> field_map_int64_fixed32_73 = 73;
-  map<int64, fixed64> field_map_int64_fixed64_74 = 74;
-  map<int64, float> field_map_int64_float_75 = 75;
-  map<int64, int32> field_map_int64_int32_76 = 76;
-  map<int64, int64> field_map_int64_int64_77 = 77;
-  map<int64, Proto2MessageLite> field_map_int64_message_78 = 78;
-  map<int64, sfixed32> field_map_int64_sfixed32_79 = 79;
-  map<int64, sfixed64> field_map_int64_sfixed64_80 = 80;
-  map<int64, sint32> field_map_int64_sint32_81 = 81;
-  map<int64, sint64> field_map_int64_sint64_82 = 82;
-  map<int64, string> field_map_int64_string_83 = 83;
-  map<int64, uint32> field_map_int64_uint32_84 = 84;
-  map<int64, uint64> field_map_int64_uint64_85 = 85;
-  map<sfixed32, bool> field_map_sfixed32_bool_86 = 86;
-  map<sfixed32, bytes> field_map_sfixed32_bytes_87 = 87;
-  map<sfixed32, double> field_map_sfixed32_double_88 = 88;
-  map<sfixed32, Proto2MessageLite.TestEnum> field_map_sfixed32_enum_89 = 89;
-  map<sfixed32, fixed32> field_map_sfixed32_fixed32_90 = 90;
-  map<sfixed32, fixed64> field_map_sfixed32_fixed64_91 = 91;
-  map<sfixed32, float> field_map_sfixed32_float_92 = 92;
-  map<sfixed32, int32> field_map_sfixed32_int32_93 = 93;
-  map<sfixed32, int64> field_map_sfixed32_int64_94 = 94;
-  map<sfixed32, Proto2MessageLite> field_map_sfixed32_message_95 = 95;
-  map<sfixed32, sfixed32> field_map_sfixed32_sfixed32_96 = 96;
-  map<sfixed32, sfixed64> field_map_sfixed32_sfixed64_97 = 97;
-  map<sfixed32, sint32> field_map_sfixed32_sint32_98 = 98;
-  map<sfixed32, sint64> field_map_sfixed32_sint64_99 = 99;
-  map<sfixed32, string> field_map_sfixed32_string_100 = 100;
-  map<sfixed32, uint32> field_map_sfixed32_uint32_101 = 101;
-  map<sfixed32, uint64> field_map_sfixed32_uint64_102 = 102;
-  map<sfixed64, bool> field_map_sfixed64_bool_103 = 103;
-  map<sfixed64, bytes> field_map_sfixed64_bytes_104 = 104;
-  map<sfixed64, double> field_map_sfixed64_double_105 = 105;
-  map<sfixed64, Proto2MessageLite.TestEnum> field_map_sfixed64_enum_106 = 106;
-  map<sfixed64, fixed32> field_map_sfixed64_fixed32_107 = 107;
-  map<sfixed64, fixed64> field_map_sfixed64_fixed64_108 = 108;
-  map<sfixed64, float> field_map_sfixed64_float_109 = 109;
-  map<sfixed64, int32> field_map_sfixed64_int32_110 = 110;
-  map<sfixed64, int64> field_map_sfixed64_int64_111 = 111;
-  map<sfixed64, Proto2MessageLite> field_map_sfixed64_message_112 = 112;
-  map<sfixed64, sfixed32> field_map_sfixed64_sfixed32_113 = 113;
-  map<sfixed64, sfixed64> field_map_sfixed64_sfixed64_114 = 114;
-  map<sfixed64, sint32> field_map_sfixed64_sint32_115 = 115;
-  map<sfixed64, sint64> field_map_sfixed64_sint64_116 = 116;
-  map<sfixed64, string> field_map_sfixed64_string_117 = 117;
-  map<sfixed64, uint32> field_map_sfixed64_uint32_118 = 118;
-  map<sfixed64, uint64> field_map_sfixed64_uint64_119 = 119;
-  map<sint32, bool> field_map_sint32_bool_120 = 120;
-  map<sint32, bytes> field_map_sint32_bytes_121 = 121;
-  map<sint32, double> field_map_sint32_double_122 = 122;
-  map<sint32, Proto2MessageLite.TestEnum> field_map_sint32_enum_123 = 123;
-  map<sint32, fixed32> field_map_sint32_fixed32_124 = 124;
-  map<sint32, fixed64> field_map_sint32_fixed64_125 = 125;
-  map<sint32, float> field_map_sint32_float_126 = 126;
-  map<sint32, int32> field_map_sint32_int32_127 = 127;
-  map<sint32, int64> field_map_sint32_int64_128 = 128;
-  map<sint32, Proto2MessageLite> field_map_sint32_message_129 = 129;
-  map<sint32, sfixed32> field_map_sint32_sfixed32_130 = 130;
-  map<sint32, sfixed64> field_map_sint32_sfixed64_131 = 131;
-  map<sint32, sint32> field_map_sint32_sint32_132 = 132;
-  map<sint32, sint64> field_map_sint32_sint64_133 = 133;
-  map<sint32, string> field_map_sint32_string_134 = 134;
-  map<sint32, uint32> field_map_sint32_uint32_135 = 135;
-  map<sint32, uint64> field_map_sint32_uint64_136 = 136;
-  map<sint64, bool> field_map_sint64_bool_137 = 137;
-  map<sint64, bytes> field_map_sint64_bytes_138 = 138;
-  map<sint64, double> field_map_sint64_double_139 = 139;
-  map<sint64, Proto2MessageLite.TestEnum> field_map_sint64_enum_140 = 140;
-  map<sint64, fixed32> field_map_sint64_fixed32_141 = 141;
-  map<sint64, fixed64> field_map_sint64_fixed64_142 = 142;
-  map<sint64, float> field_map_sint64_float_143 = 143;
-  map<sint64, int32> field_map_sint64_int32_144 = 144;
-  map<sint64, int64> field_map_sint64_int64_145 = 145;
-  map<sint64, Proto2MessageLite> field_map_sint64_message_146 = 146;
-  map<sint64, sfixed32> field_map_sint64_sfixed32_147 = 147;
-  map<sint64, sfixed64> field_map_sint64_sfixed64_148 = 148;
-  map<sint64, sint32> field_map_sint64_sint32_149 = 149;
-  map<sint64, sint64> field_map_sint64_sint64_150 = 150;
-  map<sint64, string> field_map_sint64_string_151 = 151;
-  map<sint64, uint32> field_map_sint64_uint32_152 = 152;
-  map<sint64, uint64> field_map_sint64_uint64_153 = 153;
-  map<string, bool> field_map_string_bool_154 = 154;
-  map<string, bytes> field_map_string_bytes_155 = 155;
-  map<string, double> field_map_string_double_156 = 156;
-  map<string, Proto2MessageLite.TestEnum> field_map_string_enum_157 = 157;
-  map<string, fixed32> field_map_string_fixed32_158 = 158;
-  map<string, fixed64> field_map_string_fixed64_159 = 159;
-  map<string, float> field_map_string_float_160 = 160;
-  map<string, int32> field_map_string_int32_161 = 161;
-  map<string, int64> field_map_string_int64_162 = 162;
-  map<string, Proto2MessageLite> field_map_string_message_163 = 163;
-  map<string, sfixed32> field_map_string_sfixed32_164 = 164;
-  map<string, sfixed64> field_map_string_sfixed64_165 = 165;
-  map<string, sint32> field_map_string_sint32_166 = 166;
-  map<string, sint64> field_map_string_sint64_167 = 167;
-  map<string, string> field_map_string_string_168 = 168;
-  map<string, uint32> field_map_string_uint32_169 = 169;
-  map<string, uint64> field_map_string_uint64_170 = 170;
-  map<uint32, bool> field_map_uint32_bool_171 = 171;
-  map<uint32, bytes> field_map_uint32_bytes_172 = 172;
-  map<uint32, double> field_map_uint32_double_173 = 173;
-  map<uint32, Proto2MessageLite.TestEnum> field_map_uint32_enum_174 = 174;
-  map<uint32, fixed32> field_map_uint32_fixed32_175 = 175;
-  map<uint32, fixed64> field_map_uint32_fixed64_176 = 176;
-  map<uint32, float> field_map_uint32_float_177 = 177;
-  map<uint32, int32> field_map_uint32_int32_178 = 178;
-  map<uint32, int64> field_map_uint32_int64_179 = 179;
-  map<uint32, Proto2MessageLite> field_map_uint32_message_180 = 180;
-  map<uint32, sfixed32> field_map_uint32_sfixed32_181 = 181;
-  map<uint32, sfixed64> field_map_uint32_sfixed64_182 = 182;
-  map<uint32, sint32> field_map_uint32_sint32_183 = 183;
-  map<uint32, sint64> field_map_uint32_sint64_184 = 184;
-  map<uint32, string> field_map_uint32_string_185 = 185;
-  map<uint32, uint32> field_map_uint32_uint32_186 = 186;
-  map<uint32, uint64> field_map_uint32_uint64_187 = 187;
-  map<uint64, bool> field_map_uint64_bool_188 = 188;
-  map<uint64, bytes> field_map_uint64_bytes_189 = 189;
-  map<uint64, double> field_map_uint64_double_190 = 190;
-  map<uint64, Proto2MessageLite.TestEnum> field_map_uint64_enum_191 = 191;
-  map<uint64, fixed32> field_map_uint64_fixed32_192 = 192;
-  map<uint64, fixed64> field_map_uint64_fixed64_193 = 193;
-  map<uint64, float> field_map_uint64_float_194 = 194;
-  map<uint64, int32> field_map_uint64_int32_195 = 195;
-  map<uint64, int64> field_map_uint64_int64_196 = 196;
-  map<uint64, Proto2MessageLite> field_map_uint64_message_197 = 197;
-  map<uint64, sfixed32> field_map_uint64_sfixed32_198 = 198;
-  map<uint64, sfixed64> field_map_uint64_sfixed64_199 = 199;
-  map<uint64, sint32> field_map_uint64_sint32_200 = 200;
-  map<uint64, sint64> field_map_uint64_sint64_201 = 201;
-  map<uint64, string> field_map_uint64_string_202 = 202;
-  map<uint64, uint32> field_map_uint64_uint32_203 = 203;
-  map<uint64, uint64> field_map_uint64_uint64_204 = 204;
-}
diff --git a/libs/protobuf/java/core/src/test/proto/com/google/protobuf/proto2_unknown_enum_values.proto b/libs/protobuf/java/core/src/test/proto/com/google/protobuf/proto2_unknown_enum_values.proto
deleted file mode 100644
index 5d470ac..0000000
--- a/libs/protobuf/java/core/src/test/proto/com/google/protobuf/proto2_unknown_enum_values.proto
+++ /dev/null
@@ -1,60 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto2";
-
-package proto2_unknown_enum_values;
-
-option java_package = "com.google.protobuf";
-option java_outer_classname = "Proto2UnknownEnumValuesTestProto";
-
-enum Proto2TestEnum {
-  ZERO = 0;
-  ONE = 1;
-  TWO = 2;
-}
-
-message Proto2EnumMessage {
-  repeated Proto2TestEnum repeated_packed_enum = 1 [packed = true];
-}
-
-// An enum containing a subset of the values of Proto2TestEnum, to test
-// parsing unknown packed enum values
-enum Proto2TestEnumSubset {
-  TESTENUM_SUBSET_ZERO = 0;
-  TESTENUM_SUBSET_ONE = 1;
-  // No enum value with number 2.
-}
-
-// Test messages for packed enum, with identical field number as
-// Proto2Message, to test parsing unknown packed enums.
-message Proto2EnumMessageWithEnumSubset {
-  repeated Proto2TestEnumSubset repeated_packed_enum = 1 [packed = true];
-}
diff --git a/libs/protobuf/java/core/src/test/proto/com/google/protobuf/proto3_message.proto b/libs/protobuf/java/core/src/test/proto/com/google/protobuf/proto3_message.proto
deleted file mode 100644
index bcf32e1..0000000
--- a/libs/protobuf/java/core/src/test/proto/com/google/protobuf/proto3_message.proto
+++ /dev/null
@@ -1,327 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto3";
-
-package protobuf.experimental;
-
-option java_package = "com.google.protobuf.testing";
-option java_outer_classname = "Proto3Testing";
-
-message Proto3SpecialFieldName {
-  double regular_name = 1;
-  int32 cached_size = 2;
-  int64 serialized_size = 3;
-  string class = 4;
-}
-
-message Proto3Message {
-  enum TestEnum {
-    ZERO = 0;
-    ONE = 1;
-    TWO = 2;
-  }
-
-  double field_double_1 = 1;
-  float field_float_2 = 2;
-  int64 field_int64_3 = 3;
-  uint64 field_uint64_4 = 4;
-  int32 field_int32_5 = 5;
-  fixed64 field_fixed64_6 = 6;
-  fixed32 field_fixed32_7 = 7;
-  bool field_bool_8 = 8;
-  string field_string_9 = 9;
-  Proto3Message field_message_10 = 10;
-  bytes field_bytes_11 = 11;
-  uint32 field_uint32_12 = 12;
-  TestEnum field_enum_13 = 13;
-  sfixed32 field_sfixed32_14 = 14;
-  sfixed64 field_sfixed64_15 = 15;
-  sint32 field_sint32_16 = 16;
-  sint64 field_sint64_17 = 17;
-  repeated double field_double_list_18 = 18 [packed = false];
-  repeated float field_float_list_19 = 19 [packed = false];
-  repeated int64 field_int64_list_20 = 20 [packed = false];
-  repeated uint64 field_uint64_list_21 = 21 [packed = false];
-  repeated int32 field_int32_list_22 = 22 [packed = false];
-  repeated fixed64 field_fixed64_list_23 = 23 [packed = false];
-  repeated fixed32 field_fixed32_list_24 = 24 [packed = false];
-  repeated bool field_bool_list_25 = 25 [packed = false];
-  repeated string field_string_list_26 = 26 [packed = false];
-  repeated Proto3Message field_message_list_27 = 27 [packed = false];
-  repeated bytes field_bytes_list_28 = 28 [packed = false];
-  repeated uint32 field_uint32_list_29 = 29 [packed = false];
-  repeated TestEnum field_enum_list_30 = 30 [packed = false];
-  repeated sfixed32 field_sfixed32_list_31 = 31 [packed = false];
-  repeated sfixed64 field_sfixed64_list_32 = 32 [packed = false];
-  repeated sint32 field_sint32_list_33 = 33 [packed = false];
-  repeated sint64 field_sint64_list_34 = 34 [packed = false];
-  repeated double field_double_list_packed_35 = 35 [packed = true];
-  repeated float field_float_list_packed_36 = 36 [packed = true];
-  repeated int64 field_int64_list_packed_37 = 37 [packed = true];
-  repeated uint64 field_uint64_list_packed_38 = 38 [packed = true];
-  repeated int32 field_int32_list_packed_39 = 39 [packed = true];
-  repeated fixed64 field_fixed64_list_packed_40 = 40 [packed = true];
-  repeated fixed32 field_fixed32_list_packed_41 = 41 [packed = true];
-  repeated bool field_bool_list_packed_42 = 42 [packed = true];
-  repeated uint32 field_uint32_list_packed_43 = 43 [packed = true];
-  repeated TestEnum field_enum_list_packed_44 = 44 [packed = true];
-  repeated sfixed32 field_sfixed32_list_packed_45 = 45 [packed = true];
-  repeated sfixed64 field_sfixed64_list_packed_46 = 46 [packed = true];
-  repeated sint32 field_sint32_list_packed_47 = 47 [packed = true];
-  repeated sint64 field_sint64_list_packed_48 = 48 [packed = true];
-  oneof test_oneof {
-    double field_double_53 = 53;
-    float field_float_54 = 54;
-    int64 field_int64_55 = 55;
-    uint64 field_uint64_56 = 56;
-    int32 field_int32_57 = 57;
-    fixed64 field_fixed64_58 = 58;
-    fixed32 field_fixed32_59 = 59;
-    bool field_bool_60 = 60;
-    string field_string_61 = 61;
-    Proto3Message field_message_62 = 62;
-    bytes field_bytes_63 = 63;
-    uint32 field_uint32_64 = 64;
-    sfixed32 field_sfixed32_65 = 65;
-    sfixed64 field_sfixed64_66 = 66;
-    sint32 field_sint32_67 = 67;
-    sint64 field_sint64_68 = 68;
-  }
-}
-
-message Proto3Empty {}
-
-message Proto3MessageWithMaps {
-  map<bool, bool> field_map_bool_bool_1 = 1;
-  map<bool, bytes> field_map_bool_bytes_2 = 2;
-  map<bool, double> field_map_bool_double_3 = 3;
-  map<bool, Proto3Message.TestEnum> field_map_bool_enum_4 = 4;
-  map<bool, fixed32> field_map_bool_fixed32_5 = 5;
-  map<bool, fixed64> field_map_bool_fixed64_6 = 6;
-  map<bool, float> field_map_bool_float_7 = 7;
-  map<bool, int32> field_map_bool_int32_8 = 8;
-  map<bool, int64> field_map_bool_int64_9 = 9;
-  map<bool, Proto3Message> field_map_bool_message_10 = 10;
-  map<bool, sfixed32> field_map_bool_sfixed32_11 = 11;
-  map<bool, sfixed64> field_map_bool_sfixed64_12 = 12;
-  map<bool, sint32> field_map_bool_sint32_13 = 13;
-  map<bool, sint64> field_map_bool_sint64_14 = 14;
-  map<bool, string> field_map_bool_string_15 = 15;
-  map<bool, uint32> field_map_bool_uint32_16 = 16;
-  map<bool, uint64> field_map_bool_uint64_17 = 17;
-  map<fixed32, bool> field_map_fixed32_bool_18 = 18;
-  map<fixed32, bytes> field_map_fixed32_bytes_19 = 19;
-  map<fixed32, double> field_map_fixed32_double_20 = 20;
-  map<fixed32, Proto3Message.TestEnum> field_map_fixed32_enum_21 = 21;
-  map<fixed32, fixed32> field_map_fixed32_fixed32_22 = 22;
-  map<fixed32, fixed64> field_map_fixed32_fixed64_23 = 23;
-  map<fixed32, float> field_map_fixed32_float_24 = 24;
-  map<fixed32, int32> field_map_fixed32_int32_25 = 25;
-  map<fixed32, int64> field_map_fixed32_int64_26 = 26;
-  map<fixed32, Proto3Message> field_map_fixed32_message_27 = 27;
-  map<fixed32, sfixed32> field_map_fixed32_sfixed32_28 = 28;
-  map<fixed32, sfixed64> field_map_fixed32_sfixed64_29 = 29;
-  map<fixed32, sint32> field_map_fixed32_sint32_30 = 30;
-  map<fixed32, sint64> field_map_fixed32_sint64_31 = 31;
-  map<fixed32, string> field_map_fixed32_string_32 = 32;
-  map<fixed32, uint32> field_map_fixed32_uint32_33 = 33;
-  map<fixed32, uint64> field_map_fixed32_uint64_34 = 34;
-  map<fixed64, bool> field_map_fixed64_bool_35 = 35;
-  map<fixed64, bytes> field_map_fixed64_bytes_36 = 36;
-  map<fixed64, double> field_map_fixed64_double_37 = 37;
-  map<fixed64, Proto3Message.TestEnum> field_map_fixed64_enum_38 = 38;
-  map<fixed64, fixed32> field_map_fixed64_fixed32_39 = 39;
-  map<fixed64, fixed64> field_map_fixed64_fixed64_40 = 40;
-  map<fixed64, float> field_map_fixed64_float_41 = 41;
-  map<fixed64, int32> field_map_fixed64_int32_42 = 42;
-  map<fixed64, int64> field_map_fixed64_int64_43 = 43;
-  map<fixed64, Proto3Message> field_map_fixed64_message_44 = 44;
-  map<fixed64, sfixed32> field_map_fixed64_sfixed32_45 = 45;
-  map<fixed64, sfixed64> field_map_fixed64_sfixed64_46 = 46;
-  map<fixed64, sint32> field_map_fixed64_sint32_47 = 47;
-  map<fixed64, sint64> field_map_fixed64_sint64_48 = 48;
-  map<fixed64, string> field_map_fixed64_string_49 = 49;
-  map<fixed64, uint32> field_map_fixed64_uint32_50 = 50;
-  map<fixed64, uint64> field_map_fixed64_uint64_51 = 51;
-  map<int32, bool> field_map_int32_bool_52 = 52;
-  map<int32, bytes> field_map_int32_bytes_53 = 53;
-  map<int32, double> field_map_int32_double_54 = 54;
-  map<int32, Proto3Message.TestEnum> field_map_int32_enum_55 = 55;
-  map<int32, fixed32> field_map_int32_fixed32_56 = 56;
-  map<int32, fixed64> field_map_int32_fixed64_57 = 57;
-  map<int32, float> field_map_int32_float_58 = 58;
-  map<int32, int32> field_map_int32_int32_59 = 59;
-  map<int32, int64> field_map_int32_int64_60 = 60;
-  map<int32, Proto3Message> field_map_int32_message_61 = 61;
-  map<int32, sfixed32> field_map_int32_sfixed32_62 = 62;
-  map<int32, sfixed64> field_map_int32_sfixed64_63 = 63;
-  map<int32, sint32> field_map_int32_sint32_64 = 64;
-  map<int32, sint64> field_map_int32_sint64_65 = 65;
-  map<int32, string> field_map_int32_string_66 = 66;
-  map<int32, uint32> field_map_int32_uint32_67 = 67;
-  map<int32, uint64> field_map_int32_uint64_68 = 68;
-  map<int64, bool> field_map_int64_bool_69 = 69;
-  map<int64, bytes> field_map_int64_bytes_70 = 70;
-  map<int64, double> field_map_int64_double_71 = 71;
-  map<int64, Proto3Message.TestEnum> field_map_int64_enum_72 = 72;
-  map<int64, fixed32> field_map_int64_fixed32_73 = 73;
-  map<int64, fixed64> field_map_int64_fixed64_74 = 74;
-  map<int64, float> field_map_int64_float_75 = 75;
-  map<int64, int32> field_map_int64_int32_76 = 76;
-  map<int64, int64> field_map_int64_int64_77 = 77;
-  map<int64, Proto3Message> field_map_int64_message_78 = 78;
-  map<int64, sfixed32> field_map_int64_sfixed32_79 = 79;
-  map<int64, sfixed64> field_map_int64_sfixed64_80 = 80;
-  map<int64, sint32> field_map_int64_sint32_81 = 81;
-  map<int64, sint64> field_map_int64_sint64_82 = 82;
-  map<int64, string> field_map_int64_string_83 = 83;
-  map<int64, uint32> field_map_int64_uint32_84 = 84;
-  map<int64, uint64> field_map_int64_uint64_85 = 85;
-  map<sfixed32, bool> field_map_sfixed32_bool_86 = 86;
-  map<sfixed32, bytes> field_map_sfixed32_bytes_87 = 87;
-  map<sfixed32, double> field_map_sfixed32_double_88 = 88;
-  map<sfixed32, Proto3Message.TestEnum> field_map_sfixed32_enum_89 = 89;
-  map<sfixed32, fixed32> field_map_sfixed32_fixed32_90 = 90;
-  map<sfixed32, fixed64> field_map_sfixed32_fixed64_91 = 91;
-  map<sfixed32, float> field_map_sfixed32_float_92 = 92;
-  map<sfixed32, int32> field_map_sfixed32_int32_93 = 93;
-  map<sfixed32, int64> field_map_sfixed32_int64_94 = 94;
-  map<sfixed32, Proto3Message> field_map_sfixed32_message_95 = 95;
-  map<sfixed32, sfixed32> field_map_sfixed32_sfixed32_96 = 96;
-  map<sfixed32, sfixed64> field_map_sfixed32_sfixed64_97 = 97;
-  map<sfixed32, sint32> field_map_sfixed32_sint32_98 = 98;
-  map<sfixed32, sint64> field_map_sfixed32_sint64_99 = 99;
-  map<sfixed32, string> field_map_sfixed32_string_100 = 100;
-  map<sfixed32, uint32> field_map_sfixed32_uint32_101 = 101;
-  map<sfixed32, uint64> field_map_sfixed32_uint64_102 = 102;
-  map<sfixed64, bool> field_map_sfixed64_bool_103 = 103;
-  map<sfixed64, bytes> field_map_sfixed64_bytes_104 = 104;
-  map<sfixed64, double> field_map_sfixed64_double_105 = 105;
-  map<sfixed64, Proto3Message.TestEnum> field_map_sfixed64_enum_106 = 106;
-  map<sfixed64, fixed32> field_map_sfixed64_fixed32_107 = 107;
-  map<sfixed64, fixed64> field_map_sfixed64_fixed64_108 = 108;
-  map<sfixed64, float> field_map_sfixed64_float_109 = 109;
-  map<sfixed64, int32> field_map_sfixed64_int32_110 = 110;
-  map<sfixed64, int64> field_map_sfixed64_int64_111 = 111;
-  map<sfixed64, Proto3Message> field_map_sfixed64_message_112 = 112;
-  map<sfixed64, sfixed32> field_map_sfixed64_sfixed32_113 = 113;
-  map<sfixed64, sfixed64> field_map_sfixed64_sfixed64_114 = 114;
-  map<sfixed64, sint32> field_map_sfixed64_sint32_115 = 115;
-  map<sfixed64, sint64> field_map_sfixed64_sint64_116 = 116;
-  map<sfixed64, string> field_map_sfixed64_string_117 = 117;
-  map<sfixed64, uint32> field_map_sfixed64_uint32_118 = 118;
-  map<sfixed64, uint64> field_map_sfixed64_uint64_119 = 119;
-  map<sint32, bool> field_map_sint32_bool_120 = 120;
-  map<sint32, bytes> field_map_sint32_bytes_121 = 121;
-  map<sint32, double> field_map_sint32_double_122 = 122;
-  map<sint32, Proto3Message.TestEnum> field_map_sint32_enum_123 = 123;
-  map<sint32, fixed32> field_map_sint32_fixed32_124 = 124;
-  map<sint32, fixed64> field_map_sint32_fixed64_125 = 125;
-  map<sint32, float> field_map_sint32_float_126 = 126;
-  map<sint32, int32> field_map_sint32_int32_127 = 127;
-  map<sint32, int64> field_map_sint32_int64_128 = 128;
-  map<sint32, Proto3Message> field_map_sint32_message_129 = 129;
-  map<sint32, sfixed32> field_map_sint32_sfixed32_130 = 130;
-  map<sint32, sfixed64> field_map_sint32_sfixed64_131 = 131;
-  map<sint32, sint32> field_map_sint32_sint32_132 = 132;
-  map<sint32, sint64> field_map_sint32_sint64_133 = 133;
-  map<sint32, string> field_map_sint32_string_134 = 134;
-  map<sint32, uint32> field_map_sint32_uint32_135 = 135;
-  map<sint32, uint64> field_map_sint32_uint64_136 = 136;
-  map<sint64, bool> field_map_sint64_bool_137 = 137;
-  map<sint64, bytes> field_map_sint64_bytes_138 = 138;
-  map<sint64, double> field_map_sint64_double_139 = 139;
-  map<sint64, Proto3Message.TestEnum> field_map_sint64_enum_140 = 140;
-  map<sint64, fixed32> field_map_sint64_fixed32_141 = 141;
-  map<sint64, fixed64> field_map_sint64_fixed64_142 = 142;
-  map<sint64, float> field_map_sint64_float_143 = 143;
-  map<sint64, int32> field_map_sint64_int32_144 = 144;
-  map<sint64, int64> field_map_sint64_int64_145 = 145;
-  map<sint64, Proto3Message> field_map_sint64_message_146 = 146;
-  map<sint64, sfixed32> field_map_sint64_sfixed32_147 = 147;
-  map<sint64, sfixed64> field_map_sint64_sfixed64_148 = 148;
-  map<sint64, sint32> field_map_sint64_sint32_149 = 149;
-  map<sint64, sint64> field_map_sint64_sint64_150 = 150;
-  map<sint64, string> field_map_sint64_string_151 = 151;
-  map<sint64, uint32> field_map_sint64_uint32_152 = 152;
-  map<sint64, uint64> field_map_sint64_uint64_153 = 153;
-  map<string, bool> field_map_string_bool_154 = 154;
-  map<string, bytes> field_map_string_bytes_155 = 155;
-  map<string, double> field_map_string_double_156 = 156;
-  map<string, Proto3Message.TestEnum> field_map_string_enum_157 = 157;
-  map<string, fixed32> field_map_string_fixed32_158 = 158;
-  map<string, fixed64> field_map_string_fixed64_159 = 159;
-  map<string, float> field_map_string_float_160 = 160;
-  map<string, int32> field_map_string_int32_161 = 161;
-  map<string, int64> field_map_string_int64_162 = 162;
-  map<string, Proto3Message> field_map_string_message_163 = 163;
-  map<string, sfixed32> field_map_string_sfixed32_164 = 164;
-  map<string, sfixed64> field_map_string_sfixed64_165 = 165;
-  map<string, sint32> field_map_string_sint32_166 = 166;
-  map<string, sint64> field_map_string_sint64_167 = 167;
-  map<string, string> field_map_string_string_168 = 168;
-  map<string, uint32> field_map_string_uint32_169 = 169;
-  map<string, uint64> field_map_string_uint64_170 = 170;
-  map<uint32, bool> field_map_uint32_bool_171 = 171;
-  map<uint32, bytes> field_map_uint32_bytes_172 = 172;
-  map<uint32, double> field_map_uint32_double_173 = 173;
-  map<uint32, Proto3Message.TestEnum> field_map_uint32_enum_174 = 174;
-  map<uint32, fixed32> field_map_uint32_fixed32_175 = 175;
-  map<uint32, fixed64> field_map_uint32_fixed64_176 = 176;
-  map<uint32, float> field_map_uint32_float_177 = 177;
-  map<uint32, int32> field_map_uint32_int32_178 = 178;
-  map<uint32, int64> field_map_uint32_int64_179 = 179;
-  map<uint32, Proto3Message> field_map_uint32_message_180 = 180;
-  map<uint32, sfixed32> field_map_uint32_sfixed32_181 = 181;
-  map<uint32, sfixed64> field_map_uint32_sfixed64_182 = 182;
-  map<uint32, sint32> field_map_uint32_sint32_183 = 183;
-  map<uint32, sint64> field_map_uint32_sint64_184 = 184;
-  map<uint32, string> field_map_uint32_string_185 = 185;
-  map<uint32, uint32> field_map_uint32_uint32_186 = 186;
-  map<uint32, uint64> field_map_uint32_uint64_187 = 187;
-  map<uint64, bool> field_map_uint64_bool_188 = 188;
-  map<uint64, bytes> field_map_uint64_bytes_189 = 189;
-  map<uint64, double> field_map_uint64_double_190 = 190;
-  map<uint64, Proto3Message.TestEnum> field_map_uint64_enum_191 = 191;
-  map<uint64, fixed32> field_map_uint64_fixed32_192 = 192;
-  map<uint64, fixed64> field_map_uint64_fixed64_193 = 193;
-  map<uint64, float> field_map_uint64_float_194 = 194;
-  map<uint64, int32> field_map_uint64_int32_195 = 195;
-  map<uint64, int64> field_map_uint64_int64_196 = 196;
-  map<uint64, Proto3Message> field_map_uint64_message_197 = 197;
-  map<uint64, sfixed32> field_map_uint64_sfixed32_198 = 198;
-  map<uint64, sfixed64> field_map_uint64_sfixed64_199 = 199;
-  map<uint64, sint32> field_map_uint64_sint32_200 = 200;
-  map<uint64, sint64> field_map_uint64_sint64_201 = 201;
-  map<uint64, string> field_map_uint64_string_202 = 202;
-  map<uint64, uint32> field_map_uint64_uint32_203 = 203;
-  map<uint64, uint64> field_map_uint64_uint64_204 = 204;
-}
diff --git a/libs/protobuf/java/core/src/test/proto/com/google/protobuf/proto3_message_lite.proto b/libs/protobuf/java/core/src/test/proto/com/google/protobuf/proto3_message_lite.proto
deleted file mode 100644
index 4a378b5..0000000
--- a/libs/protobuf/java/core/src/test/proto/com/google/protobuf/proto3_message_lite.proto
+++ /dev/null
@@ -1,320 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto3";
-
-package protobuf.experimental;
-
-option java_package = "com.google.protobuf.testing";
-option java_outer_classname = "Proto3TestingLite";
-
-message Proto3MessageLite {
-  enum TestEnum {
-    ZERO = 0;
-    ONE = 1;
-    TWO = 2;
-  }
-
-  double field_double_1 = 1;
-  float field_float_2 = 2;
-  int64 field_int64_3 = 3;
-  uint64 field_uint64_4 = 4;
-  int32 field_int32_5 = 5;
-  fixed64 field_fixed64_6 = 6;
-  fixed32 field_fixed32_7 = 7;
-  bool field_bool_8 = 8;
-  string field_string_9 = 9;
-  Proto3MessageLite field_message_10 = 10;
-  bytes field_bytes_11 = 11;
-  uint32 field_uint32_12 = 12;
-  TestEnum field_enum_13 = 13;
-  sfixed32 field_sfixed32_14 = 14;
-  sfixed64 field_sfixed64_15 = 15;
-  sint32 field_sint32_16 = 16;
-  sint64 field_sint64_17 = 17;
-  repeated double field_double_list_18 = 18 [packed = false];
-  repeated float field_float_list_19 = 19 [packed = false];
-  repeated int64 field_int64_list_20 = 20 [packed = false];
-  repeated uint64 field_uint64_list_21 = 21 [packed = false];
-  repeated int32 field_int32_list_22 = 22 [packed = false];
-  repeated fixed64 field_fixed64_list_23 = 23 [packed = false];
-  repeated fixed32 field_fixed32_list_24 = 24 [packed = false];
-  repeated bool field_bool_list_25 = 25 [packed = false];
-  repeated string field_string_list_26 = 26 [packed = false];
-  repeated Proto3MessageLite field_message_list_27 = 27 [packed = false];
-  repeated bytes field_bytes_list_28 = 28 [packed = false];
-  repeated uint32 field_uint32_list_29 = 29 [packed = false];
-  repeated TestEnum field_enum_list_30 = 30 [packed = false];
-  repeated sfixed32 field_sfixed32_list_31 = 31 [packed = false];
-  repeated sfixed64 field_sfixed64_list_32 = 32 [packed = false];
-  repeated sint32 field_sint32_list_33 = 33 [packed = false];
-  repeated sint64 field_sint64_list_34 = 34 [packed = false];
-  repeated double field_double_list_packed_35 = 35 [packed = true];
-  repeated float field_float_list_packed_36 = 36 [packed = true];
-  repeated int64 field_int64_list_packed_37 = 37 [packed = true];
-  repeated uint64 field_uint64_list_packed_38 = 38 [packed = true];
-  repeated int32 field_int32_list_packed_39 = 39 [packed = true];
-  repeated fixed64 field_fixed64_list_packed_40 = 40 [packed = true];
-  repeated fixed32 field_fixed32_list_packed_41 = 41 [packed = true];
-  repeated bool field_bool_list_packed_42 = 42 [packed = true];
-  repeated uint32 field_uint32_list_packed_43 = 43 [packed = true];
-  repeated TestEnum field_enum_list_packed_44 = 44 [packed = true];
-  repeated sfixed32 field_sfixed32_list_packed_45 = 45 [packed = true];
-  repeated sfixed64 field_sfixed64_list_packed_46 = 46 [packed = true];
-  repeated sint32 field_sint32_list_packed_47 = 47 [packed = true];
-  repeated sint64 field_sint64_list_packed_48 = 48 [packed = true];
-  oneof test_oneof {
-    double field_double_53 = 53;
-    float field_float_54 = 54;
-    int64 field_int64_55 = 55;
-    uint64 field_uint64_56 = 56;
-    int32 field_int32_57 = 57;
-    fixed64 field_fixed64_58 = 58;
-    fixed32 field_fixed32_59 = 59;
-    bool field_bool_60 = 60;
-    string field_string_61 = 61;
-    Proto3MessageLite field_message_62 = 62;
-    bytes field_bytes_63 = 63;
-    uint32 field_uint32_64 = 64;
-    sfixed32 field_sfixed32_65 = 65;
-    sfixed64 field_sfixed64_66 = 66;
-    sint32 field_sint32_67 = 67;
-    sint64 field_sint64_68 = 68;
-  }
-}
-
-message Proto3EmptyLite {}
-
-message Proto3MessageLiteWithMaps {
-  map<bool, bool> field_map_bool_bool_1 = 1;
-  map<bool, bytes> field_map_bool_bytes_2 = 2;
-  map<bool, double> field_map_bool_double_3 = 3;
-  map<bool, Proto3MessageLite.TestEnum> field_map_bool_enum_4 = 4;
-  map<bool, fixed32> field_map_bool_fixed32_5 = 5;
-  map<bool, fixed64> field_map_bool_fixed64_6 = 6;
-  map<bool, float> field_map_bool_float_7 = 7;
-  map<bool, int32> field_map_bool_int32_8 = 8;
-  map<bool, int64> field_map_bool_int64_9 = 9;
-  map<bool, Proto3MessageLite> field_map_bool_message_10 = 10;
-  map<bool, sfixed32> field_map_bool_sfixed32_11 = 11;
-  map<bool, sfixed64> field_map_bool_sfixed64_12 = 12;
-  map<bool, sint32> field_map_bool_sint32_13 = 13;
-  map<bool, sint64> field_map_bool_sint64_14 = 14;
-  map<bool, string> field_map_bool_string_15 = 15;
-  map<bool, uint32> field_map_bool_uint32_16 = 16;
-  map<bool, uint64> field_map_bool_uint64_17 = 17;
-  map<fixed32, bool> field_map_fixed32_bool_18 = 18;
-  map<fixed32, bytes> field_map_fixed32_bytes_19 = 19;
-  map<fixed32, double> field_map_fixed32_double_20 = 20;
-  map<fixed32, Proto3MessageLite.TestEnum> field_map_fixed32_enum_21 = 21;
-  map<fixed32, fixed32> field_map_fixed32_fixed32_22 = 22;
-  map<fixed32, fixed64> field_map_fixed32_fixed64_23 = 23;
-  map<fixed32, float> field_map_fixed32_float_24 = 24;
-  map<fixed32, int32> field_map_fixed32_int32_25 = 25;
-  map<fixed32, int64> field_map_fixed32_int64_26 = 26;
-  map<fixed32, Proto3MessageLite> field_map_fixed32_message_27 = 27;
-  map<fixed32, sfixed32> field_map_fixed32_sfixed32_28 = 28;
-  map<fixed32, sfixed64> field_map_fixed32_sfixed64_29 = 29;
-  map<fixed32, sint32> field_map_fixed32_sint32_30 = 30;
-  map<fixed32, sint64> field_map_fixed32_sint64_31 = 31;
-  map<fixed32, string> field_map_fixed32_string_32 = 32;
-  map<fixed32, uint32> field_map_fixed32_uint32_33 = 33;
-  map<fixed32, uint64> field_map_fixed32_uint64_34 = 34;
-  map<fixed64, bool> field_map_fixed64_bool_35 = 35;
-  map<fixed64, bytes> field_map_fixed64_bytes_36 = 36;
-  map<fixed64, double> field_map_fixed64_double_37 = 37;
-  map<fixed64, Proto3MessageLite.TestEnum> field_map_fixed64_enum_38 = 38;
-  map<fixed64, fixed32> field_map_fixed64_fixed32_39 = 39;
-  map<fixed64, fixed64> field_map_fixed64_fixed64_40 = 40;
-  map<fixed64, float> field_map_fixed64_float_41 = 41;
-  map<fixed64, int32> field_map_fixed64_int32_42 = 42;
-  map<fixed64, int64> field_map_fixed64_int64_43 = 43;
-  map<fixed64, Proto3MessageLite> field_map_fixed64_message_44 = 44;
-  map<fixed64, sfixed32> field_map_fixed64_sfixed32_45 = 45;
-  map<fixed64, sfixed64> field_map_fixed64_sfixed64_46 = 46;
-  map<fixed64, sint32> field_map_fixed64_sint32_47 = 47;
-  map<fixed64, sint64> field_map_fixed64_sint64_48 = 48;
-  map<fixed64, string> field_map_fixed64_string_49 = 49;
-  map<fixed64, uint32> field_map_fixed64_uint32_50 = 50;
-  map<fixed64, uint64> field_map_fixed64_uint64_51 = 51;
-  map<int32, bool> field_map_int32_bool_52 = 52;
-  map<int32, bytes> field_map_int32_bytes_53 = 53;
-  map<int32, double> field_map_int32_double_54 = 54;
-  map<int32, Proto3MessageLite.TestEnum> field_map_int32_enum_55 = 55;
-  map<int32, fixed32> field_map_int32_fixed32_56 = 56;
-  map<int32, fixed64> field_map_int32_fixed64_57 = 57;
-  map<int32, float> field_map_int32_float_58 = 58;
-  map<int32, int32> field_map_int32_int32_59 = 59;
-  map<int32, int64> field_map_int32_int64_60 = 60;
-  map<int32, Proto3MessageLite> field_map_int32_message_61 = 61;
-  map<int32, sfixed32> field_map_int32_sfixed32_62 = 62;
-  map<int32, sfixed64> field_map_int32_sfixed64_63 = 63;
-  map<int32, sint32> field_map_int32_sint32_64 = 64;
-  map<int32, sint64> field_map_int32_sint64_65 = 65;
-  map<int32, string> field_map_int32_string_66 = 66;
-  map<int32, uint32> field_map_int32_uint32_67 = 67;
-  map<int32, uint64> field_map_int32_uint64_68 = 68;
-  map<int64, bool> field_map_int64_bool_69 = 69;
-  map<int64, bytes> field_map_int64_bytes_70 = 70;
-  map<int64, double> field_map_int64_double_71 = 71;
-  map<int64, Proto3MessageLite.TestEnum> field_map_int64_enum_72 = 72;
-  map<int64, fixed32> field_map_int64_fixed32_73 = 73;
-  map<int64, fixed64> field_map_int64_fixed64_74 = 74;
-  map<int64, float> field_map_int64_float_75 = 75;
-  map<int64, int32> field_map_int64_int32_76 = 76;
-  map<int64, int64> field_map_int64_int64_77 = 77;
-  map<int64, Proto3MessageLite> field_map_int64_message_78 = 78;
-  map<int64, sfixed32> field_map_int64_sfixed32_79 = 79;
-  map<int64, sfixed64> field_map_int64_sfixed64_80 = 80;
-  map<int64, sint32> field_map_int64_sint32_81 = 81;
-  map<int64, sint64> field_map_int64_sint64_82 = 82;
-  map<int64, string> field_map_int64_string_83 = 83;
-  map<int64, uint32> field_map_int64_uint32_84 = 84;
-  map<int64, uint64> field_map_int64_uint64_85 = 85;
-  map<sfixed32, bool> field_map_sfixed32_bool_86 = 86;
-  map<sfixed32, bytes> field_map_sfixed32_bytes_87 = 87;
-  map<sfixed32, double> field_map_sfixed32_double_88 = 88;
-  map<sfixed32, Proto3MessageLite.TestEnum> field_map_sfixed32_enum_89 = 89;
-  map<sfixed32, fixed32> field_map_sfixed32_fixed32_90 = 90;
-  map<sfixed32, fixed64> field_map_sfixed32_fixed64_91 = 91;
-  map<sfixed32, float> field_map_sfixed32_float_92 = 92;
-  map<sfixed32, int32> field_map_sfixed32_int32_93 = 93;
-  map<sfixed32, int64> field_map_sfixed32_int64_94 = 94;
-  map<sfixed32, Proto3MessageLite> field_map_sfixed32_message_95 = 95;
-  map<sfixed32, sfixed32> field_map_sfixed32_sfixed32_96 = 96;
-  map<sfixed32, sfixed64> field_map_sfixed32_sfixed64_97 = 97;
-  map<sfixed32, sint32> field_map_sfixed32_sint32_98 = 98;
-  map<sfixed32, sint64> field_map_sfixed32_sint64_99 = 99;
-  map<sfixed32, string> field_map_sfixed32_string_100 = 100;
-  map<sfixed32, uint32> field_map_sfixed32_uint32_101 = 101;
-  map<sfixed32, uint64> field_map_sfixed32_uint64_102 = 102;
-  map<sfixed64, bool> field_map_sfixed64_bool_103 = 103;
-  map<sfixed64, bytes> field_map_sfixed64_bytes_104 = 104;
-  map<sfixed64, double> field_map_sfixed64_double_105 = 105;
-  map<sfixed64, Proto3MessageLite.TestEnum> field_map_sfixed64_enum_106 = 106;
-  map<sfixed64, fixed32> field_map_sfixed64_fixed32_107 = 107;
-  map<sfixed64, fixed64> field_map_sfixed64_fixed64_108 = 108;
-  map<sfixed64, float> field_map_sfixed64_float_109 = 109;
-  map<sfixed64, int32> field_map_sfixed64_int32_110 = 110;
-  map<sfixed64, int64> field_map_sfixed64_int64_111 = 111;
-  map<sfixed64, Proto3MessageLite> field_map_sfixed64_message_112 = 112;
-  map<sfixed64, sfixed32> field_map_sfixed64_sfixed32_113 = 113;
-  map<sfixed64, sfixed64> field_map_sfixed64_sfixed64_114 = 114;
-  map<sfixed64, sint32> field_map_sfixed64_sint32_115 = 115;
-  map<sfixed64, sint64> field_map_sfixed64_sint64_116 = 116;
-  map<sfixed64, string> field_map_sfixed64_string_117 = 117;
-  map<sfixed64, uint32> field_map_sfixed64_uint32_118 = 118;
-  map<sfixed64, uint64> field_map_sfixed64_uint64_119 = 119;
-  map<sint32, bool> field_map_sint32_bool_120 = 120;
-  map<sint32, bytes> field_map_sint32_bytes_121 = 121;
-  map<sint32, double> field_map_sint32_double_122 = 122;
-  map<sint32, Proto3MessageLite.TestEnum> field_map_sint32_enum_123 = 123;
-  map<sint32, fixed32> field_map_sint32_fixed32_124 = 124;
-  map<sint32, fixed64> field_map_sint32_fixed64_125 = 125;
-  map<sint32, float> field_map_sint32_float_126 = 126;
-  map<sint32, int32> field_map_sint32_int32_127 = 127;
-  map<sint32, int64> field_map_sint32_int64_128 = 128;
-  map<sint32, Proto3MessageLite> field_map_sint32_message_129 = 129;
-  map<sint32, sfixed32> field_map_sint32_sfixed32_130 = 130;
-  map<sint32, sfixed64> field_map_sint32_sfixed64_131 = 131;
-  map<sint32, sint32> field_map_sint32_sint32_132 = 132;
-  map<sint32, sint64> field_map_sint32_sint64_133 = 133;
-  map<sint32, string> field_map_sint32_string_134 = 134;
-  map<sint32, uint32> field_map_sint32_uint32_135 = 135;
-  map<sint32, uint64> field_map_sint32_uint64_136 = 136;
-  map<sint64, bool> field_map_sint64_bool_137 = 137;
-  map<sint64, bytes> field_map_sint64_bytes_138 = 138;
-  map<sint64, double> field_map_sint64_double_139 = 139;
-  map<sint64, Proto3MessageLite.TestEnum> field_map_sint64_enum_140 = 140;
-  map<sint64, fixed32> field_map_sint64_fixed32_141 = 141;
-  map<sint64, fixed64> field_map_sint64_fixed64_142 = 142;
-  map<sint64, float> field_map_sint64_float_143 = 143;
-  map<sint64, int32> field_map_sint64_int32_144 = 144;
-  map<sint64, int64> field_map_sint64_int64_145 = 145;
-  map<sint64, Proto3MessageLite> field_map_sint64_message_146 = 146;
-  map<sint64, sfixed32> field_map_sint64_sfixed32_147 = 147;
-  map<sint64, sfixed64> field_map_sint64_sfixed64_148 = 148;
-  map<sint64, sint32> field_map_sint64_sint32_149 = 149;
-  map<sint64, sint64> field_map_sint64_sint64_150 = 150;
-  map<sint64, string> field_map_sint64_string_151 = 151;
-  map<sint64, uint32> field_map_sint64_uint32_152 = 152;
-  map<sint64, uint64> field_map_sint64_uint64_153 = 153;
-  map<string, bool> field_map_string_bool_154 = 154;
-  map<string, bytes> field_map_string_bytes_155 = 155;
-  map<string, double> field_map_string_double_156 = 156;
-  map<string, Proto3MessageLite.TestEnum> field_map_string_enum_157 = 157;
-  map<string, fixed32> field_map_string_fixed32_158 = 158;
-  map<string, fixed64> field_map_string_fixed64_159 = 159;
-  map<string, float> field_map_string_float_160 = 160;
-  map<string, int32> field_map_string_int32_161 = 161;
-  map<string, int64> field_map_string_int64_162 = 162;
-  map<string, Proto3MessageLite> field_map_string_message_163 = 163;
-  map<string, sfixed32> field_map_string_sfixed32_164 = 164;
-  map<string, sfixed64> field_map_string_sfixed64_165 = 165;
-  map<string, sint32> field_map_string_sint32_166 = 166;
-  map<string, sint64> field_map_string_sint64_167 = 167;
-  map<string, string> field_map_string_string_168 = 168;
-  map<string, uint32> field_map_string_uint32_169 = 169;
-  map<string, uint64> field_map_string_uint64_170 = 170;
-  map<uint32, bool> field_map_uint32_bool_171 = 171;
-  map<uint32, bytes> field_map_uint32_bytes_172 = 172;
-  map<uint32, double> field_map_uint32_double_173 = 173;
-  map<uint32, Proto3MessageLite.TestEnum> field_map_uint32_enum_174 = 174;
-  map<uint32, fixed32> field_map_uint32_fixed32_175 = 175;
-  map<uint32, fixed64> field_map_uint32_fixed64_176 = 176;
-  map<uint32, float> field_map_uint32_float_177 = 177;
-  map<uint32, int32> field_map_uint32_int32_178 = 178;
-  map<uint32, int64> field_map_uint32_int64_179 = 179;
-  map<uint32, Proto3MessageLite> field_map_uint32_message_180 = 180;
-  map<uint32, sfixed32> field_map_uint32_sfixed32_181 = 181;
-  map<uint32, sfixed64> field_map_uint32_sfixed64_182 = 182;
-  map<uint32, sint32> field_map_uint32_sint32_183 = 183;
-  map<uint32, sint64> field_map_uint32_sint64_184 = 184;
-  map<uint32, string> field_map_uint32_string_185 = 185;
-  map<uint32, uint32> field_map_uint32_uint32_186 = 186;
-  map<uint32, uint64> field_map_uint32_uint64_187 = 187;
-  map<uint64, bool> field_map_uint64_bool_188 = 188;
-  map<uint64, bytes> field_map_uint64_bytes_189 = 189;
-  map<uint64, double> field_map_uint64_double_190 = 190;
-  map<uint64, Proto3MessageLite.TestEnum> field_map_uint64_enum_191 = 191;
-  map<uint64, fixed32> field_map_uint64_fixed32_192 = 192;
-  map<uint64, fixed64> field_map_uint64_fixed64_193 = 193;
-  map<uint64, float> field_map_uint64_float_194 = 194;
-  map<uint64, int32> field_map_uint64_int32_195 = 195;
-  map<uint64, int64> field_map_uint64_int64_196 = 196;
-  map<uint64, Proto3MessageLite> field_map_uint64_message_197 = 197;
-  map<uint64, sfixed32> field_map_uint64_sfixed32_198 = 198;
-  map<uint64, sfixed64> field_map_uint64_sfixed64_199 = 199;
-  map<uint64, sint32> field_map_uint64_sint32_200 = 200;
-  map<uint64, sint64> field_map_uint64_sint64_201 = 201;
-  map<uint64, string> field_map_uint64_string_202 = 202;
-  map<uint64, uint32> field_map_uint64_uint32_203 = 203;
-  map<uint64, uint64> field_map_uint64_uint64_204 = 204;
-}
diff --git a/libs/protobuf/java/core/src/test/proto/com/google/protobuf/test_bad_identifiers.proto b/libs/protobuf/java/core/src/test/proto/com/google/protobuf/test_bad_identifiers.proto
deleted file mode 100644
index 58665e0..0000000
--- a/libs/protobuf/java/core/src/test/proto/com/google/protobuf/test_bad_identifiers.proto
+++ /dev/null
@@ -1,241 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: jonp@google.com (Jon Perlow)
-
-// This file tests that various identifiers work as field and type names even
-// though the same identifiers are used internally by the java code generator.
-// LINT: LEGACY_NAMES
-
-syntax = "proto2";
-
-package io_protocol_tests;
-
-option java_generic_services = true;  // auto-added
-option java_package = "com.google.protobuf";
-option java_outer_classname = "TestBadIdentifiersProto";
-
-// Message with field names using underscores that conflict with accessors in
-// the base message class in java. See kForbiddenWordList in
-// src/google/protobuf/compiler/java/java_helpers.cc
-message ForbiddenWordsUnderscoreMessage {
-  // java.lang.Object
-  optional bool class = 1;
-  // com.google.protobuf.MessageLiteOrBuilder
-  optional bool default_instance_for_type = 2;
-  // com.google.protobuf.MessageLite
-  optional bool parser_for_type = 3;
-  optional bool serialized_size = 4;
-  // com.google.protobuf.MessageOrBuilder
-  optional bool all_fields = 5;
-  optional bool descriptor_for_type = 6;
-  optional bool initialization_error_string = 7;
-  optional bool unknown_fields = 8;
-  // obsolete. kept for backwards compatibility of generated code
-  optional bool cached_size = 9;
-}
-
-// Message with field names using leading underscores that conflict with
-// accessors in the base message class in java. See kForbiddenWordList in
-// src/google/protobuf/compiler/java/java_helpers.cc
-message ForbiddenWordsLeadingUnderscoreMessage {
-  // java.lang.Object
-  optional bool _class = 1;
-  // com.google.protobuf.MessageLiteOrBuilder
-  optional bool _default_instance_for_type = 2;
-  // com.google.protobuf.MessageLite
-  optional bool _parser_for_type = 3;
-  optional bool _serialized_size = 4;
-  // com.google.protobuf.MessageOrBuilder
-  optional bool _all_fields = 5;
-  optional bool _descriptor_for_type = 6;
-  optional bool _initialization_error_string = 7;
-  // TODO(b/219045204): re-enable
-  // optional bool _unknown_fields = 8;
-  // obsolete. kept for backwards compatibility of generated code
-  optional bool _cached_size = 9;
-}
-
-// Message with field names in camel case that conflict with accessors in the
-// base message class in java. See kForbiddenWordList in
-// src/google/protobuf/compiler/java/java_helpers.cc
-message ForbiddenWordsCamelMessage {
-  // java.lang.Object
-  optional bool class = 1;
-  // com.google.protobuf.MessageLiteOrBuilder
-  optional bool defaultInstanceForType = 2;
-  // com.google.protobuf.MessageLite
-  optional bool serializedSize = 3;
-  optional bool parserForType = 4;
-  // com.google.protobuf.MessageOrBuilder:
-  optional bool initializationErrorString = 5;
-  optional bool descriptorForType = 6;
-  optional bool allFields = 7;
-  // TODO(b/219045204): re-enable
-  // optional bool unknownFields = 8;
-  // obsolete. kept for backwards compatibility of generated code
-  optional bool cachedSize = 9;
-}
-
-message Descriptor {
-  option no_standard_descriptor_accessor = true;
-
-  optional string descriptor = 1;
-  message NestedDescriptor {
-    option no_standard_descriptor_accessor = true;
-
-    optional string descriptor = 1;
-  }
-  optional NestedDescriptor nested_descriptor = 2;
-  enum NestedEnum {
-    UNKNOWN = 0;
-    FOO = 1;
-  }
-}
-
-message Parser {
-  enum ParserEnum {
-    UNKNOWN = 0;
-    PARSER = 1;
-  }
-  optional ParserEnum parser = 1;
-}
-
-message Deprecated {
-  enum TestEnum {
-    UNKNOWN = 0;
-    FOO = 1;
-
-    // Test if @Deprecated annotation conflicts with Deprecated message name.
-    BAR = 2 [deprecated = true];
-  }
-
-  optional int32 field1 = 1 [deprecated = true];
-  optional TestEnum field2 = 2 [deprecated = true];
-  optional ForbiddenWordsUnderscoreMessage field3 = 3 [deprecated = true];
-}
-
-message Override {
-  optional int32 override = 1;
-}
-
-message Object {
-  optional int32 object = 1;
-  optional string string_object = 2;
-}
-
-message String {
-  optional string string = 1;
-}
-
-message Integer {
-  optional int32 integer = 1;
-}
-
-message Long {
-  optional int32 long = 1;
-}
-
-message Float {
-  optional float float = 1;
-}
-
-message Double {
-  optional double double = 1;
-}
-
-service TestConflictingMethodNames {
-  rpc Override(ForbiddenWordsUnderscoreMessage)
-      returns (ForbiddenWordsUnderscoreMessage);
-}
-
-message TestConflictingFieldNames {
-  enum TestEnum {
-    UNKNOWN = 0;
-    FOO = 1;
-  }
-  message ForbiddenWordsUnderscoreMessage {}
-  repeated int32 int32_field = 1;
-  repeated TestEnum enum_field = 2;
-  repeated string string_field = 3;
-  repeated bytes bytes_field = 4;
-  repeated ForbiddenWordsUnderscoreMessage message_field = 5;
-
-  optional int32 int32_field_count = 11;
-  optional TestEnum enum_field_count = 12;
-  optional string string_field_count = 13;
-  optional bytes bytes_field_count = 14;
-  optional ForbiddenWordsUnderscoreMessage message_field_count = 15;
-
-  repeated int32 Int32Field = 21;                              // NO_PROTO3
-  repeated TestEnum EnumField = 22;                            // NO_PROTO3
-  repeated string StringField = 23;                            // NO_PROTO3
-  repeated bytes BytesField = 24;                              // NO_PROTO3
-  repeated ForbiddenWordsUnderscoreMessage MessageField = 25;  // NO_PROTO3
-
-  // This field conflicts with "int32_field" as they both generate
-  // the method getInt32FieldList().
-  required int32 int32_field_list = 31;  // NO_PROTO3
-
-  // These field pairs have the same Java converted name
-  optional string field_name = 32;   // NO_PROTO3
-  optional string field__name = 33;  // NO_PROTO3
-  optional int32 _2conflict = 34;    // NO_PROTO3
-  optional int32 __2conflict = 35;
-
-  extensions 1000 to max;  // NO_PROTO3
-
-  repeated int64 int64_field = 41;
-  extend TestConflictingFieldNames {  // NO_PROTO3
-    // We don't generate accessors for extensions so the following extension
-    // fields don't conflict with the repeated field "int64_field".
-    optional int64 int64_field_count = 1001;  // NO_PROTO3
-    optional int64 int64_field_list = 1002;   // NO_PROTO3
-  }                                           // NO_PROTO3
-}
-
-message TestMapField {
-  message MapField {}
-  message Pair {}
-  message Message {}
-
-  map<int32, int32> map_field = 1;
-}
-
-message TestLeadingNumberFields {
-  optional int32 _30day_impressions = 1;
-  repeated string _60day_impressions = 2;
-
-  optional string __2_underscores = 3;
-  repeated string __2repeated_underscores = 4;
-
-  optional int32 _32 = 32;
-  repeated int64 _64 = 64;
-}
diff --git a/libs/protobuf/java/core/src/test/proto/com/google/protobuf/test_check_utf8.proto b/libs/protobuf/java/core/src/test/proto/com/google/protobuf/test_check_utf8.proto
deleted file mode 100644
index 119c1dc..0000000
--- a/libs/protobuf/java/core/src/test/proto/com/google/protobuf/test_check_utf8.proto
+++ /dev/null
@@ -1,51 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: Jacob Butcher (jbaum@google.com)
-//
-// Test file option java_string_check_utf8.
-syntax = "proto2";
-
-package proto2_test_check_utf8;
-
-option java_outer_classname = "TestCheckUtf8";
-option java_string_check_utf8 = true;
-
-message StringWrapper {
-  required string req = 1;
-  optional string opt = 2;
-  repeated string rep = 3;
-}
-
-message BytesWrapper {
-  required bytes req = 1;
-  optional bytes opt = 2;
-  repeated bytes rep = 3;
-}
diff --git a/libs/protobuf/java/core/src/test/proto/com/google/protobuf/test_check_utf8_size.proto b/libs/protobuf/java/core/src/test/proto/com/google/protobuf/test_check_utf8_size.proto
deleted file mode 100644
index f06d76d..0000000
--- a/libs/protobuf/java/core/src/test/proto/com/google/protobuf/test_check_utf8_size.proto
+++ /dev/null
@@ -1,52 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: Jacob Butcher (jbaum@google.com)
-//
-// Test file option java_string_check_utf8.
-syntax = "proto2";
-
-package proto2_test_check_utf8_size;
-
-option java_outer_classname = "TestCheckUtf8Size";
-option java_string_check_utf8 = true;
-option optimize_for = CODE_SIZE;
-
-message StringWrapperSize {
-  required string req = 1;
-  optional string opt = 2;
-  repeated string rep = 3;
-}
-
-message BytesWrapperSize {
-  required bytes req = 1;
-  optional bytes opt = 2;
-  repeated bytes rep = 3;
-}
diff --git a/libs/protobuf/java/core/src/test/proto/com/google/protobuf/test_custom_options.proto b/libs/protobuf/java/core/src/test/proto/com/google/protobuf/test_custom_options.proto
deleted file mode 100644
index dde4ca5..0000000
--- a/libs/protobuf/java/core/src/test/proto/com/google/protobuf/test_custom_options.proto
+++ /dev/null
@@ -1,44 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: Feng Xiao (xiaofeng@google.com)
-//
-// Test that custom options defined in a proto file's dependencies are properly
-// initialized.
-syntax = "proto2";
-
-package protobuf_unittest;
-
-import "google/protobuf/unittest_custom_options.proto";
-
-
-message TestMessageWithCustomOptionsContainer {
-  optional TestMessageWithCustomOptions field = 1;
-}
diff --git a/libs/protobuf/java/core/src/test/proto/com/google/protobuf/wrappers_test.proto b/libs/protobuf/java/core/src/test/proto/com/google/protobuf/wrappers_test.proto
deleted file mode 100644
index 60f49e0..0000000
--- a/libs/protobuf/java/core/src/test/proto/com/google/protobuf/wrappers_test.proto
+++ /dev/null
@@ -1,51 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto3";
-
-package wrappers_test;
-
-import "google/protobuf/wrappers.proto";
-
-option java_package = "com.google.protobuf.wrapperstest";
-option java_outer_classname = "WrappersTestProto";
-
-message TopLevelMessage {
-  int32 field1 = 1;
-  .google.protobuf.DoubleValue field_double = 2;
-  .google.protobuf.FloatValue field_float = 3;
-  .google.protobuf.Int64Value field_int64 = 4;
-  .google.protobuf.UInt64Value field_uint64 = 5;
-  .google.protobuf.Int32Value field_int32 = 6;
-  .google.protobuf.UInt32Value field_uint32 = 7;
-  .google.protobuf.BoolValue field_bool = 8;
-  .google.protobuf.StringValue field_string = 9;
-  .google.protobuf.BytesValue field_bytes = 10;
-}
diff --git a/libs/protobuf/java/internal/BUILD.bazel b/libs/protobuf/java/internal/BUILD.bazel
deleted file mode 100644
index 662dabd..0000000
--- a/libs/protobuf/java/internal/BUILD.bazel
+++ /dev/null
@@ -1,13 +0,0 @@
-package(default_visibility = ["//java:__subpackages__"])
-
-load("@rules_pkg//:mappings.bzl", "pkg_files", "strip_prefix")
-
-pkg_files(
-    name = "dist_files",
-    srcs = [
-        "BUILD.bazel",
-        "testing.bzl",
-    ],
-    strip_prefix = strip_prefix.from_root(""),
-    visibility = ["//java:__pkg__"],
-)
diff --git a/libs/protobuf/java/internal/testing.bzl b/libs/protobuf/java/internal/testing.bzl
deleted file mode 100644
index 76e1e45..0000000
--- a/libs/protobuf/java/internal/testing.bzl
+++ /dev/null
@@ -1,72 +0,0 @@
-"""
-Generates a side-car JUnit suite test runner class for each
-input src.
-"""
-_template = """import org.junit.runners.Suite;
-import org.junit.runner.RunWith;
-
-@RunWith(Suite.class)
-@Suite.SuiteClasses({%s})
-public class %s {}
-"""
-
-def _as_classname(fname, pkg):
-    path_name = [x.path for x in fname.files.to_list()][0]
-    file_name = path_name.split("/")[-1]
-    return ".".join([pkg, file_name.split(".")[0]]) + ".class"
-
-def _gen_suite_impl(ctx):
-    classes = ",".join(
-        [_as_classname(x, ctx.attr.package_name) for x in ctx.attr.srcs],
-    )
-    ctx.actions.write(output = ctx.outputs.out, content = _template % (
-        classes,
-        ctx.attr.outname,
-    ))
-
-_gen_suite = rule(
-    attrs = {
-        "srcs": attr.label_list(allow_files = True),
-        "package_name": attr.string(),
-        "outname": attr.string(),
-    },
-    outputs = {"out": "%{name}.java"},
-    implementation = _gen_suite_impl,
-)
-
-def junit_tests(name, srcs, data = [], deps = [], package_name = "com.google.protobuf", test_prefix = None, **kwargs):
-    testlib_name = "%s_lib" % name
-    native.java_library(
-        name = testlib_name,
-        srcs = srcs,
-        deps = deps,
-        resources = data,
-        data = data,
-    )
-    test_names = []
-    prefix = name.replace("-", "_") + "TestSuite"
-    for src in srcs:
-        test_name = src.rsplit("/", 1)[1].split(".")[0]
-        if not test_name.endswith("Test") or test_name.startswith("Abstract"):
-            continue
-        if test_prefix:
-            test_name = "%s%s" % (test_prefix, test_name)  
-        test_names = test_names + [test_name]
-        suite_name = prefix + '_' + test_name
-        _gen_suite(
-            name = suite_name,
-            srcs = [src],
-            package_name = package_name,
-            outname = suite_name,
-        )
-        native.java_test(
-            name = test_name,
-            test_class = suite_name,
-            srcs = [src] + [":" + suite_name],
-            deps = deps + [":%s" % testlib_name],
-            **kwargs
-        )
-    native.test_suite(
-        name = name,
-        tests = test_names,
-    )
diff --git a/libs/protobuf/java/kotlin-lite/BUILD.bazel b/libs/protobuf/java/kotlin-lite/BUILD.bazel
deleted file mode 100644
index d3d9ddf..0000000
--- a/libs/protobuf/java/kotlin-lite/BUILD.bazel
+++ /dev/null
@@ -1,234 +0,0 @@
-load("@io_bazel_rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
-load("@rules_java//java:defs.bzl", "java_lite_proto_library")
-load("@rules_jvm_external//:kt_defs.bzl", "kt_jvm_export")
-load("@rules_pkg//:mappings.bzl", "pkg_files", "strip_prefix")
-load("//:protobuf.bzl", "internal_gen_kt_protos")
-load("//:protobuf_version.bzl", "PROTOBUF_JAVA_VERSION")
-
-java_lite_proto_library(
-    name = "example_extensible_message_java_proto_lite",
-    deps = ["//java/kotlin:example_extensible_message_proto"],
-)
-
-kt_jvm_library(
-    name = "lite_extensions",
-    srcs = ["src/main/kotlin/com/google/protobuf/ExtendableMessageLiteExtensions.kt"],
-    deps = ["//java/lite"],
-)
-
-internal_gen_kt_protos(
-    name = "gen_well_known_protos_kotlinlite",
-    lite = True,
-    deps = [
-        "//:any_proto",
-        "//:api_proto",
-        "//:duration_proto",
-        "//:empty_proto",
-        "//:field_mask_proto",
-        "//:source_context_proto",
-        "//:struct_proto",
-        "//:timestamp_proto",
-        "//:type_proto",
-        "//:wrappers_proto",
-    ],
-)
-
-kt_jvm_library(
-    name = "well_known_protos_kotlin_lite",
-    srcs = [
-        ":gen_well_known_protos_kotlinlite",
-    ],
-    deps = [
-        "//java/kotlin:only_for_use_in_proto_generated_code_its_generator_and_tests",
-        "//java/kotlin:shared_runtime",
-        "//java/lite",
-    ],
-)
-
-kt_jvm_export(
-    name = "kotlin-lite_mvn",
-    deploy_env = [
-        "@com_github_jetbrains_kotlin//:kotlin-stdlib",
-        "//java/lite",
-    ],
-    maven_coordinates = "com.google.protobuf:protobuf-kotlin-lite:%s" % PROTOBUF_JAVA_VERSION,
-    pom_template = "//java/kotlin-lite:pom_template.xml",
-    resources = ["//:well_known_type_protos"],
-    tags = ["manual"],
-    runtime_deps = [
-        ":lite_extensions",
-        ":well_known_protos_kotlin_lite",
-        "//java/kotlin:bytestring_lib",
-        "//java/kotlin:only_for_use_in_proto_generated_code_its_generator_and_tests",
-        "//java/kotlin:shared_runtime",
-    ],
-)
-
-filegroup(
-    name = "release",
-    srcs = [
-        ":kotlin-lite_mvn-docs",
-        ":kotlin-lite_mvn-maven-source",
-        ":kotlin-lite_mvn-pom",
-        ":kotlin-lite_mvn-project",
-    ],
-    visibility = ["//java:__pkg__"],
-)
-
-test_suite(
-    name = "tests",
-    tests = [
-        "proto2_test_lite",
-        "proto3_test_lite",
-        "test_lite_extensions",
-    ],
-)
-
-kt_jvm_library(
-    name = "test_lite_extensions_library",
-    srcs = ["src/test/kotlin/com/google/protobuf/ExtendableMessageLiteExtensionsTest.kt"],
-    deps = [
-        ":example_extensible_message_java_proto_lite",
-        ":lite_extensions",
-        "//java/kotlin:only_for_use_in_proto_generated_code_its_generator_and_tests",
-        "//java/kotlin:shared_runtime",
-        "//java/lite",
-        "@com_github_jetbrains_kotlin//:kotlin-test",
-        "@maven//:com_google_truth_truth",
-        "@maven//:junit_junit",
-    ],
-)
-
-java_test(
-    name = "test_lite_extensions",
-    test_class = "com.google.protobuf.kotlin.ExtendableMessageLiteExtensionsTest",
-    runtime_deps = [":test_lite_extensions_library"],
-)
-
-java_lite_proto_library(
-    name = "evil_names_proto2_java_proto_lite",
-    deps = ["//java/kotlin:evil_names_proto2"],
-)
-
-internal_gen_kt_protos(
-    name = "gen_evil_names_proto2_lite",
-    lite = True,
-    deps = ["//java/kotlin:evil_names_proto2"],
-)
-
-java_lite_proto_library(
-    name = "evil_names_proto3_java_proto_lite",
-    deps = ["//java/kotlin:evil_names_proto3"],
-)
-
-internal_gen_kt_protos(
-    name = "gen_evil_names_proto3_lite",
-    lite = True,
-    deps = ["//java/kotlin:evil_names_proto3"],
-)
-
-java_lite_proto_library(
-    name = "multiple_files_proto3_java_proto_lite",
-    deps = ["//java/kotlin:multiple_files_proto3"],
-)
-
-internal_gen_kt_protos(
-    name = "gen_kotlin_proto3_java_multiple_files_lite",
-    deps = ["//java/kotlin:multiple_files_proto3"],
-)
-
-internal_gen_kt_protos(
-    name = "gen_kotlin_unittest_lite",
-    lite = True,
-    deps = ["//:kt_unittest_lite"],
-)
-
-kt_jvm_library(
-    name = "kotlin_unittest_lite",
-    srcs = [
-        ":gen_evil_names_proto2_lite",
-        ":gen_kotlin_unittest_lite",
-    ],
-    deps = [
-        ":evil_names_proto2_java_proto_lite",
-        "//java/core:generic_test_protos_java_proto_lite",
-        "//java/kotlin:only_for_use_in_proto_generated_code_its_generator_and_tests",
-        "//java/kotlin:shared_runtime",
-        "//java/lite",
-    ],
-)
-
-internal_gen_kt_protos(
-    name = "gen_kotlin_proto3_unittest_lite",
-    lite = True,
-    deps = ["//:kt_proto3_unittest"],
-)
-
-kt_jvm_library(
-    name = "kotlin_proto3_unittest_lite",
-    srcs = [
-        ":gen_evil_names_proto3_lite",
-        ":gen_kotlin_proto3_java_multiple_files_lite",
-        ":gen_kotlin_proto3_unittest_lite",
-    ],
-    deps = [
-        ":evil_names_proto3_java_proto_lite",
-        ":multiple_files_proto3_java_proto_lite",
-        "//java/core:generic_test_protos_java_proto_lite",
-        "//java/kotlin:only_for_use_in_proto_generated_code_its_generator_and_tests",
-        "//java/kotlin:shared_runtime",
-        "//java/lite",
-    ],
-)
-
-kt_jvm_library(
-    name = "proto2_test_lite_library",
-    srcs = ["src/test/kotlin/com/google/protobuf/Proto2LiteTest.kt"],
-    deps = [
-        ":kotlin_unittest_lite",
-        "//java/core:test_util_lite",
-        "@maven//:com_google_truth_truth",
-        "@maven//:junit_junit",
-    ],
-)
-
-java_test(
-    name = "proto2_test_lite",
-    test_class = "com.google.protobuf.kotlin.Proto2LiteTest",
-    runtime_deps = [":proto2_test_lite_library"],
-)
-
-kt_jvm_library(
-    name = "proto3_test_lite_library",
-    srcs = ["//java/kotlin:src/test/kotlin/com/google/protobuf/Proto3Test.kt"],
-    deps = [
-        ":kotlin_proto3_unittest_lite",
-        "//java/core:test_util_lite",
-        "@maven//:com_google_truth_truth",
-        "@maven//:junit_junit",
-    ],
-)
-
-java_test(
-    name = "proto3_test_lite",
-    test_class = "com.google.protobuf.kotlin.Proto3Test",
-    runtime_deps = [":proto3_test_lite_library"],
-)
-
-pkg_files(
-    name = "dist_files",
-    srcs = glob([
-        "src/main/kotlin/com/google/protobuf/*.kt",
-        "src/test/kotlin/**/*.kt",
-    ]) + [
-        "BUILD.bazel",
-        "generate-sources-build.xml",
-        "generate-test-sources-build.xml",
-        "lite.awk",
-        "pom.xml",
-        "pom_template.xml",
-        "process-lite-sources-build.xml",
-    ],
-    strip_prefix = strip_prefix.from_root(""),
-    visibility = ["//java:__pkg__"],
-)
diff --git a/libs/protobuf/java/kotlin-lite/generate-sources-build.xml b/libs/protobuf/java/kotlin-lite/generate-sources-build.xml
deleted file mode 100644
index ab9cfea..0000000
--- a/libs/protobuf/java/kotlin-lite/generate-sources-build.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<project name="generate-sources">
-    <echo message="Running protoc ..."/>
-    <mkdir dir="${generated.sources.dir}"/>
-    <exec executable="${protoc}">
-        <arg value="--kotlin_out=lite:${generated.sources.dir}"/>
-        <arg value="--proto_path=${protobuf.source.dir}"/>
-        <arg value="${protobuf.source.dir}/google/protobuf/any.proto"/>
-        <arg value="${protobuf.source.dir}/google/protobuf/api.proto"/>
-        <arg value="${protobuf.source.dir}/google/protobuf/duration.proto"/>
-        <arg value="${protobuf.source.dir}/google/protobuf/empty.proto"/>
-        <arg value="${protobuf.source.dir}/google/protobuf/field_mask.proto"/>
-        <arg value="${protobuf.source.dir}/google/protobuf/source_context.proto"/>
-        <arg value="${protobuf.source.dir}/google/protobuf/struct.proto"/>
-        <arg value="${protobuf.source.dir}/google/protobuf/timestamp.proto"/>
-        <arg value="${protobuf.source.dir}/google/protobuf/type.proto"/>
-        <arg value="${protobuf.source.dir}/google/protobuf/wrappers.proto"/>
-    </exec>
-</project>
-
diff --git a/libs/protobuf/java/kotlin-lite/generate-test-sources-build.xml b/libs/protobuf/java/kotlin-lite/generate-test-sources-build.xml
deleted file mode 100644
index ed88620..0000000
--- a/libs/protobuf/java/kotlin-lite/generate-test-sources-build.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<project name="generate-test-sources">
-    <mkdir dir="${generated.testsources.dir}"/>
-    <exec executable="${protoc}">
-        <arg value="--java_out=lite:${generated.testsources.dir}"/>
-        <arg value="--proto_path=${protobuf.source.dir}"/>
-        <arg value="--proto_path=${protobuf.basedir}/java/kotlin/${test.proto.dir}"/>
-        <arg value="--experimental_allow_proto3_optional"/>
-        <arg value="${protobuf.source.dir}/google/protobuf/map_lite_unittest.proto"/>
-        <arg value="${protobuf.source.dir}/google/protobuf/unittest.proto"/>
-        <arg value="${protobuf.source.dir}/google/protobuf/unittest_import.proto"/>
-        <arg value="${protobuf.source.dir}/google/protobuf/unittest_import_lite.proto"/>
-        <arg value="${protobuf.source.dir}/google/protobuf/unittest_import_public.proto"/>
-        <arg value="${protobuf.source.dir}/google/protobuf/unittest_import_public_lite.proto"/>
-        <arg value="${protobuf.source.dir}/google/protobuf/unittest_lite.proto"/>
-        <arg value="${protobuf.source.dir}/google/protobuf/unittest_proto3_lite.proto"/>
-        <arg value="${protobuf.basedir}/java/kotlin/${test.proto.dir}/com/google/protobuf/evil_names_proto2.proto"/>
-        <arg value="${protobuf.basedir}/java/kotlin/${test.proto.dir}/com/google/protobuf/evil_names_proto3.proto"/>
-        <arg value="${protobuf.basedir}/java/kotlin/${test.proto.dir}/com/google/protobuf/example_extensible_message.proto"/>
-        <arg value="${protobuf.basedir}/java/kotlin/${test.proto.dir}/com/google/protobuf/multiple_files_proto3.proto"/>
-    </exec>
-    <exec executable="${protoc}">
-      <arg value="--kotlin_out=lite:${generated.testsources.dir}"/>
-      <arg value="--proto_path=${protobuf.source.dir}"/>
-      <arg value="--proto_path=${protobuf.basedir}/java/kotlin/${test.proto.dir}"/>
-      <arg value="--experimental_allow_proto3_optional"/>
-      <arg value="${protobuf.source.dir}/google/protobuf/map_lite_unittest.proto"/>
-      <arg value="${protobuf.source.dir}/google/protobuf/unittest_lite.proto"/>
-      <arg value="${protobuf.source.dir}/google/protobuf/unittest_proto3_lite.proto"/>
-      <arg value="${protobuf.basedir}/java/kotlin/${test.proto.dir}/com/google/protobuf/evil_names_proto2.proto"/>
-      <arg value="${protobuf.basedir}/java/kotlin/${test.proto.dir}/com/google/protobuf/evil_names_proto3.proto"/>
-      <arg value="${protobuf.basedir}/java/kotlin/${test.proto.dir}/com/google/protobuf/example_extensible_message.proto"/>
-      <arg value="${protobuf.basedir}/java/kotlin/${test.proto.dir}/com/google/protobuf/multiple_files_proto3.proto"/>
-    </exec>
-</project>
diff --git a/libs/protobuf/java/kotlin-lite/lite.awk b/libs/protobuf/java/kotlin-lite/lite.awk
deleted file mode 100644
index b22d965..0000000
--- a/libs/protobuf/java/kotlin-lite/lite.awk
+++ /dev/null
@@ -1,25 +0,0 @@
-# Remove code enclosed by "BEGIN FULL-RUNTIME" and "END FULL-RUNTIME" to
-# create the lite-only version of a test file.
-
-BEGIN {
-  in_full_runtime = 0;
-}
-
-/BEGIN FULL-RUNTIME/ {
-  in_full_runtime = 1;
-  next;
-}
-
-/END FULL-RUNTIME/ {
-  in_full_runtime = 0;
-  next;
-}
-
-in_full_runtime {
-  # Skip full runtime code path.
-  next;
-}
-
-{
-  print;
-}
diff --git a/libs/protobuf/java/kotlin-lite/pom.xml b/libs/protobuf/java/kotlin-lite/pom.xml
deleted file mode 100644
index 50dcc83..0000000
--- a/libs/protobuf/java/kotlin-lite/pom.xml
+++ /dev/null
@@ -1,237 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>com.google.protobuf</groupId>
-    <artifactId>protobuf-parent</artifactId>
-    <version>3.21.12</version>
-  </parent>
-
-  <artifactId>protobuf-kotlin-lite</artifactId>
-
-  <name>Protocol Buffers [Kotlin-Lite]</name>
-  <description>
-    Lite version of Kotlin Protocol Buffers library. This version is optimized for code size, but does
-    not guarantee API/ABI stability.
-  </description>
-
-  <properties>
-    <kotlin.version>1.6.0</kotlin.version>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>protobuf-javalite</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-core</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava-testlib</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.truth</groupId>
-      <artifactId>truth</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.jetbrains.kotlin</groupId>
-      <artifactId>kotlin-stdlib</artifactId>
-      <version>${kotlin.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.jetbrains.kotlin</groupId>
-      <artifactId>kotlin-test</artifactId>
-      <version>${kotlin.version}</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <testResources>
-      <testResource>
-        <directory>${protobuf.source.dir}</directory>
-        <includes>
-          <include>google/protobuf/testdata/golden_message_oneof_implemented</include>
-          <include>google/protobuf/testdata/golden_packed_fields_message</include>
-        </includes>
-      </testResource>
-    </testResources>
-
-    <plugins>
-      <plugin>
-        <artifactId>maven-resources-plugin</artifactId>
-        <version>3.1.0</version>
-        <executions>
-          <execution>
-            <id>copy-kotlin-source-files</id>
-            <phase>generate-sources</phase>
-            <goals>
-              <goal>copy-resources</goal>
-            </goals>
-            <configuration>
-              <outputDirectory>${generated.sources.dir}/com/google/protobuf</outputDirectory>
-              <resources>
-                <resource>
-                  <directory>${basedir}/../kotlin/src/main/kotlin/com/google/protobuf</directory>
-                  <includes>
-                    <include>ByteStrings.kt</include>
-                    <include>DslList.kt</include>
-                    <include>DslMap.kt</include>
-                    <include>DslProxy.kt</include>
-                    <include>ExtensionList.kt</include>
-                    <include>OnlyForUseByGeneratedProtoCode.kt</include>
-                    <include>ProtoDslMarker.kt</include>
-                    <include>UnmodifiableCollections.kt</include>
-                  </includes>
-                </resource>
-              </resources>
-            </configuration>
-          </execution>
-          <execution>
-            <id>copy-test-source-files</id>
-            <phase>generate-test-sources</phase>
-            <goals>
-              <goal>copy-resources</goal>
-            </goals>
-            <configuration>
-              <outputDirectory>${generated.testsources.dir}/com/google/protobuf</outputDirectory>
-              <resources>
-                <resource>
-                  <directory>${basedir}/../core/src/test/java/com/google/protobuf</directory>
-                  <includes>
-                    <include>TestUtilLite.java</include>
-                  </includes>
-                </resource>
-              </resources>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-
-      <!-- Use Antrun plugin to generate sources with protoc -->
-      <plugin>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <executions>
-          <!-- Generate core protos -->
-          <execution>
-            <id>generate-sources</id>
-            <phase>generate-sources</phase>
-            <configuration>
-              <target>
-                <ant antfile="generate-sources-build.xml"/>
-              </target>
-            </configuration>
-            <goals>
-              <goal>run</goal>
-            </goals>
-          </execution>
-
-          <!-- Generate the test protos -->
-          <execution>
-            <id>generate-test-sources</id>
-            <phase>generate-test-sources</phase>
-            <configuration>
-              <target>
-                <ant antfile="generate-test-sources-build.xml"/>
-              </target>
-            </configuration>
-            <goals>
-              <goal>run</goal>
-            </goals>
-          </execution>
-
-          <execution>
-            <id>process-lite-sources</id>
-            <phase>generate-test-sources</phase>
-            <configuration>
-              <target>
-                <ant antfile="process-lite-sources-build.xml"/>
-              </target>
-            </configuration>
-            <goals>
-              <goal>run</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>add-generated-sources</id>
-            <phase>generate-sources</phase>
-            <goals>
-              <goal>add-source</goal>
-            </goals>
-            <configuration>
-              <sources>
-                <source>${generated.sources.dir}</source>
-              </sources>
-            </configuration>
-          </execution>
-
-          <execution>
-            <id>add-generated-test-sources</id>
-            <phase>generate-test-sources</phase>
-            <goals>
-              <goal>add-test-source</goal>
-            </goals>
-            <configuration>
-              <sources>
-                <source>${generated.testsources.dir}</source>
-              </sources>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-
-      <plugin>
-        <groupId>org.jetbrains.kotlin</groupId>
-        <artifactId>kotlin-maven-plugin</artifactId>
-        <version>${kotlin.version}</version>
-        <extensions>true</extensions>
-        <executions>
-          <execution>
-            <id>compile</id>
-            <goals> <goal>compile</goal> </goals>
-            <configuration>
-              <sourceDirs>
-                <sourceDir>${project.basedir}/src/main/kotlin</sourceDir>
-                <sourceDir>${generated.sources.dir}</sourceDir>
-              </sourceDirs>
-            </configuration>
-          </execution>
-          <execution>
-            <id>test-compile</id>
-            <goals> <goal>test-compile</goal> </goals>
-            <configuration>
-              <sourceDirs>
-                <sourceDir>${project.basedir}/src/test/kotlin</sourceDir>
-                <sourceDir>${generated.testsources.dir}</sourceDir>
-              </sourceDirs>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-</project>
diff --git a/libs/protobuf/java/kotlin-lite/pom_template.xml b/libs/protobuf/java/kotlin-lite/pom_template.xml
deleted file mode 100644
index f8a3397..0000000
--- a/libs/protobuf/java/kotlin-lite/pom_template.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>{groupId}</groupId>
-    <artifactId>protobuf-parent</artifactId>
-    <version>{version}</version>
-  </parent>
-
-  <artifactId>{artifactId}</artifactId>
-  <packaging>{type}</packaging>
-
-  <name>Protocol Buffers [Kotlin-Lite]</name>
-  <description>
-    Kotlin lite Protocol Buffers library. Protocol Buffers are a way of encoding structured data in an
-    efficient yet extensible format.
-  </description>
-
-  <properties>
-    <kotlin.version>1.6.0</kotlin.version>
-  </properties>
-</project>
diff --git a/libs/protobuf/java/kotlin-lite/process-lite-sources-build.xml b/libs/protobuf/java/kotlin-lite/process-lite-sources-build.xml
deleted file mode 100644
index d49cf3a..0000000
--- a/libs/protobuf/java/kotlin-lite/process-lite-sources-build.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<project name="process-lite-sources">
-    <exec executable="awk" output="${generated.testsources.dir}/com/google/protobuf/TestUtil.java">
-      <arg value="-f" />
-      <arg value="${basedir}/lite.awk" />
-      <arg value="${basedir}/../core/src/test/java/com/google/protobuf/TestUtil.java" />
-    </exec>
-</project>
diff --git a/libs/protobuf/java/kotlin-lite/src/main/kotlin/com/google/protobuf/ExtendableMessageLiteExtensions.kt b/libs/protobuf/java/kotlin-lite/src/main/kotlin/com/google/protobuf/ExtendableMessageLiteExtensions.kt
deleted file mode 100644
index 6c208b2..0000000
--- a/libs/protobuf/java/kotlin-lite/src/main/kotlin/com/google/protobuf/ExtendableMessageLiteExtensions.kt
+++ /dev/null
@@ -1,58 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf.kotlin
-
-import com.google.protobuf.ExtensionLite
-import com.google.protobuf.GeneratedMessageLite
-
-/** Gets the value of the proto extension. */
-operator fun <
-  M : GeneratedMessageLite.ExtendableMessage<M, *>,
-  MOrBT : GeneratedMessageLite.ExtendableMessageOrBuilder<M, *>,
-  T : Any
-  > MOrBT.get(extension: ExtensionLite<M, T>): T = getExtension(extension)
-
-/** Sets the current value of the proto extension in this builder. */
-operator fun <
-  M : GeneratedMessageLite.ExtendableMessage<M, B>,
-  B : GeneratedMessageLite.ExtendableBuilder<M, B>,
-  T : Any
-  > B.set(extension: ExtensionLite<M, T>, value: T) {
-  setExtension(extension, value)
-}
-
-/** Returns true if the specified extension is set. */
-operator fun <
-  M : GeneratedMessageLite.ExtendableMessage<M, *>,
-  MorBT : GeneratedMessageLite.ExtendableMessageOrBuilder<M, *>
-  > MorBT.contains(
-  extension: ExtensionLite<M, *>
-): Boolean = hasExtension(extension)
diff --git a/libs/protobuf/java/kotlin-lite/src/test/kotlin/com/google/protobuf/ExtendableMessageLiteExtensionsTest.kt b/libs/protobuf/java/kotlin-lite/src/test/kotlin/com/google/protobuf/ExtendableMessageLiteExtensionsTest.kt
deleted file mode 100644
index 53291b4..0000000
--- a/libs/protobuf/java/kotlin-lite/src/test/kotlin/com/google/protobuf/ExtendableMessageLiteExtensionsTest.kt
+++ /dev/null
@@ -1,90 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf.kotlin
-
-import com.google.common.truth.Truth.assertThat
-import com.google.protobuf.kotlin.test.ExampleExtensibleMessage
-import com.google.protobuf.kotlin.test.ExampleExtensibleMessageOuterClass as TestProto
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.junit.runners.JUnit4
-
-@RunWith(JUnit4::class)
-class ExtendableMessageLiteExtensionsTest {
-  @Test
-  fun setOnBuilder() {
-    val builder = ExampleExtensibleMessage.newBuilder()
-    builder[TestProto.int32Extension] = 5
-    assertThat(builder.build().getExtension(TestProto.int32Extension)).isEqualTo(5)
-  }
-
-  @Test
-  fun getOnBuilder() {
-    val builder = ExampleExtensibleMessage.newBuilder()
-      .setExtension(TestProto.int32Extension, 6)
-    assertThat(builder[TestProto.int32Extension]).isEqualTo(6)
-  }
-
-  @Test
-  fun getOnMessage() {
-    val message = ExampleExtensibleMessage.newBuilder()
-      .setExtension(TestProto.int32Extension, 6)
-      .build()
-    assertThat(message[TestProto.int32Extension]).isEqualTo(6)
-  }
-
-  @Test
-  fun containsPositiveOnMessage() {
-    val message = ExampleExtensibleMessage.newBuilder()
-      .setExtension(TestProto.int32Extension, 6)
-      .build()
-    assertThat(TestProto.int32Extension in message).isTrue()
-  }
-
-  @Test
-  fun containsPositiveOnBuilder() {
-    val builder = ExampleExtensibleMessage.newBuilder()
-      .setExtension(TestProto.int32Extension, 6)
-    assertThat(TestProto.int32Extension in builder).isTrue()
-  }
-
-  @Test
-  fun containsNegativeOnMessage() {
-    val message = ExampleExtensibleMessage.newBuilder().build()
-    assertThat(TestProto.int32Extension in message).isFalse()
-  }
-
-  @Test
-  fun containsNegativeOnBuilder() {
-    val builder = ExampleExtensibleMessage.newBuilder()
-    assertThat(TestProto.int32Extension in builder).isFalse()
-  }
-}
diff --git a/libs/protobuf/java/kotlin-lite/src/test/kotlin/com/google/protobuf/Proto2LiteTest.kt b/libs/protobuf/java/kotlin-lite/src/test/kotlin/com/google/protobuf/Proto2LiteTest.kt
deleted file mode 100644
index c343ccd..0000000
--- a/libs/protobuf/java/kotlin-lite/src/test/kotlin/com/google/protobuf/Proto2LiteTest.kt
+++ /dev/null
@@ -1,986 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf.kotlin
-
-import com.google.common.truth.Truth.assertThat
-import com.google.protobuf.TestAllTypesLiteKt
-import com.google.protobuf.TestAllTypesLiteKt.nestedMessage
-import com.google.protobuf.TestUtilLite
-import com.google.protobuf.TestUtilLite.toBytes
-import com.google.protobuf.UnittestImportLite.ImportEnumLite
-import com.google.protobuf.UnittestImportLite.ImportMessageLite
-import com.google.protobuf.UnittestImportPublicLite.PublicImportMessageLite
-import com.google.protobuf.UnittestLite
-import com.google.protobuf.UnittestLite.ForeignEnumLite
-import com.google.protobuf.UnittestLite.TestAllTypesLite
-import com.google.protobuf.UnittestLite.TestAllTypesLite.NestedEnum
-import com.google.protobuf.UnittestLite.TestEmptyMessageLite
-import com.google.protobuf.UnittestLite.TestEmptyMessageWithExtensionsLite
-import com.google.protobuf.copy
-import com.google.protobuf.foreignMessageLite
-import com.google.protobuf.kotlin.generator.EvilNamesProto2OuterClass.EvilNamesProto2
-import com.google.protobuf.kotlin.generator.EvilNamesProto2OuterClass.HardKeywordsAllTypesProto2
-import com.google.protobuf.kotlin.generator.EvilNamesProto2OuterClass.Interface
-import com.google.protobuf.kotlin.generator.HardKeywordsAllTypesProto2Kt
-import com.google.protobuf.kotlin.generator.evilNamesProto2
-import com.google.protobuf.kotlin.generator.hardKeywordsAllTypesProto2
-import com.google.protobuf.kotlin.generator.interface_
-import com.google.protobuf.optionalGroupExtensionLite
-import com.google.protobuf.repeatedGroupExtensionLite
-import com.google.protobuf.testAllExtensionsLite
-import com.google.protobuf.testAllTypesLite
-import com.google.protobuf.testEmptyMessageLite
-import com.google.protobuf.testEmptyMessageWithExtensionsLite
-import protobuf_unittest.MapLiteUnittest.MapEnumLite
-import protobuf_unittest.MapLiteUnittest.TestMapLite
-import protobuf_unittest.testMapLite
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.junit.runners.JUnit4
-
-@RunWith(JUnit4::class)
-class Proto2LiteTest {
-  @Test
-  fun testSetters() {
-    assertThat(
-        testAllTypesLite {
-          optionalInt32 = 101
-          optionalInt64 = 102
-          optionalUint32 = 103
-          optionalUint64 = 104
-          optionalSint32 = 105
-          optionalSint64 = 106
-          optionalFixed32 = 107
-          optionalFixed64 = 108
-          optionalSfixed32 = 109
-          optionalSfixed64 = 110
-          optionalFloat = 111.0f
-          optionalDouble = 112.0
-          optionalBool = true
-          optionalString = "115"
-          optionalBytes = toBytes("116")
-          optionalGroup = TestAllTypesLiteKt.optionalGroup { a = 117 }
-          optionalNestedMessage = nestedMessage { bb = 118 }
-          optionalForeignMessage = foreignMessageLite { c = 119 }
-          optionalImportMessage = ImportMessageLite.newBuilder().setD(120).build()
-          optionalPublicImportMessage = PublicImportMessageLite.newBuilder().setE(126).build()
-          optionalLazyMessage = nestedMessage { bb = 127 }
-          optionalUnverifiedLazyMessage = nestedMessage { bb = 128 }
-          optionalNestedEnum = NestedEnum.BAZ
-          optionalForeignEnum = ForeignEnumLite.FOREIGN_LITE_BAZ
-          optionalImportEnum = ImportEnumLite.IMPORT_LITE_BAZ
-          optionalStringPiece = "124"
-          optionalCord = "125"
-          repeatedInt32.add(201)
-          repeatedInt64.add(202)
-          repeatedUint32.add(203)
-          repeatedUint64.add(204)
-          repeatedSint32.add(205)
-          repeatedSint64.add(206)
-          repeatedFixed32.add(207)
-          repeatedFixed64.add(208)
-          repeatedSfixed32.add(209)
-          repeatedSfixed64.add(210)
-          repeatedFloat.add(211f)
-          repeatedDouble.add(212.0)
-          repeatedBool.add(true)
-          repeatedString.add("215")
-          repeatedBytes.add(toBytes("216"))
-          repeatedGroup.add(TestAllTypesLiteKt.repeatedGroup { a = 217 })
-          repeatedNestedMessage.add(nestedMessage { bb = 218 })
-          repeatedForeignMessage.add(foreignMessageLite { c = 219 })
-          repeatedImportMessage.add(ImportMessageLite.newBuilder().setD(220).build())
-          repeatedLazyMessage.add(nestedMessage { bb = 227 })
-          repeatedNestedEnum.add(NestedEnum.BAR)
-          repeatedForeignEnum.add(ForeignEnumLite.FOREIGN_LITE_BAR)
-          repeatedImportEnum.add(ImportEnumLite.IMPORT_LITE_BAR)
-          repeatedStringPiece.add("224")
-          repeatedCord.add("225")
-          repeatedInt32 += 301
-          repeatedInt64 += 302
-          repeatedUint32 += 303
-          repeatedUint64 += 304
-          repeatedSint32 += 305
-          repeatedSint64 += 306
-          repeatedFixed32 += 307
-          repeatedFixed64 += 308
-          repeatedSfixed32 += 309
-          repeatedSfixed64 += 310
-          repeatedFloat += 311f
-          repeatedDouble += 312.0
-          repeatedBool += false
-          repeatedString += "315"
-          repeatedBytes += toBytes("316")
-          repeatedGroup += TestAllTypesLiteKt.repeatedGroup { a = 317 }
-          repeatedNestedMessage += nestedMessage { bb = 318 }
-          repeatedForeignMessage += foreignMessageLite { c = 319 }
-          repeatedImportMessage += ImportMessageLite.newBuilder().setD(320).build()
-          repeatedLazyMessage += TestAllTypesLiteKt.nestedMessage { bb = 327 }
-          repeatedNestedEnum += NestedEnum.BAZ
-          repeatedForeignEnum += ForeignEnumLite.FOREIGN_LITE_BAZ
-          repeatedImportEnum += ImportEnumLite.IMPORT_LITE_BAZ
-          repeatedStringPiece += "324"
-          repeatedCord += "325"
-          defaultInt32 = 401
-          defaultInt64 = 402
-          defaultUint32 = 403
-          defaultUint64 = 404
-          defaultSint32 = 405
-          defaultSint64 = 406
-          defaultFixed32 = 407
-          defaultFixed64 = 408
-          defaultSfixed32 = 409
-          defaultSfixed64 = 410
-          defaultFloat = 411f
-          defaultDouble = 412.0
-          defaultBool = false
-          defaultString = "415"
-          defaultBytes = toBytes("416")
-          defaultNestedEnum = NestedEnum.FOO
-          defaultForeignEnum = ForeignEnumLite.FOREIGN_LITE_FOO
-          defaultImportEnum = ImportEnumLite.IMPORT_LITE_FOO
-          defaultStringPiece = "424"
-          defaultCord = "425"
-          oneofUint32 = 601
-          oneofNestedMessage = TestAllTypesLiteKt.nestedMessage { bb = 602 }
-          oneofString = "603"
-          oneofBytes = toBytes("604")
-        }
-      )
-      .isEqualTo(TestUtilLite.getAllLiteSetBuilder().build())
-  }
-
-  @Test
-  fun testGetters() {
-    testAllTypesLite {
-      optionalInt32 = 101
-      assertThat(optionalInt32).isEqualTo(101)
-      optionalString = "115"
-      assertThat(optionalString).isEqualTo("115")
-      optionalGroup = TestAllTypesLiteKt.optionalGroup { a = 117 }
-      assertThat(optionalGroup).isEqualTo(TestAllTypesLiteKt.optionalGroup { a = 117 })
-      optionalNestedMessage = TestAllTypesLiteKt.nestedMessage { bb = 118 }
-      assertThat(optionalNestedMessage).isEqualTo(TestAllTypesLiteKt.nestedMessage { bb = 118 })
-      optionalNestedEnum = NestedEnum.BAZ
-      assertThat(optionalNestedEnum).isEqualTo(NestedEnum.BAZ)
-      defaultInt32 = 401
-      assertThat(defaultInt32).isEqualTo(401)
-      oneofUint32 = 601
-      assertThat(oneofUint32).isEqualTo(601)
-    }
-  }
-
-  @Test
-  fun testDefaultGetters() {
-    testAllTypesLite {
-      assertThat(defaultInt32).isEqualTo(41)
-      assertThat(defaultString).isEqualTo("hello")
-      assertThat(defaultNestedEnum).isEqualTo(NestedEnum.BAR)
-      assertThat(defaultStringPiece).isEqualTo("abc")
-    }
-  }
-
-  @Test
-  fun testRepeatedGettersAndSetters() {
-    testAllTypesLite {
-      repeatedInt32.addAll(listOf(1, 2))
-      assertThat(repeatedInt32).isEqualTo(listOf(1, 2))
-      repeatedInt32 += listOf(3, 4)
-      assertThat(repeatedInt32).isEqualTo(listOf(1, 2, 3, 4))
-      repeatedInt32[0] = 5
-      assertThat(repeatedInt32).isEqualTo(listOf(5, 2, 3, 4))
-
-      repeatedString.addAll(listOf("1", "2"))
-      assertThat(repeatedString).isEqualTo(listOf("1", "2"))
-      repeatedString += listOf("3", "4")
-      assertThat(repeatedString).isEqualTo(listOf("1", "2", "3", "4"))
-      repeatedString[0] = "5"
-      assertThat(repeatedString).isEqualTo(listOf("5", "2", "3", "4"))
-
-      repeatedGroup.addAll(
-        listOf(
-          TestAllTypesLiteKt.repeatedGroup { a = 1 },
-          TestAllTypesLiteKt.repeatedGroup { a = 2 }
-        )
-      )
-      assertThat(repeatedGroup)
-        .isEqualTo(
-          listOf(
-            TestAllTypesLiteKt.repeatedGroup { a = 1 },
-            TestAllTypesLiteKt.repeatedGroup { a = 2 }
-          )
-        )
-      repeatedGroup +=
-        listOf(
-          TestAllTypesLiteKt.repeatedGroup { a = 3 },
-          TestAllTypesLiteKt.repeatedGroup { a = 4 }
-        )
-      assertThat(repeatedGroup)
-        .isEqualTo(
-          listOf(
-            TestAllTypesLiteKt.repeatedGroup { a = 1 },
-            TestAllTypesLiteKt.repeatedGroup { a = 2 },
-            TestAllTypesLiteKt.repeatedGroup { a = 3 },
-            TestAllTypesLiteKt.repeatedGroup { a = 4 }
-          )
-        )
-      repeatedGroup[0] = TestAllTypesLiteKt.repeatedGroup { a = 5 }
-      assertThat(repeatedGroup)
-        .isEqualTo(
-          listOf(
-            TestAllTypesLiteKt.repeatedGroup { a = 5 },
-            TestAllTypesLiteKt.repeatedGroup { a = 2 },
-            TestAllTypesLiteKt.repeatedGroup { a = 3 },
-            TestAllTypesLiteKt.repeatedGroup { a = 4 }
-          )
-        )
-
-      repeatedNestedMessage.addAll(listOf(nestedMessage { bb = 1 }, nestedMessage { bb = 2 }))
-      assertThat(repeatedNestedMessage)
-        .isEqualTo(listOf(nestedMessage { bb = 1 }, nestedMessage { bb = 2 }))
-      repeatedNestedMessage += listOf(nestedMessage { bb = 3 }, nestedMessage { bb = 4 })
-      assertThat(repeatedNestedMessage)
-        .isEqualTo(
-          listOf(
-            nestedMessage { bb = 1 },
-            nestedMessage { bb = 2 },
-            nestedMessage { bb = 3 },
-            nestedMessage { bb = 4 }
-          )
-        )
-      repeatedNestedMessage[0] = nestedMessage { bb = 5 }
-      assertThat(repeatedNestedMessage)
-        .isEqualTo(
-          listOf(
-            nestedMessage { bb = 5 },
-            nestedMessage { bb = 2 },
-            nestedMessage { bb = 3 },
-            nestedMessage { bb = 4 }
-          )
-        )
-
-      repeatedNestedEnum.addAll(listOf(NestedEnum.FOO, NestedEnum.BAR))
-      assertThat(repeatedNestedEnum).isEqualTo(listOf(NestedEnum.FOO, NestedEnum.BAR))
-      repeatedNestedEnum += listOf(NestedEnum.BAZ, NestedEnum.FOO)
-      assertThat(repeatedNestedEnum)
-        .isEqualTo(listOf(NestedEnum.FOO, NestedEnum.BAR, NestedEnum.BAZ, NestedEnum.FOO))
-      repeatedNestedEnum[0] = NestedEnum.BAR
-      assertThat(repeatedNestedEnum)
-        .isEqualTo(listOf(NestedEnum.BAR, NestedEnum.BAR, NestedEnum.BAZ, NestedEnum.FOO))
-    }
-  }
-
-  @Test
-  fun testHazzers() {
-    testAllTypesLite {
-      optionalInt32 = 101
-      assertThat(hasOptionalInt32()).isTrue()
-      assertThat(hasOptionalString()).isFalse()
-      optionalGroup = TestAllTypesLiteKt.optionalGroup { a = 117 }
-      assertThat(hasOptionalGroup()).isTrue()
-      assertThat(hasOptionalNestedMessage()).isFalse()
-      optionalNestedEnum = NestedEnum.BAZ
-      assertThat(hasOptionalNestedEnum()).isTrue()
-      assertThat(hasDefaultInt32()).isFalse()
-      oneofUint32 = 601
-      assertThat(hasOneofUint32()).isTrue()
-    }
-
-    testAllTypesLite {
-      assertThat(hasOptionalInt32()).isFalse()
-      optionalString = "115"
-      assertThat(hasOptionalString()).isTrue()
-      assertThat(hasOptionalGroup()).isFalse()
-      optionalNestedMessage = TestAllTypesLiteKt.nestedMessage { bb = 118 }
-      assertThat(hasOptionalNestedMessage()).isTrue()
-      assertThat(hasOptionalNestedEnum()).isFalse()
-      defaultInt32 = 401
-      assertThat(hasDefaultInt32()).isTrue()
-      assertThat(hasOneofUint32()).isFalse()
-    }
-  }
-
-  @Test
-  fun testClears() {
-    testAllTypesLite {
-      optionalInt32 = 101
-      clearOptionalInt32()
-      assertThat(hasOptionalInt32()).isFalse()
-
-      optionalString = "115"
-      clearOptionalString()
-      assertThat(hasOptionalString()).isFalse()
-
-      optionalGroup = TestAllTypesLiteKt.optionalGroup { a = 117 }
-      clearOptionalGroup()
-      assertThat(hasOptionalGroup()).isFalse()
-
-      optionalNestedMessage = TestAllTypesLiteKt.nestedMessage { bb = 118 }
-      clearOptionalNestedMessage()
-      assertThat(hasOptionalNestedMessage()).isFalse()
-
-      optionalNestedEnum = NestedEnum.BAZ
-      clearOptionalNestedEnum()
-      assertThat(hasOptionalNestedEnum()).isFalse()
-
-      defaultInt32 = 401
-      clearDefaultInt32()
-      assertThat(hasDefaultInt32()).isFalse()
-
-      oneofUint32 = 601
-      clearOneofUint32()
-      assertThat(hasOneofUint32()).isFalse()
-    }
-  }
-
-  @Test
-  fun testCopy() {
-    val message = testAllTypesLite {
-      optionalInt32 = 101
-      optionalString = "115"
-    }
-    val modifiedMessage = message.copy { optionalInt32 = 201 }
-
-    assertThat(message)
-      .isEqualTo(
-        TestAllTypesLite.newBuilder().setOptionalInt32(101).setOptionalString("115").build()
-      )
-    assertThat(modifiedMessage)
-      .isEqualTo(
-        TestAllTypesLite.newBuilder().setOptionalInt32(201).setOptionalString("115").build()
-      )
-  }
-
-  @Test
-  fun testOneof() {
-    val message = testAllTypesLite {
-      oneofString = "foo"
-      assertThat(oneofFieldCase).isEqualTo(TestAllTypesLite.OneofFieldCase.ONEOF_STRING)
-      assertThat(oneofString).isEqualTo("foo")
-      clearOneofField()
-      assertThat(hasOneofUint32()).isFalse()
-      assertThat(oneofFieldCase).isEqualTo(TestAllTypesLite.OneofFieldCase.ONEOFFIELD_NOT_SET)
-      oneofUint32 = 5
-    }
-
-    assertThat(message.getOneofFieldCase()).isEqualTo(TestAllTypesLite.OneofFieldCase.ONEOF_UINT32)
-    assertThat(message.getOneofUint32()).isEqualTo(5)
-  }
-
-  @Test
-  fun testExtensionsSet() {
-    assertThat(
-        testAllExtensionsLite {
-          this[UnittestLite.optionalInt32ExtensionLite] = 101
-          this[UnittestLite.optionalInt64ExtensionLite] = 102L
-          this[UnittestLite.optionalUint32ExtensionLite] = 103
-          this[UnittestLite.optionalUint64ExtensionLite] = 104L
-          this[UnittestLite.optionalSint32ExtensionLite] = 105
-          this[UnittestLite.optionalSint64ExtensionLite] = 106L
-          this[UnittestLite.optionalFixed32ExtensionLite] = 107
-          this[UnittestLite.optionalFixed64ExtensionLite] = 108L
-          this[UnittestLite.optionalSfixed32ExtensionLite] = 109
-          this[UnittestLite.optionalSfixed64ExtensionLite] = 110L
-          this[UnittestLite.optionalFloatExtensionLite] = 111F
-          this[UnittestLite.optionalDoubleExtensionLite] = 112.0
-          this[UnittestLite.optionalBoolExtensionLite] = true
-          this[UnittestLite.optionalStringExtensionLite] = "115"
-          this[UnittestLite.optionalBytesExtensionLite] = toBytes("116")
-          this[UnittestLite.optionalGroupExtensionLite] = optionalGroupExtensionLite { a = 117 }
-          this[UnittestLite.optionalNestedMessageExtensionLite] =
-            TestAllTypesLiteKt.nestedMessage { bb = 118 }
-          this[UnittestLite.optionalForeignMessageExtensionLite] = foreignMessageLite { c = 119 }
-          this[UnittestLite.optionalImportMessageExtensionLite] =
-            ImportMessageLite.newBuilder().setD(120).build()
-          this[UnittestLite.optionalPublicImportMessageExtensionLite] =
-            PublicImportMessageLite.newBuilder().setE(126).build()
-          this[UnittestLite.optionalLazyMessageExtensionLite] =
-            TestAllTypesLiteKt.nestedMessage { bb = 127 }
-          this[UnittestLite.optionalUnverifiedLazyMessageExtensionLite] =
-            TestAllTypesLiteKt.nestedMessage { bb = 128 }
-          this[UnittestLite.optionalNestedEnumExtensionLite] = NestedEnum.BAZ
-          this[UnittestLite.optionalForeignEnumExtensionLite] = ForeignEnumLite.FOREIGN_LITE_BAZ
-          this[UnittestLite.optionalImportEnumExtensionLite] = ImportEnumLite.IMPORT_LITE_BAZ
-          this[UnittestLite.optionalStringPieceExtensionLite] = "124"
-          this[UnittestLite.optionalCordExtensionLite] = "125"
-          this[UnittestLite.repeatedInt32ExtensionLite].add(201)
-          this[UnittestLite.repeatedInt64ExtensionLite].add(202L)
-          this[UnittestLite.repeatedUint32ExtensionLite].add(203)
-          this[UnittestLite.repeatedUint64ExtensionLite].add(204L)
-          this[UnittestLite.repeatedSint32ExtensionLite].add(205)
-          this[UnittestLite.repeatedSint64ExtensionLite].add(206L)
-          this[UnittestLite.repeatedFixed32ExtensionLite].add(207)
-          this[UnittestLite.repeatedFixed64ExtensionLite].add(208L)
-          this[UnittestLite.repeatedSfixed32ExtensionLite].add(209)
-          this[UnittestLite.repeatedSfixed64ExtensionLite].add(210L)
-          this[UnittestLite.repeatedFloatExtensionLite].add(211F)
-          this[UnittestLite.repeatedDoubleExtensionLite].add(212.0)
-          this[UnittestLite.repeatedBoolExtensionLite].add(true)
-          this[UnittestLite.repeatedStringExtensionLite].add("215")
-          this[UnittestLite.repeatedBytesExtensionLite].add(toBytes("216"))
-          this[UnittestLite.repeatedGroupExtensionLite].add(repeatedGroupExtensionLite { a = 217 })
-          this[UnittestLite.repeatedNestedMessageExtensionLite].add(
-            TestAllTypesLiteKt.nestedMessage { bb = 218 }
-          )
-          this[UnittestLite.repeatedForeignMessageExtensionLite].add(foreignMessageLite { c = 219 })
-          this[UnittestLite.repeatedImportMessageExtensionLite].add(
-            ImportMessageLite.newBuilder().setD(220).build()
-          )
-          this[UnittestLite.repeatedLazyMessageExtensionLite].add(
-            TestAllTypesLiteKt.nestedMessage { bb = 227 }
-          )
-          this[UnittestLite.repeatedNestedEnumExtensionLite].add(NestedEnum.BAR)
-          this[UnittestLite.repeatedForeignEnumExtensionLite].add(ForeignEnumLite.FOREIGN_LITE_BAR)
-          this[UnittestLite.repeatedImportEnumExtensionLite].add(ImportEnumLite.IMPORT_LITE_BAR)
-          this[UnittestLite.repeatedStringPieceExtensionLite].add("224")
-          this[UnittestLite.repeatedCordExtensionLite].add("225")
-          this[UnittestLite.repeatedInt32ExtensionLite] += 301
-          this[UnittestLite.repeatedInt64ExtensionLite] += 302L
-          this[UnittestLite.repeatedUint32ExtensionLite] += 303
-          this[UnittestLite.repeatedUint64ExtensionLite] += 304L
-          this[UnittestLite.repeatedSint32ExtensionLite] += 305
-          this[UnittestLite.repeatedSint64ExtensionLite] += 306L
-          this[UnittestLite.repeatedFixed32ExtensionLite] += 307
-          this[UnittestLite.repeatedFixed64ExtensionLite] += 308L
-          this[UnittestLite.repeatedSfixed32ExtensionLite] += 309
-          this[UnittestLite.repeatedSfixed64ExtensionLite] += 310L
-          this[UnittestLite.repeatedFloatExtensionLite] += 311F
-          this[UnittestLite.repeatedDoubleExtensionLite] += 312.0
-          this[UnittestLite.repeatedBoolExtensionLite] += false
-          this[UnittestLite.repeatedStringExtensionLite] += "315"
-          this[UnittestLite.repeatedBytesExtensionLite] += toBytes("316")
-          this[UnittestLite.repeatedGroupExtensionLite] += repeatedGroupExtensionLite { a = 317 }
-          this[UnittestLite.repeatedNestedMessageExtensionLite] +=
-            TestAllTypesLiteKt.nestedMessage { bb = 318 }
-          this[UnittestLite.repeatedForeignMessageExtensionLite] += foreignMessageLite { c = 319 }
-          this[UnittestLite.repeatedImportMessageExtensionLite] +=
-            ImportMessageLite.newBuilder().setD(320).build()
-          this[UnittestLite.repeatedLazyMessageExtensionLite] +=
-            TestAllTypesLiteKt.nestedMessage { bb = 327 }
-          this[UnittestLite.repeatedNestedEnumExtensionLite] += NestedEnum.BAZ
-          this[UnittestLite.repeatedForeignEnumExtensionLite] += ForeignEnumLite.FOREIGN_LITE_BAZ
-          this[UnittestLite.repeatedImportEnumExtensionLite] += ImportEnumLite.IMPORT_LITE_BAZ
-          this[UnittestLite.repeatedStringPieceExtensionLite] += "324"
-          this[UnittestLite.repeatedCordExtensionLite] += "325"
-          this[UnittestLite.defaultInt32ExtensionLite] = 401
-          this[UnittestLite.defaultInt64ExtensionLite] = 402L
-          this[UnittestLite.defaultUint32ExtensionLite] = 403
-          this[UnittestLite.defaultUint64ExtensionLite] = 404L
-          this[UnittestLite.defaultSint32ExtensionLite] = 405
-          this[UnittestLite.defaultSint64ExtensionLite] = 406L
-          this[UnittestLite.defaultFixed32ExtensionLite] = 407
-          this[UnittestLite.defaultFixed64ExtensionLite] = 408L
-          this[UnittestLite.defaultSfixed32ExtensionLite] = 409
-          this[UnittestLite.defaultSfixed64ExtensionLite] = 410L
-          this[UnittestLite.defaultFloatExtensionLite] = 411F
-          this[UnittestLite.defaultDoubleExtensionLite] = 412.0
-          this[UnittestLite.defaultBoolExtensionLite] = false
-          this[UnittestLite.defaultStringExtensionLite] = "415"
-          this[UnittestLite.defaultBytesExtensionLite] = toBytes("416")
-          this[UnittestLite.defaultNestedEnumExtensionLite] = NestedEnum.FOO
-          this[UnittestLite.defaultForeignEnumExtensionLite] = ForeignEnumLite.FOREIGN_LITE_FOO
-          this[UnittestLite.defaultImportEnumExtensionLite] = ImportEnumLite.IMPORT_LITE_FOO
-          this[UnittestLite.defaultStringPieceExtensionLite] = "424"
-          this[UnittestLite.defaultCordExtensionLite] = "425"
-          this[UnittestLite.oneofUint32ExtensionLite] = 601
-          this[UnittestLite.oneofNestedMessageExtensionLite] =
-            TestAllTypesLiteKt.nestedMessage { bb = 602 }
-          this[UnittestLite.oneofStringExtensionLite] = "603"
-          this[UnittestLite.oneofBytesExtensionLite] = toBytes("604")
-        }
-      )
-      .isEqualTo(TestUtilLite.getAllLiteExtensionsSet())
-  }
-
-  @Test
-  fun testExtensionGetters() {
-    testAllExtensionsLite {
-      this[UnittestLite.optionalInt32ExtensionLite] = 101
-      assertThat(this[UnittestLite.optionalInt32ExtensionLite]).isEqualTo(101)
-      this[UnittestLite.optionalStringExtensionLite] = "115"
-      assertThat(this[UnittestLite.optionalStringExtensionLite]).isEqualTo("115")
-      this[UnittestLite.optionalGroupExtensionLite] = optionalGroupExtensionLite { a = 117 }
-      assertThat(this[UnittestLite.optionalGroupExtensionLite])
-        .isEqualTo(optionalGroupExtensionLite { a = 117 })
-      this[UnittestLite.optionalNestedMessageExtensionLite] =
-        TestAllTypesLiteKt.nestedMessage { bb = 118 }
-      assertThat(this[UnittestLite.optionalNestedMessageExtensionLite])
-        .isEqualTo(TestAllTypesLiteKt.nestedMessage { bb = 118 })
-      this[UnittestLite.optionalNestedEnumExtensionLite] = NestedEnum.BAZ
-      assertThat(this[UnittestLite.optionalNestedEnumExtensionLite]).isEqualTo(NestedEnum.BAZ)
-      this[UnittestLite.defaultInt32ExtensionLite] = 401
-      assertThat(this[UnittestLite.defaultInt32ExtensionLite]).isEqualTo(401)
-      this[UnittestLite.oneofUint32ExtensionLite] = 601
-      assertThat(this[UnittestLite.oneofUint32ExtensionLite]).isEqualTo(601)
-    }
-  }
-
-  @Test
-  fun testRepeatedExtensionGettersAndSetters() {
-    testAllExtensionsLite {
-      this[UnittestLite.repeatedInt32ExtensionLite].addAll(listOf(1, 2))
-      assertThat(this[UnittestLite.repeatedInt32ExtensionLite]).isEqualTo(listOf(1, 2))
-      this[UnittestLite.repeatedInt32ExtensionLite] += listOf(3, 4)
-      assertThat(this[UnittestLite.repeatedInt32ExtensionLite]).isEqualTo(listOf(1, 2, 3, 4))
-      this[UnittestLite.repeatedInt32ExtensionLite][0] = 5
-      assertThat(this[UnittestLite.repeatedInt32ExtensionLite]).isEqualTo(listOf(5, 2, 3, 4))
-
-      this[UnittestLite.repeatedStringExtensionLite].addAll(listOf("1", "2"))
-      assertThat(this[UnittestLite.repeatedStringExtensionLite]).isEqualTo(listOf("1", "2"))
-      this[UnittestLite.repeatedStringExtensionLite] += listOf("3", "4")
-      assertThat(this[UnittestLite.repeatedStringExtensionLite])
-        .isEqualTo(listOf("1", "2", "3", "4"))
-      this[UnittestLite.repeatedStringExtensionLite][0] = "5"
-      assertThat(this[UnittestLite.repeatedStringExtensionLite])
-        .isEqualTo(listOf("5", "2", "3", "4"))
-
-      this[UnittestLite.repeatedGroupExtensionLite].addAll(
-        listOf(repeatedGroupExtensionLite { a = 1 }, repeatedGroupExtensionLite { a = 2 })
-      )
-      assertThat(this[UnittestLite.repeatedGroupExtensionLite])
-        .isEqualTo(
-          listOf(repeatedGroupExtensionLite { a = 1 }, repeatedGroupExtensionLite { a = 2 })
-        )
-      this[UnittestLite.repeatedGroupExtensionLite] +=
-        listOf(repeatedGroupExtensionLite { a = 3 }, repeatedGroupExtensionLite { a = 4 })
-      assertThat(this[UnittestLite.repeatedGroupExtensionLite])
-        .isEqualTo(
-          listOf(
-            repeatedGroupExtensionLite { a = 1 },
-            repeatedGroupExtensionLite { a = 2 },
-            repeatedGroupExtensionLite { a = 3 },
-            repeatedGroupExtensionLite { a = 4 }
-          )
-        )
-      this[UnittestLite.repeatedGroupExtensionLite][0] = repeatedGroupExtensionLite { a = 5 }
-      assertThat(this[UnittestLite.repeatedGroupExtensionLite])
-        .isEqualTo(
-          listOf(
-            repeatedGroupExtensionLite { a = 5 },
-            repeatedGroupExtensionLite { a = 2 },
-            repeatedGroupExtensionLite { a = 3 },
-            repeatedGroupExtensionLite { a = 4 }
-          )
-        )
-
-      this[UnittestLite.repeatedNestedMessageExtensionLite].addAll(
-        listOf(nestedMessage { bb = 1 }, nestedMessage { bb = 2 })
-      )
-      assertThat(this[UnittestLite.repeatedNestedMessageExtensionLite])
-        .isEqualTo(listOf(nestedMessage { bb = 1 }, nestedMessage { bb = 2 }))
-      this[UnittestLite.repeatedNestedMessageExtensionLite] +=
-        listOf(nestedMessage { bb = 3 }, nestedMessage { bb = 4 })
-      assertThat(this[UnittestLite.repeatedNestedMessageExtensionLite])
-        .isEqualTo(
-          listOf(
-            nestedMessage { bb = 1 },
-            nestedMessage { bb = 2 },
-            nestedMessage { bb = 3 },
-            nestedMessage { bb = 4 }
-          )
-        )
-      this[UnittestLite.repeatedNestedMessageExtensionLite][0] = nestedMessage { bb = 5 }
-      assertThat(this[UnittestLite.repeatedNestedMessageExtensionLite])
-        .isEqualTo(
-          listOf(
-            nestedMessage { bb = 5 },
-            nestedMessage { bb = 2 },
-            nestedMessage { bb = 3 },
-            nestedMessage { bb = 4 }
-          )
-        )
-
-      this[UnittestLite.repeatedNestedEnumExtensionLite].addAll(
-        listOf(NestedEnum.FOO, NestedEnum.BAR)
-      )
-      assertThat(this[UnittestLite.repeatedNestedEnumExtensionLite])
-        .isEqualTo(listOf(NestedEnum.FOO, NestedEnum.BAR))
-      this[UnittestLite.repeatedNestedEnumExtensionLite] += listOf(NestedEnum.BAZ, NestedEnum.FOO)
-      assertThat(this[UnittestLite.repeatedNestedEnumExtensionLite])
-        .isEqualTo(listOf(NestedEnum.FOO, NestedEnum.BAR, NestedEnum.BAZ, NestedEnum.FOO))
-      this[UnittestLite.repeatedNestedEnumExtensionLite][0] = NestedEnum.BAR
-      assertThat(this[UnittestLite.repeatedNestedEnumExtensionLite])
-        .isEqualTo(listOf(NestedEnum.BAR, NestedEnum.BAR, NestedEnum.BAZ, NestedEnum.FOO))
-    }
-  }
-
-  @Test
-  fun testExtensionContains() {
-    testAllExtensionsLite {
-      this[UnittestLite.optionalInt32ExtensionLite] = 101
-      assertThat(contains(UnittestLite.optionalInt32ExtensionLite)).isTrue()
-      assertThat(contains(UnittestLite.optionalStringExtensionLite)).isFalse()
-      this[UnittestLite.optionalGroupExtensionLite] = optionalGroupExtensionLite { a = 117 }
-      assertThat(contains(UnittestLite.optionalGroupExtensionLite)).isTrue()
-      assertThat(contains(UnittestLite.optionalNestedMessageExtensionLite)).isFalse()
-      this[UnittestLite.optionalNestedEnumExtensionLite] = NestedEnum.BAZ
-      assertThat(contains(UnittestLite.optionalNestedEnumExtensionLite)).isTrue()
-      assertThat(contains(UnittestLite.defaultInt32ExtensionLite)).isFalse()
-      this[UnittestLite.oneofUint32ExtensionLite] = 601
-      assertThat(contains(UnittestLite.oneofUint32ExtensionLite)).isTrue()
-    }
-
-    testAllExtensionsLite {
-      assertThat(contains(UnittestLite.optionalInt32ExtensionLite)).isFalse()
-      this[UnittestLite.optionalStringExtensionLite] = "115"
-      assertThat(contains(UnittestLite.optionalStringExtensionLite)).isTrue()
-      assertThat(contains(UnittestLite.optionalGroupExtensionLite)).isFalse()
-      this[UnittestLite.optionalNestedMessageExtensionLite] =
-        TestAllTypesLiteKt.nestedMessage { bb = 118 }
-      assertThat(contains(UnittestLite.optionalNestedMessageExtensionLite)).isTrue()
-      assertThat(contains(UnittestLite.optionalNestedEnumExtensionLite)).isFalse()
-      this[UnittestLite.defaultInt32ExtensionLite] = 401
-      assertThat(contains(UnittestLite.defaultInt32ExtensionLite)).isTrue()
-      assertThat(contains(UnittestLite.oneofUint32ExtensionLite)).isFalse()
-    }
-  }
-
-  @Test
-  fun testExtensionClears() {
-    testAllExtensionsLite {
-      this[UnittestLite.optionalInt32ExtensionLite] = 101
-      clear(UnittestLite.optionalInt32ExtensionLite)
-      assertThat(contains(UnittestLite.optionalInt32ExtensionLite)).isFalse()
-
-      this[UnittestLite.optionalStringExtensionLite] = "115"
-      clear(UnittestLite.optionalStringExtensionLite)
-      assertThat(contains(UnittestLite.optionalStringExtensionLite)).isFalse()
-
-      this[UnittestLite.optionalGroupExtensionLite] = optionalGroupExtensionLite { a = 117 }
-      clear(UnittestLite.optionalGroupExtensionLite)
-      assertThat(contains(UnittestLite.optionalGroupExtensionLite)).isFalse()
-
-      this[UnittestLite.optionalNestedMessageExtensionLite] =
-        TestAllTypesLiteKt.nestedMessage { bb = 118 }
-      clear(UnittestLite.optionalNestedMessageExtensionLite)
-      assertThat(contains(UnittestLite.optionalNestedMessageExtensionLite)).isFalse()
-
-      this[UnittestLite.optionalNestedEnumExtensionLite] = NestedEnum.BAZ
-      clear(UnittestLite.optionalNestedEnumExtensionLite)
-      assertThat(contains(UnittestLite.optionalNestedEnumExtensionLite)).isFalse()
-
-      this[UnittestLite.defaultInt32ExtensionLite] = 401
-      clear(UnittestLite.defaultInt32ExtensionLite)
-      assertThat(contains(UnittestLite.defaultInt32ExtensionLite)).isFalse()
-
-      this[UnittestLite.oneofUint32ExtensionLite] = 601
-      clear(UnittestLite.oneofUint32ExtensionLite)
-      assertThat(contains(UnittestLite.oneofUint32ExtensionLite)).isFalse()
-    }
-  }
-
-  @Test
-  fun testEmptyMessages() {
-    assertThat(testEmptyMessageLite {}).isEqualTo(TestEmptyMessageLite.newBuilder().build())
-
-    assertThat(testEmptyMessageWithExtensionsLite {})
-      .isEqualTo(TestEmptyMessageWithExtensionsLite.newBuilder().build())
-  }
-
-  @Test
-  fun testMapSetters() {
-    assertThat(
-        testMapLite {
-          mapInt32Int32[1] = 2
-          mapInt64Int64[1L] = 2L
-          mapUint32Uint32[1] = 2
-          mapUint64Uint64[1L] = 2L
-          mapSint32Sint32[1] = 2
-          mapSint64Sint64[1L] = 2L
-          mapFixed32Fixed32[1] = 2
-          mapFixed64Fixed64[1L] = 2L
-          mapSfixed32Sfixed32[1] = 2
-          mapSfixed64Sfixed64[1L] = 2L
-          mapInt32Float[1] = 2F
-          mapInt32Double[1] = 2.0
-          mapBoolBool[true] = true
-          mapStringString["1"] = "2"
-          mapInt32Bytes[1] = toBytes("2")
-          mapInt32Enum[1] = MapEnumLite.MAP_ENUM_FOO_LITE
-          mapInt32ForeignMessage[1] = foreignMessageLite { c = 1 }
-        }
-      )
-      .isEqualTo(
-        TestMapLite.newBuilder()
-          .putMapInt32Int32(1, 2)
-          .putMapInt64Int64(1L, 2L)
-          .putMapUint32Uint32(1, 2)
-          .putMapUint64Uint64(1L, 2L)
-          .putMapSint32Sint32(1, 2)
-          .putMapSint64Sint64(1L, 2L)
-          .putMapFixed32Fixed32(1, 2)
-          .putMapFixed64Fixed64(1L, 2L)
-          .putMapSfixed32Sfixed32(1, 2)
-          .putMapSfixed64Sfixed64(1L, 2L)
-          .putMapInt32Float(1, 2F)
-          .putMapInt32Double(1, 2.0)
-          .putMapBoolBool(true, true)
-          .putMapStringString("1", "2")
-          .putMapInt32Bytes(1, toBytes("2"))
-          .putMapInt32Enum(1, MapEnumLite.MAP_ENUM_FOO_LITE)
-          .putMapInt32ForeignMessage(1, foreignMessageLite { c = 1 })
-          .build()
-      )
-  }
-
-  @Test
-  fun testMapGettersAndSetters() {
-    testMapLite {
-      mapInt32Int32.put(1, 2)
-      assertThat(mapInt32Int32).isEqualTo(mapOf(1 to 2))
-      mapInt32Int32[3] = 4
-      assertThat(mapInt32Int32).isEqualTo(mapOf(1 to 2, 3 to 4))
-      mapInt32Int32.putAll(mapOf(5 to 6, 7 to 8))
-      assertThat(mapInt32Int32).isEqualTo(mapOf(1 to 2, 3 to 4, 5 to 6, 7 to 8))
-
-      mapStringString.put("1", "2")
-      assertThat(mapStringString).isEqualTo(mapOf("1" to "2"))
-      mapStringString["3"] = "4"
-      assertThat(mapStringString).isEqualTo(mapOf("1" to "2", "3" to "4"))
-      mapStringString.putAll(mapOf("5" to "6", "7" to "8"))
-      assertThat(mapStringString).isEqualTo(mapOf("1" to "2", "3" to "4", "5" to "6", "7" to "8"))
-
-      mapInt32Enum.put(1, MapEnumLite.MAP_ENUM_FOO_LITE)
-      assertThat(mapInt32Enum).isEqualTo(mapOf(1 to MapEnumLite.MAP_ENUM_FOO_LITE))
-      mapInt32Enum[2] = MapEnumLite.MAP_ENUM_BAR_LITE
-      assertThat(mapInt32Enum)
-        .isEqualTo(mapOf(1 to MapEnumLite.MAP_ENUM_FOO_LITE, 2 to MapEnumLite.MAP_ENUM_BAR_LITE))
-      mapInt32Enum.putAll(
-        mapOf(3 to MapEnumLite.MAP_ENUM_BAZ_LITE, 4 to MapEnumLite.MAP_ENUM_FOO_LITE)
-      )
-      assertThat(mapInt32Enum)
-        .isEqualTo(
-          mapOf(
-            1 to MapEnumLite.MAP_ENUM_FOO_LITE,
-            2 to MapEnumLite.MAP_ENUM_BAR_LITE,
-            3 to MapEnumLite.MAP_ENUM_BAZ_LITE,
-            4 to MapEnumLite.MAP_ENUM_FOO_LITE
-          )
-        )
-
-      mapInt32ForeignMessage.put(1, foreignMessageLite { c = 1 })
-      assertThat(mapInt32ForeignMessage).isEqualTo(mapOf(1 to foreignMessageLite { c = 1 }))
-      mapInt32ForeignMessage[2] = foreignMessageLite { c = 2 }
-      assertThat(mapInt32ForeignMessage)
-        .isEqualTo(mapOf(1 to foreignMessageLite { c = 1 }, 2 to foreignMessageLite { c = 2 }))
-      mapInt32ForeignMessage.putAll(
-        mapOf(3 to foreignMessageLite { c = 3 }, 4 to foreignMessageLite { c = 4 })
-      )
-      assertThat(mapInt32ForeignMessage)
-        .isEqualTo(
-          mapOf(
-            1 to foreignMessageLite { c = 1 },
-            2 to foreignMessageLite { c = 2 },
-            3 to foreignMessageLite { c = 3 },
-            4 to foreignMessageLite { c = 4 }
-          )
-        )
-    }
-  }
-
-  @Test
-  fun testMapRemove() {
-    testMapLite {
-      mapInt32Int32.putAll(mapOf(1 to 2, 3 to 4))
-      mapInt32Int32.remove(1)
-      assertThat(mapInt32Int32).isEqualTo(mapOf(3 to 4))
-
-      mapStringString.putAll(mapOf("1" to "2", "3" to "4"))
-      mapStringString.remove("1")
-      assertThat(mapStringString).isEqualTo(mapOf("3" to "4"))
-
-      mapInt32Enum.putAll(
-        mapOf(1 to MapEnumLite.MAP_ENUM_FOO_LITE, 2 to MapEnumLite.MAP_ENUM_BAR_LITE)
-      )
-      mapInt32Enum.remove(1)
-      assertThat(mapInt32Enum).isEqualTo(mapOf(2 to MapEnumLite.MAP_ENUM_BAR_LITE))
-
-      mapInt32ForeignMessage.putAll(
-        mapOf(1 to foreignMessageLite { c = 1 }, 2 to foreignMessageLite { c = 2 })
-      )
-      mapInt32ForeignMessage.remove(1)
-      assertThat(mapInt32ForeignMessage).isEqualTo(mapOf(2 to foreignMessageLite { c = 2 }))
-    }
-  }
-
-  @Test
-  fun testMapClear() {
-    testMapLite {
-      mapInt32Int32.putAll(mapOf(1 to 2, 3 to 4))
-      mapInt32Int32.clear()
-      assertThat(mapInt32Int32.isEmpty()).isTrue()
-
-      mapStringString.putAll(mapOf("1" to "2", "3" to "4"))
-      mapStringString.clear()
-      assertThat(mapStringString.isEmpty()).isTrue()
-
-      mapInt32Enum.putAll(
-        mapOf(1 to MapEnumLite.MAP_ENUM_FOO_LITE, 2 to MapEnumLite.MAP_ENUM_BAR_LITE)
-      )
-      mapInt32Enum.clear()
-      assertThat(mapInt32Enum.isEmpty()).isTrue()
-
-      mapInt32ForeignMessage.putAll(
-        mapOf(1 to foreignMessageLite { c = 1 }, 2 to foreignMessageLite { c = 2 })
-      )
-      mapInt32ForeignMessage.clear()
-      assertThat(mapInt32ForeignMessage.isEmpty()).isTrue()
-    }
-  }
-
-  @Test
-  fun testEvilNames() {
-    assertThat(
-        evilNamesProto2 {
-          initialized = true
-          hasFoo = true
-          bar = "foo"
-          isInitialized = true
-          fooBar = "foo"
-          aLLCAPS += "foo"
-          aLLCAPSMAP[1] = true
-          hasUnderbarPrecedingNumeric1Foo = true
-          hasUnderbarPrecedingNumeric42Bar = true
-          hasUnderbarPrecedingNumeric123Foo42BarBaz = true
-          extension += "foo"
-          class_ += 1
-          int = 1.0
-          long = true
-          boolean = 1L
-          sealed = "foo"
-          interface_ = 1F
-          in_ = 1
-          object_ = "foo"
-          cachedSize_ = "foo"
-          serializedSize_ = true
-          by = "foo"
-        }
-      )
-      .isEqualTo(
-        EvilNamesProto2.newBuilder()
-          .setInitialized(true)
-          .setHasFoo(true)
-          .setBar("foo")
-          .setIsInitialized(true)
-          .setFooBar("foo")
-          .addALLCAPS("foo")
-          .putALLCAPSMAP(1, true)
-          .setHasUnderbarPrecedingNumeric1Foo(true)
-          .setHasUnderbarPrecedingNumeric42Bar(true)
-          .setHasUnderbarPrecedingNumeric123Foo42BarBaz(true)
-          .addExtension("foo")
-          .addClass_(1)
-          .setInt(1.0)
-          .setLong(true)
-          .setBoolean(1L)
-          .setSealed("foo")
-          .setInterface(1F)
-          .setIn(1)
-          .setObject("foo")
-          .setCachedSize_("foo")
-          .setSerializedSize_(true)
-          .setBy("foo")
-          .build()
-      )
-
-    assertThat(interface_ {}).isEqualTo(Interface.newBuilder().build())
-  }
-
-  @Test
-  fun testHardKeywordGettersAndSetters() {
-    hardKeywordsAllTypesProto2 {
-      as_ = 1
-      assertThat(as_).isEqualTo(1)
-
-      in_ = "foo"
-      assertThat(in_).isEqualTo("foo")
-
-      break_ = HardKeywordsAllTypesProto2.NestedEnum.FOO
-      assertThat(break_).isEqualTo(HardKeywordsAllTypesProto2.NestedEnum.FOO)
-
-      do_ = HardKeywordsAllTypesProto2Kt.nestedMessage { while_ = 1 }
-      assertThat(do_).isEqualTo(HardKeywordsAllTypesProto2Kt.nestedMessage { while_ = 1 })
-
-      continue_[1] = 1
-      assertThat(continue_[1]).isEqualTo(1)
-
-      else_ += 1
-      assertThat(else_).isEqualTo(listOf(1))
-
-      for_ += "foo"
-      assertThat(for_).isEqualTo(listOf("foo"))
-
-      fun_ += HardKeywordsAllTypesProto2.NestedEnum.FOO
-      assertThat(fun_).isEqualTo(listOf(HardKeywordsAllTypesProto2.NestedEnum.FOO))
-
-      if_ += HardKeywordsAllTypesProto2Kt.nestedMessage { while_ = 1 }
-      assertThat(if_).isEqualTo(listOf(HardKeywordsAllTypesProto2Kt.nestedMessage { while_ = 1 }))
-    }
-  }
-
-  @Test
-  fun testHardKeywordHazzers() {
-    hardKeywordsAllTypesProto2 {
-      as_ = 1
-      assertThat(hasAs_()).isTrue()
-
-      in_ = "foo"
-      assertThat(hasIn_()).isTrue()
-
-      break_ = HardKeywordsAllTypesProto2.NestedEnum.FOO
-      assertThat(hasBreak_()).isTrue()
-
-      do_ = HardKeywordsAllTypesProto2Kt.nestedMessage { while_ = 1 }
-      assertThat(hasDo_()).isTrue()
-    }
-  }
-
-  @Test
-  fun testHardKeywordClears() {
-    hardKeywordsAllTypesProto2 {
-      as_ = 1
-      clearAs_()
-      assertThat(hasAs_()).isFalse()
-
-      in_ = "foo"
-      clearIn_()
-      assertThat(hasIn_()).isFalse()
-
-      break_ = HardKeywordsAllTypesProto2.NestedEnum.FOO
-      clearBreak_()
-      assertThat(hasBreak_()).isFalse()
-
-      do_ = HardKeywordsAllTypesProto2Kt.nestedMessage { while_ = 1 }
-      clearDo_()
-      assertThat(hasDo_()).isFalse()
-    }
-  }
-}
diff --git a/libs/protobuf/java/kotlin/BUILD.bazel b/libs/protobuf/java/kotlin/BUILD.bazel
deleted file mode 100644
index 67fc6e0..0000000
--- a/libs/protobuf/java/kotlin/BUILD.bazel
+++ /dev/null
@@ -1,350 +0,0 @@
-load("@io_bazel_rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
-load("@rules_java//java:defs.bzl", "java_proto_library")
-load("@rules_jvm_external//:kt_defs.bzl", "kt_jvm_export")
-load("@rules_pkg//:mappings.bzl", "pkg_files", "strip_prefix")
-load("@rules_proto//proto:defs.bzl", "proto_library")
-load("//:protobuf_version.bzl", "PROTOBUF_JAVA_VERSION")
-load("//:protobuf.bzl", "internal_gen_kt_protos")
-
-exports_files([
-    "src/test/kotlin/com/google/protobuf/Proto3Test.kt",
-])
-
-# Kotlin generated protos depend on this and only this.
-kt_jvm_library(
-    name = "shared_runtime",
-    srcs = [
-        "src/main/kotlin/com/google/protobuf/DslList.kt",
-        "src/main/kotlin/com/google/protobuf/DslMap.kt",
-        "src/main/kotlin/com/google/protobuf/DslProxy.kt",
-        "src/main/kotlin/com/google/protobuf/ExtensionList.kt",
-        "src/main/kotlin/com/google/protobuf/ProtoDslMarker.kt",
-        "src/main/kotlin/com/google/protobuf/UnmodifiableCollections.kt",
-    ],
-    visibility = ["//visibility:public"],
-    deps = [
-        ":only_for_use_in_proto_generated_code_its_generator_and_tests",
-        "//java/lite",
-    ],
-)
-
-kt_jvm_library(
-    name = "only_for_use_in_proto_generated_code_its_generator_and_tests",
-    srcs = ["src/main/kotlin/com/google/protobuf/OnlyForUseByGeneratedProtoCode.kt"],
-    visibility = ["//java:__subpackages__"],
-)
-
-kt_jvm_library(
-    name = "bytestring_lib",
-    srcs = ["src/main/kotlin/com/google/protobuf/ByteStrings.kt"],
-    visibility = ["//java:__subpackages__"],
-    deps = ["//java/lite"],
-)
-
-kt_jvm_library(
-    name = "full_extensions",
-    srcs = [
-        "src/main/kotlin/com/google/protobuf/Anies.kt",
-        "src/main/kotlin/com/google/protobuf/ExtendableMessageExtensions.kt",
-    ],
-    deps = ["//java/core"],
-)
-
-kt_jvm_export(
-    name = "kotlin_mvn",
-    deploy_env = [
-        "@com_github_jetbrains_kotlin//:kotlin-stdlib",
-        "//java/core",
-    ],
-    maven_coordinates = "com.google.protobuf:protobuf-kotlin:%s" % PROTOBUF_JAVA_VERSION,
-    pom_template = "//java/kotlin:pom_template.xml",
-    resources = [
-        "//:built_in_runtime_protos",
-        "//:well_known_type_protos",
-    ],
-    tags = ["manual"],
-    runtime_deps = [
-        ":bytestring_lib",
-        ":full_extensions",
-        ":only_for_use_in_proto_generated_code_its_generator_and_tests",
-        ":shared_runtime",
-        ":well_known_protos_kotlin",
-    ],
-)
-
-filegroup(
-    name = "release",
-    srcs = [
-        ":kotlin_mvn-docs",
-        ":kotlin_mvn-maven-source",
-        ":kotlin_mvn-pom",
-        ":kotlin_mvn-project",
-    ],
-    visibility = ["//java:__pkg__"],
-)
-
-test_suite(
-    name = "tests",
-    tests = [
-        "bytestring_test",
-        "proto2_test",
-        "proto3_test",
-        "shared_tests",
-        "test_extensions",
-    ],
-)
-
-kt_jvm_library(
-    name = "bytestring_test_library",
-    srcs = ["src/test/kotlin/com/google/protobuf/ByteStringsTest.kt"],
-    deps = [
-        ":bytestring_lib",
-        "//java/lite",
-        "@com_github_jetbrains_kotlin//:kotlin-test",
-        "@maven//:com_google_truth_truth",
-        "@maven//:junit_junit",
-    ],
-)
-
-java_test(
-    name = "bytestring_test",
-    test_class = "com.google.protobuf.kotlin.ByteStringsTest",
-    runtime_deps = [":bytestring_test_library"],
-)
-
-proto_library(
-    name = "example_extensible_message_proto",
-    srcs = ["src/test/proto/com/google/protobuf/example_extensible_message.proto"],
-    visibility = ["//java:__subpackages__"],
-)
-
-java_proto_library(
-    name = "example_extensible_message_java_proto",
-    deps = [":example_extensible_message_proto"],
-)
-
-kt_jvm_library(
-    name = "shared_tests_library",
-    srcs = [
-        "src/test/kotlin/com/google/protobuf/DslListTest.kt",
-        "src/test/kotlin/com/google/protobuf/DslMapTest.kt",
-        "src/test/kotlin/com/google/protobuf/ExtensionListTest.kt",
-    ],
-    deps = [
-        ":bytestring_lib",
-        ":example_extensible_message_java_proto",
-        ":only_for_use_in_proto_generated_code_its_generator_and_tests",
-        ":shared_runtime",
-        "@com_github_jetbrains_kotlin//:kotlin-test",
-        "@maven//:com_google_guava_guava_testlib",
-        "@maven//:com_google_truth_truth",
-        "@maven//:junit_junit",
-    ],
-)
-
-java_test(
-    name = "shared_tests",
-    test_class = "com.google.protobuf.kotlin.DslListTest",
-    runtime_deps = [":shared_tests_library"],
-)
-
-kt_jvm_library(
-    name = "test_extensions_library",
-    srcs = [
-        "src/test/kotlin/com/google/protobuf/AniesTest.kt",
-        "src/test/kotlin/com/google/protobuf/ExtendableMessageExtensionsTest.kt",
-    ],
-    deps = [
-        ":example_extensible_message_java_proto",
-        ":full_extensions",
-        ":kotlin_unittest",
-        ":only_for_use_in_proto_generated_code_its_generator_and_tests",
-        ":shared_runtime",
-        "//java/core",
-        "@com_github_jetbrains_kotlin//:kotlin-test",
-        "@maven//:com_google_truth_truth",
-        "@maven//:junit_junit",
-    ],
-)
-
-java_test(
-    name = "test_extensions",
-    test_class = "com.google.protobuf.kotlin.ExtendableMessageExtensionsTest",
-    runtime_deps = [":test_extensions_library"],
-)
-
-proto_library(
-    name = "evil_names_proto2",
-    srcs = ["src/test/proto/com/google/protobuf/evil_names_proto2.proto"],
-    visibility = ["//:__subpackages__"],
-)
-
-java_proto_library(
-    name = "evil_names_proto2_java_proto",
-    deps = [":evil_names_proto2"],
-)
-
-internal_gen_kt_protos(
-    name = "gen_evil_names_proto2",
-    deps = [":evil_names_proto2"],
-)
-
-proto_library(
-    name = "evil_names_proto3",
-    srcs = ["src/test/proto/com/google/protobuf/evil_names_proto3.proto"],
-    visibility = ["//:__subpackages__"],
-)
-
-java_proto_library(
-    name = "evil_names_proto3_java_proto",
-    deps = [":evil_names_proto3"],
-)
-
-internal_gen_kt_protos(
-    name = "gen_evil_names_proto3",
-    deps = [":evil_names_proto3"],
-)
-
-proto_library(
-    name = "multiple_files_proto3",
-    srcs = ["src/test/proto/com/google/protobuf/multiple_files_proto3.proto"],
-    visibility = ["//:__subpackages__"],
-)
-
-java_proto_library(
-    name = "multiple_files_proto3_java_proto",
-    deps = [":multiple_files_proto3"],
-)
-
-internal_gen_kt_protos(
-    name = "gen_kotlin_proto3_java_multiple_files",
-    deps = [":multiple_files_proto3"],
-)
-
-internal_gen_kt_protos(
-    name = "gen_kotlin_unittest",
-    visibility = ["//java:__subpackages__"],
-    deps = ["//:kt_unittest"],
-)
-
-kt_jvm_library(
-    name = "kotlin_unittest",
-    srcs = [
-        ":gen_evil_names_proto2",
-        ":gen_kotlin_unittest",
-    ],
-    deps = [
-        ":evil_names_proto2_java_proto",
-        ":only_for_use_in_proto_generated_code_its_generator_and_tests",
-        ":shared_runtime",
-        ":well_known_protos_kotlin",
-        "//java/core",
-        "//java/core:generic_test_protos_java_proto",
-    ],
-)
-
-internal_gen_kt_protos(
-    name = "gen_kotlin_proto3_unittest",
-    deps = ["//:kt_proto3_unittest"],
-)
-
-kt_jvm_library(
-    name = "kotlin_proto3_unittest",
-    srcs = [
-        ":gen_evil_names_proto3",
-        ":gen_kotlin_proto3_java_multiple_files",
-        ":gen_kotlin_proto3_unittest",
-    ],
-    deps = [
-        ":evil_names_proto3_java_proto",
-        ":multiple_files_proto3_java_proto",
-        ":only_for_use_in_proto_generated_code_its_generator_and_tests",
-        ":shared_runtime",
-        "//java/core",
-        "//java/core:generic_test_protos_java_proto",
-    ],
-)
-
-kt_jvm_library(
-    name = "proto2_test_library",
-    srcs = ["src/test/kotlin/com/google/protobuf/Proto2Test.kt"],
-    deps = [
-        ":kotlin_unittest",
-        "//java/core:test_util",
-        "@maven//:com_google_truth_truth",
-        "@maven//:junit_junit",
-    ],
-)
-
-java_test(
-    name = "proto2_test",
-    test_class = "com.google.protobuf.kotlin.Proto2Test",
-    runtime_deps = [":proto2_test_library"],
-)
-
-kt_jvm_library(
-    name = "proto3_test_library",
-    srcs = ["src/test/kotlin/com/google/protobuf/Proto3Test.kt"],
-    deps = [
-        ":kotlin_proto3_unittest",
-        "//java/core:test_util",
-        "@maven//:com_google_truth_truth",
-        "@maven//:junit_junit",
-    ],
-)
-
-java_test(
-    name = "proto3_test",
-    test_class = "com.google.protobuf.kotlin.Proto3Test",
-    runtime_deps = [":proto3_test_library"],
-)
-
-internal_gen_kt_protos(
-    name = "gen_well_known_protos_kotlin",
-    visibility = [
-        "//java:__subpackages__",
-    ],
-    deps = [
-        "//:any_proto",
-        "//:api_proto",
-        "//:compiler_plugin_proto",
-        "//:descriptor_proto",
-        "//:duration_proto",
-        "//:empty_proto",
-        "//:field_mask_proto",
-        "//:source_context_proto",
-        "//:struct_proto",
-        "//:timestamp_proto",
-        "//:type_proto",
-        "//:wrappers_proto",
-    ],
-)
-
-kt_jvm_library(
-    name = "well_known_protos_kotlin",
-    srcs = [
-        ":gen_well_known_protos_kotlin",
-    ],
-    deps = [
-        ":only_for_use_in_proto_generated_code_its_generator_and_tests",
-        ":shared_runtime",
-        "//java/core",
-    ],
-)
-
-pkg_files(
-    name = "dist_files",
-    srcs = glob([
-        "src/main/kotlin/com/google/protobuf/*.kt",
-        "src/test/kotlin/**/*.kt",
-        "src/test/proto/**/*.proto",
-    ]) + [
-        "BUILD.bazel",
-        "generate-sources-build.xml",
-        "generate-test-sources-build.xml",
-        "pom.xml",
-        "pom_template.xml",
-    ],
-    strip_prefix = strip_prefix.from_root(""),
-    visibility = ["//java:__pkg__"],
-)
diff --git a/libs/protobuf/java/kotlin/generate-sources-build.xml b/libs/protobuf/java/kotlin/generate-sources-build.xml
deleted file mode 100644
index 6963f37..0000000
--- a/libs/protobuf/java/kotlin/generate-sources-build.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<project name="generate-sources">
-    <echo message="Running protoc ..."/>
-    <mkdir dir="${generated.sources.dir}"/>
-    <exec executable="${protoc}">
-        <arg value="--kotlin_out=${generated.sources.dir}"/>
-        <arg value="--proto_path=${protobuf.source.dir}"/>
-        <arg value="${protobuf.source.dir}/google/protobuf/any.proto"/>
-        <arg value="${protobuf.source.dir}/google/protobuf/api.proto"/>
-        <arg value="${protobuf.source.dir}/google/protobuf/descriptor.proto"/>
-        <arg value="${protobuf.source.dir}/google/protobuf/duration.proto"/>
-        <arg value="${protobuf.source.dir}/google/protobuf/empty.proto"/>
-        <arg value="${protobuf.source.dir}/google/protobuf/field_mask.proto"/>
-        <arg value="${protobuf.source.dir}/google/protobuf/source_context.proto"/>
-        <arg value="${protobuf.source.dir}/google/protobuf/struct.proto"/>
-        <arg value="${protobuf.source.dir}/google/protobuf/timestamp.proto"/>
-        <arg value="${protobuf.source.dir}/google/protobuf/type.proto"/>
-        <arg value="${protobuf.source.dir}/google/protobuf/wrappers.proto"/>
-        <arg value="${protobuf.source.dir}/google/protobuf/compiler/plugin.proto"/>
-    </exec>
-</project>
diff --git a/libs/protobuf/java/kotlin/generate-test-sources-build.xml b/libs/protobuf/java/kotlin/generate-test-sources-build.xml
deleted file mode 100644
index dca1a05..0000000
--- a/libs/protobuf/java/kotlin/generate-test-sources-build.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<project name="generate-test-sources">
-    <mkdir dir="${generated.testsources.dir}"/>
-    <exec executable="${protoc}">
-        <arg value="--java_out=${generated.testsources.dir}"/>
-        <arg value="--proto_path=${protobuf.source.dir}"/>
-        <arg value="--proto_path=${test.proto.dir}"/>
-        <arg value="--experimental_allow_proto3_optional"/>
-        <arg value="${protobuf.source.dir}/google/protobuf/map_proto2_unittest.proto"/>
-        <arg value="${protobuf.source.dir}/google/protobuf/unittest.proto"/>
-        <arg value="${protobuf.source.dir}/google/protobuf/unittest_import.proto"/>
-        <arg value="${protobuf.source.dir}/google/protobuf/unittest_import_lite.proto"/>
-        <arg value="${protobuf.source.dir}/google/protobuf/unittest_import_public.proto"/>
-        <arg value="${protobuf.source.dir}/google/protobuf/unittest_import_public_lite.proto"/>
-        <arg value="${protobuf.source.dir}/google/protobuf/unittest_lite.proto"/>
-        <arg value="${protobuf.source.dir}/google/protobuf/unittest_proto3.proto"/>
-        <arg value="${test.proto.dir}/com/google/protobuf/evil_names_proto2.proto"/>
-        <arg value="${test.proto.dir}/com/google/protobuf/evil_names_proto3.proto"/>
-        <arg value="${test.proto.dir}/com/google/protobuf/example_extensible_message.proto"/>
-        <arg value="${test.proto.dir}/com/google/protobuf/multiple_files_proto3.proto"/>
-    </exec>
-    <exec executable="${protoc}">
-      <arg value="--kotlin_out=${generated.testsources.dir}"/>
-      <arg value="--proto_path=${protobuf.source.dir}"/>
-      <arg value="--proto_path=${test.proto.dir}"/>
-      <arg value="--experimental_allow_proto3_optional"/>
-      <arg value="${protobuf.source.dir}/google/protobuf/map_proto2_unittest.proto"/>
-      <arg value="${protobuf.source.dir}/google/protobuf/unittest.proto"/>
-      <arg value="${protobuf.source.dir}/google/protobuf/unittest_proto3.proto"/>
-      <arg value="${test.proto.dir}/com/google/protobuf/evil_names_proto2.proto"/>
-      <arg value="${test.proto.dir}/com/google/protobuf/evil_names_proto3.proto"/>
-      <arg value="${test.proto.dir}/com/google/protobuf/multiple_files_proto3.proto"/>
-    </exec>
-
-</project>
diff --git a/libs/protobuf/java/kotlin/pom.xml b/libs/protobuf/java/kotlin/pom.xml
deleted file mode 100644
index 9cc9ea0..0000000
--- a/libs/protobuf/java/kotlin/pom.xml
+++ /dev/null
@@ -1,199 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>com.google.protobuf</groupId>
-    <artifactId>protobuf-parent</artifactId>
-    <version>3.21.12</version>
-  </parent>
-
-  <artifactId>protobuf-kotlin</artifactId>
-
-  <name>Protocol Buffers [Kotlin-Core]</name>
-  <description>
-    Kotlin core Protocol Buffers library. Protocol Buffers are a way of encoding structured data in an
-    efficient yet extensible format.
-  </description>
-
-  <properties>
-    <kotlin.version>1.6.0</kotlin.version>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>protobuf-java</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-core</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava-testlib</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.truth</groupId>
-      <artifactId>truth</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.jetbrains.kotlin</groupId>
-      <artifactId>kotlin-stdlib</artifactId>
-      <version>${kotlin.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.jetbrains.kotlin</groupId>
-      <artifactId>kotlin-test</artifactId>
-      <version>${kotlin.version}</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <testResources>
-      <testResource>
-        <directory>${protobuf.source.dir}</directory>
-        <includes>
-          <include>google/protobuf/testdata/golden_message_oneof_implemented</include>
-          <include>google/protobuf/testdata/golden_packed_fields_message</include>
-        </includes>
-      </testResource>
-    </testResources>
-
-    <plugins>
-      <plugin>
-        <artifactId>maven-resources-plugin</artifactId>
-        <version>3.1.0</version>
-        <executions>
-          <execution>
-            <id>copy-test-source-files</id>
-            <phase>generate-test-sources</phase>
-            <goals>
-              <goal>copy-resources</goal>
-            </goals>
-            <configuration>
-              <outputDirectory>${generated.testsources.dir}/com/google/protobuf</outputDirectory>
-              <resources>
-                <resource>
-                  <directory>${basedir}/../core/src/test/java/com/google/protobuf</directory>
-                  <includes>
-                    <include>TestUtil.java</include>
-                    <include>TestUtilLite.java</include>
-                  </includes>
-                </resource>
-              </resources>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-
-      <!-- Use Antrun plugin to generate sources with protoc -->
-      <plugin>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <executions>
-          <!-- Generate core protos -->
-          <execution>
-            <id>generate-sources</id>
-            <phase>generate-sources</phase>
-            <configuration>
-              <target>
-                <ant antfile="generate-sources-build.xml"/>
-              </target>
-            </configuration>
-            <goals>
-              <goal>run</goal>
-            </goals>
-          </execution>
-
-          <!-- Generate the test protos -->
-          <execution>
-            <id>generate-test-sources</id>
-            <phase>generate-test-sources</phase>
-            <configuration>
-              <target>
-                <ant antfile="generate-test-sources-build.xml"/>
-              </target>
-            </configuration>
-            <goals>
-              <goal>run</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-
-      <!-- Add the generated sources to the build -->
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>add-generated-sources</id>
-            <phase>generate-sources</phase>
-            <goals>
-              <goal>add-source</goal>
-            </goals>
-            <configuration>
-              <sources>
-                <source>${generated.sources.dir}</source>
-              </sources>
-            </configuration>
-          </execution>
-          <execution>
-            <id>add-generated-test-sources</id>
-            <phase>generate-test-sources</phase>
-            <goals>
-              <goal>add-test-source</goal>
-            </goals>
-            <configuration>
-              <sources>
-                <source>${generated.testsources.dir}</source>
-              </sources>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.jetbrains.kotlin</groupId>
-        <artifactId>kotlin-maven-plugin</artifactId>
-        <version>${kotlin.version}</version>
-        <extensions>true</extensions>
-        <executions>
-          <execution>
-            <id>compile</id>
-            <goals> <goal>compile</goal> </goals>
-            <configuration>
-              <sourceDirs>
-                <sourceDir>${generated.sources.dir}</sourceDir>
-                <sourceDir>${project.basedir}/src/main/kotlin</sourceDir>
-              </sourceDirs>
-            </configuration>
-          </execution>
-          <execution>
-            <id>test-compile</id>
-            <goals> <goal>test-compile</goal> </goals>
-            <configuration>
-              <sourceDirs>
-                <sourceDir>${project.basedir}/src/test/kotlin</sourceDir>
-                <sourceDir>${generated.testsources.dir}</sourceDir>
-              </sourceDirs>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-
-</project>
diff --git a/libs/protobuf/java/kotlin/pom_template.xml b/libs/protobuf/java/kotlin/pom_template.xml
deleted file mode 100644
index 0feae33..0000000
--- a/libs/protobuf/java/kotlin/pom_template.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>{groupId}</groupId>
-    <artifactId>protobuf-parent</artifactId>
-    <version>{version}</version>
-  </parent>
-
-  <artifactId>{artifactId}</artifactId>
-  <packaging>{type}</packaging>
-
-  <name>Protocol Buffers [Kotlin-Core]</name>
-  <description>
-    Kotlin core Protocol Buffers library. Protocol Buffers are a way of encoding structured data in an
-    efficient yet extensible format.
-  </description>
-
-  <properties>
-    <kotlin.version>1.6.0</kotlin.version>
-  </properties>
-
-</project>
diff --git a/libs/protobuf/java/kotlin/src/main/kotlin/com/google/protobuf/Anies.kt b/libs/protobuf/java/kotlin/src/main/kotlin/com/google/protobuf/Anies.kt
deleted file mode 100644
index 64ac019..0000000
--- a/libs/protobuf/java/kotlin/src/main/kotlin/com/google/protobuf/Anies.kt
+++ /dev/null
@@ -1,45 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf.kotlin
-
-import com.google.protobuf.Any as ProtoAny
-import com.google.protobuf.Message
-
-/** Returns `true` if this [com.google.protobuf.Any] contains a message of type `T`. */
-inline fun <reified T : Message> ProtoAny.isA(): Boolean = this.`is`(T::class.java)
-
-/**
- * Returns the message of type `T` encoded in this [com.google.protobuf.Any].
- *
- * @throws InvalidProtocolBufferException if this [com.google.protobuf.Any] does not contain a `T`
- * message.
- */
-inline fun <reified T : Message> ProtoAny.unpack(): T = unpack(T::class.java)
diff --git a/libs/protobuf/java/kotlin/src/main/kotlin/com/google/protobuf/ByteStrings.kt b/libs/protobuf/java/kotlin/src/main/kotlin/com/google/protobuf/ByteStrings.kt
deleted file mode 100644
index 3befb3b..0000000
--- a/libs/protobuf/java/kotlin/src/main/kotlin/com/google/protobuf/ByteStrings.kt
+++ /dev/null
@@ -1,50 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf.kotlin
-
-import com.google.protobuf.ByteString
-import java.nio.ByteBuffer
-
-/** Encodes this String into a sequence of UTF-8 bytes and returns the result as a [ByteString]. */
-fun String.toByteStringUtf8(): ByteString = ByteString.copyFromUtf8(this)
-// symmetric from ByteString.toStringUtf8()
-
-/** Concatenates the given [ByteString] to this one. */
-operator fun ByteString.plus(other: ByteString): ByteString = concat(other)
-
-/** Gets the byte at [index]. */
-operator fun ByteString.get(index: Int): Byte = byteAt(index)
-
-/** Returns a copy of this [ByteArray] as an immutable [ByteString]. */
-fun ByteArray.toByteString(): ByteString = ByteString.copyFrom(this)
-
-/** Copies the remaining bytes from this [ByteBuffer] to a [ByteString]. */
-fun ByteBuffer.toByteString(): ByteString = ByteString.copyFrom(this)
diff --git a/libs/protobuf/java/kotlin/src/main/kotlin/com/google/protobuf/DslList.kt b/libs/protobuf/java/kotlin/src/main/kotlin/com/google/protobuf/DslList.kt
deleted file mode 100644
index 9f7f75b..0000000
--- a/libs/protobuf/java/kotlin/src/main/kotlin/com/google/protobuf/DslList.kt
+++ /dev/null
@@ -1,59 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf.kotlin
-
-/**
- * A simple wrapper around a [List] with an extra generic parameter that can be used to disambiguate
- * extension methods.
- *
- * <p>This class is used by Kotlin protocol buffer extensions, and its constructor is public only
- * because generated message code is in a different compilation unit.  Others should not use this
- * class directly in any way.
- */
-@Suppress("unused") // the unused type parameter
-class DslList<E, P : DslProxy> @OnlyForUseByGeneratedProtoCode constructor(
-  private val delegate: List<E>
-) : List<E> by delegate {
-  override fun iterator(): Iterator<E> = UnmodifiableIterator(delegate.iterator())
-
-  override fun listIterator(): ListIterator<E> = UnmodifiableListIterator(delegate.listIterator())
-
-  override fun listIterator(index: Int): ListIterator<E> =
-    UnmodifiableListIterator(delegate.listIterator(index))
-
-  override fun equals(other: Any?): Boolean = delegate == other
-
-  override fun hashCode(): Int = delegate.hashCode()
-
-  override fun toString(): String = delegate.toString()
-}
-
-// TODO(lowasser): investigate making this an inline class
diff --git a/libs/protobuf/java/kotlin/src/main/kotlin/com/google/protobuf/DslMap.kt b/libs/protobuf/java/kotlin/src/main/kotlin/com/google/protobuf/DslMap.kt
deleted file mode 100644
index d35195e..0000000
--- a/libs/protobuf/java/kotlin/src/main/kotlin/com/google/protobuf/DslMap.kt
+++ /dev/null
@@ -1,62 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf.kotlin
-
-/**
- * A simple wrapper around a [Map] with an extra generic parameter that can be used to disambiguate
- * extension methods.
- *
- * <p>This class is used by Kotlin protocol buffer extensions, and its constructor is public only
- * because generated message code is in a different compilation unit.  Others should not use this
- * class directly in any way.
- */
-@Suppress("unused") // the unused type parameter
-class DslMap<K, V, P : DslProxy> @OnlyForUseByGeneratedProtoCode constructor(
-  private val delegate: Map<K, V>
-) : Map<K, V> by delegate {
-  // We allocate the wrappers on calls to get, not with lazy {...}, because lazy allocates
-  // a few objects up front, and any kind of query operation on this object should be rare.
-
-  override val entries: Set<Map.Entry<K, V>>
-    get() = UnmodifiableMapEntries(delegate.entries)
-  override val keys: Set<K>
-    get() = UnmodifiableSet(delegate.keys)
-  override val values: Collection<V>
-    get() = UnmodifiableCollection(delegate.values)
-
-  override fun equals(other: Any?): Boolean = delegate == other
-
-  override fun hashCode(): Int = delegate.hashCode()
-
-  override fun toString(): String = delegate.toString()
-}
-
-// TODO(lowasser): investigate making this an inline class
diff --git a/libs/protobuf/java/kotlin/src/main/kotlin/com/google/protobuf/DslProxy.kt b/libs/protobuf/java/kotlin/src/main/kotlin/com/google/protobuf/DslProxy.kt
deleted file mode 100644
index c9b2dd4..0000000
--- a/libs/protobuf/java/kotlin/src/main/kotlin/com/google/protobuf/DslProxy.kt
+++ /dev/null
@@ -1,42 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf.kotlin
-
-/**
- * A type meaningful only for its existence, never intended to be instantiated.  For example,
- * a `DslList<Int, FooProxy>` can be given different extension methods than a
- * `DslList<Int, BarProxy>`.
- */
-abstract class DslProxy @OnlyForUseByGeneratedProtoCode protected constructor() {
-  init {
-    throw UnsupportedOperationException("A DslProxy should never be instantiated")
-  }
-}
diff --git a/libs/protobuf/java/kotlin/src/main/kotlin/com/google/protobuf/ExtendableMessageExtensions.kt b/libs/protobuf/java/kotlin/src/main/kotlin/com/google/protobuf/ExtendableMessageExtensions.kt
deleted file mode 100644
index 4f64843..0000000
--- a/libs/protobuf/java/kotlin/src/main/kotlin/com/google/protobuf/ExtendableMessageExtensions.kt
+++ /dev/null
@@ -1,56 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf.kotlin
-
-import com.google.protobuf.ExtensionLite
-import com.google.protobuf.GeneratedMessageV3
-
-/** Sets the current value of the proto extension in this builder.*/
-operator fun <
-  M : GeneratedMessageV3.ExtendableMessage<M>,
-  B : GeneratedMessageV3.ExtendableBuilder<M, B>,
-  T : Any
-  > B.set(extension: ExtensionLite<M, T>, value: T) {
-  setExtension(extension, value)
-}
-
-/** Gets the current value of the proto extension. */
-operator fun <
-  M : GeneratedMessageV3.ExtendableMessage<M>,
-  MorBT : GeneratedMessageV3.ExtendableMessageOrBuilder<M>,
-  T : Any
-  > MorBT.get(extension: ExtensionLite<M, T>): T = getExtension(extension)
-
-/** Returns true if the specified extension is set on this builder. */
-operator fun <
-  M : GeneratedMessageV3.ExtendableMessage<M>,
-  MorBT : GeneratedMessageV3.ExtendableMessageOrBuilder<M>
-  > MorBT.contains(extension: ExtensionLite<M, *>): Boolean = hasExtension(extension)
diff --git a/libs/protobuf/java/kotlin/src/main/kotlin/com/google/protobuf/ExtensionList.kt b/libs/protobuf/java/kotlin/src/main/kotlin/com/google/protobuf/ExtensionList.kt
deleted file mode 100644
index 206c19f..0000000
--- a/libs/protobuf/java/kotlin/src/main/kotlin/com/google/protobuf/ExtensionList.kt
+++ /dev/null
@@ -1,57 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf.kotlin
-
-import com.google.protobuf.ExtensionLite
-import com.google.protobuf.MessageLite
-
-/**
- * Implementation for ExtensionList and ExtensionListLite. Like [DslList], represents an
- * unmodifiable view of a repeated proto field -- in this case, an extension field -- but supports
- * querying the extension.
- */
-class ExtensionList<E, M : MessageLite>
-@OnlyForUseByGeneratedProtoCode
-constructor(val extension: ExtensionLite<M, List<E>>, private val delegate: List<E>) :
-  List<E> by delegate {
-  override fun iterator(): Iterator<E> = UnmodifiableIterator(delegate.iterator())
-
-  override fun listIterator(): ListIterator<E> = UnmodifiableListIterator(delegate.listIterator())
-
-  override fun listIterator(index: Int): ListIterator<E> =
-    UnmodifiableListIterator(delegate.listIterator(index))
-
-  override fun equals(other: Any?): Boolean = delegate == other
-
-  override fun hashCode(): Int = delegate.hashCode()
-
-  override fun toString(): String = delegate.toString()
-}
diff --git a/libs/protobuf/java/kotlin/src/main/kotlin/com/google/protobuf/OnlyForUseByGeneratedProtoCode.kt b/libs/protobuf/java/kotlin/src/main/kotlin/com/google/protobuf/OnlyForUseByGeneratedProtoCode.kt
deleted file mode 100644
index c8ed63d..0000000
--- a/libs/protobuf/java/kotlin/src/main/kotlin/com/google/protobuf/OnlyForUseByGeneratedProtoCode.kt
+++ /dev/null
@@ -1,48 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf.kotlin
-
-/**
- * Opt-in annotation to make it difficult to accidentally use APIs only intended for use by proto
- * generated code.  See https://kotlinlang.org/docs/reference/opt-in-requirements.html for details
- * on how this API works.
- */
-@RequiresOptIn(
-  message =
-    """
-    This API is only intended for use by generated protobuf code, the code generator, and their own
-    tests.  If this does not describe your code, you should not be using this API.
-  """,
-  level = RequiresOptIn.Level.ERROR
-)
-@Retention(AnnotationRetention.BINARY)
-@Target(AnnotationTarget.CONSTRUCTOR, AnnotationTarget.ANNOTATION_CLASS)
-annotation class OnlyForUseByGeneratedProtoCode
diff --git a/libs/protobuf/java/kotlin/src/main/kotlin/com/google/protobuf/ProtoDslMarker.kt b/libs/protobuf/java/kotlin/src/main/kotlin/com/google/protobuf/ProtoDslMarker.kt
deleted file mode 100644
index e922624..0000000
--- a/libs/protobuf/java/kotlin/src/main/kotlin/com/google/protobuf/ProtoDslMarker.kt
+++ /dev/null
@@ -1,40 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf.kotlin
-
-/**
- * Indicates an API that is part of a DSL to generate protocol buffer messages.
- */
-@DslMarker
-@Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.BINARY)
-@OnlyForUseByGeneratedProtoCode
-annotation class ProtoDslMarker
diff --git a/libs/protobuf/java/kotlin/src/main/kotlin/com/google/protobuf/UnmodifiableCollections.kt b/libs/protobuf/java/kotlin/src/main/kotlin/com/google/protobuf/UnmodifiableCollections.kt
deleted file mode 100644
index cf45e89..0000000
--- a/libs/protobuf/java/kotlin/src/main/kotlin/com/google/protobuf/UnmodifiableCollections.kt
+++ /dev/null
@@ -1,69 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf.kotlin
-
-/** Wraps an [Iterator] and makes it unmodifiable even from Java. */
-internal class UnmodifiableIterator<E>(delegate: Iterator<E>) : Iterator<E> by delegate
-
-/** Wraps a [ListIterator] and makes it unmodifiable even from Java. */
-internal class UnmodifiableListIterator<E>(
-  delegate: ListIterator<E>
-) : ListIterator<E> by delegate
-
-/** Wraps a [Collection] and makes it unmodifiable even from Java. */
-internal open class UnmodifiableCollection<E>(
-  private val delegate: Collection<E>
-) : Collection<E> by delegate {
-  override fun iterator(): Iterator<E> = UnmodifiableIterator(delegate.iterator())
-}
-
-/** Wraps a [Set] and makes it unmodifiable even from Java. */
-internal class UnmodifiableSet<E>(
-  delegate: Collection<E>
-) : UnmodifiableCollection<E>(delegate), Set<E>
-
-/** Wraps a [Map.Entry] and makes it unmodifiable even from Java. */
-internal class UnmodifiableMapEntry<K, V>(delegate: Map.Entry<K, V>) : Map.Entry<K, V> by delegate
-
-/** Wraps a [Set] of map entries and makes it unmodifiable even from Java. */
-internal class UnmodifiableMapEntries<K, V>(
-  private val delegate: Set<Map.Entry<K, V>>
-) : UnmodifiableCollection<Map.Entry<K, V>>(delegate), Set<Map.Entry<K, V>> {
-
-  // Is this overkill? Probably.
-
-  override fun iterator(): Iterator<Map.Entry<K, V>> {
-    val itr = delegate.iterator()
-    return object : Iterator<Map.Entry<K, V>> by itr {
-      override fun next(): Map.Entry<K, V> = UnmodifiableMapEntry(itr.next())
-    }
-  }
-}
diff --git a/libs/protobuf/java/kotlin/src/test/kotlin/com/google/protobuf/AniesTest.kt b/libs/protobuf/java/kotlin/src/test/kotlin/com/google/protobuf/AniesTest.kt
deleted file mode 100644
index 808c644..0000000
--- a/libs/protobuf/java/kotlin/src/test/kotlin/com/google/protobuf/AniesTest.kt
+++ /dev/null
@@ -1,70 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf.kotlin
-
-import com.google.common.truth.Truth.assertThat
-import com.google.protobuf.Any as ProtoAny
-import com.google.protobuf.InvalidProtocolBufferException
-import protobuf_unittest.UnittestProto.BoolMessage
-import protobuf_unittest.UnittestProto.Int32Message
-import protobuf_unittest.int32Message
-import kotlin.test.assertFailsWith
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.junit.runners.JUnit4
-
-/** Tests for extension methods on [ProtoAny]. */
-@RunWith(JUnit4::class)
-class AniesTest {
-  companion object {
-    val anAny = ProtoAny.pack(int32Message { data = 5 })
-  }
-
-  @Test
-  fun isA_Positive() {
-    assertThat(anAny.isA<Int32Message>()).isTrue()
-  }
-
-  @Test
-  fun isA_Negative() {
-    assertThat(anAny.isA<BoolMessage>()).isFalse()
-  }
-
-  @Test
-  fun unpackValid() {
-    assertThat(anAny.unpack<Int32Message>().data).isEqualTo(5)
-  }
-
-  @Test
-  fun unpackInvalid() {
-    assertFailsWith<InvalidProtocolBufferException> { anAny.unpack<BoolMessage>() }
-  }
-}
diff --git a/libs/protobuf/java/kotlin/src/test/kotlin/com/google/protobuf/ByteStringsTest.kt b/libs/protobuf/java/kotlin/src/test/kotlin/com/google/protobuf/ByteStringsTest.kt
deleted file mode 100644
index e944d38..0000000
--- a/libs/protobuf/java/kotlin/src/test/kotlin/com/google/protobuf/ByteStringsTest.kt
+++ /dev/null
@@ -1,98 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf.kotlin
-
-import com.google.common.truth.Truth.assertThat
-import com.google.protobuf.ByteString
-import java.lang.IndexOutOfBoundsException
-import java.nio.Buffer
-import java.nio.ByteBuffer
-import kotlin.test.assertFailsWith
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.junit.runners.JUnit4
-
-/** Tests for the extension functions in ByteStrings.kt. */
-@RunWith(JUnit4::class)
-class ByteStringsTest {
-  @Test
-  fun toByteStringUtf8() {
-    assertThat("abc".toByteStringUtf8())
-      .isEqualTo(ByteString.copyFrom("abc".toByteArray(Charsets.UTF_8)))
-  }
-
-  @Test
-  fun plus() {
-    assertThat("abc".toByteStringUtf8() + "def".toByteStringUtf8())
-      .isEqualTo(ByteString.copyFrom("abcdef".toByteArray(Charsets.UTF_8)))
-  }
-
-  @Test
-  fun byteAt() {
-    val str = "abc".toByteStringUtf8()
-    assertThat(str[0]).isEqualTo('a'.toByte())
-    assertThat(str[2]).isEqualTo('c'.toByte())
-  }
-
-  @Test
-  fun byteAtBelowZero() {
-    val str = "abc".toByteStringUtf8()
-    assertFailsWith<IndexOutOfBoundsException> { str[-1] }
-    assertFailsWith<IndexOutOfBoundsException> { str[-2] }
-  }
-
-  @Test
-  fun byteAtAboveLength() {
-    val str = "abc".toByteStringUtf8()
-    assertFailsWith<IndexOutOfBoundsException> { str[3] }
-    assertFailsWith<IndexOutOfBoundsException> { str[4] }
-  }
-
-  @Test
-  fun byteArrayToByteString() {
-    assertThat("abc".toByteArray(Charsets.UTF_8).toByteString())
-      .isEqualTo(ByteString.copyFromUtf8("abc"))
-  }
-
-  @Test
-  fun byteBufferToByteString() {
-    val buffer = ByteBuffer.wrap("abc".toByteArray(Charsets.UTF_8))
-    assertThat(buffer.toByteString()).isEqualTo(ByteString.copyFromUtf8("abc"))
-  }
-
-  @Test
-  fun byteBufferToByteStringRespectsPositionAndLimit() {
-    val buffer = ByteBuffer.wrap("abc".toByteArray(Charsets.UTF_8))
-    (buffer as java.nio.Buffer).position(1)
-    (buffer as java.nio.Buffer).limit(2)
-    assertThat(buffer.toByteString()).isEqualTo(ByteString.copyFromUtf8("b"))
-  }
-}
diff --git a/libs/protobuf/java/kotlin/src/test/kotlin/com/google/protobuf/DslListTest.kt b/libs/protobuf/java/kotlin/src/test/kotlin/com/google/protobuf/DslListTest.kt
deleted file mode 100644
index a5f0c49..0000000
--- a/libs/protobuf/java/kotlin/src/test/kotlin/com/google/protobuf/DslListTest.kt
+++ /dev/null
@@ -1,128 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf.kotlin
-
-import com.google.common.testing.EqualsTester
-import com.google.common.truth.Truth.assertThat
-import kotlin.test.assertFailsWith
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.junit.runners.JUnit4
-
-/** Tests for [DslList]. */
-@RunWith(JUnit4::class)
-@OptIn(OnlyForUseByGeneratedProtoCode::class)
-class DslListTest {
-  class DummyProxy private constructor() : DslProxy()
-
-  @Test
-  fun matchesList() {
-    assertThat(DslList<Int, DummyProxy>(listOf(1, 2, 3))).containsExactly(1, 2, 3).inOrder()
-  }
-
-  @Test
-  fun reflectsChangesInList() {
-    val mutableList = mutableListOf(1, 2, 3)
-    val dslList = DslList<Int, DummyProxy>(mutableList)
-    mutableList.add(4)
-    assertThat(dslList).containsExactly(1, 2, 3, 4).inOrder()
-  }
-
-  @Test
-  fun dslListIsNotMutable() {
-    val dslList = DslList<Int, DummyProxy>(mutableListOf(1, 2, 3))
-    assertThat(dslList is MutableList<*>).isFalse()
-  }
-
-  @Suppress("PLATFORM_CLASS_MAPPED_TO_KOTLIN", "UNCHECKED_CAST")
-  @Test
-  fun dslListIsNotEvenSecretlyMutable() {
-    val dslList = DslList<Int, DummyProxy>(mutableListOf(1, 2, 3))
-    val dslListAsJavaUtil = dslList as java.util.List<Int>
-    assertFailsWith<UnsupportedOperationException> {
-      dslListAsJavaUtil.add(4)
-    }
-  }
-
-  @Suppress("PLATFORM_CLASS_MAPPED_TO_KOTLIN", "UNCHECKED_CAST")
-  @Test
-  fun dslList_IteratorIsNotEvenSecretlyMutable() {
-    val dslList = DslList<Int, DummyProxy>(mutableListOf(1, 2, 3))
-    val iterator = dslList.iterator() as java.util.Iterator<Int>
-    iterator.next()
-
-    assertFailsWith<UnsupportedOperationException> {
-      iterator.remove()
-    }
-  }
-
-  @Suppress("PLATFORM_CLASS_MAPPED_TO_KOTLIN", "UNCHECKED_CAST")
-  @Test
-  fun dslList_ListIteratorIsNotEvenSecretlyMutable() {
-    val dslList = DslList<Int, DummyProxy>(mutableListOf(1, 2, 3))
-    val iterator = dslList.listIterator() as java.util.ListIterator<Int>
-    iterator.next()
-
-    assertFailsWith<UnsupportedOperationException> {
-      iterator.remove()
-    }
-  }
-
-  @Suppress("PLATFORM_CLASS_MAPPED_TO_KOTLIN", "UNCHECKED_CAST")
-  @Test
-  fun dslList_ListIteratorIndexIsNotEvenSecretlyMutable() {
-    val dslList = DslList<Int, DummyProxy>(mutableListOf(1, 2, 3))
-    val iterator = dslList.listIterator(1) as java.util.ListIterator<Int>
-    iterator.next()
-
-    assertFailsWith<UnsupportedOperationException> {
-      iterator.remove()
-    }
-  }
-
-  @Test
-  fun expectedToString() {
-    assertThat(DslList<Int, DummyProxy>(listOf(1, 2)).toString()).isEqualTo("[1, 2]")
-  }
-
-  @Test
-  fun equality() {
-    EqualsTester()
-      .addEqualityGroup(DslList<Int, DummyProxy>(listOf(1, 2)), listOf(1, 2))
-      .addEqualityGroup(DslList<Int, DummyProxy>(listOf(2, 2)), listOf(2, 2))
-      .addEqualityGroup(
-        DslList<Int, DummyProxy>(emptyList()),
-        DslList<String, DummyProxy>(emptyList()),
-        emptyList<Int>()
-      )
-      .testEquals()
-  }
-}
diff --git a/libs/protobuf/java/kotlin/src/test/kotlin/com/google/protobuf/DslMapTest.kt b/libs/protobuf/java/kotlin/src/test/kotlin/com/google/protobuf/DslMapTest.kt
deleted file mode 100644
index e7f7a19..0000000
--- a/libs/protobuf/java/kotlin/src/test/kotlin/com/google/protobuf/DslMapTest.kt
+++ /dev/null
@@ -1,194 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf.kotlin
-
-import com.google.common.testing.EqualsTester
-import com.google.common.truth.Truth.assertThat
-import kotlin.test.assertFailsWith
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.junit.runners.JUnit4
-
-@RunWith(JUnit4::class)
-@OptIn(OnlyForUseByGeneratedProtoCode::class)
-class DslMapTest {
-  class DummyProxy private constructor() : DslProxy()
-
-  @Test
-  fun matchesMap() {
-    assertThat(DslMap<Int, Int, DummyProxy>(mapOf(1 to -1, 2 to -2)))
-      .containsExactly(1, -1, 2, -2)
-  }
-
-  @Test
-  fun reflectsChangesInMap() {
-    val mutableMap = mutableMapOf(1 to -1, 2 to -2)
-    val dslMap = DslMap<Int, Int, DummyProxy>(mutableMap)
-    mutableMap[3] = -3
-    assertThat(dslMap).containsExactly(1, -1, 2, -2, 3, -3).inOrder()
-  }
-
-  @Test
-  fun dslMapIsNotMutable() {
-    val dslMap = DslMap<Int, Int, DummyProxy>(mutableMapOf(1 to -1))
-    assertThat(dslMap is MutableMap<*, *>).isFalse()
-  }
-
-  @Test
-  fun dslMapKeysAreNotMutable() {
-    val dslMap = DslMap<Int, Int, DummyProxy>(mutableMapOf(1 to -1))
-    assertThat(dslMap.keys is MutableSet<*>).isFalse()
-  }
-
-  @Test
-  fun dslMapValuesAreNotMutable() {
-    val dslMap = DslMap<Int, Int, DummyProxy>(mutableMapOf(1 to -1))
-    assertThat(dslMap.values is MutableSet<*>).isFalse()
-  }
-
-  @Test
-  fun dslMapEntriesAreNotMutable() {
-    val dslMap = DslMap<Int, Int, DummyProxy>(mutableMapOf(1 to -1))
-    assertThat(dslMap.entries is MutableSet<*>).isFalse()
-  }
-
-  @Test
-  fun dslMapEntryObjectsAreNotMutable() {
-    val dslMap = DslMap<Int, Int, DummyProxy>(mutableMapOf(1 to -1))
-    assertThat(dslMap.entries.single() is MutableMap.MutableEntry<*, *>).isFalse()
-  }
-
-  @Suppress("PLATFORM_CLASS_MAPPED_TO_KOTLIN", "UNCHECKED_CAST")
-  @Test
-  fun dslMapIsNotEvenSecretlyMutable() {
-    val dslMap = DslMap<Int, Int, DummyProxy>(mutableMapOf(1 to -1))
-    val dslMapAsJavaUtilMap = dslMap as java.util.Map<Int, Int>
-    assertFailsWith<UnsupportedOperationException> {
-      dslMapAsJavaUtilMap.put(2, -2)
-    }
-  }
-
-  @Suppress("PLATFORM_CLASS_MAPPED_TO_KOTLIN", "UNCHECKED_CAST")
-  @Test
-  fun dslMapKeysAreNotEvenSecretlyMutable() {
-    val dslMap = DslMap<Int, Int, DummyProxy>(mutableMapOf(1 to -1))
-    val dslMapKeysAsJavaUtilSet = dslMap.keys as java.util.Set<Int>
-    assertFailsWith<UnsupportedOperationException> {
-      dslMapKeysAsJavaUtilSet.remove(1)
-    }
-  }
-
-  @Suppress("PLATFORM_CLASS_MAPPED_TO_KOTLIN", "UNCHECKED_CAST")
-  @Test
-  fun dslMapKeysIteratorIsNotEvenSecretlyMutable() {
-    val dslMap = DslMap<Int, Int, DummyProxy>(mutableMapOf(1 to -1))
-    val dslMapKeysAsJavaUtilSet = dslMap.keys as java.util.Set<Int>
-    val itr = dslMapKeysAsJavaUtilSet.iterator()
-    itr.next()
-    assertFailsWith<UnsupportedOperationException> {
-      itr.remove()
-    }
-  }
-
-  @Suppress("PLATFORM_CLASS_MAPPED_TO_KOTLIN", "UNCHECKED_CAST")
-  @Test
-  fun dslMapValuesAreNotEvenSecretlyMutable() {
-    val dslMap = DslMap<Int, Int, DummyProxy>(mutableMapOf(1 to -1))
-    val dslMapValuesAsJavaUtilCollection = dslMap.values as java.util.Collection<Int>
-    assertFailsWith<UnsupportedOperationException> {
-      dslMapValuesAsJavaUtilCollection.remove(1)
-    }
-  }
-
-  @Suppress("PLATFORM_CLASS_MAPPED_TO_KOTLIN", "UNCHECKED_CAST")
-  @Test
-  fun dslMapValuesIteratorIsNotEvenSecretlyMutable() {
-    val dslMap = DslMap<Int, Int, DummyProxy>(mutableMapOf(1 to -1))
-    val dslMapValuesAsJavaUtilCollection = dslMap.values as java.util.Collection<Int>
-    val itr = dslMapValuesAsJavaUtilCollection.iterator()
-    itr.next()
-    assertFailsWith<UnsupportedOperationException> {
-      itr.remove()
-    }
-  }
-
-  @Suppress("PLATFORM_CLASS_MAPPED_TO_KOTLIN", "UNCHECKED_CAST")
-  @Test
-  fun dslMapEntriesAreNotEvenSecretlyMutable() {
-    val dslMap = DslMap<Int, Int, DummyProxy>(mutableMapOf(1 to -1))
-    val dslMapEntriesAsJavaUtilSet = dslMap.entries as java.util.Set<Map.Entry<Int, Int>>
-    val entry = dslMap.entries.single()
-    assertFailsWith<UnsupportedOperationException> {
-      dslMapEntriesAsJavaUtilSet.remove(entry)
-    }
-  }
-
-  @Suppress("PLATFORM_CLASS_MAPPED_TO_KOTLIN", "UNCHECKED_CAST")
-  @Test
-  fun dslMapEntriesIteratorIsNotEvenSecretlyMutable() {
-    val dslMap = DslMap<Int, Int, DummyProxy>(mutableMapOf(1 to -1))
-    val dslMapEntriesAsJavaUtilSet = dslMap.entries as java.util.Set<Map.Entry<Int, Int>>
-    val itr = dslMapEntriesAsJavaUtilSet.iterator()
-    itr.next()
-    assertFailsWith<UnsupportedOperationException> {
-      itr.remove()
-    }
-  }
-
-  @Suppress("PLATFORM_CLASS_MAPPED_TO_KOTLIN", "UNCHECKED_CAST")
-  @Test
-  fun dslMapEntryObjectsAreNotEvenSecretlyMutable() {
-    val dslMap = DslMap<Int, Int, DummyProxy>(mutableMapOf(1 to -1))
-    val dslMapEntryAsJavaUtilMapEntry = dslMap.entries.single() as java.util.Map.Entry<Int, Int>
-    assertFailsWith<UnsupportedOperationException> {
-      dslMapEntryAsJavaUtilMapEntry.value = 2
-    }
-  }
-
-  @Test
-  fun expectedToString() {
-    assertThat(DslMap<Int, Int, DummyProxy>(mapOf(1 to 2, 2 to 3)).toString())
-      .isEqualTo("{1=2, 2=3}")
-  }
-
-  @Test
-  fun equality() {
-    EqualsTester()
-      .addEqualityGroup(DslMap<Int, Int, DummyProxy>(mapOf(1 to 2, 2 to 3)), mapOf(1 to 2, 2 to 3))
-      .addEqualityGroup(DslMap<Int, Int, DummyProxy>(mapOf(1 to 3, 2 to 3)), mapOf(1 to 3, 2 to 3))
-      .addEqualityGroup(
-        DslMap<Int, Int, DummyProxy>(emptyMap()),
-        DslMap<String, String, DummyProxy>(emptyMap()),
-        emptyMap<Int, Int>()
-      )
-      .testEquals()
-  }
-}
diff --git a/libs/protobuf/java/kotlin/src/test/kotlin/com/google/protobuf/ExtendableMessageExtensionsTest.kt b/libs/protobuf/java/kotlin/src/test/kotlin/com/google/protobuf/ExtendableMessageExtensionsTest.kt
deleted file mode 100644
index 623bc58..0000000
--- a/libs/protobuf/java/kotlin/src/test/kotlin/com/google/protobuf/ExtendableMessageExtensionsTest.kt
+++ /dev/null
@@ -1,90 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf.kotlin
-
-import com.google.common.truth.Truth.assertThat
-import com.google.protobuf.kotlin.test.ExampleExtensibleMessage
-import com.google.protobuf.kotlin.test.ExampleExtensibleMessageOuterClass as TestProto
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.junit.runners.JUnit4
-
-@RunWith(JUnit4::class)
-class ExtendableMessageExtensionsTest {
-  @Test
-  fun setOnBuilder() {
-    val builder = ExampleExtensibleMessage.newBuilder()
-    builder[TestProto.int32Extension] = 5
-    assertThat(builder.build().getExtension(TestProto.int32Extension)).isEqualTo(5)
-  }
-
-  @Test
-  fun getOnBuilder() {
-    val builder = ExampleExtensibleMessage.newBuilder()
-      .setExtension(TestProto.int32Extension, 6)
-    assertThat(builder[TestProto.int32Extension]).isEqualTo(6)
-  }
-
-  @Test
-  fun getOnMessage() {
-    val message = ExampleExtensibleMessage.newBuilder()
-      .setExtension(TestProto.int32Extension, 6)
-      .build()
-    assertThat(message[TestProto.int32Extension]).isEqualTo(6)
-  }
-
-  @Test
-  fun containsPositiveOnMessage() {
-    val message = ExampleExtensibleMessage.newBuilder()
-      .setExtension(TestProto.int32Extension, 6)
-      .build()
-    assertThat(TestProto.int32Extension in message).isTrue()
-  }
-
-  @Test
-  fun containsPositiveOnBuilder() {
-    val builder = ExampleExtensibleMessage.newBuilder()
-      .setExtension(TestProto.int32Extension, 6)
-    assertThat(TestProto.int32Extension in builder).isTrue()
-  }
-
-  @Test
-  fun containsNegativeOnMessage() {
-    val message = ExampleExtensibleMessage.newBuilder().build()
-    assertThat(TestProto.int32Extension in message).isFalse()
-  }
-
-  @Test
-  fun containsNegativeOnBuilder() {
-    val builder = ExampleExtensibleMessage.newBuilder()
-    assertThat(TestProto.int32Extension in builder).isFalse()
-  }
-}
diff --git a/libs/protobuf/java/kotlin/src/test/kotlin/com/google/protobuf/ExtensionListTest.kt b/libs/protobuf/java/kotlin/src/test/kotlin/com/google/protobuf/ExtensionListTest.kt
deleted file mode 100644
index 239f27a..0000000
--- a/libs/protobuf/java/kotlin/src/test/kotlin/com/google/protobuf/ExtensionListTest.kt
+++ /dev/null
@@ -1,155 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf.kotlin
-
-import com.google.common.testing.EqualsTester
-import com.google.common.truth.Truth.assertThat
-import com.google.protobuf.kotlin.test.ExampleExtensibleMessage
-import com.google.protobuf.kotlin.test.ExampleExtensibleMessageOuterClass as TestProto
-import kotlin.test.assertFailsWith
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.junit.runners.JUnit4
-
-/** Tests for [DslList]. */
-@RunWith(JUnit4::class)
-@OptIn(OnlyForUseByGeneratedProtoCode::class)
-class ExtensionListTest {
-  class DummyProxy private constructor() : DslProxy()
-
-  @Test
-  fun matchesList() {
-    assertThat(
-      ExtensionList<Int, ExampleExtensibleMessage>(
-        TestProto.repeatedExtension, listOf(1, 2, 3)
-      )
-    ).containsExactly(1, 2, 3).inOrder()
-  }
-
-  @Test
-  fun reflectsChangesInList() {
-    val mutableList = mutableListOf(1, 2, 3)
-    val extensionList = ExtensionList<Int, ExampleExtensibleMessage>(
-      TestProto.repeatedExtension, mutableList
-    )
-    mutableList.add(4)
-    assertThat(extensionList).containsExactly(1, 2, 3, 4).inOrder()
-  }
-
-  @Test
-  fun extensionListIsNotMutable() {
-    val extensionList = ExtensionList<Int, ExampleExtensibleMessage>(
-      TestProto.repeatedExtension, mutableListOf(1, 2, 3)
-    )
-    assertThat(extensionList is MutableList<*>).isFalse()
-  }
-
-  @Suppress("PLATFORM_CLASS_MAPPED_TO_KOTLIN", "UNCHECKED_CAST")
-  @Test
-  fun extensionListIsNotEvenSecretlyMutable() {
-    val extensionList = ExtensionList<Int, ExampleExtensibleMessage>(
-      TestProto.repeatedExtension, mutableListOf(1, 2, 3)
-    )
-    val extensionListAsJavaUtil = extensionList as java.util.List<Int>
-    assertFailsWith<UnsupportedOperationException> {
-      extensionListAsJavaUtil.add(4)
-    }
-  }
-
-  @Suppress("PLATFORM_CLASS_MAPPED_TO_KOTLIN", "UNCHECKED_CAST")
-  @Test
-  fun extensionList_IteratorIsNotEvenSecretlyMutable() {
-    val extensionList = ExtensionList<Int, ExampleExtensibleMessage>(
-      TestProto.repeatedExtension, mutableListOf(1, 2, 3)
-    )
-    val iterator = extensionList.iterator() as java.util.Iterator<Int>
-    iterator.next()
-
-    assertFailsWith<UnsupportedOperationException> {
-      iterator.remove()
-    }
-  }
-
-  @Suppress("PLATFORM_CLASS_MAPPED_TO_KOTLIN", "UNCHECKED_CAST")
-  @Test
-  fun extensionList_ListIteratorIsNotEvenSecretlyMutable() {
-    val extensionList = ExtensionList<Int, ExampleExtensibleMessage>(
-      TestProto.repeatedExtension, mutableListOf(1, 2, 3)
-    )
-    val iterator = extensionList.listIterator() as java.util.ListIterator<Int>
-    iterator.next()
-
-    assertFailsWith<UnsupportedOperationException> {
-      iterator.remove()
-    }
-  }
-
-  @Suppress("PLATFORM_CLASS_MAPPED_TO_KOTLIN", "UNCHECKED_CAST")
-  @Test
-  fun extensionList_ListIteratorIndexIsNotEvenSecretlyMutable() {
-    val extensionList = ExtensionList<Int, ExampleExtensibleMessage>(
-      TestProto.repeatedExtension, mutableListOf(1, 2, 3)
-    )
-    val iterator = extensionList.listIterator(1) as java.util.ListIterator<Int>
-    iterator.next()
-
-    assertFailsWith<UnsupportedOperationException> {
-      iterator.remove()
-    }
-  }
-
-  @Test
-  fun expectedToString() {
-    assertThat(
-      ExtensionList<Int, ExampleExtensibleMessage>(TestProto.repeatedExtension, listOf(1, 2))
-        .toString()
-    ).isEqualTo("[1, 2]")
-  }
-
-  @Test
-  fun equality() {
-    EqualsTester()
-      .addEqualityGroup(
-        ExtensionList<Int, ExampleExtensibleMessage>(TestProto.repeatedExtension, listOf(1, 2)),
-        ExtensionList<Int, ExampleExtensibleMessage>(TestProto.differentExtension, listOf(1, 2)),
-        listOf(1, 2)
-      )
-      .addEqualityGroup(
-        ExtensionList<Int, ExampleExtensibleMessage>(TestProto.repeatedExtension, listOf(2, 2)),
-        listOf(2, 2)
-      )
-      .addEqualityGroup(
-        ExtensionList<Int, ExampleExtensibleMessage>(TestProto.repeatedExtension, emptyList()),
-        emptyList<Int>()
-      )
-      .testEquals()
-  }
-}
diff --git a/libs/protobuf/java/kotlin/src/test/kotlin/com/google/protobuf/Proto2Test.kt b/libs/protobuf/java/kotlin/src/test/kotlin/com/google/protobuf/Proto2Test.kt
deleted file mode 100644
index af797cc..0000000
--- a/libs/protobuf/java/kotlin/src/test/kotlin/com/google/protobuf/Proto2Test.kt
+++ /dev/null
@@ -1,972 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf.kotlin
-
-import com.google.common.truth.Truth.assertThat
-import com.google.protobuf.TestUtil
-import com.google.protobuf.TestUtil.toBytes
-import com.google.protobuf.kotlin.generator.EvilNamesProto2OuterClass.EvilNamesProto2
-import com.google.protobuf.kotlin.generator.EvilNamesProto2OuterClass.HardKeywordsAllTypesProto2
-import com.google.protobuf.kotlin.generator.EvilNamesProto2OuterClass.Interface
-import com.google.protobuf.kotlin.generator.HardKeywordsAllTypesProto2Kt
-import com.google.protobuf.kotlin.generator.evilNamesProto2
-import com.google.protobuf.kotlin.generator.hardKeywordsAllTypesProto2
-import com.google.protobuf.kotlin.generator.interface_
-import com.google.protobuf.test.UnittestImport.ImportEnum
-import com.google.protobuf.test.UnittestImport.ImportMessage
-import com.google.protobuf.test.UnittestImportPublic.PublicImportMessage
-import protobuf_unittest.MapProto2Unittest.Proto2MapEnum
-import protobuf_unittest.MapProto2Unittest.TestEnumMap
-import protobuf_unittest.MapProto2Unittest.TestIntIntMap
-import protobuf_unittest.MapProto2Unittest.TestMaps
-import protobuf_unittest.TestAllTypesKt
-import protobuf_unittest.TestAllTypesKt.nestedMessage
-import protobuf_unittest.UnittestProto
-import protobuf_unittest.UnittestProto.ForeignEnum
-import protobuf_unittest.UnittestProto.TestAllTypes
-import protobuf_unittest.UnittestProto.TestAllTypes.NestedEnum
-import protobuf_unittest.UnittestProto.TestEmptyMessage
-import protobuf_unittest.UnittestProto.TestEmptyMessageWithExtensions
-import protobuf_unittest.copy
-import protobuf_unittest.foreignMessage
-import protobuf_unittest.optionalGroupExtension
-import protobuf_unittest.optionalNestedMessageOrNull
-import protobuf_unittest.repeatedGroupExtension
-import protobuf_unittest.testAllExtensions
-import protobuf_unittest.testAllTypes
-import protobuf_unittest.testEmptyMessage
-import protobuf_unittest.testEmptyMessageWithExtensions
-import protobuf_unittest.testEnumMap
-import protobuf_unittest.testIntIntMap
-import protobuf_unittest.testMaps
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.junit.runners.JUnit4
-
-@RunWith(JUnit4::class)
-class Proto2Test {
-  @Test
-  fun testSetters() {
-    assertThat(
-        testAllTypes {
-          optionalInt32 = 101
-          optionalInt64 = 102
-          optionalUint32 = 103
-          optionalUint64 = 104
-          optionalSint32 = 105
-          optionalSint64 = 106
-          optionalFixed32 = 107
-          optionalFixed64 = 108
-          optionalSfixed32 = 109
-          optionalSfixed64 = 110
-          optionalFloat = 111.0f
-          optionalDouble = 112.0
-          optionalBool = true
-          optionalString = "115"
-          optionalBytes = toBytes("116")
-          optionalGroup = TestAllTypesKt.optionalGroup { a = 117 }
-          optionalNestedMessage = nestedMessage { bb = 118 }
-          optionalForeignMessage = foreignMessage { c = 119 }
-          optionalImportMessage = ImportMessage.newBuilder().setD(120).build()
-          optionalPublicImportMessage = PublicImportMessage.newBuilder().setE(126).build()
-          optionalLazyMessage = nestedMessage { bb = 127 }
-          optionalUnverifiedLazyMessage = nestedMessage { bb = 128 }
-          optionalNestedEnum = NestedEnum.BAZ
-          optionalForeignEnum = ForeignEnum.FOREIGN_BAZ
-          optionalImportEnum = ImportEnum.IMPORT_BAZ
-          optionalStringPiece = "124"
-          optionalCord = "125"
-          repeatedInt32.add(201)
-          repeatedInt64.add(202)
-          repeatedUint32.add(203)
-          repeatedUint64.add(204)
-          repeatedSint32.add(205)
-          repeatedSint64.add(206)
-          repeatedFixed32.add(207)
-          repeatedFixed64.add(208)
-          repeatedSfixed32.add(209)
-          repeatedSfixed64.add(210)
-          repeatedFloat.add(211f)
-          repeatedDouble.add(212.0)
-          repeatedBool.add(true)
-          repeatedString.add("215")
-          repeatedBytes.add(toBytes("216"))
-          repeatedGroup.add(TestAllTypesKt.repeatedGroup { a = 217 })
-          repeatedNestedMessage.add(nestedMessage { bb = 218 })
-          repeatedForeignMessage.add(foreignMessage { c = 219 })
-          repeatedImportMessage.add(ImportMessage.newBuilder().setD(220).build())
-          repeatedLazyMessage.add(nestedMessage { bb = 227 })
-          repeatedNestedEnum.add(NestedEnum.BAR)
-          repeatedForeignEnum.add(ForeignEnum.FOREIGN_BAR)
-          repeatedImportEnum.add(ImportEnum.IMPORT_BAR)
-          repeatedStringPiece.add("224")
-          repeatedCord.add("225")
-          repeatedInt32 += 301
-          repeatedInt64 += 302
-          repeatedUint32 += 303
-          repeatedUint64 += 304
-          repeatedSint32 += 305
-          repeatedSint64 += 306
-          repeatedFixed32 += 307
-          repeatedFixed64 += 308
-          repeatedSfixed32 += 309
-          repeatedSfixed64 += 310
-          repeatedFloat += 311f
-          repeatedDouble += 312.0
-          repeatedBool += false
-          repeatedString += "315"
-          repeatedBytes += toBytes("316")
-          repeatedGroup += TestAllTypesKt.repeatedGroup { a = 317 }
-          repeatedNestedMessage += nestedMessage { bb = 318 }
-          repeatedForeignMessage += foreignMessage { c = 319 }
-          repeatedImportMessage += ImportMessage.newBuilder().setD(320).build()
-          repeatedLazyMessage += TestAllTypesKt.nestedMessage { bb = 327 }
-          repeatedNestedEnum += NestedEnum.BAZ
-          repeatedForeignEnum += ForeignEnum.FOREIGN_BAZ
-          repeatedImportEnum += ImportEnum.IMPORT_BAZ
-          repeatedStringPiece += "324"
-          repeatedCord += "325"
-          defaultInt32 = 401
-          defaultInt64 = 402
-          defaultUint32 = 403
-          defaultUint64 = 404
-          defaultSint32 = 405
-          defaultSint64 = 406
-          defaultFixed32 = 407
-          defaultFixed64 = 408
-          defaultSfixed32 = 409
-          defaultSfixed64 = 410
-          defaultFloat = 411f
-          defaultDouble = 412.0
-          defaultBool = false
-          defaultString = "415"
-          defaultBytes = toBytes("416")
-          defaultNestedEnum = NestedEnum.FOO
-          defaultForeignEnum = ForeignEnum.FOREIGN_FOO
-          defaultImportEnum = ImportEnum.IMPORT_FOO
-          defaultStringPiece = "424"
-          defaultCord = "425"
-          oneofUint32 = 601
-          oneofNestedMessage = TestAllTypesKt.nestedMessage { bb = 602 }
-          oneofString = "603"
-          oneofBytes = toBytes("604")
-        }
-      )
-      .isEqualTo(TestUtil.getAllSetBuilder().build())
-  }
-
-  @Test
-  fun testGetters() {
-    testAllTypes {
-      optionalInt32 = 101
-      assertThat(optionalInt32).isEqualTo(101)
-      optionalString = "115"
-      assertThat(optionalString).isEqualTo("115")
-      optionalGroup = TestAllTypesKt.optionalGroup { a = 117 }
-      assertThat(optionalGroup).isEqualTo(TestAllTypesKt.optionalGroup { a = 117 })
-      optionalNestedMessage = TestAllTypesKt.nestedMessage { bb = 118 }
-      assertThat(optionalNestedMessage).isEqualTo(TestAllTypesKt.nestedMessage { bb = 118 })
-      optionalNestedEnum = NestedEnum.BAZ
-      assertThat(optionalNestedEnum).isEqualTo(NestedEnum.BAZ)
-      defaultInt32 = 401
-      assertThat(defaultInt32).isEqualTo(401)
-      oneofUint32 = 601
-      assertThat(oneofUint32).isEqualTo(601)
-    }
-  }
-
-  @Test
-  fun testDefaultGetters() {
-    testAllTypes {
-      assertThat(defaultInt32).isEqualTo(41)
-      assertThat(defaultString).isEqualTo("hello")
-      assertThat(defaultNestedEnum).isEqualTo(NestedEnum.BAR)
-      assertThat(defaultStringPiece).isEqualTo("abc")
-    }
-  }
-
-  @Test
-  fun testRepeatedGettersAndSetters() {
-    testAllTypes {
-      repeatedInt32.addAll(listOf(1, 2))
-      assertThat(repeatedInt32).isEqualTo(listOf(1, 2))
-      repeatedInt32 += listOf(3, 4)
-      assertThat(repeatedInt32).isEqualTo(listOf(1, 2, 3, 4))
-      repeatedInt32[0] = 5
-      assertThat(repeatedInt32).isEqualTo(listOf(5, 2, 3, 4))
-
-      repeatedString.addAll(listOf("1", "2"))
-      assertThat(repeatedString).isEqualTo(listOf("1", "2"))
-      repeatedString += listOf("3", "4")
-      assertThat(repeatedString).isEqualTo(listOf("1", "2", "3", "4"))
-      repeatedString[0] = "5"
-      assertThat(repeatedString).isEqualTo(listOf("5", "2", "3", "4"))
-
-      repeatedGroup.addAll(
-        listOf(TestAllTypesKt.repeatedGroup { a = 1 }, TestAllTypesKt.repeatedGroup { a = 2 })
-      )
-      assertThat(repeatedGroup)
-        .isEqualTo(
-          listOf(TestAllTypesKt.repeatedGroup { a = 1 }, TestAllTypesKt.repeatedGroup { a = 2 })
-        )
-      repeatedGroup +=
-        listOf(TestAllTypesKt.repeatedGroup { a = 3 }, TestAllTypesKt.repeatedGroup { a = 4 })
-      assertThat(repeatedGroup)
-        .isEqualTo(
-          listOf(
-            TestAllTypesKt.repeatedGroup { a = 1 },
-            TestAllTypesKt.repeatedGroup { a = 2 },
-            TestAllTypesKt.repeatedGroup { a = 3 },
-            TestAllTypesKt.repeatedGroup { a = 4 }
-          )
-        )
-      repeatedGroup[0] = TestAllTypesKt.repeatedGroup { a = 5 }
-      assertThat(repeatedGroup)
-        .isEqualTo(
-          listOf(
-            TestAllTypesKt.repeatedGroup { a = 5 },
-            TestAllTypesKt.repeatedGroup { a = 2 },
-            TestAllTypesKt.repeatedGroup { a = 3 },
-            TestAllTypesKt.repeatedGroup { a = 4 }
-          )
-        )
-
-      repeatedNestedMessage.addAll(listOf(nestedMessage { bb = 1 }, nestedMessage { bb = 2 }))
-      assertThat(repeatedNestedMessage)
-        .isEqualTo(listOf(nestedMessage { bb = 1 }, nestedMessage { bb = 2 }))
-      repeatedNestedMessage += listOf(nestedMessage { bb = 3 }, nestedMessage { bb = 4 })
-      assertThat(repeatedNestedMessage)
-        .isEqualTo(
-          listOf(
-            nestedMessage { bb = 1 },
-            nestedMessage { bb = 2 },
-            nestedMessage { bb = 3 },
-            nestedMessage { bb = 4 }
-          )
-        )
-      repeatedNestedMessage[0] = nestedMessage { bb = 5 }
-      assertThat(repeatedNestedMessage)
-        .isEqualTo(
-          listOf(
-            nestedMessage { bb = 5 },
-            nestedMessage { bb = 2 },
-            nestedMessage { bb = 3 },
-            nestedMessage { bb = 4 }
-          )
-        )
-
-      repeatedNestedEnum.addAll(listOf(NestedEnum.FOO, NestedEnum.BAR))
-      assertThat(repeatedNestedEnum).isEqualTo(listOf(NestedEnum.FOO, NestedEnum.BAR))
-      repeatedNestedEnum += listOf(NestedEnum.BAZ, NestedEnum.FOO)
-      assertThat(repeatedNestedEnum)
-        .isEqualTo(listOf(NestedEnum.FOO, NestedEnum.BAR, NestedEnum.BAZ, NestedEnum.FOO))
-      repeatedNestedEnum[0] = NestedEnum.BAR
-      assertThat(repeatedNestedEnum)
-        .isEqualTo(listOf(NestedEnum.BAR, NestedEnum.BAR, NestedEnum.BAZ, NestedEnum.FOO))
-    }
-  }
-
-  @Test
-  fun testHazzers() {
-    testAllTypes {
-      optionalInt32 = 101
-      assertThat(hasOptionalInt32()).isTrue()
-      assertThat(hasOptionalString()).isFalse()
-      optionalGroup = TestAllTypesKt.optionalGroup { a = 117 }
-      assertThat(hasOptionalGroup()).isTrue()
-      assertThat(hasOptionalNestedMessage()).isFalse()
-      optionalNestedEnum = NestedEnum.BAZ
-      assertThat(hasOptionalNestedEnum()).isTrue()
-      assertThat(hasDefaultInt32()).isFalse()
-      oneofUint32 = 601
-      assertThat(hasOneofUint32()).isTrue()
-    }
-
-    testAllTypes {
-      assertThat(hasOptionalInt32()).isFalse()
-      optionalString = "115"
-      assertThat(hasOptionalString()).isTrue()
-      assertThat(hasOptionalGroup()).isFalse()
-      optionalNestedMessage = TestAllTypesKt.nestedMessage { bb = 118 }
-      assertThat(hasOptionalNestedMessage()).isTrue()
-      assertThat(hasOptionalNestedEnum()).isFalse()
-      defaultInt32 = 401
-      assertThat(hasDefaultInt32()).isTrue()
-      assertThat(hasOneofUint32()).isFalse()
-    }
-  }
-
-  @Test
-  fun testClears() {
-    testAllTypes {
-      optionalInt32 = 101
-      clearOptionalInt32()
-      assertThat(hasOptionalInt32()).isFalse()
-
-      optionalString = "115"
-      clearOptionalString()
-      assertThat(hasOptionalString()).isFalse()
-
-      optionalGroup = TestAllTypesKt.optionalGroup { a = 117 }
-      clearOptionalGroup()
-      assertThat(hasOptionalGroup()).isFalse()
-
-      optionalNestedMessage = TestAllTypesKt.nestedMessage { bb = 118 }
-      clearOptionalNestedMessage()
-      assertThat(hasOptionalNestedMessage()).isFalse()
-
-      optionalNestedEnum = NestedEnum.BAZ
-      clearOptionalNestedEnum()
-      assertThat(hasOptionalNestedEnum()).isFalse()
-
-      defaultInt32 = 401
-      clearDefaultInt32()
-      assertThat(hasDefaultInt32()).isFalse()
-
-      oneofUint32 = 601
-      clearOneofUint32()
-      assertThat(hasOneofUint32()).isFalse()
-    }
-  }
-
-  @Test
-  fun testCopy() {
-    val message = testAllTypes {
-      optionalInt32 = 101
-      optionalString = "115"
-    }
-    val modifiedMessage = message.copy { optionalInt32 = 201 }
-
-    assertThat(message)
-      .isEqualTo(TestAllTypes.newBuilder().setOptionalInt32(101).setOptionalString("115").build())
-    assertThat(modifiedMessage)
-      .isEqualTo(TestAllTypes.newBuilder().setOptionalInt32(201).setOptionalString("115").build())
-  }
-
-  @Test
-  fun testOneof() {
-    val message = testAllTypes {
-      oneofString = "foo"
-      assertThat(oneofFieldCase).isEqualTo(TestAllTypes.OneofFieldCase.ONEOF_STRING)
-      assertThat(oneofString).isEqualTo("foo")
-      clearOneofField()
-      assertThat(hasOneofUint32()).isFalse()
-      assertThat(oneofFieldCase).isEqualTo(TestAllTypes.OneofFieldCase.ONEOFFIELD_NOT_SET)
-      oneofUint32 = 5
-    }
-
-    assertThat(message.getOneofFieldCase()).isEqualTo(TestAllTypes.OneofFieldCase.ONEOF_UINT32)
-    assertThat(message.getOneofUint32()).isEqualTo(5)
-  }
-
-  @Test
-  fun testExtensionsSet() {
-    assertThat(
-        testAllExtensions {
-          this[UnittestProto.optionalInt32Extension] = 101
-          this[UnittestProto.optionalInt64Extension] = 102L
-          this[UnittestProto.optionalUint32Extension] = 103
-          this[UnittestProto.optionalUint64Extension] = 104L
-          this[UnittestProto.optionalSint32Extension] = 105
-          this[UnittestProto.optionalSint64Extension] = 106L
-          this[UnittestProto.optionalFixed32Extension] = 107
-          this[UnittestProto.optionalFixed64Extension] = 108L
-          this[UnittestProto.optionalSfixed32Extension] = 109
-          this[UnittestProto.optionalSfixed64Extension] = 110L
-          this[UnittestProto.optionalFloatExtension] = 111F
-          this[UnittestProto.optionalDoubleExtension] = 112.0
-          this[UnittestProto.optionalBoolExtension] = true
-          this[UnittestProto.optionalStringExtension] = "115"
-          this[UnittestProto.optionalBytesExtension] = toBytes("116")
-          this[UnittestProto.optionalGroupExtension] = optionalGroupExtension { a = 117 }
-          this[UnittestProto.optionalNestedMessageExtension] =
-            TestAllTypesKt.nestedMessage { bb = 118 }
-          this[UnittestProto.optionalForeignMessageExtension] = foreignMessage { c = 119 }
-          this[UnittestProto.optionalImportMessageExtension] =
-            ImportMessage.newBuilder().setD(120).build()
-          this[UnittestProto.optionalPublicImportMessageExtension] =
-            PublicImportMessage.newBuilder().setE(126).build()
-          this[UnittestProto.optionalLazyMessageExtension] =
-            TestAllTypesKt.nestedMessage { bb = 127 }
-          this[UnittestProto.optionalUnverifiedLazyMessageExtension] =
-            TestAllTypesKt.nestedMessage { bb = 128 }
-          this[UnittestProto.optionalNestedEnumExtension] = NestedEnum.BAZ
-          this[UnittestProto.optionalForeignEnumExtension] = ForeignEnum.FOREIGN_BAZ
-          this[UnittestProto.optionalImportEnumExtension] = ImportEnum.IMPORT_BAZ
-          this[UnittestProto.optionalStringPieceExtension] = "124"
-          this[UnittestProto.optionalCordExtension] = "125"
-          this[UnittestProto.repeatedInt32Extension].add(201)
-          this[UnittestProto.repeatedInt64Extension].add(202L)
-          this[UnittestProto.repeatedUint32Extension].add(203)
-          this[UnittestProto.repeatedUint64Extension].add(204L)
-          this[UnittestProto.repeatedSint32Extension].add(205)
-          this[UnittestProto.repeatedSint64Extension].add(206L)
-          this[UnittestProto.repeatedFixed32Extension].add(207)
-          this[UnittestProto.repeatedFixed64Extension].add(208L)
-          this[UnittestProto.repeatedSfixed32Extension].add(209)
-          this[UnittestProto.repeatedSfixed64Extension].add(210L)
-          this[UnittestProto.repeatedFloatExtension].add(211F)
-          this[UnittestProto.repeatedDoubleExtension].add(212.0)
-          this[UnittestProto.repeatedBoolExtension].add(true)
-          this[UnittestProto.repeatedStringExtension].add("215")
-          this[UnittestProto.repeatedBytesExtension].add(toBytes("216"))
-          this[UnittestProto.repeatedGroupExtension].add(repeatedGroupExtension { a = 217 })
-          this[UnittestProto.repeatedNestedMessageExtension].add(
-            TestAllTypesKt.nestedMessage { bb = 218 }
-          )
-          this[UnittestProto.repeatedForeignMessageExtension].add(foreignMessage { c = 219 })
-          this[UnittestProto.repeatedImportMessageExtension].add(
-            ImportMessage.newBuilder().setD(220).build()
-          )
-          this[UnittestProto.repeatedLazyMessageExtension].add(
-            TestAllTypesKt.nestedMessage { bb = 227 }
-          )
-          this[UnittestProto.repeatedNestedEnumExtension].add(NestedEnum.BAR)
-          this[UnittestProto.repeatedForeignEnumExtension].add(ForeignEnum.FOREIGN_BAR)
-          this[UnittestProto.repeatedImportEnumExtension].add(ImportEnum.IMPORT_BAR)
-          this[UnittestProto.repeatedStringPieceExtension].add("224")
-          this[UnittestProto.repeatedCordExtension].add("225")
-          this[UnittestProto.repeatedInt32Extension] += 301
-          this[UnittestProto.repeatedInt64Extension] += 302L
-          this[UnittestProto.repeatedUint32Extension] += 303
-          this[UnittestProto.repeatedUint64Extension] += 304L
-          this[UnittestProto.repeatedSint32Extension] += 305
-          this[UnittestProto.repeatedSint64Extension] += 306L
-          this[UnittestProto.repeatedFixed32Extension] += 307
-          this[UnittestProto.repeatedFixed64Extension] += 308L
-          this[UnittestProto.repeatedSfixed32Extension] += 309
-          this[UnittestProto.repeatedSfixed64Extension] += 310L
-          this[UnittestProto.repeatedFloatExtension] += 311F
-          this[UnittestProto.repeatedDoubleExtension] += 312.0
-          this[UnittestProto.repeatedBoolExtension] += false
-          this[UnittestProto.repeatedStringExtension] += "315"
-          this[UnittestProto.repeatedBytesExtension] += toBytes("316")
-          this[UnittestProto.repeatedGroupExtension] += repeatedGroupExtension { a = 317 }
-          this[UnittestProto.repeatedNestedMessageExtension] +=
-            TestAllTypesKt.nestedMessage { bb = 318 }
-          this[UnittestProto.repeatedForeignMessageExtension] += foreignMessage { c = 319 }
-          this[UnittestProto.repeatedImportMessageExtension] +=
-            ImportMessage.newBuilder().setD(320).build()
-          this[UnittestProto.repeatedLazyMessageExtension] +=
-            TestAllTypesKt.nestedMessage { bb = 327 }
-          this[UnittestProto.repeatedNestedEnumExtension] += NestedEnum.BAZ
-          this[UnittestProto.repeatedForeignEnumExtension] += ForeignEnum.FOREIGN_BAZ
-          this[UnittestProto.repeatedImportEnumExtension] += ImportEnum.IMPORT_BAZ
-          this[UnittestProto.repeatedStringPieceExtension] += "324"
-          this[UnittestProto.repeatedCordExtension] += "325"
-          this[UnittestProto.defaultInt32Extension] = 401
-          this[UnittestProto.defaultInt64Extension] = 402L
-          this[UnittestProto.defaultUint32Extension] = 403
-          this[UnittestProto.defaultUint64Extension] = 404L
-          this[UnittestProto.defaultSint32Extension] = 405
-          this[UnittestProto.defaultSint64Extension] = 406L
-          this[UnittestProto.defaultFixed32Extension] = 407
-          this[UnittestProto.defaultFixed64Extension] = 408L
-          this[UnittestProto.defaultSfixed32Extension] = 409
-          this[UnittestProto.defaultSfixed64Extension] = 410L
-          this[UnittestProto.defaultFloatExtension] = 411F
-          this[UnittestProto.defaultDoubleExtension] = 412.0
-          this[UnittestProto.defaultBoolExtension] = false
-          this[UnittestProto.defaultStringExtension] = "415"
-          this[UnittestProto.defaultBytesExtension] = toBytes("416")
-          this[UnittestProto.defaultNestedEnumExtension] = NestedEnum.FOO
-          this[UnittestProto.defaultForeignEnumExtension] = ForeignEnum.FOREIGN_FOO
-          this[UnittestProto.defaultImportEnumExtension] = ImportEnum.IMPORT_FOO
-          this[UnittestProto.defaultStringPieceExtension] = "424"
-          this[UnittestProto.defaultCordExtension] = "425"
-          this[UnittestProto.oneofUint32Extension] = 601
-          this[UnittestProto.oneofNestedMessageExtension] =
-            TestAllTypesKt.nestedMessage { bb = 602 }
-          this[UnittestProto.oneofStringExtension] = "603"
-          this[UnittestProto.oneofBytesExtension] = toBytes("604")
-        }
-      )
-      .isEqualTo(TestUtil.getAllExtensionsSet())
-  }
-
-  @Test
-  fun testExtensionGetters() {
-    testAllExtensions {
-      this[UnittestProto.optionalInt32Extension] = 101
-      assertThat(this[UnittestProto.optionalInt32Extension]).isEqualTo(101)
-      this[UnittestProto.optionalStringExtension] = "115"
-      assertThat(this[UnittestProto.optionalStringExtension]).isEqualTo("115")
-      this[UnittestProto.optionalGroupExtension] = optionalGroupExtension { a = 117 }
-      assertThat(this[UnittestProto.optionalGroupExtension])
-        .isEqualTo(optionalGroupExtension { a = 117 })
-      this[UnittestProto.optionalNestedMessageExtension] = TestAllTypesKt.nestedMessage { bb = 118 }
-      assertThat(this[UnittestProto.optionalNestedMessageExtension])
-        .isEqualTo(TestAllTypesKt.nestedMessage { bb = 118 })
-      this[UnittestProto.optionalNestedEnumExtension] = NestedEnum.BAZ
-      assertThat(this[UnittestProto.optionalNestedEnumExtension]).isEqualTo(NestedEnum.BAZ)
-      this[UnittestProto.defaultInt32Extension] = 401
-      assertThat(this[UnittestProto.defaultInt32Extension]).isEqualTo(401)
-      this[UnittestProto.oneofUint32Extension] = 601
-      assertThat(this[UnittestProto.oneofUint32Extension]).isEqualTo(601)
-    }
-  }
-
-  @Test
-  fun testRepeatedExtensionGettersAndSetters() {
-    testAllExtensions {
-      this[UnittestProto.repeatedInt32Extension].addAll(listOf(1, 2))
-      assertThat(this[UnittestProto.repeatedInt32Extension]).isEqualTo(listOf(1, 2))
-      this[UnittestProto.repeatedInt32Extension] += listOf(3, 4)
-      assertThat(this[UnittestProto.repeatedInt32Extension]).isEqualTo(listOf(1, 2, 3, 4))
-      this[UnittestProto.repeatedInt32Extension][0] = 5
-      assertThat(this[UnittestProto.repeatedInt32Extension]).isEqualTo(listOf(5, 2, 3, 4))
-
-      this[UnittestProto.repeatedStringExtension].addAll(listOf("1", "2"))
-      assertThat(this[UnittestProto.repeatedStringExtension]).isEqualTo(listOf("1", "2"))
-      this[UnittestProto.repeatedStringExtension] += listOf("3", "4")
-      assertThat(this[UnittestProto.repeatedStringExtension]).isEqualTo(listOf("1", "2", "3", "4"))
-      this[UnittestProto.repeatedStringExtension][0] = "5"
-      assertThat(this[UnittestProto.repeatedStringExtension]).isEqualTo(listOf("5", "2", "3", "4"))
-
-      this[UnittestProto.repeatedGroupExtension].addAll(
-        listOf(repeatedGroupExtension { a = 1 }, repeatedGroupExtension { a = 2 })
-      )
-      assertThat(this[UnittestProto.repeatedGroupExtension])
-        .isEqualTo(listOf(repeatedGroupExtension { a = 1 }, repeatedGroupExtension { a = 2 }))
-      this[UnittestProto.repeatedGroupExtension] +=
-        listOf(repeatedGroupExtension { a = 3 }, repeatedGroupExtension { a = 4 })
-      assertThat(this[UnittestProto.repeatedGroupExtension])
-        .isEqualTo(
-          listOf(
-            repeatedGroupExtension { a = 1 },
-            repeatedGroupExtension { a = 2 },
-            repeatedGroupExtension { a = 3 },
-            repeatedGroupExtension { a = 4 }
-          )
-        )
-      this[UnittestProto.repeatedGroupExtension][0] = repeatedGroupExtension { a = 5 }
-      assertThat(this[UnittestProto.repeatedGroupExtension])
-        .isEqualTo(
-          listOf(
-            repeatedGroupExtension { a = 5 },
-            repeatedGroupExtension { a = 2 },
-            repeatedGroupExtension { a = 3 },
-            repeatedGroupExtension { a = 4 }
-          )
-        )
-
-      this[UnittestProto.repeatedNestedMessageExtension].addAll(
-        listOf(nestedMessage { bb = 1 }, nestedMessage { bb = 2 })
-      )
-      assertThat(this[UnittestProto.repeatedNestedMessageExtension])
-        .isEqualTo(listOf(nestedMessage { bb = 1 }, nestedMessage { bb = 2 }))
-      this[UnittestProto.repeatedNestedMessageExtension] +=
-        listOf(nestedMessage { bb = 3 }, nestedMessage { bb = 4 })
-      assertThat(this[UnittestProto.repeatedNestedMessageExtension])
-        .isEqualTo(
-          listOf(
-            nestedMessage { bb = 1 },
-            nestedMessage { bb = 2 },
-            nestedMessage { bb = 3 },
-            nestedMessage { bb = 4 }
-          )
-        )
-      this[UnittestProto.repeatedNestedMessageExtension][0] = nestedMessage { bb = 5 }
-      assertThat(this[UnittestProto.repeatedNestedMessageExtension])
-        .isEqualTo(
-          listOf(
-            nestedMessage { bb = 5 },
-            nestedMessage { bb = 2 },
-            nestedMessage { bb = 3 },
-            nestedMessage { bb = 4 }
-          )
-        )
-
-      this[UnittestProto.repeatedNestedEnumExtension].addAll(listOf(NestedEnum.FOO, NestedEnum.BAR))
-      assertThat(this[UnittestProto.repeatedNestedEnumExtension])
-        .isEqualTo(listOf(NestedEnum.FOO, NestedEnum.BAR))
-      this[UnittestProto.repeatedNestedEnumExtension] += listOf(NestedEnum.BAZ, NestedEnum.FOO)
-      assertThat(this[UnittestProto.repeatedNestedEnumExtension])
-        .isEqualTo(listOf(NestedEnum.FOO, NestedEnum.BAR, NestedEnum.BAZ, NestedEnum.FOO))
-    }
-  }
-
-  @Test
-  fun testExtensionContains() {
-    testAllExtensions {
-      this[UnittestProto.optionalInt32Extension] = 101
-      assertThat(contains(UnittestProto.optionalInt32Extension)).isTrue()
-      assertThat(contains(UnittestProto.optionalStringExtension)).isFalse()
-      this[UnittestProto.optionalGroupExtension] = optionalGroupExtension { a = 117 }
-      assertThat(contains(UnittestProto.optionalGroupExtension)).isTrue()
-      assertThat(contains(UnittestProto.optionalNestedMessageExtension)).isFalse()
-      this[UnittestProto.optionalNestedEnumExtension] = NestedEnum.BAZ
-      assertThat(contains(UnittestProto.optionalNestedEnumExtension)).isTrue()
-      assertThat(contains(UnittestProto.defaultInt32Extension)).isFalse()
-      this[UnittestProto.oneofUint32Extension] = 601
-      assertThat(contains(UnittestProto.optionalInt32Extension)).isTrue()
-    }
-
-    testAllExtensions {
-      assertThat(contains(UnittestProto.optionalInt32Extension)).isFalse()
-      this[UnittestProto.optionalStringExtension] = "115"
-      assertThat(contains(UnittestProto.optionalStringExtension)).isTrue()
-      assertThat(contains(UnittestProto.optionalGroupExtension)).isFalse()
-      this[UnittestProto.optionalNestedMessageExtension] = TestAllTypesKt.nestedMessage { bb = 118 }
-      assertThat(contains(UnittestProto.optionalNestedMessageExtension)).isTrue()
-      assertThat(contains(UnittestProto.optionalNestedEnumExtension)).isFalse()
-      this[UnittestProto.defaultInt32Extension] = 401
-      assertThat(contains(UnittestProto.defaultInt32Extension)).isTrue()
-      assertThat(contains(UnittestProto.oneofUint32Extension)).isFalse()
-    }
-  }
-
-  @Test
-  fun testExtensionClears() {
-    testAllExtensions {
-      this[UnittestProto.optionalInt32Extension] = 101
-      clear(UnittestProto.optionalInt32Extension)
-      assertThat(contains(UnittestProto.optionalInt32Extension)).isFalse()
-
-      this[UnittestProto.optionalStringExtension] = "115"
-      clear(UnittestProto.optionalStringExtension)
-      assertThat(contains(UnittestProto.optionalStringExtension)).isFalse()
-
-      this[UnittestProto.optionalGroupExtension] = optionalGroupExtension { a = 117 }
-      clear(UnittestProto.optionalGroupExtension)
-      assertThat(contains(UnittestProto.optionalGroupExtension)).isFalse()
-
-      this[UnittestProto.optionalNestedMessageExtension] = TestAllTypesKt.nestedMessage { bb = 118 }
-      clear(UnittestProto.optionalNestedMessageExtension)
-      assertThat(contains(UnittestProto.optionalNestedMessageExtension)).isFalse()
-
-      this[UnittestProto.optionalNestedEnumExtension] = NestedEnum.BAZ
-      clear(UnittestProto.optionalNestedEnumExtension)
-      assertThat(contains(UnittestProto.optionalNestedEnumExtension)).isFalse()
-
-      this[UnittestProto.defaultInt32Extension] = 401
-      clear(UnittestProto.defaultInt32Extension)
-      assertThat(contains(UnittestProto.oneofUint32Extension)).isFalse()
-    }
-  }
-
-  @Test
-  fun testEmptyMessages() {
-    assertThat(testEmptyMessage {}).isEqualTo(TestEmptyMessage.newBuilder().build())
-
-    assertThat(testEmptyMessageWithExtensions {})
-      .isEqualTo(TestEmptyMessageWithExtensions.newBuilder().build())
-  }
-
-  @Test
-  fun testMapSetters() {
-    val intMap = testIntIntMap { m[1] = 2 }
-    assertThat(intMap).isEqualTo(TestIntIntMap.newBuilder().putM(1, 2).build())
-
-    assertThat(
-        testMaps {
-          mInt32[1] = intMap
-          mInt64[1L] = intMap
-          mUint32[1] = intMap
-          mUint64[1L] = intMap
-          mSint32[1] = intMap
-          mSint64[1L] = intMap
-          mFixed32[1] = intMap
-          mFixed64[1L] = intMap
-          mSfixed32[1] = intMap
-          mSfixed64[1] = intMap
-          mBool[true] = intMap
-          mString["1"] = intMap
-        }
-      )
-      .isEqualTo(
-        TestMaps.newBuilder()
-          .putMInt32(1, intMap)
-          .putMInt64(1L, intMap)
-          .putMUint32(1, intMap)
-          .putMUint64(1L, intMap)
-          .putMSint32(1, intMap)
-          .putMSint64(1L, intMap)
-          .putMFixed32(1, intMap)
-          .putMFixed64(1L, intMap)
-          .putMSfixed32(1, intMap)
-          .putMSfixed64(1L, intMap)
-          .putMBool(true, intMap)
-          .putMString("1", intMap)
-          .build()
-      )
-
-    assertThat(testEnumMap { knownMapField[1] = Proto2MapEnum.PROTO2_MAP_ENUM_FOO })
-      .isEqualTo(
-        TestEnumMap.newBuilder().putKnownMapField(1, Proto2MapEnum.PROTO2_MAP_ENUM_FOO).build()
-      )
-  }
-
-  @Test
-  fun testMapGettersAndSetters() {
-    val intMap = testIntIntMap {
-      m.put(1, 2)
-      assertThat(m).isEqualTo(mapOf(1 to 2))
-      m[3] = 4
-      assertThat(m).isEqualTo(mapOf(1 to 2, 3 to 4))
-      m.putAll(mapOf(5 to 6, 7 to 8))
-      assertThat(m).isEqualTo(mapOf(1 to 2, 3 to 4, 5 to 6, 7 to 8))
-    }
-
-    testMaps {
-      mInt32.put(1, intMap)
-      assertThat(mInt32).isEqualTo(mapOf(1 to intMap))
-      mInt32[2] = intMap
-      assertThat(mInt32).isEqualTo(mapOf(1 to intMap, 2 to intMap))
-      mInt32.putAll(mapOf(3 to intMap, 4 to intMap))
-      assertThat(mInt32).isEqualTo(mapOf(1 to intMap, 2 to intMap, 3 to intMap, 4 to intMap))
-
-      mString.put("1", intMap)
-      assertThat(mString).isEqualTo(mapOf("1" to intMap))
-      mString["2"] = intMap
-      assertThat(mString).isEqualTo(mapOf("1" to intMap, "2" to intMap))
-      mString.putAll(mapOf("3" to intMap, "4" to intMap))
-      assertThat(mString)
-        .isEqualTo(mapOf("1" to intMap, "2" to intMap, "3" to intMap, "4" to intMap))
-    }
-
-    testEnumMap {
-      knownMapField.put(1, Proto2MapEnum.PROTO2_MAP_ENUM_FOO)
-      assertThat(knownMapField).isEqualTo(mapOf(1 to Proto2MapEnum.PROTO2_MAP_ENUM_FOO))
-      knownMapField[2] = Proto2MapEnum.PROTO2_MAP_ENUM_BAR
-      assertThat(knownMapField)
-        .isEqualTo(
-          mapOf(1 to Proto2MapEnum.PROTO2_MAP_ENUM_FOO, 2 to Proto2MapEnum.PROTO2_MAP_ENUM_BAR)
-        )
-      knownMapField.putAll(
-        mapOf(3 to Proto2MapEnum.PROTO2_MAP_ENUM_BAZ, 4 to Proto2MapEnum.PROTO2_MAP_ENUM_FOO)
-      )
-      assertThat(knownMapField)
-        .isEqualTo(
-          mapOf(
-            1 to Proto2MapEnum.PROTO2_MAP_ENUM_FOO,
-            2 to Proto2MapEnum.PROTO2_MAP_ENUM_BAR,
-            3 to Proto2MapEnum.PROTO2_MAP_ENUM_BAZ,
-            4 to Proto2MapEnum.PROTO2_MAP_ENUM_FOO
-          )
-        )
-    }
-  }
-
-  @Test
-  fun testMapRemove() {
-    val intMap = testIntIntMap {
-      m.putAll(mapOf(1 to 2, 3 to 4))
-      m.remove(1)
-      assertThat(m).isEqualTo(mapOf(3 to 4))
-    }
-
-    testMaps {
-      mInt32.putAll(mapOf(1 to intMap, 2 to intMap))
-      mInt32.remove(1)
-      assertThat(mInt32).isEqualTo(mapOf(2 to intMap))
-
-      mString.putAll(mapOf("1" to intMap, "2" to intMap))
-      mString.remove("1")
-      assertThat(mString).isEqualTo(mapOf("2" to intMap))
-    }
-
-    testEnumMap {
-      knownMapField.putAll(
-        mapOf(1 to Proto2MapEnum.PROTO2_MAP_ENUM_FOO, 2 to Proto2MapEnum.PROTO2_MAP_ENUM_BAR)
-      )
-      knownMapField.remove(1)
-      assertThat(knownMapField).isEqualTo(mapOf(2 to Proto2MapEnum.PROTO2_MAP_ENUM_BAR))
-    }
-  }
-
-  @Test
-  fun testMapClear() {
-    val intMap = testIntIntMap {
-      m.putAll(mapOf(1 to 2, 3 to 4))
-      m.clear()
-      assertThat(m.isEmpty()).isTrue()
-    }
-
-    testMaps {
-      mInt32.putAll(mapOf(1 to intMap, 2 to intMap))
-      mInt32.clear()
-      assertThat(mInt32.isEmpty()).isTrue()
-
-      mString.putAll(mapOf("1" to intMap, "2" to intMap))
-      mString.clear()
-      assertThat(mString.isEmpty()).isTrue()
-    }
-
-    testEnumMap {
-      knownMapField.putAll(
-        mapOf(1 to Proto2MapEnum.PROTO2_MAP_ENUM_FOO, 2 to Proto2MapEnum.PROTO2_MAP_ENUM_BAR)
-      )
-      knownMapField.clear()
-      assertThat(knownMapField.isEmpty()).isTrue()
-    }
-  }
-
-  @Test
-  fun testEvilNames() {
-    assertThat(
-        evilNamesProto2 {
-          initialized = true
-          hasFoo = true
-          bar = "foo"
-          isInitialized = true
-          fooBar = "foo"
-          aLLCAPS += "foo"
-          aLLCAPSMAP[1] = true
-          hasUnderbarPrecedingNumeric1Foo = true
-          hasUnderbarPrecedingNumeric42Bar = true
-          hasUnderbarPrecedingNumeric123Foo42BarBaz = true
-          extension += "foo"
-          class_ += 1
-          int = 1.0
-          long = true
-          boolean = 1L
-          sealed = "foo"
-          interface_ = 1F
-          in_ = 1
-          object_ = "foo"
-          cachedSize_ = "foo"
-          serializedSize_ = true
-          by = "foo"
-        }
-      )
-      .isEqualTo(
-        EvilNamesProto2.newBuilder()
-          .setInitialized(true)
-          .setHasFoo(true)
-          .setBar("foo")
-          .setIsInitialized(true)
-          .setFooBar("foo")
-          .addALLCAPS("foo")
-          .putALLCAPSMAP(1, true)
-          .setHasUnderbarPrecedingNumeric1Foo(true)
-          .setHasUnderbarPrecedingNumeric42Bar(true)
-          .setHasUnderbarPrecedingNumeric123Foo42BarBaz(true)
-          .addExtension("foo")
-          .addClass_(1)
-          .setInt(1.0)
-          .setLong(true)
-          .setBoolean(1L)
-          .setSealed("foo")
-          .setInterface(1F)
-          .setIn(1)
-          .setObject("foo")
-          .setCachedSize_("foo")
-          .setSerializedSize_(true)
-          .setBy("foo")
-          .build()
-      )
-
-    assertThat(interface_ {}).isEqualTo(Interface.newBuilder().build())
-  }
-
-  @Test
-  fun testHardKeywordGettersAndSetters() {
-    hardKeywordsAllTypesProto2 {
-      as_ = 1
-      assertThat(as_).isEqualTo(1)
-
-      in_ = "foo"
-      assertThat(in_).isEqualTo("foo")
-
-      break_ = HardKeywordsAllTypesProto2.NestedEnum.FOO
-      assertThat(break_).isEqualTo(HardKeywordsAllTypesProto2.NestedEnum.FOO)
-
-      do_ = HardKeywordsAllTypesProto2Kt.nestedMessage { while_ = 1 }
-      assertThat(do_).isEqualTo(HardKeywordsAllTypesProto2Kt.nestedMessage { while_ = 1 })
-
-      continue_[1] = 1
-      assertThat(continue_[1]).isEqualTo(1)
-
-      else_ += 1
-      assertThat(else_).isEqualTo(listOf(1))
-
-      for_ += "foo"
-      assertThat(for_).isEqualTo(listOf("foo"))
-
-      fun_ += HardKeywordsAllTypesProto2.NestedEnum.FOO
-      assertThat(fun_).isEqualTo(listOf(HardKeywordsAllTypesProto2.NestedEnum.FOO))
-
-      if_ += HardKeywordsAllTypesProto2Kt.nestedMessage { while_ = 1 }
-      assertThat(if_).isEqualTo(listOf(HardKeywordsAllTypesProto2Kt.nestedMessage { while_ = 1 }))
-    }
-  }
-
-  @Test
-  fun testHardKeywordHazzers() {
-    hardKeywordsAllTypesProto2 {
-      as_ = 1
-      assertThat(hasAs_()).isTrue()
-
-      in_ = "foo"
-      assertThat(hasIn_()).isTrue()
-
-      break_ = HardKeywordsAllTypesProto2.NestedEnum.FOO
-      assertThat(hasBreak_()).isTrue()
-
-      do_ = HardKeywordsAllTypesProto2Kt.nestedMessage { while_ = 1 }
-      assertThat(hasDo_()).isTrue()
-    }
-  }
-
-  @Test
-  fun testHardKeywordClears() {
-    hardKeywordsAllTypesProto2 {
-      as_ = 1
-      clearAs_()
-      assertThat(hasAs_()).isFalse()
-
-      in_ = "foo"
-      clearIn_()
-      assertThat(hasIn_()).isFalse()
-
-      break_ = HardKeywordsAllTypesProto2.NestedEnum.FOO
-      clearBreak_()
-      assertThat(hasBreak_()).isFalse()
-
-      do_ = HardKeywordsAllTypesProto2Kt.nestedMessage { while_ = 1 }
-      clearDo_()
-      assertThat(hasDo_()).isFalse()
-    }
-  }
-
-  @Test
-  fun testGetOrNull() {
-    val noNestedMessage = testAllTypes {}
-    assertThat(noNestedMessage.optionalNestedMessageOrNull).isEqualTo(null)
-
-    val someNestedMessage = testAllTypes {
-      optionalNestedMessage = TestAllTypesKt.nestedMessage { bb = 118 }
-    }
-    assertThat(someNestedMessage.optionalNestedMessageOrNull)
-      .isEqualTo(TestAllTypesKt.nestedMessage { bb = 118 })
-  }
-}
diff --git a/libs/protobuf/java/kotlin/src/test/kotlin/com/google/protobuf/Proto3Test.kt b/libs/protobuf/java/kotlin/src/test/kotlin/com/google/protobuf/Proto3Test.kt
deleted file mode 100644
index d6d0ab5..0000000
--- a/libs/protobuf/java/kotlin/src/test/kotlin/com/google/protobuf/Proto3Test.kt
+++ /dev/null
@@ -1,355 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf.kotlin
-
-import com.google.common.truth.Truth.assertThat
-import com.google.protobuf.kotlin.generator.EvilNamesProto3OuterClass.Class
-import com.google.protobuf.kotlin.generator.EvilNamesProto3OuterClass.EvilNamesProto3
-import com.google.protobuf.kotlin.generator.EvilNamesProto3OuterClass.HardKeywordsAllTypesProto3
-import com.google.protobuf.kotlin.generator.HardKeywordsAllTypesProto3Kt
-import com.google.protobuf.kotlin.generator.class_
-import com.google.protobuf.kotlin.generator.evilNamesProto3
-import com.google.protobuf.kotlin.generator.hardKeywordsAllTypesProto3
-import proto3_unittest.TestAllTypesKt
-import proto3_unittest.TestAllTypesKt.nestedMessage
-import proto3_unittest.UnittestProto3.TestAllTypes
-import proto3_unittest.UnittestProto3.TestAllTypes.NestedEnum
-import proto3_unittest.UnittestProto3.TestEmptyMessage
-import proto3_unittest.copy
-import proto3_unittest.optionalForeignMessageOrNull
-import proto3_unittest.optionalNestedMessageOrNull
-import proto3_unittest.testAllTypes
-import proto3_unittest.testEmptyMessage
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.junit.runners.JUnit4
-
-@RunWith(JUnit4::class)
-class Proto3Test {
-  @Test
-  fun testGettersAndSetters() {
-    testAllTypes {
-      optionalInt32 = 101
-      assertThat(optionalInt32).isEqualTo(101)
-      optionalString = "115"
-      assertThat(optionalString).isEqualTo("115")
-      optionalNestedMessage = TestAllTypesKt.nestedMessage { bb = 118 }
-      assertThat(optionalNestedMessage).isEqualTo(TestAllTypesKt.nestedMessage { bb = 118 })
-      optionalNestedEnum = NestedEnum.BAZ
-      assertThat(optionalNestedEnum).isEqualTo(NestedEnum.BAZ)
-      oneofUint32 = 601
-      assertThat(oneofUint32).isEqualTo(601)
-    }
-  }
-
-  @Test
-  fun testRepeatedGettersAndSetters() {
-    testAllTypes {
-      repeatedInt32.addAll(listOf(1, 2))
-      assertThat(repeatedInt32).isEqualTo(listOf(1, 2))
-      repeatedInt32 += listOf(3, 4)
-      assertThat(repeatedInt32).isEqualTo(listOf(1, 2, 3, 4))
-      repeatedInt32[0] = 5
-      assertThat(repeatedInt32).isEqualTo(listOf(5, 2, 3, 4))
-
-      repeatedString.addAll(listOf("1", "2"))
-      assertThat(repeatedString).isEqualTo(listOf("1", "2"))
-      repeatedString += listOf("3", "4")
-      assertThat(repeatedString).isEqualTo(listOf("1", "2", "3", "4"))
-      repeatedString[0] = "5"
-      assertThat(repeatedString).isEqualTo(listOf("5", "2", "3", "4"))
-
-      repeatedNestedMessage.addAll(listOf(nestedMessage { bb = 1 }, nestedMessage { bb = 2 }))
-      assertThat(repeatedNestedMessage)
-        .isEqualTo(listOf(nestedMessage { bb = 1 }, nestedMessage { bb = 2 }))
-      repeatedNestedMessage += listOf(nestedMessage { bb = 3 }, nestedMessage { bb = 4 })
-      assertThat(repeatedNestedMessage)
-        .isEqualTo(
-          listOf(
-            nestedMessage { bb = 1 },
-            nestedMessage { bb = 2 },
-            nestedMessage { bb = 3 },
-            nestedMessage { bb = 4 }
-          )
-        )
-      repeatedNestedMessage[0] = nestedMessage { bb = 5 }
-      assertThat(repeatedNestedMessage)
-        .isEqualTo(
-          listOf(
-            nestedMessage { bb = 5 },
-            nestedMessage { bb = 2 },
-            nestedMessage { bb = 3 },
-            nestedMessage { bb = 4 }
-          )
-        )
-
-      repeatedNestedEnum.addAll(listOf(NestedEnum.FOO, NestedEnum.BAR))
-      assertThat(repeatedNestedEnum).isEqualTo(listOf(NestedEnum.FOO, NestedEnum.BAR))
-      repeatedNestedEnum += listOf(NestedEnum.BAZ, NestedEnum.FOO)
-      assertThat(repeatedNestedEnum)
-        .isEqualTo(listOf(NestedEnum.FOO, NestedEnum.BAR, NestedEnum.BAZ, NestedEnum.FOO))
-      repeatedNestedEnum[0] = NestedEnum.BAR
-      assertThat(repeatedNestedEnum)
-        .isEqualTo(listOf(NestedEnum.BAR, NestedEnum.BAR, NestedEnum.BAZ, NestedEnum.FOO))
-    }
-  }
-
-  @Test
-  fun testClears() {
-    assertThat(
-        testAllTypes {
-          optionalInt32 = 101
-          clearOptionalInt32()
-
-          optionalString = "115"
-          clearOptionalString()
-
-          optionalNestedMessage = TestAllTypesKt.nestedMessage { bb = 118 }
-          clearOptionalNestedMessage()
-
-          optionalNestedEnum = NestedEnum.BAZ
-          clearOptionalNestedEnum()
-
-          oneofUint32 = 601
-          clearOneofUint32()
-        }
-      )
-      .isEqualTo(TestAllTypes.newBuilder().build())
-  }
-
-  @Test
-  fun testCopy() {
-    val message = testAllTypes {
-      optionalInt32 = 101
-      optionalString = "115"
-    }
-    val modifiedMessage = message.copy { optionalInt32 = 201 }
-
-    assertThat(message)
-      .isEqualTo(TestAllTypes.newBuilder().setOptionalInt32(101).setOptionalString("115").build())
-    assertThat(modifiedMessage)
-      .isEqualTo(TestAllTypes.newBuilder().setOptionalInt32(201).setOptionalString("115").build())
-  }
-
-  @Test
-  fun testOneof() {
-    val message = testAllTypes {
-      oneofString = "foo"
-      assertThat(oneofFieldCase).isEqualTo(TestAllTypes.OneofFieldCase.ONEOF_STRING)
-      assertThat(oneofString).isEqualTo("foo")
-      clearOneofField()
-      assertThat(oneofFieldCase).isEqualTo(TestAllTypes.OneofFieldCase.ONEOFFIELD_NOT_SET)
-      oneofUint32 = 5
-    }
-
-    assertThat(message.getOneofFieldCase()).isEqualTo(TestAllTypes.OneofFieldCase.ONEOF_UINT32)
-    assertThat(message.getOneofUint32()).isEqualTo(5)
-  }
-
-  @Test
-  fun testEmptyMessages() {
-    assertThat(testEmptyMessage {}).isEqualTo(TestEmptyMessage.newBuilder().build())
-  }
-
-  @Test
-  fun testEvilNames() {
-    assertThat(
-        evilNamesProto3 {
-          initialized = true
-          hasFoo = true
-          bar = "foo"
-          isInitialized = true
-          fooBar = "foo"
-          aLLCAPS += "foo"
-          aLLCAPSMAP[1] = true
-          hasUnderbarPrecedingNumeric1Foo = true
-          hasUnderbarPrecedingNumeric42Bar = true
-          hasUnderbarPrecedingNumeric123Foo42BarBaz = true
-          extension += "foo"
-          class_ = "foo"
-          int = 1.0
-          long = true
-          boolean = 1L
-          sealed = "foo"
-          interface_ = 1F
-          in_ = 1
-          object_ = "foo"
-          cachedSize_ = "foo"
-          serializedSize_ = true
-          value = "foo"
-          index = 1L
-          values += "foo"
-          newValues += "foo"
-          builder = true
-          k[1] = 1
-          v["foo"] = "foo"
-          key["foo"] = 1
-          map[1] = "foo"
-          pairs["foo"] = 1
-          LeadingUnderscore = "foo"
-          option = 1
-        }
-      )
-      .isEqualTo(
-        EvilNamesProto3.newBuilder()
-          .setInitialized(true)
-          .setHasFoo(true)
-          .setBar("foo")
-          .setIsInitialized(true)
-          .setFooBar("foo")
-          .addALLCAPS("foo")
-          .putALLCAPSMAP(1, true)
-          .setHasUnderbarPrecedingNumeric1Foo(true)
-          .setHasUnderbarPrecedingNumeric42Bar(true)
-          .setHasUnderbarPrecedingNumeric123Foo42BarBaz(true)
-          .addExtension("foo")
-          .setClass_("foo")
-          .setInt(1.0)
-          .setLong(true)
-          .setBoolean(1L)
-          .setSealed("foo")
-          .setInterface(1F)
-          .setIn(1)
-          .setObject("foo")
-          .setCachedSize_("foo")
-          .setSerializedSize_(true)
-          .setValue("foo")
-          .setIndex(1L)
-          .addValues("foo")
-          .addNewValues("foo")
-          .setBuilder(true)
-          .putK(1, 1)
-          .putV("foo", "foo")
-          .putKey("foo", 1)
-          .putMap(1, "foo")
-          .putPairs("foo", 1)
-          .setLeadingUnderscore("foo")
-          .setOption(1)
-          .build()
-      )
-
-    assertThat(class_ {}).isEqualTo(Class.newBuilder().build())
-  }
-
-  @Test
-  fun testHardKeywordGettersAndSetters() {
-    hardKeywordsAllTypesProto3 {
-      as_ = 1
-      assertThat(as_).isEqualTo(1)
-
-      in_ = "foo"
-      assertThat(in_).isEqualTo("foo")
-
-      break_ = HardKeywordsAllTypesProto3.NestedEnum.FOO
-      assertThat(break_).isEqualTo(HardKeywordsAllTypesProto3.NestedEnum.FOO)
-
-      do_ = HardKeywordsAllTypesProto3Kt.nestedMessage { while_ = 1 }
-      assertThat(do_).isEqualTo(HardKeywordsAllTypesProto3Kt.nestedMessage { while_ = 1 })
-
-      continue_[1] = 1
-      assertThat(continue_[1]).isEqualTo(1)
-
-      else_ += 1
-      assertThat(else_).isEqualTo(listOf(1))
-
-      for_ += "foo"
-      assertThat(for_).isEqualTo(listOf("foo"))
-
-      fun_ += HardKeywordsAllTypesProto3.NestedEnum.FOO
-      assertThat(fun_).isEqualTo(listOf(HardKeywordsAllTypesProto3.NestedEnum.FOO))
-
-      if_ += HardKeywordsAllTypesProto3Kt.nestedMessage { while_ = 1 }
-      assertThat(if_).isEqualTo(listOf(HardKeywordsAllTypesProto3Kt.nestedMessage { while_ = 1 }))
-    }
-  }
-
-  @Test
-  fun testHardKeywordHazzers() {
-    hardKeywordsAllTypesProto3 {
-      as_ = 1
-      assertThat(hasAs_()).isTrue()
-
-      in_ = "foo"
-      assertThat(hasIn_()).isTrue()
-
-      break_ = HardKeywordsAllTypesProto3.NestedEnum.FOO
-      assertThat(hasBreak_()).isTrue()
-
-      do_ = HardKeywordsAllTypesProto3Kt.nestedMessage { while_ = 1 }
-      assertThat(hasDo_()).isTrue()
-    }
-  }
-
-  @Test
-  fun testHardKeywordClears() {
-    hardKeywordsAllTypesProto3 {
-      as_ = 1
-      clearAs_()
-      assertThat(hasAs_()).isFalse()
-
-      in_ = "foo"
-      clearIn_()
-      assertThat(hasIn_()).isFalse()
-
-      break_ = HardKeywordsAllTypesProto3.NestedEnum.FOO
-      clearBreak_()
-      assertThat(hasBreak_()).isFalse()
-
-      do_ = HardKeywordsAllTypesProto3Kt.nestedMessage { while_ = 1 }
-      clearDo_()
-      assertThat(hasDo_()).isFalse()
-    }
-  }
-
-  @Test
-  fun testMultipleFiles() {
-    assertThat(com.google.protobuf.kotlin.generator.multipleFilesMessageA {})
-      .isEqualTo(com.google.protobuf.kotlin.generator.MultipleFilesMessageA.newBuilder().build())
-
-    assertThat(com.google.protobuf.kotlin.generator.multipleFilesMessageB {})
-      .isEqualTo(com.google.protobuf.kotlin.generator.MultipleFilesMessageB.newBuilder().build())
-  }
-
-  @Test
-  fun testGetOrNull() {
-    val noNestedMessage = testAllTypes {}
-    assertThat(noNestedMessage.optionalNestedMessageOrNull).isEqualTo(null)
-
-    val someNestedMessage = testAllTypes {
-      optionalNestedMessage = TestAllTypesKt.nestedMessage { bb = 118 }
-    }
-    assertThat(someNestedMessage.optionalNestedMessageOrNull)
-      .isEqualTo(TestAllTypesKt.nestedMessage { bb = 118 })
-
-    // No optional keyword, OrNull should still be generated
-    assertThat(someNestedMessage.optionalForeignMessageOrNull).isEqualTo(null)
-  }
-}
diff --git a/libs/protobuf/java/kotlin/src/test/proto/com/google/protobuf/evil_names_proto2.proto b/libs/protobuf/java/kotlin/src/test/proto/com/google/protobuf/evil_names_proto2.proto
deleted file mode 100644
index 3735baf..0000000
--- a/libs/protobuf/java/kotlin/src/test/proto/com/google/protobuf/evil_names_proto2.proto
+++ /dev/null
@@ -1,93 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// LINT: LEGACY_NAMES
-syntax = "proto2";
-
-package protobuf.kotlin.generator;
-
-option java_package = "com.google.protobuf.kotlin.generator";
-
-message EvilNamesProto2 {
-  optional bool initialized = 1;
-  optional bool has_foo = 2;
-  optional string Bar = 3;
-  optional bool is_initialized = 4;
-
-  oneof camelCase {
-    string fooBar = 5;
-  }
-
-  repeated string ALL_CAPS = 7;
-  map<int32, bool> ALL_CAPS_MAP = 8;
-
-  optional bool has_underbar_preceding_numeric_1foo = 9;
-  optional bool has_underbar_preceding_numeric_42bar = 13;
-  optional bool has_underbar_preceding_numeric_123foo42bar_baz = 14;
-
-  extensions 100 to max;
-
-  repeated string extension = 12;
-  repeated int32 class = 15;
-  optional double int = 16;
-  optional bool long = 17;
-  optional int64 boolean = 18;
-  optional string sealed = 19;
-  optional float interface = 20;
-  optional int32 in = 21;
-  optional string object = 22;
-  optional string cached_size = 23;
-  optional bool serialized_size = 24;
-  optional string by = 25;
-}
-
-message HardKeywordsAllTypesProto2 {
-  message NestedMessage {
-    optional int32 while = 1;
-  }
-
-  enum NestedEnum {
-    FOO = 1;
-    BAR = 2;
-  }
-
-  optional int32 as = 1;
-  optional string in = 2;
-  optional NestedEnum break = 3;
-  map<int32, int32> continue = 4;
-  optional NestedMessage do = 5;
-
-  repeated int32 else = 6;
-  repeated string for = 7;
-  repeated NestedEnum fun = 8;
-  repeated NestedMessage if = 9;
-}
-
-message Interface {}
diff --git a/libs/protobuf/java/kotlin/src/test/proto/com/google/protobuf/evil_names_proto3.proto b/libs/protobuf/java/kotlin/src/test/proto/com/google/protobuf/evil_names_proto3.proto
deleted file mode 100644
index f6b06d3..0000000
--- a/libs/protobuf/java/kotlin/src/test/proto/com/google/protobuf/evil_names_proto3.proto
+++ /dev/null
@@ -1,107 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// LINT: LEGACY_NAMES
-syntax = "proto3";
-
-package protobuf.kotlin.generator;
-
-option java_package = "com.google.protobuf.kotlin.generator";
-
-message EvilNamesProto3 {
-  bool initialized = 1;
-  bool has_foo = 2;
-  string Bar = 3;
-  bool is_initialized = 4;
-
-  oneof camelCase {
-    string fooBar = 5;
-  }
-
-  repeated string ALL_CAPS = 7;
-  map<int32, bool> ALL_CAPS_MAP = 8;
-
-  bool has_underbar_preceding_numeric_1foo = 9;
-  bool has_underbar_preceding_numeric_42bar = 10;
-  bool has_underbar_preceding_numeric_123foo42bar_baz = 11;
-
-  repeated string extension = 12;
-
-  string class = 13;
-  double int = 14;
-  bool long = 15;
-  int64 boolean = 16;
-  string sealed = 17;
-  float interface = 18;
-  int32 in = 19;
-  string object = 20;
-  string cached_size = 21;
-  bool serialized_size = 22;
-  string value = 23;
-  int64 index = 24;
-  repeated string values = 25;
-  repeated string new_values = 26;
-  bool builder = 27;
-  map<int32, int32> k = 28;
-  map<string, string> v = 29;
-  map<string, int32> key = 30;
-  map<int32, string> map = 31;
-  map<string, int32> pairs = 32;
-
-  string _leading_underscore = 33;
-  oneof _leading_underscore_oneof {
-    int32 option = 34;
-  }
-}
-
-message HardKeywordsAllTypesProto3 {
-  message NestedMessage {
-    optional int32 while = 1;
-  }
-
-  enum NestedEnum {
-    ZERO = 0;
-    FOO = 1;
-    BAR = 2;
-  }
-
-  optional int32 as = 1;
-  optional string in = 2;
-  optional NestedEnum break = 3;
-  map<int32, int32> continue = 4;
-  optional NestedMessage do = 5;
-
-  repeated int32 else = 6;
-  repeated string for = 7;
-  repeated NestedEnum fun = 8;
-  repeated NestedMessage if = 9;
-}
-
-message Class {}
diff --git a/libs/protobuf/java/kotlin/src/test/proto/com/google/protobuf/example_extensible_message.proto b/libs/protobuf/java/kotlin/src/test/proto/com/google/protobuf/example_extensible_message.proto
deleted file mode 100644
index b82c82b..0000000
--- a/libs/protobuf/java/kotlin/src/test/proto/com/google/protobuf/example_extensible_message.proto
+++ /dev/null
@@ -1,46 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto2";
-
-package protobuf.kotlin.test;
-
-option java_package = "com.google.protobuf.kotlin.test";
-option java_multiple_files = true;
-
-message ExampleExtensibleMessage {
-  extensions 10 to 20;
-}
-
-extend ExampleExtensibleMessage {
-  repeated int32 repeated_extension = 10;
-  repeated int32 different_extension = 11;
-  optional int32 int32_extension = 12;
-}
diff --git a/libs/protobuf/java/kotlin/src/test/proto/com/google/protobuf/multiple_files_proto3.proto b/libs/protobuf/java/kotlin/src/test/proto/com/google/protobuf/multiple_files_proto3.proto
deleted file mode 100644
index 61141c5..0000000
--- a/libs/protobuf/java/kotlin/src/test/proto/com/google/protobuf/multiple_files_proto3.proto
+++ /dev/null
@@ -1,42 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto3";
-
-package protobuf.kotlin.generator;
-
-option java_package = "com.google.protobuf.kotlin.generator";
-option java_multiple_files = true;
-
-enum NestedEnum { FOO = 0; }
-
-message MultipleFilesMessageA {}
-
-message MultipleFilesMessageB {}
diff --git a/libs/protobuf/java/lite.md b/libs/protobuf/java/lite.md
deleted file mode 100644
index ad92079..0000000
--- a/libs/protobuf/java/lite.md
+++ /dev/null
@@ -1,54 +0,0 @@
-# Protocol Buffers - Google's data interchange format
-
-Copyright 2008 Google Inc.
-
-https://developers.google.com/protocol-buffers/
-
-## Use the Protobuf Java Lite Runtime
-
-The Protobuf Java Lite runtime is separated from the main Java runtime because
-it's designed and implemented with different constraints. In particular, the Java
-Lite runtime is much smaller which makes it more suitable to be used on Android.
-
-In order to achieve maximum performance and code size, we do
-NOT guarantee API/ABI stability for Java Lite. If this is not acceptable
-for your use-case, use the full Java runtime instead. Note that
-the latest version of Java Lite is not compatible with the 3.0.0 version.
-
-You can generate Java Lite code for your .proto files:
-
-    $ protoc --java_out=lite:${OUTPUT_DIR} path/to/your/proto/file
-
-The "optimize_for = LITE_RUNTIME" option in the .proto file no longer has any
-effect on Java code.
-
-Include the generated Java files in your project and add a dependency on the
-protobuf Java Lite runtime. If you are using Maven, include the following:
-
-```xml
-<dependency>
-  <groupId>com.google.protobuf</groupId>
-  <artifactId>protobuf-javalite</artifactId>
-  <version>3.21.12</version>
-</dependency>
-```
-
-## R8 rule to make production app builds work
-
-The Lite runtime internally uses reflection to avoid generating hashCode/equals/(de)serialization methods. 
-R8 by default obfuscates the field names, which makes the reflection fail causing exceptions of the form 
-`java.lang.RuntimeException: Field {NAME}_ for {CLASS} not found. Known fields are [ {FIELDS} ]` in MessageSchema.java.
-
-There are open issues for this on the [protobuf Github project](https://github.com/protocolbuffers/protobuf/issues/6463) and [R8](https://issuetracker.google.com/issues/144631039).
-
-Until the issues is resolved you need to add the following line to your `proguard-rules.pro` file inside your project:
-
-```
--keep class * extends com.google.protobuf.GeneratedMessageLite { *; }
-```
-
-## Older versions
-
-For the older version of Java Lite (v3.0.0), please refer to:
-
-    https://github.com/protocolbuffers/protobuf/blob/javalite/java/lite.md
diff --git a/libs/protobuf/java/lite/BUILD.bazel b/libs/protobuf/java/lite/BUILD.bazel
deleted file mode 100644
index 9ae3c51..0000000
--- a/libs/protobuf/java/lite/BUILD.bazel
+++ /dev/null
@@ -1,96 +0,0 @@
-load("@bazel_skylib//rules:build_test.bzl", "build_test")
-load("@rules_pkg//:mappings.bzl", "pkg_filegroup", "pkg_files", "strip_prefix")
-load("@rules_proto//proto:defs.bzl", "proto_lang_toolchain")
-load("//conformance:defs.bzl", "conformance_test")
-load("//java/internal:testing.bzl", "junit_tests")
-
-exports_files(
-    ["lite.awk"],
-    visibility = ["//java/core:__pkg__"],
-)
-
-exports_files(
-    ["pom_template.xml"],
-    visibility = ["//java/core:__pkg__"],
-)
-
-alias(
-    name = "lite",
-    actual = "//java/core:lite",
-    visibility = ["//visibility:public"],
-)
-
-proto_lang_toolchain(
-    name = "toolchain",
-    # keep this in sync w/ LITE_WELL_KNOWN_PROTO_MAP in //:BUILD
-    blacklisted_protos = [
-        "//:any_proto",
-        "//:api_proto",
-        "//:duration_proto",
-        "//:empty_proto",
-        "//:field_mask_proto",
-        "//:source_context_proto",
-        "//:struct_proto",
-        "//:timestamp_proto",
-        "//:type_proto",
-        "//:wrappers_proto",
-    ],
-    command_line = "--java_out=lite:$(OUT)",
-    runtime = ":lite",
-    visibility = ["//visibility:public"],
-)
-
-test_suite(
-    name = "tests",
-    tests = [
-        "conformance_test",
-        "lite_build_test",
-        "lite_tests",
-        "//java/core:lite_tests",
-    ],
-)
-
-build_test(
-    name = "lite_build_test",
-    targets = [
-        ":lite",
-    ],
-)
-
-conformance_test(
-    name = "conformance_test",
-    failure_list = "//conformance:failure_list_java_lite.txt",
-    testee = "//conformance:conformance_java_lite",
-    text_format_failure_list = "//conformance:text_format_failure_list_java_lite.txt",
-)
-
-junit_tests(
-    name = "lite_tests",
-    size = "small",
-    srcs = glob(["src/test/**/*.java"]),
-    deps = [
-        ":lite",
-        "//java/core:generic_test_protos_java_proto_lite",
-        "//java/core:java_test_protos_java_proto_lite",
-        "//java/core:test_util_lite",
-        "@maven//:com_google_truth_truth",
-        "@maven//:junit_junit",
-    ],
-)
-
-pkg_files(
-    name = "dist_files",
-    srcs = glob([
-        "**/*.java",
-    ]) + [
-        "BUILD.bazel",
-        "generate-sources-build.xml",
-        "generate-test-sources-build.xml",
-        "lite.awk",
-        "pom.xml",
-        "pom_template.xml",
-        "process-lite-sources-build.xml",
-    ],
-    strip_prefix = strip_prefix.from_root(""),
-    visibility = ["//java:__pkg__"],
-)
diff --git a/libs/protobuf/java/lite/generate-sources-build.xml b/libs/protobuf/java/lite/generate-sources-build.xml
deleted file mode 100644
index 74d96a2..0000000
--- a/libs/protobuf/java/lite/generate-sources-build.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<project name="generate-sources">
-    <echo message="Running protoc ..."/>
-    <mkdir dir="${generated.sources.dir}"/>
-    <exec executable="${protoc}">
-        <arg value="--java_out=lite:${generated.sources.dir}"/>
-        <arg value="--proto_path=${protobuf.source.dir}"/>
-        <arg value="${protobuf.source.dir}/google/protobuf/any.proto"/>
-        <arg value="${protobuf.source.dir}/google/protobuf/api.proto"/>
-        <arg value="${protobuf.source.dir}/google/protobuf/duration.proto"/>
-        <arg value="${protobuf.source.dir}/google/protobuf/empty.proto"/>
-        <arg value="${protobuf.source.dir}/google/protobuf/field_mask.proto"/>
-        <arg value="${protobuf.source.dir}/google/protobuf/source_context.proto"/>
-        <arg value="${protobuf.source.dir}/google/protobuf/struct.proto"/>
-        <arg value="${protobuf.source.dir}/google/protobuf/timestamp.proto"/>
-        <arg value="${protobuf.source.dir}/google/protobuf/type.proto"/>
-        <arg value="${protobuf.source.dir}/google/protobuf/wrappers.proto"/>
-    </exec>
-</project>
-
diff --git a/libs/protobuf/java/lite/generate-test-sources-build.xml b/libs/protobuf/java/lite/generate-test-sources-build.xml
deleted file mode 100644
index 8123efb..0000000
--- a/libs/protobuf/java/lite/generate-test-sources-build.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<project name="generate-test-sources">
-    <mkdir dir="${generated.testsources.dir}"/>
-    <exec executable="${protoc}">
-        <arg value="--java_out=lite:${generated.testsources.dir}"/>
-        <arg value="--proto_path=${protobuf.source.dir}"/>
-        <arg value="--proto_path=${protobuf.basedir}/java/core/${test.proto.dir}"/>
-        <arg value="${protobuf.source.dir}/google/protobuf/descriptor.proto"/>
-        <arg value="${protobuf.source.dir}/google/protobuf/map_lite_unittest.proto"/>
-        <arg value="${protobuf.source.dir}/google/protobuf/unittest.proto"/>
-        <arg value="${protobuf.source.dir}/google/protobuf/unittest_import.proto"/>
-        <arg value="${protobuf.source.dir}/google/protobuf/unittest_import_lite.proto"/>
-        <arg value="${protobuf.source.dir}/google/protobuf/unittest_import_public.proto"/>
-        <arg value="${protobuf.source.dir}/google/protobuf/unittest_import_public_lite.proto"/>
-        <arg value="${protobuf.source.dir}/google/protobuf/unittest_lite.proto"/>
-        <arg value="${protobuf.source.dir}/google/protobuf/unittest_mset.proto"/>
-        <arg value="${protobuf.source.dir}/google/protobuf/unittest_mset_wire_format.proto"/>
-        <arg value="${protobuf.source.dir}/google/protobuf/unittest_no_generic_services.proto"/>
-        <arg value="${protobuf.source.dir}/google/protobuf/unittest_optimize_for.proto"/>
-        <arg value="${protobuf.source.dir}/google/protobuf/unittest_proto3.proto"/>
-        <arg value="${protobuf.source.dir}/google/protobuf/unittest_proto3_optional.proto"/>
-        <arg value="${protobuf.source.dir}/google/protobuf/unittest_well_known_types.proto"/>
-        <arg value="${protobuf.basedir}/java/core/${test.proto.dir}/com/google/protobuf/any_test.proto"/>
-        <arg value="${protobuf.basedir}/java/core/${test.proto.dir}/com/google/protobuf/cached_field_size_test.proto"/>
-        <arg value="${protobuf.basedir}/java/core/${test.proto.dir}/com/google/protobuf/deprecated_file.proto"/>
-        <arg value="${protobuf.basedir}/java/core/${test.proto.dir}/com/google/protobuf/field_presence_test.proto"/>
-        <arg value="${protobuf.basedir}/java/core/${test.proto.dir}/com/google/protobuf/lazy_fields_lite.proto"/>
-        <arg value="${protobuf.basedir}/java/core/${test.proto.dir}/com/google/protobuf/lite_equals_and_hash.proto"/>
-        <arg value="${protobuf.basedir}/java/core/${test.proto.dir}/com/google/protobuf/map_for_proto2_lite_test.proto"/>
-        <arg value="${protobuf.basedir}/java/core/${test.proto.dir}/com/google/protobuf/map_for_proto2_test.proto"/>
-        <arg value="${protobuf.basedir}/java/core/${test.proto.dir}/com/google/protobuf/map_initialization_order_test.proto"/>
-        <arg value="${protobuf.basedir}/java/core/${test.proto.dir}/com/google/protobuf/map_lite_test.proto"/>
-        <arg value="${protobuf.basedir}/java/core/${test.proto.dir}/com/google/protobuf/map_test.proto"/>
-        <arg value="${protobuf.basedir}/java/core/${test.proto.dir}/com/google/protobuf/nested_builders_test.proto"/>
-        <arg value="${protobuf.basedir}/java/core/${test.proto.dir}/com/google/protobuf/nested_extension.proto"/>
-        <arg value="${protobuf.basedir}/java/core/${test.proto.dir}/com/google/protobuf/nested_extension_lite.proto"/>
-        <arg value="${protobuf.basedir}/java/core/${test.proto.dir}/com/google/protobuf/non_nested_extension.proto"/>
-        <arg value="${protobuf.basedir}/java/core/${test.proto.dir}/com/google/protobuf/non_nested_extension_lite.proto"/>
-        <arg value="${protobuf.basedir}/java/core/${test.proto.dir}/com/google/protobuf/outer_class_name_test.proto"/>
-        <arg value="${protobuf.basedir}/java/core/${test.proto.dir}/com/google/protobuf/outer_class_name_test2.proto"/>
-        <arg value="${protobuf.basedir}/java/core/${test.proto.dir}/com/google/protobuf/outer_class_name_test3.proto"/>
-        <arg value="${protobuf.basedir}/java/core/${test.proto.dir}/com/google/protobuf/packed_field_test.proto"/>
-        <arg value="${protobuf.basedir}/java/core/${test.proto.dir}/com/google/protobuf/proto2_message.proto"/>
-        <arg value="${protobuf.basedir}/java/core/${test.proto.dir}/com/google/protobuf/proto2_message_lite.proto"/>
-        <arg value="${protobuf.basedir}/java/core/${test.proto.dir}/com/google/protobuf/proto2_unknown_enum_values.proto"/>
-        <arg value="${protobuf.basedir}/java/core/${test.proto.dir}/com/google/protobuf/proto3_message.proto"/>
-        <arg value="${protobuf.basedir}/java/core/${test.proto.dir}/com/google/protobuf/proto3_message_lite.proto"/>
-        <arg value="${protobuf.basedir}/java/core/${test.proto.dir}/com/google/protobuf/test_bad_identifiers.proto"/>
-        <arg value="${protobuf.basedir}/java/core/${test.proto.dir}/com/google/protobuf/test_check_utf8.proto"/>
-        <arg value="${protobuf.basedir}/java/core/${test.proto.dir}/com/google/protobuf/test_check_utf8_size.proto"/>
-        <arg value="${protobuf.basedir}/java/core/${test.proto.dir}/com/google/protobuf/wrappers_test.proto"/>
-    </exec>
-</project>
diff --git a/libs/protobuf/java/lite/lite.awk b/libs/protobuf/java/lite/lite.awk
deleted file mode 100644
index b22d965..0000000
--- a/libs/protobuf/java/lite/lite.awk
+++ /dev/null
@@ -1,25 +0,0 @@
-# Remove code enclosed by "BEGIN FULL-RUNTIME" and "END FULL-RUNTIME" to
-# create the lite-only version of a test file.
-
-BEGIN {
-  in_full_runtime = 0;
-}
-
-/BEGIN FULL-RUNTIME/ {
-  in_full_runtime = 1;
-  next;
-}
-
-/END FULL-RUNTIME/ {
-  in_full_runtime = 0;
-  next;
-}
-
-in_full_runtime {
-  # Skip full runtime code path.
-  next;
-}
-
-{
-  print;
-}
diff --git a/libs/protobuf/java/lite/pom.xml b/libs/protobuf/java/lite/pom.xml
deleted file mode 100644
index 367cd7a..0000000
--- a/libs/protobuf/java/lite/pom.xml
+++ /dev/null
@@ -1,346 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>com.google.protobuf</groupId>
-    <artifactId>protobuf-parent</artifactId>
-    <version>3.21.12</version>
-  </parent>
-
-  <artifactId>protobuf-javalite</artifactId>
-  <packaging>bundle</packaging>
-
-  <name>Protocol Buffers [Lite]</name>
-  <description>
-    Lite version of Protocol Buffers library. This version is optimized for code size, but does
-    not guarantee API/ABI stability.
-  </description>
-
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-core</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.truth</groupId>
-      <artifactId>truth</artifactId>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
-  <build>
-     <!-- Include core protos in the bundle as resources -->
-     <resources>
-      <resource>
-        <directory>${protobuf.source.dir}</directory>
-        <includes>
-          <include>google/protobuf/any.proto</include>
-          <include>google/protobuf/api.proto</include>
-          <include>google/protobuf/duration.proto</include>
-          <include>google/protobuf/empty.proto</include>
-          <include>google/protobuf/field_mask.proto</include>
-          <include>google/protobuf/source_context.proto</include>
-          <include>google/protobuf/struct.proto</include>
-          <include>google/protobuf/timestamp.proto</include>
-          <include>google/protobuf/type.proto</include>
-          <include>google/protobuf/wrappers.proto</include>
-        </includes>
-      </resource>
-    </resources>
-    <testResources>
-      <testResource>
-        <directory>${protobuf.source.dir}</directory>
-        <includes>
-          <include>google/protobuf/testdata/golden_message_oneof_implemented</include>
-          <include>google/protobuf/testdata/golden_packed_fields_message</include>
-        </includes>
-      </testResource>
-    </testResources>
-
-    <plugins>
-      <plugin>
-        <artifactId>maven-resources-plugin</artifactId>
-        <version>3.1.0</version>
-        <executions>
-          <execution>
-            <id>copy-source-files</id>
-            <phase>generate-sources</phase>
-            <goals>
-              <goal>copy-resources</goal>
-            </goals>
-            <configuration>
-              <outputDirectory>${generated.sources.dir}/com/google/protobuf</outputDirectory>
-              <resources>
-                <resource>
-                  <directory>${basedir}/../core/src/main/java/com/google/protobuf</directory>
-                  <includes>
-                    <!-- Keep in sync with //java/core:BUILD  -->
-                    <include>AbstractMessageLite.java</include>
-                    <include>AbstractParser.java</include>
-                    <include>AbstractProtobufList.java</include>
-                    <include>AllocatedBuffer.java</include>
-                    <include>Android.java</include>
-                    <include>ArrayDecoders.java</include>
-                    <include>BinaryReader.java</include>
-                    <include>BinaryWriter.java</include>
-                    <include>BooleanArrayList.java</include>
-                    <include>BufferAllocator.java</include>
-                    <include>ByteBufferWriter.java</include>
-                    <include>ByteOutput.java</include>
-                    <include>ByteString.java</include>
-                    <include>CanIgnoreReturnValue.java</include>
-                    <include>CheckReturnValue.java</include>
-                    <include>CodedInputStream.java</include>
-                    <include>CodedInputStreamReader.java</include>
-                    <include>CodedOutputStream.java</include>
-                    <include>CodedOutputStreamWriter.java</include>
-                    <include>CompileTimeConstant.java</include>
-                    <include>DoubleArrayList.java</include>
-                    <include>ExperimentalApi.java</include>
-                    <include>ExtensionLite.java</include>
-                    <include>ExtensionRegistryFactory.java</include>
-                    <include>ExtensionRegistryLite.java</include>
-                    <include>ExtensionSchema.java</include>
-                    <include>ExtensionSchemaLite.java</include>
-                    <include>ExtensionSchemas.java</include>
-                    <include>FieldInfo.java</include>
-                    <include>FieldSet.java</include>
-                    <include>FieldType.java</include>
-                    <include>FloatArrayList.java</include>
-                    <include>GeneratedMessageInfoFactory.java</include>
-                    <include>GeneratedMessageLite.java</include>
-                    <include>InlineMe.java</include>
-                    <include>IntArrayList.java</include>
-                    <include>Internal.java</include>
-                    <include>InvalidProtocolBufferException.java</include>
-                    <include>IterableByteBufferInputStream.java</include>
-                    <include>JavaType.java</include>
-                    <include>LazyField.java</include>
-                    <include>LazyFieldLite.java</include>
-                    <include>LazyStringArrayList.java</include>
-                    <include>LazyStringList.java</include>
-                    <include>ListFieldSchema.java</include>
-                    <include>LongArrayList.java</include>
-                    <include>ManifestSchemaFactory.java</include>
-                    <include>MapEntryLite.java</include>
-                    <include>MapFieldLite.java</include>
-                    <include>MapFieldSchema.java</include>
-                    <include>MapFieldSchemaLite.java</include>
-                    <include>MapFieldSchemas.java</include>
-                    <include>MessageInfo.java</include>
-                    <include>MessageInfoFactory.java</include>
-                    <include>MessageLite.java</include>
-                    <include>MessageLiteOrBuilder.java</include>
-                    <include>MessageLiteToString.java</include>
-                    <include>MessageSchema.java</include>
-                    <include>MessageSetSchema.java</include>
-                    <include>MutabilityOracle.java</include>
-                    <include>NewInstanceSchema.java</include>
-                    <include>NewInstanceSchemaLite.java</include>
-                    <include>NewInstanceSchemas.java</include>
-                    <include>NioByteString.java</include>
-                    <include>OneofInfo.java</include>
-                    <include>Parser.java</include>
-                    <include>PrimitiveNonBoxingCollection.java</include>
-                    <include>ProtoSyntax.java</include>
-                    <include>Protobuf.java</include>
-                    <include>ProtobufArrayList.java</include>
-                    <include>ProtobufLists.java</include>
-                    <include>ProtocolStringList.java</include>
-                    <include>RawMessageInfo.java</include>
-                    <include>Reader.java</include>
-                    <include>RopeByteString.java</include>
-                    <include>Schema.java</include>
-                    <include>SchemaFactory.java</include>
-                    <include>SchemaUtil.java</include>
-                    <include>SmallSortedMap.java</include>
-                    <include>StructuralMessageInfo.java</include>
-                    <include>TextFormatEscaper.java</include>
-                    <include>UninitializedMessageException.java</include>
-                    <include>UnknownFieldSchema.java</include>
-                    <include>UnknownFieldSetLite.java</include>
-                    <include>UnknownFieldSetLiteSchema.java</include>
-                    <include>UnmodifiableLazyStringList.java</include>
-                    <include>UnsafeByteOperations.java</include>
-                    <include>UnsafeUtil.java</include>
-                    <include>Utf8.java</include>
-                    <include>WireFormat.java</include>
-                    <include>Writer.java</include>
-                  </includes>
-                </resource>
-              </resources>
-            </configuration>
-          </execution>
-          <execution>
-            <id>copy-test-source-files</id>
-            <phase>generate-test-sources</phase>
-            <goals>
-              <goal>copy-resources</goal>
-            </goals>
-            <configuration>
-              <outputDirectory>${generated.testsources.dir}/com/google/protobuf</outputDirectory>
-              <resources>
-                <resource>
-                  <directory>${basedir}/../core/src/test/java/com/google/protobuf</directory>
-                  <!-- For sources, we want to be explicit about what we add so we don't accidentally
-                  increase the size of the lite runtime library. For tests, we want to be defensive
-                  and exclude only the full runtime exclusive tests so we don't accidentally miss
-                  any test. -->
-                  <excludes>
-                    <!-- Keep in sync with //java/core:lite_tests BUILD rule. -->
-                    <exclude>AbstractMessageTest.java</exclude>
-                    <exclude>AbstractProto2SchemaTest.java</exclude>
-                    <exclude>AnyTest.java</exclude>
-                    <exclude>CodedInputStreamTest.java</exclude>
-                    <exclude>DeprecatedFieldTest.java</exclude>
-                    <exclude>DescriptorsTest.java</exclude>
-                    <exclude>DiscardUnknownFieldsTest.java</exclude>
-                    <exclude>DynamicMessageTest.java</exclude>
-                    <exclude>ExtensionRegistryFactoryTest.java</exclude>
-                    <exclude>FieldPresenceTest.java</exclude>
-                    <exclude>ForceFieldBuildersPreRun.java</exclude>
-                    <exclude>GeneratedMessageTest.java</exclude>
-                    <exclude>LazyFieldTest.java</exclude>
-                    <exclude>LazyStringEndToEndTest.java</exclude>
-                    <exclude>MapForProto2Test.java</exclude>
-                    <exclude>MapTest.java</exclude>
-                    <exclude>MessageTest.java</exclude>
-                    <exclude>NestedBuildersTest.java</exclude>
-                    <exclude>PackedFieldTest.java</exclude>
-                    <exclude>ParserTest.java</exclude>
-                    <exclude>ParseExceptionsTest.java</exclude>
-                    <exclude>Proto2ExtensionLookupSchemaTest.java</exclude>
-                    <exclude>Proto2SchemaTest.java</exclude>
-                    <exclude>Proto2UnknownEnumValueTest.java</exclude>
-                    <exclude>RepeatedFieldBuilderV3Test.java</exclude>
-                    <exclude>ServiceTest.java</exclude>
-                    <exclude>SingleFieldBuilderV3Test.java</exclude>
-                    <exclude>TestBadIdentifiers.java</exclude>
-                    <exclude>TextFormatParseInfoTreeTest.java</exclude>
-                    <exclude>TextFormatParseLocationTest.java</exclude>
-                    <exclude>TextFormatTest.java</exclude>
-                    <exclude>TestUtil.java</exclude>
-                    <exclude>TypeRegistryTest.java</exclude>
-                    <exclude>UnknownEnumValueTest.java</exclude>
-                    <exclude>UnknownFieldSetLiteTest.java</exclude>
-                    <exclude>UnknownFieldSetPerformanceTest.java</exclude>
-                    <exclude>UnknownFieldSetTest.java</exclude>
-                    <exclude>WellKnownTypesTest.java</exclude>
-                    <exclude>WireFormatTest.java</exclude>
-                  </excludes>
-                </resource>
-              </resources>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-
-      <!-- Use Antrun plugin to generate sources with protoc -->
-      <plugin>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <executions>
-          <!-- Generate core protos -->
-          <execution>
-            <id>generate-sources</id>
-            <phase>generate-sources</phase>
-            <configuration>
-              <target>
-                <ant antfile="generate-sources-build.xml"/>
-              </target>
-            </configuration>
-            <goals>
-              <goal>run</goal>
-            </goals>
-          </execution>
-
-          <!-- Generate the test protos -->
-          <execution>
-            <id>generate-test-sources</id>
-            <phase>generate-test-sources</phase>
-            <configuration>
-              <target>
-                <ant antfile="generate-test-sources-build.xml"/>
-              </target>
-            </configuration>
-            <goals>
-              <goal>run</goal>
-            </goals>
-          </execution>
-
-          <execution>
-            <id>process-lite-sources</id>
-            <phase>generate-test-sources</phase>
-            <configuration>
-              <target>
-                <ant antfile="process-lite-sources-build.xml"/>
-              </target>
-            </configuration>
-            <goals>
-              <goal>run</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>add-generated-sources</id>
-            <phase>generate-sources</phase>
-            <goals>
-              <goal>add-source</goal>
-            </goals>
-            <configuration>
-              <sources>
-                <source>${generated.sources.dir}</source>
-              </sources>
-            </configuration>
-          </execution>
-
-          <execution>
-            <id>add-generated-test-sources</id>
-            <phase>generate-test-sources</phase>
-            <goals>
-              <goal>add-test-source</goal>
-            </goals>
-            <configuration>
-              <sources>
-                <source>${generated.testsources.dir}</source>
-              </sources>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-
-      <!-- OSGI bundle configuration -->
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <extensions>true</extensions>
-        <configuration>
-          <instructions>
-            <Automatic-Module-Name>com.google.protobuf</Automatic-Module-Name> <!-- Java9+ Jigsaw module name -->
-            <Bundle-DocURL>https://developers.google.com/protocol-buffers/</Bundle-DocURL>
-            <Bundle-SymbolicName>com.google.protobuf</Bundle-SymbolicName>
-            <Export-Package>com.google.protobuf;version=${project.version}</Export-Package>
-            <Import-Package>sun.misc;resolution:=optional,*</Import-Package>
-          </instructions>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-</project>
diff --git a/libs/protobuf/java/lite/pom_template.xml b/libs/protobuf/java/lite/pom_template.xml
deleted file mode 100644
index 6d705fd..0000000
--- a/libs/protobuf/java/lite/pom_template.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>{groupId}</groupId>
-    <artifactId>protobuf-parent</artifactId>
-    <version>{version}</version>
-  </parent>
-
-  <artifactId>{artifactId}</artifactId>
-  <packaging>{type}</packaging>
-
-  <name>Protocol Buffers [Lite]</name>
-  <description>
-    Lite version of Protocol Buffers library. This version is optimized for code size, but does
-    not guarantee API/ABI stability.
-  </description>
-
-</project>
diff --git a/libs/protobuf/java/lite/process-lite-sources-build.xml b/libs/protobuf/java/lite/process-lite-sources-build.xml
deleted file mode 100644
index d49cf3a..0000000
--- a/libs/protobuf/java/lite/process-lite-sources-build.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<project name="process-lite-sources">
-    <exec executable="awk" output="${generated.testsources.dir}/com/google/protobuf/TestUtil.java">
-      <arg value="-f" />
-      <arg value="${basedir}/lite.awk" />
-      <arg value="${basedir}/../core/src/test/java/com/google/protobuf/TestUtil.java" />
-    </exec>
-</project>
diff --git a/libs/protobuf/java/lite/proguard.pgcfg b/libs/protobuf/java/lite/proguard.pgcfg
deleted file mode 100644
index 54c798c..0000000
--- a/libs/protobuf/java/lite/proguard.pgcfg
+++ /dev/null
@@ -1,8 +0,0 @@
-
-# Skip runtime check for isOnAndroidDevice().
-# One line to make it easy to remove with sed.
--assumevalues class com.google.protobuf.Android { static boolean ASSUME_ANDROID return true; }
-
--keepclassmembers class * extends com.google.protobuf.GeneratedMessageLite {
-  <fields>;
-}
diff --git a/libs/protobuf/java/lite/src/test/java/com/google/protobuf/LiteTest.java b/libs/protobuf/java/lite/src/test/java/com/google/protobuf/LiteTest.java
deleted file mode 100644
index 801303b..0000000
--- a/libs/protobuf/java/lite/src/test/java/com/google/protobuf/LiteTest.java
+++ /dev/null
@@ -1,2815 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf;
-
-import static com.google.common.truth.Truth.assertThat;
-import static com.google.common.truth.Truth.assertWithMessage;
-import static java.util.Collections.singletonList;
-
-import com.google.protobuf.FieldPresenceTestProto.TestAllTypes;
-import com.google.protobuf.UnittestImportLite.ImportEnumLite;
-import com.google.protobuf.UnittestImportPublicLite.PublicImportMessageLite;
-import com.google.protobuf.UnittestLite.ForeignEnumLite;
-import com.google.protobuf.UnittestLite.ForeignMessageLite;
-import com.google.protobuf.UnittestLite.RecursiveMessage;
-import com.google.protobuf.UnittestLite.TestAllExtensionsLite;
-import com.google.protobuf.UnittestLite.TestAllTypesLite;
-import com.google.protobuf.UnittestLite.TestAllTypesLite.NestedEnum;
-import com.google.protobuf.UnittestLite.TestAllTypesLite.NestedMessage;
-import com.google.protobuf.UnittestLite.TestAllTypesLite.NestedMessage2;
-import com.google.protobuf.UnittestLite.TestAllTypesLite.OneofFieldCase;
-import com.google.protobuf.UnittestLite.TestAllTypesLite.OptionalGroup;
-import com.google.protobuf.UnittestLite.TestAllTypesLite.RepeatedGroup;
-import com.google.protobuf.UnittestLite.TestAllTypesLiteOrBuilder;
-import com.google.protobuf.UnittestLite.TestHugeFieldNumbersLite;
-import com.google.protobuf.UnittestLite.TestNestedExtensionLite;
-import map_lite_test.MapTestProto.TestMap;
-import map_lite_test.MapTestProto.TestMap.MessageValue;
-import protobuf_unittest.NestedExtensionLite;
-import protobuf_unittest.NonNestedExtensionLite;
-import protobuf_unittest.UnittestProto.TestOneof2;
-import protobuf_unittest.lite_equals_and_hash.LiteEqualsAndHash.Bar;
-import protobuf_unittest.lite_equals_and_hash.LiteEqualsAndHash.BarPrime;
-import protobuf_unittest.lite_equals_and_hash.LiteEqualsAndHash.Foo;
-import protobuf_unittest.lite_equals_and_hash.LiteEqualsAndHash.TestOneofEquals;
-import protobuf_unittest.lite_equals_and_hash.LiteEqualsAndHash.TestRecursiveOneof;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.lang.reflect.Field;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-/** Test lite runtime. */
-@RunWith(JUnit4.class)
-public class LiteTest {
-
-  @Before
-  public void setUp() throws Exception {
-    // Test that nested extensions are initialized correctly even if the outer
-    // class has not been accessed directly.  This was once a bug with lite
-    // messages.
-    //
-    // We put this in setUp() rather than in its own test method because we
-    // need to make sure it runs before any actual tests.
-    assertThat(TestNestedExtensionLite.nestedExtension).isNotNull();
-  }
-
-  @Test
-  public void testLite() throws Exception {
-    // Since lite messages are a subset of regular messages, we can mostly
-    // assume that the functionality of lite messages is already thoroughly
-    // tested by the regular tests.  All this test really verifies is that
-    // a proto with optimize_for = LITE_RUNTIME compiles correctly when
-    // linked only against the lite library.  That is all tested at compile
-    // time, leaving not much to do in this method.  Let's just do some random
-    // stuff to make sure the lite message is actually here and usable.
-
-    TestAllTypesLite message =
-        TestAllTypesLite.newBuilder()
-            .setOptionalInt32(123)
-            .addRepeatedString("hello")
-            .setOptionalNestedMessage(NestedMessage.newBuilder().setBb(7))
-            .build();
-
-    ByteString data = message.toByteString();
-
-    TestAllTypesLite message2 = TestAllTypesLite.parseFrom(data);
-
-    assertThat(message2.getOptionalInt32()).isEqualTo(123);
-    assertThat(message2.getRepeatedStringCount()).isEqualTo(1);
-    assertThat(message2.getRepeatedString(0)).isEqualTo("hello");
-    assertThat(message2.getOptionalNestedMessage().getBb()).isEqualTo(7);
-  }
-
-  @Test
-  public void testLite_unknownEnumAtListBoundary() throws Exception {
-    ByteArrayOutputStream byteStream = new ByteArrayOutputStream();
-    CodedOutputStream output = CodedOutputStream.newInstance(byteStream);
-    for (int i = 0; i < AbstractProtobufList.DEFAULT_CAPACITY; i++) {
-      output.writeInt32(TestAllTypesLite.REPEATED_NESTED_ENUM_FIELD_NUMBER, 1);
-    }
-    // 0 is not a valid enum value for NestedEnum
-    output.writeInt32(TestAllTypesLite.REPEATED_NESTED_ENUM_FIELD_NUMBER, 0);
-    output.flush();
-    // This tests a bug we had once with removal right at the boundary of the array. It would throw
-    // at runtime so no need to assert.
-    TestAllTypesLite unused =
-        TestAllTypesLite.parseFrom(new ByteArrayInputStream(byteStream.toByteArray()));
-  }
-
-  @Test
-  public void testLiteExtensions() throws Exception {
-    // TODO(kenton):  Unlike other features of the lite library, extensions are
-    //   implemented completely differently from the regular library.  We
-    //   should probably test them more thoroughly.
-
-    TestAllExtensionsLite message =
-        TestAllExtensionsLite.newBuilder()
-            .setExtension(UnittestLite.optionalInt32ExtensionLite, 123)
-            .addExtension(UnittestLite.repeatedStringExtensionLite, "hello")
-            .setExtension(UnittestLite.optionalNestedEnumExtensionLite, NestedEnum.BAZ)
-            .setExtension(
-                UnittestLite.optionalNestedMessageExtensionLite,
-                NestedMessage.newBuilder().setBb(7).build())
-            .build();
-
-    // Test copying a message, since coping extensions actually does use a
-    // different code path between lite and regular libraries, and as of this
-    // writing, parsing hasn't been implemented yet.
-    TestAllExtensionsLite message2 = message.toBuilder().build();
-
-    assertThat((int) message2.getExtension(UnittestLite.optionalInt32ExtensionLite)).isEqualTo(123);
-    assertThat(message2.getExtensionCount(UnittestLite.repeatedStringExtensionLite)).isEqualTo(1);
-    assertThat(message2.getExtension(UnittestLite.repeatedStringExtensionLite)).hasSize(1);
-    assertThat(message2.getExtension(UnittestLite.repeatedStringExtensionLite, 0))
-        .isEqualTo("hello");
-    assertThat(message2.getExtension(UnittestLite.optionalNestedEnumExtensionLite))
-        .isEqualTo(NestedEnum.BAZ);
-    assertThat(message2.getExtension(UnittestLite.optionalNestedMessageExtensionLite).getBb())
-        .isEqualTo(7);
-  }
-
-  @Test
-  public void testClone() {
-    TestAllTypesLite.Builder expected = TestAllTypesLite.newBuilder().setOptionalInt32(123);
-    assertThat(expected.getOptionalInt32()).isEqualTo(expected.clone().getOptionalInt32());
-
-    TestAllExtensionsLite.Builder expected2 =
-        TestAllExtensionsLite.newBuilder()
-            .setExtension(UnittestLite.optionalInt32ExtensionLite, 123);
-    assertThat(expected2.getExtension(UnittestLite.optionalInt32ExtensionLite))
-        .isEqualTo(expected2.clone().getExtension(UnittestLite.optionalInt32ExtensionLite));
-  }
-
-  @Test
-  public void testAddAll() {
-    try {
-      TestAllTypesLite.newBuilder().addAllRepeatedBytes(null);
-      assertWithMessage("expected exception").fail();
-    } catch (NullPointerException e) {
-      // expected.
-    }
-  }
-
-  @Test
-  public void testMemoization() throws Exception {
-    GeneratedMessageLite<?, ?> message = TestUtilLite.getAllLiteExtensionsSet();
-
-    // This built message should not be mutable
-    assertThat(message.isMutable()).isFalse();
-
-    // Test serialized size is memoized
-    assertThat(message.getMemoizedSerializedSize())
-        .isEqualTo(GeneratedMessageLite.UNINITIALIZED_SERIALIZED_SIZE);
-    int size = message.getSerializedSize();
-    assertThat(size).isGreaterThan(0);
-    assertThat(message.getMemoizedSerializedSize()).isEqualTo(size);
-    message.clearMemoizedSerializedSize();
-    assertThat(message.getMemoizedSerializedSize())
-        .isEqualTo(GeneratedMessageLite.UNINITIALIZED_SERIALIZED_SIZE);
-
-    // Test hashCode is memoized
-    assertThat(message.hashCodeIsNotMemoized()).isTrue();
-    int hashCode = message.hashCode();
-    assertThat(message.hashCodeIsNotMemoized()).isFalse();
-    assertThat(message.getMemoizedHashCode()).isEqualTo(hashCode);
-    message.clearMemoizedHashCode();
-    assertThat(message.hashCodeIsNotMemoized()).isTrue();
-
-    // Test isInitialized is memoized
-    Field memo = message.getClass().getDeclaredField("memoizedIsInitialized");
-    memo.setAccessible(true);
-    memo.set(message, (byte) -1);
-    boolean initialized = message.isInitialized();
-    assertThat(initialized).isTrue();
-    // We have to cast to Byte first. Casting to byte causes a type error
-    assertThat(((Byte) memo.get(message)).intValue()).isEqualTo(1);
-  }
-
-  @Test
-  public void testSanityCopyOnWrite() throws InvalidProtocolBufferException {
-    // Since builders are implemented as a thin wrapper around a message
-    // instance, we attempt to verify that we can't cause the builder to modify
-    // a produced message.
-
-    TestAllTypesLite.Builder builder = TestAllTypesLite.newBuilder();
-    TestAllTypesLite message = builder.build();
-    TestAllTypesLite messageAfterBuild;
-    builder.setOptionalBool(true);
-    assertThat(message.getOptionalBool()).isFalse();
-    assertThat(builder.getOptionalBool()).isTrue();
-    messageAfterBuild = builder.build();
-    assertThat(messageAfterBuild.getOptionalBool()).isTrue();
-    assertThat(message.getOptionalBool()).isFalse();
-    builder.clearOptionalBool();
-    assertThat(builder.getOptionalBool()).isFalse();
-    assertThat(messageAfterBuild.getOptionalBool()).isTrue();
-
-    message = builder.build();
-    builder.setOptionalBytes(ByteString.copyFromUtf8("hi"));
-    assertThat(message.getOptionalBytes()).isEqualTo(ByteString.EMPTY);
-    assertThat(builder.getOptionalBytes()).isEqualTo(ByteString.copyFromUtf8("hi"));
-    messageAfterBuild = builder.build();
-    assertThat(messageAfterBuild.getOptionalBytes()).isEqualTo(ByteString.copyFromUtf8("hi"));
-    assertThat(message.getOptionalBytes()).isEqualTo(ByteString.EMPTY);
-    builder.clearOptionalBytes();
-    assertThat(builder.getOptionalBytes()).isEqualTo(ByteString.EMPTY);
-    assertThat(messageAfterBuild.getOptionalBytes()).isEqualTo(ByteString.copyFromUtf8("hi"));
-
-    message = builder.build();
-    builder.setOptionalCord("hi");
-    assertThat(message.getOptionalCord()).isEmpty();
-    assertThat(builder.getOptionalCord()).isEqualTo("hi");
-    messageAfterBuild = builder.build();
-    assertThat(messageAfterBuild.getOptionalCord()).isEqualTo("hi");
-    assertThat(message.getOptionalCord()).isEmpty();
-    builder.clearOptionalCord();
-    assertThat(builder.getOptionalCord()).isEmpty();
-    assertThat(messageAfterBuild.getOptionalCord()).isEqualTo("hi");
-
-    message = builder.build();
-    builder.setOptionalCordBytes(ByteString.copyFromUtf8("no"));
-    assertThat(message.getOptionalCordBytes()).isEqualTo(ByteString.EMPTY);
-    assertThat(builder.getOptionalCordBytes()).isEqualTo(ByteString.copyFromUtf8("no"));
-    messageAfterBuild = builder.build();
-    assertThat(messageAfterBuild.getOptionalCordBytes()).isEqualTo(ByteString.copyFromUtf8("no"));
-    assertThat(message.getOptionalCordBytes()).isEqualTo(ByteString.EMPTY);
-    builder.clearOptionalCord();
-    assertThat(builder.getOptionalCordBytes()).isEqualTo(ByteString.EMPTY);
-    assertThat(messageAfterBuild.getOptionalCordBytes()).isEqualTo(ByteString.copyFromUtf8("no"));
-
-    message = builder.build();
-    builder.setOptionalDouble(1);
-    assertThat(message.getOptionalDouble()).isEqualTo(0D);
-    assertThat(builder.getOptionalDouble()).isEqualTo(1D);
-    messageAfterBuild = builder.build();
-    assertThat(messageAfterBuild.getOptionalDouble()).isEqualTo(1D);
-    assertThat(message.getOptionalDouble()).isEqualTo(0D);
-    builder.clearOptionalDouble();
-    assertThat(builder.getOptionalDouble()).isEqualTo(0D);
-    assertThat(messageAfterBuild.getOptionalDouble()).isEqualTo(1D);
-
-    message = builder.build();
-    builder.setOptionalFixed32(1);
-    assertThat(message.getOptionalFixed32()).isEqualTo(0);
-    assertThat(builder.getOptionalFixed32()).isEqualTo(1);
-    messageAfterBuild = builder.build();
-    assertThat(messageAfterBuild.getOptionalFixed32()).isEqualTo(1);
-    assertThat(message.getOptionalFixed32()).isEqualTo(0);
-    builder.clearOptionalFixed32();
-    assertThat(builder.getOptionalFixed32()).isEqualTo(0);
-    assertThat(messageAfterBuild.getOptionalFixed32()).isEqualTo(1);
-
-    message = builder.build();
-    builder.setOptionalFixed64(1);
-    assertThat(message.getOptionalFixed64()).isEqualTo(0L);
-    assertThat(builder.getOptionalFixed64()).isEqualTo(1L);
-    messageAfterBuild = builder.build();
-    assertThat(messageAfterBuild.getOptionalFixed64()).isEqualTo(1L);
-    assertThat(message.getOptionalFixed64()).isEqualTo(0L);
-    builder.clearOptionalFixed64();
-    assertThat(builder.getOptionalFixed64()).isEqualTo(0L);
-    assertThat(messageAfterBuild.getOptionalFixed64()).isEqualTo(1L);
-
-    message = builder.build();
-    builder.setOptionalFloat(1);
-    assertThat(message.getOptionalFloat()).isEqualTo(0F);
-    assertThat(builder.getOptionalFloat()).isEqualTo(1F);
-    messageAfterBuild = builder.build();
-    assertThat(messageAfterBuild.getOptionalFloat()).isEqualTo(1F);
-    assertThat(message.getOptionalFloat()).isEqualTo(0F);
-    builder.clearOptionalFloat();
-    assertThat(builder.getOptionalFloat()).isEqualTo(0F);
-    assertThat(messageAfterBuild.getOptionalFloat()).isEqualTo(1F);
-
-    message = builder.build();
-    builder.setOptionalForeignEnum(ForeignEnumLite.FOREIGN_LITE_BAR);
-    assertThat(message.getOptionalForeignEnum()).isEqualTo(ForeignEnumLite.FOREIGN_LITE_FOO);
-    assertThat(builder.getOptionalForeignEnum()).isEqualTo(ForeignEnumLite.FOREIGN_LITE_BAR);
-    messageAfterBuild = builder.build();
-    assertThat(messageAfterBuild.getOptionalForeignEnum())
-        .isEqualTo(ForeignEnumLite.FOREIGN_LITE_BAR);
-    assertThat(message.getOptionalForeignEnum()).isEqualTo(ForeignEnumLite.FOREIGN_LITE_FOO);
-    builder.clearOptionalForeignEnum();
-    assertThat(builder.getOptionalForeignEnum()).isEqualTo(ForeignEnumLite.FOREIGN_LITE_FOO);
-    assertThat(messageAfterBuild.getOptionalForeignEnum())
-        .isEqualTo(ForeignEnumLite.FOREIGN_LITE_BAR);
-
-    message = builder.build();
-    ForeignMessageLite foreignMessage = ForeignMessageLite.newBuilder().setC(1).build();
-    builder.setOptionalForeignMessage(foreignMessage);
-    assertThat(message.getOptionalForeignMessage())
-        .isEqualTo(ForeignMessageLite.getDefaultInstance());
-    assertThat(builder.getOptionalForeignMessage()).isEqualTo(foreignMessage);
-    messageAfterBuild = builder.build();
-    assertThat(messageAfterBuild.getOptionalForeignMessage()).isEqualTo(foreignMessage);
-    assertThat(message.getOptionalForeignMessage())
-        .isEqualTo(ForeignMessageLite.getDefaultInstance());
-    builder.clearOptionalForeignMessage();
-    assertThat(builder.getOptionalForeignMessage())
-        .isEqualTo(ForeignMessageLite.getDefaultInstance());
-    assertThat(messageAfterBuild.getOptionalForeignMessage()).isEqualTo(foreignMessage);
-
-    message = builder.build();
-    ForeignMessageLite foreignMessageC3 = ForeignMessageLite.newBuilder().setC(3).build();
-    builder.setOptionalForeignMessage(foreignMessageC3);
-    assertThat(message.getOptionalForeignMessage())
-        .isEqualTo(ForeignMessageLite.getDefaultInstance());
-    assertThat(builder.getOptionalForeignMessage()).isEqualTo(foreignMessageC3);
-    messageAfterBuild = builder.build();
-    assertThat(messageAfterBuild.getOptionalForeignMessage()).isEqualTo(foreignMessageC3);
-    assertThat(message.getOptionalForeignMessage())
-        .isEqualTo(ForeignMessageLite.getDefaultInstance());
-    builder.clearOptionalForeignMessage();
-    assertThat(builder.getOptionalForeignMessage())
-        .isEqualTo(ForeignMessageLite.getDefaultInstance());
-    assertThat(messageAfterBuild.getOptionalForeignMessage()).isEqualTo(foreignMessageC3);
-
-    message = builder.build();
-    OptionalGroup optionalGroup = OptionalGroup.newBuilder().setA(1).build();
-    builder.setOptionalGroup(optionalGroup);
-    assertThat(message.getOptionalGroup()).isEqualTo(OptionalGroup.getDefaultInstance());
-    assertThat(builder.getOptionalGroup()).isEqualTo(optionalGroup);
-    messageAfterBuild = builder.build();
-    assertThat(messageAfterBuild.getOptionalGroup()).isEqualTo(optionalGroup);
-    assertThat(message.getOptionalGroup()).isEqualTo(OptionalGroup.getDefaultInstance());
-    builder.clearOptionalGroup();
-    assertThat(builder.getOptionalGroup()).isEqualTo(OptionalGroup.getDefaultInstance());
-    assertThat(messageAfterBuild.getOptionalGroup()).isEqualTo(optionalGroup);
-
-    message = builder.build();
-    OptionalGroup.Builder optionalGroupBuilder = OptionalGroup.newBuilder().setA(3);
-    builder.setOptionalGroup(optionalGroupBuilder);
-    assertThat(message.getOptionalGroup()).isEqualTo(OptionalGroup.getDefaultInstance());
-    assertThat(builder.getOptionalGroup()).isEqualTo(optionalGroupBuilder.build());
-    messageAfterBuild = builder.build();
-    assertThat(messageAfterBuild.getOptionalGroup()).isEqualTo(optionalGroupBuilder.build());
-    assertThat(message.getOptionalGroup()).isEqualTo(OptionalGroup.getDefaultInstance());
-    builder.clearOptionalGroup();
-    assertThat(builder.getOptionalGroup()).isEqualTo(OptionalGroup.getDefaultInstance());
-    assertThat(messageAfterBuild.getOptionalGroup()).isEqualTo(optionalGroupBuilder.build());
-
-    message = builder.build();
-    builder.setOptionalInt32(1);
-    assertThat(message.getOptionalInt32()).isEqualTo(0);
-    assertThat(builder.getOptionalInt32()).isEqualTo(1);
-    messageAfterBuild = builder.build();
-    assertThat(messageAfterBuild.getOptionalInt32()).isEqualTo(1);
-    assertThat(message.getOptionalInt32()).isEqualTo(0);
-    builder.clearOptionalInt32();
-    assertThat(builder.getOptionalInt32()).isEqualTo(0);
-    assertThat(messageAfterBuild.getOptionalInt32()).isEqualTo(1);
-
-    message = builder.build();
-    builder.setOptionalInt64(1);
-    assertThat(message.getOptionalInt64()).isEqualTo(0L);
-    assertThat(builder.getOptionalInt64()).isEqualTo(1L);
-    messageAfterBuild = builder.build();
-    assertThat(messageAfterBuild.getOptionalInt64()).isEqualTo(1L);
-    assertThat(message.getOptionalInt64()).isEqualTo(0L);
-    builder.clearOptionalInt64();
-    assertThat(builder.getOptionalInt64()).isEqualTo(0L);
-    assertThat(messageAfterBuild.getOptionalInt64()).isEqualTo(1L);
-
-    message = builder.build();
-    NestedMessage nestedMessage = NestedMessage.newBuilder().setBb(1).build();
-    builder.setOptionalLazyMessage(nestedMessage);
-    assertThat(message.getOptionalLazyMessage()).isEqualTo(NestedMessage.getDefaultInstance());
-    assertThat(builder.getOptionalLazyMessage()).isEqualTo(nestedMessage);
-    messageAfterBuild = builder.build();
-    assertThat(messageAfterBuild.getOptionalLazyMessage()).isEqualTo(nestedMessage);
-    assertThat(message.getOptionalLazyMessage()).isEqualTo(NestedMessage.getDefaultInstance());
-    builder.clearOptionalLazyMessage();
-    assertThat(builder.getOptionalLazyMessage()).isEqualTo(NestedMessage.getDefaultInstance());
-    assertThat(messageAfterBuild.getOptionalLazyMessage()).isEqualTo(nestedMessage);
-
-    message = builder.build();
-    NestedMessage.Builder nestedMessageBuilder = NestedMessage.newBuilder().setBb(3);
-    builder.setOptionalLazyMessage(nestedMessageBuilder);
-    assertThat(message.getOptionalLazyMessage()).isEqualTo(NestedMessage.getDefaultInstance());
-    assertThat(builder.getOptionalLazyMessage()).isEqualTo(nestedMessageBuilder.build());
-    messageAfterBuild = builder.build();
-    assertThat(messageAfterBuild.getOptionalLazyMessage()).isEqualTo(nestedMessageBuilder.build());
-    assertThat(message.getOptionalLazyMessage()).isEqualTo(NestedMessage.getDefaultInstance());
-    builder.clearOptionalLazyMessage();
-    assertThat(builder.getOptionalLazyMessage()).isEqualTo(NestedMessage.getDefaultInstance());
-    assertThat(messageAfterBuild.getOptionalLazyMessage()).isEqualTo(nestedMessageBuilder.build());
-
-    message = builder.build();
-    builder.setOptionalSfixed32(1);
-    assertThat(message.getOptionalSfixed32()).isEqualTo(0);
-    assertThat(builder.getOptionalSfixed32()).isEqualTo(1);
-    messageAfterBuild = builder.build();
-    assertThat(messageAfterBuild.getOptionalSfixed32()).isEqualTo(1);
-    assertThat(message.getOptionalSfixed32()).isEqualTo(0);
-    builder.clearOptionalSfixed32();
-    assertThat(builder.getOptionalSfixed32()).isEqualTo(0);
-    assertThat(messageAfterBuild.getOptionalSfixed32()).isEqualTo(1);
-
-    message = builder.build();
-    builder.setOptionalSfixed64(1);
-    assertThat(message.getOptionalSfixed64()).isEqualTo(0L);
-    assertThat(builder.getOptionalSfixed64()).isEqualTo(1L);
-    messageAfterBuild = builder.build();
-    assertThat(messageAfterBuild.getOptionalSfixed64()).isEqualTo(1L);
-    assertThat(message.getOptionalSfixed64()).isEqualTo(0L);
-    builder.clearOptionalSfixed64();
-    assertThat(builder.getOptionalSfixed64()).isEqualTo(0L);
-    assertThat(messageAfterBuild.getOptionalSfixed64()).isEqualTo(1L);
-
-    message = builder.build();
-    builder.setOptionalSint32(1);
-    assertThat(message.getOptionalSint32()).isEqualTo(0);
-    assertThat(builder.getOptionalSint32()).isEqualTo(1);
-    messageAfterBuild = builder.build();
-    assertThat(messageAfterBuild.getOptionalSint32()).isEqualTo(1);
-    builder.clearOptionalSint32();
-    assertThat(builder.getOptionalSint32()).isEqualTo(0);
-    assertThat(messageAfterBuild.getOptionalSint32()).isEqualTo(1);
-
-    message = builder.build();
-    builder.setOptionalSint64(1);
-    assertThat(message.getOptionalSint64()).isEqualTo(0L);
-    assertThat(builder.getOptionalSint64()).isEqualTo(1L);
-    messageAfterBuild = builder.build();
-    assertThat(messageAfterBuild.getOptionalSint64()).isEqualTo(1L);
-    assertThat(message.getOptionalSint64()).isEqualTo(0L);
-    builder.clearOptionalSint64();
-    assertThat(builder.getOptionalSint64()).isEqualTo(0L);
-    assertThat(messageAfterBuild.getOptionalSint64()).isEqualTo(1L);
-
-    message = builder.build();
-    builder.setOptionalString("hi");
-    assertThat(message.getOptionalString()).isEmpty();
-    assertThat(builder.getOptionalString()).isEqualTo("hi");
-    messageAfterBuild = builder.build();
-    assertThat(messageAfterBuild.getOptionalString()).isEqualTo("hi");
-    assertThat(message.getOptionalString()).isEmpty();
-    builder.clearOptionalString();
-    assertThat(builder.getOptionalString()).isEmpty();
-    assertThat(messageAfterBuild.getOptionalString()).isEqualTo("hi");
-
-    message = builder.build();
-    builder.setOptionalStringBytes(ByteString.copyFromUtf8("no"));
-    assertThat(message.getOptionalStringBytes()).isEqualTo(ByteString.EMPTY);
-    assertThat(builder.getOptionalStringBytes()).isEqualTo(ByteString.copyFromUtf8("no"));
-    messageAfterBuild = builder.build();
-    assertThat(messageAfterBuild.getOptionalStringBytes()).isEqualTo(ByteString.copyFromUtf8("no"));
-    assertThat(message.getOptionalStringBytes()).isEqualTo(ByteString.EMPTY);
-    builder.clearOptionalString();
-    assertThat(builder.getOptionalStringBytes()).isEqualTo(ByteString.EMPTY);
-    assertThat(messageAfterBuild.getOptionalStringBytes()).isEqualTo(ByteString.copyFromUtf8("no"));
-
-    message = builder.build();
-    builder.setOptionalStringPiece("hi");
-    assertThat(message.getOptionalStringPiece()).isEmpty();
-    assertThat(builder.getOptionalStringPiece()).isEqualTo("hi");
-    messageAfterBuild = builder.build();
-    assertThat(messageAfterBuild.getOptionalStringPiece()).isEqualTo("hi");
-    assertThat(message.getOptionalStringPiece()).isEmpty();
-    builder.clearOptionalStringPiece();
-    assertThat(builder.getOptionalStringPiece()).isEmpty();
-    assertThat(messageAfterBuild.getOptionalStringPiece()).isEqualTo("hi");
-
-    message = builder.build();
-    builder.setOptionalStringPieceBytes(ByteString.copyFromUtf8("no"));
-    assertThat(message.getOptionalStringPieceBytes()).isEqualTo(ByteString.EMPTY);
-    assertThat(builder.getOptionalStringPieceBytes()).isEqualTo(ByteString.copyFromUtf8("no"));
-    messageAfterBuild = builder.build();
-    assertThat(messageAfterBuild.getOptionalStringPieceBytes())
-        .isEqualTo(ByteString.copyFromUtf8("no"));
-    assertThat(message.getOptionalStringPieceBytes()).isEqualTo(ByteString.EMPTY);
-    builder.clearOptionalStringPiece();
-    assertThat(builder.getOptionalStringPieceBytes()).isEqualTo(ByteString.EMPTY);
-    assertThat(messageAfterBuild.getOptionalStringPieceBytes())
-        .isEqualTo(ByteString.copyFromUtf8("no"));
-
-    message = builder.build();
-    builder.setOptionalUint32(1);
-    assertThat(message.getOptionalUint32()).isEqualTo(0);
-    assertThat(builder.getOptionalUint32()).isEqualTo(1);
-    messageAfterBuild = builder.build();
-    assertThat(messageAfterBuild.getOptionalUint32()).isEqualTo(1);
-    assertThat(message.getOptionalUint32()).isEqualTo(0);
-    builder.clearOptionalUint32();
-    assertThat(builder.getOptionalUint32()).isEqualTo(0);
-    assertThat(messageAfterBuild.getOptionalUint32()).isEqualTo(1);
-
-    message = builder.build();
-    builder.setOptionalUint64(1);
-    assertThat(message.getOptionalUint64()).isEqualTo(0L);
-    assertThat(builder.getOptionalUint64()).isEqualTo(1L);
-    messageAfterBuild = builder.build();
-    assertThat(messageAfterBuild.getOptionalUint64()).isEqualTo(1L);
-    assertThat(message.getOptionalUint64()).isEqualTo(0L);
-    builder.clearOptionalUint64();
-    assertThat(builder.getOptionalUint64()).isEqualTo(0L);
-    assertThat(messageAfterBuild.getOptionalUint64()).isEqualTo(1L);
-
-    message = builder.build();
-    builder.addAllRepeatedBool(singletonList(true));
-    assertThat(message.getRepeatedBoolList()).isEmpty();
-    assertThat(builder.getRepeatedBoolList()).containsExactly(true);
-    assertThat(message.getRepeatedBoolList()).isEmpty();
-    messageAfterBuild = builder.build();
-    builder.clearRepeatedBool();
-    assertThat(builder.getRepeatedBoolList()).isEmpty();
-    assertThat(messageAfterBuild.getRepeatedBoolList()).containsExactly(true);
-
-    message = builder.build();
-    builder.addAllRepeatedBytes(singletonList(ByteString.copyFromUtf8("hi")));
-    assertThat(message.getRepeatedBytesList()).isEmpty();
-    assertThat(builder.getRepeatedBytesList()).containsExactly(ByteString.copyFromUtf8("hi"));
-    assertThat(message.getRepeatedBytesList()).isEmpty();
-    messageAfterBuild = builder.build();
-    builder.clearRepeatedBytes();
-    assertThat(builder.getRepeatedBytesList()).isEmpty();
-    assertThat(messageAfterBuild.getRepeatedBytesList())
-        .containsExactly(ByteString.copyFromUtf8("hi"));
-
-    message = builder.build();
-    builder.addAllRepeatedCord(singletonList("hi"));
-    assertThat(message.getRepeatedCordList()).isEmpty();
-    assertThat(builder.getRepeatedCordList()).containsExactly("hi");
-    assertThat(message.getRepeatedCordList()).isEmpty();
-    messageAfterBuild = builder.build();
-    builder.clearRepeatedCord();
-    assertThat(builder.getRepeatedCordList()).isEmpty();
-    assertThat(messageAfterBuild.getRepeatedCordList()).containsExactly("hi");
-
-    message = builder.build();
-    builder.addAllRepeatedDouble(singletonList(1D));
-    assertThat(message.getRepeatedDoubleList()).isEmpty();
-    assertThat(builder.getRepeatedDoubleList()).containsExactly(1D);
-    assertThat(message.getRepeatedDoubleList()).isEmpty();
-    messageAfterBuild = builder.build();
-    builder.clearRepeatedDouble();
-    assertThat(builder.getRepeatedDoubleList()).isEmpty();
-    assertThat(messageAfterBuild.getRepeatedDoubleList()).containsExactly(1D);
-
-    message = builder.build();
-    builder.addAllRepeatedFixed32(singletonList(1));
-    assertThat(message.getRepeatedFixed32List()).isEmpty();
-    assertThat(builder.getRepeatedFixed32List()).containsExactly(1);
-    assertThat(message.getRepeatedFixed32List()).isEmpty();
-    messageAfterBuild = builder.build();
-    builder.clearRepeatedFixed32();
-    assertThat(builder.getRepeatedFixed32List()).isEmpty();
-    assertThat(messageAfterBuild.getRepeatedFixed32List()).containsExactly(1);
-
-    message = builder.build();
-    builder.addAllRepeatedFixed64(singletonList(1L));
-    assertThat(message.getRepeatedFixed64List()).isEmpty();
-    assertThat(builder.getRepeatedFixed64List()).containsExactly(1L);
-    assertThat(message.getRepeatedFixed64List()).isEmpty();
-    messageAfterBuild = builder.build();
-    builder.clearRepeatedFixed64();
-    assertThat(builder.getRepeatedFixed64List()).isEmpty();
-    assertThat(messageAfterBuild.getRepeatedFixed64List()).containsExactly(1L);
-
-    message = builder.build();
-    builder.addAllRepeatedFloat(singletonList(1F));
-    assertThat(message.getRepeatedFloatList()).isEmpty();
-    assertThat(builder.getRepeatedFloatList()).containsExactly(1F);
-    assertThat(message.getRepeatedFloatList()).isEmpty();
-    messageAfterBuild = builder.build();
-    builder.clearRepeatedFloat();
-    assertThat(builder.getRepeatedFloatList()).isEmpty();
-    assertThat(messageAfterBuild.getRepeatedFloatList()).containsExactly(1F);
-
-    message = builder.build();
-    builder.addAllRepeatedForeignEnum(singletonList(ForeignEnumLite.FOREIGN_LITE_BAR));
-    assertThat(message.getRepeatedForeignEnumList()).isEmpty();
-    assertThat(builder.getRepeatedForeignEnumList())
-        .containsExactly(ForeignEnumLite.FOREIGN_LITE_BAR);
-    assertThat(message.getRepeatedForeignEnumList()).isEmpty();
-    messageAfterBuild = builder.build();
-    builder.clearRepeatedForeignEnum();
-    assertThat(builder.getRepeatedForeignEnumList()).isEmpty();
-    assertThat(messageAfterBuild.getRepeatedForeignEnumList())
-        .containsExactly(ForeignEnumLite.FOREIGN_LITE_BAR);
-
-    message = builder.build();
-    builder.addAllRepeatedForeignMessage(singletonList(foreignMessage));
-    assertThat(message.getRepeatedForeignMessageList()).isEmpty();
-    assertThat(builder.getRepeatedForeignMessageList()).containsExactly(foreignMessage);
-    assertThat(message.getRepeatedForeignMessageList()).isEmpty();
-    messageAfterBuild = builder.build();
-    builder.clearRepeatedForeignMessage();
-    assertThat(builder.getRepeatedForeignMessageList()).isEmpty();
-    assertThat(messageAfterBuild.getRepeatedForeignMessageList()).containsExactly(foreignMessage);
-
-    message = builder.build();
-    builder.addAllRepeatedGroup(singletonList(RepeatedGroup.getDefaultInstance()));
-    assertThat(message.getRepeatedGroupList()).isEmpty();
-    assertThat(builder.getRepeatedGroupList()).containsExactly(RepeatedGroup.getDefaultInstance());
-    assertThat(message.getRepeatedGroupList()).isEmpty();
-    messageAfterBuild = builder.build();
-    builder.clearRepeatedGroup();
-    assertThat(builder.getRepeatedGroupList()).isEmpty();
-    assertThat(messageAfterBuild.getRepeatedGroupList())
-        .containsExactly(RepeatedGroup.getDefaultInstance());
-
-    message = builder.build();
-    builder.addAllRepeatedInt32(singletonList(1));
-    assertThat(message.getRepeatedInt32List()).isEmpty();
-    assertThat(builder.getRepeatedInt32List()).containsExactly(1);
-    assertThat(message.getRepeatedInt32List()).isEmpty();
-    messageAfterBuild = builder.build();
-    builder.clearRepeatedInt32();
-    assertThat(builder.getRepeatedInt32List()).isEmpty();
-    assertThat(messageAfterBuild.getRepeatedInt32List()).containsExactly(1);
-
-    message = builder.build();
-    builder.addAllRepeatedInt64(singletonList(1L));
-    assertThat(message.getRepeatedInt64List()).isEmpty();
-    assertThat(builder.getRepeatedInt64List()).containsExactly(1L);
-    assertThat(message.getRepeatedInt64List()).isEmpty();
-    messageAfterBuild = builder.build();
-    builder.clearRepeatedInt64();
-    assertThat(builder.getRepeatedInt64List()).isEmpty();
-    assertThat(messageAfterBuild.getRepeatedInt64List()).containsExactly(1L);
-
-    message = builder.build();
-    builder.addAllRepeatedLazyMessage(singletonList(nestedMessage));
-    assertThat(message.getRepeatedLazyMessageList()).isEmpty();
-    assertThat(builder.getRepeatedLazyMessageList()).containsExactly(nestedMessage);
-    assertThat(message.getRepeatedLazyMessageList()).isEmpty();
-    messageAfterBuild = builder.build();
-    builder.clearRepeatedLazyMessage();
-    assertThat(builder.getRepeatedLazyMessageList()).isEmpty();
-    assertThat(messageAfterBuild.getRepeatedLazyMessageList()).containsExactly(nestedMessage);
-
-    message = builder.build();
-    builder.addAllRepeatedSfixed32(singletonList(1));
-    assertThat(message.getRepeatedSfixed32List()).isEmpty();
-    assertThat(builder.getRepeatedSfixed32List()).containsExactly(1);
-    assertThat(message.getRepeatedSfixed32List()).isEmpty();
-    messageAfterBuild = builder.build();
-    builder.clearRepeatedSfixed32();
-    assertThat(builder.getRepeatedSfixed32List()).isEmpty();
-    assertThat(messageAfterBuild.getRepeatedSfixed32List()).containsExactly(1);
-
-    message = builder.build();
-    builder.addAllRepeatedSfixed64(singletonList(1L));
-    assertThat(message.getRepeatedSfixed64List()).isEmpty();
-    assertThat(builder.getRepeatedSfixed64List()).containsExactly(1L);
-    assertThat(message.getRepeatedSfixed64List()).isEmpty();
-    messageAfterBuild = builder.build();
-    builder.clearRepeatedSfixed64();
-    assertThat(builder.getRepeatedSfixed64List()).isEmpty();
-    assertThat(messageAfterBuild.getRepeatedSfixed64List()).containsExactly(1L);
-
-    message = builder.build();
-    builder.addAllRepeatedSint32(singletonList(1));
-    assertThat(message.getRepeatedSint32List()).isEmpty();
-    assertThat(builder.getRepeatedSint32List()).containsExactly(1);
-    assertThat(message.getRepeatedSint32List()).isEmpty();
-    messageAfterBuild = builder.build();
-    builder.clearRepeatedSint32();
-    assertThat(builder.getRepeatedSint32List()).isEmpty();
-    assertThat(messageAfterBuild.getRepeatedSint32List()).containsExactly(1);
-
-    message = builder.build();
-    builder.addAllRepeatedSint64(singletonList(1L));
-    assertThat(message.getRepeatedSint64List()).isEmpty();
-    assertThat(builder.getRepeatedSint64List()).containsExactly(1L);
-    assertThat(message.getRepeatedSint64List()).isEmpty();
-    messageAfterBuild = builder.build();
-    builder.clearRepeatedSint64();
-    assertThat(builder.getRepeatedSint64List()).isEmpty();
-    assertThat(messageAfterBuild.getRepeatedSint64List()).containsExactly(1L);
-
-    message = builder.build();
-    builder.addAllRepeatedString(singletonList("hi"));
-    assertThat(message.getRepeatedStringList()).isEmpty();
-    assertThat(builder.getRepeatedStringList()).containsExactly("hi");
-    assertThat(message.getRepeatedStringList()).isEmpty();
-    messageAfterBuild = builder.build();
-    builder.clearRepeatedString();
-    assertThat(builder.getRepeatedStringList()).isEmpty();
-    assertThat(messageAfterBuild.getRepeatedStringList()).containsExactly("hi");
-
-    message = builder.build();
-    builder.addAllRepeatedStringPiece(singletonList("hi"));
-    assertThat(message.getRepeatedStringPieceList()).isEmpty();
-    assertThat(builder.getRepeatedStringPieceList()).containsExactly("hi");
-    assertThat(message.getRepeatedStringPieceList()).isEmpty();
-    messageAfterBuild = builder.build();
-    builder.clearRepeatedStringPiece();
-    assertThat(builder.getRepeatedStringPieceList()).isEmpty();
-    assertThat(messageAfterBuild.getRepeatedStringPieceList()).containsExactly("hi");
-
-    message = builder.build();
-    builder.addAllRepeatedUint32(singletonList(1));
-    assertThat(message.getRepeatedUint32List()).isEmpty();
-    assertThat(builder.getRepeatedUint32List()).containsExactly(1);
-    assertThat(message.getRepeatedUint32List()).isEmpty();
-    messageAfterBuild = builder.build();
-    builder.clearRepeatedUint32();
-    assertThat(builder.getRepeatedUint32List()).isEmpty();
-    assertThat(messageAfterBuild.getRepeatedUint32List()).containsExactly(1);
-
-    message = builder.build();
-    builder.addAllRepeatedUint64(singletonList(1L));
-    assertThat(message.getRepeatedUint64List()).isEmpty();
-    assertThat(builder.getRepeatedUint64List()).containsExactly(1L);
-    assertThat(message.getRepeatedUint64List()).isEmpty();
-    messageAfterBuild = builder.build();
-    builder.clearRepeatedUint64();
-    assertThat(builder.getRepeatedUint64List()).isEmpty();
-    assertThat(messageAfterBuild.getRepeatedUint64List()).containsExactly(1L);
-
-    message = builder.build();
-    builder.addRepeatedBool(true);
-    assertThat(message.getRepeatedBoolList()).isEmpty();
-    assertThat(builder.getRepeatedBoolList()).containsExactly(true);
-    assertThat(message.getRepeatedBoolList()).isEmpty();
-    messageAfterBuild = builder.build();
-    builder.clearRepeatedBool();
-    assertThat(builder.getRepeatedBoolList()).isEmpty();
-    assertThat(messageAfterBuild.getRepeatedBoolList()).containsExactly(true);
-
-    message = builder.build();
-    builder.addRepeatedBytes(ByteString.copyFromUtf8("hi"));
-    assertThat(message.getRepeatedBytesList()).isEmpty();
-    assertThat(builder.getRepeatedBytesList()).containsExactly(ByteString.copyFromUtf8("hi"));
-    assertThat(message.getRepeatedBytesList()).isEmpty();
-    messageAfterBuild = builder.build();
-    builder.clearRepeatedBytes();
-    assertThat(builder.getRepeatedBytesList()).isEmpty();
-    assertThat(messageAfterBuild.getRepeatedBytesList())
-        .containsExactly(ByteString.copyFromUtf8("hi"));
-
-    message = builder.build();
-    builder.addRepeatedCord("hi");
-    assertThat(message.getRepeatedCordList()).isEmpty();
-    assertThat(builder.getRepeatedCordList()).containsExactly("hi");
-    assertThat(message.getRepeatedCordList()).isEmpty();
-    messageAfterBuild = builder.build();
-    builder.clearRepeatedCord();
-    assertThat(builder.getRepeatedCordList()).isEmpty();
-    assertThat(messageAfterBuild.getRepeatedCordList()).containsExactly("hi");
-
-    message = builder.build();
-    builder.addRepeatedDouble(1D);
-    assertThat(message.getRepeatedDoubleList()).isEmpty();
-    assertThat(builder.getRepeatedDoubleList()).containsExactly(1D);
-    assertThat(message.getRepeatedDoubleList()).isEmpty();
-    messageAfterBuild = builder.build();
-    builder.clearRepeatedDouble();
-    assertThat(builder.getRepeatedDoubleList()).isEmpty();
-    assertThat(messageAfterBuild.getRepeatedDoubleList()).containsExactly(1D);
-
-    message = builder.build();
-    builder.addRepeatedFixed32(1);
-    assertThat(message.getRepeatedFixed32List()).isEmpty();
-    assertThat(builder.getRepeatedFixed32List()).containsExactly(1);
-    assertThat(message.getRepeatedFixed32List()).isEmpty();
-    messageAfterBuild = builder.build();
-    builder.clearRepeatedFixed32();
-    assertThat(builder.getRepeatedFixed32List()).isEmpty();
-    assertThat(messageAfterBuild.getRepeatedFixed32List()).containsExactly(1);
-
-    message = builder.build();
-    builder.addRepeatedFixed64(1L);
-    assertThat(message.getRepeatedFixed64List()).isEmpty();
-    assertThat(builder.getRepeatedFixed64List()).containsExactly(1L);
-    assertThat(message.getRepeatedFixed64List()).isEmpty();
-    messageAfterBuild = builder.build();
-    builder.clearRepeatedFixed64();
-    assertThat(builder.getRepeatedFixed64List()).isEmpty();
-    assertThat(messageAfterBuild.getRepeatedFixed64List()).containsExactly(1L);
-
-    message = builder.build();
-    builder.addRepeatedFloat(1F);
-    assertThat(message.getRepeatedFloatList()).isEmpty();
-    assertThat(builder.getRepeatedFloatList()).containsExactly(1F);
-    assertThat(message.getRepeatedFloatList()).isEmpty();
-    messageAfterBuild = builder.build();
-    builder.clearRepeatedFloat();
-    assertThat(builder.getRepeatedFloatList()).isEmpty();
-    assertThat(messageAfterBuild.getRepeatedFloatList()).containsExactly(1F);
-
-    message = builder.build();
-    builder.addRepeatedForeignEnum(ForeignEnumLite.FOREIGN_LITE_BAR);
-    assertThat(message.getRepeatedForeignEnumList()).isEmpty();
-    assertThat(builder.getRepeatedForeignEnumList())
-        .containsExactly(ForeignEnumLite.FOREIGN_LITE_BAR);
-    assertThat(message.getRepeatedForeignEnumList()).isEmpty();
-    messageAfterBuild = builder.build();
-    builder.clearRepeatedForeignEnum();
-    assertThat(builder.getRepeatedForeignEnumList()).isEmpty();
-    assertThat(messageAfterBuild.getRepeatedForeignEnumList())
-        .containsExactly(ForeignEnumLite.FOREIGN_LITE_BAR);
-
-    message = builder.build();
-    builder.addRepeatedForeignMessage(foreignMessage);
-    assertThat(message.getRepeatedForeignMessageList()).isEmpty();
-    assertThat(builder.getRepeatedForeignMessageList()).containsExactly(foreignMessage);
-    assertThat(message.getRepeatedForeignMessageList()).isEmpty();
-    messageAfterBuild = builder.build();
-    builder.removeRepeatedForeignMessage(0);
-    assertThat(builder.getRepeatedForeignMessageList()).isEmpty();
-    assertThat(messageAfterBuild.getRepeatedForeignMessageList()).containsExactly(foreignMessage);
-
-    message = builder.build();
-    builder.addRepeatedGroup(RepeatedGroup.getDefaultInstance());
-    assertThat(message.getRepeatedGroupList()).isEmpty();
-    assertThat(builder.getRepeatedGroupList()).containsExactly(RepeatedGroup.getDefaultInstance());
-    assertThat(message.getRepeatedGroupList()).isEmpty();
-    messageAfterBuild = builder.build();
-    builder.removeRepeatedGroup(0);
-    assertThat(builder.getRepeatedGroupList()).isEmpty();
-    assertThat(messageAfterBuild.getRepeatedGroupList())
-        .containsExactly(RepeatedGroup.getDefaultInstance());
-
-    message = builder.build();
-    builder.addRepeatedInt32(1);
-    assertThat(message.getRepeatedInt32List()).isEmpty();
-    assertThat(builder.getRepeatedInt32List()).containsExactly(1);
-    assertThat(message.getRepeatedInt32List()).isEmpty();
-    messageAfterBuild = builder.build();
-    builder.clearRepeatedInt32();
-    assertThat(builder.getRepeatedInt32List()).isEmpty();
-    assertThat(messageAfterBuild.getRepeatedInt32List()).containsExactly(1);
-
-    message = builder.build();
-    builder.addRepeatedInt64(1L);
-    assertThat(message.getRepeatedInt64List()).isEmpty();
-    assertThat(builder.getRepeatedInt64List()).containsExactly(1L);
-    assertThat(message.getRepeatedInt64List()).isEmpty();
-    messageAfterBuild = builder.build();
-    builder.clearRepeatedInt64();
-    assertThat(builder.getRepeatedInt64List()).isEmpty();
-    assertThat(messageAfterBuild.getRepeatedInt64List()).containsExactly(1L);
-
-    message = builder.build();
-    builder.addRepeatedLazyMessage(nestedMessage);
-    assertThat(message.getRepeatedLazyMessageList()).isEmpty();
-    assertThat(builder.getRepeatedLazyMessageList()).containsExactly(nestedMessage);
-    assertThat(message.getRepeatedLazyMessageList()).isEmpty();
-    messageAfterBuild = builder.build();
-    builder.removeRepeatedLazyMessage(0);
-    assertThat(builder.getRepeatedLazyMessageList()).isEmpty();
-    assertThat(messageAfterBuild.getRepeatedLazyMessageList()).containsExactly(nestedMessage);
-
-    message = builder.build();
-    builder.addRepeatedSfixed32(1);
-    assertThat(message.getRepeatedSfixed32List()).isEmpty();
-    assertThat(builder.getRepeatedSfixed32List()).containsExactly(1);
-    assertThat(message.getRepeatedSfixed32List()).isEmpty();
-    messageAfterBuild = builder.build();
-    builder.clearRepeatedSfixed32();
-    assertThat(builder.getRepeatedSfixed32List()).isEmpty();
-    assertThat(messageAfterBuild.getRepeatedSfixed32List()).containsExactly(1);
-
-    message = builder.build();
-    builder.addRepeatedSfixed64(1L);
-    assertThat(message.getRepeatedSfixed64List()).isEmpty();
-    assertThat(builder.getRepeatedSfixed64List()).containsExactly(1L);
-    assertThat(message.getRepeatedSfixed64List()).isEmpty();
-    messageAfterBuild = builder.build();
-    builder.clearRepeatedSfixed64();
-    assertThat(builder.getRepeatedSfixed64List()).isEmpty();
-    assertThat(messageAfterBuild.getRepeatedSfixed64List()).containsExactly(1L);
-
-    message = builder.build();
-    builder.addRepeatedSint32(1);
-    assertThat(message.getRepeatedSint32List()).isEmpty();
-    assertThat(builder.getRepeatedSint32List()).containsExactly(1);
-    assertThat(message.getRepeatedSint32List()).isEmpty();
-    messageAfterBuild = builder.build();
-    builder.clearRepeatedSint32();
-    assertThat(builder.getRepeatedSint32List()).isEmpty();
-    assertThat(messageAfterBuild.getRepeatedSint32List()).containsExactly(1);
-
-    message = builder.build();
-    builder.addRepeatedSint64(1L);
-    assertThat(message.getRepeatedSint64List()).isEmpty();
-    assertThat(builder.getRepeatedSint64List()).containsExactly(1L);
-    assertThat(message.getRepeatedSint64List()).isEmpty();
-    messageAfterBuild = builder.build();
-    builder.clearRepeatedSint64();
-    assertThat(builder.getRepeatedSint64List()).isEmpty();
-    assertThat(messageAfterBuild.getRepeatedSint64List()).containsExactly(1L);
-
-    message = builder.build();
-    builder.addRepeatedString("hi");
-    assertThat(message.getRepeatedStringList()).isEmpty();
-    assertThat(builder.getRepeatedStringList()).containsExactly("hi");
-    assertThat(message.getRepeatedStringList()).isEmpty();
-    messageAfterBuild = builder.build();
-    builder.clearRepeatedString();
-    assertThat(builder.getRepeatedStringList()).isEmpty();
-    assertThat(messageAfterBuild.getRepeatedStringList()).containsExactly("hi");
-
-    message = builder.build();
-    builder.addRepeatedStringPiece("hi");
-    assertThat(message.getRepeatedStringPieceList()).isEmpty();
-    assertThat(builder.getRepeatedStringPieceList()).containsExactly("hi");
-    assertThat(message.getRepeatedStringPieceList()).isEmpty();
-    messageAfterBuild = builder.build();
-    builder.clearRepeatedStringPiece();
-    assertThat(builder.getRepeatedStringPieceList()).isEmpty();
-    assertThat(messageAfterBuild.getRepeatedStringPieceList()).containsExactly("hi");
-
-    message = builder.build();
-    builder.addRepeatedUint32(1);
-    assertThat(message.getRepeatedUint32List()).isEmpty();
-    assertThat(builder.getRepeatedUint32List()).containsExactly(1);
-    assertThat(message.getRepeatedUint32List()).isEmpty();
-    messageAfterBuild = builder.build();
-    builder.clearRepeatedUint32();
-    assertThat(builder.getRepeatedUint32List()).isEmpty();
-    assertThat(messageAfterBuild.getRepeatedUint32List()).containsExactly(1);
-
-    message = builder.build();
-    builder.addRepeatedUint64(1L);
-    assertThat(message.getRepeatedUint64List()).isEmpty();
-    assertThat(builder.getRepeatedUint64List()).containsExactly(1L);
-    assertThat(message.getRepeatedUint64List()).isEmpty();
-    messageAfterBuild = builder.build();
-    builder.clearRepeatedUint64();
-    assertThat(builder.getRepeatedUint64List()).isEmpty();
-    assertThat(messageAfterBuild.getRepeatedUint64List()).containsExactly(1L);
-
-    message = builder.build();
-    builder.addRepeatedBool(true);
-    messageAfterBuild = builder.build();
-    assertThat(message.getRepeatedBoolCount()).isEqualTo(0);
-    builder.setRepeatedBool(0, false);
-    assertThat(messageAfterBuild.getRepeatedBool(0)).isTrue();
-    assertThat(builder.getRepeatedBool(0)).isFalse();
-    builder.clearRepeatedBool();
-
-    message = builder.build();
-    builder.addRepeatedBytes(ByteString.copyFromUtf8("hi"));
-    messageAfterBuild = builder.build();
-    assertThat(message.getRepeatedBytesCount()).isEqualTo(0);
-    builder.setRepeatedBytes(0, ByteString.EMPTY);
-    assertThat(messageAfterBuild.getRepeatedBytes(0)).isEqualTo(ByteString.copyFromUtf8("hi"));
-    assertThat(builder.getRepeatedBytes(0)).isEqualTo(ByteString.EMPTY);
-    builder.clearRepeatedBytes();
-
-    message = builder.build();
-    builder.addRepeatedCord("hi");
-    messageAfterBuild = builder.build();
-    assertThat(message.getRepeatedCordCount()).isEqualTo(0);
-    builder.setRepeatedCord(0, "");
-    assertThat(messageAfterBuild.getRepeatedCord(0)).isEqualTo("hi");
-    assertThat(builder.getRepeatedCord(0)).isEmpty();
-    builder.clearRepeatedCord();
-    message = builder.build();
-
-    builder.addRepeatedCordBytes(ByteString.copyFromUtf8("hi"));
-    messageAfterBuild = builder.build();
-    assertThat(message.getRepeatedCordCount()).isEqualTo(0);
-    builder.setRepeatedCord(0, "");
-    assertThat(messageAfterBuild.getRepeatedCordBytes(0)).isEqualTo(ByteString.copyFromUtf8("hi"));
-    assertThat(builder.getRepeatedCordBytes(0)).isEqualTo(ByteString.EMPTY);
-    builder.clearRepeatedCord();
-
-    message = builder.build();
-    builder.addRepeatedDouble(1D);
-    messageAfterBuild = builder.build();
-    assertThat(message.getRepeatedDoubleCount()).isEqualTo(0);
-    builder.setRepeatedDouble(0, 0D);
-    assertThat(messageAfterBuild.getRepeatedDouble(0)).isEqualTo(1D);
-    assertThat(builder.getRepeatedDouble(0)).isEqualTo(0D);
-    builder.clearRepeatedDouble();
-
-    message = builder.build();
-    builder.addRepeatedFixed32(1);
-    messageAfterBuild = builder.build();
-    assertThat(message.getRepeatedFixed32Count()).isEqualTo(0);
-    builder.setRepeatedFixed32(0, 0);
-    assertThat(messageAfterBuild.getRepeatedFixed32(0)).isEqualTo(1);
-    assertThat(builder.getRepeatedFixed32(0)).isEqualTo(0);
-    builder.clearRepeatedFixed32();
-
-    message = builder.build();
-    builder.addRepeatedFixed64(1L);
-    messageAfterBuild = builder.build();
-    assertThat(message.getRepeatedFixed64Count()).isEqualTo(0);
-    builder.setRepeatedFixed64(0, 0L);
-    assertThat(messageAfterBuild.getRepeatedFixed64(0)).isEqualTo(1L);
-    assertThat(builder.getRepeatedFixed64(0)).isEqualTo(0L);
-    builder.clearRepeatedFixed64();
-
-    message = builder.build();
-    builder.addRepeatedFloat(1F);
-    messageAfterBuild = builder.build();
-    assertThat(message.getRepeatedFloatCount()).isEqualTo(0);
-    builder.setRepeatedFloat(0, 0F);
-    assertThat(messageAfterBuild.getRepeatedFloat(0)).isEqualTo(1F);
-    assertThat(builder.getRepeatedFloat(0)).isEqualTo(0F);
-    builder.clearRepeatedFloat();
-
-    message = builder.build();
-    builder.addRepeatedForeignEnum(ForeignEnumLite.FOREIGN_LITE_BAR);
-    messageAfterBuild = builder.build();
-    assertThat(message.getRepeatedForeignEnumCount()).isEqualTo(0);
-    builder.setRepeatedForeignEnum(0, ForeignEnumLite.FOREIGN_LITE_FOO);
-    assertThat(messageAfterBuild.getRepeatedForeignEnum(0))
-        .isEqualTo(ForeignEnumLite.FOREIGN_LITE_BAR);
-    assertThat(builder.getRepeatedForeignEnum(0)).isEqualTo(ForeignEnumLite.FOREIGN_LITE_FOO);
-    builder.clearRepeatedForeignEnum();
-
-    message = builder.build();
-    builder.addRepeatedForeignMessage(foreignMessage);
-    messageAfterBuild = builder.build();
-    assertThat(message.getRepeatedForeignMessageCount()).isEqualTo(0);
-    builder.setRepeatedForeignMessage(0, ForeignMessageLite.getDefaultInstance());
-    assertThat(messageAfterBuild.getRepeatedForeignMessage(0)).isEqualTo(foreignMessage);
-    assertThat(builder.getRepeatedForeignMessage(0))
-        .isEqualTo(ForeignMessageLite.getDefaultInstance());
-    builder.clearRepeatedForeignMessage();
-
-    message = builder.build();
-    builder.addRepeatedForeignMessage(foreignMessageC3);
-    messageAfterBuild = builder.build();
-    assertThat(message.getRepeatedForeignMessageCount()).isEqualTo(0);
-    builder.setRepeatedForeignMessage(0, ForeignMessageLite.getDefaultInstance());
-    assertThat(messageAfterBuild.getRepeatedForeignMessage(0)).isEqualTo(foreignMessageC3);
-    assertThat(builder.getRepeatedForeignMessage(0))
-        .isEqualTo(ForeignMessageLite.getDefaultInstance());
-    builder.clearRepeatedForeignMessage();
-
-    message = builder.build();
-    builder.addRepeatedForeignMessage(0, foreignMessage);
-    messageAfterBuild = builder.build();
-    assertThat(message.getRepeatedForeignMessageCount()).isEqualTo(0);
-    builder.setRepeatedForeignMessage(0, foreignMessageC3);
-    assertThat(messageAfterBuild.getRepeatedForeignMessage(0)).isEqualTo(foreignMessage);
-    assertThat(builder.getRepeatedForeignMessage(0)).isEqualTo(foreignMessageC3);
-    builder.clearRepeatedForeignMessage();
-
-    message = builder.build();
-    RepeatedGroup repeatedGroup = RepeatedGroup.newBuilder().setA(1).build();
-    builder.addRepeatedGroup(repeatedGroup);
-    messageAfterBuild = builder.build();
-    assertThat(message.getRepeatedGroupCount()).isEqualTo(0);
-    builder.setRepeatedGroup(0, RepeatedGroup.getDefaultInstance());
-    assertThat(messageAfterBuild.getRepeatedGroup(0)).isEqualTo(repeatedGroup);
-    assertThat(builder.getRepeatedGroup(0)).isEqualTo(RepeatedGroup.getDefaultInstance());
-    builder.clearRepeatedGroup();
-
-    message = builder.build();
-    builder.addRepeatedGroup(0, repeatedGroup);
-    messageAfterBuild = builder.build();
-    assertThat(message.getRepeatedGroupCount()).isEqualTo(0);
-    builder.setRepeatedGroup(0, RepeatedGroup.getDefaultInstance());
-    assertThat(messageAfterBuild.getRepeatedGroup(0)).isEqualTo(repeatedGroup);
-    assertThat(builder.getRepeatedGroup(0)).isEqualTo(RepeatedGroup.getDefaultInstance());
-    builder.clearRepeatedGroup();
-
-    message = builder.build();
-    RepeatedGroup.Builder repeatedGroupBuilder = RepeatedGroup.newBuilder().setA(3);
-    builder.addRepeatedGroup(repeatedGroupBuilder);
-    messageAfterBuild = builder.build();
-    assertThat(message.getRepeatedGroupCount()).isEqualTo(0);
-    builder.setRepeatedGroup(0, RepeatedGroup.getDefaultInstance());
-    assertThat(messageAfterBuild.getRepeatedGroup(0)).isEqualTo(repeatedGroupBuilder.build());
-    assertThat(builder.getRepeatedGroup(0)).isEqualTo(RepeatedGroup.getDefaultInstance());
-    builder.clearRepeatedGroup();
-
-    message = builder.build();
-    builder.addRepeatedGroup(0, repeatedGroupBuilder);
-    messageAfterBuild = builder.build();
-    assertThat(message.getRepeatedGroupCount()).isEqualTo(0);
-    builder.setRepeatedGroup(0, RepeatedGroup.getDefaultInstance());
-    assertThat(messageAfterBuild.getRepeatedGroup(0)).isEqualTo(repeatedGroupBuilder.build());
-    assertThat(builder.getRepeatedGroup(0)).isEqualTo(RepeatedGroup.getDefaultInstance());
-    builder.clearRepeatedGroup();
-
-    message = builder.build();
-    builder.addRepeatedInt32(1);
-    messageAfterBuild = builder.build();
-    assertThat(message.getRepeatedInt32Count()).isEqualTo(0);
-    builder.setRepeatedInt32(0, 0);
-    assertThat(messageAfterBuild.getRepeatedInt32(0)).isEqualTo(1);
-    assertThat(builder.getRepeatedInt32(0)).isEqualTo(0);
-    builder.clearRepeatedInt32();
-
-    message = builder.build();
-    builder.addRepeatedInt64(1L);
-    messageAfterBuild = builder.build();
-    assertThat(message.getRepeatedInt64Count()).isEqualTo(0L);
-    builder.setRepeatedInt64(0, 0L);
-    assertThat(messageAfterBuild.getRepeatedInt64(0)).isEqualTo(1L);
-    assertThat(builder.getRepeatedInt64(0)).isEqualTo(0L);
-    builder.clearRepeatedInt64();
-
-    message = builder.build();
-    builder.addRepeatedLazyMessage(nestedMessage);
-    messageAfterBuild = builder.build();
-    assertThat(message.getRepeatedLazyMessageCount()).isEqualTo(0);
-    builder.setRepeatedLazyMessage(0, NestedMessage.getDefaultInstance());
-    assertThat(messageAfterBuild.getRepeatedLazyMessage(0)).isEqualTo(nestedMessage);
-    assertThat(builder.getRepeatedLazyMessage(0)).isEqualTo(NestedMessage.getDefaultInstance());
-    builder.clearRepeatedLazyMessage();
-
-    message = builder.build();
-    builder.addRepeatedLazyMessage(0, nestedMessage);
-    messageAfterBuild = builder.build();
-    assertThat(message.getRepeatedLazyMessageCount()).isEqualTo(0);
-    builder.setRepeatedLazyMessage(0, NestedMessage.getDefaultInstance());
-    assertThat(messageAfterBuild.getRepeatedLazyMessage(0)).isEqualTo(nestedMessage);
-    assertThat(builder.getRepeatedLazyMessage(0)).isEqualTo(NestedMessage.getDefaultInstance());
-    builder.clearRepeatedLazyMessage();
-
-    message = builder.build();
-    builder.addRepeatedLazyMessage(nestedMessageBuilder);
-    messageAfterBuild = builder.build();
-    assertThat(message.getRepeatedLazyMessageCount()).isEqualTo(0);
-    builder.setRepeatedLazyMessage(0, NestedMessage.getDefaultInstance());
-    assertThat(messageAfterBuild.getRepeatedLazyMessage(0)).isEqualTo(nestedMessageBuilder.build());
-    assertThat(builder.getRepeatedLazyMessage(0)).isEqualTo(NestedMessage.getDefaultInstance());
-    builder.clearRepeatedLazyMessage();
-
-    message = builder.build();
-    builder.addRepeatedLazyMessage(0, nestedMessageBuilder);
-    messageAfterBuild = builder.build();
-    assertThat(message.getRepeatedLazyMessageCount()).isEqualTo(0);
-    builder.setRepeatedLazyMessage(0, NestedMessage.getDefaultInstance());
-    assertThat(messageAfterBuild.getRepeatedLazyMessage(0)).isEqualTo(nestedMessageBuilder.build());
-    assertThat(builder.getRepeatedLazyMessage(0)).isEqualTo(NestedMessage.getDefaultInstance());
-    builder.clearRepeatedLazyMessage();
-
-    message = builder.build();
-    builder.addRepeatedSfixed32(1);
-    messageAfterBuild = builder.build();
-    assertThat(message.getRepeatedSfixed32Count()).isEqualTo(0);
-    builder.setRepeatedSfixed32(0, 0);
-    assertThat(messageAfterBuild.getRepeatedSfixed32(0)).isEqualTo(1);
-    assertThat(builder.getRepeatedSfixed32(0)).isEqualTo(0);
-    builder.clearRepeatedSfixed32();
-
-    message = builder.build();
-    builder.addRepeatedSfixed64(1L);
-    messageAfterBuild = builder.build();
-    assertThat(message.getRepeatedSfixed64Count()).isEqualTo(0L);
-    builder.setRepeatedSfixed64(0, 0L);
-    assertThat(messageAfterBuild.getRepeatedSfixed64(0)).isEqualTo(1L);
-    assertThat(builder.getRepeatedSfixed64(0)).isEqualTo(0L);
-    builder.clearRepeatedSfixed64();
-
-    message = builder.build();
-    builder.addRepeatedSint32(1);
-    messageAfterBuild = builder.build();
-    assertThat(message.getRepeatedSint32Count()).isEqualTo(0);
-    builder.setRepeatedSint32(0, 0);
-    assertThat(messageAfterBuild.getRepeatedSint32(0)).isEqualTo(1);
-    assertThat(builder.getRepeatedSint32(0)).isEqualTo(0);
-    builder.clearRepeatedSint32();
-
-    message = builder.build();
-    builder.addRepeatedSint64(1L);
-    messageAfterBuild = builder.build();
-    assertThat(message.getRepeatedSint64Count()).isEqualTo(0L);
-    builder.setRepeatedSint64(0, 0L);
-    assertThat(messageAfterBuild.getRepeatedSint64(0)).isEqualTo(1L);
-    assertThat(builder.getRepeatedSint64(0)).isEqualTo(0L);
-    builder.clearRepeatedSint64();
-
-    message = builder.build();
-    builder.addRepeatedString("hi");
-    messageAfterBuild = builder.build();
-    assertThat(message.getRepeatedStringCount()).isEqualTo(0L);
-    builder.setRepeatedString(0, "");
-    assertThat(messageAfterBuild.getRepeatedString(0)).isEqualTo("hi");
-    assertThat(builder.getRepeatedString(0)).isEmpty();
-    builder.clearRepeatedString();
-
-    message = builder.build();
-    builder.addRepeatedStringBytes(ByteString.copyFromUtf8("hi"));
-    messageAfterBuild = builder.build();
-    assertThat(message.getRepeatedStringCount()).isEqualTo(0L);
-    builder.setRepeatedString(0, "");
-    assertThat(messageAfterBuild.getRepeatedStringBytes(0))
-        .isEqualTo(ByteString.copyFromUtf8("hi"));
-    assertThat(builder.getRepeatedStringBytes(0)).isEqualTo(ByteString.EMPTY);
-    builder.clearRepeatedString();
-
-    message = builder.build();
-    builder.addRepeatedStringPiece("hi");
-    messageAfterBuild = builder.build();
-    assertThat(message.getRepeatedStringPieceCount()).isEqualTo(0L);
-    builder.setRepeatedStringPiece(0, "");
-    assertThat(messageAfterBuild.getRepeatedStringPiece(0)).isEqualTo("hi");
-    assertThat(builder.getRepeatedStringPiece(0)).isEmpty();
-    builder.clearRepeatedStringPiece();
-
-    message = builder.build();
-    builder.addRepeatedStringPieceBytes(ByteString.copyFromUtf8("hi"));
-    messageAfterBuild = builder.build();
-    assertThat(message.getRepeatedStringPieceCount()).isEqualTo(0L);
-    builder.setRepeatedStringPiece(0, "");
-    assertThat(messageAfterBuild.getRepeatedStringPieceBytes(0))
-        .isEqualTo(ByteString.copyFromUtf8("hi"));
-    assertThat(builder.getRepeatedStringPieceBytes(0)).isEqualTo(ByteString.EMPTY);
-    builder.clearRepeatedStringPiece();
-
-    message = builder.build();
-    builder.addRepeatedUint32(1);
-    messageAfterBuild = builder.build();
-    assertThat(message.getRepeatedUint32Count()).isEqualTo(0);
-    builder.setRepeatedUint32(0, 0);
-    assertThat(messageAfterBuild.getRepeatedUint32(0)).isEqualTo(1);
-    assertThat(builder.getRepeatedUint32(0)).isEqualTo(0);
-    builder.clearRepeatedUint32();
-
-    message = builder.build();
-    builder.addRepeatedUint64(1L);
-    messageAfterBuild = builder.build();
-    assertThat(message.getRepeatedUint64Count()).isEqualTo(0L);
-    builder.setRepeatedUint64(0, 0L);
-    assertThat(messageAfterBuild.getRepeatedUint64(0)).isEqualTo(1L);
-    assertThat(builder.getRepeatedUint64(0)).isEqualTo(0L);
-    builder.clearRepeatedUint64();
-
-    message = builder.build();
-    assertThat(message.getSerializedSize()).isEqualTo(0);
-    builder.mergeFrom(TestAllTypesLite.newBuilder().setOptionalBool(true).build());
-    assertThat(message.getSerializedSize()).isEqualTo(0);
-    assertThat(builder.build().getOptionalBool()).isTrue();
-    builder.clearOptionalBool();
-
-    message = builder.build();
-    assertThat(message.getSerializedSize()).isEqualTo(0);
-    builder.mergeFrom(TestAllTypesLite.newBuilder().setOptionalBool(true).build());
-    assertThat(message.getSerializedSize()).isEqualTo(0);
-    assertThat(builder.build().getOptionalBool()).isTrue();
-    builder.clear();
-    assertThat(builder.build().getSerializedSize()).isEqualTo(0);
-
-    message = builder.build();
-    assertThat(message.getSerializedSize()).isEqualTo(0);
-    builder.mergeOptionalForeignMessage(foreignMessage);
-    assertThat(message.getSerializedSize()).isEqualTo(0);
-    assertThat(builder.build().getOptionalForeignMessage().getC()).isEqualTo(foreignMessage.getC());
-    builder.clearOptionalForeignMessage();
-
-    message = builder.build();
-    assertThat(message.getSerializedSize()).isEqualTo(0);
-    builder.mergeOptionalLazyMessage(nestedMessage);
-    assertThat(message.getSerializedSize()).isEqualTo(0);
-    assertThat(builder.build().getOptionalLazyMessage().getBb()).isEqualTo(nestedMessage.getBb());
-    builder.clearOptionalLazyMessage();
-
-    message = builder.build();
-    builder.setOneofString("hi");
-    assertThat(message.getOneofFieldCase()).isEqualTo(OneofFieldCase.ONEOFFIELD_NOT_SET);
-    assertThat(builder.getOneofFieldCase()).isEqualTo(OneofFieldCase.ONEOF_STRING);
-    assertThat(builder.getOneofString()).isEqualTo("hi");
-    messageAfterBuild = builder.build();
-    assertThat(messageAfterBuild.getOneofFieldCase()).isEqualTo(OneofFieldCase.ONEOF_STRING);
-    assertThat(messageAfterBuild.getOneofString()).isEqualTo("hi");
-    builder.setOneofUint32(1);
-    assertThat(messageAfterBuild.getOneofFieldCase()).isEqualTo(OneofFieldCase.ONEOF_STRING);
-    assertThat(messageAfterBuild.getOneofString()).isEqualTo("hi");
-    assertThat(builder.getOneofFieldCase()).isEqualTo(OneofFieldCase.ONEOF_UINT32);
-    assertThat(builder.getOneofUint32()).isEqualTo(1);
-    TestAllTypesLiteOrBuilder messageOrBuilder = builder;
-    assertThat(messageOrBuilder.getOneofFieldCase()).isEqualTo(OneofFieldCase.ONEOF_UINT32);
-
-    TestAllExtensionsLite.Builder extendableMessageBuilder = TestAllExtensionsLite.newBuilder();
-    TestAllExtensionsLite extendableMessage = extendableMessageBuilder.build();
-    extendableMessageBuilder.setExtension(UnittestLite.optionalInt32ExtensionLite, 1);
-    assertThat(extendableMessage.hasExtension(UnittestLite.optionalInt32ExtensionLite)).isFalse();
-    extendableMessage = extendableMessageBuilder.build();
-    assertThat((int) extendableMessageBuilder.getExtension(UnittestLite.optionalInt32ExtensionLite))
-        .isEqualTo(1);
-    assertThat((int) extendableMessage.getExtension(UnittestLite.optionalInt32ExtensionLite))
-        .isEqualTo(1);
-    extendableMessageBuilder.setExtension(UnittestLite.optionalInt32ExtensionLite, 3);
-    assertThat((int) extendableMessageBuilder.getExtension(UnittestLite.optionalInt32ExtensionLite))
-        .isEqualTo(3);
-    assertThat((int) extendableMessage.getExtension(UnittestLite.optionalInt32ExtensionLite))
-        .isEqualTo(1);
-    extendableMessage = extendableMessageBuilder.build();
-    assertThat((int) extendableMessageBuilder.getExtension(UnittestLite.optionalInt32ExtensionLite))
-        .isEqualTo(3);
-    assertThat((int) extendableMessage.getExtension(UnittestLite.optionalInt32ExtensionLite))
-        .isEqualTo(3);
-
-    // No extension registry, so it should be in unknown fields.
-    extendableMessage = TestAllExtensionsLite.parseFrom(extendableMessage.toByteArray());
-    assertThat(extendableMessage.hasExtension(UnittestLite.optionalInt32ExtensionLite)).isFalse();
-
-    extendableMessageBuilder = extendableMessage.toBuilder();
-    extendableMessageBuilder.mergeFrom(
-        TestAllExtensionsLite.newBuilder()
-            .setExtension(UnittestLite.optionalFixed32ExtensionLite, 11)
-            .build());
-
-    extendableMessage = extendableMessageBuilder.build();
-    ExtensionRegistryLite registry = ExtensionRegistryLite.newInstance();
-    UnittestLite.registerAllExtensions(registry);
-    extendableMessage = TestAllExtensionsLite.parseFrom(extendableMessage.toByteArray(), registry);
-
-    // The unknown field was preserved.
-    assertThat((int) extendableMessage.getExtension(UnittestLite.optionalInt32ExtensionLite))
-        .isEqualTo(3);
-    assertThat((int) extendableMessage.getExtension(UnittestLite.optionalFixed32ExtensionLite))
-        .isEqualTo(11);
-  }
-
-  @Test
-  @SuppressWarnings("ProtoNewBuilderMergeFrom")
-  public void testBuilderMergeFromNull() throws Exception {
-    try {
-      TestAllTypesLite.newBuilder().mergeFrom((TestAllTypesLite) null);
-      assertWithMessage("expected exception").fail();
-    } catch (NullPointerException e) {
-      // Pass.
-    }
-  }
-
-  // Builder.mergeFrom() should keep existing extensions.
-  @Test
-  public void testBuilderMergeFromWithExtensions() throws Exception {
-    TestAllExtensionsLite message =
-        TestAllExtensionsLite.newBuilder()
-            .addExtension(UnittestLite.repeatedInt32ExtensionLite, 12)
-            .build();
-
-    ExtensionRegistryLite registry = ExtensionRegistryLite.newInstance();
-    UnittestLite.registerAllExtensions(registry);
-
-    TestAllExtensionsLite.Builder builder = TestAllExtensionsLite.newBuilder();
-    builder.mergeFrom(message.toByteArray(), registry);
-    builder.mergeFrom(message.toByteArray(), registry);
-    TestAllExtensionsLite result = builder.build();
-    assertThat(result.getExtensionCount(UnittestLite.repeatedInt32ExtensionLite)).isEqualTo(2);
-    assertThat(result.getExtension(UnittestLite.repeatedInt32ExtensionLite, 0).intValue())
-        .isEqualTo(12);
-    assertThat(result.getExtension(UnittestLite.repeatedInt32ExtensionLite, 1).intValue())
-        .isEqualTo(12);
-  }
-
-  // Builder.mergeFrom() should keep existing unknown fields.
-  @Test
-  public void testBuilderMergeFromWithUnknownFields() throws Exception {
-    TestAllTypesLite message = TestAllTypesLite.newBuilder().addRepeatedInt32(1).build();
-
-    NestedMessage.Builder builder = NestedMessage.newBuilder();
-    builder.mergeFrom(message.toByteArray());
-    builder.mergeFrom(message.toByteArray());
-    NestedMessage result = builder.build();
-    assertThat(result.getSerializedSize()).isEqualTo(message.getSerializedSize() * 2);
-  }
-
-  @Test
-  public void testMergeFrom_differentFieldsSetWithinOneField() throws Exception {
-    TestAllTypesLite result =
-        TestAllTypesLite.newBuilder()
-            .setOneofNestedMessage(NestedMessage.newBuilder().setBb(2))
-            .mergeFrom(
-                TestAllTypesLite.newBuilder()
-                    .setOneofNestedMessage2(NestedMessage2.newBuilder().setDd(3))
-                    .build())
-            .build();
-
-    assertToStringEquals("oneof_nested_message2 {\n  dd: 3\n}", result);
-  }
-
-  @Test
-  public void testMergeFrom_differentFieldsOfSameTypeSetWithinOneField() throws Exception {
-    TestAllTypesLite result =
-        TestAllTypesLite.newBuilder()
-            .setOneofNestedMessage(NestedMessage.newBuilder().setBb(2))
-            .mergeFrom(
-                TestAllTypesLite.newBuilder()
-                    .setOneofLazyNestedMessage(NestedMessage.newBuilder().setCc(3))
-                    .build())
-            .build();
-
-    assertToStringEquals("oneof_lazy_nested_message {\n  cc: 3\n}", result);
-  }
-
-  @Test
-  public void testMergeFrom_sameFieldSetWithinOneofField() throws Exception {
-    TestAllTypesLite result =
-        TestAllTypesLite.newBuilder()
-            .setOneofNestedMessage(NestedMessage.newBuilder().setBb(2))
-            .mergeFrom(
-                TestAllTypesLite.newBuilder()
-                    .setOneofNestedMessage(NestedMessage.newBuilder().setCc(4))
-                    .build())
-            .build();
-
-    assertToStringEquals("oneof_nested_message {\n  bb: 2\n  cc: 4\n}", result);
-  }
-
-  @Test
-  public void testMergeFrom_failureWhenReadingValue_propagatesOriginalException() {
-    final byte[] bytes = TestOneof2.newBuilder().setFooInt(123).build().toByteArray();
-    final IOException injectedException = new IOException("oh no");
-    CodedInputStream failingInputStream =
-        CodedInputStream.newInstance(
-            new InputStream() {
-              boolean first = true;
-
-              @Override
-              public int read(byte[] b, int off, int len) throws IOException {
-                if (!first) {
-                  throw injectedException;
-                }
-                first = false;
-                System.arraycopy(bytes, 0, b, off, len);
-                return len;
-              }
-
-              @Override
-              public int read() {
-                throw new UnsupportedOperationException();
-              }
-            },
-            bytes.length - 1);
-    TestOneof2.Builder builder = TestOneof2.newBuilder();
-
-    try {
-      builder.mergeFrom(failingInputStream, ExtensionRegistryLite.getEmptyRegistry());
-      assertWithMessage("Expected mergeFrom to fail").fail();
-    } catch (IOException e) {
-      assertThat(e).isSameInstanceAs(injectedException);
-    }
-  }
-
-  @Test
-  public void testToStringDefaultInstance() throws Exception {
-    assertToStringEquals("", TestAllTypesLite.getDefaultInstance());
-  }
-
-  @Test
-  public void testToStringScalarFieldsSuffixedWithList() throws Exception {
-    assertToStringEquals(
-        "deceptively_named_list: 7",
-        TestAllTypesLite.newBuilder().setDeceptivelyNamedList(7).build());
-  }
-
-  @Test
-  public void testToStringPrimitives() throws Exception {
-    TestAllTypesLite proto =
-        TestAllTypesLite.newBuilder()
-            .setOptionalInt32(1)
-            .setOptionalInt64(9223372036854775807L)
-            .build();
-    assertToStringEquals("optional_int32: 1\noptional_int64: 9223372036854775807", proto);
-
-    proto =
-        TestAllTypesLite.newBuilder()
-            .setOptionalBool(true)
-            .setOptionalNestedEnum(NestedEnum.BAZ)
-            .build();
-    assertToStringEquals(
-        "optional_bool: true\noptional_nested_enum: " + NestedEnum.BAZ.toString(), proto);
-
-    proto = TestAllTypesLite.newBuilder().setOptionalFloat(2.72f).setOptionalDouble(3.14).build();
-    assertToStringEquals("optional_double: 3.14\noptional_float: 2.72", proto);
-  }
-
-
-  @Test
-  public void testToStringStringFields() throws Exception {
-    TestAllTypesLite proto =
-        TestAllTypesLite.newBuilder().setOptionalString("foo\"bar\nbaz\\").build();
-    assertToStringEquals("optional_string: \"foo\\\"bar\\nbaz\\\\\"", proto);
-
-    proto = TestAllTypesLite.newBuilder().setOptionalString("\u6587").build();
-    assertToStringEquals("optional_string: \"\\346\\226\\207\"", proto);
-  }
-
-  @Test
-  public void testToStringNestedMessage() throws Exception {
-    TestAllTypesLite proto =
-        TestAllTypesLite.newBuilder()
-            .setOptionalNestedMessage(NestedMessage.getDefaultInstance())
-            .build();
-    assertToStringEquals("optional_nested_message {\n}", proto);
-
-    proto =
-        TestAllTypesLite.newBuilder()
-            .setOptionalNestedMessage(NestedMessage.newBuilder().setBb(7))
-            .build();
-    assertToStringEquals("optional_nested_message {\n  bb: 7\n}", proto);
-  }
-
-  @Test
-  public void testToStringRepeatedFields() throws Exception {
-    TestAllTypesLite proto =
-        TestAllTypesLite.newBuilder()
-            .addRepeatedInt32(32)
-            .addRepeatedInt32(32)
-            .addRepeatedInt64(64)
-            .build();
-    assertToStringEquals("repeated_int32: 32\nrepeated_int32: 32\nrepeated_int64: 64", proto);
-
-    proto =
-        TestAllTypesLite.newBuilder()
-            .addRepeatedLazyMessage(NestedMessage.newBuilder().setBb(7))
-            .addRepeatedLazyMessage(NestedMessage.newBuilder().setBb(8))
-            .build();
-    assertToStringEquals(
-        "repeated_lazy_message {\n  bb: 7\n}\nrepeated_lazy_message {\n  bb: 8\n}", proto);
-  }
-
-  @Test
-  public void testToStringForeignFields() throws Exception {
-    TestAllTypesLite proto =
-        TestAllTypesLite.newBuilder()
-            .setOptionalForeignEnum(ForeignEnumLite.FOREIGN_LITE_BAR)
-            .setOptionalForeignMessage(ForeignMessageLite.newBuilder().setC(3))
-            .build();
-    assertToStringEquals(
-        "optional_foreign_enum: "
-            + ForeignEnumLite.FOREIGN_LITE_BAR
-            + "\noptional_foreign_message {\n  c: 3\n}",
-        proto);
-  }
-
-  @Test
-  public void testToStringExtensions() throws Exception {
-    TestAllExtensionsLite message =
-        TestAllExtensionsLite.newBuilder()
-            .setExtension(UnittestLite.optionalInt32ExtensionLite, 123)
-            .addExtension(UnittestLite.repeatedStringExtensionLite, "spam")
-            .addExtension(UnittestLite.repeatedStringExtensionLite, "eggs")
-            .setExtension(UnittestLite.optionalNestedEnumExtensionLite, NestedEnum.BAZ)
-            .setExtension(
-                UnittestLite.optionalNestedMessageExtensionLite,
-                NestedMessage.newBuilder().setBb(7).build())
-            .build();
-    assertToStringEquals(
-        "[1]: 123\n[18] {\n  bb: 7\n}\n[21]: 3\n[44]: \"spam\"\n[44]: \"eggs\"", message);
-  }
-
-  @Test
-  public void testToStringUnknownFields() throws Exception {
-    TestAllExtensionsLite messageWithExtensions =
-        TestAllExtensionsLite.newBuilder()
-            .setExtension(UnittestLite.optionalInt32ExtensionLite, 123)
-            .addExtension(UnittestLite.repeatedStringExtensionLite, "spam")
-            .addExtension(UnittestLite.repeatedStringExtensionLite, "eggs")
-            .setExtension(UnittestLite.optionalNestedEnumExtensionLite, NestedEnum.BAZ)
-            .setExtension(
-                UnittestLite.optionalNestedMessageExtensionLite,
-                NestedMessage.newBuilder().setBb(7).build())
-            .build();
-    TestAllExtensionsLite messageWithUnknownFields =
-        TestAllExtensionsLite.parseFrom(messageWithExtensions.toByteArray());
-    assertToStringEquals(
-        "1: 123\n18: \"\\b\\a\"\n21: 3\n44: \"spam\"\n44: \"eggs\"", messageWithUnknownFields);
-  }
-
-  @Test
-  public void testToStringLazyMessage() throws Exception {
-    TestAllTypesLite message =
-        TestAllTypesLite.newBuilder()
-            .setOptionalLazyMessage(NestedMessage.newBuilder().setBb(1).build())
-            .build();
-    assertToStringEquals("optional_lazy_message {\n  bb: 1\n}", message);
-  }
-
-  @Test
-  public void testToStringGroup() throws Exception {
-    TestAllTypesLite message =
-        TestAllTypesLite.newBuilder()
-            .setOptionalGroup(OptionalGroup.newBuilder().setA(1).build())
-            .build();
-    assertToStringEquals("optional_group {\n  a: 1\n}", message);
-  }
-
-  @Test
-  public void testToStringOneof() throws Exception {
-    TestAllTypesLite message = TestAllTypesLite.newBuilder().setOneofString("hello").build();
-    assertToStringEquals("oneof_string: \"hello\"", message);
-  }
-
-  @Test
-  public void testToStringMapFields() throws Exception {
-    TestMap message1 =
-        TestMap.newBuilder()
-            .putInt32ToStringField(1, "alpha")
-            .putInt32ToStringField(2, "beta")
-            .build();
-    assertToStringEquals(
-        "int32_to_string_field {\n"
-            + "  key: 1\n"
-            + "  value: \"alpha\"\n"
-            + "}\n"
-            + "int32_to_string_field {\n"
-            + "  key: 2\n"
-            + "  value: \"beta\"\n"
-            + "}",
-        message1);
-
-    TestMap message2 =
-        TestMap.newBuilder()
-            .putInt32ToMessageField(1, MessageValue.newBuilder().setValue(10).build())
-            .putInt32ToMessageField(2, MessageValue.newBuilder().setValue(20).build())
-            .build();
-    assertToStringEquals(
-        "int32_to_message_field {\n"
-            + "  key: 1\n"
-            + "  value {\n"
-            + "    value: 10\n"
-            + "  }\n"
-            + "}\n"
-            + "int32_to_message_field {\n"
-            + "  key: 2\n"
-            + "  value {\n"
-            + "    value: 20\n"
-            + "  }\n"
-            + "}",
-        message2);
-  }
-
-  // Asserts that the toString() representation of the message matches the expected. This verifies
-  // the first line starts with a comment; but, does not factor in said comment as part of the
-  // comparison as it contains unstable addresses.
-  private static void assertToStringEquals(String expected, MessageLite message) {
-    String toString = message.toString();
-    assertThat(toString.charAt(0)).isEqualTo('#');
-    if (toString.contains("\n")) {
-      toString = toString.substring(toString.indexOf("\n") + 1);
-    } else {
-      toString = "";
-    }
-    assertThat(toString).isEqualTo(expected);
-  }
-
-  @Test
-  public void testParseLazy() throws Exception {
-    ByteString bb =
-        TestAllTypesLite.newBuilder()
-            .setOptionalLazyMessage(NestedMessage.newBuilder().setBb(11).build())
-            .build()
-            .toByteString();
-    ByteString cc =
-        TestAllTypesLite.newBuilder()
-            .setOptionalLazyMessage(NestedMessage.newBuilder().setCc(22).build())
-            .build()
-            .toByteString();
-
-    ByteString concat = bb.concat(cc);
-    TestAllTypesLite message = TestAllTypesLite.parseFrom(concat);
-
-    assertThat(message.getOptionalLazyMessage().getBb()).isEqualTo(11);
-    assertThat(message.getOptionalLazyMessage().getCc()).isEqualTo(22L);
-  }
-
-  @Test
-  public void testParseLazy_oneOf() throws Exception {
-    ByteString bb =
-        TestAllTypesLite.newBuilder()
-            .setOneofLazyNestedMessage(NestedMessage.newBuilder().setBb(11).build())
-            .build()
-            .toByteString();
-    ByteString cc =
-        TestAllTypesLite.newBuilder()
-            .setOneofLazyNestedMessage(NestedMessage.newBuilder().setCc(22).build())
-            .build()
-            .toByteString();
-
-    ByteString concat = bb.concat(cc);
-    TestAllTypesLite message = TestAllTypesLite.parseFrom(concat);
-
-    assertThat(message.getOneofLazyNestedMessage().getBb()).isEqualTo(11);
-    assertThat(message.getOneofLazyNestedMessage().getCc()).isEqualTo(22L);
-  }
-
-  @Test
-  public void testMergeFromStream_repeatedField() throws Exception {
-    TestAllTypesLite.Builder builder = TestAllTypesLite.newBuilder().addRepeatedString("hello");
-    builder.mergeFrom(CodedInputStream.newInstance(builder.build().toByteArray()));
-
-    assertThat(builder.getRepeatedStringCount()).isEqualTo(2);
-  }
-
-  @Test
-  public void testMergeFromStream_invalidBytes() throws Exception {
-    TestAllTypesLite.Builder builder = TestAllTypesLite.newBuilder().setDefaultBool(true);
-    try {
-      builder.mergeFrom(CodedInputStream.newInstance("Invalid bytes".getBytes(Internal.UTF_8)));
-      assertWithMessage("expected exception").fail();
-    } catch (InvalidProtocolBufferException expected) {
-    }
-  }
-
-  @Test
-  public void testParseFromStream_IOExceptionNotLost() throws Exception {
-    final IOException readException = new IOException();
-    try {
-      TestAllTypesLite.parseFrom(
-          CodedInputStream.newInstance(
-              new InputStream() {
-                @Override
-                public int read() throws IOException {
-                  throw readException;
-                }
-              }));
-      assertWithMessage("expected exception").fail();
-    } catch (InvalidProtocolBufferException expected) {
-      boolean found = false;
-      for (Throwable exception = expected; exception != null; exception = exception.getCause()) {
-        if (exception == readException) {
-          found = true;
-          break;
-        }
-      }
-      if (!found) {
-        throw new AssertionError("Lost cause of parsing error", expected);
-      }
-    }
-  }
-
-  @Test
-  public void testParseDelimitedFromStream_IOExceptionNotLost() throws Exception {
-    final IOException readException = new IOException();
-    try {
-      TestAllTypesLite.parseDelimitedFrom(
-          new InputStream() {
-            @Override
-            public int read() throws IOException {
-              throw readException;
-            }
-          });
-      assertWithMessage("expected exception").fail();
-    } catch (InvalidProtocolBufferException expected) {
-      boolean found = false;
-      for (Throwable exception = expected; exception != null; exception = exception.getCause()) {
-        if (exception == readException) {
-          found = true;
-          break;
-        }
-      }
-      if (!found) {
-        throw new AssertionError("Lost cause of parsing error", expected);
-      }
-    }
-  }
-
-  @Test
-  public void testParseFromArray_manyNestedMessagesError() throws Exception {
-    RecursiveMessage.Builder recursiveMessage =
-        RecursiveMessage.newBuilder().setPayload(ByteString.copyFrom(new byte[1]));
-    for (int i = 0; i < 20; i++) {
-      recursiveMessage = RecursiveMessage.newBuilder().setRecurse(recursiveMessage.build());
-    }
-    byte[] result = recursiveMessage.build().toByteArray();
-    result[
-            result.length
-                - CodedOutputStream.computeTagSize(RecursiveMessage.PAYLOAD_FIELD_NUMBER)
-                - CodedOutputStream.computeLengthDelimitedFieldSize(1)] =
-        0; // Set invalid tag
-    try {
-      RecursiveMessage.parseFrom(result);
-      assertWithMessage("Result was: " + Arrays.toString(result)).fail();
-    } catch (InvalidProtocolBufferException expected) {
-      boolean found = false;
-      int exceptionCount = 0;
-      for (Throwable exception = expected; exception != null; exception = exception.getCause()) {
-        if (exception instanceof InvalidProtocolBufferException) {
-          exceptionCount++;
-        }
-        for (StackTraceElement element : exception.getStackTrace()) {
-          if (InvalidProtocolBufferException.class.getName().equals(element.getClassName())
-              && "invalidTag".equals(element.getMethodName())) {
-            found = true;
-          } else if (Android.isOnAndroidDevice()
-              && "decodeUnknownField".equals(element.getMethodName())) {
-            // Android is missing the first element of the stack trace - b/181147885
-            found = true;
-          }
-        }
-      }
-      if (!found) {
-        throw new AssertionError("Lost cause of parsing error", expected);
-      }
-      if (exceptionCount > 1) {
-        throw new AssertionError(exceptionCount + " nested parsing exceptions", expected);
-      }
-    }
-  }
-
-  @Test
-  public void testParseFromStream_manyNestedMessagesError() throws Exception {
-    RecursiveMessage.Builder recursiveMessage =
-        RecursiveMessage.newBuilder().setPayload(ByteString.copyFrom(new byte[1]));
-    for (int i = 0; i < 20; i++) {
-      recursiveMessage = RecursiveMessage.newBuilder().setRecurse(recursiveMessage.build());
-    }
-    byte[] result = recursiveMessage.build().toByteArray();
-    result[
-            result.length
-                - CodedOutputStream.computeTagSize(RecursiveMessage.PAYLOAD_FIELD_NUMBER)
-                - CodedOutputStream.computeLengthDelimitedFieldSize(1)] =
-        0; // Set invalid tag
-    try {
-      RecursiveMessage.parseFrom(CodedInputStream.newInstance(new ByteArrayInputStream(result)));
-      assertWithMessage("Result was: " + Arrays.toString(result)).fail();
-    } catch (InvalidProtocolBufferException expected) {
-      boolean found = false;
-      int exceptionCount = 0;
-      for (Throwable exception = expected; exception != null; exception = exception.getCause()) {
-        if (exception instanceof InvalidProtocolBufferException) {
-          exceptionCount++;
-        }
-        for (StackTraceElement element : exception.getStackTrace()) {
-          if (InvalidProtocolBufferException.class.getName().equals(element.getClassName())
-              && "invalidTag".equals(element.getMethodName())) {
-            found = true;
-          } else if (Android.isOnAndroidDevice() && "readTag".equals(element.getMethodName())) {
-            // Android is missing the first element of the stack trace - b/181147885
-            found = true;
-          }
-        }
-      }
-      if (!found) {
-        throw new AssertionError("Lost cause of parsing error", expected);
-      }
-      if (exceptionCount > 1) {
-        throw new AssertionError(exceptionCount + " nested parsing exceptions", expected);
-      }
-    }
-  }
-
-  @Test
-  public void testParseFromStream_sneakyNestedException() throws Exception {
-    final InvalidProtocolBufferException sketchy =
-        new InvalidProtocolBufferException("Created in a sketchy way!")
-            .setUnfinishedMessage(TestAllTypesLite.getDefaultInstance());
-    try {
-      RecursiveMessage.parseFrom(
-          CodedInputStream.newInstance(
-              new InputStream() {
-                @Override
-                public int read() throws IOException {
-                  throw sketchy;
-                }
-              }));
-      assertWithMessage("expected exception").fail();
-    } catch (InvalidProtocolBufferException expected) {
-      assertThat(expected).isNotSameInstanceAs(sketchy);
-    }
-    assertThat(sketchy.getUnfinishedMessage()).isEqualTo(TestAllTypesLite.getDefaultInstance());
-  }
-
-  @Test
-  public void testMergeFrom_sanity() throws Exception {
-    TestAllTypesLite one = TestUtilLite.getAllLiteSetBuilder().build();
-    byte[] bytes = one.toByteArray();
-    TestAllTypesLite two = TestAllTypesLite.parseFrom(bytes);
-
-    one = one.toBuilder().mergeFrom(one).build();
-    two = two.toBuilder().mergeFrom(bytes).build();
-    assertThat(one).isEqualTo(two);
-    assertThat(two).isEqualTo(one);
-    assertThat(one.hashCode()).isEqualTo(two.hashCode());
-  }
-
-  @Test
-  @SuppressWarnings("ProtoNewBuilderMergeFrom")
-  public void testMergeFromNoLazyFieldSharing() throws Exception {
-    TestAllTypesLite.Builder sourceBuilder =
-        TestAllTypesLite.newBuilder().setOptionalLazyMessage(NestedMessage.newBuilder().setBb(1));
-    TestAllTypesLite.Builder targetBuilder =
-        TestAllTypesLite.newBuilder().mergeFrom(sourceBuilder.build());
-    assertThat(sourceBuilder.getOptionalLazyMessage().getBb()).isEqualTo(1);
-    // now change the sourceBuilder, and target value shouldn't be affected.
-    sourceBuilder.setOptionalLazyMessage(NestedMessage.newBuilder().setBb(2));
-    assertThat(targetBuilder.getOptionalLazyMessage().getBb()).isEqualTo(1);
-  }
-
-  @Test
-  public void testEquals_notEqual() throws Exception {
-    TestAllTypesLite one = TestUtilLite.getAllLiteSetBuilder().build();
-    byte[] bytes = one.toByteArray();
-    TestAllTypesLite two = one.toBuilder().mergeFrom(one).mergeFrom(bytes).build();
-
-    assertThat(one.equals(two)).isFalse();
-    assertThat(two.equals(one)).isFalse();
-
-    assertThat(one.equals(TestAllTypesLite.getDefaultInstance())).isFalse();
-    assertThat(TestAllTypesLite.getDefaultInstance().equals(one)).isFalse();
-
-    TestAllTypesLite oneFieldSet = TestAllTypesLite.newBuilder().setDefaultBool(true).build();
-    assertThat(oneFieldSet.equals(TestAllTypesLite.getDefaultInstance())).isFalse();
-    assertThat(TestAllTypesLite.getDefaultInstance().equals(oneFieldSet)).isFalse();
-
-    oneFieldSet = TestAllTypesLite.newBuilder().setDefaultBytes(ByteString.EMPTY).build();
-    assertThat(oneFieldSet.equals(TestAllTypesLite.getDefaultInstance())).isFalse();
-    assertThat(TestAllTypesLite.getDefaultInstance().equals(oneFieldSet)).isFalse();
-
-    oneFieldSet = TestAllTypesLite.newBuilder().setDefaultCord("").build();
-    assertThat(oneFieldSet.equals(TestAllTypesLite.getDefaultInstance())).isFalse();
-    assertThat(TestAllTypesLite.getDefaultInstance().equals(oneFieldSet)).isFalse();
-
-    oneFieldSet = TestAllTypesLite.newBuilder().setDefaultCordBytes(ByteString.EMPTY).build();
-    assertThat(oneFieldSet.equals(TestAllTypesLite.getDefaultInstance())).isFalse();
-    assertThat(TestAllTypesLite.getDefaultInstance().equals(oneFieldSet)).isFalse();
-
-    oneFieldSet = TestAllTypesLite.newBuilder().setDefaultDouble(0).build();
-    assertThat(oneFieldSet.equals(TestAllTypesLite.getDefaultInstance())).isFalse();
-    assertThat(TestAllTypesLite.getDefaultInstance().equals(oneFieldSet)).isFalse();
-
-    oneFieldSet = TestAllTypesLite.newBuilder().setDefaultFixed32(0).build();
-    assertThat(oneFieldSet.equals(TestAllTypesLite.getDefaultInstance())).isFalse();
-    assertThat(TestAllTypesLite.getDefaultInstance().equals(oneFieldSet)).isFalse();
-
-    oneFieldSet = TestAllTypesLite.newBuilder().setDefaultFixed64(0).build();
-    assertThat(oneFieldSet.equals(TestAllTypesLite.getDefaultInstance())).isFalse();
-    assertThat(TestAllTypesLite.getDefaultInstance().equals(oneFieldSet)).isFalse();
-
-    oneFieldSet = TestAllTypesLite.newBuilder().setDefaultFloat(0).build();
-    assertThat(oneFieldSet.equals(TestAllTypesLite.getDefaultInstance())).isFalse();
-    assertThat(TestAllTypesLite.getDefaultInstance().equals(oneFieldSet)).isFalse();
-
-    oneFieldSet =
-        TestAllTypesLite.newBuilder()
-            .setDefaultForeignEnum(ForeignEnumLite.FOREIGN_LITE_BAR)
-            .build();
-    assertThat(oneFieldSet.equals(TestAllTypesLite.getDefaultInstance())).isFalse();
-    assertThat(TestAllTypesLite.getDefaultInstance().equals(oneFieldSet)).isFalse();
-
-    oneFieldSet =
-        TestAllTypesLite.newBuilder().setDefaultImportEnum(ImportEnumLite.IMPORT_LITE_BAR).build();
-    assertThat(oneFieldSet.equals(TestAllTypesLite.getDefaultInstance())).isFalse();
-    assertThat(TestAllTypesLite.getDefaultInstance().equals(oneFieldSet)).isFalse();
-
-    oneFieldSet = TestAllTypesLite.newBuilder().setDefaultInt32(0).build();
-    assertThat(oneFieldSet.equals(TestAllTypesLite.getDefaultInstance())).isFalse();
-    assertThat(TestAllTypesLite.getDefaultInstance().equals(oneFieldSet)).isFalse();
-
-    oneFieldSet = TestAllTypesLite.newBuilder().setDefaultInt64(0).build();
-    assertThat(oneFieldSet.equals(TestAllTypesLite.getDefaultInstance())).isFalse();
-    assertThat(TestAllTypesLite.getDefaultInstance().equals(oneFieldSet)).isFalse();
-
-    oneFieldSet = TestAllTypesLite.newBuilder().setDefaultNestedEnum(NestedEnum.BAR).build();
-    assertThat(oneFieldSet.equals(TestAllTypesLite.getDefaultInstance())).isFalse();
-    assertThat(TestAllTypesLite.getDefaultInstance().equals(oneFieldSet)).isFalse();
-
-    oneFieldSet = TestAllTypesLite.newBuilder().setDefaultSfixed32(0).build();
-    assertThat(oneFieldSet.equals(TestAllTypesLite.getDefaultInstance())).isFalse();
-    assertThat(TestAllTypesLite.getDefaultInstance().equals(oneFieldSet)).isFalse();
-
-    oneFieldSet = TestAllTypesLite.newBuilder().setDefaultSfixed64(0).build();
-    assertThat(oneFieldSet.equals(TestAllTypesLite.getDefaultInstance())).isFalse();
-    assertThat(TestAllTypesLite.getDefaultInstance().equals(oneFieldSet)).isFalse();
-
-    oneFieldSet = TestAllTypesLite.newBuilder().setDefaultSint32(0).build();
-    assertThat(oneFieldSet.equals(TestAllTypesLite.getDefaultInstance())).isFalse();
-    assertThat(TestAllTypesLite.getDefaultInstance().equals(oneFieldSet)).isFalse();
-
-    oneFieldSet = TestAllTypesLite.newBuilder().setDefaultSint64(0).build();
-    assertThat(oneFieldSet.equals(TestAllTypesLite.getDefaultInstance())).isFalse();
-    assertThat(TestAllTypesLite.getDefaultInstance().equals(oneFieldSet)).isFalse();
-
-    oneFieldSet = TestAllTypesLite.newBuilder().setDefaultString("").build();
-    assertThat(oneFieldSet.equals(TestAllTypesLite.getDefaultInstance())).isFalse();
-    assertThat(TestAllTypesLite.getDefaultInstance().equals(oneFieldSet)).isFalse();
-
-    oneFieldSet = TestAllTypesLite.newBuilder().setDefaultStringBytes(ByteString.EMPTY).build();
-    assertThat(oneFieldSet.equals(TestAllTypesLite.getDefaultInstance())).isFalse();
-    assertThat(TestAllTypesLite.getDefaultInstance().equals(oneFieldSet)).isFalse();
-
-    oneFieldSet = TestAllTypesLite.newBuilder().setDefaultStringPiece("").build();
-    assertThat(oneFieldSet.equals(TestAllTypesLite.getDefaultInstance())).isFalse();
-    assertThat(TestAllTypesLite.getDefaultInstance().equals(oneFieldSet)).isFalse();
-
-    oneFieldSet =
-        TestAllTypesLite.newBuilder().setDefaultStringPieceBytes(ByteString.EMPTY).build();
-    assertThat(oneFieldSet.equals(TestAllTypesLite.getDefaultInstance())).isFalse();
-    assertThat(TestAllTypesLite.getDefaultInstance().equals(oneFieldSet)).isFalse();
-
-    oneFieldSet = TestAllTypesLite.newBuilder().setDefaultUint32(0).build();
-    assertThat(oneFieldSet.equals(TestAllTypesLite.getDefaultInstance())).isFalse();
-    assertThat(TestAllTypesLite.getDefaultInstance().equals(oneFieldSet)).isFalse();
-
-    oneFieldSet = TestAllTypesLite.newBuilder().setDefaultUint64(0).build();
-    assertThat(oneFieldSet.equals(TestAllTypesLite.getDefaultInstance())).isFalse();
-    assertThat(TestAllTypesLite.getDefaultInstance().equals(oneFieldSet)).isFalse();
-
-    oneFieldSet = TestAllTypesLite.newBuilder().addRepeatedBool(true).build();
-    assertThat(oneFieldSet.equals(TestAllTypesLite.getDefaultInstance())).isFalse();
-    assertThat(TestAllTypesLite.getDefaultInstance().equals(oneFieldSet)).isFalse();
-
-    oneFieldSet = TestAllTypesLite.newBuilder().addRepeatedBytes(ByteString.EMPTY).build();
-    assertThat(oneFieldSet.equals(TestAllTypesLite.getDefaultInstance())).isFalse();
-    assertThat(TestAllTypesLite.getDefaultInstance().equals(oneFieldSet)).isFalse();
-
-    oneFieldSet = TestAllTypesLite.newBuilder().addRepeatedCord("").build();
-    assertThat(oneFieldSet.equals(TestAllTypesLite.getDefaultInstance())).isFalse();
-    assertThat(TestAllTypesLite.getDefaultInstance().equals(oneFieldSet)).isFalse();
-
-    oneFieldSet = TestAllTypesLite.newBuilder().addRepeatedCordBytes(ByteString.EMPTY).build();
-    assertThat(oneFieldSet.equals(TestAllTypesLite.getDefaultInstance())).isFalse();
-    assertThat(TestAllTypesLite.getDefaultInstance().equals(oneFieldSet)).isFalse();
-
-    oneFieldSet = TestAllTypesLite.newBuilder().addRepeatedDouble(0).build();
-    assertThat(oneFieldSet.equals(TestAllTypesLite.getDefaultInstance())).isFalse();
-    assertThat(TestAllTypesLite.getDefaultInstance().equals(oneFieldSet)).isFalse();
-
-    oneFieldSet = TestAllTypesLite.newBuilder().addRepeatedFixed32(0).build();
-    assertThat(oneFieldSet.equals(TestAllTypesLite.getDefaultInstance())).isFalse();
-    assertThat(TestAllTypesLite.getDefaultInstance().equals(oneFieldSet)).isFalse();
-
-    oneFieldSet = TestAllTypesLite.newBuilder().addRepeatedFixed64(0).build();
-    assertThat(oneFieldSet.equals(TestAllTypesLite.getDefaultInstance())).isFalse();
-    assertThat(TestAllTypesLite.getDefaultInstance().equals(oneFieldSet)).isFalse();
-
-    oneFieldSet = TestAllTypesLite.newBuilder().addRepeatedFloat(0).build();
-    assertThat(oneFieldSet.equals(TestAllTypesLite.getDefaultInstance())).isFalse();
-    assertThat(TestAllTypesLite.getDefaultInstance().equals(oneFieldSet)).isFalse();
-
-    oneFieldSet =
-        TestAllTypesLite.newBuilder()
-            .addRepeatedForeignEnum(ForeignEnumLite.FOREIGN_LITE_BAR)
-            .build();
-    assertThat(oneFieldSet.equals(TestAllTypesLite.getDefaultInstance())).isFalse();
-    assertThat(TestAllTypesLite.getDefaultInstance().equals(oneFieldSet)).isFalse();
-
-    oneFieldSet =
-        TestAllTypesLite.newBuilder().addRepeatedImportEnum(ImportEnumLite.IMPORT_LITE_BAR).build();
-    assertThat(oneFieldSet.equals(TestAllTypesLite.getDefaultInstance())).isFalse();
-    assertThat(TestAllTypesLite.getDefaultInstance().equals(oneFieldSet)).isFalse();
-
-    oneFieldSet = TestAllTypesLite.newBuilder().addRepeatedInt32(0).build();
-    assertThat(oneFieldSet.equals(TestAllTypesLite.getDefaultInstance())).isFalse();
-    assertThat(TestAllTypesLite.getDefaultInstance().equals(oneFieldSet)).isFalse();
-
-    oneFieldSet = TestAllTypesLite.newBuilder().addRepeatedInt64(0).build();
-    assertThat(oneFieldSet.equals(TestAllTypesLite.getDefaultInstance())).isFalse();
-    assertThat(TestAllTypesLite.getDefaultInstance().equals(oneFieldSet)).isFalse();
-
-    oneFieldSet = TestAllTypesLite.newBuilder().addRepeatedNestedEnum(NestedEnum.BAR).build();
-    assertThat(oneFieldSet.equals(TestAllTypesLite.getDefaultInstance())).isFalse();
-    assertThat(TestAllTypesLite.getDefaultInstance().equals(oneFieldSet)).isFalse();
-
-    oneFieldSet = TestAllTypesLite.newBuilder().addRepeatedSfixed32(0).build();
-    assertThat(oneFieldSet.equals(TestAllTypesLite.getDefaultInstance())).isFalse();
-    assertThat(TestAllTypesLite.getDefaultInstance().equals(oneFieldSet)).isFalse();
-
-    oneFieldSet = TestAllTypesLite.newBuilder().addRepeatedSfixed64(0).build();
-    assertThat(oneFieldSet.equals(TestAllTypesLite.getDefaultInstance())).isFalse();
-    assertThat(TestAllTypesLite.getDefaultInstance().equals(oneFieldSet)).isFalse();
-
-    oneFieldSet = TestAllTypesLite.newBuilder().addRepeatedSint32(0).build();
-    assertThat(oneFieldSet.equals(TestAllTypesLite.getDefaultInstance())).isFalse();
-    assertThat(TestAllTypesLite.getDefaultInstance().equals(oneFieldSet)).isFalse();
-
-    oneFieldSet = TestAllTypesLite.newBuilder().addRepeatedSint64(0).build();
-    assertThat(oneFieldSet.equals(TestAllTypesLite.getDefaultInstance())).isFalse();
-    assertThat(TestAllTypesLite.getDefaultInstance().equals(oneFieldSet)).isFalse();
-
-    oneFieldSet = TestAllTypesLite.newBuilder().addRepeatedString("").build();
-    assertThat(oneFieldSet.equals(TestAllTypesLite.getDefaultInstance())).isFalse();
-    assertThat(TestAllTypesLite.getDefaultInstance().equals(oneFieldSet)).isFalse();
-
-    oneFieldSet = TestAllTypesLite.newBuilder().addRepeatedStringBytes(ByteString.EMPTY).build();
-    assertThat(oneFieldSet.equals(TestAllTypesLite.getDefaultInstance())).isFalse();
-    assertThat(TestAllTypesLite.getDefaultInstance().equals(oneFieldSet)).isFalse();
-
-    oneFieldSet = TestAllTypesLite.newBuilder().addRepeatedStringPiece("").build();
-    assertThat(oneFieldSet.equals(TestAllTypesLite.getDefaultInstance())).isFalse();
-    assertThat(TestAllTypesLite.getDefaultInstance().equals(oneFieldSet)).isFalse();
-
-    oneFieldSet =
-        TestAllTypesLite.newBuilder().addRepeatedStringPieceBytes(ByteString.EMPTY).build();
-    assertThat(oneFieldSet.equals(TestAllTypesLite.getDefaultInstance())).isFalse();
-    assertThat(TestAllTypesLite.getDefaultInstance().equals(oneFieldSet)).isFalse();
-
-    oneFieldSet = TestAllTypesLite.newBuilder().addRepeatedUint32(0).build();
-    assertThat(oneFieldSet.equals(TestAllTypesLite.getDefaultInstance())).isFalse();
-    assertThat(TestAllTypesLite.getDefaultInstance().equals(oneFieldSet)).isFalse();
-
-    oneFieldSet = TestAllTypesLite.newBuilder().addRepeatedUint64(0).build();
-    assertThat(oneFieldSet.equals(TestAllTypesLite.getDefaultInstance())).isFalse();
-    assertThat(TestAllTypesLite.getDefaultInstance().equals(oneFieldSet)).isFalse();
-
-    oneFieldSet = TestAllTypesLite.newBuilder().setOptionalBool(true).build();
-    assertThat(oneFieldSet.equals(TestAllTypesLite.getDefaultInstance())).isFalse();
-    assertThat(TestAllTypesLite.getDefaultInstance().equals(oneFieldSet)).isFalse();
-
-    oneFieldSet = TestAllTypesLite.newBuilder().setOptionalBytes(ByteString.EMPTY).build();
-    assertThat(oneFieldSet.equals(TestAllTypesLite.getDefaultInstance())).isFalse();
-    assertThat(TestAllTypesLite.getDefaultInstance().equals(oneFieldSet)).isFalse();
-
-    oneFieldSet = TestAllTypesLite.newBuilder().setOptionalCord("").build();
-    assertThat(oneFieldSet.equals(TestAllTypesLite.getDefaultInstance())).isFalse();
-    assertThat(TestAllTypesLite.getDefaultInstance().equals(oneFieldSet)).isFalse();
-
-    oneFieldSet = TestAllTypesLite.newBuilder().setOptionalCordBytes(ByteString.EMPTY).build();
-    assertThat(oneFieldSet.equals(TestAllTypesLite.getDefaultInstance())).isFalse();
-    assertThat(TestAllTypesLite.getDefaultInstance().equals(oneFieldSet)).isFalse();
-
-    oneFieldSet = TestAllTypesLite.newBuilder().setOptionalDouble(0).build();
-    assertThat(oneFieldSet.equals(TestAllTypesLite.getDefaultInstance())).isFalse();
-    assertThat(TestAllTypesLite.getDefaultInstance().equals(oneFieldSet)).isFalse();
-
-    oneFieldSet = TestAllTypesLite.newBuilder().setOptionalFixed32(0).build();
-    assertThat(oneFieldSet.equals(TestAllTypesLite.getDefaultInstance())).isFalse();
-    assertThat(TestAllTypesLite.getDefaultInstance().equals(oneFieldSet)).isFalse();
-
-    oneFieldSet = TestAllTypesLite.newBuilder().setOptionalFixed64(0).build();
-    assertThat(oneFieldSet.equals(TestAllTypesLite.getDefaultInstance())).isFalse();
-    assertThat(TestAllTypesLite.getDefaultInstance().equals(oneFieldSet)).isFalse();
-
-    oneFieldSet = TestAllTypesLite.newBuilder().setOptionalFloat(0).build();
-    assertThat(oneFieldSet.equals(TestAllTypesLite.getDefaultInstance())).isFalse();
-    assertThat(TestAllTypesLite.getDefaultInstance().equals(oneFieldSet)).isFalse();
-
-    oneFieldSet =
-        TestAllTypesLite.newBuilder()
-            .setOptionalForeignEnum(ForeignEnumLite.FOREIGN_LITE_BAR)
-            .build();
-    assertThat(oneFieldSet.equals(TestAllTypesLite.getDefaultInstance())).isFalse();
-    assertThat(TestAllTypesLite.getDefaultInstance().equals(oneFieldSet)).isFalse();
-
-    oneFieldSet =
-        TestAllTypesLite.newBuilder().setOptionalImportEnum(ImportEnumLite.IMPORT_LITE_BAR).build();
-    assertThat(oneFieldSet.equals(TestAllTypesLite.getDefaultInstance())).isFalse();
-    assertThat(TestAllTypesLite.getDefaultInstance().equals(oneFieldSet)).isFalse();
-
-    oneFieldSet = TestAllTypesLite.newBuilder().setOptionalInt32(0).build();
-    assertThat(oneFieldSet.equals(TestAllTypesLite.getDefaultInstance())).isFalse();
-    assertThat(TestAllTypesLite.getDefaultInstance().equals(oneFieldSet)).isFalse();
-
-    oneFieldSet = TestAllTypesLite.newBuilder().setOptionalInt64(0).build();
-    assertThat(oneFieldSet.equals(TestAllTypesLite.getDefaultInstance())).isFalse();
-    assertThat(TestAllTypesLite.getDefaultInstance().equals(oneFieldSet)).isFalse();
-
-    oneFieldSet = TestAllTypesLite.newBuilder().setOptionalNestedEnum(NestedEnum.BAR).build();
-    assertThat(oneFieldSet.equals(TestAllTypesLite.getDefaultInstance())).isFalse();
-    assertThat(TestAllTypesLite.getDefaultInstance().equals(oneFieldSet)).isFalse();
-
-    oneFieldSet = TestAllTypesLite.newBuilder().setOptionalSfixed32(0).build();
-    assertThat(oneFieldSet.equals(TestAllTypesLite.getDefaultInstance())).isFalse();
-    assertThat(TestAllTypesLite.getDefaultInstance().equals(oneFieldSet)).isFalse();
-
-    oneFieldSet = TestAllTypesLite.newBuilder().setOptionalSfixed64(0).build();
-    assertThat(oneFieldSet.equals(TestAllTypesLite.getDefaultInstance())).isFalse();
-    assertThat(TestAllTypesLite.getDefaultInstance().equals(oneFieldSet)).isFalse();
-
-    oneFieldSet = TestAllTypesLite.newBuilder().setOptionalSint32(0).build();
-    assertThat(oneFieldSet.equals(TestAllTypesLite.getDefaultInstance())).isFalse();
-    assertThat(TestAllTypesLite.getDefaultInstance().equals(oneFieldSet)).isFalse();
-
-    oneFieldSet = TestAllTypesLite.newBuilder().setOptionalSint64(0).build();
-    assertThat(oneFieldSet.equals(TestAllTypesLite.getDefaultInstance())).isFalse();
-    assertThat(TestAllTypesLite.getDefaultInstance().equals(oneFieldSet)).isFalse();
-
-    oneFieldSet = TestAllTypesLite.newBuilder().setOptionalString("").build();
-    assertThat(oneFieldSet.equals(TestAllTypesLite.getDefaultInstance())).isFalse();
-    assertThat(TestAllTypesLite.getDefaultInstance().equals(oneFieldSet)).isFalse();
-
-    oneFieldSet = TestAllTypesLite.newBuilder().setOptionalStringBytes(ByteString.EMPTY).build();
-    assertThat(oneFieldSet.equals(TestAllTypesLite.getDefaultInstance())).isFalse();
-    assertThat(TestAllTypesLite.getDefaultInstance().equals(oneFieldSet)).isFalse();
-
-    oneFieldSet = TestAllTypesLite.newBuilder().setOptionalStringPiece("").build();
-    assertThat(oneFieldSet.equals(TestAllTypesLite.getDefaultInstance())).isFalse();
-    assertThat(TestAllTypesLite.getDefaultInstance().equals(oneFieldSet)).isFalse();
-
-    oneFieldSet =
-        TestAllTypesLite.newBuilder().setOptionalStringPieceBytes(ByteString.EMPTY).build();
-    assertThat(oneFieldSet.equals(TestAllTypesLite.getDefaultInstance())).isFalse();
-    assertThat(TestAllTypesLite.getDefaultInstance().equals(oneFieldSet)).isFalse();
-
-    oneFieldSet = TestAllTypesLite.newBuilder().setOptionalUint32(0).build();
-    assertThat(oneFieldSet.equals(TestAllTypesLite.getDefaultInstance())).isFalse();
-    assertThat(TestAllTypesLite.getDefaultInstance().equals(oneFieldSet)).isFalse();
-
-    oneFieldSet = TestAllTypesLite.newBuilder().setOptionalUint64(0).build();
-    assertThat(oneFieldSet.equals(TestAllTypesLite.getDefaultInstance())).isFalse();
-    assertThat(TestAllTypesLite.getDefaultInstance().equals(oneFieldSet)).isFalse();
-
-    oneFieldSet = TestAllTypesLite.newBuilder().setOneofBytes(ByteString.EMPTY).build();
-    assertThat(oneFieldSet.equals(TestAllTypesLite.getDefaultInstance())).isFalse();
-    assertThat(TestAllTypesLite.getDefaultInstance().equals(oneFieldSet)).isFalse();
-
-    oneFieldSet =
-        TestAllTypesLite.newBuilder()
-            .setOneofLazyNestedMessage(NestedMessage.getDefaultInstance())
-            .build();
-    assertThat(oneFieldSet.equals(TestAllTypesLite.getDefaultInstance())).isFalse();
-    assertThat(TestAllTypesLite.getDefaultInstance().equals(oneFieldSet)).isFalse();
-
-    oneFieldSet =
-        TestAllTypesLite.newBuilder()
-            .setOneofNestedMessage(NestedMessage.getDefaultInstance())
-            .build();
-    assertThat(oneFieldSet.equals(TestAllTypesLite.getDefaultInstance())).isFalse();
-    assertThat(TestAllTypesLite.getDefaultInstance().equals(oneFieldSet)).isFalse();
-
-    oneFieldSet = TestAllTypesLite.newBuilder().setOneofString("").build();
-    assertThat(oneFieldSet.equals(TestAllTypesLite.getDefaultInstance())).isFalse();
-    assertThat(TestAllTypesLite.getDefaultInstance().equals(oneFieldSet)).isFalse();
-
-    oneFieldSet = TestAllTypesLite.newBuilder().setOneofStringBytes(ByteString.EMPTY).build();
-    assertThat(oneFieldSet.equals(TestAllTypesLite.getDefaultInstance())).isFalse();
-    assertThat(TestAllTypesLite.getDefaultInstance().equals(oneFieldSet)).isFalse();
-
-    oneFieldSet = TestAllTypesLite.newBuilder().setOneofUint32(0).build();
-    assertThat(oneFieldSet.equals(TestAllTypesLite.getDefaultInstance())).isFalse();
-    assertThat(TestAllTypesLite.getDefaultInstance().equals(oneFieldSet)).isFalse();
-
-    oneFieldSet =
-        TestAllTypesLite.newBuilder()
-            .setOptionalForeignMessage(ForeignMessageLite.getDefaultInstance())
-            .build();
-    assertThat(oneFieldSet.equals(TestAllTypesLite.getDefaultInstance())).isFalse();
-    assertThat(TestAllTypesLite.getDefaultInstance().equals(oneFieldSet)).isFalse();
-
-    oneFieldSet =
-        TestAllTypesLite.newBuilder().setOptionalGroup(OptionalGroup.getDefaultInstance()).build();
-    assertThat(oneFieldSet.equals(TestAllTypesLite.getDefaultInstance())).isFalse();
-    assertThat(TestAllTypesLite.getDefaultInstance().equals(oneFieldSet)).isFalse();
-
-    oneFieldSet =
-        TestAllTypesLite.newBuilder()
-            .setOptionalPublicImportMessage(PublicImportMessageLite.getDefaultInstance())
-            .build();
-    assertThat(oneFieldSet.equals(TestAllTypesLite.getDefaultInstance())).isFalse();
-    assertThat(TestAllTypesLite.getDefaultInstance().equals(oneFieldSet)).isFalse();
-
-    oneFieldSet =
-        TestAllTypesLite.newBuilder()
-            .setOptionalLazyMessage(NestedMessage.getDefaultInstance())
-            .build();
-    assertThat(oneFieldSet.equals(TestAllTypesLite.getDefaultInstance())).isFalse();
-
-    assertThat(TestAllTypesLite.getDefaultInstance().equals(oneFieldSet)).isFalse();
-    oneFieldSet =
-        TestAllTypesLite.newBuilder()
-            .addRepeatedLazyMessage(NestedMessage.getDefaultInstance())
-            .build();
-    assertThat(oneFieldSet.equals(TestAllTypesLite.getDefaultInstance())).isFalse();
-    assertThat(TestAllTypesLite.getDefaultInstance().equals(oneFieldSet)).isFalse();
-  }
-
-  @Test
-  public void testEquals() throws Exception {
-    // Check that two identical objs are equal.
-    Foo foo1a = Foo.newBuilder().setValue(1).addBar(Bar.newBuilder().setName("foo1")).build();
-    Foo foo1b = Foo.newBuilder().setValue(1).addBar(Bar.newBuilder().setName("foo1")).build();
-    Foo foo2 = Foo.newBuilder().setValue(1).addBar(Bar.newBuilder().setName("foo2")).build();
-
-    // Check that equals is doing value rather than object equality.
-    assertThat(foo1a).isEqualTo(foo1b);
-    assertThat(foo1a.hashCode()).isEqualTo(foo1b.hashCode());
-
-    // Check that a different object is not equal.
-    assertThat(foo1a.equals(foo2)).isFalse();
-
-    // Check that two objects which have different types but the same field values are not
-    // considered to be equal.
-    Bar bar = Bar.newBuilder().setName("bar").build();
-    BarPrime barPrime = BarPrime.newBuilder().setName("bar").build();
-    assertThat(bar).isNotEqualTo((Object) barPrime); // compiler already won't let this happen.
-  }
-
-  @Test
-  public void testEqualsAndHashCodeForTrickySchemaTypes() {
-    Foo foo1 = Foo.getDefaultInstance();
-    Foo foo2 = Foo.newBuilder().setSint64(1).build();
-    Foo foo3 = Foo.newBuilder().putMyMap("key", "value2").build();
-    Foo foo4 = Foo.newBuilder().setMyGroup(Foo.MyGroup.newBuilder().setValue(4).build()).build();
-
-    assertEqualsAndHashCodeAreFalse(foo1, foo2);
-    assertEqualsAndHashCodeAreFalse(foo1, foo3);
-    assertEqualsAndHashCodeAreFalse(foo1, foo4);
-  }
-
-  @Test
-  public void testOneofEquals() throws Exception {
-    TestOneofEquals.Builder builder = TestOneofEquals.newBuilder();
-    TestOneofEquals message1 = builder.build();
-    // Set message2's name field to default value. The two messages should be different when we
-    // check with the oneof case.
-    builder.setName("");
-    TestOneofEquals message2 = builder.build();
-    assertThat(message1.equals(message2)).isFalse();
-  }
-
-  @Test
-  public void testEquals_sanity() throws Exception {
-    TestAllTypesLite one = TestUtilLite.getAllLiteSetBuilder().build();
-    TestAllTypesLite two = TestAllTypesLite.parseFrom(one.toByteArray());
-    assertThat(one).isEqualTo(two);
-    assertThat(one.hashCode()).isEqualTo(two.hashCode());
-
-    assertThat(one.toBuilder().mergeFrom(two).build())
-        .isEqualTo(two.toBuilder().mergeFrom(two.toByteArray()).build());
-  }
-
-  @Test
-  public void testEqualsAndHashCodeWithUnknownFields() throws InvalidProtocolBufferException {
-    Foo fooWithOnlyValue = Foo.newBuilder().setValue(1).build();
-
-    Foo fooWithValueAndExtension =
-        fooWithOnlyValue
-            .toBuilder()
-            .setValue(1)
-            .setExtension(Bar.fooExt, Bar.newBuilder().setName("name").build())
-            .build();
-
-    Foo fooWithValueAndUnknownFields = Foo.parseFrom(fooWithValueAndExtension.toByteArray());
-
-    assertEqualsAndHashCodeAreFalse(fooWithOnlyValue, fooWithValueAndUnknownFields);
-    assertEqualsAndHashCodeAreFalse(fooWithValueAndExtension, fooWithValueAndUnknownFields);
-  }
-
-  @Test
-  public void testEqualsAndHashCodeWithExtensions() throws InvalidProtocolBufferException {
-    Foo fooWithOnlyValue = Foo.newBuilder().setValue(1).build();
-
-    Foo fooWithValueAndExtension =
-        fooWithOnlyValue
-            .toBuilder()
-            .setValue(1)
-            .setExtension(Bar.fooExt, Bar.newBuilder().setName("name").build())
-            .build();
-
-    assertEqualsAndHashCodeAreFalse(fooWithOnlyValue, fooWithValueAndExtension);
-  }
-
-  // Test to ensure we avoid a class cast exception with oneofs.
-  @Test
-  public void testEquals_oneOfMessages() {
-    TestAllTypesLite mine = TestAllTypesLite.newBuilder().setOneofString("Hello").build();
-
-    TestAllTypesLite other =
-        TestAllTypesLite.newBuilder()
-            .setOneofNestedMessage(NestedMessage.getDefaultInstance())
-            .build();
-
-    assertThat(mine.equals(other)).isFalse();
-    assertThat(other.equals(mine)).isFalse();
-  }
-
-  @Test
-  public void testHugeFieldNumbers() throws InvalidProtocolBufferException {
-    TestHugeFieldNumbersLite message =
-        TestHugeFieldNumbersLite.newBuilder()
-            .setOptionalInt32(1)
-            .addRepeatedInt32(2)
-            .setOptionalEnum(ForeignEnumLite.FOREIGN_LITE_FOO)
-            .setOptionalString("xyz")
-            .setOptionalMessage(ForeignMessageLite.newBuilder().setC(3).build())
-            .build();
-
-    TestHugeFieldNumbersLite parsedMessage =
-        TestHugeFieldNumbersLite.parseFrom(message.toByteArray());
-    assertThat(parsedMessage.getOptionalInt32()).isEqualTo(1);
-    assertThat(parsedMessage.getRepeatedInt32(0)).isEqualTo(2);
-    assertThat(parsedMessage.getOptionalEnum()).isEqualTo(ForeignEnumLite.FOREIGN_LITE_FOO);
-    assertThat(parsedMessage.getOptionalString()).isEqualTo("xyz");
-    assertThat(parsedMessage.getOptionalMessage().getC()).isEqualTo(3);
-  }
-
-  private void assertEqualsAndHashCodeAreFalse(Object o1, Object o2) {
-    assertThat(o1.equals(o2)).isFalse();
-    assertThat(o1.hashCode()).isNotEqualTo(o2.hashCode());
-  }
-
-  @Test
-  public void testRecursiveHashcode() {
-    // This tests that we don't infinite loop.
-    int unused = TestRecursiveOneof.getDefaultInstance().hashCode();
-  }
-
-  @Test
-  public void testParseFromByteBuffer() throws Exception {
-    TestAllTypesLite message =
-        TestAllTypesLite.newBuilder()
-            .setOptionalInt32(123)
-            .addRepeatedString("hello")
-            .setOptionalNestedMessage(NestedMessage.newBuilder().setBb(7))
-            .build();
-
-    TestAllTypesLite copy =
-        TestAllTypesLite.parseFrom(message.toByteString().asReadOnlyByteBuffer());
-
-    assertThat(message).isEqualTo(copy);
-  }
-
-  @Test
-  public void testParseFromByteBufferThrows() {
-    try {
-      TestAllTypesLite.parseFrom(ByteBuffer.wrap(new byte[] {0x5}));
-      assertWithMessage("expected exception").fail();
-    } catch (InvalidProtocolBufferException expected) {
-    }
-
-    TestAllTypesLite message =
-        TestAllTypesLite.newBuilder().setOptionalInt32(123).addRepeatedString("hello").build();
-
-    ByteBuffer buffer = ByteBuffer.wrap(message.toByteArray(), 0, message.getSerializedSize() - 1);
-    try {
-      TestAllTypesLite.parseFrom(buffer);
-      assertWithMessage("expected exception").fail();
-    } catch (InvalidProtocolBufferException expected) {
-      assertThat(TestAllTypesLite.newBuilder().setOptionalInt32(123).build())
-          .isEqualTo(expected.getUnfinishedMessage());
-    }
-  }
-
-  @Test
-  public void testParseFromByteBuffer_extensions() throws Exception {
-    TestAllExtensionsLite message =
-        TestAllExtensionsLite.newBuilder()
-            .setExtension(UnittestLite.optionalInt32ExtensionLite, 123)
-            .addExtension(UnittestLite.repeatedStringExtensionLite, "hello")
-            .setExtension(UnittestLite.optionalNestedEnumExtensionLite, NestedEnum.BAZ)
-            .setExtension(
-                UnittestLite.optionalNestedMessageExtensionLite,
-                NestedMessage.newBuilder().setBb(7).build())
-            .build();
-
-    ExtensionRegistryLite registry = ExtensionRegistryLite.newInstance();
-    UnittestLite.registerAllExtensions(registry);
-
-    TestAllExtensionsLite copy =
-        TestAllExtensionsLite.parseFrom(message.toByteString().asReadOnlyByteBuffer(), registry);
-
-    assertThat(message).isEqualTo(copy);
-  }
-
-  @Test
-  public void testParseFromByteBufferThrows_extensions() {
-    ExtensionRegistryLite registry = ExtensionRegistryLite.newInstance();
-    UnittestLite.registerAllExtensions(registry);
-    try {
-      TestAllExtensionsLite.parseFrom(ByteBuffer.wrap(new byte[] {0x5}), registry);
-      assertWithMessage("expected exception").fail();
-    } catch (InvalidProtocolBufferException expected) {
-    }
-
-    TestAllExtensionsLite message =
-        TestAllExtensionsLite.newBuilder()
-            .setExtension(UnittestLite.optionalInt32ExtensionLite, 123)
-            .addExtension(UnittestLite.repeatedStringExtensionLite, "hello")
-            .build();
-
-    ByteBuffer buffer = ByteBuffer.wrap(message.toByteArray(), 0, message.getSerializedSize() - 1);
-    try {
-      TestAllExtensionsLite.parseFrom(buffer, registry);
-      assertWithMessage("expected exception").fail();
-    } catch (InvalidProtocolBufferException expected) {
-      assertThat(
-          TestAllExtensionsLite.newBuilder()
-              .setExtension(UnittestLite.optionalInt32ExtensionLite, 123)
-              .build())
-          .isEqualTo(expected.getUnfinishedMessage());
-    }
-  }
-
-  // Make sure we haven't screwed up the code generation for packing fields by default.
-  @Test
-  public void testPackedSerialization() throws Exception {
-    TestAllTypes.Builder builder = TestAllTypes.newBuilder();
-    builder.addRepeatedInt32(4321);
-    builder.addRepeatedNestedEnum(TestAllTypes.NestedEnum.BAZ);
-    TestAllTypes message = builder.build();
-
-    CodedInputStream in = CodedInputStream.newInstance(message.toByteArray());
-
-    while (!in.isAtEnd()) {
-      int tag = in.readTag();
-      assertThat(WireFormat.getTagWireType(tag)).isEqualTo(WireFormat.WIRETYPE_LENGTH_DELIMITED);
-      in.skipField(tag);
-    }
-  }
-
-  @Test
-  public void testAddAllIteratesOnce() {
-    TestAllTypesLite unused =
-        TestAllTypesLite.newBuilder()
-            .addAllRepeatedBool(new OneTimeIterableList<>(false))
-            .addAllRepeatedInt32(new OneTimeIterableList<>(0))
-            .addAllRepeatedInt64(new OneTimeIterableList<>(0L))
-            .addAllRepeatedFloat(new OneTimeIterableList<>(0f))
-            .addAllRepeatedDouble(new OneTimeIterableList<>(0d))
-            .addAllRepeatedBytes(new OneTimeIterableList<>(ByteString.EMPTY))
-            .addAllRepeatedString(new OneTimeIterableList<>(""))
-            .addAllRepeatedNestedMessage(
-                new OneTimeIterableList<>(NestedMessage.getDefaultInstance()))
-            .addAllRepeatedBool(new OneTimeIterable<>(false))
-            .addAllRepeatedInt32(new OneTimeIterable<>(0))
-            .addAllRepeatedInt64(new OneTimeIterable<>(0L))
-            .addAllRepeatedFloat(new OneTimeIterable<>(0f))
-            .addAllRepeatedDouble(new OneTimeIterable<>(0d))
-            .addAllRepeatedBytes(new OneTimeIterable<>(ByteString.EMPTY))
-            .addAllRepeatedString(new OneTimeIterable<>(""))
-            .addAllRepeatedNestedMessage(new OneTimeIterable<>(NestedMessage.getDefaultInstance()))
-            .build();
-  }
-
-  @Test
-  public void testAddAllIteratesOnce_throwsOnNull() {
-    TestAllTypesLite.Builder builder = TestAllTypesLite.newBuilder();
-    try {
-      builder.addAllRepeatedBool(new OneTimeIterableList<>(true, false, null));
-      assertWithMessage("expected exception").fail();
-    } catch (NullPointerException expected) {
-      assertThat(expected).hasMessageThat().isEqualTo("Element at index 2 is null.");
-      assertThat(builder.getRepeatedBoolCount()).isEqualTo(0);
-    }
-
-    try {
-      builder.addAllRepeatedBool(new OneTimeIterable<>(true, false, null));
-      assertWithMessage("expected exception").fail();
-    } catch (NullPointerException expected) {
-      assertThat(expected).hasMessageThat().isEqualTo("Element at index 2 is null.");
-      assertThat(builder.getRepeatedBoolCount()).isEqualTo(0);
-    }
-
-    try {
-      builder = TestAllTypesLite.newBuilder();
-      builder.addAllRepeatedBool(new OneTimeIterableList<>((Boolean) null));
-      assertWithMessage("expected exception").fail();
-    } catch (NullPointerException expected) {
-      assertThat(expected).hasMessageThat().isEqualTo("Element at index 0 is null.");
-      assertThat(builder.getRepeatedBoolCount()).isEqualTo(0);
-    }
-
-    try {
-      builder = TestAllTypesLite.newBuilder();
-      builder.addAllRepeatedInt32(new OneTimeIterableList<>((Integer) null));
-      assertWithMessage("expected exception").fail();
-    } catch (NullPointerException expected) {
-      assertThat(expected).hasMessageThat().isEqualTo("Element at index 0 is null.");
-      assertThat(builder.getRepeatedInt32Count()).isEqualTo(0);
-    }
-
-    try {
-      builder = TestAllTypesLite.newBuilder();
-      builder.addAllRepeatedInt64(new OneTimeIterableList<>((Long) null));
-      assertWithMessage("expected exception").fail();
-    } catch (NullPointerException expected) {
-      assertThat(expected).hasMessageThat().isEqualTo("Element at index 0 is null.");
-      assertThat(builder.getRepeatedInt64Count()).isEqualTo(0);
-    }
-
-    try {
-      builder = TestAllTypesLite.newBuilder();
-      builder.addAllRepeatedFloat(new OneTimeIterableList<>((Float) null));
-      assertWithMessage("expected exception").fail();
-    } catch (NullPointerException expected) {
-      assertThat(expected).hasMessageThat().isEqualTo("Element at index 0 is null.");
-      assertThat(builder.getRepeatedFloatCount()).isEqualTo(0);
-    }
-
-    try {
-      builder = TestAllTypesLite.newBuilder();
-      builder.addAllRepeatedDouble(new OneTimeIterableList<>((Double) null));
-      assertWithMessage("expected exception").fail();
-    } catch (NullPointerException expected) {
-      assertThat(expected).hasMessageThat().isEqualTo("Element at index 0 is null.");
-      assertThat(builder.getRepeatedDoubleCount()).isEqualTo(0);
-    }
-
-    try {
-      builder = TestAllTypesLite.newBuilder();
-      builder.addAllRepeatedBytes(new OneTimeIterableList<>((ByteString) null));
-      assertWithMessage("expected exception").fail();
-    } catch (NullPointerException expected) {
-      assertThat(expected).hasMessageThat().isEqualTo("Element at index 0 is null.");
-      assertThat(builder.getRepeatedBytesCount()).isEqualTo(0);
-    }
-
-    try {
-      builder = TestAllTypesLite.newBuilder();
-      builder.addAllRepeatedString(new OneTimeIterableList<>("", "", null, ""));
-      assertWithMessage("expected exception").fail();
-    } catch (NullPointerException expected) {
-      assertThat(expected).hasMessageThat().isEqualTo("Element at index 2 is null.");
-      assertThat(builder.getRepeatedStringCount()).isEqualTo(0);
-    }
-
-    try {
-      builder = TestAllTypesLite.newBuilder();
-      builder.addAllRepeatedString(new OneTimeIterable<>("", "", null, ""));
-      assertWithMessage("expected exception").fail();
-    } catch (NullPointerException expected) {
-      assertThat(expected).hasMessageThat().isEqualTo("Element at index 2 is null.");
-      assertThat(builder.getRepeatedStringCount()).isEqualTo(0);
-    }
-
-    try {
-      builder = TestAllTypesLite.newBuilder();
-      builder.addAllRepeatedString(new OneTimeIterableList<>((String) null));
-      assertWithMessage("expected exception").fail();
-    } catch (NullPointerException expected) {
-      assertThat(expected).hasMessageThat().isEqualTo("Element at index 0 is null.");
-      assertThat(builder.getRepeatedStringCount()).isEqualTo(0);
-    }
-
-    try {
-      builder = TestAllTypesLite.newBuilder();
-      builder.addAllRepeatedNestedMessage(new OneTimeIterableList<>((NestedMessage) null));
-      assertWithMessage("expected exception").fail();
-    } catch (NullPointerException expected) {
-      assertThat(expected).hasMessageThat().isEqualTo("Element at index 0 is null.");
-      assertThat(builder.getRepeatedNestedMessageCount()).isEqualTo(0);
-    }
-  }
-
-  @Test
-  public void testExtensionRenamesKeywords() {
-    assertThat(NonNestedExtensionLite.package_)
-        .isInstanceOf(GeneratedMessageLite.GeneratedExtension.class);
-    assertThat(NestedExtensionLite.MyNestedExtensionLite.private_)
-        .isInstanceOf(GeneratedMessageLite.GeneratedExtension.class);
-
-    NonNestedExtensionLite.MessageLiteToBeExtended msg =
-        NonNestedExtensionLite.MessageLiteToBeExtended.newBuilder()
-            .setExtension(NonNestedExtensionLite.package_, true)
-            .build();
-    assertThat(msg.getExtension(NonNestedExtensionLite.package_)).isTrue();
-
-    msg =
-        NonNestedExtensionLite.MessageLiteToBeExtended.newBuilder()
-            .setExtension(NestedExtensionLite.MyNestedExtensionLite.private_, 2.4)
-            .build();
-    assertThat(msg.getExtension(NestedExtensionLite.MyNestedExtensionLite.private_)).isEqualTo(2.4);
-  }
-
-  private static final class OneTimeIterableList<T> extends ArrayList<T> {
-    private boolean wasIterated = false;
-
-    OneTimeIterableList(T... contents) {
-      addAll(Arrays.asList(contents));
-    }
-
-    @Override
-    public Iterator<T> iterator() {
-      if (wasIterated) {
-        assertWithMessage("expected exception").fail();
-      }
-      wasIterated = true;
-      return super.iterator();
-    }
-  }
-
-  private static final class OneTimeIterable<T> implements Iterable<T> {
-    private final List<T> list;
-    private boolean wasIterated = false;
-
-    OneTimeIterable(T... contents) {
-      list = Arrays.asList(contents);
-    }
-
-    @Override
-    public Iterator<T> iterator() {
-      if (wasIterated) {
-        assertWithMessage("expected exception").fail();
-      }
-      wasIterated = true;
-      return list.iterator();
-    }
-  }
-
-  @Test
-  public void testNullExtensionRegistry() throws Exception {
-    try {
-      TestAllTypesLite.parseFrom(new byte[] {}, null);
-      assertWithMessage("expected exception").fail();
-    } catch (NullPointerException expected) {
-    }
-  }
-
-  @Test
-  public void testSerializeToOutputStreamThrowsIOException() {
-    try {
-      TestAllTypesLite.newBuilder()
-          .setOptionalBytes(ByteString.copyFromUtf8("hello"))
-          .build()
-          .writeTo(
-              new OutputStream() {
-
-                @Override
-                public void write(int b) throws IOException {
-                  throw new IOException();
-                }
-              });
-      assertWithMessage("expected exception").fail();
-    } catch (IOException expected) {
-    }
-  }
-
-  @Test
-  public void testUnpairedSurrogatesReplacedByQuestionMark() throws InvalidProtocolBufferException {
-    String testString = "foo \ud83d bar";
-    String expectedString = "foo ? bar";
-
-    TestAllTypesLite testMessage =
-        TestAllTypesLite.newBuilder().setOptionalString(testString).build();
-    ByteString serializedMessage = testMessage.toByteString();
-
-    // Behavior is compatible with String.getBytes("UTF-8"), which replaces
-    // unpaired surrogates with a question mark.
-    TestAllTypesLite parsedMessage = TestAllTypesLite.parseFrom(serializedMessage);
-    assertThat(parsedMessage.getOptionalString()).isEqualTo(expectedString);
-
-    // Conversion happens during serialization.
-    ByteString expectedBytes = ByteString.copyFromUtf8(expectedString);
-    assertWithMessage(
-            String.format(
-                "Expected serializedMessage (%s) to contain \"%s\" (%s).",
-                encodeHex(serializedMessage), expectedString, encodeHex(expectedBytes)))
-        .that(contains(serializedMessage, expectedBytes))
-        .isTrue();
-  }
-
-  @Test
-  public void testPreservesFloatingPointNegative0() throws Exception {
-    proto3_unittest.UnittestProto3.TestAllTypes message =
-        proto3_unittest.UnittestProto3.TestAllTypes.newBuilder()
-            .setOptionalFloat(-0.0f)
-            .setOptionalDouble(-0.0)
-            .build();
-    assertThat(
-            proto3_unittest.UnittestProto3.TestAllTypes.parseFrom(
-                message.toByteString(), ExtensionRegistryLite.getEmptyRegistry()))
-        .isEqualTo(message);
-  }
-
-  @Test
-  public void testNegative0FloatingPointEquality() throws Exception {
-    // Like Double#equals and Float#equals, we treat -0.0 as not being equal to +0.0 even though
-    // IEEE 754 mandates that they are equivalent. This test asserts that behavior.
-    proto3_unittest.UnittestProto3.TestAllTypes message1 =
-        proto3_unittest.UnittestProto3.TestAllTypes.newBuilder()
-            .setOptionalFloat(-0.0f)
-            .setOptionalDouble(-0.0)
-            .build();
-    proto3_unittest.UnittestProto3.TestAllTypes message2 =
-        proto3_unittest.UnittestProto3.TestAllTypes.newBuilder()
-            .setOptionalFloat(0.0f)
-            .setOptionalDouble(0.0)
-            .build();
-    assertThat(message1).isNotEqualTo(message2);
-  }
-
-  private static String encodeHex(ByteString bytes) {
-    String hexDigits = "0123456789abcdef";
-    StringBuilder stringBuilder = new StringBuilder(bytes.size() * 2);
-    for (byte b : bytes) {
-      stringBuilder.append(hexDigits.charAt((b & 0xf0) >> 4));
-      stringBuilder.append(hexDigits.charAt(b & 0x0f));
-    }
-    return stringBuilder.toString();
-  }
-
-  private static boolean contains(ByteString a, ByteString b) {
-    for (int i = 0; i <= a.size() - b.size(); ++i) {
-      if (a.substring(i, i + b.size()).equals(b)) {
-        return true;
-      }
-    }
-    return false;
-  }
-}
diff --git a/libs/protobuf/java/pom.xml b/libs/protobuf/java/pom.xml
deleted file mode 100644
index 863d07f..0000000
--- a/libs/protobuf/java/pom.xml
+++ /dev/null
@@ -1,287 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>com.google.protobuf</groupId>
-  <artifactId>protobuf-parent</artifactId>
-  <version>3.21.12</version>
-  <packaging>pom</packaging>
-
-  <name>Protocol Buffers [Parent]</name>
-  <inceptionYear>2008</inceptionYear>
-  <url>https://developers.google.com/protocol-buffers/</url>
-  <description>
-    Protocol Buffers are a way of encoding structured data in an efficient yet
-    extensible format.
-  </description>
-
-  <developers>
-    <developer>
-      <id>haon</id>
-      <name>Hao Nguyen</name>
-      <email>haon@google.com</email>
-      <organization>Google</organization>
-      <organizationUrl>https://cloud.google.com</organizationUrl>
-      <timezone>America/Los_Angeles</timezone>
-    </developer>
-  </developers>
-
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-
-    <!-- These are relative to the submodules -->
-    <protobuf.basedir>${project.basedir}/../..</protobuf.basedir>
-    <protobuf.source.dir>${protobuf.basedir}/src</protobuf.source.dir>
-    <protoc>${protobuf.source.dir}/protoc</protoc>
-    <test.proto.dir>src/test/proto</test.proto.dir>
-    <generated.sources.dir>${project.build.directory}/generated-sources</generated.sources.dir>
-    <generated.testsources.dir>${project.build.directory}/generated-test-sources</generated.testsources.dir>
-  </properties>
-
-  <licenses>
-    <license>
-      <name>BSD-3-Clause</name>
-      <url>https://opensource.org/licenses/BSD-3-Clause</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-
-  <scm>
-    <url>https://github.com/protocolbuffers/protobuf</url>
-    <connection>scm:git:https://github.com/protocolbuffers/protobuf.git</connection>
-  </scm>
-
-  <distributionManagement>
-    <snapshotRepository>
-      <id>sonatype-nexus-staging</id>
-      <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-    </snapshotRepository>
-    <repository>
-      <id>sonatype-nexus-staging</id>
-      <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
-    </repository>
-  </distributionManagement>
-
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>com.google.protobuf</groupId>
-        <artifactId>protobuf-bom</artifactId>
-        <version>${project.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-      <dependency>
-        <groupId>junit</groupId>
-        <artifactId>junit</artifactId>
-        <version>4.13.2</version>
-        <scope>test</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.mockito</groupId>
-        <artifactId>mockito-core</artifactId>
-        <version>4.3.1</version>
-        <scope>test</scope>
-      </dependency>
-      <dependency>
-        <groupId>com.google.guava</groupId>
-        <artifactId>guava</artifactId>
-        <version>31.1-android</version>
-      </dependency>
-      <dependency>
-        <groupId>com.google.guava</groupId>
-        <artifactId>guava-testlib</artifactId>
-        <version>31.1-android</version>
-        <scope>test</scope>
-      </dependency>
-      <dependency>
-        <groupId>com.google.truth</groupId>
-        <artifactId>truth</artifactId>
-        <version>1.1.2</version>
-        <scope>test</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-
-  <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <artifactId>maven-compiler-plugin</artifactId>
-          <version>3.6.1</version>
-          <configuration>
-            <source>1.7</source>
-            <target>1.7</target>
-          </configuration>
-        </plugin>
-        <plugin>
-          <artifactId>maven-source-plugin</artifactId>
-          <version>2.4</version>
-          <executions>
-            <execution>
-              <id>attach-sources</id>
-              <goals>
-                <goal>jar-no-fork</goal>
-              </goals>
-            </execution>
-          </executions>
-        </plugin>
-        <plugin>
-          <artifactId>maven-javadoc-plugin</artifactId>
-          <version>2.10.3</version>
-          <executions>
-            <execution>
-              <id>attach-javadocs</id>
-              <goals>
-                <goal>jar</goal>
-              </goals>
-              <configuration>
-                <failOnError>false</failOnError>
-              </configuration>
-            </execution>
-          </executions>
-        </plugin>
-        <plugin>
-          <artifactId>maven-jar-plugin</artifactId>
-          <version>2.6</version>
-        </plugin>
-        <plugin>
-          <groupId>org.codehaus.mojo</groupId>
-          <artifactId>build-helper-maven-plugin</artifactId>
-          <version>1.10</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.felix</groupId>
-          <artifactId>maven-bundle-plugin</artifactId>
-          <version>3.0.1</version>
-        </plugin>
-        <plugin>
-          <artifactId>maven-antrun-plugin</artifactId>
-          <version>3.0.0</version>
-        </plugin>
-        <plugin>
-          <artifactId>maven-surefire-plugin</artifactId>
-          <version>3.0.0-M5</version>
-        </plugin>
-        <plugin>
-          <groupId>org.codehaus.mojo</groupId>
-          <artifactId>animal-sniffer-maven-plugin</artifactId>
-          <version>1.20</version>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-    
-    <plugins>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>animal-sniffer-maven-plugin</artifactId>
-        <configuration>
-          <signature>
-            <groupId>net.sf.androidscents.signature</groupId>
-            <artifactId>android-api-level-14</artifactId>
-            <version>4.0_r4</version>
-          </signature>
-          <ignores>
-            <ignore>sun.misc.Unsafe</ignore>
-          </ignores>
-        </configuration>
-        <executions>
-          <execution>
-            <id>android</id>
-            <phase>test</phase>
-            <goals>
-              <goal>check</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-
-  <profiles>
-    <profile>
-      <id>release</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-source-plugin</artifactId>
-            <version>2.2.1</version>
-            <executions>
-              <execution>
-                <id>attach-sources</id>
-                <goals>
-                  <goal>jar-no-fork</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-javadoc-plugin</artifactId>
-            <version>2.10.3</version>
-            <executions>
-              <execution>
-                <id>attach-javadocs</id>
-                <goals>
-                  <goal>jar</goal>
-                </goals>
-                <configuration>
-                  <failOnError>false</failOnError>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <artifactId>maven-gpg-plugin</artifactId>
-            <version>1.6</version>
-            <executions>
-              <execution>
-                <id>sign-artifacts</id>
-                <phase>verify</phase>
-                <goals>
-                  <goal>sign</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <groupId>org.sonatype.plugins</groupId>
-            <artifactId>nexus-staging-maven-plugin</artifactId>
-            <version>1.6.6</version>
-            <extensions>true</extensions>
-            <configuration>
-              <serverId>sonatype-nexus-staging</serverId>
-              <nexusUrl>https://oss.sonatype.org/</nexusUrl>
-              <autoReleaseAfterClose>false</autoReleaseAfterClose>
-            </configuration>
-          </plugin>
-          <plugin>
-            <groupId>org.jetbrains.dokka</groupId>
-            <artifactId>dokka-maven-plugin</artifactId>
-            <version>1.4.32</version>
-            <executions>
-              <execution>
-                <phase>prepare-package</phase>
-                <goals>
-                  <goal>javadocJar</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
-
-  <modules>
-    <module>bom</module>
-    <module>lite</module>
-    <module>core</module>
-    <module>util</module>
-    <module>kotlin</module>
-    <module>kotlin-lite</module>
-  </modules>
-
-</project>
diff --git a/libs/protobuf/java/util/BUILD.bazel b/libs/protobuf/java/util/BUILD.bazel
deleted file mode 100644
index e3804fb..0000000
--- a/libs/protobuf/java/util/BUILD.bazel
+++ /dev/null
@@ -1,93 +0,0 @@
-load("@rules_java//java:defs.bzl", "java_proto_library")
-load("@rules_jvm_external//:defs.bzl", "java_export")
-load("@rules_pkg//:mappings.bzl", "pkg_filegroup", "pkg_files", "strip_prefix")
-load("@rules_proto//proto:defs.bzl", "proto_library")
-load("//:protobuf_version.bzl", "PROTOBUF_JAVA_VERSION")
-load("//java/internal:testing.bzl", "junit_tests")
-
-java_library(
-    name = "util",
-    srcs = glob([
-        "src/main/java/com/google/protobuf/util/*.java",
-    ]),
-    visibility = ["//visibility:public"],
-    deps = [
-        "//java/core",
-        "@maven//:com_google_code_findbugs_jsr305",
-        "@maven//:com_google_code_gson_gson",
-        "@maven//:com_google_errorprone_error_prone_annotations",
-        "@maven//:com_google_guava_guava",
-        "@maven//:com_google_j2objc_j2objc_annotations",
-    ],
-)
-
-# Bazel users, don't depend on this target, use :util.
-java_export(
-    name = "util_mvn",
-    deploy_env = ["//java/core"],
-    maven_coordinates = "com.google.protobuf:protobuf-java-util:%s" % PROTOBUF_JAVA_VERSION,
-    pom_template = "pom_template.xml",
-    tags = ["manual"],
-    visibility = ["//java:__pkg__"],
-    runtime_deps = [":util"],
-)
-
-filegroup(
-    name = "release",
-    srcs = [
-        ":util_mvn-docs",
-        ":util_mvn-maven-source",
-        ":util_mvn-pom",
-        ":util_mvn-project",
-    ],
-    visibility = ["//java:__pkg__"],
-)
-
-proto_library(
-    name = "test_protos",
-    srcs = glob(["src/test/proto/**/*.proto"]),
-    deps = [
-        "//:any_proto",
-        "//:duration_proto",
-        "//:field_mask_proto",
-        "//:struct_proto",
-        "//:timestamp_proto",
-        "//:wrappers_proto",
-    ],
-)
-
-java_proto_library(
-    name = "test_protos_java_proto",
-    deps = [":test_protos"],
-)
-
-junit_tests(
-    name = "tests",
-    package_name = "com.google.protobuf.util",
-    srcs = glob(["src/test/java/**/*.java"]),
-    deps = [
-        ":test_protos_java_proto",
-        ":util",
-        "//java/core",
-        "//java/core:generic_test_protos_java_proto",
-        "@maven//:com_google_code_gson_gson",
-        "@maven//:com_google_guava_guava",
-        "@maven//:com_google_truth_truth",
-        "@maven//:junit_junit",
-    ],
-)
-
-pkg_files(
-    name = "dist_files",
-    srcs = glob([
-        "src/main/**/*.java",
-        "src/test/**/*.java",
-        "src/test/**/*.proto",
-    ]) + [
-        "BUILD.bazel",
-        "pom.xml",
-        "pom_template.xml",
-    ],
-    strip_prefix = strip_prefix.from_root(""),
-    visibility = ["//java:__pkg__"],
-)
diff --git a/libs/protobuf/java/util/pom.xml b/libs/protobuf/java/util/pom.xml
deleted file mode 100644
index c13df65..0000000
--- a/libs/protobuf/java/util/pom.xml
+++ /dev/null
@@ -1,167 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>com.google.protobuf</groupId>
-    <artifactId>protobuf-parent</artifactId>
-    <version>3.21.12</version>
-  </parent>
-
-  <artifactId>protobuf-java-util</artifactId>
-  <packaging>bundle</packaging>
-
-  <name>Protocol Buffers [Util]</name>
-  <description>Utilities for Protocol Buffers</description>
-
-  <dependencies>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>protobuf-java</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.google.errorprone</groupId>
-      <artifactId>error_prone_annotations</artifactId>
-      <version>2.5.1</version>
-    </dependency>
-    <dependency>
-      <groupId>com.google.j2objc</groupId>
-      <artifactId>j2objc-annotations</artifactId>
-      <version>1.3</version>
-    </dependency>
-    <dependency>
-      <groupId>com.google.code.findbugs</groupId>
-      <artifactId>jsr305</artifactId>
-      <version>3.0.2</version>
-    </dependency>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava-testlib</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.code.gson</groupId>
-      <artifactId>gson</artifactId>
-      <version>2.8.9</version>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-core</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.truth</groupId>
-      <artifactId>truth</artifactId>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
-  <properties>
-    <!-- Use the core proto dir so that we can call the core generation script -->
-    <test.proto.dir>../core/src/test/proto</test.proto.dir>
-  </properties>
-
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <executions>
-          <!-- Generate the test protos -->
-          <execution>
-            <id>generate-test-sources</id>
-            <phase>generate-test-sources</phase>
-            <configuration>
-              <target>
-                <!-- Generate all of the test protos from the core module -->
-                <ant antfile="../core/generate-test-sources-build.xml"/>
-
-                <!-- Generate additional test protos for this module -->
-                <exec executable="${protoc}">
-                  <arg value="--java_out=${generated.testsources.dir}"/>
-                  <arg value="--proto_path=${protobuf.source.dir}"/>
-                  <arg value="--proto_path=src/test/proto"/>
-                  <arg value="src/test/proto/com/google/protobuf/util/json_test.proto"/>
-                </exec>
-              </target>
-            </configuration>
-            <goals>
-              <goal>run</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-
-      <!-- Add the generated test sources to the build -->
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>add-generated-test-sources</id>
-            <phase>generate-test-sources</phase>
-            <goals>
-              <goal>add-test-source</goal>
-            </goals>
-            <configuration>
-              <sources>
-                <source>${generated.testsources.dir}</source>
-              </sources>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>animal-sniffer-maven-plugin</artifactId>
-        <configuration>
-          <signature>
-            <groupId>net.sf.androidscents.signature</groupId>
-            <artifactId>android-api-level-19</artifactId>
-            <version>4.4.2_r4</version>
-          </signature>
-        </configuration>
-        <executions>
-          <execution>
-            <id>android</id>
-            <phase>test</phase>
-            <goals>
-              <goal>check</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <!-- Configure the OSGI bundle -->
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <extensions>true</extensions>
-        <configuration>
-          <instructions>
-            <Automatic-Module-Name>com.google.protobuf.util</Automatic-Module-Name> <!-- Java9+ Jigsaw module name -->
-            <Bundle-DocURL>https://developers.google.com/protocol-buffers/</Bundle-DocURL>
-            <Bundle-SymbolicName>com.google.protobuf.util</Bundle-SymbolicName>
-            <Export-Package>com.google.protobuf.util;version=${project.version}</Export-Package>
-          </instructions>
-        </configuration>
-      </plugin>
-
-      <!-- Configure the fat jar to include all dependencies -->
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <configuration>
-          <descriptorRefs>
-            <descriptorRef>jar-with-dependencies</descriptorRef>
-          </descriptorRefs>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-</project>
diff --git a/libs/protobuf/java/util/pom_template.xml b/libs/protobuf/java/util/pom_template.xml
deleted file mode 100644
index b20e62a..0000000
--- a/libs/protobuf/java/util/pom_template.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>{groupId}</groupId>
-    <artifactId>protobuf-parent</artifactId>
-    <version>{version}</version>
-  </parent>
-
-  <artifactId>{artifactId}</artifactId>
-  <packaging>{type}</packaging>
-
-  <name>Protocol Buffers [Util]</name>
-  <description>Utilities for Protocol Buffers</description>
-
-  {dependencies}
-
-</project>
diff --git a/libs/protobuf/java/util/src/main/java/com/google/protobuf/util/Durations.java b/libs/protobuf/java/util/src/main/java/com/google/protobuf/util/Durations.java
deleted file mode 100644
index 1495f09..0000000
--- a/libs/protobuf/java/util/src/main/java/com/google/protobuf/util/Durations.java
+++ /dev/null
@@ -1,481 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf.util;
-
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.math.IntMath.checkedAdd;
-import static com.google.common.math.IntMath.checkedSubtract;
-import static com.google.common.math.LongMath.checkedAdd;
-import static com.google.common.math.LongMath.checkedMultiply;
-import static com.google.common.math.LongMath.checkedSubtract;
-import static com.google.protobuf.util.Timestamps.MICROS_PER_SECOND;
-import static com.google.protobuf.util.Timestamps.MILLIS_PER_SECOND;
-import static com.google.protobuf.util.Timestamps.NANOS_PER_MICROSECOND;
-import static com.google.protobuf.util.Timestamps.NANOS_PER_MILLISECOND;
-import static com.google.protobuf.util.Timestamps.NANOS_PER_SECOND;
-
-import com.google.errorprone.annotations.CanIgnoreReturnValue;
-import com.google.errorprone.annotations.CompileTimeConstant;
-import com.google.protobuf.Duration;
-import java.io.Serializable;
-import java.text.ParseException;
-import java.util.Comparator;
-
-/**
- * Utilities to help create/manipulate {@code protobuf/duration.proto}. All operations throw an
- * {@link IllegalArgumentException} if the input(s) are not {@linkplain #isValid(Duration) valid}.
- */
-public final class Durations {
-  static final long DURATION_SECONDS_MIN = -315576000000L;
-  static final long DURATION_SECONDS_MAX = 315576000000L;
-
-  private static final long SECONDS_PER_MINUTE = 60L;
-  private static final long SECONDS_PER_HOUR = SECONDS_PER_MINUTE * 60;
-  private static final long SECONDS_PER_DAY = SECONDS_PER_HOUR * 24;
-
-  /** A constant holding the minimum valid {@link Duration}, approximately {@code -10,000} years. */
-  public static final Duration MIN_VALUE =
-      Duration.newBuilder().setSeconds(DURATION_SECONDS_MIN).setNanos(-999999999).build();
-
-  /** A constant holding the maximum valid {@link Duration}, approximately {@code +10,000} years. */
-  public static final Duration MAX_VALUE =
-      Duration.newBuilder().setSeconds(DURATION_SECONDS_MAX).setNanos(999999999).build();
-
-  /** A constant holding the duration of zero. */
-  public static final Duration ZERO = Duration.newBuilder().setSeconds(0L).setNanos(0).build();
-
-  private Durations() {}
-
-  private static enum DurationComparator implements Comparator<Duration>, Serializable {
-    INSTANCE;
-
-    @Override
-    public int compare(Duration d1, Duration d2) {
-      checkValid(d1);
-      checkValid(d2);
-      int secDiff = Long.compare(d1.getSeconds(), d2.getSeconds());
-      return (secDiff != 0) ? secDiff : Integer.compare(d1.getNanos(), d2.getNanos());
-    }
-  }
-
-  /**
-   * Returns a {@link Comparator} for {@link Duration}s which sorts in increasing chronological
-   * order. Nulls and invalid {@link Duration}s are not allowed (see {@link #isValid}). The returned
-   * comparator is serializable.
-   */
-  public static Comparator<Duration> comparator() {
-    return DurationComparator.INSTANCE;
-  }
-
-  /**
-   * Compares two durations. The value returned is identical to what would be returned by: {@code
-   * Durations.comparator().compare(x, y)}.
-   *
-   * @return the value {@code 0} if {@code x == y}; a value less than {@code 0} if {@code x < y};
-   *     and a value greater than {@code 0} if {@code x > y}
-   */
-  public static int compare(Duration x, Duration y) {
-    return DurationComparator.INSTANCE.compare(x, y);
-  }
-
-  /**
-   * Returns true if the given {@link Duration} is valid. The {@code seconds} value must be in the
-   * range [-315,576,000,000, +315,576,000,000]. The {@code nanos} value must be in the range
-   * [-999,999,999, +999,999,999].
-   *
-   * <p><b>Note:</b> Durations less than one second are represented with a 0 {@code seconds} field
-   * and a positive or negative {@code nanos} field. For durations of one second or more, a non-zero
-   * value for the {@code nanos} field must be of the same sign as the {@code seconds} field.
-   */
-  public static boolean isValid(Duration duration) {
-    return isValid(duration.getSeconds(), duration.getNanos());
-  }
-
-  /**
-   * Returns true if the given number of seconds and nanos is a valid {@link Duration}. The {@code
-   * seconds} value must be in the range [-315,576,000,000, +315,576,000,000]. The {@code nanos}
-   * value must be in the range [-999,999,999, +999,999,999].
-   *
-   * <p><b>Note:</b> Durations less than one second are represented with a 0 {@code seconds} field
-   * and a positive or negative {@code nanos} field. For durations of one second or more, a non-zero
-   * value for the {@code nanos} field must be of the same sign as the {@code seconds} field.
-   */
-  @SuppressWarnings("GoodTime") // this is a legacy conversion API
-  public static boolean isValid(long seconds, int nanos) {
-    if (seconds < DURATION_SECONDS_MIN || seconds > DURATION_SECONDS_MAX) {
-      return false;
-    }
-    if (nanos < -999999999L || nanos >= NANOS_PER_SECOND) {
-      return false;
-    }
-    if (seconds < 0 || nanos < 0) {
-      if (seconds > 0 || nanos > 0) {
-        return false;
-      }
-    }
-    return true;
-  }
-
-  /** Returns whether the given {@link Duration} is negative or not. */
-  public static boolean isNegative(Duration duration) {
-    checkValid(duration);
-    return (duration.getSeconds() == 0) ? duration.getNanos() < 0 : duration.getSeconds() < 0;
-  }
-
-  /** Returns whether the given {@link Duration} is positive or not. */
-  public static boolean isPositive(Duration duration) {
-    checkValid(duration);
-    return !isNegative(duration) && !duration.equals(ZERO);
-  }
-
-  /**
-   * Ensures that the given {@link Duration} is not negative.
-   *
-   * @throws IllegalArgumentException if {@code duration} is negative or invalid
-   * @throws NullPointerException if {@code duration} is {@code null}
-   */
-  @CanIgnoreReturnValue
-  public static Duration checkNotNegative(Duration duration) {
-    checkArgument(!isNegative(duration), "duration (%s) must not be negative", toString(duration));
-    return duration;
-  }
-
-  /**
-   * Ensures that the given {@link Duration} is positive.
-   *
-   * @throws IllegalArgumentException if {@code duration} is negative, {@code ZERO}, or invalid
-   * @throws NullPointerException if {@code duration} is {@code null}
-   */
-  @CanIgnoreReturnValue
-  public static Duration checkPositive(Duration duration) {
-    checkArgument(isPositive(duration), "duration (%s) must be positive", toString(duration));
-    return duration;
-  }
-
-  /** Throws an {@link IllegalArgumentException} if the given {@link Duration} is not valid. */
-  @CanIgnoreReturnValue
-  public static Duration checkValid(Duration duration) {
-    long seconds = duration.getSeconds();
-    int nanos = duration.getNanos();
-    if (!isValid(seconds, nanos)) {
-      throw new IllegalArgumentException(
-          String.format(
-              "Duration is not valid. See proto definition for valid values. "
-                  + "Seconds (%s) must be in range [-315,576,000,000, +315,576,000,000]. "
-                  + "Nanos (%s) must be in range [-999,999,999, +999,999,999]. "
-                  + "Nanos must have the same sign as seconds",
-              seconds, nanos));
-    }
-    return duration;
-  }
-
-  /**
-   * Builds the given builder and throws an {@link IllegalArgumentException} if it is not valid. See
-   * {@link #checkValid(Duration)}.
-   *
-   * @return A valid, built {@link Duration}.
-   */
-  public static Duration checkValid(Duration.Builder durationBuilder) {
-    return checkValid(durationBuilder.build());
-  }
-
-  /**
-   * Convert Duration to string format. The string format will contains 3, 6, or 9 fractional digits
-   * depending on the precision required to represent the exact Duration value. For example: "1s",
-   * "1.010s", "1.000000100s", "-3.100s" The range that can be represented by Duration is from
-   * -315,576,000,000 to +315,576,000,000 inclusive (in seconds).
-   *
-   * @return The string representation of the given duration.
-   * @throws IllegalArgumentException if the given duration is not in the valid range.
-   */
-  public static String toString(Duration duration) {
-    checkValid(duration);
-
-    long seconds = duration.getSeconds();
-    int nanos = duration.getNanos();
-
-    StringBuilder result = new StringBuilder();
-    if (seconds < 0 || nanos < 0) {
-      result.append("-");
-      seconds = -seconds;
-      nanos = -nanos;
-    }
-    result.append(seconds);
-    if (nanos != 0) {
-      result.append(".");
-      result.append(Timestamps.formatNanos(nanos));
-    }
-    result.append("s");
-    return result.toString();
-  }
-
-  /**
-   * Parse a string to produce a duration.
-   *
-   * @return a Duration parsed from the string
-   * @throws ParseException if the string is not in the duration format
-   */
-  public static Duration parse(String value) throws ParseException {
-    // Must end with "s".
-    if (value.isEmpty() || value.charAt(value.length() - 1) != 's') {
-      throw new ParseException("Invalid duration string: " + value, 0);
-    }
-    boolean negative = false;
-    if (value.charAt(0) == '-') {
-      negative = true;
-      value = value.substring(1);
-    }
-    String secondValue = value.substring(0, value.length() - 1);
-    String nanoValue = "";
-    int pointPosition = secondValue.indexOf('.');
-    if (pointPosition != -1) {
-      nanoValue = secondValue.substring(pointPosition + 1);
-      secondValue = secondValue.substring(0, pointPosition);
-    }
-    long seconds = Long.parseLong(secondValue);
-    int nanos = nanoValue.isEmpty() ? 0 : Timestamps.parseNanos(nanoValue);
-    if (seconds < 0) {
-      throw new ParseException("Invalid duration string: " + value, 0);
-    }
-    if (negative) {
-      seconds = -seconds;
-      nanos = -nanos;
-    }
-    try {
-      return normalizedDuration(seconds, nanos);
-    } catch (IllegalArgumentException e) {
-      ParseException ex = new ParseException("Duration value is out of range.", 0);
-      ex.initCause(e);
-      throw ex;
-    }
-  }
-
-  /**
-   * Parses a string in RFC 3339 format into a {@link Duration}.
-   *
-   * <p>Identical to {@link #parse(String)}, but throws an {@link IllegalArgumentException} instead
-   * of a {@link ParseException} if parsing fails.
-   *
-   * @return a {@link Duration} parsed from the string
-   * @throws IllegalArgumentException if parsing fails
-   */
-  public static Duration parseUnchecked(@CompileTimeConstant String value) {
-    try {
-      return parse(value);
-    } catch (ParseException e) {
-      // While `java.time.format.DateTimeParseException` is a more accurate representation of the
-      // failure, this library is currently not JDK8 ready because of Android dependencies.
-      throw new IllegalArgumentException(e);
-    }
-  }
-
-  // Static factories
-
-  /** Create a Duration from the number of days. */
-  @SuppressWarnings("GoodTime") // this is a legacy conversion API
-  public static Duration fromDays(long days) {
-    return Duration.newBuilder()
-        .setSeconds(checkedMultiply(days, SECONDS_PER_DAY))
-        .setNanos(0)
-        .build();
-  }
-
-  /** Create a Duration from the number of hours. */
-  @SuppressWarnings("GoodTime") // this is a legacy conversion API
-  public static Duration fromHours(long hours) {
-    return Duration.newBuilder()
-        .setSeconds(checkedMultiply(hours, SECONDS_PER_HOUR))
-        .setNanos(0)
-        .build();
-  }
-
-  /** Create a Duration from the number of minutes. */
-  @SuppressWarnings("GoodTime") // this is a legacy conversion API
-  public static Duration fromMinutes(long minutes) {
-    return Duration.newBuilder()
-        .setSeconds(checkedMultiply(minutes, SECONDS_PER_MINUTE))
-        .setNanos(0)
-        .build();
-  }
-
-  /** Create a Duration from the number of seconds. */
-  @SuppressWarnings("GoodTime") // this is a legacy conversion API
-  public static Duration fromSeconds(long seconds) {
-    return normalizedDuration(seconds, 0);
-  }
-
-  /** Create a Duration from the number of milliseconds. */
-  @SuppressWarnings("GoodTime") // this is a legacy conversion API
-  public static Duration fromMillis(long milliseconds) {
-    return normalizedDuration(
-        milliseconds / MILLIS_PER_SECOND,
-        (int) (milliseconds % MILLIS_PER_SECOND * NANOS_PER_MILLISECOND));
-  }
-
-  /** Create a Duration from the number of microseconds. */
-  @SuppressWarnings("GoodTime") // this is a legacy conversion API
-  public static Duration fromMicros(long microseconds) {
-    return normalizedDuration(
-        microseconds / MICROS_PER_SECOND,
-        (int) (microseconds % MICROS_PER_SECOND * NANOS_PER_MICROSECOND));
-  }
-
-  /** Create a Duration from the number of nanoseconds. */
-  @SuppressWarnings("GoodTime") // this is a legacy conversion API
-  public static Duration fromNanos(long nanoseconds) {
-    return normalizedDuration(
-        nanoseconds / NANOS_PER_SECOND, (int) (nanoseconds % NANOS_PER_SECOND));
-  }
-
-  // Conversion APIs
-
-  /**
-   * Convert a Duration to the number of days. The result will be rounded towards 0 to the nearest
-   * day.
-   */
-  @SuppressWarnings("GoodTime") // this is a legacy conversion API
-  public static long toDays(Duration duration) {
-    return checkValid(duration).getSeconds() / SECONDS_PER_DAY;
-  }
-
-  /**
-   * Convert a Duration to the number of hours. The result will be rounded towards 0 to the nearest
-   * hour.
-   */
-  @SuppressWarnings("GoodTime") // this is a legacy conversion API
-  public static long toHours(Duration duration) {
-    return checkValid(duration).getSeconds() / SECONDS_PER_HOUR;
-  }
-
-  /**
-   * Convert a Duration to the number of minutes. The result will be rounded towards 0 to the
-   * nearest minute.
-   */
-  @SuppressWarnings("GoodTime") // this is a legacy conversion API
-  public static long toMinutes(Duration duration) {
-    return checkValid(duration).getSeconds() / SECONDS_PER_MINUTE;
-  }
-
-  /**
-   * Convert a Duration to the number of seconds. The result will be rounded towards 0 to the
-   * nearest second. E.g., if the duration represents -1 nanosecond, it will be rounded to 0.
-   */
-  @SuppressWarnings("GoodTime") // this is a legacy conversion API
-  public static long toSeconds(Duration duration) {
-    return checkValid(duration).getSeconds();
-  }
-
-  /**
-   * Returns the number of seconds of the given duration as a {@code double}. This method should be
-   * used to accommodate APIs that <b>only</b> accept durations as {@code double} values.
-   *
-   * <p>This conversion may lose precision.
-   *
-   * <p>If you need the number of seconds in this duration as a {@code long} (not a {@code double}),
-   * simply use {@code duration.getSeconds()} or {@link #toSeconds} (which includes validation).
-   */
-  @SuppressWarnings({
-    "DurationSecondsToDouble", // that's the whole point of this method
-    "GoodTime" // this is a legacy conversion API
-  })
-  public static double toSecondsAsDouble(Duration duration) {
-    checkValid(duration);
-    return duration.getSeconds() + duration.getNanos() / 1e9;
-  }
-
-  /**
-   * Convert a Duration to the number of milliseconds. The result will be rounded towards 0 to the
-   * nearest millisecond. E.g., if the duration represents -1 nanosecond, it will be rounded to 0.
-   */
-  @SuppressWarnings("GoodTime") // this is a legacy conversion API
-  public static long toMillis(Duration duration) {
-    checkValid(duration);
-    return checkedAdd(
-        checkedMultiply(duration.getSeconds(), MILLIS_PER_SECOND),
-        duration.getNanos() / NANOS_PER_MILLISECOND);
-  }
-
-  /**
-   * Convert a Duration to the number of microseconds. The result will be rounded towards 0 to the
-   * nearest microseconds. E.g., if the duration represents -1 nanosecond, it will be rounded to 0.
-   */
-  @SuppressWarnings("GoodTime") // this is a legacy conversion API
-  public static long toMicros(Duration duration) {
-    checkValid(duration);
-    return checkedAdd(
-        checkedMultiply(duration.getSeconds(), MICROS_PER_SECOND),
-        duration.getNanos() / NANOS_PER_MICROSECOND);
-  }
-
-  /** Convert a Duration to the number of nanoseconds. */
-  @SuppressWarnings("GoodTime") // this is a legacy conversion API
-  public static long toNanos(Duration duration) {
-    checkValid(duration);
-    return checkedAdd(
-        checkedMultiply(duration.getSeconds(), NANOS_PER_SECOND), duration.getNanos());
-  }
-
-  // Math operations
-
-  /** Add two durations. */
-  public static Duration add(Duration d1, Duration d2) {
-    checkValid(d1);
-    checkValid(d2);
-    return normalizedDuration(
-        checkedAdd(d1.getSeconds(), d2.getSeconds()), checkedAdd(d1.getNanos(), d2.getNanos()));
-  }
-
-  /** Subtract a duration from another. */
-  public static Duration subtract(Duration d1, Duration d2) {
-    checkValid(d1);
-    checkValid(d2);
-    return normalizedDuration(
-        checkedSubtract(d1.getSeconds(), d2.getSeconds()),
-        checkedSubtract(d1.getNanos(), d2.getNanos()));
-  }
-
-  static Duration normalizedDuration(long seconds, int nanos) {
-    if (nanos <= -NANOS_PER_SECOND || nanos >= NANOS_PER_SECOND) {
-      seconds = checkedAdd(seconds, nanos / NANOS_PER_SECOND);
-      nanos %= NANOS_PER_SECOND;
-    }
-    if (seconds > 0 && nanos < 0) {
-      nanos += NANOS_PER_SECOND; // no overflow since nanos is negative (and we're adding)
-      seconds--; // no overflow since seconds is positive (and we're decrementing)
-    }
-    if (seconds < 0 && nanos > 0) {
-      nanos -= NANOS_PER_SECOND; // no overflow since nanos is positive (and we're subtracting)
-      seconds++; // no overflow since seconds is negative (and we're incrementing)
-    }
-    Duration duration = Duration.newBuilder().setSeconds(seconds).setNanos(nanos).build();
-    return checkValid(duration);
-  }
-}
diff --git a/libs/protobuf/java/util/src/main/java/com/google/protobuf/util/FieldMaskTree.java b/libs/protobuf/java/util/src/main/java/com/google/protobuf/util/FieldMaskTree.java
deleted file mode 100644
index 093740d..0000000
--- a/libs/protobuf/java/util/src/main/java/com/google/protobuf/util/FieldMaskTree.java
+++ /dev/null
@@ -1,339 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf.util;
-
-import com.google.common.base.Splitter;
-import com.google.errorprone.annotations.CanIgnoreReturnValue;
-import com.google.protobuf.Descriptors.Descriptor;
-import com.google.protobuf.Descriptors.FieldDescriptor;
-import com.google.protobuf.FieldMask;
-import com.google.protobuf.GeneratedMessage;
-import com.google.protobuf.Message;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map.Entry;
-import java.util.SortedMap;
-import java.util.TreeMap;
-import java.util.logging.Logger;
-
-/**
- * A tree representation of a FieldMask. Each leaf node in this tree represent a field path in the
- * FieldMask.
- *
- * <p>For example, FieldMask "foo.bar,foo.baz,bar.baz" as a tree will be:
- *
- * <pre>
- *   [root] -+- foo -+- bar
- *           |       |
- *           |       +- baz
- *           |
- *           +- bar --- baz
- * </pre>
- *
- * <p>By representing FieldMasks with this tree structure we can easily convert a FieldMask to a
- * canonical form, merge two FieldMasks, calculate the intersection to two FieldMasks and traverse
- * all fields specified by the FieldMask in a message tree.
- */
-final class FieldMaskTree {
-  private static final Logger logger = Logger.getLogger(FieldMaskTree.class.getName());
-
-  private static final String FIELD_PATH_SEPARATOR_REGEX = "\\.";
-
-  private static final class Node {
-    final SortedMap<String, Node> children = new TreeMap<>();
-  }
-
-  private final Node root = new Node();
-
-  /** Creates an empty FieldMaskTree. */
-  FieldMaskTree() {}
-
-  /** Creates a FieldMaskTree for a given FieldMask. */
-  FieldMaskTree(FieldMask mask) {
-    mergeFromFieldMask(mask);
-  }
-
-  @Override
-  public String toString() {
-    return FieldMaskUtil.toString(toFieldMask());
-  }
-
-  /**
-   * Adds a field path to the tree. In a FieldMask, every field path matches the specified field as
-   * well as all its sub-fields. For example, a field path "foo.bar" matches field "foo.bar" and
-   * also "foo.bar.baz", etc. When adding a field path to the tree, redundant sub-paths will be
-   * removed. That is, after adding "foo.bar" to the tree, "foo.bar.baz" will be removed if it
-   * exists, which will turn the tree node for "foo.bar" to a leaf node. Likewise, if the field path
-   * to add is a sub-path of an existing leaf node, nothing will be changed in the tree.
-   */
-  @CanIgnoreReturnValue
-  @SuppressWarnings("StringSplitter")
-  FieldMaskTree addFieldPath(String path) {
-    String[] parts = path.split(FIELD_PATH_SEPARATOR_REGEX);
-    if (parts.length == 0) {
-      return this;
-    }
-    Node node = root;
-    boolean createNewBranch = false;
-    // Find the matching node in the tree.
-    for (String part : parts) {
-      // Check whether the path matches an existing leaf node.
-      if (!createNewBranch && node != root && node.children.isEmpty()) {
-        // The path to add is a sub-path of an existing leaf node.
-        return this;
-      }
-      if (node.children.containsKey(part)) {
-        node = node.children.get(part);
-      } else {
-        createNewBranch = true;
-        Node tmp = new Node();
-        node.children.put(part, tmp);
-        node = tmp;
-      }
-    }
-    // Turn the matching node into a leaf node (i.e., remove sub-paths).
-    node.children.clear();
-    return this;
-  }
-
-  /** Merges all field paths in a FieldMask into this tree. */
-  @CanIgnoreReturnValue
-  FieldMaskTree mergeFromFieldMask(FieldMask mask) {
-    for (String path : mask.getPathsList()) {
-      addFieldPath(path);
-    }
-    return this;
-  }
-
-  /**
-   * Removes {@code path} from the tree.
-   *
-   * <ul>
-   *   When removing a field path from the tree:
-   *   <li>All sub-paths will be removed. That is, after removing "foo.bar" from the tree,
-   *       "foo.bar.baz" will be removed.
-   *   <li>If all children of a node have been removed, the node itself will be removed as well.
-   *       That is, if "foo" only has one child "bar" and "foo.bar" only has one child "baz",
-   *       removing "foo.bar.barz" would remove both "foo" and "foo.bar". If "foo" has both "bar"
-   *       and "moo" as children, removing "foo.bar" would leave the path "foo.moo" intact.
-   *   <li>If the field path to remove is a non-exist sub-path, nothing will be changed.
-   * </ul>
-   */
-  @CanIgnoreReturnValue
-  FieldMaskTree removeFieldPath(String path) {
-    List<String> parts = Splitter.onPattern(FIELD_PATH_SEPARATOR_REGEX).splitToList(path);
-    if (parts.isEmpty()) {
-      return this;
-    }
-    removeFieldPath(root, parts, 0);
-    return this;
-  }
-
-  /**
-   * Removes {@code parts} from {@code node} recursively.
-   *
-   * @return a boolean value indicating whether current {@code node} should be removed.
-   */
-  @CanIgnoreReturnValue
-  private static boolean removeFieldPath(Node node, List<String> parts, int index) {
-    String key = parts.get(index);
-
-    // Base case 1: path not match.
-    if (!node.children.containsKey(key)) {
-      return false;
-    }
-    // Base case 2: last element in parts.
-    if (index == parts.size() - 1) {
-      node.children.remove(key);
-      return node.children.isEmpty();
-    }
-    // Recursive remove sub-path.
-    if (removeFieldPath(node.children.get(key), parts, index + 1)) {
-      node.children.remove(key);
-    }
-    return node.children.isEmpty();
-  }
-
-  /** Removes all field paths in {@code mask} from this tree. */
-  @CanIgnoreReturnValue
-  FieldMaskTree removeFromFieldMask(FieldMask mask) {
-    for (String path : mask.getPathsList()) {
-      removeFieldPath(path);
-    }
-    return this;
-  }
-
-  /** Converts this tree to a FieldMask. */
-  FieldMask toFieldMask() {
-    if (root.children.isEmpty()) {
-      return FieldMask.getDefaultInstance();
-    }
-    List<String> paths = new ArrayList<>();
-    getFieldPaths(root, "", paths);
-    return FieldMask.newBuilder().addAllPaths(paths).build();
-  }
-
-  /** Gathers all field paths in a sub-tree. */
-  private static void getFieldPaths(Node node, String path, List<String> paths) {
-    if (node.children.isEmpty()) {
-      paths.add(path);
-      return;
-    }
-    for (Entry<String, Node> entry : node.children.entrySet()) {
-      String childPath = path.isEmpty() ? entry.getKey() : path + "." + entry.getKey();
-      getFieldPaths(entry.getValue(), childPath, paths);
-    }
-  }
-
-  /** Adds the intersection of this tree with the given {@code path} to {@code output}. */
-  void intersectFieldPath(String path, FieldMaskTree output) {
-    if (root.children.isEmpty()) {
-      return;
-    }
-    String[] parts = path.split(FIELD_PATH_SEPARATOR_REGEX);
-    if (parts.length == 0) {
-      return;
-    }
-    Node node = root;
-    for (String part : parts) {
-      if (node != root && node.children.isEmpty()) {
-        // The given path is a sub-path of an existing leaf node in the tree.
-        output.addFieldPath(path);
-        return;
-      }
-      if (node.children.containsKey(part)) {
-        node = node.children.get(part);
-      } else {
-        return;
-      }
-    }
-    // We found a matching node for the path. All leaf children of this matching
-    // node is in the intersection.
-    List<String> paths = new ArrayList<>();
-    getFieldPaths(node, path, paths);
-    for (String value : paths) {
-      output.addFieldPath(value);
-    }
-  }
-
-  /**
-   * Merges all fields specified by this FieldMaskTree from {@code source} to {@code destination}.
-   */
-  void merge(Message source, Message.Builder destination, FieldMaskUtil.MergeOptions options) {
-    if (source.getDescriptorForType() != destination.getDescriptorForType()) {
-      throw new IllegalArgumentException("Cannot merge messages of different types.");
-    }
-    if (root.children.isEmpty()) {
-      return;
-    }
-    merge(root, source, destination, options);
-  }
-
-  /** Merges all fields specified by a sub-tree from {@code source} to {@code destination}. */
-  private static void merge(
-      Node node, Message source, Message.Builder destination, FieldMaskUtil.MergeOptions options) {
-    if (source.getDescriptorForType() != destination.getDescriptorForType()) {
-      throw new IllegalArgumentException(
-          String.format(
-              "source (%s) and destination (%s) descriptor must be equal",
-              source.getDescriptorForType().getFullName(),
-              destination.getDescriptorForType().getFullName()));
-    }
-
-    Descriptor descriptor = source.getDescriptorForType();
-    for (Entry<String, Node> entry : node.children.entrySet()) {
-      FieldDescriptor field = descriptor.findFieldByName(entry.getKey());
-      if (field == null) {
-        logger.warning(
-            "Cannot find field \""
-                + entry.getKey()
-                + "\" in message type "
-                + descriptor.getFullName());
-        continue;
-      }
-      if (!entry.getValue().children.isEmpty()) {
-        if (field.isRepeated() || field.getJavaType() != FieldDescriptor.JavaType.MESSAGE) {
-          logger.warning(
-              "Field \""
-                  + field.getFullName()
-                  + "\" is not a "
-                  + "singular message field and cannot have sub-fields.");
-          continue;
-        }
-        if (!source.hasField(field) && !destination.hasField(field)) {
-          // If the message field is not present in both source and destination, skip recursing
-          // so we don't create unnecessary empty messages.
-          continue;
-        }
-        // This is a mess because of java proto API 1 still hanging around.
-        Message.Builder childBuilder =
-            destination instanceof GeneratedMessage.Builder
-                ? destination.getFieldBuilder(field)
-                : ((Message) destination.getField(field)).toBuilder();
-        merge(entry.getValue(), (Message) source.getField(field), childBuilder, options);
-        destination.setField(field, childBuilder.buildPartial());
-        continue;
-      }
-      if (field.isRepeated()) {
-        if (options.replaceRepeatedFields()) {
-          destination.setField(field, source.getField(field));
-        } else {
-          for (Object element : (List) source.getField(field)) {
-            destination.addRepeatedField(field, element);
-          }
-        }
-      } else {
-        if (field.getJavaType() == FieldDescriptor.JavaType.MESSAGE) {
-          if (options.replaceMessageFields()) {
-            if (!source.hasField(field)) {
-              destination.clearField(field);
-            } else {
-              destination.setField(field, source.getField(field));
-            }
-          } else {
-            if (source.hasField(field)) {
-              destination.setField(
-                  field,
-                  ((Message) destination.getField(field))
-                      .toBuilder().mergeFrom((Message) source.getField(field)).build());
-            }
-          }
-        } else {
-          if (source.hasField(field) || !options.replacePrimitiveFields()) {
-            destination.setField(field, source.getField(field));
-          } else {
-            destination.clearField(field);
-          }
-        }
-      }
-    }
-  }
-}
diff --git a/libs/protobuf/java/util/src/main/java/com/google/protobuf/util/FieldMaskUtil.java b/libs/protobuf/java/util/src/main/java/com/google/protobuf/util/FieldMaskUtil.java
deleted file mode 100644
index 9f36494..0000000
--- a/libs/protobuf/java/util/src/main/java/com/google/protobuf/util/FieldMaskUtil.java
+++ /dev/null
@@ -1,410 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf.util;
-
-import static com.google.common.base.Preconditions.checkArgument;
-
-import com.google.common.base.CaseFormat;
-import com.google.common.base.Joiner;
-import com.google.common.base.Optional;
-import com.google.common.base.Splitter;
-import com.google.common.primitives.Ints;
-import com.google.errorprone.annotations.CanIgnoreReturnValue;
-import com.google.protobuf.Descriptors.Descriptor;
-import com.google.protobuf.Descriptors.FieldDescriptor;
-import com.google.protobuf.FieldMask;
-import com.google.protobuf.Internal;
-import com.google.protobuf.Message;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import javax.annotation.Nullable;
-
-/**
- * Utility helper functions to work with {@link com.google.protobuf.FieldMask}.
- */
-public final class FieldMaskUtil {
-  private static final String FIELD_PATH_SEPARATOR = ",";
-  private static final String FIELD_PATH_SEPARATOR_REGEX = ",";
-  private static final String FIELD_SEPARATOR_REGEX = "\\.";
-
-  private FieldMaskUtil() {}
-
-  /**
-   * Converts a FieldMask to a string.
-   */
-  public static String toString(FieldMask fieldMask) {
-    // TODO(xiaofeng): Consider using com.google.common.base.Joiner here instead.
-    StringBuilder result = new StringBuilder();
-    boolean first = true;
-    for (String value : fieldMask.getPathsList()) {
-      if (value.isEmpty()) {
-        // Ignore empty paths.
-        continue;
-      }
-      if (first) {
-        first = false;
-      } else {
-        result.append(FIELD_PATH_SEPARATOR);
-      }
-      result.append(value);
-    }
-    return result.toString();
-  }
-
-  /**
-   * Parses from a string to a FieldMask.
-   */
-  public static FieldMask fromString(String value) {
-    // TODO(xiaofeng): Consider using com.google.common.base.Splitter here instead.
-    return fromStringList(Arrays.asList(value.split(FIELD_PATH_SEPARATOR_REGEX)));
-  }
-
-  /**
-   * Parses from a string to a FieldMask and validates all field paths.
-   *
-   * @throws IllegalArgumentException if any of the field path is invalid.
-   */
-  public static FieldMask fromString(Class<? extends Message> type, String value) {
-    // TODO(xiaofeng): Consider using com.google.common.base.Splitter here instead.
-    return fromStringList(type, Arrays.asList(value.split(FIELD_PATH_SEPARATOR_REGEX)));
-  }
-
-  /**
-   * Constructs a FieldMask for a list of field paths in a certain type.
-   *
-   * @throws IllegalArgumentException if any of the field path is not valid.
-   */
-  // TODO(xiaofeng): Consider renaming fromStrings()
-  public static FieldMask fromStringList(Class<? extends Message> type, Iterable<String> paths) {
-    return fromStringList(Internal.getDefaultInstance(type).getDescriptorForType(), paths);
-  }
-
-  /**
-   * Constructs a FieldMask for a list of field paths in a certain type.
-   *
-   * @throws IllegalArgumentException if any of the field path is not valid.
-   */
-  public static FieldMask fromStringList(Descriptor descriptor, Iterable<String> paths) {
-    return fromStringList(Optional.of(descriptor), paths);
-  }
-
-  /**
-   * Constructs a FieldMask for a list of field paths in a certain type. Does not validate the given
-   * paths.
-   */
-  public static FieldMask fromStringList(Iterable<String> paths) {
-    return fromStringList(Optional.<Descriptor>absent(), paths);
-  }
-
-  private static FieldMask fromStringList(Optional<Descriptor> descriptor, Iterable<String> paths) {
-    FieldMask.Builder builder = FieldMask.newBuilder();
-    for (String path : paths) {
-      if (path.isEmpty()) {
-        // Ignore empty field paths.
-        continue;
-      }
-      if (descriptor.isPresent() && !isValid(descriptor.get(), path)) {
-        throw new IllegalArgumentException(
-            path + " is not a valid path for " + descriptor.get().getFullName());
-      }
-      builder.addPaths(path);
-    }
-    return builder.build();
-  }
-
-  /**
-   * Constructs a FieldMask from the passed field numbers.
-   *
-   * @throws IllegalArgumentException if any of the fields are invalid for the message.
-   */
-  public static FieldMask fromFieldNumbers(Class<? extends Message> type, int... fieldNumbers) {
-    return fromFieldNumbers(type, Ints.asList(fieldNumbers));
-  }
-
-  /**
-   * Constructs a FieldMask from the passed field numbers.
-   *
-   * @throws IllegalArgumentException if any of the fields are invalid for the message.
-   */
-  public static FieldMask fromFieldNumbers(
-      Class<? extends Message> type, Iterable<Integer> fieldNumbers) {
-    Descriptor descriptor = Internal.getDefaultInstance(type).getDescriptorForType();
-
-    FieldMask.Builder builder = FieldMask.newBuilder();
-    for (Integer fieldNumber : fieldNumbers) {
-      FieldDescriptor field = descriptor.findFieldByNumber(fieldNumber);
-      checkArgument(
-          field != null,
-          String.format("%s is not a valid field number for %s.", fieldNumber, type));
-      builder.addPaths(field.getName());
-    }
-    return builder.build();
-  }
-
-  /**
-   * Converts a field mask to a Proto3 JSON string, that is converting from snake case to camel
-   * case and joining all paths into one string with commas.
-   */
-  public static String toJsonString(FieldMask fieldMask) {
-    List<String> paths = new ArrayList<String>(fieldMask.getPathsCount());
-    for (String path : fieldMask.getPathsList()) {
-      if (path.isEmpty()) {
-        continue;
-      }
-      paths.add(CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, path));
-    }
-    return Joiner.on(FIELD_PATH_SEPARATOR).join(paths);
-  }
-
-  /**
-   * Converts a field mask from a Proto3 JSON string, that is splitting the paths along commas and
-   * converting from camel case to snake case.
-   */
-  public static FieldMask fromJsonString(String value) {
-    Iterable<String> paths = Splitter.on(FIELD_PATH_SEPARATOR).split(value);
-    FieldMask.Builder builder = FieldMask.newBuilder();
-    for (String path : paths) {
-      if (path.isEmpty()) {
-        continue;
-      }
-      builder.addPaths(CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, path));
-    }
-    return builder.build();
-  }
-
-  /**
-   * Checks whether paths in a given fields mask are valid.
-   */
-  public static boolean isValid(Class<? extends Message> type, FieldMask fieldMask) {
-    Descriptor descriptor = Internal.getDefaultInstance(type).getDescriptorForType();
-
-    return isValid(descriptor, fieldMask);
-  }
-
-  /**
-   * Checks whether paths in a given fields mask are valid.
-   */
-  public static boolean isValid(Descriptor descriptor, FieldMask fieldMask) {
-    for (String path : fieldMask.getPathsList()) {
-      if (!isValid(descriptor, path)) {
-        return false;
-      }
-    }
-    return true;
-  }
-
-  /**
-   * Checks whether a given field path is valid.
-   */
-  public static boolean isValid(Class<? extends Message> type, String path) {
-    Descriptor descriptor = Internal.getDefaultInstance(type).getDescriptorForType();
-
-    return isValid(descriptor, path);
-  }
-
-  /** Checks whether paths in a given fields mask are valid. */
-  public static boolean isValid(@Nullable Descriptor descriptor, String path) {
-    String[] parts = path.split(FIELD_SEPARATOR_REGEX);
-    if (parts.length == 0) {
-      return false;
-    }
-    for (String name : parts) {
-      if (descriptor == null) {
-        return false;
-      }
-      FieldDescriptor field = descriptor.findFieldByName(name);
-      if (field == null) {
-        return false;
-      }
-      if (!field.isRepeated() && field.getJavaType() == FieldDescriptor.JavaType.MESSAGE) {
-        descriptor = field.getMessageType();
-      } else {
-        descriptor = null;
-      }
-    }
-    return true;
-  }
-
-  /**
-   * Converts a FieldMask to its canonical form. In the canonical form of a
-   * FieldMask, all field paths are sorted alphabetically and redundant field
-   * paths are removed.
-   */
-  public static FieldMask normalize(FieldMask mask) {
-    return new FieldMaskTree(mask).toFieldMask();
-  }
-
-  /**
-   * Creates a union of two or more FieldMasks.
-   */
-  public static FieldMask union(
-      FieldMask firstMask, FieldMask secondMask, FieldMask... otherMasks) {
-    FieldMaskTree maskTree = new FieldMaskTree(firstMask).mergeFromFieldMask(secondMask);
-    for (FieldMask mask : otherMasks) {
-      maskTree.mergeFromFieldMask(mask);
-    }
-    return maskTree.toFieldMask();
-  }
-
-  /**
-   * Subtracts {@code secondMask} and {@code otherMasks} from {@code firstMask}.
-   *
-   * <p>This method disregards proto structure. That is, if {@code firstMask} is "foo" and {@code
-   * secondMask} is "foo.bar", the response will always be "foo" without considering the internal
-   * proto structure of message "foo".
-   */
-  public static FieldMask subtract(
-      FieldMask firstMask, FieldMask secondMask, FieldMask... otherMasks) {
-    FieldMaskTree maskTree = new FieldMaskTree(firstMask).removeFromFieldMask(secondMask);
-    for (FieldMask mask : otherMasks) {
-      maskTree.removeFromFieldMask(mask);
-    }
-    return maskTree.toFieldMask();
-  }
-
-  /**
-   * Calculates the intersection of two FieldMasks.
-   */
-  public static FieldMask intersection(FieldMask mask1, FieldMask mask2) {
-    FieldMaskTree tree = new FieldMaskTree(mask1);
-    FieldMaskTree result = new FieldMaskTree();
-    for (String path : mask2.getPathsList()) {
-      tree.intersectFieldPath(path, result);
-    }
-    return result.toFieldMask();
-  }
-
-  /**
-   * Options to customize merging behavior.
-   */
-  public static final class MergeOptions {
-    private boolean replaceMessageFields = false;
-    private boolean replaceRepeatedFields = false;
-    // TODO(b/28277137): change the default behavior to always replace primitive fields after
-    // fixing all failing TAP tests.
-    private boolean replacePrimitiveFields = false;
-
-    /**
-     * Whether to replace message fields (i.e., discard existing content in
-     * destination message fields).
-     */
-    public boolean replaceMessageFields() {
-      return replaceMessageFields;
-    }
-
-    /**
-     * Whether to replace repeated fields (i.e., discard existing content in
-     * destination repeated fields).
-     */
-    public boolean replaceRepeatedFields() {
-      return replaceRepeatedFields;
-    }
-
-    /**
-     * Whether to replace primitive (non-repeated and non-message) fields in
-     * destination message fields with the source primitive fields (i.e., clear
-     * destination field if source field is not set).
-     */
-    public boolean replacePrimitiveFields() {
-      return replacePrimitiveFields;
-    }
-
-    /**
-     * Specify whether to replace message fields. Defaults to false.
-     *
-     * <p>If true, discard existing content in destination message fields when merging.
-     *
-     * <p>If false, merge the source message field into the destination message field.
-     */
-    @CanIgnoreReturnValue
-    public MergeOptions setReplaceMessageFields(boolean value) {
-      replaceMessageFields = value;
-      return this;
-    }
-
-    /**
-     * Specify whether to replace repeated fields. Defaults to false.
-     *
-     * <p>If true, discard existing content in destination repeated fields) when merging.
-     *
-     * <p>If false, append elements from source repeated field to the destination repeated field.
-     */
-    @CanIgnoreReturnValue
-    public MergeOptions setReplaceRepeatedFields(boolean value) {
-      replaceRepeatedFields = value;
-      return this;
-    }
-
-    /**
-     * Specify whether to replace primitive (non-repeated and non-message) fields in destination
-     * message fields with the source primitive fields. Defaults to false.
-     *
-     * <p>If true, set the value of the destination primitive field to the source primitive field if
-     * the source field is set, but clear the destination field otherwise.
-     *
-     * <p>If false, always set the value of the destination primitive field to the source primitive
-     * field, and if the source field is unset, the default value of the source field is copied to
-     * the destination.
-     */
-    @CanIgnoreReturnValue
-    public MergeOptions setReplacePrimitiveFields(boolean value) {
-      replacePrimitiveFields = value;
-      return this;
-    }
-  }
-
-  /**
-   * Merges fields specified by a FieldMask from one message to another with the specified merge
-   * options. The destination will remain unchanged if an empty FieldMask is provided.
-   */
-  public static void merge(
-      FieldMask mask, Message source, Message.Builder destination, MergeOptions options) {
-    new FieldMaskTree(mask).merge(source, destination, options);
-  }
-
-  /**
-   * Merges fields specified by a FieldMask from one message to another.
-   */
-  public static void merge(FieldMask mask, Message source, Message.Builder destination) {
-    merge(mask, source, destination, new MergeOptions());
-  }
-
-  /**
-   * Returns the result of keeping only the masked fields of the given proto.
-   */
-  @SuppressWarnings("unchecked")
-  public static <P extends Message> P trim(FieldMask mask, P source) {
-   Message.Builder destination = source.newBuilderForType();
-    merge(mask, source, destination);
-    return (P) destination.build();
-  }
-}
diff --git a/libs/protobuf/java/util/src/main/java/com/google/protobuf/util/JsonFormat.java b/libs/protobuf/java/util/src/main/java/com/google/protobuf/util/JsonFormat.java
deleted file mode 100644
index 6bed2e3..0000000
--- a/libs/protobuf/java/util/src/main/java/com/google/protobuf/util/JsonFormat.java
+++ /dev/null
@@ -1,2020 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf.util;
-
-import com.google.common.base.Preconditions;
-import com.google.common.io.BaseEncoding;
-import com.google.errorprone.annotations.CanIgnoreReturnValue;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.google.gson.JsonArray;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonIOException;
-import com.google.gson.JsonNull;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-import com.google.gson.JsonPrimitive;
-import com.google.gson.stream.JsonReader;
-import com.google.protobuf.Any;
-import com.google.protobuf.BoolValue;
-import com.google.protobuf.ByteString;
-import com.google.protobuf.BytesValue;
-import com.google.protobuf.Descriptors.Descriptor;
-import com.google.protobuf.Descriptors.EnumDescriptor;
-import com.google.protobuf.Descriptors.EnumValueDescriptor;
-import com.google.protobuf.Descriptors.FieldDescriptor;
-import com.google.protobuf.Descriptors.FieldDescriptor.Type;
-import com.google.protobuf.Descriptors.FileDescriptor;
-import com.google.protobuf.Descriptors.OneofDescriptor;
-import com.google.protobuf.DoubleValue;
-import com.google.protobuf.Duration;
-import com.google.protobuf.DynamicMessage;
-import com.google.protobuf.FieldMask;
-import com.google.protobuf.FloatValue;
-import com.google.protobuf.Int32Value;
-import com.google.protobuf.Int64Value;
-import com.google.protobuf.InvalidProtocolBufferException;
-import com.google.protobuf.ListValue;
-import com.google.protobuf.Message;
-import com.google.protobuf.MessageOrBuilder;
-import com.google.protobuf.NullValue;
-import com.google.protobuf.StringValue;
-import com.google.protobuf.Struct;
-import com.google.protobuf.Timestamp;
-import com.google.protobuf.UInt32Value;
-import com.google.protobuf.UInt64Value;
-import com.google.protobuf.Value;
-import java.io.IOException;
-import java.io.Reader;
-import java.io.StringReader;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.text.ParseException;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeMap;
-import java.util.logging.Logger;
-import javax.annotation.Nullable;
-
-/**
- * Utility class to convert protobuf messages to/from the <a href=
- * 'https://developers.google.com/protocol-buffers/docs/proto3#json'>Proto3 JSON format.</a>
- * Only proto3 features are supported. Proto2 only features such as extensions and unknown fields
- * are discarded in the conversion. That is, when converting proto2 messages to JSON format,
- * extensions and unknown fields are treated as if they do not exist. This applies to proto2
- * messages embedded in proto3 messages as well.
- */
-public class JsonFormat {
-  private static final Logger logger = Logger.getLogger(JsonFormat.class.getName());
-
-  private JsonFormat() {}
-
-  /**
-   * Creates a {@link Printer} with default configurations.
-   */
-  public static Printer printer() {
-    return new Printer(
-        com.google.protobuf.TypeRegistry.getEmptyTypeRegistry(),
-        TypeRegistry.getEmptyTypeRegistry(),
-        /* alwaysOutputDefaultValueFields */ false,
-        /* includingDefaultValueFields */ Collections.<FieldDescriptor>emptySet(),
-        /* preservingProtoFieldNames */ false,
-        /* omittingInsignificantWhitespace */ false,
-        /* printingEnumsAsInts */ false,
-        /* sortingMapKeys */ false);
-  }
-
-  /**
-   * A Printer converts a protobuf message to the proto3 JSON format.
-   */
-  public static class Printer {
-    private final com.google.protobuf.TypeRegistry registry;
-    private final TypeRegistry oldRegistry;
-    // NOTE: There are 3 states for these *defaultValueFields variables:
-    // 1) Default - alwaysOutput is false & including is empty set. Fields only output if they are
-    //    set to non-default values.
-    // 2) No-args includingDefaultValueFields() called - alwaysOutput is true & including is
-    //    irrelevant (but set to empty set). All fields are output regardless of their values.
-    // 3) includingDefaultValueFields(Set<FieldDescriptor>) called - alwaysOutput is false &
-    //    including is set to the specified set. Fields in that set are always output & fields not
-    //    in that set are only output if set to non-default values.
-    private boolean alwaysOutputDefaultValueFields;
-    private Set<FieldDescriptor> includingDefaultValueFields;
-    private final boolean preservingProtoFieldNames;
-    private final boolean omittingInsignificantWhitespace;
-    private final boolean printingEnumsAsInts;
-    private final boolean sortingMapKeys;
-
-    private Printer(
-        com.google.protobuf.TypeRegistry registry,
-        TypeRegistry oldRegistry,
-        boolean alwaysOutputDefaultValueFields,
-        Set<FieldDescriptor> includingDefaultValueFields,
-        boolean preservingProtoFieldNames,
-        boolean omittingInsignificantWhitespace,
-        boolean printingEnumsAsInts,
-        boolean sortingMapKeys) {
-      this.registry = registry;
-      this.oldRegistry = oldRegistry;
-      this.alwaysOutputDefaultValueFields = alwaysOutputDefaultValueFields;
-      this.includingDefaultValueFields = includingDefaultValueFields;
-      this.preservingProtoFieldNames = preservingProtoFieldNames;
-      this.omittingInsignificantWhitespace = omittingInsignificantWhitespace;
-      this.printingEnumsAsInts = printingEnumsAsInts;
-      this.sortingMapKeys = sortingMapKeys;
-    }
-
-    /**
-     * Creates a new {@link Printer} using the given registry. The new Printer clones all other
-     * configurations from the current {@link Printer}.
-     *
-     * @throws IllegalArgumentException if a registry is already set
-     */
-    public Printer usingTypeRegistry(TypeRegistry oldRegistry) {
-      if (this.oldRegistry != TypeRegistry.getEmptyTypeRegistry()
-          || this.registry != com.google.protobuf.TypeRegistry.getEmptyTypeRegistry()) {
-        throw new IllegalArgumentException("Only one registry is allowed.");
-      }
-      return new Printer(
-          com.google.protobuf.TypeRegistry.getEmptyTypeRegistry(),
-          oldRegistry,
-          alwaysOutputDefaultValueFields,
-          includingDefaultValueFields,
-          preservingProtoFieldNames,
-          omittingInsignificantWhitespace,
-          printingEnumsAsInts,
-          sortingMapKeys);
-    }
-
-    /**
-     * Creates a new {@link Printer} using the given registry. The new Printer clones all other
-     * configurations from the current {@link Printer}.
-     *
-     * @throws IllegalArgumentException if a registry is already set
-     */
-    public Printer usingTypeRegistry(com.google.protobuf.TypeRegistry registry) {
-      if (this.oldRegistry != TypeRegistry.getEmptyTypeRegistry()
-          || this.registry != com.google.protobuf.TypeRegistry.getEmptyTypeRegistry()) {
-        throw new IllegalArgumentException("Only one registry is allowed.");
-      }
-      return new Printer(
-          registry,
-          oldRegistry,
-          alwaysOutputDefaultValueFields,
-          includingDefaultValueFields,
-          preservingProtoFieldNames,
-          omittingInsignificantWhitespace,
-          printingEnumsAsInts,
-          sortingMapKeys);
-    }
-
-    /**
-     * Creates a new {@link Printer} that will also print fields set to their
-     * defaults. Empty repeated fields and map fields will be printed as well.
-     * The new Printer clones all other configurations from the current
-     * {@link Printer}.
-     */
-    public Printer includingDefaultValueFields() {
-      checkUnsetIncludingDefaultValueFields();
-      return new Printer(
-          registry,
-          oldRegistry,
-          true,
-          Collections.<FieldDescriptor>emptySet(),
-          preservingProtoFieldNames,
-          omittingInsignificantWhitespace,
-          printingEnumsAsInts,
-          sortingMapKeys);
-    }
-
-    /**
-     * Creates a new {@link Printer} that prints enum field values as integers instead of as
-     * string. The new Printer clones all other configurations from the current {@link Printer}.
-     */
-    public Printer printingEnumsAsInts() {
-      checkUnsetPrintingEnumsAsInts();
-      return new Printer(
-          registry,
-          oldRegistry,
-          alwaysOutputDefaultValueFields,
-          includingDefaultValueFields,
-          preservingProtoFieldNames,
-          omittingInsignificantWhitespace,
-          true,
-          sortingMapKeys);
-    }
-
-    private void checkUnsetPrintingEnumsAsInts() {
-      if (printingEnumsAsInts) {
-        throw new IllegalStateException("JsonFormat printingEnumsAsInts has already been set.");
-      }
-    }
-
-    /**
-     * Creates a new {@link Printer} that will also print default-valued fields if their
-     * FieldDescriptors are found in the supplied set. Empty repeated fields and map fields will be
-     * printed as well, if they match. The new Printer clones all other configurations from the
-     * current {@link Printer}. Call includingDefaultValueFields() with no args to unconditionally
-     * output all fields.
-     */
-    public Printer includingDefaultValueFields(Set<FieldDescriptor> fieldsToAlwaysOutput) {
-      Preconditions.checkArgument(
-          null != fieldsToAlwaysOutput && !fieldsToAlwaysOutput.isEmpty(),
-          "Non-empty Set must be supplied for includingDefaultValueFields.");
-
-      checkUnsetIncludingDefaultValueFields();
-      return new Printer(
-          registry,
-          oldRegistry,
-          false,
-          Collections.unmodifiableSet(new HashSet<>(fieldsToAlwaysOutput)),
-          preservingProtoFieldNames,
-          omittingInsignificantWhitespace,
-          printingEnumsAsInts,
-          sortingMapKeys);
-    }
-
-    private void checkUnsetIncludingDefaultValueFields() {
-      if (alwaysOutputDefaultValueFields || !includingDefaultValueFields.isEmpty()) {
-        throw new IllegalStateException(
-            "JsonFormat includingDefaultValueFields has already been set.");
-      }
-    }
-
-    /**
-     * Creates a new {@link Printer} that is configured to use the original proto
-     * field names as defined in the .proto file rather than converting them to
-     * lowerCamelCase. The new Printer clones all other configurations from the
-     * current {@link Printer}.
-     */
-    public Printer preservingProtoFieldNames() {
-      return new Printer(
-          registry,
-          oldRegistry,
-          alwaysOutputDefaultValueFields,
-          includingDefaultValueFields,
-          true,
-          omittingInsignificantWhitespace,
-          printingEnumsAsInts,
-          sortingMapKeys);
-    }
-
-
-    /**
-     * Create a new {@link Printer} that omits insignificant whitespace in the JSON output.
-     * This new Printer clones all other configurations from the current Printer. Insignificant
-     * whitespace is defined by the JSON spec as whitespace that appears between JSON structural
-     * elements:
-     *
-     * <pre>
-     * ws = *(
-     * %x20 /              ; Space
-     * %x09 /              ; Horizontal tab
-     * %x0A /              ; Line feed or New line
-     * %x0D )              ; Carriage return
-     * </pre>
-     *
-     * See <a href="https://tools.ietf.org/html/rfc7159">https://tools.ietf.org/html/rfc7159</a>.
-     */
-    public Printer omittingInsignificantWhitespace() {
-      return new Printer(
-          registry,
-          oldRegistry,
-          alwaysOutputDefaultValueFields,
-          includingDefaultValueFields,
-          preservingProtoFieldNames,
-          true,
-          printingEnumsAsInts,
-          sortingMapKeys);
-    }
-
-    /**
-     * Create a new {@link Printer} that will sort the map keys in the JSON output.
-     *
-     * <p>Use of this modifier is discouraged. The generated JSON messages are equivalent with and
-     * without this option set, but there are some corner use cases that demand a stable output,
-     * while order of map keys is otherwise arbitrary.
-     *
-     * <p>The generated order is not well-defined and should not be depended on, but it's stable.
-     *
-     * <p>This new Printer clones all other configurations from the current {@link Printer}.
-     */
-    public Printer sortingMapKeys() {
-      return new Printer(
-          registry,
-          oldRegistry,
-          alwaysOutputDefaultValueFields,
-          includingDefaultValueFields,
-          preservingProtoFieldNames,
-          omittingInsignificantWhitespace,
-          printingEnumsAsInts,
-          true);
-    }
-
-    /**
-     * Converts a protobuf message to the proto3 JSON format.
-     *
-     * @throws InvalidProtocolBufferException if the message contains Any types that can't be
-     *     resolved
-     * @throws IOException if writing to the output fails
-     */
-    public void appendTo(MessageOrBuilder message, Appendable output) throws IOException {
-      // TODO(xiaofeng): Investigate the allocation overhead and optimize for
-      // mobile.
-      new PrinterImpl(
-              registry,
-              oldRegistry,
-              alwaysOutputDefaultValueFields,
-              includingDefaultValueFields,
-              preservingProtoFieldNames,
-              output,
-              omittingInsignificantWhitespace,
-              printingEnumsAsInts,
-              sortingMapKeys)
-          .print(message);
-    }
-
-    /**
-     * Converts a protobuf message to the proto3 JSON format. Throws exceptions if there
-     * are unknown Any types in the message.
-     */
-    public String print(MessageOrBuilder message) throws InvalidProtocolBufferException {
-      try {
-        StringBuilder builder = new StringBuilder();
-        appendTo(message, builder);
-        return builder.toString();
-      } catch (InvalidProtocolBufferException e) {
-        throw e;
-      } catch (IOException e) {
-        // Unexpected IOException.
-        throw new IllegalStateException(e);
-      }
-    }
-  }
-
-  /**
-   * Creates a {@link Parser} with default configuration.
-   */
-  public static Parser parser() {
-    return new Parser(
-        com.google.protobuf.TypeRegistry.getEmptyTypeRegistry(),
-        TypeRegistry.getEmptyTypeRegistry(),
-        false,
-        Parser.DEFAULT_RECURSION_LIMIT);
-  }
-
-  /**
-   * A Parser parses the proto3 JSON format into a protobuf message.
-   */
-  public static class Parser {
-    private final com.google.protobuf.TypeRegistry registry;
-    private final TypeRegistry oldRegistry;
-    private final boolean ignoringUnknownFields;
-    private final int recursionLimit;
-
-    // The default parsing recursion limit is aligned with the proto binary parser.
-    private static final int DEFAULT_RECURSION_LIMIT = 100;
-
-    private Parser(
-        com.google.protobuf.TypeRegistry registry,
-        TypeRegistry oldRegistry,
-        boolean ignoreUnknownFields,
-        int recursionLimit) {
-      this.registry = registry;
-      this.oldRegistry = oldRegistry;
-      this.ignoringUnknownFields = ignoreUnknownFields;
-      this.recursionLimit = recursionLimit;
-    }
-
-    /**
-     * Creates a new {@link Parser} using the given registry. The new Parser clones all other
-     * configurations from this Parser.
-     *
-     * @throws IllegalArgumentException if a registry is already set
-     */
-    public Parser usingTypeRegistry(TypeRegistry oldRegistry) {
-      if (this.oldRegistry != TypeRegistry.getEmptyTypeRegistry()
-          || this.registry != com.google.protobuf.TypeRegistry.getEmptyTypeRegistry()) {
-        throw new IllegalArgumentException("Only one registry is allowed.");
-      }
-      return new Parser(
-          com.google.protobuf.TypeRegistry.getEmptyTypeRegistry(),
-          oldRegistry,
-          ignoringUnknownFields,
-          recursionLimit);
-    }
-
-    /**
-     * Creates a new {@link Parser} using the given registry. The new Parser clones all other
-     * configurations from this Parser.
-     *
-     * @throws IllegalArgumentException if a registry is already set
-     */
-    public Parser usingTypeRegistry(com.google.protobuf.TypeRegistry registry) {
-      if (this.oldRegistry != TypeRegistry.getEmptyTypeRegistry()
-          || this.registry != com.google.protobuf.TypeRegistry.getEmptyTypeRegistry()) {
-        throw new IllegalArgumentException("Only one registry is allowed.");
-      }
-      return new Parser(registry, oldRegistry, ignoringUnknownFields, recursionLimit);
-    }
-
-    /**
-     * Creates a new {@link Parser} configured to not throw an exception when an unknown field is
-     * encountered. The new Parser clones all other configurations from this Parser.
-     */
-    public Parser ignoringUnknownFields() {
-      return new Parser(this.registry, oldRegistry, true, recursionLimit);
-    }
-
-    /**
-     * Parses from the proto3 JSON format into a protobuf message.
-     *
-     * @throws InvalidProtocolBufferException if the input is not valid JSON
-     *         proto3 format or there are unknown fields in the input.
-     */
-    public void merge(String json, Message.Builder builder) throws InvalidProtocolBufferException {
-      // TODO(xiaofeng): Investigate the allocation overhead and optimize for
-      // mobile.
-      new ParserImpl(registry, oldRegistry, ignoringUnknownFields, recursionLimit)
-          .merge(json, builder);
-    }
-
-    /**
-     * Parses from the proto3 JSON encoding into a protobuf message.
-     *
-     * @throws InvalidProtocolBufferException if the input is not valid proto3 JSON
-     *         format or there are unknown fields in the input
-     * @throws IOException if reading from the input throws
-     */
-    public void merge(Reader json, Message.Builder builder) throws IOException {
-      // TODO(xiaofeng): Investigate the allocation overhead and optimize for
-      // mobile.
-      new ParserImpl(registry, oldRegistry, ignoringUnknownFields, recursionLimit)
-          .merge(json, builder);
-    }
-
-    // For testing only.
-    Parser usingRecursionLimit(int recursionLimit) {
-      return new Parser(registry, oldRegistry, ignoringUnknownFields, recursionLimit);
-    }
-  }
-
-  /**
-   * A TypeRegistry is used to resolve Any messages in the JSON conversion.
-   * You must provide a TypeRegistry containing all message types used in
-   * Any message fields, or the JSON conversion will fail because data
-   * in Any message fields is unrecognizable. You don't need to supply a
-   * TypeRegistry if you don't use Any message fields.
-   */
-  public static class TypeRegistry {
-    private static class EmptyTypeRegistryHolder {
-      private static final TypeRegistry EMPTY =
-          new TypeRegistry(Collections.<String, Descriptor>emptyMap());
-    }
-
-    public static TypeRegistry getEmptyTypeRegistry() {
-      return EmptyTypeRegistryHolder.EMPTY;
-    }
-
-    public static Builder newBuilder() {
-      return new Builder();
-    }
-
-    /**
-     * Find a type by its full name. Returns null if it cannot be found in this {@link
-     * TypeRegistry}.
-     */
-    @Nullable
-    public Descriptor find(String name) {
-      return types.get(name);
-    }
-
-    @Nullable
-    Descriptor getDescriptorForTypeUrl(String typeUrl) throws InvalidProtocolBufferException {
-      return find(getTypeName(typeUrl));
-    }
-
-    private final Map<String, Descriptor> types;
-
-    private TypeRegistry(Map<String, Descriptor> types) {
-      this.types = types;
-    }
-
-
-    /** A Builder is used to build {@link TypeRegistry}. */
-    public static class Builder {
-      private Builder() {}
-
-      /**
-       * Adds a message type and all types defined in the same .proto file as well as all
-       * transitively imported .proto files to this {@link Builder}.
-       */
-      @CanIgnoreReturnValue
-      public Builder add(Descriptor messageType) {
-        if (built) {
-          throw new IllegalStateException("A TypeRegistry.Builder can only be used once.");
-        }
-        addFile(messageType.getFile());
-        return this;
-      }
-
-      /**
-       * Adds message types and all types defined in the same .proto file as well as all
-       * transitively imported .proto files to this {@link Builder}.
-       */
-      @CanIgnoreReturnValue
-      public Builder add(Iterable<Descriptor> messageTypes) {
-        if (built) {
-          throw new IllegalStateException("A TypeRegistry.Builder can only be used once.");
-        }
-        for (Descriptor type : messageTypes) {
-          addFile(type.getFile());
-        }
-        return this;
-      }
-
-      /**
-       * Builds a {@link TypeRegistry}. This method can only be called once for
-       * one Builder.
-       */
-      public TypeRegistry build() {
-        built = true;
-        return new TypeRegistry(types);
-      }
-
-      private void addFile(FileDescriptor file) {
-        // Skip the file if it's already added.
-        if (!files.add(file.getFullName())) {
-          return;
-        }
-        for (FileDescriptor dependency : file.getDependencies()) {
-          addFile(dependency);
-        }
-        for (Descriptor message : file.getMessageTypes()) {
-          addMessage(message);
-        }
-      }
-
-      private void addMessage(Descriptor message) {
-        for (Descriptor nestedType : message.getNestedTypes()) {
-          addMessage(nestedType);
-        }
-
-        if (types.containsKey(message.getFullName())) {
-          logger.warning("Type " + message.getFullName() + " is added multiple times.");
-          return;
-        }
-
-        types.put(message.getFullName(), message);
-      }
-
-      private final Set<String> files = new HashSet<>();
-      private final Map<String, Descriptor> types = new HashMap<>();
-      private boolean built = false;
-    }
-  }
-
-  /**
-   * An interface for JSON formatting that can be used in
-   * combination with the omittingInsignificantWhitespace() method.
-   */
-  interface TextGenerator {
-    void indent();
-
-    void outdent();
-
-    void print(final CharSequence text) throws IOException;
-  }
-
-  /**
-   * Format the JSON without indentation
-   */
-  private static final class CompactTextGenerator implements TextGenerator {
-    private final Appendable output;
-
-    private CompactTextGenerator(final Appendable output) {
-      this.output = output;
-    }
-
-    /** ignored by compact printer */
-    @Override
-    public void indent() {}
-
-    /** ignored by compact printer */
-    @Override
-    public void outdent() {}
-
-    /** Print text to the output stream. */
-    @Override
-    public void print(final CharSequence text) throws IOException {
-      output.append(text);
-    }
-  }
-  /**
-   * A TextGenerator adds indentation when writing formatted text.
-   */
-  private static final class PrettyTextGenerator implements TextGenerator {
-    private final Appendable output;
-    private final StringBuilder indent = new StringBuilder();
-    private boolean atStartOfLine = true;
-
-    private PrettyTextGenerator(final Appendable output) {
-      this.output = output;
-    }
-
-    /**
-     * Indent text by two spaces. After calling Indent(), two spaces will be inserted at the
-     * beginning of each line of text. Indent() may be called multiple times to produce deeper
-     * indents.
-     */
-    @Override
-    public void indent() {
-      indent.append("  ");
-    }
-
-    /** Reduces the current indent level by two spaces, or crashes if the indent level is zero. */
-    @Override
-    public void outdent() {
-      final int length = indent.length();
-      if (length < 2) {
-        throw new IllegalArgumentException(" Outdent() without matching Indent().");
-      }
-      indent.delete(length - 2, length);
-    }
-
-    /** Print text to the output stream. */
-    @Override
-    public void print(final CharSequence text) throws IOException {
-      final int size = text.length();
-      int pos = 0;
-
-      for (int i = 0; i < size; i++) {
-        if (text.charAt(i) == '\n') {
-          write(text.subSequence(pos, i + 1));
-          pos = i + 1;
-          atStartOfLine = true;
-        }
-      }
-      write(text.subSequence(pos, size));
-    }
-
-    private void write(final CharSequence data) throws IOException {
-      if (data.length() == 0) {
-        return;
-      }
-      if (atStartOfLine) {
-        atStartOfLine = false;
-        output.append(indent);
-      }
-      output.append(data);
-    }
-  }
-
-  /**
-   * A Printer converts protobuf messages to the proto3 JSON format.
-   */
-  private static final class PrinterImpl {
-    private final com.google.protobuf.TypeRegistry registry;
-    private final TypeRegistry oldRegistry;
-    private final boolean alwaysOutputDefaultValueFields;
-    private final Set<FieldDescriptor> includingDefaultValueFields;
-    private final boolean preservingProtoFieldNames;
-    private final boolean printingEnumsAsInts;
-    private final boolean sortingMapKeys;
-    private final TextGenerator generator;
-    // We use Gson to help handle string escapes.
-    private final Gson gson;
-    private final CharSequence blankOrSpace;
-    private final CharSequence blankOrNewLine;
-
-    private static class GsonHolder {
-      private static final Gson DEFAULT_GSON = new GsonBuilder().create();
-    }
-
-    PrinterImpl(
-        com.google.protobuf.TypeRegistry registry,
-        TypeRegistry oldRegistry,
-        boolean alwaysOutputDefaultValueFields,
-        Set<FieldDescriptor> includingDefaultValueFields,
-        boolean preservingProtoFieldNames,
-        Appendable jsonOutput,
-        boolean omittingInsignificantWhitespace,
-        boolean printingEnumsAsInts,
-        boolean sortingMapKeys) {
-      this.registry = registry;
-      this.oldRegistry = oldRegistry;
-      this.alwaysOutputDefaultValueFields = alwaysOutputDefaultValueFields;
-      this.includingDefaultValueFields = includingDefaultValueFields;
-      this.preservingProtoFieldNames = preservingProtoFieldNames;
-      this.printingEnumsAsInts = printingEnumsAsInts;
-      this.sortingMapKeys = sortingMapKeys;
-      this.gson = GsonHolder.DEFAULT_GSON;
-      // json format related properties, determined by printerType
-      if (omittingInsignificantWhitespace) {
-        this.generator = new CompactTextGenerator(jsonOutput);
-        this.blankOrSpace = "";
-        this.blankOrNewLine = "";
-      } else {
-        this.generator = new PrettyTextGenerator(jsonOutput);
-        this.blankOrSpace = " ";
-        this.blankOrNewLine = "\n";
-      }
-    }
-
-    void print(MessageOrBuilder message) throws IOException {
-      WellKnownTypePrinter specialPrinter =
-          wellKnownTypePrinters.get(message.getDescriptorForType().getFullName());
-      if (specialPrinter != null) {
-        specialPrinter.print(this, message);
-        return;
-      }
-      print(message, null);
-    }
-
-    private interface WellKnownTypePrinter {
-      void print(PrinterImpl printer, MessageOrBuilder message) throws IOException;
-    }
-
-    private static final Map<String, WellKnownTypePrinter> wellKnownTypePrinters =
-        buildWellKnownTypePrinters();
-
-    private static Map<String, WellKnownTypePrinter> buildWellKnownTypePrinters() {
-      Map<String, WellKnownTypePrinter> printers = new HashMap<String, WellKnownTypePrinter>();
-      // Special-case Any.
-      printers.put(
-          Any.getDescriptor().getFullName(),
-          new WellKnownTypePrinter() {
-            @Override
-            public void print(PrinterImpl printer, MessageOrBuilder message) throws IOException {
-              printer.printAny(message);
-            }
-          });
-      // Special-case wrapper types.
-      WellKnownTypePrinter wrappersPrinter =
-          new WellKnownTypePrinter() {
-            @Override
-            public void print(PrinterImpl printer, MessageOrBuilder message) throws IOException {
-              printer.printWrapper(message);
-            }
-          };
-      printers.put(BoolValue.getDescriptor().getFullName(), wrappersPrinter);
-      printers.put(Int32Value.getDescriptor().getFullName(), wrappersPrinter);
-      printers.put(UInt32Value.getDescriptor().getFullName(), wrappersPrinter);
-      printers.put(Int64Value.getDescriptor().getFullName(), wrappersPrinter);
-      printers.put(UInt64Value.getDescriptor().getFullName(), wrappersPrinter);
-      printers.put(StringValue.getDescriptor().getFullName(), wrappersPrinter);
-      printers.put(BytesValue.getDescriptor().getFullName(), wrappersPrinter);
-      printers.put(FloatValue.getDescriptor().getFullName(), wrappersPrinter);
-      printers.put(DoubleValue.getDescriptor().getFullName(), wrappersPrinter);
-      // Special-case Timestamp.
-      printers.put(
-          Timestamp.getDescriptor().getFullName(),
-          new WellKnownTypePrinter() {
-            @Override
-            public void print(PrinterImpl printer, MessageOrBuilder message) throws IOException {
-              printer.printTimestamp(message);
-            }
-          });
-      // Special-case Duration.
-      printers.put(
-          Duration.getDescriptor().getFullName(),
-          new WellKnownTypePrinter() {
-            @Override
-            public void print(PrinterImpl printer, MessageOrBuilder message) throws IOException {
-              printer.printDuration(message);
-            }
-          });
-      // Special-case FieldMask.
-      printers.put(
-          FieldMask.getDescriptor().getFullName(),
-          new WellKnownTypePrinter() {
-            @Override
-            public void print(PrinterImpl printer, MessageOrBuilder message) throws IOException {
-              printer.printFieldMask(message);
-            }
-          });
-      // Special-case Struct.
-      printers.put(
-          Struct.getDescriptor().getFullName(),
-          new WellKnownTypePrinter() {
-            @Override
-            public void print(PrinterImpl printer, MessageOrBuilder message) throws IOException {
-              printer.printStruct(message);
-            }
-          });
-      // Special-case Value.
-      printers.put(
-          Value.getDescriptor().getFullName(),
-          new WellKnownTypePrinter() {
-            @Override
-            public void print(PrinterImpl printer, MessageOrBuilder message) throws IOException {
-              printer.printValue(message);
-            }
-          });
-      // Special-case ListValue.
-      printers.put(
-          ListValue.getDescriptor().getFullName(),
-          new WellKnownTypePrinter() {
-            @Override
-            public void print(PrinterImpl printer, MessageOrBuilder message) throws IOException {
-              printer.printListValue(message);
-            }
-          });
-      return printers;
-    }
-
-    /** Prints google.protobuf.Any */
-    private void printAny(MessageOrBuilder message) throws IOException {
-      if (Any.getDefaultInstance().equals(message)) {
-        generator.print("{}");
-        return;
-      }
-      Descriptor descriptor = message.getDescriptorForType();
-      FieldDescriptor typeUrlField = descriptor.findFieldByName("type_url");
-      FieldDescriptor valueField = descriptor.findFieldByName("value");
-      // Validates type of the message. Note that we can't just cast the message
-      // to com.google.protobuf.Any because it might be a DynamicMessage.
-      if (typeUrlField == null
-          || valueField == null
-          || typeUrlField.getType() != FieldDescriptor.Type.STRING
-          || valueField.getType() != FieldDescriptor.Type.BYTES) {
-        throw new InvalidProtocolBufferException("Invalid Any type.");
-      }
-      String typeUrl = (String) message.getField(typeUrlField);
-      Descriptor type = registry.getDescriptorForTypeUrl(typeUrl);
-      if (type == null) {
-        type = oldRegistry.getDescriptorForTypeUrl(typeUrl);
-        if (type == null) {
-          throw new InvalidProtocolBufferException("Cannot find type for url: " + typeUrl);
-        }
-      }
-      ByteString content = (ByteString) message.getField(valueField);
-      Message contentMessage =
-          DynamicMessage.getDefaultInstance(type).getParserForType().parseFrom(content);
-      WellKnownTypePrinter printer = wellKnownTypePrinters.get(getTypeName(typeUrl));
-      if (printer != null) {
-        // If the type is one of the well-known types, we use a special
-        // formatting.
-        generator.print("{" + blankOrNewLine);
-        generator.indent();
-        generator.print("\"@type\":" + blankOrSpace + gson.toJson(typeUrl) + "," + blankOrNewLine);
-        generator.print("\"value\":" + blankOrSpace);
-        printer.print(this, contentMessage);
-        generator.print(blankOrNewLine);
-        generator.outdent();
-        generator.print("}");
-      } else {
-        // Print the content message instead (with a "@type" field added).
-        print(contentMessage, typeUrl);
-      }
-    }
-
-    /** Prints wrapper types (e.g., google.protobuf.Int32Value) */
-    private void printWrapper(MessageOrBuilder message) throws IOException {
-      Descriptor descriptor = message.getDescriptorForType();
-      FieldDescriptor valueField = descriptor.findFieldByName("value");
-      if (valueField == null) {
-        throw new InvalidProtocolBufferException("Invalid Wrapper type.");
-      }
-      // When formatting wrapper types, we just print its value field instead of
-      // the whole message.
-      printSingleFieldValue(valueField, message.getField(valueField));
-    }
-
-    private ByteString toByteString(MessageOrBuilder message) {
-      if (message instanceof Message) {
-        return ((Message) message).toByteString();
-      } else {
-        return ((Message.Builder) message).build().toByteString();
-      }
-    }
-
-    /** Prints google.protobuf.Timestamp */
-    private void printTimestamp(MessageOrBuilder message) throws IOException {
-      Timestamp value = Timestamp.parseFrom(toByteString(message));
-      generator.print("\"" + Timestamps.toString(value) + "\"");
-    }
-
-    /** Prints google.protobuf.Duration */
-    private void printDuration(MessageOrBuilder message) throws IOException {
-      Duration value = Duration.parseFrom(toByteString(message));
-      generator.print("\"" + Durations.toString(value) + "\"");
-    }
-
-    /** Prints google.protobuf.FieldMask */
-    private void printFieldMask(MessageOrBuilder message) throws IOException {
-      FieldMask value = FieldMask.parseFrom(toByteString(message));
-      generator.print("\"" + FieldMaskUtil.toJsonString(value) + "\"");
-    }
-
-    /** Prints google.protobuf.Struct */
-    private void printStruct(MessageOrBuilder message) throws IOException {
-      Descriptor descriptor = message.getDescriptorForType();
-      FieldDescriptor field = descriptor.findFieldByName("fields");
-      if (field == null) {
-        throw new InvalidProtocolBufferException("Invalid Struct type.");
-      }
-      // Struct is formatted as a map object.
-      printMapFieldValue(field, message.getField(field));
-    }
-
-    /** Prints google.protobuf.Value */
-    private void printValue(MessageOrBuilder message) throws IOException {
-      // For a Value message, only the value of the field is formatted.
-      Map<FieldDescriptor, Object> fields = message.getAllFields();
-      if (fields.isEmpty()) {
-        // No value set.
-        generator.print("null");
-        return;
-      }
-      // A Value message can only have at most one field set (it only contains
-      // an oneof).
-      if (fields.size() != 1) {
-        throw new InvalidProtocolBufferException("Invalid Value type.");
-      }
-      for (Map.Entry<FieldDescriptor, Object> entry : fields.entrySet()) {
-        printSingleFieldValue(entry.getKey(), entry.getValue());
-      }
-    }
-
-    /** Prints google.protobuf.ListValue */
-    private void printListValue(MessageOrBuilder message) throws IOException {
-      Descriptor descriptor = message.getDescriptorForType();
-      FieldDescriptor field = descriptor.findFieldByName("values");
-      if (field == null) {
-        throw new InvalidProtocolBufferException("Invalid ListValue type.");
-      }
-      printRepeatedFieldValue(field, message.getField(field));
-    }
-
-    /** Prints a regular message with an optional type URL. */
-    private void print(MessageOrBuilder message, @Nullable String typeUrl) throws IOException {
-      generator.print("{" + blankOrNewLine);
-      generator.indent();
-
-      boolean printedField = false;
-      if (typeUrl != null) {
-        generator.print("\"@type\":" + blankOrSpace + gson.toJson(typeUrl));
-        printedField = true;
-      }
-      Map<FieldDescriptor, Object> fieldsToPrint = null;
-      if (alwaysOutputDefaultValueFields || !includingDefaultValueFields.isEmpty()) {
-        fieldsToPrint = new TreeMap<FieldDescriptor, Object>(message.getAllFields());
-        for (FieldDescriptor field : message.getDescriptorForType().getFields()) {
-          if (field.isOptional()) {
-            if (field.getJavaType() == FieldDescriptor.JavaType.MESSAGE
-                && !message.hasField(field)) {
-              // Always skip empty optional message fields. If not we will recurse indefinitely if
-              // a message has itself as a sub-field.
-              continue;
-            }
-            OneofDescriptor oneof = field.getContainingOneof();
-            if (oneof != null && !message.hasField(field)) {
-              // Skip all oneof fields except the one that is actually set
-              continue;
-            }
-          }
-          if (!fieldsToPrint.containsKey(field)
-              && (alwaysOutputDefaultValueFields || includingDefaultValueFields.contains(field))) {
-            fieldsToPrint.put(field, message.getField(field));
-          }
-        }
-      } else {
-        fieldsToPrint = message.getAllFields();
-      }
-      for (Map.Entry<FieldDescriptor, Object> field : fieldsToPrint.entrySet()) {
-        if (printedField) {
-          // Add line-endings for the previous field.
-          generator.print("," + blankOrNewLine);
-        } else {
-          printedField = true;
-        }
-        printField(field.getKey(), field.getValue());
-      }
-
-      // Add line-endings for the last field.
-      if (printedField) {
-        generator.print(blankOrNewLine);
-      }
-      generator.outdent();
-      generator.print("}");
-    }
-
-    private void printField(FieldDescriptor field, Object value) throws IOException {
-      if (preservingProtoFieldNames) {
-        generator.print("\"" + field.getName() + "\":" + blankOrSpace);
-      } else {
-        generator.print("\"" + field.getJsonName() + "\":" + blankOrSpace);
-      }
-      if (field.isMapField()) {
-        printMapFieldValue(field, value);
-      } else if (field.isRepeated()) {
-        printRepeatedFieldValue(field, value);
-      } else {
-        printSingleFieldValue(field, value);
-      }
-    }
-
-    @SuppressWarnings("rawtypes")
-    private void printRepeatedFieldValue(FieldDescriptor field, Object value) throws IOException {
-      generator.print("[");
-      boolean printedElement = false;
-      for (Object element : (List) value) {
-        if (printedElement) {
-          generator.print("," + blankOrSpace);
-        } else {
-          printedElement = true;
-        }
-        printSingleFieldValue(field, element);
-      }
-      generator.print("]");
-    }
-
-    private void printMapFieldValue(FieldDescriptor field, Object value) throws IOException {
-      Descriptor type = field.getMessageType();
-      FieldDescriptor keyField = type.findFieldByName("key");
-      FieldDescriptor valueField = type.findFieldByName("value");
-      if (keyField == null || valueField == null) {
-        throw new InvalidProtocolBufferException("Invalid map field.");
-      }
-      generator.print("{" + blankOrNewLine);
-      generator.indent();
-
-      @SuppressWarnings("unchecked") // Object guaranteed to be a List for a map field.
-      Collection<Object> elements = (List<Object>) value;
-      if (sortingMapKeys && !elements.isEmpty()) {
-        Comparator<Object> cmp = null;
-        if (keyField.getType() == FieldDescriptor.Type.STRING) {
-          cmp = new Comparator<Object>() {
-            @Override
-            public int compare(final Object o1, final Object o2) {
-              ByteString s1 = ByteString.copyFromUtf8((String) o1);
-              ByteString s2 = ByteString.copyFromUtf8((String) o2);
-              return ByteString.unsignedLexicographicalComparator().compare(s1, s2);
-            }
-          };
-        }
-        TreeMap<Object, Object> tm = new TreeMap<>(cmp);
-        for (Object element : elements) {
-          Message entry = (Message) element;
-          Object entryKey = entry.getField(keyField);
-          tm.put(entryKey, element);
-        }
-        elements = tm.values();
-      }
-
-      boolean printedElement = false;
-      for (Object element : elements) {
-        Message entry = (Message) element;
-        Object entryKey = entry.getField(keyField);
-        Object entryValue = entry.getField(valueField);
-        if (printedElement) {
-          generator.print("," + blankOrNewLine);
-        } else {
-          printedElement = true;
-        }
-        // Key fields are always double-quoted.
-        printSingleFieldValue(keyField, entryKey, true);
-        generator.print(":" + blankOrSpace);
-        printSingleFieldValue(valueField, entryValue);
-      }
-      if (printedElement) {
-        generator.print(blankOrNewLine);
-      }
-      generator.outdent();
-      generator.print("}");
-    }
-
-    private void printSingleFieldValue(FieldDescriptor field, Object value) throws IOException {
-      printSingleFieldValue(field, value, false);
-    }
-
-    /**
-     * Prints a field's value in the proto3 JSON format.
-     *
-     * @param alwaysWithQuotes whether to always add double-quotes to primitive
-     *        types
-     */
-    private void printSingleFieldValue(
-        final FieldDescriptor field, final Object value, boolean alwaysWithQuotes)
-        throws IOException {
-      switch (field.getType()) {
-        case INT32:
-        case SINT32:
-        case SFIXED32:
-          if (alwaysWithQuotes) {
-            generator.print("\"");
-          }
-          generator.print(((Integer) value).toString());
-          if (alwaysWithQuotes) {
-            generator.print("\"");
-          }
-          break;
-
-        case INT64:
-        case SINT64:
-        case SFIXED64:
-          generator.print("\"" + ((Long) value).toString() + "\"");
-          break;
-
-        case BOOL:
-          if (alwaysWithQuotes) {
-            generator.print("\"");
-          }
-          if (((Boolean) value).booleanValue()) {
-            generator.print("true");
-          } else {
-            generator.print("false");
-          }
-          if (alwaysWithQuotes) {
-            generator.print("\"");
-          }
-          break;
-
-        case FLOAT:
-          Float floatValue = (Float) value;
-          if (floatValue.isNaN()) {
-            generator.print("\"NaN\"");
-          } else if (floatValue.isInfinite()) {
-            if (floatValue < 0) {
-              generator.print("\"-Infinity\"");
-            } else {
-              generator.print("\"Infinity\"");
-            }
-          } else {
-            if (alwaysWithQuotes) {
-              generator.print("\"");
-            }
-            generator.print(floatValue.toString());
-            if (alwaysWithQuotes) {
-              generator.print("\"");
-            }
-          }
-          break;
-
-        case DOUBLE:
-          Double doubleValue = (Double) value;
-          if (doubleValue.isNaN()) {
-            generator.print("\"NaN\"");
-          } else if (doubleValue.isInfinite()) {
-            if (doubleValue < 0) {
-              generator.print("\"-Infinity\"");
-            } else {
-              generator.print("\"Infinity\"");
-            }
-          } else {
-            if (alwaysWithQuotes) {
-              generator.print("\"");
-            }
-            generator.print(doubleValue.toString());
-            if (alwaysWithQuotes) {
-              generator.print("\"");
-            }
-          }
-          break;
-
-        case UINT32:
-        case FIXED32:
-          if (alwaysWithQuotes) {
-            generator.print("\"");
-          }
-          generator.print(unsignedToString((Integer) value));
-          if (alwaysWithQuotes) {
-            generator.print("\"");
-          }
-          break;
-
-        case UINT64:
-        case FIXED64:
-          generator.print("\"" + unsignedToString((Long) value) + "\"");
-          break;
-
-        case STRING:
-          generator.print(gson.toJson(value));
-          break;
-
-        case BYTES:
-          generator.print("\"");
-          generator.print(BaseEncoding.base64().encode(((ByteString) value).toByteArray()));
-          generator.print("\"");
-          break;
-
-        case ENUM:
-          // Special-case google.protobuf.NullValue (it's an Enum).
-          if (field.getEnumType().getFullName().equals("google.protobuf.NullValue")) {
-            // No matter what value it contains, we always print it as "null".
-            if (alwaysWithQuotes) {
-              generator.print("\"");
-            }
-            generator.print("null");
-            if (alwaysWithQuotes) {
-              generator.print("\"");
-            }
-          } else {
-            if (printingEnumsAsInts || ((EnumValueDescriptor) value).getIndex() == -1) {
-              generator.print(String.valueOf(((EnumValueDescriptor) value).getNumber()));
-            } else {
-              generator.print("\"" + ((EnumValueDescriptor) value).getName() + "\"");
-            }
-          }
-          break;
-
-        case MESSAGE:
-        case GROUP:
-          print((Message) value);
-          break;
-      }
-    }
-  }
-
-  /** Convert an unsigned 32-bit integer to a string. */
-  private static String unsignedToString(final int value) {
-    if (value >= 0) {
-      return Integer.toString(value);
-    } else {
-      return Long.toString(value & 0x00000000FFFFFFFFL);
-    }
-  }
-
-  /** Convert an unsigned 64-bit integer to a string. */
-  private static String unsignedToString(final long value) {
-    if (value >= 0) {
-      return Long.toString(value);
-    } else {
-      // Pull off the most-significant bit so that BigInteger doesn't think
-      // the number is negative, then set it again using setBit().
-      return BigInteger.valueOf(value & Long.MAX_VALUE).setBit(Long.SIZE - 1).toString();
-    }
-  }
-
-  private static String getTypeName(String typeUrl) throws InvalidProtocolBufferException {
-    String[] parts = typeUrl.split("/");
-    if (parts.length == 1) {
-      throw new InvalidProtocolBufferException("Invalid type url found: " + typeUrl);
-    }
-    return parts[parts.length - 1];
-  }
-
-  private static class ParserImpl {
-    private final com.google.protobuf.TypeRegistry registry;
-    private final TypeRegistry oldRegistry;
-    private final boolean ignoringUnknownFields;
-    private final int recursionLimit;
-    private int currentDepth;
-
-    ParserImpl(
-        com.google.protobuf.TypeRegistry registry,
-        TypeRegistry oldRegistry,
-        boolean ignoreUnknownFields,
-        int recursionLimit) {
-      this.registry = registry;
-      this.oldRegistry = oldRegistry;
-      this.ignoringUnknownFields = ignoreUnknownFields;
-      this.recursionLimit = recursionLimit;
-      this.currentDepth = 0;
-    }
-
-    void merge(Reader json, Message.Builder builder) throws IOException {
-      try {
-        JsonReader reader = new JsonReader(json);
-        reader.setLenient(false);
-        merge(JsonParser.parseReader(reader), builder);
-      } catch (JsonIOException e) {
-        // Unwrap IOException.
-        if (e.getCause() instanceof IOException) {
-          throw (IOException) e.getCause();
-        } else {
-          throw new InvalidProtocolBufferException(e.getMessage(), e);
-        }
-      } catch (RuntimeException e) {
-        // We convert all exceptions from JSON parsing to our own exceptions.
-        throw new InvalidProtocolBufferException(e.getMessage(), e);
-      }
-    }
-
-    void merge(String json, Message.Builder builder) throws InvalidProtocolBufferException {
-      try {
-        JsonReader reader = new JsonReader(new StringReader(json));
-        reader.setLenient(false);
-        merge(JsonParser.parseReader(reader), builder);
-      } catch (RuntimeException e) {
-        // We convert all exceptions from JSON parsing to our own exceptions.
-        InvalidProtocolBufferException toThrow = new InvalidProtocolBufferException(e.getMessage());
-        toThrow.initCause(e);
-        throw toThrow;
-      }
-    }
-
-    private interface WellKnownTypeParser {
-      void merge(ParserImpl parser, JsonElement json, Message.Builder builder)
-          throws InvalidProtocolBufferException;
-    }
-
-    private static final Map<String, WellKnownTypeParser> wellKnownTypeParsers =
-        buildWellKnownTypeParsers();
-
-    private static Map<String, WellKnownTypeParser> buildWellKnownTypeParsers() {
-      Map<String, WellKnownTypeParser> parsers = new HashMap<String, WellKnownTypeParser>();
-      // Special-case Any.
-      parsers.put(
-          Any.getDescriptor().getFullName(),
-          new WellKnownTypeParser() {
-            @Override
-            public void merge(ParserImpl parser, JsonElement json, Message.Builder builder)
-                throws InvalidProtocolBufferException {
-              parser.mergeAny(json, builder);
-            }
-          });
-      // Special-case wrapper types.
-      WellKnownTypeParser wrappersPrinter =
-          new WellKnownTypeParser() {
-            @Override
-            public void merge(ParserImpl parser, JsonElement json, Message.Builder builder)
-                throws InvalidProtocolBufferException {
-              parser.mergeWrapper(json, builder);
-            }
-          };
-      parsers.put(BoolValue.getDescriptor().getFullName(), wrappersPrinter);
-      parsers.put(Int32Value.getDescriptor().getFullName(), wrappersPrinter);
-      parsers.put(UInt32Value.getDescriptor().getFullName(), wrappersPrinter);
-      parsers.put(Int64Value.getDescriptor().getFullName(), wrappersPrinter);
-      parsers.put(UInt64Value.getDescriptor().getFullName(), wrappersPrinter);
-      parsers.put(StringValue.getDescriptor().getFullName(), wrappersPrinter);
-      parsers.put(BytesValue.getDescriptor().getFullName(), wrappersPrinter);
-      parsers.put(FloatValue.getDescriptor().getFullName(), wrappersPrinter);
-      parsers.put(DoubleValue.getDescriptor().getFullName(), wrappersPrinter);
-      // Special-case Timestamp.
-      parsers.put(
-          Timestamp.getDescriptor().getFullName(),
-          new WellKnownTypeParser() {
-            @Override
-            public void merge(ParserImpl parser, JsonElement json, Message.Builder builder)
-                throws InvalidProtocolBufferException {
-              parser.mergeTimestamp(json, builder);
-            }
-          });
-      // Special-case Duration.
-      parsers.put(
-          Duration.getDescriptor().getFullName(),
-          new WellKnownTypeParser() {
-            @Override
-            public void merge(ParserImpl parser, JsonElement json, Message.Builder builder)
-                throws InvalidProtocolBufferException {
-              parser.mergeDuration(json, builder);
-            }
-          });
-      // Special-case FieldMask.
-      parsers.put(
-          FieldMask.getDescriptor().getFullName(),
-          new WellKnownTypeParser() {
-            @Override
-            public void merge(ParserImpl parser, JsonElement json, Message.Builder builder)
-                throws InvalidProtocolBufferException {
-              parser.mergeFieldMask(json, builder);
-            }
-          });
-      // Special-case Struct.
-      parsers.put(
-          Struct.getDescriptor().getFullName(),
-          new WellKnownTypeParser() {
-            @Override
-            public void merge(ParserImpl parser, JsonElement json, Message.Builder builder)
-                throws InvalidProtocolBufferException {
-              parser.mergeStruct(json, builder);
-            }
-          });
-      // Special-case ListValue.
-      parsers.put(
-          ListValue.getDescriptor().getFullName(),
-          new WellKnownTypeParser() {
-            @Override
-            public void merge(ParserImpl parser, JsonElement json, Message.Builder builder)
-                throws InvalidProtocolBufferException {
-              parser.mergeListValue(json, builder);
-            }
-          });
-      // Special-case Value.
-      parsers.put(
-          Value.getDescriptor().getFullName(),
-          new WellKnownTypeParser() {
-            @Override
-            public void merge(ParserImpl parser, JsonElement json, Message.Builder builder)
-                throws InvalidProtocolBufferException {
-              parser.mergeValue(json, builder);
-            }
-          });
-      return parsers;
-    }
-
-    private void merge(JsonElement json, Message.Builder builder)
-        throws InvalidProtocolBufferException {
-      WellKnownTypeParser specialParser =
-          wellKnownTypeParsers.get(builder.getDescriptorForType().getFullName());
-      if (specialParser != null) {
-        specialParser.merge(this, json, builder);
-        return;
-      }
-      mergeMessage(json, builder, false);
-    }
-
-    // Maps from camel-case field names to FieldDescriptor.
-    private final Map<Descriptor, Map<String, FieldDescriptor>> fieldNameMaps =
-        new HashMap<Descriptor, Map<String, FieldDescriptor>>();
-
-    private Map<String, FieldDescriptor> getFieldNameMap(Descriptor descriptor) {
-      if (!fieldNameMaps.containsKey(descriptor)) {
-        Map<String, FieldDescriptor> fieldNameMap = new HashMap<String, FieldDescriptor>();
-        for (FieldDescriptor field : descriptor.getFields()) {
-          fieldNameMap.put(field.getName(), field);
-          fieldNameMap.put(field.getJsonName(), field);
-        }
-        fieldNameMaps.put(descriptor, fieldNameMap);
-        return fieldNameMap;
-      }
-      return fieldNameMaps.get(descriptor);
-    }
-
-    private void mergeMessage(JsonElement json, Message.Builder builder, boolean skipTypeUrl)
-        throws InvalidProtocolBufferException {
-      if (!(json instanceof JsonObject)) {
-        throw new InvalidProtocolBufferException("Expect message object but got: " + json);
-      }
-      JsonObject object = (JsonObject) json;
-      Map<String, FieldDescriptor> fieldNameMap = getFieldNameMap(builder.getDescriptorForType());
-      for (Map.Entry<String, JsonElement> entry : object.entrySet()) {
-        if (skipTypeUrl && entry.getKey().equals("@type")) {
-          continue;
-        }
-        FieldDescriptor field = fieldNameMap.get(entry.getKey());
-        if (field == null) {
-          if (ignoringUnknownFields) {
-            continue;
-          }
-          throw new InvalidProtocolBufferException(
-              "Cannot find field: "
-                  + entry.getKey()
-                  + " in message "
-                  + builder.getDescriptorForType().getFullName());
-        }
-        mergeField(field, entry.getValue(), builder);
-      }
-    }
-
-    private void mergeAny(JsonElement json, Message.Builder builder)
-        throws InvalidProtocolBufferException {
-      Descriptor descriptor = builder.getDescriptorForType();
-      FieldDescriptor typeUrlField = descriptor.findFieldByName("type_url");
-      FieldDescriptor valueField = descriptor.findFieldByName("value");
-      // Validates type of the message. Note that we can't just cast the message
-      // to com.google.protobuf.Any because it might be a DynamicMessage.
-      if (typeUrlField == null
-          || valueField == null
-          || typeUrlField.getType() != FieldDescriptor.Type.STRING
-          || valueField.getType() != FieldDescriptor.Type.BYTES) {
-        throw new InvalidProtocolBufferException("Invalid Any type.");
-      }
-
-      if (!(json instanceof JsonObject)) {
-        throw new InvalidProtocolBufferException("Expect message object but got: " + json);
-      }
-      JsonObject object = (JsonObject) json;
-      if (object.entrySet().isEmpty()) {
-        return; // builder never modified, so it will end up building the default instance of Any
-      }
-      JsonElement typeUrlElement = object.get("@type");
-      if (typeUrlElement == null) {
-        throw new InvalidProtocolBufferException("Missing type url when parsing: " + json);
-      }
-      String typeUrl = typeUrlElement.getAsString();
-      Descriptor contentType = registry.getDescriptorForTypeUrl(typeUrl);
-      if (contentType == null) {
-        contentType = oldRegistry.getDescriptorForTypeUrl(typeUrl);
-        if (contentType == null) {
-          throw new InvalidProtocolBufferException("Cannot resolve type: " + typeUrl);
-        }
-      }
-      builder.setField(typeUrlField, typeUrl);
-      Message.Builder contentBuilder =
-          DynamicMessage.getDefaultInstance(contentType).newBuilderForType();
-      WellKnownTypeParser specialParser = wellKnownTypeParsers.get(contentType.getFullName());
-      if (specialParser != null) {
-        JsonElement value = object.get("value");
-        if (value != null) {
-          specialParser.merge(this, value, contentBuilder);
-        }
-      } else {
-        mergeMessage(json, contentBuilder, true);
-      }
-      builder.setField(valueField, contentBuilder.build().toByteString());
-    }
-
-    private void mergeFieldMask(JsonElement json, Message.Builder builder)
-        throws InvalidProtocolBufferException {
-      FieldMask value = FieldMaskUtil.fromJsonString(json.getAsString());
-      builder.mergeFrom(value.toByteString());
-    }
-
-    private void mergeTimestamp(JsonElement json, Message.Builder builder)
-        throws InvalidProtocolBufferException {
-      try {
-        Timestamp value = Timestamps.parse(json.getAsString());
-        builder.mergeFrom(value.toByteString());
-      } catch (ParseException | UnsupportedOperationException e) {
-        InvalidProtocolBufferException ex = new InvalidProtocolBufferException(
-            "Failed to parse timestamp: " + json);
-        ex.initCause(e);
-        throw ex;
-      }
-    }
-
-    private void mergeDuration(JsonElement json, Message.Builder builder)
-        throws InvalidProtocolBufferException {
-      try {
-        Duration value = Durations.parse(json.getAsString());
-        builder.mergeFrom(value.toByteString());
-      } catch (ParseException | UnsupportedOperationException e) {
-        InvalidProtocolBufferException ex = new InvalidProtocolBufferException(
-            "Failed to parse duration: " + json);
-        ex.initCause(e);
-        throw ex;
-      }
-    }
-
-    private void mergeStruct(JsonElement json, Message.Builder builder)
-        throws InvalidProtocolBufferException {
-      Descriptor descriptor = builder.getDescriptorForType();
-      FieldDescriptor field = descriptor.findFieldByName("fields");
-      if (field == null) {
-        throw new InvalidProtocolBufferException("Invalid Struct type.");
-      }
-      mergeMapField(field, json, builder);
-    }
-
-    private void mergeListValue(JsonElement json, Message.Builder builder)
-        throws InvalidProtocolBufferException {
-      Descriptor descriptor = builder.getDescriptorForType();
-      FieldDescriptor field = descriptor.findFieldByName("values");
-      if (field == null) {
-        throw new InvalidProtocolBufferException("Invalid ListValue type.");
-      }
-      mergeRepeatedField(field, json, builder);
-    }
-
-    private void mergeValue(JsonElement json, Message.Builder builder)
-        throws InvalidProtocolBufferException {
-      Descriptor type = builder.getDescriptorForType();
-      if (json instanceof JsonPrimitive) {
-        JsonPrimitive primitive = (JsonPrimitive) json;
-        if (primitive.isBoolean()) {
-          builder.setField(type.findFieldByName("bool_value"), primitive.getAsBoolean());
-        } else if (primitive.isNumber()) {
-          builder.setField(type.findFieldByName("number_value"), primitive.getAsDouble());
-        } else {
-          builder.setField(type.findFieldByName("string_value"), primitive.getAsString());
-        }
-      } else if (json instanceof JsonObject) {
-        FieldDescriptor field = type.findFieldByName("struct_value");
-        Message.Builder structBuilder = builder.newBuilderForField(field);
-        merge(json, structBuilder);
-        builder.setField(field, structBuilder.build());
-      } else if (json instanceof JsonArray) {
-        FieldDescriptor field = type.findFieldByName("list_value");
-        Message.Builder listBuilder = builder.newBuilderForField(field);
-        merge(json, listBuilder);
-        builder.setField(field, listBuilder.build());
-      } else if (json instanceof JsonNull) {
-        builder.setField(
-            type.findFieldByName("null_value"), NullValue.NULL_VALUE.getValueDescriptor());
-      } else {
-        throw new IllegalStateException("Unexpected json data: " + json);
-      }
-    }
-
-    private void mergeWrapper(JsonElement json, Message.Builder builder)
-        throws InvalidProtocolBufferException {
-      Descriptor type = builder.getDescriptorForType();
-      FieldDescriptor field = type.findFieldByName("value");
-      if (field == null) {
-        throw new InvalidProtocolBufferException("Invalid wrapper type: " + type.getFullName());
-      }
-      builder.setField(field, parseFieldValue(field, json, builder));
-    }
-
-    private void mergeField(FieldDescriptor field, JsonElement json, Message.Builder builder)
-        throws InvalidProtocolBufferException {
-      if (field.isRepeated()) {
-        if (builder.getRepeatedFieldCount(field) > 0) {
-          throw new InvalidProtocolBufferException(
-              "Field " + field.getFullName() + " has already been set.");
-        }
-      } else {
-        if (builder.hasField(field)) {
-          throw new InvalidProtocolBufferException(
-              "Field " + field.getFullName() + " has already been set.");
-        }
-      }
-      if (field.isRepeated() && json instanceof JsonNull) {
-        // We allow "null" as value for all field types and treat it as if the
-        // field is not present.
-        return;
-      }
-      if (field.isMapField()) {
-        mergeMapField(field, json, builder);
-      } else if (field.isRepeated()) {
-        mergeRepeatedField(field, json, builder);
-      } else if (field.getContainingOneof() != null) {
-        mergeOneofField(field, json, builder);
-      } else {
-        Object value = parseFieldValue(field, json, builder);
-        if (value != null) {
-          // A field interpreted as "null" is means it's treated as absent.
-          builder.setField(field, value);
-        }
-      }
-    }
-
-    private void mergeMapField(FieldDescriptor field, JsonElement json, Message.Builder builder)
-        throws InvalidProtocolBufferException {
-      if (!(json instanceof JsonObject)) {
-        throw new InvalidProtocolBufferException("Expect a map object but found: " + json);
-      }
-      Descriptor type = field.getMessageType();
-      FieldDescriptor keyField = type.findFieldByName("key");
-      FieldDescriptor valueField = type.findFieldByName("value");
-      if (keyField == null || valueField == null) {
-        throw new InvalidProtocolBufferException("Invalid map field: " + field.getFullName());
-      }
-      JsonObject object = (JsonObject) json;
-      for (Map.Entry<String, JsonElement> entry : object.entrySet()) {
-        Message.Builder entryBuilder = builder.newBuilderForField(field);
-        Object key = parseFieldValue(keyField, new JsonPrimitive(entry.getKey()), entryBuilder);
-        Object value = parseFieldValue(valueField, entry.getValue(), entryBuilder);
-        if (value == null) {
-          if (ignoringUnknownFields && valueField.getType() == Type.ENUM) {
-            continue;
-          } else {
-            throw new InvalidProtocolBufferException("Map value cannot be null.");
-          }
-        }
-        entryBuilder.setField(keyField, key);
-        entryBuilder.setField(valueField, value);
-        builder.addRepeatedField(field, entryBuilder.build());
-      }
-    }
-
-    private void mergeOneofField(FieldDescriptor field, JsonElement json, Message.Builder builder)
-        throws InvalidProtocolBufferException {
-      Object value = parseFieldValue(field, json, builder);
-      if (value == null) {
-        // A field interpreted as "null" is means it's treated as absent.
-        return;
-      }
-      if (builder.getOneofFieldDescriptor(field.getContainingOneof()) != null) {
-        throw new InvalidProtocolBufferException(
-            "Cannot set field "
-                + field.getFullName()
-                + " because another field "
-                + builder.getOneofFieldDescriptor(field.getContainingOneof()).getFullName()
-                + " belonging to the same oneof has already been set ");
-      }
-      builder.setField(field, value);
-    }
-
-    private void mergeRepeatedField(
-        FieldDescriptor field, JsonElement json, Message.Builder builder)
-        throws InvalidProtocolBufferException {
-      if (!(json instanceof JsonArray)) {
-        throw new InvalidProtocolBufferException(
-            "Expected an array for " + field.getName() + " but found " + json);
-      }
-      JsonArray array = (JsonArray) json;
-      for (int i = 0; i < array.size(); ++i) {
-        Object value = parseFieldValue(field, array.get(i), builder);
-        if (value == null) {
-          if (ignoringUnknownFields && field.getType() == Type.ENUM) {
-            continue;
-          } else {
-            throw new InvalidProtocolBufferException(
-                "Repeated field elements cannot be null in field: " + field.getFullName());
-          }
-        }
-        builder.addRepeatedField(field, value);
-      }
-    }
-
-    private int parseInt32(JsonElement json) throws InvalidProtocolBufferException {
-      try {
-        return Integer.parseInt(json.getAsString());
-      } catch (RuntimeException e) {
-        // Fall through.
-      }
-      // JSON doesn't distinguish between integer values and floating point values so "1" and
-      // "1.000" are treated as equal in JSON. For this reason we accept floating point values for
-      // integer fields as well as long as it actually is an integer (i.e., round(value) == value).
-      try {
-        BigDecimal value = new BigDecimal(json.getAsString());
-        return value.intValueExact();
-      } catch (RuntimeException e) {
-        InvalidProtocolBufferException ex = new InvalidProtocolBufferException(
-            "Not an int32 value: " + json);
-        ex.initCause(e);
-        throw ex;
-      }
-    }
-
-    private long parseInt64(JsonElement json) throws InvalidProtocolBufferException {
-      try {
-        return Long.parseLong(json.getAsString());
-      } catch (RuntimeException e) {
-        // Fall through.
-      }
-      // JSON doesn't distinguish between integer values and floating point values so "1" and
-      // "1.000" are treated as equal in JSON. For this reason we accept floating point values for
-      // integer fields as well as long as it actually is an integer (i.e., round(value) == value).
-      try {
-        BigDecimal value = new BigDecimal(json.getAsString());
-        return value.longValueExact();
-      } catch (RuntimeException e) {
-        InvalidProtocolBufferException ex = new InvalidProtocolBufferException(
-            "Not an int64 value: " + json);
-        ex.initCause(e);
-        throw ex;
-      }
-    }
-
-    private int parseUint32(JsonElement json) throws InvalidProtocolBufferException {
-      try {
-        long result = Long.parseLong(json.getAsString());
-        if (result < 0 || result > 0xFFFFFFFFL) {
-          throw new InvalidProtocolBufferException("Out of range uint32 value: " + json);
-        }
-        return (int) result;
-      } catch (RuntimeException e) {
-        // Fall through.
-      }
-      // JSON doesn't distinguish between integer values and floating point values so "1" and
-      // "1.000" are treated as equal in JSON. For this reason we accept floating point values for
-      // integer fields as well as long as it actually is an integer (i.e., round(value) == value).
-      try {
-        BigDecimal decimalValue = new BigDecimal(json.getAsString());
-        BigInteger value = decimalValue.toBigIntegerExact();
-        if (value.signum() < 0 || value.compareTo(new BigInteger("FFFFFFFF", 16)) > 0) {
-          throw new InvalidProtocolBufferException("Out of range uint32 value: " + json);
-        }
-        return value.intValue();
-      } catch (RuntimeException e) {
-        InvalidProtocolBufferException ex = new InvalidProtocolBufferException(
-            "Not an uint32 value: " + json);
-        ex.initCause(e);
-        throw ex;
-      }
-    }
-
-    private static final BigInteger MAX_UINT64 = new BigInteger("FFFFFFFFFFFFFFFF", 16);
-
-    private long parseUint64(JsonElement json) throws InvalidProtocolBufferException {
-      try {
-        BigDecimal decimalValue = new BigDecimal(json.getAsString());
-        BigInteger value = decimalValue.toBigIntegerExact();
-        if (value.compareTo(BigInteger.ZERO) < 0 || value.compareTo(MAX_UINT64) > 0) {
-          throw new InvalidProtocolBufferException("Out of range uint64 value: " + json);
-        }
-        return value.longValue();
-      } catch (RuntimeException e) {
-        InvalidProtocolBufferException ex = new InvalidProtocolBufferException(
-            "Not an uint64 value: " + json);
-        ex.initCause(e);
-        throw ex;
-      }
-    }
-
-    private boolean parseBool(JsonElement json) throws InvalidProtocolBufferException {
-      if (json.getAsString().equals("true")) {
-        return true;
-      }
-      if (json.getAsString().equals("false")) {
-        return false;
-      }
-      throw new InvalidProtocolBufferException("Invalid bool value: " + json);
-    }
-
-    private static final double EPSILON = 1e-6;
-
-    private float parseFloat(JsonElement json) throws InvalidProtocolBufferException {
-      if (json.getAsString().equals("NaN")) {
-        return Float.NaN;
-      } else if (json.getAsString().equals("Infinity")) {
-        return Float.POSITIVE_INFINITY;
-      } else if (json.getAsString().equals("-Infinity")) {
-        return Float.NEGATIVE_INFINITY;
-      }
-      try {
-        // We don't use Float.parseFloat() here because that function simply
-        // accepts all double values. Here we parse the value into a Double
-        // and do explicit range check on it.
-        double value = Double.parseDouble(json.getAsString());
-        // When a float value is printed, the printed value might be a little
-        // larger or smaller due to precision loss. Here we need to add a bit
-        // of tolerance when checking whether the float value is in range.
-        if (value > Float.MAX_VALUE * (1.0 + EPSILON)
-            || value < -Float.MAX_VALUE * (1.0 + EPSILON)) {
-          throw new InvalidProtocolBufferException("Out of range float value: " + json);
-        }
-        return (float) value;
-      } catch (RuntimeException e) {
-        InvalidProtocolBufferException ex = new InvalidProtocolBufferException(
-            "Not a float value: " + json);
-        ex.initCause(e);
-        throw e;
-      }
-    }
-
-    private static final BigDecimal MORE_THAN_ONE = new BigDecimal(String.valueOf(1.0 + EPSILON));
-    // When a float value is printed, the printed value might be a little
-    // larger or smaller due to precision loss. Here we need to add a bit
-    // of tolerance when checking whether the float value is in range.
-    private static final BigDecimal MAX_DOUBLE =
-        new BigDecimal(String.valueOf(Double.MAX_VALUE)).multiply(MORE_THAN_ONE);
-    private static final BigDecimal MIN_DOUBLE =
-        new BigDecimal(String.valueOf(-Double.MAX_VALUE)).multiply(MORE_THAN_ONE);
-
-    private double parseDouble(JsonElement json) throws InvalidProtocolBufferException {
-      if (json.getAsString().equals("NaN")) {
-        return Double.NaN;
-      } else if (json.getAsString().equals("Infinity")) {
-        return Double.POSITIVE_INFINITY;
-      } else if (json.getAsString().equals("-Infinity")) {
-        return Double.NEGATIVE_INFINITY;
-      }
-      try {
-        // We don't use Double.parseDouble() here because that function simply
-        // accepts all values. Here we parse the value into a BigDecimal and do
-        // explicit range check on it.
-        BigDecimal value = new BigDecimal(json.getAsString());
-        if (value.compareTo(MAX_DOUBLE) > 0 || value.compareTo(MIN_DOUBLE) < 0) {
-          throw new InvalidProtocolBufferException("Out of range double value: " + json);
-        }
-        return value.doubleValue();
-      } catch (RuntimeException e) {
-        InvalidProtocolBufferException ex = new InvalidProtocolBufferException(
-            "Not a double value: " + json);
-        ex.initCause(e);
-        throw ex;
-      }
-    }
-
-    private String parseString(JsonElement json) {
-      return json.getAsString();
-    }
-
-    private ByteString parseBytes(JsonElement json) {
-      try {
-        return ByteString.copyFrom(BaseEncoding.base64().decode(json.getAsString()));
-      } catch (IllegalArgumentException e) {
-        return ByteString.copyFrom(BaseEncoding.base64Url().decode(json.getAsString()));
-      }
-    }
-
-    @Nullable
-    private EnumValueDescriptor parseEnum(EnumDescriptor enumDescriptor, JsonElement json)
-        throws InvalidProtocolBufferException {
-      String value = json.getAsString();
-      EnumValueDescriptor result = enumDescriptor.findValueByName(value);
-      if (result == null) {
-        // Try to interpret the value as a number.
-        try {
-          int numericValue = parseInt32(json);
-          if (enumDescriptor.getFile().getSyntax() == FileDescriptor.Syntax.PROTO3) {
-            result = enumDescriptor.findValueByNumberCreatingIfUnknown(numericValue);
-          } else {
-            result = enumDescriptor.findValueByNumber(numericValue);
-          }
-        } catch (InvalidProtocolBufferException e) {
-          // Fall through. This exception is about invalid int32 value we get from parseInt32() but
-          // that's not the exception we want the user to see. Since result == null, we will throw
-          // an exception later.
-        }
-
-        // todo(elharo): if we are ignoring unknown fields, shouldn't we still
-        // throw InvalidProtocolBufferException for a non-numeric value here?
-        if (result == null && !ignoringUnknownFields) {
-          throw new InvalidProtocolBufferException(
-              "Invalid enum value: " + value + " for enum type: " + enumDescriptor.getFullName());
-        }
-      }
-      return result;
-    }
-
-    @Nullable
-    private Object parseFieldValue(FieldDescriptor field, JsonElement json, Message.Builder builder)
-        throws InvalidProtocolBufferException {
-      if (json instanceof JsonNull) {
-        if (field.getJavaType() == FieldDescriptor.JavaType.MESSAGE
-            && field.getMessageType().getFullName().equals(Value.getDescriptor().getFullName())) {
-          // For every other type, "null" means absence, but for the special
-          // Value message, it means the "null_value" field has been set.
-          Value value = Value.newBuilder().setNullValueValue(0).build();
-          return builder.newBuilderForField(field).mergeFrom(value.toByteString()).build();
-        } else if (field.getJavaType() == FieldDescriptor.JavaType.ENUM
-            && field.getEnumType().getFullName().equals(NullValue.getDescriptor().getFullName())) {
-          // If the type of the field is a NullValue, then the value should be explicitly set.
-          return field.getEnumType().findValueByNumber(0);
-        }
-        return null;
-      } else if (json instanceof JsonObject) {
-        if (field.getType() != FieldDescriptor.Type.MESSAGE
-            && field.getType() != FieldDescriptor.Type.GROUP) {
-          // If the field type is primitive, but the json type is JsonObject rather than
-          // JsonElement, throw a type mismatch error.
-          throw new InvalidProtocolBufferException(
-              String.format("Invalid value: %s for expected type: %s", json, field.getType()));
-        }
-      }
-      switch (field.getType()) {
-        case INT32:
-        case SINT32:
-        case SFIXED32:
-          return parseInt32(json);
-
-        case INT64:
-        case SINT64:
-        case SFIXED64:
-          return parseInt64(json);
-
-        case BOOL:
-          return parseBool(json);
-
-        case FLOAT:
-          return parseFloat(json);
-
-        case DOUBLE:
-          return parseDouble(json);
-
-        case UINT32:
-        case FIXED32:
-          return parseUint32(json);
-
-        case UINT64:
-        case FIXED64:
-          return parseUint64(json);
-
-        case STRING:
-          return parseString(json);
-
-        case BYTES:
-          return parseBytes(json);
-
-        case ENUM:
-          return parseEnum(field.getEnumType(), json);
-
-        case MESSAGE:
-        case GROUP:
-          if (currentDepth >= recursionLimit) {
-            throw new InvalidProtocolBufferException("Hit recursion limit.");
-          }
-          ++currentDepth;
-          Message.Builder subBuilder = builder.newBuilderForField(field);
-          merge(json, subBuilder);
-          --currentDepth;
-          return subBuilder.build();
-
-        default:
-          throw new InvalidProtocolBufferException("Invalid field type: " + field.getType());
-      }
-    }
-  }
-}
diff --git a/libs/protobuf/java/util/src/main/java/com/google/protobuf/util/Structs.java b/libs/protobuf/java/util/src/main/java/com/google/protobuf/util/Structs.java
deleted file mode 100644
index b1696ec..0000000
--- a/libs/protobuf/java/util/src/main/java/com/google/protobuf/util/Structs.java
+++ /dev/null
@@ -1,65 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf.util;
-
-import com.google.protobuf.Struct;
-import com.google.protobuf.Value;
-
-/** Utilities to help create {@code google.protobuf.Struct} messages. */
-public final class Structs {
-
-  /**
-   * Returns a struct containing the key-value pair.
-   */
-  public static Struct of(String k1, Value v1) {
-    return Struct.newBuilder().putFields(k1, v1).build();
-  }
-
-  /**
-   * Returns a struct containing each of the key-value pairs.
-   *
-   * <p>Providing duplicate keys is undefined behavior.
-   */
-  public static Struct of(String k1, Value v1, String k2, Value v2) {
-    return Struct.newBuilder().putFields(k1, v1).putFields(k2, v2).build();
-  }
-
-  /**
-   * Returns a struct containing each of the key-value pairs.
-   *
-   * <p>Providing duplicate keys is undefined behavior.
-   */
-  public static Struct of(String k1, Value v1, String k2, Value v2, String k3, Value v3) {
-    return Struct.newBuilder().putFields(k1, v1).putFields(k2, v2).putFields(k3, v3).build();
-  }
-
-  private Structs() {}
-}
diff --git a/libs/protobuf/java/util/src/main/java/com/google/protobuf/util/Timestamps.java b/libs/protobuf/java/util/src/main/java/com/google/protobuf/util/Timestamps.java
deleted file mode 100644
index 95f3665..0000000
--- a/libs/protobuf/java/util/src/main/java/com/google/protobuf/util/Timestamps.java
+++ /dev/null
@@ -1,484 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf.util;
-
-import static com.google.common.math.IntMath.checkedAdd;
-import static com.google.common.math.IntMath.checkedSubtract;
-import static com.google.common.math.LongMath.checkedAdd;
-import static com.google.common.math.LongMath.checkedMultiply;
-import static com.google.common.math.LongMath.checkedSubtract;
-
-import com.google.errorprone.annotations.CanIgnoreReturnValue;
-import com.google.errorprone.annotations.CompileTimeConstant;
-import com.google.j2objc.annotations.J2ObjCIncompatible;
-import com.google.protobuf.Duration;
-import com.google.protobuf.Timestamp;
-import java.io.Serializable;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.Locale;
-import java.util.TimeZone;
-
-/**
- * Utilities to help create/manipulate {@code protobuf/timestamp.proto}. All operations throw an
- * {@link IllegalArgumentException} if the input(s) are not {@linkplain #isValid(Timestamp) valid}.
- */
-public final class Timestamps {
-
-  // Timestamp for "0001-01-01T00:00:00Z"
-  static final long TIMESTAMP_SECONDS_MIN = -62135596800L;
-
-  // Timestamp for "9999-12-31T23:59:59Z"
-  static final long TIMESTAMP_SECONDS_MAX = 253402300799L;
-
-  static final int NANOS_PER_SECOND = 1000000000;
-  static final int NANOS_PER_MILLISECOND = 1000000;
-  static final int NANOS_PER_MICROSECOND = 1000;
-  static final int MILLIS_PER_SECOND = 1000;
-  static final int MICROS_PER_SECOND = 1000000;
-
-  /** A constant holding the minimum valid {@link Timestamp}, {@code 0001-01-01T00:00:00Z}. */
-  public static final Timestamp MIN_VALUE =
-      Timestamp.newBuilder().setSeconds(TIMESTAMP_SECONDS_MIN).setNanos(0).build();
-
-  /**
-   * A constant holding the maximum valid {@link Timestamp}, {@code 9999-12-31T23:59:59.999999999Z}.
-   */
-  public static final Timestamp MAX_VALUE =
-      Timestamp.newBuilder().setSeconds(TIMESTAMP_SECONDS_MAX).setNanos(999999999).build();
-
-  /**
-   * A constant holding the {@link Timestamp} of epoch time, {@code 1970-01-01T00:00:00.000000000Z}.
-   */
-  public static final Timestamp EPOCH = Timestamp.newBuilder().setSeconds(0).setNanos(0).build();
-
-  private static final ThreadLocal<SimpleDateFormat> timestampFormat =
-      new ThreadLocal<SimpleDateFormat>() {
-        @Override
-        protected SimpleDateFormat initialValue() {
-          return createTimestampFormat();
-        }
-      };
-
-  private static SimpleDateFormat createTimestampFormat() {
-    SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss", Locale.ENGLISH);
-    GregorianCalendar calendar = new GregorianCalendar(TimeZone.getTimeZone("UTC"));
-    // We use Proleptic Gregorian Calendar (i.e., Gregorian calendar extends
-    // backwards to year one) for timestamp formatting.
-    calendar.setGregorianChange(new Date(Long.MIN_VALUE));
-    sdf.setCalendar(calendar);
-    return sdf;
-  }
-
-  private Timestamps() {}
-
-  private static enum TimestampComparator implements Comparator<Timestamp>, Serializable {
-    INSTANCE;
-
-    @Override
-    public int compare(Timestamp t1, Timestamp t2) {
-      checkValid(t1);
-      checkValid(t2);
-      int secDiff = Long.compare(t1.getSeconds(), t2.getSeconds());
-      return (secDiff != 0) ? secDiff : Integer.compare(t1.getNanos(), t2.getNanos());
-    }
-  }
-
-  /**
-   * Returns a {@link Comparator} for {@link Timestamp Timestamps} which sorts in increasing
-   * chronological order. Nulls and invalid {@link Timestamp Timestamps} are not allowed (see
-   * {@link #isValid}). The returned comparator is serializable.
-   */
-  public static Comparator<Timestamp> comparator() {
-    return TimestampComparator.INSTANCE;
-  }
-
-  /**
-   * Compares two timestamps. The value returned is identical to what would be returned by: {@code
-   * Timestamps.comparator().compare(x, y)}.
-   *
-   * @return the value {@code 0} if {@code x == y}; a value less than {@code 0} if {@code x < y};
-   *     and a value greater than {@code 0} if {@code x > y}
-   */
-  public static int compare(Timestamp x, Timestamp y) {
-    return TimestampComparator.INSTANCE.compare(x, y);
-  }
-
-  /**
-   * Returns true if the given {@link Timestamp} is valid. The {@code seconds} value must be in the
-   * range [-62,135,596,800, +253,402,300,799] (i.e., between 0001-01-01T00:00:00Z and
-   * 9999-12-31T23:59:59Z). The {@code nanos} value must be in the range [0, +999,999,999].
-   *
-   * <p><b>Note:</b> Negative second values with fractional seconds must still have non-negative
-   * nanos values that count forward in time.
-   */
-  public static boolean isValid(Timestamp timestamp) {
-    return isValid(timestamp.getSeconds(), timestamp.getNanos());
-  }
-
-  /**
-   * Returns true if the given number of seconds and nanos is a valid {@link Timestamp}. The {@code
-   * seconds} value must be in the range [-62,135,596,800, +253,402,300,799] (i.e., between
-   * 0001-01-01T00:00:00Z and 9999-12-31T23:59:59Z). The {@code nanos} value must be in the range
-   * [0, +999,999,999].
-   *
-   * <p><b>Note:</b> Negative second values with fractional seconds must still have non-negative
-   * nanos values that count forward in time.
-   */
-  @SuppressWarnings("GoodTime") // this is a legacy conversion API
-  public static boolean isValid(long seconds, int nanos) {
-    if (seconds < TIMESTAMP_SECONDS_MIN || seconds > TIMESTAMP_SECONDS_MAX) {
-      return false;
-    }
-    if (nanos < 0 || nanos >= NANOS_PER_SECOND) {
-      return false;
-    }
-    return true;
-  }
-
-  /** Throws an {@link IllegalArgumentException} if the given {@link Timestamp} is not valid. */
-  @CanIgnoreReturnValue
-  public static Timestamp checkValid(Timestamp timestamp) {
-    long seconds = timestamp.getSeconds();
-    int nanos = timestamp.getNanos();
-    if (!isValid(seconds, nanos)) {
-      throw new IllegalArgumentException(
-          String.format(
-              "Timestamp is not valid. See proto definition for valid values. "
-                  + "Seconds (%s) must be in range [-62,135,596,800, +253,402,300,799]. "
-                  + "Nanos (%s) must be in range [0, +999,999,999].",
-              seconds, nanos));
-    }
-    return timestamp;
-  }
-
-  /**
-   * Builds the given builder and throws an {@link IllegalArgumentException} if it is not valid. See
-   * {@link #checkValid(Timestamp)}.
-   *
-   * @return A valid, built {@link Timestamp}.
-   */
-  public static Timestamp checkValid(Timestamp.Builder timestampBuilder) {
-    return checkValid(timestampBuilder.build());
-  }
-
-  /**
-   * Convert Timestamp to RFC 3339 date string format. The output will always be Z-normalized and
-   * uses 3, 6 or 9 fractional digits as required to represent the exact value. Note that Timestamp
-   * can only represent time from 0001-01-01T00:00:00Z to 9999-12-31T23:59:59.999999999Z. See
-   * https://www.ietf.org/rfc/rfc3339.txt
-   *
-   * <p>Example of generated format: "1972-01-01T10:00:20.021Z"
-   *
-   * @return The string representation of the given timestamp.
-   * @throws IllegalArgumentException if the given timestamp is not in the valid range.
-   */
-  public static String toString(Timestamp timestamp) {
-    checkValid(timestamp);
-
-    long seconds = timestamp.getSeconds();
-    int nanos = timestamp.getNanos();
-
-    StringBuilder result = new StringBuilder();
-    // Format the seconds part.
-    Date date = new Date(seconds * MILLIS_PER_SECOND);
-    result.append(timestampFormat.get().format(date));
-    // Format the nanos part.
-    if (nanos != 0) {
-      result.append(".");
-      result.append(formatNanos(nanos));
-    }
-    result.append("Z");
-    return result.toString();
-  }
-
-  /**
-   * Parse from RFC 3339 date string to Timestamp. This method accepts all outputs of {@link
-   * #toString(Timestamp)} and it also accepts any fractional digits (or none) and any offset as
-   * long as they fit into nano-seconds precision.
-   *
-   * <p>Example of accepted format: "1972-01-01T10:00:20.021-05:00"
-   *
-   * @return a Timestamp parsed from the string
-   * @throws ParseException if parsing fails
-   */
-  public static Timestamp parse(String value) throws ParseException {
-    int dayOffset = value.indexOf('T');
-    if (dayOffset == -1) {
-      throw new ParseException("Failed to parse timestamp: invalid timestamp \"" + value + "\"", 0);
-    }
-    int timezoneOffsetPosition = value.indexOf('Z', dayOffset);
-    if (timezoneOffsetPosition == -1) {
-      timezoneOffsetPosition = value.indexOf('+', dayOffset);
-    }
-    if (timezoneOffsetPosition == -1) {
-      timezoneOffsetPosition = value.indexOf('-', dayOffset);
-    }
-    if (timezoneOffsetPosition == -1) {
-      throw new ParseException("Failed to parse timestamp: missing valid timezone offset.", 0);
-    }
-    // Parse seconds and nanos.
-    String timeValue = value.substring(0, timezoneOffsetPosition);
-    String secondValue = timeValue;
-    String nanoValue = "";
-    int pointPosition = timeValue.indexOf('.');
-    if (pointPosition != -1) {
-      secondValue = timeValue.substring(0, pointPosition);
-      nanoValue = timeValue.substring(pointPosition + 1);
-    }
-    Date date = timestampFormat.get().parse(secondValue);
-    long seconds = date.getTime() / MILLIS_PER_SECOND;
-    int nanos = nanoValue.isEmpty() ? 0 : parseNanos(nanoValue);
-    // Parse timezone offsets.
-    if (value.charAt(timezoneOffsetPosition) == 'Z') {
-      if (value.length() != timezoneOffsetPosition + 1) {
-        throw new ParseException(
-            "Failed to parse timestamp: invalid trailing data \""
-                + value.substring(timezoneOffsetPosition)
-                + "\"",
-            0);
-      }
-    } else {
-      String offsetValue = value.substring(timezoneOffsetPosition + 1);
-      long offset = parseTimezoneOffset(offsetValue);
-      if (value.charAt(timezoneOffsetPosition) == '+') {
-        seconds -= offset;
-      } else {
-        seconds += offset;
-      }
-    }
-    try {
-      return normalizedTimestamp(seconds, nanos);
-    } catch (IllegalArgumentException e) {
-      ParseException ex = new ParseException(
-          "Failed to parse timestamp " + value + " Timestamp is out of range.", 0);
-      ex.initCause(e);
-      throw ex;
-    }
-  }
-
-  /**
-   * Parses a string in RFC 3339 format into a {@link Timestamp}.
-   *
-   * <p>Identical to {@link #parse(String)}, but throws an {@link IllegalArgumentException} instead
-   * of a {@link ParseException} if parsing fails.
-   *
-   * @return a {@link Timestamp} parsed from the string
-   * @throws IllegalArgumentException if parsing fails
-   */
-  public static Timestamp parseUnchecked(@CompileTimeConstant String value) {
-    try {
-      return parse(value);
-    } catch (ParseException e) {
-      // While `java.time.format.DateTimeParseException` is a more accurate representation of the
-      // failure, this library is currently not JDK8 ready because of Android dependencies.
-      throw new IllegalArgumentException(e);
-    }
-  }
-
-  /** Create a Timestamp from the number of seconds elapsed from the epoch. */
-  @SuppressWarnings("GoodTime") // this is a legacy conversion API
-  public static Timestamp fromSeconds(long seconds) {
-    return normalizedTimestamp(seconds, 0);
-  }
-
-  /**
-   * Convert a Timestamp to the number of seconds elapsed from the epoch.
-   *
-   * <p>The result will be rounded down to the nearest second. E.g., if the timestamp represents
-   * "1969-12-31T23:59:59.999999999Z", it will be rounded to -1 second.
-   */
-  @SuppressWarnings("GoodTime") // this is a legacy conversion API
-  public static long toSeconds(Timestamp timestamp) {
-    return checkValid(timestamp).getSeconds();
-  }
-
-  /** Create a Timestamp from the number of milliseconds elapsed from the epoch. */
-  @SuppressWarnings("GoodTime") // this is a legacy conversion API
-  public static Timestamp fromMillis(long milliseconds) {
-    return normalizedTimestamp(
-        milliseconds / MILLIS_PER_SECOND,
-        (int) (milliseconds % MILLIS_PER_SECOND * NANOS_PER_MILLISECOND));
-  }
-
-  /**
-   * Create a Timestamp from a java.util.Date. If the java.util.Date is a java.sql.Timestamp,
-   * full nanonsecond precision is retained.
-   *
-   * @throws IllegalArgumentException if the year is before 1 CE or after 9999 CE
-   */
-  @SuppressWarnings("GoodTime") // this is a legacy conversion API
-  @J2ObjCIncompatible
-  public static Timestamp fromDate(Date date) {
-    if (date instanceof java.sql.Timestamp) {
-      java.sql.Timestamp sqlTimestamp = (java.sql.Timestamp) date;
-      long integralSeconds = sqlTimestamp.getTime() / 1000L; // truncate the fractional seconds
-      return Timestamp.newBuilder()
-          .setSeconds(integralSeconds)
-          .setNanos(sqlTimestamp.getNanos())
-          .build();
-    } else {
-      return fromMillis(date.getTime());
-    }
-  }
-
-  /**
-   * Convert a Timestamp to the number of milliseconds elapsed from the epoch.
-   *
-   * <p>The result will be rounded down to the nearest millisecond. For instance, if the timestamp
-   * represents "1969-12-31T23:59:59.999999999Z", it will be rounded to -1 millisecond.
-   */
-  @SuppressWarnings("GoodTime") // this is a legacy conversion API
-  public static long toMillis(Timestamp timestamp) {
-    checkValid(timestamp);
-    return checkedAdd(
-        checkedMultiply(timestamp.getSeconds(), MILLIS_PER_SECOND),
-        timestamp.getNanos() / NANOS_PER_MILLISECOND);
-  }
-
-  /** Create a Timestamp from the number of microseconds elapsed from the epoch. */
-  @SuppressWarnings("GoodTime") // this is a legacy conversion API
-  public static Timestamp fromMicros(long microseconds) {
-    return normalizedTimestamp(
-        microseconds / MICROS_PER_SECOND,
-        (int) (microseconds % MICROS_PER_SECOND * NANOS_PER_MICROSECOND));
-  }
-
-  /**
-   * Convert a Timestamp to the number of microseconds elapsed from the epoch.
-   *
-   * <p>The result will be rounded down to the nearest microsecond. E.g., if the timestamp
-   * represents "1969-12-31T23:59:59.999999999Z", it will be rounded to -1 microsecond.
-   */
-  @SuppressWarnings("GoodTime") // this is a legacy conversion API
-  public static long toMicros(Timestamp timestamp) {
-    checkValid(timestamp);
-    return checkedAdd(
-        checkedMultiply(timestamp.getSeconds(), MICROS_PER_SECOND),
-        timestamp.getNanos() / NANOS_PER_MICROSECOND);
-  }
-
-  /** Create a Timestamp from the number of nanoseconds elapsed from the epoch. */
-  @SuppressWarnings("GoodTime") // this is a legacy conversion API
-  public static Timestamp fromNanos(long nanoseconds) {
-    return normalizedTimestamp(
-        nanoseconds / NANOS_PER_SECOND, (int) (nanoseconds % NANOS_PER_SECOND));
-  }
-
-  /** Convert a Timestamp to the number of nanoseconds elapsed from the epoch. */
-  @SuppressWarnings("GoodTime") // this is a legacy conversion API
-  public static long toNanos(Timestamp timestamp) {
-    checkValid(timestamp);
-    return checkedAdd(
-        checkedMultiply(timestamp.getSeconds(), NANOS_PER_SECOND), timestamp.getNanos());
-  }
-
-  /** Calculate the difference between two timestamps. */
-  public static Duration between(Timestamp from, Timestamp to) {
-    checkValid(from);
-    checkValid(to);
-    return Durations.normalizedDuration(
-        checkedSubtract(to.getSeconds(), from.getSeconds()),
-        checkedSubtract(to.getNanos(), from.getNanos()));
-  }
-
-  /** Add a duration to a timestamp. */
-  public static Timestamp add(Timestamp start, Duration length) {
-    checkValid(start);
-    Durations.checkValid(length);
-    return normalizedTimestamp(
-        checkedAdd(start.getSeconds(), length.getSeconds()),
-        checkedAdd(start.getNanos(), length.getNanos()));
-  }
-
-  /** Subtract a duration from a timestamp. */
-  public static Timestamp subtract(Timestamp start, Duration length) {
-    checkValid(start);
-    Durations.checkValid(length);
-    return normalizedTimestamp(
-        checkedSubtract(start.getSeconds(), length.getSeconds()),
-        checkedSubtract(start.getNanos(), length.getNanos()));
-  }
-
-  static Timestamp normalizedTimestamp(long seconds, int nanos) {
-    if (nanos <= -NANOS_PER_SECOND || nanos >= NANOS_PER_SECOND) {
-      seconds = checkedAdd(seconds, nanos / NANOS_PER_SECOND);
-      nanos = (int) (nanos % NANOS_PER_SECOND);
-    }
-    if (nanos < 0) {
-      nanos =
-          (int)
-              (nanos + NANOS_PER_SECOND); // no overflow since nanos is negative (and we're adding)
-      seconds = checkedSubtract(seconds, 1);
-    }
-    Timestamp timestamp = Timestamp.newBuilder().setSeconds(seconds).setNanos(nanos).build();
-    return checkValid(timestamp);
-  }
-
-  private static long parseTimezoneOffset(String value) throws ParseException {
-    int pos = value.indexOf(':');
-    if (pos == -1) {
-      throw new ParseException("Invalid offset value: " + value, 0);
-    }
-    String hours = value.substring(0, pos);
-    String minutes = value.substring(pos + 1);
-    return (Long.parseLong(hours) * 60 + Long.parseLong(minutes)) * 60;
-  }
-
-  static int parseNanos(String value) throws ParseException {
-    int result = 0;
-    for (int i = 0; i < 9; ++i) {
-      result = result * 10;
-      if (i < value.length()) {
-        if (value.charAt(i) < '0' || value.charAt(i) > '9') {
-          throw new ParseException("Invalid nanoseconds.", 0);
-        }
-        result += value.charAt(i) - '0';
-      }
-    }
-    return result;
-  }
-
-  /** Format the nano part of a timestamp or a duration. */
-  static String formatNanos(int nanos) {
-    // Determine whether to use 3, 6, or 9 digits for the nano part.
-    if (nanos % NANOS_PER_MILLISECOND == 0) {
-      return String.format(Locale.ENGLISH, "%1$03d", nanos / NANOS_PER_MILLISECOND);
-    } else if (nanos % NANOS_PER_MICROSECOND == 0) {
-      return String.format(Locale.ENGLISH, "%1$06d", nanos / NANOS_PER_MICROSECOND);
-    } else {
-      return String.format(Locale.ENGLISH, "%1$09d", nanos);
-    }
-  }
-}
diff --git a/libs/protobuf/java/util/src/main/java/com/google/protobuf/util/Values.java b/libs/protobuf/java/util/src/main/java/com/google/protobuf/util/Values.java
deleted file mode 100644
index f03d70e..0000000
--- a/libs/protobuf/java/util/src/main/java/com/google/protobuf/util/Values.java
+++ /dev/null
@@ -1,85 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf.util;
-
-import com.google.protobuf.ListValue;
-import com.google.protobuf.NullValue;
-import com.google.protobuf.Struct;
-import com.google.protobuf.Value;
-
-/** Utilities to help create {@code google.protobuf.Value} messages. */
-public final class Values {
-
-  private static final Value NULL_VALUE =
-      Value.newBuilder().setNullValue(NullValue.NULL_VALUE).build();
-
-  public static Value ofNull() {
-    return NULL_VALUE;
-  }
-
-  /** Returns a Value object with number set to value. */
-  public static Value of(boolean value) {
-    return Value.newBuilder().setBoolValue(value).build();
-  }
-
-  /** Returns a Value object with number set to value. */
-  public static Value of(double value) {
-    return Value.newBuilder().setNumberValue(value).build();
-  }
-
-  /** Returns a Value object with string set to value. */
-  public static Value of(String value) {
-    return Value.newBuilder().setStringValue(value).build();
-  }
-
-  /** Returns a Value object with struct set to value. */
-  public static Value of(Struct value) {
-    return Value.newBuilder().setStructValue(value).build();
-  }
-
-  /** Returns a Value with ListValue set to value. */
-  public static Value of(ListValue value) {
-    return Value.newBuilder().setListValue(value).build();
-  }
-
-  /**
-   * Returns a Value with ListValue set to the appending the result of calling {@link #of} on each
-   * element in the iterable.
-   */
-  public static Value of(Iterable<Value> values) {
-    Value.Builder valueBuilder = Value.newBuilder();
-    ListValue.Builder listValue = valueBuilder.getListValueBuilder();
-    listValue.addAllValues(values);
-    return valueBuilder.build();
-  }
-
-  private Values() {}
-}
diff --git a/libs/protobuf/java/util/src/test/java/com/google/protobuf/util/DurationsTest.java b/libs/protobuf/java/util/src/test/java/com/google/protobuf/util/DurationsTest.java
deleted file mode 100644
index ffcd4dc..0000000
--- a/libs/protobuf/java/util/src/test/java/com/google/protobuf/util/DurationsTest.java
+++ /dev/null
@@ -1,631 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf.util;
-
-import static com.google.common.truth.Truth.assertThat;
-import static com.google.common.truth.Truth.assertWithMessage;
-import static com.google.protobuf.util.Durations.toSecondsAsDouble;
-import static org.junit.Assert.fail;
-
-import com.google.common.collect.Lists;
-import com.google.protobuf.Duration;
-import com.google.protobuf.Timestamp;
-import java.text.ParseException;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-/** Unit tests for {@link Durations}. */
-@RunWith(JUnit4.class)
-public class DurationsTest {
-
-  private static final Duration INVALID_MAX =
-      Duration.newBuilder().setSeconds(Long.MAX_VALUE).setNanos(Integer.MAX_VALUE).build();
-  private static final Duration INVALID_MIN =
-      Duration.newBuilder().setSeconds(Long.MIN_VALUE).setNanos(Integer.MIN_VALUE).build();
-
-  @Test
-  public void testIsPositive() {
-    assertThat(Durations.isPositive(Durations.ZERO)).isFalse();
-    assertThat(Durations.isPositive(Durations.fromNanos(-1))).isFalse();
-    assertThat(Durations.isPositive(Durations.fromNanos(1))).isTrue();
-  }
-
-  @Test
-  public void testIsNegative() {
-    assertThat(Durations.isNegative(Durations.ZERO)).isFalse();
-    assertThat(Durations.isNegative(Durations.fromNanos(1))).isFalse();
-    assertThat(Durations.isNegative(Durations.fromNanos(-1))).isTrue();
-  }
-
-  @Test
-  public void testCheckNotNegative() {
-    Durations.checkNotNegative(Durations.ZERO);
-    Durations.checkNotNegative(Durations.fromNanos(1));
-    Durations.checkNotNegative(Durations.fromSeconds(1));
-
-    try {
-      Durations.checkNotNegative(Durations.fromNanos(-1));
-      fail();
-    } catch (IllegalArgumentException expected) {
-      assertThat(expected).hasMessageThat().isEqualTo(
-          "duration (-0.000000001s) must not be negative");
-    }
-    try {
-      Durations.checkNotNegative(Durations.fromSeconds(-1));
-      fail();
-    } catch (IllegalArgumentException expected) {
-      assertThat(expected).hasMessageThat().isEqualTo("duration (-1s) must not be negative");
-    }
-  }
-
-  @Test
-  public void testCheckPositive() {
-    Durations.checkPositive(Durations.fromNanos(1));
-    Durations.checkPositive(Durations.fromSeconds(1));
-
-    try {
-      Durations.checkPositive(Durations.ZERO);
-      fail();
-    } catch (IllegalArgumentException expected) {
-      assertThat(expected).hasMessageThat().isEqualTo("duration (0s) must be positive");
-    }
-
-    try {
-      Durations.checkPositive(Durations.fromNanos(-1));
-      fail();
-    } catch (IllegalArgumentException expected) {
-      assertThat(expected).hasMessageThat().isEqualTo("duration (-0.000000001s) must be positive");
-    }
-
-    try {
-      Durations.checkPositive(Durations.fromSeconds(-1));
-      fail();
-    } catch (IllegalArgumentException expected) {
-      assertThat(expected).hasMessageThat().isEqualTo("duration (-1s) must be positive");
-    }
-  }
-
-  @Test
-  public void testToSecondsAsDouble() {
-    assertThat(toSecondsAsDouble(duration(0, 1))).isEqualTo(1.0e-9);
-    assertThat(toSecondsAsDouble(Durations.fromMillis(999))).isEqualTo(0.999);
-    assertThat(toSecondsAsDouble(duration(1, 0))).isEqualTo(1.0);
-    assertWithMessage("Precision loss detected")
-        .that(toSecondsAsDouble(Durations.fromNanos(1234567890987654321L)))
-        .isWithin(1.0e-6)
-        .of(1234567890.9876544);
-  }
-
-  @Test
-  public void testRoundtripConversions() {
-    for (long value : Arrays.asList(-123456, -42, -1, 0, 1, 42, 123456)) {
-      assertThat(Durations.toDays(Durations.fromDays(value))).isEqualTo(value);
-      assertThat(Durations.toHours(Durations.fromHours(value))).isEqualTo(value);
-      assertThat(Durations.toMinutes(Durations.fromMinutes(value))).isEqualTo(value);
-      assertThat(Durations.toSeconds(Durations.fromSeconds(value))).isEqualTo(value);
-      assertThat(Durations.toMillis(Durations.fromMillis(value))).isEqualTo(value);
-      assertThat(Durations.toMicros(Durations.fromMicros(value))).isEqualTo(value);
-      assertThat(Durations.toNanos(Durations.fromNanos(value))).isEqualTo(value);
-    }
-  }
-
-  @Test
-  public void testStaticFactories() {
-    Duration[] durations = {
-      Durations.fromDays(1),
-      Durations.fromHours(24),
-      Durations.fromMinutes(1440),
-      Durations.fromSeconds(86_400L),
-      Durations.fromMillis(86_400_000L),
-      Durations.fromMicros(86_400_000_000L),
-      Durations.fromNanos(86_400_000_000_000L)
-    };
-
-    for (Duration d1 : durations) {
-      assertThat(d1).isNotEqualTo(null);
-      for (Duration d2 : durations) {
-        assertThat(d1).isEqualTo(d2);
-      }
-    }
-  }
-
-  @Test
-  public void testMinMaxAreValid() {
-    assertThat(Durations.isValid(Durations.MAX_VALUE)).isTrue();
-    assertThat(Durations.isValid(Durations.MIN_VALUE)).isTrue();
-  }
-
-  @Test
-  public void testIsValid_false() {
-    assertThat(Durations.isValid(-315576000001L, 0)).isFalse();
-    assertThat(Durations.isValid(315576000001L, 0)).isFalse();
-    assertThat(Durations.isValid(42L, -42)).isFalse();
-    assertThat(Durations.isValid(-42L, 42)).isFalse();
-  }
-
-  @Test
-  public void testIsValid_true() {
-    assertThat(Durations.isValid(0L, 42)).isTrue();
-    assertThat(Durations.isValid(0L, -42)).isTrue();
-    assertThat(Durations.isValid(42L, 0)).isTrue();
-    assertThat(Durations.isValid(42L, 42)).isTrue();
-    assertThat(Durations.isValid(-315576000000L, 0)).isTrue();
-    assertThat(Durations.isValid(315576000000L, 0)).isTrue();
-  }
-
-  @Test
-  public void testParse_outOfRange() throws ParseException {
-    try {
-      Duration x = Durations.parse("316576000000.123456789123456789s");
-      fail("expected ParseException");
-    } catch (ParseException expected) {
-      assertThat(expected).hasMessageThat().isEqualTo("Duration value is out of range.");
-      assertThat(expected).hasCauseThat().isNotNull();
-    }
-  }
-
-  @Test
-  public void testDurationStringFormat() throws Exception {
-    Timestamp start = Timestamps.parse("0001-01-01T00:00:00Z");
-    Timestamp end = Timestamps.parse("9999-12-31T23:59:59.999999999Z");
-    Duration duration = Timestamps.between(start, end);
-    assertThat(Durations.toString(duration)).isEqualTo("315537897599.999999999s");
-    duration = Timestamps.between(end, start);
-    assertThat(Durations.toString(duration)).isEqualTo("-315537897599.999999999s");
-
-    // Generated output should contain 3, 6, or 9 fractional digits.
-    duration = Duration.newBuilder().setSeconds(1).build();
-    assertThat(Durations.toString(duration)).isEqualTo("1s");
-    duration = Duration.newBuilder().setNanos(10000000).build();
-    assertThat(Durations.toString(duration)).isEqualTo("0.010s");
-    duration = Duration.newBuilder().setNanos(10000).build();
-    assertThat(Durations.toString(duration)).isEqualTo("0.000010s");
-    duration = Duration.newBuilder().setNanos(10).build();
-    assertThat(Durations.toString(duration)).isEqualTo("0.000000010s");
-
-    // Parsing accepts an fractional digits as long as they fit into nano
-    // precision.
-    duration = Durations.parse("0.1s");
-    assertThat(duration.getNanos()).isEqualTo(100000000);
-    duration = Durations.parse("0.0001s");
-    assertThat(duration.getNanos()).isEqualTo(100000);
-    duration = Durations.parse("0.0000001s");
-    assertThat(duration.getNanos()).isEqualTo(100);
-    // Repeat using parseUnchecked().
-    duration = Durations.parseUnchecked("0.1s");
-    assertThat(duration.getNanos()).isEqualTo(100000000);
-    duration = Durations.parseUnchecked("0.0001s");
-    assertThat(duration.getNanos()).isEqualTo(100000);
-    duration = Durations.parseUnchecked("0.0000001s");
-    assertThat(duration.getNanos()).isEqualTo(100);
-
-    // Duration must support range from -315,576,000,000s to +315576000000s
-    // which includes negative values.
-    duration = Durations.parse("315576000000.999999999s");
-    assertThat(duration.getSeconds()).isEqualTo(315576000000L);
-    assertThat(duration.getNanos()).isEqualTo(999999999);
-    duration = Durations.parse("-315576000000.999999999s");
-    assertThat(duration.getSeconds()).isEqualTo(-315576000000L);
-    assertThat(duration.getNanos()).isEqualTo(-999999999);
-    // Repeat using parseUnchecked().
-    duration = Durations.parseUnchecked("315576000000.999999999s");
-    assertThat(duration.getSeconds()).isEqualTo(315576000000L);
-    assertThat(duration.getNanos()).isEqualTo(999999999);
-    duration = Durations.parseUnchecked("-315576000000.999999999s");
-    assertThat(duration.getSeconds()).isEqualTo(-315576000000L);
-    assertThat(duration.getNanos()).isEqualTo(-999999999);
-  }
-
-  @Test
-  public void testDurationInvalidFormat() {
-    // Value too small.
-    try {
-      Durations.toString(
-                Duration.newBuilder().setSeconds(Durations.DURATION_SECONDS_MIN - 1).build());
-      fail();
-    } catch (IllegalArgumentException expected) {
-      assertThat(expected).hasMessageThat().isNotNull();
-    }
-
-    try {
-      Durations.toString(
-                Duration.newBuilder().setSeconds(Durations.DURATION_SECONDS_MAX + 1).build());
-      fail();
-    } catch (IllegalArgumentException expected) {
-      assertThat(expected).hasMessageThat().isNotNull();
-    }
-
-    // Invalid nanos value.
-    try {
-      Durations.toString(Duration.newBuilder().setSeconds(1).setNanos(-1).build());
-      fail();
-    } catch (IllegalArgumentException expected) {
-      assertThat(expected).hasMessageThat().isNotNull();
-    }
-
-    // Invalid seconds value.
-    try {
-      Durations.toString(Duration.newBuilder().setSeconds(-1).setNanos(1).build());
-      fail();
-    } catch (IllegalArgumentException expected) {
-      assertThat(expected).hasMessageThat().isNotNull();
-    }
-
-    // Value too small.
-    try {
-      Durations.parse("-315576000001s");
-      fail();
-    } catch (ParseException expected) {
-      assertThat(expected).hasMessageThat().isNotNull();
-    }
-    try {
-      Durations.parseUnchecked("-315576000001s");
-      fail();
-    } catch (IllegalArgumentException expected) {
-      assertThat(expected).hasMessageThat().isNotNull();
-    }
-
-    // Value too large.
-    try {
-      Durations.parse("315576000001s");
-      fail();
-    } catch (ParseException expected) {
-      assertThat(expected).hasMessageThat().isNotNull();
-    }
-    try {
-      Durations.parseUnchecked("315576000001s");
-      fail();
-    } catch (IllegalArgumentException expected) {
-      assertThat(expected).hasMessageThat().isNotNull();
-    }
-
-    // Empty.
-    try {
-      Durations.parse("");
-      fail();
-    } catch (ParseException expected) {
-      assertThat(expected).hasMessageThat().isNotNull();
-    }
-    try {
-      Durations.parseUnchecked("");
-      fail();
-    } catch (IllegalArgumentException expected) {
-      assertThat(expected).hasMessageThat().isNotNull();
-    }
-
-    // Missing "s".
-    try {
-      Durations.parse("0");
-      fail();
-    } catch (ParseException expected) {
-      assertThat(expected).hasMessageThat().isNotNull();
-    }
-    try {
-      Durations.parseUnchecked("0");
-      fail();
-    } catch (IllegalArgumentException expected) {
-      assertThat(expected).hasMessageThat().isNotNull();
-    }
-
-    // Invalid trailing data.
-    try {
-      Durations.parse("0s0");
-      fail();
-    } catch (ParseException expected) {
-      assertThat(expected).hasMessageThat().isNotNull();
-    }
-    try {
-      Durations.parseUnchecked("0s0");
-      fail();
-    } catch (IllegalArgumentException expected) {
-      assertThat(expected).hasMessageThat().isNotNull();
-    }
-
-    // Invalid prefix.
-    try {
-      Durations.parse("--1s");
-      fail();
-    } catch (ParseException expected) {
-      assertThat(expected).hasMessageThat().isNotNull();
-    }
-    try {
-      Durations.parseUnchecked("--1s");
-      fail();
-    } catch (IllegalArgumentException expected) {
-      assertThat(expected).hasMessageThat().isNotNull();
-    }
-  }
-
-  @Test
-  public void testDurationConversion() throws Exception {
-    Duration duration = Durations.parse("1.111111111s");
-    assertThat(Durations.toNanos(duration)).isEqualTo(1111111111);
-    assertThat(Durations.toMicros(duration)).isEqualTo(1111111);
-    assertThat(Durations.toMillis(duration)).isEqualTo(1111);
-    assertThat(Durations.toSeconds(duration)).isEqualTo(1);
-    duration = Durations.fromNanos(1111111111);
-    assertThat(Durations.toString(duration)).isEqualTo("1.111111111s");
-    duration = Durations.fromMicros(1111111);
-    assertThat(Durations.toString(duration)).isEqualTo("1.111111s");
-    duration = Durations.fromMillis(1111);
-    assertThat(Durations.toString(duration)).isEqualTo("1.111s");
-    duration = Durations.fromSeconds(1);
-    assertThat(Durations.toString(duration)).isEqualTo("1s");
-
-    duration = Durations.parse("-1.111111111s");
-    assertThat(Durations.toNanos(duration)).isEqualTo(-1111111111);
-    assertThat(Durations.toMicros(duration)).isEqualTo(-1111111);
-    assertThat(Durations.toMillis(duration)).isEqualTo(-1111);
-    assertThat(Durations.toSeconds(duration)).isEqualTo(-1);
-    duration = Durations.fromNanos(-1111111111);
-    assertThat(Durations.toString(duration)).isEqualTo("-1.111111111s");
-    duration = Durations.fromMicros(-1111111);
-    assertThat(Durations.toString(duration)).isEqualTo("-1.111111s");
-    duration = Durations.fromMillis(-1111);
-    assertThat(Durations.toString(duration)).isEqualTo("-1.111s");
-    duration = Durations.fromSeconds(-1);
-    assertThat(Durations.toString(duration)).isEqualTo("-1s");
-  }
-
-  @Test
-  public void testTimeOperations() throws Exception {
-    Timestamp start = Timestamps.parse("0001-01-01T00:00:00Z");
-    Timestamp end = Timestamps.parse("9999-12-31T23:59:59.999999999Z");
-
-    Duration duration = Timestamps.between(start, end);
-    assertThat(Durations.toString(duration)).isEqualTo("315537897599.999999999s");
-    Timestamp value = Timestamps.add(start, duration);
-    assertThat(value).isEqualTo(end);
-    value = Timestamps.subtract(end, duration);
-    assertThat(value).isEqualTo(start);
-
-    duration = Timestamps.between(end, start);
-    assertThat(Durations.toString(duration)).isEqualTo("-315537897599.999999999s");
-    value = Timestamps.add(end, duration);
-    assertThat(value).isEqualTo(start);
-    value = Timestamps.subtract(start, duration);
-    assertThat(value).isEqualTo(end);
-
-    duration = Durations.parse("-1.125s");
-    assertThat(Durations.toString(duration)).isEqualTo("-1.125s");
-
-    duration = Durations.add(duration, duration);
-    assertThat(Durations.toString(duration)).isEqualTo("-2.250s");
-
-    duration = Durations.subtract(duration, Durations.parse("-1s"));
-    assertThat(Durations.toString(duration)).isEqualTo("-1.250s");
-  }
-
-  @Test
-  public void testToString() {
-    assertThat(Durations.toString(duration(1, 1))).isEqualTo("1.000000001s");
-    assertThat(Durations.toString(duration(-1, -1))).isEqualTo("-1.000000001s");
-    assertThat(Durations.toString(duration(1, 0))).isEqualTo("1s");
-    assertThat(Durations.toString(duration(-1, 0))).isEqualTo("-1s");
-    assertThat(Durations.toString(duration(0, 1))).isEqualTo("0.000000001s");
-    assertThat(Durations.toString(duration(0, -1))).isEqualTo("-0.000000001s");
-  }
-
-  @Test
-  public void testAdd() {
-    assertThat(Durations.add(duration(1, 10), duration(1, 20))).isEqualTo(duration(2, 30));
-    assertThat(Durations.add(duration(1, 999999999), duration(1, 2))).isEqualTo(duration(3, 1));
-    assertThat(Durations.add(duration(1, 999999999), duration(1, 1))).isEqualTo(duration(3, 0));
-    assertThat(Durations.add(duration(1, 999999999), duration(-2, -1))).isEqualTo(duration(0, -2));
-    assertThat(Durations.add(duration(1, 999999999), duration(-2, 0))).isEqualTo(duration(0, -1));
-    assertThat(Durations.add(duration(-1, -10), duration(-1, -20))).isEqualTo(duration(-2, -30));
-    assertThat(Durations.add(duration(-1, -999999999), duration(-1, -2)))
-        .isEqualTo(duration(-3, -1));
-    assertThat(Durations.add(duration(-1, -999999999), duration(-1, -1)))
-        .isEqualTo(duration(-3, 0));
-    assertThat(Durations.add(duration(-1, -999999999), duration(2, 1))).isEqualTo(duration(0, 2));
-    assertThat(Durations.add(duration(-1, -999999999), duration(2, 0))).isEqualTo(duration(0, 1));
-  }
-
-  @Test
-  public void testSubtract() {
-    assertThat(Durations.subtract(duration(3, 2), duration(1, 1))).isEqualTo(duration(2, 1));
-    assertThat(Durations.subtract(duration(3, 10), duration(1, 10))).isEqualTo(duration(2, 0));
-    assertThat(Durations.subtract(duration(3, 1), duration(1, 2)))
-        .isEqualTo(duration(1, 999999999));
-    assertThat(Durations.subtract(duration(3, 2), duration(4, 1)))
-        .isEqualTo(duration(0, -999999999));
-    assertThat(Durations.subtract(duration(1, 1), duration(3, 2))).isEqualTo(duration(-2, -1));
-    assertThat(Durations.subtract(duration(1, 10), duration(3, 10))).isEqualTo(duration(-2, 0));
-    assertThat(Durations.subtract(duration(1, 2), duration(3, 1)))
-        .isEqualTo(duration(-1, -999999999));
-    assertThat(Durations.subtract(duration(4, 1), duration(3, 2)))
-        .isEqualTo(duration(0, 999999999));
-  }
-
-  @Test
-  public void testComparator() {
-    assertThat(Durations.comparator().compare(duration(3, 2), duration(3, 2))).isEqualTo(0);
-    assertThat(Durations.comparator().compare(duration(0, 0), duration(0, 0))).isEqualTo(0);
-    assertThat(Durations.comparator().compare(duration(3, 1), duration(1, 1))).isGreaterThan(0);
-    assertThat(Durations.comparator().compare(duration(3, 2), duration(3, 1))).isGreaterThan(0);
-    assertThat(Durations.comparator().compare(duration(1, 1), duration(3, 1))).isLessThan(0);
-    assertThat(Durations.comparator().compare(duration(3, 1), duration(3, 2))).isLessThan(0);
-    assertThat(Durations.comparator().compare(duration(-3, -1), duration(-1, -1))).isLessThan(0);
-    assertThat(Durations.comparator().compare(duration(-3, -2), duration(-3, -1))).isLessThan(0);
-    assertThat(Durations.comparator().compare(duration(-1, -1), duration(-3, -1))).isGreaterThan(0);
-    assertThat(Durations.comparator().compare(duration(-3, -1), duration(-3, -2))).isGreaterThan(0);
-    assertThat(Durations.comparator().compare(duration(-10, -1), duration(1, 1))).isLessThan(0);
-    assertThat(Durations.comparator().compare(duration(0, -1), duration(0, 1))).isLessThan(0);
-    assertThat(Durations.comparator().compare(duration(0x80000000L, 0), duration(0, 0)))
-        .isGreaterThan(0);
-    assertThat(Durations.comparator().compare(duration(0xFFFFFFFF00000000L, 0), duration(0, 0)))
-        .isLessThan(0);
-
-    Duration duration0 = duration(-50, -500);
-    Duration duration1 = duration(-50, -400);
-    Duration duration2 = duration(50, 500);
-    Duration duration3 = duration(100, 20);
-    Duration duration4 = duration(100, 50);
-    Duration duration5 = duration(100, 150);
-    Duration duration6 = duration(150, 40);
-
-    List<Duration> durations =
-        Lists.newArrayList(
-            duration5, duration3, duration1, duration4, duration6, duration2, duration0, duration3);
-
-    Collections.sort(durations, Durations.comparator());
-    assertThat(durations)
-        .containsExactly(
-            duration0, duration1, duration2, duration3, duration3, duration4, duration5, duration6)
-        .inOrder();
-  }
-
-  @Test
-  public void testCompare() {
-    assertThat(Durations.compare(duration(3, 2), duration(3, 2))).isEqualTo(0);
-    assertThat(Durations.compare(duration(0, 0), duration(0, 0))).isEqualTo(0);
-    assertThat(Durations.compare(duration(3, 1), duration(1, 1))).isGreaterThan(0);
-    assertThat(Durations.compare(duration(3, 2), duration(3, 1))).isGreaterThan(0);
-    assertThat(Durations.compare(duration(1, 1), duration(3, 1))).isLessThan(0);
-    assertThat(Durations.compare(duration(3, 1), duration(3, 2))).isLessThan(0);
-    assertThat(Durations.compare(duration(-3, -1), duration(-1, -1))).isLessThan(0);
-    assertThat(Durations.compare(duration(-3, -2), duration(-3, -1))).isLessThan(0);
-    assertThat(Durations.compare(duration(-1, -1), duration(-3, -1))).isGreaterThan(0);
-    assertThat(Durations.compare(duration(-3, -1), duration(-3, -2))).isGreaterThan(0);
-    assertThat(Durations.compare(duration(-10, -1), duration(1, 1))).isLessThan(0);
-    assertThat(Durations.compare(duration(0, -1), duration(0, 1))).isLessThan(0);
-    assertThat(Durations.compare(duration(0x80000000L, 0), duration(0, 0))).isGreaterThan(0);
-    assertThat(Durations.compare(duration(0xFFFFFFFF00000000L, 0), duration(0, 0))).isLessThan(0);
-  }
-
-  @Test
-  public void testOverflows() throws Exception {
-    try {
-      Durations.toNanos(duration(315576000000L, 999999999));
-      assertWithMessage("Expected an ArithmeticException to be thrown").fail();
-    } catch (ArithmeticException expected) {
-    }
-
-    try {
-      Durations.add(Durations.MAX_VALUE, Durations.MAX_VALUE);
-      assertWithMessage("Expected an IllegalArgumentException to be thrown").fail();
-    } catch (IllegalArgumentException expected) {
-    }
-    try {
-      Durations.subtract(Durations.MIN_VALUE, Durations.MAX_VALUE);
-      assertWithMessage("Expected an IllegalArgumentException to be thrown").fail();
-    } catch (IllegalArgumentException expected) {
-    }
-
-    try {
-      Durations.toNanos(INVALID_MAX);
-      assertWithMessage("Expected an IllegalArgumentException to be thrown").fail();
-    } catch (IllegalArgumentException expected) {
-    }
-    try {
-      Durations.toMicros(INVALID_MAX);
-      assertWithMessage("Expected an IllegalArgumentException to be thrown").fail();
-    } catch (IllegalArgumentException expected) {
-    }
-    try {
-      Durations.toMillis(INVALID_MAX);
-      assertWithMessage("Expected an IllegalArgumentException to be thrown").fail();
-    } catch (IllegalArgumentException expected) {
-    }
-    try {
-      Durations.toSeconds(INVALID_MAX);
-      assertWithMessage("Expected an IllegalArgumentException to be thrown").fail();
-    } catch (IllegalArgumentException expected) {
-    }
-
-    try {
-      Durations.toNanos(INVALID_MIN);
-      assertWithMessage("Expected an IllegalArgumentException to be thrown").fail();
-    } catch (IllegalArgumentException expected) {
-    }
-    try {
-      Durations.toMicros(INVALID_MIN);
-      assertWithMessage("Expected an IllegalArgumentException to be thrown").fail();
-    } catch (IllegalArgumentException expected) {
-    }
-    try {
-      Durations.toMillis(INVALID_MIN);
-      assertWithMessage("Expected an IllegalArgumentException to be thrown").fail();
-    } catch (IllegalArgumentException expected) {
-    }
-    try {
-      Durations.toSeconds(INVALID_MIN);
-      assertWithMessage("Expected an IllegalArgumentException to be thrown").fail();
-    } catch (IllegalArgumentException expected) {
-    }
-
-    assertThat(Durations.toString(Durations.fromNanos(Long.MAX_VALUE)))
-        .isEqualTo("9223372036.854775807s");
-    try {
-      Durations.fromMicros(Long.MAX_VALUE);
-      assertWithMessage("Expected an IllegalArgumentException to be thrown").fail();
-    } catch (IllegalArgumentException expected) {
-    }
-    try {
-      Durations.fromMillis(Long.MAX_VALUE);
-      assertWithMessage("Expected an IllegalArgumentException to be thrown").fail();
-    } catch (IllegalArgumentException expected) {
-    }
-    try {
-      Durations.fromSeconds(Long.MAX_VALUE);
-      assertWithMessage("Expected an IllegalArgumentException to be thrown").fail();
-    } catch (IllegalArgumentException expected) {
-    }
-
-    assertThat(Durations.toString(Durations.fromNanos(Long.MIN_VALUE)))
-        .isEqualTo("-9223372036.854775808s");
-    try {
-      Durations.fromMicros(Long.MIN_VALUE);
-      assertWithMessage("Expected an IllegalArgumentException to be thrown").fail();
-    } catch (IllegalArgumentException expected) {
-    }
-    try {
-      Durations.fromMillis(Long.MIN_VALUE);
-      assertWithMessage("Expected an IllegalArgumentException to be thrown").fail();
-    } catch (IllegalArgumentException expected) {
-    }
-    try {
-      Durations.fromSeconds(Long.MIN_VALUE);
-      assertWithMessage("Expected an IllegalArgumentException to be thrown").fail();
-    } catch (IllegalArgumentException expected) {
-    }
-  }
-
-  static Duration duration(long seconds, int nanos) {
-    return Durations.checkValid(
-        Durations.checkValid(Duration.newBuilder().setSeconds(seconds).setNanos(nanos)));
-  }
-}
diff --git a/libs/protobuf/java/util/src/test/java/com/google/protobuf/util/FieldMaskTreeTest.java b/libs/protobuf/java/util/src/test/java/com/google/protobuf/util/FieldMaskTreeTest.java
deleted file mode 100644
index 98aef02..0000000
--- a/libs/protobuf/java/util/src/test/java/com/google/protobuf/util/FieldMaskTreeTest.java
+++ /dev/null
@@ -1,398 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf.util;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import com.google.protobuf.DynamicMessage;
-import com.google.protobuf.Message;
-import com.google.protobuf.UninitializedMessageException;
-import protobuf_unittest.UnittestProto.NestedTestAllTypes;
-import protobuf_unittest.UnittestProto.TestAllTypes;
-import protobuf_unittest.UnittestProto.TestAllTypes.NestedMessage;
-import protobuf_unittest.UnittestProto.TestRequired;
-import protobuf_unittest.UnittestProto.TestRequiredMessage;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-@RunWith(JUnit4.class)
-public class FieldMaskTreeTest {
-  @Test
-  public void testAddFieldPath() throws Exception {
-    FieldMaskTree tree = new FieldMaskTree();
-    assertThat(tree.toString()).isEmpty();
-    tree.addFieldPath("");
-    assertThat(tree.toString()).isEmpty();
-    // New branch.
-    tree.addFieldPath("foo");
-    assertThat(tree.toString()).isEqualTo("foo");
-    // Redundant path.
-    tree.addFieldPath("foo");
-    assertThat(tree.toString()).isEqualTo("foo");
-    // New branch.
-    tree.addFieldPath("bar.baz");
-    assertThat(tree.toString()).isEqualTo("bar.baz,foo");
-    // Redundant sub-path.
-    tree.addFieldPath("foo.bar");
-    assertThat(tree.toString()).isEqualTo("bar.baz,foo");
-    // New branch from a non-root node.
-    tree.addFieldPath("bar.quz");
-    assertThat(tree.toString()).isEqualTo("bar.baz,bar.quz,foo");
-    // A path that matches several existing sub-paths.
-    tree.addFieldPath("bar");
-    assertThat(tree.toString()).isEqualTo("bar,foo");
-  }
-
-  @Test
-  public void testMergeFromFieldMask() throws Exception {
-    FieldMaskTree tree = new FieldMaskTree(FieldMaskUtil.fromString("foo,bar.baz,bar.quz"));
-    assertThat(tree.toString()).isEqualTo("bar.baz,bar.quz,foo");
-    tree.mergeFromFieldMask(FieldMaskUtil.fromString("foo.bar,bar"));
-    assertThat(tree.toString()).isEqualTo("bar,foo");
-  }
-
-  @Test
-  public void testRemoveFieldPath() throws Exception {
-    String initialTreeString = "bar.baz,bar.quz.bar,foo";
-    FieldMaskTree tree;
-
-    // Empty path.
-    tree = new FieldMaskTree(FieldMaskUtil.fromString(initialTreeString));
-    tree.removeFieldPath("");
-    assertThat(tree.toString()).isEqualTo(initialTreeString);
-
-    // Non-exist sub-path of an existing leaf.
-    tree = new FieldMaskTree(FieldMaskUtil.fromString(initialTreeString));
-    tree.removeFieldPath("foo.bar");
-    assertThat(tree.toString()).isEqualTo(initialTreeString);
-
-    // Non-exist path.
-    tree = new FieldMaskTree(FieldMaskUtil.fromString(initialTreeString));
-    tree.removeFieldPath("bar.foo");
-    assertThat(tree.toString()).isEqualTo(initialTreeString);
-
-    // Match an existing leaf node -> remove leaf node.
-    tree = new FieldMaskTree(FieldMaskUtil.fromString(initialTreeString));
-    tree.removeFieldPath("foo");
-    assertThat(tree.toString()).isEqualTo("bar.baz,bar.quz.bar");
-
-    // Match sub-path of an existing leaf node -> recursive removal.
-    tree = new FieldMaskTree(FieldMaskUtil.fromString(initialTreeString));
-    tree.removeFieldPath("bar.quz.bar");
-    assertThat(tree.toString()).isEqualTo("bar.baz,foo");
-
-    // Match a non-leaf node -> remove all children.
-    tree = new FieldMaskTree(FieldMaskUtil.fromString(initialTreeString));
-    tree.removeFieldPath("bar");
-    assertThat(tree.toString()).isEqualTo("foo");
-  }
-
-  @Test
-  public void testRemoveFromFieldMask() throws Exception {
-    FieldMaskTree tree = new FieldMaskTree(FieldMaskUtil.fromString("foo,bar.baz,bar.quz"));
-    assertThat(tree.toString()).isEqualTo("bar.baz,bar.quz,foo");
-    tree.removeFromFieldMask(FieldMaskUtil.fromString("foo.bar,bar"));
-    assertThat(tree.toString()).isEqualTo("foo");
-  }
-
-  @Test
-  public void testIntersectFieldPath() throws Exception {
-    FieldMaskTree tree = new FieldMaskTree(FieldMaskUtil.fromString("foo,bar.baz,bar.quz"));
-    FieldMaskTree result = new FieldMaskTree();
-    // Empty path.
-    tree.intersectFieldPath("", result);
-    assertThat(result.toString()).isEmpty();
-    // Non-exist path.
-    tree.intersectFieldPath("quz", result);
-    assertThat(result.toString()).isEmpty();
-    // Sub-path of an existing leaf.
-    tree.intersectFieldPath("foo.bar", result);
-    assertThat(result.toString()).isEqualTo("foo.bar");
-    // Match an existing leaf node.
-    tree.intersectFieldPath("foo", result);
-    assertThat(result.toString()).isEqualTo("foo");
-    // Non-exist path.
-    tree.intersectFieldPath("bar.foo", result);
-    assertThat(result.toString()).isEqualTo("foo");
-    // Match a non-leaf node.
-    tree.intersectFieldPath("bar", result);
-    assertThat(result.toString()).isEqualTo("bar.baz,bar.quz,foo");
-  }
-
-  @Test
-  public void testMerge() throws Exception {
-    testMergeImpl(true);
-    testMergeImpl(false);
-    testMergeRequire(false);
-    testMergeRequire(true);
-  }
-
-  private void merge(
-      FieldMaskTree tree,
-      Message source,
-      Message.Builder builder,
-      FieldMaskUtil.MergeOptions options,
-      boolean useDynamicMessage)
-      throws Exception {
-    if (useDynamicMessage) {
-      Message.Builder newBuilder =
-          DynamicMessage.newBuilder(source.getDescriptorForType())
-              .mergeFrom(builder.buildPartial().toByteArray());
-      tree.merge(
-          DynamicMessage.newBuilder(source.getDescriptorForType())
-              .mergeFrom(source.toByteArray())
-              .build(),
-          newBuilder,
-          options);
-      builder.clear();
-      builder.mergeFrom(newBuilder.buildPartial());
-    } else {
-      tree.merge(source, builder, options);
-    }
-  }
-
-  private void testMergeRequire(boolean useDynamicMessage) throws Exception {
-    TestRequired value = TestRequired.newBuilder().setA(4321).setB(8765).setC(233333).build();
-    TestRequiredMessage source = TestRequiredMessage.newBuilder().setRequiredMessage(value).build();
-
-    FieldMaskUtil.MergeOptions options = new FieldMaskUtil.MergeOptions();
-    TestRequiredMessage.Builder builder = TestRequiredMessage.newBuilder();
-    merge(
-        new FieldMaskTree().addFieldPath("required_message.a"),
-        source,
-        builder,
-        options,
-        useDynamicMessage);
-    assertThat(builder.hasRequiredMessage()).isTrue();
-    assertThat(builder.getRequiredMessage().hasA()).isTrue();
-    assertThat(builder.getRequiredMessage().hasB()).isFalse();
-    assertThat(builder.getRequiredMessage().hasC()).isFalse();
-    merge(
-        new FieldMaskTree().addFieldPath("required_message.b").addFieldPath("required_message.c"),
-        source,
-        builder,
-        options,
-        useDynamicMessage);
-    try {
-      assertThat(source).isEqualTo(builder.build());
-    } catch (UninitializedMessageException e) {
-      throw new AssertionError("required field isn't set", e);
-    }
-  }
-
-  private void testMergeImpl(boolean useDynamicMessage) throws Exception {
-    TestAllTypes value =
-        TestAllTypes.newBuilder()
-            .setOptionalInt32(1234)
-            .setOptionalNestedMessage(NestedMessage.newBuilder().setBb(5678))
-            .addRepeatedInt32(4321)
-            .addRepeatedNestedMessage(NestedMessage.newBuilder().setBb(8765))
-            .build();
-    NestedTestAllTypes source =
-        NestedTestAllTypes.newBuilder()
-            .setPayload(value)
-            .setChild(NestedTestAllTypes.newBuilder().setPayload(value))
-            .build();
-    // Now we have a message source with the following structure:
-    //   [root] -+- payload -+- optional_int32
-    //           |           +- optional_nested_message
-    //           |           +- repeated_int32
-    //           |           +- repeated_nested_message
-    //           |
-    //           +- child --- payload -+- optional_int32
-    //                                 +- optional_nested_message
-    //                                 +- repeated_int32
-    //                                 +- repeated_nested_message
-
-    FieldMaskUtil.MergeOptions options = new FieldMaskUtil.MergeOptions();
-
-    // Test merging with an empty FieldMask.
-    NestedTestAllTypes.Builder builder = NestedTestAllTypes.newBuilder();
-    builder.getPayloadBuilder().addRepeatedInt32(1000);
-    merge(new FieldMaskTree(), source, builder, options, useDynamicMessage);
-    NestedTestAllTypes.Builder expected = NestedTestAllTypes.newBuilder();
-    expected.getPayloadBuilder().addRepeatedInt32(1000);
-    assertThat(builder.build()).isEqualTo(expected.build());
-
-    // Test merging each individual field.
-    builder = NestedTestAllTypes.newBuilder();
-    merge(new FieldMaskTree().addFieldPath("payload.optional_int32"),
-        source, builder, options, useDynamicMessage);
-    expected = NestedTestAllTypes.newBuilder();
-    expected.getPayloadBuilder().setOptionalInt32(1234);
-    assertThat(builder.build()).isEqualTo(expected.build());
-
-    builder = NestedTestAllTypes.newBuilder();
-    merge(new FieldMaskTree().addFieldPath("payload.optional_nested_message"),
-        source, builder, options, useDynamicMessage);
-    expected = NestedTestAllTypes.newBuilder();
-    expected.getPayloadBuilder().setOptionalNestedMessage(NestedMessage.newBuilder().setBb(5678));
-    assertThat(builder.build()).isEqualTo(expected.build());
-
-    builder = NestedTestAllTypes.newBuilder();
-    merge(new FieldMaskTree().addFieldPath("payload.repeated_int32"),
-        source, builder, options, useDynamicMessage);
-    expected = NestedTestAllTypes.newBuilder();
-    expected.getPayloadBuilder().addRepeatedInt32(4321);
-    assertThat(builder.build()).isEqualTo(expected.build());
-
-    builder = NestedTestAllTypes.newBuilder();
-    merge(new FieldMaskTree().addFieldPath("payload.repeated_nested_message"),
-        source, builder, options, useDynamicMessage);
-    expected = NestedTestAllTypes.newBuilder();
-    expected.getPayloadBuilder().addRepeatedNestedMessage(NestedMessage.newBuilder().setBb(8765));
-    assertThat(builder.build()).isEqualTo(expected.build());
-
-    builder = NestedTestAllTypes.newBuilder();
-    merge(
-        new FieldMaskTree().addFieldPath("child.payload.optional_int32"),
-        source,
-        builder,
-        options,
-        useDynamicMessage);
-    expected = NestedTestAllTypes.newBuilder();
-    expected.getChildBuilder().getPayloadBuilder().setOptionalInt32(1234);
-    assertThat(builder.build()).isEqualTo(expected.build());
-
-    builder = NestedTestAllTypes.newBuilder();
-    merge(
-        new FieldMaskTree().addFieldPath("child.payload.optional_nested_message"),
-        source,
-        builder,
-        options,
-        useDynamicMessage);
-    expected = NestedTestAllTypes.newBuilder();
-    expected
-        .getChildBuilder()
-        .getPayloadBuilder()
-        .setOptionalNestedMessage(NestedMessage.newBuilder().setBb(5678));
-    assertThat(builder.build()).isEqualTo(expected.build());
-
-    builder = NestedTestAllTypes.newBuilder();
-    merge(new FieldMaskTree().addFieldPath("child.payload.repeated_int32"),
-        source, builder, options, useDynamicMessage);
-    expected = NestedTestAllTypes.newBuilder();
-    expected.getChildBuilder().getPayloadBuilder().addRepeatedInt32(4321);
-    assertThat(builder.build()).isEqualTo(expected.build());
-
-    builder = NestedTestAllTypes.newBuilder();
-    merge(new FieldMaskTree().addFieldPath("child.payload.repeated_nested_message"),
-        source, builder, options, useDynamicMessage);
-    expected = NestedTestAllTypes.newBuilder();
-    expected
-        .getChildBuilder()
-        .getPayloadBuilder()
-        .addRepeatedNestedMessage(NestedMessage.newBuilder().setBb(8765));
-    assertThat(builder.build()).isEqualTo(expected.build());
-
-    // Test merging all fields.
-    builder = NestedTestAllTypes.newBuilder();
-    merge(new FieldMaskTree().addFieldPath("child").addFieldPath("payload"),
-        source, builder, options, useDynamicMessage);
-    assertThat(builder.build()).isEqualTo(source);
-
-    // Test repeated options.
-    builder = NestedTestAllTypes.newBuilder();
-    builder.getPayloadBuilder().addRepeatedInt32(1000);
-    merge(new FieldMaskTree().addFieldPath("payload.repeated_int32"),
-        source, builder, options, useDynamicMessage);
-    // Default behavior is to append repeated fields.
-    assertThat(builder.getPayload().getRepeatedInt32Count()).isEqualTo(2);
-    assertThat(builder.getPayload().getRepeatedInt32(0)).isEqualTo(1000);
-    assertThat(builder.getPayload().getRepeatedInt32(1)).isEqualTo(4321);
-    // Change to replace repeated fields.
-    options.setReplaceRepeatedFields(true);
-    merge(new FieldMaskTree().addFieldPath("payload.repeated_int32"),
-        source, builder, options, useDynamicMessage);
-    assertThat(builder.getPayload().getRepeatedInt32Count()).isEqualTo(1);
-    assertThat(builder.getPayload().getRepeatedInt32(0)).isEqualTo(4321);
-
-    // Test message options.
-    builder = NestedTestAllTypes.newBuilder();
-    builder.getPayloadBuilder().setOptionalInt32(1000);
-    builder.getPayloadBuilder().setOptionalUint32(2000);
-    merge(new FieldMaskTree().addFieldPath("payload"),
-        source, builder, options, useDynamicMessage);
-    // Default behavior is to merge message fields.
-    assertThat(builder.getPayload().getOptionalInt32()).isEqualTo(1234);
-    assertThat(builder.getPayload().getOptionalUint32()).isEqualTo(2000);
-
-    // Test merging unset message fields.
-    NestedTestAllTypes clearedSource = source.toBuilder().clearPayload().build();
-    builder = NestedTestAllTypes.newBuilder();
-    merge(new FieldMaskTree().addFieldPath("payload"),
-        clearedSource, builder, options, useDynamicMessage);
-    assertThat(builder.hasPayload()).isFalse();
-
-    // Skip a message field if they are unset in both source and target.
-    builder = NestedTestAllTypes.newBuilder();
-    merge(new FieldMaskTree().addFieldPath("payload.optional_int32"),
-        clearedSource, builder, options, useDynamicMessage);
-    assertThat(builder.hasPayload()).isFalse();
-
-    // Change to replace message fields.
-    options.setReplaceMessageFields(true);
-    builder = NestedTestAllTypes.newBuilder();
-    builder.getPayloadBuilder().setOptionalInt32(1000);
-    builder.getPayloadBuilder().setOptionalUint32(2000);
-    merge(new FieldMaskTree().addFieldPath("payload"),
-        source, builder, options, useDynamicMessage);
-    assertThat(builder.getPayload().getOptionalInt32()).isEqualTo(1234);
-    assertThat(builder.getPayload().getOptionalUint32()).isEqualTo(0);
-
-    // Test merging unset message fields.
-    builder = NestedTestAllTypes.newBuilder();
-    builder.getPayloadBuilder().setOptionalInt32(1000);
-    builder.getPayloadBuilder().setOptionalUint32(2000);
-    merge(new FieldMaskTree().addFieldPath("payload"),
-        clearedSource, builder, options, useDynamicMessage);
-    assertThat(builder.hasPayload()).isFalse();
-
-    // Test merging unset primitive fields.
-    builder = source.toBuilder();
-    builder.getPayloadBuilder().clearOptionalInt32();
-    NestedTestAllTypes sourceWithPayloadInt32Unset = builder.build();
-    builder = source.toBuilder();
-    merge(new FieldMaskTree().addFieldPath("payload.optional_int32"),
-        sourceWithPayloadInt32Unset, builder, options, useDynamicMessage);
-    assertThat(builder.getPayload().hasOptionalInt32()).isTrue();
-    assertThat(builder.getPayload().getOptionalInt32()).isEqualTo(0);
-
-    // Change to clear unset primitive fields.
-    options.setReplacePrimitiveFields(true);
-    builder = source.toBuilder();
-    merge(new FieldMaskTree().addFieldPath("payload.optional_int32"),
-        sourceWithPayloadInt32Unset, builder, options, useDynamicMessage);
-    assertThat(builder.hasPayload()).isTrue();
-    assertThat(builder.getPayload().hasOptionalInt32()).isFalse();
-  }
-}
diff --git a/libs/protobuf/java/util/src/test/java/com/google/protobuf/util/FieldMaskUtilTest.java b/libs/protobuf/java/util/src/test/java/com/google/protobuf/util/FieldMaskUtilTest.java
deleted file mode 100644
index 79fa376..0000000
--- a/libs/protobuf/java/util/src/test/java/com/google/protobuf/util/FieldMaskUtilTest.java
+++ /dev/null
@@ -1,315 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf.util;
-
-import static com.google.common.truth.Truth.assertThat;
-import static com.google.common.truth.Truth.assertWithMessage;
-
-import com.google.common.collect.ImmutableList;
-import com.google.protobuf.FieldMask;
-import protobuf_unittest.UnittestProto.NestedTestAllTypes;
-import protobuf_unittest.UnittestProto.TestAllTypes;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-/** Unit tests for {@link FieldMaskUtil}. */
-@RunWith(JUnit4.class)
-public class FieldMaskUtilTest {
-  @Test
-  public void testIsValid() throws Exception {
-    assertThat(FieldMaskUtil.isValid(NestedTestAllTypes.class, "payload")).isTrue();
-    assertThat(FieldMaskUtil.isValid(NestedTestAllTypes.class, "nonexist")).isFalse();
-    assertThat(FieldMaskUtil.isValid(NestedTestAllTypes.class, "payload.optional_int32")).isTrue();
-    assertThat(FieldMaskUtil.isValid(NestedTestAllTypes.class, "payload.repeated_int32")).isTrue();
-    assertThat(FieldMaskUtil.isValid(NestedTestAllTypes.class, "payload.optional_nested_message"))
-        .isTrue();
-    assertThat(FieldMaskUtil.isValid(NestedTestAllTypes.class, "payload.repeated_nested_message"))
-        .isTrue();
-    assertThat(FieldMaskUtil.isValid(NestedTestAllTypes.class, "payload.nonexist")).isFalse();
-
-    assertThat(FieldMaskUtil.isValid(NestedTestAllTypes.class, FieldMaskUtil.fromString("payload")))
-        .isTrue();
-    assertThat(
-            FieldMaskUtil.isValid(NestedTestAllTypes.class, FieldMaskUtil.fromString("nonexist")))
-        .isFalse();
-    assertThat(
-            FieldMaskUtil.isValid(
-                NestedTestAllTypes.class, FieldMaskUtil.fromString("payload,nonexist")))
-        .isFalse();
-
-    assertThat(FieldMaskUtil.isValid(NestedTestAllTypes.getDescriptor(), "payload")).isTrue();
-    assertThat(FieldMaskUtil.isValid(NestedTestAllTypes.getDescriptor(), "nonexist")).isFalse();
-
-    assertThat(
-            FieldMaskUtil.isValid(
-                NestedTestAllTypes.getDescriptor(), FieldMaskUtil.fromString("payload")))
-        .isTrue();
-    assertThat(
-            FieldMaskUtil.isValid(
-                NestedTestAllTypes.getDescriptor(), FieldMaskUtil.fromString("nonexist")))
-        .isFalse();
-
-    assertThat(
-            FieldMaskUtil.isValid(NestedTestAllTypes.class, "payload.optional_nested_message.bb"))
-        .isTrue();
-    // Repeated fields cannot have sub-paths.
-    assertThat(
-            FieldMaskUtil.isValid(NestedTestAllTypes.class, "payload.repeated_nested_message.bb"))
-        .isFalse();
-    // Non-message fields cannot have sub-paths.
-    assertThat(FieldMaskUtil.isValid(NestedTestAllTypes.class, "payload.optional_int32.bb"))
-        .isFalse();
-  }
-
-  @Test
-  public void testToString() throws Exception {
-    assertThat(FieldMaskUtil.toString(FieldMask.getDefaultInstance())).isEmpty();
-    FieldMask mask = FieldMask.newBuilder().addPaths("foo").build();
-    assertThat(FieldMaskUtil.toString(mask)).isEqualTo("foo");
-    mask = FieldMask.newBuilder().addPaths("foo").addPaths("bar").build();
-    assertThat(FieldMaskUtil.toString(mask)).isEqualTo("foo,bar");
-
-    // Empty field paths are ignored.
-    mask =
-        FieldMask.newBuilder()
-            .addPaths("")
-            .addPaths("foo")
-            .addPaths("")
-            .addPaths("bar")
-            .addPaths("")
-            .build();
-    assertThat(FieldMaskUtil.toString(mask)).isEqualTo("foo,bar");
-  }
-
-  @Test
-  public void testFromString() throws Exception {
-    FieldMask mask = FieldMaskUtil.fromString("");
-    assertThat(mask.getPathsCount()).isEqualTo(0);
-    mask = FieldMaskUtil.fromString("foo");
-    assertThat(mask.getPathsCount()).isEqualTo(1);
-    assertThat(mask.getPaths(0)).isEqualTo("foo");
-    mask = FieldMaskUtil.fromString("foo,bar.baz");
-    assertThat(mask.getPathsCount()).isEqualTo(2);
-    assertThat(mask.getPaths(0)).isEqualTo("foo");
-    assertThat(mask.getPaths(1)).isEqualTo("bar.baz");
-
-    // Empty field paths are ignore.
-    mask = FieldMaskUtil.fromString(",foo,,bar,");
-    assertThat(mask.getPathsCount()).isEqualTo(2);
-    assertThat(mask.getPaths(0)).isEqualTo("foo");
-    assertThat(mask.getPaths(1)).isEqualTo("bar");
-
-    // Check whether the field paths are valid if a class parameter is provided.
-    mask = FieldMaskUtil.fromString(NestedTestAllTypes.class, ",payload");
-
-    try {
-      mask = FieldMaskUtil.fromString(NestedTestAllTypes.class, "payload,nonexist");
-      assertWithMessage("Exception is expected.").fail();
-    } catch (IllegalArgumentException e) {
-      // Expected.
-    }
-  }
-
-  @Test
-  public void testFromFieldNumbers() throws Exception {
-    FieldMask mask = FieldMaskUtil.fromFieldNumbers(TestAllTypes.class);
-    assertThat(mask.getPathsCount()).isEqualTo(0);
-    mask =
-        FieldMaskUtil.fromFieldNumbers(
-            TestAllTypes.class, TestAllTypes.OPTIONAL_INT32_FIELD_NUMBER);
-    assertThat(mask.getPathsCount()).isEqualTo(1);
-    assertThat(mask.getPaths(0)).isEqualTo("optional_int32");
-    mask =
-        FieldMaskUtil.fromFieldNumbers(
-            TestAllTypes.class,
-            TestAllTypes.OPTIONAL_INT32_FIELD_NUMBER,
-            TestAllTypes.OPTIONAL_INT64_FIELD_NUMBER);
-    assertThat(mask.getPathsCount()).isEqualTo(2);
-    assertThat(mask.getPaths(0)).isEqualTo("optional_int32");
-    assertThat(mask.getPaths(1)).isEqualTo("optional_int64");
-
-    try {
-      int invalidFieldNumber = 1000;
-      mask = FieldMaskUtil.fromFieldNumbers(TestAllTypes.class, invalidFieldNumber);
-      assertWithMessage("Exception is expected.").fail();
-    } catch (IllegalArgumentException expected) {
-    }
-  }
-
-  @Test
-  public void testToJsonString() throws Exception {
-    FieldMask mask = FieldMask.getDefaultInstance();
-    assertThat(FieldMaskUtil.toJsonString(mask)).isEmpty();
-    mask = FieldMask.newBuilder().addPaths("foo").build();
-    assertThat(FieldMaskUtil.toJsonString(mask)).isEqualTo("foo");
-    mask = FieldMask.newBuilder().addPaths("foo.bar_baz").addPaths("").build();
-    assertThat(FieldMaskUtil.toJsonString(mask)).isEqualTo("foo.barBaz");
-    mask = FieldMask.newBuilder().addPaths("foo").addPaths("bar_baz").build();
-    assertThat(FieldMaskUtil.toJsonString(mask)).isEqualTo("foo,barBaz");
-  }
-
-  @Test
-  public void testFromJsonString() throws Exception {
-    FieldMask mask = FieldMaskUtil.fromJsonString("");
-    assertThat(mask.getPathsCount()).isEqualTo(0);
-    mask = FieldMaskUtil.fromJsonString("foo");
-    assertThat(mask.getPathsCount()).isEqualTo(1);
-    assertThat(mask.getPaths(0)).isEqualTo("foo");
-    mask = FieldMaskUtil.fromJsonString("foo.barBaz");
-    assertThat(mask.getPathsCount()).isEqualTo(1);
-    assertThat(mask.getPaths(0)).isEqualTo("foo.bar_baz");
-    mask = FieldMaskUtil.fromJsonString("foo,barBaz");
-    assertThat(mask.getPathsCount()).isEqualTo(2);
-    assertThat(mask.getPaths(0)).isEqualTo("foo");
-    assertThat(mask.getPaths(1)).isEqualTo("bar_baz");
-  }
-
-  @Test
-  public void testFromStringList() throws Exception {
-    FieldMask mask =
-        FieldMaskUtil.fromStringList(
-            NestedTestAllTypes.class, ImmutableList.of("payload.repeated_nested_message", "child"));
-    assertThat(mask)
-        .isEqualTo(
-            FieldMask.newBuilder()
-                .addPaths("payload.repeated_nested_message")
-                .addPaths("child")
-                .build());
-
-    mask =
-        FieldMaskUtil.fromStringList(
-            NestedTestAllTypes.getDescriptor(),
-            ImmutableList.of("payload.repeated_nested_message", "child"));
-    assertThat(mask)
-        .isEqualTo(
-            FieldMask.newBuilder()
-                .addPaths("payload.repeated_nested_message")
-                .addPaths("child")
-                .build());
-
-    mask =
-        FieldMaskUtil.fromStringList(ImmutableList.of("payload.repeated_nested_message", "child"));
-    assertThat(mask)
-        .isEqualTo(
-            FieldMask.newBuilder()
-                .addPaths("payload.repeated_nested_message")
-                .addPaths("child")
-                .build());
-  }
-
-  @Test
-  public void testUnion() throws Exception {
-    // Only test a simple case here and expect
-    // {@link FieldMaskTreeTest#testAddFieldPath} to cover all scenarios.
-    FieldMask mask1 = FieldMaskUtil.fromString("foo,bar.baz,bar.quz");
-    FieldMask mask2 = FieldMaskUtil.fromString("foo.bar,bar");
-    FieldMask result = FieldMaskUtil.union(mask1, mask2);
-    assertThat(FieldMaskUtil.toString(result)).isEqualTo("bar,foo");
-  }
-
-  @Test
-  public void testUnion_usingVarArgs() throws Exception {
-    FieldMask mask1 = FieldMaskUtil.fromString("foo");
-    FieldMask mask2 = FieldMaskUtil.fromString("foo.bar,bar.quz");
-    FieldMask mask3 = FieldMaskUtil.fromString("bar.quz");
-    FieldMask mask4 = FieldMaskUtil.fromString("bar");
-    FieldMask result = FieldMaskUtil.union(mask1, mask2, mask3, mask4);
-    assertThat(FieldMaskUtil.toString(result)).isEqualTo("bar,foo");
-  }
-
-  @Test
-  public void testSubstract() throws Exception {
-    // Only test a simple case here and expect
-    // {@link FieldMaskTreeTest#testRemoveFieldPath} to cover all scenarios.
-    FieldMask mask1 = FieldMaskUtil.fromString("foo,bar.baz,bar.quz");
-    FieldMask mask2 = FieldMaskUtil.fromString("foo.bar,bar");
-    FieldMask result = FieldMaskUtil.subtract(mask1, mask2);
-    assertThat(FieldMaskUtil.toString(result)).isEqualTo("foo");
-  }
-
-  @Test
-  public void testSubstract_usingVarArgs() throws Exception {
-    FieldMask mask1 = FieldMaskUtil.fromString("foo,bar.baz,bar.quz.bar");
-    FieldMask mask2 = FieldMaskUtil.fromString("foo.bar,bar.baz.quz");
-    FieldMask mask3 = FieldMaskUtil.fromString("bar.quz");
-    FieldMask mask4 = FieldMaskUtil.fromString("foo,bar.baz");
-    FieldMask result = FieldMaskUtil.subtract(mask1, mask2, mask3, mask4);
-    assertThat(FieldMaskUtil.toString(result)).isEmpty();
-  }
-
-  @Test
-  public void testIntersection() throws Exception {
-    // Only test a simple case here and expect
-    // {@link FieldMaskTreeTest#testIntersectFieldPath} to cover all scenarios.
-    FieldMask mask1 = FieldMaskUtil.fromString("foo,bar.baz,bar.quz");
-    FieldMask mask2 = FieldMaskUtil.fromString("foo.bar,bar");
-    FieldMask result = FieldMaskUtil.intersection(mask1, mask2);
-    assertThat(FieldMaskUtil.toString(result)).isEqualTo("bar.baz,bar.quz,foo.bar");
-  }
-
-  @Test
-  public void testMerge() throws Exception {
-    // Only test a simple case here and expect
-    // {@link FieldMaskTreeTest#testMerge} to cover all scenarios.
-    NestedTestAllTypes source =
-        NestedTestAllTypes.newBuilder()
-            .setPayload(TestAllTypes.newBuilder().setOptionalInt32(1234))
-            .build();
-    NestedTestAllTypes.Builder builder = NestedTestAllTypes.newBuilder();
-    FieldMaskUtil.merge(FieldMaskUtil.fromString("payload"), source, builder);
-    assertThat(builder.getPayload().getOptionalInt32()).isEqualTo(1234);
-  }
-
-  @Test
-  public void testTrim() throws Exception {
-    NestedTestAllTypes source =
-        NestedTestAllTypes.newBuilder()
-            .setPayload(
-                TestAllTypes.newBuilder()
-                    .setOptionalInt32(1234)
-                    .setOptionalString("1234")
-                    .setOptionalBool(true))
-            .build();
-    FieldMask mask =
-        FieldMaskUtil.fromStringList(
-            ImmutableList.of("payload.optional_int32", "payload.optional_string"));
-
-    NestedTestAllTypes actual = FieldMaskUtil.trim(mask, source);
-
-    assertThat(actual)
-        .isEqualTo(
-            NestedTestAllTypes.newBuilder()
-                .setPayload(
-                    TestAllTypes.newBuilder().setOptionalInt32(1234).setOptionalString("1234"))
-                .build());
-  }
-}
diff --git a/libs/protobuf/java/util/src/test/java/com/google/protobuf/util/JsonFormatTest.java b/libs/protobuf/java/util/src/test/java/com/google/protobuf/util/JsonFormatTest.java
deleted file mode 100644
index c31031e..0000000
--- a/libs/protobuf/java/util/src/test/java/com/google/protobuf/util/JsonFormatTest.java
+++ /dev/null
@@ -1,2001 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf.util;
-
-import static com.google.common.truth.Truth.assertThat;
-import static com.google.common.truth.Truth.assertWithMessage;
-
-import com.google.common.collect.ImmutableSet;
-import com.google.gson.JsonSyntaxException;
-import com.google.protobuf.Any;
-import com.google.protobuf.BoolValue;
-import com.google.protobuf.ByteString;
-import com.google.protobuf.BytesValue;
-import com.google.protobuf.Descriptors.Descriptor;
-import com.google.protobuf.Descriptors.FieldDescriptor;
-import com.google.protobuf.DoubleValue;
-import com.google.protobuf.FloatValue;
-import com.google.protobuf.Int32Value;
-import com.google.protobuf.Int64Value;
-import com.google.protobuf.InvalidProtocolBufferException;
-import com.google.protobuf.ListValue;
-import com.google.protobuf.Message;
-import com.google.protobuf.NullValue;
-import com.google.protobuf.StringValue;
-import com.google.protobuf.Struct;
-import com.google.protobuf.UInt32Value;
-import com.google.protobuf.UInt64Value;
-import com.google.protobuf.Value;
-import com.google.protobuf.util.JsonFormat.TypeRegistry;
-import com.google.protobuf.util.proto.JsonTestProto.TestAllTypes;
-import com.google.protobuf.util.proto.JsonTestProto.TestAllTypes.AliasedEnum;
-import com.google.protobuf.util.proto.JsonTestProto.TestAllTypes.NestedEnum;
-import com.google.protobuf.util.proto.JsonTestProto.TestAllTypes.NestedMessage;
-import com.google.protobuf.util.proto.JsonTestProto.TestAny;
-import com.google.protobuf.util.proto.JsonTestProto.TestCustomJsonName;
-import com.google.protobuf.util.proto.JsonTestProto.TestDuration;
-import com.google.protobuf.util.proto.JsonTestProto.TestFieldMask;
-import com.google.protobuf.util.proto.JsonTestProto.TestMap;
-import com.google.protobuf.util.proto.JsonTestProto.TestOneof;
-import com.google.protobuf.util.proto.JsonTestProto.TestRecursive;
-import com.google.protobuf.util.proto.JsonTestProto.TestStruct;
-import com.google.protobuf.util.proto.JsonTestProto.TestTimestamp;
-import com.google.protobuf.util.proto.JsonTestProto.TestWrappers;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.io.StringReader;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Locale;
-import java.util.Set;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-@RunWith(JUnit4.class)
-public class JsonFormatTest {
-
-  private static Locale originalLocale;
-
-  @BeforeClass
-  public static void setLocale() {
-    originalLocale = Locale.getDefault();
-    // Test that locale does not affect JsonFormat.
-    Locale.setDefault(Locale.forLanguageTag("hi-IN"));
-  }
-
-  @AfterClass
-  public static void resetLocale() {
-    Locale.setDefault(originalLocale);
-  }
-
-  private void setAllFields(TestAllTypes.Builder builder) {
-    builder.setOptionalInt32(1234);
-    builder.setOptionalInt64(1234567890123456789L);
-    builder.setOptionalUint32(5678);
-    builder.setOptionalUint64(2345678901234567890L);
-    builder.setOptionalSint32(9012);
-    builder.setOptionalSint64(3456789012345678901L);
-    builder.setOptionalFixed32(3456);
-    builder.setOptionalFixed64(4567890123456789012L);
-    builder.setOptionalSfixed32(7890);
-    builder.setOptionalSfixed64(5678901234567890123L);
-    builder.setOptionalFloat(1.5f);
-    builder.setOptionalDouble(1.25);
-    builder.setOptionalBool(true);
-    builder.setOptionalString("Hello world!");
-    builder.setOptionalBytes(ByteString.copyFrom(new byte[] {0, 1, 2}));
-    builder.setOptionalNestedEnum(NestedEnum.BAR);
-    builder.getOptionalNestedMessageBuilder().setValue(100);
-
-    builder.addRepeatedInt32(1234);
-    builder.addRepeatedInt64(1234567890123456789L);
-    builder.addRepeatedUint32(5678);
-    builder.addRepeatedUint64(2345678901234567890L);
-    builder.addRepeatedSint32(9012);
-    builder.addRepeatedSint64(3456789012345678901L);
-    builder.addRepeatedFixed32(3456);
-    builder.addRepeatedFixed64(4567890123456789012L);
-    builder.addRepeatedSfixed32(7890);
-    builder.addRepeatedSfixed64(5678901234567890123L);
-    builder.addRepeatedFloat(1.5f);
-    builder.addRepeatedDouble(1.25);
-    builder.addRepeatedBool(true);
-    builder.addRepeatedString("Hello world!");
-    builder.addRepeatedBytes(ByteString.copyFrom(new byte[] {0, 1, 2}));
-    builder.addRepeatedNestedEnum(NestedEnum.BAR);
-    builder.addRepeatedNestedMessageBuilder().setValue(100);
-
-    builder.addRepeatedInt32(234);
-    builder.addRepeatedInt64(234567890123456789L);
-    builder.addRepeatedUint32(678);
-    builder.addRepeatedUint64(345678901234567890L);
-    builder.addRepeatedSint32(012);
-    builder.addRepeatedSint64(456789012345678901L);
-    builder.addRepeatedFixed32(456);
-    builder.addRepeatedFixed64(567890123456789012L);
-    builder.addRepeatedSfixed32(890);
-    builder.addRepeatedSfixed64(678901234567890123L);
-    builder.addRepeatedFloat(11.5f);
-    builder.addRepeatedDouble(11.25);
-    builder.addRepeatedBool(true);
-    builder.addRepeatedString("ello world!");
-    builder.addRepeatedBytes(ByteString.copyFrom(new byte[] {1, 2}));
-    builder.addRepeatedNestedEnum(NestedEnum.BAZ);
-    builder.addRepeatedNestedMessageBuilder().setValue(200);
-  }
-
-  private void assertRoundTripEquals(Message message) throws Exception {
-    assertRoundTripEquals(message, TypeRegistry.getEmptyTypeRegistry());
-  }
-
-  private void assertRoundTripEquals(Message message, TypeRegistry registry) throws Exception {
-    JsonFormat.Printer printer = JsonFormat.printer().usingTypeRegistry(registry);
-    JsonFormat.Parser parser = JsonFormat.parser().usingTypeRegistry(registry);
-    Message.Builder builder = message.newBuilderForType();
-    parser.merge(printer.print(message), builder);
-    Message parsedMessage = builder.build();
-    assertThat(parsedMessage.toString()).isEqualTo(message.toString());
-  }
-
-  private void assertRoundTripEquals(Message message, com.google.protobuf.TypeRegistry registry)
-      throws Exception {
-    JsonFormat.Printer printer = JsonFormat.printer().usingTypeRegistry(registry);
-    JsonFormat.Parser parser = JsonFormat.parser().usingTypeRegistry(registry);
-    Message.Builder builder = message.newBuilderForType();
-    parser.merge(printer.print(message), builder);
-    Message parsedMessage = builder.build();
-    assertThat(parsedMessage.toString()).isEqualTo(message.toString());
-  }
-
-  private String toJsonString(Message message) throws IOException {
-    return JsonFormat.printer().print(message);
-  }
-  private String toCompactJsonString(Message message) throws IOException {
-    return JsonFormat.printer().omittingInsignificantWhitespace().print(message);
-  }
-  private String toSortedJsonString(Message message) throws IOException {
-    return JsonFormat.printer().sortingMapKeys().print(message);
-  }
-
-  private void mergeFromJson(String json, Message.Builder builder) throws IOException {
-    JsonFormat.parser().merge(json, builder);
-  }
-
-  private void mergeFromJsonIgnoringUnknownFields(String json, Message.Builder builder)
-      throws IOException {
-    JsonFormat.parser().ignoringUnknownFields().merge(json, builder);
-  }
-
-  @Test
-  public void testAllFields() throws Exception {
-    TestAllTypes.Builder builder = TestAllTypes.newBuilder();
-    setAllFields(builder);
-    TestAllTypes message = builder.build();
-
-    assertThat(toJsonString(message))
-        .isEqualTo(
-            "{\n"
-                + "  \"optionalInt32\": 1234,\n"
-                + "  \"optionalInt64\": \"1234567890123456789\",\n"
-                + "  \"optionalUint32\": 5678,\n"
-                + "  \"optionalUint64\": \"2345678901234567890\",\n"
-                + "  \"optionalSint32\": 9012,\n"
-                + "  \"optionalSint64\": \"3456789012345678901\",\n"
-                + "  \"optionalFixed32\": 3456,\n"
-                + "  \"optionalFixed64\": \"4567890123456789012\",\n"
-                + "  \"optionalSfixed32\": 7890,\n"
-                + "  \"optionalSfixed64\": \"5678901234567890123\",\n"
-                + "  \"optionalFloat\": 1.5,\n"
-                + "  \"optionalDouble\": 1.25,\n"
-                + "  \"optionalBool\": true,\n"
-                + "  \"optionalString\": \"Hello world!\",\n"
-                + "  \"optionalBytes\": \"AAEC\",\n"
-                + "  \"optionalNestedMessage\": {\n"
-                + "    \"value\": 100\n"
-                + "  },\n"
-                + "  \"optionalNestedEnum\": \"BAR\",\n"
-                + "  \"repeatedInt32\": [1234, 234],\n"
-                + "  \"repeatedInt64\": [\"1234567890123456789\", \"234567890123456789\"],\n"
-                + "  \"repeatedUint32\": [5678, 678],\n"
-                + "  \"repeatedUint64\": [\"2345678901234567890\", \"345678901234567890\"],\n"
-                + "  \"repeatedSint32\": [9012, 10],\n"
-                + "  \"repeatedSint64\": [\"3456789012345678901\", \"456789012345678901\"],\n"
-                + "  \"repeatedFixed32\": [3456, 456],\n"
-                + "  \"repeatedFixed64\": [\"4567890123456789012\", \"567890123456789012\"],\n"
-                + "  \"repeatedSfixed32\": [7890, 890],\n"
-                + "  \"repeatedSfixed64\": [\"5678901234567890123\", \"678901234567890123\"],\n"
-                + "  \"repeatedFloat\": [1.5, 11.5],\n"
-                + "  \"repeatedDouble\": [1.25, 11.25],\n"
-                + "  \"repeatedBool\": [true, true],\n"
-                + "  \"repeatedString\": [\"Hello world!\", \"ello world!\"],\n"
-                + "  \"repeatedBytes\": [\"AAEC\", \"AQI=\"],\n"
-                + "  \"repeatedNestedMessage\": [{\n"
-                + "    \"value\": 100\n"
-                + "  }, {\n"
-                + "    \"value\": 200\n"
-                + "  }],\n"
-                + "  \"repeatedNestedEnum\": [\"BAR\", \"BAZ\"]\n"
-                + "}");
-
-    assertRoundTripEquals(message);
-  }
-
-  @Test
-  public void testUnknownEnumValues() throws Exception {
-    TestAllTypes message =
-        TestAllTypes.newBuilder()
-            .setOptionalNestedEnumValue(12345)
-            .addRepeatedNestedEnumValue(12345)
-            .addRepeatedNestedEnumValue(0)
-            .build();
-    assertThat(toJsonString(message))
-        .isEqualTo(
-            "{\n"
-                + "  \"optionalNestedEnum\": 12345,\n"
-                + "  \"repeatedNestedEnum\": [12345, \"FOO\"]\n"
-                + "}");
-    assertRoundTripEquals(message);
-
-    TestMap.Builder mapBuilder = TestMap.newBuilder();
-    mapBuilder.putInt32ToEnumMapValue(1, 0);
-    mapBuilder.putInt32ToEnumMapValue(2, 12345);
-    TestMap mapMessage = mapBuilder.build();
-    assertThat(toJsonString(mapMessage))
-        .isEqualTo(
-            "{\n"
-                + "  \"int32ToEnumMap\": {\n"
-                + "    \"1\": \"FOO\",\n"
-                + "    \"2\": 12345\n"
-                + "  }\n"
-                + "}");
-    assertRoundTripEquals(mapMessage);
-  }
-
-  @Test
-  public void testSpecialFloatValues() throws Exception {
-    TestAllTypes message =
-        TestAllTypes.newBuilder()
-            .addRepeatedFloat(Float.NaN)
-            .addRepeatedFloat(Float.POSITIVE_INFINITY)
-            .addRepeatedFloat(Float.NEGATIVE_INFINITY)
-            .addRepeatedDouble(Double.NaN)
-            .addRepeatedDouble(Double.POSITIVE_INFINITY)
-            .addRepeatedDouble(Double.NEGATIVE_INFINITY)
-            .build();
-    assertThat(toJsonString(message))
-        .isEqualTo(
-            "{\n"
-                + "  \"repeatedFloat\": [\"NaN\", \"Infinity\", \"-Infinity\"],\n"
-                + "  \"repeatedDouble\": [\"NaN\", \"Infinity\", \"-Infinity\"]\n"
-                + "}");
-
-    assertRoundTripEquals(message);
-  }
-
-  @Test
-  public void testParserAcceptStringForNumericField() throws Exception {
-    TestAllTypes.Builder builder = TestAllTypes.newBuilder();
-    mergeFromJson(
-        "{\n"
-            + "  \"optionalInt32\": \"1234\",\n"
-            + "  \"optionalUint32\": \"5678\",\n"
-            + "  \"optionalSint32\": \"9012\",\n"
-            + "  \"optionalFixed32\": \"3456\",\n"
-            + "  \"optionalSfixed32\": \"7890\",\n"
-            + "  \"optionalFloat\": \"1.5\",\n"
-            + "  \"optionalDouble\": \"1.25\",\n"
-            + "  \"optionalBool\": \"true\"\n"
-            + "}",
-        builder);
-    TestAllTypes message = builder.build();
-    assertThat(message.getOptionalInt32()).isEqualTo(1234);
-    assertThat(message.getOptionalUint32()).isEqualTo(5678);
-    assertThat(message.getOptionalSint32()).isEqualTo(9012);
-    assertThat(message.getOptionalFixed32()).isEqualTo(3456);
-    assertThat(message.getOptionalSfixed32()).isEqualTo(7890);
-    assertThat(message.getOptionalFloat()).isEqualTo(1.5f);
-    assertThat(message.getOptionalDouble()).isEqualTo(1.25);
-    assertThat(message.getOptionalBool()).isTrue();
-  }
-
-  @Test
-  public void testParserAcceptFloatingPointValueForIntegerField() throws Exception {
-    // Test that numeric values like "1.000", "1e5" will also be accepted.
-    TestAllTypes.Builder builder = TestAllTypes.newBuilder();
-    mergeFromJson(
-        "{\n"
-            + "  \"repeatedInt32\": [1.000, 1e5, \"1.000\", \"1e5\"],\n"
-            + "  \"repeatedUint32\": [1.000, 1e5, \"1.000\", \"1e5\"],\n"
-            + "  \"repeatedInt64\": [1.000, 1e5, \"1.000\", \"1e5\"],\n"
-            + "  \"repeatedUint64\": [1.000, 1e5, \"1.000\", \"1e5\"]\n"
-            + "}",
-        builder);
-    int[] expectedValues = new int[] {1, 100000, 1, 100000};
-    assertThat(builder.getRepeatedInt32Count()).isEqualTo(4);
-    assertThat(builder.getRepeatedUint32Count()).isEqualTo(4);
-    assertThat(builder.getRepeatedInt64Count()).isEqualTo(4);
-    assertThat(builder.getRepeatedUint64Count()).isEqualTo(4);
-    for (int i = 0; i < 4; ++i) {
-      assertThat(builder.getRepeatedInt32(i)).isEqualTo(expectedValues[i]);
-      assertThat(builder.getRepeatedUint32(i)).isEqualTo(expectedValues[i]);
-      assertThat(builder.getRepeatedInt64(i)).isEqualTo(expectedValues[i]);
-      assertThat(builder.getRepeatedUint64(i)).isEqualTo(expectedValues[i]);
-    }
-  }
-
-  @Test
-  public void testRejectTooLargeFloat() throws IOException {
-    TestAllTypes.Builder builder = TestAllTypes.newBuilder();
-    double tooLarge = 2.0 * Float.MAX_VALUE;
-    try {
-      mergeFromJson("{\"" + "optionalFloat" + "\":" + tooLarge + "}", builder);
-      assertWithMessage("InvalidProtocolBufferException expected.").fail();
-    } catch (InvalidProtocolBufferException expected) {
-      assertThat(expected).hasMessageThat().isEqualTo("Out of range float value: " + tooLarge);
-    }
-  }
-
-  @Test
-  public void testRejectMalformedFloat() throws IOException {
-    TestAllTypes.Builder builder = TestAllTypes.newBuilder();
-    try {
-      mergeFromJson("{\"optionalFloat\":3.5aa}", builder);
-      assertWithMessage("InvalidProtocolBufferException expected.").fail();
-    } catch (InvalidProtocolBufferException expected) {
-      assertThat(expected).hasCauseThat().isNotNull();
-    }
-  }
-
-  @Test
-  public void testRejectFractionalInt64() throws IOException {
-    TestAllTypes.Builder builder = TestAllTypes.newBuilder();
-    try {
-      mergeFromJson("{\"" + "optionalInt64" + "\":" + "1.5" + "}", builder);
-      assertWithMessage("Exception is expected.").fail();
-    } catch (InvalidProtocolBufferException expected) {
-      assertThat(expected).hasMessageThat().isEqualTo("Not an int64 value: 1.5");
-      assertThat(expected).hasCauseThat().isNotNull();
-    }
-  }
-
-  @Test
-  public void testRejectFractionalInt32() throws IOException {
-    TestAllTypes.Builder builder = TestAllTypes.newBuilder();
-    try {
-      mergeFromJson("{\"" + "optionalInt32" + "\":" + "1.5" + "}", builder);
-      assertWithMessage("Exception is expected.").fail();
-    } catch (InvalidProtocolBufferException expected) {
-      assertThat(expected).hasMessageThat().isEqualTo("Not an int32 value: 1.5");
-      assertThat(expected).hasCauseThat().isNotNull();
-    }
-  }
-
-  @Test
-  public void testRejectFractionalUnsignedInt32() throws IOException {
-    TestAllTypes.Builder builder = TestAllTypes.newBuilder();
-    try {
-      mergeFromJson("{\"" + "optionalUint32" + "\":" + "1.5" + "}", builder);
-      assertWithMessage("Exception is expected.").fail();
-    } catch (InvalidProtocolBufferException expected) {
-      assertThat(expected).hasMessageThat().isEqualTo("Not an uint32 value: 1.5");
-      assertThat(expected).hasCauseThat().isNotNull();
-    }
-  }
-
-  @Test
-  public void testRejectFractionalUnsignedInt64() throws IOException {
-    TestAllTypes.Builder builder = TestAllTypes.newBuilder();
-    try {
-      mergeFromJson("{\"" + "optionalUint64" + "\":" + "1.5" + "}", builder);
-      assertWithMessage("Exception is expected.").fail();
-    } catch (InvalidProtocolBufferException expected) {
-      assertThat(expected).hasMessageThat().isEqualTo("Not an uint64 value: 1.5");
-      assertThat(expected).hasCauseThat().isNotNull();
-    }
-  }
-
-  private void assertRejects(String name, String value) throws IOException {
-    TestAllTypes.Builder builder = TestAllTypes.newBuilder();
-    try {
-      // Numeric form is rejected.
-      mergeFromJson("{\"" + name + "\":" + value + "}", builder);
-      assertWithMessage("Exception is expected.").fail();
-    } catch (InvalidProtocolBufferException expected) {
-      assertThat(expected).hasMessageThat().contains(value);
-    }
-    try {
-      // String form is also rejected.
-      mergeFromJson("{\"" + name + "\":\"" + value + "\"}", builder);
-      assertWithMessage("Exception is expected.").fail();
-    } catch (InvalidProtocolBufferException expected) {
-      assertThat(expected).hasMessageThat().contains(value);
-    }
-  }
-
-  private void assertAccepts(String name, String value) throws IOException {
-    TestAllTypes.Builder builder = TestAllTypes.newBuilder();
-    // Both numeric form and string form are accepted.
-    mergeFromJson("{\"" + name + "\":" + value + "}", builder);
-    builder.clear();
-    mergeFromJson("{\"" + name + "\":\"" + value + "\"}", builder);
-  }
-
-  @Test
-  public void testParserRejectOutOfRangeNumericValues() throws Exception {
-    assertAccepts("optionalInt32", String.valueOf(Integer.MAX_VALUE));
-    assertAccepts("optionalInt32", String.valueOf(Integer.MIN_VALUE));
-    assertRejects("optionalInt32", String.valueOf(Integer.MAX_VALUE + 1L));
-    assertRejects("optionalInt32", String.valueOf(Integer.MIN_VALUE - 1L));
-
-    assertAccepts("optionalUint32", String.valueOf(Integer.MAX_VALUE + 1L));
-    assertRejects("optionalUint32", "123456789012345");
-    assertRejects("optionalUint32", "-1");
-
-    BigInteger one = BigInteger.ONE;
-    BigInteger maxLong = new BigInteger(String.valueOf(Long.MAX_VALUE));
-    BigInteger minLong = new BigInteger(String.valueOf(Long.MIN_VALUE));
-    assertAccepts("optionalInt64", maxLong.toString());
-    assertAccepts("optionalInt64", minLong.toString());
-    assertRejects("optionalInt64", maxLong.add(one).toString());
-    assertRejects("optionalInt64", minLong.subtract(one).toString());
-
-    assertAccepts("optionalUint64", maxLong.add(one).toString());
-    assertRejects("optionalUint64", "1234567890123456789012345");
-    assertRejects("optionalUint64", "-1");
-
-    assertAccepts("optionalBool", "true");
-    assertRejects("optionalBool", "1");
-    assertRejects("optionalBool", "0");
-
-    assertAccepts("optionalFloat", String.valueOf(Float.MAX_VALUE));
-    assertAccepts("optionalFloat", String.valueOf(-Float.MAX_VALUE));
-    assertRejects("optionalFloat", String.valueOf(Double.MAX_VALUE));
-    assertRejects("optionalFloat", String.valueOf(-Double.MAX_VALUE));
-
-    BigDecimal moreThanOne = new BigDecimal("1.000001");
-    BigDecimal maxDouble = new BigDecimal(Double.MAX_VALUE);
-    BigDecimal minDouble = new BigDecimal(-Double.MAX_VALUE);
-    assertAccepts("optionalDouble", maxDouble.toString());
-    assertAccepts("optionalDouble", minDouble.toString());
-    assertRejects("optionalDouble", maxDouble.multiply(moreThanOne).toString());
-    assertRejects("optionalDouble", minDouble.multiply(moreThanOne).toString());
-  }
-
-  @Test
-  public void testParserAcceptNull() throws Exception {
-    TestAllTypes.Builder builder = TestAllTypes.newBuilder();
-    mergeFromJson(
-        "{\n"
-            + "  \"optionalInt32\": null,\n"
-            + "  \"optionalInt64\": null,\n"
-            + "  \"optionalUint32\": null,\n"
-            + "  \"optionalUint64\": null,\n"
-            + "  \"optionalSint32\": null,\n"
-            + "  \"optionalSint64\": null,\n"
-            + "  \"optionalFixed32\": null,\n"
-            + "  \"optionalFixed64\": null,\n"
-            + "  \"optionalSfixed32\": null,\n"
-            + "  \"optionalSfixed64\": null,\n"
-            + "  \"optionalFloat\": null,\n"
-            + "  \"optionalDouble\": null,\n"
-            + "  \"optionalBool\": null,\n"
-            + "  \"optionalString\": null,\n"
-            + "  \"optionalBytes\": null,\n"
-            + "  \"optionalNestedMessage\": null,\n"
-            + "  \"optionalNestedEnum\": null,\n"
-            + "  \"repeatedInt32\": null,\n"
-            + "  \"repeatedInt64\": null,\n"
-            + "  \"repeatedUint32\": null,\n"
-            + "  \"repeatedUint64\": null,\n"
-            + "  \"repeatedSint32\": null,\n"
-            + "  \"repeatedSint64\": null,\n"
-            + "  \"repeatedFixed32\": null,\n"
-            + "  \"repeatedFixed64\": null,\n"
-            + "  \"repeatedSfixed32\": null,\n"
-            + "  \"repeatedSfixed64\": null,\n"
-            + "  \"repeatedFloat\": null,\n"
-            + "  \"repeatedDouble\": null,\n"
-            + "  \"repeatedBool\": null,\n"
-            + "  \"repeatedString\": null,\n"
-            + "  \"repeatedBytes\": null,\n"
-            + "  \"repeatedNestedMessage\": null,\n"
-            + "  \"repeatedNestedEnum\": null\n"
-            + "}",
-        builder);
-    TestAllTypes message = builder.build();
-    assertThat(message).isEqualTo(TestAllTypes.getDefaultInstance());
-
-    // Repeated field elements cannot be null.
-    try {
-      builder = TestAllTypes.newBuilder();
-      mergeFromJson("{\n" + "  \"repeatedInt32\": [null, null],\n" + "}", builder);
-      assertWithMessage("expected exception").fail();
-    } catch (InvalidProtocolBufferException e) {
-      // Exception expected.
-    }
-
-    try {
-      builder = TestAllTypes.newBuilder();
-      mergeFromJson("{\n" + "  \"repeatedNestedMessage\": [null, null],\n" + "}", builder);
-      assertWithMessage("expected exception").fail();
-    } catch (InvalidProtocolBufferException e) {
-      // Exception expected.
-    }
-  }
-
-  @Test
-  public void testNullInOneof() throws Exception {
-    TestOneof.Builder builder = TestOneof.newBuilder();
-    mergeFromJson("{\n" + "  \"oneofNullValue\": null \n" + "}", builder);
-    TestOneof message = builder.build();
-    assertThat(message.getOneofFieldCase()).isEqualTo(TestOneof.OneofFieldCase.ONEOF_NULL_VALUE);
-    assertThat(message.getOneofNullValue()).isEqualTo(NullValue.NULL_VALUE);
-  }
-
-  @Test
-  public void testNullFirstInDuplicateOneof() throws Exception {
-    TestOneof.Builder builder = TestOneof.newBuilder();
-    mergeFromJson("{\"oneofNestedMessage\": null, \"oneofInt32\": 1}", builder);
-    TestOneof message = builder.build();
-    assertThat(message.getOneofInt32()).isEqualTo(1);
-  }
-
-  @Test
-  public void testNullLastInDuplicateOneof() throws Exception {
-    TestOneof.Builder builder = TestOneof.newBuilder();
-    mergeFromJson("{\"oneofInt32\": 1, \"oneofNestedMessage\": null}", builder);
-    TestOneof message = builder.build();
-    assertThat(message.getOneofInt32()).isEqualTo(1);
-  }
-
-  @Test
-  public void testParserRejectDuplicatedFields() throws Exception {
-    // TODO(xiaofeng): The parser we are currently using (GSON) will accept and keep the last
-    // one if multiple entries have the same name. This is not the desired behavior but it can
-    // only be fixed by using our own parser. Here we only test the cases where the names are
-    // different but still referring to the same field.
-
-    // Duplicated optional fields.
-    try {
-      TestAllTypes.Builder builder = TestAllTypes.newBuilder();
-      mergeFromJson(
-          "{\n"
-              + "  \"optionalNestedMessage\": {},\n"
-              + "  \"optional_nested_message\": {}\n"
-              + "}",
-          builder);
-      assertWithMessage("expected exception").fail();
-    } catch (InvalidProtocolBufferException e) {
-      // Exception expected.
-    }
-
-    // Duplicated repeated fields.
-    try {
-      TestAllTypes.Builder builder = TestAllTypes.newBuilder();
-      mergeFromJson(
-          "{\n"
-              + "  \"repeatedInt32\": [1, 2],\n"
-              + "  \"repeated_int32\": [5, 6]\n"
-              + "}",
-          builder);
-      assertWithMessage("expected exception").fail();
-    } catch (InvalidProtocolBufferException e) {
-      // Exception expected.
-    }
-
-    // Duplicated oneof fields, same name.
-    try {
-      TestOneof.Builder builder = TestOneof.newBuilder();
-      mergeFromJson("{\n" + "  \"oneofInt32\": 1,\n" + "  \"oneof_int32\": 2\n" + "}", builder);
-      assertWithMessage("expected exception").fail();
-    } catch (InvalidProtocolBufferException e) {
-      // Exception expected.
-    }
-
-    // Duplicated oneof fields, different name.
-    try {
-      TestOneof.Builder builder = TestOneof.newBuilder();
-      mergeFromJson(
-          "{\n" + "  \"oneofInt32\": 1,\n" + "  \"oneofNullValue\": null\n" + "}", builder);
-      assertWithMessage("expected exception").fail();
-    } catch (InvalidProtocolBufferException e) {
-      // Exception expected.
-    }
-  }
-
-  @Test
-  public void testMapFields() throws Exception {
-    TestMap.Builder builder = TestMap.newBuilder();
-    builder.putInt32ToInt32Map(1, 10);
-    builder.putInt64ToInt32Map(1234567890123456789L, 10);
-    builder.putUint32ToInt32Map(2, 20);
-    builder.putUint64ToInt32Map(2234567890123456789L, 20);
-    builder.putSint32ToInt32Map(3, 30);
-    builder.putSint64ToInt32Map(3234567890123456789L, 30);
-    builder.putFixed32ToInt32Map(4, 40);
-    builder.putFixed64ToInt32Map(4234567890123456789L, 40);
-    builder.putSfixed32ToInt32Map(5, 50);
-    builder.putSfixed64ToInt32Map(5234567890123456789L, 50);
-    builder.putBoolToInt32Map(false, 6);
-    builder.putStringToInt32Map("Hello", 10);
-
-    builder.putInt32ToInt64Map(1, 1234567890123456789L);
-    builder.putInt32ToUint32Map(2, 20);
-    builder.putInt32ToUint64Map(2, 2234567890123456789L);
-    builder.putInt32ToSint32Map(3, 30);
-    builder.putInt32ToSint64Map(3, 3234567890123456789L);
-    builder.putInt32ToFixed32Map(4, 40);
-    builder.putInt32ToFixed64Map(4, 4234567890123456789L);
-    builder.putInt32ToSfixed32Map(5, 50);
-    builder.putInt32ToSfixed64Map(5, 5234567890123456789L);
-    builder.putInt32ToFloatMap(6, 1.5f);
-    builder.putInt32ToDoubleMap(6, 1.25);
-    builder.putInt32ToBoolMap(7, false);
-    builder.putInt32ToStringMap(7, "World");
-    builder.putInt32ToBytesMap(8, ByteString.copyFrom(new byte[] {1, 2, 3}));
-    builder.putInt32ToMessageMap(8, NestedMessage.newBuilder().setValue(1234).build());
-    builder.putInt32ToEnumMap(9, NestedEnum.BAR);
-    TestMap message = builder.build();
-
-    assertThat(toJsonString(message))
-        .isEqualTo(
-            "{\n"
-                + "  \"int32ToInt32Map\": {\n"
-                + "    \"1\": 10\n"
-                + "  },\n"
-                + "  \"int64ToInt32Map\": {\n"
-                + "    \"1234567890123456789\": 10\n"
-                + "  },\n"
-                + "  \"uint32ToInt32Map\": {\n"
-                + "    \"2\": 20\n"
-                + "  },\n"
-                + "  \"uint64ToInt32Map\": {\n"
-                + "    \"2234567890123456789\": 20\n"
-                + "  },\n"
-                + "  \"sint32ToInt32Map\": {\n"
-                + "    \"3\": 30\n"
-                + "  },\n"
-                + "  \"sint64ToInt32Map\": {\n"
-                + "    \"3234567890123456789\": 30\n"
-                + "  },\n"
-                + "  \"fixed32ToInt32Map\": {\n"
-                + "    \"4\": 40\n"
-                + "  },\n"
-                + "  \"fixed64ToInt32Map\": {\n"
-                + "    \"4234567890123456789\": 40\n"
-                + "  },\n"
-                + "  \"sfixed32ToInt32Map\": {\n"
-                + "    \"5\": 50\n"
-                + "  },\n"
-                + "  \"sfixed64ToInt32Map\": {\n"
-                + "    \"5234567890123456789\": 50\n"
-                + "  },\n"
-                + "  \"boolToInt32Map\": {\n"
-                + "    \"false\": 6\n"
-                + "  },\n"
-                + "  \"stringToInt32Map\": {\n"
-                + "    \"Hello\": 10\n"
-                + "  },\n"
-                + "  \"int32ToInt64Map\": {\n"
-                + "    \"1\": \"1234567890123456789\"\n"
-                + "  },\n"
-                + "  \"int32ToUint32Map\": {\n"
-                + "    \"2\": 20\n"
-                + "  },\n"
-                + "  \"int32ToUint64Map\": {\n"
-                + "    \"2\": \"2234567890123456789\"\n"
-                + "  },\n"
-                + "  \"int32ToSint32Map\": {\n"
-                + "    \"3\": 30\n"
-                + "  },\n"
-                + "  \"int32ToSint64Map\": {\n"
-                + "    \"3\": \"3234567890123456789\"\n"
-                + "  },\n"
-                + "  \"int32ToFixed32Map\": {\n"
-                + "    \"4\": 40\n"
-                + "  },\n"
-                + "  \"int32ToFixed64Map\": {\n"
-                + "    \"4\": \"4234567890123456789\"\n"
-                + "  },\n"
-                + "  \"int32ToSfixed32Map\": {\n"
-                + "    \"5\": 50\n"
-                + "  },\n"
-                + "  \"int32ToSfixed64Map\": {\n"
-                + "    \"5\": \"5234567890123456789\"\n"
-                + "  },\n"
-                + "  \"int32ToFloatMap\": {\n"
-                + "    \"6\": 1.5\n"
-                + "  },\n"
-                + "  \"int32ToDoubleMap\": {\n"
-                + "    \"6\": 1.25\n"
-                + "  },\n"
-                + "  \"int32ToBoolMap\": {\n"
-                + "    \"7\": false\n"
-                + "  },\n"
-                + "  \"int32ToStringMap\": {\n"
-                + "    \"7\": \"World\"\n"
-                + "  },\n"
-                + "  \"int32ToBytesMap\": {\n"
-                + "    \"8\": \"AQID\"\n"
-                + "  },\n"
-                + "  \"int32ToMessageMap\": {\n"
-                + "    \"8\": {\n"
-                + "      \"value\": 1234\n"
-                + "    }\n"
-                + "  },\n"
-                + "  \"int32ToEnumMap\": {\n"
-                + "    \"9\": \"BAR\"\n"
-                + "  }\n"
-                + "}");
-    assertRoundTripEquals(message);
-
-    // Test multiple entries.
-    builder = TestMap.newBuilder();
-    builder.putInt32ToInt32Map(1, 2);
-    builder.putInt32ToInt32Map(3, 4);
-    message = builder.build();
-
-    assertThat(toJsonString(message))
-        .isEqualTo(
-            "{\n"
-                + "  \"int32ToInt32Map\": {\n"
-                + "    \"1\": 2,\n"
-                + "    \"3\": 4\n"
-                + "  }\n"
-                + "}");
-    assertRoundTripEquals(message);
-  }
-
-  @Test
-  public void testMapNullValueIsRejected() throws Exception {
-    try {
-      TestMap.Builder builder = TestMap.newBuilder();
-      mergeFromJson(
-          "{\n"
-              + "  \"int32ToInt32Map\": {null: 1},\n"
-              + "  \"int32ToMessageMap\": {null: 2}\n"
-              + "}",
-          builder);
-      assertWithMessage("expected exception").fail();
-    } catch (InvalidProtocolBufferException e) {
-      // Exception expected.
-    }
-
-    try {
-      TestMap.Builder builder = TestMap.newBuilder();
-      mergeFromJson(
-          "{\n"
-              + "  \"int32ToInt32Map\": {\"1\": null},\n"
-              + "  \"int32ToMessageMap\": {\"2\": null}\n"
-              + "}",
-          builder);
-      assertWithMessage("expected exception").fail();
-
-    } catch (InvalidProtocolBufferException e) {
-      // Exception expected.
-    }
-  }
-
-  @Test
-  public void testMapEnumNullValueIsIgnored() throws Exception {
-    TestMap.Builder builder = TestMap.newBuilder();
-    mergeFromJsonIgnoringUnknownFields(
-        "{\n" + "  \"int32ToEnumMap\": {\"1\": null}\n" + "}", builder);
-    TestMap map = builder.build();
-    assertThat(map.getInt32ToEnumMapMap()).isEmpty();
-  }
-
-  @Test
-  // https://github.com/protocolbuffers/protobuf/issues/7456
-  public void testArrayTypeMismatch() throws IOException {
-    TestAllTypes.Builder builder = TestAllTypes.newBuilder();
-    try {
-      mergeFromJson(
-          "{\n"
-              + "  \"repeated_int32\": 5\n"
-              + "}",
-          builder);
-      assertWithMessage("should have thrown exception for incorrect type").fail();
-    } catch (InvalidProtocolBufferException expected) {
-      assertThat(expected).hasMessageThat()
-          .isEqualTo("Expected an array for repeated_int32 but found 5");
-    }
-  }
-
-  @Test
-  public void testParserAcceptNonQuotedObjectKey() throws Exception {
-    TestMap.Builder builder = TestMap.newBuilder();
-    mergeFromJson(
-        "{\n" + "  int32ToInt32Map: {1: 2},\n" + "  stringToInt32Map: {hello: 3}\n" + "}", builder);
-    TestMap message = builder.build();
-    assertThat(message.getInt32ToInt32MapMap().get(1).intValue()).isEqualTo(2);
-    assertThat(message.getStringToInt32MapMap().get("hello").intValue()).isEqualTo(3);
-  }
-
-  @Test
-  public void testWrappers() throws Exception {
-    TestWrappers.Builder builder = TestWrappers.newBuilder();
-    builder.getBoolValueBuilder().setValue(false);
-    builder.getInt32ValueBuilder().setValue(0);
-    builder.getInt64ValueBuilder().setValue(0);
-    builder.getUint32ValueBuilder().setValue(0);
-    builder.getUint64ValueBuilder().setValue(0);
-    builder.getFloatValueBuilder().setValue(0.0f);
-    builder.getDoubleValueBuilder().setValue(0.0);
-    builder.getStringValueBuilder().setValue("");
-    builder.getBytesValueBuilder().setValue(ByteString.EMPTY);
-    TestWrappers message = builder.build();
-
-    assertThat(toJsonString(message))
-        .isEqualTo(
-            "{\n"
-                + "  \"int32Value\": 0,\n"
-                + "  \"uint32Value\": 0,\n"
-                + "  \"int64Value\": \"0\",\n"
-                + "  \"uint64Value\": \"0\",\n"
-                + "  \"floatValue\": 0.0,\n"
-                + "  \"doubleValue\": 0.0,\n"
-                + "  \"boolValue\": false,\n"
-                + "  \"stringValue\": \"\",\n"
-                + "  \"bytesValue\": \"\"\n"
-                + "}");
-    assertRoundTripEquals(message);
-
-    builder = TestWrappers.newBuilder();
-    builder.getBoolValueBuilder().setValue(true);
-    builder.getInt32ValueBuilder().setValue(1);
-    builder.getInt64ValueBuilder().setValue(2);
-    builder.getUint32ValueBuilder().setValue(3);
-    builder.getUint64ValueBuilder().setValue(4);
-    builder.getFloatValueBuilder().setValue(5.0f);
-    builder.getDoubleValueBuilder().setValue(6.0);
-    builder.getStringValueBuilder().setValue("7");
-    builder.getBytesValueBuilder().setValue(ByteString.copyFrom(new byte[] {8}));
-    message = builder.build();
-
-    assertThat(toJsonString(message))
-        .isEqualTo(
-            "{\n"
-                + "  \"int32Value\": 1,\n"
-                + "  \"uint32Value\": 3,\n"
-                + "  \"int64Value\": \"2\",\n"
-                + "  \"uint64Value\": \"4\",\n"
-                + "  \"floatValue\": 5.0,\n"
-                + "  \"doubleValue\": 6.0,\n"
-                + "  \"boolValue\": true,\n"
-                + "  \"stringValue\": \"7\",\n"
-                + "  \"bytesValue\": \"CA==\"\n"
-                + "}");
-    assertRoundTripEquals(message);
-  }
-
-  @Test
-  public void testTimestamp() throws Exception {
-    TestTimestamp message =
-        TestTimestamp.newBuilder()
-            .setTimestampValue(Timestamps.parse("1970-01-01T00:00:00Z"))
-            .build();
-
-    assertThat(toJsonString(message))
-        .isEqualTo("{\n" + "  \"timestampValue\": \"1970-01-01T00:00:00Z\"\n" + "}");
-    assertRoundTripEquals(message);
-  }
-
-  @Test
-  public void testTimestampMergeError() throws Exception {
-    final String incorrectTimestampString = "{\"seconds\":1800,\"nanos\":0}";
-    try {
-      TestTimestamp.Builder builder = TestTimestamp.newBuilder();
-      mergeFromJson(String.format("{\"timestamp_value\": %s}", incorrectTimestampString), builder);
-      assertWithMessage("expected exception").fail();
-    } catch (InvalidProtocolBufferException e) {
-      // Exception expected.
-      assertThat(e)
-          .hasMessageThat()
-          .isEqualTo("Failed to parse timestamp: " + incorrectTimestampString);
-      assertThat(e).hasCauseThat().isNotNull();
-    }
-  }
-
-  @Test
-  public void testDuration() throws Exception {
-    TestDuration message =
-        TestDuration.newBuilder().setDurationValue(Durations.parse("12345s")).build();
-
-    assertThat(toJsonString(message)).isEqualTo("{\n" + "  \"durationValue\": \"12345s\"\n" + "}");
-    assertRoundTripEquals(message);
-  }
-
-  @Test
-  public void testDurationMergeError() throws Exception {
-    final String incorrectDurationString = "{\"seconds\":10,\"nanos\":500}";
-    try {
-      TestDuration.Builder builder = TestDuration.newBuilder();
-      mergeFromJson(String.format("{\"duration_value\": %s}", incorrectDurationString), builder);
-      assertWithMessage("expected exception").fail();
-    } catch (InvalidProtocolBufferException e) {
-      // Exception expected.
-      assertThat(e)
-          .hasMessageThat()
-          .isEqualTo("Failed to parse duration: " + incorrectDurationString);
-      assertThat(e).hasCauseThat().isNotNull();
-    }
-  }
-
-  @Test
-  public void testFieldMask() throws Exception {
-    TestFieldMask message =
-        TestFieldMask.newBuilder()
-            .setFieldMaskValue(FieldMaskUtil.fromString("foo.bar,baz,foo_bar.baz"))
-            .build();
-
-    assertThat(toJsonString(message))
-        .isEqualTo("{\n" + "  \"fieldMaskValue\": \"foo.bar,baz,fooBar.baz\"\n" + "}");
-    assertRoundTripEquals(message);
-  }
-
-  @Test
-  public void testStruct() throws Exception {
-    // Build a struct with all possible values.
-    TestStruct.Builder builder = TestStruct.newBuilder();
-    Struct.Builder structBuilder = builder.getStructValueBuilder();
-    structBuilder.putFields("null_value", Value.newBuilder().setNullValueValue(0).build());
-    structBuilder.putFields("number_value", Value.newBuilder().setNumberValue(1.25).build());
-    structBuilder.putFields("string_value", Value.newBuilder().setStringValue("hello").build());
-    Struct.Builder subStructBuilder = Struct.newBuilder();
-    subStructBuilder.putFields("number_value", Value.newBuilder().setNumberValue(1234).build());
-    structBuilder.putFields(
-        "struct_value", Value.newBuilder().setStructValue(subStructBuilder.build()).build());
-    ListValue.Builder listBuilder = ListValue.newBuilder();
-    listBuilder.addValues(Value.newBuilder().setNumberValue(1.125).build());
-    listBuilder.addValues(Value.newBuilder().setNullValueValue(0).build());
-    structBuilder.putFields(
-        "list_value", Value.newBuilder().setListValue(listBuilder.build()).build());
-    TestStruct message = builder.build();
-
-    assertThat(toJsonString(message))
-        .isEqualTo(
-            "{\n"
-                + "  \"structValue\": {\n"
-                + "    \"null_value\": null,\n"
-                + "    \"number_value\": 1.25,\n"
-                + "    \"string_value\": \"hello\",\n"
-                + "    \"struct_value\": {\n"
-                + "      \"number_value\": 1234.0\n"
-                + "    },\n"
-                + "    \"list_value\": [1.125, null]\n"
-                + "  }\n"
-                + "}");
-    assertRoundTripEquals(message);
-
-    builder = TestStruct.newBuilder();
-    builder.setValue(Value.newBuilder().setNullValueValue(0).build());
-    message = builder.build();
-    assertThat(toJsonString(message)).isEqualTo("{\n" + "  \"value\": null\n" + "}");
-    assertRoundTripEquals(message);
-
-    builder = TestStruct.newBuilder();
-    listBuilder = builder.getListValueBuilder();
-    listBuilder.addValues(Value.newBuilder().setNumberValue(31831.125).build());
-    listBuilder.addValues(Value.newBuilder().setNullValueValue(0).build());
-    message = builder.build();
-    assertThat(toJsonString(message))
-        .isEqualTo("{\n" + "  \"listValue\": [31831.125, null]\n" + "}");
-    assertRoundTripEquals(message);
-  }
-
-
-  @Test
-  public void testAnyFieldsWithCustomAddedTypeRegistry() throws Exception {
-    TestAllTypes content = TestAllTypes.newBuilder().setOptionalInt32(1234).build();
-    TestAny message = TestAny.newBuilder().setAnyValue(Any.pack(content)).build();
-
-    com.google.protobuf.TypeRegistry registry =
-        com.google.protobuf.TypeRegistry.newBuilder().add(content.getDescriptorForType()).build();
-    JsonFormat.Printer printer = JsonFormat.printer().usingTypeRegistry(registry);
-
-    assertThat(printer.print(message))
-        .isEqualTo(
-            "{\n"
-                + "  \"anyValue\": {\n"
-                + "    \"@type\": \"type.googleapis.com/json_test.TestAllTypes\",\n"
-                + "    \"optionalInt32\": 1234\n"
-                + "  }\n"
-                + "}");
-    assertRoundTripEquals(message, registry);
-
-    TestAny messageWithDefaultAnyValue =
-        TestAny.newBuilder().setAnyValue(Any.getDefaultInstance()).build();
-    assertThat(printer.print(messageWithDefaultAnyValue))
-        .isEqualTo("{\n" + "  \"anyValue\": {}\n" + "}");
-    assertRoundTripEquals(messageWithDefaultAnyValue, registry);
-
-    // Well-known types have a special formatting when embedded in Any.
-    //
-    // 1. Any in Any.
-    Any anyMessage = Any.pack(Any.pack(content));
-    assertThat(printer.print(anyMessage))
-        .isEqualTo(
-            "{\n"
-                + "  \"@type\": \"type.googleapis.com/google.protobuf.Any\",\n"
-                + "  \"value\": {\n"
-                + "    \"@type\": \"type.googleapis.com/json_test.TestAllTypes\",\n"
-                + "    \"optionalInt32\": 1234\n"
-                + "  }\n"
-                + "}");
-    assertRoundTripEquals(anyMessage, registry);
-  }
-
-  @Test
-  public void testAnyFields() throws Exception {
-    TestAllTypes content = TestAllTypes.newBuilder().setOptionalInt32(1234).build();
-    TestAny message = TestAny.newBuilder().setAnyValue(Any.pack(content)).build();
-
-    // A TypeRegistry must be provided in order to convert Any types.
-    try {
-      toJsonString(message);
-      assertWithMessage("Exception is expected.").fail();
-    } catch (InvalidProtocolBufferException expected) {
-      assertThat(expected).hasMessageThat().isEqualTo(
-          "Cannot find type for url: type.googleapis.com/json_test.TestAllTypes");
-    }
-
-    JsonFormat.TypeRegistry registry =
-        JsonFormat.TypeRegistry.newBuilder().add(TestAllTypes.getDescriptor()).build();
-    JsonFormat.Printer printer = JsonFormat.printer().usingTypeRegistry(registry);
-
-    assertThat(printer.print(message))
-        .isEqualTo(
-            "{\n"
-                + "  \"anyValue\": {\n"
-                + "    \"@type\": \"type.googleapis.com/json_test.TestAllTypes\",\n"
-                + "    \"optionalInt32\": 1234\n"
-                + "  }\n"
-                + "}");
-    assertRoundTripEquals(message, registry);
-
-    TestAny messageWithDefaultAnyValue =
-        TestAny.newBuilder().setAnyValue(Any.getDefaultInstance()).build();
-    assertThat(printer.print(messageWithDefaultAnyValue))
-        .isEqualTo("{\n" + "  \"anyValue\": {}\n" + "}");
-    assertRoundTripEquals(messageWithDefaultAnyValue, registry);
-
-    // Well-known types have a special formatting when embedded in Any.
-    //
-    // 1. Any in Any.
-    Any anyMessage = Any.pack(Any.pack(content));
-    assertThat(printer.print(anyMessage))
-        .isEqualTo(
-            "{\n"
-                + "  \"@type\": \"type.googleapis.com/google.protobuf.Any\",\n"
-                + "  \"value\": {\n"
-                + "    \"@type\": \"type.googleapis.com/json_test.TestAllTypes\",\n"
-                + "    \"optionalInt32\": 1234\n"
-                + "  }\n"
-                + "}");
-    assertRoundTripEquals(anyMessage, registry);
-
-    // 2. Wrappers in Any.
-    anyMessage = Any.pack(Int32Value.of(12345));
-    assertThat(printer.print(anyMessage))
-        .isEqualTo(
-            "{\n"
-                + "  \"@type\": \"type.googleapis.com/google.protobuf.Int32Value\",\n"
-                + "  \"value\": 12345\n"
-                + "}");
-    assertRoundTripEquals(anyMessage, registry);
-    anyMessage = Any.pack(UInt32Value.of(12345));
-    assertThat(printer.print(anyMessage))
-        .isEqualTo(
-            "{\n"
-                + "  \"@type\": \"type.googleapis.com/google.protobuf.UInt32Value\",\n"
-                + "  \"value\": 12345\n"
-                + "}");
-    assertRoundTripEquals(anyMessage, registry);
-    anyMessage = Any.pack(Int64Value.of(12345));
-    assertThat(printer.print(anyMessage))
-        .isEqualTo(
-            "{\n"
-                + "  \"@type\": \"type.googleapis.com/google.protobuf.Int64Value\",\n"
-                + "  \"value\": \"12345\"\n"
-                + "}");
-    assertRoundTripEquals(anyMessage, registry);
-    anyMessage = Any.pack(UInt64Value.of(12345));
-    assertThat(printer.print(anyMessage))
-        .isEqualTo(
-            "{\n"
-                + "  \"@type\": \"type.googleapis.com/google.protobuf.UInt64Value\",\n"
-                + "  \"value\": \"12345\"\n"
-                + "}");
-    assertRoundTripEquals(anyMessage, registry);
-    anyMessage = Any.pack(FloatValue.of(12345));
-    assertThat(printer.print(anyMessage))
-        .isEqualTo(
-            "{\n"
-                + "  \"@type\": \"type.googleapis.com/google.protobuf.FloatValue\",\n"
-                + "  \"value\": 12345.0\n"
-                + "}");
-    assertRoundTripEquals(anyMessage, registry);
-    anyMessage = Any.pack(DoubleValue.of(12345));
-    assertThat(printer.print(anyMessage))
-        .isEqualTo(
-            "{\n"
-                + "  \"@type\": \"type.googleapis.com/google.protobuf.DoubleValue\",\n"
-                + "  \"value\": 12345.0\n"
-                + "}");
-    assertRoundTripEquals(anyMessage, registry);
-    anyMessage = Any.pack(BoolValue.of(true));
-    assertThat(printer.print(anyMessage))
-        .isEqualTo(
-            "{\n"
-                + "  \"@type\": \"type.googleapis.com/google.protobuf.BoolValue\",\n"
-                + "  \"value\": true\n"
-                + "}");
-    assertRoundTripEquals(anyMessage, registry);
-    anyMessage = Any.pack(StringValue.of("Hello"));
-    assertThat(printer.print(anyMessage))
-        .isEqualTo(
-            "{\n"
-                + "  \"@type\": \"type.googleapis.com/google.protobuf.StringValue\",\n"
-                + "  \"value\": \"Hello\"\n"
-                + "}");
-    assertRoundTripEquals(anyMessage, registry);
-    anyMessage = Any.pack(BytesValue.of(ByteString.copyFrom(new byte[] {1, 2})));
-    assertThat(printer.print(anyMessage))
-        .isEqualTo(
-            "{\n"
-                + "  \"@type\": \"type.googleapis.com/google.protobuf.BytesValue\",\n"
-                + "  \"value\": \"AQI=\"\n"
-                + "}");
-    assertRoundTripEquals(anyMessage, registry);
-
-    // 3. Timestamp in Any.
-    anyMessage = Any.pack(Timestamps.parse("1969-12-31T23:59:59Z"));
-    assertThat(printer.print(anyMessage))
-        .isEqualTo(
-            "{\n"
-                + "  \"@type\": \"type.googleapis.com/google.protobuf.Timestamp\",\n"
-                + "  \"value\": \"1969-12-31T23:59:59Z\"\n"
-                + "}");
-    assertRoundTripEquals(anyMessage, registry);
-
-    // 4. Duration in Any
-    anyMessage = Any.pack(Durations.parse("12345.10s"));
-    assertThat(printer.print(anyMessage))
-        .isEqualTo(
-            "{\n"
-                + "  \"@type\": \"type.googleapis.com/google.protobuf.Duration\",\n"
-                + "  \"value\": \"12345.100s\"\n"
-                + "}");
-    assertRoundTripEquals(anyMessage, registry);
-
-    // 5. FieldMask in Any
-    anyMessage = Any.pack(FieldMaskUtil.fromString("foo.bar,baz"));
-    assertThat(printer.print(anyMessage))
-        .isEqualTo(
-            "{\n"
-                + "  \"@type\": \"type.googleapis.com/google.protobuf.FieldMask\",\n"
-                + "  \"value\": \"foo.bar,baz\"\n"
-                + "}");
-    assertRoundTripEquals(anyMessage, registry);
-
-    // 6. Struct in Any
-    Struct.Builder structBuilder = Struct.newBuilder();
-    structBuilder.putFields("number", Value.newBuilder().setNumberValue(1.125).build());
-    anyMessage = Any.pack(structBuilder.build());
-    assertThat(printer.print(anyMessage))
-        .isEqualTo(
-            "{\n"
-                + "  \"@type\": \"type.googleapis.com/google.protobuf.Struct\",\n"
-                + "  \"value\": {\n"
-                + "    \"number\": 1.125\n"
-                + "  }\n"
-                + "}");
-    assertRoundTripEquals(anyMessage, registry);
-
-    // 7. Value (number type) in Any
-    Value.Builder valueBuilder = Value.newBuilder();
-    valueBuilder.setNumberValue(1);
-    anyMessage = Any.pack(valueBuilder.build());
-    assertThat(printer.print(anyMessage))
-        .isEqualTo(
-            "{\n"
-                + "  \"@type\": \"type.googleapis.com/google.protobuf.Value\",\n"
-                + "  \"value\": 1.0\n"
-                + "}");
-    assertRoundTripEquals(anyMessage, registry);
-
-    // 8. Value (null type) in Any
-    anyMessage = Any.pack(Value.newBuilder().setNullValue(NullValue.NULL_VALUE).build());
-    assertThat(printer.print(anyMessage))
-        .isEqualTo(
-            "{\n"
-                + "  \"@type\": \"type.googleapis.com/google.protobuf.Value\",\n"
-                + "  \"value\": null\n"
-                + "}");
-    assertRoundTripEquals(anyMessage, registry);
-  }
-
-  @Test
-  public void testAnyInMaps() throws Exception {
-    JsonFormat.TypeRegistry registry =
-        JsonFormat.TypeRegistry.newBuilder().add(TestAllTypes.getDescriptor()).build();
-    JsonFormat.Printer printer = JsonFormat.printer().usingTypeRegistry(registry);
-
-    TestAny.Builder testAny = TestAny.newBuilder();
-    testAny.putAnyMap("int32_wrapper", Any.pack(Int32Value.of(123)));
-    testAny.putAnyMap("int64_wrapper", Any.pack(Int64Value.of(456)));
-    testAny.putAnyMap("timestamp", Any.pack(Timestamps.parse("1969-12-31T23:59:59Z")));
-    testAny.putAnyMap("duration", Any.pack(Durations.parse("12345.1s")));
-    testAny.putAnyMap("field_mask", Any.pack(FieldMaskUtil.fromString("foo.bar,baz")));
-    Value numberValue = Value.newBuilder().setNumberValue(1.125).build();
-    Struct.Builder struct = Struct.newBuilder();
-    struct.putFields("number", numberValue);
-    testAny.putAnyMap("struct", Any.pack(struct.build()));
-    Value nullValue = Value.newBuilder().setNullValue(NullValue.NULL_VALUE).build();
-    testAny.putAnyMap(
-        "list_value",
-        Any.pack(ListValue.newBuilder().addValues(numberValue).addValues(nullValue).build()));
-    testAny.putAnyMap("number_value", Any.pack(numberValue));
-    testAny.putAnyMap("any_value_number", Any.pack(Any.pack(numberValue)));
-    testAny.putAnyMap("any_value_default", Any.pack(Any.getDefaultInstance()));
-    testAny.putAnyMap("default", Any.getDefaultInstance());
-
-    assertThat(printer.print(testAny.build()))
-        .isEqualTo(
-            "{\n"
-                + "  \"anyMap\": {\n"
-                + "    \"int32_wrapper\": {\n"
-                + "      \"@type\": \"type.googleapis.com/google.protobuf.Int32Value\",\n"
-                + "      \"value\": 123\n"
-                + "    },\n"
-                + "    \"int64_wrapper\": {\n"
-                + "      \"@type\": \"type.googleapis.com/google.protobuf.Int64Value\",\n"
-                + "      \"value\": \"456\"\n"
-                + "    },\n"
-                + "    \"timestamp\": {\n"
-                + "      \"@type\": \"type.googleapis.com/google.protobuf.Timestamp\",\n"
-                + "      \"value\": \"1969-12-31T23:59:59Z\"\n"
-                + "    },\n"
-                + "    \"duration\": {\n"
-                + "      \"@type\": \"type.googleapis.com/google.protobuf.Duration\",\n"
-                + "      \"value\": \"12345.100s\"\n"
-                + "    },\n"
-                + "    \"field_mask\": {\n"
-                + "      \"@type\": \"type.googleapis.com/google.protobuf.FieldMask\",\n"
-                + "      \"value\": \"foo.bar,baz\"\n"
-                + "    },\n"
-                + "    \"struct\": {\n"
-                + "      \"@type\": \"type.googleapis.com/google.protobuf.Struct\",\n"
-                + "      \"value\": {\n"
-                + "        \"number\": 1.125\n"
-                + "      }\n"
-                + "    },\n"
-                + "    \"list_value\": {\n"
-                + "      \"@type\": \"type.googleapis.com/google.protobuf.ListValue\",\n"
-                + "      \"value\": [1.125, null]\n"
-                + "    },\n"
-                + "    \"number_value\": {\n"
-                + "      \"@type\": \"type.googleapis.com/google.protobuf.Value\",\n"
-                + "      \"value\": 1.125\n"
-                + "    },\n"
-                + "    \"any_value_number\": {\n"
-                + "      \"@type\": \"type.googleapis.com/google.protobuf.Any\",\n"
-                + "      \"value\": {\n"
-                + "        \"@type\": \"type.googleapis.com/google.protobuf.Value\",\n"
-                + "        \"value\": 1.125\n"
-                + "      }\n"
-                + "    },\n"
-                + "    \"any_value_default\": {\n"
-                + "      \"@type\": \"type.googleapis.com/google.protobuf.Any\",\n"
-                + "      \"value\": {}\n"
-                + "    },\n"
-                + "    \"default\": {}\n"
-                + "  }\n"
-                + "}");
-    assertRoundTripEquals(testAny.build(), registry);
-  }
-
-  @Test
-  public void testParserMissingTypeUrl() throws Exception {
-    try {
-      Any.Builder builder = Any.newBuilder();
-      mergeFromJson("{\n" + "  \"optionalInt32\": 1234\n" + "}", builder);
-      assertWithMessage("Exception is expected.").fail();
-    } catch (IOException e) {
-      // Expected.
-    }
-  }
-
-  @Test
-  public void testParserUnexpectedTypeUrl() throws Exception {
-    try {
-      Any.Builder builder = Any.newBuilder();
-      mergeFromJson(
-          "{\n"
-              + "  \"@type\": \"type.googleapis.com/json_test.UnexpectedTypes\",\n"
-              + "  \"optionalInt32\": 12345\n"
-              + "}",
-          builder);
-      assertWithMessage("Exception is expected.").fail();
-    } catch (IOException e) {
-      // Expected.
-    }
-  }
-
-  @Test
-  public void testParserRejectTrailingComma() throws Exception {
-    try {
-      TestAllTypes.Builder builder = TestAllTypes.newBuilder();
-      mergeFromJson("{\n" + "  \"optionalInt32\": 12345,\n" + "}", builder);
-      assertWithMessage("Exception is expected.").fail();
-    } catch (IOException e) {
-      // Expected.
-    }
-
-    try {
-      TestAllTypes.Builder builder = TestAllTypes.newBuilder();
-      mergeFromJson(
-         "{\n"
-         + "  \"repeatedInt32\": [12345,]\n"
-         + "}", builder);
-      assertWithMessage("IOException expected.").fail();
-     } catch (IOException e) {
-       // Expected.
-     }
-  }
-
-  @Test
-  public void testParserRejectInvalidBase64() throws Exception {
-    TestAllTypes.Builder builder = TestAllTypes.newBuilder();
-    try {
-      mergeFromJson("{\"" + "optionalBytes" + "\":" + "!@#$" + "}", builder);
-      assertWithMessage("Exception is expected.").fail();
-    } catch (InvalidProtocolBufferException expected) {
-      assertThat(expected).hasCauseThat().isNotNull();
-    }
-  }
-
-  @Test
-  public void testParserAcceptBase64Variants() throws Exception {
-    assertAccepts("optionalBytes", "AQI"); // No padding
-    assertAccepts("optionalBytes", "-_w"); // base64Url, no padding
-  }
-
-  @Test
-  public void testParserRejectInvalidEnumValue() throws Exception {
-    try {
-      TestAllTypes.Builder builder = TestAllTypes.newBuilder();
-      mergeFromJson("{\n" + "  \"optionalNestedEnum\": \"XXX\"\n" + "}", builder);
-      assertWithMessage("Exception is expected.").fail();
-    } catch (InvalidProtocolBufferException e) {
-      // Expected.
-    }
-  }
-
-  @Test
-  public void testParserUnknownFields() throws Exception {
-    try {
-      TestAllTypes.Builder builder = TestAllTypes.newBuilder();
-      String json = "{\n" + "  \"unknownField\": \"XXX\"\n" + "}";
-      JsonFormat.parser().merge(json, builder);
-      assertWithMessage("Exception is expected.").fail();
-    } catch (InvalidProtocolBufferException e) {
-      // Expected.
-    }
-  }
-
-  @Test
-  public void testParserIgnoringUnknownFields() throws Exception {
-    TestAllTypes.Builder builder = TestAllTypes.newBuilder();
-    String json = "{\n" + "  \"unknownField\": \"XXX\"\n" + "}";
-    JsonFormat.parser().ignoringUnknownFields().merge(json, builder);
-  }
-
-  @Test
-  public void testParserIgnoringUnknownEnums() throws Exception {
-    TestAllTypes.Builder builder = TestAllTypes.newBuilder();
-    String json = "{\n" + "  \"optionalNestedEnum\": \"XXX\"\n" + "}";
-    JsonFormat.parser().ignoringUnknownFields().merge(json, builder);
-    assertThat(builder.getOptionalNestedEnumValue()).isEqualTo(0);
-  }
-
-  @Test
-  public void testParserSupportAliasEnums() throws Exception {
-    TestAllTypes.Builder builder = TestAllTypes.newBuilder();
-    String json = "{\n" + "  \"optionalAliasedEnum\": \"QUX\"\n" + "}";
-    JsonFormat.parser().merge(json, builder);
-    assertThat(builder.getOptionalAliasedEnum()).isEqualTo(AliasedEnum.ALIAS_BAZ);
-
-    builder = TestAllTypes.newBuilder();
-    json = "{\n" + "  \"optionalAliasedEnum\": \"qux\"\n" + "}";
-    JsonFormat.parser().merge(json, builder);
-    assertThat(builder.getOptionalAliasedEnum()).isEqualTo(AliasedEnum.ALIAS_BAZ);
-
-    builder = TestAllTypes.newBuilder();
-    json = "{\n" + "  \"optionalAliasedEnum\": \"bAz\"\n" + "}";
-    JsonFormat.parser().merge(json, builder);
-    assertThat(builder.getOptionalAliasedEnum()).isEqualTo(AliasedEnum.ALIAS_BAZ);
-  }
-
-  @Test
-  public void testUnknownEnumMap() throws Exception {
-    TestMap.Builder builder = TestMap.newBuilder();
-    JsonFormat.parser()
-        .ignoringUnknownFields()
-        .merge("{\n" + "  \"int32ToEnumMap\": {1: XXX, 2: FOO}" + "}", builder);
-
-    assertThat(builder.getInt32ToEnumMapMap()).containsEntry(2, NestedEnum.FOO);
-    assertThat(builder.getInt32ToEnumMapMap()).hasSize(1);
-  }
-
-  @Test
-  public void testRepeatedUnknownEnum() throws Exception {
-    TestAllTypes.Builder builder = TestAllTypes.newBuilder();
-    JsonFormat.parser()
-        .ignoringUnknownFields()
-        .merge("{\n" + "  \"repeatedNestedEnum\": [XXX, FOO, BAR, BAZ]" + "}", builder);
-
-    assertThat(builder.getRepeatedNestedEnum(0)).isEqualTo(NestedEnum.FOO);
-    assertThat(builder.getRepeatedNestedEnum(1)).isEqualTo(NestedEnum.BAR);
-    assertThat(builder.getRepeatedNestedEnum(2)).isEqualTo(NestedEnum.BAZ);
-    assertThat(builder.getRepeatedNestedEnumList()).hasSize(3);
-  }
-
-  @Test
-  public void testParserIntegerEnumValue() throws Exception {
-    TestAllTypes.Builder actualBuilder = TestAllTypes.newBuilder();
-    mergeFromJson("{\n" + "  \"optionalNestedEnum\": 2\n" + "}", actualBuilder);
-
-    TestAllTypes expected = TestAllTypes.newBuilder().setOptionalNestedEnum(NestedEnum.BAZ).build();
-    assertThat(actualBuilder.build()).isEqualTo(expected);
-  }
-
-  @Test
-  public void testCustomJsonName() throws Exception {
-    TestCustomJsonName message = TestCustomJsonName.newBuilder().setValue(12345).build();
-    assertThat(JsonFormat.printer().print(message))
-        .isEqualTo("{\n" + "  \"@value\": 12345\n" + "}");
-    assertRoundTripEquals(message);
-  }
-
-  // Regression test for b/73832901. Make sure html tags are escaped.
-  @Test
-  public void testHtmlEscape() throws Exception {
-    TestAllTypes message = TestAllTypes.newBuilder().setOptionalString("</script>").build();
-    assertThat(toJsonString(message))
-        .isEqualTo("{\n  \"optionalString\": \"\\u003c/script\\u003e\"\n}");
-
-    TestAllTypes.Builder builder = TestAllTypes.newBuilder();
-    JsonFormat.parser().merge(toJsonString(message), builder);
-    assertThat(builder.getOptionalString()).isEqualTo(message.getOptionalString());
-  }
-
-  @Test
-  public void testIncludingDefaultValueFields() throws Exception {
-    TestAllTypes message = TestAllTypes.getDefaultInstance();
-    assertThat(JsonFormat.printer().print(message)).isEqualTo("{\n}");
-    assertThat(JsonFormat.printer().includingDefaultValueFields().print(message))
-        .isEqualTo(
-            "{\n"
-                + "  \"optionalInt32\": 0,\n"
-                + "  \"optionalInt64\": \"0\",\n"
-                + "  \"optionalUint32\": 0,\n"
-                + "  \"optionalUint64\": \"0\",\n"
-                + "  \"optionalSint32\": 0,\n"
-                + "  \"optionalSint64\": \"0\",\n"
-                + "  \"optionalFixed32\": 0,\n"
-                + "  \"optionalFixed64\": \"0\",\n"
-                + "  \"optionalSfixed32\": 0,\n"
-                + "  \"optionalSfixed64\": \"0\",\n"
-                + "  \"optionalFloat\": 0.0,\n"
-                + "  \"optionalDouble\": 0.0,\n"
-                + "  \"optionalBool\": false,\n"
-                + "  \"optionalString\": \"\",\n"
-                + "  \"optionalBytes\": \"\",\n"
-                + "  \"optionalNestedEnum\": \"FOO\",\n"
-                + "  \"repeatedInt32\": [],\n"
-                + "  \"repeatedInt64\": [],\n"
-                + "  \"repeatedUint32\": [],\n"
-                + "  \"repeatedUint64\": [],\n"
-                + "  \"repeatedSint32\": [],\n"
-                + "  \"repeatedSint64\": [],\n"
-                + "  \"repeatedFixed32\": [],\n"
-                + "  \"repeatedFixed64\": [],\n"
-                + "  \"repeatedSfixed32\": [],\n"
-                + "  \"repeatedSfixed64\": [],\n"
-                + "  \"repeatedFloat\": [],\n"
-                + "  \"repeatedDouble\": [],\n"
-                + "  \"repeatedBool\": [],\n"
-                + "  \"repeatedString\": [],\n"
-                + "  \"repeatedBytes\": [],\n"
-                + "  \"repeatedNestedMessage\": [],\n"
-                + "  \"repeatedNestedEnum\": [],\n"
-                + "  \"optionalAliasedEnum\": \"ALIAS_FOO\"\n"
-                + "}");
-
-    Set<FieldDescriptor> fixedFields = new HashSet<>();
-    for (FieldDescriptor fieldDesc : TestAllTypes.getDescriptor().getFields()) {
-      if (fieldDesc.getName().contains("_fixed")) {
-        fixedFields.add(fieldDesc);
-      }
-    }
-
-    assertThat(JsonFormat.printer().includingDefaultValueFields(fixedFields).print(message))
-        .isEqualTo(
-            "{\n"
-                + "  \"optionalFixed32\": 0,\n"
-                + "  \"optionalFixed64\": \"0\",\n"
-                + "  \"repeatedFixed32\": [],\n"
-                + "  \"repeatedFixed64\": []\n"
-                + "}");
-
-    TestAllTypes messageNonDefaults =
-        message.toBuilder().setOptionalInt64(1234).setOptionalFixed32(3232).build();
-    assertThat(
-            JsonFormat.printer().includingDefaultValueFields(fixedFields).print(messageNonDefaults))
-        .isEqualTo(
-            "{\n"
-                + "  \"optionalInt64\": \"1234\",\n"
-                + "  \"optionalFixed32\": 3232,\n"
-                + "  \"optionalFixed64\": \"0\",\n"
-                + "  \"repeatedFixed32\": [],\n"
-                + "  \"repeatedFixed64\": []\n"
-                + "}");
-
-    try {
-      JsonFormat.printer().includingDefaultValueFields().includingDefaultValueFields();
-      assertWithMessage("IllegalStateException is expected.").fail();
-    } catch (IllegalStateException e) {
-      // Expected.
-      assertWithMessage("Exception message should mention includingDefaultValueFields.")
-          .that(e.getMessage().contains("includingDefaultValueFields"))
-          .isTrue();
-    }
-
-    try {
-      JsonFormat.printer().includingDefaultValueFields().includingDefaultValueFields(fixedFields);
-      assertWithMessage("IllegalStateException is expected.").fail();
-    } catch (IllegalStateException e) {
-      // Expected.
-      assertWithMessage("Exception message should mention includingDefaultValueFields.")
-          .that(e.getMessage().contains("includingDefaultValueFields"))
-          .isTrue();
-    }
-
-    try {
-      JsonFormat.printer().includingDefaultValueFields(fixedFields).includingDefaultValueFields();
-      assertWithMessage("IllegalStateException is expected.").fail();
-    } catch (IllegalStateException e) {
-      // Expected.
-      assertWithMessage("Exception message should mention includingDefaultValueFields.")
-          .that(e.getMessage().contains("includingDefaultValueFields"))
-          .isTrue();
-    }
-
-    try {
-      JsonFormat.printer()
-          .includingDefaultValueFields(fixedFields)
-          .includingDefaultValueFields(fixedFields);
-      assertWithMessage("IllegalStateException is expected.").fail();
-    } catch (IllegalStateException e) {
-      // Expected.
-      assertWithMessage("Exception message should mention includingDefaultValueFields.")
-          .that(e.getMessage().contains("includingDefaultValueFields"))
-          .isTrue();
-    }
-
-    Set<FieldDescriptor> intFields = new HashSet<>();
-    for (FieldDescriptor fieldDesc : TestAllTypes.getDescriptor().getFields()) {
-      if (fieldDesc.getName().contains("_int")) {
-        intFields.add(fieldDesc);
-      }
-    }
-
-    try {
-      JsonFormat.printer()
-          .includingDefaultValueFields(intFields)
-          .includingDefaultValueFields(fixedFields);
-      assertWithMessage("IllegalStateException is expected.").fail();
-    } catch (IllegalStateException e) {
-      // Expected.
-      assertWithMessage("Exception message should mention includingDefaultValueFields.")
-          .that(e.getMessage().contains("includingDefaultValueFields"))
-          .isTrue();
-    }
-
-    try {
-      JsonFormat.printer().includingDefaultValueFields(null);
-      assertWithMessage("IllegalArgumentException is expected.").fail();
-    } catch (IllegalArgumentException e) {
-      // Expected.
-      assertWithMessage("Exception message should mention includingDefaultValueFields.")
-          .that(e.getMessage().contains("includingDefaultValueFields"))
-          .isTrue();
-    }
-
-    try {
-      JsonFormat.printer().includingDefaultValueFields(Collections.<FieldDescriptor>emptySet());
-      assertWithMessage("IllegalArgumentException is expected.").fail();
-    } catch (IllegalArgumentException e) {
-      // Expected.
-      assertWithMessage("Exception message should mention includingDefaultValueFields.")
-          .that(e.getMessage().contains("includingDefaultValueFields"))
-          .isTrue();
-    }
-
-    TestMap mapMessage = TestMap.getDefaultInstance();
-    assertThat(JsonFormat.printer().print(mapMessage)).isEqualTo("{\n}");
-    assertThat(JsonFormat.printer().includingDefaultValueFields().print(mapMessage))
-        .isEqualTo(
-            "{\n"
-                + "  \"int32ToInt32Map\": {\n"
-                + "  },\n"
-                + "  \"int64ToInt32Map\": {\n"
-                + "  },\n"
-                + "  \"uint32ToInt32Map\": {\n"
-                + "  },\n"
-                + "  \"uint64ToInt32Map\": {\n"
-                + "  },\n"
-                + "  \"sint32ToInt32Map\": {\n"
-                + "  },\n"
-                + "  \"sint64ToInt32Map\": {\n"
-                + "  },\n"
-                + "  \"fixed32ToInt32Map\": {\n"
-                + "  },\n"
-                + "  \"fixed64ToInt32Map\": {\n"
-                + "  },\n"
-                + "  \"sfixed32ToInt32Map\": {\n"
-                + "  },\n"
-                + "  \"sfixed64ToInt32Map\": {\n"
-                + "  },\n"
-                + "  \"boolToInt32Map\": {\n"
-                + "  },\n"
-                + "  \"stringToInt32Map\": {\n"
-                + "  },\n"
-                + "  \"int32ToInt64Map\": {\n"
-                + "  },\n"
-                + "  \"int32ToUint32Map\": {\n"
-                + "  },\n"
-                + "  \"int32ToUint64Map\": {\n"
-                + "  },\n"
-                + "  \"int32ToSint32Map\": {\n"
-                + "  },\n"
-                + "  \"int32ToSint64Map\": {\n"
-                + "  },\n"
-                + "  \"int32ToFixed32Map\": {\n"
-                + "  },\n"
-                + "  \"int32ToFixed64Map\": {\n"
-                + "  },\n"
-                + "  \"int32ToSfixed32Map\": {\n"
-                + "  },\n"
-                + "  \"int32ToSfixed64Map\": {\n"
-                + "  },\n"
-                + "  \"int32ToFloatMap\": {\n"
-                + "  },\n"
-                + "  \"int32ToDoubleMap\": {\n"
-                + "  },\n"
-                + "  \"int32ToBoolMap\": {\n"
-                + "  },\n"
-                + "  \"int32ToStringMap\": {\n"
-                + "  },\n"
-                + "  \"int32ToBytesMap\": {\n"
-                + "  },\n"
-                + "  \"int32ToMessageMap\": {\n"
-                + "  },\n"
-                + "  \"int32ToEnumMap\": {\n"
-                + "  }\n"
-                + "}");
-
-    TestOneof oneofMessage = TestOneof.getDefaultInstance();
-    assertThat(JsonFormat.printer().print(oneofMessage)).isEqualTo("{\n}");
-    assertThat(JsonFormat.printer().includingDefaultValueFields().print(oneofMessage))
-        .isEqualTo("{\n}");
-
-    oneofMessage = TestOneof.newBuilder().setOneofInt32(42).build();
-    assertThat(JsonFormat.printer().print(oneofMessage)).isEqualTo("{\n  \"oneofInt32\": 42\n}");
-    assertThat(JsonFormat.printer().includingDefaultValueFields().print(oneofMessage))
-        .isEqualTo("{\n  \"oneofInt32\": 42\n}");
-
-    TestOneof.Builder oneofBuilder = TestOneof.newBuilder();
-    mergeFromJson("{\n" + "  \"oneofNullValue\": null \n" + "}", oneofBuilder);
-    oneofMessage = oneofBuilder.build();
-    assertThat(JsonFormat.printer().print(oneofMessage))
-        .isEqualTo("{\n  \"oneofNullValue\": null\n}");
-    assertThat(JsonFormat.printer().includingDefaultValueFields().print(oneofMessage))
-        .isEqualTo("{\n  \"oneofNullValue\": null\n}");
-  }
-
-  @Test
-  public void testPreservingProtoFieldNames() throws Exception {
-    TestAllTypes message = TestAllTypes.newBuilder().setOptionalInt32(12345).build();
-    assertThat(JsonFormat.printer().print(message))
-        .isEqualTo("{\n" + "  \"optionalInt32\": 12345\n" + "}");
-    assertThat(JsonFormat.printer().preservingProtoFieldNames().print(message))
-        .isEqualTo("{\n" + "  \"optional_int32\": 12345\n" + "}");
-
-    // The json_name field option is ignored when configured to use original proto field names.
-    TestCustomJsonName messageWithCustomJsonName =
-        TestCustomJsonName.newBuilder().setValue(12345).build();
-    assertThat(JsonFormat.printer().preservingProtoFieldNames().print(messageWithCustomJsonName))
-        .isEqualTo("{\n" + "  \"value\": 12345\n" + "}");
-
-    // Parsers accept both original proto field names and lowerCamelCase names.
-    TestAllTypes.Builder builder = TestAllTypes.newBuilder();
-    JsonFormat.parser().merge("{\"optionalInt32\": 12345}", builder);
-    assertThat(builder.getOptionalInt32()).isEqualTo(12345);
-    builder.clear();
-    JsonFormat.parser().merge("{\"optional_int32\": 54321}", builder);
-    assertThat(builder.getOptionalInt32()).isEqualTo(54321);
-  }
-
-  @Test
-  public void testPrintingEnumsAsInts() throws Exception {
-    TestAllTypes message = TestAllTypes.newBuilder().setOptionalNestedEnum(NestedEnum.BAR).build();
-    assertThat(JsonFormat.printer().printingEnumsAsInts().print(message))
-        .isEqualTo("{\n" + "  \"optionalNestedEnum\": 1\n" + "}");
-  }
-
-  @Test
-  public void testOmittingInsignificantWhiteSpace() throws Exception {
-    TestAllTypes message = TestAllTypes.newBuilder().setOptionalInt32(12345).build();
-    assertThat(JsonFormat.printer().omittingInsignificantWhitespace().print(message))
-        .isEqualTo("{" + "\"optionalInt32\":12345" + "}");
-    TestAllTypes message1 = TestAllTypes.getDefaultInstance();
-    assertThat(JsonFormat.printer().omittingInsignificantWhitespace().print(message1))
-        .isEqualTo("{}");
-    TestAllTypes.Builder builder = TestAllTypes.newBuilder();
-    setAllFields(builder);
-    TestAllTypes message2 = builder.build();
-    assertThat(toCompactJsonString(message2))
-        .isEqualTo(
-            "{"
-                + "\"optionalInt32\":1234,"
-                + "\"optionalInt64\":\"1234567890123456789\","
-                + "\"optionalUint32\":5678,"
-                + "\"optionalUint64\":\"2345678901234567890\","
-                + "\"optionalSint32\":9012,"
-                + "\"optionalSint64\":\"3456789012345678901\","
-                + "\"optionalFixed32\":3456,"
-                + "\"optionalFixed64\":\"4567890123456789012\","
-                + "\"optionalSfixed32\":7890,"
-                + "\"optionalSfixed64\":\"5678901234567890123\","
-                + "\"optionalFloat\":1.5,"
-                + "\"optionalDouble\":1.25,"
-                + "\"optionalBool\":true,"
-                + "\"optionalString\":\"Hello world!\","
-                + "\"optionalBytes\":\"AAEC\","
-                + "\"optionalNestedMessage\":{"
-                + "\"value\":100"
-                + "},"
-                + "\"optionalNestedEnum\":\"BAR\","
-                + "\"repeatedInt32\":[1234,234],"
-                + "\"repeatedInt64\":[\"1234567890123456789\",\"234567890123456789\"],"
-                + "\"repeatedUint32\":[5678,678],"
-                + "\"repeatedUint64\":[\"2345678901234567890\",\"345678901234567890\"],"
-                + "\"repeatedSint32\":[9012,10],"
-                + "\"repeatedSint64\":[\"3456789012345678901\",\"456789012345678901\"],"
-                + "\"repeatedFixed32\":[3456,456],"
-                + "\"repeatedFixed64\":[\"4567890123456789012\",\"567890123456789012\"],"
-                + "\"repeatedSfixed32\":[7890,890],"
-                + "\"repeatedSfixed64\":[\"5678901234567890123\",\"678901234567890123\"],"
-                + "\"repeatedFloat\":[1.5,11.5],"
-                + "\"repeatedDouble\":[1.25,11.25],"
-                + "\"repeatedBool\":[true,true],"
-                + "\"repeatedString\":[\"Hello world!\",\"ello world!\"],"
-                + "\"repeatedBytes\":[\"AAEC\",\"AQI=\"],"
-                + "\"repeatedNestedMessage\":[{"
-                + "\"value\":100"
-                + "},{"
-                + "\"value\":200"
-                + "}],"
-                + "\"repeatedNestedEnum\":[\"BAR\",\"BAZ\"]"
-                + "}");
-  }
-
-  // Regression test for b/29892357
-  @Test
-  public void testEmptyWrapperTypesInAny() throws Exception {
-    JsonFormat.TypeRegistry registry =
-        JsonFormat.TypeRegistry.newBuilder().add(TestAllTypes.getDescriptor()).build();
-    JsonFormat.Parser parser = JsonFormat.parser().usingTypeRegistry(registry);
-
-    Any.Builder builder = Any.newBuilder();
-    parser.merge(
-        "{\n"
-            + "  \"@type\": \"type.googleapis.com/google.protobuf.BoolValue\",\n"
-            + "  \"value\": false\n"
-            + "}\n",
-        builder);
-    Any any = builder.build();
-    assertThat(any.getValue().size()).isEqualTo(0);
-  }
-
-  @Test
-  public void testRecursionLimit() throws Exception {
-    String input =
-      "{\n"
-          + "  \"nested\": {\n"
-          + "    \"nested\": {\n"
-          + "      \"nested\": {\n"
-          + "        \"nested\": {\n"
-          + "          \"value\": 1234\n"
-          + "        }\n"
-          + "      }\n"
-          + "    }\n"
-          + "  }\n"
-          + "}\n";
-
-    JsonFormat.Parser parser = JsonFormat.parser();
-    TestRecursive.Builder builder = TestRecursive.newBuilder();
-    parser.merge(input, builder);
-    TestRecursive message = builder.build();
-    assertThat(message.getNested().getNested().getNested().getNested().getValue()).isEqualTo(1234);
-
-    parser = JsonFormat.parser().usingRecursionLimit(3);
-    builder = TestRecursive.newBuilder();
-    try {
-      parser.merge(input, builder);
-      assertWithMessage("Exception is expected.").fail();
-    } catch (InvalidProtocolBufferException e) {
-      // Expected.
-    }
-  }
-
-  // Test that we are not leaking out JSON exceptions.
-  @Test
-  public void testJsonException_forwardsIOException() throws Exception {
-    InputStream throwingInputStream =
-        new InputStream() {
-          @Override
-          public int read() throws IOException {
-            throw new IOException("12345");
-          }
-        };
-    InputStreamReader throwingReader = new InputStreamReader(throwingInputStream);
-    // When the underlying reader throws IOException, JsonFormat should forward
-    // through this IOException.
-    try {
-      TestAllTypes.Builder builder = TestAllTypes.newBuilder();
-      JsonFormat.parser().merge(throwingReader, builder);
-      assertWithMessage("Exception is expected.").fail();
-    } catch (IOException e) {
-      assertThat(e).hasMessageThat().isEqualTo("12345");
-    }
-  }
-
-  @Test
-  public void testJsonException_forwardsJsonException() throws Exception {
-    Reader invalidJsonReader = new StringReader("{ xxx - yyy }");
-    // When the JSON parser throws parser exceptions, JsonFormat should turn
-    // that into InvalidProtocolBufferException.
-    try {
-      TestAllTypes.Builder builder = TestAllTypes.newBuilder();
-      JsonFormat.parser().merge(invalidJsonReader, builder);
-      assertWithMessage("Exception is expected.").fail();
-    } catch (InvalidProtocolBufferException e) {
-      assertThat(e.getCause()).isInstanceOf(JsonSyntaxException.class);
-    }
-  }
-
-  // Test that an error is thrown if a nested JsonObject is parsed as a primitive field.
-  @Test
-  public void testJsonObjectForPrimitiveField() throws Exception {
-    TestAllTypes.Builder builder = TestAllTypes.newBuilder();
-    try {
-      mergeFromJson(
-          "{\n"
-              + "  \"optionalString\": {\n"
-              + "    \"invalidNestedString\": \"Hello world\"\n"
-              + "  }\n"
-              + "}\n",
-          builder);
-    } catch (InvalidProtocolBufferException e) {
-      // Expected.
-    }
-  }
-
-  @Test
-  public void testSortedMapKeys() throws Exception {
-    TestMap.Builder mapBuilder = TestMap.newBuilder();
-    mapBuilder.putStringToInt32Map("\ud834\udd20", 3); // utf-8 F0 9D 84 A0
-    mapBuilder.putStringToInt32Map("foo", 99);
-    mapBuilder.putStringToInt32Map("xxx", 123);
-    mapBuilder.putStringToInt32Map("\u20ac", 1); // utf-8 E2 82 AC
-    mapBuilder.putStringToInt32Map("abc", 20);
-    mapBuilder.putStringToInt32Map("19", 19);
-    mapBuilder.putStringToInt32Map("8", 8);
-    mapBuilder.putStringToInt32Map("\ufb00", 2); // utf-8 EF AC 80
-    mapBuilder.putInt32ToInt32Map(3, 3);
-    mapBuilder.putInt32ToInt32Map(10, 10);
-    mapBuilder.putInt32ToInt32Map(5, 5);
-    mapBuilder.putInt32ToInt32Map(4, 4);
-    mapBuilder.putInt32ToInt32Map(1, 1);
-    mapBuilder.putInt32ToInt32Map(2, 2);
-    mapBuilder.putInt32ToInt32Map(-3, -3);
-    TestMap mapMessage = mapBuilder.build();
-    assertThat(toSortedJsonString(mapMessage))
-        .isEqualTo(
-            "{\n"
-                + "  \"int32ToInt32Map\": {\n"
-                + "    \"-3\": -3,\n"
-                + "    \"1\": 1,\n"
-                + "    \"2\": 2,\n"
-                + "    \"3\": 3,\n"
-                + "    \"4\": 4,\n"
-                + "    \"5\": 5,\n"
-                + "    \"10\": 10\n"
-                + "  },\n"
-                + "  \"stringToInt32Map\": {\n"
-                + "    \"19\": 19,\n"
-                + "    \"8\": 8,\n"
-                + "    \"abc\": 20,\n"
-                + "    \"foo\": 99,\n"
-                + "    \"xxx\": 123,\n"
-                + "    \"\u20ac\": 1,\n"
-                + "    \"\ufb00\": 2,\n"
-                + "    \"\ud834\udd20\": 3\n"
-                + "  }\n"
-                + "}");
-
-    TestMap emptyMap = TestMap.getDefaultInstance();
-    assertThat(toSortedJsonString(emptyMap)).isEqualTo("{\n}");
-  }
-
-  @Test
-  public void testPrintingEnumsAsIntsChainedAfterIncludingDefaultValueFields() throws Exception {
-    TestAllTypes message = TestAllTypes.newBuilder().setOptionalBool(false).build();
-
-    assertThat(
-            JsonFormat.printer()
-                .includingDefaultValueFields(
-                    ImmutableSet.of(
-                        message.getDescriptorForType().findFieldByName("optional_bool")))
-                .printingEnumsAsInts()
-                .print(message))
-        .isEqualTo("{\n" + "  \"optionalBool\": false\n" + "}");
-  }
-
-  @Test
-  public void testPreservesFloatingPointNegative0() throws Exception {
-    TestAllTypes message =
-        TestAllTypes.newBuilder().setOptionalFloat(-0.0f).setOptionalDouble(-0.0).build();
-    assertThat(JsonFormat.printer().print(message))
-        .isEqualTo("{\n  \"optionalFloat\": -0.0,\n  \"optionalDouble\": -0.0\n}");
-  }
-}
diff --git a/libs/protobuf/java/util/src/test/java/com/google/protobuf/util/StructsTest.java b/libs/protobuf/java/util/src/test/java/com/google/protobuf/util/StructsTest.java
deleted file mode 100644
index 9eb4cc6..0000000
--- a/libs/protobuf/java/util/src/test/java/com/google/protobuf/util/StructsTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf.util;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import com.google.protobuf.Struct;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-@RunWith(JUnit4.class)
-public final class StructsTest {
-
-  @Test
-  public void test1pair_constructsObject() throws Exception {
-    Struct.Builder expected = Struct.newBuilder();
-    JsonFormat.parser().merge("{\"k1\": 1}", expected);
-    assertThat(Structs.of("k1", Values.of(1))).isEqualTo(expected.build());
-  }
-
-  @Test
-  public void test2pair_constructsObject() throws Exception {
-    Struct.Builder expected = Struct.newBuilder();
-    JsonFormat.parser().merge("{\"k1\": 1, \"k2\": 2}", expected);
-    assertThat(Structs.of("k1", Values.of(1), "k2", Values.of(2))).isEqualTo(expected.build());
-  }
-
-  @Test
-  public void test3pair_constructsObject() throws Exception {
-    Struct.Builder expected = Struct.newBuilder();
-    JsonFormat.parser().merge("{\"k1\": 1, \"k2\": 2, \"k3\": 3}", expected);
-    assertThat(Structs.of("k1", Values.of(1), "k2", Values.of(2), "k3", Values.of(3)))
-        .isEqualTo(expected.build());
-  }
-
-}
diff --git a/libs/protobuf/java/util/src/test/java/com/google/protobuf/util/TimestampsTest.java b/libs/protobuf/java/util/src/test/java/com/google/protobuf/util/TimestampsTest.java
deleted file mode 100644
index ea90a6b..0000000
--- a/libs/protobuf/java/util/src/test/java/com/google/protobuf/util/TimestampsTest.java
+++ /dev/null
@@ -1,829 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf.util;
-
-import static com.google.common.truth.Truth.assertThat;
-import static com.google.common.truth.Truth.assertWithMessage;
-import static com.google.protobuf.util.DurationsTest.duration;
-
-import com.google.common.collect.Lists;
-import com.google.protobuf.Duration;
-import com.google.protobuf.Timestamp;
-import java.text.ParseException;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Collections;
-import java.util.Date;
-import java.util.List;
-import java.util.TimeZone;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-/** Unit tests for {@link Timestamps}. */
-@RunWith(JUnit4.class)
-public class TimestampsTest {
-  private static final int MILLIS_PER_SECOND = 1000;
-  private static final long MILLIS = 1409130915111L;
-  private static final long SECONDS = MILLIS / MILLIS_PER_SECOND;
-  private static final long MICROS = MILLIS * 1000;
-  private static final long NANOS = MICROS * 1000;
-
-  @SuppressWarnings("ConstantOverflow")
-  private static final long MAX_VALUE = Long.MAX_VALUE * MILLIS_PER_SECOND + MILLIS_PER_SECOND;
-
-  @SuppressWarnings("ConstantOverflow")
-  private static final long MIN_VALUE = Long.MIN_VALUE * MILLIS_PER_SECOND;
-
-  private static final Timestamp TIMESTAMP = timestamp(1409130915, 111000000);
-  private static final Timestamp ZERO_TIMESTAMP = timestamp(0, 0);
-  private static final Timestamp ONE_OF_TIMESTAMP = timestamp(-1, 999000000);
-
-  private static final Timestamp INVALID_MAX =
-      Timestamp.newBuilder().setSeconds(Long.MAX_VALUE).setNanos(Integer.MAX_VALUE).build();
-  private static final Timestamp INVALID_MIN =
-      Timestamp.newBuilder().setSeconds(Long.MIN_VALUE).setNanos(Integer.MIN_VALUE).build();
-
-  @Test
-  public void testMinMaxAreValid() {
-    assertThat(Timestamps.isValid(Timestamps.MAX_VALUE)).isTrue();
-    assertThat(Timestamps.isValid(Timestamps.MIN_VALUE)).isTrue();
-  }
-
-
-  @Test
-  public void testIsValid_false() {
-    assertThat(Timestamps.isValid(0L, -1)).isFalse();
-    assertThat(Timestamps.isValid(1L, -1)).isFalse();
-    assertThat(Timestamps.isValid(1L, (int) Timestamps.NANOS_PER_SECOND)).isFalse();
-    assertThat(Timestamps.isValid(-62135596801L, 0)).isFalse();
-    assertThat(Timestamps.isValid(253402300800L, 0)).isFalse();
-  }
-
-  @Test
-  public void testIsValid_true() {
-    assertThat(Timestamps.isValid(0L, 0)).isTrue();
-    assertThat(Timestamps.isValid(1L, 0)).isTrue();
-    assertThat(Timestamps.isValid(1L, 1)).isTrue();
-    assertThat(Timestamps.isValid(42L, 0)).isTrue();
-    assertThat(Timestamps.isValid(42L, 42)).isTrue();
-    assertThat(Timestamps.isValid(-62135596800L, 0)).isTrue();
-    assertThat(Timestamps.isValid(-62135596800L, 1)).isTrue();
-    assertThat(Timestamps.isValid(62135596799L, 1)).isTrue();
-    assertThat(Timestamps.isValid(253402300799L, 0)).isTrue();
-    assertThat(Timestamps.isValid(253402300798L, 1)).isTrue();
-    assertThat(Timestamps.isValid(253402300798L, (int) (Timestamps.NANOS_PER_SECOND - 1))).isTrue();
-  }
-
-  @Test
-  public void testTimestampStringFormat() throws Exception {
-    Timestamp start = Timestamps.parse("0001-01-01T00:00:00Z");
-    Timestamp end = Timestamps.parse("9999-12-31T23:59:59.999999999Z");
-    assertThat(start.getSeconds()).isEqualTo(Timestamps.TIMESTAMP_SECONDS_MIN);
-    assertThat(start.getNanos()).isEqualTo(0);
-    assertThat(end.getSeconds()).isEqualTo(Timestamps.TIMESTAMP_SECONDS_MAX);
-    assertThat(end.getNanos()).isEqualTo(999999999);
-    assertThat(Timestamps.toString(start)).isEqualTo("0001-01-01T00:00:00Z");
-    assertThat(Timestamps.toString(end)).isEqualTo("9999-12-31T23:59:59.999999999Z");
-
-    Timestamp value = Timestamps.parse("1970-01-01T00:00:00Z");
-    assertThat(value.getSeconds()).isEqualTo(0);
-    assertThat(value.getNanos()).isEqualTo(0);
-    value = Timestamps.parseUnchecked("1970-01-01T00:00:00Z");
-    assertThat(value.getSeconds()).isEqualTo(0);
-    assertThat(value.getNanos()).isEqualTo(0);
-
-    // Test negative timestamps.
-    value = Timestamps.parse("1969-12-31T23:59:59.999Z");
-    assertThat(value.getSeconds()).isEqualTo(-1);
-    // Nano part is in the range of [0, 999999999] for Timestamp.
-    assertThat(value.getNanos()).isEqualTo(999000000);
-    value = Timestamps.parseUnchecked("1969-12-31T23:59:59.999Z");
-    assertThat(value.getSeconds()).isEqualTo(-1);
-    // Nano part is in the range of [0, 999999999] for Timestamp.
-    assertThat(value.getNanos()).isEqualTo(999000000);
-
-    // Test that 3, 6, or 9 digits are used for the fractional part.
-    value = Timestamp.newBuilder().setNanos(10).build();
-    assertThat(Timestamps.toString(value)).isEqualTo("1970-01-01T00:00:00.000000010Z");
-    value = Timestamp.newBuilder().setNanos(10000).build();
-    assertThat(Timestamps.toString(value)).isEqualTo("1970-01-01T00:00:00.000010Z");
-    value = Timestamp.newBuilder().setNanos(10000000).build();
-    assertThat(Timestamps.toString(value)).isEqualTo("1970-01-01T00:00:00.010Z");
-
-    // Test that parsing accepts timezone offsets.
-    value = Timestamps.parse("1970-01-01T00:00:00.010+08:00");
-    assertThat(Timestamps.toString(value)).isEqualTo("1969-12-31T16:00:00.010Z");
-    value = Timestamps.parse("1970-01-01T00:00:00.010-08:00");
-    assertThat(Timestamps.toString(value)).isEqualTo("1970-01-01T08:00:00.010Z");
-    value = Timestamps.parseUnchecked("1970-01-01T00:00:00.010+08:00");
-    assertThat(Timestamps.toString(value)).isEqualTo("1969-12-31T16:00:00.010Z");
-    value = Timestamps.parseUnchecked("1970-01-01T00:00:00.010-08:00");
-    assertThat(Timestamps.toString(value)).isEqualTo("1970-01-01T08:00:00.010Z");
-  }
-
-  private volatile boolean stopParsingThreads = false;
-  private volatile String errorMessage = "";
-
-  private class ParseTimestampThread extends Thread {
-    private final String[] strings;
-    private final Timestamp[] values;
-
-    public ParseTimestampThread(String[] strings, Timestamp[] values) {
-      this.strings = strings;
-      this.values = values;
-    }
-
-    @Override
-    public void run() {
-      int index = 0;
-      while (!stopParsingThreads) {
-        Timestamp result;
-        try {
-          result = Timestamps.parse(strings[index]);
-        } catch (ParseException e) {
-          errorMessage = "Failed to parse timestamp: " + strings[index];
-          break;
-        }
-        if (result.getSeconds() != values[index].getSeconds()
-            || result.getNanos() != values[index].getNanos()) {
-          errorMessage =
-              "Actual result: " + result.toString() + ", expected: " + values[index].toString();
-          break;
-        }
-        index = (index + 1) % strings.length;
-      }
-    }
-  }
-
-  @Test
-  public void testTimestampConcurrentParsing() throws Exception {
-    String[] timestampStrings =
-        new String[] {
-          "0001-01-01T00:00:00Z",
-          "9999-12-31T23:59:59.999999999Z",
-          "1970-01-01T00:00:00Z",
-          "1969-12-31T23:59:59.999Z",
-        };
-    Timestamp[] timestampValues = new Timestamp[timestampStrings.length];
-    for (int i = 0; i < timestampStrings.length; i++) {
-      timestampValues[i] = Timestamps.parse(timestampStrings[i]);
-    }
-
-    final int threadCount = 16;
-    final int runningTime = 5000; // in milliseconds.
-    final List<Thread> threads = new ArrayList<>();
-
-    stopParsingThreads = false;
-    errorMessage = "";
-    for (int i = 0; i < threadCount; i++) {
-      Thread thread = new ParseTimestampThread(timestampStrings, timestampValues);
-      thread.start();
-      threads.add(thread);
-    }
-    Thread.sleep(runningTime);
-    stopParsingThreads = true;
-    for (Thread thread : threads) {
-      thread.join();
-    }
-    assertThat(errorMessage).isEmpty();
-  }
-
-  @Test
-  public void testTimestampInvalidFormatValueTooSmall() throws Exception {
-    try {
-      // Value too small.
-      Timestamp value =
-          Timestamp.newBuilder().setSeconds(Timestamps.TIMESTAMP_SECONDS_MIN - 1).build();
-      Timestamps.toString(value);
-      assertWithMessage("IllegalArgumentException is expected.").fail();
-    } catch (IllegalArgumentException expected) {
-    }
-  }
-
-  @Test
-  public void testTimestampInvalidFormatValueTooLarge() throws Exception {
-    try {
-      // Value too large.
-      Timestamp value =
-          Timestamp.newBuilder().setSeconds(Timestamps.TIMESTAMP_SECONDS_MAX + 1).build();
-      Timestamps.toString(value);
-      assertWithMessage("IllegalArgumentException is expected.").fail();
-    } catch (IllegalArgumentException expected) {
-    }
-  }
-
-  @Test
-  public void testTimestampInvalidFormatNanosTooSmall() throws Exception {
-    try {
-      // Invalid nanos value.
-      Timestamp value = Timestamp.newBuilder().setNanos(-1).build();
-      Timestamps.toString(value);
-      assertWithMessage("IllegalArgumentException is expected.").fail();
-    } catch (IllegalArgumentException expected) {
-    }
-  }
-
-  @Test
-  public void testTimestampInvalidFormatNanosTooLarge() throws Exception {
-    try {
-      // Invalid nanos value.
-      Timestamp value = Timestamp.newBuilder().setNanos(1000000000).build();
-      Timestamps.toString(value);
-      assertWithMessage("IllegalArgumentException is expected.").fail();
-    } catch (IllegalArgumentException expected) {
-    }
-  }
-
-  @Test
-  public void testTimestampInvalidFormatDateTooSmall() {
-    try {
-      Timestamps.parse("0000-01-01T00:00:00Z");
-      Assert.fail();
-    } catch (ParseException expected) {
-      Assert.assertNotNull(expected.getMessage());
-      assertThat(expected).hasCauseThat().isNotNull();
-    }
-    try {
-      Timestamps.parseUnchecked("0000-01-01T00:00:00Z");
-      assertWithMessage("IllegalArgumentException is expected.").fail();
-    } catch (IllegalArgumentException expected) {
-      Assert.assertNotNull(expected.getMessage());
-    }
-  }
-
-  @Test
-  public void testTimestampInvalidFormatDateTooLarge() {
-    try {
-      Timestamps.parse("10000-01-01T00:00:00Z");
-      Assert.fail();
-    } catch (ParseException expected) {
-      Assert.assertNotNull(expected.getMessage());
-    }
-    try {
-      Timestamps.parseUnchecked("10000-01-01T00:00:00Z");
-      assertWithMessage("IllegalArgumentException is expected.").fail();
-    } catch (IllegalArgumentException expected) {
-      Assert.assertNotNull(expected.getMessage());
-    }
-  }
-
-  @Test
-  public void testTimestampInvalidFormatMissingT() {
-    try {
-      Timestamps.parse("1970-01-01 00:00:00Z");
-      Assert.fail();
-    } catch (ParseException expected) {
-      Assert.assertNotNull(expected.getMessage());
-    }
-    try {
-      Timestamps.parseUnchecked("1970-01-01 00:00:00Z");
-      assertWithMessage("IllegalArgumentException is expected.").fail();
-    } catch (IllegalArgumentException expected) {
-      Assert.assertNotNull(expected.getMessage());
-    }
-  }
-
-  @Test
-  public void testTimestampInvalidFormatMissingZ() {
-    try {
-      Timestamps.parse("1970-01-01T00:00:00");
-      assertWithMessage("ParseException is expected.").fail();
-    } catch (ParseException expected) {
-      Assert.assertNotNull(expected.getMessage());
-    }
-    try {
-      Timestamps.parseUnchecked("1970-01-01T00:00:00");
-      assertWithMessage("IllegalArgumentException is expected.").fail();
-    } catch (IllegalArgumentException expected) {
-      Assert.assertNotNull(expected.getMessage());
-    }
-  }
-
-  @Test
-  public void testTimestampInvalidOffset() {
-    try {
-      Timestamps.parse("1970-01-01T00:00:00+0000");
-      assertWithMessage("ParseException is expected.").fail();
-    } catch (ParseException expected) {
-      Assert.assertNotNull(expected.getMessage());
-    }
-    try {
-      Timestamps.parseUnchecked("1970-01-01T00:00:00+0000");
-      assertWithMessage("IllegalArgumentException is expected.").fail();
-    } catch (IllegalArgumentException expected) {
-      Assert.assertNotNull(expected.getMessage());
-    }
-  }
-
-  @Test
-  public void testTimestampInvalidTrailingText() {
-    try {
-      Timestamps.parse("1970-01-01T00:00:00Z0");
-      assertWithMessage("ParseException is expected.").fail();
-    } catch (ParseException expected) {
-      Assert.assertNotNull(expected.getMessage());
-    }
-    try {
-      Timestamps.parseUnchecked("1970-01-01T00:00:00Z0");
-      assertWithMessage("IllegalArgumentException is expected.").fail();
-    } catch (IllegalArgumentException expected) {
-      Assert.assertNotNull(expected.getMessage());
-    }
-  }
-
-  @Test
-  public void testTimestampInvalidNanoSecond() {
-    try {
-      Timestamps.parse("1970-01-01T00:00:00.ABCZ");
-      assertWithMessage("ParseException is expected.").fail();
-    } catch (ParseException expected) {
-      Assert.assertNotNull(expected.getMessage());
-    }
-    try {
-      Timestamps.parseUnchecked("1970-01-01T00:00:00.ABCZ");
-      assertWithMessage("IllegalArgumentException is expected.").fail();
-    } catch (IllegalArgumentException expected) {
-      Assert.assertNotNull(expected.getMessage());
-    }
-  }
-
-  @Test
-  public void testTimestampConversion() throws Exception {
-    Timestamp timestamp = Timestamps.parse("1970-01-01T00:00:01.111111111Z");
-    assertThat(Timestamps.toNanos(timestamp)).isEqualTo(1111111111);
-    assertThat(Timestamps.toMicros(timestamp)).isEqualTo(1111111);
-    assertThat(Timestamps.toMillis(timestamp)).isEqualTo(1111);
-    assertThat(Timestamps.toSeconds(timestamp)).isEqualTo(1);
-    timestamp = Timestamps.fromNanos(1111111111);
-    assertThat(Timestamps.toString(timestamp)).isEqualTo("1970-01-01T00:00:01.111111111Z");
-    timestamp = Timestamps.fromMicros(1111111);
-    assertThat(Timestamps.toString(timestamp)).isEqualTo("1970-01-01T00:00:01.111111Z");
-    timestamp = Timestamps.fromMillis(1111);
-    assertThat(Timestamps.toString(timestamp)).isEqualTo("1970-01-01T00:00:01.111Z");
-    timestamp = Timestamps.fromSeconds(1);
-    assertThat(Timestamps.toString(timestamp)).isEqualTo("1970-01-01T00:00:01Z");
-
-    timestamp = Timestamps.parse("1969-12-31T23:59:59.111111111Z");
-    assertThat(Timestamps.toNanos(timestamp)).isEqualTo(-888888889);
-    assertThat(Timestamps.toMicros(timestamp)).isEqualTo(-888889);
-    assertThat(Timestamps.toMillis(timestamp)).isEqualTo(-889);
-    assertThat(Timestamps.toSeconds(timestamp)).isEqualTo(-1);
-    timestamp = Timestamps.fromNanos(-888888889);
-    assertThat(Timestamps.toString(timestamp)).isEqualTo("1969-12-31T23:59:59.111111111Z");
-    timestamp = Timestamps.fromMicros(-888889);
-    assertThat(Timestamps.toString(timestamp)).isEqualTo("1969-12-31T23:59:59.111111Z");
-    timestamp = Timestamps.fromMillis(-889);
-    assertThat(Timestamps.toString(timestamp)).isEqualTo("1969-12-31T23:59:59.111Z");
-    timestamp = Timestamps.fromSeconds(-1);
-    assertThat(Timestamps.toString(timestamp)).isEqualTo("1969-12-31T23:59:59Z");
-  }
-
-  @Test
-  public void testFromDate() {
-    Date date = new Date(1111);
-    Timestamp timestamp = Timestamps.fromDate(date);
-    assertThat(Timestamps.toString(timestamp)).isEqualTo("1970-01-01T00:00:01.111Z");
-  }
-
-  @Test
-  public void testFromDate_after9999CE() {
-    // protobuf still requires Java 7 so no java.time :-(
-    Calendar calendar = Calendar.getInstance();
-    calendar.clear(); // avoid random number of milliseconds
-    calendar.setTimeZone(TimeZone.getTimeZone("GMT-0"));
-    calendar.set(20000, Calendar.OCTOBER, 20, 5, 4, 3);
-    Date date = calendar.getTime();
-    try {
-      Timestamps.fromDate(date);
-      Assert.fail("should have thrown IllegalArgumentException");
-    } catch (IllegalArgumentException expected) {
-      assertThat(expected).hasMessageThat().startsWith("Timestamp is not valid.");
-    }
-  }
-
-  @Test
-  public void testFromDate_beforeYear1() {
-    // protobuf still requires Java 7 so no java.time :-(
-    Calendar calendar = Calendar.getInstance();
-    calendar.clear(); // avoid random number of milliseconds
-    calendar.setTimeZone(TimeZone.getTimeZone("GMT-0"));
-    calendar.set(-32, Calendar.OCTOBER, 20, 5, 4, 3);
-    Date date = calendar.getTime();
-    try {
-      Timestamps.fromDate(date);
-      Assert.fail("should have thrown IllegalArgumentException");
-    } catch (IllegalArgumentException expected) {
-      assertThat(expected).hasMessageThat().startsWith("Timestamp is not valid.");
-    }
-  }
-
-  @Test
-  public void testFromDate_after2262CE() {
-    // protobuf still requires Java 7 so no java.time :-(
-    Calendar calendar = Calendar.getInstance();
-    calendar.clear(); // avoid random number of milliseconds
-    calendar.setTimeZone(TimeZone.getTimeZone("GMT-0"));
-    calendar.set(2299, Calendar.OCTOBER, 20, 5, 4, 3);
-    Date date = calendar.getTime();
-    Timestamp timestamp = Timestamps.fromDate(date);
-    assertThat(Timestamps.toString(timestamp)).isEqualTo("2299-10-20T05:04:03Z");
-  }
-
-  /* Timestamp only stores integral seconds in the Date parent class and stores the nanosecond
-   * adjustment in the Timestamp class. */
-  @Test
-  public void testFromSqlTimestampSubMillisecondPrecision() {
-    java.sql.Timestamp sqlTimestamp = new java.sql.Timestamp(1111);
-    sqlTimestamp.setNanos(sqlTimestamp.getNanos() + 234567);
-    Timestamp timestamp = Timestamps.fromDate(sqlTimestamp);
-    assertThat(Timestamps.toString(timestamp)).isEqualTo("1970-01-01T00:00:01.111234567Z");
-  }
-
-  @Test
-  public void testFromSqlTimestamp() {
-    Date date = new java.sql.Timestamp(1111);
-    Timestamp timestamp = Timestamps.fromDate(date);
-    assertThat(Timestamps.toString(timestamp)).isEqualTo("1970-01-01T00:00:01.111Z");
-  }
-
-  @Test
-  public void testTimeOperations() throws Exception {
-    Timestamp start = Timestamps.parse("0001-01-01T00:00:00Z");
-    Timestamp end = Timestamps.parse("9999-12-31T23:59:59.999999999Z");
-
-    Duration duration = Timestamps.between(start, end);
-    assertThat(Durations.toString(duration)).isEqualTo("315537897599.999999999s");
-    Timestamp value = Timestamps.add(start, duration);
-    assertThat(value).isEqualTo(end);
-    value = Timestamps.subtract(end, duration);
-    assertThat(value).isEqualTo(start);
-
-    duration = Timestamps.between(end, start);
-    assertThat(Durations.toString(duration)).isEqualTo("-315537897599.999999999s");
-    value = Timestamps.add(end, duration);
-    assertThat(value).isEqualTo(start);
-    value = Timestamps.subtract(start, duration);
-    assertThat(value).isEqualTo(end);
-  }
-
-  @Test
-  public void testComparator() {
-    assertThat(Timestamps.compare(timestamp(3, 2), timestamp(3, 2))).isEqualTo(0);
-    assertThat(Timestamps.compare(timestamp(0, 0), timestamp(0, 0))).isEqualTo(0);
-    assertThat(Timestamps.compare(timestamp(3, 1), timestamp(1, 1))).isGreaterThan(0);
-    assertThat(Timestamps.compare(timestamp(3, 2), timestamp(3, 1))).isGreaterThan(0);
-    assertThat(Timestamps.compare(timestamp(1, 1), timestamp(3, 1))).isLessThan(0);
-    assertThat(Timestamps.compare(timestamp(3, 1), timestamp(3, 2))).isLessThan(0);
-    assertThat(Timestamps.compare(timestamp(-3, 1), timestamp(-1, 1))).isLessThan(0);
-    assertThat(Timestamps.compare(timestamp(-3, 2), timestamp(-3, 3))).isLessThan(0);
-    assertThat(Timestamps.compare(timestamp(-1, 1), timestamp(-3, 1))).isGreaterThan(0);
-    assertThat(Timestamps.compare(timestamp(-3, 1), timestamp(-3, 2))).isLessThan(0);
-    assertThat(Timestamps.compare(timestamp(-10, 1), timestamp(1, 1))).isLessThan(0);
-    assertThat(Timestamps.compare(timestamp(0, 1), timestamp(0, 1))).isEqualTo(0);
-    assertThat(Timestamps.compare(timestamp(0x80000000L, 0), timestamp(0, 0))).isGreaterThan(0);
-    assertThat(Timestamps.compare(timestamp(0xFFFFFFFF00000000L, 0), timestamp(0, 0)))
-        .isLessThan(0);
-
-    Timestamp timestamp0 = timestamp(-50, 400);
-    Timestamp timestamp1 = timestamp(-50, 500);
-    Timestamp timestamp2 = timestamp(50, 500);
-    Timestamp timestamp3 = timestamp(100, 20);
-    Timestamp timestamp4 = timestamp(100, 50);
-    Timestamp timestamp5 = timestamp(100, 150);
-    Timestamp timestamp6 = timestamp(150, 40);
-
-    List<Timestamp> timestamps =
-        Lists.newArrayList(
-            timestamp5,
-            timestamp3,
-            timestamp1,
-            timestamp4,
-            timestamp6,
-            timestamp2,
-            timestamp0,
-            timestamp3);
-
-    Collections.sort(timestamps, Timestamps.comparator());
-    assertThat(timestamps)
-        .containsExactly(
-            timestamp0,
-            timestamp1,
-            timestamp2,
-            timestamp3,
-            timestamp3,
-            timestamp4,
-            timestamp5,
-            timestamp6)
-        .inOrder();
-  }
-
-  @Test
-  public void testCompare() {
-    assertThat(Timestamps.compare(timestamp(3, 2), timestamp(3, 2))).isEqualTo(0);
-    assertThat(Timestamps.compare(timestamp(0, 0), timestamp(0, 0))).isEqualTo(0);
-    assertThat(Timestamps.compare(timestamp(3, 1), timestamp(1, 1))).isGreaterThan(0);
-    assertThat(Timestamps.compare(timestamp(3, 2), timestamp(3, 1))).isGreaterThan(0);
-    assertThat(Timestamps.compare(timestamp(1, 1), timestamp(3, 1))).isLessThan(0);
-    assertThat(Timestamps.compare(timestamp(3, 1), timestamp(3, 2))).isLessThan(0);
-    assertThat(Timestamps.compare(timestamp(-3, 1), timestamp(-1, 1))).isLessThan(0);
-    assertThat(Timestamps.compare(timestamp(-3, 2), timestamp(-3, 3))).isLessThan(0);
-    assertThat(Timestamps.compare(timestamp(-1, 1), timestamp(-3, 1))).isGreaterThan(0);
-    assertThat(Timestamps.compare(timestamp(-3, 1), timestamp(-3, 2))).isLessThan(0);
-    assertThat(Timestamps.compare(timestamp(-10, 1), timestamp(1, 1))).isLessThan(0);
-    assertThat(Timestamps.compare(timestamp(0, 1), timestamp(0, 1))).isEqualTo(0);
-    assertThat(Timestamps.compare(timestamp(0x80000000L, 0), timestamp(0, 0))).isGreaterThan(0);
-    assertThat(Timestamps.compare(timestamp(0xFFFFFFFF00000000L, 0), timestamp(0, 0)))
-        .isLessThan(0);
-  }
-
-  @Test
-  public void testOverflowsArithmeticException() throws Exception {
-    try {
-      Timestamps.toNanos(Timestamps.parse("9999-12-31T23:59:59.999999999Z"));
-      assertWithMessage("Expected an ArithmeticException to be thrown").fail();
-    } catch (ArithmeticException expected) {
-    }
-  }
-
-  @Test
-  public void testPositiveOverflow() {
-    try {
-      Timestamps.add(Timestamps.MAX_VALUE, Durations.MAX_VALUE);
-      assertWithMessage("Expected an IllegalArgumentException to be thrown").fail();
-    } catch (IllegalArgumentException expected) {
-    }
-  }
-
-  @Test
-  public void testNegativeOverflow() {
-    try {
-      Timestamps.subtract(Timestamps.MIN_VALUE, Durations.MAX_VALUE);
-      assertWithMessage("Expected an IllegalArgumentException to be thrown").fail();
-    } catch (IllegalArgumentException expected) {
-    }
-  }
-
-  @Test
-  public void testInvalidMaxNanosecondsOverflow() {
-    try {
-      Timestamps.toNanos(INVALID_MAX);
-      assertWithMessage("Expected an IllegalArgumentException to be thrown").fail();
-    } catch (IllegalArgumentException expected) {
-    }
-  }
-  @Test
-  public void testInvalidMaxMicrosecondsOverflow() {
-    try {
-      Timestamps.toMicros(INVALID_MAX);
-      assertWithMessage("Expected an IllegalArgumentException to be thrown").fail();
-    } catch (IllegalArgumentException expected) {
-    }
-  }
-
-  @Test
-  public void testInvalidMaxMillisecondsOverflow() {
-    try {
-      Timestamps.toMillis(INVALID_MAX);
-      assertWithMessage("Expected an IllegalArgumentException to be thrown").fail();
-    } catch (IllegalArgumentException expected) {
-    }
-  }
-
-  @Test
-  public void testInvalidMaxSecondsOverflow() {
-    try {
-      Timestamps.toSeconds(INVALID_MAX);
-      assertWithMessage("Expected an IllegalArgumentException to be thrown").fail();
-    } catch (IllegalArgumentException expected) {
-    }
-  }
-
-  @Test
-  public void testInvalidMinNanosecondsOverflow() {
-    try {
-      Timestamps.toNanos(INVALID_MIN);
-      assertWithMessage("Expected an IllegalArgumentException to be thrown").fail();
-    } catch (IllegalArgumentException expected) {
-    }
-  }
-
-  @Test
-  public void testInvalidMicrosecondsMinOverflow() {
-    try {
-      Timestamps.toMicros(INVALID_MIN);
-      assertWithMessage("Expected an IllegalArgumentException to be thrown").fail();
-    } catch (IllegalArgumentException expected) {
-    }
-  }
-
-  @Test
-  public void testInvalidMinMillisecondsOverflow() {
-    try {
-      Timestamps.toMillis(INVALID_MIN);
-      assertWithMessage("Expected an IllegalArgumentException to be thrown").fail();
-    } catch (IllegalArgumentException expected) {
-    }
-  }
-
-  @Test
-  public void testOverInvalidMinSecondsflow() {
-    try {
-      Timestamps.toSeconds(INVALID_MIN);
-      assertWithMessage("Expected an IllegalArgumentException to be thrown").fail();
-    } catch (IllegalArgumentException expected) {
-    }
-  }
-
-  @Test
-  public void testMaxNanosecondsConversion() {
-    assertThat(Timestamps.toString(Timestamps.fromNanos(Long.MAX_VALUE)))
-        .isEqualTo("2262-04-11T23:47:16.854775807Z");
-  }
-
-  @Test
-  public void testIllegalArgumentExceptionForMaxMicroseconds() {
-   try {
-      Timestamps.fromMicros(Long.MAX_VALUE);
-      assertWithMessage("Expected an IllegalArgumentException to be thrown").fail();
-    } catch (IllegalArgumentException expected) {
-    }
-  }
-
-
-  @Test
-  public void testIllegalArgumentExceptionForMaxMilliseconds() {
-    try {
-      Durations.fromMillis(Long.MAX_VALUE);
-      assertWithMessage("Expected an IllegalArgumentException to be thrown").fail();
-    } catch (IllegalArgumentException expected) {
-    }
-  }
-
-  @Test
-  public void testMinNanosecondsConversion() {
-    assertThat(Timestamps.toString(Timestamps.fromNanos(Long.MIN_VALUE)))
-        .isEqualTo("1677-09-21T00:12:43.145224192Z");
-  }
-
-  @Test
-  public void testIllegalArgumentExceptionForMinMicroseconds() {
-    try {
-      Timestamps.fromMicros(Long.MIN_VALUE);
-      assertWithMessage("Expected an IllegalArgumentException to be thrown").fail();
-    } catch (IllegalArgumentException expected) {
-    }
-  }
-
-
-  @Test
-  public void testIllegalArgumentExceptionForMinMilliseconds() {
-    try {
-      Timestamps.fromMillis(Long.MIN_VALUE);
-      assertWithMessage("Expected an IllegalArgumentException to be thrown").fail();
-    } catch (IllegalArgumentException expected) {
-    }
-  }
-
-  @Test
-  public void testConvertFromSeconds() {
-    assertThat(Timestamps.fromSeconds(SECONDS).getSeconds()).isEqualTo(TIMESTAMP.getSeconds());
-    assertThat(Timestamps.EPOCH).isEqualTo(ZERO_TIMESTAMP);
-    assertThat(Timestamps.fromSeconds(MAX_VALUE)).isEqualTo(ZERO_TIMESTAMP);
-    assertThat(Timestamps.fromSeconds(MIN_VALUE)).isEqualTo(ZERO_TIMESTAMP);
-  }
-
-  @Test
-  public void testConvertFromMillis() {
-    assertThat(Timestamps.fromMillis(MILLIS)).isEqualTo(TIMESTAMP);
-    assertThat(Timestamps.EPOCH).isEqualTo(ZERO_TIMESTAMP);
-    assertThat(Timestamps.fromMillis(-1)).isEqualTo(ONE_OF_TIMESTAMP);
-    assertThat(Timestamps.fromMillis(MAX_VALUE)).isEqualTo(ZERO_TIMESTAMP);
-    assertThat(Timestamps.fromMillis(MIN_VALUE)).isEqualTo(ZERO_TIMESTAMP);
-  }
-
-  @Test
-  public void testConvertFromMicros() {
-    assertThat(Timestamps.fromMicros(MICROS)).isEqualTo(TIMESTAMP);
-    assertThat(Timestamps.EPOCH).isEqualTo(ZERO_TIMESTAMP);
-    assertThat(Timestamps.fromMicros(-1000)).isEqualTo(ONE_OF_TIMESTAMP);
-    assertThat(Timestamps.fromMicros(MAX_VALUE)).isEqualTo(ZERO_TIMESTAMP);
-    assertThat(Timestamps.fromMicros(MIN_VALUE)).isEqualTo(ZERO_TIMESTAMP);
-  }
-
-  @Test
-  public void testConvertToSeconds() {
-    assertThat(Timestamps.toSeconds(TIMESTAMP)).isEqualTo(SECONDS);
-    assertThat(Timestamps.toSeconds(ZERO_TIMESTAMP)).isEqualTo(0);
-    assertThat(Timestamps.toSeconds(ONE_OF_TIMESTAMP)).isEqualTo(-1);
-  }
-
-  @Test
-  public void testConvertToMillis() {
-    assertThat(Timestamps.toMillis(TIMESTAMP)).isEqualTo(MILLIS);
-    assertThat(Timestamps.toMillis(ZERO_TIMESTAMP)).isEqualTo(0);
-    assertThat(Timestamps.toMillis(ONE_OF_TIMESTAMP)).isEqualTo(-1);
-  }
-
-  @Test
-  public void testConvertToMicros() {
-    assertThat(Timestamps.toMicros(TIMESTAMP)).isEqualTo(MICROS);
-    assertThat(Timestamps.toMicros(ZERO_TIMESTAMP)).isEqualTo(0);
-    assertThat(Timestamps.toMicros(ONE_OF_TIMESTAMP)).isEqualTo(-1000);
-  }
-
-  @Test
-  public void testConvertFromMillisAboveTimestampMaxLimit() {
-    long timestampMaxSeconds = 253402300799L;
-    try {
-      Timestamps.fromMillis((timestampMaxSeconds + 1) * MILLIS_PER_SECOND);
-      assertWithMessage("Expected an IllegalArgumentException to be thrown").fail();
-    } catch (IllegalArgumentException expected) {
-    }
-  }
-
-  @Test
-  public void testConvertFromMillisBelowTimestampMaxLimit() {
-    long timestampMinSeconds = -62135596800L;
-    try {
-      Timestamps.fromMillis((timestampMinSeconds - 1) * MILLIS_PER_SECOND);
-      assertWithMessage("Expected an IllegalArgumentException to be thrown").fail();
-    } catch (IllegalArgumentException expected) {
-    }
-  }
-
-  @Test
-  public void testConvertFromNanos() {
-    assertThat(Timestamps.fromNanos(NANOS)).isEqualTo(TIMESTAMP);
-    assertThat(Timestamps.fromNanos(0)).isEqualTo(ZERO_TIMESTAMP);
-    assertThat(Timestamps.fromNanos(-1000000)).isEqualTo(ONE_OF_TIMESTAMP);
-    assertThat(Timestamps.fromNanos(MAX_VALUE)).isEqualTo(ZERO_TIMESTAMP);
-    assertThat(Timestamps.fromNanos(MIN_VALUE)).isEqualTo(ZERO_TIMESTAMP);
-  }
-
-  @Test
-  public void testConvertToNanos() {
-    assertThat(Timestamps.toNanos(TIMESTAMP)).isEqualTo(NANOS);
-    assertThat(Timestamps.toNanos(ZERO_TIMESTAMP)).isEqualTo(0);
-    assertThat(Timestamps.toNanos(ONE_OF_TIMESTAMP)).isEqualTo(-1000000);
-  }
-
-  @Test
-  public void testAdd() {
-    assertThat(Timestamps.add(timestamp(1, 10), duration(1, 20))).isEqualTo(timestamp(2, 30));
-    assertThat(Timestamps.add(timestamp(1, 10), duration(-1, -11)))
-        .isEqualTo(timestamp(-1, 999999999));
-    assertThat(Timestamps.add(timestamp(10, 10), duration(-1, -11)))
-        .isEqualTo(timestamp(8, 999999999));
-    assertThat(Timestamps.add(timestamp(1, 1), duration(1, 999999999))).isEqualTo(timestamp(3, 0));
-    assertThat(Timestamps.add(timestamp(1, 2), duration(1, 999999999))).isEqualTo(timestamp(3, 1));
-  }
-
-  @Test
-  public void testSubtractDuration() {
-    assertThat(Timestamps.subtract(timestamp(1, 10), duration(-1, -20)))
-        .isEqualTo(timestamp(2, 30));
-    assertThat(Timestamps.subtract(timestamp(1, 10), duration(1, 11)))
-        .isEqualTo(timestamp(-1, 999999999));
-    assertThat(Timestamps.subtract(timestamp(10, 10), duration(1, 11)))
-        .isEqualTo(timestamp(8, 999999999));
-    assertThat(Timestamps.subtract(timestamp(1, 1), duration(-1, -999999999)))
-        .isEqualTo(timestamp(3, 0));
-    assertThat(Timestamps.subtract(timestamp(1, 2), duration(-1, -999999999)))
-        .isEqualTo(timestamp(3, 1));
-  }
-
-  static Timestamp timestamp(long seconds, int nanos) {
-    return Timestamps.checkValid(
-        Timestamps.checkValid(Timestamp.newBuilder().setSeconds(seconds).setNanos(nanos)));
-  }
-}
diff --git a/libs/protobuf/java/util/src/test/java/com/google/protobuf/util/ValuesTest.java b/libs/protobuf/java/util/src/test/java/com/google/protobuf/util/ValuesTest.java
deleted file mode 100644
index 9e172c8..0000000
--- a/libs/protobuf/java/util/src/test/java/com/google/protobuf/util/ValuesTest.java
+++ /dev/null
@@ -1,112 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package com.google.protobuf.util;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import com.google.protobuf.ListValue;
-import com.google.protobuf.NullValue;
-import com.google.protobuf.Struct;
-import com.google.protobuf.Value;
-import java.util.ArrayList;
-import java.util.List;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-@RunWith(JUnit4.class)
-public final class ValuesTest {
-  @Test
-  public void testOfNull_IsNullValue() throws Exception {
-    assertThat(Values.ofNull())
-        .isEqualTo(Value.newBuilder().setNullValue(NullValue.NULL_VALUE).build());
-  }
-
-  @Test
-  public void testOfBoolean_ConstructsValue() {
-    assertThat(Values.of(true)).isEqualTo(Value.newBuilder().setBoolValue(true).build());
-    assertThat(Values.of(false)).isEqualTo(Value.newBuilder().setBoolValue(false).build());
-  }
-
-  @Test
-  public void testOfNumeric_ConstructsValue() {
-    assertThat(Values.of(100)).isEqualTo(Value.newBuilder().setNumberValue(100).build());
-    assertThat(Values.of(1000L)).isEqualTo(Value.newBuilder().setNumberValue(1000).build());
-    assertThat(Values.of(1000.23f)).isEqualTo(Value.newBuilder().setNumberValue(1000.23f).build());
-    assertThat(Values.of(10000.23)).isEqualTo(Value.newBuilder().setNumberValue(10000.23).build());
-  }
-
-  @Test
-  public void testOfString_ConstructsValue() {
-    assertThat(Values.of("")).isEqualTo(Value.newBuilder().setStringValue("").build());
-    assertThat(Values.of("foo")).isEqualTo(Value.newBuilder().setStringValue("foo").build());
-  }
-
-  @Test
-  public void testOfStruct_ConstructsValue() {
-    Struct.Builder builder = Struct.newBuilder();
-    builder.putFields("a", Values.of("a"));
-    builder.putFields("b", Values.of("b"));
-
-    assertThat(Values.of(builder.build()))
-        .isEqualTo(Value.newBuilder().setStructValue(builder.build()).build());
-  }
-
-  @Test
-  public void testOfListValue_ConstructsInstance() {
-    ListValue.Builder builder = ListValue.newBuilder();
-    builder.addValues(Values.of(1));
-    builder.addValues(Values.of(2));
-
-    assertThat(Values.of(builder.build()))
-        .isEqualTo(Value.newBuilder().setListValue(builder.build()).build());
-  }
-
-  @Test
-  public void testOfIterable_ReturnsTheValue() {
-    ListValue.Builder builder = ListValue.newBuilder();
-    builder.addValues(Values.of(1));
-    builder.addValues(Values.of(2));
-    builder.addValues(Values.of(true));
-    builder.addValues(Value.newBuilder().setListValue(builder.build()).build());
-
-    List<Value> list = new ArrayList<>();
-    list.add(Values.of(1));
-    list.add(Values.of(2));
-    list.add(Values.of(true));
-    List<Value> copyList = new ArrayList<>(list);
-    list.add(Values.of(copyList));
-
-    assertThat(Values.of(list)).isEqualTo(Value.newBuilder().setListValue(builder).build());
-    assertThat(Values.of(new ArrayList<Value>()))
-        .isEqualTo(Value.newBuilder().setListValue(ListValue.getDefaultInstance()).build());
-  }
-}
diff --git a/libs/protobuf/java/util/src/test/proto/com/google/protobuf/util/json_test.proto b/libs/protobuf/java/util/src/test/proto/com/google/protobuf/util/json_test.proto
deleted file mode 100644
index ba4fe03..0000000
--- a/libs/protobuf/java/util/src/test/proto/com/google/protobuf/util/json_test.proto
+++ /dev/null
@@ -1,190 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto3";
-
-package json_test;
-
-import "google/protobuf/any.proto";
-import "google/protobuf/duration.proto";
-import "google/protobuf/field_mask.proto";
-import "google/protobuf/struct.proto";
-import "google/protobuf/timestamp.proto";
-import "google/protobuf/wrappers.proto";
-
-option java_package = "com.google.protobuf.util.proto";
-option java_outer_classname = "JsonTestProto";
-
-message TestAllTypes {
-  enum NestedEnum {
-    FOO = 0;
-    BAR = 1;
-    BAZ = 2;
-  }
-
-  enum AliasedEnum {
-    option allow_alias = true;
-
-    ALIAS_FOO = 0;
-    ALIAS_BAR = 1;
-    ALIAS_BAZ = 2;
-    QUX = 2;
-    qux = 2;
-    bAz = 2;
-  }
-  message NestedMessage {
-    int32 value = 1;
-  }
-
-  int32 optional_int32 = 1;
-  int64 optional_int64 = 2;
-  uint32 optional_uint32 = 3;
-  uint64 optional_uint64 = 4;
-  sint32 optional_sint32 = 5;
-  sint64 optional_sint64 = 6;
-  fixed32 optional_fixed32 = 7;
-  fixed64 optional_fixed64 = 8;
-  sfixed32 optional_sfixed32 = 9;
-  sfixed64 optional_sfixed64 = 10;
-  float optional_float = 11;
-  double optional_double = 12;
-  bool optional_bool = 13;
-  string optional_string = 14;
-  bytes optional_bytes = 15;
-  NestedMessage optional_nested_message = 18;
-  NestedEnum optional_nested_enum = 21;
-  AliasedEnum optional_aliased_enum = 52;
-
-  // Repeated
-  repeated int32 repeated_int32 = 31;
-  repeated int64 repeated_int64 = 32;
-  repeated uint32 repeated_uint32 = 33;
-  repeated uint64 repeated_uint64 = 34;
-  repeated sint32 repeated_sint32 = 35;
-  repeated sint64 repeated_sint64 = 36;
-  repeated fixed32 repeated_fixed32 = 37;
-  repeated fixed64 repeated_fixed64 = 38;
-  repeated sfixed32 repeated_sfixed32 = 39;
-  repeated sfixed64 repeated_sfixed64 = 40;
-  repeated float repeated_float = 41;
-  repeated double repeated_double = 42;
-  repeated bool repeated_bool = 43;
-  repeated string repeated_string = 44;
-  repeated bytes repeated_bytes = 45;
-  repeated NestedMessage repeated_nested_message = 48;
-  repeated NestedEnum repeated_nested_enum = 51;
-}
-
-message TestOneof {
-  oneof oneof_field {
-    int32 oneof_int32 = 1;
-    TestAllTypes.NestedMessage oneof_nested_message = 2;
-    google.protobuf.NullValue oneof_null_value = 3;
-  }
-}
-
-message TestMap {
-  // Instead of testing all combinations (too many), we only make sure all
-  // valid types have been used at least in one field as key and in one
-  // field as value.
-  map<int32, int32> int32_to_int32_map = 1;
-  map<int64, int32> int64_to_int32_map = 2;
-  map<uint32, int32> uint32_to_int32_map = 3;
-  map<uint64, int32> uint64_to_int32_map = 4;
-  map<sint32, int32> sint32_to_int32_map = 5;
-  map<sint64, int32> sint64_to_int32_map = 6;
-  map<fixed32, int32> fixed32_to_int32_map = 7;
-  map<fixed64, int32> fixed64_to_int32_map = 8;
-  map<sfixed32, int32> sfixed32_to_int32_map = 9;
-  map<sfixed64, int32> sfixed64_to_int32_map = 10;
-  map<bool, int32> bool_to_int32_map = 11;
-  map<string, int32> string_to_int32_map = 12;
-
-  map<int32, int64> int32_to_int64_map = 101;
-  map<int32, uint32> int32_to_uint32_map = 102;
-  map<int32, uint64> int32_to_uint64_map = 103;
-  map<int32, sint32> int32_to_sint32_map = 104;
-  map<int32, sint64> int32_to_sint64_map = 105;
-  map<int32, fixed32> int32_to_fixed32_map = 106;
-  map<int32, fixed64> int32_to_fixed64_map = 107;
-  map<int32, sfixed32> int32_to_sfixed32_map = 108;
-  map<int32, sfixed64> int32_to_sfixed64_map = 109;
-  map<int32, float> int32_to_float_map = 110;
-  map<int32, double> int32_to_double_map = 111;
-  map<int32, bool> int32_to_bool_map = 112;
-  map<int32, string> int32_to_string_map = 113;
-  map<int32, bytes> int32_to_bytes_map = 114;
-  map<int32, TestAllTypes.NestedMessage> int32_to_message_map = 115;
-  map<int32, TestAllTypes.NestedEnum> int32_to_enum_map = 116;
-}
-
-message TestWrappers {
-  google.protobuf.Int32Value int32_value = 1;
-  google.protobuf.UInt32Value uint32_value = 2;
-  google.protobuf.Int64Value int64_value = 3;
-  google.protobuf.UInt64Value uint64_value = 4;
-  google.protobuf.FloatValue float_value = 5;
-  google.protobuf.DoubleValue double_value = 6;
-  google.protobuf.BoolValue bool_value = 7;
-  google.protobuf.StringValue string_value = 8;
-  google.protobuf.BytesValue bytes_value = 9;
-}
-
-message TestTimestamp {
-  google.protobuf.Timestamp timestamp_value = 1;
-}
-
-message TestDuration {
-  google.protobuf.Duration duration_value = 1;
-}
-
-message TestFieldMask {
-  google.protobuf.FieldMask field_mask_value = 1;
-}
-
-message TestStruct {
-  google.protobuf.Struct struct_value = 1;
-  google.protobuf.Value value = 2;
-  google.protobuf.ListValue list_value = 3;
-}
-
-message TestAny {
-  google.protobuf.Any any_value = 1;
-  map<string, google.protobuf.Any> any_map = 2;
-}
-
-message TestCustomJsonName {
-  int32 value = 1 [json_name = "@value"];
-}
-
-message TestRecursive {
-  int32 value = 1;
-  TestRecursive nested = 2;
-}
diff --git a/libs/protobuf/kokoro/README.md b/libs/protobuf/kokoro/README.md
deleted file mode 100644
index 590d7bd..0000000
--- a/libs/protobuf/kokoro/README.md
+++ /dev/null
@@ -1,12 +0,0 @@
-
-Kokoro Infrastructure
-----------------------
-
-The files in this directory serve as plumbing for running Protobuf
-tests under Kokoro, our internal CI.
-
-We have shared this part of our CI configuration in hopes that it is
-helpful to contributors who want to better understand the details of
-our test and release processes. If there are changes, please file an
-issue; unfortunately, we may not be able to accept PRs (but feel free
-to send one if it helps to explain the issue).
diff --git a/libs/protobuf/kokoro/caplog.sh b/libs/protobuf/kokoro/caplog.sh
deleted file mode 100644
index fe81949..0000000
--- a/libs/protobuf/kokoro/caplog.sh
+++ /dev/null
@@ -1,92 +0,0 @@
-# Log capturing for the Kokoro runtime environment.
-#
-# This script should be `source`d from Kokoro build scripts to configure log
-# capturing when running under Kokoro.
-#
-# When not running under Kokoro, no logs will be collected. If you want to run
-# locally and collect logs anyway, set the KOKORO_ARTIFACTS_DIR environment
-# variable to a directory where the logs should go.
-#
-# The job `.cfg` file needs the following stanzas to declare the captured logs
-# as outputs (yes, these are globs, not regexes):
-#
-#   action: {
-#     define_artifacts: {
-#       regex: "**/*sponge_log.log"
-#       regex: "**/*sponge_log.xml"
-#     }
-#   }
-#
-# Use the provided functions below as build/test fixtures, e.g.:
-#
-#   source kokoro/capture_logs.sh
-#   caplog build/step1 <build command>
-#   caplog tests/step2 <test command>
-#
-# If log capturing is enabled, this script will set some variables that can be
-# used if necessary:
-#
-#   CAPLOG_DIR         is used for logs
-#   CAPLOG_CMAKE_ARGS  contains extra cmake args to enable test XML output
-#   CAPLOG_CTEST_ARGS  contains extra ctest args to capture combined test logs
-#
-# For example:
-#
-#   if [[ -v CAPLOG_DIR_BUILD ]]; then
-#     cp extra_diagnostics.log "${CAPLOG_DIR_BUILD}/diagnostics.log"
-#   fi
-#
-#   # Use ${...:-} form under `set -u`:
-#   caplog build/01_configure cmake -G Ninja ${CAPLOG_CMAKE_ARGS:-}
-#   caplog build/02_build     cmake --build
-#   caplog test/03_test       ctest ${CAPLOG_CTEST_ARGS:-}
-
-if [[ -z ${KOKORO_ARTIFACTS_DIR:-} ]]; then
-  function caplog() { shift; "$@"; }
-else
-
-  CAPLOG_DIR="$(mktemp -d)"
-  CAPLOG_CMAKE_ARGS="-Dprotobuf_TEST_XML_OUTDIR=${CAPLOG_DIR}/tests/"
-  CAPLOG_CTEST_ARGS="--verbose"
-
-  # Captures the stdout/stderr of a command to a named log file.
-  # Usage: caplog NAME COMMAND [ARGS...]
-  function caplog() {
-    _name="${CAPLOG_DIR}/${1%.log}.log"; shift
-    mkdir -p "${_name%/*}"
-    date
-    time ( "$@" 2>&1 | tee "${_name}" )
-    if [[ $? != 0 ]] ; then
-      cat "${_name}"
-      return 1
-    fi
-  }
-
-  # Trap handler: renames logs on script exit so they will be found by Kokoro.
-  function _caplog_onexit() {
-    _rc=$?
-    set +x
-    echo "Collecting logs [${BASH_SOURCE}]"
-
-    find "${CAPLOG_DIR}" -type f -name '*.log' \
-      | while read _textlog; do
-      # Ensure an XML file exists for each .log file.
-      touch ${_textlog%.log}.xml
-    done
-
-    find "${CAPLOG_DIR}" -type f \( -name '*.xml' -or -name '*.log' \) \
-      | while read _src; do
-      # Move to artifacts dir, preserving the path relative to CAPLOG_DIR.
-      # The filename changes from foo/bar.log to foo/bar/sponge_log.log.
-      _logfile=${_src/${CAPLOG_DIR}\//}
-      _stem=${KOKORO_ARTIFACTS_DIR}/${_logfile%.*}
-      _ext=${_logfile##*.}
-      mkdir -p ${_stem}
-      mv -v "${_src}" "${_stem}/sponge_log.${_ext}"
-    done
-    rm -rv "${CAPLOG_DIR}"
-    exit ${_rc}
-  }
-  trap _caplog_onexit EXIT
-
-fi
diff --git a/libs/protobuf/kokoro/docs/common.cfg b/libs/protobuf/kokoro/docs/common.cfg
deleted file mode 100644
index 771ca7f..0000000
--- a/libs/protobuf/kokoro/docs/common.cfg
+++ /dev/null
@@ -1,44 +0,0 @@
-# Format: //devtools/kokoro/config/proto/build.proto
-
-# Build logs will be here
-action {
-  define_artifacts {
-    regex: "**/*sponge_log.xml"
-  }
-}
-
-# Download trampoline resources.
-gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"
-
-# Use the trampoline script to run in docker.
-build_file: "protobuf/kokoro/docs/trampoline.sh"
-
-# Configure the docker image for kokoro-trampoline.
-env_vars: {
-    key: "TRAMPOLINE_IMAGE"
-    value: "gcr.io/cloud-devrel-kokoro-resources/python-multi"
-}
-
-env_vars: {
-    key: "STAGING_BUCKET"
-    value: "docs-staging"
-}
-
-# Fetch the token needed for reporting release status to GitHub
-before_action {
-  fetch_keystore {
-    keystore_resource {
-      keystore_config_id: 73713
-      keyname: "yoshi-automation-github-key"
-    }
-  }
-}
-
-before_action {
-  fetch_keystore {
-    keystore_resource {
-      keystore_config_id: 73713
-      keyname: "docuploader_service_account"
-    }
-  }
-}
diff --git a/libs/protobuf/kokoro/docs/publish-python.sh b/libs/protobuf/kokoro/docs/publish-python.sh
deleted file mode 100755
index 684afa6..0000000
--- a/libs/protobuf/kokoro/docs/publish-python.sh
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/bash
-# Adapted from https://github.com/googleapis/google-cloud-python/blob/main/.kokoro/publish-docs.sh
-
-set -eo pipefail
-
-# Disable buffering, so that the logs stream through.
-export PYTHONUNBUFFERED=1
-
-cd github/protobuf/python
-
-# install package
-sudo apt-get update
-sudo apt-get -y install software-properties-common
-sudo add-apt-repository universe
-sudo apt-get update
-sudo apt-get -y install unzip
-wget https://github.com/protocolbuffers/protobuf/releases/download/v21.0-rc1/protoc-21.0-rc-1-linux-x86_64.zip
-unzip protoc-21.0-rc-1-linux-x86_64.zip bin/protoc
-mv bin/protoc ../src/protoc
-python3 -m venv venv
-source venv/bin/activate
-python setup.py install
-
-# install docs dependencies
-python -m pip install -r docs/requirements.txt
-
-# build docs
-cd docs
-make html
-cd ..
-deactivate
-
-python3 -m pip install protobuf==4.21.0rc1 gcp-docuploader
-
-# install a json parser
-sudo apt-get -y install jq
-
-# create metadata
-python3 -m docuploader create-metadata \
-  --name=$(jq --raw-output '.name // empty' .repo-metadata.json) \
-  --version=$(python3 setup.py --version) \
-  --language=$(jq --raw-output '.language // empty' .repo-metadata.json) \
-  --distribution-name=$(python3 setup.py --name) \
-  --product-page=$(jq --raw-output '.product_documentation // empty' .repo-metadata.json) \
-  --github-repository=$(jq --raw-output '.repo // empty' .repo-metadata.json) \
-  --issue-tracker=$(jq --raw-output '.issue_tracker // empty' .repo-metadata.json)
-
-cat docs.metadata
-
-# upload docs
-python3 -m docuploader upload docs/_build/html --metadata-file docs.metadata --staging-bucket docs-staging
diff --git a/libs/protobuf/kokoro/docs/python.cfg b/libs/protobuf/kokoro/docs/python.cfg
deleted file mode 100644
index 382f431..0000000
--- a/libs/protobuf/kokoro/docs/python.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-# Format: //devtools/kokoro/config/proto/build.proto
-
-# Tell the trampoline which build file to use.
-env_vars: {
-    key: "TRAMPOLINE_BUILD_FILE"
-    value: "github/protobuf/kokoro/docs/publish-python.sh"
-}
diff --git a/libs/protobuf/kokoro/docs/trampoline.sh b/libs/protobuf/kokoro/docs/trampoline.sh
deleted file mode 100755
index 4cb78a5..0000000
--- a/libs/protobuf/kokoro/docs/trampoline.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-# Copied from https://github.com/googleapis/google-cloud-python/blob/main/.kokoro/trampoline.sh
-
-set -eo pipefail
-
-python3 "${KOKORO_GFILE_DIR}/trampoline_v1.py"  || ret_code=$?
-
-chmod +x ${KOKORO_GFILE_DIR}/trampoline_cleanup.sh
-${KOKORO_GFILE_DIR}/trampoline_cleanup.sh || true
-
-exit ${ret_code}
diff --git a/libs/protobuf/kokoro/linux/32-bit/Dockerfile b/libs/protobuf/kokoro/linux/32-bit/Dockerfile
deleted file mode 100644
index 1278889..0000000
--- a/libs/protobuf/kokoro/linux/32-bit/Dockerfile
+++ /dev/null
@@ -1,143 +0,0 @@
-# This Dockerfile specifies the recipe for creating an image for the tests
-# to run in.
-#
-# We install as many test dependencies here as we can, because these setup
-# steps can be cached.  They do *not* run every time we run the build.
-# The Docker image is only rebuilt when the Dockerfile (ie. this file)
-# changes.
-
-# Base Dockerfile for gRPC dev images
-FROM 32bit/debian:latest
-
-# Apt source for php
-RUN echo "deb http://ppa.launchpad.net/ondrej/php/ubuntu trusty main" | tee /etc/apt/sources.list.d/various-php.list && \
-  apt-key adv --keyserver keyserver.ubuntu.com --recv-keys F4FCBB07
-
-# Install dependencies.  We start with the basic ones require to build protoc
-# and the C++ build
-RUN apt-get clean && apt-get update && apt-get install -y --force-yes \
-  autoconf \
-  autotools-dev \
-  build-essential \
-  bzip2 \
-  ccache \
-  curl \
-  gcc \
-  git \
-  libc6 \
-  libc6-dbg \
-  libc6-dev \
-  libgtest-dev \
-  libtool \
-  make \
-  parallel \
-  time \
-  wget \
-  unzip \
-  # -- For python --
-  python-setuptools \
-  python-pip \
-  python-dev \
-  # -- For C++ benchmarks --
-  cmake  \
-  # -- For PHP --
-  php5.5     \
-  php5.5-dev \
-  php5.5-xml \
-  php5.6     \
-  php5.6-dev \
-  php5.6-xml \
-  php7.0     \
-  php7.0-dev \
-  php7.0-xml \
-  phpunit    \
-  valgrind   \
-  libxml2-dev \
-  && apt-get clean
-
-##################
-# PHP dependencies.
-RUN wget http://am1.php.net/get/php-5.5.38.tar.bz2/from/this/mirror
-RUN mv mirror php-5.5.38.tar.bz2
-RUN tar -xvf php-5.5.38.tar.bz2
-RUN cd php-5.5.38 && ./configure --enable-maintainer-zts --prefix=/usr/local/php-5.5-zts && \
-    make && make install && make clean && cd ..
-RUN cd php-5.5.38 && make clean && ./configure --enable-bcmath --prefix=/usr/local/php-5.5 && \
-    make && make install && make clean && cd ..
-
-RUN wget http://am1.php.net/get/php-5.6.30.tar.bz2/from/this/mirror
-RUN mv mirror php-5.6.30.tar.bz2
-RUN tar -xvf php-5.6.30.tar.bz2
-RUN cd php-5.6.30 && ./configure --enable-maintainer-zts --prefix=/usr/local/php-5.6-zts && \
-    make && make install && cd ..
-RUN cd php-5.6.30 && make clean && ./configure --enable-bcmath --prefix=/usr/local/php-5.6 && \
-    make && make install && cd ..
-
-RUN wget http://am1.php.net/get/php-7.0.18.tar.bz2/from/this/mirror
-RUN mv mirror php-7.0.18.tar.bz2
-RUN tar -xvf php-7.0.18.tar.bz2
-RUN cd php-7.0.18 && ./configure --enable-maintainer-zts --prefix=/usr/local/php-7.0-zts && \
-    make && make install && cd ..
-RUN cd php-7.0.18 && make clean && ./configure --enable-bcmath --prefix=/usr/local/php-7.0 && \
-    make && make install && cd ..
-
-RUN wget http://am1.php.net/get/php-7.1.4.tar.bz2/from/this/mirror
-RUN mv mirror php-7.1.4.tar.bz2
-RUN tar -xvf php-7.1.4.tar.bz2
-RUN cd php-7.1.4 && ./configure --enable-maintainer-zts --prefix=/usr/local/php-7.1-zts && \
-    make && make install && cd ..
-RUN cd php-7.1.4 && make clean && ./configure --enable-bcmath --prefix=/usr/local/php-7.1 && \
-    make && make install && cd ..
-
-RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
-RUN php composer-setup.php
-RUN mv composer.phar /usr/bin/composer
-RUN php -r "unlink('composer-setup.php');"
-RUN composer config -g -- disable-tls true
-RUN composer config -g -- secure-http false
-RUN cd /tmp && \
-  git clone https://github.com/google/protobuf.git && \
-  cd protobuf/php && \
-  git reset --hard 49b44bff2b6257a119f9c6a342d6151c736586b8 && \
-  ln -sfn /usr/local/php-5.5/bin/php /usr/bin/php && \
-  ln -sfn /usr/local/php-5.5/bin/php-config /usr/bin/php-config && \
-  ln -sfn /usr/local/php-5.5/bin/phpize /usr/bin/phpize && \
-  composer install && \
-  mv vendor /usr/local/vendor-5.5 && \
-  ln -sfn /usr/local/php-5.6/bin/php /usr/bin/php && \
-  ln -sfn /usr/local/php-5.6/bin/php-config /usr/bin/php-config && \
-  ln -sfn /usr/local/php-5.6/bin/phpize /usr/bin/phpize && \
-  composer install && \
-  mv vendor /usr/local/vendor-5.6 && \
-  ln -sfn /usr/local/php-7.0/bin/php /usr/bin/php && \
-  ln -sfn /usr/local/php-7.0/bin/php-config /usr/bin/php-config && \
-  ln -sfn /usr/local/php-7.0/bin/phpize /usr/bin/phpize && \
-  composer install && \
-  mv vendor /usr/local/vendor-7.0 && \
-  ln -sfn /usr/local/php-7.1/bin/php /usr/bin/php && \
-  ln -sfn /usr/local/php-7.1/bin/php-config /usr/bin/php-config && \
-  ln -sfn /usr/local/php-7.1/bin/phpize /usr/bin/phpize && \
-  composer install && \
-  mv vendor /usr/local/vendor-7.1
-
-##################
-# Python dependencies
-
-# These packages exist in apt-get, but their versions are too old, so we have
-# to get updates from pip.
-
-RUN pip install pip --upgrade
-RUN pip install virtualenv tox yattag
-
-##################
-# Prepare ccache
-
-RUN ln -s /usr/bin/ccache /usr/local/bin/gcc
-RUN ln -s /usr/bin/ccache /usr/local/bin/g++
-RUN ln -s /usr/bin/ccache /usr/local/bin/cc
-RUN ln -s /usr/bin/ccache /usr/local/bin/c++
-RUN ln -s /usr/bin/ccache /usr/local/bin/clang
-RUN ln -s /usr/bin/ccache /usr/local/bin/clang++
-
-# Define the default command.
-CMD ["bash"]
diff --git a/libs/protobuf/kokoro/linux/32-bit/build.sh b/libs/protobuf/kokoro/linux/32-bit/build.sh
deleted file mode 100755
index 8c0a41e..0000000
--- a/libs/protobuf/kokoro/linux/32-bit/build.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-#
-# This is the top-level script we give to Kokoro as the entry point for
-# running the "pull request 32" project:
-#
-# This script selects a specific Dockerfile (for building a Docker image) and
-# a script to run inside that image.  Then we delegate to the general
-# build_and_run_docker.sh script.
-
-# Change to repo root
-cd $(dirname $0)/../../..
-
-export DOCKERHUB_ORGANIZATION=protobuftesting
-export DOCKERFILE_DIR=kokoro/linux/dockerfile/test/php_32bit
-export DOCKER_RUN_SCRIPT=kokoro/linux/pull_request_in_docker.sh
-export OUTPUT_DIR=testoutput
-export TEST_SET="php_all_32"
-./kokoro/linux/build_and_run_docker.sh
diff --git a/libs/protobuf/kokoro/linux/32-bit/continuous.cfg b/libs/protobuf/kokoro/linux/32-bit/continuous.cfg
deleted file mode 100644
index 28b66c0..0000000
--- a/libs/protobuf/kokoro/linux/32-bit/continuous.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/32-bit/build.sh"
-timeout_mins: 120
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.xml"
-  }
-}
diff --git a/libs/protobuf/kokoro/linux/32-bit/presubmit.cfg b/libs/protobuf/kokoro/linux/32-bit/presubmit.cfg
deleted file mode 100644
index 28b66c0..0000000
--- a/libs/protobuf/kokoro/linux/32-bit/presubmit.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/32-bit/build.sh"
-timeout_mins: 120
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.xml"
-  }
-}
diff --git a/libs/protobuf/kokoro/linux/aarch64/cpp_crosscompile_and_run_tests_with_qemu_aarch64.sh b/libs/protobuf/kokoro/linux/aarch64/cpp_crosscompile_and_run_tests_with_qemu_aarch64.sh
deleted file mode 100755
index 425cc90..0000000
--- a/libs/protobuf/kokoro/linux/aarch64/cpp_crosscompile_and_run_tests_with_qemu_aarch64.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-#
-# Builds protobuf C++ with aarch64 crosscompiler and runs a basic set of tests under an emulator.
-# NOTE: This script is expected to run under the dockcross/linux-arm64 docker image.
-
-set -ex
-
-mkdir -p cmake/crossbuild_aarch64
-cd cmake/crossbuild_aarch64
-
-# the build commands are expected to run under dockcross docker image
-# where the CC, CXX and other toolchain variables already point to the crosscompiler
-cmake ..
-make -j8
-
-# check that the resulting test binary is indeed an aarch64 ELF
-(file ./tests | grep -q "ELF 64-bit LSB executable, ARM aarch64") || (echo "Test binary in not an aarch64 binary"; exit 1)
-
-# run the basic set of C++ tests under QEMU
-# there are other tests we could run (e.g. ./lite-test), but this is sufficient as a smoketest
-qemu-aarch64 ./tests
diff --git a/libs/protobuf/kokoro/linux/aarch64/dockcross_helpers/run_dockcross_linux_aarch64.sh b/libs/protobuf/kokoro/linux/aarch64/dockcross_helpers/run_dockcross_linux_aarch64.sh
deleted file mode 100755
index aca08bd..0000000
--- a/libs/protobuf/kokoro/linux/aarch64/dockcross_helpers/run_dockcross_linux_aarch64.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# go to the repo root
-cd $(dirname $0)/../../../..
-
-if [[ -t 0 ]]; then
-  DOCKER_TTY_ARGS="-it"
-else
-  # The input device on kokoro is not a TTY, so -it does not work.
-  DOCKER_TTY_ARGS=
-fi
-
-# Pin the dockcross image since newer versions of the image break the build
-PINNED_DOCKCROSS_IMAGE_VERSION=dockcross/linux-arm64:20210625-795dd4d
-
-# running dockcross image without any arguments generates a wrapper
-# scripts that can be used to run commands under the dockcross image
-# easily.
-# See https://github.com/dockcross/dockcross#usage for details
-docker run $DOCKER_TTY_ARGS --rm $PINNED_DOCKCROSS_IMAGE_VERSION >dockcross-linux-arm64.sh
-chmod +x dockcross-linux-arm64.sh
-
-# the wrapper script has CRLF line endings and bash doesn't like that
-# so we change CRLF line endings into LF.
-sed -i 's/\r//g' dockcross-linux-arm64.sh
-
-# The dockcross wrapper script runs arbitrary commands under the selected dockcross
-# image with the following properties which make its use very convenient:
-# * the current working directory is mounted under /work so the container can easily
-#   access the current workspace
-# * the processes in the container run under the same UID and GID as the host process so unlike
-#   vanilla "docker run" invocations, the workspace doesn't get polluted with files
-#   owned by root.
-./dockcross-linux-arm64.sh --image $PINNED_DOCKCROSS_IMAGE_VERSION -- "$@"
diff --git a/libs/protobuf/kokoro/linux/aarch64/dockcross_helpers/run_dockcross_manylinux2014_aarch64.sh b/libs/protobuf/kokoro/linux/aarch64/dockcross_helpers/run_dockcross_manylinux2014_aarch64.sh
deleted file mode 100755
index ba34fa7..0000000
--- a/libs/protobuf/kokoro/linux/aarch64/dockcross_helpers/run_dockcross_manylinux2014_aarch64.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# go to the repo root
-cd $(dirname $0)/../../../..
-
-if [[ -t 0 ]]; then
-  DOCKER_TTY_ARGS="-it"
-else
-  # The input device on kokoro is not a TTY, so -it does not work.
-  DOCKER_TTY_ARGS=
-fi
-
-# Pin the dockcross image since newer versions of the image break the build
-PINNED_DOCKCROSS_IMAGE_VERSION=dockcross/manylinux2014-aarch64:20210803-41e5c69
-
-# running dockcross image without any arguments generates a wrapper
-# scripts that can be used to run commands under the dockcross image
-# easily.
-# See https://github.com/dockcross/dockcross#usage for details
-docker run $DOCKER_TTY_ARGS --rm $PINNED_DOCKCROSS_IMAGE_VERSION >dockcross-manylinux2014-aarch64.sh
-chmod +x dockcross-manylinux2014-aarch64.sh
-
-# the wrapper script has CRLF line endings and bash doesn't like that
-# so we change CRLF line endings into LF.
-sed -i 's/\r//g' dockcross-manylinux2014-aarch64.sh
-
-# The dockcross wrapper script runs arbitrary commands under the selected dockcross
-# image with the following properties which make its use very convenient:
-# * the current working directory is mounted under /work so the container can easily
-#   access the current workspace
-# * the processes in the container run under the same UID and GID as the host process so unlike
-#   vanilla "docker run" invocations, the workspace doesn't get polluted with files
-#   owned by root.
-./dockcross-manylinux2014-aarch64.sh --image $PINNED_DOCKCROSS_IMAGE_VERSION -- "$@"
diff --git a/libs/protobuf/kokoro/linux/aarch64/php_build_and_run_tests_with_qemu_aarch64.sh b/libs/protobuf/kokoro/linux/aarch64/php_build_and_run_tests_with_qemu_aarch64.sh
deleted file mode 100755
index bcb3d9d..0000000
--- a/libs/protobuf/kokoro/linux/aarch64/php_build_and_run_tests_with_qemu_aarch64.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-# Install composer
-curl -sS https://getcomposer.org/installer | php
-mkdir -p "$HOME/bin"
-mv composer.phar "$HOME/bin/composer"
-PATH="$HOME/bin:$PATH"
-
-# go to the repo root
-cd $(dirname $0)/../../..
-
-cd php
-
-composer install
-composer test
-composer test_c
diff --git a/libs/protobuf/kokoro/linux/aarch64/protoc_crosscompile_aarch64.sh b/libs/protobuf/kokoro/linux/aarch64/protoc_crosscompile_aarch64.sh
deleted file mode 100755
index 77942a4..0000000
--- a/libs/protobuf/kokoro/linux/aarch64/protoc_crosscompile_aarch64.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-#
-# Builds protobuf C++ with aarch64 crosscompiler.
-
-set -ex
-
-./autogen.sh
-CXXFLAGS="-fPIC -g -O2" ./configure --host=aarch64
-make -j8
diff --git a/libs/protobuf/kokoro/linux/aarch64/python_crosscompile_aarch64.sh b/libs/protobuf/kokoro/linux/aarch64/python_crosscompile_aarch64.sh
deleted file mode 100755
index db2e776..0000000
--- a/libs/protobuf/kokoro/linux/aarch64/python_crosscompile_aarch64.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash
-#
-# Builds protobuf python including the C++ extension with aarch64 crosscompiler.
-# The outputs of this script are laid out so that we can later test them under an aarch64 emulator.
-# NOTE: This script is expected to run under the dockcross/manylinux2014-aarch64 docker image.
-
-set -ex
-
-PYTHON="/opt/python/cp38-cp38/bin/python"
-
-./autogen.sh
-CXXFLAGS="-fPIC -g -O2" ./configure --host=aarch64
-make -j8
-
-# create a simple shell wrapper that runs crosscompiled protoc under qemu
-echo '#!/bin/bash' >protoc_qemu_wrapper.sh
-echo 'exec qemu-aarch64 "../src/protoc" "$@"' >>protoc_qemu_wrapper.sh
-chmod ugo+x protoc_qemu_wrapper.sh
-
-# PROTOC variable is by build_py step that runs under ./python directory
-export PROTOC=../protoc_qemu_wrapper.sh
-
-pushd python
-
-# NOTE: this step will use protoc_qemu_wrapper.sh to generate protobuf files.
-${PYTHON} setup.py build_py
-
-# when crosscompiling for aarch64, --plat-name needs to be set explicitly
-# to end up with correctly named wheel file
-# the value should be manylinuxABC_ARCH and dockcross docker image
-# conveniently provides the value in the AUDITWHEEL_PLAT env
-plat_name_flag="--plat-name=$AUDITWHEEL_PLAT"
-
-# override the value of EXT_SUFFIX to make sure the crosscompiled .so files in the wheel have the correct filename suffix
-export PROTOCOL_BUFFERS_OVERRIDE_EXT_SUFFIX="$(${PYTHON} -c 'import sysconfig; print(sysconfig.get_config_var("EXT_SUFFIX").replace("-x86_64-linux-gnu.so", "-aarch64-linux-gnu.so"))')"
-
-# Build the python extension inplace to be able to python unittests later
-${PYTHON} setup.py build_ext --cpp_implementation --compile_static_extension --inplace
-
-# Build the binary wheel (to check it with auditwheel)
-${PYTHON} setup.py bdist_wheel --cpp_implementation --compile_static_extension $plat_name_flag
diff --git a/libs/protobuf/kokoro/linux/aarch64/python_run_tests_with_qemu_aarch64.sh b/libs/protobuf/kokoro/linux/aarch64/python_run_tests_with_qemu_aarch64.sh
deleted file mode 100755
index 5026d04..0000000
--- a/libs/protobuf/kokoro/linux/aarch64/python_run_tests_with_qemu_aarch64.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-# go to the repo root
-cd $(dirname $0)/../../..
-cd python
-
-PYTHON="/opt/python/cp38-cp38/bin/python"
-${PYTHON} -m pip install --user pytest auditwheel
-
-# check that we are really using aarch64 python
-(${PYTHON} -c 'import sysconfig; print(sysconfig.get_platform())' | grep -q "linux-aarch64") || (echo "Wrong python platform, needs to be aarch64 python."; exit 1)
-
-# step 1: run all python unittests
-# we've built the python extension previously with --inplace option
-# so we can just discover all the unittests and run them directly under 
-# the python/ directory.
-LD_LIBRARY_PATH=../src/.libs PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=cpp ${PYTHON} -m pytest google/protobuf
-
-# step 2: run auditwheel show to check that the wheel is manylinux2014 compatible.
-# auditwheel needs to run on wheel's target platform (or under an emulator)
-${PYTHON} -m auditwheel show dist/protobuf-*-manylinux2014_aarch64.whl
-
-# step 3: smoketest that the wheel can be installed and run a smokecheck
-${PYTHON} -m pip install dist/protobuf-*-manylinux2014_aarch64.whl
-# when python cpp extension is on, simply importing a message type will trigger loading the cpp extension
-PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=cpp ${PYTHON} -c 'import google.protobuf.timestamp_pb2; print("Successfully loaded the python cpp extension!")'
diff --git a/libs/protobuf/kokoro/linux/aarch64/qemu_helpers/prepare_qemu.sh b/libs/protobuf/kokoro/linux/aarch64/qemu_helpers/prepare_qemu.sh
deleted file mode 100755
index f613202..0000000
--- a/libs/protobuf/kokoro/linux/aarch64/qemu_helpers/prepare_qemu.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-#
-# Setup and configure qemu userspace emulator on kokoro worker so that we can seamlessly emulate processes running
-# inside docker containers.
-
-set -ex
-
-# show pre-existing qemu registration
-cat /proc/sys/fs/binfmt_misc/qemu-aarch64
-
-# Kokoro ubuntu1604 workers have already qemu-user and qemu-user-static packages installed, but it's and old version that:
-# * prints warning about some syscalls (e.g "qemu: Unsupported syscall: 278")
-# * doesn't register with binfmt_misc with the persistent ("F") flag we need (see below)
-#
-# To overcome the above limitations, we use the https://github.com/multiarch/qemu-user-static
-# docker image to provide a new enough version of qemu-user-static and register it with
-# the desired binfmt_misc flags. The most important flag we need is "F" (set by "--persistent yes"),
-# which allows the qemu-aarch64-static binary to be loaded eagerly at the time of registration with binfmt_misc.
-# That way, we can emulate aarch64 binaries running inside docker containers transparently, without needing the emulator
-# binary to be accessible from the docker image we're emulating.
-# Note that on newer distributions (such as glinux), simply "apt install qemu-user-static" is sufficient
-# to install qemu-user-static with the right flags.
-docker run --rm --privileged multiarch/qemu-user-static:5.2.0-2 --reset --credential yes --persistent yes
-
-# Print current qemu reqistration to make sure everything is setup correctly.
-cat /proc/sys/fs/binfmt_misc/qemu-aarch64
diff --git a/libs/protobuf/kokoro/linux/aarch64/ruby_build_and_run_tests_with_qemu_aarch64.sh b/libs/protobuf/kokoro/linux/aarch64/ruby_build_and_run_tests_with_qemu_aarch64.sh
deleted file mode 100755
index dc093bc..0000000
--- a/libs/protobuf/kokoro/linux/aarch64/ruby_build_and_run_tests_with_qemu_aarch64.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-# go to the repo root
-cd $(dirname $0)/../../..
-
-gem install bundler
-
-cd ruby
-
-bundle
-rake
-rake clobber_package gem
-
-# run all the tests
-rake test
diff --git a/libs/protobuf/kokoro/linux/aarch64/test_cpp_aarch64.sh b/libs/protobuf/kokoro/linux/aarch64/test_cpp_aarch64.sh
deleted file mode 100755
index 26f95f3..0000000
--- a/libs/protobuf/kokoro/linux/aarch64/test_cpp_aarch64.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-#
-# Crosscompiles protobuf C++ under dockcross docker image and runs the tests under an emulator.
-
-set -e
-
-# go to the repo root
-cd $(dirname $0)/../../..
-
-# Initialize any submodules.
-git submodule update --init --recursive
-
-# run the C++ build and test script under dockcross/linux-arm64 image
-kokoro/linux/aarch64/dockcross_helpers/run_dockcross_linux_aarch64.sh kokoro/linux/aarch64/cpp_crosscompile_and_run_tests_with_qemu_aarch64.sh
diff --git a/libs/protobuf/kokoro/linux/aarch64/test_csharp_aarch64.sh b/libs/protobuf/kokoro/linux/aarch64/test_csharp_aarch64.sh
deleted file mode 100755
index cc3bffe..0000000
--- a/libs/protobuf/kokoro/linux/aarch64/test_csharp_aarch64.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-# go to the repo root
-cd $(dirname $0)/../../..
-
-if [[ -t 0 ]]; then
-  DOCKER_TTY_ARGS="-it"
-else
-  # The input device on kokoro is not a TTY, so -it does not work.
-  DOCKER_TTY_ARGS=
-fi
-
-# First, build protobuf C# tests under x86_64 docker image
-# Tests are built "dotnet publish" because we want all the dependencies to the copied to the destination directory
-# (we want to avoid references to ~/.nuget that won't be available in the subsequent docker run)
-CSHARP_BUILD_COMMAND="dotnet publish -c Release -f net60 csharp/src/Google.Protobuf.Test/Google.Protobuf.Test.csproj"
-docker run $DOCKER_TTY_ARGS --rm --user "$(id -u):$(id -g)" -e "HOME=/home/fake-user" -e "DOTNET_CLI_TELEMETRY_OPTOUT=true" -e "DOTNET_SKIP_FIRST_TIME_EXPERIENCE=true" -v "$(mktemp -d):/home/fake-user" -v "$(pwd)":/work -w /work mcr.microsoft.com/dotnet/sdk:6.0.100-bullseye-slim bash -c "$CSHARP_BUILD_COMMAND"
-
-# Use an actual aarch64 docker image to run protobuf C# tests with an emulator. "dotnet vstest" allows
-# running tests from a pre-built project.
-# * mount the protobuf root as /work to be able to access the crosscompiled files
-# * to avoid running the process inside docker as root (which can pollute the workspace with files owned by root), we force
-#   running under current user's UID and GID. To be able to do that, we need to provide a home directory for the user
-#   otherwise the UID would be homeless under the docker container and pip install wouldn't work. For simplicity,
-#   we just run map the user's home to a throwaway temporary directory
-CSHARP_TEST_COMMAND="dotnet vstest csharp/src/Google.Protobuf.Test/bin/Release/net60/publish/Google.Protobuf.Test.dll"
-docker run $DOCKER_TTY_ARGS --rm --user "$(id -u):$(id -g)" -e "HOME=/home/fake-user" -e "DOTNET_CLI_TELEMETRY_OPTOUT=true" -e "DOTNET_SKIP_FIRST_TIME_EXPERIENCE=true" -v "$(mktemp -d):/home/fake-user" -v "$(pwd)":/work -w /work mcr.microsoft.com/dotnet/sdk:6.0.100-bullseye-slim-arm64v8 bash -c "$CSHARP_TEST_COMMAND"
diff --git a/libs/protobuf/kokoro/linux/aarch64/test_java_aarch64.sh b/libs/protobuf/kokoro/linux/aarch64/test_java_aarch64.sh
deleted file mode 100755
index a806659..0000000
--- a/libs/protobuf/kokoro/linux/aarch64/test_java_aarch64.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-# go to the repo root
-cd $(dirname $0)/../../..
-
-if [[ -t 0 ]]; then
-  DOCKER_TTY_ARGS="-it"
-else
-  # The input device on kokoro is not a TTY, so -it does not work.
-  DOCKER_TTY_ARGS=
-fi
-
-# crosscompile protoc as we will later need it for the java build.
-# we build it under the dockcross/manylinux2014-aarch64 image so that the resulting protoc binary is compatible
-# with a wide range of linux distros (including any docker images we will use later to build and test java)
-kokoro/linux/aarch64/dockcross_helpers/run_dockcross_manylinux2014_aarch64.sh kokoro/linux/aarch64/protoc_crosscompile_aarch64.sh
-
-# the command that will be used to build and test java under an emulator
-# * IsValidUtf8Test and DecodeUtf8Test tests are skipped because they take very long under an emulator.
-TEST_JAVA_COMMAND="mvn --batch-mode -DskipTests install && mvn --batch-mode -Dtest='**/*Test, !**/*IsValidUtf8Test, !**/*DecodeUtf8Test' -DfailIfNoTests=false -Dsurefire.failIfNoSpecifiedTests=false surefire:test"
-
-# use an actual aarch64 docker image (with a real aarch64 java and maven) to run build & test protobuf java under an emulator
-# * mount the protobuf root as /work to be able to access the crosscompiled files
-# * to avoid running the process inside docker as root (which can pollute the workspace with files owned by root), we force
-#   running under current user's UID and GID. To be able to do that, we need to provide a home directory for the user
-#   otherwise the UID would be homeless under the docker container and pip install wouldn't work. For simplicity,
-#   we just run map the user's home to a throwaway temporary directory
-# * the JAVA_OPTS and MAVEN_CONFIG variables are being set mostly to silence warnings about non-existent home directory
-#   and to avoid polluting the workspace.
-docker run $DOCKER_TTY_ARGS --rm --user "$(id -u):$(id -g)" -e "HOME=/home/fake-user" -e "JAVA_OPTS=-Duser.home=/home/fake-user" -e "MAVEN_CONFIG=/home/fake-user/.m2" -v "$(mktemp -d):/home/fake-user" -v "$(pwd)":/work -w /work arm64v8/maven:3.8-openjdk-11 bash -c "cd java && $TEST_JAVA_COMMAND"
diff --git a/libs/protobuf/kokoro/linux/aarch64/test_php_aarch64.sh b/libs/protobuf/kokoro/linux/aarch64/test_php_aarch64.sh
deleted file mode 100755
index b11ef43..0000000
--- a/libs/protobuf/kokoro/linux/aarch64/test_php_aarch64.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-# go to the repo root
-cd $(dirname $0)/../../..
-
-# there is no php testing docker image readily available, so we build
-# our own. It's a aarch64 image, but that's fine since qemu will
-# automatically be used to run the commands in the dockerfile.
-docker build -t testimage_protobuf_php_arm64v8 kokoro/linux/aarch64/testimage_protobuf_php_arm64v8
-
-if [[ -t 0 ]]; then
-  DOCKER_TTY_ARGS="-it"
-else
-  # The input device on kokoro is not a TTY, so -it does not work.
-  DOCKER_TTY_ARGS=
-fi
-
-# crosscompile protoc as we will later need it for the php build.
-# we build it under the dockcross/manylinux2014-aarch64 image so that the resulting protoc binary is compatible
-# with a wide range of linux distros (including any docker images we will use later to build and test php)
-kokoro/linux/aarch64/dockcross_helpers/run_dockcross_manylinux2014_aarch64.sh kokoro/linux/aarch64/protoc_crosscompile_aarch64.sh
-
-# use an actual aarch64 docker image (with a real aarch64 php) to run build & test protobuf php under an emulator
-# * mount the protobuf root as /work to be able to access the crosscompiled files
-# * to avoid running the process inside docker as root (which can pollute the workspace with files owned by root), we force
-#   running under current user's UID and GID. To be able to do that, we need to provide a home directory for the user
-#   otherwise the UID would be homeless under the docker container and pip install wouldn't work. For simplicity,
-#   we just run map the user's home to a throwaway temporary directory
-docker run $DOCKER_TTY_ARGS --rm --user "$(id -u):$(id -g)" -e "HOME=/home/fake-user" -v "$(mktemp -d):/home/fake-user" -v "$(pwd)":/work -w /work testimage_protobuf_php_arm64v8 kokoro/linux/aarch64/php_build_and_run_tests_with_qemu_aarch64.sh
diff --git a/libs/protobuf/kokoro/linux/aarch64/test_python_aarch64.sh b/libs/protobuf/kokoro/linux/aarch64/test_python_aarch64.sh
deleted file mode 100755
index 1e2d570..0000000
--- a/libs/protobuf/kokoro/linux/aarch64/test_python_aarch64.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# go to the repo root
-cd $(dirname $0)/../../..
-
-if [[ -t 0 ]]; then
-  DOCKER_TTY_ARGS="-it"
-else
-  # The input device on kokoro is not a TTY, so -it does not work.
-  DOCKER_TTY_ARGS=
-fi
-
-# crosscompile python extension and the binary wheel under dockcross/manylinux2014-aarch64 image
-kokoro/linux/aarch64/dockcross_helpers/run_dockcross_manylinux2014_aarch64.sh kokoro/linux/aarch64/python_crosscompile_aarch64.sh
-
-# once crosscompilation is done, use an actual aarch64 docker image (with a real aarch64 python) to run all the tests under an emulator
-# * mount the protobuf root as /work to be able to access the crosscompiled files
-# * intentionally use a different image than manylinux2014 so that we don't build and test on the same linux distribution
-#   (manylinux_2_24 is debian-based while manylinux2014 is centos-based)
-# * to avoid running the process inside docker as root (which can pollute the workspace with files owned by root), we force
-#   running under current user's UID and GID. To be able to do that, we need to provide a home directory for the user
-#   otherwise the UID would be homeless under the docker container and pip install wouldn't work. For simplicity,
-#   we just run map the user's home to a throwaway temporary directory
-docker run $DOCKER_TTY_ARGS --rm --user "$(id -u):$(id -g)" -e "HOME=/home/fake-user" -v "$(mktemp -d):/home/fake-user" -v "$(pwd)":/work -w /work quay.io/pypa/manylinux_2_24_aarch64 kokoro/linux/aarch64/python_run_tests_with_qemu_aarch64.sh
diff --git a/libs/protobuf/kokoro/linux/aarch64/test_ruby_aarch64.sh b/libs/protobuf/kokoro/linux/aarch64/test_ruby_aarch64.sh
deleted file mode 100755
index 91ee5f2..0000000
--- a/libs/protobuf/kokoro/linux/aarch64/test_ruby_aarch64.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-# go to the repo root
-cd $(dirname $0)/../../..
-
-if [[ -t 0 ]]; then
-  DOCKER_TTY_ARGS="-it"
-else
-  # The input device on kokoro is not a TTY, so -it does not work.
-  DOCKER_TTY_ARGS=
-fi
-
-# crosscompile protoc as we will later need it for the ruby build.
-# we build it under the dockcross/manylinux2014-aarch64 image so that the resulting protoc binary is compatible
-# with a wide range of linux distros (including any docker images we will use later to build and test ruby)
-kokoro/linux/aarch64/dockcross_helpers/run_dockcross_manylinux2014_aarch64.sh kokoro/linux/aarch64/protoc_crosscompile_aarch64.sh
-
-# use an actual aarch64 docker image (with a real aarch64 ruby) to run build & test protobuf ruby under an emulator
-# * mount the protobuf root as /work to be able to access the crosscompiled files
-# * to avoid running the process inside docker as root (which can pollute the workspace with files owned by root), we force
-#   running under current user's UID and GID. To be able to do that, we need to provide a home directory for the user
-#   otherwise the UID would be homeless under the docker container and pip install wouldn't work. For simplicity,
-#   we just run map the user's home to a throwaway temporary directory
-
-docker run $DOCKER_TTY_ARGS --rm --user "$(id -u):$(id -g)" -e "HOME=/home/fake-user" -v "$(mktemp -d):/home/fake-user" -v "$(pwd)":/work -w /work arm64v8/ruby:2.7.3-buster kokoro/linux/aarch64/ruby_build_and_run_tests_with_qemu_aarch64.sh
\ No newline at end of file
diff --git a/libs/protobuf/kokoro/linux/aarch64/testimage_protobuf_php_arm64v8/Dockerfile b/libs/protobuf/kokoro/linux/aarch64/testimage_protobuf_php_arm64v8/Dockerfile
deleted file mode 100644
index eae1bbc..0000000
--- a/libs/protobuf/kokoro/linux/aarch64/testimage_protobuf_php_arm64v8/Dockerfile
+++ /dev/null
@@ -1,3 +0,0 @@
-FROM arm64v8/debian:buster
-
-RUN apt-get update && apt-get install -y php7.3-cli php7.3-dev php7.3-bcmath composer phpunit curl git valgrind && apt-get clean
diff --git a/libs/protobuf/kokoro/linux/bazel/build.sh b/libs/protobuf/kokoro/linux/bazel/build.sh
deleted file mode 100755
index a338a99..0000000
--- a/libs/protobuf/kokoro/linux/bazel/build.sh
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/bash
-#
-# Build file to set up and run tests
-set -ex
-
-# Install Bazel 4.0.0.
-use_bazel.sh 4.0.0
-bazel version
-
-# Print bazel testlogs to stdout when tests failed.
-function print_test_logs {
-  # TODO(yannic): Only print logs of failing tests.
-  testlogs_dir=$(bazel info bazel-testlogs)
-  testlogs=$(find "${testlogs_dir}" -name "*.log")
-  for log in $testlogs; do
-    cat "${log}"
-  done
-}
-
-# Change to repo root
-cd $(dirname $0)/../../..
-
-git submodule update --init --recursive
-
-#  Disabled for now, re-enable if appropriate.
-#  //:build_files_updated_unittest \
-
-trap print_test_logs EXIT
-bazel test -k --copt=-Werror --host_copt=-Werror \
-  //build_defs:all \
-  //java:tests \
-  //:protoc \
-  //:protobuf \
-  //:protobuf_python \
-  //:protobuf_test
-trap - EXIT
-
-pushd examples
-bazel build //...
-popd
-
-# Verify that we can build successfully from generated tar files.
-./autogen.sh && ./configure && make -j$(nproc) dist
-DIST=`ls *.tar.gz`
-tar -xf $DIST
-cd ${DIST//.tar.gz}
-bazel build //:protobuf //:protobuf_java
diff --git a/libs/protobuf/kokoro/linux/bazel/continuous.cfg b/libs/protobuf/kokoro/linux/bazel/continuous.cfg
deleted file mode 100644
index 13cfef1..0000000
--- a/libs/protobuf/kokoro/linux/bazel/continuous.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/bazel/build.sh"
-timeout_mins: 15
diff --git a/libs/protobuf/kokoro/linux/bazel/presubmit.cfg b/libs/protobuf/kokoro/linux/bazel/presubmit.cfg
deleted file mode 100644
index 13cfef1..0000000
--- a/libs/protobuf/kokoro/linux/bazel/presubmit.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/bazel/build.sh"
-timeout_mins: 15
diff --git a/libs/protobuf/kokoro/linux/bazel_distcheck/build.sh b/libs/protobuf/kokoro/linux/bazel_distcheck/build.sh
deleted file mode 100755
index 4eb6e11..0000000
--- a/libs/protobuf/kokoro/linux/bazel_distcheck/build.sh
+++ /dev/null
@@ -1,87 +0,0 @@
-#!/bin/bash
-#
-# Build file to set up and run tests using bazel-build dist archive
-#
-# Note that the builds use WORKSPACE to fetch external sources, not
-# git submodules.
-
-set -eux
-
-BUILD_ONLY_TARGETS=(
-  //pkg:all
-  //:protoc
-  //:protobuf
-  //:protobuf_python
-)
-
-TEST_TARGETS=(
-  //build_defs:all
-  //conformance:all
-  //java:tests
-  //:protobuf_test
-)
-
-use_bazel.sh 5.0.0 || true
-bazel version
-
-# Change to repo root
-cd $(dirname $0)/../../..
-
-# Construct temp directory for running the dist build.
-# If you want to run locally and keep the build dir, create a directory
-# and pass it in the DIST_WORK_ROOT env var.
-if [[ -z ${DIST_WORK_ROOT:-} ]]; then
-  : ${DIST_WORK_ROOT:=$(mktemp -d)}
-  function dist_cleanup() {
-    rm -rf ${DIST_WORK_ROOT}
-  }
-  trap dist_cleanup EXIT
-fi
-
-# Let Bazel share the distdir.
-TMP_DISTDIR=${DIST_WORK_ROOT}/bazel-distdir
-mkdir -p ${TMP_DISTDIR}
-
-# Build distribution archive
-date
-bazel fetch --distdir=${TMP_DISTDIR} //pkg:dist_all_tar
-bazel build --distdir=${TMP_DISTDIR} //pkg:dist_all_tar
-DIST_ARCHIVE=$(readlink $(bazel info bazel-bin)/pkg/dist_all_tar.tar.gz)
-bazel shutdown
-
-# The `pkg_tar` rule emits a symlink based on the rule name. The actual
-# file is named with the current version.
-date
-echo "Resolved archive path: ${DIST_ARCHIVE}"
-
-# Extract the dist archive.
-date
-DIST_WORKSPACE=${DIST_WORK_ROOT}/protobuf
-mkdir -p ${DIST_WORKSPACE}
-tar -C ${DIST_WORKSPACE} --strip-components=1 -axf ${DIST_ARCHIVE}
-
-# Perform build steps in the extracted dist sources.
-
-cd ${DIST_WORKSPACE}
-FAILED=false
-
-date
-bazel fetch --distdir=${TMP_DISTDIR} "${BUILD_ONLY_TARGETS[@]}" "${TEST_TARGETS[@]}"
-
-date
-bazel build --distdir=${TMP_DISTDIR} -k \
-  "${BUILD_ONLY_TARGETS[@]}" || FAILED=true
-
-date
-bazel test --distdir=${TMP_DISTDIR} --test_output=errors -k \
-  "${TEST_TARGETS[@]}" || FAILED=true
-
-date
-cd examples
-bazel build --distdir=${TMP_DISTDIR} //... || FAILED=true
-
-if ${FAILED}; then
-   echo FAILED
-   exit 1
-fi
-echo PASS
diff --git a/libs/protobuf/kokoro/linux/bazel_distcheck/continuous.cfg b/libs/protobuf/kokoro/linux/bazel_distcheck/continuous.cfg
deleted file mode 100644
index 4ea8b21..0000000
--- a/libs/protobuf/kokoro/linux/bazel_distcheck/continuous.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/bazel_distcheck/build.sh"
-timeout_mins: 15
diff --git a/libs/protobuf/kokoro/linux/bazel_distcheck/presubmit.cfg b/libs/protobuf/kokoro/linux/bazel_distcheck/presubmit.cfg
deleted file mode 100644
index 4ea8b21..0000000
--- a/libs/protobuf/kokoro/linux/bazel_distcheck/presubmit.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/bazel_distcheck/build.sh"
-timeout_mins: 15
diff --git a/libs/protobuf/kokoro/linux/benchmark/build.sh b/libs/protobuf/kokoro/linux/benchmark/build.sh
deleted file mode 100755
index f470989..0000000
--- a/libs/protobuf/kokoro/linux/benchmark/build.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-#
-# This is the top-level script we give to Kokoro as the entry point for
-# running the "pull request" project:
-#
-# This script selects a specific Dockerfile (for building a Docker image) and
-# a script to run inside that image.  Then we delegate to the general
-# build_and_run_docker.sh script.
-
-# Change to repo root
-cd $(dirname $0)/../../..
-
-export DOCKERHUB_ORGANIZATION=protobuftesting
-export DOCKERFILE_DIR=kokoro/linux/dockerfile/test/java_stretch
-export DOCKER_RUN_SCRIPT=kokoro/linux/pull_request_in_docker.sh
-export OUTPUT_DIR=testoutput
-export TEST_SET="benchmark"
-./kokoro/linux/build_and_run_docker.sh
diff --git a/libs/protobuf/kokoro/linux/benchmark/continuous.cfg b/libs/protobuf/kokoro/linux/benchmark/continuous.cfg
deleted file mode 100644
index 8cc8f96..0000000
--- a/libs/protobuf/kokoro/linux/benchmark/continuous.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/benchmark/build.sh"
-timeout_mins: 240
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.xml"
-  }
-}
diff --git a/libs/protobuf/kokoro/linux/benchmark/run.sh b/libs/protobuf/kokoro/linux/benchmark/run.sh
deleted file mode 100755
index 963f779..0000000
--- a/libs/protobuf/kokoro/linux/benchmark/run.sh
+++ /dev/null
@@ -1,99 +0,0 @@
-#!/bin/bash
-#
-# Change to repo root
-cd $(dirname $0)/../../..
-
-set -ex
-
-export OUTPUT_DIR=testoutput
-repo_root="$(pwd)"
-
-# TODO(jtattermusch): Add back support for benchmarking with tcmalloc for C++ and python.
-# This feature was removed since it used to use tcmalloc from https://github.com/gperftools/gperftools.git
-# which is very outdated. See https://github.com/protocolbuffers/protobuf/issues/8725.
-
-# download datasets for benchmark
-pushd benchmarks
-datasets=$(for file in $(find . -type f -name "dataset.*.pb" -not -path "./tmp/*"); do echo "$(pwd)/$file"; done | xargs)
-echo $datasets
-popd
-
-# build Python protobuf
-./autogen.sh
-./configure CXXFLAGS="-fPIC -O2"
-make -j8
-pushd python
-python3 -m venv env
-source env/bin/activate
-python3 setup.py build --cpp_implementation
-pip3 install --install-option="--cpp_implementation" .
-popd
-
-# build and run Python benchmark
-# We do this before building protobuf C++ since C++ build
-# will rewrite some libraries used by protobuf python.
-pushd benchmarks
-make python-pure-python-benchmark
-make python-cpp-reflection-benchmark
-make -j8 python-cpp-generated-code-benchmark
-echo "[" > tmp/python_result.json
-echo "benchmarking pure python..."
-./python-pure-python-benchmark --json --behavior_prefix="pure-python-benchmark" $datasets  >> tmp/python_result.json
-echo "," >> "tmp/python_result.json"
-echo "benchmarking python cpp reflection..."
-env LD_LIBRARY_PATH="${repo_root}/src/.libs" ./python-cpp-reflection-benchmark --json --behavior_prefix="cpp-reflection-benchmark" $datasets  >> tmp/python_result.json
-echo "," >> "tmp/python_result.json"
-echo "benchmarking python cpp generated code..."
-env LD_LIBRARY_PATH="${repo_root}/src/.libs" ./python-cpp-generated-code-benchmark --json --behavior_prefix="cpp-generated-code-benchmark" $datasets >> tmp/python_result.json
-echo "]" >> "tmp/python_result.json"
-popd
-
-# build CPP protobuf
-./configure
-make clean && make -j8
-
-pushd java
-mvn package -B -Dmaven.test.skip=true
-popd
-
-pushd benchmarks
-
-# build and run C++ benchmark
-# "make clean" deletes the contents of the tmp/ directory, so we move it elsewhere and then restore it once build is done.
-# TODO(jtattermusch): find a less clumsy way of protecting python_result.json contents
-mv tmp/python_result.json . && make clean && make -j8 cpp-benchmark && mv python_result.json tmp
-echo "benchmarking cpp..."
-env ./cpp-benchmark --benchmark_min_time=5.0 --benchmark_out_format=json --benchmark_out="tmp/cpp_result.json" $datasets
-
-# TODO(jtattermusch): add benchmarks for https://github.com/protocolbuffers/protobuf-go.
-# The original benchmarks for https://github.com/golang/protobuf were removed
-# because:
-# * they were broken and haven't been producing results for a long time
-# * the https://github.com/golang/protobuf implementation has been superseded by
-#   https://github.com/protocolbuffers/protobuf-go
-
-# build and run java benchmark (java 11 is required)
-make java-benchmark
-echo "benchmarking java..."
-./java-benchmark -Cresults.file.options.file="tmp/java_result.json" $datasets
-
-# TODO(jtattermusch): re-enable JS benchmarks once https://github.com/protocolbuffers/protobuf/issues/8747 is fixed.
-# build and run js benchmark
-# make js-benchmark
-# echo "benchmarking js..."
-# ./js-benchmark $datasets  --json_output=$(pwd)/tmp/node_result.json
-
-# TODO(jtattermusch): add php-c-benchmark. Currently its build is broken.
-
-# persist raw the results in the build job log (for better debuggability)
-cat tmp/cpp_result.json
-cat tmp/java_result.json
-cat tmp/python_result.json
-
-# print the postprocessed results to the build job log
-# TODO(jtattermusch): re-enable uploading results to bigquery (it is currently broken)
-make python_add_init
-env LD_LIBRARY_PATH="${repo_root}/src/.libs" python3 -m util.result_parser \
-	-cpp="../tmp/cpp_result.json" -java="../tmp/java_result.json" -python="../tmp/python_result.json"
-popd
-
diff --git a/libs/protobuf/kokoro/linux/build_and_run_docker.sh b/libs/protobuf/kokoro/linux/build_and_run_docker.sh
deleted file mode 100755
index cdbd6e2..0000000
--- a/libs/protobuf/kokoro/linux/build_and_run_docker.sh
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/bin/bash
-#
-# Builds docker image and runs a command under it.
-# This is a generic script that is configured with the following variables:
-#
-# DOCKERHUB_ORGANIZATION - The organization on docker hub storing the
-# Dockerfile.
-# DOCKERFILE_DIR - Directory in which Dockerfile file is located.
-# DOCKER_RUN_SCRIPT - Script to run under docker (relative to protobuf repo root)
-# OUTPUT_DIR - Directory that will be copied from inside docker after finishing.
-# $@ - Extra args to pass to docker run
-
-set -ex
-
-cd $(dirname $0)/../..
-git_root=$(pwd)
-cd -
-
-# Use image name based on Dockerfile sha1
-if [ -z "$DOCKERHUB_ORGANIZATION" ]
-then
-  DOCKERHUB_ORGANIZATION=grpctesting/protobuf
-  DOCKER_IMAGE_NAME=${DOCKERHUB_ORGANIZATION}_$(sha1sum $DOCKERFILE_DIR/Dockerfile | cut -f1 -d\ )
-else
-  # TODO(teboring): Remove this when all tests have been migrated to separate
-  # docker images.
-  DOCKERFILE_PREFIX=$(basename $DOCKERFILE_DIR)
-  DOCKER_IMAGE_NAME=${DOCKERHUB_ORGANIZATION}/${DOCKERFILE_PREFIX}_$(sha1sum $DOCKERFILE_DIR/Dockerfile | cut -f1 -d\ )
-fi
-
-# Pull dockerimage from Dockerhub. This sometimes fails intermittently, so we
-# keep trying until we succeed.
-until docker pull $DOCKER_IMAGE_NAME; do sleep 10; done
-
-# Ensure existence of ccache directory
-CCACHE_DIR=/tmp/protobuf-ccache
-mkdir -p $CCACHE_DIR
-
-# Choose random name for docker container
-CONTAINER_NAME="build_and_run_docker_$(uuidgen)"
-
-echo $git_root
-
-# Run command inside docker
-docker run \
-  "$@" \
-  -e CCACHE_DIR=$CCACHE_DIR \
-  -e KOKORO_BUILD_NUMBER=$KOKORO_BUILD_NUMBER \
-  -e KOKORO_BUILD_ID=$KOKORO_BUILD_ID \
-  -e EXTERNAL_GIT_ROOT="/var/local/kokoro/protobuf" \
-  -e TEST_SET="$TEST_SET" \
-  -v "$git_root:/var/local/kokoro/protobuf:ro" \
-  -v $CCACHE_DIR:$CCACHE_DIR \
-  -w /var/local/git/protobuf \
-  --name=$CONTAINER_NAME \
-  $DOCKER_IMAGE_NAME \
-  bash -l "/var/local/kokoro/protobuf/$DOCKER_RUN_SCRIPT" || FAILED="true"
-
-# remove the container, possibly killing it first
-docker rm -f $CONTAINER_NAME || true
-
-[ -z "$FAILED" ] || {
-  exit 1
-}
diff --git a/libs/protobuf/kokoro/linux/cpp_aarch64/build.sh b/libs/protobuf/kokoro/linux/cpp_aarch64/build.sh
deleted file mode 100755
index a43ab1c..0000000
--- a/libs/protobuf/kokoro/linux/cpp_aarch64/build.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-#
-# This is the top-level script we give to Kokoro as the entry point for
-# running the "continuous" and "presubmit" jobs.
-
-set -ex
-
-# Change to repo root
-cd $(dirname $0)/../../..
-
-kokoro/linux/aarch64/test_cpp_aarch64.sh
diff --git a/libs/protobuf/kokoro/linux/cpp_aarch64/continuous.cfg b/libs/protobuf/kokoro/linux/cpp_aarch64/continuous.cfg
deleted file mode 100644
index 0f1be4a..0000000
--- a/libs/protobuf/kokoro/linux/cpp_aarch64/continuous.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/cpp_aarch64/build.sh"
-timeout_mins: 120
diff --git a/libs/protobuf/kokoro/linux/cpp_aarch64/presubmit.cfg b/libs/protobuf/kokoro/linux/cpp_aarch64/presubmit.cfg
deleted file mode 100644
index 0f1be4a..0000000
--- a/libs/protobuf/kokoro/linux/cpp_aarch64/presubmit.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/cpp_aarch64/build.sh"
-timeout_mins: 120
diff --git a/libs/protobuf/kokoro/linux/cpp_distcheck/build.sh b/libs/protobuf/kokoro/linux/cpp_distcheck/build.sh
deleted file mode 100755
index a28843e..0000000
--- a/libs/protobuf/kokoro/linux/cpp_distcheck/build.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-#
-# Build file to set up and run tests
-
-set -ex  # exit immediately on error
-
-# Change to repo root
-cd $(dirname $0)/../../..
-
-./tests.sh cpp_distcheck
-
-# Run tests under release docker image.
-DOCKER_IMAGE_NAME=protobuf/protoc_$(sha1sum protoc-artifacts/Dockerfile | cut -f1 -d " ")
-until docker pull $DOCKER_IMAGE_NAME; do sleep 10; done
-
-docker run -v $(pwd):/var/local/protobuf --rm $DOCKER_IMAGE_NAME \
-  bash -l /var/local/protobuf/tests.sh cpp || FAILED="true"
-
-# This directory is owned by root. We need to delete it, because otherwise
-# Kokoro will attempt to rsync it and fail with a permission error.
-rm -rf src/core
-
-if [ "$FAILED" = "true" ]; then
-  exit 1
-fi
diff --git a/libs/protobuf/kokoro/linux/cpp_distcheck/continuous.cfg b/libs/protobuf/kokoro/linux/cpp_distcheck/continuous.cfg
deleted file mode 100644
index 4289f6a..0000000
--- a/libs/protobuf/kokoro/linux/cpp_distcheck/continuous.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/cpp_distcheck/build.sh"
-timeout_mins: 1440
diff --git a/libs/protobuf/kokoro/linux/cpp_distcheck/presubmit.cfg b/libs/protobuf/kokoro/linux/cpp_distcheck/presubmit.cfg
deleted file mode 100644
index 4289f6a..0000000
--- a/libs/protobuf/kokoro/linux/cpp_distcheck/presubmit.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/cpp_distcheck/build.sh"
-timeout_mins: 1440
diff --git a/libs/protobuf/kokoro/linux/cpp_tcmalloc/build.sh b/libs/protobuf/kokoro/linux/cpp_tcmalloc/build.sh
deleted file mode 100755
index 3c77b11..0000000
--- a/libs/protobuf/kokoro/linux/cpp_tcmalloc/build.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-#
-# Build file to set up and run tests
-
-# Change to repo root
-cd $(dirname $0)/../../..
-
-export DOCKERHUB_ORGANIZATION=protobuftesting
-export DOCKERFILE_DIR=kokoro/linux/dockerfile/test/cpp_tcmalloc
-export DOCKER_RUN_SCRIPT=kokoro/linux/pull_request_in_docker.sh
-export OUTPUT_DIR=testoutput
-export TEST_SET="cpp_tcmalloc"
-./kokoro/linux/build_and_run_docker.sh
diff --git a/libs/protobuf/kokoro/linux/cpp_tcmalloc/continuous.cfg b/libs/protobuf/kokoro/linux/cpp_tcmalloc/continuous.cfg
deleted file mode 100644
index 46312a9..0000000
--- a/libs/protobuf/kokoro/linux/cpp_tcmalloc/continuous.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/cpp_tcmalloc/build.sh"
-timeout_mins: 1440
diff --git a/libs/protobuf/kokoro/linux/cpp_tcmalloc/presubmit.cfg b/libs/protobuf/kokoro/linux/cpp_tcmalloc/presubmit.cfg
deleted file mode 100644
index 46312a9..0000000
--- a/libs/protobuf/kokoro/linux/cpp_tcmalloc/presubmit.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/cpp_tcmalloc/build.sh"
-timeout_mins: 1440
diff --git a/libs/protobuf/kokoro/linux/csharp/build.sh b/libs/protobuf/kokoro/linux/csharp/build.sh
deleted file mode 100755
index 9a2eb48..0000000
--- a/libs/protobuf/kokoro/linux/csharp/build.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-#
-# This is the top-level script we give to Kokoro as the entry point for
-# running the "pull request" project:
-#
-# This script selects a specific Dockerfile (for building a Docker image) and
-# a script to run inside that image.  Then we delegate to the general
-# build_and_run_docker.sh script.
-
-# Change to repo root
-cd $(dirname $0)/../../..
-
-export DOCKERHUB_ORGANIZATION=protobuftesting
-export DOCKERFILE_DIR=kokoro/linux/dockerfile/test/csharp
-export DOCKER_RUN_SCRIPT=kokoro/linux/pull_request_in_docker.sh
-export OUTPUT_DIR=testoutput
-export TEST_SET="csharp"
-./kokoro/linux/build_and_run_docker.sh
diff --git a/libs/protobuf/kokoro/linux/csharp/continuous.cfg b/libs/protobuf/kokoro/linux/csharp/continuous.cfg
deleted file mode 100644
index 3d17767..0000000
--- a/libs/protobuf/kokoro/linux/csharp/continuous.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/csharp/build.sh"
-timeout_mins: 1440
diff --git a/libs/protobuf/kokoro/linux/csharp/presubmit.cfg b/libs/protobuf/kokoro/linux/csharp/presubmit.cfg
deleted file mode 100644
index 3d17767..0000000
--- a/libs/protobuf/kokoro/linux/csharp/presubmit.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/csharp/build.sh"
-timeout_mins: 1440
diff --git a/libs/protobuf/kokoro/linux/csharp_aarch64/build.sh b/libs/protobuf/kokoro/linux/csharp_aarch64/build.sh
deleted file mode 100755
index db3fc21..0000000
--- a/libs/protobuf/kokoro/linux/csharp_aarch64/build.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-#
-# This is the top-level script we give to Kokoro as the entry point for
-# running the "continuous" and "presubmit" jobs.
-
-set -ex
-
-# Change to repo root
-cd $(dirname $0)/../../..
-
-# Initialize any submodules.
-git submodule update --init --recursive
-
-kokoro/linux/aarch64/qemu_helpers/prepare_qemu.sh
-
-kokoro/linux/aarch64/test_csharp_aarch64.sh
diff --git a/libs/protobuf/kokoro/linux/csharp_aarch64/continuous.cfg b/libs/protobuf/kokoro/linux/csharp_aarch64/continuous.cfg
deleted file mode 100644
index df28ef3..0000000
--- a/libs/protobuf/kokoro/linux/csharp_aarch64/continuous.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/csharp_aarch64/build.sh"
-timeout_mins: 120
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.xml"
-  }
-}
diff --git a/libs/protobuf/kokoro/linux/csharp_aarch64/presubmit.cfg b/libs/protobuf/kokoro/linux/csharp_aarch64/presubmit.cfg
deleted file mode 100644
index df28ef3..0000000
--- a/libs/protobuf/kokoro/linux/csharp_aarch64/presubmit.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/csharp_aarch64/build.sh"
-timeout_mins: 120
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.xml"
-  }
-}
diff --git a/libs/protobuf/kokoro/linux/dist_install/build.sh b/libs/protobuf/kokoro/linux/dist_install/build.sh
deleted file mode 100755
index c456ee8..0000000
--- a/libs/protobuf/kokoro/linux/dist_install/build.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-#
-# Build file to set up and run tests
-
-set -ex  # exit immediately on error
-
-# Change to repo root
-cd $(dirname $0)/../../..
-
-export DOCKERHUB_ORGANIZATION=protobuftesting
-export DOCKERFILE_DIR=kokoro/linux/dockerfile/test/java_stretch
-export DOCKER_RUN_SCRIPT=kokoro/linux/pull_request_in_docker.sh
-export OUTPUT_DIR=testoutput
-export TEST_SET="dist_install"
-./kokoro/linux/build_and_run_docker.sh
diff --git a/libs/protobuf/kokoro/linux/dist_install/continuous.cfg b/libs/protobuf/kokoro/linux/dist_install/continuous.cfg
deleted file mode 100644
index b1e0b20..0000000
--- a/libs/protobuf/kokoro/linux/dist_install/continuous.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/dist_install/build.sh"
-timeout_mins: 1440
diff --git a/libs/protobuf/kokoro/linux/dist_install/presubmit.cfg b/libs/protobuf/kokoro/linux/dist_install/presubmit.cfg
deleted file mode 100644
index b1e0b20..0000000
--- a/libs/protobuf/kokoro/linux/dist_install/presubmit.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/dist_install/build.sh"
-timeout_mins: 1440
diff --git a/libs/protobuf/kokoro/linux/dockerfile/push_testing_images.sh b/libs/protobuf/kokoro/linux/dockerfile/push_testing_images.sh
deleted file mode 100755
index 2d82bab..0000000
--- a/libs/protobuf/kokoro/linux/dockerfile/push_testing_images.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-cd $(dirname $0)/../../..
-git_root=$(pwd)
-cd kokoro/linux/dockerfile
-
-DOCKERHUB_ORGANIZATION=protobuftesting
-
-for DOCKERFILE_DIR in test/*
-do
-  # Generate image name based on Dockerfile checksum. That works well as long
-  # as can count on dockerfiles being written in a way that changing the logical
-  # contents of the docker image always changes the SHA (e.g. using "ADD file"
-  # cmd in the dockerfile in not ok as contents of the added file will not be
-  # reflected in the SHA).
-  DOCKER_IMAGE_NAME=$(basename $DOCKERFILE_DIR)_$(sha1sum $DOCKERFILE_DIR/Dockerfile | cut -f1 -d\ )
-
-  echo $DOCKER_IMAGE_NAME
-  # skip the image if it already exists in the repo
-  curl --silent -f -lSL https://registry.hub.docker.com/v2/repositories/${DOCKERHUB_ORGANIZATION}/${DOCKER_IMAGE_NAME}/tags/latest > /dev/null \
-      && continue
-
-  docker build -t ${DOCKERHUB_ORGANIZATION}/${DOCKER_IMAGE_NAME} ${DOCKERFILE_DIR}
-
-  # "docker login" needs to be run in advance
-  docker push ${DOCKERHUB_ORGANIZATION}/${DOCKER_IMAGE_NAME}
-done
diff --git a/libs/protobuf/kokoro/linux/dockerfile/test/cpp_tcmalloc/Dockerfile b/libs/protobuf/kokoro/linux/dockerfile/test/cpp_tcmalloc/Dockerfile
deleted file mode 100644
index 0ce9982..0000000
--- a/libs/protobuf/kokoro/linux/dockerfile/test/cpp_tcmalloc/Dockerfile
+++ /dev/null
@@ -1,29 +0,0 @@
-FROM debian:jessie
-
-# Install dependencies.  We start with the basic ones require to build protoc
-# and the C++ build
-RUN apt-get update && apt-get install -y \
-  autoconf \
-  autotools-dev \
-  build-essential \
-  bzip2 \
-  ccache \
-  curl \
-  gcc \
-  git \
-  libc6 \
-  libc6-dbg \
-  libc6-dev \
-  libgtest-dev \
-  libtool \
-  make \
-  parallel \
-  time \
-  wget \
-  && apt-get clean
-
-# Install dependencies for TC malloc
-RUN apt-get install -y \
-  google-perftools \
-  libgoogle-perftools4 \
-  libgoogle-perftools-dev
diff --git a/libs/protobuf/kokoro/linux/dockerfile/test/csharp/Dockerfile b/libs/protobuf/kokoro/linux/dockerfile/test/csharp/Dockerfile
deleted file mode 100644
index c07fcbc..0000000
--- a/libs/protobuf/kokoro/linux/dockerfile/test/csharp/Dockerfile
+++ /dev/null
@@ -1,41 +0,0 @@
-FROM debian:buster
-
-# Install dependencies.  We start with the basic ones require to build protoc
-# and the C++ build
-RUN apt-get update && apt-get install -y \
-  autoconf \
-  autotools-dev \
-  build-essential \
-  bzip2 \
-  ccache \
-  curl \
-  gcc \
-  git \
-  libc6 \
-  libc6-dbg \
-  libc6-dev \
-  libgtest-dev \
-  libtool \
-  make \
-  parallel \
-  time \
-  wget \
-  && apt-get clean
-
-# Update ca-certificates to fix known buster + .NET 5 issue
-# https://github.com/NuGet/Announcements/issues/49
-RUN apt-get update && apt-get install -y ca-certificates && apt-get clean
-
-# dotnet SDK prerequisites
-RUN apt-get update && apt-get install -y libunwind8 libicu63 && apt-get clean
-
-# Install dotnet SDK via install script
-RUN wget -q https://dot.net/v1/dotnet-install.sh && \
-    chmod u+x dotnet-install.sh && \
-    ./dotnet-install.sh --version 3.1.415 && \
-    ./dotnet-install.sh --version 6.0.100 && \
-    ln -s /root/.dotnet/dotnet /usr/local/bin
-
-RUN wget -q www.nuget.org/NuGet.exe -O /usr/local/bin/nuget.exe
-
-ENV DOTNET_SKIP_FIRST_TIME_EXPERIENCE true
diff --git a/libs/protobuf/kokoro/linux/dockerfile/test/java_stretch/Dockerfile b/libs/protobuf/kokoro/linux/dockerfile/test/java_stretch/Dockerfile
deleted file mode 100644
index 0716927..0000000
--- a/libs/protobuf/kokoro/linux/dockerfile/test/java_stretch/Dockerfile
+++ /dev/null
@@ -1,39 +0,0 @@
-# Despite the name of this image, we are no longer on stretch.
-# We should consider renaming this image, and/or evaluating what
-# software versions we actually need.
-FROM debian:bullseye
-
-# Install dependencies.  We start with the basic ones required to build protoc
-# and the C++ build
-RUN apt-get update && apt-get install -y \
-  autoconf \
-  autotools-dev \
-  build-essential \
-  bzip2 \
-  ccache \
-  cmake \
-  curl \
-  gcc \
-  git \
-  libc6 \
-  libc6-dbg \
-  libc6-dev \
-  libgtest-dev \
-  libtool \
-  make \
-  parallel \
-  pkg-config \
-  time \
-  wget \
-  # Java dependencies
-  maven \
-  openjdk-11-jdk \
-  openjdk-17-jdk \
-  # Required for the gtest build.
-  python2 \
-  # Python dependencies
-  python3-dev \
-  python3-setuptools \
-  python3-pip \
-  python3-venv \
-  && apt-get clean
diff --git a/libs/protobuf/kokoro/linux/dockerfile/test/php/Dockerfile b/libs/protobuf/kokoro/linux/dockerfile/test/php/Dockerfile
deleted file mode 100644
index 4c9d69d..0000000
--- a/libs/protobuf/kokoro/linux/dockerfile/test/php/Dockerfile
+++ /dev/null
@@ -1,255 +0,0 @@
-FROM debian:jessie
-
-# Install dependencies.  We start with the basic ones require to build protoc
-# and the C++ build
-RUN apt-get update && apt-get install -y \
-  autoconf \
-  autotools-dev \
-  build-essential \
-  bzip2 \
-  ccache \
-  curl \
-  gcc \
-  git \
-  libc6 \
-  libc6-dbg \
-  libc6-dev \
-  libgtest-dev \
-  libtool \
-  make \
-  parallel \
-  time \
-  wget \
-  re2c \
-  sqlite3 \
-  libsqlite3-dev \
-  && apt-get clean
-
-# Install php dependencies
-RUN apt-get clean && apt-get update && apt-get install -y --force-yes \
-  php5 \
-  libcurl4-openssl-dev \
-  libgmp-dev \
-  libgmp3-dev \
-  libssl-dev \
-  libxml2-dev \
-  unzip \
-  zlib1g-dev \
-  pkg-config \
-  && apt-get clean
-
-# Install other dependencies
-RUN ln -sf /usr/include/x86_64-linux-gnu/gmp.h /usr/include/gmp.h
-RUN wget http://ftp.gnu.org/gnu/bison/bison-2.6.4.tar.gz -O /var/local/bison-2.6.4.tar.gz
-RUN cd /var/local \
-  && tar -zxvf bison-2.6.4.tar.gz \
-  && cd /var/local/bison-2.6.4 \
-  && ./configure \
-  && make \
-  && make install
-
-# Install composer
-RUN curl -sS https://getcomposer.org/installer | php
-RUN mv composer.phar /usr/local/bin/composer
-
-# Download php source code
-RUN git clone https://github.com/php/php-src
-
-# php 5.6
-RUN cd php-src \
-  && git checkout PHP-5.6.39 \
-  && ./buildconf --force
-RUN cd php-src \
-  && ./configure \
-  --enable-bcmath \
-  --enable-mbstring \
-  --with-gmp \
-  --with-openssl \
-  --with-zlib \
-  --prefix=/usr/local/php-5.6 \
-  && make \
-  && make install \
-  && make clean
-
-RUN wget -O phpunit https://phar.phpunit.de/phpunit-5.phar \
-  && chmod +x phpunit \
-  && mv phpunit /usr/local/php-5.6/bin
-
-# php 7.0
-RUN cd php-src \
-  && git checkout PHP-7.0.33 \
-  && ./buildconf --force
-RUN cd php-src \
-  && ./configure \
-  --enable-bcmath \
-  --enable-mbstring \
-  --with-gmp \
-  --with-openssl \
-  --with-zlib \
-  --prefix=/usr/local/php-7.0 \
-  && make \
-  && make install \
-  && make clean
-RUN cd php-src \
-  && ./configure \
-  --enable-maintainer-zts \
-  --enable-mbstring \
-  --with-gmp \
-  --with-openssl \
-  --with-zlib \
-  --prefix=/usr/local/php-7.0-zts \
-  && make \
-  && make install \
-  && make clean
-
-RUN wget -O phpunit https://phar.phpunit.de/phpunit-6.phar \
-  && chmod +x phpunit \
-  && cp phpunit /usr/local/php-7.0/bin \
-  && mv phpunit /usr/local/php-7.0-zts/bin
-
-# php 7.1
-RUN cd php-src \
-  && git checkout PHP-7.1.25 \
-  && ./buildconf --force
-RUN cd php-src \
-  && ./configure \
-  --enable-bcmath \
-  --enable-mbstring \
-  --with-gmp \
-  --with-openssl \
-  --with-zlib \
-  --prefix=/usr/local/php-7.1 \
-  && make \
-  && make install \
-  && make clean
-RUN cd php-src \
-  && ./configure \
-  --enable-maintainer-zts \
-  --enable-mbstring \
-  --with-gmp \
-  --with-openssl \
-  --with-zlib \
-  --prefix=/usr/local/php-7.1-zts \
-  && make \
-  && make install \
-  && make clean
-
-RUN wget -O phpunit https://phar.phpunit.de/phpunit-7.5.0.phar \
-  && chmod +x phpunit \
-  && cp phpunit /usr/local/php-7.1/bin \
-  && mv phpunit /usr/local/php-7.1-zts/bin
-
-# php 7.2
-RUN cd php-src \
-  && git checkout PHP-7.2.13 \
-  && ./buildconf --force
-RUN cd php-src \
-  && ./configure \
-  --enable-bcmath \
-  --enable-mbstring \
-  --with-gmp \
-  --with-openssl \
-  --with-zlib \
-  --prefix=/usr/local/php-7.2 \
-  && make \
-  && make install \
-  && make clean
-RUN cd php-src \
-  && ./configure \
-  --enable-maintainer-zts \
-  --enable-mbstring \
-  --with-gmp \
-  --with-openssl \
-  --with-zlib \
-  --prefix=/usr/local/php-7.2-zts \
-  && make \
-  && make install \
-  && make clean
-
-RUN wget -O phpunit https://phar.phpunit.de/phpunit-7.5.0.phar \
-  && chmod +x phpunit \
-  && cp phpunit /usr/local/php-7.2/bin \
-  && mv phpunit /usr/local/php-7.2-zts/bin
-
-# php 7.3
-RUN cd php-src \
-  && git checkout PHP-7.3.0 \
-  && ./buildconf --force
-RUN cd php-src \
-  && ./configure \
-  --enable-bcmath \
-  --enable-mbstring \
-  --with-gmp \
-  --with-openssl \
-  --with-zlib \
-  --prefix=/usr/local/php-7.3 \
-  && make \
-  && make install \
-  && make clean
-RUN cd php-src \
-  && ./configure \
-  --enable-maintainer-zts \
-  --enable-mbstring \
-  --with-gmp \
-  --with-openssl \
-  --with-zlib \
-  --prefix=/usr/local/php-7.3-zts \
-  && make \
-  && make install \
-  && make clean
-
-RUN wget -O phpunit https://phar.phpunit.de/phpunit-7.5.0.phar \
-  && chmod +x phpunit \
-  && cp phpunit /usr/local/php-7.3/bin \
-  && mv phpunit /usr/local/php-7.3-zts/bin
-
-# php 7.4
-RUN wget https://ftp.gnu.org/gnu/bison/bison-3.0.1.tar.gz -O /var/local/bison-3.0.1.tar.gz
-RUN cd /var/local \
-  && tar -zxvf bison-3.0.1.tar.gz \
-  && cd /var/local/bison-3.0.1 \
-  && ./configure \
-  && make \
-  && make install
-
-RUN wget https://github.com/php/php-src/archive/php-7.4.0.tar.gz -O /var/local/php-7.4.0.tar.gz
-
-RUN cd /var/local \
-  && tar -zxvf php-7.4.0.tar.gz
-
-RUN cd /var/local/php-src-php-7.4.0 \
-  && ./buildconf --force \
-  && ./configure \
-  --enable-bcmath \
-  --enable-mbstring \
-  --disable-mbregex \
-  --with-gmp \
-  --with-openssl \
-  --with-zlib \
-  --prefix=/usr/local/php-7.4 \
-  && make \
-  && make install \
-  && make clean
-RUN cd /var/local/php-src-php-7.4.0 \
-  && ./buildconf --force \
-  && ./configure \
-  --enable-maintainer-zts \
-  --enable-mbstring \
-  --disable-mbregex \
-  --with-gmp \
-  --with-openssl \
-  --with-zlib \
-  --prefix=/usr/local/php-7.4-zts \
-  && make \
-  && make install \
-  && make clean
-
-RUN wget -O phpunit https://phar.phpunit.de/phpunit-8.phar \
-  && chmod +x phpunit \
-  && cp phpunit /usr/local/php-7.4/bin \
-  && mv phpunit /usr/local/php-7.4-zts/bin
-
-# Install php dependencies
-RUN apt-get clean && apt-get update && apt-get install -y --force-yes \
-  valgrind \
-  && apt-get clean
diff --git a/libs/protobuf/kokoro/linux/dockerfile/test/php80/Dockerfile b/libs/protobuf/kokoro/linux/dockerfile/test/php80/Dockerfile
deleted file mode 100644
index 5b382d0..0000000
--- a/libs/protobuf/kokoro/linux/dockerfile/test/php80/Dockerfile
+++ /dev/null
@@ -1,124 +0,0 @@
-FROM debian:stretch
-
-# Install dependencies.  We start with the basic ones require to build protoc
-# and the C++ build
-RUN apt-get update && apt-get install -y \
-  autoconf \
-  autotools-dev \
-  build-essential \
-  bzip2 \
-  ccache \
-  curl \
-  gcc \
-  git \
-  libc6 \
-  libc6-dbg \
-  libc6-dev \
-  libgtest-dev \
-  libtool \
-  make \
-  parallel \
-  time \
-  wget \
-  re2c \
-  sqlite3 \
-  vim \
-  libonig-dev \
-  libsqlite3-dev \
-  && apt-get clean
-
-# Install php dependencies
-RUN apt-get clean && apt-get update && apt-get install -y --force-yes \
-  php \
-  libcurl4-openssl-dev \
-  libgmp-dev \
-  libgmp3-dev \
-  libssl-dev \
-  libxml2-dev \
-  unzip \
-  zlib1g-dev \
-  pkg-config \
-  && apt-get clean
-
-# Install other dependencies
-RUN ln -sf /usr/include/x86_64-linux-gnu/gmp.h /usr/include/gmp.h
-RUN wget https://ftp.gnu.org/gnu/bison/bison-3.0.1.tar.gz -O /var/local/bison-3.0.1.tar.gz
-RUN cd /var/local \
-  && tar -zxvf bison-3.0.1.tar.gz \
-  && cd /var/local/bison-3.0.1 \
-  && ./configure \
-  && make \
-  && make install
-
-# Install composer
-RUN curl -sS https://getcomposer.org/installer | php
-RUN mv composer.phar /usr/local/bin/composer
-
-# Download php source code
-RUN git clone https://github.com/php/php-src
-
-# php 8.0
-RUN cd php-src \
-  && git checkout php-8.0.0 \
-  && ./buildconf --force
-RUN cd php-src \
-  && ./configure \
-  --enable-bcmath \
-  --enable-mbstring \
-  --with-gmp \
-  --with-openssl \
-  --with-zlib \
-  --prefix=/usr/local/php-8.0 \
-  && make \
-  && make install \
-  && make clean
-RUN cd php-src \
-  && ./configure \
-  --enable-bcmath \
-  --enable-mbstring \
-  --enable-maintainer-zts \
-  --with-gmp \
-  --with-openssl \
-  --with-zlib \
-  --prefix=/usr/local/php-8.0-zts \
-  && make \
-  && make install \
-  && make clean
-
-RUN wget -O phpunit https://phar.phpunit.de/phpunit-9.phar \
-  && chmod +x phpunit \
-  && cp phpunit /usr/local/php-8.0/bin \
-  && mv phpunit /usr/local/php-8.0-zts/bin
-
-# php 8.1
-RUN cd php-src \
-  && git checkout php-8.1.2 \
-  && ./buildconf --force
-RUN cd php-src \
-  && ./configure \
-  --enable-bcmath \
-  --enable-mbstring \
-  --with-gmp \
-  --with-openssl \
-  --with-zlib \
-  --prefix=/usr/local/php-8.1 \
-  && make \
-  && make install \
-  && make clean
-RUN cd php-src \
-  && ./configure \
-  --enable-bcmath \
-  --enable-mbstring \
-  --enable-maintainer-zts \
-  --with-gmp \
-  --with-openssl \
-  --with-zlib \
-  --prefix=/usr/local/php-8.1-zts \
-  && make \
-  && make install \
-  && make clean
-
-# Install php dependencies
-RUN apt-get clean && apt-get update && apt-get install -y --force-yes \
-  valgrind \
-  && apt-get clean
diff --git a/libs/protobuf/kokoro/linux/dockerfile/test/php_32bit/Dockerfile b/libs/protobuf/kokoro/linux/dockerfile/test/php_32bit/Dockerfile
deleted file mode 100644
index 2fd620e..0000000
--- a/libs/protobuf/kokoro/linux/dockerfile/test/php_32bit/Dockerfile
+++ /dev/null
@@ -1,260 +0,0 @@
-FROM i386/debian:jessie
-
-# Install dependencies.  We start with the basic ones require to build protoc
-# and the C++ build
-RUN apt-get update && apt-get install -y \
-  autoconf \
-  autotools-dev \
-  build-essential \
-  bzip2 \
-  ccache \
-  curl \
-  gcc \
-  git \
-  libc6 \
-  libc6-dbg \
-  libc6-dev \
-  libgtest-dev \
-  libtool \
-  make \
-  parallel \
-  time \
-  wget \
-  re2c \
-  sqlite3 \
-  libsqlite3-dev \
-  && apt-get clean
-
-# Install php dependencies
-RUN apt-get clean && apt-get update && apt-get install -y --force-yes \
-  bison \
-  php5 \
-  libcurl4-openssl-dev \
-  libssl-dev \
-  libxml2-dev \
-  unzip \
-  zlib1g-dev \
-  pkg-config \
-  && apt-get clean
-
-# Install other dependencies
-RUN wget http://ftp.gnu.org/gnu/bison/bison-2.6.4.tar.gz -O /var/local/bison-2.6.4.tar.gz
-RUN cd /var/local \
-  && tar -zxvf bison-2.6.4.tar.gz \
-  && cd /var/local/bison-2.6.4 \
-  && ./configure \
-  && make \
-  && make install
-
-# Install composer
-RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
-RUN php composer-setup.php
-RUN mv composer.phar /usr/bin/composer
-RUN php -r "unlink('composer-setup.php');"
-
-# Download php source code
-RUN git clone https://github.com/php/php-src
-
-# php 5.6
-RUN cd php-src \
-  && git checkout PHP-5.6.39 \
-  && ./buildconf --force
-RUN cd php-src \
-  && ./configure \
-  --enable-bcmath \
-  --enable-mbstring \
-  --with-openssl \
-  --with-zlib \
-  --prefix=/usr/local/php-5.6 \
-  && make \
-  && make install \
-  && make clean
-
-RUN wget -O phpunit https://phar.phpunit.de/phpunit-5.phar \
-  && chmod +x phpunit \
-  && mv phpunit /usr/local/php-5.6/bin
-
-# php 7.0
-RUN wget https://github.com/php/php-src/archive/php-7.0.33.tar.gz -O /var/local/php-7.0.33.tar.gz
-
-RUN cd /var/local \
-  && tar -zxvf php-7.0.33.tar.gz
-
-RUN cd /var/local/php-src-php-7.0.33 \
-  && ./buildconf --force \
-  && ./configure \
-  --enable-bcmath \
-  --enable-mbstring \
-  --with-openssl \
-  --with-zlib \
-  --prefix=/usr/local/php-7.0 \
-  && make \
-  && make install \
-  && make clean
-RUN cd /var/local/php-src-php-7.0.33 \
-  && ./buildconf --force \
-  && ./configure \
-  --enable-maintainer-zts \
-  --enable-mbstring \
-  --with-openssl \
-  --with-zlib \
-  --prefix=/usr/local/php-7.0-zts \
-  && make \
-  && make install \
-  && make clean
-
-RUN wget -O phpunit https://phar.phpunit.de/phpunit-6.phar \
-  && chmod +x phpunit \
-  && cp phpunit /usr/local/php-7.0/bin \
-  && mv phpunit /usr/local/php-7.0-zts/bin
-
-# php 7.1
-RUN wget https://github.com/php/php-src/archive/php-7.1.25.tar.gz -O /var/local/php-7.1.25.tar.gz
-
-RUN cd /var/local \
-  && tar -zxvf php-7.1.25.tar.gz
-
-RUN cd /var/local/php-src-php-7.1.25 \
-  && ./buildconf --force \
-  && ./configure \
-  --enable-bcmath \
-  --enable-mbstring \
-  --with-openssl \
-  --with-zlib \
-  --prefix=/usr/local/php-7.1 \
-  && make \
-  && make install \
-  && make clean
-RUN cd /var/local/php-src-php-7.1.25 \
-  && ./buildconf --force \
-  && ./configure \
-  --enable-maintainer-zts \
-  --enable-mbstring \
-  --with-openssl \
-  --with-zlib \
-  --prefix=/usr/local/php-7.1-zts \
-  && make \
-  && make install \
-  && make clean
-
-RUN wget -O phpunit https://phar.phpunit.de/phpunit-7.5.0.phar \
-  && chmod +x phpunit \
-  && cp phpunit /usr/local/php-7.1/bin \
-  && mv phpunit /usr/local/php-7.1-zts/bin
-
-# php 7.2
-RUN wget https://github.com/php/php-src/archive/php-7.2.13.tar.gz -O /var/local/php-7.2.13.tar.gz
-
-RUN cd /var/local \
-  && tar -zxvf php-7.2.13.tar.gz
-
-RUN cd /var/local/php-src-php-7.2.13 \
-  && ./buildconf --force \
-  && ./configure \
-  --enable-bcmath \
-  --enable-mbstring \
-  --with-openssl \
-  --with-zlib \
-  --prefix=/usr/local/php-7.2 \
-  && make \
-  && make install \
-  && make clean
-RUN cd /var/local/php-src-php-7.2.13 \
-  && ./buildconf --force \
-  && ./configure \
-  --enable-maintainer-zts \
-  --enable-mbstring \
-  --with-openssl \
-  --with-zlib \
-  --prefix=/usr/local/php-7.2-zts \
-  && make \
-  && make install \
-  && make clean
-
-RUN wget -O phpunit https://phar.phpunit.de/phpunit-7.5.0.phar \
-  && chmod +x phpunit \
-  && cp phpunit /usr/local/php-7.2/bin \
-  && mv phpunit /usr/local/php-7.2-zts/bin
-
-# php 7.3
-RUN wget https://github.com/php/php-src/archive/php-7.3.0.tar.gz -O /var/local/php-7.3.0.tar.gz
-
-RUN cd /var/local \
-  && tar -zxvf php-7.3.0.tar.gz
-
-RUN cd /var/local/php-src-php-7.3.0 \
-  && ./buildconf --force \
-  && ./configure \
-  --enable-bcmath \
-  --enable-mbstring \
-  --with-openssl \
-  --with-zlib \
-  --prefix=/usr/local/php-7.3 \
-  && make \
-  && make install \
-  && make clean
-RUN cd /var/local/php-src-php-7.3.0 \
-  && ./buildconf --force \
-  && ./configure \
-  --enable-maintainer-zts \
-  --enable-mbstring \
-  --with-openssl \
-  --with-zlib \
-  --prefix=/usr/local/php-7.3-zts \
-  && make \
-  && make install \
-  && make clean
-
-RUN wget -O phpunit https://phar.phpunit.de/phpunit-7.5.0.phar \
-  && chmod +x phpunit \
-  && cp phpunit /usr/local/php-7.3/bin \
-  && mv phpunit /usr/local/php-7.3-zts/bin
-
-# php 7.4
-RUN wget https://ftp.gnu.org/gnu/bison/bison-3.0.1.tar.gz -O /var/local/bison-3.0.1.tar.gz
-RUN cd /var/local \
-  && tar -zxvf bison-3.0.1.tar.gz \
-  && cd /var/local/bison-3.0.1 \
-  && ./configure \
-  && make \
-  && make install
-
-RUN wget https://github.com/php/php-src/archive/php-7.4.0.tar.gz -O /var/local/php-7.4.0.tar.gz
-
-RUN cd /var/local \
-  && tar -zxvf php-7.4.0.tar.gz
-
-RUN cd /var/local/php-src-php-7.4.0 \
-  && ./buildconf --force \
-  && ./configure \
-  --enable-bcmath \
-  --enable-mbstring \
-  --disable-mbregex \
-  --with-openssl \
-  --with-zlib \
-  --prefix=/usr/local/php-7.4 \
-  && make \
-  && make install \
-  && make clean
-RUN cd /var/local/php-src-php-7.4.0 \
-  && ./buildconf --force \
-  && ./configure \
-  --enable-maintainer-zts \
-  --enable-mbstring \
-  --disable-mbregex \
-  --with-openssl \
-  --with-zlib \
-  --prefix=/usr/local/php-7.4-zts \
-  && make \
-  && make install \
-  && make clean
-
-RUN wget -O phpunit https://phar.phpunit.de/phpunit-8.phar \
-  && chmod +x phpunit \
-  && cp phpunit /usr/local/php-7.4/bin \
-  && mv phpunit /usr/local/php-7.4-zts/bin
-
-# Install php dependencies
-RUN apt-get clean && apt-get update && apt-get install -y --force-yes \
-  valgrind \
-  && apt-get clean
diff --git a/libs/protobuf/kokoro/linux/dockerfile/test/python310/Dockerfile b/libs/protobuf/kokoro/linux/dockerfile/test/python310/Dockerfile
deleted file mode 100644
index e16e93b..0000000
--- a/libs/protobuf/kokoro/linux/dockerfile/test/python310/Dockerfile
+++ /dev/null
@@ -1,31 +0,0 @@
-FROM python:3.10-buster
-
-# Install dependencies.  We start with the basic ones require to build protoc
-# and the C++ build
-RUN apt-get update && apt-get install -y \
-  autoconf \
-  autotools-dev \
-  build-essential \
-  bzip2 \
-  ccache \
-  curl \
-  gcc \
-  git \
-  libc6 \
-  libc6-dbg \
-  libc6-dev \
-  libgtest-dev \
-  libtool \
-  make \
-  parallel \
-  time \
-  wget \
-  && apt-get clean \
-  && rm -rf /var/lib/apt/lists/*
-
-# Install Python libraries.
-RUN python -m pip install --no-cache-dir --upgrade \
-  pip \
-  setuptools \
-  tox \
-  wheel
diff --git a/libs/protobuf/kokoro/linux/dockerfile/test/python37/Dockerfile b/libs/protobuf/kokoro/linux/dockerfile/test/python37/Dockerfile
deleted file mode 100644
index ee108dd..0000000
--- a/libs/protobuf/kokoro/linux/dockerfile/test/python37/Dockerfile
+++ /dev/null
@@ -1,31 +0,0 @@
-FROM python:3.7-buster
-
-# Install dependencies.  We start with the basic ones require to build protoc
-# and the C++ build
-RUN apt-get update && apt-get install -y \
-  autoconf \
-  autotools-dev \
-  build-essential \
-  bzip2 \
-  ccache \
-  curl \
-  gcc \
-  git \
-  libc6 \
-  libc6-dbg \
-  libc6-dev \
-  libgtest-dev \
-  libtool \
-  make \
-  parallel \
-  time \
-  wget \
-  && apt-get clean \
-  && rm -rf /var/lib/apt/lists/*
-
-# Install Python libraries.
-RUN python -m pip install --no-cache-dir --upgrade \
-  pip \
-  setuptools \
-  tox \
-  wheel
diff --git a/libs/protobuf/kokoro/linux/dockerfile/test/python38/Dockerfile b/libs/protobuf/kokoro/linux/dockerfile/test/python38/Dockerfile
deleted file mode 100644
index 56efc9d..0000000
--- a/libs/protobuf/kokoro/linux/dockerfile/test/python38/Dockerfile
+++ /dev/null
@@ -1,31 +0,0 @@
-FROM python:3.8-buster
-
-# Install dependencies.  We start with the basic ones require to build protoc
-# and the C++ build
-RUN apt-get update && apt-get install -y \
-  autoconf \
-  autotools-dev \
-  build-essential \
-  bzip2 \
-  ccache \
-  curl \
-  gcc \
-  git \
-  libc6 \
-  libc6-dbg \
-  libc6-dev \
-  libgtest-dev \
-  libtool \
-  make \
-  parallel \
-  time \
-  wget \
-  && apt-get clean \
-  && rm -rf /var/lib/apt/lists/*
-
-# Install Python libraries.
-RUN python -m pip install --no-cache-dir --upgrade \
-  pip \
-  setuptools \
-  tox \
-  wheel
diff --git a/libs/protobuf/kokoro/linux/dockerfile/test/python39/Dockerfile b/libs/protobuf/kokoro/linux/dockerfile/test/python39/Dockerfile
deleted file mode 100644
index ee7554d..0000000
--- a/libs/protobuf/kokoro/linux/dockerfile/test/python39/Dockerfile
+++ /dev/null
@@ -1,31 +0,0 @@
-FROM python:3.9-buster
-
-# Install dependencies.  We start with the basic ones require to build protoc
-# and the C++ build
-RUN apt-get update && apt-get install -y \
-  autoconf \
-  autotools-dev \
-  build-essential \
-  bzip2 \
-  ccache \
-  curl \
-  gcc \
-  git \
-  libc6 \
-  libc6-dbg \
-  libc6-dev \
-  libgtest-dev \
-  libtool \
-  make \
-  parallel \
-  time \
-  wget \
-  && apt-get clean \
-  && rm -rf /var/lib/apt/lists/*
-
-# Install Python libraries.
-RUN python -m pip install --no-cache-dir --upgrade \
-  pip \
-  setuptools \
-  tox \
-  wheel
diff --git a/libs/protobuf/kokoro/linux/dockerfile/test/ruby/Dockerfile b/libs/protobuf/kokoro/linux/dockerfile/test/ruby/Dockerfile
deleted file mode 100644
index 0e34fe5..0000000
--- a/libs/protobuf/kokoro/linux/dockerfile/test/ruby/Dockerfile
+++ /dev/null
@@ -1,44 +0,0 @@
-FROM debian:stretch
-
-# Install dependencies.  We start with the basic ones require to build protoc
-# and the C++ build
-RUN apt-get update && apt-get install -y \
-  autoconf \
-  autotools-dev \
-  build-essential \
-  bzip2 \
-  ccache \
-  curl \
-  gcc \
-  git \
-  libc6 \
-  libc6-dbg \
-  libc6-dev \
-  libgtest-dev \
-  libtool \
-  make \
-  parallel \
-  time \
-  wget \
-  # Java dependencies
-  maven \
-  openjdk-8-jdk \
-  && apt-get clean
-
-# Install rvm
-RUN gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys \
-    409B6B1796C275462A1703113804BB82D39DC0E3 \
-    7D2BAF1CF37B13E2069D6956105BD0E739499BDB
-RUN \curl -sSL https://raw.githubusercontent.com/rvm/rvm/master/binscripts/rvm-installer | bash -s master
-
-RUN /bin/bash -l -c "rvm install 2.5.1"
-RUN /bin/bash -l -c "rvm install 2.6.0"
-RUN /bin/bash -l -c "rvm install 2.7.0"
-RUN /bin/bash -l -c "rvm install 3.0.0"
-RUN /bin/bash -l -c "rvm install 3.1.0"
-RUN /bin/bash -l -c "rvm install jruby-9.2.20.1"
-RUN /bin/bash -l -c "rvm install jruby-9.3.3.0"
-RUN /bin/bash -l -c "rvm install jruby-9.3.4.0"
-
-RUN /bin/bash -l -c "echo 'gem: --no-ri --no-rdoc' > ~/.gemrc"
-RUN /bin/bash -l -c "echo 'export PATH=/usr/local/rvm/bin:$PATH' >> ~/.bashrc"
diff --git a/libs/protobuf/kokoro/linux/java_aarch64/build.sh b/libs/protobuf/kokoro/linux/java_aarch64/build.sh
deleted file mode 100755
index ed5ad53..0000000
--- a/libs/protobuf/kokoro/linux/java_aarch64/build.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-#
-# This is the top-level script we give to Kokoro as the entry point for
-# running the "continuous" and "presubmit" jobs.
-
-set -ex
-
-# Change to repo root
-cd $(dirname $0)/../../..
-
-# Initialize any submodules.
-git submodule update --init --recursive
-
-kokoro/linux/aarch64/qemu_helpers/prepare_qemu.sh
-
-kokoro/linux/aarch64/test_java_aarch64.sh
diff --git a/libs/protobuf/kokoro/linux/java_aarch64/continuous.cfg b/libs/protobuf/kokoro/linux/java_aarch64/continuous.cfg
deleted file mode 100644
index 5db46d4..0000000
--- a/libs/protobuf/kokoro/linux/java_aarch64/continuous.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/java_aarch64/build.sh"
-timeout_mins: 120
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.xml"
-  }
-}
diff --git a/libs/protobuf/kokoro/linux/java_aarch64/presubmit.cfg b/libs/protobuf/kokoro/linux/java_aarch64/presubmit.cfg
deleted file mode 100644
index 5db46d4..0000000
--- a/libs/protobuf/kokoro/linux/java_aarch64/presubmit.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/java_aarch64/build.sh"
-timeout_mins: 120
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.xml"
-  }
-}
diff --git a/libs/protobuf/kokoro/linux/java_jdk11/build.sh b/libs/protobuf/kokoro/linux/java_jdk11/build.sh
deleted file mode 100755
index d73aa7c..0000000
--- a/libs/protobuf/kokoro/linux/java_jdk11/build.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash
-#
-# This is the top-level script we give to Kokoro as the entry point for
-# running the "pull request" project:
-#
-# This script selects a specific Dockerfile (for building a Docker image) and
-# a script to run inside that image.  Then we delegate to the general
-# build_and_run_docker.sh script.
-
-# fail on error
-set -e
-
-# Change to repo root
-cd $(dirname $0)/../../..
-
-export DOCKERHUB_ORGANIZATION=protobuftesting
-# The image of the Dockerfile sha1 is fetched from the organization
-export DOCKERFILE_DIR=kokoro/linux/dockerfile/test/java_stretch
-export DOCKER_RUN_SCRIPT=kokoro/linux/pull_request_in_docker.sh
-export OUTPUT_DIR=testoutput
-export TEST_SET="java_jdk11"
-./kokoro/linux/build_and_run_docker.sh
diff --git a/libs/protobuf/kokoro/linux/java_jdk11/continuous.cfg b/libs/protobuf/kokoro/linux/java_jdk11/continuous.cfg
deleted file mode 100644
index f8af54d..0000000
--- a/libs/protobuf/kokoro/linux/java_jdk11/continuous.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/java_jdk11/build.sh"
-timeout_mins: 120
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.xml"
-  }
-}
diff --git a/libs/protobuf/kokoro/linux/java_jdk11/presubmit.cfg b/libs/protobuf/kokoro/linux/java_jdk11/presubmit.cfg
deleted file mode 100644
index 366048c..0000000
--- a/libs/protobuf/kokoro/linux/java_jdk11/presubmit.cfg
+++ /dev/null
@@ -1,12 +0,0 @@
-# Config file for running Linkage Monitor in Kokoro
-# https://github.com/GoogleCloudPlatform/cloud-opensource-java/tree/master/linkage-monitor
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/java_jdk11/build.sh"
-timeout_mins: 120
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.xml"
-  }
-}
diff --git a/libs/protobuf/kokoro/linux/java_jdk17/build.sh b/libs/protobuf/kokoro/linux/java_jdk17/build.sh
deleted file mode 100755
index 677245a..0000000
--- a/libs/protobuf/kokoro/linux/java_jdk17/build.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash
-#
-# This is the top-level script we give to Kokoro as the entry point for
-# running the "pull request" project:
-#
-# This script selects a specific Dockerfile (for building a Docker image) and
-# a script to run inside that image.  Then we delegate to the general
-# build_and_run_docker.sh script.
-
-# Fail on error
-set -e
-
-# Change to repo root
-cd $(dirname $0)/../../..
-
-export DOCKERHUB_ORGANIZATION=protobuftesting
-# The image of the Dockerfile sha1 is fetched from the organization
-export DOCKERFILE_DIR=kokoro/linux/dockerfile/test/java_stretch
-export DOCKER_RUN_SCRIPT=kokoro/linux/pull_request_in_docker.sh
-export OUTPUT_DIR=testoutput
-export TEST_SET="java_jdk17"
-./kokoro/linux/build_and_run_docker.sh
diff --git a/libs/protobuf/kokoro/linux/java_jdk17/continuous.cfg b/libs/protobuf/kokoro/linux/java_jdk17/continuous.cfg
deleted file mode 100644
index 6bac25c..0000000
--- a/libs/protobuf/kokoro/linux/java_jdk17/continuous.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/java_jdk17/build.sh"
-timeout_mins: 60
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.xml"
-  }
-}
diff --git a/libs/protobuf/kokoro/linux/java_jdk17/presubmit.cfg b/libs/protobuf/kokoro/linux/java_jdk17/presubmit.cfg
deleted file mode 100644
index ee80517..0000000
--- a/libs/protobuf/kokoro/linux/java_jdk17/presubmit.cfg
+++ /dev/null
@@ -1,12 +0,0 @@
-# Config file for running Linkage Monitor in Kokoro
-# https://github.com/GoogleCloudPlatform/cloud-opensource-java/tree/master/linkage-monitor
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/java_jdk17/build.sh"
-timeout_mins: 60
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.xml"
-  }
-}
diff --git a/libs/protobuf/kokoro/linux/java_linkage_monitor/build.sh b/libs/protobuf/kokoro/linux/java_linkage_monitor/build.sh
deleted file mode 100755
index c447453..0000000
--- a/libs/protobuf/kokoro/linux/java_linkage_monitor/build.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-#
-# This is the top-level script we give to Kokoro as the entry point for
-# running the "pull request" project:
-#
-# This script selects a specific Dockerfile (for building a Docker image) and
-# a script to run inside that image.  Then we delegate to the general
-# build_and_run_docker.sh script.
-
-# Change to repo root
-cd $(dirname $0)/../../..
-
-export DOCKERHUB_ORGANIZATION=protobuftesting
-# The image of the Dockerfile sha1 is fetched from the organization
-export DOCKERFILE_DIR=kokoro/linux/dockerfile/test/java_stretch
-export DOCKER_RUN_SCRIPT=kokoro/linux/pull_request_in_docker.sh
-export OUTPUT_DIR=testoutput
-export TEST_SET="java_linkage_monitor"
-./kokoro/linux/build_and_run_docker.sh
diff --git a/libs/protobuf/kokoro/linux/java_linkage_monitor/continuous.cfg b/libs/protobuf/kokoro/linux/java_linkage_monitor/continuous.cfg
deleted file mode 100644
index d0486cc..0000000
--- a/libs/protobuf/kokoro/linux/java_linkage_monitor/continuous.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/java_linkage_monitor/build.sh"
-timeout_mins: 120
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.xml"
-  }
-}
diff --git a/libs/protobuf/kokoro/linux/java_linkage_monitor/presubmit.cfg b/libs/protobuf/kokoro/linux/java_linkage_monitor/presubmit.cfg
deleted file mode 100644
index c02a52f..0000000
--- a/libs/protobuf/kokoro/linux/java_linkage_monitor/presubmit.cfg
+++ /dev/null
@@ -1,12 +0,0 @@
-# Config file for running Linkage Monitor in Kokoro
-# https://github.com/GoogleCloudPlatform/cloud-opensource-java/tree/master/linkage-monitor
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/java_linkage_monitor/build.sh"
-timeout_mins: 120
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.xml"
-  }
-}
diff --git a/libs/protobuf/kokoro/linux/jruby92/build.sh b/libs/protobuf/kokoro/linux/jruby92/build.sh
deleted file mode 100755
index 5820115..0000000
--- a/libs/protobuf/kokoro/linux/jruby92/build.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-#
-# This is the top-level script we give to Kokoro as the entry point for
-# running the "pull request" project:
-#
-# This script selects a specific Dockerfile (for building a Docker image) and
-# a script to run inside that image.  Then we delegate to the general
-# build_and_run_docker.sh script.
-
-# Change to repo root
-cd $(dirname $0)/../../..
-
-export DOCKERHUB_ORGANIZATION=protobuftesting
-export DOCKERFILE_DIR=kokoro/linux/dockerfile/test/ruby
-export DOCKER_RUN_SCRIPT=kokoro/linux/pull_request_in_docker.sh
-export OUTPUT_DIR=testoutput
-export TEST_SET="jruby92"
-./kokoro/linux/build_and_run_docker.sh
diff --git a/libs/protobuf/kokoro/linux/jruby92/continuous.cfg b/libs/protobuf/kokoro/linux/jruby92/continuous.cfg
deleted file mode 100644
index 3339584..0000000
--- a/libs/protobuf/kokoro/linux/jruby92/continuous.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/jruby92/build.sh"
-timeout_mins: 120
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.xml"
-  }
-}
diff --git a/libs/protobuf/kokoro/linux/jruby92/presubmit.cfg b/libs/protobuf/kokoro/linux/jruby92/presubmit.cfg
deleted file mode 100644
index 3339584..0000000
--- a/libs/protobuf/kokoro/linux/jruby92/presubmit.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/jruby92/build.sh"
-timeout_mins: 120
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.xml"
-  }
-}
diff --git a/libs/protobuf/kokoro/linux/jruby93/build.sh b/libs/protobuf/kokoro/linux/jruby93/build.sh
deleted file mode 100755
index 24c54d0..0000000
--- a/libs/protobuf/kokoro/linux/jruby93/build.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-#
-# This is the top-level script we give to Kokoro as the entry point for
-# running the "pull request" project:
-#
-# This script selects a specific Dockerfile (for building a Docker image) and
-# a script to run inside that image.  Then we delegate to the general
-# build_and_run_docker.sh script.
-
-# Change to repo root
-cd $(dirname $0)/../../..
-
-export DOCKERHUB_ORGANIZATION=protobuftesting
-export DOCKERFILE_DIR=kokoro/linux/dockerfile/test/ruby
-export DOCKER_RUN_SCRIPT=kokoro/linux/pull_request_in_docker.sh
-export OUTPUT_DIR=testoutput
-export TEST_SET="jruby93"
-./kokoro/linux/build_and_run_docker.sh
diff --git a/libs/protobuf/kokoro/linux/jruby93/continuous.cfg b/libs/protobuf/kokoro/linux/jruby93/continuous.cfg
deleted file mode 100644
index 706d848..0000000
--- a/libs/protobuf/kokoro/linux/jruby93/continuous.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/jruby93/build.sh"
-timeout_mins: 120
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.xml"
-  }
-}
diff --git a/libs/protobuf/kokoro/linux/jruby93/presubmit.cfg b/libs/protobuf/kokoro/linux/jruby93/presubmit.cfg
deleted file mode 100644
index 706d848..0000000
--- a/libs/protobuf/kokoro/linux/jruby93/presubmit.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/jruby93/build.sh"
-timeout_mins: 120
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.xml"
-  }
-}
diff --git a/libs/protobuf/kokoro/linux/make_test_output.py b/libs/protobuf/kokoro/linux/make_test_output.py
deleted file mode 100644
index 9853685..0000000
--- a/libs/protobuf/kokoro/linux/make_test_output.py
+++ /dev/null
@@ -1,94 +0,0 @@
-"""Gathers output from test runs and create an XML file in JUnit format.
-
-The output files from the individual tests have been written in a directory
-structure like:
-
-  $DIR/joblog  (output from "parallel --joblog joblog")
-  $DIR/logs/1/cpp/stdout
-  $DIR/logs/1/cpp/stderr
-  $DIR/logs/1/csharp/stdout
-  $DIR/logs/1/csharp/stderr
-  $DIR/logs/1/java_jdk7/stdout
-  $DIR/logs/1/java_jdk7/stderr
-  etc.
-
-This script bundles them into a single output XML file so Jenkins can show
-detailed test results.  It runs as the last step before the Jenkins build
-finishes.
-"""
-
-import os
-import sys
-from yattag import Doc
-from collections import defaultdict
-
-
-def readtests(basedir):
-  tests = defaultdict(dict)
-
-  # Sample input (note: separators are tabs).
-  #
-  # Seq	Host	Starttime	Runtime	Send	Receive	Exitval	Signal	Command
-  # 1	:	1456263838.313	0.005	0	0	0	0	echo A
-  with open(basedir + "/joblog") as jobs:
-    firstline = next(jobs)
-    for line in jobs:
-      values = line.split("\t")
-
-      name = values[8].split()[-1]
-      test = tests[name]
-      test["name"] = name
-      test["time"] = values[3]
-
-      exitval = values[6]
-      if int(exitval):
-        # We don't have a more specific message.  User should look at stderr.
-        test["failure"] = "TEST FAILURE"
-      else:
-        test["failure"] = False
-
-  for testname in os.listdir(basedir + "/logs/1"):
-    test = tests[testname]
-
-    with open(basedir + "/logs/1/" + testname + "/stdout") as f:
-      test["stdout"] = f.read()
-
-    with open(basedir + "/logs/1/" + testname + "/stderr") as f:
-      test["stderr"] = f.read()
-
-  # The cpp test is special since it doesn't run under parallel so doesn't show
-  # up in the job log.
-  tests["cpp"]["name"] = "cpp"
-
-  with open(basedir + '/logs/1/cpp/build_time', 'r') as f:
-    tests["cpp"]["time"] = f.read().strip()
-  tests["cpp"]["failure"] = False
-
-  ret = tests.values()
-  ret.sort(key=lambda x: x["name"])
-
-  return ret
-
-
-def genxml(tests):
-  doc, tag, text = Doc().tagtext()
-
-  with tag("testsuites"):
-    with tag("testsuite", name="Protobuf Tests"):
-      for test in tests:
-        with tag("testcase", name=test["name"], classname=test["name"],
-                             time=test["time"]):
-          with tag("system-out"):
-            text(test["stdout"])
-          with tag("system-err"):
-            text(test["stderr"])
-          if test["failure"]:
-            with tag("failure"):
-              text(test["failure"])
-
-  return doc.getvalue()
-
-
-sys.stderr.write("make_test_output.py: writing XML from directory: " +
-                 sys.argv[1] + "\n")
-print(genxml(readtests(sys.argv[1])))
diff --git a/libs/protobuf/kokoro/linux/php_aarch64/build.sh b/libs/protobuf/kokoro/linux/php_aarch64/build.sh
deleted file mode 100755
index eba8b55..0000000
--- a/libs/protobuf/kokoro/linux/php_aarch64/build.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-#
-# This is the top-level script we give to Kokoro as the entry point for
-# running the "continuous" and "presubmit" jobs.
-
-set -ex
-
-# Change to repo root
-cd $(dirname $0)/../../..
-
-# Initialize any submodules.
-git submodule update --init --recursive
-
-kokoro/linux/aarch64/qemu_helpers/prepare_qemu.sh
-
-kokoro/linux/aarch64/test_php_aarch64.sh
diff --git a/libs/protobuf/kokoro/linux/php_aarch64/continuous.cfg b/libs/protobuf/kokoro/linux/php_aarch64/continuous.cfg
deleted file mode 100644
index ff20682..0000000
--- a/libs/protobuf/kokoro/linux/php_aarch64/continuous.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/php_aarch64/build.sh"
-timeout_mins: 120
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.xml"
-  }
-}
diff --git a/libs/protobuf/kokoro/linux/php_aarch64/presubmit.cfg b/libs/protobuf/kokoro/linux/php_aarch64/presubmit.cfg
deleted file mode 100644
index ff20682..0000000
--- a/libs/protobuf/kokoro/linux/php_aarch64/presubmit.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/php_aarch64/build.sh"
-timeout_mins: 120
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.xml"
-  }
-}
diff --git a/libs/protobuf/kokoro/linux/php_all/build.sh b/libs/protobuf/kokoro/linux/php_all/build.sh
deleted file mode 100755
index cfcab00..0000000
--- a/libs/protobuf/kokoro/linux/php_all/build.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-#
-# This is the entry point for kicking off a Kokoro job. This path is referenced
-# from the .cfg files in this directory.
-
-set -ex
-
-# Change to repo base.
-cd $(dirname $0)/../../..
-
-docker run $(test -t 0 && echo "-it") -v$PWD:/workspace gcr.io/protobuf-build/php/linux:8.0.5-dbg-14a06550010c0649bf69b6c9b803c1ca609bbb6d "composer test_valgrind"
-
-docker run $(test -t 0 && echo "-it") -v$PWD:/workspace gcr.io/protobuf-build/php/linux:7.0.33-dbg-14a06550010c0649bf69b6c9b803c1ca609bbb6d "composer test && composer test_c"
-docker run $(test -t 0 && echo "-it") -v$PWD:/workspace gcr.io/protobuf-build/php/linux:7.3.28-dbg-14a06550010c0649bf69b6c9b803c1ca609bbb6d "composer test && composer test_c"
-docker run $(test -t 0 && echo "-it") -v$PWD:/workspace gcr.io/protobuf-build/php/linux:7.4.18-dbg-14a06550010c0649bf69b6c9b803c1ca609bbb6d "composer test && composer test_c"
-docker run $(test -t 0 && echo "-it") -v$PWD:/workspace gcr.io/protobuf-build/php/linux:8.0.5-dbg-14a06550010c0649bf69b6c9b803c1ca609bbb6d "composer test && composer test_c"
-
-# Run specialized memory leak & multirequest tests.
-docker run $(test -t 0 && echo "-it") -v$PWD:/workspace gcr.io/protobuf-build/php/linux:8.0.5-dbg-14a06550010c0649bf69b6c9b803c1ca609bbb6d "composer test_c && tests/multirequest.sh && tests/memory_leak_test.sh"
-
-# Most of our tests use a debug build of PHP, but we do one build against an opt
-# php just in case that surfaces anything unexpected.
-docker run $(test -t 0 && echo "-it") -v$PWD:/workspace gcr.io/protobuf-build/php/linux:8.0.5-14a06550010c0649bf69b6c9b803c1ca609bbb6d "composer test && composer test_c"
diff --git a/libs/protobuf/kokoro/linux/php_all/continuous.cfg b/libs/protobuf/kokoro/linux/php_all/continuous.cfg
deleted file mode 100644
index dfa8037..0000000
--- a/libs/protobuf/kokoro/linux/php_all/continuous.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/php_all/build.sh"
-timeout_mins: 120
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.xml"
-  }
-}
diff --git a/libs/protobuf/kokoro/linux/php_all/presubmit.cfg b/libs/protobuf/kokoro/linux/php_all/presubmit.cfg
deleted file mode 100644
index dfa8037..0000000
--- a/libs/protobuf/kokoro/linux/php_all/presubmit.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/php_all/build.sh"
-timeout_mins: 120
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.xml"
-  }
-}
diff --git a/libs/protobuf/kokoro/linux/pull_request_in_docker.sh b/libs/protobuf/kokoro/linux/pull_request_in_docker.sh
deleted file mode 100755
index a048c47..0000000
--- a/libs/protobuf/kokoro/linux/pull_request_in_docker.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-#
-# This is the script that runs inside Docker, once the image has been built,
-# to execute all tests for the "pull request" project.
-
-WORKSPACE_BASE=`pwd`
-MY_DIR="$(dirname "$0")"
-TEST_SCRIPT=./tests.sh
-BUILD_DIR=/tmp/protobuf
-
-set -e  # exit immediately on error
-set -x  # display all commands
-
-# The protobuf repository is mounted into our Docker image, but read-only.
-# We clone into a directory inside Docker (this is faster than cp).
-rm -rf $BUILD_DIR
-mkdir -p $BUILD_DIR
-cd $BUILD_DIR
-git clone /var/local/kokoro/protobuf
-cd protobuf
-
-# Initialize any submodules:
-git submodule update --init --recursive
-
-$TEST_SCRIPT $TEST_SET
diff --git a/libs/protobuf/kokoro/linux/python310/build.sh b/libs/protobuf/kokoro/linux/python310/build.sh
deleted file mode 100755
index 0d8a2c9..0000000
--- a/libs/protobuf/kokoro/linux/python310/build.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-#
-# This is the top-level script we give to Kokoro as the entry point for
-# running the "pull request" project:
-#
-# This script selects a specific Dockerfile (for building a Docker image) and
-# a script to run inside that image.  Then we delegate to the general
-# build_and_run_docker.sh script.
-
-# Change to repo root
-cd $(dirname $0)/../../..
-
-export DOCKERHUB_ORGANIZATION=protobuftesting
-export DOCKERFILE_DIR=kokoro/linux/dockerfile/test/python310
-export DOCKER_RUN_SCRIPT=kokoro/linux/pull_request_in_docker.sh
-export OUTPUT_DIR=testoutput
-export TEST_SET="python310"
-./kokoro/linux/build_and_run_docker.sh
diff --git a/libs/protobuf/kokoro/linux/python310/continuous.cfg b/libs/protobuf/kokoro/linux/python310/continuous.cfg
deleted file mode 100644
index 6ec74d8..0000000
--- a/libs/protobuf/kokoro/linux/python310/continuous.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/python310/build.sh"
-timeout_mins: 120
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.xml"
-  }
-}
diff --git a/libs/protobuf/kokoro/linux/python310/presubmit.cfg b/libs/protobuf/kokoro/linux/python310/presubmit.cfg
deleted file mode 100644
index 6ec74d8..0000000
--- a/libs/protobuf/kokoro/linux/python310/presubmit.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/python310/build.sh"
-timeout_mins: 120
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.xml"
-  }
-}
diff --git a/libs/protobuf/kokoro/linux/python310_cpp/build.sh b/libs/protobuf/kokoro/linux/python310_cpp/build.sh
deleted file mode 100755
index 2903a2d..0000000
--- a/libs/protobuf/kokoro/linux/python310_cpp/build.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-#
-# This is the top-level script we give to Kokoro as the entry point for
-# running the "pull request" project:
-#
-# This script selects a specific Dockerfile (for building a Docker image) and
-# a script to run inside that image.  Then we delegate to the general
-# build_and_run_docker.sh script.
-
-# Change to repo root
-cd $(dirname $0)/../../..
-
-export DOCKERHUB_ORGANIZATION=protobuftesting
-export DOCKERFILE_DIR=kokoro/linux/dockerfile/test/python310
-export DOCKER_RUN_SCRIPT=kokoro/linux/pull_request_in_docker.sh
-export OUTPUT_DIR=testoutput
-export TEST_SET="python310_cpp"
-./kokoro/linux/build_and_run_docker.sh
diff --git a/libs/protobuf/kokoro/linux/python310_cpp/continuous.cfg b/libs/protobuf/kokoro/linux/python310_cpp/continuous.cfg
deleted file mode 100644
index 7ec8441..0000000
--- a/libs/protobuf/kokoro/linux/python310_cpp/continuous.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/python310_cpp/build.sh"
-timeout_mins: 120
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.xml"
-  }
-}
diff --git a/libs/protobuf/kokoro/linux/python310_cpp/presubmit.cfg b/libs/protobuf/kokoro/linux/python310_cpp/presubmit.cfg
deleted file mode 100644
index 7ec8441..0000000
--- a/libs/protobuf/kokoro/linux/python310_cpp/presubmit.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/python310_cpp/build.sh"
-timeout_mins: 120
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.xml"
-  }
-}
diff --git a/libs/protobuf/kokoro/linux/python37/build.sh b/libs/protobuf/kokoro/linux/python37/build.sh
deleted file mode 100755
index 2117a27..0000000
--- a/libs/protobuf/kokoro/linux/python37/build.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-#
-# This is the top-level script we give to Kokoro as the entry point for
-# running the "pull request" project:
-#
-# This script selects a specific Dockerfile (for building a Docker image) and
-# a script to run inside that image.  Then we delegate to the general
-# build_and_run_docker.sh script.
-
-# Change to repo root
-cd $(dirname $0)/../../..
-
-export DOCKERHUB_ORGANIZATION=protobuftesting
-export DOCKERFILE_DIR=kokoro/linux/dockerfile/test/python37
-export DOCKER_RUN_SCRIPT=kokoro/linux/pull_request_in_docker.sh
-export OUTPUT_DIR=testoutput
-export TEST_SET="python37"
-./kokoro/linux/build_and_run_docker.sh
diff --git a/libs/protobuf/kokoro/linux/python37/continuous.cfg b/libs/protobuf/kokoro/linux/python37/continuous.cfg
deleted file mode 100644
index 9fa20c1..0000000
--- a/libs/protobuf/kokoro/linux/python37/continuous.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/python37/build.sh"
-timeout_mins: 120
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.xml"
-  }
-}
diff --git a/libs/protobuf/kokoro/linux/python37/presubmit.cfg b/libs/protobuf/kokoro/linux/python37/presubmit.cfg
deleted file mode 100644
index 9fa20c1..0000000
--- a/libs/protobuf/kokoro/linux/python37/presubmit.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/python37/build.sh"
-timeout_mins: 120
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.xml"
-  }
-}
diff --git a/libs/protobuf/kokoro/linux/python37_cpp/build.sh b/libs/protobuf/kokoro/linux/python37_cpp/build.sh
deleted file mode 100755
index 3126b48..0000000
--- a/libs/protobuf/kokoro/linux/python37_cpp/build.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-#
-# This is the top-level script we give to Kokoro as the entry point for
-# running the "pull request" project:
-#
-# This script selects a specific Dockerfile (for building a Docker image) and
-# a script to run inside that image.  Then we delegate to the general
-# build_and_run_docker.sh script.
-
-# Change to repo root
-cd $(dirname $0)/../../..
-
-export DOCKERHUB_ORGANIZATION=protobuftesting
-export DOCKERFILE_DIR=kokoro/linux/dockerfile/test/python37
-export DOCKER_RUN_SCRIPT=kokoro/linux/pull_request_in_docker.sh
-export OUTPUT_DIR=testoutput
-export TEST_SET="python37_cpp"
-./kokoro/linux/build_and_run_docker.sh
diff --git a/libs/protobuf/kokoro/linux/python37_cpp/continuous.cfg b/libs/protobuf/kokoro/linux/python37_cpp/continuous.cfg
deleted file mode 100644
index 49c441f..0000000
--- a/libs/protobuf/kokoro/linux/python37_cpp/continuous.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/python37_cpp/build.sh"
-timeout_mins: 120
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.xml"
-  }
-}
diff --git a/libs/protobuf/kokoro/linux/python37_cpp/presubmit.cfg b/libs/protobuf/kokoro/linux/python37_cpp/presubmit.cfg
deleted file mode 100644
index 49c441f..0000000
--- a/libs/protobuf/kokoro/linux/python37_cpp/presubmit.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/python37_cpp/build.sh"
-timeout_mins: 120
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.xml"
-  }
-}
diff --git a/libs/protobuf/kokoro/linux/python38/build.sh b/libs/protobuf/kokoro/linux/python38/build.sh
deleted file mode 100755
index 299c7ba..0000000
--- a/libs/protobuf/kokoro/linux/python38/build.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-#
-# This is the top-level script we give to Kokoro as the entry point for
-# running the "pull request" project:
-#
-# This script selects a specific Dockerfile (for building a Docker image) and
-# a script to run inside that image.  Then we delegate to the general
-# build_and_run_docker.sh script.
-
-# Change to repo root
-cd $(dirname $0)/../../..
-
-export DOCKERHUB_ORGANIZATION=protobuftesting
-export DOCKERFILE_DIR=kokoro/linux/dockerfile/test/python38
-export DOCKER_RUN_SCRIPT=kokoro/linux/pull_request_in_docker.sh
-export OUTPUT_DIR=testoutput
-export TEST_SET="python38"
-./kokoro/linux/build_and_run_docker.sh
diff --git a/libs/protobuf/kokoro/linux/python38/continuous.cfg b/libs/protobuf/kokoro/linux/python38/continuous.cfg
deleted file mode 100644
index 76425d2..0000000
--- a/libs/protobuf/kokoro/linux/python38/continuous.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/python38/build.sh"
-timeout_mins: 120
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.xml"
-  }
-}
diff --git a/libs/protobuf/kokoro/linux/python38/presubmit.cfg b/libs/protobuf/kokoro/linux/python38/presubmit.cfg
deleted file mode 100644
index 76425d2..0000000
--- a/libs/protobuf/kokoro/linux/python38/presubmit.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/python38/build.sh"
-timeout_mins: 120
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.xml"
-  }
-}
diff --git a/libs/protobuf/kokoro/linux/python38_cpp/build.sh b/libs/protobuf/kokoro/linux/python38_cpp/build.sh
deleted file mode 100755
index b43859b..0000000
--- a/libs/protobuf/kokoro/linux/python38_cpp/build.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-#
-# This is the top-level script we give to Kokoro as the entry point for
-# running the "pull request" project:
-#
-# This script selects a specific Dockerfile (for building a Docker image) and
-# a script to run inside that image.  Then we delegate to the general
-# build_and_run_docker.sh script.
-
-# Change to repo root
-cd $(dirname $0)/../../..
-
-export DOCKERHUB_ORGANIZATION=protobuftesting
-export DOCKERFILE_DIR=kokoro/linux/dockerfile/test/python38
-export DOCKER_RUN_SCRIPT=kokoro/linux/pull_request_in_docker.sh
-export OUTPUT_DIR=testoutput
-export TEST_SET="python38_cpp"
-./kokoro/linux/build_and_run_docker.sh
diff --git a/libs/protobuf/kokoro/linux/python38_cpp/continuous.cfg b/libs/protobuf/kokoro/linux/python38_cpp/continuous.cfg
deleted file mode 100644
index 1e8888c..0000000
--- a/libs/protobuf/kokoro/linux/python38_cpp/continuous.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/python38_cpp/build.sh"
-timeout_mins: 120
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.xml"
-  }
-}
diff --git a/libs/protobuf/kokoro/linux/python38_cpp/presubmit.cfg b/libs/protobuf/kokoro/linux/python38_cpp/presubmit.cfg
deleted file mode 100644
index 1e8888c..0000000
--- a/libs/protobuf/kokoro/linux/python38_cpp/presubmit.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/python38_cpp/build.sh"
-timeout_mins: 120
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.xml"
-  }
-}
diff --git a/libs/protobuf/kokoro/linux/python39/build.sh b/libs/protobuf/kokoro/linux/python39/build.sh
deleted file mode 100755
index 497dc66..0000000
--- a/libs/protobuf/kokoro/linux/python39/build.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-#
-# This is the top-level script we give to Kokoro as the entry point for
-# running the "pull request" project:
-#
-# This script selects a specific Dockerfile (for building a Docker image) and
-# a script to run inside that image.  Then we delegate to the general
-# build_and_run_docker.sh script.
-
-# Change to repo root
-cd $(dirname $0)/../../..
-
-export DOCKERHUB_ORGANIZATION=protobuftesting
-export DOCKERFILE_DIR=kokoro/linux/dockerfile/test/python39
-export DOCKER_RUN_SCRIPT=kokoro/linux/pull_request_in_docker.sh
-export OUTPUT_DIR=testoutput
-export TEST_SET="python39"
-./kokoro/linux/build_and_run_docker.sh
diff --git a/libs/protobuf/kokoro/linux/python39/continuous.cfg b/libs/protobuf/kokoro/linux/python39/continuous.cfg
deleted file mode 100644
index b03bc90..0000000
--- a/libs/protobuf/kokoro/linux/python39/continuous.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/python39/build.sh"
-timeout_mins: 120
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.xml"
-  }
-}
diff --git a/libs/protobuf/kokoro/linux/python39/presubmit.cfg b/libs/protobuf/kokoro/linux/python39/presubmit.cfg
deleted file mode 100644
index b03bc90..0000000
--- a/libs/protobuf/kokoro/linux/python39/presubmit.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/python39/build.sh"
-timeout_mins: 120
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.xml"
-  }
-}
diff --git a/libs/protobuf/kokoro/linux/python39_cpp/build.sh b/libs/protobuf/kokoro/linux/python39_cpp/build.sh
deleted file mode 100755
index f45d2ec..0000000
--- a/libs/protobuf/kokoro/linux/python39_cpp/build.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-#
-# This is the top-level script we give to Kokoro as the entry point for
-# running the "pull request" project:
-#
-# This script selects a specific Dockerfile (for building a Docker image) and
-# a script to run inside that image.  Then we delegate to the general
-# build_and_run_docker.sh script.
-
-# Change to repo root
-cd $(dirname $0)/../../..
-
-export DOCKERHUB_ORGANIZATION=protobuftesting
-export DOCKERFILE_DIR=kokoro/linux/dockerfile/test/python39
-export DOCKER_RUN_SCRIPT=kokoro/linux/pull_request_in_docker.sh
-export OUTPUT_DIR=testoutput
-export TEST_SET="python39_cpp"
-./kokoro/linux/build_and_run_docker.sh
diff --git a/libs/protobuf/kokoro/linux/python39_cpp/continuous.cfg b/libs/protobuf/kokoro/linux/python39_cpp/continuous.cfg
deleted file mode 100644
index dd84fbe..0000000
--- a/libs/protobuf/kokoro/linux/python39_cpp/continuous.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/python39_cpp/build.sh"
-timeout_mins: 120
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.xml"
-  }
-}
diff --git a/libs/protobuf/kokoro/linux/python39_cpp/presubmit.cfg b/libs/protobuf/kokoro/linux/python39_cpp/presubmit.cfg
deleted file mode 100644
index dd84fbe..0000000
--- a/libs/protobuf/kokoro/linux/python39_cpp/presubmit.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/python39_cpp/build.sh"
-timeout_mins: 120
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.xml"
-  }
-}
diff --git a/libs/protobuf/kokoro/linux/python_aarch64/build.sh b/libs/protobuf/kokoro/linux/python_aarch64/build.sh
deleted file mode 100755
index 2c67396..0000000
--- a/libs/protobuf/kokoro/linux/python_aarch64/build.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-#
-# This is the top-level script we give to Kokoro as the entry point for
-# running the "continuous" and "presubmit" jobs.
-
-set -ex
-
-# Change to repo root
-cd $(dirname $0)/../../..
-
-kokoro/linux/aarch64/qemu_helpers/prepare_qemu.sh
-
-kokoro/linux/aarch64/test_python_aarch64.sh
diff --git a/libs/protobuf/kokoro/linux/python_aarch64/continuous.cfg b/libs/protobuf/kokoro/linux/python_aarch64/continuous.cfg
deleted file mode 100644
index dee4a47..0000000
--- a/libs/protobuf/kokoro/linux/python_aarch64/continuous.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/python_aarch64/build.sh"
-timeout_mins: 120
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.xml"
-  }
-}
diff --git a/libs/protobuf/kokoro/linux/python_aarch64/presubmit.cfg b/libs/protobuf/kokoro/linux/python_aarch64/presubmit.cfg
deleted file mode 100644
index dee4a47..0000000
--- a/libs/protobuf/kokoro/linux/python_aarch64/presubmit.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/python_aarch64/build.sh"
-timeout_mins: 120
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.xml"
-  }
-}
diff --git a/libs/protobuf/kokoro/linux/ruby25/build.sh b/libs/protobuf/kokoro/linux/ruby25/build.sh
deleted file mode 100755
index 1e82ec5..0000000
--- a/libs/protobuf/kokoro/linux/ruby25/build.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-#
-# This is the top-level script we give to Kokoro as the entry point for
-# running the "pull request" project:
-#
-# This script selects a specific Dockerfile (for building a Docker image) and
-# a script to run inside that image.  Then we delegate to the general
-# build_and_run_docker.sh script.
-
-# Change to repo root
-cd $(dirname $0)/../../..
-
-export DOCKERHUB_ORGANIZATION=protobuftesting
-export DOCKERFILE_DIR=kokoro/linux/dockerfile/test/ruby
-export DOCKER_RUN_SCRIPT=kokoro/linux/pull_request_in_docker.sh
-export OUTPUT_DIR=testoutput
-export TEST_SET="ruby25"
-./kokoro/linux/build_and_run_docker.sh
diff --git a/libs/protobuf/kokoro/linux/ruby25/continuous.cfg b/libs/protobuf/kokoro/linux/ruby25/continuous.cfg
deleted file mode 100644
index dee2db0..0000000
--- a/libs/protobuf/kokoro/linux/ruby25/continuous.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/ruby25/build.sh"
-timeout_mins: 120
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.xml"
-  }
-}
diff --git a/libs/protobuf/kokoro/linux/ruby25/presubmit.cfg b/libs/protobuf/kokoro/linux/ruby25/presubmit.cfg
deleted file mode 100644
index dee2db0..0000000
--- a/libs/protobuf/kokoro/linux/ruby25/presubmit.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/ruby25/build.sh"
-timeout_mins: 120
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.xml"
-  }
-}
diff --git a/libs/protobuf/kokoro/linux/ruby26/build.sh b/libs/protobuf/kokoro/linux/ruby26/build.sh
deleted file mode 100755
index 72d2d45..0000000
--- a/libs/protobuf/kokoro/linux/ruby26/build.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-#
-# This is the top-level script we give to Kokoro as the entry point for
-# running the "pull request" project:
-#
-# This script selects a specific Dockerfile (for building a Docker image) and
-# a script to run inside that image.  Then we delegate to the general
-# build_and_run_docker.sh script.
-
-# Change to repo root
-cd $(dirname $0)/../../..
-
-export DOCKERHUB_ORGANIZATION=protobuftesting
-export DOCKERFILE_DIR=kokoro/linux/dockerfile/test/ruby
-export DOCKER_RUN_SCRIPT=kokoro/linux/pull_request_in_docker.sh
-export OUTPUT_DIR=testoutput
-export TEST_SET="ruby26"
-./kokoro/linux/build_and_run_docker.sh
diff --git a/libs/protobuf/kokoro/linux/ruby26/continuous.cfg b/libs/protobuf/kokoro/linux/ruby26/continuous.cfg
deleted file mode 100644
index 4779065..0000000
--- a/libs/protobuf/kokoro/linux/ruby26/continuous.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/ruby26/build.sh"
-timeout_mins: 120
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.xml"
-  }
-}
diff --git a/libs/protobuf/kokoro/linux/ruby26/presubmit.cfg b/libs/protobuf/kokoro/linux/ruby26/presubmit.cfg
deleted file mode 100644
index 4779065..0000000
--- a/libs/protobuf/kokoro/linux/ruby26/presubmit.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/ruby26/build.sh"
-timeout_mins: 120
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.xml"
-  }
-}
diff --git a/libs/protobuf/kokoro/linux/ruby27/build.sh b/libs/protobuf/kokoro/linux/ruby27/build.sh
deleted file mode 100755
index c38ee36..0000000
--- a/libs/protobuf/kokoro/linux/ruby27/build.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-#
-# This is the top-level script we give to Kokoro as the entry point for
-# running the "pull request" project:
-#
-# This script selects a specific Dockerfile (for building a Docker image) and
-# a script to run inside that image.  Then we delegate to the general
-# build_and_run_docker.sh script.
-
-# Change to repo root
-cd $(dirname $0)/../../..
-
-export DOCKERHUB_ORGANIZATION=protobuftesting
-export DOCKERFILE_DIR=kokoro/linux/dockerfile/test/ruby
-export DOCKER_RUN_SCRIPT=kokoro/linux/pull_request_in_docker.sh
-export OUTPUT_DIR=testoutput
-export TEST_SET="ruby27"
-./kokoro/linux/build_and_run_docker.sh
diff --git a/libs/protobuf/kokoro/linux/ruby27/continuous.cfg b/libs/protobuf/kokoro/linux/ruby27/continuous.cfg
deleted file mode 100644
index 9cce8c9..0000000
--- a/libs/protobuf/kokoro/linux/ruby27/continuous.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/ruby27/build.sh"
-timeout_mins: 120
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.xml"
-  }
-}
diff --git a/libs/protobuf/kokoro/linux/ruby27/presubmit.cfg b/libs/protobuf/kokoro/linux/ruby27/presubmit.cfg
deleted file mode 100644
index 9cce8c9..0000000
--- a/libs/protobuf/kokoro/linux/ruby27/presubmit.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/ruby27/build.sh"
-timeout_mins: 120
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.xml"
-  }
-}
diff --git a/libs/protobuf/kokoro/linux/ruby30/build.sh b/libs/protobuf/kokoro/linux/ruby30/build.sh
deleted file mode 100755
index 9e44575..0000000
--- a/libs/protobuf/kokoro/linux/ruby30/build.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-#
-# This is the top-level script we give to Kokoro as the entry point for
-# running the "pull request" project:
-#
-# This script selects a specific Dockerfile (for building a Docker image) and
-# a script to run inside that image.  Then we delegate to the general
-# build_and_run_docker.sh script.
-
-# Change to repo root
-cd $(dirname $0)/../../..
-
-export DOCKERHUB_ORGANIZATION=protobuftesting
-export DOCKERFILE_DIR=kokoro/linux/dockerfile/test/ruby
-export DOCKER_RUN_SCRIPT=kokoro/linux/pull_request_in_docker.sh
-export OUTPUT_DIR=testoutput
-export TEST_SET="ruby30"
-./kokoro/linux/build_and_run_docker.sh
diff --git a/libs/protobuf/kokoro/linux/ruby30/continuous.cfg b/libs/protobuf/kokoro/linux/ruby30/continuous.cfg
deleted file mode 100644
index b03a335..0000000
--- a/libs/protobuf/kokoro/linux/ruby30/continuous.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/ruby30/build.sh"
-timeout_mins: 120
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.xml"
-  }
-}
diff --git a/libs/protobuf/kokoro/linux/ruby30/presubmit.cfg b/libs/protobuf/kokoro/linux/ruby30/presubmit.cfg
deleted file mode 100644
index b03a335..0000000
--- a/libs/protobuf/kokoro/linux/ruby30/presubmit.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/ruby30/build.sh"
-timeout_mins: 120
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.xml"
-  }
-}
diff --git a/libs/protobuf/kokoro/linux/ruby31/build.sh b/libs/protobuf/kokoro/linux/ruby31/build.sh
deleted file mode 100644
index c22bdae..0000000
--- a/libs/protobuf/kokoro/linux/ruby31/build.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-#
-# This is the top-level script we give to Kokoro as the entry point for
-# running the "pull request" project:
-#
-# This script selects a specific Dockerfile (for building a Docker image) and
-# a script to run inside that image.  Then we delegate to the general
-# build_and_run_docker.sh script.
-
-# Change to repo root
-cd $(dirname $0)/../../..
-
-export DOCKERHUB_ORGANIZATION=protobuftesting
-export DOCKERFILE_DIR=kokoro/linux/dockerfile/test/ruby
-export DOCKER_RUN_SCRIPT=kokoro/linux/pull_request_in_docker.sh
-export OUTPUT_DIR=testoutput
-export TEST_SET="ruby31"
-./kokoro/linux/build_and_run_docker.sh
diff --git a/libs/protobuf/kokoro/linux/ruby31/continuous.cfg b/libs/protobuf/kokoro/linux/ruby31/continuous.cfg
deleted file mode 100644
index 0477912..0000000
--- a/libs/protobuf/kokoro/linux/ruby31/continuous.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/ruby31/build.sh"
-timeout_mins: 120
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.xml"
-  }
-}
diff --git a/libs/protobuf/kokoro/linux/ruby31/presubmit.cfg b/libs/protobuf/kokoro/linux/ruby31/presubmit.cfg
deleted file mode 100644
index 0477912..0000000
--- a/libs/protobuf/kokoro/linux/ruby31/presubmit.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/ruby31/build.sh"
-timeout_mins: 120
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.xml"
-  }
-}
diff --git a/libs/protobuf/kokoro/linux/ruby_aarch64/build.sh b/libs/protobuf/kokoro/linux/ruby_aarch64/build.sh
deleted file mode 100755
index 6473e0d..0000000
--- a/libs/protobuf/kokoro/linux/ruby_aarch64/build.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-#
-# This is the top-level script we give to Kokoro as the entry point for
-# running the "continuous" and "presubmit" jobs.
-
-set -ex
-
-# Change to repo root
-cd $(dirname $0)/../../..
-
-# Initialize any submodules.
-git submodule update --init --recursive
-
-kokoro/linux/aarch64/qemu_helpers/prepare_qemu.sh
-
-kokoro/linux/aarch64/test_ruby_aarch64.sh
diff --git a/libs/protobuf/kokoro/linux/ruby_aarch64/continuous.cfg b/libs/protobuf/kokoro/linux/ruby_aarch64/continuous.cfg
deleted file mode 100644
index ae82696..0000000
--- a/libs/protobuf/kokoro/linux/ruby_aarch64/continuous.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/ruby_aarch64/build.sh"
-timeout_mins: 120
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.xml"
-  }
-}
diff --git a/libs/protobuf/kokoro/linux/ruby_aarch64/presubmit.cfg b/libs/protobuf/kokoro/linux/ruby_aarch64/presubmit.cfg
deleted file mode 100644
index ae82696..0000000
--- a/libs/protobuf/kokoro/linux/ruby_aarch64/presubmit.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/linux/ruby_aarch64/build.sh"
-timeout_mins: 120
-
-action {
-  define_artifacts {
-    regex: "**/sponge_log.xml"
-  }
-}
diff --git a/libs/protobuf/kokoro/macos-next/README.md b/libs/protobuf/kokoro/macos-next/README.md
deleted file mode 100644
index 4657855..0000000
--- a/libs/protobuf/kokoro/macos-next/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# macOS-next
-
-This builder is temporary for developing and testing builds using the "next"
-macOS version without affecting the ordinary builds.
diff --git a/libs/protobuf/kokoro/macos-next/cpp/build.sh b/libs/protobuf/kokoro/macos-next/cpp/build.sh
deleted file mode 100755
index 490e990..0000000
--- a/libs/protobuf/kokoro/macos-next/cpp/build.sh
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/bin/bash -eux
-#
-# Build file to set up and run tests
-
-set -o pipefail
-
-if [[ -h /tmpfs ]] && [[ ${PWD} == /tmpfs/src ]]; then
-  # Workaround for internal Kokoro bug: b/227401944
-  cd /Volumes/BuildData/tmpfs/src
-fi
-
-# These vars can be changed when running manually, e.g.:
-#
-#   % BUILD_CONFIG=RelWithDebInfo path/to/build.sh
-
-# By default, build using Debug config.
-: ${BUILD_CONFIG:=Debug}
-
-# By default, find the sources based on this script path.
-: ${SOURCE_DIR:=$(cd $(dirname $0)/../../..; pwd)}
-
-# By default, put outputs under <git root>/cmake/build.
-: ${BUILD_DIR:=${SOURCE_DIR}/cmake/build}
-
-source ${SOURCE_DIR}/kokoro/caplog.sh
-
-#
-# Update submodules
-#
-git -C "${SOURCE_DIR}" submodule update --init --recursive
-
-#
-# Configure and build in a separate directory
-#
-mkdir -p "${BUILD_DIR}"
-
-caplog 01_configure \
-  cmake -S "${SOURCE_DIR}" -B "${BUILD_DIR}" ${CAPLOG_CMAKE_ARGS:-}
-
-if [[ -n ${CAPLOG_DIR:-} ]]; then
-  mkdir -p "${CAPLOG_DIR}/CMakeFiles"
-  cp "${BUILD_DIR}"/CMakeFiles/CMake*.log "${CAPLOG_DIR}/CMakeFiles"
-fi
-
-caplog 02_build \
-  cmake --build "${BUILD_DIR}" --config "${BUILD_CONFIG}"
-
-#
-# Run tests
-#
-(
-  cd "${BUILD_DIR}"
-  caplog 03_combined_testlog \
-    ctest -C "${BUILD_CONFIG}" -j4 ${CAPLOG_CTEST_ARGS:-}
-)
diff --git a/libs/protobuf/kokoro/macos-next/cpp/continuous.cfg b/libs/protobuf/kokoro/macos-next/cpp/continuous.cfg
deleted file mode 100644
index 166caa5..0000000
--- a/libs/protobuf/kokoro/macos-next/cpp/continuous.cfg
+++ /dev/null
@@ -1,13 +0,0 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/macos-next/cpp/build.sh"
-timeout_mins: 1440
-
-# Upload logs
-action: {
-  define_artifacts: {
-    regex: "**/*sponge_log.log"
-    regex: "**/*sponge_log.xml"
-  }
-}
diff --git a/libs/protobuf/kokoro/macos-next/cpp/presubmit.cfg b/libs/protobuf/kokoro/macos-next/cpp/presubmit.cfg
deleted file mode 100644
index 166caa5..0000000
--- a/libs/protobuf/kokoro/macos-next/cpp/presubmit.cfg
+++ /dev/null
@@ -1,13 +0,0 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/macos-next/cpp/build.sh"
-timeout_mins: 1440
-
-# Upload logs
-action: {
-  define_artifacts: {
-    regex: "**/*sponge_log.log"
-    regex: "**/*sponge_log.xml"
-  }
-}
diff --git a/libs/protobuf/kokoro/macos/cpp/build.sh b/libs/protobuf/kokoro/macos/cpp/build.sh
deleted file mode 100755
index bae2ebb..0000000
--- a/libs/protobuf/kokoro/macos/cpp/build.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-#
-# Build file to set up and run tests
-
-# Change to repo root
-cd $(dirname $0)/../../..
-
-# Prepare worker environment to run tests
-source kokoro/macos/prepare_build_macos_rc
-
-./tests.sh cpp
diff --git a/libs/protobuf/kokoro/macos/cpp/continuous.cfg b/libs/protobuf/kokoro/macos/cpp/continuous.cfg
deleted file mode 100644
index 4bea1cb..0000000
--- a/libs/protobuf/kokoro/macos/cpp/continuous.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/macos/cpp/build.sh"
-timeout_mins: 1440
diff --git a/libs/protobuf/kokoro/macos/cpp/presubmit.cfg b/libs/protobuf/kokoro/macos/cpp/presubmit.cfg
deleted file mode 100644
index 4bea1cb..0000000
--- a/libs/protobuf/kokoro/macos/cpp/presubmit.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/macos/cpp/build.sh"
-timeout_mins: 1440
diff --git a/libs/protobuf/kokoro/macos/cpp_distcheck/build.sh b/libs/protobuf/kokoro/macos/cpp_distcheck/build.sh
deleted file mode 100755
index d729b63..0000000
--- a/libs/protobuf/kokoro/macos/cpp_distcheck/build.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-#
-# Build file to set up and run tests
-
-# Change to repo root
-cd $(dirname $0)/../../..
-
-# Prepare worker environment to run tests
-source kokoro/macos/prepare_build_macos_rc
-
-./tests.sh cpp_distcheck
diff --git a/libs/protobuf/kokoro/macos/cpp_distcheck/continuous.cfg b/libs/protobuf/kokoro/macos/cpp_distcheck/continuous.cfg
deleted file mode 100644
index 89441bc..0000000
--- a/libs/protobuf/kokoro/macos/cpp_distcheck/continuous.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/macos/cpp_distcheck/build.sh"
-timeout_mins: 1440
diff --git a/libs/protobuf/kokoro/macos/cpp_distcheck/presubmit.cfg b/libs/protobuf/kokoro/macos/cpp_distcheck/presubmit.cfg
deleted file mode 100644
index 89441bc..0000000
--- a/libs/protobuf/kokoro/macos/cpp_distcheck/presubmit.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/macos/cpp_distcheck/build.sh"
-timeout_mins: 1440
diff --git a/libs/protobuf/kokoro/macos/objectivec_ios_debug/build.sh b/libs/protobuf/kokoro/macos/objectivec_ios_debug/build.sh
deleted file mode 100755
index 1055d72..0000000
--- a/libs/protobuf/kokoro/macos/objectivec_ios_debug/build.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-#
-# Build file to set up and run tests
-
-# Change to repo root
-cd $(dirname $0)/../../..
-
-# Prepare worker environment to run tests
-source kokoro/macos/prepare_build_macos_rc
-
-./tests.sh objectivec_ios_debug
diff --git a/libs/protobuf/kokoro/macos/objectivec_ios_debug/continuous.cfg b/libs/protobuf/kokoro/macos/objectivec_ios_debug/continuous.cfg
deleted file mode 100644
index 473d545..0000000
--- a/libs/protobuf/kokoro/macos/objectivec_ios_debug/continuous.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/macos/objectivec_ios_debug/build.sh"
-timeout_mins: 1440
diff --git a/libs/protobuf/kokoro/macos/objectivec_ios_debug/presubmit.cfg b/libs/protobuf/kokoro/macos/objectivec_ios_debug/presubmit.cfg
deleted file mode 100644
index 473d545..0000000
--- a/libs/protobuf/kokoro/macos/objectivec_ios_debug/presubmit.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/macos/objectivec_ios_debug/build.sh"
-timeout_mins: 1440
diff --git a/libs/protobuf/kokoro/macos/objectivec_ios_release/build.sh b/libs/protobuf/kokoro/macos/objectivec_ios_release/build.sh
deleted file mode 100755
index 76ce3ba..0000000
--- a/libs/protobuf/kokoro/macos/objectivec_ios_release/build.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-#
-# Build file to set up and run tests
-
-# Change to repo root
-cd $(dirname $0)/../../..
-
-# Prepare worker environment to run tests
-source kokoro/macos/prepare_build_macos_rc
-
-./tests.sh objectivec_ios_release
diff --git a/libs/protobuf/kokoro/macos/objectivec_ios_release/continuous.cfg b/libs/protobuf/kokoro/macos/objectivec_ios_release/continuous.cfg
deleted file mode 100644
index 3cbfb68..0000000
--- a/libs/protobuf/kokoro/macos/objectivec_ios_release/continuous.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/macos/objectivec_ios_release/build.sh"
-timeout_mins: 1440
diff --git a/libs/protobuf/kokoro/macos/objectivec_ios_release/presubmit.cfg b/libs/protobuf/kokoro/macos/objectivec_ios_release/presubmit.cfg
deleted file mode 100644
index 3cbfb68..0000000
--- a/libs/protobuf/kokoro/macos/objectivec_ios_release/presubmit.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/macos/objectivec_ios_release/build.sh"
-timeout_mins: 1440
diff --git a/libs/protobuf/kokoro/macos/objectivec_osx/build.sh b/libs/protobuf/kokoro/macos/objectivec_osx/build.sh
deleted file mode 100755
index 000be27..0000000
--- a/libs/protobuf/kokoro/macos/objectivec_osx/build.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-#
-# Build file to set up and run tests
-
-# Change to repo root
-cd $(dirname $0)/../../..
-
-# Prepare worker environment to run tests
-source kokoro/macos/prepare_build_macos_rc
-
-./tests.sh objectivec_osx
diff --git a/libs/protobuf/kokoro/macos/objectivec_osx/continuous.cfg b/libs/protobuf/kokoro/macos/objectivec_osx/continuous.cfg
deleted file mode 100644
index 41bd46a..0000000
--- a/libs/protobuf/kokoro/macos/objectivec_osx/continuous.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/macos/objectivec_osx/build.sh"
-timeout_mins: 1440
diff --git a/libs/protobuf/kokoro/macos/objectivec_osx/presubmit.cfg b/libs/protobuf/kokoro/macos/objectivec_osx/presubmit.cfg
deleted file mode 100644
index 41bd46a..0000000
--- a/libs/protobuf/kokoro/macos/objectivec_osx/presubmit.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/macos/objectivec_osx/build.sh"
-timeout_mins: 1440
diff --git a/libs/protobuf/kokoro/macos/php7.0_mac/build.sh b/libs/protobuf/kokoro/macos/php7.0_mac/build.sh
deleted file mode 100755
index c6717e0..0000000
--- a/libs/protobuf/kokoro/macos/php7.0_mac/build.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-#
-# Build file to set up and run tests
-
-# Change to repo root
-cd $(dirname $0)/../../..
-
-# Prepare worker environment to run tests
-source kokoro/macos/prepare_build_macos_rc
-
-# TODO(mkruskal) Re-enable this once we can get a working PHP 7.0 installed.
-#./tests.sh php7.0_mac
diff --git a/libs/protobuf/kokoro/macos/php7.0_mac/continuous.cfg b/libs/protobuf/kokoro/macos/php7.0_mac/continuous.cfg
deleted file mode 100644
index c2c1811..0000000
--- a/libs/protobuf/kokoro/macos/php7.0_mac/continuous.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/macos/php7.0_mac/build.sh"
-timeout_mins: 1440
diff --git a/libs/protobuf/kokoro/macos/php7.0_mac/presubmit.cfg b/libs/protobuf/kokoro/macos/php7.0_mac/presubmit.cfg
deleted file mode 100644
index c2c1811..0000000
--- a/libs/protobuf/kokoro/macos/php7.0_mac/presubmit.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/macos/php7.0_mac/build.sh"
-timeout_mins: 1440
diff --git a/libs/protobuf/kokoro/macos/php7.3_mac/build.sh b/libs/protobuf/kokoro/macos/php7.3_mac/build.sh
deleted file mode 100755
index 2688ddb..0000000
--- a/libs/protobuf/kokoro/macos/php7.3_mac/build.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-#
-# Build file to set up and run tests
-
-# Change to repo root
-cd $(dirname $0)/../../..
-
-# Prepare worker environment to run tests
-source kokoro/macos/prepare_build_macos_rc
-
-# TODO(mkruskal) Re-enable this once we can get a working PHP 7.0 installed.
-#./tests.sh php7.3_mac
diff --git a/libs/protobuf/kokoro/macos/php7.3_mac/continuous.cfg b/libs/protobuf/kokoro/macos/php7.3_mac/continuous.cfg
deleted file mode 100644
index 9a71745..0000000
--- a/libs/protobuf/kokoro/macos/php7.3_mac/continuous.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/macos/php7.3_mac/build.sh"
-timeout_mins: 1440
diff --git a/libs/protobuf/kokoro/macos/php7.3_mac/presubmit.cfg b/libs/protobuf/kokoro/macos/php7.3_mac/presubmit.cfg
deleted file mode 100644
index 9a71745..0000000
--- a/libs/protobuf/kokoro/macos/php7.3_mac/presubmit.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/macos/php7.3_mac/build.sh"
-timeout_mins: 1440
diff --git a/libs/protobuf/kokoro/macos/prepare_build_macos_rc b/libs/protobuf/kokoro/macos/prepare_build_macos_rc
deleted file mode 100755
index 7a150c7..0000000
--- a/libs/protobuf/kokoro/macos/prepare_build_macos_rc
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/bash
-#
-# This script sets up a Kokoro MacOS worker for running Protobuf tests
-
-set -eux
-
-export HOMEBREW_PREFIX=$(brew --prefix)
-
-##
-# Remove any pre-existing protobuf installation.
-brew uninstall protobuf
-
-##
-# Select Xcode version
-
-##
-# Select Xcode version
-export DEVELOPER_DIR=/Applications/Xcode_14.app/Contents/Developer
-sudo xcode-select -s "${DEVELOPER_DIR}"
-
-##
-# Select C/C++ compilers
-
-export CC=gcc
-export CXX=g++
-
-##
-# Install Python 2 by default
-
-eval "$(pyenv init -)"
-pyenv install -v -s 2.7.18 && pyenv global 2.7.18
-
-##
-# Install Tox
-
-if [[ "${KOKORO_INSTALL_TOX:-}" == "yes" ]] ; then
-  pyenv install -v -s 3.7.13
-  pyenv global 3.7.13
-  sudo python -m pip install --upgrade pip 'tox==3.27.1' tox-pyenv
-fi
-
-##
-# Setup RVM
-if [[ "${KOKORO_INSTALL_RVM:-}" == "yes" ]] ; then
-    git config --global --add safe.directory $HOMEBREW_PREFIX/Library/Taps/homebrew/homebrew-cask
-    git config --global --add safe.directory $HOMEBREW_PREFIX/Library/Taps/homebrew/homebrew-core
-    git config --global --add safe.directory $HOMEBREW_PREFIX/Library/Taps/homebrew/homebrew-services
-    sudo chown -R $(whoami) $HOME/.rvm/
-fi
diff --git a/libs/protobuf/kokoro/macos/python/build.sh b/libs/protobuf/kokoro/macos/python/build.sh
deleted file mode 100755
index 388e24b..0000000
--- a/libs/protobuf/kokoro/macos/python/build.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-#
-# Build file to set up and run tests
-
-# Change to repo root
-cd $(dirname $0)/../../..
-
-# Prepare worker environment to run tests
-KOKORO_INSTALL_TOX=yes
-source kokoro/macos/prepare_build_macos_rc
-
-./tests.sh python
diff --git a/libs/protobuf/kokoro/macos/python/continuous.cfg b/libs/protobuf/kokoro/macos/python/continuous.cfg
deleted file mode 100644
index 0fc8b50..0000000
--- a/libs/protobuf/kokoro/macos/python/continuous.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/macos/python/build.sh"
-timeout_mins: 1440
diff --git a/libs/protobuf/kokoro/macos/python/presubmit.cfg b/libs/protobuf/kokoro/macos/python/presubmit.cfg
deleted file mode 100644
index 0fc8b50..0000000
--- a/libs/protobuf/kokoro/macos/python/presubmit.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/macos/python/build.sh"
-timeout_mins: 1440
diff --git a/libs/protobuf/kokoro/macos/python_cpp/build.sh b/libs/protobuf/kokoro/macos/python_cpp/build.sh
deleted file mode 100755
index f86dd6f..0000000
--- a/libs/protobuf/kokoro/macos/python_cpp/build.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-#
-# Build file to set up and run tests
-
-# Change to repo root
-cd $(dirname $0)/../../..
-
-# Prepare worker environment to run tests
-KOKORO_INSTALL_TOX=yes
-source kokoro/macos/prepare_build_macos_rc
-g++ --version
-
-./tests.sh python_cpp
diff --git a/libs/protobuf/kokoro/macos/python_cpp/continuous.cfg b/libs/protobuf/kokoro/macos/python_cpp/continuous.cfg
deleted file mode 100644
index 22f4a0e..0000000
--- a/libs/protobuf/kokoro/macos/python_cpp/continuous.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/macos/python_cpp/build.sh"
-timeout_mins: 1440
diff --git a/libs/protobuf/kokoro/macos/python_cpp/presubmit.cfg b/libs/protobuf/kokoro/macos/python_cpp/presubmit.cfg
deleted file mode 100644
index 22f4a0e..0000000
--- a/libs/protobuf/kokoro/macos/python_cpp/presubmit.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/macos/python_cpp/build.sh"
-timeout_mins: 1440
diff --git a/libs/protobuf/kokoro/macos/ruby25/build.sh b/libs/protobuf/kokoro/macos/ruby25/build.sh
deleted file mode 100755
index 48c8940..0000000
--- a/libs/protobuf/kokoro/macos/ruby25/build.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-#
-# Build file to set up and run tests
-
-# Change to repo root
-cd $(dirname $0)/../../..
-
-# Prepare worker environment to run tests
-KOKORO_INSTALL_RVM=yes
-source kokoro/macos/prepare_build_macos_rc
-
-./tests.sh ruby25
diff --git a/libs/protobuf/kokoro/macos/ruby25/continuous.cfg b/libs/protobuf/kokoro/macos/ruby25/continuous.cfg
deleted file mode 100644
index b3755e4..0000000
--- a/libs/protobuf/kokoro/macos/ruby25/continuous.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/macos/ruby25/build.sh"
-timeout_mins: 1440
diff --git a/libs/protobuf/kokoro/macos/ruby25/presubmit.cfg b/libs/protobuf/kokoro/macos/ruby25/presubmit.cfg
deleted file mode 100644
index b3755e4..0000000
--- a/libs/protobuf/kokoro/macos/ruby25/presubmit.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/macos/ruby25/build.sh"
-timeout_mins: 1440
diff --git a/libs/protobuf/kokoro/macos/ruby26/build.sh b/libs/protobuf/kokoro/macos/ruby26/build.sh
deleted file mode 100755
index 1b94fe1..0000000
--- a/libs/protobuf/kokoro/macos/ruby26/build.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-#
-# Build file to set up and run tests
-
-# Change to repo root
-cd $(dirname $0)/../../..
-
-# Prepare worker environment to run tests
-KOKORO_INSTALL_RVM=yes
-source kokoro/macos/prepare_build_macos_rc
-
-./tests.sh ruby26
diff --git a/libs/protobuf/kokoro/macos/ruby26/continuous.cfg b/libs/protobuf/kokoro/macos/ruby26/continuous.cfg
deleted file mode 100644
index 688f63c..0000000
--- a/libs/protobuf/kokoro/macos/ruby26/continuous.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/macos/ruby26/build.sh"
-timeout_mins: 1440
diff --git a/libs/protobuf/kokoro/macos/ruby26/presubmit.cfg b/libs/protobuf/kokoro/macos/ruby26/presubmit.cfg
deleted file mode 100644
index 688f63c..0000000
--- a/libs/protobuf/kokoro/macos/ruby26/presubmit.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/macos/ruby26/build.sh"
-timeout_mins: 1440
diff --git a/libs/protobuf/kokoro/macos/ruby27/build.sh b/libs/protobuf/kokoro/macos/ruby27/build.sh
deleted file mode 100755
index baebdb7..0000000
--- a/libs/protobuf/kokoro/macos/ruby27/build.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-#
-# Build file to set up and run tests
-
-# Change to repo root
-cd $(dirname $0)/../../..
-
-# Prepare worker environment to run tests
-KOKORO_INSTALL_RVM=yes
-source kokoro/macos/prepare_build_macos_rc
-
-./tests.sh ruby27
diff --git a/libs/protobuf/kokoro/macos/ruby27/continuous.cfg b/libs/protobuf/kokoro/macos/ruby27/continuous.cfg
deleted file mode 100644
index b10b455..0000000
--- a/libs/protobuf/kokoro/macos/ruby27/continuous.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/macos/ruby27/build.sh"
-timeout_mins: 1440
diff --git a/libs/protobuf/kokoro/macos/ruby27/presubmit.cfg b/libs/protobuf/kokoro/macos/ruby27/presubmit.cfg
deleted file mode 100644
index b10b455..0000000
--- a/libs/protobuf/kokoro/macos/ruby27/presubmit.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/macos/ruby27/build.sh"
-timeout_mins: 1440
diff --git a/libs/protobuf/kokoro/macos/ruby30/build.sh b/libs/protobuf/kokoro/macos/ruby30/build.sh
deleted file mode 100755
index b1e0641..0000000
--- a/libs/protobuf/kokoro/macos/ruby30/build.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-#
-# Build file to set up and run tests
-
-# Change to repo root
-cd $(dirname $0)/../../..
-
-# Prepare worker environment to run tests
-KOKORO_INSTALL_RVM=yes
-source kokoro/macos/prepare_build_macos_rc
-
-./tests.sh ruby30
diff --git a/libs/protobuf/kokoro/macos/ruby30/continuous.cfg b/libs/protobuf/kokoro/macos/ruby30/continuous.cfg
deleted file mode 100644
index d505117..0000000
--- a/libs/protobuf/kokoro/macos/ruby30/continuous.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/macos/ruby30/build.sh"
-timeout_mins: 1440
diff --git a/libs/protobuf/kokoro/macos/ruby30/presubmit.cfg b/libs/protobuf/kokoro/macos/ruby30/presubmit.cfg
deleted file mode 100644
index d505117..0000000
--- a/libs/protobuf/kokoro/macos/ruby30/presubmit.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/macos/ruby30/build.sh"
-timeout_mins: 1440
diff --git a/libs/protobuf/kokoro/macos/ruby31/build.sh b/libs/protobuf/kokoro/macos/ruby31/build.sh
deleted file mode 100644
index 3cf61f6..0000000
--- a/libs/protobuf/kokoro/macos/ruby31/build.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-#
-# Build file to set up and run tests
-
-# Change to repo root
-cd $(dirname $0)/../../..
-
-# Fix locale issues in Monterey.
-export LC_ALL=en_US.UTF-8
-
-# Prepare worker environment to run tests
-KOKORO_INSTALL_RVM=yes
-source kokoro/macos/prepare_build_macos_rc
-
-./tests.sh ruby31
diff --git a/libs/protobuf/kokoro/macos/ruby31/continuous.cfg b/libs/protobuf/kokoro/macos/ruby31/continuous.cfg
deleted file mode 100644
index 19e16b3..0000000
--- a/libs/protobuf/kokoro/macos/ruby31/continuous.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/macos/ruby31/build.sh"
-timeout_mins: 1440
diff --git a/libs/protobuf/kokoro/macos/ruby31/presubmit.cfg b/libs/protobuf/kokoro/macos/ruby31/presubmit.cfg
deleted file mode 100644
index 19e16b3..0000000
--- a/libs/protobuf/kokoro/macos/ruby31/presubmit.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/macos/ruby31/build.sh"
-timeout_mins: 1440
diff --git a/libs/protobuf/kokoro/release/collect_all_artifacts.cfg b/libs/protobuf/kokoro/release/collect_all_artifacts.cfg
deleted file mode 100644
index 3da1a7c..0000000
--- a/libs/protobuf/kokoro/release/collect_all_artifacts.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-build_file: "protobuf/kokoro/release/collect_all_artifacts.sh"
-
-action {
-  define_artifacts {
-    regex: "github/protobuf/artifacts/**"
-  }
-}
diff --git a/libs/protobuf/kokoro/release/collect_all_artifacts.sh b/libs/protobuf/kokoro/release/collect_all_artifacts.sh
deleted file mode 100755
index 6e0d152..0000000
--- a/libs/protobuf/kokoro/release/collect_all_artifacts.sh
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-# Change to repo root.
-cd $(dirname $0)/../..
-
-# Initialize any submodules.
-git submodule update --init --recursive
-
-# The directory with all resulting artifacts
-mkdir -p artifacts
-
-# Artifacts from all predecessor jobs get copied to this directory by kokoro
-INPUT_ARTIFACTS_DIR="${KOKORO_GFILE_DIR}/github/protobuf"
-
-# TODO(jtattermusch): remove listing the files, but for now it make it easier
-# to iterate on the script.
-ls -R ${INPUT_ARTIFACTS_DIR}
-
-# ====================================
-# Copy to expose all the artifacts from the predecessor jobs to the output
-# TODO(jtattermusch): the directory layout of the artifact builds is pretty messy,
-# so will be the output artifacts of this job.
-cp -r ${INPUT_ARTIFACTS_DIR}/* artifacts
-
-# ====================================
-# Build Google.Protobuf.Tools C# nuget
-# The reason it's being done in this script is that we need access to protoc binaries
-# built on multiple platform (the build is performed by the "build artifact" step)
-# and adding and extra chained build just for building the Google.Protobuf.Tools
-# nuget seems like an overkill.
-cd csharp
-mkdir -p protoc/windows_x86
-mkdir -p protoc/windows_x64
-cp ${INPUT_ARTIFACTS_DIR}/build32/Release/protoc.exe protoc/windows_x86/protoc.exe
-cp ${INPUT_ARTIFACTS_DIR}/build64/Release/protoc.exe protoc/windows_x64/protoc.exe
-
-mkdir -p protoc/linux_x86
-mkdir -p protoc/linux_x64
-# Because of maven unrelated reasonse the linux protoc binaries have a dummy .exe extension.
-# For the Google.Protobuf.Tools nuget, we don't want that exception, so we just remove it.
-cp ${INPUT_ARTIFACTS_DIR}/protoc-artifacts/target/linux/x86_32/protoc.exe protoc/linux_x86/protoc
-cp ${INPUT_ARTIFACTS_DIR}/protoc-artifacts/target/linux/x86_64/protoc.exe protoc/linux_x64/protoc
-
-mkdir -p protoc/macosx_x64
-cp ${INPUT_ARTIFACTS_DIR}/build64/src/protoc protoc/macosx_x64/protoc
-
-# Install nuget (will also install  mono)
-# TODO(jtattermusch): use "mono:5.14" docker image instead so we don't have to apt-get install
-sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF
-echo "deb https://download.mono-project.com/repo/ubuntu stable-xenial main" | sudo tee /etc/apt/sources.list.d/mono-official-stable.list
-# NVidia has stopped publishing Cuda packages for Ubuntu 16.04, so we need to
-# delete this file to allow the apt update to run successfully.
-sudo rm -f /etc/apt/sources.list.d/cuda.list
-sudo apt update
-sudo apt-get install -y nuget
-
-nuget pack Google.Protobuf.Tools.nuspec
-
-# Copy the nupkg to the output artifacts
-cp Google.Protobuf.Tools.*.nupkg ../artifacts
diff --git a/libs/protobuf/kokoro/release/csharp/windows/build_nuget.bat b/libs/protobuf/kokoro/release/csharp/windows/build_nuget.bat
deleted file mode 100644
index 590c391..0000000
--- a/libs/protobuf/kokoro/release/csharp/windows/build_nuget.bat
+++ /dev/null
@@ -1,17 +0,0 @@
-@rem enter repo root
-cd /d %~dp0\..\..\..\..
-
-cd csharp
-
-@rem Install dotnet SDK
-powershell -File install_dotnet_sdk.ps1
-set PATH=%LOCALAPPDATA%\Microsoft\dotnet;%PATH%
-
-@rem Disable some unwanted dotnet options
-set DOTNET_SKIP_FIRST_TIME_EXPERIENCE=true
-set DOTNET_CLI_TELEMETRY_OPTOUT=true
-
-@rem Work around https://github.com/dotnet/core/issues/5881
-dotnet nuget locals all --clear
-
-call build_packages.bat
diff --git a/libs/protobuf/kokoro/release/csharp/windows/continuous.cfg b/libs/protobuf/kokoro/release/csharp/windows/continuous.cfg
deleted file mode 100644
index f508c65..0000000
--- a/libs/protobuf/kokoro/release/csharp/windows/continuous.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/release/csharp/windows/build_nuget.bat"
-timeout_mins: 60
-
-action {
-  define_artifacts {
-    regex: "**/*.nupkg"
-  }
-}
diff --git a/libs/protobuf/kokoro/release/csharp/windows/presubmit.cfg b/libs/protobuf/kokoro/release/csharp/windows/presubmit.cfg
deleted file mode 100644
index f508c65..0000000
--- a/libs/protobuf/kokoro/release/csharp/windows/presubmit.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/release/csharp/windows/build_nuget.bat"
-timeout_mins: 60
-
-action {
-  define_artifacts {
-    regex: "**/*.nupkg"
-  }
-}
diff --git a/libs/protobuf/kokoro/release/csharp/windows/release.cfg b/libs/protobuf/kokoro/release/csharp/windows/release.cfg
deleted file mode 100644
index f508c65..0000000
--- a/libs/protobuf/kokoro/release/csharp/windows/release.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/release/csharp/windows/build_nuget.bat"
-timeout_mins: 60
-
-action {
-  define_artifacts {
-    regex: "**/*.nupkg"
-  }
-}
diff --git a/libs/protobuf/kokoro/release/protoc/linux/build.sh b/libs/protobuf/kokoro/release/protoc/linux/build.sh
deleted file mode 100755
index 44a95aa..0000000
--- a/libs/protobuf/kokoro/release/protoc/linux/build.sh
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/bash
-
-set -x
-
-# Change to repo root.
-cd $(dirname $0)/../../../..
-
-# Initialize any submodules.
-git submodule update --init --recursive
-
-# Generate the configure script.
-./autogen.sh
-
-# Cross-build for aarch64, ppc64le and s390x. Note: we do these builds first to avoid
-# file permission issues. The Docker builds will create directories owned by
-# root, which causes problems if we try to add new artifacts to those
-# directories afterward.
-
-sudo apt install -y g++-aarch64-linux-gnu
-protoc-artifacts/build-protoc.sh linux aarch_64 protoc
-
-sudo apt install -y g++-powerpc64le-linux-gnu
-protoc-artifacts/build-protoc.sh linux ppcle_64 protoc
-
-sudo apt install -y g++-s390x-linux-gnu
-protoc-artifacts/build-protoc.sh linux s390_64 protoc
-
-# Use docker image to build linux artifacts.
-DOCKER_IMAGE_NAME=protobuf/protoc_$(sha1sum protoc-artifacts/Dockerfile | cut -f1 -d " ")
-docker pull $DOCKER_IMAGE_NAME
-
-docker run -v $(pwd):/var/local/protobuf --rm $DOCKER_IMAGE_NAME \
-    bash -l /var/local/protobuf/protoc-artifacts/build-protoc.sh \
-    linux x86_64 protoc || {
-  echo "Failed to build protoc for linux + x86_64."
-  exit 1
-}
-
-docker run -v $(pwd):/var/local/protobuf --rm $DOCKER_IMAGE_NAME \
-    bash -l /var/local/protobuf/protoc-artifacts/build-protoc.sh \
-    linux x86_32 protoc || {
-  echo "Failed to build protoc for linux + x86_32."
-  exit 1
-}
diff --git a/libs/protobuf/kokoro/release/protoc/linux/release.cfg b/libs/protobuf/kokoro/release/protoc/linux/release.cfg
deleted file mode 100644
index 4d8b7b6..0000000
--- a/libs/protobuf/kokoro/release/protoc/linux/release.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-build_file: "protobuf/kokoro/release/protoc/linux/build.sh"
-
-action {
-  define_artifacts {
-    regex: "**/protoc.exe"
-  }
-}
diff --git a/libs/protobuf/kokoro/release/protoc/macos/build.sh b/libs/protobuf/kokoro/release/protoc/macos/build.sh
deleted file mode 100755
index 47c9bfa..0000000
--- a/libs/protobuf/kokoro/release/protoc/macos/build.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-set -ex
-CXXFLAGS_COMMON="-std=c++14 -DNDEBUG -mmacosx-version-min=10.9"
-
-cd github/protobuf
-./autogen.sh
-
-mkdir build64 && cd build64
-export CXXFLAGS="$CXXFLAGS_COMMON -m64"
-../configure --disable-shared
-make -j4
-file src/protoc
-otool -L src/protoc | grep dylib
-cd ..
diff --git a/libs/protobuf/kokoro/release/protoc/macos/release.cfg b/libs/protobuf/kokoro/release/protoc/macos/release.cfg
deleted file mode 100644
index da903d0..0000000
--- a/libs/protobuf/kokoro/release/protoc/macos/release.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-# Configuration for Mac OSX protoc release builds
-build_file: "protobuf/kokoro/release/protoc/macos/build.sh"
-
-action {
-  define_artifacts {
-    regex: "**/protoc"
-  }
-}
diff --git a/libs/protobuf/kokoro/release/protoc/windows/build.bat b/libs/protobuf/kokoro/release/protoc/windows/build.bat
deleted file mode 100644
index 75ea546..0000000
--- a/libs/protobuf/kokoro/release/protoc/windows/build.bat
+++ /dev/null
@@ -1,32 +0,0 @@
-set PATH=C:\Program Files (x86)\MSBuild\14.0\bin\;%PATH%
-set generator32=Visual Studio 14
-set generator64=Visual Studio 14 Win64
-set vcplatform32=win32
-set vcplatform64=x64
-set configuration=Release
-
-echo Building protoc
-cd github\protobuf
-
-echo Update Submodules
-echo This is needed because this build uses CMake <3.13.
-git submodule update --init --recursive
-set ABSL_ROOT_DIR=%cd%\third_party\abseil-cpp
-
-mkdir build32
-cd build32
-cmake -G "%generator32%" -Dprotobuf_BUILD_TESTS=OFF -Dprotobuf_BUILD_SHARED_LIBS=OFF -Dprotobuf_UNICODE=ON ../cmake
-msbuild protobuf.sln /p:Platform=%vcplatform32% || goto error
-cd ..
-
-mkdir build64
-cd build64
-cmake -G "%generator64%" -Dprotobuf_BUILD_TESTS=OFF -Dprotobuf_BUILD_SHARED_LIBS=OFF -Dprotobuf_UNICODE=ON ../cmake
-msbuild protobuf.sln /p:Platform=%vcplatform64% || goto error
-cd ..
-
-goto :EOF
-
-:error
-echo Failed!
-exit /b %ERRORLEVEL%
diff --git a/libs/protobuf/kokoro/release/protoc/windows/release.cfg b/libs/protobuf/kokoro/release/protoc/windows/release.cfg
deleted file mode 100644
index 0d0da8f..0000000
--- a/libs/protobuf/kokoro/release/protoc/windows/release.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-# Configuration for Windows protoc release builds
-build_file: "protobuf/kokoro/release/protoc/windows/build.bat"
-
-action {
-  define_artifacts {
-    regex: "**/protoc.exe"
-  }
-}
diff --git a/libs/protobuf/kokoro/release/python/linux/build_artifacts.sh b/libs/protobuf/kokoro/release/python/linux/build_artifacts.sh
deleted file mode 100755
index 9a3fc58..0000000
--- a/libs/protobuf/kokoro/release/python/linux/build_artifacts.sh
+++ /dev/null
@@ -1,90 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-# change to repo root
-pushd $(dirname $0)/../../../..
-
-# Create stage dir
-ORIGINAL_DIR=`pwd`
-pushd ..
-cp -R $ORIGINAL_DIR stage
-export STAGE_DIR="`pwd`/stage"
-popd
-
-export REPO_DIR=protobuf
-export BUILD_VERSION=`grep -i "version" python/google/protobuf/__init__.py | grep -o "'.*'" | tr -d "'"`
-
-export BUILD_COMMIT=`git rev-parse HEAD`
-export PLAT=x86_64
-export UNICODE_WIDTH=32
-export MACOSX_DEPLOYMENT_TARGET=10.9
-
-rm -rf artifacts/
-rm -rf multibuild/
-mkdir artifacts
-export ARTIFACT_DIR=$(pwd)/artifacts
-
-git clone https://github.com/matthew-brett/multibuild.git
-# Pin multibuild scripts at a known commit to avoid potentially unwanted future changes from
-# silently creeping in (see https://github.com/protocolbuffers/protobuf/issues/9180).
-# IMPORTANT: always pin multibuild at the same commit for:
-# - linux/build_artifacts.sh
-# - linux/build_artifacts.sh
-# - windows/build_artifacts.bat
-(cd multibuild; git checkout b89bb903e94308be79abefa4f436bf123ebb1313)
-cp kokoro/release/python/linux/config.sh config.sh
-
-build_artifact_version() {
-  MB_PYTHON_VERSION=$1
-  cp -R $STAGE_DIR $REPO_DIR
-
-  source multibuild/common_utils.sh
-  source multibuild/travis_steps.sh
-  before_install
-
-  clean_code $REPO_DIR $BUILD_COMMIT
-
-  build_wheel $REPO_DIR/python $PLAT
-
-  mv wheelhouse/* $ARTIFACT_DIR
-
-  # Clean up env
-  rm -rf venv
-  sudo rm -rf $REPO_DIR
-}
-
-build_x86_64_manylinux1_artifact_version() {
-  # Explicitly request building manylinux1 wheels, which is no longer the default.
-  # https://github.com/protocolbuffers/protobuf/issues/9180
-  MB_ML_VER=1
-  build_artifact_version $@
-}
-
-build_x86_64_manylinux2010_artifact_version() {
-  # Explicitly request building manylinux2010 wheels
-  MB_ML_VER=2010
-  build_artifact_version $@
-}
-
-build_crosscompiled_aarch64_manylinux2014_artifact_version() {
-  # crosscompilation is only supported with the dockcross manylinux2014 image
-  DOCKER_IMAGE=dockcross/manylinux2014-aarch64:20210706-65bf2dd
-  MB_ML_VER=2014
-  PLAT=aarch64
-
-  # TODO(jtatermusch): currently when crosscompiling, "auditwheel repair" will be disabled
-  # since auditwheel doesn't work for crosscomiled wheels.
-  build_artifact_version $@
-}
-
-build_x86_64_manylinux1_artifact_version 3.6
-build_x86_64_manylinux1_artifact_version 3.7
-build_x86_64_manylinux1_artifact_version 3.8
-build_x86_64_manylinux1_artifact_version 3.9
-build_x86_64_manylinux2010_artifact_version 3.10
-
-build_crosscompiled_aarch64_manylinux2014_artifact_version 3.7
-build_crosscompiled_aarch64_manylinux2014_artifact_version 3.8
-build_crosscompiled_aarch64_manylinux2014_artifact_version 3.9
-build_crosscompiled_aarch64_manylinux2014_artifact_version 3.10
diff --git a/libs/protobuf/kokoro/release/python/linux/config.sh b/libs/protobuf/kokoro/release/python/linux/config.sh
deleted file mode 100644
index 8920495..0000000
--- a/libs/protobuf/kokoro/release/python/linux/config.sh
+++ /dev/null
@@ -1,93 +0,0 @@
-# Define custom utilities
-# Test for OSX with [ -n "$IS_OSX" ]
-
-function pre_build {
-    # Any stuff that you need to do before you start building the wheels
-    # Runs in the root directory of this repository.
-    pushd protobuf
-
-    if [ "$PLAT" == "aarch64" ]
-    then
-      local configure_host_flag="--host=aarch64"
-    fi
-
-    # Build protoc and libprotobuf
-    ./autogen.sh
-    CXXFLAGS="-fPIC -g -O2" ./configure $configure_host_flag
-    make -j8
-
-    if [ "$PLAT" == "aarch64" ]
-    then
-      # we are crosscompiling for aarch64 while running on x64
-      # the simplest way for build_py command to be able to generate
-      # the protos is by running the protoc process under
-      # an emulator. That way we don't have to build a x64 version
-      # of protoc. The qemu-arm emulator is already included
-      # in the dockcross docker image.
-      # Running protoc under an emulator is fast as protoc doesn't
-      # really do much.
-
-      # create a simple shell wrapper that runs crosscompiled protoc under qemu
-      echo '#!/bin/bash' >protoc_qemu_wrapper.sh
-      echo 'exec qemu-aarch64 "../src/protoc" "$@"' >>protoc_qemu_wrapper.sh
-      chmod ugo+x protoc_qemu_wrapper.sh
-
-      # PROTOC variable is by build_py step that runs under ./python directory
-      export PROTOC=../protoc_qemu_wrapper.sh
-    fi
-
-    # Generate python dependencies.
-    pushd python
-    python setup.py build_py
-    popd
-
-    popd
-}
-
-function bdist_wheel_cmd {
-    # Builds wheel with bdist_wheel, puts into wheelhouse
-    #
-    # It may sometimes be useful to use bdist_wheel for the wheel building
-    # process.  For example, versioneer has problems with versions which are
-    # fixed with bdist_wheel:
-    # https://github.com/warner/python-versioneer/issues/121
-    local abs_wheelhouse=$1
-
-    # Modify build version
-    pwd
-    ls
-
-    if [ "$PLAT" == "aarch64" ]
-    then
-      # when crosscompiling for aarch64, --plat-name needs to be set explicitly
-      # to end up with correctly named wheel file
-      # the value should be manylinuxABC_ARCH and dockcross docker image
-      # conveniently provides the value in the AUDITWHEEL_PLAT env
-      local plat_name_flag="--plat-name=$AUDITWHEEL_PLAT"
-
-      # override the value of EXT_SUFFIX to make sure the crosscompiled .so files in the wheel have the correct filename suffix
-      export PROTOCOL_BUFFERS_OVERRIDE_EXT_SUFFIX="$(python -c 'import sysconfig; print(sysconfig.get_config_var("EXT_SUFFIX").replace("-x86_64-linux-gnu.so", "-aarch64-linux-gnu.so"))')"
-    fi
-
-    python setup.py bdist_wheel --cpp_implementation --compile_static_extension $plat_name_flag
-    cp dist/*.whl $abs_wheelhouse
-}
-
-function build_wheel {
-    build_wheel_cmd "bdist_wheel_cmd" $@
-}
-
-function run_tests {
-    # Runs tests on installed distribution from an empty directory
-    python --version
-    python -c "from google.protobuf.pyext import _message;"
-}
-
-if [ "$PLAT" == "aarch64" ]
-then
-  # when crosscompiling for aarch64, override the default multibuild's repair_wheelhouse logic
-  # since "auditwheel repair" doesn't work for crosscompiled wheels
-  function repair_wheelhouse {
-      echo "Skipping repair_wheelhouse since auditwheel requires build architecture to match wheel architecture."
-  }
-fi
diff --git a/libs/protobuf/kokoro/release/python/linux/continuous.cfg b/libs/protobuf/kokoro/release/python/linux/continuous.cfg
deleted file mode 100644
index c0b9a01..0000000
--- a/libs/protobuf/kokoro/release/python/linux/continuous.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-# Config file for running tests in Kokoro
-build_file: "protobuf/kokoro/release/python/linux/build_artifacts.sh"
-
-action {
-  define_artifacts {
-    regex: "github/protobuf/artifacts/**"
-  }
-}
diff --git a/libs/protobuf/kokoro/release/python/linux/presubmit.cfg b/libs/protobuf/kokoro/release/python/linux/presubmit.cfg
deleted file mode 100644
index c0b9a01..0000000
--- a/libs/protobuf/kokoro/release/python/linux/presubmit.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-# Config file for running tests in Kokoro
-build_file: "protobuf/kokoro/release/python/linux/build_artifacts.sh"
-
-action {
-  define_artifacts {
-    regex: "github/protobuf/artifacts/**"
-  }
-}
diff --git a/libs/protobuf/kokoro/release/python/linux/release.cfg b/libs/protobuf/kokoro/release/python/linux/release.cfg
deleted file mode 100644
index b31b3f1..0000000
--- a/libs/protobuf/kokoro/release/python/linux/release.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-# Configuration for Linux release builds
-build_file: "protobuf/kokoro/release/python/linux/build_artifacts.sh"
-
-action {
-  define_artifacts {
-    regex: "github/protobuf/artifacts/**"
-  }
-}
diff --git a/libs/protobuf/kokoro/release/python/macos/build_artifacts.sh b/libs/protobuf/kokoro/release/python/macos/build_artifacts.sh
deleted file mode 100755
index d79d2f6..0000000
--- a/libs/protobuf/kokoro/release/python/macos/build_artifacts.sh
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-# Remove any pre-existing protobuf installation.
-brew uninstall -f protobuf
-
-# change to repo root
-pushd $(dirname $0)/../../../..
-
-# Create stage dir
-ORIGINAL_DIR=`pwd`
-pushd ..
-cp -R $ORIGINAL_DIR stage
-export STAGE_DIR="`pwd`/stage"
-popd
-
-export REPO_DIR=protobuf
-export BUILD_VERSION=`grep -i "version" python/google/protobuf/__init__.py | grep -o "'.*'" | tr -d "'"`
-export BUILD_COMMIT=`git rev-parse HEAD`
-export PLAT=x86_64
-export UNICODE_WIDTH=32
-export MACOSX_DEPLOYMENT_TARGET=10.9
-export TRAVIS_OS_NAME="osx"
-
-rm -rf artifacts/
-rm -rf multibuild/
-mkdir artifacts
-export ARTIFACT_DIR=$(pwd)/artifacts
-
-git clone https://github.com/matthew-brett/multibuild.git
-# Pin multibuild scripts at a known commit to avoid potentially unwanted future changes from
-# silently creeping in (see https://github.com/protocolbuffers/protobuf/issues/9180).
-# IMPORTANT: always pin multibuild at the same commit for:
-# - linux/build_artifacts.sh
-# - linux/build_artifacts.sh
-# - windows/build_artifacts.bat
-(cd multibuild; git checkout b89bb903e94308be79abefa4f436bf123ebb1313)
-cp kokoro/release/python/macos/config.sh config.sh
-
-OLD_PATH=$PATH
-
-build_artifact_version() {
-  MB_PYTHON_VERSION=$1
-
-  # Clean up env
-  rm -rf venv
-  sudo rm -rf $REPO_DIR
-  cp -R $STAGE_DIR $REPO_DIR
-  export PATH=$OLD_PATH
-
-  source multibuild/common_utils.sh
-  source multibuild/travis_steps.sh
-  before_install
-
-  clean_code $REPO_DIR $BUILD_COMMIT
-
-  build_wheel $REPO_DIR/python $PLAT
-
-  mv wheelhouse/* $ARTIFACT_DIR
-}
-
-export MB_PYTHON_OSX_VER=10.9
-build_artifact_version 3.7
-build_artifact_version 3.8
-build_artifact_version 3.9
-build_artifact_version 3.10
diff --git a/libs/protobuf/kokoro/release/python/macos/config.sh b/libs/protobuf/kokoro/release/python/macos/config.sh
deleted file mode 100644
index 74e6569..0000000
--- a/libs/protobuf/kokoro/release/python/macos/config.sh
+++ /dev/null
@@ -1,67 +0,0 @@
-# Define custom utilities
-# Test for OSX with [ -n "$IS_OSX" ]
-
-function remove_travis_ve_pip {
-    # Removing the system virtualenv or pip can be very problematic for
-    # macOS on Kokoro, so just leave them be.
-    :;
-}
-
-function install_pip {
-    check_python
-    PIP_CMD="sudo $PYTHON_EXE -m pip${pip_args:+ $pip_args}"
-    $PIP_CMD install --upgrade pip
-}
-
-function install_virtualenv {
-    check_python
-    check_pip
-    $PIP_CMD install --upgrade virtualenv
-    VIRTUALENV_CMD="$PYTHON_EXE -m virtualenv"
-}
-
-function pre_build {
-    # Any stuff that you need to do before you start building the wheels
-    # Runs in the root directory of this repository.
-    pushd protobuf
-
-    # Build protoc and protobuf libraries
-    bazel build //:protoc
-    export PROTOC=$PWD/bazel-bin/protoc
-    mkdir src/.libs
-    ln -s $PWD/bazel-bin/libprotobuf.a src/.libs/libprotobuf.a
-    ln -s $PWD/bazel-bin/libprotobuf_lite.a src/.libs/libprotobuf-lite.a
-
-    # Generate python dependencies.
-    pushd python
-    python setup.py build_py
-    popd
-
-    popd
-}
-
-function bdist_wheel_cmd {
-    # Builds wheel with bdist_wheel, puts into wheelhouse
-    #
-    # It may sometimes be useful to use bdist_wheel for the wheel building
-    # process.  For example, versioneer has problems with versions which are
-    # fixed with bdist_wheel:
-    # https://github.com/warner/python-versioneer/issues/121
-    local abs_wheelhouse=$1
-
-    # Modify build version
-    pwd
-    ls
-    python setup.py bdist_wheel --cpp_implementation --compile_static_extension
-    cp dist/*.whl $abs_wheelhouse
-}
-
-function build_wheel {
-    build_wheel_cmd "bdist_wheel_cmd" $@
-}
-
-function run_tests {
-    # Runs tests on installed distribution from an empty directory
-    python --version
-    python -c "from google.protobuf.pyext import _message;"
-}
diff --git a/libs/protobuf/kokoro/release/python/macos/continuous.cfg b/libs/protobuf/kokoro/release/python/macos/continuous.cfg
deleted file mode 100644
index 85cf81b..0000000
--- a/libs/protobuf/kokoro/release/python/macos/continuous.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-# Configuration for Mac OSX release builds
-build_file: "protobuf/kokoro/release/python/macos/build_artifacts.sh"
-
-action {
-  define_artifacts {
-    regex: "github/protobuf/artifacts/**"
-  }
-}
diff --git a/libs/protobuf/kokoro/release/python/macos/presubmit.cfg b/libs/protobuf/kokoro/release/python/macos/presubmit.cfg
deleted file mode 100644
index 85cf81b..0000000
--- a/libs/protobuf/kokoro/release/python/macos/presubmit.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-# Configuration for Mac OSX release builds
-build_file: "protobuf/kokoro/release/python/macos/build_artifacts.sh"
-
-action {
-  define_artifacts {
-    regex: "github/protobuf/artifacts/**"
-  }
-}
diff --git a/libs/protobuf/kokoro/release/python/macos/release.cfg b/libs/protobuf/kokoro/release/python/macos/release.cfg
deleted file mode 100644
index 85cf81b..0000000
--- a/libs/protobuf/kokoro/release/python/macos/release.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-# Configuration for Mac OSX release builds
-build_file: "protobuf/kokoro/release/python/macos/build_artifacts.sh"
-
-action {
-  define_artifacts {
-    regex: "github/protobuf/artifacts/**"
-  }
-}
diff --git a/libs/protobuf/kokoro/release/python/windows/build_artifacts.bat b/libs/protobuf/kokoro/release/python/windows/build_artifacts.bat
deleted file mode 100644
index 121283a..0000000
--- a/libs/protobuf/kokoro/release/python/windows/build_artifacts.bat
+++ /dev/null
@@ -1,88 +0,0 @@
-REM Move scripts to root
-set REPO_DIR_STAGE=%cd%\github\protobuf-stage
-xcopy /S  github\protobuf "%REPO_DIR_STAGE%\"
-cd github\protobuf
-copy kokoro\release\python\windows\build_single_artifact.bat build_single_artifact.bat
-
-REM Set environment variables
-set PACKAGE_NAME=protobuf
-set REPO_DIR=protobuf
-set BUILD_DLL=OFF
-set UNICODE=ON
-set OTHER_TEST_DEP="setuptools==38.5.1"
-set OLD_PATH=C:\Program Files (x86)\MSBuild\14.0\bin\;%PATH%
-
-REM Fetch multibuild
-git clone https://github.com/matthew-brett/multibuild.git
-REM Pin multibuild scripts at a known commit to avoid potentially unwanted future changes from
-REM silently creeping in (see https://github.com/protocolbuffers/protobuf/issues/9180).
-REM IMPORTANT: always pin multibuild at the same commit for:
-REM - linux/build_artifacts.sh
-REM - linux/build_artifacts.sh
-REM - windows/build_artifacts.bat
-cd multibuild
-git checkout b89bb903e94308be79abefa4f436bf123ebb1313
-cd ..
-
-REM Install zlib
-mkdir zlib
-curl -L -o zlib.zip http://www.winimage.com/zLibDll/zlib123dll.zip
-curl -L -o zlib-src.zip http://www.winimage.com/zLibDll/zlib123.zip
-7z x zlib.zip -ozlib
-7z x zlib-src.zip -ozlib\include
-SET ZLIB_ROOT=%cd%\zlib
-del /Q zlib.zip
-del /Q zlib-src.zip
-
-REM Create directory for artifacts
-SET ARTIFACT_DIR=%cd%\artifacts
-mkdir %ARTIFACT_DIR%
-
-REM Build wheel
-
-SET PYTHON=C:\python37_32bit
-SET PYTHON_VERSION=3.7
-SET PYTHON_ARCH=32
-CALL build_single_artifact.bat || goto :error
-
-SET PYTHON=C:\python37
-SET PYTHON_VERSION=3.7
-SET PYTHON_ARCH=64
-CALL build_single_artifact.bat || goto :error
-
-powershell -File kokoro/release/python/windows/install_python_interpreters.ps1
-
-SET PYTHON=C:\python38_32bit
-SET PYTHON_VERSION=3.8
-SET PYTHON_ARCH=32
-CALL build_single_artifact.bat || goto :error
-
-SET PYTHON=C:\python38
-SET PYTHON_VERSION=3.8
-SET PYTHON_ARCH=64
-CALL build_single_artifact.bat || goto :error
-
-SET PYTHON=C:\python39_32bit
-SET PYTHON_VERSION=3.9
-SET PYTHON_ARCH=32
-CALL build_single_artifact.bat || goto :error
-
-SET PYTHON=C:\python39
-SET PYTHON_VERSION=3.9
-SET PYTHON_ARCH=64
-CALL build_single_artifact.bat || goto :error
-
-SET PYTHON=C:\python310_32bit
-SET PYTHON_VERSION=3.10
-SET PYTHON_ARCH=32
-CALL build_single_artifact.bat || goto :error
-
-SET PYTHON=C:\python310
-SET PYTHON_VERSION=3.10
-SET PYTHON_ARCH=64
-CALL build_single_artifact.bat || goto :error
-
-goto :EOF
-
-:error
-exit /b %errorlevel%
diff --git a/libs/protobuf/kokoro/release/python/windows/build_single_artifact.bat b/libs/protobuf/kokoro/release/python/windows/build_single_artifact.bat
deleted file mode 100644
index af2d265..0000000
--- a/libs/protobuf/kokoro/release/python/windows/build_single_artifact.bat
+++ /dev/null
@@ -1,78 +0,0 @@
-setlocal
-
-if %PYTHON%==C:\python37_32bit set generator=Visual Studio 14
-if %PYTHON%==C:\python37_32bit set vcplatform=Win32
-
-if %PYTHON%==C:\python37 set generator=Visual Studio 14 Win64
-if %PYTHON%==C:\python37 set vcplatform=x64
-
-if %PYTHON%==C:\python38_32bit set generator=Visual Studio 14
-if %PYTHON%==C:\python38_32bit set vcplatform=Win32
-
-if %PYTHON%==C:\python38 set generator=Visual Studio 14 Win64
-if %PYTHON%==C:\python38 set vcplatform=x64
-
-if %PYTHON%==C:\python39_32bit set generator=Visual Studio 14
-if %PYTHON%==C:\python39_32bit set vcplatform=Win32
-
-if %PYTHON%==C:\python39 set generator=Visual Studio 14 Win64
-if %PYTHON%==C:\python39 set vcplatform=x64
-
-if %PYTHON%==C:\python310_32bit set generator=Visual Studio 14
-if %PYTHON%==C:\python310_32bit set vcplatform=Win32
-
-if %PYTHON%==C:\python310 set generator=Visual Studio 14 Win64
-if %PYTHON%==C:\python310 set vcplatform=x64
-
-REM Prepend newly installed Python to the PATH of this build (this cannot be
-REM done from inside the powershell script as it would require to restart
-REM the parent CMD process).
-SET PATH=C:\Program Files\CMake\bin;%PYTHON%;%PYTHON%\Scripts;%OLD_PATH%
-python -m pip install -U pip
-pip install wheel
-
-REM Check that we have the expected version and architecture for Python
-python --version
-python -c "import struct; print(struct.calcsize('P') * 8)"
-
-rmdir /s/q %REPO_DIR%
-xcopy /s  %REPO_DIR_STAGE% "%REPO_DIR%\"
-
-REM Checkout release commit
-cd %REPO_DIR%
-
-REM ======================
-REM Build Protobuf Library
-REM ======================
-
-mkdir src\.libs
-
-mkdir vcprojects
-pushd vcprojects
-cmake -G "%generator%" -Dprotobuf_BUILD_SHARED_LIBS=%BUILD_DLL% -Dprotobuf_UNICODE=%UNICODE% -Dprotobuf_BUILD_TESTS=OFF ../cmake || goto :error
-msbuild protobuf.sln /p:Platform=%vcplatform% /p:Configuration=Release || goto :error
-dir /s /b
-popd
-copy vcprojects\Release\libprotobuf.lib src\.libs\libprotobuf.a
-copy vcprojects\Release\libprotobuf-lite.lib src\.libs\libprotobuf-lite.a
-SET PATH=%cd%\vcprojects\Release;%PATH%
-dir vcprojects\Release
-
-REM ======================
-REM Build python library
-REM ======================
-
-cd python
-
-REM sed -i 's/\ extra_compile_args\ =\ \[\]/\ extra_compile_args\ =\ \[\'\/MT\'\]/g' setup.py
-
-python setup.py bdist_wheel --cpp_implementation --compile_static_extension
-dir dist
-copy dist\* %ARTIFACT_DIR%
-dir %ARTIFACT_DIR%
-cd ..\..
-
-goto :EOF
-
-:error
-exit /b %errorlevel%
diff --git a/libs/protobuf/kokoro/release/python/windows/continuous.cfg b/libs/protobuf/kokoro/release/python/windows/continuous.cfg
deleted file mode 100644
index 5261606..0000000
--- a/libs/protobuf/kokoro/release/python/windows/continuous.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-# Configuration for Windows protoc release builds
-build_file: "protobuf/kokoro/release/python/windows/build_artifacts.bat"
-
-action {
-  define_artifacts {
-    regex: "github/protobuf/artifacts/**"
-  }
-}
diff --git a/libs/protobuf/kokoro/release/python/windows/install_python_interpreters.ps1 b/libs/protobuf/kokoro/release/python/windows/install_python_interpreters.ps1
deleted file mode 100644
index 3f8db95..0000000
--- a/libs/protobuf/kokoro/release/python/windows/install_python_interpreters.ps1
+++ /dev/null
@@ -1,114 +0,0 @@
-#!/usr/bin/env powershell
-# Install Python 3.8 for x64 and x86 in order to build wheels on Windows.
-# Originally from grpc/tools/internal_ci/helper_scripts/install_python_interpreters.ps1
-
-Set-StrictMode -Version 2
-$ErrorActionPreference = 'Stop'
-
-trap {
-    $ErrorActionPreference = "Continue"
-    Write-Error $_
-    exit 1
-}
-
-# Avoid "Could not create SSL/TLS secure channel"
-[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
-
-function Install-Python {
-    Param(
-        [string]$PythonVersion,
-        [string]$PythonInstaller,
-        [string]$PythonInstallPath,
-        [string]$PythonInstallerHash
-    )
-    $PythonInstallerUrl = "https://www.python.org/ftp/python/$PythonVersion/$PythonInstaller.exe"
-    $PythonInstallerPath = "C:\tools\$PythonInstaller.exe"
-
-    # Downloads installer
-    Write-Host "Downloading the Python installer: $PythonInstallerUrl => $PythonInstallerPath"
-    Invoke-WebRequest -Uri $PythonInstallerUrl -OutFile $PythonInstallerPath
-
-    # Validates checksum
-    $HashFromDownload = Get-FileHash -Path $PythonInstallerPath -Algorithm MD5
-    if ($HashFromDownload.Hash -ne $PythonInstallerHash) {
-        throw "Invalid Python installer: failed checksum!"
-    }
-    Write-Host "Python installer $PythonInstallerPath validated."
-
-    # Installs Python
-    & $PythonInstallerPath /passive InstallAllUsers=1 PrependPath=1 Include_test=0 TargetDir=$PythonInstallPath
-    if (-Not $?) {
-        throw "The Python installation exited with error!"
-    }
-
-    # NOTE(lidiz) Even if the install command finishes in the script, that
-    # doesn't mean the Python installation is finished. If using "ps" to check
-    # for running processes, you might see ongoing installers at this point.
-    # So, we needs this "hack" to reliably validate that the Python binary is
-    # functioning properly.
-
-    # Wait for the installer process
-    Wait-Process -Name $PythonInstaller -Timeout 300
-    Write-Host "Installation process exits normally."
-
-    # Validate Python binary
-    $PythonBinary = "$PythonInstallPath\python.exe"
-    & $PythonBinary -c 'print(42)'
-    Write-Host "Python binary works properly."
-
-    # Installs pip
-    & $PythonBinary -m ensurepip --user
-
-    Write-Host "Python $PythonVersion installed by $PythonInstaller at $PythonInstallPath."
-}
-
-# Python 3.8
-$Python38x86Config = @{
-    PythonVersion = "3.8.0"
-    PythonInstaller = "python-3.8.0"
-    PythonInstallPath = "C:\python38_32bit"
-    PythonInstallerHash = "412a649d36626d33b8ca5593cf18318c"
-}
-Install-Python @Python38x86Config
-
-$Python38x64Config = @{
-    PythonVersion = "3.8.0"
-    PythonInstaller = "python-3.8.0-amd64"
-    PythonInstallPath = "C:\python38"
-    PythonInstallerHash = "29ea87f24c32f5e924b7d63f8a08ee8d"
-}
-Install-Python @Python38x64Config
-
-# Python 3.9
-$Python39x86Config = @{
-    PythonVersion = "3.9.0"
-    PythonInstaller = "python-3.9.0"
-    PythonInstallPath = "C:\python39_32bit"
-    PythonInstallerHash = "4a2812db8ab9f2e522c96c7728cfcccb"
-}
-Install-Python @Python39x86Config
-
-$Python39x64Config = @{
-    PythonVersion = "3.9.0"
-    PythonInstaller = "python-3.9.0-amd64"
-    PythonInstallPath = "C:\python39"
-    PythonInstallerHash = "b61a33dc28f13b561452f3089c87eb63"
-}
-Install-Python @Python39x64Config
-
-# Python 3.10
-$Python310x86Config = @{
-    PythonVersion = "3.10.0"
-    PythonInstaller = "python-3.10.0"
-    PythonInstallPath = "C:\python310_32bit"
-    PythonInstallerHash = "133aa48145032e341ad2a000cd3bff50"
-}
-Install-Python @Python310x86Config
-
-$Python310x64Config = @{
-    PythonVersion = "3.10.0"
-    PythonInstaller = "python-3.10.0-amd64"
-    PythonInstallPath = "C:\python310"
-    PythonInstallerHash = "c3917c08a7fe85db7203da6dcaa99a70"
-}
-Install-Python @Python310x64Config
diff --git a/libs/protobuf/kokoro/release/python/windows/presubmit.cfg b/libs/protobuf/kokoro/release/python/windows/presubmit.cfg
deleted file mode 100644
index 5261606..0000000
--- a/libs/protobuf/kokoro/release/python/windows/presubmit.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-# Configuration for Windows protoc release builds
-build_file: "protobuf/kokoro/release/python/windows/build_artifacts.bat"
-
-action {
-  define_artifacts {
-    regex: "github/protobuf/artifacts/**"
-  }
-}
diff --git a/libs/protobuf/kokoro/release/python/windows/release.cfg b/libs/protobuf/kokoro/release/python/windows/release.cfg
deleted file mode 100644
index 5261606..0000000
--- a/libs/protobuf/kokoro/release/python/windows/release.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-# Configuration for Windows protoc release builds
-build_file: "protobuf/kokoro/release/python/windows/build_artifacts.bat"
-
-action {
-  define_artifacts {
-    regex: "github/protobuf/artifacts/**"
-  }
-}
diff --git a/libs/protobuf/kokoro/release/ruby/linux/build_artifacts.sh b/libs/protobuf/kokoro/release/ruby/linux/build_artifacts.sh
deleted file mode 100755
index 8855522..0000000
--- a/libs/protobuf/kokoro/release/ruby/linux/build_artifacts.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-# change to repo root
-cd $(dirname $0)/../../../..
-
-source kokoro/release/ruby/linux/prepare_build.sh
-
-# ruby environment
-source kokoro/release/ruby/linux/ruby/ruby_build_environment.sh
-
-# build artifacts
-bash kokoro/release/ruby/linux/ruby/ruby_build.sh
diff --git a/libs/protobuf/kokoro/release/ruby/linux/continuous.cfg b/libs/protobuf/kokoro/release/ruby/linux/continuous.cfg
deleted file mode 100644
index dbc71b2..0000000
--- a/libs/protobuf/kokoro/release/ruby/linux/continuous.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-# Configuration for Linux release builds
-build_file: "protobuf/kokoro/release/ruby/linux/build_artifacts.sh"
-
-action {
-  define_artifacts {
-    regex: "github/protobuf/artifacts/**"
-  }
-}
diff --git a/libs/protobuf/kokoro/release/ruby/linux/prepare_build.sh b/libs/protobuf/kokoro/release/ruby/linux/prepare_build.sh
deleted file mode 100755
index 91d1868..0000000
--- a/libs/protobuf/kokoro/release/ruby/linux/prepare_build.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-# Move docker's storage location to scratch disk so we don't run out of space.
-echo 'DOCKER_OPTS="${DOCKER_OPTS} --graph=/tmpfs/docker"' | sudo tee --append /etc/default/docker
-# Use container registry mirror for pulling docker images (should make downloads faster)
-# See https://cloud.google.com/container-registry/docs/using-dockerhub-mirroring
-echo 'DOCKER_OPTS="${DOCKER_OPTS} --registry-mirror=https://mirror.gcr.io"' | sudo tee --append /etc/default/docker
-sudo service docker restart
-
-# All artifacts come here
-mkdir artifacts
-export ARTIFACT_DIR=$(pwd)/artifacts
diff --git a/libs/protobuf/kokoro/release/ruby/linux/presubmit.cfg b/libs/protobuf/kokoro/release/ruby/linux/presubmit.cfg
deleted file mode 100644
index dbc71b2..0000000
--- a/libs/protobuf/kokoro/release/ruby/linux/presubmit.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-# Configuration for Linux release builds
-build_file: "protobuf/kokoro/release/ruby/linux/build_artifacts.sh"
-
-action {
-  define_artifacts {
-    regex: "github/protobuf/artifacts/**"
-  }
-}
diff --git a/libs/protobuf/kokoro/release/ruby/linux/release.cfg b/libs/protobuf/kokoro/release/ruby/linux/release.cfg
deleted file mode 100644
index dbc71b2..0000000
--- a/libs/protobuf/kokoro/release/ruby/linux/release.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-# Configuration for Linux release builds
-build_file: "protobuf/kokoro/release/ruby/linux/build_artifacts.sh"
-
-action {
-  define_artifacts {
-    regex: "github/protobuf/artifacts/**"
-  }
-}
diff --git a/libs/protobuf/kokoro/release/ruby/linux/ruby/ruby_build.sh b/libs/protobuf/kokoro/release/ruby/linux/ruby/ruby_build.sh
deleted file mode 100755
index 761b54f..0000000
--- a/libs/protobuf/kokoro/release/ruby/linux/ruby/ruby_build.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-# Build protoc
-use_bazel.sh 5.1.1
-bazel build //:protoc
-cp bazel-bin/protoc src/protoc
-export PROTOC=$PWD/src/protoc
-
-umask 0022
-pushd ruby
-gem install bundler -v 2.1.4
-bundle update && bundle exec rake gem:native
-ls pkg
-mv pkg/* $ARTIFACT_DIR
-popd
diff --git a/libs/protobuf/kokoro/release/ruby/linux/ruby/ruby_build_environment.sh b/libs/protobuf/kokoro/release/ruby/linux/ruby/ruby_build_environment.sh
deleted file mode 100755
index 87c0f75..0000000
--- a/libs/protobuf/kokoro/release/ruby/linux/ruby/ruby_build_environment.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-set +ex
-[[ -s /etc/profile.d/rvm.sh ]] && . /etc/profile.d/rvm.sh
-set -e  # rvm commands are very verbose
-rvm --default use ruby-2.4.1
-# The version needs to be updated if the version specified in Gemfile.lock is changed
-gem install bundler -v '1.17.3'
-set -ex
diff --git a/libs/protobuf/kokoro/release/ruby/macos/build_artifacts.sh b/libs/protobuf/kokoro/release/ruby/macos/build_artifacts.sh
deleted file mode 100755
index a109d45..0000000
--- a/libs/protobuf/kokoro/release/ruby/macos/build_artifacts.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-# change to repo root
-cd $(dirname $0)/../../../..
-
-# all artifacts come here
-mkdir artifacts
-export ARTIFACT_DIR=$(pwd)/artifacts
-
-# ruby environment
-bash kokoro/release/ruby/macos/ruby/ruby_build_environment.sh
-
-# build artifacts
-bash kokoro/release/ruby/macos/ruby/ruby_build.sh
diff --git a/libs/protobuf/kokoro/release/ruby/macos/continuous.cfg b/libs/protobuf/kokoro/release/ruby/macos/continuous.cfg
deleted file mode 100644
index cb1c08b..0000000
--- a/libs/protobuf/kokoro/release/ruby/macos/continuous.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-# Configuration for Mac OSX release builds
-build_file: "protobuf/kokoro/release/ruby/macos/build_artifacts.sh"
-
-action {
-  define_artifacts {
-    regex: "github/protobuf/artifacts/**"
-  }
-}
diff --git a/libs/protobuf/kokoro/release/ruby/macos/presubmit.cfg b/libs/protobuf/kokoro/release/ruby/macos/presubmit.cfg
deleted file mode 100644
index cb1c08b..0000000
--- a/libs/protobuf/kokoro/release/ruby/macos/presubmit.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-# Configuration for Mac OSX release builds
-build_file: "protobuf/kokoro/release/ruby/macos/build_artifacts.sh"
-
-action {
-  define_artifacts {
-    regex: "github/protobuf/artifacts/**"
-  }
-}
diff --git a/libs/protobuf/kokoro/release/ruby/macos/release.cfg b/libs/protobuf/kokoro/release/ruby/macos/release.cfg
deleted file mode 100644
index cb1c08b..0000000
--- a/libs/protobuf/kokoro/release/ruby/macos/release.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-# Configuration for Mac OSX release builds
-build_file: "protobuf/kokoro/release/ruby/macos/build_artifacts.sh"
-
-action {
-  define_artifacts {
-    regex: "github/protobuf/artifacts/**"
-  }
-}
diff --git a/libs/protobuf/kokoro/release/ruby/macos/ruby/ruby_build.sh b/libs/protobuf/kokoro/release/ruby/macos/ruby/ruby_build.sh
deleted file mode 100755
index bbfc631..0000000
--- a/libs/protobuf/kokoro/release/ruby/macos/ruby/ruby_build.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-# Build protoc
-bazel build //:protoc
-export PROTOC=$PWD/bazel-bin/protoc
-
-umask 0022
-pushd ruby
-bundle update && bundle exec rake gem:native
-ls pkg
-mv pkg/* $ARTIFACT_DIR
-popd
diff --git a/libs/protobuf/kokoro/release/ruby/macos/ruby/ruby_build_environment.sh b/libs/protobuf/kokoro/release/ruby/macos/ruby/ruby_build_environment.sh
deleted file mode 100755
index 2906642..0000000
--- a/libs/protobuf/kokoro/release/ruby/macos/ruby/ruby_build_environment.sh
+++ /dev/null
@@ -1,124 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-# Fix permissions
-sudo chown -R $(whoami) $HOME/.rvm/
-sudo chown -R $(whoami) /Library/Ruby/
-
-set +ex  # rvm script is very verbose and exits with errorcode
-
-curl -sSL https://rvm.io/mpapis.asc | gpg --import -
-curl -sSL https://rvm.io/pkuczynski.asc | gpg --import -
-
-# Old OpenSSL versions cannot handle the SSL certificate used by
-# https://get.rvm.io, so as a workaround we download RVM directly from
-# GitHub. See this issue for details: https://github.com/rvm/rvm/issues/5133
-curl -sSL https://raw.githubusercontent.com/rvm/rvm/master/binscripts/rvm-installer | bash -s master --ruby
-
-source $HOME/.rvm/scripts/rvm
-set -e  # rvm commands are very verbose
-time rvm install 2.5.0
-rvm use 2.5.0
-gem install rake-compiler --no-document
-gem install bundler --no-document
-time rvm install 3.1.0
-rvm use 3.1.0
-gem install rake-compiler --no-document
-gem install bundler --no-document
-time rvm install 2.7.0
-rvm use 2.7.0 --default
-gem install rake-compiler --no-document
-gem install bundler --no-document
-rvm osx-ssl-certs status all
-rvm osx-ssl-certs update all
-set -ex
-
-rm -rf ~/.rake-compiler
-
-CROSS_RUBY=$(mktemp tmpfile.XXXXXXXX)
-CROSS_RUBY31=$(mktemp tmpfile.XXXXXXXX)
-
-
-curl https://raw.githubusercontent.com/rake-compiler/rake-compiler/72184e51779b6a3b9b8580b036a052fdc3181ced/tasks/bin/cross-ruby.rake > "$CROSS_RUBY"
-
-# See https://github.com/grpc/grpc/issues/12161 for verconf.h patch details
-patch "$CROSS_RUBY" << EOF
---- cross-ruby.rake	2020-12-11 11:17:53.000000000 +0900
-+++ patched	2020-12-11 11:18:52.000000000 +0900
-@@ -111,10 +111,12 @@
-     "--host=#{MINGW_HOST}",
-     "--target=#{MINGW_TARGET}",
-     "--build=#{RUBY_BUILD}",
--    '--enable-shared',
-+    '--enable-static',
-+    '--disable-shared',
-     '--disable-install-doc',
-+    '--without-gmp',
-     '--with-ext=',
--    'LDFLAGS=-pipe -s',
-+    'LDFLAGS=-pipe',
-   ]
-
-   # Force Winsock2 for Ruby 1.8, 1.9 defaults to it
-@@ -130,6 +132,7 @@
- # make
- file "#{build_dir}/ruby.exe" => ["#{build_dir}/Makefile"] do |t|
-   chdir File.dirname(t.prerequisites.first) do
-+    sh "test -s verconf.h || rm -f verconf.h"  # if verconf.h has size 0, make sure it gets re-built by make
-     sh MAKE
-   end
- end
-EOF
-
-cp $CROSS_RUBY $CROSS_RUBY31
-
-patch "$CROSS_RUBY31" << EOF
---- cross-ruby.rake	2022-03-04 11:49:52.000000000 +0000
-+++ patched	2022-03-04 11:58:22.000000000 +0000
-@@ -114,6 +114,7 @@
-     '--enable-static',
-     '--disable-shared',
-     '--disable-install-doc',
-+    '--with-coroutine=ucontext',
-     '--without-gmp',
-     '--with-ext=',
-     'LDFLAGS=-pipe',
-EOF
-
-MAKE="make -j8"
-
-set +x # rvm commands are very verbose
-rvm use 3.1.0
-set -x
-ruby --version | grep 'ruby 3.1.0'
-for v in 3.1.0 ; do
-  ccache -c
-  rake -f "$CROSS_RUBY31" cross-ruby VERSION="$v" HOST=x86_64-darwin MAKE="$MAKE"
-  # Disabled until it can be fixed: https://github.com/protocolbuffers/protobuf/issues/9804
-  # rake -f "$CROSS_RUBY31" cross-ruby VERSION="$v" HOST=aarch64-darwin MAKE="$MAKE"
-done
-
-set +x # rvm commands are very verbose
-rvm use 2.7.0
-set -x
-ruby --version | grep 'ruby 2.7.0'
-for v in 3.0.0 2.7.0 ; do
-  ccache -c
-  rake -f "$CROSS_RUBY" cross-ruby VERSION="$v" HOST=x86_64-darwin MAKE="$MAKE"
-  # Disabled until it can be fixed: https://github.com/protocolbuffers/protobuf/issues/9804
-  # rake -f "$CROSS_RUBY" cross-ruby VERSION="$v" HOST=aarch64-darwin MAKE="$MAKE"
-done
-set +x
-rvm use 2.5.0
-set -x
-ruby --version | grep 'ruby 2.5.0'
-for v in 2.6.0 2.5.1; do
-  ccache -c
-  rake -f "$CROSS_RUBY" cross-ruby VERSION="$v" HOST=x86_64-darwin MAKE="$MAKE"
-  # Disabled until it can be fixed: https://github.com/protocolbuffers/protobuf/issues/9804
-  # rake -f "$CROSS_RUBY" cross-ruby VERSION="$v" HOST=aarch64-darwin MAKE="$MAKE"
-done
-set +x
-rvm use 2.7.0
-set -x
diff --git a/libs/protobuf/kokoro/windows/csharp/build.bat b/libs/protobuf/kokoro/windows/csharp/build.bat
deleted file mode 100644
index 4f1df37..0000000
--- a/libs/protobuf/kokoro/windows/csharp/build.bat
+++ /dev/null
@@ -1,17 +0,0 @@
-@rem enter repo root
-cd /d %~dp0\..\..\..
-
-cd csharp
-
-@rem Install dotnet SDK
-powershell -File install_dotnet_sdk.ps1
-set PATH=%LOCALAPPDATA%\Microsoft\dotnet;%PATH%
-
-@rem Disable some unwanted dotnet options
-set DOTNET_SKIP_FIRST_TIME_EXPERIENCE=true
-set DOTNET_CLI_TELEMETRY_OPTOUT=true
-
-@rem Work around https://github.com/dotnet/core/issues/5881
-dotnet nuget locals all --clear
-
-call buildall.bat
diff --git a/libs/protobuf/kokoro/windows/csharp/continuous.cfg b/libs/protobuf/kokoro/windows/csharp/continuous.cfg
deleted file mode 100644
index f586585..0000000
--- a/libs/protobuf/kokoro/windows/csharp/continuous.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/windows/csharp/build.bat"
-timeout_mins: 1440
diff --git a/libs/protobuf/kokoro/windows/csharp/presubmit.cfg b/libs/protobuf/kokoro/windows/csharp/presubmit.cfg
deleted file mode 100644
index f586585..0000000
--- a/libs/protobuf/kokoro/windows/csharp/presubmit.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/windows/csharp/build.bat"
-timeout_mins: 1440
diff --git a/libs/protobuf/m4/ac_system_extensions.m4 b/libs/protobuf/m4/ac_system_extensions.m4
deleted file mode 100644
index 1ca2eeb..0000000
--- a/libs/protobuf/m4/ac_system_extensions.m4
+++ /dev/null
@@ -1,37 +0,0 @@
-dnl Provide AC_USE_SYSTEM_EXTENSIONS for old autoconf machines.
-AC_DEFUN([ACX_USE_SYSTEM_EXTENSIONS],[
-  ifdef([AC_USE_SYSTEM_EXTENSIONS],[
-    AC_USE_SYSTEM_EXTENSIONS
-  ],[
-    AC_BEFORE([$0], [AC_COMPILE_IFELSE])
-    AC_BEFORE([$0], [AC_RUN_IFELSE])
-
-    AC_REQUIRE([AC_GNU_SOURCE])
-    AC_REQUIRE([AC_AIX])
-    AC_REQUIRE([AC_MINIX])
-
-    AH_VERBATIM([__EXTENSIONS__],
-[/* Enable extensions on Solaris.  */
-#ifndef __EXTENSIONS__
-# undef __EXTENSIONS__
-#endif
-#ifndef _POSIX_PTHREAD_SEMANTICS
-# undef _POSIX_PTHREAD_SEMANTICS
-#endif
-#ifndef _TANDEM_SOURCE
-# undef _TANDEM_SOURCE
-#endif])
-    AC_CACHE_CHECK([whether it is safe to define __EXTENSIONS__],
-      [ac_cv_safe_to_define___extensions__],
-      [AC_COMPILE_IFELSE(
-         [AC_LANG_PROGRAM([
-#           define __EXTENSIONS__ 1
-            AC_INCLUDES_DEFAULT])],
-         [ac_cv_safe_to_define___extensions__=yes],
-         [ac_cv_safe_to_define___extensions__=no])])
-    test $ac_cv_safe_to_define___extensions__ = yes &&
-      AC_DEFINE([__EXTENSIONS__])
-    AC_DEFINE([_POSIX_PTHREAD_SEMANTICS])
-    AC_DEFINE([_TANDEM_SOURCE])
-  ])
-])
diff --git a/libs/protobuf/m4/acx_check_suncc.m4 b/libs/protobuf/m4/acx_check_suncc.m4
deleted file mode 100644
index 0a9a577..0000000
--- a/libs/protobuf/m4/acx_check_suncc.m4
+++ /dev/null
@@ -1,73 +0,0 @@
-dnl Check for the presence of the Sun Studio compiler.
-dnl If Sun Studio compiler is found, set appropriate flags.
-dnl Additionally, Sun Studio doesn't default to 64-bit by itself,
-dnl nor does it automatically look in standard Solaris places for
-dnl 64-bit libs, so we must add those options and paths to the search
-dnl paths.
-
-dnl TODO(kenton):  This is pretty hacky.  It sets CXXFLAGS, which the autoconf
-dnl docs say should never be overridden except by the user.  It also isn't
-dnl cross-compile safe.  We should fix these problems, but since I don't have
-dnl Sun CC at my disposal for testing, someone else will have to do it.
-
-AC_DEFUN([ACX_CHECK_SUNCC],[
-
-  AC_LANG_PUSH([C++])
-  AC_CHECK_DECL([__SUNPRO_CC], [SUNCC="yes"], [SUNCC="no"])
-  AC_LANG_POP()
-
-
-  AC_ARG_ENABLE([64bit-solaris],
-    [AS_HELP_STRING([--disable-64bit-solaris],
-      [Build 64 bit binary on Solaris @<:@default=on@:>@])],
-             [ac_enable_64bit="$enableval"],
-             [ac_enable_64bit="yes"])
-
-  AS_IF([test "$SUNCC" = "yes" -a "x${ac_cv_env_CXXFLAGS_set}" = "x"],[
-    dnl Sun Studio has a crashing bug with -xO4 in some cases. Keep this
-    dnl at -xO3 until a proper test to detect those crashes can be done.
-    CXXFLAGS="-g0 -xO3 -xlibmil -xdepend -xbuiltin -mt -template=no%extdef ${CXXFLAGS}"
-  ])
-
-  case $host_os in
-    *solaris*)
-      AC_CHECK_PROGS(ISAINFO, [isainfo], [no])
-      AS_IF([test "x$ISAINFO" != "xno"],
-            [isainfo_b=`${ISAINFO} -b`],
-            [isainfo_b="x"])
-
-      AS_IF([test "$isainfo_b" != "x"],[
-
-        isainfo_k=`${ISAINFO} -k`
-
-        AS_IF([test "x$ac_enable_64bit" = "xyes"],[
-
-          AS_IF([test "x$libdir" = "x\${exec_prefix}/lib"],[
-           dnl The user hasn't overridden the default libdir, so we'll
-           dnl the dir suffix to match solaris 32/64-bit policy
-           libdir="${libdir}/${isainfo_k}"
-          ])
-
-          dnl This should just be set in CPPFLAGS and in LDFLAGS, but libtool
-          dnl does the wrong thing if you don't put it into CXXFLAGS. sigh.
-          dnl (It also needs it in CFLAGS, or it does a different wrong thing!)
-          CXXFLAGS="${CXXFLAGS} -m64"
-          ac_cv_env_CXXFLAGS_set=set
-          ac_cv_env_CXXFLAGS_value='-m64'
-
-          CFLAGS="${CFLAGS} -m64"
-          ac_cv_env_CFLAGS_set=set
-          ac_cv_env_CFLAGS_value='-m64'
-
-          AS_IF([test "$target_cpu" = "sparc" -a "x$SUNCC" = "xyes" ],[
-            CXXFLAGS="-xmemalign=8s ${CXXFLAGS}"
-          ])
-        ])
-      ])
-    ;;
-  esac
-
-  AS_IF([test "$target_cpu" = "sparc" -a "x$SUNCC" = "xyes" ],[
-    CXXFLAGS="-xregs=no%appl ${CXXFLAGS}"
-  ])
-])
diff --git a/libs/protobuf/m4/ax_cxx_compile_stdcxx.m4 b/libs/protobuf/m4/ax_cxx_compile_stdcxx.m4
deleted file mode 100644
index d3288e2..0000000
--- a/libs/protobuf/m4/ax_cxx_compile_stdcxx.m4
+++ /dev/null
@@ -1,1001 +0,0 @@
-# ===========================================================================
-#   http://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_CXX_COMPILE_STDCXX(VERSION, [ext|noext], [mandatory|optional])
-#
-# DESCRIPTION
-#
-#   Check for baseline language coverage in the compiler for the specified
-#   version of the C++ standard.  If necessary, add switches to CXX and
-#   CXXCPP to enable support.  VERSION may be '11' (for the C++11 standard)
-#   or '14' (for the C++14 standard).
-#
-#   The second argument, if specified, indicates whether you insist on an
-#   extended mode (e.g. -std=gnu++11) or a strict conformance mode (e.g.
-#   -std=c++11).  If neither is specified, you get whatever works, with
-#   preference for an extended mode.
-#
-#   The third argument, if specified 'mandatory' or if left unspecified,
-#   indicates that baseline support for the specified C++ standard is
-#   required and that the macro should error out if no mode with that
-#   support is found.  If specified 'optional', then configuration proceeds
-#   regardless, after defining HAVE_CXX${VERSION} if and only if a
-#   supporting mode is found.
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Benjamin Kosnik <bkoz@redhat.com>
-#   Copyright (c) 2012 Zack Weinberg <zackw@panix.com>
-#   Copyright (c) 2013 Roy Stogner <roystgnr@ices.utexas.edu>
-#   Copyright (c) 2014, 2015 Google Inc.; contributed by Alexey Sokolov <sokolov@google.com>
-#   Copyright (c) 2015 Paul Norman <penorman@mac.com>
-#   Copyright (c) 2015 Moritz Klammler <moritz@klammler.eu>
-#   Copyright (c) 2016 Krzesimir Nowak <qdlacz@gmail.com>
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved.  This file is offered as-is, without any
-#   warranty.
-
-#serial 6
-
-dnl  This macro is based on the code from the AX_CXX_COMPILE_STDCXX_11 macro
-dnl  (serial version number 13).
-
-AX_REQUIRE_DEFINED([AC_MSG_WARN])
-AC_DEFUN([AX_CXX_COMPILE_STDCXX], [dnl
-  m4_if([$1], [11], [ax_cxx_compile_alternatives="11 0x"],
-        [$1], [14], [ax_cxx_compile_alternatives="14 1y"],
-        [$1], [17], [ax_cxx_compile_alternatives="17 1z"],
-        [m4_fatal([invalid first argument `$1' to AX_CXX_COMPILE_STDCXX])])dnl
-  m4_if([$2], [], [],
-        [$2], [ext], [],
-        [$2], [noext], [],
-        [m4_fatal([invalid second argument `$2' to AX_CXX_COMPILE_STDCXX])])dnl
-  m4_if([$3], [], [ax_cxx_compile_cxx$1_required=true],
-        [$3], [mandatory], [ax_cxx_compile_cxx$1_required=true],
-        [$3], [optional], [ax_cxx_compile_cxx$1_required=false],
-        [m4_fatal([invalid third argument `$3' to AX_CXX_COMPILE_STDCXX])])
-  AC_LANG_PUSH([C++])dnl
-  ac_success=no
-  AC_CACHE_CHECK(whether $CXX supports C++$1 features by default,
-  ax_cv_cxx_compile_cxx$1,
-  [AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])],
-    [ax_cv_cxx_compile_cxx$1=yes],
-    [ax_cv_cxx_compile_cxx$1=no])])
-  if test x$ax_cv_cxx_compile_cxx$1 = xyes; then
-    ac_success=yes
-  fi
-
-  m4_if([$2], [noext], [], [dnl
-  if test x$ac_success = xno; then
-    for alternative in ${ax_cxx_compile_alternatives}; do
-      switch="-std=gnu++${alternative}"
-      cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_$switch])
-      AC_CACHE_CHECK(whether $CXX supports C++$1 features with $switch,
-                     $cachevar,
-        [ac_save_CXX="$CXX"
-         CXX="$CXX $switch"
-         AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])],
-          [eval $cachevar=yes],
-          [eval $cachevar=no])
-         CXX="$ac_save_CXX"])
-      if eval test x\$$cachevar = xyes; then
-        CXX="$CXX $switch"
-        if test -n "$CXXCPP" ; then
-          CXXCPP="$CXXCPP $switch"
-        fi
-        ac_success=yes
-        break
-      fi
-    done
-  fi])
-
-  m4_if([$2], [ext], [], [dnl
-  if test x$ac_success = xno; then
-    dnl HP's aCC needs +std=c++11 according to:
-    dnl http://h21007.www2.hp.com/portal/download/files/unprot/aCxx/PDF_Release_Notes/769149-001.pdf
-    dnl Cray's crayCC needs "-h std=c++11"
-    for alternative in ${ax_cxx_compile_alternatives}; do
-      for switch in -std=c++${alternative} +std=c++${alternative} "-h std=c++${alternative}"; do
-        cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_$switch])
-        AC_CACHE_CHECK(whether $CXX supports C++$1 features with $switch,
-                       $cachevar,
-          [ac_save_CXX="$CXX"
-           CXX="$CXX $switch"
-           AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])],
-            [eval $cachevar=yes],
-            [eval $cachevar=no])
-           CXX="$ac_save_CXX"])
-        if eval test x\$$cachevar = xyes; then
-          CXX="$CXX $switch"
-          if test -n "$CXXCPP" ; then
-            CXXCPP="$CXXCPP $switch"
-          fi
-          ac_success=yes
-          break
-        fi
-      done
-      if test x$ac_success = xyes; then
-        break
-      fi
-    done
-  fi])
-  AC_LANG_POP([C++])
-  if test x$ax_cxx_compile_cxx$1_required = xtrue; then
-    if test x$ac_success = xno; then
-      AC_MSG_ERROR([*** A compiler with support for C++$1 language features is required.])
-    fi
-  fi
-  if test x$ac_success = xno; then
-    HAVE_CXX$1=0
-    AC_MSG_NOTICE([No compiler with C++$1 support was found])
-  else
-    HAVE_CXX$1=1
-    AC_DEFINE(HAVE_CXX$1,1,
-              [define if the compiler supports basic C++$1 syntax])
-  fi
-  AC_SUBST(HAVE_CXX$1)
-  m4_if([$1], [17], [AC_MSG_WARN([C++17 is not yet standardized, so the checks may change in incompatible ways anytime])])
-])
-
-
-dnl  Test body for checking C++11 support
-
-m4_define([_AX_CXX_COMPILE_STDCXX_testbody_11],
-  _AX_CXX_COMPILE_STDCXX_testbody_new_in_11
-)
-
-
-dnl  Test body for checking C++14 support
-
-m4_define([_AX_CXX_COMPILE_STDCXX_testbody_14],
-  _AX_CXX_COMPILE_STDCXX_testbody_new_in_11
-  _AX_CXX_COMPILE_STDCXX_testbody_new_in_14
-)
-
-m4_define([_AX_CXX_COMPILE_STDCXX_testbody_17],
-  _AX_CXX_COMPILE_STDCXX_testbody_new_in_11
-  _AX_CXX_COMPILE_STDCXX_testbody_new_in_14
-  _AX_CXX_COMPILE_STDCXX_testbody_new_in_17
-)
-
-dnl  Tests for new features in C++11
-
-m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_11], [[
-
-// If the compiler admits that it is not ready for C++11, why torture it?
-// Hopefully, this will speed up the test.
-
-#ifndef __cplusplus
-
-#error "This is not a C++ compiler"
-
-#elif __cplusplus < 201103L
-
-#error "This is not a C++11 compiler"
-
-#else
-
-#include <utility>
-
-namespace cxx11
-{
-
-  namespace test_static_assert
-  {
-
-    template <typename T>
-    struct check
-    {
-      static_assert(sizeof(int) <= sizeof(T), "not big enough");
-    };
-
-  }
-
-  namespace test_final_override
-  {
-
-    struct Base
-    {
-      virtual void f() {}
-    };
-
-    struct Derived : public Base
-    {
-      virtual void f() override {}
-    };
-
-  }
-
-  namespace test_double_right_angle_brackets
-  {
-
-    template < typename T >
-    struct check {};
-
-    typedef check<void> single_type;
-    typedef check<check<void>> double_type;
-    typedef check<check<check<void>>> triple_type;
-    typedef check<check<check<check<void>>>> quadruple_type;
-
-  }
-
-  namespace test_decltype
-  {
-
-    int
-    f()
-    {
-      int a = 1;
-      decltype(a) b = 2;
-      return a + b;
-    }
-
-  }
-
-  namespace test_type_deduction
-  {
-
-    template < typename T1, typename T2 >
-    struct is_same
-    {
-      static const bool value = false;
-    };
-
-    template < typename T >
-    struct is_same<T, T>
-    {
-      static const bool value = true;
-    };
-
-    template < typename T1, typename T2 >
-    auto
-    add(T1 a1, T2 a2) -> decltype(a1 + a2)
-    {
-      return a1 + a2;
-    }
-
-    int
-    test(const int c, volatile int v)
-    {
-      static_assert(is_same<int, decltype(0)>::value == true, "");
-      static_assert(is_same<int, decltype(c)>::value == false, "");
-      static_assert(is_same<int, decltype(v)>::value == false, "");
-      auto ac = c;
-      auto av = v;
-      auto sumi = ac + av + 'x';
-      auto sumf = ac + av + 1.0;
-      static_assert(is_same<int, decltype(ac)>::value == true, "");
-      static_assert(is_same<int, decltype(av)>::value == true, "");
-      static_assert(is_same<int, decltype(sumi)>::value == true, "");
-      static_assert(is_same<int, decltype(sumf)>::value == false, "");
-      static_assert(is_same<int, decltype(add(c, v))>::value == true, "");
-      return (sumf > 0.0) ? sumi : add(c, v);
-    }
-
-  }
-
-  namespace test_noexcept
-  {
-
-    int f() { return 0; }
-    int g() noexcept { return 0; }
-
-    static_assert(noexcept(f()) == false, "");
-    static_assert(noexcept(g()) == true, "");
-
-  }
-
-  namespace test_constexpr
-  {
-
-    template < typename CharT >
-    unsigned long constexpr
-    strlen_c_r(const CharT *const s, const unsigned long acc) noexcept
-    {
-      return *s ? strlen_c_r(s + 1, acc + 1) : acc;
-    }
-
-    template < typename CharT >
-    unsigned long constexpr
-    strlen_c(const CharT *const s) noexcept
-    {
-      return strlen_c_r(s, 0UL);
-    }
-
-    static_assert(strlen_c("") == 0UL, "");
-    static_assert(strlen_c("1") == 1UL, "");
-    static_assert(strlen_c("example") == 7UL, "");
-    static_assert(strlen_c("another\0example") == 7UL, "");
-
-  }
-
-  namespace test_rvalue_references
-  {
-
-    template < int N >
-    struct answer
-    {
-      static constexpr int value = N;
-    };
-
-    answer<1> f(int&)       { return answer<1>(); }
-    answer<2> f(const int&) { return answer<2>(); }
-    answer<3> f(int&&)      { return answer<3>(); }
-
-    void
-    test()
-    {
-      int i = 0;
-      const int c = 0;
-      static_assert(decltype(f(i))::value == 1, "");
-      static_assert(decltype(f(c))::value == 2, "");
-      static_assert(decltype(f(0))::value == 3, "");
-    }
-
-  }
-
-  namespace test_uniform_initialization
-  {
-
-    struct test
-    {
-      static const int zero {};
-      static const int one {1};
-    };
-
-    static_assert(test::zero == 0, "");
-    static_assert(test::one == 1, "");
-
-  }
-
-  namespace test_lambdas
-  {
-
-    void
-    test1()
-    {
-      auto lambda1 = [](){};
-      auto lambda2 = lambda1;
-      lambda1();
-      lambda2();
-    }
-
-    int
-    test2()
-    {
-      auto a = [](int i, int j){ return i + j; }(1, 2);
-      auto b = []() -> int { return '0'; }();
-      auto c = [=](){ return a + b; }();
-      auto d = [&](){ return c; }();
-      auto e = [a, &b](int x) mutable {
-        const auto identity = [](int y){ return y; };
-        for (auto i = 0; i < a; ++i)
-          a += b--;
-        return x + identity(a + b);
-      }(0);
-      return a + b + c + d + e;
-    }
-
-    int
-    test3()
-    {
-      const auto nullary = [](){ return 0; };
-      const auto unary = [](int x){ return x; };
-      using nullary_t = decltype(nullary);
-      using unary_t = decltype(unary);
-      const auto higher1st = [](nullary_t f){ return f(); };
-      const auto higher2nd = [unary](nullary_t f1){
-        return [unary, f1](unary_t f2){ return f2(unary(f1())); };
-      };
-      return higher1st(nullary) + higher2nd(nullary)(unary);
-    }
-
-  }
-
-  namespace test_variadic_templates
-  {
-
-    template <int...>
-    struct sum;
-
-    template <int N0, int... N1toN>
-    struct sum<N0, N1toN...>
-    {
-      static constexpr auto value = N0 + sum<N1toN...>::value;
-    };
-
-    template <>
-    struct sum<>
-    {
-      static constexpr auto value = 0;
-    };
-
-    static_assert(sum<>::value == 0, "");
-    static_assert(sum<1>::value == 1, "");
-    static_assert(sum<23>::value == 23, "");
-    static_assert(sum<1, 2>::value == 3, "");
-    static_assert(sum<5, 5, 11>::value == 21, "");
-    static_assert(sum<2, 3, 5, 7, 11, 13>::value == 41, "");
-
-  }
-
-  // http://stackoverflow.com/questions/13728184/template-aliases-and-sfinae
-  // Clang 3.1 fails with headers of libstd++ 4.8.3 when using std::function
-  // because of this.
-  namespace test_template_alias_sfinae
-  {
-
-    struct foo {};
-
-    template<typename T>
-    using member = typename T::member_type;
-
-    template<typename T>
-    void func(...) {}
-
-    template<typename T>
-    void func(member<T>*) {}
-
-    void test();
-
-    void test() { func<foo>(0); }
-
-  }
-
-  namespace test_std_move_and_forward
-  {
-    struct message {};
-    char foo(message&) { return '\0'; }
-    int foo(message&&) { return 0; }
-
-    template<typename Arg, typename RT>
-    void check(Arg&& arg, RT rt) {
-      static_assert(sizeof(rt) == sizeof(foo(std::forward<Arg>(arg))), "");
-    }
-    void test() {
-      message a;
-      check(a, char());
-      check(std::move(a), int());
-    }
-  }
-
-}  // namespace cxx11
-
-#endif  // __cplusplus >= 201103L
-
-]])
-
-
-dnl  Tests for new features in C++14
-
-m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_14], [[
-
-// If the compiler admits that it is not ready for C++14, why torture it?
-// Hopefully, this will speed up the test.
-
-#ifndef __cplusplus
-
-#error "This is not a C++ compiler"
-
-#elif __cplusplus < 201402L
-
-#error "This is not a C++14 compiler"
-
-#else
-
-namespace cxx14
-{
-
-  namespace test_polymorphic_lambdas
-  {
-
-    int
-    test()
-    {
-      const auto lambda = [](auto&&... args){
-        const auto istiny = [](auto x){
-          return (sizeof(x) == 1UL) ? 1 : 0;
-        };
-        const int aretiny[] = { istiny(args)... };
-        return aretiny[0];
-      };
-      return lambda(1, 1L, 1.0f, '1');
-    }
-
-  }
-
-  namespace test_binary_literals
-  {
-
-    constexpr auto ivii = 0b0000000000101010;
-    static_assert(ivii == 42, "wrong value");
-
-  }
-
-  namespace test_generalized_constexpr
-  {
-
-    template < typename CharT >
-    constexpr unsigned long
-    strlen_c(const CharT *const s) noexcept
-    {
-      auto length = 0UL;
-      for (auto p = s; *p; ++p)
-        ++length;
-      return length;
-    }
-
-    static_assert(strlen_c("") == 0UL, "");
-    static_assert(strlen_c("x") == 1UL, "");
-    static_assert(strlen_c("test") == 4UL, "");
-    static_assert(strlen_c("another\0test") == 7UL, "");
-
-  }
-
-  namespace test_lambda_init_capture
-  {
-
-    int
-    test()
-    {
-      auto x = 0;
-      const auto lambda1 = [a = x](int b){ return a + b; };
-      const auto lambda2 = [a = lambda1(x)](){ return a; };
-      return lambda2();
-    }
-
-  }
-
-  namespace test_digit_separators
-  {
-
-    constexpr auto ten_million = 100'000'000;
-    static_assert(ten_million == 100000000, "");
-
-  }
-
-  namespace test_return_type_deduction
-  {
-
-    auto f(int& x) { return x; }
-    decltype(auto) g(int& x) { return x; }
-
-    template < typename T1, typename T2 >
-    struct is_same
-    {
-      static constexpr auto value = false;
-    };
-
-    template < typename T >
-    struct is_same<T, T>
-    {
-      static constexpr auto value = true;
-    };
-
-    int
-    test()
-    {
-      auto x = 0;
-      static_assert(is_same<int, decltype(f(x))>::value, "");
-      static_assert(is_same<int&, decltype(g(x))>::value, "");
-      return x;
-    }
-
-  }
-
-}  // namespace cxx14
-
-#endif  // __cplusplus >= 201402L
-
-]])
-
-
-dnl  Tests for new features in C++17
-
-m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_17], [[
-
-// If the compiler admits that it is not ready for C++17, why torture it?
-// Hopefully, this will speed up the test.
-
-#ifndef __cplusplus
-
-#error "This is not a C++ compiler"
-
-#elif __cplusplus <= 201402L
-
-#error "This is not a C++17 compiler"
-
-#else
-
-#if defined(__clang__)
-  #define REALLY_CLANG
-#else
-  #if defined(__GNUC__)
-    #define REALLY_GCC
-  #endif
-#endif
-
-#include <initializer_list>
-#include <utility>
-#include <type_traits>
-
-namespace cxx17
-{
-
-#if !defined(REALLY_CLANG)
-  namespace test_constexpr_lambdas
-  {
-
-    // TODO: test it with clang++ from git
-
-    constexpr int foo = [](){return 42;}();
-
-  }
-#endif // !defined(REALLY_CLANG)
-
-  namespace test::nested_namespace::definitions
-  {
-
-  }
-
-  namespace test_fold_expression
-  {
-
-    template<typename... Args>
-    int multiply(Args... args)
-    {
-      return (args * ... * 1);
-    }
-
-    template<typename... Args>
-    bool all(Args... args)
-    {
-      return (args && ...);
-    }
-
-  }
-
-  namespace test_extended_static_assert
-  {
-
-    static_assert (true);
-
-  }
-
-  namespace test_auto_brace_init_list
-  {
-
-    auto foo = {5};
-    auto bar {5};
-
-    static_assert(std::is_same<std::initializer_list<int>, decltype(foo)>::value);
-    static_assert(std::is_same<int, decltype(bar)>::value);
-  }
-
-  namespace test_typename_in_template_template_parameter
-  {
-
-    template<template<typename> typename X> struct D;
-
-  }
-
-  namespace test_fallthrough_nodiscard_maybe_unused_attributes
-  {
-
-    int f1()
-    {
-      return 42;
-    }
-
-    [[nodiscard]] int f2()
-    {
-      [[maybe_unused]] auto unused = f1();
-
-      switch (f1())
-      {
-      case 17:
-        f1();
-        [[fallthrough]];
-      case 42:
-        f1();
-      }
-      return f1();
-    }
-
-  }
-
-  namespace test_extended_aggregate_initialization
-  {
-
-    struct base1
-    {
-      int b1, b2 = 42;
-    };
-
-    struct base2
-    {
-      base2() {
-        b3 = 42;
-      }
-      int b3;
-    };
-
-    struct derived : base1, base2
-    {
-        int d;
-    };
-
-    derived d1 {{1, 2}, {}, 4};  // full initialization
-    derived d2 {{}, {}, 4};      // value-initialized bases
-
-  }
-
-  namespace test_general_range_based_for_loop
-  {
-
-    struct iter
-    {
-      int i;
-
-      int& operator* ()
-      {
-        return i;
-      }
-
-      const int& operator* () const
-      {
-        return i;
-      }
-
-      iter& operator++()
-      {
-        ++i;
-        return *this;
-      }
-    };
-
-    struct sentinel
-    {
-      int i;
-    };
-
-    bool operator== (const iter& i, const sentinel& s)
-    {
-      return i.i == s.i;
-    }
-
-    bool operator!= (const iter& i, const sentinel& s)
-    {
-      return !(i == s);
-    }
-
-    struct range
-    {
-      iter begin() const
-      {
-        return {0};
-      }
-
-      sentinel end() const
-      {
-        return {5};
-      }
-    };
-
-    void f()
-    {
-      range r {};
-
-      for (auto i : r)
-      {
-        [[maybe_unused]] auto v = i;
-      }
-    }
-
-  }
-
-  namespace test_lambda_capture_asterisk_this_by_value
-  {
-
-    struct t
-    {
-      int i;
-      int foo()
-      {
-        return [*this]()
-        {
-          return i;
-        }();
-      }
-    };
-
-  }
-
-  namespace test_enum_class_construction
-  {
-
-    enum class byte : unsigned char
-    {};
-
-    byte foo {42};
-
-  }
-
-  namespace test_constexpr_if
-  {
-
-    template <bool cond>
-    int f ()
-    {
-      if constexpr(cond)
-      {
-        return 13;
-      }
-      else
-      {
-        return 42;
-      }
-    }
-
-  }
-
-  namespace test_selection_statement_with_initializer
-  {
-
-    int f()
-    {
-      return 13;
-    }
-
-    int f2()
-    {
-      if (auto i = f(); i > 0)
-      {
-        return 3;
-      }
-
-      switch (auto i = f(); i + 4)
-      {
-      case 17:
-        return 2;
-
-      default:
-        return 1;
-      }
-    }
-
-  }
-
-#if !defined(REALLY_CLANG)
-  namespace test_template_argument_deduction_for_class_templates
-  {
-
-    // TODO: test it with clang++ from git
-
-    template <typename T1, typename T2>
-    struct pair
-    {
-      pair (T1 p1, T2 p2)
-        : m1 {p1},
-          m2 {p2}
-      {}
-
-      T1 m1;
-      T2 m2;
-    };
-
-    void f()
-    {
-      [[maybe_unused]] auto p = pair{13, 42u};
-    }
-
-  }
-#endif // !defined(REALLY_CLANG)
-
-  namespace test_non_type_auto_template_parameters
-  {
-
-    template <auto n>
-    struct B
-    {};
-
-    B<5> b1;
-    B<'a'> b2;
-
-  }
-
-#if !defined(REALLY_CLANG)
-  namespace test_structured_bindings
-  {
-
-    // TODO: test it with clang++ from git
-
-    int arr[2] = { 1, 2 };
-    std::pair<int, int> pr = { 1, 2 };
-
-    auto f1() -> int(&)[2]
-    {
-      return arr;
-    }
-
-    auto f2() -> std::pair<int, int>&
-    {
-      return pr;
-    }
-
-    struct S
-    {
-      int x1 : 2;
-      volatile double y1;
-    };
-
-    S f3()
-    {
-      return {};
-    }
-
-    auto [ x1, y1 ] = f1();
-    auto& [ xr1, yr1 ] = f1();
-    auto [ x2, y2 ] = f2();
-    auto& [ xr2, yr2 ] = f2();
-    const auto [ x3, y3 ] = f3();
-
-  }
-#endif // !defined(REALLY_CLANG)
-
-#if !defined(REALLY_CLANG)
-  namespace test_exception_spec_type_system
-  {
-
-    // TODO: test it with clang++ from git
-
-    struct Good {};
-    struct Bad {};
-
-    void g1() noexcept;
-    void g2();
-
-    template<typename T>
-    Bad
-    f(T*, T*);
-
-    template<typename T1, typename T2>
-    Good
-    f(T1*, T2*);
-
-    static_assert (std::is_same_v<Good, decltype(f(g1, g2))>);
-
-  }
-#endif // !defined(REALLY_CLANG)
-
-  namespace test_inline_variables
-  {
-
-    template<class T> void f(T)
-    {}
-
-    template<class T> inline T g(T)
-    {
-      return T{};
-    }
-
-    template<> inline void f<>(int)
-    {}
-
-    template<> int g<>(int)
-    {
-      return 5;
-    }
-
-  }
-
-}  // namespace cxx17
-
-#endif  // __cplusplus <= 201402L
-
-]])
diff --git a/libs/protobuf/m4/ax_prog_cc_for_build.m4 b/libs/protobuf/m4/ax_prog_cc_for_build.m4
deleted file mode 100644
index 77fd346..0000000
--- a/libs/protobuf/m4/ax_prog_cc_for_build.m4
+++ /dev/null
@@ -1,125 +0,0 @@
-# ===========================================================================
-#   http://www.gnu.org/software/autoconf-archive/ax_prog_cc_for_build.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_PROG_CC_FOR_BUILD
-#
-# DESCRIPTION
-#
-#   This macro searches for a C compiler that generates native executables,
-#   that is a C compiler that surely is not a cross-compiler. This can be
-#   useful if you have to generate source code at compile-time like for
-#   example GCC does.
-#
-#   The macro sets the CC_FOR_BUILD and CPP_FOR_BUILD macros to anything
-#   needed to compile or link (CC_FOR_BUILD) and preprocess (CPP_FOR_BUILD).
-#   The value of these variables can be overridden by the user by specifying
-#   a compiler with an environment variable (like you do for standard CC).
-#
-#   It also sets BUILD_EXEEXT and BUILD_OBJEXT to the executable and object
-#   file extensions for the build platform, and GCC_FOR_BUILD to `yes' if
-#   the compiler we found is GCC. All these variables but GCC_FOR_BUILD are
-#   substituted in the Makefile.
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Paolo Bonzini <bonzini@gnu.org>
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved. This file is offered as-is, without any
-#   warranty.
-
-#serial 8
-
-AU_ALIAS([AC_PROG_CC_FOR_BUILD], [AX_PROG_CC_FOR_BUILD])
-AC_DEFUN([AX_PROG_CC_FOR_BUILD], [dnl
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_PROG_CPP])dnl
-AC_REQUIRE([AC_EXEEXT])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-
-dnl Use the standard macros, but make them use other variable names
-dnl
-pushdef([ac_cv_prog_CPP], ac_cv_build_prog_CPP)dnl
-pushdef([ac_cv_prog_gcc], ac_cv_build_prog_gcc)dnl
-pushdef([ac_cv_prog_cc_works], ac_cv_build_prog_cc_works)dnl
-pushdef([ac_cv_prog_cc_cross], ac_cv_build_prog_cc_cross)dnl
-pushdef([ac_cv_prog_cc_g], ac_cv_build_prog_cc_g)dnl
-pushdef([ac_cv_exeext], ac_cv_build_exeext)dnl
-pushdef([ac_cv_objext], ac_cv_build_objext)dnl
-pushdef([ac_exeext], ac_build_exeext)dnl
-pushdef([ac_objext], ac_build_objext)dnl
-pushdef([CC], CC_FOR_BUILD)dnl
-pushdef([CPP], CPP_FOR_BUILD)dnl
-pushdef([CFLAGS], CFLAGS_FOR_BUILD)dnl
-pushdef([CPPFLAGS], CPPFLAGS_FOR_BUILD)dnl
-pushdef([LDFLAGS], LDFLAGS_FOR_BUILD)dnl
-pushdef([host], build)dnl
-pushdef([host_alias], build_alias)dnl
-pushdef([host_cpu], build_cpu)dnl
-pushdef([host_vendor], build_vendor)dnl
-pushdef([host_os], build_os)dnl
-pushdef([ac_cv_host], ac_cv_build)dnl
-pushdef([ac_cv_host_alias], ac_cv_build_alias)dnl
-pushdef([ac_cv_host_cpu], ac_cv_build_cpu)dnl
-pushdef([ac_cv_host_vendor], ac_cv_build_vendor)dnl
-pushdef([ac_cv_host_os], ac_cv_build_os)dnl
-pushdef([ac_cpp], ac_build_cpp)dnl
-pushdef([ac_compile], ac_build_compile)dnl
-pushdef([ac_link], ac_build_link)dnl
-
-save_cross_compiling=$cross_compiling
-save_ac_tool_prefix=$ac_tool_prefix
-cross_compiling=no
-ac_tool_prefix=
-
-AC_PROG_CC
-AC_PROG_CPP
-AC_EXEEXT
-
-ac_tool_prefix=$save_ac_tool_prefix
-cross_compiling=$save_cross_compiling
-
-dnl Restore the old definitions
-dnl
-popdef([ac_link])dnl
-popdef([ac_compile])dnl
-popdef([ac_cpp])dnl
-popdef([ac_cv_host_os])dnl
-popdef([ac_cv_host_vendor])dnl
-popdef([ac_cv_host_cpu])dnl
-popdef([ac_cv_host_alias])dnl
-popdef([ac_cv_host])dnl
-popdef([host_os])dnl
-popdef([host_vendor])dnl
-popdef([host_cpu])dnl
-popdef([host_alias])dnl
-popdef([host])dnl
-popdef([LDFLAGS])dnl
-popdef([CPPFLAGS])dnl
-popdef([CFLAGS])dnl
-popdef([CPP])dnl
-popdef([CC])dnl
-popdef([ac_objext])dnl
-popdef([ac_exeext])dnl
-popdef([ac_cv_objext])dnl
-popdef([ac_cv_exeext])dnl
-popdef([ac_cv_prog_cc_g])dnl
-popdef([ac_cv_prog_cc_cross])dnl
-popdef([ac_cv_prog_cc_works])dnl
-popdef([ac_cv_prog_gcc])dnl
-popdef([ac_cv_prog_CPP])dnl
-
-dnl Finally, set Makefile variables
-dnl
-BUILD_EXEEXT=$ac_build_exeext
-BUILD_OBJEXT=$ac_build_objext
-AC_SUBST(BUILD_EXEEXT)dnl
-AC_SUBST(BUILD_OBJEXT)dnl
-AC_SUBST([CFLAGS_FOR_BUILD])dnl
-AC_SUBST([CPPFLAGS_FOR_BUILD])dnl
-AC_SUBST([LDFLAGS_FOR_BUILD])dnl
-])
diff --git a/libs/protobuf/m4/ax_prog_cxx_for_build.m4 b/libs/protobuf/m4/ax_prog_cxx_for_build.m4
deleted file mode 100644
index 8cc0f73..0000000
--- a/libs/protobuf/m4/ax_prog_cxx_for_build.m4
+++ /dev/null
@@ -1,110 +0,0 @@
-# ===========================================================================
-#   http://www.gnu.org/software/autoconf-archive/ax_prog_cxx_for_build.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_PROG_CXX_FOR_BUILD
-#
-# DESCRIPTION
-#
-#   This macro searches for a C++ compiler that generates native
-#   executables, that is a C++ compiler that surely is not a cross-compiler.
-#   This can be useful if you have to generate source code at compile-time
-#   like for example GCC does.
-#
-#   The macro sets the CXX_FOR_BUILD and CXXCPP_FOR_BUILD macros to anything
-#   needed to compile or link (CXX_FOR_BUILD) and preprocess
-#   (CXXCPP_FOR_BUILD). The value of these variables can be overridden by
-#   the user by specifying a compiler with an environment variable (like you
-#   do for standard CXX).
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Paolo Bonzini <bonzini@gnu.org>
-#   Copyright (c) 2012 Avionic Design GmbH
-#
-#   Based on the AX_PROG_CC_FOR_BUILD macro by Paolo Bonzini.
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved. This file is offered as-is, without any
-#   warranty.
-
-#serial 2
-
-AU_ALIAS([AC_PROG_CXX_FOR_BUILD], [AX_PROG_CXX_FOR_BUILD])
-AC_DEFUN([AX_PROG_CXX_FOR_BUILD], [dnl
-AC_REQUIRE([AX_PROG_CC_FOR_BUILD])dnl
-AC_REQUIRE([AC_PROG_CXX])dnl
-AC_REQUIRE([AC_PROG_CXXCPP])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-
-dnl Use the standard macros, but make them use other variable names
-dnl
-pushdef([ac_cv_prog_CXXCPP], ac_cv_build_prog_CXXCPP)dnl
-pushdef([ac_cv_prog_gxx], ac_cv_build_prog_gxx)dnl
-pushdef([ac_cv_prog_cxx_works], ac_cv_build_prog_cxx_works)dnl
-pushdef([ac_cv_prog_cxx_cross], ac_cv_build_prog_cxx_cross)dnl
-pushdef([ac_cv_prog_cxx_g], ac_cv_build_prog_cxx_g)dnl
-pushdef([CXX], CXX_FOR_BUILD)dnl
-pushdef([CXXCPP], CXXCPP_FOR_BUILD)dnl
-pushdef([CXXFLAGS], CXXFLAGS_FOR_BUILD)dnl
-pushdef([CPPFLAGS], CPPFLAGS_FOR_BUILD)dnl
-pushdef([CXXCPPFLAGS], CXXCPPFLAGS_FOR_BUILD)dnl
-pushdef([host], build)dnl
-pushdef([host_alias], build_alias)dnl
-pushdef([host_cpu], build_cpu)dnl
-pushdef([host_vendor], build_vendor)dnl
-pushdef([host_os], build_os)dnl
-pushdef([ac_cv_host], ac_cv_build)dnl
-pushdef([ac_cv_host_alias], ac_cv_build_alias)dnl
-pushdef([ac_cv_host_cpu], ac_cv_build_cpu)dnl
-pushdef([ac_cv_host_vendor], ac_cv_build_vendor)dnl
-pushdef([ac_cv_host_os], ac_cv_build_os)dnl
-pushdef([ac_cxxcpp], ac_build_cxxcpp)dnl
-pushdef([ac_compile], ac_build_compile)dnl
-pushdef([ac_link], ac_build_link)dnl
-
-save_cross_compiling=$cross_compiling
-save_ac_tool_prefix=$ac_tool_prefix
-cross_compiling=no
-ac_tool_prefix=
-
-AC_PROG_CXX
-AC_PROG_CXXCPP
-
-ac_tool_prefix=$save_ac_tool_prefix
-cross_compiling=$save_cross_compiling
-
-dnl Restore the old definitions
-dnl
-popdef([ac_link])dnl
-popdef([ac_compile])dnl
-popdef([ac_cxxcpp])dnl
-popdef([ac_cv_host_os])dnl
-popdef([ac_cv_host_vendor])dnl
-popdef([ac_cv_host_cpu])dnl
-popdef([ac_cv_host_alias])dnl
-popdef([ac_cv_host])dnl
-popdef([host_os])dnl
-popdef([host_vendor])dnl
-popdef([host_cpu])dnl
-popdef([host_alias])dnl
-popdef([host])dnl
-popdef([CXXCPPFLAGS])dnl
-popdef([CPPFLAGS])dnl
-popdef([CXXFLAGS])dnl
-popdef([CXXCPP])dnl
-popdef([CXX])dnl
-popdef([ac_cv_prog_cxx_g])dnl
-popdef([ac_cv_prog_cxx_cross])dnl
-popdef([ac_cv_prog_cxx_works])dnl
-popdef([ac_cv_prog_gxx])dnl
-popdef([ac_cv_prog_CXXCPP])dnl
-
-dnl Finally, set Makefile variables
-dnl
-AC_SUBST([CXXFLAGS_FOR_BUILD])dnl
-AC_SUBST([CXXCPPFLAGS_FOR_BUILD])dnl
-])
diff --git a/libs/protobuf/m4/ax_pthread.m4 b/libs/protobuf/m4/ax_pthread.m4
deleted file mode 100644
index 1598d07..0000000
--- a/libs/protobuf/m4/ax_pthread.m4
+++ /dev/null
@@ -1,507 +0,0 @@
-# ===========================================================================
-#        https://www.gnu.org/software/autoconf-archive/ax_pthread.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_PTHREAD([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
-#
-# DESCRIPTION
-#
-#   This macro figures out how to build C programs using POSIX threads. It
-#   sets the PTHREAD_LIBS output variable to the threads library and linker
-#   flags, and the PTHREAD_CFLAGS output variable to any special C compiler
-#   flags that are needed. (The user can also force certain compiler
-#   flags/libs to be tested by setting these environment variables.)
-#
-#   Also sets PTHREAD_CC to any special C compiler that is needed for
-#   multi-threaded programs (defaults to the value of CC otherwise). (This
-#   is necessary on AIX to use the special cc_r compiler alias.)
-#
-#   NOTE: You are assumed to not only compile your program with these flags,
-#   but also to link with them as well. For example, you might link with
-#   $PTHREAD_CC $CFLAGS $PTHREAD_CFLAGS $LDFLAGS ... $PTHREAD_LIBS $LIBS
-#
-#   If you are only building threaded programs, you may wish to use these
-#   variables in your default LIBS, CFLAGS, and CC:
-#
-#     LIBS="$PTHREAD_LIBS $LIBS"
-#     CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-#     CC="$PTHREAD_CC"
-#
-#   In addition, if the PTHREAD_CREATE_JOINABLE thread-attribute constant
-#   has a nonstandard name, this macro defines PTHREAD_CREATE_JOINABLE to
-#   that name (e.g. PTHREAD_CREATE_UNDETACHED on AIX).
-#
-#   Also HAVE_PTHREAD_PRIO_INHERIT is defined if pthread is found and the
-#   PTHREAD_PRIO_INHERIT symbol is defined when compiling with
-#   PTHREAD_CFLAGS.
-#
-#   ACTION-IF-FOUND is a list of shell commands to run if a threads library
-#   is found, and ACTION-IF-NOT-FOUND is a list of commands to run it if it
-#   is not found. If ACTION-IF-FOUND is not specified, the default action
-#   will define HAVE_PTHREAD.
-#
-#   Please let the authors know if this macro fails on any platform, or if
-#   you have any other suggestions or comments. This macro was based on work
-#   by SGJ on autoconf scripts for FFTW (http://www.fftw.org/) (with help
-#   from M. Frigo), as well as ac_pthread and hb_pthread macros posted by
-#   Alejandro Forero Cuervo to the autoconf macro repository. We are also
-#   grateful for the helpful feedback of numerous users.
-#
-#   Updated for Autoconf 2.68 by Daniel Richard G.
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Steven G. Johnson <stevenj@alum.mit.edu>
-#   Copyright (c) 2011 Daniel Richard G. <skunk@iSKUNK.ORG>
-#   Copyright (c) 2019 Marc Stevens <marc.stevens@cwi.nl>
-#
-#   This program is free software: you can redistribute it and/or modify it
-#   under the terms of the GNU General Public License as published by the
-#   Free Software Foundation, either version 3 of the License, or (at your
-#   option) any later version.
-#
-#   This program is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-#   Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License along
-#   with this program. If not, see <https://www.gnu.org/licenses/>.
-#
-#   As a special exception, the respective Autoconf Macro's copyright owner
-#   gives unlimited permission to copy, distribute and modify the configure
-#   scripts that are the output of Autoconf when processing the Macro. You
-#   need not follow the terms of the GNU General Public License when using
-#   or distributing such scripts, even though portions of the text of the
-#   Macro appear in them. The GNU General Public License (GPL) does govern
-#   all other use of the material that constitutes the Autoconf Macro.
-#
-#   This special exception to the GPL applies to versions of the Autoconf
-#   Macro released by the Autoconf Archive. When you make and distribute a
-#   modified version of the Autoconf Macro, you may extend this special
-#   exception to the GPL to apply to your modified version as well.
-
-#serial 27
-
-AU_ALIAS([ACX_PTHREAD], [AX_PTHREAD])
-AC_DEFUN([AX_PTHREAD], [
-AC_REQUIRE([AC_CANONICAL_HOST])
-AC_REQUIRE([AC_PROG_CC])
-AC_REQUIRE([AC_PROG_SED])
-AC_LANG_PUSH([C])
-ax_pthread_ok=no
-
-# We used to check for pthread.h first, but this fails if pthread.h
-# requires special compiler flags (e.g. on Tru64 or Sequent).
-# It gets checked for in the link test anyway.
-
-# First of all, check if the user has set any of the PTHREAD_LIBS,
-# etcetera environment variables, and if threads linking works using
-# them:
-if test "x$PTHREAD_CFLAGS$PTHREAD_LIBS" != "x"; then
-        ax_pthread_save_CC="$CC"
-        ax_pthread_save_CFLAGS="$CFLAGS"
-        ax_pthread_save_LIBS="$LIBS"
-        AS_IF([test "x$PTHREAD_CC" != "x"], [CC="$PTHREAD_CC"])
-        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-        LIBS="$PTHREAD_LIBS $LIBS"
-        AC_MSG_CHECKING([for pthread_join using $CC $PTHREAD_CFLAGS $PTHREAD_LIBS])
-        AC_LINK_IFELSE([AC_LANG_CALL([], [pthread_join])], [ax_pthread_ok=yes])
-        AC_MSG_RESULT([$ax_pthread_ok])
-        if test "x$ax_pthread_ok" = "xno"; then
-                PTHREAD_LIBS=""
-                PTHREAD_CFLAGS=""
-        fi
-        CC="$ax_pthread_save_CC"
-        CFLAGS="$ax_pthread_save_CFLAGS"
-        LIBS="$ax_pthread_save_LIBS"
-fi
-
-# We must check for the threads library under a number of different
-# names; the ordering is very important because some systems
-# (e.g. DEC) have both -lpthread and -lpthreads, where one of the
-# libraries is broken (non-POSIX).
-
-# Create a list of thread flags to try. Items with a "," contain both
-# C compiler flags (before ",") and linker flags (after ","). Other items
-# starting with a "-" are C compiler flags, and remaining items are
-# library names, except for "none" which indicates that we try without
-# any flags at all, and "pthread-config" which is a program returning
-# the flags for the Pth emulation library.
-
-ax_pthread_flags="pthreads none -Kthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config"
-
-# The ordering *is* (sometimes) important.  Some notes on the
-# individual items follow:
-
-# pthreads: AIX (must check this before -lpthread)
-# none: in case threads are in libc; should be tried before -Kthread and
-#       other compiler flags to prevent continual compiler warnings
-# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h)
-# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads), Tru64
-#           (Note: HP C rejects this with "bad form for `-t' option")
-# -pthreads: Solaris/gcc (Note: HP C also rejects)
-# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it
-#      doesn't hurt to check since this sometimes defines pthreads and
-#      -D_REENTRANT too), HP C (must be checked before -lpthread, which
-#      is present but should not be used directly; and before -mthreads,
-#      because the compiler interprets this as "-mt" + "-hreads")
-# -mthreads: Mingw32/gcc, Lynx/gcc
-# pthread: Linux, etcetera
-# --thread-safe: KAI C++
-# pthread-config: use pthread-config program (for GNU Pth library)
-
-case $host_os in
-
-        freebsd*)
-
-        # -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able)
-        # lthread: LinuxThreads port on FreeBSD (also preferred to -pthread)
-
-        ax_pthread_flags="-kthread lthread $ax_pthread_flags"
-        ;;
-
-        hpux*)
-
-        # From the cc(1) man page: "[-mt] Sets various -D flags to enable
-        # multi-threading and also sets -lpthread."
-
-        ax_pthread_flags="-mt -pthread pthread $ax_pthread_flags"
-        ;;
-
-        openedition*)
-
-        # IBM z/OS requires a feature-test macro to be defined in order to
-        # enable POSIX threads at all, so give the user a hint if this is
-        # not set. (We don't define these ourselves, as they can affect
-        # other portions of the system API in unpredictable ways.)
-
-        AC_EGREP_CPP([AX_PTHREAD_ZOS_MISSING],
-            [
-#            if !defined(_OPEN_THREADS) && !defined(_UNIX03_THREADS)
-             AX_PTHREAD_ZOS_MISSING
-#            endif
-            ],
-            [AC_MSG_WARN([IBM z/OS requires -D_OPEN_THREADS or -D_UNIX03_THREADS to enable pthreads support.])])
-        ;;
-
-        solaris*)
-
-        # On Solaris (at least, for some versions), libc contains stubbed
-        # (non-functional) versions of the pthreads routines, so link-based
-        # tests will erroneously succeed. (N.B.: The stubs are missing
-        # pthread_cleanup_push, or rather a function called by this macro,
-        # so we could check for that, but who knows whether they'll stub
-        # that too in a future libc.)  So we'll check first for the
-        # standard Solaris way of linking pthreads (-mt -lpthread).
-
-        ax_pthread_flags="-mt,-lpthread pthread $ax_pthread_flags"
-        ;;
-esac
-
-# Are we compiling with Clang?
-
-AC_CACHE_CHECK([whether $CC is Clang],
-    [ax_cv_PTHREAD_CLANG],
-    [ax_cv_PTHREAD_CLANG=no
-     # Note that Autoconf sets GCC=yes for Clang as well as GCC
-     if test "x$GCC" = "xyes"; then
-        AC_EGREP_CPP([AX_PTHREAD_CC_IS_CLANG],
-            [/* Note: Clang 2.7 lacks __clang_[a-z]+__ */
-#            if defined(__clang__) && defined(__llvm__)
-             AX_PTHREAD_CC_IS_CLANG
-#            endif
-            ],
-            [ax_cv_PTHREAD_CLANG=yes])
-     fi
-    ])
-ax_pthread_clang="$ax_cv_PTHREAD_CLANG"
-
-
-# GCC generally uses -pthread, or -pthreads on some platforms (e.g. SPARC)
-
-# Note that for GCC and Clang -pthread generally implies -lpthread,
-# except when -nostdlib is passed.
-# This is problematic using libtool to build C++ shared libraries with pthread:
-# [1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=25460
-# [2] https://bugzilla.redhat.com/show_bug.cgi?id=661333
-# [3] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=468555
-# To solve this, first try -pthread together with -lpthread for GCC
-
-AS_IF([test "x$GCC" = "xyes"],
-      [ax_pthread_flags="-pthread,-lpthread -pthread -pthreads $ax_pthread_flags"])
-
-# Clang takes -pthread (never supported any other flag), but we'll try with -lpthread first
-
-AS_IF([test "x$ax_pthread_clang" = "xyes"],
-      [ax_pthread_flags="-pthread,-lpthread -pthread"])
-
-
-# The presence of a feature test macro requesting re-entrant function
-# definitions is, on some systems, a strong hint that pthreads support is
-# correctly enabled
-
-case $host_os in
-        darwin* | hpux* | linux* | osf* | solaris*)
-        ax_pthread_check_macro="_REENTRANT"
-        ;;
-
-        aix*)
-        ax_pthread_check_macro="_THREAD_SAFE"
-        ;;
-
-        *)
-        ax_pthread_check_macro="--"
-        ;;
-esac
-AS_IF([test "x$ax_pthread_check_macro" = "x--"],
-      [ax_pthread_check_cond=0],
-      [ax_pthread_check_cond="!defined($ax_pthread_check_macro)"])
-
-
-if test "x$ax_pthread_ok" = "xno"; then
-for ax_pthread_try_flag in $ax_pthread_flags; do
-
-        case $ax_pthread_try_flag in
-                none)
-                AC_MSG_CHECKING([whether pthreads work without any flags])
-                ;;
-
-                *,*)
-                PTHREAD_CFLAGS=`echo $ax_pthread_try_flag | sed "s/^\(.*\),\(.*\)$/\1/"`
-                PTHREAD_LIBS=`echo $ax_pthread_try_flag | sed "s/^\(.*\),\(.*\)$/\2/"`
-                AC_MSG_CHECKING([whether pthreads work with "$PTHREAD_CFLAGS" and "$PTHREAD_LIBS"])
-                ;;
-
-                -*)
-                AC_MSG_CHECKING([whether pthreads work with $ax_pthread_try_flag])
-                PTHREAD_CFLAGS="$ax_pthread_try_flag"
-                ;;
-
-                pthread-config)
-                AC_CHECK_PROG([ax_pthread_config], [pthread-config], [yes], [no])
-                AS_IF([test "x$ax_pthread_config" = "xno"], [continue])
-                PTHREAD_CFLAGS="`pthread-config --cflags`"
-                PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`"
-                ;;
-
-                *)
-                AC_MSG_CHECKING([for the pthreads library -l$ax_pthread_try_flag])
-                PTHREAD_LIBS="-l$ax_pthread_try_flag"
-                ;;
-        esac
-
-        ax_pthread_save_CFLAGS="$CFLAGS"
-        ax_pthread_save_LIBS="$LIBS"
-        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-        LIBS="$PTHREAD_LIBS $LIBS"
-
-        # Check for various functions.  We must include pthread.h,
-        # since some functions may be macros.  (On the Sequent, we
-        # need a special flag -Kthread to make this header compile.)
-        # We check for pthread_join because it is in -lpthread on IRIX
-        # while pthread_create is in libc.  We check for pthread_attr_init
-        # due to DEC craziness with -lpthreads.  We check for
-        # pthread_cleanup_push because it is one of the few pthread
-        # functions on Solaris that doesn't have a non-functional libc stub.
-        # We try pthread_create on general principles.
-
-        AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>
-#                       if $ax_pthread_check_cond
-#                        error "$ax_pthread_check_macro must be defined"
-#                       endif
-                        static void *some_global = NULL;
-                        static void routine(void *a)
-                          {
-                             /* To avoid any unused-parameter or
-                                unused-but-set-parameter warning.  */
-                             some_global = a;
-                          }
-                        static void *start_routine(void *a) { return a; }],
-                       [pthread_t th; pthread_attr_t attr;
-                        pthread_create(&th, 0, start_routine, 0);
-                        pthread_join(th, 0);
-                        pthread_attr_init(&attr);
-                        pthread_cleanup_push(routine, 0);
-                        pthread_cleanup_pop(0) /* ; */])],
-            [ax_pthread_ok=yes],
-            [])
-
-        CFLAGS="$ax_pthread_save_CFLAGS"
-        LIBS="$ax_pthread_save_LIBS"
-
-        AC_MSG_RESULT([$ax_pthread_ok])
-        AS_IF([test "x$ax_pthread_ok" = "xyes"], [break])
-
-        PTHREAD_LIBS=""
-        PTHREAD_CFLAGS=""
-done
-fi
-
-
-# Clang needs special handling, because older versions handle the -pthread
-# option in a rather... idiosyncratic way
-
-if test "x$ax_pthread_clang" = "xyes"; then
-
-        # Clang takes -pthread; it has never supported any other flag
-
-        # (Note 1: This will need to be revisited if a system that Clang
-        # supports has POSIX threads in a separate library.  This tends not
-        # to be the way of modern systems, but it's conceivable.)
-
-        # (Note 2: On some systems, notably Darwin, -pthread is not needed
-        # to get POSIX threads support; the API is always present and
-        # active.  We could reasonably leave PTHREAD_CFLAGS empty.  But
-        # -pthread does define _REENTRANT, and while the Darwin headers
-        # ignore this macro, third-party headers might not.)
-
-        # However, older versions of Clang make a point of warning the user
-        # that, in an invocation where only linking and no compilation is
-        # taking place, the -pthread option has no effect ("argument unused
-        # during compilation").  They expect -pthread to be passed in only
-        # when source code is being compiled.
-        #
-        # Problem is, this is at odds with the way Automake and most other
-        # C build frameworks function, which is that the same flags used in
-        # compilation (CFLAGS) are also used in linking.  Many systems
-        # supported by AX_PTHREAD require exactly this for POSIX threads
-        # support, and in fact it is often not straightforward to specify a
-        # flag that is used only in the compilation phase and not in
-        # linking.  Such a scenario is extremely rare in practice.
-        #
-        # Even though use of the -pthread flag in linking would only print
-        # a warning, this can be a nuisance for well-run software projects
-        # that build with -Werror.  So if the active version of Clang has
-        # this misfeature, we search for an option to squash it.
-
-        AC_CACHE_CHECK([whether Clang needs flag to prevent "argument unused" warning when linking with -pthread],
-            [ax_cv_PTHREAD_CLANG_NO_WARN_FLAG],
-            [ax_cv_PTHREAD_CLANG_NO_WARN_FLAG=unknown
-             # Create an alternate version of $ac_link that compiles and
-             # links in two steps (.c -> .o, .o -> exe) instead of one
-             # (.c -> exe), because the warning occurs only in the second
-             # step
-             ax_pthread_save_ac_link="$ac_link"
-             ax_pthread_sed='s/conftest\.\$ac_ext/conftest.$ac_objext/g'
-             ax_pthread_link_step=`$as_echo "$ac_link" | sed "$ax_pthread_sed"`
-             ax_pthread_2step_ac_link="($ac_compile) && (echo ==== >&5) && ($ax_pthread_link_step)"
-             ax_pthread_save_CFLAGS="$CFLAGS"
-             for ax_pthread_try in '' -Qunused-arguments -Wno-unused-command-line-argument unknown; do
-                AS_IF([test "x$ax_pthread_try" = "xunknown"], [break])
-                CFLAGS="-Werror -Wunknown-warning-option $ax_pthread_try -pthread $ax_pthread_save_CFLAGS"
-                ac_link="$ax_pthread_save_ac_link"
-                AC_LINK_IFELSE([AC_LANG_SOURCE([[int main(void){return 0;}]])],
-                    [ac_link="$ax_pthread_2step_ac_link"
-                     AC_LINK_IFELSE([AC_LANG_SOURCE([[int main(void){return 0;}]])],
-                         [break])
-                    ])
-             done
-             ac_link="$ax_pthread_save_ac_link"
-             CFLAGS="$ax_pthread_save_CFLAGS"
-             AS_IF([test "x$ax_pthread_try" = "x"], [ax_pthread_try=no])
-             ax_cv_PTHREAD_CLANG_NO_WARN_FLAG="$ax_pthread_try"
-            ])
-
-        case "$ax_cv_PTHREAD_CLANG_NO_WARN_FLAG" in
-                no | unknown) ;;
-                *) PTHREAD_CFLAGS="$ax_cv_PTHREAD_CLANG_NO_WARN_FLAG $PTHREAD_CFLAGS" ;;
-        esac
-
-fi # $ax_pthread_clang = yes
-
-
-
-# Various other checks:
-if test "x$ax_pthread_ok" = "xyes"; then
-        ax_pthread_save_CFLAGS="$CFLAGS"
-        ax_pthread_save_LIBS="$LIBS"
-        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-        LIBS="$PTHREAD_LIBS $LIBS"
-
-        # Detect AIX lossage: JOINABLE attribute is called UNDETACHED.
-        AC_CACHE_CHECK([for joinable pthread attribute],
-            [ax_cv_PTHREAD_JOINABLE_ATTR],
-            [ax_cv_PTHREAD_JOINABLE_ATTR=unknown
-             for ax_pthread_attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do
-                 AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>],
-                                                 [int attr = $ax_pthread_attr; return attr /* ; */])],
-                                [ax_cv_PTHREAD_JOINABLE_ATTR=$ax_pthread_attr; break],
-                                [])
-             done
-            ])
-        AS_IF([test "x$ax_cv_PTHREAD_JOINABLE_ATTR" != "xunknown" && \
-               test "x$ax_cv_PTHREAD_JOINABLE_ATTR" != "xPTHREAD_CREATE_JOINABLE" && \
-               test "x$ax_pthread_joinable_attr_defined" != "xyes"],
-              [AC_DEFINE_UNQUOTED([PTHREAD_CREATE_JOINABLE],
-                                  [$ax_cv_PTHREAD_JOINABLE_ATTR],
-                                  [Define to necessary symbol if this constant
-                                   uses a non-standard name on your system.])
-               ax_pthread_joinable_attr_defined=yes
-              ])
-
-        AC_CACHE_CHECK([whether more special flags are required for pthreads],
-            [ax_cv_PTHREAD_SPECIAL_FLAGS],
-            [ax_cv_PTHREAD_SPECIAL_FLAGS=no
-             case $host_os in
-             solaris*)
-             ax_cv_PTHREAD_SPECIAL_FLAGS="-D_POSIX_PTHREAD_SEMANTICS"
-             ;;
-             esac
-            ])
-        AS_IF([test "x$ax_cv_PTHREAD_SPECIAL_FLAGS" != "xno" && \
-               test "x$ax_pthread_special_flags_added" != "xyes"],
-              [PTHREAD_CFLAGS="$ax_cv_PTHREAD_SPECIAL_FLAGS $PTHREAD_CFLAGS"
-               ax_pthread_special_flags_added=yes])
-
-        AC_CACHE_CHECK([for PTHREAD_PRIO_INHERIT],
-            [ax_cv_PTHREAD_PRIO_INHERIT],
-            [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <pthread.h>]],
-                                             [[int i = PTHREAD_PRIO_INHERIT;
-                                               return i;]])],
-                            [ax_cv_PTHREAD_PRIO_INHERIT=yes],
-                            [ax_cv_PTHREAD_PRIO_INHERIT=no])
-            ])
-        AS_IF([test "x$ax_cv_PTHREAD_PRIO_INHERIT" = "xyes" && \
-               test "x$ax_pthread_prio_inherit_defined" != "xyes"],
-              [AC_DEFINE([HAVE_PTHREAD_PRIO_INHERIT], [1], [Have PTHREAD_PRIO_INHERIT.])
-               ax_pthread_prio_inherit_defined=yes
-              ])
-
-        CFLAGS="$ax_pthread_save_CFLAGS"
-        LIBS="$ax_pthread_save_LIBS"
-
-        # More AIX lossage: compile with *_r variant
-        if test "x$GCC" != "xyes"; then
-            case $host_os in
-                aix*)
-                AS_CASE(["x/$CC"],
-                    [x*/c89|x*/c89_128|x*/c99|x*/c99_128|x*/cc|x*/cc128|x*/xlc|x*/xlc_v6|x*/xlc128|x*/xlc128_v6],
-                    [#handle absolute path differently from PATH based program lookup
-                     AS_CASE(["x$CC"],
-                         [x/*],
-                         [AS_IF([AS_EXECUTABLE_P([${CC}_r])],[PTHREAD_CC="${CC}_r"])],
-                         [AC_CHECK_PROGS([PTHREAD_CC],[${CC}_r],[$CC])])])
-                ;;
-            esac
-        fi
-fi
-
-test -n "$PTHREAD_CC" || PTHREAD_CC="$CC"
-
-AC_SUBST([PTHREAD_LIBS])
-AC_SUBST([PTHREAD_CFLAGS])
-AC_SUBST([PTHREAD_CC])
-
-# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
-if test "x$ax_pthread_ok" = "xyes"; then
-        ifelse([$1],,[AC_DEFINE([HAVE_PTHREAD],[1],[Define if you have POSIX threads libraries and header files.])],[$1])
-        :
-else
-        ax_pthread_ok=no
-        $2
-fi
-AC_LANG_POP
-])dnl AX_PTHREAD
diff --git a/libs/protobuf/m4/stl_hash.m4 b/libs/protobuf/m4/stl_hash.m4
deleted file mode 100644
index d7def1a..0000000
--- a/libs/protobuf/m4/stl_hash.m4
+++ /dev/null
@@ -1,71 +0,0 @@
-# We check two things: where the include file is for
-# unordered_map/hash_map (we prefer the first form), and what
-# namespace unordered/hash_map lives in within that include file.  We
-# include AC_TRY_COMPILE for all the combinations we've seen in the
-# wild.  We define HASH_MAP_H to the location of the header file, and
-# HASH_NAMESPACE to the namespace the class (unordered_map or
-# hash_map) is in.
-
-# This also checks if unordered map exists.
-AC_DEFUN([AC_CXX_STL_HASH],
-  [
-   AC_MSG_CHECKING(the location of hash_map)
-   AC_LANG_SAVE
-   AC_LANG_CPLUSPLUS
-   ac_cv_cxx_hash_map=""
-   # First try unordered_map, but not on gcc's before 4.2 -- I've
-   # seen unexplainable unordered_map bugs with -O2 on older gcc's.
-   AC_TRY_COMPILE([#if defined(__GNUC__) && (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 2))
-                   # error GCC too old for unordered_map
-                   #endif
-                   ],
-                   [/* no program body necessary */],
-                   [stl_hash_old_gcc=no],
-                   [stl_hash_old_gcc=yes])
-   for location in unordered_map tr1/unordered_map; do
-     for namespace in std std::tr1; do
-       if test -z "$ac_cv_cxx_hash_map" -a "$stl_hash_old_gcc" != yes; then
-         # Some older gcc's have a buggy tr1, so test a bit of code.
-         AC_TRY_COMPILE([#include <$location>],
-                        [const ${namespace}::unordered_map<int, int> t;
-                         return t.find(5) == t.end();],
-                        [ac_cv_cxx_hash_map="<$location>";
-                         ac_cv_cxx_hash_namespace="$namespace";
-                         ac_cv_cxx_hash_map_class="unordered_map";])
-       fi
-     done
-   done
-   # Now try hash_map
-   for location in ext/hash_map hash_map; do
-     for namespace in __gnu_cxx "" std stdext; do
-       if test -z "$ac_cv_cxx_hash_map"; then
-         AC_TRY_COMPILE([#include <$location>],
-                        [${namespace}::hash_map<int, int> t],
-                        [ac_cv_cxx_hash_map="<$location>";
-                         ac_cv_cxx_hash_namespace="$namespace";
-                         ac_cv_cxx_hash_map_class="hash_map";])
-       fi
-     done
-   done
-   ac_cv_cxx_hash_set=`echo "$ac_cv_cxx_hash_map" | sed s/map/set/`;
-   ac_cv_cxx_hash_set_class=`echo "$ac_cv_cxx_hash_map_class" | sed s/map/set/`;
-   if test -n "$ac_cv_cxx_hash_map"; then
-      AC_DEFINE(HAVE_HASH_MAP, 1, [define if the compiler has hash_map])
-      AC_DEFINE(HAVE_HASH_SET, 1, [define if the compiler has hash_set])
-      AC_DEFINE_UNQUOTED(HASH_MAP_H,$ac_cv_cxx_hash_map,
-                         [the location of <unordered_map> or <hash_map>])
-      AC_DEFINE_UNQUOTED(HASH_SET_H,$ac_cv_cxx_hash_set,
-                         [the location of <unordered_set> or <hash_set>])
-      AC_DEFINE_UNQUOTED(HASH_NAMESPACE,$ac_cv_cxx_hash_namespace,
-                         [the namespace of hash_map/hash_set])
-      AC_DEFINE_UNQUOTED(HASH_MAP_CLASS,$ac_cv_cxx_hash_map_class,
-                         [the name of <hash_map>])
-      AC_DEFINE_UNQUOTED(HASH_SET_CLASS,$ac_cv_cxx_hash_set_class,
-                         [the name of <hash_set>])
-      AC_MSG_RESULT([$ac_cv_cxx_hash_map])
-   else
-      AC_MSG_RESULT()
-      AC_MSG_WARN([could not find an STL hash_map])
-   fi
-])
-
diff --git a/libs/protobuf/maven_install.json b/libs/protobuf/maven_install.json
deleted file mode 100644
index 9c5860a..0000000
--- a/libs/protobuf/maven_install.json
+++ /dev/null
@@ -1,287 +0,0 @@
-{
-    "dependency_tree": {
-        "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL",
-        "__INPUT_ARTIFACTS_HASH": -228414992,
-        "__RESOLVED_ARTIFACTS_HASH": -722345565,
-        "conflict_resolution": {
-            "com.google.errorprone:error_prone_annotations:2.3.2": "com.google.errorprone:error_prone_annotations:2.11.0",
-            "junit:junit:4.12": "junit:junit:4.13.2"
-        },
-        "dependencies": [
-            {
-                "coord": "com.google.auto.value:auto-value-annotations:1.7.4",
-                "dependencies": [],
-                "directDependencies": [],
-                "file": "v1/https/repo1.maven.org/maven2/com/google/auto/value/auto-value-annotations/1.7.4/auto-value-annotations-1.7.4.jar",
-                "mirror_urls": [
-                    "https://repo1.maven.org/maven2/com/google/auto/value/auto-value-annotations/1.7.4/auto-value-annotations-1.7.4.jar",
-                    "https://repo.maven.apache.org/maven2/com/google/auto/value/auto-value-annotations/1.7.4/auto-value-annotations-1.7.4.jar"
-                ],
-                "sha256": "fedd59b0b4986c342f6ab2d182f2a4ee9fceb2c7e2d5bdc4dc764c92394a23d3",
-                "url": "https://repo1.maven.org/maven2/com/google/auto/value/auto-value-annotations/1.7.4/auto-value-annotations-1.7.4.jar"
-            },
-            {
-                "coord": "com.google.code.findbugs:jsr305:3.0.2",
-                "dependencies": [],
-                "directDependencies": [],
-                "file": "v1/https/repo1.maven.org/maven2/com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2.jar",
-                "mirror_urls": [
-                    "https://repo1.maven.org/maven2/com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2.jar",
-                    "https://repo.maven.apache.org/maven2/com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2.jar"
-                ],
-                "sha256": "766ad2a0783f2687962c8ad74ceecc38a28b9f72a2d085ee438b7813e928d0c7",
-                "url": "https://repo1.maven.org/maven2/com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2.jar"
-            },
-            {
-                "coord": "com.google.code.gson:gson:2.8.9",
-                "dependencies": [],
-                "directDependencies": [],
-                "file": "v1/https/repo1.maven.org/maven2/com/google/code/gson/gson/2.8.9/gson-2.8.9.jar",
-                "mirror_urls": [
-                    "https://repo1.maven.org/maven2/com/google/code/gson/gson/2.8.9/gson-2.8.9.jar",
-                    "https://repo.maven.apache.org/maven2/com/google/code/gson/gson/2.8.9/gson-2.8.9.jar"
-                ],
-                "sha256": "d3999291855de495c94c743761b8ab5176cfeabe281a5ab0d8e8d45326fd703e",
-                "url": "https://repo1.maven.org/maven2/com/google/code/gson/gson/2.8.9/gson-2.8.9.jar"
-            },
-            {
-                "coord": "com.google.errorprone:error_prone_annotations:2.11.0",
-                "dependencies": [],
-                "directDependencies": [],
-                "file": "v1/https/repo1.maven.org/maven2/com/google/errorprone/error_prone_annotations/2.11.0/error_prone_annotations-2.11.0.jar",
-                "mirror_urls": [
-                    "https://repo1.maven.org/maven2/com/google/errorprone/error_prone_annotations/2.11.0/error_prone_annotations-2.11.0.jar",
-                    "https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.11.0/error_prone_annotations-2.11.0.jar"
-                ],
-                "sha256": "721cb91842b46fa056847d104d5225c8b8e1e8b62263b993051e1e5a0137b7ec",
-                "url": "https://repo1.maven.org/maven2/com/google/errorprone/error_prone_annotations/2.11.0/error_prone_annotations-2.11.0.jar"
-            },
-            {
-                "coord": "com.google.guava:failureaccess:1.0.1",
-                "dependencies": [],
-                "directDependencies": [],
-                "file": "v1/https/repo1.maven.org/maven2/com/google/guava/failureaccess/1.0.1/failureaccess-1.0.1.jar",
-                "mirror_urls": [
-                    "https://repo1.maven.org/maven2/com/google/guava/failureaccess/1.0.1/failureaccess-1.0.1.jar",
-                    "https://repo.maven.apache.org/maven2/com/google/guava/failureaccess/1.0.1/failureaccess-1.0.1.jar"
-                ],
-                "sha256": "a171ee4c734dd2da837e4b16be9df4661afab72a41adaf31eb84dfdaf936ca26",
-                "url": "https://repo1.maven.org/maven2/com/google/guava/failureaccess/1.0.1/failureaccess-1.0.1.jar"
-            },
-            {
-                "coord": "com.google.guava:guava-testlib:31.1-jre",
-                "dependencies": [
-                    "com.google.code.findbugs:jsr305:3.0.2",
-                    "com.google.errorprone:error_prone_annotations:2.11.0",
-                    "com.google.guava:failureaccess:1.0.1",
-                    "com.google.guava:guava:31.1-jre",
-                    "com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava",
-                    "com.google.j2objc:j2objc-annotations:1.3",
-                    "junit:junit:4.13.2",
-                    "org.checkerframework:checker-qual:3.12.0",
-                    "org.hamcrest:hamcrest-core:1.3"
-                ],
-                "directDependencies": [
-                    "com.google.code.findbugs:jsr305:3.0.2",
-                    "com.google.errorprone:error_prone_annotations:2.11.0",
-                    "com.google.guava:guava:31.1-jre",
-                    "com.google.j2objc:j2objc-annotations:1.3",
-                    "junit:junit:4.13.2",
-                    "org.checkerframework:checker-qual:3.12.0"
-                ],
-                "file": "v1/https/repo1.maven.org/maven2/com/google/guava/guava-testlib/31.1-jre/guava-testlib-31.1-jre.jar",
-                "mirror_urls": [
-                    "https://repo1.maven.org/maven2/com/google/guava/guava-testlib/31.1-jre/guava-testlib-31.1-jre.jar",
-                    "https://repo.maven.apache.org/maven2/com/google/guava/guava-testlib/31.1-jre/guava-testlib-31.1-jre.jar"
-                ],
-                "sha256": "aadc71b10d5c3ac474dd16be84cfb18d257e584d1e0a59f8cab64ef4376226ce",
-                "url": "https://repo1.maven.org/maven2/com/google/guava/guava-testlib/31.1-jre/guava-testlib-31.1-jre.jar"
-            },
-            {
-                "coord": "com.google.guava:guava:31.1-jre",
-                "dependencies": [
-                    "com.google.code.findbugs:jsr305:3.0.2",
-                    "com.google.errorprone:error_prone_annotations:2.11.0",
-                    "com.google.guava:failureaccess:1.0.1",
-                    "com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava",
-                    "com.google.j2objc:j2objc-annotations:1.3",
-                    "org.checkerframework:checker-qual:3.12.0"
-                ],
-                "directDependencies": [
-                    "com.google.code.findbugs:jsr305:3.0.2",
-                    "com.google.errorprone:error_prone_annotations:2.11.0",
-                    "com.google.guava:failureaccess:1.0.1",
-                    "com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava",
-                    "com.google.j2objc:j2objc-annotations:1.3",
-                    "org.checkerframework:checker-qual:3.12.0"
-                ],
-                "file": "v1/https/repo1.maven.org/maven2/com/google/guava/guava/31.1-jre/guava-31.1-jre.jar",
-                "mirror_urls": [
-                    "https://repo1.maven.org/maven2/com/google/guava/guava/31.1-jre/guava-31.1-jre.jar",
-                    "https://repo.maven.apache.org/maven2/com/google/guava/guava/31.1-jre/guava-31.1-jre.jar"
-                ],
-                "sha256": "a42edc9cab792e39fe39bb94f3fca655ed157ff87a8af78e1d6ba5b07c4a00ab",
-                "url": "https://repo1.maven.org/maven2/com/google/guava/guava/31.1-jre/guava-31.1-jre.jar"
-            },
-            {
-                "coord": "com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava",
-                "dependencies": [],
-                "directDependencies": [],
-                "file": "v1/https/repo1.maven.org/maven2/com/google/guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar",
-                "mirror_urls": [
-                    "https://repo1.maven.org/maven2/com/google/guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar",
-                    "https://repo.maven.apache.org/maven2/com/google/guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar"
-                ],
-                "sha256": "b372a037d4230aa57fbeffdef30fd6123f9c0c2db85d0aced00c91b974f33f99",
-                "url": "https://repo1.maven.org/maven2/com/google/guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar"
-            },
-            {
-                "coord": "com.google.j2objc:j2objc-annotations:1.3",
-                "dependencies": [],
-                "directDependencies": [],
-                "file": "v1/https/repo1.maven.org/maven2/com/google/j2objc/j2objc-annotations/1.3/j2objc-annotations-1.3.jar",
-                "mirror_urls": [
-                    "https://repo1.maven.org/maven2/com/google/j2objc/j2objc-annotations/1.3/j2objc-annotations-1.3.jar",
-                    "https://repo.maven.apache.org/maven2/com/google/j2objc/j2objc-annotations/1.3/j2objc-annotations-1.3.jar"
-                ],
-                "sha256": "21af30c92267bd6122c0e0b4d20cccb6641a37eaf956c6540ec471d584e64a7b",
-                "url": "https://repo1.maven.org/maven2/com/google/j2objc/j2objc-annotations/1.3/j2objc-annotations-1.3.jar"
-            },
-            {
-                "coord": "com.google.truth:truth:1.1.2",
-                "dependencies": [
-                    "com.google.auto.value:auto-value-annotations:1.7.4",
-                    "com.google.errorprone:error_prone_annotations:2.11.0",
-                    "com.google.guava:guava:31.1-jre",
-                    "junit:junit:4.13.2",
-                    "org.checkerframework:checker-qual:3.12.0",
-                    "org.ow2.asm:asm:9.0"
-                ],
-                "directDependencies": [
-                    "com.google.auto.value:auto-value-annotations:1.7.4",
-                    "com.google.errorprone:error_prone_annotations:2.11.0",
-                    "com.google.guava:guava:31.1-jre",
-                    "junit:junit:4.13.2",
-                    "org.checkerframework:checker-qual:3.12.0",
-                    "org.ow2.asm:asm:9.0"
-                ],
-                "file": "v1/https/repo1.maven.org/maven2/com/google/truth/truth/1.1.2/truth-1.1.2.jar",
-                "mirror_urls": [
-                    "https://repo1.maven.org/maven2/com/google/truth/truth/1.1.2/truth-1.1.2.jar",
-                    "https://repo.maven.apache.org/maven2/com/google/truth/truth/1.1.2/truth-1.1.2.jar"
-                ],
-                "sha256": "a85e03b8b6ae8780f060cfded9500a3d1b5f52808f99a2ea6da9c683313c7518",
-                "url": "https://repo1.maven.org/maven2/com/google/truth/truth/1.1.2/truth-1.1.2.jar"
-            },
-            {
-                "coord": "junit:junit:4.13.2",
-                "dependencies": [
-                    "org.hamcrest:hamcrest-core:1.3"
-                ],
-                "directDependencies": [
-                    "org.hamcrest:hamcrest-core:1.3"
-                ],
-                "file": "v1/https/repo1.maven.org/maven2/junit/junit/4.13.2/junit-4.13.2.jar",
-                "mirror_urls": [
-                    "https://repo1.maven.org/maven2/junit/junit/4.13.2/junit-4.13.2.jar",
-                    "https://repo.maven.apache.org/maven2/junit/junit/4.13.2/junit-4.13.2.jar"
-                ],
-                "sha256": "8e495b634469d64fb8acfa3495a065cbacc8a0fff55ce1e31007be4c16dc57d3",
-                "url": "https://repo1.maven.org/maven2/junit/junit/4.13.2/junit-4.13.2.jar"
-            },
-            {
-                "coord": "net.bytebuddy:byte-buddy-agent:1.12.7",
-                "dependencies": [],
-                "directDependencies": [],
-                "file": "v1/https/repo1.maven.org/maven2/net/bytebuddy/byte-buddy-agent/1.12.7/byte-buddy-agent-1.12.7.jar",
-                "mirror_urls": [
-                    "https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy-agent/1.12.7/byte-buddy-agent-1.12.7.jar",
-                    "https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-agent/1.12.7/byte-buddy-agent-1.12.7.jar"
-                ],
-                "sha256": "73d84bb6e8e8980e674d796a29063f510ceb527c6f8c912a08a13e236be05c71",
-                "url": "https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy-agent/1.12.7/byte-buddy-agent-1.12.7.jar"
-            },
-            {
-                "coord": "net.bytebuddy:byte-buddy:1.12.7",
-                "dependencies": [],
-                "directDependencies": [],
-                "file": "v1/https/repo1.maven.org/maven2/net/bytebuddy/byte-buddy/1.12.7/byte-buddy-1.12.7.jar",
-                "mirror_urls": [
-                    "https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy/1.12.7/byte-buddy-1.12.7.jar",
-                    "https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy/1.12.7/byte-buddy-1.12.7.jar"
-                ],
-                "sha256": "d2e46555699e70361b5471a7e142f9c67855bba6907a285177ebd8ad973775d8",
-                "url": "https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy/1.12.7/byte-buddy-1.12.7.jar"
-            },
-            {
-                "coord": "org.checkerframework:checker-qual:3.12.0",
-                "dependencies": [],
-                "directDependencies": [],
-                "file": "v1/https/repo1.maven.org/maven2/org/checkerframework/checker-qual/3.12.0/checker-qual-3.12.0.jar",
-                "mirror_urls": [
-                    "https://repo1.maven.org/maven2/org/checkerframework/checker-qual/3.12.0/checker-qual-3.12.0.jar",
-                    "https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/3.12.0/checker-qual-3.12.0.jar"
-                ],
-                "sha256": "ff10785ac2a357ec5de9c293cb982a2cbb605c0309ea4cc1cb9b9bc6dbe7f3cb",
-                "url": "https://repo1.maven.org/maven2/org/checkerframework/checker-qual/3.12.0/checker-qual-3.12.0.jar"
-            },
-            {
-                "coord": "org.hamcrest:hamcrest-core:1.3",
-                "dependencies": [],
-                "directDependencies": [],
-                "file": "v1/https/repo1.maven.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar",
-                "mirror_urls": [
-                    "https://repo1.maven.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar",
-                    "https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar"
-                ],
-                "sha256": "66fdef91e9739348df7a096aa384a5685f4e875584cce89386a7a47251c4d8e9",
-                "url": "https://repo1.maven.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar"
-            },
-            {
-                "coord": "org.mockito:mockito-core:4.3.1",
-                "dependencies": [
-                    "net.bytebuddy:byte-buddy-agent:1.12.7",
-                    "net.bytebuddy:byte-buddy:1.12.7",
-                    "org.objenesis:objenesis:3.2"
-                ],
-                "directDependencies": [
-                    "net.bytebuddy:byte-buddy-agent:1.12.7",
-                    "net.bytebuddy:byte-buddy:1.12.7",
-                    "org.objenesis:objenesis:3.2"
-                ],
-                "file": "v1/https/repo1.maven.org/maven2/org/mockito/mockito-core/4.3.1/mockito-core-4.3.1.jar",
-                "mirror_urls": [
-                    "https://repo1.maven.org/maven2/org/mockito/mockito-core/4.3.1/mockito-core-4.3.1.jar",
-                    "https://repo.maven.apache.org/maven2/org/mockito/mockito-core/4.3.1/mockito-core-4.3.1.jar"
-                ],
-                "sha256": "148de2c6928365db29443ca12d35c930d9f481172b934fdd801d1cb1409ea83a",
-                "url": "https://repo1.maven.org/maven2/org/mockito/mockito-core/4.3.1/mockito-core-4.3.1.jar"
-            },
-            {
-                "coord": "org.objenesis:objenesis:3.2",
-                "dependencies": [],
-                "directDependencies": [],
-                "file": "v1/https/repo1.maven.org/maven2/org/objenesis/objenesis/3.2/objenesis-3.2.jar",
-                "mirror_urls": [
-                    "https://repo1.maven.org/maven2/org/objenesis/objenesis/3.2/objenesis-3.2.jar",
-                    "https://repo.maven.apache.org/maven2/org/objenesis/objenesis/3.2/objenesis-3.2.jar"
-                ],
-                "sha256": "03d960bd5aef03c653eb000413ada15eb77cdd2b8e4448886edf5692805e35f3",
-                "url": "https://repo1.maven.org/maven2/org/objenesis/objenesis/3.2/objenesis-3.2.jar"
-            },
-            {
-                "coord": "org.ow2.asm:asm:9.0",
-                "dependencies": [],
-                "directDependencies": [],
-                "file": "v1/https/repo1.maven.org/maven2/org/ow2/asm/asm/9.0/asm-9.0.jar",
-                "mirror_urls": [
-                    "https://repo1.maven.org/maven2/org/ow2/asm/asm/9.0/asm-9.0.jar",
-                    "https://repo.maven.apache.org/maven2/org/ow2/asm/asm/9.0/asm-9.0.jar"
-                ],
-                "sha256": "0df97574914aee92fd349d0cb4e00f3345d45b2c239e0bb50f0a90ead47888e0",
-                "url": "https://repo1.maven.org/maven2/org/ow2/asm/asm/9.0/asm-9.0.jar"
-            }
-        ],
-        "version": "0.1.0"
-    }
-}
diff --git a/libs/protobuf/objectivec/.clang-format b/libs/protobuf/objectivec/.clang-format
deleted file mode 100644
index d3ff76b..0000000
--- a/libs/protobuf/objectivec/.clang-format
+++ /dev/null
@@ -1,7 +0,0 @@
-BasedOnStyle: Google
-
-# Ignore pddm directives.
-CommentPragmas: '^%'
-
-# Following the rest of the protobuf code.
-ColumnLimit: 80
diff --git a/libs/protobuf/objectivec/.gitignore b/libs/protobuf/objectivec/.gitignore
deleted file mode 100644
index f786ffc..0000000
--- a/libs/protobuf/objectivec/.gitignore
+++ /dev/null
@@ -1,23 +0,0 @@
-## Build generated
-build/
-DerivedData/
-
-## Various settings
-*.pbxuser
-!default.pbxuser
-*.mode1v3
-!default.mode1v3
-*.mode2v3
-!default.mode2v3
-*.perspectivev3
-!default.perspectivev3
-xcuserdata/
-
-## Other
-*.moved-aside
-*.xccheckout
-*.xcscmblueprint
-
-## Obj-C/Swift specific
-*.hmap
-*.ipa
diff --git a/libs/protobuf/objectivec/BUILD.bazel b/libs/protobuf/objectivec/BUILD.bazel
deleted file mode 100644
index c18788f..0000000
--- a/libs/protobuf/objectivec/BUILD.bazel
+++ /dev/null
@@ -1,122 +0,0 @@
-load("@rules_cc//cc:defs.bzl", "objc_library")
-load("@rules_pkg//:mappings.bzl", "pkg_files", "strip_prefix")
-
-objc_library(
-    name = "objectivec",
-    hdrs = [
-        "GPBAny.pbobjc.h",
-        "GPBApi.pbobjc.h",
-        "GPBDuration.pbobjc.h",
-        "GPBEmpty.pbobjc.h",
-        "GPBFieldMask.pbobjc.h",
-        "GPBSourceContext.pbobjc.h",
-        "GPBStruct.pbobjc.h",
-        "GPBTimestamp.pbobjc.h",
-        "GPBType.pbobjc.h",
-        "GPBWrappers.pbobjc.h",
-        "GPBArray.h",
-        "GPBBootstrap.h",
-        "GPBCodedInputStream.h",
-        "GPBCodedOutputStream.h",
-        "GPBDescriptor.h",
-        "GPBDictionary.h",
-        "GPBExtensionInternals.h",
-        "GPBExtensionRegistry.h",
-        "GPBMessage.h",
-        "GPBProtocolBuffers.h",
-        "GPBProtocolBuffers_RuntimeSupport.h",
-        "GPBRootObject.h",
-        "GPBRuntimeTypes.h",
-        "GPBUnknownField.h",
-        "GPBUnknownFieldSet.h",
-        "GPBUtilities.h",
-        "GPBWellKnownTypes.h",
-        "GPBWireFormat.h",
-        "google/protobuf/Any.pbobjc.h",
-        "google/protobuf/Api.pbobjc.h",
-        "google/protobuf/Duration.pbobjc.h",
-        "google/protobuf/Empty.pbobjc.h",
-        "google/protobuf/FieldMask.pbobjc.h",
-        "google/protobuf/SourceContext.pbobjc.h",
-        "google/protobuf/Struct.pbobjc.h",
-        "google/protobuf/Timestamp.pbobjc.h",
-        "google/protobuf/Type.pbobjc.h",
-        "google/protobuf/Wrappers.pbobjc.h",
-        # Package private headers, but exposed because the generated sources
-        # need to use them.
-        "GPBArray_PackagePrivate.h",
-        "GPBCodedInputStream_PackagePrivate.h",
-        "GPBCodedOutputStream_PackagePrivate.h",
-        "GPBDescriptor_PackagePrivate.h",
-        "GPBDictionary_PackagePrivate.h",
-        "GPBMessage_PackagePrivate.h",
-        "GPBRootObject_PackagePrivate.h",
-        "GPBUnknownFieldSet_PackagePrivate.h",
-        "GPBUnknownField_PackagePrivate.h",
-        "GPBUtilities_PackagePrivate.h",
-    ],
-    copts = [
-        "-Wno-vla",
-    ],
-    includes = [
-        ".",
-    ],
-    non_arc_srcs = [
-        "GPBAny.pbobjc.m",
-        "GPBApi.pbobjc.m",
-        "GPBArray.m",
-        "GPBCodedInputStream.m",
-        "GPBCodedOutputStream.m",
-        "GPBDescriptor.m",
-        "GPBDictionary.m",
-        "GPBDuration.pbobjc.m",
-        "GPBEmpty.pbobjc.m",
-        "GPBExtensionInternals.m",
-        "GPBExtensionRegistry.m",
-        "GPBFieldMask.pbobjc.m",
-        "GPBMessage.m",
-        "GPBRootObject.m",
-        "GPBSourceContext.pbobjc.m",
-        "GPBStruct.pbobjc.m",
-        "GPBTimestamp.pbobjc.m",
-        "GPBType.pbobjc.m",
-        "GPBUnknownField.m",
-        "GPBUnknownFieldSet.m",
-        "GPBUtilities.m",
-        "GPBWellKnownTypes.m",
-        "GPBWireFormat.m",
-        "GPBWrappers.pbobjc.m",
-    ],
-    visibility = ["//visibility:public"],
-)
-
-pkg_files(
-    name = "dist_files",
-    srcs = glob([
-        "*.h",
-        "*.m",
-        "**/*.h",
-        "**/*.m",
-        "**/*.mm",
-        "**/*.swift",
-        "DevTools/*.sh",
-        "DevTools/*.py",
-        "ProtocolBuffers_iOS.xcodeproj/**/*",
-        "ProtocolBuffers_OSX.xcodeproj/**/*",
-        "ProtocolBuffers_tvOS.xcodeproj/**/*",
-        "Tests/CocoaPods/**/*",
-        "Tests/*.pddm",
-        "Tests/*.txt",
-        "Tests/*.plist",
-        "Tests/*.proto",
-    ]) + [
-        ".clang-format",
-        "BUILD.bazel",
-        "README.md",
-        "Tests/golden_message",
-        "Tests/golden_packed_fields_message",
-        "generate_well_known_types.sh",
-    ],
-    strip_prefix = strip_prefix.from_root(""),
-    visibility = ["//pkg:__pkg__"],
-)
diff --git a/libs/protobuf/objectivec/DevTools/check_version_stamps.sh b/libs/protobuf/objectivec/DevTools/check_version_stamps.sh
deleted file mode 100755
index a3524cb..0000000
--- a/libs/protobuf/objectivec/DevTools/check_version_stamps.sh
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/bin/bash -eu
-
-# This script checks that the runtime version number constant in the compiler
-# source and in the runtime source is the same.
-#
-# A distro can be made of the protobuf sources with only a subset of the
-# languages, so if the compiler depended on the Objective C runtime, those
-# builds would break. At the same time, we don't want the runtime source
-# depending on the compiler sources; so two copies of the constant are needed.
-
-readonly ScriptDir=$(dirname "$(echo $0 | sed -e "s,^\([^/]\),$(pwd)/\1,")")
-readonly ProtoRootDir="${ScriptDir}/../.."
-
-die() {
-    echo "Error: $1"
-    exit 1
-}
-
-readonly GeneratorSrc="${ProtoRootDir}/src/google/protobuf/compiler/objectivec/objectivec_file.cc"
-readonly RuntimeSrc="${ProtoRootDir}/objectivec/GPBBootstrap.h"
-
-check_constant() {
-  local ConstantName="$1"
-
-  # Collect version from generator sources.
-  local GeneratorVersion=$( \
-      cat "${GeneratorSrc}" \
-          | sed -n -e "s:const int32_t ${ConstantName} = \([0-9]*\);:\1:p"
-  )
-  if [[ -z "${GeneratorVersion}" ]] ; then
-      die "Failed to find ${ConstantName} in the generator source (${GeneratorSrc})."
-  fi
-
-  # Collect version from runtime sources.
-  local RuntimeVersion=$( \
-      cat "${RuntimeSrc}" \
-          | sed -n -e "s:#define ${ConstantName} \([0-9]*\):\1:p"
-  )
-  if [[ -z "${RuntimeVersion}" ]] ; then
-      die "Failed to find ${ConstantName} in the runtime source (${RuntimeSrc})."
-  fi
-
-  # Compare them.
-  if [[ "${GeneratorVersion}" != "${RuntimeVersion}" ]] ; then
-      die "${ConstantName} values don't match!
-  Generator: ${GeneratorVersion} from ${GeneratorSrc}
-    Runtime: ${RuntimeVersion} from ${RuntimeSrc}
-"
-  fi
-}
-
-# Do the check.
-check_constant GOOGLE_PROTOBUF_OBJC_VERSION
-
-# Success
diff --git a/libs/protobuf/objectivec/DevTools/compile_testing_protos.sh b/libs/protobuf/objectivec/DevTools/compile_testing_protos.sh
deleted file mode 100755
index 69c32f9..0000000
--- a/libs/protobuf/objectivec/DevTools/compile_testing_protos.sh
+++ /dev/null
@@ -1,177 +0,0 @@
-#!/bin/bash -eu
-# Invoked by the Xcode projects to build the protos needed for the unittests.
-
-readonly OUTPUT_DIR="${PROJECT_DERIVED_FILE_DIR}/protos"
-
-# -----------------------------------------------------------------------------
-# Helper for bailing.
-die() {
-  echo "Error: $1"
-  exit 2
-}
-
-# -----------------------------------------------------------------------------
-# What to do.
-case "${ACTION}" in
-  "")
-    # Build, fall thru
-    ;;
-  "clean")
-    rm -rf "${OUTPUT_DIR}"
-    exit 0
-    ;;
-  *)
-    die "Unknown action requested: ${ACTION}"
-    ;;
-esac
-
-# -----------------------------------------------------------------------------
-# Reusing a bunch of the protos from the protocolbuffers/protobuf tree, this
-# can include some extras as there is no harm in ensuring work for C++
-# generation.
-
-CORE_PROTO_FILES=(
-  src/google/protobuf/any_test.proto
-  src/google/protobuf/unittest_arena.proto
-  src/google/protobuf/unittest_custom_options.proto
-  src/google/protobuf/unittest_enormous_descriptor.proto
-  src/google/protobuf/unittest_embed_optimize_for.proto
-  src/google/protobuf/unittest_empty.proto
-  src/google/protobuf/unittest_import.proto
-  src/google/protobuf/unittest_import_lite.proto
-  src/google/protobuf/unittest_lite.proto
-  src/google/protobuf/unittest_mset.proto
-  src/google/protobuf/unittest_mset_wire_format.proto
-  src/google/protobuf/unittest_no_generic_services.proto
-  src/google/protobuf/unittest_optimize_for.proto
-  src/google/protobuf/unittest.proto
-  src/google/protobuf/unittest_import_public.proto
-  src/google/protobuf/unittest_import_public_lite.proto
-  src/google/protobuf/unittest_drop_unknown_fields.proto
-  src/google/protobuf/unittest_preserve_unknown_enum.proto
-  src/google/protobuf/map_lite_unittest.proto
-  src/google/protobuf/map_proto2_unittest.proto
-  src/google/protobuf/map_unittest.proto
-  # The unittest_custom_options.proto extends the messages in descriptor.proto
-  # so we build it in to test extending in general. The library doesn't provide
-  # a descriptor as it doesn't use the classes/enums.
-  src/google/protobuf/descriptor.proto
-)
-
-# -----------------------------------------------------------------------------
-# The objc unittest specific proto files.
-
-OBJC_TEST_PROTO_FILES=(
-  objectivec/Tests/unittest_cycle.proto
-  objectivec/Tests/unittest_deprecated.proto
-  objectivec/Tests/unittest_deprecated_file.proto
-  objectivec/Tests/unittest_extension_chain_a.proto
-  objectivec/Tests/unittest_extension_chain_b.proto
-  objectivec/Tests/unittest_extension_chain_c.proto
-  objectivec/Tests/unittest_extension_chain_d.proto
-  objectivec/Tests/unittest_extension_chain_e.proto
-  objectivec/Tests/unittest_extension_chain_f.proto
-  objectivec/Tests/unittest_extension_chain_g.proto
-  objectivec/Tests/unittest_objc.proto
-  objectivec/Tests/unittest_objc_startup.proto
-  objectivec/Tests/unittest_objc_options.proto
-  objectivec/Tests/unittest_runtime_proto2.proto
-  objectivec/Tests/unittest_runtime_proto3.proto
-)
-
-OBJC_EXTENSIONS=( .pbobjc.h .pbobjc.m )
-
-# -----------------------------------------------------------------------------
-# Ensure the output dir exists
-mkdir -p "${OUTPUT_DIR}/google/protobuf"
-
-# -----------------------------------------------------------------------------
-# Move to the top of the protobuf directories and ensure there is a protoc
-# binary to use.
-cd "${SRCROOT}/.."
-[[ -x src/protoc ]] || \
-  die "Could not find the protoc binary; make sure you have built it (objectivec/DevTools/full_mac_build.sh -h)."
-
-# -----------------------------------------------------------------------------
-RUN_PROTOC=no
-
-# Check to if all the output files exist (in case a new one got added).
-
-for PROTO_FILE in "${CORE_PROTO_FILES[@]}" "${OBJC_TEST_PROTO_FILES[@]}"; do
-  DIR=${PROTO_FILE%/*}
-  BASE_NAME=${PROTO_FILE##*/}
-  # Drop the extension
-  BASE_NAME=${BASE_NAME%.*}
-  OBJC_NAME=$(echo "${BASE_NAME}" | awk -F _ '{for(i=1; i<=NF; i++) printf "%s", toupper(substr($i,1,1)) substr($i,2);}')
-
-  for EXT in "${OBJC_EXTENSIONS[@]}"; do
-    if [[ ! -f "${OUTPUT_DIR}/google/protobuf/${OBJC_NAME}${EXT}" ]]; then
-      RUN_PROTOC=yes
-    fi
-  done
-done
-
-# If we haven't decided to run protoc because of a missing file, check to see if
-# an input has changed.
-if [[ "${RUN_PROTOC}" != "yes" ]] ; then
-  # Find the newest input file (protos, compiler, and this script).
-  # (these patterns catch some extra stuff, but better to over sample than
-  # under)
-  readonly NewestInput=$(find \
-     src/google/protobuf/*.proto \
-     objectivec/Tests/*.proto \
-     src/.libs src/*.la src/protoc \
-     objectivec/DevTools/compile_testing_protos.sh \
-        -type f -print0 \
-        | xargs -0 stat -f "%m %N" \
-        | sort -n | tail -n1 | cut -f2- -d" ")
-  # Find the oldest output file.
-  readonly OldestOutput=$(find \
-        "${OUTPUT_DIR}" \
-        -type f -name "*.pbobjc.[hm]" -print0 \
-        | xargs -0 stat -f "%m %N" \
-        | sort -n -r | tail -n1 | cut -f2- -d" ")
-  # If the newest input is newer than the oldest output, regenerate.
-  if [[ "${NewestInput}" -nt "${OldestOutput}" ]] ; then
-    RUN_PROTOC=yes
-  fi
-fi
-
-if [[ "${RUN_PROTOC}" != "yes" ]] ; then
-  # Up to date.
-  exit 0
-fi
-
-# -----------------------------------------------------------------------------
-# Prune out all the files from previous generations to ensure we only have
-# current ones.
-find "${OUTPUT_DIR}" \
-    -type f -name "*.pbobjc.[hm]" -print0 \
-    | xargs -0 rm -rf
-
-# -----------------------------------------------------------------------------
-# Helper to invoke protoc
-compile_protos() {
-  src/protoc                                   \
-    --objc_out="${OUTPUT_DIR}/google/protobuf" \
-    --proto_path=src/google/protobuf/          \
-    --proto_path=src                           \
-    --experimental_allow_proto3_optional       \
-    "$@"
-}
-
-# -----------------------------------------------------------------------------
-# Generate most of the proto files that exist in the C++ src tree.
-
-# Note: there is overlap in package.Message names between some of the test
-# files, so they can't be generated all at once. This works because the overlap
-# isn't linked into a single binary.
-for a_proto in "${CORE_PROTO_FILES[@]}" ; do
-  compile_protos "${a_proto}"
-done
-
-# -----------------------------------------------------------------------------
-# Generate the Objective C specific testing protos.
-compile_protos \
-  --proto_path="objectivec/Tests" \
-  "${OBJC_TEST_PROTO_FILES[@]}"
diff --git a/libs/protobuf/objectivec/DevTools/full_mac_build.sh b/libs/protobuf/objectivec/DevTools/full_mac_build.sh
deleted file mode 100755
index 98b71a6..0000000
--- a/libs/protobuf/objectivec/DevTools/full_mac_build.sh
+++ /dev/null
@@ -1,400 +0,0 @@
-#!/bin/bash
-#
-# Helper to do build so you don't have to remember all the steps/args.
-
-
-set -eu
-
-# Some base locations.
-readonly ScriptDir=$(dirname "$(echo $0 | sed -e "s,^\([^/]\),$(pwd)/\1,")")
-readonly ProtoRootDir="${ScriptDir}/../.."
-
-printUsage() {
-  NAME=$(basename "${0}")
-  cat << EOF
-usage: ${NAME} [OPTIONS]
-
-This script does the common build steps needed.
-
-OPTIONS:
-
- General:
-
-   -h, --help
-         Show this message
-   -c, --clean
-         Issue a clean before the normal build.
-   -a, --autogen
-         Start by rerunning autogen & configure.
-   -r, --regenerate-descriptors
-         Run generate_descriptor_proto.sh to regenerate all the checked in
-         proto sources.
-   -j #, --jobs #
-         Force the number of parallel jobs (useful for debugging build issues).
-   --core-only
-         Skip some of the core protobuf build/checks to shorten the build time.
-   --skip-xcode
-         Skip the invoke of Xcode to test the runtime on both iOS and OS X.
-   --skip-xcode-ios
-         Skip the invoke of Xcode to test the runtime on iOS.
-   --skip-xcode-debug
-         Skip the Xcode Debug configuration.
-   --skip-xcode-release
-         Skip the Xcode Release configuration.
-   --skip-xcode-osx | --skip-xcode-macos
-         Skip the invoke of Xcode to test the runtime on OS X.
-   --skip-xcode-tvos
-         Skip the invoke of Xcode to test the runtime on tvOS.
-   --skip-objc-conformance
-         Skip the Objective C conformance tests (run on OS X).
-   --xcode-quiet
-         Pass -quiet to xcodebuild.
-
-EOF
-}
-
-header() {
-  echo ""
-  echo "========================================================================"
-  echo "    ${@}"
-  echo "========================================================================"
-}
-
-# Thanks to libtool, builds can fail in odd ways and since it eats some output
-# it can be hard to spot, so force error output if make exits with a non zero.
-wrapped_make() {
-  set +e  # Don't stop if the command fails.
-  make $*
-  MAKE_EXIT_STATUS=$?
-  if [ ${MAKE_EXIT_STATUS} -ne 0 ]; then
-    echo "Error: 'make $*' exited with status ${MAKE_EXIT_STATUS}"
-    exit ${MAKE_EXIT_STATUS}
-  fi
-  set -e
-}
-
-NUM_MAKE_JOBS=$(/usr/sbin/sysctl -n hw.ncpu)
-if [[ "${NUM_MAKE_JOBS}" -lt 2 ]] ; then
-  NUM_MAKE_JOBS=2
-fi
-
-DO_AUTOGEN=no
-DO_CLEAN=no
-REGEN_DESCRIPTORS=no
-CORE_ONLY=no
-DO_XCODE_IOS_TESTS=yes
-DO_XCODE_OSX_TESTS=yes
-DO_XCODE_TVOS_TESTS=yes
-DO_XCODE_DEBUG=yes
-DO_XCODE_RELEASE=yes
-DO_OBJC_CONFORMANCE_TESTS=yes
-XCODE_QUIET=no
-while [[ $# != 0 ]]; do
-  case "${1}" in
-    -h | --help )
-      printUsage
-      exit 0
-      ;;
-    -c | --clean )
-      DO_CLEAN=yes
-      ;;
-    -a | --autogen )
-      DO_AUTOGEN=yes
-      ;;
-    -r | --regenerate-descriptors )
-      REGEN_DESCRIPTORS=yes
-      ;;
-    -j | --jobs )
-      shift
-      NUM_MAKE_JOBS="${1}"
-      ;;
-    --core-only )
-      CORE_ONLY=yes
-      ;;
-    --skip-xcode )
-      DO_XCODE_IOS_TESTS=no
-      DO_XCODE_OSX_TESTS=no
-      DO_XCODE_TVOS_TESTS=no
-      ;;
-    --skip-xcode-ios )
-      DO_XCODE_IOS_TESTS=no
-      ;;
-    --skip-xcode-osx | --skip-xcode-macos)
-      DO_XCODE_OSX_TESTS=no
-      ;;
-    --skip-xcode-tvos )
-      DO_XCODE_TVOS_TESTS=no
-      ;;
-    --skip-xcode-debug )
-      DO_XCODE_DEBUG=no
-      ;;
-    --skip-xcode-release )
-      DO_XCODE_RELEASE=no
-      ;;
-    --skip-objc-conformance )
-      DO_OBJC_CONFORMANCE_TESTS=no
-      ;;
-    --xcode-quiet )
-      XCODE_QUIET=yes
-      ;;
-    -*)
-      echo "ERROR: Unknown option: ${1}" 1>&2
-      printUsage
-      exit 1
-      ;;
-    *)
-      echo "ERROR: Unknown argument: ${1}" 1>&2
-      printUsage
-      exit 1
-      ;;
-  esac
-  shift
-done
-
-# Into the proto dir.
-cd "${ProtoRootDir}"
-
-# if no Makefile, force the autogen.
-if [[ ! -f Makefile ]] ; then
-  DO_AUTOGEN=yes
-fi
-
-if [[ "${DO_AUTOGEN}" == "yes" ]] ; then
-  header "Running autogen & configure"
-  ./autogen.sh
-  ./configure \
-    CPPFLAGS="-mmacosx-version-min=10.9 -Wunused-const-variable -Wunused-function"
-fi
-
-if [[ "${DO_CLEAN}" == "yes" ]] ; then
-  header "Cleaning"
-  wrapped_make clean
-  if [[ "${DO_XCODE_IOS_TESTS}" == "yes" ]] ; then
-    XCODEBUILD_CLEAN_BASE_IOS=(
-      xcodebuild
-        -project objectivec/ProtocolBuffers_iOS.xcodeproj
-        -scheme ProtocolBuffers
-    )
-    if [[ "${DO_XCODE_DEBUG}" == "yes" ]] ; then
-      "${XCODEBUILD_CLEAN_BASE_IOS[@]}" -configuration Debug clean
-    fi
-    if [[ "${DO_XCODE_RELEASE}" == "yes" ]] ; then
-      "${XCODEBUILD_CLEAN_BASE_IOS[@]}" -configuration Release clean
-    fi
-  fi
-  if [[ "${DO_XCODE_OSX_TESTS}" == "yes" ]] ; then
-    XCODEBUILD_CLEAN_BASE_OSX=(
-      xcodebuild
-        -project objectivec/ProtocolBuffers_OSX.xcodeproj
-        -scheme ProtocolBuffers
-    )
-    if [[ "${DO_XCODE_DEBUG}" == "yes" ]] ; then
-      "${XCODEBUILD_CLEAN_BASE_OSX[@]}" -configuration Debug clean
-    fi
-    if [[ "${DO_XCODE_RELEASE}" == "yes" ]] ; then
-      "${XCODEBUILD_CLEAN_BASE_OSX[@]}" -configuration Release clean
-    fi
-  fi
-  if [[ "${DO_XCODE_TVOS_TESTS}" == "yes" ]] ; then
-    XCODEBUILD_CLEAN_BASE_OSX=(
-      xcodebuild
-        -project objectivec/ProtocolBuffers_tvOS.xcodeproj
-        -scheme ProtocolBuffers
-    )
-    if [[ "${DO_XCODE_DEBUG}" == "yes" ]] ; then
-      "${XCODEBUILD_CLEAN_BASE_OSX[@]}" -configuration Debug clean
-    fi
-    if [[ "${DO_XCODE_RELEASE}" == "yes" ]] ; then
-      "${XCODEBUILD_CLEAN_BASE_OSX[@]}" -configuration Release clean
-    fi
-  fi
-fi
-
-if [[ "${REGEN_DESCRIPTORS}" == "yes" ]] ; then
-  header "Regenerating the descriptor sources."
-  ./generate_descriptor_proto.sh -j "${NUM_MAKE_JOBS}"
-fi
-
-if [[ "${CORE_ONLY}" == "yes" ]] ; then
-  header "Building core Only"
-  wrapped_make -j "${NUM_MAKE_JOBS}"
-else
-  header "Building"
-  # Can't issue these together, when fully parallel, something sometimes chokes
-  # at random.
-  wrapped_make -j "${NUM_MAKE_JOBS}" all
-  wrapped_make -j "${NUM_MAKE_JOBS}" check
-  # Fire off the conformance tests also.
-  cd conformance
-  wrapped_make -j "${NUM_MAKE_JOBS}" test_cpp
-  cd ..
-fi
-
-# Ensure the WKT sources checked in are current.
-objectivec/generate_well_known_types.sh --check-only -j "${NUM_MAKE_JOBS}"
-
-header "Checking on the ObjC Runtime Code"
-# Some of the kokoro machines don't have python3 yet, so fall back to python if need be.
-if hash python3 >/dev/null 2>&1 ; then
-  LOCAL_PYTHON=python3
-else
-  LOCAL_PYTHON=python
-fi
-"${LOCAL_PYTHON}" objectivec/DevTools/pddm_tests.py
-if ! "${LOCAL_PYTHON}" objectivec/DevTools/pddm.py --dry-run objectivec/*.[hm] objectivec/Tests/*.[hm] ; then
-  echo ""
-  echo "Update by running:"
-  echo "   objectivec/DevTools/pddm.py objectivec/*.[hm] objectivec/Tests/*.[hm]"
-  exit 1
-fi
-
-readonly XCODE_VERSION_LINE="$(xcodebuild -version | grep Xcode\  )"
-readonly XCODE_VERSION="${XCODE_VERSION_LINE/Xcode /}"  # drop the prefix.
-
-if [[ "${DO_XCODE_IOS_TESTS}" == "yes" ]] ; then
-  XCODEBUILD_TEST_BASE_IOS=(
-    xcodebuild
-      -project objectivec/ProtocolBuffers_iOS.xcodeproj
-      -scheme ProtocolBuffers
-  )
-  if [[ "${XCODE_QUIET}" == "yes" ]] ; then
-    XCODEBUILD_TEST_BASE_IOS+=( -quiet )
-  fi
-  # Don't need to worry about form factors or retina/non retina;
-  # just pick a mix of OS Versions and 32/64 bit.
-  # NOTE: Different Xcode have different simulated hardware/os support.
-  case "${XCODE_VERSION}" in
-    [6-8].* )
-      echo "ERROR: The unittests include Swift code that is now Swift 4.0." 1>&2
-      echo "ERROR: Xcode 9.0 or higher is required to build the test suite, but the library works with Xcode 7.x." 1>&2
-      exit 11
-      ;;
-    9.[0-2]* )
-      XCODEBUILD_TEST_BASE_IOS+=(
-          -destination "platform=iOS Simulator,name=iPhone 4s,OS=8.1" # 32bit
-          -destination "platform=iOS Simulator,name=iPhone 7,OS=latest" # 64bit
-          # 9.0-9.2 all seem to often fail running destinations in parallel
-          -disable-concurrent-testing
-      )
-      ;;
-    9.[3-4]* )
-      XCODEBUILD_TEST_BASE_IOS+=(
-          # Xcode 9.3 chokes targeting iOS 8.x - http://www.openradar.me/39335367
-          -destination "platform=iOS Simulator,name=iPhone 4s,OS=9.0" # 32bit
-          -destination "platform=iOS Simulator,name=iPhone 7,OS=latest" # 64bit
-          # 9.3 also seems to often fail running destinations in parallel
-          -disable-concurrent-testing
-      )
-      ;;
-    10.*)
-      XCODEBUILD_TEST_BASE_IOS+=(
-          -destination "platform=iOS Simulator,name=iPhone 4s,OS=8.1" # 32bit
-          -destination "platform=iOS Simulator,name=iPhone 7,OS=latest" # 64bit
-          # 10.x also seems to often fail running destinations in parallel (with
-          # 32bit one include at least)
-          -disable-concurrent-destination-testing
-      )
-      ;;
-    11.* | 12.* | 13.* | 14.*)
-      # Dropped 32bit as Apple doesn't seem support the simulators either.
-      XCODEBUILD_TEST_BASE_IOS+=(
-          -destination "platform=iOS Simulator,name=iPhone 8,OS=latest" # 64bit
-      )
-      ;;
-    * )
-      echo ""
-      echo "ATTENTION: Time to update the simulator targets for Xcode ${XCODE_VERSION}"
-      echo ""
-      echo "ERROR: Build aborted!"
-      exit 2
-      ;;
-  esac
-  if [[ "${DO_XCODE_DEBUG}" == "yes" ]] ; then
-    header "Doing Xcode iOS build/tests - Debug"
-    "${XCODEBUILD_TEST_BASE_IOS[@]}" -configuration Debug test
-  fi
-  if [[ "${DO_XCODE_RELEASE}" == "yes" ]] ; then
-    header "Doing Xcode iOS build/tests - Release"
-    "${XCODEBUILD_TEST_BASE_IOS[@]}" -configuration Release test
-  fi
-  # Don't leave the simulator in the developer's face.
-  killall Simulator 2> /dev/null || true
-fi
-if [[ "${DO_XCODE_OSX_TESTS}" == "yes" ]] ; then
-  XCODEBUILD_TEST_BASE_OSX=(
-    xcodebuild
-      -project objectivec/ProtocolBuffers_OSX.xcodeproj
-      -scheme ProtocolBuffers
-      # Since the ObjC 2.0 Runtime is required, 32bit OS X isn't supported.
-      -destination "platform=OS X,arch=x86_64" # 64bit
-  )
-  if [[ "${XCODE_QUIET}" == "yes" ]] ; then
-    XCODEBUILD_TEST_BASE_OSX+=( -quiet )
-  fi
-  case "${XCODE_VERSION}" in
-    [6-8].* )
-      echo "ERROR: The unittests include Swift code that is now Swift 4.0." 1>&2
-      echo "ERROR: Xcode 9.0 or higher is required to build the test suite, but the library works with Xcode 7.x." 1>&2
-      exit 11
-      ;;
-  esac
-  if [[ "${DO_XCODE_DEBUG}" == "yes" ]] ; then
-    header "Doing Xcode OS X build/tests - Debug"
-    "${XCODEBUILD_TEST_BASE_OSX[@]}" -configuration Debug test
-  fi
-  if [[ "${DO_XCODE_RELEASE}" == "yes" ]] ; then
-    header "Doing Xcode OS X build/tests - Release"
-    "${XCODEBUILD_TEST_BASE_OSX[@]}" -configuration Release test
-  fi
-fi
-if [[ "${DO_XCODE_TVOS_TESTS}" == "yes" ]] ; then
-  XCODEBUILD_TEST_BASE_TVOS=(
-    xcodebuild
-      -project objectivec/ProtocolBuffers_tvOS.xcodeproj
-      -scheme ProtocolBuffers
-  )
-  case "${XCODE_VERSION}" in
-    [6-9].* )
-      echo "ERROR: Xcode 10.0 or higher is required to build the test suite." 1>&2
-      exit 11
-      ;;
-    10.* | 11.* | 12.*)
-      XCODEBUILD_TEST_BASE_TVOS+=(
-        -destination "platform=tvOS Simulator,name=Apple TV 4K,OS=latest"
-      )
-      ;;
-    13.* | 14.*)
-      XCODEBUILD_TEST_BASE_TVOS+=(
-        -destination "platform=tvOS Simulator,name=Apple TV 4K (2nd generation),OS=latest"
-      )
-      ;;
-    * )
-      echo ""
-      echo "ATTENTION: Time to update the simulator targets for Xcode ${XCODE_VERSION}"
-      echo ""
-      echo "ERROR: Build aborted!"
-      exit 2
-      ;;
-  esac
-  if [[ "${XCODE_QUIET}" == "yes" ]] ; then
-    XCODEBUILD_TEST_BASE_TVOS+=( -quiet )
-  fi
-  if [[ "${DO_XCODE_DEBUG}" == "yes" ]] ; then
-    header "Doing Xcode tvOS build/tests - Debug"
-    "${XCODEBUILD_TEST_BASE_TVOS[@]}" -configuration Debug test
-  fi
-  if [[ "${DO_XCODE_RELEASE}" == "yes" ]] ; then
-    header "Doing Xcode tvOS build/tests - Release"
-    "${XCODEBUILD_TEST_BASE_TVOS[@]}" -configuration Release test
-  fi
-fi
-
-if [[ "${DO_OBJC_CONFORMANCE_TESTS}" == "yes" ]] ; then
-  header "Running ObjC Conformance Tests"
-  cd conformance
-  wrapped_make -j "${NUM_MAKE_JOBS}" test_objc
-  cd ..
-fi
-
-echo ""
-echo "$(basename "${0}"): Success!"
diff --git a/libs/protobuf/objectivec/DevTools/pddm.py b/libs/protobuf/objectivec/DevTools/pddm.py
deleted file mode 100755
index 60ff089..0000000
--- a/libs/protobuf/objectivec/DevTools/pddm.py
+++ /dev/null
@@ -1,693 +0,0 @@
-#! /usr/bin/env python3
-#
-# Protocol Buffers - Google's data interchange format
-# Copyright 2015 Google Inc.  All rights reserved.
-# https://developers.google.com/protocol-buffers/
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-"""PDDM - Poor Developers' Debug-able Macros
-
-A simple markup that can be added in comments of source so they can then be
-expanded out into code. Most of this could be done with CPP macros, but then
-developers can't really step through them in the debugger, this way they are
-expanded to the same code, but you can debug them.
-
-Any file can be processed, but the syntax is designed around a C based compiler.
-Processed lines start with "//%".  There are three types of sections you can
-create: Text (left alone), Macro Definitions, and Macro Expansions.  There is
-no order required between definitions and expansions, all definitions are read
-before any expansions are processed (thus, if desired, definitions can be put
-at the end of the file to keep them out of the way of the code).
-
-Macro Definitions are started with "//%PDDM-DEFINE Name(args)" and all lines
-afterwards that start with "//%" are included in the definition.  Multiple
-macros can be defined in one block by just using a another "//%PDDM-DEFINE"
-line to start the next macro.  Optionally, a macro can be ended with
-"//%PDDM-DEFINE-END", this can be useful when you want to make it clear that
-trailing blank lines are included in the macro.  You can also end a definition
-with an expansion.
-
-Macro Expansions are started by single lines containing
-"//%PDDM-EXPAND Name(args)" and then with "//%PDDM-EXPAND-END" or another
-expansions.  All lines in-between are replaced by the result of the expansion.
-The first line of the expansion is always a blank like just for readability.
-
-Expansion itself is pretty simple, one macro can invoke another macro, but
-you cannot nest the invoke of a macro in another macro (i.e. - can't do
-"foo(bar(a))", but you can define foo(a) and bar(b) where bar invokes foo()
-within its expansion.
-
-When macros are expanded, the arg references can also add "$O" suffix to the
-name (i.e. - "NAME$O") to specify an option to be applied. The options are:
-
-    $S - Replace each character in the value with a space.
-    $l - Lowercase the first letter of the value.
-    $L - Lowercase the whole value.
-    $u - Uppercase the first letter of the value.
-    $U - Uppercase the whole value.
-
-Within a macro you can use ## to cause things to get joined together after
-expansion (i.e. - "a##b" within a macro will become "ab").
-
-Example:
-
-    int foo(MyEnum x) {
-    switch (x) {
-    //%PDDM-EXPAND case(Enum_Left, 1)
-    //%PDDM-EXPAND case(Enum_Center, 2)
-    //%PDDM-EXPAND case(Enum_Right, 3)
-    //%PDDM-EXPAND-END
-    }
-
-    //%PDDM-DEFINE case(_A, _B)
-    //%  case _A:
-    //%    return _B;
-
-  A macro ends at the start of the next one, or an optional %PDDM-DEFINE-END
-  can be used to avoid adding extra blank lines/returns (or make it clear when
-  it is desired).
-
-  One macro can invoke another by simply using its name NAME(ARGS). You cannot
-  nest an invoke inside another (i.e. - NAME1(NAME2(ARGS)) isn't supported).
-
-  Within a macro you can use ## to cause things to get joined together after
-  processing (i.e. - "a##b" within a macro will become "ab").
-
-
-"""
-
-import optparse
-import os
-import re
-import sys
-
-
-# Regex for macro definition.
-_MACRO_RE = re.compile(r'(?P<name>\w+)\((?P<args>.*?)\)')
-# Regex for macro's argument definition.
-_MACRO_ARG_NAME_RE = re.compile(r'^\w+$')
-
-# Line inserted after each EXPAND.
-_GENERATED_CODE_LINE = (
-  '// This block of code is generated, do not edit it directly.'
-)
-
-
-def _MacroRefRe(macro_names):
-  # Takes in a list of macro names and makes a regex that will match invokes
-  # of those macros.
-  return re.compile(r'\b(?P<macro_ref>(?P<name>(%s))\((?P<args>.*?)\))' %
-                    '|'.join(macro_names))
-
-
-def _MacroArgRefRe(macro_arg_names):
-  # Takes in a list of macro arg names and makes a regex that will match
-  # uses of those args.
-  return re.compile(r'\b(?P<name>(%s))(\$(?P<option>.))?\b' %
-                    '|'.join(macro_arg_names))
-
-
-class PDDMError(Exception):
-  """Error thrown by pddm."""
-
-  def __init__(self, message="Error"):
-    self.message = message
-    super().__init__(self.message)
-
-
-class MacroCollection(object):
-  """Hold a set of macros and can resolve/expand them."""
-
-  def __init__(self, a_file=None):
-    """Initializes the collection.
-
-    Args:
-      a_file: The file like stream to parse.
-
-    Raises:
-      PDDMError if there are any issues.
-    """
-    self._macros = dict()
-    if a_file:
-      self.ParseInput(a_file)
-
-  class MacroDefinition(object):
-    """Holds a macro definition."""
-
-    def __init__(self, name, arg_names):
-      self._name = name
-      self._args = tuple(arg_names)
-      self._body = ''
-      self._needNewLine = False
-
-    def AppendLine(self, line):
-      if self._needNewLine:
-        self._body += '\n'
-      self._body += line
-      self._needNewLine = not line.endswith('\n')
-
-    @property
-    def name(self):
-      return self._name
-
-    @property
-    def args(self):
-      return self._args
-
-    @property
-    def body(self):
-      return self._body
-
-  def ParseInput(self, a_file):
-    """Consumes input extracting definitions.
-
-    Args:
-      a_file: The file like stream to parse.
-
-    Raises:
-      PDDMError if there are any issues.
-    """
-    input_lines = a_file.read().splitlines()
-    self.ParseLines(input_lines)
-
-  def ParseLines(self, input_lines):
-    """Parses list of lines.
-
-    Args:
-      input_lines: A list of strings of input to parse (no newlines on the
-                   strings).
-
-    Raises:
-      PDDMError if there are any issues.
-    """
-    current_macro = None
-    for line in input_lines:
-      if line.startswith('PDDM-'):
-        directive = line.split(' ', 1)[0]
-        if directive == 'PDDM-DEFINE':
-          name, args = self._ParseDefineLine(line)
-          if self._macros.get(name):
-            raise PDDMError('Attempt to redefine macro: "%s"' % line)
-          current_macro = self.MacroDefinition(name, args)
-          self._macros[name] = current_macro
-          continue
-        if directive == 'PDDM-DEFINE-END':
-          if not current_macro:
-            raise PDDMError('Got DEFINE-END directive without an active macro:'
-                            ' "%s"' % line)
-          current_macro = None
-          continue
-        raise PDDMError('Hit a line with an unknown directive: "%s"' % line)
-
-      if current_macro:
-        current_macro.AppendLine(line)
-        continue
-
-      # Allow blank lines between macro definitions.
-      if line.strip() == '':
-        continue
-
-      raise PDDMError('Hit a line that wasn\'t a directive and no open macro'
-                      ' definition: "%s"' % line)
-
-  def _ParseDefineLine(self, input_line):
-    assert input_line.startswith('PDDM-DEFINE')
-    line = input_line[12:].strip()
-    match = _MACRO_RE.match(line)
-    # Must match full line
-    if match is None or match.group(0) != line:
-      raise PDDMError('Failed to parse macro definition: "%s"' % input_line)
-    name = match.group('name')
-    args_str = match.group('args').strip()
-    args = []
-    if args_str:
-      for part in args_str.split(','):
-        arg = part.strip()
-        if arg == '':
-          raise PDDMError('Empty arg name in macro definition: "%s"'
-                          % input_line)
-        if not _MACRO_ARG_NAME_RE.match(arg):
-          raise PDDMError('Invalid arg name "%s" in macro definition: "%s"'
-                          % (arg, input_line))
-        if arg in args:
-          raise PDDMError('Arg name "%s" used more than once in macro'
-                          ' definition: "%s"' % (arg, input_line))
-        args.append(arg)
-    return (name, tuple(args))
-
-  def Expand(self, macro_ref_str):
-    """Expands the macro reference.
-
-    Args:
-      macro_ref_str: String of a macro reference (i.e. foo(a, b)).
-
-    Returns:
-      The text from the expansion.
-
-    Raises:
-      PDDMError if there are any issues.
-    """
-    match = _MACRO_RE.match(macro_ref_str)
-    if match is None or match.group(0) != macro_ref_str:
-      raise PDDMError('Failed to parse macro reference: "%s"' % macro_ref_str)
-    if match.group('name') not in self._macros:
-      raise PDDMError('No macro named "%s".' % match.group('name'))
-    return self._Expand(match, [], macro_ref_str)
-
-  def _FormatStack(self, macro_ref_stack):
-    result = ''
-    for _, macro_ref in reversed(macro_ref_stack):
-      result += '\n...while expanding "%s".' % macro_ref
-    return result
-
-  def _Expand(self, macro_ref_match, macro_stack, macro_ref_str=None):
-    if macro_ref_str is None:
-      macro_ref_str = macro_ref_match.group('macro_ref')
-    name = macro_ref_match.group('name')
-    for prev_name, prev_macro_ref in macro_stack:
-      if name == prev_name:
-        raise PDDMError('Found macro recursion, invoking "%s":%s' %
-                        (macro_ref_str, self._FormatStack(macro_stack)))
-    macro = self._macros[name]
-    args_str = macro_ref_match.group('args').strip()
-    args = []
-    if args_str or len(macro.args):
-      args = [x.strip() for x in args_str.split(',')]
-    if len(args) != len(macro.args):
-      raise PDDMError('Expected %d args, got: "%s".%s' %
-                      (len(macro.args), macro_ref_str,
-                       self._FormatStack(macro_stack)))
-    # Replace args usages.
-    result = self._ReplaceArgValues(macro, args, macro_ref_str, macro_stack)
-    # Expand any macro invokes.
-    new_macro_stack = macro_stack + [(name, macro_ref_str)]
-    while True:
-      eval_result = self._EvalMacrosRefs(result, new_macro_stack)
-      # Consume all ## directives to glue things together.
-      eval_result = eval_result.replace('##', '')
-      if eval_result == result:
-        break
-      result = eval_result
-    return result
-
-  def _ReplaceArgValues(self,
-                        macro, arg_values, macro_ref_to_report, macro_stack):
-    if len(arg_values) == 0:
-      # Nothing to do
-      return macro.body
-    assert len(arg_values) == len(macro.args)
-    args = dict(list(zip(macro.args, arg_values)))
-
-    def _lookupArg(match):
-      val = args[match.group('name')]
-      opt = match.group('option')
-      if opt:
-        if opt == 'S':  # Spaces for the length
-          return ' ' * len(val)
-        elif opt == 'l':  # Lowercase first character
-          if val:
-            return val[0].lower() + val[1:]
-          else:
-            return val
-        elif opt == 'L':  # All Lowercase
-          return val.lower()
-        elif opt == 'u':  # Uppercase first character
-          if val:
-            return val[0].upper() + val[1:]
-          else:
-            return val
-        elif opt == 'U':  # All Uppercase
-          return val.upper()
-        else:
-          raise PDDMError('Unknown arg option "%s$%s" while expanding "%s".%s'
-                          % (match.group('name'), match.group('option'),
-                             macro_ref_to_report,
-                             self._FormatStack(macro_stack)))
-      return val
-    # Let the regex do the work!
-    macro_arg_ref_re = _MacroArgRefRe(macro.args)
-    return macro_arg_ref_re.sub(_lookupArg, macro.body)
-
-  def _EvalMacrosRefs(self, text, macro_stack):
-    macro_ref_re = _MacroRefRe(list(self._macros.keys()))
-
-    def _resolveMacro(match):
-      return self._Expand(match, macro_stack)
-    return macro_ref_re.sub(_resolveMacro, text)
-
-
-class SourceFile(object):
-  """Represents a source file with PDDM directives in it."""
-
-  def __init__(self, a_file, import_resolver=None):
-    """Initializes the file reading in the file.
-
-    Args:
-      a_file: The file to read in.
-      import_resolver: a function that given a path will return a stream for
-        the contents.
-
-    Raises:
-      PDDMError if there are any issues.
-    """
-    self._sections = []
-    self._original_content = a_file.read()
-    self._import_resolver = import_resolver
-    self._processed_content = None
-
-  class SectionBase(object):
-
-    def __init__(self, first_line_num):
-      self._lines = []
-      self._first_line_num = first_line_num
-
-    def TryAppend(self, line, line_num):
-      """Try appending a line.
-
-      Args:
-        line: The line to append.
-        line_num: The number of the line.
-
-      Returns:
-        A tuple of (SUCCESS, CAN_ADD_MORE).  If SUCCESS if False, the line
-        wasn't append.  If SUCCESS is True, then CAN_ADD_MORE is True/False to
-        indicate if more lines can be added after this one.
-      """
-      assert False, "subclass should have overridden"
-      return (False, False)
-
-    def HitEOF(self):
-      """Called when the EOF was reached for for a given section."""
-      pass
-
-    def BindMacroCollection(self, macro_collection):
-      """Binds the chunk to a macro collection.
-
-      Args:
-        macro_collection: The collection to bind too.
-      """
-      pass
-
-    def Append(self, line):
-      self._lines.append(line)
-
-    @property
-    def lines(self):
-      return self._lines
-
-    @property
-    def num_lines_captured(self):
-      return len(self._lines)
-
-    @property
-    def first_line_num(self):
-      return self._first_line_num
-
-    @property
-    def first_line(self):
-      if not self._lines:
-        return ''
-      return self._lines[0]
-
-    @property
-    def text(self):
-      return '\n'.join(self.lines) + '\n'
-
-  class TextSection(SectionBase):
-    """Text section that is echoed out as is."""
-
-    def TryAppend(self, line, line_num):
-      if line.startswith('//%PDDM'):
-        return (False, False)
-      self.Append(line)
-      return (True, True)
-
-  class ExpansionSection(SectionBase):
-    """Section that is the result of an macro expansion."""
-
-    def __init__(self, first_line_num):
-      SourceFile.SectionBase.__init__(self, first_line_num)
-      self._macro_collection = None
-
-    def TryAppend(self, line, line_num):
-      if line.startswith('//%PDDM'):
-        directive = line.split(' ', 1)[0]
-        if directive == '//%PDDM-EXPAND':
-          self.Append(line)
-          return (True, True)
-        if directive == '//%PDDM-EXPAND-END':
-          assert self.num_lines_captured > 0
-          return (True, False)
-        raise PDDMError('Ran into directive ("%s", line %d) while in "%s".' %
-                        (directive, line_num, self.first_line))
-      # Eat other lines.
-      return (True, True)
-
-    def HitEOF(self):
-      raise PDDMError('Hit the end of the file while in "%s".' %
-                      self.first_line)
-
-    def BindMacroCollection(self, macro_collection):
-      self._macro_collection = macro_collection
-
-    @property
-    def lines(self):
-      captured_lines = SourceFile.SectionBase.lines.fget(self)
-      directive_len = len('//%PDDM-EXPAND')
-      result = []
-      for line in captured_lines:
-        result.append(line)
-        if self._macro_collection:
-          # Always add a blank line, seems to read better. (If need be, add an
-          # option to the EXPAND to indicate if this should be done.)
-          result.extend([_GENERATED_CODE_LINE, '// clang-format off', ''])
-          macro = line[directive_len:].strip()
-          try:
-            expand_result = self._macro_collection.Expand(macro)
-            # Since expansions are line oriented, strip trailing whitespace
-            # from the lines.
-            lines = [x.rstrip() for x in expand_result.split('\n')]
-            lines.append('// clang-format on')
-            result.append('\n'.join(lines))
-          except PDDMError as e:
-            raise PDDMError('%s\n...while expanding "%s" from the section'
-                            ' that started:\n   Line %d: %s' %
-                            (e.message, macro,
-                             self.first_line_num, self.first_line))
-
-      # Add the ending marker.
-      if len(captured_lines) == 1:
-        result.append('//%%PDDM-EXPAND-END %s' %
-                      captured_lines[0][directive_len:].strip())
-      else:
-        result.append('//%%PDDM-EXPAND-END (%s expansions)' %
-                      len(captured_lines))
-      return result
-
-  class DefinitionSection(SectionBase):
-    """Section containing macro definitions"""
-
-    def TryAppend(self, line, line_num):
-      if not line.startswith('//%'):
-        return (False, False)
-      if line.startswith('//%PDDM'):
-        directive = line.split(' ', 1)[0]
-        if directive == "//%PDDM-EXPAND":
-          return False, False
-        if directive not in ('//%PDDM-DEFINE', '//%PDDM-DEFINE-END'):
-          raise PDDMError('Ran into directive ("%s", line %d) while in "%s".' %
-                          (directive, line_num, self.first_line))
-      self.Append(line)
-      return (True, True)
-
-    def BindMacroCollection(self, macro_collection):
-      if macro_collection:
-        try:
-          # Parse the lines after stripping the prefix.
-          macro_collection.ParseLines([x[3:] for x in self.lines])
-        except PDDMError as e:
-          raise PDDMError('%s\n...while parsing section that started:\n'
-                          '  Line %d: %s' %
-                          (e.message, self.first_line_num, self.first_line))
-
-  class ImportDefinesSection(SectionBase):
-    """Section containing an import of PDDM-DEFINES from an external file."""
-
-    def __init__(self, first_line_num, import_resolver):
-      SourceFile.SectionBase.__init__(self, first_line_num)
-      self._import_resolver = import_resolver
-
-    def TryAppend(self, line, line_num):
-      if not line.startswith('//%PDDM-IMPORT-DEFINES '):
-        return (False, False)
-      assert self.num_lines_captured == 0
-      self.Append(line)
-      return (True, False)
-
-    def BindMacroCollection(self, macro_colletion):
-      if not macro_colletion:
-        return
-      if self._import_resolver is None:
-        raise PDDMError('Got an IMPORT-DEFINES without a resolver (line %d):'
-                        ' "%s".' % (self.first_line_num, self.first_line))
-      import_name = self.first_line.split(' ', 1)[1].strip()
-      imported_file = self._import_resolver(import_name)
-      if imported_file is None:
-        raise PDDMError('Resolver failed to find "%s" (line %d):'
-                        ' "%s".' %
-                        (import_name, self.first_line_num, self.first_line))
-      try:
-        imported_src_file = SourceFile(imported_file, self._import_resolver)
-        imported_src_file._ParseFile()
-        for section in imported_src_file._sections:
-          section.BindMacroCollection(macro_colletion)
-      except PDDMError as e:
-        raise PDDMError('%s\n...while importing defines:\n'
-                        '  Line %d: %s' %
-                        (e.message, self.first_line_num, self.first_line))
-
-  def _ParseFile(self):
-    self._sections = []
-    lines = self._original_content.splitlines()
-    cur_section = None
-    for line_num, line in enumerate(lines, 1):
-      if not cur_section:
-        cur_section = self._MakeSection(line, line_num)
-      was_added, accept_more = cur_section.TryAppend(line, line_num)
-      if not was_added:
-        cur_section = self._MakeSection(line, line_num)
-        was_added, accept_more = cur_section.TryAppend(line, line_num)
-        assert was_added
-      if not accept_more:
-        cur_section = None
-
-    if cur_section:
-      cur_section.HitEOF()
-
-  def _MakeSection(self, line, line_num):
-    if not line.startswith('//%PDDM'):
-      section = self.TextSection(line_num)
-    else:
-      directive = line.split(' ', 1)[0]
-      if directive == '//%PDDM-EXPAND':
-        section = self.ExpansionSection(line_num)
-      elif directive == '//%PDDM-DEFINE':
-        section = self.DefinitionSection(line_num)
-      elif directive == '//%PDDM-IMPORT-DEFINES':
-        section = self.ImportDefinesSection(line_num, self._import_resolver)
-      else:
-        raise PDDMError('Unexpected line %d: "%s".' % (line_num, line))
-    self._sections.append(section)
-    return section
-
-  def ProcessContent(self, strip_expansion=False):
-    """Processes the file contents."""
-    self._ParseFile()
-    if strip_expansion:
-      # Without a collection the expansions become blank, removing them.
-      collection = None
-    else:
-      collection = MacroCollection()
-    for section in self._sections:
-      section.BindMacroCollection(collection)
-    result = ''
-    for section in self._sections:
-      result += section.text
-    self._processed_content = result
-
-  @property
-  def original_content(self):
-    return self._original_content
-
-  @property
-  def processed_content(self):
-    return self._processed_content
-
-
-def main(args):
-  usage = '%prog [OPTIONS] PATH ...'
-  description = (
-      'Processes PDDM directives in the given paths and write them back out.'
-  )
-  parser = optparse.OptionParser(usage=usage, description=description)
-  parser.add_option('--dry-run',
-                    default=False, action='store_true',
-                    help='Don\'t write back to the file(s), just report if the'
-                    ' contents needs an update and exit with a value of 1.')
-  parser.add_option('--verbose',
-                    default=False, action='store_true',
-                    help='Reports is a file is already current.')
-  parser.add_option('--collapse',
-                    default=False, action='store_true',
-                    help='Removes all the generated code.')
-  opts, extra_args = parser.parse_args(args)
-
-  if not extra_args:
-    parser.error('Need at least one file to process')
-
-  result = 0
-  for a_path in extra_args:
-    if not os.path.exists(a_path):
-      sys.stderr.write('ERROR: File not found: %s\n' % a_path)
-      return 100
-
-    def _ImportResolver(name):
-      # resolve based on the file being read.
-      a_dir = os.path.dirname(a_path)
-      import_path = os.path.join(a_dir, name)
-      if not os.path.exists(import_path):
-        return None
-      return open(import_path, 'r')
-
-    with open(a_path, 'r') as f:
-      src_file = SourceFile(f, _ImportResolver)
-
-    try:
-      src_file.ProcessContent(strip_expansion=opts.collapse)
-    except PDDMError as e:
-      sys.stderr.write('ERROR: %s\n...While processing "%s"\n' %
-                       (e.message, a_path))
-      return 101
-
-    if src_file.processed_content != src_file.original_content:
-      if not opts.dry_run:
-        print('Updating for "%s".' % a_path)
-        with open(a_path, 'w') as f:
-          f.write(src_file.processed_content)
-      else:
-        # Special result to indicate things need updating.
-        print('Update needed for "%s".' % a_path)
-        result = 1
-    elif opts.verbose:
-      print('No update for "%s".' % a_path)
-
-  return result
-
-
-if __name__ == '__main__':
-  sys.exit(main(sys.argv[1:]))
diff --git a/libs/protobuf/objectivec/DevTools/pddm_tests.py b/libs/protobuf/objectivec/DevTools/pddm_tests.py
deleted file mode 100755
index d5b88c9..0000000
--- a/libs/protobuf/objectivec/DevTools/pddm_tests.py
+++ /dev/null
@@ -1,522 +0,0 @@
-#! /usr/bin/env python3
-#
-# Protocol Buffers - Google's data interchange format
-# Copyright 2015 Google Inc.  All rights reserved.
-# https://developers.google.com/protocol-buffers/
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-"""Tests for pddm.py."""
-
-import io
-import unittest
-
-import pddm
-
-
-class TestParsingMacros(unittest.TestCase):
-
-  def testParseEmpty(self):
-    f = io.StringIO('')
-    result = pddm.MacroCollection(f)
-    self.assertEqual(len(result._macros), 0)
-
-  def testParseOne(self):
-    f = io.StringIO("""PDDM-DEFINE foo( )
-body""")
-    result = pddm.MacroCollection(f)
-    self.assertEqual(len(result._macros), 1)
-    macro = result._macros.get('foo')
-    self.assertIsNotNone(macro)
-    self.assertEqual(macro.name, 'foo')
-    self.assertEqual(macro.args, tuple())
-    self.assertEqual(macro.body, 'body')
-
-  def testParseGeneral(self):
-    # Tests multiple defines, spaces in all places, etc.
-    f = io.StringIO("""
-PDDM-DEFINE noArgs( )
-body1
-body2
-
-PDDM-DEFINE-END
-
-PDDM-DEFINE oneArg(foo)
-body3
-PDDM-DEFINE  twoArgs( bar_ , baz )
-body4
-body5""")
-    result = pddm.MacroCollection(f)
-    self.assertEqual(len(result._macros), 3)
-    macro = result._macros.get('noArgs')
-    self.assertIsNotNone(macro)
-    self.assertEqual(macro.name, 'noArgs')
-    self.assertEqual(macro.args, tuple())
-    self.assertEqual(macro.body, 'body1\nbody2\n')
-    macro = result._macros.get('oneArg')
-    self.assertIsNotNone(macro)
-    self.assertEqual(macro.name, 'oneArg')
-    self.assertEqual(macro.args, ('foo',))
-    self.assertEqual(macro.body, 'body3')
-    macro = result._macros.get('twoArgs')
-    self.assertIsNotNone(macro)
-    self.assertEqual(macro.name, 'twoArgs')
-    self.assertEqual(macro.args, ('bar_', 'baz'))
-    self.assertEqual(macro.body, 'body4\nbody5')
-    # Add into existing collection
-    f = io.StringIO("""
-PDDM-DEFINE another(a,b,c)
-body1
-body2""")
-    result.ParseInput(f)
-    self.assertEqual(len(result._macros), 4)
-    macro = result._macros.get('another')
-    self.assertIsNotNone(macro)
-    self.assertEqual(macro.name, 'another')
-    self.assertEqual(macro.args, ('a', 'b', 'c'))
-    self.assertEqual(macro.body, 'body1\nbody2')
-
-  def testParseDirectiveIssues(self):
-    test_list = [
-      # Unknown directive
-      ('PDDM-DEFINE foo()\nbody\nPDDM-DEFINED foo\nbaz',
-       'Hit a line with an unknown directive: '),
-      # End without begin
-      ('PDDM-DEFINE foo()\nbody\nPDDM-DEFINE-END\nPDDM-DEFINE-END\n',
-       'Got DEFINE-END directive without an active macro: '),
-      # Line not in macro block
-      ('PDDM-DEFINE foo()\nbody\nPDDM-DEFINE-END\nmumble\n',
-       'Hit a line that wasn\'t a directive and no open macro definition: '),
-      # Redefine macro
-      ('PDDM-DEFINE foo()\nbody\nPDDM-DEFINE foo(a)\nmumble\n',
-       'Attempt to redefine macro: '),
-    ]
-    for idx, (input_str, expected_prefix) in enumerate(test_list, 1):
-      f = io.StringIO(input_str)
-      try:
-        result = pddm.MacroCollection(f)
-        self.fail('Should throw exception, entry %d' % idx)
-      except pddm.PDDMError as e:
-        self.assertTrue(e.message.startswith(expected_prefix),
-                        'Entry %d failed: %r' % (idx, e))
-
-  def testParseBeginIssues(self):
-    test_list = [
-      # 1. No name
-      ('PDDM-DEFINE\nmumble',
-       'Failed to parse macro definition: '),
-      # 2. No name (with spaces)
-      ('PDDM-DEFINE  \nmumble',
-       'Failed to parse macro definition: '),
-      # 3. No open paren
-      ('PDDM-DEFINE  foo\nmumble',
-       'Failed to parse macro definition: '),
-      # 4. No close paren
-      ('PDDM-DEFINE foo(\nmumble',
-       'Failed to parse macro definition: '),
-      # 5. No close paren (with args)
-      ('PDDM-DEFINE foo(a, b\nmumble',
-       'Failed to parse macro definition: '),
-      # 6. No name before args
-      ('PDDM-DEFINE  (a, b)\nmumble',
-       'Failed to parse macro definition: '),
-      # 7. No name before args
-      ('PDDM-DEFINE foo bar(a, b)\nmumble',
-       'Failed to parse macro definition: '),
-      # 8. Empty arg name
-      ('PDDM-DEFINE foo(a, ,b)\nmumble',
-       'Empty arg name in macro definition: '),
-      ('PDDM-DEFINE foo(a,,b)\nmumble',
-       'Empty arg name in macro definition: '),
-      # 10. Duplicate name
-      ('PDDM-DEFINE foo(a,b,a,c)\nmumble',
-       'Arg name "a" used more than once in macro definition: '),
-      # 11. Invalid arg name
-      ('PDDM-DEFINE foo(a b,c)\nmumble',
-       'Invalid arg name "a b" in macro definition: '),
-      ('PDDM-DEFINE foo(a.b,c)\nmumble',
-       'Invalid arg name "a.b" in macro definition: '),
-      ('PDDM-DEFINE foo(a-b,c)\nmumble',
-       'Invalid arg name "a-b" in macro definition: '),
-      ('PDDM-DEFINE foo(a,b,c.)\nmumble',
-       'Invalid arg name "c." in macro definition: '),
-      # 15. Extra stuff after the name
-      ('PDDM-DEFINE foo(a,c) foo\nmumble',
-       'Failed to parse macro definition: '),
-      ('PDDM-DEFINE foo(a,c) foo)\nmumble',
-       'Failed to parse macro definition: '),
-    ]
-    for idx, (input_str, expected_prefix) in enumerate(test_list, 1):
-      f = io.StringIO(input_str)
-      try:
-        result = pddm.MacroCollection(f)
-        self.fail('Should throw exception, entry %d' % idx)
-      except pddm.PDDMError as e:
-        self.assertTrue(e.message.startswith(expected_prefix),
-                        'Entry %d failed: %r' % (idx, e))
-
-
-class TestExpandingMacros(unittest.TestCase):
-
-  def testExpandBasics(self):
-    f = io.StringIO("""
-PDDM-DEFINE noArgs( )
-body1
-body2
-
-PDDM-DEFINE-END
-
-PDDM-DEFINE oneArg(a)
-body3 a
-
-PDDM-DEFINE-END
-
-PDDM-DEFINE twoArgs(b,c)
-body4 b c
-body5
-PDDM-DEFINE-END
-
-""")
-    mc = pddm.MacroCollection(f)
-    test_list = [
-      ('noArgs()',
-       'body1\nbody2\n'),
-      ('oneArg(wee)',
-       'body3 wee\n'),
-      ('twoArgs(having some, fun)',
-       'body4 having some fun\nbody5'),
-      # One arg, pass empty.
-      ('oneArg()',
-       'body3 \n'),
-      # Two args, gets empty in each slot.
-      ('twoArgs(, empty)',
-       'body4  empty\nbody5'),
-      ('twoArgs(empty, )',
-       'body4 empty \nbody5'),
-      ('twoArgs(, )',
-       'body4  \nbody5'),
-    ]
-    for idx, (input_str, expected) in enumerate(test_list, 1):
-      result = mc.Expand(input_str)
-      self.assertEqual(result, expected,
-                       'Entry %d --\n       Result: %r\n     Expected: %r' %
-                       (idx, result, expected))
-
-  def testExpandArgOptions(self):
-    f = io.StringIO("""
-PDDM-DEFINE bar(a)
-a-a$S-a$l-a$L-a$u-a$U
-PDDM-DEFINE-END
-""")
-    mc = pddm.MacroCollection(f)
-
-    self.assertEqual(mc.Expand('bar(xYz)'), 'xYz-   -xYz-xyz-XYz-XYZ')
-    self.assertEqual(mc.Expand('bar(MnoP)'), 'MnoP-    -mnoP-mnop-MnoP-MNOP')
-    # Test empty
-    self.assertEqual(mc.Expand('bar()'), '-----')
-
-  def testExpandSimpleMacroErrors(self):
-    f = io.StringIO("""
-PDDM-DEFINE foo(a, b)
-<a-z>
-PDDM-DEFINE baz(a)
-a - a$z
-""")
-    mc = pddm.MacroCollection(f)
-    test_list = [
-      # 1. Unknown macro
-      ('bar()',
-       'No macro named "bar".'),
-      ('bar(a)',
-       'No macro named "bar".'),
-      # 3. Arg mismatch
-      ('foo()',
-       'Expected 2 args, got: "foo()".'),
-      ('foo(a b)',
-       'Expected 2 args, got: "foo(a b)".'),
-      ('foo(a,b,c)',
-       'Expected 2 args, got: "foo(a,b,c)".'),
-      # 6. Unknown option in expansion
-      ('baz(mumble)',
-       'Unknown arg option "a$z" while expanding "baz(mumble)".'),
-    ]
-    for idx, (input_str, expected_err) in enumerate(test_list, 1):
-      try:
-        result = mc.Expand(input_str)
-        self.fail('Should throw exception, entry %d' % idx)
-      except pddm.PDDMError as e:
-        self.assertEqual(e.message, expected_err,
-                        'Entry %d failed: %r' % (idx, e))
-
-  def testExpandReferences(self):
-    f = io.StringIO("""
-PDDM-DEFINE StartIt()
-foo(abc, def)
-foo(ghi, jkl)
-PDDM-DEFINE foo(a, b)
-bar(a, int)
-bar(b, NSString *)
-PDDM-DEFINE bar(n, t)
-- (t)n;
-- (void)set##n$u##:(t)value;
-
-""")
-    mc = pddm.MacroCollection(f)
-    expected = """- (int)abc;
-- (void)setAbc:(int)value;
-
-- (NSString *)def;
-- (void)setDef:(NSString *)value;
-
-- (int)ghi;
-- (void)setGhi:(int)value;
-
-- (NSString *)jkl;
-- (void)setJkl:(NSString *)value;
-"""
-    self.assertEqual(mc.Expand('StartIt()'), expected)
-
-  def testCatchRecursion(self):
-    f = io.StringIO("""
-PDDM-DEFINE foo(a, b)
-bar(1, a)
-bar(2, b)
-PDDM-DEFINE bar(x, y)
-foo(x, y)
-""")
-    mc = pddm.MacroCollection(f)
-    try:
-      result = mc.Expand('foo(A,B)')
-      self.fail('Should throw exception! Test failed to catch recursion.')
-    except pddm.PDDMError as e:
-      self.assertEqual(e.message,
-                       'Found macro recursion, invoking "foo(1, A)":\n...while expanding "bar(1, A)".\n...while expanding "foo(A,B)".')
-
-
-class TestParsingSource(unittest.TestCase):
-
-  def testBasicParse(self):
-    test_list = [
-      # 1. no directives
-      ('a\nb\nc',
-       (3,) ),
-      # 2. One define
-      ('a\n//%PDDM-DEFINE foo()\n//%body\nc',
-       (1, 2, 1) ),
-      # 3. Two defines
-      ('a\n//%PDDM-DEFINE foo()\n//%body\n//%PDDM-DEFINE bar()\n//%body2\nc',
-       (1, 4, 1) ),
-      # 4. Two defines with ends
-      ('a\n//%PDDM-DEFINE foo()\n//%body\n//%PDDM-DEFINE-END\n'
-       '//%PDDM-DEFINE bar()\n//%body2\n//%PDDM-DEFINE-END\nc',
-       (1, 6, 1) ),
-      # 5. One expand, one define (that runs to end of file)
-      ('a\n//%PDDM-EXPAND foo()\nbody\n//%PDDM-EXPAND-END\n'
-       '//%PDDM-DEFINE bar()\n//%body2\n',
-       (1, 1, 2) ),
-      # 6. One define ended with an expand.
-      ('a\nb\n//%PDDM-DEFINE bar()\n//%body2\n'
-       '//%PDDM-EXPAND bar()\nbody2\n//%PDDM-EXPAND-END\n',
-       (2, 2, 1) ),
-      # 7. Two expands (one end), one define.
-      ('a\n//%PDDM-EXPAND foo(1)\nbody\n//%PDDM-EXPAND foo(2)\nbody2\n//%PDDM-EXPAND-END\n'
-       '//%PDDM-DEFINE foo()\n//%body2\n',
-       (1, 2, 2) ),
-    ]
-    for idx, (input_str, line_counts) in enumerate(test_list, 1):
-      f = io.StringIO(input_str)
-      sf = pddm.SourceFile(f)
-      sf._ParseFile()
-      self.assertEqual(len(sf._sections), len(line_counts),
-                       'Entry %d -- %d != %d' %
-                       (idx, len(sf._sections), len(line_counts)))
-      for idx2, (sec, expected) in enumerate(zip(sf._sections, line_counts), 1):
-        self.assertEqual(sec.num_lines_captured, expected,
-                         'Entry %d, section %d -- %d != %d' %
-                         (idx, idx2, sec.num_lines_captured, expected))
-
-  def testErrors(self):
-    test_list = [
-      # 1. Directive within expansion
-      ('//%PDDM-EXPAND a()\n//%PDDM-BOGUS',
-       'Ran into directive ("//%PDDM-BOGUS", line 2) while in "//%PDDM-EXPAND a()".'),
-      ('//%PDDM-EXPAND a()\n//%PDDM-DEFINE a()\n//%body\n',
-       'Ran into directive ("//%PDDM-DEFINE", line 2) while in "//%PDDM-EXPAND a()".'),
-      # 3. Expansion ran off end of file
-      ('//%PDDM-EXPAND a()\na\nb\n',
-       'Hit the end of the file while in "//%PDDM-EXPAND a()".'),
-      # 4. Directive within define
-      ('//%PDDM-DEFINE a()\n//%body\n//%PDDM-BOGUS',
-       'Ran into directive ("//%PDDM-BOGUS", line 3) while in "//%PDDM-DEFINE a()".'),
-      ('//%PDDM-DEFINE a()\n//%body\n//%PDDM-EXPAND-END a()',
-       'Ran into directive ("//%PDDM-EXPAND-END", line 3) while in "//%PDDM-DEFINE a()".'),
-      # 6. Directives that shouldn't start sections
-      ('a\n//%PDDM-DEFINE-END a()\n//a\n',
-       'Unexpected line 2: "//%PDDM-DEFINE-END a()".'),
-      ('a\n//%PDDM-EXPAND-END a()\n//a\n',
-       'Unexpected line 2: "//%PDDM-EXPAND-END a()".'),
-      ('//%PDDM-BOGUS\n//a\n',
-       'Unexpected line 1: "//%PDDM-BOGUS".'),
-    ]
-    for idx, (input_str, expected_err) in enumerate(test_list, 1):
-      f = io.StringIO(input_str)
-      try:
-        pddm.SourceFile(f)._ParseFile()
-        self.fail('Should throw exception, entry %d' % idx)
-      except pddm.PDDMError as e:
-        self.assertEqual(e.message, expected_err,
-                        'Entry %d failed: %r' % (idx, e))
-
-class TestProcessingSource(unittest.TestCase):
-
-  def testBasics(self):
-    self.maxDiff = None
-    input_str = """
-//%PDDM-IMPORT-DEFINES ImportFile
-foo
-//%PDDM-EXPAND mumble(abc)
-//%PDDM-EXPAND-END
-bar
-//%PDDM-EXPAND mumble(def)
-//%PDDM-EXPAND mumble(ghi)
-//%PDDM-EXPAND-END
-baz
-//%PDDM-DEFINE mumble(a_)
-//%a_: getName(a_)
-"""
-    input_str2 = """
-//%PDDM-DEFINE getName(x_)
-//%do##x_$u##(int x_);
-
-"""
-    expected = """
-//%PDDM-IMPORT-DEFINES ImportFile
-foo
-//%PDDM-EXPAND mumble(abc)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-abc: doAbc(int abc);
-// clang-format on
-//%PDDM-EXPAND-END mumble(abc)
-bar
-//%PDDM-EXPAND mumble(def)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-def: doDef(int def);
-// clang-format on
-//%PDDM-EXPAND mumble(ghi)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-ghi: doGhi(int ghi);
-// clang-format on
-//%PDDM-EXPAND-END (2 expansions)
-baz
-//%PDDM-DEFINE mumble(a_)
-//%a_: getName(a_)
-"""
-    expected_stripped = """
-//%PDDM-IMPORT-DEFINES ImportFile
-foo
-//%PDDM-EXPAND mumble(abc)
-//%PDDM-EXPAND-END mumble(abc)
-bar
-//%PDDM-EXPAND mumble(def)
-//%PDDM-EXPAND mumble(ghi)
-//%PDDM-EXPAND-END (2 expansions)
-baz
-//%PDDM-DEFINE mumble(a_)
-//%a_: getName(a_)
-"""
-    def _Resolver(name):
-      self.assertEqual(name, 'ImportFile')
-      return io.StringIO(input_str2)
-    f = io.StringIO(input_str)
-    sf = pddm.SourceFile(f, _Resolver)
-    sf.ProcessContent()
-    self.assertEqual(sf.processed_content, expected)
-    # Feed it through and nothing should change.
-    f2 = io.StringIO(sf.processed_content)
-    sf2 = pddm.SourceFile(f2, _Resolver)
-    sf2.ProcessContent()
-    self.assertEqual(sf2.processed_content, expected)
-    self.assertEqual(sf2.processed_content, sf.processed_content)
-    # Test stripping (with the original input and expanded version).
-    f2 = io.StringIO(input_str)
-    sf2 = pddm.SourceFile(f2)
-    sf2.ProcessContent(strip_expansion=True)
-    self.assertEqual(sf2.processed_content, expected_stripped)
-    f2 = io.StringIO(sf.processed_content)
-    sf2 = pddm.SourceFile(f2, _Resolver)
-    sf2.ProcessContent(strip_expansion=True)
-    self.assertEqual(sf2.processed_content, expected_stripped)
-
-  def testProcessFileWithMacroParseError(self):
-    input_str = """
-foo
-//%PDDM-DEFINE mumble(a_)
-//%body
-//%PDDM-DEFINE mumble(x_)
-//%body2
-
-"""
-    f = io.StringIO(input_str)
-    sf = pddm.SourceFile(f)
-    try:
-      sf.ProcessContent()
-      self.fail('Should throw exception! Test failed to catch macro parsing error.')
-    except pddm.PDDMError as e:
-      self.assertEqual(e.message,
-                       'Attempt to redefine macro: "PDDM-DEFINE mumble(x_)"\n'
-                       '...while parsing section that started:\n'
-                       '  Line 3: //%PDDM-DEFINE mumble(a_)')
-
-  def testProcessFileWithExpandError(self):
-    input_str = """
-foo
-//%PDDM-DEFINE mumble(a_)
-//%body
-//%PDDM-EXPAND foobar(x_)
-//%PDDM-EXPAND-END
-
-"""
-    f = io.StringIO(input_str)
-    sf = pddm.SourceFile(f)
-    try:
-      sf.ProcessContent()
-      self.fail('Should throw exception! Test failed to catch expand error.')
-    except pddm.PDDMError as e:
-      self.assertEqual(e.message,
-                       'No macro named "foobar".\n'
-                       '...while expanding "foobar(x_)" from the section that'
-                       ' started:\n   Line 5: //%PDDM-EXPAND foobar(x_)')
-
-
-if __name__ == '__main__':
-  unittest.main()
diff --git a/libs/protobuf/objectivec/GPBAny.pbobjc.h b/libs/protobuf/objectivec/GPBAny.pbobjc.h
deleted file mode 100644
index 7fb4129..0000000
--- a/libs/protobuf/objectivec/GPBAny.pbobjc.h
+++ /dev/null
@@ -1,174 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/protobuf/any.proto
-
-#import "GPBDescriptor.h"
-#import "GPBMessage.h"
-#import "GPBRootObject.h"
-
-#if GOOGLE_PROTOBUF_OBJC_VERSION < 30004
-#error This file was generated by a newer version of protoc which is incompatible with your Protocol Buffer library sources.
-#endif
-#if 30004 < GOOGLE_PROTOBUF_OBJC_MIN_SUPPORTED_VERSION
-#error This file was generated by an older version of protoc which is incompatible with your Protocol Buffer library sources.
-#endif
-
-// @@protoc_insertion_point(imports)
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-
-CF_EXTERN_C_BEGIN
-
-NS_ASSUME_NONNULL_BEGIN
-
-#pragma mark - GPBAnyRoot
-
-/**
- * Exposes the extension registry for this file.
- *
- * The base class provides:
- * @code
- *   + (GPBExtensionRegistry *)extensionRegistry;
- * @endcode
- * which is a @c GPBExtensionRegistry that includes all the extensions defined by
- * this file and all files that it depends on.
- **/
-GPB_FINAL @interface GPBAnyRoot : GPBRootObject
-@end
-
-#pragma mark - GPBAny
-
-typedef GPB_ENUM(GPBAny_FieldNumber) {
-  GPBAny_FieldNumber_TypeURL = 1,
-  GPBAny_FieldNumber_Value = 2,
-};
-
-/**
- * `Any` contains an arbitrary serialized protocol buffer message along with a
- * URL that describes the type of the serialized message.
- *
- * Protobuf library provides support to pack/unpack Any values in the form
- * of utility functions or additional generated methods of the Any type.
- *
- * Example 1: Pack and unpack a message in C++.
- *
- *     Foo foo = ...;
- *     Any any;
- *     any.PackFrom(foo);
- *     ...
- *     if (any.UnpackTo(&foo)) {
- *       ...
- *     }
- *
- * Example 2: Pack and unpack a message in Java.
- *
- *     Foo foo = ...;
- *     Any any = Any.pack(foo);
- *     ...
- *     if (any.is(Foo.class)) {
- *       foo = any.unpack(Foo.class);
- *     }
- *
- * Example 3: Pack and unpack a message in Python.
- *
- *     foo = Foo(...)
- *     any = Any()
- *     any.Pack(foo)
- *     ...
- *     if any.Is(Foo.DESCRIPTOR):
- *       any.Unpack(foo)
- *       ...
- *
- * Example 4: Pack and unpack a message in Go
- *
- *      foo := &pb.Foo{...}
- *      any, err := anypb.New(foo)
- *      if err != nil {
- *        ...
- *      }
- *      ...
- *      foo := &pb.Foo{}
- *      if err := any.UnmarshalTo(foo); err != nil {
- *        ...
- *      }
- *
- * The pack methods provided by protobuf library will by default use
- * 'type.googleapis.com/full.type.name' as the type URL and the unpack
- * methods only use the fully qualified type name after the last '/'
- * in the type URL, for example "foo.bar.com/x/y.z" will yield type
- * name "y.z".
- *
- *
- * JSON
- *
- * The JSON representation of an `Any` value uses the regular
- * representation of the deserialized, embedded message, with an
- * additional field `\@type` which contains the type URL. Example:
- *
- *     package google.profile;
- *     message Person {
- *       string first_name = 1;
- *       string last_name = 2;
- *     }
- *
- *     {
- *       "\@type": "type.googleapis.com/google.profile.Person",
- *       "firstName": <string>,
- *       "lastName": <string>
- *     }
- *
- * If the embedded message type is well-known and has a custom JSON
- * representation, that representation will be embedded adding a field
- * `value` which holds the custom JSON in addition to the `\@type`
- * field. Example (for message [google.protobuf.Duration][]):
- *
- *     {
- *       "\@type": "type.googleapis.com/google.protobuf.Duration",
- *       "value": "1.212s"
- *     }
- **/
-GPB_FINAL @interface GPBAny : GPBMessage
-
-/**
- * A URL/resource name that uniquely identifies the type of the serialized
- * protocol buffer message. This string must contain at least
- * one "/" character. The last segment of the URL's path must represent
- * the fully qualified name of the type (as in
- * `path/google.protobuf.Duration`). The name should be in a canonical form
- * (e.g., leading "." is not accepted).
- *
- * In practice, teams usually precompile into the binary all types that they
- * expect it to use in the context of Any. However, for URLs which use the
- * scheme `http`, `https`, or no scheme, one can optionally set up a type
- * server that maps type URLs to message definitions as follows:
- *
- * * If no scheme is provided, `https` is assumed.
- * * An HTTP GET on the URL must yield a [google.protobuf.Type][]
- *   value in binary format, or produce an error.
- * * Applications are allowed to cache lookup results based on the
- *   URL, or have them precompiled into a binary to avoid any
- *   lookup. Therefore, binary compatibility needs to be preserved
- *   on changes to types. (Use versioned type names to manage
- *   breaking changes.)
- *
- * Note: this functionality is not currently available in the official
- * protobuf release, and it is not used for type URLs beginning with
- * type.googleapis.com.
- *
- * Schemes other than `http`, `https` (or the empty scheme) might be
- * used with implementation specific semantics.
- **/
-@property(nonatomic, readwrite, copy, null_resettable) NSString *typeURL;
-
-/** Must be a valid serialized protocol buffer of the above specified type. */
-@property(nonatomic, readwrite, copy, null_resettable) NSData *value;
-
-@end
-
-NS_ASSUME_NONNULL_END
-
-CF_EXTERN_C_END
-
-#pragma clang diagnostic pop
-
-// @@protoc_insertion_point(global_scope)
diff --git a/libs/protobuf/objectivec/GPBAny.pbobjc.m b/libs/protobuf/objectivec/GPBAny.pbobjc.m
deleted file mode 100644
index 7632c8c..0000000
--- a/libs/protobuf/objectivec/GPBAny.pbobjc.m
+++ /dev/null
@@ -1,100 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/protobuf/any.proto
-
-#import "GPBProtocolBuffers_RuntimeSupport.h"
-#import "GPBAny.pbobjc.h"
-
-// @@protoc_insertion_point(imports)
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-
-#pragma mark - GPBAnyRoot
-
-@implementation GPBAnyRoot
-
-// No extensions in the file and no imports, so no need to generate
-// +extensionRegistry.
-
-@end
-
-#pragma mark - GPBAnyRoot_FileDescriptor
-
-static GPBFileDescriptor *GPBAnyRoot_FileDescriptor(void) {
-  // This is called by +initialize so there is no need to worry
-  // about thread safety of the singleton.
-  static GPBFileDescriptor *descriptor = NULL;
-  if (!descriptor) {
-    GPB_DEBUG_CHECK_RUNTIME_VERSIONS();
-    descriptor = [[GPBFileDescriptor alloc] initWithPackage:@"google.protobuf"
-                                                 objcPrefix:@"GPB"
-                                                     syntax:GPBFileSyntaxProto3];
-  }
-  return descriptor;
-}
-
-#pragma mark - GPBAny
-
-@implementation GPBAny
-
-@dynamic typeURL;
-@dynamic value;
-
-typedef struct GPBAny__storage_ {
-  uint32_t _has_storage_[1];
-  NSString *typeURL;
-  NSData *value;
-} GPBAny__storage_;
-
-// This method is threadsafe because it is initially called
-// in +initialize for each subclass.
-+ (GPBDescriptor *)descriptor {
-  static GPBDescriptor *descriptor = nil;
-  if (!descriptor) {
-    static GPBMessageFieldDescription fields[] = {
-      {
-        .name = "typeURL",
-        .dataTypeSpecific.clazz = Nil,
-        .number = GPBAny_FieldNumber_TypeURL,
-        .hasIndex = 0,
-        .offset = (uint32_t)offsetof(GPBAny__storage_, typeURL),
-        .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldTextFormatNameCustom | GPBFieldClearHasIvarOnZero),
-        .dataType = GPBDataTypeString,
-      },
-      {
-        .name = "value",
-        .dataTypeSpecific.clazz = Nil,
-        .number = GPBAny_FieldNumber_Value,
-        .hasIndex = 1,
-        .offset = (uint32_t)offsetof(GPBAny__storage_, value),
-        .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldClearHasIvarOnZero),
-        .dataType = GPBDataTypeBytes,
-      },
-    };
-    GPBDescriptor *localDescriptor =
-        [GPBDescriptor allocDescriptorForClass:[GPBAny class]
-                                     rootClass:[GPBAnyRoot class]
-                                          file:GPBAnyRoot_FileDescriptor()
-                                        fields:fields
-                                    fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
-                                   storageSize:sizeof(GPBAny__storage_)
-                                         flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown)];
-#if !GPBOBJC_SKIP_MESSAGE_TEXTFORMAT_EXTRAS
-    static const char *extraTextFormatInfo =
-        "\001\001\004\241!!\000";
-    [localDescriptor setupExtraTextInfo:extraTextFormatInfo];
-#endif  // !GPBOBJC_SKIP_MESSAGE_TEXTFORMAT_EXTRAS
-    #if defined(DEBUG) && DEBUG
-      NSAssert(descriptor == nil, @"Startup recursed!");
-    #endif  // DEBUG
-    descriptor = localDescriptor;
-  }
-  return descriptor;
-}
-
-@end
-
-
-#pragma clang diagnostic pop
-
-// @@protoc_insertion_point(global_scope)
diff --git a/libs/protobuf/objectivec/GPBApi.pbobjc.h b/libs/protobuf/objectivec/GPBApi.pbobjc.h
deleted file mode 100644
index 871e908..0000000
--- a/libs/protobuf/objectivec/GPBApi.pbobjc.h
+++ /dev/null
@@ -1,298 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/protobuf/api.proto
-
-#import "GPBDescriptor.h"
-#import "GPBMessage.h"
-#import "GPBRootObject.h"
-#import "GPBSourceContext.pbobjc.h"
-#import "GPBType.pbobjc.h"
-
-#if GOOGLE_PROTOBUF_OBJC_VERSION < 30004
-#error This file was generated by a newer version of protoc which is incompatible with your Protocol Buffer library sources.
-#endif
-#if 30004 < GOOGLE_PROTOBUF_OBJC_MIN_SUPPORTED_VERSION
-#error This file was generated by an older version of protoc which is incompatible with your Protocol Buffer library sources.
-#endif
-
-// @@protoc_insertion_point(imports)
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-
-CF_EXTERN_C_BEGIN
-
-@class GPBMethod;
-@class GPBMixin;
-
-NS_ASSUME_NONNULL_BEGIN
-
-#pragma mark - GPBApiRoot
-
-/**
- * Exposes the extension registry for this file.
- *
- * The base class provides:
- * @code
- *   + (GPBExtensionRegistry *)extensionRegistry;
- * @endcode
- * which is a @c GPBExtensionRegistry that includes all the extensions defined by
- * this file and all files that it depends on.
- **/
-GPB_FINAL @interface GPBApiRoot : GPBRootObject
-@end
-
-#pragma mark - GPBApi
-
-typedef GPB_ENUM(GPBApi_FieldNumber) {
-  GPBApi_FieldNumber_Name = 1,
-  GPBApi_FieldNumber_MethodsArray = 2,
-  GPBApi_FieldNumber_OptionsArray = 3,
-  GPBApi_FieldNumber_Version = 4,
-  GPBApi_FieldNumber_SourceContext = 5,
-  GPBApi_FieldNumber_MixinsArray = 6,
-  GPBApi_FieldNumber_Syntax = 7,
-};
-
-/**
- * Api is a light-weight descriptor for an API Interface.
- *
- * Interfaces are also described as "protocol buffer services" in some contexts,
- * such as by the "service" keyword in a .proto file, but they are different
- * from API Services, which represent a concrete implementation of an interface
- * as opposed to simply a description of methods and bindings. They are also
- * sometimes simply referred to as "APIs" in other contexts, such as the name of
- * this message itself. See https://cloud.google.com/apis/design/glossary for
- * detailed terminology.
- **/
-GPB_FINAL @interface GPBApi : GPBMessage
-
-/**
- * The fully qualified name of this interface, including package name
- * followed by the interface's simple name.
- **/
-@property(nonatomic, readwrite, copy, null_resettable) NSString *name;
-
-/** The methods of this interface, in unspecified order. */
-@property(nonatomic, readwrite, strong, null_resettable) NSMutableArray<GPBMethod*> *methodsArray;
-/** The number of items in @c methodsArray without causing the array to be created. */
-@property(nonatomic, readonly) NSUInteger methodsArray_Count;
-
-/** Any metadata attached to the interface. */
-@property(nonatomic, readwrite, strong, null_resettable) NSMutableArray<GPBOption*> *optionsArray;
-/** The number of items in @c optionsArray without causing the array to be created. */
-@property(nonatomic, readonly) NSUInteger optionsArray_Count;
-
-/**
- * A version string for this interface. If specified, must have the form
- * `major-version.minor-version`, as in `1.10`. If the minor version is
- * omitted, it defaults to zero. If the entire version field is empty, the
- * major version is derived from the package name, as outlined below. If the
- * field is not empty, the version in the package name will be verified to be
- * consistent with what is provided here.
- *
- * The versioning schema uses [semantic
- * versioning](http://semver.org) where the major version number
- * indicates a breaking change and the minor version an additive,
- * non-breaking change. Both version numbers are signals to users
- * what to expect from different versions, and should be carefully
- * chosen based on the product plan.
- *
- * The major version is also reflected in the package name of the
- * interface, which must end in `v<major-version>`, as in
- * `google.feature.v1`. For major versions 0 and 1, the suffix can
- * be omitted. Zero major versions must only be used for
- * experimental, non-GA interfaces.
- **/
-@property(nonatomic, readwrite, copy, null_resettable) NSString *version;
-
-/**
- * Source context for the protocol buffer service represented by this
- * message.
- **/
-@property(nonatomic, readwrite, strong, null_resettable) GPBSourceContext *sourceContext;
-/** Test to see if @c sourceContext has been set. */
-@property(nonatomic, readwrite) BOOL hasSourceContext;
-
-/** Included interfaces. See [Mixin][]. */
-@property(nonatomic, readwrite, strong, null_resettable) NSMutableArray<GPBMixin*> *mixinsArray;
-/** The number of items in @c mixinsArray without causing the array to be created. */
-@property(nonatomic, readonly) NSUInteger mixinsArray_Count;
-
-/** The source syntax of the service. */
-@property(nonatomic, readwrite) enum GPBSyntax syntax;
-
-@end
-
-/**
- * Fetches the raw value of a @c GPBApi's @c syntax property, even
- * if the value was not defined by the enum at the time the code was generated.
- **/
-int32_t GPBApi_Syntax_RawValue(GPBApi *message);
-/**
- * Sets the raw value of an @c GPBApi's @c syntax property, allowing
- * it to be set to a value that was not defined by the enum at the time the code
- * was generated.
- **/
-void SetGPBApi_Syntax_RawValue(GPBApi *message, int32_t value);
-
-#pragma mark - GPBMethod
-
-typedef GPB_ENUM(GPBMethod_FieldNumber) {
-  GPBMethod_FieldNumber_Name = 1,
-  GPBMethod_FieldNumber_RequestTypeURL = 2,
-  GPBMethod_FieldNumber_RequestStreaming = 3,
-  GPBMethod_FieldNumber_ResponseTypeURL = 4,
-  GPBMethod_FieldNumber_ResponseStreaming = 5,
-  GPBMethod_FieldNumber_OptionsArray = 6,
-  GPBMethod_FieldNumber_Syntax = 7,
-};
-
-/**
- * Method represents a method of an API interface.
- **/
-GPB_FINAL @interface GPBMethod : GPBMessage
-
-/** The simple name of this method. */
-@property(nonatomic, readwrite, copy, null_resettable) NSString *name;
-
-/** A URL of the input message type. */
-@property(nonatomic, readwrite, copy, null_resettable) NSString *requestTypeURL;
-
-/** If true, the request is streamed. */
-@property(nonatomic, readwrite) BOOL requestStreaming;
-
-/** The URL of the output message type. */
-@property(nonatomic, readwrite, copy, null_resettable) NSString *responseTypeURL;
-
-/** If true, the response is streamed. */
-@property(nonatomic, readwrite) BOOL responseStreaming;
-
-/** Any metadata attached to the method. */
-@property(nonatomic, readwrite, strong, null_resettable) NSMutableArray<GPBOption*> *optionsArray;
-/** The number of items in @c optionsArray without causing the array to be created. */
-@property(nonatomic, readonly) NSUInteger optionsArray_Count;
-
-/** The source syntax of this method. */
-@property(nonatomic, readwrite) enum GPBSyntax syntax;
-
-@end
-
-/**
- * Fetches the raw value of a @c GPBMethod's @c syntax property, even
- * if the value was not defined by the enum at the time the code was generated.
- **/
-int32_t GPBMethod_Syntax_RawValue(GPBMethod *message);
-/**
- * Sets the raw value of an @c GPBMethod's @c syntax property, allowing
- * it to be set to a value that was not defined by the enum at the time the code
- * was generated.
- **/
-void SetGPBMethod_Syntax_RawValue(GPBMethod *message, int32_t value);
-
-#pragma mark - GPBMixin
-
-typedef GPB_ENUM(GPBMixin_FieldNumber) {
-  GPBMixin_FieldNumber_Name = 1,
-  GPBMixin_FieldNumber_Root = 2,
-};
-
-/**
- * Declares an API Interface to be included in this interface. The including
- * interface must redeclare all the methods from the included interface, but
- * documentation and options are inherited as follows:
- *
- * - If after comment and whitespace stripping, the documentation
- *   string of the redeclared method is empty, it will be inherited
- *   from the original method.
- *
- * - Each annotation belonging to the service config (http,
- *   visibility) which is not set in the redeclared method will be
- *   inherited.
- *
- * - If an http annotation is inherited, the path pattern will be
- *   modified as follows. Any version prefix will be replaced by the
- *   version of the including interface plus the [root][] path if
- *   specified.
- *
- * Example of a simple mixin:
- *
- *     package google.acl.v1;
- *     service AccessControl {
- *       // Get the underlying ACL object.
- *       rpc GetAcl(GetAclRequest) returns (Acl) {
- *         option (google.api.http).get = "/v1/{resource=**}:getAcl";
- *       }
- *     }
- *
- *     package google.storage.v2;
- *     service Storage {
- *       rpc GetAcl(GetAclRequest) returns (Acl);
- *
- *       // Get a data record.
- *       rpc GetData(GetDataRequest) returns (Data) {
- *         option (google.api.http).get = "/v2/{resource=**}";
- *       }
- *     }
- *
- * Example of a mixin configuration:
- *
- *     apis:
- *     - name: google.storage.v2.Storage
- *       mixins:
- *       - name: google.acl.v1.AccessControl
- *
- * The mixin construct implies that all methods in `AccessControl` are
- * also declared with same name and request/response types in
- * `Storage`. A documentation generator or annotation processor will
- * see the effective `Storage.GetAcl` method after inheriting
- * documentation and annotations as follows:
- *
- *     service Storage {
- *       // Get the underlying ACL object.
- *       rpc GetAcl(GetAclRequest) returns (Acl) {
- *         option (google.api.http).get = "/v2/{resource=**}:getAcl";
- *       }
- *       ...
- *     }
- *
- * Note how the version in the path pattern changed from `v1` to `v2`.
- *
- * If the `root` field in the mixin is specified, it should be a
- * relative path under which inherited HTTP paths are placed. Example:
- *
- *     apis:
- *     - name: google.storage.v2.Storage
- *       mixins:
- *       - name: google.acl.v1.AccessControl
- *         root: acls
- *
- * This implies the following inherited HTTP annotation:
- *
- *     service Storage {
- *       // Get the underlying ACL object.
- *       rpc GetAcl(GetAclRequest) returns (Acl) {
- *         option (google.api.http).get = "/v2/acls/{resource=**}:getAcl";
- *       }
- *       ...
- *     }
- **/
-GPB_FINAL @interface GPBMixin : GPBMessage
-
-/** The fully qualified name of the interface which is included. */
-@property(nonatomic, readwrite, copy, null_resettable) NSString *name;
-
-/**
- * If non-empty specifies a path under which inherited HTTP paths
- * are rooted.
- **/
-@property(nonatomic, readwrite, copy, null_resettable) NSString *root;
-
-@end
-
-NS_ASSUME_NONNULL_END
-
-CF_EXTERN_C_END
-
-#pragma clang diagnostic pop
-
-// @@protoc_insertion_point(global_scope)
diff --git a/libs/protobuf/objectivec/GPBApi.pbobjc.m b/libs/protobuf/objectivec/GPBApi.pbobjc.m
deleted file mode 100644
index 7f86a08..0000000
--- a/libs/protobuf/objectivec/GPBApi.pbobjc.m
+++ /dev/null
@@ -1,354 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/protobuf/api.proto
-
-#import "GPBProtocolBuffers_RuntimeSupport.h"
-#import "GPBApi.pbobjc.h"
-
-// @@protoc_insertion_point(imports)
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-#pragma clang diagnostic ignored "-Wdollar-in-identifier-extension"
-
-#pragma mark - Objective C Class declarations
-// Forward declarations of Objective C classes that we can use as
-// static values in struct initializers.
-// We don't use [Foo class] because it is not a static value.
-GPBObjCClassDeclaration(GPBMethod);
-GPBObjCClassDeclaration(GPBMixin);
-GPBObjCClassDeclaration(GPBOption);
-GPBObjCClassDeclaration(GPBSourceContext);
-
-#pragma mark - GPBApiRoot
-
-@implementation GPBApiRoot
-
-// No extensions in the file and none of the imports (direct or indirect)
-// defined extensions, so no need to generate +extensionRegistry.
-
-@end
-
-#pragma mark - GPBApiRoot_FileDescriptor
-
-static GPBFileDescriptor *GPBApiRoot_FileDescriptor(void) {
-  // This is called by +initialize so there is no need to worry
-  // about thread safety of the singleton.
-  static GPBFileDescriptor *descriptor = NULL;
-  if (!descriptor) {
-    GPB_DEBUG_CHECK_RUNTIME_VERSIONS();
-    descriptor = [[GPBFileDescriptor alloc] initWithPackage:@"google.protobuf"
-                                                 objcPrefix:@"GPB"
-                                                     syntax:GPBFileSyntaxProto3];
-  }
-  return descriptor;
-}
-
-#pragma mark - GPBApi
-
-@implementation GPBApi
-
-@dynamic name;
-@dynamic methodsArray, methodsArray_Count;
-@dynamic optionsArray, optionsArray_Count;
-@dynamic version;
-@dynamic hasSourceContext, sourceContext;
-@dynamic mixinsArray, mixinsArray_Count;
-@dynamic syntax;
-
-typedef struct GPBApi__storage_ {
-  uint32_t _has_storage_[1];
-  GPBSyntax syntax;
-  NSString *name;
-  NSMutableArray *methodsArray;
-  NSMutableArray *optionsArray;
-  NSString *version;
-  GPBSourceContext *sourceContext;
-  NSMutableArray *mixinsArray;
-} GPBApi__storage_;
-
-// This method is threadsafe because it is initially called
-// in +initialize for each subclass.
-+ (GPBDescriptor *)descriptor {
-  static GPBDescriptor *descriptor = nil;
-  if (!descriptor) {
-    static GPBMessageFieldDescription fields[] = {
-      {
-        .name = "name",
-        .dataTypeSpecific.clazz = Nil,
-        .number = GPBApi_FieldNumber_Name,
-        .hasIndex = 0,
-        .offset = (uint32_t)offsetof(GPBApi__storage_, name),
-        .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldClearHasIvarOnZero),
-        .dataType = GPBDataTypeString,
-      },
-      {
-        .name = "methodsArray",
-        .dataTypeSpecific.clazz = GPBObjCClass(GPBMethod),
-        .number = GPBApi_FieldNumber_MethodsArray,
-        .hasIndex = GPBNoHasBit,
-        .offset = (uint32_t)offsetof(GPBApi__storage_, methodsArray),
-        .flags = GPBFieldRepeated,
-        .dataType = GPBDataTypeMessage,
-      },
-      {
-        .name = "optionsArray",
-        .dataTypeSpecific.clazz = GPBObjCClass(GPBOption),
-        .number = GPBApi_FieldNumber_OptionsArray,
-        .hasIndex = GPBNoHasBit,
-        .offset = (uint32_t)offsetof(GPBApi__storage_, optionsArray),
-        .flags = GPBFieldRepeated,
-        .dataType = GPBDataTypeMessage,
-      },
-      {
-        .name = "version",
-        .dataTypeSpecific.clazz = Nil,
-        .number = GPBApi_FieldNumber_Version,
-        .hasIndex = 1,
-        .offset = (uint32_t)offsetof(GPBApi__storage_, version),
-        .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldClearHasIvarOnZero),
-        .dataType = GPBDataTypeString,
-      },
-      {
-        .name = "sourceContext",
-        .dataTypeSpecific.clazz = GPBObjCClass(GPBSourceContext),
-        .number = GPBApi_FieldNumber_SourceContext,
-        .hasIndex = 2,
-        .offset = (uint32_t)offsetof(GPBApi__storage_, sourceContext),
-        .flags = GPBFieldOptional,
-        .dataType = GPBDataTypeMessage,
-      },
-      {
-        .name = "mixinsArray",
-        .dataTypeSpecific.clazz = GPBObjCClass(GPBMixin),
-        .number = GPBApi_FieldNumber_MixinsArray,
-        .hasIndex = GPBNoHasBit,
-        .offset = (uint32_t)offsetof(GPBApi__storage_, mixinsArray),
-        .flags = GPBFieldRepeated,
-        .dataType = GPBDataTypeMessage,
-      },
-      {
-        .name = "syntax",
-        .dataTypeSpecific.enumDescFunc = GPBSyntax_EnumDescriptor,
-        .number = GPBApi_FieldNumber_Syntax,
-        .hasIndex = 3,
-        .offset = (uint32_t)offsetof(GPBApi__storage_, syntax),
-        .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldHasEnumDescriptor | GPBFieldClearHasIvarOnZero),
-        .dataType = GPBDataTypeEnum,
-      },
-    };
-    GPBDescriptor *localDescriptor =
-        [GPBDescriptor allocDescriptorForClass:[GPBApi class]
-                                     rootClass:[GPBApiRoot class]
-                                          file:GPBApiRoot_FileDescriptor()
-                                        fields:fields
-                                    fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
-                                   storageSize:sizeof(GPBApi__storage_)
-                                         flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown)];
-    #if defined(DEBUG) && DEBUG
-      NSAssert(descriptor == nil, @"Startup recursed!");
-    #endif  // DEBUG
-    descriptor = localDescriptor;
-  }
-  return descriptor;
-}
-
-@end
-
-int32_t GPBApi_Syntax_RawValue(GPBApi *message) {
-  GPBDescriptor *descriptor = [GPBApi descriptor];
-  GPBFieldDescriptor *field = [descriptor fieldWithNumber:GPBApi_FieldNumber_Syntax];
-  return GPBGetMessageRawEnumField(message, field);
-}
-
-void SetGPBApi_Syntax_RawValue(GPBApi *message, int32_t value) {
-  GPBDescriptor *descriptor = [GPBApi descriptor];
-  GPBFieldDescriptor *field = [descriptor fieldWithNumber:GPBApi_FieldNumber_Syntax];
-  GPBSetMessageRawEnumField(message, field, value);
-}
-
-#pragma mark - GPBMethod
-
-@implementation GPBMethod
-
-@dynamic name;
-@dynamic requestTypeURL;
-@dynamic requestStreaming;
-@dynamic responseTypeURL;
-@dynamic responseStreaming;
-@dynamic optionsArray, optionsArray_Count;
-@dynamic syntax;
-
-typedef struct GPBMethod__storage_ {
-  uint32_t _has_storage_[1];
-  GPBSyntax syntax;
-  NSString *name;
-  NSString *requestTypeURL;
-  NSString *responseTypeURL;
-  NSMutableArray *optionsArray;
-} GPBMethod__storage_;
-
-// This method is threadsafe because it is initially called
-// in +initialize for each subclass.
-+ (GPBDescriptor *)descriptor {
-  static GPBDescriptor *descriptor = nil;
-  if (!descriptor) {
-    static GPBMessageFieldDescription fields[] = {
-      {
-        .name = "name",
-        .dataTypeSpecific.clazz = Nil,
-        .number = GPBMethod_FieldNumber_Name,
-        .hasIndex = 0,
-        .offset = (uint32_t)offsetof(GPBMethod__storage_, name),
-        .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldClearHasIvarOnZero),
-        .dataType = GPBDataTypeString,
-      },
-      {
-        .name = "requestTypeURL",
-        .dataTypeSpecific.clazz = Nil,
-        .number = GPBMethod_FieldNumber_RequestTypeURL,
-        .hasIndex = 1,
-        .offset = (uint32_t)offsetof(GPBMethod__storage_, requestTypeURL),
-        .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldTextFormatNameCustom | GPBFieldClearHasIvarOnZero),
-        .dataType = GPBDataTypeString,
-      },
-      {
-        .name = "requestStreaming",
-        .dataTypeSpecific.clazz = Nil,
-        .number = GPBMethod_FieldNumber_RequestStreaming,
-        .hasIndex = 2,
-        .offset = 3,  // Stored in _has_storage_ to save space.
-        .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldClearHasIvarOnZero),
-        .dataType = GPBDataTypeBool,
-      },
-      {
-        .name = "responseTypeURL",
-        .dataTypeSpecific.clazz = Nil,
-        .number = GPBMethod_FieldNumber_ResponseTypeURL,
-        .hasIndex = 4,
-        .offset = (uint32_t)offsetof(GPBMethod__storage_, responseTypeURL),
-        .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldTextFormatNameCustom | GPBFieldClearHasIvarOnZero),
-        .dataType = GPBDataTypeString,
-      },
-      {
-        .name = "responseStreaming",
-        .dataTypeSpecific.clazz = Nil,
-        .number = GPBMethod_FieldNumber_ResponseStreaming,
-        .hasIndex = 5,
-        .offset = 6,  // Stored in _has_storage_ to save space.
-        .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldClearHasIvarOnZero),
-        .dataType = GPBDataTypeBool,
-      },
-      {
-        .name = "optionsArray",
-        .dataTypeSpecific.clazz = GPBObjCClass(GPBOption),
-        .number = GPBMethod_FieldNumber_OptionsArray,
-        .hasIndex = GPBNoHasBit,
-        .offset = (uint32_t)offsetof(GPBMethod__storage_, optionsArray),
-        .flags = GPBFieldRepeated,
-        .dataType = GPBDataTypeMessage,
-      },
-      {
-        .name = "syntax",
-        .dataTypeSpecific.enumDescFunc = GPBSyntax_EnumDescriptor,
-        .number = GPBMethod_FieldNumber_Syntax,
-        .hasIndex = 7,
-        .offset = (uint32_t)offsetof(GPBMethod__storage_, syntax),
-        .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldHasEnumDescriptor | GPBFieldClearHasIvarOnZero),
-        .dataType = GPBDataTypeEnum,
-      },
-    };
-    GPBDescriptor *localDescriptor =
-        [GPBDescriptor allocDescriptorForClass:[GPBMethod class]
-                                     rootClass:[GPBApiRoot class]
-                                          file:GPBApiRoot_FileDescriptor()
-                                        fields:fields
-                                    fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
-                                   storageSize:sizeof(GPBMethod__storage_)
-                                         flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown)];
-#if !GPBOBJC_SKIP_MESSAGE_TEXTFORMAT_EXTRAS
-    static const char *extraTextFormatInfo =
-        "\002\002\007\244\241!!\000\004\010\244\241!!\000";
-    [localDescriptor setupExtraTextInfo:extraTextFormatInfo];
-#endif  // !GPBOBJC_SKIP_MESSAGE_TEXTFORMAT_EXTRAS
-    #if defined(DEBUG) && DEBUG
-      NSAssert(descriptor == nil, @"Startup recursed!");
-    #endif  // DEBUG
-    descriptor = localDescriptor;
-  }
-  return descriptor;
-}
-
-@end
-
-int32_t GPBMethod_Syntax_RawValue(GPBMethod *message) {
-  GPBDescriptor *descriptor = [GPBMethod descriptor];
-  GPBFieldDescriptor *field = [descriptor fieldWithNumber:GPBMethod_FieldNumber_Syntax];
-  return GPBGetMessageRawEnumField(message, field);
-}
-
-void SetGPBMethod_Syntax_RawValue(GPBMethod *message, int32_t value) {
-  GPBDescriptor *descriptor = [GPBMethod descriptor];
-  GPBFieldDescriptor *field = [descriptor fieldWithNumber:GPBMethod_FieldNumber_Syntax];
-  GPBSetMessageRawEnumField(message, field, value);
-}
-
-#pragma mark - GPBMixin
-
-@implementation GPBMixin
-
-@dynamic name;
-@dynamic root;
-
-typedef struct GPBMixin__storage_ {
-  uint32_t _has_storage_[1];
-  NSString *name;
-  NSString *root;
-} GPBMixin__storage_;
-
-// This method is threadsafe because it is initially called
-// in +initialize for each subclass.
-+ (GPBDescriptor *)descriptor {
-  static GPBDescriptor *descriptor = nil;
-  if (!descriptor) {
-    static GPBMessageFieldDescription fields[] = {
-      {
-        .name = "name",
-        .dataTypeSpecific.clazz = Nil,
-        .number = GPBMixin_FieldNumber_Name,
-        .hasIndex = 0,
-        .offset = (uint32_t)offsetof(GPBMixin__storage_, name),
-        .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldClearHasIvarOnZero),
-        .dataType = GPBDataTypeString,
-      },
-      {
-        .name = "root",
-        .dataTypeSpecific.clazz = Nil,
-        .number = GPBMixin_FieldNumber_Root,
-        .hasIndex = 1,
-        .offset = (uint32_t)offsetof(GPBMixin__storage_, root),
-        .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldClearHasIvarOnZero),
-        .dataType = GPBDataTypeString,
-      },
-    };
-    GPBDescriptor *localDescriptor =
-        [GPBDescriptor allocDescriptorForClass:[GPBMixin class]
-                                     rootClass:[GPBApiRoot class]
-                                          file:GPBApiRoot_FileDescriptor()
-                                        fields:fields
-                                    fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
-                                   storageSize:sizeof(GPBMixin__storage_)
-                                         flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown)];
-    #if defined(DEBUG) && DEBUG
-      NSAssert(descriptor == nil, @"Startup recursed!");
-    #endif  // DEBUG
-    descriptor = localDescriptor;
-  }
-  return descriptor;
-}
-
-@end
-
-
-#pragma clang diagnostic pop
-
-// @@protoc_insertion_point(global_scope)
diff --git a/libs/protobuf/objectivec/GPBArray.h b/libs/protobuf/objectivec/GPBArray.h
deleted file mode 100644
index 5aea75c..0000000
--- a/libs/protobuf/objectivec/GPBArray.h
+++ /dev/null
@@ -1,1969 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#import <Foundation/Foundation.h>
-
-#import "GPBRuntimeTypes.h"
-
-NS_ASSUME_NONNULL_BEGIN
-
-//%PDDM-EXPAND DECLARE_ARRAYS()
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-#pragma mark - Int32
-
-/**
- * Class used for repeated fields of int32_t values. This performs better than
- * boxing into NSNumbers in NSArrays.
- *
- * @note This class is not meant to be subclassed.
- **/
-@interface GPBInt32Array : NSObject <NSCopying>
-
-/** The number of elements contained in the array. */
-@property(nonatomic, readonly) NSUInteger count;
-
-/**
- * @return A newly instanced and empty GPBInt32Array.
- **/
-+ (instancetype)array;
-
-/**
- * Creates and initializes a GPBInt32Array with the single element given.
- *
- * @param value The value to be placed in the array.
- *
- * @return A newly instanced GPBInt32Array with value in it.
- **/
-+ (instancetype)arrayWithValue:(int32_t)value;
-
-/**
- * Creates and initializes a GPBInt32Array with the contents of the given
- * array.
- *
- * @param array Array with the contents to be put into the new array.
- *
- * @return A newly instanced GPBInt32Array with the contents of array.
- **/
-+ (instancetype)arrayWithValueArray:(GPBInt32Array *)array;
-
-/**
- * Creates and initializes a GPBInt32Array with the given capacity.
- *
- * @param count The capacity needed for the array.
- *
- * @return A newly instanced GPBInt32Array with a capacity of count.
- **/
-+ (instancetype)arrayWithCapacity:(NSUInteger)count;
-
-/**
- * @return A newly initialized and empty GPBInt32Array.
- **/
-- (instancetype)init NS_DESIGNATED_INITIALIZER;
-
-/**
- * Initializes the array, copying the given values.
- *
- * @param values An array with the values to put inside this array.
- * @param count  The number of elements to copy into the array.
- *
- * @return A newly initialized GPBInt32Array with a copy of the values.
- **/
-- (instancetype)initWithValues:(const int32_t [__nullable])values
-                         count:(NSUInteger)count;
-
-/**
- * Initializes the array, copying the given values.
- *
- * @param array An array with the values to put inside this array.
- *
- * @return A newly initialized GPBInt32Array with a copy of the values.
- **/
-- (instancetype)initWithValueArray:(GPBInt32Array *)array;
-
-/**
- * Initializes the array with the given capacity.
- *
- * @param count The capacity needed for the array.
- *
- * @return A newly initialized GPBInt32Array with a capacity of count.
- **/
-- (instancetype)initWithCapacity:(NSUInteger)count;
-
-/**
- * Gets the value at the given index.
- *
- * @param index The index of the value to get.
- *
- * @return The value at the given index.
- **/
-- (int32_t)valueAtIndex:(NSUInteger)index;
-
-/**
- * Enumerates the values on this array with the given block.
- *
- * @param block The block to enumerate with.
- *   **value**: The current value being enumerated.
- *   **idx**:   The index of the current value.
- *   **stop**:  A pointer to a boolean that when set stops the enumeration.
- **/
-- (void)enumerateValuesWithBlock:(void (NS_NOESCAPE ^)(int32_t value, NSUInteger idx, BOOL *stop))block;
-
-/**
- * Enumerates the values on this array with the given block.
- *
- * @param opts  Options to control the enumeration.
- * @param block The block to enumerate with.
- *   **value**: The current value being enumerated.
- *   **idx**:   The index of the current value.
- *   **stop**:  A pointer to a boolean that when set stops the enumeration.
- **/
-- (void)enumerateValuesWithOptions:(NSEnumerationOptions)opts
-                        usingBlock:(void (NS_NOESCAPE ^)(int32_t value, NSUInteger idx, BOOL *stop))block;
-
-/**
- * Adds a value to this array.
- *
- * @param value The value to add to this array.
- **/
-- (void)addValue:(int32_t)value;
-
-/**
- * Adds values to this array.
- *
- * @param values The values to add to this array.
- * @param count  The number of elements to add.
- **/
-- (void)addValues:(const int32_t [__nullable])values count:(NSUInteger)count;
-
-/**
- * Adds the values from the given array to this array.
- *
- * @param array The array containing the elements to add to this array.
- **/
-- (void)addValuesFromArray:(GPBInt32Array *)array;
-
-/**
- * Inserts a value into the given position.
- *
- * @param value The value to add to this array.
- * @param index The index into which to insert the value.
- **/
-- (void)insertValue:(int32_t)value atIndex:(NSUInteger)index;
-
-/**
- * Replaces the value at the given index with the given value.
- *
- * @param index The index for which to replace the value.
- * @param value The value to replace with.
- **/
-- (void)replaceValueAtIndex:(NSUInteger)index withValue:(int32_t)value;
-
-/**
- * Removes the value at the given index.
- *
- * @param index The index of the value to remove.
- **/
-- (void)removeValueAtIndex:(NSUInteger)index;
-
-/**
- * Removes all the values from this array.
- **/
-- (void)removeAll;
-
-/**
- * Exchanges the values between the given indexes.
- *
- * @param idx1 The index of the first element to exchange.
- * @param idx2 The index of the second element to exchange.
- **/
-- (void)exchangeValueAtIndex:(NSUInteger)idx1
-            withValueAtIndex:(NSUInteger)idx2;
-
-@end
-
-#pragma mark - UInt32
-
-/**
- * Class used for repeated fields of uint32_t values. This performs better than
- * boxing into NSNumbers in NSArrays.
- *
- * @note This class is not meant to be subclassed.
- **/
-@interface GPBUInt32Array : NSObject <NSCopying>
-
-/** The number of elements contained in the array. */
-@property(nonatomic, readonly) NSUInteger count;
-
-/**
- * @return A newly instanced and empty GPBUInt32Array.
- **/
-+ (instancetype)array;
-
-/**
- * Creates and initializes a GPBUInt32Array with the single element given.
- *
- * @param value The value to be placed in the array.
- *
- * @return A newly instanced GPBUInt32Array with value in it.
- **/
-+ (instancetype)arrayWithValue:(uint32_t)value;
-
-/**
- * Creates and initializes a GPBUInt32Array with the contents of the given
- * array.
- *
- * @param array Array with the contents to be put into the new array.
- *
- * @return A newly instanced GPBUInt32Array with the contents of array.
- **/
-+ (instancetype)arrayWithValueArray:(GPBUInt32Array *)array;
-
-/**
- * Creates and initializes a GPBUInt32Array with the given capacity.
- *
- * @param count The capacity needed for the array.
- *
- * @return A newly instanced GPBUInt32Array with a capacity of count.
- **/
-+ (instancetype)arrayWithCapacity:(NSUInteger)count;
-
-/**
- * @return A newly initialized and empty GPBUInt32Array.
- **/
-- (instancetype)init NS_DESIGNATED_INITIALIZER;
-
-/**
- * Initializes the array, copying the given values.
- *
- * @param values An array with the values to put inside this array.
- * @param count  The number of elements to copy into the array.
- *
- * @return A newly initialized GPBUInt32Array with a copy of the values.
- **/
-- (instancetype)initWithValues:(const uint32_t [__nullable])values
-                         count:(NSUInteger)count;
-
-/**
- * Initializes the array, copying the given values.
- *
- * @param array An array with the values to put inside this array.
- *
- * @return A newly initialized GPBUInt32Array with a copy of the values.
- **/
-- (instancetype)initWithValueArray:(GPBUInt32Array *)array;
-
-/**
- * Initializes the array with the given capacity.
- *
- * @param count The capacity needed for the array.
- *
- * @return A newly initialized GPBUInt32Array with a capacity of count.
- **/
-- (instancetype)initWithCapacity:(NSUInteger)count;
-
-/**
- * Gets the value at the given index.
- *
- * @param index The index of the value to get.
- *
- * @return The value at the given index.
- **/
-- (uint32_t)valueAtIndex:(NSUInteger)index;
-
-/**
- * Enumerates the values on this array with the given block.
- *
- * @param block The block to enumerate with.
- *   **value**: The current value being enumerated.
- *   **idx**:   The index of the current value.
- *   **stop**:  A pointer to a boolean that when set stops the enumeration.
- **/
-- (void)enumerateValuesWithBlock:(void (NS_NOESCAPE ^)(uint32_t value, NSUInteger idx, BOOL *stop))block;
-
-/**
- * Enumerates the values on this array with the given block.
- *
- * @param opts  Options to control the enumeration.
- * @param block The block to enumerate with.
- *   **value**: The current value being enumerated.
- *   **idx**:   The index of the current value.
- *   **stop**:  A pointer to a boolean that when set stops the enumeration.
- **/
-- (void)enumerateValuesWithOptions:(NSEnumerationOptions)opts
-                        usingBlock:(void (NS_NOESCAPE ^)(uint32_t value, NSUInteger idx, BOOL *stop))block;
-
-/**
- * Adds a value to this array.
- *
- * @param value The value to add to this array.
- **/
-- (void)addValue:(uint32_t)value;
-
-/**
- * Adds values to this array.
- *
- * @param values The values to add to this array.
- * @param count  The number of elements to add.
- **/
-- (void)addValues:(const uint32_t [__nullable])values count:(NSUInteger)count;
-
-/**
- * Adds the values from the given array to this array.
- *
- * @param array The array containing the elements to add to this array.
- **/
-- (void)addValuesFromArray:(GPBUInt32Array *)array;
-
-/**
- * Inserts a value into the given position.
- *
- * @param value The value to add to this array.
- * @param index The index into which to insert the value.
- **/
-- (void)insertValue:(uint32_t)value atIndex:(NSUInteger)index;
-
-/**
- * Replaces the value at the given index with the given value.
- *
- * @param index The index for which to replace the value.
- * @param value The value to replace with.
- **/
-- (void)replaceValueAtIndex:(NSUInteger)index withValue:(uint32_t)value;
-
-/**
- * Removes the value at the given index.
- *
- * @param index The index of the value to remove.
- **/
-- (void)removeValueAtIndex:(NSUInteger)index;
-
-/**
- * Removes all the values from this array.
- **/
-- (void)removeAll;
-
-/**
- * Exchanges the values between the given indexes.
- *
- * @param idx1 The index of the first element to exchange.
- * @param idx2 The index of the second element to exchange.
- **/
-- (void)exchangeValueAtIndex:(NSUInteger)idx1
-            withValueAtIndex:(NSUInteger)idx2;
-
-@end
-
-#pragma mark - Int64
-
-/**
- * Class used for repeated fields of int64_t values. This performs better than
- * boxing into NSNumbers in NSArrays.
- *
- * @note This class is not meant to be subclassed.
- **/
-@interface GPBInt64Array : NSObject <NSCopying>
-
-/** The number of elements contained in the array. */
-@property(nonatomic, readonly) NSUInteger count;
-
-/**
- * @return A newly instanced and empty GPBInt64Array.
- **/
-+ (instancetype)array;
-
-/**
- * Creates and initializes a GPBInt64Array with the single element given.
- *
- * @param value The value to be placed in the array.
- *
- * @return A newly instanced GPBInt64Array with value in it.
- **/
-+ (instancetype)arrayWithValue:(int64_t)value;
-
-/**
- * Creates and initializes a GPBInt64Array with the contents of the given
- * array.
- *
- * @param array Array with the contents to be put into the new array.
- *
- * @return A newly instanced GPBInt64Array with the contents of array.
- **/
-+ (instancetype)arrayWithValueArray:(GPBInt64Array *)array;
-
-/**
- * Creates and initializes a GPBInt64Array with the given capacity.
- *
- * @param count The capacity needed for the array.
- *
- * @return A newly instanced GPBInt64Array with a capacity of count.
- **/
-+ (instancetype)arrayWithCapacity:(NSUInteger)count;
-
-/**
- * @return A newly initialized and empty GPBInt64Array.
- **/
-- (instancetype)init NS_DESIGNATED_INITIALIZER;
-
-/**
- * Initializes the array, copying the given values.
- *
- * @param values An array with the values to put inside this array.
- * @param count  The number of elements to copy into the array.
- *
- * @return A newly initialized GPBInt64Array with a copy of the values.
- **/
-- (instancetype)initWithValues:(const int64_t [__nullable])values
-                         count:(NSUInteger)count;
-
-/**
- * Initializes the array, copying the given values.
- *
- * @param array An array with the values to put inside this array.
- *
- * @return A newly initialized GPBInt64Array with a copy of the values.
- **/
-- (instancetype)initWithValueArray:(GPBInt64Array *)array;
-
-/**
- * Initializes the array with the given capacity.
- *
- * @param count The capacity needed for the array.
- *
- * @return A newly initialized GPBInt64Array with a capacity of count.
- **/
-- (instancetype)initWithCapacity:(NSUInteger)count;
-
-/**
- * Gets the value at the given index.
- *
- * @param index The index of the value to get.
- *
- * @return The value at the given index.
- **/
-- (int64_t)valueAtIndex:(NSUInteger)index;
-
-/**
- * Enumerates the values on this array with the given block.
- *
- * @param block The block to enumerate with.
- *   **value**: The current value being enumerated.
- *   **idx**:   The index of the current value.
- *   **stop**:  A pointer to a boolean that when set stops the enumeration.
- **/
-- (void)enumerateValuesWithBlock:(void (NS_NOESCAPE ^)(int64_t value, NSUInteger idx, BOOL *stop))block;
-
-/**
- * Enumerates the values on this array with the given block.
- *
- * @param opts  Options to control the enumeration.
- * @param block The block to enumerate with.
- *   **value**: The current value being enumerated.
- *   **idx**:   The index of the current value.
- *   **stop**:  A pointer to a boolean that when set stops the enumeration.
- **/
-- (void)enumerateValuesWithOptions:(NSEnumerationOptions)opts
-                        usingBlock:(void (NS_NOESCAPE ^)(int64_t value, NSUInteger idx, BOOL *stop))block;
-
-/**
- * Adds a value to this array.
- *
- * @param value The value to add to this array.
- **/
-- (void)addValue:(int64_t)value;
-
-/**
- * Adds values to this array.
- *
- * @param values The values to add to this array.
- * @param count  The number of elements to add.
- **/
-- (void)addValues:(const int64_t [__nullable])values count:(NSUInteger)count;
-
-/**
- * Adds the values from the given array to this array.
- *
- * @param array The array containing the elements to add to this array.
- **/
-- (void)addValuesFromArray:(GPBInt64Array *)array;
-
-/**
- * Inserts a value into the given position.
- *
- * @param value The value to add to this array.
- * @param index The index into which to insert the value.
- **/
-- (void)insertValue:(int64_t)value atIndex:(NSUInteger)index;
-
-/**
- * Replaces the value at the given index with the given value.
- *
- * @param index The index for which to replace the value.
- * @param value The value to replace with.
- **/
-- (void)replaceValueAtIndex:(NSUInteger)index withValue:(int64_t)value;
-
-/**
- * Removes the value at the given index.
- *
- * @param index The index of the value to remove.
- **/
-- (void)removeValueAtIndex:(NSUInteger)index;
-
-/**
- * Removes all the values from this array.
- **/
-- (void)removeAll;
-
-/**
- * Exchanges the values between the given indexes.
- *
- * @param idx1 The index of the first element to exchange.
- * @param idx2 The index of the second element to exchange.
- **/
-- (void)exchangeValueAtIndex:(NSUInteger)idx1
-            withValueAtIndex:(NSUInteger)idx2;
-
-@end
-
-#pragma mark - UInt64
-
-/**
- * Class used for repeated fields of uint64_t values. This performs better than
- * boxing into NSNumbers in NSArrays.
- *
- * @note This class is not meant to be subclassed.
- **/
-@interface GPBUInt64Array : NSObject <NSCopying>
-
-/** The number of elements contained in the array. */
-@property(nonatomic, readonly) NSUInteger count;
-
-/**
- * @return A newly instanced and empty GPBUInt64Array.
- **/
-+ (instancetype)array;
-
-/**
- * Creates and initializes a GPBUInt64Array with the single element given.
- *
- * @param value The value to be placed in the array.
- *
- * @return A newly instanced GPBUInt64Array with value in it.
- **/
-+ (instancetype)arrayWithValue:(uint64_t)value;
-
-/**
- * Creates and initializes a GPBUInt64Array with the contents of the given
- * array.
- *
- * @param array Array with the contents to be put into the new array.
- *
- * @return A newly instanced GPBUInt64Array with the contents of array.
- **/
-+ (instancetype)arrayWithValueArray:(GPBUInt64Array *)array;
-
-/**
- * Creates and initializes a GPBUInt64Array with the given capacity.
- *
- * @param count The capacity needed for the array.
- *
- * @return A newly instanced GPBUInt64Array with a capacity of count.
- **/
-+ (instancetype)arrayWithCapacity:(NSUInteger)count;
-
-/**
- * @return A newly initialized and empty GPBUInt64Array.
- **/
-- (instancetype)init NS_DESIGNATED_INITIALIZER;
-
-/**
- * Initializes the array, copying the given values.
- *
- * @param values An array with the values to put inside this array.
- * @param count  The number of elements to copy into the array.
- *
- * @return A newly initialized GPBUInt64Array with a copy of the values.
- **/
-- (instancetype)initWithValues:(const uint64_t [__nullable])values
-                         count:(NSUInteger)count;
-
-/**
- * Initializes the array, copying the given values.
- *
- * @param array An array with the values to put inside this array.
- *
- * @return A newly initialized GPBUInt64Array with a copy of the values.
- **/
-- (instancetype)initWithValueArray:(GPBUInt64Array *)array;
-
-/**
- * Initializes the array with the given capacity.
- *
- * @param count The capacity needed for the array.
- *
- * @return A newly initialized GPBUInt64Array with a capacity of count.
- **/
-- (instancetype)initWithCapacity:(NSUInteger)count;
-
-/**
- * Gets the value at the given index.
- *
- * @param index The index of the value to get.
- *
- * @return The value at the given index.
- **/
-- (uint64_t)valueAtIndex:(NSUInteger)index;
-
-/**
- * Enumerates the values on this array with the given block.
- *
- * @param block The block to enumerate with.
- *   **value**: The current value being enumerated.
- *   **idx**:   The index of the current value.
- *   **stop**:  A pointer to a boolean that when set stops the enumeration.
- **/
-- (void)enumerateValuesWithBlock:(void (NS_NOESCAPE ^)(uint64_t value, NSUInteger idx, BOOL *stop))block;
-
-/**
- * Enumerates the values on this array with the given block.
- *
- * @param opts  Options to control the enumeration.
- * @param block The block to enumerate with.
- *   **value**: The current value being enumerated.
- *   **idx**:   The index of the current value.
- *   **stop**:  A pointer to a boolean that when set stops the enumeration.
- **/
-- (void)enumerateValuesWithOptions:(NSEnumerationOptions)opts
-                        usingBlock:(void (NS_NOESCAPE ^)(uint64_t value, NSUInteger idx, BOOL *stop))block;
-
-/**
- * Adds a value to this array.
- *
- * @param value The value to add to this array.
- **/
-- (void)addValue:(uint64_t)value;
-
-/**
- * Adds values to this array.
- *
- * @param values The values to add to this array.
- * @param count  The number of elements to add.
- **/
-- (void)addValues:(const uint64_t [__nullable])values count:(NSUInteger)count;
-
-/**
- * Adds the values from the given array to this array.
- *
- * @param array The array containing the elements to add to this array.
- **/
-- (void)addValuesFromArray:(GPBUInt64Array *)array;
-
-/**
- * Inserts a value into the given position.
- *
- * @param value The value to add to this array.
- * @param index The index into which to insert the value.
- **/
-- (void)insertValue:(uint64_t)value atIndex:(NSUInteger)index;
-
-/**
- * Replaces the value at the given index with the given value.
- *
- * @param index The index for which to replace the value.
- * @param value The value to replace with.
- **/
-- (void)replaceValueAtIndex:(NSUInteger)index withValue:(uint64_t)value;
-
-/**
- * Removes the value at the given index.
- *
- * @param index The index of the value to remove.
- **/
-- (void)removeValueAtIndex:(NSUInteger)index;
-
-/**
- * Removes all the values from this array.
- **/
-- (void)removeAll;
-
-/**
- * Exchanges the values between the given indexes.
- *
- * @param idx1 The index of the first element to exchange.
- * @param idx2 The index of the second element to exchange.
- **/
-- (void)exchangeValueAtIndex:(NSUInteger)idx1
-            withValueAtIndex:(NSUInteger)idx2;
-
-@end
-
-#pragma mark - Float
-
-/**
- * Class used for repeated fields of float values. This performs better than
- * boxing into NSNumbers in NSArrays.
- *
- * @note This class is not meant to be subclassed.
- **/
-@interface GPBFloatArray : NSObject <NSCopying>
-
-/** The number of elements contained in the array. */
-@property(nonatomic, readonly) NSUInteger count;
-
-/**
- * @return A newly instanced and empty GPBFloatArray.
- **/
-+ (instancetype)array;
-
-/**
- * Creates and initializes a GPBFloatArray with the single element given.
- *
- * @param value The value to be placed in the array.
- *
- * @return A newly instanced GPBFloatArray with value in it.
- **/
-+ (instancetype)arrayWithValue:(float)value;
-
-/**
- * Creates and initializes a GPBFloatArray with the contents of the given
- * array.
- *
- * @param array Array with the contents to be put into the new array.
- *
- * @return A newly instanced GPBFloatArray with the contents of array.
- **/
-+ (instancetype)arrayWithValueArray:(GPBFloatArray *)array;
-
-/**
- * Creates and initializes a GPBFloatArray with the given capacity.
- *
- * @param count The capacity needed for the array.
- *
- * @return A newly instanced GPBFloatArray with a capacity of count.
- **/
-+ (instancetype)arrayWithCapacity:(NSUInteger)count;
-
-/**
- * @return A newly initialized and empty GPBFloatArray.
- **/
-- (instancetype)init NS_DESIGNATED_INITIALIZER;
-
-/**
- * Initializes the array, copying the given values.
- *
- * @param values An array with the values to put inside this array.
- * @param count  The number of elements to copy into the array.
- *
- * @return A newly initialized GPBFloatArray with a copy of the values.
- **/
-- (instancetype)initWithValues:(const float [__nullable])values
-                         count:(NSUInteger)count;
-
-/**
- * Initializes the array, copying the given values.
- *
- * @param array An array with the values to put inside this array.
- *
- * @return A newly initialized GPBFloatArray with a copy of the values.
- **/
-- (instancetype)initWithValueArray:(GPBFloatArray *)array;
-
-/**
- * Initializes the array with the given capacity.
- *
- * @param count The capacity needed for the array.
- *
- * @return A newly initialized GPBFloatArray with a capacity of count.
- **/
-- (instancetype)initWithCapacity:(NSUInteger)count;
-
-/**
- * Gets the value at the given index.
- *
- * @param index The index of the value to get.
- *
- * @return The value at the given index.
- **/
-- (float)valueAtIndex:(NSUInteger)index;
-
-/**
- * Enumerates the values on this array with the given block.
- *
- * @param block The block to enumerate with.
- *   **value**: The current value being enumerated.
- *   **idx**:   The index of the current value.
- *   **stop**:  A pointer to a boolean that when set stops the enumeration.
- **/
-- (void)enumerateValuesWithBlock:(void (NS_NOESCAPE ^)(float value, NSUInteger idx, BOOL *stop))block;
-
-/**
- * Enumerates the values on this array with the given block.
- *
- * @param opts  Options to control the enumeration.
- * @param block The block to enumerate with.
- *   **value**: The current value being enumerated.
- *   **idx**:   The index of the current value.
- *   **stop**:  A pointer to a boolean that when set stops the enumeration.
- **/
-- (void)enumerateValuesWithOptions:(NSEnumerationOptions)opts
-                        usingBlock:(void (NS_NOESCAPE ^)(float value, NSUInteger idx, BOOL *stop))block;
-
-/**
- * Adds a value to this array.
- *
- * @param value The value to add to this array.
- **/
-- (void)addValue:(float)value;
-
-/**
- * Adds values to this array.
- *
- * @param values The values to add to this array.
- * @param count  The number of elements to add.
- **/
-- (void)addValues:(const float [__nullable])values count:(NSUInteger)count;
-
-/**
- * Adds the values from the given array to this array.
- *
- * @param array The array containing the elements to add to this array.
- **/
-- (void)addValuesFromArray:(GPBFloatArray *)array;
-
-/**
- * Inserts a value into the given position.
- *
- * @param value The value to add to this array.
- * @param index The index into which to insert the value.
- **/
-- (void)insertValue:(float)value atIndex:(NSUInteger)index;
-
-/**
- * Replaces the value at the given index with the given value.
- *
- * @param index The index for which to replace the value.
- * @param value The value to replace with.
- **/
-- (void)replaceValueAtIndex:(NSUInteger)index withValue:(float)value;
-
-/**
- * Removes the value at the given index.
- *
- * @param index The index of the value to remove.
- **/
-- (void)removeValueAtIndex:(NSUInteger)index;
-
-/**
- * Removes all the values from this array.
- **/
-- (void)removeAll;
-
-/**
- * Exchanges the values between the given indexes.
- *
- * @param idx1 The index of the first element to exchange.
- * @param idx2 The index of the second element to exchange.
- **/
-- (void)exchangeValueAtIndex:(NSUInteger)idx1
-            withValueAtIndex:(NSUInteger)idx2;
-
-@end
-
-#pragma mark - Double
-
-/**
- * Class used for repeated fields of double values. This performs better than
- * boxing into NSNumbers in NSArrays.
- *
- * @note This class is not meant to be subclassed.
- **/
-@interface GPBDoubleArray : NSObject <NSCopying>
-
-/** The number of elements contained in the array. */
-@property(nonatomic, readonly) NSUInteger count;
-
-/**
- * @return A newly instanced and empty GPBDoubleArray.
- **/
-+ (instancetype)array;
-
-/**
- * Creates and initializes a GPBDoubleArray with the single element given.
- *
- * @param value The value to be placed in the array.
- *
- * @return A newly instanced GPBDoubleArray with value in it.
- **/
-+ (instancetype)arrayWithValue:(double)value;
-
-/**
- * Creates and initializes a GPBDoubleArray with the contents of the given
- * array.
- *
- * @param array Array with the contents to be put into the new array.
- *
- * @return A newly instanced GPBDoubleArray with the contents of array.
- **/
-+ (instancetype)arrayWithValueArray:(GPBDoubleArray *)array;
-
-/**
- * Creates and initializes a GPBDoubleArray with the given capacity.
- *
- * @param count The capacity needed for the array.
- *
- * @return A newly instanced GPBDoubleArray with a capacity of count.
- **/
-+ (instancetype)arrayWithCapacity:(NSUInteger)count;
-
-/**
- * @return A newly initialized and empty GPBDoubleArray.
- **/
-- (instancetype)init NS_DESIGNATED_INITIALIZER;
-
-/**
- * Initializes the array, copying the given values.
- *
- * @param values An array with the values to put inside this array.
- * @param count  The number of elements to copy into the array.
- *
- * @return A newly initialized GPBDoubleArray with a copy of the values.
- **/
-- (instancetype)initWithValues:(const double [__nullable])values
-                         count:(NSUInteger)count;
-
-/**
- * Initializes the array, copying the given values.
- *
- * @param array An array with the values to put inside this array.
- *
- * @return A newly initialized GPBDoubleArray with a copy of the values.
- **/
-- (instancetype)initWithValueArray:(GPBDoubleArray *)array;
-
-/**
- * Initializes the array with the given capacity.
- *
- * @param count The capacity needed for the array.
- *
- * @return A newly initialized GPBDoubleArray with a capacity of count.
- **/
-- (instancetype)initWithCapacity:(NSUInteger)count;
-
-/**
- * Gets the value at the given index.
- *
- * @param index The index of the value to get.
- *
- * @return The value at the given index.
- **/
-- (double)valueAtIndex:(NSUInteger)index;
-
-/**
- * Enumerates the values on this array with the given block.
- *
- * @param block The block to enumerate with.
- *   **value**: The current value being enumerated.
- *   **idx**:   The index of the current value.
- *   **stop**:  A pointer to a boolean that when set stops the enumeration.
- **/
-- (void)enumerateValuesWithBlock:(void (NS_NOESCAPE ^)(double value, NSUInteger idx, BOOL *stop))block;
-
-/**
- * Enumerates the values on this array with the given block.
- *
- * @param opts  Options to control the enumeration.
- * @param block The block to enumerate with.
- *   **value**: The current value being enumerated.
- *   **idx**:   The index of the current value.
- *   **stop**:  A pointer to a boolean that when set stops the enumeration.
- **/
-- (void)enumerateValuesWithOptions:(NSEnumerationOptions)opts
-                        usingBlock:(void (NS_NOESCAPE ^)(double value, NSUInteger idx, BOOL *stop))block;
-
-/**
- * Adds a value to this array.
- *
- * @param value The value to add to this array.
- **/
-- (void)addValue:(double)value;
-
-/**
- * Adds values to this array.
- *
- * @param values The values to add to this array.
- * @param count  The number of elements to add.
- **/
-- (void)addValues:(const double [__nullable])values count:(NSUInteger)count;
-
-/**
- * Adds the values from the given array to this array.
- *
- * @param array The array containing the elements to add to this array.
- **/
-- (void)addValuesFromArray:(GPBDoubleArray *)array;
-
-/**
- * Inserts a value into the given position.
- *
- * @param value The value to add to this array.
- * @param index The index into which to insert the value.
- **/
-- (void)insertValue:(double)value atIndex:(NSUInteger)index;
-
-/**
- * Replaces the value at the given index with the given value.
- *
- * @param index The index for which to replace the value.
- * @param value The value to replace with.
- **/
-- (void)replaceValueAtIndex:(NSUInteger)index withValue:(double)value;
-
-/**
- * Removes the value at the given index.
- *
- * @param index The index of the value to remove.
- **/
-- (void)removeValueAtIndex:(NSUInteger)index;
-
-/**
- * Removes all the values from this array.
- **/
-- (void)removeAll;
-
-/**
- * Exchanges the values between the given indexes.
- *
- * @param idx1 The index of the first element to exchange.
- * @param idx2 The index of the second element to exchange.
- **/
-- (void)exchangeValueAtIndex:(NSUInteger)idx1
-            withValueAtIndex:(NSUInteger)idx2;
-
-@end
-
-#pragma mark - Bool
-
-/**
- * Class used for repeated fields of BOOL values. This performs better than
- * boxing into NSNumbers in NSArrays.
- *
- * @note This class is not meant to be subclassed.
- **/
-@interface GPBBoolArray : NSObject <NSCopying>
-
-/** The number of elements contained in the array. */
-@property(nonatomic, readonly) NSUInteger count;
-
-/**
- * @return A newly instanced and empty GPBBoolArray.
- **/
-+ (instancetype)array;
-
-/**
- * Creates and initializes a GPBBoolArray with the single element given.
- *
- * @param value The value to be placed in the array.
- *
- * @return A newly instanced GPBBoolArray with value in it.
- **/
-+ (instancetype)arrayWithValue:(BOOL)value;
-
-/**
- * Creates and initializes a GPBBoolArray with the contents of the given
- * array.
- *
- * @param array Array with the contents to be put into the new array.
- *
- * @return A newly instanced GPBBoolArray with the contents of array.
- **/
-+ (instancetype)arrayWithValueArray:(GPBBoolArray *)array;
-
-/**
- * Creates and initializes a GPBBoolArray with the given capacity.
- *
- * @param count The capacity needed for the array.
- *
- * @return A newly instanced GPBBoolArray with a capacity of count.
- **/
-+ (instancetype)arrayWithCapacity:(NSUInteger)count;
-
-/**
- * @return A newly initialized and empty GPBBoolArray.
- **/
-- (instancetype)init NS_DESIGNATED_INITIALIZER;
-
-/**
- * Initializes the array, copying the given values.
- *
- * @param values An array with the values to put inside this array.
- * @param count  The number of elements to copy into the array.
- *
- * @return A newly initialized GPBBoolArray with a copy of the values.
- **/
-- (instancetype)initWithValues:(const BOOL [__nullable])values
-                         count:(NSUInteger)count;
-
-/**
- * Initializes the array, copying the given values.
- *
- * @param array An array with the values to put inside this array.
- *
- * @return A newly initialized GPBBoolArray with a copy of the values.
- **/
-- (instancetype)initWithValueArray:(GPBBoolArray *)array;
-
-/**
- * Initializes the array with the given capacity.
- *
- * @param count The capacity needed for the array.
- *
- * @return A newly initialized GPBBoolArray with a capacity of count.
- **/
-- (instancetype)initWithCapacity:(NSUInteger)count;
-
-/**
- * Gets the value at the given index.
- *
- * @param index The index of the value to get.
- *
- * @return The value at the given index.
- **/
-- (BOOL)valueAtIndex:(NSUInteger)index;
-
-/**
- * Enumerates the values on this array with the given block.
- *
- * @param block The block to enumerate with.
- *   **value**: The current value being enumerated.
- *   **idx**:   The index of the current value.
- *   **stop**:  A pointer to a boolean that when set stops the enumeration.
- **/
-- (void)enumerateValuesWithBlock:(void (NS_NOESCAPE ^)(BOOL value, NSUInteger idx, BOOL *stop))block;
-
-/**
- * Enumerates the values on this array with the given block.
- *
- * @param opts  Options to control the enumeration.
- * @param block The block to enumerate with.
- *   **value**: The current value being enumerated.
- *   **idx**:   The index of the current value.
- *   **stop**:  A pointer to a boolean that when set stops the enumeration.
- **/
-- (void)enumerateValuesWithOptions:(NSEnumerationOptions)opts
-                        usingBlock:(void (NS_NOESCAPE ^)(BOOL value, NSUInteger idx, BOOL *stop))block;
-
-/**
- * Adds a value to this array.
- *
- * @param value The value to add to this array.
- **/
-- (void)addValue:(BOOL)value;
-
-/**
- * Adds values to this array.
- *
- * @param values The values to add to this array.
- * @param count  The number of elements to add.
- **/
-- (void)addValues:(const BOOL [__nullable])values count:(NSUInteger)count;
-
-/**
- * Adds the values from the given array to this array.
- *
- * @param array The array containing the elements to add to this array.
- **/
-- (void)addValuesFromArray:(GPBBoolArray *)array;
-
-/**
- * Inserts a value into the given position.
- *
- * @param value The value to add to this array.
- * @param index The index into which to insert the value.
- **/
-- (void)insertValue:(BOOL)value atIndex:(NSUInteger)index;
-
-/**
- * Replaces the value at the given index with the given value.
- *
- * @param index The index for which to replace the value.
- * @param value The value to replace with.
- **/
-- (void)replaceValueAtIndex:(NSUInteger)index withValue:(BOOL)value;
-
-/**
- * Removes the value at the given index.
- *
- * @param index The index of the value to remove.
- **/
-- (void)removeValueAtIndex:(NSUInteger)index;
-
-/**
- * Removes all the values from this array.
- **/
-- (void)removeAll;
-
-/**
- * Exchanges the values between the given indexes.
- *
- * @param idx1 The index of the first element to exchange.
- * @param idx2 The index of the second element to exchange.
- **/
-- (void)exchangeValueAtIndex:(NSUInteger)idx1
-            withValueAtIndex:(NSUInteger)idx2;
-
-@end
-
-#pragma mark - Enum
-
-/**
- * This class is used for repeated fields of int32_t values. This performs
- * better than boxing into NSNumbers in NSArrays.
- *
- * @note This class is not meant to be subclassed.
- **/
-@interface GPBEnumArray : NSObject <NSCopying>
-
-/** The number of elements contained in the array. */
-@property(nonatomic, readonly) NSUInteger count;
-/** The validation function to check if the enums are valid. */
-@property(nonatomic, readonly) GPBEnumValidationFunc validationFunc;
-
-/**
- * @return A newly instanced and empty GPBEnumArray.
- **/
-+ (instancetype)array;
-
-/**
- * Creates and initializes a GPBEnumArray with the enum validation function
- * given.
- *
- * @param func The enum validation function for the array.
- *
- * @return A newly instanced GPBEnumArray.
- **/
-+ (instancetype)arrayWithValidationFunction:(nullable GPBEnumValidationFunc)func;
-
-/**
- * Creates and initializes a GPBEnumArray with the enum validation function
- * given and the single raw value given.
- *
- * @param func  The enum validation function for the array.
- * @param value The raw value to add to this array.
- *
- * @return A newly instanced GPBEnumArray.
- **/
-+ (instancetype)arrayWithValidationFunction:(nullable GPBEnumValidationFunc)func
-                                   rawValue:(int32_t)value;
-
-/**
- * Creates and initializes a GPBEnumArray that adds the elements from the
- * given array.
- *
- * @param array Array containing the values to add to the new array.
- *
- * @return A newly instanced GPBEnumArray.
- **/
-+ (instancetype)arrayWithValueArray:(GPBEnumArray *)array;
-
-/**
- * Creates and initializes a GPBEnumArray with the given enum validation
- * function and with the givencapacity.
- *
- * @param func  The enum validation function for the array.
- * @param count The capacity needed for the array.
- *
- * @return A newly instanced GPBEnumArray with a capacity of count.
- **/
-+ (instancetype)arrayWithValidationFunction:(nullable GPBEnumValidationFunc)func
-                                   capacity:(NSUInteger)count;
-
-/**
- * Initializes the array with the given enum validation function.
- *
- * @param func The enum validation function for the array.
- *
- * @return A newly initialized GPBEnumArray with a copy of the values.
- **/
-- (instancetype)initWithValidationFunction:(nullable GPBEnumValidationFunc)func
-    NS_DESIGNATED_INITIALIZER;
-
-/**
- * Initializes the array, copying the given values.
- *
- * @param func   The enum validation function for the array.
- * @param values An array with the values to put inside this array.
- * @param count  The number of elements to copy into the array.
- *
- * @return A newly initialized GPBEnumArray with a copy of the values.
- **/
-- (instancetype)initWithValidationFunction:(nullable GPBEnumValidationFunc)func
-                                 rawValues:(const int32_t [__nullable])values
-                                     count:(NSUInteger)count;
-
-/**
- * Initializes the array, copying the given values.
- *
- * @param array An array with the values to put inside this array.
- *
- * @return A newly initialized GPBEnumArray with a copy of the values.
- **/
-- (instancetype)initWithValueArray:(GPBEnumArray *)array;
-
-/**
- * Initializes the array with the given capacity.
- *
- * @param func  The enum validation function for the array.
- * @param count The capacity needed for the array.
- *
- * @return A newly initialized GPBEnumArray with a capacity of count.
- **/
-- (instancetype)initWithValidationFunction:(nullable GPBEnumValidationFunc)func
-                                  capacity:(NSUInteger)count;
-
-// These will return kGPBUnrecognizedEnumeratorValue if the value at index is not a
-// valid enumerator as defined by validationFunc. If the actual value is
-// desired, use "raw" version of the method.
-
-/**
- * Gets the value at the given index.
- *
- * @param index The index of the value to get.
- *
- * @return The value at the given index.
- **/
-- (int32_t)valueAtIndex:(NSUInteger)index;
-
-/**
- * Enumerates the values on this array with the given block.
- *
- * @param block The block to enumerate with.
- *   **value**: The current value being enumerated.
- *   **idx**:   The index of the current value.
- *   **stop**:  A pointer to a boolean that when set stops the enumeration.
- **/
-- (void)enumerateValuesWithBlock:(void (NS_NOESCAPE ^)(int32_t value, NSUInteger idx, BOOL *stop))block;
-
-/**
- * Enumerates the values on this array with the given block.
- *
- * @param opts  Options to control the enumeration.
- * @param block The block to enumerate with.
- *   **value**: The current value being enumerated.
- *   **idx**:   The index of the current value.
- *   **stop**:  A pointer to a boolean that when set stops the enumeration.
- **/
-- (void)enumerateValuesWithOptions:(NSEnumerationOptions)opts
-                        usingBlock:(void (NS_NOESCAPE ^)(int32_t value, NSUInteger idx, BOOL *stop))block;
-
-// These methods bypass the validationFunc to provide access to values that were not
-// known at the time the binary was compiled.
-
-/**
- * Gets the raw enum value at the given index.
- *
- * @param index The index of the raw enum value to get.
- *
- * @return The raw enum value at the given index.
- **/
-- (int32_t)rawValueAtIndex:(NSUInteger)index;
-
-/**
- * Enumerates the values on this array with the given block.
- *
- * @param block The block to enumerate with.
- *   **value**: The current value being enumerated.
- *   **idx**:   The index of the current value.
- *   **stop**:  A pointer to a boolean that when set stops the enumeration.
- **/
-- (void)enumerateRawValuesWithBlock:(void (NS_NOESCAPE ^)(int32_t value, NSUInteger idx, BOOL *stop))block;
-
-/**
- * Enumerates the values on this array with the given block.
- *
- * @param opts  Options to control the enumeration.
- * @param block The block to enumerate with.
- *   **value**: The current value being enumerated.
- *   **idx**:   The index of the current value.
- *   **stop**:  A pointer to a boolean that when set stops the enumeration.
- **/
-- (void)enumerateRawValuesWithOptions:(NSEnumerationOptions)opts
-                           usingBlock:(void (NS_NOESCAPE ^)(int32_t value, NSUInteger idx, BOOL *stop))block;
-
-// If value is not a valid enumerator as defined by validationFunc, these
-// methods will assert in debug, and will log in release and assign the value
-// to the default value. Use the rawValue methods below to assign non enumerator
-// values.
-
-/**
- * Adds a value to this array.
- *
- * @param value The value to add to this array.
- **/
-- (void)addValue:(int32_t)value;
-
-/**
- * Adds values to this array.
- *
- * @param values The values to add to this array.
- * @param count  The number of elements to add.
- **/
-- (void)addValues:(const int32_t [__nullable])values count:(NSUInteger)count;
-
-
-/**
- * Inserts a value into the given position.
- *
- * @param value The value to add to this array.
- * @param index The index into which to insert the value.
- **/
-- (void)insertValue:(int32_t)value atIndex:(NSUInteger)index;
-
-/**
- * Replaces the value at the given index with the given value.
- *
- * @param index The index for which to replace the value.
- * @param value The value to replace with.
- **/
-- (void)replaceValueAtIndex:(NSUInteger)index withValue:(int32_t)value;
-
-// These methods bypass the validationFunc to provide setting of values that were not
-// known at the time the binary was compiled.
-
-/**
- * Adds a raw enum value to this array.
- *
- * @note This method bypass the validationFunc to enable the setting of values that
- *       were not known at the time the binary was compiled.
- *
- * @param value The raw enum value to add to the array.
- **/
-- (void)addRawValue:(int32_t)value;
-
-/**
- * Adds raw enum values to this array.
- *
- * @note This method bypass the validationFunc to enable the setting of values that
- *       were not known at the time the binary was compiled.
- *
- * @param array Array containing the raw enum values to add to this array.
- **/
-- (void)addRawValuesFromArray:(GPBEnumArray *)array;
-
-/**
- * Adds raw enum values to this array.
- *
- * @note This method bypass the validationFunc to enable the setting of values that
- *       were not known at the time the binary was compiled.
- *
- * @param values Array containing the raw enum values to add to this array.
- * @param count  The number of raw values to add.
- **/
-- (void)addRawValues:(const int32_t [__nullable])values count:(NSUInteger)count;
-
-/**
- * Inserts a raw enum value at the given index.
- *
- * @note This method bypass the validationFunc to enable the setting of values that
- *       were not known at the time the binary was compiled.
- *
- * @param value Raw enum value to add.
- * @param index The index into which to insert the value.
- **/
-- (void)insertRawValue:(int32_t)value atIndex:(NSUInteger)index;
-
-/**
- * Replaces the raw enum value at the given index with the given value.
- *
- * @note This method bypass the validationFunc to enable the setting of values that
- *       were not known at the time the binary was compiled.
- *
- * @param index The index for which to replace the value.
- * @param value The raw enum value to replace with.
- **/
-- (void)replaceValueAtIndex:(NSUInteger)index withRawValue:(int32_t)value;
-
-// No validation applies to these methods.
-
-/**
- * Removes the value at the given index.
- *
- * @param index The index of the value to remove.
- **/
-- (void)removeValueAtIndex:(NSUInteger)index;
-
-/**
- * Removes all the values from this array.
- **/
-- (void)removeAll;
-
-/**
- * Exchanges the values between the given indexes.
- *
- * @param idx1 The index of the first element to exchange.
- * @param idx2 The index of the second element to exchange.
- **/
-- (void)exchangeValueAtIndex:(NSUInteger)idx1
-            withValueAtIndex:(NSUInteger)idx2;
-
-@end
-
-// clang-format on
-//%PDDM-EXPAND-END DECLARE_ARRAYS()
-
-NS_ASSUME_NONNULL_END
-
-//%PDDM-DEFINE DECLARE_ARRAYS()
-//%ARRAY_INTERFACE_SIMPLE(Int32, int32_t)
-//%ARRAY_INTERFACE_SIMPLE(UInt32, uint32_t)
-//%ARRAY_INTERFACE_SIMPLE(Int64, int64_t)
-//%ARRAY_INTERFACE_SIMPLE(UInt64, uint64_t)
-//%ARRAY_INTERFACE_SIMPLE(Float, float)
-//%ARRAY_INTERFACE_SIMPLE(Double, double)
-//%ARRAY_INTERFACE_SIMPLE(Bool, BOOL)
-//%ARRAY_INTERFACE_ENUM(Enum, int32_t)
-
-//
-// The common case (everything but Enum)
-//
-
-//%PDDM-DEFINE ARRAY_INTERFACE_SIMPLE(NAME, TYPE)
-//%#pragma mark - NAME
-//%
-//%/**
-//% * Class used for repeated fields of ##TYPE## values. This performs better than
-//% * boxing into NSNumbers in NSArrays.
-//% *
-//% * @note This class is not meant to be subclassed.
-//% **/
-//%@interface GPB##NAME##Array : NSObject <NSCopying>
-//%
-//%/** The number of elements contained in the array. */
-//%@property(nonatomic, readonly) NSUInteger count;
-//%
-//%/**
-//% * @return A newly instanced and empty GPB##NAME##Array.
-//% **/
-//%+ (instancetype)array;
-//%
-//%/**
-//% * Creates and initializes a GPB##NAME##Array with the single element given.
-//% *
-//% * @param value The value to be placed in the array.
-//% *
-//% * @return A newly instanced GPB##NAME##Array with value in it.
-//% **/
-//%+ (instancetype)arrayWithValue:(TYPE)value;
-//%
-//%/**
-//% * Creates and initializes a GPB##NAME##Array with the contents of the given
-//% * array.
-//% *
-//% * @param array Array with the contents to be put into the new array.
-//% *
-//% * @return A newly instanced GPB##NAME##Array with the contents of array.
-//% **/
-//%+ (instancetype)arrayWithValueArray:(GPB##NAME##Array *)array;
-//%
-//%/**
-//% * Creates and initializes a GPB##NAME##Array with the given capacity.
-//% *
-//% * @param count The capacity needed for the array.
-//% *
-//% * @return A newly instanced GPB##NAME##Array with a capacity of count.
-//% **/
-//%+ (instancetype)arrayWithCapacity:(NSUInteger)count;
-//%
-//%/**
-//% * @return A newly initialized and empty GPB##NAME##Array.
-//% **/
-//%- (instancetype)init NS_DESIGNATED_INITIALIZER;
-//%
-//%/**
-//% * Initializes the array, copying the given values.
-//% *
-//% * @param values An array with the values to put inside this array.
-//% * @param count  The number of elements to copy into the array.
-//% *
-//% * @return A newly initialized GPB##NAME##Array with a copy of the values.
-//% **/
-//%- (instancetype)initWithValues:(const TYPE [__nullable])values
-//%                         count:(NSUInteger)count;
-//%
-//%/**
-//% * Initializes the array, copying the given values.
-//% *
-//% * @param array An array with the values to put inside this array.
-//% *
-//% * @return A newly initialized GPB##NAME##Array with a copy of the values.
-//% **/
-//%- (instancetype)initWithValueArray:(GPB##NAME##Array *)array;
-//%
-//%/**
-//% * Initializes the array with the given capacity.
-//% *
-//% * @param count The capacity needed for the array.
-//% *
-//% * @return A newly initialized GPB##NAME##Array with a capacity of count.
-//% **/
-//%- (instancetype)initWithCapacity:(NSUInteger)count;
-//%
-//%ARRAY_IMMUTABLE_INTERFACE(NAME, TYPE, Basic)
-//%
-//%ARRAY_MUTABLE_INTERFACE(NAME, TYPE, Basic)
-//%
-//%@end
-//%
-
-//
-// Macros specific to Enums (to tweak their interface).
-//
-
-//%PDDM-DEFINE ARRAY_INTERFACE_ENUM(NAME, TYPE)
-//%#pragma mark - NAME
-//%
-//%/**
-//% * This class is used for repeated fields of ##TYPE## values. This performs
-//% * better than boxing into NSNumbers in NSArrays.
-//% *
-//% * @note This class is not meant to be subclassed.
-//% **/
-//%@interface GPB##NAME##Array : NSObject <NSCopying>
-//%
-//%/** The number of elements contained in the array. */
-//%@property(nonatomic, readonly) NSUInteger count;
-//%/** The validation function to check if the enums are valid. */
-//%@property(nonatomic, readonly) GPBEnumValidationFunc validationFunc;
-//%
-//%/**
-//% * @return A newly instanced and empty GPB##NAME##Array.
-//% **/
-//%+ (instancetype)array;
-//%
-//%/**
-//% * Creates and initializes a GPB##NAME##Array with the enum validation function
-//% * given.
-//% *
-//% * @param func The enum validation function for the array.
-//% *
-//% * @return A newly instanced GPB##NAME##Array.
-//% **/
-//%+ (instancetype)arrayWithValidationFunction:(nullable GPBEnumValidationFunc)func;
-//%
-//%/**
-//% * Creates and initializes a GPB##NAME##Array with the enum validation function
-//% * given and the single raw value given.
-//% *
-//% * @param func  The enum validation function for the array.
-//% * @param value The raw value to add to this array.
-//% *
-//% * @return A newly instanced GPB##NAME##Array.
-//% **/
-//%+ (instancetype)arrayWithValidationFunction:(nullable GPBEnumValidationFunc)func
-//%                                   rawValue:(TYPE)value;
-//%
-//%/**
-//% * Creates and initializes a GPB##NAME##Array that adds the elements from the
-//% * given array.
-//% *
-//% * @param array Array containing the values to add to the new array.
-//% *
-//% * @return A newly instanced GPB##NAME##Array.
-//% **/
-//%+ (instancetype)arrayWithValueArray:(GPB##NAME##Array *)array;
-//%
-//%/**
-//% * Creates and initializes a GPB##NAME##Array with the given enum validation
-//% * function and with the givencapacity.
-//% *
-//% * @param func  The enum validation function for the array.
-//% * @param count The capacity needed for the array.
-//% *
-//% * @return A newly instanced GPB##NAME##Array with a capacity of count.
-//% **/
-//%+ (instancetype)arrayWithValidationFunction:(nullable GPBEnumValidationFunc)func
-//%                                   capacity:(NSUInteger)count;
-//%
-//%/**
-//% * Initializes the array with the given enum validation function.
-//% *
-//% * @param func The enum validation function for the array.
-//% *
-//% * @return A newly initialized GPB##NAME##Array with a copy of the values.
-//% **/
-//%- (instancetype)initWithValidationFunction:(nullable GPBEnumValidationFunc)func
-//%    NS_DESIGNATED_INITIALIZER;
-//%
-//%/**
-//% * Initializes the array, copying the given values.
-//% *
-//% * @param func   The enum validation function for the array.
-//% * @param values An array with the values to put inside this array.
-//% * @param count  The number of elements to copy into the array.
-//% *
-//% * @return A newly initialized GPB##NAME##Array with a copy of the values.
-//% **/
-//%- (instancetype)initWithValidationFunction:(nullable GPBEnumValidationFunc)func
-//%                                 rawValues:(const TYPE [__nullable])values
-//%                                     count:(NSUInteger)count;
-//%
-//%/**
-//% * Initializes the array, copying the given values.
-//% *
-//% * @param array An array with the values to put inside this array.
-//% *
-//% * @return A newly initialized GPB##NAME##Array with a copy of the values.
-//% **/
-//%- (instancetype)initWithValueArray:(GPB##NAME##Array *)array;
-//%
-//%/**
-//% * Initializes the array with the given capacity.
-//% *
-//% * @param func  The enum validation function for the array.
-//% * @param count The capacity needed for the array.
-//% *
-//% * @return A newly initialized GPB##NAME##Array with a capacity of count.
-//% **/
-//%- (instancetype)initWithValidationFunction:(nullable GPBEnumValidationFunc)func
-//%                                  capacity:(NSUInteger)count;
-//%
-//%// These will return kGPBUnrecognizedEnumeratorValue if the value at index is not a
-//%// valid enumerator as defined by validationFunc. If the actual value is
-//%// desired, use "raw" version of the method.
-//%
-//%ARRAY_IMMUTABLE_INTERFACE(NAME, TYPE, NAME)
-//%
-//%// These methods bypass the validationFunc to provide access to values that were not
-//%// known at the time the binary was compiled.
-//%
-//%/**
-//% * Gets the raw enum value at the given index.
-//% *
-//% * @param index The index of the raw enum value to get.
-//% *
-//% * @return The raw enum value at the given index.
-//% **/
-//%- (TYPE)rawValueAtIndex:(NSUInteger)index;
-//%
-//%/**
-//% * Enumerates the values on this array with the given block.
-//% *
-//% * @param block The block to enumerate with.
-//% *   **value**: The current value being enumerated.
-//% *   **idx**:   The index of the current value.
-//% *   **stop**:  A pointer to a boolean that when set stops the enumeration.
-//% **/
-//%- (void)enumerateRawValuesWithBlock:(void (NS_NOESCAPE ^)(TYPE value, NSUInteger idx, BOOL *stop))block;
-//%
-//%/**
-//% * Enumerates the values on this array with the given block.
-//% *
-//% * @param opts  Options to control the enumeration.
-//% * @param block The block to enumerate with.
-//% *   **value**: The current value being enumerated.
-//% *   **idx**:   The index of the current value.
-//% *   **stop**:  A pointer to a boolean that when set stops the enumeration.
-//% **/
-//%- (void)enumerateRawValuesWithOptions:(NSEnumerationOptions)opts
-//%                           usingBlock:(void (NS_NOESCAPE ^)(TYPE value, NSUInteger idx, BOOL *stop))block;
-//%
-//%// If value is not a valid enumerator as defined by validationFunc, these
-//%// methods will assert in debug, and will log in release and assign the value
-//%// to the default value. Use the rawValue methods below to assign non enumerator
-//%// values.
-//%
-//%ARRAY_MUTABLE_INTERFACE(NAME, TYPE, NAME)
-//%
-//%@end
-//%
-
-//%PDDM-DEFINE ARRAY_IMMUTABLE_INTERFACE(NAME, TYPE, HELPER_NAME)
-//%/**
-//% * Gets the value at the given index.
-//% *
-//% * @param index The index of the value to get.
-//% *
-//% * @return The value at the given index.
-//% **/
-//%- (TYPE)valueAtIndex:(NSUInteger)index;
-//%
-//%/**
-//% * Enumerates the values on this array with the given block.
-//% *
-//% * @param block The block to enumerate with.
-//% *   **value**: The current value being enumerated.
-//% *   **idx**:   The index of the current value.
-//% *   **stop**:  A pointer to a boolean that when set stops the enumeration.
-//% **/
-//%- (void)enumerateValuesWithBlock:(void (NS_NOESCAPE ^)(TYPE value, NSUInteger idx, BOOL *stop))block;
-//%
-//%/**
-//% * Enumerates the values on this array with the given block.
-//% *
-//% * @param opts  Options to control the enumeration.
-//% * @param block The block to enumerate with.
-//% *   **value**: The current value being enumerated.
-//% *   **idx**:   The index of the current value.
-//% *   **stop**:  A pointer to a boolean that when set stops the enumeration.
-//% **/
-//%- (void)enumerateValuesWithOptions:(NSEnumerationOptions)opts
-//%                        usingBlock:(void (NS_NOESCAPE ^)(TYPE value, NSUInteger idx, BOOL *stop))block;
-
-//%PDDM-DEFINE ARRAY_MUTABLE_INTERFACE(NAME, TYPE, HELPER_NAME)
-//%/**
-//% * Adds a value to this array.
-//% *
-//% * @param value The value to add to this array.
-//% **/
-//%- (void)addValue:(TYPE)value;
-//%
-//%/**
-//% * Adds values to this array.
-//% *
-//% * @param values The values to add to this array.
-//% * @param count  The number of elements to add.
-//% **/
-//%- (void)addValues:(const TYPE [__nullable])values count:(NSUInteger)count;
-//%
-//%ARRAY_EXTRA_MUTABLE_METHODS1_##HELPER_NAME(NAME, TYPE)
-//%/**
-//% * Inserts a value into the given position.
-//% *
-//% * @param value The value to add to this array.
-//% * @param index The index into which to insert the value.
-//% **/
-//%- (void)insertValue:(TYPE)value atIndex:(NSUInteger)index;
-//%
-//%/**
-//% * Replaces the value at the given index with the given value.
-//% *
-//% * @param index The index for which to replace the value.
-//% * @param value The value to replace with.
-//% **/
-//%- (void)replaceValueAtIndex:(NSUInteger)index withValue:(TYPE)value;
-//%ARRAY_EXTRA_MUTABLE_METHODS2_##HELPER_NAME(NAME, TYPE)
-//%/**
-//% * Removes the value at the given index.
-//% *
-//% * @param index The index of the value to remove.
-//% **/
-//%- (void)removeValueAtIndex:(NSUInteger)index;
-//%
-//%/**
-//% * Removes all the values from this array.
-//% **/
-//%- (void)removeAll;
-//%
-//%/**
-//% * Exchanges the values between the given indexes.
-//% *
-//% * @param idx1 The index of the first element to exchange.
-//% * @param idx2 The index of the second element to exchange.
-//% **/
-//%- (void)exchangeValueAtIndex:(NSUInteger)idx1
-//%            withValueAtIndex:(NSUInteger)idx2;
-
-//
-// These are hooks invoked by the above to do insert as needed.
-//
-
-//%PDDM-DEFINE ARRAY_EXTRA_MUTABLE_METHODS1_Basic(NAME, TYPE)
-//%/**
-//% * Adds the values from the given array to this array.
-//% *
-//% * @param array The array containing the elements to add to this array.
-//% **/
-//%- (void)addValuesFromArray:(GPB##NAME##Array *)array;
-//%
-//%PDDM-DEFINE ARRAY_EXTRA_MUTABLE_METHODS2_Basic(NAME, TYPE)
-// Empty
-//%PDDM-DEFINE ARRAY_EXTRA_MUTABLE_METHODS1_Enum(NAME, TYPE)
-// Empty
-//%PDDM-DEFINE ARRAY_EXTRA_MUTABLE_METHODS2_Enum(NAME, TYPE)
-//%
-//%// These methods bypass the validationFunc to provide setting of values that were not
-//%// known at the time the binary was compiled.
-//%
-//%/**
-//% * Adds a raw enum value to this array.
-//% *
-//% * @note This method bypass the validationFunc to enable the setting of values that
-//% *       were not known at the time the binary was compiled.
-//% *
-//% * @param value The raw enum value to add to the array.
-//% **/
-//%- (void)addRawValue:(TYPE)value;
-//%
-//%/**
-//% * Adds raw enum values to this array.
-//% *
-//% * @note This method bypass the validationFunc to enable the setting of values that
-//% *       were not known at the time the binary was compiled.
-//% *
-//% * @param array Array containing the raw enum values to add to this array.
-//% **/
-//%- (void)addRawValuesFromArray:(GPB##NAME##Array *)array;
-//%
-//%/**
-//% * Adds raw enum values to this array.
-//% *
-//% * @note This method bypass the validationFunc to enable the setting of values that
-//% *       were not known at the time the binary was compiled.
-//% *
-//% * @param values Array containing the raw enum values to add to this array.
-//% * @param count  The number of raw values to add.
-//% **/
-//%- (void)addRawValues:(const TYPE [__nullable])values count:(NSUInteger)count;
-//%
-//%/**
-//% * Inserts a raw enum value at the given index.
-//% *
-//% * @note This method bypass the validationFunc to enable the setting of values that
-//% *       were not known at the time the binary was compiled.
-//% *
-//% * @param value Raw enum value to add.
-//% * @param index The index into which to insert the value.
-//% **/
-//%- (void)insertRawValue:(TYPE)value atIndex:(NSUInteger)index;
-//%
-//%/**
-//% * Replaces the raw enum value at the given index with the given value.
-//% *
-//% * @note This method bypass the validationFunc to enable the setting of values that
-//% *       were not known at the time the binary was compiled.
-//% *
-//% * @param index The index for which to replace the value.
-//% * @param value The raw enum value to replace with.
-//% **/
-//%- (void)replaceValueAtIndex:(NSUInteger)index withRawValue:(TYPE)value;
-//%
-//%// No validation applies to these methods.
-//%
diff --git a/libs/protobuf/objectivec/GPBArray.m b/libs/protobuf/objectivec/GPBArray.m
deleted file mode 100644
index bb9a077..0000000
--- a/libs/protobuf/objectivec/GPBArray.m
+++ /dev/null
@@ -1,2575 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#import "GPBArray_PackagePrivate.h"
-
-#import "GPBMessage_PackagePrivate.h"
-
-// Direct access is use for speed, to avoid even internally declaring things
-// read/write, etc. The warning is enabled in the project to ensure code calling
-// protos can turn on -Wdirect-ivar-access without issues.
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdirect-ivar-access"
-
-// Mutable arrays use an internal buffer that can always hold a multiple of this elements.
-#define kChunkSize 16
-#define CapacityFromCount(x) (((x / kChunkSize) + 1) * kChunkSize)
-
-static BOOL ArrayDefault_IsValidValue(int32_t value) {
-  // Anything but the bad value marker is allowed.
-  return (value != kGPBUnrecognizedEnumeratorValue);
-}
-
-//%PDDM-DEFINE VALIDATE_RANGE(INDEX, COUNT)
-//%  if (INDEX >= COUNT) {
-//%    [NSException raise:NSRangeException
-//%                format:@"Index (%lu) beyond bounds (%lu)",
-//%                       (unsigned long)INDEX, (unsigned long)COUNT];
-//%  }
-//%PDDM-DEFINE MAYBE_GROW_TO_SET_COUNT(NEW_COUNT)
-//%  if (NEW_COUNT > _capacity) {
-//%    [self internalResizeToCapacity:CapacityFromCount(NEW_COUNT)];
-//%  }
-//%  _count = NEW_COUNT;
-//%PDDM-DEFINE SET_COUNT_AND_MAYBE_SHRINK(NEW_COUNT)
-//%  _count = NEW_COUNT;
-//%  if ((NEW_COUNT + (2 * kChunkSize)) < _capacity) {
-//%    [self internalResizeToCapacity:CapacityFromCount(NEW_COUNT)];
-//%  }
-
-//
-// Macros for the common basic cases.
-//
-
-//%PDDM-DEFINE ARRAY_INTERFACE_SIMPLE(NAME, TYPE, FORMAT)
-//%#pragma mark - NAME
-//%
-//%@implementation GPB##NAME##Array {
-//% @package
-//%  TYPE *_values;
-//%  NSUInteger _count;
-//%  NSUInteger _capacity;
-//%}
-//%
-//%@synthesize count = _count;
-//%
-//%+ (instancetype)array {
-//%  return [[[self alloc] init] autorelease];
-//%}
-//%
-//%+ (instancetype)arrayWithValue:(TYPE)value {
-//%  // Cast is needed so the compiler knows what class we are invoking initWithValues: on to get
-//%  // the type correct.
-//%  return [[(GPB##NAME##Array*)[self alloc] initWithValues:&value count:1] autorelease];
-//%}
-//%
-//%+ (instancetype)arrayWithValueArray:(GPB##NAME##Array *)array {
-//%  return [[(GPB##NAME##Array*)[self alloc] initWithValueArray:array] autorelease];
-//%}
-//%
-//%+ (instancetype)arrayWithCapacity:(NSUInteger)count {
-//%  return [[[self alloc] initWithCapacity:count] autorelease];
-//%}
-//%
-//%- (instancetype)init {
-//%  self = [super init];
-//%  // No work needed;
-//%  return self;
-//%}
-//%
-//%- (instancetype)initWithValueArray:(GPB##NAME##Array *)array {
-//%  return [self initWithValues:array->_values count:array->_count];
-//%}
-//%
-//%- (instancetype)initWithValues:(const TYPE [])values count:(NSUInteger)count {
-//%  self = [self init];
-//%  if (self) {
-//%    if (count && values) {
-//%      _values = reallocf(_values, count * sizeof(TYPE));
-//%      if (_values != NULL) {
-//%        _capacity = count;
-//%        memcpy(_values, values, count * sizeof(TYPE));
-//%        _count = count;
-//%      } else {
-//%        [self release];
-//%        [NSException raise:NSMallocException
-//%                    format:@"Failed to allocate %lu bytes",
-//%                           (unsigned long)(count * sizeof(TYPE))];
-//%      }
-//%    }
-//%  }
-//%  return self;
-//%}
-//%
-//%- (instancetype)initWithCapacity:(NSUInteger)count {
-//%  self = [self initWithValues:NULL count:0];
-//%  if (self && count) {
-//%    [self internalResizeToCapacity:count];
-//%  }
-//%  return self;
-//%}
-//%
-//%- (instancetype)copyWithZone:(NSZone *)zone {
-//%  return [[GPB##NAME##Array allocWithZone:zone] initWithValues:_values count:_count];
-//%}
-//%
-//%ARRAY_IMMUTABLE_CORE(NAME, TYPE, , FORMAT)
-//%
-//%- (TYPE)valueAtIndex:(NSUInteger)index {
-//%VALIDATE_RANGE(index, _count)
-//%  return _values[index];
-//%}
-//%
-//%ARRAY_MUTABLE_CORE(NAME, TYPE, , FORMAT)
-//%@end
-//%
-
-//
-// Some core macros used for both the simple types and Enums.
-//
-
-//%PDDM-DEFINE ARRAY_IMMUTABLE_CORE(NAME, TYPE, ACCESSOR_NAME, FORMAT)
-//%- (void)dealloc {
-//%  NSAssert(!_autocreator,
-//%           @"%@: Autocreator must be cleared before release, autocreator: %@",
-//%           [self class], _autocreator);
-//%  free(_values);
-//%  [super dealloc];
-//%}
-//%
-//%- (BOOL)isEqual:(id)other {
-//%  if (self == other) {
-//%    return YES;
-//%  }
-//%  if (![other isKindOfClass:[GPB##NAME##Array class]]) {
-//%    return NO;
-//%  }
-//%  GPB##NAME##Array *otherArray = other;
-//%  return (_count == otherArray->_count
-//%          && memcmp(_values, otherArray->_values, (_count * sizeof(TYPE))) == 0);
-//%}
-//%
-//%- (NSUInteger)hash {
-//%  // Follow NSArray's lead, and use the count as the hash.
-//%  return _count;
-//%}
-//%
-//%- (NSString *)description {
-//%  NSMutableString *result = [NSMutableString stringWithFormat:@"<%@ %p> { ", [self class], self];
-//%  for (NSUInteger i = 0, count = _count; i < count; ++i) {
-//%    if (i == 0) {
-//%      [result appendFormat:@"##FORMAT##", _values[i]];
-//%    } else {
-//%      [result appendFormat:@", ##FORMAT##", _values[i]];
-//%    }
-//%  }
-//%  [result appendFormat:@" }"];
-//%  return result;
-//%}
-//%
-//%- (void)enumerate##ACCESSOR_NAME##ValuesWithBlock:(void (NS_NOESCAPE ^)(TYPE value, NSUInteger idx, BOOL *stop))block {
-//%  [self enumerate##ACCESSOR_NAME##ValuesWithOptions:(NSEnumerationOptions)0 usingBlock:block];
-//%}
-//%
-//%- (void)enumerate##ACCESSOR_NAME##ValuesWithOptions:(NSEnumerationOptions)opts
-//%                  ACCESSOR_NAME$S      usingBlock:(void (NS_NOESCAPE ^)(TYPE value, NSUInteger idx, BOOL *stop))block {
-//%  // NSEnumerationConcurrent isn't currently supported (and Apple's docs say that is ok).
-//%  BOOL stop = NO;
-//%  if ((opts & NSEnumerationReverse) == 0) {
-//%    for (NSUInteger i = 0, count = _count; i < count; ++i) {
-//%      block(_values[i], i, &stop);
-//%      if (stop) break;
-//%    }
-//%  } else if (_count > 0) {
-//%    for (NSUInteger i = _count; i > 0; --i) {
-//%      block(_values[i - 1], (i - 1), &stop);
-//%      if (stop) break;
-//%    }
-//%  }
-//%}
-
-//%PDDM-DEFINE MUTATION_HOOK_None()
-//%PDDM-DEFINE MUTATION_METHODS(NAME, TYPE, ACCESSOR_NAME, HOOK_1, HOOK_2)
-//%- (void)add##ACCESSOR_NAME##Value:(TYPE)value {
-//%  [self add##ACCESSOR_NAME##Values:&value count:1];
-//%}
-//%
-//%- (void)add##ACCESSOR_NAME##Values:(const TYPE [])values count:(NSUInteger)count {
-//%  if (values == NULL || count == 0) return;
-//%MUTATION_HOOK_##HOOK_1()  NSUInteger initialCount = _count;
-//%  NSUInteger newCount = initialCount + count;
-//%MAYBE_GROW_TO_SET_COUNT(newCount)
-//%  memcpy(&_values[initialCount], values, count * sizeof(TYPE));
-//%  if (_autocreator) {
-//%    GPBAutocreatedArrayModified(_autocreator, self);
-//%  }
-//%}
-//%
-//%- (void)insert##ACCESSOR_NAME##Value:(TYPE)value atIndex:(NSUInteger)index {
-//%VALIDATE_RANGE(index, _count + 1)
-//%MUTATION_HOOK_##HOOK_2()  NSUInteger initialCount = _count;
-//%  NSUInteger newCount = initialCount + 1;
-//%MAYBE_GROW_TO_SET_COUNT(newCount)
-//%  if (index != initialCount) {
-//%    memmove(&_values[index + 1], &_values[index], (initialCount - index) * sizeof(TYPE));
-//%  }
-//%  _values[index] = value;
-//%  if (_autocreator) {
-//%    GPBAutocreatedArrayModified(_autocreator, self);
-//%  }
-//%}
-//%
-//%- (void)replaceValueAtIndex:(NSUInteger)index with##ACCESSOR_NAME##Value:(TYPE)value {
-//%VALIDATE_RANGE(index, _count)
-//%MUTATION_HOOK_##HOOK_2()  _values[index] = value;
-//%}
-
-//%PDDM-DEFINE ARRAY_MUTABLE_CORE(NAME, TYPE, ACCESSOR_NAME, FORMAT)
-//%- (void)internalResizeToCapacity:(NSUInteger)newCapacity {
-//%  _values = reallocf(_values, newCapacity * sizeof(TYPE));
-//%  if (_values == NULL) {
-//%    _capacity = 0;
-//%    _count = 0;
-//%    [NSException raise:NSMallocException
-//%                format:@"Failed to allocate %lu bytes",
-//%                       (unsigned long)(newCapacity * sizeof(TYPE))];
-//%  }
-//%  _capacity = newCapacity;
-//%}
-//%
-//%MUTATION_METHODS(NAME, TYPE, ACCESSOR_NAME, None, None)
-//%
-//%- (void)add##ACCESSOR_NAME##ValuesFromArray:(GPB##NAME##Array *)array {
-//%  [self add##ACCESSOR_NAME##Values:array->_values count:array->_count];
-//%}
-//%
-//%- (void)removeValueAtIndex:(NSUInteger)index {
-//%VALIDATE_RANGE(index, _count)
-//%  NSUInteger newCount = _count - 1;
-//%  if (index != newCount) {
-//%    memmove(&_values[index], &_values[index + 1], (newCount - index) * sizeof(TYPE));
-//%  }
-//%SET_COUNT_AND_MAYBE_SHRINK(newCount)
-//%}
-//%
-//%- (void)removeAll {
-//%SET_COUNT_AND_MAYBE_SHRINK(0)
-//%}
-//%
-//%- (void)exchangeValueAtIndex:(NSUInteger)idx1
-//%            withValueAtIndex:(NSUInteger)idx2 {
-//%VALIDATE_RANGE(idx1, _count)
-//%VALIDATE_RANGE(idx2, _count)
-//%  TYPE temp = _values[idx1];
-//%  _values[idx1] = _values[idx2];
-//%  _values[idx2] = temp;
-//%}
-//%
-
-//%PDDM-EXPAND ARRAY_INTERFACE_SIMPLE(Int32, int32_t, %d)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-#pragma mark - Int32
-
-@implementation GPBInt32Array {
- @package
-  int32_t *_values;
-  NSUInteger _count;
-  NSUInteger _capacity;
-}
-
-@synthesize count = _count;
-
-+ (instancetype)array {
-  return [[[self alloc] init] autorelease];
-}
-
-+ (instancetype)arrayWithValue:(int32_t)value {
-  // Cast is needed so the compiler knows what class we are invoking initWithValues: on to get
-  // the type correct.
-  return [[(GPBInt32Array*)[self alloc] initWithValues:&value count:1] autorelease];
-}
-
-+ (instancetype)arrayWithValueArray:(GPBInt32Array *)array {
-  return [[(GPBInt32Array*)[self alloc] initWithValueArray:array] autorelease];
-}
-
-+ (instancetype)arrayWithCapacity:(NSUInteger)count {
-  return [[[self alloc] initWithCapacity:count] autorelease];
-}
-
-- (instancetype)init {
-  self = [super init];
-  // No work needed;
-  return self;
-}
-
-- (instancetype)initWithValueArray:(GPBInt32Array *)array {
-  return [self initWithValues:array->_values count:array->_count];
-}
-
-- (instancetype)initWithValues:(const int32_t [])values count:(NSUInteger)count {
-  self = [self init];
-  if (self) {
-    if (count && values) {
-      _values = reallocf(_values, count * sizeof(int32_t));
-      if (_values != NULL) {
-        _capacity = count;
-        memcpy(_values, values, count * sizeof(int32_t));
-        _count = count;
-      } else {
-        [self release];
-        [NSException raise:NSMallocException
-                    format:@"Failed to allocate %lu bytes",
-                           (unsigned long)(count * sizeof(int32_t))];
-      }
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithCapacity:(NSUInteger)count {
-  self = [self initWithValues:NULL count:0];
-  if (self && count) {
-    [self internalResizeToCapacity:count];
-  }
-  return self;
-}
-
-- (instancetype)copyWithZone:(NSZone *)zone {
-  return [[GPBInt32Array allocWithZone:zone] initWithValues:_values count:_count];
-}
-
-- (void)dealloc {
-  NSAssert(!_autocreator,
-           @"%@: Autocreator must be cleared before release, autocreator: %@",
-           [self class], _autocreator);
-  free(_values);
-  [super dealloc];
-}
-
-- (BOOL)isEqual:(id)other {
-  if (self == other) {
-    return YES;
-  }
-  if (![other isKindOfClass:[GPBInt32Array class]]) {
-    return NO;
-  }
-  GPBInt32Array *otherArray = other;
-  return (_count == otherArray->_count
-          && memcmp(_values, otherArray->_values, (_count * sizeof(int32_t))) == 0);
-}
-
-- (NSUInteger)hash {
-  // Follow NSArray's lead, and use the count as the hash.
-  return _count;
-}
-
-- (NSString *)description {
-  NSMutableString *result = [NSMutableString stringWithFormat:@"<%@ %p> { ", [self class], self];
-  for (NSUInteger i = 0, count = _count; i < count; ++i) {
-    if (i == 0) {
-      [result appendFormat:@"%d", _values[i]];
-    } else {
-      [result appendFormat:@", %d", _values[i]];
-    }
-  }
-  [result appendFormat:@" }"];
-  return result;
-}
-
-- (void)enumerateValuesWithBlock:(void (NS_NOESCAPE ^)(int32_t value, NSUInteger idx, BOOL *stop))block {
-  [self enumerateValuesWithOptions:(NSEnumerationOptions)0 usingBlock:block];
-}
-
-- (void)enumerateValuesWithOptions:(NSEnumerationOptions)opts
-                        usingBlock:(void (NS_NOESCAPE ^)(int32_t value, NSUInteger idx, BOOL *stop))block {
-  // NSEnumerationConcurrent isn't currently supported (and Apple's docs say that is ok).
-  BOOL stop = NO;
-  if ((opts & NSEnumerationReverse) == 0) {
-    for (NSUInteger i = 0, count = _count; i < count; ++i) {
-      block(_values[i], i, &stop);
-      if (stop) break;
-    }
-  } else if (_count > 0) {
-    for (NSUInteger i = _count; i > 0; --i) {
-      block(_values[i - 1], (i - 1), &stop);
-      if (stop) break;
-    }
-  }
-}
-
-- (int32_t)valueAtIndex:(NSUInteger)index {
-  if (index >= _count) {
-    [NSException raise:NSRangeException
-                format:@"Index (%lu) beyond bounds (%lu)",
-                       (unsigned long)index, (unsigned long)_count];
-  }
-  return _values[index];
-}
-
-- (void)internalResizeToCapacity:(NSUInteger)newCapacity {
-  _values = reallocf(_values, newCapacity * sizeof(int32_t));
-  if (_values == NULL) {
-    _capacity = 0;
-    _count = 0;
-    [NSException raise:NSMallocException
-                format:@"Failed to allocate %lu bytes",
-                       (unsigned long)(newCapacity * sizeof(int32_t))];
-  }
-  _capacity = newCapacity;
-}
-
-- (void)addValue:(int32_t)value {
-  [self addValues:&value count:1];
-}
-
-- (void)addValues:(const int32_t [])values count:(NSUInteger)count {
-  if (values == NULL || count == 0) return;
-  NSUInteger initialCount = _count;
-  NSUInteger newCount = initialCount + count;
-  if (newCount > _capacity) {
-    [self internalResizeToCapacity:CapacityFromCount(newCount)];
-  }
-  _count = newCount;
-  memcpy(&_values[initialCount], values, count * sizeof(int32_t));
-  if (_autocreator) {
-    GPBAutocreatedArrayModified(_autocreator, self);
-  }
-}
-
-- (void)insertValue:(int32_t)value atIndex:(NSUInteger)index {
-  if (index >= _count + 1) {
-    [NSException raise:NSRangeException
-                format:@"Index (%lu) beyond bounds (%lu)",
-                       (unsigned long)index, (unsigned long)_count + 1];
-  }
-  NSUInteger initialCount = _count;
-  NSUInteger newCount = initialCount + 1;
-  if (newCount > _capacity) {
-    [self internalResizeToCapacity:CapacityFromCount(newCount)];
-  }
-  _count = newCount;
-  if (index != initialCount) {
-    memmove(&_values[index + 1], &_values[index], (initialCount - index) * sizeof(int32_t));
-  }
-  _values[index] = value;
-  if (_autocreator) {
-    GPBAutocreatedArrayModified(_autocreator, self);
-  }
-}
-
-- (void)replaceValueAtIndex:(NSUInteger)index withValue:(int32_t)value {
-  if (index >= _count) {
-    [NSException raise:NSRangeException
-                format:@"Index (%lu) beyond bounds (%lu)",
-                       (unsigned long)index, (unsigned long)_count];
-  }
-  _values[index] = value;
-}
-
-- (void)addValuesFromArray:(GPBInt32Array *)array {
-  [self addValues:array->_values count:array->_count];
-}
-
-- (void)removeValueAtIndex:(NSUInteger)index {
-  if (index >= _count) {
-    [NSException raise:NSRangeException
-                format:@"Index (%lu) beyond bounds (%lu)",
-                       (unsigned long)index, (unsigned long)_count];
-  }
-  NSUInteger newCount = _count - 1;
-  if (index != newCount) {
-    memmove(&_values[index], &_values[index + 1], (newCount - index) * sizeof(int32_t));
-  }
-  _count = newCount;
-  if ((newCount + (2 * kChunkSize)) < _capacity) {
-    [self internalResizeToCapacity:CapacityFromCount(newCount)];
-  }
-}
-
-- (void)removeAll {
-  _count = 0;
-  if ((0 + (2 * kChunkSize)) < _capacity) {
-    [self internalResizeToCapacity:CapacityFromCount(0)];
-  }
-}
-
-- (void)exchangeValueAtIndex:(NSUInteger)idx1
-            withValueAtIndex:(NSUInteger)idx2 {
-  if (idx1 >= _count) {
-    [NSException raise:NSRangeException
-                format:@"Index (%lu) beyond bounds (%lu)",
-                       (unsigned long)idx1, (unsigned long)_count];
-  }
-  if (idx2 >= _count) {
-    [NSException raise:NSRangeException
-                format:@"Index (%lu) beyond bounds (%lu)",
-                       (unsigned long)idx2, (unsigned long)_count];
-  }
-  int32_t temp = _values[idx1];
-  _values[idx1] = _values[idx2];
-  _values[idx2] = temp;
-}
-
-@end
-
-// clang-format on
-//%PDDM-EXPAND ARRAY_INTERFACE_SIMPLE(UInt32, uint32_t, %u)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-#pragma mark - UInt32
-
-@implementation GPBUInt32Array {
- @package
-  uint32_t *_values;
-  NSUInteger _count;
-  NSUInteger _capacity;
-}
-
-@synthesize count = _count;
-
-+ (instancetype)array {
-  return [[[self alloc] init] autorelease];
-}
-
-+ (instancetype)arrayWithValue:(uint32_t)value {
-  // Cast is needed so the compiler knows what class we are invoking initWithValues: on to get
-  // the type correct.
-  return [[(GPBUInt32Array*)[self alloc] initWithValues:&value count:1] autorelease];
-}
-
-+ (instancetype)arrayWithValueArray:(GPBUInt32Array *)array {
-  return [[(GPBUInt32Array*)[self alloc] initWithValueArray:array] autorelease];
-}
-
-+ (instancetype)arrayWithCapacity:(NSUInteger)count {
-  return [[[self alloc] initWithCapacity:count] autorelease];
-}
-
-- (instancetype)init {
-  self = [super init];
-  // No work needed;
-  return self;
-}
-
-- (instancetype)initWithValueArray:(GPBUInt32Array *)array {
-  return [self initWithValues:array->_values count:array->_count];
-}
-
-- (instancetype)initWithValues:(const uint32_t [])values count:(NSUInteger)count {
-  self = [self init];
-  if (self) {
-    if (count && values) {
-      _values = reallocf(_values, count * sizeof(uint32_t));
-      if (_values != NULL) {
-        _capacity = count;
-        memcpy(_values, values, count * sizeof(uint32_t));
-        _count = count;
-      } else {
-        [self release];
-        [NSException raise:NSMallocException
-                    format:@"Failed to allocate %lu bytes",
-                           (unsigned long)(count * sizeof(uint32_t))];
-      }
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithCapacity:(NSUInteger)count {
-  self = [self initWithValues:NULL count:0];
-  if (self && count) {
-    [self internalResizeToCapacity:count];
-  }
-  return self;
-}
-
-- (instancetype)copyWithZone:(NSZone *)zone {
-  return [[GPBUInt32Array allocWithZone:zone] initWithValues:_values count:_count];
-}
-
-- (void)dealloc {
-  NSAssert(!_autocreator,
-           @"%@: Autocreator must be cleared before release, autocreator: %@",
-           [self class], _autocreator);
-  free(_values);
-  [super dealloc];
-}
-
-- (BOOL)isEqual:(id)other {
-  if (self == other) {
-    return YES;
-  }
-  if (![other isKindOfClass:[GPBUInt32Array class]]) {
-    return NO;
-  }
-  GPBUInt32Array *otherArray = other;
-  return (_count == otherArray->_count
-          && memcmp(_values, otherArray->_values, (_count * sizeof(uint32_t))) == 0);
-}
-
-- (NSUInteger)hash {
-  // Follow NSArray's lead, and use the count as the hash.
-  return _count;
-}
-
-- (NSString *)description {
-  NSMutableString *result = [NSMutableString stringWithFormat:@"<%@ %p> { ", [self class], self];
-  for (NSUInteger i = 0, count = _count; i < count; ++i) {
-    if (i == 0) {
-      [result appendFormat:@"%u", _values[i]];
-    } else {
-      [result appendFormat:@", %u", _values[i]];
-    }
-  }
-  [result appendFormat:@" }"];
-  return result;
-}
-
-- (void)enumerateValuesWithBlock:(void (NS_NOESCAPE ^)(uint32_t value, NSUInteger idx, BOOL *stop))block {
-  [self enumerateValuesWithOptions:(NSEnumerationOptions)0 usingBlock:block];
-}
-
-- (void)enumerateValuesWithOptions:(NSEnumerationOptions)opts
-                        usingBlock:(void (NS_NOESCAPE ^)(uint32_t value, NSUInteger idx, BOOL *stop))block {
-  // NSEnumerationConcurrent isn't currently supported (and Apple's docs say that is ok).
-  BOOL stop = NO;
-  if ((opts & NSEnumerationReverse) == 0) {
-    for (NSUInteger i = 0, count = _count; i < count; ++i) {
-      block(_values[i], i, &stop);
-      if (stop) break;
-    }
-  } else if (_count > 0) {
-    for (NSUInteger i = _count; i > 0; --i) {
-      block(_values[i - 1], (i - 1), &stop);
-      if (stop) break;
-    }
-  }
-}
-
-- (uint32_t)valueAtIndex:(NSUInteger)index {
-  if (index >= _count) {
-    [NSException raise:NSRangeException
-                format:@"Index (%lu) beyond bounds (%lu)",
-                       (unsigned long)index, (unsigned long)_count];
-  }
-  return _values[index];
-}
-
-- (void)internalResizeToCapacity:(NSUInteger)newCapacity {
-  _values = reallocf(_values, newCapacity * sizeof(uint32_t));
-  if (_values == NULL) {
-    _capacity = 0;
-    _count = 0;
-    [NSException raise:NSMallocException
-                format:@"Failed to allocate %lu bytes",
-                       (unsigned long)(newCapacity * sizeof(uint32_t))];
-  }
-  _capacity = newCapacity;
-}
-
-- (void)addValue:(uint32_t)value {
-  [self addValues:&value count:1];
-}
-
-- (void)addValues:(const uint32_t [])values count:(NSUInteger)count {
-  if (values == NULL || count == 0) return;
-  NSUInteger initialCount = _count;
-  NSUInteger newCount = initialCount + count;
-  if (newCount > _capacity) {
-    [self internalResizeToCapacity:CapacityFromCount(newCount)];
-  }
-  _count = newCount;
-  memcpy(&_values[initialCount], values, count * sizeof(uint32_t));
-  if (_autocreator) {
-    GPBAutocreatedArrayModified(_autocreator, self);
-  }
-}
-
-- (void)insertValue:(uint32_t)value atIndex:(NSUInteger)index {
-  if (index >= _count + 1) {
-    [NSException raise:NSRangeException
-                format:@"Index (%lu) beyond bounds (%lu)",
-                       (unsigned long)index, (unsigned long)_count + 1];
-  }
-  NSUInteger initialCount = _count;
-  NSUInteger newCount = initialCount + 1;
-  if (newCount > _capacity) {
-    [self internalResizeToCapacity:CapacityFromCount(newCount)];
-  }
-  _count = newCount;
-  if (index != initialCount) {
-    memmove(&_values[index + 1], &_values[index], (initialCount - index) * sizeof(uint32_t));
-  }
-  _values[index] = value;
-  if (_autocreator) {
-    GPBAutocreatedArrayModified(_autocreator, self);
-  }
-}
-
-- (void)replaceValueAtIndex:(NSUInteger)index withValue:(uint32_t)value {
-  if (index >= _count) {
-    [NSException raise:NSRangeException
-                format:@"Index (%lu) beyond bounds (%lu)",
-                       (unsigned long)index, (unsigned long)_count];
-  }
-  _values[index] = value;
-}
-
-- (void)addValuesFromArray:(GPBUInt32Array *)array {
-  [self addValues:array->_values count:array->_count];
-}
-
-- (void)removeValueAtIndex:(NSUInteger)index {
-  if (index >= _count) {
-    [NSException raise:NSRangeException
-                format:@"Index (%lu) beyond bounds (%lu)",
-                       (unsigned long)index, (unsigned long)_count];
-  }
-  NSUInteger newCount = _count - 1;
-  if (index != newCount) {
-    memmove(&_values[index], &_values[index + 1], (newCount - index) * sizeof(uint32_t));
-  }
-  _count = newCount;
-  if ((newCount + (2 * kChunkSize)) < _capacity) {
-    [self internalResizeToCapacity:CapacityFromCount(newCount)];
-  }
-}
-
-- (void)removeAll {
-  _count = 0;
-  if ((0 + (2 * kChunkSize)) < _capacity) {
-    [self internalResizeToCapacity:CapacityFromCount(0)];
-  }
-}
-
-- (void)exchangeValueAtIndex:(NSUInteger)idx1
-            withValueAtIndex:(NSUInteger)idx2 {
-  if (idx1 >= _count) {
-    [NSException raise:NSRangeException
-                format:@"Index (%lu) beyond bounds (%lu)",
-                       (unsigned long)idx1, (unsigned long)_count];
-  }
-  if (idx2 >= _count) {
-    [NSException raise:NSRangeException
-                format:@"Index (%lu) beyond bounds (%lu)",
-                       (unsigned long)idx2, (unsigned long)_count];
-  }
-  uint32_t temp = _values[idx1];
-  _values[idx1] = _values[idx2];
-  _values[idx2] = temp;
-}
-
-@end
-
-// clang-format on
-//%PDDM-EXPAND ARRAY_INTERFACE_SIMPLE(Int64, int64_t, %lld)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-#pragma mark - Int64
-
-@implementation GPBInt64Array {
- @package
-  int64_t *_values;
-  NSUInteger _count;
-  NSUInteger _capacity;
-}
-
-@synthesize count = _count;
-
-+ (instancetype)array {
-  return [[[self alloc] init] autorelease];
-}
-
-+ (instancetype)arrayWithValue:(int64_t)value {
-  // Cast is needed so the compiler knows what class we are invoking initWithValues: on to get
-  // the type correct.
-  return [[(GPBInt64Array*)[self alloc] initWithValues:&value count:1] autorelease];
-}
-
-+ (instancetype)arrayWithValueArray:(GPBInt64Array *)array {
-  return [[(GPBInt64Array*)[self alloc] initWithValueArray:array] autorelease];
-}
-
-+ (instancetype)arrayWithCapacity:(NSUInteger)count {
-  return [[[self alloc] initWithCapacity:count] autorelease];
-}
-
-- (instancetype)init {
-  self = [super init];
-  // No work needed;
-  return self;
-}
-
-- (instancetype)initWithValueArray:(GPBInt64Array *)array {
-  return [self initWithValues:array->_values count:array->_count];
-}
-
-- (instancetype)initWithValues:(const int64_t [])values count:(NSUInteger)count {
-  self = [self init];
-  if (self) {
-    if (count && values) {
-      _values = reallocf(_values, count * sizeof(int64_t));
-      if (_values != NULL) {
-        _capacity = count;
-        memcpy(_values, values, count * sizeof(int64_t));
-        _count = count;
-      } else {
-        [self release];
-        [NSException raise:NSMallocException
-                    format:@"Failed to allocate %lu bytes",
-                           (unsigned long)(count * sizeof(int64_t))];
-      }
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithCapacity:(NSUInteger)count {
-  self = [self initWithValues:NULL count:0];
-  if (self && count) {
-    [self internalResizeToCapacity:count];
-  }
-  return self;
-}
-
-- (instancetype)copyWithZone:(NSZone *)zone {
-  return [[GPBInt64Array allocWithZone:zone] initWithValues:_values count:_count];
-}
-
-- (void)dealloc {
-  NSAssert(!_autocreator,
-           @"%@: Autocreator must be cleared before release, autocreator: %@",
-           [self class], _autocreator);
-  free(_values);
-  [super dealloc];
-}
-
-- (BOOL)isEqual:(id)other {
-  if (self == other) {
-    return YES;
-  }
-  if (![other isKindOfClass:[GPBInt64Array class]]) {
-    return NO;
-  }
-  GPBInt64Array *otherArray = other;
-  return (_count == otherArray->_count
-          && memcmp(_values, otherArray->_values, (_count * sizeof(int64_t))) == 0);
-}
-
-- (NSUInteger)hash {
-  // Follow NSArray's lead, and use the count as the hash.
-  return _count;
-}
-
-- (NSString *)description {
-  NSMutableString *result = [NSMutableString stringWithFormat:@"<%@ %p> { ", [self class], self];
-  for (NSUInteger i = 0, count = _count; i < count; ++i) {
-    if (i == 0) {
-      [result appendFormat:@"%lld", _values[i]];
-    } else {
-      [result appendFormat:@", %lld", _values[i]];
-    }
-  }
-  [result appendFormat:@" }"];
-  return result;
-}
-
-- (void)enumerateValuesWithBlock:(void (NS_NOESCAPE ^)(int64_t value, NSUInteger idx, BOOL *stop))block {
-  [self enumerateValuesWithOptions:(NSEnumerationOptions)0 usingBlock:block];
-}
-
-- (void)enumerateValuesWithOptions:(NSEnumerationOptions)opts
-                        usingBlock:(void (NS_NOESCAPE ^)(int64_t value, NSUInteger idx, BOOL *stop))block {
-  // NSEnumerationConcurrent isn't currently supported (and Apple's docs say that is ok).
-  BOOL stop = NO;
-  if ((opts & NSEnumerationReverse) == 0) {
-    for (NSUInteger i = 0, count = _count; i < count; ++i) {
-      block(_values[i], i, &stop);
-      if (stop) break;
-    }
-  } else if (_count > 0) {
-    for (NSUInteger i = _count; i > 0; --i) {
-      block(_values[i - 1], (i - 1), &stop);
-      if (stop) break;
-    }
-  }
-}
-
-- (int64_t)valueAtIndex:(NSUInteger)index {
-  if (index >= _count) {
-    [NSException raise:NSRangeException
-                format:@"Index (%lu) beyond bounds (%lu)",
-                       (unsigned long)index, (unsigned long)_count];
-  }
-  return _values[index];
-}
-
-- (void)internalResizeToCapacity:(NSUInteger)newCapacity {
-  _values = reallocf(_values, newCapacity * sizeof(int64_t));
-  if (_values == NULL) {
-    _capacity = 0;
-    _count = 0;
-    [NSException raise:NSMallocException
-                format:@"Failed to allocate %lu bytes",
-                       (unsigned long)(newCapacity * sizeof(int64_t))];
-  }
-  _capacity = newCapacity;
-}
-
-- (void)addValue:(int64_t)value {
-  [self addValues:&value count:1];
-}
-
-- (void)addValues:(const int64_t [])values count:(NSUInteger)count {
-  if (values == NULL || count == 0) return;
-  NSUInteger initialCount = _count;
-  NSUInteger newCount = initialCount + count;
-  if (newCount > _capacity) {
-    [self internalResizeToCapacity:CapacityFromCount(newCount)];
-  }
-  _count = newCount;
-  memcpy(&_values[initialCount], values, count * sizeof(int64_t));
-  if (_autocreator) {
-    GPBAutocreatedArrayModified(_autocreator, self);
-  }
-}
-
-- (void)insertValue:(int64_t)value atIndex:(NSUInteger)index {
-  if (index >= _count + 1) {
-    [NSException raise:NSRangeException
-                format:@"Index (%lu) beyond bounds (%lu)",
-                       (unsigned long)index, (unsigned long)_count + 1];
-  }
-  NSUInteger initialCount = _count;
-  NSUInteger newCount = initialCount + 1;
-  if (newCount > _capacity) {
-    [self internalResizeToCapacity:CapacityFromCount(newCount)];
-  }
-  _count = newCount;
-  if (index != initialCount) {
-    memmove(&_values[index + 1], &_values[index], (initialCount - index) * sizeof(int64_t));
-  }
-  _values[index] = value;
-  if (_autocreator) {
-    GPBAutocreatedArrayModified(_autocreator, self);
-  }
-}
-
-- (void)replaceValueAtIndex:(NSUInteger)index withValue:(int64_t)value {
-  if (index >= _count) {
-    [NSException raise:NSRangeException
-                format:@"Index (%lu) beyond bounds (%lu)",
-                       (unsigned long)index, (unsigned long)_count];
-  }
-  _values[index] = value;
-}
-
-- (void)addValuesFromArray:(GPBInt64Array *)array {
-  [self addValues:array->_values count:array->_count];
-}
-
-- (void)removeValueAtIndex:(NSUInteger)index {
-  if (index >= _count) {
-    [NSException raise:NSRangeException
-                format:@"Index (%lu) beyond bounds (%lu)",
-                       (unsigned long)index, (unsigned long)_count];
-  }
-  NSUInteger newCount = _count - 1;
-  if (index != newCount) {
-    memmove(&_values[index], &_values[index + 1], (newCount - index) * sizeof(int64_t));
-  }
-  _count = newCount;
-  if ((newCount + (2 * kChunkSize)) < _capacity) {
-    [self internalResizeToCapacity:CapacityFromCount(newCount)];
-  }
-}
-
-- (void)removeAll {
-  _count = 0;
-  if ((0 + (2 * kChunkSize)) < _capacity) {
-    [self internalResizeToCapacity:CapacityFromCount(0)];
-  }
-}
-
-- (void)exchangeValueAtIndex:(NSUInteger)idx1
-            withValueAtIndex:(NSUInteger)idx2 {
-  if (idx1 >= _count) {
-    [NSException raise:NSRangeException
-                format:@"Index (%lu) beyond bounds (%lu)",
-                       (unsigned long)idx1, (unsigned long)_count];
-  }
-  if (idx2 >= _count) {
-    [NSException raise:NSRangeException
-                format:@"Index (%lu) beyond bounds (%lu)",
-                       (unsigned long)idx2, (unsigned long)_count];
-  }
-  int64_t temp = _values[idx1];
-  _values[idx1] = _values[idx2];
-  _values[idx2] = temp;
-}
-
-@end
-
-// clang-format on
-//%PDDM-EXPAND ARRAY_INTERFACE_SIMPLE(UInt64, uint64_t, %llu)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-#pragma mark - UInt64
-
-@implementation GPBUInt64Array {
- @package
-  uint64_t *_values;
-  NSUInteger _count;
-  NSUInteger _capacity;
-}
-
-@synthesize count = _count;
-
-+ (instancetype)array {
-  return [[[self alloc] init] autorelease];
-}
-
-+ (instancetype)arrayWithValue:(uint64_t)value {
-  // Cast is needed so the compiler knows what class we are invoking initWithValues: on to get
-  // the type correct.
-  return [[(GPBUInt64Array*)[self alloc] initWithValues:&value count:1] autorelease];
-}
-
-+ (instancetype)arrayWithValueArray:(GPBUInt64Array *)array {
-  return [[(GPBUInt64Array*)[self alloc] initWithValueArray:array] autorelease];
-}
-
-+ (instancetype)arrayWithCapacity:(NSUInteger)count {
-  return [[[self alloc] initWithCapacity:count] autorelease];
-}
-
-- (instancetype)init {
-  self = [super init];
-  // No work needed;
-  return self;
-}
-
-- (instancetype)initWithValueArray:(GPBUInt64Array *)array {
-  return [self initWithValues:array->_values count:array->_count];
-}
-
-- (instancetype)initWithValues:(const uint64_t [])values count:(NSUInteger)count {
-  self = [self init];
-  if (self) {
-    if (count && values) {
-      _values = reallocf(_values, count * sizeof(uint64_t));
-      if (_values != NULL) {
-        _capacity = count;
-        memcpy(_values, values, count * sizeof(uint64_t));
-        _count = count;
-      } else {
-        [self release];
-        [NSException raise:NSMallocException
-                    format:@"Failed to allocate %lu bytes",
-                           (unsigned long)(count * sizeof(uint64_t))];
-      }
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithCapacity:(NSUInteger)count {
-  self = [self initWithValues:NULL count:0];
-  if (self && count) {
-    [self internalResizeToCapacity:count];
-  }
-  return self;
-}
-
-- (instancetype)copyWithZone:(NSZone *)zone {
-  return [[GPBUInt64Array allocWithZone:zone] initWithValues:_values count:_count];
-}
-
-- (void)dealloc {
-  NSAssert(!_autocreator,
-           @"%@: Autocreator must be cleared before release, autocreator: %@",
-           [self class], _autocreator);
-  free(_values);
-  [super dealloc];
-}
-
-- (BOOL)isEqual:(id)other {
-  if (self == other) {
-    return YES;
-  }
-  if (![other isKindOfClass:[GPBUInt64Array class]]) {
-    return NO;
-  }
-  GPBUInt64Array *otherArray = other;
-  return (_count == otherArray->_count
-          && memcmp(_values, otherArray->_values, (_count * sizeof(uint64_t))) == 0);
-}
-
-- (NSUInteger)hash {
-  // Follow NSArray's lead, and use the count as the hash.
-  return _count;
-}
-
-- (NSString *)description {
-  NSMutableString *result = [NSMutableString stringWithFormat:@"<%@ %p> { ", [self class], self];
-  for (NSUInteger i = 0, count = _count; i < count; ++i) {
-    if (i == 0) {
-      [result appendFormat:@"%llu", _values[i]];
-    } else {
-      [result appendFormat:@", %llu", _values[i]];
-    }
-  }
-  [result appendFormat:@" }"];
-  return result;
-}
-
-- (void)enumerateValuesWithBlock:(void (NS_NOESCAPE ^)(uint64_t value, NSUInteger idx, BOOL *stop))block {
-  [self enumerateValuesWithOptions:(NSEnumerationOptions)0 usingBlock:block];
-}
-
-- (void)enumerateValuesWithOptions:(NSEnumerationOptions)opts
-                        usingBlock:(void (NS_NOESCAPE ^)(uint64_t value, NSUInteger idx, BOOL *stop))block {
-  // NSEnumerationConcurrent isn't currently supported (and Apple's docs say that is ok).
-  BOOL stop = NO;
-  if ((opts & NSEnumerationReverse) == 0) {
-    for (NSUInteger i = 0, count = _count; i < count; ++i) {
-      block(_values[i], i, &stop);
-      if (stop) break;
-    }
-  } else if (_count > 0) {
-    for (NSUInteger i = _count; i > 0; --i) {
-      block(_values[i - 1], (i - 1), &stop);
-      if (stop) break;
-    }
-  }
-}
-
-- (uint64_t)valueAtIndex:(NSUInteger)index {
-  if (index >= _count) {
-    [NSException raise:NSRangeException
-                format:@"Index (%lu) beyond bounds (%lu)",
-                       (unsigned long)index, (unsigned long)_count];
-  }
-  return _values[index];
-}
-
-- (void)internalResizeToCapacity:(NSUInteger)newCapacity {
-  _values = reallocf(_values, newCapacity * sizeof(uint64_t));
-  if (_values == NULL) {
-    _capacity = 0;
-    _count = 0;
-    [NSException raise:NSMallocException
-                format:@"Failed to allocate %lu bytes",
-                       (unsigned long)(newCapacity * sizeof(uint64_t))];
-  }
-  _capacity = newCapacity;
-}
-
-- (void)addValue:(uint64_t)value {
-  [self addValues:&value count:1];
-}
-
-- (void)addValues:(const uint64_t [])values count:(NSUInteger)count {
-  if (values == NULL || count == 0) return;
-  NSUInteger initialCount = _count;
-  NSUInteger newCount = initialCount + count;
-  if (newCount > _capacity) {
-    [self internalResizeToCapacity:CapacityFromCount(newCount)];
-  }
-  _count = newCount;
-  memcpy(&_values[initialCount], values, count * sizeof(uint64_t));
-  if (_autocreator) {
-    GPBAutocreatedArrayModified(_autocreator, self);
-  }
-}
-
-- (void)insertValue:(uint64_t)value atIndex:(NSUInteger)index {
-  if (index >= _count + 1) {
-    [NSException raise:NSRangeException
-                format:@"Index (%lu) beyond bounds (%lu)",
-                       (unsigned long)index, (unsigned long)_count + 1];
-  }
-  NSUInteger initialCount = _count;
-  NSUInteger newCount = initialCount + 1;
-  if (newCount > _capacity) {
-    [self internalResizeToCapacity:CapacityFromCount(newCount)];
-  }
-  _count = newCount;
-  if (index != initialCount) {
-    memmove(&_values[index + 1], &_values[index], (initialCount - index) * sizeof(uint64_t));
-  }
-  _values[index] = value;
-  if (_autocreator) {
-    GPBAutocreatedArrayModified(_autocreator, self);
-  }
-}
-
-- (void)replaceValueAtIndex:(NSUInteger)index withValue:(uint64_t)value {
-  if (index >= _count) {
-    [NSException raise:NSRangeException
-                format:@"Index (%lu) beyond bounds (%lu)",
-                       (unsigned long)index, (unsigned long)_count];
-  }
-  _values[index] = value;
-}
-
-- (void)addValuesFromArray:(GPBUInt64Array *)array {
-  [self addValues:array->_values count:array->_count];
-}
-
-- (void)removeValueAtIndex:(NSUInteger)index {
-  if (index >= _count) {
-    [NSException raise:NSRangeException
-                format:@"Index (%lu) beyond bounds (%lu)",
-                       (unsigned long)index, (unsigned long)_count];
-  }
-  NSUInteger newCount = _count - 1;
-  if (index != newCount) {
-    memmove(&_values[index], &_values[index + 1], (newCount - index) * sizeof(uint64_t));
-  }
-  _count = newCount;
-  if ((newCount + (2 * kChunkSize)) < _capacity) {
-    [self internalResizeToCapacity:CapacityFromCount(newCount)];
-  }
-}
-
-- (void)removeAll {
-  _count = 0;
-  if ((0 + (2 * kChunkSize)) < _capacity) {
-    [self internalResizeToCapacity:CapacityFromCount(0)];
-  }
-}
-
-- (void)exchangeValueAtIndex:(NSUInteger)idx1
-            withValueAtIndex:(NSUInteger)idx2 {
-  if (idx1 >= _count) {
-    [NSException raise:NSRangeException
-                format:@"Index (%lu) beyond bounds (%lu)",
-                       (unsigned long)idx1, (unsigned long)_count];
-  }
-  if (idx2 >= _count) {
-    [NSException raise:NSRangeException
-                format:@"Index (%lu) beyond bounds (%lu)",
-                       (unsigned long)idx2, (unsigned long)_count];
-  }
-  uint64_t temp = _values[idx1];
-  _values[idx1] = _values[idx2];
-  _values[idx2] = temp;
-}
-
-@end
-
-// clang-format on
-//%PDDM-EXPAND ARRAY_INTERFACE_SIMPLE(Float, float, %f)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-#pragma mark - Float
-
-@implementation GPBFloatArray {
- @package
-  float *_values;
-  NSUInteger _count;
-  NSUInteger _capacity;
-}
-
-@synthesize count = _count;
-
-+ (instancetype)array {
-  return [[[self alloc] init] autorelease];
-}
-
-+ (instancetype)arrayWithValue:(float)value {
-  // Cast is needed so the compiler knows what class we are invoking initWithValues: on to get
-  // the type correct.
-  return [[(GPBFloatArray*)[self alloc] initWithValues:&value count:1] autorelease];
-}
-
-+ (instancetype)arrayWithValueArray:(GPBFloatArray *)array {
-  return [[(GPBFloatArray*)[self alloc] initWithValueArray:array] autorelease];
-}
-
-+ (instancetype)arrayWithCapacity:(NSUInteger)count {
-  return [[[self alloc] initWithCapacity:count] autorelease];
-}
-
-- (instancetype)init {
-  self = [super init];
-  // No work needed;
-  return self;
-}
-
-- (instancetype)initWithValueArray:(GPBFloatArray *)array {
-  return [self initWithValues:array->_values count:array->_count];
-}
-
-- (instancetype)initWithValues:(const float [])values count:(NSUInteger)count {
-  self = [self init];
-  if (self) {
-    if (count && values) {
-      _values = reallocf(_values, count * sizeof(float));
-      if (_values != NULL) {
-        _capacity = count;
-        memcpy(_values, values, count * sizeof(float));
-        _count = count;
-      } else {
-        [self release];
-        [NSException raise:NSMallocException
-                    format:@"Failed to allocate %lu bytes",
-                           (unsigned long)(count * sizeof(float))];
-      }
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithCapacity:(NSUInteger)count {
-  self = [self initWithValues:NULL count:0];
-  if (self && count) {
-    [self internalResizeToCapacity:count];
-  }
-  return self;
-}
-
-- (instancetype)copyWithZone:(NSZone *)zone {
-  return [[GPBFloatArray allocWithZone:zone] initWithValues:_values count:_count];
-}
-
-- (void)dealloc {
-  NSAssert(!_autocreator,
-           @"%@: Autocreator must be cleared before release, autocreator: %@",
-           [self class], _autocreator);
-  free(_values);
-  [super dealloc];
-}
-
-- (BOOL)isEqual:(id)other {
-  if (self == other) {
-    return YES;
-  }
-  if (![other isKindOfClass:[GPBFloatArray class]]) {
-    return NO;
-  }
-  GPBFloatArray *otherArray = other;
-  return (_count == otherArray->_count
-          && memcmp(_values, otherArray->_values, (_count * sizeof(float))) == 0);
-}
-
-- (NSUInteger)hash {
-  // Follow NSArray's lead, and use the count as the hash.
-  return _count;
-}
-
-- (NSString *)description {
-  NSMutableString *result = [NSMutableString stringWithFormat:@"<%@ %p> { ", [self class], self];
-  for (NSUInteger i = 0, count = _count; i < count; ++i) {
-    if (i == 0) {
-      [result appendFormat:@"%f", _values[i]];
-    } else {
-      [result appendFormat:@", %f", _values[i]];
-    }
-  }
-  [result appendFormat:@" }"];
-  return result;
-}
-
-- (void)enumerateValuesWithBlock:(void (NS_NOESCAPE ^)(float value, NSUInteger idx, BOOL *stop))block {
-  [self enumerateValuesWithOptions:(NSEnumerationOptions)0 usingBlock:block];
-}
-
-- (void)enumerateValuesWithOptions:(NSEnumerationOptions)opts
-                        usingBlock:(void (NS_NOESCAPE ^)(float value, NSUInteger idx, BOOL *stop))block {
-  // NSEnumerationConcurrent isn't currently supported (and Apple's docs say that is ok).
-  BOOL stop = NO;
-  if ((opts & NSEnumerationReverse) == 0) {
-    for (NSUInteger i = 0, count = _count; i < count; ++i) {
-      block(_values[i], i, &stop);
-      if (stop) break;
-    }
-  } else if (_count > 0) {
-    for (NSUInteger i = _count; i > 0; --i) {
-      block(_values[i - 1], (i - 1), &stop);
-      if (stop) break;
-    }
-  }
-}
-
-- (float)valueAtIndex:(NSUInteger)index {
-  if (index >= _count) {
-    [NSException raise:NSRangeException
-                format:@"Index (%lu) beyond bounds (%lu)",
-                       (unsigned long)index, (unsigned long)_count];
-  }
-  return _values[index];
-}
-
-- (void)internalResizeToCapacity:(NSUInteger)newCapacity {
-  _values = reallocf(_values, newCapacity * sizeof(float));
-  if (_values == NULL) {
-    _capacity = 0;
-    _count = 0;
-    [NSException raise:NSMallocException
-                format:@"Failed to allocate %lu bytes",
-                       (unsigned long)(newCapacity * sizeof(float))];
-  }
-  _capacity = newCapacity;
-}
-
-- (void)addValue:(float)value {
-  [self addValues:&value count:1];
-}
-
-- (void)addValues:(const float [])values count:(NSUInteger)count {
-  if (values == NULL || count == 0) return;
-  NSUInteger initialCount = _count;
-  NSUInteger newCount = initialCount + count;
-  if (newCount > _capacity) {
-    [self internalResizeToCapacity:CapacityFromCount(newCount)];
-  }
-  _count = newCount;
-  memcpy(&_values[initialCount], values, count * sizeof(float));
-  if (_autocreator) {
-    GPBAutocreatedArrayModified(_autocreator, self);
-  }
-}
-
-- (void)insertValue:(float)value atIndex:(NSUInteger)index {
-  if (index >= _count + 1) {
-    [NSException raise:NSRangeException
-                format:@"Index (%lu) beyond bounds (%lu)",
-                       (unsigned long)index, (unsigned long)_count + 1];
-  }
-  NSUInteger initialCount = _count;
-  NSUInteger newCount = initialCount + 1;
-  if (newCount > _capacity) {
-    [self internalResizeToCapacity:CapacityFromCount(newCount)];
-  }
-  _count = newCount;
-  if (index != initialCount) {
-    memmove(&_values[index + 1], &_values[index], (initialCount - index) * sizeof(float));
-  }
-  _values[index] = value;
-  if (_autocreator) {
-    GPBAutocreatedArrayModified(_autocreator, self);
-  }
-}
-
-- (void)replaceValueAtIndex:(NSUInteger)index withValue:(float)value {
-  if (index >= _count) {
-    [NSException raise:NSRangeException
-                format:@"Index (%lu) beyond bounds (%lu)",
-                       (unsigned long)index, (unsigned long)_count];
-  }
-  _values[index] = value;
-}
-
-- (void)addValuesFromArray:(GPBFloatArray *)array {
-  [self addValues:array->_values count:array->_count];
-}
-
-- (void)removeValueAtIndex:(NSUInteger)index {
-  if (index >= _count) {
-    [NSException raise:NSRangeException
-                format:@"Index (%lu) beyond bounds (%lu)",
-                       (unsigned long)index, (unsigned long)_count];
-  }
-  NSUInteger newCount = _count - 1;
-  if (index != newCount) {
-    memmove(&_values[index], &_values[index + 1], (newCount - index) * sizeof(float));
-  }
-  _count = newCount;
-  if ((newCount + (2 * kChunkSize)) < _capacity) {
-    [self internalResizeToCapacity:CapacityFromCount(newCount)];
-  }
-}
-
-- (void)removeAll {
-  _count = 0;
-  if ((0 + (2 * kChunkSize)) < _capacity) {
-    [self internalResizeToCapacity:CapacityFromCount(0)];
-  }
-}
-
-- (void)exchangeValueAtIndex:(NSUInteger)idx1
-            withValueAtIndex:(NSUInteger)idx2 {
-  if (idx1 >= _count) {
-    [NSException raise:NSRangeException
-                format:@"Index (%lu) beyond bounds (%lu)",
-                       (unsigned long)idx1, (unsigned long)_count];
-  }
-  if (idx2 >= _count) {
-    [NSException raise:NSRangeException
-                format:@"Index (%lu) beyond bounds (%lu)",
-                       (unsigned long)idx2, (unsigned long)_count];
-  }
-  float temp = _values[idx1];
-  _values[idx1] = _values[idx2];
-  _values[idx2] = temp;
-}
-
-@end
-
-// clang-format on
-//%PDDM-EXPAND ARRAY_INTERFACE_SIMPLE(Double, double, %lf)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-#pragma mark - Double
-
-@implementation GPBDoubleArray {
- @package
-  double *_values;
-  NSUInteger _count;
-  NSUInteger _capacity;
-}
-
-@synthesize count = _count;
-
-+ (instancetype)array {
-  return [[[self alloc] init] autorelease];
-}
-
-+ (instancetype)arrayWithValue:(double)value {
-  // Cast is needed so the compiler knows what class we are invoking initWithValues: on to get
-  // the type correct.
-  return [[(GPBDoubleArray*)[self alloc] initWithValues:&value count:1] autorelease];
-}
-
-+ (instancetype)arrayWithValueArray:(GPBDoubleArray *)array {
-  return [[(GPBDoubleArray*)[self alloc] initWithValueArray:array] autorelease];
-}
-
-+ (instancetype)arrayWithCapacity:(NSUInteger)count {
-  return [[[self alloc] initWithCapacity:count] autorelease];
-}
-
-- (instancetype)init {
-  self = [super init];
-  // No work needed;
-  return self;
-}
-
-- (instancetype)initWithValueArray:(GPBDoubleArray *)array {
-  return [self initWithValues:array->_values count:array->_count];
-}
-
-- (instancetype)initWithValues:(const double [])values count:(NSUInteger)count {
-  self = [self init];
-  if (self) {
-    if (count && values) {
-      _values = reallocf(_values, count * sizeof(double));
-      if (_values != NULL) {
-        _capacity = count;
-        memcpy(_values, values, count * sizeof(double));
-        _count = count;
-      } else {
-        [self release];
-        [NSException raise:NSMallocException
-                    format:@"Failed to allocate %lu bytes",
-                           (unsigned long)(count * sizeof(double))];
-      }
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithCapacity:(NSUInteger)count {
-  self = [self initWithValues:NULL count:0];
-  if (self && count) {
-    [self internalResizeToCapacity:count];
-  }
-  return self;
-}
-
-- (instancetype)copyWithZone:(NSZone *)zone {
-  return [[GPBDoubleArray allocWithZone:zone] initWithValues:_values count:_count];
-}
-
-- (void)dealloc {
-  NSAssert(!_autocreator,
-           @"%@: Autocreator must be cleared before release, autocreator: %@",
-           [self class], _autocreator);
-  free(_values);
-  [super dealloc];
-}
-
-- (BOOL)isEqual:(id)other {
-  if (self == other) {
-    return YES;
-  }
-  if (![other isKindOfClass:[GPBDoubleArray class]]) {
-    return NO;
-  }
-  GPBDoubleArray *otherArray = other;
-  return (_count == otherArray->_count
-          && memcmp(_values, otherArray->_values, (_count * sizeof(double))) == 0);
-}
-
-- (NSUInteger)hash {
-  // Follow NSArray's lead, and use the count as the hash.
-  return _count;
-}
-
-- (NSString *)description {
-  NSMutableString *result = [NSMutableString stringWithFormat:@"<%@ %p> { ", [self class], self];
-  for (NSUInteger i = 0, count = _count; i < count; ++i) {
-    if (i == 0) {
-      [result appendFormat:@"%lf", _values[i]];
-    } else {
-      [result appendFormat:@", %lf", _values[i]];
-    }
-  }
-  [result appendFormat:@" }"];
-  return result;
-}
-
-- (void)enumerateValuesWithBlock:(void (NS_NOESCAPE ^)(double value, NSUInteger idx, BOOL *stop))block {
-  [self enumerateValuesWithOptions:(NSEnumerationOptions)0 usingBlock:block];
-}
-
-- (void)enumerateValuesWithOptions:(NSEnumerationOptions)opts
-                        usingBlock:(void (NS_NOESCAPE ^)(double value, NSUInteger idx, BOOL *stop))block {
-  // NSEnumerationConcurrent isn't currently supported (and Apple's docs say that is ok).
-  BOOL stop = NO;
-  if ((opts & NSEnumerationReverse) == 0) {
-    for (NSUInteger i = 0, count = _count; i < count; ++i) {
-      block(_values[i], i, &stop);
-      if (stop) break;
-    }
-  } else if (_count > 0) {
-    for (NSUInteger i = _count; i > 0; --i) {
-      block(_values[i - 1], (i - 1), &stop);
-      if (stop) break;
-    }
-  }
-}
-
-- (double)valueAtIndex:(NSUInteger)index {
-  if (index >= _count) {
-    [NSException raise:NSRangeException
-                format:@"Index (%lu) beyond bounds (%lu)",
-                       (unsigned long)index, (unsigned long)_count];
-  }
-  return _values[index];
-}
-
-- (void)internalResizeToCapacity:(NSUInteger)newCapacity {
-  _values = reallocf(_values, newCapacity * sizeof(double));
-  if (_values == NULL) {
-    _capacity = 0;
-    _count = 0;
-    [NSException raise:NSMallocException
-                format:@"Failed to allocate %lu bytes",
-                       (unsigned long)(newCapacity * sizeof(double))];
-  }
-  _capacity = newCapacity;
-}
-
-- (void)addValue:(double)value {
-  [self addValues:&value count:1];
-}
-
-- (void)addValues:(const double [])values count:(NSUInteger)count {
-  if (values == NULL || count == 0) return;
-  NSUInteger initialCount = _count;
-  NSUInteger newCount = initialCount + count;
-  if (newCount > _capacity) {
-    [self internalResizeToCapacity:CapacityFromCount(newCount)];
-  }
-  _count = newCount;
-  memcpy(&_values[initialCount], values, count * sizeof(double));
-  if (_autocreator) {
-    GPBAutocreatedArrayModified(_autocreator, self);
-  }
-}
-
-- (void)insertValue:(double)value atIndex:(NSUInteger)index {
-  if (index >= _count + 1) {
-    [NSException raise:NSRangeException
-                format:@"Index (%lu) beyond bounds (%lu)",
-                       (unsigned long)index, (unsigned long)_count + 1];
-  }
-  NSUInteger initialCount = _count;
-  NSUInteger newCount = initialCount + 1;
-  if (newCount > _capacity) {
-    [self internalResizeToCapacity:CapacityFromCount(newCount)];
-  }
-  _count = newCount;
-  if (index != initialCount) {
-    memmove(&_values[index + 1], &_values[index], (initialCount - index) * sizeof(double));
-  }
-  _values[index] = value;
-  if (_autocreator) {
-    GPBAutocreatedArrayModified(_autocreator, self);
-  }
-}
-
-- (void)replaceValueAtIndex:(NSUInteger)index withValue:(double)value {
-  if (index >= _count) {
-    [NSException raise:NSRangeException
-                format:@"Index (%lu) beyond bounds (%lu)",
-                       (unsigned long)index, (unsigned long)_count];
-  }
-  _values[index] = value;
-}
-
-- (void)addValuesFromArray:(GPBDoubleArray *)array {
-  [self addValues:array->_values count:array->_count];
-}
-
-- (void)removeValueAtIndex:(NSUInteger)index {
-  if (index >= _count) {
-    [NSException raise:NSRangeException
-                format:@"Index (%lu) beyond bounds (%lu)",
-                       (unsigned long)index, (unsigned long)_count];
-  }
-  NSUInteger newCount = _count - 1;
-  if (index != newCount) {
-    memmove(&_values[index], &_values[index + 1], (newCount - index) * sizeof(double));
-  }
-  _count = newCount;
-  if ((newCount + (2 * kChunkSize)) < _capacity) {
-    [self internalResizeToCapacity:CapacityFromCount(newCount)];
-  }
-}
-
-- (void)removeAll {
-  _count = 0;
-  if ((0 + (2 * kChunkSize)) < _capacity) {
-    [self internalResizeToCapacity:CapacityFromCount(0)];
-  }
-}
-
-- (void)exchangeValueAtIndex:(NSUInteger)idx1
-            withValueAtIndex:(NSUInteger)idx2 {
-  if (idx1 >= _count) {
-    [NSException raise:NSRangeException
-                format:@"Index (%lu) beyond bounds (%lu)",
-                       (unsigned long)idx1, (unsigned long)_count];
-  }
-  if (idx2 >= _count) {
-    [NSException raise:NSRangeException
-                format:@"Index (%lu) beyond bounds (%lu)",
-                       (unsigned long)idx2, (unsigned long)_count];
-  }
-  double temp = _values[idx1];
-  _values[idx1] = _values[idx2];
-  _values[idx2] = temp;
-}
-
-@end
-
-// clang-format on
-//%PDDM-EXPAND ARRAY_INTERFACE_SIMPLE(Bool, BOOL, %d)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-#pragma mark - Bool
-
-@implementation GPBBoolArray {
- @package
-  BOOL *_values;
-  NSUInteger _count;
-  NSUInteger _capacity;
-}
-
-@synthesize count = _count;
-
-+ (instancetype)array {
-  return [[[self alloc] init] autorelease];
-}
-
-+ (instancetype)arrayWithValue:(BOOL)value {
-  // Cast is needed so the compiler knows what class we are invoking initWithValues: on to get
-  // the type correct.
-  return [[(GPBBoolArray*)[self alloc] initWithValues:&value count:1] autorelease];
-}
-
-+ (instancetype)arrayWithValueArray:(GPBBoolArray *)array {
-  return [[(GPBBoolArray*)[self alloc] initWithValueArray:array] autorelease];
-}
-
-+ (instancetype)arrayWithCapacity:(NSUInteger)count {
-  return [[[self alloc] initWithCapacity:count] autorelease];
-}
-
-- (instancetype)init {
-  self = [super init];
-  // No work needed;
-  return self;
-}
-
-- (instancetype)initWithValueArray:(GPBBoolArray *)array {
-  return [self initWithValues:array->_values count:array->_count];
-}
-
-- (instancetype)initWithValues:(const BOOL [])values count:(NSUInteger)count {
-  self = [self init];
-  if (self) {
-    if (count && values) {
-      _values = reallocf(_values, count * sizeof(BOOL));
-      if (_values != NULL) {
-        _capacity = count;
-        memcpy(_values, values, count * sizeof(BOOL));
-        _count = count;
-      } else {
-        [self release];
-        [NSException raise:NSMallocException
-                    format:@"Failed to allocate %lu bytes",
-                           (unsigned long)(count * sizeof(BOOL))];
-      }
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithCapacity:(NSUInteger)count {
-  self = [self initWithValues:NULL count:0];
-  if (self && count) {
-    [self internalResizeToCapacity:count];
-  }
-  return self;
-}
-
-- (instancetype)copyWithZone:(NSZone *)zone {
-  return [[GPBBoolArray allocWithZone:zone] initWithValues:_values count:_count];
-}
-
-- (void)dealloc {
-  NSAssert(!_autocreator,
-           @"%@: Autocreator must be cleared before release, autocreator: %@",
-           [self class], _autocreator);
-  free(_values);
-  [super dealloc];
-}
-
-- (BOOL)isEqual:(id)other {
-  if (self == other) {
-    return YES;
-  }
-  if (![other isKindOfClass:[GPBBoolArray class]]) {
-    return NO;
-  }
-  GPBBoolArray *otherArray = other;
-  return (_count == otherArray->_count
-          && memcmp(_values, otherArray->_values, (_count * sizeof(BOOL))) == 0);
-}
-
-- (NSUInteger)hash {
-  // Follow NSArray's lead, and use the count as the hash.
-  return _count;
-}
-
-- (NSString *)description {
-  NSMutableString *result = [NSMutableString stringWithFormat:@"<%@ %p> { ", [self class], self];
-  for (NSUInteger i = 0, count = _count; i < count; ++i) {
-    if (i == 0) {
-      [result appendFormat:@"%d", _values[i]];
-    } else {
-      [result appendFormat:@", %d", _values[i]];
-    }
-  }
-  [result appendFormat:@" }"];
-  return result;
-}
-
-- (void)enumerateValuesWithBlock:(void (NS_NOESCAPE ^)(BOOL value, NSUInteger idx, BOOL *stop))block {
-  [self enumerateValuesWithOptions:(NSEnumerationOptions)0 usingBlock:block];
-}
-
-- (void)enumerateValuesWithOptions:(NSEnumerationOptions)opts
-                        usingBlock:(void (NS_NOESCAPE ^)(BOOL value, NSUInteger idx, BOOL *stop))block {
-  // NSEnumerationConcurrent isn't currently supported (and Apple's docs say that is ok).
-  BOOL stop = NO;
-  if ((opts & NSEnumerationReverse) == 0) {
-    for (NSUInteger i = 0, count = _count; i < count; ++i) {
-      block(_values[i], i, &stop);
-      if (stop) break;
-    }
-  } else if (_count > 0) {
-    for (NSUInteger i = _count; i > 0; --i) {
-      block(_values[i - 1], (i - 1), &stop);
-      if (stop) break;
-    }
-  }
-}
-
-- (BOOL)valueAtIndex:(NSUInteger)index {
-  if (index >= _count) {
-    [NSException raise:NSRangeException
-                format:@"Index (%lu) beyond bounds (%lu)",
-                       (unsigned long)index, (unsigned long)_count];
-  }
-  return _values[index];
-}
-
-- (void)internalResizeToCapacity:(NSUInteger)newCapacity {
-  _values = reallocf(_values, newCapacity * sizeof(BOOL));
-  if (_values == NULL) {
-    _capacity = 0;
-    _count = 0;
-    [NSException raise:NSMallocException
-                format:@"Failed to allocate %lu bytes",
-                       (unsigned long)(newCapacity * sizeof(BOOL))];
-  }
-  _capacity = newCapacity;
-}
-
-- (void)addValue:(BOOL)value {
-  [self addValues:&value count:1];
-}
-
-- (void)addValues:(const BOOL [])values count:(NSUInteger)count {
-  if (values == NULL || count == 0) return;
-  NSUInteger initialCount = _count;
-  NSUInteger newCount = initialCount + count;
-  if (newCount > _capacity) {
-    [self internalResizeToCapacity:CapacityFromCount(newCount)];
-  }
-  _count = newCount;
-  memcpy(&_values[initialCount], values, count * sizeof(BOOL));
-  if (_autocreator) {
-    GPBAutocreatedArrayModified(_autocreator, self);
-  }
-}
-
-- (void)insertValue:(BOOL)value atIndex:(NSUInteger)index {
-  if (index >= _count + 1) {
-    [NSException raise:NSRangeException
-                format:@"Index (%lu) beyond bounds (%lu)",
-                       (unsigned long)index, (unsigned long)_count + 1];
-  }
-  NSUInteger initialCount = _count;
-  NSUInteger newCount = initialCount + 1;
-  if (newCount > _capacity) {
-    [self internalResizeToCapacity:CapacityFromCount(newCount)];
-  }
-  _count = newCount;
-  if (index != initialCount) {
-    memmove(&_values[index + 1], &_values[index], (initialCount - index) * sizeof(BOOL));
-  }
-  _values[index] = value;
-  if (_autocreator) {
-    GPBAutocreatedArrayModified(_autocreator, self);
-  }
-}
-
-- (void)replaceValueAtIndex:(NSUInteger)index withValue:(BOOL)value {
-  if (index >= _count) {
-    [NSException raise:NSRangeException
-                format:@"Index (%lu) beyond bounds (%lu)",
-                       (unsigned long)index, (unsigned long)_count];
-  }
-  _values[index] = value;
-}
-
-- (void)addValuesFromArray:(GPBBoolArray *)array {
-  [self addValues:array->_values count:array->_count];
-}
-
-- (void)removeValueAtIndex:(NSUInteger)index {
-  if (index >= _count) {
-    [NSException raise:NSRangeException
-                format:@"Index (%lu) beyond bounds (%lu)",
-                       (unsigned long)index, (unsigned long)_count];
-  }
-  NSUInteger newCount = _count - 1;
-  if (index != newCount) {
-    memmove(&_values[index], &_values[index + 1], (newCount - index) * sizeof(BOOL));
-  }
-  _count = newCount;
-  if ((newCount + (2 * kChunkSize)) < _capacity) {
-    [self internalResizeToCapacity:CapacityFromCount(newCount)];
-  }
-}
-
-- (void)removeAll {
-  _count = 0;
-  if ((0 + (2 * kChunkSize)) < _capacity) {
-    [self internalResizeToCapacity:CapacityFromCount(0)];
-  }
-}
-
-- (void)exchangeValueAtIndex:(NSUInteger)idx1
-            withValueAtIndex:(NSUInteger)idx2 {
-  if (idx1 >= _count) {
-    [NSException raise:NSRangeException
-                format:@"Index (%lu) beyond bounds (%lu)",
-                       (unsigned long)idx1, (unsigned long)_count];
-  }
-  if (idx2 >= _count) {
-    [NSException raise:NSRangeException
-                format:@"Index (%lu) beyond bounds (%lu)",
-                       (unsigned long)idx2, (unsigned long)_count];
-  }
-  BOOL temp = _values[idx1];
-  _values[idx1] = _values[idx2];
-  _values[idx2] = temp;
-}
-
-@end
-
-// clang-format on
-//%PDDM-EXPAND-END (7 expansions)
-
-#pragma mark - Enum
-
-@implementation GPBEnumArray {
- @package
-  GPBEnumValidationFunc _validationFunc;
-  int32_t *_values;
-  NSUInteger _count;
-  NSUInteger _capacity;
-}
-
-@synthesize count = _count;
-@synthesize validationFunc = _validationFunc;
-
-+ (instancetype)array {
-  return [[[self alloc] initWithValidationFunction:NULL] autorelease];
-}
-
-+ (instancetype)arrayWithValidationFunction:(GPBEnumValidationFunc)func {
-  return [[[self alloc] initWithValidationFunction:func] autorelease];
-}
-
-+ (instancetype)arrayWithValidationFunction:(GPBEnumValidationFunc)func
-                                   rawValue:(int32_t)value {
-  return [[[self alloc] initWithValidationFunction:func
-                                         rawValues:&value
-                                             count:1] autorelease];
-}
-
-+ (instancetype)arrayWithValueArray:(GPBEnumArray *)array {
-  return [[(GPBEnumArray*)[self alloc] initWithValueArray:array] autorelease];
-}
-
-+ (instancetype)arrayWithValidationFunction:(GPBEnumValidationFunc)func
-                                   capacity:(NSUInteger)count {
-  return [[[self alloc] initWithValidationFunction:func capacity:count] autorelease];
-}
-
-- (instancetype)init {
-  return [self initWithValidationFunction:NULL];
-}
-
-- (instancetype)initWithValueArray:(GPBEnumArray *)array {
-  return [self initWithValidationFunction:array->_validationFunc
-                                rawValues:array->_values
-                                    count:array->_count];
-}
-
-- (instancetype)initWithValidationFunction:(GPBEnumValidationFunc)func {
-  self = [super init];
-  if (self) {
-    _validationFunc = (func != NULL ? func : ArrayDefault_IsValidValue);
-  }
-  return self;
-}
-
-- (instancetype)initWithValidationFunction:(GPBEnumValidationFunc)func
-                                 rawValues:(const int32_t [])values
-                                     count:(NSUInteger)count {
-  self = [self initWithValidationFunction:func];
-  if (self) {
-    if (count && values) {
-      _values = reallocf(_values, count * sizeof(int32_t));
-      if (_values != NULL) {
-        _capacity = count;
-        memcpy(_values, values, count * sizeof(int32_t));
-        _count = count;
-      } else {
-        [self release];
-        [NSException raise:NSMallocException
-                    format:@"Failed to allocate %lu bytes",
-                           (unsigned long)(count * sizeof(int32_t))];
-      }
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithValidationFunction:(GPBEnumValidationFunc)func
-                                  capacity:(NSUInteger)count {
-  self = [self initWithValidationFunction:func];
-  if (self && count) {
-    [self internalResizeToCapacity:count];
-  }
-  return self;
-}
-
-- (instancetype)copyWithZone:(NSZone *)zone {
-  return [[GPBEnumArray allocWithZone:zone]
-             initWithValidationFunction:_validationFunc
-                              rawValues:_values
-                                  count:_count];
-}
-
-//%PDDM-EXPAND ARRAY_IMMUTABLE_CORE(Enum, int32_t, Raw, %d)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-- (void)dealloc {
-  NSAssert(!_autocreator,
-           @"%@: Autocreator must be cleared before release, autocreator: %@",
-           [self class], _autocreator);
-  free(_values);
-  [super dealloc];
-}
-
-- (BOOL)isEqual:(id)other {
-  if (self == other) {
-    return YES;
-  }
-  if (![other isKindOfClass:[GPBEnumArray class]]) {
-    return NO;
-  }
-  GPBEnumArray *otherArray = other;
-  return (_count == otherArray->_count
-          && memcmp(_values, otherArray->_values, (_count * sizeof(int32_t))) == 0);
-}
-
-- (NSUInteger)hash {
-  // Follow NSArray's lead, and use the count as the hash.
-  return _count;
-}
-
-- (NSString *)description {
-  NSMutableString *result = [NSMutableString stringWithFormat:@"<%@ %p> { ", [self class], self];
-  for (NSUInteger i = 0, count = _count; i < count; ++i) {
-    if (i == 0) {
-      [result appendFormat:@"%d", _values[i]];
-    } else {
-      [result appendFormat:@", %d", _values[i]];
-    }
-  }
-  [result appendFormat:@" }"];
-  return result;
-}
-
-- (void)enumerateRawValuesWithBlock:(void (NS_NOESCAPE ^)(int32_t value, NSUInteger idx, BOOL *stop))block {
-  [self enumerateRawValuesWithOptions:(NSEnumerationOptions)0 usingBlock:block];
-}
-
-- (void)enumerateRawValuesWithOptions:(NSEnumerationOptions)opts
-                           usingBlock:(void (NS_NOESCAPE ^)(int32_t value, NSUInteger idx, BOOL *stop))block {
-  // NSEnumerationConcurrent isn't currently supported (and Apple's docs say that is ok).
-  BOOL stop = NO;
-  if ((opts & NSEnumerationReverse) == 0) {
-    for (NSUInteger i = 0, count = _count; i < count; ++i) {
-      block(_values[i], i, &stop);
-      if (stop) break;
-    }
-  } else if (_count > 0) {
-    for (NSUInteger i = _count; i > 0; --i) {
-      block(_values[i - 1], (i - 1), &stop);
-      if (stop) break;
-    }
-  }
-}
-// clang-format on
-//%PDDM-EXPAND-END ARRAY_IMMUTABLE_CORE(Enum, int32_t, Raw, %d)
-
-- (int32_t)valueAtIndex:(NSUInteger)index {
-//%PDDM-EXPAND VALIDATE_RANGE(index, _count)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-  if (index >= _count) {
-    [NSException raise:NSRangeException
-                format:@"Index (%lu) beyond bounds (%lu)",
-                       (unsigned long)index, (unsigned long)_count];
-  }
-// clang-format on
-//%PDDM-EXPAND-END VALIDATE_RANGE(index, _count)
-  int32_t result = _values[index];
-  if (!_validationFunc(result)) {
-    result = kGPBUnrecognizedEnumeratorValue;
-  }
-  return result;
-}
-
-- (int32_t)rawValueAtIndex:(NSUInteger)index {
-//%PDDM-EXPAND VALIDATE_RANGE(index, _count)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-  if (index >= _count) {
-    [NSException raise:NSRangeException
-                format:@"Index (%lu) beyond bounds (%lu)",
-                       (unsigned long)index, (unsigned long)_count];
-  }
-// clang-format on
-//%PDDM-EXPAND-END VALIDATE_RANGE(index, _count)
-  return _values[index];
-}
-
-- (void)enumerateValuesWithBlock:(void (NS_NOESCAPE ^)(int32_t value, NSUInteger idx, BOOL *stop))block {
-  [self enumerateValuesWithOptions:(NSEnumerationOptions)0 usingBlock:block];
-}
-
-- (void)enumerateValuesWithOptions:(NSEnumerationOptions)opts
-                        usingBlock:(void (NS_NOESCAPE ^)(int32_t value, NSUInteger idx, BOOL *stop))block {
-  // NSEnumerationConcurrent isn't currently supported (and Apple's docs say that is ok).
-  BOOL stop = NO;
-  GPBEnumValidationFunc func = _validationFunc;
-  if ((opts & NSEnumerationReverse) == 0) {
-    int32_t *scan = _values;
-    int32_t *end = scan + _count;
-    for (NSUInteger i = 0; scan < end; ++i, ++scan) {
-      int32_t value = *scan;
-      if (!func(value)) {
-        value = kGPBUnrecognizedEnumeratorValue;
-      }
-      block(value, i, &stop);
-      if (stop) break;
-    }
-  } else if (_count > 0) {
-    int32_t *end = _values;
-    int32_t *scan = end + (_count - 1);
-    for (NSUInteger i = (_count - 1); scan >= end; --i, --scan) {
-      int32_t value = *scan;
-      if (!func(value)) {
-        value = kGPBUnrecognizedEnumeratorValue;
-      }
-      block(value, i, &stop);
-      if (stop) break;
-    }
-  }
-}
-
-//%PDDM-EXPAND ARRAY_MUTABLE_CORE(Enum, int32_t, Raw, %d)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-- (void)internalResizeToCapacity:(NSUInteger)newCapacity {
-  _values = reallocf(_values, newCapacity * sizeof(int32_t));
-  if (_values == NULL) {
-    _capacity = 0;
-    _count = 0;
-    [NSException raise:NSMallocException
-                format:@"Failed to allocate %lu bytes",
-                       (unsigned long)(newCapacity * sizeof(int32_t))];
-  }
-  _capacity = newCapacity;
-}
-
-- (void)addRawValue:(int32_t)value {
-  [self addRawValues:&value count:1];
-}
-
-- (void)addRawValues:(const int32_t [])values count:(NSUInteger)count {
-  if (values == NULL || count == 0) return;
-  NSUInteger initialCount = _count;
-  NSUInteger newCount = initialCount + count;
-  if (newCount > _capacity) {
-    [self internalResizeToCapacity:CapacityFromCount(newCount)];
-  }
-  _count = newCount;
-  memcpy(&_values[initialCount], values, count * sizeof(int32_t));
-  if (_autocreator) {
-    GPBAutocreatedArrayModified(_autocreator, self);
-  }
-}
-
-- (void)insertRawValue:(int32_t)value atIndex:(NSUInteger)index {
-  if (index >= _count + 1) {
-    [NSException raise:NSRangeException
-                format:@"Index (%lu) beyond bounds (%lu)",
-                       (unsigned long)index, (unsigned long)_count + 1];
-  }
-  NSUInteger initialCount = _count;
-  NSUInteger newCount = initialCount + 1;
-  if (newCount > _capacity) {
-    [self internalResizeToCapacity:CapacityFromCount(newCount)];
-  }
-  _count = newCount;
-  if (index != initialCount) {
-    memmove(&_values[index + 1], &_values[index], (initialCount - index) * sizeof(int32_t));
-  }
-  _values[index] = value;
-  if (_autocreator) {
-    GPBAutocreatedArrayModified(_autocreator, self);
-  }
-}
-
-- (void)replaceValueAtIndex:(NSUInteger)index withRawValue:(int32_t)value {
-  if (index >= _count) {
-    [NSException raise:NSRangeException
-                format:@"Index (%lu) beyond bounds (%lu)",
-                       (unsigned long)index, (unsigned long)_count];
-  }
-  _values[index] = value;
-}
-
-- (void)addRawValuesFromArray:(GPBEnumArray *)array {
-  [self addRawValues:array->_values count:array->_count];
-}
-
-- (void)removeValueAtIndex:(NSUInteger)index {
-  if (index >= _count) {
-    [NSException raise:NSRangeException
-                format:@"Index (%lu) beyond bounds (%lu)",
-                       (unsigned long)index, (unsigned long)_count];
-  }
-  NSUInteger newCount = _count - 1;
-  if (index != newCount) {
-    memmove(&_values[index], &_values[index + 1], (newCount - index) * sizeof(int32_t));
-  }
-  _count = newCount;
-  if ((newCount + (2 * kChunkSize)) < _capacity) {
-    [self internalResizeToCapacity:CapacityFromCount(newCount)];
-  }
-}
-
-- (void)removeAll {
-  _count = 0;
-  if ((0 + (2 * kChunkSize)) < _capacity) {
-    [self internalResizeToCapacity:CapacityFromCount(0)];
-  }
-}
-
-- (void)exchangeValueAtIndex:(NSUInteger)idx1
-            withValueAtIndex:(NSUInteger)idx2 {
-  if (idx1 >= _count) {
-    [NSException raise:NSRangeException
-                format:@"Index (%lu) beyond bounds (%lu)",
-                       (unsigned long)idx1, (unsigned long)_count];
-  }
-  if (idx2 >= _count) {
-    [NSException raise:NSRangeException
-                format:@"Index (%lu) beyond bounds (%lu)",
-                       (unsigned long)idx2, (unsigned long)_count];
-  }
-  int32_t temp = _values[idx1];
-  _values[idx1] = _values[idx2];
-  _values[idx2] = temp;
-}
-
-// clang-format on
-//%PDDM-EXPAND MUTATION_METHODS(Enum, int32_t, , EnumValidationList, EnumValidationOne)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-- (void)addValue:(int32_t)value {
-  [self addValues:&value count:1];
-}
-
-- (void)addValues:(const int32_t [])values count:(NSUInteger)count {
-  if (values == NULL || count == 0) return;
-  GPBEnumValidationFunc func = _validationFunc;
-  for (NSUInteger i = 0; i < count; ++i) {
-    if (!func(values[i])) {
-      [NSException raise:NSInvalidArgumentException
-                  format:@"%@: Attempt to set an unknown enum value (%d)",
-                         [self class], values[i]];
-    }
-  }
-  NSUInteger initialCount = _count;
-  NSUInteger newCount = initialCount + count;
-  if (newCount > _capacity) {
-    [self internalResizeToCapacity:CapacityFromCount(newCount)];
-  }
-  _count = newCount;
-  memcpy(&_values[initialCount], values, count * sizeof(int32_t));
-  if (_autocreator) {
-    GPBAutocreatedArrayModified(_autocreator, self);
-  }
-}
-
-- (void)insertValue:(int32_t)value atIndex:(NSUInteger)index {
-  if (index >= _count + 1) {
-    [NSException raise:NSRangeException
-                format:@"Index (%lu) beyond bounds (%lu)",
-                       (unsigned long)index, (unsigned long)_count + 1];
-  }
-  if (!_validationFunc(value)) {
-    [NSException raise:NSInvalidArgumentException
-                format:@"%@: Attempt to set an unknown enum value (%d)",
-                       [self class], value];
-  }
-  NSUInteger initialCount = _count;
-  NSUInteger newCount = initialCount + 1;
-  if (newCount > _capacity) {
-    [self internalResizeToCapacity:CapacityFromCount(newCount)];
-  }
-  _count = newCount;
-  if (index != initialCount) {
-    memmove(&_values[index + 1], &_values[index], (initialCount - index) * sizeof(int32_t));
-  }
-  _values[index] = value;
-  if (_autocreator) {
-    GPBAutocreatedArrayModified(_autocreator, self);
-  }
-}
-
-- (void)replaceValueAtIndex:(NSUInteger)index withValue:(int32_t)value {
-  if (index >= _count) {
-    [NSException raise:NSRangeException
-                format:@"Index (%lu) beyond bounds (%lu)",
-                       (unsigned long)index, (unsigned long)_count];
-  }
-  if (!_validationFunc(value)) {
-    [NSException raise:NSInvalidArgumentException
-                format:@"%@: Attempt to set an unknown enum value (%d)",
-                       [self class], value];
-  }
-  _values[index] = value;
-}
-// clang-format on
-//%PDDM-EXPAND-END (2 expansions)
-
-//%PDDM-DEFINE MUTATION_HOOK_EnumValidationList()
-//%  GPBEnumValidationFunc func = _validationFunc;
-//%  for (NSUInteger i = 0; i < count; ++i) {
-//%    if (!func(values[i])) {
-//%      [NSException raise:NSInvalidArgumentException
-//%                  format:@"%@: Attempt to set an unknown enum value (%d)",
-//%                         [self class], values[i]];
-//%    }
-//%  }
-//%
-//%PDDM-DEFINE MUTATION_HOOK_EnumValidationOne()
-//%  if (!_validationFunc(value)) {
-//%    [NSException raise:NSInvalidArgumentException
-//%                format:@"%@: Attempt to set an unknown enum value (%d)",
-//%                       [self class], value];
-//%  }
-//%
-
-@end
-
-#pragma mark - NSArray Subclass
-
-@implementation GPBAutocreatedArray {
-  NSMutableArray *_array;
-}
-
-- (void)dealloc {
-  NSAssert(!_autocreator,
-           @"%@: Autocreator must be cleared before release, autocreator: %@",
-           [self class], _autocreator);
-  [_array release];
-  [super dealloc];
-}
-
-#pragma mark Required NSArray overrides
-
-- (NSUInteger)count {
-  return [_array count];
-}
-
-- (id)objectAtIndex:(NSUInteger)idx {
-  return [_array objectAtIndex:idx];
-}
-
-#pragma mark Required NSMutableArray overrides
-
-// Only need to call GPBAutocreatedArrayModified() when adding things since
-// we only autocreate empty arrays.
-
-- (void)insertObject:(id)anObject atIndex:(NSUInteger)idx {
-  if (_array == nil) {
-    _array = [[NSMutableArray alloc] init];
-  }
-  [_array insertObject:anObject atIndex:idx];
-
-  if (_autocreator) {
-    GPBAutocreatedArrayModified(_autocreator, self);
-  }
-}
-
-- (void)removeObject:(id)anObject {
-  [_array removeObject:anObject];
-}
-
-- (void)removeObjectAtIndex:(NSUInteger)idx {
-  [_array removeObjectAtIndex:idx];
-}
-
-- (void)addObject:(id)anObject {
-  if (_array == nil) {
-    _array = [[NSMutableArray alloc] init];
-  }
-  [_array addObject:anObject];
-
-  if (_autocreator) {
-    GPBAutocreatedArrayModified(_autocreator, self);
-  }
-}
-
-- (void)removeLastObject {
-  [_array removeLastObject];
-}
-
-- (void)replaceObjectAtIndex:(NSUInteger)idx withObject:(id)anObject {
-  [_array replaceObjectAtIndex:idx withObject:anObject];
-}
-
-#pragma mark Extra things hooked
-
-- (id)copyWithZone:(NSZone *)zone {
-  if (_array == nil) {
-    return [[NSMutableArray allocWithZone:zone] init];
-  }
-  return [_array copyWithZone:zone];
-}
-
-- (id)mutableCopyWithZone:(NSZone *)zone {
-  if (_array == nil) {
-    return [[NSMutableArray allocWithZone:zone] init];
-  }
-  return [_array mutableCopyWithZone:zone];
-}
-
-- (NSUInteger)countByEnumeratingWithState:(NSFastEnumerationState *)state
-                                  objects:(id __unsafe_unretained [])buffer
-                                    count:(NSUInteger)len {
-  return [_array countByEnumeratingWithState:state objects:buffer count:len];
-}
-
-- (void)enumerateObjectsUsingBlock:(void (NS_NOESCAPE ^)(id obj, NSUInteger idx, BOOL *stop))block {
-  [_array enumerateObjectsUsingBlock:block];
-}
-
-- (void)enumerateObjectsWithOptions:(NSEnumerationOptions)opts
-                         usingBlock:(void (NS_NOESCAPE ^)(id obj, NSUInteger idx, BOOL *stop))block {
-  [_array enumerateObjectsWithOptions:opts usingBlock:block];
-}
-
-@end
-
-#pragma clang diagnostic pop
diff --git a/libs/protobuf/objectivec/GPBArray_PackagePrivate.h b/libs/protobuf/objectivec/GPBArray_PackagePrivate.h
deleted file mode 100644
index 07eab89..0000000
--- a/libs/protobuf/objectivec/GPBArray_PackagePrivate.h
+++ /dev/null
@@ -1,132 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#import "GPBArray.h"
-
-@class GPBMessage;
-
-//%PDDM-DEFINE DECLARE_ARRAY_EXTRAS()
-//%ARRAY_INTERFACE_EXTRAS(Int32, int32_t)
-//%ARRAY_INTERFACE_EXTRAS(UInt32, uint32_t)
-//%ARRAY_INTERFACE_EXTRAS(Int64, int64_t)
-//%ARRAY_INTERFACE_EXTRAS(UInt64, uint64_t)
-//%ARRAY_INTERFACE_EXTRAS(Float, float)
-//%ARRAY_INTERFACE_EXTRAS(Double, double)
-//%ARRAY_INTERFACE_EXTRAS(Bool, BOOL)
-//%ARRAY_INTERFACE_EXTRAS(Enum, int32_t)
-
-//%PDDM-DEFINE ARRAY_INTERFACE_EXTRAS(NAME, TYPE)
-//%#pragma mark - NAME
-//%
-//%@interface GPB##NAME##Array () {
-//% @package
-//%  GPB_UNSAFE_UNRETAINED GPBMessage *_autocreator;
-//%}
-//%@end
-//%
-
-//%PDDM-EXPAND DECLARE_ARRAY_EXTRAS()
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-#pragma mark - Int32
-
-@interface GPBInt32Array () {
- @package
-  GPB_UNSAFE_UNRETAINED GPBMessage *_autocreator;
-}
-@end
-
-#pragma mark - UInt32
-
-@interface GPBUInt32Array () {
- @package
-  GPB_UNSAFE_UNRETAINED GPBMessage *_autocreator;
-}
-@end
-
-#pragma mark - Int64
-
-@interface GPBInt64Array () {
- @package
-  GPB_UNSAFE_UNRETAINED GPBMessage *_autocreator;
-}
-@end
-
-#pragma mark - UInt64
-
-@interface GPBUInt64Array () {
- @package
-  GPB_UNSAFE_UNRETAINED GPBMessage *_autocreator;
-}
-@end
-
-#pragma mark - Float
-
-@interface GPBFloatArray () {
- @package
-  GPB_UNSAFE_UNRETAINED GPBMessage *_autocreator;
-}
-@end
-
-#pragma mark - Double
-
-@interface GPBDoubleArray () {
- @package
-  GPB_UNSAFE_UNRETAINED GPBMessage *_autocreator;
-}
-@end
-
-#pragma mark - Bool
-
-@interface GPBBoolArray () {
- @package
-  GPB_UNSAFE_UNRETAINED GPBMessage *_autocreator;
-}
-@end
-
-#pragma mark - Enum
-
-@interface GPBEnumArray () {
- @package
-  GPB_UNSAFE_UNRETAINED GPBMessage *_autocreator;
-}
-@end
-
-// clang-format on
-//%PDDM-EXPAND-END DECLARE_ARRAY_EXTRAS()
-
-#pragma mark - NSArray Subclass
-
-@interface GPBAutocreatedArray : NSMutableArray {
- @package
-  GPB_UNSAFE_UNRETAINED GPBMessage *_autocreator;
-}
-@end
diff --git a/libs/protobuf/objectivec/GPBBootstrap.h b/libs/protobuf/objectivec/GPBBootstrap.h
deleted file mode 100644
index ea5986b..0000000
--- a/libs/protobuf/objectivec/GPBBootstrap.h
+++ /dev/null
@@ -1,146 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-/**
- * The Objective C runtime has complete enough info that most protos don’t end
- * up using this, so leaving it on is no cost or very little cost.  If you
- * happen to see it causing bloat, this is the way to disable it. If you do
- * need to disable it, try only disabling it for Release builds as having
- * full TextFormat can be useful for debugging.
- **/
-#ifndef GPBOBJC_SKIP_MESSAGE_TEXTFORMAT_EXTRAS
-#define GPBOBJC_SKIP_MESSAGE_TEXTFORMAT_EXTRAS 0
-#endif
-
-// Used in the generated code to give sizes to enums. int32_t was chosen based
-// on the fact that Protocol Buffers enums are limited to this range.
-#if !__has_feature(objc_fixed_enum)
- #error All supported Xcode versions should support objc_fixed_enum.
-#endif
-
-// If the headers are imported into Objective-C++, we can run into an issue
-// where the definition of NS_ENUM (really CF_ENUM) changes based on the C++
-// standard that is in effect.  If it isn't C++11 or higher, the definition
-// doesn't allow us to forward declare. We work around this one case by
-// providing a local definition. The default case has to use NS_ENUM for the
-// magic that is Swift bridging of enums.
-#if (defined(__cplusplus) && __cplusplus && __cplusplus < 201103L)
- #define GPB_ENUM(X) enum X : int32_t X; enum X : int32_t
-#else
- #define GPB_ENUM(X) NS_ENUM(int32_t, X)
-#endif
-
-/**
- * GPB_ENUM_FWD_DECLARE is used for forward declaring enums, for example:
- *
- * ```
- * GPB_ENUM_FWD_DECLARE(Foo_Enum)
- *
- * @interface BarClass : NSObject
- * @property (nonatomic) enum Foo_Enum value;
- * - (void)bazMethod:(enum Foo_Enum):value;
- * @end
- * ```
- **/
-#define GPB_ENUM_FWD_DECLARE(X) enum X : int32_t
-
-/**
- * Based upon CF_INLINE. Forces inlining in non DEBUG builds.
- **/
-#if !defined(DEBUG)
-#define GPB_INLINE static __inline__ __attribute__((always_inline))
-#else
-#define GPB_INLINE static __inline__
-#endif
-
-/**
- * For use in public headers that might need to deal with ARC.
- **/
-#ifndef GPB_UNSAFE_UNRETAINED
-#if __has_feature(objc_arc)
-#define GPB_UNSAFE_UNRETAINED __unsafe_unretained
-#else
-#define GPB_UNSAFE_UNRETAINED
-#endif
-#endif
-
-/**
- * Attribute used for Objective-C proto interface deprecations without messages.
- **/
-#ifndef GPB_DEPRECATED
-#define GPB_DEPRECATED __attribute__((deprecated))
-#endif
-
-/**
- * Attribute used for Objective-C proto interface deprecations with messages.
- **/
-#ifndef GPB_DEPRECATED_MSG
-#if __has_extension(attribute_deprecated_with_message)
-#define GPB_DEPRECATED_MSG(msg) __attribute__((deprecated(msg)))
-#else
-#define GPB_DEPRECATED_MSG(msg) __attribute__((deprecated))
-#endif
-#endif
-
-// If property name starts with init we need to annotate it to get past ARC.
-// http://stackoverflow.com/questions/18723226/how-do-i-annotate-an-objective-c-property-with-an-objc-method-family/18723227#18723227
-//
-// Meant to be used internally by generated code.
-#define GPB_METHOD_FAMILY_NONE __attribute__((objc_method_family(none)))
-
-// Prevent subclassing of generated proto classes.
-#ifndef GPB_FINAL
-#define GPB_FINAL __attribute__((objc_subclassing_restricted))
-#endif  // GPB_FINAL
-
-// ----------------------------------------------------------------------------
-// These version numbers are all internal to the ObjC Protobuf runtime; they
-// are used to ensure compatibility between the generated sources and the
-// headers being compiled against and/or the version of sources being run
-// against.
-//
-// They are all #defines so the values are captured into every .o file they
-// are used in and to allow comparisons in the preprocessor.
-
-// Current library runtime version.
-// - Gets bumped when the runtime makes changes to the interfaces between the
-//   generated code and runtime (things added/removed, etc).
-#define GOOGLE_PROTOBUF_OBJC_VERSION 30004
-
-// Minimum runtime version supported for compiling/running against.
-// - Gets changed when support for the older generated code is dropped.
-#define GOOGLE_PROTOBUF_OBJC_MIN_SUPPORTED_VERSION 30001
-
-
-// This is a legacy constant now frozen in time for old generated code. If
-// GOOGLE_PROTOBUF_OBJC_MIN_SUPPORTED_VERSION ever gets moved above 30001 then
-// this should also change to break code compiled with an old runtime that
-// can't be supported any more.
-#define GOOGLE_PROTOBUF_OBJC_GEN_VERSION 30001
diff --git a/libs/protobuf/objectivec/GPBCodedInputStream.h b/libs/protobuf/objectivec/GPBCodedInputStream.h
deleted file mode 100644
index 1886ccf..0000000
--- a/libs/protobuf/objectivec/GPBCodedInputStream.h
+++ /dev/null
@@ -1,253 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#import <Foundation/Foundation.h>
-
-@class GPBMessage;
-@class GPBExtensionRegistry;
-
-NS_ASSUME_NONNULL_BEGIN
-
-CF_EXTERN_C_BEGIN
-
-/**
- * @c GPBCodedInputStream exception name. Exceptions raised from
- * @c GPBCodedInputStream contain an underlying error in the userInfo dictionary
- * under the GPBCodedInputStreamUnderlyingErrorKey key.
- **/
-extern NSString *const GPBCodedInputStreamException;
-
-/** The key under which the underlying NSError from the exception is stored. */
-extern NSString *const GPBCodedInputStreamUnderlyingErrorKey;
-
-/** NSError domain used for @c GPBCodedInputStream errors. */
-extern NSString *const GPBCodedInputStreamErrorDomain;
-
-/**
- * Error code for NSError with @c GPBCodedInputStreamErrorDomain.
- **/
-typedef NS_ENUM(NSInteger, GPBCodedInputStreamErrorCode) {
-  /** The size does not fit in the remaining bytes to be read. */
-  GPBCodedInputStreamErrorInvalidSize = -100,
-  /** Attempted to read beyond the subsection limit. */
-  GPBCodedInputStreamErrorSubsectionLimitReached = -101,
-  /** The requested subsection limit is invalid. */
-  GPBCodedInputStreamErrorInvalidSubsectionLimit = -102,
-  /** Invalid tag read. */
-  GPBCodedInputStreamErrorInvalidTag = -103,
-  /** Invalid UTF-8 character in a string. */
-  GPBCodedInputStreamErrorInvalidUTF8 = -104,
-  /** Invalid VarInt read. */
-  GPBCodedInputStreamErrorInvalidVarInt = -105,
-  /** The maximum recursion depth of messages was exceeded. */
-  GPBCodedInputStreamErrorRecursionDepthExceeded = -106,
-};
-
-CF_EXTERN_C_END
-
-/**
- * Reads and decodes protocol message fields.
- *
- * The common uses of protocol buffers shouldn't need to use this class.
- * @c GPBMessage's provide a @c +parseFromData:error: and
- * @c +parseFromData:extensionRegistry:error: method that will decode a
- * message for you.
- *
- * @note Subclassing of @c GPBCodedInputStream is NOT supported.
- **/
-@interface GPBCodedInputStream : NSObject
-
-/**
- * Creates a new stream wrapping some data.
- *
- * @param data The data to wrap inside the stream.
- *
- * @return A newly instanced GPBCodedInputStream.
- **/
-+ (instancetype)streamWithData:(NSData *)data;
-
-/**
- * Initializes a stream wrapping some data.
- *
- * @param data The data to wrap inside the stream.
- *
- * @return A newly initialized GPBCodedInputStream.
- **/
-- (instancetype)initWithData:(NSData *)data;
-
-/**
- * Attempts to read a field tag, returning zero if we have reached EOF.
- * Protocol message parsers use this to read tags, since a protocol message
- * may legally end wherever a tag occurs, and zero is not a valid tag number.
- *
- * @return The field tag, or zero if EOF was reached.
- **/
-- (int32_t)readTag;
-
-/**
- * @return A double read from the stream.
- **/
-- (double)readDouble;
-/**
- * @return A float read from the stream.
- **/
-- (float)readFloat;
-/**
- * @return A uint64 read from the stream.
- **/
-- (uint64_t)readUInt64;
-/**
- * @return A uint32 read from the stream.
- **/
-- (uint32_t)readUInt32;
-/**
- * @return An int64 read from the stream.
- **/
-- (int64_t)readInt64;
-/**
- * @return An int32 read from the stream.
- **/
-- (int32_t)readInt32;
-/**
- * @return A fixed64 read from the stream.
- **/
-- (uint64_t)readFixed64;
-/**
- * @return A fixed32 read from the stream.
- **/
-- (uint32_t)readFixed32;
-/**
- * @return An enum read from the stream.
- **/
-- (int32_t)readEnum;
-/**
- * @return A sfixed32 read from the stream.
- **/
-- (int32_t)readSFixed32;
-/**
- * @return A fixed64 read from the stream.
- **/
-- (int64_t)readSFixed64;
-/**
- * @return A sint32 read from the stream.
- **/
-- (int32_t)readSInt32;
-/**
- * @return A sint64 read from the stream.
- **/
-- (int64_t)readSInt64;
-/**
- * @return A boolean read from the stream.
- **/
-- (BOOL)readBool;
-/**
- * @return A string read from the stream.
- **/
-- (NSString *)readString;
-/**
- * @return Data read from the stream.
- **/
-- (NSData *)readBytes;
-
-/**
- * Read an embedded message field value from the stream.
- *
- * @param message           The message to set fields on as they are read.
- * @param extensionRegistry An optional extension registry to use to lookup
- *                          extensions for message.
- **/
-- (void)readMessage:(GPBMessage *)message
-  extensionRegistry:(nullable GPBExtensionRegistry *)extensionRegistry;
-
-/**
- * Reads and discards a single field, given its tag value.
- *
- * @param tag The tag number of the field to skip.
- *
- * @return NO if the tag is an endgroup tag (in which case nothing is skipped),
- *         YES in all other cases.
- **/
-- (BOOL)skipField:(int32_t)tag;
-
-/**
- * Reads and discards an entire message. This will read either until EOF or
- * until an endgroup tag, whichever comes first.
- **/
-- (void)skipMessage;
-
-/**
- * Check to see if the logical end of the stream has been reached.
- *
- * @note This can return NO when there is no more data, but the current parsing
- *       expected more data.
- *
- * @return YES if the logical end of the stream has been reached, NO otherwise.
- **/
-- (BOOL)isAtEnd;
-
-/**
- * @return The offset into the stream.
- **/
-- (size_t)position;
-
-/**
- * Moves the limit to the given byte offset starting at the current location.
- *
- * @exception GPBCodedInputStreamException If the requested bytes exceed the
- *            current limit.
- *
- * @param byteLimit The number of bytes to move the limit, offset to the current
- *                  location.
- *
- * @return The limit offset before moving the new limit.
- */
-- (size_t)pushLimit:(size_t)byteLimit;
-
-/**
- * Moves the limit back to the offset as it was before calling pushLimit:.
- *
- * @param oldLimit The number of bytes to move the current limit. Usually this
- *                 is the value returned by the pushLimit: method.
- */
-- (void)popLimit:(size_t)oldLimit;
-
-/**
- * Verifies that the last call to -readTag returned the given tag value. This
- * is used to verify that a nested group ended with the correct end tag.
- *
- * @exception NSParseErrorException If the value does not match the last tag.
- *
- * @param expected The tag that was expected.
- **/
-- (void)checkLastTagWas:(int32_t)expected;
-
-@end
-
-NS_ASSUME_NONNULL_END
diff --git a/libs/protobuf/objectivec/GPBCodedInputStream.m b/libs/protobuf/objectivec/GPBCodedInputStream.m
deleted file mode 100644
index c459391..0000000
--- a/libs/protobuf/objectivec/GPBCodedInputStream.m
+++ /dev/null
@@ -1,513 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#import "GPBCodedInputStream_PackagePrivate.h"
-
-#import "GPBDictionary_PackagePrivate.h"
-#import "GPBMessage_PackagePrivate.h"
-#import "GPBUnknownFieldSet_PackagePrivate.h"
-#import "GPBUtilities_PackagePrivate.h"
-#import "GPBWireFormat.h"
-
-NSString *const GPBCodedInputStreamException =
-    GPBNSStringifySymbol(GPBCodedInputStreamException);
-
-NSString *const GPBCodedInputStreamUnderlyingErrorKey =
-    GPBNSStringifySymbol(GPBCodedInputStreamUnderlyingErrorKey);
-
-NSString *const GPBCodedInputStreamErrorDomain =
-    GPBNSStringifySymbol(GPBCodedInputStreamErrorDomain);
-
-// Matching:
-// https://github.com/protocolbuffers/protobuf/blob/main/java/core/src/main/java/com/google/protobuf/CodedInputStream.java#L62
-//  private static final int DEFAULT_RECURSION_LIMIT = 100;
-// https://github.com/protocolbuffers/protobuf/blob/main/src/google/protobuf/io/coded_stream.cc#L86
-//  int CodedInputStream::default_recursion_limit_ = 100;
-static const NSUInteger kDefaultRecursionLimit = 100;
-
-static void RaiseException(NSInteger code, NSString *reason) {
-  NSDictionary *errorInfo = nil;
-  if ([reason length]) {
-    errorInfo = @{ GPBErrorReasonKey: reason };
-  }
-  NSError *error = [NSError errorWithDomain:GPBCodedInputStreamErrorDomain
-                                       code:code
-                                   userInfo:errorInfo];
-
-  NSDictionary *exceptionInfo =
-      @{ GPBCodedInputStreamUnderlyingErrorKey: error };
-  [[NSException exceptionWithName:GPBCodedInputStreamException
-                           reason:reason
-                         userInfo:exceptionInfo] raise];
-}
-
-static void CheckRecursionLimit(GPBCodedInputStreamState *state) {
-  if (state->recursionDepth >= kDefaultRecursionLimit) {
-    RaiseException(GPBCodedInputStreamErrorRecursionDepthExceeded, nil);
-  }
-}
-
-static void CheckSize(GPBCodedInputStreamState *state, size_t size) {
-  size_t newSize = state->bufferPos + size;
-  if (newSize > state->bufferSize) {
-    RaiseException(GPBCodedInputStreamErrorInvalidSize, nil);
-  }
-  if (newSize > state->currentLimit) {
-    // Fast forward to end of currentLimit;
-    state->bufferPos = state->currentLimit;
-    RaiseException(GPBCodedInputStreamErrorSubsectionLimitReached, nil);
-  }
-}
-
-static int8_t ReadRawByte(GPBCodedInputStreamState *state) {
-  CheckSize(state, sizeof(int8_t));
-  return ((int8_t *)state->bytes)[state->bufferPos++];
-}
-
-static int32_t ReadRawLittleEndian32(GPBCodedInputStreamState *state) {
-  CheckSize(state, sizeof(int32_t));
-  // Not using OSReadLittleInt32 because it has undocumented dependency
-  // on reads being aligned.
-  int32_t value;
-  memcpy(&value, state->bytes + state->bufferPos, sizeof(int32_t));
-  value = OSSwapLittleToHostInt32(value);
-  state->bufferPos += sizeof(int32_t);
-  return value;
-}
-
-static int64_t ReadRawLittleEndian64(GPBCodedInputStreamState *state) {
-  CheckSize(state, sizeof(int64_t));
-  // Not using OSReadLittleInt64 because it has undocumented dependency
-  // on reads being aligned.  
-  int64_t value;
-  memcpy(&value, state->bytes + state->bufferPos, sizeof(int64_t));
-  value = OSSwapLittleToHostInt64(value);
-  state->bufferPos += sizeof(int64_t);
-  return value;
-}
-
-static int64_t ReadRawVarint64(GPBCodedInputStreamState *state) {
-  int32_t shift = 0;
-  int64_t result = 0;
-  while (shift < 64) {
-    int8_t b = ReadRawByte(state);
-    result |= (int64_t)((uint64_t)(b & 0x7F) << shift);
-    if ((b & 0x80) == 0) {
-      return result;
-    }
-    shift += 7;
-  }
-  RaiseException(GPBCodedInputStreamErrorInvalidVarInt, @"Invalid VarInt64");
-  return 0;
-}
-
-static int32_t ReadRawVarint32(GPBCodedInputStreamState *state) {
-  return (int32_t)ReadRawVarint64(state);
-}
-
-static void SkipRawData(GPBCodedInputStreamState *state, size_t size) {
-  CheckSize(state, size);
-  state->bufferPos += size;
-}
-
-double GPBCodedInputStreamReadDouble(GPBCodedInputStreamState *state) {
-  int64_t value = ReadRawLittleEndian64(state);
-  return GPBConvertInt64ToDouble(value);
-}
-
-float GPBCodedInputStreamReadFloat(GPBCodedInputStreamState *state) {
-  int32_t value = ReadRawLittleEndian32(state);
-  return GPBConvertInt32ToFloat(value);
-}
-
-uint64_t GPBCodedInputStreamReadUInt64(GPBCodedInputStreamState *state) {
-  uint64_t value = ReadRawVarint64(state);
-  return value;
-}
-
-uint32_t GPBCodedInputStreamReadUInt32(GPBCodedInputStreamState *state) {
-  uint32_t value = ReadRawVarint32(state);
-  return value;
-}
-
-int64_t GPBCodedInputStreamReadInt64(GPBCodedInputStreamState *state) {
-  int64_t value = ReadRawVarint64(state);
-  return value;
-}
-
-int32_t GPBCodedInputStreamReadInt32(GPBCodedInputStreamState *state) {
-  int32_t value = ReadRawVarint32(state);
-  return value;
-}
-
-uint64_t GPBCodedInputStreamReadFixed64(GPBCodedInputStreamState *state) {
-  uint64_t value = ReadRawLittleEndian64(state);
-  return value;
-}
-
-uint32_t GPBCodedInputStreamReadFixed32(GPBCodedInputStreamState *state) {
-  uint32_t value = ReadRawLittleEndian32(state);
-  return value;
-}
-
-int32_t GPBCodedInputStreamReadEnum(GPBCodedInputStreamState *state) {
-  int32_t value = ReadRawVarint32(state);
-  return value;
-}
-
-int32_t GPBCodedInputStreamReadSFixed32(GPBCodedInputStreamState *state) {
-  int32_t value = ReadRawLittleEndian32(state);
-  return value;
-}
-
-int64_t GPBCodedInputStreamReadSFixed64(GPBCodedInputStreamState *state) {
-  int64_t value = ReadRawLittleEndian64(state);
-  return value;
-}
-
-int32_t GPBCodedInputStreamReadSInt32(GPBCodedInputStreamState *state) {
-  int32_t value = GPBDecodeZigZag32(ReadRawVarint32(state));
-  return value;
-}
-
-int64_t GPBCodedInputStreamReadSInt64(GPBCodedInputStreamState *state) {
-  int64_t value = GPBDecodeZigZag64(ReadRawVarint64(state));
-  return value;
-}
-
-BOOL GPBCodedInputStreamReadBool(GPBCodedInputStreamState *state) {
-  return ReadRawVarint64(state) != 0;
-}
-
-int32_t GPBCodedInputStreamReadTag(GPBCodedInputStreamState *state) {
-  if (GPBCodedInputStreamIsAtEnd(state)) {
-    state->lastTag = 0;
-    return 0;
-  }
-
-  state->lastTag = ReadRawVarint32(state);
-  // Tags have to include a valid wireformat.
-  if (!GPBWireFormatIsValidTag(state->lastTag)) {
-    RaiseException(GPBCodedInputStreamErrorInvalidTag,
-                   @"Invalid wireformat in tag.");
-  }
-  // Zero is not a valid field number.
-  if (GPBWireFormatGetTagFieldNumber(state->lastTag) == 0) {
-    RaiseException(GPBCodedInputStreamErrorInvalidTag,
-                   @"A zero field number on the wire is invalid.");
-  }
-  return state->lastTag;
-}
-
-NSString *GPBCodedInputStreamReadRetainedString(
-    GPBCodedInputStreamState *state) {
-  int32_t size = ReadRawVarint32(state);
-  NSString *result;
-  if (size == 0) {
-    result = @"";
-  } else {
-    CheckSize(state, size);
-    result = [[NSString alloc] initWithBytes:&state->bytes[state->bufferPos]
-                                      length:size
-                                    encoding:NSUTF8StringEncoding];
-    state->bufferPos += size;
-    if (!result) {
-#ifdef DEBUG
-      // https://developers.google.com/protocol-buffers/docs/proto#scalar
-      NSLog(@"UTF-8 failure, is some field type 'string' when it should be "
-            @"'bytes'?");
-#endif
-      RaiseException(GPBCodedInputStreamErrorInvalidUTF8, nil);
-    }
-  }
-  return result;
-}
-
-NSData *GPBCodedInputStreamReadRetainedBytes(GPBCodedInputStreamState *state) {
-  int32_t size = ReadRawVarint32(state);
-  if (size < 0) return nil;
-  CheckSize(state, size);
-  NSData *result = [[NSData alloc] initWithBytes:state->bytes + state->bufferPos
-                                          length:size];
-  state->bufferPos += size;
-  return result;
-}
-
-NSData *GPBCodedInputStreamReadRetainedBytesNoCopy(
-    GPBCodedInputStreamState *state) {
-  int32_t size = ReadRawVarint32(state);
-  if (size < 0) return nil;
-  CheckSize(state, size);
-  // Cast is safe because freeWhenDone is NO.
-  NSData *result = [[NSData alloc]
-      initWithBytesNoCopy:(void *)(state->bytes + state->bufferPos)
-                   length:size
-             freeWhenDone:NO];
-  state->bufferPos += size;
-  return result;
-}
-
-size_t GPBCodedInputStreamPushLimit(GPBCodedInputStreamState *state,
-                                    size_t byteLimit) {
-  byteLimit += state->bufferPos;
-  size_t oldLimit = state->currentLimit;
-  if (byteLimit > oldLimit) {
-    RaiseException(GPBCodedInputStreamErrorInvalidSubsectionLimit, nil);
-  }
-  state->currentLimit = byteLimit;
-  return oldLimit;
-}
-
-void GPBCodedInputStreamPopLimit(GPBCodedInputStreamState *state,
-                                 size_t oldLimit) {
-  state->currentLimit = oldLimit;
-}
-
-size_t GPBCodedInputStreamBytesUntilLimit(GPBCodedInputStreamState *state) {
-  return state->currentLimit - state->bufferPos;
-}
-
-BOOL GPBCodedInputStreamIsAtEnd(GPBCodedInputStreamState *state) {
-  return (state->bufferPos == state->bufferSize) ||
-         (state->bufferPos == state->currentLimit);
-}
-
-void GPBCodedInputStreamCheckLastTagWas(GPBCodedInputStreamState *state,
-                                        int32_t value) {
-  if (state->lastTag != value) {
-    RaiseException(GPBCodedInputStreamErrorInvalidTag, @"Unexpected tag read");
-  }
-}
-
-@implementation GPBCodedInputStream
-
-+ (instancetype)streamWithData:(NSData *)data {
-  return [[[self alloc] initWithData:data] autorelease];
-}
-
-- (instancetype)initWithData:(NSData *)data {
-  if ((self = [super init])) {
-#ifdef DEBUG
-    NSCAssert([self class] == [GPBCodedInputStream class],
-              @"Subclassing of GPBCodedInputStream is not allowed.");
-#endif
-    buffer_ = [data retain];
-    state_.bytes = (const uint8_t *)[data bytes];
-    state_.bufferSize = [data length];
-    state_.currentLimit = state_.bufferSize;
-  }
-  return self;
-}
-
-- (void)dealloc {
-  [buffer_ release];
-  [super dealloc];
-}
-
-// Direct access is use for speed, to avoid even internally declaring things
-// read/write, etc. The warning is enabled in the project to ensure code calling
-// protos can turn on -Wdirect-ivar-access without issues.
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdirect-ivar-access"
-
-- (int32_t)readTag {
-  return GPBCodedInputStreamReadTag(&state_);
-}
-
-- (void)checkLastTagWas:(int32_t)value {
-  GPBCodedInputStreamCheckLastTagWas(&state_, value);
-}
-
-- (BOOL)skipField:(int32_t)tag {
-  NSAssert(GPBWireFormatIsValidTag(tag), @"Invalid tag");
-  switch (GPBWireFormatGetTagWireType(tag)) {
-    case GPBWireFormatVarint:
-      GPBCodedInputStreamReadInt32(&state_);
-      return YES;
-    case GPBWireFormatFixed64:
-      SkipRawData(&state_, sizeof(int64_t));
-      return YES;
-    case GPBWireFormatLengthDelimited:
-      SkipRawData(&state_, ReadRawVarint32(&state_));
-      return YES;
-    case GPBWireFormatStartGroup:
-      [self skipMessage];
-      GPBCodedInputStreamCheckLastTagWas(
-          &state_, GPBWireFormatMakeTag(GPBWireFormatGetTagFieldNumber(tag),
-                                        GPBWireFormatEndGroup));
-      return YES;
-    case GPBWireFormatEndGroup:
-      return NO;
-    case GPBWireFormatFixed32:
-      SkipRawData(&state_, sizeof(int32_t));
-      return YES;
-  }
-}
-
-- (void)skipMessage {
-  while (YES) {
-    int32_t tag = GPBCodedInputStreamReadTag(&state_);
-    if (tag == 0 || ![self skipField:tag]) {
-      return;
-    }
-  }
-}
-
-- (BOOL)isAtEnd {
-  return GPBCodedInputStreamIsAtEnd(&state_);
-}
-
-- (size_t)position {
-  return state_.bufferPos;
-}
-
-- (size_t)pushLimit:(size_t)byteLimit {
-  return GPBCodedInputStreamPushLimit(&state_, byteLimit);
-}
-
-- (void)popLimit:(size_t)oldLimit {
-  GPBCodedInputStreamPopLimit(&state_, oldLimit);
-}
-
-- (double)readDouble {
-  return GPBCodedInputStreamReadDouble(&state_);
-}
-
-- (float)readFloat {
-  return GPBCodedInputStreamReadFloat(&state_);
-}
-
-- (uint64_t)readUInt64 {
-  return GPBCodedInputStreamReadUInt64(&state_);
-}
-
-- (int64_t)readInt64 {
-  return GPBCodedInputStreamReadInt64(&state_);
-}
-
-- (int32_t)readInt32 {
-  return GPBCodedInputStreamReadInt32(&state_);
-}
-
-- (uint64_t)readFixed64 {
-  return GPBCodedInputStreamReadFixed64(&state_);
-}
-
-- (uint32_t)readFixed32 {
-  return GPBCodedInputStreamReadFixed32(&state_);
-}
-
-- (BOOL)readBool {
-  return GPBCodedInputStreamReadBool(&state_);
-}
-
-- (NSString *)readString {
-  return [GPBCodedInputStreamReadRetainedString(&state_) autorelease];
-}
-
-- (void)readGroup:(int32_t)fieldNumber
-              message:(GPBMessage *)message
-    extensionRegistry:(GPBExtensionRegistry *)extensionRegistry {
-  CheckRecursionLimit(&state_);
-  ++state_.recursionDepth;
-  [message mergeFromCodedInputStream:self extensionRegistry:extensionRegistry];
-  GPBCodedInputStreamCheckLastTagWas(
-      &state_, GPBWireFormatMakeTag(fieldNumber, GPBWireFormatEndGroup));
-  --state_.recursionDepth;
-}
-
-- (void)readUnknownGroup:(int32_t)fieldNumber
-                 message:(GPBUnknownFieldSet *)message {
-  CheckRecursionLimit(&state_);
-  ++state_.recursionDepth;
-  [message mergeFromCodedInputStream:self];
-  GPBCodedInputStreamCheckLastTagWas(
-      &state_, GPBWireFormatMakeTag(fieldNumber, GPBWireFormatEndGroup));
-  --state_.recursionDepth;
-}
-
-- (void)readMessage:(GPBMessage *)message
-    extensionRegistry:(GPBExtensionRegistry *)extensionRegistry {
-  CheckRecursionLimit(&state_);
-  int32_t length = ReadRawVarint32(&state_);
-  size_t oldLimit = GPBCodedInputStreamPushLimit(&state_, length);
-  ++state_.recursionDepth;
-  [message mergeFromCodedInputStream:self extensionRegistry:extensionRegistry];
-  GPBCodedInputStreamCheckLastTagWas(&state_, 0);
-  --state_.recursionDepth;
-  GPBCodedInputStreamPopLimit(&state_, oldLimit);
-}
-
-- (void)readMapEntry:(id)mapDictionary
-    extensionRegistry:(GPBExtensionRegistry *)extensionRegistry
-                field:(GPBFieldDescriptor *)field
-        parentMessage:(GPBMessage *)parentMessage {
-  CheckRecursionLimit(&state_);
-  int32_t length = ReadRawVarint32(&state_);
-  size_t oldLimit = GPBCodedInputStreamPushLimit(&state_, length);
-  ++state_.recursionDepth;
-  GPBDictionaryReadEntry(mapDictionary, self, extensionRegistry, field,
-                         parentMessage);
-  GPBCodedInputStreamCheckLastTagWas(&state_, 0);
-  --state_.recursionDepth;
-  GPBCodedInputStreamPopLimit(&state_, oldLimit);
-}
-
-- (NSData *)readBytes {
-  return [GPBCodedInputStreamReadRetainedBytes(&state_) autorelease];
-}
-
-- (uint32_t)readUInt32 {
-  return GPBCodedInputStreamReadUInt32(&state_);
-}
-
-- (int32_t)readEnum {
-  return GPBCodedInputStreamReadEnum(&state_);
-}
-
-- (int32_t)readSFixed32 {
-  return GPBCodedInputStreamReadSFixed32(&state_);
-}
-
-- (int64_t)readSFixed64 {
-  return GPBCodedInputStreamReadSFixed64(&state_);
-}
-
-- (int32_t)readSInt32 {
-  return GPBCodedInputStreamReadSInt32(&state_);
-}
-
-- (int64_t)readSInt64 {
-  return GPBCodedInputStreamReadSInt64(&state_);
-}
-
-#pragma clang diagnostic pop
-
-@end
diff --git a/libs/protobuf/objectivec/GPBCodedInputStream_PackagePrivate.h b/libs/protobuf/objectivec/GPBCodedInputStream_PackagePrivate.h
deleted file mode 100644
index 43ec6e7..0000000
--- a/libs/protobuf/objectivec/GPBCodedInputStream_PackagePrivate.h
+++ /dev/null
@@ -1,112 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// This header is private to the ProtobolBuffers library and must NOT be
-// included by any sources outside this library. The contents of this file are
-// subject to change at any time without notice.
-
-#import "GPBCodedInputStream.h"
-
-@class GPBUnknownFieldSet;
-@class GPBFieldDescriptor;
-
-typedef struct GPBCodedInputStreamState {
-  const uint8_t *bytes;
-  size_t bufferSize;
-  size_t bufferPos;
-
-  // For parsing subsections of an input stream you can put a hard limit on
-  // how much should be read. Normally the limit is the end of the stream,
-  // but you can adjust it to anywhere, and if you hit it you will be at the
-  // end of the stream, until you adjust the limit.
-  size_t currentLimit;
-  int32_t lastTag;
-  NSUInteger recursionDepth;
-} GPBCodedInputStreamState;
-
-@interface GPBCodedInputStream () {
- @package
-  struct GPBCodedInputStreamState state_;
-  NSData *buffer_;
-}
-
-// Group support is deprecated, so we hide this interface from users, but
-// support for older data.
-- (void)readGroup:(int32_t)fieldNumber
-              message:(GPBMessage *)message
-    extensionRegistry:(GPBExtensionRegistry *)extensionRegistry;
-
-// Reads a group field value from the stream and merges it into the given
-// UnknownFieldSet.
-- (void)readUnknownGroup:(int32_t)fieldNumber
-                 message:(GPBUnknownFieldSet *)message;
-
-// Reads a map entry.
-- (void)readMapEntry:(id)mapDictionary
-    extensionRegistry:(GPBExtensionRegistry *)extensionRegistry
-                field:(GPBFieldDescriptor *)field
-        parentMessage:(GPBMessage *)parentMessage;
-@end
-
-CF_EXTERN_C_BEGIN
-
-int32_t GPBCodedInputStreamReadTag(GPBCodedInputStreamState *state);
-
-double GPBCodedInputStreamReadDouble(GPBCodedInputStreamState *state);
-float GPBCodedInputStreamReadFloat(GPBCodedInputStreamState *state);
-uint64_t GPBCodedInputStreamReadUInt64(GPBCodedInputStreamState *state);
-uint32_t GPBCodedInputStreamReadUInt32(GPBCodedInputStreamState *state);
-int64_t GPBCodedInputStreamReadInt64(GPBCodedInputStreamState *state);
-int32_t GPBCodedInputStreamReadInt32(GPBCodedInputStreamState *state);
-uint64_t GPBCodedInputStreamReadFixed64(GPBCodedInputStreamState *state);
-uint32_t GPBCodedInputStreamReadFixed32(GPBCodedInputStreamState *state);
-int32_t GPBCodedInputStreamReadEnum(GPBCodedInputStreamState *state);
-int32_t GPBCodedInputStreamReadSFixed32(GPBCodedInputStreamState *state);
-int64_t GPBCodedInputStreamReadSFixed64(GPBCodedInputStreamState *state);
-int32_t GPBCodedInputStreamReadSInt32(GPBCodedInputStreamState *state);
-int64_t GPBCodedInputStreamReadSInt64(GPBCodedInputStreamState *state);
-BOOL GPBCodedInputStreamReadBool(GPBCodedInputStreamState *state);
-NSString *GPBCodedInputStreamReadRetainedString(GPBCodedInputStreamState *state)
-    __attribute((ns_returns_retained));
-NSData *GPBCodedInputStreamReadRetainedBytes(GPBCodedInputStreamState *state)
-    __attribute((ns_returns_retained));
-NSData *GPBCodedInputStreamReadRetainedBytesNoCopy(
-    GPBCodedInputStreamState *state) __attribute((ns_returns_retained));
-
-size_t GPBCodedInputStreamPushLimit(GPBCodedInputStreamState *state,
-                                    size_t byteLimit);
-void GPBCodedInputStreamPopLimit(GPBCodedInputStreamState *state,
-                                 size_t oldLimit);
-size_t GPBCodedInputStreamBytesUntilLimit(GPBCodedInputStreamState *state);
-BOOL GPBCodedInputStreamIsAtEnd(GPBCodedInputStreamState *state);
-void GPBCodedInputStreamCheckLastTagWas(GPBCodedInputStreamState *state,
-                                        int32_t value);
-
-CF_EXTERN_C_END
diff --git a/libs/protobuf/objectivec/GPBCodedOutputStream.h b/libs/protobuf/objectivec/GPBCodedOutputStream.h
deleted file mode 100644
index 5dde974..0000000
--- a/libs/protobuf/objectivec/GPBCodedOutputStream.h
+++ /dev/null
@@ -1,757 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#import <Foundation/Foundation.h>
-
-#import "GPBRuntimeTypes.h"
-#import "GPBWireFormat.h"
-
-@class GPBBoolArray;
-@class GPBDoubleArray;
-@class GPBEnumArray;
-@class GPBFloatArray;
-@class GPBMessage;
-@class GPBInt32Array;
-@class GPBInt64Array;
-@class GPBUInt32Array;
-@class GPBUInt64Array;
-@class GPBUnknownFieldSet;
-
-NS_ASSUME_NONNULL_BEGIN
-
-/**
- * @c GPBCodedOutputStream exception names.
- **/
-extern NSString *const GPBCodedOutputStreamException_OutOfSpace;
-extern NSString *const GPBCodedOutputStreamException_WriteFailed;
-
-/**
- * Writes out protocol message fields.
- *
- * The common uses of protocol buffers shouldn't need to use this class.
- * GPBMessage's provide a -data method that will serialize the message for you.
- *
- * @note Any -write* api can raise the GPBCodedOutputStreamException_*
- *       exceptions.
- *
- * @note Subclassing of GPBCodedOutputStream is NOT supported.
- **/
-@interface GPBCodedOutputStream : NSObject
-
-/**
- * Creates a stream to fill in the given data. Data must be sized to fit or
- * an error will be raised when out of space.
- *
- * @param data The data where the stream will be written to.
- *
- * @return A newly instanced GPBCodedOutputStream.
- **/
-+ (instancetype)streamWithData:(NSMutableData *)data;
-
-/**
- * Creates a stream to write into the given NSOutputStream.
- *
- * @param output The output stream where the stream will be written to.
- *
- * @return A newly instanced GPBCodedOutputStream.
- **/
-+ (instancetype)streamWithOutputStream:(NSOutputStream *)output;
-
-/**
- * Initializes a stream to fill in the given data. Data must be sized to fit
- * or an error will be raised when out of space.
- *
- * @param data The data where the stream will be written to.
- *
- * @return A newly initialized GPBCodedOutputStream.
- **/
-- (instancetype)initWithData:(NSMutableData *)data;
-
-/**
- * Initializes a stream to write into the given @c NSOutputStream.
- *
- * @param output The output stream where the stream will be written to.
- *
- * @return A newly initialized GPBCodedOutputStream.
- **/
-- (instancetype)initWithOutputStream:(NSOutputStream *)output;
-
-/**
- * Flush any buffered data out.
- **/
-- (void)flush;
-
-/**
- * Write the raw byte out.
- *
- * @param value The value to write out.
- **/
-- (void)writeRawByte:(uint8_t)value;
-
-/**
- * Write the tag for the given field number and wire format.
- *
- * @param fieldNumber The field number.
- * @param format      The wire format the data for the field will be in.
- **/
-- (void)writeTag:(uint32_t)fieldNumber format:(GPBWireFormat)format;
-
-/**
- * Write a 32bit value out in little endian format.
- *
- * @param value The value to write out.
- **/
-- (void)writeRawLittleEndian32:(int32_t)value;
-/**
- * Write a 64bit value out in little endian format.
- *
- * @param value The value to write out.
- **/
-- (void)writeRawLittleEndian64:(int64_t)value;
-
-/**
- * Write a 32bit value out in varint format.
- *
- * @param value The value to write out.
- **/
-- (void)writeRawVarint32:(int32_t)value;
-/**
- * Write a 64bit value out in varint format.
- *
- * @param value The value to write out.
- **/
-- (void)writeRawVarint64:(int64_t)value;
-
-/**
- * Write a size_t out as a 32bit varint value.
- *
- * @note This will truncate 64 bit values to 32.
- *
- * @param value The value to write out.
- **/
-- (void)writeRawVarintSizeTAs32:(size_t)value;
-
-/**
- * Writes the contents of an NSData out.
- *
- * @param data The data to write out.
- **/
-- (void)writeRawData:(NSData *)data;
-/**
- * Writes out the given data.
- *
- * @param data   The data blob to write out.
- * @param offset The offset into the blob to start writing out.
- * @param length The number of bytes from the blob to write out.
- **/
-- (void)writeRawPtr:(const void *)data
-             offset:(size_t)offset
-             length:(size_t)length;
-
-//%PDDM-EXPAND _WRITE_DECLS()
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-/**
- * Write a double for the given field number.
- *
- * @param fieldNumber The field number assigned to the value.
- * @param value       The value to write out.
- **/
-- (void)writeDouble:(int32_t)fieldNumber value:(double)value;
-/**
- * Write a packed array of double for the given field number.
- *
- * @param fieldNumber The field number assigned to the values.
- * @param values      The values to write out.
- * @param tag         The tag assigned to the values.
- **/
-- (void)writeDoubleArray:(int32_t)fieldNumber
-                  values:(GPBDoubleArray *)values
-                     tag:(uint32_t)tag;
-/**
- * Write a double without any tag.
- *
- * @param value The value to write out.
- **/
-- (void)writeDoubleNoTag:(double)value;
-
-/**
- * Write a float for the given field number.
- *
- * @param fieldNumber The field number assigned to the value.
- * @param value       The value to write out.
- **/
-- (void)writeFloat:(int32_t)fieldNumber value:(float)value;
-/**
- * Write a packed array of float for the given field number.
- *
- * @param fieldNumber The field number assigned to the values.
- * @param values      The values to write out.
- * @param tag         The tag assigned to the values.
- **/
-- (void)writeFloatArray:(int32_t)fieldNumber
-                 values:(GPBFloatArray *)values
-                    tag:(uint32_t)tag;
-/**
- * Write a float without any tag.
- *
- * @param value The value to write out.
- **/
-- (void)writeFloatNoTag:(float)value;
-
-/**
- * Write a uint64_t for the given field number.
- *
- * @param fieldNumber The field number assigned to the value.
- * @param value       The value to write out.
- **/
-- (void)writeUInt64:(int32_t)fieldNumber value:(uint64_t)value;
-/**
- * Write a packed array of uint64_t for the given field number.
- *
- * @param fieldNumber The field number assigned to the values.
- * @param values      The values to write out.
- * @param tag         The tag assigned to the values.
- **/
-- (void)writeUInt64Array:(int32_t)fieldNumber
-                  values:(GPBUInt64Array *)values
-                     tag:(uint32_t)tag;
-/**
- * Write a uint64_t without any tag.
- *
- * @param value The value to write out.
- **/
-- (void)writeUInt64NoTag:(uint64_t)value;
-
-/**
- * Write a int64_t for the given field number.
- *
- * @param fieldNumber The field number assigned to the value.
- * @param value       The value to write out.
- **/
-- (void)writeInt64:(int32_t)fieldNumber value:(int64_t)value;
-/**
- * Write a packed array of int64_t for the given field number.
- *
- * @param fieldNumber The field number assigned to the values.
- * @param values      The values to write out.
- * @param tag         The tag assigned to the values.
- **/
-- (void)writeInt64Array:(int32_t)fieldNumber
-                 values:(GPBInt64Array *)values
-                    tag:(uint32_t)tag;
-/**
- * Write a int64_t without any tag.
- *
- * @param value The value to write out.
- **/
-- (void)writeInt64NoTag:(int64_t)value;
-
-/**
- * Write a int32_t for the given field number.
- *
- * @param fieldNumber The field number assigned to the value.
- * @param value       The value to write out.
- **/
-- (void)writeInt32:(int32_t)fieldNumber value:(int32_t)value;
-/**
- * Write a packed array of int32_t for the given field number.
- *
- * @param fieldNumber The field number assigned to the values.
- * @param values      The values to write out.
- * @param tag         The tag assigned to the values.
- **/
-- (void)writeInt32Array:(int32_t)fieldNumber
-                 values:(GPBInt32Array *)values
-                    tag:(uint32_t)tag;
-/**
- * Write a int32_t without any tag.
- *
- * @param value The value to write out.
- **/
-- (void)writeInt32NoTag:(int32_t)value;
-
-/**
- * Write a uint32_t for the given field number.
- *
- * @param fieldNumber The field number assigned to the value.
- * @param value       The value to write out.
- **/
-- (void)writeUInt32:(int32_t)fieldNumber value:(uint32_t)value;
-/**
- * Write a packed array of uint32_t for the given field number.
- *
- * @param fieldNumber The field number assigned to the values.
- * @param values      The values to write out.
- * @param tag         The tag assigned to the values.
- **/
-- (void)writeUInt32Array:(int32_t)fieldNumber
-                  values:(GPBUInt32Array *)values
-                     tag:(uint32_t)tag;
-/**
- * Write a uint32_t without any tag.
- *
- * @param value The value to write out.
- **/
-- (void)writeUInt32NoTag:(uint32_t)value;
-
-/**
- * Write a uint64_t for the given field number.
- *
- * @param fieldNumber The field number assigned to the value.
- * @param value       The value to write out.
- **/
-- (void)writeFixed64:(int32_t)fieldNumber value:(uint64_t)value;
-/**
- * Write a packed array of uint64_t for the given field number.
- *
- * @param fieldNumber The field number assigned to the values.
- * @param values      The values to write out.
- * @param tag         The tag assigned to the values.
- **/
-- (void)writeFixed64Array:(int32_t)fieldNumber
-                   values:(GPBUInt64Array *)values
-                      tag:(uint32_t)tag;
-/**
- * Write a uint64_t without any tag.
- *
- * @param value The value to write out.
- **/
-- (void)writeFixed64NoTag:(uint64_t)value;
-
-/**
- * Write a uint32_t for the given field number.
- *
- * @param fieldNumber The field number assigned to the value.
- * @param value       The value to write out.
- **/
-- (void)writeFixed32:(int32_t)fieldNumber value:(uint32_t)value;
-/**
- * Write a packed array of uint32_t for the given field number.
- *
- * @param fieldNumber The field number assigned to the values.
- * @param values      The values to write out.
- * @param tag         The tag assigned to the values.
- **/
-- (void)writeFixed32Array:(int32_t)fieldNumber
-                   values:(GPBUInt32Array *)values
-                      tag:(uint32_t)tag;
-/**
- * Write a uint32_t without any tag.
- *
- * @param value The value to write out.
- **/
-- (void)writeFixed32NoTag:(uint32_t)value;
-
-/**
- * Write a int32_t for the given field number.
- *
- * @param fieldNumber The field number assigned to the value.
- * @param value       The value to write out.
- **/
-- (void)writeSInt32:(int32_t)fieldNumber value:(int32_t)value;
-/**
- * Write a packed array of int32_t for the given field number.
- *
- * @param fieldNumber The field number assigned to the values.
- * @param values      The values to write out.
- * @param tag         The tag assigned to the values.
- **/
-- (void)writeSInt32Array:(int32_t)fieldNumber
-                  values:(GPBInt32Array *)values
-                     tag:(uint32_t)tag;
-/**
- * Write a int32_t without any tag.
- *
- * @param value The value to write out.
- **/
-- (void)writeSInt32NoTag:(int32_t)value;
-
-/**
- * Write a int64_t for the given field number.
- *
- * @param fieldNumber The field number assigned to the value.
- * @param value       The value to write out.
- **/
-- (void)writeSInt64:(int32_t)fieldNumber value:(int64_t)value;
-/**
- * Write a packed array of int64_t for the given field number.
- *
- * @param fieldNumber The field number assigned to the values.
- * @param values      The values to write out.
- * @param tag         The tag assigned to the values.
- **/
-- (void)writeSInt64Array:(int32_t)fieldNumber
-                  values:(GPBInt64Array *)values
-                     tag:(uint32_t)tag;
-/**
- * Write a int64_t without any tag.
- *
- * @param value The value to write out.
- **/
-- (void)writeSInt64NoTag:(int64_t)value;
-
-/**
- * Write a int64_t for the given field number.
- *
- * @param fieldNumber The field number assigned to the value.
- * @param value       The value to write out.
- **/
-- (void)writeSFixed64:(int32_t)fieldNumber value:(int64_t)value;
-/**
- * Write a packed array of int64_t for the given field number.
- *
- * @param fieldNumber The field number assigned to the values.
- * @param values      The values to write out.
- * @param tag         The tag assigned to the values.
- **/
-- (void)writeSFixed64Array:(int32_t)fieldNumber
-                    values:(GPBInt64Array *)values
-                       tag:(uint32_t)tag;
-/**
- * Write a int64_t without any tag.
- *
- * @param value The value to write out.
- **/
-- (void)writeSFixed64NoTag:(int64_t)value;
-
-/**
- * Write a int32_t for the given field number.
- *
- * @param fieldNumber The field number assigned to the value.
- * @param value       The value to write out.
- **/
-- (void)writeSFixed32:(int32_t)fieldNumber value:(int32_t)value;
-/**
- * Write a packed array of int32_t for the given field number.
- *
- * @param fieldNumber The field number assigned to the values.
- * @param values      The values to write out.
- * @param tag         The tag assigned to the values.
- **/
-- (void)writeSFixed32Array:(int32_t)fieldNumber
-                    values:(GPBInt32Array *)values
-                       tag:(uint32_t)tag;
-/**
- * Write a int32_t without any tag.
- *
- * @param value The value to write out.
- **/
-- (void)writeSFixed32NoTag:(int32_t)value;
-
-/**
- * Write a BOOL for the given field number.
- *
- * @param fieldNumber The field number assigned to the value.
- * @param value       The value to write out.
- **/
-- (void)writeBool:(int32_t)fieldNumber value:(BOOL)value;
-/**
- * Write a packed array of BOOL for the given field number.
- *
- * @param fieldNumber The field number assigned to the values.
- * @param values      The values to write out.
- * @param tag         The tag assigned to the values.
- **/
-- (void)writeBoolArray:(int32_t)fieldNumber
-                values:(GPBBoolArray *)values
-                   tag:(uint32_t)tag;
-/**
- * Write a BOOL without any tag.
- *
- * @param value The value to write out.
- **/
-- (void)writeBoolNoTag:(BOOL)value;
-
-/**
- * Write a int32_t for the given field number.
- *
- * @param fieldNumber The field number assigned to the value.
- * @param value       The value to write out.
- **/
-- (void)writeEnum:(int32_t)fieldNumber value:(int32_t)value;
-/**
- * Write a packed array of int32_t for the given field number.
- *
- * @param fieldNumber The field number assigned to the values.
- * @param values      The values to write out.
- * @param tag         The tag assigned to the values.
- **/
-- (void)writeEnumArray:(int32_t)fieldNumber
-                values:(GPBEnumArray *)values
-                   tag:(uint32_t)tag;
-/**
- * Write a int32_t without any tag.
- *
- * @param value The value to write out.
- **/
-- (void)writeEnumNoTag:(int32_t)value;
-
-/**
- * Write a NSString for the given field number.
- *
- * @param fieldNumber The field number assigned to the value.
- * @param value       The value to write out.
- **/
-- (void)writeString:(int32_t)fieldNumber value:(NSString *)value;
-/**
- * Write an array of NSString for the given field number.
- *
- * @param fieldNumber The field number assigned to the values.
- * @param values      The values to write out.
- **/
-- (void)writeStringArray:(int32_t)fieldNumber
-                  values:(NSArray<NSString*> *)values;
-/**
- * Write a NSString without any tag.
- *
- * @param value The value to write out.
- **/
-- (void)writeStringNoTag:(NSString *)value;
-
-/**
- * Write a GPBMessage for the given field number.
- *
- * @param fieldNumber The field number assigned to the value.
- * @param value       The value to write out.
- **/
-- (void)writeMessage:(int32_t)fieldNumber value:(GPBMessage *)value;
-/**
- * Write an array of GPBMessage for the given field number.
- *
- * @param fieldNumber The field number assigned to the values.
- * @param values      The values to write out.
- **/
-- (void)writeMessageArray:(int32_t)fieldNumber
-                   values:(NSArray<GPBMessage*> *)values;
-/**
- * Write a GPBMessage without any tag.
- *
- * @param value The value to write out.
- **/
-- (void)writeMessageNoTag:(GPBMessage *)value;
-
-/**
- * Write a NSData for the given field number.
- *
- * @param fieldNumber The field number assigned to the value.
- * @param value       The value to write out.
- **/
-- (void)writeBytes:(int32_t)fieldNumber value:(NSData *)value;
-/**
- * Write an array of NSData for the given field number.
- *
- * @param fieldNumber The field number assigned to the values.
- * @param values      The values to write out.
- **/
-- (void)writeBytesArray:(int32_t)fieldNumber
-                 values:(NSArray<NSData*> *)values;
-/**
- * Write a NSData without any tag.
- *
- * @param value The value to write out.
- **/
-- (void)writeBytesNoTag:(NSData *)value;
-
-/**
- * Write a GPBMessage for the given field number.
- *
- * @param fieldNumber The field number assigned to the value.
- * @param value       The value to write out.
- **/
-- (void)writeGroup:(int32_t)fieldNumber
-             value:(GPBMessage *)value;
-/**
- * Write an array of GPBMessage for the given field number.
- *
- * @param fieldNumber The field number assigned to the values.
- * @param values      The values to write out.
- **/
-- (void)writeGroupArray:(int32_t)fieldNumber
-                 values:(NSArray<GPBMessage*> *)values;
-/**
- * Write a GPBMessage without any tag (but does write the endGroup tag).
- *
- * @param fieldNumber The field number assigned to the value.
- * @param value       The value to write out.
- **/
-- (void)writeGroupNoTag:(int32_t)fieldNumber
-                  value:(GPBMessage *)value;
-
-/**
- * Write a GPBUnknownFieldSet for the given field number.
- *
- * @param fieldNumber The field number assigned to the value.
- * @param value       The value to write out.
- **/
-- (void)writeUnknownGroup:(int32_t)fieldNumber
-                    value:(GPBUnknownFieldSet *)value;
-/**
- * Write an array of GPBUnknownFieldSet for the given field number.
- *
- * @param fieldNumber The field number assigned to the values.
- * @param values      The values to write out.
- **/
-- (void)writeUnknownGroupArray:(int32_t)fieldNumber
-                        values:(NSArray<GPBUnknownFieldSet*> *)values;
-/**
- * Write a GPBUnknownFieldSet without any tag (but does write the endGroup tag).
- *
- * @param fieldNumber The field number assigned to the value.
- * @param value       The value to write out.
- **/
-- (void)writeUnknownGroupNoTag:(int32_t)fieldNumber
-                         value:(GPBUnknownFieldSet *)value;
-
-// clang-format on
-//%PDDM-EXPAND-END _WRITE_DECLS()
-
-/**
-Write a MessageSet extension field to the stream. For historical reasons,
-the wire format differs from normal fields.
-
-@param fieldNumber The extension field number to write out.
-@param value       The message from where to get the extension.
-*/
-- (void)writeMessageSetExtension:(int32_t)fieldNumber value:(GPBMessage *)value;
-
-/**
-Write an unparsed MessageSet extension field to the stream. For historical
-reasons, the wire format differs from normal fields.
-
-@param fieldNumber The extension field number to write out.
-@param value       The raw message from where to get the extension.
-*/
-- (void)writeRawMessageSetExtension:(int32_t)fieldNumber value:(NSData *)value;
-
-@end
-
-NS_ASSUME_NONNULL_END
-
-// Write methods for types that can be in packed arrays.
-//%PDDM-DEFINE _WRITE_PACKABLE_DECLS(NAME, ARRAY_TYPE, TYPE)
-//%/**
-//% * Write a TYPE for the given field number.
-//% *
-//% * @param fieldNumber The field number assigned to the value.
-//% * @param value       The value to write out.
-//% **/
-//%- (void)write##NAME:(int32_t)fieldNumber value:(TYPE)value;
-//%/**
-//% * Write a packed array of TYPE for the given field number.
-//% *
-//% * @param fieldNumber The field number assigned to the values.
-//% * @param values      The values to write out.
-//% * @param tag         The tag assigned to the values.
-//% **/
-//%- (void)write##NAME##Array:(int32_t)fieldNumber
-//%       NAME$S     values:(GPB##ARRAY_TYPE##Array *)values
-//%       NAME$S        tag:(uint32_t)tag;
-//%/**
-//% * Write a TYPE without any tag.
-//% *
-//% * @param value The value to write out.
-//% **/
-//%- (void)write##NAME##NoTag:(TYPE)value;
-//%
-// Write methods for types that aren't in packed arrays.
-//%PDDM-DEFINE _WRITE_UNPACKABLE_DECLS(NAME, TYPE)
-//%/**
-//% * Write a TYPE for the given field number.
-//% *
-//% * @param fieldNumber The field number assigned to the value.
-//% * @param value       The value to write out.
-//% **/
-//%- (void)write##NAME:(int32_t)fieldNumber value:(TYPE *)value;
-//%/**
-//% * Write an array of TYPE for the given field number.
-//% *
-//% * @param fieldNumber The field number assigned to the values.
-//% * @param values      The values to write out.
-//% **/
-//%- (void)write##NAME##Array:(int32_t)fieldNumber
-//%           NAME$S values:(NSArray<##TYPE##*> *)values;
-//%/**
-//% * Write a TYPE without any tag.
-//% *
-//% * @param value The value to write out.
-//% **/
-//%- (void)write##NAME##NoTag:(TYPE *)value;
-//%
-// Special write methods for Groups.
-//%PDDM-DEFINE _WRITE_GROUP_DECLS(NAME, TYPE)
-//%/**
-//% * Write a TYPE for the given field number.
-//% *
-//% * @param fieldNumber The field number assigned to the value.
-//% * @param value       The value to write out.
-//% **/
-//%- (void)write##NAME:(int32_t)fieldNumber
-//%       NAME$S value:(TYPE *)value;
-//%/**
-//% * Write an array of TYPE for the given field number.
-//% *
-//% * @param fieldNumber The field number assigned to the values.
-//% * @param values      The values to write out.
-//% **/
-//%- (void)write##NAME##Array:(int32_t)fieldNumber
-//%           NAME$S values:(NSArray<##TYPE##*> *)values;
-//%/**
-//% * Write a TYPE without any tag (but does write the endGroup tag).
-//% *
-//% * @param fieldNumber The field number assigned to the value.
-//% * @param value       The value to write out.
-//% **/
-//%- (void)write##NAME##NoTag:(int32_t)fieldNumber
-//%            NAME$S value:(TYPE *)value;
-//%
-
-// One macro to hide it all up above.
-//%PDDM-DEFINE _WRITE_DECLS()
-//%_WRITE_PACKABLE_DECLS(Double, Double, double)
-//%_WRITE_PACKABLE_DECLS(Float, Float, float)
-//%_WRITE_PACKABLE_DECLS(UInt64, UInt64, uint64_t)
-//%_WRITE_PACKABLE_DECLS(Int64, Int64, int64_t)
-//%_WRITE_PACKABLE_DECLS(Int32, Int32, int32_t)
-//%_WRITE_PACKABLE_DECLS(UInt32, UInt32, uint32_t)
-//%_WRITE_PACKABLE_DECLS(Fixed64, UInt64, uint64_t)
-//%_WRITE_PACKABLE_DECLS(Fixed32, UInt32, uint32_t)
-//%_WRITE_PACKABLE_DECLS(SInt32, Int32, int32_t)
-//%_WRITE_PACKABLE_DECLS(SInt64, Int64, int64_t)
-//%_WRITE_PACKABLE_DECLS(SFixed64, Int64, int64_t)
-//%_WRITE_PACKABLE_DECLS(SFixed32, Int32, int32_t)
-//%_WRITE_PACKABLE_DECLS(Bool, Bool, BOOL)
-//%_WRITE_PACKABLE_DECLS(Enum, Enum, int32_t)
-//%_WRITE_UNPACKABLE_DECLS(String, NSString)
-//%_WRITE_UNPACKABLE_DECLS(Message, GPBMessage)
-//%_WRITE_UNPACKABLE_DECLS(Bytes, NSData)
-//%_WRITE_GROUP_DECLS(Group, GPBMessage)
-//%_WRITE_GROUP_DECLS(UnknownGroup, GPBUnknownFieldSet)
diff --git a/libs/protobuf/objectivec/GPBCodedOutputStream.m b/libs/protobuf/objectivec/GPBCodedOutputStream.m
deleted file mode 100644
index 4e2a514..0000000
--- a/libs/protobuf/objectivec/GPBCodedOutputStream.m
+++ /dev/null
@@ -1,1248 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#import "GPBCodedOutputStream_PackagePrivate.h"
-
-#import <mach/vm_param.h>
-
-#import "GPBArray.h"
-#import "GPBUnknownFieldSet_PackagePrivate.h"
-#import "GPBUtilities_PackagePrivate.h"
-
-// These values are the existing values so as not to break any code that might
-// have already been inspecting them when they weren't documented/exposed.
-NSString *const GPBCodedOutputStreamException_OutOfSpace = @"OutOfSpace";
-NSString *const GPBCodedOutputStreamException_WriteFailed = @"WriteFailed";
-
-// Structure for containing state of a GPBCodedInputStream. Brought out into
-// a struct so that we can inline several common functions instead of dealing
-// with overhead of ObjC dispatch.
-typedef struct GPBOutputBufferState {
-  uint8_t *bytes;
-  size_t size;
-  size_t position;
-  NSOutputStream *output;
-} GPBOutputBufferState;
-
-@implementation GPBCodedOutputStream {
-  GPBOutputBufferState state_;
-  NSMutableData *buffer_;
-}
-
-static const int32_t LITTLE_ENDIAN_32_SIZE = sizeof(uint32_t);
-static const int32_t LITTLE_ENDIAN_64_SIZE = sizeof(uint64_t);
-
-// Internal helper that writes the current buffer to the output. The
-// buffer position is reset to its initial value when this returns.
-static void GPBRefreshBuffer(GPBOutputBufferState *state) {
-  if (state->output == nil) {
-    // We're writing to a single buffer.
-    [NSException raise:GPBCodedOutputStreamException_OutOfSpace format:@""];
-  }
-  if (state->position != 0) {
-    NSInteger written =
-        [state->output write:state->bytes maxLength:state->position];
-    if (written != (NSInteger)state->position) {
-      [NSException raise:GPBCodedOutputStreamException_WriteFailed format:@""];
-    }
-    state->position = 0;
-  }
-}
-
-static void GPBWriteRawByte(GPBOutputBufferState *state, uint8_t value) {
-  if (state->position == state->size) {
-    GPBRefreshBuffer(state);
-  }
-  state->bytes[state->position++] = value;
-}
-
-static void GPBWriteRawVarint32(GPBOutputBufferState *state, int32_t value) {
-  while (YES) {
-    if ((value & ~0x7F) == 0) {
-      uint8_t val = (uint8_t)value;
-      GPBWriteRawByte(state, val);
-      return;
-    } else {
-      GPBWriteRawByte(state, (value & 0x7F) | 0x80);
-      value = GPBLogicalRightShift32(value, 7);
-    }
-  }
-}
-
-static void GPBWriteRawVarint64(GPBOutputBufferState *state, int64_t value) {
-  while (YES) {
-    if ((value & ~0x7FL) == 0) {
-      uint8_t val = (uint8_t)value;
-      GPBWriteRawByte(state, val);
-      return;
-    } else {
-      GPBWriteRawByte(state, ((int32_t)value & 0x7F) | 0x80);
-      value = GPBLogicalRightShift64(value, 7);
-    }
-  }
-}
-
-static void GPBWriteInt32NoTag(GPBOutputBufferState *state, int32_t value) {
-  if (value >= 0) {
-    GPBWriteRawVarint32(state, value);
-  } else {
-    // Must sign-extend
-    GPBWriteRawVarint64(state, value);
-  }
-}
-
-static void GPBWriteUInt32(GPBOutputBufferState *state, int32_t fieldNumber,
-                           uint32_t value) {
-  GPBWriteTagWithFormat(state, fieldNumber, GPBWireFormatVarint);
-  GPBWriteRawVarint32(state, value);
-}
-
-static void GPBWriteTagWithFormat(GPBOutputBufferState *state,
-                                  uint32_t fieldNumber, GPBWireFormat format) {
-  GPBWriteRawVarint32(state, GPBWireFormatMakeTag(fieldNumber, format));
-}
-
-static void GPBWriteRawLittleEndian32(GPBOutputBufferState *state,
-                                      int32_t value) {
-  GPBWriteRawByte(state, (value)&0xFF);
-  GPBWriteRawByte(state, (value >> 8) & 0xFF);
-  GPBWriteRawByte(state, (value >> 16) & 0xFF);
-  GPBWriteRawByte(state, (value >> 24) & 0xFF);
-}
-
-static void GPBWriteRawLittleEndian64(GPBOutputBufferState *state,
-                                      int64_t value) {
-  GPBWriteRawByte(state, (int32_t)(value)&0xFF);
-  GPBWriteRawByte(state, (int32_t)(value >> 8) & 0xFF);
-  GPBWriteRawByte(state, (int32_t)(value >> 16) & 0xFF);
-  GPBWriteRawByte(state, (int32_t)(value >> 24) & 0xFF);
-  GPBWriteRawByte(state, (int32_t)(value >> 32) & 0xFF);
-  GPBWriteRawByte(state, (int32_t)(value >> 40) & 0xFF);
-  GPBWriteRawByte(state, (int32_t)(value >> 48) & 0xFF);
-  GPBWriteRawByte(state, (int32_t)(value >> 56) & 0xFF);
-}
-
-- (void)dealloc {
-  [self flush];
-  [state_.output close];
-  [state_.output release];
-  [buffer_ release];
-
-  [super dealloc];
-}
-
-- (instancetype)initWithOutputStream:(NSOutputStream *)output {
-  NSMutableData *data = [NSMutableData dataWithLength:PAGE_SIZE];
-  return [self initWithOutputStream:output data:data];
-}
-
-- (instancetype)initWithData:(NSMutableData *)data {
-  return [self initWithOutputStream:nil data:data];
-}
-
-// This initializer isn't exposed, but it is the designated initializer.
-// Setting OutputStream and NSData is to control the buffering behavior/size
-// of the work, but that is more obvious via the bufferSize: version.
-- (instancetype)initWithOutputStream:(NSOutputStream *)output
-                                data:(NSMutableData *)data {
-  if ((self = [super init])) {
-    buffer_ = [data retain];
-    state_.bytes = [data mutableBytes];
-    state_.size = [data length];
-    state_.output = [output retain];
-    [state_.output open];
-  }
-  return self;
-}
-
-+ (instancetype)streamWithOutputStream:(NSOutputStream *)output {
-  NSMutableData *data = [NSMutableData dataWithLength:PAGE_SIZE];
-  return [[[self alloc] initWithOutputStream:output
-                                        data:data] autorelease];
-}
-
-+ (instancetype)streamWithData:(NSMutableData *)data {
-  return [[[self alloc] initWithData:data] autorelease];
-}
-
-// Direct access is use for speed, to avoid even internally declaring things
-// read/write, etc. The warning is enabled in the project to ensure code calling
-// protos can turn on -Wdirect-ivar-access without issues.
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdirect-ivar-access"
-
-- (void)writeDoubleNoTag:(double)value {
-  GPBWriteRawLittleEndian64(&state_, GPBConvertDoubleToInt64(value));
-}
-
-- (void)writeDouble:(int32_t)fieldNumber value:(double)value {
-  GPBWriteTagWithFormat(&state_, fieldNumber, GPBWireFormatFixed64);
-  GPBWriteRawLittleEndian64(&state_, GPBConvertDoubleToInt64(value));
-}
-
-- (void)writeFloatNoTag:(float)value {
-  GPBWriteRawLittleEndian32(&state_, GPBConvertFloatToInt32(value));
-}
-
-- (void)writeFloat:(int32_t)fieldNumber value:(float)value {
-  GPBWriteTagWithFormat(&state_, fieldNumber, GPBWireFormatFixed32);
-  GPBWriteRawLittleEndian32(&state_, GPBConvertFloatToInt32(value));
-}
-
-- (void)writeUInt64NoTag:(uint64_t)value {
-  GPBWriteRawVarint64(&state_, value);
-}
-
-- (void)writeUInt64:(int32_t)fieldNumber value:(uint64_t)value {
-  GPBWriteTagWithFormat(&state_, fieldNumber, GPBWireFormatVarint);
-  GPBWriteRawVarint64(&state_, value);
-}
-
-- (void)writeInt64NoTag:(int64_t)value {
-  GPBWriteRawVarint64(&state_, value);
-}
-
-- (void)writeInt64:(int32_t)fieldNumber value:(int64_t)value {
-  GPBWriteTagWithFormat(&state_, fieldNumber, GPBWireFormatVarint);
-  GPBWriteRawVarint64(&state_, value);
-}
-
-- (void)writeInt32NoTag:(int32_t)value {
-  GPBWriteInt32NoTag(&state_, value);
-}
-
-- (void)writeInt32:(int32_t)fieldNumber value:(int32_t)value {
-  GPBWriteTagWithFormat(&state_, fieldNumber, GPBWireFormatVarint);
-  GPBWriteInt32NoTag(&state_, value);
-}
-
-- (void)writeFixed64NoTag:(uint64_t)value {
-  GPBWriteRawLittleEndian64(&state_, value);
-}
-
-- (void)writeFixed64:(int32_t)fieldNumber value:(uint64_t)value {
-  GPBWriteTagWithFormat(&state_, fieldNumber, GPBWireFormatFixed64);
-  GPBWriteRawLittleEndian64(&state_, value);
-}
-
-- (void)writeFixed32NoTag:(uint32_t)value {
-  GPBWriteRawLittleEndian32(&state_, value);
-}
-
-- (void)writeFixed32:(int32_t)fieldNumber value:(uint32_t)value {
-  GPBWriteTagWithFormat(&state_, fieldNumber, GPBWireFormatFixed32);
-  GPBWriteRawLittleEndian32(&state_, value);
-}
-
-- (void)writeBoolNoTag:(BOOL)value {
-  GPBWriteRawByte(&state_, (value ? 1 : 0));
-}
-
-- (void)writeBool:(int32_t)fieldNumber value:(BOOL)value {
-  GPBWriteTagWithFormat(&state_, fieldNumber, GPBWireFormatVarint);
-  GPBWriteRawByte(&state_, (value ? 1 : 0));
-}
-
-- (void)writeStringNoTag:(const NSString *)value {
-  size_t length = [value lengthOfBytesUsingEncoding:NSUTF8StringEncoding];
-  GPBWriteRawVarint32(&state_, (int32_t)length);
-  if (length == 0) {
-    return;
-  }
-
-  const char *quickString =
-      CFStringGetCStringPtr((CFStringRef)value, kCFStringEncodingUTF8);
-
-  // Fast path: Most strings are short, if the buffer already has space,
-  // add to it directly.
-  NSUInteger bufferBytesLeft = state_.size - state_.position;
-  if (bufferBytesLeft >= length) {
-    NSUInteger usedBufferLength = 0;
-    BOOL result;
-    if (quickString != NULL) {
-      memcpy(state_.bytes + state_.position, quickString, length);
-      usedBufferLength = length;
-      result = YES;
-    } else {
-      result = [value getBytes:state_.bytes + state_.position
-                     maxLength:bufferBytesLeft
-                    usedLength:&usedBufferLength
-                      encoding:NSUTF8StringEncoding
-                       options:(NSStringEncodingConversionOptions)0
-                         range:NSMakeRange(0, [value length])
-                remainingRange:NULL];
-    }
-    if (result) {
-      NSAssert2((usedBufferLength == length),
-                @"Our UTF8 calc was wrong? %tu vs %zd", usedBufferLength,
-                length);
-      state_.position += usedBufferLength;
-      return;
-    }
-  } else if (quickString != NULL) {
-    [self writeRawPtr:quickString offset:0 length:length];
-  } else {
-    // Slow path: just get it as data and write it out.
-    NSData *utf8Data = [value dataUsingEncoding:NSUTF8StringEncoding];
-    NSAssert2(([utf8Data length] == length),
-              @"Strings UTF8 length was wrong? %tu vs %zd", [utf8Data length],
-              length);
-    [self writeRawData:utf8Data];
-  }
-}
-
-- (void)writeString:(int32_t)fieldNumber value:(NSString *)value {
-  GPBWriteTagWithFormat(&state_, fieldNumber, GPBWireFormatLengthDelimited);
-  [self writeStringNoTag:value];
-}
-
-- (void)writeGroupNoTag:(int32_t)fieldNumber value:(GPBMessage *)value {
-  [value writeToCodedOutputStream:self];
-  GPBWriteTagWithFormat(&state_, fieldNumber, GPBWireFormatEndGroup);
-}
-
-- (void)writeGroup:(int32_t)fieldNumber value:(GPBMessage *)value {
-  GPBWriteTagWithFormat(&state_, fieldNumber, GPBWireFormatStartGroup);
-  [self writeGroupNoTag:fieldNumber value:value];
-}
-
-- (void)writeUnknownGroupNoTag:(int32_t)fieldNumber
-                         value:(const GPBUnknownFieldSet *)value {
-  [value writeToCodedOutputStream:self];
-  GPBWriteTagWithFormat(&state_, fieldNumber, GPBWireFormatEndGroup);
-}
-
-- (void)writeUnknownGroup:(int32_t)fieldNumber
-                    value:(GPBUnknownFieldSet *)value {
-  GPBWriteTagWithFormat(&state_, fieldNumber, GPBWireFormatStartGroup);
-  [self writeUnknownGroupNoTag:fieldNumber value:value];
-}
-
-- (void)writeMessageNoTag:(GPBMessage *)value {
-  GPBWriteRawVarint32(&state_, (int32_t)[value serializedSize]);
-  [value writeToCodedOutputStream:self];
-}
-
-- (void)writeMessage:(int32_t)fieldNumber value:(GPBMessage *)value {
-  GPBWriteTagWithFormat(&state_, fieldNumber, GPBWireFormatLengthDelimited);
-  [self writeMessageNoTag:value];
-}
-
-- (void)writeBytesNoTag:(NSData *)value {
-  GPBWriteRawVarint32(&state_, (int32_t)[value length]);
-  [self writeRawData:value];
-}
-
-- (void)writeBytes:(int32_t)fieldNumber value:(NSData *)value {
-  GPBWriteTagWithFormat(&state_, fieldNumber, GPBWireFormatLengthDelimited);
-  [self writeBytesNoTag:value];
-}
-
-- (void)writeUInt32NoTag:(uint32_t)value {
-  GPBWriteRawVarint32(&state_, value);
-}
-
-- (void)writeUInt32:(int32_t)fieldNumber value:(uint32_t)value {
-  GPBWriteUInt32(&state_, fieldNumber, value);
-}
-
-- (void)writeEnumNoTag:(int32_t)value {
-  GPBWriteInt32NoTag(&state_, value);
-}
-
-- (void)writeEnum:(int32_t)fieldNumber value:(int32_t)value {
-  GPBWriteTagWithFormat(&state_, fieldNumber, GPBWireFormatVarint);
-  GPBWriteInt32NoTag(&state_, value);
-}
-
-- (void)writeSFixed32NoTag:(int32_t)value {
-  GPBWriteRawLittleEndian32(&state_, value);
-}
-
-- (void)writeSFixed32:(int32_t)fieldNumber value:(int32_t)value {
-  GPBWriteTagWithFormat(&state_, fieldNumber, GPBWireFormatFixed32);
-  GPBWriteRawLittleEndian32(&state_, value);
-}
-
-- (void)writeSFixed64NoTag:(int64_t)value {
-  GPBWriteRawLittleEndian64(&state_, value);
-}
-
-- (void)writeSFixed64:(int32_t)fieldNumber value:(int64_t)value {
-  GPBWriteTagWithFormat(&state_, fieldNumber, GPBWireFormatFixed64);
-  GPBWriteRawLittleEndian64(&state_, value);
-}
-
-- (void)writeSInt32NoTag:(int32_t)value {
-  GPBWriteRawVarint32(&state_, GPBEncodeZigZag32(value));
-}
-
-- (void)writeSInt32:(int32_t)fieldNumber value:(int32_t)value {
-  GPBWriteTagWithFormat(&state_, fieldNumber, GPBWireFormatVarint);
-  GPBWriteRawVarint32(&state_, GPBEncodeZigZag32(value));
-}
-
-- (void)writeSInt64NoTag:(int64_t)value {
-  GPBWriteRawVarint64(&state_, GPBEncodeZigZag64(value));
-}
-
-- (void)writeSInt64:(int32_t)fieldNumber value:(int64_t)value {
-  GPBWriteTagWithFormat(&state_, fieldNumber, GPBWireFormatVarint);
-  GPBWriteRawVarint64(&state_, GPBEncodeZigZag64(value));
-}
-
-//%PDDM-DEFINE WRITE_PACKABLE_DEFNS(NAME, ARRAY_TYPE, TYPE, ACCESSOR_NAME)
-//%- (void)write##NAME##Array:(int32_t)fieldNumber
-//%       NAME$S     values:(GPB##ARRAY_TYPE##Array *)values
-//%       NAME$S        tag:(uint32_t)tag {
-//%  if (tag != 0) {
-//%    if (values.count == 0) return;
-//%    __block size_t dataSize = 0;
-//%    [values enumerate##ACCESSOR_NAME##ValuesWithBlock:^(TYPE value, NSUInteger idx, BOOL *stop) {
-//%#pragma unused(idx, stop)
-//%      dataSize += GPBCompute##NAME##SizeNoTag(value);
-//%    }];
-//%    GPBWriteRawVarint32(&state_, tag);
-//%    GPBWriteRawVarint32(&state_, (int32_t)dataSize);
-//%    [values enumerate##ACCESSOR_NAME##ValuesWithBlock:^(TYPE value, NSUInteger idx, BOOL *stop) {
-//%#pragma unused(idx, stop)
-//%      [self write##NAME##NoTag:value];
-//%    }];
-//%  } else {
-//%    [values enumerate##ACCESSOR_NAME##ValuesWithBlock:^(TYPE value, NSUInteger idx, BOOL *stop) {
-//%#pragma unused(idx, stop)
-//%      [self write##NAME:fieldNumber value:value];
-//%    }];
-//%  }
-//%}
-//%
-//%PDDM-DEFINE WRITE_UNPACKABLE_DEFNS(NAME, TYPE)
-//%- (void)write##NAME##Array:(int32_t)fieldNumber values:(NSArray *)values {
-//%  for (TYPE *value in values) {
-//%    [self write##NAME:fieldNumber value:value];
-//%  }
-//%}
-//%
-//%PDDM-EXPAND WRITE_PACKABLE_DEFNS(Double, Double, double, )
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-- (void)writeDoubleArray:(int32_t)fieldNumber
-                  values:(GPBDoubleArray *)values
-                     tag:(uint32_t)tag {
-  if (tag != 0) {
-    if (values.count == 0) return;
-    __block size_t dataSize = 0;
-    [values enumerateValuesWithBlock:^(double value, NSUInteger idx, BOOL *stop) {
-#pragma unused(idx, stop)
-      dataSize += GPBComputeDoubleSizeNoTag(value);
-    }];
-    GPBWriteRawVarint32(&state_, tag);
-    GPBWriteRawVarint32(&state_, (int32_t)dataSize);
-    [values enumerateValuesWithBlock:^(double value, NSUInteger idx, BOOL *stop) {
-#pragma unused(idx, stop)
-      [self writeDoubleNoTag:value];
-    }];
-  } else {
-    [values enumerateValuesWithBlock:^(double value, NSUInteger idx, BOOL *stop) {
-#pragma unused(idx, stop)
-      [self writeDouble:fieldNumber value:value];
-    }];
-  }
-}
-
-// clang-format on
-//%PDDM-EXPAND WRITE_PACKABLE_DEFNS(Float, Float, float, )
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-- (void)writeFloatArray:(int32_t)fieldNumber
-                 values:(GPBFloatArray *)values
-                    tag:(uint32_t)tag {
-  if (tag != 0) {
-    if (values.count == 0) return;
-    __block size_t dataSize = 0;
-    [values enumerateValuesWithBlock:^(float value, NSUInteger idx, BOOL *stop) {
-#pragma unused(idx, stop)
-      dataSize += GPBComputeFloatSizeNoTag(value);
-    }];
-    GPBWriteRawVarint32(&state_, tag);
-    GPBWriteRawVarint32(&state_, (int32_t)dataSize);
-    [values enumerateValuesWithBlock:^(float value, NSUInteger idx, BOOL *stop) {
-#pragma unused(idx, stop)
-      [self writeFloatNoTag:value];
-    }];
-  } else {
-    [values enumerateValuesWithBlock:^(float value, NSUInteger idx, BOOL *stop) {
-#pragma unused(idx, stop)
-      [self writeFloat:fieldNumber value:value];
-    }];
-  }
-}
-
-// clang-format on
-//%PDDM-EXPAND WRITE_PACKABLE_DEFNS(UInt64, UInt64, uint64_t, )
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-- (void)writeUInt64Array:(int32_t)fieldNumber
-                  values:(GPBUInt64Array *)values
-                     tag:(uint32_t)tag {
-  if (tag != 0) {
-    if (values.count == 0) return;
-    __block size_t dataSize = 0;
-    [values enumerateValuesWithBlock:^(uint64_t value, NSUInteger idx, BOOL *stop) {
-#pragma unused(idx, stop)
-      dataSize += GPBComputeUInt64SizeNoTag(value);
-    }];
-    GPBWriteRawVarint32(&state_, tag);
-    GPBWriteRawVarint32(&state_, (int32_t)dataSize);
-    [values enumerateValuesWithBlock:^(uint64_t value, NSUInteger idx, BOOL *stop) {
-#pragma unused(idx, stop)
-      [self writeUInt64NoTag:value];
-    }];
-  } else {
-    [values enumerateValuesWithBlock:^(uint64_t value, NSUInteger idx, BOOL *stop) {
-#pragma unused(idx, stop)
-      [self writeUInt64:fieldNumber value:value];
-    }];
-  }
-}
-
-// clang-format on
-//%PDDM-EXPAND WRITE_PACKABLE_DEFNS(Int64, Int64, int64_t, )
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-- (void)writeInt64Array:(int32_t)fieldNumber
-                 values:(GPBInt64Array *)values
-                    tag:(uint32_t)tag {
-  if (tag != 0) {
-    if (values.count == 0) return;
-    __block size_t dataSize = 0;
-    [values enumerateValuesWithBlock:^(int64_t value, NSUInteger idx, BOOL *stop) {
-#pragma unused(idx, stop)
-      dataSize += GPBComputeInt64SizeNoTag(value);
-    }];
-    GPBWriteRawVarint32(&state_, tag);
-    GPBWriteRawVarint32(&state_, (int32_t)dataSize);
-    [values enumerateValuesWithBlock:^(int64_t value, NSUInteger idx, BOOL *stop) {
-#pragma unused(idx, stop)
-      [self writeInt64NoTag:value];
-    }];
-  } else {
-    [values enumerateValuesWithBlock:^(int64_t value, NSUInteger idx, BOOL *stop) {
-#pragma unused(idx, stop)
-      [self writeInt64:fieldNumber value:value];
-    }];
-  }
-}
-
-// clang-format on
-//%PDDM-EXPAND WRITE_PACKABLE_DEFNS(Int32, Int32, int32_t, )
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-- (void)writeInt32Array:(int32_t)fieldNumber
-                 values:(GPBInt32Array *)values
-                    tag:(uint32_t)tag {
-  if (tag != 0) {
-    if (values.count == 0) return;
-    __block size_t dataSize = 0;
-    [values enumerateValuesWithBlock:^(int32_t value, NSUInteger idx, BOOL *stop) {
-#pragma unused(idx, stop)
-      dataSize += GPBComputeInt32SizeNoTag(value);
-    }];
-    GPBWriteRawVarint32(&state_, tag);
-    GPBWriteRawVarint32(&state_, (int32_t)dataSize);
-    [values enumerateValuesWithBlock:^(int32_t value, NSUInteger idx, BOOL *stop) {
-#pragma unused(idx, stop)
-      [self writeInt32NoTag:value];
-    }];
-  } else {
-    [values enumerateValuesWithBlock:^(int32_t value, NSUInteger idx, BOOL *stop) {
-#pragma unused(idx, stop)
-      [self writeInt32:fieldNumber value:value];
-    }];
-  }
-}
-
-// clang-format on
-//%PDDM-EXPAND WRITE_PACKABLE_DEFNS(UInt32, UInt32, uint32_t, )
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-- (void)writeUInt32Array:(int32_t)fieldNumber
-                  values:(GPBUInt32Array *)values
-                     tag:(uint32_t)tag {
-  if (tag != 0) {
-    if (values.count == 0) return;
-    __block size_t dataSize = 0;
-    [values enumerateValuesWithBlock:^(uint32_t value, NSUInteger idx, BOOL *stop) {
-#pragma unused(idx, stop)
-      dataSize += GPBComputeUInt32SizeNoTag(value);
-    }];
-    GPBWriteRawVarint32(&state_, tag);
-    GPBWriteRawVarint32(&state_, (int32_t)dataSize);
-    [values enumerateValuesWithBlock:^(uint32_t value, NSUInteger idx, BOOL *stop) {
-#pragma unused(idx, stop)
-      [self writeUInt32NoTag:value];
-    }];
-  } else {
-    [values enumerateValuesWithBlock:^(uint32_t value, NSUInteger idx, BOOL *stop) {
-#pragma unused(idx, stop)
-      [self writeUInt32:fieldNumber value:value];
-    }];
-  }
-}
-
-// clang-format on
-//%PDDM-EXPAND WRITE_PACKABLE_DEFNS(Fixed64, UInt64, uint64_t, )
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-- (void)writeFixed64Array:(int32_t)fieldNumber
-                   values:(GPBUInt64Array *)values
-                      tag:(uint32_t)tag {
-  if (tag != 0) {
-    if (values.count == 0) return;
-    __block size_t dataSize = 0;
-    [values enumerateValuesWithBlock:^(uint64_t value, NSUInteger idx, BOOL *stop) {
-#pragma unused(idx, stop)
-      dataSize += GPBComputeFixed64SizeNoTag(value);
-    }];
-    GPBWriteRawVarint32(&state_, tag);
-    GPBWriteRawVarint32(&state_, (int32_t)dataSize);
-    [values enumerateValuesWithBlock:^(uint64_t value, NSUInteger idx, BOOL *stop) {
-#pragma unused(idx, stop)
-      [self writeFixed64NoTag:value];
-    }];
-  } else {
-    [values enumerateValuesWithBlock:^(uint64_t value, NSUInteger idx, BOOL *stop) {
-#pragma unused(idx, stop)
-      [self writeFixed64:fieldNumber value:value];
-    }];
-  }
-}
-
-// clang-format on
-//%PDDM-EXPAND WRITE_PACKABLE_DEFNS(Fixed32, UInt32, uint32_t, )
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-- (void)writeFixed32Array:(int32_t)fieldNumber
-                   values:(GPBUInt32Array *)values
-                      tag:(uint32_t)tag {
-  if (tag != 0) {
-    if (values.count == 0) return;
-    __block size_t dataSize = 0;
-    [values enumerateValuesWithBlock:^(uint32_t value, NSUInteger idx, BOOL *stop) {
-#pragma unused(idx, stop)
-      dataSize += GPBComputeFixed32SizeNoTag(value);
-    }];
-    GPBWriteRawVarint32(&state_, tag);
-    GPBWriteRawVarint32(&state_, (int32_t)dataSize);
-    [values enumerateValuesWithBlock:^(uint32_t value, NSUInteger idx, BOOL *stop) {
-#pragma unused(idx, stop)
-      [self writeFixed32NoTag:value];
-    }];
-  } else {
-    [values enumerateValuesWithBlock:^(uint32_t value, NSUInteger idx, BOOL *stop) {
-#pragma unused(idx, stop)
-      [self writeFixed32:fieldNumber value:value];
-    }];
-  }
-}
-
-// clang-format on
-//%PDDM-EXPAND WRITE_PACKABLE_DEFNS(SInt32, Int32, int32_t, )
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-- (void)writeSInt32Array:(int32_t)fieldNumber
-                  values:(GPBInt32Array *)values
-                     tag:(uint32_t)tag {
-  if (tag != 0) {
-    if (values.count == 0) return;
-    __block size_t dataSize = 0;
-    [values enumerateValuesWithBlock:^(int32_t value, NSUInteger idx, BOOL *stop) {
-#pragma unused(idx, stop)
-      dataSize += GPBComputeSInt32SizeNoTag(value);
-    }];
-    GPBWriteRawVarint32(&state_, tag);
-    GPBWriteRawVarint32(&state_, (int32_t)dataSize);
-    [values enumerateValuesWithBlock:^(int32_t value, NSUInteger idx, BOOL *stop) {
-#pragma unused(idx, stop)
-      [self writeSInt32NoTag:value];
-    }];
-  } else {
-    [values enumerateValuesWithBlock:^(int32_t value, NSUInteger idx, BOOL *stop) {
-#pragma unused(idx, stop)
-      [self writeSInt32:fieldNumber value:value];
-    }];
-  }
-}
-
-// clang-format on
-//%PDDM-EXPAND WRITE_PACKABLE_DEFNS(SInt64, Int64, int64_t, )
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-- (void)writeSInt64Array:(int32_t)fieldNumber
-                  values:(GPBInt64Array *)values
-                     tag:(uint32_t)tag {
-  if (tag != 0) {
-    if (values.count == 0) return;
-    __block size_t dataSize = 0;
-    [values enumerateValuesWithBlock:^(int64_t value, NSUInteger idx, BOOL *stop) {
-#pragma unused(idx, stop)
-      dataSize += GPBComputeSInt64SizeNoTag(value);
-    }];
-    GPBWriteRawVarint32(&state_, tag);
-    GPBWriteRawVarint32(&state_, (int32_t)dataSize);
-    [values enumerateValuesWithBlock:^(int64_t value, NSUInteger idx, BOOL *stop) {
-#pragma unused(idx, stop)
-      [self writeSInt64NoTag:value];
-    }];
-  } else {
-    [values enumerateValuesWithBlock:^(int64_t value, NSUInteger idx, BOOL *stop) {
-#pragma unused(idx, stop)
-      [self writeSInt64:fieldNumber value:value];
-    }];
-  }
-}
-
-// clang-format on
-//%PDDM-EXPAND WRITE_PACKABLE_DEFNS(SFixed64, Int64, int64_t, )
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-- (void)writeSFixed64Array:(int32_t)fieldNumber
-                    values:(GPBInt64Array *)values
-                       tag:(uint32_t)tag {
-  if (tag != 0) {
-    if (values.count == 0) return;
-    __block size_t dataSize = 0;
-    [values enumerateValuesWithBlock:^(int64_t value, NSUInteger idx, BOOL *stop) {
-#pragma unused(idx, stop)
-      dataSize += GPBComputeSFixed64SizeNoTag(value);
-    }];
-    GPBWriteRawVarint32(&state_, tag);
-    GPBWriteRawVarint32(&state_, (int32_t)dataSize);
-    [values enumerateValuesWithBlock:^(int64_t value, NSUInteger idx, BOOL *stop) {
-#pragma unused(idx, stop)
-      [self writeSFixed64NoTag:value];
-    }];
-  } else {
-    [values enumerateValuesWithBlock:^(int64_t value, NSUInteger idx, BOOL *stop) {
-#pragma unused(idx, stop)
-      [self writeSFixed64:fieldNumber value:value];
-    }];
-  }
-}
-
-// clang-format on
-//%PDDM-EXPAND WRITE_PACKABLE_DEFNS(SFixed32, Int32, int32_t, )
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-- (void)writeSFixed32Array:(int32_t)fieldNumber
-                    values:(GPBInt32Array *)values
-                       tag:(uint32_t)tag {
-  if (tag != 0) {
-    if (values.count == 0) return;
-    __block size_t dataSize = 0;
-    [values enumerateValuesWithBlock:^(int32_t value, NSUInteger idx, BOOL *stop) {
-#pragma unused(idx, stop)
-      dataSize += GPBComputeSFixed32SizeNoTag(value);
-    }];
-    GPBWriteRawVarint32(&state_, tag);
-    GPBWriteRawVarint32(&state_, (int32_t)dataSize);
-    [values enumerateValuesWithBlock:^(int32_t value, NSUInteger idx, BOOL *stop) {
-#pragma unused(idx, stop)
-      [self writeSFixed32NoTag:value];
-    }];
-  } else {
-    [values enumerateValuesWithBlock:^(int32_t value, NSUInteger idx, BOOL *stop) {
-#pragma unused(idx, stop)
-      [self writeSFixed32:fieldNumber value:value];
-    }];
-  }
-}
-
-// clang-format on
-//%PDDM-EXPAND WRITE_PACKABLE_DEFNS(Bool, Bool, BOOL, )
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-- (void)writeBoolArray:(int32_t)fieldNumber
-                values:(GPBBoolArray *)values
-                   tag:(uint32_t)tag {
-  if (tag != 0) {
-    if (values.count == 0) return;
-    __block size_t dataSize = 0;
-    [values enumerateValuesWithBlock:^(BOOL value, NSUInteger idx, BOOL *stop) {
-#pragma unused(idx, stop)
-      dataSize += GPBComputeBoolSizeNoTag(value);
-    }];
-    GPBWriteRawVarint32(&state_, tag);
-    GPBWriteRawVarint32(&state_, (int32_t)dataSize);
-    [values enumerateValuesWithBlock:^(BOOL value, NSUInteger idx, BOOL *stop) {
-#pragma unused(idx, stop)
-      [self writeBoolNoTag:value];
-    }];
-  } else {
-    [values enumerateValuesWithBlock:^(BOOL value, NSUInteger idx, BOOL *stop) {
-#pragma unused(idx, stop)
-      [self writeBool:fieldNumber value:value];
-    }];
-  }
-}
-
-// clang-format on
-//%PDDM-EXPAND WRITE_PACKABLE_DEFNS(Enum, Enum, int32_t, Raw)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-- (void)writeEnumArray:(int32_t)fieldNumber
-                values:(GPBEnumArray *)values
-                   tag:(uint32_t)tag {
-  if (tag != 0) {
-    if (values.count == 0) return;
-    __block size_t dataSize = 0;
-    [values enumerateRawValuesWithBlock:^(int32_t value, NSUInteger idx, BOOL *stop) {
-#pragma unused(idx, stop)
-      dataSize += GPBComputeEnumSizeNoTag(value);
-    }];
-    GPBWriteRawVarint32(&state_, tag);
-    GPBWriteRawVarint32(&state_, (int32_t)dataSize);
-    [values enumerateRawValuesWithBlock:^(int32_t value, NSUInteger idx, BOOL *stop) {
-#pragma unused(idx, stop)
-      [self writeEnumNoTag:value];
-    }];
-  } else {
-    [values enumerateRawValuesWithBlock:^(int32_t value, NSUInteger idx, BOOL *stop) {
-#pragma unused(idx, stop)
-      [self writeEnum:fieldNumber value:value];
-    }];
-  }
-}
-
-// clang-format on
-//%PDDM-EXPAND WRITE_UNPACKABLE_DEFNS(String, NSString)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-- (void)writeStringArray:(int32_t)fieldNumber values:(NSArray *)values {
-  for (NSString *value in values) {
-    [self writeString:fieldNumber value:value];
-  }
-}
-
-// clang-format on
-//%PDDM-EXPAND WRITE_UNPACKABLE_DEFNS(Message, GPBMessage)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-- (void)writeMessageArray:(int32_t)fieldNumber values:(NSArray *)values {
-  for (GPBMessage *value in values) {
-    [self writeMessage:fieldNumber value:value];
-  }
-}
-
-// clang-format on
-//%PDDM-EXPAND WRITE_UNPACKABLE_DEFNS(Bytes, NSData)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-- (void)writeBytesArray:(int32_t)fieldNumber values:(NSArray *)values {
-  for (NSData *value in values) {
-    [self writeBytes:fieldNumber value:value];
-  }
-}
-
-// clang-format on
-//%PDDM-EXPAND WRITE_UNPACKABLE_DEFNS(Group, GPBMessage)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-- (void)writeGroupArray:(int32_t)fieldNumber values:(NSArray *)values {
-  for (GPBMessage *value in values) {
-    [self writeGroup:fieldNumber value:value];
-  }
-}
-
-// clang-format on
-//%PDDM-EXPAND WRITE_UNPACKABLE_DEFNS(UnknownGroup, GPBUnknownFieldSet)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-- (void)writeUnknownGroupArray:(int32_t)fieldNumber values:(NSArray *)values {
-  for (GPBUnknownFieldSet *value in values) {
-    [self writeUnknownGroup:fieldNumber value:value];
-  }
-}
-
-// clang-format on
-//%PDDM-EXPAND-END (19 expansions)
-
-- (void)writeMessageSetExtension:(int32_t)fieldNumber
-                           value:(GPBMessage *)value {
-  GPBWriteTagWithFormat(&state_, GPBWireFormatMessageSetItem,
-                        GPBWireFormatStartGroup);
-  GPBWriteUInt32(&state_, GPBWireFormatMessageSetTypeId, fieldNumber);
-  [self writeMessage:GPBWireFormatMessageSetMessage value:value];
-  GPBWriteTagWithFormat(&state_, GPBWireFormatMessageSetItem,
-                        GPBWireFormatEndGroup);
-}
-
-- (void)writeRawMessageSetExtension:(int32_t)fieldNumber value:(NSData *)value {
-  GPBWriteTagWithFormat(&state_, GPBWireFormatMessageSetItem,
-                        GPBWireFormatStartGroup);
-  GPBWriteUInt32(&state_, GPBWireFormatMessageSetTypeId, fieldNumber);
-  [self writeBytes:GPBWireFormatMessageSetMessage value:value];
-  GPBWriteTagWithFormat(&state_, GPBWireFormatMessageSetItem,
-                        GPBWireFormatEndGroup);
-}
-
-- (void)flush {
-  if (state_.output != nil) {
-    GPBRefreshBuffer(&state_);
-  }
-}
-
-- (void)writeRawByte:(uint8_t)value {
-  GPBWriteRawByte(&state_, value);
-}
-
-- (void)writeRawData:(const NSData *)data {
-  [self writeRawPtr:[data bytes] offset:0 length:[data length]];
-}
-
-- (void)writeRawPtr:(const void *)value
-             offset:(size_t)offset
-             length:(size_t)length {
-  if (value == nil || length == 0) {
-    return;
-  }
-
-  NSUInteger bufferLength = state_.size;
-  NSUInteger bufferBytesLeft = bufferLength - state_.position;
-  if (bufferBytesLeft >= length) {
-    // We have room in the current buffer.
-    memcpy(state_.bytes + state_.position, ((uint8_t *)value) + offset, length);
-    state_.position += length;
-  } else {
-    // Write extends past current buffer.  Fill the rest of this buffer and
-    // flush.
-    size_t bytesWritten = bufferBytesLeft;
-    memcpy(state_.bytes + state_.position, ((uint8_t *)value) + offset,
-           bytesWritten);
-    offset += bytesWritten;
-    length -= bytesWritten;
-    state_.position = bufferLength;
-    GPBRefreshBuffer(&state_);
-    bufferLength = state_.size;
-
-    // Now deal with the rest.
-    // Since we have an output stream, this is our buffer
-    // and buffer offset == 0
-    if (length <= bufferLength) {
-      // Fits in new buffer.
-      memcpy(state_.bytes, ((uint8_t *)value) + offset, length);
-      state_.position = length;
-    } else {
-      // Write is very big.  Let's do it all at once.
-      NSInteger written = [state_.output write:((uint8_t *)value) + offset maxLength:length];
-      if (written != (NSInteger)length) {
-        [NSException raise:GPBCodedOutputStreamException_WriteFailed format:@""];
-      }
-    }
-  }
-}
-
-- (void)writeTag:(uint32_t)fieldNumber format:(GPBWireFormat)format {
-  GPBWriteTagWithFormat(&state_, fieldNumber, format);
-}
-
-- (void)writeRawVarint32:(int32_t)value {
-  GPBWriteRawVarint32(&state_, value);
-}
-
-- (void)writeRawVarintSizeTAs32:(size_t)value {
-  // Note the truncation.
-  GPBWriteRawVarint32(&state_, (int32_t)value);
-}
-
-- (void)writeRawVarint64:(int64_t)value {
-  GPBWriteRawVarint64(&state_, value);
-}
-
-- (void)writeRawLittleEndian32:(int32_t)value {
-  GPBWriteRawLittleEndian32(&state_, value);
-}
-
-- (void)writeRawLittleEndian64:(int64_t)value {
-  GPBWriteRawLittleEndian64(&state_, value);
-}
-
-#pragma clang diagnostic pop
-
-@end
-
-size_t GPBComputeDoubleSizeNoTag(Float64 value) {
-#pragma unused(value)
-  return LITTLE_ENDIAN_64_SIZE;
-}
-
-size_t GPBComputeFloatSizeNoTag(Float32 value) {
-#pragma unused(value)
-  return LITTLE_ENDIAN_32_SIZE;
-}
-
-size_t GPBComputeUInt64SizeNoTag(uint64_t value) {
-  return GPBComputeRawVarint64Size(value);
-}
-
-size_t GPBComputeInt64SizeNoTag(int64_t value) {
-  return GPBComputeRawVarint64Size(value);
-}
-
-size_t GPBComputeInt32SizeNoTag(int32_t value) {
-  if (value >= 0) {
-    return GPBComputeRawVarint32Size(value);
-  } else {
-    // Must sign-extend.
-    return 10;
-  }
-}
-
-size_t GPBComputeSizeTSizeAsInt32NoTag(size_t value) {
-  return GPBComputeInt32SizeNoTag((int32_t)value);
-}
-
-size_t GPBComputeFixed64SizeNoTag(uint64_t value) {
-#pragma unused(value)
-  return LITTLE_ENDIAN_64_SIZE;
-}
-
-size_t GPBComputeFixed32SizeNoTag(uint32_t value) {
-#pragma unused(value)
-  return LITTLE_ENDIAN_32_SIZE;
-}
-
-size_t GPBComputeBoolSizeNoTag(BOOL value) {
-#pragma unused(value)
-  return 1;
-}
-
-size_t GPBComputeStringSizeNoTag(NSString *value) {
-  NSUInteger length = [value lengthOfBytesUsingEncoding:NSUTF8StringEncoding];
-  return GPBComputeRawVarint32SizeForInteger(length) + length;
-}
-
-size_t GPBComputeGroupSizeNoTag(GPBMessage *value) {
-  return [value serializedSize];
-}
-
-size_t GPBComputeUnknownGroupSizeNoTag(GPBUnknownFieldSet *value) {
-  return value.serializedSize;
-}
-
-size_t GPBComputeMessageSizeNoTag(GPBMessage *value) {
-  size_t size = [value serializedSize];
-  return GPBComputeRawVarint32SizeForInteger(size) + size;
-}
-
-size_t GPBComputeBytesSizeNoTag(NSData *value) {
-  NSUInteger valueLength = [value length];
-  return GPBComputeRawVarint32SizeForInteger(valueLength) + valueLength;
-}
-
-size_t GPBComputeUInt32SizeNoTag(int32_t value) {
-  return GPBComputeRawVarint32Size(value);
-}
-
-size_t GPBComputeEnumSizeNoTag(int32_t value) {
-  return GPBComputeInt32SizeNoTag(value);
-}
-
-size_t GPBComputeSFixed32SizeNoTag(int32_t value) {
-#pragma unused(value)
-  return LITTLE_ENDIAN_32_SIZE;
-}
-
-size_t GPBComputeSFixed64SizeNoTag(int64_t value) {
-#pragma unused(value)
-  return LITTLE_ENDIAN_64_SIZE;
-}
-
-size_t GPBComputeSInt32SizeNoTag(int32_t value) {
-  return GPBComputeRawVarint32Size(GPBEncodeZigZag32(value));
-}
-
-size_t GPBComputeSInt64SizeNoTag(int64_t value) {
-  return GPBComputeRawVarint64Size(GPBEncodeZigZag64(value));
-}
-
-size_t GPBComputeDoubleSize(int32_t fieldNumber, double value) {
-  return GPBComputeTagSize(fieldNumber) + GPBComputeDoubleSizeNoTag(value);
-}
-
-size_t GPBComputeFloatSize(int32_t fieldNumber, float value) {
-  return GPBComputeTagSize(fieldNumber) + GPBComputeFloatSizeNoTag(value);
-}
-
-size_t GPBComputeUInt64Size(int32_t fieldNumber, uint64_t value) {
-  return GPBComputeTagSize(fieldNumber) + GPBComputeUInt64SizeNoTag(value);
-}
-
-size_t GPBComputeInt64Size(int32_t fieldNumber, int64_t value) {
-  return GPBComputeTagSize(fieldNumber) + GPBComputeInt64SizeNoTag(value);
-}
-
-size_t GPBComputeInt32Size(int32_t fieldNumber, int32_t value) {
-  return GPBComputeTagSize(fieldNumber) + GPBComputeInt32SizeNoTag(value);
-}
-
-size_t GPBComputeFixed64Size(int32_t fieldNumber, uint64_t value) {
-  return GPBComputeTagSize(fieldNumber) + GPBComputeFixed64SizeNoTag(value);
-}
-
-size_t GPBComputeFixed32Size(int32_t fieldNumber, uint32_t value) {
-  return GPBComputeTagSize(fieldNumber) + GPBComputeFixed32SizeNoTag(value);
-}
-
-size_t GPBComputeBoolSize(int32_t fieldNumber, BOOL value) {
-  return GPBComputeTagSize(fieldNumber) + GPBComputeBoolSizeNoTag(value);
-}
-
-size_t GPBComputeStringSize(int32_t fieldNumber, NSString *value) {
-  return GPBComputeTagSize(fieldNumber) + GPBComputeStringSizeNoTag(value);
-}
-
-size_t GPBComputeGroupSize(int32_t fieldNumber, GPBMessage *value) {
-  return GPBComputeTagSize(fieldNumber) * 2 + GPBComputeGroupSizeNoTag(value);
-}
-
-size_t GPBComputeUnknownGroupSize(int32_t fieldNumber,
-                                  GPBUnknownFieldSet *value) {
-  return GPBComputeTagSize(fieldNumber) * 2 +
-         GPBComputeUnknownGroupSizeNoTag(value);
-}
-
-size_t GPBComputeMessageSize(int32_t fieldNumber, GPBMessage *value) {
-  return GPBComputeTagSize(fieldNumber) + GPBComputeMessageSizeNoTag(value);
-}
-
-size_t GPBComputeBytesSize(int32_t fieldNumber, NSData *value) {
-  return GPBComputeTagSize(fieldNumber) + GPBComputeBytesSizeNoTag(value);
-}
-
-size_t GPBComputeUInt32Size(int32_t fieldNumber, uint32_t value) {
-  return GPBComputeTagSize(fieldNumber) + GPBComputeUInt32SizeNoTag(value);
-}
-
-size_t GPBComputeEnumSize(int32_t fieldNumber, int32_t value) {
-  return GPBComputeTagSize(fieldNumber) + GPBComputeEnumSizeNoTag(value);
-}
-
-size_t GPBComputeSFixed32Size(int32_t fieldNumber, int32_t value) {
-  return GPBComputeTagSize(fieldNumber) + GPBComputeSFixed32SizeNoTag(value);
-}
-
-size_t GPBComputeSFixed64Size(int32_t fieldNumber, int64_t value) {
-  return GPBComputeTagSize(fieldNumber) + GPBComputeSFixed64SizeNoTag(value);
-}
-
-size_t GPBComputeSInt32Size(int32_t fieldNumber, int32_t value) {
-  return GPBComputeTagSize(fieldNumber) + GPBComputeSInt32SizeNoTag(value);
-}
-
-size_t GPBComputeSInt64Size(int32_t fieldNumber, int64_t value) {
-  return GPBComputeTagSize(fieldNumber) +
-         GPBComputeRawVarint64Size(GPBEncodeZigZag64(value));
-}
-
-size_t GPBComputeMessageSetExtensionSize(int32_t fieldNumber,
-                                         GPBMessage *value) {
-  return GPBComputeTagSize(GPBWireFormatMessageSetItem) * 2 +
-         GPBComputeUInt32Size(GPBWireFormatMessageSetTypeId, fieldNumber) +
-         GPBComputeMessageSize(GPBWireFormatMessageSetMessage, value);
-}
-
-size_t GPBComputeRawMessageSetExtensionSize(int32_t fieldNumber,
-                                            NSData *value) {
-  return GPBComputeTagSize(GPBWireFormatMessageSetItem) * 2 +
-         GPBComputeUInt32Size(GPBWireFormatMessageSetTypeId, fieldNumber) +
-         GPBComputeBytesSize(GPBWireFormatMessageSetMessage, value);
-}
-
-size_t GPBComputeTagSize(int32_t fieldNumber) {
-  return GPBComputeRawVarint32Size(
-      GPBWireFormatMakeTag(fieldNumber, GPBWireFormatVarint));
-}
-
-size_t GPBComputeWireFormatTagSize(int field_number, GPBDataType dataType) {
-  size_t result = GPBComputeTagSize(field_number);
-  if (dataType == GPBDataTypeGroup) {
-    // Groups have both a start and an end tag.
-    return result * 2;
-  } else {
-    return result;
-  }
-}
-
-size_t GPBComputeRawVarint32Size(int32_t value) {
-  // value is treated as unsigned, so it won't be sign-extended if negative.
-  if ((value & (0xffffffff << 7)) == 0) return 1;
-  if ((value & (0xffffffff << 14)) == 0) return 2;
-  if ((value & (0xffffffff << 21)) == 0) return 3;
-  if ((value & (0xffffffff << 28)) == 0) return 4;
-  return 5;
-}
-
-size_t GPBComputeRawVarint32SizeForInteger(NSInteger value) {
-  // Note the truncation.
-  return GPBComputeRawVarint32Size((int32_t)value);
-}
-
-size_t GPBComputeRawVarint64Size(int64_t value) {
-  if ((value & (0xffffffffffffffffL << 7)) == 0) return 1;
-  if ((value & (0xffffffffffffffffL << 14)) == 0) return 2;
-  if ((value & (0xffffffffffffffffL << 21)) == 0) return 3;
-  if ((value & (0xffffffffffffffffL << 28)) == 0) return 4;
-  if ((value & (0xffffffffffffffffL << 35)) == 0) return 5;
-  if ((value & (0xffffffffffffffffL << 42)) == 0) return 6;
-  if ((value & (0xffffffffffffffffL << 49)) == 0) return 7;
-  if ((value & (0xffffffffffffffffL << 56)) == 0) return 8;
-  if ((value & (0xffffffffffffffffL << 63)) == 0) return 9;
-  return 10;
-}
diff --git a/libs/protobuf/objectivec/GPBCodedOutputStream_PackagePrivate.h b/libs/protobuf/objectivec/GPBCodedOutputStream_PackagePrivate.h
deleted file mode 100644
index 2e7bb4c..0000000
--- a/libs/protobuf/objectivec/GPBCodedOutputStream_PackagePrivate.h
+++ /dev/null
@@ -1,126 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2016 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#import "GPBCodedOutputStream.h"
-
-NS_ASSUME_NONNULL_BEGIN
-
-CF_EXTERN_C_BEGIN
-
-size_t GPBComputeDoubleSize(int32_t fieldNumber, double value)
-    __attribute__((const));
-size_t GPBComputeFloatSize(int32_t fieldNumber, float value)
-    __attribute__((const));
-size_t GPBComputeUInt64Size(int32_t fieldNumber, uint64_t value)
-    __attribute__((const));
-size_t GPBComputeInt64Size(int32_t fieldNumber, int64_t value)
-    __attribute__((const));
-size_t GPBComputeInt32Size(int32_t fieldNumber, int32_t value)
-    __attribute__((const));
-size_t GPBComputeFixed64Size(int32_t fieldNumber, uint64_t value)
-    __attribute__((const));
-size_t GPBComputeFixed32Size(int32_t fieldNumber, uint32_t value)
-    __attribute__((const));
-size_t GPBComputeBoolSize(int32_t fieldNumber, BOOL value)
-    __attribute__((const));
-size_t GPBComputeStringSize(int32_t fieldNumber, NSString *value)
-    __attribute__((const));
-size_t GPBComputeGroupSize(int32_t fieldNumber, GPBMessage *value)
-    __attribute__((const));
-size_t GPBComputeUnknownGroupSize(int32_t fieldNumber,
-                                  GPBUnknownFieldSet *value)
-    __attribute__((const));
-size_t GPBComputeMessageSize(int32_t fieldNumber, GPBMessage *value)
-    __attribute__((const));
-size_t GPBComputeBytesSize(int32_t fieldNumber, NSData *value)
-    __attribute__((const));
-size_t GPBComputeUInt32Size(int32_t fieldNumber, uint32_t value)
-    __attribute__((const));
-size_t GPBComputeSFixed32Size(int32_t fieldNumber, int32_t value)
-    __attribute__((const));
-size_t GPBComputeSFixed64Size(int32_t fieldNumber, int64_t value)
-    __attribute__((const));
-size_t GPBComputeSInt32Size(int32_t fieldNumber, int32_t value)
-    __attribute__((const));
-size_t GPBComputeSInt64Size(int32_t fieldNumber, int64_t value)
-    __attribute__((const));
-size_t GPBComputeTagSize(int32_t fieldNumber) __attribute__((const));
-size_t GPBComputeWireFormatTagSize(int field_number, GPBDataType dataType)
-    __attribute__((const));
-
-size_t GPBComputeDoubleSizeNoTag(double value) __attribute__((const));
-size_t GPBComputeFloatSizeNoTag(float value) __attribute__((const));
-size_t GPBComputeUInt64SizeNoTag(uint64_t value) __attribute__((const));
-size_t GPBComputeInt64SizeNoTag(int64_t value) __attribute__((const));
-size_t GPBComputeInt32SizeNoTag(int32_t value) __attribute__((const));
-size_t GPBComputeFixed64SizeNoTag(uint64_t value) __attribute__((const));
-size_t GPBComputeFixed32SizeNoTag(uint32_t value) __attribute__((const));
-size_t GPBComputeBoolSizeNoTag(BOOL value) __attribute__((const));
-size_t GPBComputeStringSizeNoTag(NSString *value) __attribute__((const));
-size_t GPBComputeGroupSizeNoTag(GPBMessage *value) __attribute__((const));
-size_t GPBComputeUnknownGroupSizeNoTag(GPBUnknownFieldSet *value)
-    __attribute__((const));
-size_t GPBComputeMessageSizeNoTag(GPBMessage *value) __attribute__((const));
-size_t GPBComputeBytesSizeNoTag(NSData *value) __attribute__((const));
-size_t GPBComputeUInt32SizeNoTag(int32_t value) __attribute__((const));
-size_t GPBComputeEnumSizeNoTag(int32_t value) __attribute__((const));
-size_t GPBComputeSFixed32SizeNoTag(int32_t value) __attribute__((const));
-size_t GPBComputeSFixed64SizeNoTag(int64_t value) __attribute__((const));
-size_t GPBComputeSInt32SizeNoTag(int32_t value) __attribute__((const));
-size_t GPBComputeSInt64SizeNoTag(int64_t value) __attribute__((const));
-
-// Note that this will calculate the size of 64 bit values truncated to 32.
-size_t GPBComputeSizeTSizeAsInt32NoTag(size_t value) __attribute__((const));
-
-size_t GPBComputeRawVarint32Size(int32_t value) __attribute__((const));
-size_t GPBComputeRawVarint64Size(int64_t value) __attribute__((const));
-
-// Note that this will calculate the size of 64 bit values truncated to 32.
-size_t GPBComputeRawVarint32SizeForInteger(NSInteger value)
-    __attribute__((const));
-
-// Compute the number of bytes that would be needed to encode a
-// MessageSet extension to the stream.  For historical reasons,
-// the wire format differs from normal fields.
-size_t GPBComputeMessageSetExtensionSize(int32_t fieldNumber, GPBMessage *value)
-    __attribute__((const));
-
-// Compute the number of bytes that would be needed to encode an
-// unparsed MessageSet extension field to the stream.  For
-// historical reasons, the wire format differs from normal fields.
-size_t GPBComputeRawMessageSetExtensionSize(int32_t fieldNumber, NSData *value)
-    __attribute__((const));
-
-size_t GPBComputeEnumSize(int32_t fieldNumber, int32_t value)
-    __attribute__((const));
-
-CF_EXTERN_C_END
-
-NS_ASSUME_NONNULL_END
diff --git a/libs/protobuf/objectivec/GPBDescriptor.h b/libs/protobuf/objectivec/GPBDescriptor.h
deleted file mode 100644
index fd66b0e..0000000
--- a/libs/protobuf/objectivec/GPBDescriptor.h
+++ /dev/null
@@ -1,318 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#import <Foundation/Foundation.h>
-
-#import "GPBRuntimeTypes.h"
-
-@class GPBEnumDescriptor;
-@class GPBFieldDescriptor;
-@class GPBFileDescriptor;
-@class GPBOneofDescriptor;
-
-NS_ASSUME_NONNULL_BEGIN
-
-/** Syntax used in the proto file. */
-typedef NS_ENUM(uint8_t, GPBFileSyntax) {
-  /** Unknown syntax. */
-  GPBFileSyntaxUnknown = 0,
-  /** Proto2 syntax. */
-  GPBFileSyntaxProto2 = 2,
-  /** Proto3 syntax. */
-  GPBFileSyntaxProto3 = 3,
-};
-
-/** Type of proto field. */
-typedef NS_ENUM(uint8_t, GPBFieldType) {
-  /** Optional/required field. Only valid for proto2 fields. */
-  GPBFieldTypeSingle,
-  /** Repeated field. */
-  GPBFieldTypeRepeated,
-  /** Map field. */
-  GPBFieldTypeMap,
-};
-
-/**
- * Describes a proto message.
- **/
-@interface GPBDescriptor : NSObject<NSCopying>
-
-/** Name of the message. */
-@property(nonatomic, readonly, copy) NSString *name;
-/** Fields declared in the message. */
-@property(nonatomic, readonly, strong, nullable) NSArray<GPBFieldDescriptor*> *fields;
-/** Oneofs declared in the message. */
-@property(nonatomic, readonly, strong, nullable) NSArray<GPBOneofDescriptor*> *oneofs;
-/** Extension range declared for the message. */
-@property(nonatomic, readonly, nullable) const GPBExtensionRange *extensionRanges;
-/** Number of extension ranges declared for the message. */
-@property(nonatomic, readonly) uint32_t extensionRangesCount;
-/** Descriptor for the file where the message was defined. */
-@property(nonatomic, readonly) GPBFileDescriptor *file;
-
-/** Whether the message is in wire format or not. */
-@property(nonatomic, readonly, getter=isWireFormat) BOOL wireFormat;
-/** The class of this message. */
-@property(nonatomic, readonly) Class messageClass;
-/** Containing message descriptor if this message is nested, or nil otherwise. */
-@property(readonly, nullable) GPBDescriptor *containingType;
-/**
- * Fully qualified name for this message (package.message). Can be nil if the
- * value is unable to be computed.
- */
-@property(readonly, nullable) NSString *fullName;
-
-/**
- * Gets the field for the given number.
- *
- * @param fieldNumber The number for the field to get.
- *
- * @return The field descriptor for the given number, or nil if not found.
- **/
-- (nullable GPBFieldDescriptor *)fieldWithNumber:(uint32_t)fieldNumber;
-
-/**
- * Gets the field for the given name.
- *
- * @param name The name for the field to get.
- *
- * @return The field descriptor for the given name, or nil if not found.
- **/
-- (nullable GPBFieldDescriptor *)fieldWithName:(NSString *)name;
-
-/**
- * Gets the oneof for the given name.
- *
- * @param name The name for the oneof to get.
- *
- * @return The oneof descriptor for the given name, or nil if not found.
- **/
-- (nullable GPBOneofDescriptor *)oneofWithName:(NSString *)name;
-
-@end
-
-/**
- * Describes a proto file.
- **/
-@interface GPBFileDescriptor : NSObject
-
-/** The package declared in the proto file. */
-@property(nonatomic, readonly, copy) NSString *package;
-/** The objc prefix declared in the proto file. */
-@property(nonatomic, readonly, copy, nullable) NSString *objcPrefix;
-/** The syntax of the proto file. */
-@property(nonatomic, readonly) GPBFileSyntax syntax;
-
-@end
-
-/**
- * Describes a oneof field.
- **/
-@interface GPBOneofDescriptor : NSObject
-/** Name of the oneof field. */
-@property(nonatomic, readonly) NSString *name;
-/** Fields declared in the oneof. */
-@property(nonatomic, readonly) NSArray<GPBFieldDescriptor*> *fields;
-
-/**
- * Gets the field for the given number.
- *
- * @param fieldNumber The number for the field to get.
- *
- * @return The field descriptor for the given number, or nil if not found.
- **/
-- (nullable GPBFieldDescriptor *)fieldWithNumber:(uint32_t)fieldNumber;
-
-/**
- * Gets the field for the given name.
- *
- * @param name The name for the field to get.
- *
- * @return The field descriptor for the given name, or nil if not found.
- **/
-- (nullable GPBFieldDescriptor *)fieldWithName:(NSString *)name;
-
-@end
-
-/**
- * Describes a proto field.
- **/
-@interface GPBFieldDescriptor : NSObject
-
-/** Name of the field. */
-@property(nonatomic, readonly, copy) NSString *name;
-/** Number associated with the field. */
-@property(nonatomic, readonly) uint32_t number;
-/** Data type contained in the field. */
-@property(nonatomic, readonly) GPBDataType dataType;
-/** Whether it has a default value or not. */
-@property(nonatomic, readonly) BOOL hasDefaultValue;
-/** Default value for the field. */
-@property(nonatomic, readonly) GPBGenericValue defaultValue;
-/** Whether this field is required. Only valid for proto2 fields. */
-@property(nonatomic, readonly, getter=isRequired) BOOL required;
-/** Whether this field is optional. */
-@property(nonatomic, readonly, getter=isOptional) BOOL optional;
-/** Type of field (single, repeated, map). */
-@property(nonatomic, readonly) GPBFieldType fieldType;
-/** Type of the key if the field is a map. The value's type is -dataType. */
-@property(nonatomic, readonly) GPBDataType mapKeyDataType;
-/** Whether the field is packable. */
-@property(nonatomic, readonly, getter=isPackable) BOOL packable;
-
-/** The containing oneof if this field is part of one, nil otherwise. */
-@property(nonatomic, readonly, nullable) GPBOneofDescriptor *containingOneof;
-
-/** Class of the message if the field is of message type. */
-@property(nonatomic, readonly, nullable) Class msgClass;
-
-/** Descriptor for the enum if this field is an enum. */
-@property(nonatomic, readonly, strong, nullable) GPBEnumDescriptor *enumDescriptor;
-
-/**
- * Checks whether the given enum raw value is a valid enum value.
- *
- * @param value The raw enum value to check.
- *
- * @return YES if value is a valid enum raw value.
- **/
-- (BOOL)isValidEnumValue:(int32_t)value;
-
-/** @return Name for the text format, or nil if not known. */
-- (nullable NSString *)textFormatName;
-
-@end
-
-/**
- * Describes a proto enum.
- **/
-@interface GPBEnumDescriptor : NSObject
-
-/** Name of the enum. */
-@property(nonatomic, readonly, copy) NSString *name;
-/** Function that validates that raw values are valid enum values. */
-@property(nonatomic, readonly) GPBEnumValidationFunc enumVerifier;
-
-/**
- * Returns the enum value name for the given raw enum.
- *
- * Note that there can be more than one name corresponding to a given value
- * if the allow_alias option is used.
- *
- * @param number The raw enum value.
- *
- * @return The first name that matches the enum value passed, or nil if not valid.
- **/
-- (nullable NSString *)enumNameForValue:(int32_t)number;
-
-/**
- * Gets the enum raw value for the given enum name.
- *
- * @param outValue A pointer where the value will be set.
- * @param name     The enum name for which to get the raw value.
- *
- * @return YES if a value was copied into the pointer, NO otherwise.
- **/
-- (BOOL)getValue:(nullable int32_t *)outValue forEnumName:(NSString *)name;
-
-/**
- * Returns the text format for the given raw enum value.
- *
- * @param number The raw enum value.
- *
- * @return The first text format name which matches the enum value, or nil if not valid.
- **/
-- (nullable NSString *)textFormatNameForValue:(int32_t)number;
-
-/**
- * Gets the enum raw value for the given text format name.
- *
- * @param outValue       A pointer where the value will be set.
- * @param textFormatName The text format name for which to get the raw value.
- *
- * @return YES if a value was copied into the pointer, NO otherwise.
- **/
-- (BOOL)getValue:(nullable int32_t *)outValue forEnumTextFormatName:(NSString *)textFormatName;
-
-/**
- * Gets the number of defined enum names.
- *
- * @return Count of the number of enum names, including any aliases.
- */
-@property(nonatomic, readonly) uint32_t enumNameCount;
-
-/**
- * Gets the enum name corresponding to the given index.
- *
- * @param index Index into the available names.  The defined range is from 0
- *              to self.enumNameCount - 1.
- *
- * @returns The enum name at the given index, or nil if the index is out of range.
- */
-- (nullable NSString *)getEnumNameForIndex:(uint32_t)index;
-
-/**
- * Gets the enum text format name corresponding to the given index.
- *
- * @param index Index into the available names.  The defined range is from 0
- *              to self.enumNameCount - 1.
- *
- * @returns The text format name at the given index, or nil if the index is out of range.
- */
-- (nullable NSString *)getEnumTextFormatNameForIndex:(uint32_t)index;
-
-@end
-
-/**
- * Describes a proto extension.
- **/
-@interface GPBExtensionDescriptor : NSObject<NSCopying>
-/** Field number under which the extension is stored. */
-@property(nonatomic, readonly) uint32_t fieldNumber;
-/** The containing message class, i.e. the class extended by this extension. */
-@property(nonatomic, readonly) Class containingMessageClass;
-/** Data type contained in the extension. */
-@property(nonatomic, readonly) GPBDataType dataType;
-/** Whether the extension is repeated. */
-@property(nonatomic, readonly, getter=isRepeated) BOOL repeated;
-/** Whether the extension is packable. */
-@property(nonatomic, readonly, getter=isPackable) BOOL packable;
-/** The class of the message if the extension is of message type. */
-@property(nonatomic, readonly) Class msgClass;
-/** The singleton name for the extension. */
-@property(nonatomic, readonly) NSString *singletonName;
-/** The enum descriptor if the extension is of enum type. */
-@property(nonatomic, readonly, strong, nullable) GPBEnumDescriptor *enumDescriptor;
-/** The default value for the extension. */
-@property(nonatomic, readonly, nullable) id defaultValue;
-
-@end
-
-NS_ASSUME_NONNULL_END
diff --git a/libs/protobuf/objectivec/GPBDescriptor.m b/libs/protobuf/objectivec/GPBDescriptor.m
deleted file mode 100644
index c29b955..0000000
--- a/libs/protobuf/objectivec/GPBDescriptor.m
+++ /dev/null
@@ -1,1154 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#import "GPBDescriptor_PackagePrivate.h"
-
-#import <objc/runtime.h>
-
-#import "GPBUtilities_PackagePrivate.h"
-#import "GPBWireFormat.h"
-#import "GPBMessage_PackagePrivate.h"
-
-// Direct access is use for speed, to avoid even internally declaring things
-// read/write, etc. The warning is enabled in the project to ensure code calling
-// protos can turn on -Wdirect-ivar-access without issues.
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdirect-ivar-access"
-
-// The addresses of these variables are used as keys for objc_getAssociatedObject.
-static const char kTextFormatExtraValueKey = 0;
-static const char kParentClassValueKey = 0;
-static const char kClassNameSuffixKey = 0;
-
-// Utility function to generate selectors on the fly.
-static SEL SelFromStrings(const char *prefix, const char *middle,
-                          const char *suffix, BOOL takesArg) {
-  if (prefix == NULL && suffix == NULL && !takesArg) {
-    return sel_getUid(middle);
-  }
-  const size_t prefixLen = prefix != NULL ? strlen(prefix) : 0;
-  const size_t middleLen = strlen(middle);
-  const size_t suffixLen = suffix != NULL ? strlen(suffix) : 0;
-  size_t totalLen =
-      prefixLen + middleLen + suffixLen + 1;  // include space for null on end.
-  if (takesArg) {
-    totalLen += 1;
-  }
-  char buffer[totalLen];
-  if (prefix != NULL) {
-    memcpy(buffer, prefix, prefixLen);
-    memcpy(buffer + prefixLen, middle, middleLen);
-    buffer[prefixLen] = (char)toupper(buffer[prefixLen]);
-  } else {
-    memcpy(buffer, middle, middleLen);
-  }
-  if (suffix != NULL) {
-    memcpy(buffer + prefixLen + middleLen, suffix, suffixLen);
-  }
-  if (takesArg) {
-    buffer[totalLen - 2] = ':';
-  }
-  // Always null terminate it.
-  buffer[totalLen - 1] = 0;
-
-  SEL result = sel_getUid(buffer);
-  return result;
-}
-
-static NSArray *NewFieldsArrayForHasIndex(int hasIndex,
-                                          NSArray *allMessageFields)
-    __attribute__((ns_returns_retained));
-
-static NSArray *NewFieldsArrayForHasIndex(int hasIndex,
-                                          NSArray *allMessageFields) {
-  NSMutableArray *result = [[NSMutableArray alloc] init];
-  for (GPBFieldDescriptor *fieldDesc in allMessageFields) {
-    if (fieldDesc->description_->hasIndex == hasIndex) {
-      [result addObject:fieldDesc];
-    }
-  }
-  return result;
-}
-
-@implementation GPBDescriptor {
-  Class messageClass_;
-  GPBFileDescriptor *file_;
-  BOOL wireFormat_;
-}
-
-@synthesize messageClass = messageClass_;
-@synthesize fields = fields_;
-@synthesize oneofs = oneofs_;
-@synthesize extensionRanges = extensionRanges_;
-@synthesize extensionRangesCount = extensionRangesCount_;
-@synthesize file = file_;
-@synthesize wireFormat = wireFormat_;
-
-+ (instancetype)
-    allocDescriptorForClass:(Class)messageClass
-                  rootClass:(Class)rootClass
-                       file:(GPBFileDescriptor *)file
-                     fields:(void *)fieldDescriptions
-                 fieldCount:(uint32_t)fieldCount
-                storageSize:(uint32_t)storageSize
-                      flags:(GPBDescriptorInitializationFlags)flags {
-  // The rootClass is no longer used, but it is passed in to ensure it
-  // was started up during initialization also.
-  (void)rootClass;
-  NSMutableArray *fields = nil;
-  GPBFileSyntax syntax = file.syntax;
-  BOOL fieldsIncludeDefault =
-      (flags & GPBDescriptorInitializationFlag_FieldsWithDefault) != 0;
-  BOOL usesClassRefs =
-      (flags & GPBDescriptorInitializationFlag_UsesClassRefs) != 0;
-  BOOL proto3OptionalKnown =
-      (flags & GPBDescriptorInitializationFlag_Proto3OptionalKnown) != 0;
-
-  void *desc;
-  for (uint32_t i = 0; i < fieldCount; ++i) {
-    if (fields == nil) {
-      fields = [[NSMutableArray alloc] initWithCapacity:fieldCount];
-    }
-    // Need correctly typed pointer for array indexing below to work.
-    if (fieldsIncludeDefault) {
-      GPBMessageFieldDescriptionWithDefault *fieldDescWithDefault = fieldDescriptions;
-      desc = &(fieldDescWithDefault[i]);
-    } else {
-      GPBMessageFieldDescription *fieldDesc = fieldDescriptions;
-      desc = &(fieldDesc[i]);
-    }
-    GPBFieldDescriptor *fieldDescriptor =
-        [[GPBFieldDescriptor alloc] initWithFieldDescription:desc
-                                             includesDefault:fieldsIncludeDefault
-                                               usesClassRefs:usesClassRefs
-                                         proto3OptionalKnown:proto3OptionalKnown
-                                                      syntax:syntax];
-    [fields addObject:fieldDescriptor];
-    [fieldDescriptor release];
-  }
-
-  BOOL wireFormat = (flags & GPBDescriptorInitializationFlag_WireFormat) != 0;
-  GPBDescriptor *descriptor = [[self alloc] initWithClass:messageClass
-                                                     file:file
-                                                   fields:fields
-                                              storageSize:storageSize
-                                               wireFormat:wireFormat];
-  [fields release];
-  return descriptor;
-}
-
-- (instancetype)initWithClass:(Class)messageClass
-                         file:(GPBFileDescriptor *)file
-                       fields:(NSArray *)fields
-                  storageSize:(uint32_t)storageSize
-                   wireFormat:(BOOL)wireFormat {
-  if ((self = [super init])) {
-    messageClass_ = messageClass;
-    file_ = file;
-    fields_ = [fields retain];
-    storageSize_ = storageSize;
-    wireFormat_ = wireFormat;
-  }
-  return self;
-}
-
-- (void)dealloc {
-  [fields_ release];
-  [oneofs_ release];
-  [super dealloc];
-}
-
-- (void)setupOneofs:(const char **)oneofNames
-              count:(uint32_t)count
-      firstHasIndex:(int32_t)firstHasIndex {
-  NSCAssert(firstHasIndex < 0, @"Should always be <0");
-  NSMutableArray *oneofs = [[NSMutableArray alloc] initWithCapacity:count];
-  for (uint32_t i = 0, hasIndex = firstHasIndex; i < count; ++i, --hasIndex) {
-    const char *name = oneofNames[i];
-    NSArray *fieldsForOneof = NewFieldsArrayForHasIndex(hasIndex, fields_);
-    NSCAssert(fieldsForOneof.count > 0,
-              @"No fields for this oneof? (%s:%d)", name, hasIndex);
-    GPBOneofDescriptor *oneofDescriptor =
-        [[GPBOneofDescriptor alloc] initWithName:name fields:fieldsForOneof];
-    [oneofs addObject:oneofDescriptor];
-    [oneofDescriptor release];
-    [fieldsForOneof release];
-  }
-  oneofs_ = oneofs;
-}
-
-- (void)setupExtraTextInfo:(const char *)extraTextFormatInfo {
-  // Extra info is a compile time option, so skip the work if not needed.
-  if (extraTextFormatInfo) {
-    NSValue *extraInfoValue = [NSValue valueWithPointer:extraTextFormatInfo];
-    for (GPBFieldDescriptor *fieldDescriptor in fields_) {
-      if (fieldDescriptor->description_->flags & GPBFieldTextFormatNameCustom) {
-        objc_setAssociatedObject(fieldDescriptor, &kTextFormatExtraValueKey,
-                                 extraInfoValue,
-                                 OBJC_ASSOCIATION_RETAIN_NONATOMIC);
-      }
-    }
-  }
-}
-
-- (void)setupExtensionRanges:(const GPBExtensionRange *)ranges count:(int32_t)count {
-  extensionRanges_ = ranges;
-  extensionRangesCount_ = count;
-}
-
-- (void)setupContainingMessageClass:(Class)messageClass {
-  objc_setAssociatedObject(self, &kParentClassValueKey,
-                           messageClass,
-                           OBJC_ASSOCIATION_ASSIGN);
-}
-
-- (void)setupContainingMessageClassName:(const char *)msgClassName {
-  // Note: Only fetch the class here, can't send messages to it because
-  // that could cause cycles back to this class within +initialize if
-  // two messages have each other in fields (i.e. - they build a graph).
-  Class clazz = objc_getClass(msgClassName);
-  NSAssert(clazz, @"Class %s not defined", msgClassName);
-  [self setupContainingMessageClass:clazz];
-}
-
-- (void)setupMessageClassNameSuffix:(NSString *)suffix {
-  if (suffix.length) {
-    objc_setAssociatedObject(self, &kClassNameSuffixKey,
-                             suffix,
-                             OBJC_ASSOCIATION_RETAIN_NONATOMIC);
-  }
-}
-
-- (NSString *)name {
-  return NSStringFromClass(messageClass_);
-}
-
-- (GPBDescriptor *)containingType {
-  Class parentClass = objc_getAssociatedObject(self, &kParentClassValueKey);
-  return [parentClass descriptor];
-}
-
-- (NSString *)fullName {
-  NSString *className = NSStringFromClass(self.messageClass);
-  GPBFileDescriptor *file = self.file;
-  NSString *objcPrefix = file.objcPrefix;
-  if (objcPrefix && ![className hasPrefix:objcPrefix]) {
-    NSAssert(0,
-             @"Class didn't have correct prefix? (%@ - %@)",
-             className, objcPrefix);
-    return nil;
-  }
-  GPBDescriptor *parent = self.containingType;
-
-  NSString *name = nil;
-  if (parent) {
-    NSString *parentClassName = NSStringFromClass(parent.messageClass);
-    // The generator will add _Class to avoid reserved words, drop it.
-    NSString *suffix = objc_getAssociatedObject(parent, &kClassNameSuffixKey);
-    if (suffix) {
-      if (![parentClassName hasSuffix:suffix]) {
-        NSAssert(0,
-                 @"ParentMessage class didn't have correct suffix? (%@ - %@)",
-                 className, suffix);
-        return nil;
-      }
-      parentClassName =
-          [parentClassName substringToIndex:(parentClassName.length - suffix.length)];
-    }
-    NSString *parentPrefix = [parentClassName stringByAppendingString:@"_"];
-    if (![className hasPrefix:parentPrefix]) {
-      NSAssert(0,
-               @"Class didn't have the correct parent name prefix? (%@ - %@)",
-               parentPrefix, className);
-      return nil;
-    }
-    name = [className substringFromIndex:parentPrefix.length];
-  } else {
-    name = [className substringFromIndex:objcPrefix.length];
-  }
-
-  // The generator will add _Class to avoid reserved words, drop it.
-  NSString *suffix = objc_getAssociatedObject(self, &kClassNameSuffixKey);
-  if (suffix) {
-    if (![name hasSuffix:suffix]) {
-      NSAssert(0,
-               @"Message class didn't have correct suffix? (%@ - %@)",
-               name, suffix);
-      return nil;
-    }
-    name = [name substringToIndex:(name.length - suffix.length)];
-  }
-
-  NSString *prefix = (parent != nil ? parent.fullName : file.package);
-  NSString *result;
-  if (prefix.length > 0) {
-    result = [NSString stringWithFormat:@"%@.%@", prefix, name];
-  } else {
-    result = name;
-  }
-  return result;
-}
-
-- (id)copyWithZone:(NSZone *)zone {
-#pragma unused(zone)
-  return [self retain];
-}
-
-- (GPBFieldDescriptor *)fieldWithNumber:(uint32_t)fieldNumber {
-  for (GPBFieldDescriptor *descriptor in fields_) {
-    if (GPBFieldNumber(descriptor) == fieldNumber) {
-      return descriptor;
-    }
-  }
-  return nil;
-}
-
-- (GPBFieldDescriptor *)fieldWithName:(NSString *)name {
-  for (GPBFieldDescriptor *descriptor in fields_) {
-    if ([descriptor.name isEqual:name]) {
-      return descriptor;
-    }
-  }
-  return nil;
-}
-
-- (GPBOneofDescriptor *)oneofWithName:(NSString *)name {
-  for (GPBOneofDescriptor *descriptor in oneofs_) {
-    if ([descriptor.name isEqual:name]) {
-      return descriptor;
-    }
-  }
-  return nil;
-}
-
-@end
-
-@implementation GPBFileDescriptor {
-  NSString *package_;
-  NSString *objcPrefix_;
-  GPBFileSyntax syntax_;
-}
-
-@synthesize package = package_;
-@synthesize objcPrefix = objcPrefix_;
-@synthesize syntax = syntax_;
-
-- (instancetype)initWithPackage:(NSString *)package
-                     objcPrefix:(NSString *)objcPrefix
-                         syntax:(GPBFileSyntax)syntax {
-  self = [super init];
-  if (self) {
-    package_ = [package copy];
-    objcPrefix_ = [objcPrefix copy];
-    syntax_ = syntax;
-  }
-  return self;
-}
-
-- (instancetype)initWithPackage:(NSString *)package
-                         syntax:(GPBFileSyntax)syntax {
-  self = [super init];
-  if (self) {
-    package_ = [package copy];
-    syntax_ = syntax;
-  }
-  return self;
-}
-
-- (void)dealloc {
-  [package_ release];
-  [objcPrefix_ release];
-  [super dealloc];
-}
-
-@end
-
-@implementation GPBOneofDescriptor
-
-@synthesize fields = fields_;
-
-- (instancetype)initWithName:(const char *)name fields:(NSArray *)fields {
-  self = [super init];
-  if (self) {
-    name_ = name;
-    fields_ = [fields retain];
-    for (GPBFieldDescriptor *fieldDesc in fields) {
-      fieldDesc->containingOneof_ = self;
-    }
-
-    caseSel_ = SelFromStrings(NULL, name, "OneOfCase", NO);
-  }
-  return self;
-}
-
-- (void)dealloc {
-  [fields_ release];
-  [super dealloc];
-}
-
-- (NSString *)name {
-  return (NSString * _Nonnull)@(name_);
-}
-
-- (GPBFieldDescriptor *)fieldWithNumber:(uint32_t)fieldNumber {
-  for (GPBFieldDescriptor *descriptor in fields_) {
-    if (GPBFieldNumber(descriptor) == fieldNumber) {
-      return descriptor;
-    }
-  }
-  return nil;
-}
-
-- (GPBFieldDescriptor *)fieldWithName:(NSString *)name {
-  for (GPBFieldDescriptor *descriptor in fields_) {
-    if ([descriptor.name isEqual:name]) {
-      return descriptor;
-    }
-  }
-  return nil;
-}
-
-@end
-
-uint32_t GPBFieldTag(GPBFieldDescriptor *self) {
-  GPBMessageFieldDescription *description = self->description_;
-  GPBWireFormat format;
-  if ((description->flags & GPBFieldMapKeyMask) != 0) {
-    // Maps are repeated messages on the wire.
-    format = GPBWireFormatForType(GPBDataTypeMessage, NO);
-  } else {
-    format = GPBWireFormatForType(description->dataType,
-                                  ((description->flags & GPBFieldPacked) != 0));
-  }
-  return GPBWireFormatMakeTag(description->number, format);
-}
-
-uint32_t GPBFieldAlternateTag(GPBFieldDescriptor *self) {
-  GPBMessageFieldDescription *description = self->description_;
-  NSCAssert((description->flags & GPBFieldRepeated) != 0,
-            @"Only valid on repeated fields");
-  GPBWireFormat format =
-      GPBWireFormatForType(description->dataType,
-                           ((description->flags & GPBFieldPacked) == 0));
-  return GPBWireFormatMakeTag(description->number, format);
-}
-
-@implementation GPBFieldDescriptor {
-  GPBGenericValue defaultValue_;
-
-  // Message ivars
-  Class msgClass_;
-
-  // Enum ivars.
-  // If protos are generated with GenerateEnumDescriptors on then it will
-  // be a enumDescriptor, otherwise it will be a enumVerifier.
-  union {
-    GPBEnumDescriptor *enumDescriptor_;
-    GPBEnumValidationFunc enumVerifier_;
-  } enumHandling_;
-}
-
-@synthesize msgClass = msgClass_;
-@synthesize containingOneof = containingOneof_;
-
-- (instancetype)init {
-  // Throw an exception if people attempt to not use the designated initializer.
-  self = [super init];
-  if (self != nil) {
-    [self doesNotRecognizeSelector:_cmd];
-    self = nil;
-  }
-  return self;
-}
-
-- (instancetype)initWithFieldDescription:(void *)description
-                         includesDefault:(BOOL)includesDefault
-                           usesClassRefs:(BOOL)usesClassRefs
-                     proto3OptionalKnown:(BOOL)proto3OptionalKnown
-                                  syntax:(GPBFileSyntax)syntax {
-  if ((self = [super init])) {
-    GPBMessageFieldDescription *coreDesc;
-    if (includesDefault) {
-      coreDesc = &(((GPBMessageFieldDescriptionWithDefault *)description)->core);
-    } else {
-      coreDesc = description;
-    }
-    description_ = coreDesc;
-    getSel_ = sel_getUid(coreDesc->name);
-    setSel_ = SelFromStrings("set", coreDesc->name, NULL, YES);
-
-    GPBDataType dataType = coreDesc->dataType;
-    BOOL isMessage = GPBDataTypeIsMessage(dataType);
-    BOOL isMapOrArray = GPBFieldIsMapOrArray(self);
-
-    // If proto3 optionals weren't known (i.e. generated code from an
-    // older version), compute the flag for the rest of the runtime.
-    if (!proto3OptionalKnown) {
-      // If it was...
-      //  - proto3 syntax
-      //  - not repeated/map
-      //  - not in a oneof (negative has index)
-      //  - not a message (the flag doesn't make sense for messages)
-      BOOL clearOnZero = ((syntax == GPBFileSyntaxProto3) &&
-                          !isMapOrArray &&
-                          (coreDesc->hasIndex >= 0) &&
-                          !isMessage);
-      if (clearOnZero) {
-        coreDesc->flags |= GPBFieldClearHasIvarOnZero;
-      }
-    }
-
-    if (isMapOrArray) {
-      // map<>/repeated fields get a *Count property (inplace of a has*) to
-      // support checking if there are any entries without triggering
-      // autocreation.
-      hasOrCountSel_ = SelFromStrings(NULL, coreDesc->name, "_Count", NO);
-    } else {
-      // It is a single field; it gets has/setHas selectors if...
-      //  - not in a oneof (negative has index)
-      //  - not clearing on zero
-      if ((coreDesc->hasIndex >= 0) &&
-          ((coreDesc->flags & GPBFieldClearHasIvarOnZero) == 0)) {
-        hasOrCountSel_ = SelFromStrings("has", coreDesc->name, NULL, NO);
-        setHasSel_ = SelFromStrings("setHas", coreDesc->name, NULL, YES);
-      }
-    }
-
-    // Extra type specific data.
-    if (isMessage) {
-      // Note: Only fetch the class here, can't send messages to it because
-      // that could cause cycles back to this class within +initialize if
-      // two messages have each other in fields (i.e. - they build a graph).
-      if (usesClassRefs) {
-        msgClass_ = coreDesc->dataTypeSpecific.clazz;
-      } else {
-        // Backwards compatibility for sources generated with older protoc.
-        const char *className = coreDesc->dataTypeSpecific.className;
-        msgClass_ = objc_getClass(className);
-        NSAssert(msgClass_, @"Class %s not defined", className);
-      }
-    } else if (dataType == GPBDataTypeEnum) {
-      if ((coreDesc->flags & GPBFieldHasEnumDescriptor) != 0) {
-        enumHandling_.enumDescriptor_ =
-            coreDesc->dataTypeSpecific.enumDescFunc();
-      } else {
-        enumHandling_.enumVerifier_ =
-            coreDesc->dataTypeSpecific.enumVerifier;
-      }
-    }
-
-    // Non map<>/repeated fields can have defaults in proto2 syntax.
-    if (!isMapOrArray && includesDefault) {
-      defaultValue_ = ((GPBMessageFieldDescriptionWithDefault *)description)->defaultValue;
-      if (dataType == GPBDataTypeBytes) {
-        // Data stored as a length prefixed (network byte order) c-string in
-        // descriptor structure.
-        const uint8_t *bytes = (const uint8_t *)defaultValue_.valueData;
-        if (bytes) {
-          uint32_t length;
-          memcpy(&length, bytes, sizeof(length));
-          length = ntohl(length);
-          bytes += sizeof(length);
-          defaultValue_.valueData =
-              [[NSData alloc] initWithBytes:bytes length:length];
-        }
-      }
-    }
-  }
-  return self;
-}
-
-- (void)dealloc {
-  if (description_->dataType == GPBDataTypeBytes &&
-      !(description_->flags & GPBFieldRepeated)) {
-    [defaultValue_.valueData release];
-  }
-  [super dealloc];
-}
-
-- (GPBDataType)dataType {
-  return description_->dataType;
-}
-
-- (BOOL)hasDefaultValue {
-  return (description_->flags & GPBFieldHasDefaultValue) != 0;
-}
-
-- (uint32_t)number {
-  return description_->number;
-}
-
-- (NSString *)name {
-  return (NSString * _Nonnull)@(description_->name);
-}
-
-- (BOOL)isRequired {
-  return (description_->flags & GPBFieldRequired) != 0;
-}
-
-- (BOOL)isOptional {
-  return (description_->flags & GPBFieldOptional) != 0;
-}
-
-- (GPBFieldType)fieldType {
-  GPBFieldFlags flags = description_->flags;
-  if ((flags & GPBFieldRepeated) != 0) {
-    return GPBFieldTypeRepeated;
-  } else if ((flags & GPBFieldMapKeyMask) != 0) {
-    return GPBFieldTypeMap;
-  } else {
-    return GPBFieldTypeSingle;
-  }
-}
-
-- (GPBDataType)mapKeyDataType {
-  switch (description_->flags & GPBFieldMapKeyMask) {
-    case GPBFieldMapKeyInt32:
-      return GPBDataTypeInt32;
-    case GPBFieldMapKeyInt64:
-      return GPBDataTypeInt64;
-    case GPBFieldMapKeyUInt32:
-      return GPBDataTypeUInt32;
-    case GPBFieldMapKeyUInt64:
-      return GPBDataTypeUInt64;
-    case GPBFieldMapKeySInt32:
-      return GPBDataTypeSInt32;
-    case GPBFieldMapKeySInt64:
-      return GPBDataTypeSInt64;
-    case GPBFieldMapKeyFixed32:
-      return GPBDataTypeFixed32;
-    case GPBFieldMapKeyFixed64:
-      return GPBDataTypeFixed64;
-    case GPBFieldMapKeySFixed32:
-      return GPBDataTypeSFixed32;
-    case GPBFieldMapKeySFixed64:
-      return GPBDataTypeSFixed64;
-    case GPBFieldMapKeyBool:
-      return GPBDataTypeBool;
-    case GPBFieldMapKeyString:
-      return GPBDataTypeString;
-
-    default:
-      NSAssert(0, @"Not a map type");
-      return GPBDataTypeInt32;  // For lack of anything better.
-  }
-}
-
-- (BOOL)isPackable {
-  return (description_->flags & GPBFieldPacked) != 0;
-}
-
-- (BOOL)isValidEnumValue:(int32_t)value {
-  NSAssert(description_->dataType == GPBDataTypeEnum,
-           @"Field Must be of type GPBDataTypeEnum");
-  if (description_->flags & GPBFieldHasEnumDescriptor) {
-    return enumHandling_.enumDescriptor_.enumVerifier(value);
-  } else {
-    return enumHandling_.enumVerifier_(value);
-  }
-}
-
-- (GPBEnumDescriptor *)enumDescriptor {
-  if (description_->flags & GPBFieldHasEnumDescriptor) {
-    return enumHandling_.enumDescriptor_;
-  } else {
-    return nil;
-  }
-}
-
-- (GPBGenericValue)defaultValue {
-  // Depends on the fact that defaultValue_ is initialized either to "0/nil" or
-  // to an actual defaultValue in our initializer.
-  GPBGenericValue value = defaultValue_;
-
-  if (!(description_->flags & GPBFieldRepeated)) {
-    // We special handle data and strings. If they are nil, we replace them
-    // with empty string/empty data.
-    GPBDataType type = description_->dataType;
-    if (type == GPBDataTypeBytes && value.valueData == nil) {
-      value.valueData = GPBEmptyNSData();
-    } else if (type == GPBDataTypeString && value.valueString == nil) {
-      value.valueString = @"";
-    }
-  }
-  return value;
-}
-
-- (NSString *)textFormatName {
-  if ((description_->flags & GPBFieldTextFormatNameCustom) != 0) {
-    NSValue *extraInfoValue =
-        objc_getAssociatedObject(self, &kTextFormatExtraValueKey);
-    // Support can be left out at generation time.
-    if (!extraInfoValue) {
-      return nil;
-    }
-    const uint8_t *extraTextFormatInfo = [extraInfoValue pointerValue];
-    return GPBDecodeTextFormatName(extraTextFormatInfo, GPBFieldNumber(self),
-                                   self.name);
-  }
-
-  // The logic here has to match SetCommonFieldVariables() from
-  // objectivec_field.cc in the proto compiler.
-  NSString *name = self.name;
-  NSUInteger len = [name length];
-
-  // Remove the "_p" added to reserved names.
-  if ([name hasSuffix:@"_p"]) {
-    name = [name substringToIndex:(len - 2)];
-    len = [name length];
-  }
-
-  // Remove "Array" from the end for repeated fields.
-  if (((description_->flags & GPBFieldRepeated) != 0) &&
-      [name hasSuffix:@"Array"]) {
-    name = [name substringToIndex:(len - 5)];
-    len = [name length];
-  }
-
-  // Groups vs. other fields.
-  if (description_->dataType == GPBDataTypeGroup) {
-    // Just capitalize the first letter.
-    unichar firstChar = [name characterAtIndex:0];
-    if (firstChar >= 'a' && firstChar <= 'z') {
-      NSString *firstCharString =
-          [NSString stringWithFormat:@"%C", (unichar)(firstChar - 'a' + 'A')];
-      NSString *result =
-          [name stringByReplacingCharactersInRange:NSMakeRange(0, 1)
-                                        withString:firstCharString];
-      return result;
-    }
-    return name;
-
-  } else {
-    // Undo the CamelCase.
-    NSMutableString *result = [NSMutableString stringWithCapacity:len];
-    for (uint32_t i = 0; i < len; i++) {
-      unichar c = [name characterAtIndex:i];
-      if (c >= 'A' && c <= 'Z') {
-        if (i > 0) {
-          [result appendFormat:@"_%C", (unichar)(c - 'A' + 'a')];
-        } else {
-          [result appendFormat:@"%C", c];
-        }
-      } else {
-        [result appendFormat:@"%C", c];
-      }
-    }
-    return result;
-  }
-}
-
-@end
-
-@implementation GPBEnumDescriptor {
-  NSString *name_;
-  // valueNames_ is a single c string with all of the value names appended
-  // together, each null terminated.  -calcValueNameOffsets fills in
-  // nameOffsets_ with the offsets to allow quicker access to the individual
-  // names.
-  const char *valueNames_;
-  const int32_t *values_;
-  GPBEnumValidationFunc enumVerifier_;
-  const uint8_t *extraTextFormatInfo_;
-  uint32_t *nameOffsets_;
-  uint32_t valueCount_;
-}
-
-@synthesize name = name_;
-@synthesize enumVerifier = enumVerifier_;
-
-+ (instancetype)
-    allocDescriptorForName:(NSString *)name
-                valueNames:(const char *)valueNames
-                    values:(const int32_t *)values
-                     count:(uint32_t)valueCount
-              enumVerifier:(GPBEnumValidationFunc)enumVerifier {
-  GPBEnumDescriptor *descriptor = [[self alloc] initWithName:name
-                                                  valueNames:valueNames
-                                                      values:values
-                                                       count:valueCount
-                                                enumVerifier:enumVerifier];
-  return descriptor;
-}
-
-+ (instancetype)
-    allocDescriptorForName:(NSString *)name
-                valueNames:(const char *)valueNames
-                    values:(const int32_t *)values
-                     count:(uint32_t)valueCount
-              enumVerifier:(GPBEnumValidationFunc)enumVerifier
-       extraTextFormatInfo:(const char *)extraTextFormatInfo {
-  // Call the common case.
-  GPBEnumDescriptor *descriptor = [self allocDescriptorForName:name
-                                                    valueNames:valueNames
-                                                        values:values
-                                                         count:valueCount
-                                                  enumVerifier:enumVerifier];
-  // Set the extra info.
-  descriptor->extraTextFormatInfo_ = (const uint8_t *)extraTextFormatInfo;
-  return descriptor;
-}
-
-- (instancetype)initWithName:(NSString *)name
-                  valueNames:(const char *)valueNames
-                      values:(const int32_t *)values
-                       count:(uint32_t)valueCount
-                enumVerifier:(GPBEnumValidationFunc)enumVerifier {
-  if ((self = [super init])) {
-    name_ = [name copy];
-    valueNames_ = valueNames;
-    values_ = values;
-    valueCount_ = valueCount;
-    enumVerifier_ = enumVerifier;
-  }
-  return self;
-}
-
-- (void)dealloc {
-  [name_ release];
-  if (nameOffsets_) free(nameOffsets_);
-  [super dealloc];
-}
-
-- (void)calcValueNameOffsets {
-  @synchronized(self) {
-    if (nameOffsets_ != NULL) {
-      return;
-    }
-    uint32_t *offsets = malloc(valueCount_ * sizeof(uint32_t));
-    if (!offsets) return;
-    const char *scan = valueNames_;
-    for (uint32_t i = 0; i < valueCount_; ++i) {
-      offsets[i] = (uint32_t)(scan - valueNames_);
-      while (*scan != '\0') ++scan;
-      ++scan;  // Step over the null.
-    }
-    nameOffsets_ = offsets;
-  }
-}
-
-- (NSString *)enumNameForValue:(int32_t)number {
-  for (uint32_t i = 0; i < valueCount_; ++i) {
-    if (values_[i] == number) {
-      return [self getEnumNameForIndex:i];
-    }
-  }
-  return nil;
-}
-
-- (BOOL)getValue:(int32_t *)outValue forEnumName:(NSString *)name {
-  // Must have the prefix.
-  NSUInteger prefixLen = name_.length + 1;
-  if ((name.length <= prefixLen) || ![name hasPrefix:name_] ||
-      ([name characterAtIndex:prefixLen - 1] != '_')) {
-    return NO;
-  }
-
-  // Skip over the prefix.
-  const char *nameAsCStr = [name UTF8String];
-  nameAsCStr += prefixLen;
-
-  if (nameOffsets_ == NULL) [self calcValueNameOffsets];
-  if (nameOffsets_ == NULL) return NO;
-
-  // Find it.
-  for (uint32_t i = 0; i < valueCount_; ++i) {
-    const char *valueName = valueNames_ + nameOffsets_[i];
-    if (strcmp(nameAsCStr, valueName) == 0) {
-      if (outValue) {
-        *outValue = values_[i];
-      }
-      return YES;
-    }
-  }
-  return NO;
-}
-
-- (BOOL)getValue:(int32_t *)outValue forEnumTextFormatName:(NSString *)textFormatName {
-    if (nameOffsets_ == NULL) [self calcValueNameOffsets];
-    if (nameOffsets_ == NULL) return NO;
-
-    for (uint32_t i = 0; i < valueCount_; ++i) {
-        NSString *valueTextFormatName = [self getEnumTextFormatNameForIndex:i];
-        if ([valueTextFormatName isEqual:textFormatName]) {
-            if (outValue) {
-                *outValue = values_[i];
-            }
-            return YES;
-        }
-    }
-    return NO;
-}
-
-- (NSString *)textFormatNameForValue:(int32_t)number {
-  // Find the EnumValue descriptor and its index.
-  BOOL foundIt = NO;
-  uint32_t valueDescriptorIndex;
-  for (valueDescriptorIndex = 0; valueDescriptorIndex < valueCount_;
-       ++valueDescriptorIndex) {
-    if (values_[valueDescriptorIndex] == number) {
-      foundIt = YES;
-      break;
-    }
-  }
-
-  if (!foundIt) {
-    return nil;
-  }
-  return [self getEnumTextFormatNameForIndex:valueDescriptorIndex];
-}
-
-- (uint32_t)enumNameCount {
-  return valueCount_;
-}
-
-- (NSString *)getEnumNameForIndex:(uint32_t)index {
-  if (nameOffsets_ == NULL) [self calcValueNameOffsets];
-  if (nameOffsets_ == NULL) return nil;
-
-  if (index >= valueCount_) {
-    return nil;
-  }
-  const char *valueName = valueNames_ + nameOffsets_[index];
-  NSString *fullName = [NSString stringWithFormat:@"%@_%s", name_, valueName];
-  return fullName;
-}
-
-- (NSString *)getEnumTextFormatNameForIndex:(uint32_t)index {
-  if (nameOffsets_ == NULL) [self calcValueNameOffsets];
-  if (nameOffsets_ == NULL) return nil;
-
-  if (index >= valueCount_) {
-    return nil;
-  }
-  NSString *result = nil;
-  // Naming adds an underscore between enum name and value name, skip that also.
-  const char *valueName = valueNames_ + nameOffsets_[index];
-  NSString *shortName = @(valueName);
-
-  // See if it is in the map of special format handling.
-  if (extraTextFormatInfo_) {
-    result = GPBDecodeTextFormatName(extraTextFormatInfo_,
-                                     (int32_t)index, shortName);
-  }
-  // Logic here needs to match what objectivec_enum.cc does in the proto
-  // compiler.
-  if (result == nil) {
-    NSUInteger len = [shortName length];
-    NSMutableString *worker = [NSMutableString stringWithCapacity:len];
-    for (NSUInteger i = 0; i < len; i++) {
-      unichar c = [shortName characterAtIndex:i];
-      if (i > 0 && c >= 'A' && c <= 'Z') {
-        [worker appendString:@"_"];
-      }
-      [worker appendFormat:@"%c", toupper((char)c)];
-    }
-    result = worker;
-  }
-  return result;
-}
-
-@end
-
-@implementation GPBExtensionDescriptor {
-  GPBGenericValue defaultValue_;
-}
-
-- (instancetype)initWithExtensionDescription:(GPBExtensionDescription *)desc
-                               usesClassRefs:(BOOL)usesClassRefs {
-  if ((self = [super init])) {
-    description_ = desc;
-    if (!usesClassRefs) {
-      // Legacy without class ref support.
-      const char *className = description_->messageOrGroupClass.name;
-      if (className) {
-        Class clazz = objc_lookUpClass(className);
-        NSAssert(clazz != Nil, @"Class %s not defined", className);
-        description_->messageOrGroupClass.clazz = clazz;
-      }
-
-      const char *extendedClassName = description_->extendedClass.name;
-      if (extendedClassName) {
-        Class clazz = objc_lookUpClass(extendedClassName);
-        NSAssert(clazz, @"Class %s not defined", extendedClassName);
-        description_->extendedClass.clazz = clazz;
-      }
-    }
-
-    GPBDataType type = description_->dataType;
-    if (type == GPBDataTypeBytes) {
-      // Data stored as a length prefixed c-string in descriptor records.
-      const uint8_t *bytes =
-          (const uint8_t *)description_->defaultValue.valueData;
-      if (bytes) {
-        uint32_t length;
-        memcpy(&length, bytes, sizeof(length));
-        // The length is stored in network byte order.
-        length = ntohl(length);
-        bytes += sizeof(length);
-        defaultValue_.valueData =
-            [[NSData alloc] initWithBytes:bytes length:length];
-      }
-    } else if (type == GPBDataTypeMessage || type == GPBDataTypeGroup) {
-      // The default is looked up in -defaultValue instead since extensions
-      // aren't common, we avoid the hit startup hit and it avoid initialization
-      // order issues.
-    } else {
-      defaultValue_ = description_->defaultValue;
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithExtensionDescription:(GPBExtensionDescription *)desc {
-  return [self initWithExtensionDescription:desc usesClassRefs:NO];
-}
-
-- (void)dealloc {
-  if ((description_->dataType == GPBDataTypeBytes) &&
-      !GPBExtensionIsRepeated(description_)) {
-    [defaultValue_.valueData release];
-  }
-  [super dealloc];
-}
-
-- (instancetype)copyWithZone:(NSZone *)zone {
-#pragma unused(zone)
-  // Immutable.
-  return [self retain];
-}
-
-- (NSString *)singletonName {
-  return (NSString * _Nonnull)@(description_->singletonName);
-}
-
-- (const char *)singletonNameC {
-  return description_->singletonName;
-}
-
-- (uint32_t)fieldNumber {
-  return description_->fieldNumber;
-}
-
-- (GPBDataType)dataType {
-  return description_->dataType;
-}
-
-- (GPBWireFormat)wireType {
-  return GPBWireFormatForType(description_->dataType,
-                              GPBExtensionIsPacked(description_));
-}
-
-- (GPBWireFormat)alternateWireType {
-  NSAssert(GPBExtensionIsRepeated(description_),
-           @"Only valid on repeated extensions");
-  return GPBWireFormatForType(description_->dataType,
-                              !GPBExtensionIsPacked(description_));
-}
-
-- (BOOL)isRepeated {
-  return GPBExtensionIsRepeated(description_);
-}
-
-- (BOOL)isPackable {
-  return GPBExtensionIsPacked(description_);
-}
-
-- (Class)msgClass {
-  return description_->messageOrGroupClass.clazz;
-}
-
-- (Class)containingMessageClass {
-  return description_->extendedClass.clazz;
-}
-
-- (GPBEnumDescriptor *)enumDescriptor {
-  if (description_->dataType == GPBDataTypeEnum) {
-    GPBEnumDescriptor *enumDescriptor = description_->enumDescriptorFunc();
-    return enumDescriptor;
-  }
-  return nil;
-}
-
-- (id)defaultValue {
-  if (GPBExtensionIsRepeated(description_)) {
-    return nil;
-  }
-
-  switch (description_->dataType) {
-    case GPBDataTypeBool:
-      return @(defaultValue_.valueBool);
-    case GPBDataTypeFloat:
-      return @(defaultValue_.valueFloat);
-    case GPBDataTypeDouble:
-      return @(defaultValue_.valueDouble);
-    case GPBDataTypeInt32:
-    case GPBDataTypeSInt32:
-    case GPBDataTypeEnum:
-    case GPBDataTypeSFixed32:
-      return @(defaultValue_.valueInt32);
-    case GPBDataTypeInt64:
-    case GPBDataTypeSInt64:
-    case GPBDataTypeSFixed64:
-      return @(defaultValue_.valueInt64);
-    case GPBDataTypeUInt32:
-    case GPBDataTypeFixed32:
-      return @(defaultValue_.valueUInt32);
-    case GPBDataTypeUInt64:
-    case GPBDataTypeFixed64:
-      return @(defaultValue_.valueUInt64);
-    case GPBDataTypeBytes:
-      // Like message fields, the default is zero length data.
-      return (defaultValue_.valueData ? defaultValue_.valueData
-                                      : GPBEmptyNSData());
-    case GPBDataTypeString:
-      // Like message fields, the default is zero length string.
-      return (defaultValue_.valueString ? defaultValue_.valueString : @"");
-    case GPBDataTypeGroup:
-    case GPBDataTypeMessage:
-      return nil;
-  }
-}
-
-- (NSComparisonResult)compareByFieldNumber:(GPBExtensionDescriptor *)other {
-  int32_t selfNumber = description_->fieldNumber;
-  int32_t otherNumber = other->description_->fieldNumber;
-  if (selfNumber < otherNumber) {
-    return NSOrderedAscending;
-  } else if (selfNumber == otherNumber) {
-    return NSOrderedSame;
-  } else {
-    return NSOrderedDescending;
-  }
-}
-
-@end
-
-#pragma clang diagnostic pop
diff --git a/libs/protobuf/objectivec/GPBDescriptor_PackagePrivate.h b/libs/protobuf/objectivec/GPBDescriptor_PackagePrivate.h
deleted file mode 100644
index 408f8d4..0000000
--- a/libs/protobuf/objectivec/GPBDescriptor_PackagePrivate.h
+++ /dev/null
@@ -1,374 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// This header is private to the ProtobolBuffers library and must NOT be
-// included by any sources outside this library. The contents of this file are
-// subject to change at any time without notice.
-
-#import "GPBDescriptor.h"
-#import "GPBWireFormat.h"
-
-// Describes attributes of the field.
-typedef NS_OPTIONS(uint16_t, GPBFieldFlags) {
-  GPBFieldNone            = 0,
-  // These map to standard protobuf concepts.
-  GPBFieldRequired        = 1 << 0,
-  GPBFieldRepeated        = 1 << 1,
-  GPBFieldPacked          = 1 << 2,
-  GPBFieldOptional        = 1 << 3,
-  GPBFieldHasDefaultValue = 1 << 4,
-
-  // Indicate that the field should "clear" when set to zero value. This is the
-  // proto3 non optional behavior for singular data (ints, data, string, enum)
-  // fields.
-  GPBFieldClearHasIvarOnZero = 1 << 5,
-  // Indicates the field needs custom handling for the TextFormat name, if not
-  // set, the name can be derived from the ObjC name.
-  GPBFieldTextFormatNameCustom = 1 << 6,
-  // Indicates the field has an enum descriptor.
-  GPBFieldHasEnumDescriptor = 1 << 7,
-
-  // These are not standard protobuf concepts, they are specific to the
-  // Objective C runtime.
-
-  // These bits are used to mark the field as a map and what the key
-  // type is.
-  GPBFieldMapKeyMask     = 0xF << 8,
-  GPBFieldMapKeyInt32    =  1 << 8,
-  GPBFieldMapKeyInt64    =  2 << 8,
-  GPBFieldMapKeyUInt32   =  3 << 8,
-  GPBFieldMapKeyUInt64   =  4 << 8,
-  GPBFieldMapKeySInt32   =  5 << 8,
-  GPBFieldMapKeySInt64   =  6 << 8,
-  GPBFieldMapKeyFixed32  =  7 << 8,
-  GPBFieldMapKeyFixed64  =  8 << 8,
-  GPBFieldMapKeySFixed32 =  9 << 8,
-  GPBFieldMapKeySFixed64 = 10 << 8,
-  GPBFieldMapKeyBool     = 11 << 8,
-  GPBFieldMapKeyString   = 12 << 8,
-};
-
-// NOTE: The structures defined here have their members ordered to minimize
-// their size. This directly impacts the size of apps since these exist per
-// field/extension.
-
-// Describes a single field in a protobuf as it is represented as an ivar.
-typedef struct GPBMessageFieldDescription {
-  // Name of ivar.
-  const char *name;
-  union {
-    // className is deprecated and will be removed in favor of clazz.
-    // kept around right now for backwards compatibility.
-    // clazz is used iff GPBDescriptorInitializationFlag_UsesClassRefs is set.
-    char *className;  // Name of the class of the message.
-    Class clazz;  // Class of the message.
-    // For enums only: If EnumDescriptors are compiled in, it will be that,
-    // otherwise it will be the verifier.
-    GPBEnumDescriptorFunc enumDescFunc;
-    GPBEnumValidationFunc enumVerifier;
-  } dataTypeSpecific;
-  // The field number for the ivar.
-  uint32_t number;
-  // The index (in bits) into _has_storage_.
-  //   >= 0: the bit to use for a value being set.
-  //   = GPBNoHasBit(INT32_MAX): no storage used.
-  //   < 0: in a oneOf, use a full int32 to record the field active.
-  int32_t hasIndex;
-  // Offset of the variable into it's structure struct.
-  uint32_t offset;
-  // Field flags. Use accessor functions below.
-  GPBFieldFlags flags;
-  // Data type of the ivar.
-  GPBDataType dataType;
-} GPBMessageFieldDescription;
-
-// Fields in messages defined in a 'proto2' syntax file can provide a default
-// value. This struct provides the default along with the field info.
-typedef struct GPBMessageFieldDescriptionWithDefault {
-  // Default value for the ivar.
-  GPBGenericValue defaultValue;
-
-  GPBMessageFieldDescription core;
-} GPBMessageFieldDescriptionWithDefault;
-
-// Describes attributes of the extension.
-typedef NS_OPTIONS(uint8_t, GPBExtensionOptions) {
-  GPBExtensionNone          = 0,
-  // These map to standard protobuf concepts.
-  GPBExtensionRepeated      = 1 << 0,
-  GPBExtensionPacked        = 1 << 1,
-  GPBExtensionSetWireFormat = 1 << 2,
-};
-
-// An extension
-typedef struct GPBExtensionDescription {
-  GPBGenericValue defaultValue;
-  const char *singletonName;
-  // Before 3.12, `extendedClass` was just a `const char *`. Thanks to nested
-  // initialization (https://en.cppreference.com/w/c/language/struct_initialization#Nested_initialization)
-  // old generated code with `.extendedClass = GPBStringifySymbol(Something)`
-  // still works; and the current generator can use `extendedClass.clazz`, to
-  // pass a Class reference.
-  union {
-    const char *name;
-    Class clazz;
-  } extendedClass;
-  // Before 3.12, this was `const char *messageOrGroupClassName`. In the
-  // initial 3.12 release, we moved the `union messageOrGroupClass`, and failed
-  // to realize that would break existing source code for extensions. So to
-  // keep existing source code working, we added an unnamed union (C11) to
-  // provide both the old field name and the new union. This keeps both older
-  // and newer code working.
-  // Background: https://github.com/protocolbuffers/protobuf/issues/7555
-  union {
-    const char *messageOrGroupClassName;
-    union {
-     const char *name;
-     Class clazz;
-   } messageOrGroupClass;
-  };
-  GPBEnumDescriptorFunc enumDescriptorFunc;
-  int32_t fieldNumber;
-  GPBDataType dataType;
-  GPBExtensionOptions options;
-} GPBExtensionDescription;
-
-typedef NS_OPTIONS(uint32_t, GPBDescriptorInitializationFlags) {
-  GPBDescriptorInitializationFlag_None              = 0,
-  GPBDescriptorInitializationFlag_FieldsWithDefault = 1 << 0,
-  GPBDescriptorInitializationFlag_WireFormat        = 1 << 1,
-
-  // This is used as a stopgap as we move from using class names to class
-  // references. The runtime needs to support both until we allow a
-  // breaking change in the runtime.
-  GPBDescriptorInitializationFlag_UsesClassRefs     = 1 << 2,
-
-  // This flag is used to indicate that the generated sources already contain
-  // the `GPBFieldClearHasIvarOnZero` flag and it doesn't have to be computed
-  // at startup. This allows older generated code to still work with the
-  // current runtime library.
-  GPBDescriptorInitializationFlag_Proto3OptionalKnown = 1 << 3,
-};
-
-@interface GPBDescriptor () {
- @package
-  NSArray *fields_;
-  NSArray *oneofs_;
-  uint32_t storageSize_;
-}
-
-// fieldDescriptions have to be long lived, they are held as raw pointers.
-+ (instancetype)
-    allocDescriptorForClass:(Class)messageClass
-                  rootClass:(Class)rootClass
-                       file:(GPBFileDescriptor *)file
-                     fields:(void *)fieldDescriptions
-                 fieldCount:(uint32_t)fieldCount
-                storageSize:(uint32_t)storageSize
-                      flags:(GPBDescriptorInitializationFlags)flags;
-
-- (instancetype)initWithClass:(Class)messageClass
-                         file:(GPBFileDescriptor *)file
-                       fields:(NSArray *)fields
-                  storageSize:(uint32_t)storage
-                   wireFormat:(BOOL)wireFormat;
-
-// Called right after init to provide extra information to avoid init having
-// an explosion of args. These pointers are recorded, so they are expected
-// to live for the lifetime of the app.
-- (void)setupOneofs:(const char **)oneofNames
-              count:(uint32_t)count
-      firstHasIndex:(int32_t)firstHasIndex;
-- (void)setupExtraTextInfo:(const char *)extraTextFormatInfo;
-- (void)setupExtensionRanges:(const GPBExtensionRange *)ranges count:(int32_t)count;
-- (void)setupContainingMessageClass:(Class)msgClass;
-- (void)setupMessageClassNameSuffix:(NSString *)suffix;
-
-// Deprecated. Use setupContainingMessageClass instead.
-- (void)setupContainingMessageClassName:(const char *)msgClassName;
-
-@end
-
-@interface GPBFileDescriptor ()
-- (instancetype)initWithPackage:(NSString *)package
-                     objcPrefix:(NSString *)objcPrefix
-                         syntax:(GPBFileSyntax)syntax;
-- (instancetype)initWithPackage:(NSString *)package
-                         syntax:(GPBFileSyntax)syntax;
-@end
-
-@interface GPBOneofDescriptor () {
- @package
-  const char *name_;
-  NSArray *fields_;
-  SEL caseSel_;
-}
-// name must be long lived.
-- (instancetype)initWithName:(const char *)name fields:(NSArray *)fields;
-@end
-
-@interface GPBFieldDescriptor () {
- @package
-  GPBMessageFieldDescription *description_;
-  GPB_UNSAFE_UNRETAINED GPBOneofDescriptor *containingOneof_;
-
-  SEL getSel_;
-  SEL setSel_;
-  SEL hasOrCountSel_;  // *Count for map<>/repeated fields, has* otherwise.
-  SEL setHasSel_;
-}
-
-// Single initializer
-// description has to be long lived, it is held as a raw pointer.
-- (instancetype)initWithFieldDescription:(void *)description
-                         includesDefault:(BOOL)includesDefault
-                           usesClassRefs:(BOOL)usesClassRefs
-                     proto3OptionalKnown:(BOOL)proto3OptionalKnown
-                                  syntax:(GPBFileSyntax)syntax;
-
-@end
-
-@interface GPBEnumDescriptor ()
-// valueNames, values and extraTextFormatInfo have to be long lived, they are
-// held as raw pointers.
-+ (instancetype)
-    allocDescriptorForName:(NSString *)name
-                valueNames:(const char *)valueNames
-                    values:(const int32_t *)values
-                     count:(uint32_t)valueCount
-              enumVerifier:(GPBEnumValidationFunc)enumVerifier;
-+ (instancetype)
-    allocDescriptorForName:(NSString *)name
-                valueNames:(const char *)valueNames
-                    values:(const int32_t *)values
-                     count:(uint32_t)valueCount
-              enumVerifier:(GPBEnumValidationFunc)enumVerifier
-       extraTextFormatInfo:(const char *)extraTextFormatInfo;
-
-- (instancetype)initWithName:(NSString *)name
-                  valueNames:(const char *)valueNames
-                      values:(const int32_t *)values
-                       count:(uint32_t)valueCount
-                enumVerifier:(GPBEnumValidationFunc)enumVerifier;
-@end
-
-@interface GPBExtensionDescriptor () {
- @package
-  GPBExtensionDescription *description_;
-}
-@property(nonatomic, readonly) GPBWireFormat wireType;
-
-// For repeated extensions, alternateWireType is the wireType with the opposite
-// value for the packable property.  i.e. - if the extension was marked packed
-// it would be the wire type for unpacked; if the extension was marked unpacked,
-// it would be the wire type for packed.
-@property(nonatomic, readonly) GPBWireFormat alternateWireType;
-
-// description has to be long lived, it is held as a raw pointer.
-- (instancetype)initWithExtensionDescription:(GPBExtensionDescription *)desc
-                               usesClassRefs:(BOOL)usesClassRefs;
-// Deprecated. Calls above with `usesClassRefs = NO`
-- (instancetype)initWithExtensionDescription:(GPBExtensionDescription *)desc;
-
-- (NSComparisonResult)compareByFieldNumber:(GPBExtensionDescriptor *)other;
-@end
-
-CF_EXTERN_C_BEGIN
-
-// Direct access is use for speed, to avoid even internally declaring things
-// read/write, etc. The warning is enabled in the project to ensure code calling
-// protos can turn on -Wdirect-ivar-access without issues.
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdirect-ivar-access"
-
-GPB_INLINE BOOL GPBFieldIsMapOrArray(GPBFieldDescriptor *field) {
-  return (field->description_->flags &
-          (GPBFieldRepeated | GPBFieldMapKeyMask)) != 0;
-}
-
-GPB_INLINE GPBDataType GPBGetFieldDataType(GPBFieldDescriptor *field) {
-  return field->description_->dataType;
-}
-
-GPB_INLINE int32_t GPBFieldHasIndex(GPBFieldDescriptor *field) {
-  return field->description_->hasIndex;
-}
-
-GPB_INLINE uint32_t GPBFieldNumber(GPBFieldDescriptor *field) {
-  return field->description_->number;
-}
-
-#pragma clang diagnostic pop
-
-uint32_t GPBFieldTag(GPBFieldDescriptor *self);
-
-// For repeated fields, alternateWireType is the wireType with the opposite
-// value for the packable property.  i.e. - if the field was marked packed it
-// would be the wire type for unpacked; if the field was marked unpacked, it
-// would be the wire type for packed.
-uint32_t GPBFieldAlternateTag(GPBFieldDescriptor *self);
-
-GPB_INLINE BOOL GPBHasPreservingUnknownEnumSemantics(GPBFileSyntax syntax) {
-  return syntax == GPBFileSyntaxProto3;
-}
-
-GPB_INLINE BOOL GPBExtensionIsRepeated(GPBExtensionDescription *description) {
-  return (description->options & GPBExtensionRepeated) != 0;
-}
-
-GPB_INLINE BOOL GPBExtensionIsPacked(GPBExtensionDescription *description) {
-  return (description->options & GPBExtensionPacked) != 0;
-}
-
-GPB_INLINE BOOL GPBExtensionIsWireFormat(GPBExtensionDescription *description) {
-  return (description->options & GPBExtensionSetWireFormat) != 0;
-}
-
-// Helper for compile time assets.
-#ifndef GPBInternalCompileAssert
-  #if __has_feature(c_static_assert) || __has_extension(c_static_assert)
-    #define GPBInternalCompileAssert(test, msg) _Static_assert((test), #msg)
-  #else
-    // Pre-Xcode 7 support.
-    #define GPBInternalCompileAssertSymbolInner(line, msg) GPBInternalCompileAssert ## line ## __ ## msg
-    #define GPBInternalCompileAssertSymbol(line, msg) GPBInternalCompileAssertSymbolInner(line, msg)
-    #define GPBInternalCompileAssert(test, msg) \
-        typedef char GPBInternalCompileAssertSymbol(__LINE__, msg) [ ((test) ? 1 : -1) ]
-  #endif  // __has_feature(c_static_assert) || __has_extension(c_static_assert)
-#endif // GPBInternalCompileAssert
-
-// Sanity check that there isn't padding between the field description
-// structures with and without a default.
-GPBInternalCompileAssert(sizeof(GPBMessageFieldDescriptionWithDefault) ==
-                         (sizeof(GPBGenericValue) +
-                          sizeof(GPBMessageFieldDescription)),
-                         DescriptionsWithDefault_different_size_than_expected);
-
-CF_EXTERN_C_END
diff --git a/libs/protobuf/objectivec/GPBDictionary.h b/libs/protobuf/objectivec/GPBDictionary.h
deleted file mode 100644
index 28d880d..0000000
--- a/libs/protobuf/objectivec/GPBDictionary.h
+++ /dev/null
@@ -1,5772 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#import <Foundation/Foundation.h>
-
-#import "GPBRuntimeTypes.h"
-
-// Note on naming: for the classes holding numeric values, a more natural
-// naming of the method might be things like "-valueForKey:",
-// "-setValue:forKey:"; etc. But those selectors are also defined by Key Value
-// Coding (KVC) as categories on NSObject. So "overloading" the selectors with
-// other meanings can cause warnings (based on compiler settings), but more
-// importantly, some of those selector get called as KVC breaks up keypaths.
-// So if those selectors are used, using KVC will compile cleanly, but could
-// crash as it invokes those selectors with the wrong types of arguments.
-
-NS_ASSUME_NONNULL_BEGIN
-
-//%PDDM-EXPAND DECLARE_DICTIONARIES()
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-#pragma mark - UInt32 -> UInt32
-
-/**
- * Class used for map fields of <uint32_t, uint32_t>
- * values. This performs better than boxing into NSNumbers in NSDictionaries.
- *
- * @note This class is not meant to be subclassed.
- **/
-@interface GPBUInt32UInt32Dictionary : NSObject <NSCopying>
-
-/** Number of entries stored in this dictionary. */
-@property(nonatomic, readonly) NSUInteger count;
-
-/**
- * Initializes this dictionary, copying the given values and keys.
- *
- * @param values      The values to be placed in this dictionary.
- * @param keys        The keys under which to store the values.
- * @param count       The number of elements to copy into the dictionary.
- *
- * @return A newly initialized dictionary with a copy of the values and keys.
- **/
-- (instancetype)initWithUInt32s:(const uint32_t [__nullable])values
-                        forKeys:(const uint32_t [__nullable])keys
-                          count:(NSUInteger)count NS_DESIGNATED_INITIALIZER;
-
-/**
- * Initializes this dictionary, copying the entries from the given dictionary.
- *
- * @param dictionary Dictionary containing the entries to add to this dictionary.
- *
- * @return A newly initialized dictionary with the entries of the given dictionary.
- **/
-- (instancetype)initWithDictionary:(GPBUInt32UInt32Dictionary *)dictionary;
-
-/**
- * Initializes this dictionary with the requested capacity.
- *
- * @param numItems Number of items needed for this dictionary.
- *
- * @return A newly initialized dictionary with the requested capacity.
- **/
-- (instancetype)initWithCapacity:(NSUInteger)numItems;
-
-/**
- * Gets the value for the given key.
- *
- * @param value Pointer into which the value will be set, if found.
- * @param key   Key under which the value is stored, if present.
- *
- * @return YES if the key was found and the value was copied, NO otherwise.
- **/
-- (BOOL)getUInt32:(nullable uint32_t *)value forKey:(uint32_t)key;
-
-/**
- * Enumerates the keys and values on this dictionary with the given block.
- *
- * @param block The block to enumerate with.
- *   **key**:        The key for the current entry.
- *   **value**:      The value for the current entry
- *   **stop**:       A pointer to a boolean that when set stops the enumeration.
- **/
-- (void)enumerateKeysAndUInt32sUsingBlock:
-    (void (NS_NOESCAPE ^)(uint32_t key, uint32_t value, BOOL *stop))block;
-
-/**
- * Adds the keys and values from another dictionary.
- *
- * @param otherDictionary Dictionary containing entries to be added to this
- *                        dictionary.
- **/
-- (void)addEntriesFromDictionary:(GPBUInt32UInt32Dictionary *)otherDictionary;
-
-/**
- * Sets the value for the given key.
- *
- * @param value     The value to set.
- * @param key       The key under which to store the value.
- **/
-- (void)setUInt32:(uint32_t)value forKey:(uint32_t)key;
-
-/**
- * Removes the entry for the given key.
- *
- * @param aKey Key to be removed from this dictionary.
- **/
-- (void)removeUInt32ForKey:(uint32_t)aKey;
-
-/**
- * Removes all entries in this dictionary.
- **/
-- (void)removeAll;
-
-@end
-
-#pragma mark - UInt32 -> Int32
-
-/**
- * Class used for map fields of <uint32_t, int32_t>
- * values. This performs better than boxing into NSNumbers in NSDictionaries.
- *
- * @note This class is not meant to be subclassed.
- **/
-@interface GPBUInt32Int32Dictionary : NSObject <NSCopying>
-
-/** Number of entries stored in this dictionary. */
-@property(nonatomic, readonly) NSUInteger count;
-
-/**
- * Initializes this dictionary, copying the given values and keys.
- *
- * @param values      The values to be placed in this dictionary.
- * @param keys        The keys under which to store the values.
- * @param count       The number of elements to copy into the dictionary.
- *
- * @return A newly initialized dictionary with a copy of the values and keys.
- **/
-- (instancetype)initWithInt32s:(const int32_t [__nullable])values
-                       forKeys:(const uint32_t [__nullable])keys
-                         count:(NSUInteger)count NS_DESIGNATED_INITIALIZER;
-
-/**
- * Initializes this dictionary, copying the entries from the given dictionary.
- *
- * @param dictionary Dictionary containing the entries to add to this dictionary.
- *
- * @return A newly initialized dictionary with the entries of the given dictionary.
- **/
-- (instancetype)initWithDictionary:(GPBUInt32Int32Dictionary *)dictionary;
-
-/**
- * Initializes this dictionary with the requested capacity.
- *
- * @param numItems Number of items needed for this dictionary.
- *
- * @return A newly initialized dictionary with the requested capacity.
- **/
-- (instancetype)initWithCapacity:(NSUInteger)numItems;
-
-/**
- * Gets the value for the given key.
- *
- * @param value Pointer into which the value will be set, if found.
- * @param key   Key under which the value is stored, if present.
- *
- * @return YES if the key was found and the value was copied, NO otherwise.
- **/
-- (BOOL)getInt32:(nullable int32_t *)value forKey:(uint32_t)key;
-
-/**
- * Enumerates the keys and values on this dictionary with the given block.
- *
- * @param block The block to enumerate with.
- *   **key**:        The key for the current entry.
- *   **value**:      The value for the current entry
- *   **stop**:       A pointer to a boolean that when set stops the enumeration.
- **/
-- (void)enumerateKeysAndInt32sUsingBlock:
-    (void (NS_NOESCAPE ^)(uint32_t key, int32_t value, BOOL *stop))block;
-
-/**
- * Adds the keys and values from another dictionary.
- *
- * @param otherDictionary Dictionary containing entries to be added to this
- *                        dictionary.
- **/
-- (void)addEntriesFromDictionary:(GPBUInt32Int32Dictionary *)otherDictionary;
-
-/**
- * Sets the value for the given key.
- *
- * @param value     The value to set.
- * @param key       The key under which to store the value.
- **/
-- (void)setInt32:(int32_t)value forKey:(uint32_t)key;
-
-/**
- * Removes the entry for the given key.
- *
- * @param aKey Key to be removed from this dictionary.
- **/
-- (void)removeInt32ForKey:(uint32_t)aKey;
-
-/**
- * Removes all entries in this dictionary.
- **/
-- (void)removeAll;
-
-@end
-
-#pragma mark - UInt32 -> UInt64
-
-/**
- * Class used for map fields of <uint32_t, uint64_t>
- * values. This performs better than boxing into NSNumbers in NSDictionaries.
- *
- * @note This class is not meant to be subclassed.
- **/
-@interface GPBUInt32UInt64Dictionary : NSObject <NSCopying>
-
-/** Number of entries stored in this dictionary. */
-@property(nonatomic, readonly) NSUInteger count;
-
-/**
- * Initializes this dictionary, copying the given values and keys.
- *
- * @param values      The values to be placed in this dictionary.
- * @param keys        The keys under which to store the values.
- * @param count       The number of elements to copy into the dictionary.
- *
- * @return A newly initialized dictionary with a copy of the values and keys.
- **/
-- (instancetype)initWithUInt64s:(const uint64_t [__nullable])values
-                        forKeys:(const uint32_t [__nullable])keys
-                          count:(NSUInteger)count NS_DESIGNATED_INITIALIZER;
-
-/**
- * Initializes this dictionary, copying the entries from the given dictionary.
- *
- * @param dictionary Dictionary containing the entries to add to this dictionary.
- *
- * @return A newly initialized dictionary with the entries of the given dictionary.
- **/
-- (instancetype)initWithDictionary:(GPBUInt32UInt64Dictionary *)dictionary;
-
-/**
- * Initializes this dictionary with the requested capacity.
- *
- * @param numItems Number of items needed for this dictionary.
- *
- * @return A newly initialized dictionary with the requested capacity.
- **/
-- (instancetype)initWithCapacity:(NSUInteger)numItems;
-
-/**
- * Gets the value for the given key.
- *
- * @param value Pointer into which the value will be set, if found.
- * @param key   Key under which the value is stored, if present.
- *
- * @return YES if the key was found and the value was copied, NO otherwise.
- **/
-- (BOOL)getUInt64:(nullable uint64_t *)value forKey:(uint32_t)key;
-
-/**
- * Enumerates the keys and values on this dictionary with the given block.
- *
- * @param block The block to enumerate with.
- *   **key**:        The key for the current entry.
- *   **value**:      The value for the current entry
- *   **stop**:       A pointer to a boolean that when set stops the enumeration.
- **/
-- (void)enumerateKeysAndUInt64sUsingBlock:
-    (void (NS_NOESCAPE ^)(uint32_t key, uint64_t value, BOOL *stop))block;
-
-/**
- * Adds the keys and values from another dictionary.
- *
- * @param otherDictionary Dictionary containing entries to be added to this
- *                        dictionary.
- **/
-- (void)addEntriesFromDictionary:(GPBUInt32UInt64Dictionary *)otherDictionary;
-
-/**
- * Sets the value for the given key.
- *
- * @param value     The value to set.
- * @param key       The key under which to store the value.
- **/
-- (void)setUInt64:(uint64_t)value forKey:(uint32_t)key;
-
-/**
- * Removes the entry for the given key.
- *
- * @param aKey Key to be removed from this dictionary.
- **/
-- (void)removeUInt64ForKey:(uint32_t)aKey;
-
-/**
- * Removes all entries in this dictionary.
- **/
-- (void)removeAll;
-
-@end
-
-#pragma mark - UInt32 -> Int64
-
-/**
- * Class used for map fields of <uint32_t, int64_t>
- * values. This performs better than boxing into NSNumbers in NSDictionaries.
- *
- * @note This class is not meant to be subclassed.
- **/
-@interface GPBUInt32Int64Dictionary : NSObject <NSCopying>
-
-/** Number of entries stored in this dictionary. */
-@property(nonatomic, readonly) NSUInteger count;
-
-/**
- * Initializes this dictionary, copying the given values and keys.
- *
- * @param values      The values to be placed in this dictionary.
- * @param keys        The keys under which to store the values.
- * @param count       The number of elements to copy into the dictionary.
- *
- * @return A newly initialized dictionary with a copy of the values and keys.
- **/
-- (instancetype)initWithInt64s:(const int64_t [__nullable])values
-                       forKeys:(const uint32_t [__nullable])keys
-                         count:(NSUInteger)count NS_DESIGNATED_INITIALIZER;
-
-/**
- * Initializes this dictionary, copying the entries from the given dictionary.
- *
- * @param dictionary Dictionary containing the entries to add to this dictionary.
- *
- * @return A newly initialized dictionary with the entries of the given dictionary.
- **/
-- (instancetype)initWithDictionary:(GPBUInt32Int64Dictionary *)dictionary;
-
-/**
- * Initializes this dictionary with the requested capacity.
- *
- * @param numItems Number of items needed for this dictionary.
- *
- * @return A newly initialized dictionary with the requested capacity.
- **/
-- (instancetype)initWithCapacity:(NSUInteger)numItems;
-
-/**
- * Gets the value for the given key.
- *
- * @param value Pointer into which the value will be set, if found.
- * @param key   Key under which the value is stored, if present.
- *
- * @return YES if the key was found and the value was copied, NO otherwise.
- **/
-- (BOOL)getInt64:(nullable int64_t *)value forKey:(uint32_t)key;
-
-/**
- * Enumerates the keys and values on this dictionary with the given block.
- *
- * @param block The block to enumerate with.
- *   **key**:        The key for the current entry.
- *   **value**:      The value for the current entry
- *   **stop**:       A pointer to a boolean that when set stops the enumeration.
- **/
-- (void)enumerateKeysAndInt64sUsingBlock:
-    (void (NS_NOESCAPE ^)(uint32_t key, int64_t value, BOOL *stop))block;
-
-/**
- * Adds the keys and values from another dictionary.
- *
- * @param otherDictionary Dictionary containing entries to be added to this
- *                        dictionary.
- **/
-- (void)addEntriesFromDictionary:(GPBUInt32Int64Dictionary *)otherDictionary;
-
-/**
- * Sets the value for the given key.
- *
- * @param value     The value to set.
- * @param key       The key under which to store the value.
- **/
-- (void)setInt64:(int64_t)value forKey:(uint32_t)key;
-
-/**
- * Removes the entry for the given key.
- *
- * @param aKey Key to be removed from this dictionary.
- **/
-- (void)removeInt64ForKey:(uint32_t)aKey;
-
-/**
- * Removes all entries in this dictionary.
- **/
-- (void)removeAll;
-
-@end
-
-#pragma mark - UInt32 -> Bool
-
-/**
- * Class used for map fields of <uint32_t, BOOL>
- * values. This performs better than boxing into NSNumbers in NSDictionaries.
- *
- * @note This class is not meant to be subclassed.
- **/
-@interface GPBUInt32BoolDictionary : NSObject <NSCopying>
-
-/** Number of entries stored in this dictionary. */
-@property(nonatomic, readonly) NSUInteger count;
-
-/**
- * Initializes this dictionary, copying the given values and keys.
- *
- * @param values      The values to be placed in this dictionary.
- * @param keys        The keys under which to store the values.
- * @param count       The number of elements to copy into the dictionary.
- *
- * @return A newly initialized dictionary with a copy of the values and keys.
- **/
-- (instancetype)initWithBools:(const BOOL [__nullable])values
-                      forKeys:(const uint32_t [__nullable])keys
-                        count:(NSUInteger)count NS_DESIGNATED_INITIALIZER;
-
-/**
- * Initializes this dictionary, copying the entries from the given dictionary.
- *
- * @param dictionary Dictionary containing the entries to add to this dictionary.
- *
- * @return A newly initialized dictionary with the entries of the given dictionary.
- **/
-- (instancetype)initWithDictionary:(GPBUInt32BoolDictionary *)dictionary;
-
-/**
- * Initializes this dictionary with the requested capacity.
- *
- * @param numItems Number of items needed for this dictionary.
- *
- * @return A newly initialized dictionary with the requested capacity.
- **/
-- (instancetype)initWithCapacity:(NSUInteger)numItems;
-
-/**
- * Gets the value for the given key.
- *
- * @param value Pointer into which the value will be set, if found.
- * @param key   Key under which the value is stored, if present.
- *
- * @return YES if the key was found and the value was copied, NO otherwise.
- **/
-- (BOOL)getBool:(nullable BOOL *)value forKey:(uint32_t)key;
-
-/**
- * Enumerates the keys and values on this dictionary with the given block.
- *
- * @param block The block to enumerate with.
- *   **key**:        The key for the current entry.
- *   **value**:      The value for the current entry
- *   **stop**:       A pointer to a boolean that when set stops the enumeration.
- **/
-- (void)enumerateKeysAndBoolsUsingBlock:
-    (void (NS_NOESCAPE ^)(uint32_t key, BOOL value, BOOL *stop))block;
-
-/**
- * Adds the keys and values from another dictionary.
- *
- * @param otherDictionary Dictionary containing entries to be added to this
- *                        dictionary.
- **/
-- (void)addEntriesFromDictionary:(GPBUInt32BoolDictionary *)otherDictionary;
-
-/**
- * Sets the value for the given key.
- *
- * @param value     The value to set.
- * @param key       The key under which to store the value.
- **/
-- (void)setBool:(BOOL)value forKey:(uint32_t)key;
-
-/**
- * Removes the entry for the given key.
- *
- * @param aKey Key to be removed from this dictionary.
- **/
-- (void)removeBoolForKey:(uint32_t)aKey;
-
-/**
- * Removes all entries in this dictionary.
- **/
-- (void)removeAll;
-
-@end
-
-#pragma mark - UInt32 -> Float
-
-/**
- * Class used for map fields of <uint32_t, float>
- * values. This performs better than boxing into NSNumbers in NSDictionaries.
- *
- * @note This class is not meant to be subclassed.
- **/
-@interface GPBUInt32FloatDictionary : NSObject <NSCopying>
-
-/** Number of entries stored in this dictionary. */
-@property(nonatomic, readonly) NSUInteger count;
-
-/**
- * Initializes this dictionary, copying the given values and keys.
- *
- * @param values      The values to be placed in this dictionary.
- * @param keys        The keys under which to store the values.
- * @param count       The number of elements to copy into the dictionary.
- *
- * @return A newly initialized dictionary with a copy of the values and keys.
- **/
-- (instancetype)initWithFloats:(const float [__nullable])values
-                       forKeys:(const uint32_t [__nullable])keys
-                         count:(NSUInteger)count NS_DESIGNATED_INITIALIZER;
-
-/**
- * Initializes this dictionary, copying the entries from the given dictionary.
- *
- * @param dictionary Dictionary containing the entries to add to this dictionary.
- *
- * @return A newly initialized dictionary with the entries of the given dictionary.
- **/
-- (instancetype)initWithDictionary:(GPBUInt32FloatDictionary *)dictionary;
-
-/**
- * Initializes this dictionary with the requested capacity.
- *
- * @param numItems Number of items needed for this dictionary.
- *
- * @return A newly initialized dictionary with the requested capacity.
- **/
-- (instancetype)initWithCapacity:(NSUInteger)numItems;
-
-/**
- * Gets the value for the given key.
- *
- * @param value Pointer into which the value will be set, if found.
- * @param key   Key under which the value is stored, if present.
- *
- * @return YES if the key was found and the value was copied, NO otherwise.
- **/
-- (BOOL)getFloat:(nullable float *)value forKey:(uint32_t)key;
-
-/**
- * Enumerates the keys and values on this dictionary with the given block.
- *
- * @param block The block to enumerate with.
- *   **key**:        The key for the current entry.
- *   **value**:      The value for the current entry
- *   **stop**:       A pointer to a boolean that when set stops the enumeration.
- **/
-- (void)enumerateKeysAndFloatsUsingBlock:
-    (void (NS_NOESCAPE ^)(uint32_t key, float value, BOOL *stop))block;
-
-/**
- * Adds the keys and values from another dictionary.
- *
- * @param otherDictionary Dictionary containing entries to be added to this
- *                        dictionary.
- **/
-- (void)addEntriesFromDictionary:(GPBUInt32FloatDictionary *)otherDictionary;
-
-/**
- * Sets the value for the given key.
- *
- * @param value     The value to set.
- * @param key       The key under which to store the value.
- **/
-- (void)setFloat:(float)value forKey:(uint32_t)key;
-
-/**
- * Removes the entry for the given key.
- *
- * @param aKey Key to be removed from this dictionary.
- **/
-- (void)removeFloatForKey:(uint32_t)aKey;
-
-/**
- * Removes all entries in this dictionary.
- **/
-- (void)removeAll;
-
-@end
-
-#pragma mark - UInt32 -> Double
-
-/**
- * Class used for map fields of <uint32_t, double>
- * values. This performs better than boxing into NSNumbers in NSDictionaries.
- *
- * @note This class is not meant to be subclassed.
- **/
-@interface GPBUInt32DoubleDictionary : NSObject <NSCopying>
-
-/** Number of entries stored in this dictionary. */
-@property(nonatomic, readonly) NSUInteger count;
-
-/**
- * Initializes this dictionary, copying the given values and keys.
- *
- * @param values      The values to be placed in this dictionary.
- * @param keys        The keys under which to store the values.
- * @param count       The number of elements to copy into the dictionary.
- *
- * @return A newly initialized dictionary with a copy of the values and keys.
- **/
-- (instancetype)initWithDoubles:(const double [__nullable])values
-                        forKeys:(const uint32_t [__nullable])keys
-                          count:(NSUInteger)count NS_DESIGNATED_INITIALIZER;
-
-/**
- * Initializes this dictionary, copying the entries from the given dictionary.
- *
- * @param dictionary Dictionary containing the entries to add to this dictionary.
- *
- * @return A newly initialized dictionary with the entries of the given dictionary.
- **/
-- (instancetype)initWithDictionary:(GPBUInt32DoubleDictionary *)dictionary;
-
-/**
- * Initializes this dictionary with the requested capacity.
- *
- * @param numItems Number of items needed for this dictionary.
- *
- * @return A newly initialized dictionary with the requested capacity.
- **/
-- (instancetype)initWithCapacity:(NSUInteger)numItems;
-
-/**
- * Gets the value for the given key.
- *
- * @param value Pointer into which the value will be set, if found.
- * @param key   Key under which the value is stored, if present.
- *
- * @return YES if the key was found and the value was copied, NO otherwise.
- **/
-- (BOOL)getDouble:(nullable double *)value forKey:(uint32_t)key;
-
-/**
- * Enumerates the keys and values on this dictionary with the given block.
- *
- * @param block The block to enumerate with.
- *   **key**:        The key for the current entry.
- *   **value**:      The value for the current entry
- *   **stop**:       A pointer to a boolean that when set stops the enumeration.
- **/
-- (void)enumerateKeysAndDoublesUsingBlock:
-    (void (NS_NOESCAPE ^)(uint32_t key, double value, BOOL *stop))block;
-
-/**
- * Adds the keys and values from another dictionary.
- *
- * @param otherDictionary Dictionary containing entries to be added to this
- *                        dictionary.
- **/
-- (void)addEntriesFromDictionary:(GPBUInt32DoubleDictionary *)otherDictionary;
-
-/**
- * Sets the value for the given key.
- *
- * @param value     The value to set.
- * @param key       The key under which to store the value.
- **/
-- (void)setDouble:(double)value forKey:(uint32_t)key;
-
-/**
- * Removes the entry for the given key.
- *
- * @param aKey Key to be removed from this dictionary.
- **/
-- (void)removeDoubleForKey:(uint32_t)aKey;
-
-/**
- * Removes all entries in this dictionary.
- **/
-- (void)removeAll;
-
-@end
-
-#pragma mark - UInt32 -> Enum
-
-/**
- * Class used for map fields of <uint32_t, int32_t>
- * values. This performs better than boxing into NSNumbers in NSDictionaries.
- *
- * @note This class is not meant to be subclassed.
- **/
-@interface GPBUInt32EnumDictionary : NSObject <NSCopying>
-
-/** Number of entries stored in this dictionary. */
-@property(nonatomic, readonly) NSUInteger count;
-/** The validation function to check if the enums are valid. */
-@property(nonatomic, readonly) GPBEnumValidationFunc validationFunc;
-
-/**
- * Initializes a dictionary with the given validation function.
- *
- * @param func The enum validation function for the dictionary.
- *
- * @return A newly initialized dictionary.
- **/
-- (instancetype)initWithValidationFunction:(nullable GPBEnumValidationFunc)func;
-
-/**
- * Initializes a dictionary with the entries given.
- *
- * @param func   The enum validation function for the dictionary.
- * @param values The raw enum values values to be placed in the dictionary.
- * @param keys   The keys under which to store the values.
- * @param count  The number of entries to store in the dictionary.
- *
- * @return A newly initialized dictionary with the keys and values in it.
- **/
-- (instancetype)initWithValidationFunction:(nullable GPBEnumValidationFunc)func
-                                 rawValues:(const int32_t [__nullable])values
-                                   forKeys:(const uint32_t [__nullable])keys
-                                     count:(NSUInteger)count NS_DESIGNATED_INITIALIZER;
-
-/**
- * Initializes a dictionary with the entries from the given.
- * dictionary.
- *
- * @param dictionary Dictionary containing the entries to add to the dictionary.
- *
- * @return A newly initialized dictionary with the entries from the given
- *         dictionary in it.
- **/
-- (instancetype)initWithDictionary:(GPBUInt32EnumDictionary *)dictionary;
-
-/**
- * Initializes a dictionary with the given capacity.
- *
- * @param func     The enum validation function for the dictionary.
- * @param numItems Capacity needed for the dictionary.
- *
- * @return A newly initialized dictionary with the given capacity.
- **/
-- (instancetype)initWithValidationFunction:(nullable GPBEnumValidationFunc)func
-                                  capacity:(NSUInteger)numItems;
-
-// These will return kGPBUnrecognizedEnumeratorValue if the value for the key
-// is not a valid enumerator as defined by validationFunc. If the actual value is
-// desired, use "raw" version of the method.
-
-/**
- * Gets the value for the given key.
- *
- * @param value Pointer into which the value will be set, if found.
- * @param key   Key under which the value is stored, if present.
- *
- * @return YES if the key was found and the value was copied, NO otherwise.
- **/
-- (BOOL)getEnum:(nullable int32_t *)value forKey:(uint32_t)key;
-
-/**
- * Enumerates the keys and values on this dictionary with the given block.
- *
- * @param block The block to enumerate with.
- *   **key**:        The key for the current entry.
- *   **value**:      The value for the current entry
- *   **stop**:       A pointer to a boolean that when set stops the enumeration.
- **/
-- (void)enumerateKeysAndEnumsUsingBlock:
-    (void (NS_NOESCAPE ^)(uint32_t key, int32_t value, BOOL *stop))block;
-
-/**
- * Gets the raw enum value for the given key.
- *
- * @note This method bypass the validationFunc to enable the access of values that
- *       were not known at the time the binary was compiled.
- *
- * @param rawValue Pointer into which the value will be set, if found.
- * @param key      Key under which the value is stored, if present.
- *
- * @return YES if the key was found and the value was copied, NO otherwise.
- **/
-- (BOOL)getRawValue:(nullable int32_t *)rawValue forKey:(uint32_t)key;
-
-/**
- * Enumerates the keys and values on this dictionary with the given block.
- *
- * @note This method bypass the validationFunc to enable the access of values that
- *       were not known at the time the binary was compiled.
- *
- * @param block The block to enumerate with.
- *   **key**:      The key for the current entry.
- *   **rawValue**: The value for the current entry
- *   **stop**:     A pointer to a boolean that when set stops the enumeration.
- **/
-- (void)enumerateKeysAndRawValuesUsingBlock:
-    (void (NS_NOESCAPE ^)(uint32_t key, int32_t rawValue, BOOL *stop))block;
-
-/**
- * Adds the keys and raw enum values from another dictionary.
- *
- * @note This method bypass the validationFunc to enable the setting of values that
- *       were not known at the time the binary was compiled.
- *
- * @param otherDictionary Dictionary containing entries to be added to this
- *                        dictionary.
- **/
-- (void)addRawEntriesFromDictionary:(GPBUInt32EnumDictionary *)otherDictionary;
-
-// If value is not a valid enumerator as defined by validationFunc, these
-// methods will assert in debug, and will log in release and assign the value
-// to the default value. Use the rawValue methods below to assign non enumerator
-// values.
-
-/**
- * Sets the value for the given key.
- *
- * @param value     The value to set.
- * @param key       The key under which to store the value.
- **/
-- (void)setEnum:(int32_t)value forKey:(uint32_t)key;
-
-/**
- * Sets the raw enum value for the given key.
- *
- * @note This method bypass the validationFunc to enable the setting of values that
- *       were not known at the time the binary was compiled.
- *
- * @param rawValue The raw enum value to set.
- * @param key      The key under which to store the raw enum value.
- **/
-- (void)setRawValue:(int32_t)rawValue forKey:(uint32_t)key;
-
-/**
- * Removes the entry for the given key.
- *
- * @param aKey Key to be removed from this dictionary.
- **/
-- (void)removeEnumForKey:(uint32_t)aKey;
-
-/**
- * Removes all entries in this dictionary.
- **/
-- (void)removeAll;
-
-@end
-
-#pragma mark - UInt32 -> Object
-
-/**
- * Class used for map fields of <uint32_t, ObjectType>
- * values. This performs better than boxing into NSNumbers in NSDictionaries.
- *
- * @note This class is not meant to be subclassed.
- **/
-@interface GPBUInt32ObjectDictionary<__covariant ObjectType> : NSObject <NSCopying>
-
-/** Number of entries stored in this dictionary. */
-@property(nonatomic, readonly) NSUInteger count;
-
-/**
- * Initializes this dictionary, copying the given values and keys.
- *
- * @param objects      The values to be placed in this dictionary.
- * @param keys         The keys under which to store the values.
- * @param count        The number of elements to copy into the dictionary.
- *
- * @return A newly initialized dictionary with a copy of the values and keys.
- **/
-- (instancetype)initWithObjects:(const ObjectType __nonnull GPB_UNSAFE_UNRETAINED [__nullable])objects
-                        forKeys:(const uint32_t [__nullable])keys
-                          count:(NSUInteger)count NS_DESIGNATED_INITIALIZER;
-
-/**
- * Initializes this dictionary, copying the entries from the given dictionary.
- *
- * @param dictionary Dictionary containing the entries to add to this dictionary.
- *
- * @return A newly initialized dictionary with the entries of the given dictionary.
- **/
-- (instancetype)initWithDictionary:(GPBUInt32ObjectDictionary *)dictionary;
-
-/**
- * Initializes this dictionary with the requested capacity.
- *
- * @param numItems Number of items needed for this dictionary.
- *
- * @return A newly initialized dictionary with the requested capacity.
- **/
-- (instancetype)initWithCapacity:(NSUInteger)numItems;
-
-/**
- * Fetches the object stored under the given key.
- *
- * @param key Key under which the value is stored, if present.
- *
- * @return The object if found, nil otherwise.
- **/
-- (ObjectType)objectForKey:(uint32_t)key;
-
-/**
- * Enumerates the keys and values on this dictionary with the given block.
- *
- * @param block The block to enumerate with.
- *   **key**:         The key for the current entry.
- *   **object**:      The value for the current entry
- *   **stop**:        A pointer to a boolean that when set stops the enumeration.
- **/
-- (void)enumerateKeysAndObjectsUsingBlock:
-    (void (NS_NOESCAPE ^)(uint32_t key, ObjectType object, BOOL *stop))block;
-
-/**
- * Adds the keys and values from another dictionary.
- *
- * @param otherDictionary Dictionary containing entries to be added to this
- *                        dictionary.
- **/
-- (void)addEntriesFromDictionary:(GPBUInt32ObjectDictionary *)otherDictionary;
-
-/**
- * Sets the value for the given key.
- *
- * @param object     The value to set.
- * @param key        The key under which to store the value.
- **/
-- (void)setObject:(ObjectType)object forKey:(uint32_t)key;
-
-/**
- * Removes the entry for the given key.
- *
- * @param aKey Key to be removed from this dictionary.
- **/
-- (void)removeObjectForKey:(uint32_t)aKey;
-
-/**
- * Removes all entries in this dictionary.
- **/
-- (void)removeAll;
-
-@end
-
-#pragma mark - Int32 -> UInt32
-
-/**
- * Class used for map fields of <int32_t, uint32_t>
- * values. This performs better than boxing into NSNumbers in NSDictionaries.
- *
- * @note This class is not meant to be subclassed.
- **/
-@interface GPBInt32UInt32Dictionary : NSObject <NSCopying>
-
-/** Number of entries stored in this dictionary. */
-@property(nonatomic, readonly) NSUInteger count;
-
-/**
- * Initializes this dictionary, copying the given values and keys.
- *
- * @param values      The values to be placed in this dictionary.
- * @param keys        The keys under which to store the values.
- * @param count       The number of elements to copy into the dictionary.
- *
- * @return A newly initialized dictionary with a copy of the values and keys.
- **/
-- (instancetype)initWithUInt32s:(const uint32_t [__nullable])values
-                        forKeys:(const int32_t [__nullable])keys
-                          count:(NSUInteger)count NS_DESIGNATED_INITIALIZER;
-
-/**
- * Initializes this dictionary, copying the entries from the given dictionary.
- *
- * @param dictionary Dictionary containing the entries to add to this dictionary.
- *
- * @return A newly initialized dictionary with the entries of the given dictionary.
- **/
-- (instancetype)initWithDictionary:(GPBInt32UInt32Dictionary *)dictionary;
-
-/**
- * Initializes this dictionary with the requested capacity.
- *
- * @param numItems Number of items needed for this dictionary.
- *
- * @return A newly initialized dictionary with the requested capacity.
- **/
-- (instancetype)initWithCapacity:(NSUInteger)numItems;
-
-/**
- * Gets the value for the given key.
- *
- * @param value Pointer into which the value will be set, if found.
- * @param key   Key under which the value is stored, if present.
- *
- * @return YES if the key was found and the value was copied, NO otherwise.
- **/
-- (BOOL)getUInt32:(nullable uint32_t *)value forKey:(int32_t)key;
-
-/**
- * Enumerates the keys and values on this dictionary with the given block.
- *
- * @param block The block to enumerate with.
- *   **key**:        The key for the current entry.
- *   **value**:      The value for the current entry
- *   **stop**:       A pointer to a boolean that when set stops the enumeration.
- **/
-- (void)enumerateKeysAndUInt32sUsingBlock:
-    (void (NS_NOESCAPE ^)(int32_t key, uint32_t value, BOOL *stop))block;
-
-/**
- * Adds the keys and values from another dictionary.
- *
- * @param otherDictionary Dictionary containing entries to be added to this
- *                        dictionary.
- **/
-- (void)addEntriesFromDictionary:(GPBInt32UInt32Dictionary *)otherDictionary;
-
-/**
- * Sets the value for the given key.
- *
- * @param value     The value to set.
- * @param key       The key under which to store the value.
- **/
-- (void)setUInt32:(uint32_t)value forKey:(int32_t)key;
-
-/**
- * Removes the entry for the given key.
- *
- * @param aKey Key to be removed from this dictionary.
- **/
-- (void)removeUInt32ForKey:(int32_t)aKey;
-
-/**
- * Removes all entries in this dictionary.
- **/
-- (void)removeAll;
-
-@end
-
-#pragma mark - Int32 -> Int32
-
-/**
- * Class used for map fields of <int32_t, int32_t>
- * values. This performs better than boxing into NSNumbers in NSDictionaries.
- *
- * @note This class is not meant to be subclassed.
- **/
-@interface GPBInt32Int32Dictionary : NSObject <NSCopying>
-
-/** Number of entries stored in this dictionary. */
-@property(nonatomic, readonly) NSUInteger count;
-
-/**
- * Initializes this dictionary, copying the given values and keys.
- *
- * @param values      The values to be placed in this dictionary.
- * @param keys        The keys under which to store the values.
- * @param count       The number of elements to copy into the dictionary.
- *
- * @return A newly initialized dictionary with a copy of the values and keys.
- **/
-- (instancetype)initWithInt32s:(const int32_t [__nullable])values
-                       forKeys:(const int32_t [__nullable])keys
-                         count:(NSUInteger)count NS_DESIGNATED_INITIALIZER;
-
-/**
- * Initializes this dictionary, copying the entries from the given dictionary.
- *
- * @param dictionary Dictionary containing the entries to add to this dictionary.
- *
- * @return A newly initialized dictionary with the entries of the given dictionary.
- **/
-- (instancetype)initWithDictionary:(GPBInt32Int32Dictionary *)dictionary;
-
-/**
- * Initializes this dictionary with the requested capacity.
- *
- * @param numItems Number of items needed for this dictionary.
- *
- * @return A newly initialized dictionary with the requested capacity.
- **/
-- (instancetype)initWithCapacity:(NSUInteger)numItems;
-
-/**
- * Gets the value for the given key.
- *
- * @param value Pointer into which the value will be set, if found.
- * @param key   Key under which the value is stored, if present.
- *
- * @return YES if the key was found and the value was copied, NO otherwise.
- **/
-- (BOOL)getInt32:(nullable int32_t *)value forKey:(int32_t)key;
-
-/**
- * Enumerates the keys and values on this dictionary with the given block.
- *
- * @param block The block to enumerate with.
- *   **key**:        The key for the current entry.
- *   **value**:      The value for the current entry
- *   **stop**:       A pointer to a boolean that when set stops the enumeration.
- **/
-- (void)enumerateKeysAndInt32sUsingBlock:
-    (void (NS_NOESCAPE ^)(int32_t key, int32_t value, BOOL *stop))block;
-
-/**
- * Adds the keys and values from another dictionary.
- *
- * @param otherDictionary Dictionary containing entries to be added to this
- *                        dictionary.
- **/
-- (void)addEntriesFromDictionary:(GPBInt32Int32Dictionary *)otherDictionary;
-
-/**
- * Sets the value for the given key.
- *
- * @param value     The value to set.
- * @param key       The key under which to store the value.
- **/
-- (void)setInt32:(int32_t)value forKey:(int32_t)key;
-
-/**
- * Removes the entry for the given key.
- *
- * @param aKey Key to be removed from this dictionary.
- **/
-- (void)removeInt32ForKey:(int32_t)aKey;
-
-/**
- * Removes all entries in this dictionary.
- **/
-- (void)removeAll;
-
-@end
-
-#pragma mark - Int32 -> UInt64
-
-/**
- * Class used for map fields of <int32_t, uint64_t>
- * values. This performs better than boxing into NSNumbers in NSDictionaries.
- *
- * @note This class is not meant to be subclassed.
- **/
-@interface GPBInt32UInt64Dictionary : NSObject <NSCopying>
-
-/** Number of entries stored in this dictionary. */
-@property(nonatomic, readonly) NSUInteger count;
-
-/**
- * Initializes this dictionary, copying the given values and keys.
- *
- * @param values      The values to be placed in this dictionary.
- * @param keys        The keys under which to store the values.
- * @param count       The number of elements to copy into the dictionary.
- *
- * @return A newly initialized dictionary with a copy of the values and keys.
- **/
-- (instancetype)initWithUInt64s:(const uint64_t [__nullable])values
-                        forKeys:(const int32_t [__nullable])keys
-                          count:(NSUInteger)count NS_DESIGNATED_INITIALIZER;
-
-/**
- * Initializes this dictionary, copying the entries from the given dictionary.
- *
- * @param dictionary Dictionary containing the entries to add to this dictionary.
- *
- * @return A newly initialized dictionary with the entries of the given dictionary.
- **/
-- (instancetype)initWithDictionary:(GPBInt32UInt64Dictionary *)dictionary;
-
-/**
- * Initializes this dictionary with the requested capacity.
- *
- * @param numItems Number of items needed for this dictionary.
- *
- * @return A newly initialized dictionary with the requested capacity.
- **/
-- (instancetype)initWithCapacity:(NSUInteger)numItems;
-
-/**
- * Gets the value for the given key.
- *
- * @param value Pointer into which the value will be set, if found.
- * @param key   Key under which the value is stored, if present.
- *
- * @return YES if the key was found and the value was copied, NO otherwise.
- **/
-- (BOOL)getUInt64:(nullable uint64_t *)value forKey:(int32_t)key;
-
-/**
- * Enumerates the keys and values on this dictionary with the given block.
- *
- * @param block The block to enumerate with.
- *   **key**:        The key for the current entry.
- *   **value**:      The value for the current entry
- *   **stop**:       A pointer to a boolean that when set stops the enumeration.
- **/
-- (void)enumerateKeysAndUInt64sUsingBlock:
-    (void (NS_NOESCAPE ^)(int32_t key, uint64_t value, BOOL *stop))block;
-
-/**
- * Adds the keys and values from another dictionary.
- *
- * @param otherDictionary Dictionary containing entries to be added to this
- *                        dictionary.
- **/
-- (void)addEntriesFromDictionary:(GPBInt32UInt64Dictionary *)otherDictionary;
-
-/**
- * Sets the value for the given key.
- *
- * @param value     The value to set.
- * @param key       The key under which to store the value.
- **/
-- (void)setUInt64:(uint64_t)value forKey:(int32_t)key;
-
-/**
- * Removes the entry for the given key.
- *
- * @param aKey Key to be removed from this dictionary.
- **/
-- (void)removeUInt64ForKey:(int32_t)aKey;
-
-/**
- * Removes all entries in this dictionary.
- **/
-- (void)removeAll;
-
-@end
-
-#pragma mark - Int32 -> Int64
-
-/**
- * Class used for map fields of <int32_t, int64_t>
- * values. This performs better than boxing into NSNumbers in NSDictionaries.
- *
- * @note This class is not meant to be subclassed.
- **/
-@interface GPBInt32Int64Dictionary : NSObject <NSCopying>
-
-/** Number of entries stored in this dictionary. */
-@property(nonatomic, readonly) NSUInteger count;
-
-/**
- * Initializes this dictionary, copying the given values and keys.
- *
- * @param values      The values to be placed in this dictionary.
- * @param keys        The keys under which to store the values.
- * @param count       The number of elements to copy into the dictionary.
- *
- * @return A newly initialized dictionary with a copy of the values and keys.
- **/
-- (instancetype)initWithInt64s:(const int64_t [__nullable])values
-                       forKeys:(const int32_t [__nullable])keys
-                         count:(NSUInteger)count NS_DESIGNATED_INITIALIZER;
-
-/**
- * Initializes this dictionary, copying the entries from the given dictionary.
- *
- * @param dictionary Dictionary containing the entries to add to this dictionary.
- *
- * @return A newly initialized dictionary with the entries of the given dictionary.
- **/
-- (instancetype)initWithDictionary:(GPBInt32Int64Dictionary *)dictionary;
-
-/**
- * Initializes this dictionary with the requested capacity.
- *
- * @param numItems Number of items needed for this dictionary.
- *
- * @return A newly initialized dictionary with the requested capacity.
- **/
-- (instancetype)initWithCapacity:(NSUInteger)numItems;
-
-/**
- * Gets the value for the given key.
- *
- * @param value Pointer into which the value will be set, if found.
- * @param key   Key under which the value is stored, if present.
- *
- * @return YES if the key was found and the value was copied, NO otherwise.
- **/
-- (BOOL)getInt64:(nullable int64_t *)value forKey:(int32_t)key;
-
-/**
- * Enumerates the keys and values on this dictionary with the given block.
- *
- * @param block The block to enumerate with.
- *   **key**:        The key for the current entry.
- *   **value**:      The value for the current entry
- *   **stop**:       A pointer to a boolean that when set stops the enumeration.
- **/
-- (void)enumerateKeysAndInt64sUsingBlock:
-    (void (NS_NOESCAPE ^)(int32_t key, int64_t value, BOOL *stop))block;
-
-/**
- * Adds the keys and values from another dictionary.
- *
- * @param otherDictionary Dictionary containing entries to be added to this
- *                        dictionary.
- **/
-- (void)addEntriesFromDictionary:(GPBInt32Int64Dictionary *)otherDictionary;
-
-/**
- * Sets the value for the given key.
- *
- * @param value     The value to set.
- * @param key       The key under which to store the value.
- **/
-- (void)setInt64:(int64_t)value forKey:(int32_t)key;
-
-/**
- * Removes the entry for the given key.
- *
- * @param aKey Key to be removed from this dictionary.
- **/
-- (void)removeInt64ForKey:(int32_t)aKey;
-
-/**
- * Removes all entries in this dictionary.
- **/
-- (void)removeAll;
-
-@end
-
-#pragma mark - Int32 -> Bool
-
-/**
- * Class used for map fields of <int32_t, BOOL>
- * values. This performs better than boxing into NSNumbers in NSDictionaries.
- *
- * @note This class is not meant to be subclassed.
- **/
-@interface GPBInt32BoolDictionary : NSObject <NSCopying>
-
-/** Number of entries stored in this dictionary. */
-@property(nonatomic, readonly) NSUInteger count;
-
-/**
- * Initializes this dictionary, copying the given values and keys.
- *
- * @param values      The values to be placed in this dictionary.
- * @param keys        The keys under which to store the values.
- * @param count       The number of elements to copy into the dictionary.
- *
- * @return A newly initialized dictionary with a copy of the values and keys.
- **/
-- (instancetype)initWithBools:(const BOOL [__nullable])values
-                      forKeys:(const int32_t [__nullable])keys
-                        count:(NSUInteger)count NS_DESIGNATED_INITIALIZER;
-
-/**
- * Initializes this dictionary, copying the entries from the given dictionary.
- *
- * @param dictionary Dictionary containing the entries to add to this dictionary.
- *
- * @return A newly initialized dictionary with the entries of the given dictionary.
- **/
-- (instancetype)initWithDictionary:(GPBInt32BoolDictionary *)dictionary;
-
-/**
- * Initializes this dictionary with the requested capacity.
- *
- * @param numItems Number of items needed for this dictionary.
- *
- * @return A newly initialized dictionary with the requested capacity.
- **/
-- (instancetype)initWithCapacity:(NSUInteger)numItems;
-
-/**
- * Gets the value for the given key.
- *
- * @param value Pointer into which the value will be set, if found.
- * @param key   Key under which the value is stored, if present.
- *
- * @return YES if the key was found and the value was copied, NO otherwise.
- **/
-- (BOOL)getBool:(nullable BOOL *)value forKey:(int32_t)key;
-
-/**
- * Enumerates the keys and values on this dictionary with the given block.
- *
- * @param block The block to enumerate with.
- *   **key**:        The key for the current entry.
- *   **value**:      The value for the current entry
- *   **stop**:       A pointer to a boolean that when set stops the enumeration.
- **/
-- (void)enumerateKeysAndBoolsUsingBlock:
-    (void (NS_NOESCAPE ^)(int32_t key, BOOL value, BOOL *stop))block;
-
-/**
- * Adds the keys and values from another dictionary.
- *
- * @param otherDictionary Dictionary containing entries to be added to this
- *                        dictionary.
- **/
-- (void)addEntriesFromDictionary:(GPBInt32BoolDictionary *)otherDictionary;
-
-/**
- * Sets the value for the given key.
- *
- * @param value     The value to set.
- * @param key       The key under which to store the value.
- **/
-- (void)setBool:(BOOL)value forKey:(int32_t)key;
-
-/**
- * Removes the entry for the given key.
- *
- * @param aKey Key to be removed from this dictionary.
- **/
-- (void)removeBoolForKey:(int32_t)aKey;
-
-/**
- * Removes all entries in this dictionary.
- **/
-- (void)removeAll;
-
-@end
-
-#pragma mark - Int32 -> Float
-
-/**
- * Class used for map fields of <int32_t, float>
- * values. This performs better than boxing into NSNumbers in NSDictionaries.
- *
- * @note This class is not meant to be subclassed.
- **/
-@interface GPBInt32FloatDictionary : NSObject <NSCopying>
-
-/** Number of entries stored in this dictionary. */
-@property(nonatomic, readonly) NSUInteger count;
-
-/**
- * Initializes this dictionary, copying the given values and keys.
- *
- * @param values      The values to be placed in this dictionary.
- * @param keys        The keys under which to store the values.
- * @param count       The number of elements to copy into the dictionary.
- *
- * @return A newly initialized dictionary with a copy of the values and keys.
- **/
-- (instancetype)initWithFloats:(const float [__nullable])values
-                       forKeys:(const int32_t [__nullable])keys
-                         count:(NSUInteger)count NS_DESIGNATED_INITIALIZER;
-
-/**
- * Initializes this dictionary, copying the entries from the given dictionary.
- *
- * @param dictionary Dictionary containing the entries to add to this dictionary.
- *
- * @return A newly initialized dictionary with the entries of the given dictionary.
- **/
-- (instancetype)initWithDictionary:(GPBInt32FloatDictionary *)dictionary;
-
-/**
- * Initializes this dictionary with the requested capacity.
- *
- * @param numItems Number of items needed for this dictionary.
- *
- * @return A newly initialized dictionary with the requested capacity.
- **/
-- (instancetype)initWithCapacity:(NSUInteger)numItems;
-
-/**
- * Gets the value for the given key.
- *
- * @param value Pointer into which the value will be set, if found.
- * @param key   Key under which the value is stored, if present.
- *
- * @return YES if the key was found and the value was copied, NO otherwise.
- **/
-- (BOOL)getFloat:(nullable float *)value forKey:(int32_t)key;
-
-/**
- * Enumerates the keys and values on this dictionary with the given block.
- *
- * @param block The block to enumerate with.
- *   **key**:        The key for the current entry.
- *   **value**:      The value for the current entry
- *   **stop**:       A pointer to a boolean that when set stops the enumeration.
- **/
-- (void)enumerateKeysAndFloatsUsingBlock:
-    (void (NS_NOESCAPE ^)(int32_t key, float value, BOOL *stop))block;
-
-/**
- * Adds the keys and values from another dictionary.
- *
- * @param otherDictionary Dictionary containing entries to be added to this
- *                        dictionary.
- **/
-- (void)addEntriesFromDictionary:(GPBInt32FloatDictionary *)otherDictionary;
-
-/**
- * Sets the value for the given key.
- *
- * @param value     The value to set.
- * @param key       The key under which to store the value.
- **/
-- (void)setFloat:(float)value forKey:(int32_t)key;
-
-/**
- * Removes the entry for the given key.
- *
- * @param aKey Key to be removed from this dictionary.
- **/
-- (void)removeFloatForKey:(int32_t)aKey;
-
-/**
- * Removes all entries in this dictionary.
- **/
-- (void)removeAll;
-
-@end
-
-#pragma mark - Int32 -> Double
-
-/**
- * Class used for map fields of <int32_t, double>
- * values. This performs better than boxing into NSNumbers in NSDictionaries.
- *
- * @note This class is not meant to be subclassed.
- **/
-@interface GPBInt32DoubleDictionary : NSObject <NSCopying>
-
-/** Number of entries stored in this dictionary. */
-@property(nonatomic, readonly) NSUInteger count;
-
-/**
- * Initializes this dictionary, copying the given values and keys.
- *
- * @param values      The values to be placed in this dictionary.
- * @param keys        The keys under which to store the values.
- * @param count       The number of elements to copy into the dictionary.
- *
- * @return A newly initialized dictionary with a copy of the values and keys.
- **/
-- (instancetype)initWithDoubles:(const double [__nullable])values
-                        forKeys:(const int32_t [__nullable])keys
-                          count:(NSUInteger)count NS_DESIGNATED_INITIALIZER;
-
-/**
- * Initializes this dictionary, copying the entries from the given dictionary.
- *
- * @param dictionary Dictionary containing the entries to add to this dictionary.
- *
- * @return A newly initialized dictionary with the entries of the given dictionary.
- **/
-- (instancetype)initWithDictionary:(GPBInt32DoubleDictionary *)dictionary;
-
-/**
- * Initializes this dictionary with the requested capacity.
- *
- * @param numItems Number of items needed for this dictionary.
- *
- * @return A newly initialized dictionary with the requested capacity.
- **/
-- (instancetype)initWithCapacity:(NSUInteger)numItems;
-
-/**
- * Gets the value for the given key.
- *
- * @param value Pointer into which the value will be set, if found.
- * @param key   Key under which the value is stored, if present.
- *
- * @return YES if the key was found and the value was copied, NO otherwise.
- **/
-- (BOOL)getDouble:(nullable double *)value forKey:(int32_t)key;
-
-/**
- * Enumerates the keys and values on this dictionary with the given block.
- *
- * @param block The block to enumerate with.
- *   **key**:        The key for the current entry.
- *   **value**:      The value for the current entry
- *   **stop**:       A pointer to a boolean that when set stops the enumeration.
- **/
-- (void)enumerateKeysAndDoublesUsingBlock:
-    (void (NS_NOESCAPE ^)(int32_t key, double value, BOOL *stop))block;
-
-/**
- * Adds the keys and values from another dictionary.
- *
- * @param otherDictionary Dictionary containing entries to be added to this
- *                        dictionary.
- **/
-- (void)addEntriesFromDictionary:(GPBInt32DoubleDictionary *)otherDictionary;
-
-/**
- * Sets the value for the given key.
- *
- * @param value     The value to set.
- * @param key       The key under which to store the value.
- **/
-- (void)setDouble:(double)value forKey:(int32_t)key;
-
-/**
- * Removes the entry for the given key.
- *
- * @param aKey Key to be removed from this dictionary.
- **/
-- (void)removeDoubleForKey:(int32_t)aKey;
-
-/**
- * Removes all entries in this dictionary.
- **/
-- (void)removeAll;
-
-@end
-
-#pragma mark - Int32 -> Enum
-
-/**
- * Class used for map fields of <int32_t, int32_t>
- * values. This performs better than boxing into NSNumbers in NSDictionaries.
- *
- * @note This class is not meant to be subclassed.
- **/
-@interface GPBInt32EnumDictionary : NSObject <NSCopying>
-
-/** Number of entries stored in this dictionary. */
-@property(nonatomic, readonly) NSUInteger count;
-/** The validation function to check if the enums are valid. */
-@property(nonatomic, readonly) GPBEnumValidationFunc validationFunc;
-
-/**
- * Initializes a dictionary with the given validation function.
- *
- * @param func The enum validation function for the dictionary.
- *
- * @return A newly initialized dictionary.
- **/
-- (instancetype)initWithValidationFunction:(nullable GPBEnumValidationFunc)func;
-
-/**
- * Initializes a dictionary with the entries given.
- *
- * @param func   The enum validation function for the dictionary.
- * @param values The raw enum values values to be placed in the dictionary.
- * @param keys   The keys under which to store the values.
- * @param count  The number of entries to store in the dictionary.
- *
- * @return A newly initialized dictionary with the keys and values in it.
- **/
-- (instancetype)initWithValidationFunction:(nullable GPBEnumValidationFunc)func
-                                 rawValues:(const int32_t [__nullable])values
-                                   forKeys:(const int32_t [__nullable])keys
-                                     count:(NSUInteger)count NS_DESIGNATED_INITIALIZER;
-
-/**
- * Initializes a dictionary with the entries from the given.
- * dictionary.
- *
- * @param dictionary Dictionary containing the entries to add to the dictionary.
- *
- * @return A newly initialized dictionary with the entries from the given
- *         dictionary in it.
- **/
-- (instancetype)initWithDictionary:(GPBInt32EnumDictionary *)dictionary;
-
-/**
- * Initializes a dictionary with the given capacity.
- *
- * @param func     The enum validation function for the dictionary.
- * @param numItems Capacity needed for the dictionary.
- *
- * @return A newly initialized dictionary with the given capacity.
- **/
-- (instancetype)initWithValidationFunction:(nullable GPBEnumValidationFunc)func
-                                  capacity:(NSUInteger)numItems;
-
-// These will return kGPBUnrecognizedEnumeratorValue if the value for the key
-// is not a valid enumerator as defined by validationFunc. If the actual value is
-// desired, use "raw" version of the method.
-
-/**
- * Gets the value for the given key.
- *
- * @param value Pointer into which the value will be set, if found.
- * @param key   Key under which the value is stored, if present.
- *
- * @return YES if the key was found and the value was copied, NO otherwise.
- **/
-- (BOOL)getEnum:(nullable int32_t *)value forKey:(int32_t)key;
-
-/**
- * Enumerates the keys and values on this dictionary with the given block.
- *
- * @param block The block to enumerate with.
- *   **key**:        The key for the current entry.
- *   **value**:      The value for the current entry
- *   **stop**:       A pointer to a boolean that when set stops the enumeration.
- **/
-- (void)enumerateKeysAndEnumsUsingBlock:
-    (void (NS_NOESCAPE ^)(int32_t key, int32_t value, BOOL *stop))block;
-
-/**
- * Gets the raw enum value for the given key.
- *
- * @note This method bypass the validationFunc to enable the access of values that
- *       were not known at the time the binary was compiled.
- *
- * @param rawValue Pointer into which the value will be set, if found.
- * @param key      Key under which the value is stored, if present.
- *
- * @return YES if the key was found and the value was copied, NO otherwise.
- **/
-- (BOOL)getRawValue:(nullable int32_t *)rawValue forKey:(int32_t)key;
-
-/**
- * Enumerates the keys and values on this dictionary with the given block.
- *
- * @note This method bypass the validationFunc to enable the access of values that
- *       were not known at the time the binary was compiled.
- *
- * @param block The block to enumerate with.
- *   **key**:      The key for the current entry.
- *   **rawValue**: The value for the current entry
- *   **stop**:     A pointer to a boolean that when set stops the enumeration.
- **/
-- (void)enumerateKeysAndRawValuesUsingBlock:
-    (void (NS_NOESCAPE ^)(int32_t key, int32_t rawValue, BOOL *stop))block;
-
-/**
- * Adds the keys and raw enum values from another dictionary.
- *
- * @note This method bypass the validationFunc to enable the setting of values that
- *       were not known at the time the binary was compiled.
- *
- * @param otherDictionary Dictionary containing entries to be added to this
- *                        dictionary.
- **/
-- (void)addRawEntriesFromDictionary:(GPBInt32EnumDictionary *)otherDictionary;
-
-// If value is not a valid enumerator as defined by validationFunc, these
-// methods will assert in debug, and will log in release and assign the value
-// to the default value. Use the rawValue methods below to assign non enumerator
-// values.
-
-/**
- * Sets the value for the given key.
- *
- * @param value     The value to set.
- * @param key       The key under which to store the value.
- **/
-- (void)setEnum:(int32_t)value forKey:(int32_t)key;
-
-/**
- * Sets the raw enum value for the given key.
- *
- * @note This method bypass the validationFunc to enable the setting of values that
- *       were not known at the time the binary was compiled.
- *
- * @param rawValue The raw enum value to set.
- * @param key      The key under which to store the raw enum value.
- **/
-- (void)setRawValue:(int32_t)rawValue forKey:(int32_t)key;
-
-/**
- * Removes the entry for the given key.
- *
- * @param aKey Key to be removed from this dictionary.
- **/
-- (void)removeEnumForKey:(int32_t)aKey;
-
-/**
- * Removes all entries in this dictionary.
- **/
-- (void)removeAll;
-
-@end
-
-#pragma mark - Int32 -> Object
-
-/**
- * Class used for map fields of <int32_t, ObjectType>
- * values. This performs better than boxing into NSNumbers in NSDictionaries.
- *
- * @note This class is not meant to be subclassed.
- **/
-@interface GPBInt32ObjectDictionary<__covariant ObjectType> : NSObject <NSCopying>
-
-/** Number of entries stored in this dictionary. */
-@property(nonatomic, readonly) NSUInteger count;
-
-/**
- * Initializes this dictionary, copying the given values and keys.
- *
- * @param objects      The values to be placed in this dictionary.
- * @param keys         The keys under which to store the values.
- * @param count        The number of elements to copy into the dictionary.
- *
- * @return A newly initialized dictionary with a copy of the values and keys.
- **/
-- (instancetype)initWithObjects:(const ObjectType __nonnull GPB_UNSAFE_UNRETAINED [__nullable])objects
-                        forKeys:(const int32_t [__nullable])keys
-                          count:(NSUInteger)count NS_DESIGNATED_INITIALIZER;
-
-/**
- * Initializes this dictionary, copying the entries from the given dictionary.
- *
- * @param dictionary Dictionary containing the entries to add to this dictionary.
- *
- * @return A newly initialized dictionary with the entries of the given dictionary.
- **/
-- (instancetype)initWithDictionary:(GPBInt32ObjectDictionary *)dictionary;
-
-/**
- * Initializes this dictionary with the requested capacity.
- *
- * @param numItems Number of items needed for this dictionary.
- *
- * @return A newly initialized dictionary with the requested capacity.
- **/
-- (instancetype)initWithCapacity:(NSUInteger)numItems;
-
-/**
- * Fetches the object stored under the given key.
- *
- * @param key Key under which the value is stored, if present.
- *
- * @return The object if found, nil otherwise.
- **/
-- (ObjectType)objectForKey:(int32_t)key;
-
-/**
- * Enumerates the keys and values on this dictionary with the given block.
- *
- * @param block The block to enumerate with.
- *   **key**:         The key for the current entry.
- *   **object**:      The value for the current entry
- *   **stop**:        A pointer to a boolean that when set stops the enumeration.
- **/
-- (void)enumerateKeysAndObjectsUsingBlock:
-    (void (NS_NOESCAPE ^)(int32_t key, ObjectType object, BOOL *stop))block;
-
-/**
- * Adds the keys and values from another dictionary.
- *
- * @param otherDictionary Dictionary containing entries to be added to this
- *                        dictionary.
- **/
-- (void)addEntriesFromDictionary:(GPBInt32ObjectDictionary *)otherDictionary;
-
-/**
- * Sets the value for the given key.
- *
- * @param object     The value to set.
- * @param key        The key under which to store the value.
- **/
-- (void)setObject:(ObjectType)object forKey:(int32_t)key;
-
-/**
- * Removes the entry for the given key.
- *
- * @param aKey Key to be removed from this dictionary.
- **/
-- (void)removeObjectForKey:(int32_t)aKey;
-
-/**
- * Removes all entries in this dictionary.
- **/
-- (void)removeAll;
-
-@end
-
-#pragma mark - UInt64 -> UInt32
-
-/**
- * Class used for map fields of <uint64_t, uint32_t>
- * values. This performs better than boxing into NSNumbers in NSDictionaries.
- *
- * @note This class is not meant to be subclassed.
- **/
-@interface GPBUInt64UInt32Dictionary : NSObject <NSCopying>
-
-/** Number of entries stored in this dictionary. */
-@property(nonatomic, readonly) NSUInteger count;
-
-/**
- * Initializes this dictionary, copying the given values and keys.
- *
- * @param values      The values to be placed in this dictionary.
- * @param keys        The keys under which to store the values.
- * @param count       The number of elements to copy into the dictionary.
- *
- * @return A newly initialized dictionary with a copy of the values and keys.
- **/
-- (instancetype)initWithUInt32s:(const uint32_t [__nullable])values
-                        forKeys:(const uint64_t [__nullable])keys
-                          count:(NSUInteger)count NS_DESIGNATED_INITIALIZER;
-
-/**
- * Initializes this dictionary, copying the entries from the given dictionary.
- *
- * @param dictionary Dictionary containing the entries to add to this dictionary.
- *
- * @return A newly initialized dictionary with the entries of the given dictionary.
- **/
-- (instancetype)initWithDictionary:(GPBUInt64UInt32Dictionary *)dictionary;
-
-/**
- * Initializes this dictionary with the requested capacity.
- *
- * @param numItems Number of items needed for this dictionary.
- *
- * @return A newly initialized dictionary with the requested capacity.
- **/
-- (instancetype)initWithCapacity:(NSUInteger)numItems;
-
-/**
- * Gets the value for the given key.
- *
- * @param value Pointer into which the value will be set, if found.
- * @param key   Key under which the value is stored, if present.
- *
- * @return YES if the key was found and the value was copied, NO otherwise.
- **/
-- (BOOL)getUInt32:(nullable uint32_t *)value forKey:(uint64_t)key;
-
-/**
- * Enumerates the keys and values on this dictionary with the given block.
- *
- * @param block The block to enumerate with.
- *   **key**:        The key for the current entry.
- *   **value**:      The value for the current entry
- *   **stop**:       A pointer to a boolean that when set stops the enumeration.
- **/
-- (void)enumerateKeysAndUInt32sUsingBlock:
-    (void (NS_NOESCAPE ^)(uint64_t key, uint32_t value, BOOL *stop))block;
-
-/**
- * Adds the keys and values from another dictionary.
- *
- * @param otherDictionary Dictionary containing entries to be added to this
- *                        dictionary.
- **/
-- (void)addEntriesFromDictionary:(GPBUInt64UInt32Dictionary *)otherDictionary;
-
-/**
- * Sets the value for the given key.
- *
- * @param value     The value to set.
- * @param key       The key under which to store the value.
- **/
-- (void)setUInt32:(uint32_t)value forKey:(uint64_t)key;
-
-/**
- * Removes the entry for the given key.
- *
- * @param aKey Key to be removed from this dictionary.
- **/
-- (void)removeUInt32ForKey:(uint64_t)aKey;
-
-/**
- * Removes all entries in this dictionary.
- **/
-- (void)removeAll;
-
-@end
-
-#pragma mark - UInt64 -> Int32
-
-/**
- * Class used for map fields of <uint64_t, int32_t>
- * values. This performs better than boxing into NSNumbers in NSDictionaries.
- *
- * @note This class is not meant to be subclassed.
- **/
-@interface GPBUInt64Int32Dictionary : NSObject <NSCopying>
-
-/** Number of entries stored in this dictionary. */
-@property(nonatomic, readonly) NSUInteger count;
-
-/**
- * Initializes this dictionary, copying the given values and keys.
- *
- * @param values      The values to be placed in this dictionary.
- * @param keys        The keys under which to store the values.
- * @param count       The number of elements to copy into the dictionary.
- *
- * @return A newly initialized dictionary with a copy of the values and keys.
- **/
-- (instancetype)initWithInt32s:(const int32_t [__nullable])values
-                       forKeys:(const uint64_t [__nullable])keys
-                         count:(NSUInteger)count NS_DESIGNATED_INITIALIZER;
-
-/**
- * Initializes this dictionary, copying the entries from the given dictionary.
- *
- * @param dictionary Dictionary containing the entries to add to this dictionary.
- *
- * @return A newly initialized dictionary with the entries of the given dictionary.
- **/
-- (instancetype)initWithDictionary:(GPBUInt64Int32Dictionary *)dictionary;
-
-/**
- * Initializes this dictionary with the requested capacity.
- *
- * @param numItems Number of items needed for this dictionary.
- *
- * @return A newly initialized dictionary with the requested capacity.
- **/
-- (instancetype)initWithCapacity:(NSUInteger)numItems;
-
-/**
- * Gets the value for the given key.
- *
- * @param value Pointer into which the value will be set, if found.
- * @param key   Key under which the value is stored, if present.
- *
- * @return YES if the key was found and the value was copied, NO otherwise.
- **/
-- (BOOL)getInt32:(nullable int32_t *)value forKey:(uint64_t)key;
-
-/**
- * Enumerates the keys and values on this dictionary with the given block.
- *
- * @param block The block to enumerate with.
- *   **key**:        The key for the current entry.
- *   **value**:      The value for the current entry
- *   **stop**:       A pointer to a boolean that when set stops the enumeration.
- **/
-- (void)enumerateKeysAndInt32sUsingBlock:
-    (void (NS_NOESCAPE ^)(uint64_t key, int32_t value, BOOL *stop))block;
-
-/**
- * Adds the keys and values from another dictionary.
- *
- * @param otherDictionary Dictionary containing entries to be added to this
- *                        dictionary.
- **/
-- (void)addEntriesFromDictionary:(GPBUInt64Int32Dictionary *)otherDictionary;
-
-/**
- * Sets the value for the given key.
- *
- * @param value     The value to set.
- * @param key       The key under which to store the value.
- **/
-- (void)setInt32:(int32_t)value forKey:(uint64_t)key;
-
-/**
- * Removes the entry for the given key.
- *
- * @param aKey Key to be removed from this dictionary.
- **/
-- (void)removeInt32ForKey:(uint64_t)aKey;
-
-/**
- * Removes all entries in this dictionary.
- **/
-- (void)removeAll;
-
-@end
-
-#pragma mark - UInt64 -> UInt64
-
-/**
- * Class used for map fields of <uint64_t, uint64_t>
- * values. This performs better than boxing into NSNumbers in NSDictionaries.
- *
- * @note This class is not meant to be subclassed.
- **/
-@interface GPBUInt64UInt64Dictionary : NSObject <NSCopying>
-
-/** Number of entries stored in this dictionary. */
-@property(nonatomic, readonly) NSUInteger count;
-
-/**
- * Initializes this dictionary, copying the given values and keys.
- *
- * @param values      The values to be placed in this dictionary.
- * @param keys        The keys under which to store the values.
- * @param count       The number of elements to copy into the dictionary.
- *
- * @return A newly initialized dictionary with a copy of the values and keys.
- **/
-- (instancetype)initWithUInt64s:(const uint64_t [__nullable])values
-                        forKeys:(const uint64_t [__nullable])keys
-                          count:(NSUInteger)count NS_DESIGNATED_INITIALIZER;
-
-/**
- * Initializes this dictionary, copying the entries from the given dictionary.
- *
- * @param dictionary Dictionary containing the entries to add to this dictionary.
- *
- * @return A newly initialized dictionary with the entries of the given dictionary.
- **/
-- (instancetype)initWithDictionary:(GPBUInt64UInt64Dictionary *)dictionary;
-
-/**
- * Initializes this dictionary with the requested capacity.
- *
- * @param numItems Number of items needed for this dictionary.
- *
- * @return A newly initialized dictionary with the requested capacity.
- **/
-- (instancetype)initWithCapacity:(NSUInteger)numItems;
-
-/**
- * Gets the value for the given key.
- *
- * @param value Pointer into which the value will be set, if found.
- * @param key   Key under which the value is stored, if present.
- *
- * @return YES if the key was found and the value was copied, NO otherwise.
- **/
-- (BOOL)getUInt64:(nullable uint64_t *)value forKey:(uint64_t)key;
-
-/**
- * Enumerates the keys and values on this dictionary with the given block.
- *
- * @param block The block to enumerate with.
- *   **key**:        The key for the current entry.
- *   **value**:      The value for the current entry
- *   **stop**:       A pointer to a boolean that when set stops the enumeration.
- **/
-- (void)enumerateKeysAndUInt64sUsingBlock:
-    (void (NS_NOESCAPE ^)(uint64_t key, uint64_t value, BOOL *stop))block;
-
-/**
- * Adds the keys and values from another dictionary.
- *
- * @param otherDictionary Dictionary containing entries to be added to this
- *                        dictionary.
- **/
-- (void)addEntriesFromDictionary:(GPBUInt64UInt64Dictionary *)otherDictionary;
-
-/**
- * Sets the value for the given key.
- *
- * @param value     The value to set.
- * @param key       The key under which to store the value.
- **/
-- (void)setUInt64:(uint64_t)value forKey:(uint64_t)key;
-
-/**
- * Removes the entry for the given key.
- *
- * @param aKey Key to be removed from this dictionary.
- **/
-- (void)removeUInt64ForKey:(uint64_t)aKey;
-
-/**
- * Removes all entries in this dictionary.
- **/
-- (void)removeAll;
-
-@end
-
-#pragma mark - UInt64 -> Int64
-
-/**
- * Class used for map fields of <uint64_t, int64_t>
- * values. This performs better than boxing into NSNumbers in NSDictionaries.
- *
- * @note This class is not meant to be subclassed.
- **/
-@interface GPBUInt64Int64Dictionary : NSObject <NSCopying>
-
-/** Number of entries stored in this dictionary. */
-@property(nonatomic, readonly) NSUInteger count;
-
-/**
- * Initializes this dictionary, copying the given values and keys.
- *
- * @param values      The values to be placed in this dictionary.
- * @param keys        The keys under which to store the values.
- * @param count       The number of elements to copy into the dictionary.
- *
- * @return A newly initialized dictionary with a copy of the values and keys.
- **/
-- (instancetype)initWithInt64s:(const int64_t [__nullable])values
-                       forKeys:(const uint64_t [__nullable])keys
-                         count:(NSUInteger)count NS_DESIGNATED_INITIALIZER;
-
-/**
- * Initializes this dictionary, copying the entries from the given dictionary.
- *
- * @param dictionary Dictionary containing the entries to add to this dictionary.
- *
- * @return A newly initialized dictionary with the entries of the given dictionary.
- **/
-- (instancetype)initWithDictionary:(GPBUInt64Int64Dictionary *)dictionary;
-
-/**
- * Initializes this dictionary with the requested capacity.
- *
- * @param numItems Number of items needed for this dictionary.
- *
- * @return A newly initialized dictionary with the requested capacity.
- **/
-- (instancetype)initWithCapacity:(NSUInteger)numItems;
-
-/**
- * Gets the value for the given key.
- *
- * @param value Pointer into which the value will be set, if found.
- * @param key   Key under which the value is stored, if present.
- *
- * @return YES if the key was found and the value was copied, NO otherwise.
- **/
-- (BOOL)getInt64:(nullable int64_t *)value forKey:(uint64_t)key;
-
-/**
- * Enumerates the keys and values on this dictionary with the given block.
- *
- * @param block The block to enumerate with.
- *   **key**:        The key for the current entry.
- *   **value**:      The value for the current entry
- *   **stop**:       A pointer to a boolean that when set stops the enumeration.
- **/
-- (void)enumerateKeysAndInt64sUsingBlock:
-    (void (NS_NOESCAPE ^)(uint64_t key, int64_t value, BOOL *stop))block;
-
-/**
- * Adds the keys and values from another dictionary.
- *
- * @param otherDictionary Dictionary containing entries to be added to this
- *                        dictionary.
- **/
-- (void)addEntriesFromDictionary:(GPBUInt64Int64Dictionary *)otherDictionary;
-
-/**
- * Sets the value for the given key.
- *
- * @param value     The value to set.
- * @param key       The key under which to store the value.
- **/
-- (void)setInt64:(int64_t)value forKey:(uint64_t)key;
-
-/**
- * Removes the entry for the given key.
- *
- * @param aKey Key to be removed from this dictionary.
- **/
-- (void)removeInt64ForKey:(uint64_t)aKey;
-
-/**
- * Removes all entries in this dictionary.
- **/
-- (void)removeAll;
-
-@end
-
-#pragma mark - UInt64 -> Bool
-
-/**
- * Class used for map fields of <uint64_t, BOOL>
- * values. This performs better than boxing into NSNumbers in NSDictionaries.
- *
- * @note This class is not meant to be subclassed.
- **/
-@interface GPBUInt64BoolDictionary : NSObject <NSCopying>
-
-/** Number of entries stored in this dictionary. */
-@property(nonatomic, readonly) NSUInteger count;
-
-/**
- * Initializes this dictionary, copying the given values and keys.
- *
- * @param values      The values to be placed in this dictionary.
- * @param keys        The keys under which to store the values.
- * @param count       The number of elements to copy into the dictionary.
- *
- * @return A newly initialized dictionary with a copy of the values and keys.
- **/
-- (instancetype)initWithBools:(const BOOL [__nullable])values
-                      forKeys:(const uint64_t [__nullable])keys
-                        count:(NSUInteger)count NS_DESIGNATED_INITIALIZER;
-
-/**
- * Initializes this dictionary, copying the entries from the given dictionary.
- *
- * @param dictionary Dictionary containing the entries to add to this dictionary.
- *
- * @return A newly initialized dictionary with the entries of the given dictionary.
- **/
-- (instancetype)initWithDictionary:(GPBUInt64BoolDictionary *)dictionary;
-
-/**
- * Initializes this dictionary with the requested capacity.
- *
- * @param numItems Number of items needed for this dictionary.
- *
- * @return A newly initialized dictionary with the requested capacity.
- **/
-- (instancetype)initWithCapacity:(NSUInteger)numItems;
-
-/**
- * Gets the value for the given key.
- *
- * @param value Pointer into which the value will be set, if found.
- * @param key   Key under which the value is stored, if present.
- *
- * @return YES if the key was found and the value was copied, NO otherwise.
- **/
-- (BOOL)getBool:(nullable BOOL *)value forKey:(uint64_t)key;
-
-/**
- * Enumerates the keys and values on this dictionary with the given block.
- *
- * @param block The block to enumerate with.
- *   **key**:        The key for the current entry.
- *   **value**:      The value for the current entry
- *   **stop**:       A pointer to a boolean that when set stops the enumeration.
- **/
-- (void)enumerateKeysAndBoolsUsingBlock:
-    (void (NS_NOESCAPE ^)(uint64_t key, BOOL value, BOOL *stop))block;
-
-/**
- * Adds the keys and values from another dictionary.
- *
- * @param otherDictionary Dictionary containing entries to be added to this
- *                        dictionary.
- **/
-- (void)addEntriesFromDictionary:(GPBUInt64BoolDictionary *)otherDictionary;
-
-/**
- * Sets the value for the given key.
- *
- * @param value     The value to set.
- * @param key       The key under which to store the value.
- **/
-- (void)setBool:(BOOL)value forKey:(uint64_t)key;
-
-/**
- * Removes the entry for the given key.
- *
- * @param aKey Key to be removed from this dictionary.
- **/
-- (void)removeBoolForKey:(uint64_t)aKey;
-
-/**
- * Removes all entries in this dictionary.
- **/
-- (void)removeAll;
-
-@end
-
-#pragma mark - UInt64 -> Float
-
-/**
- * Class used for map fields of <uint64_t, float>
- * values. This performs better than boxing into NSNumbers in NSDictionaries.
- *
- * @note This class is not meant to be subclassed.
- **/
-@interface GPBUInt64FloatDictionary : NSObject <NSCopying>
-
-/** Number of entries stored in this dictionary. */
-@property(nonatomic, readonly) NSUInteger count;
-
-/**
- * Initializes this dictionary, copying the given values and keys.
- *
- * @param values      The values to be placed in this dictionary.
- * @param keys        The keys under which to store the values.
- * @param count       The number of elements to copy into the dictionary.
- *
- * @return A newly initialized dictionary with a copy of the values and keys.
- **/
-- (instancetype)initWithFloats:(const float [__nullable])values
-                       forKeys:(const uint64_t [__nullable])keys
-                         count:(NSUInteger)count NS_DESIGNATED_INITIALIZER;
-
-/**
- * Initializes this dictionary, copying the entries from the given dictionary.
- *
- * @param dictionary Dictionary containing the entries to add to this dictionary.
- *
- * @return A newly initialized dictionary with the entries of the given dictionary.
- **/
-- (instancetype)initWithDictionary:(GPBUInt64FloatDictionary *)dictionary;
-
-/**
- * Initializes this dictionary with the requested capacity.
- *
- * @param numItems Number of items needed for this dictionary.
- *
- * @return A newly initialized dictionary with the requested capacity.
- **/
-- (instancetype)initWithCapacity:(NSUInteger)numItems;
-
-/**
- * Gets the value for the given key.
- *
- * @param value Pointer into which the value will be set, if found.
- * @param key   Key under which the value is stored, if present.
- *
- * @return YES if the key was found and the value was copied, NO otherwise.
- **/
-- (BOOL)getFloat:(nullable float *)value forKey:(uint64_t)key;
-
-/**
- * Enumerates the keys and values on this dictionary with the given block.
- *
- * @param block The block to enumerate with.
- *   **key**:        The key for the current entry.
- *   **value**:      The value for the current entry
- *   **stop**:       A pointer to a boolean that when set stops the enumeration.
- **/
-- (void)enumerateKeysAndFloatsUsingBlock:
-    (void (NS_NOESCAPE ^)(uint64_t key, float value, BOOL *stop))block;
-
-/**
- * Adds the keys and values from another dictionary.
- *
- * @param otherDictionary Dictionary containing entries to be added to this
- *                        dictionary.
- **/
-- (void)addEntriesFromDictionary:(GPBUInt64FloatDictionary *)otherDictionary;
-
-/**
- * Sets the value for the given key.
- *
- * @param value     The value to set.
- * @param key       The key under which to store the value.
- **/
-- (void)setFloat:(float)value forKey:(uint64_t)key;
-
-/**
- * Removes the entry for the given key.
- *
- * @param aKey Key to be removed from this dictionary.
- **/
-- (void)removeFloatForKey:(uint64_t)aKey;
-
-/**
- * Removes all entries in this dictionary.
- **/
-- (void)removeAll;
-
-@end
-
-#pragma mark - UInt64 -> Double
-
-/**
- * Class used for map fields of <uint64_t, double>
- * values. This performs better than boxing into NSNumbers in NSDictionaries.
- *
- * @note This class is not meant to be subclassed.
- **/
-@interface GPBUInt64DoubleDictionary : NSObject <NSCopying>
-
-/** Number of entries stored in this dictionary. */
-@property(nonatomic, readonly) NSUInteger count;
-
-/**
- * Initializes this dictionary, copying the given values and keys.
- *
- * @param values      The values to be placed in this dictionary.
- * @param keys        The keys under which to store the values.
- * @param count       The number of elements to copy into the dictionary.
- *
- * @return A newly initialized dictionary with a copy of the values and keys.
- **/
-- (instancetype)initWithDoubles:(const double [__nullable])values
-                        forKeys:(const uint64_t [__nullable])keys
-                          count:(NSUInteger)count NS_DESIGNATED_INITIALIZER;
-
-/**
- * Initializes this dictionary, copying the entries from the given dictionary.
- *
- * @param dictionary Dictionary containing the entries to add to this dictionary.
- *
- * @return A newly initialized dictionary with the entries of the given dictionary.
- **/
-- (instancetype)initWithDictionary:(GPBUInt64DoubleDictionary *)dictionary;
-
-/**
- * Initializes this dictionary with the requested capacity.
- *
- * @param numItems Number of items needed for this dictionary.
- *
- * @return A newly initialized dictionary with the requested capacity.
- **/
-- (instancetype)initWithCapacity:(NSUInteger)numItems;
-
-/**
- * Gets the value for the given key.
- *
- * @param value Pointer into which the value will be set, if found.
- * @param key   Key under which the value is stored, if present.
- *
- * @return YES if the key was found and the value was copied, NO otherwise.
- **/
-- (BOOL)getDouble:(nullable double *)value forKey:(uint64_t)key;
-
-/**
- * Enumerates the keys and values on this dictionary with the given block.
- *
- * @param block The block to enumerate with.
- *   **key**:        The key for the current entry.
- *   **value**:      The value for the current entry
- *   **stop**:       A pointer to a boolean that when set stops the enumeration.
- **/
-- (void)enumerateKeysAndDoublesUsingBlock:
-    (void (NS_NOESCAPE ^)(uint64_t key, double value, BOOL *stop))block;
-
-/**
- * Adds the keys and values from another dictionary.
- *
- * @param otherDictionary Dictionary containing entries to be added to this
- *                        dictionary.
- **/
-- (void)addEntriesFromDictionary:(GPBUInt64DoubleDictionary *)otherDictionary;
-
-/**
- * Sets the value for the given key.
- *
- * @param value     The value to set.
- * @param key       The key under which to store the value.
- **/
-- (void)setDouble:(double)value forKey:(uint64_t)key;
-
-/**
- * Removes the entry for the given key.
- *
- * @param aKey Key to be removed from this dictionary.
- **/
-- (void)removeDoubleForKey:(uint64_t)aKey;
-
-/**
- * Removes all entries in this dictionary.
- **/
-- (void)removeAll;
-
-@end
-
-#pragma mark - UInt64 -> Enum
-
-/**
- * Class used for map fields of <uint64_t, int32_t>
- * values. This performs better than boxing into NSNumbers in NSDictionaries.
- *
- * @note This class is not meant to be subclassed.
- **/
-@interface GPBUInt64EnumDictionary : NSObject <NSCopying>
-
-/** Number of entries stored in this dictionary. */
-@property(nonatomic, readonly) NSUInteger count;
-/** The validation function to check if the enums are valid. */
-@property(nonatomic, readonly) GPBEnumValidationFunc validationFunc;
-
-/**
- * Initializes a dictionary with the given validation function.
- *
- * @param func The enum validation function for the dictionary.
- *
- * @return A newly initialized dictionary.
- **/
-- (instancetype)initWithValidationFunction:(nullable GPBEnumValidationFunc)func;
-
-/**
- * Initializes a dictionary with the entries given.
- *
- * @param func   The enum validation function for the dictionary.
- * @param values The raw enum values values to be placed in the dictionary.
- * @param keys   The keys under which to store the values.
- * @param count  The number of entries to store in the dictionary.
- *
- * @return A newly initialized dictionary with the keys and values in it.
- **/
-- (instancetype)initWithValidationFunction:(nullable GPBEnumValidationFunc)func
-                                 rawValues:(const int32_t [__nullable])values
-                                   forKeys:(const uint64_t [__nullable])keys
-                                     count:(NSUInteger)count NS_DESIGNATED_INITIALIZER;
-
-/**
- * Initializes a dictionary with the entries from the given.
- * dictionary.
- *
- * @param dictionary Dictionary containing the entries to add to the dictionary.
- *
- * @return A newly initialized dictionary with the entries from the given
- *         dictionary in it.
- **/
-- (instancetype)initWithDictionary:(GPBUInt64EnumDictionary *)dictionary;
-
-/**
- * Initializes a dictionary with the given capacity.
- *
- * @param func     The enum validation function for the dictionary.
- * @param numItems Capacity needed for the dictionary.
- *
- * @return A newly initialized dictionary with the given capacity.
- **/
-- (instancetype)initWithValidationFunction:(nullable GPBEnumValidationFunc)func
-                                  capacity:(NSUInteger)numItems;
-
-// These will return kGPBUnrecognizedEnumeratorValue if the value for the key
-// is not a valid enumerator as defined by validationFunc. If the actual value is
-// desired, use "raw" version of the method.
-
-/**
- * Gets the value for the given key.
- *
- * @param value Pointer into which the value will be set, if found.
- * @param key   Key under which the value is stored, if present.
- *
- * @return YES if the key was found and the value was copied, NO otherwise.
- **/
-- (BOOL)getEnum:(nullable int32_t *)value forKey:(uint64_t)key;
-
-/**
- * Enumerates the keys and values on this dictionary with the given block.
- *
- * @param block The block to enumerate with.
- *   **key**:        The key for the current entry.
- *   **value**:      The value for the current entry
- *   **stop**:       A pointer to a boolean that when set stops the enumeration.
- **/
-- (void)enumerateKeysAndEnumsUsingBlock:
-    (void (NS_NOESCAPE ^)(uint64_t key, int32_t value, BOOL *stop))block;
-
-/**
- * Gets the raw enum value for the given key.
- *
- * @note This method bypass the validationFunc to enable the access of values that
- *       were not known at the time the binary was compiled.
- *
- * @param rawValue Pointer into which the value will be set, if found.
- * @param key      Key under which the value is stored, if present.
- *
- * @return YES if the key was found and the value was copied, NO otherwise.
- **/
-- (BOOL)getRawValue:(nullable int32_t *)rawValue forKey:(uint64_t)key;
-
-/**
- * Enumerates the keys and values on this dictionary with the given block.
- *
- * @note This method bypass the validationFunc to enable the access of values that
- *       were not known at the time the binary was compiled.
- *
- * @param block The block to enumerate with.
- *   **key**:      The key for the current entry.
- *   **rawValue**: The value for the current entry
- *   **stop**:     A pointer to a boolean that when set stops the enumeration.
- **/
-- (void)enumerateKeysAndRawValuesUsingBlock:
-    (void (NS_NOESCAPE ^)(uint64_t key, int32_t rawValue, BOOL *stop))block;
-
-/**
- * Adds the keys and raw enum values from another dictionary.
- *
- * @note This method bypass the validationFunc to enable the setting of values that
- *       were not known at the time the binary was compiled.
- *
- * @param otherDictionary Dictionary containing entries to be added to this
- *                        dictionary.
- **/
-- (void)addRawEntriesFromDictionary:(GPBUInt64EnumDictionary *)otherDictionary;
-
-// If value is not a valid enumerator as defined by validationFunc, these
-// methods will assert in debug, and will log in release and assign the value
-// to the default value. Use the rawValue methods below to assign non enumerator
-// values.
-
-/**
- * Sets the value for the given key.
- *
- * @param value     The value to set.
- * @param key       The key under which to store the value.
- **/
-- (void)setEnum:(int32_t)value forKey:(uint64_t)key;
-
-/**
- * Sets the raw enum value for the given key.
- *
- * @note This method bypass the validationFunc to enable the setting of values that
- *       were not known at the time the binary was compiled.
- *
- * @param rawValue The raw enum value to set.
- * @param key      The key under which to store the raw enum value.
- **/
-- (void)setRawValue:(int32_t)rawValue forKey:(uint64_t)key;
-
-/**
- * Removes the entry for the given key.
- *
- * @param aKey Key to be removed from this dictionary.
- **/
-- (void)removeEnumForKey:(uint64_t)aKey;
-
-/**
- * Removes all entries in this dictionary.
- **/
-- (void)removeAll;
-
-@end
-
-#pragma mark - UInt64 -> Object
-
-/**
- * Class used for map fields of <uint64_t, ObjectType>
- * values. This performs better than boxing into NSNumbers in NSDictionaries.
- *
- * @note This class is not meant to be subclassed.
- **/
-@interface GPBUInt64ObjectDictionary<__covariant ObjectType> : NSObject <NSCopying>
-
-/** Number of entries stored in this dictionary. */
-@property(nonatomic, readonly) NSUInteger count;
-
-/**
- * Initializes this dictionary, copying the given values and keys.
- *
- * @param objects      The values to be placed in this dictionary.
- * @param keys         The keys under which to store the values.
- * @param count        The number of elements to copy into the dictionary.
- *
- * @return A newly initialized dictionary with a copy of the values and keys.
- **/
-- (instancetype)initWithObjects:(const ObjectType __nonnull GPB_UNSAFE_UNRETAINED [__nullable])objects
-                        forKeys:(const uint64_t [__nullable])keys
-                          count:(NSUInteger)count NS_DESIGNATED_INITIALIZER;
-
-/**
- * Initializes this dictionary, copying the entries from the given dictionary.
- *
- * @param dictionary Dictionary containing the entries to add to this dictionary.
- *
- * @return A newly initialized dictionary with the entries of the given dictionary.
- **/
-- (instancetype)initWithDictionary:(GPBUInt64ObjectDictionary *)dictionary;
-
-/**
- * Initializes this dictionary with the requested capacity.
- *
- * @param numItems Number of items needed for this dictionary.
- *
- * @return A newly initialized dictionary with the requested capacity.
- **/
-- (instancetype)initWithCapacity:(NSUInteger)numItems;
-
-/**
- * Fetches the object stored under the given key.
- *
- * @param key Key under which the value is stored, if present.
- *
- * @return The object if found, nil otherwise.
- **/
-- (ObjectType)objectForKey:(uint64_t)key;
-
-/**
- * Enumerates the keys and values on this dictionary with the given block.
- *
- * @param block The block to enumerate with.
- *   **key**:         The key for the current entry.
- *   **object**:      The value for the current entry
- *   **stop**:        A pointer to a boolean that when set stops the enumeration.
- **/
-- (void)enumerateKeysAndObjectsUsingBlock:
-    (void (NS_NOESCAPE ^)(uint64_t key, ObjectType object, BOOL *stop))block;
-
-/**
- * Adds the keys and values from another dictionary.
- *
- * @param otherDictionary Dictionary containing entries to be added to this
- *                        dictionary.
- **/
-- (void)addEntriesFromDictionary:(GPBUInt64ObjectDictionary *)otherDictionary;
-
-/**
- * Sets the value for the given key.
- *
- * @param object     The value to set.
- * @param key        The key under which to store the value.
- **/
-- (void)setObject:(ObjectType)object forKey:(uint64_t)key;
-
-/**
- * Removes the entry for the given key.
- *
- * @param aKey Key to be removed from this dictionary.
- **/
-- (void)removeObjectForKey:(uint64_t)aKey;
-
-/**
- * Removes all entries in this dictionary.
- **/
-- (void)removeAll;
-
-@end
-
-#pragma mark - Int64 -> UInt32
-
-/**
- * Class used for map fields of <int64_t, uint32_t>
- * values. This performs better than boxing into NSNumbers in NSDictionaries.
- *
- * @note This class is not meant to be subclassed.
- **/
-@interface GPBInt64UInt32Dictionary : NSObject <NSCopying>
-
-/** Number of entries stored in this dictionary. */
-@property(nonatomic, readonly) NSUInteger count;
-
-/**
- * Initializes this dictionary, copying the given values and keys.
- *
- * @param values      The values to be placed in this dictionary.
- * @param keys        The keys under which to store the values.
- * @param count       The number of elements to copy into the dictionary.
- *
- * @return A newly initialized dictionary with a copy of the values and keys.
- **/
-- (instancetype)initWithUInt32s:(const uint32_t [__nullable])values
-                        forKeys:(const int64_t [__nullable])keys
-                          count:(NSUInteger)count NS_DESIGNATED_INITIALIZER;
-
-/**
- * Initializes this dictionary, copying the entries from the given dictionary.
- *
- * @param dictionary Dictionary containing the entries to add to this dictionary.
- *
- * @return A newly initialized dictionary with the entries of the given dictionary.
- **/
-- (instancetype)initWithDictionary:(GPBInt64UInt32Dictionary *)dictionary;
-
-/**
- * Initializes this dictionary with the requested capacity.
- *
- * @param numItems Number of items needed for this dictionary.
- *
- * @return A newly initialized dictionary with the requested capacity.
- **/
-- (instancetype)initWithCapacity:(NSUInteger)numItems;
-
-/**
- * Gets the value for the given key.
- *
- * @param value Pointer into which the value will be set, if found.
- * @param key   Key under which the value is stored, if present.
- *
- * @return YES if the key was found and the value was copied, NO otherwise.
- **/
-- (BOOL)getUInt32:(nullable uint32_t *)value forKey:(int64_t)key;
-
-/**
- * Enumerates the keys and values on this dictionary with the given block.
- *
- * @param block The block to enumerate with.
- *   **key**:        The key for the current entry.
- *   **value**:      The value for the current entry
- *   **stop**:       A pointer to a boolean that when set stops the enumeration.
- **/
-- (void)enumerateKeysAndUInt32sUsingBlock:
-    (void (NS_NOESCAPE ^)(int64_t key, uint32_t value, BOOL *stop))block;
-
-/**
- * Adds the keys and values from another dictionary.
- *
- * @param otherDictionary Dictionary containing entries to be added to this
- *                        dictionary.
- **/
-- (void)addEntriesFromDictionary:(GPBInt64UInt32Dictionary *)otherDictionary;
-
-/**
- * Sets the value for the given key.
- *
- * @param value     The value to set.
- * @param key       The key under which to store the value.
- **/
-- (void)setUInt32:(uint32_t)value forKey:(int64_t)key;
-
-/**
- * Removes the entry for the given key.
- *
- * @param aKey Key to be removed from this dictionary.
- **/
-- (void)removeUInt32ForKey:(int64_t)aKey;
-
-/**
- * Removes all entries in this dictionary.
- **/
-- (void)removeAll;
-
-@end
-
-#pragma mark - Int64 -> Int32
-
-/**
- * Class used for map fields of <int64_t, int32_t>
- * values. This performs better than boxing into NSNumbers in NSDictionaries.
- *
- * @note This class is not meant to be subclassed.
- **/
-@interface GPBInt64Int32Dictionary : NSObject <NSCopying>
-
-/** Number of entries stored in this dictionary. */
-@property(nonatomic, readonly) NSUInteger count;
-
-/**
- * Initializes this dictionary, copying the given values and keys.
- *
- * @param values      The values to be placed in this dictionary.
- * @param keys        The keys under which to store the values.
- * @param count       The number of elements to copy into the dictionary.
- *
- * @return A newly initialized dictionary with a copy of the values and keys.
- **/
-- (instancetype)initWithInt32s:(const int32_t [__nullable])values
-                       forKeys:(const int64_t [__nullable])keys
-                         count:(NSUInteger)count NS_DESIGNATED_INITIALIZER;
-
-/**
- * Initializes this dictionary, copying the entries from the given dictionary.
- *
- * @param dictionary Dictionary containing the entries to add to this dictionary.
- *
- * @return A newly initialized dictionary with the entries of the given dictionary.
- **/
-- (instancetype)initWithDictionary:(GPBInt64Int32Dictionary *)dictionary;
-
-/**
- * Initializes this dictionary with the requested capacity.
- *
- * @param numItems Number of items needed for this dictionary.
- *
- * @return A newly initialized dictionary with the requested capacity.
- **/
-- (instancetype)initWithCapacity:(NSUInteger)numItems;
-
-/**
- * Gets the value for the given key.
- *
- * @param value Pointer into which the value will be set, if found.
- * @param key   Key under which the value is stored, if present.
- *
- * @return YES if the key was found and the value was copied, NO otherwise.
- **/
-- (BOOL)getInt32:(nullable int32_t *)value forKey:(int64_t)key;
-
-/**
- * Enumerates the keys and values on this dictionary with the given block.
- *
- * @param block The block to enumerate with.
- *   **key**:        The key for the current entry.
- *   **value**:      The value for the current entry
- *   **stop**:       A pointer to a boolean that when set stops the enumeration.
- **/
-- (void)enumerateKeysAndInt32sUsingBlock:
-    (void (NS_NOESCAPE ^)(int64_t key, int32_t value, BOOL *stop))block;
-
-/**
- * Adds the keys and values from another dictionary.
- *
- * @param otherDictionary Dictionary containing entries to be added to this
- *                        dictionary.
- **/
-- (void)addEntriesFromDictionary:(GPBInt64Int32Dictionary *)otherDictionary;
-
-/**
- * Sets the value for the given key.
- *
- * @param value     The value to set.
- * @param key       The key under which to store the value.
- **/
-- (void)setInt32:(int32_t)value forKey:(int64_t)key;
-
-/**
- * Removes the entry for the given key.
- *
- * @param aKey Key to be removed from this dictionary.
- **/
-- (void)removeInt32ForKey:(int64_t)aKey;
-
-/**
- * Removes all entries in this dictionary.
- **/
-- (void)removeAll;
-
-@end
-
-#pragma mark - Int64 -> UInt64
-
-/**
- * Class used for map fields of <int64_t, uint64_t>
- * values. This performs better than boxing into NSNumbers in NSDictionaries.
- *
- * @note This class is not meant to be subclassed.
- **/
-@interface GPBInt64UInt64Dictionary : NSObject <NSCopying>
-
-/** Number of entries stored in this dictionary. */
-@property(nonatomic, readonly) NSUInteger count;
-
-/**
- * Initializes this dictionary, copying the given values and keys.
- *
- * @param values      The values to be placed in this dictionary.
- * @param keys        The keys under which to store the values.
- * @param count       The number of elements to copy into the dictionary.
- *
- * @return A newly initialized dictionary with a copy of the values and keys.
- **/
-- (instancetype)initWithUInt64s:(const uint64_t [__nullable])values
-                        forKeys:(const int64_t [__nullable])keys
-                          count:(NSUInteger)count NS_DESIGNATED_INITIALIZER;
-
-/**
- * Initializes this dictionary, copying the entries from the given dictionary.
- *
- * @param dictionary Dictionary containing the entries to add to this dictionary.
- *
- * @return A newly initialized dictionary with the entries of the given dictionary.
- **/
-- (instancetype)initWithDictionary:(GPBInt64UInt64Dictionary *)dictionary;
-
-/**
- * Initializes this dictionary with the requested capacity.
- *
- * @param numItems Number of items needed for this dictionary.
- *
- * @return A newly initialized dictionary with the requested capacity.
- **/
-- (instancetype)initWithCapacity:(NSUInteger)numItems;
-
-/**
- * Gets the value for the given key.
- *
- * @param value Pointer into which the value will be set, if found.
- * @param key   Key under which the value is stored, if present.
- *
- * @return YES if the key was found and the value was copied, NO otherwise.
- **/
-- (BOOL)getUInt64:(nullable uint64_t *)value forKey:(int64_t)key;
-
-/**
- * Enumerates the keys and values on this dictionary with the given block.
- *
- * @param block The block to enumerate with.
- *   **key**:        The key for the current entry.
- *   **value**:      The value for the current entry
- *   **stop**:       A pointer to a boolean that when set stops the enumeration.
- **/
-- (void)enumerateKeysAndUInt64sUsingBlock:
-    (void (NS_NOESCAPE ^)(int64_t key, uint64_t value, BOOL *stop))block;
-
-/**
- * Adds the keys and values from another dictionary.
- *
- * @param otherDictionary Dictionary containing entries to be added to this
- *                        dictionary.
- **/
-- (void)addEntriesFromDictionary:(GPBInt64UInt64Dictionary *)otherDictionary;
-
-/**
- * Sets the value for the given key.
- *
- * @param value     The value to set.
- * @param key       The key under which to store the value.
- **/
-- (void)setUInt64:(uint64_t)value forKey:(int64_t)key;
-
-/**
- * Removes the entry for the given key.
- *
- * @param aKey Key to be removed from this dictionary.
- **/
-- (void)removeUInt64ForKey:(int64_t)aKey;
-
-/**
- * Removes all entries in this dictionary.
- **/
-- (void)removeAll;
-
-@end
-
-#pragma mark - Int64 -> Int64
-
-/**
- * Class used for map fields of <int64_t, int64_t>
- * values. This performs better than boxing into NSNumbers in NSDictionaries.
- *
- * @note This class is not meant to be subclassed.
- **/
-@interface GPBInt64Int64Dictionary : NSObject <NSCopying>
-
-/** Number of entries stored in this dictionary. */
-@property(nonatomic, readonly) NSUInteger count;
-
-/**
- * Initializes this dictionary, copying the given values and keys.
- *
- * @param values      The values to be placed in this dictionary.
- * @param keys        The keys under which to store the values.
- * @param count       The number of elements to copy into the dictionary.
- *
- * @return A newly initialized dictionary with a copy of the values and keys.
- **/
-- (instancetype)initWithInt64s:(const int64_t [__nullable])values
-                       forKeys:(const int64_t [__nullable])keys
-                         count:(NSUInteger)count NS_DESIGNATED_INITIALIZER;
-
-/**
- * Initializes this dictionary, copying the entries from the given dictionary.
- *
- * @param dictionary Dictionary containing the entries to add to this dictionary.
- *
- * @return A newly initialized dictionary with the entries of the given dictionary.
- **/
-- (instancetype)initWithDictionary:(GPBInt64Int64Dictionary *)dictionary;
-
-/**
- * Initializes this dictionary with the requested capacity.
- *
- * @param numItems Number of items needed for this dictionary.
- *
- * @return A newly initialized dictionary with the requested capacity.
- **/
-- (instancetype)initWithCapacity:(NSUInteger)numItems;
-
-/**
- * Gets the value for the given key.
- *
- * @param value Pointer into which the value will be set, if found.
- * @param key   Key under which the value is stored, if present.
- *
- * @return YES if the key was found and the value was copied, NO otherwise.
- **/
-- (BOOL)getInt64:(nullable int64_t *)value forKey:(int64_t)key;
-
-/**
- * Enumerates the keys and values on this dictionary with the given block.
- *
- * @param block The block to enumerate with.
- *   **key**:        The key for the current entry.
- *   **value**:      The value for the current entry
- *   **stop**:       A pointer to a boolean that when set stops the enumeration.
- **/
-- (void)enumerateKeysAndInt64sUsingBlock:
-    (void (NS_NOESCAPE ^)(int64_t key, int64_t value, BOOL *stop))block;
-
-/**
- * Adds the keys and values from another dictionary.
- *
- * @param otherDictionary Dictionary containing entries to be added to this
- *                        dictionary.
- **/
-- (void)addEntriesFromDictionary:(GPBInt64Int64Dictionary *)otherDictionary;
-
-/**
- * Sets the value for the given key.
- *
- * @param value     The value to set.
- * @param key       The key under which to store the value.
- **/
-- (void)setInt64:(int64_t)value forKey:(int64_t)key;
-
-/**
- * Removes the entry for the given key.
- *
- * @param aKey Key to be removed from this dictionary.
- **/
-- (void)removeInt64ForKey:(int64_t)aKey;
-
-/**
- * Removes all entries in this dictionary.
- **/
-- (void)removeAll;
-
-@end
-
-#pragma mark - Int64 -> Bool
-
-/**
- * Class used for map fields of <int64_t, BOOL>
- * values. This performs better than boxing into NSNumbers in NSDictionaries.
- *
- * @note This class is not meant to be subclassed.
- **/
-@interface GPBInt64BoolDictionary : NSObject <NSCopying>
-
-/** Number of entries stored in this dictionary. */
-@property(nonatomic, readonly) NSUInteger count;
-
-/**
- * Initializes this dictionary, copying the given values and keys.
- *
- * @param values      The values to be placed in this dictionary.
- * @param keys        The keys under which to store the values.
- * @param count       The number of elements to copy into the dictionary.
- *
- * @return A newly initialized dictionary with a copy of the values and keys.
- **/
-- (instancetype)initWithBools:(const BOOL [__nullable])values
-                      forKeys:(const int64_t [__nullable])keys
-                        count:(NSUInteger)count NS_DESIGNATED_INITIALIZER;
-
-/**
- * Initializes this dictionary, copying the entries from the given dictionary.
- *
- * @param dictionary Dictionary containing the entries to add to this dictionary.
- *
- * @return A newly initialized dictionary with the entries of the given dictionary.
- **/
-- (instancetype)initWithDictionary:(GPBInt64BoolDictionary *)dictionary;
-
-/**
- * Initializes this dictionary with the requested capacity.
- *
- * @param numItems Number of items needed for this dictionary.
- *
- * @return A newly initialized dictionary with the requested capacity.
- **/
-- (instancetype)initWithCapacity:(NSUInteger)numItems;
-
-/**
- * Gets the value for the given key.
- *
- * @param value Pointer into which the value will be set, if found.
- * @param key   Key under which the value is stored, if present.
- *
- * @return YES if the key was found and the value was copied, NO otherwise.
- **/
-- (BOOL)getBool:(nullable BOOL *)value forKey:(int64_t)key;
-
-/**
- * Enumerates the keys and values on this dictionary with the given block.
- *
- * @param block The block to enumerate with.
- *   **key**:        The key for the current entry.
- *   **value**:      The value for the current entry
- *   **stop**:       A pointer to a boolean that when set stops the enumeration.
- **/
-- (void)enumerateKeysAndBoolsUsingBlock:
-    (void (NS_NOESCAPE ^)(int64_t key, BOOL value, BOOL *stop))block;
-
-/**
- * Adds the keys and values from another dictionary.
- *
- * @param otherDictionary Dictionary containing entries to be added to this
- *                        dictionary.
- **/
-- (void)addEntriesFromDictionary:(GPBInt64BoolDictionary *)otherDictionary;
-
-/**
- * Sets the value for the given key.
- *
- * @param value     The value to set.
- * @param key       The key under which to store the value.
- **/
-- (void)setBool:(BOOL)value forKey:(int64_t)key;
-
-/**
- * Removes the entry for the given key.
- *
- * @param aKey Key to be removed from this dictionary.
- **/
-- (void)removeBoolForKey:(int64_t)aKey;
-
-/**
- * Removes all entries in this dictionary.
- **/
-- (void)removeAll;
-
-@end
-
-#pragma mark - Int64 -> Float
-
-/**
- * Class used for map fields of <int64_t, float>
- * values. This performs better than boxing into NSNumbers in NSDictionaries.
- *
- * @note This class is not meant to be subclassed.
- **/
-@interface GPBInt64FloatDictionary : NSObject <NSCopying>
-
-/** Number of entries stored in this dictionary. */
-@property(nonatomic, readonly) NSUInteger count;
-
-/**
- * Initializes this dictionary, copying the given values and keys.
- *
- * @param values      The values to be placed in this dictionary.
- * @param keys        The keys under which to store the values.
- * @param count       The number of elements to copy into the dictionary.
- *
- * @return A newly initialized dictionary with a copy of the values and keys.
- **/
-- (instancetype)initWithFloats:(const float [__nullable])values
-                       forKeys:(const int64_t [__nullable])keys
-                         count:(NSUInteger)count NS_DESIGNATED_INITIALIZER;
-
-/**
- * Initializes this dictionary, copying the entries from the given dictionary.
- *
- * @param dictionary Dictionary containing the entries to add to this dictionary.
- *
- * @return A newly initialized dictionary with the entries of the given dictionary.
- **/
-- (instancetype)initWithDictionary:(GPBInt64FloatDictionary *)dictionary;
-
-/**
- * Initializes this dictionary with the requested capacity.
- *
- * @param numItems Number of items needed for this dictionary.
- *
- * @return A newly initialized dictionary with the requested capacity.
- **/
-- (instancetype)initWithCapacity:(NSUInteger)numItems;
-
-/**
- * Gets the value for the given key.
- *
- * @param value Pointer into which the value will be set, if found.
- * @param key   Key under which the value is stored, if present.
- *
- * @return YES if the key was found and the value was copied, NO otherwise.
- **/
-- (BOOL)getFloat:(nullable float *)value forKey:(int64_t)key;
-
-/**
- * Enumerates the keys and values on this dictionary with the given block.
- *
- * @param block The block to enumerate with.
- *   **key**:        The key for the current entry.
- *   **value**:      The value for the current entry
- *   **stop**:       A pointer to a boolean that when set stops the enumeration.
- **/
-- (void)enumerateKeysAndFloatsUsingBlock:
-    (void (NS_NOESCAPE ^)(int64_t key, float value, BOOL *stop))block;
-
-/**
- * Adds the keys and values from another dictionary.
- *
- * @param otherDictionary Dictionary containing entries to be added to this
- *                        dictionary.
- **/
-- (void)addEntriesFromDictionary:(GPBInt64FloatDictionary *)otherDictionary;
-
-/**
- * Sets the value for the given key.
- *
- * @param value     The value to set.
- * @param key       The key under which to store the value.
- **/
-- (void)setFloat:(float)value forKey:(int64_t)key;
-
-/**
- * Removes the entry for the given key.
- *
- * @param aKey Key to be removed from this dictionary.
- **/
-- (void)removeFloatForKey:(int64_t)aKey;
-
-/**
- * Removes all entries in this dictionary.
- **/
-- (void)removeAll;
-
-@end
-
-#pragma mark - Int64 -> Double
-
-/**
- * Class used for map fields of <int64_t, double>
- * values. This performs better than boxing into NSNumbers in NSDictionaries.
- *
- * @note This class is not meant to be subclassed.
- **/
-@interface GPBInt64DoubleDictionary : NSObject <NSCopying>
-
-/** Number of entries stored in this dictionary. */
-@property(nonatomic, readonly) NSUInteger count;
-
-/**
- * Initializes this dictionary, copying the given values and keys.
- *
- * @param values      The values to be placed in this dictionary.
- * @param keys        The keys under which to store the values.
- * @param count       The number of elements to copy into the dictionary.
- *
- * @return A newly initialized dictionary with a copy of the values and keys.
- **/
-- (instancetype)initWithDoubles:(const double [__nullable])values
-                        forKeys:(const int64_t [__nullable])keys
-                          count:(NSUInteger)count NS_DESIGNATED_INITIALIZER;
-
-/**
- * Initializes this dictionary, copying the entries from the given dictionary.
- *
- * @param dictionary Dictionary containing the entries to add to this dictionary.
- *
- * @return A newly initialized dictionary with the entries of the given dictionary.
- **/
-- (instancetype)initWithDictionary:(GPBInt64DoubleDictionary *)dictionary;
-
-/**
- * Initializes this dictionary with the requested capacity.
- *
- * @param numItems Number of items needed for this dictionary.
- *
- * @return A newly initialized dictionary with the requested capacity.
- **/
-- (instancetype)initWithCapacity:(NSUInteger)numItems;
-
-/**
- * Gets the value for the given key.
- *
- * @param value Pointer into which the value will be set, if found.
- * @param key   Key under which the value is stored, if present.
- *
- * @return YES if the key was found and the value was copied, NO otherwise.
- **/
-- (BOOL)getDouble:(nullable double *)value forKey:(int64_t)key;
-
-/**
- * Enumerates the keys and values on this dictionary with the given block.
- *
- * @param block The block to enumerate with.
- *   **key**:        The key for the current entry.
- *   **value**:      The value for the current entry
- *   **stop**:       A pointer to a boolean that when set stops the enumeration.
- **/
-- (void)enumerateKeysAndDoublesUsingBlock:
-    (void (NS_NOESCAPE ^)(int64_t key, double value, BOOL *stop))block;
-
-/**
- * Adds the keys and values from another dictionary.
- *
- * @param otherDictionary Dictionary containing entries to be added to this
- *                        dictionary.
- **/
-- (void)addEntriesFromDictionary:(GPBInt64DoubleDictionary *)otherDictionary;
-
-/**
- * Sets the value for the given key.
- *
- * @param value     The value to set.
- * @param key       The key under which to store the value.
- **/
-- (void)setDouble:(double)value forKey:(int64_t)key;
-
-/**
- * Removes the entry for the given key.
- *
- * @param aKey Key to be removed from this dictionary.
- **/
-- (void)removeDoubleForKey:(int64_t)aKey;
-
-/**
- * Removes all entries in this dictionary.
- **/
-- (void)removeAll;
-
-@end
-
-#pragma mark - Int64 -> Enum
-
-/**
- * Class used for map fields of <int64_t, int32_t>
- * values. This performs better than boxing into NSNumbers in NSDictionaries.
- *
- * @note This class is not meant to be subclassed.
- **/
-@interface GPBInt64EnumDictionary : NSObject <NSCopying>
-
-/** Number of entries stored in this dictionary. */
-@property(nonatomic, readonly) NSUInteger count;
-/** The validation function to check if the enums are valid. */
-@property(nonatomic, readonly) GPBEnumValidationFunc validationFunc;
-
-/**
- * Initializes a dictionary with the given validation function.
- *
- * @param func The enum validation function for the dictionary.
- *
- * @return A newly initialized dictionary.
- **/
-- (instancetype)initWithValidationFunction:(nullable GPBEnumValidationFunc)func;
-
-/**
- * Initializes a dictionary with the entries given.
- *
- * @param func   The enum validation function for the dictionary.
- * @param values The raw enum values values to be placed in the dictionary.
- * @param keys   The keys under which to store the values.
- * @param count  The number of entries to store in the dictionary.
- *
- * @return A newly initialized dictionary with the keys and values in it.
- **/
-- (instancetype)initWithValidationFunction:(nullable GPBEnumValidationFunc)func
-                                 rawValues:(const int32_t [__nullable])values
-                                   forKeys:(const int64_t [__nullable])keys
-                                     count:(NSUInteger)count NS_DESIGNATED_INITIALIZER;
-
-/**
- * Initializes a dictionary with the entries from the given.
- * dictionary.
- *
- * @param dictionary Dictionary containing the entries to add to the dictionary.
- *
- * @return A newly initialized dictionary with the entries from the given
- *         dictionary in it.
- **/
-- (instancetype)initWithDictionary:(GPBInt64EnumDictionary *)dictionary;
-
-/**
- * Initializes a dictionary with the given capacity.
- *
- * @param func     The enum validation function for the dictionary.
- * @param numItems Capacity needed for the dictionary.
- *
- * @return A newly initialized dictionary with the given capacity.
- **/
-- (instancetype)initWithValidationFunction:(nullable GPBEnumValidationFunc)func
-                                  capacity:(NSUInteger)numItems;
-
-// These will return kGPBUnrecognizedEnumeratorValue if the value for the key
-// is not a valid enumerator as defined by validationFunc. If the actual value is
-// desired, use "raw" version of the method.
-
-/**
- * Gets the value for the given key.
- *
- * @param value Pointer into which the value will be set, if found.
- * @param key   Key under which the value is stored, if present.
- *
- * @return YES if the key was found and the value was copied, NO otherwise.
- **/
-- (BOOL)getEnum:(nullable int32_t *)value forKey:(int64_t)key;
-
-/**
- * Enumerates the keys and values on this dictionary with the given block.
- *
- * @param block The block to enumerate with.
- *   **key**:        The key for the current entry.
- *   **value**:      The value for the current entry
- *   **stop**:       A pointer to a boolean that when set stops the enumeration.
- **/
-- (void)enumerateKeysAndEnumsUsingBlock:
-    (void (NS_NOESCAPE ^)(int64_t key, int32_t value, BOOL *stop))block;
-
-/**
- * Gets the raw enum value for the given key.
- *
- * @note This method bypass the validationFunc to enable the access of values that
- *       were not known at the time the binary was compiled.
- *
- * @param rawValue Pointer into which the value will be set, if found.
- * @param key      Key under which the value is stored, if present.
- *
- * @return YES if the key was found and the value was copied, NO otherwise.
- **/
-- (BOOL)getRawValue:(nullable int32_t *)rawValue forKey:(int64_t)key;
-
-/**
- * Enumerates the keys and values on this dictionary with the given block.
- *
- * @note This method bypass the validationFunc to enable the access of values that
- *       were not known at the time the binary was compiled.
- *
- * @param block The block to enumerate with.
- *   **key**:      The key for the current entry.
- *   **rawValue**: The value for the current entry
- *   **stop**:     A pointer to a boolean that when set stops the enumeration.
- **/
-- (void)enumerateKeysAndRawValuesUsingBlock:
-    (void (NS_NOESCAPE ^)(int64_t key, int32_t rawValue, BOOL *stop))block;
-
-/**
- * Adds the keys and raw enum values from another dictionary.
- *
- * @note This method bypass the validationFunc to enable the setting of values that
- *       were not known at the time the binary was compiled.
- *
- * @param otherDictionary Dictionary containing entries to be added to this
- *                        dictionary.
- **/
-- (void)addRawEntriesFromDictionary:(GPBInt64EnumDictionary *)otherDictionary;
-
-// If value is not a valid enumerator as defined by validationFunc, these
-// methods will assert in debug, and will log in release and assign the value
-// to the default value. Use the rawValue methods below to assign non enumerator
-// values.
-
-/**
- * Sets the value for the given key.
- *
- * @param value     The value to set.
- * @param key       The key under which to store the value.
- **/
-- (void)setEnum:(int32_t)value forKey:(int64_t)key;
-
-/**
- * Sets the raw enum value for the given key.
- *
- * @note This method bypass the validationFunc to enable the setting of values that
- *       were not known at the time the binary was compiled.
- *
- * @param rawValue The raw enum value to set.
- * @param key      The key under which to store the raw enum value.
- **/
-- (void)setRawValue:(int32_t)rawValue forKey:(int64_t)key;
-
-/**
- * Removes the entry for the given key.
- *
- * @param aKey Key to be removed from this dictionary.
- **/
-- (void)removeEnumForKey:(int64_t)aKey;
-
-/**
- * Removes all entries in this dictionary.
- **/
-- (void)removeAll;
-
-@end
-
-#pragma mark - Int64 -> Object
-
-/**
- * Class used for map fields of <int64_t, ObjectType>
- * values. This performs better than boxing into NSNumbers in NSDictionaries.
- *
- * @note This class is not meant to be subclassed.
- **/
-@interface GPBInt64ObjectDictionary<__covariant ObjectType> : NSObject <NSCopying>
-
-/** Number of entries stored in this dictionary. */
-@property(nonatomic, readonly) NSUInteger count;
-
-/**
- * Initializes this dictionary, copying the given values and keys.
- *
- * @param objects      The values to be placed in this dictionary.
- * @param keys         The keys under which to store the values.
- * @param count        The number of elements to copy into the dictionary.
- *
- * @return A newly initialized dictionary with a copy of the values and keys.
- **/
-- (instancetype)initWithObjects:(const ObjectType __nonnull GPB_UNSAFE_UNRETAINED [__nullable])objects
-                        forKeys:(const int64_t [__nullable])keys
-                          count:(NSUInteger)count NS_DESIGNATED_INITIALIZER;
-
-/**
- * Initializes this dictionary, copying the entries from the given dictionary.
- *
- * @param dictionary Dictionary containing the entries to add to this dictionary.
- *
- * @return A newly initialized dictionary with the entries of the given dictionary.
- **/
-- (instancetype)initWithDictionary:(GPBInt64ObjectDictionary *)dictionary;
-
-/**
- * Initializes this dictionary with the requested capacity.
- *
- * @param numItems Number of items needed for this dictionary.
- *
- * @return A newly initialized dictionary with the requested capacity.
- **/
-- (instancetype)initWithCapacity:(NSUInteger)numItems;
-
-/**
- * Fetches the object stored under the given key.
- *
- * @param key Key under which the value is stored, if present.
- *
- * @return The object if found, nil otherwise.
- **/
-- (ObjectType)objectForKey:(int64_t)key;
-
-/**
- * Enumerates the keys and values on this dictionary with the given block.
- *
- * @param block The block to enumerate with.
- *   **key**:         The key for the current entry.
- *   **object**:      The value for the current entry
- *   **stop**:        A pointer to a boolean that when set stops the enumeration.
- **/
-- (void)enumerateKeysAndObjectsUsingBlock:
-    (void (NS_NOESCAPE ^)(int64_t key, ObjectType object, BOOL *stop))block;
-
-/**
- * Adds the keys and values from another dictionary.
- *
- * @param otherDictionary Dictionary containing entries to be added to this
- *                        dictionary.
- **/
-- (void)addEntriesFromDictionary:(GPBInt64ObjectDictionary *)otherDictionary;
-
-/**
- * Sets the value for the given key.
- *
- * @param object     The value to set.
- * @param key        The key under which to store the value.
- **/
-- (void)setObject:(ObjectType)object forKey:(int64_t)key;
-
-/**
- * Removes the entry for the given key.
- *
- * @param aKey Key to be removed from this dictionary.
- **/
-- (void)removeObjectForKey:(int64_t)aKey;
-
-/**
- * Removes all entries in this dictionary.
- **/
-- (void)removeAll;
-
-@end
-
-#pragma mark - Bool -> UInt32
-
-/**
- * Class used for map fields of <BOOL, uint32_t>
- * values. This performs better than boxing into NSNumbers in NSDictionaries.
- *
- * @note This class is not meant to be subclassed.
- **/
-@interface GPBBoolUInt32Dictionary : NSObject <NSCopying>
-
-/** Number of entries stored in this dictionary. */
-@property(nonatomic, readonly) NSUInteger count;
-
-/**
- * Initializes this dictionary, copying the given values and keys.
- *
- * @param values      The values to be placed in this dictionary.
- * @param keys        The keys under which to store the values.
- * @param count       The number of elements to copy into the dictionary.
- *
- * @return A newly initialized dictionary with a copy of the values and keys.
- **/
-- (instancetype)initWithUInt32s:(const uint32_t [__nullable])values
-                        forKeys:(const BOOL [__nullable])keys
-                          count:(NSUInteger)count NS_DESIGNATED_INITIALIZER;
-
-/**
- * Initializes this dictionary, copying the entries from the given dictionary.
- *
- * @param dictionary Dictionary containing the entries to add to this dictionary.
- *
- * @return A newly initialized dictionary with the entries of the given dictionary.
- **/
-- (instancetype)initWithDictionary:(GPBBoolUInt32Dictionary *)dictionary;
-
-/**
- * Initializes this dictionary with the requested capacity.
- *
- * @param numItems Number of items needed for this dictionary.
- *
- * @return A newly initialized dictionary with the requested capacity.
- **/
-- (instancetype)initWithCapacity:(NSUInteger)numItems;
-
-/**
- * Gets the value for the given key.
- *
- * @param value Pointer into which the value will be set, if found.
- * @param key   Key under which the value is stored, if present.
- *
- * @return YES if the key was found and the value was copied, NO otherwise.
- **/
-- (BOOL)getUInt32:(nullable uint32_t *)value forKey:(BOOL)key;
-
-/**
- * Enumerates the keys and values on this dictionary with the given block.
- *
- * @param block The block to enumerate with.
- *   **key**:        The key for the current entry.
- *   **value**:      The value for the current entry
- *   **stop**:       A pointer to a boolean that when set stops the enumeration.
- **/
-- (void)enumerateKeysAndUInt32sUsingBlock:
-    (void (NS_NOESCAPE ^)(BOOL key, uint32_t value, BOOL *stop))block;
-
-/**
- * Adds the keys and values from another dictionary.
- *
- * @param otherDictionary Dictionary containing entries to be added to this
- *                        dictionary.
- **/
-- (void)addEntriesFromDictionary:(GPBBoolUInt32Dictionary *)otherDictionary;
-
-/**
- * Sets the value for the given key.
- *
- * @param value     The value to set.
- * @param key       The key under which to store the value.
- **/
-- (void)setUInt32:(uint32_t)value forKey:(BOOL)key;
-
-/**
- * Removes the entry for the given key.
- *
- * @param aKey Key to be removed from this dictionary.
- **/
-- (void)removeUInt32ForKey:(BOOL)aKey;
-
-/**
- * Removes all entries in this dictionary.
- **/
-- (void)removeAll;
-
-@end
-
-#pragma mark - Bool -> Int32
-
-/**
- * Class used for map fields of <BOOL, int32_t>
- * values. This performs better than boxing into NSNumbers in NSDictionaries.
- *
- * @note This class is not meant to be subclassed.
- **/
-@interface GPBBoolInt32Dictionary : NSObject <NSCopying>
-
-/** Number of entries stored in this dictionary. */
-@property(nonatomic, readonly) NSUInteger count;
-
-/**
- * Initializes this dictionary, copying the given values and keys.
- *
- * @param values      The values to be placed in this dictionary.
- * @param keys        The keys under which to store the values.
- * @param count       The number of elements to copy into the dictionary.
- *
- * @return A newly initialized dictionary with a copy of the values and keys.
- **/
-- (instancetype)initWithInt32s:(const int32_t [__nullable])values
-                       forKeys:(const BOOL [__nullable])keys
-                         count:(NSUInteger)count NS_DESIGNATED_INITIALIZER;
-
-/**
- * Initializes this dictionary, copying the entries from the given dictionary.
- *
- * @param dictionary Dictionary containing the entries to add to this dictionary.
- *
- * @return A newly initialized dictionary with the entries of the given dictionary.
- **/
-- (instancetype)initWithDictionary:(GPBBoolInt32Dictionary *)dictionary;
-
-/**
- * Initializes this dictionary with the requested capacity.
- *
- * @param numItems Number of items needed for this dictionary.
- *
- * @return A newly initialized dictionary with the requested capacity.
- **/
-- (instancetype)initWithCapacity:(NSUInteger)numItems;
-
-/**
- * Gets the value for the given key.
- *
- * @param value Pointer into which the value will be set, if found.
- * @param key   Key under which the value is stored, if present.
- *
- * @return YES if the key was found and the value was copied, NO otherwise.
- **/
-- (BOOL)getInt32:(nullable int32_t *)value forKey:(BOOL)key;
-
-/**
- * Enumerates the keys and values on this dictionary with the given block.
- *
- * @param block The block to enumerate with.
- *   **key**:        The key for the current entry.
- *   **value**:      The value for the current entry
- *   **stop**:       A pointer to a boolean that when set stops the enumeration.
- **/
-- (void)enumerateKeysAndInt32sUsingBlock:
-    (void (NS_NOESCAPE ^)(BOOL key, int32_t value, BOOL *stop))block;
-
-/**
- * Adds the keys and values from another dictionary.
- *
- * @param otherDictionary Dictionary containing entries to be added to this
- *                        dictionary.
- **/
-- (void)addEntriesFromDictionary:(GPBBoolInt32Dictionary *)otherDictionary;
-
-/**
- * Sets the value for the given key.
- *
- * @param value     The value to set.
- * @param key       The key under which to store the value.
- **/
-- (void)setInt32:(int32_t)value forKey:(BOOL)key;
-
-/**
- * Removes the entry for the given key.
- *
- * @param aKey Key to be removed from this dictionary.
- **/
-- (void)removeInt32ForKey:(BOOL)aKey;
-
-/**
- * Removes all entries in this dictionary.
- **/
-- (void)removeAll;
-
-@end
-
-#pragma mark - Bool -> UInt64
-
-/**
- * Class used for map fields of <BOOL, uint64_t>
- * values. This performs better than boxing into NSNumbers in NSDictionaries.
- *
- * @note This class is not meant to be subclassed.
- **/
-@interface GPBBoolUInt64Dictionary : NSObject <NSCopying>
-
-/** Number of entries stored in this dictionary. */
-@property(nonatomic, readonly) NSUInteger count;
-
-/**
- * Initializes this dictionary, copying the given values and keys.
- *
- * @param values      The values to be placed in this dictionary.
- * @param keys        The keys under which to store the values.
- * @param count       The number of elements to copy into the dictionary.
- *
- * @return A newly initialized dictionary with a copy of the values and keys.
- **/
-- (instancetype)initWithUInt64s:(const uint64_t [__nullable])values
-                        forKeys:(const BOOL [__nullable])keys
-                          count:(NSUInteger)count NS_DESIGNATED_INITIALIZER;
-
-/**
- * Initializes this dictionary, copying the entries from the given dictionary.
- *
- * @param dictionary Dictionary containing the entries to add to this dictionary.
- *
- * @return A newly initialized dictionary with the entries of the given dictionary.
- **/
-- (instancetype)initWithDictionary:(GPBBoolUInt64Dictionary *)dictionary;
-
-/**
- * Initializes this dictionary with the requested capacity.
- *
- * @param numItems Number of items needed for this dictionary.
- *
- * @return A newly initialized dictionary with the requested capacity.
- **/
-- (instancetype)initWithCapacity:(NSUInteger)numItems;
-
-/**
- * Gets the value for the given key.
- *
- * @param value Pointer into which the value will be set, if found.
- * @param key   Key under which the value is stored, if present.
- *
- * @return YES if the key was found and the value was copied, NO otherwise.
- **/
-- (BOOL)getUInt64:(nullable uint64_t *)value forKey:(BOOL)key;
-
-/**
- * Enumerates the keys and values on this dictionary with the given block.
- *
- * @param block The block to enumerate with.
- *   **key**:        The key for the current entry.
- *   **value**:      The value for the current entry
- *   **stop**:       A pointer to a boolean that when set stops the enumeration.
- **/
-- (void)enumerateKeysAndUInt64sUsingBlock:
-    (void (NS_NOESCAPE ^)(BOOL key, uint64_t value, BOOL *stop))block;
-
-/**
- * Adds the keys and values from another dictionary.
- *
- * @param otherDictionary Dictionary containing entries to be added to this
- *                        dictionary.
- **/
-- (void)addEntriesFromDictionary:(GPBBoolUInt64Dictionary *)otherDictionary;
-
-/**
- * Sets the value for the given key.
- *
- * @param value     The value to set.
- * @param key       The key under which to store the value.
- **/
-- (void)setUInt64:(uint64_t)value forKey:(BOOL)key;
-
-/**
- * Removes the entry for the given key.
- *
- * @param aKey Key to be removed from this dictionary.
- **/
-- (void)removeUInt64ForKey:(BOOL)aKey;
-
-/**
- * Removes all entries in this dictionary.
- **/
-- (void)removeAll;
-
-@end
-
-#pragma mark - Bool -> Int64
-
-/**
- * Class used for map fields of <BOOL, int64_t>
- * values. This performs better than boxing into NSNumbers in NSDictionaries.
- *
- * @note This class is not meant to be subclassed.
- **/
-@interface GPBBoolInt64Dictionary : NSObject <NSCopying>
-
-/** Number of entries stored in this dictionary. */
-@property(nonatomic, readonly) NSUInteger count;
-
-/**
- * Initializes this dictionary, copying the given values and keys.
- *
- * @param values      The values to be placed in this dictionary.
- * @param keys        The keys under which to store the values.
- * @param count       The number of elements to copy into the dictionary.
- *
- * @return A newly initialized dictionary with a copy of the values and keys.
- **/
-- (instancetype)initWithInt64s:(const int64_t [__nullable])values
-                       forKeys:(const BOOL [__nullable])keys
-                         count:(NSUInteger)count NS_DESIGNATED_INITIALIZER;
-
-/**
- * Initializes this dictionary, copying the entries from the given dictionary.
- *
- * @param dictionary Dictionary containing the entries to add to this dictionary.
- *
- * @return A newly initialized dictionary with the entries of the given dictionary.
- **/
-- (instancetype)initWithDictionary:(GPBBoolInt64Dictionary *)dictionary;
-
-/**
- * Initializes this dictionary with the requested capacity.
- *
- * @param numItems Number of items needed for this dictionary.
- *
- * @return A newly initialized dictionary with the requested capacity.
- **/
-- (instancetype)initWithCapacity:(NSUInteger)numItems;
-
-/**
- * Gets the value for the given key.
- *
- * @param value Pointer into which the value will be set, if found.
- * @param key   Key under which the value is stored, if present.
- *
- * @return YES if the key was found and the value was copied, NO otherwise.
- **/
-- (BOOL)getInt64:(nullable int64_t *)value forKey:(BOOL)key;
-
-/**
- * Enumerates the keys and values on this dictionary with the given block.
- *
- * @param block The block to enumerate with.
- *   **key**:        The key for the current entry.
- *   **value**:      The value for the current entry
- *   **stop**:       A pointer to a boolean that when set stops the enumeration.
- **/
-- (void)enumerateKeysAndInt64sUsingBlock:
-    (void (NS_NOESCAPE ^)(BOOL key, int64_t value, BOOL *stop))block;
-
-/**
- * Adds the keys and values from another dictionary.
- *
- * @param otherDictionary Dictionary containing entries to be added to this
- *                        dictionary.
- **/
-- (void)addEntriesFromDictionary:(GPBBoolInt64Dictionary *)otherDictionary;
-
-/**
- * Sets the value for the given key.
- *
- * @param value     The value to set.
- * @param key       The key under which to store the value.
- **/
-- (void)setInt64:(int64_t)value forKey:(BOOL)key;
-
-/**
- * Removes the entry for the given key.
- *
- * @param aKey Key to be removed from this dictionary.
- **/
-- (void)removeInt64ForKey:(BOOL)aKey;
-
-/**
- * Removes all entries in this dictionary.
- **/
-- (void)removeAll;
-
-@end
-
-#pragma mark - Bool -> Bool
-
-/**
- * Class used for map fields of <BOOL, BOOL>
- * values. This performs better than boxing into NSNumbers in NSDictionaries.
- *
- * @note This class is not meant to be subclassed.
- **/
-@interface GPBBoolBoolDictionary : NSObject <NSCopying>
-
-/** Number of entries stored in this dictionary. */
-@property(nonatomic, readonly) NSUInteger count;
-
-/**
- * Initializes this dictionary, copying the given values and keys.
- *
- * @param values      The values to be placed in this dictionary.
- * @param keys        The keys under which to store the values.
- * @param count       The number of elements to copy into the dictionary.
- *
- * @return A newly initialized dictionary with a copy of the values and keys.
- **/
-- (instancetype)initWithBools:(const BOOL [__nullable])values
-                      forKeys:(const BOOL [__nullable])keys
-                        count:(NSUInteger)count NS_DESIGNATED_INITIALIZER;
-
-/**
- * Initializes this dictionary, copying the entries from the given dictionary.
- *
- * @param dictionary Dictionary containing the entries to add to this dictionary.
- *
- * @return A newly initialized dictionary with the entries of the given dictionary.
- **/
-- (instancetype)initWithDictionary:(GPBBoolBoolDictionary *)dictionary;
-
-/**
- * Initializes this dictionary with the requested capacity.
- *
- * @param numItems Number of items needed for this dictionary.
- *
- * @return A newly initialized dictionary with the requested capacity.
- **/
-- (instancetype)initWithCapacity:(NSUInteger)numItems;
-
-/**
- * Gets the value for the given key.
- *
- * @param value Pointer into which the value will be set, if found.
- * @param key   Key under which the value is stored, if present.
- *
- * @return YES if the key was found and the value was copied, NO otherwise.
- **/
-- (BOOL)getBool:(nullable BOOL *)value forKey:(BOOL)key;
-
-/**
- * Enumerates the keys and values on this dictionary with the given block.
- *
- * @param block The block to enumerate with.
- *   **key**:        The key for the current entry.
- *   **value**:      The value for the current entry
- *   **stop**:       A pointer to a boolean that when set stops the enumeration.
- **/
-- (void)enumerateKeysAndBoolsUsingBlock:
-    (void (NS_NOESCAPE ^)(BOOL key, BOOL value, BOOL *stop))block;
-
-/**
- * Adds the keys and values from another dictionary.
- *
- * @param otherDictionary Dictionary containing entries to be added to this
- *                        dictionary.
- **/
-- (void)addEntriesFromDictionary:(GPBBoolBoolDictionary *)otherDictionary;
-
-/**
- * Sets the value for the given key.
- *
- * @param value     The value to set.
- * @param key       The key under which to store the value.
- **/
-- (void)setBool:(BOOL)value forKey:(BOOL)key;
-
-/**
- * Removes the entry for the given key.
- *
- * @param aKey Key to be removed from this dictionary.
- **/
-- (void)removeBoolForKey:(BOOL)aKey;
-
-/**
- * Removes all entries in this dictionary.
- **/
-- (void)removeAll;
-
-@end
-
-#pragma mark - Bool -> Float
-
-/**
- * Class used for map fields of <BOOL, float>
- * values. This performs better than boxing into NSNumbers in NSDictionaries.
- *
- * @note This class is not meant to be subclassed.
- **/
-@interface GPBBoolFloatDictionary : NSObject <NSCopying>
-
-/** Number of entries stored in this dictionary. */
-@property(nonatomic, readonly) NSUInteger count;
-
-/**
- * Initializes this dictionary, copying the given values and keys.
- *
- * @param values      The values to be placed in this dictionary.
- * @param keys        The keys under which to store the values.
- * @param count       The number of elements to copy into the dictionary.
- *
- * @return A newly initialized dictionary with a copy of the values and keys.
- **/
-- (instancetype)initWithFloats:(const float [__nullable])values
-                       forKeys:(const BOOL [__nullable])keys
-                         count:(NSUInteger)count NS_DESIGNATED_INITIALIZER;
-
-/**
- * Initializes this dictionary, copying the entries from the given dictionary.
- *
- * @param dictionary Dictionary containing the entries to add to this dictionary.
- *
- * @return A newly initialized dictionary with the entries of the given dictionary.
- **/
-- (instancetype)initWithDictionary:(GPBBoolFloatDictionary *)dictionary;
-
-/**
- * Initializes this dictionary with the requested capacity.
- *
- * @param numItems Number of items needed for this dictionary.
- *
- * @return A newly initialized dictionary with the requested capacity.
- **/
-- (instancetype)initWithCapacity:(NSUInteger)numItems;
-
-/**
- * Gets the value for the given key.
- *
- * @param value Pointer into which the value will be set, if found.
- * @param key   Key under which the value is stored, if present.
- *
- * @return YES if the key was found and the value was copied, NO otherwise.
- **/
-- (BOOL)getFloat:(nullable float *)value forKey:(BOOL)key;
-
-/**
- * Enumerates the keys and values on this dictionary with the given block.
- *
- * @param block The block to enumerate with.
- *   **key**:        The key for the current entry.
- *   **value**:      The value for the current entry
- *   **stop**:       A pointer to a boolean that when set stops the enumeration.
- **/
-- (void)enumerateKeysAndFloatsUsingBlock:
-    (void (NS_NOESCAPE ^)(BOOL key, float value, BOOL *stop))block;
-
-/**
- * Adds the keys and values from another dictionary.
- *
- * @param otherDictionary Dictionary containing entries to be added to this
- *                        dictionary.
- **/
-- (void)addEntriesFromDictionary:(GPBBoolFloatDictionary *)otherDictionary;
-
-/**
- * Sets the value for the given key.
- *
- * @param value     The value to set.
- * @param key       The key under which to store the value.
- **/
-- (void)setFloat:(float)value forKey:(BOOL)key;
-
-/**
- * Removes the entry for the given key.
- *
- * @param aKey Key to be removed from this dictionary.
- **/
-- (void)removeFloatForKey:(BOOL)aKey;
-
-/**
- * Removes all entries in this dictionary.
- **/
-- (void)removeAll;
-
-@end
-
-#pragma mark - Bool -> Double
-
-/**
- * Class used for map fields of <BOOL, double>
- * values. This performs better than boxing into NSNumbers in NSDictionaries.
- *
- * @note This class is not meant to be subclassed.
- **/
-@interface GPBBoolDoubleDictionary : NSObject <NSCopying>
-
-/** Number of entries stored in this dictionary. */
-@property(nonatomic, readonly) NSUInteger count;
-
-/**
- * Initializes this dictionary, copying the given values and keys.
- *
- * @param values      The values to be placed in this dictionary.
- * @param keys        The keys under which to store the values.
- * @param count       The number of elements to copy into the dictionary.
- *
- * @return A newly initialized dictionary with a copy of the values and keys.
- **/
-- (instancetype)initWithDoubles:(const double [__nullable])values
-                        forKeys:(const BOOL [__nullable])keys
-                          count:(NSUInteger)count NS_DESIGNATED_INITIALIZER;
-
-/**
- * Initializes this dictionary, copying the entries from the given dictionary.
- *
- * @param dictionary Dictionary containing the entries to add to this dictionary.
- *
- * @return A newly initialized dictionary with the entries of the given dictionary.
- **/
-- (instancetype)initWithDictionary:(GPBBoolDoubleDictionary *)dictionary;
-
-/**
- * Initializes this dictionary with the requested capacity.
- *
- * @param numItems Number of items needed for this dictionary.
- *
- * @return A newly initialized dictionary with the requested capacity.
- **/
-- (instancetype)initWithCapacity:(NSUInteger)numItems;
-
-/**
- * Gets the value for the given key.
- *
- * @param value Pointer into which the value will be set, if found.
- * @param key   Key under which the value is stored, if present.
- *
- * @return YES if the key was found and the value was copied, NO otherwise.
- **/
-- (BOOL)getDouble:(nullable double *)value forKey:(BOOL)key;
-
-/**
- * Enumerates the keys and values on this dictionary with the given block.
- *
- * @param block The block to enumerate with.
- *   **key**:        The key for the current entry.
- *   **value**:      The value for the current entry
- *   **stop**:       A pointer to a boolean that when set stops the enumeration.
- **/
-- (void)enumerateKeysAndDoublesUsingBlock:
-    (void (NS_NOESCAPE ^)(BOOL key, double value, BOOL *stop))block;
-
-/**
- * Adds the keys and values from another dictionary.
- *
- * @param otherDictionary Dictionary containing entries to be added to this
- *                        dictionary.
- **/
-- (void)addEntriesFromDictionary:(GPBBoolDoubleDictionary *)otherDictionary;
-
-/**
- * Sets the value for the given key.
- *
- * @param value     The value to set.
- * @param key       The key under which to store the value.
- **/
-- (void)setDouble:(double)value forKey:(BOOL)key;
-
-/**
- * Removes the entry for the given key.
- *
- * @param aKey Key to be removed from this dictionary.
- **/
-- (void)removeDoubleForKey:(BOOL)aKey;
-
-/**
- * Removes all entries in this dictionary.
- **/
-- (void)removeAll;
-
-@end
-
-#pragma mark - Bool -> Enum
-
-/**
- * Class used for map fields of <BOOL, int32_t>
- * values. This performs better than boxing into NSNumbers in NSDictionaries.
- *
- * @note This class is not meant to be subclassed.
- **/
-@interface GPBBoolEnumDictionary : NSObject <NSCopying>
-
-/** Number of entries stored in this dictionary. */
-@property(nonatomic, readonly) NSUInteger count;
-/** The validation function to check if the enums are valid. */
-@property(nonatomic, readonly) GPBEnumValidationFunc validationFunc;
-
-/**
- * Initializes a dictionary with the given validation function.
- *
- * @param func The enum validation function for the dictionary.
- *
- * @return A newly initialized dictionary.
- **/
-- (instancetype)initWithValidationFunction:(nullable GPBEnumValidationFunc)func;
-
-/**
- * Initializes a dictionary with the entries given.
- *
- * @param func   The enum validation function for the dictionary.
- * @param values The raw enum values values to be placed in the dictionary.
- * @param keys   The keys under which to store the values.
- * @param count  The number of entries to store in the dictionary.
- *
- * @return A newly initialized dictionary with the keys and values in it.
- **/
-- (instancetype)initWithValidationFunction:(nullable GPBEnumValidationFunc)func
-                                 rawValues:(const int32_t [__nullable])values
-                                   forKeys:(const BOOL [__nullable])keys
-                                     count:(NSUInteger)count NS_DESIGNATED_INITIALIZER;
-
-/**
- * Initializes a dictionary with the entries from the given.
- * dictionary.
- *
- * @param dictionary Dictionary containing the entries to add to the dictionary.
- *
- * @return A newly initialized dictionary with the entries from the given
- *         dictionary in it.
- **/
-- (instancetype)initWithDictionary:(GPBBoolEnumDictionary *)dictionary;
-
-/**
- * Initializes a dictionary with the given capacity.
- *
- * @param func     The enum validation function for the dictionary.
- * @param numItems Capacity needed for the dictionary.
- *
- * @return A newly initialized dictionary with the given capacity.
- **/
-- (instancetype)initWithValidationFunction:(nullable GPBEnumValidationFunc)func
-                                  capacity:(NSUInteger)numItems;
-
-// These will return kGPBUnrecognizedEnumeratorValue if the value for the key
-// is not a valid enumerator as defined by validationFunc. If the actual value is
-// desired, use "raw" version of the method.
-
-/**
- * Gets the value for the given key.
- *
- * @param value Pointer into which the value will be set, if found.
- * @param key   Key under which the value is stored, if present.
- *
- * @return YES if the key was found and the value was copied, NO otherwise.
- **/
-- (BOOL)getEnum:(nullable int32_t *)value forKey:(BOOL)key;
-
-/**
- * Enumerates the keys and values on this dictionary with the given block.
- *
- * @param block The block to enumerate with.
- *   **key**:        The key for the current entry.
- *   **value**:      The value for the current entry
- *   **stop**:       A pointer to a boolean that when set stops the enumeration.
- **/
-- (void)enumerateKeysAndEnumsUsingBlock:
-    (void (NS_NOESCAPE ^)(BOOL key, int32_t value, BOOL *stop))block;
-
-/**
- * Gets the raw enum value for the given key.
- *
- * @note This method bypass the validationFunc to enable the access of values that
- *       were not known at the time the binary was compiled.
- *
- * @param rawValue Pointer into which the value will be set, if found.
- * @param key      Key under which the value is stored, if present.
- *
- * @return YES if the key was found and the value was copied, NO otherwise.
- **/
-- (BOOL)getRawValue:(nullable int32_t *)rawValue forKey:(BOOL)key;
-
-/**
- * Enumerates the keys and values on this dictionary with the given block.
- *
- * @note This method bypass the validationFunc to enable the access of values that
- *       were not known at the time the binary was compiled.
- *
- * @param block The block to enumerate with.
- *   **key**:      The key for the current entry.
- *   **rawValue**: The value for the current entry
- *   **stop**:     A pointer to a boolean that when set stops the enumeration.
- **/
-- (void)enumerateKeysAndRawValuesUsingBlock:
-    (void (NS_NOESCAPE ^)(BOOL key, int32_t rawValue, BOOL *stop))block;
-
-/**
- * Adds the keys and raw enum values from another dictionary.
- *
- * @note This method bypass the validationFunc to enable the setting of values that
- *       were not known at the time the binary was compiled.
- *
- * @param otherDictionary Dictionary containing entries to be added to this
- *                        dictionary.
- **/
-- (void)addRawEntriesFromDictionary:(GPBBoolEnumDictionary *)otherDictionary;
-
-// If value is not a valid enumerator as defined by validationFunc, these
-// methods will assert in debug, and will log in release and assign the value
-// to the default value. Use the rawValue methods below to assign non enumerator
-// values.
-
-/**
- * Sets the value for the given key.
- *
- * @param value     The value to set.
- * @param key       The key under which to store the value.
- **/
-- (void)setEnum:(int32_t)value forKey:(BOOL)key;
-
-/**
- * Sets the raw enum value for the given key.
- *
- * @note This method bypass the validationFunc to enable the setting of values that
- *       were not known at the time the binary was compiled.
- *
- * @param rawValue The raw enum value to set.
- * @param key      The key under which to store the raw enum value.
- **/
-- (void)setRawValue:(int32_t)rawValue forKey:(BOOL)key;
-
-/**
- * Removes the entry for the given key.
- *
- * @param aKey Key to be removed from this dictionary.
- **/
-- (void)removeEnumForKey:(BOOL)aKey;
-
-/**
- * Removes all entries in this dictionary.
- **/
-- (void)removeAll;
-
-@end
-
-#pragma mark - Bool -> Object
-
-/**
- * Class used for map fields of <BOOL, ObjectType>
- * values. This performs better than boxing into NSNumbers in NSDictionaries.
- *
- * @note This class is not meant to be subclassed.
- **/
-@interface GPBBoolObjectDictionary<__covariant ObjectType> : NSObject <NSCopying>
-
-/** Number of entries stored in this dictionary. */
-@property(nonatomic, readonly) NSUInteger count;
-
-/**
- * Initializes this dictionary, copying the given values and keys.
- *
- * @param objects      The values to be placed in this dictionary.
- * @param keys         The keys under which to store the values.
- * @param count        The number of elements to copy into the dictionary.
- *
- * @return A newly initialized dictionary with a copy of the values and keys.
- **/
-- (instancetype)initWithObjects:(const ObjectType __nonnull GPB_UNSAFE_UNRETAINED [__nullable])objects
-                        forKeys:(const BOOL [__nullable])keys
-                          count:(NSUInteger)count NS_DESIGNATED_INITIALIZER;
-
-/**
- * Initializes this dictionary, copying the entries from the given dictionary.
- *
- * @param dictionary Dictionary containing the entries to add to this dictionary.
- *
- * @return A newly initialized dictionary with the entries of the given dictionary.
- **/
-- (instancetype)initWithDictionary:(GPBBoolObjectDictionary *)dictionary;
-
-/**
- * Initializes this dictionary with the requested capacity.
- *
- * @param numItems Number of items needed for this dictionary.
- *
- * @return A newly initialized dictionary with the requested capacity.
- **/
-- (instancetype)initWithCapacity:(NSUInteger)numItems;
-
-/**
- * Fetches the object stored under the given key.
- *
- * @param key Key under which the value is stored, if present.
- *
- * @return The object if found, nil otherwise.
- **/
-- (ObjectType)objectForKey:(BOOL)key;
-
-/**
- * Enumerates the keys and values on this dictionary with the given block.
- *
- * @param block The block to enumerate with.
- *   **key**:         The key for the current entry.
- *   **object**:      The value for the current entry
- *   **stop**:        A pointer to a boolean that when set stops the enumeration.
- **/
-- (void)enumerateKeysAndObjectsUsingBlock:
-    (void (NS_NOESCAPE ^)(BOOL key, ObjectType object, BOOL *stop))block;
-
-/**
- * Adds the keys and values from another dictionary.
- *
- * @param otherDictionary Dictionary containing entries to be added to this
- *                        dictionary.
- **/
-- (void)addEntriesFromDictionary:(GPBBoolObjectDictionary *)otherDictionary;
-
-/**
- * Sets the value for the given key.
- *
- * @param object     The value to set.
- * @param key        The key under which to store the value.
- **/
-- (void)setObject:(ObjectType)object forKey:(BOOL)key;
-
-/**
- * Removes the entry for the given key.
- *
- * @param aKey Key to be removed from this dictionary.
- **/
-- (void)removeObjectForKey:(BOOL)aKey;
-
-/**
- * Removes all entries in this dictionary.
- **/
-- (void)removeAll;
-
-@end
-
-#pragma mark - String -> UInt32
-
-/**
- * Class used for map fields of <NSString, uint32_t>
- * values. This performs better than boxing into NSNumbers in NSDictionaries.
- *
- * @note This class is not meant to be subclassed.
- **/
-@interface GPBStringUInt32Dictionary : NSObject <NSCopying>
-
-/** Number of entries stored in this dictionary. */
-@property(nonatomic, readonly) NSUInteger count;
-
-/**
- * Initializes this dictionary, copying the given values and keys.
- *
- * @param values      The values to be placed in this dictionary.
- * @param keys        The keys under which to store the values.
- * @param count       The number of elements to copy into the dictionary.
- *
- * @return A newly initialized dictionary with a copy of the values and keys.
- **/
-- (instancetype)initWithUInt32s:(const uint32_t [__nullable])values
-                        forKeys:(const NSString * __nonnull GPB_UNSAFE_UNRETAINED [__nullable])keys
-                          count:(NSUInteger)count NS_DESIGNATED_INITIALIZER;
-
-/**
- * Initializes this dictionary, copying the entries from the given dictionary.
- *
- * @param dictionary Dictionary containing the entries to add to this dictionary.
- *
- * @return A newly initialized dictionary with the entries of the given dictionary.
- **/
-- (instancetype)initWithDictionary:(GPBStringUInt32Dictionary *)dictionary;
-
-/**
- * Initializes this dictionary with the requested capacity.
- *
- * @param numItems Number of items needed for this dictionary.
- *
- * @return A newly initialized dictionary with the requested capacity.
- **/
-- (instancetype)initWithCapacity:(NSUInteger)numItems;
-
-/**
- * Gets the value for the given key.
- *
- * @param value Pointer into which the value will be set, if found.
- * @param key   Key under which the value is stored, if present.
- *
- * @return YES if the key was found and the value was copied, NO otherwise.
- **/
-- (BOOL)getUInt32:(nullable uint32_t *)value forKey:(NSString *)key;
-
-/**
- * Enumerates the keys and values on this dictionary with the given block.
- *
- * @param block The block to enumerate with.
- *   **key**:        The key for the current entry.
- *   **value**:      The value for the current entry
- *   **stop**:       A pointer to a boolean that when set stops the enumeration.
- **/
-- (void)enumerateKeysAndUInt32sUsingBlock:
-    (void (NS_NOESCAPE ^)(NSString *key, uint32_t value, BOOL *stop))block;
-
-/**
- * Adds the keys and values from another dictionary.
- *
- * @param otherDictionary Dictionary containing entries to be added to this
- *                        dictionary.
- **/
-- (void)addEntriesFromDictionary:(GPBStringUInt32Dictionary *)otherDictionary;
-
-/**
- * Sets the value for the given key.
- *
- * @param value     The value to set.
- * @param key       The key under which to store the value.
- **/
-- (void)setUInt32:(uint32_t)value forKey:(NSString *)key;
-
-/**
- * Removes the entry for the given key.
- *
- * @param aKey Key to be removed from this dictionary.
- **/
-- (void)removeUInt32ForKey:(NSString *)aKey;
-
-/**
- * Removes all entries in this dictionary.
- **/
-- (void)removeAll;
-
-@end
-
-#pragma mark - String -> Int32
-
-/**
- * Class used for map fields of <NSString, int32_t>
- * values. This performs better than boxing into NSNumbers in NSDictionaries.
- *
- * @note This class is not meant to be subclassed.
- **/
-@interface GPBStringInt32Dictionary : NSObject <NSCopying>
-
-/** Number of entries stored in this dictionary. */
-@property(nonatomic, readonly) NSUInteger count;
-
-/**
- * Initializes this dictionary, copying the given values and keys.
- *
- * @param values      The values to be placed in this dictionary.
- * @param keys        The keys under which to store the values.
- * @param count       The number of elements to copy into the dictionary.
- *
- * @return A newly initialized dictionary with a copy of the values and keys.
- **/
-- (instancetype)initWithInt32s:(const int32_t [__nullable])values
-                       forKeys:(const NSString * __nonnull GPB_UNSAFE_UNRETAINED [__nullable])keys
-                         count:(NSUInteger)count NS_DESIGNATED_INITIALIZER;
-
-/**
- * Initializes this dictionary, copying the entries from the given dictionary.
- *
- * @param dictionary Dictionary containing the entries to add to this dictionary.
- *
- * @return A newly initialized dictionary with the entries of the given dictionary.
- **/
-- (instancetype)initWithDictionary:(GPBStringInt32Dictionary *)dictionary;
-
-/**
- * Initializes this dictionary with the requested capacity.
- *
- * @param numItems Number of items needed for this dictionary.
- *
- * @return A newly initialized dictionary with the requested capacity.
- **/
-- (instancetype)initWithCapacity:(NSUInteger)numItems;
-
-/**
- * Gets the value for the given key.
- *
- * @param value Pointer into which the value will be set, if found.
- * @param key   Key under which the value is stored, if present.
- *
- * @return YES if the key was found and the value was copied, NO otherwise.
- **/
-- (BOOL)getInt32:(nullable int32_t *)value forKey:(NSString *)key;
-
-/**
- * Enumerates the keys and values on this dictionary with the given block.
- *
- * @param block The block to enumerate with.
- *   **key**:        The key for the current entry.
- *   **value**:      The value for the current entry
- *   **stop**:       A pointer to a boolean that when set stops the enumeration.
- **/
-- (void)enumerateKeysAndInt32sUsingBlock:
-    (void (NS_NOESCAPE ^)(NSString *key, int32_t value, BOOL *stop))block;
-
-/**
- * Adds the keys and values from another dictionary.
- *
- * @param otherDictionary Dictionary containing entries to be added to this
- *                        dictionary.
- **/
-- (void)addEntriesFromDictionary:(GPBStringInt32Dictionary *)otherDictionary;
-
-/**
- * Sets the value for the given key.
- *
- * @param value     The value to set.
- * @param key       The key under which to store the value.
- **/
-- (void)setInt32:(int32_t)value forKey:(NSString *)key;
-
-/**
- * Removes the entry for the given key.
- *
- * @param aKey Key to be removed from this dictionary.
- **/
-- (void)removeInt32ForKey:(NSString *)aKey;
-
-/**
- * Removes all entries in this dictionary.
- **/
-- (void)removeAll;
-
-@end
-
-#pragma mark - String -> UInt64
-
-/**
- * Class used for map fields of <NSString, uint64_t>
- * values. This performs better than boxing into NSNumbers in NSDictionaries.
- *
- * @note This class is not meant to be subclassed.
- **/
-@interface GPBStringUInt64Dictionary : NSObject <NSCopying>
-
-/** Number of entries stored in this dictionary. */
-@property(nonatomic, readonly) NSUInteger count;
-
-/**
- * Initializes this dictionary, copying the given values and keys.
- *
- * @param values      The values to be placed in this dictionary.
- * @param keys        The keys under which to store the values.
- * @param count       The number of elements to copy into the dictionary.
- *
- * @return A newly initialized dictionary with a copy of the values and keys.
- **/
-- (instancetype)initWithUInt64s:(const uint64_t [__nullable])values
-                        forKeys:(const NSString * __nonnull GPB_UNSAFE_UNRETAINED [__nullable])keys
-                          count:(NSUInteger)count NS_DESIGNATED_INITIALIZER;
-
-/**
- * Initializes this dictionary, copying the entries from the given dictionary.
- *
- * @param dictionary Dictionary containing the entries to add to this dictionary.
- *
- * @return A newly initialized dictionary with the entries of the given dictionary.
- **/
-- (instancetype)initWithDictionary:(GPBStringUInt64Dictionary *)dictionary;
-
-/**
- * Initializes this dictionary with the requested capacity.
- *
- * @param numItems Number of items needed for this dictionary.
- *
- * @return A newly initialized dictionary with the requested capacity.
- **/
-- (instancetype)initWithCapacity:(NSUInteger)numItems;
-
-/**
- * Gets the value for the given key.
- *
- * @param value Pointer into which the value will be set, if found.
- * @param key   Key under which the value is stored, if present.
- *
- * @return YES if the key was found and the value was copied, NO otherwise.
- **/
-- (BOOL)getUInt64:(nullable uint64_t *)value forKey:(NSString *)key;
-
-/**
- * Enumerates the keys and values on this dictionary with the given block.
- *
- * @param block The block to enumerate with.
- *   **key**:        The key for the current entry.
- *   **value**:      The value for the current entry
- *   **stop**:       A pointer to a boolean that when set stops the enumeration.
- **/
-- (void)enumerateKeysAndUInt64sUsingBlock:
-    (void (NS_NOESCAPE ^)(NSString *key, uint64_t value, BOOL *stop))block;
-
-/**
- * Adds the keys and values from another dictionary.
- *
- * @param otherDictionary Dictionary containing entries to be added to this
- *                        dictionary.
- **/
-- (void)addEntriesFromDictionary:(GPBStringUInt64Dictionary *)otherDictionary;
-
-/**
- * Sets the value for the given key.
- *
- * @param value     The value to set.
- * @param key       The key under which to store the value.
- **/
-- (void)setUInt64:(uint64_t)value forKey:(NSString *)key;
-
-/**
- * Removes the entry for the given key.
- *
- * @param aKey Key to be removed from this dictionary.
- **/
-- (void)removeUInt64ForKey:(NSString *)aKey;
-
-/**
- * Removes all entries in this dictionary.
- **/
-- (void)removeAll;
-
-@end
-
-#pragma mark - String -> Int64
-
-/**
- * Class used for map fields of <NSString, int64_t>
- * values. This performs better than boxing into NSNumbers in NSDictionaries.
- *
- * @note This class is not meant to be subclassed.
- **/
-@interface GPBStringInt64Dictionary : NSObject <NSCopying>
-
-/** Number of entries stored in this dictionary. */
-@property(nonatomic, readonly) NSUInteger count;
-
-/**
- * Initializes this dictionary, copying the given values and keys.
- *
- * @param values      The values to be placed in this dictionary.
- * @param keys        The keys under which to store the values.
- * @param count       The number of elements to copy into the dictionary.
- *
- * @return A newly initialized dictionary with a copy of the values and keys.
- **/
-- (instancetype)initWithInt64s:(const int64_t [__nullable])values
-                       forKeys:(const NSString * __nonnull GPB_UNSAFE_UNRETAINED [__nullable])keys
-                         count:(NSUInteger)count NS_DESIGNATED_INITIALIZER;
-
-/**
- * Initializes this dictionary, copying the entries from the given dictionary.
- *
- * @param dictionary Dictionary containing the entries to add to this dictionary.
- *
- * @return A newly initialized dictionary with the entries of the given dictionary.
- **/
-- (instancetype)initWithDictionary:(GPBStringInt64Dictionary *)dictionary;
-
-/**
- * Initializes this dictionary with the requested capacity.
- *
- * @param numItems Number of items needed for this dictionary.
- *
- * @return A newly initialized dictionary with the requested capacity.
- **/
-- (instancetype)initWithCapacity:(NSUInteger)numItems;
-
-/**
- * Gets the value for the given key.
- *
- * @param value Pointer into which the value will be set, if found.
- * @param key   Key under which the value is stored, if present.
- *
- * @return YES if the key was found and the value was copied, NO otherwise.
- **/
-- (BOOL)getInt64:(nullable int64_t *)value forKey:(NSString *)key;
-
-/**
- * Enumerates the keys and values on this dictionary with the given block.
- *
- * @param block The block to enumerate with.
- *   **key**:        The key for the current entry.
- *   **value**:      The value for the current entry
- *   **stop**:       A pointer to a boolean that when set stops the enumeration.
- **/
-- (void)enumerateKeysAndInt64sUsingBlock:
-    (void (NS_NOESCAPE ^)(NSString *key, int64_t value, BOOL *stop))block;
-
-/**
- * Adds the keys and values from another dictionary.
- *
- * @param otherDictionary Dictionary containing entries to be added to this
- *                        dictionary.
- **/
-- (void)addEntriesFromDictionary:(GPBStringInt64Dictionary *)otherDictionary;
-
-/**
- * Sets the value for the given key.
- *
- * @param value     The value to set.
- * @param key       The key under which to store the value.
- **/
-- (void)setInt64:(int64_t)value forKey:(NSString *)key;
-
-/**
- * Removes the entry for the given key.
- *
- * @param aKey Key to be removed from this dictionary.
- **/
-- (void)removeInt64ForKey:(NSString *)aKey;
-
-/**
- * Removes all entries in this dictionary.
- **/
-- (void)removeAll;
-
-@end
-
-#pragma mark - String -> Bool
-
-/**
- * Class used for map fields of <NSString, BOOL>
- * values. This performs better than boxing into NSNumbers in NSDictionaries.
- *
- * @note This class is not meant to be subclassed.
- **/
-@interface GPBStringBoolDictionary : NSObject <NSCopying>
-
-/** Number of entries stored in this dictionary. */
-@property(nonatomic, readonly) NSUInteger count;
-
-/**
- * Initializes this dictionary, copying the given values and keys.
- *
- * @param values      The values to be placed in this dictionary.
- * @param keys        The keys under which to store the values.
- * @param count       The number of elements to copy into the dictionary.
- *
- * @return A newly initialized dictionary with a copy of the values and keys.
- **/
-- (instancetype)initWithBools:(const BOOL [__nullable])values
-                      forKeys:(const NSString * __nonnull GPB_UNSAFE_UNRETAINED [__nullable])keys
-                        count:(NSUInteger)count NS_DESIGNATED_INITIALIZER;
-
-/**
- * Initializes this dictionary, copying the entries from the given dictionary.
- *
- * @param dictionary Dictionary containing the entries to add to this dictionary.
- *
- * @return A newly initialized dictionary with the entries of the given dictionary.
- **/
-- (instancetype)initWithDictionary:(GPBStringBoolDictionary *)dictionary;
-
-/**
- * Initializes this dictionary with the requested capacity.
- *
- * @param numItems Number of items needed for this dictionary.
- *
- * @return A newly initialized dictionary with the requested capacity.
- **/
-- (instancetype)initWithCapacity:(NSUInteger)numItems;
-
-/**
- * Gets the value for the given key.
- *
- * @param value Pointer into which the value will be set, if found.
- * @param key   Key under which the value is stored, if present.
- *
- * @return YES if the key was found and the value was copied, NO otherwise.
- **/
-- (BOOL)getBool:(nullable BOOL *)value forKey:(NSString *)key;
-
-/**
- * Enumerates the keys and values on this dictionary with the given block.
- *
- * @param block The block to enumerate with.
- *   **key**:        The key for the current entry.
- *   **value**:      The value for the current entry
- *   **stop**:       A pointer to a boolean that when set stops the enumeration.
- **/
-- (void)enumerateKeysAndBoolsUsingBlock:
-    (void (NS_NOESCAPE ^)(NSString *key, BOOL value, BOOL *stop))block;
-
-/**
- * Adds the keys and values from another dictionary.
- *
- * @param otherDictionary Dictionary containing entries to be added to this
- *                        dictionary.
- **/
-- (void)addEntriesFromDictionary:(GPBStringBoolDictionary *)otherDictionary;
-
-/**
- * Sets the value for the given key.
- *
- * @param value     The value to set.
- * @param key       The key under which to store the value.
- **/
-- (void)setBool:(BOOL)value forKey:(NSString *)key;
-
-/**
- * Removes the entry for the given key.
- *
- * @param aKey Key to be removed from this dictionary.
- **/
-- (void)removeBoolForKey:(NSString *)aKey;
-
-/**
- * Removes all entries in this dictionary.
- **/
-- (void)removeAll;
-
-@end
-
-#pragma mark - String -> Float
-
-/**
- * Class used for map fields of <NSString, float>
- * values. This performs better than boxing into NSNumbers in NSDictionaries.
- *
- * @note This class is not meant to be subclassed.
- **/
-@interface GPBStringFloatDictionary : NSObject <NSCopying>
-
-/** Number of entries stored in this dictionary. */
-@property(nonatomic, readonly) NSUInteger count;
-
-/**
- * Initializes this dictionary, copying the given values and keys.
- *
- * @param values      The values to be placed in this dictionary.
- * @param keys        The keys under which to store the values.
- * @param count       The number of elements to copy into the dictionary.
- *
- * @return A newly initialized dictionary with a copy of the values and keys.
- **/
-- (instancetype)initWithFloats:(const float [__nullable])values
-                       forKeys:(const NSString * __nonnull GPB_UNSAFE_UNRETAINED [__nullable])keys
-                         count:(NSUInteger)count NS_DESIGNATED_INITIALIZER;
-
-/**
- * Initializes this dictionary, copying the entries from the given dictionary.
- *
- * @param dictionary Dictionary containing the entries to add to this dictionary.
- *
- * @return A newly initialized dictionary with the entries of the given dictionary.
- **/
-- (instancetype)initWithDictionary:(GPBStringFloatDictionary *)dictionary;
-
-/**
- * Initializes this dictionary with the requested capacity.
- *
- * @param numItems Number of items needed for this dictionary.
- *
- * @return A newly initialized dictionary with the requested capacity.
- **/
-- (instancetype)initWithCapacity:(NSUInteger)numItems;
-
-/**
- * Gets the value for the given key.
- *
- * @param value Pointer into which the value will be set, if found.
- * @param key   Key under which the value is stored, if present.
- *
- * @return YES if the key was found and the value was copied, NO otherwise.
- **/
-- (BOOL)getFloat:(nullable float *)value forKey:(NSString *)key;
-
-/**
- * Enumerates the keys and values on this dictionary with the given block.
- *
- * @param block The block to enumerate with.
- *   **key**:        The key for the current entry.
- *   **value**:      The value for the current entry
- *   **stop**:       A pointer to a boolean that when set stops the enumeration.
- **/
-- (void)enumerateKeysAndFloatsUsingBlock:
-    (void (NS_NOESCAPE ^)(NSString *key, float value, BOOL *stop))block;
-
-/**
- * Adds the keys and values from another dictionary.
- *
- * @param otherDictionary Dictionary containing entries to be added to this
- *                        dictionary.
- **/
-- (void)addEntriesFromDictionary:(GPBStringFloatDictionary *)otherDictionary;
-
-/**
- * Sets the value for the given key.
- *
- * @param value     The value to set.
- * @param key       The key under which to store the value.
- **/
-- (void)setFloat:(float)value forKey:(NSString *)key;
-
-/**
- * Removes the entry for the given key.
- *
- * @param aKey Key to be removed from this dictionary.
- **/
-- (void)removeFloatForKey:(NSString *)aKey;
-
-/**
- * Removes all entries in this dictionary.
- **/
-- (void)removeAll;
-
-@end
-
-#pragma mark - String -> Double
-
-/**
- * Class used for map fields of <NSString, double>
- * values. This performs better than boxing into NSNumbers in NSDictionaries.
- *
- * @note This class is not meant to be subclassed.
- **/
-@interface GPBStringDoubleDictionary : NSObject <NSCopying>
-
-/** Number of entries stored in this dictionary. */
-@property(nonatomic, readonly) NSUInteger count;
-
-/**
- * Initializes this dictionary, copying the given values and keys.
- *
- * @param values      The values to be placed in this dictionary.
- * @param keys        The keys under which to store the values.
- * @param count       The number of elements to copy into the dictionary.
- *
- * @return A newly initialized dictionary with a copy of the values and keys.
- **/
-- (instancetype)initWithDoubles:(const double [__nullable])values
-                        forKeys:(const NSString * __nonnull GPB_UNSAFE_UNRETAINED [__nullable])keys
-                          count:(NSUInteger)count NS_DESIGNATED_INITIALIZER;
-
-/**
- * Initializes this dictionary, copying the entries from the given dictionary.
- *
- * @param dictionary Dictionary containing the entries to add to this dictionary.
- *
- * @return A newly initialized dictionary with the entries of the given dictionary.
- **/
-- (instancetype)initWithDictionary:(GPBStringDoubleDictionary *)dictionary;
-
-/**
- * Initializes this dictionary with the requested capacity.
- *
- * @param numItems Number of items needed for this dictionary.
- *
- * @return A newly initialized dictionary with the requested capacity.
- **/
-- (instancetype)initWithCapacity:(NSUInteger)numItems;
-
-/**
- * Gets the value for the given key.
- *
- * @param value Pointer into which the value will be set, if found.
- * @param key   Key under which the value is stored, if present.
- *
- * @return YES if the key was found and the value was copied, NO otherwise.
- **/
-- (BOOL)getDouble:(nullable double *)value forKey:(NSString *)key;
-
-/**
- * Enumerates the keys and values on this dictionary with the given block.
- *
- * @param block The block to enumerate with.
- *   **key**:        The key for the current entry.
- *   **value**:      The value for the current entry
- *   **stop**:       A pointer to a boolean that when set stops the enumeration.
- **/
-- (void)enumerateKeysAndDoublesUsingBlock:
-    (void (NS_NOESCAPE ^)(NSString *key, double value, BOOL *stop))block;
-
-/**
- * Adds the keys and values from another dictionary.
- *
- * @param otherDictionary Dictionary containing entries to be added to this
- *                        dictionary.
- **/
-- (void)addEntriesFromDictionary:(GPBStringDoubleDictionary *)otherDictionary;
-
-/**
- * Sets the value for the given key.
- *
- * @param value     The value to set.
- * @param key       The key under which to store the value.
- **/
-- (void)setDouble:(double)value forKey:(NSString *)key;
-
-/**
- * Removes the entry for the given key.
- *
- * @param aKey Key to be removed from this dictionary.
- **/
-- (void)removeDoubleForKey:(NSString *)aKey;
-
-/**
- * Removes all entries in this dictionary.
- **/
-- (void)removeAll;
-
-@end
-
-#pragma mark - String -> Enum
-
-/**
- * Class used for map fields of <NSString, int32_t>
- * values. This performs better than boxing into NSNumbers in NSDictionaries.
- *
- * @note This class is not meant to be subclassed.
- **/
-@interface GPBStringEnumDictionary : NSObject <NSCopying>
-
-/** Number of entries stored in this dictionary. */
-@property(nonatomic, readonly) NSUInteger count;
-/** The validation function to check if the enums are valid. */
-@property(nonatomic, readonly) GPBEnumValidationFunc validationFunc;
-
-/**
- * Initializes a dictionary with the given validation function.
- *
- * @param func The enum validation function for the dictionary.
- *
- * @return A newly initialized dictionary.
- **/
-- (instancetype)initWithValidationFunction:(nullable GPBEnumValidationFunc)func;
-
-/**
- * Initializes a dictionary with the entries given.
- *
- * @param func   The enum validation function for the dictionary.
- * @param values The raw enum values values to be placed in the dictionary.
- * @param keys   The keys under which to store the values.
- * @param count  The number of entries to store in the dictionary.
- *
- * @return A newly initialized dictionary with the keys and values in it.
- **/
-- (instancetype)initWithValidationFunction:(nullable GPBEnumValidationFunc)func
-                                 rawValues:(const int32_t [__nullable])values
-                                   forKeys:(const NSString * __nonnull GPB_UNSAFE_UNRETAINED [__nullable])keys
-                                     count:(NSUInteger)count NS_DESIGNATED_INITIALIZER;
-
-/**
- * Initializes a dictionary with the entries from the given.
- * dictionary.
- *
- * @param dictionary Dictionary containing the entries to add to the dictionary.
- *
- * @return A newly initialized dictionary with the entries from the given
- *         dictionary in it.
- **/
-- (instancetype)initWithDictionary:(GPBStringEnumDictionary *)dictionary;
-
-/**
- * Initializes a dictionary with the given capacity.
- *
- * @param func     The enum validation function for the dictionary.
- * @param numItems Capacity needed for the dictionary.
- *
- * @return A newly initialized dictionary with the given capacity.
- **/
-- (instancetype)initWithValidationFunction:(nullable GPBEnumValidationFunc)func
-                                  capacity:(NSUInteger)numItems;
-
-// These will return kGPBUnrecognizedEnumeratorValue if the value for the key
-// is not a valid enumerator as defined by validationFunc. If the actual value is
-// desired, use "raw" version of the method.
-
-/**
- * Gets the value for the given key.
- *
- * @param value Pointer into which the value will be set, if found.
- * @param key   Key under which the value is stored, if present.
- *
- * @return YES if the key was found and the value was copied, NO otherwise.
- **/
-- (BOOL)getEnum:(nullable int32_t *)value forKey:(NSString *)key;
-
-/**
- * Enumerates the keys and values on this dictionary with the given block.
- *
- * @param block The block to enumerate with.
- *   **key**:        The key for the current entry.
- *   **value**:      The value for the current entry
- *   **stop**:       A pointer to a boolean that when set stops the enumeration.
- **/
-- (void)enumerateKeysAndEnumsUsingBlock:
-    (void (NS_NOESCAPE ^)(NSString *key, int32_t value, BOOL *stop))block;
-
-/**
- * Gets the raw enum value for the given key.
- *
- * @note This method bypass the validationFunc to enable the access of values that
- *       were not known at the time the binary was compiled.
- *
- * @param rawValue Pointer into which the value will be set, if found.
- * @param key      Key under which the value is stored, if present.
- *
- * @return YES if the key was found and the value was copied, NO otherwise.
- **/
-- (BOOL)getRawValue:(nullable int32_t *)rawValue forKey:(NSString *)key;
-
-/**
- * Enumerates the keys and values on this dictionary with the given block.
- *
- * @note This method bypass the validationFunc to enable the access of values that
- *       were not known at the time the binary was compiled.
- *
- * @param block The block to enumerate with.
- *   **key**:      The key for the current entry.
- *   **rawValue**: The value for the current entry
- *   **stop**:     A pointer to a boolean that when set stops the enumeration.
- **/
-- (void)enumerateKeysAndRawValuesUsingBlock:
-    (void (NS_NOESCAPE ^)(NSString *key, int32_t rawValue, BOOL *stop))block;
-
-/**
- * Adds the keys and raw enum values from another dictionary.
- *
- * @note This method bypass the validationFunc to enable the setting of values that
- *       were not known at the time the binary was compiled.
- *
- * @param otherDictionary Dictionary containing entries to be added to this
- *                        dictionary.
- **/
-- (void)addRawEntriesFromDictionary:(GPBStringEnumDictionary *)otherDictionary;
-
-// If value is not a valid enumerator as defined by validationFunc, these
-// methods will assert in debug, and will log in release and assign the value
-// to the default value. Use the rawValue methods below to assign non enumerator
-// values.
-
-/**
- * Sets the value for the given key.
- *
- * @param value     The value to set.
- * @param key       The key under which to store the value.
- **/
-- (void)setEnum:(int32_t)value forKey:(NSString *)key;
-
-/**
- * Sets the raw enum value for the given key.
- *
- * @note This method bypass the validationFunc to enable the setting of values that
- *       were not known at the time the binary was compiled.
- *
- * @param rawValue The raw enum value to set.
- * @param key      The key under which to store the raw enum value.
- **/
-- (void)setRawValue:(int32_t)rawValue forKey:(NSString *)key;
-
-/**
- * Removes the entry for the given key.
- *
- * @param aKey Key to be removed from this dictionary.
- **/
-- (void)removeEnumForKey:(NSString *)aKey;
-
-/**
- * Removes all entries in this dictionary.
- **/
-- (void)removeAll;
-
-@end
-
-// clang-format on
-//%PDDM-EXPAND-END DECLARE_DICTIONARIES()
-
-NS_ASSUME_NONNULL_END
-
-//%PDDM-DEFINE DECLARE_DICTIONARIES()
-//%DICTIONARY_INTERFACES_FOR_POD_KEY(UInt32, uint32_t)
-//%DICTIONARY_INTERFACES_FOR_POD_KEY(Int32, int32_t)
-//%DICTIONARY_INTERFACES_FOR_POD_KEY(UInt64, uint64_t)
-//%DICTIONARY_INTERFACES_FOR_POD_KEY(Int64, int64_t)
-//%DICTIONARY_INTERFACES_FOR_POD_KEY(Bool, BOOL)
-//%DICTIONARY_POD_INTERFACES_FOR_KEY(String, NSString, *, OBJECT)
-//%PDDM-DEFINE DICTIONARY_INTERFACES_FOR_POD_KEY(KEY_NAME, KEY_TYPE)
-//%DICTIONARY_POD_INTERFACES_FOR_KEY(KEY_NAME, KEY_TYPE, , POD)
-//%DICTIONARY_POD_KEY_TO_OBJECT_INTERFACE(KEY_NAME, KEY_TYPE, Object, ObjectType)
-//%PDDM-DEFINE DICTIONARY_POD_INTERFACES_FOR_KEY(KEY_NAME, KEY_TYPE, KisP, KHELPER)
-//%DICTIONARY_KEY_TO_POD_INTERFACE(KEY_NAME, KEY_TYPE, KisP, KHELPER, UInt32, uint32_t)
-//%DICTIONARY_KEY_TO_POD_INTERFACE(KEY_NAME, KEY_TYPE, KisP, KHELPER, Int32, int32_t)
-//%DICTIONARY_KEY_TO_POD_INTERFACE(KEY_NAME, KEY_TYPE, KisP, KHELPER, UInt64, uint64_t)
-//%DICTIONARY_KEY_TO_POD_INTERFACE(KEY_NAME, KEY_TYPE, KisP, KHELPER, Int64, int64_t)
-//%DICTIONARY_KEY_TO_POD_INTERFACE(KEY_NAME, KEY_TYPE, KisP, KHELPER, Bool, BOOL)
-//%DICTIONARY_KEY_TO_POD_INTERFACE(KEY_NAME, KEY_TYPE, KisP, KHELPER, Float, float)
-//%DICTIONARY_KEY_TO_POD_INTERFACE(KEY_NAME, KEY_TYPE, KisP, KHELPER, Double, double)
-//%DICTIONARY_KEY_TO_ENUM_INTERFACE(KEY_NAME, KEY_TYPE, KisP, KHELPER, Enum, int32_t)
-//%PDDM-DEFINE DICTIONARY_KEY_TO_POD_INTERFACE(KEY_NAME, KEY_TYPE, KisP, KHELPER, VALUE_NAME, VALUE_TYPE)
-//%DICTIONARY_COMMON_INTERFACE(KEY_NAME, KEY_TYPE, KisP, KHELPER, VALUE_NAME, VALUE_TYPE, POD, VALUE_NAME, value)
-//%PDDM-DEFINE DICTIONARY_POD_KEY_TO_OBJECT_INTERFACE(KEY_NAME, KEY_TYPE, VALUE_NAME, VALUE_TYPE)
-//%DICTIONARY_COMMON_INTERFACE(KEY_NAME, KEY_TYPE, , POD, VALUE_NAME, VALUE_TYPE, OBJECT, Object, object)
-//%PDDM-DEFINE VALUE_FOR_KEY_POD(KEY_TYPE, VALUE_TYPE, VNAME)
-//%/**
-//% * Gets the value for the given key.
-//% *
-//% * @param value Pointer into which the value will be set, if found.
-//% * @param key   Key under which the value is stored, if present.
-//% *
-//% * @return YES if the key was found and the value was copied, NO otherwise.
-//% **/
-//%- (BOOL)get##VNAME##:(nullable VALUE_TYPE *)value forKey:(KEY_TYPE)key;
-//%PDDM-DEFINE VALUE_FOR_KEY_OBJECT(KEY_TYPE, VALUE_TYPE, VNAME)
-//%/**
-//% * Fetches the object stored under the given key.
-//% *
-//% * @param key Key under which the value is stored, if present.
-//% *
-//% * @return The object if found, nil otherwise.
-//% **/
-//%- (VALUE_TYPE)objectForKey:(KEY_TYPE)key;
-//%PDDM-DEFINE VALUE_FOR_KEY_Enum(KEY_TYPE, VALUE_TYPE, VNAME)
-//%VALUE_FOR_KEY_POD(KEY_TYPE, VALUE_TYPE, VNAME)
-//%PDDM-DEFINE ARRAY_ARG_MODIFIERPOD()
-// Nothing
-//%PDDM-DEFINE ARRAY_ARG_MODIFIEREnum()
-// Nothing
-//%PDDM-DEFINE ARRAY_ARG_MODIFIEROBJECT()
-//%__nonnull GPB_UNSAFE_UNRETAINED ##
-//%PDDM-DEFINE DICTIONARY_CLASS_DECLPOD(KEY_NAME, VALUE_NAME, VALUE_TYPE)
-//%GPB##KEY_NAME##VALUE_NAME##Dictionary
-//%PDDM-DEFINE DICTIONARY_CLASS_DECLEnum(KEY_NAME, VALUE_NAME, VALUE_TYPE)
-//%GPB##KEY_NAME##VALUE_NAME##Dictionary
-//%PDDM-DEFINE DICTIONARY_CLASS_DECLOBJECT(KEY_NAME, VALUE_NAME, VALUE_TYPE)
-//%GPB##KEY_NAME##VALUE_NAME##Dictionary<__covariant VALUE_TYPE>
-//%PDDM-DEFINE DICTIONARY_COMMON_INTERFACE(KEY_NAME, KEY_TYPE, KisP, KHELPER, VALUE_NAME, VALUE_TYPE, VHELPER, VNAME, VNAME_VAR)
-//%#pragma mark - KEY_NAME -> VALUE_NAME
-//%
-//%/**
-//% * Class used for map fields of <##KEY_TYPE##, ##VALUE_TYPE##>
-//% * values. This performs better than boxing into NSNumbers in NSDictionaries.
-//% *
-//% * @note This class is not meant to be subclassed.
-//% **/
-//%@interface DICTIONARY_CLASS_DECL##VHELPER(KEY_NAME, VALUE_NAME, VALUE_TYPE) : NSObject <NSCopying>
-//%
-//%/** Number of entries stored in this dictionary. */
-//%@property(nonatomic, readonly) NSUInteger count;
-//%
-//%/**
-//% * Initializes this dictionary, copying the given values and keys.
-//% *
-//% * @param ##VNAME_VAR##s      The values to be placed in this dictionary.
-//% * @param keys ##VNAME_VAR$S##  The keys under which to store the values.
-//% * @param count ##VNAME_VAR$S## The number of elements to copy into the dictionary.
-//% *
-//% * @return A newly initialized dictionary with a copy of the values and keys.
-//% **/
-//%- (instancetype)initWith##VNAME##s:(const VALUE_TYPE ARRAY_ARG_MODIFIER##VHELPER()[__nullable])##VNAME_VAR##s
-//%                ##VNAME$S##  forKeys:(const KEY_TYPE##KisP$S##KisP ARRAY_ARG_MODIFIER##KHELPER()[__nullable])keys
-//%                ##VNAME$S##    count:(NSUInteger)count NS_DESIGNATED_INITIALIZER;
-//%
-//%/**
-//% * Initializes this dictionary, copying the entries from the given dictionary.
-//% *
-//% * @param dictionary Dictionary containing the entries to add to this dictionary.
-//% *
-//% * @return A newly initialized dictionary with the entries of the given dictionary.
-//% **/
-//%- (instancetype)initWithDictionary:(GPB##KEY_NAME##VALUE_NAME##Dictionary *)dictionary;
-//%
-//%/**
-//% * Initializes this dictionary with the requested capacity.
-//% *
-//% * @param numItems Number of items needed for this dictionary.
-//% *
-//% * @return A newly initialized dictionary with the requested capacity.
-//% **/
-//%- (instancetype)initWithCapacity:(NSUInteger)numItems;
-//%
-//%DICTIONARY_IMMUTABLE_INTERFACE(KEY_NAME, KEY_TYPE, KisP, VALUE_NAME, VALUE_TYPE, VHELPER, VNAME, VNAME_VAR)
-//%
-//%/**
-//% * Adds the keys and values from another dictionary.
-//% *
-//% * @param otherDictionary Dictionary containing entries to be added to this
-//% *                        dictionary.
-//% **/
-//%- (void)addEntriesFromDictionary:(GPB##KEY_NAME##VALUE_NAME##Dictionary *)otherDictionary;
-//%
-//%DICTIONARY_MUTABLE_INTERFACE(KEY_NAME, KEY_TYPE, KisP, VALUE_NAME, VALUE_TYPE, VHELPER, VNAME, VNAME_VAR)
-//%
-//%@end
-//%
-
-//%PDDM-DEFINE DICTIONARY_KEY_TO_ENUM_INTERFACE(KEY_NAME, KEY_TYPE, KisP, KHELPER, VALUE_NAME, VALUE_TYPE)
-//%DICTIONARY_KEY_TO_ENUM_INTERFACE2(KEY_NAME, KEY_TYPE, KisP, KHELPER, VALUE_NAME, VALUE_TYPE, Enum)
-//%PDDM-DEFINE DICTIONARY_KEY_TO_ENUM_INTERFACE2(KEY_NAME, KEY_TYPE, KisP, KHELPER, VALUE_NAME, VALUE_TYPE, VHELPER)
-//%#pragma mark - KEY_NAME -> VALUE_NAME
-//%
-//%/**
-//% * Class used for map fields of <##KEY_TYPE##, ##VALUE_TYPE##>
-//% * values. This performs better than boxing into NSNumbers in NSDictionaries.
-//% *
-//% * @note This class is not meant to be subclassed.
-//% **/
-//%@interface GPB##KEY_NAME##VALUE_NAME##Dictionary : NSObject <NSCopying>
-//%
-//%/** Number of entries stored in this dictionary. */
-//%@property(nonatomic, readonly) NSUInteger count;
-//%/** The validation function to check if the enums are valid. */
-//%@property(nonatomic, readonly) GPBEnumValidationFunc validationFunc;
-//%
-//%/**
-//% * Initializes a dictionary with the given validation function.
-//% *
-//% * @param func The enum validation function for the dictionary.
-//% *
-//% * @return A newly initialized dictionary.
-//% **/
-//%- (instancetype)initWithValidationFunction:(nullable GPBEnumValidationFunc)func;
-//%
-//%/**
-//% * Initializes a dictionary with the entries given.
-//% *
-//% * @param func   The enum validation function for the dictionary.
-//% * @param values The raw enum values values to be placed in the dictionary.
-//% * @param keys   The keys under which to store the values.
-//% * @param count  The number of entries to store in the dictionary.
-//% *
-//% * @return A newly initialized dictionary with the keys and values in it.
-//% **/
-//%- (instancetype)initWithValidationFunction:(nullable GPBEnumValidationFunc)func
-//%                                 rawValues:(const VALUE_TYPE ARRAY_ARG_MODIFIER##VHELPER()[__nullable])values
-//%                                   forKeys:(const KEY_TYPE##KisP$S##KisP ARRAY_ARG_MODIFIER##KHELPER()[__nullable])keys
-//%                                     count:(NSUInteger)count NS_DESIGNATED_INITIALIZER;
-//%
-//%/**
-//% * Initializes a dictionary with the entries from the given.
-//% * dictionary.
-//% *
-//% * @param dictionary Dictionary containing the entries to add to the dictionary.
-//% *
-//% * @return A newly initialized dictionary with the entries from the given
-//% *         dictionary in it.
-//% **/
-//%- (instancetype)initWithDictionary:(GPB##KEY_NAME##VALUE_NAME##Dictionary *)dictionary;
-//%
-//%/**
-//% * Initializes a dictionary with the given capacity.
-//% *
-//% * @param func     The enum validation function for the dictionary.
-//% * @param numItems Capacity needed for the dictionary.
-//% *
-//% * @return A newly initialized dictionary with the given capacity.
-//% **/
-//%- (instancetype)initWithValidationFunction:(nullable GPBEnumValidationFunc)func
-//%                                  capacity:(NSUInteger)numItems;
-//%
-//%// These will return kGPBUnrecognizedEnumeratorValue if the value for the key
-//%// is not a valid enumerator as defined by validationFunc. If the actual value is
-//%// desired, use "raw" version of the method.
-//%
-//%DICTIONARY_IMMUTABLE_INTERFACE(KEY_NAME, KEY_TYPE, KisP, VALUE_NAME, VALUE_TYPE, VHELPER, Enum, value)
-//%
-//%/**
-//% * Gets the raw enum value for the given key.
-//% *
-//% * @note This method bypass the validationFunc to enable the access of values that
-//% *       were not known at the time the binary was compiled.
-//% *
-//% * @param rawValue Pointer into which the value will be set, if found.
-//% * @param key      Key under which the value is stored, if present.
-//% *
-//% * @return YES if the key was found and the value was copied, NO otherwise.
-//% **/
-//%- (BOOL)getRawValue:(nullable VALUE_TYPE *)rawValue forKey:(KEY_TYPE##KisP$S##KisP)key;
-//%
-//%/**
-//% * Enumerates the keys and values on this dictionary with the given block.
-//% *
-//% * @note This method bypass the validationFunc to enable the access of values that
-//% *       were not known at the time the binary was compiled.
-//% *
-//% * @param block The block to enumerate with.
-//% *   **key**:      The key for the current entry.
-//% *   **rawValue**: The value for the current entry
-//% *   **stop**:     A pointer to a boolean that when set stops the enumeration.
-//% **/
-//%- (void)enumerateKeysAndRawValuesUsingBlock:
-//%    (void (NS_NOESCAPE ^)(KEY_TYPE KisP##key, VALUE_TYPE rawValue, BOOL *stop))block;
-//%
-//%/**
-//% * Adds the keys and raw enum values from another dictionary.
-//% *
-//% * @note This method bypass the validationFunc to enable the setting of values that
-//% *       were not known at the time the binary was compiled.
-//% *
-//% * @param otherDictionary Dictionary containing entries to be added to this
-//% *                        dictionary.
-//% **/
-//%- (void)addRawEntriesFromDictionary:(GPB##KEY_NAME##VALUE_NAME##Dictionary *)otherDictionary;
-//%
-//%// If value is not a valid enumerator as defined by validationFunc, these
-//%// methods will assert in debug, and will log in release and assign the value
-//%// to the default value. Use the rawValue methods below to assign non enumerator
-//%// values.
-//%
-//%DICTIONARY_MUTABLE_INTERFACE(KEY_NAME, KEY_TYPE, KisP, VALUE_NAME, VALUE_TYPE, VHELPER, Enum, value)
-//%
-//%@end
-//%
-
-//%PDDM-DEFINE DICTIONARY_IMMUTABLE_INTERFACE(KEY_NAME, KEY_TYPE, KisP, VALUE_NAME, VALUE_TYPE, VHELPER, VNAME, VNAME_VAR)
-//%VALUE_FOR_KEY_##VHELPER(KEY_TYPE##KisP$S##KisP, VALUE_TYPE, VNAME)
-//%
-//%/**
-//% * Enumerates the keys and values on this dictionary with the given block.
-//% *
-//% * @param block The block to enumerate with.
-//% *   **key**: ##VNAME_VAR$S##  The key for the current entry.
-//% *   **VNAME_VAR**:      The value for the current entry
-//% *   **stop**: ##VNAME_VAR$S## A pointer to a boolean that when set stops the enumeration.
-//% **/
-//%- (void)enumerateKeysAnd##VNAME##sUsingBlock:
-//%    (void (NS_NOESCAPE ^)(KEY_TYPE KisP##key, VALUE_TYPE VNAME_VAR, BOOL *stop))block;
-
-//%PDDM-DEFINE DICTIONARY_MUTABLE_INTERFACE(KEY_NAME, KEY_TYPE, KisP, VALUE_NAME, VALUE_TYPE, VHELPER, VNAME, VNAME_VAR)
-//%/**
-//% * Sets the value for the given key.
-//% *
-//% * @param ##VNAME_VAR     The value to set.
-//% * @param key ##VNAME_VAR$S## The key under which to store the value.
-//% **/
-//%- (void)set##VNAME##:(VALUE_TYPE)##VNAME_VAR forKey:(KEY_TYPE##KisP$S##KisP)key;
-//%DICTIONARY_EXTRA_MUTABLE_METHODS_##VHELPER(KEY_NAME, KEY_TYPE, KisP, VALUE_NAME, VALUE_TYPE)
-//%/**
-//% * Removes the entry for the given key.
-//% *
-//% * @param aKey Key to be removed from this dictionary.
-//% **/
-//%- (void)remove##VNAME##ForKey:(KEY_TYPE##KisP$S##KisP)aKey;
-//%
-//%/**
-//% * Removes all entries in this dictionary.
-//% **/
-//%- (void)removeAll;
-
-//%PDDM-DEFINE DICTIONARY_EXTRA_MUTABLE_METHODS_POD(KEY_NAME, KEY_TYPE, KisP, VALUE_NAME, VALUE_TYPE)
-// Empty
-//%PDDM-DEFINE DICTIONARY_EXTRA_MUTABLE_METHODS_OBJECT(KEY_NAME, KEY_TYPE, KisP, VALUE_NAME, VALUE_TYPE)
-// Empty
-//%PDDM-DEFINE DICTIONARY_EXTRA_MUTABLE_METHODS_Enum(KEY_NAME, KEY_TYPE, KisP, VALUE_NAME, VALUE_TYPE)
-//%
-//%/**
-//% * Sets the raw enum value for the given key.
-//% *
-//% * @note This method bypass the validationFunc to enable the setting of values that
-//% *       were not known at the time the binary was compiled.
-//% *
-//% * @param rawValue The raw enum value to set.
-//% * @param key      The key under which to store the raw enum value.
-//% **/
-//%- (void)setRawValue:(VALUE_TYPE)rawValue forKey:(KEY_TYPE##KisP$S##KisP)key;
-//%
diff --git a/libs/protobuf/objectivec/GPBDictionary.m b/libs/protobuf/objectivec/GPBDictionary.m
deleted file mode 100644
index 187a970..0000000
--- a/libs/protobuf/objectivec/GPBDictionary.m
+++ /dev/null
@@ -1,12150 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#import "GPBDictionary_PackagePrivate.h"
-
-#import "GPBCodedInputStream_PackagePrivate.h"
-#import "GPBCodedOutputStream_PackagePrivate.h"
-#import "GPBDescriptor_PackagePrivate.h"
-#import "GPBMessage_PackagePrivate.h"
-#import "GPBUtilities_PackagePrivate.h"
-
-// ------------------------------ NOTE ------------------------------
-// At the moment, this is all using NSNumbers in NSDictionaries under
-// the hood, but it is all hidden so we can come back and optimize
-// with direct CFDictionary usage later.  The reason that wasn't
-// done yet is needing to support 32bit iOS builds.  Otherwise
-// it would be pretty simple to store all this data in CFDictionaries
-// directly.
-// ------------------------------------------------------------------
-
-// Direct access is use for speed, to avoid even internally declaring things
-// read/write, etc. The warning is enabled in the project to ensure code calling
-// protos can turn on -Wdirect-ivar-access without issues.
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdirect-ivar-access"
-
-// Used to include code only visible to specific versions of the static
-// analyzer. Useful for wrapping code that only exists to silence the analyzer.
-// Determine the values you want to use for BEGIN_APPLE_BUILD_VERSION,
-// END_APPLE_BUILD_VERSION using:
-//   xcrun clang -dM -E -x c /dev/null | grep __apple_build_version__
-// Example usage:
-//  #if GPB_STATIC_ANALYZER_ONLY(5621, 5623) ... #endif
-#define GPB_STATIC_ANALYZER_ONLY(BEGIN_APPLE_BUILD_VERSION, END_APPLE_BUILD_VERSION) \
-    (defined(__clang_analyzer__) && \
-     (__apple_build_version__ >= BEGIN_APPLE_BUILD_VERSION && \
-      __apple_build_version__ <= END_APPLE_BUILD_VERSION))
-
-enum {
-  kMapKeyFieldNumber = 1,
-  kMapValueFieldNumber = 2,
-};
-
-static BOOL DictDefault_IsValidValue(int32_t value) {
-  // Anything but the bad value marker is allowed.
-  return (value != kGPBUnrecognizedEnumeratorValue);
-}
-
-//%PDDM-DEFINE SERIALIZE_SUPPORT_2_TYPE(VALUE_NAME, VALUE_TYPE, GPBDATATYPE_NAME1, GPBDATATYPE_NAME2)
-//%static size_t ComputeDict##VALUE_NAME##FieldSize(VALUE_TYPE value, uint32_t fieldNum, GPBDataType dataType) {
-//%  if (dataType == GPBDataType##GPBDATATYPE_NAME1) {
-//%    return GPBCompute##GPBDATATYPE_NAME1##Size(fieldNum, value);
-//%  } else if (dataType == GPBDataType##GPBDATATYPE_NAME2) {
-//%    return GPBCompute##GPBDATATYPE_NAME2##Size(fieldNum, value);
-//%  } else {
-//%    NSCAssert(NO, @"Unexpected type %d", dataType);
-//%    return 0;
-//%  }
-//%}
-//%
-//%static void WriteDict##VALUE_NAME##Field(GPBCodedOutputStream *stream, VALUE_TYPE value, uint32_t fieldNum, GPBDataType dataType) {
-//%  if (dataType == GPBDataType##GPBDATATYPE_NAME1) {
-//%    [stream write##GPBDATATYPE_NAME1##:fieldNum value:value];
-//%  } else if (dataType == GPBDataType##GPBDATATYPE_NAME2) {
-//%    [stream write##GPBDATATYPE_NAME2##:fieldNum value:value];
-//%  } else {
-//%    NSCAssert(NO, @"Unexpected type %d", dataType);
-//%  }
-//%}
-//%
-//%PDDM-DEFINE SERIALIZE_SUPPORT_3_TYPE(VALUE_NAME, VALUE_TYPE, GPBDATATYPE_NAME1, GPBDATATYPE_NAME2, GPBDATATYPE_NAME3)
-//%static size_t ComputeDict##VALUE_NAME##FieldSize(VALUE_TYPE value, uint32_t fieldNum, GPBDataType dataType) {
-//%  if (dataType == GPBDataType##GPBDATATYPE_NAME1) {
-//%    return GPBCompute##GPBDATATYPE_NAME1##Size(fieldNum, value);
-//%  } else if (dataType == GPBDataType##GPBDATATYPE_NAME2) {
-//%    return GPBCompute##GPBDATATYPE_NAME2##Size(fieldNum, value);
-//%  } else if (dataType == GPBDataType##GPBDATATYPE_NAME3) {
-//%    return GPBCompute##GPBDATATYPE_NAME3##Size(fieldNum, value);
-//%  } else {
-//%    NSCAssert(NO, @"Unexpected type %d", dataType);
-//%    return 0;
-//%  }
-//%}
-//%
-//%static void WriteDict##VALUE_NAME##Field(GPBCodedOutputStream *stream, VALUE_TYPE value, uint32_t fieldNum, GPBDataType dataType) {
-//%  if (dataType == GPBDataType##GPBDATATYPE_NAME1) {
-//%    [stream write##GPBDATATYPE_NAME1##:fieldNum value:value];
-//%  } else if (dataType == GPBDataType##GPBDATATYPE_NAME2) {
-//%    [stream write##GPBDATATYPE_NAME2##:fieldNum value:value];
-//%  } else if (dataType == GPBDataType##GPBDATATYPE_NAME3) {
-//%    [stream write##GPBDATATYPE_NAME3##:fieldNum value:value];
-//%  } else {
-//%    NSCAssert(NO, @"Unexpected type %d", dataType);
-//%  }
-//%}
-//%
-//%PDDM-DEFINE SIMPLE_SERIALIZE_SUPPORT(VALUE_NAME, VALUE_TYPE, VisP)
-//%static size_t ComputeDict##VALUE_NAME##FieldSize(VALUE_TYPE VisP##value, uint32_t fieldNum, GPBDataType dataType) {
-//%  NSCAssert(dataType == GPBDataType##VALUE_NAME, @"bad type: %d", dataType);
-//%  #pragma unused(dataType)  // For when asserts are off in release.
-//%  return GPBCompute##VALUE_NAME##Size(fieldNum, value);
-//%}
-//%
-//%static void WriteDict##VALUE_NAME##Field(GPBCodedOutputStream *stream, VALUE_TYPE VisP##value, uint32_t fieldNum, GPBDataType dataType) {
-//%  NSCAssert(dataType == GPBDataType##VALUE_NAME, @"bad type: %d", dataType);
-//%  #pragma unused(dataType)  // For when asserts are off in release.
-//%  [stream write##VALUE_NAME##:fieldNum value:value];
-//%}
-//%
-//%PDDM-DEFINE SERIALIZE_SUPPORT_HELPERS()
-//%SERIALIZE_SUPPORT_3_TYPE(Int32, int32_t, Int32, SInt32, SFixed32)
-//%SERIALIZE_SUPPORT_2_TYPE(UInt32, uint32_t, UInt32, Fixed32)
-//%SERIALIZE_SUPPORT_3_TYPE(Int64, int64_t, Int64, SInt64, SFixed64)
-//%SERIALIZE_SUPPORT_2_TYPE(UInt64, uint64_t, UInt64, Fixed64)
-//%SIMPLE_SERIALIZE_SUPPORT(Bool, BOOL, )
-//%SIMPLE_SERIALIZE_SUPPORT(Enum, int32_t, )
-//%SIMPLE_SERIALIZE_SUPPORT(Float, float, )
-//%SIMPLE_SERIALIZE_SUPPORT(Double, double, )
-//%SIMPLE_SERIALIZE_SUPPORT(String, NSString, *)
-//%SERIALIZE_SUPPORT_3_TYPE(Object, id, Message, String, Bytes)
-//%PDDM-EXPAND SERIALIZE_SUPPORT_HELPERS()
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-static size_t ComputeDictInt32FieldSize(int32_t value, uint32_t fieldNum, GPBDataType dataType) {
-  if (dataType == GPBDataTypeInt32) {
-    return GPBComputeInt32Size(fieldNum, value);
-  } else if (dataType == GPBDataTypeSInt32) {
-    return GPBComputeSInt32Size(fieldNum, value);
-  } else if (dataType == GPBDataTypeSFixed32) {
-    return GPBComputeSFixed32Size(fieldNum, value);
-  } else {
-    NSCAssert(NO, @"Unexpected type %d", dataType);
-    return 0;
-  }
-}
-
-static void WriteDictInt32Field(GPBCodedOutputStream *stream, int32_t value, uint32_t fieldNum, GPBDataType dataType) {
-  if (dataType == GPBDataTypeInt32) {
-    [stream writeInt32:fieldNum value:value];
-  } else if (dataType == GPBDataTypeSInt32) {
-    [stream writeSInt32:fieldNum value:value];
-  } else if (dataType == GPBDataTypeSFixed32) {
-    [stream writeSFixed32:fieldNum value:value];
-  } else {
-    NSCAssert(NO, @"Unexpected type %d", dataType);
-  }
-}
-
-static size_t ComputeDictUInt32FieldSize(uint32_t value, uint32_t fieldNum, GPBDataType dataType) {
-  if (dataType == GPBDataTypeUInt32) {
-    return GPBComputeUInt32Size(fieldNum, value);
-  } else if (dataType == GPBDataTypeFixed32) {
-    return GPBComputeFixed32Size(fieldNum, value);
-  } else {
-    NSCAssert(NO, @"Unexpected type %d", dataType);
-    return 0;
-  }
-}
-
-static void WriteDictUInt32Field(GPBCodedOutputStream *stream, uint32_t value, uint32_t fieldNum, GPBDataType dataType) {
-  if (dataType == GPBDataTypeUInt32) {
-    [stream writeUInt32:fieldNum value:value];
-  } else if (dataType == GPBDataTypeFixed32) {
-    [stream writeFixed32:fieldNum value:value];
-  } else {
-    NSCAssert(NO, @"Unexpected type %d", dataType);
-  }
-}
-
-static size_t ComputeDictInt64FieldSize(int64_t value, uint32_t fieldNum, GPBDataType dataType) {
-  if (dataType == GPBDataTypeInt64) {
-    return GPBComputeInt64Size(fieldNum, value);
-  } else if (dataType == GPBDataTypeSInt64) {
-    return GPBComputeSInt64Size(fieldNum, value);
-  } else if (dataType == GPBDataTypeSFixed64) {
-    return GPBComputeSFixed64Size(fieldNum, value);
-  } else {
-    NSCAssert(NO, @"Unexpected type %d", dataType);
-    return 0;
-  }
-}
-
-static void WriteDictInt64Field(GPBCodedOutputStream *stream, int64_t value, uint32_t fieldNum, GPBDataType dataType) {
-  if (dataType == GPBDataTypeInt64) {
-    [stream writeInt64:fieldNum value:value];
-  } else if (dataType == GPBDataTypeSInt64) {
-    [stream writeSInt64:fieldNum value:value];
-  } else if (dataType == GPBDataTypeSFixed64) {
-    [stream writeSFixed64:fieldNum value:value];
-  } else {
-    NSCAssert(NO, @"Unexpected type %d", dataType);
-  }
-}
-
-static size_t ComputeDictUInt64FieldSize(uint64_t value, uint32_t fieldNum, GPBDataType dataType) {
-  if (dataType == GPBDataTypeUInt64) {
-    return GPBComputeUInt64Size(fieldNum, value);
-  } else if (dataType == GPBDataTypeFixed64) {
-    return GPBComputeFixed64Size(fieldNum, value);
-  } else {
-    NSCAssert(NO, @"Unexpected type %d", dataType);
-    return 0;
-  }
-}
-
-static void WriteDictUInt64Field(GPBCodedOutputStream *stream, uint64_t value, uint32_t fieldNum, GPBDataType dataType) {
-  if (dataType == GPBDataTypeUInt64) {
-    [stream writeUInt64:fieldNum value:value];
-  } else if (dataType == GPBDataTypeFixed64) {
-    [stream writeFixed64:fieldNum value:value];
-  } else {
-    NSCAssert(NO, @"Unexpected type %d", dataType);
-  }
-}
-
-static size_t ComputeDictBoolFieldSize(BOOL value, uint32_t fieldNum, GPBDataType dataType) {
-  NSCAssert(dataType == GPBDataTypeBool, @"bad type: %d", dataType);
-  #pragma unused(dataType)  // For when asserts are off in release.
-  return GPBComputeBoolSize(fieldNum, value);
-}
-
-static void WriteDictBoolField(GPBCodedOutputStream *stream, BOOL value, uint32_t fieldNum, GPBDataType dataType) {
-  NSCAssert(dataType == GPBDataTypeBool, @"bad type: %d", dataType);
-  #pragma unused(dataType)  // For when asserts are off in release.
-  [stream writeBool:fieldNum value:value];
-}
-
-static size_t ComputeDictEnumFieldSize(int32_t value, uint32_t fieldNum, GPBDataType dataType) {
-  NSCAssert(dataType == GPBDataTypeEnum, @"bad type: %d", dataType);
-  #pragma unused(dataType)  // For when asserts are off in release.
-  return GPBComputeEnumSize(fieldNum, value);
-}
-
-static void WriteDictEnumField(GPBCodedOutputStream *stream, int32_t value, uint32_t fieldNum, GPBDataType dataType) {
-  NSCAssert(dataType == GPBDataTypeEnum, @"bad type: %d", dataType);
-  #pragma unused(dataType)  // For when asserts are off in release.
-  [stream writeEnum:fieldNum value:value];
-}
-
-static size_t ComputeDictFloatFieldSize(float value, uint32_t fieldNum, GPBDataType dataType) {
-  NSCAssert(dataType == GPBDataTypeFloat, @"bad type: %d", dataType);
-  #pragma unused(dataType)  // For when asserts are off in release.
-  return GPBComputeFloatSize(fieldNum, value);
-}
-
-static void WriteDictFloatField(GPBCodedOutputStream *stream, float value, uint32_t fieldNum, GPBDataType dataType) {
-  NSCAssert(dataType == GPBDataTypeFloat, @"bad type: %d", dataType);
-  #pragma unused(dataType)  // For when asserts are off in release.
-  [stream writeFloat:fieldNum value:value];
-}
-
-static size_t ComputeDictDoubleFieldSize(double value, uint32_t fieldNum, GPBDataType dataType) {
-  NSCAssert(dataType == GPBDataTypeDouble, @"bad type: %d", dataType);
-  #pragma unused(dataType)  // For when asserts are off in release.
-  return GPBComputeDoubleSize(fieldNum, value);
-}
-
-static void WriteDictDoubleField(GPBCodedOutputStream *stream, double value, uint32_t fieldNum, GPBDataType dataType) {
-  NSCAssert(dataType == GPBDataTypeDouble, @"bad type: %d", dataType);
-  #pragma unused(dataType)  // For when asserts are off in release.
-  [stream writeDouble:fieldNum value:value];
-}
-
-static size_t ComputeDictStringFieldSize(NSString *value, uint32_t fieldNum, GPBDataType dataType) {
-  NSCAssert(dataType == GPBDataTypeString, @"bad type: %d", dataType);
-  #pragma unused(dataType)  // For when asserts are off in release.
-  return GPBComputeStringSize(fieldNum, value);
-}
-
-static void WriteDictStringField(GPBCodedOutputStream *stream, NSString *value, uint32_t fieldNum, GPBDataType dataType) {
-  NSCAssert(dataType == GPBDataTypeString, @"bad type: %d", dataType);
-  #pragma unused(dataType)  // For when asserts are off in release.
-  [stream writeString:fieldNum value:value];
-}
-
-static size_t ComputeDictObjectFieldSize(id value, uint32_t fieldNum, GPBDataType dataType) {
-  if (dataType == GPBDataTypeMessage) {
-    return GPBComputeMessageSize(fieldNum, value);
-  } else if (dataType == GPBDataTypeString) {
-    return GPBComputeStringSize(fieldNum, value);
-  } else if (dataType == GPBDataTypeBytes) {
-    return GPBComputeBytesSize(fieldNum, value);
-  } else {
-    NSCAssert(NO, @"Unexpected type %d", dataType);
-    return 0;
-  }
-}
-
-static void WriteDictObjectField(GPBCodedOutputStream *stream, id value, uint32_t fieldNum, GPBDataType dataType) {
-  if (dataType == GPBDataTypeMessage) {
-    [stream writeMessage:fieldNum value:value];
-  } else if (dataType == GPBDataTypeString) {
-    [stream writeString:fieldNum value:value];
-  } else if (dataType == GPBDataTypeBytes) {
-    [stream writeBytes:fieldNum value:value];
-  } else {
-    NSCAssert(NO, @"Unexpected type %d", dataType);
-  }
-}
-
-// clang-format on
-//%PDDM-EXPAND-END SERIALIZE_SUPPORT_HELPERS()
-
-size_t GPBDictionaryComputeSizeInternalHelper(NSDictionary *dict, GPBFieldDescriptor *field) {
-  GPBDataType mapValueType = GPBGetFieldDataType(field);
-  size_t result = 0;
-  NSString *key;
-  NSEnumerator *keys = [dict keyEnumerator];
-  while ((key = [keys nextObject])) {
-    id obj = dict[key];
-    size_t msgSize = GPBComputeStringSize(kMapKeyFieldNumber, key);
-    msgSize += ComputeDictObjectFieldSize(obj, kMapValueFieldNumber, mapValueType);
-    result += GPBComputeRawVarint32SizeForInteger(msgSize) + msgSize;
-  }
-  size_t tagSize = GPBComputeWireFormatTagSize(GPBFieldNumber(field), GPBDataTypeMessage);
-  result += tagSize * dict.count;
-  return result;
-}
-
-void GPBDictionaryWriteToStreamInternalHelper(GPBCodedOutputStream *outputStream,
-                                              NSDictionary *dict,
-                                              GPBFieldDescriptor *field) {
-  NSCAssert(field.mapKeyDataType == GPBDataTypeString, @"Unexpected key type");
-  GPBDataType mapValueType = GPBGetFieldDataType(field);
-  uint32_t tag = GPBWireFormatMakeTag(GPBFieldNumber(field), GPBWireFormatLengthDelimited);
-  NSString *key;
-  NSEnumerator *keys = [dict keyEnumerator];
-  while ((key = [keys nextObject])) {
-    id obj = dict[key];
-    // Write the tag.
-    [outputStream writeInt32NoTag:tag];
-    // Write the size of the message.
-    size_t msgSize = GPBComputeStringSize(kMapKeyFieldNumber, key);
-    msgSize += ComputeDictObjectFieldSize(obj, kMapValueFieldNumber, mapValueType);
-
-    // Write the size and fields.
-    [outputStream writeInt32NoTag:(int32_t)msgSize];
-    [outputStream writeString:kMapKeyFieldNumber value:key];
-    WriteDictObjectField(outputStream, obj, kMapValueFieldNumber, mapValueType);
-  }
-}
-
-BOOL GPBDictionaryIsInitializedInternalHelper(NSDictionary *dict, GPBFieldDescriptor *field) {
-  NSCAssert(field.mapKeyDataType == GPBDataTypeString, @"Unexpected key type");
-  NSCAssert(GPBGetFieldDataType(field) == GPBDataTypeMessage, @"Unexpected value type");
-  #pragma unused(field)  // For when asserts are off in release.
-  GPBMessage *msg;
-  NSEnumerator *objects = [dict objectEnumerator];
-  while ((msg = [objects nextObject])) {
-    if (!msg.initialized) {
-      return NO;
-    }
-  }
-  return YES;
-}
-
-// Note: if the type is an object, it the retain pass back to the caller.
-static void ReadValue(GPBCodedInputStream *stream,
-                      GPBGenericValue *valueToFill,
-                      GPBDataType type,
-                      GPBExtensionRegistry *registry,
-                      GPBFieldDescriptor *field) {
-  switch (type) {
-    case GPBDataTypeBool:
-      valueToFill->valueBool = GPBCodedInputStreamReadBool(&stream->state_);
-      break;
-    case GPBDataTypeFixed32:
-      valueToFill->valueUInt32 = GPBCodedInputStreamReadFixed32(&stream->state_);
-      break;
-    case GPBDataTypeSFixed32:
-      valueToFill->valueInt32 = GPBCodedInputStreamReadSFixed32(&stream->state_);
-      break;
-    case GPBDataTypeFloat:
-      valueToFill->valueFloat = GPBCodedInputStreamReadFloat(&stream->state_);
-      break;
-    case GPBDataTypeFixed64:
-      valueToFill->valueUInt64 = GPBCodedInputStreamReadFixed64(&stream->state_);
-      break;
-    case GPBDataTypeSFixed64:
-      valueToFill->valueInt64 = GPBCodedInputStreamReadSFixed64(&stream->state_);
-      break;
-    case GPBDataTypeDouble:
-      valueToFill->valueDouble = GPBCodedInputStreamReadDouble(&stream->state_);
-      break;
-    case GPBDataTypeInt32:
-      valueToFill->valueInt32 = GPBCodedInputStreamReadInt32(&stream->state_);
-      break;
-    case GPBDataTypeInt64:
-      valueToFill->valueInt64 = GPBCodedInputStreamReadInt64(&stream->state_);
-      break;
-    case GPBDataTypeSInt32:
-      valueToFill->valueInt32 = GPBCodedInputStreamReadSInt32(&stream->state_);
-      break;
-    case GPBDataTypeSInt64:
-      valueToFill->valueInt64 = GPBCodedInputStreamReadSInt64(&stream->state_);
-      break;
-    case GPBDataTypeUInt32:
-      valueToFill->valueUInt32 = GPBCodedInputStreamReadUInt32(&stream->state_);
-      break;
-    case GPBDataTypeUInt64:
-      valueToFill->valueUInt64 = GPBCodedInputStreamReadUInt64(&stream->state_);
-      break;
-    case GPBDataTypeBytes:
-      [valueToFill->valueData release];
-      valueToFill->valueData = GPBCodedInputStreamReadRetainedBytes(&stream->state_);
-      break;
-    case GPBDataTypeString:
-      [valueToFill->valueString release];
-      valueToFill->valueString = GPBCodedInputStreamReadRetainedString(&stream->state_);
-      break;
-    case GPBDataTypeMessage: {
-      GPBMessage *message = [[field.msgClass alloc] init];
-      [stream readMessage:message extensionRegistry:registry];
-      [valueToFill->valueMessage release];
-      valueToFill->valueMessage = message;
-      break;
-    }
-    case GPBDataTypeGroup:
-      NSCAssert(NO, @"Can't happen");
-      break;
-    case GPBDataTypeEnum:
-      valueToFill->valueEnum = GPBCodedInputStreamReadEnum(&stream->state_);
-      break;
-  }
-}
-
-void GPBDictionaryReadEntry(id mapDictionary,
-                            GPBCodedInputStream *stream,
-                            GPBExtensionRegistry *registry,
-                            GPBFieldDescriptor *field,
-                            GPBMessage *parentMessage) {
-  GPBDataType keyDataType = field.mapKeyDataType;
-  GPBDataType valueDataType = GPBGetFieldDataType(field);
-
-  GPBGenericValue key;
-  GPBGenericValue value;
-  // Zero them (but pick up any enum default for proto2).
-  key.valueString = value.valueString = nil;
-  if (valueDataType == GPBDataTypeEnum) {
-    value = field.defaultValue;
-  }
-
-  GPBCodedInputStreamState *state = &stream->state_;
-  uint32_t keyTag =
-      GPBWireFormatMakeTag(kMapKeyFieldNumber, GPBWireFormatForType(keyDataType, NO));
-  uint32_t valueTag =
-      GPBWireFormatMakeTag(kMapValueFieldNumber, GPBWireFormatForType(valueDataType, NO));
-
-  BOOL hitError = NO;
-  while (YES) {
-    uint32_t tag = GPBCodedInputStreamReadTag(state);
-    if (tag == keyTag) {
-      ReadValue(stream, &key, keyDataType, registry, field);
-    } else if (tag == valueTag) {
-      ReadValue(stream, &value, valueDataType, registry, field);
-    } else if (tag == 0) {
-      // zero signals EOF / limit reached
-      break;
-    } else {  // Unknown
-      if (![stream skipField:tag]){
-        hitError = YES;
-        break;
-      }
-    }
-  }
-
-  if (!hitError) {
-    // Handle the special defaults and/or missing key/value.
-    if ((keyDataType == GPBDataTypeString) && (key.valueString == nil)) {
-      key.valueString = [@"" retain];
-    }
-    if (GPBDataTypeIsObject(valueDataType) && value.valueString == nil) {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wswitch-enum"
-      switch (valueDataType) {
-        case GPBDataTypeString:
-          value.valueString = [@"" retain];
-          break;
-        case GPBDataTypeBytes:
-          value.valueData = [GPBEmptyNSData() retain];
-          break;
-#if defined(__clang_analyzer__)
-        case GPBDataTypeGroup:
-          // Maps can't really have Groups as the value type, but this case is needed
-          // so the analyzer won't report the possibility of send nil in for the value
-          // in the NSMutableDictionary case below.
-#endif
-        case GPBDataTypeMessage: {
-          value.valueMessage = [[field.msgClass alloc] init];
-          break;
-        }
-        default:
-          // Nothing
-          break;
-      }
-#pragma clang diagnostic pop
-    }
-
-    if ((keyDataType == GPBDataTypeString) && GPBDataTypeIsObject(valueDataType)) {
-#if GPB_STATIC_ANALYZER_ONLY(6020053, 7000181)
-     // Limited to Xcode 6.4 - 7.2, are known to fail here. The upper end can
-     // be raised as needed for new Xcodes.
-     //
-     // This is only needed on a "shallow" analyze; on a "deep" analyze, the
-     // existing code path gets this correct. In shallow, the analyzer decides
-     // GPBDataTypeIsObject(valueDataType) is both false and true on a single
-     // path through this function, allowing nil to be used for the
-     // setObject:forKey:.
-     if (value.valueString == nil) {
-       value.valueString = [@"" retain];
-     }
-#endif
-      // mapDictionary is an NSMutableDictionary
-      [(NSMutableDictionary *)mapDictionary setObject:value.valueString
-                                               forKey:key.valueString];
-    } else {
-      if (valueDataType == GPBDataTypeEnum) {
-        if (GPBHasPreservingUnknownEnumSemantics([parentMessage descriptor].file.syntax) ||
-            [field isValidEnumValue:value.valueEnum]) {
-          [mapDictionary setGPBGenericValue:&value forGPBGenericValueKey:&key];
-        } else {
-          NSData *data = [mapDictionary serializedDataForUnknownValue:value.valueEnum
-                                                               forKey:&key
-                                                          keyDataType:keyDataType];
-          [parentMessage addUnknownMapEntry:GPBFieldNumber(field) value:data];
-        }
-      } else {
-        [mapDictionary setGPBGenericValue:&value forGPBGenericValueKey:&key];
-      }
-    }
-  }
-
-  if (GPBDataTypeIsObject(keyDataType)) {
-    [key.valueString release];
-  }
-  if (GPBDataTypeIsObject(valueDataType)) {
-    [value.valueString release];
-  }
-}
-
-//
-// Macros for the common basic cases.
-//
-
-//%PDDM-DEFINE DICTIONARY_IMPL_FOR_POD_KEY(KEY_NAME, KEY_TYPE)
-//%DICTIONARY_POD_IMPL_FOR_KEY(KEY_NAME, KEY_TYPE, , POD)
-//%DICTIONARY_POD_KEY_TO_OBJECT_IMPL(KEY_NAME, KEY_TYPE, Object, id)
-
-//%PDDM-DEFINE DICTIONARY_POD_IMPL_FOR_KEY(KEY_NAME, KEY_TYPE, KisP, KHELPER)
-//%DICTIONARY_KEY_TO_POD_IMPL(KEY_NAME, KEY_TYPE, KisP, UInt32, uint32_t, KHELPER)
-//%DICTIONARY_KEY_TO_POD_IMPL(KEY_NAME, KEY_TYPE, KisP, Int32, int32_t, KHELPER)
-//%DICTIONARY_KEY_TO_POD_IMPL(KEY_NAME, KEY_TYPE, KisP, UInt64, uint64_t, KHELPER)
-//%DICTIONARY_KEY_TO_POD_IMPL(KEY_NAME, KEY_TYPE, KisP, Int64, int64_t, KHELPER)
-//%DICTIONARY_KEY_TO_POD_IMPL(KEY_NAME, KEY_TYPE, KisP, Bool, BOOL, KHELPER)
-//%DICTIONARY_KEY_TO_POD_IMPL(KEY_NAME, KEY_TYPE, KisP, Float, float, KHELPER)
-//%DICTIONARY_KEY_TO_POD_IMPL(KEY_NAME, KEY_TYPE, KisP, Double, double, KHELPER)
-//%DICTIONARY_KEY_TO_ENUM_IMPL(KEY_NAME, KEY_TYPE, KisP, Enum, int32_t, KHELPER)
-
-//%PDDM-DEFINE DICTIONARY_KEY_TO_POD_IMPL(KEY_NAME, KEY_TYPE, KisP, VALUE_NAME, VALUE_TYPE, KHELPER)
-//%DICTIONARY_COMMON_IMPL(KEY_NAME, KEY_TYPE, KisP, VALUE_NAME, VALUE_TYPE, KHELPER, POD, VALUE_NAME, value)
-
-//%PDDM-DEFINE DICTIONARY_POD_KEY_TO_OBJECT_IMPL(KEY_NAME, KEY_TYPE, VALUE_NAME, VALUE_TYPE)
-//%DICTIONARY_COMMON_IMPL(KEY_NAME, KEY_TYPE, , VALUE_NAME, VALUE_TYPE, POD, OBJECT, Object, object)
-
-//%PDDM-DEFINE DICTIONARY_COMMON_IMPL(KEY_NAME, KEY_TYPE, KisP, VALUE_NAME, VALUE_TYPE, KHELPER, VHELPER, VNAME, VNAME_VAR)
-//%#pragma mark - KEY_NAME -> VALUE_NAME
-//%
-//%@implementation GPB##KEY_NAME##VALUE_NAME##Dictionary {
-//% @package
-//%  NSMutableDictionary *_dictionary;
-//%}
-//%
-//%- (instancetype)init {
-//%  return [self initWith##VNAME##s:NULL forKeys:NULL count:0];
-//%}
-//%
-//%- (instancetype)initWith##VNAME##s:(const VALUE_TYPE [])##VNAME_VAR##s
-//%                ##VNAME$S##  forKeys:(const KEY_TYPE##KisP$S##KisP [])keys
-//%                ##VNAME$S##    count:(NSUInteger)count {
-//%  self = [super init];
-//%  if (self) {
-//%    _dictionary = [[NSMutableDictionary alloc] init];
-//%    if (count && VNAME_VAR##s && keys) {
-//%      for (NSUInteger i = 0; i < count; ++i) {
-//%DICTIONARY_VALIDATE_VALUE_##VHELPER(VNAME_VAR##s[i], ______)##DICTIONARY_VALIDATE_KEY_##KHELPER(keys[i], ______)        [_dictionary setObject:WRAPPED##VHELPER(VNAME_VAR##s[i]) forKey:WRAPPED##KHELPER(keys[i])];
-//%      }
-//%    }
-//%  }
-//%  return self;
-//%}
-//%
-//%- (instancetype)initWithDictionary:(GPB##KEY_NAME##VALUE_NAME##Dictionary *)dictionary {
-//%  self = [self initWith##VNAME##s:NULL forKeys:NULL count:0];
-//%  if (self) {
-//%    if (dictionary) {
-//%      [_dictionary addEntriesFromDictionary:dictionary->_dictionary];
-//%    }
-//%  }
-//%  return self;
-//%}
-//%
-//%- (instancetype)initWithCapacity:(NSUInteger)numItems {
-//%  #pragma unused(numItems)
-//%  return [self initWith##VNAME##s:NULL forKeys:NULL count:0];
-//%}
-//%
-//%DICTIONARY_IMMUTABLE_CORE(KEY_NAME, KEY_TYPE, KisP, VALUE_NAME, VALUE_TYPE, KHELPER, VHELPER, VNAME, VNAME_VAR, )
-//%
-//%VALUE_FOR_KEY_##VHELPER(KEY_TYPE##KisP$S##KisP, VALUE_NAME, VALUE_TYPE, KHELPER)
-//%
-//%DICTIONARY_MUTABLE_CORE(KEY_NAME, KEY_TYPE, KisP, VALUE_NAME, VALUE_TYPE, KHELPER, VHELPER, VNAME, VNAME_VAR, )
-//%
-//%@end
-//%
-
-//%PDDM-DEFINE DICTIONARY_KEY_TO_ENUM_IMPL(KEY_NAME, KEY_TYPE, KisP, VALUE_NAME, VALUE_TYPE, KHELPER)
-//%DICTIONARY_KEY_TO_ENUM_IMPL2(KEY_NAME, KEY_TYPE, KisP, VALUE_NAME, VALUE_TYPE, KHELPER, POD)
-//%PDDM-DEFINE DICTIONARY_KEY_TO_ENUM_IMPL2(KEY_NAME, KEY_TYPE, KisP, VALUE_NAME, VALUE_TYPE, KHELPER, VHELPER)
-//%#pragma mark - KEY_NAME -> VALUE_NAME
-//%
-//%@implementation GPB##KEY_NAME##VALUE_NAME##Dictionary {
-//% @package
-//%  NSMutableDictionary *_dictionary;
-//%  GPBEnumValidationFunc _validationFunc;
-//%}
-//%
-//%@synthesize validationFunc = _validationFunc;
-//%
-//%- (instancetype)init {
-//%  return [self initWithValidationFunction:NULL rawValues:NULL forKeys:NULL count:0];
-//%}
-//%
-//%- (instancetype)initWithValidationFunction:(GPBEnumValidationFunc)func {
-//%  return [self initWithValidationFunction:func rawValues:NULL forKeys:NULL count:0];
-//%}
-//%
-//%- (instancetype)initWithValidationFunction:(GPBEnumValidationFunc)func
-//%                                 rawValues:(const VALUE_TYPE [])rawValues
-//%                                   forKeys:(const KEY_TYPE##KisP$S##KisP [])keys
-//%                                     count:(NSUInteger)count {
-//%  self = [super init];
-//%  if (self) {
-//%    _dictionary = [[NSMutableDictionary alloc] init];
-//%    _validationFunc = (func != NULL ? func : DictDefault_IsValidValue);
-//%    if (count && rawValues && keys) {
-//%      for (NSUInteger i = 0; i < count; ++i) {
-//%DICTIONARY_VALIDATE_KEY_##KHELPER(keys[i], ______)        [_dictionary setObject:WRAPPED##VHELPER(rawValues[i]) forKey:WRAPPED##KHELPER(keys[i])];
-//%      }
-//%    }
-//%  }
-//%  return self;
-//%}
-//%
-//%- (instancetype)initWithDictionary:(GPB##KEY_NAME##VALUE_NAME##Dictionary *)dictionary {
-//%  self = [self initWithValidationFunction:dictionary.validationFunc
-//%                                rawValues:NULL
-//%                                  forKeys:NULL
-//%                                    count:0];
-//%  if (self) {
-//%    if (dictionary) {
-//%      [_dictionary addEntriesFromDictionary:dictionary->_dictionary];
-//%    }
-//%  }
-//%  return self;
-//%}
-//%
-//%- (instancetype)initWithValidationFunction:(GPBEnumValidationFunc)func
-//%                                  capacity:(NSUInteger)numItems {
-//%  #pragma unused(numItems)
-//%  return [self initWithValidationFunction:func rawValues:NULL forKeys:NULL count:0];
-//%}
-//%
-//%DICTIONARY_IMMUTABLE_CORE(KEY_NAME, KEY_TYPE, KisP, VALUE_NAME, VALUE_TYPE, KHELPER, VHELPER, Value, value, Raw)
-//%
-//%- (BOOL)getEnum:(VALUE_TYPE *)value forKey:(KEY_TYPE##KisP$S##KisP)key {
-//%  NSNumber *wrapped = [_dictionary objectForKey:WRAPPED##KHELPER(key)];
-//%  if (wrapped && value) {
-//%    VALUE_TYPE result = UNWRAP##VALUE_NAME(wrapped);
-//%    if (!_validationFunc(result)) {
-//%      result = kGPBUnrecognizedEnumeratorValue;
-//%    }
-//%    *value = result;
-//%  }
-//%  return (wrapped != NULL);
-//%}
-//%
-//%- (BOOL)getRawValue:(VALUE_TYPE *)rawValue forKey:(KEY_TYPE##KisP$S##KisP)key {
-//%  NSNumber *wrapped = [_dictionary objectForKey:WRAPPED##KHELPER(key)];
-//%  if (wrapped && rawValue) {
-//%    *rawValue = UNWRAP##VALUE_NAME(wrapped);
-//%  }
-//%  return (wrapped != NULL);
-//%}
-//%
-//%- (void)enumerateKeysAndEnumsUsingBlock:
-//%    (void (NS_NOESCAPE ^)(KEY_TYPE KisP##key, VALUE_TYPE value, BOOL *stop))block {
-//%  GPBEnumValidationFunc func = _validationFunc;
-//%  BOOL stop = NO;
-//%  NSEnumerator *keys = [_dictionary keyEnumerator];
-//%  ENUM_TYPE##KHELPER(KEY_TYPE)##aKey;
-//%  while ((aKey = [keys nextObject])) {
-//%    ENUM_TYPE##VHELPER(VALUE_TYPE)##aValue = _dictionary[aKey];
-//%      VALUE_TYPE unwrapped = UNWRAP##VALUE_NAME(aValue);
-//%      if (!func(unwrapped)) {
-//%        unwrapped = kGPBUnrecognizedEnumeratorValue;
-//%      }
-//%    block(UNWRAP##KEY_NAME(aKey), unwrapped, &stop);
-//%    if (stop) {
-//%      break;
-//%    }
-//%  }
-//%}
-//%
-//%DICTIONARY_MUTABLE_CORE2(KEY_NAME, KEY_TYPE, KisP, VALUE_NAME, VALUE_TYPE, KHELPER, VHELPER, Value, Enum, value, Raw)
-//%
-//%- (void)setEnum:(VALUE_TYPE)value forKey:(KEY_TYPE##KisP$S##KisP)key {
-//%DICTIONARY_VALIDATE_KEY_##KHELPER(key, )  if (!_validationFunc(value)) {
-//%    [NSException raise:NSInvalidArgumentException
-//%                format:@"GPB##KEY_NAME##VALUE_NAME##Dictionary: Attempt to set an unknown enum value (%d)",
-//%                       value];
-//%  }
-//%
-//%  [_dictionary setObject:WRAPPED##VHELPER(value) forKey:WRAPPED##KHELPER(key)];
-//%  if (_autocreator) {
-//%    GPBAutocreatedDictionaryModified(_autocreator, self);
-//%  }
-//%}
-//%
-//%@end
-//%
-
-//%PDDM-DEFINE DICTIONARY_IMMUTABLE_CORE(KEY_NAME, KEY_TYPE, KisP, VALUE_NAME, VALUE_TYPE, KHELPER, VHELPER, VNAME, VNAME_VAR, ACCESSOR_NAME)
-//%- (void)dealloc {
-//%  NSAssert(!_autocreator,
-//%           @"%@: Autocreator must be cleared before release, autocreator: %@",
-//%           [self class], _autocreator);
-//%  [_dictionary release];
-//%  [super dealloc];
-//%}
-//%
-//%- (instancetype)copyWithZone:(NSZone *)zone {
-//%  return [[GPB##KEY_NAME##VALUE_NAME##Dictionary allocWithZone:zone] initWithDictionary:self];
-//%}
-//%
-//%- (BOOL)isEqual:(id)other {
-//%  if (self == other) {
-//%    return YES;
-//%  }
-//%  if (![other isKindOfClass:[GPB##KEY_NAME##VALUE_NAME##Dictionary class]]) {
-//%    return NO;
-//%  }
-//%  GPB##KEY_NAME##VALUE_NAME##Dictionary *otherDictionary = other;
-//%  return [_dictionary isEqual:otherDictionary->_dictionary];
-//%}
-//%
-//%- (NSUInteger)hash {
-//%  return _dictionary.count;
-//%}
-//%
-//%- (NSString *)description {
-//%  return [NSString stringWithFormat:@"<%@ %p> { %@ }", [self class], self, _dictionary];
-//%}
-//%
-//%- (NSUInteger)count {
-//%  return _dictionary.count;
-//%}
-//%
-//%- (void)enumerateKeysAnd##ACCESSOR_NAME##VNAME##sUsingBlock:
-//%    (void (NS_NOESCAPE ^)(KEY_TYPE KisP##key, VALUE_TYPE VNAME_VAR, BOOL *stop))block {
-//%  BOOL stop = NO;
-//%  NSDictionary *internal = _dictionary;
-//%  NSEnumerator *keys = [internal keyEnumerator];
-//%  ENUM_TYPE##KHELPER(KEY_TYPE)##aKey;
-//%  while ((aKey = [keys nextObject])) {
-//%    ENUM_TYPE##VHELPER(VALUE_TYPE)##a##VNAME_VAR$u = internal[aKey];
-//%    block(UNWRAP##KEY_NAME(aKey), UNWRAP##VALUE_NAME(a##VNAME_VAR$u), &stop);
-//%    if (stop) {
-//%      break;
-//%    }
-//%  }
-//%}
-//%
-//%EXTRA_METHODS_##VHELPER(KEY_NAME, VALUE_NAME)- (size_t)computeSerializedSizeAsField:(GPBFieldDescriptor *)field {
-//%  NSDictionary *internal = _dictionary;
-//%  NSUInteger count = internal.count;
-//%  if (count == 0) {
-//%    return 0;
-//%  }
-//%
-//%  GPBDataType valueDataType = GPBGetFieldDataType(field);
-//%  GPBDataType keyDataType = field.mapKeyDataType;
-//%  size_t result = 0;
-//%  NSEnumerator *keys = [internal keyEnumerator];
-//%  ENUM_TYPE##KHELPER(KEY_TYPE)##aKey;
-//%  while ((aKey = [keys nextObject])) {
-//%    ENUM_TYPE##VHELPER(VALUE_TYPE)##a##VNAME_VAR$u = internal[aKey];
-//%    size_t msgSize = ComputeDict##KEY_NAME##FieldSize(UNWRAP##KEY_NAME(aKey), kMapKeyFieldNumber, keyDataType);
-//%    msgSize += ComputeDict##VALUE_NAME##FieldSize(UNWRAP##VALUE_NAME(a##VNAME_VAR$u), kMapValueFieldNumber, valueDataType);
-//%    result += GPBComputeRawVarint32SizeForInteger(msgSize) + msgSize;
-//%  }
-//%  size_t tagSize = GPBComputeWireFormatTagSize(GPBFieldNumber(field), GPBDataTypeMessage);
-//%  result += tagSize * count;
-//%  return result;
-//%}
-//%
-//%- (void)writeToCodedOutputStream:(GPBCodedOutputStream *)outputStream
-//%                         asField:(GPBFieldDescriptor *)field {
-//%  GPBDataType valueDataType = GPBGetFieldDataType(field);
-//%  GPBDataType keyDataType = field.mapKeyDataType;
-//%  uint32_t tag = GPBWireFormatMakeTag(GPBFieldNumber(field), GPBWireFormatLengthDelimited);
-//%  NSDictionary *internal = _dictionary;
-//%  NSEnumerator *keys = [internal keyEnumerator];
-//%  ENUM_TYPE##KHELPER(KEY_TYPE)##aKey;
-//%  while ((aKey = [keys nextObject])) {
-//%    ENUM_TYPE##VHELPER(VALUE_TYPE)##a##VNAME_VAR$u = internal[aKey];
-//%    [outputStream writeInt32NoTag:tag];
-//%    // Write the size of the message.
-//%    KEY_TYPE KisP##unwrappedKey = UNWRAP##KEY_NAME(aKey);
-//%    VALUE_TYPE unwrappedValue = UNWRAP##VALUE_NAME(a##VNAME_VAR$u);
-//%    size_t msgSize = ComputeDict##KEY_NAME##FieldSize(unwrappedKey, kMapKeyFieldNumber, keyDataType);
-//%    msgSize += ComputeDict##VALUE_NAME##FieldSize(unwrappedValue, kMapValueFieldNumber, valueDataType);
-//%    [outputStream writeInt32NoTag:(int32_t)msgSize];
-//%    // Write the fields.
-//%    WriteDict##KEY_NAME##Field(outputStream, unwrappedKey, kMapKeyFieldNumber, keyDataType);
-//%    WriteDict##VALUE_NAME##Field(outputStream, unwrappedValue, kMapValueFieldNumber, valueDataType);
-//%  }
-//%}
-//%
-//%SERIAL_DATA_FOR_ENTRY_##VHELPER(KEY_NAME, VALUE_NAME)- (void)setGPBGenericValue:(GPBGenericValue *)value
-//%     forGPBGenericValueKey:(GPBGenericValue *)key {
-//%  [_dictionary setObject:WRAPPED##VHELPER(value->##GPBVALUE_##VHELPER(VALUE_NAME)##) forKey:WRAPPED##KHELPER(key->value##KEY_NAME)];
-//%}
-//%
-//%- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
-//%  [self enumerateKeysAnd##ACCESSOR_NAME##VNAME##sUsingBlock:^(KEY_TYPE KisP##key, VALUE_TYPE VNAME_VAR, BOOL *stop) {
-//%      #pragma unused(stop)
-//%      block(TEXT_FORMAT_OBJ##KEY_NAME(key), TEXT_FORMAT_OBJ##VALUE_NAME(VNAME_VAR));
-//%  }];
-//%}
-//%PDDM-DEFINE DICTIONARY_MUTABLE_CORE(KEY_NAME, KEY_TYPE, KisP, VALUE_NAME, VALUE_TYPE, KHELPER, VHELPER, VNAME, VNAME_VAR, ACCESSOR_NAME)
-//%DICTIONARY_MUTABLE_CORE2(KEY_NAME, KEY_TYPE, KisP, VALUE_NAME, VALUE_TYPE, KHELPER, VHELPER, VNAME, VNAME, VNAME_VAR, ACCESSOR_NAME)
-//%PDDM-DEFINE DICTIONARY_MUTABLE_CORE2(KEY_NAME, KEY_TYPE, KisP, VALUE_NAME, VALUE_TYPE, KHELPER, VHELPER, VNAME, VNAME_REMOVE, VNAME_VAR, ACCESSOR_NAME)
-//%- (void)add##ACCESSOR_NAME##EntriesFromDictionary:(GPB##KEY_NAME##VALUE_NAME##Dictionary *)otherDictionary {
-//%  if (otherDictionary) {
-//%    [_dictionary addEntriesFromDictionary:otherDictionary->_dictionary];
-//%    if (_autocreator) {
-//%      GPBAutocreatedDictionaryModified(_autocreator, self);
-//%    }
-//%  }
-//%}
-//%
-//%- (void)set##ACCESSOR_NAME##VNAME##:(VALUE_TYPE)VNAME_VAR forKey:(KEY_TYPE##KisP$S##KisP)key {
-//%DICTIONARY_VALIDATE_VALUE_##VHELPER(VNAME_VAR, )##DICTIONARY_VALIDATE_KEY_##KHELPER(key, )  [_dictionary setObject:WRAPPED##VHELPER(VNAME_VAR) forKey:WRAPPED##KHELPER(key)];
-//%  if (_autocreator) {
-//%    GPBAutocreatedDictionaryModified(_autocreator, self);
-//%  }
-//%}
-//%
-//%- (void)remove##VNAME_REMOVE##ForKey:(KEY_TYPE##KisP$S##KisP)aKey {
-//%  [_dictionary removeObjectForKey:WRAPPED##KHELPER(aKey)];
-//%}
-//%
-//%- (void)removeAll {
-//%  [_dictionary removeAllObjects];
-//%}
-
-//
-// Custom Generation for Bool keys
-//
-
-//%PDDM-DEFINE DICTIONARY_BOOL_KEY_TO_POD_IMPL(VALUE_NAME, VALUE_TYPE)
-//%DICTIONARY_BOOL_KEY_TO_VALUE_IMPL(VALUE_NAME, VALUE_TYPE, POD, VALUE_NAME, value)
-//%PDDM-DEFINE DICTIONARY_BOOL_KEY_TO_OBJECT_IMPL(VALUE_NAME, VALUE_TYPE)
-//%DICTIONARY_BOOL_KEY_TO_VALUE_IMPL(VALUE_NAME, VALUE_TYPE, OBJECT, Object, object)
-
-//%PDDM-DEFINE DICTIONARY_BOOL_KEY_TO_VALUE_IMPL(VALUE_NAME, VALUE_TYPE, HELPER, VNAME, VNAME_VAR)
-//%#pragma mark - Bool -> VALUE_NAME
-//%
-//%@implementation GPBBool##VALUE_NAME##Dictionary {
-//% @package
-//%  VALUE_TYPE _values[2];
-//%BOOL_DICT_HAS_STORAGE_##HELPER()}
-//%
-//%- (instancetype)init {
-//%  return [self initWith##VNAME##s:NULL forKeys:NULL count:0];
-//%}
-//%
-//%BOOL_DICT_INITS_##HELPER(VALUE_NAME, VALUE_TYPE)
-//%
-//%- (instancetype)initWithCapacity:(NSUInteger)numItems {
-//%  #pragma unused(numItems)
-//%  return [self initWith##VNAME##s:NULL forKeys:NULL count:0];
-//%}
-//%
-//%BOOL_DICT_DEALLOC##HELPER()
-//%
-//%- (instancetype)copyWithZone:(NSZone *)zone {
-//%  return [[GPBBool##VALUE_NAME##Dictionary allocWithZone:zone] initWithDictionary:self];
-//%}
-//%
-//%- (BOOL)isEqual:(id)other {
-//%  if (self == other) {
-//%    return YES;
-//%  }
-//%  if (![other isKindOfClass:[GPBBool##VALUE_NAME##Dictionary class]]) {
-//%    return NO;
-//%  }
-//%  GPBBool##VALUE_NAME##Dictionary *otherDictionary = other;
-//%  if ((BOOL_DICT_W_HAS##HELPER(0, ) != BOOL_DICT_W_HAS##HELPER(0, otherDictionary->)) ||
-//%      (BOOL_DICT_W_HAS##HELPER(1, ) != BOOL_DICT_W_HAS##HELPER(1, otherDictionary->))) {
-//%    return NO;
-//%  }
-//%  if ((BOOL_DICT_W_HAS##HELPER(0, ) && (NEQ_##HELPER(_values[0], otherDictionary->_values[0]))) ||
-//%      (BOOL_DICT_W_HAS##HELPER(1, ) && (NEQ_##HELPER(_values[1], otherDictionary->_values[1])))) {
-//%    return NO;
-//%  }
-//%  return YES;
-//%}
-//%
-//%- (NSUInteger)hash {
-//%  return (BOOL_DICT_W_HAS##HELPER(0, ) ? 1 : 0) + (BOOL_DICT_W_HAS##HELPER(1, ) ? 1 : 0);
-//%}
-//%
-//%- (NSString *)description {
-//%  NSMutableString *result = [NSMutableString stringWithFormat:@"<%@ %p> {", [self class], self];
-//%  if (BOOL_DICT_W_HAS##HELPER(0, )) {
-//%    [result appendFormat:@"NO: STR_FORMAT_##HELPER(VALUE_NAME)", _values[0]];
-//%  }
-//%  if (BOOL_DICT_W_HAS##HELPER(1, )) {
-//%    [result appendFormat:@"YES: STR_FORMAT_##HELPER(VALUE_NAME)", _values[1]];
-//%  }
-//%  [result appendString:@" }"];
-//%  return result;
-//%}
-//%
-//%- (NSUInteger)count {
-//%  return (BOOL_DICT_W_HAS##HELPER(0, ) ? 1 : 0) + (BOOL_DICT_W_HAS##HELPER(1, ) ? 1 : 0);
-//%}
-//%
-//%BOOL_VALUE_FOR_KEY_##HELPER(VALUE_NAME, VALUE_TYPE)
-//%
-//%BOOL_SET_GPBVALUE_FOR_KEY_##HELPER(VALUE_NAME, VALUE_TYPE, VisP)
-//%
-//%- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
-//%  if (BOOL_DICT_HAS##HELPER(0, )) {
-//%    block(@"false", TEXT_FORMAT_OBJ##VALUE_NAME(_values[0]));
-//%  }
-//%  if (BOOL_DICT_W_HAS##HELPER(1, )) {
-//%    block(@"true", TEXT_FORMAT_OBJ##VALUE_NAME(_values[1]));
-//%  }
-//%}
-//%
-//%- (void)enumerateKeysAnd##VNAME##sUsingBlock:
-//%    (void (NS_NOESCAPE ^)(BOOL key, VALUE_TYPE VNAME_VAR, BOOL *stop))block {
-//%  BOOL stop = NO;
-//%  if (BOOL_DICT_HAS##HELPER(0, )) {
-//%    block(NO, _values[0], &stop);
-//%  }
-//%  if (!stop && BOOL_DICT_W_HAS##HELPER(1, )) {
-//%    block(YES, _values[1], &stop);
-//%  }
-//%}
-//%
-//%BOOL_EXTRA_METHODS_##HELPER(Bool, VALUE_NAME)- (size_t)computeSerializedSizeAsField:(GPBFieldDescriptor *)field {
-//%  GPBDataType valueDataType = GPBGetFieldDataType(field);
-//%  NSUInteger count = 0;
-//%  size_t result = 0;
-//%  for (int i = 0; i < 2; ++i) {
-//%    if (BOOL_DICT_HAS##HELPER(i, )) {
-//%      ++count;
-//%      size_t msgSize = ComputeDictBoolFieldSize((i == 1), kMapKeyFieldNumber, GPBDataTypeBool);
-//%      msgSize += ComputeDict##VALUE_NAME##FieldSize(_values[i], kMapValueFieldNumber, valueDataType);
-//%      result += GPBComputeRawVarint32SizeForInteger(msgSize) + msgSize;
-//%    }
-//%  }
-//%  size_t tagSize = GPBComputeWireFormatTagSize(GPBFieldNumber(field), GPBDataTypeMessage);
-//%  result += tagSize * count;
-//%  return result;
-//%}
-//%
-//%- (void)writeToCodedOutputStream:(GPBCodedOutputStream *)outputStream
-//%                         asField:(GPBFieldDescriptor *)field {
-//%  GPBDataType valueDataType = GPBGetFieldDataType(field);
-//%  uint32_t tag = GPBWireFormatMakeTag(GPBFieldNumber(field), GPBWireFormatLengthDelimited);
-//%  for (int i = 0; i < 2; ++i) {
-//%    if (BOOL_DICT_HAS##HELPER(i, )) {
-//%      // Write the tag.
-//%      [outputStream writeInt32NoTag:tag];
-//%      // Write the size of the message.
-//%      size_t msgSize = ComputeDictBoolFieldSize((i == 1), kMapKeyFieldNumber, GPBDataTypeBool);
-//%      msgSize += ComputeDict##VALUE_NAME##FieldSize(_values[i], kMapValueFieldNumber, valueDataType);
-//%      [outputStream writeInt32NoTag:(int32_t)msgSize];
-//%      // Write the fields.
-//%      WriteDictBoolField(outputStream, (i == 1), kMapKeyFieldNumber, GPBDataTypeBool);
-//%      WriteDict##VALUE_NAME##Field(outputStream, _values[i], kMapValueFieldNumber, valueDataType);
-//%    }
-//%  }
-//%}
-//%
-//%BOOL_DICT_MUTATIONS_##HELPER(VALUE_NAME, VALUE_TYPE)
-//%
-//%@end
-//%
-
-
-//
-// Helpers for PODs
-//
-
-//%PDDM-DEFINE VALUE_FOR_KEY_POD(KEY_TYPE, VALUE_NAME, VALUE_TYPE, KHELPER)
-//%- (BOOL)get##VALUE_NAME##:(nullable VALUE_TYPE *)value forKey:(KEY_TYPE)key {
-//%  NSNumber *wrapped = [_dictionary objectForKey:WRAPPED##KHELPER(key)];
-//%  if (wrapped && value) {
-//%    *value = UNWRAP##VALUE_NAME(wrapped);
-//%  }
-//%  return (wrapped != NULL);
-//%}
-//%PDDM-DEFINE WRAPPEDPOD(VALUE)
-//%@(VALUE)
-//%PDDM-DEFINE UNWRAPUInt32(VALUE)
-//%[VALUE unsignedIntValue]
-//%PDDM-DEFINE UNWRAPInt32(VALUE)
-//%[VALUE intValue]
-//%PDDM-DEFINE UNWRAPUInt64(VALUE)
-//%[VALUE unsignedLongLongValue]
-//%PDDM-DEFINE UNWRAPInt64(VALUE)
-//%[VALUE longLongValue]
-//%PDDM-DEFINE UNWRAPBool(VALUE)
-//%[VALUE boolValue]
-//%PDDM-DEFINE UNWRAPFloat(VALUE)
-//%[VALUE floatValue]
-//%PDDM-DEFINE UNWRAPDouble(VALUE)
-//%[VALUE doubleValue]
-//%PDDM-DEFINE UNWRAPEnum(VALUE)
-//%[VALUE intValue]
-//%PDDM-DEFINE TEXT_FORMAT_OBJUInt32(VALUE)
-//%[NSString stringWithFormat:@"%u", VALUE]
-//%PDDM-DEFINE TEXT_FORMAT_OBJInt32(VALUE)
-//%[NSString stringWithFormat:@"%d", VALUE]
-//%PDDM-DEFINE TEXT_FORMAT_OBJUInt64(VALUE)
-//%[NSString stringWithFormat:@"%llu", VALUE]
-//%PDDM-DEFINE TEXT_FORMAT_OBJInt64(VALUE)
-//%[NSString stringWithFormat:@"%lld", VALUE]
-//%PDDM-DEFINE TEXT_FORMAT_OBJBool(VALUE)
-//%(VALUE ? @"true" : @"false")
-//%PDDM-DEFINE TEXT_FORMAT_OBJFloat(VALUE)
-//%[NSString stringWithFormat:@"%.*g", FLT_DIG, VALUE]
-//%PDDM-DEFINE TEXT_FORMAT_OBJDouble(VALUE)
-//%[NSString stringWithFormat:@"%.*lg", DBL_DIG, VALUE]
-//%PDDM-DEFINE TEXT_FORMAT_OBJEnum(VALUE)
-//%@(VALUE)
-//%PDDM-DEFINE ENUM_TYPEPOD(TYPE)
-//%NSNumber *
-//%PDDM-DEFINE NEQ_POD(VAL1, VAL2)
-//%VAL1 != VAL2
-//%PDDM-DEFINE EXTRA_METHODS_POD(KEY_NAME, VALUE_NAME)
-// Empty
-//%PDDM-DEFINE BOOL_EXTRA_METHODS_POD(KEY_NAME, VALUE_NAME)
-// Empty
-//%PDDM-DEFINE SERIAL_DATA_FOR_ENTRY_POD(KEY_NAME, VALUE_NAME)
-//%SERIAL_DATA_FOR_ENTRY_POD_##VALUE_NAME(KEY_NAME)
-//%PDDM-DEFINE SERIAL_DATA_FOR_ENTRY_POD_UInt32(KEY_NAME)
-// Empty
-//%PDDM-DEFINE SERIAL_DATA_FOR_ENTRY_POD_Int32(KEY_NAME)
-// Empty
-//%PDDM-DEFINE SERIAL_DATA_FOR_ENTRY_POD_UInt64(KEY_NAME)
-// Empty
-//%PDDM-DEFINE SERIAL_DATA_FOR_ENTRY_POD_Int64(KEY_NAME)
-// Empty
-//%PDDM-DEFINE SERIAL_DATA_FOR_ENTRY_POD_Bool(KEY_NAME)
-// Empty
-//%PDDM-DEFINE SERIAL_DATA_FOR_ENTRY_POD_Float(KEY_NAME)
-// Empty
-//%PDDM-DEFINE SERIAL_DATA_FOR_ENTRY_POD_Double(KEY_NAME)
-// Empty
-//%PDDM-DEFINE SERIAL_DATA_FOR_ENTRY_POD_Enum(KEY_NAME)
-//%- (NSData *)serializedDataForUnknownValue:(int32_t)value
-//%                                   forKey:(GPBGenericValue *)key
-//%                              keyDataType:(GPBDataType)keyDataType {
-//%  size_t msgSize = ComputeDict##KEY_NAME##FieldSize(key->value##KEY_NAME, kMapKeyFieldNumber, keyDataType);
-//%  msgSize += ComputeDictEnumFieldSize(value, kMapValueFieldNumber, GPBDataTypeEnum);
-//%  NSMutableData *data = [NSMutableData dataWithLength:msgSize];
-//%  GPBCodedOutputStream *outputStream = [[GPBCodedOutputStream alloc] initWithData:data];
-//%  WriteDict##KEY_NAME##Field(outputStream, key->value##KEY_NAME, kMapKeyFieldNumber, keyDataType);
-//%  WriteDictEnumField(outputStream, value, kMapValueFieldNumber, GPBDataTypeEnum);
-//%  [outputStream release];
-//%  return data;
-//%}
-//%
-//%PDDM-DEFINE GPBVALUE_POD(VALUE_NAME)
-//%value##VALUE_NAME
-//%PDDM-DEFINE DICTIONARY_VALIDATE_VALUE_POD(VALUE_NAME, EXTRA_INDENT)
-// Empty
-//%PDDM-DEFINE DICTIONARY_VALIDATE_KEY_POD(KEY_NAME, EXTRA_INDENT)
-// Empty
-
-//%PDDM-DEFINE BOOL_DICT_HAS_STORAGE_POD()
-//%  BOOL _valueSet[2];
-//%
-//%PDDM-DEFINE BOOL_DICT_INITS_POD(VALUE_NAME, VALUE_TYPE)
-//%- (instancetype)initWith##VALUE_NAME##s:(const VALUE_TYPE [])values
-//%                 ##VALUE_NAME$S## forKeys:(const BOOL [])keys
-//%                 ##VALUE_NAME$S##   count:(NSUInteger)count {
-//%  self = [super init];
-//%  if (self) {
-//%    for (NSUInteger i = 0; i < count; ++i) {
-//%      int idx = keys[i] ? 1 : 0;
-//%      _values[idx] = values[i];
-//%      _valueSet[idx] = YES;
-//%    }
-//%  }
-//%  return self;
-//%}
-//%
-//%- (instancetype)initWithDictionary:(GPBBool##VALUE_NAME##Dictionary *)dictionary {
-//%  self = [self initWith##VALUE_NAME##s:NULL forKeys:NULL count:0];
-//%  if (self) {
-//%    if (dictionary) {
-//%      for (int i = 0; i < 2; ++i) {
-//%        if (dictionary->_valueSet[i]) {
-//%          _values[i] = dictionary->_values[i];
-//%          _valueSet[i] = YES;
-//%        }
-//%      }
-//%    }
-//%  }
-//%  return self;
-//%}
-//%PDDM-DEFINE BOOL_DICT_DEALLOCPOD()
-//%#if !defined(NS_BLOCK_ASSERTIONS)
-//%- (void)dealloc {
-//%  NSAssert(!_autocreator,
-//%           @"%@: Autocreator must be cleared before release, autocreator: %@",
-//%           [self class], _autocreator);
-//%  [super dealloc];
-//%}
-//%#endif  // !defined(NS_BLOCK_ASSERTIONS)
-//%PDDM-DEFINE BOOL_DICT_W_HASPOD(IDX, REF)
-//%BOOL_DICT_HASPOD(IDX, REF)
-//%PDDM-DEFINE BOOL_DICT_HASPOD(IDX, REF)
-//%REF##_valueSet[IDX]
-//%PDDM-DEFINE BOOL_VALUE_FOR_KEY_POD(VALUE_NAME, VALUE_TYPE)
-//%- (BOOL)get##VALUE_NAME##:(VALUE_TYPE *)value forKey:(BOOL)key {
-//%  int idx = (key ? 1 : 0);
-//%  if (_valueSet[idx]) {
-//%    if (value) {
-//%      *value = _values[idx];
-//%    }
-//%    return YES;
-//%  }
-//%  return NO;
-//%}
-//%PDDM-DEFINE BOOL_SET_GPBVALUE_FOR_KEY_POD(VALUE_NAME, VALUE_TYPE, VisP)
-//%- (void)setGPBGenericValue:(GPBGenericValue *)value
-//%     forGPBGenericValueKey:(GPBGenericValue *)key {
-//%  int idx = (key->valueBool ? 1 : 0);
-//%  _values[idx] = value->value##VALUE_NAME;
-//%  _valueSet[idx] = YES;
-//%}
-//%PDDM-DEFINE BOOL_DICT_MUTATIONS_POD(VALUE_NAME, VALUE_TYPE)
-//%- (void)addEntriesFromDictionary:(GPBBool##VALUE_NAME##Dictionary *)otherDictionary {
-//%  if (otherDictionary) {
-//%    for (int i = 0; i < 2; ++i) {
-//%      if (otherDictionary->_valueSet[i]) {
-//%        _valueSet[i] = YES;
-//%        _values[i] = otherDictionary->_values[i];
-//%      }
-//%    }
-//%    if (_autocreator) {
-//%      GPBAutocreatedDictionaryModified(_autocreator, self);
-//%    }
-//%  }
-//%}
-//%
-//%- (void)set##VALUE_NAME:(VALUE_TYPE)value forKey:(BOOL)key {
-//%  int idx = (key ? 1 : 0);
-//%  _values[idx] = value;
-//%  _valueSet[idx] = YES;
-//%  if (_autocreator) {
-//%    GPBAutocreatedDictionaryModified(_autocreator, self);
-//%  }
-//%}
-//%
-//%- (void)remove##VALUE_NAME##ForKey:(BOOL)aKey {
-//%  _valueSet[aKey ? 1 : 0] = NO;
-//%}
-//%
-//%- (void)removeAll {
-//%  _valueSet[0] = NO;
-//%  _valueSet[1] = NO;
-//%}
-//%PDDM-DEFINE STR_FORMAT_POD(VALUE_NAME)
-//%STR_FORMAT_##VALUE_NAME()
-//%PDDM-DEFINE STR_FORMAT_UInt32()
-//%%u
-//%PDDM-DEFINE STR_FORMAT_Int32()
-//%%d
-//%PDDM-DEFINE STR_FORMAT_UInt64()
-//%%llu
-//%PDDM-DEFINE STR_FORMAT_Int64()
-//%%lld
-//%PDDM-DEFINE STR_FORMAT_Bool()
-//%%d
-//%PDDM-DEFINE STR_FORMAT_Float()
-//%%f
-//%PDDM-DEFINE STR_FORMAT_Double()
-//%%lf
-
-//
-// Helpers for Objects
-//
-
-//%PDDM-DEFINE VALUE_FOR_KEY_OBJECT(KEY_TYPE, VALUE_NAME, VALUE_TYPE, KHELPER)
-//%- (VALUE_TYPE)objectForKey:(KEY_TYPE)key {
-//%  VALUE_TYPE result = [_dictionary objectForKey:WRAPPED##KHELPER(key)];
-//%  return result;
-//%}
-//%PDDM-DEFINE WRAPPEDOBJECT(VALUE)
-//%VALUE
-//%PDDM-DEFINE UNWRAPString(VALUE)
-//%VALUE
-//%PDDM-DEFINE UNWRAPObject(VALUE)
-//%VALUE
-//%PDDM-DEFINE TEXT_FORMAT_OBJString(VALUE)
-//%VALUE
-//%PDDM-DEFINE TEXT_FORMAT_OBJObject(VALUE)
-//%VALUE
-//%PDDM-DEFINE ENUM_TYPEOBJECT(TYPE)
-//%ENUM_TYPEOBJECT_##TYPE()
-//%PDDM-DEFINE ENUM_TYPEOBJECT_NSString()
-//%NSString *
-//%PDDM-DEFINE ENUM_TYPEOBJECT_id()
-//%id ##
-//%PDDM-DEFINE NEQ_OBJECT(VAL1, VAL2)
-//%![VAL1 isEqual:VAL2]
-//%PDDM-DEFINE EXTRA_METHODS_OBJECT(KEY_NAME, VALUE_NAME)
-//%- (BOOL)isInitialized {
-//%  for (GPBMessage *msg in [_dictionary objectEnumerator]) {
-//%    if (!msg.initialized) {
-//%      return NO;
-//%    }
-//%  }
-//%  return YES;
-//%}
-//%
-//%- (instancetype)deepCopyWithZone:(NSZone *)zone {
-//%  GPB##KEY_NAME##VALUE_NAME##Dictionary *newDict =
-//%      [[GPB##KEY_NAME##VALUE_NAME##Dictionary alloc] init];
-//%  NSEnumerator *keys = [_dictionary keyEnumerator];
-//%  id aKey;
-//%  NSMutableDictionary *internalDict = newDict->_dictionary;
-//%  while ((aKey = [keys nextObject])) {
-//%    GPBMessage *msg = _dictionary[aKey];
-//%    GPBMessage *copiedMsg = [msg copyWithZone:zone];
-//%    [internalDict setObject:copiedMsg forKey:aKey];
-//%    [copiedMsg release];
-//%  }
-//%  return newDict;
-//%}
-//%
-//%
-//%PDDM-DEFINE BOOL_EXTRA_METHODS_OBJECT(KEY_NAME, VALUE_NAME)
-//%- (BOOL)isInitialized {
-//%  if (_values[0] && ![_values[0] isInitialized]) {
-//%    return NO;
-//%  }
-//%  if (_values[1] && ![_values[1] isInitialized]) {
-//%    return NO;
-//%  }
-//%  return YES;
-//%}
-//%
-//%- (instancetype)deepCopyWithZone:(NSZone *)zone {
-//%  GPB##KEY_NAME##VALUE_NAME##Dictionary *newDict =
-//%      [[GPB##KEY_NAME##VALUE_NAME##Dictionary alloc] init];
-//%  for (int i = 0; i < 2; ++i) {
-//%    if (_values[i] != nil) {
-//%      newDict->_values[i] = [_values[i] copyWithZone:zone];
-//%    }
-//%  }
-//%  return newDict;
-//%}
-//%
-//%
-//%PDDM-DEFINE SERIAL_DATA_FOR_ENTRY_OBJECT(KEY_NAME, VALUE_NAME)
-// Empty
-//%PDDM-DEFINE GPBVALUE_OBJECT(VALUE_NAME)
-//%valueString
-//%PDDM-DEFINE DICTIONARY_VALIDATE_VALUE_OBJECT(VALUE_NAME, EXTRA_INDENT)
-//%##EXTRA_INDENT$S##  if (!##VALUE_NAME) {
-//%##EXTRA_INDENT$S##    [NSException raise:NSInvalidArgumentException
-//%##EXTRA_INDENT$S##                format:@"Attempting to add nil object to a Dictionary"];
-//%##EXTRA_INDENT$S##  }
-//%
-//%PDDM-DEFINE DICTIONARY_VALIDATE_KEY_OBJECT(KEY_NAME, EXTRA_INDENT)
-//%##EXTRA_INDENT$S##  if (!##KEY_NAME) {
-//%##EXTRA_INDENT$S##    [NSException raise:NSInvalidArgumentException
-//%##EXTRA_INDENT$S##                format:@"Attempting to add nil key to a Dictionary"];
-//%##EXTRA_INDENT$S##  }
-//%
-
-//%PDDM-DEFINE BOOL_DICT_HAS_STORAGE_OBJECT()
-// Empty
-//%PDDM-DEFINE BOOL_DICT_INITS_OBJECT(VALUE_NAME, VALUE_TYPE)
-//%- (instancetype)initWithObjects:(const VALUE_TYPE [])objects
-//%                        forKeys:(const BOOL [])keys
-//%                          count:(NSUInteger)count {
-//%  self = [super init];
-//%  if (self) {
-//%    for (NSUInteger i = 0; i < count; ++i) {
-//%      if (!objects[i]) {
-//%        [NSException raise:NSInvalidArgumentException
-//%                    format:@"Attempting to add nil object to a Dictionary"];
-//%      }
-//%      int idx = keys[i] ? 1 : 0;
-//%      [_values[idx] release];
-//%      _values[idx] = (VALUE_TYPE)[objects[i] retain];
-//%    }
-//%  }
-//%  return self;
-//%}
-//%
-//%- (instancetype)initWithDictionary:(GPBBool##VALUE_NAME##Dictionary *)dictionary {
-//%  self = [self initWithObjects:NULL forKeys:NULL count:0];
-//%  if (self) {
-//%    if (dictionary) {
-//%      _values[0] = [dictionary->_values[0] retain];
-//%      _values[1] = [dictionary->_values[1] retain];
-//%    }
-//%  }
-//%  return self;
-//%}
-//%PDDM-DEFINE BOOL_DICT_DEALLOCOBJECT()
-//%- (void)dealloc {
-//%  NSAssert(!_autocreator,
-//%           @"%@: Autocreator must be cleared before release, autocreator: %@",
-//%           [self class], _autocreator);
-//%  [_values[0] release];
-//%  [_values[1] release];
-//%  [super dealloc];
-//%}
-//%PDDM-DEFINE BOOL_DICT_W_HASOBJECT(IDX, REF)
-//%(BOOL_DICT_HASOBJECT(IDX, REF))
-//%PDDM-DEFINE BOOL_DICT_HASOBJECT(IDX, REF)
-//%REF##_values[IDX] != nil
-//%PDDM-DEFINE BOOL_VALUE_FOR_KEY_OBJECT(VALUE_NAME, VALUE_TYPE)
-//%- (VALUE_TYPE)objectForKey:(BOOL)key {
-//%  return _values[key ? 1 : 0];
-//%}
-//%PDDM-DEFINE BOOL_SET_GPBVALUE_FOR_KEY_OBJECT(VALUE_NAME, VALUE_TYPE, VisP)
-//%- (void)setGPBGenericValue:(GPBGenericValue *)value
-//%     forGPBGenericValueKey:(GPBGenericValue *)key {
-//%  int idx = (key->valueBool ? 1 : 0);
-//%  [_values[idx] release];
-//%  _values[idx] = [value->valueString retain];
-//%}
-
-//%PDDM-DEFINE BOOL_DICT_MUTATIONS_OBJECT(VALUE_NAME, VALUE_TYPE)
-//%- (void)addEntriesFromDictionary:(GPBBool##VALUE_NAME##Dictionary *)otherDictionary {
-//%  if (otherDictionary) {
-//%    for (int i = 0; i < 2; ++i) {
-//%      if (otherDictionary->_values[i] != nil) {
-//%        [_values[i] release];
-//%        _values[i] = [otherDictionary->_values[i] retain];
-//%      }
-//%    }
-//%    if (_autocreator) {
-//%      GPBAutocreatedDictionaryModified(_autocreator, self);
-//%    }
-//%  }
-//%}
-//%
-//%- (void)setObject:(VALUE_TYPE)object forKey:(BOOL)key {
-//%  if (!object) {
-//%    [NSException raise:NSInvalidArgumentException
-//%                format:@"Attempting to add nil object to a Dictionary"];
-//%  }
-//%  int idx = (key ? 1 : 0);
-//%  [_values[idx] release];
-//%  _values[idx] = [object retain];
-//%  if (_autocreator) {
-//%    GPBAutocreatedDictionaryModified(_autocreator, self);
-//%  }
-//%}
-//%
-//%- (void)removeObjectForKey:(BOOL)aKey {
-//%  int idx = (aKey ? 1 : 0);
-//%  [_values[idx] release];
-//%  _values[idx] = nil;
-//%}
-//%
-//%- (void)removeAll {
-//%  for (int i = 0; i < 2; ++i) {
-//%    [_values[i] release];
-//%    _values[i] = nil;
-//%  }
-//%}
-//%PDDM-DEFINE STR_FORMAT_OBJECT(VALUE_NAME)
-//%%@
-
-
-//%PDDM-EXPAND DICTIONARY_IMPL_FOR_POD_KEY(UInt32, uint32_t)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-#pragma mark - UInt32 -> UInt32
-
-@implementation GPBUInt32UInt32Dictionary {
- @package
-  NSMutableDictionary *_dictionary;
-}
-
-- (instancetype)init {
-  return [self initWithUInt32s:NULL forKeys:NULL count:0];
-}
-
-- (instancetype)initWithUInt32s:(const uint32_t [])values
-                        forKeys:(const uint32_t [])keys
-                          count:(NSUInteger)count {
-  self = [super init];
-  if (self) {
-    _dictionary = [[NSMutableDictionary alloc] init];
-    if (count && values && keys) {
-      for (NSUInteger i = 0; i < count; ++i) {
-        [_dictionary setObject:@(values[i]) forKey:@(keys[i])];
-      }
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithDictionary:(GPBUInt32UInt32Dictionary *)dictionary {
-  self = [self initWithUInt32s:NULL forKeys:NULL count:0];
-  if (self) {
-    if (dictionary) {
-      [_dictionary addEntriesFromDictionary:dictionary->_dictionary];
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithCapacity:(NSUInteger)numItems {
-  #pragma unused(numItems)
-  return [self initWithUInt32s:NULL forKeys:NULL count:0];
-}
-
-- (void)dealloc {
-  NSAssert(!_autocreator,
-           @"%@: Autocreator must be cleared before release, autocreator: %@",
-           [self class], _autocreator);
-  [_dictionary release];
-  [super dealloc];
-}
-
-- (instancetype)copyWithZone:(NSZone *)zone {
-  return [[GPBUInt32UInt32Dictionary allocWithZone:zone] initWithDictionary:self];
-}
-
-- (BOOL)isEqual:(id)other {
-  if (self == other) {
-    return YES;
-  }
-  if (![other isKindOfClass:[GPBUInt32UInt32Dictionary class]]) {
-    return NO;
-  }
-  GPBUInt32UInt32Dictionary *otherDictionary = other;
-  return [_dictionary isEqual:otherDictionary->_dictionary];
-}
-
-- (NSUInteger)hash {
-  return _dictionary.count;
-}
-
-- (NSString *)description {
-  return [NSString stringWithFormat:@"<%@ %p> { %@ }", [self class], self, _dictionary];
-}
-
-- (NSUInteger)count {
-  return _dictionary.count;
-}
-
-- (void)enumerateKeysAndUInt32sUsingBlock:
-    (void (NS_NOESCAPE ^)(uint32_t key, uint32_t value, BOOL *stop))block {
-  BOOL stop = NO;
-  NSDictionary *internal = _dictionary;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    block([aKey unsignedIntValue], [aValue unsignedIntValue], &stop);
-    if (stop) {
-      break;
-    }
-  }
-}
-
-- (size_t)computeSerializedSizeAsField:(GPBFieldDescriptor *)field {
-  NSDictionary *internal = _dictionary;
-  NSUInteger count = internal.count;
-  if (count == 0) {
-    return 0;
-  }
-
-  GPBDataType valueDataType = GPBGetFieldDataType(field);
-  GPBDataType keyDataType = field.mapKeyDataType;
-  size_t result = 0;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    size_t msgSize = ComputeDictUInt32FieldSize([aKey unsignedIntValue], kMapKeyFieldNumber, keyDataType);
-    msgSize += ComputeDictUInt32FieldSize([aValue unsignedIntValue], kMapValueFieldNumber, valueDataType);
-    result += GPBComputeRawVarint32SizeForInteger(msgSize) + msgSize;
-  }
-  size_t tagSize = GPBComputeWireFormatTagSize(GPBFieldNumber(field), GPBDataTypeMessage);
-  result += tagSize * count;
-  return result;
-}
-
-- (void)writeToCodedOutputStream:(GPBCodedOutputStream *)outputStream
-                         asField:(GPBFieldDescriptor *)field {
-  GPBDataType valueDataType = GPBGetFieldDataType(field);
-  GPBDataType keyDataType = field.mapKeyDataType;
-  uint32_t tag = GPBWireFormatMakeTag(GPBFieldNumber(field), GPBWireFormatLengthDelimited);
-  NSDictionary *internal = _dictionary;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    [outputStream writeInt32NoTag:tag];
-    // Write the size of the message.
-    uint32_t unwrappedKey = [aKey unsignedIntValue];
-    uint32_t unwrappedValue = [aValue unsignedIntValue];
-    size_t msgSize = ComputeDictUInt32FieldSize(unwrappedKey, kMapKeyFieldNumber, keyDataType);
-    msgSize += ComputeDictUInt32FieldSize(unwrappedValue, kMapValueFieldNumber, valueDataType);
-    [outputStream writeInt32NoTag:(int32_t)msgSize];
-    // Write the fields.
-    WriteDictUInt32Field(outputStream, unwrappedKey, kMapKeyFieldNumber, keyDataType);
-    WriteDictUInt32Field(outputStream, unwrappedValue, kMapValueFieldNumber, valueDataType);
-  }
-}
-
-- (void)setGPBGenericValue:(GPBGenericValue *)value
-     forGPBGenericValueKey:(GPBGenericValue *)key {
-  [_dictionary setObject:@(value->valueUInt32) forKey:@(key->valueUInt32)];
-}
-
-- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
-  [self enumerateKeysAndUInt32sUsingBlock:^(uint32_t key, uint32_t value, BOOL *stop) {
-      #pragma unused(stop)
-      block([NSString stringWithFormat:@"%u", key], [NSString stringWithFormat:@"%u", value]);
-  }];
-}
-
-- (BOOL)getUInt32:(nullable uint32_t *)value forKey:(uint32_t)key {
-  NSNumber *wrapped = [_dictionary objectForKey:@(key)];
-  if (wrapped && value) {
-    *value = [wrapped unsignedIntValue];
-  }
-  return (wrapped != NULL);
-}
-
-- (void)addEntriesFromDictionary:(GPBUInt32UInt32Dictionary *)otherDictionary {
-  if (otherDictionary) {
-    [_dictionary addEntriesFromDictionary:otherDictionary->_dictionary];
-    if (_autocreator) {
-      GPBAutocreatedDictionaryModified(_autocreator, self);
-    }
-  }
-}
-
-- (void)setUInt32:(uint32_t)value forKey:(uint32_t)key {
-  [_dictionary setObject:@(value) forKey:@(key)];
-  if (_autocreator) {
-    GPBAutocreatedDictionaryModified(_autocreator, self);
-  }
-}
-
-- (void)removeUInt32ForKey:(uint32_t)aKey {
-  [_dictionary removeObjectForKey:@(aKey)];
-}
-
-- (void)removeAll {
-  [_dictionary removeAllObjects];
-}
-
-@end
-
-#pragma mark - UInt32 -> Int32
-
-@implementation GPBUInt32Int32Dictionary {
- @package
-  NSMutableDictionary *_dictionary;
-}
-
-- (instancetype)init {
-  return [self initWithInt32s:NULL forKeys:NULL count:0];
-}
-
-- (instancetype)initWithInt32s:(const int32_t [])values
-                       forKeys:(const uint32_t [])keys
-                         count:(NSUInteger)count {
-  self = [super init];
-  if (self) {
-    _dictionary = [[NSMutableDictionary alloc] init];
-    if (count && values && keys) {
-      for (NSUInteger i = 0; i < count; ++i) {
-        [_dictionary setObject:@(values[i]) forKey:@(keys[i])];
-      }
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithDictionary:(GPBUInt32Int32Dictionary *)dictionary {
-  self = [self initWithInt32s:NULL forKeys:NULL count:0];
-  if (self) {
-    if (dictionary) {
-      [_dictionary addEntriesFromDictionary:dictionary->_dictionary];
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithCapacity:(NSUInteger)numItems {
-  #pragma unused(numItems)
-  return [self initWithInt32s:NULL forKeys:NULL count:0];
-}
-
-- (void)dealloc {
-  NSAssert(!_autocreator,
-           @"%@: Autocreator must be cleared before release, autocreator: %@",
-           [self class], _autocreator);
-  [_dictionary release];
-  [super dealloc];
-}
-
-- (instancetype)copyWithZone:(NSZone *)zone {
-  return [[GPBUInt32Int32Dictionary allocWithZone:zone] initWithDictionary:self];
-}
-
-- (BOOL)isEqual:(id)other {
-  if (self == other) {
-    return YES;
-  }
-  if (![other isKindOfClass:[GPBUInt32Int32Dictionary class]]) {
-    return NO;
-  }
-  GPBUInt32Int32Dictionary *otherDictionary = other;
-  return [_dictionary isEqual:otherDictionary->_dictionary];
-}
-
-- (NSUInteger)hash {
-  return _dictionary.count;
-}
-
-- (NSString *)description {
-  return [NSString stringWithFormat:@"<%@ %p> { %@ }", [self class], self, _dictionary];
-}
-
-- (NSUInteger)count {
-  return _dictionary.count;
-}
-
-- (void)enumerateKeysAndInt32sUsingBlock:
-    (void (NS_NOESCAPE ^)(uint32_t key, int32_t value, BOOL *stop))block {
-  BOOL stop = NO;
-  NSDictionary *internal = _dictionary;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    block([aKey unsignedIntValue], [aValue intValue], &stop);
-    if (stop) {
-      break;
-    }
-  }
-}
-
-- (size_t)computeSerializedSizeAsField:(GPBFieldDescriptor *)field {
-  NSDictionary *internal = _dictionary;
-  NSUInteger count = internal.count;
-  if (count == 0) {
-    return 0;
-  }
-
-  GPBDataType valueDataType = GPBGetFieldDataType(field);
-  GPBDataType keyDataType = field.mapKeyDataType;
-  size_t result = 0;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    size_t msgSize = ComputeDictUInt32FieldSize([aKey unsignedIntValue], kMapKeyFieldNumber, keyDataType);
-    msgSize += ComputeDictInt32FieldSize([aValue intValue], kMapValueFieldNumber, valueDataType);
-    result += GPBComputeRawVarint32SizeForInteger(msgSize) + msgSize;
-  }
-  size_t tagSize = GPBComputeWireFormatTagSize(GPBFieldNumber(field), GPBDataTypeMessage);
-  result += tagSize * count;
-  return result;
-}
-
-- (void)writeToCodedOutputStream:(GPBCodedOutputStream *)outputStream
-                         asField:(GPBFieldDescriptor *)field {
-  GPBDataType valueDataType = GPBGetFieldDataType(field);
-  GPBDataType keyDataType = field.mapKeyDataType;
-  uint32_t tag = GPBWireFormatMakeTag(GPBFieldNumber(field), GPBWireFormatLengthDelimited);
-  NSDictionary *internal = _dictionary;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    [outputStream writeInt32NoTag:tag];
-    // Write the size of the message.
-    uint32_t unwrappedKey = [aKey unsignedIntValue];
-    int32_t unwrappedValue = [aValue intValue];
-    size_t msgSize = ComputeDictUInt32FieldSize(unwrappedKey, kMapKeyFieldNumber, keyDataType);
-    msgSize += ComputeDictInt32FieldSize(unwrappedValue, kMapValueFieldNumber, valueDataType);
-    [outputStream writeInt32NoTag:(int32_t)msgSize];
-    // Write the fields.
-    WriteDictUInt32Field(outputStream, unwrappedKey, kMapKeyFieldNumber, keyDataType);
-    WriteDictInt32Field(outputStream, unwrappedValue, kMapValueFieldNumber, valueDataType);
-  }
-}
-
-- (void)setGPBGenericValue:(GPBGenericValue *)value
-     forGPBGenericValueKey:(GPBGenericValue *)key {
-  [_dictionary setObject:@(value->valueInt32) forKey:@(key->valueUInt32)];
-}
-
-- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
-  [self enumerateKeysAndInt32sUsingBlock:^(uint32_t key, int32_t value, BOOL *stop) {
-      #pragma unused(stop)
-      block([NSString stringWithFormat:@"%u", key], [NSString stringWithFormat:@"%d", value]);
-  }];
-}
-
-- (BOOL)getInt32:(nullable int32_t *)value forKey:(uint32_t)key {
-  NSNumber *wrapped = [_dictionary objectForKey:@(key)];
-  if (wrapped && value) {
-    *value = [wrapped intValue];
-  }
-  return (wrapped != NULL);
-}
-
-- (void)addEntriesFromDictionary:(GPBUInt32Int32Dictionary *)otherDictionary {
-  if (otherDictionary) {
-    [_dictionary addEntriesFromDictionary:otherDictionary->_dictionary];
-    if (_autocreator) {
-      GPBAutocreatedDictionaryModified(_autocreator, self);
-    }
-  }
-}
-
-- (void)setInt32:(int32_t)value forKey:(uint32_t)key {
-  [_dictionary setObject:@(value) forKey:@(key)];
-  if (_autocreator) {
-    GPBAutocreatedDictionaryModified(_autocreator, self);
-  }
-}
-
-- (void)removeInt32ForKey:(uint32_t)aKey {
-  [_dictionary removeObjectForKey:@(aKey)];
-}
-
-- (void)removeAll {
-  [_dictionary removeAllObjects];
-}
-
-@end
-
-#pragma mark - UInt32 -> UInt64
-
-@implementation GPBUInt32UInt64Dictionary {
- @package
-  NSMutableDictionary *_dictionary;
-}
-
-- (instancetype)init {
-  return [self initWithUInt64s:NULL forKeys:NULL count:0];
-}
-
-- (instancetype)initWithUInt64s:(const uint64_t [])values
-                        forKeys:(const uint32_t [])keys
-                          count:(NSUInteger)count {
-  self = [super init];
-  if (self) {
-    _dictionary = [[NSMutableDictionary alloc] init];
-    if (count && values && keys) {
-      for (NSUInteger i = 0; i < count; ++i) {
-        [_dictionary setObject:@(values[i]) forKey:@(keys[i])];
-      }
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithDictionary:(GPBUInt32UInt64Dictionary *)dictionary {
-  self = [self initWithUInt64s:NULL forKeys:NULL count:0];
-  if (self) {
-    if (dictionary) {
-      [_dictionary addEntriesFromDictionary:dictionary->_dictionary];
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithCapacity:(NSUInteger)numItems {
-  #pragma unused(numItems)
-  return [self initWithUInt64s:NULL forKeys:NULL count:0];
-}
-
-- (void)dealloc {
-  NSAssert(!_autocreator,
-           @"%@: Autocreator must be cleared before release, autocreator: %@",
-           [self class], _autocreator);
-  [_dictionary release];
-  [super dealloc];
-}
-
-- (instancetype)copyWithZone:(NSZone *)zone {
-  return [[GPBUInt32UInt64Dictionary allocWithZone:zone] initWithDictionary:self];
-}
-
-- (BOOL)isEqual:(id)other {
-  if (self == other) {
-    return YES;
-  }
-  if (![other isKindOfClass:[GPBUInt32UInt64Dictionary class]]) {
-    return NO;
-  }
-  GPBUInt32UInt64Dictionary *otherDictionary = other;
-  return [_dictionary isEqual:otherDictionary->_dictionary];
-}
-
-- (NSUInteger)hash {
-  return _dictionary.count;
-}
-
-- (NSString *)description {
-  return [NSString stringWithFormat:@"<%@ %p> { %@ }", [self class], self, _dictionary];
-}
-
-- (NSUInteger)count {
-  return _dictionary.count;
-}
-
-- (void)enumerateKeysAndUInt64sUsingBlock:
-    (void (NS_NOESCAPE ^)(uint32_t key, uint64_t value, BOOL *stop))block {
-  BOOL stop = NO;
-  NSDictionary *internal = _dictionary;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    block([aKey unsignedIntValue], [aValue unsignedLongLongValue], &stop);
-    if (stop) {
-      break;
-    }
-  }
-}
-
-- (size_t)computeSerializedSizeAsField:(GPBFieldDescriptor *)field {
-  NSDictionary *internal = _dictionary;
-  NSUInteger count = internal.count;
-  if (count == 0) {
-    return 0;
-  }
-
-  GPBDataType valueDataType = GPBGetFieldDataType(field);
-  GPBDataType keyDataType = field.mapKeyDataType;
-  size_t result = 0;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    size_t msgSize = ComputeDictUInt32FieldSize([aKey unsignedIntValue], kMapKeyFieldNumber, keyDataType);
-    msgSize += ComputeDictUInt64FieldSize([aValue unsignedLongLongValue], kMapValueFieldNumber, valueDataType);
-    result += GPBComputeRawVarint32SizeForInteger(msgSize) + msgSize;
-  }
-  size_t tagSize = GPBComputeWireFormatTagSize(GPBFieldNumber(field), GPBDataTypeMessage);
-  result += tagSize * count;
-  return result;
-}
-
-- (void)writeToCodedOutputStream:(GPBCodedOutputStream *)outputStream
-                         asField:(GPBFieldDescriptor *)field {
-  GPBDataType valueDataType = GPBGetFieldDataType(field);
-  GPBDataType keyDataType = field.mapKeyDataType;
-  uint32_t tag = GPBWireFormatMakeTag(GPBFieldNumber(field), GPBWireFormatLengthDelimited);
-  NSDictionary *internal = _dictionary;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    [outputStream writeInt32NoTag:tag];
-    // Write the size of the message.
-    uint32_t unwrappedKey = [aKey unsignedIntValue];
-    uint64_t unwrappedValue = [aValue unsignedLongLongValue];
-    size_t msgSize = ComputeDictUInt32FieldSize(unwrappedKey, kMapKeyFieldNumber, keyDataType);
-    msgSize += ComputeDictUInt64FieldSize(unwrappedValue, kMapValueFieldNumber, valueDataType);
-    [outputStream writeInt32NoTag:(int32_t)msgSize];
-    // Write the fields.
-    WriteDictUInt32Field(outputStream, unwrappedKey, kMapKeyFieldNumber, keyDataType);
-    WriteDictUInt64Field(outputStream, unwrappedValue, kMapValueFieldNumber, valueDataType);
-  }
-}
-
-- (void)setGPBGenericValue:(GPBGenericValue *)value
-     forGPBGenericValueKey:(GPBGenericValue *)key {
-  [_dictionary setObject:@(value->valueUInt64) forKey:@(key->valueUInt32)];
-}
-
-- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
-  [self enumerateKeysAndUInt64sUsingBlock:^(uint32_t key, uint64_t value, BOOL *stop) {
-      #pragma unused(stop)
-      block([NSString stringWithFormat:@"%u", key], [NSString stringWithFormat:@"%llu", value]);
-  }];
-}
-
-- (BOOL)getUInt64:(nullable uint64_t *)value forKey:(uint32_t)key {
-  NSNumber *wrapped = [_dictionary objectForKey:@(key)];
-  if (wrapped && value) {
-    *value = [wrapped unsignedLongLongValue];
-  }
-  return (wrapped != NULL);
-}
-
-- (void)addEntriesFromDictionary:(GPBUInt32UInt64Dictionary *)otherDictionary {
-  if (otherDictionary) {
-    [_dictionary addEntriesFromDictionary:otherDictionary->_dictionary];
-    if (_autocreator) {
-      GPBAutocreatedDictionaryModified(_autocreator, self);
-    }
-  }
-}
-
-- (void)setUInt64:(uint64_t)value forKey:(uint32_t)key {
-  [_dictionary setObject:@(value) forKey:@(key)];
-  if (_autocreator) {
-    GPBAutocreatedDictionaryModified(_autocreator, self);
-  }
-}
-
-- (void)removeUInt64ForKey:(uint32_t)aKey {
-  [_dictionary removeObjectForKey:@(aKey)];
-}
-
-- (void)removeAll {
-  [_dictionary removeAllObjects];
-}
-
-@end
-
-#pragma mark - UInt32 -> Int64
-
-@implementation GPBUInt32Int64Dictionary {
- @package
-  NSMutableDictionary *_dictionary;
-}
-
-- (instancetype)init {
-  return [self initWithInt64s:NULL forKeys:NULL count:0];
-}
-
-- (instancetype)initWithInt64s:(const int64_t [])values
-                       forKeys:(const uint32_t [])keys
-                         count:(NSUInteger)count {
-  self = [super init];
-  if (self) {
-    _dictionary = [[NSMutableDictionary alloc] init];
-    if (count && values && keys) {
-      for (NSUInteger i = 0; i < count; ++i) {
-        [_dictionary setObject:@(values[i]) forKey:@(keys[i])];
-      }
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithDictionary:(GPBUInt32Int64Dictionary *)dictionary {
-  self = [self initWithInt64s:NULL forKeys:NULL count:0];
-  if (self) {
-    if (dictionary) {
-      [_dictionary addEntriesFromDictionary:dictionary->_dictionary];
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithCapacity:(NSUInteger)numItems {
-  #pragma unused(numItems)
-  return [self initWithInt64s:NULL forKeys:NULL count:0];
-}
-
-- (void)dealloc {
-  NSAssert(!_autocreator,
-           @"%@: Autocreator must be cleared before release, autocreator: %@",
-           [self class], _autocreator);
-  [_dictionary release];
-  [super dealloc];
-}
-
-- (instancetype)copyWithZone:(NSZone *)zone {
-  return [[GPBUInt32Int64Dictionary allocWithZone:zone] initWithDictionary:self];
-}
-
-- (BOOL)isEqual:(id)other {
-  if (self == other) {
-    return YES;
-  }
-  if (![other isKindOfClass:[GPBUInt32Int64Dictionary class]]) {
-    return NO;
-  }
-  GPBUInt32Int64Dictionary *otherDictionary = other;
-  return [_dictionary isEqual:otherDictionary->_dictionary];
-}
-
-- (NSUInteger)hash {
-  return _dictionary.count;
-}
-
-- (NSString *)description {
-  return [NSString stringWithFormat:@"<%@ %p> { %@ }", [self class], self, _dictionary];
-}
-
-- (NSUInteger)count {
-  return _dictionary.count;
-}
-
-- (void)enumerateKeysAndInt64sUsingBlock:
-    (void (NS_NOESCAPE ^)(uint32_t key, int64_t value, BOOL *stop))block {
-  BOOL stop = NO;
-  NSDictionary *internal = _dictionary;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    block([aKey unsignedIntValue], [aValue longLongValue], &stop);
-    if (stop) {
-      break;
-    }
-  }
-}
-
-- (size_t)computeSerializedSizeAsField:(GPBFieldDescriptor *)field {
-  NSDictionary *internal = _dictionary;
-  NSUInteger count = internal.count;
-  if (count == 0) {
-    return 0;
-  }
-
-  GPBDataType valueDataType = GPBGetFieldDataType(field);
-  GPBDataType keyDataType = field.mapKeyDataType;
-  size_t result = 0;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    size_t msgSize = ComputeDictUInt32FieldSize([aKey unsignedIntValue], kMapKeyFieldNumber, keyDataType);
-    msgSize += ComputeDictInt64FieldSize([aValue longLongValue], kMapValueFieldNumber, valueDataType);
-    result += GPBComputeRawVarint32SizeForInteger(msgSize) + msgSize;
-  }
-  size_t tagSize = GPBComputeWireFormatTagSize(GPBFieldNumber(field), GPBDataTypeMessage);
-  result += tagSize * count;
-  return result;
-}
-
-- (void)writeToCodedOutputStream:(GPBCodedOutputStream *)outputStream
-                         asField:(GPBFieldDescriptor *)field {
-  GPBDataType valueDataType = GPBGetFieldDataType(field);
-  GPBDataType keyDataType = field.mapKeyDataType;
-  uint32_t tag = GPBWireFormatMakeTag(GPBFieldNumber(field), GPBWireFormatLengthDelimited);
-  NSDictionary *internal = _dictionary;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    [outputStream writeInt32NoTag:tag];
-    // Write the size of the message.
-    uint32_t unwrappedKey = [aKey unsignedIntValue];
-    int64_t unwrappedValue = [aValue longLongValue];
-    size_t msgSize = ComputeDictUInt32FieldSize(unwrappedKey, kMapKeyFieldNumber, keyDataType);
-    msgSize += ComputeDictInt64FieldSize(unwrappedValue, kMapValueFieldNumber, valueDataType);
-    [outputStream writeInt32NoTag:(int32_t)msgSize];
-    // Write the fields.
-    WriteDictUInt32Field(outputStream, unwrappedKey, kMapKeyFieldNumber, keyDataType);
-    WriteDictInt64Field(outputStream, unwrappedValue, kMapValueFieldNumber, valueDataType);
-  }
-}
-
-- (void)setGPBGenericValue:(GPBGenericValue *)value
-     forGPBGenericValueKey:(GPBGenericValue *)key {
-  [_dictionary setObject:@(value->valueInt64) forKey:@(key->valueUInt32)];
-}
-
-- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
-  [self enumerateKeysAndInt64sUsingBlock:^(uint32_t key, int64_t value, BOOL *stop) {
-      #pragma unused(stop)
-      block([NSString stringWithFormat:@"%u", key], [NSString stringWithFormat:@"%lld", value]);
-  }];
-}
-
-- (BOOL)getInt64:(nullable int64_t *)value forKey:(uint32_t)key {
-  NSNumber *wrapped = [_dictionary objectForKey:@(key)];
-  if (wrapped && value) {
-    *value = [wrapped longLongValue];
-  }
-  return (wrapped != NULL);
-}
-
-- (void)addEntriesFromDictionary:(GPBUInt32Int64Dictionary *)otherDictionary {
-  if (otherDictionary) {
-    [_dictionary addEntriesFromDictionary:otherDictionary->_dictionary];
-    if (_autocreator) {
-      GPBAutocreatedDictionaryModified(_autocreator, self);
-    }
-  }
-}
-
-- (void)setInt64:(int64_t)value forKey:(uint32_t)key {
-  [_dictionary setObject:@(value) forKey:@(key)];
-  if (_autocreator) {
-    GPBAutocreatedDictionaryModified(_autocreator, self);
-  }
-}
-
-- (void)removeInt64ForKey:(uint32_t)aKey {
-  [_dictionary removeObjectForKey:@(aKey)];
-}
-
-- (void)removeAll {
-  [_dictionary removeAllObjects];
-}
-
-@end
-
-#pragma mark - UInt32 -> Bool
-
-@implementation GPBUInt32BoolDictionary {
- @package
-  NSMutableDictionary *_dictionary;
-}
-
-- (instancetype)init {
-  return [self initWithBools:NULL forKeys:NULL count:0];
-}
-
-- (instancetype)initWithBools:(const BOOL [])values
-                      forKeys:(const uint32_t [])keys
-                        count:(NSUInteger)count {
-  self = [super init];
-  if (self) {
-    _dictionary = [[NSMutableDictionary alloc] init];
-    if (count && values && keys) {
-      for (NSUInteger i = 0; i < count; ++i) {
-        [_dictionary setObject:@(values[i]) forKey:@(keys[i])];
-      }
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithDictionary:(GPBUInt32BoolDictionary *)dictionary {
-  self = [self initWithBools:NULL forKeys:NULL count:0];
-  if (self) {
-    if (dictionary) {
-      [_dictionary addEntriesFromDictionary:dictionary->_dictionary];
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithCapacity:(NSUInteger)numItems {
-  #pragma unused(numItems)
-  return [self initWithBools:NULL forKeys:NULL count:0];
-}
-
-- (void)dealloc {
-  NSAssert(!_autocreator,
-           @"%@: Autocreator must be cleared before release, autocreator: %@",
-           [self class], _autocreator);
-  [_dictionary release];
-  [super dealloc];
-}
-
-- (instancetype)copyWithZone:(NSZone *)zone {
-  return [[GPBUInt32BoolDictionary allocWithZone:zone] initWithDictionary:self];
-}
-
-- (BOOL)isEqual:(id)other {
-  if (self == other) {
-    return YES;
-  }
-  if (![other isKindOfClass:[GPBUInt32BoolDictionary class]]) {
-    return NO;
-  }
-  GPBUInt32BoolDictionary *otherDictionary = other;
-  return [_dictionary isEqual:otherDictionary->_dictionary];
-}
-
-- (NSUInteger)hash {
-  return _dictionary.count;
-}
-
-- (NSString *)description {
-  return [NSString stringWithFormat:@"<%@ %p> { %@ }", [self class], self, _dictionary];
-}
-
-- (NSUInteger)count {
-  return _dictionary.count;
-}
-
-- (void)enumerateKeysAndBoolsUsingBlock:
-    (void (NS_NOESCAPE ^)(uint32_t key, BOOL value, BOOL *stop))block {
-  BOOL stop = NO;
-  NSDictionary *internal = _dictionary;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    block([aKey unsignedIntValue], [aValue boolValue], &stop);
-    if (stop) {
-      break;
-    }
-  }
-}
-
-- (size_t)computeSerializedSizeAsField:(GPBFieldDescriptor *)field {
-  NSDictionary *internal = _dictionary;
-  NSUInteger count = internal.count;
-  if (count == 0) {
-    return 0;
-  }
-
-  GPBDataType valueDataType = GPBGetFieldDataType(field);
-  GPBDataType keyDataType = field.mapKeyDataType;
-  size_t result = 0;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    size_t msgSize = ComputeDictUInt32FieldSize([aKey unsignedIntValue], kMapKeyFieldNumber, keyDataType);
-    msgSize += ComputeDictBoolFieldSize([aValue boolValue], kMapValueFieldNumber, valueDataType);
-    result += GPBComputeRawVarint32SizeForInteger(msgSize) + msgSize;
-  }
-  size_t tagSize = GPBComputeWireFormatTagSize(GPBFieldNumber(field), GPBDataTypeMessage);
-  result += tagSize * count;
-  return result;
-}
-
-- (void)writeToCodedOutputStream:(GPBCodedOutputStream *)outputStream
-                         asField:(GPBFieldDescriptor *)field {
-  GPBDataType valueDataType = GPBGetFieldDataType(field);
-  GPBDataType keyDataType = field.mapKeyDataType;
-  uint32_t tag = GPBWireFormatMakeTag(GPBFieldNumber(field), GPBWireFormatLengthDelimited);
-  NSDictionary *internal = _dictionary;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    [outputStream writeInt32NoTag:tag];
-    // Write the size of the message.
-    uint32_t unwrappedKey = [aKey unsignedIntValue];
-    BOOL unwrappedValue = [aValue boolValue];
-    size_t msgSize = ComputeDictUInt32FieldSize(unwrappedKey, kMapKeyFieldNumber, keyDataType);
-    msgSize += ComputeDictBoolFieldSize(unwrappedValue, kMapValueFieldNumber, valueDataType);
-    [outputStream writeInt32NoTag:(int32_t)msgSize];
-    // Write the fields.
-    WriteDictUInt32Field(outputStream, unwrappedKey, kMapKeyFieldNumber, keyDataType);
-    WriteDictBoolField(outputStream, unwrappedValue, kMapValueFieldNumber, valueDataType);
-  }
-}
-
-- (void)setGPBGenericValue:(GPBGenericValue *)value
-     forGPBGenericValueKey:(GPBGenericValue *)key {
-  [_dictionary setObject:@(value->valueBool) forKey:@(key->valueUInt32)];
-}
-
-- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
-  [self enumerateKeysAndBoolsUsingBlock:^(uint32_t key, BOOL value, BOOL *stop) {
-      #pragma unused(stop)
-      block([NSString stringWithFormat:@"%u", key], (value ? @"true" : @"false"));
-  }];
-}
-
-- (BOOL)getBool:(nullable BOOL *)value forKey:(uint32_t)key {
-  NSNumber *wrapped = [_dictionary objectForKey:@(key)];
-  if (wrapped && value) {
-    *value = [wrapped boolValue];
-  }
-  return (wrapped != NULL);
-}
-
-- (void)addEntriesFromDictionary:(GPBUInt32BoolDictionary *)otherDictionary {
-  if (otherDictionary) {
-    [_dictionary addEntriesFromDictionary:otherDictionary->_dictionary];
-    if (_autocreator) {
-      GPBAutocreatedDictionaryModified(_autocreator, self);
-    }
-  }
-}
-
-- (void)setBool:(BOOL)value forKey:(uint32_t)key {
-  [_dictionary setObject:@(value) forKey:@(key)];
-  if (_autocreator) {
-    GPBAutocreatedDictionaryModified(_autocreator, self);
-  }
-}
-
-- (void)removeBoolForKey:(uint32_t)aKey {
-  [_dictionary removeObjectForKey:@(aKey)];
-}
-
-- (void)removeAll {
-  [_dictionary removeAllObjects];
-}
-
-@end
-
-#pragma mark - UInt32 -> Float
-
-@implementation GPBUInt32FloatDictionary {
- @package
-  NSMutableDictionary *_dictionary;
-}
-
-- (instancetype)init {
-  return [self initWithFloats:NULL forKeys:NULL count:0];
-}
-
-- (instancetype)initWithFloats:(const float [])values
-                       forKeys:(const uint32_t [])keys
-                         count:(NSUInteger)count {
-  self = [super init];
-  if (self) {
-    _dictionary = [[NSMutableDictionary alloc] init];
-    if (count && values && keys) {
-      for (NSUInteger i = 0; i < count; ++i) {
-        [_dictionary setObject:@(values[i]) forKey:@(keys[i])];
-      }
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithDictionary:(GPBUInt32FloatDictionary *)dictionary {
-  self = [self initWithFloats:NULL forKeys:NULL count:0];
-  if (self) {
-    if (dictionary) {
-      [_dictionary addEntriesFromDictionary:dictionary->_dictionary];
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithCapacity:(NSUInteger)numItems {
-  #pragma unused(numItems)
-  return [self initWithFloats:NULL forKeys:NULL count:0];
-}
-
-- (void)dealloc {
-  NSAssert(!_autocreator,
-           @"%@: Autocreator must be cleared before release, autocreator: %@",
-           [self class], _autocreator);
-  [_dictionary release];
-  [super dealloc];
-}
-
-- (instancetype)copyWithZone:(NSZone *)zone {
-  return [[GPBUInt32FloatDictionary allocWithZone:zone] initWithDictionary:self];
-}
-
-- (BOOL)isEqual:(id)other {
-  if (self == other) {
-    return YES;
-  }
-  if (![other isKindOfClass:[GPBUInt32FloatDictionary class]]) {
-    return NO;
-  }
-  GPBUInt32FloatDictionary *otherDictionary = other;
-  return [_dictionary isEqual:otherDictionary->_dictionary];
-}
-
-- (NSUInteger)hash {
-  return _dictionary.count;
-}
-
-- (NSString *)description {
-  return [NSString stringWithFormat:@"<%@ %p> { %@ }", [self class], self, _dictionary];
-}
-
-- (NSUInteger)count {
-  return _dictionary.count;
-}
-
-- (void)enumerateKeysAndFloatsUsingBlock:
-    (void (NS_NOESCAPE ^)(uint32_t key, float value, BOOL *stop))block {
-  BOOL stop = NO;
-  NSDictionary *internal = _dictionary;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    block([aKey unsignedIntValue], [aValue floatValue], &stop);
-    if (stop) {
-      break;
-    }
-  }
-}
-
-- (size_t)computeSerializedSizeAsField:(GPBFieldDescriptor *)field {
-  NSDictionary *internal = _dictionary;
-  NSUInteger count = internal.count;
-  if (count == 0) {
-    return 0;
-  }
-
-  GPBDataType valueDataType = GPBGetFieldDataType(field);
-  GPBDataType keyDataType = field.mapKeyDataType;
-  size_t result = 0;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    size_t msgSize = ComputeDictUInt32FieldSize([aKey unsignedIntValue], kMapKeyFieldNumber, keyDataType);
-    msgSize += ComputeDictFloatFieldSize([aValue floatValue], kMapValueFieldNumber, valueDataType);
-    result += GPBComputeRawVarint32SizeForInteger(msgSize) + msgSize;
-  }
-  size_t tagSize = GPBComputeWireFormatTagSize(GPBFieldNumber(field), GPBDataTypeMessage);
-  result += tagSize * count;
-  return result;
-}
-
-- (void)writeToCodedOutputStream:(GPBCodedOutputStream *)outputStream
-                         asField:(GPBFieldDescriptor *)field {
-  GPBDataType valueDataType = GPBGetFieldDataType(field);
-  GPBDataType keyDataType = field.mapKeyDataType;
-  uint32_t tag = GPBWireFormatMakeTag(GPBFieldNumber(field), GPBWireFormatLengthDelimited);
-  NSDictionary *internal = _dictionary;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    [outputStream writeInt32NoTag:tag];
-    // Write the size of the message.
-    uint32_t unwrappedKey = [aKey unsignedIntValue];
-    float unwrappedValue = [aValue floatValue];
-    size_t msgSize = ComputeDictUInt32FieldSize(unwrappedKey, kMapKeyFieldNumber, keyDataType);
-    msgSize += ComputeDictFloatFieldSize(unwrappedValue, kMapValueFieldNumber, valueDataType);
-    [outputStream writeInt32NoTag:(int32_t)msgSize];
-    // Write the fields.
-    WriteDictUInt32Field(outputStream, unwrappedKey, kMapKeyFieldNumber, keyDataType);
-    WriteDictFloatField(outputStream, unwrappedValue, kMapValueFieldNumber, valueDataType);
-  }
-}
-
-- (void)setGPBGenericValue:(GPBGenericValue *)value
-     forGPBGenericValueKey:(GPBGenericValue *)key {
-  [_dictionary setObject:@(value->valueFloat) forKey:@(key->valueUInt32)];
-}
-
-- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
-  [self enumerateKeysAndFloatsUsingBlock:^(uint32_t key, float value, BOOL *stop) {
-      #pragma unused(stop)
-      block([NSString stringWithFormat:@"%u", key], [NSString stringWithFormat:@"%.*g", FLT_DIG, value]);
-  }];
-}
-
-- (BOOL)getFloat:(nullable float *)value forKey:(uint32_t)key {
-  NSNumber *wrapped = [_dictionary objectForKey:@(key)];
-  if (wrapped && value) {
-    *value = [wrapped floatValue];
-  }
-  return (wrapped != NULL);
-}
-
-- (void)addEntriesFromDictionary:(GPBUInt32FloatDictionary *)otherDictionary {
-  if (otherDictionary) {
-    [_dictionary addEntriesFromDictionary:otherDictionary->_dictionary];
-    if (_autocreator) {
-      GPBAutocreatedDictionaryModified(_autocreator, self);
-    }
-  }
-}
-
-- (void)setFloat:(float)value forKey:(uint32_t)key {
-  [_dictionary setObject:@(value) forKey:@(key)];
-  if (_autocreator) {
-    GPBAutocreatedDictionaryModified(_autocreator, self);
-  }
-}
-
-- (void)removeFloatForKey:(uint32_t)aKey {
-  [_dictionary removeObjectForKey:@(aKey)];
-}
-
-- (void)removeAll {
-  [_dictionary removeAllObjects];
-}
-
-@end
-
-#pragma mark - UInt32 -> Double
-
-@implementation GPBUInt32DoubleDictionary {
- @package
-  NSMutableDictionary *_dictionary;
-}
-
-- (instancetype)init {
-  return [self initWithDoubles:NULL forKeys:NULL count:0];
-}
-
-- (instancetype)initWithDoubles:(const double [])values
-                        forKeys:(const uint32_t [])keys
-                          count:(NSUInteger)count {
-  self = [super init];
-  if (self) {
-    _dictionary = [[NSMutableDictionary alloc] init];
-    if (count && values && keys) {
-      for (NSUInteger i = 0; i < count; ++i) {
-        [_dictionary setObject:@(values[i]) forKey:@(keys[i])];
-      }
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithDictionary:(GPBUInt32DoubleDictionary *)dictionary {
-  self = [self initWithDoubles:NULL forKeys:NULL count:0];
-  if (self) {
-    if (dictionary) {
-      [_dictionary addEntriesFromDictionary:dictionary->_dictionary];
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithCapacity:(NSUInteger)numItems {
-  #pragma unused(numItems)
-  return [self initWithDoubles:NULL forKeys:NULL count:0];
-}
-
-- (void)dealloc {
-  NSAssert(!_autocreator,
-           @"%@: Autocreator must be cleared before release, autocreator: %@",
-           [self class], _autocreator);
-  [_dictionary release];
-  [super dealloc];
-}
-
-- (instancetype)copyWithZone:(NSZone *)zone {
-  return [[GPBUInt32DoubleDictionary allocWithZone:zone] initWithDictionary:self];
-}
-
-- (BOOL)isEqual:(id)other {
-  if (self == other) {
-    return YES;
-  }
-  if (![other isKindOfClass:[GPBUInt32DoubleDictionary class]]) {
-    return NO;
-  }
-  GPBUInt32DoubleDictionary *otherDictionary = other;
-  return [_dictionary isEqual:otherDictionary->_dictionary];
-}
-
-- (NSUInteger)hash {
-  return _dictionary.count;
-}
-
-- (NSString *)description {
-  return [NSString stringWithFormat:@"<%@ %p> { %@ }", [self class], self, _dictionary];
-}
-
-- (NSUInteger)count {
-  return _dictionary.count;
-}
-
-- (void)enumerateKeysAndDoublesUsingBlock:
-    (void (NS_NOESCAPE ^)(uint32_t key, double value, BOOL *stop))block {
-  BOOL stop = NO;
-  NSDictionary *internal = _dictionary;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    block([aKey unsignedIntValue], [aValue doubleValue], &stop);
-    if (stop) {
-      break;
-    }
-  }
-}
-
-- (size_t)computeSerializedSizeAsField:(GPBFieldDescriptor *)field {
-  NSDictionary *internal = _dictionary;
-  NSUInteger count = internal.count;
-  if (count == 0) {
-    return 0;
-  }
-
-  GPBDataType valueDataType = GPBGetFieldDataType(field);
-  GPBDataType keyDataType = field.mapKeyDataType;
-  size_t result = 0;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    size_t msgSize = ComputeDictUInt32FieldSize([aKey unsignedIntValue], kMapKeyFieldNumber, keyDataType);
-    msgSize += ComputeDictDoubleFieldSize([aValue doubleValue], kMapValueFieldNumber, valueDataType);
-    result += GPBComputeRawVarint32SizeForInteger(msgSize) + msgSize;
-  }
-  size_t tagSize = GPBComputeWireFormatTagSize(GPBFieldNumber(field), GPBDataTypeMessage);
-  result += tagSize * count;
-  return result;
-}
-
-- (void)writeToCodedOutputStream:(GPBCodedOutputStream *)outputStream
-                         asField:(GPBFieldDescriptor *)field {
-  GPBDataType valueDataType = GPBGetFieldDataType(field);
-  GPBDataType keyDataType = field.mapKeyDataType;
-  uint32_t tag = GPBWireFormatMakeTag(GPBFieldNumber(field), GPBWireFormatLengthDelimited);
-  NSDictionary *internal = _dictionary;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    [outputStream writeInt32NoTag:tag];
-    // Write the size of the message.
-    uint32_t unwrappedKey = [aKey unsignedIntValue];
-    double unwrappedValue = [aValue doubleValue];
-    size_t msgSize = ComputeDictUInt32FieldSize(unwrappedKey, kMapKeyFieldNumber, keyDataType);
-    msgSize += ComputeDictDoubleFieldSize(unwrappedValue, kMapValueFieldNumber, valueDataType);
-    [outputStream writeInt32NoTag:(int32_t)msgSize];
-    // Write the fields.
-    WriteDictUInt32Field(outputStream, unwrappedKey, kMapKeyFieldNumber, keyDataType);
-    WriteDictDoubleField(outputStream, unwrappedValue, kMapValueFieldNumber, valueDataType);
-  }
-}
-
-- (void)setGPBGenericValue:(GPBGenericValue *)value
-     forGPBGenericValueKey:(GPBGenericValue *)key {
-  [_dictionary setObject:@(value->valueDouble) forKey:@(key->valueUInt32)];
-}
-
-- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
-  [self enumerateKeysAndDoublesUsingBlock:^(uint32_t key, double value, BOOL *stop) {
-      #pragma unused(stop)
-      block([NSString stringWithFormat:@"%u", key], [NSString stringWithFormat:@"%.*lg", DBL_DIG, value]);
-  }];
-}
-
-- (BOOL)getDouble:(nullable double *)value forKey:(uint32_t)key {
-  NSNumber *wrapped = [_dictionary objectForKey:@(key)];
-  if (wrapped && value) {
-    *value = [wrapped doubleValue];
-  }
-  return (wrapped != NULL);
-}
-
-- (void)addEntriesFromDictionary:(GPBUInt32DoubleDictionary *)otherDictionary {
-  if (otherDictionary) {
-    [_dictionary addEntriesFromDictionary:otherDictionary->_dictionary];
-    if (_autocreator) {
-      GPBAutocreatedDictionaryModified(_autocreator, self);
-    }
-  }
-}
-
-- (void)setDouble:(double)value forKey:(uint32_t)key {
-  [_dictionary setObject:@(value) forKey:@(key)];
-  if (_autocreator) {
-    GPBAutocreatedDictionaryModified(_autocreator, self);
-  }
-}
-
-- (void)removeDoubleForKey:(uint32_t)aKey {
-  [_dictionary removeObjectForKey:@(aKey)];
-}
-
-- (void)removeAll {
-  [_dictionary removeAllObjects];
-}
-
-@end
-
-#pragma mark - UInt32 -> Enum
-
-@implementation GPBUInt32EnumDictionary {
- @package
-  NSMutableDictionary *_dictionary;
-  GPBEnumValidationFunc _validationFunc;
-}
-
-@synthesize validationFunc = _validationFunc;
-
-- (instancetype)init {
-  return [self initWithValidationFunction:NULL rawValues:NULL forKeys:NULL count:0];
-}
-
-- (instancetype)initWithValidationFunction:(GPBEnumValidationFunc)func {
-  return [self initWithValidationFunction:func rawValues:NULL forKeys:NULL count:0];
-}
-
-- (instancetype)initWithValidationFunction:(GPBEnumValidationFunc)func
-                                 rawValues:(const int32_t [])rawValues
-                                   forKeys:(const uint32_t [])keys
-                                     count:(NSUInteger)count {
-  self = [super init];
-  if (self) {
-    _dictionary = [[NSMutableDictionary alloc] init];
-    _validationFunc = (func != NULL ? func : DictDefault_IsValidValue);
-    if (count && rawValues && keys) {
-      for (NSUInteger i = 0; i < count; ++i) {
-        [_dictionary setObject:@(rawValues[i]) forKey:@(keys[i])];
-      }
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithDictionary:(GPBUInt32EnumDictionary *)dictionary {
-  self = [self initWithValidationFunction:dictionary.validationFunc
-                                rawValues:NULL
-                                  forKeys:NULL
-                                    count:0];
-  if (self) {
-    if (dictionary) {
-      [_dictionary addEntriesFromDictionary:dictionary->_dictionary];
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithValidationFunction:(GPBEnumValidationFunc)func
-                                  capacity:(NSUInteger)numItems {
-  #pragma unused(numItems)
-  return [self initWithValidationFunction:func rawValues:NULL forKeys:NULL count:0];
-}
-
-- (void)dealloc {
-  NSAssert(!_autocreator,
-           @"%@: Autocreator must be cleared before release, autocreator: %@",
-           [self class], _autocreator);
-  [_dictionary release];
-  [super dealloc];
-}
-
-- (instancetype)copyWithZone:(NSZone *)zone {
-  return [[GPBUInt32EnumDictionary allocWithZone:zone] initWithDictionary:self];
-}
-
-- (BOOL)isEqual:(id)other {
-  if (self == other) {
-    return YES;
-  }
-  if (![other isKindOfClass:[GPBUInt32EnumDictionary class]]) {
-    return NO;
-  }
-  GPBUInt32EnumDictionary *otherDictionary = other;
-  return [_dictionary isEqual:otherDictionary->_dictionary];
-}
-
-- (NSUInteger)hash {
-  return _dictionary.count;
-}
-
-- (NSString *)description {
-  return [NSString stringWithFormat:@"<%@ %p> { %@ }", [self class], self, _dictionary];
-}
-
-- (NSUInteger)count {
-  return _dictionary.count;
-}
-
-- (void)enumerateKeysAndRawValuesUsingBlock:
-    (void (NS_NOESCAPE ^)(uint32_t key, int32_t value, BOOL *stop))block {
-  BOOL stop = NO;
-  NSDictionary *internal = _dictionary;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    block([aKey unsignedIntValue], [aValue intValue], &stop);
-    if (stop) {
-      break;
-    }
-  }
-}
-
-- (size_t)computeSerializedSizeAsField:(GPBFieldDescriptor *)field {
-  NSDictionary *internal = _dictionary;
-  NSUInteger count = internal.count;
-  if (count == 0) {
-    return 0;
-  }
-
-  GPBDataType valueDataType = GPBGetFieldDataType(field);
-  GPBDataType keyDataType = field.mapKeyDataType;
-  size_t result = 0;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    size_t msgSize = ComputeDictUInt32FieldSize([aKey unsignedIntValue], kMapKeyFieldNumber, keyDataType);
-    msgSize += ComputeDictEnumFieldSize([aValue intValue], kMapValueFieldNumber, valueDataType);
-    result += GPBComputeRawVarint32SizeForInteger(msgSize) + msgSize;
-  }
-  size_t tagSize = GPBComputeWireFormatTagSize(GPBFieldNumber(field), GPBDataTypeMessage);
-  result += tagSize * count;
-  return result;
-}
-
-- (void)writeToCodedOutputStream:(GPBCodedOutputStream *)outputStream
-                         asField:(GPBFieldDescriptor *)field {
-  GPBDataType valueDataType = GPBGetFieldDataType(field);
-  GPBDataType keyDataType = field.mapKeyDataType;
-  uint32_t tag = GPBWireFormatMakeTag(GPBFieldNumber(field), GPBWireFormatLengthDelimited);
-  NSDictionary *internal = _dictionary;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    [outputStream writeInt32NoTag:tag];
-    // Write the size of the message.
-    uint32_t unwrappedKey = [aKey unsignedIntValue];
-    int32_t unwrappedValue = [aValue intValue];
-    size_t msgSize = ComputeDictUInt32FieldSize(unwrappedKey, kMapKeyFieldNumber, keyDataType);
-    msgSize += ComputeDictEnumFieldSize(unwrappedValue, kMapValueFieldNumber, valueDataType);
-    [outputStream writeInt32NoTag:(int32_t)msgSize];
-    // Write the fields.
-    WriteDictUInt32Field(outputStream, unwrappedKey, kMapKeyFieldNumber, keyDataType);
-    WriteDictEnumField(outputStream, unwrappedValue, kMapValueFieldNumber, valueDataType);
-  }
-}
-
-- (NSData *)serializedDataForUnknownValue:(int32_t)value
-                                   forKey:(GPBGenericValue *)key
-                              keyDataType:(GPBDataType)keyDataType {
-  size_t msgSize = ComputeDictUInt32FieldSize(key->valueUInt32, kMapKeyFieldNumber, keyDataType);
-  msgSize += ComputeDictEnumFieldSize(value, kMapValueFieldNumber, GPBDataTypeEnum);
-  NSMutableData *data = [NSMutableData dataWithLength:msgSize];
-  GPBCodedOutputStream *outputStream = [[GPBCodedOutputStream alloc] initWithData:data];
-  WriteDictUInt32Field(outputStream, key->valueUInt32, kMapKeyFieldNumber, keyDataType);
-  WriteDictEnumField(outputStream, value, kMapValueFieldNumber, GPBDataTypeEnum);
-  [outputStream release];
-  return data;
-}
-- (void)setGPBGenericValue:(GPBGenericValue *)value
-     forGPBGenericValueKey:(GPBGenericValue *)key {
-  [_dictionary setObject:@(value->valueEnum) forKey:@(key->valueUInt32)];
-}
-
-- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
-  [self enumerateKeysAndRawValuesUsingBlock:^(uint32_t key, int32_t value, BOOL *stop) {
-      #pragma unused(stop)
-      block([NSString stringWithFormat:@"%u", key], @(value));
-  }];
-}
-
-- (BOOL)getEnum:(int32_t *)value forKey:(uint32_t)key {
-  NSNumber *wrapped = [_dictionary objectForKey:@(key)];
-  if (wrapped && value) {
-    int32_t result = [wrapped intValue];
-    if (!_validationFunc(result)) {
-      result = kGPBUnrecognizedEnumeratorValue;
-    }
-    *value = result;
-  }
-  return (wrapped != NULL);
-}
-
-- (BOOL)getRawValue:(int32_t *)rawValue forKey:(uint32_t)key {
-  NSNumber *wrapped = [_dictionary objectForKey:@(key)];
-  if (wrapped && rawValue) {
-    *rawValue = [wrapped intValue];
-  }
-  return (wrapped != NULL);
-}
-
-- (void)enumerateKeysAndEnumsUsingBlock:
-    (void (NS_NOESCAPE ^)(uint32_t key, int32_t value, BOOL *stop))block {
-  GPBEnumValidationFunc func = _validationFunc;
-  BOOL stop = NO;
-  NSEnumerator *keys = [_dictionary keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = _dictionary[aKey];
-      int32_t unwrapped = [aValue intValue];
-      if (!func(unwrapped)) {
-        unwrapped = kGPBUnrecognizedEnumeratorValue;
-      }
-    block([aKey unsignedIntValue], unwrapped, &stop);
-    if (stop) {
-      break;
-    }
-  }
-}
-
-- (void)addRawEntriesFromDictionary:(GPBUInt32EnumDictionary *)otherDictionary {
-  if (otherDictionary) {
-    [_dictionary addEntriesFromDictionary:otherDictionary->_dictionary];
-    if (_autocreator) {
-      GPBAutocreatedDictionaryModified(_autocreator, self);
-    }
-  }
-}
-
-- (void)setRawValue:(int32_t)value forKey:(uint32_t)key {
-  [_dictionary setObject:@(value) forKey:@(key)];
-  if (_autocreator) {
-    GPBAutocreatedDictionaryModified(_autocreator, self);
-  }
-}
-
-- (void)removeEnumForKey:(uint32_t)aKey {
-  [_dictionary removeObjectForKey:@(aKey)];
-}
-
-- (void)removeAll {
-  [_dictionary removeAllObjects];
-}
-
-- (void)setEnum:(int32_t)value forKey:(uint32_t)key {
-  if (!_validationFunc(value)) {
-    [NSException raise:NSInvalidArgumentException
-                format:@"GPBUInt32EnumDictionary: Attempt to set an unknown enum value (%d)",
-                       value];
-  }
-
-  [_dictionary setObject:@(value) forKey:@(key)];
-  if (_autocreator) {
-    GPBAutocreatedDictionaryModified(_autocreator, self);
-  }
-}
-
-@end
-
-#pragma mark - UInt32 -> Object
-
-@implementation GPBUInt32ObjectDictionary {
- @package
-  NSMutableDictionary *_dictionary;
-}
-
-- (instancetype)init {
-  return [self initWithObjects:NULL forKeys:NULL count:0];
-}
-
-- (instancetype)initWithObjects:(const id [])objects
-                        forKeys:(const uint32_t [])keys
-                          count:(NSUInteger)count {
-  self = [super init];
-  if (self) {
-    _dictionary = [[NSMutableDictionary alloc] init];
-    if (count && objects && keys) {
-      for (NSUInteger i = 0; i < count; ++i) {
-        if (!objects[i]) {
-          [NSException raise:NSInvalidArgumentException
-                      format:@"Attempting to add nil object to a Dictionary"];
-        }
-        [_dictionary setObject:objects[i] forKey:@(keys[i])];
-      }
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithDictionary:(GPBUInt32ObjectDictionary *)dictionary {
-  self = [self initWithObjects:NULL forKeys:NULL count:0];
-  if (self) {
-    if (dictionary) {
-      [_dictionary addEntriesFromDictionary:dictionary->_dictionary];
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithCapacity:(NSUInteger)numItems {
-  #pragma unused(numItems)
-  return [self initWithObjects:NULL forKeys:NULL count:0];
-}
-
-- (void)dealloc {
-  NSAssert(!_autocreator,
-           @"%@: Autocreator must be cleared before release, autocreator: %@",
-           [self class], _autocreator);
-  [_dictionary release];
-  [super dealloc];
-}
-
-- (instancetype)copyWithZone:(NSZone *)zone {
-  return [[GPBUInt32ObjectDictionary allocWithZone:zone] initWithDictionary:self];
-}
-
-- (BOOL)isEqual:(id)other {
-  if (self == other) {
-    return YES;
-  }
-  if (![other isKindOfClass:[GPBUInt32ObjectDictionary class]]) {
-    return NO;
-  }
-  GPBUInt32ObjectDictionary *otherDictionary = other;
-  return [_dictionary isEqual:otherDictionary->_dictionary];
-}
-
-- (NSUInteger)hash {
-  return _dictionary.count;
-}
-
-- (NSString *)description {
-  return [NSString stringWithFormat:@"<%@ %p> { %@ }", [self class], self, _dictionary];
-}
-
-- (NSUInteger)count {
-  return _dictionary.count;
-}
-
-- (void)enumerateKeysAndObjectsUsingBlock:
-    (void (NS_NOESCAPE ^)(uint32_t key, id object, BOOL *stop))block {
-  BOOL stop = NO;
-  NSDictionary *internal = _dictionary;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    id aObject = internal[aKey];
-    block([aKey unsignedIntValue], aObject, &stop);
-    if (stop) {
-      break;
-    }
-  }
-}
-
-- (BOOL)isInitialized {
-  for (GPBMessage *msg in [_dictionary objectEnumerator]) {
-    if (!msg.initialized) {
-      return NO;
-    }
-  }
-  return YES;
-}
-
-- (instancetype)deepCopyWithZone:(NSZone *)zone {
-  GPBUInt32ObjectDictionary *newDict =
-      [[GPBUInt32ObjectDictionary alloc] init];
-  NSEnumerator *keys = [_dictionary keyEnumerator];
-  id aKey;
-  NSMutableDictionary *internalDict = newDict->_dictionary;
-  while ((aKey = [keys nextObject])) {
-    GPBMessage *msg = _dictionary[aKey];
-    GPBMessage *copiedMsg = [msg copyWithZone:zone];
-    [internalDict setObject:copiedMsg forKey:aKey];
-    [copiedMsg release];
-  }
-  return newDict;
-}
-
-- (size_t)computeSerializedSizeAsField:(GPBFieldDescriptor *)field {
-  NSDictionary *internal = _dictionary;
-  NSUInteger count = internal.count;
-  if (count == 0) {
-    return 0;
-  }
-
-  GPBDataType valueDataType = GPBGetFieldDataType(field);
-  GPBDataType keyDataType = field.mapKeyDataType;
-  size_t result = 0;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    id aObject = internal[aKey];
-    size_t msgSize = ComputeDictUInt32FieldSize([aKey unsignedIntValue], kMapKeyFieldNumber, keyDataType);
-    msgSize += ComputeDictObjectFieldSize(aObject, kMapValueFieldNumber, valueDataType);
-    result += GPBComputeRawVarint32SizeForInteger(msgSize) + msgSize;
-  }
-  size_t tagSize = GPBComputeWireFormatTagSize(GPBFieldNumber(field), GPBDataTypeMessage);
-  result += tagSize * count;
-  return result;
-}
-
-- (void)writeToCodedOutputStream:(GPBCodedOutputStream *)outputStream
-                         asField:(GPBFieldDescriptor *)field {
-  GPBDataType valueDataType = GPBGetFieldDataType(field);
-  GPBDataType keyDataType = field.mapKeyDataType;
-  uint32_t tag = GPBWireFormatMakeTag(GPBFieldNumber(field), GPBWireFormatLengthDelimited);
-  NSDictionary *internal = _dictionary;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    id aObject = internal[aKey];
-    [outputStream writeInt32NoTag:tag];
-    // Write the size of the message.
-    uint32_t unwrappedKey = [aKey unsignedIntValue];
-    id unwrappedValue = aObject;
-    size_t msgSize = ComputeDictUInt32FieldSize(unwrappedKey, kMapKeyFieldNumber, keyDataType);
-    msgSize += ComputeDictObjectFieldSize(unwrappedValue, kMapValueFieldNumber, valueDataType);
-    [outputStream writeInt32NoTag:(int32_t)msgSize];
-    // Write the fields.
-    WriteDictUInt32Field(outputStream, unwrappedKey, kMapKeyFieldNumber, keyDataType);
-    WriteDictObjectField(outputStream, unwrappedValue, kMapValueFieldNumber, valueDataType);
-  }
-}
-
-- (void)setGPBGenericValue:(GPBGenericValue *)value
-     forGPBGenericValueKey:(GPBGenericValue *)key {
-  [_dictionary setObject:value->valueString forKey:@(key->valueUInt32)];
-}
-
-- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
-  [self enumerateKeysAndObjectsUsingBlock:^(uint32_t key, id object, BOOL *stop) {
-      #pragma unused(stop)
-      block([NSString stringWithFormat:@"%u", key], object);
-  }];
-}
-
-- (id)objectForKey:(uint32_t)key {
-  id result = [_dictionary objectForKey:@(key)];
-  return result;
-}
-
-- (void)addEntriesFromDictionary:(GPBUInt32ObjectDictionary *)otherDictionary {
-  if (otherDictionary) {
-    [_dictionary addEntriesFromDictionary:otherDictionary->_dictionary];
-    if (_autocreator) {
-      GPBAutocreatedDictionaryModified(_autocreator, self);
-    }
-  }
-}
-
-- (void)setObject:(id)object forKey:(uint32_t)key {
-  if (!object) {
-    [NSException raise:NSInvalidArgumentException
-                format:@"Attempting to add nil object to a Dictionary"];
-  }
-  [_dictionary setObject:object forKey:@(key)];
-  if (_autocreator) {
-    GPBAutocreatedDictionaryModified(_autocreator, self);
-  }
-}
-
-- (void)removeObjectForKey:(uint32_t)aKey {
-  [_dictionary removeObjectForKey:@(aKey)];
-}
-
-- (void)removeAll {
-  [_dictionary removeAllObjects];
-}
-
-@end
-
-// clang-format on
-//%PDDM-EXPAND DICTIONARY_IMPL_FOR_POD_KEY(Int32, int32_t)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-#pragma mark - Int32 -> UInt32
-
-@implementation GPBInt32UInt32Dictionary {
- @package
-  NSMutableDictionary *_dictionary;
-}
-
-- (instancetype)init {
-  return [self initWithUInt32s:NULL forKeys:NULL count:0];
-}
-
-- (instancetype)initWithUInt32s:(const uint32_t [])values
-                        forKeys:(const int32_t [])keys
-                          count:(NSUInteger)count {
-  self = [super init];
-  if (self) {
-    _dictionary = [[NSMutableDictionary alloc] init];
-    if (count && values && keys) {
-      for (NSUInteger i = 0; i < count; ++i) {
-        [_dictionary setObject:@(values[i]) forKey:@(keys[i])];
-      }
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithDictionary:(GPBInt32UInt32Dictionary *)dictionary {
-  self = [self initWithUInt32s:NULL forKeys:NULL count:0];
-  if (self) {
-    if (dictionary) {
-      [_dictionary addEntriesFromDictionary:dictionary->_dictionary];
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithCapacity:(NSUInteger)numItems {
-  #pragma unused(numItems)
-  return [self initWithUInt32s:NULL forKeys:NULL count:0];
-}
-
-- (void)dealloc {
-  NSAssert(!_autocreator,
-           @"%@: Autocreator must be cleared before release, autocreator: %@",
-           [self class], _autocreator);
-  [_dictionary release];
-  [super dealloc];
-}
-
-- (instancetype)copyWithZone:(NSZone *)zone {
-  return [[GPBInt32UInt32Dictionary allocWithZone:zone] initWithDictionary:self];
-}
-
-- (BOOL)isEqual:(id)other {
-  if (self == other) {
-    return YES;
-  }
-  if (![other isKindOfClass:[GPBInt32UInt32Dictionary class]]) {
-    return NO;
-  }
-  GPBInt32UInt32Dictionary *otherDictionary = other;
-  return [_dictionary isEqual:otherDictionary->_dictionary];
-}
-
-- (NSUInteger)hash {
-  return _dictionary.count;
-}
-
-- (NSString *)description {
-  return [NSString stringWithFormat:@"<%@ %p> { %@ }", [self class], self, _dictionary];
-}
-
-- (NSUInteger)count {
-  return _dictionary.count;
-}
-
-- (void)enumerateKeysAndUInt32sUsingBlock:
-    (void (NS_NOESCAPE ^)(int32_t key, uint32_t value, BOOL *stop))block {
-  BOOL stop = NO;
-  NSDictionary *internal = _dictionary;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    block([aKey intValue], [aValue unsignedIntValue], &stop);
-    if (stop) {
-      break;
-    }
-  }
-}
-
-- (size_t)computeSerializedSizeAsField:(GPBFieldDescriptor *)field {
-  NSDictionary *internal = _dictionary;
-  NSUInteger count = internal.count;
-  if (count == 0) {
-    return 0;
-  }
-
-  GPBDataType valueDataType = GPBGetFieldDataType(field);
-  GPBDataType keyDataType = field.mapKeyDataType;
-  size_t result = 0;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    size_t msgSize = ComputeDictInt32FieldSize([aKey intValue], kMapKeyFieldNumber, keyDataType);
-    msgSize += ComputeDictUInt32FieldSize([aValue unsignedIntValue], kMapValueFieldNumber, valueDataType);
-    result += GPBComputeRawVarint32SizeForInteger(msgSize) + msgSize;
-  }
-  size_t tagSize = GPBComputeWireFormatTagSize(GPBFieldNumber(field), GPBDataTypeMessage);
-  result += tagSize * count;
-  return result;
-}
-
-- (void)writeToCodedOutputStream:(GPBCodedOutputStream *)outputStream
-                         asField:(GPBFieldDescriptor *)field {
-  GPBDataType valueDataType = GPBGetFieldDataType(field);
-  GPBDataType keyDataType = field.mapKeyDataType;
-  uint32_t tag = GPBWireFormatMakeTag(GPBFieldNumber(field), GPBWireFormatLengthDelimited);
-  NSDictionary *internal = _dictionary;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    [outputStream writeInt32NoTag:tag];
-    // Write the size of the message.
-    int32_t unwrappedKey = [aKey intValue];
-    uint32_t unwrappedValue = [aValue unsignedIntValue];
-    size_t msgSize = ComputeDictInt32FieldSize(unwrappedKey, kMapKeyFieldNumber, keyDataType);
-    msgSize += ComputeDictUInt32FieldSize(unwrappedValue, kMapValueFieldNumber, valueDataType);
-    [outputStream writeInt32NoTag:(int32_t)msgSize];
-    // Write the fields.
-    WriteDictInt32Field(outputStream, unwrappedKey, kMapKeyFieldNumber, keyDataType);
-    WriteDictUInt32Field(outputStream, unwrappedValue, kMapValueFieldNumber, valueDataType);
-  }
-}
-
-- (void)setGPBGenericValue:(GPBGenericValue *)value
-     forGPBGenericValueKey:(GPBGenericValue *)key {
-  [_dictionary setObject:@(value->valueUInt32) forKey:@(key->valueInt32)];
-}
-
-- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
-  [self enumerateKeysAndUInt32sUsingBlock:^(int32_t key, uint32_t value, BOOL *stop) {
-      #pragma unused(stop)
-      block([NSString stringWithFormat:@"%d", key], [NSString stringWithFormat:@"%u", value]);
-  }];
-}
-
-- (BOOL)getUInt32:(nullable uint32_t *)value forKey:(int32_t)key {
-  NSNumber *wrapped = [_dictionary objectForKey:@(key)];
-  if (wrapped && value) {
-    *value = [wrapped unsignedIntValue];
-  }
-  return (wrapped != NULL);
-}
-
-- (void)addEntriesFromDictionary:(GPBInt32UInt32Dictionary *)otherDictionary {
-  if (otherDictionary) {
-    [_dictionary addEntriesFromDictionary:otherDictionary->_dictionary];
-    if (_autocreator) {
-      GPBAutocreatedDictionaryModified(_autocreator, self);
-    }
-  }
-}
-
-- (void)setUInt32:(uint32_t)value forKey:(int32_t)key {
-  [_dictionary setObject:@(value) forKey:@(key)];
-  if (_autocreator) {
-    GPBAutocreatedDictionaryModified(_autocreator, self);
-  }
-}
-
-- (void)removeUInt32ForKey:(int32_t)aKey {
-  [_dictionary removeObjectForKey:@(aKey)];
-}
-
-- (void)removeAll {
-  [_dictionary removeAllObjects];
-}
-
-@end
-
-#pragma mark - Int32 -> Int32
-
-@implementation GPBInt32Int32Dictionary {
- @package
-  NSMutableDictionary *_dictionary;
-}
-
-- (instancetype)init {
-  return [self initWithInt32s:NULL forKeys:NULL count:0];
-}
-
-- (instancetype)initWithInt32s:(const int32_t [])values
-                       forKeys:(const int32_t [])keys
-                         count:(NSUInteger)count {
-  self = [super init];
-  if (self) {
-    _dictionary = [[NSMutableDictionary alloc] init];
-    if (count && values && keys) {
-      for (NSUInteger i = 0; i < count; ++i) {
-        [_dictionary setObject:@(values[i]) forKey:@(keys[i])];
-      }
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithDictionary:(GPBInt32Int32Dictionary *)dictionary {
-  self = [self initWithInt32s:NULL forKeys:NULL count:0];
-  if (self) {
-    if (dictionary) {
-      [_dictionary addEntriesFromDictionary:dictionary->_dictionary];
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithCapacity:(NSUInteger)numItems {
-  #pragma unused(numItems)
-  return [self initWithInt32s:NULL forKeys:NULL count:0];
-}
-
-- (void)dealloc {
-  NSAssert(!_autocreator,
-           @"%@: Autocreator must be cleared before release, autocreator: %@",
-           [self class], _autocreator);
-  [_dictionary release];
-  [super dealloc];
-}
-
-- (instancetype)copyWithZone:(NSZone *)zone {
-  return [[GPBInt32Int32Dictionary allocWithZone:zone] initWithDictionary:self];
-}
-
-- (BOOL)isEqual:(id)other {
-  if (self == other) {
-    return YES;
-  }
-  if (![other isKindOfClass:[GPBInt32Int32Dictionary class]]) {
-    return NO;
-  }
-  GPBInt32Int32Dictionary *otherDictionary = other;
-  return [_dictionary isEqual:otherDictionary->_dictionary];
-}
-
-- (NSUInteger)hash {
-  return _dictionary.count;
-}
-
-- (NSString *)description {
-  return [NSString stringWithFormat:@"<%@ %p> { %@ }", [self class], self, _dictionary];
-}
-
-- (NSUInteger)count {
-  return _dictionary.count;
-}
-
-- (void)enumerateKeysAndInt32sUsingBlock:
-    (void (NS_NOESCAPE ^)(int32_t key, int32_t value, BOOL *stop))block {
-  BOOL stop = NO;
-  NSDictionary *internal = _dictionary;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    block([aKey intValue], [aValue intValue], &stop);
-    if (stop) {
-      break;
-    }
-  }
-}
-
-- (size_t)computeSerializedSizeAsField:(GPBFieldDescriptor *)field {
-  NSDictionary *internal = _dictionary;
-  NSUInteger count = internal.count;
-  if (count == 0) {
-    return 0;
-  }
-
-  GPBDataType valueDataType = GPBGetFieldDataType(field);
-  GPBDataType keyDataType = field.mapKeyDataType;
-  size_t result = 0;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    size_t msgSize = ComputeDictInt32FieldSize([aKey intValue], kMapKeyFieldNumber, keyDataType);
-    msgSize += ComputeDictInt32FieldSize([aValue intValue], kMapValueFieldNumber, valueDataType);
-    result += GPBComputeRawVarint32SizeForInteger(msgSize) + msgSize;
-  }
-  size_t tagSize = GPBComputeWireFormatTagSize(GPBFieldNumber(field), GPBDataTypeMessage);
-  result += tagSize * count;
-  return result;
-}
-
-- (void)writeToCodedOutputStream:(GPBCodedOutputStream *)outputStream
-                         asField:(GPBFieldDescriptor *)field {
-  GPBDataType valueDataType = GPBGetFieldDataType(field);
-  GPBDataType keyDataType = field.mapKeyDataType;
-  uint32_t tag = GPBWireFormatMakeTag(GPBFieldNumber(field), GPBWireFormatLengthDelimited);
-  NSDictionary *internal = _dictionary;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    [outputStream writeInt32NoTag:tag];
-    // Write the size of the message.
-    int32_t unwrappedKey = [aKey intValue];
-    int32_t unwrappedValue = [aValue intValue];
-    size_t msgSize = ComputeDictInt32FieldSize(unwrappedKey, kMapKeyFieldNumber, keyDataType);
-    msgSize += ComputeDictInt32FieldSize(unwrappedValue, kMapValueFieldNumber, valueDataType);
-    [outputStream writeInt32NoTag:(int32_t)msgSize];
-    // Write the fields.
-    WriteDictInt32Field(outputStream, unwrappedKey, kMapKeyFieldNumber, keyDataType);
-    WriteDictInt32Field(outputStream, unwrappedValue, kMapValueFieldNumber, valueDataType);
-  }
-}
-
-- (void)setGPBGenericValue:(GPBGenericValue *)value
-     forGPBGenericValueKey:(GPBGenericValue *)key {
-  [_dictionary setObject:@(value->valueInt32) forKey:@(key->valueInt32)];
-}
-
-- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
-  [self enumerateKeysAndInt32sUsingBlock:^(int32_t key, int32_t value, BOOL *stop) {
-      #pragma unused(stop)
-      block([NSString stringWithFormat:@"%d", key], [NSString stringWithFormat:@"%d", value]);
-  }];
-}
-
-- (BOOL)getInt32:(nullable int32_t *)value forKey:(int32_t)key {
-  NSNumber *wrapped = [_dictionary objectForKey:@(key)];
-  if (wrapped && value) {
-    *value = [wrapped intValue];
-  }
-  return (wrapped != NULL);
-}
-
-- (void)addEntriesFromDictionary:(GPBInt32Int32Dictionary *)otherDictionary {
-  if (otherDictionary) {
-    [_dictionary addEntriesFromDictionary:otherDictionary->_dictionary];
-    if (_autocreator) {
-      GPBAutocreatedDictionaryModified(_autocreator, self);
-    }
-  }
-}
-
-- (void)setInt32:(int32_t)value forKey:(int32_t)key {
-  [_dictionary setObject:@(value) forKey:@(key)];
-  if (_autocreator) {
-    GPBAutocreatedDictionaryModified(_autocreator, self);
-  }
-}
-
-- (void)removeInt32ForKey:(int32_t)aKey {
-  [_dictionary removeObjectForKey:@(aKey)];
-}
-
-- (void)removeAll {
-  [_dictionary removeAllObjects];
-}
-
-@end
-
-#pragma mark - Int32 -> UInt64
-
-@implementation GPBInt32UInt64Dictionary {
- @package
-  NSMutableDictionary *_dictionary;
-}
-
-- (instancetype)init {
-  return [self initWithUInt64s:NULL forKeys:NULL count:0];
-}
-
-- (instancetype)initWithUInt64s:(const uint64_t [])values
-                        forKeys:(const int32_t [])keys
-                          count:(NSUInteger)count {
-  self = [super init];
-  if (self) {
-    _dictionary = [[NSMutableDictionary alloc] init];
-    if (count && values && keys) {
-      for (NSUInteger i = 0; i < count; ++i) {
-        [_dictionary setObject:@(values[i]) forKey:@(keys[i])];
-      }
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithDictionary:(GPBInt32UInt64Dictionary *)dictionary {
-  self = [self initWithUInt64s:NULL forKeys:NULL count:0];
-  if (self) {
-    if (dictionary) {
-      [_dictionary addEntriesFromDictionary:dictionary->_dictionary];
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithCapacity:(NSUInteger)numItems {
-  #pragma unused(numItems)
-  return [self initWithUInt64s:NULL forKeys:NULL count:0];
-}
-
-- (void)dealloc {
-  NSAssert(!_autocreator,
-           @"%@: Autocreator must be cleared before release, autocreator: %@",
-           [self class], _autocreator);
-  [_dictionary release];
-  [super dealloc];
-}
-
-- (instancetype)copyWithZone:(NSZone *)zone {
-  return [[GPBInt32UInt64Dictionary allocWithZone:zone] initWithDictionary:self];
-}
-
-- (BOOL)isEqual:(id)other {
-  if (self == other) {
-    return YES;
-  }
-  if (![other isKindOfClass:[GPBInt32UInt64Dictionary class]]) {
-    return NO;
-  }
-  GPBInt32UInt64Dictionary *otherDictionary = other;
-  return [_dictionary isEqual:otherDictionary->_dictionary];
-}
-
-- (NSUInteger)hash {
-  return _dictionary.count;
-}
-
-- (NSString *)description {
-  return [NSString stringWithFormat:@"<%@ %p> { %@ }", [self class], self, _dictionary];
-}
-
-- (NSUInteger)count {
-  return _dictionary.count;
-}
-
-- (void)enumerateKeysAndUInt64sUsingBlock:
-    (void (NS_NOESCAPE ^)(int32_t key, uint64_t value, BOOL *stop))block {
-  BOOL stop = NO;
-  NSDictionary *internal = _dictionary;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    block([aKey intValue], [aValue unsignedLongLongValue], &stop);
-    if (stop) {
-      break;
-    }
-  }
-}
-
-- (size_t)computeSerializedSizeAsField:(GPBFieldDescriptor *)field {
-  NSDictionary *internal = _dictionary;
-  NSUInteger count = internal.count;
-  if (count == 0) {
-    return 0;
-  }
-
-  GPBDataType valueDataType = GPBGetFieldDataType(field);
-  GPBDataType keyDataType = field.mapKeyDataType;
-  size_t result = 0;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    size_t msgSize = ComputeDictInt32FieldSize([aKey intValue], kMapKeyFieldNumber, keyDataType);
-    msgSize += ComputeDictUInt64FieldSize([aValue unsignedLongLongValue], kMapValueFieldNumber, valueDataType);
-    result += GPBComputeRawVarint32SizeForInteger(msgSize) + msgSize;
-  }
-  size_t tagSize = GPBComputeWireFormatTagSize(GPBFieldNumber(field), GPBDataTypeMessage);
-  result += tagSize * count;
-  return result;
-}
-
-- (void)writeToCodedOutputStream:(GPBCodedOutputStream *)outputStream
-                         asField:(GPBFieldDescriptor *)field {
-  GPBDataType valueDataType = GPBGetFieldDataType(field);
-  GPBDataType keyDataType = field.mapKeyDataType;
-  uint32_t tag = GPBWireFormatMakeTag(GPBFieldNumber(field), GPBWireFormatLengthDelimited);
-  NSDictionary *internal = _dictionary;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    [outputStream writeInt32NoTag:tag];
-    // Write the size of the message.
-    int32_t unwrappedKey = [aKey intValue];
-    uint64_t unwrappedValue = [aValue unsignedLongLongValue];
-    size_t msgSize = ComputeDictInt32FieldSize(unwrappedKey, kMapKeyFieldNumber, keyDataType);
-    msgSize += ComputeDictUInt64FieldSize(unwrappedValue, kMapValueFieldNumber, valueDataType);
-    [outputStream writeInt32NoTag:(int32_t)msgSize];
-    // Write the fields.
-    WriteDictInt32Field(outputStream, unwrappedKey, kMapKeyFieldNumber, keyDataType);
-    WriteDictUInt64Field(outputStream, unwrappedValue, kMapValueFieldNumber, valueDataType);
-  }
-}
-
-- (void)setGPBGenericValue:(GPBGenericValue *)value
-     forGPBGenericValueKey:(GPBGenericValue *)key {
-  [_dictionary setObject:@(value->valueUInt64) forKey:@(key->valueInt32)];
-}
-
-- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
-  [self enumerateKeysAndUInt64sUsingBlock:^(int32_t key, uint64_t value, BOOL *stop) {
-      #pragma unused(stop)
-      block([NSString stringWithFormat:@"%d", key], [NSString stringWithFormat:@"%llu", value]);
-  }];
-}
-
-- (BOOL)getUInt64:(nullable uint64_t *)value forKey:(int32_t)key {
-  NSNumber *wrapped = [_dictionary objectForKey:@(key)];
-  if (wrapped && value) {
-    *value = [wrapped unsignedLongLongValue];
-  }
-  return (wrapped != NULL);
-}
-
-- (void)addEntriesFromDictionary:(GPBInt32UInt64Dictionary *)otherDictionary {
-  if (otherDictionary) {
-    [_dictionary addEntriesFromDictionary:otherDictionary->_dictionary];
-    if (_autocreator) {
-      GPBAutocreatedDictionaryModified(_autocreator, self);
-    }
-  }
-}
-
-- (void)setUInt64:(uint64_t)value forKey:(int32_t)key {
-  [_dictionary setObject:@(value) forKey:@(key)];
-  if (_autocreator) {
-    GPBAutocreatedDictionaryModified(_autocreator, self);
-  }
-}
-
-- (void)removeUInt64ForKey:(int32_t)aKey {
-  [_dictionary removeObjectForKey:@(aKey)];
-}
-
-- (void)removeAll {
-  [_dictionary removeAllObjects];
-}
-
-@end
-
-#pragma mark - Int32 -> Int64
-
-@implementation GPBInt32Int64Dictionary {
- @package
-  NSMutableDictionary *_dictionary;
-}
-
-- (instancetype)init {
-  return [self initWithInt64s:NULL forKeys:NULL count:0];
-}
-
-- (instancetype)initWithInt64s:(const int64_t [])values
-                       forKeys:(const int32_t [])keys
-                         count:(NSUInteger)count {
-  self = [super init];
-  if (self) {
-    _dictionary = [[NSMutableDictionary alloc] init];
-    if (count && values && keys) {
-      for (NSUInteger i = 0; i < count; ++i) {
-        [_dictionary setObject:@(values[i]) forKey:@(keys[i])];
-      }
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithDictionary:(GPBInt32Int64Dictionary *)dictionary {
-  self = [self initWithInt64s:NULL forKeys:NULL count:0];
-  if (self) {
-    if (dictionary) {
-      [_dictionary addEntriesFromDictionary:dictionary->_dictionary];
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithCapacity:(NSUInteger)numItems {
-  #pragma unused(numItems)
-  return [self initWithInt64s:NULL forKeys:NULL count:0];
-}
-
-- (void)dealloc {
-  NSAssert(!_autocreator,
-           @"%@: Autocreator must be cleared before release, autocreator: %@",
-           [self class], _autocreator);
-  [_dictionary release];
-  [super dealloc];
-}
-
-- (instancetype)copyWithZone:(NSZone *)zone {
-  return [[GPBInt32Int64Dictionary allocWithZone:zone] initWithDictionary:self];
-}
-
-- (BOOL)isEqual:(id)other {
-  if (self == other) {
-    return YES;
-  }
-  if (![other isKindOfClass:[GPBInt32Int64Dictionary class]]) {
-    return NO;
-  }
-  GPBInt32Int64Dictionary *otherDictionary = other;
-  return [_dictionary isEqual:otherDictionary->_dictionary];
-}
-
-- (NSUInteger)hash {
-  return _dictionary.count;
-}
-
-- (NSString *)description {
-  return [NSString stringWithFormat:@"<%@ %p> { %@ }", [self class], self, _dictionary];
-}
-
-- (NSUInteger)count {
-  return _dictionary.count;
-}
-
-- (void)enumerateKeysAndInt64sUsingBlock:
-    (void (NS_NOESCAPE ^)(int32_t key, int64_t value, BOOL *stop))block {
-  BOOL stop = NO;
-  NSDictionary *internal = _dictionary;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    block([aKey intValue], [aValue longLongValue], &stop);
-    if (stop) {
-      break;
-    }
-  }
-}
-
-- (size_t)computeSerializedSizeAsField:(GPBFieldDescriptor *)field {
-  NSDictionary *internal = _dictionary;
-  NSUInteger count = internal.count;
-  if (count == 0) {
-    return 0;
-  }
-
-  GPBDataType valueDataType = GPBGetFieldDataType(field);
-  GPBDataType keyDataType = field.mapKeyDataType;
-  size_t result = 0;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    size_t msgSize = ComputeDictInt32FieldSize([aKey intValue], kMapKeyFieldNumber, keyDataType);
-    msgSize += ComputeDictInt64FieldSize([aValue longLongValue], kMapValueFieldNumber, valueDataType);
-    result += GPBComputeRawVarint32SizeForInteger(msgSize) + msgSize;
-  }
-  size_t tagSize = GPBComputeWireFormatTagSize(GPBFieldNumber(field), GPBDataTypeMessage);
-  result += tagSize * count;
-  return result;
-}
-
-- (void)writeToCodedOutputStream:(GPBCodedOutputStream *)outputStream
-                         asField:(GPBFieldDescriptor *)field {
-  GPBDataType valueDataType = GPBGetFieldDataType(field);
-  GPBDataType keyDataType = field.mapKeyDataType;
-  uint32_t tag = GPBWireFormatMakeTag(GPBFieldNumber(field), GPBWireFormatLengthDelimited);
-  NSDictionary *internal = _dictionary;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    [outputStream writeInt32NoTag:tag];
-    // Write the size of the message.
-    int32_t unwrappedKey = [aKey intValue];
-    int64_t unwrappedValue = [aValue longLongValue];
-    size_t msgSize = ComputeDictInt32FieldSize(unwrappedKey, kMapKeyFieldNumber, keyDataType);
-    msgSize += ComputeDictInt64FieldSize(unwrappedValue, kMapValueFieldNumber, valueDataType);
-    [outputStream writeInt32NoTag:(int32_t)msgSize];
-    // Write the fields.
-    WriteDictInt32Field(outputStream, unwrappedKey, kMapKeyFieldNumber, keyDataType);
-    WriteDictInt64Field(outputStream, unwrappedValue, kMapValueFieldNumber, valueDataType);
-  }
-}
-
-- (void)setGPBGenericValue:(GPBGenericValue *)value
-     forGPBGenericValueKey:(GPBGenericValue *)key {
-  [_dictionary setObject:@(value->valueInt64) forKey:@(key->valueInt32)];
-}
-
-- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
-  [self enumerateKeysAndInt64sUsingBlock:^(int32_t key, int64_t value, BOOL *stop) {
-      #pragma unused(stop)
-      block([NSString stringWithFormat:@"%d", key], [NSString stringWithFormat:@"%lld", value]);
-  }];
-}
-
-- (BOOL)getInt64:(nullable int64_t *)value forKey:(int32_t)key {
-  NSNumber *wrapped = [_dictionary objectForKey:@(key)];
-  if (wrapped && value) {
-    *value = [wrapped longLongValue];
-  }
-  return (wrapped != NULL);
-}
-
-- (void)addEntriesFromDictionary:(GPBInt32Int64Dictionary *)otherDictionary {
-  if (otherDictionary) {
-    [_dictionary addEntriesFromDictionary:otherDictionary->_dictionary];
-    if (_autocreator) {
-      GPBAutocreatedDictionaryModified(_autocreator, self);
-    }
-  }
-}
-
-- (void)setInt64:(int64_t)value forKey:(int32_t)key {
-  [_dictionary setObject:@(value) forKey:@(key)];
-  if (_autocreator) {
-    GPBAutocreatedDictionaryModified(_autocreator, self);
-  }
-}
-
-- (void)removeInt64ForKey:(int32_t)aKey {
-  [_dictionary removeObjectForKey:@(aKey)];
-}
-
-- (void)removeAll {
-  [_dictionary removeAllObjects];
-}
-
-@end
-
-#pragma mark - Int32 -> Bool
-
-@implementation GPBInt32BoolDictionary {
- @package
-  NSMutableDictionary *_dictionary;
-}
-
-- (instancetype)init {
-  return [self initWithBools:NULL forKeys:NULL count:0];
-}
-
-- (instancetype)initWithBools:(const BOOL [])values
-                      forKeys:(const int32_t [])keys
-                        count:(NSUInteger)count {
-  self = [super init];
-  if (self) {
-    _dictionary = [[NSMutableDictionary alloc] init];
-    if (count && values && keys) {
-      for (NSUInteger i = 0; i < count; ++i) {
-        [_dictionary setObject:@(values[i]) forKey:@(keys[i])];
-      }
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithDictionary:(GPBInt32BoolDictionary *)dictionary {
-  self = [self initWithBools:NULL forKeys:NULL count:0];
-  if (self) {
-    if (dictionary) {
-      [_dictionary addEntriesFromDictionary:dictionary->_dictionary];
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithCapacity:(NSUInteger)numItems {
-  #pragma unused(numItems)
-  return [self initWithBools:NULL forKeys:NULL count:0];
-}
-
-- (void)dealloc {
-  NSAssert(!_autocreator,
-           @"%@: Autocreator must be cleared before release, autocreator: %@",
-           [self class], _autocreator);
-  [_dictionary release];
-  [super dealloc];
-}
-
-- (instancetype)copyWithZone:(NSZone *)zone {
-  return [[GPBInt32BoolDictionary allocWithZone:zone] initWithDictionary:self];
-}
-
-- (BOOL)isEqual:(id)other {
-  if (self == other) {
-    return YES;
-  }
-  if (![other isKindOfClass:[GPBInt32BoolDictionary class]]) {
-    return NO;
-  }
-  GPBInt32BoolDictionary *otherDictionary = other;
-  return [_dictionary isEqual:otherDictionary->_dictionary];
-}
-
-- (NSUInteger)hash {
-  return _dictionary.count;
-}
-
-- (NSString *)description {
-  return [NSString stringWithFormat:@"<%@ %p> { %@ }", [self class], self, _dictionary];
-}
-
-- (NSUInteger)count {
-  return _dictionary.count;
-}
-
-- (void)enumerateKeysAndBoolsUsingBlock:
-    (void (NS_NOESCAPE ^)(int32_t key, BOOL value, BOOL *stop))block {
-  BOOL stop = NO;
-  NSDictionary *internal = _dictionary;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    block([aKey intValue], [aValue boolValue], &stop);
-    if (stop) {
-      break;
-    }
-  }
-}
-
-- (size_t)computeSerializedSizeAsField:(GPBFieldDescriptor *)field {
-  NSDictionary *internal = _dictionary;
-  NSUInteger count = internal.count;
-  if (count == 0) {
-    return 0;
-  }
-
-  GPBDataType valueDataType = GPBGetFieldDataType(field);
-  GPBDataType keyDataType = field.mapKeyDataType;
-  size_t result = 0;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    size_t msgSize = ComputeDictInt32FieldSize([aKey intValue], kMapKeyFieldNumber, keyDataType);
-    msgSize += ComputeDictBoolFieldSize([aValue boolValue], kMapValueFieldNumber, valueDataType);
-    result += GPBComputeRawVarint32SizeForInteger(msgSize) + msgSize;
-  }
-  size_t tagSize = GPBComputeWireFormatTagSize(GPBFieldNumber(field), GPBDataTypeMessage);
-  result += tagSize * count;
-  return result;
-}
-
-- (void)writeToCodedOutputStream:(GPBCodedOutputStream *)outputStream
-                         asField:(GPBFieldDescriptor *)field {
-  GPBDataType valueDataType = GPBGetFieldDataType(field);
-  GPBDataType keyDataType = field.mapKeyDataType;
-  uint32_t tag = GPBWireFormatMakeTag(GPBFieldNumber(field), GPBWireFormatLengthDelimited);
-  NSDictionary *internal = _dictionary;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    [outputStream writeInt32NoTag:tag];
-    // Write the size of the message.
-    int32_t unwrappedKey = [aKey intValue];
-    BOOL unwrappedValue = [aValue boolValue];
-    size_t msgSize = ComputeDictInt32FieldSize(unwrappedKey, kMapKeyFieldNumber, keyDataType);
-    msgSize += ComputeDictBoolFieldSize(unwrappedValue, kMapValueFieldNumber, valueDataType);
-    [outputStream writeInt32NoTag:(int32_t)msgSize];
-    // Write the fields.
-    WriteDictInt32Field(outputStream, unwrappedKey, kMapKeyFieldNumber, keyDataType);
-    WriteDictBoolField(outputStream, unwrappedValue, kMapValueFieldNumber, valueDataType);
-  }
-}
-
-- (void)setGPBGenericValue:(GPBGenericValue *)value
-     forGPBGenericValueKey:(GPBGenericValue *)key {
-  [_dictionary setObject:@(value->valueBool) forKey:@(key->valueInt32)];
-}
-
-- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
-  [self enumerateKeysAndBoolsUsingBlock:^(int32_t key, BOOL value, BOOL *stop) {
-      #pragma unused(stop)
-      block([NSString stringWithFormat:@"%d", key], (value ? @"true" : @"false"));
-  }];
-}
-
-- (BOOL)getBool:(nullable BOOL *)value forKey:(int32_t)key {
-  NSNumber *wrapped = [_dictionary objectForKey:@(key)];
-  if (wrapped && value) {
-    *value = [wrapped boolValue];
-  }
-  return (wrapped != NULL);
-}
-
-- (void)addEntriesFromDictionary:(GPBInt32BoolDictionary *)otherDictionary {
-  if (otherDictionary) {
-    [_dictionary addEntriesFromDictionary:otherDictionary->_dictionary];
-    if (_autocreator) {
-      GPBAutocreatedDictionaryModified(_autocreator, self);
-    }
-  }
-}
-
-- (void)setBool:(BOOL)value forKey:(int32_t)key {
-  [_dictionary setObject:@(value) forKey:@(key)];
-  if (_autocreator) {
-    GPBAutocreatedDictionaryModified(_autocreator, self);
-  }
-}
-
-- (void)removeBoolForKey:(int32_t)aKey {
-  [_dictionary removeObjectForKey:@(aKey)];
-}
-
-- (void)removeAll {
-  [_dictionary removeAllObjects];
-}
-
-@end
-
-#pragma mark - Int32 -> Float
-
-@implementation GPBInt32FloatDictionary {
- @package
-  NSMutableDictionary *_dictionary;
-}
-
-- (instancetype)init {
-  return [self initWithFloats:NULL forKeys:NULL count:0];
-}
-
-- (instancetype)initWithFloats:(const float [])values
-                       forKeys:(const int32_t [])keys
-                         count:(NSUInteger)count {
-  self = [super init];
-  if (self) {
-    _dictionary = [[NSMutableDictionary alloc] init];
-    if (count && values && keys) {
-      for (NSUInteger i = 0; i < count; ++i) {
-        [_dictionary setObject:@(values[i]) forKey:@(keys[i])];
-      }
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithDictionary:(GPBInt32FloatDictionary *)dictionary {
-  self = [self initWithFloats:NULL forKeys:NULL count:0];
-  if (self) {
-    if (dictionary) {
-      [_dictionary addEntriesFromDictionary:dictionary->_dictionary];
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithCapacity:(NSUInteger)numItems {
-  #pragma unused(numItems)
-  return [self initWithFloats:NULL forKeys:NULL count:0];
-}
-
-- (void)dealloc {
-  NSAssert(!_autocreator,
-           @"%@: Autocreator must be cleared before release, autocreator: %@",
-           [self class], _autocreator);
-  [_dictionary release];
-  [super dealloc];
-}
-
-- (instancetype)copyWithZone:(NSZone *)zone {
-  return [[GPBInt32FloatDictionary allocWithZone:zone] initWithDictionary:self];
-}
-
-- (BOOL)isEqual:(id)other {
-  if (self == other) {
-    return YES;
-  }
-  if (![other isKindOfClass:[GPBInt32FloatDictionary class]]) {
-    return NO;
-  }
-  GPBInt32FloatDictionary *otherDictionary = other;
-  return [_dictionary isEqual:otherDictionary->_dictionary];
-}
-
-- (NSUInteger)hash {
-  return _dictionary.count;
-}
-
-- (NSString *)description {
-  return [NSString stringWithFormat:@"<%@ %p> { %@ }", [self class], self, _dictionary];
-}
-
-- (NSUInteger)count {
-  return _dictionary.count;
-}
-
-- (void)enumerateKeysAndFloatsUsingBlock:
-    (void (NS_NOESCAPE ^)(int32_t key, float value, BOOL *stop))block {
-  BOOL stop = NO;
-  NSDictionary *internal = _dictionary;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    block([aKey intValue], [aValue floatValue], &stop);
-    if (stop) {
-      break;
-    }
-  }
-}
-
-- (size_t)computeSerializedSizeAsField:(GPBFieldDescriptor *)field {
-  NSDictionary *internal = _dictionary;
-  NSUInteger count = internal.count;
-  if (count == 0) {
-    return 0;
-  }
-
-  GPBDataType valueDataType = GPBGetFieldDataType(field);
-  GPBDataType keyDataType = field.mapKeyDataType;
-  size_t result = 0;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    size_t msgSize = ComputeDictInt32FieldSize([aKey intValue], kMapKeyFieldNumber, keyDataType);
-    msgSize += ComputeDictFloatFieldSize([aValue floatValue], kMapValueFieldNumber, valueDataType);
-    result += GPBComputeRawVarint32SizeForInteger(msgSize) + msgSize;
-  }
-  size_t tagSize = GPBComputeWireFormatTagSize(GPBFieldNumber(field), GPBDataTypeMessage);
-  result += tagSize * count;
-  return result;
-}
-
-- (void)writeToCodedOutputStream:(GPBCodedOutputStream *)outputStream
-                         asField:(GPBFieldDescriptor *)field {
-  GPBDataType valueDataType = GPBGetFieldDataType(field);
-  GPBDataType keyDataType = field.mapKeyDataType;
-  uint32_t tag = GPBWireFormatMakeTag(GPBFieldNumber(field), GPBWireFormatLengthDelimited);
-  NSDictionary *internal = _dictionary;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    [outputStream writeInt32NoTag:tag];
-    // Write the size of the message.
-    int32_t unwrappedKey = [aKey intValue];
-    float unwrappedValue = [aValue floatValue];
-    size_t msgSize = ComputeDictInt32FieldSize(unwrappedKey, kMapKeyFieldNumber, keyDataType);
-    msgSize += ComputeDictFloatFieldSize(unwrappedValue, kMapValueFieldNumber, valueDataType);
-    [outputStream writeInt32NoTag:(int32_t)msgSize];
-    // Write the fields.
-    WriteDictInt32Field(outputStream, unwrappedKey, kMapKeyFieldNumber, keyDataType);
-    WriteDictFloatField(outputStream, unwrappedValue, kMapValueFieldNumber, valueDataType);
-  }
-}
-
-- (void)setGPBGenericValue:(GPBGenericValue *)value
-     forGPBGenericValueKey:(GPBGenericValue *)key {
-  [_dictionary setObject:@(value->valueFloat) forKey:@(key->valueInt32)];
-}
-
-- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
-  [self enumerateKeysAndFloatsUsingBlock:^(int32_t key, float value, BOOL *stop) {
-      #pragma unused(stop)
-      block([NSString stringWithFormat:@"%d", key], [NSString stringWithFormat:@"%.*g", FLT_DIG, value]);
-  }];
-}
-
-- (BOOL)getFloat:(nullable float *)value forKey:(int32_t)key {
-  NSNumber *wrapped = [_dictionary objectForKey:@(key)];
-  if (wrapped && value) {
-    *value = [wrapped floatValue];
-  }
-  return (wrapped != NULL);
-}
-
-- (void)addEntriesFromDictionary:(GPBInt32FloatDictionary *)otherDictionary {
-  if (otherDictionary) {
-    [_dictionary addEntriesFromDictionary:otherDictionary->_dictionary];
-    if (_autocreator) {
-      GPBAutocreatedDictionaryModified(_autocreator, self);
-    }
-  }
-}
-
-- (void)setFloat:(float)value forKey:(int32_t)key {
-  [_dictionary setObject:@(value) forKey:@(key)];
-  if (_autocreator) {
-    GPBAutocreatedDictionaryModified(_autocreator, self);
-  }
-}
-
-- (void)removeFloatForKey:(int32_t)aKey {
-  [_dictionary removeObjectForKey:@(aKey)];
-}
-
-- (void)removeAll {
-  [_dictionary removeAllObjects];
-}
-
-@end
-
-#pragma mark - Int32 -> Double
-
-@implementation GPBInt32DoubleDictionary {
- @package
-  NSMutableDictionary *_dictionary;
-}
-
-- (instancetype)init {
-  return [self initWithDoubles:NULL forKeys:NULL count:0];
-}
-
-- (instancetype)initWithDoubles:(const double [])values
-                        forKeys:(const int32_t [])keys
-                          count:(NSUInteger)count {
-  self = [super init];
-  if (self) {
-    _dictionary = [[NSMutableDictionary alloc] init];
-    if (count && values && keys) {
-      for (NSUInteger i = 0; i < count; ++i) {
-        [_dictionary setObject:@(values[i]) forKey:@(keys[i])];
-      }
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithDictionary:(GPBInt32DoubleDictionary *)dictionary {
-  self = [self initWithDoubles:NULL forKeys:NULL count:0];
-  if (self) {
-    if (dictionary) {
-      [_dictionary addEntriesFromDictionary:dictionary->_dictionary];
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithCapacity:(NSUInteger)numItems {
-  #pragma unused(numItems)
-  return [self initWithDoubles:NULL forKeys:NULL count:0];
-}
-
-- (void)dealloc {
-  NSAssert(!_autocreator,
-           @"%@: Autocreator must be cleared before release, autocreator: %@",
-           [self class], _autocreator);
-  [_dictionary release];
-  [super dealloc];
-}
-
-- (instancetype)copyWithZone:(NSZone *)zone {
-  return [[GPBInt32DoubleDictionary allocWithZone:zone] initWithDictionary:self];
-}
-
-- (BOOL)isEqual:(id)other {
-  if (self == other) {
-    return YES;
-  }
-  if (![other isKindOfClass:[GPBInt32DoubleDictionary class]]) {
-    return NO;
-  }
-  GPBInt32DoubleDictionary *otherDictionary = other;
-  return [_dictionary isEqual:otherDictionary->_dictionary];
-}
-
-- (NSUInteger)hash {
-  return _dictionary.count;
-}
-
-- (NSString *)description {
-  return [NSString stringWithFormat:@"<%@ %p> { %@ }", [self class], self, _dictionary];
-}
-
-- (NSUInteger)count {
-  return _dictionary.count;
-}
-
-- (void)enumerateKeysAndDoublesUsingBlock:
-    (void (NS_NOESCAPE ^)(int32_t key, double value, BOOL *stop))block {
-  BOOL stop = NO;
-  NSDictionary *internal = _dictionary;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    block([aKey intValue], [aValue doubleValue], &stop);
-    if (stop) {
-      break;
-    }
-  }
-}
-
-- (size_t)computeSerializedSizeAsField:(GPBFieldDescriptor *)field {
-  NSDictionary *internal = _dictionary;
-  NSUInteger count = internal.count;
-  if (count == 0) {
-    return 0;
-  }
-
-  GPBDataType valueDataType = GPBGetFieldDataType(field);
-  GPBDataType keyDataType = field.mapKeyDataType;
-  size_t result = 0;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    size_t msgSize = ComputeDictInt32FieldSize([aKey intValue], kMapKeyFieldNumber, keyDataType);
-    msgSize += ComputeDictDoubleFieldSize([aValue doubleValue], kMapValueFieldNumber, valueDataType);
-    result += GPBComputeRawVarint32SizeForInteger(msgSize) + msgSize;
-  }
-  size_t tagSize = GPBComputeWireFormatTagSize(GPBFieldNumber(field), GPBDataTypeMessage);
-  result += tagSize * count;
-  return result;
-}
-
-- (void)writeToCodedOutputStream:(GPBCodedOutputStream *)outputStream
-                         asField:(GPBFieldDescriptor *)field {
-  GPBDataType valueDataType = GPBGetFieldDataType(field);
-  GPBDataType keyDataType = field.mapKeyDataType;
-  uint32_t tag = GPBWireFormatMakeTag(GPBFieldNumber(field), GPBWireFormatLengthDelimited);
-  NSDictionary *internal = _dictionary;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    [outputStream writeInt32NoTag:tag];
-    // Write the size of the message.
-    int32_t unwrappedKey = [aKey intValue];
-    double unwrappedValue = [aValue doubleValue];
-    size_t msgSize = ComputeDictInt32FieldSize(unwrappedKey, kMapKeyFieldNumber, keyDataType);
-    msgSize += ComputeDictDoubleFieldSize(unwrappedValue, kMapValueFieldNumber, valueDataType);
-    [outputStream writeInt32NoTag:(int32_t)msgSize];
-    // Write the fields.
-    WriteDictInt32Field(outputStream, unwrappedKey, kMapKeyFieldNumber, keyDataType);
-    WriteDictDoubleField(outputStream, unwrappedValue, kMapValueFieldNumber, valueDataType);
-  }
-}
-
-- (void)setGPBGenericValue:(GPBGenericValue *)value
-     forGPBGenericValueKey:(GPBGenericValue *)key {
-  [_dictionary setObject:@(value->valueDouble) forKey:@(key->valueInt32)];
-}
-
-- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
-  [self enumerateKeysAndDoublesUsingBlock:^(int32_t key, double value, BOOL *stop) {
-      #pragma unused(stop)
-      block([NSString stringWithFormat:@"%d", key], [NSString stringWithFormat:@"%.*lg", DBL_DIG, value]);
-  }];
-}
-
-- (BOOL)getDouble:(nullable double *)value forKey:(int32_t)key {
-  NSNumber *wrapped = [_dictionary objectForKey:@(key)];
-  if (wrapped && value) {
-    *value = [wrapped doubleValue];
-  }
-  return (wrapped != NULL);
-}
-
-- (void)addEntriesFromDictionary:(GPBInt32DoubleDictionary *)otherDictionary {
-  if (otherDictionary) {
-    [_dictionary addEntriesFromDictionary:otherDictionary->_dictionary];
-    if (_autocreator) {
-      GPBAutocreatedDictionaryModified(_autocreator, self);
-    }
-  }
-}
-
-- (void)setDouble:(double)value forKey:(int32_t)key {
-  [_dictionary setObject:@(value) forKey:@(key)];
-  if (_autocreator) {
-    GPBAutocreatedDictionaryModified(_autocreator, self);
-  }
-}
-
-- (void)removeDoubleForKey:(int32_t)aKey {
-  [_dictionary removeObjectForKey:@(aKey)];
-}
-
-- (void)removeAll {
-  [_dictionary removeAllObjects];
-}
-
-@end
-
-#pragma mark - Int32 -> Enum
-
-@implementation GPBInt32EnumDictionary {
- @package
-  NSMutableDictionary *_dictionary;
-  GPBEnumValidationFunc _validationFunc;
-}
-
-@synthesize validationFunc = _validationFunc;
-
-- (instancetype)init {
-  return [self initWithValidationFunction:NULL rawValues:NULL forKeys:NULL count:0];
-}
-
-- (instancetype)initWithValidationFunction:(GPBEnumValidationFunc)func {
-  return [self initWithValidationFunction:func rawValues:NULL forKeys:NULL count:0];
-}
-
-- (instancetype)initWithValidationFunction:(GPBEnumValidationFunc)func
-                                 rawValues:(const int32_t [])rawValues
-                                   forKeys:(const int32_t [])keys
-                                     count:(NSUInteger)count {
-  self = [super init];
-  if (self) {
-    _dictionary = [[NSMutableDictionary alloc] init];
-    _validationFunc = (func != NULL ? func : DictDefault_IsValidValue);
-    if (count && rawValues && keys) {
-      for (NSUInteger i = 0; i < count; ++i) {
-        [_dictionary setObject:@(rawValues[i]) forKey:@(keys[i])];
-      }
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithDictionary:(GPBInt32EnumDictionary *)dictionary {
-  self = [self initWithValidationFunction:dictionary.validationFunc
-                                rawValues:NULL
-                                  forKeys:NULL
-                                    count:0];
-  if (self) {
-    if (dictionary) {
-      [_dictionary addEntriesFromDictionary:dictionary->_dictionary];
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithValidationFunction:(GPBEnumValidationFunc)func
-                                  capacity:(NSUInteger)numItems {
-  #pragma unused(numItems)
-  return [self initWithValidationFunction:func rawValues:NULL forKeys:NULL count:0];
-}
-
-- (void)dealloc {
-  NSAssert(!_autocreator,
-           @"%@: Autocreator must be cleared before release, autocreator: %@",
-           [self class], _autocreator);
-  [_dictionary release];
-  [super dealloc];
-}
-
-- (instancetype)copyWithZone:(NSZone *)zone {
-  return [[GPBInt32EnumDictionary allocWithZone:zone] initWithDictionary:self];
-}
-
-- (BOOL)isEqual:(id)other {
-  if (self == other) {
-    return YES;
-  }
-  if (![other isKindOfClass:[GPBInt32EnumDictionary class]]) {
-    return NO;
-  }
-  GPBInt32EnumDictionary *otherDictionary = other;
-  return [_dictionary isEqual:otherDictionary->_dictionary];
-}
-
-- (NSUInteger)hash {
-  return _dictionary.count;
-}
-
-- (NSString *)description {
-  return [NSString stringWithFormat:@"<%@ %p> { %@ }", [self class], self, _dictionary];
-}
-
-- (NSUInteger)count {
-  return _dictionary.count;
-}
-
-- (void)enumerateKeysAndRawValuesUsingBlock:
-    (void (NS_NOESCAPE ^)(int32_t key, int32_t value, BOOL *stop))block {
-  BOOL stop = NO;
-  NSDictionary *internal = _dictionary;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    block([aKey intValue], [aValue intValue], &stop);
-    if (stop) {
-      break;
-    }
-  }
-}
-
-- (size_t)computeSerializedSizeAsField:(GPBFieldDescriptor *)field {
-  NSDictionary *internal = _dictionary;
-  NSUInteger count = internal.count;
-  if (count == 0) {
-    return 0;
-  }
-
-  GPBDataType valueDataType = GPBGetFieldDataType(field);
-  GPBDataType keyDataType = field.mapKeyDataType;
-  size_t result = 0;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    size_t msgSize = ComputeDictInt32FieldSize([aKey intValue], kMapKeyFieldNumber, keyDataType);
-    msgSize += ComputeDictEnumFieldSize([aValue intValue], kMapValueFieldNumber, valueDataType);
-    result += GPBComputeRawVarint32SizeForInteger(msgSize) + msgSize;
-  }
-  size_t tagSize = GPBComputeWireFormatTagSize(GPBFieldNumber(field), GPBDataTypeMessage);
-  result += tagSize * count;
-  return result;
-}
-
-- (void)writeToCodedOutputStream:(GPBCodedOutputStream *)outputStream
-                         asField:(GPBFieldDescriptor *)field {
-  GPBDataType valueDataType = GPBGetFieldDataType(field);
-  GPBDataType keyDataType = field.mapKeyDataType;
-  uint32_t tag = GPBWireFormatMakeTag(GPBFieldNumber(field), GPBWireFormatLengthDelimited);
-  NSDictionary *internal = _dictionary;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    [outputStream writeInt32NoTag:tag];
-    // Write the size of the message.
-    int32_t unwrappedKey = [aKey intValue];
-    int32_t unwrappedValue = [aValue intValue];
-    size_t msgSize = ComputeDictInt32FieldSize(unwrappedKey, kMapKeyFieldNumber, keyDataType);
-    msgSize += ComputeDictEnumFieldSize(unwrappedValue, kMapValueFieldNumber, valueDataType);
-    [outputStream writeInt32NoTag:(int32_t)msgSize];
-    // Write the fields.
-    WriteDictInt32Field(outputStream, unwrappedKey, kMapKeyFieldNumber, keyDataType);
-    WriteDictEnumField(outputStream, unwrappedValue, kMapValueFieldNumber, valueDataType);
-  }
-}
-
-- (NSData *)serializedDataForUnknownValue:(int32_t)value
-                                   forKey:(GPBGenericValue *)key
-                              keyDataType:(GPBDataType)keyDataType {
-  size_t msgSize = ComputeDictInt32FieldSize(key->valueInt32, kMapKeyFieldNumber, keyDataType);
-  msgSize += ComputeDictEnumFieldSize(value, kMapValueFieldNumber, GPBDataTypeEnum);
-  NSMutableData *data = [NSMutableData dataWithLength:msgSize];
-  GPBCodedOutputStream *outputStream = [[GPBCodedOutputStream alloc] initWithData:data];
-  WriteDictInt32Field(outputStream, key->valueInt32, kMapKeyFieldNumber, keyDataType);
-  WriteDictEnumField(outputStream, value, kMapValueFieldNumber, GPBDataTypeEnum);
-  [outputStream release];
-  return data;
-}
-- (void)setGPBGenericValue:(GPBGenericValue *)value
-     forGPBGenericValueKey:(GPBGenericValue *)key {
-  [_dictionary setObject:@(value->valueEnum) forKey:@(key->valueInt32)];
-}
-
-- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
-  [self enumerateKeysAndRawValuesUsingBlock:^(int32_t key, int32_t value, BOOL *stop) {
-      #pragma unused(stop)
-      block([NSString stringWithFormat:@"%d", key], @(value));
-  }];
-}
-
-- (BOOL)getEnum:(int32_t *)value forKey:(int32_t)key {
-  NSNumber *wrapped = [_dictionary objectForKey:@(key)];
-  if (wrapped && value) {
-    int32_t result = [wrapped intValue];
-    if (!_validationFunc(result)) {
-      result = kGPBUnrecognizedEnumeratorValue;
-    }
-    *value = result;
-  }
-  return (wrapped != NULL);
-}
-
-- (BOOL)getRawValue:(int32_t *)rawValue forKey:(int32_t)key {
-  NSNumber *wrapped = [_dictionary objectForKey:@(key)];
-  if (wrapped && rawValue) {
-    *rawValue = [wrapped intValue];
-  }
-  return (wrapped != NULL);
-}
-
-- (void)enumerateKeysAndEnumsUsingBlock:
-    (void (NS_NOESCAPE ^)(int32_t key, int32_t value, BOOL *stop))block {
-  GPBEnumValidationFunc func = _validationFunc;
-  BOOL stop = NO;
-  NSEnumerator *keys = [_dictionary keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = _dictionary[aKey];
-      int32_t unwrapped = [aValue intValue];
-      if (!func(unwrapped)) {
-        unwrapped = kGPBUnrecognizedEnumeratorValue;
-      }
-    block([aKey intValue], unwrapped, &stop);
-    if (stop) {
-      break;
-    }
-  }
-}
-
-- (void)addRawEntriesFromDictionary:(GPBInt32EnumDictionary *)otherDictionary {
-  if (otherDictionary) {
-    [_dictionary addEntriesFromDictionary:otherDictionary->_dictionary];
-    if (_autocreator) {
-      GPBAutocreatedDictionaryModified(_autocreator, self);
-    }
-  }
-}
-
-- (void)setRawValue:(int32_t)value forKey:(int32_t)key {
-  [_dictionary setObject:@(value) forKey:@(key)];
-  if (_autocreator) {
-    GPBAutocreatedDictionaryModified(_autocreator, self);
-  }
-}
-
-- (void)removeEnumForKey:(int32_t)aKey {
-  [_dictionary removeObjectForKey:@(aKey)];
-}
-
-- (void)removeAll {
-  [_dictionary removeAllObjects];
-}
-
-- (void)setEnum:(int32_t)value forKey:(int32_t)key {
-  if (!_validationFunc(value)) {
-    [NSException raise:NSInvalidArgumentException
-                format:@"GPBInt32EnumDictionary: Attempt to set an unknown enum value (%d)",
-                       value];
-  }
-
-  [_dictionary setObject:@(value) forKey:@(key)];
-  if (_autocreator) {
-    GPBAutocreatedDictionaryModified(_autocreator, self);
-  }
-}
-
-@end
-
-#pragma mark - Int32 -> Object
-
-@implementation GPBInt32ObjectDictionary {
- @package
-  NSMutableDictionary *_dictionary;
-}
-
-- (instancetype)init {
-  return [self initWithObjects:NULL forKeys:NULL count:0];
-}
-
-- (instancetype)initWithObjects:(const id [])objects
-                        forKeys:(const int32_t [])keys
-                          count:(NSUInteger)count {
-  self = [super init];
-  if (self) {
-    _dictionary = [[NSMutableDictionary alloc] init];
-    if (count && objects && keys) {
-      for (NSUInteger i = 0; i < count; ++i) {
-        if (!objects[i]) {
-          [NSException raise:NSInvalidArgumentException
-                      format:@"Attempting to add nil object to a Dictionary"];
-        }
-        [_dictionary setObject:objects[i] forKey:@(keys[i])];
-      }
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithDictionary:(GPBInt32ObjectDictionary *)dictionary {
-  self = [self initWithObjects:NULL forKeys:NULL count:0];
-  if (self) {
-    if (dictionary) {
-      [_dictionary addEntriesFromDictionary:dictionary->_dictionary];
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithCapacity:(NSUInteger)numItems {
-  #pragma unused(numItems)
-  return [self initWithObjects:NULL forKeys:NULL count:0];
-}
-
-- (void)dealloc {
-  NSAssert(!_autocreator,
-           @"%@: Autocreator must be cleared before release, autocreator: %@",
-           [self class], _autocreator);
-  [_dictionary release];
-  [super dealloc];
-}
-
-- (instancetype)copyWithZone:(NSZone *)zone {
-  return [[GPBInt32ObjectDictionary allocWithZone:zone] initWithDictionary:self];
-}
-
-- (BOOL)isEqual:(id)other {
-  if (self == other) {
-    return YES;
-  }
-  if (![other isKindOfClass:[GPBInt32ObjectDictionary class]]) {
-    return NO;
-  }
-  GPBInt32ObjectDictionary *otherDictionary = other;
-  return [_dictionary isEqual:otherDictionary->_dictionary];
-}
-
-- (NSUInteger)hash {
-  return _dictionary.count;
-}
-
-- (NSString *)description {
-  return [NSString stringWithFormat:@"<%@ %p> { %@ }", [self class], self, _dictionary];
-}
-
-- (NSUInteger)count {
-  return _dictionary.count;
-}
-
-- (void)enumerateKeysAndObjectsUsingBlock:
-    (void (NS_NOESCAPE ^)(int32_t key, id object, BOOL *stop))block {
-  BOOL stop = NO;
-  NSDictionary *internal = _dictionary;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    id aObject = internal[aKey];
-    block([aKey intValue], aObject, &stop);
-    if (stop) {
-      break;
-    }
-  }
-}
-
-- (BOOL)isInitialized {
-  for (GPBMessage *msg in [_dictionary objectEnumerator]) {
-    if (!msg.initialized) {
-      return NO;
-    }
-  }
-  return YES;
-}
-
-- (instancetype)deepCopyWithZone:(NSZone *)zone {
-  GPBInt32ObjectDictionary *newDict =
-      [[GPBInt32ObjectDictionary alloc] init];
-  NSEnumerator *keys = [_dictionary keyEnumerator];
-  id aKey;
-  NSMutableDictionary *internalDict = newDict->_dictionary;
-  while ((aKey = [keys nextObject])) {
-    GPBMessage *msg = _dictionary[aKey];
-    GPBMessage *copiedMsg = [msg copyWithZone:zone];
-    [internalDict setObject:copiedMsg forKey:aKey];
-    [copiedMsg release];
-  }
-  return newDict;
-}
-
-- (size_t)computeSerializedSizeAsField:(GPBFieldDescriptor *)field {
-  NSDictionary *internal = _dictionary;
-  NSUInteger count = internal.count;
-  if (count == 0) {
-    return 0;
-  }
-
-  GPBDataType valueDataType = GPBGetFieldDataType(field);
-  GPBDataType keyDataType = field.mapKeyDataType;
-  size_t result = 0;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    id aObject = internal[aKey];
-    size_t msgSize = ComputeDictInt32FieldSize([aKey intValue], kMapKeyFieldNumber, keyDataType);
-    msgSize += ComputeDictObjectFieldSize(aObject, kMapValueFieldNumber, valueDataType);
-    result += GPBComputeRawVarint32SizeForInteger(msgSize) + msgSize;
-  }
-  size_t tagSize = GPBComputeWireFormatTagSize(GPBFieldNumber(field), GPBDataTypeMessage);
-  result += tagSize * count;
-  return result;
-}
-
-- (void)writeToCodedOutputStream:(GPBCodedOutputStream *)outputStream
-                         asField:(GPBFieldDescriptor *)field {
-  GPBDataType valueDataType = GPBGetFieldDataType(field);
-  GPBDataType keyDataType = field.mapKeyDataType;
-  uint32_t tag = GPBWireFormatMakeTag(GPBFieldNumber(field), GPBWireFormatLengthDelimited);
-  NSDictionary *internal = _dictionary;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    id aObject = internal[aKey];
-    [outputStream writeInt32NoTag:tag];
-    // Write the size of the message.
-    int32_t unwrappedKey = [aKey intValue];
-    id unwrappedValue = aObject;
-    size_t msgSize = ComputeDictInt32FieldSize(unwrappedKey, kMapKeyFieldNumber, keyDataType);
-    msgSize += ComputeDictObjectFieldSize(unwrappedValue, kMapValueFieldNumber, valueDataType);
-    [outputStream writeInt32NoTag:(int32_t)msgSize];
-    // Write the fields.
-    WriteDictInt32Field(outputStream, unwrappedKey, kMapKeyFieldNumber, keyDataType);
-    WriteDictObjectField(outputStream, unwrappedValue, kMapValueFieldNumber, valueDataType);
-  }
-}
-
-- (void)setGPBGenericValue:(GPBGenericValue *)value
-     forGPBGenericValueKey:(GPBGenericValue *)key {
-  [_dictionary setObject:value->valueString forKey:@(key->valueInt32)];
-}
-
-- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
-  [self enumerateKeysAndObjectsUsingBlock:^(int32_t key, id object, BOOL *stop) {
-      #pragma unused(stop)
-      block([NSString stringWithFormat:@"%d", key], object);
-  }];
-}
-
-- (id)objectForKey:(int32_t)key {
-  id result = [_dictionary objectForKey:@(key)];
-  return result;
-}
-
-- (void)addEntriesFromDictionary:(GPBInt32ObjectDictionary *)otherDictionary {
-  if (otherDictionary) {
-    [_dictionary addEntriesFromDictionary:otherDictionary->_dictionary];
-    if (_autocreator) {
-      GPBAutocreatedDictionaryModified(_autocreator, self);
-    }
-  }
-}
-
-- (void)setObject:(id)object forKey:(int32_t)key {
-  if (!object) {
-    [NSException raise:NSInvalidArgumentException
-                format:@"Attempting to add nil object to a Dictionary"];
-  }
-  [_dictionary setObject:object forKey:@(key)];
-  if (_autocreator) {
-    GPBAutocreatedDictionaryModified(_autocreator, self);
-  }
-}
-
-- (void)removeObjectForKey:(int32_t)aKey {
-  [_dictionary removeObjectForKey:@(aKey)];
-}
-
-- (void)removeAll {
-  [_dictionary removeAllObjects];
-}
-
-@end
-
-// clang-format on
-//%PDDM-EXPAND DICTIONARY_IMPL_FOR_POD_KEY(UInt64, uint64_t)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-#pragma mark - UInt64 -> UInt32
-
-@implementation GPBUInt64UInt32Dictionary {
- @package
-  NSMutableDictionary *_dictionary;
-}
-
-- (instancetype)init {
-  return [self initWithUInt32s:NULL forKeys:NULL count:0];
-}
-
-- (instancetype)initWithUInt32s:(const uint32_t [])values
-                        forKeys:(const uint64_t [])keys
-                          count:(NSUInteger)count {
-  self = [super init];
-  if (self) {
-    _dictionary = [[NSMutableDictionary alloc] init];
-    if (count && values && keys) {
-      for (NSUInteger i = 0; i < count; ++i) {
-        [_dictionary setObject:@(values[i]) forKey:@(keys[i])];
-      }
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithDictionary:(GPBUInt64UInt32Dictionary *)dictionary {
-  self = [self initWithUInt32s:NULL forKeys:NULL count:0];
-  if (self) {
-    if (dictionary) {
-      [_dictionary addEntriesFromDictionary:dictionary->_dictionary];
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithCapacity:(NSUInteger)numItems {
-  #pragma unused(numItems)
-  return [self initWithUInt32s:NULL forKeys:NULL count:0];
-}
-
-- (void)dealloc {
-  NSAssert(!_autocreator,
-           @"%@: Autocreator must be cleared before release, autocreator: %@",
-           [self class], _autocreator);
-  [_dictionary release];
-  [super dealloc];
-}
-
-- (instancetype)copyWithZone:(NSZone *)zone {
-  return [[GPBUInt64UInt32Dictionary allocWithZone:zone] initWithDictionary:self];
-}
-
-- (BOOL)isEqual:(id)other {
-  if (self == other) {
-    return YES;
-  }
-  if (![other isKindOfClass:[GPBUInt64UInt32Dictionary class]]) {
-    return NO;
-  }
-  GPBUInt64UInt32Dictionary *otherDictionary = other;
-  return [_dictionary isEqual:otherDictionary->_dictionary];
-}
-
-- (NSUInteger)hash {
-  return _dictionary.count;
-}
-
-- (NSString *)description {
-  return [NSString stringWithFormat:@"<%@ %p> { %@ }", [self class], self, _dictionary];
-}
-
-- (NSUInteger)count {
-  return _dictionary.count;
-}
-
-- (void)enumerateKeysAndUInt32sUsingBlock:
-    (void (NS_NOESCAPE ^)(uint64_t key, uint32_t value, BOOL *stop))block {
-  BOOL stop = NO;
-  NSDictionary *internal = _dictionary;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    block([aKey unsignedLongLongValue], [aValue unsignedIntValue], &stop);
-    if (stop) {
-      break;
-    }
-  }
-}
-
-- (size_t)computeSerializedSizeAsField:(GPBFieldDescriptor *)field {
-  NSDictionary *internal = _dictionary;
-  NSUInteger count = internal.count;
-  if (count == 0) {
-    return 0;
-  }
-
-  GPBDataType valueDataType = GPBGetFieldDataType(field);
-  GPBDataType keyDataType = field.mapKeyDataType;
-  size_t result = 0;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    size_t msgSize = ComputeDictUInt64FieldSize([aKey unsignedLongLongValue], kMapKeyFieldNumber, keyDataType);
-    msgSize += ComputeDictUInt32FieldSize([aValue unsignedIntValue], kMapValueFieldNumber, valueDataType);
-    result += GPBComputeRawVarint32SizeForInteger(msgSize) + msgSize;
-  }
-  size_t tagSize = GPBComputeWireFormatTagSize(GPBFieldNumber(field), GPBDataTypeMessage);
-  result += tagSize * count;
-  return result;
-}
-
-- (void)writeToCodedOutputStream:(GPBCodedOutputStream *)outputStream
-                         asField:(GPBFieldDescriptor *)field {
-  GPBDataType valueDataType = GPBGetFieldDataType(field);
-  GPBDataType keyDataType = field.mapKeyDataType;
-  uint32_t tag = GPBWireFormatMakeTag(GPBFieldNumber(field), GPBWireFormatLengthDelimited);
-  NSDictionary *internal = _dictionary;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    [outputStream writeInt32NoTag:tag];
-    // Write the size of the message.
-    uint64_t unwrappedKey = [aKey unsignedLongLongValue];
-    uint32_t unwrappedValue = [aValue unsignedIntValue];
-    size_t msgSize = ComputeDictUInt64FieldSize(unwrappedKey, kMapKeyFieldNumber, keyDataType);
-    msgSize += ComputeDictUInt32FieldSize(unwrappedValue, kMapValueFieldNumber, valueDataType);
-    [outputStream writeInt32NoTag:(int32_t)msgSize];
-    // Write the fields.
-    WriteDictUInt64Field(outputStream, unwrappedKey, kMapKeyFieldNumber, keyDataType);
-    WriteDictUInt32Field(outputStream, unwrappedValue, kMapValueFieldNumber, valueDataType);
-  }
-}
-
-- (void)setGPBGenericValue:(GPBGenericValue *)value
-     forGPBGenericValueKey:(GPBGenericValue *)key {
-  [_dictionary setObject:@(value->valueUInt32) forKey:@(key->valueUInt64)];
-}
-
-- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
-  [self enumerateKeysAndUInt32sUsingBlock:^(uint64_t key, uint32_t value, BOOL *stop) {
-      #pragma unused(stop)
-      block([NSString stringWithFormat:@"%llu", key], [NSString stringWithFormat:@"%u", value]);
-  }];
-}
-
-- (BOOL)getUInt32:(nullable uint32_t *)value forKey:(uint64_t)key {
-  NSNumber *wrapped = [_dictionary objectForKey:@(key)];
-  if (wrapped && value) {
-    *value = [wrapped unsignedIntValue];
-  }
-  return (wrapped != NULL);
-}
-
-- (void)addEntriesFromDictionary:(GPBUInt64UInt32Dictionary *)otherDictionary {
-  if (otherDictionary) {
-    [_dictionary addEntriesFromDictionary:otherDictionary->_dictionary];
-    if (_autocreator) {
-      GPBAutocreatedDictionaryModified(_autocreator, self);
-    }
-  }
-}
-
-- (void)setUInt32:(uint32_t)value forKey:(uint64_t)key {
-  [_dictionary setObject:@(value) forKey:@(key)];
-  if (_autocreator) {
-    GPBAutocreatedDictionaryModified(_autocreator, self);
-  }
-}
-
-- (void)removeUInt32ForKey:(uint64_t)aKey {
-  [_dictionary removeObjectForKey:@(aKey)];
-}
-
-- (void)removeAll {
-  [_dictionary removeAllObjects];
-}
-
-@end
-
-#pragma mark - UInt64 -> Int32
-
-@implementation GPBUInt64Int32Dictionary {
- @package
-  NSMutableDictionary *_dictionary;
-}
-
-- (instancetype)init {
-  return [self initWithInt32s:NULL forKeys:NULL count:0];
-}
-
-- (instancetype)initWithInt32s:(const int32_t [])values
-                       forKeys:(const uint64_t [])keys
-                         count:(NSUInteger)count {
-  self = [super init];
-  if (self) {
-    _dictionary = [[NSMutableDictionary alloc] init];
-    if (count && values && keys) {
-      for (NSUInteger i = 0; i < count; ++i) {
-        [_dictionary setObject:@(values[i]) forKey:@(keys[i])];
-      }
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithDictionary:(GPBUInt64Int32Dictionary *)dictionary {
-  self = [self initWithInt32s:NULL forKeys:NULL count:0];
-  if (self) {
-    if (dictionary) {
-      [_dictionary addEntriesFromDictionary:dictionary->_dictionary];
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithCapacity:(NSUInteger)numItems {
-  #pragma unused(numItems)
-  return [self initWithInt32s:NULL forKeys:NULL count:0];
-}
-
-- (void)dealloc {
-  NSAssert(!_autocreator,
-           @"%@: Autocreator must be cleared before release, autocreator: %@",
-           [self class], _autocreator);
-  [_dictionary release];
-  [super dealloc];
-}
-
-- (instancetype)copyWithZone:(NSZone *)zone {
-  return [[GPBUInt64Int32Dictionary allocWithZone:zone] initWithDictionary:self];
-}
-
-- (BOOL)isEqual:(id)other {
-  if (self == other) {
-    return YES;
-  }
-  if (![other isKindOfClass:[GPBUInt64Int32Dictionary class]]) {
-    return NO;
-  }
-  GPBUInt64Int32Dictionary *otherDictionary = other;
-  return [_dictionary isEqual:otherDictionary->_dictionary];
-}
-
-- (NSUInteger)hash {
-  return _dictionary.count;
-}
-
-- (NSString *)description {
-  return [NSString stringWithFormat:@"<%@ %p> { %@ }", [self class], self, _dictionary];
-}
-
-- (NSUInteger)count {
-  return _dictionary.count;
-}
-
-- (void)enumerateKeysAndInt32sUsingBlock:
-    (void (NS_NOESCAPE ^)(uint64_t key, int32_t value, BOOL *stop))block {
-  BOOL stop = NO;
-  NSDictionary *internal = _dictionary;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    block([aKey unsignedLongLongValue], [aValue intValue], &stop);
-    if (stop) {
-      break;
-    }
-  }
-}
-
-- (size_t)computeSerializedSizeAsField:(GPBFieldDescriptor *)field {
-  NSDictionary *internal = _dictionary;
-  NSUInteger count = internal.count;
-  if (count == 0) {
-    return 0;
-  }
-
-  GPBDataType valueDataType = GPBGetFieldDataType(field);
-  GPBDataType keyDataType = field.mapKeyDataType;
-  size_t result = 0;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    size_t msgSize = ComputeDictUInt64FieldSize([aKey unsignedLongLongValue], kMapKeyFieldNumber, keyDataType);
-    msgSize += ComputeDictInt32FieldSize([aValue intValue], kMapValueFieldNumber, valueDataType);
-    result += GPBComputeRawVarint32SizeForInteger(msgSize) + msgSize;
-  }
-  size_t tagSize = GPBComputeWireFormatTagSize(GPBFieldNumber(field), GPBDataTypeMessage);
-  result += tagSize * count;
-  return result;
-}
-
-- (void)writeToCodedOutputStream:(GPBCodedOutputStream *)outputStream
-                         asField:(GPBFieldDescriptor *)field {
-  GPBDataType valueDataType = GPBGetFieldDataType(field);
-  GPBDataType keyDataType = field.mapKeyDataType;
-  uint32_t tag = GPBWireFormatMakeTag(GPBFieldNumber(field), GPBWireFormatLengthDelimited);
-  NSDictionary *internal = _dictionary;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    [outputStream writeInt32NoTag:tag];
-    // Write the size of the message.
-    uint64_t unwrappedKey = [aKey unsignedLongLongValue];
-    int32_t unwrappedValue = [aValue intValue];
-    size_t msgSize = ComputeDictUInt64FieldSize(unwrappedKey, kMapKeyFieldNumber, keyDataType);
-    msgSize += ComputeDictInt32FieldSize(unwrappedValue, kMapValueFieldNumber, valueDataType);
-    [outputStream writeInt32NoTag:(int32_t)msgSize];
-    // Write the fields.
-    WriteDictUInt64Field(outputStream, unwrappedKey, kMapKeyFieldNumber, keyDataType);
-    WriteDictInt32Field(outputStream, unwrappedValue, kMapValueFieldNumber, valueDataType);
-  }
-}
-
-- (void)setGPBGenericValue:(GPBGenericValue *)value
-     forGPBGenericValueKey:(GPBGenericValue *)key {
-  [_dictionary setObject:@(value->valueInt32) forKey:@(key->valueUInt64)];
-}
-
-- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
-  [self enumerateKeysAndInt32sUsingBlock:^(uint64_t key, int32_t value, BOOL *stop) {
-      #pragma unused(stop)
-      block([NSString stringWithFormat:@"%llu", key], [NSString stringWithFormat:@"%d", value]);
-  }];
-}
-
-- (BOOL)getInt32:(nullable int32_t *)value forKey:(uint64_t)key {
-  NSNumber *wrapped = [_dictionary objectForKey:@(key)];
-  if (wrapped && value) {
-    *value = [wrapped intValue];
-  }
-  return (wrapped != NULL);
-}
-
-- (void)addEntriesFromDictionary:(GPBUInt64Int32Dictionary *)otherDictionary {
-  if (otherDictionary) {
-    [_dictionary addEntriesFromDictionary:otherDictionary->_dictionary];
-    if (_autocreator) {
-      GPBAutocreatedDictionaryModified(_autocreator, self);
-    }
-  }
-}
-
-- (void)setInt32:(int32_t)value forKey:(uint64_t)key {
-  [_dictionary setObject:@(value) forKey:@(key)];
-  if (_autocreator) {
-    GPBAutocreatedDictionaryModified(_autocreator, self);
-  }
-}
-
-- (void)removeInt32ForKey:(uint64_t)aKey {
-  [_dictionary removeObjectForKey:@(aKey)];
-}
-
-- (void)removeAll {
-  [_dictionary removeAllObjects];
-}
-
-@end
-
-#pragma mark - UInt64 -> UInt64
-
-@implementation GPBUInt64UInt64Dictionary {
- @package
-  NSMutableDictionary *_dictionary;
-}
-
-- (instancetype)init {
-  return [self initWithUInt64s:NULL forKeys:NULL count:0];
-}
-
-- (instancetype)initWithUInt64s:(const uint64_t [])values
-                        forKeys:(const uint64_t [])keys
-                          count:(NSUInteger)count {
-  self = [super init];
-  if (self) {
-    _dictionary = [[NSMutableDictionary alloc] init];
-    if (count && values && keys) {
-      for (NSUInteger i = 0; i < count; ++i) {
-        [_dictionary setObject:@(values[i]) forKey:@(keys[i])];
-      }
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithDictionary:(GPBUInt64UInt64Dictionary *)dictionary {
-  self = [self initWithUInt64s:NULL forKeys:NULL count:0];
-  if (self) {
-    if (dictionary) {
-      [_dictionary addEntriesFromDictionary:dictionary->_dictionary];
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithCapacity:(NSUInteger)numItems {
-  #pragma unused(numItems)
-  return [self initWithUInt64s:NULL forKeys:NULL count:0];
-}
-
-- (void)dealloc {
-  NSAssert(!_autocreator,
-           @"%@: Autocreator must be cleared before release, autocreator: %@",
-           [self class], _autocreator);
-  [_dictionary release];
-  [super dealloc];
-}
-
-- (instancetype)copyWithZone:(NSZone *)zone {
-  return [[GPBUInt64UInt64Dictionary allocWithZone:zone] initWithDictionary:self];
-}
-
-- (BOOL)isEqual:(id)other {
-  if (self == other) {
-    return YES;
-  }
-  if (![other isKindOfClass:[GPBUInt64UInt64Dictionary class]]) {
-    return NO;
-  }
-  GPBUInt64UInt64Dictionary *otherDictionary = other;
-  return [_dictionary isEqual:otherDictionary->_dictionary];
-}
-
-- (NSUInteger)hash {
-  return _dictionary.count;
-}
-
-- (NSString *)description {
-  return [NSString stringWithFormat:@"<%@ %p> { %@ }", [self class], self, _dictionary];
-}
-
-- (NSUInteger)count {
-  return _dictionary.count;
-}
-
-- (void)enumerateKeysAndUInt64sUsingBlock:
-    (void (NS_NOESCAPE ^)(uint64_t key, uint64_t value, BOOL *stop))block {
-  BOOL stop = NO;
-  NSDictionary *internal = _dictionary;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    block([aKey unsignedLongLongValue], [aValue unsignedLongLongValue], &stop);
-    if (stop) {
-      break;
-    }
-  }
-}
-
-- (size_t)computeSerializedSizeAsField:(GPBFieldDescriptor *)field {
-  NSDictionary *internal = _dictionary;
-  NSUInteger count = internal.count;
-  if (count == 0) {
-    return 0;
-  }
-
-  GPBDataType valueDataType = GPBGetFieldDataType(field);
-  GPBDataType keyDataType = field.mapKeyDataType;
-  size_t result = 0;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    size_t msgSize = ComputeDictUInt64FieldSize([aKey unsignedLongLongValue], kMapKeyFieldNumber, keyDataType);
-    msgSize += ComputeDictUInt64FieldSize([aValue unsignedLongLongValue], kMapValueFieldNumber, valueDataType);
-    result += GPBComputeRawVarint32SizeForInteger(msgSize) + msgSize;
-  }
-  size_t tagSize = GPBComputeWireFormatTagSize(GPBFieldNumber(field), GPBDataTypeMessage);
-  result += tagSize * count;
-  return result;
-}
-
-- (void)writeToCodedOutputStream:(GPBCodedOutputStream *)outputStream
-                         asField:(GPBFieldDescriptor *)field {
-  GPBDataType valueDataType = GPBGetFieldDataType(field);
-  GPBDataType keyDataType = field.mapKeyDataType;
-  uint32_t tag = GPBWireFormatMakeTag(GPBFieldNumber(field), GPBWireFormatLengthDelimited);
-  NSDictionary *internal = _dictionary;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    [outputStream writeInt32NoTag:tag];
-    // Write the size of the message.
-    uint64_t unwrappedKey = [aKey unsignedLongLongValue];
-    uint64_t unwrappedValue = [aValue unsignedLongLongValue];
-    size_t msgSize = ComputeDictUInt64FieldSize(unwrappedKey, kMapKeyFieldNumber, keyDataType);
-    msgSize += ComputeDictUInt64FieldSize(unwrappedValue, kMapValueFieldNumber, valueDataType);
-    [outputStream writeInt32NoTag:(int32_t)msgSize];
-    // Write the fields.
-    WriteDictUInt64Field(outputStream, unwrappedKey, kMapKeyFieldNumber, keyDataType);
-    WriteDictUInt64Field(outputStream, unwrappedValue, kMapValueFieldNumber, valueDataType);
-  }
-}
-
-- (void)setGPBGenericValue:(GPBGenericValue *)value
-     forGPBGenericValueKey:(GPBGenericValue *)key {
-  [_dictionary setObject:@(value->valueUInt64) forKey:@(key->valueUInt64)];
-}
-
-- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
-  [self enumerateKeysAndUInt64sUsingBlock:^(uint64_t key, uint64_t value, BOOL *stop) {
-      #pragma unused(stop)
-      block([NSString stringWithFormat:@"%llu", key], [NSString stringWithFormat:@"%llu", value]);
-  }];
-}
-
-- (BOOL)getUInt64:(nullable uint64_t *)value forKey:(uint64_t)key {
-  NSNumber *wrapped = [_dictionary objectForKey:@(key)];
-  if (wrapped && value) {
-    *value = [wrapped unsignedLongLongValue];
-  }
-  return (wrapped != NULL);
-}
-
-- (void)addEntriesFromDictionary:(GPBUInt64UInt64Dictionary *)otherDictionary {
-  if (otherDictionary) {
-    [_dictionary addEntriesFromDictionary:otherDictionary->_dictionary];
-    if (_autocreator) {
-      GPBAutocreatedDictionaryModified(_autocreator, self);
-    }
-  }
-}
-
-- (void)setUInt64:(uint64_t)value forKey:(uint64_t)key {
-  [_dictionary setObject:@(value) forKey:@(key)];
-  if (_autocreator) {
-    GPBAutocreatedDictionaryModified(_autocreator, self);
-  }
-}
-
-- (void)removeUInt64ForKey:(uint64_t)aKey {
-  [_dictionary removeObjectForKey:@(aKey)];
-}
-
-- (void)removeAll {
-  [_dictionary removeAllObjects];
-}
-
-@end
-
-#pragma mark - UInt64 -> Int64
-
-@implementation GPBUInt64Int64Dictionary {
- @package
-  NSMutableDictionary *_dictionary;
-}
-
-- (instancetype)init {
-  return [self initWithInt64s:NULL forKeys:NULL count:0];
-}
-
-- (instancetype)initWithInt64s:(const int64_t [])values
-                       forKeys:(const uint64_t [])keys
-                         count:(NSUInteger)count {
-  self = [super init];
-  if (self) {
-    _dictionary = [[NSMutableDictionary alloc] init];
-    if (count && values && keys) {
-      for (NSUInteger i = 0; i < count; ++i) {
-        [_dictionary setObject:@(values[i]) forKey:@(keys[i])];
-      }
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithDictionary:(GPBUInt64Int64Dictionary *)dictionary {
-  self = [self initWithInt64s:NULL forKeys:NULL count:0];
-  if (self) {
-    if (dictionary) {
-      [_dictionary addEntriesFromDictionary:dictionary->_dictionary];
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithCapacity:(NSUInteger)numItems {
-  #pragma unused(numItems)
-  return [self initWithInt64s:NULL forKeys:NULL count:0];
-}
-
-- (void)dealloc {
-  NSAssert(!_autocreator,
-           @"%@: Autocreator must be cleared before release, autocreator: %@",
-           [self class], _autocreator);
-  [_dictionary release];
-  [super dealloc];
-}
-
-- (instancetype)copyWithZone:(NSZone *)zone {
-  return [[GPBUInt64Int64Dictionary allocWithZone:zone] initWithDictionary:self];
-}
-
-- (BOOL)isEqual:(id)other {
-  if (self == other) {
-    return YES;
-  }
-  if (![other isKindOfClass:[GPBUInt64Int64Dictionary class]]) {
-    return NO;
-  }
-  GPBUInt64Int64Dictionary *otherDictionary = other;
-  return [_dictionary isEqual:otherDictionary->_dictionary];
-}
-
-- (NSUInteger)hash {
-  return _dictionary.count;
-}
-
-- (NSString *)description {
-  return [NSString stringWithFormat:@"<%@ %p> { %@ }", [self class], self, _dictionary];
-}
-
-- (NSUInteger)count {
-  return _dictionary.count;
-}
-
-- (void)enumerateKeysAndInt64sUsingBlock:
-    (void (NS_NOESCAPE ^)(uint64_t key, int64_t value, BOOL *stop))block {
-  BOOL stop = NO;
-  NSDictionary *internal = _dictionary;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    block([aKey unsignedLongLongValue], [aValue longLongValue], &stop);
-    if (stop) {
-      break;
-    }
-  }
-}
-
-- (size_t)computeSerializedSizeAsField:(GPBFieldDescriptor *)field {
-  NSDictionary *internal = _dictionary;
-  NSUInteger count = internal.count;
-  if (count == 0) {
-    return 0;
-  }
-
-  GPBDataType valueDataType = GPBGetFieldDataType(field);
-  GPBDataType keyDataType = field.mapKeyDataType;
-  size_t result = 0;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    size_t msgSize = ComputeDictUInt64FieldSize([aKey unsignedLongLongValue], kMapKeyFieldNumber, keyDataType);
-    msgSize += ComputeDictInt64FieldSize([aValue longLongValue], kMapValueFieldNumber, valueDataType);
-    result += GPBComputeRawVarint32SizeForInteger(msgSize) + msgSize;
-  }
-  size_t tagSize = GPBComputeWireFormatTagSize(GPBFieldNumber(field), GPBDataTypeMessage);
-  result += tagSize * count;
-  return result;
-}
-
-- (void)writeToCodedOutputStream:(GPBCodedOutputStream *)outputStream
-                         asField:(GPBFieldDescriptor *)field {
-  GPBDataType valueDataType = GPBGetFieldDataType(field);
-  GPBDataType keyDataType = field.mapKeyDataType;
-  uint32_t tag = GPBWireFormatMakeTag(GPBFieldNumber(field), GPBWireFormatLengthDelimited);
-  NSDictionary *internal = _dictionary;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    [outputStream writeInt32NoTag:tag];
-    // Write the size of the message.
-    uint64_t unwrappedKey = [aKey unsignedLongLongValue];
-    int64_t unwrappedValue = [aValue longLongValue];
-    size_t msgSize = ComputeDictUInt64FieldSize(unwrappedKey, kMapKeyFieldNumber, keyDataType);
-    msgSize += ComputeDictInt64FieldSize(unwrappedValue, kMapValueFieldNumber, valueDataType);
-    [outputStream writeInt32NoTag:(int32_t)msgSize];
-    // Write the fields.
-    WriteDictUInt64Field(outputStream, unwrappedKey, kMapKeyFieldNumber, keyDataType);
-    WriteDictInt64Field(outputStream, unwrappedValue, kMapValueFieldNumber, valueDataType);
-  }
-}
-
-- (void)setGPBGenericValue:(GPBGenericValue *)value
-     forGPBGenericValueKey:(GPBGenericValue *)key {
-  [_dictionary setObject:@(value->valueInt64) forKey:@(key->valueUInt64)];
-}
-
-- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
-  [self enumerateKeysAndInt64sUsingBlock:^(uint64_t key, int64_t value, BOOL *stop) {
-      #pragma unused(stop)
-      block([NSString stringWithFormat:@"%llu", key], [NSString stringWithFormat:@"%lld", value]);
-  }];
-}
-
-- (BOOL)getInt64:(nullable int64_t *)value forKey:(uint64_t)key {
-  NSNumber *wrapped = [_dictionary objectForKey:@(key)];
-  if (wrapped && value) {
-    *value = [wrapped longLongValue];
-  }
-  return (wrapped != NULL);
-}
-
-- (void)addEntriesFromDictionary:(GPBUInt64Int64Dictionary *)otherDictionary {
-  if (otherDictionary) {
-    [_dictionary addEntriesFromDictionary:otherDictionary->_dictionary];
-    if (_autocreator) {
-      GPBAutocreatedDictionaryModified(_autocreator, self);
-    }
-  }
-}
-
-- (void)setInt64:(int64_t)value forKey:(uint64_t)key {
-  [_dictionary setObject:@(value) forKey:@(key)];
-  if (_autocreator) {
-    GPBAutocreatedDictionaryModified(_autocreator, self);
-  }
-}
-
-- (void)removeInt64ForKey:(uint64_t)aKey {
-  [_dictionary removeObjectForKey:@(aKey)];
-}
-
-- (void)removeAll {
-  [_dictionary removeAllObjects];
-}
-
-@end
-
-#pragma mark - UInt64 -> Bool
-
-@implementation GPBUInt64BoolDictionary {
- @package
-  NSMutableDictionary *_dictionary;
-}
-
-- (instancetype)init {
-  return [self initWithBools:NULL forKeys:NULL count:0];
-}
-
-- (instancetype)initWithBools:(const BOOL [])values
-                      forKeys:(const uint64_t [])keys
-                        count:(NSUInteger)count {
-  self = [super init];
-  if (self) {
-    _dictionary = [[NSMutableDictionary alloc] init];
-    if (count && values && keys) {
-      for (NSUInteger i = 0; i < count; ++i) {
-        [_dictionary setObject:@(values[i]) forKey:@(keys[i])];
-      }
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithDictionary:(GPBUInt64BoolDictionary *)dictionary {
-  self = [self initWithBools:NULL forKeys:NULL count:0];
-  if (self) {
-    if (dictionary) {
-      [_dictionary addEntriesFromDictionary:dictionary->_dictionary];
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithCapacity:(NSUInteger)numItems {
-  #pragma unused(numItems)
-  return [self initWithBools:NULL forKeys:NULL count:0];
-}
-
-- (void)dealloc {
-  NSAssert(!_autocreator,
-           @"%@: Autocreator must be cleared before release, autocreator: %@",
-           [self class], _autocreator);
-  [_dictionary release];
-  [super dealloc];
-}
-
-- (instancetype)copyWithZone:(NSZone *)zone {
-  return [[GPBUInt64BoolDictionary allocWithZone:zone] initWithDictionary:self];
-}
-
-- (BOOL)isEqual:(id)other {
-  if (self == other) {
-    return YES;
-  }
-  if (![other isKindOfClass:[GPBUInt64BoolDictionary class]]) {
-    return NO;
-  }
-  GPBUInt64BoolDictionary *otherDictionary = other;
-  return [_dictionary isEqual:otherDictionary->_dictionary];
-}
-
-- (NSUInteger)hash {
-  return _dictionary.count;
-}
-
-- (NSString *)description {
-  return [NSString stringWithFormat:@"<%@ %p> { %@ }", [self class], self, _dictionary];
-}
-
-- (NSUInteger)count {
-  return _dictionary.count;
-}
-
-- (void)enumerateKeysAndBoolsUsingBlock:
-    (void (NS_NOESCAPE ^)(uint64_t key, BOOL value, BOOL *stop))block {
-  BOOL stop = NO;
-  NSDictionary *internal = _dictionary;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    block([aKey unsignedLongLongValue], [aValue boolValue], &stop);
-    if (stop) {
-      break;
-    }
-  }
-}
-
-- (size_t)computeSerializedSizeAsField:(GPBFieldDescriptor *)field {
-  NSDictionary *internal = _dictionary;
-  NSUInteger count = internal.count;
-  if (count == 0) {
-    return 0;
-  }
-
-  GPBDataType valueDataType = GPBGetFieldDataType(field);
-  GPBDataType keyDataType = field.mapKeyDataType;
-  size_t result = 0;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    size_t msgSize = ComputeDictUInt64FieldSize([aKey unsignedLongLongValue], kMapKeyFieldNumber, keyDataType);
-    msgSize += ComputeDictBoolFieldSize([aValue boolValue], kMapValueFieldNumber, valueDataType);
-    result += GPBComputeRawVarint32SizeForInteger(msgSize) + msgSize;
-  }
-  size_t tagSize = GPBComputeWireFormatTagSize(GPBFieldNumber(field), GPBDataTypeMessage);
-  result += tagSize * count;
-  return result;
-}
-
-- (void)writeToCodedOutputStream:(GPBCodedOutputStream *)outputStream
-                         asField:(GPBFieldDescriptor *)field {
-  GPBDataType valueDataType = GPBGetFieldDataType(field);
-  GPBDataType keyDataType = field.mapKeyDataType;
-  uint32_t tag = GPBWireFormatMakeTag(GPBFieldNumber(field), GPBWireFormatLengthDelimited);
-  NSDictionary *internal = _dictionary;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    [outputStream writeInt32NoTag:tag];
-    // Write the size of the message.
-    uint64_t unwrappedKey = [aKey unsignedLongLongValue];
-    BOOL unwrappedValue = [aValue boolValue];
-    size_t msgSize = ComputeDictUInt64FieldSize(unwrappedKey, kMapKeyFieldNumber, keyDataType);
-    msgSize += ComputeDictBoolFieldSize(unwrappedValue, kMapValueFieldNumber, valueDataType);
-    [outputStream writeInt32NoTag:(int32_t)msgSize];
-    // Write the fields.
-    WriteDictUInt64Field(outputStream, unwrappedKey, kMapKeyFieldNumber, keyDataType);
-    WriteDictBoolField(outputStream, unwrappedValue, kMapValueFieldNumber, valueDataType);
-  }
-}
-
-- (void)setGPBGenericValue:(GPBGenericValue *)value
-     forGPBGenericValueKey:(GPBGenericValue *)key {
-  [_dictionary setObject:@(value->valueBool) forKey:@(key->valueUInt64)];
-}
-
-- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
-  [self enumerateKeysAndBoolsUsingBlock:^(uint64_t key, BOOL value, BOOL *stop) {
-      #pragma unused(stop)
-      block([NSString stringWithFormat:@"%llu", key], (value ? @"true" : @"false"));
-  }];
-}
-
-- (BOOL)getBool:(nullable BOOL *)value forKey:(uint64_t)key {
-  NSNumber *wrapped = [_dictionary objectForKey:@(key)];
-  if (wrapped && value) {
-    *value = [wrapped boolValue];
-  }
-  return (wrapped != NULL);
-}
-
-- (void)addEntriesFromDictionary:(GPBUInt64BoolDictionary *)otherDictionary {
-  if (otherDictionary) {
-    [_dictionary addEntriesFromDictionary:otherDictionary->_dictionary];
-    if (_autocreator) {
-      GPBAutocreatedDictionaryModified(_autocreator, self);
-    }
-  }
-}
-
-- (void)setBool:(BOOL)value forKey:(uint64_t)key {
-  [_dictionary setObject:@(value) forKey:@(key)];
-  if (_autocreator) {
-    GPBAutocreatedDictionaryModified(_autocreator, self);
-  }
-}
-
-- (void)removeBoolForKey:(uint64_t)aKey {
-  [_dictionary removeObjectForKey:@(aKey)];
-}
-
-- (void)removeAll {
-  [_dictionary removeAllObjects];
-}
-
-@end
-
-#pragma mark - UInt64 -> Float
-
-@implementation GPBUInt64FloatDictionary {
- @package
-  NSMutableDictionary *_dictionary;
-}
-
-- (instancetype)init {
-  return [self initWithFloats:NULL forKeys:NULL count:0];
-}
-
-- (instancetype)initWithFloats:(const float [])values
-                       forKeys:(const uint64_t [])keys
-                         count:(NSUInteger)count {
-  self = [super init];
-  if (self) {
-    _dictionary = [[NSMutableDictionary alloc] init];
-    if (count && values && keys) {
-      for (NSUInteger i = 0; i < count; ++i) {
-        [_dictionary setObject:@(values[i]) forKey:@(keys[i])];
-      }
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithDictionary:(GPBUInt64FloatDictionary *)dictionary {
-  self = [self initWithFloats:NULL forKeys:NULL count:0];
-  if (self) {
-    if (dictionary) {
-      [_dictionary addEntriesFromDictionary:dictionary->_dictionary];
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithCapacity:(NSUInteger)numItems {
-  #pragma unused(numItems)
-  return [self initWithFloats:NULL forKeys:NULL count:0];
-}
-
-- (void)dealloc {
-  NSAssert(!_autocreator,
-           @"%@: Autocreator must be cleared before release, autocreator: %@",
-           [self class], _autocreator);
-  [_dictionary release];
-  [super dealloc];
-}
-
-- (instancetype)copyWithZone:(NSZone *)zone {
-  return [[GPBUInt64FloatDictionary allocWithZone:zone] initWithDictionary:self];
-}
-
-- (BOOL)isEqual:(id)other {
-  if (self == other) {
-    return YES;
-  }
-  if (![other isKindOfClass:[GPBUInt64FloatDictionary class]]) {
-    return NO;
-  }
-  GPBUInt64FloatDictionary *otherDictionary = other;
-  return [_dictionary isEqual:otherDictionary->_dictionary];
-}
-
-- (NSUInteger)hash {
-  return _dictionary.count;
-}
-
-- (NSString *)description {
-  return [NSString stringWithFormat:@"<%@ %p> { %@ }", [self class], self, _dictionary];
-}
-
-- (NSUInteger)count {
-  return _dictionary.count;
-}
-
-- (void)enumerateKeysAndFloatsUsingBlock:
-    (void (NS_NOESCAPE ^)(uint64_t key, float value, BOOL *stop))block {
-  BOOL stop = NO;
-  NSDictionary *internal = _dictionary;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    block([aKey unsignedLongLongValue], [aValue floatValue], &stop);
-    if (stop) {
-      break;
-    }
-  }
-}
-
-- (size_t)computeSerializedSizeAsField:(GPBFieldDescriptor *)field {
-  NSDictionary *internal = _dictionary;
-  NSUInteger count = internal.count;
-  if (count == 0) {
-    return 0;
-  }
-
-  GPBDataType valueDataType = GPBGetFieldDataType(field);
-  GPBDataType keyDataType = field.mapKeyDataType;
-  size_t result = 0;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    size_t msgSize = ComputeDictUInt64FieldSize([aKey unsignedLongLongValue], kMapKeyFieldNumber, keyDataType);
-    msgSize += ComputeDictFloatFieldSize([aValue floatValue], kMapValueFieldNumber, valueDataType);
-    result += GPBComputeRawVarint32SizeForInteger(msgSize) + msgSize;
-  }
-  size_t tagSize = GPBComputeWireFormatTagSize(GPBFieldNumber(field), GPBDataTypeMessage);
-  result += tagSize * count;
-  return result;
-}
-
-- (void)writeToCodedOutputStream:(GPBCodedOutputStream *)outputStream
-                         asField:(GPBFieldDescriptor *)field {
-  GPBDataType valueDataType = GPBGetFieldDataType(field);
-  GPBDataType keyDataType = field.mapKeyDataType;
-  uint32_t tag = GPBWireFormatMakeTag(GPBFieldNumber(field), GPBWireFormatLengthDelimited);
-  NSDictionary *internal = _dictionary;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    [outputStream writeInt32NoTag:tag];
-    // Write the size of the message.
-    uint64_t unwrappedKey = [aKey unsignedLongLongValue];
-    float unwrappedValue = [aValue floatValue];
-    size_t msgSize = ComputeDictUInt64FieldSize(unwrappedKey, kMapKeyFieldNumber, keyDataType);
-    msgSize += ComputeDictFloatFieldSize(unwrappedValue, kMapValueFieldNumber, valueDataType);
-    [outputStream writeInt32NoTag:(int32_t)msgSize];
-    // Write the fields.
-    WriteDictUInt64Field(outputStream, unwrappedKey, kMapKeyFieldNumber, keyDataType);
-    WriteDictFloatField(outputStream, unwrappedValue, kMapValueFieldNumber, valueDataType);
-  }
-}
-
-- (void)setGPBGenericValue:(GPBGenericValue *)value
-     forGPBGenericValueKey:(GPBGenericValue *)key {
-  [_dictionary setObject:@(value->valueFloat) forKey:@(key->valueUInt64)];
-}
-
-- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
-  [self enumerateKeysAndFloatsUsingBlock:^(uint64_t key, float value, BOOL *stop) {
-      #pragma unused(stop)
-      block([NSString stringWithFormat:@"%llu", key], [NSString stringWithFormat:@"%.*g", FLT_DIG, value]);
-  }];
-}
-
-- (BOOL)getFloat:(nullable float *)value forKey:(uint64_t)key {
-  NSNumber *wrapped = [_dictionary objectForKey:@(key)];
-  if (wrapped && value) {
-    *value = [wrapped floatValue];
-  }
-  return (wrapped != NULL);
-}
-
-- (void)addEntriesFromDictionary:(GPBUInt64FloatDictionary *)otherDictionary {
-  if (otherDictionary) {
-    [_dictionary addEntriesFromDictionary:otherDictionary->_dictionary];
-    if (_autocreator) {
-      GPBAutocreatedDictionaryModified(_autocreator, self);
-    }
-  }
-}
-
-- (void)setFloat:(float)value forKey:(uint64_t)key {
-  [_dictionary setObject:@(value) forKey:@(key)];
-  if (_autocreator) {
-    GPBAutocreatedDictionaryModified(_autocreator, self);
-  }
-}
-
-- (void)removeFloatForKey:(uint64_t)aKey {
-  [_dictionary removeObjectForKey:@(aKey)];
-}
-
-- (void)removeAll {
-  [_dictionary removeAllObjects];
-}
-
-@end
-
-#pragma mark - UInt64 -> Double
-
-@implementation GPBUInt64DoubleDictionary {
- @package
-  NSMutableDictionary *_dictionary;
-}
-
-- (instancetype)init {
-  return [self initWithDoubles:NULL forKeys:NULL count:0];
-}
-
-- (instancetype)initWithDoubles:(const double [])values
-                        forKeys:(const uint64_t [])keys
-                          count:(NSUInteger)count {
-  self = [super init];
-  if (self) {
-    _dictionary = [[NSMutableDictionary alloc] init];
-    if (count && values && keys) {
-      for (NSUInteger i = 0; i < count; ++i) {
-        [_dictionary setObject:@(values[i]) forKey:@(keys[i])];
-      }
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithDictionary:(GPBUInt64DoubleDictionary *)dictionary {
-  self = [self initWithDoubles:NULL forKeys:NULL count:0];
-  if (self) {
-    if (dictionary) {
-      [_dictionary addEntriesFromDictionary:dictionary->_dictionary];
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithCapacity:(NSUInteger)numItems {
-  #pragma unused(numItems)
-  return [self initWithDoubles:NULL forKeys:NULL count:0];
-}
-
-- (void)dealloc {
-  NSAssert(!_autocreator,
-           @"%@: Autocreator must be cleared before release, autocreator: %@",
-           [self class], _autocreator);
-  [_dictionary release];
-  [super dealloc];
-}
-
-- (instancetype)copyWithZone:(NSZone *)zone {
-  return [[GPBUInt64DoubleDictionary allocWithZone:zone] initWithDictionary:self];
-}
-
-- (BOOL)isEqual:(id)other {
-  if (self == other) {
-    return YES;
-  }
-  if (![other isKindOfClass:[GPBUInt64DoubleDictionary class]]) {
-    return NO;
-  }
-  GPBUInt64DoubleDictionary *otherDictionary = other;
-  return [_dictionary isEqual:otherDictionary->_dictionary];
-}
-
-- (NSUInteger)hash {
-  return _dictionary.count;
-}
-
-- (NSString *)description {
-  return [NSString stringWithFormat:@"<%@ %p> { %@ }", [self class], self, _dictionary];
-}
-
-- (NSUInteger)count {
-  return _dictionary.count;
-}
-
-- (void)enumerateKeysAndDoublesUsingBlock:
-    (void (NS_NOESCAPE ^)(uint64_t key, double value, BOOL *stop))block {
-  BOOL stop = NO;
-  NSDictionary *internal = _dictionary;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    block([aKey unsignedLongLongValue], [aValue doubleValue], &stop);
-    if (stop) {
-      break;
-    }
-  }
-}
-
-- (size_t)computeSerializedSizeAsField:(GPBFieldDescriptor *)field {
-  NSDictionary *internal = _dictionary;
-  NSUInteger count = internal.count;
-  if (count == 0) {
-    return 0;
-  }
-
-  GPBDataType valueDataType = GPBGetFieldDataType(field);
-  GPBDataType keyDataType = field.mapKeyDataType;
-  size_t result = 0;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    size_t msgSize = ComputeDictUInt64FieldSize([aKey unsignedLongLongValue], kMapKeyFieldNumber, keyDataType);
-    msgSize += ComputeDictDoubleFieldSize([aValue doubleValue], kMapValueFieldNumber, valueDataType);
-    result += GPBComputeRawVarint32SizeForInteger(msgSize) + msgSize;
-  }
-  size_t tagSize = GPBComputeWireFormatTagSize(GPBFieldNumber(field), GPBDataTypeMessage);
-  result += tagSize * count;
-  return result;
-}
-
-- (void)writeToCodedOutputStream:(GPBCodedOutputStream *)outputStream
-                         asField:(GPBFieldDescriptor *)field {
-  GPBDataType valueDataType = GPBGetFieldDataType(field);
-  GPBDataType keyDataType = field.mapKeyDataType;
-  uint32_t tag = GPBWireFormatMakeTag(GPBFieldNumber(field), GPBWireFormatLengthDelimited);
-  NSDictionary *internal = _dictionary;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    [outputStream writeInt32NoTag:tag];
-    // Write the size of the message.
-    uint64_t unwrappedKey = [aKey unsignedLongLongValue];
-    double unwrappedValue = [aValue doubleValue];
-    size_t msgSize = ComputeDictUInt64FieldSize(unwrappedKey, kMapKeyFieldNumber, keyDataType);
-    msgSize += ComputeDictDoubleFieldSize(unwrappedValue, kMapValueFieldNumber, valueDataType);
-    [outputStream writeInt32NoTag:(int32_t)msgSize];
-    // Write the fields.
-    WriteDictUInt64Field(outputStream, unwrappedKey, kMapKeyFieldNumber, keyDataType);
-    WriteDictDoubleField(outputStream, unwrappedValue, kMapValueFieldNumber, valueDataType);
-  }
-}
-
-- (void)setGPBGenericValue:(GPBGenericValue *)value
-     forGPBGenericValueKey:(GPBGenericValue *)key {
-  [_dictionary setObject:@(value->valueDouble) forKey:@(key->valueUInt64)];
-}
-
-- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
-  [self enumerateKeysAndDoublesUsingBlock:^(uint64_t key, double value, BOOL *stop) {
-      #pragma unused(stop)
-      block([NSString stringWithFormat:@"%llu", key], [NSString stringWithFormat:@"%.*lg", DBL_DIG, value]);
-  }];
-}
-
-- (BOOL)getDouble:(nullable double *)value forKey:(uint64_t)key {
-  NSNumber *wrapped = [_dictionary objectForKey:@(key)];
-  if (wrapped && value) {
-    *value = [wrapped doubleValue];
-  }
-  return (wrapped != NULL);
-}
-
-- (void)addEntriesFromDictionary:(GPBUInt64DoubleDictionary *)otherDictionary {
-  if (otherDictionary) {
-    [_dictionary addEntriesFromDictionary:otherDictionary->_dictionary];
-    if (_autocreator) {
-      GPBAutocreatedDictionaryModified(_autocreator, self);
-    }
-  }
-}
-
-- (void)setDouble:(double)value forKey:(uint64_t)key {
-  [_dictionary setObject:@(value) forKey:@(key)];
-  if (_autocreator) {
-    GPBAutocreatedDictionaryModified(_autocreator, self);
-  }
-}
-
-- (void)removeDoubleForKey:(uint64_t)aKey {
-  [_dictionary removeObjectForKey:@(aKey)];
-}
-
-- (void)removeAll {
-  [_dictionary removeAllObjects];
-}
-
-@end
-
-#pragma mark - UInt64 -> Enum
-
-@implementation GPBUInt64EnumDictionary {
- @package
-  NSMutableDictionary *_dictionary;
-  GPBEnumValidationFunc _validationFunc;
-}
-
-@synthesize validationFunc = _validationFunc;
-
-- (instancetype)init {
-  return [self initWithValidationFunction:NULL rawValues:NULL forKeys:NULL count:0];
-}
-
-- (instancetype)initWithValidationFunction:(GPBEnumValidationFunc)func {
-  return [self initWithValidationFunction:func rawValues:NULL forKeys:NULL count:0];
-}
-
-- (instancetype)initWithValidationFunction:(GPBEnumValidationFunc)func
-                                 rawValues:(const int32_t [])rawValues
-                                   forKeys:(const uint64_t [])keys
-                                     count:(NSUInteger)count {
-  self = [super init];
-  if (self) {
-    _dictionary = [[NSMutableDictionary alloc] init];
-    _validationFunc = (func != NULL ? func : DictDefault_IsValidValue);
-    if (count && rawValues && keys) {
-      for (NSUInteger i = 0; i < count; ++i) {
-        [_dictionary setObject:@(rawValues[i]) forKey:@(keys[i])];
-      }
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithDictionary:(GPBUInt64EnumDictionary *)dictionary {
-  self = [self initWithValidationFunction:dictionary.validationFunc
-                                rawValues:NULL
-                                  forKeys:NULL
-                                    count:0];
-  if (self) {
-    if (dictionary) {
-      [_dictionary addEntriesFromDictionary:dictionary->_dictionary];
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithValidationFunction:(GPBEnumValidationFunc)func
-                                  capacity:(NSUInteger)numItems {
-  #pragma unused(numItems)
-  return [self initWithValidationFunction:func rawValues:NULL forKeys:NULL count:0];
-}
-
-- (void)dealloc {
-  NSAssert(!_autocreator,
-           @"%@: Autocreator must be cleared before release, autocreator: %@",
-           [self class], _autocreator);
-  [_dictionary release];
-  [super dealloc];
-}
-
-- (instancetype)copyWithZone:(NSZone *)zone {
-  return [[GPBUInt64EnumDictionary allocWithZone:zone] initWithDictionary:self];
-}
-
-- (BOOL)isEqual:(id)other {
-  if (self == other) {
-    return YES;
-  }
-  if (![other isKindOfClass:[GPBUInt64EnumDictionary class]]) {
-    return NO;
-  }
-  GPBUInt64EnumDictionary *otherDictionary = other;
-  return [_dictionary isEqual:otherDictionary->_dictionary];
-}
-
-- (NSUInteger)hash {
-  return _dictionary.count;
-}
-
-- (NSString *)description {
-  return [NSString stringWithFormat:@"<%@ %p> { %@ }", [self class], self, _dictionary];
-}
-
-- (NSUInteger)count {
-  return _dictionary.count;
-}
-
-- (void)enumerateKeysAndRawValuesUsingBlock:
-    (void (NS_NOESCAPE ^)(uint64_t key, int32_t value, BOOL *stop))block {
-  BOOL stop = NO;
-  NSDictionary *internal = _dictionary;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    block([aKey unsignedLongLongValue], [aValue intValue], &stop);
-    if (stop) {
-      break;
-    }
-  }
-}
-
-- (size_t)computeSerializedSizeAsField:(GPBFieldDescriptor *)field {
-  NSDictionary *internal = _dictionary;
-  NSUInteger count = internal.count;
-  if (count == 0) {
-    return 0;
-  }
-
-  GPBDataType valueDataType = GPBGetFieldDataType(field);
-  GPBDataType keyDataType = field.mapKeyDataType;
-  size_t result = 0;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    size_t msgSize = ComputeDictUInt64FieldSize([aKey unsignedLongLongValue], kMapKeyFieldNumber, keyDataType);
-    msgSize += ComputeDictEnumFieldSize([aValue intValue], kMapValueFieldNumber, valueDataType);
-    result += GPBComputeRawVarint32SizeForInteger(msgSize) + msgSize;
-  }
-  size_t tagSize = GPBComputeWireFormatTagSize(GPBFieldNumber(field), GPBDataTypeMessage);
-  result += tagSize * count;
-  return result;
-}
-
-- (void)writeToCodedOutputStream:(GPBCodedOutputStream *)outputStream
-                         asField:(GPBFieldDescriptor *)field {
-  GPBDataType valueDataType = GPBGetFieldDataType(field);
-  GPBDataType keyDataType = field.mapKeyDataType;
-  uint32_t tag = GPBWireFormatMakeTag(GPBFieldNumber(field), GPBWireFormatLengthDelimited);
-  NSDictionary *internal = _dictionary;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    [outputStream writeInt32NoTag:tag];
-    // Write the size of the message.
-    uint64_t unwrappedKey = [aKey unsignedLongLongValue];
-    int32_t unwrappedValue = [aValue intValue];
-    size_t msgSize = ComputeDictUInt64FieldSize(unwrappedKey, kMapKeyFieldNumber, keyDataType);
-    msgSize += ComputeDictEnumFieldSize(unwrappedValue, kMapValueFieldNumber, valueDataType);
-    [outputStream writeInt32NoTag:(int32_t)msgSize];
-    // Write the fields.
-    WriteDictUInt64Field(outputStream, unwrappedKey, kMapKeyFieldNumber, keyDataType);
-    WriteDictEnumField(outputStream, unwrappedValue, kMapValueFieldNumber, valueDataType);
-  }
-}
-
-- (NSData *)serializedDataForUnknownValue:(int32_t)value
-                                   forKey:(GPBGenericValue *)key
-                              keyDataType:(GPBDataType)keyDataType {
-  size_t msgSize = ComputeDictUInt64FieldSize(key->valueUInt64, kMapKeyFieldNumber, keyDataType);
-  msgSize += ComputeDictEnumFieldSize(value, kMapValueFieldNumber, GPBDataTypeEnum);
-  NSMutableData *data = [NSMutableData dataWithLength:msgSize];
-  GPBCodedOutputStream *outputStream = [[GPBCodedOutputStream alloc] initWithData:data];
-  WriteDictUInt64Field(outputStream, key->valueUInt64, kMapKeyFieldNumber, keyDataType);
-  WriteDictEnumField(outputStream, value, kMapValueFieldNumber, GPBDataTypeEnum);
-  [outputStream release];
-  return data;
-}
-- (void)setGPBGenericValue:(GPBGenericValue *)value
-     forGPBGenericValueKey:(GPBGenericValue *)key {
-  [_dictionary setObject:@(value->valueEnum) forKey:@(key->valueUInt64)];
-}
-
-- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
-  [self enumerateKeysAndRawValuesUsingBlock:^(uint64_t key, int32_t value, BOOL *stop) {
-      #pragma unused(stop)
-      block([NSString stringWithFormat:@"%llu", key], @(value));
-  }];
-}
-
-- (BOOL)getEnum:(int32_t *)value forKey:(uint64_t)key {
-  NSNumber *wrapped = [_dictionary objectForKey:@(key)];
-  if (wrapped && value) {
-    int32_t result = [wrapped intValue];
-    if (!_validationFunc(result)) {
-      result = kGPBUnrecognizedEnumeratorValue;
-    }
-    *value = result;
-  }
-  return (wrapped != NULL);
-}
-
-- (BOOL)getRawValue:(int32_t *)rawValue forKey:(uint64_t)key {
-  NSNumber *wrapped = [_dictionary objectForKey:@(key)];
-  if (wrapped && rawValue) {
-    *rawValue = [wrapped intValue];
-  }
-  return (wrapped != NULL);
-}
-
-- (void)enumerateKeysAndEnumsUsingBlock:
-    (void (NS_NOESCAPE ^)(uint64_t key, int32_t value, BOOL *stop))block {
-  GPBEnumValidationFunc func = _validationFunc;
-  BOOL stop = NO;
-  NSEnumerator *keys = [_dictionary keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = _dictionary[aKey];
-      int32_t unwrapped = [aValue intValue];
-      if (!func(unwrapped)) {
-        unwrapped = kGPBUnrecognizedEnumeratorValue;
-      }
-    block([aKey unsignedLongLongValue], unwrapped, &stop);
-    if (stop) {
-      break;
-    }
-  }
-}
-
-- (void)addRawEntriesFromDictionary:(GPBUInt64EnumDictionary *)otherDictionary {
-  if (otherDictionary) {
-    [_dictionary addEntriesFromDictionary:otherDictionary->_dictionary];
-    if (_autocreator) {
-      GPBAutocreatedDictionaryModified(_autocreator, self);
-    }
-  }
-}
-
-- (void)setRawValue:(int32_t)value forKey:(uint64_t)key {
-  [_dictionary setObject:@(value) forKey:@(key)];
-  if (_autocreator) {
-    GPBAutocreatedDictionaryModified(_autocreator, self);
-  }
-}
-
-- (void)removeEnumForKey:(uint64_t)aKey {
-  [_dictionary removeObjectForKey:@(aKey)];
-}
-
-- (void)removeAll {
-  [_dictionary removeAllObjects];
-}
-
-- (void)setEnum:(int32_t)value forKey:(uint64_t)key {
-  if (!_validationFunc(value)) {
-    [NSException raise:NSInvalidArgumentException
-                format:@"GPBUInt64EnumDictionary: Attempt to set an unknown enum value (%d)",
-                       value];
-  }
-
-  [_dictionary setObject:@(value) forKey:@(key)];
-  if (_autocreator) {
-    GPBAutocreatedDictionaryModified(_autocreator, self);
-  }
-}
-
-@end
-
-#pragma mark - UInt64 -> Object
-
-@implementation GPBUInt64ObjectDictionary {
- @package
-  NSMutableDictionary *_dictionary;
-}
-
-- (instancetype)init {
-  return [self initWithObjects:NULL forKeys:NULL count:0];
-}
-
-- (instancetype)initWithObjects:(const id [])objects
-                        forKeys:(const uint64_t [])keys
-                          count:(NSUInteger)count {
-  self = [super init];
-  if (self) {
-    _dictionary = [[NSMutableDictionary alloc] init];
-    if (count && objects && keys) {
-      for (NSUInteger i = 0; i < count; ++i) {
-        if (!objects[i]) {
-          [NSException raise:NSInvalidArgumentException
-                      format:@"Attempting to add nil object to a Dictionary"];
-        }
-        [_dictionary setObject:objects[i] forKey:@(keys[i])];
-      }
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithDictionary:(GPBUInt64ObjectDictionary *)dictionary {
-  self = [self initWithObjects:NULL forKeys:NULL count:0];
-  if (self) {
-    if (dictionary) {
-      [_dictionary addEntriesFromDictionary:dictionary->_dictionary];
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithCapacity:(NSUInteger)numItems {
-  #pragma unused(numItems)
-  return [self initWithObjects:NULL forKeys:NULL count:0];
-}
-
-- (void)dealloc {
-  NSAssert(!_autocreator,
-           @"%@: Autocreator must be cleared before release, autocreator: %@",
-           [self class], _autocreator);
-  [_dictionary release];
-  [super dealloc];
-}
-
-- (instancetype)copyWithZone:(NSZone *)zone {
-  return [[GPBUInt64ObjectDictionary allocWithZone:zone] initWithDictionary:self];
-}
-
-- (BOOL)isEqual:(id)other {
-  if (self == other) {
-    return YES;
-  }
-  if (![other isKindOfClass:[GPBUInt64ObjectDictionary class]]) {
-    return NO;
-  }
-  GPBUInt64ObjectDictionary *otherDictionary = other;
-  return [_dictionary isEqual:otherDictionary->_dictionary];
-}
-
-- (NSUInteger)hash {
-  return _dictionary.count;
-}
-
-- (NSString *)description {
-  return [NSString stringWithFormat:@"<%@ %p> { %@ }", [self class], self, _dictionary];
-}
-
-- (NSUInteger)count {
-  return _dictionary.count;
-}
-
-- (void)enumerateKeysAndObjectsUsingBlock:
-    (void (NS_NOESCAPE ^)(uint64_t key, id object, BOOL *stop))block {
-  BOOL stop = NO;
-  NSDictionary *internal = _dictionary;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    id aObject = internal[aKey];
-    block([aKey unsignedLongLongValue], aObject, &stop);
-    if (stop) {
-      break;
-    }
-  }
-}
-
-- (BOOL)isInitialized {
-  for (GPBMessage *msg in [_dictionary objectEnumerator]) {
-    if (!msg.initialized) {
-      return NO;
-    }
-  }
-  return YES;
-}
-
-- (instancetype)deepCopyWithZone:(NSZone *)zone {
-  GPBUInt64ObjectDictionary *newDict =
-      [[GPBUInt64ObjectDictionary alloc] init];
-  NSEnumerator *keys = [_dictionary keyEnumerator];
-  id aKey;
-  NSMutableDictionary *internalDict = newDict->_dictionary;
-  while ((aKey = [keys nextObject])) {
-    GPBMessage *msg = _dictionary[aKey];
-    GPBMessage *copiedMsg = [msg copyWithZone:zone];
-    [internalDict setObject:copiedMsg forKey:aKey];
-    [copiedMsg release];
-  }
-  return newDict;
-}
-
-- (size_t)computeSerializedSizeAsField:(GPBFieldDescriptor *)field {
-  NSDictionary *internal = _dictionary;
-  NSUInteger count = internal.count;
-  if (count == 0) {
-    return 0;
-  }
-
-  GPBDataType valueDataType = GPBGetFieldDataType(field);
-  GPBDataType keyDataType = field.mapKeyDataType;
-  size_t result = 0;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    id aObject = internal[aKey];
-    size_t msgSize = ComputeDictUInt64FieldSize([aKey unsignedLongLongValue], kMapKeyFieldNumber, keyDataType);
-    msgSize += ComputeDictObjectFieldSize(aObject, kMapValueFieldNumber, valueDataType);
-    result += GPBComputeRawVarint32SizeForInteger(msgSize) + msgSize;
-  }
-  size_t tagSize = GPBComputeWireFormatTagSize(GPBFieldNumber(field), GPBDataTypeMessage);
-  result += tagSize * count;
-  return result;
-}
-
-- (void)writeToCodedOutputStream:(GPBCodedOutputStream *)outputStream
-                         asField:(GPBFieldDescriptor *)field {
-  GPBDataType valueDataType = GPBGetFieldDataType(field);
-  GPBDataType keyDataType = field.mapKeyDataType;
-  uint32_t tag = GPBWireFormatMakeTag(GPBFieldNumber(field), GPBWireFormatLengthDelimited);
-  NSDictionary *internal = _dictionary;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    id aObject = internal[aKey];
-    [outputStream writeInt32NoTag:tag];
-    // Write the size of the message.
-    uint64_t unwrappedKey = [aKey unsignedLongLongValue];
-    id unwrappedValue = aObject;
-    size_t msgSize = ComputeDictUInt64FieldSize(unwrappedKey, kMapKeyFieldNumber, keyDataType);
-    msgSize += ComputeDictObjectFieldSize(unwrappedValue, kMapValueFieldNumber, valueDataType);
-    [outputStream writeInt32NoTag:(int32_t)msgSize];
-    // Write the fields.
-    WriteDictUInt64Field(outputStream, unwrappedKey, kMapKeyFieldNumber, keyDataType);
-    WriteDictObjectField(outputStream, unwrappedValue, kMapValueFieldNumber, valueDataType);
-  }
-}
-
-- (void)setGPBGenericValue:(GPBGenericValue *)value
-     forGPBGenericValueKey:(GPBGenericValue *)key {
-  [_dictionary setObject:value->valueString forKey:@(key->valueUInt64)];
-}
-
-- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
-  [self enumerateKeysAndObjectsUsingBlock:^(uint64_t key, id object, BOOL *stop) {
-      #pragma unused(stop)
-      block([NSString stringWithFormat:@"%llu", key], object);
-  }];
-}
-
-- (id)objectForKey:(uint64_t)key {
-  id result = [_dictionary objectForKey:@(key)];
-  return result;
-}
-
-- (void)addEntriesFromDictionary:(GPBUInt64ObjectDictionary *)otherDictionary {
-  if (otherDictionary) {
-    [_dictionary addEntriesFromDictionary:otherDictionary->_dictionary];
-    if (_autocreator) {
-      GPBAutocreatedDictionaryModified(_autocreator, self);
-    }
-  }
-}
-
-- (void)setObject:(id)object forKey:(uint64_t)key {
-  if (!object) {
-    [NSException raise:NSInvalidArgumentException
-                format:@"Attempting to add nil object to a Dictionary"];
-  }
-  [_dictionary setObject:object forKey:@(key)];
-  if (_autocreator) {
-    GPBAutocreatedDictionaryModified(_autocreator, self);
-  }
-}
-
-- (void)removeObjectForKey:(uint64_t)aKey {
-  [_dictionary removeObjectForKey:@(aKey)];
-}
-
-- (void)removeAll {
-  [_dictionary removeAllObjects];
-}
-
-@end
-
-// clang-format on
-//%PDDM-EXPAND DICTIONARY_IMPL_FOR_POD_KEY(Int64, int64_t)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-#pragma mark - Int64 -> UInt32
-
-@implementation GPBInt64UInt32Dictionary {
- @package
-  NSMutableDictionary *_dictionary;
-}
-
-- (instancetype)init {
-  return [self initWithUInt32s:NULL forKeys:NULL count:0];
-}
-
-- (instancetype)initWithUInt32s:(const uint32_t [])values
-                        forKeys:(const int64_t [])keys
-                          count:(NSUInteger)count {
-  self = [super init];
-  if (self) {
-    _dictionary = [[NSMutableDictionary alloc] init];
-    if (count && values && keys) {
-      for (NSUInteger i = 0; i < count; ++i) {
-        [_dictionary setObject:@(values[i]) forKey:@(keys[i])];
-      }
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithDictionary:(GPBInt64UInt32Dictionary *)dictionary {
-  self = [self initWithUInt32s:NULL forKeys:NULL count:0];
-  if (self) {
-    if (dictionary) {
-      [_dictionary addEntriesFromDictionary:dictionary->_dictionary];
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithCapacity:(NSUInteger)numItems {
-  #pragma unused(numItems)
-  return [self initWithUInt32s:NULL forKeys:NULL count:0];
-}
-
-- (void)dealloc {
-  NSAssert(!_autocreator,
-           @"%@: Autocreator must be cleared before release, autocreator: %@",
-           [self class], _autocreator);
-  [_dictionary release];
-  [super dealloc];
-}
-
-- (instancetype)copyWithZone:(NSZone *)zone {
-  return [[GPBInt64UInt32Dictionary allocWithZone:zone] initWithDictionary:self];
-}
-
-- (BOOL)isEqual:(id)other {
-  if (self == other) {
-    return YES;
-  }
-  if (![other isKindOfClass:[GPBInt64UInt32Dictionary class]]) {
-    return NO;
-  }
-  GPBInt64UInt32Dictionary *otherDictionary = other;
-  return [_dictionary isEqual:otherDictionary->_dictionary];
-}
-
-- (NSUInteger)hash {
-  return _dictionary.count;
-}
-
-- (NSString *)description {
-  return [NSString stringWithFormat:@"<%@ %p> { %@ }", [self class], self, _dictionary];
-}
-
-- (NSUInteger)count {
-  return _dictionary.count;
-}
-
-- (void)enumerateKeysAndUInt32sUsingBlock:
-    (void (NS_NOESCAPE ^)(int64_t key, uint32_t value, BOOL *stop))block {
-  BOOL stop = NO;
-  NSDictionary *internal = _dictionary;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    block([aKey longLongValue], [aValue unsignedIntValue], &stop);
-    if (stop) {
-      break;
-    }
-  }
-}
-
-- (size_t)computeSerializedSizeAsField:(GPBFieldDescriptor *)field {
-  NSDictionary *internal = _dictionary;
-  NSUInteger count = internal.count;
-  if (count == 0) {
-    return 0;
-  }
-
-  GPBDataType valueDataType = GPBGetFieldDataType(field);
-  GPBDataType keyDataType = field.mapKeyDataType;
-  size_t result = 0;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    size_t msgSize = ComputeDictInt64FieldSize([aKey longLongValue], kMapKeyFieldNumber, keyDataType);
-    msgSize += ComputeDictUInt32FieldSize([aValue unsignedIntValue], kMapValueFieldNumber, valueDataType);
-    result += GPBComputeRawVarint32SizeForInteger(msgSize) + msgSize;
-  }
-  size_t tagSize = GPBComputeWireFormatTagSize(GPBFieldNumber(field), GPBDataTypeMessage);
-  result += tagSize * count;
-  return result;
-}
-
-- (void)writeToCodedOutputStream:(GPBCodedOutputStream *)outputStream
-                         asField:(GPBFieldDescriptor *)field {
-  GPBDataType valueDataType = GPBGetFieldDataType(field);
-  GPBDataType keyDataType = field.mapKeyDataType;
-  uint32_t tag = GPBWireFormatMakeTag(GPBFieldNumber(field), GPBWireFormatLengthDelimited);
-  NSDictionary *internal = _dictionary;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    [outputStream writeInt32NoTag:tag];
-    // Write the size of the message.
-    int64_t unwrappedKey = [aKey longLongValue];
-    uint32_t unwrappedValue = [aValue unsignedIntValue];
-    size_t msgSize = ComputeDictInt64FieldSize(unwrappedKey, kMapKeyFieldNumber, keyDataType);
-    msgSize += ComputeDictUInt32FieldSize(unwrappedValue, kMapValueFieldNumber, valueDataType);
-    [outputStream writeInt32NoTag:(int32_t)msgSize];
-    // Write the fields.
-    WriteDictInt64Field(outputStream, unwrappedKey, kMapKeyFieldNumber, keyDataType);
-    WriteDictUInt32Field(outputStream, unwrappedValue, kMapValueFieldNumber, valueDataType);
-  }
-}
-
-- (void)setGPBGenericValue:(GPBGenericValue *)value
-     forGPBGenericValueKey:(GPBGenericValue *)key {
-  [_dictionary setObject:@(value->valueUInt32) forKey:@(key->valueInt64)];
-}
-
-- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
-  [self enumerateKeysAndUInt32sUsingBlock:^(int64_t key, uint32_t value, BOOL *stop) {
-      #pragma unused(stop)
-      block([NSString stringWithFormat:@"%lld", key], [NSString stringWithFormat:@"%u", value]);
-  }];
-}
-
-- (BOOL)getUInt32:(nullable uint32_t *)value forKey:(int64_t)key {
-  NSNumber *wrapped = [_dictionary objectForKey:@(key)];
-  if (wrapped && value) {
-    *value = [wrapped unsignedIntValue];
-  }
-  return (wrapped != NULL);
-}
-
-- (void)addEntriesFromDictionary:(GPBInt64UInt32Dictionary *)otherDictionary {
-  if (otherDictionary) {
-    [_dictionary addEntriesFromDictionary:otherDictionary->_dictionary];
-    if (_autocreator) {
-      GPBAutocreatedDictionaryModified(_autocreator, self);
-    }
-  }
-}
-
-- (void)setUInt32:(uint32_t)value forKey:(int64_t)key {
-  [_dictionary setObject:@(value) forKey:@(key)];
-  if (_autocreator) {
-    GPBAutocreatedDictionaryModified(_autocreator, self);
-  }
-}
-
-- (void)removeUInt32ForKey:(int64_t)aKey {
-  [_dictionary removeObjectForKey:@(aKey)];
-}
-
-- (void)removeAll {
-  [_dictionary removeAllObjects];
-}
-
-@end
-
-#pragma mark - Int64 -> Int32
-
-@implementation GPBInt64Int32Dictionary {
- @package
-  NSMutableDictionary *_dictionary;
-}
-
-- (instancetype)init {
-  return [self initWithInt32s:NULL forKeys:NULL count:0];
-}
-
-- (instancetype)initWithInt32s:(const int32_t [])values
-                       forKeys:(const int64_t [])keys
-                         count:(NSUInteger)count {
-  self = [super init];
-  if (self) {
-    _dictionary = [[NSMutableDictionary alloc] init];
-    if (count && values && keys) {
-      for (NSUInteger i = 0; i < count; ++i) {
-        [_dictionary setObject:@(values[i]) forKey:@(keys[i])];
-      }
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithDictionary:(GPBInt64Int32Dictionary *)dictionary {
-  self = [self initWithInt32s:NULL forKeys:NULL count:0];
-  if (self) {
-    if (dictionary) {
-      [_dictionary addEntriesFromDictionary:dictionary->_dictionary];
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithCapacity:(NSUInteger)numItems {
-  #pragma unused(numItems)
-  return [self initWithInt32s:NULL forKeys:NULL count:0];
-}
-
-- (void)dealloc {
-  NSAssert(!_autocreator,
-           @"%@: Autocreator must be cleared before release, autocreator: %@",
-           [self class], _autocreator);
-  [_dictionary release];
-  [super dealloc];
-}
-
-- (instancetype)copyWithZone:(NSZone *)zone {
-  return [[GPBInt64Int32Dictionary allocWithZone:zone] initWithDictionary:self];
-}
-
-- (BOOL)isEqual:(id)other {
-  if (self == other) {
-    return YES;
-  }
-  if (![other isKindOfClass:[GPBInt64Int32Dictionary class]]) {
-    return NO;
-  }
-  GPBInt64Int32Dictionary *otherDictionary = other;
-  return [_dictionary isEqual:otherDictionary->_dictionary];
-}
-
-- (NSUInteger)hash {
-  return _dictionary.count;
-}
-
-- (NSString *)description {
-  return [NSString stringWithFormat:@"<%@ %p> { %@ }", [self class], self, _dictionary];
-}
-
-- (NSUInteger)count {
-  return _dictionary.count;
-}
-
-- (void)enumerateKeysAndInt32sUsingBlock:
-    (void (NS_NOESCAPE ^)(int64_t key, int32_t value, BOOL *stop))block {
-  BOOL stop = NO;
-  NSDictionary *internal = _dictionary;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    block([aKey longLongValue], [aValue intValue], &stop);
-    if (stop) {
-      break;
-    }
-  }
-}
-
-- (size_t)computeSerializedSizeAsField:(GPBFieldDescriptor *)field {
-  NSDictionary *internal = _dictionary;
-  NSUInteger count = internal.count;
-  if (count == 0) {
-    return 0;
-  }
-
-  GPBDataType valueDataType = GPBGetFieldDataType(field);
-  GPBDataType keyDataType = field.mapKeyDataType;
-  size_t result = 0;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    size_t msgSize = ComputeDictInt64FieldSize([aKey longLongValue], kMapKeyFieldNumber, keyDataType);
-    msgSize += ComputeDictInt32FieldSize([aValue intValue], kMapValueFieldNumber, valueDataType);
-    result += GPBComputeRawVarint32SizeForInteger(msgSize) + msgSize;
-  }
-  size_t tagSize = GPBComputeWireFormatTagSize(GPBFieldNumber(field), GPBDataTypeMessage);
-  result += tagSize * count;
-  return result;
-}
-
-- (void)writeToCodedOutputStream:(GPBCodedOutputStream *)outputStream
-                         asField:(GPBFieldDescriptor *)field {
-  GPBDataType valueDataType = GPBGetFieldDataType(field);
-  GPBDataType keyDataType = field.mapKeyDataType;
-  uint32_t tag = GPBWireFormatMakeTag(GPBFieldNumber(field), GPBWireFormatLengthDelimited);
-  NSDictionary *internal = _dictionary;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    [outputStream writeInt32NoTag:tag];
-    // Write the size of the message.
-    int64_t unwrappedKey = [aKey longLongValue];
-    int32_t unwrappedValue = [aValue intValue];
-    size_t msgSize = ComputeDictInt64FieldSize(unwrappedKey, kMapKeyFieldNumber, keyDataType);
-    msgSize += ComputeDictInt32FieldSize(unwrappedValue, kMapValueFieldNumber, valueDataType);
-    [outputStream writeInt32NoTag:(int32_t)msgSize];
-    // Write the fields.
-    WriteDictInt64Field(outputStream, unwrappedKey, kMapKeyFieldNumber, keyDataType);
-    WriteDictInt32Field(outputStream, unwrappedValue, kMapValueFieldNumber, valueDataType);
-  }
-}
-
-- (void)setGPBGenericValue:(GPBGenericValue *)value
-     forGPBGenericValueKey:(GPBGenericValue *)key {
-  [_dictionary setObject:@(value->valueInt32) forKey:@(key->valueInt64)];
-}
-
-- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
-  [self enumerateKeysAndInt32sUsingBlock:^(int64_t key, int32_t value, BOOL *stop) {
-      #pragma unused(stop)
-      block([NSString stringWithFormat:@"%lld", key], [NSString stringWithFormat:@"%d", value]);
-  }];
-}
-
-- (BOOL)getInt32:(nullable int32_t *)value forKey:(int64_t)key {
-  NSNumber *wrapped = [_dictionary objectForKey:@(key)];
-  if (wrapped && value) {
-    *value = [wrapped intValue];
-  }
-  return (wrapped != NULL);
-}
-
-- (void)addEntriesFromDictionary:(GPBInt64Int32Dictionary *)otherDictionary {
-  if (otherDictionary) {
-    [_dictionary addEntriesFromDictionary:otherDictionary->_dictionary];
-    if (_autocreator) {
-      GPBAutocreatedDictionaryModified(_autocreator, self);
-    }
-  }
-}
-
-- (void)setInt32:(int32_t)value forKey:(int64_t)key {
-  [_dictionary setObject:@(value) forKey:@(key)];
-  if (_autocreator) {
-    GPBAutocreatedDictionaryModified(_autocreator, self);
-  }
-}
-
-- (void)removeInt32ForKey:(int64_t)aKey {
-  [_dictionary removeObjectForKey:@(aKey)];
-}
-
-- (void)removeAll {
-  [_dictionary removeAllObjects];
-}
-
-@end
-
-#pragma mark - Int64 -> UInt64
-
-@implementation GPBInt64UInt64Dictionary {
- @package
-  NSMutableDictionary *_dictionary;
-}
-
-- (instancetype)init {
-  return [self initWithUInt64s:NULL forKeys:NULL count:0];
-}
-
-- (instancetype)initWithUInt64s:(const uint64_t [])values
-                        forKeys:(const int64_t [])keys
-                          count:(NSUInteger)count {
-  self = [super init];
-  if (self) {
-    _dictionary = [[NSMutableDictionary alloc] init];
-    if (count && values && keys) {
-      for (NSUInteger i = 0; i < count; ++i) {
-        [_dictionary setObject:@(values[i]) forKey:@(keys[i])];
-      }
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithDictionary:(GPBInt64UInt64Dictionary *)dictionary {
-  self = [self initWithUInt64s:NULL forKeys:NULL count:0];
-  if (self) {
-    if (dictionary) {
-      [_dictionary addEntriesFromDictionary:dictionary->_dictionary];
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithCapacity:(NSUInteger)numItems {
-  #pragma unused(numItems)
-  return [self initWithUInt64s:NULL forKeys:NULL count:0];
-}
-
-- (void)dealloc {
-  NSAssert(!_autocreator,
-           @"%@: Autocreator must be cleared before release, autocreator: %@",
-           [self class], _autocreator);
-  [_dictionary release];
-  [super dealloc];
-}
-
-- (instancetype)copyWithZone:(NSZone *)zone {
-  return [[GPBInt64UInt64Dictionary allocWithZone:zone] initWithDictionary:self];
-}
-
-- (BOOL)isEqual:(id)other {
-  if (self == other) {
-    return YES;
-  }
-  if (![other isKindOfClass:[GPBInt64UInt64Dictionary class]]) {
-    return NO;
-  }
-  GPBInt64UInt64Dictionary *otherDictionary = other;
-  return [_dictionary isEqual:otherDictionary->_dictionary];
-}
-
-- (NSUInteger)hash {
-  return _dictionary.count;
-}
-
-- (NSString *)description {
-  return [NSString stringWithFormat:@"<%@ %p> { %@ }", [self class], self, _dictionary];
-}
-
-- (NSUInteger)count {
-  return _dictionary.count;
-}
-
-- (void)enumerateKeysAndUInt64sUsingBlock:
-    (void (NS_NOESCAPE ^)(int64_t key, uint64_t value, BOOL *stop))block {
-  BOOL stop = NO;
-  NSDictionary *internal = _dictionary;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    block([aKey longLongValue], [aValue unsignedLongLongValue], &stop);
-    if (stop) {
-      break;
-    }
-  }
-}
-
-- (size_t)computeSerializedSizeAsField:(GPBFieldDescriptor *)field {
-  NSDictionary *internal = _dictionary;
-  NSUInteger count = internal.count;
-  if (count == 0) {
-    return 0;
-  }
-
-  GPBDataType valueDataType = GPBGetFieldDataType(field);
-  GPBDataType keyDataType = field.mapKeyDataType;
-  size_t result = 0;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    size_t msgSize = ComputeDictInt64FieldSize([aKey longLongValue], kMapKeyFieldNumber, keyDataType);
-    msgSize += ComputeDictUInt64FieldSize([aValue unsignedLongLongValue], kMapValueFieldNumber, valueDataType);
-    result += GPBComputeRawVarint32SizeForInteger(msgSize) + msgSize;
-  }
-  size_t tagSize = GPBComputeWireFormatTagSize(GPBFieldNumber(field), GPBDataTypeMessage);
-  result += tagSize * count;
-  return result;
-}
-
-- (void)writeToCodedOutputStream:(GPBCodedOutputStream *)outputStream
-                         asField:(GPBFieldDescriptor *)field {
-  GPBDataType valueDataType = GPBGetFieldDataType(field);
-  GPBDataType keyDataType = field.mapKeyDataType;
-  uint32_t tag = GPBWireFormatMakeTag(GPBFieldNumber(field), GPBWireFormatLengthDelimited);
-  NSDictionary *internal = _dictionary;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    [outputStream writeInt32NoTag:tag];
-    // Write the size of the message.
-    int64_t unwrappedKey = [aKey longLongValue];
-    uint64_t unwrappedValue = [aValue unsignedLongLongValue];
-    size_t msgSize = ComputeDictInt64FieldSize(unwrappedKey, kMapKeyFieldNumber, keyDataType);
-    msgSize += ComputeDictUInt64FieldSize(unwrappedValue, kMapValueFieldNumber, valueDataType);
-    [outputStream writeInt32NoTag:(int32_t)msgSize];
-    // Write the fields.
-    WriteDictInt64Field(outputStream, unwrappedKey, kMapKeyFieldNumber, keyDataType);
-    WriteDictUInt64Field(outputStream, unwrappedValue, kMapValueFieldNumber, valueDataType);
-  }
-}
-
-- (void)setGPBGenericValue:(GPBGenericValue *)value
-     forGPBGenericValueKey:(GPBGenericValue *)key {
-  [_dictionary setObject:@(value->valueUInt64) forKey:@(key->valueInt64)];
-}
-
-- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
-  [self enumerateKeysAndUInt64sUsingBlock:^(int64_t key, uint64_t value, BOOL *stop) {
-      #pragma unused(stop)
-      block([NSString stringWithFormat:@"%lld", key], [NSString stringWithFormat:@"%llu", value]);
-  }];
-}
-
-- (BOOL)getUInt64:(nullable uint64_t *)value forKey:(int64_t)key {
-  NSNumber *wrapped = [_dictionary objectForKey:@(key)];
-  if (wrapped && value) {
-    *value = [wrapped unsignedLongLongValue];
-  }
-  return (wrapped != NULL);
-}
-
-- (void)addEntriesFromDictionary:(GPBInt64UInt64Dictionary *)otherDictionary {
-  if (otherDictionary) {
-    [_dictionary addEntriesFromDictionary:otherDictionary->_dictionary];
-    if (_autocreator) {
-      GPBAutocreatedDictionaryModified(_autocreator, self);
-    }
-  }
-}
-
-- (void)setUInt64:(uint64_t)value forKey:(int64_t)key {
-  [_dictionary setObject:@(value) forKey:@(key)];
-  if (_autocreator) {
-    GPBAutocreatedDictionaryModified(_autocreator, self);
-  }
-}
-
-- (void)removeUInt64ForKey:(int64_t)aKey {
-  [_dictionary removeObjectForKey:@(aKey)];
-}
-
-- (void)removeAll {
-  [_dictionary removeAllObjects];
-}
-
-@end
-
-#pragma mark - Int64 -> Int64
-
-@implementation GPBInt64Int64Dictionary {
- @package
-  NSMutableDictionary *_dictionary;
-}
-
-- (instancetype)init {
-  return [self initWithInt64s:NULL forKeys:NULL count:0];
-}
-
-- (instancetype)initWithInt64s:(const int64_t [])values
-                       forKeys:(const int64_t [])keys
-                         count:(NSUInteger)count {
-  self = [super init];
-  if (self) {
-    _dictionary = [[NSMutableDictionary alloc] init];
-    if (count && values && keys) {
-      for (NSUInteger i = 0; i < count; ++i) {
-        [_dictionary setObject:@(values[i]) forKey:@(keys[i])];
-      }
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithDictionary:(GPBInt64Int64Dictionary *)dictionary {
-  self = [self initWithInt64s:NULL forKeys:NULL count:0];
-  if (self) {
-    if (dictionary) {
-      [_dictionary addEntriesFromDictionary:dictionary->_dictionary];
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithCapacity:(NSUInteger)numItems {
-  #pragma unused(numItems)
-  return [self initWithInt64s:NULL forKeys:NULL count:0];
-}
-
-- (void)dealloc {
-  NSAssert(!_autocreator,
-           @"%@: Autocreator must be cleared before release, autocreator: %@",
-           [self class], _autocreator);
-  [_dictionary release];
-  [super dealloc];
-}
-
-- (instancetype)copyWithZone:(NSZone *)zone {
-  return [[GPBInt64Int64Dictionary allocWithZone:zone] initWithDictionary:self];
-}
-
-- (BOOL)isEqual:(id)other {
-  if (self == other) {
-    return YES;
-  }
-  if (![other isKindOfClass:[GPBInt64Int64Dictionary class]]) {
-    return NO;
-  }
-  GPBInt64Int64Dictionary *otherDictionary = other;
-  return [_dictionary isEqual:otherDictionary->_dictionary];
-}
-
-- (NSUInteger)hash {
-  return _dictionary.count;
-}
-
-- (NSString *)description {
-  return [NSString stringWithFormat:@"<%@ %p> { %@ }", [self class], self, _dictionary];
-}
-
-- (NSUInteger)count {
-  return _dictionary.count;
-}
-
-- (void)enumerateKeysAndInt64sUsingBlock:
-    (void (NS_NOESCAPE ^)(int64_t key, int64_t value, BOOL *stop))block {
-  BOOL stop = NO;
-  NSDictionary *internal = _dictionary;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    block([aKey longLongValue], [aValue longLongValue], &stop);
-    if (stop) {
-      break;
-    }
-  }
-}
-
-- (size_t)computeSerializedSizeAsField:(GPBFieldDescriptor *)field {
-  NSDictionary *internal = _dictionary;
-  NSUInteger count = internal.count;
-  if (count == 0) {
-    return 0;
-  }
-
-  GPBDataType valueDataType = GPBGetFieldDataType(field);
-  GPBDataType keyDataType = field.mapKeyDataType;
-  size_t result = 0;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    size_t msgSize = ComputeDictInt64FieldSize([aKey longLongValue], kMapKeyFieldNumber, keyDataType);
-    msgSize += ComputeDictInt64FieldSize([aValue longLongValue], kMapValueFieldNumber, valueDataType);
-    result += GPBComputeRawVarint32SizeForInteger(msgSize) + msgSize;
-  }
-  size_t tagSize = GPBComputeWireFormatTagSize(GPBFieldNumber(field), GPBDataTypeMessage);
-  result += tagSize * count;
-  return result;
-}
-
-- (void)writeToCodedOutputStream:(GPBCodedOutputStream *)outputStream
-                         asField:(GPBFieldDescriptor *)field {
-  GPBDataType valueDataType = GPBGetFieldDataType(field);
-  GPBDataType keyDataType = field.mapKeyDataType;
-  uint32_t tag = GPBWireFormatMakeTag(GPBFieldNumber(field), GPBWireFormatLengthDelimited);
-  NSDictionary *internal = _dictionary;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    [outputStream writeInt32NoTag:tag];
-    // Write the size of the message.
-    int64_t unwrappedKey = [aKey longLongValue];
-    int64_t unwrappedValue = [aValue longLongValue];
-    size_t msgSize = ComputeDictInt64FieldSize(unwrappedKey, kMapKeyFieldNumber, keyDataType);
-    msgSize += ComputeDictInt64FieldSize(unwrappedValue, kMapValueFieldNumber, valueDataType);
-    [outputStream writeInt32NoTag:(int32_t)msgSize];
-    // Write the fields.
-    WriteDictInt64Field(outputStream, unwrappedKey, kMapKeyFieldNumber, keyDataType);
-    WriteDictInt64Field(outputStream, unwrappedValue, kMapValueFieldNumber, valueDataType);
-  }
-}
-
-- (void)setGPBGenericValue:(GPBGenericValue *)value
-     forGPBGenericValueKey:(GPBGenericValue *)key {
-  [_dictionary setObject:@(value->valueInt64) forKey:@(key->valueInt64)];
-}
-
-- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
-  [self enumerateKeysAndInt64sUsingBlock:^(int64_t key, int64_t value, BOOL *stop) {
-      #pragma unused(stop)
-      block([NSString stringWithFormat:@"%lld", key], [NSString stringWithFormat:@"%lld", value]);
-  }];
-}
-
-- (BOOL)getInt64:(nullable int64_t *)value forKey:(int64_t)key {
-  NSNumber *wrapped = [_dictionary objectForKey:@(key)];
-  if (wrapped && value) {
-    *value = [wrapped longLongValue];
-  }
-  return (wrapped != NULL);
-}
-
-- (void)addEntriesFromDictionary:(GPBInt64Int64Dictionary *)otherDictionary {
-  if (otherDictionary) {
-    [_dictionary addEntriesFromDictionary:otherDictionary->_dictionary];
-    if (_autocreator) {
-      GPBAutocreatedDictionaryModified(_autocreator, self);
-    }
-  }
-}
-
-- (void)setInt64:(int64_t)value forKey:(int64_t)key {
-  [_dictionary setObject:@(value) forKey:@(key)];
-  if (_autocreator) {
-    GPBAutocreatedDictionaryModified(_autocreator, self);
-  }
-}
-
-- (void)removeInt64ForKey:(int64_t)aKey {
-  [_dictionary removeObjectForKey:@(aKey)];
-}
-
-- (void)removeAll {
-  [_dictionary removeAllObjects];
-}
-
-@end
-
-#pragma mark - Int64 -> Bool
-
-@implementation GPBInt64BoolDictionary {
- @package
-  NSMutableDictionary *_dictionary;
-}
-
-- (instancetype)init {
-  return [self initWithBools:NULL forKeys:NULL count:0];
-}
-
-- (instancetype)initWithBools:(const BOOL [])values
-                      forKeys:(const int64_t [])keys
-                        count:(NSUInteger)count {
-  self = [super init];
-  if (self) {
-    _dictionary = [[NSMutableDictionary alloc] init];
-    if (count && values && keys) {
-      for (NSUInteger i = 0; i < count; ++i) {
-        [_dictionary setObject:@(values[i]) forKey:@(keys[i])];
-      }
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithDictionary:(GPBInt64BoolDictionary *)dictionary {
-  self = [self initWithBools:NULL forKeys:NULL count:0];
-  if (self) {
-    if (dictionary) {
-      [_dictionary addEntriesFromDictionary:dictionary->_dictionary];
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithCapacity:(NSUInteger)numItems {
-  #pragma unused(numItems)
-  return [self initWithBools:NULL forKeys:NULL count:0];
-}
-
-- (void)dealloc {
-  NSAssert(!_autocreator,
-           @"%@: Autocreator must be cleared before release, autocreator: %@",
-           [self class], _autocreator);
-  [_dictionary release];
-  [super dealloc];
-}
-
-- (instancetype)copyWithZone:(NSZone *)zone {
-  return [[GPBInt64BoolDictionary allocWithZone:zone] initWithDictionary:self];
-}
-
-- (BOOL)isEqual:(id)other {
-  if (self == other) {
-    return YES;
-  }
-  if (![other isKindOfClass:[GPBInt64BoolDictionary class]]) {
-    return NO;
-  }
-  GPBInt64BoolDictionary *otherDictionary = other;
-  return [_dictionary isEqual:otherDictionary->_dictionary];
-}
-
-- (NSUInteger)hash {
-  return _dictionary.count;
-}
-
-- (NSString *)description {
-  return [NSString stringWithFormat:@"<%@ %p> { %@ }", [self class], self, _dictionary];
-}
-
-- (NSUInteger)count {
-  return _dictionary.count;
-}
-
-- (void)enumerateKeysAndBoolsUsingBlock:
-    (void (NS_NOESCAPE ^)(int64_t key, BOOL value, BOOL *stop))block {
-  BOOL stop = NO;
-  NSDictionary *internal = _dictionary;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    block([aKey longLongValue], [aValue boolValue], &stop);
-    if (stop) {
-      break;
-    }
-  }
-}
-
-- (size_t)computeSerializedSizeAsField:(GPBFieldDescriptor *)field {
-  NSDictionary *internal = _dictionary;
-  NSUInteger count = internal.count;
-  if (count == 0) {
-    return 0;
-  }
-
-  GPBDataType valueDataType = GPBGetFieldDataType(field);
-  GPBDataType keyDataType = field.mapKeyDataType;
-  size_t result = 0;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    size_t msgSize = ComputeDictInt64FieldSize([aKey longLongValue], kMapKeyFieldNumber, keyDataType);
-    msgSize += ComputeDictBoolFieldSize([aValue boolValue], kMapValueFieldNumber, valueDataType);
-    result += GPBComputeRawVarint32SizeForInteger(msgSize) + msgSize;
-  }
-  size_t tagSize = GPBComputeWireFormatTagSize(GPBFieldNumber(field), GPBDataTypeMessage);
-  result += tagSize * count;
-  return result;
-}
-
-- (void)writeToCodedOutputStream:(GPBCodedOutputStream *)outputStream
-                         asField:(GPBFieldDescriptor *)field {
-  GPBDataType valueDataType = GPBGetFieldDataType(field);
-  GPBDataType keyDataType = field.mapKeyDataType;
-  uint32_t tag = GPBWireFormatMakeTag(GPBFieldNumber(field), GPBWireFormatLengthDelimited);
-  NSDictionary *internal = _dictionary;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    [outputStream writeInt32NoTag:tag];
-    // Write the size of the message.
-    int64_t unwrappedKey = [aKey longLongValue];
-    BOOL unwrappedValue = [aValue boolValue];
-    size_t msgSize = ComputeDictInt64FieldSize(unwrappedKey, kMapKeyFieldNumber, keyDataType);
-    msgSize += ComputeDictBoolFieldSize(unwrappedValue, kMapValueFieldNumber, valueDataType);
-    [outputStream writeInt32NoTag:(int32_t)msgSize];
-    // Write the fields.
-    WriteDictInt64Field(outputStream, unwrappedKey, kMapKeyFieldNumber, keyDataType);
-    WriteDictBoolField(outputStream, unwrappedValue, kMapValueFieldNumber, valueDataType);
-  }
-}
-
-- (void)setGPBGenericValue:(GPBGenericValue *)value
-     forGPBGenericValueKey:(GPBGenericValue *)key {
-  [_dictionary setObject:@(value->valueBool) forKey:@(key->valueInt64)];
-}
-
-- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
-  [self enumerateKeysAndBoolsUsingBlock:^(int64_t key, BOOL value, BOOL *stop) {
-      #pragma unused(stop)
-      block([NSString stringWithFormat:@"%lld", key], (value ? @"true" : @"false"));
-  }];
-}
-
-- (BOOL)getBool:(nullable BOOL *)value forKey:(int64_t)key {
-  NSNumber *wrapped = [_dictionary objectForKey:@(key)];
-  if (wrapped && value) {
-    *value = [wrapped boolValue];
-  }
-  return (wrapped != NULL);
-}
-
-- (void)addEntriesFromDictionary:(GPBInt64BoolDictionary *)otherDictionary {
-  if (otherDictionary) {
-    [_dictionary addEntriesFromDictionary:otherDictionary->_dictionary];
-    if (_autocreator) {
-      GPBAutocreatedDictionaryModified(_autocreator, self);
-    }
-  }
-}
-
-- (void)setBool:(BOOL)value forKey:(int64_t)key {
-  [_dictionary setObject:@(value) forKey:@(key)];
-  if (_autocreator) {
-    GPBAutocreatedDictionaryModified(_autocreator, self);
-  }
-}
-
-- (void)removeBoolForKey:(int64_t)aKey {
-  [_dictionary removeObjectForKey:@(aKey)];
-}
-
-- (void)removeAll {
-  [_dictionary removeAllObjects];
-}
-
-@end
-
-#pragma mark - Int64 -> Float
-
-@implementation GPBInt64FloatDictionary {
- @package
-  NSMutableDictionary *_dictionary;
-}
-
-- (instancetype)init {
-  return [self initWithFloats:NULL forKeys:NULL count:0];
-}
-
-- (instancetype)initWithFloats:(const float [])values
-                       forKeys:(const int64_t [])keys
-                         count:(NSUInteger)count {
-  self = [super init];
-  if (self) {
-    _dictionary = [[NSMutableDictionary alloc] init];
-    if (count && values && keys) {
-      for (NSUInteger i = 0; i < count; ++i) {
-        [_dictionary setObject:@(values[i]) forKey:@(keys[i])];
-      }
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithDictionary:(GPBInt64FloatDictionary *)dictionary {
-  self = [self initWithFloats:NULL forKeys:NULL count:0];
-  if (self) {
-    if (dictionary) {
-      [_dictionary addEntriesFromDictionary:dictionary->_dictionary];
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithCapacity:(NSUInteger)numItems {
-  #pragma unused(numItems)
-  return [self initWithFloats:NULL forKeys:NULL count:0];
-}
-
-- (void)dealloc {
-  NSAssert(!_autocreator,
-           @"%@: Autocreator must be cleared before release, autocreator: %@",
-           [self class], _autocreator);
-  [_dictionary release];
-  [super dealloc];
-}
-
-- (instancetype)copyWithZone:(NSZone *)zone {
-  return [[GPBInt64FloatDictionary allocWithZone:zone] initWithDictionary:self];
-}
-
-- (BOOL)isEqual:(id)other {
-  if (self == other) {
-    return YES;
-  }
-  if (![other isKindOfClass:[GPBInt64FloatDictionary class]]) {
-    return NO;
-  }
-  GPBInt64FloatDictionary *otherDictionary = other;
-  return [_dictionary isEqual:otherDictionary->_dictionary];
-}
-
-- (NSUInteger)hash {
-  return _dictionary.count;
-}
-
-- (NSString *)description {
-  return [NSString stringWithFormat:@"<%@ %p> { %@ }", [self class], self, _dictionary];
-}
-
-- (NSUInteger)count {
-  return _dictionary.count;
-}
-
-- (void)enumerateKeysAndFloatsUsingBlock:
-    (void (NS_NOESCAPE ^)(int64_t key, float value, BOOL *stop))block {
-  BOOL stop = NO;
-  NSDictionary *internal = _dictionary;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    block([aKey longLongValue], [aValue floatValue], &stop);
-    if (stop) {
-      break;
-    }
-  }
-}
-
-- (size_t)computeSerializedSizeAsField:(GPBFieldDescriptor *)field {
-  NSDictionary *internal = _dictionary;
-  NSUInteger count = internal.count;
-  if (count == 0) {
-    return 0;
-  }
-
-  GPBDataType valueDataType = GPBGetFieldDataType(field);
-  GPBDataType keyDataType = field.mapKeyDataType;
-  size_t result = 0;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    size_t msgSize = ComputeDictInt64FieldSize([aKey longLongValue], kMapKeyFieldNumber, keyDataType);
-    msgSize += ComputeDictFloatFieldSize([aValue floatValue], kMapValueFieldNumber, valueDataType);
-    result += GPBComputeRawVarint32SizeForInteger(msgSize) + msgSize;
-  }
-  size_t tagSize = GPBComputeWireFormatTagSize(GPBFieldNumber(field), GPBDataTypeMessage);
-  result += tagSize * count;
-  return result;
-}
-
-- (void)writeToCodedOutputStream:(GPBCodedOutputStream *)outputStream
-                         asField:(GPBFieldDescriptor *)field {
-  GPBDataType valueDataType = GPBGetFieldDataType(field);
-  GPBDataType keyDataType = field.mapKeyDataType;
-  uint32_t tag = GPBWireFormatMakeTag(GPBFieldNumber(field), GPBWireFormatLengthDelimited);
-  NSDictionary *internal = _dictionary;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    [outputStream writeInt32NoTag:tag];
-    // Write the size of the message.
-    int64_t unwrappedKey = [aKey longLongValue];
-    float unwrappedValue = [aValue floatValue];
-    size_t msgSize = ComputeDictInt64FieldSize(unwrappedKey, kMapKeyFieldNumber, keyDataType);
-    msgSize += ComputeDictFloatFieldSize(unwrappedValue, kMapValueFieldNumber, valueDataType);
-    [outputStream writeInt32NoTag:(int32_t)msgSize];
-    // Write the fields.
-    WriteDictInt64Field(outputStream, unwrappedKey, kMapKeyFieldNumber, keyDataType);
-    WriteDictFloatField(outputStream, unwrappedValue, kMapValueFieldNumber, valueDataType);
-  }
-}
-
-- (void)setGPBGenericValue:(GPBGenericValue *)value
-     forGPBGenericValueKey:(GPBGenericValue *)key {
-  [_dictionary setObject:@(value->valueFloat) forKey:@(key->valueInt64)];
-}
-
-- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
-  [self enumerateKeysAndFloatsUsingBlock:^(int64_t key, float value, BOOL *stop) {
-      #pragma unused(stop)
-      block([NSString stringWithFormat:@"%lld", key], [NSString stringWithFormat:@"%.*g", FLT_DIG, value]);
-  }];
-}
-
-- (BOOL)getFloat:(nullable float *)value forKey:(int64_t)key {
-  NSNumber *wrapped = [_dictionary objectForKey:@(key)];
-  if (wrapped && value) {
-    *value = [wrapped floatValue];
-  }
-  return (wrapped != NULL);
-}
-
-- (void)addEntriesFromDictionary:(GPBInt64FloatDictionary *)otherDictionary {
-  if (otherDictionary) {
-    [_dictionary addEntriesFromDictionary:otherDictionary->_dictionary];
-    if (_autocreator) {
-      GPBAutocreatedDictionaryModified(_autocreator, self);
-    }
-  }
-}
-
-- (void)setFloat:(float)value forKey:(int64_t)key {
-  [_dictionary setObject:@(value) forKey:@(key)];
-  if (_autocreator) {
-    GPBAutocreatedDictionaryModified(_autocreator, self);
-  }
-}
-
-- (void)removeFloatForKey:(int64_t)aKey {
-  [_dictionary removeObjectForKey:@(aKey)];
-}
-
-- (void)removeAll {
-  [_dictionary removeAllObjects];
-}
-
-@end
-
-#pragma mark - Int64 -> Double
-
-@implementation GPBInt64DoubleDictionary {
- @package
-  NSMutableDictionary *_dictionary;
-}
-
-- (instancetype)init {
-  return [self initWithDoubles:NULL forKeys:NULL count:0];
-}
-
-- (instancetype)initWithDoubles:(const double [])values
-                        forKeys:(const int64_t [])keys
-                          count:(NSUInteger)count {
-  self = [super init];
-  if (self) {
-    _dictionary = [[NSMutableDictionary alloc] init];
-    if (count && values && keys) {
-      for (NSUInteger i = 0; i < count; ++i) {
-        [_dictionary setObject:@(values[i]) forKey:@(keys[i])];
-      }
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithDictionary:(GPBInt64DoubleDictionary *)dictionary {
-  self = [self initWithDoubles:NULL forKeys:NULL count:0];
-  if (self) {
-    if (dictionary) {
-      [_dictionary addEntriesFromDictionary:dictionary->_dictionary];
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithCapacity:(NSUInteger)numItems {
-  #pragma unused(numItems)
-  return [self initWithDoubles:NULL forKeys:NULL count:0];
-}
-
-- (void)dealloc {
-  NSAssert(!_autocreator,
-           @"%@: Autocreator must be cleared before release, autocreator: %@",
-           [self class], _autocreator);
-  [_dictionary release];
-  [super dealloc];
-}
-
-- (instancetype)copyWithZone:(NSZone *)zone {
-  return [[GPBInt64DoubleDictionary allocWithZone:zone] initWithDictionary:self];
-}
-
-- (BOOL)isEqual:(id)other {
-  if (self == other) {
-    return YES;
-  }
-  if (![other isKindOfClass:[GPBInt64DoubleDictionary class]]) {
-    return NO;
-  }
-  GPBInt64DoubleDictionary *otherDictionary = other;
-  return [_dictionary isEqual:otherDictionary->_dictionary];
-}
-
-- (NSUInteger)hash {
-  return _dictionary.count;
-}
-
-- (NSString *)description {
-  return [NSString stringWithFormat:@"<%@ %p> { %@ }", [self class], self, _dictionary];
-}
-
-- (NSUInteger)count {
-  return _dictionary.count;
-}
-
-- (void)enumerateKeysAndDoublesUsingBlock:
-    (void (NS_NOESCAPE ^)(int64_t key, double value, BOOL *stop))block {
-  BOOL stop = NO;
-  NSDictionary *internal = _dictionary;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    block([aKey longLongValue], [aValue doubleValue], &stop);
-    if (stop) {
-      break;
-    }
-  }
-}
-
-- (size_t)computeSerializedSizeAsField:(GPBFieldDescriptor *)field {
-  NSDictionary *internal = _dictionary;
-  NSUInteger count = internal.count;
-  if (count == 0) {
-    return 0;
-  }
-
-  GPBDataType valueDataType = GPBGetFieldDataType(field);
-  GPBDataType keyDataType = field.mapKeyDataType;
-  size_t result = 0;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    size_t msgSize = ComputeDictInt64FieldSize([aKey longLongValue], kMapKeyFieldNumber, keyDataType);
-    msgSize += ComputeDictDoubleFieldSize([aValue doubleValue], kMapValueFieldNumber, valueDataType);
-    result += GPBComputeRawVarint32SizeForInteger(msgSize) + msgSize;
-  }
-  size_t tagSize = GPBComputeWireFormatTagSize(GPBFieldNumber(field), GPBDataTypeMessage);
-  result += tagSize * count;
-  return result;
-}
-
-- (void)writeToCodedOutputStream:(GPBCodedOutputStream *)outputStream
-                         asField:(GPBFieldDescriptor *)field {
-  GPBDataType valueDataType = GPBGetFieldDataType(field);
-  GPBDataType keyDataType = field.mapKeyDataType;
-  uint32_t tag = GPBWireFormatMakeTag(GPBFieldNumber(field), GPBWireFormatLengthDelimited);
-  NSDictionary *internal = _dictionary;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    [outputStream writeInt32NoTag:tag];
-    // Write the size of the message.
-    int64_t unwrappedKey = [aKey longLongValue];
-    double unwrappedValue = [aValue doubleValue];
-    size_t msgSize = ComputeDictInt64FieldSize(unwrappedKey, kMapKeyFieldNumber, keyDataType);
-    msgSize += ComputeDictDoubleFieldSize(unwrappedValue, kMapValueFieldNumber, valueDataType);
-    [outputStream writeInt32NoTag:(int32_t)msgSize];
-    // Write the fields.
-    WriteDictInt64Field(outputStream, unwrappedKey, kMapKeyFieldNumber, keyDataType);
-    WriteDictDoubleField(outputStream, unwrappedValue, kMapValueFieldNumber, valueDataType);
-  }
-}
-
-- (void)setGPBGenericValue:(GPBGenericValue *)value
-     forGPBGenericValueKey:(GPBGenericValue *)key {
-  [_dictionary setObject:@(value->valueDouble) forKey:@(key->valueInt64)];
-}
-
-- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
-  [self enumerateKeysAndDoublesUsingBlock:^(int64_t key, double value, BOOL *stop) {
-      #pragma unused(stop)
-      block([NSString stringWithFormat:@"%lld", key], [NSString stringWithFormat:@"%.*lg", DBL_DIG, value]);
-  }];
-}
-
-- (BOOL)getDouble:(nullable double *)value forKey:(int64_t)key {
-  NSNumber *wrapped = [_dictionary objectForKey:@(key)];
-  if (wrapped && value) {
-    *value = [wrapped doubleValue];
-  }
-  return (wrapped != NULL);
-}
-
-- (void)addEntriesFromDictionary:(GPBInt64DoubleDictionary *)otherDictionary {
-  if (otherDictionary) {
-    [_dictionary addEntriesFromDictionary:otherDictionary->_dictionary];
-    if (_autocreator) {
-      GPBAutocreatedDictionaryModified(_autocreator, self);
-    }
-  }
-}
-
-- (void)setDouble:(double)value forKey:(int64_t)key {
-  [_dictionary setObject:@(value) forKey:@(key)];
-  if (_autocreator) {
-    GPBAutocreatedDictionaryModified(_autocreator, self);
-  }
-}
-
-- (void)removeDoubleForKey:(int64_t)aKey {
-  [_dictionary removeObjectForKey:@(aKey)];
-}
-
-- (void)removeAll {
-  [_dictionary removeAllObjects];
-}
-
-@end
-
-#pragma mark - Int64 -> Enum
-
-@implementation GPBInt64EnumDictionary {
- @package
-  NSMutableDictionary *_dictionary;
-  GPBEnumValidationFunc _validationFunc;
-}
-
-@synthesize validationFunc = _validationFunc;
-
-- (instancetype)init {
-  return [self initWithValidationFunction:NULL rawValues:NULL forKeys:NULL count:0];
-}
-
-- (instancetype)initWithValidationFunction:(GPBEnumValidationFunc)func {
-  return [self initWithValidationFunction:func rawValues:NULL forKeys:NULL count:0];
-}
-
-- (instancetype)initWithValidationFunction:(GPBEnumValidationFunc)func
-                                 rawValues:(const int32_t [])rawValues
-                                   forKeys:(const int64_t [])keys
-                                     count:(NSUInteger)count {
-  self = [super init];
-  if (self) {
-    _dictionary = [[NSMutableDictionary alloc] init];
-    _validationFunc = (func != NULL ? func : DictDefault_IsValidValue);
-    if (count && rawValues && keys) {
-      for (NSUInteger i = 0; i < count; ++i) {
-        [_dictionary setObject:@(rawValues[i]) forKey:@(keys[i])];
-      }
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithDictionary:(GPBInt64EnumDictionary *)dictionary {
-  self = [self initWithValidationFunction:dictionary.validationFunc
-                                rawValues:NULL
-                                  forKeys:NULL
-                                    count:0];
-  if (self) {
-    if (dictionary) {
-      [_dictionary addEntriesFromDictionary:dictionary->_dictionary];
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithValidationFunction:(GPBEnumValidationFunc)func
-                                  capacity:(NSUInteger)numItems {
-  #pragma unused(numItems)
-  return [self initWithValidationFunction:func rawValues:NULL forKeys:NULL count:0];
-}
-
-- (void)dealloc {
-  NSAssert(!_autocreator,
-           @"%@: Autocreator must be cleared before release, autocreator: %@",
-           [self class], _autocreator);
-  [_dictionary release];
-  [super dealloc];
-}
-
-- (instancetype)copyWithZone:(NSZone *)zone {
-  return [[GPBInt64EnumDictionary allocWithZone:zone] initWithDictionary:self];
-}
-
-- (BOOL)isEqual:(id)other {
-  if (self == other) {
-    return YES;
-  }
-  if (![other isKindOfClass:[GPBInt64EnumDictionary class]]) {
-    return NO;
-  }
-  GPBInt64EnumDictionary *otherDictionary = other;
-  return [_dictionary isEqual:otherDictionary->_dictionary];
-}
-
-- (NSUInteger)hash {
-  return _dictionary.count;
-}
-
-- (NSString *)description {
-  return [NSString stringWithFormat:@"<%@ %p> { %@ }", [self class], self, _dictionary];
-}
-
-- (NSUInteger)count {
-  return _dictionary.count;
-}
-
-- (void)enumerateKeysAndRawValuesUsingBlock:
-    (void (NS_NOESCAPE ^)(int64_t key, int32_t value, BOOL *stop))block {
-  BOOL stop = NO;
-  NSDictionary *internal = _dictionary;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    block([aKey longLongValue], [aValue intValue], &stop);
-    if (stop) {
-      break;
-    }
-  }
-}
-
-- (size_t)computeSerializedSizeAsField:(GPBFieldDescriptor *)field {
-  NSDictionary *internal = _dictionary;
-  NSUInteger count = internal.count;
-  if (count == 0) {
-    return 0;
-  }
-
-  GPBDataType valueDataType = GPBGetFieldDataType(field);
-  GPBDataType keyDataType = field.mapKeyDataType;
-  size_t result = 0;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    size_t msgSize = ComputeDictInt64FieldSize([aKey longLongValue], kMapKeyFieldNumber, keyDataType);
-    msgSize += ComputeDictEnumFieldSize([aValue intValue], kMapValueFieldNumber, valueDataType);
-    result += GPBComputeRawVarint32SizeForInteger(msgSize) + msgSize;
-  }
-  size_t tagSize = GPBComputeWireFormatTagSize(GPBFieldNumber(field), GPBDataTypeMessage);
-  result += tagSize * count;
-  return result;
-}
-
-- (void)writeToCodedOutputStream:(GPBCodedOutputStream *)outputStream
-                         asField:(GPBFieldDescriptor *)field {
-  GPBDataType valueDataType = GPBGetFieldDataType(field);
-  GPBDataType keyDataType = field.mapKeyDataType;
-  uint32_t tag = GPBWireFormatMakeTag(GPBFieldNumber(field), GPBWireFormatLengthDelimited);
-  NSDictionary *internal = _dictionary;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    [outputStream writeInt32NoTag:tag];
-    // Write the size of the message.
-    int64_t unwrappedKey = [aKey longLongValue];
-    int32_t unwrappedValue = [aValue intValue];
-    size_t msgSize = ComputeDictInt64FieldSize(unwrappedKey, kMapKeyFieldNumber, keyDataType);
-    msgSize += ComputeDictEnumFieldSize(unwrappedValue, kMapValueFieldNumber, valueDataType);
-    [outputStream writeInt32NoTag:(int32_t)msgSize];
-    // Write the fields.
-    WriteDictInt64Field(outputStream, unwrappedKey, kMapKeyFieldNumber, keyDataType);
-    WriteDictEnumField(outputStream, unwrappedValue, kMapValueFieldNumber, valueDataType);
-  }
-}
-
-- (NSData *)serializedDataForUnknownValue:(int32_t)value
-                                   forKey:(GPBGenericValue *)key
-                              keyDataType:(GPBDataType)keyDataType {
-  size_t msgSize = ComputeDictInt64FieldSize(key->valueInt64, kMapKeyFieldNumber, keyDataType);
-  msgSize += ComputeDictEnumFieldSize(value, kMapValueFieldNumber, GPBDataTypeEnum);
-  NSMutableData *data = [NSMutableData dataWithLength:msgSize];
-  GPBCodedOutputStream *outputStream = [[GPBCodedOutputStream alloc] initWithData:data];
-  WriteDictInt64Field(outputStream, key->valueInt64, kMapKeyFieldNumber, keyDataType);
-  WriteDictEnumField(outputStream, value, kMapValueFieldNumber, GPBDataTypeEnum);
-  [outputStream release];
-  return data;
-}
-- (void)setGPBGenericValue:(GPBGenericValue *)value
-     forGPBGenericValueKey:(GPBGenericValue *)key {
-  [_dictionary setObject:@(value->valueEnum) forKey:@(key->valueInt64)];
-}
-
-- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
-  [self enumerateKeysAndRawValuesUsingBlock:^(int64_t key, int32_t value, BOOL *stop) {
-      #pragma unused(stop)
-      block([NSString stringWithFormat:@"%lld", key], @(value));
-  }];
-}
-
-- (BOOL)getEnum:(int32_t *)value forKey:(int64_t)key {
-  NSNumber *wrapped = [_dictionary objectForKey:@(key)];
-  if (wrapped && value) {
-    int32_t result = [wrapped intValue];
-    if (!_validationFunc(result)) {
-      result = kGPBUnrecognizedEnumeratorValue;
-    }
-    *value = result;
-  }
-  return (wrapped != NULL);
-}
-
-- (BOOL)getRawValue:(int32_t *)rawValue forKey:(int64_t)key {
-  NSNumber *wrapped = [_dictionary objectForKey:@(key)];
-  if (wrapped && rawValue) {
-    *rawValue = [wrapped intValue];
-  }
-  return (wrapped != NULL);
-}
-
-- (void)enumerateKeysAndEnumsUsingBlock:
-    (void (NS_NOESCAPE ^)(int64_t key, int32_t value, BOOL *stop))block {
-  GPBEnumValidationFunc func = _validationFunc;
-  BOOL stop = NO;
-  NSEnumerator *keys = [_dictionary keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = _dictionary[aKey];
-      int32_t unwrapped = [aValue intValue];
-      if (!func(unwrapped)) {
-        unwrapped = kGPBUnrecognizedEnumeratorValue;
-      }
-    block([aKey longLongValue], unwrapped, &stop);
-    if (stop) {
-      break;
-    }
-  }
-}
-
-- (void)addRawEntriesFromDictionary:(GPBInt64EnumDictionary *)otherDictionary {
-  if (otherDictionary) {
-    [_dictionary addEntriesFromDictionary:otherDictionary->_dictionary];
-    if (_autocreator) {
-      GPBAutocreatedDictionaryModified(_autocreator, self);
-    }
-  }
-}
-
-- (void)setRawValue:(int32_t)value forKey:(int64_t)key {
-  [_dictionary setObject:@(value) forKey:@(key)];
-  if (_autocreator) {
-    GPBAutocreatedDictionaryModified(_autocreator, self);
-  }
-}
-
-- (void)removeEnumForKey:(int64_t)aKey {
-  [_dictionary removeObjectForKey:@(aKey)];
-}
-
-- (void)removeAll {
-  [_dictionary removeAllObjects];
-}
-
-- (void)setEnum:(int32_t)value forKey:(int64_t)key {
-  if (!_validationFunc(value)) {
-    [NSException raise:NSInvalidArgumentException
-                format:@"GPBInt64EnumDictionary: Attempt to set an unknown enum value (%d)",
-                       value];
-  }
-
-  [_dictionary setObject:@(value) forKey:@(key)];
-  if (_autocreator) {
-    GPBAutocreatedDictionaryModified(_autocreator, self);
-  }
-}
-
-@end
-
-#pragma mark - Int64 -> Object
-
-@implementation GPBInt64ObjectDictionary {
- @package
-  NSMutableDictionary *_dictionary;
-}
-
-- (instancetype)init {
-  return [self initWithObjects:NULL forKeys:NULL count:0];
-}
-
-- (instancetype)initWithObjects:(const id [])objects
-                        forKeys:(const int64_t [])keys
-                          count:(NSUInteger)count {
-  self = [super init];
-  if (self) {
-    _dictionary = [[NSMutableDictionary alloc] init];
-    if (count && objects && keys) {
-      for (NSUInteger i = 0; i < count; ++i) {
-        if (!objects[i]) {
-          [NSException raise:NSInvalidArgumentException
-                      format:@"Attempting to add nil object to a Dictionary"];
-        }
-        [_dictionary setObject:objects[i] forKey:@(keys[i])];
-      }
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithDictionary:(GPBInt64ObjectDictionary *)dictionary {
-  self = [self initWithObjects:NULL forKeys:NULL count:0];
-  if (self) {
-    if (dictionary) {
-      [_dictionary addEntriesFromDictionary:dictionary->_dictionary];
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithCapacity:(NSUInteger)numItems {
-  #pragma unused(numItems)
-  return [self initWithObjects:NULL forKeys:NULL count:0];
-}
-
-- (void)dealloc {
-  NSAssert(!_autocreator,
-           @"%@: Autocreator must be cleared before release, autocreator: %@",
-           [self class], _autocreator);
-  [_dictionary release];
-  [super dealloc];
-}
-
-- (instancetype)copyWithZone:(NSZone *)zone {
-  return [[GPBInt64ObjectDictionary allocWithZone:zone] initWithDictionary:self];
-}
-
-- (BOOL)isEqual:(id)other {
-  if (self == other) {
-    return YES;
-  }
-  if (![other isKindOfClass:[GPBInt64ObjectDictionary class]]) {
-    return NO;
-  }
-  GPBInt64ObjectDictionary *otherDictionary = other;
-  return [_dictionary isEqual:otherDictionary->_dictionary];
-}
-
-- (NSUInteger)hash {
-  return _dictionary.count;
-}
-
-- (NSString *)description {
-  return [NSString stringWithFormat:@"<%@ %p> { %@ }", [self class], self, _dictionary];
-}
-
-- (NSUInteger)count {
-  return _dictionary.count;
-}
-
-- (void)enumerateKeysAndObjectsUsingBlock:
-    (void (NS_NOESCAPE ^)(int64_t key, id object, BOOL *stop))block {
-  BOOL stop = NO;
-  NSDictionary *internal = _dictionary;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    id aObject = internal[aKey];
-    block([aKey longLongValue], aObject, &stop);
-    if (stop) {
-      break;
-    }
-  }
-}
-
-- (BOOL)isInitialized {
-  for (GPBMessage *msg in [_dictionary objectEnumerator]) {
-    if (!msg.initialized) {
-      return NO;
-    }
-  }
-  return YES;
-}
-
-- (instancetype)deepCopyWithZone:(NSZone *)zone {
-  GPBInt64ObjectDictionary *newDict =
-      [[GPBInt64ObjectDictionary alloc] init];
-  NSEnumerator *keys = [_dictionary keyEnumerator];
-  id aKey;
-  NSMutableDictionary *internalDict = newDict->_dictionary;
-  while ((aKey = [keys nextObject])) {
-    GPBMessage *msg = _dictionary[aKey];
-    GPBMessage *copiedMsg = [msg copyWithZone:zone];
-    [internalDict setObject:copiedMsg forKey:aKey];
-    [copiedMsg release];
-  }
-  return newDict;
-}
-
-- (size_t)computeSerializedSizeAsField:(GPBFieldDescriptor *)field {
-  NSDictionary *internal = _dictionary;
-  NSUInteger count = internal.count;
-  if (count == 0) {
-    return 0;
-  }
-
-  GPBDataType valueDataType = GPBGetFieldDataType(field);
-  GPBDataType keyDataType = field.mapKeyDataType;
-  size_t result = 0;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    id aObject = internal[aKey];
-    size_t msgSize = ComputeDictInt64FieldSize([aKey longLongValue], kMapKeyFieldNumber, keyDataType);
-    msgSize += ComputeDictObjectFieldSize(aObject, kMapValueFieldNumber, valueDataType);
-    result += GPBComputeRawVarint32SizeForInteger(msgSize) + msgSize;
-  }
-  size_t tagSize = GPBComputeWireFormatTagSize(GPBFieldNumber(field), GPBDataTypeMessage);
-  result += tagSize * count;
-  return result;
-}
-
-- (void)writeToCodedOutputStream:(GPBCodedOutputStream *)outputStream
-                         asField:(GPBFieldDescriptor *)field {
-  GPBDataType valueDataType = GPBGetFieldDataType(field);
-  GPBDataType keyDataType = field.mapKeyDataType;
-  uint32_t tag = GPBWireFormatMakeTag(GPBFieldNumber(field), GPBWireFormatLengthDelimited);
-  NSDictionary *internal = _dictionary;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSNumber *aKey;
-  while ((aKey = [keys nextObject])) {
-    id aObject = internal[aKey];
-    [outputStream writeInt32NoTag:tag];
-    // Write the size of the message.
-    int64_t unwrappedKey = [aKey longLongValue];
-    id unwrappedValue = aObject;
-    size_t msgSize = ComputeDictInt64FieldSize(unwrappedKey, kMapKeyFieldNumber, keyDataType);
-    msgSize += ComputeDictObjectFieldSize(unwrappedValue, kMapValueFieldNumber, valueDataType);
-    [outputStream writeInt32NoTag:(int32_t)msgSize];
-    // Write the fields.
-    WriteDictInt64Field(outputStream, unwrappedKey, kMapKeyFieldNumber, keyDataType);
-    WriteDictObjectField(outputStream, unwrappedValue, kMapValueFieldNumber, valueDataType);
-  }
-}
-
-- (void)setGPBGenericValue:(GPBGenericValue *)value
-     forGPBGenericValueKey:(GPBGenericValue *)key {
-  [_dictionary setObject:value->valueString forKey:@(key->valueInt64)];
-}
-
-- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
-  [self enumerateKeysAndObjectsUsingBlock:^(int64_t key, id object, BOOL *stop) {
-      #pragma unused(stop)
-      block([NSString stringWithFormat:@"%lld", key], object);
-  }];
-}
-
-- (id)objectForKey:(int64_t)key {
-  id result = [_dictionary objectForKey:@(key)];
-  return result;
-}
-
-- (void)addEntriesFromDictionary:(GPBInt64ObjectDictionary *)otherDictionary {
-  if (otherDictionary) {
-    [_dictionary addEntriesFromDictionary:otherDictionary->_dictionary];
-    if (_autocreator) {
-      GPBAutocreatedDictionaryModified(_autocreator, self);
-    }
-  }
-}
-
-- (void)setObject:(id)object forKey:(int64_t)key {
-  if (!object) {
-    [NSException raise:NSInvalidArgumentException
-                format:@"Attempting to add nil object to a Dictionary"];
-  }
-  [_dictionary setObject:object forKey:@(key)];
-  if (_autocreator) {
-    GPBAutocreatedDictionaryModified(_autocreator, self);
-  }
-}
-
-- (void)removeObjectForKey:(int64_t)aKey {
-  [_dictionary removeObjectForKey:@(aKey)];
-}
-
-- (void)removeAll {
-  [_dictionary removeAllObjects];
-}
-
-@end
-
-// clang-format on
-//%PDDM-EXPAND DICTIONARY_POD_IMPL_FOR_KEY(String, NSString, *, OBJECT)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-#pragma mark - String -> UInt32
-
-@implementation GPBStringUInt32Dictionary {
- @package
-  NSMutableDictionary *_dictionary;
-}
-
-- (instancetype)init {
-  return [self initWithUInt32s:NULL forKeys:NULL count:0];
-}
-
-- (instancetype)initWithUInt32s:(const uint32_t [])values
-                        forKeys:(const NSString * [])keys
-                          count:(NSUInteger)count {
-  self = [super init];
-  if (self) {
-    _dictionary = [[NSMutableDictionary alloc] init];
-    if (count && values && keys) {
-      for (NSUInteger i = 0; i < count; ++i) {
-        if (!keys[i]) {
-          [NSException raise:NSInvalidArgumentException
-                      format:@"Attempting to add nil key to a Dictionary"];
-        }
-        [_dictionary setObject:@(values[i]) forKey:keys[i]];
-      }
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithDictionary:(GPBStringUInt32Dictionary *)dictionary {
-  self = [self initWithUInt32s:NULL forKeys:NULL count:0];
-  if (self) {
-    if (dictionary) {
-      [_dictionary addEntriesFromDictionary:dictionary->_dictionary];
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithCapacity:(NSUInteger)numItems {
-  #pragma unused(numItems)
-  return [self initWithUInt32s:NULL forKeys:NULL count:0];
-}
-
-- (void)dealloc {
-  NSAssert(!_autocreator,
-           @"%@: Autocreator must be cleared before release, autocreator: %@",
-           [self class], _autocreator);
-  [_dictionary release];
-  [super dealloc];
-}
-
-- (instancetype)copyWithZone:(NSZone *)zone {
-  return [[GPBStringUInt32Dictionary allocWithZone:zone] initWithDictionary:self];
-}
-
-- (BOOL)isEqual:(id)other {
-  if (self == other) {
-    return YES;
-  }
-  if (![other isKindOfClass:[GPBStringUInt32Dictionary class]]) {
-    return NO;
-  }
-  GPBStringUInt32Dictionary *otherDictionary = other;
-  return [_dictionary isEqual:otherDictionary->_dictionary];
-}
-
-- (NSUInteger)hash {
-  return _dictionary.count;
-}
-
-- (NSString *)description {
-  return [NSString stringWithFormat:@"<%@ %p> { %@ }", [self class], self, _dictionary];
-}
-
-- (NSUInteger)count {
-  return _dictionary.count;
-}
-
-- (void)enumerateKeysAndUInt32sUsingBlock:
-    (void (NS_NOESCAPE ^)(NSString *key, uint32_t value, BOOL *stop))block {
-  BOOL stop = NO;
-  NSDictionary *internal = _dictionary;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSString *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    block(aKey, [aValue unsignedIntValue], &stop);
-    if (stop) {
-      break;
-    }
-  }
-}
-
-- (size_t)computeSerializedSizeAsField:(GPBFieldDescriptor *)field {
-  NSDictionary *internal = _dictionary;
-  NSUInteger count = internal.count;
-  if (count == 0) {
-    return 0;
-  }
-
-  GPBDataType valueDataType = GPBGetFieldDataType(field);
-  GPBDataType keyDataType = field.mapKeyDataType;
-  size_t result = 0;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSString *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    size_t msgSize = ComputeDictStringFieldSize(aKey, kMapKeyFieldNumber, keyDataType);
-    msgSize += ComputeDictUInt32FieldSize([aValue unsignedIntValue], kMapValueFieldNumber, valueDataType);
-    result += GPBComputeRawVarint32SizeForInteger(msgSize) + msgSize;
-  }
-  size_t tagSize = GPBComputeWireFormatTagSize(GPBFieldNumber(field), GPBDataTypeMessage);
-  result += tagSize * count;
-  return result;
-}
-
-- (void)writeToCodedOutputStream:(GPBCodedOutputStream *)outputStream
-                         asField:(GPBFieldDescriptor *)field {
-  GPBDataType valueDataType = GPBGetFieldDataType(field);
-  GPBDataType keyDataType = field.mapKeyDataType;
-  uint32_t tag = GPBWireFormatMakeTag(GPBFieldNumber(field), GPBWireFormatLengthDelimited);
-  NSDictionary *internal = _dictionary;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSString *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    [outputStream writeInt32NoTag:tag];
-    // Write the size of the message.
-    NSString *unwrappedKey = aKey;
-    uint32_t unwrappedValue = [aValue unsignedIntValue];
-    size_t msgSize = ComputeDictStringFieldSize(unwrappedKey, kMapKeyFieldNumber, keyDataType);
-    msgSize += ComputeDictUInt32FieldSize(unwrappedValue, kMapValueFieldNumber, valueDataType);
-    [outputStream writeInt32NoTag:(int32_t)msgSize];
-    // Write the fields.
-    WriteDictStringField(outputStream, unwrappedKey, kMapKeyFieldNumber, keyDataType);
-    WriteDictUInt32Field(outputStream, unwrappedValue, kMapValueFieldNumber, valueDataType);
-  }
-}
-
-- (void)setGPBGenericValue:(GPBGenericValue *)value
-     forGPBGenericValueKey:(GPBGenericValue *)key {
-  [_dictionary setObject:@(value->valueUInt32) forKey:key->valueString];
-}
-
-- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
-  [self enumerateKeysAndUInt32sUsingBlock:^(NSString *key, uint32_t value, BOOL *stop) {
-      #pragma unused(stop)
-      block(key, [NSString stringWithFormat:@"%u", value]);
-  }];
-}
-
-- (BOOL)getUInt32:(nullable uint32_t *)value forKey:(NSString *)key {
-  NSNumber *wrapped = [_dictionary objectForKey:key];
-  if (wrapped && value) {
-    *value = [wrapped unsignedIntValue];
-  }
-  return (wrapped != NULL);
-}
-
-- (void)addEntriesFromDictionary:(GPBStringUInt32Dictionary *)otherDictionary {
-  if (otherDictionary) {
-    [_dictionary addEntriesFromDictionary:otherDictionary->_dictionary];
-    if (_autocreator) {
-      GPBAutocreatedDictionaryModified(_autocreator, self);
-    }
-  }
-}
-
-- (void)setUInt32:(uint32_t)value forKey:(NSString *)key {
-  if (!key) {
-    [NSException raise:NSInvalidArgumentException
-                format:@"Attempting to add nil key to a Dictionary"];
-  }
-  [_dictionary setObject:@(value) forKey:key];
-  if (_autocreator) {
-    GPBAutocreatedDictionaryModified(_autocreator, self);
-  }
-}
-
-- (void)removeUInt32ForKey:(NSString *)aKey {
-  [_dictionary removeObjectForKey:aKey];
-}
-
-- (void)removeAll {
-  [_dictionary removeAllObjects];
-}
-
-@end
-
-#pragma mark - String -> Int32
-
-@implementation GPBStringInt32Dictionary {
- @package
-  NSMutableDictionary *_dictionary;
-}
-
-- (instancetype)init {
-  return [self initWithInt32s:NULL forKeys:NULL count:0];
-}
-
-- (instancetype)initWithInt32s:(const int32_t [])values
-                       forKeys:(const NSString * [])keys
-                         count:(NSUInteger)count {
-  self = [super init];
-  if (self) {
-    _dictionary = [[NSMutableDictionary alloc] init];
-    if (count && values && keys) {
-      for (NSUInteger i = 0; i < count; ++i) {
-        if (!keys[i]) {
-          [NSException raise:NSInvalidArgumentException
-                      format:@"Attempting to add nil key to a Dictionary"];
-        }
-        [_dictionary setObject:@(values[i]) forKey:keys[i]];
-      }
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithDictionary:(GPBStringInt32Dictionary *)dictionary {
-  self = [self initWithInt32s:NULL forKeys:NULL count:0];
-  if (self) {
-    if (dictionary) {
-      [_dictionary addEntriesFromDictionary:dictionary->_dictionary];
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithCapacity:(NSUInteger)numItems {
-  #pragma unused(numItems)
-  return [self initWithInt32s:NULL forKeys:NULL count:0];
-}
-
-- (void)dealloc {
-  NSAssert(!_autocreator,
-           @"%@: Autocreator must be cleared before release, autocreator: %@",
-           [self class], _autocreator);
-  [_dictionary release];
-  [super dealloc];
-}
-
-- (instancetype)copyWithZone:(NSZone *)zone {
-  return [[GPBStringInt32Dictionary allocWithZone:zone] initWithDictionary:self];
-}
-
-- (BOOL)isEqual:(id)other {
-  if (self == other) {
-    return YES;
-  }
-  if (![other isKindOfClass:[GPBStringInt32Dictionary class]]) {
-    return NO;
-  }
-  GPBStringInt32Dictionary *otherDictionary = other;
-  return [_dictionary isEqual:otherDictionary->_dictionary];
-}
-
-- (NSUInteger)hash {
-  return _dictionary.count;
-}
-
-- (NSString *)description {
-  return [NSString stringWithFormat:@"<%@ %p> { %@ }", [self class], self, _dictionary];
-}
-
-- (NSUInteger)count {
-  return _dictionary.count;
-}
-
-- (void)enumerateKeysAndInt32sUsingBlock:
-    (void (NS_NOESCAPE ^)(NSString *key, int32_t value, BOOL *stop))block {
-  BOOL stop = NO;
-  NSDictionary *internal = _dictionary;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSString *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    block(aKey, [aValue intValue], &stop);
-    if (stop) {
-      break;
-    }
-  }
-}
-
-- (size_t)computeSerializedSizeAsField:(GPBFieldDescriptor *)field {
-  NSDictionary *internal = _dictionary;
-  NSUInteger count = internal.count;
-  if (count == 0) {
-    return 0;
-  }
-
-  GPBDataType valueDataType = GPBGetFieldDataType(field);
-  GPBDataType keyDataType = field.mapKeyDataType;
-  size_t result = 0;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSString *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    size_t msgSize = ComputeDictStringFieldSize(aKey, kMapKeyFieldNumber, keyDataType);
-    msgSize += ComputeDictInt32FieldSize([aValue intValue], kMapValueFieldNumber, valueDataType);
-    result += GPBComputeRawVarint32SizeForInteger(msgSize) + msgSize;
-  }
-  size_t tagSize = GPBComputeWireFormatTagSize(GPBFieldNumber(field), GPBDataTypeMessage);
-  result += tagSize * count;
-  return result;
-}
-
-- (void)writeToCodedOutputStream:(GPBCodedOutputStream *)outputStream
-                         asField:(GPBFieldDescriptor *)field {
-  GPBDataType valueDataType = GPBGetFieldDataType(field);
-  GPBDataType keyDataType = field.mapKeyDataType;
-  uint32_t tag = GPBWireFormatMakeTag(GPBFieldNumber(field), GPBWireFormatLengthDelimited);
-  NSDictionary *internal = _dictionary;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSString *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    [outputStream writeInt32NoTag:tag];
-    // Write the size of the message.
-    NSString *unwrappedKey = aKey;
-    int32_t unwrappedValue = [aValue intValue];
-    size_t msgSize = ComputeDictStringFieldSize(unwrappedKey, kMapKeyFieldNumber, keyDataType);
-    msgSize += ComputeDictInt32FieldSize(unwrappedValue, kMapValueFieldNumber, valueDataType);
-    [outputStream writeInt32NoTag:(int32_t)msgSize];
-    // Write the fields.
-    WriteDictStringField(outputStream, unwrappedKey, kMapKeyFieldNumber, keyDataType);
-    WriteDictInt32Field(outputStream, unwrappedValue, kMapValueFieldNumber, valueDataType);
-  }
-}
-
-- (void)setGPBGenericValue:(GPBGenericValue *)value
-     forGPBGenericValueKey:(GPBGenericValue *)key {
-  [_dictionary setObject:@(value->valueInt32) forKey:key->valueString];
-}
-
-- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
-  [self enumerateKeysAndInt32sUsingBlock:^(NSString *key, int32_t value, BOOL *stop) {
-      #pragma unused(stop)
-      block(key, [NSString stringWithFormat:@"%d", value]);
-  }];
-}
-
-- (BOOL)getInt32:(nullable int32_t *)value forKey:(NSString *)key {
-  NSNumber *wrapped = [_dictionary objectForKey:key];
-  if (wrapped && value) {
-    *value = [wrapped intValue];
-  }
-  return (wrapped != NULL);
-}
-
-- (void)addEntriesFromDictionary:(GPBStringInt32Dictionary *)otherDictionary {
-  if (otherDictionary) {
-    [_dictionary addEntriesFromDictionary:otherDictionary->_dictionary];
-    if (_autocreator) {
-      GPBAutocreatedDictionaryModified(_autocreator, self);
-    }
-  }
-}
-
-- (void)setInt32:(int32_t)value forKey:(NSString *)key {
-  if (!key) {
-    [NSException raise:NSInvalidArgumentException
-                format:@"Attempting to add nil key to a Dictionary"];
-  }
-  [_dictionary setObject:@(value) forKey:key];
-  if (_autocreator) {
-    GPBAutocreatedDictionaryModified(_autocreator, self);
-  }
-}
-
-- (void)removeInt32ForKey:(NSString *)aKey {
-  [_dictionary removeObjectForKey:aKey];
-}
-
-- (void)removeAll {
-  [_dictionary removeAllObjects];
-}
-
-@end
-
-#pragma mark - String -> UInt64
-
-@implementation GPBStringUInt64Dictionary {
- @package
-  NSMutableDictionary *_dictionary;
-}
-
-- (instancetype)init {
-  return [self initWithUInt64s:NULL forKeys:NULL count:0];
-}
-
-- (instancetype)initWithUInt64s:(const uint64_t [])values
-                        forKeys:(const NSString * [])keys
-                          count:(NSUInteger)count {
-  self = [super init];
-  if (self) {
-    _dictionary = [[NSMutableDictionary alloc] init];
-    if (count && values && keys) {
-      for (NSUInteger i = 0; i < count; ++i) {
-        if (!keys[i]) {
-          [NSException raise:NSInvalidArgumentException
-                      format:@"Attempting to add nil key to a Dictionary"];
-        }
-        [_dictionary setObject:@(values[i]) forKey:keys[i]];
-      }
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithDictionary:(GPBStringUInt64Dictionary *)dictionary {
-  self = [self initWithUInt64s:NULL forKeys:NULL count:0];
-  if (self) {
-    if (dictionary) {
-      [_dictionary addEntriesFromDictionary:dictionary->_dictionary];
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithCapacity:(NSUInteger)numItems {
-  #pragma unused(numItems)
-  return [self initWithUInt64s:NULL forKeys:NULL count:0];
-}
-
-- (void)dealloc {
-  NSAssert(!_autocreator,
-           @"%@: Autocreator must be cleared before release, autocreator: %@",
-           [self class], _autocreator);
-  [_dictionary release];
-  [super dealloc];
-}
-
-- (instancetype)copyWithZone:(NSZone *)zone {
-  return [[GPBStringUInt64Dictionary allocWithZone:zone] initWithDictionary:self];
-}
-
-- (BOOL)isEqual:(id)other {
-  if (self == other) {
-    return YES;
-  }
-  if (![other isKindOfClass:[GPBStringUInt64Dictionary class]]) {
-    return NO;
-  }
-  GPBStringUInt64Dictionary *otherDictionary = other;
-  return [_dictionary isEqual:otherDictionary->_dictionary];
-}
-
-- (NSUInteger)hash {
-  return _dictionary.count;
-}
-
-- (NSString *)description {
-  return [NSString stringWithFormat:@"<%@ %p> { %@ }", [self class], self, _dictionary];
-}
-
-- (NSUInteger)count {
-  return _dictionary.count;
-}
-
-- (void)enumerateKeysAndUInt64sUsingBlock:
-    (void (NS_NOESCAPE ^)(NSString *key, uint64_t value, BOOL *stop))block {
-  BOOL stop = NO;
-  NSDictionary *internal = _dictionary;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSString *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    block(aKey, [aValue unsignedLongLongValue], &stop);
-    if (stop) {
-      break;
-    }
-  }
-}
-
-- (size_t)computeSerializedSizeAsField:(GPBFieldDescriptor *)field {
-  NSDictionary *internal = _dictionary;
-  NSUInteger count = internal.count;
-  if (count == 0) {
-    return 0;
-  }
-
-  GPBDataType valueDataType = GPBGetFieldDataType(field);
-  GPBDataType keyDataType = field.mapKeyDataType;
-  size_t result = 0;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSString *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    size_t msgSize = ComputeDictStringFieldSize(aKey, kMapKeyFieldNumber, keyDataType);
-    msgSize += ComputeDictUInt64FieldSize([aValue unsignedLongLongValue], kMapValueFieldNumber, valueDataType);
-    result += GPBComputeRawVarint32SizeForInteger(msgSize) + msgSize;
-  }
-  size_t tagSize = GPBComputeWireFormatTagSize(GPBFieldNumber(field), GPBDataTypeMessage);
-  result += tagSize * count;
-  return result;
-}
-
-- (void)writeToCodedOutputStream:(GPBCodedOutputStream *)outputStream
-                         asField:(GPBFieldDescriptor *)field {
-  GPBDataType valueDataType = GPBGetFieldDataType(field);
-  GPBDataType keyDataType = field.mapKeyDataType;
-  uint32_t tag = GPBWireFormatMakeTag(GPBFieldNumber(field), GPBWireFormatLengthDelimited);
-  NSDictionary *internal = _dictionary;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSString *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    [outputStream writeInt32NoTag:tag];
-    // Write the size of the message.
-    NSString *unwrappedKey = aKey;
-    uint64_t unwrappedValue = [aValue unsignedLongLongValue];
-    size_t msgSize = ComputeDictStringFieldSize(unwrappedKey, kMapKeyFieldNumber, keyDataType);
-    msgSize += ComputeDictUInt64FieldSize(unwrappedValue, kMapValueFieldNumber, valueDataType);
-    [outputStream writeInt32NoTag:(int32_t)msgSize];
-    // Write the fields.
-    WriteDictStringField(outputStream, unwrappedKey, kMapKeyFieldNumber, keyDataType);
-    WriteDictUInt64Field(outputStream, unwrappedValue, kMapValueFieldNumber, valueDataType);
-  }
-}
-
-- (void)setGPBGenericValue:(GPBGenericValue *)value
-     forGPBGenericValueKey:(GPBGenericValue *)key {
-  [_dictionary setObject:@(value->valueUInt64) forKey:key->valueString];
-}
-
-- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
-  [self enumerateKeysAndUInt64sUsingBlock:^(NSString *key, uint64_t value, BOOL *stop) {
-      #pragma unused(stop)
-      block(key, [NSString stringWithFormat:@"%llu", value]);
-  }];
-}
-
-- (BOOL)getUInt64:(nullable uint64_t *)value forKey:(NSString *)key {
-  NSNumber *wrapped = [_dictionary objectForKey:key];
-  if (wrapped && value) {
-    *value = [wrapped unsignedLongLongValue];
-  }
-  return (wrapped != NULL);
-}
-
-- (void)addEntriesFromDictionary:(GPBStringUInt64Dictionary *)otherDictionary {
-  if (otherDictionary) {
-    [_dictionary addEntriesFromDictionary:otherDictionary->_dictionary];
-    if (_autocreator) {
-      GPBAutocreatedDictionaryModified(_autocreator, self);
-    }
-  }
-}
-
-- (void)setUInt64:(uint64_t)value forKey:(NSString *)key {
-  if (!key) {
-    [NSException raise:NSInvalidArgumentException
-                format:@"Attempting to add nil key to a Dictionary"];
-  }
-  [_dictionary setObject:@(value) forKey:key];
-  if (_autocreator) {
-    GPBAutocreatedDictionaryModified(_autocreator, self);
-  }
-}
-
-- (void)removeUInt64ForKey:(NSString *)aKey {
-  [_dictionary removeObjectForKey:aKey];
-}
-
-- (void)removeAll {
-  [_dictionary removeAllObjects];
-}
-
-@end
-
-#pragma mark - String -> Int64
-
-@implementation GPBStringInt64Dictionary {
- @package
-  NSMutableDictionary *_dictionary;
-}
-
-- (instancetype)init {
-  return [self initWithInt64s:NULL forKeys:NULL count:0];
-}
-
-- (instancetype)initWithInt64s:(const int64_t [])values
-                       forKeys:(const NSString * [])keys
-                         count:(NSUInteger)count {
-  self = [super init];
-  if (self) {
-    _dictionary = [[NSMutableDictionary alloc] init];
-    if (count && values && keys) {
-      for (NSUInteger i = 0; i < count; ++i) {
-        if (!keys[i]) {
-          [NSException raise:NSInvalidArgumentException
-                      format:@"Attempting to add nil key to a Dictionary"];
-        }
-        [_dictionary setObject:@(values[i]) forKey:keys[i]];
-      }
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithDictionary:(GPBStringInt64Dictionary *)dictionary {
-  self = [self initWithInt64s:NULL forKeys:NULL count:0];
-  if (self) {
-    if (dictionary) {
-      [_dictionary addEntriesFromDictionary:dictionary->_dictionary];
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithCapacity:(NSUInteger)numItems {
-  #pragma unused(numItems)
-  return [self initWithInt64s:NULL forKeys:NULL count:0];
-}
-
-- (void)dealloc {
-  NSAssert(!_autocreator,
-           @"%@: Autocreator must be cleared before release, autocreator: %@",
-           [self class], _autocreator);
-  [_dictionary release];
-  [super dealloc];
-}
-
-- (instancetype)copyWithZone:(NSZone *)zone {
-  return [[GPBStringInt64Dictionary allocWithZone:zone] initWithDictionary:self];
-}
-
-- (BOOL)isEqual:(id)other {
-  if (self == other) {
-    return YES;
-  }
-  if (![other isKindOfClass:[GPBStringInt64Dictionary class]]) {
-    return NO;
-  }
-  GPBStringInt64Dictionary *otherDictionary = other;
-  return [_dictionary isEqual:otherDictionary->_dictionary];
-}
-
-- (NSUInteger)hash {
-  return _dictionary.count;
-}
-
-- (NSString *)description {
-  return [NSString stringWithFormat:@"<%@ %p> { %@ }", [self class], self, _dictionary];
-}
-
-- (NSUInteger)count {
-  return _dictionary.count;
-}
-
-- (void)enumerateKeysAndInt64sUsingBlock:
-    (void (NS_NOESCAPE ^)(NSString *key, int64_t value, BOOL *stop))block {
-  BOOL stop = NO;
-  NSDictionary *internal = _dictionary;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSString *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    block(aKey, [aValue longLongValue], &stop);
-    if (stop) {
-      break;
-    }
-  }
-}
-
-- (size_t)computeSerializedSizeAsField:(GPBFieldDescriptor *)field {
-  NSDictionary *internal = _dictionary;
-  NSUInteger count = internal.count;
-  if (count == 0) {
-    return 0;
-  }
-
-  GPBDataType valueDataType = GPBGetFieldDataType(field);
-  GPBDataType keyDataType = field.mapKeyDataType;
-  size_t result = 0;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSString *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    size_t msgSize = ComputeDictStringFieldSize(aKey, kMapKeyFieldNumber, keyDataType);
-    msgSize += ComputeDictInt64FieldSize([aValue longLongValue], kMapValueFieldNumber, valueDataType);
-    result += GPBComputeRawVarint32SizeForInteger(msgSize) + msgSize;
-  }
-  size_t tagSize = GPBComputeWireFormatTagSize(GPBFieldNumber(field), GPBDataTypeMessage);
-  result += tagSize * count;
-  return result;
-}
-
-- (void)writeToCodedOutputStream:(GPBCodedOutputStream *)outputStream
-                         asField:(GPBFieldDescriptor *)field {
-  GPBDataType valueDataType = GPBGetFieldDataType(field);
-  GPBDataType keyDataType = field.mapKeyDataType;
-  uint32_t tag = GPBWireFormatMakeTag(GPBFieldNumber(field), GPBWireFormatLengthDelimited);
-  NSDictionary *internal = _dictionary;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSString *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    [outputStream writeInt32NoTag:tag];
-    // Write the size of the message.
-    NSString *unwrappedKey = aKey;
-    int64_t unwrappedValue = [aValue longLongValue];
-    size_t msgSize = ComputeDictStringFieldSize(unwrappedKey, kMapKeyFieldNumber, keyDataType);
-    msgSize += ComputeDictInt64FieldSize(unwrappedValue, kMapValueFieldNumber, valueDataType);
-    [outputStream writeInt32NoTag:(int32_t)msgSize];
-    // Write the fields.
-    WriteDictStringField(outputStream, unwrappedKey, kMapKeyFieldNumber, keyDataType);
-    WriteDictInt64Field(outputStream, unwrappedValue, kMapValueFieldNumber, valueDataType);
-  }
-}
-
-- (void)setGPBGenericValue:(GPBGenericValue *)value
-     forGPBGenericValueKey:(GPBGenericValue *)key {
-  [_dictionary setObject:@(value->valueInt64) forKey:key->valueString];
-}
-
-- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
-  [self enumerateKeysAndInt64sUsingBlock:^(NSString *key, int64_t value, BOOL *stop) {
-      #pragma unused(stop)
-      block(key, [NSString stringWithFormat:@"%lld", value]);
-  }];
-}
-
-- (BOOL)getInt64:(nullable int64_t *)value forKey:(NSString *)key {
-  NSNumber *wrapped = [_dictionary objectForKey:key];
-  if (wrapped && value) {
-    *value = [wrapped longLongValue];
-  }
-  return (wrapped != NULL);
-}
-
-- (void)addEntriesFromDictionary:(GPBStringInt64Dictionary *)otherDictionary {
-  if (otherDictionary) {
-    [_dictionary addEntriesFromDictionary:otherDictionary->_dictionary];
-    if (_autocreator) {
-      GPBAutocreatedDictionaryModified(_autocreator, self);
-    }
-  }
-}
-
-- (void)setInt64:(int64_t)value forKey:(NSString *)key {
-  if (!key) {
-    [NSException raise:NSInvalidArgumentException
-                format:@"Attempting to add nil key to a Dictionary"];
-  }
-  [_dictionary setObject:@(value) forKey:key];
-  if (_autocreator) {
-    GPBAutocreatedDictionaryModified(_autocreator, self);
-  }
-}
-
-- (void)removeInt64ForKey:(NSString *)aKey {
-  [_dictionary removeObjectForKey:aKey];
-}
-
-- (void)removeAll {
-  [_dictionary removeAllObjects];
-}
-
-@end
-
-#pragma mark - String -> Bool
-
-@implementation GPBStringBoolDictionary {
- @package
-  NSMutableDictionary *_dictionary;
-}
-
-- (instancetype)init {
-  return [self initWithBools:NULL forKeys:NULL count:0];
-}
-
-- (instancetype)initWithBools:(const BOOL [])values
-                      forKeys:(const NSString * [])keys
-                        count:(NSUInteger)count {
-  self = [super init];
-  if (self) {
-    _dictionary = [[NSMutableDictionary alloc] init];
-    if (count && values && keys) {
-      for (NSUInteger i = 0; i < count; ++i) {
-        if (!keys[i]) {
-          [NSException raise:NSInvalidArgumentException
-                      format:@"Attempting to add nil key to a Dictionary"];
-        }
-        [_dictionary setObject:@(values[i]) forKey:keys[i]];
-      }
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithDictionary:(GPBStringBoolDictionary *)dictionary {
-  self = [self initWithBools:NULL forKeys:NULL count:0];
-  if (self) {
-    if (dictionary) {
-      [_dictionary addEntriesFromDictionary:dictionary->_dictionary];
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithCapacity:(NSUInteger)numItems {
-  #pragma unused(numItems)
-  return [self initWithBools:NULL forKeys:NULL count:0];
-}
-
-- (void)dealloc {
-  NSAssert(!_autocreator,
-           @"%@: Autocreator must be cleared before release, autocreator: %@",
-           [self class], _autocreator);
-  [_dictionary release];
-  [super dealloc];
-}
-
-- (instancetype)copyWithZone:(NSZone *)zone {
-  return [[GPBStringBoolDictionary allocWithZone:zone] initWithDictionary:self];
-}
-
-- (BOOL)isEqual:(id)other {
-  if (self == other) {
-    return YES;
-  }
-  if (![other isKindOfClass:[GPBStringBoolDictionary class]]) {
-    return NO;
-  }
-  GPBStringBoolDictionary *otherDictionary = other;
-  return [_dictionary isEqual:otherDictionary->_dictionary];
-}
-
-- (NSUInteger)hash {
-  return _dictionary.count;
-}
-
-- (NSString *)description {
-  return [NSString stringWithFormat:@"<%@ %p> { %@ }", [self class], self, _dictionary];
-}
-
-- (NSUInteger)count {
-  return _dictionary.count;
-}
-
-- (void)enumerateKeysAndBoolsUsingBlock:
-    (void (NS_NOESCAPE ^)(NSString *key, BOOL value, BOOL *stop))block {
-  BOOL stop = NO;
-  NSDictionary *internal = _dictionary;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSString *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    block(aKey, [aValue boolValue], &stop);
-    if (stop) {
-      break;
-    }
-  }
-}
-
-- (size_t)computeSerializedSizeAsField:(GPBFieldDescriptor *)field {
-  NSDictionary *internal = _dictionary;
-  NSUInteger count = internal.count;
-  if (count == 0) {
-    return 0;
-  }
-
-  GPBDataType valueDataType = GPBGetFieldDataType(field);
-  GPBDataType keyDataType = field.mapKeyDataType;
-  size_t result = 0;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSString *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    size_t msgSize = ComputeDictStringFieldSize(aKey, kMapKeyFieldNumber, keyDataType);
-    msgSize += ComputeDictBoolFieldSize([aValue boolValue], kMapValueFieldNumber, valueDataType);
-    result += GPBComputeRawVarint32SizeForInteger(msgSize) + msgSize;
-  }
-  size_t tagSize = GPBComputeWireFormatTagSize(GPBFieldNumber(field), GPBDataTypeMessage);
-  result += tagSize * count;
-  return result;
-}
-
-- (void)writeToCodedOutputStream:(GPBCodedOutputStream *)outputStream
-                         asField:(GPBFieldDescriptor *)field {
-  GPBDataType valueDataType = GPBGetFieldDataType(field);
-  GPBDataType keyDataType = field.mapKeyDataType;
-  uint32_t tag = GPBWireFormatMakeTag(GPBFieldNumber(field), GPBWireFormatLengthDelimited);
-  NSDictionary *internal = _dictionary;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSString *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    [outputStream writeInt32NoTag:tag];
-    // Write the size of the message.
-    NSString *unwrappedKey = aKey;
-    BOOL unwrappedValue = [aValue boolValue];
-    size_t msgSize = ComputeDictStringFieldSize(unwrappedKey, kMapKeyFieldNumber, keyDataType);
-    msgSize += ComputeDictBoolFieldSize(unwrappedValue, kMapValueFieldNumber, valueDataType);
-    [outputStream writeInt32NoTag:(int32_t)msgSize];
-    // Write the fields.
-    WriteDictStringField(outputStream, unwrappedKey, kMapKeyFieldNumber, keyDataType);
-    WriteDictBoolField(outputStream, unwrappedValue, kMapValueFieldNumber, valueDataType);
-  }
-}
-
-- (void)setGPBGenericValue:(GPBGenericValue *)value
-     forGPBGenericValueKey:(GPBGenericValue *)key {
-  [_dictionary setObject:@(value->valueBool) forKey:key->valueString];
-}
-
-- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
-  [self enumerateKeysAndBoolsUsingBlock:^(NSString *key, BOOL value, BOOL *stop) {
-      #pragma unused(stop)
-      block(key, (value ? @"true" : @"false"));
-  }];
-}
-
-- (BOOL)getBool:(nullable BOOL *)value forKey:(NSString *)key {
-  NSNumber *wrapped = [_dictionary objectForKey:key];
-  if (wrapped && value) {
-    *value = [wrapped boolValue];
-  }
-  return (wrapped != NULL);
-}
-
-- (void)addEntriesFromDictionary:(GPBStringBoolDictionary *)otherDictionary {
-  if (otherDictionary) {
-    [_dictionary addEntriesFromDictionary:otherDictionary->_dictionary];
-    if (_autocreator) {
-      GPBAutocreatedDictionaryModified(_autocreator, self);
-    }
-  }
-}
-
-- (void)setBool:(BOOL)value forKey:(NSString *)key {
-  if (!key) {
-    [NSException raise:NSInvalidArgumentException
-                format:@"Attempting to add nil key to a Dictionary"];
-  }
-  [_dictionary setObject:@(value) forKey:key];
-  if (_autocreator) {
-    GPBAutocreatedDictionaryModified(_autocreator, self);
-  }
-}
-
-- (void)removeBoolForKey:(NSString *)aKey {
-  [_dictionary removeObjectForKey:aKey];
-}
-
-- (void)removeAll {
-  [_dictionary removeAllObjects];
-}
-
-@end
-
-#pragma mark - String -> Float
-
-@implementation GPBStringFloatDictionary {
- @package
-  NSMutableDictionary *_dictionary;
-}
-
-- (instancetype)init {
-  return [self initWithFloats:NULL forKeys:NULL count:0];
-}
-
-- (instancetype)initWithFloats:(const float [])values
-                       forKeys:(const NSString * [])keys
-                         count:(NSUInteger)count {
-  self = [super init];
-  if (self) {
-    _dictionary = [[NSMutableDictionary alloc] init];
-    if (count && values && keys) {
-      for (NSUInteger i = 0; i < count; ++i) {
-        if (!keys[i]) {
-          [NSException raise:NSInvalidArgumentException
-                      format:@"Attempting to add nil key to a Dictionary"];
-        }
-        [_dictionary setObject:@(values[i]) forKey:keys[i]];
-      }
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithDictionary:(GPBStringFloatDictionary *)dictionary {
-  self = [self initWithFloats:NULL forKeys:NULL count:0];
-  if (self) {
-    if (dictionary) {
-      [_dictionary addEntriesFromDictionary:dictionary->_dictionary];
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithCapacity:(NSUInteger)numItems {
-  #pragma unused(numItems)
-  return [self initWithFloats:NULL forKeys:NULL count:0];
-}
-
-- (void)dealloc {
-  NSAssert(!_autocreator,
-           @"%@: Autocreator must be cleared before release, autocreator: %@",
-           [self class], _autocreator);
-  [_dictionary release];
-  [super dealloc];
-}
-
-- (instancetype)copyWithZone:(NSZone *)zone {
-  return [[GPBStringFloatDictionary allocWithZone:zone] initWithDictionary:self];
-}
-
-- (BOOL)isEqual:(id)other {
-  if (self == other) {
-    return YES;
-  }
-  if (![other isKindOfClass:[GPBStringFloatDictionary class]]) {
-    return NO;
-  }
-  GPBStringFloatDictionary *otherDictionary = other;
-  return [_dictionary isEqual:otherDictionary->_dictionary];
-}
-
-- (NSUInteger)hash {
-  return _dictionary.count;
-}
-
-- (NSString *)description {
-  return [NSString stringWithFormat:@"<%@ %p> { %@ }", [self class], self, _dictionary];
-}
-
-- (NSUInteger)count {
-  return _dictionary.count;
-}
-
-- (void)enumerateKeysAndFloatsUsingBlock:
-    (void (NS_NOESCAPE ^)(NSString *key, float value, BOOL *stop))block {
-  BOOL stop = NO;
-  NSDictionary *internal = _dictionary;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSString *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    block(aKey, [aValue floatValue], &stop);
-    if (stop) {
-      break;
-    }
-  }
-}
-
-- (size_t)computeSerializedSizeAsField:(GPBFieldDescriptor *)field {
-  NSDictionary *internal = _dictionary;
-  NSUInteger count = internal.count;
-  if (count == 0) {
-    return 0;
-  }
-
-  GPBDataType valueDataType = GPBGetFieldDataType(field);
-  GPBDataType keyDataType = field.mapKeyDataType;
-  size_t result = 0;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSString *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    size_t msgSize = ComputeDictStringFieldSize(aKey, kMapKeyFieldNumber, keyDataType);
-    msgSize += ComputeDictFloatFieldSize([aValue floatValue], kMapValueFieldNumber, valueDataType);
-    result += GPBComputeRawVarint32SizeForInteger(msgSize) + msgSize;
-  }
-  size_t tagSize = GPBComputeWireFormatTagSize(GPBFieldNumber(field), GPBDataTypeMessage);
-  result += tagSize * count;
-  return result;
-}
-
-- (void)writeToCodedOutputStream:(GPBCodedOutputStream *)outputStream
-                         asField:(GPBFieldDescriptor *)field {
-  GPBDataType valueDataType = GPBGetFieldDataType(field);
-  GPBDataType keyDataType = field.mapKeyDataType;
-  uint32_t tag = GPBWireFormatMakeTag(GPBFieldNumber(field), GPBWireFormatLengthDelimited);
-  NSDictionary *internal = _dictionary;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSString *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    [outputStream writeInt32NoTag:tag];
-    // Write the size of the message.
-    NSString *unwrappedKey = aKey;
-    float unwrappedValue = [aValue floatValue];
-    size_t msgSize = ComputeDictStringFieldSize(unwrappedKey, kMapKeyFieldNumber, keyDataType);
-    msgSize += ComputeDictFloatFieldSize(unwrappedValue, kMapValueFieldNumber, valueDataType);
-    [outputStream writeInt32NoTag:(int32_t)msgSize];
-    // Write the fields.
-    WriteDictStringField(outputStream, unwrappedKey, kMapKeyFieldNumber, keyDataType);
-    WriteDictFloatField(outputStream, unwrappedValue, kMapValueFieldNumber, valueDataType);
-  }
-}
-
-- (void)setGPBGenericValue:(GPBGenericValue *)value
-     forGPBGenericValueKey:(GPBGenericValue *)key {
-  [_dictionary setObject:@(value->valueFloat) forKey:key->valueString];
-}
-
-- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
-  [self enumerateKeysAndFloatsUsingBlock:^(NSString *key, float value, BOOL *stop) {
-      #pragma unused(stop)
-      block(key, [NSString stringWithFormat:@"%.*g", FLT_DIG, value]);
-  }];
-}
-
-- (BOOL)getFloat:(nullable float *)value forKey:(NSString *)key {
-  NSNumber *wrapped = [_dictionary objectForKey:key];
-  if (wrapped && value) {
-    *value = [wrapped floatValue];
-  }
-  return (wrapped != NULL);
-}
-
-- (void)addEntriesFromDictionary:(GPBStringFloatDictionary *)otherDictionary {
-  if (otherDictionary) {
-    [_dictionary addEntriesFromDictionary:otherDictionary->_dictionary];
-    if (_autocreator) {
-      GPBAutocreatedDictionaryModified(_autocreator, self);
-    }
-  }
-}
-
-- (void)setFloat:(float)value forKey:(NSString *)key {
-  if (!key) {
-    [NSException raise:NSInvalidArgumentException
-                format:@"Attempting to add nil key to a Dictionary"];
-  }
-  [_dictionary setObject:@(value) forKey:key];
-  if (_autocreator) {
-    GPBAutocreatedDictionaryModified(_autocreator, self);
-  }
-}
-
-- (void)removeFloatForKey:(NSString *)aKey {
-  [_dictionary removeObjectForKey:aKey];
-}
-
-- (void)removeAll {
-  [_dictionary removeAllObjects];
-}
-
-@end
-
-#pragma mark - String -> Double
-
-@implementation GPBStringDoubleDictionary {
- @package
-  NSMutableDictionary *_dictionary;
-}
-
-- (instancetype)init {
-  return [self initWithDoubles:NULL forKeys:NULL count:0];
-}
-
-- (instancetype)initWithDoubles:(const double [])values
-                        forKeys:(const NSString * [])keys
-                          count:(NSUInteger)count {
-  self = [super init];
-  if (self) {
-    _dictionary = [[NSMutableDictionary alloc] init];
-    if (count && values && keys) {
-      for (NSUInteger i = 0; i < count; ++i) {
-        if (!keys[i]) {
-          [NSException raise:NSInvalidArgumentException
-                      format:@"Attempting to add nil key to a Dictionary"];
-        }
-        [_dictionary setObject:@(values[i]) forKey:keys[i]];
-      }
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithDictionary:(GPBStringDoubleDictionary *)dictionary {
-  self = [self initWithDoubles:NULL forKeys:NULL count:0];
-  if (self) {
-    if (dictionary) {
-      [_dictionary addEntriesFromDictionary:dictionary->_dictionary];
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithCapacity:(NSUInteger)numItems {
-  #pragma unused(numItems)
-  return [self initWithDoubles:NULL forKeys:NULL count:0];
-}
-
-- (void)dealloc {
-  NSAssert(!_autocreator,
-           @"%@: Autocreator must be cleared before release, autocreator: %@",
-           [self class], _autocreator);
-  [_dictionary release];
-  [super dealloc];
-}
-
-- (instancetype)copyWithZone:(NSZone *)zone {
-  return [[GPBStringDoubleDictionary allocWithZone:zone] initWithDictionary:self];
-}
-
-- (BOOL)isEqual:(id)other {
-  if (self == other) {
-    return YES;
-  }
-  if (![other isKindOfClass:[GPBStringDoubleDictionary class]]) {
-    return NO;
-  }
-  GPBStringDoubleDictionary *otherDictionary = other;
-  return [_dictionary isEqual:otherDictionary->_dictionary];
-}
-
-- (NSUInteger)hash {
-  return _dictionary.count;
-}
-
-- (NSString *)description {
-  return [NSString stringWithFormat:@"<%@ %p> { %@ }", [self class], self, _dictionary];
-}
-
-- (NSUInteger)count {
-  return _dictionary.count;
-}
-
-- (void)enumerateKeysAndDoublesUsingBlock:
-    (void (NS_NOESCAPE ^)(NSString *key, double value, BOOL *stop))block {
-  BOOL stop = NO;
-  NSDictionary *internal = _dictionary;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSString *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    block(aKey, [aValue doubleValue], &stop);
-    if (stop) {
-      break;
-    }
-  }
-}
-
-- (size_t)computeSerializedSizeAsField:(GPBFieldDescriptor *)field {
-  NSDictionary *internal = _dictionary;
-  NSUInteger count = internal.count;
-  if (count == 0) {
-    return 0;
-  }
-
-  GPBDataType valueDataType = GPBGetFieldDataType(field);
-  GPBDataType keyDataType = field.mapKeyDataType;
-  size_t result = 0;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSString *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    size_t msgSize = ComputeDictStringFieldSize(aKey, kMapKeyFieldNumber, keyDataType);
-    msgSize += ComputeDictDoubleFieldSize([aValue doubleValue], kMapValueFieldNumber, valueDataType);
-    result += GPBComputeRawVarint32SizeForInteger(msgSize) + msgSize;
-  }
-  size_t tagSize = GPBComputeWireFormatTagSize(GPBFieldNumber(field), GPBDataTypeMessage);
-  result += tagSize * count;
-  return result;
-}
-
-- (void)writeToCodedOutputStream:(GPBCodedOutputStream *)outputStream
-                         asField:(GPBFieldDescriptor *)field {
-  GPBDataType valueDataType = GPBGetFieldDataType(field);
-  GPBDataType keyDataType = field.mapKeyDataType;
-  uint32_t tag = GPBWireFormatMakeTag(GPBFieldNumber(field), GPBWireFormatLengthDelimited);
-  NSDictionary *internal = _dictionary;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSString *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    [outputStream writeInt32NoTag:tag];
-    // Write the size of the message.
-    NSString *unwrappedKey = aKey;
-    double unwrappedValue = [aValue doubleValue];
-    size_t msgSize = ComputeDictStringFieldSize(unwrappedKey, kMapKeyFieldNumber, keyDataType);
-    msgSize += ComputeDictDoubleFieldSize(unwrappedValue, kMapValueFieldNumber, valueDataType);
-    [outputStream writeInt32NoTag:(int32_t)msgSize];
-    // Write the fields.
-    WriteDictStringField(outputStream, unwrappedKey, kMapKeyFieldNumber, keyDataType);
-    WriteDictDoubleField(outputStream, unwrappedValue, kMapValueFieldNumber, valueDataType);
-  }
-}
-
-- (void)setGPBGenericValue:(GPBGenericValue *)value
-     forGPBGenericValueKey:(GPBGenericValue *)key {
-  [_dictionary setObject:@(value->valueDouble) forKey:key->valueString];
-}
-
-- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
-  [self enumerateKeysAndDoublesUsingBlock:^(NSString *key, double value, BOOL *stop) {
-      #pragma unused(stop)
-      block(key, [NSString stringWithFormat:@"%.*lg", DBL_DIG, value]);
-  }];
-}
-
-- (BOOL)getDouble:(nullable double *)value forKey:(NSString *)key {
-  NSNumber *wrapped = [_dictionary objectForKey:key];
-  if (wrapped && value) {
-    *value = [wrapped doubleValue];
-  }
-  return (wrapped != NULL);
-}
-
-- (void)addEntriesFromDictionary:(GPBStringDoubleDictionary *)otherDictionary {
-  if (otherDictionary) {
-    [_dictionary addEntriesFromDictionary:otherDictionary->_dictionary];
-    if (_autocreator) {
-      GPBAutocreatedDictionaryModified(_autocreator, self);
-    }
-  }
-}
-
-- (void)setDouble:(double)value forKey:(NSString *)key {
-  if (!key) {
-    [NSException raise:NSInvalidArgumentException
-                format:@"Attempting to add nil key to a Dictionary"];
-  }
-  [_dictionary setObject:@(value) forKey:key];
-  if (_autocreator) {
-    GPBAutocreatedDictionaryModified(_autocreator, self);
-  }
-}
-
-- (void)removeDoubleForKey:(NSString *)aKey {
-  [_dictionary removeObjectForKey:aKey];
-}
-
-- (void)removeAll {
-  [_dictionary removeAllObjects];
-}
-
-@end
-
-#pragma mark - String -> Enum
-
-@implementation GPBStringEnumDictionary {
- @package
-  NSMutableDictionary *_dictionary;
-  GPBEnumValidationFunc _validationFunc;
-}
-
-@synthesize validationFunc = _validationFunc;
-
-- (instancetype)init {
-  return [self initWithValidationFunction:NULL rawValues:NULL forKeys:NULL count:0];
-}
-
-- (instancetype)initWithValidationFunction:(GPBEnumValidationFunc)func {
-  return [self initWithValidationFunction:func rawValues:NULL forKeys:NULL count:0];
-}
-
-- (instancetype)initWithValidationFunction:(GPBEnumValidationFunc)func
-                                 rawValues:(const int32_t [])rawValues
-                                   forKeys:(const NSString * [])keys
-                                     count:(NSUInteger)count {
-  self = [super init];
-  if (self) {
-    _dictionary = [[NSMutableDictionary alloc] init];
-    _validationFunc = (func != NULL ? func : DictDefault_IsValidValue);
-    if (count && rawValues && keys) {
-      for (NSUInteger i = 0; i < count; ++i) {
-        if (!keys[i]) {
-          [NSException raise:NSInvalidArgumentException
-                      format:@"Attempting to add nil key to a Dictionary"];
-        }
-        [_dictionary setObject:@(rawValues[i]) forKey:keys[i]];
-      }
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithDictionary:(GPBStringEnumDictionary *)dictionary {
-  self = [self initWithValidationFunction:dictionary.validationFunc
-                                rawValues:NULL
-                                  forKeys:NULL
-                                    count:0];
-  if (self) {
-    if (dictionary) {
-      [_dictionary addEntriesFromDictionary:dictionary->_dictionary];
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithValidationFunction:(GPBEnumValidationFunc)func
-                                  capacity:(NSUInteger)numItems {
-  #pragma unused(numItems)
-  return [self initWithValidationFunction:func rawValues:NULL forKeys:NULL count:0];
-}
-
-- (void)dealloc {
-  NSAssert(!_autocreator,
-           @"%@: Autocreator must be cleared before release, autocreator: %@",
-           [self class], _autocreator);
-  [_dictionary release];
-  [super dealloc];
-}
-
-- (instancetype)copyWithZone:(NSZone *)zone {
-  return [[GPBStringEnumDictionary allocWithZone:zone] initWithDictionary:self];
-}
-
-- (BOOL)isEqual:(id)other {
-  if (self == other) {
-    return YES;
-  }
-  if (![other isKindOfClass:[GPBStringEnumDictionary class]]) {
-    return NO;
-  }
-  GPBStringEnumDictionary *otherDictionary = other;
-  return [_dictionary isEqual:otherDictionary->_dictionary];
-}
-
-- (NSUInteger)hash {
-  return _dictionary.count;
-}
-
-- (NSString *)description {
-  return [NSString stringWithFormat:@"<%@ %p> { %@ }", [self class], self, _dictionary];
-}
-
-- (NSUInteger)count {
-  return _dictionary.count;
-}
-
-- (void)enumerateKeysAndRawValuesUsingBlock:
-    (void (NS_NOESCAPE ^)(NSString *key, int32_t value, BOOL *stop))block {
-  BOOL stop = NO;
-  NSDictionary *internal = _dictionary;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSString *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    block(aKey, [aValue intValue], &stop);
-    if (stop) {
-      break;
-    }
-  }
-}
-
-- (size_t)computeSerializedSizeAsField:(GPBFieldDescriptor *)field {
-  NSDictionary *internal = _dictionary;
-  NSUInteger count = internal.count;
-  if (count == 0) {
-    return 0;
-  }
-
-  GPBDataType valueDataType = GPBGetFieldDataType(field);
-  GPBDataType keyDataType = field.mapKeyDataType;
-  size_t result = 0;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSString *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    size_t msgSize = ComputeDictStringFieldSize(aKey, kMapKeyFieldNumber, keyDataType);
-    msgSize += ComputeDictEnumFieldSize([aValue intValue], kMapValueFieldNumber, valueDataType);
-    result += GPBComputeRawVarint32SizeForInteger(msgSize) + msgSize;
-  }
-  size_t tagSize = GPBComputeWireFormatTagSize(GPBFieldNumber(field), GPBDataTypeMessage);
-  result += tagSize * count;
-  return result;
-}
-
-- (void)writeToCodedOutputStream:(GPBCodedOutputStream *)outputStream
-                         asField:(GPBFieldDescriptor *)field {
-  GPBDataType valueDataType = GPBGetFieldDataType(field);
-  GPBDataType keyDataType = field.mapKeyDataType;
-  uint32_t tag = GPBWireFormatMakeTag(GPBFieldNumber(field), GPBWireFormatLengthDelimited);
-  NSDictionary *internal = _dictionary;
-  NSEnumerator *keys = [internal keyEnumerator];
-  NSString *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = internal[aKey];
-    [outputStream writeInt32NoTag:tag];
-    // Write the size of the message.
-    NSString *unwrappedKey = aKey;
-    int32_t unwrappedValue = [aValue intValue];
-    size_t msgSize = ComputeDictStringFieldSize(unwrappedKey, kMapKeyFieldNumber, keyDataType);
-    msgSize += ComputeDictEnumFieldSize(unwrappedValue, kMapValueFieldNumber, valueDataType);
-    [outputStream writeInt32NoTag:(int32_t)msgSize];
-    // Write the fields.
-    WriteDictStringField(outputStream, unwrappedKey, kMapKeyFieldNumber, keyDataType);
-    WriteDictEnumField(outputStream, unwrappedValue, kMapValueFieldNumber, valueDataType);
-  }
-}
-
-- (NSData *)serializedDataForUnknownValue:(int32_t)value
-                                   forKey:(GPBGenericValue *)key
-                              keyDataType:(GPBDataType)keyDataType {
-  size_t msgSize = ComputeDictStringFieldSize(key->valueString, kMapKeyFieldNumber, keyDataType);
-  msgSize += ComputeDictEnumFieldSize(value, kMapValueFieldNumber, GPBDataTypeEnum);
-  NSMutableData *data = [NSMutableData dataWithLength:msgSize];
-  GPBCodedOutputStream *outputStream = [[GPBCodedOutputStream alloc] initWithData:data];
-  WriteDictStringField(outputStream, key->valueString, kMapKeyFieldNumber, keyDataType);
-  WriteDictEnumField(outputStream, value, kMapValueFieldNumber, GPBDataTypeEnum);
-  [outputStream release];
-  return data;
-}
-- (void)setGPBGenericValue:(GPBGenericValue *)value
-     forGPBGenericValueKey:(GPBGenericValue *)key {
-  [_dictionary setObject:@(value->valueEnum) forKey:key->valueString];
-}
-
-- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
-  [self enumerateKeysAndRawValuesUsingBlock:^(NSString *key, int32_t value, BOOL *stop) {
-      #pragma unused(stop)
-      block(key, @(value));
-  }];
-}
-
-- (BOOL)getEnum:(int32_t *)value forKey:(NSString *)key {
-  NSNumber *wrapped = [_dictionary objectForKey:key];
-  if (wrapped && value) {
-    int32_t result = [wrapped intValue];
-    if (!_validationFunc(result)) {
-      result = kGPBUnrecognizedEnumeratorValue;
-    }
-    *value = result;
-  }
-  return (wrapped != NULL);
-}
-
-- (BOOL)getRawValue:(int32_t *)rawValue forKey:(NSString *)key {
-  NSNumber *wrapped = [_dictionary objectForKey:key];
-  if (wrapped && rawValue) {
-    *rawValue = [wrapped intValue];
-  }
-  return (wrapped != NULL);
-}
-
-- (void)enumerateKeysAndEnumsUsingBlock:
-    (void (NS_NOESCAPE ^)(NSString *key, int32_t value, BOOL *stop))block {
-  GPBEnumValidationFunc func = _validationFunc;
-  BOOL stop = NO;
-  NSEnumerator *keys = [_dictionary keyEnumerator];
-  NSString *aKey;
-  while ((aKey = [keys nextObject])) {
-    NSNumber *aValue = _dictionary[aKey];
-      int32_t unwrapped = [aValue intValue];
-      if (!func(unwrapped)) {
-        unwrapped = kGPBUnrecognizedEnumeratorValue;
-      }
-    block(aKey, unwrapped, &stop);
-    if (stop) {
-      break;
-    }
-  }
-}
-
-- (void)addRawEntriesFromDictionary:(GPBStringEnumDictionary *)otherDictionary {
-  if (otherDictionary) {
-    [_dictionary addEntriesFromDictionary:otherDictionary->_dictionary];
-    if (_autocreator) {
-      GPBAutocreatedDictionaryModified(_autocreator, self);
-    }
-  }
-}
-
-- (void)setRawValue:(int32_t)value forKey:(NSString *)key {
-  if (!key) {
-    [NSException raise:NSInvalidArgumentException
-                format:@"Attempting to add nil key to a Dictionary"];
-  }
-  [_dictionary setObject:@(value) forKey:key];
-  if (_autocreator) {
-    GPBAutocreatedDictionaryModified(_autocreator, self);
-  }
-}
-
-- (void)removeEnumForKey:(NSString *)aKey {
-  [_dictionary removeObjectForKey:aKey];
-}
-
-- (void)removeAll {
-  [_dictionary removeAllObjects];
-}
-
-- (void)setEnum:(int32_t)value forKey:(NSString *)key {
-  if (!key) {
-    [NSException raise:NSInvalidArgumentException
-                format:@"Attempting to add nil key to a Dictionary"];
-  }
-  if (!_validationFunc(value)) {
-    [NSException raise:NSInvalidArgumentException
-                format:@"GPBStringEnumDictionary: Attempt to set an unknown enum value (%d)",
-                       value];
-  }
-
-  [_dictionary setObject:@(value) forKey:key];
-  if (_autocreator) {
-    GPBAutocreatedDictionaryModified(_autocreator, self);
-  }
-}
-
-@end
-
-// clang-format on
-//%PDDM-EXPAND-END (5 expansions)
-
-
-//%PDDM-EXPAND DICTIONARY_BOOL_KEY_TO_POD_IMPL(UInt32, uint32_t)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-#pragma mark - Bool -> UInt32
-
-@implementation GPBBoolUInt32Dictionary {
- @package
-  uint32_t _values[2];
-  BOOL _valueSet[2];
-}
-
-- (instancetype)init {
-  return [self initWithUInt32s:NULL forKeys:NULL count:0];
-}
-
-- (instancetype)initWithUInt32s:(const uint32_t [])values
-                        forKeys:(const BOOL [])keys
-                          count:(NSUInteger)count {
-  self = [super init];
-  if (self) {
-    for (NSUInteger i = 0; i < count; ++i) {
-      int idx = keys[i] ? 1 : 0;
-      _values[idx] = values[i];
-      _valueSet[idx] = YES;
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithDictionary:(GPBBoolUInt32Dictionary *)dictionary {
-  self = [self initWithUInt32s:NULL forKeys:NULL count:0];
-  if (self) {
-    if (dictionary) {
-      for (int i = 0; i < 2; ++i) {
-        if (dictionary->_valueSet[i]) {
-          _values[i] = dictionary->_values[i];
-          _valueSet[i] = YES;
-        }
-      }
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithCapacity:(NSUInteger)numItems {
-  #pragma unused(numItems)
-  return [self initWithUInt32s:NULL forKeys:NULL count:0];
-}
-
-#if !defined(NS_BLOCK_ASSERTIONS)
-- (void)dealloc {
-  NSAssert(!_autocreator,
-           @"%@: Autocreator must be cleared before release, autocreator: %@",
-           [self class], _autocreator);
-  [super dealloc];
-}
-#endif  // !defined(NS_BLOCK_ASSERTIONS)
-
-- (instancetype)copyWithZone:(NSZone *)zone {
-  return [[GPBBoolUInt32Dictionary allocWithZone:zone] initWithDictionary:self];
-}
-
-- (BOOL)isEqual:(id)other {
-  if (self == other) {
-    return YES;
-  }
-  if (![other isKindOfClass:[GPBBoolUInt32Dictionary class]]) {
-    return NO;
-  }
-  GPBBoolUInt32Dictionary *otherDictionary = other;
-  if ((_valueSet[0] != otherDictionary->_valueSet[0]) ||
-      (_valueSet[1] != otherDictionary->_valueSet[1])) {
-    return NO;
-  }
-  if ((_valueSet[0] && (_values[0] != otherDictionary->_values[0])) ||
-      (_valueSet[1] && (_values[1] != otherDictionary->_values[1]))) {
-    return NO;
-  }
-  return YES;
-}
-
-- (NSUInteger)hash {
-  return (_valueSet[0] ? 1 : 0) + (_valueSet[1] ? 1 : 0);
-}
-
-- (NSString *)description {
-  NSMutableString *result = [NSMutableString stringWithFormat:@"<%@ %p> {", [self class], self];
-  if (_valueSet[0]) {
-    [result appendFormat:@"NO: %u", _values[0]];
-  }
-  if (_valueSet[1]) {
-    [result appendFormat:@"YES: %u", _values[1]];
-  }
-  [result appendString:@" }"];
-  return result;
-}
-
-- (NSUInteger)count {
-  return (_valueSet[0] ? 1 : 0) + (_valueSet[1] ? 1 : 0);
-}
-
-- (BOOL)getUInt32:(uint32_t *)value forKey:(BOOL)key {
-  int idx = (key ? 1 : 0);
-  if (_valueSet[idx]) {
-    if (value) {
-      *value = _values[idx];
-    }
-    return YES;
-  }
-  return NO;
-}
-
-- (void)setGPBGenericValue:(GPBGenericValue *)value
-     forGPBGenericValueKey:(GPBGenericValue *)key {
-  int idx = (key->valueBool ? 1 : 0);
-  _values[idx] = value->valueUInt32;
-  _valueSet[idx] = YES;
-}
-
-- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
-  if (_valueSet[0]) {
-    block(@"false", [NSString stringWithFormat:@"%u", _values[0]]);
-  }
-  if (_valueSet[1]) {
-    block(@"true", [NSString stringWithFormat:@"%u", _values[1]]);
-  }
-}
-
-- (void)enumerateKeysAndUInt32sUsingBlock:
-    (void (NS_NOESCAPE ^)(BOOL key, uint32_t value, BOOL *stop))block {
-  BOOL stop = NO;
-  if (_valueSet[0]) {
-    block(NO, _values[0], &stop);
-  }
-  if (!stop && _valueSet[1]) {
-    block(YES, _values[1], &stop);
-  }
-}
-
-- (size_t)computeSerializedSizeAsField:(GPBFieldDescriptor *)field {
-  GPBDataType valueDataType = GPBGetFieldDataType(field);
-  NSUInteger count = 0;
-  size_t result = 0;
-  for (int i = 0; i < 2; ++i) {
-    if (_valueSet[i]) {
-      ++count;
-      size_t msgSize = ComputeDictBoolFieldSize((i == 1), kMapKeyFieldNumber, GPBDataTypeBool);
-      msgSize += ComputeDictUInt32FieldSize(_values[i], kMapValueFieldNumber, valueDataType);
-      result += GPBComputeRawVarint32SizeForInteger(msgSize) + msgSize;
-    }
-  }
-  size_t tagSize = GPBComputeWireFormatTagSize(GPBFieldNumber(field), GPBDataTypeMessage);
-  result += tagSize * count;
-  return result;
-}
-
-- (void)writeToCodedOutputStream:(GPBCodedOutputStream *)outputStream
-                         asField:(GPBFieldDescriptor *)field {
-  GPBDataType valueDataType = GPBGetFieldDataType(field);
-  uint32_t tag = GPBWireFormatMakeTag(GPBFieldNumber(field), GPBWireFormatLengthDelimited);
-  for (int i = 0; i < 2; ++i) {
-    if (_valueSet[i]) {
-      // Write the tag.
-      [outputStream writeInt32NoTag:tag];
-      // Write the size of the message.
-      size_t msgSize = ComputeDictBoolFieldSize((i == 1), kMapKeyFieldNumber, GPBDataTypeBool);
-      msgSize += ComputeDictUInt32FieldSize(_values[i], kMapValueFieldNumber, valueDataType);
-      [outputStream writeInt32NoTag:(int32_t)msgSize];
-      // Write the fields.
-      WriteDictBoolField(outputStream, (i == 1), kMapKeyFieldNumber, GPBDataTypeBool);
-      WriteDictUInt32Field(outputStream, _values[i], kMapValueFieldNumber, valueDataType);
-    }
-  }
-}
-
-- (void)addEntriesFromDictionary:(GPBBoolUInt32Dictionary *)otherDictionary {
-  if (otherDictionary) {
-    for (int i = 0; i < 2; ++i) {
-      if (otherDictionary->_valueSet[i]) {
-        _valueSet[i] = YES;
-        _values[i] = otherDictionary->_values[i];
-      }
-    }
-    if (_autocreator) {
-      GPBAutocreatedDictionaryModified(_autocreator, self);
-    }
-  }
-}
-
-- (void)setUInt32:(uint32_t)value forKey:(BOOL)key {
-  int idx = (key ? 1 : 0);
-  _values[idx] = value;
-  _valueSet[idx] = YES;
-  if (_autocreator) {
-    GPBAutocreatedDictionaryModified(_autocreator, self);
-  }
-}
-
-- (void)removeUInt32ForKey:(BOOL)aKey {
-  _valueSet[aKey ? 1 : 0] = NO;
-}
-
-- (void)removeAll {
-  _valueSet[0] = NO;
-  _valueSet[1] = NO;
-}
-
-@end
-
-// clang-format on
-//%PDDM-EXPAND DICTIONARY_BOOL_KEY_TO_POD_IMPL(Int32, int32_t)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-#pragma mark - Bool -> Int32
-
-@implementation GPBBoolInt32Dictionary {
- @package
-  int32_t _values[2];
-  BOOL _valueSet[2];
-}
-
-- (instancetype)init {
-  return [self initWithInt32s:NULL forKeys:NULL count:0];
-}
-
-- (instancetype)initWithInt32s:(const int32_t [])values
-                       forKeys:(const BOOL [])keys
-                         count:(NSUInteger)count {
-  self = [super init];
-  if (self) {
-    for (NSUInteger i = 0; i < count; ++i) {
-      int idx = keys[i] ? 1 : 0;
-      _values[idx] = values[i];
-      _valueSet[idx] = YES;
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithDictionary:(GPBBoolInt32Dictionary *)dictionary {
-  self = [self initWithInt32s:NULL forKeys:NULL count:0];
-  if (self) {
-    if (dictionary) {
-      for (int i = 0; i < 2; ++i) {
-        if (dictionary->_valueSet[i]) {
-          _values[i] = dictionary->_values[i];
-          _valueSet[i] = YES;
-        }
-      }
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithCapacity:(NSUInteger)numItems {
-  #pragma unused(numItems)
-  return [self initWithInt32s:NULL forKeys:NULL count:0];
-}
-
-#if !defined(NS_BLOCK_ASSERTIONS)
-- (void)dealloc {
-  NSAssert(!_autocreator,
-           @"%@: Autocreator must be cleared before release, autocreator: %@",
-           [self class], _autocreator);
-  [super dealloc];
-}
-#endif  // !defined(NS_BLOCK_ASSERTIONS)
-
-- (instancetype)copyWithZone:(NSZone *)zone {
-  return [[GPBBoolInt32Dictionary allocWithZone:zone] initWithDictionary:self];
-}
-
-- (BOOL)isEqual:(id)other {
-  if (self == other) {
-    return YES;
-  }
-  if (![other isKindOfClass:[GPBBoolInt32Dictionary class]]) {
-    return NO;
-  }
-  GPBBoolInt32Dictionary *otherDictionary = other;
-  if ((_valueSet[0] != otherDictionary->_valueSet[0]) ||
-      (_valueSet[1] != otherDictionary->_valueSet[1])) {
-    return NO;
-  }
-  if ((_valueSet[0] && (_values[0] != otherDictionary->_values[0])) ||
-      (_valueSet[1] && (_values[1] != otherDictionary->_values[1]))) {
-    return NO;
-  }
-  return YES;
-}
-
-- (NSUInteger)hash {
-  return (_valueSet[0] ? 1 : 0) + (_valueSet[1] ? 1 : 0);
-}
-
-- (NSString *)description {
-  NSMutableString *result = [NSMutableString stringWithFormat:@"<%@ %p> {", [self class], self];
-  if (_valueSet[0]) {
-    [result appendFormat:@"NO: %d", _values[0]];
-  }
-  if (_valueSet[1]) {
-    [result appendFormat:@"YES: %d", _values[1]];
-  }
-  [result appendString:@" }"];
-  return result;
-}
-
-- (NSUInteger)count {
-  return (_valueSet[0] ? 1 : 0) + (_valueSet[1] ? 1 : 0);
-}
-
-- (BOOL)getInt32:(int32_t *)value forKey:(BOOL)key {
-  int idx = (key ? 1 : 0);
-  if (_valueSet[idx]) {
-    if (value) {
-      *value = _values[idx];
-    }
-    return YES;
-  }
-  return NO;
-}
-
-- (void)setGPBGenericValue:(GPBGenericValue *)value
-     forGPBGenericValueKey:(GPBGenericValue *)key {
-  int idx = (key->valueBool ? 1 : 0);
-  _values[idx] = value->valueInt32;
-  _valueSet[idx] = YES;
-}
-
-- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
-  if (_valueSet[0]) {
-    block(@"false", [NSString stringWithFormat:@"%d", _values[0]]);
-  }
-  if (_valueSet[1]) {
-    block(@"true", [NSString stringWithFormat:@"%d", _values[1]]);
-  }
-}
-
-- (void)enumerateKeysAndInt32sUsingBlock:
-    (void (NS_NOESCAPE ^)(BOOL key, int32_t value, BOOL *stop))block {
-  BOOL stop = NO;
-  if (_valueSet[0]) {
-    block(NO, _values[0], &stop);
-  }
-  if (!stop && _valueSet[1]) {
-    block(YES, _values[1], &stop);
-  }
-}
-
-- (size_t)computeSerializedSizeAsField:(GPBFieldDescriptor *)field {
-  GPBDataType valueDataType = GPBGetFieldDataType(field);
-  NSUInteger count = 0;
-  size_t result = 0;
-  for (int i = 0; i < 2; ++i) {
-    if (_valueSet[i]) {
-      ++count;
-      size_t msgSize = ComputeDictBoolFieldSize((i == 1), kMapKeyFieldNumber, GPBDataTypeBool);
-      msgSize += ComputeDictInt32FieldSize(_values[i], kMapValueFieldNumber, valueDataType);
-      result += GPBComputeRawVarint32SizeForInteger(msgSize) + msgSize;
-    }
-  }
-  size_t tagSize = GPBComputeWireFormatTagSize(GPBFieldNumber(field), GPBDataTypeMessage);
-  result += tagSize * count;
-  return result;
-}
-
-- (void)writeToCodedOutputStream:(GPBCodedOutputStream *)outputStream
-                         asField:(GPBFieldDescriptor *)field {
-  GPBDataType valueDataType = GPBGetFieldDataType(field);
-  uint32_t tag = GPBWireFormatMakeTag(GPBFieldNumber(field), GPBWireFormatLengthDelimited);
-  for (int i = 0; i < 2; ++i) {
-    if (_valueSet[i]) {
-      // Write the tag.
-      [outputStream writeInt32NoTag:tag];
-      // Write the size of the message.
-      size_t msgSize = ComputeDictBoolFieldSize((i == 1), kMapKeyFieldNumber, GPBDataTypeBool);
-      msgSize += ComputeDictInt32FieldSize(_values[i], kMapValueFieldNumber, valueDataType);
-      [outputStream writeInt32NoTag:(int32_t)msgSize];
-      // Write the fields.
-      WriteDictBoolField(outputStream, (i == 1), kMapKeyFieldNumber, GPBDataTypeBool);
-      WriteDictInt32Field(outputStream, _values[i], kMapValueFieldNumber, valueDataType);
-    }
-  }
-}
-
-- (void)addEntriesFromDictionary:(GPBBoolInt32Dictionary *)otherDictionary {
-  if (otherDictionary) {
-    for (int i = 0; i < 2; ++i) {
-      if (otherDictionary->_valueSet[i]) {
-        _valueSet[i] = YES;
-        _values[i] = otherDictionary->_values[i];
-      }
-    }
-    if (_autocreator) {
-      GPBAutocreatedDictionaryModified(_autocreator, self);
-    }
-  }
-}
-
-- (void)setInt32:(int32_t)value forKey:(BOOL)key {
-  int idx = (key ? 1 : 0);
-  _values[idx] = value;
-  _valueSet[idx] = YES;
-  if (_autocreator) {
-    GPBAutocreatedDictionaryModified(_autocreator, self);
-  }
-}
-
-- (void)removeInt32ForKey:(BOOL)aKey {
-  _valueSet[aKey ? 1 : 0] = NO;
-}
-
-- (void)removeAll {
-  _valueSet[0] = NO;
-  _valueSet[1] = NO;
-}
-
-@end
-
-// clang-format on
-//%PDDM-EXPAND DICTIONARY_BOOL_KEY_TO_POD_IMPL(UInt64, uint64_t)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-#pragma mark - Bool -> UInt64
-
-@implementation GPBBoolUInt64Dictionary {
- @package
-  uint64_t _values[2];
-  BOOL _valueSet[2];
-}
-
-- (instancetype)init {
-  return [self initWithUInt64s:NULL forKeys:NULL count:0];
-}
-
-- (instancetype)initWithUInt64s:(const uint64_t [])values
-                        forKeys:(const BOOL [])keys
-                          count:(NSUInteger)count {
-  self = [super init];
-  if (self) {
-    for (NSUInteger i = 0; i < count; ++i) {
-      int idx = keys[i] ? 1 : 0;
-      _values[idx] = values[i];
-      _valueSet[idx] = YES;
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithDictionary:(GPBBoolUInt64Dictionary *)dictionary {
-  self = [self initWithUInt64s:NULL forKeys:NULL count:0];
-  if (self) {
-    if (dictionary) {
-      for (int i = 0; i < 2; ++i) {
-        if (dictionary->_valueSet[i]) {
-          _values[i] = dictionary->_values[i];
-          _valueSet[i] = YES;
-        }
-      }
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithCapacity:(NSUInteger)numItems {
-  #pragma unused(numItems)
-  return [self initWithUInt64s:NULL forKeys:NULL count:0];
-}
-
-#if !defined(NS_BLOCK_ASSERTIONS)
-- (void)dealloc {
-  NSAssert(!_autocreator,
-           @"%@: Autocreator must be cleared before release, autocreator: %@",
-           [self class], _autocreator);
-  [super dealloc];
-}
-#endif  // !defined(NS_BLOCK_ASSERTIONS)
-
-- (instancetype)copyWithZone:(NSZone *)zone {
-  return [[GPBBoolUInt64Dictionary allocWithZone:zone] initWithDictionary:self];
-}
-
-- (BOOL)isEqual:(id)other {
-  if (self == other) {
-    return YES;
-  }
-  if (![other isKindOfClass:[GPBBoolUInt64Dictionary class]]) {
-    return NO;
-  }
-  GPBBoolUInt64Dictionary *otherDictionary = other;
-  if ((_valueSet[0] != otherDictionary->_valueSet[0]) ||
-      (_valueSet[1] != otherDictionary->_valueSet[1])) {
-    return NO;
-  }
-  if ((_valueSet[0] && (_values[0] != otherDictionary->_values[0])) ||
-      (_valueSet[1] && (_values[1] != otherDictionary->_values[1]))) {
-    return NO;
-  }
-  return YES;
-}
-
-- (NSUInteger)hash {
-  return (_valueSet[0] ? 1 : 0) + (_valueSet[1] ? 1 : 0);
-}
-
-- (NSString *)description {
-  NSMutableString *result = [NSMutableString stringWithFormat:@"<%@ %p> {", [self class], self];
-  if (_valueSet[0]) {
-    [result appendFormat:@"NO: %llu", _values[0]];
-  }
-  if (_valueSet[1]) {
-    [result appendFormat:@"YES: %llu", _values[1]];
-  }
-  [result appendString:@" }"];
-  return result;
-}
-
-- (NSUInteger)count {
-  return (_valueSet[0] ? 1 : 0) + (_valueSet[1] ? 1 : 0);
-}
-
-- (BOOL)getUInt64:(uint64_t *)value forKey:(BOOL)key {
-  int idx = (key ? 1 : 0);
-  if (_valueSet[idx]) {
-    if (value) {
-      *value = _values[idx];
-    }
-    return YES;
-  }
-  return NO;
-}
-
-- (void)setGPBGenericValue:(GPBGenericValue *)value
-     forGPBGenericValueKey:(GPBGenericValue *)key {
-  int idx = (key->valueBool ? 1 : 0);
-  _values[idx] = value->valueUInt64;
-  _valueSet[idx] = YES;
-}
-
-- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
-  if (_valueSet[0]) {
-    block(@"false", [NSString stringWithFormat:@"%llu", _values[0]]);
-  }
-  if (_valueSet[1]) {
-    block(@"true", [NSString stringWithFormat:@"%llu", _values[1]]);
-  }
-}
-
-- (void)enumerateKeysAndUInt64sUsingBlock:
-    (void (NS_NOESCAPE ^)(BOOL key, uint64_t value, BOOL *stop))block {
-  BOOL stop = NO;
-  if (_valueSet[0]) {
-    block(NO, _values[0], &stop);
-  }
-  if (!stop && _valueSet[1]) {
-    block(YES, _values[1], &stop);
-  }
-}
-
-- (size_t)computeSerializedSizeAsField:(GPBFieldDescriptor *)field {
-  GPBDataType valueDataType = GPBGetFieldDataType(field);
-  NSUInteger count = 0;
-  size_t result = 0;
-  for (int i = 0; i < 2; ++i) {
-    if (_valueSet[i]) {
-      ++count;
-      size_t msgSize = ComputeDictBoolFieldSize((i == 1), kMapKeyFieldNumber, GPBDataTypeBool);
-      msgSize += ComputeDictUInt64FieldSize(_values[i], kMapValueFieldNumber, valueDataType);
-      result += GPBComputeRawVarint32SizeForInteger(msgSize) + msgSize;
-    }
-  }
-  size_t tagSize = GPBComputeWireFormatTagSize(GPBFieldNumber(field), GPBDataTypeMessage);
-  result += tagSize * count;
-  return result;
-}
-
-- (void)writeToCodedOutputStream:(GPBCodedOutputStream *)outputStream
-                         asField:(GPBFieldDescriptor *)field {
-  GPBDataType valueDataType = GPBGetFieldDataType(field);
-  uint32_t tag = GPBWireFormatMakeTag(GPBFieldNumber(field), GPBWireFormatLengthDelimited);
-  for (int i = 0; i < 2; ++i) {
-    if (_valueSet[i]) {
-      // Write the tag.
-      [outputStream writeInt32NoTag:tag];
-      // Write the size of the message.
-      size_t msgSize = ComputeDictBoolFieldSize((i == 1), kMapKeyFieldNumber, GPBDataTypeBool);
-      msgSize += ComputeDictUInt64FieldSize(_values[i], kMapValueFieldNumber, valueDataType);
-      [outputStream writeInt32NoTag:(int32_t)msgSize];
-      // Write the fields.
-      WriteDictBoolField(outputStream, (i == 1), kMapKeyFieldNumber, GPBDataTypeBool);
-      WriteDictUInt64Field(outputStream, _values[i], kMapValueFieldNumber, valueDataType);
-    }
-  }
-}
-
-- (void)addEntriesFromDictionary:(GPBBoolUInt64Dictionary *)otherDictionary {
-  if (otherDictionary) {
-    for (int i = 0; i < 2; ++i) {
-      if (otherDictionary->_valueSet[i]) {
-        _valueSet[i] = YES;
-        _values[i] = otherDictionary->_values[i];
-      }
-    }
-    if (_autocreator) {
-      GPBAutocreatedDictionaryModified(_autocreator, self);
-    }
-  }
-}
-
-- (void)setUInt64:(uint64_t)value forKey:(BOOL)key {
-  int idx = (key ? 1 : 0);
-  _values[idx] = value;
-  _valueSet[idx] = YES;
-  if (_autocreator) {
-    GPBAutocreatedDictionaryModified(_autocreator, self);
-  }
-}
-
-- (void)removeUInt64ForKey:(BOOL)aKey {
-  _valueSet[aKey ? 1 : 0] = NO;
-}
-
-- (void)removeAll {
-  _valueSet[0] = NO;
-  _valueSet[1] = NO;
-}
-
-@end
-
-// clang-format on
-//%PDDM-EXPAND DICTIONARY_BOOL_KEY_TO_POD_IMPL(Int64, int64_t)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-#pragma mark - Bool -> Int64
-
-@implementation GPBBoolInt64Dictionary {
- @package
-  int64_t _values[2];
-  BOOL _valueSet[2];
-}
-
-- (instancetype)init {
-  return [self initWithInt64s:NULL forKeys:NULL count:0];
-}
-
-- (instancetype)initWithInt64s:(const int64_t [])values
-                       forKeys:(const BOOL [])keys
-                         count:(NSUInteger)count {
-  self = [super init];
-  if (self) {
-    for (NSUInteger i = 0; i < count; ++i) {
-      int idx = keys[i] ? 1 : 0;
-      _values[idx] = values[i];
-      _valueSet[idx] = YES;
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithDictionary:(GPBBoolInt64Dictionary *)dictionary {
-  self = [self initWithInt64s:NULL forKeys:NULL count:0];
-  if (self) {
-    if (dictionary) {
-      for (int i = 0; i < 2; ++i) {
-        if (dictionary->_valueSet[i]) {
-          _values[i] = dictionary->_values[i];
-          _valueSet[i] = YES;
-        }
-      }
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithCapacity:(NSUInteger)numItems {
-  #pragma unused(numItems)
-  return [self initWithInt64s:NULL forKeys:NULL count:0];
-}
-
-#if !defined(NS_BLOCK_ASSERTIONS)
-- (void)dealloc {
-  NSAssert(!_autocreator,
-           @"%@: Autocreator must be cleared before release, autocreator: %@",
-           [self class], _autocreator);
-  [super dealloc];
-}
-#endif  // !defined(NS_BLOCK_ASSERTIONS)
-
-- (instancetype)copyWithZone:(NSZone *)zone {
-  return [[GPBBoolInt64Dictionary allocWithZone:zone] initWithDictionary:self];
-}
-
-- (BOOL)isEqual:(id)other {
-  if (self == other) {
-    return YES;
-  }
-  if (![other isKindOfClass:[GPBBoolInt64Dictionary class]]) {
-    return NO;
-  }
-  GPBBoolInt64Dictionary *otherDictionary = other;
-  if ((_valueSet[0] != otherDictionary->_valueSet[0]) ||
-      (_valueSet[1] != otherDictionary->_valueSet[1])) {
-    return NO;
-  }
-  if ((_valueSet[0] && (_values[0] != otherDictionary->_values[0])) ||
-      (_valueSet[1] && (_values[1] != otherDictionary->_values[1]))) {
-    return NO;
-  }
-  return YES;
-}
-
-- (NSUInteger)hash {
-  return (_valueSet[0] ? 1 : 0) + (_valueSet[1] ? 1 : 0);
-}
-
-- (NSString *)description {
-  NSMutableString *result = [NSMutableString stringWithFormat:@"<%@ %p> {", [self class], self];
-  if (_valueSet[0]) {
-    [result appendFormat:@"NO: %lld", _values[0]];
-  }
-  if (_valueSet[1]) {
-    [result appendFormat:@"YES: %lld", _values[1]];
-  }
-  [result appendString:@" }"];
-  return result;
-}
-
-- (NSUInteger)count {
-  return (_valueSet[0] ? 1 : 0) + (_valueSet[1] ? 1 : 0);
-}
-
-- (BOOL)getInt64:(int64_t *)value forKey:(BOOL)key {
-  int idx = (key ? 1 : 0);
-  if (_valueSet[idx]) {
-    if (value) {
-      *value = _values[idx];
-    }
-    return YES;
-  }
-  return NO;
-}
-
-- (void)setGPBGenericValue:(GPBGenericValue *)value
-     forGPBGenericValueKey:(GPBGenericValue *)key {
-  int idx = (key->valueBool ? 1 : 0);
-  _values[idx] = value->valueInt64;
-  _valueSet[idx] = YES;
-}
-
-- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
-  if (_valueSet[0]) {
-    block(@"false", [NSString stringWithFormat:@"%lld", _values[0]]);
-  }
-  if (_valueSet[1]) {
-    block(@"true", [NSString stringWithFormat:@"%lld", _values[1]]);
-  }
-}
-
-- (void)enumerateKeysAndInt64sUsingBlock:
-    (void (NS_NOESCAPE ^)(BOOL key, int64_t value, BOOL *stop))block {
-  BOOL stop = NO;
-  if (_valueSet[0]) {
-    block(NO, _values[0], &stop);
-  }
-  if (!stop && _valueSet[1]) {
-    block(YES, _values[1], &stop);
-  }
-}
-
-- (size_t)computeSerializedSizeAsField:(GPBFieldDescriptor *)field {
-  GPBDataType valueDataType = GPBGetFieldDataType(field);
-  NSUInteger count = 0;
-  size_t result = 0;
-  for (int i = 0; i < 2; ++i) {
-    if (_valueSet[i]) {
-      ++count;
-      size_t msgSize = ComputeDictBoolFieldSize((i == 1), kMapKeyFieldNumber, GPBDataTypeBool);
-      msgSize += ComputeDictInt64FieldSize(_values[i], kMapValueFieldNumber, valueDataType);
-      result += GPBComputeRawVarint32SizeForInteger(msgSize) + msgSize;
-    }
-  }
-  size_t tagSize = GPBComputeWireFormatTagSize(GPBFieldNumber(field), GPBDataTypeMessage);
-  result += tagSize * count;
-  return result;
-}
-
-- (void)writeToCodedOutputStream:(GPBCodedOutputStream *)outputStream
-                         asField:(GPBFieldDescriptor *)field {
-  GPBDataType valueDataType = GPBGetFieldDataType(field);
-  uint32_t tag = GPBWireFormatMakeTag(GPBFieldNumber(field), GPBWireFormatLengthDelimited);
-  for (int i = 0; i < 2; ++i) {
-    if (_valueSet[i]) {
-      // Write the tag.
-      [outputStream writeInt32NoTag:tag];
-      // Write the size of the message.
-      size_t msgSize = ComputeDictBoolFieldSize((i == 1), kMapKeyFieldNumber, GPBDataTypeBool);
-      msgSize += ComputeDictInt64FieldSize(_values[i], kMapValueFieldNumber, valueDataType);
-      [outputStream writeInt32NoTag:(int32_t)msgSize];
-      // Write the fields.
-      WriteDictBoolField(outputStream, (i == 1), kMapKeyFieldNumber, GPBDataTypeBool);
-      WriteDictInt64Field(outputStream, _values[i], kMapValueFieldNumber, valueDataType);
-    }
-  }
-}
-
-- (void)addEntriesFromDictionary:(GPBBoolInt64Dictionary *)otherDictionary {
-  if (otherDictionary) {
-    for (int i = 0; i < 2; ++i) {
-      if (otherDictionary->_valueSet[i]) {
-        _valueSet[i] = YES;
-        _values[i] = otherDictionary->_values[i];
-      }
-    }
-    if (_autocreator) {
-      GPBAutocreatedDictionaryModified(_autocreator, self);
-    }
-  }
-}
-
-- (void)setInt64:(int64_t)value forKey:(BOOL)key {
-  int idx = (key ? 1 : 0);
-  _values[idx] = value;
-  _valueSet[idx] = YES;
-  if (_autocreator) {
-    GPBAutocreatedDictionaryModified(_autocreator, self);
-  }
-}
-
-- (void)removeInt64ForKey:(BOOL)aKey {
-  _valueSet[aKey ? 1 : 0] = NO;
-}
-
-- (void)removeAll {
-  _valueSet[0] = NO;
-  _valueSet[1] = NO;
-}
-
-@end
-
-// clang-format on
-//%PDDM-EXPAND DICTIONARY_BOOL_KEY_TO_POD_IMPL(Bool, BOOL)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-#pragma mark - Bool -> Bool
-
-@implementation GPBBoolBoolDictionary {
- @package
-  BOOL _values[2];
-  BOOL _valueSet[2];
-}
-
-- (instancetype)init {
-  return [self initWithBools:NULL forKeys:NULL count:0];
-}
-
-- (instancetype)initWithBools:(const BOOL [])values
-                      forKeys:(const BOOL [])keys
-                        count:(NSUInteger)count {
-  self = [super init];
-  if (self) {
-    for (NSUInteger i = 0; i < count; ++i) {
-      int idx = keys[i] ? 1 : 0;
-      _values[idx] = values[i];
-      _valueSet[idx] = YES;
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithDictionary:(GPBBoolBoolDictionary *)dictionary {
-  self = [self initWithBools:NULL forKeys:NULL count:0];
-  if (self) {
-    if (dictionary) {
-      for (int i = 0; i < 2; ++i) {
-        if (dictionary->_valueSet[i]) {
-          _values[i] = dictionary->_values[i];
-          _valueSet[i] = YES;
-        }
-      }
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithCapacity:(NSUInteger)numItems {
-  #pragma unused(numItems)
-  return [self initWithBools:NULL forKeys:NULL count:0];
-}
-
-#if !defined(NS_BLOCK_ASSERTIONS)
-- (void)dealloc {
-  NSAssert(!_autocreator,
-           @"%@: Autocreator must be cleared before release, autocreator: %@",
-           [self class], _autocreator);
-  [super dealloc];
-}
-#endif  // !defined(NS_BLOCK_ASSERTIONS)
-
-- (instancetype)copyWithZone:(NSZone *)zone {
-  return [[GPBBoolBoolDictionary allocWithZone:zone] initWithDictionary:self];
-}
-
-- (BOOL)isEqual:(id)other {
-  if (self == other) {
-    return YES;
-  }
-  if (![other isKindOfClass:[GPBBoolBoolDictionary class]]) {
-    return NO;
-  }
-  GPBBoolBoolDictionary *otherDictionary = other;
-  if ((_valueSet[0] != otherDictionary->_valueSet[0]) ||
-      (_valueSet[1] != otherDictionary->_valueSet[1])) {
-    return NO;
-  }
-  if ((_valueSet[0] && (_values[0] != otherDictionary->_values[0])) ||
-      (_valueSet[1] && (_values[1] != otherDictionary->_values[1]))) {
-    return NO;
-  }
-  return YES;
-}
-
-- (NSUInteger)hash {
-  return (_valueSet[0] ? 1 : 0) + (_valueSet[1] ? 1 : 0);
-}
-
-- (NSString *)description {
-  NSMutableString *result = [NSMutableString stringWithFormat:@"<%@ %p> {", [self class], self];
-  if (_valueSet[0]) {
-    [result appendFormat:@"NO: %d", _values[0]];
-  }
-  if (_valueSet[1]) {
-    [result appendFormat:@"YES: %d", _values[1]];
-  }
-  [result appendString:@" }"];
-  return result;
-}
-
-- (NSUInteger)count {
-  return (_valueSet[0] ? 1 : 0) + (_valueSet[1] ? 1 : 0);
-}
-
-- (BOOL)getBool:(BOOL *)value forKey:(BOOL)key {
-  int idx = (key ? 1 : 0);
-  if (_valueSet[idx]) {
-    if (value) {
-      *value = _values[idx];
-    }
-    return YES;
-  }
-  return NO;
-}
-
-- (void)setGPBGenericValue:(GPBGenericValue *)value
-     forGPBGenericValueKey:(GPBGenericValue *)key {
-  int idx = (key->valueBool ? 1 : 0);
-  _values[idx] = value->valueBool;
-  _valueSet[idx] = YES;
-}
-
-- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
-  if (_valueSet[0]) {
-    block(@"false", (_values[0] ? @"true" : @"false"));
-  }
-  if (_valueSet[1]) {
-    block(@"true", (_values[1] ? @"true" : @"false"));
-  }
-}
-
-- (void)enumerateKeysAndBoolsUsingBlock:
-    (void (NS_NOESCAPE ^)(BOOL key, BOOL value, BOOL *stop))block {
-  BOOL stop = NO;
-  if (_valueSet[0]) {
-    block(NO, _values[0], &stop);
-  }
-  if (!stop && _valueSet[1]) {
-    block(YES, _values[1], &stop);
-  }
-}
-
-- (size_t)computeSerializedSizeAsField:(GPBFieldDescriptor *)field {
-  GPBDataType valueDataType = GPBGetFieldDataType(field);
-  NSUInteger count = 0;
-  size_t result = 0;
-  for (int i = 0; i < 2; ++i) {
-    if (_valueSet[i]) {
-      ++count;
-      size_t msgSize = ComputeDictBoolFieldSize((i == 1), kMapKeyFieldNumber, GPBDataTypeBool);
-      msgSize += ComputeDictBoolFieldSize(_values[i], kMapValueFieldNumber, valueDataType);
-      result += GPBComputeRawVarint32SizeForInteger(msgSize) + msgSize;
-    }
-  }
-  size_t tagSize = GPBComputeWireFormatTagSize(GPBFieldNumber(field), GPBDataTypeMessage);
-  result += tagSize * count;
-  return result;
-}
-
-- (void)writeToCodedOutputStream:(GPBCodedOutputStream *)outputStream
-                         asField:(GPBFieldDescriptor *)field {
-  GPBDataType valueDataType = GPBGetFieldDataType(field);
-  uint32_t tag = GPBWireFormatMakeTag(GPBFieldNumber(field), GPBWireFormatLengthDelimited);
-  for (int i = 0; i < 2; ++i) {
-    if (_valueSet[i]) {
-      // Write the tag.
-      [outputStream writeInt32NoTag:tag];
-      // Write the size of the message.
-      size_t msgSize = ComputeDictBoolFieldSize((i == 1), kMapKeyFieldNumber, GPBDataTypeBool);
-      msgSize += ComputeDictBoolFieldSize(_values[i], kMapValueFieldNumber, valueDataType);
-      [outputStream writeInt32NoTag:(int32_t)msgSize];
-      // Write the fields.
-      WriteDictBoolField(outputStream, (i == 1), kMapKeyFieldNumber, GPBDataTypeBool);
-      WriteDictBoolField(outputStream, _values[i], kMapValueFieldNumber, valueDataType);
-    }
-  }
-}
-
-- (void)addEntriesFromDictionary:(GPBBoolBoolDictionary *)otherDictionary {
-  if (otherDictionary) {
-    for (int i = 0; i < 2; ++i) {
-      if (otherDictionary->_valueSet[i]) {
-        _valueSet[i] = YES;
-        _values[i] = otherDictionary->_values[i];
-      }
-    }
-    if (_autocreator) {
-      GPBAutocreatedDictionaryModified(_autocreator, self);
-    }
-  }
-}
-
-- (void)setBool:(BOOL)value forKey:(BOOL)key {
-  int idx = (key ? 1 : 0);
-  _values[idx] = value;
-  _valueSet[idx] = YES;
-  if (_autocreator) {
-    GPBAutocreatedDictionaryModified(_autocreator, self);
-  }
-}
-
-- (void)removeBoolForKey:(BOOL)aKey {
-  _valueSet[aKey ? 1 : 0] = NO;
-}
-
-- (void)removeAll {
-  _valueSet[0] = NO;
-  _valueSet[1] = NO;
-}
-
-@end
-
-// clang-format on
-//%PDDM-EXPAND DICTIONARY_BOOL_KEY_TO_POD_IMPL(Float, float)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-#pragma mark - Bool -> Float
-
-@implementation GPBBoolFloatDictionary {
- @package
-  float _values[2];
-  BOOL _valueSet[2];
-}
-
-- (instancetype)init {
-  return [self initWithFloats:NULL forKeys:NULL count:0];
-}
-
-- (instancetype)initWithFloats:(const float [])values
-                       forKeys:(const BOOL [])keys
-                         count:(NSUInteger)count {
-  self = [super init];
-  if (self) {
-    for (NSUInteger i = 0; i < count; ++i) {
-      int idx = keys[i] ? 1 : 0;
-      _values[idx] = values[i];
-      _valueSet[idx] = YES;
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithDictionary:(GPBBoolFloatDictionary *)dictionary {
-  self = [self initWithFloats:NULL forKeys:NULL count:0];
-  if (self) {
-    if (dictionary) {
-      for (int i = 0; i < 2; ++i) {
-        if (dictionary->_valueSet[i]) {
-          _values[i] = dictionary->_values[i];
-          _valueSet[i] = YES;
-        }
-      }
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithCapacity:(NSUInteger)numItems {
-  #pragma unused(numItems)
-  return [self initWithFloats:NULL forKeys:NULL count:0];
-}
-
-#if !defined(NS_BLOCK_ASSERTIONS)
-- (void)dealloc {
-  NSAssert(!_autocreator,
-           @"%@: Autocreator must be cleared before release, autocreator: %@",
-           [self class], _autocreator);
-  [super dealloc];
-}
-#endif  // !defined(NS_BLOCK_ASSERTIONS)
-
-- (instancetype)copyWithZone:(NSZone *)zone {
-  return [[GPBBoolFloatDictionary allocWithZone:zone] initWithDictionary:self];
-}
-
-- (BOOL)isEqual:(id)other {
-  if (self == other) {
-    return YES;
-  }
-  if (![other isKindOfClass:[GPBBoolFloatDictionary class]]) {
-    return NO;
-  }
-  GPBBoolFloatDictionary *otherDictionary = other;
-  if ((_valueSet[0] != otherDictionary->_valueSet[0]) ||
-      (_valueSet[1] != otherDictionary->_valueSet[1])) {
-    return NO;
-  }
-  if ((_valueSet[0] && (_values[0] != otherDictionary->_values[0])) ||
-      (_valueSet[1] && (_values[1] != otherDictionary->_values[1]))) {
-    return NO;
-  }
-  return YES;
-}
-
-- (NSUInteger)hash {
-  return (_valueSet[0] ? 1 : 0) + (_valueSet[1] ? 1 : 0);
-}
-
-- (NSString *)description {
-  NSMutableString *result = [NSMutableString stringWithFormat:@"<%@ %p> {", [self class], self];
-  if (_valueSet[0]) {
-    [result appendFormat:@"NO: %f", _values[0]];
-  }
-  if (_valueSet[1]) {
-    [result appendFormat:@"YES: %f", _values[1]];
-  }
-  [result appendString:@" }"];
-  return result;
-}
-
-- (NSUInteger)count {
-  return (_valueSet[0] ? 1 : 0) + (_valueSet[1] ? 1 : 0);
-}
-
-- (BOOL)getFloat:(float *)value forKey:(BOOL)key {
-  int idx = (key ? 1 : 0);
-  if (_valueSet[idx]) {
-    if (value) {
-      *value = _values[idx];
-    }
-    return YES;
-  }
-  return NO;
-}
-
-- (void)setGPBGenericValue:(GPBGenericValue *)value
-     forGPBGenericValueKey:(GPBGenericValue *)key {
-  int idx = (key->valueBool ? 1 : 0);
-  _values[idx] = value->valueFloat;
-  _valueSet[idx] = YES;
-}
-
-- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
-  if (_valueSet[0]) {
-    block(@"false", [NSString stringWithFormat:@"%.*g", FLT_DIG, _values[0]]);
-  }
-  if (_valueSet[1]) {
-    block(@"true", [NSString stringWithFormat:@"%.*g", FLT_DIG, _values[1]]);
-  }
-}
-
-- (void)enumerateKeysAndFloatsUsingBlock:
-    (void (NS_NOESCAPE ^)(BOOL key, float value, BOOL *stop))block {
-  BOOL stop = NO;
-  if (_valueSet[0]) {
-    block(NO, _values[0], &stop);
-  }
-  if (!stop && _valueSet[1]) {
-    block(YES, _values[1], &stop);
-  }
-}
-
-- (size_t)computeSerializedSizeAsField:(GPBFieldDescriptor *)field {
-  GPBDataType valueDataType = GPBGetFieldDataType(field);
-  NSUInteger count = 0;
-  size_t result = 0;
-  for (int i = 0; i < 2; ++i) {
-    if (_valueSet[i]) {
-      ++count;
-      size_t msgSize = ComputeDictBoolFieldSize((i == 1), kMapKeyFieldNumber, GPBDataTypeBool);
-      msgSize += ComputeDictFloatFieldSize(_values[i], kMapValueFieldNumber, valueDataType);
-      result += GPBComputeRawVarint32SizeForInteger(msgSize) + msgSize;
-    }
-  }
-  size_t tagSize = GPBComputeWireFormatTagSize(GPBFieldNumber(field), GPBDataTypeMessage);
-  result += tagSize * count;
-  return result;
-}
-
-- (void)writeToCodedOutputStream:(GPBCodedOutputStream *)outputStream
-                         asField:(GPBFieldDescriptor *)field {
-  GPBDataType valueDataType = GPBGetFieldDataType(field);
-  uint32_t tag = GPBWireFormatMakeTag(GPBFieldNumber(field), GPBWireFormatLengthDelimited);
-  for (int i = 0; i < 2; ++i) {
-    if (_valueSet[i]) {
-      // Write the tag.
-      [outputStream writeInt32NoTag:tag];
-      // Write the size of the message.
-      size_t msgSize = ComputeDictBoolFieldSize((i == 1), kMapKeyFieldNumber, GPBDataTypeBool);
-      msgSize += ComputeDictFloatFieldSize(_values[i], kMapValueFieldNumber, valueDataType);
-      [outputStream writeInt32NoTag:(int32_t)msgSize];
-      // Write the fields.
-      WriteDictBoolField(outputStream, (i == 1), kMapKeyFieldNumber, GPBDataTypeBool);
-      WriteDictFloatField(outputStream, _values[i], kMapValueFieldNumber, valueDataType);
-    }
-  }
-}
-
-- (void)addEntriesFromDictionary:(GPBBoolFloatDictionary *)otherDictionary {
-  if (otherDictionary) {
-    for (int i = 0; i < 2; ++i) {
-      if (otherDictionary->_valueSet[i]) {
-        _valueSet[i] = YES;
-        _values[i] = otherDictionary->_values[i];
-      }
-    }
-    if (_autocreator) {
-      GPBAutocreatedDictionaryModified(_autocreator, self);
-    }
-  }
-}
-
-- (void)setFloat:(float)value forKey:(BOOL)key {
-  int idx = (key ? 1 : 0);
-  _values[idx] = value;
-  _valueSet[idx] = YES;
-  if (_autocreator) {
-    GPBAutocreatedDictionaryModified(_autocreator, self);
-  }
-}
-
-- (void)removeFloatForKey:(BOOL)aKey {
-  _valueSet[aKey ? 1 : 0] = NO;
-}
-
-- (void)removeAll {
-  _valueSet[0] = NO;
-  _valueSet[1] = NO;
-}
-
-@end
-
-// clang-format on
-//%PDDM-EXPAND DICTIONARY_BOOL_KEY_TO_POD_IMPL(Double, double)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-#pragma mark - Bool -> Double
-
-@implementation GPBBoolDoubleDictionary {
- @package
-  double _values[2];
-  BOOL _valueSet[2];
-}
-
-- (instancetype)init {
-  return [self initWithDoubles:NULL forKeys:NULL count:0];
-}
-
-- (instancetype)initWithDoubles:(const double [])values
-                        forKeys:(const BOOL [])keys
-                          count:(NSUInteger)count {
-  self = [super init];
-  if (self) {
-    for (NSUInteger i = 0; i < count; ++i) {
-      int idx = keys[i] ? 1 : 0;
-      _values[idx] = values[i];
-      _valueSet[idx] = YES;
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithDictionary:(GPBBoolDoubleDictionary *)dictionary {
-  self = [self initWithDoubles:NULL forKeys:NULL count:0];
-  if (self) {
-    if (dictionary) {
-      for (int i = 0; i < 2; ++i) {
-        if (dictionary->_valueSet[i]) {
-          _values[i] = dictionary->_values[i];
-          _valueSet[i] = YES;
-        }
-      }
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithCapacity:(NSUInteger)numItems {
-  #pragma unused(numItems)
-  return [self initWithDoubles:NULL forKeys:NULL count:0];
-}
-
-#if !defined(NS_BLOCK_ASSERTIONS)
-- (void)dealloc {
-  NSAssert(!_autocreator,
-           @"%@: Autocreator must be cleared before release, autocreator: %@",
-           [self class], _autocreator);
-  [super dealloc];
-}
-#endif  // !defined(NS_BLOCK_ASSERTIONS)
-
-- (instancetype)copyWithZone:(NSZone *)zone {
-  return [[GPBBoolDoubleDictionary allocWithZone:zone] initWithDictionary:self];
-}
-
-- (BOOL)isEqual:(id)other {
-  if (self == other) {
-    return YES;
-  }
-  if (![other isKindOfClass:[GPBBoolDoubleDictionary class]]) {
-    return NO;
-  }
-  GPBBoolDoubleDictionary *otherDictionary = other;
-  if ((_valueSet[0] != otherDictionary->_valueSet[0]) ||
-      (_valueSet[1] != otherDictionary->_valueSet[1])) {
-    return NO;
-  }
-  if ((_valueSet[0] && (_values[0] != otherDictionary->_values[0])) ||
-      (_valueSet[1] && (_values[1] != otherDictionary->_values[1]))) {
-    return NO;
-  }
-  return YES;
-}
-
-- (NSUInteger)hash {
-  return (_valueSet[0] ? 1 : 0) + (_valueSet[1] ? 1 : 0);
-}
-
-- (NSString *)description {
-  NSMutableString *result = [NSMutableString stringWithFormat:@"<%@ %p> {", [self class], self];
-  if (_valueSet[0]) {
-    [result appendFormat:@"NO: %lf", _values[0]];
-  }
-  if (_valueSet[1]) {
-    [result appendFormat:@"YES: %lf", _values[1]];
-  }
-  [result appendString:@" }"];
-  return result;
-}
-
-- (NSUInteger)count {
-  return (_valueSet[0] ? 1 : 0) + (_valueSet[1] ? 1 : 0);
-}
-
-- (BOOL)getDouble:(double *)value forKey:(BOOL)key {
-  int idx = (key ? 1 : 0);
-  if (_valueSet[idx]) {
-    if (value) {
-      *value = _values[idx];
-    }
-    return YES;
-  }
-  return NO;
-}
-
-- (void)setGPBGenericValue:(GPBGenericValue *)value
-     forGPBGenericValueKey:(GPBGenericValue *)key {
-  int idx = (key->valueBool ? 1 : 0);
-  _values[idx] = value->valueDouble;
-  _valueSet[idx] = YES;
-}
-
-- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
-  if (_valueSet[0]) {
-    block(@"false", [NSString stringWithFormat:@"%.*lg", DBL_DIG, _values[0]]);
-  }
-  if (_valueSet[1]) {
-    block(@"true", [NSString stringWithFormat:@"%.*lg", DBL_DIG, _values[1]]);
-  }
-}
-
-- (void)enumerateKeysAndDoublesUsingBlock:
-    (void (NS_NOESCAPE ^)(BOOL key, double value, BOOL *stop))block {
-  BOOL stop = NO;
-  if (_valueSet[0]) {
-    block(NO, _values[0], &stop);
-  }
-  if (!stop && _valueSet[1]) {
-    block(YES, _values[1], &stop);
-  }
-}
-
-- (size_t)computeSerializedSizeAsField:(GPBFieldDescriptor *)field {
-  GPBDataType valueDataType = GPBGetFieldDataType(field);
-  NSUInteger count = 0;
-  size_t result = 0;
-  for (int i = 0; i < 2; ++i) {
-    if (_valueSet[i]) {
-      ++count;
-      size_t msgSize = ComputeDictBoolFieldSize((i == 1), kMapKeyFieldNumber, GPBDataTypeBool);
-      msgSize += ComputeDictDoubleFieldSize(_values[i], kMapValueFieldNumber, valueDataType);
-      result += GPBComputeRawVarint32SizeForInteger(msgSize) + msgSize;
-    }
-  }
-  size_t tagSize = GPBComputeWireFormatTagSize(GPBFieldNumber(field), GPBDataTypeMessage);
-  result += tagSize * count;
-  return result;
-}
-
-- (void)writeToCodedOutputStream:(GPBCodedOutputStream *)outputStream
-                         asField:(GPBFieldDescriptor *)field {
-  GPBDataType valueDataType = GPBGetFieldDataType(field);
-  uint32_t tag = GPBWireFormatMakeTag(GPBFieldNumber(field), GPBWireFormatLengthDelimited);
-  for (int i = 0; i < 2; ++i) {
-    if (_valueSet[i]) {
-      // Write the tag.
-      [outputStream writeInt32NoTag:tag];
-      // Write the size of the message.
-      size_t msgSize = ComputeDictBoolFieldSize((i == 1), kMapKeyFieldNumber, GPBDataTypeBool);
-      msgSize += ComputeDictDoubleFieldSize(_values[i], kMapValueFieldNumber, valueDataType);
-      [outputStream writeInt32NoTag:(int32_t)msgSize];
-      // Write the fields.
-      WriteDictBoolField(outputStream, (i == 1), kMapKeyFieldNumber, GPBDataTypeBool);
-      WriteDictDoubleField(outputStream, _values[i], kMapValueFieldNumber, valueDataType);
-    }
-  }
-}
-
-- (void)addEntriesFromDictionary:(GPBBoolDoubleDictionary *)otherDictionary {
-  if (otherDictionary) {
-    for (int i = 0; i < 2; ++i) {
-      if (otherDictionary->_valueSet[i]) {
-        _valueSet[i] = YES;
-        _values[i] = otherDictionary->_values[i];
-      }
-    }
-    if (_autocreator) {
-      GPBAutocreatedDictionaryModified(_autocreator, self);
-    }
-  }
-}
-
-- (void)setDouble:(double)value forKey:(BOOL)key {
-  int idx = (key ? 1 : 0);
-  _values[idx] = value;
-  _valueSet[idx] = YES;
-  if (_autocreator) {
-    GPBAutocreatedDictionaryModified(_autocreator, self);
-  }
-}
-
-- (void)removeDoubleForKey:(BOOL)aKey {
-  _valueSet[aKey ? 1 : 0] = NO;
-}
-
-- (void)removeAll {
-  _valueSet[0] = NO;
-  _valueSet[1] = NO;
-}
-
-@end
-
-// clang-format on
-//%PDDM-EXPAND DICTIONARY_BOOL_KEY_TO_OBJECT_IMPL(Object, id)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-#pragma mark - Bool -> Object
-
-@implementation GPBBoolObjectDictionary {
- @package
-  id _values[2];
-}
-
-- (instancetype)init {
-  return [self initWithObjects:NULL forKeys:NULL count:0];
-}
-
-- (instancetype)initWithObjects:(const id [])objects
-                        forKeys:(const BOOL [])keys
-                          count:(NSUInteger)count {
-  self = [super init];
-  if (self) {
-    for (NSUInteger i = 0; i < count; ++i) {
-      if (!objects[i]) {
-        [NSException raise:NSInvalidArgumentException
-                    format:@"Attempting to add nil object to a Dictionary"];
-      }
-      int idx = keys[i] ? 1 : 0;
-      [_values[idx] release];
-      _values[idx] = (id)[objects[i] retain];
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithDictionary:(GPBBoolObjectDictionary *)dictionary {
-  self = [self initWithObjects:NULL forKeys:NULL count:0];
-  if (self) {
-    if (dictionary) {
-      _values[0] = [dictionary->_values[0] retain];
-      _values[1] = [dictionary->_values[1] retain];
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithCapacity:(NSUInteger)numItems {
-  #pragma unused(numItems)
-  return [self initWithObjects:NULL forKeys:NULL count:0];
-}
-
-- (void)dealloc {
-  NSAssert(!_autocreator,
-           @"%@: Autocreator must be cleared before release, autocreator: %@",
-           [self class], _autocreator);
-  [_values[0] release];
-  [_values[1] release];
-  [super dealloc];
-}
-
-- (instancetype)copyWithZone:(NSZone *)zone {
-  return [[GPBBoolObjectDictionary allocWithZone:zone] initWithDictionary:self];
-}
-
-- (BOOL)isEqual:(id)other {
-  if (self == other) {
-    return YES;
-  }
-  if (![other isKindOfClass:[GPBBoolObjectDictionary class]]) {
-    return NO;
-  }
-  GPBBoolObjectDictionary *otherDictionary = other;
-  if (((_values[0] != nil) != (otherDictionary->_values[0] != nil)) ||
-      ((_values[1] != nil) != (otherDictionary->_values[1] != nil))) {
-    return NO;
-  }
-  if (((_values[0] != nil) && (![_values[0] isEqual:otherDictionary->_values[0]])) ||
-      ((_values[1] != nil) && (![_values[1] isEqual:otherDictionary->_values[1]]))) {
-    return NO;
-  }
-  return YES;
-}
-
-- (NSUInteger)hash {
-  return ((_values[0] != nil) ? 1 : 0) + ((_values[1] != nil) ? 1 : 0);
-}
-
-- (NSString *)description {
-  NSMutableString *result = [NSMutableString stringWithFormat:@"<%@ %p> {", [self class], self];
-  if ((_values[0] != nil)) {
-    [result appendFormat:@"NO: %@", _values[0]];
-  }
-  if ((_values[1] != nil)) {
-    [result appendFormat:@"YES: %@", _values[1]];
-  }
-  [result appendString:@" }"];
-  return result;
-}
-
-- (NSUInteger)count {
-  return ((_values[0] != nil) ? 1 : 0) + ((_values[1] != nil) ? 1 : 0);
-}
-
-- (id)objectForKey:(BOOL)key {
-  return _values[key ? 1 : 0];
-}
-
-- (void)setGPBGenericValue:(GPBGenericValue *)value
-     forGPBGenericValueKey:(GPBGenericValue *)key {
-  int idx = (key->valueBool ? 1 : 0);
-  [_values[idx] release];
-  _values[idx] = [value->valueString retain];
-}
-
-- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
-  if (_values[0] != nil) {
-    block(@"false", _values[0]);
-  }
-  if ((_values[1] != nil)) {
-    block(@"true", _values[1]);
-  }
-}
-
-- (void)enumerateKeysAndObjectsUsingBlock:
-    (void (NS_NOESCAPE ^)(BOOL key, id object, BOOL *stop))block {
-  BOOL stop = NO;
-  if (_values[0] != nil) {
-    block(NO, _values[0], &stop);
-  }
-  if (!stop && (_values[1] != nil)) {
-    block(YES, _values[1], &stop);
-  }
-}
-
-- (BOOL)isInitialized {
-  if (_values[0] && ![_values[0] isInitialized]) {
-    return NO;
-  }
-  if (_values[1] && ![_values[1] isInitialized]) {
-    return NO;
-  }
-  return YES;
-}
-
-- (instancetype)deepCopyWithZone:(NSZone *)zone {
-  GPBBoolObjectDictionary *newDict =
-      [[GPBBoolObjectDictionary alloc] init];
-  for (int i = 0; i < 2; ++i) {
-    if (_values[i] != nil) {
-      newDict->_values[i] = [_values[i] copyWithZone:zone];
-    }
-  }
-  return newDict;
-}
-
-- (size_t)computeSerializedSizeAsField:(GPBFieldDescriptor *)field {
-  GPBDataType valueDataType = GPBGetFieldDataType(field);
-  NSUInteger count = 0;
-  size_t result = 0;
-  for (int i = 0; i < 2; ++i) {
-    if (_values[i] != nil) {
-      ++count;
-      size_t msgSize = ComputeDictBoolFieldSize((i == 1), kMapKeyFieldNumber, GPBDataTypeBool);
-      msgSize += ComputeDictObjectFieldSize(_values[i], kMapValueFieldNumber, valueDataType);
-      result += GPBComputeRawVarint32SizeForInteger(msgSize) + msgSize;
-    }
-  }
-  size_t tagSize = GPBComputeWireFormatTagSize(GPBFieldNumber(field), GPBDataTypeMessage);
-  result += tagSize * count;
-  return result;
-}
-
-- (void)writeToCodedOutputStream:(GPBCodedOutputStream *)outputStream
-                         asField:(GPBFieldDescriptor *)field {
-  GPBDataType valueDataType = GPBGetFieldDataType(field);
-  uint32_t tag = GPBWireFormatMakeTag(GPBFieldNumber(field), GPBWireFormatLengthDelimited);
-  for (int i = 0; i < 2; ++i) {
-    if (_values[i] != nil) {
-      // Write the tag.
-      [outputStream writeInt32NoTag:tag];
-      // Write the size of the message.
-      size_t msgSize = ComputeDictBoolFieldSize((i == 1), kMapKeyFieldNumber, GPBDataTypeBool);
-      msgSize += ComputeDictObjectFieldSize(_values[i], kMapValueFieldNumber, valueDataType);
-      [outputStream writeInt32NoTag:(int32_t)msgSize];
-      // Write the fields.
-      WriteDictBoolField(outputStream, (i == 1), kMapKeyFieldNumber, GPBDataTypeBool);
-      WriteDictObjectField(outputStream, _values[i], kMapValueFieldNumber, valueDataType);
-    }
-  }
-}
-
-- (void)addEntriesFromDictionary:(GPBBoolObjectDictionary *)otherDictionary {
-  if (otherDictionary) {
-    for (int i = 0; i < 2; ++i) {
-      if (otherDictionary->_values[i] != nil) {
-        [_values[i] release];
-        _values[i] = [otherDictionary->_values[i] retain];
-      }
-    }
-    if (_autocreator) {
-      GPBAutocreatedDictionaryModified(_autocreator, self);
-    }
-  }
-}
-
-- (void)setObject:(id)object forKey:(BOOL)key {
-  if (!object) {
-    [NSException raise:NSInvalidArgumentException
-                format:@"Attempting to add nil object to a Dictionary"];
-  }
-  int idx = (key ? 1 : 0);
-  [_values[idx] release];
-  _values[idx] = [object retain];
-  if (_autocreator) {
-    GPBAutocreatedDictionaryModified(_autocreator, self);
-  }
-}
-
-- (void)removeObjectForKey:(BOOL)aKey {
-  int idx = (aKey ? 1 : 0);
-  [_values[idx] release];
-  _values[idx] = nil;
-}
-
-- (void)removeAll {
-  for (int i = 0; i < 2; ++i) {
-    [_values[i] release];
-    _values[i] = nil;
-  }
-}
-
-@end
-
-// clang-format on
-//%PDDM-EXPAND-END (8 expansions)
-
-#pragma mark - Bool -> Enum
-
-@implementation GPBBoolEnumDictionary {
- @package
-  GPBEnumValidationFunc _validationFunc;
-  int32_t _values[2];
-  BOOL _valueSet[2];
-}
-
-@synthesize validationFunc = _validationFunc;
-
-- (instancetype)init {
-  return [self initWithValidationFunction:NULL rawValues:NULL forKeys:NULL count:0];
-}
-
-- (instancetype)initWithValidationFunction:(GPBEnumValidationFunc)func {
-  return [self initWithValidationFunction:func rawValues:NULL forKeys:NULL count:0];
-}
-
-- (instancetype)initWithValidationFunction:(GPBEnumValidationFunc)func
-                                rawValues:(const int32_t [])rawValues
-                                   forKeys:(const BOOL [])keys
-                                     count:(NSUInteger)count {
-  self = [super init];
-  if (self) {
-    _validationFunc = (func != NULL ? func : DictDefault_IsValidValue);
-    for (NSUInteger i = 0; i < count; ++i) {
-      int idx = keys[i] ? 1 : 0;
-      _values[idx] = rawValues[i];
-      _valueSet[idx] = YES;
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithDictionary:(GPBBoolEnumDictionary *)dictionary {
-  self = [self initWithValidationFunction:dictionary.validationFunc
-                                rawValues:NULL
-                                  forKeys:NULL
-                                    count:0];
-  if (self) {
-    if (dictionary) {
-      for (int i = 0; i < 2; ++i) {
-        if (dictionary->_valueSet[i]) {
-          _values[i] = dictionary->_values[i];
-          _valueSet[i] = YES;
-        }
-      }
-    }
-  }
-  return self;
-}
-
-- (instancetype)initWithValidationFunction:(GPBEnumValidationFunc)func
-                                  capacity:(NSUInteger)numItems {
-#pragma unused(numItems)
-  return [self initWithValidationFunction:func rawValues:NULL forKeys:NULL count:0];
-}
-
-#if !defined(NS_BLOCK_ASSERTIONS)
-- (void)dealloc {
-  NSAssert(!_autocreator,
-           @"%@: Autocreator must be cleared before release, autocreator: %@",
-           [self class], _autocreator);
-  [super dealloc];
-}
-#endif  // !defined(NS_BLOCK_ASSERTIONS)
-
-- (instancetype)copyWithZone:(NSZone *)zone {
-  return [[GPBBoolEnumDictionary allocWithZone:zone] initWithDictionary:self];
-}
-
-- (BOOL)isEqual:(id)other {
-  if (self == other) {
-    return YES;
-  }
-  if (![other isKindOfClass:[GPBBoolEnumDictionary class]]) {
-    return NO;
-  }
-  GPBBoolEnumDictionary *otherDictionary = other;
-  if ((_valueSet[0] != otherDictionary->_valueSet[0]) ||
-      (_valueSet[1] != otherDictionary->_valueSet[1])) {
-    return NO;
-  }
-  if ((_valueSet[0] && (_values[0] != otherDictionary->_values[0])) ||
-      (_valueSet[1] && (_values[1] != otherDictionary->_values[1]))) {
-    return NO;
-  }
-  return YES;
-}
-
-- (NSUInteger)hash {
-  return (_valueSet[0] ? 1 : 0) + (_valueSet[1] ? 1 : 0);
-}
-
-- (NSString *)description {
-  NSMutableString *result = [NSMutableString stringWithFormat:@"<%@ %p> {", [self class], self];
-  if (_valueSet[0]) {
-    [result appendFormat:@"NO: %d", _values[0]];
-  }
-  if (_valueSet[1]) {
-    [result appendFormat:@"YES: %d", _values[1]];
-  }
-  [result appendString:@" }"];
-  return result;
-}
-
-- (NSUInteger)count {
-  return (_valueSet[0] ? 1 : 0) + (_valueSet[1] ? 1 : 0);
-}
-
-- (BOOL)getEnum:(int32_t*)value forKey:(BOOL)key {
-  int idx = (key ? 1 : 0);
-  if (_valueSet[idx]) {
-    if (value) {
-      int32_t result = _values[idx];
-      if (!_validationFunc(result)) {
-        result = kGPBUnrecognizedEnumeratorValue;
-      }
-      *value = result;
-    }
-    return YES;
-  }
-  return NO;
-}
-
-- (BOOL)getRawValue:(int32_t*)rawValue forKey:(BOOL)key {
-  int idx = (key ? 1 : 0);
-  if (_valueSet[idx]) {
-    if (rawValue) {
-      *rawValue = _values[idx];
-    }
-    return YES;
-  }
-  return NO;
-}
-
-- (void)enumerateKeysAndRawValuesUsingBlock:
-    (void (NS_NOESCAPE ^)(BOOL key, int32_t value, BOOL *stop))block {
-  BOOL stop = NO;
-  if (_valueSet[0]) {
-    block(NO, _values[0], &stop);
-  }
-  if (!stop && _valueSet[1]) {
-    block(YES, _values[1], &stop);
-  }
-}
-
-- (void)enumerateKeysAndEnumsUsingBlock:
-    (void (NS_NOESCAPE ^)(BOOL key, int32_t rawValue, BOOL *stop))block {
-  BOOL stop = NO;
-  GPBEnumValidationFunc func = _validationFunc;
-  int32_t validatedValue;
-  if (_valueSet[0]) {
-    validatedValue = _values[0];
-    if (!func(validatedValue)) {
-      validatedValue = kGPBUnrecognizedEnumeratorValue;
-    }
-    block(NO, validatedValue, &stop);
-  }
-  if (!stop && _valueSet[1]) {
-    validatedValue = _values[1];
-    if (!func(validatedValue)) {
-      validatedValue = kGPBUnrecognizedEnumeratorValue;
-    }
-    block(YES, validatedValue, &stop);
-  }
-}
-
-//%PDDM-EXPAND SERIAL_DATA_FOR_ENTRY_POD_Enum(Bool)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-- (NSData *)serializedDataForUnknownValue:(int32_t)value
-                                   forKey:(GPBGenericValue *)key
-                              keyDataType:(GPBDataType)keyDataType {
-  size_t msgSize = ComputeDictBoolFieldSize(key->valueBool, kMapKeyFieldNumber, keyDataType);
-  msgSize += ComputeDictEnumFieldSize(value, kMapValueFieldNumber, GPBDataTypeEnum);
-  NSMutableData *data = [NSMutableData dataWithLength:msgSize];
-  GPBCodedOutputStream *outputStream = [[GPBCodedOutputStream alloc] initWithData:data];
-  WriteDictBoolField(outputStream, key->valueBool, kMapKeyFieldNumber, keyDataType);
-  WriteDictEnumField(outputStream, value, kMapValueFieldNumber, GPBDataTypeEnum);
-  [outputStream release];
-  return data;
-}
-
-// clang-format on
-//%PDDM-EXPAND-END SERIAL_DATA_FOR_ENTRY_POD_Enum(Bool)
-
-- (size_t)computeSerializedSizeAsField:(GPBFieldDescriptor *)field {
-  GPBDataType valueDataType = GPBGetFieldDataType(field);
-  NSUInteger count = 0;
-  size_t result = 0;
-  for (int i = 0; i < 2; ++i) {
-    if (_valueSet[i]) {
-      ++count;
-      size_t msgSize = ComputeDictBoolFieldSize((i == 1), kMapKeyFieldNumber, GPBDataTypeBool);
-      msgSize += ComputeDictInt32FieldSize(_values[i], kMapValueFieldNumber, valueDataType);
-      result += GPBComputeRawVarint32SizeForInteger(msgSize) + msgSize;
-    }
-  }
-  size_t tagSize = GPBComputeWireFormatTagSize(GPBFieldNumber(field), GPBDataTypeMessage);
-  result += tagSize * count;
-  return result;
-}
-
-- (void)writeToCodedOutputStream:(GPBCodedOutputStream *)outputStream
-                         asField:(GPBFieldDescriptor *)field {
-  GPBDataType valueDataType = GPBGetFieldDataType(field);
-  uint32_t tag = GPBWireFormatMakeTag(GPBFieldNumber(field), GPBWireFormatLengthDelimited);
-  for (int i = 0; i < 2; ++i) {
-    if (_valueSet[i]) {
-      // Write the tag.
-      [outputStream writeInt32NoTag:tag];
-      // Write the size of the message.
-      size_t msgSize = ComputeDictBoolFieldSize((i == 1), kMapKeyFieldNumber, GPBDataTypeBool);
-      msgSize += ComputeDictInt32FieldSize(_values[i], kMapValueFieldNumber, valueDataType);
-      [outputStream writeInt32NoTag:(int32_t)msgSize];
-      // Write the fields.
-      WriteDictBoolField(outputStream, (i == 1), kMapKeyFieldNumber, GPBDataTypeBool);
-      WriteDictInt32Field(outputStream, _values[i], kMapValueFieldNumber, valueDataType);
-    }
-  }
-}
-
-- (void)enumerateForTextFormat:(void (NS_NOESCAPE ^)(id keyObj, id valueObj))block {
-  if (_valueSet[0]) {
-    block(@"false", @(_values[0]));
-  }
-  if (_valueSet[1]) {
-    block(@"true", @(_values[1]));
-  }
-}
-
-- (void)setGPBGenericValue:(GPBGenericValue *)value
-     forGPBGenericValueKey:(GPBGenericValue *)key {
-  int idx = (key->valueBool ? 1 : 0);
-  _values[idx] = value->valueInt32;
-  _valueSet[idx] = YES;
-}
-
-- (void)addRawEntriesFromDictionary:(GPBBoolEnumDictionary *)otherDictionary {
-  if (otherDictionary) {
-    for (int i = 0; i < 2; ++i) {
-      if (otherDictionary->_valueSet[i]) {
-        _valueSet[i] = YES;
-        _values[i] = otherDictionary->_values[i];
-      }
-    }
-    if (_autocreator) {
-      GPBAutocreatedDictionaryModified(_autocreator, self);
-    }
-  }
-}
-
-- (void)setEnum:(int32_t)value forKey:(BOOL)key {
-  if (!_validationFunc(value)) {
-    [NSException raise:NSInvalidArgumentException
-                format:@"GPBBoolEnumDictionary: Attempt to set an unknown enum value (%d)",
-     value];
-  }
-  int idx = (key ? 1 : 0);
-  _values[idx] = value;
-  _valueSet[idx] = YES;
-  if (_autocreator) {
-    GPBAutocreatedDictionaryModified(_autocreator, self);
-  }
-}
-
-- (void)setRawValue:(int32_t)rawValue forKey:(BOOL)key {
-  int idx = (key ? 1 : 0);
-  _values[idx] = rawValue;
-  _valueSet[idx] = YES;
-  if (_autocreator) {
-    GPBAutocreatedDictionaryModified(_autocreator, self);
-  }
-}
-
-- (void)removeEnumForKey:(BOOL)aKey {
-  _valueSet[aKey ? 1 : 0] = NO;
-}
-
-- (void)removeAll {
-  _valueSet[0] = NO;
-  _valueSet[1] = NO;
-}
-
-@end
-
-#pragma mark - NSDictionary Subclass
-
-@implementation GPBAutocreatedDictionary {
-  NSMutableDictionary *_dictionary;
-}
-
-- (void)dealloc {
-  NSAssert(!_autocreator,
-           @"%@: Autocreator must be cleared before release, autocreator: %@",
-           [self class], _autocreator);
-  [_dictionary release];
-  [super dealloc];
-}
-
-#pragma mark Required NSDictionary overrides
-
-- (instancetype)initWithObjects:(const id [])objects
-                        forKeys:(const id<NSCopying> [])keys
-                          count:(NSUInteger)count {
-  self = [super init];
-  if (self) {
-    _dictionary = [[NSMutableDictionary alloc] initWithObjects:objects
-                                                       forKeys:keys
-                                                         count:count];
-  }
-  return self;
-}
-
-- (NSUInteger)count {
-  return [_dictionary count];
-}
-
-- (id)objectForKey:(id)aKey {
-  return [_dictionary objectForKey:aKey];
-}
-
-- (NSEnumerator *)keyEnumerator {
-  if (_dictionary == nil) {
-    _dictionary = [[NSMutableDictionary alloc] init];
-  }
-  return [_dictionary keyEnumerator];
-}
-
-#pragma mark Required NSMutableDictionary overrides
-
-// Only need to call GPBAutocreatedDictionaryModified() when adding things
-// since we only autocreate empty dictionaries.
-
-- (void)setObject:(id)anObject forKey:(id<NSCopying>)aKey {
-  if (_dictionary == nil) {
-    _dictionary = [[NSMutableDictionary alloc] init];
-  }
-  [_dictionary setObject:anObject forKey:aKey];
-  if (_autocreator) {
-    GPBAutocreatedDictionaryModified(_autocreator, self);
-  }
-}
-
-- (void)removeObjectForKey:(id)aKey {
-  [_dictionary removeObjectForKey:aKey];
-}
-
-#pragma mark Extra things hooked
-
-- (id)copyWithZone:(NSZone *)zone {
-  if (_dictionary == nil) {
-    return [[NSMutableDictionary allocWithZone:zone] init];
-  }
-  return [_dictionary copyWithZone:zone];
-}
-
-- (id)mutableCopyWithZone:(NSZone *)zone {
-  if (_dictionary == nil) {
-    return [[NSMutableDictionary allocWithZone:zone] init];
-  }
-  return [_dictionary mutableCopyWithZone:zone];
-}
-
-// Not really needed, but subscripting is likely common enough it doesn't hurt
-// to ensure it goes directly to the real NSMutableDictionary.
-- (id)objectForKeyedSubscript:(id)key {
-  return [_dictionary objectForKeyedSubscript:key];
-}
-
-// Not really needed, but subscripting is likely common enough it doesn't hurt
-// to ensure it goes directly to the real NSMutableDictionary.
-- (void)setObject:(id)obj forKeyedSubscript:(id<NSCopying>)key {
-  if (_dictionary == nil) {
-    _dictionary = [[NSMutableDictionary alloc] init];
-  }
-  [_dictionary setObject:obj forKeyedSubscript:key];
-  if (_autocreator) {
-    GPBAutocreatedDictionaryModified(_autocreator, self);
-  }
-}
-
-- (void)enumerateKeysAndObjectsUsingBlock:(void (NS_NOESCAPE ^)(id key,
-                                                    id obj,
-                                                    BOOL *stop))block {
-  [_dictionary enumerateKeysAndObjectsUsingBlock:block];
-}
-
-- (void)enumerateKeysAndObjectsWithOptions:(NSEnumerationOptions)opts
-                                usingBlock:(void (NS_NOESCAPE ^)(id key,
-                                                     id obj,
-                                                     BOOL *stop))block {
-  [_dictionary enumerateKeysAndObjectsWithOptions:opts usingBlock:block];
-}
-
-@end
-
-#pragma clang diagnostic pop
diff --git a/libs/protobuf/objectivec/GPBDictionary_PackagePrivate.h b/libs/protobuf/objectivec/GPBDictionary_PackagePrivate.h
deleted file mode 100644
index 15e4283..0000000
--- a/libs/protobuf/objectivec/GPBDictionary_PackagePrivate.h
+++ /dev/null
@@ -1,500 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#import <Foundation/Foundation.h>
-
-#import "GPBDictionary.h"
-
-@class GPBCodedInputStream;
-@class GPBCodedOutputStream;
-@class GPBExtensionRegistry;
-@class GPBFieldDescriptor;
-
-@protocol GPBDictionaryInternalsProtocol
-- (size_t)computeSerializedSizeAsField:(GPBFieldDescriptor *)field;
-- (void)writeToCodedOutputStream:(GPBCodedOutputStream *)outputStream
-                         asField:(GPBFieldDescriptor *)field;
-- (void)setGPBGenericValue:(GPBGenericValue *)value
-     forGPBGenericValueKey:(GPBGenericValue *)key;
-- (void)enumerateForTextFormat:(void (^)(id keyObj, id valueObj))block;
-@end
-
-//%PDDM-DEFINE DICTIONARY_PRIV_INTERFACES_FOR_POD_KEY(KEY_NAME)
-//%DICTIONARY_POD_PRIV_INTERFACES_FOR_KEY(KEY_NAME)
-//%DICTIONARY_PRIVATE_INTERFACES(KEY_NAME, Object, Object)
-//%PDDM-DEFINE DICTIONARY_POD_PRIV_INTERFACES_FOR_KEY(KEY_NAME)
-//%DICTIONARY_PRIVATE_INTERFACES(KEY_NAME, UInt32, Basic)
-//%DICTIONARY_PRIVATE_INTERFACES(KEY_NAME, Int32, Basic)
-//%DICTIONARY_PRIVATE_INTERFACES(KEY_NAME, UInt64, Basic)
-//%DICTIONARY_PRIVATE_INTERFACES(KEY_NAME, Int64, Basic)
-//%DICTIONARY_PRIVATE_INTERFACES(KEY_NAME, Bool, Basic)
-//%DICTIONARY_PRIVATE_INTERFACES(KEY_NAME, Float, Basic)
-//%DICTIONARY_PRIVATE_INTERFACES(KEY_NAME, Double, Basic)
-//%DICTIONARY_PRIVATE_INTERFACES(KEY_NAME, Enum, Enum)
-
-//%PDDM-DEFINE DICTIONARY_PRIVATE_INTERFACES(KEY_NAME, VALUE_NAME, HELPER)
-//%@interface GPB##KEY_NAME##VALUE_NAME##Dictionary () <GPBDictionaryInternalsProtocol> {
-//% @package
-//%  GPB_UNSAFE_UNRETAINED GPBMessage *_autocreator;
-//%}
-//%EXTRA_DICTIONARY_PRIVATE_INTERFACES_##HELPER()@end
-//%
-
-//%PDDM-DEFINE EXTRA_DICTIONARY_PRIVATE_INTERFACES_Basic()
-// Empty
-//%PDDM-DEFINE EXTRA_DICTIONARY_PRIVATE_INTERFACES_Object()
-//%- (BOOL)isInitialized;
-//%- (instancetype)deepCopyWithZone:(NSZone *)zone
-//%    __attribute__((ns_returns_retained));
-//%
-//%PDDM-DEFINE EXTRA_DICTIONARY_PRIVATE_INTERFACES_Enum()
-//%- (NSData *)serializedDataForUnknownValue:(int32_t)value
-//%                                   forKey:(GPBGenericValue *)key
-//%                              keyDataType:(GPBDataType)keyDataType;
-//%
-
-//%PDDM-EXPAND DICTIONARY_PRIV_INTERFACES_FOR_POD_KEY(UInt32)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-@interface GPBUInt32UInt32Dictionary () <GPBDictionaryInternalsProtocol> {
- @package
-  GPB_UNSAFE_UNRETAINED GPBMessage *_autocreator;
-}
-@end
-
-@interface GPBUInt32Int32Dictionary () <GPBDictionaryInternalsProtocol> {
- @package
-  GPB_UNSAFE_UNRETAINED GPBMessage *_autocreator;
-}
-@end
-
-@interface GPBUInt32UInt64Dictionary () <GPBDictionaryInternalsProtocol> {
- @package
-  GPB_UNSAFE_UNRETAINED GPBMessage *_autocreator;
-}
-@end
-
-@interface GPBUInt32Int64Dictionary () <GPBDictionaryInternalsProtocol> {
- @package
-  GPB_UNSAFE_UNRETAINED GPBMessage *_autocreator;
-}
-@end
-
-@interface GPBUInt32BoolDictionary () <GPBDictionaryInternalsProtocol> {
- @package
-  GPB_UNSAFE_UNRETAINED GPBMessage *_autocreator;
-}
-@end
-
-@interface GPBUInt32FloatDictionary () <GPBDictionaryInternalsProtocol> {
- @package
-  GPB_UNSAFE_UNRETAINED GPBMessage *_autocreator;
-}
-@end
-
-@interface GPBUInt32DoubleDictionary () <GPBDictionaryInternalsProtocol> {
- @package
-  GPB_UNSAFE_UNRETAINED GPBMessage *_autocreator;
-}
-@end
-
-@interface GPBUInt32EnumDictionary () <GPBDictionaryInternalsProtocol> {
- @package
-  GPB_UNSAFE_UNRETAINED GPBMessage *_autocreator;
-}
-- (NSData *)serializedDataForUnknownValue:(int32_t)value
-                                   forKey:(GPBGenericValue *)key
-                              keyDataType:(GPBDataType)keyDataType;
-@end
-
-@interface GPBUInt32ObjectDictionary () <GPBDictionaryInternalsProtocol> {
- @package
-  GPB_UNSAFE_UNRETAINED GPBMessage *_autocreator;
-}
-- (BOOL)isInitialized;
-- (instancetype)deepCopyWithZone:(NSZone *)zone
-    __attribute__((ns_returns_retained));
-@end
-
-// clang-format on
-//%PDDM-EXPAND DICTIONARY_PRIV_INTERFACES_FOR_POD_KEY(Int32)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-@interface GPBInt32UInt32Dictionary () <GPBDictionaryInternalsProtocol> {
- @package
-  GPB_UNSAFE_UNRETAINED GPBMessage *_autocreator;
-}
-@end
-
-@interface GPBInt32Int32Dictionary () <GPBDictionaryInternalsProtocol> {
- @package
-  GPB_UNSAFE_UNRETAINED GPBMessage *_autocreator;
-}
-@end
-
-@interface GPBInt32UInt64Dictionary () <GPBDictionaryInternalsProtocol> {
- @package
-  GPB_UNSAFE_UNRETAINED GPBMessage *_autocreator;
-}
-@end
-
-@interface GPBInt32Int64Dictionary () <GPBDictionaryInternalsProtocol> {
- @package
-  GPB_UNSAFE_UNRETAINED GPBMessage *_autocreator;
-}
-@end
-
-@interface GPBInt32BoolDictionary () <GPBDictionaryInternalsProtocol> {
- @package
-  GPB_UNSAFE_UNRETAINED GPBMessage *_autocreator;
-}
-@end
-
-@interface GPBInt32FloatDictionary () <GPBDictionaryInternalsProtocol> {
- @package
-  GPB_UNSAFE_UNRETAINED GPBMessage *_autocreator;
-}
-@end
-
-@interface GPBInt32DoubleDictionary () <GPBDictionaryInternalsProtocol> {
- @package
-  GPB_UNSAFE_UNRETAINED GPBMessage *_autocreator;
-}
-@end
-
-@interface GPBInt32EnumDictionary () <GPBDictionaryInternalsProtocol> {
- @package
-  GPB_UNSAFE_UNRETAINED GPBMessage *_autocreator;
-}
-- (NSData *)serializedDataForUnknownValue:(int32_t)value
-                                   forKey:(GPBGenericValue *)key
-                              keyDataType:(GPBDataType)keyDataType;
-@end
-
-@interface GPBInt32ObjectDictionary () <GPBDictionaryInternalsProtocol> {
- @package
-  GPB_UNSAFE_UNRETAINED GPBMessage *_autocreator;
-}
-- (BOOL)isInitialized;
-- (instancetype)deepCopyWithZone:(NSZone *)zone
-    __attribute__((ns_returns_retained));
-@end
-
-// clang-format on
-//%PDDM-EXPAND DICTIONARY_PRIV_INTERFACES_FOR_POD_KEY(UInt64)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-@interface GPBUInt64UInt32Dictionary () <GPBDictionaryInternalsProtocol> {
- @package
-  GPB_UNSAFE_UNRETAINED GPBMessage *_autocreator;
-}
-@end
-
-@interface GPBUInt64Int32Dictionary () <GPBDictionaryInternalsProtocol> {
- @package
-  GPB_UNSAFE_UNRETAINED GPBMessage *_autocreator;
-}
-@end
-
-@interface GPBUInt64UInt64Dictionary () <GPBDictionaryInternalsProtocol> {
- @package
-  GPB_UNSAFE_UNRETAINED GPBMessage *_autocreator;
-}
-@end
-
-@interface GPBUInt64Int64Dictionary () <GPBDictionaryInternalsProtocol> {
- @package
-  GPB_UNSAFE_UNRETAINED GPBMessage *_autocreator;
-}
-@end
-
-@interface GPBUInt64BoolDictionary () <GPBDictionaryInternalsProtocol> {
- @package
-  GPB_UNSAFE_UNRETAINED GPBMessage *_autocreator;
-}
-@end
-
-@interface GPBUInt64FloatDictionary () <GPBDictionaryInternalsProtocol> {
- @package
-  GPB_UNSAFE_UNRETAINED GPBMessage *_autocreator;
-}
-@end
-
-@interface GPBUInt64DoubleDictionary () <GPBDictionaryInternalsProtocol> {
- @package
-  GPB_UNSAFE_UNRETAINED GPBMessage *_autocreator;
-}
-@end
-
-@interface GPBUInt64EnumDictionary () <GPBDictionaryInternalsProtocol> {
- @package
-  GPB_UNSAFE_UNRETAINED GPBMessage *_autocreator;
-}
-- (NSData *)serializedDataForUnknownValue:(int32_t)value
-                                   forKey:(GPBGenericValue *)key
-                              keyDataType:(GPBDataType)keyDataType;
-@end
-
-@interface GPBUInt64ObjectDictionary () <GPBDictionaryInternalsProtocol> {
- @package
-  GPB_UNSAFE_UNRETAINED GPBMessage *_autocreator;
-}
-- (BOOL)isInitialized;
-- (instancetype)deepCopyWithZone:(NSZone *)zone
-    __attribute__((ns_returns_retained));
-@end
-
-// clang-format on
-//%PDDM-EXPAND DICTIONARY_PRIV_INTERFACES_FOR_POD_KEY(Int64)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-@interface GPBInt64UInt32Dictionary () <GPBDictionaryInternalsProtocol> {
- @package
-  GPB_UNSAFE_UNRETAINED GPBMessage *_autocreator;
-}
-@end
-
-@interface GPBInt64Int32Dictionary () <GPBDictionaryInternalsProtocol> {
- @package
-  GPB_UNSAFE_UNRETAINED GPBMessage *_autocreator;
-}
-@end
-
-@interface GPBInt64UInt64Dictionary () <GPBDictionaryInternalsProtocol> {
- @package
-  GPB_UNSAFE_UNRETAINED GPBMessage *_autocreator;
-}
-@end
-
-@interface GPBInt64Int64Dictionary () <GPBDictionaryInternalsProtocol> {
- @package
-  GPB_UNSAFE_UNRETAINED GPBMessage *_autocreator;
-}
-@end
-
-@interface GPBInt64BoolDictionary () <GPBDictionaryInternalsProtocol> {
- @package
-  GPB_UNSAFE_UNRETAINED GPBMessage *_autocreator;
-}
-@end
-
-@interface GPBInt64FloatDictionary () <GPBDictionaryInternalsProtocol> {
- @package
-  GPB_UNSAFE_UNRETAINED GPBMessage *_autocreator;
-}
-@end
-
-@interface GPBInt64DoubleDictionary () <GPBDictionaryInternalsProtocol> {
- @package
-  GPB_UNSAFE_UNRETAINED GPBMessage *_autocreator;
-}
-@end
-
-@interface GPBInt64EnumDictionary () <GPBDictionaryInternalsProtocol> {
- @package
-  GPB_UNSAFE_UNRETAINED GPBMessage *_autocreator;
-}
-- (NSData *)serializedDataForUnknownValue:(int32_t)value
-                                   forKey:(GPBGenericValue *)key
-                              keyDataType:(GPBDataType)keyDataType;
-@end
-
-@interface GPBInt64ObjectDictionary () <GPBDictionaryInternalsProtocol> {
- @package
-  GPB_UNSAFE_UNRETAINED GPBMessage *_autocreator;
-}
-- (BOOL)isInitialized;
-- (instancetype)deepCopyWithZone:(NSZone *)zone
-    __attribute__((ns_returns_retained));
-@end
-
-// clang-format on
-//%PDDM-EXPAND DICTIONARY_PRIV_INTERFACES_FOR_POD_KEY(Bool)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-@interface GPBBoolUInt32Dictionary () <GPBDictionaryInternalsProtocol> {
- @package
-  GPB_UNSAFE_UNRETAINED GPBMessage *_autocreator;
-}
-@end
-
-@interface GPBBoolInt32Dictionary () <GPBDictionaryInternalsProtocol> {
- @package
-  GPB_UNSAFE_UNRETAINED GPBMessage *_autocreator;
-}
-@end
-
-@interface GPBBoolUInt64Dictionary () <GPBDictionaryInternalsProtocol> {
- @package
-  GPB_UNSAFE_UNRETAINED GPBMessage *_autocreator;
-}
-@end
-
-@interface GPBBoolInt64Dictionary () <GPBDictionaryInternalsProtocol> {
- @package
-  GPB_UNSAFE_UNRETAINED GPBMessage *_autocreator;
-}
-@end
-
-@interface GPBBoolBoolDictionary () <GPBDictionaryInternalsProtocol> {
- @package
-  GPB_UNSAFE_UNRETAINED GPBMessage *_autocreator;
-}
-@end
-
-@interface GPBBoolFloatDictionary () <GPBDictionaryInternalsProtocol> {
- @package
-  GPB_UNSAFE_UNRETAINED GPBMessage *_autocreator;
-}
-@end
-
-@interface GPBBoolDoubleDictionary () <GPBDictionaryInternalsProtocol> {
- @package
-  GPB_UNSAFE_UNRETAINED GPBMessage *_autocreator;
-}
-@end
-
-@interface GPBBoolEnumDictionary () <GPBDictionaryInternalsProtocol> {
- @package
-  GPB_UNSAFE_UNRETAINED GPBMessage *_autocreator;
-}
-- (NSData *)serializedDataForUnknownValue:(int32_t)value
-                                   forKey:(GPBGenericValue *)key
-                              keyDataType:(GPBDataType)keyDataType;
-@end
-
-@interface GPBBoolObjectDictionary () <GPBDictionaryInternalsProtocol> {
- @package
-  GPB_UNSAFE_UNRETAINED GPBMessage *_autocreator;
-}
-- (BOOL)isInitialized;
-- (instancetype)deepCopyWithZone:(NSZone *)zone
-    __attribute__((ns_returns_retained));
-@end
-
-// clang-format on
-//%PDDM-EXPAND DICTIONARY_POD_PRIV_INTERFACES_FOR_KEY(String)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-@interface GPBStringUInt32Dictionary () <GPBDictionaryInternalsProtocol> {
- @package
-  GPB_UNSAFE_UNRETAINED GPBMessage *_autocreator;
-}
-@end
-
-@interface GPBStringInt32Dictionary () <GPBDictionaryInternalsProtocol> {
- @package
-  GPB_UNSAFE_UNRETAINED GPBMessage *_autocreator;
-}
-@end
-
-@interface GPBStringUInt64Dictionary () <GPBDictionaryInternalsProtocol> {
- @package
-  GPB_UNSAFE_UNRETAINED GPBMessage *_autocreator;
-}
-@end
-
-@interface GPBStringInt64Dictionary () <GPBDictionaryInternalsProtocol> {
- @package
-  GPB_UNSAFE_UNRETAINED GPBMessage *_autocreator;
-}
-@end
-
-@interface GPBStringBoolDictionary () <GPBDictionaryInternalsProtocol> {
- @package
-  GPB_UNSAFE_UNRETAINED GPBMessage *_autocreator;
-}
-@end
-
-@interface GPBStringFloatDictionary () <GPBDictionaryInternalsProtocol> {
- @package
-  GPB_UNSAFE_UNRETAINED GPBMessage *_autocreator;
-}
-@end
-
-@interface GPBStringDoubleDictionary () <GPBDictionaryInternalsProtocol> {
- @package
-  GPB_UNSAFE_UNRETAINED GPBMessage *_autocreator;
-}
-@end
-
-@interface GPBStringEnumDictionary () <GPBDictionaryInternalsProtocol> {
- @package
-  GPB_UNSAFE_UNRETAINED GPBMessage *_autocreator;
-}
-- (NSData *)serializedDataForUnknownValue:(int32_t)value
-                                   forKey:(GPBGenericValue *)key
-                              keyDataType:(GPBDataType)keyDataType;
-@end
-
-// clang-format on
-//%PDDM-EXPAND-END (6 expansions)
-
-#pragma mark - NSDictionary Subclass
-
-@interface GPBAutocreatedDictionary : NSMutableDictionary {
-  @package
-  GPB_UNSAFE_UNRETAINED GPBMessage *_autocreator;
-}
-@end
-
-#pragma mark - Helpers
-
-CF_EXTERN_C_BEGIN
-
-// Helper to compute size when an NSDictionary is used for the map instead
-// of a custom type.
-size_t GPBDictionaryComputeSizeInternalHelper(NSDictionary *dict,
-                                              GPBFieldDescriptor *field);
-
-// Helper to write out when an NSDictionary is used for the map instead
-// of a custom type.
-void GPBDictionaryWriteToStreamInternalHelper(
-    GPBCodedOutputStream *outputStream, NSDictionary *dict,
-    GPBFieldDescriptor *field);
-
-// Helper to check message initialization when an NSDictionary is used for
-// the map instead of a custom type.
-BOOL GPBDictionaryIsInitializedInternalHelper(NSDictionary *dict,
-                                              GPBFieldDescriptor *field);
-
-// Helper to read a map instead.
-void GPBDictionaryReadEntry(id mapDictionary, GPBCodedInputStream *stream,
-                            GPBExtensionRegistry *registry,
-                            GPBFieldDescriptor *field,
-                            GPBMessage *parentMessage);
-
-CF_EXTERN_C_END
diff --git a/libs/protobuf/objectivec/GPBDuration.pbobjc.h b/libs/protobuf/objectivec/GPBDuration.pbobjc.h
deleted file mode 100644
index d6236b0..0000000
--- a/libs/protobuf/objectivec/GPBDuration.pbobjc.h
+++ /dev/null
@@ -1,133 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/protobuf/duration.proto
-
-#import "GPBDescriptor.h"
-#import "GPBMessage.h"
-#import "GPBRootObject.h"
-
-#if GOOGLE_PROTOBUF_OBJC_VERSION < 30004
-#error This file was generated by a newer version of protoc which is incompatible with your Protocol Buffer library sources.
-#endif
-#if 30004 < GOOGLE_PROTOBUF_OBJC_MIN_SUPPORTED_VERSION
-#error This file was generated by an older version of protoc which is incompatible with your Protocol Buffer library sources.
-#endif
-
-// @@protoc_insertion_point(imports)
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-
-CF_EXTERN_C_BEGIN
-
-NS_ASSUME_NONNULL_BEGIN
-
-#pragma mark - GPBDurationRoot
-
-/**
- * Exposes the extension registry for this file.
- *
- * The base class provides:
- * @code
- *   + (GPBExtensionRegistry *)extensionRegistry;
- * @endcode
- * which is a @c GPBExtensionRegistry that includes all the extensions defined by
- * this file and all files that it depends on.
- **/
-GPB_FINAL @interface GPBDurationRoot : GPBRootObject
-@end
-
-#pragma mark - GPBDuration
-
-typedef GPB_ENUM(GPBDuration_FieldNumber) {
-  GPBDuration_FieldNumber_Seconds = 1,
-  GPBDuration_FieldNumber_Nanos = 2,
-};
-
-/**
- * A Duration represents a signed, fixed-length span of time represented
- * as a count of seconds and fractions of seconds at nanosecond
- * resolution. It is independent of any calendar and concepts like "day"
- * or "month". It is related to Timestamp in that the difference between
- * two Timestamp values is a Duration and it can be added or subtracted
- * from a Timestamp. Range is approximately +-10,000 years.
- *
- * # Examples
- *
- * Example 1: Compute Duration from two Timestamps in pseudo code.
- *
- *     Timestamp start = ...;
- *     Timestamp end = ...;
- *     Duration duration = ...;
- *
- *     duration.seconds = end.seconds - start.seconds;
- *     duration.nanos = end.nanos - start.nanos;
- *
- *     if (duration.seconds < 0 && duration.nanos > 0) {
- *       duration.seconds += 1;
- *       duration.nanos -= 1000000000;
- *     } else if (duration.seconds > 0 && duration.nanos < 0) {
- *       duration.seconds -= 1;
- *       duration.nanos += 1000000000;
- *     }
- *
- * Example 2: Compute Timestamp from Timestamp + Duration in pseudo code.
- *
- *     Timestamp start = ...;
- *     Duration duration = ...;
- *     Timestamp end = ...;
- *
- *     end.seconds = start.seconds + duration.seconds;
- *     end.nanos = start.nanos + duration.nanos;
- *
- *     if (end.nanos < 0) {
- *       end.seconds -= 1;
- *       end.nanos += 1000000000;
- *     } else if (end.nanos >= 1000000000) {
- *       end.seconds += 1;
- *       end.nanos -= 1000000000;
- *     }
- *
- * Example 3: Compute Duration from datetime.timedelta in Python.
- *
- *     td = datetime.timedelta(days=3, minutes=10)
- *     duration = Duration()
- *     duration.FromTimedelta(td)
- *
- * # JSON Mapping
- *
- * In JSON format, the Duration type is encoded as a string rather than an
- * object, where the string ends in the suffix "s" (indicating seconds) and
- * is preceded by the number of seconds, with nanoseconds expressed as
- * fractional seconds. For example, 3 seconds with 0 nanoseconds should be
- * encoded in JSON format as "3s", while 3 seconds and 1 nanosecond should
- * be expressed in JSON format as "3.000000001s", and 3 seconds and 1
- * microsecond should be expressed in JSON format as "3.000001s".
- **/
-GPB_FINAL @interface GPBDuration : GPBMessage
-
-/**
- * Signed seconds of the span of time. Must be from -315,576,000,000
- * to +315,576,000,000 inclusive. Note: these bounds are computed from:
- * 60 sec/min * 60 min/hr * 24 hr/day * 365.25 days/year * 10000 years
- **/
-@property(nonatomic, readwrite) int64_t seconds;
-
-/**
- * Signed fractions of a second at nanosecond resolution of the span
- * of time. Durations less than one second are represented with a 0
- * `seconds` field and a positive or negative `nanos` field. For durations
- * of one second or more, a non-zero value for the `nanos` field must be
- * of the same sign as the `seconds` field. Must be from -999,999,999
- * to +999,999,999 inclusive.
- **/
-@property(nonatomic, readwrite) int32_t nanos;
-
-@end
-
-NS_ASSUME_NONNULL_END
-
-CF_EXTERN_C_END
-
-#pragma clang diagnostic pop
-
-// @@protoc_insertion_point(global_scope)
diff --git a/libs/protobuf/objectivec/GPBDuration.pbobjc.m b/libs/protobuf/objectivec/GPBDuration.pbobjc.m
deleted file mode 100644
index 11ba5e5..0000000
--- a/libs/protobuf/objectivec/GPBDuration.pbobjc.m
+++ /dev/null
@@ -1,95 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/protobuf/duration.proto
-
-#import "GPBProtocolBuffers_RuntimeSupport.h"
-#import "GPBDuration.pbobjc.h"
-
-// @@protoc_insertion_point(imports)
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-
-#pragma mark - GPBDurationRoot
-
-@implementation GPBDurationRoot
-
-// No extensions in the file and no imports, so no need to generate
-// +extensionRegistry.
-
-@end
-
-#pragma mark - GPBDurationRoot_FileDescriptor
-
-static GPBFileDescriptor *GPBDurationRoot_FileDescriptor(void) {
-  // This is called by +initialize so there is no need to worry
-  // about thread safety of the singleton.
-  static GPBFileDescriptor *descriptor = NULL;
-  if (!descriptor) {
-    GPB_DEBUG_CHECK_RUNTIME_VERSIONS();
-    descriptor = [[GPBFileDescriptor alloc] initWithPackage:@"google.protobuf"
-                                                 objcPrefix:@"GPB"
-                                                     syntax:GPBFileSyntaxProto3];
-  }
-  return descriptor;
-}
-
-#pragma mark - GPBDuration
-
-@implementation GPBDuration
-
-@dynamic seconds;
-@dynamic nanos;
-
-typedef struct GPBDuration__storage_ {
-  uint32_t _has_storage_[1];
-  int32_t nanos;
-  int64_t seconds;
-} GPBDuration__storage_;
-
-// This method is threadsafe because it is initially called
-// in +initialize for each subclass.
-+ (GPBDescriptor *)descriptor {
-  static GPBDescriptor *descriptor = nil;
-  if (!descriptor) {
-    static GPBMessageFieldDescription fields[] = {
-      {
-        .name = "seconds",
-        .dataTypeSpecific.clazz = Nil,
-        .number = GPBDuration_FieldNumber_Seconds,
-        .hasIndex = 0,
-        .offset = (uint32_t)offsetof(GPBDuration__storage_, seconds),
-        .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldClearHasIvarOnZero),
-        .dataType = GPBDataTypeInt64,
-      },
-      {
-        .name = "nanos",
-        .dataTypeSpecific.clazz = Nil,
-        .number = GPBDuration_FieldNumber_Nanos,
-        .hasIndex = 1,
-        .offset = (uint32_t)offsetof(GPBDuration__storage_, nanos),
-        .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldClearHasIvarOnZero),
-        .dataType = GPBDataTypeInt32,
-      },
-    };
-    GPBDescriptor *localDescriptor =
-        [GPBDescriptor allocDescriptorForClass:[GPBDuration class]
-                                     rootClass:[GPBDurationRoot class]
-                                          file:GPBDurationRoot_FileDescriptor()
-                                        fields:fields
-                                    fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
-                                   storageSize:sizeof(GPBDuration__storage_)
-                                         flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown)];
-    #if defined(DEBUG) && DEBUG
-      NSAssert(descriptor == nil, @"Startup recursed!");
-    #endif  // DEBUG
-    descriptor = localDescriptor;
-  }
-  return descriptor;
-}
-
-@end
-
-
-#pragma clang diagnostic pop
-
-// @@protoc_insertion_point(global_scope)
diff --git a/libs/protobuf/objectivec/GPBEmpty.pbobjc.h b/libs/protobuf/objectivec/GPBEmpty.pbobjc.h
deleted file mode 100644
index 5878223..0000000
--- a/libs/protobuf/objectivec/GPBEmpty.pbobjc.h
+++ /dev/null
@@ -1,60 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/protobuf/empty.proto
-
-#import "GPBDescriptor.h"
-#import "GPBMessage.h"
-#import "GPBRootObject.h"
-
-#if GOOGLE_PROTOBUF_OBJC_VERSION < 30004
-#error This file was generated by a newer version of protoc which is incompatible with your Protocol Buffer library sources.
-#endif
-#if 30004 < GOOGLE_PROTOBUF_OBJC_MIN_SUPPORTED_VERSION
-#error This file was generated by an older version of protoc which is incompatible with your Protocol Buffer library sources.
-#endif
-
-// @@protoc_insertion_point(imports)
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-
-CF_EXTERN_C_BEGIN
-
-NS_ASSUME_NONNULL_BEGIN
-
-#pragma mark - GPBEmptyRoot
-
-/**
- * Exposes the extension registry for this file.
- *
- * The base class provides:
- * @code
- *   + (GPBExtensionRegistry *)extensionRegistry;
- * @endcode
- * which is a @c GPBExtensionRegistry that includes all the extensions defined by
- * this file and all files that it depends on.
- **/
-GPB_FINAL @interface GPBEmptyRoot : GPBRootObject
-@end
-
-#pragma mark - GPBEmpty
-
-/**
- * A generic empty message that you can re-use to avoid defining duplicated
- * empty messages in your APIs. A typical example is to use it as the request
- * or the response type of an API method. For instance:
- *
- *     service Foo {
- *       rpc Bar(google.protobuf.Empty) returns (google.protobuf.Empty);
- *     }
- **/
-GPB_FINAL @interface GPBEmpty : GPBMessage
-
-@end
-
-NS_ASSUME_NONNULL_END
-
-CF_EXTERN_C_END
-
-#pragma clang diagnostic pop
-
-// @@protoc_insertion_point(global_scope)
diff --git a/libs/protobuf/objectivec/GPBEmpty.pbobjc.m b/libs/protobuf/objectivec/GPBEmpty.pbobjc.m
deleted file mode 100644
index 8aefddb..0000000
--- a/libs/protobuf/objectivec/GPBEmpty.pbobjc.m
+++ /dev/null
@@ -1,71 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/protobuf/empty.proto
-
-#import "GPBProtocolBuffers_RuntimeSupport.h"
-#import "GPBEmpty.pbobjc.h"
-
-// @@protoc_insertion_point(imports)
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-
-#pragma mark - GPBEmptyRoot
-
-@implementation GPBEmptyRoot
-
-// No extensions in the file and no imports, so no need to generate
-// +extensionRegistry.
-
-@end
-
-#pragma mark - GPBEmptyRoot_FileDescriptor
-
-static GPBFileDescriptor *GPBEmptyRoot_FileDescriptor(void) {
-  // This is called by +initialize so there is no need to worry
-  // about thread safety of the singleton.
-  static GPBFileDescriptor *descriptor = NULL;
-  if (!descriptor) {
-    GPB_DEBUG_CHECK_RUNTIME_VERSIONS();
-    descriptor = [[GPBFileDescriptor alloc] initWithPackage:@"google.protobuf"
-                                                 objcPrefix:@"GPB"
-                                                     syntax:GPBFileSyntaxProto3];
-  }
-  return descriptor;
-}
-
-#pragma mark - GPBEmpty
-
-@implementation GPBEmpty
-
-
-typedef struct GPBEmpty__storage_ {
-  uint32_t _has_storage_[1];
-} GPBEmpty__storage_;
-
-// This method is threadsafe because it is initially called
-// in +initialize for each subclass.
-+ (GPBDescriptor *)descriptor {
-  static GPBDescriptor *descriptor = nil;
-  if (!descriptor) {
-    GPBDescriptor *localDescriptor =
-        [GPBDescriptor allocDescriptorForClass:[GPBEmpty class]
-                                     rootClass:[GPBEmptyRoot class]
-                                          file:GPBEmptyRoot_FileDescriptor()
-                                        fields:NULL
-                                    fieldCount:0
-                                   storageSize:sizeof(GPBEmpty__storage_)
-                                         flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown)];
-    #if defined(DEBUG) && DEBUG
-      NSAssert(descriptor == nil, @"Startup recursed!");
-    #endif  // DEBUG
-    descriptor = localDescriptor;
-  }
-  return descriptor;
-}
-
-@end
-
-
-#pragma clang diagnostic pop
-
-// @@protoc_insertion_point(global_scope)
diff --git a/libs/protobuf/objectivec/GPBExtensionInternals.h b/libs/protobuf/objectivec/GPBExtensionInternals.h
deleted file mode 100644
index 2b980ae..0000000
--- a/libs/protobuf/objectivec/GPBExtensionInternals.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#import <Foundation/Foundation.h>
-
-#import "GPBDescriptor.h"
-
-@class GPBCodedInputStream;
-@class GPBCodedOutputStream;
-@class GPBExtensionRegistry;
-
-void GPBExtensionMergeFromInputStream(GPBExtensionDescriptor *extension,
-                                      BOOL isPackedOnStream,
-                                      GPBCodedInputStream *input,
-                                      GPBExtensionRegistry *extensionRegistry,
-                                      GPBMessage *message);
-
-size_t GPBComputeExtensionSerializedSizeIncludingTag(
-    GPBExtensionDescriptor *extension, id value);
-
-void GPBWriteExtensionValueToOutputStream(GPBExtensionDescriptor *extension,
-                                          id value,
-                                          GPBCodedOutputStream *output);
diff --git a/libs/protobuf/objectivec/GPBExtensionInternals.m b/libs/protobuf/objectivec/GPBExtensionInternals.m
deleted file mode 100644
index bacec57..0000000
--- a/libs/protobuf/objectivec/GPBExtensionInternals.m
+++ /dev/null
@@ -1,391 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#import "GPBExtensionInternals.h"
-
-#import <objc/runtime.h>
-
-#import "GPBCodedInputStream_PackagePrivate.h"
-#import "GPBCodedOutputStream_PackagePrivate.h"
-#import "GPBDescriptor_PackagePrivate.h"
-#import "GPBMessage_PackagePrivate.h"
-#import "GPBUtilities_PackagePrivate.h"
-
-static id NewSingleValueFromInputStream(GPBExtensionDescriptor *extension,
-                                        GPBCodedInputStream *input,
-                                        GPBExtensionRegistry *extensionRegistry,
-                                        GPBMessage *existingValue)
-    __attribute__((ns_returns_retained));
-
-GPB_INLINE size_t DataTypeSize(GPBDataType dataType) {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wswitch-enum"
-  switch (dataType) {
-    case GPBDataTypeBool:
-      return 1;
-    case GPBDataTypeFixed32:
-    case GPBDataTypeSFixed32:
-    case GPBDataTypeFloat:
-      return 4;
-    case GPBDataTypeFixed64:
-    case GPBDataTypeSFixed64:
-    case GPBDataTypeDouble:
-      return 8;
-    default:
-      return 0;
-  }
-#pragma clang diagnostic pop
-}
-
-static size_t ComputePBSerializedSizeNoTagOfObject(GPBDataType dataType, id object) {
-#define FIELD_CASE(TYPE, ACCESSOR)                                     \
-  case GPBDataType##TYPE:                                              \
-    return GPBCompute##TYPE##SizeNoTag([(NSNumber *)object ACCESSOR]);
-#define FIELD_CASE2(TYPE)                                              \
-  case GPBDataType##TYPE:                                              \
-    return GPBCompute##TYPE##SizeNoTag(object);
-  switch (dataType) {
-    FIELD_CASE(Bool, boolValue)
-    FIELD_CASE(Float, floatValue)
-    FIELD_CASE(Double, doubleValue)
-    FIELD_CASE(Int32, intValue)
-    FIELD_CASE(SFixed32, intValue)
-    FIELD_CASE(SInt32, intValue)
-    FIELD_CASE(Enum, intValue)
-    FIELD_CASE(Int64, longLongValue)
-    FIELD_CASE(SInt64, longLongValue)
-    FIELD_CASE(SFixed64, longLongValue)
-    FIELD_CASE(UInt32, unsignedIntValue)
-    FIELD_CASE(Fixed32, unsignedIntValue)
-    FIELD_CASE(UInt64, unsignedLongLongValue)
-    FIELD_CASE(Fixed64, unsignedLongLongValue)
-    FIELD_CASE2(Bytes)
-    FIELD_CASE2(String)
-    FIELD_CASE2(Message)
-    FIELD_CASE2(Group)
-  }
-#undef FIELD_CASE
-#undef FIELD_CASE2
-}
-
-static size_t ComputeSerializedSizeIncludingTagOfObject(
-    GPBExtensionDescription *description, id object) {
-#define FIELD_CASE(TYPE, ACCESSOR)                                   \
-  case GPBDataType##TYPE:                                            \
-    return GPBCompute##TYPE##Size(description->fieldNumber,          \
-                                  [(NSNumber *)object ACCESSOR]);
-#define FIELD_CASE2(TYPE)                                            \
-  case GPBDataType##TYPE:                                            \
-    return GPBCompute##TYPE##Size(description->fieldNumber, object);
-  switch (description->dataType) {
-    FIELD_CASE(Bool, boolValue)
-    FIELD_CASE(Float, floatValue)
-    FIELD_CASE(Double, doubleValue)
-    FIELD_CASE(Int32, intValue)
-    FIELD_CASE(SFixed32, intValue)
-    FIELD_CASE(SInt32, intValue)
-    FIELD_CASE(Enum, intValue)
-    FIELD_CASE(Int64, longLongValue)
-    FIELD_CASE(SInt64, longLongValue)
-    FIELD_CASE(SFixed64, longLongValue)
-    FIELD_CASE(UInt32, unsignedIntValue)
-    FIELD_CASE(Fixed32, unsignedIntValue)
-    FIELD_CASE(UInt64, unsignedLongLongValue)
-    FIELD_CASE(Fixed64, unsignedLongLongValue)
-    FIELD_CASE2(Bytes)
-    FIELD_CASE2(String)
-    FIELD_CASE2(Group)
-    case GPBDataTypeMessage:
-      if (GPBExtensionIsWireFormat(description)) {
-        return GPBComputeMessageSetExtensionSize(description->fieldNumber,
-                                                 object);
-      } else {
-        return GPBComputeMessageSize(description->fieldNumber, object);
-      }
-  }
-#undef FIELD_CASE
-#undef FIELD_CASE2
-}
-
-static size_t ComputeSerializedSizeIncludingTagOfArray(
-    GPBExtensionDescription *description, NSArray *values) {
-  if (GPBExtensionIsPacked(description)) {
-    size_t size = 0;
-    size_t typeSize = DataTypeSize(description->dataType);
-    if (typeSize != 0) {
-      size = values.count * typeSize;
-    } else {
-      for (id value in values) {
-        size +=
-            ComputePBSerializedSizeNoTagOfObject(description->dataType, value);
-      }
-    }
-    return size + GPBComputeTagSize(description->fieldNumber) +
-           GPBComputeRawVarint32SizeForInteger(size);
-  } else {
-    size_t size = 0;
-    for (id value in values) {
-      size += ComputeSerializedSizeIncludingTagOfObject(description, value);
-    }
-    return size;
-  }
-}
-
-static void WriteObjectIncludingTagToCodedOutputStream(
-    id object, GPBExtensionDescription *description,
-    GPBCodedOutputStream *output) {
-#define FIELD_CASE(TYPE, ACCESSOR)                      \
-  case GPBDataType##TYPE:                               \
-    [output write##TYPE:description->fieldNumber        \
-                  value:[(NSNumber *)object ACCESSOR]]; \
-    return;
-#define FIELD_CASE2(TYPE)                                       \
-  case GPBDataType##TYPE:                                       \
-    [output write##TYPE:description->fieldNumber value:object]; \
-    return;
-  switch (description->dataType) {
-    FIELD_CASE(Bool, boolValue)
-    FIELD_CASE(Float, floatValue)
-    FIELD_CASE(Double, doubleValue)
-    FIELD_CASE(Int32, intValue)
-    FIELD_CASE(SFixed32, intValue)
-    FIELD_CASE(SInt32, intValue)
-    FIELD_CASE(Enum, intValue)
-    FIELD_CASE(Int64, longLongValue)
-    FIELD_CASE(SInt64, longLongValue)
-    FIELD_CASE(SFixed64, longLongValue)
-    FIELD_CASE(UInt32, unsignedIntValue)
-    FIELD_CASE(Fixed32, unsignedIntValue)
-    FIELD_CASE(UInt64, unsignedLongLongValue)
-    FIELD_CASE(Fixed64, unsignedLongLongValue)
-    FIELD_CASE2(Bytes)
-    FIELD_CASE2(String)
-    FIELD_CASE2(Group)
-    case GPBDataTypeMessage:
-      if (GPBExtensionIsWireFormat(description)) {
-        [output writeMessageSetExtension:description->fieldNumber value:object];
-      } else {
-        [output writeMessage:description->fieldNumber value:object];
-      }
-      return;
-  }
-#undef FIELD_CASE
-#undef FIELD_CASE2
-}
-
-static void WriteObjectNoTagToCodedOutputStream(
-    id object, GPBExtensionDescription *description,
-    GPBCodedOutputStream *output) {
-#define FIELD_CASE(TYPE, ACCESSOR)                             \
-  case GPBDataType##TYPE:                                      \
-    [output write##TYPE##NoTag:[(NSNumber *)object ACCESSOR]]; \
-    return;
-#define FIELD_CASE2(TYPE)               \
-  case GPBDataType##TYPE:               \
-    [output write##TYPE##NoTag:object]; \
-    return;
-  switch (description->dataType) {
-    FIELD_CASE(Bool, boolValue)
-    FIELD_CASE(Float, floatValue)
-    FIELD_CASE(Double, doubleValue)
-    FIELD_CASE(Int32, intValue)
-    FIELD_CASE(SFixed32, intValue)
-    FIELD_CASE(SInt32, intValue)
-    FIELD_CASE(Enum, intValue)
-    FIELD_CASE(Int64, longLongValue)
-    FIELD_CASE(SInt64, longLongValue)
-    FIELD_CASE(SFixed64, longLongValue)
-    FIELD_CASE(UInt32, unsignedIntValue)
-    FIELD_CASE(Fixed32, unsignedIntValue)
-    FIELD_CASE(UInt64, unsignedLongLongValue)
-    FIELD_CASE(Fixed64, unsignedLongLongValue)
-    FIELD_CASE2(Bytes)
-    FIELD_CASE2(String)
-    FIELD_CASE2(Message)
-    case GPBDataTypeGroup:
-      [output writeGroupNoTag:description->fieldNumber value:object];
-      return;
-  }
-#undef FIELD_CASE
-#undef FIELD_CASE2
-}
-
-static void WriteArrayIncludingTagsToCodedOutputStream(
-    NSArray *values, GPBExtensionDescription *description,
-    GPBCodedOutputStream *output) {
-  if (GPBExtensionIsPacked(description)) {
-    [output writeTag:description->fieldNumber
-              format:GPBWireFormatLengthDelimited];
-    size_t dataSize = 0;
-    size_t typeSize = DataTypeSize(description->dataType);
-    if (typeSize != 0) {
-      dataSize = values.count * typeSize;
-    } else {
-      for (id value in values) {
-        dataSize +=
-            ComputePBSerializedSizeNoTagOfObject(description->dataType, value);
-      }
-    }
-    [output writeRawVarintSizeTAs32:dataSize];
-    for (id value in values) {
-      WriteObjectNoTagToCodedOutputStream(value, description, output);
-    }
-  } else {
-    for (id value in values) {
-      WriteObjectIncludingTagToCodedOutputStream(value, description, output);
-    }
-  }
-}
-
-// Direct access is use for speed, to avoid even internally declaring things
-// read/write, etc. The warning is enabled in the project to ensure code calling
-// protos can turn on -Wdirect-ivar-access without issues.
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdirect-ivar-access"
-
-void GPBExtensionMergeFromInputStream(GPBExtensionDescriptor *extension,
-                                      BOOL isPackedOnStream,
-                                      GPBCodedInputStream *input,
-                                      GPBExtensionRegistry *extensionRegistry,
-                                      GPBMessage *message) {
-  GPBExtensionDescription *description = extension->description_;
-  GPBCodedInputStreamState *state = &input->state_;
-  if (isPackedOnStream) {
-    NSCAssert(GPBExtensionIsRepeated(description),
-              @"How was it packed if it isn't repeated?");
-    int32_t length = GPBCodedInputStreamReadInt32(state);
-    size_t limit = GPBCodedInputStreamPushLimit(state, length);
-    while (GPBCodedInputStreamBytesUntilLimit(state) > 0) {
-      id value = NewSingleValueFromInputStream(extension,
-                                               input,
-                                               extensionRegistry,
-                                               nil);
-      [message addExtension:extension value:value];
-      [value release];
-    }
-    GPBCodedInputStreamPopLimit(state, limit);
-  } else {
-    id existingValue = nil;
-    BOOL isRepeated = GPBExtensionIsRepeated(description);
-    if (!isRepeated && GPBDataTypeIsMessage(description->dataType)) {
-      existingValue = [message getExistingExtension:extension];
-    }
-    id value = NewSingleValueFromInputStream(extension,
-                                             input,
-                                             extensionRegistry,
-                                             existingValue);
-    if (isRepeated) {
-      [message addExtension:extension value:value];
-    } else {
-      [message setExtension:extension value:value];
-    }
-    [value release];
-  }
-}
-
-void GPBWriteExtensionValueToOutputStream(GPBExtensionDescriptor *extension,
-                                          id value,
-                                          GPBCodedOutputStream *output) {
-  GPBExtensionDescription *description = extension->description_;
-  if (GPBExtensionIsRepeated(description)) {
-    WriteArrayIncludingTagsToCodedOutputStream(value, description, output);
-  } else {
-    WriteObjectIncludingTagToCodedOutputStream(value, description, output);
-  }
-}
-
-size_t GPBComputeExtensionSerializedSizeIncludingTag(
-    GPBExtensionDescriptor *extension, id value) {
-  GPBExtensionDescription *description = extension->description_;
-  if (GPBExtensionIsRepeated(description)) {
-    return ComputeSerializedSizeIncludingTagOfArray(description, value);
-  } else {
-    return ComputeSerializedSizeIncludingTagOfObject(description, value);
-  }
-}
-
-// Note that this returns a retained value intentionally.
-static id NewSingleValueFromInputStream(GPBExtensionDescriptor *extension,
-                                        GPBCodedInputStream *input,
-                                        GPBExtensionRegistry *extensionRegistry,
-                                        GPBMessage *existingValue) {
-  GPBExtensionDescription *description = extension->description_;
-  GPBCodedInputStreamState *state = &input->state_;
-  switch (description->dataType) {
-    case GPBDataTypeBool:     return [[NSNumber alloc] initWithBool:GPBCodedInputStreamReadBool(state)];
-    case GPBDataTypeFixed32:  return [[NSNumber alloc] initWithUnsignedInt:GPBCodedInputStreamReadFixed32(state)];
-    case GPBDataTypeSFixed32: return [[NSNumber alloc] initWithInt:GPBCodedInputStreamReadSFixed32(state)];
-    case GPBDataTypeFloat:    return [[NSNumber alloc] initWithFloat:GPBCodedInputStreamReadFloat(state)];
-    case GPBDataTypeFixed64:  return [[NSNumber alloc] initWithUnsignedLongLong:GPBCodedInputStreamReadFixed64(state)];
-    case GPBDataTypeSFixed64: return [[NSNumber alloc] initWithLongLong:GPBCodedInputStreamReadSFixed64(state)];
-    case GPBDataTypeDouble:   return [[NSNumber alloc] initWithDouble:GPBCodedInputStreamReadDouble(state)];
-    case GPBDataTypeInt32:    return [[NSNumber alloc] initWithInt:GPBCodedInputStreamReadInt32(state)];
-    case GPBDataTypeInt64:    return [[NSNumber alloc] initWithLongLong:GPBCodedInputStreamReadInt64(state)];
-    case GPBDataTypeSInt32:   return [[NSNumber alloc] initWithInt:GPBCodedInputStreamReadSInt32(state)];
-    case GPBDataTypeSInt64:   return [[NSNumber alloc] initWithLongLong:GPBCodedInputStreamReadSInt64(state)];
-    case GPBDataTypeUInt32:   return [[NSNumber alloc] initWithUnsignedInt:GPBCodedInputStreamReadUInt32(state)];
-    case GPBDataTypeUInt64:   return [[NSNumber alloc] initWithUnsignedLongLong:GPBCodedInputStreamReadUInt64(state)];
-    case GPBDataTypeBytes:    return GPBCodedInputStreamReadRetainedBytes(state);
-    case GPBDataTypeString:   return GPBCodedInputStreamReadRetainedString(state);
-    case GPBDataTypeEnum:     return [[NSNumber alloc] initWithInt:GPBCodedInputStreamReadEnum(state)];
-    case GPBDataTypeGroup:
-    case GPBDataTypeMessage: {
-      GPBMessage *message;
-      if (existingValue) {
-        message = [existingValue retain];
-      } else {
-        GPBDescriptor *descriptor = [extension.msgClass descriptor];
-        message = [[descriptor.messageClass alloc] init];
-      }
-
-      if (description->dataType == GPBDataTypeGroup) {
-        [input readGroup:description->fieldNumber
-                 message:message
-            extensionRegistry:extensionRegistry];
-      } else {
-        // description->dataType == GPBDataTypeMessage
-        if (GPBExtensionIsWireFormat(description)) {
-          // For MessageSet fields the message length will have already been
-          // read.
-          [message mergeFromCodedInputStream:input
-                           extensionRegistry:extensionRegistry];
-        } else {
-          [input readMessage:message extensionRegistry:extensionRegistry];
-        }
-      }
-
-      return message;
-    }
-  }
-
-  return nil;
-}
-
-#pragma clang diagnostic pop
diff --git a/libs/protobuf/objectivec/GPBExtensionRegistry.h b/libs/protobuf/objectivec/GPBExtensionRegistry.h
deleted file mode 100644
index d79632d..0000000
--- a/libs/protobuf/objectivec/GPBExtensionRegistry.h
+++ /dev/null
@@ -1,87 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#import <Foundation/Foundation.h>
-
-@class GPBDescriptor;
-@class GPBExtensionDescriptor;
-
-NS_ASSUME_NONNULL_BEGIN
-
-/**
- * A table of known extensions, searchable by name or field number.  When
- * parsing a protocol message that might have extensions, you must provide a
- * GPBExtensionRegistry in which you have registered any extensions that you
- * want to be able to parse. Otherwise, those extensions will just be treated
- * like unknown fields.
- *
- * The *Root classes provide `+extensionRegistry` for the extensions defined
- * in a given file *and* all files it imports. You can also create a
- * GPBExtensionRegistry, and merge those registries to handle parsing
- * extensions defined from non overlapping files.
- *
- * ```
- * GPBExtensionRegistry *registry = [[MyProtoFileRoot extensionRegistry] copy];
- * [registry addExtension:[OtherMessage neededExtension]]; // Not in MyProtoFile
- * NSError *parseError;
- * MyMessage *msg = [MyMessage parseData:data extensionRegistry:registry error:&parseError];
- * ```
- **/
-@interface GPBExtensionRegistry : NSObject<NSCopying>
-
-/**
- * Adds the given GPBExtensionDescriptor to this registry.
- *
- * @param extension The extension description to add.
- **/
-- (void)addExtension:(GPBExtensionDescriptor *)extension;
-
-/**
- * Adds all the extensions from another registry to this registry.
- *
- * @param registry The registry to merge into this registry.
- **/
-- (void)addExtensions:(GPBExtensionRegistry *)registry;
-
-/**
- * Looks for the extension registered for the given field number on a given
- * GPBDescriptor.
- *
- * @param descriptor  The descriptor to look for a registered extension on.
- * @param fieldNumber The field number of the extension to look for.
- *
- * @return The registered GPBExtensionDescriptor or nil if none was found.
- **/
-- (nullable GPBExtensionDescriptor *)extensionForDescriptor:(GPBDescriptor *)descriptor
-                                                fieldNumber:(NSInteger)fieldNumber;
-
-@end
-
-NS_ASSUME_NONNULL_END
diff --git a/libs/protobuf/objectivec/GPBExtensionRegistry.m b/libs/protobuf/objectivec/GPBExtensionRegistry.m
deleted file mode 100644
index e3ff7c4..0000000
--- a/libs/protobuf/objectivec/GPBExtensionRegistry.m
+++ /dev/null
@@ -1,131 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#import "GPBExtensionRegistry.h"
-
-#import "GPBBootstrap.h"
-#import "GPBDescriptor.h"
-
-@implementation GPBExtensionRegistry {
-  CFMutableDictionaryRef mutableClassMap_;
-}
-
-- (instancetype)init {
-  if ((self = [super init])) {
-    // The keys are ObjC classes, so straight up ptr comparisons are fine.
-    mutableClassMap_ = CFDictionaryCreateMutable(kCFAllocatorDefault, 0, NULL,
-                                             &kCFTypeDictionaryValueCallBacks);
-  }
-  return self;
-}
-
-- (void)dealloc {
-  CFRelease(mutableClassMap_);
-  [super dealloc];
-}
-
-// Direct access is use for speed, to avoid even internally declaring things
-// read/write, etc. The warning is enabled in the project to ensure code calling
-// protos can turn on -Wdirect-ivar-access without issues.
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdirect-ivar-access"
-
-- (instancetype)copyWithZone:(NSZone *)zone {
-  GPBExtensionRegistry *result = [[[self class] allocWithZone:zone] init];
-  [result addExtensions:self];
-  return result;
-}
-
-- (void)addExtension:(GPBExtensionDescriptor *)extension {
-  if (extension == nil) {
-    return;
-  }
-
-  Class containingMessageClass = extension.containingMessageClass;
-  CFMutableDictionaryRef extensionMap = (CFMutableDictionaryRef)
-      CFDictionaryGetValue(mutableClassMap_, containingMessageClass);
-  if (extensionMap == nil) {
-    // Use a custom dictionary here because the keys are numbers and conversion
-    // back and forth from NSNumber isn't worth the cost.
-    extensionMap = CFDictionaryCreateMutable(kCFAllocatorDefault, 0, NULL,
-                                             &kCFTypeDictionaryValueCallBacks);
-    CFDictionarySetValue(mutableClassMap_, containingMessageClass, extensionMap);
-    CFRelease(extensionMap);
-  }
-
-  ssize_t key = extension.fieldNumber;
-  CFDictionarySetValue(extensionMap, (const void *)key, extension);
-}
-
-- (GPBExtensionDescriptor *)extensionForDescriptor:(GPBDescriptor *)descriptor
-                                       fieldNumber:(NSInteger)fieldNumber {
-  Class messageClass = descriptor.messageClass;
-  CFMutableDictionaryRef extensionMap = (CFMutableDictionaryRef)
-      CFDictionaryGetValue(mutableClassMap_, messageClass);
-  ssize_t key = fieldNumber;
-  GPBExtensionDescriptor *result =
-      (extensionMap
-       ? CFDictionaryGetValue(extensionMap, (const void *)key)
-       : nil);
-  return result;
-}
-
-static void CopyKeyValue(const void *key, const void *value, void *context) {
-  CFMutableDictionaryRef extensionMap = (CFMutableDictionaryRef)context;
-  CFDictionarySetValue(extensionMap, key, value);
-}
-
-static void CopySubDictionary(const void *key, const void *value, void *context) {
-  CFMutableDictionaryRef mutableClassMap = (CFMutableDictionaryRef)context;
-  Class containingMessageClass = key;
-  CFMutableDictionaryRef otherExtensionMap = (CFMutableDictionaryRef)value;
-
-  CFMutableDictionaryRef extensionMap = (CFMutableDictionaryRef)
-      CFDictionaryGetValue(mutableClassMap, containingMessageClass);
-  if (extensionMap == nil) {
-    extensionMap = CFDictionaryCreateMutableCopy(kCFAllocatorDefault, 0, otherExtensionMap);
-    CFDictionarySetValue(mutableClassMap, containingMessageClass, extensionMap);
-    CFRelease(extensionMap);
-  } else {
-    CFDictionaryApplyFunction(otherExtensionMap, CopyKeyValue, extensionMap);
-  }
-}
-
-- (void)addExtensions:(GPBExtensionRegistry *)registry {
-  if (registry == nil) {
-    // In the case where there are no extensions just ignore.
-    return;
-  }
-  CFDictionaryApplyFunction(registry->mutableClassMap_, CopySubDictionary, mutableClassMap_);
-}
-
-#pragma clang diagnostic pop
-
-@end
diff --git a/libs/protobuf/objectivec/GPBFieldMask.pbobjc.h b/libs/protobuf/objectivec/GPBFieldMask.pbobjc.h
deleted file mode 100644
index c4667b4..0000000
--- a/libs/protobuf/objectivec/GPBFieldMask.pbobjc.h
+++ /dev/null
@@ -1,261 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/protobuf/field_mask.proto
-
-#import "GPBDescriptor.h"
-#import "GPBMessage.h"
-#import "GPBRootObject.h"
-
-#if GOOGLE_PROTOBUF_OBJC_VERSION < 30004
-#error This file was generated by a newer version of protoc which is incompatible with your Protocol Buffer library sources.
-#endif
-#if 30004 < GOOGLE_PROTOBUF_OBJC_MIN_SUPPORTED_VERSION
-#error This file was generated by an older version of protoc which is incompatible with your Protocol Buffer library sources.
-#endif
-
-// @@protoc_insertion_point(imports)
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-
-CF_EXTERN_C_BEGIN
-
-NS_ASSUME_NONNULL_BEGIN
-
-#pragma mark - GPBFieldMaskRoot
-
-/**
- * Exposes the extension registry for this file.
- *
- * The base class provides:
- * @code
- *   + (GPBExtensionRegistry *)extensionRegistry;
- * @endcode
- * which is a @c GPBExtensionRegistry that includes all the extensions defined by
- * this file and all files that it depends on.
- **/
-GPB_FINAL @interface GPBFieldMaskRoot : GPBRootObject
-@end
-
-#pragma mark - GPBFieldMask
-
-typedef GPB_ENUM(GPBFieldMask_FieldNumber) {
-  GPBFieldMask_FieldNumber_PathsArray = 1,
-};
-
-/**
- * `FieldMask` represents a set of symbolic field paths, for example:
- *
- *     paths: "f.a"
- *     paths: "f.b.d"
- *
- * Here `f` represents a field in some root message, `a` and `b`
- * fields in the message found in `f`, and `d` a field found in the
- * message in `f.b`.
- *
- * Field masks are used to specify a subset of fields that should be
- * returned by a get operation or modified by an update operation.
- * Field masks also have a custom JSON encoding (see below).
- *
- * # Field Masks in Projections
- *
- * When used in the context of a projection, a response message or
- * sub-message is filtered by the API to only contain those fields as
- * specified in the mask. For example, if the mask in the previous
- * example is applied to a response message as follows:
- *
- *     f {
- *       a : 22
- *       b {
- *         d : 1
- *         x : 2
- *       }
- *       y : 13
- *     }
- *     z: 8
- *
- * The result will not contain specific values for fields x,y and z
- * (their value will be set to the default, and omitted in proto text
- * output):
- *
- *
- *     f {
- *       a : 22
- *       b {
- *         d : 1
- *       }
- *     }
- *
- * A repeated field is not allowed except at the last position of a
- * paths string.
- *
- * If a FieldMask object is not present in a get operation, the
- * operation applies to all fields (as if a FieldMask of all fields
- * had been specified).
- *
- * Note that a field mask does not necessarily apply to the
- * top-level response message. In case of a REST get operation, the
- * field mask applies directly to the response, but in case of a REST
- * list operation, the mask instead applies to each individual message
- * in the returned resource list. In case of a REST custom method,
- * other definitions may be used. Where the mask applies will be
- * clearly documented together with its declaration in the API.  In
- * any case, the effect on the returned resource/resources is required
- * behavior for APIs.
- *
- * # Field Masks in Update Operations
- *
- * A field mask in update operations specifies which fields of the
- * targeted resource are going to be updated. The API is required
- * to only change the values of the fields as specified in the mask
- * and leave the others untouched. If a resource is passed in to
- * describe the updated values, the API ignores the values of all
- * fields not covered by the mask.
- *
- * If a repeated field is specified for an update operation, new values will
- * be appended to the existing repeated field in the target resource. Note that
- * a repeated field is only allowed in the last position of a `paths` string.
- *
- * If a sub-message is specified in the last position of the field mask for an
- * update operation, then new value will be merged into the existing sub-message
- * in the target resource.
- *
- * For example, given the target message:
- *
- *     f {
- *       b {
- *         d: 1
- *         x: 2
- *       }
- *       c: [1]
- *     }
- *
- * And an update message:
- *
- *     f {
- *       b {
- *         d: 10
- *       }
- *       c: [2]
- *     }
- *
- * then if the field mask is:
- *
- *  paths: ["f.b", "f.c"]
- *
- * then the result will be:
- *
- *     f {
- *       b {
- *         d: 10
- *         x: 2
- *       }
- *       c: [1, 2]
- *     }
- *
- * An implementation may provide options to override this default behavior for
- * repeated and message fields.
- *
- * In order to reset a field's value to the default, the field must
- * be in the mask and set to the default value in the provided resource.
- * Hence, in order to reset all fields of a resource, provide a default
- * instance of the resource and set all fields in the mask, or do
- * not provide a mask as described below.
- *
- * If a field mask is not present on update, the operation applies to
- * all fields (as if a field mask of all fields has been specified).
- * Note that in the presence of schema evolution, this may mean that
- * fields the client does not know and has therefore not filled into
- * the request will be reset to their default. If this is unwanted
- * behavior, a specific service may require a client to always specify
- * a field mask, producing an error if not.
- *
- * As with get operations, the location of the resource which
- * describes the updated values in the request message depends on the
- * operation kind. In any case, the effect of the field mask is
- * required to be honored by the API.
- *
- * ## Considerations for HTTP REST
- *
- * The HTTP kind of an update operation which uses a field mask must
- * be set to PATCH instead of PUT in order to satisfy HTTP semantics
- * (PUT must only be used for full updates).
- *
- * # JSON Encoding of Field Masks
- *
- * In JSON, a field mask is encoded as a single string where paths are
- * separated by a comma. Fields name in each path are converted
- * to/from lower-camel naming conventions.
- *
- * As an example, consider the following message declarations:
- *
- *     message Profile {
- *       User user = 1;
- *       Photo photo = 2;
- *     }
- *     message User {
- *       string display_name = 1;
- *       string address = 2;
- *     }
- *
- * In proto a field mask for `Profile` may look as such:
- *
- *     mask {
- *       paths: "user.display_name"
- *       paths: "photo"
- *     }
- *
- * In JSON, the same mask is represented as below:
- *
- *     {
- *       mask: "user.displayName,photo"
- *     }
- *
- * # Field Masks and Oneof Fields
- *
- * Field masks treat fields in oneofs just as regular fields. Consider the
- * following message:
- *
- *     message SampleMessage {
- *       oneof test_oneof {
- *         string name = 4;
- *         SubMessage sub_message = 9;
- *       }
- *     }
- *
- * The field mask can be:
- *
- *     mask {
- *       paths: "name"
- *     }
- *
- * Or:
- *
- *     mask {
- *       paths: "sub_message"
- *     }
- *
- * Note that oneof type names ("test_oneof" in this case) cannot be used in
- * paths.
- *
- * ## Field Mask Verification
- *
- * The implementation of any API method which has a FieldMask type field in the
- * request should verify the included field paths, and return an
- * `INVALID_ARGUMENT` error if any path is unmappable.
- **/
-GPB_FINAL @interface GPBFieldMask : GPBMessage
-
-/** The set of field mask paths. */
-@property(nonatomic, readwrite, strong, null_resettable) NSMutableArray<NSString*> *pathsArray;
-/** The number of items in @c pathsArray without causing the array to be created. */
-@property(nonatomic, readonly) NSUInteger pathsArray_Count;
-
-@end
-
-NS_ASSUME_NONNULL_END
-
-CF_EXTERN_C_END
-
-#pragma clang diagnostic pop
-
-// @@protoc_insertion_point(global_scope)
diff --git a/libs/protobuf/objectivec/GPBFieldMask.pbobjc.m b/libs/protobuf/objectivec/GPBFieldMask.pbobjc.m
deleted file mode 100644
index ab25d3f..0000000
--- a/libs/protobuf/objectivec/GPBFieldMask.pbobjc.m
+++ /dev/null
@@ -1,84 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/protobuf/field_mask.proto
-
-#import "GPBProtocolBuffers_RuntimeSupport.h"
-#import "GPBFieldMask.pbobjc.h"
-
-// @@protoc_insertion_point(imports)
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-
-#pragma mark - GPBFieldMaskRoot
-
-@implementation GPBFieldMaskRoot
-
-// No extensions in the file and no imports, so no need to generate
-// +extensionRegistry.
-
-@end
-
-#pragma mark - GPBFieldMaskRoot_FileDescriptor
-
-static GPBFileDescriptor *GPBFieldMaskRoot_FileDescriptor(void) {
-  // This is called by +initialize so there is no need to worry
-  // about thread safety of the singleton.
-  static GPBFileDescriptor *descriptor = NULL;
-  if (!descriptor) {
-    GPB_DEBUG_CHECK_RUNTIME_VERSIONS();
-    descriptor = [[GPBFileDescriptor alloc] initWithPackage:@"google.protobuf"
-                                                 objcPrefix:@"GPB"
-                                                     syntax:GPBFileSyntaxProto3];
-  }
-  return descriptor;
-}
-
-#pragma mark - GPBFieldMask
-
-@implementation GPBFieldMask
-
-@dynamic pathsArray, pathsArray_Count;
-
-typedef struct GPBFieldMask__storage_ {
-  uint32_t _has_storage_[1];
-  NSMutableArray *pathsArray;
-} GPBFieldMask__storage_;
-
-// This method is threadsafe because it is initially called
-// in +initialize for each subclass.
-+ (GPBDescriptor *)descriptor {
-  static GPBDescriptor *descriptor = nil;
-  if (!descriptor) {
-    static GPBMessageFieldDescription fields[] = {
-      {
-        .name = "pathsArray",
-        .dataTypeSpecific.clazz = Nil,
-        .number = GPBFieldMask_FieldNumber_PathsArray,
-        .hasIndex = GPBNoHasBit,
-        .offset = (uint32_t)offsetof(GPBFieldMask__storage_, pathsArray),
-        .flags = GPBFieldRepeated,
-        .dataType = GPBDataTypeString,
-      },
-    };
-    GPBDescriptor *localDescriptor =
-        [GPBDescriptor allocDescriptorForClass:[GPBFieldMask class]
-                                     rootClass:[GPBFieldMaskRoot class]
-                                          file:GPBFieldMaskRoot_FileDescriptor()
-                                        fields:fields
-                                    fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
-                                   storageSize:sizeof(GPBFieldMask__storage_)
-                                         flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown)];
-    #if defined(DEBUG) && DEBUG
-      NSAssert(descriptor == nil, @"Startup recursed!");
-    #endif  // DEBUG
-    descriptor = localDescriptor;
-  }
-  return descriptor;
-}
-
-@end
-
-
-#pragma clang diagnostic pop
-
-// @@protoc_insertion_point(global_scope)
diff --git a/libs/protobuf/objectivec/GPBMessage.h b/libs/protobuf/objectivec/GPBMessage.h
deleted file mode 100644
index 01253a4..0000000
--- a/libs/protobuf/objectivec/GPBMessage.h
+++ /dev/null
@@ -1,470 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#import <Foundation/Foundation.h>
-
-#import "GPBBootstrap.h"
-
-@class GPBDescriptor;
-@class GPBCodedInputStream;
-@class GPBCodedOutputStream;
-@class GPBExtensionDescriptor;
-@class GPBExtensionRegistry;
-@class GPBFieldDescriptor;
-@class GPBUnknownFieldSet;
-
-NS_ASSUME_NONNULL_BEGIN
-
-CF_EXTERN_C_BEGIN
-
-/** NSError domain used for errors. */
-extern NSString *const GPBMessageErrorDomain;
-
-/** Error codes for NSErrors originated in GPBMessage. */
-typedef NS_ENUM(NSInteger, GPBMessageErrorCode) {
-  /** Uncategorized error. */
-  GPBMessageErrorCodeOther = -100,
-  /** Message couldn't be serialized because it is missing required fields. */
-  GPBMessageErrorCodeMissingRequiredField = -101,
-};
-
-/**
- * Key under which the GPBMessage error's reason is stored inside the userInfo
- * dictionary.
- **/
-extern NSString *const GPBErrorReasonKey;
-
-CF_EXTERN_C_END
-
-/**
- * Base class that each generated message subclasses from.
- *
- * @note @c NSCopying support is a "deep copy", in that all sub objects are
- *       copied.  Just like you wouldn't want a UIView/NSView trying to
- *       exist in two places, you don't want a sub message to be a property
- *       property of two other messages.
- *
- * @note While the class support NSSecureCoding, if the message has any
- *       extensions, they will end up reloaded in @c unknownFields as there is
- *       no way for the @c NSCoding plumbing to pass through a
- *       @c GPBExtensionRegistry. To support extensions, instead of passing the
- *       calls off to the Message, simple store the result of @c data, and then
- *       when loading, fetch the data and use
- *       @c +parseFromData:extensionRegistry:error: to provide an extension
- *       registry.
- **/
-@interface GPBMessage : NSObject<NSSecureCoding, NSCopying>
-
-// If you add an instance method/property to this class that may conflict with
-// fields declared in protos, you need to update objective_helpers.cc. The main
-// cases are methods that take no arguments, or setFoo:/hasFoo: type methods.
-
-/**
- * The set of unknown fields for this message.
- *
- * Only messages from proto files declared with "proto2" syntax support unknown
- * fields. For "proto3" syntax, any unknown fields found while parsing are
- * dropped.
- **/
-@property(nonatomic, copy, nullable) GPBUnknownFieldSet *unknownFields;
-
-/**
- * Whether the message, along with all submessages, have the required fields
- * set. This is only applicable for files declared with "proto2" syntax, as
- * there are no required fields for "proto3" syntax.
- **/
-@property(nonatomic, readonly, getter=isInitialized) BOOL initialized;
-
-/**
- * @return An autoreleased message with the default values set.
- **/
-+ (instancetype)message;
-
-/**
- * Creates a new instance by parsing the provided data. This method should be
- * sent to the generated message class that the data should be interpreted as.
- * If there is an error the method returns nil and the error is returned in
- * errorPtr (when provided).
- *
- * @note In DEBUG builds, the parsed message is checked to be sure all required
- *       fields were provided, and the parse will fail if some are missing.
- *
- * @note The errors returned are likely coming from the domain and codes listed
- *       at the top of this file and GPBCodedInputStream.h.
- *
- * @param data     The data to parse.
- * @param errorPtr An optional error pointer to fill in with a failure reason if
- *                 the data can not be parsed.
- *
- * @return A new instance of the generated class.
- **/
-+ (nullable instancetype)parseFromData:(NSData *)data error:(NSError **)errorPtr;
-
-/**
- * Creates a new instance by parsing the data. This method should be sent to
- * the generated message class that the data should be interpreted as. If
- * there is an error the method returns nil and the error is returned in
- * errorPtr (when provided).
- *
- * @note In DEBUG builds, the parsed message is checked to be sure all required
- *       fields were provided, and the parse will fail if some are missing.
- *
- * @note The errors returned are likely coming from the domain and codes listed
- *       at the top of this file and GPBCodedInputStream.h.
- *
- * @param data              The data to parse.
- * @param extensionRegistry The extension registry to use to look up extensions.
- * @param errorPtr          An optional error pointer to fill in with a failure
- *                          reason if the data can not be parsed.
- *
- * @return A new instance of the generated class.
- **/
-+ (nullable instancetype)parseFromData:(NSData *)data
-                     extensionRegistry:(nullable GPBExtensionRegistry *)extensionRegistry
-                                 error:(NSError **)errorPtr;
-
-/**
- * Creates a new instance by parsing the data from the given input stream. This
- * method should be sent to the generated message class that the data should
- * be interpreted as. If there is an error the method returns nil and the error
- * is returned in errorPtr (when provided).
- *
- * @note In DEBUG builds, the parsed message is checked to be sure all required
- *       fields were provided, and the parse will fail if some are missing.
- *
- * @note The errors returned are likely coming from the domain and codes listed
- *       at the top of this file and GPBCodedInputStream.h.
- *
- * @param input             The stream to read data from.
- * @param extensionRegistry The extension registry to use to look up extensions.
- * @param errorPtr          An optional error pointer to fill in with a failure
- *                          reason if the data can not be parsed.
- *
- * @return A new instance of the generated class.
- **/
-+ (nullable instancetype)parseFromCodedInputStream:(GPBCodedInputStream *)input
-                                 extensionRegistry:
-                                     (nullable GPBExtensionRegistry *)extensionRegistry
-                                             error:(NSError **)errorPtr;
-
-/**
- * Creates a new instance by parsing the data from the given input stream. This
- * method should be sent to the generated message class that the data should
- * be interpreted as. If there is an error the method returns nil and the error
- * is returned in errorPtr (when provided).
- *
- * @note Unlike the parseFrom... methods, this never checks to see if all of
- *       the required fields are set. So this method can be used to reload
- *       messages that may not be complete.
- *
- * @note The errors returned are likely coming from the domain and codes listed
- *       at the top of this file and GPBCodedInputStream.h.
- *
- * @param input             The stream to read data from.
- * @param extensionRegistry The extension registry to use to look up extensions.
- * @param errorPtr          An optional error pointer to fill in with a failure
- *                          reason if the data can not be parsed.
- *
- * @return A new instance of the generated class.
- **/
-+ (nullable instancetype)parseDelimitedFromCodedInputStream:(GPBCodedInputStream *)input
-                                          extensionRegistry:
-                                              (nullable GPBExtensionRegistry *)extensionRegistry
-                                                      error:(NSError **)errorPtr;
-
-/**
- * Initializes an instance by parsing the data. This method should be sent to
- * the generated message class that the data should be interpreted as. If
- * there is an error the method returns nil and the error is returned in
- * errorPtr (when provided).
- *
- * @note In DEBUG builds, the parsed message is checked to be sure all required
- *       fields were provided, and the parse will fail if some are missing.
- *
- * @note The errors returned are likely coming from the domain and codes listed
- *       at the top of this file and GPBCodedInputStream.h.
- *
- * @param data     The data to parse.
- * @param errorPtr An optional error pointer to fill in with a failure reason if
- *                 the data can not be parsed.
- *
- * @return An initialized instance of the generated class.
- **/
-- (nullable instancetype)initWithData:(NSData *)data error:(NSError **)errorPtr;
-
-/**
- * Initializes an instance by parsing the data. This method should be sent to
- * the generated message class that the data should be interpreted as. If
- * there is an error the method returns nil and the error is returned in
- * errorPtr (when provided).
- *
- * @note In DEBUG builds, the parsed message is checked to be sure all required
- *       fields were provided, and the parse will fail if some are missing.
- *
- * @note The errors returned are likely coming from the domain and codes listed
- *       at the top of this file and GPBCodedInputStream.h.
- *
- * @param data              The data to parse.
- * @param extensionRegistry The extension registry to use to look up extensions.
- * @param errorPtr          An optional error pointer to fill in with a failure
- *                          reason if the data can not be parsed.
- *
- * @return An initialized instance of the generated class.
- **/
-- (nullable instancetype)initWithData:(NSData *)data
-                    extensionRegistry:(nullable GPBExtensionRegistry *)extensionRegistry
-                                error:(NSError **)errorPtr;
-
-/**
- * Initializes an instance by parsing the data from the given input stream. This
- * method should be sent to the generated message class that the data should
- * be interpreted as. If there is an error the method returns nil and the error
- * is returned in errorPtr (when provided).
- *
- * @note Unlike the parseFrom... methods, this never checks to see if all of
- *       the required fields are set. So this method can be used to reload
- *       messages that may not be complete.
- *
- * @note The errors returned are likely coming from the domain and codes listed
- *       at the top of this file and GPBCodedInputStream.h.
- *
- * @param input             The stream to read data from.
- * @param extensionRegistry The extension registry to use to look up extensions.
- * @param errorPtr          An optional error pointer to fill in with a failure
- *                          reason if the data can not be parsed.
- *
- * @return An initialized instance of the generated class.
- **/
-- (nullable instancetype)initWithCodedInputStream:(GPBCodedInputStream *)input
-                                extensionRegistry:
-                                    (nullable GPBExtensionRegistry *)extensionRegistry
-                                            error:(NSError **)errorPtr;
-
-/**
- * Parses the given data as this message's class, and merges those values into
- * this message.
- *
- * @param data              The binary representation of the message to merge.
- * @param extensionRegistry The extension registry to use to look up extensions.
- *
- * @exception GPBCodedInputStreamException Exception thrown when parsing was
- *                                         unsuccessful.
- **/
-- (void)mergeFromData:(NSData *)data
-    extensionRegistry:(nullable GPBExtensionRegistry *)extensionRegistry;
-
-/**
- * Merges the fields from another message (of the same type) into this
- * message.
- *
- * @param other Message to merge into this message.
- **/
-- (void)mergeFrom:(GPBMessage *)other;
-
-/**
- * Writes out the message to the given coded output stream.
- *
- * @param output The coded output stream into which to write the message.
- *
- * @note This can raise the GPBCodedOutputStreamException_* exceptions.
- *
- **/
-- (void)writeToCodedOutputStream:(GPBCodedOutputStream *)output;
-
-/**
- * Writes out the message to the given output stream.
- *
- * @param output The output stream into which to write the message.
- *
- * @note This can raise the GPBCodedOutputStreamException_* exceptions.
- **/
-- (void)writeToOutputStream:(NSOutputStream *)output;
-
-/**
- * Writes out a varint for the message size followed by the message to
- * the given output stream.
- *
- * @param output The coded output stream into which to write the message.
- *
- * @note This can raise the GPBCodedOutputStreamException_* exceptions.
- **/
-- (void)writeDelimitedToCodedOutputStream:(GPBCodedOutputStream *)output;
-
-/**
- * Writes out a varint for the message size followed by the message to
- * the given output stream.
- *
- * @param output The output stream into which to write the message.
- *
- * @note This can raise the GPBCodedOutputStreamException_* exceptions.
- **/
-- (void)writeDelimitedToOutputStream:(NSOutputStream *)output;
-
-/**
- * Serializes the message to an NSData.
- *
- * If there is an error while generating the data, nil is returned.
- *
- * @note This value is not cached, so if you are using it repeatedly, cache
- *       it yourself.
- *
- * @note In DEBUG ONLY, the message is also checked for all required field,
- *       if one is missing, nil will be returned.
- *
- * @return The binary representation of the message.
- **/
-- (nullable NSData *)data;
-
-/**
- * Serializes a varint with the message size followed by the message data,
- * returning that as an NSData.
- *
- * @note This value is not cached, so if you are using it repeatedly, it is
- *       recommended to keep a local copy.
- *
- * @return The binary representation of the size along with the message.
- **/
-- (NSData *)delimitedData;
-
-/**
- * Calculates the size of the object if it were serialized.
- *
- * This is not a cached value. If you are following a pattern like this:
- *
- * ```
- * size_t size = [aMsg serializedSize];
- * NSMutableData *foo = [NSMutableData dataWithCapacity:size + sizeof(size)];
- * [foo writeSize:size];
- * [foo appendData:[aMsg data]];
- * ```
- *
- * you would be better doing:
- *
- * ```
- * NSData *data = [aMsg data];
- * NSUInteger size = [aMsg length];
- * NSMutableData *foo = [NSMutableData dataWithCapacity:size + sizeof(size)];
- * [foo writeSize:size];
- * [foo appendData:data];
- * ```
- *
- * @return The size of the message in it's binary representation.
- **/
-- (size_t)serializedSize;
-
-/**
- * @return The descriptor for the message class.
- **/
-+ (GPBDescriptor *)descriptor;
-
-/**
- * Return the descriptor for the message.
- **/
-- (GPBDescriptor *)descriptor;
-
-/**
- * @return An array with the extension descriptors that are currently set on the
- * message.
- **/
-- (NSArray *)extensionsCurrentlySet;
-
-/**
- * Checks whether there is an extension set on the message which matches the
- * given extension descriptor.
- *
- * @param extension Extension descriptor to check if it's set on the message.
- *
- * @return Whether the extension is currently set on the message.
- **/
-- (BOOL)hasExtension:(GPBExtensionDescriptor *)extension;
-
-/*
- * Fetches the given extension's value for this message.
- *
- * Extensions use boxed values (NSNumbers) for PODs and NSMutableArrays for
- * repeated fields. If the extension is a Message one will be auto created for
- * you and returned similar to fields.
- *
- * @param extension The extension descriptor of the extension to fetch.
- *
- * @return The extension matching the given descriptor, or nil if none found.
- **/
-- (nullable id)getExtension:(GPBExtensionDescriptor *)extension;
-
-/**
- * Sets the given extension's value for this message. This only applies for
- * single field extensions (i.e. - not repeated fields).
- *
- * Extensions use boxed values (NSNumbers).
- *
- * @param extension The extension descriptor under which to set the value.
- * @param value     The value to be set as the extension.
- **/
-- (void)setExtension:(GPBExtensionDescriptor *)extension
-               value:(nullable id)value;
-
-/**
- * Adds the given value to the extension for this message. This only applies
- * to repeated field extensions. If the field is a repeated POD type, the value
- * should be an NSNumber.
- *
- * @param extension The extension descriptor under which to add the value.
- * @param value     The value to be added to the repeated extension.
- **/
-- (void)addExtension:(GPBExtensionDescriptor *)extension value:(id)value;
-
-/**
- * Replaces the value at the given index with the given value for the extension
- * on this message. This only applies to repeated field extensions. If the field
- * is a repeated POD type, the value is should be an NSNumber.
- *
- * @param extension The extension descriptor under which to replace the value.
- * @param index     The index of the extension to be replaced.
- * @param value     The value to be replaced in the repeated extension.
- **/
-- (void)setExtension:(GPBExtensionDescriptor *)extension
-               index:(NSUInteger)index
-               value:(id)value;
-
-/**
- * Clears the given extension for this message.
- *
- * @param extension The extension descriptor to be cleared from this message.
- **/
-- (void)clearExtension:(GPBExtensionDescriptor *)extension;
-
-/**
- * Resets all of the fields of this message to their default values.
- **/
-- (void)clear;
-
-@end
-
-NS_ASSUME_NONNULL_END
diff --git a/libs/protobuf/objectivec/GPBMessage.m b/libs/protobuf/objectivec/GPBMessage.m
deleted file mode 100644
index ee94dee..0000000
--- a/libs/protobuf/objectivec/GPBMessage.m
+++ /dev/null
@@ -1,3395 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#import "GPBMessage_PackagePrivate.h"
-
-#import <objc/runtime.h>
-#import <objc/message.h>
-#import <stdatomic.h>
-
-#import "GPBArray_PackagePrivate.h"
-#import "GPBCodedInputStream_PackagePrivate.h"
-#import "GPBCodedOutputStream_PackagePrivate.h"
-#import "GPBDescriptor_PackagePrivate.h"
-#import "GPBDictionary_PackagePrivate.h"
-#import "GPBExtensionInternals.h"
-#import "GPBExtensionRegistry.h"
-#import "GPBRootObject_PackagePrivate.h"
-#import "GPBUnknownFieldSet_PackagePrivate.h"
-#import "GPBUtilities_PackagePrivate.h"
-
-// Direct access is use for speed, to avoid even internally declaring things
-// read/write, etc. The warning is enabled in the project to ensure code calling
-// protos can turn on -Wdirect-ivar-access without issues.
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdirect-ivar-access"
-
-NSString *const GPBMessageErrorDomain =
-    GPBNSStringifySymbol(GPBMessageErrorDomain);
-
-NSString *const GPBErrorReasonKey = @"Reason";
-
-static NSString *const kGPBDataCoderKey = @"GPBData";
-
-//
-// PLEASE REMEMBER:
-//
-// This is the base class for *all* messages generated, so any selector defined,
-// *public* or *private* could end up colliding with a proto message field. So
-// avoid using selectors that could match a property, use C functions to hide
-// them, etc.
-//
-
-@interface GPBMessage () {
- @package
-  GPBUnknownFieldSet *unknownFields_;
-  NSMutableDictionary *extensionMap_;
-  // Readonly access to autocreatedExtensionMap_ is protected via
-  // readOnlySemaphore_.
-  NSMutableDictionary *autocreatedExtensionMap_;
-
-  // If the object was autocreated, we remember the creator so that if we get
-  // mutated, we can inform the creator to make our field visible.
-  GPBMessage *autocreator_;
-  GPBFieldDescriptor *autocreatorField_;
-  GPBExtensionDescriptor *autocreatorExtension_;
-
-  // Message can only be mutated from one thread. But some *readonly* operations
-  // modify internal state because they autocreate things. The
-  // autocreatedExtensionMap_ is one such structure. Access during readonly
-  // operations is protected via this semaphore.
-  // NOTE: OSSpinLock may seem like a good fit here but Apple engineers have
-  // pointed out that they are vulnerable to live locking on iOS in cases of
-  // priority inversion:
-  //   http://mjtsai.com/blog/2015/12/16/osspinlock-is-unsafe/
-  //   https://lists.swift.org/pipermail/swift-dev/Week-of-Mon-20151214/000372.html
-  // Use of readOnlySemaphore_ must be prefaced by a call to
-  // GPBPrepareReadOnlySemaphore to ensure it has been created. This allows
-  // readOnlySemaphore_ to be only created when actually needed.
-  _Atomic(dispatch_semaphore_t) readOnlySemaphore_;
-}
-@end
-
-static id CreateArrayForField(GPBFieldDescriptor *field,
-                              GPBMessage *autocreator)
-    __attribute__((ns_returns_retained));
-static id GetOrCreateArrayIvarWithField(GPBMessage *self,
-                                        GPBFieldDescriptor *field);
-static id GetArrayIvarWithField(GPBMessage *self, GPBFieldDescriptor *field);
-static id CreateMapForField(GPBFieldDescriptor *field,
-                            GPBMessage *autocreator)
-    __attribute__((ns_returns_retained));
-static id GetOrCreateMapIvarWithField(GPBMessage *self,
-                                      GPBFieldDescriptor *field);
-static id GetMapIvarWithField(GPBMessage *self, GPBFieldDescriptor *field);
-static NSMutableDictionary *CloneExtensionMap(NSDictionary *extensionMap,
-                                              NSZone *zone)
-    __attribute__((ns_returns_retained));
-
-#ifdef DEBUG
-static NSError *MessageError(NSInteger code, NSDictionary *userInfo) {
-  return [NSError errorWithDomain:GPBMessageErrorDomain
-                             code:code
-                         userInfo:userInfo];
-}
-#endif
-
-static NSError *ErrorFromException(NSException *exception) {
-  NSError *error = nil;
-
-  if ([exception.name isEqual:GPBCodedInputStreamException]) {
-    NSDictionary *exceptionInfo = exception.userInfo;
-    error = exceptionInfo[GPBCodedInputStreamUnderlyingErrorKey];
-  }
-
-  if (!error) {
-    NSString *reason = exception.reason;
-    NSDictionary *userInfo = nil;
-    if ([reason length]) {
-      userInfo = @{ GPBErrorReasonKey : reason };
-    }
-
-    error = [NSError errorWithDomain:GPBMessageErrorDomain
-                                code:GPBMessageErrorCodeOther
-                            userInfo:userInfo];
-  }
-  return error;
-}
-
-static void CheckExtension(GPBMessage *self,
-                           GPBExtensionDescriptor *extension) {
-  if (![self isKindOfClass:extension.containingMessageClass]) {
-    [NSException
-         raise:NSInvalidArgumentException
-        format:@"Extension %@ used on wrong class (%@ instead of %@)",
-               extension.singletonName,
-               [self class], extension.containingMessageClass];
-  }
-}
-
-static NSMutableDictionary *CloneExtensionMap(NSDictionary *extensionMap,
-                                              NSZone *zone) {
-  if (extensionMap.count == 0) {
-    return nil;
-  }
-  NSMutableDictionary *result = [[NSMutableDictionary allocWithZone:zone]
-      initWithCapacity:extensionMap.count];
-
-  for (GPBExtensionDescriptor *extension in extensionMap) {
-    id value = [extensionMap objectForKey:extension];
-    BOOL isMessageExtension = GPBExtensionIsMessage(extension);
-
-    if (extension.repeated) {
-      if (isMessageExtension) {
-        NSMutableArray *list =
-            [[NSMutableArray alloc] initWithCapacity:[value count]];
-        for (GPBMessage *listValue in value) {
-          GPBMessage *copiedValue = [listValue copyWithZone:zone];
-          [list addObject:copiedValue];
-          [copiedValue release];
-        }
-        [result setObject:list forKey:extension];
-        [list release];
-      } else {
-        NSMutableArray *copiedValue = [value mutableCopyWithZone:zone];
-        [result setObject:copiedValue forKey:extension];
-        [copiedValue release];
-      }
-    } else {
-      if (isMessageExtension) {
-        GPBMessage *copiedValue = [value copyWithZone:zone];
-        [result setObject:copiedValue forKey:extension];
-        [copiedValue release];
-      } else {
-        [result setObject:value forKey:extension];
-      }
-    }
-  }
-
-  return result;
-}
-
-static id CreateArrayForField(GPBFieldDescriptor *field,
-                              GPBMessage *autocreator) {
-  id result;
-  GPBDataType fieldDataType = GPBGetFieldDataType(field);
-  switch (fieldDataType) {
-    case GPBDataTypeBool:
-      result = [[GPBBoolArray alloc] init];
-      break;
-    case GPBDataTypeFixed32:
-    case GPBDataTypeUInt32:
-      result = [[GPBUInt32Array alloc] init];
-      break;
-    case GPBDataTypeInt32:
-    case GPBDataTypeSFixed32:
-    case GPBDataTypeSInt32:
-      result = [[GPBInt32Array alloc] init];
-      break;
-    case GPBDataTypeFixed64:
-    case GPBDataTypeUInt64:
-      result = [[GPBUInt64Array alloc] init];
-      break;
-    case GPBDataTypeInt64:
-    case GPBDataTypeSFixed64:
-    case GPBDataTypeSInt64:
-      result = [[GPBInt64Array alloc] init];
-      break;
-    case GPBDataTypeFloat:
-      result = [[GPBFloatArray alloc] init];
-      break;
-    case GPBDataTypeDouble:
-      result = [[GPBDoubleArray alloc] init];
-      break;
-
-    case GPBDataTypeEnum:
-      result = [[GPBEnumArray alloc]
-                  initWithValidationFunction:field.enumDescriptor.enumVerifier];
-      break;
-
-    case GPBDataTypeBytes:
-    case GPBDataTypeGroup:
-    case GPBDataTypeMessage:
-    case GPBDataTypeString:
-      if (autocreator) {
-        result = [[GPBAutocreatedArray alloc] init];
-      } else {
-        result = [[NSMutableArray alloc] init];
-      }
-      break;
-  }
-
-  if (autocreator) {
-    if (GPBDataTypeIsObject(fieldDataType)) {
-      GPBAutocreatedArray *autoArray = result;
-      autoArray->_autocreator =  autocreator;
-    } else {
-      GPBInt32Array *gpbArray = result;
-      gpbArray->_autocreator = autocreator;
-    }
-  }
-
-  return result;
-}
-
-static id CreateMapForField(GPBFieldDescriptor *field,
-                            GPBMessage *autocreator) {
-  id result;
-  GPBDataType keyDataType = field.mapKeyDataType;
-  GPBDataType valueDataType = GPBGetFieldDataType(field);
-  switch (keyDataType) {
-    case GPBDataTypeBool:
-      switch (valueDataType) {
-        case GPBDataTypeBool:
-          result = [[GPBBoolBoolDictionary alloc] init];
-          break;
-        case GPBDataTypeFixed32:
-        case GPBDataTypeUInt32:
-          result = [[GPBBoolUInt32Dictionary alloc] init];
-          break;
-        case GPBDataTypeInt32:
-        case GPBDataTypeSFixed32:
-        case GPBDataTypeSInt32:
-          result = [[GPBBoolInt32Dictionary alloc] init];
-          break;
-        case GPBDataTypeFixed64:
-        case GPBDataTypeUInt64:
-          result = [[GPBBoolUInt64Dictionary alloc] init];
-          break;
-        case GPBDataTypeInt64:
-        case GPBDataTypeSFixed64:
-        case GPBDataTypeSInt64:
-          result = [[GPBBoolInt64Dictionary alloc] init];
-          break;
-        case GPBDataTypeFloat:
-          result = [[GPBBoolFloatDictionary alloc] init];
-          break;
-        case GPBDataTypeDouble:
-          result = [[GPBBoolDoubleDictionary alloc] init];
-          break;
-        case GPBDataTypeEnum:
-          result = [[GPBBoolEnumDictionary alloc]
-              initWithValidationFunction:field.enumDescriptor.enumVerifier];
-          break;
-        case GPBDataTypeBytes:
-        case GPBDataTypeMessage:
-        case GPBDataTypeString:
-          result = [[GPBBoolObjectDictionary alloc] init];
-          break;
-        case GPBDataTypeGroup:
-          NSCAssert(NO, @"shouldn't happen");
-          return nil;
-      }
-      break;
-    case GPBDataTypeFixed32:
-    case GPBDataTypeUInt32:
-      switch (valueDataType) {
-        case GPBDataTypeBool:
-          result = [[GPBUInt32BoolDictionary alloc] init];
-          break;
-        case GPBDataTypeFixed32:
-        case GPBDataTypeUInt32:
-          result = [[GPBUInt32UInt32Dictionary alloc] init];
-          break;
-        case GPBDataTypeInt32:
-        case GPBDataTypeSFixed32:
-        case GPBDataTypeSInt32:
-          result = [[GPBUInt32Int32Dictionary alloc] init];
-          break;
-        case GPBDataTypeFixed64:
-        case GPBDataTypeUInt64:
-          result = [[GPBUInt32UInt64Dictionary alloc] init];
-          break;
-        case GPBDataTypeInt64:
-        case GPBDataTypeSFixed64:
-        case GPBDataTypeSInt64:
-          result = [[GPBUInt32Int64Dictionary alloc] init];
-          break;
-        case GPBDataTypeFloat:
-          result = [[GPBUInt32FloatDictionary alloc] init];
-          break;
-        case GPBDataTypeDouble:
-          result = [[GPBUInt32DoubleDictionary alloc] init];
-          break;
-        case GPBDataTypeEnum:
-          result = [[GPBUInt32EnumDictionary alloc]
-              initWithValidationFunction:field.enumDescriptor.enumVerifier];
-          break;
-        case GPBDataTypeBytes:
-        case GPBDataTypeMessage:
-        case GPBDataTypeString:
-          result = [[GPBUInt32ObjectDictionary alloc] init];
-          break;
-        case GPBDataTypeGroup:
-          NSCAssert(NO, @"shouldn't happen");
-          return nil;
-      }
-      break;
-    case GPBDataTypeInt32:
-    case GPBDataTypeSFixed32:
-    case GPBDataTypeSInt32:
-      switch (valueDataType) {
-        case GPBDataTypeBool:
-          result = [[GPBInt32BoolDictionary alloc] init];
-          break;
-        case GPBDataTypeFixed32:
-        case GPBDataTypeUInt32:
-          result = [[GPBInt32UInt32Dictionary alloc] init];
-          break;
-        case GPBDataTypeInt32:
-        case GPBDataTypeSFixed32:
-        case GPBDataTypeSInt32:
-          result = [[GPBInt32Int32Dictionary alloc] init];
-          break;
-        case GPBDataTypeFixed64:
-        case GPBDataTypeUInt64:
-          result = [[GPBInt32UInt64Dictionary alloc] init];
-          break;
-        case GPBDataTypeInt64:
-        case GPBDataTypeSFixed64:
-        case GPBDataTypeSInt64:
-          result = [[GPBInt32Int64Dictionary alloc] init];
-          break;
-        case GPBDataTypeFloat:
-          result = [[GPBInt32FloatDictionary alloc] init];
-          break;
-        case GPBDataTypeDouble:
-          result = [[GPBInt32DoubleDictionary alloc] init];
-          break;
-        case GPBDataTypeEnum:
-          result = [[GPBInt32EnumDictionary alloc]
-              initWithValidationFunction:field.enumDescriptor.enumVerifier];
-          break;
-        case GPBDataTypeBytes:
-        case GPBDataTypeMessage:
-        case GPBDataTypeString:
-          result = [[GPBInt32ObjectDictionary alloc] init];
-          break;
-        case GPBDataTypeGroup:
-          NSCAssert(NO, @"shouldn't happen");
-          return nil;
-      }
-      break;
-    case GPBDataTypeFixed64:
-    case GPBDataTypeUInt64:
-      switch (valueDataType) {
-        case GPBDataTypeBool:
-          result = [[GPBUInt64BoolDictionary alloc] init];
-          break;
-        case GPBDataTypeFixed32:
-        case GPBDataTypeUInt32:
-          result = [[GPBUInt64UInt32Dictionary alloc] init];
-          break;
-        case GPBDataTypeInt32:
-        case GPBDataTypeSFixed32:
-        case GPBDataTypeSInt32:
-          result = [[GPBUInt64Int32Dictionary alloc] init];
-          break;
-        case GPBDataTypeFixed64:
-        case GPBDataTypeUInt64:
-          result = [[GPBUInt64UInt64Dictionary alloc] init];
-          break;
-        case GPBDataTypeInt64:
-        case GPBDataTypeSFixed64:
-        case GPBDataTypeSInt64:
-          result = [[GPBUInt64Int64Dictionary alloc] init];
-          break;
-        case GPBDataTypeFloat:
-          result = [[GPBUInt64FloatDictionary alloc] init];
-          break;
-        case GPBDataTypeDouble:
-          result = [[GPBUInt64DoubleDictionary alloc] init];
-          break;
-        case GPBDataTypeEnum:
-          result = [[GPBUInt64EnumDictionary alloc]
-              initWithValidationFunction:field.enumDescriptor.enumVerifier];
-          break;
-        case GPBDataTypeBytes:
-        case GPBDataTypeMessage:
-        case GPBDataTypeString:
-          result = [[GPBUInt64ObjectDictionary alloc] init];
-          break;
-        case GPBDataTypeGroup:
-          NSCAssert(NO, @"shouldn't happen");
-          return nil;
-      }
-      break;
-    case GPBDataTypeInt64:
-    case GPBDataTypeSFixed64:
-    case GPBDataTypeSInt64:
-      switch (valueDataType) {
-        case GPBDataTypeBool:
-          result = [[GPBInt64BoolDictionary alloc] init];
-          break;
-        case GPBDataTypeFixed32:
-        case GPBDataTypeUInt32:
-          result = [[GPBInt64UInt32Dictionary alloc] init];
-          break;
-        case GPBDataTypeInt32:
-        case GPBDataTypeSFixed32:
-        case GPBDataTypeSInt32:
-          result = [[GPBInt64Int32Dictionary alloc] init];
-          break;
-        case GPBDataTypeFixed64:
-        case GPBDataTypeUInt64:
-          result = [[GPBInt64UInt64Dictionary alloc] init];
-          break;
-        case GPBDataTypeInt64:
-        case GPBDataTypeSFixed64:
-        case GPBDataTypeSInt64:
-          result = [[GPBInt64Int64Dictionary alloc] init];
-          break;
-        case GPBDataTypeFloat:
-          result = [[GPBInt64FloatDictionary alloc] init];
-          break;
-        case GPBDataTypeDouble:
-          result = [[GPBInt64DoubleDictionary alloc] init];
-          break;
-        case GPBDataTypeEnum:
-          result = [[GPBInt64EnumDictionary alloc]
-              initWithValidationFunction:field.enumDescriptor.enumVerifier];
-          break;
-        case GPBDataTypeBytes:
-        case GPBDataTypeMessage:
-        case GPBDataTypeString:
-          result = [[GPBInt64ObjectDictionary alloc] init];
-          break;
-        case GPBDataTypeGroup:
-          NSCAssert(NO, @"shouldn't happen");
-          return nil;
-      }
-      break;
-    case GPBDataTypeString:
-      switch (valueDataType) {
-        case GPBDataTypeBool:
-          result = [[GPBStringBoolDictionary alloc] init];
-          break;
-        case GPBDataTypeFixed32:
-        case GPBDataTypeUInt32:
-          result = [[GPBStringUInt32Dictionary alloc] init];
-          break;
-        case GPBDataTypeInt32:
-        case GPBDataTypeSFixed32:
-        case GPBDataTypeSInt32:
-          result = [[GPBStringInt32Dictionary alloc] init];
-          break;
-        case GPBDataTypeFixed64:
-        case GPBDataTypeUInt64:
-          result = [[GPBStringUInt64Dictionary alloc] init];
-          break;
-        case GPBDataTypeInt64:
-        case GPBDataTypeSFixed64:
-        case GPBDataTypeSInt64:
-          result = [[GPBStringInt64Dictionary alloc] init];
-          break;
-        case GPBDataTypeFloat:
-          result = [[GPBStringFloatDictionary alloc] init];
-          break;
-        case GPBDataTypeDouble:
-          result = [[GPBStringDoubleDictionary alloc] init];
-          break;
-        case GPBDataTypeEnum:
-          result = [[GPBStringEnumDictionary alloc]
-              initWithValidationFunction:field.enumDescriptor.enumVerifier];
-          break;
-        case GPBDataTypeBytes:
-        case GPBDataTypeMessage:
-        case GPBDataTypeString:
-          if (autocreator) {
-            result = [[GPBAutocreatedDictionary alloc] init];
-          } else {
-            result = [[NSMutableDictionary alloc] init];
-          }
-          break;
-        case GPBDataTypeGroup:
-          NSCAssert(NO, @"shouldn't happen");
-          return nil;
-      }
-      break;
-
-    case GPBDataTypeFloat:
-    case GPBDataTypeDouble:
-    case GPBDataTypeEnum:
-    case GPBDataTypeBytes:
-    case GPBDataTypeGroup:
-    case GPBDataTypeMessage:
-      NSCAssert(NO, @"shouldn't happen");
-      return nil;
-  }
-
-  if (autocreator) {
-    if ((keyDataType == GPBDataTypeString) &&
-        GPBDataTypeIsObject(valueDataType)) {
-      GPBAutocreatedDictionary *autoDict = result;
-      autoDict->_autocreator =  autocreator;
-    } else {
-      GPBInt32Int32Dictionary *gpbDict = result;
-      gpbDict->_autocreator = autocreator;
-    }
-  }
-
-  return result;
-}
-
-#if !defined(__clang_analyzer__)
-// These functions are blocked from the analyzer because the analyzer sees the
-// GPBSetRetainedObjectIvarWithFieldPrivate() call as consuming the array/map,
-// so use of the array/map after the call returns is flagged as a use after
-// free.
-// But GPBSetRetainedObjectIvarWithFieldPrivate() is "consuming" the retain
-// count be holding onto the object (it is transferring it), the object is
-// still valid after returning from the call.  The other way to avoid this
-// would be to add a -retain/-autorelease, but that would force every
-// repeated/map field parsed into the autorelease pool which is both a memory
-// and performance hit.
-
-static id GetOrCreateArrayIvarWithField(GPBMessage *self,
-                                        GPBFieldDescriptor *field) {
-  id array = GPBGetObjectIvarWithFieldNoAutocreate(self, field);
-  if (!array) {
-    // No lock needed, this is called from places expecting to mutate
-    // so no threading protection is needed.
-    array = CreateArrayForField(field, nil);
-    GPBSetRetainedObjectIvarWithFieldPrivate(self, field, array);
-  }
-  return array;
-}
-
-// This is like GPBGetObjectIvarWithField(), but for arrays, it should
-// only be used to wire the method into the class.
-static id GetArrayIvarWithField(GPBMessage *self, GPBFieldDescriptor *field) {
-  uint8_t *storage = (uint8_t *)self->messageStorage_;
-  _Atomic(id) *typePtr = (_Atomic(id) *)&storage[field->description_->offset];
-  id array = atomic_load(typePtr);
-  if (array) {
-    return array;
-  }
-
-  id expected = nil;
-  id autocreated = CreateArrayForField(field, self);
-  if (atomic_compare_exchange_strong(typePtr, &expected, autocreated)) {
-    // Value was set, return it.
-    return autocreated;
-  }
-
-  // Some other thread set it, release the one created and return what got set.
-  if (GPBFieldDataTypeIsObject(field)) {
-    GPBAutocreatedArray *autoArray = autocreated;
-    autoArray->_autocreator = nil;
-  } else {
-    GPBInt32Array *gpbArray = autocreated;
-    gpbArray->_autocreator = nil;
-  }
-  [autocreated release];
-  return expected;
-}
-
-static id GetOrCreateMapIvarWithField(GPBMessage *self,
-                                      GPBFieldDescriptor *field) {
-  id dict = GPBGetObjectIvarWithFieldNoAutocreate(self, field);
-  if (!dict) {
-    // No lock needed, this is called from places expecting to mutate
-    // so no threading protection is needed.
-    dict = CreateMapForField(field, nil);
-    GPBSetRetainedObjectIvarWithFieldPrivate(self, field, dict);
-  }
-  return dict;
-}
-
-// This is like GPBGetObjectIvarWithField(), but for maps, it should
-// only be used to wire the method into the class.
-static id GetMapIvarWithField(GPBMessage *self, GPBFieldDescriptor *field) {
-  uint8_t *storage = (uint8_t *)self->messageStorage_;
-  _Atomic(id) *typePtr = (_Atomic(id) *)&storage[field->description_->offset];
-  id dict = atomic_load(typePtr);
-  if (dict) {
-    return dict;
-  }
-
-  id expected = nil;
-  id autocreated = CreateMapForField(field, self);
-  if (atomic_compare_exchange_strong(typePtr, &expected, autocreated)) {
-    // Value was set, return it.
-    return autocreated;
-  }
-
-  // Some other thread set it, release the one created and return what got set.
-  if ((field.mapKeyDataType == GPBDataTypeString) &&
-      GPBFieldDataTypeIsObject(field)) {
-    GPBAutocreatedDictionary *autoDict = autocreated;
-    autoDict->_autocreator = nil;
-  } else {
-    GPBInt32Int32Dictionary *gpbDict = autocreated;
-    gpbDict->_autocreator = nil;
-  }
-  [autocreated release];
-  return expected;
-}
-
-#endif  // !defined(__clang_analyzer__)
-
-GPBMessage *GPBCreateMessageWithAutocreator(Class msgClass,
-                                            GPBMessage *autocreator,
-                                            GPBFieldDescriptor *field) {
-  GPBMessage *message = [[msgClass alloc] init];
-  message->autocreator_ = autocreator;
-  message->autocreatorField_ = [field retain];
-  return message;
-}
-
-static GPBMessage *CreateMessageWithAutocreatorForExtension(
-    Class msgClass, GPBMessage *autocreator, GPBExtensionDescriptor *extension)
-    __attribute__((ns_returns_retained));
-
-static GPBMessage *CreateMessageWithAutocreatorForExtension(
-    Class msgClass, GPBMessage *autocreator,
-    GPBExtensionDescriptor *extension) {
-  GPBMessage *message = [[msgClass alloc] init];
-  message->autocreator_ = autocreator;
-  message->autocreatorExtension_ = [extension retain];
-  return message;
-}
-
-BOOL GPBWasMessageAutocreatedBy(GPBMessage *message, GPBMessage *parent) {
-  return (message->autocreator_ == parent);
-}
-
-void GPBBecomeVisibleToAutocreator(GPBMessage *self) {
-  // Message objects that are implicitly created by accessing a message field
-  // are initially not visible via the hasX selector. This method makes them
-  // visible.
-  if (self->autocreator_) {
-    // This will recursively make all parent messages visible until it reaches a
-    // super-creator that's visible.
-    if (self->autocreatorField_) {
-      GPBSetObjectIvarWithFieldPrivate(self->autocreator_,
-                                        self->autocreatorField_, self);
-    } else {
-      [self->autocreator_ setExtension:self->autocreatorExtension_ value:self];
-    }
-  }
-}
-
-void GPBAutocreatedArrayModified(GPBMessage *self, id array) {
-  // When one of our autocreated arrays adds elements, make it visible.
-  GPBDescriptor *descriptor = [[self class] descriptor];
-  for (GPBFieldDescriptor *field in descriptor->fields_) {
-    if (field.fieldType == GPBFieldTypeRepeated) {
-      id curArray = GPBGetObjectIvarWithFieldNoAutocreate(self, field);
-      if (curArray == array) {
-        if (GPBFieldDataTypeIsObject(field)) {
-          GPBAutocreatedArray *autoArray = array;
-          autoArray->_autocreator = nil;
-        } else {
-          GPBInt32Array *gpbArray = array;
-          gpbArray->_autocreator = nil;
-        }
-        GPBBecomeVisibleToAutocreator(self);
-        return;
-      }
-    }
-  }
-  NSCAssert(NO, @"Unknown autocreated %@ for %@.", [array class], self);
-}
-
-void GPBAutocreatedDictionaryModified(GPBMessage *self, id dictionary) {
-  // When one of our autocreated dicts adds elements, make it visible.
-  GPBDescriptor *descriptor = [[self class] descriptor];
-  for (GPBFieldDescriptor *field in descriptor->fields_) {
-    if (field.fieldType == GPBFieldTypeMap) {
-      id curDict = GPBGetObjectIvarWithFieldNoAutocreate(self, field);
-      if (curDict == dictionary) {
-        if ((field.mapKeyDataType == GPBDataTypeString) &&
-            GPBFieldDataTypeIsObject(field)) {
-          GPBAutocreatedDictionary *autoDict = dictionary;
-          autoDict->_autocreator = nil;
-        } else {
-          GPBInt32Int32Dictionary *gpbDict = dictionary;
-          gpbDict->_autocreator = nil;
-        }
-        GPBBecomeVisibleToAutocreator(self);
-        return;
-      }
-    }
-  }
-  NSCAssert(NO, @"Unknown autocreated %@ for %@.", [dictionary class], self);
-}
-
-void GPBClearMessageAutocreator(GPBMessage *self) {
-  if ((self == nil) || !self->autocreator_) {
-    return;
-  }
-
-#if defined(DEBUG) && DEBUG && !defined(NS_BLOCK_ASSERTIONS)
-  // Either the autocreator must have its "has" flag set to YES, or it must be
-  // NO and not equal to ourselves.
-  BOOL autocreatorHas =
-      (self->autocreatorField_
-           ? GPBGetHasIvarField(self->autocreator_, self->autocreatorField_)
-           : [self->autocreator_ hasExtension:self->autocreatorExtension_]);
-  GPBMessage *autocreatorFieldValue =
-      (self->autocreatorField_
-           ? GPBGetObjectIvarWithFieldNoAutocreate(self->autocreator_,
-                                                   self->autocreatorField_)
-           : [self->autocreator_->autocreatedExtensionMap_
-                 objectForKey:self->autocreatorExtension_]);
-  NSCAssert(autocreatorHas || autocreatorFieldValue != self,
-            @"Cannot clear autocreator because it still refers to self, self: %@.",
-            self);
-
-#endif  // DEBUG && !defined(NS_BLOCK_ASSERTIONS)
-
-  self->autocreator_ = nil;
-  [self->autocreatorField_ release];
-  self->autocreatorField_ = nil;
-  [self->autocreatorExtension_ release];
-  self->autocreatorExtension_ = nil;
-}
-
-// Call this before using the readOnlySemaphore_. This ensures it is created only once.
-void GPBPrepareReadOnlySemaphore(GPBMessage *self) {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdirect-ivar-access"
-
-  // Create the semaphore on demand (rather than init) as developers might not cause them
-  // to be needed, and the heap usage can add up.  The atomic swap is used to avoid needing
-  // another lock around creating it.
-  if (self->readOnlySemaphore_ == nil) {
-    dispatch_semaphore_t worker = dispatch_semaphore_create(1);
-    dispatch_semaphore_t expected = nil;
-    if (!atomic_compare_exchange_strong(&self->readOnlySemaphore_, &expected, worker)) {
-      dispatch_release(worker);
-    }
-#if defined(__clang_analyzer__)
-    // The Xcode 9.2 (and 9.3 beta) static analyzer thinks worker is leaked
-    // (doesn't seem to know about atomic_compare_exchange_strong); so just
-    // for the analyzer, let it think worker is also released in this case.
-    else { dispatch_release(worker); }
-#endif
-  }
-
-#pragma clang diagnostic pop
-}
-
-static GPBUnknownFieldSet *GetOrMakeUnknownFields(GPBMessage *self) {
-  if (!self->unknownFields_) {
-    self->unknownFields_ = [[GPBUnknownFieldSet alloc] init];
-    GPBBecomeVisibleToAutocreator(self);
-  }
-  return self->unknownFields_;
-}
-
-@implementation GPBMessage
-
-+ (void)initialize {
-  Class pbMessageClass = [GPBMessage class];
-  if ([self class] == pbMessageClass) {
-    // This is here to start up the "base" class descriptor.
-    [self descriptor];
-    // Message shares extension method resolving with GPBRootObject so insure
-    // it is started up at the same time.
-    (void)[GPBRootObject class];
-  } else if ([self superclass] == pbMessageClass) {
-    // This is here to start up all the "message" subclasses. Just needs to be
-    // done for the messages, not any of the subclasses.
-    // This must be done in initialize to enforce thread safety of start up of
-    // the protocol buffer library.
-    // Note: The generated code for -descriptor calls
-    // +[GPBDescriptor allocDescriptorForClass:...], passing the GPBRootObject
-    // subclass for the file.  That call chain is what ensures that *Root class
-    // is started up to support extension resolution off the message class
-    // (+resolveClassMethod: below) in a thread safe manner.
-    [self descriptor];
-  }
-}
-
-+ (instancetype)allocWithZone:(NSZone *)zone {
-  // Override alloc to allocate our classes with the additional storage
-  // required for the instance variables.
-  GPBDescriptor *descriptor = [self descriptor];
-  return NSAllocateObject(self, descriptor->storageSize_, zone);
-}
-
-+ (instancetype)alloc {
-  return [self allocWithZone:nil];
-}
-
-+ (GPBDescriptor *)descriptor {
-  // This is thread safe because it is called from +initialize.
-  static GPBDescriptor *descriptor = NULL;
-  static GPBFileDescriptor *fileDescriptor = NULL;
-  if (!descriptor) {
-    // Use a dummy file that marks it as proto2 syntax so when used generically
-    // it supports unknowns/etc.
-    fileDescriptor =
-        [[GPBFileDescriptor alloc] initWithPackage:@"internal"
-                                            syntax:GPBFileSyntaxProto2];
-
-    descriptor = [GPBDescriptor allocDescriptorForClass:[GPBMessage class]
-                                              rootClass:Nil
-                                                   file:fileDescriptor
-                                                 fields:NULL
-                                             fieldCount:0
-                                            storageSize:0
-                                                  flags:0];
-  }
-  return descriptor;
-}
-
-+ (instancetype)message {
-  return [[[self alloc] init] autorelease];
-}
-
-- (instancetype)init {
-  if ((self = [super init])) {
-    messageStorage_ = (GPBMessage_StoragePtr)(
-        ((uint8_t *)self) + class_getInstanceSize([self class]));
-  }
-
-  return self;
-}
-
-- (instancetype)initWithData:(NSData *)data error:(NSError **)errorPtr {
-  return [self initWithData:data extensionRegistry:nil error:errorPtr];
-}
-
-- (instancetype)initWithData:(NSData *)data
-           extensionRegistry:(GPBExtensionRegistry *)extensionRegistry
-                       error:(NSError **)errorPtr {
-  if ((self = [self init])) {
-    @try {
-      [self mergeFromData:data extensionRegistry:extensionRegistry];
-      if (errorPtr) {
-        *errorPtr = nil;
-      }
-    }
-    @catch (NSException *exception) {
-      [self release];
-      self = nil;
-      if (errorPtr) {
-        *errorPtr = ErrorFromException(exception);
-      }
-    }
-#ifdef DEBUG
-    if (self && !self.initialized) {
-      [self release];
-      self = nil;
-      if (errorPtr) {
-        *errorPtr = MessageError(GPBMessageErrorCodeMissingRequiredField, nil);
-      }
-    }
-#endif
-  }
-  return self;
-}
-
-- (instancetype)initWithCodedInputStream:(GPBCodedInputStream *)input
-                       extensionRegistry:
-                           (GPBExtensionRegistry *)extensionRegistry
-                                   error:(NSError **)errorPtr {
-  if ((self = [self init])) {
-    @try {
-      [self mergeFromCodedInputStream:input extensionRegistry:extensionRegistry];
-      if (errorPtr) {
-        *errorPtr = nil;
-      }
-    }
-    @catch (NSException *exception) {
-      [self release];
-      self = nil;
-      if (errorPtr) {
-        *errorPtr = ErrorFromException(exception);
-      }
-    }
-#ifdef DEBUG
-    if (self && !self.initialized) {
-      [self release];
-      self = nil;
-      if (errorPtr) {
-        *errorPtr = MessageError(GPBMessageErrorCodeMissingRequiredField, nil);
-      }
-    }
-#endif
-  }
-  return self;
-}
-
-- (void)dealloc {
-  [self internalClear:NO];
-  NSCAssert(!autocreator_, @"Autocreator was not cleared before dealloc.");
-  if (readOnlySemaphore_) {
-    dispatch_release(readOnlySemaphore_);
-  }
-  [super dealloc];
-}
-
-- (void)copyFieldsInto:(GPBMessage *)message
-                  zone:(NSZone *)zone
-            descriptor:(GPBDescriptor *)descriptor {
-  // Copy all the storage...
-  memcpy(message->messageStorage_, messageStorage_, descriptor->storageSize_);
-
-  // Loop over the fields doing fixup...
-  for (GPBFieldDescriptor *field in descriptor->fields_) {
-    if (GPBFieldIsMapOrArray(field)) {
-      id value = GPBGetObjectIvarWithFieldNoAutocreate(self, field);
-      if (value) {
-        // We need to copy the array/map, but the catch is for message fields,
-        // we also need to ensure all the messages as those need copying also.
-        id newValue;
-        if (GPBFieldDataTypeIsMessage(field)) {
-          if (field.fieldType == GPBFieldTypeRepeated) {
-            NSArray *existingArray = (NSArray *)value;
-            NSMutableArray *newArray =
-                [[NSMutableArray alloc] initWithCapacity:existingArray.count];
-            newValue = newArray;
-            for (GPBMessage *msg in existingArray) {
-              GPBMessage *copiedMsg = [msg copyWithZone:zone];
-              [newArray addObject:copiedMsg];
-              [copiedMsg release];
-            }
-          } else {
-            if (field.mapKeyDataType == GPBDataTypeString) {
-              // Map is an NSDictionary.
-              NSDictionary *existingDict = value;
-              NSMutableDictionary *newDict = [[NSMutableDictionary alloc]
-                  initWithCapacity:existingDict.count];
-              newValue = newDict;
-              [existingDict enumerateKeysAndObjectsUsingBlock:^(NSString *key,
-                                                                GPBMessage *msg,
-                                                                BOOL *stop) {
-#pragma unused(stop)
-                GPBMessage *copiedMsg = [msg copyWithZone:zone];
-                [newDict setObject:copiedMsg forKey:key];
-                [copiedMsg release];
-              }];
-            } else {
-              // Is one of the GPB*ObjectDictionary classes.  Type doesn't
-              // matter, just need one to invoke the selector.
-              GPBInt32ObjectDictionary *existingDict = value;
-              newValue = [existingDict deepCopyWithZone:zone];
-            }
-          }
-        } else {
-          // Not messages (but is a map/array)...
-          if (field.fieldType == GPBFieldTypeRepeated) {
-            if (GPBFieldDataTypeIsObject(field)) {
-              // NSArray
-              newValue = [value mutableCopyWithZone:zone];
-            } else {
-              // GPB*Array
-              newValue = [value copyWithZone:zone];
-            }
-          } else {
-            if ((field.mapKeyDataType == GPBDataTypeString) &&
-                GPBFieldDataTypeIsObject(field)) {
-              // NSDictionary
-              newValue = [value mutableCopyWithZone:zone];
-            } else {
-              // Is one of the GPB*Dictionary classes.  Type doesn't matter,
-              // just need one to invoke the selector.
-              GPBInt32Int32Dictionary *existingDict = value;
-              newValue = [existingDict copyWithZone:zone];
-            }
-          }
-        }
-        // We retain here because the memcpy picked up the pointer value and
-        // the next call to SetRetainedObject... will release the current value.
-        [value retain];
-        GPBSetRetainedObjectIvarWithFieldPrivate(message, field, newValue);
-      }
-    } else if (GPBFieldDataTypeIsMessage(field)) {
-      // For object types, if we have a value, copy it.  If we don't,
-      // zero it to remove the pointer to something that was autocreated
-      // (and the ptr just got memcpyed).
-      if (GPBGetHasIvarField(self, field)) {
-        GPBMessage *value = GPBGetObjectIvarWithFieldNoAutocreate(self, field);
-        GPBMessage *newValue = [value copyWithZone:zone];
-        // We retain here because the memcpy picked up the pointer value and
-        // the next call to SetRetainedObject... will release the current value.
-        [value retain];
-        GPBSetRetainedObjectIvarWithFieldPrivate(message, field, newValue);
-      } else {
-        uint8_t *storage = (uint8_t *)message->messageStorage_;
-        id *typePtr = (id *)&storage[field->description_->offset];
-        *typePtr = NULL;
-      }
-    } else if (GPBFieldDataTypeIsObject(field) &&
-               GPBGetHasIvarField(self, field)) {
-      // A set string/data value (message picked off above), copy it.
-      id value = GPBGetObjectIvarWithFieldNoAutocreate(self, field);
-      id newValue = [value copyWithZone:zone];
-      // We retain here because the memcpy picked up the pointer value and
-      // the next call to SetRetainedObject... will release the current value.
-      [value retain];
-      GPBSetRetainedObjectIvarWithFieldPrivate(message, field, newValue);
-    } else {
-      // memcpy took care of the rest of the primitive fields if they were set.
-    }
-  }  // for (field in descriptor->fields_)
-}
-
-- (id)copyWithZone:(NSZone *)zone {
-  GPBDescriptor *descriptor = [self descriptor];
-  GPBMessage *result = [[descriptor.messageClass allocWithZone:zone] init];
-
-  [self copyFieldsInto:result zone:zone descriptor:descriptor];
-  // Make immutable copies of the extra bits.
-  result->unknownFields_ = [unknownFields_ copyWithZone:zone];
-  result->extensionMap_ = CloneExtensionMap(extensionMap_, zone);
-  return result;
-}
-
-- (void)clear {
-  [self internalClear:YES];
-}
-
-- (void)internalClear:(BOOL)zeroStorage {
-  GPBDescriptor *descriptor = [self descriptor];
-  for (GPBFieldDescriptor *field in descriptor->fields_) {
-    if (GPBFieldIsMapOrArray(field)) {
-      id arrayOrMap = GPBGetObjectIvarWithFieldNoAutocreate(self, field);
-      if (arrayOrMap) {
-        if (field.fieldType == GPBFieldTypeRepeated) {
-          if (GPBFieldDataTypeIsObject(field)) {
-            if ([arrayOrMap isKindOfClass:[GPBAutocreatedArray class]]) {
-              GPBAutocreatedArray *autoArray = arrayOrMap;
-              if (autoArray->_autocreator == self) {
-                autoArray->_autocreator = nil;
-              }
-            }
-          } else {
-            // Type doesn't matter, it is a GPB*Array.
-            GPBInt32Array *gpbArray = arrayOrMap;
-            if (gpbArray->_autocreator == self) {
-              gpbArray->_autocreator = nil;
-            }
-          }
-        } else {
-          if ((field.mapKeyDataType == GPBDataTypeString) &&
-              GPBFieldDataTypeIsObject(field)) {
-            if ([arrayOrMap isKindOfClass:[GPBAutocreatedDictionary class]]) {
-              GPBAutocreatedDictionary *autoDict = arrayOrMap;
-              if (autoDict->_autocreator == self) {
-                autoDict->_autocreator = nil;
-              }
-            }
-          } else {
-            // Type doesn't matter, it is a GPB*Dictionary.
-            GPBInt32Int32Dictionary *gpbDict = arrayOrMap;
-            if (gpbDict->_autocreator == self) {
-              gpbDict->_autocreator = nil;
-            }
-          }
-        }
-        [arrayOrMap release];
-      }
-    } else if (GPBFieldDataTypeIsMessage(field)) {
-      GPBClearAutocreatedMessageIvarWithField(self, field);
-      GPBMessage *value = GPBGetObjectIvarWithFieldNoAutocreate(self, field);
-      [value release];
-    } else if (GPBFieldDataTypeIsObject(field) &&
-               GPBGetHasIvarField(self, field)) {
-      id value = GPBGetObjectIvarWithField(self, field);
-      [value release];
-    }
-  }
-
-  // GPBClearMessageAutocreator() expects that its caller has already been
-  // removed from autocreatedExtensionMap_ so we set to nil first.
-  NSArray *autocreatedValues = [autocreatedExtensionMap_ allValues];
-  [autocreatedExtensionMap_ release];
-  autocreatedExtensionMap_ = nil;
-
-  // Since we're clearing all of our extensions, make sure that we clear the
-  // autocreator on any that we've created so they no longer refer to us.
-  for (GPBMessage *value in autocreatedValues) {
-    NSCAssert(GPBWasMessageAutocreatedBy(value, self),
-              @"Autocreated extension does not refer back to self.");
-    GPBClearMessageAutocreator(value);
-  }
-
-  [extensionMap_ release];
-  extensionMap_ = nil;
-  [unknownFields_ release];
-  unknownFields_ = nil;
-
-  // Note that clearing does not affect autocreator_. If we are being cleared
-  // because of a dealloc, then autocreator_ should be nil anyway. If we are
-  // being cleared because someone explicitly clears us, we don't want to
-  // sever our relationship with our autocreator.
-
-  if (zeroStorage) {
-    memset(messageStorage_, 0, descriptor->storageSize_);
-  }
-}
-
-- (BOOL)isInitialized {
-  GPBDescriptor *descriptor = [self descriptor];
-  for (GPBFieldDescriptor *field in descriptor->fields_) {
-    if (field.isRequired) {
-      if (!GPBGetHasIvarField(self, field)) {
-        return NO;
-      }
-    }
-    if (GPBFieldDataTypeIsMessage(field)) {
-      GPBFieldType fieldType = field.fieldType;
-      if (fieldType == GPBFieldTypeSingle) {
-        if (field.isRequired) {
-          GPBMessage *message = GPBGetMessageMessageField(self, field);
-          if (!message.initialized) {
-            return NO;
-          }
-        } else {
-          NSAssert(field.isOptional,
-                   @"%@: Single message field %@ not required or optional?",
-                   [self class], field.name);
-          if (GPBGetHasIvarField(self, field)) {
-            GPBMessage *message = GPBGetMessageMessageField(self, field);
-            if (!message.initialized) {
-              return NO;
-            }
-          }
-        }
-      } else if (fieldType == GPBFieldTypeRepeated) {
-        NSArray *array = GPBGetObjectIvarWithFieldNoAutocreate(self, field);
-        for (GPBMessage *message in array) {
-          if (!message.initialized) {
-            return NO;
-          }
-        }
-      } else {  // fieldType == GPBFieldTypeMap
-        if (field.mapKeyDataType == GPBDataTypeString) {
-          NSDictionary *map =
-              GPBGetObjectIvarWithFieldNoAutocreate(self, field);
-          if (map && !GPBDictionaryIsInitializedInternalHelper(map, field)) {
-            return NO;
-          }
-        } else {
-          // Real type is GPB*ObjectDictionary, exact type doesn't matter.
-          GPBInt32ObjectDictionary *map =
-              GPBGetObjectIvarWithFieldNoAutocreate(self, field);
-          if (map && ![map isInitialized]) {
-            return NO;
-          }
-        }
-      }
-    }
-  }
-
-  __block BOOL result = YES;
-  [extensionMap_
-      enumerateKeysAndObjectsUsingBlock:^(GPBExtensionDescriptor *extension,
-                                          id obj,
-                                          BOOL *stop) {
-        if (GPBExtensionIsMessage(extension)) {
-          if (extension.isRepeated) {
-            for (GPBMessage *msg in obj) {
-              if (!msg.initialized) {
-                result = NO;
-                *stop = YES;
-                break;
-              }
-            }
-          } else {
-            GPBMessage *asMsg = obj;
-            if (!asMsg.initialized) {
-              result = NO;
-              *stop = YES;
-            }
-          }
-        }
-      }];
-  return result;
-}
-
-- (GPBDescriptor *)descriptor {
-  return [[self class] descriptor];
-}
-
-- (NSData *)data {
-#ifdef DEBUG
-  if (!self.initialized) {
-    return nil;
-  }
-#endif
-  NSMutableData *data = [NSMutableData dataWithLength:[self serializedSize]];
-  GPBCodedOutputStream *stream =
-      [[GPBCodedOutputStream alloc] initWithData:data];
-  @try {
-    [self writeToCodedOutputStream:stream];
-  }
-  @catch (NSException *exception) {
-    // This really shouldn't happen. The only way writeToCodedOutputStream:
-    // could throw is if something in the library has a bug and the
-    // serializedSize was wrong.
-#ifdef DEBUG
-    NSLog(@"%@: Internal exception while building message data: %@",
-          [self class], exception);
-#endif
-    data = nil;
-  }
-  [stream release];
-  return data;
-}
-
-- (NSData *)delimitedData {
-  size_t serializedSize = [self serializedSize];
-  size_t varintSize = GPBComputeRawVarint32SizeForInteger(serializedSize);
-  NSMutableData *data =
-      [NSMutableData dataWithLength:(serializedSize + varintSize)];
-  GPBCodedOutputStream *stream =
-      [[GPBCodedOutputStream alloc] initWithData:data];
-  @try {
-    [self writeDelimitedToCodedOutputStream:stream];
-  }
-  @catch (NSException *exception) {
-    // This really shouldn't happen.  The only way writeToCodedOutputStream:
-    // could throw is if something in the library has a bug and the
-    // serializedSize was wrong.
-#ifdef DEBUG
-    NSLog(@"%@: Internal exception while building message delimitedData: %@",
-          [self class], exception);
-#endif
-    // If it happens, truncate.
-    data.length = 0;
-  }
-  [stream release];
-  return data;
-}
-
-- (void)writeToOutputStream:(NSOutputStream *)output {
-  GPBCodedOutputStream *stream =
-      [[GPBCodedOutputStream alloc] initWithOutputStream:output];
-  [self writeToCodedOutputStream:stream];
-  [stream release];
-}
-
-- (void)writeToCodedOutputStream:(GPBCodedOutputStream *)output {
-  GPBDescriptor *descriptor = [self descriptor];
-  NSArray *fieldsArray = descriptor->fields_;
-  NSUInteger fieldCount = fieldsArray.count;
-  const GPBExtensionRange *extensionRanges = descriptor.extensionRanges;
-  NSUInteger extensionRangesCount = descriptor.extensionRangesCount;
-  NSArray *sortedExtensions =
-      [[extensionMap_ allKeys] sortedArrayUsingSelector:@selector(compareByFieldNumber:)];
-  for (NSUInteger i = 0, j = 0; i < fieldCount || j < extensionRangesCount;) {
-    if (i == fieldCount) {
-      [self writeExtensionsToCodedOutputStream:output
-                                         range:extensionRanges[j++]
-                              sortedExtensions:sortedExtensions];
-    } else if (j == extensionRangesCount ||
-               GPBFieldNumber(fieldsArray[i]) < extensionRanges[j].start) {
-      [self writeField:fieldsArray[i++] toCodedOutputStream:output];
-    } else {
-      [self writeExtensionsToCodedOutputStream:output
-                                         range:extensionRanges[j++]
-                              sortedExtensions:sortedExtensions];
-    }
-  }
-  if (descriptor.isWireFormat) {
-    [unknownFields_ writeAsMessageSetTo:output];
-  } else {
-    [unknownFields_ writeToCodedOutputStream:output];
-  }
-}
-
-- (void)writeDelimitedToOutputStream:(NSOutputStream *)output {
-  GPBCodedOutputStream *codedOutput =
-      [[GPBCodedOutputStream alloc] initWithOutputStream:output];
-  [self writeDelimitedToCodedOutputStream:codedOutput];
-  [codedOutput release];
-}
-
-- (void)writeDelimitedToCodedOutputStream:(GPBCodedOutputStream *)output {
-  [output writeRawVarintSizeTAs32:[self serializedSize]];
-  [self writeToCodedOutputStream:output];
-}
-
-- (void)writeField:(GPBFieldDescriptor *)field
-    toCodedOutputStream:(GPBCodedOutputStream *)output {
-  GPBFieldType fieldType = field.fieldType;
-  if (fieldType == GPBFieldTypeSingle) {
-    BOOL has = GPBGetHasIvarField(self, field);
-    if (!has) {
-      return;
-    }
-  }
-  uint32_t fieldNumber = GPBFieldNumber(field);
-
-//%PDDM-DEFINE FIELD_CASE(TYPE, REAL_TYPE)
-//%FIELD_CASE_FULL(TYPE, REAL_TYPE, REAL_TYPE)
-//%PDDM-DEFINE FIELD_CASE_FULL(TYPE, REAL_TYPE, ARRAY_TYPE)
-//%    case GPBDataType##TYPE:
-//%      if (fieldType == GPBFieldTypeRepeated) {
-//%        uint32_t tag = field.isPackable ? GPBFieldTag(field) : 0;
-//%        GPB##ARRAY_TYPE##Array *array =
-//%            GPBGetObjectIvarWithFieldNoAutocreate(self, field);
-//%        [output write##TYPE##Array:fieldNumber values:array tag:tag];
-//%      } else if (fieldType == GPBFieldTypeSingle) {
-//%        [output write##TYPE:fieldNumber
-//%              TYPE$S  value:GPBGetMessage##REAL_TYPE##Field(self, field)];
-//%      } else {  // fieldType == GPBFieldTypeMap
-//%        // Exact type here doesn't matter.
-//%        GPBInt32##ARRAY_TYPE##Dictionary *dict =
-//%            GPBGetObjectIvarWithFieldNoAutocreate(self, field);
-//%        [dict writeToCodedOutputStream:output asField:field];
-//%      }
-//%      break;
-//%
-//%PDDM-DEFINE FIELD_CASE2(TYPE)
-//%    case GPBDataType##TYPE:
-//%      if (fieldType == GPBFieldTypeRepeated) {
-//%        NSArray *array = GPBGetObjectIvarWithFieldNoAutocreate(self, field);
-//%        [output write##TYPE##Array:fieldNumber values:array];
-//%      } else if (fieldType == GPBFieldTypeSingle) {
-//%        // GPBGetObjectIvarWithFieldNoAutocreate() avoids doing the has check
-//%        // again.
-//%        [output write##TYPE:fieldNumber
-//%              TYPE$S  value:GPBGetObjectIvarWithFieldNoAutocreate(self, field)];
-//%      } else {  // fieldType == GPBFieldTypeMap
-//%        // Exact type here doesn't matter.
-//%        id dict = GPBGetObjectIvarWithFieldNoAutocreate(self, field);
-//%        GPBDataType mapKeyDataType = field.mapKeyDataType;
-//%        if (mapKeyDataType == GPBDataTypeString) {
-//%          GPBDictionaryWriteToStreamInternalHelper(output, dict, field);
-//%        } else {
-//%          [dict writeToCodedOutputStream:output asField:field];
-//%        }
-//%      }
-//%      break;
-//%
-
-  switch (GPBGetFieldDataType(field)) {
-
-//%PDDM-EXPAND FIELD_CASE(Bool, Bool)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-    case GPBDataTypeBool:
-      if (fieldType == GPBFieldTypeRepeated) {
-        uint32_t tag = field.isPackable ? GPBFieldTag(field) : 0;
-        GPBBoolArray *array =
-            GPBGetObjectIvarWithFieldNoAutocreate(self, field);
-        [output writeBoolArray:fieldNumber values:array tag:tag];
-      } else if (fieldType == GPBFieldTypeSingle) {
-        [output writeBool:fieldNumber
-                    value:GPBGetMessageBoolField(self, field)];
-      } else {  // fieldType == GPBFieldTypeMap
-        // Exact type here doesn't matter.
-        GPBInt32BoolDictionary *dict =
-            GPBGetObjectIvarWithFieldNoAutocreate(self, field);
-        [dict writeToCodedOutputStream:output asField:field];
-      }
-      break;
-
-// clang-format on
-//%PDDM-EXPAND FIELD_CASE(Fixed32, UInt32)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-    case GPBDataTypeFixed32:
-      if (fieldType == GPBFieldTypeRepeated) {
-        uint32_t tag = field.isPackable ? GPBFieldTag(field) : 0;
-        GPBUInt32Array *array =
-            GPBGetObjectIvarWithFieldNoAutocreate(self, field);
-        [output writeFixed32Array:fieldNumber values:array tag:tag];
-      } else if (fieldType == GPBFieldTypeSingle) {
-        [output writeFixed32:fieldNumber
-                       value:GPBGetMessageUInt32Field(self, field)];
-      } else {  // fieldType == GPBFieldTypeMap
-        // Exact type here doesn't matter.
-        GPBInt32UInt32Dictionary *dict =
-            GPBGetObjectIvarWithFieldNoAutocreate(self, field);
-        [dict writeToCodedOutputStream:output asField:field];
-      }
-      break;
-
-// clang-format on
-//%PDDM-EXPAND FIELD_CASE(SFixed32, Int32)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-    case GPBDataTypeSFixed32:
-      if (fieldType == GPBFieldTypeRepeated) {
-        uint32_t tag = field.isPackable ? GPBFieldTag(field) : 0;
-        GPBInt32Array *array =
-            GPBGetObjectIvarWithFieldNoAutocreate(self, field);
-        [output writeSFixed32Array:fieldNumber values:array tag:tag];
-      } else if (fieldType == GPBFieldTypeSingle) {
-        [output writeSFixed32:fieldNumber
-                        value:GPBGetMessageInt32Field(self, field)];
-      } else {  // fieldType == GPBFieldTypeMap
-        // Exact type here doesn't matter.
-        GPBInt32Int32Dictionary *dict =
-            GPBGetObjectIvarWithFieldNoAutocreate(self, field);
-        [dict writeToCodedOutputStream:output asField:field];
-      }
-      break;
-
-// clang-format on
-//%PDDM-EXPAND FIELD_CASE(Float, Float)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-    case GPBDataTypeFloat:
-      if (fieldType == GPBFieldTypeRepeated) {
-        uint32_t tag = field.isPackable ? GPBFieldTag(field) : 0;
-        GPBFloatArray *array =
-            GPBGetObjectIvarWithFieldNoAutocreate(self, field);
-        [output writeFloatArray:fieldNumber values:array tag:tag];
-      } else if (fieldType == GPBFieldTypeSingle) {
-        [output writeFloat:fieldNumber
-                     value:GPBGetMessageFloatField(self, field)];
-      } else {  // fieldType == GPBFieldTypeMap
-        // Exact type here doesn't matter.
-        GPBInt32FloatDictionary *dict =
-            GPBGetObjectIvarWithFieldNoAutocreate(self, field);
-        [dict writeToCodedOutputStream:output asField:field];
-      }
-      break;
-
-// clang-format on
-//%PDDM-EXPAND FIELD_CASE(Fixed64, UInt64)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-    case GPBDataTypeFixed64:
-      if (fieldType == GPBFieldTypeRepeated) {
-        uint32_t tag = field.isPackable ? GPBFieldTag(field) : 0;
-        GPBUInt64Array *array =
-            GPBGetObjectIvarWithFieldNoAutocreate(self, field);
-        [output writeFixed64Array:fieldNumber values:array tag:tag];
-      } else if (fieldType == GPBFieldTypeSingle) {
-        [output writeFixed64:fieldNumber
-                       value:GPBGetMessageUInt64Field(self, field)];
-      } else {  // fieldType == GPBFieldTypeMap
-        // Exact type here doesn't matter.
-        GPBInt32UInt64Dictionary *dict =
-            GPBGetObjectIvarWithFieldNoAutocreate(self, field);
-        [dict writeToCodedOutputStream:output asField:field];
-      }
-      break;
-
-// clang-format on
-//%PDDM-EXPAND FIELD_CASE(SFixed64, Int64)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-    case GPBDataTypeSFixed64:
-      if (fieldType == GPBFieldTypeRepeated) {
-        uint32_t tag = field.isPackable ? GPBFieldTag(field) : 0;
-        GPBInt64Array *array =
-            GPBGetObjectIvarWithFieldNoAutocreate(self, field);
-        [output writeSFixed64Array:fieldNumber values:array tag:tag];
-      } else if (fieldType == GPBFieldTypeSingle) {
-        [output writeSFixed64:fieldNumber
-                        value:GPBGetMessageInt64Field(self, field)];
-      } else {  // fieldType == GPBFieldTypeMap
-        // Exact type here doesn't matter.
-        GPBInt32Int64Dictionary *dict =
-            GPBGetObjectIvarWithFieldNoAutocreate(self, field);
-        [dict writeToCodedOutputStream:output asField:field];
-      }
-      break;
-
-// clang-format on
-//%PDDM-EXPAND FIELD_CASE(Double, Double)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-    case GPBDataTypeDouble:
-      if (fieldType == GPBFieldTypeRepeated) {
-        uint32_t tag = field.isPackable ? GPBFieldTag(field) : 0;
-        GPBDoubleArray *array =
-            GPBGetObjectIvarWithFieldNoAutocreate(self, field);
-        [output writeDoubleArray:fieldNumber values:array tag:tag];
-      } else if (fieldType == GPBFieldTypeSingle) {
-        [output writeDouble:fieldNumber
-                      value:GPBGetMessageDoubleField(self, field)];
-      } else {  // fieldType == GPBFieldTypeMap
-        // Exact type here doesn't matter.
-        GPBInt32DoubleDictionary *dict =
-            GPBGetObjectIvarWithFieldNoAutocreate(self, field);
-        [dict writeToCodedOutputStream:output asField:field];
-      }
-      break;
-
-// clang-format on
-//%PDDM-EXPAND FIELD_CASE(Int32, Int32)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-    case GPBDataTypeInt32:
-      if (fieldType == GPBFieldTypeRepeated) {
-        uint32_t tag = field.isPackable ? GPBFieldTag(field) : 0;
-        GPBInt32Array *array =
-            GPBGetObjectIvarWithFieldNoAutocreate(self, field);
-        [output writeInt32Array:fieldNumber values:array tag:tag];
-      } else if (fieldType == GPBFieldTypeSingle) {
-        [output writeInt32:fieldNumber
-                     value:GPBGetMessageInt32Field(self, field)];
-      } else {  // fieldType == GPBFieldTypeMap
-        // Exact type here doesn't matter.
-        GPBInt32Int32Dictionary *dict =
-            GPBGetObjectIvarWithFieldNoAutocreate(self, field);
-        [dict writeToCodedOutputStream:output asField:field];
-      }
-      break;
-
-// clang-format on
-//%PDDM-EXPAND FIELD_CASE(Int64, Int64)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-    case GPBDataTypeInt64:
-      if (fieldType == GPBFieldTypeRepeated) {
-        uint32_t tag = field.isPackable ? GPBFieldTag(field) : 0;
-        GPBInt64Array *array =
-            GPBGetObjectIvarWithFieldNoAutocreate(self, field);
-        [output writeInt64Array:fieldNumber values:array tag:tag];
-      } else if (fieldType == GPBFieldTypeSingle) {
-        [output writeInt64:fieldNumber
-                     value:GPBGetMessageInt64Field(self, field)];
-      } else {  // fieldType == GPBFieldTypeMap
-        // Exact type here doesn't matter.
-        GPBInt32Int64Dictionary *dict =
-            GPBGetObjectIvarWithFieldNoAutocreate(self, field);
-        [dict writeToCodedOutputStream:output asField:field];
-      }
-      break;
-
-// clang-format on
-//%PDDM-EXPAND FIELD_CASE(SInt32, Int32)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-    case GPBDataTypeSInt32:
-      if (fieldType == GPBFieldTypeRepeated) {
-        uint32_t tag = field.isPackable ? GPBFieldTag(field) : 0;
-        GPBInt32Array *array =
-            GPBGetObjectIvarWithFieldNoAutocreate(self, field);
-        [output writeSInt32Array:fieldNumber values:array tag:tag];
-      } else if (fieldType == GPBFieldTypeSingle) {
-        [output writeSInt32:fieldNumber
-                      value:GPBGetMessageInt32Field(self, field)];
-      } else {  // fieldType == GPBFieldTypeMap
-        // Exact type here doesn't matter.
-        GPBInt32Int32Dictionary *dict =
-            GPBGetObjectIvarWithFieldNoAutocreate(self, field);
-        [dict writeToCodedOutputStream:output asField:field];
-      }
-      break;
-
-// clang-format on
-//%PDDM-EXPAND FIELD_CASE(SInt64, Int64)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-    case GPBDataTypeSInt64:
-      if (fieldType == GPBFieldTypeRepeated) {
-        uint32_t tag = field.isPackable ? GPBFieldTag(field) : 0;
-        GPBInt64Array *array =
-            GPBGetObjectIvarWithFieldNoAutocreate(self, field);
-        [output writeSInt64Array:fieldNumber values:array tag:tag];
-      } else if (fieldType == GPBFieldTypeSingle) {
-        [output writeSInt64:fieldNumber
-                      value:GPBGetMessageInt64Field(self, field)];
-      } else {  // fieldType == GPBFieldTypeMap
-        // Exact type here doesn't matter.
-        GPBInt32Int64Dictionary *dict =
-            GPBGetObjectIvarWithFieldNoAutocreate(self, field);
-        [dict writeToCodedOutputStream:output asField:field];
-      }
-      break;
-
-// clang-format on
-//%PDDM-EXPAND FIELD_CASE(UInt32, UInt32)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-    case GPBDataTypeUInt32:
-      if (fieldType == GPBFieldTypeRepeated) {
-        uint32_t tag = field.isPackable ? GPBFieldTag(field) : 0;
-        GPBUInt32Array *array =
-            GPBGetObjectIvarWithFieldNoAutocreate(self, field);
-        [output writeUInt32Array:fieldNumber values:array tag:tag];
-      } else if (fieldType == GPBFieldTypeSingle) {
-        [output writeUInt32:fieldNumber
-                      value:GPBGetMessageUInt32Field(self, field)];
-      } else {  // fieldType == GPBFieldTypeMap
-        // Exact type here doesn't matter.
-        GPBInt32UInt32Dictionary *dict =
-            GPBGetObjectIvarWithFieldNoAutocreate(self, field);
-        [dict writeToCodedOutputStream:output asField:field];
-      }
-      break;
-
-// clang-format on
-//%PDDM-EXPAND FIELD_CASE(UInt64, UInt64)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-    case GPBDataTypeUInt64:
-      if (fieldType == GPBFieldTypeRepeated) {
-        uint32_t tag = field.isPackable ? GPBFieldTag(field) : 0;
-        GPBUInt64Array *array =
-            GPBGetObjectIvarWithFieldNoAutocreate(self, field);
-        [output writeUInt64Array:fieldNumber values:array tag:tag];
-      } else if (fieldType == GPBFieldTypeSingle) {
-        [output writeUInt64:fieldNumber
-                      value:GPBGetMessageUInt64Field(self, field)];
-      } else {  // fieldType == GPBFieldTypeMap
-        // Exact type here doesn't matter.
-        GPBInt32UInt64Dictionary *dict =
-            GPBGetObjectIvarWithFieldNoAutocreate(self, field);
-        [dict writeToCodedOutputStream:output asField:field];
-      }
-      break;
-
-// clang-format on
-//%PDDM-EXPAND FIELD_CASE_FULL(Enum, Int32, Enum)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-    case GPBDataTypeEnum:
-      if (fieldType == GPBFieldTypeRepeated) {
-        uint32_t tag = field.isPackable ? GPBFieldTag(field) : 0;
-        GPBEnumArray *array =
-            GPBGetObjectIvarWithFieldNoAutocreate(self, field);
-        [output writeEnumArray:fieldNumber values:array tag:tag];
-      } else if (fieldType == GPBFieldTypeSingle) {
-        [output writeEnum:fieldNumber
-                    value:GPBGetMessageInt32Field(self, field)];
-      } else {  // fieldType == GPBFieldTypeMap
-        // Exact type here doesn't matter.
-        GPBInt32EnumDictionary *dict =
-            GPBGetObjectIvarWithFieldNoAutocreate(self, field);
-        [dict writeToCodedOutputStream:output asField:field];
-      }
-      break;
-
-// clang-format on
-//%PDDM-EXPAND FIELD_CASE2(Bytes)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-    case GPBDataTypeBytes:
-      if (fieldType == GPBFieldTypeRepeated) {
-        NSArray *array = GPBGetObjectIvarWithFieldNoAutocreate(self, field);
-        [output writeBytesArray:fieldNumber values:array];
-      } else if (fieldType == GPBFieldTypeSingle) {
-        // GPBGetObjectIvarWithFieldNoAutocreate() avoids doing the has check
-        // again.
-        [output writeBytes:fieldNumber
-                     value:GPBGetObjectIvarWithFieldNoAutocreate(self, field)];
-      } else {  // fieldType == GPBFieldTypeMap
-        // Exact type here doesn't matter.
-        id dict = GPBGetObjectIvarWithFieldNoAutocreate(self, field);
-        GPBDataType mapKeyDataType = field.mapKeyDataType;
-        if (mapKeyDataType == GPBDataTypeString) {
-          GPBDictionaryWriteToStreamInternalHelper(output, dict, field);
-        } else {
-          [dict writeToCodedOutputStream:output asField:field];
-        }
-      }
-      break;
-
-// clang-format on
-//%PDDM-EXPAND FIELD_CASE2(String)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-    case GPBDataTypeString:
-      if (fieldType == GPBFieldTypeRepeated) {
-        NSArray *array = GPBGetObjectIvarWithFieldNoAutocreate(self, field);
-        [output writeStringArray:fieldNumber values:array];
-      } else if (fieldType == GPBFieldTypeSingle) {
-        // GPBGetObjectIvarWithFieldNoAutocreate() avoids doing the has check
-        // again.
-        [output writeString:fieldNumber
-                      value:GPBGetObjectIvarWithFieldNoAutocreate(self, field)];
-      } else {  // fieldType == GPBFieldTypeMap
-        // Exact type here doesn't matter.
-        id dict = GPBGetObjectIvarWithFieldNoAutocreate(self, field);
-        GPBDataType mapKeyDataType = field.mapKeyDataType;
-        if (mapKeyDataType == GPBDataTypeString) {
-          GPBDictionaryWriteToStreamInternalHelper(output, dict, field);
-        } else {
-          [dict writeToCodedOutputStream:output asField:field];
-        }
-      }
-      break;
-
-// clang-format on
-//%PDDM-EXPAND FIELD_CASE2(Message)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-    case GPBDataTypeMessage:
-      if (fieldType == GPBFieldTypeRepeated) {
-        NSArray *array = GPBGetObjectIvarWithFieldNoAutocreate(self, field);
-        [output writeMessageArray:fieldNumber values:array];
-      } else if (fieldType == GPBFieldTypeSingle) {
-        // GPBGetObjectIvarWithFieldNoAutocreate() avoids doing the has check
-        // again.
-        [output writeMessage:fieldNumber
-                       value:GPBGetObjectIvarWithFieldNoAutocreate(self, field)];
-      } else {  // fieldType == GPBFieldTypeMap
-        // Exact type here doesn't matter.
-        id dict = GPBGetObjectIvarWithFieldNoAutocreate(self, field);
-        GPBDataType mapKeyDataType = field.mapKeyDataType;
-        if (mapKeyDataType == GPBDataTypeString) {
-          GPBDictionaryWriteToStreamInternalHelper(output, dict, field);
-        } else {
-          [dict writeToCodedOutputStream:output asField:field];
-        }
-      }
-      break;
-
-// clang-format on
-//%PDDM-EXPAND FIELD_CASE2(Group)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-    case GPBDataTypeGroup:
-      if (fieldType == GPBFieldTypeRepeated) {
-        NSArray *array = GPBGetObjectIvarWithFieldNoAutocreate(self, field);
-        [output writeGroupArray:fieldNumber values:array];
-      } else if (fieldType == GPBFieldTypeSingle) {
-        // GPBGetObjectIvarWithFieldNoAutocreate() avoids doing the has check
-        // again.
-        [output writeGroup:fieldNumber
-                     value:GPBGetObjectIvarWithFieldNoAutocreate(self, field)];
-      } else {  // fieldType == GPBFieldTypeMap
-        // Exact type here doesn't matter.
-        id dict = GPBGetObjectIvarWithFieldNoAutocreate(self, field);
-        GPBDataType mapKeyDataType = field.mapKeyDataType;
-        if (mapKeyDataType == GPBDataTypeString) {
-          GPBDictionaryWriteToStreamInternalHelper(output, dict, field);
-        } else {
-          [dict writeToCodedOutputStream:output asField:field];
-        }
-      }
-      break;
-
-// clang-format on
-//%PDDM-EXPAND-END (18 expansions)
-  }
-}
-
-#pragma mark - Extensions
-
-- (id)getExtension:(GPBExtensionDescriptor *)extension {
-  CheckExtension(self, extension);
-  id value = [extensionMap_ objectForKey:extension];
-  if (value != nil) {
-    return value;
-  }
-
-  // No default for repeated.
-  if (extension.isRepeated) {
-    return nil;
-  }
-  // Non messages get their default.
-  if (!GPBExtensionIsMessage(extension)) {
-    return extension.defaultValue;
-  }
-
-  // Check for an autocreated value.
-  GPBPrepareReadOnlySemaphore(self);
-  dispatch_semaphore_wait(readOnlySemaphore_, DISPATCH_TIME_FOREVER);
-  value = [autocreatedExtensionMap_ objectForKey:extension];
-  if (!value) {
-    // Auto create the message extensions to match normal fields.
-    value = CreateMessageWithAutocreatorForExtension(extension.msgClass, self,
-                                                     extension);
-
-    if (autocreatedExtensionMap_ == nil) {
-      autocreatedExtensionMap_ = [[NSMutableDictionary alloc] init];
-    }
-
-    // We can't simply call setExtension here because that would clear the new
-    // value's autocreator.
-    [autocreatedExtensionMap_ setObject:value forKey:extension];
-    [value release];
-  }
-
-  dispatch_semaphore_signal(readOnlySemaphore_);
-  return value;
-}
-
-- (id)getExistingExtension:(GPBExtensionDescriptor *)extension {
-  // This is an internal method so we don't need to call CheckExtension().
-  return [extensionMap_ objectForKey:extension];
-}
-
-- (BOOL)hasExtension:(GPBExtensionDescriptor *)extension {
-#if defined(DEBUG) && DEBUG
-  CheckExtension(self, extension);
-#endif  // DEBUG
-  return nil != [extensionMap_ objectForKey:extension];
-}
-
-- (NSArray *)extensionsCurrentlySet {
-  return [extensionMap_ allKeys];
-}
-
-- (void)writeExtensionsToCodedOutputStream:(GPBCodedOutputStream *)output
-                                     range:(GPBExtensionRange)range
-                          sortedExtensions:(NSArray *)sortedExtensions {
-  uint32_t start = range.start;
-  uint32_t end = range.end;
-  for (GPBExtensionDescriptor *extension in sortedExtensions) {
-    uint32_t fieldNumber = extension.fieldNumber;
-    if (fieldNumber < start) {
-      continue;
-    }
-    if (fieldNumber >= end) {
-      break;
-    }
-    id value = [extensionMap_ objectForKey:extension];
-    GPBWriteExtensionValueToOutputStream(extension, value, output);
-  }
-}
-
-- (void)setExtension:(GPBExtensionDescriptor *)extension value:(id)value {
-  if (!value) {
-    [self clearExtension:extension];
-    return;
-  }
-
-  CheckExtension(self, extension);
-
-  if (extension.repeated) {
-    [NSException raise:NSInvalidArgumentException
-                format:@"Must call addExtension() for repeated types."];
-  }
-
-  if (extensionMap_ == nil) {
-    extensionMap_ = [[NSMutableDictionary alloc] init];
-  }
-
-  // This pointless cast is for CLANG_WARN_NULLABLE_TO_NONNULL_CONVERSION.
-  // Without it, the compiler complains we're passing an id nullable when
-  // setObject:forKey: requires a id nonnull for the value. The check for
-  // !value at the start of the method ensures it isn't nil, but the check
-  // isn't smart enough to realize that.
-  [extensionMap_ setObject:(id)value forKey:extension];
-
-  GPBExtensionDescriptor *descriptor = extension;
-
-  if (GPBExtensionIsMessage(descriptor) && !descriptor.isRepeated) {
-    GPBMessage *autocreatedValue =
-        [[autocreatedExtensionMap_ objectForKey:extension] retain];
-    // Must remove from the map before calling GPBClearMessageAutocreator() so
-    // that GPBClearMessageAutocreator() knows its safe to clear.
-    [autocreatedExtensionMap_ removeObjectForKey:extension];
-    GPBClearMessageAutocreator(autocreatedValue);
-    [autocreatedValue release];
-  }
-
-  GPBBecomeVisibleToAutocreator(self);
-}
-
-- (void)addExtension:(GPBExtensionDescriptor *)extension value:(id)value {
-  CheckExtension(self, extension);
-
-  if (!extension.repeated) {
-    [NSException raise:NSInvalidArgumentException
-                format:@"Must call setExtension() for singular types."];
-  }
-
-  if (extensionMap_ == nil) {
-    extensionMap_ = [[NSMutableDictionary alloc] init];
-  }
-  NSMutableArray *list = [extensionMap_ objectForKey:extension];
-  if (list == nil) {
-    list = [NSMutableArray array];
-    [extensionMap_ setObject:list forKey:extension];
-  }
-
-  [list addObject:value];
-  GPBBecomeVisibleToAutocreator(self);
-}
-
-- (void)setExtension:(GPBExtensionDescriptor *)extension
-               index:(NSUInteger)idx
-               value:(id)value {
-  CheckExtension(self, extension);
-
-  if (!extension.repeated) {
-    [NSException raise:NSInvalidArgumentException
-                format:@"Must call setExtension() for singular types."];
-  }
-
-  if (extensionMap_ == nil) {
-    extensionMap_ = [[NSMutableDictionary alloc] init];
-  }
-
-  NSMutableArray *list = [extensionMap_ objectForKey:extension];
-
-  [list replaceObjectAtIndex:idx withObject:value];
-  GPBBecomeVisibleToAutocreator(self);
-}
-
-- (void)clearExtension:(GPBExtensionDescriptor *)extension {
-  CheckExtension(self, extension);
-
-  // Only become visible if there was actually a value to clear.
-  if ([extensionMap_ objectForKey:extension]) {
-    [extensionMap_ removeObjectForKey:extension];
-    GPBBecomeVisibleToAutocreator(self);
-  }
-}
-
-#pragma mark - mergeFrom
-
-- (void)mergeFromData:(NSData *)data
-    extensionRegistry:(GPBExtensionRegistry *)extensionRegistry {
-  GPBCodedInputStream *input = [[GPBCodedInputStream alloc] initWithData:data];
-  [self mergeFromCodedInputStream:input extensionRegistry:extensionRegistry];
-  [input checkLastTagWas:0];
-  [input release];
-}
-
-#pragma mark - mergeDelimitedFrom
-
-- (void)mergeDelimitedFromCodedInputStream:(GPBCodedInputStream *)input
-                         extensionRegistry:(GPBExtensionRegistry *)extensionRegistry {
-  GPBCodedInputStreamState *state = &input->state_;
-  if (GPBCodedInputStreamIsAtEnd(state)) {
-    return;
-  }
-  NSData *data = GPBCodedInputStreamReadRetainedBytesNoCopy(state);
-  if (data == nil) {
-    return;
-  }
-  [self mergeFromData:data extensionRegistry:extensionRegistry];
-  [data release];
-}
-
-#pragma mark - Parse From Data Support
-
-+ (instancetype)parseFromData:(NSData *)data error:(NSError **)errorPtr {
-  return [self parseFromData:data extensionRegistry:nil error:errorPtr];
-}
-
-+ (instancetype)parseFromData:(NSData *)data
-            extensionRegistry:(GPBExtensionRegistry *)extensionRegistry
-                        error:(NSError **)errorPtr {
-  return [[[self alloc] initWithData:data
-                   extensionRegistry:extensionRegistry
-                               error:errorPtr] autorelease];
-}
-
-+ (instancetype)parseFromCodedInputStream:(GPBCodedInputStream *)input
-                        extensionRegistry:(GPBExtensionRegistry *)extensionRegistry
-                                    error:(NSError **)errorPtr {
-  return
-      [[[self alloc] initWithCodedInputStream:input
-                            extensionRegistry:extensionRegistry
-                                        error:errorPtr] autorelease];
-}
-
-#pragma mark - Parse Delimited From Data Support
-
-+ (instancetype)parseDelimitedFromCodedInputStream:(GPBCodedInputStream *)input
-                                 extensionRegistry:
-                                     (GPBExtensionRegistry *)extensionRegistry
-                                             error:(NSError **)errorPtr {
-  GPBMessage *message = [[[self alloc] init] autorelease];
-  @try {
-    [message mergeDelimitedFromCodedInputStream:input
-                              extensionRegistry:extensionRegistry];
-    if (errorPtr) {
-      *errorPtr = nil;
-    }
-  }
-  @catch (NSException *exception) {
-    message = nil;
-    if (errorPtr) {
-      *errorPtr = ErrorFromException(exception);
-    }
-  }
-#ifdef DEBUG
-  if (message && !message.initialized) {
-    message = nil;
-    if (errorPtr) {
-      *errorPtr = MessageError(GPBMessageErrorCodeMissingRequiredField, nil);
-    }
-  }
-#endif
-  return message;
-}
-
-#pragma mark - Unknown Field Support
-
-- (GPBUnknownFieldSet *)unknownFields {
-  return unknownFields_;
-}
-
-- (void)setUnknownFields:(GPBUnknownFieldSet *)unknownFields {
-  if (unknownFields != unknownFields_) {
-    [unknownFields_ release];
-    unknownFields_ = [unknownFields copy];
-    GPBBecomeVisibleToAutocreator(self);
-  }
-}
-
-- (void)parseMessageSet:(GPBCodedInputStream *)input
-      extensionRegistry:(GPBExtensionRegistry *)extensionRegistry {
-  uint32_t typeId = 0;
-  NSData *rawBytes = nil;
-  GPBExtensionDescriptor *extension = nil;
-  GPBCodedInputStreamState *state = &input->state_;
-  while (true) {
-    uint32_t tag = GPBCodedInputStreamReadTag(state);
-    if (tag == 0) {
-      break;
-    }
-
-    if (tag == GPBWireFormatMessageSetTypeIdTag) {
-      typeId = GPBCodedInputStreamReadUInt32(state);
-      if (typeId != 0) {
-        extension = [extensionRegistry extensionForDescriptor:[self descriptor]
-                                                  fieldNumber:typeId];
-      }
-    } else if (tag == GPBWireFormatMessageSetMessageTag) {
-      rawBytes =
-          [GPBCodedInputStreamReadRetainedBytesNoCopy(state) autorelease];
-    } else {
-      if (![input skipField:tag]) {
-        break;
-      }
-    }
-  }
-
-  [input checkLastTagWas:GPBWireFormatMessageSetItemEndTag];
-
-  if (rawBytes != nil && typeId != 0) {
-    if (extension != nil) {
-      GPBCodedInputStream *newInput =
-          [[GPBCodedInputStream alloc] initWithData:rawBytes];
-      GPBExtensionMergeFromInputStream(extension,
-                                       extension.packable,
-                                       newInput,
-                                       extensionRegistry,
-                                       self);
-      [newInput release];
-    } else {
-      GPBUnknownFieldSet *unknownFields = GetOrMakeUnknownFields(self);
-      // rawBytes was created via a NoCopy, so it can be reusing a
-      // subrange of another NSData that might go out of scope as things
-      // unwind, so a copy is needed to ensure what is saved in the
-      // unknown fields stays valid.
-      NSData *cloned = [NSData dataWithData:rawBytes];
-      [unknownFields mergeMessageSetMessage:typeId data:cloned];
-    }
-  }
-}
-
-- (BOOL)parseUnknownField:(GPBCodedInputStream *)input
-        extensionRegistry:(GPBExtensionRegistry *)extensionRegistry
-                      tag:(uint32_t)tag {
-  GPBWireFormat wireType = GPBWireFormatGetTagWireType(tag);
-  int32_t fieldNumber = GPBWireFormatGetTagFieldNumber(tag);
-
-  GPBDescriptor *descriptor = [self descriptor];
-  GPBExtensionDescriptor *extension =
-      [extensionRegistry extensionForDescriptor:descriptor
-                                    fieldNumber:fieldNumber];
-  if (extension == nil) {
-    if (descriptor.wireFormat && GPBWireFormatMessageSetItemTag == tag) {
-      [self parseMessageSet:input extensionRegistry:extensionRegistry];
-      return YES;
-    }
-  } else {
-    if (extension.wireType == wireType) {
-      GPBExtensionMergeFromInputStream(extension,
-                                       extension.packable,
-                                       input,
-                                       extensionRegistry,
-                                       self);
-      return YES;
-    }
-    // Primitive, repeated types can be packed on unpacked on the wire, and are
-    // parsed either way.
-    if ([extension isRepeated] &&
-        !GPBDataTypeIsObject(extension->description_->dataType) &&
-        (extension.alternateWireType == wireType)) {
-      GPBExtensionMergeFromInputStream(extension,
-                                       !extension.packable,
-                                       input,
-                                       extensionRegistry,
-                                       self);
-      return YES;
-    }
-  }
-  if ([GPBUnknownFieldSet isFieldTag:tag]) {
-    GPBUnknownFieldSet *unknownFields = GetOrMakeUnknownFields(self);
-    return [unknownFields mergeFieldFrom:tag input:input];
-  } else {
-    return NO;
-  }
-}
-
-- (void)addUnknownMapEntry:(int32_t)fieldNum value:(NSData *)data {
-  GPBUnknownFieldSet *unknownFields = GetOrMakeUnknownFields(self);
-  [unknownFields addUnknownMapEntry:fieldNum value:data];
-}
-
-#pragma mark - MergeFromCodedInputStream Support
-
-static void MergeSingleFieldFromCodedInputStream(
-    GPBMessage *self, GPBFieldDescriptor *field, GPBFileSyntax syntax,
-    GPBCodedInputStream *input, GPBExtensionRegistry *extensionRegistry) {
-  GPBDataType fieldDataType = GPBGetFieldDataType(field);
-  switch (fieldDataType) {
-#define CASE_SINGLE_POD(NAME, TYPE, FUNC_TYPE)                             \
-    case GPBDataType##NAME: {                                              \
-      TYPE val = GPBCodedInputStreamRead##NAME(&input->state_);            \
-      GPBSet##FUNC_TYPE##IvarWithFieldPrivate(self, field, val);           \
-      break;                                                               \
-            }
-#define CASE_SINGLE_OBJECT(NAME)                                           \
-    case GPBDataType##NAME: {                                              \
-      id val = GPBCodedInputStreamReadRetained##NAME(&input->state_);      \
-      GPBSetRetainedObjectIvarWithFieldPrivate(self, field, val);          \
-      break;                                                               \
-    }
-      CASE_SINGLE_POD(Bool, BOOL, Bool)
-      CASE_SINGLE_POD(Fixed32, uint32_t, UInt32)
-      CASE_SINGLE_POD(SFixed32, int32_t, Int32)
-      CASE_SINGLE_POD(Float, float, Float)
-      CASE_SINGLE_POD(Fixed64, uint64_t, UInt64)
-      CASE_SINGLE_POD(SFixed64, int64_t, Int64)
-      CASE_SINGLE_POD(Double, double, Double)
-      CASE_SINGLE_POD(Int32, int32_t, Int32)
-      CASE_SINGLE_POD(Int64, int64_t, Int64)
-      CASE_SINGLE_POD(SInt32, int32_t, Int32)
-      CASE_SINGLE_POD(SInt64, int64_t, Int64)
-      CASE_SINGLE_POD(UInt32, uint32_t, UInt32)
-      CASE_SINGLE_POD(UInt64, uint64_t, UInt64)
-      CASE_SINGLE_OBJECT(Bytes)
-      CASE_SINGLE_OBJECT(String)
-#undef CASE_SINGLE_POD
-#undef CASE_SINGLE_OBJECT
-
-    case GPBDataTypeMessage: {
-      if (GPBGetHasIvarField(self, field)) {
-        // GPBGetObjectIvarWithFieldNoAutocreate() avoids doing the has
-        // check again.
-        GPBMessage *message =
-            GPBGetObjectIvarWithFieldNoAutocreate(self, field);
-        [input readMessage:message extensionRegistry:extensionRegistry];
-      } else {
-        GPBMessage *message = [[field.msgClass alloc] init];
-        [input readMessage:message extensionRegistry:extensionRegistry];
-        GPBSetRetainedObjectIvarWithFieldPrivate(self, field, message);
-      }
-      break;
-    }
-
-    case GPBDataTypeGroup: {
-      if (GPBGetHasIvarField(self, field)) {
-        // GPBGetObjectIvarWithFieldNoAutocreate() avoids doing the has
-        // check again.
-        GPBMessage *message =
-            GPBGetObjectIvarWithFieldNoAutocreate(self, field);
-        [input readGroup:GPBFieldNumber(field)
-                      message:message
-            extensionRegistry:extensionRegistry];
-      } else {
-        GPBMessage *message = [[field.msgClass alloc] init];
-        [input readGroup:GPBFieldNumber(field)
-                      message:message
-            extensionRegistry:extensionRegistry];
-        GPBSetRetainedObjectIvarWithFieldPrivate(self, field, message);
-      }
-      break;
-    }
-
-    case GPBDataTypeEnum: {
-      int32_t val = GPBCodedInputStreamReadEnum(&input->state_);
-      if (GPBHasPreservingUnknownEnumSemantics(syntax) ||
-          [field isValidEnumValue:val]) {
-        GPBSetInt32IvarWithFieldPrivate(self, field, val);
-      } else {
-        GPBUnknownFieldSet *unknownFields = GetOrMakeUnknownFields(self);
-        [unknownFields mergeVarintField:GPBFieldNumber(field) value:val];
-      }
-    }
-  }  // switch
-}
-
-static void MergeRepeatedPackedFieldFromCodedInputStream(
-    GPBMessage *self, GPBFieldDescriptor *field, GPBFileSyntax syntax,
-    GPBCodedInputStream *input) {
-  GPBDataType fieldDataType = GPBGetFieldDataType(field);
-  GPBCodedInputStreamState *state = &input->state_;
-  id genericArray = GetOrCreateArrayIvarWithField(self, field);
-  int32_t length = GPBCodedInputStreamReadInt32(state);
-  size_t limit = GPBCodedInputStreamPushLimit(state, length);
-  while (GPBCodedInputStreamBytesUntilLimit(state) > 0) {
-    switch (fieldDataType) {
-#define CASE_REPEATED_PACKED_POD(NAME, TYPE, ARRAY_TYPE)      \
-     case GPBDataType##NAME: {                                \
-       TYPE val = GPBCodedInputStreamRead##NAME(state);       \
-       [(GPB##ARRAY_TYPE##Array *)genericArray addValue:val]; \
-       break;                                                 \
-     }
-        CASE_REPEATED_PACKED_POD(Bool, BOOL, Bool)
-        CASE_REPEATED_PACKED_POD(Fixed32, uint32_t, UInt32)
-        CASE_REPEATED_PACKED_POD(SFixed32, int32_t, Int32)
-        CASE_REPEATED_PACKED_POD(Float, float, Float)
-        CASE_REPEATED_PACKED_POD(Fixed64, uint64_t, UInt64)
-        CASE_REPEATED_PACKED_POD(SFixed64, int64_t, Int64)
-        CASE_REPEATED_PACKED_POD(Double, double, Double)
-        CASE_REPEATED_PACKED_POD(Int32, int32_t, Int32)
-        CASE_REPEATED_PACKED_POD(Int64, int64_t, Int64)
-        CASE_REPEATED_PACKED_POD(SInt32, int32_t, Int32)
-        CASE_REPEATED_PACKED_POD(SInt64, int64_t, Int64)
-        CASE_REPEATED_PACKED_POD(UInt32, uint32_t, UInt32)
-        CASE_REPEATED_PACKED_POD(UInt64, uint64_t, UInt64)
-#undef CASE_REPEATED_PACKED_POD
-
-      case GPBDataTypeBytes:
-      case GPBDataTypeString:
-      case GPBDataTypeMessage:
-      case GPBDataTypeGroup:
-        NSCAssert(NO, @"Non primitive types can't be packed");
-        break;
-
-      case GPBDataTypeEnum: {
-        int32_t val = GPBCodedInputStreamReadEnum(state);
-        if (GPBHasPreservingUnknownEnumSemantics(syntax) ||
-            [field isValidEnumValue:val]) {
-          [(GPBEnumArray*)genericArray addRawValue:val];
-        } else {
-          GPBUnknownFieldSet *unknownFields = GetOrMakeUnknownFields(self);
-          [unknownFields mergeVarintField:GPBFieldNumber(field) value:val];
-        }
-        break;
-      }
-    }  // switch
-  }  // while(BytesUntilLimit() > 0)
-  GPBCodedInputStreamPopLimit(state, limit);
-}
-
-static void MergeRepeatedNotPackedFieldFromCodedInputStream(
-    GPBMessage *self, GPBFieldDescriptor *field, GPBFileSyntax syntax,
-    GPBCodedInputStream *input, GPBExtensionRegistry *extensionRegistry) {
-  GPBCodedInputStreamState *state = &input->state_;
-  id genericArray = GetOrCreateArrayIvarWithField(self, field);
-  switch (GPBGetFieldDataType(field)) {
-#define CASE_REPEATED_NOT_PACKED_POD(NAME, TYPE, ARRAY_TYPE) \
-   case GPBDataType##NAME: {                                 \
-     TYPE val = GPBCodedInputStreamRead##NAME(state);        \
-     [(GPB##ARRAY_TYPE##Array *)genericArray addValue:val];  \
-     break;                                                  \
-   }
-#define CASE_REPEATED_NOT_PACKED_OBJECT(NAME)                \
-   case GPBDataType##NAME: {                                 \
-     id val = GPBCodedInputStreamReadRetained##NAME(state);  \
-     [(NSMutableArray*)genericArray addObject:val];          \
-     [val release];                                          \
-     break;                                                  \
-   }
-      CASE_REPEATED_NOT_PACKED_POD(Bool, BOOL, Bool)
-      CASE_REPEATED_NOT_PACKED_POD(Fixed32, uint32_t, UInt32)
-      CASE_REPEATED_NOT_PACKED_POD(SFixed32, int32_t, Int32)
-      CASE_REPEATED_NOT_PACKED_POD(Float, float, Float)
-      CASE_REPEATED_NOT_PACKED_POD(Fixed64, uint64_t, UInt64)
-      CASE_REPEATED_NOT_PACKED_POD(SFixed64, int64_t, Int64)
-      CASE_REPEATED_NOT_PACKED_POD(Double, double, Double)
-      CASE_REPEATED_NOT_PACKED_POD(Int32, int32_t, Int32)
-      CASE_REPEATED_NOT_PACKED_POD(Int64, int64_t, Int64)
-      CASE_REPEATED_NOT_PACKED_POD(SInt32, int32_t, Int32)
-      CASE_REPEATED_NOT_PACKED_POD(SInt64, int64_t, Int64)
-      CASE_REPEATED_NOT_PACKED_POD(UInt32, uint32_t, UInt32)
-      CASE_REPEATED_NOT_PACKED_POD(UInt64, uint64_t, UInt64)
-      CASE_REPEATED_NOT_PACKED_OBJECT(Bytes)
-      CASE_REPEATED_NOT_PACKED_OBJECT(String)
-#undef CASE_REPEATED_NOT_PACKED_POD
-#undef CASE_NOT_PACKED_OBJECT
-    case GPBDataTypeMessage: {
-      GPBMessage *message = [[field.msgClass alloc] init];
-      [input readMessage:message extensionRegistry:extensionRegistry];
-      [(NSMutableArray*)genericArray addObject:message];
-      [message release];
-      break;
-    }
-    case GPBDataTypeGroup: {
-      GPBMessage *message = [[field.msgClass alloc] init];
-      [input readGroup:GPBFieldNumber(field)
-                    message:message
-          extensionRegistry:extensionRegistry];
-      [(NSMutableArray*)genericArray addObject:message];
-      [message release];
-      break;
-    }
-    case GPBDataTypeEnum: {
-      int32_t val = GPBCodedInputStreamReadEnum(state);
-      if (GPBHasPreservingUnknownEnumSemantics(syntax) ||
-          [field isValidEnumValue:val]) {
-        [(GPBEnumArray*)genericArray addRawValue:val];
-      } else {
-        GPBUnknownFieldSet *unknownFields = GetOrMakeUnknownFields(self);
-        [unknownFields mergeVarintField:GPBFieldNumber(field) value:val];
-      }
-      break;
-    }
-  }  // switch
-}
-
-- (void)mergeFromCodedInputStream:(GPBCodedInputStream *)input
-                extensionRegistry:(GPBExtensionRegistry *)extensionRegistry {
-  GPBDescriptor *descriptor = [self descriptor];
-  GPBFileSyntax syntax = descriptor.file.syntax;
-  GPBCodedInputStreamState *state = &input->state_;
-  uint32_t tag = 0;
-  NSUInteger startingIndex = 0;
-  NSArray *fields = descriptor->fields_;
-  NSUInteger numFields = fields.count;
-  while (YES) {
-    BOOL merged = NO;
-    tag = GPBCodedInputStreamReadTag(state);
-    if (tag == 0) {
-      break;  // Reached end.
-    }
-    for (NSUInteger i = 0; i < numFields; ++i) {
-      if (startingIndex >= numFields) startingIndex = 0;
-      GPBFieldDescriptor *fieldDescriptor = fields[startingIndex];
-      if (GPBFieldTag(fieldDescriptor) == tag) {
-        GPBFieldType fieldType = fieldDescriptor.fieldType;
-        if (fieldType == GPBFieldTypeSingle) {
-          MergeSingleFieldFromCodedInputStream(self, fieldDescriptor, syntax,
-                                               input, extensionRegistry);
-          // Well formed protos will only have a single field once, advance
-          // the starting index to the next field.
-          startingIndex += 1;
-        } else if (fieldType == GPBFieldTypeRepeated) {
-          if (fieldDescriptor.isPackable) {
-            MergeRepeatedPackedFieldFromCodedInputStream(
-                self, fieldDescriptor, syntax, input);
-            // Well formed protos will only have a repeated field that is
-            // packed once, advance the starting index to the next field.
-            startingIndex += 1;
-          } else {
-            MergeRepeatedNotPackedFieldFromCodedInputStream(
-                self, fieldDescriptor, syntax, input, extensionRegistry);
-          }
-        } else {  // fieldType == GPBFieldTypeMap
-          // GPB*Dictionary or NSDictionary, exact type doesn't matter at this
-          // point.
-          id map = GetOrCreateMapIvarWithField(self, fieldDescriptor);
-          [input readMapEntry:map
-            extensionRegistry:extensionRegistry
-                        field:fieldDescriptor
-                parentMessage:self];
-        }
-        merged = YES;
-        break;
-      } else {
-        startingIndex += 1;
-      }
-    }  // for(i < numFields)
-
-    if (!merged && (tag != 0)) {
-      // Primitive, repeated types can be packed on unpacked on the wire, and
-      // are parsed either way.  The above loop covered tag in the preferred
-      // for, so this need to check the alternate form.
-      for (NSUInteger i = 0; i < numFields; ++i) {
-        if (startingIndex >= numFields) startingIndex = 0;
-        GPBFieldDescriptor *fieldDescriptor = fields[startingIndex];
-        if ((fieldDescriptor.fieldType == GPBFieldTypeRepeated) &&
-            !GPBFieldDataTypeIsObject(fieldDescriptor) &&
-            (GPBFieldAlternateTag(fieldDescriptor) == tag)) {
-          BOOL alternateIsPacked = !fieldDescriptor.isPackable;
-          if (alternateIsPacked) {
-            MergeRepeatedPackedFieldFromCodedInputStream(
-                self, fieldDescriptor, syntax, input);
-            // Well formed protos will only have a repeated field that is
-            // packed once, advance the starting index to the next field.
-            startingIndex += 1;
-          } else {
-            MergeRepeatedNotPackedFieldFromCodedInputStream(
-                self, fieldDescriptor, syntax, input, extensionRegistry);
-          }
-          merged = YES;
-          break;
-        } else {
-          startingIndex += 1;
-        }
-      }
-    }
-
-    if (!merged) {
-      if (tag == 0) {
-        // zero signals EOF / limit reached
-        return;
-      } else {
-        if (![self parseUnknownField:input
-                   extensionRegistry:extensionRegistry
-                                 tag:tag]) {
-          // it's an endgroup tag
-          return;
-        }
-      }
-    }  // if(!merged)
-
-  }  // while(YES)
-}
-
-#pragma mark - MergeFrom Support
-
-- (void)mergeFrom:(GPBMessage *)other {
-  Class selfClass = [self class];
-  Class otherClass = [other class];
-  if (!([selfClass isSubclassOfClass:otherClass] ||
-        [otherClass isSubclassOfClass:selfClass])) {
-    [NSException raise:NSInvalidArgumentException
-                format:@"Classes must match %@ != %@", selfClass, otherClass];
-  }
-
-  // We assume something will be done and become visible.
-  GPBBecomeVisibleToAutocreator(self);
-
-  GPBDescriptor *descriptor = [[self class] descriptor];
-
-  for (GPBFieldDescriptor *field in descriptor->fields_) {
-    GPBFieldType fieldType = field.fieldType;
-    if (fieldType == GPBFieldTypeSingle) {
-      int32_t hasIndex = GPBFieldHasIndex(field);
-      uint32_t fieldNumber = GPBFieldNumber(field);
-      if (!GPBGetHasIvar(other, hasIndex, fieldNumber)) {
-        // Other doesn't have the field set, on to the next.
-        continue;
-      }
-      GPBDataType fieldDataType = GPBGetFieldDataType(field);
-      switch (fieldDataType) {
-        case GPBDataTypeBool:
-          GPBSetBoolIvarWithFieldPrivate(
-              self, field, GPBGetMessageBoolField(other, field));
-          break;
-        case GPBDataTypeSFixed32:
-        case GPBDataTypeEnum:
-        case GPBDataTypeInt32:
-        case GPBDataTypeSInt32:
-          GPBSetInt32IvarWithFieldPrivate(
-              self, field, GPBGetMessageInt32Field(other, field));
-          break;
-        case GPBDataTypeFixed32:
-        case GPBDataTypeUInt32:
-          GPBSetUInt32IvarWithFieldPrivate(
-              self, field, GPBGetMessageUInt32Field(other, field));
-          break;
-        case GPBDataTypeSFixed64:
-        case GPBDataTypeInt64:
-        case GPBDataTypeSInt64:
-          GPBSetInt64IvarWithFieldPrivate(
-              self, field, GPBGetMessageInt64Field(other, field));
-          break;
-        case GPBDataTypeFixed64:
-        case GPBDataTypeUInt64:
-          GPBSetUInt64IvarWithFieldPrivate(
-              self, field, GPBGetMessageUInt64Field(other, field));
-          break;
-        case GPBDataTypeFloat:
-          GPBSetFloatIvarWithFieldPrivate(
-              self, field, GPBGetMessageFloatField(other, field));
-          break;
-        case GPBDataTypeDouble:
-          GPBSetDoubleIvarWithFieldPrivate(
-              self, field, GPBGetMessageDoubleField(other, field));
-          break;
-        case GPBDataTypeBytes:
-        case GPBDataTypeString: {
-          id otherVal = GPBGetObjectIvarWithFieldNoAutocreate(other, field);
-          GPBSetObjectIvarWithFieldPrivate(self, field, otherVal);
-          break;
-        }
-        case GPBDataTypeMessage:
-        case GPBDataTypeGroup: {
-          id otherVal = GPBGetObjectIvarWithFieldNoAutocreate(other, field);
-          if (GPBGetHasIvar(self, hasIndex, fieldNumber)) {
-            GPBMessage *message =
-                GPBGetObjectIvarWithFieldNoAutocreate(self, field);
-            [message mergeFrom:otherVal];
-          } else {
-            GPBMessage *message = [otherVal copy];
-            GPBSetRetainedObjectIvarWithFieldPrivate(self, field, message);
-          }
-          break;
-        }
-      } // switch()
-    } else if (fieldType == GPBFieldTypeRepeated) {
-      // In the case of a list, they need to be appended, and there is no
-      // _hasIvar to worry about setting.
-      id otherArray =
-          GPBGetObjectIvarWithFieldNoAutocreate(other, field);
-      if (otherArray) {
-        GPBDataType fieldDataType = field->description_->dataType;
-        if (GPBDataTypeIsObject(fieldDataType)) {
-          NSMutableArray *resultArray =
-              GetOrCreateArrayIvarWithField(self, field);
-          [resultArray addObjectsFromArray:otherArray];
-        } else if (fieldDataType == GPBDataTypeEnum) {
-          GPBEnumArray *resultArray =
-              GetOrCreateArrayIvarWithField(self, field);
-          [resultArray addRawValuesFromArray:otherArray];
-        } else {
-          // The array type doesn't matter, that all implement
-          // -addValuesFromArray:.
-          GPBInt32Array *resultArray =
-              GetOrCreateArrayIvarWithField(self, field);
-          [resultArray addValuesFromArray:otherArray];
-        }
-      }
-    } else {  // fieldType = GPBFieldTypeMap
-      // In the case of a map, they need to be merged, and there is no
-      // _hasIvar to worry about setting.
-      id otherDict = GPBGetObjectIvarWithFieldNoAutocreate(other, field);
-      if (otherDict) {
-        GPBDataType keyDataType = field.mapKeyDataType;
-        GPBDataType valueDataType = field->description_->dataType;
-        if (GPBDataTypeIsObject(keyDataType) &&
-            GPBDataTypeIsObject(valueDataType)) {
-          NSMutableDictionary *resultDict =
-              GetOrCreateMapIvarWithField(self, field);
-          [resultDict addEntriesFromDictionary:otherDict];
-        } else if (valueDataType == GPBDataTypeEnum) {
-          // The exact type doesn't matter, just need to know it is a
-          // GPB*EnumDictionary.
-          GPBInt32EnumDictionary *resultDict =
-              GetOrCreateMapIvarWithField(self, field);
-          [resultDict addRawEntriesFromDictionary:otherDict];
-        } else {
-          // The exact type doesn't matter, they all implement
-          // -addEntriesFromDictionary:.
-          GPBInt32Int32Dictionary *resultDict =
-              GetOrCreateMapIvarWithField(self, field);
-          [resultDict addEntriesFromDictionary:otherDict];
-        }
-      }
-    }  // if (fieldType)..else if...else
-  }  // for(fields)
-
-  // Unknown fields.
-  if (!unknownFields_) {
-    [self setUnknownFields:other.unknownFields];
-  } else {
-    [unknownFields_ mergeUnknownFields:other.unknownFields];
-  }
-
-  // Extensions
-
-  if (other->extensionMap_.count == 0) {
-    return;
-  }
-
-  if (extensionMap_ == nil) {
-    extensionMap_ =
-        CloneExtensionMap(other->extensionMap_, NSZoneFromPointer(self));
-  } else {
-    for (GPBExtensionDescriptor *extension in other->extensionMap_) {
-      id otherValue = [other->extensionMap_ objectForKey:extension];
-      id value = [extensionMap_ objectForKey:extension];
-      BOOL isMessageExtension = GPBExtensionIsMessage(extension);
-
-      if (extension.repeated) {
-        NSMutableArray *list = value;
-        if (list == nil) {
-          list = [[NSMutableArray alloc] init];
-          [extensionMap_ setObject:list forKey:extension];
-          [list release];
-        }
-        if (isMessageExtension) {
-          for (GPBMessage *otherListValue in otherValue) {
-            GPBMessage *copiedValue = [otherListValue copy];
-            [list addObject:copiedValue];
-            [copiedValue release];
-          }
-        } else {
-          [list addObjectsFromArray:otherValue];
-        }
-      } else {
-        if (isMessageExtension) {
-          if (value) {
-            [(GPBMessage *)value mergeFrom:(GPBMessage *)otherValue];
-          } else {
-            GPBMessage *copiedValue = [otherValue copy];
-            [extensionMap_ setObject:copiedValue forKey:extension];
-            [copiedValue release];
-          }
-        } else {
-          [extensionMap_ setObject:otherValue forKey:extension];
-        }
-      }
-
-      if (isMessageExtension && !extension.isRepeated) {
-        GPBMessage *autocreatedValue =
-            [[autocreatedExtensionMap_ objectForKey:extension] retain];
-        // Must remove from the map before calling GPBClearMessageAutocreator()
-        // so that GPBClearMessageAutocreator() knows its safe to clear.
-        [autocreatedExtensionMap_ removeObjectForKey:extension];
-        GPBClearMessageAutocreator(autocreatedValue);
-        [autocreatedValue release];
-      }
-    }
-  }
-}
-
-#pragma mark - isEqual: & hash Support
-
-- (BOOL)isEqual:(id)other {
-  if (other == self) {
-    return YES;
-  }
-  if (![other isKindOfClass:[GPBMessage class]]) {
-    return NO;
-  }
-  GPBMessage *otherMsg = other;
-  GPBDescriptor *descriptor = [[self class] descriptor];
-  if ([[otherMsg class] descriptor] != descriptor) {
-    return NO;
-  }
-  uint8_t *selfStorage = (uint8_t *)messageStorage_;
-  uint8_t *otherStorage = (uint8_t *)otherMsg->messageStorage_;
-
-  for (GPBFieldDescriptor *field in descriptor->fields_) {
-    if (GPBFieldIsMapOrArray(field)) {
-      // In the case of a list or map, there is no _hasIvar to worry about.
-      // NOTE: These are NSArray/GPB*Array or NSDictionary/GPB*Dictionary, but
-      // the type doesn't really matter as the objects all support -count and
-      // -isEqual:.
-      NSArray *resultMapOrArray =
-          GPBGetObjectIvarWithFieldNoAutocreate(self, field);
-      NSArray *otherMapOrArray =
-          GPBGetObjectIvarWithFieldNoAutocreate(other, field);
-      // nil and empty are equal
-      if (resultMapOrArray.count != 0 || otherMapOrArray.count != 0) {
-        if (![resultMapOrArray isEqual:otherMapOrArray]) {
-          return NO;
-        }
-      }
-    } else {  // Single field
-      int32_t hasIndex = GPBFieldHasIndex(field);
-      uint32_t fieldNum = GPBFieldNumber(field);
-      BOOL selfHas = GPBGetHasIvar(self, hasIndex, fieldNum);
-      BOOL otherHas = GPBGetHasIvar(other, hasIndex, fieldNum);
-      if (selfHas != otherHas) {
-        return NO;  // Differing has values, not equal.
-      }
-      if (!selfHas) {
-        // Same has values, was no, nothing else to check for this field.
-        continue;
-      }
-      // Now compare the values.
-      GPBDataType fieldDataType = GPBGetFieldDataType(field);
-      size_t fieldOffset = field->description_->offset;
-      switch (fieldDataType) {
-        case GPBDataTypeBool: {
-          // Bools are stored in has_bits to avoid needing explicit space in
-          // the storage structure.
-          // (the field number passed to the HasIvar helper doesn't really
-          // matter since the offset is never negative)
-          BOOL selfValue = GPBGetHasIvar(self, (int32_t)(fieldOffset), 0);
-          BOOL otherValue = GPBGetHasIvar(other, (int32_t)(fieldOffset), 0);
-          if (selfValue != otherValue) {
-            return NO;
-          }
-          break;
-        }
-        case GPBDataTypeSFixed32:
-        case GPBDataTypeInt32:
-        case GPBDataTypeSInt32:
-        case GPBDataTypeEnum:
-        case GPBDataTypeFixed32:
-        case GPBDataTypeUInt32:
-        case GPBDataTypeFloat: {
-          GPBInternalCompileAssert(sizeof(float) == sizeof(uint32_t), float_not_32_bits);
-          // These are all 32bit, signed/unsigned doesn't matter for equality.
-          uint32_t *selfValPtr = (uint32_t *)&selfStorage[fieldOffset];
-          uint32_t *otherValPtr = (uint32_t *)&otherStorage[fieldOffset];
-          if (*selfValPtr != *otherValPtr) {
-            return NO;
-          }
-          break;
-        }
-        case GPBDataTypeSFixed64:
-        case GPBDataTypeInt64:
-        case GPBDataTypeSInt64:
-        case GPBDataTypeFixed64:
-        case GPBDataTypeUInt64:
-        case GPBDataTypeDouble: {
-          GPBInternalCompileAssert(sizeof(double) == sizeof(uint64_t), double_not_64_bits);
-          // These are all 64bit, signed/unsigned doesn't matter for equality.
-          uint64_t *selfValPtr = (uint64_t *)&selfStorage[fieldOffset];
-          uint64_t *otherValPtr = (uint64_t *)&otherStorage[fieldOffset];
-          if (*selfValPtr != *otherValPtr) {
-            return NO;
-          }
-          break;
-        }
-        case GPBDataTypeBytes:
-        case GPBDataTypeString:
-        case GPBDataTypeMessage:
-        case GPBDataTypeGroup: {
-          // Type doesn't matter here, they all implement -isEqual:.
-          id *selfValPtr = (id *)&selfStorage[fieldOffset];
-          id *otherValPtr = (id *)&otherStorage[fieldOffset];
-          if (![*selfValPtr isEqual:*otherValPtr]) {
-            return NO;
-          }
-          break;
-        }
-      } // switch()
-    }   // if(mapOrArray)...else
-  }  // for(fields)
-
-  // nil and empty are equal
-  if (extensionMap_.count != 0 || otherMsg->extensionMap_.count != 0) {
-    if (![extensionMap_ isEqual:otherMsg->extensionMap_]) {
-      return NO;
-    }
-  }
-
-  // nil and empty are equal
-  GPBUnknownFieldSet *otherUnknowns = otherMsg->unknownFields_;
-  if ([unknownFields_ countOfFields] != 0 ||
-      [otherUnknowns countOfFields] != 0) {
-    if (![unknownFields_ isEqual:otherUnknowns]) {
-      return NO;
-    }
-  }
-
-  return YES;
-}
-
-// It is very difficult to implement a generic hash for ProtoBuf messages that
-// will perform well. If you need hashing on your ProtoBufs (eg you are using
-// them as dictionary keys) you will probably want to implement a ProtoBuf
-// message specific hash as a category on your protobuf class. Do not make it a
-// category on GPBMessage as you will conflict with this hash, and will possibly
-// override hash for all generated protobufs. A good implementation of hash will
-// be really fast, so we would recommend only hashing protobufs that have an
-// identifier field of some kind that you can easily hash. If you implement
-// hash, we would strongly recommend overriding isEqual: in your category as
-// well, as the default implementation of isEqual: is extremely slow, and may
-// drastically affect performance in large sets.
-- (NSUInteger)hash {
-  GPBDescriptor *descriptor = [[self class] descriptor];
-  const NSUInteger prime = 19;
-  uint8_t *storage = (uint8_t *)messageStorage_;
-
-  // Start with the descriptor and then mix it with some instance info.
-  // Hopefully that will give a spread based on classes and what fields are set.
-  NSUInteger result = (NSUInteger)descriptor;
-
-  for (GPBFieldDescriptor *field in descriptor->fields_) {
-    if (GPBFieldIsMapOrArray(field)) {
-      // Exact type doesn't matter, just check if there are any elements.
-      NSArray *mapOrArray = GPBGetObjectIvarWithFieldNoAutocreate(self, field);
-      NSUInteger count = mapOrArray.count;
-      if (count) {
-        // NSArray/NSDictionary use count, use the field number and the count.
-        result = prime * result + GPBFieldNumber(field);
-        result = prime * result + count;
-      }
-    } else if (GPBGetHasIvarField(self, field)) {
-      // Just using the field number seemed simple/fast, but then a small
-      // message class where all the same fields are always set (to different
-      // things would end up all with the same hash, so pull in some data).
-      GPBDataType fieldDataType = GPBGetFieldDataType(field);
-      size_t fieldOffset = field->description_->offset;
-      switch (fieldDataType) {
-        case GPBDataTypeBool: {
-          // Bools are stored in has_bits to avoid needing explicit space in
-          // the storage structure.
-          // (the field number passed to the HasIvar helper doesn't really
-          // matter since the offset is never negative)
-          BOOL value = GPBGetHasIvar(self, (int32_t)(fieldOffset), 0);
-          result = prime * result + value;
-          break;
-        }
-        case GPBDataTypeSFixed32:
-        case GPBDataTypeInt32:
-        case GPBDataTypeSInt32:
-        case GPBDataTypeEnum:
-        case GPBDataTypeFixed32:
-        case GPBDataTypeUInt32:
-        case GPBDataTypeFloat: {
-          GPBInternalCompileAssert(sizeof(float) == sizeof(uint32_t), float_not_32_bits);
-          // These are all 32bit, just mix it in.
-          uint32_t *valPtr = (uint32_t *)&storage[fieldOffset];
-          result = prime * result + *valPtr;
-          break;
-        }
-        case GPBDataTypeSFixed64:
-        case GPBDataTypeInt64:
-        case GPBDataTypeSInt64:
-        case GPBDataTypeFixed64:
-        case GPBDataTypeUInt64:
-        case GPBDataTypeDouble: {
-          GPBInternalCompileAssert(sizeof(double) == sizeof(uint64_t), double_not_64_bits);
-          // These are all 64bit, just mix what fits into an NSUInteger in.
-          uint64_t *valPtr = (uint64_t *)&storage[fieldOffset];
-          result = prime * result + (NSUInteger)(*valPtr);
-          break;
-        }
-        case GPBDataTypeBytes:
-        case GPBDataTypeString: {
-          // Type doesn't matter here, they both implement -hash:.
-          id *valPtr = (id *)&storage[fieldOffset];
-          result = prime * result + [*valPtr hash];
-          break;
-        }
-
-        case GPBDataTypeMessage:
-        case GPBDataTypeGroup: {
-          GPBMessage **valPtr = (GPBMessage **)&storage[fieldOffset];
-          // Could call -hash on the sub message, but that could recurse pretty
-          // deep; follow the lead of NSArray/NSDictionary and don't really
-          // recurse for hash, instead use the field number and the descriptor
-          // of the sub message.  Yes, this could suck for a bunch of messages
-          // where they all only differ in the sub messages, but if you are
-          // using a message with sub messages for something that needs -hash,
-          // odds are you are also copying them as keys, and that deep copy
-          // will also suck.
-          result = prime * result + GPBFieldNumber(field);
-          result = prime * result + (NSUInteger)[[*valPtr class] descriptor];
-          break;
-        }
-      } // switch()
-    }
-  }
-
-  // Unknowns and extensions are not included.
-
-  return result;
-}
-
-#pragma mark - Description Support
-
-- (NSString *)description {
-  NSString *textFormat = GPBTextFormatForMessage(self, @"    ");
-  NSString *description = [NSString
-      stringWithFormat:@"<%@ %p>: {\n%@}", [self class], self, textFormat];
-  return description;
-}
-
-#if defined(DEBUG) && DEBUG
-
-// Xcode 5.1 added support for custom quick look info.
-// https://developer.apple.com/library/ios/documentation/IDEs/Conceptual/CustomClassDisplay_in_QuickLook/CH01-quick_look_for_custom_objects/CH01-quick_look_for_custom_objects.html#//apple_ref/doc/uid/TP40014001-CH2-SW1
-- (id)debugQuickLookObject {
-  return GPBTextFormatForMessage(self, nil);
-}
-
-#endif  // DEBUG
-
-#pragma mark - SerializedSize
-
-- (size_t)serializedSize {
-  GPBDescriptor *descriptor = [[self class] descriptor];
-  size_t result = 0;
-
-  // Has check is done explicitly, so GPBGetObjectIvarWithFieldNoAutocreate()
-  // avoids doing the has check again.
-
-  // Fields.
-  for (GPBFieldDescriptor *fieldDescriptor in descriptor->fields_) {
-    GPBFieldType fieldType = fieldDescriptor.fieldType;
-    GPBDataType fieldDataType = GPBGetFieldDataType(fieldDescriptor);
-
-    // Single Fields
-    if (fieldType == GPBFieldTypeSingle) {
-      BOOL selfHas = GPBGetHasIvarField(self, fieldDescriptor);
-      if (!selfHas) {
-        continue;  // Nothing to do.
-      }
-
-      uint32_t fieldNumber = GPBFieldNumber(fieldDescriptor);
-
-      switch (fieldDataType) {
-#define CASE_SINGLE_POD(NAME, TYPE, FUNC_TYPE)                                \
-        case GPBDataType##NAME: {                                             \
-          TYPE fieldVal = GPBGetMessage##FUNC_TYPE##Field(self, fieldDescriptor); \
-          result += GPBCompute##NAME##Size(fieldNumber, fieldVal);            \
-          break;                                                              \
-        }
-#define CASE_SINGLE_OBJECT(NAME)                                              \
-        case GPBDataType##NAME: {                                             \
-          id fieldVal = GPBGetObjectIvarWithFieldNoAutocreate(self, fieldDescriptor); \
-          result += GPBCompute##NAME##Size(fieldNumber, fieldVal);            \
-          break;                                                              \
-        }
-          CASE_SINGLE_POD(Bool, BOOL, Bool)
-          CASE_SINGLE_POD(Fixed32, uint32_t, UInt32)
-          CASE_SINGLE_POD(SFixed32, int32_t, Int32)
-          CASE_SINGLE_POD(Float, float, Float)
-          CASE_SINGLE_POD(Fixed64, uint64_t, UInt64)
-          CASE_SINGLE_POD(SFixed64, int64_t, Int64)
-          CASE_SINGLE_POD(Double, double, Double)
-          CASE_SINGLE_POD(Int32, int32_t, Int32)
-          CASE_SINGLE_POD(Int64, int64_t, Int64)
-          CASE_SINGLE_POD(SInt32, int32_t, Int32)
-          CASE_SINGLE_POD(SInt64, int64_t, Int64)
-          CASE_SINGLE_POD(UInt32, uint32_t, UInt32)
-          CASE_SINGLE_POD(UInt64, uint64_t, UInt64)
-          CASE_SINGLE_OBJECT(Bytes)
-          CASE_SINGLE_OBJECT(String)
-          CASE_SINGLE_OBJECT(Message)
-          CASE_SINGLE_OBJECT(Group)
-          CASE_SINGLE_POD(Enum, int32_t, Int32)
-#undef CASE_SINGLE_POD
-#undef CASE_SINGLE_OBJECT
-      }
-
-    // Repeated Fields
-    } else if (fieldType == GPBFieldTypeRepeated) {
-      id genericArray =
-          GPBGetObjectIvarWithFieldNoAutocreate(self, fieldDescriptor);
-      NSUInteger count = [genericArray count];
-      if (count == 0) {
-        continue;  // Nothing to add.
-      }
-      __block size_t dataSize = 0;
-
-      switch (fieldDataType) {
-#define CASE_REPEATED_POD(NAME, TYPE, ARRAY_TYPE)                             \
-    CASE_REPEATED_POD_EXTRA(NAME, TYPE, ARRAY_TYPE, )
-#define CASE_REPEATED_POD_EXTRA(NAME, TYPE, ARRAY_TYPE, ARRAY_ACCESSOR_NAME)  \
-        case GPBDataType##NAME: {                                             \
-          GPB##ARRAY_TYPE##Array *array = genericArray;                       \
-          [array enumerate##ARRAY_ACCESSOR_NAME##ValuesWithBlock:^(TYPE value, NSUInteger idx, BOOL *stop) { \
-            _Pragma("unused(idx, stop)");                                     \
-            dataSize += GPBCompute##NAME##SizeNoTag(value);                   \
-          }];                                                                 \
-          break;                                                              \
-        }
-#define CASE_REPEATED_OBJECT(NAME)                                            \
-        case GPBDataType##NAME: {                                             \
-          for (id value in genericArray) {                                    \
-            dataSize += GPBCompute##NAME##SizeNoTag(value);                   \
-          }                                                                   \
-          break;                                                              \
-        }
-          CASE_REPEATED_POD(Bool, BOOL, Bool)
-          CASE_REPEATED_POD(Fixed32, uint32_t, UInt32)
-          CASE_REPEATED_POD(SFixed32, int32_t, Int32)
-          CASE_REPEATED_POD(Float, float, Float)
-          CASE_REPEATED_POD(Fixed64, uint64_t, UInt64)
-          CASE_REPEATED_POD(SFixed64, int64_t, Int64)
-          CASE_REPEATED_POD(Double, double, Double)
-          CASE_REPEATED_POD(Int32, int32_t, Int32)
-          CASE_REPEATED_POD(Int64, int64_t, Int64)
-          CASE_REPEATED_POD(SInt32, int32_t, Int32)
-          CASE_REPEATED_POD(SInt64, int64_t, Int64)
-          CASE_REPEATED_POD(UInt32, uint32_t, UInt32)
-          CASE_REPEATED_POD(UInt64, uint64_t, UInt64)
-          CASE_REPEATED_OBJECT(Bytes)
-          CASE_REPEATED_OBJECT(String)
-          CASE_REPEATED_OBJECT(Message)
-          CASE_REPEATED_OBJECT(Group)
-          CASE_REPEATED_POD_EXTRA(Enum, int32_t, Enum, Raw)
-#undef CASE_REPEATED_POD
-#undef CASE_REPEATED_POD_EXTRA
-#undef CASE_REPEATED_OBJECT
-      }  // switch
-      result += dataSize;
-      size_t tagSize = GPBComputeTagSize(GPBFieldNumber(fieldDescriptor));
-      if (fieldDataType == GPBDataTypeGroup) {
-        // Groups have both a start and an end tag.
-        tagSize *= 2;
-      }
-      if (fieldDescriptor.isPackable) {
-        result += tagSize;
-        result += GPBComputeSizeTSizeAsInt32NoTag(dataSize);
-      } else {
-        result += count * tagSize;
-      }
-
-    // Map<> Fields
-    } else {  // fieldType == GPBFieldTypeMap
-      if (GPBDataTypeIsObject(fieldDataType) &&
-          (fieldDescriptor.mapKeyDataType == GPBDataTypeString)) {
-        // If key type was string, then the map is an NSDictionary.
-        NSDictionary *map =
-            GPBGetObjectIvarWithFieldNoAutocreate(self, fieldDescriptor);
-        if (map) {
-          result += GPBDictionaryComputeSizeInternalHelper(map, fieldDescriptor);
-        }
-      } else {
-        // Type will be GPB*GroupDictionary, exact type doesn't matter.
-        GPBInt32Int32Dictionary *map =
-            GPBGetObjectIvarWithFieldNoAutocreate(self, fieldDescriptor);
-        result += [map computeSerializedSizeAsField:fieldDescriptor];
-      }
-    }
-  }  // for(fields)
-
-  // Add any unknown fields.
-  if (descriptor.wireFormat) {
-    result += [unknownFields_ serializedSizeAsMessageSet];
-  } else {
-    result += [unknownFields_ serializedSize];
-  }
-
-  // Add any extensions.
-  for (GPBExtensionDescriptor *extension in extensionMap_) {
-    id value = [extensionMap_ objectForKey:extension];
-    result += GPBComputeExtensionSerializedSizeIncludingTag(extension, value);
-  }
-
-  return result;
-}
-
-#pragma mark - Resolve Methods Support
-
-typedef struct ResolveIvarAccessorMethodResult {
-  IMP impToAdd;
-  SEL encodingSelector;
-} ResolveIvarAccessorMethodResult;
-
-// |field| can be __unsafe_unretained because they are created at startup
-// and are essentially global. No need to pay for retain/release when
-// they are captured in blocks.
-static void ResolveIvarGet(__unsafe_unretained GPBFieldDescriptor *field,
-                           ResolveIvarAccessorMethodResult *result) {
-  GPBDataType fieldDataType = GPBGetFieldDataType(field);
-  switch (fieldDataType) {
-#define CASE_GET(NAME, TYPE, TRUE_NAME)                          \
-    case GPBDataType##NAME: {                                    \
-      result->impToAdd = imp_implementationWithBlock(^(id obj) { \
-        return GPBGetMessage##TRUE_NAME##Field(obj, field);      \
-       });                                                       \
-      result->encodingSelector = @selector(get##NAME);           \
-      break;                                                     \
-    }
-#define CASE_GET_OBJECT(NAME, TYPE, TRUE_NAME)                   \
-    case GPBDataType##NAME: {                                    \
-      result->impToAdd = imp_implementationWithBlock(^(id obj) { \
-        return GPBGetObjectIvarWithField(obj, field);            \
-       });                                                       \
-      result->encodingSelector = @selector(get##NAME);           \
-      break;                                                     \
-    }
-      CASE_GET(Bool, BOOL, Bool)
-      CASE_GET(Fixed32, uint32_t, UInt32)
-      CASE_GET(SFixed32, int32_t, Int32)
-      CASE_GET(Float, float, Float)
-      CASE_GET(Fixed64, uint64_t, UInt64)
-      CASE_GET(SFixed64, int64_t, Int64)
-      CASE_GET(Double, double, Double)
-      CASE_GET(Int32, int32_t, Int32)
-      CASE_GET(Int64, int64_t, Int64)
-      CASE_GET(SInt32, int32_t, Int32)
-      CASE_GET(SInt64, int64_t, Int64)
-      CASE_GET(UInt32, uint32_t, UInt32)
-      CASE_GET(UInt64, uint64_t, UInt64)
-      CASE_GET_OBJECT(Bytes, id, Object)
-      CASE_GET_OBJECT(String, id, Object)
-      CASE_GET_OBJECT(Message, id, Object)
-      CASE_GET_OBJECT(Group, id, Object)
-      CASE_GET(Enum, int32_t, Enum)
-#undef CASE_GET
-  }
-}
-
-// See comment about __unsafe_unretained on ResolveIvarGet.
-static void ResolveIvarSet(__unsafe_unretained GPBFieldDescriptor *field,
-                           ResolveIvarAccessorMethodResult *result) {
-  GPBDataType fieldDataType = GPBGetFieldDataType(field);
-  switch (fieldDataType) {
-#define CASE_SET(NAME, TYPE, TRUE_NAME)                                       \
-    case GPBDataType##NAME: {                                                 \
-      result->impToAdd = imp_implementationWithBlock(^(id obj, TYPE value) {  \
-        return GPBSet##TRUE_NAME##IvarWithFieldPrivate(obj, field, value);    \
-      });                                                                     \
-      result->encodingSelector = @selector(set##NAME:);                       \
-      break;                                                                  \
-    }
-#define CASE_SET_COPY(NAME)                                                   \
-    case GPBDataType##NAME: {                                                 \
-      result->impToAdd = imp_implementationWithBlock(^(id obj, id value) {    \
-        return GPBSetRetainedObjectIvarWithFieldPrivate(obj, field, [value copy]); \
-      });                                                                     \
-      result->encodingSelector = @selector(set##NAME:);                       \
-      break;                                                                  \
-    }
-      CASE_SET(Bool, BOOL, Bool)
-      CASE_SET(Fixed32, uint32_t, UInt32)
-      CASE_SET(SFixed32, int32_t, Int32)
-      CASE_SET(Float, float, Float)
-      CASE_SET(Fixed64, uint64_t, UInt64)
-      CASE_SET(SFixed64, int64_t, Int64)
-      CASE_SET(Double, double, Double)
-      CASE_SET(Int32, int32_t, Int32)
-      CASE_SET(Int64, int64_t, Int64)
-      CASE_SET(SInt32, int32_t, Int32)
-      CASE_SET(SInt64, int64_t, Int64)
-      CASE_SET(UInt32, uint32_t, UInt32)
-      CASE_SET(UInt64, uint64_t, UInt64)
-      CASE_SET_COPY(Bytes)
-      CASE_SET_COPY(String)
-      CASE_SET(Message, id, Object)
-      CASE_SET(Group, id, Object)
-      CASE_SET(Enum, int32_t, Enum)
-#undef CASE_SET
-  }
-}
-
-+ (BOOL)resolveInstanceMethod:(SEL)sel {
-  const GPBDescriptor *descriptor = [self descriptor];
-  if (!descriptor) {
-    return [super resolveInstanceMethod:sel];
-  }
-
-  // NOTE: hasOrCountSel_/setHasSel_ will be NULL if the field for the given
-  // message should not have has support (done in GPBDescriptor.m), so there is
-  // no need for checks here to see if has*/setHas* are allowed.
-  ResolveIvarAccessorMethodResult result = {NULL, NULL};
-
-  // See comment about __unsafe_unretained on ResolveIvarGet.
-  for (__unsafe_unretained GPBFieldDescriptor *field in descriptor->fields_) {
-    BOOL isMapOrArray = GPBFieldIsMapOrArray(field);
-    if (!isMapOrArray) {
-      // Single fields.
-      if (sel == field->getSel_) {
-        ResolveIvarGet(field, &result);
-        break;
-      } else if (sel == field->setSel_) {
-        ResolveIvarSet(field, &result);
-        break;
-      } else if (sel == field->hasOrCountSel_) {
-        int32_t index = GPBFieldHasIndex(field);
-        uint32_t fieldNum = GPBFieldNumber(field);
-        result.impToAdd = imp_implementationWithBlock(^(id obj) {
-          return GPBGetHasIvar(obj, index, fieldNum);
-        });
-        result.encodingSelector = @selector(getBool);
-        break;
-      } else if (sel == field->setHasSel_) {
-        result.impToAdd = imp_implementationWithBlock(^(id obj, BOOL value) {
-          if (value) {
-            [NSException raise:NSInvalidArgumentException
-                        format:@"%@: %@ can only be set to NO (to clear field).",
-                               [obj class],
-                               NSStringFromSelector(field->setHasSel_)];
-          }
-          GPBClearMessageField(obj, field);
-        });
-        result.encodingSelector = @selector(setBool:);
-        break;
-      } else {
-        GPBOneofDescriptor *oneof = field->containingOneof_;
-        if (oneof && (sel == oneof->caseSel_)) {
-          int32_t index = GPBFieldHasIndex(field);
-          result.impToAdd = imp_implementationWithBlock(^(id obj) {
-            return GPBGetHasOneof(obj, index);
-          });
-          result.encodingSelector = @selector(getEnum);
-          break;
-        }
-      }
-    } else {
-      // map<>/repeated fields.
-      if (sel == field->getSel_) {
-        if (field.fieldType == GPBFieldTypeRepeated) {
-          result.impToAdd = imp_implementationWithBlock(^(id obj) {
-            return GetArrayIvarWithField(obj, field);
-          });
-        } else {
-          result.impToAdd = imp_implementationWithBlock(^(id obj) {
-            return GetMapIvarWithField(obj, field);
-          });
-        }
-        result.encodingSelector = @selector(getArray);
-        break;
-      } else if (sel == field->setSel_) {
-        // Local for syntax so the block can directly capture it and not the
-        // full lookup.
-        result.impToAdd = imp_implementationWithBlock(^(id obj, id value) {
-          GPBSetObjectIvarWithFieldPrivate(obj, field, value);
-        });
-        result.encodingSelector = @selector(setArray:);
-        break;
-      } else if (sel == field->hasOrCountSel_) {
-        result.impToAdd = imp_implementationWithBlock(^(id obj) {
-          // Type doesn't matter, all *Array and *Dictionary types support
-          // -count.
-          NSArray *arrayOrMap =
-              GPBGetObjectIvarWithFieldNoAutocreate(obj, field);
-          return [arrayOrMap count];
-        });
-        result.encodingSelector = @selector(getArrayCount);
-        break;
-      }
-    }
-  }
-  if (result.impToAdd) {
-    const char *encoding =
-        GPBMessageEncodingForSelector(result.encodingSelector, YES);
-    Class msgClass = descriptor.messageClass;
-    BOOL methodAdded = class_addMethod(msgClass, sel, result.impToAdd, encoding);
-    // class_addMethod() is documented as also failing if the method was already
-    // added; so we check if the method is already there and return success so
-    // the method dispatch will still happen.  Why would it already be added?
-    // Two threads could cause the same method to be bound at the same time,
-    // but only one will actually bind it; the other still needs to return true
-    // so things will dispatch.
-    if (!methodAdded) {
-      methodAdded = GPBClassHasSel(msgClass, sel);
-    }
-    return methodAdded;
-  }
-  return [super resolveInstanceMethod:sel];
-}
-
-+ (BOOL)resolveClassMethod:(SEL)sel {
-  // Extensions scoped to a Message and looked up via class methods.
-  if (GPBResolveExtensionClassMethod(self, sel)) {
-    return YES;
-  }
-  return [super resolveClassMethod:sel];
-}
-
-#pragma mark - NSCoding Support
-
-+ (BOOL)supportsSecureCoding {
-  return YES;
-}
-
-- (instancetype)initWithCoder:(NSCoder *)aDecoder {
-  self = [self init];
-  if (self) {
-    NSData *data =
-        [aDecoder decodeObjectOfClass:[NSData class] forKey:kGPBDataCoderKey];
-    if (data.length) {
-      [self mergeFromData:data extensionRegistry:nil];
-    }
-  }
-  return self;
-}
-
-- (void)encodeWithCoder:(NSCoder *)aCoder {
-#if defined(DEBUG) && DEBUG
-  if (extensionMap_.count) {
-    // Hint to go along with the docs on GPBMessage about this.
-    //
-    // Note: This is incomplete, in that it only checked the "root" message,
-    // if a sub message in a field has extensions, the issue still exists. A
-    // recursive check could be done here (like the work in
-    // GPBMessageDropUnknownFieldsRecursively()), but that has the potential to
-    // be expensive and could slow down serialization in DEBUG enough to cause
-    // developers other problems.
-    NSLog(@"Warning: writing out a GPBMessage (%@) via NSCoding and it"
-          @" has %ld extensions; when read back in, those fields will be"
-          @" in the unknownFields property instead.",
-          [self class], (long)extensionMap_.count);
-  }
-#endif
-  NSData *data = [self data];
-  if (data.length) {
-    [aCoder encodeObject:data forKey:kGPBDataCoderKey];
-  }
-}
-
-#pragma mark - KVC Support
-
-+ (BOOL)accessInstanceVariablesDirectly {
-  // Make sure KVC doesn't use instance variables.
-  return NO;
-}
-
-@end
-
-#pragma mark - Messages from GPBUtilities.h but defined here for access to helpers.
-
-// Only exists for public api, no core code should use this.
-id GPBGetMessageRepeatedField(GPBMessage *self, GPBFieldDescriptor *field) {
-#if defined(DEBUG) && DEBUG
-  if (field.fieldType != GPBFieldTypeRepeated) {
-    [NSException raise:NSInvalidArgumentException
-                format:@"%@.%@ is not a repeated field.",
-     [self class], field.name];
-  }
-#endif
-  return GetOrCreateArrayIvarWithField(self, field);
-}
-
-// Only exists for public api, no core code should use this.
-id GPBGetMessageMapField(GPBMessage *self, GPBFieldDescriptor *field) {
-#if defined(DEBUG) && DEBUG
-  if (field.fieldType != GPBFieldTypeMap) {
-    [NSException raise:NSInvalidArgumentException
-                format:@"%@.%@ is not a map<> field.",
-     [self class], field.name];
-  }
-#endif
-  return GetOrCreateMapIvarWithField(self, field);
-}
-
-id GPBGetObjectIvarWithField(GPBMessage *self, GPBFieldDescriptor *field) {
-  NSCAssert(!GPBFieldIsMapOrArray(field), @"Shouldn't get here");
-  if (!GPBFieldDataTypeIsMessage(field)) {
-    if (GPBGetHasIvarField(self, field)) {
-      uint8_t *storage = (uint8_t *)self->messageStorage_;
-      id *typePtr = (id *)&storage[field->description_->offset];
-      return *typePtr;
-    }
-    // Not set...non messages (string/data), get their default.
-    return field.defaultValue.valueMessage;
-  }
-
-  uint8_t *storage = (uint8_t *)self->messageStorage_;
-  _Atomic(id) *typePtr = (_Atomic(id) *)&storage[field->description_->offset];
-  id msg = atomic_load(typePtr);
-  if (msg) {
-    return msg;
-  }
-
-  id expected = nil;
-  id autocreated = GPBCreateMessageWithAutocreator(field.msgClass, self, field);
-  if (atomic_compare_exchange_strong(typePtr, &expected, autocreated)) {
-    // Value was set, return it.
-    return autocreated;
-  }
-
-  // Some other thread set it, release the one created and return what got set.
-  GPBClearMessageAutocreator(autocreated);
-  [autocreated release];
-  return expected;
-}
-
-#pragma clang diagnostic pop
diff --git a/libs/protobuf/objectivec/GPBMessage_PackagePrivate.h b/libs/protobuf/objectivec/GPBMessage_PackagePrivate.h
deleted file mode 100644
index ca10983..0000000
--- a/libs/protobuf/objectivec/GPBMessage_PackagePrivate.h
+++ /dev/null
@@ -1,124 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// This header is private to the ProtobolBuffers library and must NOT be
-// included by any sources outside this library. The contents of this file are
-// subject to change at any time without notice.
-
-#import "GPBMessage.h"
-
-// TODO: Remove this import. Older generated code use the OSAtomic* apis,
-// so anyone that hasn't regenerated says building by having this. After
-// enough time has passed, this likely can be removed as folks should have
-// regenerated.
-#import <libkern/OSAtomic.h>
-
-#import "GPBBootstrap.h"
-
-typedef struct GPBMessage_Storage {
-  uint32_t _has_storage_[0];
-} GPBMessage_Storage;
-
-typedef struct GPBMessage_Storage *GPBMessage_StoragePtr;
-
-@interface GPBMessage () {
- @package
-  // NOTE: Because of the +allocWithZone code using NSAllocateObject(),
-  // this structure should ideally always be kept pointer aligned where the
-  // real storage starts is also pointer aligned. The compiler/runtime already
-  // do this, but it may not be documented.
-
-  // A pointer to the actual fields of the subclasses. The actual structure
-  // pointed to by this pointer will depend on the subclass.
-  // All of the actual structures will start the same as
-  // GPBMessage_Storage with _has_storage__ as the first field.
-  // Kept public because static functions need to access it.
-  GPBMessage_StoragePtr messageStorage_;
-}
-
-// Gets an extension value without autocreating the result if not found. (i.e.
-// returns nil if the extension is not set)
-- (id)getExistingExtension:(GPBExtensionDescriptor *)extension;
-
-// Parses a message of this type from the input and merges it with this
-// message.
-//
-// Warning:  This does not verify that all required fields are present in
-// the input message.
-// Note:  The caller should call
-// -[CodedInputStream checkLastTagWas:] after calling this to
-// verify that the last tag seen was the appropriate end-group tag,
-// or zero for EOF.
-// NOTE: This will throw if there is an error while parsing.
-- (void)mergeFromCodedInputStream:(GPBCodedInputStream *)input
-                extensionRegistry:(GPBExtensionRegistry *)extensionRegistry;
-
-// Parses the next delimited message of this type from the input and merges it
-// with this message.
-- (void)mergeDelimitedFromCodedInputStream:(GPBCodedInputStream *)input
-                         extensionRegistry:
-                             (GPBExtensionRegistry *)extensionRegistry;
-
-- (void)addUnknownMapEntry:(int32_t)fieldNum value:(NSData *)data;
-
-@end
-
-CF_EXTERN_C_BEGIN
-
-
-// Call this before using the readOnlySemaphore_. This ensures it is created only once.
-void GPBPrepareReadOnlySemaphore(GPBMessage *self);
-
-// Returns a new instance that was automatically created by |autocreator| for
-// its field |field|.
-GPBMessage *GPBCreateMessageWithAutocreator(Class msgClass,
-                                            GPBMessage *autocreator,
-                                            GPBFieldDescriptor *field)
-    __attribute__((ns_returns_retained));
-
-// Returns whether |message| autocreated this message. This is NO if the message
-// was not autocreated by |message| or if it has been mutated since
-// autocreation.
-BOOL GPBWasMessageAutocreatedBy(GPBMessage *message, GPBMessage *parent);
-
-// Call this when you mutate a message. It will cause the message to become
-// visible to its autocreator.
-void GPBBecomeVisibleToAutocreator(GPBMessage *self);
-
-// Call this when an array/dictionary is mutated so the parent message that
-// autocreated it can react.
-void GPBAutocreatedArrayModified(GPBMessage *self, id array);
-void GPBAutocreatedDictionaryModified(GPBMessage *self, id dictionary);
-
-// Clear the autocreator, if any. Asserts if the autocreator still has an
-// autocreated reference to this message.
-void GPBClearMessageAutocreator(GPBMessage *self);
-
-CF_EXTERN_C_END
diff --git a/libs/protobuf/objectivec/GPBProtocolBuffers.h b/libs/protobuf/objectivec/GPBProtocolBuffers.h
deleted file mode 100644
index 619c082..0000000
--- a/libs/protobuf/objectivec/GPBProtocolBuffers.h
+++ /dev/null
@@ -1,57 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#import "GPBBootstrap.h"
-
-#import "GPBArray.h"
-#import "GPBCodedInputStream.h"
-#import "GPBCodedOutputStream.h"
-#import "GPBDescriptor.h"
-#import "GPBDictionary.h"
-#import "GPBExtensionRegistry.h"
-#import "GPBMessage.h"
-#import "GPBRootObject.h"
-#import "GPBUnknownField.h"
-#import "GPBUnknownFieldSet.h"
-#import "GPBUtilities.h"
-#import "GPBWellKnownTypes.h"
-#import "GPBWireFormat.h"
-
-// Well-known proto types
-#import "GPBAny.pbobjc.h"
-#import "GPBApi.pbobjc.h"
-#import "GPBDuration.pbobjc.h"
-#import "GPBEmpty.pbobjc.h"
-#import "GPBFieldMask.pbobjc.h"
-#import "GPBSourceContext.pbobjc.h"
-#import "GPBStruct.pbobjc.h"
-#import "GPBTimestamp.pbobjc.h"
-#import "GPBType.pbobjc.h"
-#import "GPBWrappers.pbobjc.h"
diff --git a/libs/protobuf/objectivec/GPBProtocolBuffers.m b/libs/protobuf/objectivec/GPBProtocolBuffers.m
deleted file mode 100644
index 0545ae9..0000000
--- a/libs/protobuf/objectivec/GPBProtocolBuffers.m
+++ /dev/null
@@ -1,66 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// If you want to build protocol buffers in your own project without adding the
-// project dependency, you can just add this file.
-
-
-// This warning seems to treat code differently when it is #imported than when
-// it is inline in the file.  GPBDictionary.m compiles cleanly in other targets,
-// but when #imported here it triggers a bunch of warnings that don't make
-// much sense, and don't trigger when compiled directly.  So we shut off the
-// warnings here.
-#pragma clang diagnostic ignored "-Wnullability-completeness"
-
-#import "GPBArray.m"
-#import "GPBCodedInputStream.m"
-#import "GPBCodedOutputStream.m"
-#import "GPBDescriptor.m"
-#import "GPBDictionary.m"
-#import "GPBExtensionInternals.m"
-#import "GPBExtensionRegistry.m"
-#import "GPBMessage.m"
-#import "GPBRootObject.m"
-#import "GPBUnknownField.m"
-#import "GPBUnknownFieldSet.m"
-#import "GPBUtilities.m"
-#import "GPBWellKnownTypes.m"
-#import "GPBWireFormat.m"
-
-#import "GPBAny.pbobjc.m"
-#import "GPBApi.pbobjc.m"
-#import "GPBDuration.pbobjc.m"
-#import "GPBEmpty.pbobjc.m"
-#import "GPBFieldMask.pbobjc.m"
-#import "GPBSourceContext.pbobjc.m"
-#import "GPBStruct.pbobjc.m"
-#import "GPBTimestamp.pbobjc.m"
-#import "GPBType.pbobjc.m"
-#import "GPBWrappers.pbobjc.m"
diff --git a/libs/protobuf/objectivec/GPBProtocolBuffers_RuntimeSupport.h b/libs/protobuf/objectivec/GPBProtocolBuffers_RuntimeSupport.h
deleted file mode 100644
index 04dde62..0000000
--- a/libs/protobuf/objectivec/GPBProtocolBuffers_RuntimeSupport.h
+++ /dev/null
@@ -1,40 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// This header is meant to only be used by the generated source, it should not
-// be included in code using protocol buffers.
-
-#import "GPBBootstrap.h"
-
-#import "GPBDescriptor_PackagePrivate.h"
-#import "GPBExtensionInternals.h"
-#import "GPBMessage_PackagePrivate.h"
-#import "GPBRootObject_PackagePrivate.h"
-#import "GPBUtilities_PackagePrivate.h"
diff --git a/libs/protobuf/objectivec/GPBRootObject.h b/libs/protobuf/objectivec/GPBRootObject.h
deleted file mode 100644
index d2e2aeb..0000000
--- a/libs/protobuf/objectivec/GPBRootObject.h
+++ /dev/null
@@ -1,52 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#import <Foundation/Foundation.h>
-
-@class GPBExtensionRegistry;
-
-NS_ASSUME_NONNULL_BEGIN
-
-/**
- * Every generated proto file defines a local "Root" class that exposes a
- * GPBExtensionRegistry for all the extensions defined by that file and
- * the files it depends on.
- **/
-@interface GPBRootObject : NSObject
-
-/**
- * @return An extension registry for the given file and all the files it depends
- * on.
- **/
-+ (GPBExtensionRegistry *)extensionRegistry;
-
-@end
-
-NS_ASSUME_NONNULL_END
diff --git a/libs/protobuf/objectivec/GPBRootObject.m b/libs/protobuf/objectivec/GPBRootObject.m
deleted file mode 100644
index bad2f9a..0000000
--- a/libs/protobuf/objectivec/GPBRootObject.m
+++ /dev/null
@@ -1,245 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#import "GPBRootObject_PackagePrivate.h"
-
-#import <objc/runtime.h>
-
-#import <CoreFoundation/CoreFoundation.h>
-
-#import "GPBDescriptor.h"
-#import "GPBExtensionRegistry.h"
-#import "GPBUtilities_PackagePrivate.h"
-
-@interface GPBExtensionDescriptor (GPBRootObject)
-// Get singletonName as a c string.
-- (const char *)singletonNameC;
-@end
-
-// We need some object to conform to the MessageSignatureProtocol to make sure
-// the selectors in it are recorded in our Objective C runtime information.
-// GPBMessage is arguably the more "obvious" choice, but given that all messages
-// inherit from GPBMessage, conflicts seem likely, so we are using GPBRootObject
-// instead.
-@interface GPBRootObject () <GPBMessageSignatureProtocol>
-@end
-
-@implementation GPBRootObject
-
-// Taken from http://www.burtleburtle.net/bob/hash/doobs.html
-// Public Domain
-static uint32_t jenkins_one_at_a_time_hash(const char *key) {
-  uint32_t hash = 0;
-  for (uint32_t i = 0; key[i] != '\0'; ++i) {
-    hash += key[i];
-    hash += (hash << 10);
-    hash ^= (hash >> 6);
-  }
-  hash += (hash << 3);
-  hash ^= (hash >> 11);
-  hash += (hash << 15);
-  return hash;
-}
-
-// Key methods for our custom CFDictionary.
-// Note that the dictionary lasts for the lifetime of our app, so no need
-// to worry about deallocation. All of the items are added to it at
-// startup, and so the keys don't need to be retained/released.
-// Keys are NULL terminated char *.
-static const void *GPBRootExtensionKeyRetain(CFAllocatorRef allocator,
-                                             const void *value) {
-#pragma unused(allocator)
-  return value;
-}
-
-static void GPBRootExtensionKeyRelease(CFAllocatorRef allocator,
-                                       const void *value) {
-#pragma unused(allocator)
-#pragma unused(value)
-}
-
-static CFStringRef GPBRootExtensionCopyKeyDescription(const void *value) {
-  const char *key = (const char *)value;
-  return CFStringCreateWithCString(kCFAllocatorDefault, key,
-                                   kCFStringEncodingUTF8);
-}
-
-static Boolean GPBRootExtensionKeyEqual(const void *value1,
-                                        const void *value2) {
-  const char *key1 = (const char *)value1;
-  const char *key2 = (const char *)value2;
-  return strcmp(key1, key2) == 0;
-}
-
-static CFHashCode GPBRootExtensionKeyHash(const void *value) {
-  const char *key = (const char *)value;
-  return jenkins_one_at_a_time_hash(key);
-}
-
-// NOTE: OSSpinLock may seem like a good fit here but Apple engineers have
-// pointed out that they are vulnerable to live locking on iOS in cases of
-// priority inversion:
-//   http://mjtsai.com/blog/2015/12/16/osspinlock-is-unsafe/
-//   https://lists.swift.org/pipermail/swift-dev/Week-of-Mon-20151214/000372.html
-static dispatch_semaphore_t gExtensionSingletonDictionarySemaphore;
-static CFMutableDictionaryRef gExtensionSingletonDictionary = NULL;
-static GPBExtensionRegistry *gDefaultExtensionRegistry = NULL;
-
-+ (void)initialize {
-  // Ensure the global is started up.
-  if (!gExtensionSingletonDictionary) {
-    gExtensionSingletonDictionarySemaphore = dispatch_semaphore_create(1);
-    CFDictionaryKeyCallBacks keyCallBacks = {
-      // See description above for reason for using custom dictionary.
-      0,
-      GPBRootExtensionKeyRetain,
-      GPBRootExtensionKeyRelease,
-      GPBRootExtensionCopyKeyDescription,
-      GPBRootExtensionKeyEqual,
-      GPBRootExtensionKeyHash,
-    };
-    gExtensionSingletonDictionary =
-        CFDictionaryCreateMutable(kCFAllocatorDefault, 0, &keyCallBacks,
-                                  &kCFTypeDictionaryValueCallBacks);
-    gDefaultExtensionRegistry = [[GPBExtensionRegistry alloc] init];
-  }
-
-  if ([self superclass] == [GPBRootObject class]) {
-    // This is here to start up all the per file "Root" subclasses.
-    // This must be done in initialize to enforce thread safety of start up of
-    // the protocol buffer library.
-    [self extensionRegistry];
-  }
-}
-
-+ (GPBExtensionRegistry *)extensionRegistry {
-  // Is overridden in all the subclasses that provide extensions to provide the
-  // per class one.
-  return gDefaultExtensionRegistry;
-}
-
-+ (void)globallyRegisterExtension:(GPBExtensionDescriptor *)field {
-  const char *key = [field singletonNameC];
-  dispatch_semaphore_wait(gExtensionSingletonDictionarySemaphore,
-                          DISPATCH_TIME_FOREVER);
-  CFDictionarySetValue(gExtensionSingletonDictionary, key, field);
-  dispatch_semaphore_signal(gExtensionSingletonDictionarySemaphore);
-}
-
-static id ExtensionForName(id self, SEL _cmd) {
-  // Really fast way of doing "classname_selName".
-  // This came up as a hotspot (creation of NSString *) when accessing a
-  // lot of extensions.
-  const char *selName = sel_getName(_cmd);
-  if (selName[0] == '_') {
-    return nil;  // Apple internal selector.
-  }
-  size_t selNameLen = 0;
-  while (1) {
-    char c = selName[selNameLen];
-    if (c == '\0') {  // String end.
-      break;
-    }
-    if (c == ':') {
-      return nil;  // Selector took an arg, not one of the runtime methods.
-    }
-    ++selNameLen;
-  }
-
-  const char *className = class_getName(self);
-  size_t classNameLen = strlen(className);
-  char key[classNameLen + selNameLen + 2];
-  memcpy(key, className, classNameLen);
-  key[classNameLen] = '_';
-  memcpy(&key[classNameLen + 1], selName, selNameLen);
-  key[classNameLen + 1 + selNameLen] = '\0';
-
-  // NOTE: Even though this method is called from another C function,
-  // gExtensionSingletonDictionarySemaphore and gExtensionSingletonDictionary
-  // will always be initialized. This is because this call flow is just to
-  // lookup the Extension, meaning the code is calling an Extension class
-  // message on a Message or Root class. This guarantees that the class was
-  // initialized and Message classes ensure their Root was also initialized.
-  NSAssert(gExtensionSingletonDictionary, @"Startup order broken!");
-
-  dispatch_semaphore_wait(gExtensionSingletonDictionarySemaphore,
-                          DISPATCH_TIME_FOREVER);
-  id extension = (id)CFDictionaryGetValue(gExtensionSingletonDictionary, key);
-  // We can't remove the key from the dictionary here (as an optimization),
-  // two threads could have gone into +resolveClassMethod: for the same method,
-  // and ended up here; there's no way to ensure both return YES without letting
-  // both try to wire in the method.
-  dispatch_semaphore_signal(gExtensionSingletonDictionarySemaphore);
-  return extension;
-}
-
-BOOL GPBResolveExtensionClassMethod(Class self, SEL sel) {
-  // Another option would be to register the extensions with the class at
-  // globallyRegisterExtension:
-  // Timing the two solutions, this solution turned out to be much faster
-  // and reduced startup time, and runtime memory.
-  // The advantage to globallyRegisterExtension is that it would reduce the
-  // size of the protos somewhat because the singletonNameC wouldn't need
-  // to include the class name. For a class with a lot of extensions it
-  // can add up. You could also significantly reduce the code complexity of this
-  // file.
-  id extension = ExtensionForName(self, sel);
-  if (extension != nil) {
-    const char *encoding =
-        GPBMessageEncodingForSelector(@selector(getClassValue), NO);
-    Class metaClass = objc_getMetaClass(class_getName(self));
-    IMP imp = imp_implementationWithBlock(^(id obj) {
-#pragma unused(obj)
-      return extension;
-    });
-    BOOL methodAdded = class_addMethod(metaClass, sel, imp, encoding);
-    // class_addMethod() is documented as also failing if the method was already
-    // added; so we check if the method is already there and return success so
-    // the method dispatch will still happen.  Why would it already be added?
-    // Two threads could cause the same method to be bound at the same time,
-    // but only one will actually bind it; the other still needs to return true
-    // so things will dispatch.
-    if (!methodAdded) {
-      methodAdded = GPBClassHasSel(metaClass, sel);
-    }
-    return methodAdded;
-  }
-  return NO;
-}
-
-
-+ (BOOL)resolveClassMethod:(SEL)sel {
-  if (GPBResolveExtensionClassMethod(self, sel)) {
-    return YES;
-  }
-  return [super resolveClassMethod:sel];
-}
-
-@end
diff --git a/libs/protobuf/objectivec/GPBRootObject_PackagePrivate.h b/libs/protobuf/objectivec/GPBRootObject_PackagePrivate.h
deleted file mode 100644
index 3c8f09c..0000000
--- a/libs/protobuf/objectivec/GPBRootObject_PackagePrivate.h
+++ /dev/null
@@ -1,46 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#import <Foundation/Foundation.h>
-
-#import "GPBRootObject.h"
-
-@class GPBExtensionDescriptor;
-
-@interface GPBRootObject ()
-
-// Globally register.
-+ (void)globallyRegisterExtension:(GPBExtensionDescriptor *)field;
-
-@end
-
-// Returns YES if the selector was resolved and added to the class,
-// NO otherwise.
-BOOL GPBResolveExtensionClassMethod(Class self, SEL sel);
diff --git a/libs/protobuf/objectivec/GPBRuntimeTypes.h b/libs/protobuf/objectivec/GPBRuntimeTypes.h
deleted file mode 100644
index 9c1083a..0000000
--- a/libs/protobuf/objectivec/GPBRuntimeTypes.h
+++ /dev/null
@@ -1,151 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#import <Foundation/Foundation.h>
-
-#import "GPBBootstrap.h"
-
-@class GPBEnumDescriptor;
-@class GPBMessage;
-@class GPBInt32Array;
-
-/**
- * Verifies that a given value can be represented by an enum type.
- * */
-typedef BOOL (*GPBEnumValidationFunc)(int32_t);
-
-/**
- * Fetches an EnumDescriptor.
- * */
-typedef GPBEnumDescriptor *(*GPBEnumDescriptorFunc)(void);
-
-/**
- * Magic value used at runtime to indicate an enum value that wasn't know at
- * compile time.
- * */
-enum {
-  kGPBUnrecognizedEnumeratorValue = (int32_t)0xFBADBEEF,
-};
-
-/**
- * A union for storing all possible Protobuf values. Note that owner is
- * responsible for memory management of object types.
- * */
-typedef union {
-  BOOL valueBool;
-  int32_t valueInt32;
-  int64_t valueInt64;
-  uint32_t valueUInt32;
-  uint64_t valueUInt64;
-  float valueFloat;
-  double valueDouble;
-  GPB_UNSAFE_UNRETAINED NSData *valueData;
-  GPB_UNSAFE_UNRETAINED NSString *valueString;
-  GPB_UNSAFE_UNRETAINED GPBMessage *valueMessage;
-  int32_t valueEnum;
-} GPBGenericValue;
-
-/**
- * Enum listing the possible data types that a field can contain.
- *
- * @note Do not change the order of this enum (or add things to it) without
- *       thinking about it very carefully. There are several things that depend
- *       on the order.
- * */
-typedef NS_ENUM(uint8_t, GPBDataType) {
-  /** Field contains boolean value(s). */
-  GPBDataTypeBool = 0,
-  /** Field contains unsigned 4 byte value(s). */
-  GPBDataTypeFixed32,
-  /** Field contains signed 4 byte value(s). */
-  GPBDataTypeSFixed32,
-  /** Field contains float value(s). */
-  GPBDataTypeFloat,
-  /** Field contains unsigned 8 byte value(s). */
-  GPBDataTypeFixed64,
-  /** Field contains signed 8 byte value(s). */
-  GPBDataTypeSFixed64,
-  /** Field contains double value(s). */
-  GPBDataTypeDouble,
-  /**
-   * Field contains variable length value(s). Inefficient for encoding negative
-   * numbers – if your field is likely to have negative values, use
-   * GPBDataTypeSInt32 instead.
-   **/
-  GPBDataTypeInt32,
-  /**
-   * Field contains variable length value(s). Inefficient for encoding negative
-   * numbers – if your field is likely to have negative values, use
-   * GPBDataTypeSInt64 instead.
-   **/
-  GPBDataTypeInt64,
-  /** Field contains signed variable length integer value(s). */
-  GPBDataTypeSInt32,
-  /** Field contains signed variable length integer value(s). */
-  GPBDataTypeSInt64,
-  /** Field contains unsigned variable length integer value(s). */
-  GPBDataTypeUInt32,
-  /** Field contains unsigned variable length integer value(s). */
-  GPBDataTypeUInt64,
-  /** Field contains an arbitrary sequence of bytes. */
-  GPBDataTypeBytes,
-  /** Field contains UTF-8 encoded or 7-bit ASCII text. */
-  GPBDataTypeString,
-  /** Field contains message type(s). */
-  GPBDataTypeMessage,
-  /** Field contains message type(s). */
-  GPBDataTypeGroup,
-  /** Field contains enum value(s). */
-  GPBDataTypeEnum,
-};
-
-enum {
-  /**
-   * A count of the number of types in GPBDataType. Separated out from the
-   * GPBDataType enum to avoid warnings regarding not handling GPBDataType_Count
-   * in switch statements.
-   **/
-  GPBDataType_Count = GPBDataTypeEnum + 1
-};
-
-/** An extension range. */
-typedef struct GPBExtensionRange {
-  /** Inclusive. */
-  uint32_t start;
-  /** Exclusive. */
-  uint32_t end;
-} GPBExtensionRange;
-
-/**
- A type to represent an Objective C class.
- This is actually an `objc_class` but the runtime headers will not allow us to
- reference `objc_class`, so we have defined our own.
-*/
-typedef struct GPBObjcClass_t GPBObjcClass_t;
diff --git a/libs/protobuf/objectivec/GPBSourceContext.pbobjc.h b/libs/protobuf/objectivec/GPBSourceContext.pbobjc.h
deleted file mode 100644
index b17fec0..0000000
--- a/libs/protobuf/objectivec/GPBSourceContext.pbobjc.h
+++ /dev/null
@@ -1,65 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/protobuf/source_context.proto
-
-#import "GPBDescriptor.h"
-#import "GPBMessage.h"
-#import "GPBRootObject.h"
-
-#if GOOGLE_PROTOBUF_OBJC_VERSION < 30004
-#error This file was generated by a newer version of protoc which is incompatible with your Protocol Buffer library sources.
-#endif
-#if 30004 < GOOGLE_PROTOBUF_OBJC_MIN_SUPPORTED_VERSION
-#error This file was generated by an older version of protoc which is incompatible with your Protocol Buffer library sources.
-#endif
-
-// @@protoc_insertion_point(imports)
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-
-CF_EXTERN_C_BEGIN
-
-NS_ASSUME_NONNULL_BEGIN
-
-#pragma mark - GPBSourceContextRoot
-
-/**
- * Exposes the extension registry for this file.
- *
- * The base class provides:
- * @code
- *   + (GPBExtensionRegistry *)extensionRegistry;
- * @endcode
- * which is a @c GPBExtensionRegistry that includes all the extensions defined by
- * this file and all files that it depends on.
- **/
-GPB_FINAL @interface GPBSourceContextRoot : GPBRootObject
-@end
-
-#pragma mark - GPBSourceContext
-
-typedef GPB_ENUM(GPBSourceContext_FieldNumber) {
-  GPBSourceContext_FieldNumber_FileName = 1,
-};
-
-/**
- * `SourceContext` represents information about the source of a
- * protobuf element, like the file in which it is defined.
- **/
-GPB_FINAL @interface GPBSourceContext : GPBMessage
-
-/**
- * The path-qualified name of the .proto file that contained the associated
- * protobuf element.  For example: `"google/protobuf/source_context.proto"`.
- **/
-@property(nonatomic, readwrite, copy, null_resettable) NSString *fileName;
-
-@end
-
-NS_ASSUME_NONNULL_END
-
-CF_EXTERN_C_END
-
-#pragma clang diagnostic pop
-
-// @@protoc_insertion_point(global_scope)
diff --git a/libs/protobuf/objectivec/GPBSourceContext.pbobjc.m b/libs/protobuf/objectivec/GPBSourceContext.pbobjc.m
deleted file mode 100644
index 376d442..0000000
--- a/libs/protobuf/objectivec/GPBSourceContext.pbobjc.m
+++ /dev/null
@@ -1,84 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/protobuf/source_context.proto
-
-#import "GPBProtocolBuffers_RuntimeSupport.h"
-#import "GPBSourceContext.pbobjc.h"
-
-// @@protoc_insertion_point(imports)
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-
-#pragma mark - GPBSourceContextRoot
-
-@implementation GPBSourceContextRoot
-
-// No extensions in the file and no imports, so no need to generate
-// +extensionRegistry.
-
-@end
-
-#pragma mark - GPBSourceContextRoot_FileDescriptor
-
-static GPBFileDescriptor *GPBSourceContextRoot_FileDescriptor(void) {
-  // This is called by +initialize so there is no need to worry
-  // about thread safety of the singleton.
-  static GPBFileDescriptor *descriptor = NULL;
-  if (!descriptor) {
-    GPB_DEBUG_CHECK_RUNTIME_VERSIONS();
-    descriptor = [[GPBFileDescriptor alloc] initWithPackage:@"google.protobuf"
-                                                 objcPrefix:@"GPB"
-                                                     syntax:GPBFileSyntaxProto3];
-  }
-  return descriptor;
-}
-
-#pragma mark - GPBSourceContext
-
-@implementation GPBSourceContext
-
-@dynamic fileName;
-
-typedef struct GPBSourceContext__storage_ {
-  uint32_t _has_storage_[1];
-  NSString *fileName;
-} GPBSourceContext__storage_;
-
-// This method is threadsafe because it is initially called
-// in +initialize for each subclass.
-+ (GPBDescriptor *)descriptor {
-  static GPBDescriptor *descriptor = nil;
-  if (!descriptor) {
-    static GPBMessageFieldDescription fields[] = {
-      {
-        .name = "fileName",
-        .dataTypeSpecific.clazz = Nil,
-        .number = GPBSourceContext_FieldNumber_FileName,
-        .hasIndex = 0,
-        .offset = (uint32_t)offsetof(GPBSourceContext__storage_, fileName),
-        .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldClearHasIvarOnZero),
-        .dataType = GPBDataTypeString,
-      },
-    };
-    GPBDescriptor *localDescriptor =
-        [GPBDescriptor allocDescriptorForClass:[GPBSourceContext class]
-                                     rootClass:[GPBSourceContextRoot class]
-                                          file:GPBSourceContextRoot_FileDescriptor()
-                                        fields:fields
-                                    fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
-                                   storageSize:sizeof(GPBSourceContext__storage_)
-                                         flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown)];
-    #if defined(DEBUG) && DEBUG
-      NSAssert(descriptor == nil, @"Startup recursed!");
-    #endif  // DEBUG
-    descriptor = localDescriptor;
-  }
-  return descriptor;
-}
-
-@end
-
-
-#pragma clang diagnostic pop
-
-// @@protoc_insertion_point(global_scope)
diff --git a/libs/protobuf/objectivec/GPBStruct.pbobjc.h b/libs/protobuf/objectivec/GPBStruct.pbobjc.h
deleted file mode 100644
index dd6ab28..0000000
--- a/libs/protobuf/objectivec/GPBStruct.pbobjc.h
+++ /dev/null
@@ -1,192 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/protobuf/struct.proto
-
-#import "GPBDescriptor.h"
-#import "GPBMessage.h"
-#import "GPBRootObject.h"
-
-#if GOOGLE_PROTOBUF_OBJC_VERSION < 30004
-#error This file was generated by a newer version of protoc which is incompatible with your Protocol Buffer library sources.
-#endif
-#if 30004 < GOOGLE_PROTOBUF_OBJC_MIN_SUPPORTED_VERSION
-#error This file was generated by an older version of protoc which is incompatible with your Protocol Buffer library sources.
-#endif
-
-// @@protoc_insertion_point(imports)
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-
-CF_EXTERN_C_BEGIN
-
-@class GPBListValue;
-@class GPBStruct;
-@class GPBValue;
-
-NS_ASSUME_NONNULL_BEGIN
-
-#pragma mark - Enum GPBNullValue
-
-/**
- * `NullValue` is a singleton enumeration to represent the null value for the
- * `Value` type union.
- *
- *  The JSON representation for `NullValue` is JSON `null`.
- **/
-typedef GPB_ENUM(GPBNullValue) {
-  /**
-   * Value used if any message's field encounters a value that is not defined
-   * by this enum. The message will also have C functions to get/set the rawValue
-   * of the field.
-   **/
-  GPBNullValue_GPBUnrecognizedEnumeratorValue = kGPBUnrecognizedEnumeratorValue,
-  /** Null value. */
-  GPBNullValue_NullValue = 0,
-};
-
-GPBEnumDescriptor *GPBNullValue_EnumDescriptor(void);
-
-/**
- * Checks to see if the given value is defined by the enum or was not known at
- * the time this source was generated.
- **/
-BOOL GPBNullValue_IsValidValue(int32_t value);
-
-#pragma mark - GPBStructRoot
-
-/**
- * Exposes the extension registry for this file.
- *
- * The base class provides:
- * @code
- *   + (GPBExtensionRegistry *)extensionRegistry;
- * @endcode
- * which is a @c GPBExtensionRegistry that includes all the extensions defined by
- * this file and all files that it depends on.
- **/
-GPB_FINAL @interface GPBStructRoot : GPBRootObject
-@end
-
-#pragma mark - GPBStruct
-
-typedef GPB_ENUM(GPBStruct_FieldNumber) {
-  GPBStruct_FieldNumber_Fields = 1,
-};
-
-/**
- * `Struct` represents a structured data value, consisting of fields
- * which map to dynamically typed values. In some languages, `Struct`
- * might be supported by a native representation. For example, in
- * scripting languages like JS a struct is represented as an
- * object. The details of that representation are described together
- * with the proto support for the language.
- *
- * The JSON representation for `Struct` is JSON object.
- **/
-GPB_FINAL @interface GPBStruct : GPBMessage
-
-/** Unordered map of dynamically typed values. */
-@property(nonatomic, readwrite, strong, null_resettable) NSMutableDictionary<NSString*, GPBValue*> *fields;
-/** The number of items in @c fields without causing the array to be created. */
-@property(nonatomic, readonly) NSUInteger fields_Count;
-
-@end
-
-#pragma mark - GPBValue
-
-typedef GPB_ENUM(GPBValue_FieldNumber) {
-  GPBValue_FieldNumber_NullValue = 1,
-  GPBValue_FieldNumber_NumberValue = 2,
-  GPBValue_FieldNumber_StringValue = 3,
-  GPBValue_FieldNumber_BoolValue = 4,
-  GPBValue_FieldNumber_StructValue = 5,
-  GPBValue_FieldNumber_ListValue = 6,
-};
-
-typedef GPB_ENUM(GPBValue_Kind_OneOfCase) {
-  GPBValue_Kind_OneOfCase_GPBUnsetOneOfCase = 0,
-  GPBValue_Kind_OneOfCase_NullValue = 1,
-  GPBValue_Kind_OneOfCase_NumberValue = 2,
-  GPBValue_Kind_OneOfCase_StringValue = 3,
-  GPBValue_Kind_OneOfCase_BoolValue = 4,
-  GPBValue_Kind_OneOfCase_StructValue = 5,
-  GPBValue_Kind_OneOfCase_ListValue = 6,
-};
-
-/**
- * `Value` represents a dynamically typed value which can be either
- * null, a number, a string, a boolean, a recursive struct value, or a
- * list of values. A producer of value is expected to set one of these
- * variants. Absence of any variant indicates an error.
- *
- * The JSON representation for `Value` is JSON value.
- **/
-GPB_FINAL @interface GPBValue : GPBMessage
-
-/** The kind of value. */
-@property(nonatomic, readonly) GPBValue_Kind_OneOfCase kindOneOfCase;
-
-/** Represents a null value. */
-@property(nonatomic, readwrite) GPBNullValue nullValue;
-
-/** Represents a double value. */
-@property(nonatomic, readwrite) double numberValue;
-
-/** Represents a string value. */
-@property(nonatomic, readwrite, copy, null_resettable) NSString *stringValue;
-
-/** Represents a boolean value. */
-@property(nonatomic, readwrite) BOOL boolValue;
-
-/** Represents a structured value. */
-@property(nonatomic, readwrite, strong, null_resettable) GPBStruct *structValue;
-
-/** Represents a repeated `Value`. */
-@property(nonatomic, readwrite, strong, null_resettable) GPBListValue *listValue;
-
-@end
-
-/**
- * Fetches the raw value of a @c GPBValue's @c nullValue property, even
- * if the value was not defined by the enum at the time the code was generated.
- **/
-int32_t GPBValue_NullValue_RawValue(GPBValue *message);
-/**
- * Sets the raw value of an @c GPBValue's @c nullValue property, allowing
- * it to be set to a value that was not defined by the enum at the time the code
- * was generated.
- **/
-void SetGPBValue_NullValue_RawValue(GPBValue *message, int32_t value);
-
-/**
- * Clears whatever value was set for the oneof 'kind'.
- **/
-void GPBValue_ClearKindOneOfCase(GPBValue *message);
-
-#pragma mark - GPBListValue
-
-typedef GPB_ENUM(GPBListValue_FieldNumber) {
-  GPBListValue_FieldNumber_ValuesArray = 1,
-};
-
-/**
- * `ListValue` is a wrapper around a repeated field of values.
- *
- * The JSON representation for `ListValue` is JSON array.
- **/
-GPB_FINAL @interface GPBListValue : GPBMessage
-
-/** Repeated field of dynamically typed values. */
-@property(nonatomic, readwrite, strong, null_resettable) NSMutableArray<GPBValue*> *valuesArray;
-/** The number of items in @c valuesArray without causing the array to be created. */
-@property(nonatomic, readonly) NSUInteger valuesArray_Count;
-
-@end
-
-NS_ASSUME_NONNULL_END
-
-CF_EXTERN_C_END
-
-#pragma clang diagnostic pop
-
-// @@protoc_insertion_point(global_scope)
diff --git a/libs/protobuf/objectivec/GPBStruct.pbobjc.m b/libs/protobuf/objectivec/GPBStruct.pbobjc.m
deleted file mode 100644
index 726cfb8..0000000
--- a/libs/protobuf/objectivec/GPBStruct.pbobjc.m
+++ /dev/null
@@ -1,297 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/protobuf/struct.proto
-
-#import "GPBProtocolBuffers_RuntimeSupport.h"
-#import "GPBStruct.pbobjc.h"
-
-#import <stdatomic.h>
-
-// @@protoc_insertion_point(imports)
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-#pragma clang diagnostic ignored "-Wdirect-ivar-access"
-#pragma clang diagnostic ignored "-Wdollar-in-identifier-extension"
-
-#pragma mark - Objective C Class declarations
-// Forward declarations of Objective C classes that we can use as
-// static values in struct initializers.
-// We don't use [Foo class] because it is not a static value.
-GPBObjCClassDeclaration(GPBListValue);
-GPBObjCClassDeclaration(GPBStruct);
-GPBObjCClassDeclaration(GPBValue);
-
-#pragma mark - GPBStructRoot
-
-@implementation GPBStructRoot
-
-// No extensions in the file and no imports, so no need to generate
-// +extensionRegistry.
-
-@end
-
-#pragma mark - GPBStructRoot_FileDescriptor
-
-static GPBFileDescriptor *GPBStructRoot_FileDescriptor(void) {
-  // This is called by +initialize so there is no need to worry
-  // about thread safety of the singleton.
-  static GPBFileDescriptor *descriptor = NULL;
-  if (!descriptor) {
-    GPB_DEBUG_CHECK_RUNTIME_VERSIONS();
-    descriptor = [[GPBFileDescriptor alloc] initWithPackage:@"google.protobuf"
-                                                 objcPrefix:@"GPB"
-                                                     syntax:GPBFileSyntaxProto3];
-  }
-  return descriptor;
-}
-
-#pragma mark - Enum GPBNullValue
-
-GPBEnumDescriptor *GPBNullValue_EnumDescriptor(void) {
-  static _Atomic(GPBEnumDescriptor*) descriptor = nil;
-  if (!descriptor) {
-    static const char *valueNames =
-        "NullValue\000";
-    static const int32_t values[] = {
-        GPBNullValue_NullValue,
-    };
-    GPBEnumDescriptor *worker =
-        [GPBEnumDescriptor allocDescriptorForName:GPBNSStringifySymbol(GPBNullValue)
-                                       valueNames:valueNames
-                                           values:values
-                                            count:(uint32_t)(sizeof(values) / sizeof(int32_t))
-                                     enumVerifier:GPBNullValue_IsValidValue];
-    GPBEnumDescriptor *expected = nil;
-    if (!atomic_compare_exchange_strong(&descriptor, &expected, worker)) {
-      [worker release];
-    }
-  }
-  return descriptor;
-}
-
-BOOL GPBNullValue_IsValidValue(int32_t value__) {
-  switch (value__) {
-    case GPBNullValue_NullValue:
-      return YES;
-    default:
-      return NO;
-  }
-}
-
-#pragma mark - GPBStruct
-
-@implementation GPBStruct
-
-@dynamic fields, fields_Count;
-
-typedef struct GPBStruct__storage_ {
-  uint32_t _has_storage_[1];
-  NSMutableDictionary *fields;
-} GPBStruct__storage_;
-
-// This method is threadsafe because it is initially called
-// in +initialize for each subclass.
-+ (GPBDescriptor *)descriptor {
-  static GPBDescriptor *descriptor = nil;
-  if (!descriptor) {
-    static GPBMessageFieldDescription fields[] = {
-      {
-        .name = "fields",
-        .dataTypeSpecific.clazz = GPBObjCClass(GPBValue),
-        .number = GPBStruct_FieldNumber_Fields,
-        .hasIndex = GPBNoHasBit,
-        .offset = (uint32_t)offsetof(GPBStruct__storage_, fields),
-        .flags = GPBFieldMapKeyString,
-        .dataType = GPBDataTypeMessage,
-      },
-    };
-    GPBDescriptor *localDescriptor =
-        [GPBDescriptor allocDescriptorForClass:[GPBStruct class]
-                                     rootClass:[GPBStructRoot class]
-                                          file:GPBStructRoot_FileDescriptor()
-                                        fields:fields
-                                    fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
-                                   storageSize:sizeof(GPBStruct__storage_)
-                                         flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown)];
-    #if defined(DEBUG) && DEBUG
-      NSAssert(descriptor == nil, @"Startup recursed!");
-    #endif  // DEBUG
-    descriptor = localDescriptor;
-  }
-  return descriptor;
-}
-
-@end
-
-#pragma mark - GPBValue
-
-@implementation GPBValue
-
-@dynamic kindOneOfCase;
-@dynamic nullValue;
-@dynamic numberValue;
-@dynamic stringValue;
-@dynamic boolValue;
-@dynamic structValue;
-@dynamic listValue;
-
-typedef struct GPBValue__storage_ {
-  uint32_t _has_storage_[2];
-  GPBNullValue nullValue;
-  NSString *stringValue;
-  GPBStruct *structValue;
-  GPBListValue *listValue;
-  double numberValue;
-} GPBValue__storage_;
-
-// This method is threadsafe because it is initially called
-// in +initialize for each subclass.
-+ (GPBDescriptor *)descriptor {
-  static GPBDescriptor *descriptor = nil;
-  if (!descriptor) {
-    static GPBMessageFieldDescription fields[] = {
-      {
-        .name = "nullValue",
-        .dataTypeSpecific.enumDescFunc = GPBNullValue_EnumDescriptor,
-        .number = GPBValue_FieldNumber_NullValue,
-        .hasIndex = -1,
-        .offset = (uint32_t)offsetof(GPBValue__storage_, nullValue),
-        .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldHasEnumDescriptor),
-        .dataType = GPBDataTypeEnum,
-      },
-      {
-        .name = "numberValue",
-        .dataTypeSpecific.clazz = Nil,
-        .number = GPBValue_FieldNumber_NumberValue,
-        .hasIndex = -1,
-        .offset = (uint32_t)offsetof(GPBValue__storage_, numberValue),
-        .flags = GPBFieldOptional,
-        .dataType = GPBDataTypeDouble,
-      },
-      {
-        .name = "stringValue",
-        .dataTypeSpecific.clazz = Nil,
-        .number = GPBValue_FieldNumber_StringValue,
-        .hasIndex = -1,
-        .offset = (uint32_t)offsetof(GPBValue__storage_, stringValue),
-        .flags = GPBFieldOptional,
-        .dataType = GPBDataTypeString,
-      },
-      {
-        .name = "boolValue",
-        .dataTypeSpecific.clazz = Nil,
-        .number = GPBValue_FieldNumber_BoolValue,
-        .hasIndex = -1,
-        .offset = 0,  // Stored in _has_storage_ to save space.
-        .flags = GPBFieldOptional,
-        .dataType = GPBDataTypeBool,
-      },
-      {
-        .name = "structValue",
-        .dataTypeSpecific.clazz = GPBObjCClass(GPBStruct),
-        .number = GPBValue_FieldNumber_StructValue,
-        .hasIndex = -1,
-        .offset = (uint32_t)offsetof(GPBValue__storage_, structValue),
-        .flags = GPBFieldOptional,
-        .dataType = GPBDataTypeMessage,
-      },
-      {
-        .name = "listValue",
-        .dataTypeSpecific.clazz = GPBObjCClass(GPBListValue),
-        .number = GPBValue_FieldNumber_ListValue,
-        .hasIndex = -1,
-        .offset = (uint32_t)offsetof(GPBValue__storage_, listValue),
-        .flags = GPBFieldOptional,
-        .dataType = GPBDataTypeMessage,
-      },
-    };
-    GPBDescriptor *localDescriptor =
-        [GPBDescriptor allocDescriptorForClass:[GPBValue class]
-                                     rootClass:[GPBStructRoot class]
-                                          file:GPBStructRoot_FileDescriptor()
-                                        fields:fields
-                                    fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
-                                   storageSize:sizeof(GPBValue__storage_)
-                                         flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown)];
-    static const char *oneofs[] = {
-      "kind",
-    };
-    [localDescriptor setupOneofs:oneofs
-                           count:(uint32_t)(sizeof(oneofs) / sizeof(char*))
-                   firstHasIndex:-1];
-    #if defined(DEBUG) && DEBUG
-      NSAssert(descriptor == nil, @"Startup recursed!");
-    #endif  // DEBUG
-    descriptor = localDescriptor;
-  }
-  return descriptor;
-}
-
-@end
-
-int32_t GPBValue_NullValue_RawValue(GPBValue *message) {
-  GPBDescriptor *descriptor = [GPBValue descriptor];
-  GPBFieldDescriptor *field = [descriptor fieldWithNumber:GPBValue_FieldNumber_NullValue];
-  return GPBGetMessageRawEnumField(message, field);
-}
-
-void SetGPBValue_NullValue_RawValue(GPBValue *message, int32_t value) {
-  GPBDescriptor *descriptor = [GPBValue descriptor];
-  GPBFieldDescriptor *field = [descriptor fieldWithNumber:GPBValue_FieldNumber_NullValue];
-  GPBSetMessageRawEnumField(message, field, value);
-}
-
-void GPBValue_ClearKindOneOfCase(GPBValue *message) {
-  GPBDescriptor *descriptor = [GPBValue descriptor];
-  GPBOneofDescriptor *oneof = [descriptor.oneofs objectAtIndex:0];
-  GPBClearOneof(message, oneof);
-}
-#pragma mark - GPBListValue
-
-@implementation GPBListValue
-
-@dynamic valuesArray, valuesArray_Count;
-
-typedef struct GPBListValue__storage_ {
-  uint32_t _has_storage_[1];
-  NSMutableArray *valuesArray;
-} GPBListValue__storage_;
-
-// This method is threadsafe because it is initially called
-// in +initialize for each subclass.
-+ (GPBDescriptor *)descriptor {
-  static GPBDescriptor *descriptor = nil;
-  if (!descriptor) {
-    static GPBMessageFieldDescription fields[] = {
-      {
-        .name = "valuesArray",
-        .dataTypeSpecific.clazz = GPBObjCClass(GPBValue),
-        .number = GPBListValue_FieldNumber_ValuesArray,
-        .hasIndex = GPBNoHasBit,
-        .offset = (uint32_t)offsetof(GPBListValue__storage_, valuesArray),
-        .flags = GPBFieldRepeated,
-        .dataType = GPBDataTypeMessage,
-      },
-    };
-    GPBDescriptor *localDescriptor =
-        [GPBDescriptor allocDescriptorForClass:[GPBListValue class]
-                                     rootClass:[GPBStructRoot class]
-                                          file:GPBStructRoot_FileDescriptor()
-                                        fields:fields
-                                    fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
-                                   storageSize:sizeof(GPBListValue__storage_)
-                                         flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown)];
-    #if defined(DEBUG) && DEBUG
-      NSAssert(descriptor == nil, @"Startup recursed!");
-    #endif  // DEBUG
-    descriptor = localDescriptor;
-  }
-  return descriptor;
-}
-
-@end
-
-
-#pragma clang diagnostic pop
-
-// @@protoc_insertion_point(global_scope)
diff --git a/libs/protobuf/objectivec/GPBTimestamp.pbobjc.h b/libs/protobuf/objectivec/GPBTimestamp.pbobjc.h
deleted file mode 100644
index 8203383..0000000
--- a/libs/protobuf/objectivec/GPBTimestamp.pbobjc.h
+++ /dev/null
@@ -1,164 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/protobuf/timestamp.proto
-
-#import "GPBDescriptor.h"
-#import "GPBMessage.h"
-#import "GPBRootObject.h"
-
-#if GOOGLE_PROTOBUF_OBJC_VERSION < 30004
-#error This file was generated by a newer version of protoc which is incompatible with your Protocol Buffer library sources.
-#endif
-#if 30004 < GOOGLE_PROTOBUF_OBJC_MIN_SUPPORTED_VERSION
-#error This file was generated by an older version of protoc which is incompatible with your Protocol Buffer library sources.
-#endif
-
-// @@protoc_insertion_point(imports)
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-
-CF_EXTERN_C_BEGIN
-
-NS_ASSUME_NONNULL_BEGIN
-
-#pragma mark - GPBTimestampRoot
-
-/**
- * Exposes the extension registry for this file.
- *
- * The base class provides:
- * @code
- *   + (GPBExtensionRegistry *)extensionRegistry;
- * @endcode
- * which is a @c GPBExtensionRegistry that includes all the extensions defined by
- * this file and all files that it depends on.
- **/
-GPB_FINAL @interface GPBTimestampRoot : GPBRootObject
-@end
-
-#pragma mark - GPBTimestamp
-
-typedef GPB_ENUM(GPBTimestamp_FieldNumber) {
-  GPBTimestamp_FieldNumber_Seconds = 1,
-  GPBTimestamp_FieldNumber_Nanos = 2,
-};
-
-/**
- * A Timestamp represents a point in time independent of any time zone or local
- * calendar, encoded as a count of seconds and fractions of seconds at
- * nanosecond resolution. The count is relative to an epoch at UTC midnight on
- * January 1, 1970, in the proleptic Gregorian calendar which extends the
- * Gregorian calendar backwards to year one.
- *
- * All minutes are 60 seconds long. Leap seconds are "smeared" so that no leap
- * second table is needed for interpretation, using a [24-hour linear
- * smear](https://developers.google.com/time/smear).
- *
- * The range is from 0001-01-01T00:00:00Z to 9999-12-31T23:59:59.999999999Z. By
- * restricting to that range, we ensure that we can convert to and from [RFC
- * 3339](https://www.ietf.org/rfc/rfc3339.txt) date strings.
- *
- * # Examples
- *
- * Example 1: Compute Timestamp from POSIX `time()`.
- *
- *     Timestamp timestamp;
- *     timestamp.set_seconds(time(NULL));
- *     timestamp.set_nanos(0);
- *
- * Example 2: Compute Timestamp from POSIX `gettimeofday()`.
- *
- *     struct timeval tv;
- *     gettimeofday(&tv, NULL);
- *
- *     Timestamp timestamp;
- *     timestamp.set_seconds(tv.tv_sec);
- *     timestamp.set_nanos(tv.tv_usec * 1000);
- *
- * Example 3: Compute Timestamp from Win32 `GetSystemTimeAsFileTime()`.
- *
- *     FILETIME ft;
- *     GetSystemTimeAsFileTime(&ft);
- *     UINT64 ticks = (((UINT64)ft.dwHighDateTime) << 32) | ft.dwLowDateTime;
- *
- *     // A Windows tick is 100 nanoseconds. Windows epoch 1601-01-01T00:00:00Z
- *     // is 11644473600 seconds before Unix epoch 1970-01-01T00:00:00Z.
- *     Timestamp timestamp;
- *     timestamp.set_seconds((INT64) ((ticks / 10000000) - 11644473600LL));
- *     timestamp.set_nanos((INT32) ((ticks % 10000000) * 100));
- *
- * Example 4: Compute Timestamp from Java `System.currentTimeMillis()`.
- *
- *     long millis = System.currentTimeMillis();
- *
- *     Timestamp timestamp = Timestamp.newBuilder().setSeconds(millis / 1000)
- *         .setNanos((int) ((millis % 1000) * 1000000)).build();
- *
- *
- * Example 5: Compute Timestamp from Java `Instant.now()`.
- *
- *     Instant now = Instant.now();
- *
- *     Timestamp timestamp =
- *         Timestamp.newBuilder().setSeconds(now.getEpochSecond())
- *             .setNanos(now.getNano()).build();
- *
- *
- * Example 6: Compute Timestamp from current time in Python.
- *
- *     timestamp = Timestamp()
- *     timestamp.GetCurrentTime()
- *
- * # JSON Mapping
- *
- * In JSON format, the Timestamp type is encoded as a string in the
- * [RFC 3339](https://www.ietf.org/rfc/rfc3339.txt) format. That is, the
- * format is "{year}-{month}-{day}T{hour}:{min}:{sec}[.{frac_sec}]Z"
- * where {year} is always expressed using four digits while {month}, {day},
- * {hour}, {min}, and {sec} are zero-padded to two digits each. The fractional
- * seconds, which can go up to 9 digits (i.e. up to 1 nanosecond resolution),
- * are optional. The "Z" suffix indicates the timezone ("UTC"); the timezone
- * is required. A proto3 JSON serializer should always use UTC (as indicated by
- * "Z") when printing the Timestamp type and a proto3 JSON parser should be
- * able to accept both UTC and other timezones (as indicated by an offset).
- *
- * For example, "2017-01-15T01:30:15.01Z" encodes 15.01 seconds past
- * 01:30 UTC on January 15, 2017.
- *
- * In JavaScript, one can convert a Date object to this format using the
- * standard
- * [toISOString()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/toISOString)
- * method. In Python, a standard `datetime.datetime` object can be converted
- * to this format using
- * [`strftime`](https://docs.python.org/2/library/time.html#time.strftime) with
- * the time format spec '%Y-%m-%dT%H:%M:%S.%fZ'. Likewise, in Java, one can use
- * the Joda Time's [`ISODateTimeFormat.dateTime()`](
- * http://www.joda.org/joda-time/apidocs/org/joda/time/format/ISODateTimeFormat.html#dateTime%2D%2D
- * ) to obtain a formatter capable of generating timestamps in this format.
- **/
-GPB_FINAL @interface GPBTimestamp : GPBMessage
-
-/**
- * Represents seconds of UTC time since Unix epoch
- * 1970-01-01T00:00:00Z. Must be from 0001-01-01T00:00:00Z to
- * 9999-12-31T23:59:59Z inclusive.
- **/
-@property(nonatomic, readwrite) int64_t seconds;
-
-/**
- * Non-negative fractions of a second at nanosecond resolution. Negative
- * second values with fractions must still have non-negative nanos values
- * that count forward in time. Must be from 0 to 999,999,999
- * inclusive.
- **/
-@property(nonatomic, readwrite) int32_t nanos;
-
-@end
-
-NS_ASSUME_NONNULL_END
-
-CF_EXTERN_C_END
-
-#pragma clang diagnostic pop
-
-// @@protoc_insertion_point(global_scope)
diff --git a/libs/protobuf/objectivec/GPBTimestamp.pbobjc.m b/libs/protobuf/objectivec/GPBTimestamp.pbobjc.m
deleted file mode 100644
index 72d348f..0000000
--- a/libs/protobuf/objectivec/GPBTimestamp.pbobjc.m
+++ /dev/null
@@ -1,95 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/protobuf/timestamp.proto
-
-#import "GPBProtocolBuffers_RuntimeSupport.h"
-#import "GPBTimestamp.pbobjc.h"
-
-// @@protoc_insertion_point(imports)
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-
-#pragma mark - GPBTimestampRoot
-
-@implementation GPBTimestampRoot
-
-// No extensions in the file and no imports, so no need to generate
-// +extensionRegistry.
-
-@end
-
-#pragma mark - GPBTimestampRoot_FileDescriptor
-
-static GPBFileDescriptor *GPBTimestampRoot_FileDescriptor(void) {
-  // This is called by +initialize so there is no need to worry
-  // about thread safety of the singleton.
-  static GPBFileDescriptor *descriptor = NULL;
-  if (!descriptor) {
-    GPB_DEBUG_CHECK_RUNTIME_VERSIONS();
-    descriptor = [[GPBFileDescriptor alloc] initWithPackage:@"google.protobuf"
-                                                 objcPrefix:@"GPB"
-                                                     syntax:GPBFileSyntaxProto3];
-  }
-  return descriptor;
-}
-
-#pragma mark - GPBTimestamp
-
-@implementation GPBTimestamp
-
-@dynamic seconds;
-@dynamic nanos;
-
-typedef struct GPBTimestamp__storage_ {
-  uint32_t _has_storage_[1];
-  int32_t nanos;
-  int64_t seconds;
-} GPBTimestamp__storage_;
-
-// This method is threadsafe because it is initially called
-// in +initialize for each subclass.
-+ (GPBDescriptor *)descriptor {
-  static GPBDescriptor *descriptor = nil;
-  if (!descriptor) {
-    static GPBMessageFieldDescription fields[] = {
-      {
-        .name = "seconds",
-        .dataTypeSpecific.clazz = Nil,
-        .number = GPBTimestamp_FieldNumber_Seconds,
-        .hasIndex = 0,
-        .offset = (uint32_t)offsetof(GPBTimestamp__storage_, seconds),
-        .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldClearHasIvarOnZero),
-        .dataType = GPBDataTypeInt64,
-      },
-      {
-        .name = "nanos",
-        .dataTypeSpecific.clazz = Nil,
-        .number = GPBTimestamp_FieldNumber_Nanos,
-        .hasIndex = 1,
-        .offset = (uint32_t)offsetof(GPBTimestamp__storage_, nanos),
-        .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldClearHasIvarOnZero),
-        .dataType = GPBDataTypeInt32,
-      },
-    };
-    GPBDescriptor *localDescriptor =
-        [GPBDescriptor allocDescriptorForClass:[GPBTimestamp class]
-                                     rootClass:[GPBTimestampRoot class]
-                                          file:GPBTimestampRoot_FileDescriptor()
-                                        fields:fields
-                                    fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
-                                   storageSize:sizeof(GPBTimestamp__storage_)
-                                         flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown)];
-    #if defined(DEBUG) && DEBUG
-      NSAssert(descriptor == nil, @"Startup recursed!");
-    #endif  // DEBUG
-    descriptor = localDescriptor;
-  }
-  return descriptor;
-}
-
-@end
-
-
-#pragma clang diagnostic pop
-
-// @@protoc_insertion_point(global_scope)
diff --git a/libs/protobuf/objectivec/GPBType.pbobjc.h b/libs/protobuf/objectivec/GPBType.pbobjc.h
deleted file mode 100644
index b023050..0000000
--- a/libs/protobuf/objectivec/GPBType.pbobjc.h
+++ /dev/null
@@ -1,432 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/protobuf/type.proto
-
-#import "GPBDescriptor.h"
-#import "GPBMessage.h"
-#import "GPBRootObject.h"
-#import "GPBAny.pbobjc.h"
-#import "GPBSourceContext.pbobjc.h"
-
-#if GOOGLE_PROTOBUF_OBJC_VERSION < 30004
-#error This file was generated by a newer version of protoc which is incompatible with your Protocol Buffer library sources.
-#endif
-#if 30004 < GOOGLE_PROTOBUF_OBJC_MIN_SUPPORTED_VERSION
-#error This file was generated by an older version of protoc which is incompatible with your Protocol Buffer library sources.
-#endif
-
-// @@protoc_insertion_point(imports)
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-
-CF_EXTERN_C_BEGIN
-
-@class GPBEnumValue;
-@class GPBField;
-@class GPBOption;
-
-NS_ASSUME_NONNULL_BEGIN
-
-#pragma mark - Enum GPBSyntax
-
-/** The syntax in which a protocol buffer element is defined. */
-typedef GPB_ENUM(GPBSyntax) {
-  /**
-   * Value used if any message's field encounters a value that is not defined
-   * by this enum. The message will also have C functions to get/set the rawValue
-   * of the field.
-   **/
-  GPBSyntax_GPBUnrecognizedEnumeratorValue = kGPBUnrecognizedEnumeratorValue,
-  /** Syntax `proto2`. */
-  GPBSyntax_SyntaxProto2 = 0,
-
-  /** Syntax `proto3`. */
-  GPBSyntax_SyntaxProto3 = 1,
-};
-
-GPBEnumDescriptor *GPBSyntax_EnumDescriptor(void);
-
-/**
- * Checks to see if the given value is defined by the enum or was not known at
- * the time this source was generated.
- **/
-BOOL GPBSyntax_IsValidValue(int32_t value);
-
-#pragma mark - Enum GPBField_Kind
-
-/** Basic field types. */
-typedef GPB_ENUM(GPBField_Kind) {
-  /**
-   * Value used if any message's field encounters a value that is not defined
-   * by this enum. The message will also have C functions to get/set the rawValue
-   * of the field.
-   **/
-  GPBField_Kind_GPBUnrecognizedEnumeratorValue = kGPBUnrecognizedEnumeratorValue,
-  /** Field type unknown. */
-  GPBField_Kind_TypeUnknown = 0,
-
-  /** Field type double. */
-  GPBField_Kind_TypeDouble = 1,
-
-  /** Field type float. */
-  GPBField_Kind_TypeFloat = 2,
-
-  /** Field type int64. */
-  GPBField_Kind_TypeInt64 = 3,
-
-  /** Field type uint64. */
-  GPBField_Kind_TypeUint64 = 4,
-
-  /** Field type int32. */
-  GPBField_Kind_TypeInt32 = 5,
-
-  /** Field type fixed64. */
-  GPBField_Kind_TypeFixed64 = 6,
-
-  /** Field type fixed32. */
-  GPBField_Kind_TypeFixed32 = 7,
-
-  /** Field type bool. */
-  GPBField_Kind_TypeBool = 8,
-
-  /** Field type string. */
-  GPBField_Kind_TypeString = 9,
-
-  /** Field type group. Proto2 syntax only, and deprecated. */
-  GPBField_Kind_TypeGroup = 10,
-
-  /** Field type message. */
-  GPBField_Kind_TypeMessage = 11,
-
-  /** Field type bytes. */
-  GPBField_Kind_TypeBytes = 12,
-
-  /** Field type uint32. */
-  GPBField_Kind_TypeUint32 = 13,
-
-  /** Field type enum. */
-  GPBField_Kind_TypeEnum = 14,
-
-  /** Field type sfixed32. */
-  GPBField_Kind_TypeSfixed32 = 15,
-
-  /** Field type sfixed64. */
-  GPBField_Kind_TypeSfixed64 = 16,
-
-  /** Field type sint32. */
-  GPBField_Kind_TypeSint32 = 17,
-
-  /** Field type sint64. */
-  GPBField_Kind_TypeSint64 = 18,
-};
-
-GPBEnumDescriptor *GPBField_Kind_EnumDescriptor(void);
-
-/**
- * Checks to see if the given value is defined by the enum or was not known at
- * the time this source was generated.
- **/
-BOOL GPBField_Kind_IsValidValue(int32_t value);
-
-#pragma mark - Enum GPBField_Cardinality
-
-/** Whether a field is optional, required, or repeated. */
-typedef GPB_ENUM(GPBField_Cardinality) {
-  /**
-   * Value used if any message's field encounters a value that is not defined
-   * by this enum. The message will also have C functions to get/set the rawValue
-   * of the field.
-   **/
-  GPBField_Cardinality_GPBUnrecognizedEnumeratorValue = kGPBUnrecognizedEnumeratorValue,
-  /** For fields with unknown cardinality. */
-  GPBField_Cardinality_CardinalityUnknown = 0,
-
-  /** For optional fields. */
-  GPBField_Cardinality_CardinalityOptional = 1,
-
-  /** For required fields. Proto2 syntax only. */
-  GPBField_Cardinality_CardinalityRequired = 2,
-
-  /** For repeated fields. */
-  GPBField_Cardinality_CardinalityRepeated = 3,
-};
-
-GPBEnumDescriptor *GPBField_Cardinality_EnumDescriptor(void);
-
-/**
- * Checks to see if the given value is defined by the enum or was not known at
- * the time this source was generated.
- **/
-BOOL GPBField_Cardinality_IsValidValue(int32_t value);
-
-#pragma mark - GPBTypeRoot
-
-/**
- * Exposes the extension registry for this file.
- *
- * The base class provides:
- * @code
- *   + (GPBExtensionRegistry *)extensionRegistry;
- * @endcode
- * which is a @c GPBExtensionRegistry that includes all the extensions defined by
- * this file and all files that it depends on.
- **/
-GPB_FINAL @interface GPBTypeRoot : GPBRootObject
-@end
-
-#pragma mark - GPBType
-
-typedef GPB_ENUM(GPBType_FieldNumber) {
-  GPBType_FieldNumber_Name = 1,
-  GPBType_FieldNumber_FieldsArray = 2,
-  GPBType_FieldNumber_OneofsArray = 3,
-  GPBType_FieldNumber_OptionsArray = 4,
-  GPBType_FieldNumber_SourceContext = 5,
-  GPBType_FieldNumber_Syntax = 6,
-};
-
-/**
- * A protocol buffer message type.
- **/
-GPB_FINAL @interface GPBType : GPBMessage
-
-/** The fully qualified message name. */
-@property(nonatomic, readwrite, copy, null_resettable) NSString *name;
-
-/** The list of fields. */
-@property(nonatomic, readwrite, strong, null_resettable) NSMutableArray<GPBField*> *fieldsArray;
-/** The number of items in @c fieldsArray without causing the array to be created. */
-@property(nonatomic, readonly) NSUInteger fieldsArray_Count;
-
-/** The list of types appearing in `oneof` definitions in this type. */
-@property(nonatomic, readwrite, strong, null_resettable) NSMutableArray<NSString*> *oneofsArray;
-/** The number of items in @c oneofsArray without causing the array to be created. */
-@property(nonatomic, readonly) NSUInteger oneofsArray_Count;
-
-/** The protocol buffer options. */
-@property(nonatomic, readwrite, strong, null_resettable) NSMutableArray<GPBOption*> *optionsArray;
-/** The number of items in @c optionsArray without causing the array to be created. */
-@property(nonatomic, readonly) NSUInteger optionsArray_Count;
-
-/** The source context. */
-@property(nonatomic, readwrite, strong, null_resettable) GPBSourceContext *sourceContext;
-/** Test to see if @c sourceContext has been set. */
-@property(nonatomic, readwrite) BOOL hasSourceContext;
-
-/** The source syntax. */
-@property(nonatomic, readwrite) GPBSyntax syntax;
-
-@end
-
-/**
- * Fetches the raw value of a @c GPBType's @c syntax property, even
- * if the value was not defined by the enum at the time the code was generated.
- **/
-int32_t GPBType_Syntax_RawValue(GPBType *message);
-/**
- * Sets the raw value of an @c GPBType's @c syntax property, allowing
- * it to be set to a value that was not defined by the enum at the time the code
- * was generated.
- **/
-void SetGPBType_Syntax_RawValue(GPBType *message, int32_t value);
-
-#pragma mark - GPBField
-
-typedef GPB_ENUM(GPBField_FieldNumber) {
-  GPBField_FieldNumber_Kind = 1,
-  GPBField_FieldNumber_Cardinality = 2,
-  GPBField_FieldNumber_Number = 3,
-  GPBField_FieldNumber_Name = 4,
-  GPBField_FieldNumber_TypeURL = 6,
-  GPBField_FieldNumber_OneofIndex = 7,
-  GPBField_FieldNumber_Packed = 8,
-  GPBField_FieldNumber_OptionsArray = 9,
-  GPBField_FieldNumber_JsonName = 10,
-  GPBField_FieldNumber_DefaultValue = 11,
-};
-
-/**
- * A single field of a message type.
- **/
-GPB_FINAL @interface GPBField : GPBMessage
-
-/** The field type. */
-@property(nonatomic, readwrite) GPBField_Kind kind;
-
-/** The field cardinality. */
-@property(nonatomic, readwrite) GPBField_Cardinality cardinality;
-
-/** The field number. */
-@property(nonatomic, readwrite) int32_t number;
-
-/** The field name. */
-@property(nonatomic, readwrite, copy, null_resettable) NSString *name;
-
-/**
- * The field type URL, without the scheme, for message or enumeration
- * types. Example: `"type.googleapis.com/google.protobuf.Timestamp"`.
- **/
-@property(nonatomic, readwrite, copy, null_resettable) NSString *typeURL;
-
-/**
- * The index of the field type in `Type.oneofs`, for message or enumeration
- * types. The first type has index 1; zero means the type is not in the list.
- **/
-@property(nonatomic, readwrite) int32_t oneofIndex;
-
-/** Whether to use alternative packed wire representation. */
-@property(nonatomic, readwrite) BOOL packed;
-
-/** The protocol buffer options. */
-@property(nonatomic, readwrite, strong, null_resettable) NSMutableArray<GPBOption*> *optionsArray;
-/** The number of items in @c optionsArray without causing the array to be created. */
-@property(nonatomic, readonly) NSUInteger optionsArray_Count;
-
-/** The field JSON name. */
-@property(nonatomic, readwrite, copy, null_resettable) NSString *jsonName;
-
-/** The string value of the default value of this field. Proto2 syntax only. */
-@property(nonatomic, readwrite, copy, null_resettable) NSString *defaultValue;
-
-@end
-
-/**
- * Fetches the raw value of a @c GPBField's @c kind property, even
- * if the value was not defined by the enum at the time the code was generated.
- **/
-int32_t GPBField_Kind_RawValue(GPBField *message);
-/**
- * Sets the raw value of an @c GPBField's @c kind property, allowing
- * it to be set to a value that was not defined by the enum at the time the code
- * was generated.
- **/
-void SetGPBField_Kind_RawValue(GPBField *message, int32_t value);
-
-/**
- * Fetches the raw value of a @c GPBField's @c cardinality property, even
- * if the value was not defined by the enum at the time the code was generated.
- **/
-int32_t GPBField_Cardinality_RawValue(GPBField *message);
-/**
- * Sets the raw value of an @c GPBField's @c cardinality property, allowing
- * it to be set to a value that was not defined by the enum at the time the code
- * was generated.
- **/
-void SetGPBField_Cardinality_RawValue(GPBField *message, int32_t value);
-
-#pragma mark - GPBEnum
-
-typedef GPB_ENUM(GPBEnum_FieldNumber) {
-  GPBEnum_FieldNumber_Name = 1,
-  GPBEnum_FieldNumber_EnumvalueArray = 2,
-  GPBEnum_FieldNumber_OptionsArray = 3,
-  GPBEnum_FieldNumber_SourceContext = 4,
-  GPBEnum_FieldNumber_Syntax = 5,
-};
-
-/**
- * Enum type definition.
- **/
-GPB_FINAL @interface GPBEnum : GPBMessage
-
-/** Enum type name. */
-@property(nonatomic, readwrite, copy, null_resettable) NSString *name;
-
-/** Enum value definitions. */
-@property(nonatomic, readwrite, strong, null_resettable) NSMutableArray<GPBEnumValue*> *enumvalueArray;
-/** The number of items in @c enumvalueArray without causing the array to be created. */
-@property(nonatomic, readonly) NSUInteger enumvalueArray_Count;
-
-/** Protocol buffer options. */
-@property(nonatomic, readwrite, strong, null_resettable) NSMutableArray<GPBOption*> *optionsArray;
-/** The number of items in @c optionsArray without causing the array to be created. */
-@property(nonatomic, readonly) NSUInteger optionsArray_Count;
-
-/** The source context. */
-@property(nonatomic, readwrite, strong, null_resettable) GPBSourceContext *sourceContext;
-/** Test to see if @c sourceContext has been set. */
-@property(nonatomic, readwrite) BOOL hasSourceContext;
-
-/** The source syntax. */
-@property(nonatomic, readwrite) GPBSyntax syntax;
-
-@end
-
-/**
- * Fetches the raw value of a @c GPBEnum's @c syntax property, even
- * if the value was not defined by the enum at the time the code was generated.
- **/
-int32_t GPBEnum_Syntax_RawValue(GPBEnum *message);
-/**
- * Sets the raw value of an @c GPBEnum's @c syntax property, allowing
- * it to be set to a value that was not defined by the enum at the time the code
- * was generated.
- **/
-void SetGPBEnum_Syntax_RawValue(GPBEnum *message, int32_t value);
-
-#pragma mark - GPBEnumValue
-
-typedef GPB_ENUM(GPBEnumValue_FieldNumber) {
-  GPBEnumValue_FieldNumber_Name = 1,
-  GPBEnumValue_FieldNumber_Number = 2,
-  GPBEnumValue_FieldNumber_OptionsArray = 3,
-};
-
-/**
- * Enum value definition.
- **/
-GPB_FINAL @interface GPBEnumValue : GPBMessage
-
-/** Enum value name. */
-@property(nonatomic, readwrite, copy, null_resettable) NSString *name;
-
-/** Enum value number. */
-@property(nonatomic, readwrite) int32_t number;
-
-/** Protocol buffer options. */
-@property(nonatomic, readwrite, strong, null_resettable) NSMutableArray<GPBOption*> *optionsArray;
-/** The number of items in @c optionsArray without causing the array to be created. */
-@property(nonatomic, readonly) NSUInteger optionsArray_Count;
-
-@end
-
-#pragma mark - GPBOption
-
-typedef GPB_ENUM(GPBOption_FieldNumber) {
-  GPBOption_FieldNumber_Name = 1,
-  GPBOption_FieldNumber_Value = 2,
-};
-
-/**
- * A protocol buffer option, which can be attached to a message, field,
- * enumeration, etc.
- **/
-GPB_FINAL @interface GPBOption : GPBMessage
-
-/**
- * The option's name. For protobuf built-in options (options defined in
- * descriptor.proto), this is the short name. For example, `"map_entry"`.
- * For custom options, it should be the fully-qualified name. For example,
- * `"google.api.http"`.
- **/
-@property(nonatomic, readwrite, copy, null_resettable) NSString *name;
-
-/**
- * The option's value packed in an Any message. If the value is a primitive,
- * the corresponding wrapper type defined in google/protobuf/wrappers.proto
- * should be used. If the value is an enum, it should be stored as an int32
- * value using the google.protobuf.Int32Value type.
- **/
-@property(nonatomic, readwrite, strong, null_resettable) GPBAny *value;
-/** Test to see if @c value has been set. */
-@property(nonatomic, readwrite) BOOL hasValue;
-
-@end
-
-NS_ASSUME_NONNULL_END
-
-CF_EXTERN_C_END
-
-#pragma clang diagnostic pop
-
-// @@protoc_insertion_point(global_scope)
diff --git a/libs/protobuf/objectivec/GPBType.pbobjc.m b/libs/protobuf/objectivec/GPBType.pbobjc.m
deleted file mode 100644
index f5fc1ef..0000000
--- a/libs/protobuf/objectivec/GPBType.pbobjc.m
+++ /dev/null
@@ -1,709 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/protobuf/type.proto
-
-#import "GPBProtocolBuffers_RuntimeSupport.h"
-#import "GPBType.pbobjc.h"
-
-#import <stdatomic.h>
-
-// @@protoc_insertion_point(imports)
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-#pragma clang diagnostic ignored "-Wdollar-in-identifier-extension"
-
-#pragma mark - Objective C Class declarations
-// Forward declarations of Objective C classes that we can use as
-// static values in struct initializers.
-// We don't use [Foo class] because it is not a static value.
-GPBObjCClassDeclaration(GPBAny);
-GPBObjCClassDeclaration(GPBEnumValue);
-GPBObjCClassDeclaration(GPBField);
-GPBObjCClassDeclaration(GPBOption);
-GPBObjCClassDeclaration(GPBSourceContext);
-
-#pragma mark - GPBTypeRoot
-
-@implementation GPBTypeRoot
-
-// No extensions in the file and none of the imports (direct or indirect)
-// defined extensions, so no need to generate +extensionRegistry.
-
-@end
-
-#pragma mark - GPBTypeRoot_FileDescriptor
-
-static GPBFileDescriptor *GPBTypeRoot_FileDescriptor(void) {
-  // This is called by +initialize so there is no need to worry
-  // about thread safety of the singleton.
-  static GPBFileDescriptor *descriptor = NULL;
-  if (!descriptor) {
-    GPB_DEBUG_CHECK_RUNTIME_VERSIONS();
-    descriptor = [[GPBFileDescriptor alloc] initWithPackage:@"google.protobuf"
-                                                 objcPrefix:@"GPB"
-                                                     syntax:GPBFileSyntaxProto3];
-  }
-  return descriptor;
-}
-
-#pragma mark - Enum GPBSyntax
-
-GPBEnumDescriptor *GPBSyntax_EnumDescriptor(void) {
-  static _Atomic(GPBEnumDescriptor*) descriptor = nil;
-  if (!descriptor) {
-    static const char *valueNames =
-        "SyntaxProto2\000SyntaxProto3\000";
-    static const int32_t values[] = {
-        GPBSyntax_SyntaxProto2,
-        GPBSyntax_SyntaxProto3,
-    };
-    GPBEnumDescriptor *worker =
-        [GPBEnumDescriptor allocDescriptorForName:GPBNSStringifySymbol(GPBSyntax)
-                                       valueNames:valueNames
-                                           values:values
-                                            count:(uint32_t)(sizeof(values) / sizeof(int32_t))
-                                     enumVerifier:GPBSyntax_IsValidValue];
-    GPBEnumDescriptor *expected = nil;
-    if (!atomic_compare_exchange_strong(&descriptor, &expected, worker)) {
-      [worker release];
-    }
-  }
-  return descriptor;
-}
-
-BOOL GPBSyntax_IsValidValue(int32_t value__) {
-  switch (value__) {
-    case GPBSyntax_SyntaxProto2:
-    case GPBSyntax_SyntaxProto3:
-      return YES;
-    default:
-      return NO;
-  }
-}
-
-#pragma mark - GPBType
-
-@implementation GPBType
-
-@dynamic name;
-@dynamic fieldsArray, fieldsArray_Count;
-@dynamic oneofsArray, oneofsArray_Count;
-@dynamic optionsArray, optionsArray_Count;
-@dynamic hasSourceContext, sourceContext;
-@dynamic syntax;
-
-typedef struct GPBType__storage_ {
-  uint32_t _has_storage_[1];
-  GPBSyntax syntax;
-  NSString *name;
-  NSMutableArray *fieldsArray;
-  NSMutableArray *oneofsArray;
-  NSMutableArray *optionsArray;
-  GPBSourceContext *sourceContext;
-} GPBType__storage_;
-
-// This method is threadsafe because it is initially called
-// in +initialize for each subclass.
-+ (GPBDescriptor *)descriptor {
-  static GPBDescriptor *descriptor = nil;
-  if (!descriptor) {
-    static GPBMessageFieldDescription fields[] = {
-      {
-        .name = "name",
-        .dataTypeSpecific.clazz = Nil,
-        .number = GPBType_FieldNumber_Name,
-        .hasIndex = 0,
-        .offset = (uint32_t)offsetof(GPBType__storage_, name),
-        .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldClearHasIvarOnZero),
-        .dataType = GPBDataTypeString,
-      },
-      {
-        .name = "fieldsArray",
-        .dataTypeSpecific.clazz = GPBObjCClass(GPBField),
-        .number = GPBType_FieldNumber_FieldsArray,
-        .hasIndex = GPBNoHasBit,
-        .offset = (uint32_t)offsetof(GPBType__storage_, fieldsArray),
-        .flags = GPBFieldRepeated,
-        .dataType = GPBDataTypeMessage,
-      },
-      {
-        .name = "oneofsArray",
-        .dataTypeSpecific.clazz = Nil,
-        .number = GPBType_FieldNumber_OneofsArray,
-        .hasIndex = GPBNoHasBit,
-        .offset = (uint32_t)offsetof(GPBType__storage_, oneofsArray),
-        .flags = GPBFieldRepeated,
-        .dataType = GPBDataTypeString,
-      },
-      {
-        .name = "optionsArray",
-        .dataTypeSpecific.clazz = GPBObjCClass(GPBOption),
-        .number = GPBType_FieldNumber_OptionsArray,
-        .hasIndex = GPBNoHasBit,
-        .offset = (uint32_t)offsetof(GPBType__storage_, optionsArray),
-        .flags = GPBFieldRepeated,
-        .dataType = GPBDataTypeMessage,
-      },
-      {
-        .name = "sourceContext",
-        .dataTypeSpecific.clazz = GPBObjCClass(GPBSourceContext),
-        .number = GPBType_FieldNumber_SourceContext,
-        .hasIndex = 1,
-        .offset = (uint32_t)offsetof(GPBType__storage_, sourceContext),
-        .flags = GPBFieldOptional,
-        .dataType = GPBDataTypeMessage,
-      },
-      {
-        .name = "syntax",
-        .dataTypeSpecific.enumDescFunc = GPBSyntax_EnumDescriptor,
-        .number = GPBType_FieldNumber_Syntax,
-        .hasIndex = 2,
-        .offset = (uint32_t)offsetof(GPBType__storage_, syntax),
-        .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldHasEnumDescriptor | GPBFieldClearHasIvarOnZero),
-        .dataType = GPBDataTypeEnum,
-      },
-    };
-    GPBDescriptor *localDescriptor =
-        [GPBDescriptor allocDescriptorForClass:[GPBType class]
-                                     rootClass:[GPBTypeRoot class]
-                                          file:GPBTypeRoot_FileDescriptor()
-                                        fields:fields
-                                    fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
-                                   storageSize:sizeof(GPBType__storage_)
-                                         flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown)];
-    #if defined(DEBUG) && DEBUG
-      NSAssert(descriptor == nil, @"Startup recursed!");
-    #endif  // DEBUG
-    descriptor = localDescriptor;
-  }
-  return descriptor;
-}
-
-@end
-
-int32_t GPBType_Syntax_RawValue(GPBType *message) {
-  GPBDescriptor *descriptor = [GPBType descriptor];
-  GPBFieldDescriptor *field = [descriptor fieldWithNumber:GPBType_FieldNumber_Syntax];
-  return GPBGetMessageRawEnumField(message, field);
-}
-
-void SetGPBType_Syntax_RawValue(GPBType *message, int32_t value) {
-  GPBDescriptor *descriptor = [GPBType descriptor];
-  GPBFieldDescriptor *field = [descriptor fieldWithNumber:GPBType_FieldNumber_Syntax];
-  GPBSetMessageRawEnumField(message, field, value);
-}
-
-#pragma mark - GPBField
-
-@implementation GPBField
-
-@dynamic kind;
-@dynamic cardinality;
-@dynamic number;
-@dynamic name;
-@dynamic typeURL;
-@dynamic oneofIndex;
-@dynamic packed;
-@dynamic optionsArray, optionsArray_Count;
-@dynamic jsonName;
-@dynamic defaultValue;
-
-typedef struct GPBField__storage_ {
-  uint32_t _has_storage_[1];
-  GPBField_Kind kind;
-  GPBField_Cardinality cardinality;
-  int32_t number;
-  int32_t oneofIndex;
-  NSString *name;
-  NSString *typeURL;
-  NSMutableArray *optionsArray;
-  NSString *jsonName;
-  NSString *defaultValue;
-} GPBField__storage_;
-
-// This method is threadsafe because it is initially called
-// in +initialize for each subclass.
-+ (GPBDescriptor *)descriptor {
-  static GPBDescriptor *descriptor = nil;
-  if (!descriptor) {
-    static GPBMessageFieldDescription fields[] = {
-      {
-        .name = "kind",
-        .dataTypeSpecific.enumDescFunc = GPBField_Kind_EnumDescriptor,
-        .number = GPBField_FieldNumber_Kind,
-        .hasIndex = 0,
-        .offset = (uint32_t)offsetof(GPBField__storage_, kind),
-        .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldHasEnumDescriptor | GPBFieldClearHasIvarOnZero),
-        .dataType = GPBDataTypeEnum,
-      },
-      {
-        .name = "cardinality",
-        .dataTypeSpecific.enumDescFunc = GPBField_Cardinality_EnumDescriptor,
-        .number = GPBField_FieldNumber_Cardinality,
-        .hasIndex = 1,
-        .offset = (uint32_t)offsetof(GPBField__storage_, cardinality),
-        .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldHasEnumDescriptor | GPBFieldClearHasIvarOnZero),
-        .dataType = GPBDataTypeEnum,
-      },
-      {
-        .name = "number",
-        .dataTypeSpecific.clazz = Nil,
-        .number = GPBField_FieldNumber_Number,
-        .hasIndex = 2,
-        .offset = (uint32_t)offsetof(GPBField__storage_, number),
-        .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldClearHasIvarOnZero),
-        .dataType = GPBDataTypeInt32,
-      },
-      {
-        .name = "name",
-        .dataTypeSpecific.clazz = Nil,
-        .number = GPBField_FieldNumber_Name,
-        .hasIndex = 3,
-        .offset = (uint32_t)offsetof(GPBField__storage_, name),
-        .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldClearHasIvarOnZero),
-        .dataType = GPBDataTypeString,
-      },
-      {
-        .name = "typeURL",
-        .dataTypeSpecific.clazz = Nil,
-        .number = GPBField_FieldNumber_TypeURL,
-        .hasIndex = 4,
-        .offset = (uint32_t)offsetof(GPBField__storage_, typeURL),
-        .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldTextFormatNameCustom | GPBFieldClearHasIvarOnZero),
-        .dataType = GPBDataTypeString,
-      },
-      {
-        .name = "oneofIndex",
-        .dataTypeSpecific.clazz = Nil,
-        .number = GPBField_FieldNumber_OneofIndex,
-        .hasIndex = 5,
-        .offset = (uint32_t)offsetof(GPBField__storage_, oneofIndex),
-        .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldClearHasIvarOnZero),
-        .dataType = GPBDataTypeInt32,
-      },
-      {
-        .name = "packed",
-        .dataTypeSpecific.clazz = Nil,
-        .number = GPBField_FieldNumber_Packed,
-        .hasIndex = 6,
-        .offset = 7,  // Stored in _has_storage_ to save space.
-        .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldClearHasIvarOnZero),
-        .dataType = GPBDataTypeBool,
-      },
-      {
-        .name = "optionsArray",
-        .dataTypeSpecific.clazz = GPBObjCClass(GPBOption),
-        .number = GPBField_FieldNumber_OptionsArray,
-        .hasIndex = GPBNoHasBit,
-        .offset = (uint32_t)offsetof(GPBField__storage_, optionsArray),
-        .flags = GPBFieldRepeated,
-        .dataType = GPBDataTypeMessage,
-      },
-      {
-        .name = "jsonName",
-        .dataTypeSpecific.clazz = Nil,
-        .number = GPBField_FieldNumber_JsonName,
-        .hasIndex = 8,
-        .offset = (uint32_t)offsetof(GPBField__storage_, jsonName),
-        .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldClearHasIvarOnZero),
-        .dataType = GPBDataTypeString,
-      },
-      {
-        .name = "defaultValue",
-        .dataTypeSpecific.clazz = Nil,
-        .number = GPBField_FieldNumber_DefaultValue,
-        .hasIndex = 9,
-        .offset = (uint32_t)offsetof(GPBField__storage_, defaultValue),
-        .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldClearHasIvarOnZero),
-        .dataType = GPBDataTypeString,
-      },
-    };
-    GPBDescriptor *localDescriptor =
-        [GPBDescriptor allocDescriptorForClass:[GPBField class]
-                                     rootClass:[GPBTypeRoot class]
-                                          file:GPBTypeRoot_FileDescriptor()
-                                        fields:fields
-                                    fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
-                                   storageSize:sizeof(GPBField__storage_)
-                                         flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown)];
-#if !GPBOBJC_SKIP_MESSAGE_TEXTFORMAT_EXTRAS
-    static const char *extraTextFormatInfo =
-        "\001\006\004\241!!\000";
-    [localDescriptor setupExtraTextInfo:extraTextFormatInfo];
-#endif  // !GPBOBJC_SKIP_MESSAGE_TEXTFORMAT_EXTRAS
-    #if defined(DEBUG) && DEBUG
-      NSAssert(descriptor == nil, @"Startup recursed!");
-    #endif  // DEBUG
-    descriptor = localDescriptor;
-  }
-  return descriptor;
-}
-
-@end
-
-int32_t GPBField_Kind_RawValue(GPBField *message) {
-  GPBDescriptor *descriptor = [GPBField descriptor];
-  GPBFieldDescriptor *field = [descriptor fieldWithNumber:GPBField_FieldNumber_Kind];
-  return GPBGetMessageRawEnumField(message, field);
-}
-
-void SetGPBField_Kind_RawValue(GPBField *message, int32_t value) {
-  GPBDescriptor *descriptor = [GPBField descriptor];
-  GPBFieldDescriptor *field = [descriptor fieldWithNumber:GPBField_FieldNumber_Kind];
-  GPBSetMessageRawEnumField(message, field, value);
-}
-
-int32_t GPBField_Cardinality_RawValue(GPBField *message) {
-  GPBDescriptor *descriptor = [GPBField descriptor];
-  GPBFieldDescriptor *field = [descriptor fieldWithNumber:GPBField_FieldNumber_Cardinality];
-  return GPBGetMessageRawEnumField(message, field);
-}
-
-void SetGPBField_Cardinality_RawValue(GPBField *message, int32_t value) {
-  GPBDescriptor *descriptor = [GPBField descriptor];
-  GPBFieldDescriptor *field = [descriptor fieldWithNumber:GPBField_FieldNumber_Cardinality];
-  GPBSetMessageRawEnumField(message, field, value);
-}
-
-#pragma mark - Enum GPBField_Kind
-
-GPBEnumDescriptor *GPBField_Kind_EnumDescriptor(void) {
-  static _Atomic(GPBEnumDescriptor*) descriptor = nil;
-  if (!descriptor) {
-    static const char *valueNames =
-        "TypeUnknown\000TypeDouble\000TypeFloat\000TypeInt"
-        "64\000TypeUint64\000TypeInt32\000TypeFixed64\000Type"
-        "Fixed32\000TypeBool\000TypeString\000TypeGroup\000Ty"
-        "peMessage\000TypeBytes\000TypeUint32\000TypeEnum\000"
-        "TypeSfixed32\000TypeSfixed64\000TypeSint32\000Typ"
-        "eSint64\000";
-    static const int32_t values[] = {
-        GPBField_Kind_TypeUnknown,
-        GPBField_Kind_TypeDouble,
-        GPBField_Kind_TypeFloat,
-        GPBField_Kind_TypeInt64,
-        GPBField_Kind_TypeUint64,
-        GPBField_Kind_TypeInt32,
-        GPBField_Kind_TypeFixed64,
-        GPBField_Kind_TypeFixed32,
-        GPBField_Kind_TypeBool,
-        GPBField_Kind_TypeString,
-        GPBField_Kind_TypeGroup,
-        GPBField_Kind_TypeMessage,
-        GPBField_Kind_TypeBytes,
-        GPBField_Kind_TypeUint32,
-        GPBField_Kind_TypeEnum,
-        GPBField_Kind_TypeSfixed32,
-        GPBField_Kind_TypeSfixed64,
-        GPBField_Kind_TypeSint32,
-        GPBField_Kind_TypeSint64,
-    };
-    GPBEnumDescriptor *worker =
-        [GPBEnumDescriptor allocDescriptorForName:GPBNSStringifySymbol(GPBField_Kind)
-                                       valueNames:valueNames
-                                           values:values
-                                            count:(uint32_t)(sizeof(values) / sizeof(int32_t))
-                                     enumVerifier:GPBField_Kind_IsValidValue];
-    GPBEnumDescriptor *expected = nil;
-    if (!atomic_compare_exchange_strong(&descriptor, &expected, worker)) {
-      [worker release];
-    }
-  }
-  return descriptor;
-}
-
-BOOL GPBField_Kind_IsValidValue(int32_t value__) {
-  switch (value__) {
-    case GPBField_Kind_TypeUnknown:
-    case GPBField_Kind_TypeDouble:
-    case GPBField_Kind_TypeFloat:
-    case GPBField_Kind_TypeInt64:
-    case GPBField_Kind_TypeUint64:
-    case GPBField_Kind_TypeInt32:
-    case GPBField_Kind_TypeFixed64:
-    case GPBField_Kind_TypeFixed32:
-    case GPBField_Kind_TypeBool:
-    case GPBField_Kind_TypeString:
-    case GPBField_Kind_TypeGroup:
-    case GPBField_Kind_TypeMessage:
-    case GPBField_Kind_TypeBytes:
-    case GPBField_Kind_TypeUint32:
-    case GPBField_Kind_TypeEnum:
-    case GPBField_Kind_TypeSfixed32:
-    case GPBField_Kind_TypeSfixed64:
-    case GPBField_Kind_TypeSint32:
-    case GPBField_Kind_TypeSint64:
-      return YES;
-    default:
-      return NO;
-  }
-}
-
-#pragma mark - Enum GPBField_Cardinality
-
-GPBEnumDescriptor *GPBField_Cardinality_EnumDescriptor(void) {
-  static _Atomic(GPBEnumDescriptor*) descriptor = nil;
-  if (!descriptor) {
-    static const char *valueNames =
-        "CardinalityUnknown\000CardinalityOptional\000C"
-        "ardinalityRequired\000CardinalityRepeated\000";
-    static const int32_t values[] = {
-        GPBField_Cardinality_CardinalityUnknown,
-        GPBField_Cardinality_CardinalityOptional,
-        GPBField_Cardinality_CardinalityRequired,
-        GPBField_Cardinality_CardinalityRepeated,
-    };
-    GPBEnumDescriptor *worker =
-        [GPBEnumDescriptor allocDescriptorForName:GPBNSStringifySymbol(GPBField_Cardinality)
-                                       valueNames:valueNames
-                                           values:values
-                                            count:(uint32_t)(sizeof(values) / sizeof(int32_t))
-                                     enumVerifier:GPBField_Cardinality_IsValidValue];
-    GPBEnumDescriptor *expected = nil;
-    if (!atomic_compare_exchange_strong(&descriptor, &expected, worker)) {
-      [worker release];
-    }
-  }
-  return descriptor;
-}
-
-BOOL GPBField_Cardinality_IsValidValue(int32_t value__) {
-  switch (value__) {
-    case GPBField_Cardinality_CardinalityUnknown:
-    case GPBField_Cardinality_CardinalityOptional:
-    case GPBField_Cardinality_CardinalityRequired:
-    case GPBField_Cardinality_CardinalityRepeated:
-      return YES;
-    default:
-      return NO;
-  }
-}
-
-#pragma mark - GPBEnum
-
-@implementation GPBEnum
-
-@dynamic name;
-@dynamic enumvalueArray, enumvalueArray_Count;
-@dynamic optionsArray, optionsArray_Count;
-@dynamic hasSourceContext, sourceContext;
-@dynamic syntax;
-
-typedef struct GPBEnum__storage_ {
-  uint32_t _has_storage_[1];
-  GPBSyntax syntax;
-  NSString *name;
-  NSMutableArray *enumvalueArray;
-  NSMutableArray *optionsArray;
-  GPBSourceContext *sourceContext;
-} GPBEnum__storage_;
-
-// This method is threadsafe because it is initially called
-// in +initialize for each subclass.
-+ (GPBDescriptor *)descriptor {
-  static GPBDescriptor *descriptor = nil;
-  if (!descriptor) {
-    static GPBMessageFieldDescription fields[] = {
-      {
-        .name = "name",
-        .dataTypeSpecific.clazz = Nil,
-        .number = GPBEnum_FieldNumber_Name,
-        .hasIndex = 0,
-        .offset = (uint32_t)offsetof(GPBEnum__storage_, name),
-        .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldClearHasIvarOnZero),
-        .dataType = GPBDataTypeString,
-      },
-      {
-        .name = "enumvalueArray",
-        .dataTypeSpecific.clazz = GPBObjCClass(GPBEnumValue),
-        .number = GPBEnum_FieldNumber_EnumvalueArray,
-        .hasIndex = GPBNoHasBit,
-        .offset = (uint32_t)offsetof(GPBEnum__storage_, enumvalueArray),
-        .flags = GPBFieldRepeated,
-        .dataType = GPBDataTypeMessage,
-      },
-      {
-        .name = "optionsArray",
-        .dataTypeSpecific.clazz = GPBObjCClass(GPBOption),
-        .number = GPBEnum_FieldNumber_OptionsArray,
-        .hasIndex = GPBNoHasBit,
-        .offset = (uint32_t)offsetof(GPBEnum__storage_, optionsArray),
-        .flags = GPBFieldRepeated,
-        .dataType = GPBDataTypeMessage,
-      },
-      {
-        .name = "sourceContext",
-        .dataTypeSpecific.clazz = GPBObjCClass(GPBSourceContext),
-        .number = GPBEnum_FieldNumber_SourceContext,
-        .hasIndex = 1,
-        .offset = (uint32_t)offsetof(GPBEnum__storage_, sourceContext),
-        .flags = GPBFieldOptional,
-        .dataType = GPBDataTypeMessage,
-      },
-      {
-        .name = "syntax",
-        .dataTypeSpecific.enumDescFunc = GPBSyntax_EnumDescriptor,
-        .number = GPBEnum_FieldNumber_Syntax,
-        .hasIndex = 2,
-        .offset = (uint32_t)offsetof(GPBEnum__storage_, syntax),
-        .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldHasEnumDescriptor | GPBFieldClearHasIvarOnZero),
-        .dataType = GPBDataTypeEnum,
-      },
-    };
-    GPBDescriptor *localDescriptor =
-        [GPBDescriptor allocDescriptorForClass:[GPBEnum class]
-                                     rootClass:[GPBTypeRoot class]
-                                          file:GPBTypeRoot_FileDescriptor()
-                                        fields:fields
-                                    fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
-                                   storageSize:sizeof(GPBEnum__storage_)
-                                         flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown)];
-    #if defined(DEBUG) && DEBUG
-      NSAssert(descriptor == nil, @"Startup recursed!");
-    #endif  // DEBUG
-    descriptor = localDescriptor;
-  }
-  return descriptor;
-}
-
-@end
-
-int32_t GPBEnum_Syntax_RawValue(GPBEnum *message) {
-  GPBDescriptor *descriptor = [GPBEnum descriptor];
-  GPBFieldDescriptor *field = [descriptor fieldWithNumber:GPBEnum_FieldNumber_Syntax];
-  return GPBGetMessageRawEnumField(message, field);
-}
-
-void SetGPBEnum_Syntax_RawValue(GPBEnum *message, int32_t value) {
-  GPBDescriptor *descriptor = [GPBEnum descriptor];
-  GPBFieldDescriptor *field = [descriptor fieldWithNumber:GPBEnum_FieldNumber_Syntax];
-  GPBSetMessageRawEnumField(message, field, value);
-}
-
-#pragma mark - GPBEnumValue
-
-@implementation GPBEnumValue
-
-@dynamic name;
-@dynamic number;
-@dynamic optionsArray, optionsArray_Count;
-
-typedef struct GPBEnumValue__storage_ {
-  uint32_t _has_storage_[1];
-  int32_t number;
-  NSString *name;
-  NSMutableArray *optionsArray;
-} GPBEnumValue__storage_;
-
-// This method is threadsafe because it is initially called
-// in +initialize for each subclass.
-+ (GPBDescriptor *)descriptor {
-  static GPBDescriptor *descriptor = nil;
-  if (!descriptor) {
-    static GPBMessageFieldDescription fields[] = {
-      {
-        .name = "name",
-        .dataTypeSpecific.clazz = Nil,
-        .number = GPBEnumValue_FieldNumber_Name,
-        .hasIndex = 0,
-        .offset = (uint32_t)offsetof(GPBEnumValue__storage_, name),
-        .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldClearHasIvarOnZero),
-        .dataType = GPBDataTypeString,
-      },
-      {
-        .name = "number",
-        .dataTypeSpecific.clazz = Nil,
-        .number = GPBEnumValue_FieldNumber_Number,
-        .hasIndex = 1,
-        .offset = (uint32_t)offsetof(GPBEnumValue__storage_, number),
-        .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldClearHasIvarOnZero),
-        .dataType = GPBDataTypeInt32,
-      },
-      {
-        .name = "optionsArray",
-        .dataTypeSpecific.clazz = GPBObjCClass(GPBOption),
-        .number = GPBEnumValue_FieldNumber_OptionsArray,
-        .hasIndex = GPBNoHasBit,
-        .offset = (uint32_t)offsetof(GPBEnumValue__storage_, optionsArray),
-        .flags = GPBFieldRepeated,
-        .dataType = GPBDataTypeMessage,
-      },
-    };
-    GPBDescriptor *localDescriptor =
-        [GPBDescriptor allocDescriptorForClass:[GPBEnumValue class]
-                                     rootClass:[GPBTypeRoot class]
-                                          file:GPBTypeRoot_FileDescriptor()
-                                        fields:fields
-                                    fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
-                                   storageSize:sizeof(GPBEnumValue__storage_)
-                                         flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown)];
-    #if defined(DEBUG) && DEBUG
-      NSAssert(descriptor == nil, @"Startup recursed!");
-    #endif  // DEBUG
-    descriptor = localDescriptor;
-  }
-  return descriptor;
-}
-
-@end
-
-#pragma mark - GPBOption
-
-@implementation GPBOption
-
-@dynamic name;
-@dynamic hasValue, value;
-
-typedef struct GPBOption__storage_ {
-  uint32_t _has_storage_[1];
-  NSString *name;
-  GPBAny *value;
-} GPBOption__storage_;
-
-// This method is threadsafe because it is initially called
-// in +initialize for each subclass.
-+ (GPBDescriptor *)descriptor {
-  static GPBDescriptor *descriptor = nil;
-  if (!descriptor) {
-    static GPBMessageFieldDescription fields[] = {
-      {
-        .name = "name",
-        .dataTypeSpecific.clazz = Nil,
-        .number = GPBOption_FieldNumber_Name,
-        .hasIndex = 0,
-        .offset = (uint32_t)offsetof(GPBOption__storage_, name),
-        .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldClearHasIvarOnZero),
-        .dataType = GPBDataTypeString,
-      },
-      {
-        .name = "value",
-        .dataTypeSpecific.clazz = GPBObjCClass(GPBAny),
-        .number = GPBOption_FieldNumber_Value,
-        .hasIndex = 1,
-        .offset = (uint32_t)offsetof(GPBOption__storage_, value),
-        .flags = GPBFieldOptional,
-        .dataType = GPBDataTypeMessage,
-      },
-    };
-    GPBDescriptor *localDescriptor =
-        [GPBDescriptor allocDescriptorForClass:[GPBOption class]
-                                     rootClass:[GPBTypeRoot class]
-                                          file:GPBTypeRoot_FileDescriptor()
-                                        fields:fields
-                                    fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
-                                   storageSize:sizeof(GPBOption__storage_)
-                                         flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown)];
-    #if defined(DEBUG) && DEBUG
-      NSAssert(descriptor == nil, @"Startup recursed!");
-    #endif  // DEBUG
-    descriptor = localDescriptor;
-  }
-  return descriptor;
-}
-
-@end
-
-
-#pragma clang diagnostic pop
-
-// @@protoc_insertion_point(global_scope)
diff --git a/libs/protobuf/objectivec/GPBUnknownField.h b/libs/protobuf/objectivec/GPBUnknownField.h
deleted file mode 100644
index 5b96023..0000000
--- a/libs/protobuf/objectivec/GPBUnknownField.h
+++ /dev/null
@@ -1,99 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#import <Foundation/Foundation.h>
-
-@class GPBCodedOutputStream;
-@class GPBUInt32Array;
-@class GPBUInt64Array;
-@class GPBUnknownFieldSet;
-
-NS_ASSUME_NONNULL_BEGIN
-/**
- * Store an unknown field. These are used in conjunction with
- * GPBUnknownFieldSet.
- **/
-@interface GPBUnknownField : NSObject<NSCopying>
-
-/** Initialize a field with the given number. */
-- (instancetype)initWithNumber:(int32_t)number;
-
-/** The field number the data is stored under. */
-@property(nonatomic, readonly, assign) int32_t number;
-
-/** An array of varint values for this field. */
-@property(nonatomic, readonly, strong) GPBUInt64Array *varintList;
-
-/** An array of fixed32 values for this field. */
-@property(nonatomic, readonly, strong) GPBUInt32Array *fixed32List;
-
-/** An array of fixed64 values for this field. */
-@property(nonatomic, readonly, strong) GPBUInt64Array *fixed64List;
-
-/** An array of data values for this field. */
-@property(nonatomic, readonly, strong) NSArray<NSData*> *lengthDelimitedList;
-
-/** An array of groups of values for this field. */
-@property(nonatomic, readonly, strong) NSArray<GPBUnknownFieldSet*> *groupList;
-
-/**
- * Add a value to the varintList.
- *
- * @param value The value to add.
- **/
-- (void)addVarint:(uint64_t)value;
-/**
- * Add a value to the fixed32List.
- *
- * @param value The value to add.
- **/
-- (void)addFixed32:(uint32_t)value;
-/**
- * Add a value to the fixed64List.
- *
- * @param value The value to add.
- **/
-- (void)addFixed64:(uint64_t)value;
-/**
- * Add a value to the lengthDelimitedList.
- *
- * @param value The value to add.
- **/
-- (void)addLengthDelimited:(NSData *)value;
-/**
- * Add a value to the groupList.
- *
- * @param value The value to add.
- **/
-- (void)addGroup:(GPBUnknownFieldSet *)value;
-
-@end
-
-NS_ASSUME_NONNULL_END
diff --git a/libs/protobuf/objectivec/GPBUnknownField.m b/libs/protobuf/objectivec/GPBUnknownField.m
deleted file mode 100644
index 7fa8cad..0000000
--- a/libs/protobuf/objectivec/GPBUnknownField.m
+++ /dev/null
@@ -1,337 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#import "GPBUnknownField_PackagePrivate.h"
-
-#import "GPBArray.h"
-#import "GPBCodedOutputStream_PackagePrivate.h"
-#import "GPBUnknownFieldSet.h"
-
-@implementation GPBUnknownField {
- @protected
-  int32_t number_;
-  GPBUInt64Array *mutableVarintList_;
-  GPBUInt32Array *mutableFixed32List_;
-  GPBUInt64Array *mutableFixed64List_;
-  NSMutableArray<NSData*> *mutableLengthDelimitedList_;
-  NSMutableArray<GPBUnknownFieldSet*> *mutableGroupList_;
-}
-
-@synthesize number = number_;
-@synthesize varintList = mutableVarintList_;
-@synthesize fixed32List = mutableFixed32List_;
-@synthesize fixed64List = mutableFixed64List_;
-@synthesize lengthDelimitedList = mutableLengthDelimitedList_;
-@synthesize groupList = mutableGroupList_;
-
-- (instancetype)initWithNumber:(int32_t)number {
-  if ((self = [super init])) {
-    number_ = number;
-  }
-  return self;
-}
-
-- (void)dealloc {
-  [mutableVarintList_ release];
-  [mutableFixed32List_ release];
-  [mutableFixed64List_ release];
-  [mutableLengthDelimitedList_ release];
-  [mutableGroupList_ release];
-
-  [super dealloc];
-}
-
-// Direct access is use for speed, to avoid even internally declaring things
-// read/write, etc. The warning is enabled in the project to ensure code calling
-// protos can turn on -Wdirect-ivar-access without issues.
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdirect-ivar-access"
-
-- (id)copyWithZone:(NSZone *)zone {
-  GPBUnknownField *result =
-      [[GPBUnknownField allocWithZone:zone] initWithNumber:number_];
-  result->mutableFixed32List_ = [mutableFixed32List_ copyWithZone:zone];
-  result->mutableFixed64List_ = [mutableFixed64List_ copyWithZone:zone];
-  result->mutableLengthDelimitedList_ =
-      [mutableLengthDelimitedList_ mutableCopyWithZone:zone];
-  result->mutableVarintList_ = [mutableVarintList_ copyWithZone:zone];
-  if (mutableGroupList_.count) {
-    result->mutableGroupList_ = [[NSMutableArray allocWithZone:zone]
-        initWithCapacity:mutableGroupList_.count];
-    for (GPBUnknownFieldSet *group in mutableGroupList_) {
-      GPBUnknownFieldSet *copied = [group copyWithZone:zone];
-      [result->mutableGroupList_ addObject:copied];
-      [copied release];
-    }
-  }
-  return result;
-}
-
-- (BOOL)isEqual:(id)object {
-  if (self == object) return YES;
-  if (![object isKindOfClass:[GPBUnknownField class]]) return NO;
-  GPBUnknownField *field = (GPBUnknownField *)object;
-  if (number_ != field->number_) return NO;
-  BOOL equalVarint =
-      (mutableVarintList_.count == 0 && field->mutableVarintList_.count == 0) ||
-      [mutableVarintList_ isEqual:field->mutableVarintList_];
-  if (!equalVarint) return NO;
-  BOOL equalFixed32 = (mutableFixed32List_.count == 0 &&
-                       field->mutableFixed32List_.count == 0) ||
-                      [mutableFixed32List_ isEqual:field->mutableFixed32List_];
-  if (!equalFixed32) return NO;
-  BOOL equalFixed64 = (mutableFixed64List_.count == 0 &&
-                       field->mutableFixed64List_.count == 0) ||
-                      [mutableFixed64List_ isEqual:field->mutableFixed64List_];
-  if (!equalFixed64) return NO;
-  BOOL equalLDList =
-      (mutableLengthDelimitedList_.count == 0 &&
-       field->mutableLengthDelimitedList_.count == 0) ||
-      [mutableLengthDelimitedList_ isEqual:field->mutableLengthDelimitedList_];
-  if (!equalLDList) return NO;
-  BOOL equalGroupList =
-      (mutableGroupList_.count == 0 && field->mutableGroupList_.count == 0) ||
-      [mutableGroupList_ isEqual:field->mutableGroupList_];
-  if (!equalGroupList) return NO;
-  return YES;
-}
-
-- (NSUInteger)hash {
-  // Just mix the hashes of the possible sub arrays.
-  const int prime = 31;
-  NSUInteger result = prime + [mutableVarintList_ hash];
-  result = prime * result + [mutableFixed32List_ hash];
-  result = prime * result + [mutableFixed64List_ hash];
-  result = prime * result + [mutableLengthDelimitedList_ hash];
-  result = prime * result + [mutableGroupList_ hash];
-  return result;
-}
-
-- (void)writeToOutput:(GPBCodedOutputStream *)output {
-  NSUInteger count = mutableVarintList_.count;
-  if (count > 0) {
-    [output writeUInt64Array:number_ values:mutableVarintList_ tag:0];
-  }
-  count = mutableFixed32List_.count;
-  if (count > 0) {
-    [output writeFixed32Array:number_ values:mutableFixed32List_ tag:0];
-  }
-  count = mutableFixed64List_.count;
-  if (count > 0) {
-    [output writeFixed64Array:number_ values:mutableFixed64List_ tag:0];
-  }
-  count = mutableLengthDelimitedList_.count;
-  if (count > 0) {
-    [output writeBytesArray:number_ values:mutableLengthDelimitedList_];
-  }
-  count = mutableGroupList_.count;
-  if (count > 0) {
-    [output writeUnknownGroupArray:number_ values:mutableGroupList_];
-  }
-}
-
-- (size_t)serializedSize {
-  __block size_t result = 0;
-  int32_t number = number_;
-  [mutableVarintList_
-      enumerateValuesWithBlock:^(uint64_t value, NSUInteger idx, BOOL *stop) {
-#pragma unused(idx, stop)
-        result += GPBComputeUInt64Size(number, value);
-      }];
-
-  [mutableFixed32List_
-      enumerateValuesWithBlock:^(uint32_t value, NSUInteger idx, BOOL *stop) {
-#pragma unused(idx, stop)
-        result += GPBComputeFixed32Size(number, value);
-      }];
-
-  [mutableFixed64List_
-      enumerateValuesWithBlock:^(uint64_t value, NSUInteger idx, BOOL *stop) {
-#pragma unused(idx, stop)
-        result += GPBComputeFixed64Size(number, value);
-      }];
-
-  for (NSData *data in mutableLengthDelimitedList_) {
-    result += GPBComputeBytesSize(number, data);
-  }
-
-  for (GPBUnknownFieldSet *set in mutableGroupList_) {
-    result += GPBComputeUnknownGroupSize(number, set);
-  }
-
-  return result;
-}
-
-- (void)writeAsMessageSetExtensionToOutput:(GPBCodedOutputStream *)output {
-  for (NSData *data in mutableLengthDelimitedList_) {
-    [output writeRawMessageSetExtension:number_ value:data];
-  }
-}
-
-- (size_t)serializedSizeAsMessageSetExtension {
-  size_t result = 0;
-  for (NSData *data in mutableLengthDelimitedList_) {
-    result += GPBComputeRawMessageSetExtensionSize(number_, data);
-  }
-  return result;
-}
-
-- (NSString *)description {
-  NSMutableString *description =
-      [NSMutableString stringWithFormat:@"<%@ %p>: Field: %d {\n",
-       [self class], self, number_];
-  [mutableVarintList_
-      enumerateValuesWithBlock:^(uint64_t value, NSUInteger idx, BOOL *stop) {
-#pragma unused(idx, stop)
-        [description appendFormat:@"\t%llu\n", value];
-      }];
-
-  [mutableFixed32List_
-      enumerateValuesWithBlock:^(uint32_t value, NSUInteger idx, BOOL *stop) {
-#pragma unused(idx, stop)
-        [description appendFormat:@"\t%u\n", value];
-      }];
-
-  [mutableFixed64List_
-      enumerateValuesWithBlock:^(uint64_t value, NSUInteger idx, BOOL *stop) {
-#pragma unused(idx, stop)
-        [description appendFormat:@"\t%llu\n", value];
-      }];
-
-  for (NSData *data in mutableLengthDelimitedList_) {
-    [description appendFormat:@"\t%@\n", data];
-  }
-
-  for (GPBUnknownFieldSet *set in mutableGroupList_) {
-    [description appendFormat:@"\t%@\n", set];
-  }
-  [description appendString:@"}"];
-  return description;
-}
-
-- (void)mergeFromField:(GPBUnknownField *)other {
-  GPBUInt64Array *otherVarintList = other.varintList;
-  if (otherVarintList.count > 0) {
-    if (mutableVarintList_ == nil) {
-      mutableVarintList_ = [otherVarintList copy];
-    } else {
-      [mutableVarintList_ addValuesFromArray:otherVarintList];
-    }
-  }
-
-  GPBUInt32Array *otherFixed32List = other.fixed32List;
-  if (otherFixed32List.count > 0) {
-    if (mutableFixed32List_ == nil) {
-      mutableFixed32List_ = [otherFixed32List copy];
-    } else {
-      [mutableFixed32List_ addValuesFromArray:otherFixed32List];
-    }
-  }
-
-  GPBUInt64Array *otherFixed64List = other.fixed64List;
-  if (otherFixed64List.count > 0) {
-    if (mutableFixed64List_ == nil) {
-      mutableFixed64List_ = [otherFixed64List copy];
-    } else {
-      [mutableFixed64List_ addValuesFromArray:otherFixed64List];
-    }
-  }
-
-  NSArray *otherLengthDelimitedList = other.lengthDelimitedList;
-  if (otherLengthDelimitedList.count > 0) {
-    if (mutableLengthDelimitedList_ == nil) {
-      mutableLengthDelimitedList_ = [otherLengthDelimitedList mutableCopy];
-    } else {
-      [mutableLengthDelimitedList_
-          addObjectsFromArray:otherLengthDelimitedList];
-    }
-  }
-
-  NSArray *otherGroupList = other.groupList;
-  if (otherGroupList.count > 0) {
-    if (mutableGroupList_ == nil) {
-      mutableGroupList_ =
-          [[NSMutableArray alloc] initWithCapacity:otherGroupList.count];
-    }
-    // Make our own mutable copies.
-    for (GPBUnknownFieldSet *group in otherGroupList) {
-      GPBUnknownFieldSet *copied = [group copy];
-      [mutableGroupList_ addObject:copied];
-      [copied release];
-    }
-  }
-}
-
-- (void)addVarint:(uint64_t)value {
-  if (mutableVarintList_ == nil) {
-    mutableVarintList_ = [[GPBUInt64Array alloc] initWithValues:&value count:1];
-  } else {
-    [mutableVarintList_ addValue:value];
-  }
-}
-
-- (void)addFixed32:(uint32_t)value {
-  if (mutableFixed32List_ == nil) {
-    mutableFixed32List_ =
-        [[GPBUInt32Array alloc] initWithValues:&value count:1];
-  } else {
-    [mutableFixed32List_ addValue:value];
-  }
-}
-
-- (void)addFixed64:(uint64_t)value {
-  if (mutableFixed64List_ == nil) {
-    mutableFixed64List_ =
-        [[GPBUInt64Array alloc] initWithValues:&value count:1];
-  } else {
-    [mutableFixed64List_ addValue:value];
-  }
-}
-
-- (void)addLengthDelimited:(NSData *)value {
-  if (mutableLengthDelimitedList_ == nil) {
-    mutableLengthDelimitedList_ =
-        [[NSMutableArray alloc] initWithObjects:&value count:1];
-  } else {
-    [mutableLengthDelimitedList_ addObject:value];
-  }
-}
-
-- (void)addGroup:(GPBUnknownFieldSet *)value {
-  if (mutableGroupList_ == nil) {
-    mutableGroupList_ = [[NSMutableArray alloc] initWithObjects:&value count:1];
-  } else {
-    [mutableGroupList_ addObject:value];
-  }
-}
-
-#pragma clang diagnostic pop
-
-@end
diff --git a/libs/protobuf/objectivec/GPBUnknownFieldSet.h b/libs/protobuf/objectivec/GPBUnknownFieldSet.h
deleted file mode 100644
index 1b5f24f..0000000
--- a/libs/protobuf/objectivec/GPBUnknownFieldSet.h
+++ /dev/null
@@ -1,82 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#import <Foundation/Foundation.h>
-
-@class GPBUnknownField;
-
-NS_ASSUME_NONNULL_BEGIN
-
-/**
- * A collection of unknown fields. Fields parsed from the binary representation
- * of a message that are unknown end up in an instance of this set. This only
- * applies for files declared with the "proto2" syntax. Files declared with the
- * "proto3" syntax discard the unknown values.
- **/
-@interface GPBUnknownFieldSet : NSObject<NSCopying>
-
-/**
- * Tests to see if the given field number has a value.
- *
- * @param number The field number to check.
- *
- * @return YES if there is an unknown field for the given field number.
- **/
-- (BOOL)hasField:(int32_t)number;
-
-/**
- * Fetches the GPBUnknownField for the given field number.
- *
- * @param number The field number to look up.
- *
- * @return The GPBUnknownField or nil if none found.
- **/
-- (nullable GPBUnknownField *)getField:(int32_t)number;
-
-/**
- * @return The number of fields in this set.
- **/
-- (NSUInteger)countOfFields;
-
-/**
- * Adds the given field to the set.
- *
- * @param field The field to add to the set.
- **/
-- (void)addField:(GPBUnknownField *)field;
-
-/**
- * @return An array of the GPBUnknownFields sorted by the field numbers.
- **/
-- (NSArray<GPBUnknownField *> *)sortedFields;
-
-@end
-
-NS_ASSUME_NONNULL_END
diff --git a/libs/protobuf/objectivec/GPBUnknownFieldSet.m b/libs/protobuf/objectivec/GPBUnknownFieldSet.m
deleted file mode 100644
index a7335f0..0000000
--- a/libs/protobuf/objectivec/GPBUnknownFieldSet.m
+++ /dev/null
@@ -1,395 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#import "GPBUnknownFieldSet_PackagePrivate.h"
-
-#import "GPBCodedInputStream_PackagePrivate.h"
-#import "GPBCodedOutputStream.h"
-#import "GPBUnknownField_PackagePrivate.h"
-#import "GPBUtilities.h"
-#import "GPBWireFormat.h"
-
-#pragma mark Helpers
-
-static void checkNumber(int32_t number) {
-  if (number == 0) {
-    [NSException raise:NSInvalidArgumentException
-                format:@"Zero is not a valid field number."];
-  }
-}
-
-@implementation GPBUnknownFieldSet {
- @package
-  CFMutableDictionaryRef fields_;
-}
-
-static void CopyWorker(const void *key, const void *value, void *context) {
-#pragma unused(key)
-  GPBUnknownField *field = value;
-  GPBUnknownFieldSet *result = context;
-
-  GPBUnknownField *copied = [field copy];
-  [result addField:copied];
-  [copied release];
-}
-
-// Direct access is use for speed, to avoid even internally declaring things
-// read/write, etc. The warning is enabled in the project to ensure code calling
-// protos can turn on -Wdirect-ivar-access without issues.
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdirect-ivar-access"
-
-- (id)copyWithZone:(NSZone *)zone {
-  GPBUnknownFieldSet *result = [[GPBUnknownFieldSet allocWithZone:zone] init];
-  if (fields_) {
-    CFDictionaryApplyFunction(fields_, CopyWorker, result);
-  }
-  return result;
-}
-
-- (void)dealloc {
-  if (fields_) {
-    CFRelease(fields_);
-  }
-  [super dealloc];
-}
-
-- (BOOL)isEqual:(id)object {
-  BOOL equal = NO;
-  if ([object isKindOfClass:[GPBUnknownFieldSet class]]) {
-    GPBUnknownFieldSet *set = (GPBUnknownFieldSet *)object;
-    if ((fields_ == NULL) && (set->fields_ == NULL)) {
-      equal = YES;
-    } else if ((fields_ != NULL) && (set->fields_ != NULL)) {
-      equal = CFEqual(fields_, set->fields_);
-    }
-  }
-  return equal;
-}
-
-- (NSUInteger)hash {
-  // Return the hash of the fields dictionary (or just some value).
-  if (fields_) {
-    return CFHash(fields_);
-  }
-  return (NSUInteger)[GPBUnknownFieldSet class];
-}
-
-#pragma mark - Public Methods
-
-- (BOOL)hasField:(int32_t)number {
-  ssize_t key = number;
-  return fields_ ? (CFDictionaryGetValue(fields_, (void *)key) != nil) : NO;
-}
-
-- (GPBUnknownField *)getField:(int32_t)number {
-  ssize_t key = number;
-  GPBUnknownField *result =
-      fields_ ? CFDictionaryGetValue(fields_, (void *)key) : nil;
-  return result;
-}
-
-- (NSUInteger)countOfFields {
-  return fields_ ? CFDictionaryGetCount(fields_) : 0;
-}
-
-- (NSArray *)sortedFields {
-  if (!fields_) return [NSArray array];
-  size_t count = CFDictionaryGetCount(fields_);
-  ssize_t keys[count];
-  GPBUnknownField *values[count];
-  CFDictionaryGetKeysAndValues(fields_, (const void **)keys,
-                               (const void **)values);
-  struct GPBFieldPair {
-    ssize_t key;
-    GPBUnknownField *value;
-  } pairs[count];
-  for (size_t i = 0; i < count; ++i) {
-    pairs[i].key = keys[i];
-    pairs[i].value = values[i];
-  };
-  qsort_b(pairs, count, sizeof(struct GPBFieldPair),
-          ^(const void *first, const void *second) {
-            const struct GPBFieldPair *a = first;
-            const struct GPBFieldPair *b = second;
-            return (a->key > b->key) ? 1 : ((a->key == b->key) ? 0 : -1);
-          });
-  for (size_t i = 0; i < count; ++i) {
-    values[i] = pairs[i].value;
-  };
-  return [NSArray arrayWithObjects:values count:count];
-}
-
-#pragma mark - Internal Methods
-
-- (void)writeToCodedOutputStream:(GPBCodedOutputStream *)output {
-  if (!fields_) return;
-  size_t count = CFDictionaryGetCount(fields_);
-  ssize_t keys[count];
-  GPBUnknownField *values[count];
-  CFDictionaryGetKeysAndValues(fields_, (const void **)keys,
-                               (const void **)values);
-  if (count > 1) {
-    struct GPBFieldPair {
-      ssize_t key;
-      GPBUnknownField *value;
-    } pairs[count];
-
-    for (size_t i = 0; i < count; ++i) {
-      pairs[i].key = keys[i];
-      pairs[i].value = values[i];
-    };
-    qsort_b(pairs, count, sizeof(struct GPBFieldPair),
-            ^(const void *first, const void *second) {
-              const struct GPBFieldPair *a = first;
-              const struct GPBFieldPair *b = second;
-              return (a->key > b->key) ? 1 : ((a->key == b->key) ? 0 : -1);
-            });
-    for (size_t i = 0; i < count; ++i) {
-      GPBUnknownField *value = pairs[i].value;
-      [value writeToOutput:output];
-    }
-  } else {
-    [values[0] writeToOutput:output];
-  }
-}
-
-- (NSString *)description {
-  NSMutableString *description = [NSMutableString
-      stringWithFormat:@"<%@ %p>: TextFormat: {\n", [self class], self];
-  NSString *textFormat = GPBTextFormatForUnknownFieldSet(self, @"  ");
-  [description appendString:textFormat];
-  [description appendString:@"}"];
-  return description;
-}
-
-static void GPBUnknownFieldSetSerializedSize(const void *key, const void *value,
-                                             void *context) {
-#pragma unused(key)
-  GPBUnknownField *field = value;
-  size_t *result = context;
-  *result += [field serializedSize];
-}
-
-- (size_t)serializedSize {
-  size_t result = 0;
-  if (fields_) {
-    CFDictionaryApplyFunction(fields_, GPBUnknownFieldSetSerializedSize,
-                              &result);
-  }
-  return result;
-}
-
-static void GPBUnknownFieldSetWriteAsMessageSetTo(const void *key,
-                                                  const void *value,
-                                                  void *context) {
-#pragma unused(key)
-  GPBUnknownField *field = value;
-  GPBCodedOutputStream *output = context;
-  [field writeAsMessageSetExtensionToOutput:output];
-}
-
-- (void)writeAsMessageSetTo:(GPBCodedOutputStream *)output {
-  if (fields_) {
-    CFDictionaryApplyFunction(fields_, GPBUnknownFieldSetWriteAsMessageSetTo,
-                              output);
-  }
-}
-
-static void GPBUnknownFieldSetSerializedSizeAsMessageSet(const void *key,
-                                                         const void *value,
-                                                         void *context) {
-#pragma unused(key)
-  GPBUnknownField *field = value;
-  size_t *result = context;
-  *result += [field serializedSizeAsMessageSetExtension];
-}
-
-- (size_t)serializedSizeAsMessageSet {
-  size_t result = 0;
-  if (fields_) {
-    CFDictionaryApplyFunction(
-        fields_, GPBUnknownFieldSetSerializedSizeAsMessageSet, &result);
-  }
-  return result;
-}
-
-- (NSData *)data {
-  NSMutableData *data = [NSMutableData dataWithLength:self.serializedSize];
-  GPBCodedOutputStream *output =
-      [[GPBCodedOutputStream alloc] initWithData:data];
-  [self writeToCodedOutputStream:output];
-  [output release];
-  return data;
-}
-
-+ (BOOL)isFieldTag:(int32_t)tag {
-  return GPBWireFormatGetTagWireType(tag) != GPBWireFormatEndGroup;
-}
-
-- (void)addField:(GPBUnknownField *)field {
-  int32_t number = [field number];
-  checkNumber(number);
-  if (!fields_) {
-    // Use a custom dictionary here because the keys are numbers and conversion
-    // back and forth from NSNumber isn't worth the cost.
-    fields_ = CFDictionaryCreateMutable(kCFAllocatorDefault, 0, NULL,
-                                        &kCFTypeDictionaryValueCallBacks);
-  }
-  ssize_t key = number;
-  CFDictionarySetValue(fields_, (const void *)key, field);
-}
-
-- (GPBUnknownField *)mutableFieldForNumber:(int32_t)number create:(BOOL)create {
-  ssize_t key = number;
-  GPBUnknownField *existing =
-      fields_ ? CFDictionaryGetValue(fields_, (const void *)key) : nil;
-  if (!existing && create) {
-    existing = [[GPBUnknownField alloc] initWithNumber:number];
-    // This retains existing.
-    [self addField:existing];
-    [existing release];
-  }
-  return existing;
-}
-
-static void GPBUnknownFieldSetMergeUnknownFields(const void *key,
-                                                 const void *value,
-                                                 void *context) {
-#pragma unused(key)
-  GPBUnknownField *field = value;
-  GPBUnknownFieldSet *self = context;
-
-  int32_t number = [field number];
-  checkNumber(number);
-  GPBUnknownField *oldField = [self mutableFieldForNumber:number create:NO];
-  if (oldField) {
-    [oldField mergeFromField:field];
-  } else {
-    // Merge only comes from GPBMessage's mergeFrom:, so it means we are on
-    // mutable message and are an mutable instance, so make sure we need
-    // mutable fields.
-    GPBUnknownField *fieldCopy = [field copy];
-    [self addField:fieldCopy];
-    [fieldCopy release];
-  }
-}
-
-- (void)mergeUnknownFields:(GPBUnknownFieldSet *)other {
-  if (other && other->fields_) {
-    CFDictionaryApplyFunction(other->fields_,
-                              GPBUnknownFieldSetMergeUnknownFields, self);
-  }
-}
-
-- (void)mergeFromData:(NSData *)data {
-  GPBCodedInputStream *input = [[GPBCodedInputStream alloc] initWithData:data];
-  [self mergeFromCodedInputStream:input];
-  [input checkLastTagWas:0];
-  [input release];
-}
-
-- (void)mergeVarintField:(int32_t)number value:(int32_t)value {
-  checkNumber(number);
-  [[self mutableFieldForNumber:number create:YES] addVarint:value];
-}
-
-- (BOOL)mergeFieldFrom:(int32_t)tag input:(GPBCodedInputStream *)input {
-  NSAssert(GPBWireFormatIsValidTag(tag), @"Got passed an invalid tag");
-  int32_t number = GPBWireFormatGetTagFieldNumber(tag);
-  GPBCodedInputStreamState *state = &input->state_;
-  switch (GPBWireFormatGetTagWireType(tag)) {
-    case GPBWireFormatVarint: {
-      GPBUnknownField *field = [self mutableFieldForNumber:number create:YES];
-      [field addVarint:GPBCodedInputStreamReadInt64(state)];
-      return YES;
-    }
-    case GPBWireFormatFixed64: {
-      GPBUnknownField *field = [self mutableFieldForNumber:number create:YES];
-      [field addFixed64:GPBCodedInputStreamReadFixed64(state)];
-      return YES;
-    }
-    case GPBWireFormatLengthDelimited: {
-      NSData *data = GPBCodedInputStreamReadRetainedBytes(state);
-      GPBUnknownField *field = [self mutableFieldForNumber:number create:YES];
-      [field addLengthDelimited:data];
-      [data release];
-      return YES;
-    }
-    case GPBWireFormatStartGroup: {
-      GPBUnknownFieldSet *unknownFieldSet = [[GPBUnknownFieldSet alloc] init];
-      [input readUnknownGroup:number message:unknownFieldSet];
-      GPBUnknownField *field = [self mutableFieldForNumber:number create:YES];
-      [field addGroup:unknownFieldSet];
-      [unknownFieldSet release];
-      return YES;
-    }
-    case GPBWireFormatEndGroup:
-      return NO;
-    case GPBWireFormatFixed32: {
-      GPBUnknownField *field = [self mutableFieldForNumber:number create:YES];
-      [field addFixed32:GPBCodedInputStreamReadFixed32(state)];
-      return YES;
-    }
-  }
-}
-
-- (void)mergeMessageSetMessage:(int32_t)number data:(NSData *)messageData {
-  [[self mutableFieldForNumber:number create:YES]
-      addLengthDelimited:messageData];
-}
-
-- (void)addUnknownMapEntry:(int32_t)fieldNum value:(NSData *)data {
-  GPBUnknownField *field = [self mutableFieldForNumber:fieldNum create:YES];
-  [field addLengthDelimited:data];
-}
-
-- (void)mergeFromCodedInputStream:(GPBCodedInputStream *)input {
-  while (YES) {
-    int32_t tag = GPBCodedInputStreamReadTag(&input->state_);
-    if (tag == 0 || ![self mergeFieldFrom:tag input:input]) {
-      break;
-    }
-  }
-}
-
-- (void)getTags:(int32_t *)tags {
-  if (!fields_) return;
-  size_t count = CFDictionaryGetCount(fields_);
-  ssize_t keys[count];
-  CFDictionaryGetKeysAndValues(fields_, (const void **)keys, NULL);
-  for (size_t i = 0; i < count; ++i) {
-    tags[i] = (int32_t)keys[i];
-  }
-}
-
-#pragma clang diagnostic pop
-
-@end
diff --git a/libs/protobuf/objectivec/GPBUnknownFieldSet_PackagePrivate.h b/libs/protobuf/objectivec/GPBUnknownFieldSet_PackagePrivate.h
deleted file mode 100644
index e27127a..0000000
--- a/libs/protobuf/objectivec/GPBUnknownFieldSet_PackagePrivate.h
+++ /dev/null
@@ -1,61 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#import <Foundation/Foundation.h>
-
-#import "GPBUnknownFieldSet.h"
-
-@class GPBCodedOutputStream;
-@class GPBCodedInputStream;
-
-@interface GPBUnknownFieldSet ()
-
-+ (BOOL)isFieldTag:(int32_t)tag;
-
-- (NSData *)data;
-
-- (size_t)serializedSize;
-- (size_t)serializedSizeAsMessageSet;
-
-- (void)writeToCodedOutputStream:(GPBCodedOutputStream *)output;
-- (void)writeAsMessageSetTo:(GPBCodedOutputStream *)output;
-
-- (void)mergeUnknownFields:(GPBUnknownFieldSet *)other;
-
-- (void)mergeFromCodedInputStream:(GPBCodedInputStream *)input;
-- (void)mergeFromData:(NSData *)data;
-
-- (void)mergeVarintField:(int32_t)number value:(int32_t)value;
-- (BOOL)mergeFieldFrom:(int32_t)tag input:(GPBCodedInputStream *)input;
-- (void)mergeMessageSetMessage:(int32_t)number data:(NSData *)messageData;
-
-- (void)addUnknownMapEntry:(int32_t)fieldNum value:(NSData *)data;
-
-@end
diff --git a/libs/protobuf/objectivec/GPBUnknownField_PackagePrivate.h b/libs/protobuf/objectivec/GPBUnknownField_PackagePrivate.h
deleted file mode 100644
index 2b4c789..0000000
--- a/libs/protobuf/objectivec/GPBUnknownField_PackagePrivate.h
+++ /dev/null
@@ -1,47 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#import <Foundation/Foundation.h>
-
-#import "GPBUnknownField.h"
-
-@class GPBCodedOutputStream;
-
-@interface GPBUnknownField ()
-
-- (void)writeToOutput:(GPBCodedOutputStream *)output;
-- (size_t)serializedSize;
-
-- (void)writeAsMessageSetExtensionToOutput:(GPBCodedOutputStream *)output;
-- (size_t)serializedSizeAsMessageSetExtension;
-
-- (void)mergeFromField:(GPBUnknownField *)other;
-
-@end
diff --git a/libs/protobuf/objectivec/GPBUtilities.h b/libs/protobuf/objectivec/GPBUtilities.h
deleted file mode 100644
index 75759b2..0000000
--- a/libs/protobuf/objectivec/GPBUtilities.h
+++ /dev/null
@@ -1,551 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#import <Foundation/Foundation.h>
-
-#import "GPBArray.h"
-#import "GPBMessage.h"
-#import "GPBRuntimeTypes.h"
-
-@class GPBOneofDescriptor;
-
-CF_EXTERN_C_BEGIN
-
-NS_ASSUME_NONNULL_BEGIN
-
-/**
- * Generates a string that should be a valid "TextFormat" for the C++ version
- * of Protocol Buffers.
- *
- * @param message    The message to generate from.
- * @param lineIndent A string to use as the prefix for all lines generated. Can
- *                   be nil if no extra indent is needed.
- *
- * @return An NSString with the TextFormat of the message.
- **/
-NSString *GPBTextFormatForMessage(GPBMessage *message,
-                                  NSString * __nullable lineIndent);
-
-/**
- * Generates a string that should be a valid "TextFormat" for the C++ version
- * of Protocol Buffers.
- *
- * @param unknownSet The unknown field set to generate from.
- * @param lineIndent A string to use as the prefix for all lines generated. Can
- *                   be nil if no extra indent is needed.
- *
- * @return An NSString with the TextFormat of the unknown field set.
- **/
-NSString *GPBTextFormatForUnknownFieldSet(GPBUnknownFieldSet * __nullable unknownSet,
-                                          NSString * __nullable lineIndent);
-
-/**
- * Checks if the given field number is set on a message.
- *
- * @param self        The message to check.
- * @param fieldNumber The field number to check.
- *
- * @return YES if the field number is set on the given message.
- **/
-BOOL GPBMessageHasFieldNumberSet(GPBMessage *self, uint32_t fieldNumber);
-
-/**
- * Checks if the given field is set on a message.
- *
- * @param self  The message to check.
- * @param field The field to check.
- *
- * @return YES if the field is set on the given message.
- **/
-BOOL GPBMessageHasFieldSet(GPBMessage *self, GPBFieldDescriptor *field);
-
-/**
- * Clears the given field for the given message.
- *
- * @param self  The message for which to clear the field.
- * @param field The field to clear.
- **/
-void GPBClearMessageField(GPBMessage *self, GPBFieldDescriptor *field);
-
-/**
- * Clears the given oneof field for the given message.
- *
- * @param self  The message for which to clear the field.
- * @param oneof The oneof to clear.
- **/
-void GPBClearOneof(GPBMessage *self, GPBOneofDescriptor *oneof);
-
-//%PDDM-EXPAND GPB_ACCESSORS()
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-
-//
-// Get/Set a given field from/to a message.
-//
-
-// Single Fields
-
-/**
- * Gets the value of a bytes field.
- *
- * @param self  The message from which to get the field.
- * @param field The field to get.
- **/
-NSData *GPBGetMessageBytesField(GPBMessage *self, GPBFieldDescriptor *field);
-
-/**
- * Sets the value of a bytes field.
- *
- * @param self  The message into which to set the field.
- * @param field The field to set.
- * @param value The to set in the field.
- **/
-void GPBSetMessageBytesField(GPBMessage *self, GPBFieldDescriptor *field, NSData *value);
-
-/**
- * Gets the value of a string field.
- *
- * @param self  The message from which to get the field.
- * @param field The field to get.
- **/
-NSString *GPBGetMessageStringField(GPBMessage *self, GPBFieldDescriptor *field);
-
-/**
- * Sets the value of a string field.
- *
- * @param self  The message into which to set the field.
- * @param field The field to set.
- * @param value The to set in the field.
- **/
-void GPBSetMessageStringField(GPBMessage *self, GPBFieldDescriptor *field, NSString *value);
-
-/**
- * Gets the value of a message field.
- *
- * @param self  The message from which to get the field.
- * @param field The field to get.
- **/
-GPBMessage *GPBGetMessageMessageField(GPBMessage *self, GPBFieldDescriptor *field);
-
-/**
- * Sets the value of a message field.
- *
- * @param self  The message into which to set the field.
- * @param field The field to set.
- * @param value The to set in the field.
- **/
-void GPBSetMessageMessageField(GPBMessage *self, GPBFieldDescriptor *field, GPBMessage *value);
-
-/**
- * Gets the value of a group field.
- *
- * @param self  The message from which to get the field.
- * @param field The field to get.
- **/
-GPBMessage *GPBGetMessageGroupField(GPBMessage *self, GPBFieldDescriptor *field);
-
-/**
- * Sets the value of a group field.
- *
- * @param self  The message into which to set the field.
- * @param field The field to set.
- * @param value The to set in the field.
- **/
-void GPBSetMessageGroupField(GPBMessage *self, GPBFieldDescriptor *field, GPBMessage *value);
-
-/**
- * Gets the value of a bool field.
- *
- * @param self  The message from which to get the field.
- * @param field The field to get.
- **/
-BOOL GPBGetMessageBoolField(GPBMessage *self, GPBFieldDescriptor *field);
-
-/**
- * Sets the value of a bool field.
- *
- * @param self  The message into which to set the field.
- * @param field The field to set.
- * @param value The to set in the field.
- **/
-void GPBSetMessageBoolField(GPBMessage *self, GPBFieldDescriptor *field, BOOL value);
-
-/**
- * Gets the value of an int32 field.
- *
- * @param self  The message from which to get the field.
- * @param field The field to get.
- **/
-int32_t GPBGetMessageInt32Field(GPBMessage *self, GPBFieldDescriptor *field);
-
-/**
- * Sets the value of an int32 field.
- *
- * @param self  The message into which to set the field.
- * @param field The field to set.
- * @param value The to set in the field.
- **/
-void GPBSetMessageInt32Field(GPBMessage *self, GPBFieldDescriptor *field, int32_t value);
-
-/**
- * Gets the value of an uint32 field.
- *
- * @param self  The message from which to get the field.
- * @param field The field to get.
- **/
-uint32_t GPBGetMessageUInt32Field(GPBMessage *self, GPBFieldDescriptor *field);
-
-/**
- * Sets the value of an uint32 field.
- *
- * @param self  The message into which to set the field.
- * @param field The field to set.
- * @param value The to set in the field.
- **/
-void GPBSetMessageUInt32Field(GPBMessage *self, GPBFieldDescriptor *field, uint32_t value);
-
-/**
- * Gets the value of an int64 field.
- *
- * @param self  The message from which to get the field.
- * @param field The field to get.
- **/
-int64_t GPBGetMessageInt64Field(GPBMessage *self, GPBFieldDescriptor *field);
-
-/**
- * Sets the value of an int64 field.
- *
- * @param self  The message into which to set the field.
- * @param field The field to set.
- * @param value The to set in the field.
- **/
-void GPBSetMessageInt64Field(GPBMessage *self, GPBFieldDescriptor *field, int64_t value);
-
-/**
- * Gets the value of an uint64 field.
- *
- * @param self  The message from which to get the field.
- * @param field The field to get.
- **/
-uint64_t GPBGetMessageUInt64Field(GPBMessage *self, GPBFieldDescriptor *field);
-
-/**
- * Sets the value of an uint64 field.
- *
- * @param self  The message into which to set the field.
- * @param field The field to set.
- * @param value The to set in the field.
- **/
-void GPBSetMessageUInt64Field(GPBMessage *self, GPBFieldDescriptor *field, uint64_t value);
-
-/**
- * Gets the value of a float field.
- *
- * @param self  The message from which to get the field.
- * @param field The field to get.
- **/
-float GPBGetMessageFloatField(GPBMessage *self, GPBFieldDescriptor *field);
-
-/**
- * Sets the value of a float field.
- *
- * @param self  The message into which to set the field.
- * @param field The field to set.
- * @param value The to set in the field.
- **/
-void GPBSetMessageFloatField(GPBMessage *self, GPBFieldDescriptor *field, float value);
-
-/**
- * Gets the value of a double field.
- *
- * @param self  The message from which to get the field.
- * @param field The field to get.
- **/
-double GPBGetMessageDoubleField(GPBMessage *self, GPBFieldDescriptor *field);
-
-/**
- * Sets the value of a double field.
- *
- * @param self  The message into which to set the field.
- * @param field The field to set.
- * @param value The to set in the field.
- **/
-void GPBSetMessageDoubleField(GPBMessage *self, GPBFieldDescriptor *field, double value);
-
-/**
- * Gets the given enum field of a message. For proto3, if the value isn't a
- * member of the enum, @c kGPBUnrecognizedEnumeratorValue will be returned.
- * GPBGetMessageRawEnumField will bypass the check and return whatever value
- * was set.
- *
- * @param self  The message from which to get the field.
- * @param field The field to get.
- *
- * @return The enum value for the given field.
- **/
-int32_t GPBGetMessageEnumField(GPBMessage *self, GPBFieldDescriptor *field);
-
-/**
- * Set the given enum field of a message. You can only set values that are
- * members of the enum.
- *
- * @param self  The message into which to set the field.
- * @param field The field to set.
- * @param value The enum value to set in the field.
- **/
-void GPBSetMessageEnumField(GPBMessage *self,
-                            GPBFieldDescriptor *field,
-                            int32_t value);
-
-/**
- * Get the given enum field of a message. No check is done to ensure the value
- * was defined in the enum.
- *
- * @param self  The message from which to get the field.
- * @param field The field to get.
- *
- * @return The raw enum value for the given field.
- **/
-int32_t GPBGetMessageRawEnumField(GPBMessage *self, GPBFieldDescriptor *field);
-
-/**
- * Set the given enum field of a message. You can set the value to anything,
- * even a value that is not a member of the enum.
- *
- * @param self  The message into which to set the field.
- * @param field The field to set.
- * @param value The raw enum value to set in the field.
- **/
-void GPBSetMessageRawEnumField(GPBMessage *self,
-                               GPBFieldDescriptor *field,
-                               int32_t value);
-
-// Repeated Fields
-
-/**
- * Gets the value of a repeated field.
- *
- * @param self  The message from which to get the field.
- * @param field The repeated field to get.
- *
- * @return A GPB*Array or an NSMutableArray based on the field's type.
- **/
-id GPBGetMessageRepeatedField(GPBMessage *self, GPBFieldDescriptor *field);
-
-/**
- * Sets the value of a repeated field.
- *
- * @param self  The message into which to set the field.
- * @param field The field to set.
- * @param array A GPB*Array or NSMutableArray based on the field's type.
- **/
-void GPBSetMessageRepeatedField(GPBMessage *self,
-                                GPBFieldDescriptor *field,
-                                id array);
-
-// Map Fields
-
-/**
- * Gets the value of a map<> field.
- *
- * @param self  The message from which to get the field.
- * @param field The repeated field to get.
- *
- * @return A GPB*Dictionary or NSMutableDictionary based on the field's type.
- **/
-id GPBGetMessageMapField(GPBMessage *self, GPBFieldDescriptor *field);
-
-/**
- * Sets the value of a map<> field.
- *
- * @param self       The message into which to set the field.
- * @param field      The field to set.
- * @param dictionary A GPB*Dictionary or NSMutableDictionary based on the
- *                   field's type.
- **/
-void GPBSetMessageMapField(GPBMessage *self,
-                           GPBFieldDescriptor *field,
-                           id dictionary);
-
-// clang-format on
-//%PDDM-EXPAND-END GPB_ACCESSORS()
-
-/**
- * Returns an empty NSData to assign to byte fields when you wish to assign them
- * to empty. Prevents allocating a lot of little [NSData data] objects.
- **/
-NSData *GPBEmptyNSData(void) __attribute__((pure));
-
-/**
- * Drops the `unknownFields` from the given message and from all sub message.
- **/
-void GPBMessageDropUnknownFieldsRecursively(GPBMessage *message);
-
-NS_ASSUME_NONNULL_END
-
-CF_EXTERN_C_END
-
-
-//%PDDM-DEFINE GPB_ACCESSORS()
-//%
-//%//
-//%// Get/Set a given field from/to a message.
-//%//
-//%
-//%// Single Fields
-//%
-//%GPB_ACCESSOR_SINGLE_FULL(Bytes, NSData, , *)
-//%GPB_ACCESSOR_SINGLE_FULL(String, NSString, , *)
-//%GPB_ACCESSOR_SINGLE_FULL(Message, GPBMessage, , *)
-//%GPB_ACCESSOR_SINGLE_FULL(Group, GPBMessage, , *)
-//%GPB_ACCESSOR_SINGLE(Bool, BOOL, )
-//%GPB_ACCESSOR_SINGLE(Int32, int32_t, n)
-//%GPB_ACCESSOR_SINGLE(UInt32, uint32_t, n)
-//%GPB_ACCESSOR_SINGLE(Int64, int64_t, n)
-//%GPB_ACCESSOR_SINGLE(UInt64, uint64_t, n)
-//%GPB_ACCESSOR_SINGLE(Float, float, )
-//%GPB_ACCESSOR_SINGLE(Double, double, )
-//%/**
-//% * Gets the given enum field of a message. For proto3, if the value isn't a
-//% * member of the enum, @c kGPBUnrecognizedEnumeratorValue will be returned.
-//% * GPBGetMessageRawEnumField will bypass the check and return whatever value
-//% * was set.
-//% *
-//% * @param self  The message from which to get the field.
-//% * @param field The field to get.
-//% *
-//% * @return The enum value for the given field.
-//% **/
-//%int32_t GPBGetMessageEnumField(GPBMessage *self, GPBFieldDescriptor *field);
-//%
-//%/**
-//% * Set the given enum field of a message. You can only set values that are
-//% * members of the enum.
-//% *
-//% * @param self  The message into which to set the field.
-//% * @param field The field to set.
-//% * @param value The enum value to set in the field.
-//% **/
-//%void GPBSetMessageEnumField(GPBMessage *self,
-//%                            GPBFieldDescriptor *field,
-//%                            int32_t value);
-//%
-//%/**
-//% * Get the given enum field of a message. No check is done to ensure the value
-//% * was defined in the enum.
-//% *
-//% * @param self  The message from which to get the field.
-//% * @param field The field to get.
-//% *
-//% * @return The raw enum value for the given field.
-//% **/
-//%int32_t GPBGetMessageRawEnumField(GPBMessage *self, GPBFieldDescriptor *field);
-//%
-//%/**
-//% * Set the given enum field of a message. You can set the value to anything,
-//% * even a value that is not a member of the enum.
-//% *
-//% * @param self  The message into which to set the field.
-//% * @param field The field to set.
-//% * @param value The raw enum value to set in the field.
-//% **/
-//%void GPBSetMessageRawEnumField(GPBMessage *self,
-//%                               GPBFieldDescriptor *field,
-//%                               int32_t value);
-//%
-//%// Repeated Fields
-//%
-//%/**
-//% * Gets the value of a repeated field.
-//% *
-//% * @param self  The message from which to get the field.
-//% * @param field The repeated field to get.
-//% *
-//% * @return A GPB*Array or an NSMutableArray based on the field's type.
-//% **/
-//%id GPBGetMessageRepeatedField(GPBMessage *self, GPBFieldDescriptor *field);
-//%
-//%/**
-//% * Sets the value of a repeated field.
-//% *
-//% * @param self  The message into which to set the field.
-//% * @param field The field to set.
-//% * @param array A GPB*Array or NSMutableArray based on the field's type.
-//% **/
-//%void GPBSetMessageRepeatedField(GPBMessage *self,
-//%                                GPBFieldDescriptor *field,
-//%                                id array);
-//%
-//%// Map Fields
-//%
-//%/**
-//% * Gets the value of a map<> field.
-//% *
-//% * @param self  The message from which to get the field.
-//% * @param field The repeated field to get.
-//% *
-//% * @return A GPB*Dictionary or NSMutableDictionary based on the field's type.
-//% **/
-//%id GPBGetMessageMapField(GPBMessage *self, GPBFieldDescriptor *field);
-//%
-//%/**
-//% * Sets the value of a map<> field.
-//% *
-//% * @param self       The message into which to set the field.
-//% * @param field      The field to set.
-//% * @param dictionary A GPB*Dictionary or NSMutableDictionary based on the
-//% *                   field's type.
-//% **/
-//%void GPBSetMessageMapField(GPBMessage *self,
-//%                           GPBFieldDescriptor *field,
-//%                           id dictionary);
-//%
-
-//%PDDM-DEFINE GPB_ACCESSOR_SINGLE(NAME, TYPE, AN)
-//%GPB_ACCESSOR_SINGLE_FULL(NAME, TYPE, AN, )
-//%PDDM-DEFINE GPB_ACCESSOR_SINGLE_FULL(NAME, TYPE, AN, TisP)
-//%/**
-//% * Gets the value of a##AN NAME$L field.
-//% *
-//% * @param self  The message from which to get the field.
-//% * @param field The field to get.
-//% **/
-//%TYPE TisP##GPBGetMessage##NAME##Field(GPBMessage *self, GPBFieldDescriptor *field);
-//%
-//%/**
-//% * Sets the value of a##AN NAME$L field.
-//% *
-//% * @param self  The message into which to set the field.
-//% * @param field The field to set.
-//% * @param value The to set in the field.
-//% **/
-//%void GPBSetMessage##NAME##Field(GPBMessage *self, GPBFieldDescriptor *field, TYPE TisP##value);
-//%
diff --git a/libs/protobuf/objectivec/GPBUtilities.m b/libs/protobuf/objectivec/GPBUtilities.m
deleted file mode 100644
index b72d0e2..0000000
--- a/libs/protobuf/objectivec/GPBUtilities.m
+++ /dev/null
@@ -1,2280 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#import "GPBUtilities_PackagePrivate.h"
-
-#import <objc/runtime.h>
-
-#import "GPBArray_PackagePrivate.h"
-#import "GPBDescriptor_PackagePrivate.h"
-#import "GPBDictionary_PackagePrivate.h"
-#import "GPBMessage_PackagePrivate.h"
-#import "GPBUnknownField.h"
-#import "GPBUnknownFieldSet.h"
-
-// Direct access is use for speed, to avoid even internally declaring things
-// read/write, etc. The warning is enabled in the project to ensure code calling
-// protos can turn on -Wdirect-ivar-access without issues.
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdirect-ivar-access"
-
-static void AppendTextFormatForMessage(GPBMessage *message,
-                                       NSMutableString *toStr,
-                                       NSString *lineIndent);
-
-// Are two datatypes the same basic type representation (ex Int32 and SInt32).
-// Marked unused because currently only called from asserts/debug.
-static BOOL DataTypesEquivalent(GPBDataType type1,
-                                GPBDataType type2) __attribute__ ((unused));
-
-// Basic type representation for a type (ex: for SInt32 it is Int32).
-// Marked unused because currently only called from asserts/debug.
-static GPBDataType BaseDataType(GPBDataType type) __attribute__ ((unused));
-
-// String name for a data type.
-// Marked unused because currently only called from asserts/debug.
-static NSString *TypeToString(GPBDataType dataType) __attribute__ ((unused));
-
-// Helper for clearing oneofs.
-static void GPBMaybeClearOneofPrivate(GPBMessage *self,
-                                      GPBOneofDescriptor *oneof,
-                                      int32_t oneofHasIndex,
-                                      uint32_t fieldNumberNotToClear);
-
-NSData *GPBEmptyNSData(void) {
-  static dispatch_once_t onceToken;
-  static NSData *defaultNSData = nil;
-  dispatch_once(&onceToken, ^{
-    defaultNSData = [[NSData alloc] init];
-  });
-  return defaultNSData;
-}
-
-void GPBMessageDropUnknownFieldsRecursively(GPBMessage *initialMessage) {
-  if (!initialMessage) {
-    return;
-  }
-
-  // Use an array as a list to process to avoid recursion.
-  NSMutableArray *todo = [NSMutableArray arrayWithObject:initialMessage];
-
-  while (todo.count) {
-    GPBMessage *msg = todo.lastObject;
-    [todo removeLastObject];
-
-    // Clear unknowns.
-    msg.unknownFields = nil;
-
-    // Handle the message fields.
-    GPBDescriptor *descriptor = [[msg class] descriptor];
-    for (GPBFieldDescriptor *field in descriptor->fields_) {
-      if (!GPBFieldDataTypeIsMessage(field)) {
-        continue;
-      }
-      switch (field.fieldType) {
-        case GPBFieldTypeSingle:
-          if (GPBGetHasIvarField(msg, field)) {
-            GPBMessage *fieldMessage = GPBGetObjectIvarWithFieldNoAutocreate(msg, field);
-            [todo addObject:fieldMessage];
-          }
-          break;
-
-        case GPBFieldTypeRepeated: {
-          NSArray *fieldMessages = GPBGetObjectIvarWithFieldNoAutocreate(msg, field);
-          if (fieldMessages.count) {
-            [todo addObjectsFromArray:fieldMessages];
-          }
-          break;
-        }
-
-        case GPBFieldTypeMap: {
-          id rawFieldMap = GPBGetObjectIvarWithFieldNoAutocreate(msg, field);
-          switch (field.mapKeyDataType) {
-            case GPBDataTypeBool:
-              [(GPBBoolObjectDictionary*)rawFieldMap enumerateKeysAndObjectsUsingBlock:^(
-                  BOOL key, id _Nonnull object, BOOL * _Nonnull stop) {
-                #pragma unused(key, stop)
-                [todo addObject:object];
-              }];
-              break;
-            case GPBDataTypeFixed32:
-            case GPBDataTypeUInt32:
-              [(GPBUInt32ObjectDictionary*)rawFieldMap enumerateKeysAndObjectsUsingBlock:^(
-                  uint32_t key, id _Nonnull object, BOOL * _Nonnull stop) {
-                #pragma unused(key, stop)
-                [todo addObject:object];
-              }];
-              break;
-            case GPBDataTypeInt32:
-            case GPBDataTypeSFixed32:
-            case GPBDataTypeSInt32:
-              [(GPBInt32ObjectDictionary*)rawFieldMap enumerateKeysAndObjectsUsingBlock:^(
-                  int32_t key, id _Nonnull object, BOOL * _Nonnull stop) {
-                #pragma unused(key, stop)
-                [todo addObject:object];
-              }];
-              break;
-            case GPBDataTypeFixed64:
-            case GPBDataTypeUInt64:
-              [(GPBUInt64ObjectDictionary*)rawFieldMap enumerateKeysAndObjectsUsingBlock:^(
-                  uint64_t key, id _Nonnull object, BOOL * _Nonnull stop) {
-                #pragma unused(key, stop)
-                [todo addObject:object];
-              }];
-              break;
-            case GPBDataTypeInt64:
-            case GPBDataTypeSFixed64:
-            case GPBDataTypeSInt64:
-              [(GPBInt64ObjectDictionary*)rawFieldMap enumerateKeysAndObjectsUsingBlock:^(
-                  int64_t key, id _Nonnull object, BOOL * _Nonnull stop) {
-                #pragma unused(key, stop)
-                [todo addObject:object];
-              }];
-              break;
-            case GPBDataTypeString:
-              [(NSDictionary*)rawFieldMap enumerateKeysAndObjectsUsingBlock:^(
-                  NSString * _Nonnull key, GPBMessage * _Nonnull obj, BOOL * _Nonnull stop) {
-                #pragma unused(key, stop)
-                [todo addObject:obj];
-              }];
-              break;
-            case GPBDataTypeFloat:
-            case GPBDataTypeDouble:
-            case GPBDataTypeEnum:
-            case GPBDataTypeBytes:
-            case GPBDataTypeGroup:
-            case GPBDataTypeMessage:
-              NSCAssert(NO, @"Aren't valid key types.");
-          }
-          break;
-        }  // switch(field.mapKeyDataType)
-      }  // switch(field.fieldType)
-    }  // for(fields)
-
-    // Handle any extensions holding messages.
-    for (GPBExtensionDescriptor *extension in [msg extensionsCurrentlySet]) {
-      if (!GPBDataTypeIsMessage(extension.dataType)) {
-        continue;
-      }
-      if (extension.isRepeated) {
-        NSArray *extMessages = [msg getExtension:extension];
-        [todo addObjectsFromArray:extMessages];
-      } else {
-        GPBMessage *extMessage = [msg getExtension:extension];
-        [todo addObject:extMessage];
-      }
-    }  // for(extensionsCurrentlySet)
-
-  }  // while(todo.count)
-}
-
-
-// -- About Version Checks --
-// There's actually 3 places these checks all come into play:
-// 1. When the generated source is compile into .o files, the header check
-//    happens. This is checking the protoc used matches the library being used
-//    when making the .o.
-// 2. Every place a generated proto header is included in a developer's code,
-//    the header check comes into play again. But this time it is checking that
-//    the current library headers being used still support/match the ones for
-//    the generated code.
-// 3. At runtime the final check here (GPBCheckRuntimeVersionsInternal), is
-//    called from the generated code passing in values captured when the
-//    generated code's .o was made. This checks that at runtime the generated
-//    code and runtime library match.
-
-void GPBCheckRuntimeVersionSupport(int32_t objcRuntimeVersion) {
-  // NOTE: This is passing the value captured in the compiled code to check
-  // against the values captured when the runtime support was compiled. This
-  // ensures the library code isn't in a different framework/library that
-  // was generated with a non matching version.
-  if (GOOGLE_PROTOBUF_OBJC_VERSION < objcRuntimeVersion) {
-    // Library is too old for headers.
-    [NSException raise:NSInternalInconsistencyException
-                format:@"Linked to ProtocolBuffer runtime version %d,"
-                       @" but code compiled needing at least %d!",
-                       GOOGLE_PROTOBUF_OBJC_VERSION, objcRuntimeVersion];
-  }
-  if (objcRuntimeVersion < GOOGLE_PROTOBUF_OBJC_MIN_SUPPORTED_VERSION) {
-    // Headers are too old for library.
-    [NSException raise:NSInternalInconsistencyException
-                format:@"Proto generation source compiled against runtime"
-                       @" version %d, but this version of the runtime only"
-                       @" supports back to %d!",
-                       objcRuntimeVersion,
-                       GOOGLE_PROTOBUF_OBJC_MIN_SUPPORTED_VERSION];
-  }
-}
-
-// This api is no longer used for version checks. 30001 is the last version
-// using this old versioning model. When that support is removed, this function
-// can be removed (along with the declaration in GPBUtilities_PackagePrivate.h).
-void GPBCheckRuntimeVersionInternal(int32_t version) {
-  GPBInternalCompileAssert(GOOGLE_PROTOBUF_OBJC_MIN_SUPPORTED_VERSION == 30001,
-                           time_to_remove_this_old_version_shim);
-  if (version != GOOGLE_PROTOBUF_OBJC_MIN_SUPPORTED_VERSION) {
-    [NSException raise:NSInternalInconsistencyException
-                format:@"Linked to ProtocolBuffer runtime version %d,"
-                       @" but code compiled with version %d!",
-                       GOOGLE_PROTOBUF_OBJC_GEN_VERSION, version];
-  }
-}
-
-BOOL GPBMessageHasFieldNumberSet(GPBMessage *self, uint32_t fieldNumber) {
-  GPBDescriptor *descriptor = [self descriptor];
-  GPBFieldDescriptor *field = [descriptor fieldWithNumber:fieldNumber];
-  return GPBMessageHasFieldSet(self, field);
-}
-
-BOOL GPBMessageHasFieldSet(GPBMessage *self, GPBFieldDescriptor *field) {
-  if (self == nil || field == nil) return NO;
-
-  // Repeated/Map don't use the bit, they check the count.
-  if (GPBFieldIsMapOrArray(field)) {
-    // Array/map type doesn't matter, since GPB*Array/NSArray and
-    // GPB*Dictionary/NSDictionary all support -count;
-    NSArray *arrayOrMap = GPBGetObjectIvarWithFieldNoAutocreate(self, field);
-    return (arrayOrMap.count > 0);
-  } else {
-    return GPBGetHasIvarField(self, field);
-  }
-}
-
-void GPBClearMessageField(GPBMessage *self, GPBFieldDescriptor *field) {
-  // If not set, nothing to do.
-  if (!GPBGetHasIvarField(self, field)) {
-    return;
-  }
-
-  GPBMessageFieldDescription *fieldDesc = field->description_;
-  if (GPBFieldStoresObject(field)) {
-    // Object types are handled slightly differently, they need to be released.
-    uint8_t *storage = (uint8_t *)self->messageStorage_;
-    id *typePtr = (id *)&storage[fieldDesc->offset];
-    [*typePtr release];
-    *typePtr = nil;
-  } else {
-    // POD types just need to clear the has bit as the Get* method will
-    // fetch the default when needed.
-  }
-  GPBSetHasIvar(self, fieldDesc->hasIndex, fieldDesc->number, NO);
-}
-
-void GPBClearOneof(GPBMessage *self, GPBOneofDescriptor *oneof) {
-  #if defined(DEBUG) && DEBUG
-    NSCAssert([[self descriptor] oneofWithName:oneof.name] == oneof,
-              @"OneofDescriptor %@ doesn't appear to be for %@ messages.",
-              oneof.name, [self class]);
-  #endif
-  GPBFieldDescriptor *firstField = oneof->fields_[0];
-  GPBMaybeClearOneofPrivate(self, oneof, firstField->description_->hasIndex, 0);
-}
-
-BOOL GPBGetHasIvar(GPBMessage *self, int32_t idx, uint32_t fieldNumber) {
-  NSCAssert(self->messageStorage_ != NULL,
-            @"%@: All messages should have storage (from init)",
-            [self class]);
-  if (idx < 0) {
-    NSCAssert(fieldNumber != 0, @"Invalid field number.");
-    BOOL hasIvar = (self->messageStorage_->_has_storage_[-idx] == fieldNumber);
-    return hasIvar;
-  } else {
-    NSCAssert(idx != GPBNoHasBit, @"Invalid has bit.");
-    uint32_t byteIndex = idx / 32;
-    uint32_t bitMask = (1U << (idx % 32));
-    BOOL hasIvar =
-        (self->messageStorage_->_has_storage_[byteIndex] & bitMask) ? YES : NO;
-    return hasIvar;
-  }
-}
-
-uint32_t GPBGetHasOneof(GPBMessage *self, int32_t idx) {
-  NSCAssert(idx < 0, @"%@: invalid index (%d) for oneof.",
-            [self class], idx);
-  uint32_t result = self->messageStorage_->_has_storage_[-idx];
-  return result;
-}
-
-void GPBSetHasIvar(GPBMessage *self, int32_t idx, uint32_t fieldNumber,
-                   BOOL value) {
-  if (idx < 0) {
-    NSCAssert(fieldNumber != 0, @"Invalid field number.");
-    uint32_t *has_storage = self->messageStorage_->_has_storage_;
-    has_storage[-idx] = (value ? fieldNumber : 0);
-  } else {
-    NSCAssert(idx != GPBNoHasBit, @"Invalid has bit.");
-    uint32_t *has_storage = self->messageStorage_->_has_storage_;
-    uint32_t byte = idx / 32;
-    uint32_t bitMask = (1U << (idx % 32));
-    if (value) {
-      has_storage[byte] |= bitMask;
-    } else {
-      has_storage[byte] &= ~bitMask;
-    }
-  }
-}
-
-static void GPBMaybeClearOneofPrivate(GPBMessage *self,
-                                      GPBOneofDescriptor *oneof,
-                                      int32_t oneofHasIndex,
-                                      uint32_t fieldNumberNotToClear) {
-  uint32_t fieldNumberSet = GPBGetHasOneof(self, oneofHasIndex);
-  if ((fieldNumberSet == fieldNumberNotToClear) || (fieldNumberSet == 0)) {
-    // Do nothing/nothing set in the oneof.
-    return;
-  }
-
-  // Like GPBClearMessageField(), free the memory if an objecttype is set,
-  // pod types don't need to do anything.
-  GPBFieldDescriptor *fieldSet = [oneof fieldWithNumber:fieldNumberSet];
-  NSCAssert(fieldSet,
-            @"%@: oneof set to something (%u) not in the oneof?",
-            [self class], fieldNumberSet);
-  if (fieldSet && GPBFieldStoresObject(fieldSet)) {
-    uint8_t *storage = (uint8_t *)self->messageStorage_;
-    id *typePtr = (id *)&storage[fieldSet->description_->offset];
-    [*typePtr release];
-    *typePtr = nil;
-  }
-
-  // Set to nothing stored in the oneof.
-  // (field number doesn't matter since setting to nothing).
-  GPBSetHasIvar(self, oneofHasIndex, 1, NO);
-}
-
-#pragma mark - IVar accessors
-
-//%PDDM-DEFINE IVAR_POD_ACCESSORS_DEFN(NAME, TYPE)
-//%TYPE GPBGetMessage##NAME##Field(GPBMessage *self,
-//% TYPE$S            NAME$S       GPBFieldDescriptor *field) {
-//%#if defined(DEBUG) && DEBUG
-//%  NSCAssert([[self descriptor] fieldWithNumber:field.number] == field,
-//%            @"FieldDescriptor %@ doesn't appear to be for %@ messages.",
-//%            field.name, [self class]);
-//%  NSCAssert(DataTypesEquivalent(GPBGetFieldDataType(field),
-//%                                GPBDataType##NAME),
-//%            @"Attempting to get value of TYPE from field %@ "
-//%            @"of %@ which is of type %@.",
-//%            [self class], field.name,
-//%            TypeToString(GPBGetFieldDataType(field)));
-//%#endif
-//%  if (GPBGetHasIvarField(self, field)) {
-//%    uint8_t *storage = (uint8_t *)self->messageStorage_;
-//%    TYPE *typePtr = (TYPE *)&storage[field->description_->offset];
-//%    return *typePtr;
-//%  } else {
-//%    return field.defaultValue.value##NAME;
-//%  }
-//%}
-//%
-//%// Only exists for public api, no core code should use this.
-//%void GPBSetMessage##NAME##Field(GPBMessage *self,
-//%                   NAME$S     GPBFieldDescriptor *field,
-//%                   NAME$S     TYPE value) {
-//%  if (self == nil || field == nil) return;
-//%#if defined(DEBUG) && DEBUG
-//%  NSCAssert([[self descriptor] fieldWithNumber:field.number] == field,
-//%            @"FieldDescriptor %@ doesn't appear to be for %@ messages.",
-//%            field.name, [self class]);
-//%  NSCAssert(DataTypesEquivalent(GPBGetFieldDataType(field),
-//%                                GPBDataType##NAME),
-//%            @"Attempting to set field %@ of %@ which is of type %@ with "
-//%            @"value of type TYPE.",
-//%            [self class], field.name,
-//%            TypeToString(GPBGetFieldDataType(field)));
-//%#endif
-//%  GPBSet##NAME##IvarWithFieldPrivate(self, field, value);
-//%}
-//%
-//%void GPBSet##NAME##IvarWithFieldPrivate(GPBMessage *self,
-//%            NAME$S                    GPBFieldDescriptor *field,
-//%            NAME$S                    TYPE value) {
-//%  GPBOneofDescriptor *oneof = field->containingOneof_;
-//%  GPBMessageFieldDescription *fieldDesc = field->description_;
-//%  if (oneof) {
-//%    GPBMaybeClearOneofPrivate(self, oneof, fieldDesc->hasIndex, fieldDesc->number);
-//%  }
-//%#if defined(DEBUG) && DEBUG
-//%  NSCAssert(self->messageStorage_ != NULL,
-//%            @"%@: All messages should have storage (from init)",
-//%            [self class]);
-//%#endif
-//%#if defined(__clang_analyzer__)
-//%  if (self->messageStorage_ == NULL) return;
-//%#endif
-//%  uint8_t *storage = (uint8_t *)self->messageStorage_;
-//%  TYPE *typePtr = (TYPE *)&storage[fieldDesc->offset];
-//%  *typePtr = value;
-//%  // If the value is zero, then we only count the field as "set" if the field
-//%  // shouldn't auto clear on zero.
-//%  BOOL hasValue = ((value != (TYPE)0)
-//%                   || ((fieldDesc->flags & GPBFieldClearHasIvarOnZero) == 0));
-//%  GPBSetHasIvar(self, fieldDesc->hasIndex, fieldDesc->number, hasValue);
-//%  GPBBecomeVisibleToAutocreator(self);
-//%}
-//%
-//%PDDM-DEFINE IVAR_ALIAS_DEFN_OBJECT(NAME, TYPE)
-//%// Only exists for public api, no core code should use this.
-//%TYPE *GPBGetMessage##NAME##Field(GPBMessage *self,
-//% TYPE$S             NAME$S       GPBFieldDescriptor *field) {
-//%#if defined(DEBUG) && DEBUG
-//%  NSCAssert(DataTypesEquivalent(GPBGetFieldDataType(field),
-//%                                GPBDataType##NAME),
-//%            @"Attempting to get value of TYPE from field %@ "
-//%            @"of %@ which is of type %@.",
-//%            [self class], field.name,
-//%            TypeToString(GPBGetFieldDataType(field)));
-//%#endif
-//%  return (TYPE *)GPBGetObjectIvarWithField(self, field);
-//%}
-//%
-//%// Only exists for public api, no core code should use this.
-//%void GPBSetMessage##NAME##Field(GPBMessage *self,
-//%                   NAME$S     GPBFieldDescriptor *field,
-//%                   NAME$S     TYPE *value) {
-//%#if defined(DEBUG) && DEBUG
-//%  NSCAssert(DataTypesEquivalent(GPBGetFieldDataType(field),
-//%                                GPBDataType##NAME),
-//%            @"Attempting to set field %@ of %@ which is of type %@ with "
-//%            @"value of type TYPE.",
-//%            [self class], field.name,
-//%            TypeToString(GPBGetFieldDataType(field)));
-//%#endif
-//%  GPBSetObjectIvarWithField(self, field, (id)value);
-//%}
-//%
-//%PDDM-DEFINE IVAR_ALIAS_DEFN_COPY_OBJECT(NAME, TYPE)
-//%// Only exists for public api, no core code should use this.
-//%TYPE *GPBGetMessage##NAME##Field(GPBMessage *self,
-//% TYPE$S             NAME$S       GPBFieldDescriptor *field) {
-//%#if defined(DEBUG) && DEBUG
-//%  NSCAssert(DataTypesEquivalent(GPBGetFieldDataType(field),
-//%                                GPBDataType##NAME),
-//%            @"Attempting to get value of TYPE from field %@ "
-//%            @"of %@ which is of type %@.",
-//%            [self class], field.name,
-//%            TypeToString(GPBGetFieldDataType(field)));
-//%#endif
-//%  return (TYPE *)GPBGetObjectIvarWithField(self, field);
-//%}
-//%
-//%// Only exists for public api, no core code should use this.
-//%void GPBSetMessage##NAME##Field(GPBMessage *self,
-//%                   NAME$S     GPBFieldDescriptor *field,
-//%                   NAME$S     TYPE *value) {
-//%#if defined(DEBUG) && DEBUG
-//%  NSCAssert(DataTypesEquivalent(GPBGetFieldDataType(field),
-//%                                GPBDataType##NAME),
-//%            @"Attempting to set field %@ of %@ which is of type %@ with "
-//%            @"value of type TYPE.",
-//%            [self class], field.name,
-//%            TypeToString(GPBGetFieldDataType(field)));
-//%#endif
-//%  GPBSetCopyObjectIvarWithField(self, field, (id)value);
-//%}
-//%
-
-// Object types are handled slightly differently, they need to be released
-// and retained.
-
-void GPBClearAutocreatedMessageIvarWithField(GPBMessage *self,
-                                             GPBFieldDescriptor *field) {
-  if (GPBGetHasIvarField(self, field)) {
-    return;
-  }
-  uint8_t *storage = (uint8_t *)self->messageStorage_;
-  id *typePtr = (id *)&storage[field->description_->offset];
-  GPBMessage *oldValue = *typePtr;
-  *typePtr = NULL;
-  GPBClearMessageAutocreator(oldValue);
-  [oldValue release];
-}
-
-// This exists only for bridging some aliased types, nothing else should use it.
-static void GPBSetObjectIvarWithField(GPBMessage *self,
-                                      GPBFieldDescriptor *field, id value) {
-  if (self == nil || field == nil) return;
-  GPBSetRetainedObjectIvarWithFieldPrivate(self, field, [value retain]);
-}
-
-static void GPBSetCopyObjectIvarWithField(GPBMessage *self,
-                                          GPBFieldDescriptor *field, id value);
-
-// GPBSetCopyObjectIvarWithField is blocked from the analyzer because it flags
-// a leak for the -copy even though GPBSetRetainedObjectIvarWithFieldPrivate
-// is marked as consuming the value. Note: For some reason this doesn't happen
-// with the -retain in GPBSetObjectIvarWithField.
-#if !defined(__clang_analyzer__)
-// This exists only for bridging some aliased types, nothing else should use it.
-static void GPBSetCopyObjectIvarWithField(GPBMessage *self,
-                                          GPBFieldDescriptor *field, id value) {
-  if (self == nil || field == nil) return;
-  GPBSetRetainedObjectIvarWithFieldPrivate(self, field, [value copy]);
-}
-#endif  // !defined(__clang_analyzer__)
-
-void GPBSetObjectIvarWithFieldPrivate(GPBMessage *self,
-                                      GPBFieldDescriptor *field, id value) {
-  GPBSetRetainedObjectIvarWithFieldPrivate(self, field, [value retain]);
-}
-
-void GPBSetRetainedObjectIvarWithFieldPrivate(GPBMessage *self,
-                                              GPBFieldDescriptor *field,
-                                              id value) {
-  NSCAssert(self->messageStorage_ != NULL,
-            @"%@: All messages should have storage (from init)",
-            [self class]);
-#if defined(__clang_analyzer__)
-  if (self->messageStorage_ == NULL) return;
-#endif
-  GPBDataType fieldType = GPBGetFieldDataType(field);
-  BOOL isMapOrArray = GPBFieldIsMapOrArray(field);
-  BOOL fieldIsMessage = GPBDataTypeIsMessage(fieldType);
-#if defined(DEBUG) && DEBUG
-  if (value == nil && !isMapOrArray && !fieldIsMessage &&
-      field.hasDefaultValue) {
-    // Setting a message to nil is an obvious way to "clear" the value
-    // as there is no way to set a non-empty default value for messages.
-    //
-    // For Strings and Bytes that have default values set it is not clear what
-    // should be done when their value is set to nil. Is the intention just to
-    // clear the set value and reset to default, or is the intention to set the
-    // value to the empty string/data? Arguments can be made for both cases.
-    // 'nil' has been abused as a replacement for an empty string/data in ObjC.
-    // We decided to be consistent with all "object" types and clear the has
-    // field, and fall back on the default value. The warning below will only
-    // appear in debug, but the could should be changed so the intention is
-    // clear.
-    NSString *hasSel = NSStringFromSelector(field->hasOrCountSel_);
-    NSString *propName = field.name;
-    NSString *className = self.descriptor.name;
-    NSLog(@"warning: '%@.%@ = nil;' is not clearly defined for fields with "
-          @"default values. Please use '%@.%@ = %@' if you want to set it to "
-          @"empty, or call '%@.%@ = NO' to reset it to it's default value of "
-          @"'%@'. Defaulting to resetting default value.",
-          className, propName, className, propName,
-          (fieldType == GPBDataTypeString) ? @"@\"\"" : @"GPBEmptyNSData()",
-          className, hasSel, field.defaultValue.valueString);
-    // Note: valueString, depending on the type, it could easily be
-    // valueData/valueMessage.
-  }
-#endif  // DEBUG
-  GPBMessageFieldDescription *fieldDesc = field->description_;
-  if (!isMapOrArray) {
-    // Non repeated/map can be in an oneof, clear any existing value from the
-    // oneof.
-    GPBOneofDescriptor *oneof = field->containingOneof_;
-    if (oneof) {
-      GPBMaybeClearOneofPrivate(self, oneof, fieldDesc->hasIndex, fieldDesc->number);
-    }
-    // Clear "has" if they are being set to nil.
-    BOOL setHasValue = (value != nil);
-    // If the field should clear on a "zero" value, then check if the string/data
-    // was zero length, and clear instead.
-    if (((fieldDesc->flags & GPBFieldClearHasIvarOnZero) != 0) &&
-        ([value length] == 0)) {
-      setHasValue = NO;
-      // The value passed in was retained, it must be released since we
-      // aren't saving anything in the field.
-      [value release];
-      value = nil;
-    }
-    GPBSetHasIvar(self, fieldDesc->hasIndex, fieldDesc->number, setHasValue);
-  }
-  uint8_t *storage = (uint8_t *)self->messageStorage_;
-  id *typePtr = (id *)&storage[fieldDesc->offset];
-
-  id oldValue = *typePtr;
-
-  *typePtr = value;
-
-  if (oldValue) {
-    if (isMapOrArray) {
-      if (field.fieldType == GPBFieldTypeRepeated) {
-        // If the old array was autocreated by us, then clear it.
-        if (GPBDataTypeIsObject(fieldType)) {
-          if ([oldValue isKindOfClass:[GPBAutocreatedArray class]]) {
-            GPBAutocreatedArray *autoArray = oldValue;
-            if (autoArray->_autocreator == self) {
-              autoArray->_autocreator = nil;
-            }
-          }
-        } else {
-          // Type doesn't matter, it is a GPB*Array.
-          GPBInt32Array *gpbArray = oldValue;
-          if (gpbArray->_autocreator == self) {
-            gpbArray->_autocreator = nil;
-          }
-        }
-      } else { // GPBFieldTypeMap
-        // If the old map was autocreated by us, then clear it.
-        if ((field.mapKeyDataType == GPBDataTypeString) &&
-            GPBDataTypeIsObject(fieldType)) {
-          if ([oldValue isKindOfClass:[GPBAutocreatedDictionary class]]) {
-            GPBAutocreatedDictionary *autoDict = oldValue;
-            if (autoDict->_autocreator == self) {
-              autoDict->_autocreator = nil;
-            }
-          }
-        } else {
-          // Type doesn't matter, it is a GPB*Dictionary.
-          GPBInt32Int32Dictionary *gpbDict = oldValue;
-          if (gpbDict->_autocreator == self) {
-            gpbDict->_autocreator = nil;
-          }
-        }
-      }
-    } else if (fieldIsMessage) {
-      // If the old message value was autocreated by us, then clear it.
-      GPBMessage *oldMessageValue = oldValue;
-      if (GPBWasMessageAutocreatedBy(oldMessageValue, self)) {
-        GPBClearMessageAutocreator(oldMessageValue);
-      }
-    }
-    [oldValue release];
-  }
-
-  GPBBecomeVisibleToAutocreator(self);
-}
-
-id GPBGetObjectIvarWithFieldNoAutocreate(GPBMessage *self,
-                                         GPBFieldDescriptor *field) {
-  if (self->messageStorage_ == nil) {
-    return nil;
-  }
-  uint8_t *storage = (uint8_t *)self->messageStorage_;
-  id *typePtr = (id *)&storage[field->description_->offset];
-  return *typePtr;
-}
-
-// Only exists for public api, no core code should use this.
-int32_t GPBGetMessageEnumField(GPBMessage *self, GPBFieldDescriptor *field) {
-  #if defined(DEBUG) && DEBUG
-    NSCAssert([[self descriptor] fieldWithNumber:field.number] == field,
-              @"FieldDescriptor %@ doesn't appear to be for %@ messages.",
-              field.name, [self class]);
-    NSCAssert(GPBGetFieldDataType(field) == GPBDataTypeEnum,
-              @"Attempting to get value of type Enum from field %@ "
-              @"of %@ which is of type %@.",
-              [self class], field.name,
-              TypeToString(GPBGetFieldDataType(field)));
-  #endif
-
-  int32_t result = GPBGetMessageInt32Field(self, field);
-  // If this is presevering unknown enums, make sure the value is valid before
-  // returning it.
-
-  GPBFileSyntax syntax = [self descriptor].file.syntax;
-  if (GPBHasPreservingUnknownEnumSemantics(syntax) &&
-      ![field isValidEnumValue:result]) {
-    result = kGPBUnrecognizedEnumeratorValue;
-  }
-  return result;
-}
-
-// Only exists for public api, no core code should use this.
-void GPBSetMessageEnumField(GPBMessage *self, GPBFieldDescriptor *field,
-                            int32_t value) {
-  #if defined(DEBUG) && DEBUG
-    NSCAssert([[self descriptor] fieldWithNumber:field.number] == field,
-              @"FieldDescriptor %@ doesn't appear to be for %@ messages.",
-              field.name, [self class]);
-    NSCAssert(GPBGetFieldDataType(field) == GPBDataTypeEnum,
-              @"Attempting to set field %@ of %@ which is of type %@ with "
-              @"value of type Enum.",
-              [self class], field.name,
-              TypeToString(GPBGetFieldDataType(field)));
-  #endif
-  GPBSetEnumIvarWithFieldPrivate(self, field, value);
-}
-
-void GPBSetEnumIvarWithFieldPrivate(GPBMessage *self,
-                                    GPBFieldDescriptor *field, int32_t value) {
-  // Don't allow in unknown values.  Proto3 can use the Raw method.
-  if (![field isValidEnumValue:value]) {
-    [NSException raise:NSInvalidArgumentException
-                format:@"%@.%@: Attempt to set an unknown enum value (%d)",
-                       [self class], field.name, value];
-  }
-  GPBSetInt32IvarWithFieldPrivate(self, field, value);
-}
-
-// Only exists for public api, no core code should use this.
-int32_t GPBGetMessageRawEnumField(GPBMessage *self,
-                                  GPBFieldDescriptor *field) {
-  int32_t result = GPBGetMessageInt32Field(self, field);
-  return result;
-}
-
-// Only exists for public api, no core code should use this.
-void GPBSetMessageRawEnumField(GPBMessage *self, GPBFieldDescriptor *field,
-                               int32_t value) {
-  GPBSetInt32IvarWithFieldPrivate(self, field, value);
-}
-
-BOOL GPBGetMessageBoolField(GPBMessage *self,
-                            GPBFieldDescriptor *field) {
-#if defined(DEBUG) && DEBUG
-  NSCAssert([[self descriptor] fieldWithNumber:field.number] == field,
-            @"FieldDescriptor %@ doesn't appear to be for %@ messages.",
-            field.name, [self class]);
-  NSCAssert(DataTypesEquivalent(GPBGetFieldDataType(field), GPBDataTypeBool),
-            @"Attempting to get value of type bool from field %@ "
-            @"of %@ which is of type %@.",
-            [self class], field.name,
-            TypeToString(GPBGetFieldDataType(field)));
-#endif
-  if (GPBGetHasIvarField(self, field)) {
-    // Bools are stored in the has bits to avoid needing explicit space in the
-    // storage structure.
-    // (the field number passed to the HasIvar helper doesn't really matter
-    // since the offset is never negative)
-    GPBMessageFieldDescription *fieldDesc = field->description_;
-    return GPBGetHasIvar(self, (int32_t)(fieldDesc->offset), fieldDesc->number);
-  } else {
-    return field.defaultValue.valueBool;
-  }
-}
-
-// Only exists for public api, no core code should use this.
-void GPBSetMessageBoolField(GPBMessage *self,
-                            GPBFieldDescriptor *field,
-                            BOOL value) {
-  if (self == nil || field == nil) return;
-  #if defined(DEBUG) && DEBUG
-    NSCAssert([[self descriptor] fieldWithNumber:field.number] == field,
-              @"FieldDescriptor %@ doesn't appear to be for %@ messages.",
-              field.name, [self class]);
-    NSCAssert(DataTypesEquivalent(GPBGetFieldDataType(field), GPBDataTypeBool),
-              @"Attempting to set field %@ of %@ which is of type %@ with "
-              @"value of type bool.",
-              [self class], field.name,
-              TypeToString(GPBGetFieldDataType(field)));
-  #endif
-  GPBSetBoolIvarWithFieldPrivate(self, field, value);
-}
-
-void GPBSetBoolIvarWithFieldPrivate(GPBMessage *self,
-                                    GPBFieldDescriptor *field,
-                                    BOOL value) {
-  GPBMessageFieldDescription *fieldDesc = field->description_;
-  GPBOneofDescriptor *oneof = field->containingOneof_;
-  if (oneof) {
-    GPBMaybeClearOneofPrivate(self, oneof, fieldDesc->hasIndex, fieldDesc->number);
-  }
-
-  // Bools are stored in the has bits to avoid needing explicit space in the
-  // storage structure.
-  // (the field number passed to the HasIvar helper doesn't really matter since
-  // the offset is never negative)
-  GPBSetHasIvar(self, (int32_t)(fieldDesc->offset), fieldDesc->number, value);
-
-  // If the value is zero, then we only count the field as "set" if the field
-  // shouldn't auto clear on zero.
-  BOOL hasValue = ((value != (BOOL)0)
-                   || ((fieldDesc->flags & GPBFieldClearHasIvarOnZero) == 0));
-  GPBSetHasIvar(self, fieldDesc->hasIndex, fieldDesc->number, hasValue);
-  GPBBecomeVisibleToAutocreator(self);
-}
-
-//%PDDM-EXPAND IVAR_POD_ACCESSORS_DEFN(Int32, int32_t)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-int32_t GPBGetMessageInt32Field(GPBMessage *self,
-                                GPBFieldDescriptor *field) {
-#if defined(DEBUG) && DEBUG
-  NSCAssert([[self descriptor] fieldWithNumber:field.number] == field,
-            @"FieldDescriptor %@ doesn't appear to be for %@ messages.",
-            field.name, [self class]);
-  NSCAssert(DataTypesEquivalent(GPBGetFieldDataType(field),
-                                GPBDataTypeInt32),
-            @"Attempting to get value of int32_t from field %@ "
-            @"of %@ which is of type %@.",
-            [self class], field.name,
-            TypeToString(GPBGetFieldDataType(field)));
-#endif
-  if (GPBGetHasIvarField(self, field)) {
-    uint8_t *storage = (uint8_t *)self->messageStorage_;
-    int32_t *typePtr = (int32_t *)&storage[field->description_->offset];
-    return *typePtr;
-  } else {
-    return field.defaultValue.valueInt32;
-  }
-}
-
-// Only exists for public api, no core code should use this.
-void GPBSetMessageInt32Field(GPBMessage *self,
-                             GPBFieldDescriptor *field,
-                             int32_t value) {
-  if (self == nil || field == nil) return;
-#if defined(DEBUG) && DEBUG
-  NSCAssert([[self descriptor] fieldWithNumber:field.number] == field,
-            @"FieldDescriptor %@ doesn't appear to be for %@ messages.",
-            field.name, [self class]);
-  NSCAssert(DataTypesEquivalent(GPBGetFieldDataType(field),
-                                GPBDataTypeInt32),
-            @"Attempting to set field %@ of %@ which is of type %@ with "
-            @"value of type int32_t.",
-            [self class], field.name,
-            TypeToString(GPBGetFieldDataType(field)));
-#endif
-  GPBSetInt32IvarWithFieldPrivate(self, field, value);
-}
-
-void GPBSetInt32IvarWithFieldPrivate(GPBMessage *self,
-                                     GPBFieldDescriptor *field,
-                                     int32_t value) {
-  GPBOneofDescriptor *oneof = field->containingOneof_;
-  GPBMessageFieldDescription *fieldDesc = field->description_;
-  if (oneof) {
-    GPBMaybeClearOneofPrivate(self, oneof, fieldDesc->hasIndex, fieldDesc->number);
-  }
-#if defined(DEBUG) && DEBUG
-  NSCAssert(self->messageStorage_ != NULL,
-            @"%@: All messages should have storage (from init)",
-            [self class]);
-#endif
-#if defined(__clang_analyzer__)
-  if (self->messageStorage_ == NULL) return;
-#endif
-  uint8_t *storage = (uint8_t *)self->messageStorage_;
-  int32_t *typePtr = (int32_t *)&storage[fieldDesc->offset];
-  *typePtr = value;
-  // If the value is zero, then we only count the field as "set" if the field
-  // shouldn't auto clear on zero.
-  BOOL hasValue = ((value != (int32_t)0)
-                   || ((fieldDesc->flags & GPBFieldClearHasIvarOnZero) == 0));
-  GPBSetHasIvar(self, fieldDesc->hasIndex, fieldDesc->number, hasValue);
-  GPBBecomeVisibleToAutocreator(self);
-}
-
-// clang-format on
-//%PDDM-EXPAND IVAR_POD_ACCESSORS_DEFN(UInt32, uint32_t)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-uint32_t GPBGetMessageUInt32Field(GPBMessage *self,
-                                  GPBFieldDescriptor *field) {
-#if defined(DEBUG) && DEBUG
-  NSCAssert([[self descriptor] fieldWithNumber:field.number] == field,
-            @"FieldDescriptor %@ doesn't appear to be for %@ messages.",
-            field.name, [self class]);
-  NSCAssert(DataTypesEquivalent(GPBGetFieldDataType(field),
-                                GPBDataTypeUInt32),
-            @"Attempting to get value of uint32_t from field %@ "
-            @"of %@ which is of type %@.",
-            [self class], field.name,
-            TypeToString(GPBGetFieldDataType(field)));
-#endif
-  if (GPBGetHasIvarField(self, field)) {
-    uint8_t *storage = (uint8_t *)self->messageStorage_;
-    uint32_t *typePtr = (uint32_t *)&storage[field->description_->offset];
-    return *typePtr;
-  } else {
-    return field.defaultValue.valueUInt32;
-  }
-}
-
-// Only exists for public api, no core code should use this.
-void GPBSetMessageUInt32Field(GPBMessage *self,
-                              GPBFieldDescriptor *field,
-                              uint32_t value) {
-  if (self == nil || field == nil) return;
-#if defined(DEBUG) && DEBUG
-  NSCAssert([[self descriptor] fieldWithNumber:field.number] == field,
-            @"FieldDescriptor %@ doesn't appear to be for %@ messages.",
-            field.name, [self class]);
-  NSCAssert(DataTypesEquivalent(GPBGetFieldDataType(field),
-                                GPBDataTypeUInt32),
-            @"Attempting to set field %@ of %@ which is of type %@ with "
-            @"value of type uint32_t.",
-            [self class], field.name,
-            TypeToString(GPBGetFieldDataType(field)));
-#endif
-  GPBSetUInt32IvarWithFieldPrivate(self, field, value);
-}
-
-void GPBSetUInt32IvarWithFieldPrivate(GPBMessage *self,
-                                      GPBFieldDescriptor *field,
-                                      uint32_t value) {
-  GPBOneofDescriptor *oneof = field->containingOneof_;
-  GPBMessageFieldDescription *fieldDesc = field->description_;
-  if (oneof) {
-    GPBMaybeClearOneofPrivate(self, oneof, fieldDesc->hasIndex, fieldDesc->number);
-  }
-#if defined(DEBUG) && DEBUG
-  NSCAssert(self->messageStorage_ != NULL,
-            @"%@: All messages should have storage (from init)",
-            [self class]);
-#endif
-#if defined(__clang_analyzer__)
-  if (self->messageStorage_ == NULL) return;
-#endif
-  uint8_t *storage = (uint8_t *)self->messageStorage_;
-  uint32_t *typePtr = (uint32_t *)&storage[fieldDesc->offset];
-  *typePtr = value;
-  // If the value is zero, then we only count the field as "set" if the field
-  // shouldn't auto clear on zero.
-  BOOL hasValue = ((value != (uint32_t)0)
-                   || ((fieldDesc->flags & GPBFieldClearHasIvarOnZero) == 0));
-  GPBSetHasIvar(self, fieldDesc->hasIndex, fieldDesc->number, hasValue);
-  GPBBecomeVisibleToAutocreator(self);
-}
-
-// clang-format on
-//%PDDM-EXPAND IVAR_POD_ACCESSORS_DEFN(Int64, int64_t)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-int64_t GPBGetMessageInt64Field(GPBMessage *self,
-                                GPBFieldDescriptor *field) {
-#if defined(DEBUG) && DEBUG
-  NSCAssert([[self descriptor] fieldWithNumber:field.number] == field,
-            @"FieldDescriptor %@ doesn't appear to be for %@ messages.",
-            field.name, [self class]);
-  NSCAssert(DataTypesEquivalent(GPBGetFieldDataType(field),
-                                GPBDataTypeInt64),
-            @"Attempting to get value of int64_t from field %@ "
-            @"of %@ which is of type %@.",
-            [self class], field.name,
-            TypeToString(GPBGetFieldDataType(field)));
-#endif
-  if (GPBGetHasIvarField(self, field)) {
-    uint8_t *storage = (uint8_t *)self->messageStorage_;
-    int64_t *typePtr = (int64_t *)&storage[field->description_->offset];
-    return *typePtr;
-  } else {
-    return field.defaultValue.valueInt64;
-  }
-}
-
-// Only exists for public api, no core code should use this.
-void GPBSetMessageInt64Field(GPBMessage *self,
-                             GPBFieldDescriptor *field,
-                             int64_t value) {
-  if (self == nil || field == nil) return;
-#if defined(DEBUG) && DEBUG
-  NSCAssert([[self descriptor] fieldWithNumber:field.number] == field,
-            @"FieldDescriptor %@ doesn't appear to be for %@ messages.",
-            field.name, [self class]);
-  NSCAssert(DataTypesEquivalent(GPBGetFieldDataType(field),
-                                GPBDataTypeInt64),
-            @"Attempting to set field %@ of %@ which is of type %@ with "
-            @"value of type int64_t.",
-            [self class], field.name,
-            TypeToString(GPBGetFieldDataType(field)));
-#endif
-  GPBSetInt64IvarWithFieldPrivate(self, field, value);
-}
-
-void GPBSetInt64IvarWithFieldPrivate(GPBMessage *self,
-                                     GPBFieldDescriptor *field,
-                                     int64_t value) {
-  GPBOneofDescriptor *oneof = field->containingOneof_;
-  GPBMessageFieldDescription *fieldDesc = field->description_;
-  if (oneof) {
-    GPBMaybeClearOneofPrivate(self, oneof, fieldDesc->hasIndex, fieldDesc->number);
-  }
-#if defined(DEBUG) && DEBUG
-  NSCAssert(self->messageStorage_ != NULL,
-            @"%@: All messages should have storage (from init)",
-            [self class]);
-#endif
-#if defined(__clang_analyzer__)
-  if (self->messageStorage_ == NULL) return;
-#endif
-  uint8_t *storage = (uint8_t *)self->messageStorage_;
-  int64_t *typePtr = (int64_t *)&storage[fieldDesc->offset];
-  *typePtr = value;
-  // If the value is zero, then we only count the field as "set" if the field
-  // shouldn't auto clear on zero.
-  BOOL hasValue = ((value != (int64_t)0)
-                   || ((fieldDesc->flags & GPBFieldClearHasIvarOnZero) == 0));
-  GPBSetHasIvar(self, fieldDesc->hasIndex, fieldDesc->number, hasValue);
-  GPBBecomeVisibleToAutocreator(self);
-}
-
-// clang-format on
-//%PDDM-EXPAND IVAR_POD_ACCESSORS_DEFN(UInt64, uint64_t)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-uint64_t GPBGetMessageUInt64Field(GPBMessage *self,
-                                  GPBFieldDescriptor *field) {
-#if defined(DEBUG) && DEBUG
-  NSCAssert([[self descriptor] fieldWithNumber:field.number] == field,
-            @"FieldDescriptor %@ doesn't appear to be for %@ messages.",
-            field.name, [self class]);
-  NSCAssert(DataTypesEquivalent(GPBGetFieldDataType(field),
-                                GPBDataTypeUInt64),
-            @"Attempting to get value of uint64_t from field %@ "
-            @"of %@ which is of type %@.",
-            [self class], field.name,
-            TypeToString(GPBGetFieldDataType(field)));
-#endif
-  if (GPBGetHasIvarField(self, field)) {
-    uint8_t *storage = (uint8_t *)self->messageStorage_;
-    uint64_t *typePtr = (uint64_t *)&storage[field->description_->offset];
-    return *typePtr;
-  } else {
-    return field.defaultValue.valueUInt64;
-  }
-}
-
-// Only exists for public api, no core code should use this.
-void GPBSetMessageUInt64Field(GPBMessage *self,
-                              GPBFieldDescriptor *field,
-                              uint64_t value) {
-  if (self == nil || field == nil) return;
-#if defined(DEBUG) && DEBUG
-  NSCAssert([[self descriptor] fieldWithNumber:field.number] == field,
-            @"FieldDescriptor %@ doesn't appear to be for %@ messages.",
-            field.name, [self class]);
-  NSCAssert(DataTypesEquivalent(GPBGetFieldDataType(field),
-                                GPBDataTypeUInt64),
-            @"Attempting to set field %@ of %@ which is of type %@ with "
-            @"value of type uint64_t.",
-            [self class], field.name,
-            TypeToString(GPBGetFieldDataType(field)));
-#endif
-  GPBSetUInt64IvarWithFieldPrivate(self, field, value);
-}
-
-void GPBSetUInt64IvarWithFieldPrivate(GPBMessage *self,
-                                      GPBFieldDescriptor *field,
-                                      uint64_t value) {
-  GPBOneofDescriptor *oneof = field->containingOneof_;
-  GPBMessageFieldDescription *fieldDesc = field->description_;
-  if (oneof) {
-    GPBMaybeClearOneofPrivate(self, oneof, fieldDesc->hasIndex, fieldDesc->number);
-  }
-#if defined(DEBUG) && DEBUG
-  NSCAssert(self->messageStorage_ != NULL,
-            @"%@: All messages should have storage (from init)",
-            [self class]);
-#endif
-#if defined(__clang_analyzer__)
-  if (self->messageStorage_ == NULL) return;
-#endif
-  uint8_t *storage = (uint8_t *)self->messageStorage_;
-  uint64_t *typePtr = (uint64_t *)&storage[fieldDesc->offset];
-  *typePtr = value;
-  // If the value is zero, then we only count the field as "set" if the field
-  // shouldn't auto clear on zero.
-  BOOL hasValue = ((value != (uint64_t)0)
-                   || ((fieldDesc->flags & GPBFieldClearHasIvarOnZero) == 0));
-  GPBSetHasIvar(self, fieldDesc->hasIndex, fieldDesc->number, hasValue);
-  GPBBecomeVisibleToAutocreator(self);
-}
-
-// clang-format on
-//%PDDM-EXPAND IVAR_POD_ACCESSORS_DEFN(Float, float)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-float GPBGetMessageFloatField(GPBMessage *self,
-                              GPBFieldDescriptor *field) {
-#if defined(DEBUG) && DEBUG
-  NSCAssert([[self descriptor] fieldWithNumber:field.number] == field,
-            @"FieldDescriptor %@ doesn't appear to be for %@ messages.",
-            field.name, [self class]);
-  NSCAssert(DataTypesEquivalent(GPBGetFieldDataType(field),
-                                GPBDataTypeFloat),
-            @"Attempting to get value of float from field %@ "
-            @"of %@ which is of type %@.",
-            [self class], field.name,
-            TypeToString(GPBGetFieldDataType(field)));
-#endif
-  if (GPBGetHasIvarField(self, field)) {
-    uint8_t *storage = (uint8_t *)self->messageStorage_;
-    float *typePtr = (float *)&storage[field->description_->offset];
-    return *typePtr;
-  } else {
-    return field.defaultValue.valueFloat;
-  }
-}
-
-// Only exists for public api, no core code should use this.
-void GPBSetMessageFloatField(GPBMessage *self,
-                             GPBFieldDescriptor *field,
-                             float value) {
-  if (self == nil || field == nil) return;
-#if defined(DEBUG) && DEBUG
-  NSCAssert([[self descriptor] fieldWithNumber:field.number] == field,
-            @"FieldDescriptor %@ doesn't appear to be for %@ messages.",
-            field.name, [self class]);
-  NSCAssert(DataTypesEquivalent(GPBGetFieldDataType(field),
-                                GPBDataTypeFloat),
-            @"Attempting to set field %@ of %@ which is of type %@ with "
-            @"value of type float.",
-            [self class], field.name,
-            TypeToString(GPBGetFieldDataType(field)));
-#endif
-  GPBSetFloatIvarWithFieldPrivate(self, field, value);
-}
-
-void GPBSetFloatIvarWithFieldPrivate(GPBMessage *self,
-                                     GPBFieldDescriptor *field,
-                                     float value) {
-  GPBOneofDescriptor *oneof = field->containingOneof_;
-  GPBMessageFieldDescription *fieldDesc = field->description_;
-  if (oneof) {
-    GPBMaybeClearOneofPrivate(self, oneof, fieldDesc->hasIndex, fieldDesc->number);
-  }
-#if defined(DEBUG) && DEBUG
-  NSCAssert(self->messageStorage_ != NULL,
-            @"%@: All messages should have storage (from init)",
-            [self class]);
-#endif
-#if defined(__clang_analyzer__)
-  if (self->messageStorage_ == NULL) return;
-#endif
-  uint8_t *storage = (uint8_t *)self->messageStorage_;
-  float *typePtr = (float *)&storage[fieldDesc->offset];
-  *typePtr = value;
-  // If the value is zero, then we only count the field as "set" if the field
-  // shouldn't auto clear on zero.
-  BOOL hasValue = ((value != (float)0)
-                   || ((fieldDesc->flags & GPBFieldClearHasIvarOnZero) == 0));
-  GPBSetHasIvar(self, fieldDesc->hasIndex, fieldDesc->number, hasValue);
-  GPBBecomeVisibleToAutocreator(self);
-}
-
-// clang-format on
-//%PDDM-EXPAND IVAR_POD_ACCESSORS_DEFN(Double, double)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-double GPBGetMessageDoubleField(GPBMessage *self,
-                                GPBFieldDescriptor *field) {
-#if defined(DEBUG) && DEBUG
-  NSCAssert([[self descriptor] fieldWithNumber:field.number] == field,
-            @"FieldDescriptor %@ doesn't appear to be for %@ messages.",
-            field.name, [self class]);
-  NSCAssert(DataTypesEquivalent(GPBGetFieldDataType(field),
-                                GPBDataTypeDouble),
-            @"Attempting to get value of double from field %@ "
-            @"of %@ which is of type %@.",
-            [self class], field.name,
-            TypeToString(GPBGetFieldDataType(field)));
-#endif
-  if (GPBGetHasIvarField(self, field)) {
-    uint8_t *storage = (uint8_t *)self->messageStorage_;
-    double *typePtr = (double *)&storage[field->description_->offset];
-    return *typePtr;
-  } else {
-    return field.defaultValue.valueDouble;
-  }
-}
-
-// Only exists for public api, no core code should use this.
-void GPBSetMessageDoubleField(GPBMessage *self,
-                              GPBFieldDescriptor *field,
-                              double value) {
-  if (self == nil || field == nil) return;
-#if defined(DEBUG) && DEBUG
-  NSCAssert([[self descriptor] fieldWithNumber:field.number] == field,
-            @"FieldDescriptor %@ doesn't appear to be for %@ messages.",
-            field.name, [self class]);
-  NSCAssert(DataTypesEquivalent(GPBGetFieldDataType(field),
-                                GPBDataTypeDouble),
-            @"Attempting to set field %@ of %@ which is of type %@ with "
-            @"value of type double.",
-            [self class], field.name,
-            TypeToString(GPBGetFieldDataType(field)));
-#endif
-  GPBSetDoubleIvarWithFieldPrivate(self, field, value);
-}
-
-void GPBSetDoubleIvarWithFieldPrivate(GPBMessage *self,
-                                      GPBFieldDescriptor *field,
-                                      double value) {
-  GPBOneofDescriptor *oneof = field->containingOneof_;
-  GPBMessageFieldDescription *fieldDesc = field->description_;
-  if (oneof) {
-    GPBMaybeClearOneofPrivate(self, oneof, fieldDesc->hasIndex, fieldDesc->number);
-  }
-#if defined(DEBUG) && DEBUG
-  NSCAssert(self->messageStorage_ != NULL,
-            @"%@: All messages should have storage (from init)",
-            [self class]);
-#endif
-#if defined(__clang_analyzer__)
-  if (self->messageStorage_ == NULL) return;
-#endif
-  uint8_t *storage = (uint8_t *)self->messageStorage_;
-  double *typePtr = (double *)&storage[fieldDesc->offset];
-  *typePtr = value;
-  // If the value is zero, then we only count the field as "set" if the field
-  // shouldn't auto clear on zero.
-  BOOL hasValue = ((value != (double)0)
-                   || ((fieldDesc->flags & GPBFieldClearHasIvarOnZero) == 0));
-  GPBSetHasIvar(self, fieldDesc->hasIndex, fieldDesc->number, hasValue);
-  GPBBecomeVisibleToAutocreator(self);
-}
-
-// clang-format on
-//%PDDM-EXPAND-END (6 expansions)
-
-// Aliases are function calls that are virtually the same.
-
-//%PDDM-EXPAND IVAR_ALIAS_DEFN_COPY_OBJECT(String, NSString)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-// Only exists for public api, no core code should use this.
-NSString *GPBGetMessageStringField(GPBMessage *self,
-                                   GPBFieldDescriptor *field) {
-#if defined(DEBUG) && DEBUG
-  NSCAssert(DataTypesEquivalent(GPBGetFieldDataType(field),
-                                GPBDataTypeString),
-            @"Attempting to get value of NSString from field %@ "
-            @"of %@ which is of type %@.",
-            [self class], field.name,
-            TypeToString(GPBGetFieldDataType(field)));
-#endif
-  return (NSString *)GPBGetObjectIvarWithField(self, field);
-}
-
-// Only exists for public api, no core code should use this.
-void GPBSetMessageStringField(GPBMessage *self,
-                              GPBFieldDescriptor *field,
-                              NSString *value) {
-#if defined(DEBUG) && DEBUG
-  NSCAssert(DataTypesEquivalent(GPBGetFieldDataType(field),
-                                GPBDataTypeString),
-            @"Attempting to set field %@ of %@ which is of type %@ with "
-            @"value of type NSString.",
-            [self class], field.name,
-            TypeToString(GPBGetFieldDataType(field)));
-#endif
-  GPBSetCopyObjectIvarWithField(self, field, (id)value);
-}
-
-// clang-format on
-//%PDDM-EXPAND IVAR_ALIAS_DEFN_COPY_OBJECT(Bytes, NSData)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-// Only exists for public api, no core code should use this.
-NSData *GPBGetMessageBytesField(GPBMessage *self,
-                                GPBFieldDescriptor *field) {
-#if defined(DEBUG) && DEBUG
-  NSCAssert(DataTypesEquivalent(GPBGetFieldDataType(field),
-                                GPBDataTypeBytes),
-            @"Attempting to get value of NSData from field %@ "
-            @"of %@ which is of type %@.",
-            [self class], field.name,
-            TypeToString(GPBGetFieldDataType(field)));
-#endif
-  return (NSData *)GPBGetObjectIvarWithField(self, field);
-}
-
-// Only exists for public api, no core code should use this.
-void GPBSetMessageBytesField(GPBMessage *self,
-                             GPBFieldDescriptor *field,
-                             NSData *value) {
-#if defined(DEBUG) && DEBUG
-  NSCAssert(DataTypesEquivalent(GPBGetFieldDataType(field),
-                                GPBDataTypeBytes),
-            @"Attempting to set field %@ of %@ which is of type %@ with "
-            @"value of type NSData.",
-            [self class], field.name,
-            TypeToString(GPBGetFieldDataType(field)));
-#endif
-  GPBSetCopyObjectIvarWithField(self, field, (id)value);
-}
-
-// clang-format on
-//%PDDM-EXPAND IVAR_ALIAS_DEFN_OBJECT(Message, GPBMessage)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-// Only exists for public api, no core code should use this.
-GPBMessage *GPBGetMessageMessageField(GPBMessage *self,
-                                      GPBFieldDescriptor *field) {
-#if defined(DEBUG) && DEBUG
-  NSCAssert(DataTypesEquivalent(GPBGetFieldDataType(field),
-                                GPBDataTypeMessage),
-            @"Attempting to get value of GPBMessage from field %@ "
-            @"of %@ which is of type %@.",
-            [self class], field.name,
-            TypeToString(GPBGetFieldDataType(field)));
-#endif
-  return (GPBMessage *)GPBGetObjectIvarWithField(self, field);
-}
-
-// Only exists for public api, no core code should use this.
-void GPBSetMessageMessageField(GPBMessage *self,
-                               GPBFieldDescriptor *field,
-                               GPBMessage *value) {
-#if defined(DEBUG) && DEBUG
-  NSCAssert(DataTypesEquivalent(GPBGetFieldDataType(field),
-                                GPBDataTypeMessage),
-            @"Attempting to set field %@ of %@ which is of type %@ with "
-            @"value of type GPBMessage.",
-            [self class], field.name,
-            TypeToString(GPBGetFieldDataType(field)));
-#endif
-  GPBSetObjectIvarWithField(self, field, (id)value);
-}
-
-// clang-format on
-//%PDDM-EXPAND IVAR_ALIAS_DEFN_OBJECT(Group, GPBMessage)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-// Only exists for public api, no core code should use this.
-GPBMessage *GPBGetMessageGroupField(GPBMessage *self,
-                                    GPBFieldDescriptor *field) {
-#if defined(DEBUG) && DEBUG
-  NSCAssert(DataTypesEquivalent(GPBGetFieldDataType(field),
-                                GPBDataTypeGroup),
-            @"Attempting to get value of GPBMessage from field %@ "
-            @"of %@ which is of type %@.",
-            [self class], field.name,
-            TypeToString(GPBGetFieldDataType(field)));
-#endif
-  return (GPBMessage *)GPBGetObjectIvarWithField(self, field);
-}
-
-// Only exists for public api, no core code should use this.
-void GPBSetMessageGroupField(GPBMessage *self,
-                             GPBFieldDescriptor *field,
-                             GPBMessage *value) {
-#if defined(DEBUG) && DEBUG
-  NSCAssert(DataTypesEquivalent(GPBGetFieldDataType(field),
-                                GPBDataTypeGroup),
-            @"Attempting to set field %@ of %@ which is of type %@ with "
-            @"value of type GPBMessage.",
-            [self class], field.name,
-            TypeToString(GPBGetFieldDataType(field)));
-#endif
-  GPBSetObjectIvarWithField(self, field, (id)value);
-}
-
-// clang-format on
-//%PDDM-EXPAND-END (4 expansions)
-
-// GPBGetMessageRepeatedField is defined in GPBMessage.m
-
-// Only exists for public api, no core code should use this.
-void GPBSetMessageRepeatedField(GPBMessage *self, GPBFieldDescriptor *field, id array) {
-#if defined(DEBUG) && DEBUG
-  if (field.fieldType != GPBFieldTypeRepeated) {
-    [NSException raise:NSInvalidArgumentException
-                format:@"%@.%@ is not a repeated field.",
-                       [self class], field.name];
-  }
-  Class expectedClass = Nil;
-  switch (GPBGetFieldDataType(field)) {
-    case GPBDataTypeBool:
-      expectedClass = [GPBBoolArray class];
-      break;
-    case GPBDataTypeSFixed32:
-    case GPBDataTypeInt32:
-    case GPBDataTypeSInt32:
-      expectedClass = [GPBInt32Array class];
-      break;
-    case GPBDataTypeFixed32:
-    case GPBDataTypeUInt32:
-      expectedClass = [GPBUInt32Array class];
-      break;
-    case GPBDataTypeSFixed64:
-    case GPBDataTypeInt64:
-    case GPBDataTypeSInt64:
-      expectedClass = [GPBInt64Array class];
-      break;
-    case GPBDataTypeFixed64:
-    case GPBDataTypeUInt64:
-      expectedClass = [GPBUInt64Array class];
-      break;
-    case GPBDataTypeFloat:
-      expectedClass = [GPBFloatArray class];
-      break;
-    case GPBDataTypeDouble:
-      expectedClass = [GPBDoubleArray class];
-      break;
-    case GPBDataTypeBytes:
-    case GPBDataTypeString:
-    case GPBDataTypeMessage:
-    case GPBDataTypeGroup:
-      expectedClass = [NSMutableArray class];
-      break;
-    case GPBDataTypeEnum:
-      expectedClass = [GPBEnumArray class];
-      break;
-  }
-  if (array && ![array isKindOfClass:expectedClass]) {
-    [NSException raise:NSInvalidArgumentException
-                format:@"%@.%@: Expected %@ object, got %@.",
-                       [self class], field.name, expectedClass, [array class]];
-  }
-#endif
-  GPBSetObjectIvarWithField(self, field, array);
-}
-
-static GPBDataType BaseDataType(GPBDataType type) {
-  switch (type) {
-    case GPBDataTypeSFixed32:
-    case GPBDataTypeInt32:
-    case GPBDataTypeSInt32:
-    case GPBDataTypeEnum:
-      return GPBDataTypeInt32;
-    case GPBDataTypeFixed32:
-    case GPBDataTypeUInt32:
-      return GPBDataTypeUInt32;
-    case GPBDataTypeSFixed64:
-    case GPBDataTypeInt64:
-    case GPBDataTypeSInt64:
-      return GPBDataTypeInt64;
-    case GPBDataTypeFixed64:
-    case GPBDataTypeUInt64:
-      return GPBDataTypeUInt64;
-    case GPBDataTypeMessage:
-    case GPBDataTypeGroup:
-      return GPBDataTypeMessage;
-    case GPBDataTypeBool:
-    case GPBDataTypeFloat:
-    case GPBDataTypeDouble:
-    case GPBDataTypeBytes:
-    case GPBDataTypeString:
-      return type;
-   }
-}
-
-static BOOL DataTypesEquivalent(GPBDataType type1, GPBDataType type2) {
-  return BaseDataType(type1) == BaseDataType(type2);
-}
-
-static NSString *TypeToString(GPBDataType dataType) {
-  switch (dataType) {
-    case GPBDataTypeBool:
-      return @"Bool";
-    case GPBDataTypeSFixed32:
-    case GPBDataTypeInt32:
-    case GPBDataTypeSInt32:
-      return @"Int32";
-    case GPBDataTypeFixed32:
-    case GPBDataTypeUInt32:
-      return @"UInt32";
-    case GPBDataTypeSFixed64:
-    case GPBDataTypeInt64:
-    case GPBDataTypeSInt64:
-      return @"Int64";
-    case GPBDataTypeFixed64:
-    case GPBDataTypeUInt64:
-      return @"UInt64";
-    case GPBDataTypeFloat:
-      return @"Float";
-    case GPBDataTypeDouble:
-      return @"Double";
-    case GPBDataTypeBytes:
-    case GPBDataTypeString:
-    case GPBDataTypeMessage:
-    case GPBDataTypeGroup:
-      return @"Object";
-    case GPBDataTypeEnum:
-      return @"Enum";
-  }
-}
-
-// GPBGetMessageMapField is defined in GPBMessage.m
-
-// Only exists for public api, no core code should use this.
-void GPBSetMessageMapField(GPBMessage *self, GPBFieldDescriptor *field,
-                           id dictionary) {
-#if defined(DEBUG) && DEBUG
-  if (field.fieldType != GPBFieldTypeMap) {
-    [NSException raise:NSInvalidArgumentException
-                format:@"%@.%@ is not a map<> field.",
-                       [self class], field.name];
-  }
-  if (dictionary) {
-    GPBDataType keyDataType = field.mapKeyDataType;
-    GPBDataType valueDataType = GPBGetFieldDataType(field);
-    NSString *keyStr = TypeToString(keyDataType);
-    NSString *valueStr = TypeToString(valueDataType);
-    if (keyDataType == GPBDataTypeString) {
-      keyStr = @"String";
-    }
-    Class expectedClass = Nil;
-    if ((keyDataType == GPBDataTypeString) &&
-        GPBDataTypeIsObject(valueDataType)) {
-      expectedClass = [NSMutableDictionary class];
-    } else {
-      NSString *className =
-          [NSString stringWithFormat:@"GPB%@%@Dictionary", keyStr, valueStr];
-      expectedClass = NSClassFromString(className);
-      NSCAssert(expectedClass, @"Missing a class (%@)?", expectedClass);
-    }
-    if (![dictionary isKindOfClass:expectedClass]) {
-      [NSException raise:NSInvalidArgumentException
-                  format:@"%@.%@: Expected %@ object, got %@.",
-                         [self class], field.name, expectedClass,
-                         [dictionary class]];
-    }
-  }
-#endif
-  GPBSetObjectIvarWithField(self, field, dictionary);
-}
-
-#pragma mark - Misc Dynamic Runtime Utils
-
-const char *GPBMessageEncodingForSelector(SEL selector, BOOL instanceSel) {
-  Protocol *protocol =
-      objc_getProtocol(GPBStringifySymbol(GPBMessageSignatureProtocol));
-  NSCAssert(protocol, @"Missing GPBMessageSignatureProtocol");
-  struct objc_method_description description =
-      protocol_getMethodDescription(protocol, selector, NO, instanceSel);
-  NSCAssert(description.name != Nil && description.types != nil,
-            @"Missing method for selector %@", NSStringFromSelector(selector));
-  return description.types;
-}
-
-#pragma mark - Text Format Support
-
-static void AppendStringEscaped(NSString *toPrint, NSMutableString *destStr) {
-  [destStr appendString:@"\""];
-  NSUInteger len = [toPrint length];
-  for (NSUInteger i = 0; i < len; ++i) {
-    unichar aChar = [toPrint characterAtIndex:i];
-    switch (aChar) {
-      case '\n': [destStr appendString:@"\\n"];  break;
-      case '\r': [destStr appendString:@"\\r"];  break;
-      case '\t': [destStr appendString:@"\\t"];  break;
-      case '\"': [destStr appendString:@"\\\""]; break;
-      case '\'': [destStr appendString:@"\\\'"]; break;
-      case '\\': [destStr appendString:@"\\\\"]; break;
-      default:
-        // This differs slightly from the C++ code in that the C++ doesn't
-        // generate UTF8; it looks at the string in UTF8, but escapes every
-        // byte > 0x7E.
-        if (aChar < 0x20) {
-          [destStr appendFormat:@"\\%d%d%d",
-                                (aChar / 64), ((aChar % 64) / 8), (aChar % 8)];
-        } else {
-          [destStr appendFormat:@"%C", aChar];
-        }
-        break;
-    }
-  }
-  [destStr appendString:@"\""];
-}
-
-static void AppendBufferAsString(NSData *buffer, NSMutableString *destStr) {
-  const char *src = (const char *)[buffer bytes];
-  size_t srcLen = [buffer length];
-  [destStr appendString:@"\""];
-  for (const char *srcEnd = src + srcLen; src < srcEnd; src++) {
-    switch (*src) {
-      case '\n': [destStr appendString:@"\\n"];  break;
-      case '\r': [destStr appendString:@"\\r"];  break;
-      case '\t': [destStr appendString:@"\\t"];  break;
-      case '\"': [destStr appendString:@"\\\""]; break;
-      case '\'': [destStr appendString:@"\\\'"]; break;
-      case '\\': [destStr appendString:@"\\\\"]; break;
-      default:
-        if (isprint(*src)) {
-          [destStr appendFormat:@"%c", *src];
-        } else {
-          // NOTE: doing hex means you have to worry about the letter after
-          // the hex being another hex char and forcing that to be escaped, so
-          // use octal to keep it simple.
-          [destStr appendFormat:@"\\%03o", (uint8_t)(*src)];
-        }
-        break;
-    }
-  }
-  [destStr appendString:@"\""];
-}
-
-static void AppendTextFormatForMapMessageField(
-    id map, GPBFieldDescriptor *field, NSMutableString *toStr,
-    NSString *lineIndent, NSString *fieldName, NSString *lineEnding) {
-  GPBDataType keyDataType = field.mapKeyDataType;
-  GPBDataType valueDataType = GPBGetFieldDataType(field);
-  BOOL isMessageValue = GPBDataTypeIsMessage(valueDataType);
-
-  NSString *msgStartFirst =
-      [NSString stringWithFormat:@"%@%@ {%@\n", lineIndent, fieldName, lineEnding];
-  NSString *msgStart =
-      [NSString stringWithFormat:@"%@%@ {\n", lineIndent, fieldName];
-  NSString *msgEnd = [NSString stringWithFormat:@"%@}\n", lineIndent];
-
-  NSString *keyLine = [NSString stringWithFormat:@"%@  key: ", lineIndent];
-  NSString *valueLine = [NSString stringWithFormat:@"%@  value%s ", lineIndent,
-                                                   (isMessageValue ? "" : ":")];
-
-  __block BOOL isFirst = YES;
-
-  if ((keyDataType == GPBDataTypeString) &&
-      GPBDataTypeIsObject(valueDataType)) {
-    // map is an NSDictionary.
-    NSDictionary *dict = map;
-    [dict enumerateKeysAndObjectsUsingBlock:^(NSString *key, id value, BOOL *stop) {
-      #pragma unused(stop)
-      [toStr appendString:(isFirst ? msgStartFirst : msgStart)];
-      isFirst = NO;
-
-      [toStr appendString:keyLine];
-      AppendStringEscaped(key, toStr);
-      [toStr appendString:@"\n"];
-
-      [toStr appendString:valueLine];
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wswitch-enum"
-      switch (valueDataType) {
-        case GPBDataTypeString:
-          AppendStringEscaped(value, toStr);
-          break;
-
-        case GPBDataTypeBytes:
-          AppendBufferAsString(value, toStr);
-          break;
-
-        case GPBDataTypeMessage:
-          [toStr appendString:@"{\n"];
-          NSString *subIndent = [lineIndent stringByAppendingString:@"    "];
-          AppendTextFormatForMessage(value, toStr, subIndent);
-          [toStr appendFormat:@"%@  }", lineIndent];
-          break;
-
-        default:
-          NSCAssert(NO, @"Can't happen");
-          break;
-      }
-#pragma clang diagnostic pop
-      [toStr appendString:@"\n"];
-
-      [toStr appendString:msgEnd];
-    }];
-  } else {
-    // map is one of the GPB*Dictionary classes, type doesn't matter.
-    GPBInt32Int32Dictionary *dict = map;
-    [dict enumerateForTextFormat:^(id keyObj, id valueObj) {
-      [toStr appendString:(isFirst ? msgStartFirst : msgStart)];
-      isFirst = NO;
-
-      // Key always is a NSString.
-      if (keyDataType == GPBDataTypeString) {
-        [toStr appendString:keyLine];
-        AppendStringEscaped(keyObj, toStr);
-        [toStr appendString:@"\n"];
-      } else {
-        [toStr appendFormat:@"%@%@\n", keyLine, keyObj];
-      }
-
-      [toStr appendString:valueLine];
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wswitch-enum"
-      switch (valueDataType) {
-        case GPBDataTypeString:
-          AppendStringEscaped(valueObj, toStr);
-          break;
-
-        case GPBDataTypeBytes:
-          AppendBufferAsString(valueObj, toStr);
-          break;
-
-        case GPBDataTypeMessage:
-          [toStr appendString:@"{\n"];
-          NSString *subIndent = [lineIndent stringByAppendingString:@"    "];
-          AppendTextFormatForMessage(valueObj, toStr, subIndent);
-          [toStr appendFormat:@"%@  }", lineIndent];
-          break;
-
-        case GPBDataTypeEnum: {
-          int32_t enumValue = [valueObj intValue];
-          NSString *valueStr = nil;
-          GPBEnumDescriptor *descriptor = field.enumDescriptor;
-          if (descriptor) {
-            valueStr = [descriptor textFormatNameForValue:enumValue];
-          }
-          if (valueStr) {
-            [toStr appendString:valueStr];
-          } else {
-            [toStr appendFormat:@"%d", enumValue];
-          }
-          break;
-        }
-
-        default:
-          NSCAssert(valueDataType != GPBDataTypeGroup, @"Can't happen");
-          // Everything else is a NSString.
-          [toStr appendString:valueObj];
-          break;
-      }
-#pragma clang diagnostic pop
-      [toStr appendString:@"\n"];
-
-      [toStr appendString:msgEnd];
-    }];
-  }
-}
-
-static void AppendTextFormatForMessageField(GPBMessage *message,
-                                            GPBFieldDescriptor *field,
-                                            NSMutableString *toStr,
-                                            NSString *lineIndent) {
-  id arrayOrMap;
-  NSUInteger count;
-  GPBFieldType fieldType = field.fieldType;
-  switch (fieldType) {
-    case GPBFieldTypeSingle:
-      arrayOrMap = nil;
-      count = (GPBGetHasIvarField(message, field) ? 1 : 0);
-      break;
-
-    case GPBFieldTypeRepeated:
-      // Will be NSArray or GPB*Array, type doesn't matter, they both
-      // implement count.
-      arrayOrMap = GPBGetObjectIvarWithFieldNoAutocreate(message, field);
-      count = [(NSArray *)arrayOrMap count];
-      break;
-
-    case GPBFieldTypeMap: {
-      // Will be GPB*Dictionary or NSMutableDictionary, type doesn't matter,
-      // they both implement count.
-      arrayOrMap = GPBGetObjectIvarWithFieldNoAutocreate(message, field);
-      count = [(NSDictionary *)arrayOrMap count];
-      break;
-    }
-  }
-
-  if (count == 0) {
-    // Nothing to print, out of here.
-    return;
-  }
-
-  NSString *lineEnding = @"";
-
-  // If the name can't be reversed or support for extra info was turned off,
-  // this can return nil.
-  NSString *fieldName = [field textFormatName];
-  if ([fieldName length] == 0) {
-    fieldName = [NSString stringWithFormat:@"%u", GPBFieldNumber(field)];
-    // If there is only one entry, put the objc name as a comment, other wise
-    // add it before the repeated values.
-    if (count > 1) {
-      [toStr appendFormat:@"%@# %@\n", lineIndent, field.name];
-    } else {
-      lineEnding = [NSString stringWithFormat:@"  # %@", field.name];
-    }
-  }
-
-  if (fieldType == GPBFieldTypeMap) {
-    AppendTextFormatForMapMessageField(arrayOrMap, field, toStr, lineIndent,
-                                       fieldName, lineEnding);
-    return;
-  }
-
-  id array = arrayOrMap;
-  const BOOL isRepeated = (array != nil);
-
-  GPBDataType fieldDataType = GPBGetFieldDataType(field);
-  BOOL isMessageField = GPBDataTypeIsMessage(fieldDataType);
-  for (NSUInteger j = 0; j < count; ++j) {
-    // Start the line.
-    [toStr appendFormat:@"%@%@%s ", lineIndent, fieldName,
-                        (isMessageField ? "" : ":")];
-
-    // The value.
-    switch (fieldDataType) {
-#define FIELD_CASE(GPBDATATYPE, CTYPE, REAL_TYPE, ...)                        \
-  case GPBDataType##GPBDATATYPE: {                                            \
-    CTYPE v = (isRepeated ? [(GPB##REAL_TYPE##Array *)array valueAtIndex:j]   \
-                          : GPBGetMessage##REAL_TYPE##Field(message, field)); \
-    [toStr appendFormat:__VA_ARGS__, v];                                      \
-    break;                                                                    \
-  }
-
-      FIELD_CASE(Int32, int32_t, Int32, @"%d")
-      FIELD_CASE(SInt32, int32_t, Int32, @"%d")
-      FIELD_CASE(SFixed32, int32_t, Int32, @"%d")
-      FIELD_CASE(UInt32, uint32_t, UInt32, @"%u")
-      FIELD_CASE(Fixed32, uint32_t, UInt32, @"%u")
-      FIELD_CASE(Int64, int64_t, Int64, @"%lld")
-      FIELD_CASE(SInt64, int64_t, Int64, @"%lld")
-      FIELD_CASE(SFixed64, int64_t, Int64, @"%lld")
-      FIELD_CASE(UInt64, uint64_t, UInt64, @"%llu")
-      FIELD_CASE(Fixed64, uint64_t, UInt64, @"%llu")
-      FIELD_CASE(Float, float, Float, @"%.*g", FLT_DIG)
-      FIELD_CASE(Double, double, Double, @"%.*lg", DBL_DIG)
-
-#undef FIELD_CASE
-
-      case GPBDataTypeEnum: {
-        int32_t v = (isRepeated ? [(GPBEnumArray *)array rawValueAtIndex:j]
-                                : GPBGetMessageInt32Field(message, field));
-        NSString *valueStr = nil;
-        GPBEnumDescriptor *descriptor = field.enumDescriptor;
-        if (descriptor) {
-          valueStr = [descriptor textFormatNameForValue:v];
-        }
-        if (valueStr) {
-          [toStr appendString:valueStr];
-        } else {
-          [toStr appendFormat:@"%d", v];
-        }
-        break;
-      }
-
-      case GPBDataTypeBool: {
-        BOOL v = (isRepeated ? [(GPBBoolArray *)array valueAtIndex:j]
-                             : GPBGetMessageBoolField(message, field));
-        [toStr appendString:(v ? @"true" : @"false")];
-        break;
-      }
-
-      case GPBDataTypeString: {
-        NSString *v = (isRepeated ? [(NSArray *)array objectAtIndex:j]
-                                  : GPBGetMessageStringField(message, field));
-        AppendStringEscaped(v, toStr);
-        break;
-      }
-
-      case GPBDataTypeBytes: {
-        NSData *v = (isRepeated ? [(NSArray *)array objectAtIndex:j]
-                                : GPBGetMessageBytesField(message, field));
-        AppendBufferAsString(v, toStr);
-        break;
-      }
-
-      case GPBDataTypeGroup:
-      case GPBDataTypeMessage: {
-        GPBMessage *v =
-            (isRepeated ? [(NSArray *)array objectAtIndex:j]
-                        : GPBGetObjectIvarWithField(message, field));
-        [toStr appendFormat:@"{%@\n", lineEnding];
-        NSString *subIndent = [lineIndent stringByAppendingString:@"  "];
-        AppendTextFormatForMessage(v, toStr, subIndent);
-        [toStr appendFormat:@"%@}", lineIndent];
-        lineEnding = @"";
-        break;
-      }
-
-    }  // switch(fieldDataType)
-
-    // End the line.
-    [toStr appendFormat:@"%@\n", lineEnding];
-
-  }  // for(count)
-}
-
-static void AppendTextFormatForMessageExtensionRange(GPBMessage *message,
-                                                     NSArray *activeExtensions,
-                                                     GPBExtensionRange range,
-                                                     NSMutableString *toStr,
-                                                     NSString *lineIndent) {
-  uint32_t start = range.start;
-  uint32_t end = range.end;
-  for (GPBExtensionDescriptor *extension in activeExtensions) {
-    uint32_t fieldNumber = extension.fieldNumber;
-    if (fieldNumber < start) {
-      // Not there yet.
-      continue;
-    }
-    if (fieldNumber >= end) {
-      // Done.
-      break;
-    }
-
-    id rawExtValue = [message getExtension:extension];
-    BOOL isRepeated = extension.isRepeated;
-
-    NSUInteger numValues = 1;
-    NSString *lineEnding = @"";
-    if (isRepeated) {
-      numValues = [(NSArray *)rawExtValue count];
-    }
-
-    NSString *singletonName = extension.singletonName;
-    if (numValues == 1) {
-      lineEnding = [NSString stringWithFormat:@"  # [%@]", singletonName];
-    } else {
-      [toStr appendFormat:@"%@# [%@]\n", lineIndent, singletonName];
-    }
-
-    GPBDataType extDataType = extension.dataType;
-    for (NSUInteger j = 0; j < numValues; ++j) {
-      id curValue = (isRepeated ? [rawExtValue objectAtIndex:j] : rawExtValue);
-
-      // Start the line.
-      [toStr appendFormat:@"%@%u%s ", lineIndent, fieldNumber,
-                          (GPBDataTypeIsMessage(extDataType) ? "" : ":")];
-
-      // The value.
-      switch (extDataType) {
-#define FIELD_CASE(GPBDATATYPE, CTYPE, NUMSELECTOR, ...) \
-  case GPBDataType##GPBDATATYPE: {                       \
-    CTYPE v = [(NSNumber *)curValue NUMSELECTOR];        \
-    [toStr appendFormat:__VA_ARGS__, v];                 \
-    break;                                               \
-  }
-
-        FIELD_CASE(Int32, int32_t, intValue, @"%d")
-        FIELD_CASE(SInt32, int32_t, intValue, @"%d")
-        FIELD_CASE(SFixed32, int32_t, unsignedIntValue, @"%d")
-        FIELD_CASE(UInt32, uint32_t, unsignedIntValue, @"%u")
-        FIELD_CASE(Fixed32, uint32_t, unsignedIntValue, @"%u")
-        FIELD_CASE(Int64, int64_t, longLongValue, @"%lld")
-        FIELD_CASE(SInt64, int64_t, longLongValue, @"%lld")
-        FIELD_CASE(SFixed64, int64_t, longLongValue, @"%lld")
-        FIELD_CASE(UInt64, uint64_t, unsignedLongLongValue, @"%llu")
-        FIELD_CASE(Fixed64, uint64_t, unsignedLongLongValue, @"%llu")
-        FIELD_CASE(Float, float, floatValue, @"%.*g", FLT_DIG)
-        FIELD_CASE(Double, double, doubleValue, @"%.*lg", DBL_DIG)
-        // TODO: Add a comment with the enum name from enum descriptors
-        // (might not be real value, so leave it as a comment, ObjC compiler
-        // name mangles differently).  Doesn't look like we actually generate
-        // an enum descriptor reference like we do for normal fields, so this
-        // will take a compiler change.
-        FIELD_CASE(Enum, int32_t, intValue, @"%d")
-
-#undef FIELD_CASE
-
-        case GPBDataTypeBool:
-          [toStr appendString:([(NSNumber *)curValue boolValue] ? @"true"
-                                                                : @"false")];
-          break;
-
-        case GPBDataTypeString:
-          AppendStringEscaped(curValue, toStr);
-          break;
-
-        case GPBDataTypeBytes:
-          AppendBufferAsString((NSData *)curValue, toStr);
-          break;
-
-        case GPBDataTypeGroup:
-        case GPBDataTypeMessage: {
-          [toStr appendFormat:@"{%@\n", lineEnding];
-          NSString *subIndent = [lineIndent stringByAppendingString:@"  "];
-          AppendTextFormatForMessage(curValue, toStr, subIndent);
-          [toStr appendFormat:@"%@}", lineIndent];
-          lineEnding = @"";
-          break;
-        }
-
-      }  // switch(extDataType)
-
-      // End the line.
-      [toStr appendFormat:@"%@\n", lineEnding];
-
-    }  //  for(numValues)
-
-  }  // for..in(activeExtensions)
-}
-
-static void AppendTextFormatForMessage(GPBMessage *message,
-                                       NSMutableString *toStr,
-                                       NSString *lineIndent) {
-  GPBDescriptor *descriptor = [message descriptor];
-  NSArray *fieldsArray = descriptor->fields_;
-  NSUInteger fieldCount = fieldsArray.count;
-  const GPBExtensionRange *extensionRanges = descriptor.extensionRanges;
-  NSUInteger extensionRangesCount = descriptor.extensionRangesCount;
-  NSArray *activeExtensions = [[message extensionsCurrentlySet]
-      sortedArrayUsingSelector:@selector(compareByFieldNumber:)];
-  for (NSUInteger i = 0, j = 0; i < fieldCount || j < extensionRangesCount;) {
-    if (i == fieldCount) {
-      AppendTextFormatForMessageExtensionRange(
-          message, activeExtensions, extensionRanges[j++], toStr, lineIndent);
-    } else if (j == extensionRangesCount ||
-               GPBFieldNumber(fieldsArray[i]) < extensionRanges[j].start) {
-      AppendTextFormatForMessageField(message, fieldsArray[i++], toStr,
-                                      lineIndent);
-    } else {
-      AppendTextFormatForMessageExtensionRange(
-          message, activeExtensions, extensionRanges[j++], toStr, lineIndent);
-    }
-  }
-
-  NSString *unknownFieldsStr =
-      GPBTextFormatForUnknownFieldSet(message.unknownFields, lineIndent);
-  if ([unknownFieldsStr length] > 0) {
-    [toStr appendFormat:@"%@# --- Unknown fields ---\n", lineIndent];
-    [toStr appendString:unknownFieldsStr];
-  }
-}
-
-NSString *GPBTextFormatForMessage(GPBMessage *message, NSString *lineIndent) {
-  if (message == nil) return @"";
-  if (lineIndent == nil) lineIndent = @"";
-
-  NSMutableString *buildString = [NSMutableString string];
-  AppendTextFormatForMessage(message, buildString, lineIndent);
-  return buildString;
-}
-
-NSString *GPBTextFormatForUnknownFieldSet(GPBUnknownFieldSet *unknownSet,
-                                          NSString *lineIndent) {
-  if (unknownSet == nil) return @"";
-  if (lineIndent == nil) lineIndent = @"";
-
-  NSMutableString *result = [NSMutableString string];
-  for (GPBUnknownField *field in [unknownSet sortedFields]) {
-    int32_t fieldNumber = [field number];
-
-#define PRINT_LOOP(PROPNAME, CTYPE, FORMAT)                                   \
-  [field.PROPNAME                                                             \
-      enumerateValuesWithBlock:^(CTYPE value, NSUInteger idx, BOOL * stop) {  \
-    _Pragma("unused(idx, stop)");                                             \
-    [result                                                                   \
-        appendFormat:@"%@%d: " #FORMAT "\n", lineIndent, fieldNumber, value]; \
-      }];
-
-    PRINT_LOOP(varintList, uint64_t, %llu);
-    PRINT_LOOP(fixed32List, uint32_t, 0x%X);
-    PRINT_LOOP(fixed64List, uint64_t, 0x%llX);
-
-#undef PRINT_LOOP
-
-    // NOTE: C++ version of TextFormat tries to parse this as a message
-    // and print that if it succeeds.
-    for (NSData *data in field.lengthDelimitedList) {
-      [result appendFormat:@"%@%d: ", lineIndent, fieldNumber];
-      AppendBufferAsString(data, result);
-      [result appendString:@"\n"];
-    }
-
-    for (GPBUnknownFieldSet *subUnknownSet in field.groupList) {
-      [result appendFormat:@"%@%d: {\n", lineIndent, fieldNumber];
-      NSString *subIndent = [lineIndent stringByAppendingString:@"  "];
-      NSString *subUnknownSetStr =
-          GPBTextFormatForUnknownFieldSet(subUnknownSet, subIndent);
-      [result appendString:subUnknownSetStr];
-      [result appendFormat:@"%@}\n", lineIndent];
-    }
-  }
-  return result;
-}
-
-// Helpers to decode a varint. Not using GPBCodedInputStream version because
-// that needs a state object, and we don't want to create an input stream out
-// of the data.
-GPB_INLINE int8_t ReadRawByteFromData(const uint8_t **data) {
-  int8_t result = *((int8_t *)(*data));
-  ++(*data);
-  return result;
-}
-
-static int32_t ReadRawVarint32FromData(const uint8_t **data) {
-  int8_t tmp = ReadRawByteFromData(data);
-  if (tmp >= 0) {
-    return tmp;
-  }
-  int32_t result = tmp & 0x7f;
-  if ((tmp = ReadRawByteFromData(data)) >= 0) {
-    result |= tmp << 7;
-  } else {
-    result |= (tmp & 0x7f) << 7;
-    if ((tmp = ReadRawByteFromData(data)) >= 0) {
-      result |= tmp << 14;
-    } else {
-      result |= (tmp & 0x7f) << 14;
-      if ((tmp = ReadRawByteFromData(data)) >= 0) {
-        result |= tmp << 21;
-      } else {
-        result |= (tmp & 0x7f) << 21;
-        result |= (tmp = ReadRawByteFromData(data)) << 28;
-        if (tmp < 0) {
-          // Discard upper 32 bits.
-          for (int i = 0; i < 5; i++) {
-            if (ReadRawByteFromData(data) >= 0) {
-              return result;
-            }
-          }
-          [NSException raise:NSParseErrorException
-                      format:@"Unable to read varint32"];
-        }
-      }
-    }
-  }
-  return result;
-}
-
-NSString *GPBDecodeTextFormatName(const uint8_t *decodeData, int32_t key,
-                                  NSString *inputStr) {
-  // decodData form:
-  //  varint32: num entries
-  //  for each entry:
-  //    varint32: key
-  //    bytes*: decode data
-  //
-  // decode data one of two forms:
-  //  1: a \0 followed by the string followed by an \0
-  //  2: bytecodes to transform an input into the right thing, ending with \0
-  //
-  // the bytes codes are of the form:
-  //  0xabbccccc
-  //  0x0 (all zeros), end.
-  //  a - if set, add an underscore
-  //  bb - 00 ccccc bytes as is
-  //  bb - 10 ccccc upper first, as is on rest, ccccc byte total
-  //  bb - 01 ccccc lower first, as is on rest, ccccc byte total
-  //  bb - 11 ccccc all upper, ccccc byte total
-
-  if (!decodeData || !inputStr) {
-    return nil;
-  }
-
-  // Find key
-  const uint8_t *scan = decodeData;
-  int32_t numEntries = ReadRawVarint32FromData(&scan);
-  BOOL foundKey = NO;
-  while (!foundKey && (numEntries > 0)) {
-    --numEntries;
-    int32_t dataKey = ReadRawVarint32FromData(&scan);
-    if (dataKey == key) {
-      foundKey = YES;
-    } else {
-      // If it is a inlined string, it will start with \0; if it is bytecode it
-      // will start with a code. So advance one (skipping the inline string
-      // marker), and then loop until reaching the end marker (\0).
-      ++scan;
-      while (*scan != 0) ++scan;
-      // Now move past the end marker.
-      ++scan;
-    }
-  }
-
-  if (!foundKey) {
-    return nil;
-  }
-
-  // Decode
-
-  if (*scan == 0) {
-    // Inline string. Move over the marker, and NSString can take it as
-    // UTF8.
-    ++scan;
-    NSString *result = [NSString stringWithUTF8String:(const char *)scan];
-    return result;
-  }
-
-  NSMutableString *result =
-      [NSMutableString stringWithCapacity:[inputStr length]];
-
-  const uint8_t kAddUnderscore  = 0b10000000;
-  const uint8_t kOpMask         = 0b01100000;
-  // const uint8_t kOpAsIs        = 0b00000000;
-  const uint8_t kOpFirstUpper     = 0b01000000;
-  const uint8_t kOpFirstLower     = 0b00100000;
-  const uint8_t kOpAllUpper       = 0b01100000;
-  const uint8_t kSegmentLenMask = 0b00011111;
-
-  NSInteger i = 0;
-  for (; *scan != 0; ++scan) {
-    if (*scan & kAddUnderscore) {
-      [result appendString:@"_"];
-    }
-    int segmentLen = *scan & kSegmentLenMask;
-    uint8_t decodeOp = *scan & kOpMask;
-
-    // Do op specific handling of the first character.
-    if (decodeOp == kOpFirstUpper) {
-      unichar c = [inputStr characterAtIndex:i];
-      [result appendFormat:@"%c", toupper((char)c)];
-      ++i;
-      --segmentLen;
-    } else if (decodeOp == kOpFirstLower) {
-      unichar c = [inputStr characterAtIndex:i];
-      [result appendFormat:@"%c", tolower((char)c)];
-      ++i;
-      --segmentLen;
-    }
-    // else op == kOpAsIs || op == kOpAllUpper
-
-    // Now pull over the rest of the length for this segment.
-    for (int x = 0; x < segmentLen; ++x) {
-      unichar c = [inputStr characterAtIndex:(i + x)];
-      if (decodeOp == kOpAllUpper) {
-        [result appendFormat:@"%c", toupper((char)c)];
-      } else {
-        [result appendFormat:@"%C", c];
-      }
-    }
-    i += segmentLen;
-  }
-
-  return result;
-}
-
-#pragma mark Legacy methods old generated code calls
-
-// Shim from the older generated code into the runtime.
-void GPBSetInt32IvarWithFieldInternal(GPBMessage *self,
-                                      GPBFieldDescriptor *field,
-                                      int32_t value,
-                                      GPBFileSyntax syntax) {
-#pragma unused(syntax)
-  GPBSetMessageInt32Field(self, field, value);
-}
-
-void GPBMaybeClearOneof(GPBMessage *self, GPBOneofDescriptor *oneof,
-                        int32_t oneofHasIndex, uint32_t fieldNumberNotToClear) {
-#pragma unused(fieldNumberNotToClear)
-  #if defined(DEBUG) && DEBUG
-    NSCAssert([[self descriptor] oneofWithName:oneof.name] == oneof,
-              @"OneofDescriptor %@ doesn't appear to be for %@ messages.",
-              oneof.name, [self class]);
-    GPBFieldDescriptor *firstField = oneof->fields_[0];
-    NSCAssert(firstField->description_->hasIndex == oneofHasIndex,
-              @"Internal error, oneofHasIndex (%d) doesn't match (%d).",
-              firstField->description_->hasIndex, oneofHasIndex);
-  #endif
-  GPBMaybeClearOneofPrivate(self, oneof, oneofHasIndex, 0);
-}
-
-#pragma clang diagnostic pop
-
-#pragma mark Misc Helpers
-
-BOOL GPBClassHasSel(Class aClass, SEL sel) {
-  // NOTE: We have to use class_copyMethodList, all other runtime method
-  // lookups actually also resolve the method implementation and this
-  // is called from within those methods.
-
-  BOOL result = NO;
-  unsigned int methodCount = 0;
-  Method *methodList = class_copyMethodList(aClass, &methodCount);
-  for (unsigned int i = 0; i < methodCount; ++i) {
-    SEL methodSelector = method_getName(methodList[i]);
-    if (methodSelector == sel) {
-      result = YES;
-      break;
-    }
-  }
-  free(methodList);
-  return result;
-}
diff --git a/libs/protobuf/objectivec/GPBUtilities_PackagePrivate.h b/libs/protobuf/objectivec/GPBUtilities_PackagePrivate.h
deleted file mode 100644
index 3d3d734..0000000
--- a/libs/protobuf/objectivec/GPBUtilities_PackagePrivate.h
+++ /dev/null
@@ -1,358 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#import <Foundation/Foundation.h>
-
-#import "GPBUtilities.h"
-
-#import "GPBDescriptor_PackagePrivate.h"
-
-// Macros for stringifying library symbols. These are used in the generated
-// GPB descriptor classes wherever a library symbol name is represented as a
-// string.
-#define GPBStringify(S) #S
-#define GPBStringifySymbol(S) GPBStringify(S)
-
-#define GPBNSStringify(S) @#S
-#define GPBNSStringifySymbol(S) GPBNSStringify(S)
-
-// Macros for generating a Class from a class name. These are used in
-// the generated GPB descriptor classes wherever an Objective C class
-// reference is needed for a generated class.
-#define GPBObjCClassSymbol(name) OBJC_CLASS_$_##name
-#define GPBObjCClass(name) \
-    ((__bridge Class)&(GPBObjCClassSymbol(name)))
-#define GPBObjCClassDeclaration(name) \
-    extern const GPBObjcClass_t GPBObjCClassSymbol(name)
-
-// Constant to internally mark when there is no has bit.
-#define GPBNoHasBit INT32_MAX
-
-CF_EXTERN_C_BEGIN
-
-// These two are used to inject a runtime check for version mismatch into the
-// generated sources to make sure they are linked with a supporting runtime.
-void GPBCheckRuntimeVersionSupport(int32_t objcRuntimeVersion);
-GPB_INLINE void GPB_DEBUG_CHECK_RUNTIME_VERSIONS() {
-  // NOTE: By being inline here, this captures the value from the library's
-  // headers at the time the generated code was compiled.
-#if defined(DEBUG) && DEBUG
-  GPBCheckRuntimeVersionSupport(GOOGLE_PROTOBUF_OBJC_VERSION);
-#endif
-}
-
-// Legacy version of the checks, remove when GOOGLE_PROTOBUF_OBJC_GEN_VERSION
-// goes away (see more info in GPBBootstrap.h).
-void GPBCheckRuntimeVersionInternal(int32_t version);
-GPB_INLINE void GPBDebugCheckRuntimeVersion() {
-#if defined(DEBUG) && DEBUG
-  GPBCheckRuntimeVersionInternal(GOOGLE_PROTOBUF_OBJC_GEN_VERSION);
-#endif
-}
-
-// Conversion functions for de/serializing floating point types.
-
-GPB_INLINE int64_t GPBConvertDoubleToInt64(double v) {
-  GPBInternalCompileAssert(sizeof(double) == sizeof(int64_t), double_not_64_bits);
-  int64_t result;
-  memcpy(&result, &v, sizeof(result));
-  return result;
-}
-
-GPB_INLINE int32_t GPBConvertFloatToInt32(float v) {
-  GPBInternalCompileAssert(sizeof(float) == sizeof(int32_t), float_not_32_bits);
-  int32_t result;
-  memcpy(&result, &v, sizeof(result));
-  return result;
-}
-
-GPB_INLINE double GPBConvertInt64ToDouble(int64_t v) {
-  GPBInternalCompileAssert(sizeof(double) == sizeof(int64_t), double_not_64_bits);
-  double result;
-  memcpy(&result, &v, sizeof(result));
-  return result;
-}
-
-GPB_INLINE float GPBConvertInt32ToFloat(int32_t v) {
-  GPBInternalCompileAssert(sizeof(float) == sizeof(int32_t), float_not_32_bits);
-  float result;
-  memcpy(&result, &v, sizeof(result));
-  return result;
-}
-
-GPB_INLINE int32_t GPBLogicalRightShift32(int32_t value, int32_t spaces) {
-  return (int32_t)((uint32_t)(value) >> spaces);
-}
-
-GPB_INLINE int64_t GPBLogicalRightShift64(int64_t value, int32_t spaces) {
-  return (int64_t)((uint64_t)(value) >> spaces);
-}
-
-// Decode a ZigZag-encoded 32-bit value.  ZigZag encodes signed integers
-// into values that can be efficiently encoded with varint.  (Otherwise,
-// negative values must be sign-extended to 64 bits to be varint encoded,
-// thus always taking 10 bytes on the wire.)
-GPB_INLINE int32_t GPBDecodeZigZag32(uint32_t n) {
-  return (int32_t)(GPBLogicalRightShift32((int32_t)n, 1) ^ -((int32_t)(n) & 1));
-}
-
-// Decode a ZigZag-encoded 64-bit value.  ZigZag encodes signed integers
-// into values that can be efficiently encoded with varint.  (Otherwise,
-// negative values must be sign-extended to 64 bits to be varint encoded,
-// thus always taking 10 bytes on the wire.)
-GPB_INLINE int64_t GPBDecodeZigZag64(uint64_t n) {
-  return (int64_t)(GPBLogicalRightShift64((int64_t)n, 1) ^ -((int64_t)(n) & 1));
-}
-
-// Encode a ZigZag-encoded 32-bit value.  ZigZag encodes signed integers
-// into values that can be efficiently encoded with varint.  (Otherwise,
-// negative values must be sign-extended to 64 bits to be varint encoded,
-// thus always taking 10 bytes on the wire.)
-GPB_INLINE uint32_t GPBEncodeZigZag32(int32_t n) {
-  // Note:  the right-shift must be arithmetic
-  return ((uint32_t)n << 1) ^ (uint32_t)(n >> 31);
-}
-
-// Encode a ZigZag-encoded 64-bit value.  ZigZag encodes signed integers
-// into values that can be efficiently encoded with varint.  (Otherwise,
-// negative values must be sign-extended to 64 bits to be varint encoded,
-// thus always taking 10 bytes on the wire.)
-GPB_INLINE uint64_t GPBEncodeZigZag64(int64_t n) {
-  // Note:  the right-shift must be arithmetic
-  return ((uint64_t)n << 1) ^ (uint64_t)(n >> 63);
-}
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wswitch-enum"
-#pragma clang diagnostic ignored "-Wdirect-ivar-access"
-
-GPB_INLINE BOOL GPBDataTypeIsObject(GPBDataType type) {
-  switch (type) {
-    case GPBDataTypeBytes:
-    case GPBDataTypeString:
-    case GPBDataTypeMessage:
-    case GPBDataTypeGroup:
-      return YES;
-    default:
-      return NO;
-  }
-}
-
-GPB_INLINE BOOL GPBDataTypeIsMessage(GPBDataType type) {
-  switch (type) {
-    case GPBDataTypeMessage:
-    case GPBDataTypeGroup:
-      return YES;
-    default:
-      return NO;
-  }
-}
-
-GPB_INLINE BOOL GPBFieldDataTypeIsMessage(GPBFieldDescriptor *field) {
-  return GPBDataTypeIsMessage(field->description_->dataType);
-}
-
-GPB_INLINE BOOL GPBFieldDataTypeIsObject(GPBFieldDescriptor *field) {
-  return GPBDataTypeIsObject(field->description_->dataType);
-}
-
-GPB_INLINE BOOL GPBExtensionIsMessage(GPBExtensionDescriptor *ext) {
-  return GPBDataTypeIsMessage(ext->description_->dataType);
-}
-
-// The field is an array/map or it has an object value.
-GPB_INLINE BOOL GPBFieldStoresObject(GPBFieldDescriptor *field) {
-  GPBMessageFieldDescription *desc = field->description_;
-  if ((desc->flags & (GPBFieldRepeated | GPBFieldMapKeyMask)) != 0) {
-    return YES;
-  }
-  return GPBDataTypeIsObject(desc->dataType);
-}
-
-BOOL GPBGetHasIvar(GPBMessage *self, int32_t index, uint32_t fieldNumber);
-void GPBSetHasIvar(GPBMessage *self, int32_t idx, uint32_t fieldNumber,
-                   BOOL value);
-uint32_t GPBGetHasOneof(GPBMessage *self, int32_t index);
-
-GPB_INLINE BOOL
-GPBGetHasIvarField(GPBMessage *self, GPBFieldDescriptor *field) {
-  GPBMessageFieldDescription *fieldDesc = field->description_;
-  return GPBGetHasIvar(self, fieldDesc->hasIndex, fieldDesc->number);
-}
-
-#pragma clang diagnostic pop
-
-//%PDDM-DEFINE GPB_IVAR_SET_DECL(NAME, TYPE)
-//%void GPBSet##NAME##IvarWithFieldPrivate(GPBMessage *self,
-//%            NAME$S                    GPBFieldDescriptor *field,
-//%            NAME$S                    TYPE value);
-//%PDDM-EXPAND GPB_IVAR_SET_DECL(Bool, BOOL)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-void GPBSetBoolIvarWithFieldPrivate(GPBMessage *self,
-                                    GPBFieldDescriptor *field,
-                                    BOOL value);
-// clang-format on
-//%PDDM-EXPAND GPB_IVAR_SET_DECL(Int32, int32_t)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-void GPBSetInt32IvarWithFieldPrivate(GPBMessage *self,
-                                     GPBFieldDescriptor *field,
-                                     int32_t value);
-// clang-format on
-//%PDDM-EXPAND GPB_IVAR_SET_DECL(UInt32, uint32_t)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-void GPBSetUInt32IvarWithFieldPrivate(GPBMessage *self,
-                                      GPBFieldDescriptor *field,
-                                      uint32_t value);
-// clang-format on
-//%PDDM-EXPAND GPB_IVAR_SET_DECL(Int64, int64_t)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-void GPBSetInt64IvarWithFieldPrivate(GPBMessage *self,
-                                     GPBFieldDescriptor *field,
-                                     int64_t value);
-// clang-format on
-//%PDDM-EXPAND GPB_IVAR_SET_DECL(UInt64, uint64_t)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-void GPBSetUInt64IvarWithFieldPrivate(GPBMessage *self,
-                                      GPBFieldDescriptor *field,
-                                      uint64_t value);
-// clang-format on
-//%PDDM-EXPAND GPB_IVAR_SET_DECL(Float, float)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-void GPBSetFloatIvarWithFieldPrivate(GPBMessage *self,
-                                     GPBFieldDescriptor *field,
-                                     float value);
-// clang-format on
-//%PDDM-EXPAND GPB_IVAR_SET_DECL(Double, double)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-void GPBSetDoubleIvarWithFieldPrivate(GPBMessage *self,
-                                      GPBFieldDescriptor *field,
-                                      double value);
-// clang-format on
-//%PDDM-EXPAND-END (7 expansions)
-
-void GPBSetEnumIvarWithFieldPrivate(GPBMessage *self,
-                                    GPBFieldDescriptor *field,
-                                    int32_t value);
-
-id GPBGetObjectIvarWithField(GPBMessage *self, GPBFieldDescriptor *field);
-
-void GPBSetObjectIvarWithFieldPrivate(GPBMessage *self,
-                                      GPBFieldDescriptor *field, id value);
-void GPBSetRetainedObjectIvarWithFieldPrivate(GPBMessage *self,
-                                              GPBFieldDescriptor *field,
-                                              id __attribute__((ns_consumed))
-                                              value);
-
-// GPBGetObjectIvarWithField will automatically create the field (message) if
-// it doesn't exist. GPBGetObjectIvarWithFieldNoAutocreate will return nil.
-id GPBGetObjectIvarWithFieldNoAutocreate(GPBMessage *self,
-                                         GPBFieldDescriptor *field);
-
-// Clears and releases the autocreated message ivar, if it's autocreated. If
-// it's not set as autocreated, this method does nothing.
-void GPBClearAutocreatedMessageIvarWithField(GPBMessage *self,
-                                             GPBFieldDescriptor *field);
-
-// Returns an Objective C encoding for |selector|. |instanceSel| should be
-// YES if it's an instance selector (as opposed to a class selector).
-// |selector| must be a selector from MessageSignatureProtocol.
-const char *GPBMessageEncodingForSelector(SEL selector, BOOL instanceSel);
-
-// Helper for text format name encoding.
-// decodeData is the data describing the special decodes.
-// key and inputString are the input that needs decoding.
-NSString *GPBDecodeTextFormatName(const uint8_t *decodeData, int32_t key,
-                                  NSString *inputString);
-
-
-// Shims from the older generated code into the runtime.
-void GPBSetInt32IvarWithFieldInternal(GPBMessage *self,
-                                      GPBFieldDescriptor *field,
-                                      int32_t value,
-                                      GPBFileSyntax syntax);
-void GPBMaybeClearOneof(GPBMessage *self, GPBOneofDescriptor *oneof,
-                        int32_t oneofHasIndex, uint32_t fieldNumberNotToClear);
-
-// A series of selectors that are used solely to get @encoding values
-// for them by the dynamic protobuf runtime code. See
-// GPBMessageEncodingForSelector for details. GPBRootObject conforms to
-// the protocol so that it is encoded in the Objective C runtime.
-@protocol GPBMessageSignatureProtocol
-@optional
-
-#define GPB_MESSAGE_SIGNATURE_ENTRY(TYPE, NAME) \
-  -(TYPE)get##NAME;                             \
-  -(void)set##NAME : (TYPE)value;               \
-  -(TYPE)get##NAME##AtIndex : (NSUInteger)index;
-
-GPB_MESSAGE_SIGNATURE_ENTRY(BOOL, Bool)
-GPB_MESSAGE_SIGNATURE_ENTRY(uint32_t, Fixed32)
-GPB_MESSAGE_SIGNATURE_ENTRY(int32_t, SFixed32)
-GPB_MESSAGE_SIGNATURE_ENTRY(float, Float)
-GPB_MESSAGE_SIGNATURE_ENTRY(uint64_t, Fixed64)
-GPB_MESSAGE_SIGNATURE_ENTRY(int64_t, SFixed64)
-GPB_MESSAGE_SIGNATURE_ENTRY(double, Double)
-GPB_MESSAGE_SIGNATURE_ENTRY(int32_t, Int32)
-GPB_MESSAGE_SIGNATURE_ENTRY(int64_t, Int64)
-GPB_MESSAGE_SIGNATURE_ENTRY(int32_t, SInt32)
-GPB_MESSAGE_SIGNATURE_ENTRY(int64_t, SInt64)
-GPB_MESSAGE_SIGNATURE_ENTRY(uint32_t, UInt32)
-GPB_MESSAGE_SIGNATURE_ENTRY(uint64_t, UInt64)
-GPB_MESSAGE_SIGNATURE_ENTRY(NSData *, Bytes)
-GPB_MESSAGE_SIGNATURE_ENTRY(NSString *, String)
-GPB_MESSAGE_SIGNATURE_ENTRY(GPBMessage *, Message)
-GPB_MESSAGE_SIGNATURE_ENTRY(GPBMessage *, Group)
-GPB_MESSAGE_SIGNATURE_ENTRY(int32_t, Enum)
-
-#undef GPB_MESSAGE_SIGNATURE_ENTRY
-
-- (id)getArray;
-- (NSUInteger)getArrayCount;
-- (void)setArray:(NSArray *)array;
-+ (id)getClassValue;
-@end
-
-BOOL GPBClassHasSel(Class aClass, SEL sel);
-
-CF_EXTERN_C_END
diff --git a/libs/protobuf/objectivec/GPBWellKnownTypes.h b/libs/protobuf/objectivec/GPBWellKnownTypes.h
deleted file mode 100644
index 80d9db0..0000000
--- a/libs/protobuf/objectivec/GPBWellKnownTypes.h
+++ /dev/null
@@ -1,233 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#import <Foundation/Foundation.h>
-
-#import "GPBAny.pbobjc.h"
-#import "GPBDuration.pbobjc.h"
-#import "GPBTimestamp.pbobjc.h"
-
-NS_ASSUME_NONNULL_BEGIN
-
-#pragma mark - Errors
-
-/** NSError domain used for errors. */
-extern NSString *const GPBWellKnownTypesErrorDomain;
-
-/** Error code for NSError with GPBWellKnownTypesErrorDomain. */
-typedef NS_ENUM(NSInteger, GPBWellKnownTypesErrorCode) {
-  /** The type_url could not be computed for the requested GPBMessage class. */
-  GPBWellKnownTypesErrorCodeFailedToComputeTypeURL = -100,
-  /** type_url in a Any doesn’t match that of the requested GPBMessage class. */
-  GPBWellKnownTypesErrorCodeTypeURLMismatch = -101,
-};
-
-#pragma mark - GPBTimestamp
-
-/**
- * Category for GPBTimestamp to work with standard Foundation time/date types.
- **/
-@interface GPBTimestamp (GBPWellKnownTypes)
-
-/** The NSDate representation of this GPBTimestamp. */
-@property(nonatomic, readwrite, strong) NSDate *date;
-
-/**
- * The NSTimeInterval representation of this GPBTimestamp.
- *
- * @note: Not all second/nanos combinations can be represented in a
- * NSTimeInterval, so getting this could be a lossy transform.
- **/
-@property(nonatomic, readwrite) NSTimeInterval timeIntervalSince1970;
-
-/**
- * Initializes a GPBTimestamp with the given NSDate.
- *
- * @param date The date to configure the GPBTimestamp with.
- *
- * @return A newly initialized GPBTimestamp.
- **/
-- (instancetype)initWithDate:(NSDate *)date;
-
-/**
- * Initializes a GPBTimestamp with the given NSTimeInterval.
- *
- * @param timeIntervalSince1970 Time interval to configure the GPBTimestamp with.
- *
- * @return A newly initialized GPBTimestamp.
- **/
-- (instancetype)initWithTimeIntervalSince1970:(NSTimeInterval)timeIntervalSince1970;
-
-@end
-
-#pragma mark - GPBDuration
-
-/**
- * Category for GPBDuration to work with standard Foundation time type.
- **/
-@interface GPBDuration (GBPWellKnownTypes)
-
-/**
- * The NSTimeInterval representation of this GPBDuration.
- *
- * @note: Not all second/nanos combinations can be represented in a
- * NSTimeInterval, so getting this could be a lossy transform.
- **/
-@property(nonatomic, readwrite) NSTimeInterval timeInterval;
-
-/**
- * Initializes a GPBDuration with the given NSTimeInterval.
- *
- * @param timeInterval Time interval to configure the GPBDuration with.
- *
- * @return A newly initialized GPBDuration.
- **/
-- (instancetype)initWithTimeInterval:(NSTimeInterval)timeInterval;
-
-// These next two methods are deprecated because GBPDuration has no need of a
-// "base" time. The older methods were about symmetry with GBPTimestamp, but
-// the unix epoch usage is too confusing.
-
-/** Deprecated, use timeInterval instead. */
-@property(nonatomic, readwrite) NSTimeInterval timeIntervalSince1970
-    __attribute__((deprecated("Use timeInterval")));
-/** Deprecated, use initWithTimeInterval: instead. */
-- (instancetype)initWithTimeIntervalSince1970:(NSTimeInterval)timeIntervalSince1970
-    __attribute__((deprecated("Use initWithTimeInterval:")));
-
-@end
-
-#pragma mark - GPBAny
-
-/**
- * Category for GPBAny to help work with the message within the object.
- **/
-@interface GPBAny (GBPWellKnownTypes)
-
-/**
- * Convenience method to create a GPBAny containing the serialized message.
- * This uses type.googleapis.com/ as the type_url's prefix.
- *
- * @param message  The message to be packed into the GPBAny.
- * @param errorPtr Pointer to an error that will be populated if something goes
- *                 wrong.
- *
- * @return A newly configured GPBAny with the given message, or nil on failure.
- */
-+ (nullable instancetype)anyWithMessage:(nonnull GPBMessage *)message
-                                  error:(NSError **)errorPtr;
-
-/**
- * Convenience method to create a GPBAny containing the serialized message.
- *
- * @param message       The message to be packed into the GPBAny.
- * @param typeURLPrefix The URL prefix to apply for type_url.
- * @param errorPtr      Pointer to an error that will be populated if something
- *                      goes wrong.
- *
- * @return A newly configured GPBAny with the given message, or nil on failure.
- */
-+ (nullable instancetype)anyWithMessage:(nonnull GPBMessage *)message
-                          typeURLPrefix:(nonnull NSString *)typeURLPrefix
-                                  error:(NSError **)errorPtr;
-
-/**
- * Initializes a GPBAny to contain the serialized message. This uses
- * type.googleapis.com/ as the type_url's prefix.
- *
- * @param message  The message to be packed into the GPBAny.
- * @param errorPtr Pointer to an error that will be populated if something goes
- *                 wrong.
- *
- * @return A newly configured GPBAny with the given message, or nil on failure.
- */
-- (nullable instancetype)initWithMessage:(nonnull GPBMessage *)message
-                                   error:(NSError **)errorPtr;
-
-/**
- * Initializes a GPBAny to contain the serialized message.
- *
- * @param message       The message to be packed into the GPBAny.
- * @param typeURLPrefix The URL prefix to apply for type_url.
- * @param errorPtr      Pointer to an error that will be populated if something
- *                      goes wrong.
- *
- * @return A newly configured GPBAny with the given message, or nil on failure.
- */
-- (nullable instancetype)initWithMessage:(nonnull GPBMessage *)message
-                           typeURLPrefix:(nonnull NSString *)typeURLPrefix
-                                   error:(NSError **)errorPtr;
-
-/**
- * Packs the serialized message into this GPBAny. This uses
- * type.googleapis.com/ as the type_url's prefix.
- *
- * @param message  The message to be packed into the GPBAny.
- * @param errorPtr Pointer to an error that will be populated if something goes
- *                 wrong.
- *
- * @return Whether the packing was successful or not.
- */
-- (BOOL)packWithMessage:(nonnull GPBMessage *)message
-                  error:(NSError **)errorPtr;
-
-/**
- * Packs the serialized message into this GPBAny.
- *
- * @param message       The message to be packed into the GPBAny.
- * @param typeURLPrefix The URL prefix to apply for type_url.
- * @param errorPtr      Pointer to an error that will be populated if something
- *                      goes wrong.
- *
- * @return Whether the packing was successful or not.
- */
-- (BOOL)packWithMessage:(nonnull GPBMessage *)message
-          typeURLPrefix:(nonnull NSString *)typeURLPrefix
-                  error:(NSError **)errorPtr;
-
-/**
- * Unpacks the serialized message as if it was an instance of the given class.
- *
- * @note When checking type_url, the base URL is not checked, only the fully
- *       qualified name.
- *
- * @param messageClass The class to use to deserialize the contained message.
- * @param errorPtr     Pointer to an error that will be populated if something
- *                     goes wrong.
- *
- * @return An instance of the given class populated with the contained data, or
- *         nil on failure.
- */
-- (nullable GPBMessage *)unpackMessageClass:(Class)messageClass
-                                      error:(NSError **)errorPtr;
-
-@end
-
-NS_ASSUME_NONNULL_END
diff --git a/libs/protobuf/objectivec/GPBWellKnownTypes.m b/libs/protobuf/objectivec/GPBWellKnownTypes.m
deleted file mode 100644
index 2808afe..0000000
--- a/libs/protobuf/objectivec/GPBWellKnownTypes.m
+++ /dev/null
@@ -1,272 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Importing sources here to force the linker to include our category methods in
-// the static library. If these were compiled separately, the category methods
-// below would be stripped by the linker.
-
-#import "GPBWellKnownTypes.h"
-
-#import "GPBUtilities_PackagePrivate.h"
-
-NSString *const GPBWellKnownTypesErrorDomain =
-    GPBNSStringifySymbol(GPBWellKnownTypesErrorDomain);
-
-static NSString *kTypePrefixGoogleApisCom = @"type.googleapis.com/";
-
-static NSTimeInterval TimeIntervalFromSecondsAndNanos(int64_t seconds,
-                                                      int32_t nanos) {
-  return seconds + (NSTimeInterval)nanos / 1e9;
-}
-
-static int32_t SecondsAndNanosFromTimeInterval(NSTimeInterval time,
-                                               int64_t *outSeconds,
-                                               BOOL nanosMustBePositive) {
-  NSTimeInterval seconds;
-  NSTimeInterval nanos = modf(time, &seconds);
-
-  if (nanosMustBePositive && (nanos < 0)) {
-    // Per Timestamp.proto, nanos is non-negative and "Negative second values with
-    // fractions must still have non-negative nanos values that count forward in
-    // time. Must be from 0 to 999,999,999 inclusive."
-    --seconds;
-    nanos = 1.0 + nanos;
-  }
-
-  nanos *= 1e9;
-  *outSeconds = (int64_t)seconds;
-  return (int32_t)nanos;
-}
-
-static NSString *BuildTypeURL(NSString *typeURLPrefix, NSString *fullName) {
-  if (typeURLPrefix.length == 0) {
-    return fullName;
-  }
-
-  if ([typeURLPrefix hasSuffix:@"/"]) {
-    return [typeURLPrefix stringByAppendingString:fullName];
-  }
-
-  return [NSString stringWithFormat:@"%@/%@", typeURLPrefix, fullName];
-}
-
-static NSString *ParseTypeFromURL(NSString *typeURLString) {
-  NSRange range = [typeURLString rangeOfString:@"/" options:NSBackwardsSearch];
-  if ((range.location == NSNotFound) ||
-      (NSMaxRange(range) == typeURLString.length)) {
-    return nil;
-  }
-  NSString *result = [typeURLString substringFromIndex:range.location + 1];
-  return result;
-}
-
-#pragma mark - GPBTimestamp
-
-@implementation GPBTimestamp (GBPWellKnownTypes)
-
-- (instancetype)initWithDate:(NSDate *)date {
-  return [self initWithTimeIntervalSince1970:date.timeIntervalSince1970];
-}
-
-- (instancetype)initWithTimeIntervalSince1970:(NSTimeInterval)timeIntervalSince1970 {
-  if ((self = [super init])) {
-    int64_t seconds;
-    int32_t nanos = SecondsAndNanosFromTimeInterval(
-        timeIntervalSince1970, &seconds, YES);
-    self.seconds = seconds;
-    self.nanos = nanos;
-  }
-  return self;
-}
-
-- (NSDate *)date {
-  return [NSDate dateWithTimeIntervalSince1970:self.timeIntervalSince1970];
-}
-
-- (void)setDate:(NSDate *)date {
-  self.timeIntervalSince1970 = date.timeIntervalSince1970;
-}
-
-- (NSTimeInterval)timeIntervalSince1970 {
-  return TimeIntervalFromSecondsAndNanos(self.seconds, self.nanos);
-}
-
-- (void)setTimeIntervalSince1970:(NSTimeInterval)timeIntervalSince1970 {
-  int64_t seconds;
-  int32_t nanos =
-      SecondsAndNanosFromTimeInterval(timeIntervalSince1970, &seconds, YES);
-  self.seconds = seconds;
-  self.nanos = nanos;
-}
-
-@end
-
-#pragma mark - GPBDuration
-
-@implementation GPBDuration (GBPWellKnownTypes)
-
-- (instancetype)initWithTimeInterval:(NSTimeInterval)timeInterval {
-  if ((self = [super init])) {
-    int64_t seconds;
-    int32_t nanos = SecondsAndNanosFromTimeInterval(
-        timeInterval, &seconds, NO);
-    self.seconds = seconds;
-    self.nanos = nanos;
-  }
-  return self;
-}
-
-- (instancetype)initWithTimeIntervalSince1970:(NSTimeInterval)timeIntervalSince1970 {
-  return [self initWithTimeInterval:timeIntervalSince1970];
-}
-
-- (NSTimeInterval)timeInterval {
-  return TimeIntervalFromSecondsAndNanos(self.seconds, self.nanos);
-}
-
-- (void)setTimeInterval:(NSTimeInterval)timeInterval {
-  int64_t seconds;
-  int32_t nanos =
-      SecondsAndNanosFromTimeInterval(timeInterval, &seconds, NO);
-  self.seconds = seconds;
-  self.nanos = nanos;
-}
-
-- (NSTimeInterval)timeIntervalSince1970 {
-  return self.timeInterval;
-}
-
-- (void)setTimeIntervalSince1970:(NSTimeInterval)timeIntervalSince1970 {
-  self.timeInterval = timeIntervalSince1970;
-}
-
-@end
-
-#pragma mark - GPBAny
-
-@implementation GPBAny (GBPWellKnownTypes)
-
-+ (instancetype)anyWithMessage:(GPBMessage *)message
-                         error:(NSError **)errorPtr {
-  return [self anyWithMessage:message
-                typeURLPrefix:kTypePrefixGoogleApisCom
-                        error:errorPtr];
-}
-
-+ (instancetype)anyWithMessage:(GPBMessage *)message
-                 typeURLPrefix:(NSString *)typeURLPrefix
-                         error:(NSError **)errorPtr {
-  return [[[self alloc] initWithMessage:message
-                          typeURLPrefix:typeURLPrefix
-                                  error:errorPtr] autorelease];
-}
-
-- (instancetype)initWithMessage:(GPBMessage *)message
-                          error:(NSError **)errorPtr {
-  return [self initWithMessage:message
-                 typeURLPrefix:kTypePrefixGoogleApisCom
-                         error:errorPtr];
-}
-
-- (instancetype)initWithMessage:(GPBMessage *)message
-                  typeURLPrefix:(NSString *)typeURLPrefix
-                          error:(NSError **)errorPtr {
-  self = [self init];
-  if (self) {
-    if (![self packWithMessage:message
-                 typeURLPrefix:typeURLPrefix
-                         error:errorPtr]) {
-      [self release];
-      self = nil;
-    }
-  }
-  return self;
-}
-
-- (BOOL)packWithMessage:(GPBMessage *)message
-                  error:(NSError **)errorPtr {
-  return [self packWithMessage:message
-                 typeURLPrefix:kTypePrefixGoogleApisCom
-                         error:errorPtr];
-}
-
-- (BOOL)packWithMessage:(GPBMessage *)message
-          typeURLPrefix:(NSString *)typeURLPrefix
-                  error:(NSError **)errorPtr {
-  NSString *fullName = [message descriptor].fullName;
-  if (fullName.length == 0) {
-    if (errorPtr) {
-      *errorPtr =
-          [NSError errorWithDomain:GPBWellKnownTypesErrorDomain
-                              code:GPBWellKnownTypesErrorCodeFailedToComputeTypeURL
-                          userInfo:nil];
-    }
-    return NO;
-  }
-  if (errorPtr) {
-    *errorPtr = nil;
-  }
-  self.typeURL = BuildTypeURL(typeURLPrefix, fullName);
-  self.value = message.data;
-  return YES;
-}
-
-- (GPBMessage *)unpackMessageClass:(Class)messageClass
-                             error:(NSError **)errorPtr {
-  NSString *fullName = [messageClass descriptor].fullName;
-  if (fullName.length == 0) {
-    if (errorPtr) {
-      *errorPtr =
-          [NSError errorWithDomain:GPBWellKnownTypesErrorDomain
-                              code:GPBWellKnownTypesErrorCodeFailedToComputeTypeURL
-                      userInfo:nil];
-    }
-    return nil;
-  }
-
-  NSString *expectedFullName = ParseTypeFromURL(self.typeURL);
-  if ((expectedFullName == nil) || ![expectedFullName isEqual:fullName]) {
-    if (errorPtr) {
-      *errorPtr =
-          [NSError errorWithDomain:GPBWellKnownTypesErrorDomain
-                              code:GPBWellKnownTypesErrorCodeTypeURLMismatch
-                          userInfo:nil];
-    }
-    return nil;
-  }
-
-  // Any is proto3, which means no extensions, so this assumes anything put
-  // within an any also won't need extensions. A second helper could be added
-  // if needed.
-  return [messageClass parseFromData:self.value
-                               error:errorPtr];
-}
-
-@end
diff --git a/libs/protobuf/objectivec/GPBWireFormat.h b/libs/protobuf/objectivec/GPBWireFormat.h
deleted file mode 100644
index c5941a3..0000000
--- a/libs/protobuf/objectivec/GPBWireFormat.h
+++ /dev/null
@@ -1,73 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#import "GPBRuntimeTypes.h"
-
-CF_EXTERN_C_BEGIN
-
-NS_ASSUME_NONNULL_BEGIN
-
-typedef enum {
-  GPBWireFormatVarint = 0,
-  GPBWireFormatFixed64 = 1,
-  GPBWireFormatLengthDelimited = 2,
-  GPBWireFormatStartGroup = 3,
-  GPBWireFormatEndGroup = 4,
-  GPBWireFormatFixed32 = 5,
-} GPBWireFormat;
-
-enum {
-  GPBWireFormatMessageSetItem = 1,
-  GPBWireFormatMessageSetTypeId = 2,
-  GPBWireFormatMessageSetMessage = 3
-};
-
-uint32_t GPBWireFormatMakeTag(uint32_t fieldNumber, GPBWireFormat wireType)
-    __attribute__((const));
-GPBWireFormat GPBWireFormatGetTagWireType(uint32_t tag) __attribute__((const));
-uint32_t GPBWireFormatGetTagFieldNumber(uint32_t tag) __attribute__((const));
-BOOL GPBWireFormatIsValidTag(uint32_t tag) __attribute__((const));
-
-GPBWireFormat GPBWireFormatForType(GPBDataType dataType, BOOL isPacked)
-    __attribute__((const));
-
-#define GPBWireFormatMessageSetItemTag \
-  (GPBWireFormatMakeTag(GPBWireFormatMessageSetItem, GPBWireFormatStartGroup))
-#define GPBWireFormatMessageSetItemEndTag \
-  (GPBWireFormatMakeTag(GPBWireFormatMessageSetItem, GPBWireFormatEndGroup))
-#define GPBWireFormatMessageSetTypeIdTag \
-  (GPBWireFormatMakeTag(GPBWireFormatMessageSetTypeId, GPBWireFormatVarint))
-#define GPBWireFormatMessageSetMessageTag               \
-  (GPBWireFormatMakeTag(GPBWireFormatMessageSetMessage, \
-                        GPBWireFormatLengthDelimited))
-
-NS_ASSUME_NONNULL_END
-
-CF_EXTERN_C_END
diff --git a/libs/protobuf/objectivec/GPBWireFormat.m b/libs/protobuf/objectivec/GPBWireFormat.m
deleted file mode 100644
index 860a339..0000000
--- a/libs/protobuf/objectivec/GPBWireFormat.m
+++ /dev/null
@@ -1,85 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#import "GPBWireFormat.h"
-
-#import "GPBUtilities_PackagePrivate.h"
-
-enum {
-  GPBWireFormatTagTypeBits = 3,
-  GPBWireFormatTagTypeMask = 7 /* = (1 << GPBWireFormatTagTypeBits) - 1 */,
-};
-
-uint32_t GPBWireFormatMakeTag(uint32_t fieldNumber, GPBWireFormat wireType) {
-  return (fieldNumber << GPBWireFormatTagTypeBits) | wireType;
-}
-
-GPBWireFormat GPBWireFormatGetTagWireType(uint32_t tag) {
-  return (GPBWireFormat)(tag & GPBWireFormatTagTypeMask);
-}
-
-uint32_t GPBWireFormatGetTagFieldNumber(uint32_t tag) {
-  return GPBLogicalRightShift32(tag, GPBWireFormatTagTypeBits);
-}
-
-BOOL GPBWireFormatIsValidTag(uint32_t tag) {
-  uint32_t formatBits = (tag & GPBWireFormatTagTypeMask);
-  // The valid GPBWireFormat* values are 0-5, anything else is not a valid tag.
-  BOOL result = (formatBits <= 5);
-  return result;
-}
-
-GPBWireFormat GPBWireFormatForType(GPBDataType type, BOOL isPacked) {
-  if (isPacked) {
-    return GPBWireFormatLengthDelimited;
-  }
-
-  static const GPBWireFormat format[GPBDataType_Count] = {
-      GPBWireFormatVarint,           // GPBDataTypeBool
-      GPBWireFormatFixed32,          // GPBDataTypeFixed32
-      GPBWireFormatFixed32,          // GPBDataTypeSFixed32
-      GPBWireFormatFixed32,          // GPBDataTypeFloat
-      GPBWireFormatFixed64,          // GPBDataTypeFixed64
-      GPBWireFormatFixed64,          // GPBDataTypeSFixed64
-      GPBWireFormatFixed64,          // GPBDataTypeDouble
-      GPBWireFormatVarint,           // GPBDataTypeInt32
-      GPBWireFormatVarint,           // GPBDataTypeInt64
-      GPBWireFormatVarint,           // GPBDataTypeSInt32
-      GPBWireFormatVarint,           // GPBDataTypeSInt64
-      GPBWireFormatVarint,           // GPBDataTypeUInt32
-      GPBWireFormatVarint,           // GPBDataTypeUInt64
-      GPBWireFormatLengthDelimited,  // GPBDataTypeBytes
-      GPBWireFormatLengthDelimited,  // GPBDataTypeString
-      GPBWireFormatLengthDelimited,  // GPBDataTypeMessage
-      GPBWireFormatStartGroup,       // GPBDataTypeGroup
-      GPBWireFormatVarint            // GPBDataTypeEnum
-  };
-  return format[type];
-}
diff --git a/libs/protobuf/objectivec/GPBWrappers.pbobjc.h b/libs/protobuf/objectivec/GPBWrappers.pbobjc.h
deleted file mode 100644
index e6741ae..0000000
--- a/libs/protobuf/objectivec/GPBWrappers.pbobjc.h
+++ /dev/null
@@ -1,207 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/protobuf/wrappers.proto
-
-#import "GPBDescriptor.h"
-#import "GPBMessage.h"
-#import "GPBRootObject.h"
-
-#if GOOGLE_PROTOBUF_OBJC_VERSION < 30004
-#error This file was generated by a newer version of protoc which is incompatible with your Protocol Buffer library sources.
-#endif
-#if 30004 < GOOGLE_PROTOBUF_OBJC_MIN_SUPPORTED_VERSION
-#error This file was generated by an older version of protoc which is incompatible with your Protocol Buffer library sources.
-#endif
-
-// @@protoc_insertion_point(imports)
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-
-CF_EXTERN_C_BEGIN
-
-NS_ASSUME_NONNULL_BEGIN
-
-#pragma mark - GPBWrappersRoot
-
-/**
- * Exposes the extension registry for this file.
- *
- * The base class provides:
- * @code
- *   + (GPBExtensionRegistry *)extensionRegistry;
- * @endcode
- * which is a @c GPBExtensionRegistry that includes all the extensions defined by
- * this file and all files that it depends on.
- **/
-GPB_FINAL @interface GPBWrappersRoot : GPBRootObject
-@end
-
-#pragma mark - GPBDoubleValue
-
-typedef GPB_ENUM(GPBDoubleValue_FieldNumber) {
-  GPBDoubleValue_FieldNumber_Value = 1,
-};
-
-/**
- * Wrapper message for `double`.
- *
- * The JSON representation for `DoubleValue` is JSON number.
- **/
-GPB_FINAL @interface GPBDoubleValue : GPBMessage
-
-/** The double value. */
-@property(nonatomic, readwrite) double value;
-
-@end
-
-#pragma mark - GPBFloatValue
-
-typedef GPB_ENUM(GPBFloatValue_FieldNumber) {
-  GPBFloatValue_FieldNumber_Value = 1,
-};
-
-/**
- * Wrapper message for `float`.
- *
- * The JSON representation for `FloatValue` is JSON number.
- **/
-GPB_FINAL @interface GPBFloatValue : GPBMessage
-
-/** The float value. */
-@property(nonatomic, readwrite) float value;
-
-@end
-
-#pragma mark - GPBInt64Value
-
-typedef GPB_ENUM(GPBInt64Value_FieldNumber) {
-  GPBInt64Value_FieldNumber_Value = 1,
-};
-
-/**
- * Wrapper message for `int64`.
- *
- * The JSON representation for `Int64Value` is JSON string.
- **/
-GPB_FINAL @interface GPBInt64Value : GPBMessage
-
-/** The int64 value. */
-@property(nonatomic, readwrite) int64_t value;
-
-@end
-
-#pragma mark - GPBUInt64Value
-
-typedef GPB_ENUM(GPBUInt64Value_FieldNumber) {
-  GPBUInt64Value_FieldNumber_Value = 1,
-};
-
-/**
- * Wrapper message for `uint64`.
- *
- * The JSON representation for `UInt64Value` is JSON string.
- **/
-GPB_FINAL @interface GPBUInt64Value : GPBMessage
-
-/** The uint64 value. */
-@property(nonatomic, readwrite) uint64_t value;
-
-@end
-
-#pragma mark - GPBInt32Value
-
-typedef GPB_ENUM(GPBInt32Value_FieldNumber) {
-  GPBInt32Value_FieldNumber_Value = 1,
-};
-
-/**
- * Wrapper message for `int32`.
- *
- * The JSON representation for `Int32Value` is JSON number.
- **/
-GPB_FINAL @interface GPBInt32Value : GPBMessage
-
-/** The int32 value. */
-@property(nonatomic, readwrite) int32_t value;
-
-@end
-
-#pragma mark - GPBUInt32Value
-
-typedef GPB_ENUM(GPBUInt32Value_FieldNumber) {
-  GPBUInt32Value_FieldNumber_Value = 1,
-};
-
-/**
- * Wrapper message for `uint32`.
- *
- * The JSON representation for `UInt32Value` is JSON number.
- **/
-GPB_FINAL @interface GPBUInt32Value : GPBMessage
-
-/** The uint32 value. */
-@property(nonatomic, readwrite) uint32_t value;
-
-@end
-
-#pragma mark - GPBBoolValue
-
-typedef GPB_ENUM(GPBBoolValue_FieldNumber) {
-  GPBBoolValue_FieldNumber_Value = 1,
-};
-
-/**
- * Wrapper message for `bool`.
- *
- * The JSON representation for `BoolValue` is JSON `true` and `false`.
- **/
-GPB_FINAL @interface GPBBoolValue : GPBMessage
-
-/** The bool value. */
-@property(nonatomic, readwrite) BOOL value;
-
-@end
-
-#pragma mark - GPBStringValue
-
-typedef GPB_ENUM(GPBStringValue_FieldNumber) {
-  GPBStringValue_FieldNumber_Value = 1,
-};
-
-/**
- * Wrapper message for `string`.
- *
- * The JSON representation for `StringValue` is JSON string.
- **/
-GPB_FINAL @interface GPBStringValue : GPBMessage
-
-/** The string value. */
-@property(nonatomic, readwrite, copy, null_resettable) NSString *value;
-
-@end
-
-#pragma mark - GPBBytesValue
-
-typedef GPB_ENUM(GPBBytesValue_FieldNumber) {
-  GPBBytesValue_FieldNumber_Value = 1,
-};
-
-/**
- * Wrapper message for `bytes`.
- *
- * The JSON representation for `BytesValue` is JSON string.
- **/
-GPB_FINAL @interface GPBBytesValue : GPBMessage
-
-/** The bytes value. */
-@property(nonatomic, readwrite, copy, null_resettable) NSData *value;
-
-@end
-
-NS_ASSUME_NONNULL_END
-
-CF_EXTERN_C_END
-
-#pragma clang diagnostic pop
-
-// @@protoc_insertion_point(global_scope)
diff --git a/libs/protobuf/objectivec/GPBWrappers.pbobjc.m b/libs/protobuf/objectivec/GPBWrappers.pbobjc.m
deleted file mode 100644
index b02a071..0000000
--- a/libs/protobuf/objectivec/GPBWrappers.pbobjc.m
+++ /dev/null
@@ -1,443 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/protobuf/wrappers.proto
-
-#import "GPBProtocolBuffers_RuntimeSupport.h"
-#import "GPBWrappers.pbobjc.h"
-
-// @@protoc_insertion_point(imports)
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-
-#pragma mark - GPBWrappersRoot
-
-@implementation GPBWrappersRoot
-
-// No extensions in the file and no imports, so no need to generate
-// +extensionRegistry.
-
-@end
-
-#pragma mark - GPBWrappersRoot_FileDescriptor
-
-static GPBFileDescriptor *GPBWrappersRoot_FileDescriptor(void) {
-  // This is called by +initialize so there is no need to worry
-  // about thread safety of the singleton.
-  static GPBFileDescriptor *descriptor = NULL;
-  if (!descriptor) {
-    GPB_DEBUG_CHECK_RUNTIME_VERSIONS();
-    descriptor = [[GPBFileDescriptor alloc] initWithPackage:@"google.protobuf"
-                                                 objcPrefix:@"GPB"
-                                                     syntax:GPBFileSyntaxProto3];
-  }
-  return descriptor;
-}
-
-#pragma mark - GPBDoubleValue
-
-@implementation GPBDoubleValue
-
-@dynamic value;
-
-typedef struct GPBDoubleValue__storage_ {
-  uint32_t _has_storage_[1];
-  double value;
-} GPBDoubleValue__storage_;
-
-// This method is threadsafe because it is initially called
-// in +initialize for each subclass.
-+ (GPBDescriptor *)descriptor {
-  static GPBDescriptor *descriptor = nil;
-  if (!descriptor) {
-    static GPBMessageFieldDescription fields[] = {
-      {
-        .name = "value",
-        .dataTypeSpecific.clazz = Nil,
-        .number = GPBDoubleValue_FieldNumber_Value,
-        .hasIndex = 0,
-        .offset = (uint32_t)offsetof(GPBDoubleValue__storage_, value),
-        .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldClearHasIvarOnZero),
-        .dataType = GPBDataTypeDouble,
-      },
-    };
-    GPBDescriptor *localDescriptor =
-        [GPBDescriptor allocDescriptorForClass:[GPBDoubleValue class]
-                                     rootClass:[GPBWrappersRoot class]
-                                          file:GPBWrappersRoot_FileDescriptor()
-                                        fields:fields
-                                    fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
-                                   storageSize:sizeof(GPBDoubleValue__storage_)
-                                         flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown)];
-    #if defined(DEBUG) && DEBUG
-      NSAssert(descriptor == nil, @"Startup recursed!");
-    #endif  // DEBUG
-    descriptor = localDescriptor;
-  }
-  return descriptor;
-}
-
-@end
-
-#pragma mark - GPBFloatValue
-
-@implementation GPBFloatValue
-
-@dynamic value;
-
-typedef struct GPBFloatValue__storage_ {
-  uint32_t _has_storage_[1];
-  float value;
-} GPBFloatValue__storage_;
-
-// This method is threadsafe because it is initially called
-// in +initialize for each subclass.
-+ (GPBDescriptor *)descriptor {
-  static GPBDescriptor *descriptor = nil;
-  if (!descriptor) {
-    static GPBMessageFieldDescription fields[] = {
-      {
-        .name = "value",
-        .dataTypeSpecific.clazz = Nil,
-        .number = GPBFloatValue_FieldNumber_Value,
-        .hasIndex = 0,
-        .offset = (uint32_t)offsetof(GPBFloatValue__storage_, value),
-        .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldClearHasIvarOnZero),
-        .dataType = GPBDataTypeFloat,
-      },
-    };
-    GPBDescriptor *localDescriptor =
-        [GPBDescriptor allocDescriptorForClass:[GPBFloatValue class]
-                                     rootClass:[GPBWrappersRoot class]
-                                          file:GPBWrappersRoot_FileDescriptor()
-                                        fields:fields
-                                    fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
-                                   storageSize:sizeof(GPBFloatValue__storage_)
-                                         flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown)];
-    #if defined(DEBUG) && DEBUG
-      NSAssert(descriptor == nil, @"Startup recursed!");
-    #endif  // DEBUG
-    descriptor = localDescriptor;
-  }
-  return descriptor;
-}
-
-@end
-
-#pragma mark - GPBInt64Value
-
-@implementation GPBInt64Value
-
-@dynamic value;
-
-typedef struct GPBInt64Value__storage_ {
-  uint32_t _has_storage_[1];
-  int64_t value;
-} GPBInt64Value__storage_;
-
-// This method is threadsafe because it is initially called
-// in +initialize for each subclass.
-+ (GPBDescriptor *)descriptor {
-  static GPBDescriptor *descriptor = nil;
-  if (!descriptor) {
-    static GPBMessageFieldDescription fields[] = {
-      {
-        .name = "value",
-        .dataTypeSpecific.clazz = Nil,
-        .number = GPBInt64Value_FieldNumber_Value,
-        .hasIndex = 0,
-        .offset = (uint32_t)offsetof(GPBInt64Value__storage_, value),
-        .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldClearHasIvarOnZero),
-        .dataType = GPBDataTypeInt64,
-      },
-    };
-    GPBDescriptor *localDescriptor =
-        [GPBDescriptor allocDescriptorForClass:[GPBInt64Value class]
-                                     rootClass:[GPBWrappersRoot class]
-                                          file:GPBWrappersRoot_FileDescriptor()
-                                        fields:fields
-                                    fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
-                                   storageSize:sizeof(GPBInt64Value__storage_)
-                                         flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown)];
-    #if defined(DEBUG) && DEBUG
-      NSAssert(descriptor == nil, @"Startup recursed!");
-    #endif  // DEBUG
-    descriptor = localDescriptor;
-  }
-  return descriptor;
-}
-
-@end
-
-#pragma mark - GPBUInt64Value
-
-@implementation GPBUInt64Value
-
-@dynamic value;
-
-typedef struct GPBUInt64Value__storage_ {
-  uint32_t _has_storage_[1];
-  uint64_t value;
-} GPBUInt64Value__storage_;
-
-// This method is threadsafe because it is initially called
-// in +initialize for each subclass.
-+ (GPBDescriptor *)descriptor {
-  static GPBDescriptor *descriptor = nil;
-  if (!descriptor) {
-    static GPBMessageFieldDescription fields[] = {
-      {
-        .name = "value",
-        .dataTypeSpecific.clazz = Nil,
-        .number = GPBUInt64Value_FieldNumber_Value,
-        .hasIndex = 0,
-        .offset = (uint32_t)offsetof(GPBUInt64Value__storage_, value),
-        .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldClearHasIvarOnZero),
-        .dataType = GPBDataTypeUInt64,
-      },
-    };
-    GPBDescriptor *localDescriptor =
-        [GPBDescriptor allocDescriptorForClass:[GPBUInt64Value class]
-                                     rootClass:[GPBWrappersRoot class]
-                                          file:GPBWrappersRoot_FileDescriptor()
-                                        fields:fields
-                                    fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
-                                   storageSize:sizeof(GPBUInt64Value__storage_)
-                                         flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown)];
-    #if defined(DEBUG) && DEBUG
-      NSAssert(descriptor == nil, @"Startup recursed!");
-    #endif  // DEBUG
-    descriptor = localDescriptor;
-  }
-  return descriptor;
-}
-
-@end
-
-#pragma mark - GPBInt32Value
-
-@implementation GPBInt32Value
-
-@dynamic value;
-
-typedef struct GPBInt32Value__storage_ {
-  uint32_t _has_storage_[1];
-  int32_t value;
-} GPBInt32Value__storage_;
-
-// This method is threadsafe because it is initially called
-// in +initialize for each subclass.
-+ (GPBDescriptor *)descriptor {
-  static GPBDescriptor *descriptor = nil;
-  if (!descriptor) {
-    static GPBMessageFieldDescription fields[] = {
-      {
-        .name = "value",
-        .dataTypeSpecific.clazz = Nil,
-        .number = GPBInt32Value_FieldNumber_Value,
-        .hasIndex = 0,
-        .offset = (uint32_t)offsetof(GPBInt32Value__storage_, value),
-        .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldClearHasIvarOnZero),
-        .dataType = GPBDataTypeInt32,
-      },
-    };
-    GPBDescriptor *localDescriptor =
-        [GPBDescriptor allocDescriptorForClass:[GPBInt32Value class]
-                                     rootClass:[GPBWrappersRoot class]
-                                          file:GPBWrappersRoot_FileDescriptor()
-                                        fields:fields
-                                    fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
-                                   storageSize:sizeof(GPBInt32Value__storage_)
-                                         flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown)];
-    #if defined(DEBUG) && DEBUG
-      NSAssert(descriptor == nil, @"Startup recursed!");
-    #endif  // DEBUG
-    descriptor = localDescriptor;
-  }
-  return descriptor;
-}
-
-@end
-
-#pragma mark - GPBUInt32Value
-
-@implementation GPBUInt32Value
-
-@dynamic value;
-
-typedef struct GPBUInt32Value__storage_ {
-  uint32_t _has_storage_[1];
-  uint32_t value;
-} GPBUInt32Value__storage_;
-
-// This method is threadsafe because it is initially called
-// in +initialize for each subclass.
-+ (GPBDescriptor *)descriptor {
-  static GPBDescriptor *descriptor = nil;
-  if (!descriptor) {
-    static GPBMessageFieldDescription fields[] = {
-      {
-        .name = "value",
-        .dataTypeSpecific.clazz = Nil,
-        .number = GPBUInt32Value_FieldNumber_Value,
-        .hasIndex = 0,
-        .offset = (uint32_t)offsetof(GPBUInt32Value__storage_, value),
-        .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldClearHasIvarOnZero),
-        .dataType = GPBDataTypeUInt32,
-      },
-    };
-    GPBDescriptor *localDescriptor =
-        [GPBDescriptor allocDescriptorForClass:[GPBUInt32Value class]
-                                     rootClass:[GPBWrappersRoot class]
-                                          file:GPBWrappersRoot_FileDescriptor()
-                                        fields:fields
-                                    fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
-                                   storageSize:sizeof(GPBUInt32Value__storage_)
-                                         flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown)];
-    #if defined(DEBUG) && DEBUG
-      NSAssert(descriptor == nil, @"Startup recursed!");
-    #endif  // DEBUG
-    descriptor = localDescriptor;
-  }
-  return descriptor;
-}
-
-@end
-
-#pragma mark - GPBBoolValue
-
-@implementation GPBBoolValue
-
-@dynamic value;
-
-typedef struct GPBBoolValue__storage_ {
-  uint32_t _has_storage_[1];
-} GPBBoolValue__storage_;
-
-// This method is threadsafe because it is initially called
-// in +initialize for each subclass.
-+ (GPBDescriptor *)descriptor {
-  static GPBDescriptor *descriptor = nil;
-  if (!descriptor) {
-    static GPBMessageFieldDescription fields[] = {
-      {
-        .name = "value",
-        .dataTypeSpecific.clazz = Nil,
-        .number = GPBBoolValue_FieldNumber_Value,
-        .hasIndex = 0,
-        .offset = 1,  // Stored in _has_storage_ to save space.
-        .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldClearHasIvarOnZero),
-        .dataType = GPBDataTypeBool,
-      },
-    };
-    GPBDescriptor *localDescriptor =
-        [GPBDescriptor allocDescriptorForClass:[GPBBoolValue class]
-                                     rootClass:[GPBWrappersRoot class]
-                                          file:GPBWrappersRoot_FileDescriptor()
-                                        fields:fields
-                                    fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
-                                   storageSize:sizeof(GPBBoolValue__storage_)
-                                         flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown)];
-    #if defined(DEBUG) && DEBUG
-      NSAssert(descriptor == nil, @"Startup recursed!");
-    #endif  // DEBUG
-    descriptor = localDescriptor;
-  }
-  return descriptor;
-}
-
-@end
-
-#pragma mark - GPBStringValue
-
-@implementation GPBStringValue
-
-@dynamic value;
-
-typedef struct GPBStringValue__storage_ {
-  uint32_t _has_storage_[1];
-  NSString *value;
-} GPBStringValue__storage_;
-
-// This method is threadsafe because it is initially called
-// in +initialize for each subclass.
-+ (GPBDescriptor *)descriptor {
-  static GPBDescriptor *descriptor = nil;
-  if (!descriptor) {
-    static GPBMessageFieldDescription fields[] = {
-      {
-        .name = "value",
-        .dataTypeSpecific.clazz = Nil,
-        .number = GPBStringValue_FieldNumber_Value,
-        .hasIndex = 0,
-        .offset = (uint32_t)offsetof(GPBStringValue__storage_, value),
-        .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldClearHasIvarOnZero),
-        .dataType = GPBDataTypeString,
-      },
-    };
-    GPBDescriptor *localDescriptor =
-        [GPBDescriptor allocDescriptorForClass:[GPBStringValue class]
-                                     rootClass:[GPBWrappersRoot class]
-                                          file:GPBWrappersRoot_FileDescriptor()
-                                        fields:fields
-                                    fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
-                                   storageSize:sizeof(GPBStringValue__storage_)
-                                         flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown)];
-    #if defined(DEBUG) && DEBUG
-      NSAssert(descriptor == nil, @"Startup recursed!");
-    #endif  // DEBUG
-    descriptor = localDescriptor;
-  }
-  return descriptor;
-}
-
-@end
-
-#pragma mark - GPBBytesValue
-
-@implementation GPBBytesValue
-
-@dynamic value;
-
-typedef struct GPBBytesValue__storage_ {
-  uint32_t _has_storage_[1];
-  NSData *value;
-} GPBBytesValue__storage_;
-
-// This method is threadsafe because it is initially called
-// in +initialize for each subclass.
-+ (GPBDescriptor *)descriptor {
-  static GPBDescriptor *descriptor = nil;
-  if (!descriptor) {
-    static GPBMessageFieldDescription fields[] = {
-      {
-        .name = "value",
-        .dataTypeSpecific.clazz = Nil,
-        .number = GPBBytesValue_FieldNumber_Value,
-        .hasIndex = 0,
-        .offset = (uint32_t)offsetof(GPBBytesValue__storage_, value),
-        .flags = (GPBFieldFlags)(GPBFieldOptional | GPBFieldClearHasIvarOnZero),
-        .dataType = GPBDataTypeBytes,
-      },
-    };
-    GPBDescriptor *localDescriptor =
-        [GPBDescriptor allocDescriptorForClass:[GPBBytesValue class]
-                                     rootClass:[GPBWrappersRoot class]
-                                          file:GPBWrappersRoot_FileDescriptor()
-                                        fields:fields
-                                    fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
-                                   storageSize:sizeof(GPBBytesValue__storage_)
-                                         flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown)];
-    #if defined(DEBUG) && DEBUG
-      NSAssert(descriptor == nil, @"Startup recursed!");
-    #endif  // DEBUG
-    descriptor = localDescriptor;
-  }
-  return descriptor;
-}
-
-@end
-
-
-#pragma clang diagnostic pop
-
-// @@protoc_insertion_point(global_scope)
diff --git a/libs/protobuf/objectivec/ProtocolBuffers_OSX.xcodeproj/project.pbxproj b/libs/protobuf/objectivec/ProtocolBuffers_OSX.xcodeproj/project.pbxproj
deleted file mode 100644
index 365fdc3..0000000
--- a/libs/protobuf/objectivec/ProtocolBuffers_OSX.xcodeproj/project.pbxproj
+++ /dev/null
@@ -1,1119 +0,0 @@
-// !$*UTF8*$!
-{
-	archiveVersion = 1;
-	classes = {
-	};
-	objectVersion = 47;
-	objects = {
-
-/* Begin PBXBuildFile section */
-		5102DABC1891A073002037B6 /* GPBConcurrencyTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 5102DABB1891A052002037B6 /* GPBConcurrencyTests.m */; };
-		7461B5360F94FB4600A0C422 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; };
-		7461B53C0F94FB4E00A0C422 /* GPBCodedInputStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 7461B48F0F94F99000A0C422 /* GPBCodedInputStream.m */; };
-		7461B53D0F94FB4E00A0C422 /* GPBCodedOutputStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 7461B4910F94F99000A0C422 /* GPBCodedOutputStream.m */; };
-		7461B5490F94FB4E00A0C422 /* GPBExtensionRegistry.m in Sources */ = {isa = PBXBuildFile; fileRef = 7461B4A90F94F99000A0C422 /* GPBExtensionRegistry.m */; };
-		7461B54C0F94FB4E00A0C422 /* GPBUnknownField.m in Sources */ = {isa = PBXBuildFile; fileRef = 7461B4AF0F94F99000A0C422 /* GPBUnknownField.m */; };
-		7461B5530F94FB4E00A0C422 /* GPBMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 7461B4BF0F94F99000A0C422 /* GPBMessage.m */; };
-		7461B5610F94FB4E00A0C422 /* GPBUnknownFieldSet.m in Sources */ = {isa = PBXBuildFile; fileRef = 7461B4E20F94F99000A0C422 /* GPBUnknownFieldSet.m */; };
-		7461B5630F94FB4E00A0C422 /* GPBUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = 7461B4E60F94F99000A0C422 /* GPBUtilities.m */; };
-		7461B5640F94FB4E00A0C422 /* GPBWireFormat.m in Sources */ = {isa = PBXBuildFile; fileRef = 7461B4E80F94F99000A0C422 /* GPBWireFormat.m */; };
-		8B210CCE159383D60032D72D /* golden_message in Resources */ = {isa = PBXBuildFile; fileRef = 8B210CCD159383D60032D72D /* golden_message */; };
-		8B210CD0159386920032D72D /* golden_packed_fields_message in Resources */ = {isa = PBXBuildFile; fileRef = 8B210CCF159386920032D72D /* golden_packed_fields_message */; };
-		8B4248BB1A8C256A00BC1EC6 /* GPBSwiftTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8B4248BA1A8C256A00BC1EC6 /* GPBSwiftTests.swift */; };
-		8B4248D21A927E1500BC1EC6 /* GPBWellKnownTypes.m in Sources */ = {isa = PBXBuildFile; fileRef = 8B4248D01A927E1500BC1EC6 /* GPBWellKnownTypes.m */; };
-		8B4248DC1A92933A00BC1EC6 /* GPBWellKnownTypesTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 8B4248DB1A92933A00BC1EC6 /* GPBWellKnownTypesTest.m */; };
-		8B79657B14992E3F002FFBFC /* GPBRootObject.m in Sources */ = {isa = PBXBuildFile; fileRef = 8B79657914992E3E002FFBFC /* GPBRootObject.m */; };
-		8B8B615D17DF7056002EE618 /* GPBARCUnittestProtos.m in Sources */ = {isa = PBXBuildFile; fileRef = 8B8B615C17DF7056002EE618 /* GPBARCUnittestProtos.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
-		8B96157414C8C38C00A2AC0B /* GPBDescriptor.m in Sources */ = {isa = PBXBuildFile; fileRef = 8B96157314C8C38C00A2AC0B /* GPBDescriptor.m */; };
-		8BBEA4A9147C727D00C4ADB7 /* GPBCodedInputStreamTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 7461B69B0F94FDF800A0C422 /* GPBCodedInputStreamTests.m */; };
-		8BBEA4AA147C727D00C4ADB7 /* GPBCodedOuputStreamTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 7461B69D0F94FDF800A0C422 /* GPBCodedOuputStreamTests.m */; };
-		8BBEA4AC147C727D00C4ADB7 /* GPBMessageTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 7461B6A30F94FDF800A0C422 /* GPBMessageTests.m */; };
-		8BBEA4B0147C727D00C4ADB7 /* GPBTestUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = 7461B6AC0F94FDF800A0C422 /* GPBTestUtilities.m */; };
-		8BBEA4B6147C727D00C4ADB7 /* GPBUnknownFieldSetTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 7461B6B80F94FDF900A0C422 /* GPBUnknownFieldSetTest.m */; };
-		8BBEA4B7147C727D00C4ADB7 /* GPBUtilitiesTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 7461B6BA0F94FDF900A0C422 /* GPBUtilitiesTests.m */; };
-		8BBEA4B8147C727D00C4ADB7 /* GPBWireFormatTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 7461B6BC0F94FDF900A0C422 /* GPBWireFormatTests.m */; };
-		8BBEA4BB147C729200C4ADB7 /* libProtocolBuffers.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7461B52E0F94FAF800A0C422 /* libProtocolBuffers.a */; };
-		8BD3981F14BE59D70081D629 /* GPBUnittestProtos.m in Sources */ = {isa = PBXBuildFile; fileRef = 8BD3981E14BE59D70081D629 /* GPBUnittestProtos.m */; };
-		8BF8193514A0DDA600A2C982 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; };
-		8BFF9D1A23AD582300E63E32 /* GPBMessageTests+ClassNames.m in Sources */ = {isa = PBXBuildFile; fileRef = 8BFF9D1923AD582200E63E32 /* GPBMessageTests+ClassNames.m */; };
-		F401DC2D1A8D444600FCC765 /* GPBArray.m in Sources */ = {isa = PBXBuildFile; fileRef = F401DC2B1A8D444600FCC765 /* GPBArray.m */; };
-		F401DC331A8E5C0200FCC765 /* GPBArrayTests.m in Sources */ = {isa = PBXBuildFile; fileRef = F401DC321A8E5C0200FCC765 /* GPBArrayTests.m */; };
-		F40EE4AB206BF8B90071091A /* GPBCompileTest01.m in Sources */ = {isa = PBXBuildFile; fileRef = F40EE488206BF8B00071091A /* GPBCompileTest01.m */; };
-		F40EE4AC206BF8B90071091A /* GPBCompileTest02.m in Sources */ = {isa = PBXBuildFile; fileRef = F40EE481206BF8AE0071091A /* GPBCompileTest02.m */; };
-		F40EE4AD206BF8B90071091A /* GPBCompileTest03.m in Sources */ = {isa = PBXBuildFile; fileRef = F40EE491206BF8B10071091A /* GPBCompileTest03.m */; };
-		F40EE4AE206BF8B90071091A /* GPBCompileTest04.m in Sources */ = {isa = PBXBuildFile; fileRef = F40EE47E206BF8AE0071091A /* GPBCompileTest04.m */; };
-		F40EE4AF206BF8B90071091A /* GPBCompileTest05.m in Sources */ = {isa = PBXBuildFile; fileRef = F40EE47F206BF8AE0071091A /* GPBCompileTest05.m */; };
-		F40EE4B0206BF8B90071091A /* GPBCompileTest06.m in Sources */ = {isa = PBXBuildFile; fileRef = F40EE492206BF8B10071091A /* GPBCompileTest06.m */; };
-		F40EE4B1206BF8B90071091A /* GPBCompileTest07.m in Sources */ = {isa = PBXBuildFile; fileRef = F40EE480206BF8AE0071091A /* GPBCompileTest07.m */; };
-		F40EE4B2206BF8B90071091A /* GPBCompileTest08.m in Sources */ = {isa = PBXBuildFile; fileRef = F40EE47D206BF8AD0071091A /* GPBCompileTest08.m */; };
-		F40EE4B3206BF8B90071091A /* GPBCompileTest09.m in Sources */ = {isa = PBXBuildFile; fileRef = F40EE484206BF8AF0071091A /* GPBCompileTest09.m */; };
-		F40EE4B4206BF8B90071091A /* GPBCompileTest10.m in Sources */ = {isa = PBXBuildFile; fileRef = F40EE48C206BF8B00071091A /* GPBCompileTest10.m */; };
-		F40EE4B5206BF8B90071091A /* GPBCompileTest11.m in Sources */ = {isa = PBXBuildFile; fileRef = F40EE493206BF8B20071091A /* GPBCompileTest11.m */; };
-		F40EE4B6206BF8B90071091A /* GPBCompileTest12.m in Sources */ = {isa = PBXBuildFile; fileRef = F40EE490206BF8B10071091A /* GPBCompileTest12.m */; };
-		F40EE4B7206BF8B90071091A /* GPBCompileTest13.m in Sources */ = {isa = PBXBuildFile; fileRef = F40EE483206BF8AF0071091A /* GPBCompileTest13.m */; };
-		F40EE4B8206BF8B90071091A /* GPBCompileTest14.m in Sources */ = {isa = PBXBuildFile; fileRef = F40EE48F206BF8B10071091A /* GPBCompileTest14.m */; };
-		F40EE4B9206BF8B90071091A /* GPBCompileTest15.m in Sources */ = {isa = PBXBuildFile; fileRef = F40EE489206BF8B00071091A /* GPBCompileTest15.m */; };
-		F40EE4BA206BF8B90071091A /* GPBCompileTest16.m in Sources */ = {isa = PBXBuildFile; fileRef = F40EE48B206BF8B00071091A /* GPBCompileTest16.m */; };
-		F40EE4BB206BF8B90071091A /* GPBCompileTest17.m in Sources */ = {isa = PBXBuildFile; fileRef = F40EE48D206BF8B00071091A /* GPBCompileTest17.m */; };
-		F40EE4BC206BF8B90071091A /* GPBCompileTest18.m in Sources */ = {isa = PBXBuildFile; fileRef = F40EE48E206BF8B10071091A /* GPBCompileTest18.m */; };
-		F40EE4BD206BF8B90071091A /* GPBCompileTest19.m in Sources */ = {isa = PBXBuildFile; fileRef = F40EE482206BF8AF0071091A /* GPBCompileTest19.m */; };
-		F40EE4BE206BF8B90071091A /* GPBCompileTest20.m in Sources */ = {isa = PBXBuildFile; fileRef = F40EE485206BF8AF0071091A /* GPBCompileTest20.m */; };
-		F40EE4BF206BF8B90071091A /* GPBCompileTest21.m in Sources */ = {isa = PBXBuildFile; fileRef = F40EE486206BF8AF0071091A /* GPBCompileTest21.m */; };
-		F40EE4C0206BF8B90071091A /* GPBCompileTest22.m in Sources */ = {isa = PBXBuildFile; fileRef = F40EE48A206BF8B00071091A /* GPBCompileTest22.m */; };
-		F40EE4C1206BF8B90071091A /* GPBCompileTest23.m in Sources */ = {isa = PBXBuildFile; fileRef = F40EE487206BF8B00071091A /* GPBCompileTest23.m */; };
-		F40EE50B206C06640071091A /* GPBCompileTest24.m in Sources */ = {isa = PBXBuildFile; fileRef = F40EE508206C06440071091A /* GPBCompileTest24.m */; };
-		F40EE50C206C06640071091A /* GPBCompileTest25.m in Sources */ = {isa = PBXBuildFile; fileRef = F40EE507206C06440071091A /* GPBCompileTest25.m */; };
-		F41C175D1833D3310064ED4D /* GPBPerfTests.m in Sources */ = {isa = PBXBuildFile; fileRef = F41C175C1833D3310064ED4D /* GPBPerfTests.m */; };
-		F4353D1D1AB8822D005A6198 /* GPBDescriptorTests.m in Sources */ = {isa = PBXBuildFile; fileRef = F4353D1C1AB8822D005A6198 /* GPBDescriptorTests.m */; };
-		F4353D231ABB1537005A6198 /* GPBDictionary.m in Sources */ = {isa = PBXBuildFile; fileRef = F4353D211ABB1537005A6198 /* GPBDictionary.m */; };
-		F4353D341AC06F10005A6198 /* GPBDictionaryTests+Bool.m in Sources */ = {isa = PBXBuildFile; fileRef = F4353D2D1AC06F10005A6198 /* GPBDictionaryTests+Bool.m */; };
-		F4353D351AC06F10005A6198 /* GPBDictionaryTests+Int32.m in Sources */ = {isa = PBXBuildFile; fileRef = F4353D2E1AC06F10005A6198 /* GPBDictionaryTests+Int32.m */; };
-		F4353D361AC06F10005A6198 /* GPBDictionaryTests+Int64.m in Sources */ = {isa = PBXBuildFile; fileRef = F4353D2F1AC06F10005A6198 /* GPBDictionaryTests+Int64.m */; };
-		F4353D371AC06F10005A6198 /* GPBDictionaryTests+String.m in Sources */ = {isa = PBXBuildFile; fileRef = F4353D301AC06F10005A6198 /* GPBDictionaryTests+String.m */; };
-		F4353D381AC06F10005A6198 /* GPBDictionaryTests+UInt32.m in Sources */ = {isa = PBXBuildFile; fileRef = F4353D311AC06F10005A6198 /* GPBDictionaryTests+UInt32.m */; };
-		F4353D391AC06F10005A6198 /* GPBDictionaryTests+UInt64.m in Sources */ = {isa = PBXBuildFile; fileRef = F4353D321AC06F10005A6198 /* GPBDictionaryTests+UInt64.m */; };
-		F43C88D0191D77FC009E917D /* text_format_unittest_data.txt in Resources */ = {isa = PBXBuildFile; fileRef = F43C88CF191D77FC009E917D /* text_format_unittest_data.txt */; };
-		F4487C4D1A9F8E0200531423 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; };
-		F4487C521A9F8E4D00531423 /* GPBProtocolBuffers.m in Sources */ = {isa = PBXBuildFile; fileRef = 8BCF338814ED799900BC5317 /* GPBProtocolBuffers.m */; };
-		F4487C751AADF7F500531423 /* GPBMessageTests+Runtime.m in Sources */ = {isa = PBXBuildFile; fileRef = F4487C741AADF7F500531423 /* GPBMessageTests+Runtime.m */; };
-		F4487C7F1AAF62CD00531423 /* GPBMessageTests+Serialization.m in Sources */ = {isa = PBXBuildFile; fileRef = F4487C7E1AAF62CD00531423 /* GPBMessageTests+Serialization.m */; };
-		F4487C831AAF6AB300531423 /* GPBMessageTests+Merge.m in Sources */ = {isa = PBXBuildFile; fileRef = F4487C821AAF6AB300531423 /* GPBMessageTests+Merge.m */; };
-		F4584D821ECCB52A00803AB6 /* GPBExtensionRegistryTest.m in Sources */ = {isa = PBXBuildFile; fileRef = F4584D7E1ECCB38900803AB6 /* GPBExtensionRegistryTest.m */; };
-		F45C69CC16DFD08D0081955B /* GPBExtensionInternals.m in Sources */ = {isa = PBXBuildFile; fileRef = F45C69CB16DFD08D0081955B /* GPBExtensionInternals.m */; };
-		F45E57C71AE6DC6A000B7D99 /* text_format_map_unittest_data.txt in Resources */ = {isa = PBXBuildFile; fileRef = F45E57C61AE6DC6A000B7D99 /* text_format_map_unittest_data.txt */; };
-		F47CF92B23D9006000C7B24C /* GPBStruct.pbobjc.m in Sources */ = {isa = PBXBuildFile; fileRef = F47CF91F23D9005F00C7B24C /* GPBStruct.pbobjc.m */; };
-		F47CF92F23D9006000C7B24C /* GPBSourceContext.pbobjc.m in Sources */ = {isa = PBXBuildFile; fileRef = F47CF92323D9006000C7B24C /* GPBSourceContext.pbobjc.m */; };
-		F47CF93123D9006000C7B24C /* GPBType.pbobjc.m in Sources */ = {isa = PBXBuildFile; fileRef = F47CF92523D9006000C7B24C /* GPBType.pbobjc.m */; };
-		F47CF93223D9006000C7B24C /* GPBWrappers.pbobjc.m in Sources */ = {isa = PBXBuildFile; fileRef = F47CF92623D9006000C7B24C /* GPBWrappers.pbobjc.m */; };
-		F47CF93423D9006000C7B24C /* GPBFieldMask.pbobjc.m in Sources */ = {isa = PBXBuildFile; fileRef = F47CF92823D9006000C7B24C /* GPBFieldMask.pbobjc.m */; };
-		F47CF93523D9006000C7B24C /* GPBTimestamp.pbobjc.m in Sources */ = {isa = PBXBuildFile; fileRef = F47CF92923D9006000C7B24C /* GPBTimestamp.pbobjc.m */; };
-		F47CF94123D902D500C7B24C /* GPBEmpty.pbobjc.m in Sources */ = {isa = PBXBuildFile; fileRef = F47CF93923D902D500C7B24C /* GPBEmpty.pbobjc.m */; };
-		F47CF94223D902D500C7B24C /* GPBApi.pbobjc.m in Sources */ = {isa = PBXBuildFile; fileRef = F47CF93A23D902D500C7B24C /* GPBApi.pbobjc.m */; };
-		F47CF94323D902D500C7B24C /* GPBAny.pbobjc.m in Sources */ = {isa = PBXBuildFile; fileRef = F47CF93B23D902D500C7B24C /* GPBAny.pbobjc.m */; };
-		F47CF94623D902D500C7B24C /* GPBDuration.pbobjc.m in Sources */ = {isa = PBXBuildFile; fileRef = F47CF93E23D902D500C7B24C /* GPBDuration.pbobjc.m */; };
-		F4B51B1E1BBC610700744318 /* GPBObjectiveCPlusPlusTest.mm in Sources */ = {isa = PBXBuildFile; fileRef = F4B51B1D1BBC610700744318 /* GPBObjectiveCPlusPlusTest.mm */; };
-		F4C4B9E41E1D976300D3B61D /* GPBDictionaryTests.m in Sources */ = {isa = PBXBuildFile; fileRef = F4C4B9E21E1D974F00D3B61D /* GPBDictionaryTests.m */; };
-		F4F53F8A219CC4F2001EABF4 /* text_format_extensions_unittest_data.txt in Resources */ = {isa = PBXBuildFile; fileRef = F4F53F89219CC4F2001EABF4 /* text_format_extensions_unittest_data.txt */; };
-		F4F8D8831D789FD9002CE128 /* GPBUnittestProtos2.m in Sources */ = {isa = PBXBuildFile; fileRef = F4F8D8811D789FCE002CE128 /* GPBUnittestProtos2.m */; };
-/* End PBXBuildFile section */
-
-/* Begin PBXContainerItemProxy section */
-		8BBEA4BC147C729A00C4ADB7 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 7461B52D0F94FAF800A0C422;
-			remoteInfo = ProtocolBuffers;
-		};
-		F45BBC181B0CE3D7002D064D /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = F45BBC141B0CE3C6002D064D;
-			remoteInfo = "Compile Unittest Protos";
-		};
-/* End PBXContainerItemProxy section */
-
-/* Begin PBXFileReference section */
-		1D30AB110D05D00D00671497 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
-		5102DABB1891A052002037B6 /* GPBConcurrencyTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = GPBConcurrencyTests.m; sourceTree = "<group>"; };
-		51457B5F18D0B7AF00CCC606 /* GPBCodedInputStream_PackagePrivate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GPBCodedInputStream_PackagePrivate.h; sourceTree = "<group>"; };
-		515B840C18B7DEE30031753B /* GPBDescriptor_PackagePrivate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GPBDescriptor_PackagePrivate.h; sourceTree = "<group>"; };
-		5196A06918CE16B000B759E2 /* GPBMessage_PackagePrivate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GPBMessage_PackagePrivate.h; sourceTree = "<group>"; };
-		7401C1A90F950347006D8281 /* UnitTests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "UnitTests-Info.plist"; sourceTree = "<group>"; };
-		7461B48D0F94F99000A0C422 /* GPBBootstrap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPBBootstrap.h; sourceTree = "<group>"; };
-		7461B48E0F94F99000A0C422 /* GPBCodedInputStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPBCodedInputStream.h; sourceTree = "<group>"; };
-		7461B48F0F94F99000A0C422 /* GPBCodedInputStream.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = GPBCodedInputStream.m; sourceTree = "<group>"; };
-		7461B4900F94F99000A0C422 /* GPBCodedOutputStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPBCodedOutputStream.h; sourceTree = "<group>"; };
-		7461B4910F94F99000A0C422 /* GPBCodedOutputStream.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBCodedOutputStream.m; sourceTree = "<group>"; };
-		7461B4A80F94F99000A0C422 /* GPBExtensionRegistry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPBExtensionRegistry.h; sourceTree = "<group>"; };
-		7461B4A90F94F99000A0C422 /* GPBExtensionRegistry.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBExtensionRegistry.m; sourceTree = "<group>"; };
-		7461B4AE0F94F99000A0C422 /* GPBUnknownField.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPBUnknownField.h; sourceTree = "<group>"; };
-		7461B4AF0F94F99000A0C422 /* GPBUnknownField.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBUnknownField.m; sourceTree = "<group>"; };
-		7461B4BE0F94F99000A0C422 /* GPBMessage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPBMessage.h; sourceTree = "<group>"; };
-		7461B4BF0F94F99000A0C422 /* GPBMessage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBMessage.m; sourceTree = "<group>"; };
-		7461B4CD0F94F99000A0C422 /* GPBProtocolBuffers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPBProtocolBuffers.h; sourceTree = "<group>"; };
-		7461B4E10F94F99000A0C422 /* GPBUnknownFieldSet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPBUnknownFieldSet.h; sourceTree = "<group>"; };
-		7461B4E20F94F99000A0C422 /* GPBUnknownFieldSet.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBUnknownFieldSet.m; sourceTree = "<group>"; };
-		7461B4E50F94F99000A0C422 /* GPBUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPBUtilities.h; sourceTree = "<group>"; };
-		7461B4E60F94F99000A0C422 /* GPBUtilities.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBUtilities.m; sourceTree = "<group>"; };
-		7461B4E70F94F99000A0C422 /* GPBWireFormat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPBWireFormat.h; sourceTree = "<group>"; };
-		7461B4E80F94F99000A0C422 /* GPBWireFormat.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBWireFormat.m; sourceTree = "<group>"; };
-		7461B52E0F94FAF800A0C422 /* libProtocolBuffers.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libProtocolBuffers.a; sourceTree = BUILT_PRODUCTS_DIR; };
-		7461B69B0F94FDF800A0C422 /* GPBCodedInputStreamTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBCodedInputStreamTests.m; sourceTree = "<group>"; };
-		7461B69D0F94FDF800A0C422 /* GPBCodedOuputStreamTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBCodedOuputStreamTests.m; sourceTree = "<group>"; };
-		7461B6A30F94FDF800A0C422 /* GPBMessageTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBMessageTests.m; sourceTree = "<group>"; };
-		7461B6AB0F94FDF800A0C422 /* GPBTestUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPBTestUtilities.h; sourceTree = "<group>"; };
-		7461B6AC0F94FDF800A0C422 /* GPBTestUtilities.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBTestUtilities.m; sourceTree = "<group>"; };
-		7461B6B80F94FDF900A0C422 /* GPBUnknownFieldSetTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBUnknownFieldSetTest.m; sourceTree = "<group>"; };
-		7461B6BA0F94FDF900A0C422 /* GPBUtilitiesTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBUtilitiesTests.m; sourceTree = "<group>"; };
-		7461B6BC0F94FDF900A0C422 /* GPBWireFormatTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBWireFormatTests.m; sourceTree = "<group>"; };
-		8B09AAF614B663A7007B4184 /* unittest_objc.proto */ = {isa = PBXFileReference; lastKnownFileType = text; path = unittest_objc.proto; sourceTree = "<group>"; };
-		8B210CCD159383D60032D72D /* golden_message */ = {isa = PBXFileReference; lastKnownFileType = file; path = golden_message; sourceTree = "<group>"; };
-		8B210CCF159386920032D72D /* golden_packed_fields_message */ = {isa = PBXFileReference; lastKnownFileType = file; path = golden_packed_fields_message; sourceTree = "<group>"; };
-		8B35468421A616F6000BD30D /* unittest_objc_options.proto */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.protobuf; path = unittest_objc_options.proto; sourceTree = "<group>"; };
-		8B4248B91A8C256900BC1EC6 /* UnitTests-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "UnitTests-Bridging-Header.h"; sourceTree = "<group>"; };
-		8B4248BA1A8C256A00BC1EC6 /* GPBSwiftTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GPBSwiftTests.swift; sourceTree = "<group>"; };
-		8B4248CF1A927E1500BC1EC6 /* GPBWellKnownTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPBWellKnownTypes.h; sourceTree = "<group>"; };
-		8B4248D01A927E1500BC1EC6 /* GPBWellKnownTypes.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBWellKnownTypes.m; sourceTree = "<group>"; };
-		8B4248DB1A92933A00BC1EC6 /* GPBWellKnownTypesTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBWellKnownTypesTest.m; sourceTree = "<group>"; };
-		8B42494C1A92A16600BC1EC6 /* duration.proto */ = {isa = PBXFileReference; lastKnownFileType = text; name = duration.proto; path = ../src/google/protobuf/duration.proto; sourceTree = "<group>"; };
-		8B42494D1A92A16600BC1EC6 /* timestamp.proto */ = {isa = PBXFileReference; lastKnownFileType = text; name = timestamp.proto; path = ../src/google/protobuf/timestamp.proto; sourceTree = "<group>"; };
-		8B79657814992E3E002FFBFC /* GPBRootObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPBRootObject.h; sourceTree = "<group>"; };
-		8B79657914992E3E002FFBFC /* GPBRootObject.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBRootObject.m; sourceTree = "<group>"; };
-		8B7E6A7414893DBA00F8884A /* unittest_custom_options.proto */ = {isa = PBXFileReference; lastKnownFileType = text; name = unittest_custom_options.proto; path = ../../src/google/protobuf/unittest_custom_options.proto; sourceTree = "<group>"; };
-		8B7E6A7514893DBA00F8884A /* unittest_embed_optimize_for.proto */ = {isa = PBXFileReference; lastKnownFileType = text; name = unittest_embed_optimize_for.proto; path = ../../src/google/protobuf/unittest_embed_optimize_for.proto; sourceTree = "<group>"; };
-		8B7E6A7614893DBA00F8884A /* unittest_empty.proto */ = {isa = PBXFileReference; lastKnownFileType = text; name = unittest_empty.proto; path = ../../src/google/protobuf/unittest_empty.proto; sourceTree = "<group>"; };
-		8B7E6A7814893DBB00F8884A /* unittest_import.proto */ = {isa = PBXFileReference; lastKnownFileType = text; name = unittest_import.proto; path = ../../src/google/protobuf/unittest_import.proto; sourceTree = "<group>"; };
-		8B7E6A7B14893DBC00F8884A /* unittest_mset.proto */ = {isa = PBXFileReference; lastKnownFileType = text; name = unittest_mset.proto; path = ../../src/google/protobuf/unittest_mset.proto; sourceTree = "<group>"; };
-		8B7E6A7C14893DBC00F8884A /* unittest_no_generic_services.proto */ = {isa = PBXFileReference; lastKnownFileType = text; name = unittest_no_generic_services.proto; path = ../../src/google/protobuf/unittest_no_generic_services.proto; sourceTree = "<group>"; };
-		8B7E6A7D14893DBC00F8884A /* unittest_optimize_for.proto */ = {isa = PBXFileReference; lastKnownFileType = text; name = unittest_optimize_for.proto; path = ../../src/google/protobuf/unittest_optimize_for.proto; sourceTree = "<group>"; };
-		8B7E6A7E14893DBC00F8884A /* unittest.proto */ = {isa = PBXFileReference; lastKnownFileType = text; name = unittest.proto; path = ../../src/google/protobuf/unittest.proto; sourceTree = "<group>"; };
-		8B8B615C17DF7056002EE618 /* GPBARCUnittestProtos.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBARCUnittestProtos.m; sourceTree = "<group>"; };
-		8B96157214C8B06000A2AC0B /* GPBDescriptor.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GPBDescriptor.h; sourceTree = "<group>"; };
-		8B96157314C8C38C00A2AC0B /* GPBDescriptor.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBDescriptor.m; sourceTree = "<group>"; };
-		8BBD9DB016DD1DC8008E1EC1 /* unittest_lite.proto */ = {isa = PBXFileReference; lastKnownFileType = text; name = unittest_lite.proto; path = ../../src/google/protobuf/unittest_lite.proto; sourceTree = "<group>"; };
-		8BBEA4A6147C727100C4ADB7 /* UnitTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = UnitTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
-		8BCF338814ED799900BC5317 /* GPBProtocolBuffers.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = GPBProtocolBuffers.m; sourceTree = "<group>"; };
-		8BD3981D14BE54220081D629 /* unittest_enormous_descriptor.proto */ = {isa = PBXFileReference; lastKnownFileType = text; name = unittest_enormous_descriptor.proto; path = ../../src/google/protobuf/unittest_enormous_descriptor.proto; sourceTree = "<group>"; };
-		8BD3981E14BE59D70081D629 /* GPBUnittestProtos.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBUnittestProtos.m; sourceTree = "<group>"; };
-		8BEB5AE01498033E0078BF9D /* GPBRuntimeTypes.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GPBRuntimeTypes.h; sourceTree = "<group>"; };
-		8BFF9D1923AD582200E63E32 /* GPBMessageTests+ClassNames.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "GPBMessageTests+ClassNames.m"; sourceTree = "<group>"; };
-		F401DC2A1A8D444600FCC765 /* GPBArray.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPBArray.h; sourceTree = "<group>"; };
-		F401DC2B1A8D444600FCC765 /* GPBArray.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBArray.m; sourceTree = "<group>"; };
-		F401DC321A8E5C0200FCC765 /* GPBArrayTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBArrayTests.m; sourceTree = "<group>"; };
-		F40EE47D206BF8AD0071091A /* GPBCompileTest08.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBCompileTest08.m; sourceTree = "<group>"; };
-		F40EE47E206BF8AE0071091A /* GPBCompileTest04.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBCompileTest04.m; sourceTree = "<group>"; };
-		F40EE47F206BF8AE0071091A /* GPBCompileTest05.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBCompileTest05.m; sourceTree = "<group>"; };
-		F40EE480206BF8AE0071091A /* GPBCompileTest07.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBCompileTest07.m; sourceTree = "<group>"; };
-		F40EE481206BF8AE0071091A /* GPBCompileTest02.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBCompileTest02.m; sourceTree = "<group>"; };
-		F40EE482206BF8AF0071091A /* GPBCompileTest19.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBCompileTest19.m; sourceTree = "<group>"; };
-		F40EE483206BF8AF0071091A /* GPBCompileTest13.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBCompileTest13.m; sourceTree = "<group>"; };
-		F40EE484206BF8AF0071091A /* GPBCompileTest09.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBCompileTest09.m; sourceTree = "<group>"; };
-		F40EE485206BF8AF0071091A /* GPBCompileTest20.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBCompileTest20.m; sourceTree = "<group>"; };
-		F40EE486206BF8AF0071091A /* GPBCompileTest21.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBCompileTest21.m; sourceTree = "<group>"; };
-		F40EE487206BF8B00071091A /* GPBCompileTest23.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBCompileTest23.m; sourceTree = "<group>"; };
-		F40EE488206BF8B00071091A /* GPBCompileTest01.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBCompileTest01.m; sourceTree = "<group>"; };
-		F40EE489206BF8B00071091A /* GPBCompileTest15.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBCompileTest15.m; sourceTree = "<group>"; };
-		F40EE48A206BF8B00071091A /* GPBCompileTest22.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBCompileTest22.m; sourceTree = "<group>"; };
-		F40EE48B206BF8B00071091A /* GPBCompileTest16.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBCompileTest16.m; sourceTree = "<group>"; };
-		F40EE48C206BF8B00071091A /* GPBCompileTest10.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBCompileTest10.m; sourceTree = "<group>"; };
-		F40EE48D206BF8B00071091A /* GPBCompileTest17.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBCompileTest17.m; sourceTree = "<group>"; };
-		F40EE48E206BF8B10071091A /* GPBCompileTest18.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBCompileTest18.m; sourceTree = "<group>"; };
-		F40EE48F206BF8B10071091A /* GPBCompileTest14.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBCompileTest14.m; sourceTree = "<group>"; };
-		F40EE490206BF8B10071091A /* GPBCompileTest12.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBCompileTest12.m; sourceTree = "<group>"; };
-		F40EE491206BF8B10071091A /* GPBCompileTest03.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBCompileTest03.m; sourceTree = "<group>"; };
-		F40EE492206BF8B10071091A /* GPBCompileTest06.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBCompileTest06.m; sourceTree = "<group>"; };
-		F40EE493206BF8B20071091A /* GPBCompileTest11.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBCompileTest11.m; sourceTree = "<group>"; };
-		F40EE507206C06440071091A /* GPBCompileTest25.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBCompileTest25.m; sourceTree = "<group>"; };
-		F40EE508206C06440071091A /* GPBCompileTest24.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBCompileTest24.m; sourceTree = "<group>"; };
-		F41C175C1833D3310064ED4D /* GPBPerfTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBPerfTests.m; sourceTree = "<group>"; };
-		F4353D1C1AB8822D005A6198 /* GPBDescriptorTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBDescriptorTests.m; sourceTree = "<group>"; };
-		F4353D201ABB1537005A6198 /* GPBDictionary.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPBDictionary.h; sourceTree = "<group>"; };
-		F4353D211ABB1537005A6198 /* GPBDictionary.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBDictionary.m; sourceTree = "<group>"; };
-		F4353D2C1AC06F10005A6198 /* GPBDictionaryTests.pddm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = GPBDictionaryTests.pddm; sourceTree = "<group>"; };
-		F4353D2D1AC06F10005A6198 /* GPBDictionaryTests+Bool.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "GPBDictionaryTests+Bool.m"; sourceTree = "<group>"; };
-		F4353D2E1AC06F10005A6198 /* GPBDictionaryTests+Int32.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "GPBDictionaryTests+Int32.m"; sourceTree = "<group>"; };
-		F4353D2F1AC06F10005A6198 /* GPBDictionaryTests+Int64.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "GPBDictionaryTests+Int64.m"; sourceTree = "<group>"; };
-		F4353D301AC06F10005A6198 /* GPBDictionaryTests+String.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "GPBDictionaryTests+String.m"; sourceTree = "<group>"; };
-		F4353D311AC06F10005A6198 /* GPBDictionaryTests+UInt32.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "GPBDictionaryTests+UInt32.m"; sourceTree = "<group>"; };
-		F4353D321AC06F10005A6198 /* GPBDictionaryTests+UInt64.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "GPBDictionaryTests+UInt64.m"; sourceTree = "<group>"; };
-		F43725911AC9832D004DCAFB /* GPBDictionary_PackagePrivate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GPBDictionary_PackagePrivate.h; sourceTree = "<group>"; };
-		F43C88CF191D77FC009E917D /* text_format_unittest_data.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = text_format_unittest_data.txt; sourceTree = "<group>"; };
-		F4411BE71AF12FD700324B4A /* GPBArray_PackagePrivate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GPBArray_PackagePrivate.h; sourceTree = "<group>"; };
-		F4487C511A9F8E0200531423 /* libTestSingleSourceBuild.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libTestSingleSourceBuild.a; sourceTree = BUILT_PRODUCTS_DIR; };
-		F4487C741AADF7F500531423 /* GPBMessageTests+Runtime.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "GPBMessageTests+Runtime.m"; sourceTree = "<group>"; };
-		F4487C781AADFB3100531423 /* unittest_runtime_proto2.proto */ = {isa = PBXFileReference; lastKnownFileType = text; path = unittest_runtime_proto2.proto; sourceTree = "<group>"; };
-		F4487C791AADFB3200531423 /* unittest_runtime_proto3.proto */ = {isa = PBXFileReference; lastKnownFileType = text; path = unittest_runtime_proto3.proto; sourceTree = "<group>"; };
-		F4487C7C1AAE06AC00531423 /* GPBUtilities_PackagePrivate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GPBUtilities_PackagePrivate.h; sourceTree = "<group>"; };
-		F4487C7E1AAF62CD00531423 /* GPBMessageTests+Serialization.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "GPBMessageTests+Serialization.m"; sourceTree = "<group>"; };
-		F4487C821AAF6AB300531423 /* GPBMessageTests+Merge.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "GPBMessageTests+Merge.m"; sourceTree = "<group>"; };
-		F44929001C866B1900C2548A /* GPBCodedOutputStream_PackagePrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPBCodedOutputStream_PackagePrivate.h; sourceTree = "<group>"; };
-		F451D3F51A8AAE8700B8A22C /* GPBProtocolBuffers_RuntimeSupport.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GPBProtocolBuffers_RuntimeSupport.h; sourceTree = "<group>"; };
-		F4584D7E1ECCB38900803AB6 /* GPBExtensionRegistryTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBExtensionRegistryTest.m; sourceTree = "<group>"; };
-		F45C69CB16DFD08D0081955B /* GPBExtensionInternals.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBExtensionInternals.m; sourceTree = "<group>"; };
-		F45E57C61AE6DC6A000B7D99 /* text_format_map_unittest_data.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = text_format_map_unittest_data.txt; sourceTree = "<group>"; };
-		F47CF91F23D9005F00C7B24C /* GPBStruct.pbobjc.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBStruct.pbobjc.m; sourceTree = "<group>"; };
-		F47CF92023D9006000C7B24C /* GPBSourceContext.pbobjc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPBSourceContext.pbobjc.h; sourceTree = "<group>"; };
-		F47CF92123D9006000C7B24C /* GPBStruct.pbobjc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPBStruct.pbobjc.h; sourceTree = "<group>"; };
-		F47CF92223D9006000C7B24C /* GPBFieldMask.pbobjc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPBFieldMask.pbobjc.h; sourceTree = "<group>"; };
-		F47CF92323D9006000C7B24C /* GPBSourceContext.pbobjc.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBSourceContext.pbobjc.m; sourceTree = "<group>"; };
-		F47CF92423D9006000C7B24C /* GPBTimestamp.pbobjc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPBTimestamp.pbobjc.h; sourceTree = "<group>"; };
-		F47CF92523D9006000C7B24C /* GPBType.pbobjc.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBType.pbobjc.m; sourceTree = "<group>"; };
-		F47CF92623D9006000C7B24C /* GPBWrappers.pbobjc.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBWrappers.pbobjc.m; sourceTree = "<group>"; };
-		F47CF92723D9006000C7B24C /* GPBWrappers.pbobjc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPBWrappers.pbobjc.h; sourceTree = "<group>"; };
-		F47CF92823D9006000C7B24C /* GPBFieldMask.pbobjc.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBFieldMask.pbobjc.m; sourceTree = "<group>"; };
-		F47CF92923D9006000C7B24C /* GPBTimestamp.pbobjc.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBTimestamp.pbobjc.m; sourceTree = "<group>"; };
-		F47CF92A23D9006000C7B24C /* GPBType.pbobjc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPBType.pbobjc.h; sourceTree = "<group>"; };
-		F47CF93723D902D500C7B24C /* GPBAny.pbobjc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPBAny.pbobjc.h; sourceTree = "<group>"; };
-		F47CF93823D902D500C7B24C /* GPBEmpty.pbobjc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPBEmpty.pbobjc.h; sourceTree = "<group>"; };
-		F47CF93923D902D500C7B24C /* GPBEmpty.pbobjc.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBEmpty.pbobjc.m; sourceTree = "<group>"; };
-		F47CF93A23D902D500C7B24C /* GPBApi.pbobjc.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBApi.pbobjc.m; sourceTree = "<group>"; };
-		F47CF93B23D902D500C7B24C /* GPBAny.pbobjc.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBAny.pbobjc.m; sourceTree = "<group>"; };
-		F47CF93C23D902D500C7B24C /* GPBDuration.pbobjc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPBDuration.pbobjc.h; sourceTree = "<group>"; };
-		F47CF93D23D902D500C7B24C /* GPBApi.pbobjc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPBApi.pbobjc.h; sourceTree = "<group>"; };
-		F47CF93E23D902D500C7B24C /* GPBDuration.pbobjc.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBDuration.pbobjc.m; sourceTree = "<group>"; };
-		F4AC9E1D1A8BEB3500BD6E83 /* unittest_cycle.proto */ = {isa = PBXFileReference; lastKnownFileType = text; path = unittest_cycle.proto; sourceTree = "<group>"; };
-		F4B51B1D1BBC610700744318 /* GPBObjectiveCPlusPlusTest.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GPBObjectiveCPlusPlusTest.mm; sourceTree = "<group>"; };
-		F4B6B8AF1A9CC98000892426 /* GPBUnknownField_PackagePrivate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GPBUnknownField_PackagePrivate.h; sourceTree = "<group>"; };
-		F4B6B8B21A9CCBDA00892426 /* GPBUnknownFieldSet_PackagePrivate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GPBUnknownFieldSet_PackagePrivate.h; sourceTree = "<group>"; };
-		F4B6B8B61A9CD1DE00892426 /* GPBExtensionInternals.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GPBExtensionInternals.h; sourceTree = "<group>"; };
-		F4B6B8B81A9CD1DE00892426 /* GPBRootObject_PackagePrivate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GPBRootObject_PackagePrivate.h; sourceTree = "<group>"; };
-		F4C4B9E21E1D974F00D3B61D /* GPBDictionaryTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBDictionaryTests.m; sourceTree = "<group>"; };
-		F4CF31701B162ED800BD9B06 /* unittest_objc_startup.proto */ = {isa = PBXFileReference; lastKnownFileType = text; path = unittest_objc_startup.proto; sourceTree = "<group>"; };
-		F4E675A61B21D05C0054530B /* any.proto */ = {isa = PBXFileReference; lastKnownFileType = text; name = any.proto; path = ../src/google/protobuf/any.proto; sourceTree = "<group>"; };
-		F4E675A71B21D05C0054530B /* api.proto */ = {isa = PBXFileReference; lastKnownFileType = text; name = api.proto; path = ../src/google/protobuf/api.proto; sourceTree = "<group>"; };
-		F4E675A81B21D05C0054530B /* empty.proto */ = {isa = PBXFileReference; lastKnownFileType = text; name = empty.proto; path = ../src/google/protobuf/empty.proto; sourceTree = "<group>"; };
-		F4E675A91B21D05C0054530B /* field_mask.proto */ = {isa = PBXFileReference; lastKnownFileType = text; name = field_mask.proto; path = ../src/google/protobuf/field_mask.proto; sourceTree = "<group>"; };
-		F4E675AA1B21D05C0054530B /* source_context.proto */ = {isa = PBXFileReference; lastKnownFileType = text; name = source_context.proto; path = ../src/google/protobuf/source_context.proto; sourceTree = "<group>"; };
-		F4E675AB1B21D05C0054530B /* struct.proto */ = {isa = PBXFileReference; lastKnownFileType = text; name = struct.proto; path = ../src/google/protobuf/struct.proto; sourceTree = "<group>"; };
-		F4E675AC1B21D05C0054530B /* type.proto */ = {isa = PBXFileReference; lastKnownFileType = text; name = type.proto; path = ../src/google/protobuf/type.proto; sourceTree = "<group>"; };
-		F4E675AD1B21D05C0054530B /* wrappers.proto */ = {isa = PBXFileReference; lastKnownFileType = text; name = wrappers.proto; path = ../src/google/protobuf/wrappers.proto; sourceTree = "<group>"; };
-		F4F53F89219CC4F2001EABF4 /* text_format_extensions_unittest_data.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = text_format_extensions_unittest_data.txt; sourceTree = "<group>"; };
-		F4F8D8811D789FCE002CE128 /* GPBUnittestProtos2.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBUnittestProtos2.m; sourceTree = "<group>"; };
-/* End PBXFileReference section */
-
-/* Begin PBXFrameworksBuildPhase section */
-		7461B52C0F94FAF800A0C422 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				7461B5360F94FB4600A0C422 /* Foundation.framework in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		8BBEA4A3147C727100C4ADB7 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				8BBEA4BB147C729200C4ADB7 /* libProtocolBuffers.a in Frameworks */,
-				8BF8193514A0DDA600A2C982 /* Foundation.framework in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		F4487C4C1A9F8E0200531423 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				F4487C4D1A9F8E0200531423 /* Foundation.framework in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXFrameworksBuildPhase section */
-
-/* Begin PBXGroup section */
-		080E96DDFE201D6D7F000001 /* Core Source */ = {
-			isa = PBXGroup;
-			children = (
-				7461B4CD0F94F99000A0C422 /* GPBProtocolBuffers.h */,
-				F451D3F51A8AAE8700B8A22C /* GPBProtocolBuffers_RuntimeSupport.h */,
-				8BCF338814ED799900BC5317 /* GPBProtocolBuffers.m */,
-				7461B3C50F94F84100A0C422 /* Extensions */,
-				7461B4850F94F96600A0C422 /* Fields */,
-				7461B4860F94F96B00A0C422 /* IO */,
-				7461B5150F94FA7300A0C422 /* Messages */,
-				8BCF334414ED727300BC5317 /* Support */,
-				29B97315FDCFA39411CA2CEA /* Generated */,
-			);
-			name = "Core Source";
-			sourceTree = "<group>";
-		};
-		19C28FACFE9D520D11CA2CBB /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				7461B52E0F94FAF800A0C422 /* libProtocolBuffers.a */,
-				8BBEA4A6147C727100C4ADB7 /* UnitTests.xctest */,
-				F4487C511A9F8E0200531423 /* libTestSingleSourceBuild.a */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
-		29B97314FDCFA39411CA2CEA /* CustomTemplate */ = {
-			isa = PBXGroup;
-			children = (
-				080E96DDFE201D6D7F000001 /* Core Source */,
-				7461B6940F94FDDD00A0C422 /* Tests */,
-				29B97323FDCFA39411CA2CEA /* Frameworks */,
-				19C28FACFE9D520D11CA2CBB /* Products */,
-			);
-			name = CustomTemplate;
-			sourceTree = "<group>";
-		};
-		29B97315FDCFA39411CA2CEA /* Generated */ = {
-			isa = PBXGroup;
-			children = (
-				F47CF93723D902D500C7B24C /* GPBAny.pbobjc.h */,
-				F47CF93B23D902D500C7B24C /* GPBAny.pbobjc.m */,
-				F47CF93D23D902D500C7B24C /* GPBApi.pbobjc.h */,
-				F47CF93A23D902D500C7B24C /* GPBApi.pbobjc.m */,
-				F47CF93C23D902D500C7B24C /* GPBDuration.pbobjc.h */,
-				F47CF93E23D902D500C7B24C /* GPBDuration.pbobjc.m */,
-				F47CF93823D902D500C7B24C /* GPBEmpty.pbobjc.h */,
-				F47CF93923D902D500C7B24C /* GPBEmpty.pbobjc.m */,
-				F47CF92223D9006000C7B24C /* GPBFieldMask.pbobjc.h */,
-				F47CF92823D9006000C7B24C /* GPBFieldMask.pbobjc.m */,
-				F47CF92023D9006000C7B24C /* GPBSourceContext.pbobjc.h */,
-				F47CF92323D9006000C7B24C /* GPBSourceContext.pbobjc.m */,
-				F47CF92123D9006000C7B24C /* GPBStruct.pbobjc.h */,
-				F47CF91F23D9005F00C7B24C /* GPBStruct.pbobjc.m */,
-				F47CF92423D9006000C7B24C /* GPBTimestamp.pbobjc.h */,
-				F47CF92923D9006000C7B24C /* GPBTimestamp.pbobjc.m */,
-				F47CF92A23D9006000C7B24C /* GPBType.pbobjc.h */,
-				F47CF92523D9006000C7B24C /* GPBType.pbobjc.m */,
-				F47CF92723D9006000C7B24C /* GPBWrappers.pbobjc.h */,
-				F47CF92623D9006000C7B24C /* GPBWrappers.pbobjc.m */,
-				F4E675A61B21D05C0054530B /* any.proto */,
-				F4E675A71B21D05C0054530B /* api.proto */,
-				8B42494C1A92A16600BC1EC6 /* duration.proto */,
-				F4E675A81B21D05C0054530B /* empty.proto */,
-				F4E675A91B21D05C0054530B /* field_mask.proto */,
-				F4E675AA1B21D05C0054530B /* source_context.proto */,
-				F4E675AB1B21D05C0054530B /* struct.proto */,
-				8B42494D1A92A16600BC1EC6 /* timestamp.proto */,
-				F4E675AC1B21D05C0054530B /* type.proto */,
-				F4E675AD1B21D05C0054530B /* wrappers.proto */,
-			);
-			name = Generated;
-			sourceTree = "<group>";
-		};
-		29B97323FDCFA39411CA2CEA /* Frameworks */ = {
-			isa = PBXGroup;
-			children = (
-				1D30AB110D05D00D00671497 /* Foundation.framework */,
-			);
-			name = Frameworks;
-			sourceTree = "<group>";
-		};
-		7461B3C50F94F84100A0C422 /* Extensions */ = {
-			isa = PBXGroup;
-			children = (
-				F4B6B8B61A9CD1DE00892426 /* GPBExtensionInternals.h */,
-				F45C69CB16DFD08D0081955B /* GPBExtensionInternals.m */,
-				7461B4A80F94F99000A0C422 /* GPBExtensionRegistry.h */,
-				7461B4A90F94F99000A0C422 /* GPBExtensionRegistry.m */,
-				F4B6B8B81A9CD1DE00892426 /* GPBRootObject_PackagePrivate.h */,
-				8B79657814992E3E002FFBFC /* GPBRootObject.h */,
-				8B79657914992E3E002FFBFC /* GPBRootObject.m */,
-			);
-			name = Extensions;
-			sourceTree = "<group>";
-		};
-		7461B4850F94F96600A0C422 /* Fields */ = {
-			isa = PBXGroup;
-			children = (
-				F4B6B8AF1A9CC98000892426 /* GPBUnknownField_PackagePrivate.h */,
-				7461B4AE0F94F99000A0C422 /* GPBUnknownField.h */,
-				7461B4AF0F94F99000A0C422 /* GPBUnknownField.m */,
-				F4B6B8B21A9CCBDA00892426 /* GPBUnknownFieldSet_PackagePrivate.h */,
-				7461B4E10F94F99000A0C422 /* GPBUnknownFieldSet.h */,
-				7461B4E20F94F99000A0C422 /* GPBUnknownFieldSet.m */,
-			);
-			name = Fields;
-			sourceTree = "<group>";
-		};
-		7461B4860F94F96B00A0C422 /* IO */ = {
-			isa = PBXGroup;
-			children = (
-				51457B5F18D0B7AF00CCC606 /* GPBCodedInputStream_PackagePrivate.h */,
-				7461B48E0F94F99000A0C422 /* GPBCodedInputStream.h */,
-				7461B48F0F94F99000A0C422 /* GPBCodedInputStream.m */,
-				F44929001C866B1900C2548A /* GPBCodedOutputStream_PackagePrivate.h */,
-				7461B4900F94F99000A0C422 /* GPBCodedOutputStream.h */,
-				7461B4910F94F99000A0C422 /* GPBCodedOutputStream.m */,
-				7461B4E70F94F99000A0C422 /* GPBWireFormat.h */,
-				7461B4E80F94F99000A0C422 /* GPBWireFormat.m */,
-			);
-			name = IO;
-			sourceTree = "<group>";
-		};
-		7461B5150F94FA7300A0C422 /* Messages */ = {
-			isa = PBXGroup;
-			children = (
-				515B840C18B7DEE30031753B /* GPBDescriptor_PackagePrivate.h */,
-				8B96157214C8B06000A2AC0B /* GPBDescriptor.h */,
-				8B96157314C8C38C00A2AC0B /* GPBDescriptor.m */,
-				7461B4BE0F94F99000A0C422 /* GPBMessage.h */,
-				5196A06918CE16B000B759E2 /* GPBMessage_PackagePrivate.h */,
-				7461B4BF0F94F99000A0C422 /* GPBMessage.m */,
-			);
-			name = Messages;
-			sourceTree = "<group>";
-		};
-		7461B6940F94FDDD00A0C422 /* Tests */ = {
-			isa = PBXGroup;
-			children = (
-				8B210CCD159383D60032D72D /* golden_message */,
-				8B210CCF159386920032D72D /* golden_packed_fields_message */,
-				8B8B615C17DF7056002EE618 /* GPBARCUnittestProtos.m */,
-				F401DC321A8E5C0200FCC765 /* GPBArrayTests.m */,
-				7461B69B0F94FDF800A0C422 /* GPBCodedInputStreamTests.m */,
-				7461B69D0F94FDF800A0C422 /* GPBCodedOuputStreamTests.m */,
-				F40EE488206BF8B00071091A /* GPBCompileTest01.m */,
-				F40EE481206BF8AE0071091A /* GPBCompileTest02.m */,
-				F40EE491206BF8B10071091A /* GPBCompileTest03.m */,
-				F40EE47E206BF8AE0071091A /* GPBCompileTest04.m */,
-				F40EE47F206BF8AE0071091A /* GPBCompileTest05.m */,
-				F40EE492206BF8B10071091A /* GPBCompileTest06.m */,
-				F40EE480206BF8AE0071091A /* GPBCompileTest07.m */,
-				F40EE47D206BF8AD0071091A /* GPBCompileTest08.m */,
-				F40EE484206BF8AF0071091A /* GPBCompileTest09.m */,
-				F40EE48C206BF8B00071091A /* GPBCompileTest10.m */,
-				F40EE493206BF8B20071091A /* GPBCompileTest11.m */,
-				F40EE490206BF8B10071091A /* GPBCompileTest12.m */,
-				F40EE483206BF8AF0071091A /* GPBCompileTest13.m */,
-				F40EE48F206BF8B10071091A /* GPBCompileTest14.m */,
-				F40EE489206BF8B00071091A /* GPBCompileTest15.m */,
-				F40EE48B206BF8B00071091A /* GPBCompileTest16.m */,
-				F40EE48D206BF8B00071091A /* GPBCompileTest17.m */,
-				F40EE48E206BF8B10071091A /* GPBCompileTest18.m */,
-				F40EE482206BF8AF0071091A /* GPBCompileTest19.m */,
-				F40EE485206BF8AF0071091A /* GPBCompileTest20.m */,
-				F40EE486206BF8AF0071091A /* GPBCompileTest21.m */,
-				F40EE48A206BF8B00071091A /* GPBCompileTest22.m */,
-				F40EE487206BF8B00071091A /* GPBCompileTest23.m */,
-				F40EE508206C06440071091A /* GPBCompileTest24.m */,
-				F40EE507206C06440071091A /* GPBCompileTest25.m */,
-				5102DABB1891A052002037B6 /* GPBConcurrencyTests.m */,
-				F4353D1C1AB8822D005A6198 /* GPBDescriptorTests.m */,
-				F4C4B9E21E1D974F00D3B61D /* GPBDictionaryTests.m */,
-				F4353D2C1AC06F10005A6198 /* GPBDictionaryTests.pddm */,
-				F4353D2D1AC06F10005A6198 /* GPBDictionaryTests+Bool.m */,
-				F4353D2E1AC06F10005A6198 /* GPBDictionaryTests+Int32.m */,
-				F4353D2F1AC06F10005A6198 /* GPBDictionaryTests+Int64.m */,
-				F4353D301AC06F10005A6198 /* GPBDictionaryTests+String.m */,
-				F4353D311AC06F10005A6198 /* GPBDictionaryTests+UInt32.m */,
-				F4353D321AC06F10005A6198 /* GPBDictionaryTests+UInt64.m */,
-				F4584D7E1ECCB38900803AB6 /* GPBExtensionRegistryTest.m */,
-				7461B6A30F94FDF800A0C422 /* GPBMessageTests.m */,
-				F4487C821AAF6AB300531423 /* GPBMessageTests+Merge.m */,
-				F4487C741AADF7F500531423 /* GPBMessageTests+Runtime.m */,
-				8BFF9D1923AD582200E63E32 /* GPBMessageTests+ClassNames.m */,
-				F4487C7E1AAF62CD00531423 /* GPBMessageTests+Serialization.m */,
-				F4B51B1D1BBC610700744318 /* GPBObjectiveCPlusPlusTest.mm */,
-				F41C175C1833D3310064ED4D /* GPBPerfTests.m */,
-				8B4248BA1A8C256A00BC1EC6 /* GPBSwiftTests.swift */,
-				7461B6AB0F94FDF800A0C422 /* GPBTestUtilities.h */,
-				7461B6AC0F94FDF800A0C422 /* GPBTestUtilities.m */,
-				8BD3981E14BE59D70081D629 /* GPBUnittestProtos.m */,
-				F4F8D8811D789FCE002CE128 /* GPBUnittestProtos2.m */,
-				7461B6B80F94FDF900A0C422 /* GPBUnknownFieldSetTest.m */,
-				7461B6BA0F94FDF900A0C422 /* GPBUtilitiesTests.m */,
-				8B4248DB1A92933A00BC1EC6 /* GPBWellKnownTypesTest.m */,
-				7461B6BC0F94FDF900A0C422 /* GPBWireFormatTests.m */,
-				F4F53F89219CC4F2001EABF4 /* text_format_extensions_unittest_data.txt */,
-				F45E57C61AE6DC6A000B7D99 /* text_format_map_unittest_data.txt */,
-				F43C88CF191D77FC009E917D /* text_format_unittest_data.txt */,
-				8B7E6A7414893DBA00F8884A /* unittest_custom_options.proto */,
-				F4AC9E1D1A8BEB3500BD6E83 /* unittest_cycle.proto */,
-				8B7E6A7514893DBA00F8884A /* unittest_embed_optimize_for.proto */,
-				8B7E6A7614893DBA00F8884A /* unittest_empty.proto */,
-				8BD3981D14BE54220081D629 /* unittest_enormous_descriptor.proto */,
-				8B7E6A7814893DBB00F8884A /* unittest_import.proto */,
-				8BBD9DB016DD1DC8008E1EC1 /* unittest_lite.proto */,
-				8B7E6A7B14893DBC00F8884A /* unittest_mset.proto */,
-				8B7E6A7C14893DBC00F8884A /* unittest_no_generic_services.proto */,
-				8B35468421A616F6000BD30D /* unittest_objc_options.proto */,
-				F4CF31701B162ED800BD9B06 /* unittest_objc_startup.proto */,
-				8B09AAF614B663A7007B4184 /* unittest_objc.proto */,
-				8B7E6A7D14893DBC00F8884A /* unittest_optimize_for.proto */,
-				F4487C781AADFB3100531423 /* unittest_runtime_proto2.proto */,
-				F4487C791AADFB3200531423 /* unittest_runtime_proto3.proto */,
-				8B7E6A7E14893DBC00F8884A /* unittest.proto */,
-				8B4248B91A8C256900BC1EC6 /* UnitTests-Bridging-Header.h */,
-				7401C1A90F950347006D8281 /* UnitTests-Info.plist */,
-			);
-			path = Tests;
-			sourceTree = "<group>";
-		};
-		8BCF334414ED727300BC5317 /* Support */ = {
-			isa = PBXGroup;
-			children = (
-				F4411BE71AF12FD700324B4A /* GPBArray_PackagePrivate.h */,
-				F401DC2A1A8D444600FCC765 /* GPBArray.h */,
-				F401DC2B1A8D444600FCC765 /* GPBArray.m */,
-				7461B48D0F94F99000A0C422 /* GPBBootstrap.h */,
-				F43725911AC9832D004DCAFB /* GPBDictionary_PackagePrivate.h */,
-				F4353D201ABB1537005A6198 /* GPBDictionary.h */,
-				F4353D211ABB1537005A6198 /* GPBDictionary.m */,
-				8BEB5AE01498033E0078BF9D /* GPBRuntimeTypes.h */,
-				F4487C7C1AAE06AC00531423 /* GPBUtilities_PackagePrivate.h */,
-				7461B4E50F94F99000A0C422 /* GPBUtilities.h */,
-				7461B4E60F94F99000A0C422 /* GPBUtilities.m */,
-				8B4248CF1A927E1500BC1EC6 /* GPBWellKnownTypes.h */,
-				8B4248D01A927E1500BC1EC6 /* GPBWellKnownTypes.m */,
-			);
-			name = Support;
-			sourceTree = "<group>";
-		};
-/* End PBXGroup section */
-
-/* Begin PBXHeadersBuildPhase section */
-		7461B52A0F94FAF800A0C422 /* Headers */ = {
-			isa = PBXHeadersBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		F4487C391A9F8E0200531423 /* Headers */ = {
-			isa = PBXHeadersBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXHeadersBuildPhase section */
-
-/* Begin PBXLegacyTarget section */
-		F45BBC141B0CE3C6002D064D /* Compile Unittest Protos */ = {
-			isa = PBXLegacyTarget;
-			buildArgumentsString = "$(ACTION)";
-			buildConfigurationList = F45BBC171B0CE3C6002D064D /* Build configuration list for PBXLegacyTarget "Compile Unittest Protos" */;
-			buildPhases = (
-			);
-			buildToolPath = DevTools/compile_testing_protos.sh;
-			dependencies = (
-			);
-			name = "Compile Unittest Protos";
-			passBuildSettingsInEnvironment = 1;
-			productName = "Compile Unittest Protos";
-		};
-/* End PBXLegacyTarget section */
-
-/* Begin PBXNativeTarget section */
-		7461B52D0F94FAF800A0C422 /* ProtocolBuffers */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 7461B5330F94FAFD00A0C422 /* Build configuration list for PBXNativeTarget "ProtocolBuffers" */;
-			buildPhases = (
-				7461B52A0F94FAF800A0C422 /* Headers */,
-				7461B52B0F94FAF800A0C422 /* Sources */,
-				7461B52C0F94FAF800A0C422 /* Frameworks */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = ProtocolBuffers;
-			productName = "ProtocolBuffers-iPhoneDevice";
-			productReference = 7461B52E0F94FAF800A0C422 /* libProtocolBuffers.a */;
-			productType = "com.apple.product-type.library.static";
-		};
-		8BBEA4A5147C727100C4ADB7 /* UnitTests */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 8BBEA4BA147C728600C4ADB7 /* Build configuration list for PBXNativeTarget "UnitTests" */;
-			buildPhases = (
-				F4B62A781AF91F6000AFCEDC /* Script: Check Runtime Stamps */,
-				8BBEA4A1147C727100C4ADB7 /* Resources */,
-				8BBEA4A2147C727100C4ADB7 /* Sources */,
-				8BBEA4A3147C727100C4ADB7 /* Frameworks */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-				8BBEA4BD147C729A00C4ADB7 /* PBXTargetDependency */,
-				F45BBC191B0CE3D7002D064D /* PBXTargetDependency */,
-			);
-			name = UnitTests;
-			productName = UnitTests;
-			productReference = 8BBEA4A6147C727100C4ADB7 /* UnitTests.xctest */;
-			productType = "com.apple.product-type.bundle.unit-test";
-		};
-		F4487C381A9F8E0200531423 /* TestSingleSourceBuild */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = F4487C4E1A9F8E0200531423 /* Build configuration list for PBXNativeTarget "TestSingleSourceBuild" */;
-			buildPhases = (
-				F4487C391A9F8E0200531423 /* Headers */,
-				F4487C3D1A9F8E0200531423 /* Sources */,
-				F4487C4C1A9F8E0200531423 /* Frameworks */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = TestSingleSourceBuild;
-			productName = "ProtocolBuffers-iPhoneDevice";
-			productReference = F4487C511A9F8E0200531423 /* libTestSingleSourceBuild.a */;
-			productType = "com.apple.product-type.library.static";
-		};
-/* End PBXNativeTarget section */
-
-/* Begin PBXProject section */
-		29B97313FDCFA39411CA2CEA /* Project object */ = {
-			isa = PBXProject;
-			attributes = {
-				LastSwiftUpdateCheck = 0710;
-				LastTestingUpgradeCheck = 0600;
-				LastUpgradeCheck = 0930;
-				TargetAttributes = {
-					8BBEA4A5147C727100C4ADB7 = {
-						LastSwiftMigration = 0940;
-						TestTargetID = 8B9A5EA41831993600A9D33B;
-					};
-					F45BBC141B0CE3C6002D064D = {
-						CreatedOnToolsVersion = 6.3.2;
-					};
-				};
-			};
-			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "ProtocolBuffers_OSX" */;
-			compatibilityVersion = "Xcode 6.3";
-			developmentRegion = English;
-			hasScannedForEncodings = 1;
-			knownRegions = (
-				English,
-				en,
-			);
-			mainGroup = 29B97314FDCFA39411CA2CEA /* CustomTemplate */;
-			projectDirPath = "";
-			projectRoot = "";
-			targets = (
-				7461B52D0F94FAF800A0C422 /* ProtocolBuffers */,
-				8BBEA4A5147C727100C4ADB7 /* UnitTests */,
-				F4487C381A9F8E0200531423 /* TestSingleSourceBuild */,
-				F45BBC141B0CE3C6002D064D /* Compile Unittest Protos */,
-			);
-		};
-/* End PBXProject section */
-
-/* Begin PBXResourcesBuildPhase section */
-		8BBEA4A1147C727100C4ADB7 /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				8B210CCE159383D60032D72D /* golden_message in Resources */,
-				F4F53F8A219CC4F2001EABF4 /* text_format_extensions_unittest_data.txt in Resources */,
-				F43C88D0191D77FC009E917D /* text_format_unittest_data.txt in Resources */,
-				8B210CD0159386920032D72D /* golden_packed_fields_message in Resources */,
-				F45E57C71AE6DC6A000B7D99 /* text_format_map_unittest_data.txt in Resources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXResourcesBuildPhase section */
-
-/* Begin PBXShellScriptBuildPhase section */
-		F4B62A781AF91F6000AFCEDC /* Script: Check Runtime Stamps */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "Script: Check Runtime Stamps";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "set -eu\nexec \"${SOURCE_ROOT}/DevTools/check_version_stamps.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
-/* End PBXShellScriptBuildPhase section */
-
-/* Begin PBXSourcesBuildPhase section */
-		7461B52B0F94FAF800A0C422 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				F47CF93123D9006000C7B24C /* GPBType.pbobjc.m in Sources */,
-				7461B53C0F94FB4E00A0C422 /* GPBCodedInputStream.m in Sources */,
-				F47CF93223D9006000C7B24C /* GPBWrappers.pbobjc.m in Sources */,
-				F47CF94123D902D500C7B24C /* GPBEmpty.pbobjc.m in Sources */,
-				F47CF94623D902D500C7B24C /* GPBDuration.pbobjc.m in Sources */,
-				F47CF92F23D9006000C7B24C /* GPBSourceContext.pbobjc.m in Sources */,
-				7461B53D0F94FB4E00A0C422 /* GPBCodedOutputStream.m in Sources */,
-				F401DC2D1A8D444600FCC765 /* GPBArray.m in Sources */,
-				7461B5490F94FB4E00A0C422 /* GPBExtensionRegistry.m in Sources */,
-				7461B54C0F94FB4E00A0C422 /* GPBUnknownField.m in Sources */,
-				7461B5530F94FB4E00A0C422 /* GPBMessage.m in Sources */,
-				7461B5610F94FB4E00A0C422 /* GPBUnknownFieldSet.m in Sources */,
-				F47CF93423D9006000C7B24C /* GPBFieldMask.pbobjc.m in Sources */,
-				7461B5630F94FB4E00A0C422 /* GPBUtilities.m in Sources */,
-				7461B5640F94FB4E00A0C422 /* GPBWireFormat.m in Sources */,
-				F4353D231ABB1537005A6198 /* GPBDictionary.m in Sources */,
-				8B79657B14992E3F002FFBFC /* GPBRootObject.m in Sources */,
-				F47CF93523D9006000C7B24C /* GPBTimestamp.pbobjc.m in Sources */,
-				8B96157414C8C38C00A2AC0B /* GPBDescriptor.m in Sources */,
-				F45C69CC16DFD08D0081955B /* GPBExtensionInternals.m in Sources */,
-				F47CF92B23D9006000C7B24C /* GPBStruct.pbobjc.m in Sources */,
-				F47CF94323D902D500C7B24C /* GPBAny.pbobjc.m in Sources */,
-				8B4248D21A927E1500BC1EC6 /* GPBWellKnownTypes.m in Sources */,
-				F47CF94223D902D500C7B24C /* GPBApi.pbobjc.m in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		8BBEA4A2147C727100C4ADB7 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				8BBEA4A9147C727D00C4ADB7 /* GPBCodedInputStreamTests.m in Sources */,
-				F40EE50B206C06640071091A /* GPBCompileTest24.m in Sources */,
-				F40EE4BE206BF8B90071091A /* GPBCompileTest20.m in Sources */,
-				F401DC331A8E5C0200FCC765 /* GPBArrayTests.m in Sources */,
-				F40EE4B4206BF8B90071091A /* GPBCompileTest10.m in Sources */,
-				F4353D361AC06F10005A6198 /* GPBDictionaryTests+Int64.m in Sources */,
-				F40EE4C0206BF8B90071091A /* GPBCompileTest22.m in Sources */,
-				F40EE4B2206BF8B90071091A /* GPBCompileTest08.m in Sources */,
-				F40EE4BB206BF8B90071091A /* GPBCompileTest17.m in Sources */,
-				F4353D391AC06F10005A6198 /* GPBDictionaryTests+UInt64.m in Sources */,
-				8BBEA4AA147C727D00C4ADB7 /* GPBCodedOuputStreamTests.m in Sources */,
-				F40EE4C1206BF8B90071091A /* GPBCompileTest23.m in Sources */,
-				8BBEA4AC147C727D00C4ADB7 /* GPBMessageTests.m in Sources */,
-				F4B51B1E1BBC610700744318 /* GPBObjectiveCPlusPlusTest.mm in Sources */,
-				F40EE4BD206BF8B90071091A /* GPBCompileTest19.m in Sources */,
-				F40EE4B0206BF8B90071091A /* GPBCompileTest06.m in Sources */,
-				F40EE4B6206BF8B90071091A /* GPBCompileTest12.m in Sources */,
-				F4487C7F1AAF62CD00531423 /* GPBMessageTests+Serialization.m in Sources */,
-				F40EE4AD206BF8B90071091A /* GPBCompileTest03.m in Sources */,
-				F40EE4BC206BF8B90071091A /* GPBCompileTest18.m in Sources */,
-				F40EE4B7206BF8B90071091A /* GPBCompileTest13.m in Sources */,
-				F40EE4B9206BF8B90071091A /* GPBCompileTest15.m in Sources */,
-				F40EE4B1206BF8B90071091A /* GPBCompileTest07.m in Sources */,
-				8B4248DC1A92933A00BC1EC6 /* GPBWellKnownTypesTest.m in Sources */,
-				F40EE4BF206BF8B90071091A /* GPBCompileTest21.m in Sources */,
-				F40EE4B5206BF8B90071091A /* GPBCompileTest11.m in Sources */,
-				F4F8D8831D789FD9002CE128 /* GPBUnittestProtos2.m in Sources */,
-				F4353D1D1AB8822D005A6198 /* GPBDescriptorTests.m in Sources */,
-				8B4248BB1A8C256A00BC1EC6 /* GPBSwiftTests.swift in Sources */,
-				F40EE50C206C06640071091A /* GPBCompileTest25.m in Sources */,
-				F4584D821ECCB52A00803AB6 /* GPBExtensionRegistryTest.m in Sources */,
-				8BFF9D1A23AD582300E63E32 /* GPBMessageTests+ClassNames.m in Sources */,
-				5102DABC1891A073002037B6 /* GPBConcurrencyTests.m in Sources */,
-				F4487C751AADF7F500531423 /* GPBMessageTests+Runtime.m in Sources */,
-				F40EE4AC206BF8B90071091A /* GPBCompileTest02.m in Sources */,
-				F4353D351AC06F10005A6198 /* GPBDictionaryTests+Int32.m in Sources */,
-				F40EE4AF206BF8B90071091A /* GPBCompileTest05.m in Sources */,
-				F40EE4B8206BF8B90071091A /* GPBCompileTest14.m in Sources */,
-				8BBEA4B0147C727D00C4ADB7 /* GPBTestUtilities.m in Sources */,
-				F40EE4AE206BF8B90071091A /* GPBCompileTest04.m in Sources */,
-				F40EE4BA206BF8B90071091A /* GPBCompileTest16.m in Sources */,
-				F41C175D1833D3310064ED4D /* GPBPerfTests.m in Sources */,
-				F4353D341AC06F10005A6198 /* GPBDictionaryTests+Bool.m in Sources */,
-				F4487C831AAF6AB300531423 /* GPBMessageTests+Merge.m in Sources */,
-				F40EE4AB206BF8B90071091A /* GPBCompileTest01.m in Sources */,
-				8BBEA4B6147C727D00C4ADB7 /* GPBUnknownFieldSetTest.m in Sources */,
-				F4353D371AC06F10005A6198 /* GPBDictionaryTests+String.m in Sources */,
-				F4353D381AC06F10005A6198 /* GPBDictionaryTests+UInt32.m in Sources */,
-				F40EE4B3206BF8B90071091A /* GPBCompileTest09.m in Sources */,
-				8BBEA4B7147C727D00C4ADB7 /* GPBUtilitiesTests.m in Sources */,
-				F4C4B9E41E1D976300D3B61D /* GPBDictionaryTests.m in Sources */,
-				8BBEA4B8147C727D00C4ADB7 /* GPBWireFormatTests.m in Sources */,
-				8BD3981F14BE59D70081D629 /* GPBUnittestProtos.m in Sources */,
-				8B8B615D17DF7056002EE618 /* GPBARCUnittestProtos.m in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		F4487C3D1A9F8E0200531423 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				F4487C521A9F8E4D00531423 /* GPBProtocolBuffers.m in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXSourcesBuildPhase section */
-
-/* Begin PBXTargetDependency section */
-		8BBEA4BD147C729A00C4ADB7 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 7461B52D0F94FAF800A0C422 /* ProtocolBuffers */;
-			targetProxy = 8BBEA4BC147C729A00C4ADB7 /* PBXContainerItemProxy */;
-		};
-		F45BBC191B0CE3D7002D064D /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = F45BBC141B0CE3C6002D064D /* Compile Unittest Protos */;
-			targetProxy = F45BBC181B0CE3D7002D064D /* PBXContainerItemProxy */;
-		};
-/* End PBXTargetDependency section */
-
-/* Begin XCBuildConfiguration section */
-		7461B52F0F94FAFA00A0C422 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				CLANG_ENABLE_OBJC_WEAK = YES;
-				COMBINE_HIDPI_IMAGES = YES;
-				PRODUCT_NAME = ProtocolBuffers;
-				USER_HEADER_SEARCH_PATHS = "$(SRCROOT)";
-			};
-			name = Debug;
-		};
-		7461B5300F94FAFA00A0C422 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				CLANG_ENABLE_OBJC_WEAK = YES;
-				COMBINE_HIDPI_IMAGES = YES;
-				PRODUCT_NAME = ProtocolBuffers;
-				USER_HEADER_SEARCH_PATHS = "$(SRCROOT)";
-			};
-			name = Release;
-		};
-		8BBEA4A7147C727100C4ADB7 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				CLANG_ENABLE_MODULES = YES;
-				CLANG_ENABLE_OBJC_WEAK = YES;
-				COMBINE_HIDPI_IMAGES = YES;
-				INFOPLIST_FILE = "Tests/UnitTests-Info.plist";
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
-				OTHER_LDFLAGS = "-ObjC";
-				PRODUCT_BUNDLE_IDENTIFIER = "com.yourcompany.${PRODUCT_NAME:identifier}";
-				PRODUCT_NAME = UnitTests;
-				SWIFT_OBJC_BRIDGING_HEADER = "Tests/UnitTests-Bridging-Header.h";
-				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 4.0;
-				USER_HEADER_SEARCH_PATHS = "${PROJECT_DERIVED_FILE_DIR}/protos $(SRCROOT)";
-				WARNING_CFLAGS = (
-					"$(inherited)",
-					"-Wno-documentation-unknown-command",
-					"-Wno-reserved-id-macro",
-					"-Wno-direct-ivar-access",
-				);
-			};
-			name = Debug;
-		};
-		8BBEA4A8147C727100C4ADB7 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				CLANG_ENABLE_MODULES = YES;
-				CLANG_ENABLE_OBJC_WEAK = YES;
-				COMBINE_HIDPI_IMAGES = YES;
-				INFOPLIST_FILE = "Tests/UnitTests-Info.plist";
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
-				OTHER_LDFLAGS = "-ObjC";
-				PRODUCT_BUNDLE_IDENTIFIER = "com.yourcompany.${PRODUCT_NAME:identifier}";
-				PRODUCT_NAME = UnitTests;
-				SWIFT_OBJC_BRIDGING_HEADER = "Tests/UnitTests-Bridging-Header.h";
-				SWIFT_VERSION = 4.0;
-				USER_HEADER_SEARCH_PATHS = "${PROJECT_DERIVED_FILE_DIR}/protos $(SRCROOT)";
-				WARNING_CFLAGS = (
-					"$(inherited)",
-					"-Wno-documentation-unknown-command",
-					"-Wno-reserved-id-macro",
-					"-Wno-direct-ivar-access",
-				);
-			};
-			name = Release;
-		};
-		C01FCF4F08A954540054247B /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				CLANG_ANALYZER_NONNULL = YES;
-				CLANG_ANALYZER_SECURITY_FLOATLOOPCOUNTER = YES;
-				CLANG_ANALYZER_SECURITY_INSECUREAPI_RAND = YES;
-				CLANG_ANALYZER_SECURITY_INSECUREAPI_STRCPY = YES;
-				CLANG_STATIC_ANALYZER_MODE = deep;
-				CLANG_WARN_ASSIGN_ENUM = YES;
-				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
-				CLANG_WARN_COMMA = YES;
-				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
-				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
-				CLANG_WARN_EMPTY_BODY = YES;
-				CLANG_WARN_INFINITE_RECURSION = YES;
-				CLANG_WARN_NULLABLE_TO_NONNULL_CONVERSION = YES;
-				CLANG_WARN_OBJC_EXPLICIT_OWNERSHIP_TYPE = YES;
-				CLANG_WARN_OBJC_IMPLICIT_ATOMIC_PROPERTIES = YES;
-				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
-				CLANG_WARN_OBJC_MISSING_PROPERTY_SYNTHESIS = YES;
-				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
-				CLANG_WARN_STRICT_PROTOTYPES = YES;
-				CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES;
-				CLANG_WARN_SUSPICIOUS_MOVE = YES;
-				CLANG_WARN_UNREACHABLE_CODE = YES_AGGRESSIVE;
-				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				ENABLE_TESTABILITY = YES;
-				GCC_C_LANGUAGE_STANDARD = c99;
-				GCC_NO_COMMON_BLOCKS = YES;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PREPROCESSOR_DEFINITIONS = "DEBUG=1";
-				GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES;
-				GCC_TREAT_INCOMPATIBLE_POINTER_TYPE_WARNINGS_AS_ERRORS = YES;
-				GCC_TREAT_WARNINGS_AS_ERRORS = YES;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES;
-				GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
-				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-				GCC_WARN_HIDDEN_VIRTUAL_FUNCTIONS = YES;
-				GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES;
-				GCC_WARN_MISSING_PARENTHESES = YES;
-				GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES;
-				GCC_WARN_SHADOW = YES;
-				GCC_WARN_SIGN_COMPARE = YES;
-				GCC_WARN_UNDECLARED_SELECTOR = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				GCC_WARN_UNKNOWN_PRAGMAS = YES;
-				GCC_WARN_UNUSED_FUNCTION = YES;
-				GCC_WARN_UNUSED_LABEL = YES;
-				GCC_WARN_UNUSED_PARAMETER = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				GENERATE_PROFILING_CODE = NO;
-				MACOSX_DEPLOYMENT_TARGET = 10.9;
-				ONLY_ACTIVE_ARCH = YES;
-				RUN_CLANG_STATIC_ANALYZER = YES;
-				SDKROOT = macosx;
-				USE_HEADERMAP = NO;
-				WARNING_CFLAGS = (
-					"-Wdocumentation-unknown-command",
-					"-Wundef",
-					"-Wreserved-id-macro",
-					"-Wswitch-enum",
-					"-Wdirect-ivar-access",
-					"-Woverriding-method-mismatch",
-				);
-			};
-			name = Debug;
-		};
-		C01FCF5008A954540054247B /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				CLANG_ANALYZER_NONNULL = YES;
-				CLANG_ANALYZER_SECURITY_FLOATLOOPCOUNTER = YES;
-				CLANG_ANALYZER_SECURITY_INSECUREAPI_RAND = YES;
-				CLANG_ANALYZER_SECURITY_INSECUREAPI_STRCPY = YES;
-				CLANG_STATIC_ANALYZER_MODE = deep;
-				CLANG_WARN_ASSIGN_ENUM = YES;
-				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
-				CLANG_WARN_COMMA = YES;
-				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
-				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
-				CLANG_WARN_EMPTY_BODY = YES;
-				CLANG_WARN_INFINITE_RECURSION = YES;
-				CLANG_WARN_NULLABLE_TO_NONNULL_CONVERSION = YES;
-				CLANG_WARN_OBJC_EXPLICIT_OWNERSHIP_TYPE = YES;
-				CLANG_WARN_OBJC_IMPLICIT_ATOMIC_PROPERTIES = YES;
-				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
-				CLANG_WARN_OBJC_MISSING_PROPERTY_SYNTHESIS = YES;
-				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
-				CLANG_WARN_STRICT_PROTOTYPES = YES;
-				CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES;
-				CLANG_WARN_SUSPICIOUS_MOVE = YES;
-				CLANG_WARN_UNREACHABLE_CODE = YES_AGGRESSIVE;
-				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				ENABLE_NS_ASSERTIONS = NO;
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				GCC_C_LANGUAGE_STANDARD = c99;
-				GCC_NO_COMMON_BLOCKS = YES;
-				GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES;
-				GCC_TREAT_INCOMPATIBLE_POINTER_TYPE_WARNINGS_AS_ERRORS = YES;
-				GCC_TREAT_WARNINGS_AS_ERRORS = YES;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES;
-				GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
-				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-				GCC_WARN_HIDDEN_VIRTUAL_FUNCTIONS = YES;
-				GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES;
-				GCC_WARN_MISSING_PARENTHESES = YES;
-				GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES;
-				GCC_WARN_SHADOW = YES;
-				GCC_WARN_SIGN_COMPARE = YES;
-				GCC_WARN_UNDECLARED_SELECTOR = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				GCC_WARN_UNKNOWN_PRAGMAS = YES;
-				GCC_WARN_UNUSED_FUNCTION = YES;
-				GCC_WARN_UNUSED_LABEL = YES;
-				GCC_WARN_UNUSED_PARAMETER = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				GENERATE_PROFILING_CODE = NO;
-				MACOSX_DEPLOYMENT_TARGET = 10.9;
-				RUN_CLANG_STATIC_ANALYZER = YES;
-				SDKROOT = macosx;
-				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				USE_HEADERMAP = NO;
-				WARNING_CFLAGS = (
-					"-Wdocumentation-unknown-command",
-					"-Wundef",
-					"-Wreserved-id-macro",
-					"-Wswitch-enum",
-					"-Wdirect-ivar-access",
-					"-Woverriding-method-mismatch",
-				);
-			};
-			name = Release;
-		};
-		F4487C4F1A9F8E0200531423 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				CLANG_ENABLE_OBJC_WEAK = YES;
-				COMBINE_HIDPI_IMAGES = YES;
-				PRODUCT_NAME = TestSingleSourceBuild;
-				USER_HEADER_SEARCH_PATHS = "$(SRCROOT)";
-			};
-			name = Debug;
-		};
-		F4487C501A9F8E0200531423 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				CLANG_ENABLE_OBJC_WEAK = YES;
-				COMBINE_HIDPI_IMAGES = YES;
-				PRODUCT_NAME = TestSingleSourceBuild;
-				USER_HEADER_SEARCH_PATHS = "$(SRCROOT)";
-			};
-			name = Release;
-		};
-		F45BBC151B0CE3C6002D064D /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				CLANG_ENABLE_OBJC_WEAK = YES;
-			};
-			name = Debug;
-		};
-		F45BBC161B0CE3C6002D064D /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				CLANG_ENABLE_OBJC_WEAK = YES;
-			};
-			name = Release;
-		};
-/* End XCBuildConfiguration section */
-
-/* Begin XCConfigurationList section */
-		7461B5330F94FAFD00A0C422 /* Build configuration list for PBXNativeTarget "ProtocolBuffers" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				7461B52F0F94FAFA00A0C422 /* Debug */,
-				7461B5300F94FAFA00A0C422 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		8BBEA4BA147C728600C4ADB7 /* Build configuration list for PBXNativeTarget "UnitTests" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				8BBEA4A7147C727100C4ADB7 /* Debug */,
-				8BBEA4A8147C727100C4ADB7 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		C01FCF4E08A954540054247B /* Build configuration list for PBXProject "ProtocolBuffers_OSX" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				C01FCF4F08A954540054247B /* Debug */,
-				C01FCF5008A954540054247B /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		F4487C4E1A9F8E0200531423 /* Build configuration list for PBXNativeTarget "TestSingleSourceBuild" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				F4487C4F1A9F8E0200531423 /* Debug */,
-				F4487C501A9F8E0200531423 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		F45BBC171B0CE3C6002D064D /* Build configuration list for PBXLegacyTarget "Compile Unittest Protos" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				F45BBC151B0CE3C6002D064D /* Debug */,
-				F45BBC161B0CE3C6002D064D /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-/* End XCConfigurationList section */
-	};
-	rootObject = 29B97313FDCFA39411CA2CEA /* Project object */;
-}
diff --git a/libs/protobuf/objectivec/ProtocolBuffers_OSX.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/libs/protobuf/objectivec/ProtocolBuffers_OSX.xcodeproj/project.xcworkspace/contents.xcworkspacedata
deleted file mode 100644
index 888be4d..0000000
--- a/libs/protobuf/objectivec/ProtocolBuffers_OSX.xcodeproj/project.xcworkspace/contents.xcworkspacedata
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Workspace
-   version = "1.0">
-   <FileRef
-      location = "self:ProtocolBuffers_OSX.xcodeproj">
-   </FileRef>
-</Workspace>
diff --git a/libs/protobuf/objectivec/ProtocolBuffers_OSX.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/libs/protobuf/objectivec/ProtocolBuffers_OSX.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
deleted file mode 100644
index 18d9810..0000000
--- a/libs/protobuf/objectivec/ProtocolBuffers_OSX.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>IDEDidComputeMac32BitWarning</key>
-	<true/>
-</dict>
-</plist>
diff --git a/libs/protobuf/objectivec/ProtocolBuffers_OSX.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/libs/protobuf/objectivec/ProtocolBuffers_OSX.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
deleted file mode 100644
index 08de0be..0000000
--- a/libs/protobuf/objectivec/ProtocolBuffers_OSX.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>IDEWorkspaceSharedSettings_AutocreateContextsIfNeeded</key>
-	<false/>
-</dict>
-</plist>
diff --git a/libs/protobuf/objectivec/ProtocolBuffers_OSX.xcodeproj/xcshareddata/xcschemes/PerformanceTests.xcscheme b/libs/protobuf/objectivec/ProtocolBuffers_OSX.xcodeproj/xcshareddata/xcschemes/PerformanceTests.xcscheme
deleted file mode 100644
index 6653a1b..0000000
--- a/libs/protobuf/objectivec/ProtocolBuffers_OSX.xcodeproj/xcshareddata/xcschemes/PerformanceTests.xcscheme
+++ /dev/null
@@ -1,344 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "0930"
-   version = "1.3">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "7461B52D0F94FAF800A0C422"
-               BuildableName = "libProtocolBuffers.a"
-               BlueprintName = "ProtocolBuffers"
-               ReferencedContainer = "container:ProtocolBuffers_OSX.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      buildConfiguration = "Release"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "8BBEA4A5147C727100C4ADB7"
-               BuildableName = "UnitTests.xctest"
-               BlueprintName = "UnitTests"
-               ReferencedContainer = "container:ProtocolBuffers_OSX.xcodeproj">
-            </BuildableReference>
-            <SkippedTests>
-               <Test
-                  Identifier = "CodedInputStreamTests">
-               </Test>
-               <Test
-                  Identifier = "CodedOutputStreamTests">
-               </Test>
-               <Test
-                  Identifier = "ConcurrencyTests">
-               </Test>
-               <Test
-                  Identifier = "DescriptorTests">
-               </Test>
-               <Test
-                  Identifier = "GPBAutocreatedArrayTests">
-               </Test>
-               <Test
-                  Identifier = "GPBAutocreatedDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBBoolArrayTests">
-               </Test>
-               <Test
-                  Identifier = "GPBBoolBoolDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBBoolDoubleDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBBoolFloatDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBBoolInt32DictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBBoolInt64DictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBBoolObjectDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBBoolUInt32DictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBBoolUInt64DictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBBridgeTests">
-               </Test>
-               <Test
-                  Identifier = "GPBDoubleArrayTests">
-               </Test>
-               <Test
-                  Identifier = "GPBEnumArrayCustomTests">
-               </Test>
-               <Test
-                  Identifier = "GPBEnumArrayTests">
-               </Test>
-               <Test
-                  Identifier = "GPBExtensionRegistryTest">
-               </Test>
-               <Test
-                  Identifier = "GPBFloatArrayTests">
-               </Test>
-               <Test
-                  Identifier = "GPBInt32ArrayTests">
-               </Test>
-               <Test
-                  Identifier = "GPBInt32BoolDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBInt32DoubleDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBInt32EnumDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBInt32EnumDictionaryUnknownEnumTests">
-               </Test>
-               <Test
-                  Identifier = "GPBInt32FloatDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBInt32Int32DictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBInt32Int64DictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBInt32ObjectDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBInt32UInt32DictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBInt32UInt64DictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBInt64ArrayTests">
-               </Test>
-               <Test
-                  Identifier = "GPBInt64BoolDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBInt64DoubleDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBInt64EnumDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBInt64EnumDictionaryUnknownEnumTests">
-               </Test>
-               <Test
-                  Identifier = "GPBInt64FloatDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBInt64Int32DictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBInt64Int64DictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBInt64ObjectDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBInt64UInt32DictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBInt64UInt64DictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBObjectiveCPlusPlusTests">
-               </Test>
-               <Test
-                  Identifier = "GPBStringBoolDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBStringDoubleDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBStringEnumDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBStringEnumDictionaryUnknownEnumTests">
-               </Test>
-               <Test
-                  Identifier = "GPBStringFloatDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBStringInt32DictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBStringInt64DictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBStringUInt32DictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBStringUInt64DictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBTestCase">
-               </Test>
-               <Test
-                  Identifier = "GPBUInt32ArrayTests">
-               </Test>
-               <Test
-                  Identifier = "GPBUInt32BoolDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBUInt32DoubleDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBUInt32EnumDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBUInt32EnumDictionaryUnknownEnumTests">
-               </Test>
-               <Test
-                  Identifier = "GPBUInt32FloatDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBUInt32Int32DictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBUInt32Int64DictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBUInt32ObjectDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBUInt32UInt32DictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBUInt32UInt64DictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBUInt64ArrayTests">
-               </Test>
-               <Test
-                  Identifier = "GPBUInt64BoolDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBUInt64DoubleDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBUInt64EnumDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBUInt64EnumDictionaryUnknownEnumTests">
-               </Test>
-               <Test
-                  Identifier = "GPBUInt64FloatDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBUInt64Int32DictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBUInt64Int64DictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBUInt64ObjectDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBUInt64UInt32DictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBUInt64UInt64DictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "MessageMergeTests">
-               </Test>
-               <Test
-                  Identifier = "MessageRuntimeTests">
-               </Test>
-               <Test
-                  Identifier = "MessageSerializationTests">
-               </Test>
-               <Test
-                  Identifier = "MessageTests">
-               </Test>
-               <Test
-                  Identifier = "UnknownFieldSetTest">
-               </Test>
-               <Test
-                  Identifier = "UtilitiesTests">
-               </Test>
-               <Test
-                  Identifier = "WellKnownTypesTest">
-               </Test>
-               <Test
-                  Identifier = "WireFormatTests">
-               </Test>
-            </SkippedTests>
-         </TestableReference>
-      </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
-   </TestAction>
-   <LaunchAction
-      buildConfiguration = "Release"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      debugServiceExtension = "internal"
-      allowLocationSimulation = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "7461B52D0F94FAF800A0C422"
-            BuildableName = "libProtocolBuffers.a"
-            BlueprintName = "ProtocolBuffers"
-            ReferencedContainer = "container:ProtocolBuffers_OSX.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
-   </LaunchAction>
-   <ProfileAction
-      buildConfiguration = "Release"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "7461B52D0F94FAF800A0C422"
-            BuildableName = "libProtocolBuffers.a"
-            BlueprintName = "ProtocolBuffers"
-            ReferencedContainer = "container:ProtocolBuffers_OSX.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Release">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>
diff --git a/libs/protobuf/objectivec/ProtocolBuffers_OSX.xcodeproj/xcshareddata/xcschemes/ProtocolBuffers.xcscheme b/libs/protobuf/objectivec/ProtocolBuffers_OSX.xcodeproj/xcshareddata/xcschemes/ProtocolBuffers.xcscheme
deleted file mode 100644
index 328771b..0000000
--- a/libs/protobuf/objectivec/ProtocolBuffers_OSX.xcodeproj/xcshareddata/xcschemes/ProtocolBuffers.xcscheme
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "0930"
-   version = "1.3">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "NO">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "7461B52D0F94FAF800A0C422"
-               BuildableName = "libProtocolBuffers.a"
-               BlueprintName = "ProtocolBuffers"
-               ReferencedContainer = "container:ProtocolBuffers_OSX.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "NO"
-            buildForArchiving = "NO"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "F4487C381A9F8E0200531423"
-               BuildableName = "libTestSingleSourceBuild.a"
-               BlueprintName = "TestSingleSourceBuild"
-               ReferencedContainer = "container:ProtocolBuffers_OSX.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "NO"
-            buildForProfiling = "NO"
-            buildForArchiving = "NO"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "8BBEA4A5147C727100C4ADB7"
-               BuildableName = "UnitTests.xctest"
-               BlueprintName = "UnitTests"
-               ReferencedContainer = "container:ProtocolBuffers_OSX.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      codeCoverageEnabled = "YES"
-      shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "8BBEA4A5147C727100C4ADB7"
-               BuildableName = "UnitTests.xctest"
-               BlueprintName = "UnitTests"
-               ReferencedContainer = "container:ProtocolBuffers_OSX.xcodeproj">
-            </BuildableReference>
-            <SkippedTests>
-               <Test
-                  Identifier = "PerfTests">
-               </Test>
-            </SkippedTests>
-         </TestableReference>
-      </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "7461B52D0F94FAF800A0C422"
-            BuildableName = "libProtocolBuffers.a"
-            BlueprintName = "ProtocolBuffers"
-            ReferencedContainer = "container:ProtocolBuffers_OSX.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
-   </TestAction>
-   <LaunchAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      debugServiceExtension = "internal"
-      allowLocationSimulation = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "7461B52D0F94FAF800A0C422"
-            BuildableName = "libProtocolBuffers.a"
-            BlueprintName = "ProtocolBuffers"
-            ReferencedContainer = "container:ProtocolBuffers_OSX.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
-   </LaunchAction>
-   <ProfileAction
-      buildConfiguration = "Release"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "7461B52D0F94FAF800A0C422"
-            BuildableName = "libProtocolBuffers.a"
-            BlueprintName = "ProtocolBuffers"
-            ReferencedContainer = "container:ProtocolBuffers_OSX.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>
diff --git a/libs/protobuf/objectivec/ProtocolBuffers_iOS.xcodeproj/project.pbxproj b/libs/protobuf/objectivec/ProtocolBuffers_iOS.xcodeproj/project.pbxproj
deleted file mode 100644
index 03e0580..0000000
--- a/libs/protobuf/objectivec/ProtocolBuffers_iOS.xcodeproj/project.pbxproj
+++ /dev/null
@@ -1,1142 +0,0 @@
-// !$*UTF8*$!
-{
-	archiveVersion = 1;
-	classes = {
-	};
-	objectVersion = 47;
-	objects = {
-
-/* Begin PBXBuildFile section */
-		5102DABC1891A073002037B6 /* GPBConcurrencyTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 5102DABB1891A052002037B6 /* GPBConcurrencyTests.m */; };
-		7461B5360F94FB4600A0C422 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; };
-		7461B53C0F94FB4E00A0C422 /* GPBCodedInputStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 7461B48F0F94F99000A0C422 /* GPBCodedInputStream.m */; };
-		7461B53D0F94FB4E00A0C422 /* GPBCodedOutputStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 7461B4910F94F99000A0C422 /* GPBCodedOutputStream.m */; };
-		7461B5490F94FB4E00A0C422 /* GPBExtensionRegistry.m in Sources */ = {isa = PBXBuildFile; fileRef = 7461B4A90F94F99000A0C422 /* GPBExtensionRegistry.m */; };
-		7461B54C0F94FB4E00A0C422 /* GPBUnknownField.m in Sources */ = {isa = PBXBuildFile; fileRef = 7461B4AF0F94F99000A0C422 /* GPBUnknownField.m */; };
-		7461B5530F94FB4E00A0C422 /* GPBMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 7461B4BF0F94F99000A0C422 /* GPBMessage.m */; };
-		7461B5610F94FB4E00A0C422 /* GPBUnknownFieldSet.m in Sources */ = {isa = PBXBuildFile; fileRef = 7461B4E20F94F99000A0C422 /* GPBUnknownFieldSet.m */; };
-		7461B5630F94FB4E00A0C422 /* GPBUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = 7461B4E60F94F99000A0C422 /* GPBUtilities.m */; };
-		7461B5640F94FB4E00A0C422 /* GPBWireFormat.m in Sources */ = {isa = PBXBuildFile; fileRef = 7461B4E80F94F99000A0C422 /* GPBWireFormat.m */; };
-		8B210CCE159383D60032D72D /* golden_message in Resources */ = {isa = PBXBuildFile; fileRef = 8B210CCD159383D60032D72D /* golden_message */; };
-		8B210CD0159386920032D72D /* golden_packed_fields_message in Resources */ = {isa = PBXBuildFile; fileRef = 8B210CCF159386920032D72D /* golden_packed_fields_message */; };
-		8B4248B41A8BD96E00BC1EC6 /* GPBSwiftTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8B4248B31A8BD96E00BC1EC6 /* GPBSwiftTests.swift */; };
-		8B4248E41A929C8900BC1EC6 /* GPBWellKnownTypes.m in Sources */ = {isa = PBXBuildFile; fileRef = 8B4248E21A929C8900BC1EC6 /* GPBWellKnownTypes.m */; };
-		8B4248E61A929C9900BC1EC6 /* GPBWellKnownTypesTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 8B4248E51A929C9900BC1EC6 /* GPBWellKnownTypesTest.m */; };
-		8B79657B14992E3F002FFBFC /* GPBRootObject.m in Sources */ = {isa = PBXBuildFile; fileRef = 8B79657914992E3E002FFBFC /* GPBRootObject.m */; };
-		8B8B615D17DF7056002EE618 /* GPBARCUnittestProtos.m in Sources */ = {isa = PBXBuildFile; fileRef = 8B8B615C17DF7056002EE618 /* GPBARCUnittestProtos.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
-		8B96157414C8C38C00A2AC0B /* GPBDescriptor.m in Sources */ = {isa = PBXBuildFile; fileRef = 8B96157314C8C38C00A2AC0B /* GPBDescriptor.m */; };
-		8B9A5EEC18330A0F00A9D33B /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8B9A5E9F1831913D00A9D33B /* UIKit.framework */; };
-		8BBEA4A9147C727D00C4ADB7 /* GPBCodedInputStreamTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 7461B69B0F94FDF800A0C422 /* GPBCodedInputStreamTests.m */; };
-		8BBEA4AA147C727D00C4ADB7 /* GPBCodedOuputStreamTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 7461B69D0F94FDF800A0C422 /* GPBCodedOuputStreamTests.m */; };
-		8BBEA4AC147C727D00C4ADB7 /* GPBMessageTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 7461B6A30F94FDF800A0C422 /* GPBMessageTests.m */; };
-		8BBEA4B0147C727D00C4ADB7 /* GPBTestUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = 7461B6AC0F94FDF800A0C422 /* GPBTestUtilities.m */; };
-		8BBEA4B6147C727D00C4ADB7 /* GPBUnknownFieldSetTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 7461B6B80F94FDF900A0C422 /* GPBUnknownFieldSetTest.m */; };
-		8BBEA4B7147C727D00C4ADB7 /* GPBUtilitiesTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 7461B6BA0F94FDF900A0C422 /* GPBUtilitiesTests.m */; };
-		8BBEA4B8147C727D00C4ADB7 /* GPBWireFormatTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 7461B6BC0F94FDF900A0C422 /* GPBWireFormatTests.m */; };
-		8BBEA4BB147C729200C4ADB7 /* libProtocolBuffers.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7461B52E0F94FAF800A0C422 /* libProtocolBuffers.a */; };
-		8BD3981F14BE59D70081D629 /* GPBUnittestProtos.m in Sources */ = {isa = PBXBuildFile; fileRef = 8BD3981E14BE59D70081D629 /* GPBUnittestProtos.m */; };
-		8BF8193514A0DDA600A2C982 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; };
-		8BFF9D1C23AD593C00E63E32 /* GPBMessageTests+ClassNames.m in Sources */ = {isa = PBXBuildFile; fileRef = 8BFF9D1B23AD593B00E63E32 /* GPBMessageTests+ClassNames.m */; };
-		F401DC351A8E5C6F00FCC765 /* GPBArrayTests.m in Sources */ = {isa = PBXBuildFile; fileRef = F401DC341A8E5C6F00FCC765 /* GPBArrayTests.m */; };
-		F40EE4F0206BF91E0071091A /* GPBCompileTest01.m in Sources */ = {isa = PBXBuildFile; fileRef = F40EE4CD206BF9170071091A /* GPBCompileTest01.m */; };
-		F40EE4F1206BF91E0071091A /* GPBCompileTest02.m in Sources */ = {isa = PBXBuildFile; fileRef = F40EE4C6206BF9170071091A /* GPBCompileTest02.m */; };
-		F40EE4F2206BF91E0071091A /* GPBCompileTest03.m in Sources */ = {isa = PBXBuildFile; fileRef = F40EE4D6206BF9190071091A /* GPBCompileTest03.m */; };
-		F40EE4F3206BF91E0071091A /* GPBCompileTest04.m in Sources */ = {isa = PBXBuildFile; fileRef = F40EE4C3206BF9160071091A /* GPBCompileTest04.m */; };
-		F40EE4F4206BF91E0071091A /* GPBCompileTest05.m in Sources */ = {isa = PBXBuildFile; fileRef = F40EE4C4206BF9160071091A /* GPBCompileTest05.m */; };
-		F40EE4F5206BF91E0071091A /* GPBCompileTest06.m in Sources */ = {isa = PBXBuildFile; fileRef = F40EE4D7206BF9190071091A /* GPBCompileTest06.m */; };
-		F40EE4F6206BF91E0071091A /* GPBCompileTest07.m in Sources */ = {isa = PBXBuildFile; fileRef = F40EE4C5206BF9170071091A /* GPBCompileTest07.m */; };
-		F40EE4F7206BF91E0071091A /* GPBCompileTest08.m in Sources */ = {isa = PBXBuildFile; fileRef = F40EE4C2206BF9160071091A /* GPBCompileTest08.m */; };
-		F40EE4F8206BF91E0071091A /* GPBCompileTest09.m in Sources */ = {isa = PBXBuildFile; fileRef = F40EE4C9206BF9170071091A /* GPBCompileTest09.m */; };
-		F40EE4F9206BF91E0071091A /* GPBCompileTest10.m in Sources */ = {isa = PBXBuildFile; fileRef = F40EE4D1206BF9180071091A /* GPBCompileTest10.m */; };
-		F40EE4FA206BF91E0071091A /* GPBCompileTest11.m in Sources */ = {isa = PBXBuildFile; fileRef = F40EE4D8206BF9190071091A /* GPBCompileTest11.m */; };
-		F40EE4FB206BF91E0071091A /* GPBCompileTest12.m in Sources */ = {isa = PBXBuildFile; fileRef = F40EE4D5206BF9180071091A /* GPBCompileTest12.m */; };
-		F40EE4FC206BF91E0071091A /* GPBCompileTest13.m in Sources */ = {isa = PBXBuildFile; fileRef = F40EE4C8206BF9170071091A /* GPBCompileTest13.m */; };
-		F40EE4FD206BF91E0071091A /* GPBCompileTest14.m in Sources */ = {isa = PBXBuildFile; fileRef = F40EE4D4206BF9180071091A /* GPBCompileTest14.m */; };
-		F40EE4FE206BF91E0071091A /* GPBCompileTest15.m in Sources */ = {isa = PBXBuildFile; fileRef = F40EE4CE206BF9170071091A /* GPBCompileTest15.m */; };
-		F40EE4FF206BF91E0071091A /* GPBCompileTest16.m in Sources */ = {isa = PBXBuildFile; fileRef = F40EE4D0206BF9180071091A /* GPBCompileTest16.m */; };
-		F40EE500206BF91E0071091A /* GPBCompileTest17.m in Sources */ = {isa = PBXBuildFile; fileRef = F40EE4D2206BF9180071091A /* GPBCompileTest17.m */; };
-		F40EE501206BF91E0071091A /* GPBCompileTest18.m in Sources */ = {isa = PBXBuildFile; fileRef = F40EE4D3206BF9180071091A /* GPBCompileTest18.m */; };
-		F40EE502206BF91E0071091A /* GPBCompileTest19.m in Sources */ = {isa = PBXBuildFile; fileRef = F40EE4C7206BF9170071091A /* GPBCompileTest19.m */; };
-		F40EE503206BF91E0071091A /* GPBCompileTest20.m in Sources */ = {isa = PBXBuildFile; fileRef = F40EE4CA206BF9170071091A /* GPBCompileTest20.m */; };
-		F40EE504206BF91E0071091A /* GPBCompileTest21.m in Sources */ = {isa = PBXBuildFile; fileRef = F40EE4CB206BF9170071091A /* GPBCompileTest21.m */; };
-		F40EE505206BF91E0071091A /* GPBCompileTest22.m in Sources */ = {isa = PBXBuildFile; fileRef = F40EE4CF206BF9170071091A /* GPBCompileTest22.m */; };
-		F40EE506206BF91E0071091A /* GPBCompileTest23.m in Sources */ = {isa = PBXBuildFile; fileRef = F40EE4CC206BF9170071091A /* GPBCompileTest23.m */; };
-		F40EE511206C068D0071091A /* GPBCompileTest24.m in Sources */ = {isa = PBXBuildFile; fileRef = F40EE50E206C06880071091A /* GPBCompileTest24.m */; };
-		F40EE512206C068D0071091A /* GPBCompileTest25.m in Sources */ = {isa = PBXBuildFile; fileRef = F40EE50D206C06880071091A /* GPBCompileTest25.m */; };
-		F41C175D1833D3310064ED4D /* GPBPerfTests.m in Sources */ = {isa = PBXBuildFile; fileRef = F41C175C1833D3310064ED4D /* GPBPerfTests.m */; };
-		F4353D1F1AB88243005A6198 /* GPBDescriptorTests.m in Sources */ = {isa = PBXBuildFile; fileRef = F4353D1E1AB88243005A6198 /* GPBDescriptorTests.m */; };
-		F4353D271ABB156F005A6198 /* GPBDictionary.m in Sources */ = {isa = PBXBuildFile; fileRef = F4353D251ABB156F005A6198 /* GPBDictionary.m */; };
-		F4353D421AC06F31005A6198 /* GPBDictionaryTests+Bool.m in Sources */ = {isa = PBXBuildFile; fileRef = F4353D3B1AC06F31005A6198 /* GPBDictionaryTests+Bool.m */; };
-		F4353D431AC06F31005A6198 /* GPBDictionaryTests+Int32.m in Sources */ = {isa = PBXBuildFile; fileRef = F4353D3C1AC06F31005A6198 /* GPBDictionaryTests+Int32.m */; };
-		F4353D441AC06F31005A6198 /* GPBDictionaryTests+Int64.m in Sources */ = {isa = PBXBuildFile; fileRef = F4353D3D1AC06F31005A6198 /* GPBDictionaryTests+Int64.m */; };
-		F4353D451AC06F31005A6198 /* GPBDictionaryTests+String.m in Sources */ = {isa = PBXBuildFile; fileRef = F4353D3E1AC06F31005A6198 /* GPBDictionaryTests+String.m */; };
-		F4353D461AC06F31005A6198 /* GPBDictionaryTests+UInt32.m in Sources */ = {isa = PBXBuildFile; fileRef = F4353D3F1AC06F31005A6198 /* GPBDictionaryTests+UInt32.m */; };
-		F4353D471AC06F31005A6198 /* GPBDictionaryTests+UInt64.m in Sources */ = {isa = PBXBuildFile; fileRef = F4353D401AC06F31005A6198 /* GPBDictionaryTests+UInt64.m */; };
-		F43C88D0191D77FC009E917D /* text_format_unittest_data.txt in Resources */ = {isa = PBXBuildFile; fileRef = F43C88CF191D77FC009E917D /* text_format_unittest_data.txt */; };
-		F4487C6A1A9F8F8100531423 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; };
-		F4487C6F1A9F8FFF00531423 /* GPBProtocolBuffers.m in Sources */ = {isa = PBXBuildFile; fileRef = 8BCF338814ED799900BC5317 /* GPBProtocolBuffers.m */; };
-		F4487C731A9F906200531423 /* GPBArray.m in Sources */ = {isa = PBXBuildFile; fileRef = F4487C711A9F906200531423 /* GPBArray.m */; };
-		F4487C771AADF84900531423 /* GPBMessageTests+Runtime.m in Sources */ = {isa = PBXBuildFile; fileRef = F4487C761AADF84900531423 /* GPBMessageTests+Runtime.m */; };
-		F4487C811AAF62FC00531423 /* GPBMessageTests+Serialization.m in Sources */ = {isa = PBXBuildFile; fileRef = F4487C801AAF62FC00531423 /* GPBMessageTests+Serialization.m */; };
-		F4487C851AAF6AC500531423 /* GPBMessageTests+Merge.m in Sources */ = {isa = PBXBuildFile; fileRef = F4487C841AAF6AC500531423 /* GPBMessageTests+Merge.m */; };
-		F4584D831ECCB53600803AB6 /* GPBExtensionRegistryTest.m in Sources */ = {isa = PBXBuildFile; fileRef = F4584D801ECCB39E00803AB6 /* GPBExtensionRegistryTest.m */; };
-		F45C69CC16DFD08D0081955B /* GPBExtensionInternals.m in Sources */ = {isa = PBXBuildFile; fileRef = F45C69CB16DFD08D0081955B /* GPBExtensionInternals.m */; };
-		F45E57C91AE6DC98000B7D99 /* text_format_map_unittest_data.txt in Resources */ = {isa = PBXBuildFile; fileRef = F45E57C81AE6DC98000B7D99 /* text_format_map_unittest_data.txt */; };
-		F47CF95F23D903C600C7B24C /* GPBDuration.pbobjc.m in Sources */ = {isa = PBXBuildFile; fileRef = F47CF94B23D903C600C7B24C /* GPBDuration.pbobjc.m */; };
-		F47CF96023D903C600C7B24C /* GPBWrappers.pbobjc.m in Sources */ = {isa = PBXBuildFile; fileRef = F47CF94C23D903C600C7B24C /* GPBWrappers.pbobjc.m */; };
-		F47CF96223D903C600C7B24C /* GPBFieldMask.pbobjc.m in Sources */ = {isa = PBXBuildFile; fileRef = F47CF94E23D903C600C7B24C /* GPBFieldMask.pbobjc.m */; };
-		F47CF96423D903C600C7B24C /* GPBStruct.pbobjc.m in Sources */ = {isa = PBXBuildFile; fileRef = F47CF95023D903C600C7B24C /* GPBStruct.pbobjc.m */; };
-		F47CF96523D903C600C7B24C /* GPBApi.pbobjc.m in Sources */ = {isa = PBXBuildFile; fileRef = F47CF95123D903C600C7B24C /* GPBApi.pbobjc.m */; };
-		F47CF96623D903C600C7B24C /* GPBSourceContext.pbobjc.m in Sources */ = {isa = PBXBuildFile; fileRef = F47CF95223D903C600C7B24C /* GPBSourceContext.pbobjc.m */; };
-		F47CF96723D903C600C7B24C /* GPBEmpty.pbobjc.m in Sources */ = {isa = PBXBuildFile; fileRef = F47CF95323D903C600C7B24C /* GPBEmpty.pbobjc.m */; };
-		F47CF96923D903C600C7B24C /* GPBTimestamp.pbobjc.m in Sources */ = {isa = PBXBuildFile; fileRef = F47CF95523D903C600C7B24C /* GPBTimestamp.pbobjc.m */; };
-		F47CF96C23D903C600C7B24C /* GPBType.pbobjc.m in Sources */ = {isa = PBXBuildFile; fileRef = F47CF95823D903C600C7B24C /* GPBType.pbobjc.m */; };
-		F47CF96D23D903C600C7B24C /* GPBAny.pbobjc.m in Sources */ = {isa = PBXBuildFile; fileRef = F47CF95923D903C600C7B24C /* GPBAny.pbobjc.m */; };
-		F4B51B1C1BBC5C7100744318 /* GPBObjectiveCPlusPlusTest.mm in Sources */ = {isa = PBXBuildFile; fileRef = F4B51B1B1BBC5C7100744318 /* GPBObjectiveCPlusPlusTest.mm */; };
-		F4C4B9E71E1D97BF00D3B61D /* GPBDictionaryTests.m in Sources */ = {isa = PBXBuildFile; fileRef = F4C4B9E51E1D97BB00D3B61D /* GPBDictionaryTests.m */; };
-		F4F53F8C219CC5DF001EABF4 /* text_format_extensions_unittest_data.txt in Resources */ = {isa = PBXBuildFile; fileRef = F4F53F8B219CC5DF001EABF4 /* text_format_extensions_unittest_data.txt */; };
-		F4F8D8861D78A193002CE128 /* GPBUnittestProtos2.m in Sources */ = {isa = PBXBuildFile; fileRef = F4F8D8841D78A186002CE128 /* GPBUnittestProtos2.m */; };
-/* End PBXBuildFile section */
-
-/* Begin PBXContainerItemProxy section */
-		8BBEA4BC147C729A00C4ADB7 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 7461B52D0F94FAF800A0C422;
-			remoteInfo = ProtocolBuffers;
-		};
-		F45BBC121B0CDBBA002D064D /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = F45BBC0E1B0CDB50002D064D;
-			remoteInfo = "Compile Unittest Protos";
-		};
-/* End PBXContainerItemProxy section */
-
-/* Begin PBXFileReference section */
-		1D30AB110D05D00D00671497 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
-		5102DABB1891A052002037B6 /* GPBConcurrencyTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = GPBConcurrencyTests.m; sourceTree = "<group>"; };
-		51457B5F18D0B7AF00CCC606 /* GPBCodedInputStream_PackagePrivate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GPBCodedInputStream_PackagePrivate.h; sourceTree = "<group>"; };
-		515B840C18B7DEE30031753B /* GPBDescriptor_PackagePrivate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GPBDescriptor_PackagePrivate.h; sourceTree = "<group>"; };
-		5196A06918CE16B000B759E2 /* GPBMessage_PackagePrivate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GPBMessage_PackagePrivate.h; sourceTree = "<group>"; };
-		7401C1A90F950347006D8281 /* UnitTests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "UnitTests-Info.plist"; sourceTree = "<group>"; };
-		7461B48D0F94F99000A0C422 /* GPBBootstrap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPBBootstrap.h; sourceTree = "<group>"; };
-		7461B48E0F94F99000A0C422 /* GPBCodedInputStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPBCodedInputStream.h; sourceTree = "<group>"; };
-		7461B48F0F94F99000A0C422 /* GPBCodedInputStream.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = GPBCodedInputStream.m; sourceTree = "<group>"; };
-		7461B4900F94F99000A0C422 /* GPBCodedOutputStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPBCodedOutputStream.h; sourceTree = "<group>"; };
-		7461B4910F94F99000A0C422 /* GPBCodedOutputStream.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBCodedOutputStream.m; sourceTree = "<group>"; };
-		7461B4A80F94F99000A0C422 /* GPBExtensionRegistry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPBExtensionRegistry.h; sourceTree = "<group>"; };
-		7461B4A90F94F99000A0C422 /* GPBExtensionRegistry.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBExtensionRegistry.m; sourceTree = "<group>"; };
-		7461B4AE0F94F99000A0C422 /* GPBUnknownField.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPBUnknownField.h; sourceTree = "<group>"; };
-		7461B4AF0F94F99000A0C422 /* GPBUnknownField.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBUnknownField.m; sourceTree = "<group>"; };
-		7461B4BE0F94F99000A0C422 /* GPBMessage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPBMessage.h; sourceTree = "<group>"; };
-		7461B4BF0F94F99000A0C422 /* GPBMessage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBMessage.m; sourceTree = "<group>"; };
-		7461B4CD0F94F99000A0C422 /* GPBProtocolBuffers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPBProtocolBuffers.h; sourceTree = "<group>"; };
-		7461B4E10F94F99000A0C422 /* GPBUnknownFieldSet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPBUnknownFieldSet.h; sourceTree = "<group>"; };
-		7461B4E20F94F99000A0C422 /* GPBUnknownFieldSet.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBUnknownFieldSet.m; sourceTree = "<group>"; };
-		7461B4E50F94F99000A0C422 /* GPBUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPBUtilities.h; sourceTree = "<group>"; };
-		7461B4E60F94F99000A0C422 /* GPBUtilities.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBUtilities.m; sourceTree = "<group>"; };
-		7461B4E70F94F99000A0C422 /* GPBWireFormat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPBWireFormat.h; sourceTree = "<group>"; };
-		7461B4E80F94F99000A0C422 /* GPBWireFormat.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBWireFormat.m; sourceTree = "<group>"; };
-		7461B52E0F94FAF800A0C422 /* libProtocolBuffers.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libProtocolBuffers.a; sourceTree = BUILT_PRODUCTS_DIR; };
-		7461B69B0F94FDF800A0C422 /* GPBCodedInputStreamTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBCodedInputStreamTests.m; sourceTree = "<group>"; };
-		7461B69D0F94FDF800A0C422 /* GPBCodedOuputStreamTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBCodedOuputStreamTests.m; sourceTree = "<group>"; };
-		7461B6A30F94FDF800A0C422 /* GPBMessageTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBMessageTests.m; sourceTree = "<group>"; };
-		7461B6AB0F94FDF800A0C422 /* GPBTestUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPBTestUtilities.h; sourceTree = "<group>"; };
-		7461B6AC0F94FDF800A0C422 /* GPBTestUtilities.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBTestUtilities.m; sourceTree = "<group>"; };
-		7461B6B80F94FDF900A0C422 /* GPBUnknownFieldSetTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBUnknownFieldSetTest.m; sourceTree = "<group>"; };
-		7461B6BA0F94FDF900A0C422 /* GPBUtilitiesTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBUtilitiesTests.m; sourceTree = "<group>"; };
-		7461B6BC0F94FDF900A0C422 /* GPBWireFormatTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBWireFormatTests.m; sourceTree = "<group>"; };
-		8B09AAF614B663A7007B4184 /* unittest_objc.proto */ = {isa = PBXFileReference; lastKnownFileType = text; path = unittest_objc.proto; sourceTree = "<group>"; };
-		8B210CCD159383D60032D72D /* golden_message */ = {isa = PBXFileReference; lastKnownFileType = file; path = golden_message; sourceTree = "<group>"; };
-		8B210CCF159386920032D72D /* golden_packed_fields_message */ = {isa = PBXFileReference; lastKnownFileType = file; path = golden_packed_fields_message; sourceTree = "<group>"; };
-		8B35468621A61EB2000BD30D /* unittest_objc_options.proto */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.protobuf; path = unittest_objc_options.proto; sourceTree = "<group>"; };
-		8B4248B21A8BD96D00BC1EC6 /* UnitTests-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "UnitTests-Bridging-Header.h"; sourceTree = "<group>"; };
-		8B4248B31A8BD96E00BC1EC6 /* GPBSwiftTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GPBSwiftTests.swift; sourceTree = "<group>"; };
-		8B4248E11A929C8900BC1EC6 /* GPBWellKnownTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPBWellKnownTypes.h; sourceTree = "<group>"; };
-		8B4248E21A929C8900BC1EC6 /* GPBWellKnownTypes.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBWellKnownTypes.m; sourceTree = "<group>"; };
-		8B4248E51A929C9900BC1EC6 /* GPBWellKnownTypesTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBWellKnownTypesTest.m; sourceTree = "<group>"; };
-		8B4249481A92A02300BC1EC6 /* timestamp.proto */ = {isa = PBXFileReference; lastKnownFileType = text; name = timestamp.proto; path = ../src/google/protobuf/timestamp.proto; sourceTree = "<group>"; };
-		8B42494A1A92A0BA00BC1EC6 /* duration.proto */ = {isa = PBXFileReference; lastKnownFileType = text; name = duration.proto; path = ../src/google/protobuf/duration.proto; sourceTree = "<group>"; };
-		8B79657814992E3E002FFBFC /* GPBRootObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPBRootObject.h; sourceTree = "<group>"; };
-		8B79657914992E3E002FFBFC /* GPBRootObject.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBRootObject.m; sourceTree = "<group>"; };
-		8B7E6A7414893DBA00F8884A /* unittest_custom_options.proto */ = {isa = PBXFileReference; lastKnownFileType = text; name = unittest_custom_options.proto; path = ../../src/google/protobuf/unittest_custom_options.proto; sourceTree = "<group>"; };
-		8B7E6A7514893DBA00F8884A /* unittest_embed_optimize_for.proto */ = {isa = PBXFileReference; lastKnownFileType = text; name = unittest_embed_optimize_for.proto; path = ../../src/google/protobuf/unittest_embed_optimize_for.proto; sourceTree = "<group>"; };
-		8B7E6A7614893DBA00F8884A /* unittest_empty.proto */ = {isa = PBXFileReference; lastKnownFileType = text; name = unittest_empty.proto; path = ../../src/google/protobuf/unittest_empty.proto; sourceTree = "<group>"; };
-		8B7E6A7814893DBB00F8884A /* unittest_import.proto */ = {isa = PBXFileReference; lastKnownFileType = text; name = unittest_import.proto; path = ../../src/google/protobuf/unittest_import.proto; sourceTree = "<group>"; };
-		8B7E6A7B14893DBC00F8884A /* unittest_mset.proto */ = {isa = PBXFileReference; lastKnownFileType = text; name = unittest_mset.proto; path = ../../src/google/protobuf/unittest_mset.proto; sourceTree = "<group>"; };
-		8B7E6A7C14893DBC00F8884A /* unittest_no_generic_services.proto */ = {isa = PBXFileReference; lastKnownFileType = text; name = unittest_no_generic_services.proto; path = ../../src/google/protobuf/unittest_no_generic_services.proto; sourceTree = "<group>"; };
-		8B7E6A7D14893DBC00F8884A /* unittest_optimize_for.proto */ = {isa = PBXFileReference; lastKnownFileType = text; name = unittest_optimize_for.proto; path = ../../src/google/protobuf/unittest_optimize_for.proto; sourceTree = "<group>"; };
-		8B7E6A7E14893DBC00F8884A /* unittest.proto */ = {isa = PBXFileReference; lastKnownFileType = text; name = unittest.proto; path = ../../src/google/protobuf/unittest.proto; sourceTree = "<group>"; };
-		8B8B615C17DF7056002EE618 /* GPBARCUnittestProtos.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBARCUnittestProtos.m; sourceTree = "<group>"; };
-		8B96157214C8B06000A2AC0B /* GPBDescriptor.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GPBDescriptor.h; sourceTree = "<group>"; };
-		8B96157314C8C38C00A2AC0B /* GPBDescriptor.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBDescriptor.m; sourceTree = "<group>"; };
-		8B9742421A8AAA7800DCE92C /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
-		8B9A5E9F1831913D00A9D33B /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
-		8BBD9DB016DD1DC8008E1EC1 /* unittest_lite.proto */ = {isa = PBXFileReference; lastKnownFileType = text; name = unittest_lite.proto; path = ../../src/google/protobuf/unittest_lite.proto; sourceTree = "<group>"; };
-		8BBEA4A6147C727100C4ADB7 /* UnitTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = UnitTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
-		8BCF338814ED799900BC5317 /* GPBProtocolBuffers.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = GPBProtocolBuffers.m; sourceTree = "<group>"; };
-		8BD3981D14BE54220081D629 /* unittest_enormous_descriptor.proto */ = {isa = PBXFileReference; lastKnownFileType = text; name = unittest_enormous_descriptor.proto; path = ../../src/google/protobuf/unittest_enormous_descriptor.proto; sourceTree = "<group>"; };
-		8BD3981E14BE59D70081D629 /* GPBUnittestProtos.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBUnittestProtos.m; sourceTree = "<group>"; };
-		8BEB5AE01498033E0078BF9D /* GPBRuntimeTypes.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GPBRuntimeTypes.h; sourceTree = "<group>"; };
-		8BFF9D1B23AD593B00E63E32 /* GPBMessageTests+ClassNames.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "GPBMessageTests+ClassNames.m"; sourceTree = "<group>"; };
-		F401DC341A8E5C6F00FCC765 /* GPBArrayTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBArrayTests.m; sourceTree = "<group>"; };
-		F40EE4C2206BF9160071091A /* GPBCompileTest08.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBCompileTest08.m; sourceTree = "<group>"; };
-		F40EE4C3206BF9160071091A /* GPBCompileTest04.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBCompileTest04.m; sourceTree = "<group>"; };
-		F40EE4C4206BF9160071091A /* GPBCompileTest05.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBCompileTest05.m; sourceTree = "<group>"; };
-		F40EE4C5206BF9170071091A /* GPBCompileTest07.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBCompileTest07.m; sourceTree = "<group>"; };
-		F40EE4C6206BF9170071091A /* GPBCompileTest02.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBCompileTest02.m; sourceTree = "<group>"; };
-		F40EE4C7206BF9170071091A /* GPBCompileTest19.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBCompileTest19.m; sourceTree = "<group>"; };
-		F40EE4C8206BF9170071091A /* GPBCompileTest13.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBCompileTest13.m; sourceTree = "<group>"; };
-		F40EE4C9206BF9170071091A /* GPBCompileTest09.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBCompileTest09.m; sourceTree = "<group>"; };
-		F40EE4CA206BF9170071091A /* GPBCompileTest20.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBCompileTest20.m; sourceTree = "<group>"; };
-		F40EE4CB206BF9170071091A /* GPBCompileTest21.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBCompileTest21.m; sourceTree = "<group>"; };
-		F40EE4CC206BF9170071091A /* GPBCompileTest23.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBCompileTest23.m; sourceTree = "<group>"; };
-		F40EE4CD206BF9170071091A /* GPBCompileTest01.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBCompileTest01.m; sourceTree = "<group>"; };
-		F40EE4CE206BF9170071091A /* GPBCompileTest15.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBCompileTest15.m; sourceTree = "<group>"; };
-		F40EE4CF206BF9170071091A /* GPBCompileTest22.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBCompileTest22.m; sourceTree = "<group>"; };
-		F40EE4D0206BF9180071091A /* GPBCompileTest16.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBCompileTest16.m; sourceTree = "<group>"; };
-		F40EE4D1206BF9180071091A /* GPBCompileTest10.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBCompileTest10.m; sourceTree = "<group>"; };
-		F40EE4D2206BF9180071091A /* GPBCompileTest17.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBCompileTest17.m; sourceTree = "<group>"; };
-		F40EE4D3206BF9180071091A /* GPBCompileTest18.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBCompileTest18.m; sourceTree = "<group>"; };
-		F40EE4D4206BF9180071091A /* GPBCompileTest14.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBCompileTest14.m; sourceTree = "<group>"; };
-		F40EE4D5206BF9180071091A /* GPBCompileTest12.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBCompileTest12.m; sourceTree = "<group>"; };
-		F40EE4D6206BF9190071091A /* GPBCompileTest03.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBCompileTest03.m; sourceTree = "<group>"; };
-		F40EE4D7206BF9190071091A /* GPBCompileTest06.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBCompileTest06.m; sourceTree = "<group>"; };
-		F40EE4D8206BF9190071091A /* GPBCompileTest11.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBCompileTest11.m; sourceTree = "<group>"; };
-		F40EE50D206C06880071091A /* GPBCompileTest25.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBCompileTest25.m; sourceTree = "<group>"; };
-		F40EE50E206C06880071091A /* GPBCompileTest24.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBCompileTest24.m; sourceTree = "<group>"; };
-		F41C175C1833D3310064ED4D /* GPBPerfTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBPerfTests.m; sourceTree = "<group>"; };
-		F4353D1E1AB88243005A6198 /* GPBDescriptorTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBDescriptorTests.m; sourceTree = "<group>"; };
-		F4353D241ABB156F005A6198 /* GPBDictionary.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPBDictionary.h; sourceTree = "<group>"; };
-		F4353D251ABB156F005A6198 /* GPBDictionary.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBDictionary.m; sourceTree = "<group>"; };
-		F4353D3A1AC06F31005A6198 /* GPBDictionaryTests.pddm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = GPBDictionaryTests.pddm; sourceTree = "<group>"; };
-		F4353D3B1AC06F31005A6198 /* GPBDictionaryTests+Bool.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "GPBDictionaryTests+Bool.m"; sourceTree = "<group>"; };
-		F4353D3C1AC06F31005A6198 /* GPBDictionaryTests+Int32.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "GPBDictionaryTests+Int32.m"; sourceTree = "<group>"; };
-		F4353D3D1AC06F31005A6198 /* GPBDictionaryTests+Int64.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "GPBDictionaryTests+Int64.m"; sourceTree = "<group>"; };
-		F4353D3E1AC06F31005A6198 /* GPBDictionaryTests+String.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "GPBDictionaryTests+String.m"; sourceTree = "<group>"; };
-		F4353D3F1AC06F31005A6198 /* GPBDictionaryTests+UInt32.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "GPBDictionaryTests+UInt32.m"; sourceTree = "<group>"; };
-		F4353D401AC06F31005A6198 /* GPBDictionaryTests+UInt64.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "GPBDictionaryTests+UInt64.m"; sourceTree = "<group>"; };
-		F43725921AC9835D004DCAFB /* GPBDictionary_PackagePrivate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GPBDictionary_PackagePrivate.h; sourceTree = "<group>"; };
-		F43C88CF191D77FC009E917D /* text_format_unittest_data.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = text_format_unittest_data.txt; sourceTree = "<group>"; };
-		F4411BE81AF1301700324B4A /* GPBArray_PackagePrivate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GPBArray_PackagePrivate.h; sourceTree = "<group>"; };
-		F4487C6E1A9F8F8100531423 /* libTestSingleSourceBuild.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libTestSingleSourceBuild.a; sourceTree = BUILT_PRODUCTS_DIR; };
-		F4487C701A9F906200531423 /* GPBArray.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPBArray.h; sourceTree = "<group>"; };
-		F4487C711A9F906200531423 /* GPBArray.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBArray.m; sourceTree = "<group>"; };
-		F4487C761AADF84900531423 /* GPBMessageTests+Runtime.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "GPBMessageTests+Runtime.m"; sourceTree = "<group>"; };
-		F4487C7A1AADFB5500531423 /* unittest_runtime_proto2.proto */ = {isa = PBXFileReference; lastKnownFileType = text; path = unittest_runtime_proto2.proto; sourceTree = "<group>"; };
-		F4487C7B1AADFB5500531423 /* unittest_runtime_proto3.proto */ = {isa = PBXFileReference; lastKnownFileType = text; path = unittest_runtime_proto3.proto; sourceTree = "<group>"; };
-		F4487C7D1AAE06C500531423 /* GPBUtilities_PackagePrivate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GPBUtilities_PackagePrivate.h; sourceTree = "<group>"; };
-		F4487C801AAF62FC00531423 /* GPBMessageTests+Serialization.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "GPBMessageTests+Serialization.m"; sourceTree = "<group>"; };
-		F4487C841AAF6AC500531423 /* GPBMessageTests+Merge.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "GPBMessageTests+Merge.m"; sourceTree = "<group>"; };
-		F44929021C866B3B00C2548A /* GPBCodedOutputStream_PackagePrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPBCodedOutputStream_PackagePrivate.h; sourceTree = "<group>"; };
-		F451D3F61A8AAEA600B8A22C /* GPBProtocolBuffers_RuntimeSupport.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GPBProtocolBuffers_RuntimeSupport.h; sourceTree = "<group>"; };
-		F4584D801ECCB39E00803AB6 /* GPBExtensionRegistryTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GPBExtensionRegistryTest.m; path = Tests/GPBExtensionRegistryTest.m; sourceTree = SOURCE_ROOT; };
-		F45C69CB16DFD08D0081955B /* GPBExtensionInternals.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBExtensionInternals.m; sourceTree = "<group>"; };
-		F45E57C81AE6DC98000B7D99 /* text_format_map_unittest_data.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = text_format_map_unittest_data.txt; sourceTree = "<group>"; };
-		F47CF94723D903C500C7B24C /* GPBFieldMask.pbobjc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPBFieldMask.pbobjc.h; sourceTree = "<group>"; };
-		F47CF94823D903C500C7B24C /* GPBDuration.pbobjc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPBDuration.pbobjc.h; sourceTree = "<group>"; };
-		F47CF94923D903C500C7B24C /* GPBApi.pbobjc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPBApi.pbobjc.h; sourceTree = "<group>"; };
-		F47CF94A23D903C500C7B24C /* GPBEmpty.pbobjc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPBEmpty.pbobjc.h; sourceTree = "<group>"; };
-		F47CF94B23D903C600C7B24C /* GPBDuration.pbobjc.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBDuration.pbobjc.m; sourceTree = "<group>"; };
-		F47CF94C23D903C600C7B24C /* GPBWrappers.pbobjc.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBWrappers.pbobjc.m; sourceTree = "<group>"; };
-		F47CF94D23D903C600C7B24C /* GPBWrappers.pbobjc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPBWrappers.pbobjc.h; sourceTree = "<group>"; };
-		F47CF94E23D903C600C7B24C /* GPBFieldMask.pbobjc.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBFieldMask.pbobjc.m; sourceTree = "<group>"; };
-		F47CF94F23D903C600C7B24C /* GPBStruct.pbobjc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPBStruct.pbobjc.h; sourceTree = "<group>"; };
-		F47CF95023D903C600C7B24C /* GPBStruct.pbobjc.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBStruct.pbobjc.m; sourceTree = "<group>"; };
-		F47CF95123D903C600C7B24C /* GPBApi.pbobjc.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBApi.pbobjc.m; sourceTree = "<group>"; };
-		F47CF95223D903C600C7B24C /* GPBSourceContext.pbobjc.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBSourceContext.pbobjc.m; sourceTree = "<group>"; };
-		F47CF95323D903C600C7B24C /* GPBEmpty.pbobjc.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBEmpty.pbobjc.m; sourceTree = "<group>"; };
-		F47CF95423D903C600C7B24C /* GPBAny.pbobjc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPBAny.pbobjc.h; sourceTree = "<group>"; };
-		F47CF95523D903C600C7B24C /* GPBTimestamp.pbobjc.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBTimestamp.pbobjc.m; sourceTree = "<group>"; };
-		F47CF95623D903C600C7B24C /* GPBType.pbobjc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPBType.pbobjc.h; sourceTree = "<group>"; };
-		F47CF95723D903C600C7B24C /* GPBTimestamp.pbobjc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPBTimestamp.pbobjc.h; sourceTree = "<group>"; };
-		F47CF95823D903C600C7B24C /* GPBType.pbobjc.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBType.pbobjc.m; sourceTree = "<group>"; };
-		F47CF95923D903C600C7B24C /* GPBAny.pbobjc.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBAny.pbobjc.m; sourceTree = "<group>"; };
-		F47CF95A23D903C600C7B24C /* GPBSourceContext.pbobjc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPBSourceContext.pbobjc.h; sourceTree = "<group>"; };
-		F4AC9E1C1A8BEB1000BD6E83 /* unittest_cycle.proto */ = {isa = PBXFileReference; lastKnownFileType = text; path = unittest_cycle.proto; sourceTree = "<group>"; };
-		F4B51B1B1BBC5C7100744318 /* GPBObjectiveCPlusPlusTest.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GPBObjectiveCPlusPlusTest.mm; sourceTree = "<group>"; };
-		F4B6B8B01A9CC99500892426 /* GPBUnknownField_PackagePrivate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GPBUnknownField_PackagePrivate.h; sourceTree = "<group>"; };
-		F4B6B8B11A9CCBBB00892426 /* GPBUnknownFieldSet_PackagePrivate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GPBUnknownFieldSet_PackagePrivate.h; sourceTree = "<group>"; };
-		F4B6B8B31A9CD1C600892426 /* GPBExtensionInternals.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GPBExtensionInternals.h; sourceTree = "<group>"; };
-		F4B6B8B51A9CD1C600892426 /* GPBRootObject_PackagePrivate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GPBRootObject_PackagePrivate.h; sourceTree = "<group>"; };
-		F4C4B9E51E1D97BB00D3B61D /* GPBDictionaryTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBDictionaryTests.m; sourceTree = "<group>"; };
-		F4CF31711B162EF500BD9B06 /* unittest_objc_startup.proto */ = {isa = PBXFileReference; lastKnownFileType = text; path = unittest_objc_startup.proto; sourceTree = "<group>"; };
-		F4E675D81B21D1DE0054530B /* any.proto */ = {isa = PBXFileReference; lastKnownFileType = text; name = any.proto; path = ../src/google/protobuf/any.proto; sourceTree = "<group>"; };
-		F4E675D91B21D1DE0054530B /* api.proto */ = {isa = PBXFileReference; lastKnownFileType = text; name = api.proto; path = ../src/google/protobuf/api.proto; sourceTree = "<group>"; };
-		F4E675DA1B21D1DE0054530B /* empty.proto */ = {isa = PBXFileReference; lastKnownFileType = text; name = empty.proto; path = ../src/google/protobuf/empty.proto; sourceTree = "<group>"; };
-		F4E675DB1B21D1DE0054530B /* field_mask.proto */ = {isa = PBXFileReference; lastKnownFileType = text; name = field_mask.proto; path = ../src/google/protobuf/field_mask.proto; sourceTree = "<group>"; };
-		F4E675DC1B21D1DE0054530B /* source_context.proto */ = {isa = PBXFileReference; lastKnownFileType = text; name = source_context.proto; path = ../src/google/protobuf/source_context.proto; sourceTree = "<group>"; };
-		F4E675DD1B21D1DE0054530B /* struct.proto */ = {isa = PBXFileReference; lastKnownFileType = text; name = struct.proto; path = ../src/google/protobuf/struct.proto; sourceTree = "<group>"; };
-		F4E675DE1B21D1DE0054530B /* type.proto */ = {isa = PBXFileReference; lastKnownFileType = text; name = type.proto; path = ../src/google/protobuf/type.proto; sourceTree = "<group>"; };
-		F4E675DF1B21D1DE0054530B /* wrappers.proto */ = {isa = PBXFileReference; lastKnownFileType = text; name = wrappers.proto; path = ../src/google/protobuf/wrappers.proto; sourceTree = "<group>"; };
-		F4F53F8B219CC5DF001EABF4 /* text_format_extensions_unittest_data.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = text_format_extensions_unittest_data.txt; sourceTree = "<group>"; };
-		F4F8D8841D78A186002CE128 /* GPBUnittestProtos2.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBUnittestProtos2.m; sourceTree = "<group>"; };
-/* End PBXFileReference section */
-
-/* Begin PBXFrameworksBuildPhase section */
-		7461B52C0F94FAF800A0C422 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				7461B5360F94FB4600A0C422 /* Foundation.framework in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		8BBEA4A3147C727100C4ADB7 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				8BBEA4BB147C729200C4ADB7 /* libProtocolBuffers.a in Frameworks */,
-				8B9A5EEC18330A0F00A9D33B /* UIKit.framework in Frameworks */,
-				8BF8193514A0DDA600A2C982 /* Foundation.framework in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		F4487C691A9F8F8100531423 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				F4487C6A1A9F8F8100531423 /* Foundation.framework in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXFrameworksBuildPhase section */
-
-/* Begin PBXGroup section */
-		080E96DDFE201D6D7F000001 /* Core Source */ = {
-			isa = PBXGroup;
-			children = (
-				7461B4CD0F94F99000A0C422 /* GPBProtocolBuffers.h */,
-				F451D3F61A8AAEA600B8A22C /* GPBProtocolBuffers_RuntimeSupport.h */,
-				8BCF338814ED799900BC5317 /* GPBProtocolBuffers.m */,
-				7461B3C50F94F84100A0C422 /* Extensions */,
-				7461B4850F94F96600A0C422 /* Fields */,
-				7461B4860F94F96B00A0C422 /* IO */,
-				7461B5150F94FA7300A0C422 /* Messages */,
-				8BCF334414ED727300BC5317 /* Support */,
-				29B97315FDCFA39411CA2CEA /* Generated */,
-			);
-			name = "Core Source";
-			sourceTree = "<group>";
-		};
-		19C28FACFE9D520D11CA2CBB /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				7461B52E0F94FAF800A0C422 /* libProtocolBuffers.a */,
-				8BBEA4A6147C727100C4ADB7 /* UnitTests.xctest */,
-				F4487C6E1A9F8F8100531423 /* libTestSingleSourceBuild.a */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
-		29B97314FDCFA39411CA2CEA /* CustomTemplate */ = {
-			isa = PBXGroup;
-			children = (
-				080E96DDFE201D6D7F000001 /* Core Source */,
-				7461B6940F94FDDD00A0C422 /* Tests */,
-				29B97323FDCFA39411CA2CEA /* Frameworks */,
-				19C28FACFE9D520D11CA2CBB /* Products */,
-			);
-			name = CustomTemplate;
-			sourceTree = "<group>";
-		};
-		29B97315FDCFA39411CA2CEA /* Generated */ = {
-			isa = PBXGroup;
-			children = (
-				F47CF95423D903C600C7B24C /* GPBAny.pbobjc.h */,
-				F47CF95923D903C600C7B24C /* GPBAny.pbobjc.m */,
-				F47CF94923D903C500C7B24C /* GPBApi.pbobjc.h */,
-				F47CF95123D903C600C7B24C /* GPBApi.pbobjc.m */,
-				F47CF94823D903C500C7B24C /* GPBDuration.pbobjc.h */,
-				F47CF94B23D903C600C7B24C /* GPBDuration.pbobjc.m */,
-				F47CF94A23D903C500C7B24C /* GPBEmpty.pbobjc.h */,
-				F47CF95323D903C600C7B24C /* GPBEmpty.pbobjc.m */,
-				F47CF94723D903C500C7B24C /* GPBFieldMask.pbobjc.h */,
-				F47CF94E23D903C600C7B24C /* GPBFieldMask.pbobjc.m */,
-				F47CF95A23D903C600C7B24C /* GPBSourceContext.pbobjc.h */,
-				F47CF95223D903C600C7B24C /* GPBSourceContext.pbobjc.m */,
-				F47CF94F23D903C600C7B24C /* GPBStruct.pbobjc.h */,
-				F47CF95023D903C600C7B24C /* GPBStruct.pbobjc.m */,
-				F47CF95723D903C600C7B24C /* GPBTimestamp.pbobjc.h */,
-				F47CF95523D903C600C7B24C /* GPBTimestamp.pbobjc.m */,
-				F47CF95623D903C600C7B24C /* GPBType.pbobjc.h */,
-				F47CF95823D903C600C7B24C /* GPBType.pbobjc.m */,
-				F47CF94D23D903C600C7B24C /* GPBWrappers.pbobjc.h */,
-				F47CF94C23D903C600C7B24C /* GPBWrappers.pbobjc.m */,
-				F4E675D81B21D1DE0054530B /* any.proto */,
-				F4E675D91B21D1DE0054530B /* api.proto */,
-				8B42494A1A92A0BA00BC1EC6 /* duration.proto */,
-				F4E675DA1B21D1DE0054530B /* empty.proto */,
-				F4E675DB1B21D1DE0054530B /* field_mask.proto */,
-				F4E675DC1B21D1DE0054530B /* source_context.proto */,
-				F4E675DD1B21D1DE0054530B /* struct.proto */,
-				8B4249481A92A02300BC1EC6 /* timestamp.proto */,
-				F4E675DE1B21D1DE0054530B /* type.proto */,
-				F4E675DF1B21D1DE0054530B /* wrappers.proto */,
-			);
-			name = Generated;
-			sourceTree = "<group>";
-		};
-		29B97323FDCFA39411CA2CEA /* Frameworks */ = {
-			isa = PBXGroup;
-			children = (
-				8B9742421A8AAA7800DCE92C /* CoreGraphics.framework */,
-				8B9A5E9F1831913D00A9D33B /* UIKit.framework */,
-				1D30AB110D05D00D00671497 /* Foundation.framework */,
-			);
-			name = Frameworks;
-			sourceTree = "<group>";
-		};
-		7461B3C50F94F84100A0C422 /* Extensions */ = {
-			isa = PBXGroup;
-			children = (
-				F4B6B8B31A9CD1C600892426 /* GPBExtensionInternals.h */,
-				F45C69CB16DFD08D0081955B /* GPBExtensionInternals.m */,
-				7461B4A80F94F99000A0C422 /* GPBExtensionRegistry.h */,
-				7461B4A90F94F99000A0C422 /* GPBExtensionRegistry.m */,
-				F4B6B8B51A9CD1C600892426 /* GPBRootObject_PackagePrivate.h */,
-				8B79657814992E3E002FFBFC /* GPBRootObject.h */,
-				8B79657914992E3E002FFBFC /* GPBRootObject.m */,
-			);
-			name = Extensions;
-			sourceTree = "<group>";
-		};
-		7461B4850F94F96600A0C422 /* Fields */ = {
-			isa = PBXGroup;
-			children = (
-				F4B6B8B01A9CC99500892426 /* GPBUnknownField_PackagePrivate.h */,
-				7461B4AE0F94F99000A0C422 /* GPBUnknownField.h */,
-				7461B4AF0F94F99000A0C422 /* GPBUnknownField.m */,
-				F4B6B8B11A9CCBBB00892426 /* GPBUnknownFieldSet_PackagePrivate.h */,
-				7461B4E10F94F99000A0C422 /* GPBUnknownFieldSet.h */,
-				7461B4E20F94F99000A0C422 /* GPBUnknownFieldSet.m */,
-			);
-			name = Fields;
-			sourceTree = "<group>";
-		};
-		7461B4860F94F96B00A0C422 /* IO */ = {
-			isa = PBXGroup;
-			children = (
-				51457B5F18D0B7AF00CCC606 /* GPBCodedInputStream_PackagePrivate.h */,
-				7461B48E0F94F99000A0C422 /* GPBCodedInputStream.h */,
-				7461B48F0F94F99000A0C422 /* GPBCodedInputStream.m */,
-				F44929021C866B3B00C2548A /* GPBCodedOutputStream_PackagePrivate.h */,
-				7461B4900F94F99000A0C422 /* GPBCodedOutputStream.h */,
-				7461B4910F94F99000A0C422 /* GPBCodedOutputStream.m */,
-				7461B4E70F94F99000A0C422 /* GPBWireFormat.h */,
-				7461B4E80F94F99000A0C422 /* GPBWireFormat.m */,
-			);
-			name = IO;
-			sourceTree = "<group>";
-		};
-		7461B5150F94FA7300A0C422 /* Messages */ = {
-			isa = PBXGroup;
-			children = (
-				515B840C18B7DEE30031753B /* GPBDescriptor_PackagePrivate.h */,
-				8B96157214C8B06000A2AC0B /* GPBDescriptor.h */,
-				8B96157314C8C38C00A2AC0B /* GPBDescriptor.m */,
-				7461B4BE0F94F99000A0C422 /* GPBMessage.h */,
-				5196A06918CE16B000B759E2 /* GPBMessage_PackagePrivate.h */,
-				7461B4BF0F94F99000A0C422 /* GPBMessage.m */,
-			);
-			name = Messages;
-			sourceTree = "<group>";
-		};
-		7461B6940F94FDDD00A0C422 /* Tests */ = {
-			isa = PBXGroup;
-			children = (
-				8B210CCD159383D60032D72D /* golden_message */,
-				8B210CCF159386920032D72D /* golden_packed_fields_message */,
-				8B8B615C17DF7056002EE618 /* GPBARCUnittestProtos.m */,
-				F401DC341A8E5C6F00FCC765 /* GPBArrayTests.m */,
-				7461B69B0F94FDF800A0C422 /* GPBCodedInputStreamTests.m */,
-				7461B69D0F94FDF800A0C422 /* GPBCodedOuputStreamTests.m */,
-				F40EE4CD206BF9170071091A /* GPBCompileTest01.m */,
-				F40EE4C6206BF9170071091A /* GPBCompileTest02.m */,
-				F40EE4D6206BF9190071091A /* GPBCompileTest03.m */,
-				F40EE4C3206BF9160071091A /* GPBCompileTest04.m */,
-				F40EE4C4206BF9160071091A /* GPBCompileTest05.m */,
-				F40EE4D7206BF9190071091A /* GPBCompileTest06.m */,
-				F40EE4C5206BF9170071091A /* GPBCompileTest07.m */,
-				F40EE4C2206BF9160071091A /* GPBCompileTest08.m */,
-				F40EE4C9206BF9170071091A /* GPBCompileTest09.m */,
-				F40EE4D1206BF9180071091A /* GPBCompileTest10.m */,
-				F40EE4D8206BF9190071091A /* GPBCompileTest11.m */,
-				F40EE4D5206BF9180071091A /* GPBCompileTest12.m */,
-				F40EE4C8206BF9170071091A /* GPBCompileTest13.m */,
-				F40EE4D4206BF9180071091A /* GPBCompileTest14.m */,
-				F40EE4CE206BF9170071091A /* GPBCompileTest15.m */,
-				F40EE4D0206BF9180071091A /* GPBCompileTest16.m */,
-				F40EE4D2206BF9180071091A /* GPBCompileTest17.m */,
-				F40EE4D3206BF9180071091A /* GPBCompileTest18.m */,
-				F40EE4C7206BF9170071091A /* GPBCompileTest19.m */,
-				F40EE4CA206BF9170071091A /* GPBCompileTest20.m */,
-				F40EE4CB206BF9170071091A /* GPBCompileTest21.m */,
-				F40EE4CF206BF9170071091A /* GPBCompileTest22.m */,
-				F40EE4CC206BF9170071091A /* GPBCompileTest23.m */,
-				F40EE50E206C06880071091A /* GPBCompileTest24.m */,
-				F40EE50D206C06880071091A /* GPBCompileTest25.m */,
-				5102DABB1891A052002037B6 /* GPBConcurrencyTests.m */,
-				F4353D1E1AB88243005A6198 /* GPBDescriptorTests.m */,
-				F4C4B9E51E1D97BB00D3B61D /* GPBDictionaryTests.m */,
-				F4353D3A1AC06F31005A6198 /* GPBDictionaryTests.pddm */,
-				F4353D3B1AC06F31005A6198 /* GPBDictionaryTests+Bool.m */,
-				F4353D3C1AC06F31005A6198 /* GPBDictionaryTests+Int32.m */,
-				F4353D3D1AC06F31005A6198 /* GPBDictionaryTests+Int64.m */,
-				F4353D3E1AC06F31005A6198 /* GPBDictionaryTests+String.m */,
-				F4353D3F1AC06F31005A6198 /* GPBDictionaryTests+UInt32.m */,
-				F4353D401AC06F31005A6198 /* GPBDictionaryTests+UInt64.m */,
-				F4584D801ECCB39E00803AB6 /* GPBExtensionRegistryTest.m */,
-				7461B6A30F94FDF800A0C422 /* GPBMessageTests.m */,
-				F4487C841AAF6AC500531423 /* GPBMessageTests+Merge.m */,
-				F4487C761AADF84900531423 /* GPBMessageTests+Runtime.m */,
-				8BFF9D1B23AD593B00E63E32 /* GPBMessageTests+ClassNames.m */,
-				F4487C801AAF62FC00531423 /* GPBMessageTests+Serialization.m */,
-				F4B51B1B1BBC5C7100744318 /* GPBObjectiveCPlusPlusTest.mm */,
-				F41C175C1833D3310064ED4D /* GPBPerfTests.m */,
-				8B4248B31A8BD96E00BC1EC6 /* GPBSwiftTests.swift */,
-				7461B6AB0F94FDF800A0C422 /* GPBTestUtilities.h */,
-				7461B6AC0F94FDF800A0C422 /* GPBTestUtilities.m */,
-				8BD3981E14BE59D70081D629 /* GPBUnittestProtos.m */,
-				F4F8D8841D78A186002CE128 /* GPBUnittestProtos2.m */,
-				7461B6B80F94FDF900A0C422 /* GPBUnknownFieldSetTest.m */,
-				7461B6BA0F94FDF900A0C422 /* GPBUtilitiesTests.m */,
-				8B4248E51A929C9900BC1EC6 /* GPBWellKnownTypesTest.m */,
-				7461B6BC0F94FDF900A0C422 /* GPBWireFormatTests.m */,
-				F4F53F8B219CC5DF001EABF4 /* text_format_extensions_unittest_data.txt */,
-				F45E57C81AE6DC98000B7D99 /* text_format_map_unittest_data.txt */,
-				F43C88CF191D77FC009E917D /* text_format_unittest_data.txt */,
-				8B7E6A7414893DBA00F8884A /* unittest_custom_options.proto */,
-				F4AC9E1C1A8BEB1000BD6E83 /* unittest_cycle.proto */,
-				8B7E6A7514893DBA00F8884A /* unittest_embed_optimize_for.proto */,
-				8B7E6A7614893DBA00F8884A /* unittest_empty.proto */,
-				8BD3981D14BE54220081D629 /* unittest_enormous_descriptor.proto */,
-				8B7E6A7814893DBB00F8884A /* unittest_import.proto */,
-				8BBD9DB016DD1DC8008E1EC1 /* unittest_lite.proto */,
-				8B7E6A7B14893DBC00F8884A /* unittest_mset.proto */,
-				8B7E6A7C14893DBC00F8884A /* unittest_no_generic_services.proto */,
-				8B35468621A61EB2000BD30D /* unittest_objc_options.proto */,
-				F4CF31711B162EF500BD9B06 /* unittest_objc_startup.proto */,
-				8B09AAF614B663A7007B4184 /* unittest_objc.proto */,
-				8B7E6A7D14893DBC00F8884A /* unittest_optimize_for.proto */,
-				F4487C7A1AADFB5500531423 /* unittest_runtime_proto2.proto */,
-				F4487C7B1AADFB5500531423 /* unittest_runtime_proto3.proto */,
-				8B7E6A7E14893DBC00F8884A /* unittest.proto */,
-				8B4248B21A8BD96D00BC1EC6 /* UnitTests-Bridging-Header.h */,
-				7401C1A90F950347006D8281 /* UnitTests-Info.plist */,
-			);
-			path = Tests;
-			sourceTree = "<group>";
-		};
-		8BCF334414ED727300BC5317 /* Support */ = {
-			isa = PBXGroup;
-			children = (
-				F4411BE81AF1301700324B4A /* GPBArray_PackagePrivate.h */,
-				F4487C701A9F906200531423 /* GPBArray.h */,
-				F4487C711A9F906200531423 /* GPBArray.m */,
-				7461B48D0F94F99000A0C422 /* GPBBootstrap.h */,
-				F43725921AC9835D004DCAFB /* GPBDictionary_PackagePrivate.h */,
-				F4353D241ABB156F005A6198 /* GPBDictionary.h */,
-				F4353D251ABB156F005A6198 /* GPBDictionary.m */,
-				8BEB5AE01498033E0078BF9D /* GPBRuntimeTypes.h */,
-				F4487C7D1AAE06C500531423 /* GPBUtilities_PackagePrivate.h */,
-				7461B4E50F94F99000A0C422 /* GPBUtilities.h */,
-				7461B4E60F94F99000A0C422 /* GPBUtilities.m */,
-				8B4248E11A929C8900BC1EC6 /* GPBWellKnownTypes.h */,
-				8B4248E21A929C8900BC1EC6 /* GPBWellKnownTypes.m */,
-			);
-			name = Support;
-			sourceTree = "<group>";
-		};
-/* End PBXGroup section */
-
-/* Begin PBXHeadersBuildPhase section */
-		7461B52A0F94FAF800A0C422 /* Headers */ = {
-			isa = PBXHeadersBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		F4487C561A9F8F8100531423 /* Headers */ = {
-			isa = PBXHeadersBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXHeadersBuildPhase section */
-
-/* Begin PBXLegacyTarget section */
-		F45BBC0E1B0CDB50002D064D /* Compile Unittest Protos */ = {
-			isa = PBXLegacyTarget;
-			buildArgumentsString = "$(ACTION)";
-			buildConfigurationList = F45BBC111B0CDB50002D064D /* Build configuration list for PBXLegacyTarget "Compile Unittest Protos" */;
-			buildPhases = (
-			);
-			buildToolPath = DevTools/compile_testing_protos.sh;
-			buildWorkingDirectory = "";
-			dependencies = (
-			);
-			name = "Compile Unittest Protos";
-			passBuildSettingsInEnvironment = 1;
-			productName = "Compile Unittest Protos";
-		};
-/* End PBXLegacyTarget section */
-
-/* Begin PBXNativeTarget section */
-		7461B52D0F94FAF800A0C422 /* ProtocolBuffers */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 7461B5330F94FAFD00A0C422 /* Build configuration list for PBXNativeTarget "ProtocolBuffers" */;
-			buildPhases = (
-				7461B52A0F94FAF800A0C422 /* Headers */,
-				7461B52B0F94FAF800A0C422 /* Sources */,
-				7461B52C0F94FAF800A0C422 /* Frameworks */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = ProtocolBuffers;
-			productName = "ProtocolBuffers-iPhoneDevice";
-			productReference = 7461B52E0F94FAF800A0C422 /* libProtocolBuffers.a */;
-			productType = "com.apple.product-type.library.static";
-		};
-		8BBEA4A5147C727100C4ADB7 /* UnitTests */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 8BBEA4BA147C728600C4ADB7 /* Build configuration list for PBXNativeTarget "UnitTests" */;
-			buildPhases = (
-				F4B62A791AF91F7500AFCEDC /* Script: Check Runtime Stamps */,
-				8BBEA4A1147C727100C4ADB7 /* Resources */,
-				8BBEA4A2147C727100C4ADB7 /* Sources */,
-				8BBEA4A3147C727100C4ADB7 /* Frameworks */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-				8BBEA4BD147C729A00C4ADB7 /* PBXTargetDependency */,
-				F45BBC131B0CDBBA002D064D /* PBXTargetDependency */,
-			);
-			name = UnitTests;
-			productName = UnitTests;
-			productReference = 8BBEA4A6147C727100C4ADB7 /* UnitTests.xctest */;
-			productType = "com.apple.product-type.bundle.unit-test";
-		};
-		F4487C551A9F8F8100531423 /* TestSingleSourceBuild */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = F4487C6B1A9F8F8100531423 /* Build configuration list for PBXNativeTarget "TestSingleSourceBuild" */;
-			buildPhases = (
-				F4487C561A9F8F8100531423 /* Headers */,
-				F4487C5A1A9F8F8100531423 /* Sources */,
-				F4487C691A9F8F8100531423 /* Frameworks */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = TestSingleSourceBuild;
-			productName = "ProtocolBuffers-iPhoneDevice";
-			productReference = F4487C6E1A9F8F8100531423 /* libTestSingleSourceBuild.a */;
-			productType = "com.apple.product-type.library.static";
-		};
-/* End PBXNativeTarget section */
-
-/* Begin PBXProject section */
-		29B97313FDCFA39411CA2CEA /* Project object */ = {
-			isa = PBXProject;
-			attributes = {
-				LastSwiftUpdateCheck = 0710;
-				LastTestingUpgradeCheck = 0600;
-				LastUpgradeCheck = 0930;
-				TargetAttributes = {
-					8BBEA4A5147C727100C4ADB7 = {
-						LastSwiftMigration = 0940;
-						TestTargetID = 8B9A5EA41831993600A9D33B;
-					};
-					F45BBC0E1B0CDB50002D064D = {
-						CreatedOnToolsVersion = 6.3.2;
-					};
-				};
-			};
-			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "ProtocolBuffers_iOS" */;
-			compatibilityVersion = "Xcode 6.3";
-			developmentRegion = English;
-			hasScannedForEncodings = 1;
-			knownRegions = (
-				English,
-				en,
-			);
-			mainGroup = 29B97314FDCFA39411CA2CEA /* CustomTemplate */;
-			projectDirPath = "";
-			projectRoot = "";
-			targets = (
-				7461B52D0F94FAF800A0C422 /* ProtocolBuffers */,
-				8BBEA4A5147C727100C4ADB7 /* UnitTests */,
-				F4487C551A9F8F8100531423 /* TestSingleSourceBuild */,
-				F45BBC0E1B0CDB50002D064D /* Compile Unittest Protos */,
-			);
-		};
-/* End PBXProject section */
-
-/* Begin PBXResourcesBuildPhase section */
-		8BBEA4A1147C727100C4ADB7 /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				8B210CCE159383D60032D72D /* golden_message in Resources */,
-				F4F53F8C219CC5DF001EABF4 /* text_format_extensions_unittest_data.txt in Resources */,
-				F43C88D0191D77FC009E917D /* text_format_unittest_data.txt in Resources */,
-				8B210CD0159386920032D72D /* golden_packed_fields_message in Resources */,
-				F45E57C91AE6DC98000B7D99 /* text_format_map_unittest_data.txt in Resources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXResourcesBuildPhase section */
-
-/* Begin PBXShellScriptBuildPhase section */
-		F4B62A791AF91F7500AFCEDC /* Script: Check Runtime Stamps */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "Script: Check Runtime Stamps";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "set -eu\nexec \"${SOURCE_ROOT}/DevTools/check_version_stamps.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
-/* End PBXShellScriptBuildPhase section */
-
-/* Begin PBXSourcesBuildPhase section */
-		7461B52B0F94FAF800A0C422 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				7461B53C0F94FB4E00A0C422 /* GPBCodedInputStream.m in Sources */,
-				F47CF96D23D903C600C7B24C /* GPBAny.pbobjc.m in Sources */,
-				F47CF96623D903C600C7B24C /* GPBSourceContext.pbobjc.m in Sources */,
-				F47CF96C23D903C600C7B24C /* GPBType.pbobjc.m in Sources */,
-				F47CF96423D903C600C7B24C /* GPBStruct.pbobjc.m in Sources */,
-				F47CF96723D903C600C7B24C /* GPBEmpty.pbobjc.m in Sources */,
-				F4487C731A9F906200531423 /* GPBArray.m in Sources */,
-				7461B53D0F94FB4E00A0C422 /* GPBCodedOutputStream.m in Sources */,
-				7461B5490F94FB4E00A0C422 /* GPBExtensionRegistry.m in Sources */,
-				F47CF95F23D903C600C7B24C /* GPBDuration.pbobjc.m in Sources */,
-				7461B54C0F94FB4E00A0C422 /* GPBUnknownField.m in Sources */,
-				7461B5530F94FB4E00A0C422 /* GPBMessage.m in Sources */,
-				7461B5610F94FB4E00A0C422 /* GPBUnknownFieldSet.m in Sources */,
-				7461B5630F94FB4E00A0C422 /* GPBUtilities.m in Sources */,
-				7461B5640F94FB4E00A0C422 /* GPBWireFormat.m in Sources */,
-				F47CF96023D903C600C7B24C /* GPBWrappers.pbobjc.m in Sources */,
-				F47CF96523D903C600C7B24C /* GPBApi.pbobjc.m in Sources */,
-				F4353D271ABB156F005A6198 /* GPBDictionary.m in Sources */,
-				8B79657B14992E3F002FFBFC /* GPBRootObject.m in Sources */,
-				F47CF96223D903C600C7B24C /* GPBFieldMask.pbobjc.m in Sources */,
-				8B96157414C8C38C00A2AC0B /* GPBDescriptor.m in Sources */,
-				F45C69CC16DFD08D0081955B /* GPBExtensionInternals.m in Sources */,
-				8B4248E41A929C8900BC1EC6 /* GPBWellKnownTypes.m in Sources */,
-				F47CF96923D903C600C7B24C /* GPBTimestamp.pbobjc.m in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		8BBEA4A2147C727100C4ADB7 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				8BBEA4A9147C727D00C4ADB7 /* GPBCodedInputStreamTests.m in Sources */,
-				F40EE511206C068D0071091A /* GPBCompileTest24.m in Sources */,
-				F40EE503206BF91E0071091A /* GPBCompileTest20.m in Sources */,
-				F401DC351A8E5C6F00FCC765 /* GPBArrayTests.m in Sources */,
-				F40EE4F9206BF91E0071091A /* GPBCompileTest10.m in Sources */,
-				F4353D441AC06F31005A6198 /* GPBDictionaryTests+Int64.m in Sources */,
-				F40EE505206BF91E0071091A /* GPBCompileTest22.m in Sources */,
-				F40EE4F7206BF91E0071091A /* GPBCompileTest08.m in Sources */,
-				F40EE500206BF91E0071091A /* GPBCompileTest17.m in Sources */,
-				F4353D471AC06F31005A6198 /* GPBDictionaryTests+UInt64.m in Sources */,
-				8BBEA4AA147C727D00C4ADB7 /* GPBCodedOuputStreamTests.m in Sources */,
-				F40EE506206BF91E0071091A /* GPBCompileTest23.m in Sources */,
-				8BBEA4AC147C727D00C4ADB7 /* GPBMessageTests.m in Sources */,
-				F4487C811AAF62FC00531423 /* GPBMessageTests+Serialization.m in Sources */,
-				F40EE502206BF91E0071091A /* GPBCompileTest19.m in Sources */,
-				F40EE4F5206BF91E0071091A /* GPBCompileTest06.m in Sources */,
-				F40EE4FB206BF91E0071091A /* GPBCompileTest12.m in Sources */,
-				8B4248E61A929C9900BC1EC6 /* GPBWellKnownTypesTest.m in Sources */,
-				F40EE4F2206BF91E0071091A /* GPBCompileTest03.m in Sources */,
-				F40EE501206BF91E0071091A /* GPBCompileTest18.m in Sources */,
-				F40EE4FC206BF91E0071091A /* GPBCompileTest13.m in Sources */,
-				F40EE4FE206BF91E0071091A /* GPBCompileTest15.m in Sources */,
-				F40EE4F6206BF91E0071091A /* GPBCompileTest07.m in Sources */,
-				F4353D1F1AB88243005A6198 /* GPBDescriptorTests.m in Sources */,
-				F40EE504206BF91E0071091A /* GPBCompileTest21.m in Sources */,
-				F40EE4FA206BF91E0071091A /* GPBCompileTest11.m in Sources */,
-				F4F8D8861D78A193002CE128 /* GPBUnittestProtos2.m in Sources */,
-				F4B51B1C1BBC5C7100744318 /* GPBObjectiveCPlusPlusTest.mm in Sources */,
-				8B4248B41A8BD96E00BC1EC6 /* GPBSwiftTests.swift in Sources */,
-				F40EE512206C068D0071091A /* GPBCompileTest25.m in Sources */,
-				F4584D831ECCB53600803AB6 /* GPBExtensionRegistryTest.m in Sources */,
-				8BFF9D1C23AD593C00E63E32 /* GPBMessageTests+ClassNames.m in Sources */,
-				5102DABC1891A073002037B6 /* GPBConcurrencyTests.m in Sources */,
-				F4487C771AADF84900531423 /* GPBMessageTests+Runtime.m in Sources */,
-				F40EE4F1206BF91E0071091A /* GPBCompileTest02.m in Sources */,
-				F4353D431AC06F31005A6198 /* GPBDictionaryTests+Int32.m in Sources */,
-				F40EE4F4206BF91E0071091A /* GPBCompileTest05.m in Sources */,
-				F40EE4FD206BF91E0071091A /* GPBCompileTest14.m in Sources */,
-				8BBEA4B0147C727D00C4ADB7 /* GPBTestUtilities.m in Sources */,
-				F40EE4F3206BF91E0071091A /* GPBCompileTest04.m in Sources */,
-				F40EE4FF206BF91E0071091A /* GPBCompileTest16.m in Sources */,
-				F41C175D1833D3310064ED4D /* GPBPerfTests.m in Sources */,
-				F4353D421AC06F31005A6198 /* GPBDictionaryTests+Bool.m in Sources */,
-				F4487C851AAF6AC500531423 /* GPBMessageTests+Merge.m in Sources */,
-				F40EE4F0206BF91E0071091A /* GPBCompileTest01.m in Sources */,
-				8BBEA4B6147C727D00C4ADB7 /* GPBUnknownFieldSetTest.m in Sources */,
-				F4353D451AC06F31005A6198 /* GPBDictionaryTests+String.m in Sources */,
-				F4353D461AC06F31005A6198 /* GPBDictionaryTests+UInt32.m in Sources */,
-				F40EE4F8206BF91E0071091A /* GPBCompileTest09.m in Sources */,
-				8BBEA4B7147C727D00C4ADB7 /* GPBUtilitiesTests.m in Sources */,
-				F4C4B9E71E1D97BF00D3B61D /* GPBDictionaryTests.m in Sources */,
-				8BBEA4B8147C727D00C4ADB7 /* GPBWireFormatTests.m in Sources */,
-				8BD3981F14BE59D70081D629 /* GPBUnittestProtos.m in Sources */,
-				8B8B615D17DF7056002EE618 /* GPBARCUnittestProtos.m in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		F4487C5A1A9F8F8100531423 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				F4487C6F1A9F8FFF00531423 /* GPBProtocolBuffers.m in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXSourcesBuildPhase section */
-
-/* Begin PBXTargetDependency section */
-		8BBEA4BD147C729A00C4ADB7 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 7461B52D0F94FAF800A0C422 /* ProtocolBuffers */;
-			targetProxy = 8BBEA4BC147C729A00C4ADB7 /* PBXContainerItemProxy */;
-		};
-		F45BBC131B0CDBBA002D064D /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = F45BBC0E1B0CDB50002D064D /* Compile Unittest Protos */;
-			targetProxy = F45BBC121B0CDBBA002D064D /* PBXContainerItemProxy */;
-		};
-/* End PBXTargetDependency section */
-
-/* Begin XCBuildConfiguration section */
-		7461B52F0F94FAFA00A0C422 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				CLANG_ENABLE_OBJC_WEAK = YES;
-				PRODUCT_NAME = ProtocolBuffers;
-				SKIP_INSTALL = YES;
-				TARGETED_DEVICE_FAMILY = "1,2";
-				USER_HEADER_SEARCH_PATHS = "$(SRCROOT)";
-			};
-			name = Debug;
-		};
-		7461B5300F94FAFA00A0C422 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				CLANG_ENABLE_OBJC_WEAK = YES;
-				PRODUCT_NAME = ProtocolBuffers;
-				SKIP_INSTALL = YES;
-				TARGETED_DEVICE_FAMILY = "1,2";
-				USER_HEADER_SEARCH_PATHS = "$(SRCROOT)";
-			};
-			name = Release;
-		};
-		8BBEA4A7147C727100C4ADB7 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				CLANG_ENABLE_MODULES = YES;
-				CLANG_ENABLE_OBJC_WEAK = YES;
-				FRAMEWORK_SEARCH_PATHS = (
-					"\"$(DEVELOPER_LIBRARY_DIR)/Frameworks\"",
-					"$(inherited)",
-				);
-				INFOPLIST_FILE = "Tests/UnitTests-Info.plist";
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"\"$(DEVELOPER_DIR)/usr/lib\"",
-				);
-				OTHER_LDFLAGS = "-ObjC";
-				PRODUCT_NAME = UnitTests;
-				SWIFT_OBJC_BRIDGING_HEADER = "Tests/UnitTests-Bridging-Header.h";
-				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 4.0;
-				TARGETED_DEVICE_FAMILY = "1,2";
-				USER_HEADER_SEARCH_PATHS = "${PROJECT_DERIVED_FILE_DIR}/protos $(SRCROOT)";
-				WARNING_CFLAGS = (
-					"$(inherited)",
-					"-Wno-documentation-unknown-command",
-					"-Wno-reserved-id-macro",
-					"-Wno-direct-ivar-access",
-				);
-			};
-			name = Debug;
-		};
-		8BBEA4A8147C727100C4ADB7 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				CLANG_ENABLE_MODULES = YES;
-				CLANG_ENABLE_OBJC_WEAK = YES;
-				FRAMEWORK_SEARCH_PATHS = (
-					"\"$(DEVELOPER_LIBRARY_DIR)/Frameworks\"",
-					"$(inherited)",
-				);
-				INFOPLIST_FILE = "Tests/UnitTests-Info.plist";
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"\"$(DEVELOPER_DIR)/usr/lib\"",
-				);
-				OTHER_LDFLAGS = "-ObjC";
-				PRODUCT_NAME = UnitTests;
-				SWIFT_OBJC_BRIDGING_HEADER = "Tests/UnitTests-Bridging-Header.h";
-				SWIFT_VERSION = 4.0;
-				TARGETED_DEVICE_FAMILY = "1,2";
-				USER_HEADER_SEARCH_PATHS = "${PROJECT_DERIVED_FILE_DIR}/protos $(SRCROOT)";
-				WARNING_CFLAGS = (
-					"$(inherited)",
-					"-Wno-documentation-unknown-command",
-					"-Wno-reserved-id-macro",
-					"-Wno-direct-ivar-access",
-				);
-			};
-			name = Release;
-		};
-		C01FCF4F08A954540054247B /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				CLANG_ANALYZER_NONNULL = YES;
-				CLANG_ANALYZER_SECURITY_FLOATLOOPCOUNTER = YES;
-				CLANG_ANALYZER_SECURITY_INSECUREAPI_RAND = YES;
-				CLANG_ANALYZER_SECURITY_INSECUREAPI_STRCPY = YES;
-				CLANG_STATIC_ANALYZER_MODE = deep;
-				CLANG_WARN_ASSIGN_ENUM = YES;
-				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
-				CLANG_WARN_COMMA = YES;
-				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
-				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
-				CLANG_WARN_EMPTY_BODY = YES;
-				CLANG_WARN_INFINITE_RECURSION = YES;
-				CLANG_WARN_NULLABLE_TO_NONNULL_CONVERSION = YES;
-				CLANG_WARN_OBJC_EXPLICIT_OWNERSHIP_TYPE = YES;
-				CLANG_WARN_OBJC_IMPLICIT_ATOMIC_PROPERTIES = YES;
-				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
-				CLANG_WARN_OBJC_MISSING_PROPERTY_SYNTHESIS = YES;
-				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
-				CLANG_WARN_STRICT_PROTOTYPES = YES;
-				CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES;
-				CLANG_WARN_SUSPICIOUS_MOVE = YES;
-				CLANG_WARN_UNREACHABLE_CODE = YES_AGGRESSIVE;
-				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				ENABLE_TESTABILITY = YES;
-				GCC_C_LANGUAGE_STANDARD = c99;
-				GCC_NO_COMMON_BLOCKS = YES;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PREPROCESSOR_DEFINITIONS = "DEBUG=1";
-				GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES;
-				GCC_TREAT_INCOMPATIBLE_POINTER_TYPE_WARNINGS_AS_ERRORS = YES;
-				GCC_TREAT_WARNINGS_AS_ERRORS = YES;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES;
-				GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
-				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-				GCC_WARN_HIDDEN_VIRTUAL_FUNCTIONS = YES;
-				GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES;
-				GCC_WARN_MISSING_PARENTHESES = YES;
-				GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES;
-				GCC_WARN_SHADOW = YES;
-				GCC_WARN_SIGN_COMPARE = YES;
-				GCC_WARN_UNDECLARED_SELECTOR = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				GCC_WARN_UNKNOWN_PRAGMAS = YES;
-				GCC_WARN_UNUSED_FUNCTION = YES;
-				GCC_WARN_UNUSED_LABEL = YES;
-				GCC_WARN_UNUSED_PARAMETER = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				GENERATE_PROFILING_CODE = NO;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
-				ONLY_ACTIVE_ARCH = YES;
-				RUN_CLANG_STATIC_ANALYZER = YES;
-				SDKROOT = iphoneos;
-				WARNING_CFLAGS = (
-					"-Wdocumentation-unknown-command",
-					"-Wundef",
-					"-Wreserved-id-macro",
-					"-Wswitch-enum",
-					"-Wdirect-ivar-access",
-					"-Woverriding-method-mismatch",
-				);
-			};
-			name = Debug;
-		};
-		C01FCF5008A954540054247B /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				CLANG_ANALYZER_NONNULL = YES;
-				CLANG_ANALYZER_SECURITY_FLOATLOOPCOUNTER = YES;
-				CLANG_ANALYZER_SECURITY_INSECUREAPI_RAND = YES;
-				CLANG_ANALYZER_SECURITY_INSECUREAPI_STRCPY = YES;
-				CLANG_STATIC_ANALYZER_MODE = deep;
-				CLANG_WARN_ASSIGN_ENUM = YES;
-				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
-				CLANG_WARN_COMMA = YES;
-				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
-				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
-				CLANG_WARN_EMPTY_BODY = YES;
-				CLANG_WARN_INFINITE_RECURSION = YES;
-				CLANG_WARN_NULLABLE_TO_NONNULL_CONVERSION = YES;
-				CLANG_WARN_OBJC_EXPLICIT_OWNERSHIP_TYPE = YES;
-				CLANG_WARN_OBJC_IMPLICIT_ATOMIC_PROPERTIES = YES;
-				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
-				CLANG_WARN_OBJC_MISSING_PROPERTY_SYNTHESIS = YES;
-				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
-				CLANG_WARN_STRICT_PROTOTYPES = YES;
-				CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES;
-				CLANG_WARN_SUSPICIOUS_MOVE = YES;
-				CLANG_WARN_UNREACHABLE_CODE = YES_AGGRESSIVE;
-				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				ENABLE_NS_ASSERTIONS = NO;
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				GCC_C_LANGUAGE_STANDARD = c99;
-				GCC_NO_COMMON_BLOCKS = YES;
-				GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES;
-				GCC_TREAT_INCOMPATIBLE_POINTER_TYPE_WARNINGS_AS_ERRORS = YES;
-				GCC_TREAT_WARNINGS_AS_ERRORS = YES;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES;
-				GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
-				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-				GCC_WARN_HIDDEN_VIRTUAL_FUNCTIONS = YES;
-				GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES;
-				GCC_WARN_MISSING_PARENTHESES = YES;
-				GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES;
-				GCC_WARN_SHADOW = YES;
-				GCC_WARN_SIGN_COMPARE = YES;
-				GCC_WARN_UNDECLARED_SELECTOR = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				GCC_WARN_UNKNOWN_PRAGMAS = YES;
-				GCC_WARN_UNUSED_FUNCTION = YES;
-				GCC_WARN_UNUSED_LABEL = YES;
-				GCC_WARN_UNUSED_PARAMETER = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				GENERATE_PROFILING_CODE = NO;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
-				RUN_CLANG_STATIC_ANALYZER = YES;
-				SDKROOT = iphoneos;
-				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				WARNING_CFLAGS = (
-					"-Wdocumentation-unknown-command",
-					"-Wundef",
-					"-Wreserved-id-macro",
-					"-Wswitch-enum",
-					"-Wdirect-ivar-access",
-					"-Woverriding-method-mismatch",
-				);
-			};
-			name = Release;
-		};
-		F4487C6C1A9F8F8100531423 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				CLANG_ENABLE_OBJC_WEAK = YES;
-				PRODUCT_NAME = TestSingleSourceBuild;
-				TARGETED_DEVICE_FAMILY = "1,2";
-				USER_HEADER_SEARCH_PATHS = "$(SRCROOT)";
-			};
-			name = Debug;
-		};
-		F4487C6D1A9F8F8100531423 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				CLANG_ENABLE_OBJC_WEAK = YES;
-				PRODUCT_NAME = TestSingleSourceBuild;
-				TARGETED_DEVICE_FAMILY = "1,2";
-				USER_HEADER_SEARCH_PATHS = "$(SRCROOT)";
-			};
-			name = Release;
-		};
-		F45BBC0F1B0CDB50002D064D /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				CLANG_ENABLE_OBJC_WEAK = YES;
-			};
-			name = Debug;
-		};
-		F45BBC101B0CDB50002D064D /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				CLANG_ENABLE_OBJC_WEAK = YES;
-			};
-			name = Release;
-		};
-/* End XCBuildConfiguration section */
-
-/* Begin XCConfigurationList section */
-		7461B5330F94FAFD00A0C422 /* Build configuration list for PBXNativeTarget "ProtocolBuffers" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				7461B52F0F94FAFA00A0C422 /* Debug */,
-				7461B5300F94FAFA00A0C422 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		8BBEA4BA147C728600C4ADB7 /* Build configuration list for PBXNativeTarget "UnitTests" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				8BBEA4A7147C727100C4ADB7 /* Debug */,
-				8BBEA4A8147C727100C4ADB7 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		C01FCF4E08A954540054247B /* Build configuration list for PBXProject "ProtocolBuffers_iOS" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				C01FCF4F08A954540054247B /* Debug */,
-				C01FCF5008A954540054247B /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		F4487C6B1A9F8F8100531423 /* Build configuration list for PBXNativeTarget "TestSingleSourceBuild" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				F4487C6C1A9F8F8100531423 /* Debug */,
-				F4487C6D1A9F8F8100531423 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		F45BBC111B0CDB50002D064D /* Build configuration list for PBXLegacyTarget "Compile Unittest Protos" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				F45BBC0F1B0CDB50002D064D /* Debug */,
-				F45BBC101B0CDB50002D064D /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-/* End XCConfigurationList section */
-	};
-	rootObject = 29B97313FDCFA39411CA2CEA /* Project object */;
-}
diff --git a/libs/protobuf/objectivec/ProtocolBuffers_iOS.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/libs/protobuf/objectivec/ProtocolBuffers_iOS.xcodeproj/project.xcworkspace/contents.xcworkspacedata
deleted file mode 100644
index 037a91d..0000000
--- a/libs/protobuf/objectivec/ProtocolBuffers_iOS.xcodeproj/project.xcworkspace/contents.xcworkspacedata
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Workspace
-   version = "1.0">
-   <FileRef
-      location = "self:ProtocolBuffers_iOS.xcodeproj">
-   </FileRef>
-</Workspace>
diff --git a/libs/protobuf/objectivec/ProtocolBuffers_iOS.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/libs/protobuf/objectivec/ProtocolBuffers_iOS.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
deleted file mode 100644
index 18d9810..0000000
--- a/libs/protobuf/objectivec/ProtocolBuffers_iOS.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>IDEDidComputeMac32BitWarning</key>
-	<true/>
-</dict>
-</plist>
diff --git a/libs/protobuf/objectivec/ProtocolBuffers_iOS.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/libs/protobuf/objectivec/ProtocolBuffers_iOS.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
deleted file mode 100644
index 08de0be..0000000
--- a/libs/protobuf/objectivec/ProtocolBuffers_iOS.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>IDEWorkspaceSharedSettings_AutocreateContextsIfNeeded</key>
-	<false/>
-</dict>
-</plist>
diff --git a/libs/protobuf/objectivec/ProtocolBuffers_iOS.xcodeproj/xcshareddata/xcschemes/PerformanceTests.xcscheme b/libs/protobuf/objectivec/ProtocolBuffers_iOS.xcodeproj/xcshareddata/xcschemes/PerformanceTests.xcscheme
deleted file mode 100644
index 1a02f7e..0000000
--- a/libs/protobuf/objectivec/ProtocolBuffers_iOS.xcodeproj/xcshareddata/xcschemes/PerformanceTests.xcscheme
+++ /dev/null
@@ -1,344 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "0930"
-   version = "1.3">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "7461B52D0F94FAF800A0C422"
-               BuildableName = "libProtocolBuffers.a"
-               BlueprintName = "ProtocolBuffers"
-               ReferencedContainer = "container:ProtocolBuffers_iOS.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      buildConfiguration = "Release"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "8BBEA4A5147C727100C4ADB7"
-               BuildableName = "UnitTests.xctest"
-               BlueprintName = "UnitTests"
-               ReferencedContainer = "container:ProtocolBuffers_iOS.xcodeproj">
-            </BuildableReference>
-            <SkippedTests>
-               <Test
-                  Identifier = "CodedInputStreamTests">
-               </Test>
-               <Test
-                  Identifier = "CodedOutputStreamTests">
-               </Test>
-               <Test
-                  Identifier = "ConcurrencyTests">
-               </Test>
-               <Test
-                  Identifier = "DescriptorTests">
-               </Test>
-               <Test
-                  Identifier = "GPBAutocreatedArrayTests">
-               </Test>
-               <Test
-                  Identifier = "GPBAutocreatedDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBBoolArrayTests">
-               </Test>
-               <Test
-                  Identifier = "GPBBoolBoolDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBBoolDoubleDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBBoolFloatDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBBoolInt32DictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBBoolInt64DictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBBoolObjectDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBBoolUInt32DictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBBoolUInt64DictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBBridgeTests">
-               </Test>
-               <Test
-                  Identifier = "GPBDoubleArrayTests">
-               </Test>
-               <Test
-                  Identifier = "GPBEnumArrayCustomTests">
-               </Test>
-               <Test
-                  Identifier = "GPBEnumArrayTests">
-               </Test>
-               <Test
-                  Identifier = "GPBExtensionRegistryTest">
-               </Test>
-               <Test
-                  Identifier = "GPBFloatArrayTests">
-               </Test>
-               <Test
-                  Identifier = "GPBInt32ArrayTests">
-               </Test>
-               <Test
-                  Identifier = "GPBInt32BoolDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBInt32DoubleDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBInt32EnumDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBInt32EnumDictionaryUnknownEnumTests">
-               </Test>
-               <Test
-                  Identifier = "GPBInt32FloatDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBInt32Int32DictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBInt32Int64DictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBInt32ObjectDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBInt32UInt32DictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBInt32UInt64DictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBInt64ArrayTests">
-               </Test>
-               <Test
-                  Identifier = "GPBInt64BoolDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBInt64DoubleDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBInt64EnumDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBInt64EnumDictionaryUnknownEnumTests">
-               </Test>
-               <Test
-                  Identifier = "GPBInt64FloatDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBInt64Int32DictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBInt64Int64DictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBInt64ObjectDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBInt64UInt32DictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBInt64UInt64DictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBObjectiveCPlusPlusTests">
-               </Test>
-               <Test
-                  Identifier = "GPBStringBoolDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBStringDoubleDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBStringEnumDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBStringEnumDictionaryUnknownEnumTests">
-               </Test>
-               <Test
-                  Identifier = "GPBStringFloatDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBStringInt32DictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBStringInt64DictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBStringUInt32DictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBStringUInt64DictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBTestCase">
-               </Test>
-               <Test
-                  Identifier = "GPBUInt32ArrayTests">
-               </Test>
-               <Test
-                  Identifier = "GPBUInt32BoolDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBUInt32DoubleDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBUInt32EnumDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBUInt32EnumDictionaryUnknownEnumTests">
-               </Test>
-               <Test
-                  Identifier = "GPBUInt32FloatDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBUInt32Int32DictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBUInt32Int64DictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBUInt32ObjectDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBUInt32UInt32DictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBUInt32UInt64DictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBUInt64ArrayTests">
-               </Test>
-               <Test
-                  Identifier = "GPBUInt64BoolDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBUInt64DoubleDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBUInt64EnumDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBUInt64EnumDictionaryUnknownEnumTests">
-               </Test>
-               <Test
-                  Identifier = "GPBUInt64FloatDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBUInt64Int32DictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBUInt64Int64DictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBUInt64ObjectDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBUInt64UInt32DictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBUInt64UInt64DictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "MessageMergeTests">
-               </Test>
-               <Test
-                  Identifier = "MessageRuntimeTests">
-               </Test>
-               <Test
-                  Identifier = "MessageSerializationTests">
-               </Test>
-               <Test
-                  Identifier = "MessageTests">
-               </Test>
-               <Test
-                  Identifier = "UnknownFieldSetTest">
-               </Test>
-               <Test
-                  Identifier = "UtilitiesTests">
-               </Test>
-               <Test
-                  Identifier = "WellKnownTypesTest">
-               </Test>
-               <Test
-                  Identifier = "WireFormatTests">
-               </Test>
-            </SkippedTests>
-         </TestableReference>
-      </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "8B9A5EA41831993600A9D33B"
-            BuildableName = "iOSTestHarness.app"
-            BlueprintName = "iOSTestHarness"
-            ReferencedContainer = "container:ProtocolBuffers_iOS.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
-   </TestAction>
-   <LaunchAction
-      buildConfiguration = "Release"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      debugServiceExtension = "internal"
-      allowLocationSimulation = "YES">
-      <AdditionalOptions>
-      </AdditionalOptions>
-   </LaunchAction>
-   <ProfileAction
-      buildConfiguration = "Release"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "7461B52D0F94FAF800A0C422"
-            BuildableName = "libProtocolBuffers.a"
-            BlueprintName = "ProtocolBuffers"
-            ReferencedContainer = "container:ProtocolBuffers_iOS.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Release">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>
diff --git a/libs/protobuf/objectivec/ProtocolBuffers_iOS.xcodeproj/xcshareddata/xcschemes/ProtocolBuffers.xcscheme b/libs/protobuf/objectivec/ProtocolBuffers_iOS.xcodeproj/xcshareddata/xcschemes/ProtocolBuffers.xcscheme
deleted file mode 100644
index bacbcba..0000000
--- a/libs/protobuf/objectivec/ProtocolBuffers_iOS.xcodeproj/xcshareddata/xcschemes/ProtocolBuffers.xcscheme
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "0930"
-   version = "1.3">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "NO">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "7461B52D0F94FAF800A0C422"
-               BuildableName = "libProtocolBuffers.a"
-               BlueprintName = "ProtocolBuffers"
-               ReferencedContainer = "container:ProtocolBuffers_iOS.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "NO"
-            buildForArchiving = "NO"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "F4487C551A9F8F8100531423"
-               BuildableName = "libTestSingleSourceBuild.a"
-               BlueprintName = "TestSingleSourceBuild"
-               ReferencedContainer = "container:ProtocolBuffers_iOS.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "NO"
-            buildForProfiling = "NO"
-            buildForArchiving = "NO"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "8BBEA4A5147C727100C4ADB7"
-               BuildableName = "UnitTests.xctest"
-               BlueprintName = "UnitTests"
-               ReferencedContainer = "container:ProtocolBuffers_iOS.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      codeCoverageEnabled = "YES"
-      shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "8BBEA4A5147C727100C4ADB7"
-               BuildableName = "UnitTests.xctest"
-               BlueprintName = "UnitTests"
-               ReferencedContainer = "container:ProtocolBuffers_iOS.xcodeproj">
-            </BuildableReference>
-            <SkippedTests>
-               <Test
-                  Identifier = "PerfTests">
-               </Test>
-            </SkippedTests>
-         </TestableReference>
-      </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "8B9A5EA41831993600A9D33B"
-            BuildableName = "iOSTestHarness.app"
-            BlueprintName = "iOSTestHarness"
-            ReferencedContainer = "container:ProtocolBuffers_iOS.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
-   </TestAction>
-   <LaunchAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      debugServiceExtension = "internal"
-      allowLocationSimulation = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "7461B52D0F94FAF800A0C422"
-            BuildableName = "libProtocolBuffers.a"
-            BlueprintName = "ProtocolBuffers"
-            ReferencedContainer = "container:ProtocolBuffers_iOS.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
-   </LaunchAction>
-   <ProfileAction
-      buildConfiguration = "Release"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "7461B52D0F94FAF800A0C422"
-            BuildableName = "libProtocolBuffers.a"
-            BlueprintName = "ProtocolBuffers"
-            ReferencedContainer = "container:ProtocolBuffers_iOS.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>
diff --git a/libs/protobuf/objectivec/ProtocolBuffers_tvOS.xcodeproj/project.pbxproj b/libs/protobuf/objectivec/ProtocolBuffers_tvOS.xcodeproj/project.pbxproj
deleted file mode 100644
index c7a8d85..0000000
--- a/libs/protobuf/objectivec/ProtocolBuffers_tvOS.xcodeproj/project.pbxproj
+++ /dev/null
@@ -1,1134 +0,0 @@
-// !$*UTF8*$!
-{
-	archiveVersion = 1;
-	classes = {
-	};
-	objectVersion = 47;
-	objects = {
-
-/* Begin PBXBuildFile section */
-		5102DABC1891A073002037B6 /* GPBConcurrencyTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 5102DABB1891A052002037B6 /* GPBConcurrencyTests.m */; };
-		7461B5360F94FB4600A0C422 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; };
-		7461B53C0F94FB4E00A0C422 /* GPBCodedInputStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 7461B48F0F94F99000A0C422 /* GPBCodedInputStream.m */; };
-		7461B53D0F94FB4E00A0C422 /* GPBCodedOutputStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 7461B4910F94F99000A0C422 /* GPBCodedOutputStream.m */; };
-		7461B5490F94FB4E00A0C422 /* GPBExtensionRegistry.m in Sources */ = {isa = PBXBuildFile; fileRef = 7461B4A90F94F99000A0C422 /* GPBExtensionRegistry.m */; };
-		7461B54C0F94FB4E00A0C422 /* GPBUnknownField.m in Sources */ = {isa = PBXBuildFile; fileRef = 7461B4AF0F94F99000A0C422 /* GPBUnknownField.m */; };
-		7461B5530F94FB4E00A0C422 /* GPBMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 7461B4BF0F94F99000A0C422 /* GPBMessage.m */; };
-		7461B5610F94FB4E00A0C422 /* GPBUnknownFieldSet.m in Sources */ = {isa = PBXBuildFile; fileRef = 7461B4E20F94F99000A0C422 /* GPBUnknownFieldSet.m */; };
-		7461B5630F94FB4E00A0C422 /* GPBUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = 7461B4E60F94F99000A0C422 /* GPBUtilities.m */; };
-		7461B5640F94FB4E00A0C422 /* GPBWireFormat.m in Sources */ = {isa = PBXBuildFile; fileRef = 7461B4E80F94F99000A0C422 /* GPBWireFormat.m */; };
-		8B210CCE159383D60032D72D /* golden_message in Resources */ = {isa = PBXBuildFile; fileRef = 8B210CCD159383D60032D72D /* golden_message */; };
-		8B210CD0159386920032D72D /* golden_packed_fields_message in Resources */ = {isa = PBXBuildFile; fileRef = 8B210CCF159386920032D72D /* golden_packed_fields_message */; };
-		8B4248B41A8BD96E00BC1EC6 /* GPBSwiftTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8B4248B31A8BD96E00BC1EC6 /* GPBSwiftTests.swift */; };
-		8B4248E41A929C8900BC1EC6 /* GPBWellKnownTypes.m in Sources */ = {isa = PBXBuildFile; fileRef = 8B4248E21A929C8900BC1EC6 /* GPBWellKnownTypes.m */; };
-		8B4248E61A929C9900BC1EC6 /* GPBWellKnownTypesTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 8B4248E51A929C9900BC1EC6 /* GPBWellKnownTypesTest.m */; };
-		8B79657B14992E3F002FFBFC /* GPBRootObject.m in Sources */ = {isa = PBXBuildFile; fileRef = 8B79657914992E3E002FFBFC /* GPBRootObject.m */; };
-		8B8B615D17DF7056002EE618 /* GPBARCUnittestProtos.m in Sources */ = {isa = PBXBuildFile; fileRef = 8B8B615C17DF7056002EE618 /* GPBARCUnittestProtos.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
-		8B96157414C8C38C00A2AC0B /* GPBDescriptor.m in Sources */ = {isa = PBXBuildFile; fileRef = 8B96157314C8C38C00A2AC0B /* GPBDescriptor.m */; };
-		8B9A5EEC18330A0F00A9D33B /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8B9A5E9F1831913D00A9D33B /* UIKit.framework */; };
-		8BBEA4A9147C727D00C4ADB7 /* GPBCodedInputStreamTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 7461B69B0F94FDF800A0C422 /* GPBCodedInputStreamTests.m */; };
-		8BBEA4AA147C727D00C4ADB7 /* GPBCodedOuputStreamTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 7461B69D0F94FDF800A0C422 /* GPBCodedOuputStreamTests.m */; };
-		8BBEA4AC147C727D00C4ADB7 /* GPBMessageTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 7461B6A30F94FDF800A0C422 /* GPBMessageTests.m */; };
-		8BBEA4B0147C727D00C4ADB7 /* GPBTestUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = 7461B6AC0F94FDF800A0C422 /* GPBTestUtilities.m */; };
-		8BBEA4B6147C727D00C4ADB7 /* GPBUnknownFieldSetTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 7461B6B80F94FDF900A0C422 /* GPBUnknownFieldSetTest.m */; };
-		8BBEA4B7147C727D00C4ADB7 /* GPBUtilitiesTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 7461B6BA0F94FDF900A0C422 /* GPBUtilitiesTests.m */; };
-		8BBEA4B8147C727D00C4ADB7 /* GPBWireFormatTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 7461B6BC0F94FDF900A0C422 /* GPBWireFormatTests.m */; };
-		8BBEA4BB147C729200C4ADB7 /* libProtocolBuffers.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7461B52E0F94FAF800A0C422 /* libProtocolBuffers.a */; };
-		8BD3981F14BE59D70081D629 /* GPBUnittestProtos.m in Sources */ = {isa = PBXBuildFile; fileRef = 8BD3981E14BE59D70081D629 /* GPBUnittestProtos.m */; };
-		8BF8193514A0DDA600A2C982 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; };
-		8BFF9D1E23AD599400E63E32 /* GPBMessageTests+ClassNames.m in Sources */ = {isa = PBXBuildFile; fileRef = 8BFF9D1D23AD599400E63E32 /* GPBMessageTests+ClassNames.m */; };
-		F401DC351A8E5C6F00FCC765 /* GPBArrayTests.m in Sources */ = {isa = PBXBuildFile; fileRef = F401DC341A8E5C6F00FCC765 /* GPBArrayTests.m */; };
-		F40EE4F0206BF91E0071091A /* GPBCompileTest01.m in Sources */ = {isa = PBXBuildFile; fileRef = F40EE4CD206BF9170071091A /* GPBCompileTest01.m */; };
-		F40EE4F1206BF91E0071091A /* GPBCompileTest02.m in Sources */ = {isa = PBXBuildFile; fileRef = F40EE4C6206BF9170071091A /* GPBCompileTest02.m */; };
-		F40EE4F2206BF91E0071091A /* GPBCompileTest03.m in Sources */ = {isa = PBXBuildFile; fileRef = F40EE4D6206BF9190071091A /* GPBCompileTest03.m */; };
-		F40EE4F3206BF91E0071091A /* GPBCompileTest04.m in Sources */ = {isa = PBXBuildFile; fileRef = F40EE4C3206BF9160071091A /* GPBCompileTest04.m */; };
-		F40EE4F4206BF91E0071091A /* GPBCompileTest05.m in Sources */ = {isa = PBXBuildFile; fileRef = F40EE4C4206BF9160071091A /* GPBCompileTest05.m */; };
-		F40EE4F5206BF91E0071091A /* GPBCompileTest06.m in Sources */ = {isa = PBXBuildFile; fileRef = F40EE4D7206BF9190071091A /* GPBCompileTest06.m */; };
-		F40EE4F6206BF91E0071091A /* GPBCompileTest07.m in Sources */ = {isa = PBXBuildFile; fileRef = F40EE4C5206BF9170071091A /* GPBCompileTest07.m */; };
-		F40EE4F7206BF91E0071091A /* GPBCompileTest08.m in Sources */ = {isa = PBXBuildFile; fileRef = F40EE4C2206BF9160071091A /* GPBCompileTest08.m */; };
-		F40EE4F8206BF91E0071091A /* GPBCompileTest09.m in Sources */ = {isa = PBXBuildFile; fileRef = F40EE4C9206BF9170071091A /* GPBCompileTest09.m */; };
-		F40EE4F9206BF91E0071091A /* GPBCompileTest10.m in Sources */ = {isa = PBXBuildFile; fileRef = F40EE4D1206BF9180071091A /* GPBCompileTest10.m */; };
-		F40EE4FA206BF91E0071091A /* GPBCompileTest11.m in Sources */ = {isa = PBXBuildFile; fileRef = F40EE4D8206BF9190071091A /* GPBCompileTest11.m */; };
-		F40EE4FB206BF91E0071091A /* GPBCompileTest12.m in Sources */ = {isa = PBXBuildFile; fileRef = F40EE4D5206BF9180071091A /* GPBCompileTest12.m */; };
-		F40EE4FC206BF91E0071091A /* GPBCompileTest13.m in Sources */ = {isa = PBXBuildFile; fileRef = F40EE4C8206BF9170071091A /* GPBCompileTest13.m */; };
-		F40EE4FD206BF91E0071091A /* GPBCompileTest14.m in Sources */ = {isa = PBXBuildFile; fileRef = F40EE4D4206BF9180071091A /* GPBCompileTest14.m */; };
-		F40EE4FE206BF91E0071091A /* GPBCompileTest15.m in Sources */ = {isa = PBXBuildFile; fileRef = F40EE4CE206BF9170071091A /* GPBCompileTest15.m */; };
-		F40EE4FF206BF91E0071091A /* GPBCompileTest16.m in Sources */ = {isa = PBXBuildFile; fileRef = F40EE4D0206BF9180071091A /* GPBCompileTest16.m */; };
-		F40EE500206BF91E0071091A /* GPBCompileTest17.m in Sources */ = {isa = PBXBuildFile; fileRef = F40EE4D2206BF9180071091A /* GPBCompileTest17.m */; };
-		F40EE501206BF91E0071091A /* GPBCompileTest18.m in Sources */ = {isa = PBXBuildFile; fileRef = F40EE4D3206BF9180071091A /* GPBCompileTest18.m */; };
-		F40EE502206BF91E0071091A /* GPBCompileTest19.m in Sources */ = {isa = PBXBuildFile; fileRef = F40EE4C7206BF9170071091A /* GPBCompileTest19.m */; };
-		F40EE503206BF91E0071091A /* GPBCompileTest20.m in Sources */ = {isa = PBXBuildFile; fileRef = F40EE4CA206BF9170071091A /* GPBCompileTest20.m */; };
-		F40EE504206BF91E0071091A /* GPBCompileTest21.m in Sources */ = {isa = PBXBuildFile; fileRef = F40EE4CB206BF9170071091A /* GPBCompileTest21.m */; };
-		F40EE505206BF91E0071091A /* GPBCompileTest22.m in Sources */ = {isa = PBXBuildFile; fileRef = F40EE4CF206BF9170071091A /* GPBCompileTest22.m */; };
-		F40EE506206BF91E0071091A /* GPBCompileTest23.m in Sources */ = {isa = PBXBuildFile; fileRef = F40EE4CC206BF9170071091A /* GPBCompileTest23.m */; };
-		F40EE511206C068D0071091A /* GPBCompileTest24.m in Sources */ = {isa = PBXBuildFile; fileRef = F40EE50E206C06880071091A /* GPBCompileTest24.m */; };
-		F40EE512206C068D0071091A /* GPBCompileTest25.m in Sources */ = {isa = PBXBuildFile; fileRef = F40EE50D206C06880071091A /* GPBCompileTest25.m */; };
-		F41C175D1833D3310064ED4D /* GPBPerfTests.m in Sources */ = {isa = PBXBuildFile; fileRef = F41C175C1833D3310064ED4D /* GPBPerfTests.m */; };
-		F4353D1F1AB88243005A6198 /* GPBDescriptorTests.m in Sources */ = {isa = PBXBuildFile; fileRef = F4353D1E1AB88243005A6198 /* GPBDescriptorTests.m */; };
-		F4353D271ABB156F005A6198 /* GPBDictionary.m in Sources */ = {isa = PBXBuildFile; fileRef = F4353D251ABB156F005A6198 /* GPBDictionary.m */; };
-		F4353D421AC06F31005A6198 /* GPBDictionaryTests+Bool.m in Sources */ = {isa = PBXBuildFile; fileRef = F4353D3B1AC06F31005A6198 /* GPBDictionaryTests+Bool.m */; };
-		F4353D431AC06F31005A6198 /* GPBDictionaryTests+Int32.m in Sources */ = {isa = PBXBuildFile; fileRef = F4353D3C1AC06F31005A6198 /* GPBDictionaryTests+Int32.m */; };
-		F4353D441AC06F31005A6198 /* GPBDictionaryTests+Int64.m in Sources */ = {isa = PBXBuildFile; fileRef = F4353D3D1AC06F31005A6198 /* GPBDictionaryTests+Int64.m */; };
-		F4353D451AC06F31005A6198 /* GPBDictionaryTests+String.m in Sources */ = {isa = PBXBuildFile; fileRef = F4353D3E1AC06F31005A6198 /* GPBDictionaryTests+String.m */; };
-		F4353D461AC06F31005A6198 /* GPBDictionaryTests+UInt32.m in Sources */ = {isa = PBXBuildFile; fileRef = F4353D3F1AC06F31005A6198 /* GPBDictionaryTests+UInt32.m */; };
-		F4353D471AC06F31005A6198 /* GPBDictionaryTests+UInt64.m in Sources */ = {isa = PBXBuildFile; fileRef = F4353D401AC06F31005A6198 /* GPBDictionaryTests+UInt64.m */; };
-		F43C88D0191D77FC009E917D /* text_format_unittest_data.txt in Resources */ = {isa = PBXBuildFile; fileRef = F43C88CF191D77FC009E917D /* text_format_unittest_data.txt */; };
-		F4487C6A1A9F8F8100531423 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; };
-		F4487C6F1A9F8FFF00531423 /* GPBProtocolBuffers.m in Sources */ = {isa = PBXBuildFile; fileRef = 8BCF338814ED799900BC5317 /* GPBProtocolBuffers.m */; };
-		F4487C731A9F906200531423 /* GPBArray.m in Sources */ = {isa = PBXBuildFile; fileRef = F4487C711A9F906200531423 /* GPBArray.m */; };
-		F4487C771AADF84900531423 /* GPBMessageTests+Runtime.m in Sources */ = {isa = PBXBuildFile; fileRef = F4487C761AADF84900531423 /* GPBMessageTests+Runtime.m */; };
-		F4487C811AAF62FC00531423 /* GPBMessageTests+Serialization.m in Sources */ = {isa = PBXBuildFile; fileRef = F4487C801AAF62FC00531423 /* GPBMessageTests+Serialization.m */; };
-		F4487C851AAF6AC500531423 /* GPBMessageTests+Merge.m in Sources */ = {isa = PBXBuildFile; fileRef = F4487C841AAF6AC500531423 /* GPBMessageTests+Merge.m */; };
-		F4584D831ECCB53600803AB6 /* GPBExtensionRegistryTest.m in Sources */ = {isa = PBXBuildFile; fileRef = F4584D801ECCB39E00803AB6 /* GPBExtensionRegistryTest.m */; };
-		F45C69CC16DFD08D0081955B /* GPBExtensionInternals.m in Sources */ = {isa = PBXBuildFile; fileRef = F45C69CB16DFD08D0081955B /* GPBExtensionInternals.m */; };
-		F45E57C91AE6DC98000B7D99 /* text_format_map_unittest_data.txt in Resources */ = {isa = PBXBuildFile; fileRef = F45E57C81AE6DC98000B7D99 /* text_format_map_unittest_data.txt */; };
-		F47CF98523D904E600C7B24C /* GPBApi.pbobjc.m in Sources */ = {isa = PBXBuildFile; fileRef = F47CF97123D904E500C7B24C /* GPBApi.pbobjc.m */; };
-		F47CF98623D904E600C7B24C /* GPBEmpty.pbobjc.m in Sources */ = {isa = PBXBuildFile; fileRef = F47CF97223D904E500C7B24C /* GPBEmpty.pbobjc.m */; };
-		F47CF98923D904E600C7B24C /* GPBStruct.pbobjc.m in Sources */ = {isa = PBXBuildFile; fileRef = F47CF97523D904E500C7B24C /* GPBStruct.pbobjc.m */; };
-		F47CF98A23D904E600C7B24C /* GPBFieldMask.pbobjc.m in Sources */ = {isa = PBXBuildFile; fileRef = F47CF97623D904E500C7B24C /* GPBFieldMask.pbobjc.m */; };
-		F47CF98B23D904E600C7B24C /* GPBDuration.pbobjc.m in Sources */ = {isa = PBXBuildFile; fileRef = F47CF97723D904E500C7B24C /* GPBDuration.pbobjc.m */; };
-		F47CF98E23D904E600C7B24C /* GPBType.pbobjc.m in Sources */ = {isa = PBXBuildFile; fileRef = F47CF97A23D904E600C7B24C /* GPBType.pbobjc.m */; };
-		F47CF98F23D904E600C7B24C /* GPBTimestamp.pbobjc.m in Sources */ = {isa = PBXBuildFile; fileRef = F47CF97B23D904E600C7B24C /* GPBTimestamp.pbobjc.m */; };
-		F47CF99323D904E600C7B24C /* GPBWrappers.pbobjc.m in Sources */ = {isa = PBXBuildFile; fileRef = F47CF97F23D904E600C7B24C /* GPBWrappers.pbobjc.m */; };
-		F47CF99423D904E600C7B24C /* GPBAny.pbobjc.m in Sources */ = {isa = PBXBuildFile; fileRef = F47CF98023D904E600C7B24C /* GPBAny.pbobjc.m */; };
-		F47CF99623D904E600C7B24C /* GPBSourceContext.pbobjc.m in Sources */ = {isa = PBXBuildFile; fileRef = F47CF98223D904E600C7B24C /* GPBSourceContext.pbobjc.m */; };
-		F4B51B1C1BBC5C7100744318 /* GPBObjectiveCPlusPlusTest.mm in Sources */ = {isa = PBXBuildFile; fileRef = F4B51B1B1BBC5C7100744318 /* GPBObjectiveCPlusPlusTest.mm */; };
-		F4C4B9E71E1D97BF00D3B61D /* GPBDictionaryTests.m in Sources */ = {isa = PBXBuildFile; fileRef = F4C4B9E51E1D97BB00D3B61D /* GPBDictionaryTests.m */; };
-		F4F53F8C219CC5DF001EABF4 /* text_format_extensions_unittest_data.txt in Resources */ = {isa = PBXBuildFile; fileRef = F4F53F8B219CC5DF001EABF4 /* text_format_extensions_unittest_data.txt */; };
-		F4F8D8861D78A193002CE128 /* GPBUnittestProtos2.m in Sources */ = {isa = PBXBuildFile; fileRef = F4F8D8841D78A186002CE128 /* GPBUnittestProtos2.m */; };
-/* End PBXBuildFile section */
-
-/* Begin PBXContainerItemProxy section */
-		8BBEA4BC147C729A00C4ADB7 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 7461B52D0F94FAF800A0C422;
-			remoteInfo = ProtocolBuffers;
-		};
-		F45BBC121B0CDBBA002D064D /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = F45BBC0E1B0CDB50002D064D;
-			remoteInfo = "Compile Unittest Protos";
-		};
-/* End PBXContainerItemProxy section */
-
-/* Begin PBXFileReference section */
-		1D30AB110D05D00D00671497 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
-		5102DABB1891A052002037B6 /* GPBConcurrencyTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = GPBConcurrencyTests.m; sourceTree = "<group>"; };
-		51457B5F18D0B7AF00CCC606 /* GPBCodedInputStream_PackagePrivate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GPBCodedInputStream_PackagePrivate.h; sourceTree = "<group>"; };
-		515B840C18B7DEE30031753B /* GPBDescriptor_PackagePrivate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GPBDescriptor_PackagePrivate.h; sourceTree = "<group>"; };
-		5196A06918CE16B000B759E2 /* GPBMessage_PackagePrivate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GPBMessage_PackagePrivate.h; sourceTree = "<group>"; };
-		7401C1A90F950347006D8281 /* UnitTests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "UnitTests-Info.plist"; sourceTree = "<group>"; };
-		7461B48D0F94F99000A0C422 /* GPBBootstrap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPBBootstrap.h; sourceTree = "<group>"; };
-		7461B48E0F94F99000A0C422 /* GPBCodedInputStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPBCodedInputStream.h; sourceTree = "<group>"; };
-		7461B48F0F94F99000A0C422 /* GPBCodedInputStream.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = GPBCodedInputStream.m; sourceTree = "<group>"; };
-		7461B4900F94F99000A0C422 /* GPBCodedOutputStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPBCodedOutputStream.h; sourceTree = "<group>"; };
-		7461B4910F94F99000A0C422 /* GPBCodedOutputStream.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBCodedOutputStream.m; sourceTree = "<group>"; };
-		7461B4A80F94F99000A0C422 /* GPBExtensionRegistry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPBExtensionRegistry.h; sourceTree = "<group>"; };
-		7461B4A90F94F99000A0C422 /* GPBExtensionRegistry.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBExtensionRegistry.m; sourceTree = "<group>"; };
-		7461B4AE0F94F99000A0C422 /* GPBUnknownField.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPBUnknownField.h; sourceTree = "<group>"; };
-		7461B4AF0F94F99000A0C422 /* GPBUnknownField.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBUnknownField.m; sourceTree = "<group>"; };
-		7461B4BE0F94F99000A0C422 /* GPBMessage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPBMessage.h; sourceTree = "<group>"; };
-		7461B4BF0F94F99000A0C422 /* GPBMessage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBMessage.m; sourceTree = "<group>"; };
-		7461B4CD0F94F99000A0C422 /* GPBProtocolBuffers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPBProtocolBuffers.h; sourceTree = "<group>"; };
-		7461B4E10F94F99000A0C422 /* GPBUnknownFieldSet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPBUnknownFieldSet.h; sourceTree = "<group>"; };
-		7461B4E20F94F99000A0C422 /* GPBUnknownFieldSet.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBUnknownFieldSet.m; sourceTree = "<group>"; };
-		7461B4E50F94F99000A0C422 /* GPBUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPBUtilities.h; sourceTree = "<group>"; };
-		7461B4E60F94F99000A0C422 /* GPBUtilities.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBUtilities.m; sourceTree = "<group>"; };
-		7461B4E70F94F99000A0C422 /* GPBWireFormat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPBWireFormat.h; sourceTree = "<group>"; };
-		7461B4E80F94F99000A0C422 /* GPBWireFormat.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBWireFormat.m; sourceTree = "<group>"; };
-		7461B52E0F94FAF800A0C422 /* libProtocolBuffers.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libProtocolBuffers.a; sourceTree = BUILT_PRODUCTS_DIR; };
-		7461B69B0F94FDF800A0C422 /* GPBCodedInputStreamTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBCodedInputStreamTests.m; sourceTree = "<group>"; };
-		7461B69D0F94FDF800A0C422 /* GPBCodedOuputStreamTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBCodedOuputStreamTests.m; sourceTree = "<group>"; };
-		7461B6A30F94FDF800A0C422 /* GPBMessageTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBMessageTests.m; sourceTree = "<group>"; };
-		7461B6AB0F94FDF800A0C422 /* GPBTestUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPBTestUtilities.h; sourceTree = "<group>"; };
-		7461B6AC0F94FDF800A0C422 /* GPBTestUtilities.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBTestUtilities.m; sourceTree = "<group>"; };
-		7461B6B80F94FDF900A0C422 /* GPBUnknownFieldSetTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBUnknownFieldSetTest.m; sourceTree = "<group>"; };
-		7461B6BA0F94FDF900A0C422 /* GPBUtilitiesTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBUtilitiesTests.m; sourceTree = "<group>"; };
-		7461B6BC0F94FDF900A0C422 /* GPBWireFormatTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBWireFormatTests.m; sourceTree = "<group>"; };
-		8B09AAF614B663A7007B4184 /* unittest_objc.proto */ = {isa = PBXFileReference; lastKnownFileType = text; path = unittest_objc.proto; sourceTree = "<group>"; };
-		8B210CCD159383D60032D72D /* golden_message */ = {isa = PBXFileReference; lastKnownFileType = file; path = golden_message; sourceTree = "<group>"; };
-		8B210CCF159386920032D72D /* golden_packed_fields_message */ = {isa = PBXFileReference; lastKnownFileType = file; path = golden_packed_fields_message; sourceTree = "<group>"; };
-		8B35468621A61EB2000BD30D /* unittest_objc_options.proto */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.protobuf; path = unittest_objc_options.proto; sourceTree = "<group>"; };
-		8B4248B21A8BD96D00BC1EC6 /* UnitTests-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "UnitTests-Bridging-Header.h"; sourceTree = "<group>"; };
-		8B4248B31A8BD96E00BC1EC6 /* GPBSwiftTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GPBSwiftTests.swift; sourceTree = "<group>"; };
-		8B4248E11A929C8900BC1EC6 /* GPBWellKnownTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPBWellKnownTypes.h; sourceTree = "<group>"; };
-		8B4248E21A929C8900BC1EC6 /* GPBWellKnownTypes.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBWellKnownTypes.m; sourceTree = "<group>"; };
-		8B4248E51A929C9900BC1EC6 /* GPBWellKnownTypesTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBWellKnownTypesTest.m; sourceTree = "<group>"; };
-		8B4249481A92A02300BC1EC6 /* timestamp.proto */ = {isa = PBXFileReference; lastKnownFileType = text; name = timestamp.proto; path = ../src/google/protobuf/timestamp.proto; sourceTree = "<group>"; };
-		8B42494A1A92A0BA00BC1EC6 /* duration.proto */ = {isa = PBXFileReference; lastKnownFileType = text; name = duration.proto; path = ../src/google/protobuf/duration.proto; sourceTree = "<group>"; };
-		8B79657814992E3E002FFBFC /* GPBRootObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPBRootObject.h; sourceTree = "<group>"; };
-		8B79657914992E3E002FFBFC /* GPBRootObject.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBRootObject.m; sourceTree = "<group>"; };
-		8B7E6A7414893DBA00F8884A /* unittest_custom_options.proto */ = {isa = PBXFileReference; lastKnownFileType = text; name = unittest_custom_options.proto; path = ../../src/google/protobuf/unittest_custom_options.proto; sourceTree = "<group>"; };
-		8B7E6A7514893DBA00F8884A /* unittest_embed_optimize_for.proto */ = {isa = PBXFileReference; lastKnownFileType = text; name = unittest_embed_optimize_for.proto; path = ../../src/google/protobuf/unittest_embed_optimize_for.proto; sourceTree = "<group>"; };
-		8B7E6A7614893DBA00F8884A /* unittest_empty.proto */ = {isa = PBXFileReference; lastKnownFileType = text; name = unittest_empty.proto; path = ../../src/google/protobuf/unittest_empty.proto; sourceTree = "<group>"; };
-		8B7E6A7814893DBB00F8884A /* unittest_import.proto */ = {isa = PBXFileReference; lastKnownFileType = text; name = unittest_import.proto; path = ../../src/google/protobuf/unittest_import.proto; sourceTree = "<group>"; };
-		8B7E6A7B14893DBC00F8884A /* unittest_mset.proto */ = {isa = PBXFileReference; lastKnownFileType = text; name = unittest_mset.proto; path = ../../src/google/protobuf/unittest_mset.proto; sourceTree = "<group>"; };
-		8B7E6A7C14893DBC00F8884A /* unittest_no_generic_services.proto */ = {isa = PBXFileReference; lastKnownFileType = text; name = unittest_no_generic_services.proto; path = ../../src/google/protobuf/unittest_no_generic_services.proto; sourceTree = "<group>"; };
-		8B7E6A7D14893DBC00F8884A /* unittest_optimize_for.proto */ = {isa = PBXFileReference; lastKnownFileType = text; name = unittest_optimize_for.proto; path = ../../src/google/protobuf/unittest_optimize_for.proto; sourceTree = "<group>"; };
-		8B7E6A7E14893DBC00F8884A /* unittest.proto */ = {isa = PBXFileReference; lastKnownFileType = text; name = unittest.proto; path = ../../src/google/protobuf/unittest.proto; sourceTree = "<group>"; };
-		8B8B615C17DF7056002EE618 /* GPBARCUnittestProtos.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBARCUnittestProtos.m; sourceTree = "<group>"; };
-		8B96157214C8B06000A2AC0B /* GPBDescriptor.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GPBDescriptor.h; sourceTree = "<group>"; };
-		8B96157314C8C38C00A2AC0B /* GPBDescriptor.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBDescriptor.m; sourceTree = "<group>"; };
-		8B9742421A8AAA7800DCE92C /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
-		8B9A5E9F1831913D00A9D33B /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
-		8BBD9DB016DD1DC8008E1EC1 /* unittest_lite.proto */ = {isa = PBXFileReference; lastKnownFileType = text; name = unittest_lite.proto; path = ../../src/google/protobuf/unittest_lite.proto; sourceTree = "<group>"; };
-		8BBEA4A6147C727100C4ADB7 /* UnitTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = UnitTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
-		8BCF338814ED799900BC5317 /* GPBProtocolBuffers.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = GPBProtocolBuffers.m; sourceTree = "<group>"; };
-		8BD3981D14BE54220081D629 /* unittest_enormous_descriptor.proto */ = {isa = PBXFileReference; lastKnownFileType = text; name = unittest_enormous_descriptor.proto; path = ../../src/google/protobuf/unittest_enormous_descriptor.proto; sourceTree = "<group>"; };
-		8BD3981E14BE59D70081D629 /* GPBUnittestProtos.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBUnittestProtos.m; sourceTree = "<group>"; };
-		8BEB5AE01498033E0078BF9D /* GPBRuntimeTypes.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GPBRuntimeTypes.h; sourceTree = "<group>"; };
-		8BFF9D1D23AD599400E63E32 /* GPBMessageTests+ClassNames.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "GPBMessageTests+ClassNames.m"; sourceTree = "<group>"; };
-		F401DC341A8E5C6F00FCC765 /* GPBArrayTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBArrayTests.m; sourceTree = "<group>"; };
-		F40EE4C2206BF9160071091A /* GPBCompileTest08.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBCompileTest08.m; sourceTree = "<group>"; };
-		F40EE4C3206BF9160071091A /* GPBCompileTest04.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBCompileTest04.m; sourceTree = "<group>"; };
-		F40EE4C4206BF9160071091A /* GPBCompileTest05.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBCompileTest05.m; sourceTree = "<group>"; };
-		F40EE4C5206BF9170071091A /* GPBCompileTest07.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBCompileTest07.m; sourceTree = "<group>"; };
-		F40EE4C6206BF9170071091A /* GPBCompileTest02.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBCompileTest02.m; sourceTree = "<group>"; };
-		F40EE4C7206BF9170071091A /* GPBCompileTest19.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBCompileTest19.m; sourceTree = "<group>"; };
-		F40EE4C8206BF9170071091A /* GPBCompileTest13.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBCompileTest13.m; sourceTree = "<group>"; };
-		F40EE4C9206BF9170071091A /* GPBCompileTest09.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBCompileTest09.m; sourceTree = "<group>"; };
-		F40EE4CA206BF9170071091A /* GPBCompileTest20.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBCompileTest20.m; sourceTree = "<group>"; };
-		F40EE4CB206BF9170071091A /* GPBCompileTest21.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBCompileTest21.m; sourceTree = "<group>"; };
-		F40EE4CC206BF9170071091A /* GPBCompileTest23.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBCompileTest23.m; sourceTree = "<group>"; };
-		F40EE4CD206BF9170071091A /* GPBCompileTest01.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBCompileTest01.m; sourceTree = "<group>"; };
-		F40EE4CE206BF9170071091A /* GPBCompileTest15.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBCompileTest15.m; sourceTree = "<group>"; };
-		F40EE4CF206BF9170071091A /* GPBCompileTest22.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBCompileTest22.m; sourceTree = "<group>"; };
-		F40EE4D0206BF9180071091A /* GPBCompileTest16.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBCompileTest16.m; sourceTree = "<group>"; };
-		F40EE4D1206BF9180071091A /* GPBCompileTest10.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBCompileTest10.m; sourceTree = "<group>"; };
-		F40EE4D2206BF9180071091A /* GPBCompileTest17.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBCompileTest17.m; sourceTree = "<group>"; };
-		F40EE4D3206BF9180071091A /* GPBCompileTest18.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBCompileTest18.m; sourceTree = "<group>"; };
-		F40EE4D4206BF9180071091A /* GPBCompileTest14.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBCompileTest14.m; sourceTree = "<group>"; };
-		F40EE4D5206BF9180071091A /* GPBCompileTest12.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBCompileTest12.m; sourceTree = "<group>"; };
-		F40EE4D6206BF9190071091A /* GPBCompileTest03.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBCompileTest03.m; sourceTree = "<group>"; };
-		F40EE4D7206BF9190071091A /* GPBCompileTest06.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBCompileTest06.m; sourceTree = "<group>"; };
-		F40EE4D8206BF9190071091A /* GPBCompileTest11.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBCompileTest11.m; sourceTree = "<group>"; };
-		F40EE50D206C06880071091A /* GPBCompileTest25.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBCompileTest25.m; sourceTree = "<group>"; };
-		F40EE50E206C06880071091A /* GPBCompileTest24.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBCompileTest24.m; sourceTree = "<group>"; };
-		F41C175C1833D3310064ED4D /* GPBPerfTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBPerfTests.m; sourceTree = "<group>"; };
-		F4353D1E1AB88243005A6198 /* GPBDescriptorTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBDescriptorTests.m; sourceTree = "<group>"; };
-		F4353D241ABB156F005A6198 /* GPBDictionary.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPBDictionary.h; sourceTree = "<group>"; };
-		F4353D251ABB156F005A6198 /* GPBDictionary.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBDictionary.m; sourceTree = "<group>"; };
-		F4353D3A1AC06F31005A6198 /* GPBDictionaryTests.pddm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = GPBDictionaryTests.pddm; sourceTree = "<group>"; };
-		F4353D3B1AC06F31005A6198 /* GPBDictionaryTests+Bool.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "GPBDictionaryTests+Bool.m"; sourceTree = "<group>"; };
-		F4353D3C1AC06F31005A6198 /* GPBDictionaryTests+Int32.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "GPBDictionaryTests+Int32.m"; sourceTree = "<group>"; };
-		F4353D3D1AC06F31005A6198 /* GPBDictionaryTests+Int64.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "GPBDictionaryTests+Int64.m"; sourceTree = "<group>"; };
-		F4353D3E1AC06F31005A6198 /* GPBDictionaryTests+String.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "GPBDictionaryTests+String.m"; sourceTree = "<group>"; };
-		F4353D3F1AC06F31005A6198 /* GPBDictionaryTests+UInt32.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "GPBDictionaryTests+UInt32.m"; sourceTree = "<group>"; };
-		F4353D401AC06F31005A6198 /* GPBDictionaryTests+UInt64.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "GPBDictionaryTests+UInt64.m"; sourceTree = "<group>"; };
-		F43725921AC9835D004DCAFB /* GPBDictionary_PackagePrivate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GPBDictionary_PackagePrivate.h; sourceTree = "<group>"; };
-		F43C88CF191D77FC009E917D /* text_format_unittest_data.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = text_format_unittest_data.txt; sourceTree = "<group>"; };
-		F4411BE81AF1301700324B4A /* GPBArray_PackagePrivate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GPBArray_PackagePrivate.h; sourceTree = "<group>"; };
-		F4487C6E1A9F8F8100531423 /* libTestSingleSourceBuild.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libTestSingleSourceBuild.a; sourceTree = BUILT_PRODUCTS_DIR; };
-		F4487C701A9F906200531423 /* GPBArray.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPBArray.h; sourceTree = "<group>"; };
-		F4487C711A9F906200531423 /* GPBArray.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBArray.m; sourceTree = "<group>"; };
-		F4487C761AADF84900531423 /* GPBMessageTests+Runtime.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "GPBMessageTests+Runtime.m"; sourceTree = "<group>"; };
-		F4487C7A1AADFB5500531423 /* unittest_runtime_proto2.proto */ = {isa = PBXFileReference; lastKnownFileType = text; path = unittest_runtime_proto2.proto; sourceTree = "<group>"; };
-		F4487C7B1AADFB5500531423 /* unittest_runtime_proto3.proto */ = {isa = PBXFileReference; lastKnownFileType = text; path = unittest_runtime_proto3.proto; sourceTree = "<group>"; };
-		F4487C7D1AAE06C500531423 /* GPBUtilities_PackagePrivate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GPBUtilities_PackagePrivate.h; sourceTree = "<group>"; };
-		F4487C801AAF62FC00531423 /* GPBMessageTests+Serialization.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "GPBMessageTests+Serialization.m"; sourceTree = "<group>"; };
-		F4487C841AAF6AC500531423 /* GPBMessageTests+Merge.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "GPBMessageTests+Merge.m"; sourceTree = "<group>"; };
-		F44929021C866B3B00C2548A /* GPBCodedOutputStream_PackagePrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPBCodedOutputStream_PackagePrivate.h; sourceTree = "<group>"; };
-		F451D3F61A8AAEA600B8A22C /* GPBProtocolBuffers_RuntimeSupport.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GPBProtocolBuffers_RuntimeSupport.h; sourceTree = "<group>"; };
-		F4584D801ECCB39E00803AB6 /* GPBExtensionRegistryTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GPBExtensionRegistryTest.m; path = Tests/GPBExtensionRegistryTest.m; sourceTree = SOURCE_ROOT; };
-		F45C69CB16DFD08D0081955B /* GPBExtensionInternals.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBExtensionInternals.m; sourceTree = "<group>"; };
-		F45E57C81AE6DC98000B7D99 /* text_format_map_unittest_data.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = text_format_map_unittest_data.txt; sourceTree = "<group>"; };
-		F47CF96F23D904E500C7B24C /* GPBWrappers.pbobjc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPBWrappers.pbobjc.h; sourceTree = "<group>"; };
-		F47CF97023D904E500C7B24C /* GPBFieldMask.pbobjc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPBFieldMask.pbobjc.h; sourceTree = "<group>"; };
-		F47CF97123D904E500C7B24C /* GPBApi.pbobjc.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBApi.pbobjc.m; sourceTree = "<group>"; };
-		F47CF97223D904E500C7B24C /* GPBEmpty.pbobjc.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBEmpty.pbobjc.m; sourceTree = "<group>"; };
-		F47CF97323D904E500C7B24C /* GPBSourceContext.pbobjc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPBSourceContext.pbobjc.h; sourceTree = "<group>"; };
-		F47CF97423D904E500C7B24C /* GPBDuration.pbobjc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPBDuration.pbobjc.h; sourceTree = "<group>"; };
-		F47CF97523D904E500C7B24C /* GPBStruct.pbobjc.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBStruct.pbobjc.m; sourceTree = "<group>"; };
-		F47CF97623D904E500C7B24C /* GPBFieldMask.pbobjc.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBFieldMask.pbobjc.m; sourceTree = "<group>"; };
-		F47CF97723D904E500C7B24C /* GPBDuration.pbobjc.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBDuration.pbobjc.m; sourceTree = "<group>"; };
-		F47CF97823D904E600C7B24C /* GPBTimestamp.pbobjc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPBTimestamp.pbobjc.h; sourceTree = "<group>"; };
-		F47CF97923D904E600C7B24C /* GPBType.pbobjc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPBType.pbobjc.h; sourceTree = "<group>"; };
-		F47CF97A23D904E600C7B24C /* GPBType.pbobjc.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBType.pbobjc.m; sourceTree = "<group>"; };
-		F47CF97B23D904E600C7B24C /* GPBTimestamp.pbobjc.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBTimestamp.pbobjc.m; sourceTree = "<group>"; };
-		F47CF97C23D904E600C7B24C /* GPBApi.pbobjc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPBApi.pbobjc.h; sourceTree = "<group>"; };
-		F47CF97D23D904E600C7B24C /* GPBAny.pbobjc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPBAny.pbobjc.h; sourceTree = "<group>"; };
-		F47CF97E23D904E600C7B24C /* GPBEmpty.pbobjc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPBEmpty.pbobjc.h; sourceTree = "<group>"; };
-		F47CF97F23D904E600C7B24C /* GPBWrappers.pbobjc.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBWrappers.pbobjc.m; sourceTree = "<group>"; };
-		F47CF98023D904E600C7B24C /* GPBAny.pbobjc.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBAny.pbobjc.m; sourceTree = "<group>"; };
-		F47CF98123D904E600C7B24C /* GPBStruct.pbobjc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GPBStruct.pbobjc.h; sourceTree = "<group>"; };
-		F47CF98223D904E600C7B24C /* GPBSourceContext.pbobjc.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBSourceContext.pbobjc.m; sourceTree = "<group>"; };
-		F4AC9E1C1A8BEB1000BD6E83 /* unittest_cycle.proto */ = {isa = PBXFileReference; lastKnownFileType = text; path = unittest_cycle.proto; sourceTree = "<group>"; };
-		F4B51B1B1BBC5C7100744318 /* GPBObjectiveCPlusPlusTest.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = GPBObjectiveCPlusPlusTest.mm; sourceTree = "<group>"; };
-		F4B6B8B01A9CC99500892426 /* GPBUnknownField_PackagePrivate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GPBUnknownField_PackagePrivate.h; sourceTree = "<group>"; };
-		F4B6B8B11A9CCBBB00892426 /* GPBUnknownFieldSet_PackagePrivate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GPBUnknownFieldSet_PackagePrivate.h; sourceTree = "<group>"; };
-		F4B6B8B31A9CD1C600892426 /* GPBExtensionInternals.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GPBExtensionInternals.h; sourceTree = "<group>"; };
-		F4B6B8B51A9CD1C600892426 /* GPBRootObject_PackagePrivate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GPBRootObject_PackagePrivate.h; sourceTree = "<group>"; };
-		F4C4B9E51E1D97BB00D3B61D /* GPBDictionaryTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBDictionaryTests.m; sourceTree = "<group>"; };
-		F4CF31711B162EF500BD9B06 /* unittest_objc_startup.proto */ = {isa = PBXFileReference; lastKnownFileType = text; path = unittest_objc_startup.proto; sourceTree = "<group>"; };
-		F4E675D81B21D1DE0054530B /* any.proto */ = {isa = PBXFileReference; lastKnownFileType = text; name = any.proto; path = ../src/google/protobuf/any.proto; sourceTree = "<group>"; };
-		F4E675D91B21D1DE0054530B /* api.proto */ = {isa = PBXFileReference; lastKnownFileType = text; name = api.proto; path = ../src/google/protobuf/api.proto; sourceTree = "<group>"; };
-		F4E675DA1B21D1DE0054530B /* empty.proto */ = {isa = PBXFileReference; lastKnownFileType = text; name = empty.proto; path = ../src/google/protobuf/empty.proto; sourceTree = "<group>"; };
-		F4E675DB1B21D1DE0054530B /* field_mask.proto */ = {isa = PBXFileReference; lastKnownFileType = text; name = field_mask.proto; path = ../src/google/protobuf/field_mask.proto; sourceTree = "<group>"; };
-		F4E675DC1B21D1DE0054530B /* source_context.proto */ = {isa = PBXFileReference; lastKnownFileType = text; name = source_context.proto; path = ../src/google/protobuf/source_context.proto; sourceTree = "<group>"; };
-		F4E675DD1B21D1DE0054530B /* struct.proto */ = {isa = PBXFileReference; lastKnownFileType = text; name = struct.proto; path = ../src/google/protobuf/struct.proto; sourceTree = "<group>"; };
-		F4E675DE1B21D1DE0054530B /* type.proto */ = {isa = PBXFileReference; lastKnownFileType = text; name = type.proto; path = ../src/google/protobuf/type.proto; sourceTree = "<group>"; };
-		F4E675DF1B21D1DE0054530B /* wrappers.proto */ = {isa = PBXFileReference; lastKnownFileType = text; name = wrappers.proto; path = ../src/google/protobuf/wrappers.proto; sourceTree = "<group>"; };
-		F4F53F8B219CC5DF001EABF4 /* text_format_extensions_unittest_data.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = text_format_extensions_unittest_data.txt; sourceTree = "<group>"; };
-		F4F8D8841D78A186002CE128 /* GPBUnittestProtos2.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GPBUnittestProtos2.m; sourceTree = "<group>"; };
-/* End PBXFileReference section */
-
-/* Begin PBXFrameworksBuildPhase section */
-		7461B52C0F94FAF800A0C422 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				7461B5360F94FB4600A0C422 /* Foundation.framework in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		8BBEA4A3147C727100C4ADB7 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				8BBEA4BB147C729200C4ADB7 /* libProtocolBuffers.a in Frameworks */,
-				8B9A5EEC18330A0F00A9D33B /* UIKit.framework in Frameworks */,
-				8BF8193514A0DDA600A2C982 /* Foundation.framework in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		F4487C691A9F8F8100531423 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				F4487C6A1A9F8F8100531423 /* Foundation.framework in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXFrameworksBuildPhase section */
-
-/* Begin PBXGroup section */
-		080E96DDFE201D6D7F000001 /* Core Source */ = {
-			isa = PBXGroup;
-			children = (
-				7461B4CD0F94F99000A0C422 /* GPBProtocolBuffers.h */,
-				F451D3F61A8AAEA600B8A22C /* GPBProtocolBuffers_RuntimeSupport.h */,
-				8BCF338814ED799900BC5317 /* GPBProtocolBuffers.m */,
-				7461B3C50F94F84100A0C422 /* Extensions */,
-				7461B4850F94F96600A0C422 /* Fields */,
-				7461B4860F94F96B00A0C422 /* IO */,
-				7461B5150F94FA7300A0C422 /* Messages */,
-				8BCF334414ED727300BC5317 /* Support */,
-				29B97315FDCFA39411CA2CEA /* Generated */,
-			);
-			name = "Core Source";
-			sourceTree = "<group>";
-		};
-		19C28FACFE9D520D11CA2CBB /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				7461B52E0F94FAF800A0C422 /* libProtocolBuffers.a */,
-				8BBEA4A6147C727100C4ADB7 /* UnitTests.xctest */,
-				F4487C6E1A9F8F8100531423 /* libTestSingleSourceBuild.a */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
-		29B97314FDCFA39411CA2CEA /* CustomTemplate */ = {
-			isa = PBXGroup;
-			children = (
-				080E96DDFE201D6D7F000001 /* Core Source */,
-				7461B6940F94FDDD00A0C422 /* Tests */,
-				29B97323FDCFA39411CA2CEA /* Frameworks */,
-				19C28FACFE9D520D11CA2CBB /* Products */,
-			);
-			name = CustomTemplate;
-			sourceTree = "<group>";
-		};
-		29B97315FDCFA39411CA2CEA /* Generated */ = {
-			isa = PBXGroup;
-			children = (
-				F47CF97D23D904E600C7B24C /* GPBAny.pbobjc.h */,
-				F47CF98023D904E600C7B24C /* GPBAny.pbobjc.m */,
-				F47CF97C23D904E600C7B24C /* GPBApi.pbobjc.h */,
-				F47CF97123D904E500C7B24C /* GPBApi.pbobjc.m */,
-				F47CF97423D904E500C7B24C /* GPBDuration.pbobjc.h */,
-				F47CF97723D904E500C7B24C /* GPBDuration.pbobjc.m */,
-				F47CF97E23D904E600C7B24C /* GPBEmpty.pbobjc.h */,
-				F47CF97223D904E500C7B24C /* GPBEmpty.pbobjc.m */,
-				F47CF97023D904E500C7B24C /* GPBFieldMask.pbobjc.h */,
-				F47CF97623D904E500C7B24C /* GPBFieldMask.pbobjc.m */,
-				F47CF97323D904E500C7B24C /* GPBSourceContext.pbobjc.h */,
-				F47CF98223D904E600C7B24C /* GPBSourceContext.pbobjc.m */,
-				F47CF98123D904E600C7B24C /* GPBStruct.pbobjc.h */,
-				F47CF97523D904E500C7B24C /* GPBStruct.pbobjc.m */,
-				F47CF97823D904E600C7B24C /* GPBTimestamp.pbobjc.h */,
-				F47CF97B23D904E600C7B24C /* GPBTimestamp.pbobjc.m */,
-				F47CF97923D904E600C7B24C /* GPBType.pbobjc.h */,
-				F47CF97A23D904E600C7B24C /* GPBType.pbobjc.m */,
-				F47CF96F23D904E500C7B24C /* GPBWrappers.pbobjc.h */,
-				F47CF97F23D904E600C7B24C /* GPBWrappers.pbobjc.m */,
-				F4E675D81B21D1DE0054530B /* any.proto */,
-				F4E675D91B21D1DE0054530B /* api.proto */,
-				8B42494A1A92A0BA00BC1EC6 /* duration.proto */,
-				F4E675DA1B21D1DE0054530B /* empty.proto */,
-				F4E675DB1B21D1DE0054530B /* field_mask.proto */,
-				F4E675DC1B21D1DE0054530B /* source_context.proto */,
-				F4E675DD1B21D1DE0054530B /* struct.proto */,
-				8B4249481A92A02300BC1EC6 /* timestamp.proto */,
-				F4E675DE1B21D1DE0054530B /* type.proto */,
-				F4E675DF1B21D1DE0054530B /* wrappers.proto */,
-			);
-			name = Generated;
-			sourceTree = "<group>";
-		};
-		29B97323FDCFA39411CA2CEA /* Frameworks */ = {
-			isa = PBXGroup;
-			children = (
-				8B9742421A8AAA7800DCE92C /* CoreGraphics.framework */,
-				8B9A5E9F1831913D00A9D33B /* UIKit.framework */,
-				1D30AB110D05D00D00671497 /* Foundation.framework */,
-			);
-			name = Frameworks;
-			sourceTree = "<group>";
-		};
-		7461B3C50F94F84100A0C422 /* Extensions */ = {
-			isa = PBXGroup;
-			children = (
-				F4B6B8B31A9CD1C600892426 /* GPBExtensionInternals.h */,
-				F45C69CB16DFD08D0081955B /* GPBExtensionInternals.m */,
-				7461B4A80F94F99000A0C422 /* GPBExtensionRegistry.h */,
-				7461B4A90F94F99000A0C422 /* GPBExtensionRegistry.m */,
-				F4B6B8B51A9CD1C600892426 /* GPBRootObject_PackagePrivate.h */,
-				8B79657814992E3E002FFBFC /* GPBRootObject.h */,
-				8B79657914992E3E002FFBFC /* GPBRootObject.m */,
-			);
-			name = Extensions;
-			sourceTree = "<group>";
-		};
-		7461B4850F94F96600A0C422 /* Fields */ = {
-			isa = PBXGroup;
-			children = (
-				F4B6B8B01A9CC99500892426 /* GPBUnknownField_PackagePrivate.h */,
-				7461B4AE0F94F99000A0C422 /* GPBUnknownField.h */,
-				7461B4AF0F94F99000A0C422 /* GPBUnknownField.m */,
-				F4B6B8B11A9CCBBB00892426 /* GPBUnknownFieldSet_PackagePrivate.h */,
-				7461B4E10F94F99000A0C422 /* GPBUnknownFieldSet.h */,
-				7461B4E20F94F99000A0C422 /* GPBUnknownFieldSet.m */,
-			);
-			name = Fields;
-			sourceTree = "<group>";
-		};
-		7461B4860F94F96B00A0C422 /* IO */ = {
-			isa = PBXGroup;
-			children = (
-				51457B5F18D0B7AF00CCC606 /* GPBCodedInputStream_PackagePrivate.h */,
-				7461B48E0F94F99000A0C422 /* GPBCodedInputStream.h */,
-				7461B48F0F94F99000A0C422 /* GPBCodedInputStream.m */,
-				F44929021C866B3B00C2548A /* GPBCodedOutputStream_PackagePrivate.h */,
-				7461B4900F94F99000A0C422 /* GPBCodedOutputStream.h */,
-				7461B4910F94F99000A0C422 /* GPBCodedOutputStream.m */,
-				7461B4E70F94F99000A0C422 /* GPBWireFormat.h */,
-				7461B4E80F94F99000A0C422 /* GPBWireFormat.m */,
-			);
-			name = IO;
-			sourceTree = "<group>";
-		};
-		7461B5150F94FA7300A0C422 /* Messages */ = {
-			isa = PBXGroup;
-			children = (
-				515B840C18B7DEE30031753B /* GPBDescriptor_PackagePrivate.h */,
-				8B96157214C8B06000A2AC0B /* GPBDescriptor.h */,
-				8B96157314C8C38C00A2AC0B /* GPBDescriptor.m */,
-				7461B4BE0F94F99000A0C422 /* GPBMessage.h */,
-				5196A06918CE16B000B759E2 /* GPBMessage_PackagePrivate.h */,
-				7461B4BF0F94F99000A0C422 /* GPBMessage.m */,
-			);
-			name = Messages;
-			sourceTree = "<group>";
-		};
-		7461B6940F94FDDD00A0C422 /* Tests */ = {
-			isa = PBXGroup;
-			children = (
-				8B210CCD159383D60032D72D /* golden_message */,
-				8B210CCF159386920032D72D /* golden_packed_fields_message */,
-				8B8B615C17DF7056002EE618 /* GPBARCUnittestProtos.m */,
-				F401DC341A8E5C6F00FCC765 /* GPBArrayTests.m */,
-				7461B69B0F94FDF800A0C422 /* GPBCodedInputStreamTests.m */,
-				7461B69D0F94FDF800A0C422 /* GPBCodedOuputStreamTests.m */,
-				F40EE4CD206BF9170071091A /* GPBCompileTest01.m */,
-				F40EE4C6206BF9170071091A /* GPBCompileTest02.m */,
-				F40EE4D6206BF9190071091A /* GPBCompileTest03.m */,
-				F40EE4C3206BF9160071091A /* GPBCompileTest04.m */,
-				F40EE4C4206BF9160071091A /* GPBCompileTest05.m */,
-				F40EE4D7206BF9190071091A /* GPBCompileTest06.m */,
-				F40EE4C5206BF9170071091A /* GPBCompileTest07.m */,
-				F40EE4C2206BF9160071091A /* GPBCompileTest08.m */,
-				F40EE4C9206BF9170071091A /* GPBCompileTest09.m */,
-				F40EE4D1206BF9180071091A /* GPBCompileTest10.m */,
-				F40EE4D8206BF9190071091A /* GPBCompileTest11.m */,
-				F40EE4D5206BF9180071091A /* GPBCompileTest12.m */,
-				F40EE4C8206BF9170071091A /* GPBCompileTest13.m */,
-				F40EE4D4206BF9180071091A /* GPBCompileTest14.m */,
-				F40EE4CE206BF9170071091A /* GPBCompileTest15.m */,
-				F40EE4D0206BF9180071091A /* GPBCompileTest16.m */,
-				F40EE4D2206BF9180071091A /* GPBCompileTest17.m */,
-				F40EE4D3206BF9180071091A /* GPBCompileTest18.m */,
-				F40EE4C7206BF9170071091A /* GPBCompileTest19.m */,
-				F40EE4CA206BF9170071091A /* GPBCompileTest20.m */,
-				F40EE4CB206BF9170071091A /* GPBCompileTest21.m */,
-				F40EE4CF206BF9170071091A /* GPBCompileTest22.m */,
-				F40EE4CC206BF9170071091A /* GPBCompileTest23.m */,
-				F40EE50E206C06880071091A /* GPBCompileTest24.m */,
-				F40EE50D206C06880071091A /* GPBCompileTest25.m */,
-				5102DABB1891A052002037B6 /* GPBConcurrencyTests.m */,
-				F4353D1E1AB88243005A6198 /* GPBDescriptorTests.m */,
-				F4C4B9E51E1D97BB00D3B61D /* GPBDictionaryTests.m */,
-				F4353D3A1AC06F31005A6198 /* GPBDictionaryTests.pddm */,
-				F4353D3B1AC06F31005A6198 /* GPBDictionaryTests+Bool.m */,
-				F4353D3C1AC06F31005A6198 /* GPBDictionaryTests+Int32.m */,
-				F4353D3D1AC06F31005A6198 /* GPBDictionaryTests+Int64.m */,
-				F4353D3E1AC06F31005A6198 /* GPBDictionaryTests+String.m */,
-				F4353D3F1AC06F31005A6198 /* GPBDictionaryTests+UInt32.m */,
-				F4353D401AC06F31005A6198 /* GPBDictionaryTests+UInt64.m */,
-				F4584D801ECCB39E00803AB6 /* GPBExtensionRegistryTest.m */,
-				7461B6A30F94FDF800A0C422 /* GPBMessageTests.m */,
-				F4487C841AAF6AC500531423 /* GPBMessageTests+Merge.m */,
-				F4487C761AADF84900531423 /* GPBMessageTests+Runtime.m */,
-				8BFF9D1D23AD599400E63E32 /* GPBMessageTests+ClassNames.m */,
-				F4487C801AAF62FC00531423 /* GPBMessageTests+Serialization.m */,
-				F4B51B1B1BBC5C7100744318 /* GPBObjectiveCPlusPlusTest.mm */,
-				F41C175C1833D3310064ED4D /* GPBPerfTests.m */,
-				8B4248B31A8BD96E00BC1EC6 /* GPBSwiftTests.swift */,
-				7461B6AB0F94FDF800A0C422 /* GPBTestUtilities.h */,
-				7461B6AC0F94FDF800A0C422 /* GPBTestUtilities.m */,
-				8BD3981E14BE59D70081D629 /* GPBUnittestProtos.m */,
-				F4F8D8841D78A186002CE128 /* GPBUnittestProtos2.m */,
-				7461B6B80F94FDF900A0C422 /* GPBUnknownFieldSetTest.m */,
-				7461B6BA0F94FDF900A0C422 /* GPBUtilitiesTests.m */,
-				8B4248E51A929C9900BC1EC6 /* GPBWellKnownTypesTest.m */,
-				7461B6BC0F94FDF900A0C422 /* GPBWireFormatTests.m */,
-				F4F53F8B219CC5DF001EABF4 /* text_format_extensions_unittest_data.txt */,
-				F45E57C81AE6DC98000B7D99 /* text_format_map_unittest_data.txt */,
-				F43C88CF191D77FC009E917D /* text_format_unittest_data.txt */,
-				8B7E6A7414893DBA00F8884A /* unittest_custom_options.proto */,
-				F4AC9E1C1A8BEB1000BD6E83 /* unittest_cycle.proto */,
-				8B7E6A7514893DBA00F8884A /* unittest_embed_optimize_for.proto */,
-				8B7E6A7614893DBA00F8884A /* unittest_empty.proto */,
-				8BD3981D14BE54220081D629 /* unittest_enormous_descriptor.proto */,
-				8B7E6A7814893DBB00F8884A /* unittest_import.proto */,
-				8BBD9DB016DD1DC8008E1EC1 /* unittest_lite.proto */,
-				8B7E6A7B14893DBC00F8884A /* unittest_mset.proto */,
-				8B7E6A7C14893DBC00F8884A /* unittest_no_generic_services.proto */,
-				8B35468621A61EB2000BD30D /* unittest_objc_options.proto */,
-				F4CF31711B162EF500BD9B06 /* unittest_objc_startup.proto */,
-				8B09AAF614B663A7007B4184 /* unittest_objc.proto */,
-				8B7E6A7D14893DBC00F8884A /* unittest_optimize_for.proto */,
-				F4487C7A1AADFB5500531423 /* unittest_runtime_proto2.proto */,
-				F4487C7B1AADFB5500531423 /* unittest_runtime_proto3.proto */,
-				8B7E6A7E14893DBC00F8884A /* unittest.proto */,
-				8B4248B21A8BD96D00BC1EC6 /* UnitTests-Bridging-Header.h */,
-				7401C1A90F950347006D8281 /* UnitTests-Info.plist */,
-			);
-			path = Tests;
-			sourceTree = "<group>";
-		};
-		8BCF334414ED727300BC5317 /* Support */ = {
-			isa = PBXGroup;
-			children = (
-				F4411BE81AF1301700324B4A /* GPBArray_PackagePrivate.h */,
-				F4487C701A9F906200531423 /* GPBArray.h */,
-				F4487C711A9F906200531423 /* GPBArray.m */,
-				7461B48D0F94F99000A0C422 /* GPBBootstrap.h */,
-				F43725921AC9835D004DCAFB /* GPBDictionary_PackagePrivate.h */,
-				F4353D241ABB156F005A6198 /* GPBDictionary.h */,
-				F4353D251ABB156F005A6198 /* GPBDictionary.m */,
-				8BEB5AE01498033E0078BF9D /* GPBRuntimeTypes.h */,
-				F4487C7D1AAE06C500531423 /* GPBUtilities_PackagePrivate.h */,
-				7461B4E50F94F99000A0C422 /* GPBUtilities.h */,
-				7461B4E60F94F99000A0C422 /* GPBUtilities.m */,
-				8B4248E11A929C8900BC1EC6 /* GPBWellKnownTypes.h */,
-				8B4248E21A929C8900BC1EC6 /* GPBWellKnownTypes.m */,
-			);
-			name = Support;
-			sourceTree = "<group>";
-		};
-/* End PBXGroup section */
-
-/* Begin PBXHeadersBuildPhase section */
-		7461B52A0F94FAF800A0C422 /* Headers */ = {
-			isa = PBXHeadersBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		F4487C561A9F8F8100531423 /* Headers */ = {
-			isa = PBXHeadersBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXHeadersBuildPhase section */
-
-/* Begin PBXLegacyTarget section */
-		F45BBC0E1B0CDB50002D064D /* Compile Unittest Protos */ = {
-			isa = PBXLegacyTarget;
-			buildArgumentsString = "$(ACTION)";
-			buildConfigurationList = F45BBC111B0CDB50002D064D /* Build configuration list for PBXLegacyTarget "Compile Unittest Protos" */;
-			buildPhases = (
-			);
-			buildToolPath = DevTools/compile_testing_protos.sh;
-			buildWorkingDirectory = "";
-			dependencies = (
-			);
-			name = "Compile Unittest Protos";
-			passBuildSettingsInEnvironment = 1;
-			productName = "Compile Unittest Protos";
-		};
-/* End PBXLegacyTarget section */
-
-/* Begin PBXNativeTarget section */
-		7461B52D0F94FAF800A0C422 /* ProtocolBuffers */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 7461B5330F94FAFD00A0C422 /* Build configuration list for PBXNativeTarget "ProtocolBuffers" */;
-			buildPhases = (
-				7461B52A0F94FAF800A0C422 /* Headers */,
-				7461B52B0F94FAF800A0C422 /* Sources */,
-				7461B52C0F94FAF800A0C422 /* Frameworks */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = ProtocolBuffers;
-			productName = "ProtocolBuffers-iPhoneDevice";
-			productReference = 7461B52E0F94FAF800A0C422 /* libProtocolBuffers.a */;
-			productType = "com.apple.product-type.library.static";
-		};
-		8BBEA4A5147C727100C4ADB7 /* UnitTests */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 8BBEA4BA147C728600C4ADB7 /* Build configuration list for PBXNativeTarget "UnitTests" */;
-			buildPhases = (
-				F4B62A791AF91F7500AFCEDC /* Script: Check Runtime Stamps */,
-				8BBEA4A1147C727100C4ADB7 /* Resources */,
-				8BBEA4A2147C727100C4ADB7 /* Sources */,
-				8BBEA4A3147C727100C4ADB7 /* Frameworks */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-				8BBEA4BD147C729A00C4ADB7 /* PBXTargetDependency */,
-				F45BBC131B0CDBBA002D064D /* PBXTargetDependency */,
-			);
-			name = UnitTests;
-			productName = UnitTests;
-			productReference = 8BBEA4A6147C727100C4ADB7 /* UnitTests.xctest */;
-			productType = "com.apple.product-type.bundle.unit-test";
-		};
-		F4487C551A9F8F8100531423 /* TestSingleSourceBuild */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = F4487C6B1A9F8F8100531423 /* Build configuration list for PBXNativeTarget "TestSingleSourceBuild" */;
-			buildPhases = (
-				F4487C561A9F8F8100531423 /* Headers */,
-				F4487C5A1A9F8F8100531423 /* Sources */,
-				F4487C691A9F8F8100531423 /* Frameworks */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = TestSingleSourceBuild;
-			productName = "ProtocolBuffers-iPhoneDevice";
-			productReference = F4487C6E1A9F8F8100531423 /* libTestSingleSourceBuild.a */;
-			productType = "com.apple.product-type.library.static";
-		};
-/* End PBXNativeTarget section */
-
-/* Begin PBXProject section */
-		29B97313FDCFA39411CA2CEA /* Project object */ = {
-			isa = PBXProject;
-			attributes = {
-				LastSwiftUpdateCheck = 0710;
-				LastTestingUpgradeCheck = 0600;
-				LastUpgradeCheck = 0930;
-				TargetAttributes = {
-					8BBEA4A5147C727100C4ADB7 = {
-						LastSwiftMigration = 0940;
-						TestTargetID = 8B9A5EA41831993600A9D33B;
-					};
-					F45BBC0E1B0CDB50002D064D = {
-						CreatedOnToolsVersion = 6.3.2;
-					};
-				};
-			};
-			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "ProtocolBuffers_tvOS" */;
-			compatibilityVersion = "Xcode 6.3";
-			developmentRegion = English;
-			hasScannedForEncodings = 1;
-			knownRegions = (
-				English,
-				en,
-			);
-			mainGroup = 29B97314FDCFA39411CA2CEA /* CustomTemplate */;
-			projectDirPath = "";
-			projectRoot = "";
-			targets = (
-				7461B52D0F94FAF800A0C422 /* ProtocolBuffers */,
-				8BBEA4A5147C727100C4ADB7 /* UnitTests */,
-				F4487C551A9F8F8100531423 /* TestSingleSourceBuild */,
-				F45BBC0E1B0CDB50002D064D /* Compile Unittest Protos */,
-			);
-		};
-/* End PBXProject section */
-
-/* Begin PBXResourcesBuildPhase section */
-		8BBEA4A1147C727100C4ADB7 /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				8B210CCE159383D60032D72D /* golden_message in Resources */,
-				F4F53F8C219CC5DF001EABF4 /* text_format_extensions_unittest_data.txt in Resources */,
-				F43C88D0191D77FC009E917D /* text_format_unittest_data.txt in Resources */,
-				8B210CD0159386920032D72D /* golden_packed_fields_message in Resources */,
-				F45E57C91AE6DC98000B7D99 /* text_format_map_unittest_data.txt in Resources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXResourcesBuildPhase section */
-
-/* Begin PBXShellScriptBuildPhase section */
-		F4B62A791AF91F7500AFCEDC /* Script: Check Runtime Stamps */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "Script: Check Runtime Stamps";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "set -eu\nexec \"${SOURCE_ROOT}/DevTools/check_version_stamps.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
-/* End PBXShellScriptBuildPhase section */
-
-/* Begin PBXSourcesBuildPhase section */
-		7461B52B0F94FAF800A0C422 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				7461B53C0F94FB4E00A0C422 /* GPBCodedInputStream.m in Sources */,
-				F4487C731A9F906200531423 /* GPBArray.m in Sources */,
-				F47CF98923D904E600C7B24C /* GPBStruct.pbobjc.m in Sources */,
-				F47CF98623D904E600C7B24C /* GPBEmpty.pbobjc.m in Sources */,
-				7461B53D0F94FB4E00A0C422 /* GPBCodedOutputStream.m in Sources */,
-				F47CF98523D904E600C7B24C /* GPBApi.pbobjc.m in Sources */,
-				7461B5490F94FB4E00A0C422 /* GPBExtensionRegistry.m in Sources */,
-				7461B54C0F94FB4E00A0C422 /* GPBUnknownField.m in Sources */,
-				F47CF98E23D904E600C7B24C /* GPBType.pbobjc.m in Sources */,
-				F47CF99623D904E600C7B24C /* GPBSourceContext.pbobjc.m in Sources */,
-				7461B5530F94FB4E00A0C422 /* GPBMessage.m in Sources */,
-				F47CF99323D904E600C7B24C /* GPBWrappers.pbobjc.m in Sources */,
-				F47CF98F23D904E600C7B24C /* GPBTimestamp.pbobjc.m in Sources */,
-				7461B5610F94FB4E00A0C422 /* GPBUnknownFieldSet.m in Sources */,
-				7461B5630F94FB4E00A0C422 /* GPBUtilities.m in Sources */,
-				7461B5640F94FB4E00A0C422 /* GPBWireFormat.m in Sources */,
-				F4353D271ABB156F005A6198 /* GPBDictionary.m in Sources */,
-				F47CF98B23D904E600C7B24C /* GPBDuration.pbobjc.m in Sources */,
-				8B79657B14992E3F002FFBFC /* GPBRootObject.m in Sources */,
-				8B96157414C8C38C00A2AC0B /* GPBDescriptor.m in Sources */,
-				F47CF98A23D904E600C7B24C /* GPBFieldMask.pbobjc.m in Sources */,
-				F47CF99423D904E600C7B24C /* GPBAny.pbobjc.m in Sources */,
-				F45C69CC16DFD08D0081955B /* GPBExtensionInternals.m in Sources */,
-				8B4248E41A929C8900BC1EC6 /* GPBWellKnownTypes.m in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		8BBEA4A2147C727100C4ADB7 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				8BBEA4A9147C727D00C4ADB7 /* GPBCodedInputStreamTests.m in Sources */,
-				F40EE511206C068D0071091A /* GPBCompileTest24.m in Sources */,
-				F40EE503206BF91E0071091A /* GPBCompileTest20.m in Sources */,
-				F401DC351A8E5C6F00FCC765 /* GPBArrayTests.m in Sources */,
-				F40EE4F9206BF91E0071091A /* GPBCompileTest10.m in Sources */,
-				F4353D441AC06F31005A6198 /* GPBDictionaryTests+Int64.m in Sources */,
-				F40EE505206BF91E0071091A /* GPBCompileTest22.m in Sources */,
-				F40EE4F7206BF91E0071091A /* GPBCompileTest08.m in Sources */,
-				F40EE500206BF91E0071091A /* GPBCompileTest17.m in Sources */,
-				F4353D471AC06F31005A6198 /* GPBDictionaryTests+UInt64.m in Sources */,
-				8BBEA4AA147C727D00C4ADB7 /* GPBCodedOuputStreamTests.m in Sources */,
-				F40EE506206BF91E0071091A /* GPBCompileTest23.m in Sources */,
-				8BBEA4AC147C727D00C4ADB7 /* GPBMessageTests.m in Sources */,
-				F4487C811AAF62FC00531423 /* GPBMessageTests+Serialization.m in Sources */,
-				F40EE502206BF91E0071091A /* GPBCompileTest19.m in Sources */,
-				F40EE4F5206BF91E0071091A /* GPBCompileTest06.m in Sources */,
-				F40EE4FB206BF91E0071091A /* GPBCompileTest12.m in Sources */,
-				8B4248E61A929C9900BC1EC6 /* GPBWellKnownTypesTest.m in Sources */,
-				F40EE4F2206BF91E0071091A /* GPBCompileTest03.m in Sources */,
-				F40EE501206BF91E0071091A /* GPBCompileTest18.m in Sources */,
-				F40EE4FC206BF91E0071091A /* GPBCompileTest13.m in Sources */,
-				F40EE4FE206BF91E0071091A /* GPBCompileTest15.m in Sources */,
-				F40EE4F6206BF91E0071091A /* GPBCompileTest07.m in Sources */,
-				F4353D1F1AB88243005A6198 /* GPBDescriptorTests.m in Sources */,
-				F40EE504206BF91E0071091A /* GPBCompileTest21.m in Sources */,
-				F40EE4FA206BF91E0071091A /* GPBCompileTest11.m in Sources */,
-				F4F8D8861D78A193002CE128 /* GPBUnittestProtos2.m in Sources */,
-				F4B51B1C1BBC5C7100744318 /* GPBObjectiveCPlusPlusTest.mm in Sources */,
-				8B4248B41A8BD96E00BC1EC6 /* GPBSwiftTests.swift in Sources */,
-				F40EE512206C068D0071091A /* GPBCompileTest25.m in Sources */,
-				F4584D831ECCB53600803AB6 /* GPBExtensionRegistryTest.m in Sources */,
-				8BFF9D1E23AD599400E63E32 /* GPBMessageTests+ClassNames.m in Sources */,
-				5102DABC1891A073002037B6 /* GPBConcurrencyTests.m in Sources */,
-				F4487C771AADF84900531423 /* GPBMessageTests+Runtime.m in Sources */,
-				F40EE4F1206BF91E0071091A /* GPBCompileTest02.m in Sources */,
-				F4353D431AC06F31005A6198 /* GPBDictionaryTests+Int32.m in Sources */,
-				F40EE4F4206BF91E0071091A /* GPBCompileTest05.m in Sources */,
-				F40EE4FD206BF91E0071091A /* GPBCompileTest14.m in Sources */,
-				8BBEA4B0147C727D00C4ADB7 /* GPBTestUtilities.m in Sources */,
-				F40EE4F3206BF91E0071091A /* GPBCompileTest04.m in Sources */,
-				F40EE4FF206BF91E0071091A /* GPBCompileTest16.m in Sources */,
-				F41C175D1833D3310064ED4D /* GPBPerfTests.m in Sources */,
-				F4353D421AC06F31005A6198 /* GPBDictionaryTests+Bool.m in Sources */,
-				F4487C851AAF6AC500531423 /* GPBMessageTests+Merge.m in Sources */,
-				F40EE4F0206BF91E0071091A /* GPBCompileTest01.m in Sources */,
-				8BBEA4B6147C727D00C4ADB7 /* GPBUnknownFieldSetTest.m in Sources */,
-				F4353D451AC06F31005A6198 /* GPBDictionaryTests+String.m in Sources */,
-				F4353D461AC06F31005A6198 /* GPBDictionaryTests+UInt32.m in Sources */,
-				F40EE4F8206BF91E0071091A /* GPBCompileTest09.m in Sources */,
-				8BBEA4B7147C727D00C4ADB7 /* GPBUtilitiesTests.m in Sources */,
-				F4C4B9E71E1D97BF00D3B61D /* GPBDictionaryTests.m in Sources */,
-				8BBEA4B8147C727D00C4ADB7 /* GPBWireFormatTests.m in Sources */,
-				8BD3981F14BE59D70081D629 /* GPBUnittestProtos.m in Sources */,
-				8B8B615D17DF7056002EE618 /* GPBARCUnittestProtos.m in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		F4487C5A1A9F8F8100531423 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				F4487C6F1A9F8FFF00531423 /* GPBProtocolBuffers.m in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXSourcesBuildPhase section */
-
-/* Begin PBXTargetDependency section */
-		8BBEA4BD147C729A00C4ADB7 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 7461B52D0F94FAF800A0C422 /* ProtocolBuffers */;
-			targetProxy = 8BBEA4BC147C729A00C4ADB7 /* PBXContainerItemProxy */;
-		};
-		F45BBC131B0CDBBA002D064D /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = F45BBC0E1B0CDB50002D064D /* Compile Unittest Protos */;
-			targetProxy = F45BBC121B0CDBBA002D064D /* PBXContainerItemProxy */;
-		};
-/* End PBXTargetDependency section */
-
-/* Begin XCBuildConfiguration section */
-		7461B52F0F94FAFA00A0C422 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				CLANG_ENABLE_OBJC_WEAK = YES;
-				PRODUCT_NAME = ProtocolBuffers;
-				USER_HEADER_SEARCH_PATHS = "$(SRCROOT)";
-			};
-			name = Debug;
-		};
-		7461B5300F94FAFA00A0C422 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				CLANG_ENABLE_OBJC_WEAK = YES;
-				PRODUCT_NAME = ProtocolBuffers;
-				USER_HEADER_SEARCH_PATHS = "$(SRCROOT)";
-			};
-			name = Release;
-		};
-		8BBEA4A7147C727100C4ADB7 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				CLANG_ENABLE_MODULES = YES;
-				CLANG_ENABLE_OBJC_WEAK = YES;
-				FRAMEWORK_SEARCH_PATHS = (
-					"\"$(DEVELOPER_LIBRARY_DIR)/Frameworks\"",
-					"$(inherited)",
-				);
-				INFOPLIST_FILE = "Tests/UnitTests-Info.plist";
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"\"$(DEVELOPER_DIR)/usr/lib\"",
-				);
-				OTHER_LDFLAGS = "-ObjC";
-				PRODUCT_NAME = UnitTests;
-				SWIFT_OBJC_BRIDGING_HEADER = "Tests/UnitTests-Bridging-Header.h";
-				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 4.0;
-				USER_HEADER_SEARCH_PATHS = "${PROJECT_DERIVED_FILE_DIR}/protos $(SRCROOT)";
-				WARNING_CFLAGS = (
-					"$(inherited)",
-					"-Wno-documentation-unknown-command",
-					"-Wno-reserved-id-macro",
-					"-Wno-direct-ivar-access",
-				);
-			};
-			name = Debug;
-		};
-		8BBEA4A8147C727100C4ADB7 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				CLANG_ENABLE_MODULES = YES;
-				CLANG_ENABLE_OBJC_WEAK = YES;
-				FRAMEWORK_SEARCH_PATHS = (
-					"\"$(DEVELOPER_LIBRARY_DIR)/Frameworks\"",
-					"$(inherited)",
-				);
-				INFOPLIST_FILE = "Tests/UnitTests-Info.plist";
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					"\"$(DEVELOPER_DIR)/usr/lib\"",
-				);
-				OTHER_LDFLAGS = "-ObjC";
-				PRODUCT_NAME = UnitTests;
-				SWIFT_OBJC_BRIDGING_HEADER = "Tests/UnitTests-Bridging-Header.h";
-				SWIFT_VERSION = 4.0;
-				USER_HEADER_SEARCH_PATHS = "${PROJECT_DERIVED_FILE_DIR}/protos $(SRCROOT)";
-				WARNING_CFLAGS = (
-					"$(inherited)",
-					"-Wno-documentation-unknown-command",
-					"-Wno-reserved-id-macro",
-					"-Wno-direct-ivar-access",
-				);
-			};
-			name = Release;
-		};
-		C01FCF4F08A954540054247B /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				CLANG_ANALYZER_NONNULL = YES;
-				CLANG_ANALYZER_SECURITY_FLOATLOOPCOUNTER = YES;
-				CLANG_ANALYZER_SECURITY_INSECUREAPI_RAND = YES;
-				CLANG_ANALYZER_SECURITY_INSECUREAPI_STRCPY = YES;
-				CLANG_STATIC_ANALYZER_MODE = deep;
-				CLANG_WARN_ASSIGN_ENUM = YES;
-				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
-				CLANG_WARN_COMMA = YES;
-				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
-				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
-				CLANG_WARN_EMPTY_BODY = YES;
-				CLANG_WARN_INFINITE_RECURSION = YES;
-				CLANG_WARN_NULLABLE_TO_NONNULL_CONVERSION = YES;
-				CLANG_WARN_OBJC_EXPLICIT_OWNERSHIP_TYPE = YES;
-				CLANG_WARN_OBJC_IMPLICIT_ATOMIC_PROPERTIES = YES;
-				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
-				CLANG_WARN_OBJC_MISSING_PROPERTY_SYNTHESIS = YES;
-				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
-				CLANG_WARN_STRICT_PROTOTYPES = YES;
-				CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES;
-				CLANG_WARN_SUSPICIOUS_MOVE = YES;
-				CLANG_WARN_UNREACHABLE_CODE = YES_AGGRESSIVE;
-				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				ENABLE_TESTABILITY = YES;
-				GCC_C_LANGUAGE_STANDARD = c99;
-				GCC_NO_COMMON_BLOCKS = YES;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PREPROCESSOR_DEFINITIONS = "DEBUG=1";
-				GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES;
-				GCC_TREAT_INCOMPATIBLE_POINTER_TYPE_WARNINGS_AS_ERRORS = YES;
-				GCC_TREAT_WARNINGS_AS_ERRORS = YES;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES;
-				GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
-				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-				GCC_WARN_HIDDEN_VIRTUAL_FUNCTIONS = YES;
-				GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES;
-				GCC_WARN_MISSING_PARENTHESES = YES;
-				GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES;
-				GCC_WARN_SHADOW = YES;
-				GCC_WARN_SIGN_COMPARE = YES;
-				GCC_WARN_UNDECLARED_SELECTOR = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				GCC_WARN_UNKNOWN_PRAGMAS = YES;
-				GCC_WARN_UNUSED_FUNCTION = YES;
-				GCC_WARN_UNUSED_LABEL = YES;
-				GCC_WARN_UNUSED_PARAMETER = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				GENERATE_PROFILING_CODE = NO;
-				ONLY_ACTIVE_ARCH = YES;
-				RUN_CLANG_STATIC_ANALYZER = YES;
-				SDKROOT = appletvos;
-				TVOS_DEPLOYMENT_TARGET = 9.0;
-				WARNING_CFLAGS = (
-					"-Wdocumentation-unknown-command",
-					"-Wundef",
-					"-Wreserved-id-macro",
-					"-Wswitch-enum",
-					"-Wdirect-ivar-access",
-					"-Woverriding-method-mismatch",
-				);
-			};
-			name = Debug;
-		};
-		C01FCF5008A954540054247B /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				CLANG_ANALYZER_NONNULL = YES;
-				CLANG_ANALYZER_SECURITY_FLOATLOOPCOUNTER = YES;
-				CLANG_ANALYZER_SECURITY_INSECUREAPI_RAND = YES;
-				CLANG_ANALYZER_SECURITY_INSECUREAPI_STRCPY = YES;
-				CLANG_STATIC_ANALYZER_MODE = deep;
-				CLANG_WARN_ASSIGN_ENUM = YES;
-				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
-				CLANG_WARN_COMMA = YES;
-				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
-				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
-				CLANG_WARN_EMPTY_BODY = YES;
-				CLANG_WARN_INFINITE_RECURSION = YES;
-				CLANG_WARN_NULLABLE_TO_NONNULL_CONVERSION = YES;
-				CLANG_WARN_OBJC_EXPLICIT_OWNERSHIP_TYPE = YES;
-				CLANG_WARN_OBJC_IMPLICIT_ATOMIC_PROPERTIES = YES;
-				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
-				CLANG_WARN_OBJC_MISSING_PROPERTY_SYNTHESIS = YES;
-				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
-				CLANG_WARN_STRICT_PROTOTYPES = YES;
-				CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES;
-				CLANG_WARN_SUSPICIOUS_MOVE = YES;
-				CLANG_WARN_UNREACHABLE_CODE = YES_AGGRESSIVE;
-				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				ENABLE_NS_ASSERTIONS = NO;
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				GCC_C_LANGUAGE_STANDARD = c99;
-				GCC_NO_COMMON_BLOCKS = YES;
-				GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES;
-				GCC_TREAT_INCOMPATIBLE_POINTER_TYPE_WARNINGS_AS_ERRORS = YES;
-				GCC_TREAT_WARNINGS_AS_ERRORS = YES;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES;
-				GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
-				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-				GCC_WARN_HIDDEN_VIRTUAL_FUNCTIONS = YES;
-				GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES;
-				GCC_WARN_MISSING_PARENTHESES = YES;
-				GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES;
-				GCC_WARN_SHADOW = YES;
-				GCC_WARN_SIGN_COMPARE = YES;
-				GCC_WARN_UNDECLARED_SELECTOR = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				GCC_WARN_UNKNOWN_PRAGMAS = YES;
-				GCC_WARN_UNUSED_FUNCTION = YES;
-				GCC_WARN_UNUSED_LABEL = YES;
-				GCC_WARN_UNUSED_PARAMETER = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				GENERATE_PROFILING_CODE = NO;
-				RUN_CLANG_STATIC_ANALYZER = YES;
-				SDKROOT = appletvos;
-				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				TVOS_DEPLOYMENT_TARGET = 9.0;
-				WARNING_CFLAGS = (
-					"-Wdocumentation-unknown-command",
-					"-Wundef",
-					"-Wreserved-id-macro",
-					"-Wswitch-enum",
-					"-Wdirect-ivar-access",
-					"-Woverriding-method-mismatch",
-				);
-			};
-			name = Release;
-		};
-		F4487C6C1A9F8F8100531423 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				CLANG_ENABLE_OBJC_WEAK = YES;
-				PRODUCT_NAME = TestSingleSourceBuild;
-				USER_HEADER_SEARCH_PATHS = "$(SRCROOT)";
-			};
-			name = Debug;
-		};
-		F4487C6D1A9F8F8100531423 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				CLANG_ENABLE_OBJC_WEAK = YES;
-				PRODUCT_NAME = TestSingleSourceBuild;
-				USER_HEADER_SEARCH_PATHS = "$(SRCROOT)";
-			};
-			name = Release;
-		};
-		F45BBC0F1B0CDB50002D064D /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				CLANG_ENABLE_OBJC_WEAK = YES;
-			};
-			name = Debug;
-		};
-		F45BBC101B0CDB50002D064D /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				CLANG_ENABLE_OBJC_WEAK = YES;
-			};
-			name = Release;
-		};
-/* End XCBuildConfiguration section */
-
-/* Begin XCConfigurationList section */
-		7461B5330F94FAFD00A0C422 /* Build configuration list for PBXNativeTarget "ProtocolBuffers" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				7461B52F0F94FAFA00A0C422 /* Debug */,
-				7461B5300F94FAFA00A0C422 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		8BBEA4BA147C728600C4ADB7 /* Build configuration list for PBXNativeTarget "UnitTests" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				8BBEA4A7147C727100C4ADB7 /* Debug */,
-				8BBEA4A8147C727100C4ADB7 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		C01FCF4E08A954540054247B /* Build configuration list for PBXProject "ProtocolBuffers_tvOS" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				C01FCF4F08A954540054247B /* Debug */,
-				C01FCF5008A954540054247B /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		F4487C6B1A9F8F8100531423 /* Build configuration list for PBXNativeTarget "TestSingleSourceBuild" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				F4487C6C1A9F8F8100531423 /* Debug */,
-				F4487C6D1A9F8F8100531423 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		F45BBC111B0CDB50002D064D /* Build configuration list for PBXLegacyTarget "Compile Unittest Protos" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				F45BBC0F1B0CDB50002D064D /* Debug */,
-				F45BBC101B0CDB50002D064D /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-/* End XCConfigurationList section */
-	};
-	rootObject = 29B97313FDCFA39411CA2CEA /* Project object */;
-}
diff --git a/libs/protobuf/objectivec/ProtocolBuffers_tvOS.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/libs/protobuf/objectivec/ProtocolBuffers_tvOS.xcodeproj/project.xcworkspace/contents.xcworkspacedata
deleted file mode 100644
index 4c32c7f..0000000
--- a/libs/protobuf/objectivec/ProtocolBuffers_tvOS.xcodeproj/project.xcworkspace/contents.xcworkspacedata
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Workspace
-   version = "1.0">
-   <FileRef
-      location = "self:ProtocolBuffers_tvOS.xcodeproj">
-   </FileRef>
-</Workspace>
diff --git a/libs/protobuf/objectivec/ProtocolBuffers_tvOS.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/libs/protobuf/objectivec/ProtocolBuffers_tvOS.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
deleted file mode 100644
index 18d9810..0000000
--- a/libs/protobuf/objectivec/ProtocolBuffers_tvOS.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>IDEDidComputeMac32BitWarning</key>
-	<true/>
-</dict>
-</plist>
diff --git a/libs/protobuf/objectivec/ProtocolBuffers_tvOS.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/libs/protobuf/objectivec/ProtocolBuffers_tvOS.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
deleted file mode 100644
index 08de0be..0000000
--- a/libs/protobuf/objectivec/ProtocolBuffers_tvOS.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>IDEWorkspaceSharedSettings_AutocreateContextsIfNeeded</key>
-	<false/>
-</dict>
-</plist>
diff --git a/libs/protobuf/objectivec/ProtocolBuffers_tvOS.xcodeproj/xcshareddata/xcschemes/PerformanceTests.xcscheme b/libs/protobuf/objectivec/ProtocolBuffers_tvOS.xcodeproj/xcshareddata/xcschemes/PerformanceTests.xcscheme
deleted file mode 100644
index b11dc6e..0000000
--- a/libs/protobuf/objectivec/ProtocolBuffers_tvOS.xcodeproj/xcshareddata/xcschemes/PerformanceTests.xcscheme
+++ /dev/null
@@ -1,370 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "0930"
-   version = "1.3">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "7461B52D0F94FAF800A0C422"
-               BuildableName = "libProtocolBuffers.a"
-               BlueprintName = "ProtocolBuffers"
-               ReferencedContainer = "container:ProtocolBuffers_tvOS.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "NO"
-            buildForProfiling = "NO"
-            buildForArchiving = "NO"
-            buildForAnalyzing = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "8BBEA4A5147C727100C4ADB7"
-               BuildableName = "UnitTests.xctest"
-               BlueprintName = "UnitTests"
-               ReferencedContainer = "container:ProtocolBuffers_tvOS.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      buildConfiguration = "Release"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "8BBEA4A5147C727100C4ADB7"
-               BuildableName = "UnitTests.xctest"
-               BlueprintName = "UnitTests"
-               ReferencedContainer = "container:ProtocolBuffers_tvOS.xcodeproj">
-            </BuildableReference>
-            <SkippedTests>
-               <Test
-                  Identifier = "CodedInputStreamTests">
-               </Test>
-               <Test
-                  Identifier = "CodedOutputStreamTests">
-               </Test>
-               <Test
-                  Identifier = "ConcurrencyTests">
-               </Test>
-               <Test
-                  Identifier = "DescriptorTests">
-               </Test>
-               <Test
-                  Identifier = "GPBAutocreatedArrayTests">
-               </Test>
-               <Test
-                  Identifier = "GPBAutocreatedDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBBoolArrayTests">
-               </Test>
-               <Test
-                  Identifier = "GPBBoolBoolDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBBoolDoubleDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBBoolFloatDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBBoolInt32DictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBBoolInt64DictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBBoolObjectDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBBoolUInt32DictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBBoolUInt64DictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBBridgeTests">
-               </Test>
-               <Test
-                  Identifier = "GPBDoubleArrayTests">
-               </Test>
-               <Test
-                  Identifier = "GPBEnumArrayCustomTests">
-               </Test>
-               <Test
-                  Identifier = "GPBEnumArrayTests">
-               </Test>
-               <Test
-                  Identifier = "GPBExtensionRegistryTest">
-               </Test>
-               <Test
-                  Identifier = "GPBFloatArrayTests">
-               </Test>
-               <Test
-                  Identifier = "GPBInt32ArrayTests">
-               </Test>
-               <Test
-                  Identifier = "GPBInt32BoolDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBInt32DoubleDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBInt32EnumDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBInt32EnumDictionaryUnknownEnumTests">
-               </Test>
-               <Test
-                  Identifier = "GPBInt32FloatDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBInt32Int32DictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBInt32Int64DictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBInt32ObjectDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBInt32UInt32DictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBInt32UInt64DictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBInt64ArrayTests">
-               </Test>
-               <Test
-                  Identifier = "GPBInt64BoolDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBInt64DoubleDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBInt64EnumDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBInt64EnumDictionaryUnknownEnumTests">
-               </Test>
-               <Test
-                  Identifier = "GPBInt64FloatDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBInt64Int32DictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBInt64Int64DictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBInt64ObjectDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBInt64UInt32DictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBInt64UInt64DictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBObjectiveCPlusPlusTests">
-               </Test>
-               <Test
-                  Identifier = "GPBStringBoolDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBStringDoubleDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBStringEnumDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBStringEnumDictionaryUnknownEnumTests">
-               </Test>
-               <Test
-                  Identifier = "GPBStringFloatDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBStringInt32DictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBStringInt64DictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBStringUInt32DictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBStringUInt64DictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBTestCase">
-               </Test>
-               <Test
-                  Identifier = "GPBUInt32ArrayTests">
-               </Test>
-               <Test
-                  Identifier = "GPBUInt32BoolDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBUInt32DoubleDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBUInt32EnumDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBUInt32EnumDictionaryUnknownEnumTests">
-               </Test>
-               <Test
-                  Identifier = "GPBUInt32FloatDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBUInt32Int32DictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBUInt32Int64DictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBUInt32ObjectDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBUInt32UInt32DictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBUInt32UInt64DictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBUInt64ArrayTests">
-               </Test>
-               <Test
-                  Identifier = "GPBUInt64BoolDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBUInt64DoubleDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBUInt64EnumDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBUInt64EnumDictionaryUnknownEnumTests">
-               </Test>
-               <Test
-                  Identifier = "GPBUInt64FloatDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBUInt64Int32DictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBUInt64Int64DictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBUInt64ObjectDictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBUInt64UInt32DictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "GPBUInt64UInt64DictionaryTests">
-               </Test>
-               <Test
-                  Identifier = "MessageMergeTests">
-               </Test>
-               <Test
-                  Identifier = "MessageRuntimeTests">
-               </Test>
-               <Test
-                  Identifier = "MessageSerializationTests">
-               </Test>
-               <Test
-                  Identifier = "MessageTests">
-               </Test>
-               <Test
-                  Identifier = "PerfTests/testHas">
-               </Test>
-               <Test
-                  Identifier = "UnknownFieldSetTest">
-               </Test>
-               <Test
-                  Identifier = "UtilitiesTests">
-               </Test>
-               <Test
-                  Identifier = "WellKnownTypesTest">
-               </Test>
-               <Test
-                  Identifier = "WireFormatTests">
-               </Test>
-            </SkippedTests>
-         </TestableReference>
-      </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "7461B52D0F94FAF800A0C422"
-            BuildableName = "libProtocolBuffers.a"
-            BlueprintName = "ProtocolBuffers"
-            ReferencedContainer = "container:ProtocolBuffers_tvOS.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
-   </TestAction>
-   <LaunchAction
-      buildConfiguration = "Release"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      debugServiceExtension = "internal"
-      allowLocationSimulation = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "7461B52D0F94FAF800A0C422"
-            BuildableName = "libProtocolBuffers.a"
-            BlueprintName = "ProtocolBuffers"
-            ReferencedContainer = "container:ProtocolBuffers_tvOS.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
-   </LaunchAction>
-   <ProfileAction
-      buildConfiguration = "Release"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "7461B52D0F94FAF800A0C422"
-            BuildableName = "libProtocolBuffers.a"
-            BlueprintName = "ProtocolBuffers"
-            ReferencedContainer = "container:ProtocolBuffers_tvOS.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Release">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>
diff --git a/libs/protobuf/objectivec/ProtocolBuffers_tvOS.xcodeproj/xcshareddata/xcschemes/ProtocolBuffers.xcscheme b/libs/protobuf/objectivec/ProtocolBuffers_tvOS.xcodeproj/xcshareddata/xcschemes/ProtocolBuffers.xcscheme
deleted file mode 100644
index 25d047a..0000000
--- a/libs/protobuf/objectivec/ProtocolBuffers_tvOS.xcodeproj/xcshareddata/xcschemes/ProtocolBuffers.xcscheme
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "0930"
-   version = "1.3">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "NO">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "7461B52D0F94FAF800A0C422"
-               BuildableName = "libProtocolBuffers.a"
-               BlueprintName = "ProtocolBuffers"
-               ReferencedContainer = "container:ProtocolBuffers_tvOS.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "NO"
-            buildForArchiving = "NO"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "F4487C551A9F8F8100531423"
-               BuildableName = "libTestSingleSourceBuild.a"
-               BlueprintName = "TestSingleSourceBuild"
-               ReferencedContainer = "container:ProtocolBuffers_tvOS.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "NO"
-            buildForProfiling = "NO"
-            buildForArchiving = "NO"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "8BBEA4A5147C727100C4ADB7"
-               BuildableName = "UnitTests.xctest"
-               BlueprintName = "UnitTests"
-               ReferencedContainer = "container:ProtocolBuffers_tvOS.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      codeCoverageEnabled = "YES"
-      shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "8BBEA4A5147C727100C4ADB7"
-               BuildableName = "UnitTests.xctest"
-               BlueprintName = "UnitTests"
-               ReferencedContainer = "container:ProtocolBuffers_tvOS.xcodeproj">
-            </BuildableReference>
-            <SkippedTests>
-               <Test
-                  Identifier = "PerfTests">
-               </Test>
-            </SkippedTests>
-         </TestableReference>
-      </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "7461B52D0F94FAF800A0C422"
-            BuildableName = "libProtocolBuffers.a"
-            BlueprintName = "ProtocolBuffers"
-            ReferencedContainer = "container:ProtocolBuffers_tvOS.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
-   </TestAction>
-   <LaunchAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      debugServiceExtension = "internal"
-      allowLocationSimulation = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "7461B52D0F94FAF800A0C422"
-            BuildableName = "libProtocolBuffers.a"
-            BlueprintName = "ProtocolBuffers"
-            ReferencedContainer = "container:ProtocolBuffers_tvOS.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
-   </LaunchAction>
-   <ProfileAction
-      buildConfiguration = "Release"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "7461B52D0F94FAF800A0C422"
-            BuildableName = "libProtocolBuffers.a"
-            BlueprintName = "ProtocolBuffers"
-            ReferencedContainer = "container:ProtocolBuffers_tvOS.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>
diff --git a/libs/protobuf/objectivec/README.md b/libs/protobuf/objectivec/README.md
deleted file mode 100644
index a0fcd19..0000000
--- a/libs/protobuf/objectivec/README.md
+++ /dev/null
@@ -1,252 +0,0 @@
-Protocol Buffers - Google's data interchange format
-===================================================
-
-Copyright 2008 Google Inc.
-
-This directory contains the Objective C Protocol Buffers runtime library.
-
-Requirements
-------------
-
-The Objective C implementation requires:
-
-- Objective C 2.0 Runtime (32bit & 64bit iOS, 64bit OS X).
-- Xcode 10.3 (or later).
-- The library code does *not* use ARC (for performance reasons), but it all can
-  be called from ARC code.
-
-Installation
-------------
-
-The distribution pulled from github includes the sources for both the
-compiler (protoc) and the runtime (this directory). After cloning the distribution
-and needed submodules ([see the src directory's README](../src/README.md)),
-to build the compiler and run the runtime tests, you can use:
-
-     $ objectivec/DevTools/full_mac_build.sh
-
-This will generate the `src/protoc` binary.
-
-Building
---------
-
-There are two ways to include the Runtime sources in your project:
-
-Add `objectivec/*.h`, `objectivec/google/protobuf/*.pbobjc.h`, and
-`objectivec/GPBProtocolBuffers.m` to your project.
-
-*or*
-
-Add `objectivec/*.h`, `objectivec/google/protobuf/*.pbobjc.h`,
-`objectivec/google/protobuf/*.pbobjc.m`, and `objectivec/*.m` except for
-`objectivec/GPBProtocolBuffers.m` to your project.
-
-
-If the target is using ARC, remember to turn off ARC (`-fno-objc-arc`) for the
-`.m` files.
-
-The files generated by `protoc` for the `*.proto` files (`*.pbobjc.h` and
-`*.pbobjc.m`) are then also added to the target.
-
-Usage
------
-
-The objects generated for messages should work like any other Objective C
-object. They are mutable objects, but if you don't change them, they are safe
-to share between threads (similar to passing an NSMutableDictionary between
-threads/queues; as long as no one mutates it, things are fine).
-
-There are a few behaviors worth calling out:
-
-A property that is type NSString\* will never return nil. If the value is
-unset, it will return an empty string (@""). This is inpart to align things
-with the Protocol Buffers spec which says the default for strings is an empty
-string, but also so you can always safely pass them to isEqual:/compare:, etc.
-and have deterministic results.
-
-A property that is type NSData\* also won't return nil, it will return an empty
-data ([NSData data]). The reasoning is the same as for NSString not returning
-nil.
-
-A property that is another GPBMessage class also will not return nil. If the
-field wasn't already set, you will get a instance of the correct class. This
-instance will be a temporary instance unless you mutate it, at which point it
-will be attached to its parent object. We call this pattern *autocreators*.
-Similar to NSString and NSData properties it makes things a little safer when
-using them with isEqual:/etc.; but more importantly, this allows you to write
-code that uses Objective C's property dot notation to walk into nested objects
-and access and/or assign things without having to check that they are not nil
-and create them each step along the way. You can write this:
-
-```
-- (void)updateRecord:(MyMessage *)msg {
-  ...
-  // Note: You don't have to check subMessage and otherMessage for nil and
-  // alloc/init/assign them back along the way.
-  msg.subMessage.otherMessage.lastName = @"Smith";
-  ...
-}
-```
-
-If you want to check if a GPBMessage property is present, there is always as
-`has\[NAME\]` property to go with the main property to check if it is set.
-
-A property that is of an Array or Dictionary type also provides *autocreator*
-behavior and will never return nil. This provides all the same benefits you
-see for the message properties. Again, you can write:
-
-```
-- (void)updateRecord:(MyMessage *)msg {
-  ...
-  // Note: Just like above, you don't have to check subMessage and otherMessage
-  // for nil and alloc/init/assign them back along the way. You also don't have
-  // to create the siblingsArray, you can safely just append to it.
-  [msg.subMessage.otherMessage.siblingsArray addObject:@"Pat"];
-  ...
-}
-```
-
-If you are inspecting a message you got from some other place (server, disk,
-etc), you may want to check if the Array or Dictionary has entries without
-causing it to be created for you. For this, there is always a `\[NAME\]_Count`
-property also provided that can return zero or the real count, but won't trigger
-the creation.
-
-For primitive type fields (ints, floats, bools, enum) in messages defined in a
-`.proto` file that use *proto2* syntax there are conceptual differences between
-having an *explicit* and *default* value. You can always get the value of the
-property. In the case that it hasn't been set you will get the default. In
-cases where you need to know whether it was set explicitly or you are just
-getting the default, you can use the `has\[NAME\]` property. If the value has
-been set, and you want to clear it, you can set the `has\[NAME\]` to `NO`.
-*proto3* syntax messages do away with this concept, thus the default values are
-never included when the message is encoded.
-
-The Objective C classes/enums can be used from Swift code.
-
-Objective C Generator Proto File Options
-----------------------------------------
-
-**objc_class_prefix=\<prefix\>** (no default)
-
-This options allow you to provide a custom prefix for all the symbols generated
-from a proto file (classes (from message), enums, the Root for extension
-support).
-
-If not set, the generation options `package_to_prefix_mappings_path` and
-`use_package_as_prefix` (documented below) controls what is used instead. Since
-Objective C uses a global namespace for all of its classes, there can be collisions.
-`use_package_as_prefix=yes` should avoid collisions since proto package are used to
-scope/name things in other languages, but this option can be used to get shorter
-names instead. Convention is to base the explicit prefix on the proto package.
-
-Objective C Generator `protoc` Options
---------------------------------------
-
-When generating Objective C code, `protoc` supports a `--objc_opt` argument; the
-argument is comma-delimited name/value pairs (_key=value,key2=value2_). The
-_keys_ are used to change the behavior during generation. The currently
-supported keys are:
-
-  * `generate_for_named_framework`: The `value` used for this key will be used
-    when generating the `#import` statements in the generated code.  Instead
-    of being plain `#import "some/path/file.pbobjc.h"` lines, they will be
-    framework based, i.e. - `#import <VALUE/file.pbobjc.h>`.
-
-    _NOTE:_ If this is used with `named_framework_to_proto_path_mappings_path`,
-    then this is effectively the _default_ to use for everything that wasn't
-    mapped by the other.
-
-  * `named_framework_to_proto_path_mappings_path`: The `value` used for this key
-    is a path to a file containing the listing of framework names and proto
-    files. The generator uses this to decide if another proto file referenced
-    should use a framework style import vs. a user level import
-    (`#import <FRAMEWORK/file.pbobjc.h>` vs `#import "dir/file.pbobjc.h"`).
-
-    The format of the file is:
-      * An entry is a line of `frameworkName: file.proto, dir/file2.proto`.
-      * Comments start with `#`.
-      * A comment can go on a line after an entry.
-        (i.e. - `frameworkName: file.proto # comment`)
-
-    Any number of files can be listed for a framework, just separate them with
-    commas.
-
-    There can be multiple lines listing the same frameworkName in case it has a
-    lot of proto files included in it; and having multiple lines makes things
-    easier to read.
-
-  * `runtime_import_prefix`: The `value` used for this key to be used as a
-    prefix on `#import`s of runtime provided headers in the generated files.
-    When integrating ObjC protos into a build system, this can be used to avoid
-    having to add the runtime directory to the header search path since the
-    generate `#import` will be more complete.
-
-  * `package_to_prefix_mappings_path`: The `value` used for this key is a
-    path to a file containing a list of proto packages and prefixes.
-    The generator will use this to locate which ObjC class prefix to use when
-    generating sources _unless_ the `objc_class_prefix` file option is set.
-    This option can be useful if multiple apps consume a common set of
-    proto files but wish to use a different prefix for the generated sources
-    between them. This option takes precedent over the `use_package_as_prefix`
-    option.
-
-    The format of the file is:
-      * An entry is a line of "package=prefix".
-      * Comments start with `#`.
-      * A comment can go on a line after a expected package/prefix pair.
-        (i.e. - "package=prefix # comment")
-      * For files that do NOT have a proto package (not recommended), an
-        entry can be made as "no_package:PATH=prefix", where PATH is the
-      path for the .proto file.
-
-  * `use_package_as_prefix` and `proto_package_prefix_exceptions_path`: The
-    `value` for `use_package_as_prefix` can be `yes` or `no`, and indicates
-    if a prefix should be derived from the proto package for all the symbols
-    for files that don't have the `objc_class_prefix` file option (mentioned
-    above). This helps ensure the symbols are more unique and means there is
-    less chance of ObjC class name collisions.
-
-    To help in migrating code to using this support,
-    `proto_package_prefix_exceptions_path` can be used to provide the path
-    to a file that contains proto package names (one per line, comments allowed
-    if prefixed with `#`). These package won't get the derived prefix, allowing
-    migrations to the behavior one proto package at a time across a code base.
-
-    `use_package_as_prefix` currently defaults to `no` (existing behavior), but
-    in the future (as a breaking change), that is likely to change since it
-    helps prepare folks before they end up using a lot of protos and getting a
-    lot of collisions.
-
-  * `headers_use_forward_declarations`: The `value` for this can be `yes` or
-    `no`, and indicates if the generated headers use forward declarations for
-    Message and Enum types from other .proto files or if the files should be
-    imported into the generated header instead.
-
-    By using forward declarations, less code is likely to recompile when the
-    files do change, but Swift generally doesn't like forward declarations and
-    will fail to include properties when the concrete definition of the type is
-    known at import time. If your proto usages span modules, this can be a
-    problem.
-
-    `headers_use_forward_declarations` currently defaults to `yes` (existing
-    behavior), but in a future release, that default may change to provide
-    better Swift support by default.
-
-Contributing
-------------
-
-Please make updates to the tests along with changes. If just changing the
-runtime, the Xcode projects can be used to build and run tests. If your change
-also requires changes to the generated code,
-`objectivec/DevTools/full_mac_build.sh` can be used to easily rebuild and test
-changes. Passing `-h` to the script will show the addition options that could
-be useful.
-
-Documentation
--------------
-
-The complete documentation for Protocol Buffers is available via the
-web at:
-
-https://developers.google.com/protocol-buffers/
diff --git a/libs/protobuf/objectivec/Tests/GPBARCUnittestProtos.m b/libs/protobuf/objectivec/Tests/GPBARCUnittestProtos.m
deleted file mode 100644
index 29f6ccf..0000000
--- a/libs/protobuf/objectivec/Tests/GPBARCUnittestProtos.m
+++ /dev/null
@@ -1,63 +0,0 @@
-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
-
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Makes sure all the generated headers compile with ARC on.
-
-// The unittest_custom_options.proto extends the messages in descriptor.proto
-// so we build it in to test extending in general. The library doesn't provide
-// a descriptor as it doesn't use the classes/enums.
-#import "google/protobuf/Descriptor.pbobjc.h"
-
-#import "google/protobuf/Unittest.pbobjc.h"
-#import "google/protobuf/UnittestCustomOptions.pbobjc.h"
-#import "google/protobuf/UnittestCycle.pbobjc.h"
-#import "google/protobuf/UnittestDeprecated.pbobjc.h"
-#import "google/protobuf/UnittestDeprecatedFile.pbobjc.h"
-#import "google/protobuf/UnittestDropUnknownFields.pbobjc.h"
-#import "google/protobuf/UnittestEmbedOptimizeFor.pbobjc.h"
-#import "google/protobuf/UnittestEmpty.pbobjc.h"
-#import "google/protobuf/UnittestEnormousDescriptor.pbobjc.h"
-#import "google/protobuf/UnittestImport.pbobjc.h"
-#import "google/protobuf/UnittestImportLite.pbobjc.h"
-#import "google/protobuf/UnittestImportPublic.pbobjc.h"
-#import "google/protobuf/UnittestImportPublicLite.pbobjc.h"
-#import "google/protobuf/UnittestLite.pbobjc.h"
-#import "google/protobuf/UnittestMset.pbobjc.h"
-#import "google/protobuf/UnittestNoGenericServices.pbobjc.h"
-#import "google/protobuf/UnittestObjc.pbobjc.h"
-#import "google/protobuf/UnittestObjcStartup.pbobjc.h"
-#import "google/protobuf/UnittestOptimizeFor.pbobjc.h"
-#import "google/protobuf/UnittestPreserveUnknownEnum.pbobjc.h"
-#import "google/protobuf/UnittestRuntimeProto2.pbobjc.h"
-#import "google/protobuf/UnittestRuntimeProto3.pbobjc.h"
diff --git a/libs/protobuf/objectivec/Tests/GPBArrayTests.m b/libs/protobuf/objectivec/Tests/GPBArrayTests.m
deleted file mode 100644
index 9b004bc..0000000
--- a/libs/protobuf/objectivec/Tests/GPBArrayTests.m
+++ /dev/null
@@ -1,3731 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#import <Foundation/Foundation.h>
-#import <XCTest/XCTest.h>
-
-#import "GPBArray.h"
-#import "GPBArray_PackagePrivate.h"
-
-#import "GPBTestUtilities.h"
-
-// To let the testing macros work, add some extra methods to simplify things.
-@interface GPBEnumArray (TestingTweak)
-+ (instancetype)arrayWithValue:(int32_t)value;
-+ (instancetype)arrayWithCapacity:(NSUInteger)count;
-- (instancetype)initWithValues:(const int32_t [])values
-                         count:(NSUInteger)count;
-@end
-
-static BOOL TestingEnum_IsValidValue(int32_t value) {
-  switch (value) {
-    case 71:
-    case 72:
-    case 73:
-    case 74:
-      return YES;
-    default:
-      return NO;
-  }
-}
-
-static BOOL TestingEnum_IsValidValue2(int32_t value) {
-  switch (value) {
-    case 71:
-    case 72:
-    case 73:
-      return YES;
-    default:
-      return NO;
-  }
-}
-
-@implementation GPBEnumArray (TestingTweak)
-+ (instancetype)arrayWithValue:(int32_t)value {
-  return [[[self alloc] initWithValidationFunction:TestingEnum_IsValidValue
-                                         rawValues:&value
-                                             count:1] autorelease];
-}
-+ (instancetype)arrayWithCapacity:(NSUInteger)count {
-  return [[[self alloc] initWithValidationFunction:TestingEnum_IsValidValue
-                                          capacity:count] autorelease];
-}
-- (instancetype)initWithValues:(const int32_t [])values
-                         count:(NSUInteger)count {
-  return [self initWithValidationFunction:TestingEnum_IsValidValue
-                                rawValues:values
-                                    count:count];
-}
-@end
-
-#pragma mark - PDDM Macros
-
-//%PDDM-DEFINE ARRAY_TESTS(NAME, TYPE, VAL1, VAL2, VAL3, VAL4)
-//%ARRAY_TESTS2(NAME, TYPE, VAL1, VAL2, VAL3, VAL4, )
-//%PDDM-DEFINE ARRAY_TESTS2(NAME, TYPE, VAL1, VAL2, VAL3, VAL4, HELPER)
-//%#pragma mark - NAME
-//%
-//%@interface GPB##NAME##ArrayTests : XCTestCase
-//%@end
-//%
-//%@implementation GPB##NAME##ArrayTests
-//%
-//%- (void)testEmpty {
-//%  GPB##NAME##Array *array = [[GPB##NAME##Array alloc] init];
-//%  XCTAssertNotNil(array);
-//%  XCTAssertEqual(array.count, 0U);
-//%  XCTAssertThrowsSpecificNamed([array valueAtIndex:0], NSException, NSRangeException);
-//%  [array enumerateValuesWithBlock:^(TYPE value, NSUInteger idx, BOOL *stop) {
-//%    #pragma unused(value, idx, stop)
-//%    XCTFail(@"Shouldn't get here!");
-//%  }];
-//%  [array enumerateValuesWithOptions:NSEnumerationReverse
-//%                         usingBlock:^(TYPE value, NSUInteger idx, BOOL *stop) {
-//%    #pragma unused(value, idx, stop)
-//%    XCTFail(@"Shouldn't get here!");
-//%  }];
-//%  [array release];
-//%}
-//%
-//%- (void)testOne {
-//%  GPB##NAME##Array *array = [GPB##NAME##Array arrayWithValue:VAL1];
-//%  XCTAssertNotNil(array);
-//%  XCTAssertEqual(array.count, 1U);
-//%  XCTAssertEqual([array valueAtIndex:0], VAL1);
-//%  XCTAssertThrowsSpecificNamed([array valueAtIndex:1], NSException, NSRangeException);
-//%  [array enumerateValuesWithBlock:^(TYPE value, NSUInteger idx, BOOL *stop) {
-//%    XCTAssertEqual(idx, 0U);
-//%    XCTAssertEqual(value, VAL1);
-//%    XCTAssertNotEqual(stop, NULL);
-//%  }];
-//%  [array enumerateValuesWithOptions:NSEnumerationReverse
-//%                         usingBlock:^(TYPE value, NSUInteger idx, BOOL *stop) {
-//%    XCTAssertEqual(idx, 0U);
-//%    XCTAssertEqual(value, VAL1);
-//%    XCTAssertNotEqual(stop, NULL);
-//%  }];
-//%}
-//%
-//%- (void)testBasics {
-//%  static const TYPE kValues[] = { VAL1, VAL2, VAL3, VAL4 };
-//%  GPB##NAME##Array *array =
-//%      [[GPB##NAME##Array alloc] initWithValues:kValues
-//%            NAME$S                     count:GPBARRAYSIZE(kValues)];
-//%  XCTAssertNotNil(array);
-//%  XCTAssertEqual(array.count, 4U);
-//%  XCTAssertEqual([array valueAtIndex:0], VAL1);
-//%  XCTAssertEqual([array valueAtIndex:1], VAL2);
-//%  XCTAssertEqual([array valueAtIndex:2], VAL3);
-//%  XCTAssertEqual([array valueAtIndex:3], VAL4);
-//%  XCTAssertThrowsSpecificNamed([array valueAtIndex:4], NSException, NSRangeException);
-//%  __block NSUInteger idx2 = 0;
-//%  [array enumerateValuesWithBlock:^(TYPE value, NSUInteger idx, BOOL *stop) {
-//%    XCTAssertEqual(idx, idx2);
-//%    XCTAssertEqual(value, kValues[idx]);
-//%    XCTAssertNotEqual(stop, NULL);
-//%    ++idx2;
-//%  }];
-//%  idx2 = 0;
-//%  [array enumerateValuesWithOptions:NSEnumerationReverse
-//%                         usingBlock:^(TYPE value, NSUInteger idx, BOOL *stop) {
-//%    XCTAssertEqual(idx, (3 - idx2));
-//%    XCTAssertEqual(value, kValues[idx]);
-//%    XCTAssertNotEqual(stop, NULL);
-//%    ++idx2;
-//%  }];
-//%  // Stopping the enumeration.
-//%  idx2 = 0;
-//%  [array enumerateValuesWithBlock:^(TYPE value, NSUInteger idx, BOOL *stop) {
-//%    XCTAssertEqual(idx, idx2);
-//%    XCTAssertEqual(value, kValues[idx]);
-//%    XCTAssertNotEqual(stop, NULL);
-//%    if (idx2 == 1) *stop = YES;
-//%    XCTAssertNotEqual(idx, 2U);
-//%    XCTAssertNotEqual(idx, 3U);
-//%    ++idx2;
-//%  }];
-//%  idx2 = 0;
-//%  [array enumerateValuesWithOptions:NSEnumerationReverse
-//%                         usingBlock:^(TYPE value, NSUInteger idx, BOOL *stop) {
-//%    XCTAssertEqual(idx, (3 - idx2));
-//%    XCTAssertEqual(value, kValues[idx]);
-//%    XCTAssertNotEqual(stop, NULL);
-//%    if (idx2 == 1) *stop = YES;
-//%    XCTAssertNotEqual(idx, 1U);
-//%    XCTAssertNotEqual(idx, 0U);
-//%    ++idx2;
-//%  }];
-//%  // Ensure description doesn't choke.
-//%  XCTAssertTrue(array.description.length > 10);
-//%  [array release];
-//%}
-//%
-//%- (void)testEquality {
-//%  const TYPE kValues1[] = { VAL1, VAL2, VAL3 };
-//%  const TYPE kValues2[] = { VAL1, VAL4, VAL3 };
-//%  const TYPE kValues3[] = { VAL1, VAL2, VAL3, VAL4 };
-//%  GPB##NAME##Array *array1 =
-//%      [[GPB##NAME##Array alloc] initWithValues:kValues1
-//%            NAME$S                     count:GPBARRAYSIZE(kValues1)];
-//%  XCTAssertNotNil(array1);
-//%  GPB##NAME##Array *array1prime =
-//%      [[GPB##NAME##Array alloc] initWithValues:kValues1
-//%            NAME$S                     count:GPBARRAYSIZE(kValues1)];
-//%  XCTAssertNotNil(array1prime);
-//%  GPB##NAME##Array *array2 =
-//%      [[GPB##NAME##Array alloc] initWithValues:kValues2
-//%            NAME$S                     count:GPBARRAYSIZE(kValues2)];
-//%  XCTAssertNotNil(array2);
-//%  GPB##NAME##Array *array3 =
-//%      [[GPB##NAME##Array alloc] initWithValues:kValues3
-//%            NAME$S                     count:GPBARRAYSIZE(kValues3)];
-//%  XCTAssertNotNil(array3);
-//%
-//%  // Identity
-//%  XCTAssertTrue([array1 isEqual:array1]);
-//%  // Wrong type doesn't blow up.
-//%  XCTAssertFalse([array1 isEqual:@"bogus"]);
-//%  // 1/1Prime should be different objects, but equal.
-//%  XCTAssertNotEqual(array1, array1prime);
-//%  XCTAssertEqualObjects(array1, array1prime);
-//%  // Equal, so they must have same hash.
-//%  XCTAssertEqual([array1 hash], [array1prime hash]);
-//%
-//%  // 1/2/3 shouldn't be equal.
-//%  XCTAssertNotEqualObjects(array1, array2);
-//%  XCTAssertNotEqualObjects(array1, array3);
-//%  XCTAssertNotEqualObjects(array2, array3);
-//%
-//%  [array1 release];
-//%  [array1prime release];
-//%  [array2 release];
-//%  [array3 release];
-//%}
-//%
-//%- (void)testCopy {
-//%  const TYPE kValues[] = { VAL1, VAL2, VAL3, VAL4 };
-//%  GPB##NAME##Array *array =
-//%      [[GPB##NAME##Array alloc] initWithValues:kValues
-//%            NAME$S                     count:GPBARRAYSIZE(kValues)];
-//%  XCTAssertNotNil(array);
-//%
-//%  GPB##NAME##Array *array2 = [array copy];
-//%  XCTAssertNotNil(array2);
-//%
-//%  // Should be new object but equal.
-//%  XCTAssertNotEqual(array, array2);
-//%  XCTAssertEqualObjects(array, array2);
-//%  [array2 release];
-//%  [array release];
-//%}
-//%
-//%- (void)testArrayFromArray {
-//%  const TYPE kValues[] = { VAL1, VAL2, VAL3, VAL4 };
-//%  GPB##NAME##Array *array =
-//%      [[GPB##NAME##Array alloc] initWithValues:kValues
-//%            NAME$S                     count:GPBARRAYSIZE(kValues)];
-//%  XCTAssertNotNil(array);
-//%
-//%  GPB##NAME##Array *array2 = [GPB##NAME##Array arrayWithValueArray:array];
-//%  XCTAssertNotNil(array2);
-//%
-//%  // Should be new pointer, but equal objects.
-//%  XCTAssertNotEqual(array, array2);
-//%  XCTAssertEqualObjects(array, array2);
-//%  [array release];
-//%}
-//%
-//%- (void)testAdds {
-//%  GPB##NAME##Array *array = [GPB##NAME##Array array];
-//%  XCTAssertNotNil(array);
-//%
-//%  XCTAssertEqual(array.count, 0U);
-//%  [array addValue:VAL1];
-//%  XCTAssertEqual(array.count, 1U);
-//%
-//%  const TYPE kValues1[] = { VAL2, VAL3 };
-//%  [array addValues:kValues1 count:GPBARRAYSIZE(kValues1)];
-//%  XCTAssertEqual(array.count, 3U);
-//%
-//%  const TYPE kValues2[] = { VAL4, VAL1 };
-//%  GPB##NAME##Array *array2 =
-//%      [[GPB##NAME##Array alloc] initWithValues:kValues2
-//%            NAME$S                     count:GPBARRAYSIZE(kValues2)];
-//%  XCTAssertNotNil(array2);
-//%  [array add##HELPER##ValuesFromArray:array2];
-//%  XCTAssertEqual(array.count, 5U);
-//%
-//%  // Zero/nil inputs do nothing.
-//%  [array addValues:kValues1 count:0];
-//%  XCTAssertEqual(array.count, 5U);
-//%  [array addValues:NULL count:5];
-//%  XCTAssertEqual(array.count, 5U);
-//%
-//%  XCTAssertEqual([array valueAtIndex:0], VAL1);
-//%  XCTAssertEqual([array valueAtIndex:1], VAL2);
-//%  XCTAssertEqual([array valueAtIndex:2], VAL3);
-//%  XCTAssertEqual([array valueAtIndex:3], VAL4);
-//%  XCTAssertEqual([array valueAtIndex:4], VAL1);
-//%  [array2 release];
-//%}
-//%
-//%- (void)testInsert {
-//%  const TYPE kValues[] = { VAL1, VAL2, VAL3 };
-//%  GPB##NAME##Array *array =
-//%      [[GPB##NAME##Array alloc] initWithValues:kValues
-//%            NAME$S                     count:GPBARRAYSIZE(kValues)];
-//%  XCTAssertNotNil(array);
-//%  XCTAssertEqual(array.count, 3U);
-//%
-//%  // First
-//%  [array insertValue:VAL4 atIndex:0];
-//%  XCTAssertEqual(array.count, 4U);
-//%
-//%  // Middle
-//%  [array insertValue:VAL4 atIndex:2];
-//%  XCTAssertEqual(array.count, 5U);
-//%
-//%  // End
-//%  [array insertValue:VAL4 atIndex:5];
-//%  XCTAssertEqual(array.count, 6U);
-//%
-//%  // Too far.
-//%  XCTAssertThrowsSpecificNamed([array insertValue:VAL4 atIndex:7],
-//%                               NSException, NSRangeException);
-//%
-//%  XCTAssertEqual([array valueAtIndex:0], VAL4);
-//%  XCTAssertEqual([array valueAtIndex:1], VAL1);
-//%  XCTAssertEqual([array valueAtIndex:2], VAL4);
-//%  XCTAssertEqual([array valueAtIndex:3], VAL2);
-//%  XCTAssertEqual([array valueAtIndex:4], VAL3);
-//%  XCTAssertEqual([array valueAtIndex:5], VAL4);
-//%  [array release];
-//%}
-//%
-//%- (void)testRemove {
-//%  const TYPE kValues[] = { VAL4, VAL1, VAL2, VAL4, VAL3, VAL4 };
-//%  GPB##NAME##Array *array =
-//%      [[GPB##NAME##Array alloc] initWithValues:kValues
-//%            NAME$S                     count:GPBARRAYSIZE(kValues)];
-//%  XCTAssertNotNil(array);
-//%  XCTAssertEqual(array.count, 6U);
-//%
-//%  // First
-//%  [array removeValueAtIndex:0];
-//%  XCTAssertEqual(array.count, 5U);
-//%  XCTAssertEqual([array valueAtIndex:0], VAL1);
-//%
-//%  // Middle
-//%  [array removeValueAtIndex:2];
-//%  XCTAssertEqual(array.count, 4U);
-//%  XCTAssertEqual([array valueAtIndex:2], VAL3);
-//%
-//%  // End
-//%  [array removeValueAtIndex:3];
-//%  XCTAssertEqual(array.count, 3U);
-//%
-//%  XCTAssertEqual([array valueAtIndex:0], VAL1);
-//%  XCTAssertEqual([array valueAtIndex:1], VAL2);
-//%  XCTAssertEqual([array valueAtIndex:2], VAL3);
-//%
-//%  // Too far.
-//%  XCTAssertThrowsSpecificNamed([array removeValueAtIndex:3],
-//%                               NSException, NSRangeException);
-//%
-//%  [array removeAll];
-//%  XCTAssertEqual(array.count, 0U);
-//%  XCTAssertThrowsSpecificNamed([array removeValueAtIndex:0],
-//%                               NSException, NSRangeException);
-//%  [array release];
-//%}
-//%
-//%- (void)testInplaceMutation {
-//%  const TYPE kValues[] = { VAL1, VAL1, VAL3, VAL3 };
-//%  GPB##NAME##Array *array =
-//%      [[GPB##NAME##Array alloc] initWithValues:kValues
-//%            NAME$S                     count:GPBARRAYSIZE(kValues)];
-//%  XCTAssertNotNil(array);
-//%
-//%  [array replaceValueAtIndex:1 withValue:VAL2];
-//%  [array replaceValueAtIndex:3 withValue:VAL4];
-//%  XCTAssertEqual(array.count, 4U);
-//%  XCTAssertEqual([array valueAtIndex:0], VAL1);
-//%  XCTAssertEqual([array valueAtIndex:1], VAL2);
-//%  XCTAssertEqual([array valueAtIndex:2], VAL3);
-//%  XCTAssertEqual([array valueAtIndex:3], VAL4);
-//%
-//%  XCTAssertThrowsSpecificNamed([array replaceValueAtIndex:4 withValue:VAL4],
-//%                               NSException, NSRangeException);
-//%
-//%  [array exchangeValueAtIndex:1 withValueAtIndex:3];
-//%  XCTAssertEqual(array.count, 4U);
-//%  XCTAssertEqual([array valueAtIndex:0], VAL1);
-//%  XCTAssertEqual([array valueAtIndex:1], VAL4);
-//%  XCTAssertEqual([array valueAtIndex:2], VAL3);
-//%  XCTAssertEqual([array valueAtIndex:3], VAL2);
-//%
-//%  [array exchangeValueAtIndex:2 withValueAtIndex:0];
-//%  XCTAssertEqual(array.count, 4U);
-//%  XCTAssertEqual([array valueAtIndex:0], VAL3);
-//%  XCTAssertEqual([array valueAtIndex:1], VAL4);
-//%  XCTAssertEqual([array valueAtIndex:2], VAL1);
-//%  XCTAssertEqual([array valueAtIndex:3], VAL2);
-//%
-//%  XCTAssertThrowsSpecificNamed([array exchangeValueAtIndex:4 withValueAtIndex:1],
-//%                               NSException, NSRangeException);
-//%  XCTAssertThrowsSpecificNamed([array exchangeValueAtIndex:1 withValueAtIndex:4],
-//%                               NSException, NSRangeException);
-//%  [array release];
-//%}
-//%
-//%- (void)testInternalResizing {
-//%  const TYPE kValues[] = { VAL1, VAL2, VAL3, VAL4 };
-//%  GPB##NAME##Array *array =
-//%      [GPB##NAME##Array arrayWithCapacity:GPBARRAYSIZE(kValues)];
-//%  XCTAssertNotNil(array);
-//%  [array addValues:kValues count:GPBARRAYSIZE(kValues)];
-//%
-//%  // Add/remove to trigger the intneral buffer to grow/shrink.
-//%  for (int i = 0; i < 100; ++i) {
-//%    [array addValues:kValues count:GPBARRAYSIZE(kValues)];
-//%  }
-//%  XCTAssertEqual(array.count, 404U);
-//%  for (int i = 0; i < 100; ++i) {
-//%    [array removeValueAtIndex:(i * 2)];
-//%  }
-//%  XCTAssertEqual(array.count, 304U);
-//%  for (int i = 0; i < 100; ++i) {
-//%    [array insertValue:VAL4 atIndex:(i * 3)];
-//%  }
-//%  XCTAssertEqual(array.count, 404U);
-//%  [array removeAll];
-//%  XCTAssertEqual(array.count, 0U);
-//%}
-//%
-//%@end
-//%
-//%PDDM-EXPAND ARRAY_TESTS(Int32, int32_t, 1, 2, 3, 4)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-#pragma mark - Int32
-
-@interface GPBInt32ArrayTests : XCTestCase
-@end
-
-@implementation GPBInt32ArrayTests
-
-- (void)testEmpty {
-  GPBInt32Array *array = [[GPBInt32Array alloc] init];
-  XCTAssertNotNil(array);
-  XCTAssertEqual(array.count, 0U);
-  XCTAssertThrowsSpecificNamed([array valueAtIndex:0], NSException, NSRangeException);
-  [array enumerateValuesWithBlock:^(int32_t value, NSUInteger idx, BOOL *stop) {
-    #pragma unused(value, idx, stop)
-    XCTFail(@"Shouldn't get here!");
-  }];
-  [array enumerateValuesWithOptions:NSEnumerationReverse
-                         usingBlock:^(int32_t value, NSUInteger idx, BOOL *stop) {
-    #pragma unused(value, idx, stop)
-    XCTFail(@"Shouldn't get here!");
-  }];
-  [array release];
-}
-
-- (void)testOne {
-  GPBInt32Array *array = [GPBInt32Array arrayWithValue:1];
-  XCTAssertNotNil(array);
-  XCTAssertEqual(array.count, 1U);
-  XCTAssertEqual([array valueAtIndex:0], 1);
-  XCTAssertThrowsSpecificNamed([array valueAtIndex:1], NSException, NSRangeException);
-  [array enumerateValuesWithBlock:^(int32_t value, NSUInteger idx, BOOL *stop) {
-    XCTAssertEqual(idx, 0U);
-    XCTAssertEqual(value, 1);
-    XCTAssertNotEqual(stop, NULL);
-  }];
-  [array enumerateValuesWithOptions:NSEnumerationReverse
-                         usingBlock:^(int32_t value, NSUInteger idx, BOOL *stop) {
-    XCTAssertEqual(idx, 0U);
-    XCTAssertEqual(value, 1);
-    XCTAssertNotEqual(stop, NULL);
-  }];
-}
-
-- (void)testBasics {
-  static const int32_t kValues[] = { 1, 2, 3, 4 };
-  GPBInt32Array *array =
-      [[GPBInt32Array alloc] initWithValues:kValues
-                                      count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(array);
-  XCTAssertEqual(array.count, 4U);
-  XCTAssertEqual([array valueAtIndex:0], 1);
-  XCTAssertEqual([array valueAtIndex:1], 2);
-  XCTAssertEqual([array valueAtIndex:2], 3);
-  XCTAssertEqual([array valueAtIndex:3], 4);
-  XCTAssertThrowsSpecificNamed([array valueAtIndex:4], NSException, NSRangeException);
-  __block NSUInteger idx2 = 0;
-  [array enumerateValuesWithBlock:^(int32_t value, NSUInteger idx, BOOL *stop) {
-    XCTAssertEqual(idx, idx2);
-    XCTAssertEqual(value, kValues[idx]);
-    XCTAssertNotEqual(stop, NULL);
-    ++idx2;
-  }];
-  idx2 = 0;
-  [array enumerateValuesWithOptions:NSEnumerationReverse
-                         usingBlock:^(int32_t value, NSUInteger idx, BOOL *stop) {
-    XCTAssertEqual(idx, (3 - idx2));
-    XCTAssertEqual(value, kValues[idx]);
-    XCTAssertNotEqual(stop, NULL);
-    ++idx2;
-  }];
-  // Stopping the enumeration.
-  idx2 = 0;
-  [array enumerateValuesWithBlock:^(int32_t value, NSUInteger idx, BOOL *stop) {
-    XCTAssertEqual(idx, idx2);
-    XCTAssertEqual(value, kValues[idx]);
-    XCTAssertNotEqual(stop, NULL);
-    if (idx2 == 1) *stop = YES;
-    XCTAssertNotEqual(idx, 2U);
-    XCTAssertNotEqual(idx, 3U);
-    ++idx2;
-  }];
-  idx2 = 0;
-  [array enumerateValuesWithOptions:NSEnumerationReverse
-                         usingBlock:^(int32_t value, NSUInteger idx, BOOL *stop) {
-    XCTAssertEqual(idx, (3 - idx2));
-    XCTAssertEqual(value, kValues[idx]);
-    XCTAssertNotEqual(stop, NULL);
-    if (idx2 == 1) *stop = YES;
-    XCTAssertNotEqual(idx, 1U);
-    XCTAssertNotEqual(idx, 0U);
-    ++idx2;
-  }];
-  // Ensure description doesn't choke.
-  XCTAssertTrue(array.description.length > 10);
-  [array release];
-}
-
-- (void)testEquality {
-  const int32_t kValues1[] = { 1, 2, 3 };
-  const int32_t kValues2[] = { 1, 4, 3 };
-  const int32_t kValues3[] = { 1, 2, 3, 4 };
-  GPBInt32Array *array1 =
-      [[GPBInt32Array alloc] initWithValues:kValues1
-                                      count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(array1);
-  GPBInt32Array *array1prime =
-      [[GPBInt32Array alloc] initWithValues:kValues1
-                                      count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(array1prime);
-  GPBInt32Array *array2 =
-      [[GPBInt32Array alloc] initWithValues:kValues2
-                                      count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(array2);
-  GPBInt32Array *array3 =
-      [[GPBInt32Array alloc] initWithValues:kValues3
-                                      count:GPBARRAYSIZE(kValues3)];
-  XCTAssertNotNil(array3);
-
-  // Identity
-  XCTAssertTrue([array1 isEqual:array1]);
-  // Wrong type doesn't blow up.
-  XCTAssertFalse([array1 isEqual:@"bogus"]);
-  // 1/1Prime should be different objects, but equal.
-  XCTAssertNotEqual(array1, array1prime);
-  XCTAssertEqualObjects(array1, array1prime);
-  // Equal, so they must have same hash.
-  XCTAssertEqual([array1 hash], [array1prime hash]);
-
-  // 1/2/3 shouldn't be equal.
-  XCTAssertNotEqualObjects(array1, array2);
-  XCTAssertNotEqualObjects(array1, array3);
-  XCTAssertNotEqualObjects(array2, array3);
-
-  [array1 release];
-  [array1prime release];
-  [array2 release];
-  [array3 release];
-}
-
-- (void)testCopy {
-  const int32_t kValues[] = { 1, 2, 3, 4 };
-  GPBInt32Array *array =
-      [[GPBInt32Array alloc] initWithValues:kValues
-                                      count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(array);
-
-  GPBInt32Array *array2 = [array copy];
-  XCTAssertNotNil(array2);
-
-  // Should be new object but equal.
-  XCTAssertNotEqual(array, array2);
-  XCTAssertEqualObjects(array, array2);
-  [array2 release];
-  [array release];
-}
-
-- (void)testArrayFromArray {
-  const int32_t kValues[] = { 1, 2, 3, 4 };
-  GPBInt32Array *array =
-      [[GPBInt32Array alloc] initWithValues:kValues
-                                      count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(array);
-
-  GPBInt32Array *array2 = [GPBInt32Array arrayWithValueArray:array];
-  XCTAssertNotNil(array2);
-
-  // Should be new pointer, but equal objects.
-  XCTAssertNotEqual(array, array2);
-  XCTAssertEqualObjects(array, array2);
-  [array release];
-}
-
-- (void)testAdds {
-  GPBInt32Array *array = [GPBInt32Array array];
-  XCTAssertNotNil(array);
-
-  XCTAssertEqual(array.count, 0U);
-  [array addValue:1];
-  XCTAssertEqual(array.count, 1U);
-
-  const int32_t kValues1[] = { 2, 3 };
-  [array addValues:kValues1 count:GPBARRAYSIZE(kValues1)];
-  XCTAssertEqual(array.count, 3U);
-
-  const int32_t kValues2[] = { 4, 1 };
-  GPBInt32Array *array2 =
-      [[GPBInt32Array alloc] initWithValues:kValues2
-                                      count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(array2);
-  [array addValuesFromArray:array2];
-  XCTAssertEqual(array.count, 5U);
-
-  // Zero/nil inputs do nothing.
-  [array addValues:kValues1 count:0];
-  XCTAssertEqual(array.count, 5U);
-  [array addValues:NULL count:5];
-  XCTAssertEqual(array.count, 5U);
-
-  XCTAssertEqual([array valueAtIndex:0], 1);
-  XCTAssertEqual([array valueAtIndex:1], 2);
-  XCTAssertEqual([array valueAtIndex:2], 3);
-  XCTAssertEqual([array valueAtIndex:3], 4);
-  XCTAssertEqual([array valueAtIndex:4], 1);
-  [array2 release];
-}
-
-- (void)testInsert {
-  const int32_t kValues[] = { 1, 2, 3 };
-  GPBInt32Array *array =
-      [[GPBInt32Array alloc] initWithValues:kValues
-                                      count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(array);
-  XCTAssertEqual(array.count, 3U);
-
-  // First
-  [array insertValue:4 atIndex:0];
-  XCTAssertEqual(array.count, 4U);
-
-  // Middle
-  [array insertValue:4 atIndex:2];
-  XCTAssertEqual(array.count, 5U);
-
-  // End
-  [array insertValue:4 atIndex:5];
-  XCTAssertEqual(array.count, 6U);
-
-  // Too far.
-  XCTAssertThrowsSpecificNamed([array insertValue:4 atIndex:7],
-                               NSException, NSRangeException);
-
-  XCTAssertEqual([array valueAtIndex:0], 4);
-  XCTAssertEqual([array valueAtIndex:1], 1);
-  XCTAssertEqual([array valueAtIndex:2], 4);
-  XCTAssertEqual([array valueAtIndex:3], 2);
-  XCTAssertEqual([array valueAtIndex:4], 3);
-  XCTAssertEqual([array valueAtIndex:5], 4);
-  [array release];
-}
-
-- (void)testRemove {
-  const int32_t kValues[] = { 4, 1, 2, 4, 3, 4 };
-  GPBInt32Array *array =
-      [[GPBInt32Array alloc] initWithValues:kValues
-                                      count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(array);
-  XCTAssertEqual(array.count, 6U);
-
-  // First
-  [array removeValueAtIndex:0];
-  XCTAssertEqual(array.count, 5U);
-  XCTAssertEqual([array valueAtIndex:0], 1);
-
-  // Middle
-  [array removeValueAtIndex:2];
-  XCTAssertEqual(array.count, 4U);
-  XCTAssertEqual([array valueAtIndex:2], 3);
-
-  // End
-  [array removeValueAtIndex:3];
-  XCTAssertEqual(array.count, 3U);
-
-  XCTAssertEqual([array valueAtIndex:0], 1);
-  XCTAssertEqual([array valueAtIndex:1], 2);
-  XCTAssertEqual([array valueAtIndex:2], 3);
-
-  // Too far.
-  XCTAssertThrowsSpecificNamed([array removeValueAtIndex:3],
-                               NSException, NSRangeException);
-
-  [array removeAll];
-  XCTAssertEqual(array.count, 0U);
-  XCTAssertThrowsSpecificNamed([array removeValueAtIndex:0],
-                               NSException, NSRangeException);
-  [array release];
-}
-
-- (void)testInplaceMutation {
-  const int32_t kValues[] = { 1, 1, 3, 3 };
-  GPBInt32Array *array =
-      [[GPBInt32Array alloc] initWithValues:kValues
-                                      count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(array);
-
-  [array replaceValueAtIndex:1 withValue:2];
-  [array replaceValueAtIndex:3 withValue:4];
-  XCTAssertEqual(array.count, 4U);
-  XCTAssertEqual([array valueAtIndex:0], 1);
-  XCTAssertEqual([array valueAtIndex:1], 2);
-  XCTAssertEqual([array valueAtIndex:2], 3);
-  XCTAssertEqual([array valueAtIndex:3], 4);
-
-  XCTAssertThrowsSpecificNamed([array replaceValueAtIndex:4 withValue:4],
-                               NSException, NSRangeException);
-
-  [array exchangeValueAtIndex:1 withValueAtIndex:3];
-  XCTAssertEqual(array.count, 4U);
-  XCTAssertEqual([array valueAtIndex:0], 1);
-  XCTAssertEqual([array valueAtIndex:1], 4);
-  XCTAssertEqual([array valueAtIndex:2], 3);
-  XCTAssertEqual([array valueAtIndex:3], 2);
-
-  [array exchangeValueAtIndex:2 withValueAtIndex:0];
-  XCTAssertEqual(array.count, 4U);
-  XCTAssertEqual([array valueAtIndex:0], 3);
-  XCTAssertEqual([array valueAtIndex:1], 4);
-  XCTAssertEqual([array valueAtIndex:2], 1);
-  XCTAssertEqual([array valueAtIndex:3], 2);
-
-  XCTAssertThrowsSpecificNamed([array exchangeValueAtIndex:4 withValueAtIndex:1],
-                               NSException, NSRangeException);
-  XCTAssertThrowsSpecificNamed([array exchangeValueAtIndex:1 withValueAtIndex:4],
-                               NSException, NSRangeException);
-  [array release];
-}
-
-- (void)testInternalResizing {
-  const int32_t kValues[] = { 1, 2, 3, 4 };
-  GPBInt32Array *array =
-      [GPBInt32Array arrayWithCapacity:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(array);
-  [array addValues:kValues count:GPBARRAYSIZE(kValues)];
-
-  // Add/remove to trigger the intneral buffer to grow/shrink.
-  for (int i = 0; i < 100; ++i) {
-    [array addValues:kValues count:GPBARRAYSIZE(kValues)];
-  }
-  XCTAssertEqual(array.count, 404U);
-  for (int i = 0; i < 100; ++i) {
-    [array removeValueAtIndex:(i * 2)];
-  }
-  XCTAssertEqual(array.count, 304U);
-  for (int i = 0; i < 100; ++i) {
-    [array insertValue:4 atIndex:(i * 3)];
-  }
-  XCTAssertEqual(array.count, 404U);
-  [array removeAll];
-  XCTAssertEqual(array.count, 0U);
-}
-
-@end
-
-// clang-format on
-//%PDDM-EXPAND ARRAY_TESTS(UInt32, uint32_t, 11U, 12U, 13U, 14U)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-#pragma mark - UInt32
-
-@interface GPBUInt32ArrayTests : XCTestCase
-@end
-
-@implementation GPBUInt32ArrayTests
-
-- (void)testEmpty {
-  GPBUInt32Array *array = [[GPBUInt32Array alloc] init];
-  XCTAssertNotNil(array);
-  XCTAssertEqual(array.count, 0U);
-  XCTAssertThrowsSpecificNamed([array valueAtIndex:0], NSException, NSRangeException);
-  [array enumerateValuesWithBlock:^(uint32_t value, NSUInteger idx, BOOL *stop) {
-    #pragma unused(value, idx, stop)
-    XCTFail(@"Shouldn't get here!");
-  }];
-  [array enumerateValuesWithOptions:NSEnumerationReverse
-                         usingBlock:^(uint32_t value, NSUInteger idx, BOOL *stop) {
-    #pragma unused(value, idx, stop)
-    XCTFail(@"Shouldn't get here!");
-  }];
-  [array release];
-}
-
-- (void)testOne {
-  GPBUInt32Array *array = [GPBUInt32Array arrayWithValue:11U];
-  XCTAssertNotNil(array);
-  XCTAssertEqual(array.count, 1U);
-  XCTAssertEqual([array valueAtIndex:0], 11U);
-  XCTAssertThrowsSpecificNamed([array valueAtIndex:1], NSException, NSRangeException);
-  [array enumerateValuesWithBlock:^(uint32_t value, NSUInteger idx, BOOL *stop) {
-    XCTAssertEqual(idx, 0U);
-    XCTAssertEqual(value, 11U);
-    XCTAssertNotEqual(stop, NULL);
-  }];
-  [array enumerateValuesWithOptions:NSEnumerationReverse
-                         usingBlock:^(uint32_t value, NSUInteger idx, BOOL *stop) {
-    XCTAssertEqual(idx, 0U);
-    XCTAssertEqual(value, 11U);
-    XCTAssertNotEqual(stop, NULL);
-  }];
-}
-
-- (void)testBasics {
-  static const uint32_t kValues[] = { 11U, 12U, 13U, 14U };
-  GPBUInt32Array *array =
-      [[GPBUInt32Array alloc] initWithValues:kValues
-                                       count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(array);
-  XCTAssertEqual(array.count, 4U);
-  XCTAssertEqual([array valueAtIndex:0], 11U);
-  XCTAssertEqual([array valueAtIndex:1], 12U);
-  XCTAssertEqual([array valueAtIndex:2], 13U);
-  XCTAssertEqual([array valueAtIndex:3], 14U);
-  XCTAssertThrowsSpecificNamed([array valueAtIndex:4], NSException, NSRangeException);
-  __block NSUInteger idx2 = 0;
-  [array enumerateValuesWithBlock:^(uint32_t value, NSUInteger idx, BOOL *stop) {
-    XCTAssertEqual(idx, idx2);
-    XCTAssertEqual(value, kValues[idx]);
-    XCTAssertNotEqual(stop, NULL);
-    ++idx2;
-  }];
-  idx2 = 0;
-  [array enumerateValuesWithOptions:NSEnumerationReverse
-                         usingBlock:^(uint32_t value, NSUInteger idx, BOOL *stop) {
-    XCTAssertEqual(idx, (3 - idx2));
-    XCTAssertEqual(value, kValues[idx]);
-    XCTAssertNotEqual(stop, NULL);
-    ++idx2;
-  }];
-  // Stopping the enumeration.
-  idx2 = 0;
-  [array enumerateValuesWithBlock:^(uint32_t value, NSUInteger idx, BOOL *stop) {
-    XCTAssertEqual(idx, idx2);
-    XCTAssertEqual(value, kValues[idx]);
-    XCTAssertNotEqual(stop, NULL);
-    if (idx2 == 1) *stop = YES;
-    XCTAssertNotEqual(idx, 2U);
-    XCTAssertNotEqual(idx, 3U);
-    ++idx2;
-  }];
-  idx2 = 0;
-  [array enumerateValuesWithOptions:NSEnumerationReverse
-                         usingBlock:^(uint32_t value, NSUInteger idx, BOOL *stop) {
-    XCTAssertEqual(idx, (3 - idx2));
-    XCTAssertEqual(value, kValues[idx]);
-    XCTAssertNotEqual(stop, NULL);
-    if (idx2 == 1) *stop = YES;
-    XCTAssertNotEqual(idx, 1U);
-    XCTAssertNotEqual(idx, 0U);
-    ++idx2;
-  }];
-  // Ensure description doesn't choke.
-  XCTAssertTrue(array.description.length > 10);
-  [array release];
-}
-
-- (void)testEquality {
-  const uint32_t kValues1[] = { 11U, 12U, 13U };
-  const uint32_t kValues2[] = { 11U, 14U, 13U };
-  const uint32_t kValues3[] = { 11U, 12U, 13U, 14U };
-  GPBUInt32Array *array1 =
-      [[GPBUInt32Array alloc] initWithValues:kValues1
-                                       count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(array1);
-  GPBUInt32Array *array1prime =
-      [[GPBUInt32Array alloc] initWithValues:kValues1
-                                       count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(array1prime);
-  GPBUInt32Array *array2 =
-      [[GPBUInt32Array alloc] initWithValues:kValues2
-                                       count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(array2);
-  GPBUInt32Array *array3 =
-      [[GPBUInt32Array alloc] initWithValues:kValues3
-                                       count:GPBARRAYSIZE(kValues3)];
-  XCTAssertNotNil(array3);
-
-  // Identity
-  XCTAssertTrue([array1 isEqual:array1]);
-  // Wrong type doesn't blow up.
-  XCTAssertFalse([array1 isEqual:@"bogus"]);
-  // 1/1Prime should be different objects, but equal.
-  XCTAssertNotEqual(array1, array1prime);
-  XCTAssertEqualObjects(array1, array1prime);
-  // Equal, so they must have same hash.
-  XCTAssertEqual([array1 hash], [array1prime hash]);
-
-  // 1/2/3 shouldn't be equal.
-  XCTAssertNotEqualObjects(array1, array2);
-  XCTAssertNotEqualObjects(array1, array3);
-  XCTAssertNotEqualObjects(array2, array3);
-
-  [array1 release];
-  [array1prime release];
-  [array2 release];
-  [array3 release];
-}
-
-- (void)testCopy {
-  const uint32_t kValues[] = { 11U, 12U, 13U, 14U };
-  GPBUInt32Array *array =
-      [[GPBUInt32Array alloc] initWithValues:kValues
-                                       count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(array);
-
-  GPBUInt32Array *array2 = [array copy];
-  XCTAssertNotNil(array2);
-
-  // Should be new object but equal.
-  XCTAssertNotEqual(array, array2);
-  XCTAssertEqualObjects(array, array2);
-  [array2 release];
-  [array release];
-}
-
-- (void)testArrayFromArray {
-  const uint32_t kValues[] = { 11U, 12U, 13U, 14U };
-  GPBUInt32Array *array =
-      [[GPBUInt32Array alloc] initWithValues:kValues
-                                       count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(array);
-
-  GPBUInt32Array *array2 = [GPBUInt32Array arrayWithValueArray:array];
-  XCTAssertNotNil(array2);
-
-  // Should be new pointer, but equal objects.
-  XCTAssertNotEqual(array, array2);
-  XCTAssertEqualObjects(array, array2);
-  [array release];
-}
-
-- (void)testAdds {
-  GPBUInt32Array *array = [GPBUInt32Array array];
-  XCTAssertNotNil(array);
-
-  XCTAssertEqual(array.count, 0U);
-  [array addValue:11U];
-  XCTAssertEqual(array.count, 1U);
-
-  const uint32_t kValues1[] = { 12U, 13U };
-  [array addValues:kValues1 count:GPBARRAYSIZE(kValues1)];
-  XCTAssertEqual(array.count, 3U);
-
-  const uint32_t kValues2[] = { 14U, 11U };
-  GPBUInt32Array *array2 =
-      [[GPBUInt32Array alloc] initWithValues:kValues2
-                                       count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(array2);
-  [array addValuesFromArray:array2];
-  XCTAssertEqual(array.count, 5U);
-
-  // Zero/nil inputs do nothing.
-  [array addValues:kValues1 count:0];
-  XCTAssertEqual(array.count, 5U);
-  [array addValues:NULL count:5];
-  XCTAssertEqual(array.count, 5U);
-
-  XCTAssertEqual([array valueAtIndex:0], 11U);
-  XCTAssertEqual([array valueAtIndex:1], 12U);
-  XCTAssertEqual([array valueAtIndex:2], 13U);
-  XCTAssertEqual([array valueAtIndex:3], 14U);
-  XCTAssertEqual([array valueAtIndex:4], 11U);
-  [array2 release];
-}
-
-- (void)testInsert {
-  const uint32_t kValues[] = { 11U, 12U, 13U };
-  GPBUInt32Array *array =
-      [[GPBUInt32Array alloc] initWithValues:kValues
-                                       count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(array);
-  XCTAssertEqual(array.count, 3U);
-
-  // First
-  [array insertValue:14U atIndex:0];
-  XCTAssertEqual(array.count, 4U);
-
-  // Middle
-  [array insertValue:14U atIndex:2];
-  XCTAssertEqual(array.count, 5U);
-
-  // End
-  [array insertValue:14U atIndex:5];
-  XCTAssertEqual(array.count, 6U);
-
-  // Too far.
-  XCTAssertThrowsSpecificNamed([array insertValue:14U atIndex:7],
-                               NSException, NSRangeException);
-
-  XCTAssertEqual([array valueAtIndex:0], 14U);
-  XCTAssertEqual([array valueAtIndex:1], 11U);
-  XCTAssertEqual([array valueAtIndex:2], 14U);
-  XCTAssertEqual([array valueAtIndex:3], 12U);
-  XCTAssertEqual([array valueAtIndex:4], 13U);
-  XCTAssertEqual([array valueAtIndex:5], 14U);
-  [array release];
-}
-
-- (void)testRemove {
-  const uint32_t kValues[] = { 14U, 11U, 12U, 14U, 13U, 14U };
-  GPBUInt32Array *array =
-      [[GPBUInt32Array alloc] initWithValues:kValues
-                                       count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(array);
-  XCTAssertEqual(array.count, 6U);
-
-  // First
-  [array removeValueAtIndex:0];
-  XCTAssertEqual(array.count, 5U);
-  XCTAssertEqual([array valueAtIndex:0], 11U);
-
-  // Middle
-  [array removeValueAtIndex:2];
-  XCTAssertEqual(array.count, 4U);
-  XCTAssertEqual([array valueAtIndex:2], 13U);
-
-  // End
-  [array removeValueAtIndex:3];
-  XCTAssertEqual(array.count, 3U);
-
-  XCTAssertEqual([array valueAtIndex:0], 11U);
-  XCTAssertEqual([array valueAtIndex:1], 12U);
-  XCTAssertEqual([array valueAtIndex:2], 13U);
-
-  // Too far.
-  XCTAssertThrowsSpecificNamed([array removeValueAtIndex:3],
-                               NSException, NSRangeException);
-
-  [array removeAll];
-  XCTAssertEqual(array.count, 0U);
-  XCTAssertThrowsSpecificNamed([array removeValueAtIndex:0],
-                               NSException, NSRangeException);
-  [array release];
-}
-
-- (void)testInplaceMutation {
-  const uint32_t kValues[] = { 11U, 11U, 13U, 13U };
-  GPBUInt32Array *array =
-      [[GPBUInt32Array alloc] initWithValues:kValues
-                                       count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(array);
-
-  [array replaceValueAtIndex:1 withValue:12U];
-  [array replaceValueAtIndex:3 withValue:14U];
-  XCTAssertEqual(array.count, 4U);
-  XCTAssertEqual([array valueAtIndex:0], 11U);
-  XCTAssertEqual([array valueAtIndex:1], 12U);
-  XCTAssertEqual([array valueAtIndex:2], 13U);
-  XCTAssertEqual([array valueAtIndex:3], 14U);
-
-  XCTAssertThrowsSpecificNamed([array replaceValueAtIndex:4 withValue:14U],
-                               NSException, NSRangeException);
-
-  [array exchangeValueAtIndex:1 withValueAtIndex:3];
-  XCTAssertEqual(array.count, 4U);
-  XCTAssertEqual([array valueAtIndex:0], 11U);
-  XCTAssertEqual([array valueAtIndex:1], 14U);
-  XCTAssertEqual([array valueAtIndex:2], 13U);
-  XCTAssertEqual([array valueAtIndex:3], 12U);
-
-  [array exchangeValueAtIndex:2 withValueAtIndex:0];
-  XCTAssertEqual(array.count, 4U);
-  XCTAssertEqual([array valueAtIndex:0], 13U);
-  XCTAssertEqual([array valueAtIndex:1], 14U);
-  XCTAssertEqual([array valueAtIndex:2], 11U);
-  XCTAssertEqual([array valueAtIndex:3], 12U);
-
-  XCTAssertThrowsSpecificNamed([array exchangeValueAtIndex:4 withValueAtIndex:1],
-                               NSException, NSRangeException);
-  XCTAssertThrowsSpecificNamed([array exchangeValueAtIndex:1 withValueAtIndex:4],
-                               NSException, NSRangeException);
-  [array release];
-}
-
-- (void)testInternalResizing {
-  const uint32_t kValues[] = { 11U, 12U, 13U, 14U };
-  GPBUInt32Array *array =
-      [GPBUInt32Array arrayWithCapacity:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(array);
-  [array addValues:kValues count:GPBARRAYSIZE(kValues)];
-
-  // Add/remove to trigger the intneral buffer to grow/shrink.
-  for (int i = 0; i < 100; ++i) {
-    [array addValues:kValues count:GPBARRAYSIZE(kValues)];
-  }
-  XCTAssertEqual(array.count, 404U);
-  for (int i = 0; i < 100; ++i) {
-    [array removeValueAtIndex:(i * 2)];
-  }
-  XCTAssertEqual(array.count, 304U);
-  for (int i = 0; i < 100; ++i) {
-    [array insertValue:14U atIndex:(i * 3)];
-  }
-  XCTAssertEqual(array.count, 404U);
-  [array removeAll];
-  XCTAssertEqual(array.count, 0U);
-}
-
-@end
-
-// clang-format on
-//%PDDM-EXPAND ARRAY_TESTS(Int64, int64_t, 31LL, 32LL, 33LL, 34LL)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-#pragma mark - Int64
-
-@interface GPBInt64ArrayTests : XCTestCase
-@end
-
-@implementation GPBInt64ArrayTests
-
-- (void)testEmpty {
-  GPBInt64Array *array = [[GPBInt64Array alloc] init];
-  XCTAssertNotNil(array);
-  XCTAssertEqual(array.count, 0U);
-  XCTAssertThrowsSpecificNamed([array valueAtIndex:0], NSException, NSRangeException);
-  [array enumerateValuesWithBlock:^(int64_t value, NSUInteger idx, BOOL *stop) {
-    #pragma unused(value, idx, stop)
-    XCTFail(@"Shouldn't get here!");
-  }];
-  [array enumerateValuesWithOptions:NSEnumerationReverse
-                         usingBlock:^(int64_t value, NSUInteger idx, BOOL *stop) {
-    #pragma unused(value, idx, stop)
-    XCTFail(@"Shouldn't get here!");
-  }];
-  [array release];
-}
-
-- (void)testOne {
-  GPBInt64Array *array = [GPBInt64Array arrayWithValue:31LL];
-  XCTAssertNotNil(array);
-  XCTAssertEqual(array.count, 1U);
-  XCTAssertEqual([array valueAtIndex:0], 31LL);
-  XCTAssertThrowsSpecificNamed([array valueAtIndex:1], NSException, NSRangeException);
-  [array enumerateValuesWithBlock:^(int64_t value, NSUInteger idx, BOOL *stop) {
-    XCTAssertEqual(idx, 0U);
-    XCTAssertEqual(value, 31LL);
-    XCTAssertNotEqual(stop, NULL);
-  }];
-  [array enumerateValuesWithOptions:NSEnumerationReverse
-                         usingBlock:^(int64_t value, NSUInteger idx, BOOL *stop) {
-    XCTAssertEqual(idx, 0U);
-    XCTAssertEqual(value, 31LL);
-    XCTAssertNotEqual(stop, NULL);
-  }];
-}
-
-- (void)testBasics {
-  static const int64_t kValues[] = { 31LL, 32LL, 33LL, 34LL };
-  GPBInt64Array *array =
-      [[GPBInt64Array alloc] initWithValues:kValues
-                                      count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(array);
-  XCTAssertEqual(array.count, 4U);
-  XCTAssertEqual([array valueAtIndex:0], 31LL);
-  XCTAssertEqual([array valueAtIndex:1], 32LL);
-  XCTAssertEqual([array valueAtIndex:2], 33LL);
-  XCTAssertEqual([array valueAtIndex:3], 34LL);
-  XCTAssertThrowsSpecificNamed([array valueAtIndex:4], NSException, NSRangeException);
-  __block NSUInteger idx2 = 0;
-  [array enumerateValuesWithBlock:^(int64_t value, NSUInteger idx, BOOL *stop) {
-    XCTAssertEqual(idx, idx2);
-    XCTAssertEqual(value, kValues[idx]);
-    XCTAssertNotEqual(stop, NULL);
-    ++idx2;
-  }];
-  idx2 = 0;
-  [array enumerateValuesWithOptions:NSEnumerationReverse
-                         usingBlock:^(int64_t value, NSUInteger idx, BOOL *stop) {
-    XCTAssertEqual(idx, (3 - idx2));
-    XCTAssertEqual(value, kValues[idx]);
-    XCTAssertNotEqual(stop, NULL);
-    ++idx2;
-  }];
-  // Stopping the enumeration.
-  idx2 = 0;
-  [array enumerateValuesWithBlock:^(int64_t value, NSUInteger idx, BOOL *stop) {
-    XCTAssertEqual(idx, idx2);
-    XCTAssertEqual(value, kValues[idx]);
-    XCTAssertNotEqual(stop, NULL);
-    if (idx2 == 1) *stop = YES;
-    XCTAssertNotEqual(idx, 2U);
-    XCTAssertNotEqual(idx, 3U);
-    ++idx2;
-  }];
-  idx2 = 0;
-  [array enumerateValuesWithOptions:NSEnumerationReverse
-                         usingBlock:^(int64_t value, NSUInteger idx, BOOL *stop) {
-    XCTAssertEqual(idx, (3 - idx2));
-    XCTAssertEqual(value, kValues[idx]);
-    XCTAssertNotEqual(stop, NULL);
-    if (idx2 == 1) *stop = YES;
-    XCTAssertNotEqual(idx, 1U);
-    XCTAssertNotEqual(idx, 0U);
-    ++idx2;
-  }];
-  // Ensure description doesn't choke.
-  XCTAssertTrue(array.description.length > 10);
-  [array release];
-}
-
-- (void)testEquality {
-  const int64_t kValues1[] = { 31LL, 32LL, 33LL };
-  const int64_t kValues2[] = { 31LL, 34LL, 33LL };
-  const int64_t kValues3[] = { 31LL, 32LL, 33LL, 34LL };
-  GPBInt64Array *array1 =
-      [[GPBInt64Array alloc] initWithValues:kValues1
-                                      count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(array1);
-  GPBInt64Array *array1prime =
-      [[GPBInt64Array alloc] initWithValues:kValues1
-                                      count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(array1prime);
-  GPBInt64Array *array2 =
-      [[GPBInt64Array alloc] initWithValues:kValues2
-                                      count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(array2);
-  GPBInt64Array *array3 =
-      [[GPBInt64Array alloc] initWithValues:kValues3
-                                      count:GPBARRAYSIZE(kValues3)];
-  XCTAssertNotNil(array3);
-
-  // Identity
-  XCTAssertTrue([array1 isEqual:array1]);
-  // Wrong type doesn't blow up.
-  XCTAssertFalse([array1 isEqual:@"bogus"]);
-  // 1/1Prime should be different objects, but equal.
-  XCTAssertNotEqual(array1, array1prime);
-  XCTAssertEqualObjects(array1, array1prime);
-  // Equal, so they must have same hash.
-  XCTAssertEqual([array1 hash], [array1prime hash]);
-
-  // 1/2/3 shouldn't be equal.
-  XCTAssertNotEqualObjects(array1, array2);
-  XCTAssertNotEqualObjects(array1, array3);
-  XCTAssertNotEqualObjects(array2, array3);
-
-  [array1 release];
-  [array1prime release];
-  [array2 release];
-  [array3 release];
-}
-
-- (void)testCopy {
-  const int64_t kValues[] = { 31LL, 32LL, 33LL, 34LL };
-  GPBInt64Array *array =
-      [[GPBInt64Array alloc] initWithValues:kValues
-                                      count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(array);
-
-  GPBInt64Array *array2 = [array copy];
-  XCTAssertNotNil(array2);
-
-  // Should be new object but equal.
-  XCTAssertNotEqual(array, array2);
-  XCTAssertEqualObjects(array, array2);
-  [array2 release];
-  [array release];
-}
-
-- (void)testArrayFromArray {
-  const int64_t kValues[] = { 31LL, 32LL, 33LL, 34LL };
-  GPBInt64Array *array =
-      [[GPBInt64Array alloc] initWithValues:kValues
-                                      count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(array);
-
-  GPBInt64Array *array2 = [GPBInt64Array arrayWithValueArray:array];
-  XCTAssertNotNil(array2);
-
-  // Should be new pointer, but equal objects.
-  XCTAssertNotEqual(array, array2);
-  XCTAssertEqualObjects(array, array2);
-  [array release];
-}
-
-- (void)testAdds {
-  GPBInt64Array *array = [GPBInt64Array array];
-  XCTAssertNotNil(array);
-
-  XCTAssertEqual(array.count, 0U);
-  [array addValue:31LL];
-  XCTAssertEqual(array.count, 1U);
-
-  const int64_t kValues1[] = { 32LL, 33LL };
-  [array addValues:kValues1 count:GPBARRAYSIZE(kValues1)];
-  XCTAssertEqual(array.count, 3U);
-
-  const int64_t kValues2[] = { 34LL, 31LL };
-  GPBInt64Array *array2 =
-      [[GPBInt64Array alloc] initWithValues:kValues2
-                                      count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(array2);
-  [array addValuesFromArray:array2];
-  XCTAssertEqual(array.count, 5U);
-
-  // Zero/nil inputs do nothing.
-  [array addValues:kValues1 count:0];
-  XCTAssertEqual(array.count, 5U);
-  [array addValues:NULL count:5];
-  XCTAssertEqual(array.count, 5U);
-
-  XCTAssertEqual([array valueAtIndex:0], 31LL);
-  XCTAssertEqual([array valueAtIndex:1], 32LL);
-  XCTAssertEqual([array valueAtIndex:2], 33LL);
-  XCTAssertEqual([array valueAtIndex:3], 34LL);
-  XCTAssertEqual([array valueAtIndex:4], 31LL);
-  [array2 release];
-}
-
-- (void)testInsert {
-  const int64_t kValues[] = { 31LL, 32LL, 33LL };
-  GPBInt64Array *array =
-      [[GPBInt64Array alloc] initWithValues:kValues
-                                      count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(array);
-  XCTAssertEqual(array.count, 3U);
-
-  // First
-  [array insertValue:34LL atIndex:0];
-  XCTAssertEqual(array.count, 4U);
-
-  // Middle
-  [array insertValue:34LL atIndex:2];
-  XCTAssertEqual(array.count, 5U);
-
-  // End
-  [array insertValue:34LL atIndex:5];
-  XCTAssertEqual(array.count, 6U);
-
-  // Too far.
-  XCTAssertThrowsSpecificNamed([array insertValue:34LL atIndex:7],
-                               NSException, NSRangeException);
-
-  XCTAssertEqual([array valueAtIndex:0], 34LL);
-  XCTAssertEqual([array valueAtIndex:1], 31LL);
-  XCTAssertEqual([array valueAtIndex:2], 34LL);
-  XCTAssertEqual([array valueAtIndex:3], 32LL);
-  XCTAssertEqual([array valueAtIndex:4], 33LL);
-  XCTAssertEqual([array valueAtIndex:5], 34LL);
-  [array release];
-}
-
-- (void)testRemove {
-  const int64_t kValues[] = { 34LL, 31LL, 32LL, 34LL, 33LL, 34LL };
-  GPBInt64Array *array =
-      [[GPBInt64Array alloc] initWithValues:kValues
-                                      count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(array);
-  XCTAssertEqual(array.count, 6U);
-
-  // First
-  [array removeValueAtIndex:0];
-  XCTAssertEqual(array.count, 5U);
-  XCTAssertEqual([array valueAtIndex:0], 31LL);
-
-  // Middle
-  [array removeValueAtIndex:2];
-  XCTAssertEqual(array.count, 4U);
-  XCTAssertEqual([array valueAtIndex:2], 33LL);
-
-  // End
-  [array removeValueAtIndex:3];
-  XCTAssertEqual(array.count, 3U);
-
-  XCTAssertEqual([array valueAtIndex:0], 31LL);
-  XCTAssertEqual([array valueAtIndex:1], 32LL);
-  XCTAssertEqual([array valueAtIndex:2], 33LL);
-
-  // Too far.
-  XCTAssertThrowsSpecificNamed([array removeValueAtIndex:3],
-                               NSException, NSRangeException);
-
-  [array removeAll];
-  XCTAssertEqual(array.count, 0U);
-  XCTAssertThrowsSpecificNamed([array removeValueAtIndex:0],
-                               NSException, NSRangeException);
-  [array release];
-}
-
-- (void)testInplaceMutation {
-  const int64_t kValues[] = { 31LL, 31LL, 33LL, 33LL };
-  GPBInt64Array *array =
-      [[GPBInt64Array alloc] initWithValues:kValues
-                                      count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(array);
-
-  [array replaceValueAtIndex:1 withValue:32LL];
-  [array replaceValueAtIndex:3 withValue:34LL];
-  XCTAssertEqual(array.count, 4U);
-  XCTAssertEqual([array valueAtIndex:0], 31LL);
-  XCTAssertEqual([array valueAtIndex:1], 32LL);
-  XCTAssertEqual([array valueAtIndex:2], 33LL);
-  XCTAssertEqual([array valueAtIndex:3], 34LL);
-
-  XCTAssertThrowsSpecificNamed([array replaceValueAtIndex:4 withValue:34LL],
-                               NSException, NSRangeException);
-
-  [array exchangeValueAtIndex:1 withValueAtIndex:3];
-  XCTAssertEqual(array.count, 4U);
-  XCTAssertEqual([array valueAtIndex:0], 31LL);
-  XCTAssertEqual([array valueAtIndex:1], 34LL);
-  XCTAssertEqual([array valueAtIndex:2], 33LL);
-  XCTAssertEqual([array valueAtIndex:3], 32LL);
-
-  [array exchangeValueAtIndex:2 withValueAtIndex:0];
-  XCTAssertEqual(array.count, 4U);
-  XCTAssertEqual([array valueAtIndex:0], 33LL);
-  XCTAssertEqual([array valueAtIndex:1], 34LL);
-  XCTAssertEqual([array valueAtIndex:2], 31LL);
-  XCTAssertEqual([array valueAtIndex:3], 32LL);
-
-  XCTAssertThrowsSpecificNamed([array exchangeValueAtIndex:4 withValueAtIndex:1],
-                               NSException, NSRangeException);
-  XCTAssertThrowsSpecificNamed([array exchangeValueAtIndex:1 withValueAtIndex:4],
-                               NSException, NSRangeException);
-  [array release];
-}
-
-- (void)testInternalResizing {
-  const int64_t kValues[] = { 31LL, 32LL, 33LL, 34LL };
-  GPBInt64Array *array =
-      [GPBInt64Array arrayWithCapacity:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(array);
-  [array addValues:kValues count:GPBARRAYSIZE(kValues)];
-
-  // Add/remove to trigger the intneral buffer to grow/shrink.
-  for (int i = 0; i < 100; ++i) {
-    [array addValues:kValues count:GPBARRAYSIZE(kValues)];
-  }
-  XCTAssertEqual(array.count, 404U);
-  for (int i = 0; i < 100; ++i) {
-    [array removeValueAtIndex:(i * 2)];
-  }
-  XCTAssertEqual(array.count, 304U);
-  for (int i = 0; i < 100; ++i) {
-    [array insertValue:34LL atIndex:(i * 3)];
-  }
-  XCTAssertEqual(array.count, 404U);
-  [array removeAll];
-  XCTAssertEqual(array.count, 0U);
-}
-
-@end
-
-// clang-format on
-//%PDDM-EXPAND ARRAY_TESTS(UInt64, uint64_t, 41ULL, 42ULL, 43ULL, 44ULL)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-#pragma mark - UInt64
-
-@interface GPBUInt64ArrayTests : XCTestCase
-@end
-
-@implementation GPBUInt64ArrayTests
-
-- (void)testEmpty {
-  GPBUInt64Array *array = [[GPBUInt64Array alloc] init];
-  XCTAssertNotNil(array);
-  XCTAssertEqual(array.count, 0U);
-  XCTAssertThrowsSpecificNamed([array valueAtIndex:0], NSException, NSRangeException);
-  [array enumerateValuesWithBlock:^(uint64_t value, NSUInteger idx, BOOL *stop) {
-    #pragma unused(value, idx, stop)
-    XCTFail(@"Shouldn't get here!");
-  }];
-  [array enumerateValuesWithOptions:NSEnumerationReverse
-                         usingBlock:^(uint64_t value, NSUInteger idx, BOOL *stop) {
-    #pragma unused(value, idx, stop)
-    XCTFail(@"Shouldn't get here!");
-  }];
-  [array release];
-}
-
-- (void)testOne {
-  GPBUInt64Array *array = [GPBUInt64Array arrayWithValue:41ULL];
-  XCTAssertNotNil(array);
-  XCTAssertEqual(array.count, 1U);
-  XCTAssertEqual([array valueAtIndex:0], 41ULL);
-  XCTAssertThrowsSpecificNamed([array valueAtIndex:1], NSException, NSRangeException);
-  [array enumerateValuesWithBlock:^(uint64_t value, NSUInteger idx, BOOL *stop) {
-    XCTAssertEqual(idx, 0U);
-    XCTAssertEqual(value, 41ULL);
-    XCTAssertNotEqual(stop, NULL);
-  }];
-  [array enumerateValuesWithOptions:NSEnumerationReverse
-                         usingBlock:^(uint64_t value, NSUInteger idx, BOOL *stop) {
-    XCTAssertEqual(idx, 0U);
-    XCTAssertEqual(value, 41ULL);
-    XCTAssertNotEqual(stop, NULL);
-  }];
-}
-
-- (void)testBasics {
-  static const uint64_t kValues[] = { 41ULL, 42ULL, 43ULL, 44ULL };
-  GPBUInt64Array *array =
-      [[GPBUInt64Array alloc] initWithValues:kValues
-                                       count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(array);
-  XCTAssertEqual(array.count, 4U);
-  XCTAssertEqual([array valueAtIndex:0], 41ULL);
-  XCTAssertEqual([array valueAtIndex:1], 42ULL);
-  XCTAssertEqual([array valueAtIndex:2], 43ULL);
-  XCTAssertEqual([array valueAtIndex:3], 44ULL);
-  XCTAssertThrowsSpecificNamed([array valueAtIndex:4], NSException, NSRangeException);
-  __block NSUInteger idx2 = 0;
-  [array enumerateValuesWithBlock:^(uint64_t value, NSUInteger idx, BOOL *stop) {
-    XCTAssertEqual(idx, idx2);
-    XCTAssertEqual(value, kValues[idx]);
-    XCTAssertNotEqual(stop, NULL);
-    ++idx2;
-  }];
-  idx2 = 0;
-  [array enumerateValuesWithOptions:NSEnumerationReverse
-                         usingBlock:^(uint64_t value, NSUInteger idx, BOOL *stop) {
-    XCTAssertEqual(idx, (3 - idx2));
-    XCTAssertEqual(value, kValues[idx]);
-    XCTAssertNotEqual(stop, NULL);
-    ++idx2;
-  }];
-  // Stopping the enumeration.
-  idx2 = 0;
-  [array enumerateValuesWithBlock:^(uint64_t value, NSUInteger idx, BOOL *stop) {
-    XCTAssertEqual(idx, idx2);
-    XCTAssertEqual(value, kValues[idx]);
-    XCTAssertNotEqual(stop, NULL);
-    if (idx2 == 1) *stop = YES;
-    XCTAssertNotEqual(idx, 2U);
-    XCTAssertNotEqual(idx, 3U);
-    ++idx2;
-  }];
-  idx2 = 0;
-  [array enumerateValuesWithOptions:NSEnumerationReverse
-                         usingBlock:^(uint64_t value, NSUInteger idx, BOOL *stop) {
-    XCTAssertEqual(idx, (3 - idx2));
-    XCTAssertEqual(value, kValues[idx]);
-    XCTAssertNotEqual(stop, NULL);
-    if (idx2 == 1) *stop = YES;
-    XCTAssertNotEqual(idx, 1U);
-    XCTAssertNotEqual(idx, 0U);
-    ++idx2;
-  }];
-  // Ensure description doesn't choke.
-  XCTAssertTrue(array.description.length > 10);
-  [array release];
-}
-
-- (void)testEquality {
-  const uint64_t kValues1[] = { 41ULL, 42ULL, 43ULL };
-  const uint64_t kValues2[] = { 41ULL, 44ULL, 43ULL };
-  const uint64_t kValues3[] = { 41ULL, 42ULL, 43ULL, 44ULL };
-  GPBUInt64Array *array1 =
-      [[GPBUInt64Array alloc] initWithValues:kValues1
-                                       count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(array1);
-  GPBUInt64Array *array1prime =
-      [[GPBUInt64Array alloc] initWithValues:kValues1
-                                       count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(array1prime);
-  GPBUInt64Array *array2 =
-      [[GPBUInt64Array alloc] initWithValues:kValues2
-                                       count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(array2);
-  GPBUInt64Array *array3 =
-      [[GPBUInt64Array alloc] initWithValues:kValues3
-                                       count:GPBARRAYSIZE(kValues3)];
-  XCTAssertNotNil(array3);
-
-  // Identity
-  XCTAssertTrue([array1 isEqual:array1]);
-  // Wrong type doesn't blow up.
-  XCTAssertFalse([array1 isEqual:@"bogus"]);
-  // 1/1Prime should be different objects, but equal.
-  XCTAssertNotEqual(array1, array1prime);
-  XCTAssertEqualObjects(array1, array1prime);
-  // Equal, so they must have same hash.
-  XCTAssertEqual([array1 hash], [array1prime hash]);
-
-  // 1/2/3 shouldn't be equal.
-  XCTAssertNotEqualObjects(array1, array2);
-  XCTAssertNotEqualObjects(array1, array3);
-  XCTAssertNotEqualObjects(array2, array3);
-
-  [array1 release];
-  [array1prime release];
-  [array2 release];
-  [array3 release];
-}
-
-- (void)testCopy {
-  const uint64_t kValues[] = { 41ULL, 42ULL, 43ULL, 44ULL };
-  GPBUInt64Array *array =
-      [[GPBUInt64Array alloc] initWithValues:kValues
-                                       count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(array);
-
-  GPBUInt64Array *array2 = [array copy];
-  XCTAssertNotNil(array2);
-
-  // Should be new object but equal.
-  XCTAssertNotEqual(array, array2);
-  XCTAssertEqualObjects(array, array2);
-  [array2 release];
-  [array release];
-}
-
-- (void)testArrayFromArray {
-  const uint64_t kValues[] = { 41ULL, 42ULL, 43ULL, 44ULL };
-  GPBUInt64Array *array =
-      [[GPBUInt64Array alloc] initWithValues:kValues
-                                       count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(array);
-
-  GPBUInt64Array *array2 = [GPBUInt64Array arrayWithValueArray:array];
-  XCTAssertNotNil(array2);
-
-  // Should be new pointer, but equal objects.
-  XCTAssertNotEqual(array, array2);
-  XCTAssertEqualObjects(array, array2);
-  [array release];
-}
-
-- (void)testAdds {
-  GPBUInt64Array *array = [GPBUInt64Array array];
-  XCTAssertNotNil(array);
-
-  XCTAssertEqual(array.count, 0U);
-  [array addValue:41ULL];
-  XCTAssertEqual(array.count, 1U);
-
-  const uint64_t kValues1[] = { 42ULL, 43ULL };
-  [array addValues:kValues1 count:GPBARRAYSIZE(kValues1)];
-  XCTAssertEqual(array.count, 3U);
-
-  const uint64_t kValues2[] = { 44ULL, 41ULL };
-  GPBUInt64Array *array2 =
-      [[GPBUInt64Array alloc] initWithValues:kValues2
-                                       count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(array2);
-  [array addValuesFromArray:array2];
-  XCTAssertEqual(array.count, 5U);
-
-  // Zero/nil inputs do nothing.
-  [array addValues:kValues1 count:0];
-  XCTAssertEqual(array.count, 5U);
-  [array addValues:NULL count:5];
-  XCTAssertEqual(array.count, 5U);
-
-  XCTAssertEqual([array valueAtIndex:0], 41ULL);
-  XCTAssertEqual([array valueAtIndex:1], 42ULL);
-  XCTAssertEqual([array valueAtIndex:2], 43ULL);
-  XCTAssertEqual([array valueAtIndex:3], 44ULL);
-  XCTAssertEqual([array valueAtIndex:4], 41ULL);
-  [array2 release];
-}
-
-- (void)testInsert {
-  const uint64_t kValues[] = { 41ULL, 42ULL, 43ULL };
-  GPBUInt64Array *array =
-      [[GPBUInt64Array alloc] initWithValues:kValues
-                                       count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(array);
-  XCTAssertEqual(array.count, 3U);
-
-  // First
-  [array insertValue:44ULL atIndex:0];
-  XCTAssertEqual(array.count, 4U);
-
-  // Middle
-  [array insertValue:44ULL atIndex:2];
-  XCTAssertEqual(array.count, 5U);
-
-  // End
-  [array insertValue:44ULL atIndex:5];
-  XCTAssertEqual(array.count, 6U);
-
-  // Too far.
-  XCTAssertThrowsSpecificNamed([array insertValue:44ULL atIndex:7],
-                               NSException, NSRangeException);
-
-  XCTAssertEqual([array valueAtIndex:0], 44ULL);
-  XCTAssertEqual([array valueAtIndex:1], 41ULL);
-  XCTAssertEqual([array valueAtIndex:2], 44ULL);
-  XCTAssertEqual([array valueAtIndex:3], 42ULL);
-  XCTAssertEqual([array valueAtIndex:4], 43ULL);
-  XCTAssertEqual([array valueAtIndex:5], 44ULL);
-  [array release];
-}
-
-- (void)testRemove {
-  const uint64_t kValues[] = { 44ULL, 41ULL, 42ULL, 44ULL, 43ULL, 44ULL };
-  GPBUInt64Array *array =
-      [[GPBUInt64Array alloc] initWithValues:kValues
-                                       count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(array);
-  XCTAssertEqual(array.count, 6U);
-
-  // First
-  [array removeValueAtIndex:0];
-  XCTAssertEqual(array.count, 5U);
-  XCTAssertEqual([array valueAtIndex:0], 41ULL);
-
-  // Middle
-  [array removeValueAtIndex:2];
-  XCTAssertEqual(array.count, 4U);
-  XCTAssertEqual([array valueAtIndex:2], 43ULL);
-
-  // End
-  [array removeValueAtIndex:3];
-  XCTAssertEqual(array.count, 3U);
-
-  XCTAssertEqual([array valueAtIndex:0], 41ULL);
-  XCTAssertEqual([array valueAtIndex:1], 42ULL);
-  XCTAssertEqual([array valueAtIndex:2], 43ULL);
-
-  // Too far.
-  XCTAssertThrowsSpecificNamed([array removeValueAtIndex:3],
-                               NSException, NSRangeException);
-
-  [array removeAll];
-  XCTAssertEqual(array.count, 0U);
-  XCTAssertThrowsSpecificNamed([array removeValueAtIndex:0],
-                               NSException, NSRangeException);
-  [array release];
-}
-
-- (void)testInplaceMutation {
-  const uint64_t kValues[] = { 41ULL, 41ULL, 43ULL, 43ULL };
-  GPBUInt64Array *array =
-      [[GPBUInt64Array alloc] initWithValues:kValues
-                                       count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(array);
-
-  [array replaceValueAtIndex:1 withValue:42ULL];
-  [array replaceValueAtIndex:3 withValue:44ULL];
-  XCTAssertEqual(array.count, 4U);
-  XCTAssertEqual([array valueAtIndex:0], 41ULL);
-  XCTAssertEqual([array valueAtIndex:1], 42ULL);
-  XCTAssertEqual([array valueAtIndex:2], 43ULL);
-  XCTAssertEqual([array valueAtIndex:3], 44ULL);
-
-  XCTAssertThrowsSpecificNamed([array replaceValueAtIndex:4 withValue:44ULL],
-                               NSException, NSRangeException);
-
-  [array exchangeValueAtIndex:1 withValueAtIndex:3];
-  XCTAssertEqual(array.count, 4U);
-  XCTAssertEqual([array valueAtIndex:0], 41ULL);
-  XCTAssertEqual([array valueAtIndex:1], 44ULL);
-  XCTAssertEqual([array valueAtIndex:2], 43ULL);
-  XCTAssertEqual([array valueAtIndex:3], 42ULL);
-
-  [array exchangeValueAtIndex:2 withValueAtIndex:0];
-  XCTAssertEqual(array.count, 4U);
-  XCTAssertEqual([array valueAtIndex:0], 43ULL);
-  XCTAssertEqual([array valueAtIndex:1], 44ULL);
-  XCTAssertEqual([array valueAtIndex:2], 41ULL);
-  XCTAssertEqual([array valueAtIndex:3], 42ULL);
-
-  XCTAssertThrowsSpecificNamed([array exchangeValueAtIndex:4 withValueAtIndex:1],
-                               NSException, NSRangeException);
-  XCTAssertThrowsSpecificNamed([array exchangeValueAtIndex:1 withValueAtIndex:4],
-                               NSException, NSRangeException);
-  [array release];
-}
-
-- (void)testInternalResizing {
-  const uint64_t kValues[] = { 41ULL, 42ULL, 43ULL, 44ULL };
-  GPBUInt64Array *array =
-      [GPBUInt64Array arrayWithCapacity:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(array);
-  [array addValues:kValues count:GPBARRAYSIZE(kValues)];
-
-  // Add/remove to trigger the intneral buffer to grow/shrink.
-  for (int i = 0; i < 100; ++i) {
-    [array addValues:kValues count:GPBARRAYSIZE(kValues)];
-  }
-  XCTAssertEqual(array.count, 404U);
-  for (int i = 0; i < 100; ++i) {
-    [array removeValueAtIndex:(i * 2)];
-  }
-  XCTAssertEqual(array.count, 304U);
-  for (int i = 0; i < 100; ++i) {
-    [array insertValue:44ULL atIndex:(i * 3)];
-  }
-  XCTAssertEqual(array.count, 404U);
-  [array removeAll];
-  XCTAssertEqual(array.count, 0U);
-}
-
-@end
-
-// clang-format on
-//%PDDM-EXPAND ARRAY_TESTS(Float, float, 51.f, 52.f, 53.f, 54.f)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-#pragma mark - Float
-
-@interface GPBFloatArrayTests : XCTestCase
-@end
-
-@implementation GPBFloatArrayTests
-
-- (void)testEmpty {
-  GPBFloatArray *array = [[GPBFloatArray alloc] init];
-  XCTAssertNotNil(array);
-  XCTAssertEqual(array.count, 0U);
-  XCTAssertThrowsSpecificNamed([array valueAtIndex:0], NSException, NSRangeException);
-  [array enumerateValuesWithBlock:^(float value, NSUInteger idx, BOOL *stop) {
-    #pragma unused(value, idx, stop)
-    XCTFail(@"Shouldn't get here!");
-  }];
-  [array enumerateValuesWithOptions:NSEnumerationReverse
-                         usingBlock:^(float value, NSUInteger idx, BOOL *stop) {
-    #pragma unused(value, idx, stop)
-    XCTFail(@"Shouldn't get here!");
-  }];
-  [array release];
-}
-
-- (void)testOne {
-  GPBFloatArray *array = [GPBFloatArray arrayWithValue:51.f];
-  XCTAssertNotNil(array);
-  XCTAssertEqual(array.count, 1U);
-  XCTAssertEqual([array valueAtIndex:0], 51.f);
-  XCTAssertThrowsSpecificNamed([array valueAtIndex:1], NSException, NSRangeException);
-  [array enumerateValuesWithBlock:^(float value, NSUInteger idx, BOOL *stop) {
-    XCTAssertEqual(idx, 0U);
-    XCTAssertEqual(value, 51.f);
-    XCTAssertNotEqual(stop, NULL);
-  }];
-  [array enumerateValuesWithOptions:NSEnumerationReverse
-                         usingBlock:^(float value, NSUInteger idx, BOOL *stop) {
-    XCTAssertEqual(idx, 0U);
-    XCTAssertEqual(value, 51.f);
-    XCTAssertNotEqual(stop, NULL);
-  }];
-}
-
-- (void)testBasics {
-  static const float kValues[] = { 51.f, 52.f, 53.f, 54.f };
-  GPBFloatArray *array =
-      [[GPBFloatArray alloc] initWithValues:kValues
-                                      count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(array);
-  XCTAssertEqual(array.count, 4U);
-  XCTAssertEqual([array valueAtIndex:0], 51.f);
-  XCTAssertEqual([array valueAtIndex:1], 52.f);
-  XCTAssertEqual([array valueAtIndex:2], 53.f);
-  XCTAssertEqual([array valueAtIndex:3], 54.f);
-  XCTAssertThrowsSpecificNamed([array valueAtIndex:4], NSException, NSRangeException);
-  __block NSUInteger idx2 = 0;
-  [array enumerateValuesWithBlock:^(float value, NSUInteger idx, BOOL *stop) {
-    XCTAssertEqual(idx, idx2);
-    XCTAssertEqual(value, kValues[idx]);
-    XCTAssertNotEqual(stop, NULL);
-    ++idx2;
-  }];
-  idx2 = 0;
-  [array enumerateValuesWithOptions:NSEnumerationReverse
-                         usingBlock:^(float value, NSUInteger idx, BOOL *stop) {
-    XCTAssertEqual(idx, (3 - idx2));
-    XCTAssertEqual(value, kValues[idx]);
-    XCTAssertNotEqual(stop, NULL);
-    ++idx2;
-  }];
-  // Stopping the enumeration.
-  idx2 = 0;
-  [array enumerateValuesWithBlock:^(float value, NSUInteger idx, BOOL *stop) {
-    XCTAssertEqual(idx, idx2);
-    XCTAssertEqual(value, kValues[idx]);
-    XCTAssertNotEqual(stop, NULL);
-    if (idx2 == 1) *stop = YES;
-    XCTAssertNotEqual(idx, 2U);
-    XCTAssertNotEqual(idx, 3U);
-    ++idx2;
-  }];
-  idx2 = 0;
-  [array enumerateValuesWithOptions:NSEnumerationReverse
-                         usingBlock:^(float value, NSUInteger idx, BOOL *stop) {
-    XCTAssertEqual(idx, (3 - idx2));
-    XCTAssertEqual(value, kValues[idx]);
-    XCTAssertNotEqual(stop, NULL);
-    if (idx2 == 1) *stop = YES;
-    XCTAssertNotEqual(idx, 1U);
-    XCTAssertNotEqual(idx, 0U);
-    ++idx2;
-  }];
-  // Ensure description doesn't choke.
-  XCTAssertTrue(array.description.length > 10);
-  [array release];
-}
-
-- (void)testEquality {
-  const float kValues1[] = { 51.f, 52.f, 53.f };
-  const float kValues2[] = { 51.f, 54.f, 53.f };
-  const float kValues3[] = { 51.f, 52.f, 53.f, 54.f };
-  GPBFloatArray *array1 =
-      [[GPBFloatArray alloc] initWithValues:kValues1
-                                      count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(array1);
-  GPBFloatArray *array1prime =
-      [[GPBFloatArray alloc] initWithValues:kValues1
-                                      count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(array1prime);
-  GPBFloatArray *array2 =
-      [[GPBFloatArray alloc] initWithValues:kValues2
-                                      count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(array2);
-  GPBFloatArray *array3 =
-      [[GPBFloatArray alloc] initWithValues:kValues3
-                                      count:GPBARRAYSIZE(kValues3)];
-  XCTAssertNotNil(array3);
-
-  // Identity
-  XCTAssertTrue([array1 isEqual:array1]);
-  // Wrong type doesn't blow up.
-  XCTAssertFalse([array1 isEqual:@"bogus"]);
-  // 1/1Prime should be different objects, but equal.
-  XCTAssertNotEqual(array1, array1prime);
-  XCTAssertEqualObjects(array1, array1prime);
-  // Equal, so they must have same hash.
-  XCTAssertEqual([array1 hash], [array1prime hash]);
-
-  // 1/2/3 shouldn't be equal.
-  XCTAssertNotEqualObjects(array1, array2);
-  XCTAssertNotEqualObjects(array1, array3);
-  XCTAssertNotEqualObjects(array2, array3);
-
-  [array1 release];
-  [array1prime release];
-  [array2 release];
-  [array3 release];
-}
-
-- (void)testCopy {
-  const float kValues[] = { 51.f, 52.f, 53.f, 54.f };
-  GPBFloatArray *array =
-      [[GPBFloatArray alloc] initWithValues:kValues
-                                      count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(array);
-
-  GPBFloatArray *array2 = [array copy];
-  XCTAssertNotNil(array2);
-
-  // Should be new object but equal.
-  XCTAssertNotEqual(array, array2);
-  XCTAssertEqualObjects(array, array2);
-  [array2 release];
-  [array release];
-}
-
-- (void)testArrayFromArray {
-  const float kValues[] = { 51.f, 52.f, 53.f, 54.f };
-  GPBFloatArray *array =
-      [[GPBFloatArray alloc] initWithValues:kValues
-                                      count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(array);
-
-  GPBFloatArray *array2 = [GPBFloatArray arrayWithValueArray:array];
-  XCTAssertNotNil(array2);
-
-  // Should be new pointer, but equal objects.
-  XCTAssertNotEqual(array, array2);
-  XCTAssertEqualObjects(array, array2);
-  [array release];
-}
-
-- (void)testAdds {
-  GPBFloatArray *array = [GPBFloatArray array];
-  XCTAssertNotNil(array);
-
-  XCTAssertEqual(array.count, 0U);
-  [array addValue:51.f];
-  XCTAssertEqual(array.count, 1U);
-
-  const float kValues1[] = { 52.f, 53.f };
-  [array addValues:kValues1 count:GPBARRAYSIZE(kValues1)];
-  XCTAssertEqual(array.count, 3U);
-
-  const float kValues2[] = { 54.f, 51.f };
-  GPBFloatArray *array2 =
-      [[GPBFloatArray alloc] initWithValues:kValues2
-                                      count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(array2);
-  [array addValuesFromArray:array2];
-  XCTAssertEqual(array.count, 5U);
-
-  // Zero/nil inputs do nothing.
-  [array addValues:kValues1 count:0];
-  XCTAssertEqual(array.count, 5U);
-  [array addValues:NULL count:5];
-  XCTAssertEqual(array.count, 5U);
-
-  XCTAssertEqual([array valueAtIndex:0], 51.f);
-  XCTAssertEqual([array valueAtIndex:1], 52.f);
-  XCTAssertEqual([array valueAtIndex:2], 53.f);
-  XCTAssertEqual([array valueAtIndex:3], 54.f);
-  XCTAssertEqual([array valueAtIndex:4], 51.f);
-  [array2 release];
-}
-
-- (void)testInsert {
-  const float kValues[] = { 51.f, 52.f, 53.f };
-  GPBFloatArray *array =
-      [[GPBFloatArray alloc] initWithValues:kValues
-                                      count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(array);
-  XCTAssertEqual(array.count, 3U);
-
-  // First
-  [array insertValue:54.f atIndex:0];
-  XCTAssertEqual(array.count, 4U);
-
-  // Middle
-  [array insertValue:54.f atIndex:2];
-  XCTAssertEqual(array.count, 5U);
-
-  // End
-  [array insertValue:54.f atIndex:5];
-  XCTAssertEqual(array.count, 6U);
-
-  // Too far.
-  XCTAssertThrowsSpecificNamed([array insertValue:54.f atIndex:7],
-                               NSException, NSRangeException);
-
-  XCTAssertEqual([array valueAtIndex:0], 54.f);
-  XCTAssertEqual([array valueAtIndex:1], 51.f);
-  XCTAssertEqual([array valueAtIndex:2], 54.f);
-  XCTAssertEqual([array valueAtIndex:3], 52.f);
-  XCTAssertEqual([array valueAtIndex:4], 53.f);
-  XCTAssertEqual([array valueAtIndex:5], 54.f);
-  [array release];
-}
-
-- (void)testRemove {
-  const float kValues[] = { 54.f, 51.f, 52.f, 54.f, 53.f, 54.f };
-  GPBFloatArray *array =
-      [[GPBFloatArray alloc] initWithValues:kValues
-                                      count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(array);
-  XCTAssertEqual(array.count, 6U);
-
-  // First
-  [array removeValueAtIndex:0];
-  XCTAssertEqual(array.count, 5U);
-  XCTAssertEqual([array valueAtIndex:0], 51.f);
-
-  // Middle
-  [array removeValueAtIndex:2];
-  XCTAssertEqual(array.count, 4U);
-  XCTAssertEqual([array valueAtIndex:2], 53.f);
-
-  // End
-  [array removeValueAtIndex:3];
-  XCTAssertEqual(array.count, 3U);
-
-  XCTAssertEqual([array valueAtIndex:0], 51.f);
-  XCTAssertEqual([array valueAtIndex:1], 52.f);
-  XCTAssertEqual([array valueAtIndex:2], 53.f);
-
-  // Too far.
-  XCTAssertThrowsSpecificNamed([array removeValueAtIndex:3],
-                               NSException, NSRangeException);
-
-  [array removeAll];
-  XCTAssertEqual(array.count, 0U);
-  XCTAssertThrowsSpecificNamed([array removeValueAtIndex:0],
-                               NSException, NSRangeException);
-  [array release];
-}
-
-- (void)testInplaceMutation {
-  const float kValues[] = { 51.f, 51.f, 53.f, 53.f };
-  GPBFloatArray *array =
-      [[GPBFloatArray alloc] initWithValues:kValues
-                                      count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(array);
-
-  [array replaceValueAtIndex:1 withValue:52.f];
-  [array replaceValueAtIndex:3 withValue:54.f];
-  XCTAssertEqual(array.count, 4U);
-  XCTAssertEqual([array valueAtIndex:0], 51.f);
-  XCTAssertEqual([array valueAtIndex:1], 52.f);
-  XCTAssertEqual([array valueAtIndex:2], 53.f);
-  XCTAssertEqual([array valueAtIndex:3], 54.f);
-
-  XCTAssertThrowsSpecificNamed([array replaceValueAtIndex:4 withValue:54.f],
-                               NSException, NSRangeException);
-
-  [array exchangeValueAtIndex:1 withValueAtIndex:3];
-  XCTAssertEqual(array.count, 4U);
-  XCTAssertEqual([array valueAtIndex:0], 51.f);
-  XCTAssertEqual([array valueAtIndex:1], 54.f);
-  XCTAssertEqual([array valueAtIndex:2], 53.f);
-  XCTAssertEqual([array valueAtIndex:3], 52.f);
-
-  [array exchangeValueAtIndex:2 withValueAtIndex:0];
-  XCTAssertEqual(array.count, 4U);
-  XCTAssertEqual([array valueAtIndex:0], 53.f);
-  XCTAssertEqual([array valueAtIndex:1], 54.f);
-  XCTAssertEqual([array valueAtIndex:2], 51.f);
-  XCTAssertEqual([array valueAtIndex:3], 52.f);
-
-  XCTAssertThrowsSpecificNamed([array exchangeValueAtIndex:4 withValueAtIndex:1],
-                               NSException, NSRangeException);
-  XCTAssertThrowsSpecificNamed([array exchangeValueAtIndex:1 withValueAtIndex:4],
-                               NSException, NSRangeException);
-  [array release];
-}
-
-- (void)testInternalResizing {
-  const float kValues[] = { 51.f, 52.f, 53.f, 54.f };
-  GPBFloatArray *array =
-      [GPBFloatArray arrayWithCapacity:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(array);
-  [array addValues:kValues count:GPBARRAYSIZE(kValues)];
-
-  // Add/remove to trigger the intneral buffer to grow/shrink.
-  for (int i = 0; i < 100; ++i) {
-    [array addValues:kValues count:GPBARRAYSIZE(kValues)];
-  }
-  XCTAssertEqual(array.count, 404U);
-  for (int i = 0; i < 100; ++i) {
-    [array removeValueAtIndex:(i * 2)];
-  }
-  XCTAssertEqual(array.count, 304U);
-  for (int i = 0; i < 100; ++i) {
-    [array insertValue:54.f atIndex:(i * 3)];
-  }
-  XCTAssertEqual(array.count, 404U);
-  [array removeAll];
-  XCTAssertEqual(array.count, 0U);
-}
-
-@end
-
-// clang-format on
-//%PDDM-EXPAND ARRAY_TESTS(Double, double, 61., 62., 63., 64.)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-#pragma mark - Double
-
-@interface GPBDoubleArrayTests : XCTestCase
-@end
-
-@implementation GPBDoubleArrayTests
-
-- (void)testEmpty {
-  GPBDoubleArray *array = [[GPBDoubleArray alloc] init];
-  XCTAssertNotNil(array);
-  XCTAssertEqual(array.count, 0U);
-  XCTAssertThrowsSpecificNamed([array valueAtIndex:0], NSException, NSRangeException);
-  [array enumerateValuesWithBlock:^(double value, NSUInteger idx, BOOL *stop) {
-    #pragma unused(value, idx, stop)
-    XCTFail(@"Shouldn't get here!");
-  }];
-  [array enumerateValuesWithOptions:NSEnumerationReverse
-                         usingBlock:^(double value, NSUInteger idx, BOOL *stop) {
-    #pragma unused(value, idx, stop)
-    XCTFail(@"Shouldn't get here!");
-  }];
-  [array release];
-}
-
-- (void)testOne {
-  GPBDoubleArray *array = [GPBDoubleArray arrayWithValue:61.];
-  XCTAssertNotNil(array);
-  XCTAssertEqual(array.count, 1U);
-  XCTAssertEqual([array valueAtIndex:0], 61.);
-  XCTAssertThrowsSpecificNamed([array valueAtIndex:1], NSException, NSRangeException);
-  [array enumerateValuesWithBlock:^(double value, NSUInteger idx, BOOL *stop) {
-    XCTAssertEqual(idx, 0U);
-    XCTAssertEqual(value, 61.);
-    XCTAssertNotEqual(stop, NULL);
-  }];
-  [array enumerateValuesWithOptions:NSEnumerationReverse
-                         usingBlock:^(double value, NSUInteger idx, BOOL *stop) {
-    XCTAssertEqual(idx, 0U);
-    XCTAssertEqual(value, 61.);
-    XCTAssertNotEqual(stop, NULL);
-  }];
-}
-
-- (void)testBasics {
-  static const double kValues[] = { 61., 62., 63., 64. };
-  GPBDoubleArray *array =
-      [[GPBDoubleArray alloc] initWithValues:kValues
-                                       count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(array);
-  XCTAssertEqual(array.count, 4U);
-  XCTAssertEqual([array valueAtIndex:0], 61.);
-  XCTAssertEqual([array valueAtIndex:1], 62.);
-  XCTAssertEqual([array valueAtIndex:2], 63.);
-  XCTAssertEqual([array valueAtIndex:3], 64.);
-  XCTAssertThrowsSpecificNamed([array valueAtIndex:4], NSException, NSRangeException);
-  __block NSUInteger idx2 = 0;
-  [array enumerateValuesWithBlock:^(double value, NSUInteger idx, BOOL *stop) {
-    XCTAssertEqual(idx, idx2);
-    XCTAssertEqual(value, kValues[idx]);
-    XCTAssertNotEqual(stop, NULL);
-    ++idx2;
-  }];
-  idx2 = 0;
-  [array enumerateValuesWithOptions:NSEnumerationReverse
-                         usingBlock:^(double value, NSUInteger idx, BOOL *stop) {
-    XCTAssertEqual(idx, (3 - idx2));
-    XCTAssertEqual(value, kValues[idx]);
-    XCTAssertNotEqual(stop, NULL);
-    ++idx2;
-  }];
-  // Stopping the enumeration.
-  idx2 = 0;
-  [array enumerateValuesWithBlock:^(double value, NSUInteger idx, BOOL *stop) {
-    XCTAssertEqual(idx, idx2);
-    XCTAssertEqual(value, kValues[idx]);
-    XCTAssertNotEqual(stop, NULL);
-    if (idx2 == 1) *stop = YES;
-    XCTAssertNotEqual(idx, 2U);
-    XCTAssertNotEqual(idx, 3U);
-    ++idx2;
-  }];
-  idx2 = 0;
-  [array enumerateValuesWithOptions:NSEnumerationReverse
-                         usingBlock:^(double value, NSUInteger idx, BOOL *stop) {
-    XCTAssertEqual(idx, (3 - idx2));
-    XCTAssertEqual(value, kValues[idx]);
-    XCTAssertNotEqual(stop, NULL);
-    if (idx2 == 1) *stop = YES;
-    XCTAssertNotEqual(idx, 1U);
-    XCTAssertNotEqual(idx, 0U);
-    ++idx2;
-  }];
-  // Ensure description doesn't choke.
-  XCTAssertTrue(array.description.length > 10);
-  [array release];
-}
-
-- (void)testEquality {
-  const double kValues1[] = { 61., 62., 63. };
-  const double kValues2[] = { 61., 64., 63. };
-  const double kValues3[] = { 61., 62., 63., 64. };
-  GPBDoubleArray *array1 =
-      [[GPBDoubleArray alloc] initWithValues:kValues1
-                                       count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(array1);
-  GPBDoubleArray *array1prime =
-      [[GPBDoubleArray alloc] initWithValues:kValues1
-                                       count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(array1prime);
-  GPBDoubleArray *array2 =
-      [[GPBDoubleArray alloc] initWithValues:kValues2
-                                       count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(array2);
-  GPBDoubleArray *array3 =
-      [[GPBDoubleArray alloc] initWithValues:kValues3
-                                       count:GPBARRAYSIZE(kValues3)];
-  XCTAssertNotNil(array3);
-
-  // Identity
-  XCTAssertTrue([array1 isEqual:array1]);
-  // Wrong type doesn't blow up.
-  XCTAssertFalse([array1 isEqual:@"bogus"]);
-  // 1/1Prime should be different objects, but equal.
-  XCTAssertNotEqual(array1, array1prime);
-  XCTAssertEqualObjects(array1, array1prime);
-  // Equal, so they must have same hash.
-  XCTAssertEqual([array1 hash], [array1prime hash]);
-
-  // 1/2/3 shouldn't be equal.
-  XCTAssertNotEqualObjects(array1, array2);
-  XCTAssertNotEqualObjects(array1, array3);
-  XCTAssertNotEqualObjects(array2, array3);
-
-  [array1 release];
-  [array1prime release];
-  [array2 release];
-  [array3 release];
-}
-
-- (void)testCopy {
-  const double kValues[] = { 61., 62., 63., 64. };
-  GPBDoubleArray *array =
-      [[GPBDoubleArray alloc] initWithValues:kValues
-                                       count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(array);
-
-  GPBDoubleArray *array2 = [array copy];
-  XCTAssertNotNil(array2);
-
-  // Should be new object but equal.
-  XCTAssertNotEqual(array, array2);
-  XCTAssertEqualObjects(array, array2);
-  [array2 release];
-  [array release];
-}
-
-- (void)testArrayFromArray {
-  const double kValues[] = { 61., 62., 63., 64. };
-  GPBDoubleArray *array =
-      [[GPBDoubleArray alloc] initWithValues:kValues
-                                       count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(array);
-
-  GPBDoubleArray *array2 = [GPBDoubleArray arrayWithValueArray:array];
-  XCTAssertNotNil(array2);
-
-  // Should be new pointer, but equal objects.
-  XCTAssertNotEqual(array, array2);
-  XCTAssertEqualObjects(array, array2);
-  [array release];
-}
-
-- (void)testAdds {
-  GPBDoubleArray *array = [GPBDoubleArray array];
-  XCTAssertNotNil(array);
-
-  XCTAssertEqual(array.count, 0U);
-  [array addValue:61.];
-  XCTAssertEqual(array.count, 1U);
-
-  const double kValues1[] = { 62., 63. };
-  [array addValues:kValues1 count:GPBARRAYSIZE(kValues1)];
-  XCTAssertEqual(array.count, 3U);
-
-  const double kValues2[] = { 64., 61. };
-  GPBDoubleArray *array2 =
-      [[GPBDoubleArray alloc] initWithValues:kValues2
-                                       count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(array2);
-  [array addValuesFromArray:array2];
-  XCTAssertEqual(array.count, 5U);
-
-  // Zero/nil inputs do nothing.
-  [array addValues:kValues1 count:0];
-  XCTAssertEqual(array.count, 5U);
-  [array addValues:NULL count:5];
-  XCTAssertEqual(array.count, 5U);
-
-  XCTAssertEqual([array valueAtIndex:0], 61.);
-  XCTAssertEqual([array valueAtIndex:1], 62.);
-  XCTAssertEqual([array valueAtIndex:2], 63.);
-  XCTAssertEqual([array valueAtIndex:3], 64.);
-  XCTAssertEqual([array valueAtIndex:4], 61.);
-  [array2 release];
-}
-
-- (void)testInsert {
-  const double kValues[] = { 61., 62., 63. };
-  GPBDoubleArray *array =
-      [[GPBDoubleArray alloc] initWithValues:kValues
-                                       count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(array);
-  XCTAssertEqual(array.count, 3U);
-
-  // First
-  [array insertValue:64. atIndex:0];
-  XCTAssertEqual(array.count, 4U);
-
-  // Middle
-  [array insertValue:64. atIndex:2];
-  XCTAssertEqual(array.count, 5U);
-
-  // End
-  [array insertValue:64. atIndex:5];
-  XCTAssertEqual(array.count, 6U);
-
-  // Too far.
-  XCTAssertThrowsSpecificNamed([array insertValue:64. atIndex:7],
-                               NSException, NSRangeException);
-
-  XCTAssertEqual([array valueAtIndex:0], 64.);
-  XCTAssertEqual([array valueAtIndex:1], 61.);
-  XCTAssertEqual([array valueAtIndex:2], 64.);
-  XCTAssertEqual([array valueAtIndex:3], 62.);
-  XCTAssertEqual([array valueAtIndex:4], 63.);
-  XCTAssertEqual([array valueAtIndex:5], 64.);
-  [array release];
-}
-
-- (void)testRemove {
-  const double kValues[] = { 64., 61., 62., 64., 63., 64. };
-  GPBDoubleArray *array =
-      [[GPBDoubleArray alloc] initWithValues:kValues
-                                       count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(array);
-  XCTAssertEqual(array.count, 6U);
-
-  // First
-  [array removeValueAtIndex:0];
-  XCTAssertEqual(array.count, 5U);
-  XCTAssertEqual([array valueAtIndex:0], 61.);
-
-  // Middle
-  [array removeValueAtIndex:2];
-  XCTAssertEqual(array.count, 4U);
-  XCTAssertEqual([array valueAtIndex:2], 63.);
-
-  // End
-  [array removeValueAtIndex:3];
-  XCTAssertEqual(array.count, 3U);
-
-  XCTAssertEqual([array valueAtIndex:0], 61.);
-  XCTAssertEqual([array valueAtIndex:1], 62.);
-  XCTAssertEqual([array valueAtIndex:2], 63.);
-
-  // Too far.
-  XCTAssertThrowsSpecificNamed([array removeValueAtIndex:3],
-                               NSException, NSRangeException);
-
-  [array removeAll];
-  XCTAssertEqual(array.count, 0U);
-  XCTAssertThrowsSpecificNamed([array removeValueAtIndex:0],
-                               NSException, NSRangeException);
-  [array release];
-}
-
-- (void)testInplaceMutation {
-  const double kValues[] = { 61., 61., 63., 63. };
-  GPBDoubleArray *array =
-      [[GPBDoubleArray alloc] initWithValues:kValues
-                                       count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(array);
-
-  [array replaceValueAtIndex:1 withValue:62.];
-  [array replaceValueAtIndex:3 withValue:64.];
-  XCTAssertEqual(array.count, 4U);
-  XCTAssertEqual([array valueAtIndex:0], 61.);
-  XCTAssertEqual([array valueAtIndex:1], 62.);
-  XCTAssertEqual([array valueAtIndex:2], 63.);
-  XCTAssertEqual([array valueAtIndex:3], 64.);
-
-  XCTAssertThrowsSpecificNamed([array replaceValueAtIndex:4 withValue:64.],
-                               NSException, NSRangeException);
-
-  [array exchangeValueAtIndex:1 withValueAtIndex:3];
-  XCTAssertEqual(array.count, 4U);
-  XCTAssertEqual([array valueAtIndex:0], 61.);
-  XCTAssertEqual([array valueAtIndex:1], 64.);
-  XCTAssertEqual([array valueAtIndex:2], 63.);
-  XCTAssertEqual([array valueAtIndex:3], 62.);
-
-  [array exchangeValueAtIndex:2 withValueAtIndex:0];
-  XCTAssertEqual(array.count, 4U);
-  XCTAssertEqual([array valueAtIndex:0], 63.);
-  XCTAssertEqual([array valueAtIndex:1], 64.);
-  XCTAssertEqual([array valueAtIndex:2], 61.);
-  XCTAssertEqual([array valueAtIndex:3], 62.);
-
-  XCTAssertThrowsSpecificNamed([array exchangeValueAtIndex:4 withValueAtIndex:1],
-                               NSException, NSRangeException);
-  XCTAssertThrowsSpecificNamed([array exchangeValueAtIndex:1 withValueAtIndex:4],
-                               NSException, NSRangeException);
-  [array release];
-}
-
-- (void)testInternalResizing {
-  const double kValues[] = { 61., 62., 63., 64. };
-  GPBDoubleArray *array =
-      [GPBDoubleArray arrayWithCapacity:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(array);
-  [array addValues:kValues count:GPBARRAYSIZE(kValues)];
-
-  // Add/remove to trigger the intneral buffer to grow/shrink.
-  for (int i = 0; i < 100; ++i) {
-    [array addValues:kValues count:GPBARRAYSIZE(kValues)];
-  }
-  XCTAssertEqual(array.count, 404U);
-  for (int i = 0; i < 100; ++i) {
-    [array removeValueAtIndex:(i * 2)];
-  }
-  XCTAssertEqual(array.count, 304U);
-  for (int i = 0; i < 100; ++i) {
-    [array insertValue:64. atIndex:(i * 3)];
-  }
-  XCTAssertEqual(array.count, 404U);
-  [array removeAll];
-  XCTAssertEqual(array.count, 0U);
-}
-
-@end
-
-// clang-format on
-//%PDDM-EXPAND ARRAY_TESTS(Bool, BOOL, TRUE, TRUE, FALSE, FALSE)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-#pragma mark - Bool
-
-@interface GPBBoolArrayTests : XCTestCase
-@end
-
-@implementation GPBBoolArrayTests
-
-- (void)testEmpty {
-  GPBBoolArray *array = [[GPBBoolArray alloc] init];
-  XCTAssertNotNil(array);
-  XCTAssertEqual(array.count, 0U);
-  XCTAssertThrowsSpecificNamed([array valueAtIndex:0], NSException, NSRangeException);
-  [array enumerateValuesWithBlock:^(BOOL value, NSUInteger idx, BOOL *stop) {
-    #pragma unused(value, idx, stop)
-    XCTFail(@"Shouldn't get here!");
-  }];
-  [array enumerateValuesWithOptions:NSEnumerationReverse
-                         usingBlock:^(BOOL value, NSUInteger idx, BOOL *stop) {
-    #pragma unused(value, idx, stop)
-    XCTFail(@"Shouldn't get here!");
-  }];
-  [array release];
-}
-
-- (void)testOne {
-  GPBBoolArray *array = [GPBBoolArray arrayWithValue:TRUE];
-  XCTAssertNotNil(array);
-  XCTAssertEqual(array.count, 1U);
-  XCTAssertEqual([array valueAtIndex:0], TRUE);
-  XCTAssertThrowsSpecificNamed([array valueAtIndex:1], NSException, NSRangeException);
-  [array enumerateValuesWithBlock:^(BOOL value, NSUInteger idx, BOOL *stop) {
-    XCTAssertEqual(idx, 0U);
-    XCTAssertEqual(value, TRUE);
-    XCTAssertNotEqual(stop, NULL);
-  }];
-  [array enumerateValuesWithOptions:NSEnumerationReverse
-                         usingBlock:^(BOOL value, NSUInteger idx, BOOL *stop) {
-    XCTAssertEqual(idx, 0U);
-    XCTAssertEqual(value, TRUE);
-    XCTAssertNotEqual(stop, NULL);
-  }];
-}
-
-- (void)testBasics {
-  static const BOOL kValues[] = { TRUE, TRUE, FALSE, FALSE };
-  GPBBoolArray *array =
-      [[GPBBoolArray alloc] initWithValues:kValues
-                                     count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(array);
-  XCTAssertEqual(array.count, 4U);
-  XCTAssertEqual([array valueAtIndex:0], TRUE);
-  XCTAssertEqual([array valueAtIndex:1], TRUE);
-  XCTAssertEqual([array valueAtIndex:2], FALSE);
-  XCTAssertEqual([array valueAtIndex:3], FALSE);
-  XCTAssertThrowsSpecificNamed([array valueAtIndex:4], NSException, NSRangeException);
-  __block NSUInteger idx2 = 0;
-  [array enumerateValuesWithBlock:^(BOOL value, NSUInteger idx, BOOL *stop) {
-    XCTAssertEqual(idx, idx2);
-    XCTAssertEqual(value, kValues[idx]);
-    XCTAssertNotEqual(stop, NULL);
-    ++idx2;
-  }];
-  idx2 = 0;
-  [array enumerateValuesWithOptions:NSEnumerationReverse
-                         usingBlock:^(BOOL value, NSUInteger idx, BOOL *stop) {
-    XCTAssertEqual(idx, (3 - idx2));
-    XCTAssertEqual(value, kValues[idx]);
-    XCTAssertNotEqual(stop, NULL);
-    ++idx2;
-  }];
-  // Stopping the enumeration.
-  idx2 = 0;
-  [array enumerateValuesWithBlock:^(BOOL value, NSUInteger idx, BOOL *stop) {
-    XCTAssertEqual(idx, idx2);
-    XCTAssertEqual(value, kValues[idx]);
-    XCTAssertNotEqual(stop, NULL);
-    if (idx2 == 1) *stop = YES;
-    XCTAssertNotEqual(idx, 2U);
-    XCTAssertNotEqual(idx, 3U);
-    ++idx2;
-  }];
-  idx2 = 0;
-  [array enumerateValuesWithOptions:NSEnumerationReverse
-                         usingBlock:^(BOOL value, NSUInteger idx, BOOL *stop) {
-    XCTAssertEqual(idx, (3 - idx2));
-    XCTAssertEqual(value, kValues[idx]);
-    XCTAssertNotEqual(stop, NULL);
-    if (idx2 == 1) *stop = YES;
-    XCTAssertNotEqual(idx, 1U);
-    XCTAssertNotEqual(idx, 0U);
-    ++idx2;
-  }];
-  // Ensure description doesn't choke.
-  XCTAssertTrue(array.description.length > 10);
-  [array release];
-}
-
-- (void)testEquality {
-  const BOOL kValues1[] = { TRUE, TRUE, FALSE };
-  const BOOL kValues2[] = { TRUE, FALSE, FALSE };
-  const BOOL kValues3[] = { TRUE, TRUE, FALSE, FALSE };
-  GPBBoolArray *array1 =
-      [[GPBBoolArray alloc] initWithValues:kValues1
-                                     count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(array1);
-  GPBBoolArray *array1prime =
-      [[GPBBoolArray alloc] initWithValues:kValues1
-                                     count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(array1prime);
-  GPBBoolArray *array2 =
-      [[GPBBoolArray alloc] initWithValues:kValues2
-                                     count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(array2);
-  GPBBoolArray *array3 =
-      [[GPBBoolArray alloc] initWithValues:kValues3
-                                     count:GPBARRAYSIZE(kValues3)];
-  XCTAssertNotNil(array3);
-
-  // Identity
-  XCTAssertTrue([array1 isEqual:array1]);
-  // Wrong type doesn't blow up.
-  XCTAssertFalse([array1 isEqual:@"bogus"]);
-  // 1/1Prime should be different objects, but equal.
-  XCTAssertNotEqual(array1, array1prime);
-  XCTAssertEqualObjects(array1, array1prime);
-  // Equal, so they must have same hash.
-  XCTAssertEqual([array1 hash], [array1prime hash]);
-
-  // 1/2/3 shouldn't be equal.
-  XCTAssertNotEqualObjects(array1, array2);
-  XCTAssertNotEqualObjects(array1, array3);
-  XCTAssertNotEqualObjects(array2, array3);
-
-  [array1 release];
-  [array1prime release];
-  [array2 release];
-  [array3 release];
-}
-
-- (void)testCopy {
-  const BOOL kValues[] = { TRUE, TRUE, FALSE, FALSE };
-  GPBBoolArray *array =
-      [[GPBBoolArray alloc] initWithValues:kValues
-                                     count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(array);
-
-  GPBBoolArray *array2 = [array copy];
-  XCTAssertNotNil(array2);
-
-  // Should be new object but equal.
-  XCTAssertNotEqual(array, array2);
-  XCTAssertEqualObjects(array, array2);
-  [array2 release];
-  [array release];
-}
-
-- (void)testArrayFromArray {
-  const BOOL kValues[] = { TRUE, TRUE, FALSE, FALSE };
-  GPBBoolArray *array =
-      [[GPBBoolArray alloc] initWithValues:kValues
-                                     count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(array);
-
-  GPBBoolArray *array2 = [GPBBoolArray arrayWithValueArray:array];
-  XCTAssertNotNil(array2);
-
-  // Should be new pointer, but equal objects.
-  XCTAssertNotEqual(array, array2);
-  XCTAssertEqualObjects(array, array2);
-  [array release];
-}
-
-- (void)testAdds {
-  GPBBoolArray *array = [GPBBoolArray array];
-  XCTAssertNotNil(array);
-
-  XCTAssertEqual(array.count, 0U);
-  [array addValue:TRUE];
-  XCTAssertEqual(array.count, 1U);
-
-  const BOOL kValues1[] = { TRUE, FALSE };
-  [array addValues:kValues1 count:GPBARRAYSIZE(kValues1)];
-  XCTAssertEqual(array.count, 3U);
-
-  const BOOL kValues2[] = { FALSE, TRUE };
-  GPBBoolArray *array2 =
-      [[GPBBoolArray alloc] initWithValues:kValues2
-                                     count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(array2);
-  [array addValuesFromArray:array2];
-  XCTAssertEqual(array.count, 5U);
-
-  // Zero/nil inputs do nothing.
-  [array addValues:kValues1 count:0];
-  XCTAssertEqual(array.count, 5U);
-  [array addValues:NULL count:5];
-  XCTAssertEqual(array.count, 5U);
-
-  XCTAssertEqual([array valueAtIndex:0], TRUE);
-  XCTAssertEqual([array valueAtIndex:1], TRUE);
-  XCTAssertEqual([array valueAtIndex:2], FALSE);
-  XCTAssertEqual([array valueAtIndex:3], FALSE);
-  XCTAssertEqual([array valueAtIndex:4], TRUE);
-  [array2 release];
-}
-
-- (void)testInsert {
-  const BOOL kValues[] = { TRUE, TRUE, FALSE };
-  GPBBoolArray *array =
-      [[GPBBoolArray alloc] initWithValues:kValues
-                                     count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(array);
-  XCTAssertEqual(array.count, 3U);
-
-  // First
-  [array insertValue:FALSE atIndex:0];
-  XCTAssertEqual(array.count, 4U);
-
-  // Middle
-  [array insertValue:FALSE atIndex:2];
-  XCTAssertEqual(array.count, 5U);
-
-  // End
-  [array insertValue:FALSE atIndex:5];
-  XCTAssertEqual(array.count, 6U);
-
-  // Too far.
-  XCTAssertThrowsSpecificNamed([array insertValue:FALSE atIndex:7],
-                               NSException, NSRangeException);
-
-  XCTAssertEqual([array valueAtIndex:0], FALSE);
-  XCTAssertEqual([array valueAtIndex:1], TRUE);
-  XCTAssertEqual([array valueAtIndex:2], FALSE);
-  XCTAssertEqual([array valueAtIndex:3], TRUE);
-  XCTAssertEqual([array valueAtIndex:4], FALSE);
-  XCTAssertEqual([array valueAtIndex:5], FALSE);
-  [array release];
-}
-
-- (void)testRemove {
-  const BOOL kValues[] = { FALSE, TRUE, TRUE, FALSE, FALSE, FALSE };
-  GPBBoolArray *array =
-      [[GPBBoolArray alloc] initWithValues:kValues
-                                     count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(array);
-  XCTAssertEqual(array.count, 6U);
-
-  // First
-  [array removeValueAtIndex:0];
-  XCTAssertEqual(array.count, 5U);
-  XCTAssertEqual([array valueAtIndex:0], TRUE);
-
-  // Middle
-  [array removeValueAtIndex:2];
-  XCTAssertEqual(array.count, 4U);
-  XCTAssertEqual([array valueAtIndex:2], FALSE);
-
-  // End
-  [array removeValueAtIndex:3];
-  XCTAssertEqual(array.count, 3U);
-
-  XCTAssertEqual([array valueAtIndex:0], TRUE);
-  XCTAssertEqual([array valueAtIndex:1], TRUE);
-  XCTAssertEqual([array valueAtIndex:2], FALSE);
-
-  // Too far.
-  XCTAssertThrowsSpecificNamed([array removeValueAtIndex:3],
-                               NSException, NSRangeException);
-
-  [array removeAll];
-  XCTAssertEqual(array.count, 0U);
-  XCTAssertThrowsSpecificNamed([array removeValueAtIndex:0],
-                               NSException, NSRangeException);
-  [array release];
-}
-
-- (void)testInplaceMutation {
-  const BOOL kValues[] = { TRUE, TRUE, FALSE, FALSE };
-  GPBBoolArray *array =
-      [[GPBBoolArray alloc] initWithValues:kValues
-                                     count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(array);
-
-  [array replaceValueAtIndex:1 withValue:TRUE];
-  [array replaceValueAtIndex:3 withValue:FALSE];
-  XCTAssertEqual(array.count, 4U);
-  XCTAssertEqual([array valueAtIndex:0], TRUE);
-  XCTAssertEqual([array valueAtIndex:1], TRUE);
-  XCTAssertEqual([array valueAtIndex:2], FALSE);
-  XCTAssertEqual([array valueAtIndex:3], FALSE);
-
-  XCTAssertThrowsSpecificNamed([array replaceValueAtIndex:4 withValue:FALSE],
-                               NSException, NSRangeException);
-
-  [array exchangeValueAtIndex:1 withValueAtIndex:3];
-  XCTAssertEqual(array.count, 4U);
-  XCTAssertEqual([array valueAtIndex:0], TRUE);
-  XCTAssertEqual([array valueAtIndex:1], FALSE);
-  XCTAssertEqual([array valueAtIndex:2], FALSE);
-  XCTAssertEqual([array valueAtIndex:3], TRUE);
-
-  [array exchangeValueAtIndex:2 withValueAtIndex:0];
-  XCTAssertEqual(array.count, 4U);
-  XCTAssertEqual([array valueAtIndex:0], FALSE);
-  XCTAssertEqual([array valueAtIndex:1], FALSE);
-  XCTAssertEqual([array valueAtIndex:2], TRUE);
-  XCTAssertEqual([array valueAtIndex:3], TRUE);
-
-  XCTAssertThrowsSpecificNamed([array exchangeValueAtIndex:4 withValueAtIndex:1],
-                               NSException, NSRangeException);
-  XCTAssertThrowsSpecificNamed([array exchangeValueAtIndex:1 withValueAtIndex:4],
-                               NSException, NSRangeException);
-  [array release];
-}
-
-- (void)testInternalResizing {
-  const BOOL kValues[] = { TRUE, TRUE, FALSE, FALSE };
-  GPBBoolArray *array =
-      [GPBBoolArray arrayWithCapacity:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(array);
-  [array addValues:kValues count:GPBARRAYSIZE(kValues)];
-
-  // Add/remove to trigger the intneral buffer to grow/shrink.
-  for (int i = 0; i < 100; ++i) {
-    [array addValues:kValues count:GPBARRAYSIZE(kValues)];
-  }
-  XCTAssertEqual(array.count, 404U);
-  for (int i = 0; i < 100; ++i) {
-    [array removeValueAtIndex:(i * 2)];
-  }
-  XCTAssertEqual(array.count, 304U);
-  for (int i = 0; i < 100; ++i) {
-    [array insertValue:FALSE atIndex:(i * 3)];
-  }
-  XCTAssertEqual(array.count, 404U);
-  [array removeAll];
-  XCTAssertEqual(array.count, 0U);
-}
-
-@end
-
-// clang-format on
-//%PDDM-EXPAND ARRAY_TESTS2(Enum, int32_t, 71, 72, 73, 74, Raw)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-#pragma mark - Enum
-
-@interface GPBEnumArrayTests : XCTestCase
-@end
-
-@implementation GPBEnumArrayTests
-
-- (void)testEmpty {
-  GPBEnumArray *array = [[GPBEnumArray alloc] init];
-  XCTAssertNotNil(array);
-  XCTAssertEqual(array.count, 0U);
-  XCTAssertThrowsSpecificNamed([array valueAtIndex:0], NSException, NSRangeException);
-  [array enumerateValuesWithBlock:^(int32_t value, NSUInteger idx, BOOL *stop) {
-    #pragma unused(value, idx, stop)
-    XCTFail(@"Shouldn't get here!");
-  }];
-  [array enumerateValuesWithOptions:NSEnumerationReverse
-                         usingBlock:^(int32_t value, NSUInteger idx, BOOL *stop) {
-    #pragma unused(value, idx, stop)
-    XCTFail(@"Shouldn't get here!");
-  }];
-  [array release];
-}
-
-- (void)testOne {
-  GPBEnumArray *array = [GPBEnumArray arrayWithValue:71];
-  XCTAssertNotNil(array);
-  XCTAssertEqual(array.count, 1U);
-  XCTAssertEqual([array valueAtIndex:0], 71);
-  XCTAssertThrowsSpecificNamed([array valueAtIndex:1], NSException, NSRangeException);
-  [array enumerateValuesWithBlock:^(int32_t value, NSUInteger idx, BOOL *stop) {
-    XCTAssertEqual(idx, 0U);
-    XCTAssertEqual(value, 71);
-    XCTAssertNotEqual(stop, NULL);
-  }];
-  [array enumerateValuesWithOptions:NSEnumerationReverse
-                         usingBlock:^(int32_t value, NSUInteger idx, BOOL *stop) {
-    XCTAssertEqual(idx, 0U);
-    XCTAssertEqual(value, 71);
-    XCTAssertNotEqual(stop, NULL);
-  }];
-}
-
-- (void)testBasics {
-  static const int32_t kValues[] = { 71, 72, 73, 74 };
-  GPBEnumArray *array =
-      [[GPBEnumArray alloc] initWithValues:kValues
-                                     count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(array);
-  XCTAssertEqual(array.count, 4U);
-  XCTAssertEqual([array valueAtIndex:0], 71);
-  XCTAssertEqual([array valueAtIndex:1], 72);
-  XCTAssertEqual([array valueAtIndex:2], 73);
-  XCTAssertEqual([array valueAtIndex:3], 74);
-  XCTAssertThrowsSpecificNamed([array valueAtIndex:4], NSException, NSRangeException);
-  __block NSUInteger idx2 = 0;
-  [array enumerateValuesWithBlock:^(int32_t value, NSUInteger idx, BOOL *stop) {
-    XCTAssertEqual(idx, idx2);
-    XCTAssertEqual(value, kValues[idx]);
-    XCTAssertNotEqual(stop, NULL);
-    ++idx2;
-  }];
-  idx2 = 0;
-  [array enumerateValuesWithOptions:NSEnumerationReverse
-                         usingBlock:^(int32_t value, NSUInteger idx, BOOL *stop) {
-    XCTAssertEqual(idx, (3 - idx2));
-    XCTAssertEqual(value, kValues[idx]);
-    XCTAssertNotEqual(stop, NULL);
-    ++idx2;
-  }];
-  // Stopping the enumeration.
-  idx2 = 0;
-  [array enumerateValuesWithBlock:^(int32_t value, NSUInteger idx, BOOL *stop) {
-    XCTAssertEqual(idx, idx2);
-    XCTAssertEqual(value, kValues[idx]);
-    XCTAssertNotEqual(stop, NULL);
-    if (idx2 == 1) *stop = YES;
-    XCTAssertNotEqual(idx, 2U);
-    XCTAssertNotEqual(idx, 3U);
-    ++idx2;
-  }];
-  idx2 = 0;
-  [array enumerateValuesWithOptions:NSEnumerationReverse
-                         usingBlock:^(int32_t value, NSUInteger idx, BOOL *stop) {
-    XCTAssertEqual(idx, (3 - idx2));
-    XCTAssertEqual(value, kValues[idx]);
-    XCTAssertNotEqual(stop, NULL);
-    if (idx2 == 1) *stop = YES;
-    XCTAssertNotEqual(idx, 1U);
-    XCTAssertNotEqual(idx, 0U);
-    ++idx2;
-  }];
-  // Ensure description doesn't choke.
-  XCTAssertTrue(array.description.length > 10);
-  [array release];
-}
-
-- (void)testEquality {
-  const int32_t kValues1[] = { 71, 72, 73 };
-  const int32_t kValues2[] = { 71, 74, 73 };
-  const int32_t kValues3[] = { 71, 72, 73, 74 };
-  GPBEnumArray *array1 =
-      [[GPBEnumArray alloc] initWithValues:kValues1
-                                     count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(array1);
-  GPBEnumArray *array1prime =
-      [[GPBEnumArray alloc] initWithValues:kValues1
-                                     count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(array1prime);
-  GPBEnumArray *array2 =
-      [[GPBEnumArray alloc] initWithValues:kValues2
-                                     count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(array2);
-  GPBEnumArray *array3 =
-      [[GPBEnumArray alloc] initWithValues:kValues3
-                                     count:GPBARRAYSIZE(kValues3)];
-  XCTAssertNotNil(array3);
-
-  // Identity
-  XCTAssertTrue([array1 isEqual:array1]);
-  // Wrong type doesn't blow up.
-  XCTAssertFalse([array1 isEqual:@"bogus"]);
-  // 1/1Prime should be different objects, but equal.
-  XCTAssertNotEqual(array1, array1prime);
-  XCTAssertEqualObjects(array1, array1prime);
-  // Equal, so they must have same hash.
-  XCTAssertEqual([array1 hash], [array1prime hash]);
-
-  // 1/2/3 shouldn't be equal.
-  XCTAssertNotEqualObjects(array1, array2);
-  XCTAssertNotEqualObjects(array1, array3);
-  XCTAssertNotEqualObjects(array2, array3);
-
-  [array1 release];
-  [array1prime release];
-  [array2 release];
-  [array3 release];
-}
-
-- (void)testCopy {
-  const int32_t kValues[] = { 71, 72, 73, 74 };
-  GPBEnumArray *array =
-      [[GPBEnumArray alloc] initWithValues:kValues
-                                     count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(array);
-
-  GPBEnumArray *array2 = [array copy];
-  XCTAssertNotNil(array2);
-
-  // Should be new object but equal.
-  XCTAssertNotEqual(array, array2);
-  XCTAssertEqualObjects(array, array2);
-  [array2 release];
-  [array release];
-}
-
-- (void)testArrayFromArray {
-  const int32_t kValues[] = { 71, 72, 73, 74 };
-  GPBEnumArray *array =
-      [[GPBEnumArray alloc] initWithValues:kValues
-                                     count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(array);
-
-  GPBEnumArray *array2 = [GPBEnumArray arrayWithValueArray:array];
-  XCTAssertNotNil(array2);
-
-  // Should be new pointer, but equal objects.
-  XCTAssertNotEqual(array, array2);
-  XCTAssertEqualObjects(array, array2);
-  [array release];
-}
-
-- (void)testAdds {
-  GPBEnumArray *array = [GPBEnumArray array];
-  XCTAssertNotNil(array);
-
-  XCTAssertEqual(array.count, 0U);
-  [array addValue:71];
-  XCTAssertEqual(array.count, 1U);
-
-  const int32_t kValues1[] = { 72, 73 };
-  [array addValues:kValues1 count:GPBARRAYSIZE(kValues1)];
-  XCTAssertEqual(array.count, 3U);
-
-  const int32_t kValues2[] = { 74, 71 };
-  GPBEnumArray *array2 =
-      [[GPBEnumArray alloc] initWithValues:kValues2
-                                     count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(array2);
-  [array addRawValuesFromArray:array2];
-  XCTAssertEqual(array.count, 5U);
-
-  // Zero/nil inputs do nothing.
-  [array addValues:kValues1 count:0];
-  XCTAssertEqual(array.count, 5U);
-  [array addValues:NULL count:5];
-  XCTAssertEqual(array.count, 5U);
-
-  XCTAssertEqual([array valueAtIndex:0], 71);
-  XCTAssertEqual([array valueAtIndex:1], 72);
-  XCTAssertEqual([array valueAtIndex:2], 73);
-  XCTAssertEqual([array valueAtIndex:3], 74);
-  XCTAssertEqual([array valueAtIndex:4], 71);
-  [array2 release];
-}
-
-- (void)testInsert {
-  const int32_t kValues[] = { 71, 72, 73 };
-  GPBEnumArray *array =
-      [[GPBEnumArray alloc] initWithValues:kValues
-                                     count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(array);
-  XCTAssertEqual(array.count, 3U);
-
-  // First
-  [array insertValue:74 atIndex:0];
-  XCTAssertEqual(array.count, 4U);
-
-  // Middle
-  [array insertValue:74 atIndex:2];
-  XCTAssertEqual(array.count, 5U);
-
-  // End
-  [array insertValue:74 atIndex:5];
-  XCTAssertEqual(array.count, 6U);
-
-  // Too far.
-  XCTAssertThrowsSpecificNamed([array insertValue:74 atIndex:7],
-                               NSException, NSRangeException);
-
-  XCTAssertEqual([array valueAtIndex:0], 74);
-  XCTAssertEqual([array valueAtIndex:1], 71);
-  XCTAssertEqual([array valueAtIndex:2], 74);
-  XCTAssertEqual([array valueAtIndex:3], 72);
-  XCTAssertEqual([array valueAtIndex:4], 73);
-  XCTAssertEqual([array valueAtIndex:5], 74);
-  [array release];
-}
-
-- (void)testRemove {
-  const int32_t kValues[] = { 74, 71, 72, 74, 73, 74 };
-  GPBEnumArray *array =
-      [[GPBEnumArray alloc] initWithValues:kValues
-                                     count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(array);
-  XCTAssertEqual(array.count, 6U);
-
-  // First
-  [array removeValueAtIndex:0];
-  XCTAssertEqual(array.count, 5U);
-  XCTAssertEqual([array valueAtIndex:0], 71);
-
-  // Middle
-  [array removeValueAtIndex:2];
-  XCTAssertEqual(array.count, 4U);
-  XCTAssertEqual([array valueAtIndex:2], 73);
-
-  // End
-  [array removeValueAtIndex:3];
-  XCTAssertEqual(array.count, 3U);
-
-  XCTAssertEqual([array valueAtIndex:0], 71);
-  XCTAssertEqual([array valueAtIndex:1], 72);
-  XCTAssertEqual([array valueAtIndex:2], 73);
-
-  // Too far.
-  XCTAssertThrowsSpecificNamed([array removeValueAtIndex:3],
-                               NSException, NSRangeException);
-
-  [array removeAll];
-  XCTAssertEqual(array.count, 0U);
-  XCTAssertThrowsSpecificNamed([array removeValueAtIndex:0],
-                               NSException, NSRangeException);
-  [array release];
-}
-
-- (void)testInplaceMutation {
-  const int32_t kValues[] = { 71, 71, 73, 73 };
-  GPBEnumArray *array =
-      [[GPBEnumArray alloc] initWithValues:kValues
-                                     count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(array);
-
-  [array replaceValueAtIndex:1 withValue:72];
-  [array replaceValueAtIndex:3 withValue:74];
-  XCTAssertEqual(array.count, 4U);
-  XCTAssertEqual([array valueAtIndex:0], 71);
-  XCTAssertEqual([array valueAtIndex:1], 72);
-  XCTAssertEqual([array valueAtIndex:2], 73);
-  XCTAssertEqual([array valueAtIndex:3], 74);
-
-  XCTAssertThrowsSpecificNamed([array replaceValueAtIndex:4 withValue:74],
-                               NSException, NSRangeException);
-
-  [array exchangeValueAtIndex:1 withValueAtIndex:3];
-  XCTAssertEqual(array.count, 4U);
-  XCTAssertEqual([array valueAtIndex:0], 71);
-  XCTAssertEqual([array valueAtIndex:1], 74);
-  XCTAssertEqual([array valueAtIndex:2], 73);
-  XCTAssertEqual([array valueAtIndex:3], 72);
-
-  [array exchangeValueAtIndex:2 withValueAtIndex:0];
-  XCTAssertEqual(array.count, 4U);
-  XCTAssertEqual([array valueAtIndex:0], 73);
-  XCTAssertEqual([array valueAtIndex:1], 74);
-  XCTAssertEqual([array valueAtIndex:2], 71);
-  XCTAssertEqual([array valueAtIndex:3], 72);
-
-  XCTAssertThrowsSpecificNamed([array exchangeValueAtIndex:4 withValueAtIndex:1],
-                               NSException, NSRangeException);
-  XCTAssertThrowsSpecificNamed([array exchangeValueAtIndex:1 withValueAtIndex:4],
-                               NSException, NSRangeException);
-  [array release];
-}
-
-- (void)testInternalResizing {
-  const int32_t kValues[] = { 71, 72, 73, 74 };
-  GPBEnumArray *array =
-      [GPBEnumArray arrayWithCapacity:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(array);
-  [array addValues:kValues count:GPBARRAYSIZE(kValues)];
-
-  // Add/remove to trigger the intneral buffer to grow/shrink.
-  for (int i = 0; i < 100; ++i) {
-    [array addValues:kValues count:GPBARRAYSIZE(kValues)];
-  }
-  XCTAssertEqual(array.count, 404U);
-  for (int i = 0; i < 100; ++i) {
-    [array removeValueAtIndex:(i * 2)];
-  }
-  XCTAssertEqual(array.count, 304U);
-  for (int i = 0; i < 100; ++i) {
-    [array insertValue:74 atIndex:(i * 3)];
-  }
-  XCTAssertEqual(array.count, 404U);
-  [array removeAll];
-  XCTAssertEqual(array.count, 0U);
-}
-
-@end
-
-// clang-format on
-//%PDDM-EXPAND-END (8 expansions)
-
-#pragma mark - Non macro-based Enum tests
-
-// These are hand written tests to cover the verification and raw methods.
-
-@interface GPBEnumArrayCustomTests : XCTestCase
-@end
-
-@implementation GPBEnumArrayCustomTests
-
-- (void)testRawBasics {
-  static const int32_t kValues[] = { 71, 272, 73, 374 };
-  static const int32_t kValuesFiltered[] = {
-      71, kGPBUnrecognizedEnumeratorValue, 73, kGPBUnrecognizedEnumeratorValue
-  };
-  XCTAssertEqual(GPBARRAYSIZE(kValues), GPBARRAYSIZE(kValuesFiltered));
-  GPBEnumArray *array =
-      [[GPBEnumArray alloc] initWithValidationFunction:TestingEnum_IsValidValue
-                                             rawValues:kValues
-                                                 count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(array);
-  XCTAssertEqual(array.count, 4U);
-  GPBEnumValidationFunc func = TestingEnum_IsValidValue;
-  XCTAssertEqual(array.validationFunc, func);
-  XCTAssertEqual([array rawValueAtIndex:0], 71);
-  XCTAssertEqual([array rawValueAtIndex:1], 272);
-  XCTAssertEqual([array valueAtIndex:1], kGPBUnrecognizedEnumeratorValue);
-  XCTAssertEqual([array rawValueAtIndex:2], 73);
-  XCTAssertEqual([array rawValueAtIndex:3], 374);
-  XCTAssertEqual([array valueAtIndex:3], kGPBUnrecognizedEnumeratorValue);
-  XCTAssertThrowsSpecificNamed([array rawValueAtIndex:4], NSException, NSRangeException);
-  __block NSUInteger idx2 = 0;
-  [array enumerateRawValuesWithBlock:^(int32_t value, NSUInteger idx, BOOL *stop) {
-    XCTAssertEqual(idx, idx2);
-    XCTAssertEqual(value, kValues[idx]);
-    XCTAssertNotEqual(stop, NULL);
-    ++idx2;
-  }];
-  idx2 = 0;
-  [array enumerateValuesWithBlock:^(int32_t value, NSUInteger idx, BOOL *stop) {
-    XCTAssertEqual(idx, idx2);
-    XCTAssertEqual(value, kValuesFiltered[idx]);
-    XCTAssertNotEqual(stop, NULL);
-    ++idx2;
-  }];
-  idx2 = 0;
-  [array enumerateRawValuesWithOptions:NSEnumerationReverse
-                            usingBlock:^(int32_t value, NSUInteger idx, BOOL *stop) {
-    XCTAssertEqual(idx, (3 - idx2));
-    XCTAssertEqual(value, kValues[idx]);
-    XCTAssertNotEqual(stop, NULL);
-    ++idx2;
-  }];
-  idx2 = 0;
-  [array enumerateValuesWithOptions:NSEnumerationReverse
-                         usingBlock:^(int32_t value, NSUInteger idx, BOOL *stop) {
-    XCTAssertEqual(idx, (3 - idx2));
-    XCTAssertEqual(value, kValuesFiltered[idx]);
-    XCTAssertNotEqual(stop, NULL);
-    ++idx2;
-  }];
-  // Stopping the enumeration.
-  idx2 = 0;
-  [array enumerateRawValuesWithBlock:^(int32_t value, NSUInteger idx, BOOL *stop) {
-    XCTAssertEqual(idx, idx2);
-    XCTAssertEqual(value, kValues[idx]);
-    XCTAssertNotEqual(stop, NULL);
-    if (idx2 == 1) *stop = YES;
-    XCTAssertNotEqual(idx, 2U);
-    XCTAssertNotEqual(idx, 3U);
-    ++idx2;
-  }];
-  idx2 = 0;
-  [array enumerateRawValuesWithOptions:NSEnumerationReverse
-                            usingBlock:^(int32_t value, NSUInteger idx, BOOL *stop) {
-    XCTAssertEqual(idx, (3 - idx2));
-    XCTAssertEqual(value, kValues[idx]);
-    XCTAssertNotEqual(stop, NULL);
-    if (idx2 == 1) *stop = YES;
-    XCTAssertNotEqual(idx, 1U);
-    XCTAssertNotEqual(idx, 0U);
-    ++idx2;
-  }];
-  [array release];
-}
-
-- (void)testEquality {
-  const int32_t kValues1[] = { 71, 72, 173 };  // With unknown value
-  const int32_t kValues2[] = { 71, 74, 173 };  // With unknown value
-  const int32_t kValues3[] = { 71, 72, 173, 74 };  // With unknown value
-  GPBEnumArray *array1 =
-      [[GPBEnumArray alloc] initWithValidationFunction:TestingEnum_IsValidValue
-                                             rawValues:kValues1
-                                                 count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(array1);
-  GPBEnumArray *array1prime =
-      [[GPBEnumArray alloc] initWithValidationFunction:TestingEnum_IsValidValue2
-                                             rawValues:kValues1
-                                                 count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(array1prime);
-  GPBEnumArray *array2 =
-      [[GPBEnumArray alloc] initWithValues:kValues2
-                                     count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(array2);
-  GPBEnumArray *array3 =
-      [[GPBEnumArray alloc] initWithValues:kValues3
-                                     count:GPBARRAYSIZE(kValues3)];
-  XCTAssertNotNil(array3);
-
-  // 1/1Prime should be different objects, but equal.
-  XCTAssertNotEqual(array1, array1prime);
-  XCTAssertEqualObjects(array1, array1prime);
-  // Equal, so they must have same hash.
-  XCTAssertEqual([array1 hash], [array1prime hash]);
-  // But different validation functions.
-  XCTAssertNotEqual(array1.validationFunc, array1prime.validationFunc);
-
-  // 1/2/3 shouldn't be equal.
-  XCTAssertNotEqualObjects(array1, array2);
-  XCTAssertNotEqualObjects(array1, array3);
-  XCTAssertNotEqualObjects(array2, array3);
-
-  [array1 release];
-  [array1prime release];
-  [array2 release];
-  [array3 release];
-}
-
-- (void)testCopy {
-  const int32_t kValues[] = { 71, 72 };
-  GPBEnumArray *array =
-      [[GPBEnumArray alloc] initWithValues:kValues
-                                     count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(array);
-
-  [array addRawValue:1000]; // Unknown
-  XCTAssertEqual(array.count, 3U);
-  XCTAssertEqual([array rawValueAtIndex:0], 71);
-  XCTAssertEqual([array rawValueAtIndex:1], 72);
-  XCTAssertEqual([array rawValueAtIndex:2], 1000);
-  XCTAssertEqual([array valueAtIndex:2], kGPBUnrecognizedEnumeratorValue);
-
-  GPBEnumArray *array2 = [array copy];
-  XCTAssertNotNil(array2);
-
-  // Should be new object but equal.
-  XCTAssertNotEqual(array, array2);
-  XCTAssertEqualObjects(array, array2);
-  XCTAssertEqual(array.validationFunc, array2.validationFunc);
-  XCTAssertTrue([array2 isKindOfClass:[GPBEnumArray class]]);
-  XCTAssertEqual(array2.count, 3U);
-  XCTAssertEqual([array2 rawValueAtIndex:0], 71);
-  XCTAssertEqual([array2 rawValueAtIndex:1], 72);
-  XCTAssertEqual([array2 rawValueAtIndex:2], 1000);
-  XCTAssertEqual([array2 valueAtIndex:2], kGPBUnrecognizedEnumeratorValue);
-  [array2 release];
-  [array release];
-}
-
-- (void)testArrayFromArray {
-  const int32_t kValues[] = { 71, 172, 173, 74 };  // Unknowns
-  GPBEnumArray *array =
-      [[GPBEnumArray alloc] initWithValidationFunction:TestingEnum_IsValidValue
-                                             rawValues:kValues
-                                                 count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(array);
-
-  GPBEnumArray *array2 = [GPBEnumArray arrayWithValueArray:array];
-  XCTAssertNotNil(array2);
-
-  // Should be new pointer, but equal objects.
-  XCTAssertNotEqual(array, array2);
-  XCTAssertEqualObjects(array, array2);
-  XCTAssertEqual(array.validationFunc, array2.validationFunc);
-  [array release];
-}
-
-- (void)testUnknownAdds {
-  GPBEnumArray *array =
-      [[GPBEnumArray alloc] initWithValidationFunction:TestingEnum_IsValidValue];
-  XCTAssertNotNil(array);
-
-  XCTAssertThrowsSpecificNamed([array addValue:172],
-                               NSException, NSInvalidArgumentException);
-  XCTAssertEqual(array.count, 0U);
-
-  const int32_t kValues1[] = { 172, 173 };  // Unknown
-  XCTAssertThrowsSpecificNamed([array addValues:kValues1 count:GPBARRAYSIZE(kValues1)],
-                               NSException, NSInvalidArgumentException);
-  XCTAssertEqual(array.count, 0U);
-  [array release];
-}
-
-- (void)testRawAdds {
-  GPBEnumArray *array =
-      [[GPBEnumArray alloc] initWithValidationFunction:TestingEnum_IsValidValue];
-  XCTAssertNotNil(array);
-
-  XCTAssertEqual(array.count, 0U);
-  [array addRawValue:71];  // Valid
-  XCTAssertEqual(array.count, 1U);
-
-  const int32_t kValues1[] = { 172, 173 };  // Unknown
-  [array addRawValues:kValues1 count:GPBARRAYSIZE(kValues1)];
-  XCTAssertEqual(array.count, 3U);
-
-  const int32_t kValues2[] = { 74, 71 };
-  GPBEnumArray *array2 =
-      [[GPBEnumArray alloc] initWithValues:kValues2
-                                     count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(array2);
-  [array addRawValuesFromArray:array2];
-  XCTAssertEqual(array.count, 5U);
-
-  XCTAssertEqual([array rawValueAtIndex:0], 71);
-  XCTAssertEqual([array rawValueAtIndex:1], 172);
-  XCTAssertEqual([array valueAtIndex:1], kGPBUnrecognizedEnumeratorValue);
-  XCTAssertEqual([array rawValueAtIndex:2], 173);
-  XCTAssertEqual([array valueAtIndex:2], kGPBUnrecognizedEnumeratorValue);
-  XCTAssertEqual([array rawValueAtIndex:3], 74);
-  XCTAssertEqual([array rawValueAtIndex:4], 71);
-  [array release];
-}
-
-- (void)testUnknownInserts {
-  const int32_t kValues[] = { 71, 72, 73 };
-  GPBEnumArray *array =
-      [[GPBEnumArray alloc] initWithValidationFunction:TestingEnum_IsValidValue
-                                             rawValues:kValues
-                                                 count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(array);
-  XCTAssertEqual(array.count, 3U);
-
-  // First
-  XCTAssertThrowsSpecificNamed([array insertValue:174 atIndex:0],
-                               NSException, NSInvalidArgumentException);
-  XCTAssertEqual(array.count, 3U);
-
-  // Middle
-  XCTAssertThrowsSpecificNamed([array insertValue:274 atIndex:1],
-                               NSException, NSInvalidArgumentException);
-  XCTAssertEqual(array.count, 3U);
-
-  // End
-  XCTAssertThrowsSpecificNamed([array insertValue:374 atIndex:3],
-                               NSException, NSInvalidArgumentException);
-  XCTAssertEqual(array.count, 3U);
-  [array release];
-}
-
-- (void)testRawInsert {
-  const int32_t kValues[] = { 71, 72, 73 };
-  GPBEnumArray *array =
-      [[GPBEnumArray alloc] initWithValidationFunction:TestingEnum_IsValidValue
-                                             rawValues:kValues
-                                                 count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(array);
-  XCTAssertEqual(array.count, 3U);
-
-  // First
-  [array insertRawValue:174 atIndex:0];  // Unknown
-  XCTAssertEqual(array.count, 4U);
-
-  // Middle
-  [array insertRawValue:274 atIndex:2];  // Unknown
-  XCTAssertEqual(array.count, 5U);
-
-  // End
-  [array insertRawValue:374 atIndex:5];  // Unknown
-  XCTAssertEqual(array.count, 6U);
-
-  // Too far.
-  XCTAssertThrowsSpecificNamed([array insertRawValue:74 atIndex:7],
-                               NSException, NSRangeException);
-
-  XCTAssertEqual([array rawValueAtIndex:0], 174);
-  XCTAssertEqual([array valueAtIndex:0], kGPBUnrecognizedEnumeratorValue);
-  XCTAssertEqual([array rawValueAtIndex:1], 71);
-  XCTAssertEqual([array rawValueAtIndex:2], 274);
-  XCTAssertEqual([array valueAtIndex:2], kGPBUnrecognizedEnumeratorValue);
-  XCTAssertEqual([array rawValueAtIndex:3], 72);
-  XCTAssertEqual([array rawValueAtIndex:4], 73);
-  XCTAssertEqual([array rawValueAtIndex:5], 374);
-  XCTAssertEqual([array valueAtIndex:5], kGPBUnrecognizedEnumeratorValue);
-  [array release];
-}
-
-- (void)testUnknownInplaceMutation {
-  const int32_t kValues[] = { 71, 72, 73, 74 };
-  GPBEnumArray *array =
-      [[GPBEnumArray alloc] initWithValidationFunction:TestingEnum_IsValidValue
-                                             rawValues:kValues
-                                                 count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(array);
-
-  XCTAssertThrowsSpecificNamed([array replaceValueAtIndex:1 withValue:172],
-                               NSException, NSInvalidArgumentException);
-  XCTAssertThrowsSpecificNamed([array replaceValueAtIndex:3 withValue:274],
-                               NSException, NSInvalidArgumentException);
-  XCTAssertEqual(array.count, 4U);
-  XCTAssertEqual([array valueAtIndex:0], 71);
-  XCTAssertEqual([array valueAtIndex:1], 72);
-  XCTAssertEqual([array valueAtIndex:2], 73);
-  XCTAssertEqual([array valueAtIndex:3], 74);
-  [array release];
-}
-
-
-- (void)testRawInplaceMutation {
-  const int32_t kValues[] = { 71, 72, 73, 74 };
-  GPBEnumArray *array =
-      [[GPBEnumArray alloc] initWithValidationFunction:TestingEnum_IsValidValue
-                                             rawValues:kValues
-                                                 count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(array);
-
-  [array replaceValueAtIndex:1 withRawValue:172];  // Unknown
-  [array replaceValueAtIndex:3 withRawValue:274];  // Unknown
-  XCTAssertEqual(array.count, 4U);
-  XCTAssertEqual([array rawValueAtIndex:0], 71);
-  XCTAssertEqual([array rawValueAtIndex:1], 172);
-  XCTAssertEqual([array valueAtIndex:1], kGPBUnrecognizedEnumeratorValue);
-  XCTAssertEqual([array rawValueAtIndex:2], 73);
-  XCTAssertEqual([array rawValueAtIndex:3], 274);
-  XCTAssertEqual([array valueAtIndex:3], kGPBUnrecognizedEnumeratorValue);
-
-  XCTAssertThrowsSpecificNamed([array replaceValueAtIndex:4 withRawValue:74],
-                               NSException, NSRangeException);
-  [array release];
-}
-
-- (void)testRawInternalResizing {
-  const int32_t kValues[] = { 71, 172, 173, 74 };  // Unknown
-  GPBEnumArray *array =
-      [[GPBEnumArray alloc] initWithValues:kValues
-                                     count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(array);
-
-  // Add/remove to trigger the intneral buffer to grow/shrink.
-  for (int i = 0; i < 100; ++i) {
-    [array addRawValues:kValues count:GPBARRAYSIZE(kValues)];
-  }
-  XCTAssertEqual(array.count, 404U);
-  for (int i = 0; i < 100; ++i) {
-    [array removeValueAtIndex:(i * 2)];
-  }
-  XCTAssertEqual(array.count, 304U);
-  for (int i = 0; i < 100; ++i) {
-    [array insertRawValue:274 atIndex:(i * 3)];  // Unknown
-  }
-  XCTAssertEqual(array.count, 404U);
-  [array removeAll];
-  XCTAssertEqual(array.count, 0U);
-  [array release];
-}
-
-@end
-
-#pragma mark - GPBAutocreatedArray Tests
-
-// These are hand written tests to double check some behaviors of the
-// GPBAutocreatedArray.
-
-// NOTE: GPBAutocreatedArray is private to the library, users of the library
-// should never have to directly deal with this class.
-
-@interface GPBAutocreatedArrayTests : XCTestCase
-@end
-
-@implementation GPBAutocreatedArrayTests
-
-- (void)testEquality {
-  GPBAutocreatedArray *array = [[GPBAutocreatedArray alloc] init];
-
-  XCTAssertTrue([array isEqual:@[]]);
-  XCTAssertTrue([array isEqualToArray:@[]]);
-
-  XCTAssertFalse([array isEqual:@[ @"foo" ]]);
-  XCTAssertFalse([array isEqualToArray:@[ @"foo" ]]);
-
-  [array addObject:@"foo"];
-
-  XCTAssertFalse([array isEqual:@[]]);
-  XCTAssertFalse([array isEqualToArray:@[]]);
-  XCTAssertTrue([array isEqual:@[ @"foo" ]]);
-  XCTAssertTrue([array isEqualToArray:@[ @"foo" ]]);
-  XCTAssertFalse([array isEqual:@[ @"bar" ]]);
-  XCTAssertFalse([array isEqualToArray:@[ @"bar" ]]);
-
-  GPBAutocreatedArray *array2 = [[GPBAutocreatedArray alloc] init];
-
-  XCTAssertFalse([array isEqual:array2]);
-  XCTAssertFalse([array isEqualToArray:array2]);
-
-  [array2 addObject:@"bar"];
-  XCTAssertFalse([array isEqual:array2]);
-  XCTAssertFalse([array isEqualToArray:array2]);
-
-  [array2 replaceObjectAtIndex:0 withObject:@"foo"];
-  XCTAssertTrue([array isEqual:array2]);
-  XCTAssertTrue([array isEqualToArray:array2]);
-
-  [array2 release];
-  [array release];
-}
-
-- (void)testCopy {
-  {
-    GPBAutocreatedArray *array = [[GPBAutocreatedArray alloc] init];
-
-    NSArray *cpy = [array copy];
-    XCTAssertTrue(cpy != array); // Ptr compare
-    XCTAssertTrue([cpy isKindOfClass:[NSArray class]]);
-    XCTAssertFalse([cpy isKindOfClass:[GPBAutocreatedArray class]]);
-    XCTAssertEqual(cpy.count, (NSUInteger)0);
-
-    NSArray *cpy2 = [array copy];
-    XCTAssertTrue(cpy2 != array); // Ptr compare
-    // Can't compare cpy and cpy2 because NSArray has a singleton empty
-    // array it uses, so the ptrs are the same.
-    XCTAssertTrue([cpy2 isKindOfClass:[NSArray class]]);
-    XCTAssertFalse([cpy2 isKindOfClass:[GPBAutocreatedArray class]]);
-    XCTAssertEqual(cpy2.count, (NSUInteger)0);
-
-    [cpy2 release];
-    [cpy release];
-    [array release];
-  }
-
-  {
-    GPBAutocreatedArray *array = [[GPBAutocreatedArray alloc] init];
-
-    NSMutableArray *cpy = [array mutableCopy];
-    XCTAssertTrue(cpy != array); // Ptr compare
-    XCTAssertTrue([cpy isKindOfClass:[NSMutableArray class]]);
-    XCTAssertFalse([cpy isKindOfClass:[GPBAutocreatedArray class]]);
-    XCTAssertEqual(cpy.count, (NSUInteger)0);
-
-    NSMutableArray *cpy2 = [array mutableCopy];
-    XCTAssertTrue(cpy2 != array); // Ptr compare
-    XCTAssertTrue(cpy2 != cpy); // Ptr compare
-    XCTAssertTrue([cpy2 isKindOfClass:[NSMutableArray class]]);
-    XCTAssertFalse([cpy2 isKindOfClass:[GPBAutocreatedArray class]]);
-    XCTAssertEqual(cpy2.count, (NSUInteger)0);
-
-    [cpy2 release];
-    [cpy release];
-    [array release];
-  }
-
-  {
-    GPBAutocreatedArray *array = [[GPBAutocreatedArray alloc] init];
-    [array addObject:@"foo"];
-    [array addObject:@"bar"];
-
-    NSArray *cpy = [array copy];
-    XCTAssertTrue(cpy != array); // Ptr compare
-    XCTAssertTrue([cpy isKindOfClass:[NSArray class]]);
-    XCTAssertFalse([cpy isKindOfClass:[GPBAutocreatedArray class]]);
-    XCTAssertEqual(cpy.count, (NSUInteger)2);
-    XCTAssertEqualObjects(cpy[0], @"foo");
-    XCTAssertEqualObjects(cpy[1], @"bar");
-
-    NSArray *cpy2 = [array copy];
-    XCTAssertTrue(cpy2 != array); // Ptr compare
-    XCTAssertTrue(cpy2 != cpy); // Ptr compare
-    XCTAssertTrue([cpy2 isKindOfClass:[NSArray class]]);
-    XCTAssertFalse([cpy2 isKindOfClass:[GPBAutocreatedArray class]]);
-    XCTAssertEqual(cpy2.count, (NSUInteger)2);
-    XCTAssertEqualObjects(cpy2[0], @"foo");
-    XCTAssertEqualObjects(cpy2[1], @"bar");
-
-    [cpy2 release];
-    [cpy release];
-    [array release];
-  }
-
-  {
-    GPBAutocreatedArray *array = [[GPBAutocreatedArray alloc] init];
-    [array addObject:@"foo"];
-    [array addObject:@"bar"];
-
-    NSMutableArray *cpy = [array mutableCopy];
-    XCTAssertTrue(cpy != array); // Ptr compare
-    XCTAssertTrue([cpy isKindOfClass:[NSArray class]]);
-    XCTAssertFalse([cpy isKindOfClass:[GPBAutocreatedArray class]]);
-    XCTAssertEqual(cpy.count, (NSUInteger)2);
-    XCTAssertEqualObjects(cpy[0], @"foo");
-    XCTAssertEqualObjects(cpy[1], @"bar");
-
-    NSMutableArray *cpy2 = [array mutableCopy];
-    XCTAssertTrue(cpy2 != array); // Ptr compare
-    XCTAssertTrue(cpy2 != cpy); // Ptr compare
-    XCTAssertTrue([cpy2 isKindOfClass:[NSArray class]]);
-    XCTAssertFalse([cpy2 isKindOfClass:[GPBAutocreatedArray class]]);
-    XCTAssertEqual(cpy2.count, (NSUInteger)2);
-    XCTAssertEqualObjects(cpy2[0], @"foo");
-    XCTAssertEqualObjects(cpy2[1], @"bar");
-
-    [cpy2 release];
-    [cpy release];
-    [array release];
-  }
-}
-
-- (void)testIndexedSubscriptSupport {
-  // The base NSArray/NSMutableArray behaviors for *IndexedSubscript methods
-  // should still work via the methods that one has to override to make an
-  // NSMutableArray subclass.  i.e. - this should "just work" and if these
-  // crash/fail, then something is wrong in how NSMutableArray is subclassed.
-
-  GPBAutocreatedArray *array = [[GPBAutocreatedArray alloc] init];
-
-  [array addObject:@"foo"];
-  [array addObject:@"bar"];
-  XCTAssertEqual(array.count, (NSUInteger)2);
-  XCTAssertEqualObjects(array[0], @"foo");
-  XCTAssertEqualObjects(array[1], @"bar");
-  array[0] = @"foo2";
-  array[2] = @"baz";
-  XCTAssertEqual(array.count, (NSUInteger)3);
-  XCTAssertEqualObjects(array[0], @"foo2");
-  XCTAssertEqualObjects(array[1], @"bar");
-  XCTAssertEqualObjects(array[2], @"baz");
-
-  [array release];
-}
-
-@end
diff --git a/libs/protobuf/objectivec/Tests/GPBCodedInputStreamTests.m b/libs/protobuf/objectivec/Tests/GPBCodedInputStreamTests.m
deleted file mode 100644
index 6cd5a1f..0000000
--- a/libs/protobuf/objectivec/Tests/GPBCodedInputStreamTests.m
+++ /dev/null
@@ -1,460 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#import "GPBTestUtilities.h"
-
-#import "GPBCodedInputStream.h"
-#import "GPBCodedOutputStream.h"
-#import "GPBUnknownFieldSet_PackagePrivate.h"
-#import "GPBUtilities_PackagePrivate.h"
-#import "google/protobuf/Unittest.pbobjc.h"
-
-@interface CodedInputStreamTests : GPBTestCase
-@end
-
-@implementation CodedInputStreamTests
-
-- (NSData*)bytes_with_sentinel:(int32_t)unused, ... {
-  va_list list;
-  va_start(list, unused);
-
-  NSMutableData* values = [NSMutableData dataWithCapacity:0];
-  int32_t i;
-
-  while ((i = va_arg(list, int32_t)) != 256) {
-    NSAssert(i >= 0 && i < 256, @"");
-    uint8_t u = (uint8_t)i;
-    [values appendBytes:&u length:1];
-  }
-
-  va_end(list);
-
-  return values;
-}
-
-#define bytes(...) [self bytes_with_sentinel:0, __VA_ARGS__, 256]
-
-- (void)testDecodeZigZag {
-  [self assertReadZigZag32:bytes(0x0) value:0];
-  [self assertReadZigZag32:bytes(0x1) value:-1];
-  [self assertReadZigZag32:bytes(0x2) value:1];
-  [self assertReadZigZag32:bytes(0x3) value:-2];
-
-  [self assertReadZigZag32:bytes(0xFE, 0xFF, 0xFF, 0xFF, 0x07) value:(int32_t)0x3FFFFFFF];
-  [self assertReadZigZag32:bytes(0xFF, 0xFF, 0xFF, 0xFF, 0x07) value:(int32_t)0xC0000000];
-  [self assertReadZigZag32:bytes(0xFE, 0xFF, 0xFF, 0xFF, 0x0F) value:(int32_t)0x7FFFFFFF];
-  [self assertReadZigZag32:bytes(0xFF, 0xFF, 0xFF, 0xFF, 0x0F) value:(int32_t)0x80000000];
-
-  [self assertReadZigZag64:bytes(0x0) value:0];
-  [self assertReadZigZag64:bytes(0x1) value:-1];
-  [self assertReadZigZag64:bytes(0x2) value:1];
-  [self assertReadZigZag64:bytes(0x3) value:-2];
-
-  [self assertReadZigZag64:bytes(0xFE, 0xFF, 0xFF, 0xFF, 0x07) value:(int32_t)0x3FFFFFFF];
-  [self assertReadZigZag64:bytes(0xFF, 0xFF, 0xFF, 0xFF, 0x07) value:(int32_t)0xC0000000];
-  [self assertReadZigZag64:bytes(0xFE, 0xFF, 0xFF, 0xFF, 0x0F) value:(int32_t)0x7FFFFFFF];
-  [self assertReadZigZag64:bytes(0xFF, 0xFF, 0xFF, 0xFF, 0x0F) value:(int32_t)0x80000000];
-
-  [self assertReadZigZag64:bytes(0xFE, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x01) value:0x7FFFFFFFFFFFFFFFL];
-  [self assertReadZigZag64:bytes(0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x01) value:0x8000000000000000L];
-}
-
-- (void)assertReadVarint:(NSData*)data value:(int64_t)value {
-  if (value <= INT32_MAX && value >= INT32_MIN) {
-    {
-      GPBCodedInputStream* input = [GPBCodedInputStream streamWithData:data];
-      XCTAssertEqual((int32_t)value, [input readInt32]);
-    }
-    {
-      GPBCodedInputStream* input = [GPBCodedInputStream streamWithData:data];
-      XCTAssertEqual((int32_t)value, [input readEnum]);
-    }
-  }
-  if (value <= UINT32_MAX && value >= 0) {
-    GPBCodedInputStream* input = [GPBCodedInputStream streamWithData:data];
-    XCTAssertEqual((uint32_t)value, [input readUInt32]);
-  }
-  {
-    GPBCodedInputStream* input = [GPBCodedInputStream streamWithData:data];
-    XCTAssertEqual(value, [input readInt64]);
-  }
-  if (value >= 0) {
-    GPBCodedInputStream* input = [GPBCodedInputStream streamWithData:data];
-    XCTAssertEqual((uint64_t)value, [input readUInt64]);
-  }
-}
-
-- (void)assertReadLittleEndian32:(NSData*)data value:(int32_t)value {
-  {
-    GPBCodedInputStream* input = [GPBCodedInputStream streamWithData:data];
-    XCTAssertEqual(value, [input readSFixed32]);
-  }
-  {
-    GPBCodedInputStream* input = [GPBCodedInputStream streamWithData:data];
-    XCTAssertEqual(GPBConvertInt32ToFloat(value), [input readFloat]);
-  }
-  {
-    GPBCodedInputStream* input = [GPBCodedInputStream streamWithData:data];
-    XCTAssertEqual((uint32_t)value, [input readFixed32]);
-  }
-  {
-    GPBCodedInputStream* input = [GPBCodedInputStream streamWithData:data];
-    XCTAssertEqual(value, [input readSFixed32]);
-  }
-}
-
-- (void)assertReadLittleEndian64:(NSData*)data value:(int64_t)value {
-  {
-    GPBCodedInputStream* input = [GPBCodedInputStream streamWithData:data];
-    XCTAssertEqual(value, [input readSFixed64]);
-  }
-  {
-    GPBCodedInputStream* input = [GPBCodedInputStream streamWithData:data];
-    XCTAssertEqual(GPBConvertInt64ToDouble(value), [input readDouble]);
-  }
-  {
-    GPBCodedInputStream* input = [GPBCodedInputStream streamWithData:data];
-    XCTAssertEqual((uint64_t)value, [input readFixed64]);
-  }
-  {
-    GPBCodedInputStream* input = [GPBCodedInputStream streamWithData:data];
-    XCTAssertEqual(value, [input readSFixed64]);
-  }
-}
-
-- (void)assertReadZigZag32:(NSData*)data value:(int64_t)value {
-  GPBCodedInputStream* input = [GPBCodedInputStream streamWithData:data];
-  XCTAssertEqual((int32_t)value, [input readSInt32]);
-}
-
-- (void)assertReadZigZag64:(NSData*)data value:(int64_t)value {
-  GPBCodedInputStream* input = [GPBCodedInputStream streamWithData:data];
-  XCTAssertEqual(value, [input readSInt64]);
-}
-
-- (void)assertReadVarintFailure:(NSData*)data {
-  {
-    GPBCodedInputStream* input = [GPBCodedInputStream streamWithData:data];
-    XCTAssertThrows([input readInt32]);
-  }
-  {
-    GPBCodedInputStream* input = [GPBCodedInputStream streamWithData:data];
-    XCTAssertThrows([input readInt64]);
-  }
-}
-
-- (void)testBytes {
-  NSData* data = bytes(0xa2, 0x74);
-  XCTAssertEqual(data.length, (NSUInteger)2);
-  XCTAssertEqual(((uint8_t*)data.bytes)[0], (uint8_t)0xa2);
-  XCTAssertEqual(((uint8_t*)data.bytes)[1], (uint8_t)0x74);
-}
-
-- (void)testReadBool {
-  {
-    GPBCodedInputStream* input = [GPBCodedInputStream streamWithData:bytes(0x00)];
-    XCTAssertEqual(NO, [input readBool]);
-  }
-  {
-    GPBCodedInputStream* input = [GPBCodedInputStream streamWithData:bytes(0x01)];
-    XCTAssertEqual(YES, [input readBool]);
-  }
-}
-
-- (void)testReadVarint {
-  [self assertReadVarint:bytes(0x00) value:0];
-  [self assertReadVarint:bytes(0x01) value:1];
-  [self assertReadVarint:bytes(0x7f) value:127];
-  // 14882
-  [self assertReadVarint:bytes(0xa2, 0x74) value:(0x22 << 0) | (0x74 << 7)];
-  // 1904930
-  [self assertReadVarint:bytes(0xa2, 0xa2, 0x74) value:(0x22 << 0) | (0x22 << 7) | (0x74 << 14)];
-  // 243831074
-  [self assertReadVarint:bytes(0xa2, 0xa2, 0xa2, 0x74)
-                   value:(0x22 << 0) | (0x22 << 7) | (0x22 << 14) | (0x74 << 21)];
-  // 2961488830
-  [self assertReadVarint:bytes(0xbe, 0xf7, 0x92, 0x84, 0x0b)
-                   value:(0x3e << 0) | (0x77 << 7) | (0x12 << 14) |
-                         (0x04 << 21) | (0x0bLL << 28)];
-
-  // 64-bit
-  // 7256456126
-  [self assertReadVarint:bytes(0xbe, 0xf7, 0x92, 0x84, 0x1b)
-                   value:(0x3e << 0) | (0x77 << 7) | (0x12 << 14) |
-                         (0x04 << 21) | (0x1bLL << 28)];
-  // 41256202580718336
-  [self assertReadVarint:bytes(0x80, 0xe6, 0xeb, 0x9c, 0xc3, 0xc9, 0xa4, 0x49)
-                   value:(0x00 << 0) | (0x66 << 7) | (0x6b << 14) |
-                         (0x1c << 21) | (0x43LL << 28) | (0x49LL << 35) |
-                         (0x24LL << 42) | (0x49LL << 49)];
-  // 11964378330978735131
-  [self
-      assertReadVarint:bytes(0x9b, 0xa8, 0xf9, 0xc2, 0xbb, 0xd6, 0x80, 0x85,
-                             0xa6, 0x01)
-                 value:(0x1b << 0) | (0x28 << 7) | (0x79 << 14) | (0x42 << 21) |
-                       (0x3bLL << 28) | (0x56LL << 35) | (0x00LL << 42) |
-                       (0x05LL << 49) | (0x26LL << 56) | (0x01ULL << 63)];
-
-  // Failures
-  [self assertReadVarintFailure:bytes(0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
-                                      0x80, 0x80, 0x80, 0x00)];
-  [self assertReadVarintFailure:bytes(0x80)];
-}
-
-- (void)testReadVarint32FromVarint64 {
-  {
-    // Turn on lower 31 bits of the upper half on a 64 bit varint.
-    NSData* data = bytes(0x80, 0x80, 0x80, 0x80, 0xF0, 0xFF, 0xFF, 0xFF, 0xFF, 0x7E);
-
-    int32_t value32 = 0x0;
-    GPBCodedInputStream* input32 = [GPBCodedInputStream streamWithData:data];
-    XCTAssertEqual(value32, [input32 readInt32]);
-
-    int64_t value64 = INT64_MAX & 0xFFFFFFFF00000000;
-    GPBCodedInputStream* input64 = [GPBCodedInputStream streamWithData:data];
-    XCTAssertEqual(value64, [input64 readInt64]);
-  }
-  {
-    // Turn on lower 31 bits and lower 31 bits on upper half on a 64 bit varint.
-    NSData* data = bytes(0xFF, 0xFF, 0xFF, 0xFF, 0xF7, 0xFF, 0xFF, 0xFF, 0xFF, 0x7E);
-
-    int32_t value32 = INT32_MAX;
-    GPBCodedInputStream* input32 = [GPBCodedInputStream streamWithData:data];
-    XCTAssertEqual(value32, [input32 readInt32]);
-
-    int64_t value64 = INT64_MAX & 0xFFFFFFFF7FFFFFFF;
-    GPBCodedInputStream* input64 = [GPBCodedInputStream streamWithData:data];
-    XCTAssertEqual(value64, [input64 readInt64]);
-  }
-  {
-    // Turn on bits 32 and 64 bit on a 64 bit varint.
-    NSData* data = bytes(0x80, 0x80, 0x80, 0x80, 0x88, 0x80, 0x80, 0x80, 0x80, 0x01);
-
-    int32_t value32 = INT32_MIN;
-    GPBCodedInputStream* input32 = [GPBCodedInputStream streamWithData:data];
-    XCTAssertEqual(value32, [input32 readInt32]);
-
-    int64_t value64 = INT64_MIN | (0x01LL << 31);
-    GPBCodedInputStream* input64 = [GPBCodedInputStream streamWithData:data];
-    XCTAssertEqual(value64, [input64 readInt64]);
-  }
-}
-
-- (void)testReadLittleEndian {
-  [self assertReadLittleEndian32:bytes(0x78, 0x56, 0x34, 0x12)
-                           value:0x12345678];
-  [self assertReadLittleEndian32:bytes(0xf0, 0xde, 0xbc, 0x9a)
-                           value:0x9abcdef0];
-
-  [self assertReadLittleEndian64:bytes(0xf0, 0xde, 0xbc, 0x9a, 0x78, 0x56, 0x34,
-                                       0x12)
-                           value:0x123456789abcdef0LL];
-  [self assertReadLittleEndian64:bytes(0x78, 0x56, 0x34, 0x12, 0xf0, 0xde, 0xbc,
-                                       0x9a)
-                           value:0x9abcdef012345678LL];
-}
-
-- (void)testReadWholeMessage {
-  TestAllTypes* message = [self allSetRepeatedCount:kGPBDefaultRepeatCount];
-
-  NSData* rawBytes = message.data;
-  XCTAssertEqual(message.serializedSize, (size_t)rawBytes.length);
-
-  TestAllTypes* message2 =
-      [TestAllTypes parseFromData:rawBytes extensionRegistry:nil error:NULL];
-  [self assertAllFieldsSet:message2 repeatedCount:kGPBDefaultRepeatCount];
-}
-
-- (void)testSkipWholeMessage {
-  TestAllTypes* message = [self allSetRepeatedCount:kGPBDefaultRepeatCount];
-  NSData* rawBytes = message.data;
-
-  // Create two parallel inputs.  Parse one as unknown fields while using
-  // skipField() to skip each field on the other.  Expect the same tags.
-  GPBCodedInputStream* input1 = [GPBCodedInputStream streamWithData:rawBytes];
-  GPBCodedInputStream* input2 = [GPBCodedInputStream streamWithData:rawBytes];
-  GPBUnknownFieldSet* unknownFields =
-      [[[GPBUnknownFieldSet alloc] init] autorelease];
-
-  while (YES) {
-    int32_t tag = [input1 readTag];
-    XCTAssertEqual(tag, [input2 readTag]);
-    if (tag == 0) {
-      break;
-    }
-    [unknownFields mergeFieldFrom:tag input:input1];
-    [input2 skipField:tag];
-  }
-}
-
-- (void)testReadHugeBlob {
-  // Allocate and initialize a 1MB blob.
-  NSMutableData* blob = [NSMutableData dataWithLength:1 << 20];
-  for (NSUInteger i = 0; i < blob.length; i++) {
-    ((uint8_t*)blob.mutableBytes)[i] = (uint8_t)i;
-  }
-
-  // Make a message containing it.
-  TestAllTypes* message = [TestAllTypes message];
-  [self setAllFields:message repeatedCount:kGPBDefaultRepeatCount];
-  [message setOptionalBytes:blob];
-
-  // Serialize and parse it.  Make sure to parse from an InputStream, not
-  // directly from a ByteString, so that CodedInputStream uses buffered
-  // reading.
-  NSData *messageData = message.data;
-  XCTAssertNotNil(messageData);
-  GPBCodedInputStream* stream =
-      [GPBCodedInputStream streamWithData:messageData];
-  TestAllTypes* message2 = [TestAllTypes parseFromCodedInputStream:stream
-                                                 extensionRegistry:nil
-                                                             error:NULL];
-
-  XCTAssertEqualObjects(message.optionalBytes, message2.optionalBytes);
-
-  // Make sure all the other fields were parsed correctly.
-  TestAllTypes* message3 = [[message2 copy] autorelease];
-  TestAllTypes* types = [self allSetRepeatedCount:kGPBDefaultRepeatCount];
-  NSData* data = [types optionalBytes];
-  [message3 setOptionalBytes:data];
-
-  [self assertAllFieldsSet:message3 repeatedCount:kGPBDefaultRepeatCount];
-}
-
-- (void)testReadMaliciouslyLargeBlob {
-  NSOutputStream* rawOutput = [NSOutputStream outputStreamToMemory];
-  GPBCodedOutputStream* output =
-      [GPBCodedOutputStream streamWithOutputStream:rawOutput];
-
-  int32_t tag = GPBWireFormatMakeTag(1, GPBWireFormatLengthDelimited);
-  [output writeRawVarint32:tag];
-  [output writeRawVarint32:0x7FFFFFFF];
-  uint8_t bytes[32] = {0};
-  [output writeRawData:[NSData dataWithBytes:bytes length:32]];
-  [output flush];
-
-  NSData* data =
-      [rawOutput propertyForKey:NSStreamDataWrittenToMemoryStreamKey];
-  GPBCodedInputStream* input =
-      [GPBCodedInputStream streamWithData:[NSMutableData dataWithData:data]];
-  XCTAssertEqual(tag, [input readTag]);
-
-  XCTAssertThrows([input readBytes]);
-}
-
-- (void)testReadEmptyString {
-  NSData *data = bytes(0x00);
-  GPBCodedInputStream* input = [GPBCodedInputStream streamWithData:data];
-  XCTAssertEqualObjects(@"", [input readString]);
-}
-
-- (void)testInvalidGroupEndTagThrows {
-  NSData *data = bytes(0x0B, 0x1A, 0x02, 0x4B, 0x50, 0x14);
-  GPBCodedInputStream* input = [GPBCodedInputStream streamWithData:data];
-  XCTAssertThrowsSpecificNamed([input skipMessage],
-                               NSException,
-                               GPBCodedInputStreamException,
-                               @"should throw a GPBCodedInputStreamException exception ");
-}
-
-- (void)testBytesWithNegativeSize {
-  NSData *data = bytes(0xFF, 0xFF, 0xFF, 0xFF, 0x0F);
-  GPBCodedInputStream *input = [GPBCodedInputStream streamWithData:data];
-  XCTAssertNil([input readBytes]);
-}
-
-// Verifies fix for b/10315336.
-// Note: Now that there isn't a custom string class under the hood, this test
-// isn't as critical, but it does cover bad input and if a custom class is added
-// again, it will help validate that class' handing of bad utf8.
-- (void)testReadMalformedString {
-  NSOutputStream* rawOutput = [NSOutputStream outputStreamToMemory];
-  GPBCodedOutputStream* output =
-      [GPBCodedOutputStream streamWithOutputStream:rawOutput];
-
-  int32_t tag = GPBWireFormatMakeTag(TestAllTypes_FieldNumber_DefaultString,
-                                     GPBWireFormatLengthDelimited);
-  [output writeRawVarint32:tag];
-  [output writeRawVarint32:5];
-  // Create an invalid utf-8 byte array.
-  uint8_t bytes[] = {0xc2, 0xf2, 0x0, 0x0, 0x0};
-  [output writeRawData:[NSData dataWithBytes:bytes length:sizeof(bytes)]];
-  [output flush];
-
-  NSData *data =
-      [rawOutput propertyForKey:NSStreamDataWrittenToMemoryStreamKey];
-  GPBCodedInputStream* input = [GPBCodedInputStream streamWithData:data];
-  NSError *error = nil;
-  TestAllTypes* message = [TestAllTypes parseFromCodedInputStream:input
-                                                extensionRegistry:nil
-                                                            error:&error];
-  XCTAssertNotNil(error);
-  XCTAssertNil(message);
-}
-
-- (void)testBOMWithinStrings {
-  // We've seen servers that end up with BOMs within strings (not always at the
-  // start, and sometimes in multiple places), make sure they always parse
-  // correctly. (Again, this is inpart in case a custom string class is ever
-  // used again.)
-  const char* strs[] = {
-    "\xEF\xBB\xBF String with BOM",
-    "String with \xEF\xBB\xBF in middle",
-    "String with end bom \xEF\xBB\xBF",
-    "\xEF\xBB\xBF\xe2\x99\xa1",  // BOM White Heart
-    "\xEF\xBB\xBF\xEF\xBB\xBF String with Two BOM",
-  };
-  for (size_t i = 0; i < GPBARRAYSIZE(strs); ++i) {
-    NSOutputStream* rawOutput = [NSOutputStream outputStreamToMemory];
-    GPBCodedOutputStream* output =
-        [GPBCodedOutputStream streamWithOutputStream:rawOutput];
-
-    int32_t tag = GPBWireFormatMakeTag(TestAllTypes_FieldNumber_DefaultString,
-                                       GPBWireFormatLengthDelimited);
-    [output writeRawVarint32:tag];
-    size_t length = strlen(strs[i]);
-    [output writeRawVarint32:(int32_t)length];
-    [output writeRawData:[NSData dataWithBytes:strs[i] length:length]];
-    [output flush];
-
-    NSData* data =
-        [rawOutput propertyForKey:NSStreamDataWrittenToMemoryStreamKey];
-    GPBCodedInputStream* input = [GPBCodedInputStream streamWithData:data];
-    TestAllTypes* message = [TestAllTypes parseFromCodedInputStream:input
-                                                  extensionRegistry:nil
-                                                              error:NULL];
-    XCTAssertNotNil(message, @"Loop %zd", i);
-    // Ensure the string is there. NSString can consume the BOM in some
-    // cases, so don't actually check the string for exact equality.
-    XCTAssertTrue(message.defaultString.length > 0, @"Loop %zd", i);
-  }
-}
-
-@end
diff --git a/libs/protobuf/objectivec/Tests/GPBCodedOuputStreamTests.m b/libs/protobuf/objectivec/Tests/GPBCodedOuputStreamTests.m
deleted file mode 100644
index a9934ac..0000000
--- a/libs/protobuf/objectivec/Tests/GPBCodedOuputStreamTests.m
+++ /dev/null
@@ -1,444 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#import "GPBTestUtilities.h"
-
-#import "GPBCodedOutputStream_PackagePrivate.h"
-#import "GPBCodedInputStream.h"
-#import "GPBUtilities_PackagePrivate.h"
-#import "google/protobuf/Unittest.pbobjc.h"
-
-@interface GPBCodedOutputStream (InternalMethods)
-// Declared in the .m file, expose for testing.
-- (instancetype)initWithOutputStream:(NSOutputStream *)output
-                                data:(NSMutableData *)data;
-@end
-
-@interface GPBCodedOutputStream (Helper)
-+ (instancetype)streamWithOutputStream:(NSOutputStream *)output
-                            bufferSize:(size_t)bufferSize;
-@end
-
-@implementation GPBCodedOutputStream (Helper)
-+ (instancetype)streamWithOutputStream:(NSOutputStream *)output
-                            bufferSize:(size_t)bufferSize {
-  NSMutableData *data = [NSMutableData dataWithLength:bufferSize];
-  return [[[self alloc] initWithOutputStream:output data:data] autorelease];
-}
-@end
-
-@interface CodedOutputStreamTests : GPBTestCase
-@end
-
-@implementation CodedOutputStreamTests
-
-- (NSData*)bytes_with_sentinel:(int32_t)unused, ... {
-  va_list list;
-  va_start(list, unused);
-
-  NSMutableData* values = [NSMutableData dataWithCapacity:0];
-  int32_t i;
-
-  while ((i = va_arg(list, int32_t)) != 256) {
-    NSAssert(i >= 0 && i < 256, @"");
-    uint8_t u = (uint8_t)i;
-    [values appendBytes:&u length:1];
-  }
-
-  va_end(list);
-
-  return values;
-}
-
-#define bytes(...) [self bytes_with_sentinel:0, __VA_ARGS__, 256]
-
-- (void)assertWriteLittleEndian32:(NSData*)data value:(int32_t)value {
-  NSOutputStream* rawOutput = [NSOutputStream outputStreamToMemory];
-  GPBCodedOutputStream* output =
-      [GPBCodedOutputStream streamWithOutputStream:rawOutput];
-  [output writeRawLittleEndian32:(int32_t)value];
-  [output flush];
-
-  NSData* actual =
-      [rawOutput propertyForKey:NSStreamDataWrittenToMemoryStreamKey];
-  XCTAssertEqualObjects(data, actual);
-
-  // Try different block sizes.
-  for (int blockSize = 1; blockSize <= 16; blockSize *= 2) {
-    rawOutput = [NSOutputStream outputStreamToMemory];
-    output = [GPBCodedOutputStream streamWithOutputStream:rawOutput
-                                               bufferSize:blockSize];
-    [output writeRawLittleEndian32:(int32_t)value];
-    [output flush];
-
-    actual = [rawOutput propertyForKey:NSStreamDataWrittenToMemoryStreamKey];
-    XCTAssertEqualObjects(data, actual);
-  }
-}
-
-- (void)assertWriteLittleEndian64:(NSData*)data value:(int64_t)value {
-  NSOutputStream* rawOutput = [NSOutputStream outputStreamToMemory];
-  GPBCodedOutputStream* output =
-      [GPBCodedOutputStream streamWithOutputStream:rawOutput];
-  [output writeRawLittleEndian64:value];
-  [output flush];
-
-  NSData* actual =
-      [rawOutput propertyForKey:NSStreamDataWrittenToMemoryStreamKey];
-  XCTAssertEqualObjects(data, actual);
-
-  // Try different block sizes.
-  for (int blockSize = 1; blockSize <= 16; blockSize *= 2) {
-    rawOutput = [NSOutputStream outputStreamToMemory];
-    output = [GPBCodedOutputStream streamWithOutputStream:rawOutput
-                                               bufferSize:blockSize];
-    [output writeRawLittleEndian64:value];
-    [output flush];
-
-    actual = [rawOutput propertyForKey:NSStreamDataWrittenToMemoryStreamKey];
-    XCTAssertEqualObjects(data, actual);
-  }
-}
-
-- (void)assertWriteVarint:(NSData*)data value:(int64_t)value {
-  // Only do 32-bit write if the value fits in 32 bits.
-  if (GPBLogicalRightShift64(value, 32) == 0) {
-    NSOutputStream* rawOutput = [NSOutputStream outputStreamToMemory];
-    GPBCodedOutputStream* output =
-        [GPBCodedOutputStream streamWithOutputStream:rawOutput];
-    [output writeRawVarint32:(int32_t)value];
-    [output flush];
-
-    NSData* actual =
-        [rawOutput propertyForKey:NSStreamDataWrittenToMemoryStreamKey];
-    XCTAssertEqualObjects(data, actual);
-
-    // Also try computing size.
-    XCTAssertEqual(GPBComputeRawVarint32Size((int32_t)value),
-                   (size_t)data.length);
-  }
-
-  {
-    NSOutputStream* rawOutput = [NSOutputStream outputStreamToMemory];
-    GPBCodedOutputStream* output =
-        [GPBCodedOutputStream streamWithOutputStream:rawOutput];
-    [output writeRawVarint64:value];
-    [output flush];
-
-    NSData* actual =
-        [rawOutput propertyForKey:NSStreamDataWrittenToMemoryStreamKey];
-    XCTAssertEqualObjects(data, actual);
-
-    // Also try computing size.
-    XCTAssertEqual(GPBComputeRawVarint64Size(value), (size_t)data.length);
-  }
-
-  // Try different block sizes.
-  for (int blockSize = 1; blockSize <= 16; blockSize *= 2) {
-    // Only do 32-bit write if the value fits in 32 bits.
-    if (GPBLogicalRightShift64(value, 32) == 0) {
-      NSOutputStream* rawOutput = [NSOutputStream outputStreamToMemory];
-      GPBCodedOutputStream* output =
-          [GPBCodedOutputStream streamWithOutputStream:rawOutput
-                                            bufferSize:blockSize];
-
-      [output writeRawVarint32:(int32_t)value];
-      [output flush];
-
-      NSData* actual =
-          [rawOutput propertyForKey:NSStreamDataWrittenToMemoryStreamKey];
-      XCTAssertEqualObjects(data, actual);
-    }
-
-    {
-      NSOutputStream* rawOutput = [NSOutputStream outputStreamToMemory];
-      GPBCodedOutputStream* output =
-          [GPBCodedOutputStream streamWithOutputStream:rawOutput
-                                            bufferSize:blockSize];
-
-      [output writeRawVarint64:value];
-      [output flush];
-
-      NSData* actual =
-          [rawOutput propertyForKey:NSStreamDataWrittenToMemoryStreamKey];
-      XCTAssertEqualObjects(data, actual);
-    }
-  }
-}
-
-- (void)assertWriteStringNoTag:(NSData*)data
-                         value:(NSString *)value
-                       context:(NSString *)contextMessage {
-  NSOutputStream* rawOutput = [NSOutputStream outputStreamToMemory];
-  GPBCodedOutputStream* output =
-      [GPBCodedOutputStream streamWithOutputStream:rawOutput];
-  [output writeStringNoTag:value];
-  [output flush];
-
-  NSData* actual =
-      [rawOutput propertyForKey:NSStreamDataWrittenToMemoryStreamKey];
-  XCTAssertEqualObjects(data, actual, @"%@", contextMessage);
-
-  // Try different block sizes.
-  for (int blockSize = 1; blockSize <= 16; blockSize *= 2) {
-    rawOutput = [NSOutputStream outputStreamToMemory];
-    output = [GPBCodedOutputStream streamWithOutputStream:rawOutput
-                                               bufferSize:blockSize];
-    [output writeStringNoTag:value];
-    [output flush];
-
-    actual = [rawOutput propertyForKey:NSStreamDataWrittenToMemoryStreamKey];
-    XCTAssertEqualObjects(data, actual, @"%@", contextMessage);
-  }
-}
-
-- (void)testWriteVarint1 {
-  [self assertWriteVarint:bytes(0x00) value:0];
-}
-
-- (void)testWriteVarint2 {
-  [self assertWriteVarint:bytes(0x01) value:1];
-}
-
-- (void)testWriteVarint3 {
-  [self assertWriteVarint:bytes(0x7f) value:127];
-}
-
-- (void)testWriteVarint4 {
-  // 14882
-  [self assertWriteVarint:bytes(0xa2, 0x74) value:(0x22 << 0) | (0x74 << 7)];
-}
-
-- (void)testWriteVarint5 {
-  // The sign/nosign distinction is done here because normally varints are
-  // around 64bit values, but for some cases a 32bit value is forced with
-  // with the sign bit (tags, uint32, etc.)
-
-  // 1887747006 (no sign bit)
-  [self assertWriteVarint:bytes(0xbe, 0xf7, 0x92, 0x84, 0x07)
-                    value:(0x3e << 0) | (0x77 << 7) | (0x12 << 14) |
-                          (0x04 << 21) | (0x07LL << 28)];
-  // 2961488830 (sign bit)
-  [self assertWriteVarint:bytes(0xbe, 0xf7, 0x92, 0x84, 0x0b)
-                    value:(0x3e << 0) | (0x77 << 7) | (0x12 << 14) |
-                          (0x04 << 21) | (0x0bLL << 28)];
-}
-
-- (void)testWriteVarint6 {
-  // 64-bit
-  // 7256456126
-  [self assertWriteVarint:bytes(0xbe, 0xf7, 0x92, 0x84, 0x1b)
-                    value:(0x3e << 0) | (0x77 << 7) | (0x12 << 14) |
-                          (0x04 << 21) | (0x1bLL << 28)];
-}
-
-- (void)testWriteVarint7 {
-  // 41256202580718336
-  [self assertWriteVarint:bytes(0x80, 0xe6, 0xeb, 0x9c, 0xc3, 0xc9, 0xa4, 0x49)
-                    value:(0x00 << 0) | (0x66 << 7) | (0x6b << 14) |
-                          (0x1c << 21) | (0x43LL << 28) | (0x49LL << 35) |
-                          (0x24LL << 42) | (0x49LL << 49)];
-}
-
-- (void)testWriteVarint8 {
-  // 11964378330978735131
-  [self assertWriteVarint:bytes(0x9b, 0xa8, 0xf9, 0xc2, 0xbb, 0xd6, 0x80, 0x85,
-                                0xa6, 0x01)
-                    value:(0x1b << 0) | (0x28 << 7) | (0x79 << 14) |
-                          (0x42 << 21) | (0x3bLL << 28) | (0x56LL << 35) |
-                          (0x00LL << 42) | (0x05LL << 49) | (0x26LL << 56) |
-                          (0x01ULL << 63)];
-}
-
-- (void)testWriteLittleEndian {
-  [self assertWriteLittleEndian32:bytes(0x78, 0x56, 0x34, 0x12)
-                            value:0x12345678];
-  [self assertWriteLittleEndian32:bytes(0xf0, 0xde, 0xbc, 0x9a)
-                            value:0x9abcdef0];
-
-  [self assertWriteLittleEndian64:bytes(0xf0, 0xde, 0xbc, 0x9a, 0x78, 0x56,
-                                        0x34, 0x12)
-                            value:0x123456789abcdef0LL];
-  [self assertWriteLittleEndian64:bytes(0x78, 0x56, 0x34, 0x12, 0xf0, 0xde,
-                                        0xbc, 0x9a)
-                            value:0x9abcdef012345678LL];
-}
-
-- (void)testEncodeZigZag {
-  XCTAssertEqual(0U, GPBEncodeZigZag32(0));
-  XCTAssertEqual(1U, GPBEncodeZigZag32(-1));
-  XCTAssertEqual(2U, GPBEncodeZigZag32(1));
-  XCTAssertEqual(3U, GPBEncodeZigZag32(-2));
-  XCTAssertEqual(0x7FFFFFFEU, GPBEncodeZigZag32(0x3FFFFFFF));
-  XCTAssertEqual(0x7FFFFFFFU, GPBEncodeZigZag32(0xC0000000));
-  XCTAssertEqual(0xFFFFFFFEU, GPBEncodeZigZag32(0x7FFFFFFF));
-  XCTAssertEqual(0xFFFFFFFFU, GPBEncodeZigZag32(0x80000000));
-
-  XCTAssertEqual(0ULL, GPBEncodeZigZag64(0));
-  XCTAssertEqual(1ULL, GPBEncodeZigZag64(-1));
-  XCTAssertEqual(2ULL, GPBEncodeZigZag64(1));
-  XCTAssertEqual(3ULL, GPBEncodeZigZag64(-2));
-  XCTAssertEqual(0x000000007FFFFFFEULL,
-                 GPBEncodeZigZag64(0x000000003FFFFFFFLL));
-  XCTAssertEqual(0x000000007FFFFFFFULL,
-                 GPBEncodeZigZag64(0xFFFFFFFFC0000000LL));
-  XCTAssertEqual(0x00000000FFFFFFFEULL,
-                 GPBEncodeZigZag64(0x000000007FFFFFFFLL));
-  XCTAssertEqual(0x00000000FFFFFFFFULL,
-                 GPBEncodeZigZag64(0xFFFFFFFF80000000LL));
-  XCTAssertEqual(0xFFFFFFFFFFFFFFFEULL,
-                 GPBEncodeZigZag64(0x7FFFFFFFFFFFFFFFLL));
-  XCTAssertEqual(0xFFFFFFFFFFFFFFFFULL,
-                 GPBEncodeZigZag64(0x8000000000000000LL));
-
-  // Some easier-to-verify round-trip tests.  The inputs (other than 0, 1, -1)
-  // were chosen semi-randomly via keyboard bashing.
-  XCTAssertEqual(0U, GPBEncodeZigZag32(GPBDecodeZigZag32(0)));
-  XCTAssertEqual(1U, GPBEncodeZigZag32(GPBDecodeZigZag32(1)));
-  XCTAssertEqual(-1U, GPBEncodeZigZag32(GPBDecodeZigZag32(-1)));
-  XCTAssertEqual(14927U, GPBEncodeZigZag32(GPBDecodeZigZag32(14927)));
-  XCTAssertEqual(-3612U, GPBEncodeZigZag32(GPBDecodeZigZag32(-3612)));
-
-  XCTAssertEqual(0ULL, GPBEncodeZigZag64(GPBDecodeZigZag64(0)));
-  XCTAssertEqual(1ULL, GPBEncodeZigZag64(GPBDecodeZigZag64(1)));
-  XCTAssertEqual(-1ULL, GPBEncodeZigZag64(GPBDecodeZigZag64(-1)));
-  XCTAssertEqual(14927ULL, GPBEncodeZigZag64(GPBDecodeZigZag64(14927)));
-  XCTAssertEqual(-3612ULL, GPBEncodeZigZag64(GPBDecodeZigZag64(-3612)));
-
-  XCTAssertEqual(856912304801416ULL,
-                 GPBEncodeZigZag64(GPBDecodeZigZag64(856912304801416LL)));
-  XCTAssertEqual(-75123905439571256ULL,
-                 GPBEncodeZigZag64(GPBDecodeZigZag64(-75123905439571256LL)));
-}
-
-- (void)testWriteWholeMessage {
-  // Not kGPBDefaultRepeatCount because we are comparing to a golden master file
-  // that was generated with 2.
-  TestAllTypes* message = [self allSetRepeatedCount:2];
-
-  NSData* rawBytes = message.data;
-  NSData* goldenData =
-      [self getDataFileNamed:@"golden_message" dataToWrite:rawBytes];
-  XCTAssertEqualObjects(rawBytes, goldenData);
-
-  // Try different block sizes.
-  for (int blockSize = 1; blockSize < 256; blockSize *= 2) {
-    NSOutputStream* rawOutput = [NSOutputStream outputStreamToMemory];
-    GPBCodedOutputStream* output =
-        [GPBCodedOutputStream streamWithOutputStream:rawOutput
-                                          bufferSize:blockSize];
-    [message writeToCodedOutputStream:output];
-    [output flush];
-
-    NSData* actual =
-        [rawOutput propertyForKey:NSStreamDataWrittenToMemoryStreamKey];
-    XCTAssertEqualObjects(rawBytes, actual);
-  }
-
-  // Not kGPBDefaultRepeatCount because we are comparing to a golden master file
-  // that was generated with 2.
-  TestAllExtensions* extensions = [self allExtensionsSetRepeatedCount:2];
-  rawBytes = extensions.data;
-  goldenData = [self getDataFileNamed:@"golden_packed_fields_message"
-                          dataToWrite:rawBytes];
-  XCTAssertEqualObjects(rawBytes, goldenData);
-}
-
-- (void)testCFStringGetCStringPtrAndStringsWithNullChars {
-  // This test exists to verify that CFStrings with embedded NULLs still expose
-  // their raw buffer if they are backed by UTF8 storage. If this fails, the
-  // quick/direct access paths in GPBCodedOutputStream that depend on
-  // CFStringGetCStringPtr need to be re-evalutated (maybe just removed).
-  // And yes, we do get NULLs in strings from some servers.
-
-  char zeroTest[] = "\0Test\0String";
-  // Note: there is a \0 at the end of this since it is a c-string.
-  NSString *asNSString = [[NSString alloc] initWithBytes:zeroTest
-                                                  length:sizeof(zeroTest)
-                                                encoding:NSUTF8StringEncoding];
-  const char *cString =
-      CFStringGetCStringPtr((CFStringRef)asNSString, kCFStringEncodingUTF8);
-  XCTAssertTrue(cString != NULL);
-  // Again, if the above assert fails, then it means NSString no longer exposes
-  // the raw utf8 storage of a string created from utf8 input, so the code using
-  // CFStringGetCStringPtr in GPBCodedOutputStream will still work (it will take
-  // a different code path); but the optimizations for when
-  // CFStringGetCStringPtr does work could possibly go away.
-
-  XCTAssertEqual(sizeof(zeroTest),
-                 [asNSString lengthOfBytesUsingEncoding:NSUTF8StringEncoding]);
-  XCTAssertTrue(0 == memcmp(cString, zeroTest, sizeof(zeroTest)));
-  [asNSString release];
-}
-
-- (void)testWriteStringsWithZeroChar {
-  // Unicode allows `\0` as a character, and NSString is a class cluster, so
-  // there are a few different classes that could end up behind a given string.
-  // Historically, we've seen differences based on constant strings in code and
-  // strings built via the NSString apis. So this round trips them to ensure
-  // they are acting as expected.
-
-  NSArray<NSString *> *strs = @[
-    @"\0at start",
-    @"in\0middle",
-    @"at end\0",
-  ];
-  int i = 0;
-  for (NSString *str in strs) {
-    NSData *asUTF8 = [str dataUsingEncoding:NSUTF8StringEncoding];
-    NSMutableData *expected = [NSMutableData data];
-    uint8_t lengthByte = (uint8_t)asUTF8.length;
-    [expected appendBytes:&lengthByte length:1];
-    [expected appendData:asUTF8];
-
-    NSString *context = [NSString stringWithFormat:@"Loop %d - Literal", i];
-    [self assertWriteStringNoTag:expected value:str context:context];
-
-    // Force a new string to be built which gets a different class from the
-    // NSString class cluster than the literal did.
-    NSString *str2 = [NSString stringWithFormat:@"%@", str];
-    context = [NSString stringWithFormat:@"Loop %d - Built", i];
-    [self assertWriteStringNoTag:expected value:str2 context:context];
-
-    ++i;
-  }
-}
-
-- (void)testThatItThrowsWhenWriteRawPtrFails {
-  NSOutputStream *output = [NSOutputStream outputStreamToMemory];
-  GPBCodedOutputStream *codedOutput =
-      [GPBCodedOutputStream streamWithOutputStream:output bufferSize:0];  // Skip buffering.
-  [output close];  // Close the output stream to force failure on write.
-  const char *cString = "raw";
-  XCTAssertThrowsSpecificNamed([codedOutput writeRawPtr:cString offset:0 length:strlen(cString)],
-                               NSException, GPBCodedOutputStreamException_WriteFailed);
-}
-
-@end
diff --git a/libs/protobuf/objectivec/Tests/GPBCompileTest01.m b/libs/protobuf/objectivec/Tests/GPBCompileTest01.m
deleted file mode 100644
index c8bc433..0000000
--- a/libs/protobuf/objectivec/Tests/GPBCompileTest01.m
+++ /dev/null
@@ -1,40 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-// This is a test including a single public header to ensure things build.
-// It helps test that imports are complete/ordered correctly.
-
-#import "GPBArray.h"
-
-
-// Something in the body of this file so the compiler/linker won't complain
-// about an empty .o file.
-__attribute__((visibility("default"))) char dummy_symbol_1 = 0;
diff --git a/libs/protobuf/objectivec/Tests/GPBCompileTest02.m b/libs/protobuf/objectivec/Tests/GPBCompileTest02.m
deleted file mode 100644
index c44e201..0000000
--- a/libs/protobuf/objectivec/Tests/GPBCompileTest02.m
+++ /dev/null
@@ -1,40 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-// This is a test including a single public header to ensure things build.
-// It helps test that imports are complete/ordered correctly.
-
-#import "GPBCodedInputStream.h"
-
-
-// Something in the body of this file so the compiler/linker won't complain
-// about an empty .o file.
-__attribute__((visibility("default"))) char dummy_symbol_2 = 0;
diff --git a/libs/protobuf/objectivec/Tests/GPBCompileTest03.m b/libs/protobuf/objectivec/Tests/GPBCompileTest03.m
deleted file mode 100644
index 41994f9..0000000
--- a/libs/protobuf/objectivec/Tests/GPBCompileTest03.m
+++ /dev/null
@@ -1,40 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-// This is a test including a single public header to ensure things build.
-// It helps test that imports are complete/ordered correctly.
-
-#import "GPBCodedOutputStream.h"
-
-
-// Something in the body of this file so the compiler/linker won't complain
-// about an empty .o file.
-__attribute__((visibility("default"))) char dummy_symbol_3 = 0;
diff --git a/libs/protobuf/objectivec/Tests/GPBCompileTest04.m b/libs/protobuf/objectivec/Tests/GPBCompileTest04.m
deleted file mode 100644
index c31498f..0000000
--- a/libs/protobuf/objectivec/Tests/GPBCompileTest04.m
+++ /dev/null
@@ -1,40 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-// This is a test including a single public header to ensure things build.
-// It helps test that imports are complete/ordered correctly.
-
-#import "GPBDescriptor.h"
-
-
-// Something in the body of this file so the compiler/linker won't complain
-// about an empty .o file.
-__attribute__((visibility("default"))) char dummy_symbol_4 = 0;
diff --git a/libs/protobuf/objectivec/Tests/GPBCompileTest05.m b/libs/protobuf/objectivec/Tests/GPBCompileTest05.m
deleted file mode 100644
index adb7225..0000000
--- a/libs/protobuf/objectivec/Tests/GPBCompileTest05.m
+++ /dev/null
@@ -1,40 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-// This is a test including a single public header to ensure things build.
-// It helps test that imports are complete/ordered correctly.
-
-#import "GPBDictionary.h"
-
-
-// Something in the body of this file so the compiler/linker won't complain
-// about an empty .o file.
-__attribute__((visibility("default"))) char dummy_symbol_5 = 0;
diff --git a/libs/protobuf/objectivec/Tests/GPBCompileTest06.m b/libs/protobuf/objectivec/Tests/GPBCompileTest06.m
deleted file mode 100644
index b7505b0..0000000
--- a/libs/protobuf/objectivec/Tests/GPBCompileTest06.m
+++ /dev/null
@@ -1,40 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-// This is a test including a single public header to ensure things build.
-// It helps test that imports are complete/ordered correctly.
-
-#import "GPBExtensionRegistry.h"
-
-
-// Something in the body of this file so the compiler/linker won't complain
-// about an empty .o file.
-__attribute__((visibility("default"))) char dummy_symbol_6 = 0;
diff --git a/libs/protobuf/objectivec/Tests/GPBCompileTest07.m b/libs/protobuf/objectivec/Tests/GPBCompileTest07.m
deleted file mode 100644
index 939bb70..0000000
--- a/libs/protobuf/objectivec/Tests/GPBCompileTest07.m
+++ /dev/null
@@ -1,40 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-// This is a test including a single public header to ensure things build.
-// It helps test that imports are complete/ordered correctly.
-
-#import "GPBMessage.h"
-
-
-// Something in the body of this file so the compiler/linker won't complain
-// about an empty .o file.
-__attribute__((visibility("default"))) char dummy_symbol_7 = 0;
diff --git a/libs/protobuf/objectivec/Tests/GPBCompileTest08.m b/libs/protobuf/objectivec/Tests/GPBCompileTest08.m
deleted file mode 100644
index a84f38c..0000000
--- a/libs/protobuf/objectivec/Tests/GPBCompileTest08.m
+++ /dev/null
@@ -1,40 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-// This is a test including a single public header to ensure things build.
-// It helps test that imports are complete/ordered correctly.
-
-#import "GPBRootObject.h"
-
-
-// Something in the body of this file so the compiler/linker won't complain
-// about an empty .o file.
-__attribute__((visibility("default"))) char dummy_symbol_8 = 0;
diff --git a/libs/protobuf/objectivec/Tests/GPBCompileTest09.m b/libs/protobuf/objectivec/Tests/GPBCompileTest09.m
deleted file mode 100644
index f8ccb4a..0000000
--- a/libs/protobuf/objectivec/Tests/GPBCompileTest09.m
+++ /dev/null
@@ -1,40 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-// This is a test including a single public header to ensure things build.
-// It helps test that imports are complete/ordered correctly.
-
-#import "GPBUnknownField.h"
-
-
-// Something in the body of this file so the compiler/linker won't complain
-// about an empty .o file.
-__attribute__((visibility("default"))) char dummy_symbol_9 = 0;
diff --git a/libs/protobuf/objectivec/Tests/GPBCompileTest10.m b/libs/protobuf/objectivec/Tests/GPBCompileTest10.m
deleted file mode 100644
index d831867..0000000
--- a/libs/protobuf/objectivec/Tests/GPBCompileTest10.m
+++ /dev/null
@@ -1,40 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-// This is a test including a single public header to ensure things build.
-// It helps test that imports are complete/ordered correctly.
-
-#import "GPBUnknownFieldSet.h"
-
-
-// Something in the body of this file so the compiler/linker won't complain
-// about an empty .o file.
-__attribute__((visibility("default"))) char dummy_symbol_10 = 0;
diff --git a/libs/protobuf/objectivec/Tests/GPBCompileTest11.m b/libs/protobuf/objectivec/Tests/GPBCompileTest11.m
deleted file mode 100644
index 9f2c6b1..0000000
--- a/libs/protobuf/objectivec/Tests/GPBCompileTest11.m
+++ /dev/null
@@ -1,40 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-// This is a test including a single public header to ensure things build.
-// It helps test that imports are complete/ordered correctly.
-
-#import "GPBUtilities.h"
-
-
-// Something in the body of this file so the compiler/linker won't complain
-// about an empty .o file.
-__attribute__((visibility("default"))) char dummy_symbol_11 = 0;
diff --git a/libs/protobuf/objectivec/Tests/GPBCompileTest12.m b/libs/protobuf/objectivec/Tests/GPBCompileTest12.m
deleted file mode 100644
index 3aa29b3..0000000
--- a/libs/protobuf/objectivec/Tests/GPBCompileTest12.m
+++ /dev/null
@@ -1,40 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-// This is a test including a single public header to ensure things build.
-// It helps test that imports are complete/ordered correctly.
-
-#import "GPBWellKnownTypes.h"
-
-
-// Something in the body of this file so the compiler/linker won't complain
-// about an empty .o file.
-__attribute__((visibility("default"))) char dummy_symbol_12 = 0;
diff --git a/libs/protobuf/objectivec/Tests/GPBCompileTest13.m b/libs/protobuf/objectivec/Tests/GPBCompileTest13.m
deleted file mode 100644
index fef2af5..0000000
--- a/libs/protobuf/objectivec/Tests/GPBCompileTest13.m
+++ /dev/null
@@ -1,40 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-// This is a test including a single public header to ensure things build.
-// It helps test that imports are complete/ordered correctly.
-
-#import "GPBWireFormat.h"
-
-
-// Something in the body of this file so the compiler/linker won't complain
-// about an empty .o file.
-__attribute__((visibility("default"))) char dummy_symbol_13 = 0;
diff --git a/libs/protobuf/objectivec/Tests/GPBCompileTest14.m b/libs/protobuf/objectivec/Tests/GPBCompileTest14.m
deleted file mode 100644
index 1e64b71..0000000
--- a/libs/protobuf/objectivec/Tests/GPBCompileTest14.m
+++ /dev/null
@@ -1,40 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-// This is a test including a single public header to ensure things build.
-// It helps test that imports are complete/ordered correctly.
-
-#import "GPBAny.pbobjc.h"
-
-
-// Something in the body of this file so the compiler/linker won't complain
-// about an empty .o file.
-__attribute__((visibility("default"))) char dummy_symbol_14 = 0;
diff --git a/libs/protobuf/objectivec/Tests/GPBCompileTest15.m b/libs/protobuf/objectivec/Tests/GPBCompileTest15.m
deleted file mode 100644
index 2eaedb2..0000000
--- a/libs/protobuf/objectivec/Tests/GPBCompileTest15.m
+++ /dev/null
@@ -1,40 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-// This is a test including a single public header to ensure things build.
-// It helps test that imports are complete/ordered correctly.
-
-#import "GPBApi.pbobjc.h"
-
-
-// Something in the body of this file so the compiler/linker won't complain
-// about an empty .o file.
-__attribute__((visibility("default"))) char dummy_symbol_15 = 0;
diff --git a/libs/protobuf/objectivec/Tests/GPBCompileTest16.m b/libs/protobuf/objectivec/Tests/GPBCompileTest16.m
deleted file mode 100644
index 25af89e..0000000
--- a/libs/protobuf/objectivec/Tests/GPBCompileTest16.m
+++ /dev/null
@@ -1,40 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-// This is a test including a single public header to ensure things build.
-// It helps test that imports are complete/ordered correctly.
-
-#import "GPBDuration.pbobjc.h"
-
-
-// Something in the body of this file so the compiler/linker won't complain
-// about an empty .o file.
-__attribute__((visibility("default"))) char dummy_symbol_16 = 0;
diff --git a/libs/protobuf/objectivec/Tests/GPBCompileTest17.m b/libs/protobuf/objectivec/Tests/GPBCompileTest17.m
deleted file mode 100644
index c719ad3..0000000
--- a/libs/protobuf/objectivec/Tests/GPBCompileTest17.m
+++ /dev/null
@@ -1,40 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-// This is a test including a single public header to ensure things build.
-// It helps test that imports are complete/ordered correctly.
-
-#import "GPBEmpty.pbobjc.h"
-
-
-// Something in the body of this file so the compiler/linker won't complain
-// about an empty .o file.
-__attribute__((visibility("default"))) char dummy_symbol_17 = 0;
diff --git a/libs/protobuf/objectivec/Tests/GPBCompileTest18.m b/libs/protobuf/objectivec/Tests/GPBCompileTest18.m
deleted file mode 100644
index a02b259..0000000
--- a/libs/protobuf/objectivec/Tests/GPBCompileTest18.m
+++ /dev/null
@@ -1,40 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-// This is a test including a single public header to ensure things build.
-// It helps test that imports are complete/ordered correctly.
-
-#import "GPBFieldMask.pbobjc.h"
-
-
-// Something in the body of this file so the compiler/linker won't complain
-// about an empty .o file.
-__attribute__((visibility("default"))) char dummy_symbol_18 = 0;
diff --git a/libs/protobuf/objectivec/Tests/GPBCompileTest19.m b/libs/protobuf/objectivec/Tests/GPBCompileTest19.m
deleted file mode 100644
index b447284..0000000
--- a/libs/protobuf/objectivec/Tests/GPBCompileTest19.m
+++ /dev/null
@@ -1,40 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-// This is a test including a single public header to ensure things build.
-// It helps test that imports are complete/ordered correctly.
-
-#import "GPBSourceContext.pbobjc.h"
-
-
-// Something in the body of this file so the compiler/linker won't complain
-// about an empty .o file.
-__attribute__((visibility("default"))) char dummy_symbol_19 = 0;
diff --git a/libs/protobuf/objectivec/Tests/GPBCompileTest20.m b/libs/protobuf/objectivec/Tests/GPBCompileTest20.m
deleted file mode 100644
index 120ef55..0000000
--- a/libs/protobuf/objectivec/Tests/GPBCompileTest20.m
+++ /dev/null
@@ -1,40 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-// This is a test including a single public header to ensure things build.
-// It helps test that imports are complete/ordered correctly.
-
-#import "GPBStruct.pbobjc.h"
-
-
-// Something in the body of this file so the compiler/linker won't complain
-// about an empty .o file.
-__attribute__((visibility("default"))) char dummy_symbol_20 = 0;
diff --git a/libs/protobuf/objectivec/Tests/GPBCompileTest21.m b/libs/protobuf/objectivec/Tests/GPBCompileTest21.m
deleted file mode 100644
index 766d890..0000000
--- a/libs/protobuf/objectivec/Tests/GPBCompileTest21.m
+++ /dev/null
@@ -1,40 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-// This is a test including a single public header to ensure things build.
-// It helps test that imports are complete/ordered correctly.
-
-#import "GPBTimestamp.pbobjc.h"
-
-
-// Something in the body of this file so the compiler/linker won't complain
-// about an empty .o file.
-__attribute__((visibility("default"))) char dummy_symbol_21 = 0;
diff --git a/libs/protobuf/objectivec/Tests/GPBCompileTest22.m b/libs/protobuf/objectivec/Tests/GPBCompileTest22.m
deleted file mode 100644
index 6d0955b..0000000
--- a/libs/protobuf/objectivec/Tests/GPBCompileTest22.m
+++ /dev/null
@@ -1,40 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-// This is a test including a single public header to ensure things build.
-// It helps test that imports are complete/ordered correctly.
-
-#import "GPBType.pbobjc.h"
-
-
-// Something in the body of this file so the compiler/linker won't complain
-// about an empty .o file.
-__attribute__((visibility("default"))) char dummy_symbol_22 = 0;
diff --git a/libs/protobuf/objectivec/Tests/GPBCompileTest23.m b/libs/protobuf/objectivec/Tests/GPBCompileTest23.m
deleted file mode 100644
index 22f2db6..0000000
--- a/libs/protobuf/objectivec/Tests/GPBCompileTest23.m
+++ /dev/null
@@ -1,40 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-// This is a test including a single public header to ensure things build.
-// It helps test that imports are complete/ordered correctly.
-
-#import "GPBWrappers.pbobjc.h"
-
-
-// Something in the body of this file so the compiler/linker won't complain
-// about an empty .o file.
-__attribute__((visibility("default"))) char dummy_symbol_23 = 0;
diff --git a/libs/protobuf/objectivec/Tests/GPBCompileTest24.m b/libs/protobuf/objectivec/Tests/GPBCompileTest24.m
deleted file mode 100644
index c81ea73..0000000
--- a/libs/protobuf/objectivec/Tests/GPBCompileTest24.m
+++ /dev/null
@@ -1,42 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-// This is a test including a single header to ensure things build. This
-// is NOT a public header of the library, but uses a file that defines
-// proto2 syntax messages that are extendable, so it can need more things
-// that the proto3 syntax WKTs bundled with the library.
-
-#import "google/protobuf/Descriptor.pbobjc.h"
-
-
-// Something in the body of this file so the compiler/linker won't complain
-// about an empty .o file.
-__attribute__((visibility("default"))) char dummy_symbol_24 = 0;
diff --git a/libs/protobuf/objectivec/Tests/GPBCompileTest25.m b/libs/protobuf/objectivec/Tests/GPBCompileTest25.m
deleted file mode 100644
index 7a482b5..0000000
--- a/libs/protobuf/objectivec/Tests/GPBCompileTest25.m
+++ /dev/null
@@ -1,42 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-// This is a test including a single header to ensure things build. This
-// is NOT a public header of the library, but uses a file that defines
-// extensions to proto2 syntax messages, so it can need more things
-// that the proto3 syntax WKTs bundled with the library.
-
-#import "google/protobuf/UnittestCustomOptions.pbobjc.h"
-
-
-// Something in the body of this file so the compiler/linker won't complain
-// about an empty .o file.
-__attribute__((visibility("default"))) char dummy_symbol_25 = 0;
diff --git a/libs/protobuf/objectivec/Tests/GPBConcurrencyTests.m b/libs/protobuf/objectivec/Tests/GPBConcurrencyTests.m
deleted file mode 100644
index daf75e7..0000000
--- a/libs/protobuf/objectivec/Tests/GPBConcurrencyTests.m
+++ /dev/null
@@ -1,206 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2014 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#import "GPBTestUtilities.h"
-
-#import "google/protobuf/Unittest.pbobjc.h"
-#import "google/protobuf/UnittestObjc.pbobjc.h"
-
-static const int kNumThreads = 100;
-static const int kNumMessages = 100;
-
-// NOTE: Most of these tests don't "fail" in the sense that the XCTAsserts
-// trip.  Rather, the asserts simply exercise the apis, and if there is
-// a concurancy issue, the NSAsserts in the runtime code fire and/or the
-// code just crashes outright.
-
-@interface ConcurrencyTests : GPBTestCase
-@end
-
-@implementation ConcurrencyTests
-
-- (NSArray *)createThreadsWithSelector:(SEL)selector object:(id)object {
-  NSMutableArray *array = [NSMutableArray array];
-  for (NSUInteger i = 0; i < kNumThreads; i++) {
-    NSThread *thread =
-        [[NSThread alloc] initWithTarget:self selector:selector object:object];
-    [array addObject:thread];
-    [thread release];
-  }
-  return array;
-}
-
-- (NSArray *)createMessagesWithType:(Class)msgType {
-  NSMutableArray *array = [NSMutableArray array];
-  for (NSUInteger i = 0; i < kNumMessages; i++) {
-    [array addObject:[msgType message]];
-  }
-  return array;
-}
-
-- (void)startThreads:(NSArray *)threads {
-  for (NSThread *thread in threads) {
-    [thread start];
-  }
-}
-
-- (void)joinThreads:(NSArray *)threads {
-  for (NSThread *thread in threads) {
-    while (![thread isFinished])
-      ;
-  }
-}
-
-- (void)readForeignMessage:(NSArray *)messages {
-  for (NSUInteger i = 0; i < 10; i++) {
-    for (TestAllTypes *message in messages) {
-      XCTAssertEqual(message.optionalForeignMessage.c, 0);
-    }
-  }
-}
-
-- (void)testConcurrentReadOfUnsetMessageField {
-  NSArray *messages = [self createMessagesWithType:[TestAllTypes class]];
-  NSArray *threads =
-      [self createThreadsWithSelector:@selector(readForeignMessage:)
-                               object:messages];
-  [self startThreads:threads];
-  [self joinThreads:threads];
-  for (TestAllTypes *message in messages) {
-    XCTAssertFalse(message.hasOptionalForeignMessage);
-  }
-}
-
-- (void)readRepeatedInt32:(NSArray *)messages {
-  for (int i = 0; i < 10; i++) {
-    for (TestAllTypes *message in messages) {
-      XCTAssertEqual([message.repeatedInt32Array count], (NSUInteger)0);
-    }
-  }
-}
-
-- (void)testConcurrentReadOfUnsetRepeatedIntField {
-  NSArray *messages = [self createMessagesWithType:[TestAllTypes class]];
-  NSArray *threads =
-      [self createThreadsWithSelector:@selector(readRepeatedInt32:)
-                               object:messages];
-  [self startThreads:threads];
-  [self joinThreads:threads];
-  for (TestAllTypes *message in messages) {
-    XCTAssertEqual([message.repeatedInt32Array count], (NSUInteger)0);
-  }
-}
-
-- (void)readRepeatedString:(NSArray *)messages {
-  for (int i = 0; i < 10; i++) {
-    for (TestAllTypes *message in messages) {
-      XCTAssertEqual([message.repeatedStringArray count], (NSUInteger)0);
-    }
-  }
-}
-
-- (void)testConcurrentReadOfUnsetRepeatedStringField {
-  NSArray *messages = [self createMessagesWithType:[TestAllTypes class]];
-  NSArray *threads =
-      [self createThreadsWithSelector:@selector(readRepeatedString:)
-                               object:messages];
-  [self startThreads:threads];
-  [self joinThreads:threads];
-  for (TestAllTypes *message in messages) {
-    XCTAssertEqual([message.repeatedStringArray count], (NSUInteger)0);
-  }
-}
-
-- (void)readInt32Int32Map:(NSArray *)messages {
-  for (int i = 0; i < 10; i++) {
-    for (TestRecursiveMessageWithRepeatedField *message in messages) {
-      XCTAssertEqual([message.iToI count], (NSUInteger)0);
-    }
-  }
-}
-
-- (void)testConcurrentReadOfUnsetInt32Int32MapField {
-  NSArray *messages =
-      [self createMessagesWithType:[TestRecursiveMessageWithRepeatedField class]];
-  NSArray *threads =
-      [self createThreadsWithSelector:@selector(readInt32Int32Map:)
-                               object:messages];
-  [self startThreads:threads];
-  [self joinThreads:threads];
-  for (TestRecursiveMessageWithRepeatedField *message in messages) {
-    XCTAssertEqual([message.iToI count], (NSUInteger)0);
-  }
-}
-
-- (void)readStringStringMap:(NSArray *)messages {
-  for (int i = 0; i < 10; i++) {
-    for (TestRecursiveMessageWithRepeatedField *message in messages) {
-      XCTAssertEqual([message.strToStr count], (NSUInteger)0);
-    }
-  }
-}
-
-- (void)testConcurrentReadOfUnsetStringStringMapField {
-  NSArray *messages =
-      [self createMessagesWithType:[TestRecursiveMessageWithRepeatedField class]];
-  NSArray *threads =
-      [self createThreadsWithSelector:@selector(readStringStringMap:)
-                               object:messages];
-  [self startThreads:threads];
-  [self joinThreads:threads];
-  for (TestRecursiveMessageWithRepeatedField *message in messages) {
-    XCTAssertEqual([message.strToStr count], (NSUInteger)0);
-  }
-}
-
-- (void)readOptionalForeignMessageExtension:(NSArray *)messages {
-  for (int i = 0; i < 10; i++) {
-    for (TestAllExtensions *message in messages) {
-      ForeignMessage *foreign =
-          [message getExtension:[UnittestRoot optionalForeignMessageExtension]];
-      XCTAssertEqual(foreign.c, 0);
-    }
-  }
-}
-
-- (void)testConcurrentReadOfUnsetExtensionField {
-  NSArray *messages = [self createMessagesWithType:[TestAllExtensions class]];
-  SEL sel = @selector(readOptionalForeignMessageExtension:);
-  NSArray *threads = [self createThreadsWithSelector:sel object:messages];
-  [self startThreads:threads];
-  [self joinThreads:threads];
-  GPBExtensionDescriptor *extension =
-      [UnittestRoot optionalForeignMessageExtension];
-  for (TestAllExtensions *message in messages) {
-    XCTAssertFalse([message hasExtension:extension]);
-  }
-}
-
-@end
diff --git a/libs/protobuf/objectivec/Tests/GPBDescriptorTests.m b/libs/protobuf/objectivec/Tests/GPBDescriptorTests.m
deleted file mode 100644
index b1ff544..0000000
--- a/libs/protobuf/objectivec/Tests/GPBDescriptorTests.m
+++ /dev/null
@@ -1,461 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#import "GPBTestUtilities.h"
-
-#import <objc/runtime.h>
-
-#import "GPBDescriptor_PackagePrivate.h"
-#import "google/protobuf/Unittest.pbobjc.h"
-#import "google/protobuf/UnittestObjc.pbobjc.h"
-#import "google/protobuf/Descriptor.pbobjc.h"
-
-@interface DescriptorTests : GPBTestCase
-@end
-
-@implementation DescriptorTests
-
-- (void)testDescriptor_containingType {
-  GPBDescriptor *testAllTypesDesc = [TestAllTypes descriptor];
-  GPBDescriptor *nestedMessageDesc = [TestAllTypes_NestedMessage descriptor];
-  XCTAssertNil(testAllTypesDesc.containingType);
-  XCTAssertNotNil(nestedMessageDesc.containingType);
-  XCTAssertEqual(nestedMessageDesc.containingType, testAllTypesDesc);  // Ptr comparison
-}
-
-- (void)testDescriptor_fullName {
-  GPBDescriptor *testAllTypesDesc = [TestAllTypes descriptor];
-  XCTAssertEqualObjects(testAllTypesDesc.fullName, @"protobuf_unittest.TestAllTypes");
-  GPBDescriptor *nestedMessageDesc = [TestAllTypes_NestedMessage descriptor];
-  XCTAssertEqualObjects(nestedMessageDesc.fullName, @"protobuf_unittest.TestAllTypes.NestedMessage");
-
-  // Prefixes removed.
-  GPBDescriptor *descDesc = [GPBDescriptorProto descriptor];
-  XCTAssertEqualObjects(descDesc.fullName, @"google.protobuf.DescriptorProto");
-  GPBDescriptor *descExtRngDesc = [GPBDescriptorProto_ExtensionRange descriptor];
-  XCTAssertEqualObjects(descExtRngDesc.fullName, @"google.protobuf.DescriptorProto.ExtensionRange");
-
-  // Things that get "_Class" added.
-  GPBDescriptor *pointDesc = [Point_Class descriptor];
-  XCTAssertEqualObjects(pointDesc.fullName, @"protobuf_unittest.Point");
-  GPBDescriptor *pointRectDesc = [Point_Rect descriptor];
-  XCTAssertEqualObjects(pointRectDesc.fullName, @"protobuf_unittest.Point.Rect");
-}
-
-- (void)testFieldDescriptor {
-  GPBDescriptor *descriptor = [TestAllTypes descriptor];
-
-  // Nested Enum
-  GPBFieldDescriptor *fieldDescriptorWithName =
-      [descriptor fieldWithName:@"optionalNestedEnum"];
-  XCTAssertNotNil(fieldDescriptorWithName);
-  GPBFieldDescriptor *fieldDescriptorWithNumber =
-      [descriptor fieldWithNumber:21];
-  XCTAssertNotNil(fieldDescriptorWithNumber);
-  XCTAssertEqual(fieldDescriptorWithName, fieldDescriptorWithNumber);
-  XCTAssertNotNil(fieldDescriptorWithNumber.enumDescriptor);
-  XCTAssertEqualObjects(fieldDescriptorWithNumber.enumDescriptor.name,
-                        @"TestAllTypes_NestedEnum");
-  XCTAssertEqual(fieldDescriptorWithName.number, fieldDescriptorWithNumber.number);
-  XCTAssertEqual(fieldDescriptorWithName.dataType, GPBDataTypeEnum);
-
-  // Foreign Enum
-  fieldDescriptorWithName = [descriptor fieldWithName:@"optionalForeignEnum"];
-  XCTAssertNotNil(fieldDescriptorWithName);
-  fieldDescriptorWithNumber = [descriptor fieldWithNumber:22];
-  XCTAssertNotNil(fieldDescriptorWithNumber);
-  XCTAssertEqual(fieldDescriptorWithName, fieldDescriptorWithNumber);
-  XCTAssertNotNil(fieldDescriptorWithNumber.enumDescriptor);
-  XCTAssertEqualObjects(fieldDescriptorWithNumber.enumDescriptor.name,
-                        @"ForeignEnum");
-  XCTAssertEqual(fieldDescriptorWithName.number, fieldDescriptorWithNumber.number);
-  XCTAssertEqual(fieldDescriptorWithName.dataType, GPBDataTypeEnum);
-
-  // Import Enum
-  fieldDescriptorWithName = [descriptor fieldWithName:@"optionalImportEnum"];
-  XCTAssertNotNil(fieldDescriptorWithName);
-  fieldDescriptorWithNumber = [descriptor fieldWithNumber:23];
-  XCTAssertNotNil(fieldDescriptorWithNumber);
-  XCTAssertEqual(fieldDescriptorWithName, fieldDescriptorWithNumber);
-  XCTAssertNotNil(fieldDescriptorWithNumber.enumDescriptor);
-  XCTAssertEqualObjects(fieldDescriptorWithNumber.enumDescriptor.name,
-                        @"ImportEnum");
-  XCTAssertEqual(fieldDescriptorWithName.number, fieldDescriptorWithNumber.number);
-  XCTAssertEqual(fieldDescriptorWithName.dataType, GPBDataTypeEnum);
-
-  // Nested Message
-  fieldDescriptorWithName = [descriptor fieldWithName:@"optionalNestedMessage"];
-  XCTAssertNotNil(fieldDescriptorWithName);
-  fieldDescriptorWithNumber = [descriptor fieldWithNumber:18];
-  XCTAssertNotNil(fieldDescriptorWithNumber);
-  XCTAssertEqual(fieldDescriptorWithName, fieldDescriptorWithNumber);
-  XCTAssertNil(fieldDescriptorWithNumber.enumDescriptor);
-  XCTAssertEqual(fieldDescriptorWithName.number, fieldDescriptorWithNumber.number);
-  XCTAssertEqual(fieldDescriptorWithName.dataType, GPBDataTypeMessage);
-
-  // Foreign Message
-  fieldDescriptorWithName =
-      [descriptor fieldWithName:@"optionalForeignMessage"];
-  XCTAssertNotNil(fieldDescriptorWithName);
-  fieldDescriptorWithNumber = [descriptor fieldWithNumber:19];
-  XCTAssertNotNil(fieldDescriptorWithNumber);
-  XCTAssertEqual(fieldDescriptorWithName, fieldDescriptorWithNumber);
-  XCTAssertNil(fieldDescriptorWithNumber.enumDescriptor);
-  XCTAssertEqual(fieldDescriptorWithName.number, fieldDescriptorWithNumber.number);
-  XCTAssertEqual(fieldDescriptorWithName.dataType, GPBDataTypeMessage);
-
-  // Import Message
-  fieldDescriptorWithName = [descriptor fieldWithName:@"optionalImportMessage"];
-  XCTAssertNotNil(fieldDescriptorWithName);
-  fieldDescriptorWithNumber = [descriptor fieldWithNumber:20];
-  XCTAssertNotNil(fieldDescriptorWithNumber);
-  XCTAssertEqual(fieldDescriptorWithName, fieldDescriptorWithNumber);
-  XCTAssertNil(fieldDescriptorWithNumber.enumDescriptor);
-  XCTAssertEqual(fieldDescriptorWithName.number, fieldDescriptorWithNumber.number);
-  XCTAssertEqual(fieldDescriptorWithName.dataType, GPBDataTypeMessage);
-
-  // Some failed lookups.
-  XCTAssertNil([descriptor fieldWithName:@"NOT THERE"]);
-  XCTAssertNil([descriptor fieldWithNumber:9876543]);
-}
-
-- (void)testEnumDescriptor {
-  GPBEnumDescriptor *descriptor = TestAllTypes_NestedEnum_EnumDescriptor();
-
-  NSString *enumName = [descriptor enumNameForValue:1];
-  XCTAssertNotNil(enumName);
-  int32_t value;
-  XCTAssertTrue(
-      [descriptor getValue:&value forEnumName:@"TestAllTypes_NestedEnum_Foo"]);
-  XCTAssertTrue(
-      [descriptor getValue:NULL forEnumName:@"TestAllTypes_NestedEnum_Foo"]);
-  XCTAssertEqual(value, TestAllTypes_NestedEnum_Foo);
-
-  enumName = [descriptor enumNameForValue:2];
-  XCTAssertNotNil(enumName);
-  XCTAssertTrue(
-      [descriptor getValue:&value forEnumName:@"TestAllTypes_NestedEnum_Bar"]);
-  XCTAssertEqual(value, TestAllTypes_NestedEnum_Bar);
-
-  enumName = [descriptor enumNameForValue:3];
-  XCTAssertNotNil(enumName);
-  XCTAssertTrue(
-      [descriptor getValue:&value forEnumName:@"TestAllTypes_NestedEnum_Baz"]);
-  XCTAssertEqual(value, TestAllTypes_NestedEnum_Baz);
-
-  // TextFormat
-  enumName = [descriptor textFormatNameForValue:1];
-  XCTAssertNotNil(enumName);
-  XCTAssertTrue([descriptor getValue:&value forEnumTextFormatName:@"FOO"]);
-  XCTAssertEqual(value, TestAllTypes_NestedEnum_Foo);
-  XCTAssertNil([descriptor textFormatNameForValue:99999]);
-
-  // Bad values
-  enumName = [descriptor enumNameForValue:0];
-  XCTAssertNil(enumName);
-  XCTAssertFalse([descriptor getValue:&value forEnumName:@"Unknown"]);
-  XCTAssertFalse([descriptor getValue:NULL forEnumName:@"Unknown"]);
-  XCTAssertFalse([descriptor getValue:&value
-                          forEnumName:@"TestAllTypes_NestedEnum_Unknown"]);
-  XCTAssertFalse([descriptor getValue:NULL
-                          forEnumName:@"TestAllTypes_NestedEnum_Unknown"]);
-  XCTAssertFalse([descriptor getValue:NULL forEnumTextFormatName:@"Unknown"]);
-  XCTAssertFalse([descriptor getValue:&value forEnumTextFormatName:@"Unknown"]);
-}
-
-- (void)testEnumDescriptorIntrospection {
-  GPBEnumDescriptor *descriptor = TestAllTypes_NestedEnum_EnumDescriptor();
-
-  XCTAssertEqual(descriptor.enumNameCount, 4U);
-  XCTAssertEqualObjects([descriptor getEnumNameForIndex:0],
-                        @"TestAllTypes_NestedEnum_Foo");
-  XCTAssertEqualObjects([descriptor getEnumTextFormatNameForIndex:0], @"FOO");
-  XCTAssertEqualObjects([descriptor getEnumNameForIndex:1],
-                 @"TestAllTypes_NestedEnum_Bar");
-  XCTAssertEqualObjects([descriptor getEnumTextFormatNameForIndex:1], @"BAR");
-  XCTAssertEqualObjects([descriptor getEnumNameForIndex:2],
-                 @"TestAllTypes_NestedEnum_Baz");
-  XCTAssertEqualObjects([descriptor getEnumTextFormatNameForIndex:2], @"BAZ");
-  XCTAssertEqualObjects([descriptor getEnumNameForIndex:3],
-                 @"TestAllTypes_NestedEnum_Neg");
-  XCTAssertEqualObjects([descriptor getEnumTextFormatNameForIndex:3], @"NEG");
-}
-
-- (void)testEnumDescriptorIntrospectionWithAlias {
-  GPBEnumDescriptor *descriptor = TestEnumWithDupValue_EnumDescriptor();
-  NSString *enumName;
-  int32_t value;
-
-  XCTAssertEqual(descriptor.enumNameCount, 5U);
-
-  enumName = [descriptor getEnumNameForIndex:0];
-  XCTAssertEqualObjects(enumName, @"TestEnumWithDupValue_Foo1");
-  XCTAssertTrue([descriptor getValue:&value forEnumName:enumName]);
-  XCTAssertEqual(value, 1);
-  XCTAssertEqualObjects([descriptor getEnumTextFormatNameForIndex:0], @"FOO1");
-
-  enumName = [descriptor getEnumNameForIndex:1];
-  XCTAssertEqualObjects(enumName, @"TestEnumWithDupValue_Bar1");
-  XCTAssertTrue([descriptor getValue:&value forEnumName:enumName]);
-  XCTAssertEqual(value, 2);
-  XCTAssertEqualObjects([descriptor getEnumTextFormatNameForIndex:1], @"BAR1");
-
-  enumName = [descriptor getEnumNameForIndex:2];
-  XCTAssertEqualObjects(enumName, @"TestEnumWithDupValue_Baz");
-  XCTAssertTrue([descriptor getValue:&value forEnumName:enumName]);
-  XCTAssertEqual(value, 3);
-  XCTAssertEqualObjects([descriptor getEnumTextFormatNameForIndex:2], @"BAZ");
-
-  enumName = [descriptor getEnumNameForIndex:3];
-  XCTAssertEqualObjects(enumName, @"TestEnumWithDupValue_Foo2");
-  XCTAssertTrue([descriptor getValue:&value forEnumName:enumName]);
-  XCTAssertEqual(value, 1);
-  XCTAssertEqualObjects([descriptor getEnumTextFormatNameForIndex:3], @"FOO2");
-
-  enumName = [descriptor getEnumNameForIndex:4];
-  XCTAssertEqualObjects(enumName, @"TestEnumWithDupValue_Bar2");
-  XCTAssertTrue([descriptor getValue:&value forEnumName:enumName]);
-  XCTAssertEqual(value, 2);
-  XCTAssertEqualObjects([descriptor getEnumTextFormatNameForIndex:4], @"BAR2");
-}
-
-- (void)testEnumAliasNameCollisions {
-  GPBEnumDescriptor *descriptor = TestEnumObjCNameCollision_EnumDescriptor();
-  NSString *textFormatName;
-  int32_t value;
-
-  XCTAssertEqual(descriptor.enumNameCount, 5U);
-
-  XCTAssertEqualObjects([descriptor getEnumNameForIndex:0], @"TestEnumObjCNameCollision_Foo");
-  textFormatName = [descriptor getEnumTextFormatNameForIndex:0];
-  XCTAssertEqualObjects(textFormatName, @"FOO");
-  XCTAssertTrue([descriptor getValue:&value forEnumTextFormatName:textFormatName]);
-  XCTAssertEqual(value, 1);
-
-  XCTAssertEqualObjects([descriptor getEnumNameForIndex:1], @"TestEnumObjCNameCollision_Foo");
-  textFormatName = [descriptor getEnumTextFormatNameForIndex:1];
-  XCTAssertEqualObjects(textFormatName, @"foo");
-  XCTAssertTrue([descriptor getValue:&value forEnumTextFormatName:textFormatName]);
-  XCTAssertEqual(value, 1);
-
-  XCTAssertEqualObjects([descriptor getEnumNameForIndex:2], @"TestEnumObjCNameCollision_Bar");
-  textFormatName = [descriptor getEnumTextFormatNameForIndex:2];
-  XCTAssertEqualObjects(textFormatName, @"BAR");
-  XCTAssertTrue([descriptor getValue:&value forEnumTextFormatName:textFormatName]);
-  XCTAssertEqual(value, 2);
-
-  XCTAssertEqualObjects([descriptor getEnumNameForIndex:3], @"TestEnumObjCNameCollision_Mumble");
-  textFormatName = [descriptor getEnumTextFormatNameForIndex:3];
-  XCTAssertEqualObjects(textFormatName, @"mumble");
-  XCTAssertTrue([descriptor getValue:&value forEnumTextFormatName:textFormatName]);
-  XCTAssertEqual(value, 2);
-
-  XCTAssertEqualObjects([descriptor getEnumNameForIndex:4], @"TestEnumObjCNameCollision_Mumble");
-  textFormatName = [descriptor getEnumTextFormatNameForIndex:4];
-  XCTAssertEqualObjects(textFormatName, @"MUMBLE");
-  XCTAssertTrue([descriptor getValue:&value forEnumTextFormatName:textFormatName]);
-  XCTAssertEqual(value, 2);
-}
-
-- (void)testEnumValueValidator {
-  GPBDescriptor *descriptor = [TestAllTypes descriptor];
-  GPBFieldDescriptor *fieldDescriptor =
-      [descriptor fieldWithName:@"optionalNestedEnum"];
-
-  // Valid values
-  XCTAssertTrue([fieldDescriptor isValidEnumValue:1]);
-  XCTAssertTrue([fieldDescriptor isValidEnumValue:2]);
-  XCTAssertTrue([fieldDescriptor isValidEnumValue:3]);
-  XCTAssertTrue([fieldDescriptor isValidEnumValue:-1]);
-
-  // Invalid values
-  XCTAssertFalse([fieldDescriptor isValidEnumValue:4]);
-  XCTAssertFalse([fieldDescriptor isValidEnumValue:0]);
-  XCTAssertFalse([fieldDescriptor isValidEnumValue:-2]);
-}
-
-- (void)testOneofDescriptor {
-  GPBDescriptor *descriptor = [TestOneof2 descriptor];
-
-  GPBFieldDescriptor *fooStringField =
-      [descriptor fieldWithNumber:TestOneof2_FieldNumber_FooString];
-  XCTAssertNotNil(fooStringField);
-  GPBFieldDescriptor *barStringField =
-      [descriptor fieldWithNumber:TestOneof2_FieldNumber_BarString];
-  XCTAssertNotNil(barStringField);
-
-  // Check the oneofs to have what is expected but not other onesofs
-
-  GPBOneofDescriptor *oneofFoo = [descriptor oneofWithName:@"foo"];
-  XCTAssertNotNil(oneofFoo);
-  XCTAssertNotNil([oneofFoo fieldWithName:@"fooString"]);
-  XCTAssertNil([oneofFoo fieldWithName:@"barString"]);
-
-  GPBOneofDescriptor *oneofBar = [descriptor oneofWithName:@"bar"];
-  XCTAssertNotNil(oneofBar);
-  XCTAssertNil([oneofBar fieldWithName:@"fooString"]);
-  XCTAssertNotNil([oneofBar fieldWithName:@"barString"]);
-
-  // Pointer comparisons against lookups from message.
-
-  XCTAssertEqual([oneofFoo fieldWithNumber:TestOneof2_FieldNumber_FooString],
-                 fooStringField);
-  XCTAssertEqual([oneofFoo fieldWithName:@"fooString"], fooStringField);
-
-  XCTAssertEqual([oneofBar fieldWithNumber:TestOneof2_FieldNumber_BarString],
-                 barStringField);
-  XCTAssertEqual([oneofBar fieldWithName:@"barString"], barStringField);
-
-  // Unknown oneof not found.
-
-  XCTAssertNil([descriptor oneofWithName:@"mumble"]);
-  XCTAssertNil([descriptor oneofWithName:@"Foo"]);
-
-  // Unknown oneof item.
-
-  XCTAssertNil([oneofFoo fieldWithName:@"mumble"]);
-  XCTAssertNil([oneofFoo fieldWithNumber:666]);
-
-  // Field exists, but not in this oneof.
-
-  XCTAssertNil([oneofFoo fieldWithName:@"barString"]);
-  XCTAssertNil([oneofFoo fieldWithNumber:TestOneof2_FieldNumber_BarString]);
-  XCTAssertNil([oneofBar fieldWithName:@"fooString"]);
-  XCTAssertNil([oneofBar fieldWithNumber:TestOneof2_FieldNumber_FooString]);
-
-  // Check pointers back to the enclosing oneofs.
-  // (pointer comparisons)
-  XCTAssertEqual(fooStringField.containingOneof, oneofFoo);
-  XCTAssertEqual(barStringField.containingOneof, oneofBar);
-  GPBFieldDescriptor *bazString =
-      [descriptor fieldWithNumber:TestOneof2_FieldNumber_BazString];
-  XCTAssertNotNil(bazString);
-  XCTAssertNil(bazString.containingOneof);
-}
-
-- (void)testExtensiondDescriptor {
-  Class msgClass = [TestAllExtensions class];
-  Class packedMsgClass = [TestPackedExtensions class];
-
-  // Int
-
-  GPBExtensionDescriptor *descriptor = [UnittestRoot optionalInt32Extension];
-  XCTAssertNotNil(descriptor);
-  XCTAssertEqual(descriptor.containingMessageClass, msgClass);  // ptr equality
-  XCTAssertFalse(descriptor.isPackable);
-  XCTAssertEqualObjects(descriptor.defaultValue, @0);
-  XCTAssertNil(descriptor.enumDescriptor);
-
-  descriptor = [UnittestRoot defaultInt32Extension];
-  XCTAssertNotNil(descriptor);
-  XCTAssertEqual(descriptor.containingMessageClass, msgClass);  // ptr equality
-  XCTAssertFalse(descriptor.isPackable);
-  XCTAssertEqualObjects(descriptor.defaultValue, @41);
-  XCTAssertNil(descriptor.enumDescriptor);
-
-  // Enum
-
-  descriptor = [UnittestRoot optionalNestedEnumExtension];
-  XCTAssertNotNil(descriptor);
-  XCTAssertEqual(descriptor.containingMessageClass, msgClass);  // ptr equality
-  XCTAssertFalse(descriptor.isPackable);
-  XCTAssertEqual(descriptor.defaultValue, @1);
-  XCTAssertEqualObjects(descriptor.enumDescriptor.name, @"TestAllTypes_NestedEnum");
-
-  descriptor = [UnittestRoot defaultNestedEnumExtension];
-  XCTAssertNotNil(descriptor);
-  XCTAssertEqual(descriptor.containingMessageClass, msgClass);  // ptr equality
-  XCTAssertFalse(descriptor.isPackable);
-  XCTAssertEqual(descriptor.defaultValue, @2);
-  XCTAssertEqualObjects(descriptor.enumDescriptor.name, @"TestAllTypes_NestedEnum");
-
-  // Message
-
-  descriptor = [UnittestRoot optionalNestedMessageExtension];
-  XCTAssertNotNil(descriptor);
-  XCTAssertEqual(descriptor.containingMessageClass, msgClass);  // ptr equality
-  XCTAssertFalse(descriptor.isPackable);
-  XCTAssertNil(descriptor.defaultValue);
-  XCTAssertNil(descriptor.enumDescriptor);
-
-  // Repeated Int
-
-  descriptor = [UnittestRoot repeatedInt32Extension];
-  XCTAssertNotNil(descriptor);
-  XCTAssertEqual(descriptor.containingMessageClass, msgClass);  // ptr equality
-  XCTAssertFalse(descriptor.isPackable);
-  XCTAssertNil(descriptor.defaultValue);
-  XCTAssertNil(descriptor.enumDescriptor);
-
-  descriptor = [UnittestRoot packedInt32Extension];
-  XCTAssertNotNil(descriptor);
-  XCTAssertEqual(descriptor.containingMessageClass, packedMsgClass);  // ptr equality
-  XCTAssertTrue(descriptor.isPackable);
-  XCTAssertNil(descriptor.defaultValue);
-  XCTAssertNil(descriptor.enumDescriptor);
-
-  // Repeated Enum
-
-  descriptor = [UnittestRoot repeatedNestedEnumExtension];
-  XCTAssertNotNil(descriptor);
-  XCTAssertEqual(descriptor.containingMessageClass, msgClass);  // ptr equality
-  XCTAssertFalse(descriptor.isPackable);
-  XCTAssertNil(descriptor.defaultValue);
-  XCTAssertEqualObjects(descriptor.enumDescriptor.name, @"TestAllTypes_NestedEnum");
-
-  descriptor = [UnittestRoot packedEnumExtension];
-  XCTAssertNotNil(descriptor);
-  XCTAssertEqual(descriptor.containingMessageClass, packedMsgClass);  // ptr equality
-  XCTAssertTrue(descriptor.isPackable);
-  XCTAssertNil(descriptor.defaultValue);
-  XCTAssertEqualObjects(descriptor.enumDescriptor.name, @"ForeignEnum");
-
-  // Repeated Message
-
-  descriptor = [UnittestRoot repeatedNestedMessageExtension];
-  XCTAssertNotNil(descriptor);
-  XCTAssertEqual(descriptor.containingMessageClass, msgClass);  // ptr equality
-  XCTAssertFalse(descriptor.isPackable);
-  XCTAssertNil(descriptor.defaultValue);
-  XCTAssertNil(descriptor.enumDescriptor);
-
-  // Compare (used internally for serialization).
-
-  GPBExtensionDescriptor *ext1 = [UnittestRoot optionalInt32Extension];
-  XCTAssertEqual(ext1.fieldNumber, 1u);
-  GPBExtensionDescriptor *ext2 = [UnittestRoot optionalInt64Extension];
-  XCTAssertEqual(ext2.fieldNumber, 2u);
-
-  XCTAssertEqual([ext1 compareByFieldNumber:ext2], NSOrderedAscending);
-  XCTAssertEqual([ext2 compareByFieldNumber:ext1], NSOrderedDescending);
-  XCTAssertEqual([ext1 compareByFieldNumber:ext1], NSOrderedSame);
-}
-
-@end
diff --git a/libs/protobuf/objectivec/Tests/GPBDictionaryTests+Bool.m b/libs/protobuf/objectivec/Tests/GPBDictionaryTests+Bool.m
deleted file mode 100644
index 4c02144..0000000
--- a/libs/protobuf/objectivec/Tests/GPBDictionaryTests+Bool.m
+++ /dev/null
@@ -1,2466 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#import <Foundation/Foundation.h>
-#import <XCTest/XCTest.h>
-
-#import "GPBDictionary.h"
-
-#import "GPBTestUtilities.h"
-#import "google/protobuf/UnittestRuntimeProto2.pbobjc.h"
-
-// Pull in the macros (using an external file because expanding all tests
-// in a single file makes a file that is failing to work with within Xcode.
-//%PDDM-IMPORT-DEFINES GPBDictionaryTests.pddm
-
-//%PDDM-EXPAND BOOL_TESTS_FOR_POD_VALUE(UInt32, uint32_t, 100U, 101U)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-#pragma mark - Bool -> UInt32
-
-@interface GPBBoolUInt32DictionaryTests : XCTestCase
-@end
-
-@implementation GPBBoolUInt32DictionaryTests
-
-- (void)testEmpty {
-  GPBBoolUInt32Dictionary *dict = [[GPBBoolUInt32Dictionary alloc] init];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertFalse([dict getUInt32:NULL forKey:YES]);
-  [dict enumerateKeysAndUInt32sUsingBlock:^(BOOL aKey, uint32_t aValue, BOOL *stop) {
-    #pragma unused(aKey, aValue, stop)
-    XCTFail(@"Shouldn't get here!");
-  }];
-  [dict release];
-}
-
-- (void)testOne {
-  GPBBoolUInt32Dictionary *dict = [[GPBBoolUInt32Dictionary alloc] init];
-  [dict setUInt32:100U forKey:YES];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 1U);
-  uint32_t value;
-  XCTAssertTrue([dict getUInt32:NULL forKey:YES]);
-  XCTAssertTrue([dict getUInt32:&value forKey:YES]);
-  XCTAssertEqual(value, 100U);
-  XCTAssertFalse([dict getUInt32:NULL forKey:NO]);
-  [dict enumerateKeysAndUInt32sUsingBlock:^(BOOL aKey, uint32_t aValue, BOOL *stop) {
-    XCTAssertEqual(aKey, YES);
-    XCTAssertEqual(aValue, 100U);
-    XCTAssertNotEqual(stop, NULL);
-  }];
-  [dict release];
-}
-
-- (void)testBasics {
-  const BOOL kKeys[] = { YES, NO };
-  const uint32_t kValues[] = { 100U, 101U };
-  GPBBoolUInt32Dictionary *dict =
-      [[GPBBoolUInt32Dictionary alloc] initWithUInt32s:kValues
-                                               forKeys:kKeys
-                                                 count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 2U);
-  uint32_t value;
-  XCTAssertTrue([dict getUInt32:NULL forKey:YES]);
-  XCTAssertTrue([dict getUInt32:&value forKey:YES]);
-  XCTAssertEqual(value, 100U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:NO]);
-  XCTAssertTrue([dict getUInt32:&value forKey:NO]);
-  XCTAssertEqual(value, 101U);
-
-  __block NSUInteger idx = 0;
-  BOOL *seenKeys = malloc(2 * sizeof(BOOL));
-  uint32_t *seenValues = malloc(2 * sizeof(uint32_t));
-  [dict enumerateKeysAndUInt32sUsingBlock:^(BOOL aKey, uint32_t aValue, BOOL *stop) {
-    XCTAssertLessThan(idx, 2U);
-    seenKeys[idx] = aKey;
-    seenValues[idx] = aValue;
-    XCTAssertNotEqual(stop, NULL);
-    ++idx;
-  }];
-  for (int i = 0; i < 2; ++i) {
-    BOOL foundKey = NO;
-    for (int j = 0; (j < 2) && !foundKey; ++j) {
-      if (kKeys[i] == seenKeys[j]) {
-        foundKey = YES;
-        XCTAssertEqual(kValues[i], seenValues[j], @"i = %d, j = %d", i, j);
-      }
-    }
-    XCTAssertTrue(foundKey, @"i = %d", i);
-  }
-  free(seenKeys);
-  free(seenValues);
-
-  // Stopping the enumeration.
-  idx = 0;
-  [dict enumerateKeysAndUInt32sUsingBlock:^(BOOL aKey, uint32_t aValue, BOOL *stop) {
-    #pragma unused(aKey, aValue)
-    if (idx == 0) *stop = YES;
-    XCTAssertNotEqual(idx, 2U);
-    ++idx;
-  }];
-  [dict release];
-}
-
-- (void)testEquality {
-  const BOOL kKeys1[] = { YES, NO };
-  const BOOL kKeys2[] = { NO, YES };
-  const uint32_t kValues1[] = { 100U, 101U };
-  const uint32_t kValues2[] = { 101U, 100U };
-  const uint32_t kValues3[] = { 101U };
-  GPBBoolUInt32Dictionary *dict1 =
-      [[GPBBoolUInt32Dictionary alloc] initWithUInt32s:kValues1
-                                               forKeys:kKeys1
-                                                 count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict1);
-  GPBBoolUInt32Dictionary *dict1prime =
-      [[GPBBoolUInt32Dictionary alloc] initWithUInt32s:kValues1
-                                               forKeys:kKeys1
-                                                 count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict1prime);
-  GPBBoolUInt32Dictionary *dict2 =
-      [[GPBBoolUInt32Dictionary alloc] initWithUInt32s:kValues2
-                                               forKeys:kKeys1
-                                                 count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(dict2);
-  GPBBoolUInt32Dictionary *dict3 =
-      [[GPBBoolUInt32Dictionary alloc] initWithUInt32s:kValues1
-                                               forKeys:kKeys2
-                                                 count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict3);
-  GPBBoolUInt32Dictionary *dict4 =
-      [[GPBBoolUInt32Dictionary alloc] initWithUInt32s:kValues3
-                                               forKeys:kKeys1
-                                                 count:GPBARRAYSIZE(kValues3)];
-  XCTAssertNotNil(dict4);
-
-  // 1/1Prime should be different objects, but equal.
-  XCTAssertNotEqual(dict1, dict1prime);
-  XCTAssertEqualObjects(dict1, dict1prime);
-  // Equal, so they must have same hash.
-  XCTAssertEqual([dict1 hash], [dict1prime hash]);
-
-  // 2 is same keys, different values; not equal.
-  XCTAssertNotEqualObjects(dict1, dict2);
-
-  // 3 is different keys, same values; not equal.
-  XCTAssertNotEqualObjects(dict1, dict3);
-
-  // 4 Fewer pairs; not equal
-  XCTAssertNotEqualObjects(dict1, dict4);
-
-  [dict1 release];
-  [dict1prime release];
-  [dict2 release];
-  [dict3 release];
-  [dict4 release];
-}
-
-- (void)testCopy {
-  const BOOL kKeys[] = { YES, NO };
-  const uint32_t kValues[] = { 100U, 101U };
-  GPBBoolUInt32Dictionary *dict =
-      [[GPBBoolUInt32Dictionary alloc] initWithUInt32s:kValues
-                                               forKeys:kKeys
-                                                 count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-
-  GPBBoolUInt32Dictionary *dict2 = [dict copy];
-  XCTAssertNotNil(dict2);
-
-  // Should be new object but equal.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  XCTAssertTrue([dict2 isKindOfClass:[GPBBoolUInt32Dictionary class]]);
-
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testDictionaryFromDictionary {
-  const BOOL kKeys[] = { YES, NO };
-  const uint32_t kValues[] = { 100U, 101U };
-  GPBBoolUInt32Dictionary *dict =
-      [[GPBBoolUInt32Dictionary alloc] initWithUInt32s:kValues
-                                               forKeys:kKeys
-                                                 count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-
-  GPBBoolUInt32Dictionary *dict2 =
-      [[GPBBoolUInt32Dictionary alloc] initWithDictionary:dict];
-  XCTAssertNotNil(dict2);
-
-  // Should be new pointer, but equal objects.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testAdds {
-  GPBBoolUInt32Dictionary *dict = [[GPBBoolUInt32Dictionary alloc] init];
-  XCTAssertNotNil(dict);
-
-  XCTAssertEqual(dict.count, 0U);
-  [dict setUInt32:100U forKey:YES];
-  XCTAssertEqual(dict.count, 1U);
-
-  const BOOL kKeys[] = { NO };
-  const uint32_t kValues[] = { 101U };
-  GPBBoolUInt32Dictionary *dict2 =
-      [[GPBBoolUInt32Dictionary alloc] initWithUInt32s:kValues
-                                               forKeys:kKeys
-                                                 count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict2);
-  [dict addEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 2U);
-
-  uint32_t value;
-  XCTAssertTrue([dict getUInt32:NULL forKey:YES]);
-  XCTAssertTrue([dict getUInt32:&value forKey:YES]);
-  XCTAssertEqual(value, 100U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:NO]);
-  XCTAssertTrue([dict getUInt32:&value forKey:NO]);
-  XCTAssertEqual(value, 101U);
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testRemove {
-  const BOOL kKeys[] = { YES, NO};
-  const uint32_t kValues[] = { 100U, 101U };
-  GPBBoolUInt32Dictionary *dict =
-      [[GPBBoolUInt32Dictionary alloc] initWithUInt32s:kValues
-                                        forKeys:kKeys
-                                          count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 2U);
-
-  [dict removeUInt32ForKey:NO];
-  XCTAssertEqual(dict.count, 1U);
-  uint32_t value;
-  XCTAssertTrue([dict getUInt32:NULL forKey:YES]);
-  XCTAssertTrue([dict getUInt32:&value forKey:YES]);
-  XCTAssertEqual(value, 100U);
-  XCTAssertFalse([dict getUInt32:NULL forKey:NO]);
-
-  // Remove again does nothing.
-  [dict removeUInt32ForKey:NO];
-  XCTAssertEqual(dict.count, 1U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:YES]);
-  XCTAssertTrue([dict getUInt32:&value forKey:YES]);
-  XCTAssertEqual(value, 100U);
-  XCTAssertFalse([dict getUInt32:NULL forKey:NO]);
-
-  [dict removeAll];
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertFalse([dict getUInt32:NULL forKey:YES]);
-  XCTAssertFalse([dict getUInt32:NULL forKey:NO]);
-  [dict release];
-}
-
-- (void)testInplaceMutation {
-  const BOOL kKeys[] = { YES, NO };
-  const uint32_t kValues[] = { 100U, 101U };
-  GPBBoolUInt32Dictionary *dict =
-      [[GPBBoolUInt32Dictionary alloc] initWithUInt32s:kValues
-                                               forKeys:kKeys
-                                                 count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 2U);
-  uint32_t value;
-  XCTAssertTrue([dict getUInt32:NULL forKey:YES]);
-  XCTAssertTrue([dict getUInt32:&value forKey:YES]);
-  XCTAssertEqual(value, 100U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:NO]);
-  XCTAssertTrue([dict getUInt32:&value forKey:NO]);
-  XCTAssertEqual(value, 101U);
-
-  [dict setUInt32:101U forKey:YES];
-  XCTAssertEqual(dict.count, 2U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:YES]);
-  XCTAssertTrue([dict getUInt32:&value forKey:YES]);
-  XCTAssertEqual(value, 101U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:NO]);
-  XCTAssertTrue([dict getUInt32:&value forKey:NO]);
-  XCTAssertEqual(value, 101U);
-
-  [dict setUInt32:100U forKey:NO];
-  XCTAssertEqual(dict.count, 2U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:YES]);
-  XCTAssertTrue([dict getUInt32:&value forKey:YES]);
-  XCTAssertEqual(value, 101U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:NO]);
-  XCTAssertTrue([dict getUInt32:&value forKey:NO]);
-  XCTAssertEqual(value, 100U);
-
-  const BOOL kKeys2[] = { NO, YES };
-  const uint32_t kValues2[] = { 101U, 100U };
-  GPBBoolUInt32Dictionary *dict2 =
-      [[GPBBoolUInt32Dictionary alloc] initWithUInt32s:kValues2
-                                               forKeys:kKeys2
-                                                 count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(dict2);
-  [dict addEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 2U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:YES]);
-  XCTAssertTrue([dict getUInt32:&value forKey:YES]);
-  XCTAssertEqual(value, 100U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:NO]);
-  XCTAssertTrue([dict getUInt32:&value forKey:NO]);
-  XCTAssertEqual(value, 101U);
-
-  [dict2 release];
-  [dict release];
-}
-
-@end
-
-// clang-format on
-//%PDDM-EXPAND BOOL_TESTS_FOR_POD_VALUE(Int32, int32_t, 200, 201)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-#pragma mark - Bool -> Int32
-
-@interface GPBBoolInt32DictionaryTests : XCTestCase
-@end
-
-@implementation GPBBoolInt32DictionaryTests
-
-- (void)testEmpty {
-  GPBBoolInt32Dictionary *dict = [[GPBBoolInt32Dictionary alloc] init];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertFalse([dict getInt32:NULL forKey:YES]);
-  [dict enumerateKeysAndInt32sUsingBlock:^(BOOL aKey, int32_t aValue, BOOL *stop) {
-    #pragma unused(aKey, aValue, stop)
-    XCTFail(@"Shouldn't get here!");
-  }];
-  [dict release];
-}
-
-- (void)testOne {
-  GPBBoolInt32Dictionary *dict = [[GPBBoolInt32Dictionary alloc] init];
-  [dict setInt32:200 forKey:YES];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 1U);
-  int32_t value;
-  XCTAssertTrue([dict getInt32:NULL forKey:YES]);
-  XCTAssertTrue([dict getInt32:&value forKey:YES]);
-  XCTAssertEqual(value, 200);
-  XCTAssertFalse([dict getInt32:NULL forKey:NO]);
-  [dict enumerateKeysAndInt32sUsingBlock:^(BOOL aKey, int32_t aValue, BOOL *stop) {
-    XCTAssertEqual(aKey, YES);
-    XCTAssertEqual(aValue, 200);
-    XCTAssertNotEqual(stop, NULL);
-  }];
-  [dict release];
-}
-
-- (void)testBasics {
-  const BOOL kKeys[] = { YES, NO };
-  const int32_t kValues[] = { 200, 201 };
-  GPBBoolInt32Dictionary *dict =
-      [[GPBBoolInt32Dictionary alloc] initWithInt32s:kValues
-                                             forKeys:kKeys
-                                               count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 2U);
-  int32_t value;
-  XCTAssertTrue([dict getInt32:NULL forKey:YES]);
-  XCTAssertTrue([dict getInt32:&value forKey:YES]);
-  XCTAssertEqual(value, 200);
-  XCTAssertTrue([dict getInt32:NULL forKey:NO]);
-  XCTAssertTrue([dict getInt32:&value forKey:NO]);
-  XCTAssertEqual(value, 201);
-
-  __block NSUInteger idx = 0;
-  BOOL *seenKeys = malloc(2 * sizeof(BOOL));
-  int32_t *seenValues = malloc(2 * sizeof(int32_t));
-  [dict enumerateKeysAndInt32sUsingBlock:^(BOOL aKey, int32_t aValue, BOOL *stop) {
-    XCTAssertLessThan(idx, 2U);
-    seenKeys[idx] = aKey;
-    seenValues[idx] = aValue;
-    XCTAssertNotEqual(stop, NULL);
-    ++idx;
-  }];
-  for (int i = 0; i < 2; ++i) {
-    BOOL foundKey = NO;
-    for (int j = 0; (j < 2) && !foundKey; ++j) {
-      if (kKeys[i] == seenKeys[j]) {
-        foundKey = YES;
-        XCTAssertEqual(kValues[i], seenValues[j], @"i = %d, j = %d", i, j);
-      }
-    }
-    XCTAssertTrue(foundKey, @"i = %d", i);
-  }
-  free(seenKeys);
-  free(seenValues);
-
-  // Stopping the enumeration.
-  idx = 0;
-  [dict enumerateKeysAndInt32sUsingBlock:^(BOOL aKey, int32_t aValue, BOOL *stop) {
-    #pragma unused(aKey, aValue)
-    if (idx == 0) *stop = YES;
-    XCTAssertNotEqual(idx, 2U);
-    ++idx;
-  }];
-  [dict release];
-}
-
-- (void)testEquality {
-  const BOOL kKeys1[] = { YES, NO };
-  const BOOL kKeys2[] = { NO, YES };
-  const int32_t kValues1[] = { 200, 201 };
-  const int32_t kValues2[] = { 201, 200 };
-  const int32_t kValues3[] = { 201 };
-  GPBBoolInt32Dictionary *dict1 =
-      [[GPBBoolInt32Dictionary alloc] initWithInt32s:kValues1
-                                             forKeys:kKeys1
-                                               count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict1);
-  GPBBoolInt32Dictionary *dict1prime =
-      [[GPBBoolInt32Dictionary alloc] initWithInt32s:kValues1
-                                             forKeys:kKeys1
-                                               count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict1prime);
-  GPBBoolInt32Dictionary *dict2 =
-      [[GPBBoolInt32Dictionary alloc] initWithInt32s:kValues2
-                                             forKeys:kKeys1
-                                               count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(dict2);
-  GPBBoolInt32Dictionary *dict3 =
-      [[GPBBoolInt32Dictionary alloc] initWithInt32s:kValues1
-                                             forKeys:kKeys2
-                                               count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict3);
-  GPBBoolInt32Dictionary *dict4 =
-      [[GPBBoolInt32Dictionary alloc] initWithInt32s:kValues3
-                                             forKeys:kKeys1
-                                               count:GPBARRAYSIZE(kValues3)];
-  XCTAssertNotNil(dict4);
-
-  // 1/1Prime should be different objects, but equal.
-  XCTAssertNotEqual(dict1, dict1prime);
-  XCTAssertEqualObjects(dict1, dict1prime);
-  // Equal, so they must have same hash.
-  XCTAssertEqual([dict1 hash], [dict1prime hash]);
-
-  // 2 is same keys, different values; not equal.
-  XCTAssertNotEqualObjects(dict1, dict2);
-
-  // 3 is different keys, same values; not equal.
-  XCTAssertNotEqualObjects(dict1, dict3);
-
-  // 4 Fewer pairs; not equal
-  XCTAssertNotEqualObjects(dict1, dict4);
-
-  [dict1 release];
-  [dict1prime release];
-  [dict2 release];
-  [dict3 release];
-  [dict4 release];
-}
-
-- (void)testCopy {
-  const BOOL kKeys[] = { YES, NO };
-  const int32_t kValues[] = { 200, 201 };
-  GPBBoolInt32Dictionary *dict =
-      [[GPBBoolInt32Dictionary alloc] initWithInt32s:kValues
-                                             forKeys:kKeys
-                                               count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-
-  GPBBoolInt32Dictionary *dict2 = [dict copy];
-  XCTAssertNotNil(dict2);
-
-  // Should be new object but equal.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  XCTAssertTrue([dict2 isKindOfClass:[GPBBoolInt32Dictionary class]]);
-
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testDictionaryFromDictionary {
-  const BOOL kKeys[] = { YES, NO };
-  const int32_t kValues[] = { 200, 201 };
-  GPBBoolInt32Dictionary *dict =
-      [[GPBBoolInt32Dictionary alloc] initWithInt32s:kValues
-                                             forKeys:kKeys
-                                               count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-
-  GPBBoolInt32Dictionary *dict2 =
-      [[GPBBoolInt32Dictionary alloc] initWithDictionary:dict];
-  XCTAssertNotNil(dict2);
-
-  // Should be new pointer, but equal objects.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testAdds {
-  GPBBoolInt32Dictionary *dict = [[GPBBoolInt32Dictionary alloc] init];
-  XCTAssertNotNil(dict);
-
-  XCTAssertEqual(dict.count, 0U);
-  [dict setInt32:200 forKey:YES];
-  XCTAssertEqual(dict.count, 1U);
-
-  const BOOL kKeys[] = { NO };
-  const int32_t kValues[] = { 201 };
-  GPBBoolInt32Dictionary *dict2 =
-      [[GPBBoolInt32Dictionary alloc] initWithInt32s:kValues
-                                             forKeys:kKeys
-                                               count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict2);
-  [dict addEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 2U);
-
-  int32_t value;
-  XCTAssertTrue([dict getInt32:NULL forKey:YES]);
-  XCTAssertTrue([dict getInt32:&value forKey:YES]);
-  XCTAssertEqual(value, 200);
-  XCTAssertTrue([dict getInt32:NULL forKey:NO]);
-  XCTAssertTrue([dict getInt32:&value forKey:NO]);
-  XCTAssertEqual(value, 201);
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testRemove {
-  const BOOL kKeys[] = { YES, NO};
-  const int32_t kValues[] = { 200, 201 };
-  GPBBoolInt32Dictionary *dict =
-      [[GPBBoolInt32Dictionary alloc] initWithInt32s:kValues
-                                      forKeys:kKeys
-                                        count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 2U);
-
-  [dict removeInt32ForKey:NO];
-  XCTAssertEqual(dict.count, 1U);
-  int32_t value;
-  XCTAssertTrue([dict getInt32:NULL forKey:YES]);
-  XCTAssertTrue([dict getInt32:&value forKey:YES]);
-  XCTAssertEqual(value, 200);
-  XCTAssertFalse([dict getInt32:NULL forKey:NO]);
-
-  // Remove again does nothing.
-  [dict removeInt32ForKey:NO];
-  XCTAssertEqual(dict.count, 1U);
-  XCTAssertTrue([dict getInt32:NULL forKey:YES]);
-  XCTAssertTrue([dict getInt32:&value forKey:YES]);
-  XCTAssertEqual(value, 200);
-  XCTAssertFalse([dict getInt32:NULL forKey:NO]);
-
-  [dict removeAll];
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertFalse([dict getInt32:NULL forKey:YES]);
-  XCTAssertFalse([dict getInt32:NULL forKey:NO]);
-  [dict release];
-}
-
-- (void)testInplaceMutation {
-  const BOOL kKeys[] = { YES, NO };
-  const int32_t kValues[] = { 200, 201 };
-  GPBBoolInt32Dictionary *dict =
-      [[GPBBoolInt32Dictionary alloc] initWithInt32s:kValues
-                                             forKeys:kKeys
-                                               count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 2U);
-  int32_t value;
-  XCTAssertTrue([dict getInt32:NULL forKey:YES]);
-  XCTAssertTrue([dict getInt32:&value forKey:YES]);
-  XCTAssertEqual(value, 200);
-  XCTAssertTrue([dict getInt32:NULL forKey:NO]);
-  XCTAssertTrue([dict getInt32:&value forKey:NO]);
-  XCTAssertEqual(value, 201);
-
-  [dict setInt32:201 forKey:YES];
-  XCTAssertEqual(dict.count, 2U);
-  XCTAssertTrue([dict getInt32:NULL forKey:YES]);
-  XCTAssertTrue([dict getInt32:&value forKey:YES]);
-  XCTAssertEqual(value, 201);
-  XCTAssertTrue([dict getInt32:NULL forKey:NO]);
-  XCTAssertTrue([dict getInt32:&value forKey:NO]);
-  XCTAssertEqual(value, 201);
-
-  [dict setInt32:200 forKey:NO];
-  XCTAssertEqual(dict.count, 2U);
-  XCTAssertTrue([dict getInt32:NULL forKey:YES]);
-  XCTAssertTrue([dict getInt32:&value forKey:YES]);
-  XCTAssertEqual(value, 201);
-  XCTAssertTrue([dict getInt32:NULL forKey:NO]);
-  XCTAssertTrue([dict getInt32:&value forKey:NO]);
-  XCTAssertEqual(value, 200);
-
-  const BOOL kKeys2[] = { NO, YES };
-  const int32_t kValues2[] = { 201, 200 };
-  GPBBoolInt32Dictionary *dict2 =
-      [[GPBBoolInt32Dictionary alloc] initWithInt32s:kValues2
-                                             forKeys:kKeys2
-                                               count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(dict2);
-  [dict addEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 2U);
-  XCTAssertTrue([dict getInt32:NULL forKey:YES]);
-  XCTAssertTrue([dict getInt32:&value forKey:YES]);
-  XCTAssertEqual(value, 200);
-  XCTAssertTrue([dict getInt32:NULL forKey:NO]);
-  XCTAssertTrue([dict getInt32:&value forKey:NO]);
-  XCTAssertEqual(value, 201);
-
-  [dict2 release];
-  [dict release];
-}
-
-@end
-
-// clang-format on
-//%PDDM-EXPAND BOOL_TESTS_FOR_POD_VALUE(UInt64, uint64_t, 300U, 301U)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-#pragma mark - Bool -> UInt64
-
-@interface GPBBoolUInt64DictionaryTests : XCTestCase
-@end
-
-@implementation GPBBoolUInt64DictionaryTests
-
-- (void)testEmpty {
-  GPBBoolUInt64Dictionary *dict = [[GPBBoolUInt64Dictionary alloc] init];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertFalse([dict getUInt64:NULL forKey:YES]);
-  [dict enumerateKeysAndUInt64sUsingBlock:^(BOOL aKey, uint64_t aValue, BOOL *stop) {
-    #pragma unused(aKey, aValue, stop)
-    XCTFail(@"Shouldn't get here!");
-  }];
-  [dict release];
-}
-
-- (void)testOne {
-  GPBBoolUInt64Dictionary *dict = [[GPBBoolUInt64Dictionary alloc] init];
-  [dict setUInt64:300U forKey:YES];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 1U);
-  uint64_t value;
-  XCTAssertTrue([dict getUInt64:NULL forKey:YES]);
-  XCTAssertTrue([dict getUInt64:&value forKey:YES]);
-  XCTAssertEqual(value, 300U);
-  XCTAssertFalse([dict getUInt64:NULL forKey:NO]);
-  [dict enumerateKeysAndUInt64sUsingBlock:^(BOOL aKey, uint64_t aValue, BOOL *stop) {
-    XCTAssertEqual(aKey, YES);
-    XCTAssertEqual(aValue, 300U);
-    XCTAssertNotEqual(stop, NULL);
-  }];
-  [dict release];
-}
-
-- (void)testBasics {
-  const BOOL kKeys[] = { YES, NO };
-  const uint64_t kValues[] = { 300U, 301U };
-  GPBBoolUInt64Dictionary *dict =
-      [[GPBBoolUInt64Dictionary alloc] initWithUInt64s:kValues
-                                               forKeys:kKeys
-                                                 count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 2U);
-  uint64_t value;
-  XCTAssertTrue([dict getUInt64:NULL forKey:YES]);
-  XCTAssertTrue([dict getUInt64:&value forKey:YES]);
-  XCTAssertEqual(value, 300U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:NO]);
-  XCTAssertTrue([dict getUInt64:&value forKey:NO]);
-  XCTAssertEqual(value, 301U);
-
-  __block NSUInteger idx = 0;
-  BOOL *seenKeys = malloc(2 * sizeof(BOOL));
-  uint64_t *seenValues = malloc(2 * sizeof(uint64_t));
-  [dict enumerateKeysAndUInt64sUsingBlock:^(BOOL aKey, uint64_t aValue, BOOL *stop) {
-    XCTAssertLessThan(idx, 2U);
-    seenKeys[idx] = aKey;
-    seenValues[idx] = aValue;
-    XCTAssertNotEqual(stop, NULL);
-    ++idx;
-  }];
-  for (int i = 0; i < 2; ++i) {
-    BOOL foundKey = NO;
-    for (int j = 0; (j < 2) && !foundKey; ++j) {
-      if (kKeys[i] == seenKeys[j]) {
-        foundKey = YES;
-        XCTAssertEqual(kValues[i], seenValues[j], @"i = %d, j = %d", i, j);
-      }
-    }
-    XCTAssertTrue(foundKey, @"i = %d", i);
-  }
-  free(seenKeys);
-  free(seenValues);
-
-  // Stopping the enumeration.
-  idx = 0;
-  [dict enumerateKeysAndUInt64sUsingBlock:^(BOOL aKey, uint64_t aValue, BOOL *stop) {
-    #pragma unused(aKey, aValue)
-    if (idx == 0) *stop = YES;
-    XCTAssertNotEqual(idx, 2U);
-    ++idx;
-  }];
-  [dict release];
-}
-
-- (void)testEquality {
-  const BOOL kKeys1[] = { YES, NO };
-  const BOOL kKeys2[] = { NO, YES };
-  const uint64_t kValues1[] = { 300U, 301U };
-  const uint64_t kValues2[] = { 301U, 300U };
-  const uint64_t kValues3[] = { 301U };
-  GPBBoolUInt64Dictionary *dict1 =
-      [[GPBBoolUInt64Dictionary alloc] initWithUInt64s:kValues1
-                                               forKeys:kKeys1
-                                                 count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict1);
-  GPBBoolUInt64Dictionary *dict1prime =
-      [[GPBBoolUInt64Dictionary alloc] initWithUInt64s:kValues1
-                                               forKeys:kKeys1
-                                                 count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict1prime);
-  GPBBoolUInt64Dictionary *dict2 =
-      [[GPBBoolUInt64Dictionary alloc] initWithUInt64s:kValues2
-                                               forKeys:kKeys1
-                                                 count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(dict2);
-  GPBBoolUInt64Dictionary *dict3 =
-      [[GPBBoolUInt64Dictionary alloc] initWithUInt64s:kValues1
-                                               forKeys:kKeys2
-                                                 count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict3);
-  GPBBoolUInt64Dictionary *dict4 =
-      [[GPBBoolUInt64Dictionary alloc] initWithUInt64s:kValues3
-                                               forKeys:kKeys1
-                                                 count:GPBARRAYSIZE(kValues3)];
-  XCTAssertNotNil(dict4);
-
-  // 1/1Prime should be different objects, but equal.
-  XCTAssertNotEqual(dict1, dict1prime);
-  XCTAssertEqualObjects(dict1, dict1prime);
-  // Equal, so they must have same hash.
-  XCTAssertEqual([dict1 hash], [dict1prime hash]);
-
-  // 2 is same keys, different values; not equal.
-  XCTAssertNotEqualObjects(dict1, dict2);
-
-  // 3 is different keys, same values; not equal.
-  XCTAssertNotEqualObjects(dict1, dict3);
-
-  // 4 Fewer pairs; not equal
-  XCTAssertNotEqualObjects(dict1, dict4);
-
-  [dict1 release];
-  [dict1prime release];
-  [dict2 release];
-  [dict3 release];
-  [dict4 release];
-}
-
-- (void)testCopy {
-  const BOOL kKeys[] = { YES, NO };
-  const uint64_t kValues[] = { 300U, 301U };
-  GPBBoolUInt64Dictionary *dict =
-      [[GPBBoolUInt64Dictionary alloc] initWithUInt64s:kValues
-                                               forKeys:kKeys
-                                                 count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-
-  GPBBoolUInt64Dictionary *dict2 = [dict copy];
-  XCTAssertNotNil(dict2);
-
-  // Should be new object but equal.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  XCTAssertTrue([dict2 isKindOfClass:[GPBBoolUInt64Dictionary class]]);
-
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testDictionaryFromDictionary {
-  const BOOL kKeys[] = { YES, NO };
-  const uint64_t kValues[] = { 300U, 301U };
-  GPBBoolUInt64Dictionary *dict =
-      [[GPBBoolUInt64Dictionary alloc] initWithUInt64s:kValues
-                                               forKeys:kKeys
-                                                 count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-
-  GPBBoolUInt64Dictionary *dict2 =
-      [[GPBBoolUInt64Dictionary alloc] initWithDictionary:dict];
-  XCTAssertNotNil(dict2);
-
-  // Should be new pointer, but equal objects.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testAdds {
-  GPBBoolUInt64Dictionary *dict = [[GPBBoolUInt64Dictionary alloc] init];
-  XCTAssertNotNil(dict);
-
-  XCTAssertEqual(dict.count, 0U);
-  [dict setUInt64:300U forKey:YES];
-  XCTAssertEqual(dict.count, 1U);
-
-  const BOOL kKeys[] = { NO };
-  const uint64_t kValues[] = { 301U };
-  GPBBoolUInt64Dictionary *dict2 =
-      [[GPBBoolUInt64Dictionary alloc] initWithUInt64s:kValues
-                                               forKeys:kKeys
-                                                 count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict2);
-  [dict addEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 2U);
-
-  uint64_t value;
-  XCTAssertTrue([dict getUInt64:NULL forKey:YES]);
-  XCTAssertTrue([dict getUInt64:&value forKey:YES]);
-  XCTAssertEqual(value, 300U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:NO]);
-  XCTAssertTrue([dict getUInt64:&value forKey:NO]);
-  XCTAssertEqual(value, 301U);
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testRemove {
-  const BOOL kKeys[] = { YES, NO};
-  const uint64_t kValues[] = { 300U, 301U };
-  GPBBoolUInt64Dictionary *dict =
-      [[GPBBoolUInt64Dictionary alloc] initWithUInt64s:kValues
-                                        forKeys:kKeys
-                                          count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 2U);
-
-  [dict removeUInt64ForKey:NO];
-  XCTAssertEqual(dict.count, 1U);
-  uint64_t value;
-  XCTAssertTrue([dict getUInt64:NULL forKey:YES]);
-  XCTAssertTrue([dict getUInt64:&value forKey:YES]);
-  XCTAssertEqual(value, 300U);
-  XCTAssertFalse([dict getUInt64:NULL forKey:NO]);
-
-  // Remove again does nothing.
-  [dict removeUInt64ForKey:NO];
-  XCTAssertEqual(dict.count, 1U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:YES]);
-  XCTAssertTrue([dict getUInt64:&value forKey:YES]);
-  XCTAssertEqual(value, 300U);
-  XCTAssertFalse([dict getUInt64:NULL forKey:NO]);
-
-  [dict removeAll];
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertFalse([dict getUInt64:NULL forKey:YES]);
-  XCTAssertFalse([dict getUInt64:NULL forKey:NO]);
-  [dict release];
-}
-
-- (void)testInplaceMutation {
-  const BOOL kKeys[] = { YES, NO };
-  const uint64_t kValues[] = { 300U, 301U };
-  GPBBoolUInt64Dictionary *dict =
-      [[GPBBoolUInt64Dictionary alloc] initWithUInt64s:kValues
-                                               forKeys:kKeys
-                                                 count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 2U);
-  uint64_t value;
-  XCTAssertTrue([dict getUInt64:NULL forKey:YES]);
-  XCTAssertTrue([dict getUInt64:&value forKey:YES]);
-  XCTAssertEqual(value, 300U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:NO]);
-  XCTAssertTrue([dict getUInt64:&value forKey:NO]);
-  XCTAssertEqual(value, 301U);
-
-  [dict setUInt64:301U forKey:YES];
-  XCTAssertEqual(dict.count, 2U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:YES]);
-  XCTAssertTrue([dict getUInt64:&value forKey:YES]);
-  XCTAssertEqual(value, 301U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:NO]);
-  XCTAssertTrue([dict getUInt64:&value forKey:NO]);
-  XCTAssertEqual(value, 301U);
-
-  [dict setUInt64:300U forKey:NO];
-  XCTAssertEqual(dict.count, 2U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:YES]);
-  XCTAssertTrue([dict getUInt64:&value forKey:YES]);
-  XCTAssertEqual(value, 301U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:NO]);
-  XCTAssertTrue([dict getUInt64:&value forKey:NO]);
-  XCTAssertEqual(value, 300U);
-
-  const BOOL kKeys2[] = { NO, YES };
-  const uint64_t kValues2[] = { 301U, 300U };
-  GPBBoolUInt64Dictionary *dict2 =
-      [[GPBBoolUInt64Dictionary alloc] initWithUInt64s:kValues2
-                                               forKeys:kKeys2
-                                                 count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(dict2);
-  [dict addEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 2U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:YES]);
-  XCTAssertTrue([dict getUInt64:&value forKey:YES]);
-  XCTAssertEqual(value, 300U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:NO]);
-  XCTAssertTrue([dict getUInt64:&value forKey:NO]);
-  XCTAssertEqual(value, 301U);
-
-  [dict2 release];
-  [dict release];
-}
-
-@end
-
-// clang-format on
-//%PDDM-EXPAND BOOL_TESTS_FOR_POD_VALUE(Int64, int64_t, 400, 401)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-#pragma mark - Bool -> Int64
-
-@interface GPBBoolInt64DictionaryTests : XCTestCase
-@end
-
-@implementation GPBBoolInt64DictionaryTests
-
-- (void)testEmpty {
-  GPBBoolInt64Dictionary *dict = [[GPBBoolInt64Dictionary alloc] init];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertFalse([dict getInt64:NULL forKey:YES]);
-  [dict enumerateKeysAndInt64sUsingBlock:^(BOOL aKey, int64_t aValue, BOOL *stop) {
-    #pragma unused(aKey, aValue, stop)
-    XCTFail(@"Shouldn't get here!");
-  }];
-  [dict release];
-}
-
-- (void)testOne {
-  GPBBoolInt64Dictionary *dict = [[GPBBoolInt64Dictionary alloc] init];
-  [dict setInt64:400 forKey:YES];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 1U);
-  int64_t value;
-  XCTAssertTrue([dict getInt64:NULL forKey:YES]);
-  XCTAssertTrue([dict getInt64:&value forKey:YES]);
-  XCTAssertEqual(value, 400);
-  XCTAssertFalse([dict getInt64:NULL forKey:NO]);
-  [dict enumerateKeysAndInt64sUsingBlock:^(BOOL aKey, int64_t aValue, BOOL *stop) {
-    XCTAssertEqual(aKey, YES);
-    XCTAssertEqual(aValue, 400);
-    XCTAssertNotEqual(stop, NULL);
-  }];
-  [dict release];
-}
-
-- (void)testBasics {
-  const BOOL kKeys[] = { YES, NO };
-  const int64_t kValues[] = { 400, 401 };
-  GPBBoolInt64Dictionary *dict =
-      [[GPBBoolInt64Dictionary alloc] initWithInt64s:kValues
-                                             forKeys:kKeys
-                                               count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 2U);
-  int64_t value;
-  XCTAssertTrue([dict getInt64:NULL forKey:YES]);
-  XCTAssertTrue([dict getInt64:&value forKey:YES]);
-  XCTAssertEqual(value, 400);
-  XCTAssertTrue([dict getInt64:NULL forKey:NO]);
-  XCTAssertTrue([dict getInt64:&value forKey:NO]);
-  XCTAssertEqual(value, 401);
-
-  __block NSUInteger idx = 0;
-  BOOL *seenKeys = malloc(2 * sizeof(BOOL));
-  int64_t *seenValues = malloc(2 * sizeof(int64_t));
-  [dict enumerateKeysAndInt64sUsingBlock:^(BOOL aKey, int64_t aValue, BOOL *stop) {
-    XCTAssertLessThan(idx, 2U);
-    seenKeys[idx] = aKey;
-    seenValues[idx] = aValue;
-    XCTAssertNotEqual(stop, NULL);
-    ++idx;
-  }];
-  for (int i = 0; i < 2; ++i) {
-    BOOL foundKey = NO;
-    for (int j = 0; (j < 2) && !foundKey; ++j) {
-      if (kKeys[i] == seenKeys[j]) {
-        foundKey = YES;
-        XCTAssertEqual(kValues[i], seenValues[j], @"i = %d, j = %d", i, j);
-      }
-    }
-    XCTAssertTrue(foundKey, @"i = %d", i);
-  }
-  free(seenKeys);
-  free(seenValues);
-
-  // Stopping the enumeration.
-  idx = 0;
-  [dict enumerateKeysAndInt64sUsingBlock:^(BOOL aKey, int64_t aValue, BOOL *stop) {
-    #pragma unused(aKey, aValue)
-    if (idx == 0) *stop = YES;
-    XCTAssertNotEqual(idx, 2U);
-    ++idx;
-  }];
-  [dict release];
-}
-
-- (void)testEquality {
-  const BOOL kKeys1[] = { YES, NO };
-  const BOOL kKeys2[] = { NO, YES };
-  const int64_t kValues1[] = { 400, 401 };
-  const int64_t kValues2[] = { 401, 400 };
-  const int64_t kValues3[] = { 401 };
-  GPBBoolInt64Dictionary *dict1 =
-      [[GPBBoolInt64Dictionary alloc] initWithInt64s:kValues1
-                                             forKeys:kKeys1
-                                               count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict1);
-  GPBBoolInt64Dictionary *dict1prime =
-      [[GPBBoolInt64Dictionary alloc] initWithInt64s:kValues1
-                                             forKeys:kKeys1
-                                               count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict1prime);
-  GPBBoolInt64Dictionary *dict2 =
-      [[GPBBoolInt64Dictionary alloc] initWithInt64s:kValues2
-                                             forKeys:kKeys1
-                                               count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(dict2);
-  GPBBoolInt64Dictionary *dict3 =
-      [[GPBBoolInt64Dictionary alloc] initWithInt64s:kValues1
-                                             forKeys:kKeys2
-                                               count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict3);
-  GPBBoolInt64Dictionary *dict4 =
-      [[GPBBoolInt64Dictionary alloc] initWithInt64s:kValues3
-                                             forKeys:kKeys1
-                                               count:GPBARRAYSIZE(kValues3)];
-  XCTAssertNotNil(dict4);
-
-  // 1/1Prime should be different objects, but equal.
-  XCTAssertNotEqual(dict1, dict1prime);
-  XCTAssertEqualObjects(dict1, dict1prime);
-  // Equal, so they must have same hash.
-  XCTAssertEqual([dict1 hash], [dict1prime hash]);
-
-  // 2 is same keys, different values; not equal.
-  XCTAssertNotEqualObjects(dict1, dict2);
-
-  // 3 is different keys, same values; not equal.
-  XCTAssertNotEqualObjects(dict1, dict3);
-
-  // 4 Fewer pairs; not equal
-  XCTAssertNotEqualObjects(dict1, dict4);
-
-  [dict1 release];
-  [dict1prime release];
-  [dict2 release];
-  [dict3 release];
-  [dict4 release];
-}
-
-- (void)testCopy {
-  const BOOL kKeys[] = { YES, NO };
-  const int64_t kValues[] = { 400, 401 };
-  GPBBoolInt64Dictionary *dict =
-      [[GPBBoolInt64Dictionary alloc] initWithInt64s:kValues
-                                             forKeys:kKeys
-                                               count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-
-  GPBBoolInt64Dictionary *dict2 = [dict copy];
-  XCTAssertNotNil(dict2);
-
-  // Should be new object but equal.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  XCTAssertTrue([dict2 isKindOfClass:[GPBBoolInt64Dictionary class]]);
-
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testDictionaryFromDictionary {
-  const BOOL kKeys[] = { YES, NO };
-  const int64_t kValues[] = { 400, 401 };
-  GPBBoolInt64Dictionary *dict =
-      [[GPBBoolInt64Dictionary alloc] initWithInt64s:kValues
-                                             forKeys:kKeys
-                                               count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-
-  GPBBoolInt64Dictionary *dict2 =
-      [[GPBBoolInt64Dictionary alloc] initWithDictionary:dict];
-  XCTAssertNotNil(dict2);
-
-  // Should be new pointer, but equal objects.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testAdds {
-  GPBBoolInt64Dictionary *dict = [[GPBBoolInt64Dictionary alloc] init];
-  XCTAssertNotNil(dict);
-
-  XCTAssertEqual(dict.count, 0U);
-  [dict setInt64:400 forKey:YES];
-  XCTAssertEqual(dict.count, 1U);
-
-  const BOOL kKeys[] = { NO };
-  const int64_t kValues[] = { 401 };
-  GPBBoolInt64Dictionary *dict2 =
-      [[GPBBoolInt64Dictionary alloc] initWithInt64s:kValues
-                                             forKeys:kKeys
-                                               count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict2);
-  [dict addEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 2U);
-
-  int64_t value;
-  XCTAssertTrue([dict getInt64:NULL forKey:YES]);
-  XCTAssertTrue([dict getInt64:&value forKey:YES]);
-  XCTAssertEqual(value, 400);
-  XCTAssertTrue([dict getInt64:NULL forKey:NO]);
-  XCTAssertTrue([dict getInt64:&value forKey:NO]);
-  XCTAssertEqual(value, 401);
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testRemove {
-  const BOOL kKeys[] = { YES, NO};
-  const int64_t kValues[] = { 400, 401 };
-  GPBBoolInt64Dictionary *dict =
-      [[GPBBoolInt64Dictionary alloc] initWithInt64s:kValues
-                                      forKeys:kKeys
-                                        count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 2U);
-
-  [dict removeInt64ForKey:NO];
-  XCTAssertEqual(dict.count, 1U);
-  int64_t value;
-  XCTAssertTrue([dict getInt64:NULL forKey:YES]);
-  XCTAssertTrue([dict getInt64:&value forKey:YES]);
-  XCTAssertEqual(value, 400);
-  XCTAssertFalse([dict getInt64:NULL forKey:NO]);
-
-  // Remove again does nothing.
-  [dict removeInt64ForKey:NO];
-  XCTAssertEqual(dict.count, 1U);
-  XCTAssertTrue([dict getInt64:NULL forKey:YES]);
-  XCTAssertTrue([dict getInt64:&value forKey:YES]);
-  XCTAssertEqual(value, 400);
-  XCTAssertFalse([dict getInt64:NULL forKey:NO]);
-
-  [dict removeAll];
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertFalse([dict getInt64:NULL forKey:YES]);
-  XCTAssertFalse([dict getInt64:NULL forKey:NO]);
-  [dict release];
-}
-
-- (void)testInplaceMutation {
-  const BOOL kKeys[] = { YES, NO };
-  const int64_t kValues[] = { 400, 401 };
-  GPBBoolInt64Dictionary *dict =
-      [[GPBBoolInt64Dictionary alloc] initWithInt64s:kValues
-                                             forKeys:kKeys
-                                               count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 2U);
-  int64_t value;
-  XCTAssertTrue([dict getInt64:NULL forKey:YES]);
-  XCTAssertTrue([dict getInt64:&value forKey:YES]);
-  XCTAssertEqual(value, 400);
-  XCTAssertTrue([dict getInt64:NULL forKey:NO]);
-  XCTAssertTrue([dict getInt64:&value forKey:NO]);
-  XCTAssertEqual(value, 401);
-
-  [dict setInt64:401 forKey:YES];
-  XCTAssertEqual(dict.count, 2U);
-  XCTAssertTrue([dict getInt64:NULL forKey:YES]);
-  XCTAssertTrue([dict getInt64:&value forKey:YES]);
-  XCTAssertEqual(value, 401);
-  XCTAssertTrue([dict getInt64:NULL forKey:NO]);
-  XCTAssertTrue([dict getInt64:&value forKey:NO]);
-  XCTAssertEqual(value, 401);
-
-  [dict setInt64:400 forKey:NO];
-  XCTAssertEqual(dict.count, 2U);
-  XCTAssertTrue([dict getInt64:NULL forKey:YES]);
-  XCTAssertTrue([dict getInt64:&value forKey:YES]);
-  XCTAssertEqual(value, 401);
-  XCTAssertTrue([dict getInt64:NULL forKey:NO]);
-  XCTAssertTrue([dict getInt64:&value forKey:NO]);
-  XCTAssertEqual(value, 400);
-
-  const BOOL kKeys2[] = { NO, YES };
-  const int64_t kValues2[] = { 401, 400 };
-  GPBBoolInt64Dictionary *dict2 =
-      [[GPBBoolInt64Dictionary alloc] initWithInt64s:kValues2
-                                             forKeys:kKeys2
-                                               count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(dict2);
-  [dict addEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 2U);
-  XCTAssertTrue([dict getInt64:NULL forKey:YES]);
-  XCTAssertTrue([dict getInt64:&value forKey:YES]);
-  XCTAssertEqual(value, 400);
-  XCTAssertTrue([dict getInt64:NULL forKey:NO]);
-  XCTAssertTrue([dict getInt64:&value forKey:NO]);
-  XCTAssertEqual(value, 401);
-
-  [dict2 release];
-  [dict release];
-}
-
-@end
-
-// clang-format on
-//%PDDM-EXPAND BOOL_TESTS_FOR_POD_VALUE(Bool, BOOL, NO, YES)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-#pragma mark - Bool -> Bool
-
-@interface GPBBoolBoolDictionaryTests : XCTestCase
-@end
-
-@implementation GPBBoolBoolDictionaryTests
-
-- (void)testEmpty {
-  GPBBoolBoolDictionary *dict = [[GPBBoolBoolDictionary alloc] init];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertFalse([dict getBool:NULL forKey:YES]);
-  [dict enumerateKeysAndBoolsUsingBlock:^(BOOL aKey, BOOL aValue, BOOL *stop) {
-    #pragma unused(aKey, aValue, stop)
-    XCTFail(@"Shouldn't get here!");
-  }];
-  [dict release];
-}
-
-- (void)testOne {
-  GPBBoolBoolDictionary *dict = [[GPBBoolBoolDictionary alloc] init];
-  [dict setBool:NO forKey:YES];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 1U);
-  BOOL value;
-  XCTAssertTrue([dict getBool:NULL forKey:YES]);
-  XCTAssertTrue([dict getBool:&value forKey:YES]);
-  XCTAssertEqual(value, NO);
-  XCTAssertFalse([dict getBool:NULL forKey:NO]);
-  [dict enumerateKeysAndBoolsUsingBlock:^(BOOL aKey, BOOL aValue, BOOL *stop) {
-    XCTAssertEqual(aKey, YES);
-    XCTAssertEqual(aValue, NO);
-    XCTAssertNotEqual(stop, NULL);
-  }];
-  [dict release];
-}
-
-- (void)testBasics {
-  const BOOL kKeys[] = { YES, NO };
-  const BOOL kValues[] = { NO, YES };
-  GPBBoolBoolDictionary *dict =
-      [[GPBBoolBoolDictionary alloc] initWithBools:kValues
-                                           forKeys:kKeys
-                                             count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 2U);
-  BOOL value;
-  XCTAssertTrue([dict getBool:NULL forKey:YES]);
-  XCTAssertTrue([dict getBool:&value forKey:YES]);
-  XCTAssertEqual(value, NO);
-  XCTAssertTrue([dict getBool:NULL forKey:NO]);
-  XCTAssertTrue([dict getBool:&value forKey:NO]);
-  XCTAssertEqual(value, YES);
-
-  __block NSUInteger idx = 0;
-  BOOL *seenKeys = malloc(2 * sizeof(BOOL));
-  BOOL *seenValues = malloc(2 * sizeof(BOOL));
-  [dict enumerateKeysAndBoolsUsingBlock:^(BOOL aKey, BOOL aValue, BOOL *stop) {
-    XCTAssertLessThan(idx, 2U);
-    seenKeys[idx] = aKey;
-    seenValues[idx] = aValue;
-    XCTAssertNotEqual(stop, NULL);
-    ++idx;
-  }];
-  for (int i = 0; i < 2; ++i) {
-    BOOL foundKey = NO;
-    for (int j = 0; (j < 2) && !foundKey; ++j) {
-      if (kKeys[i] == seenKeys[j]) {
-        foundKey = YES;
-        XCTAssertEqual(kValues[i], seenValues[j], @"i = %d, j = %d", i, j);
-      }
-    }
-    XCTAssertTrue(foundKey, @"i = %d", i);
-  }
-  free(seenKeys);
-  free(seenValues);
-
-  // Stopping the enumeration.
-  idx = 0;
-  [dict enumerateKeysAndBoolsUsingBlock:^(BOOL aKey, BOOL aValue, BOOL *stop) {
-    #pragma unused(aKey, aValue)
-    if (idx == 0) *stop = YES;
-    XCTAssertNotEqual(idx, 2U);
-    ++idx;
-  }];
-  [dict release];
-}
-
-- (void)testEquality {
-  const BOOL kKeys1[] = { YES, NO };
-  const BOOL kKeys2[] = { NO, YES };
-  const BOOL kValues1[] = { NO, YES };
-  const BOOL kValues2[] = { YES, NO };
-  const BOOL kValues3[] = { YES };
-  GPBBoolBoolDictionary *dict1 =
-      [[GPBBoolBoolDictionary alloc] initWithBools:kValues1
-                                           forKeys:kKeys1
-                                             count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict1);
-  GPBBoolBoolDictionary *dict1prime =
-      [[GPBBoolBoolDictionary alloc] initWithBools:kValues1
-                                           forKeys:kKeys1
-                                             count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict1prime);
-  GPBBoolBoolDictionary *dict2 =
-      [[GPBBoolBoolDictionary alloc] initWithBools:kValues2
-                                           forKeys:kKeys1
-                                             count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(dict2);
-  GPBBoolBoolDictionary *dict3 =
-      [[GPBBoolBoolDictionary alloc] initWithBools:kValues1
-                                           forKeys:kKeys2
-                                             count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict3);
-  GPBBoolBoolDictionary *dict4 =
-      [[GPBBoolBoolDictionary alloc] initWithBools:kValues3
-                                           forKeys:kKeys1
-                                             count:GPBARRAYSIZE(kValues3)];
-  XCTAssertNotNil(dict4);
-
-  // 1/1Prime should be different objects, but equal.
-  XCTAssertNotEqual(dict1, dict1prime);
-  XCTAssertEqualObjects(dict1, dict1prime);
-  // Equal, so they must have same hash.
-  XCTAssertEqual([dict1 hash], [dict1prime hash]);
-
-  // 2 is same keys, different values; not equal.
-  XCTAssertNotEqualObjects(dict1, dict2);
-
-  // 3 is different keys, same values; not equal.
-  XCTAssertNotEqualObjects(dict1, dict3);
-
-  // 4 Fewer pairs; not equal
-  XCTAssertNotEqualObjects(dict1, dict4);
-
-  [dict1 release];
-  [dict1prime release];
-  [dict2 release];
-  [dict3 release];
-  [dict4 release];
-}
-
-- (void)testCopy {
-  const BOOL kKeys[] = { YES, NO };
-  const BOOL kValues[] = { NO, YES };
-  GPBBoolBoolDictionary *dict =
-      [[GPBBoolBoolDictionary alloc] initWithBools:kValues
-                                           forKeys:kKeys
-                                             count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-
-  GPBBoolBoolDictionary *dict2 = [dict copy];
-  XCTAssertNotNil(dict2);
-
-  // Should be new object but equal.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  XCTAssertTrue([dict2 isKindOfClass:[GPBBoolBoolDictionary class]]);
-
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testDictionaryFromDictionary {
-  const BOOL kKeys[] = { YES, NO };
-  const BOOL kValues[] = { NO, YES };
-  GPBBoolBoolDictionary *dict =
-      [[GPBBoolBoolDictionary alloc] initWithBools:kValues
-                                           forKeys:kKeys
-                                             count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-
-  GPBBoolBoolDictionary *dict2 =
-      [[GPBBoolBoolDictionary alloc] initWithDictionary:dict];
-  XCTAssertNotNil(dict2);
-
-  // Should be new pointer, but equal objects.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testAdds {
-  GPBBoolBoolDictionary *dict = [[GPBBoolBoolDictionary alloc] init];
-  XCTAssertNotNil(dict);
-
-  XCTAssertEqual(dict.count, 0U);
-  [dict setBool:NO forKey:YES];
-  XCTAssertEqual(dict.count, 1U);
-
-  const BOOL kKeys[] = { NO };
-  const BOOL kValues[] = { YES };
-  GPBBoolBoolDictionary *dict2 =
-      [[GPBBoolBoolDictionary alloc] initWithBools:kValues
-                                           forKeys:kKeys
-                                             count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict2);
-  [dict addEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 2U);
-
-  BOOL value;
-  XCTAssertTrue([dict getBool:NULL forKey:YES]);
-  XCTAssertTrue([dict getBool:&value forKey:YES]);
-  XCTAssertEqual(value, NO);
-  XCTAssertTrue([dict getBool:NULL forKey:NO]);
-  XCTAssertTrue([dict getBool:&value forKey:NO]);
-  XCTAssertEqual(value, YES);
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testRemove {
-  const BOOL kKeys[] = { YES, NO};
-  const BOOL kValues[] = { NO, YES };
-  GPBBoolBoolDictionary *dict =
-      [[GPBBoolBoolDictionary alloc] initWithBools:kValues
-                                    forKeys:kKeys
-                                      count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 2U);
-
-  [dict removeBoolForKey:NO];
-  XCTAssertEqual(dict.count, 1U);
-  BOOL value;
-  XCTAssertTrue([dict getBool:NULL forKey:YES]);
-  XCTAssertTrue([dict getBool:&value forKey:YES]);
-  XCTAssertEqual(value, NO);
-  XCTAssertFalse([dict getBool:NULL forKey:NO]);
-
-  // Remove again does nothing.
-  [dict removeBoolForKey:NO];
-  XCTAssertEqual(dict.count, 1U);
-  XCTAssertTrue([dict getBool:NULL forKey:YES]);
-  XCTAssertTrue([dict getBool:&value forKey:YES]);
-  XCTAssertEqual(value, NO);
-  XCTAssertFalse([dict getBool:NULL forKey:NO]);
-
-  [dict removeAll];
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertFalse([dict getBool:NULL forKey:YES]);
-  XCTAssertFalse([dict getBool:NULL forKey:NO]);
-  [dict release];
-}
-
-- (void)testInplaceMutation {
-  const BOOL kKeys[] = { YES, NO };
-  const BOOL kValues[] = { NO, YES };
-  GPBBoolBoolDictionary *dict =
-      [[GPBBoolBoolDictionary alloc] initWithBools:kValues
-                                           forKeys:kKeys
-                                             count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 2U);
-  BOOL value;
-  XCTAssertTrue([dict getBool:NULL forKey:YES]);
-  XCTAssertTrue([dict getBool:&value forKey:YES]);
-  XCTAssertEqual(value, NO);
-  XCTAssertTrue([dict getBool:NULL forKey:NO]);
-  XCTAssertTrue([dict getBool:&value forKey:NO]);
-  XCTAssertEqual(value, YES);
-
-  [dict setBool:YES forKey:YES];
-  XCTAssertEqual(dict.count, 2U);
-  XCTAssertTrue([dict getBool:NULL forKey:YES]);
-  XCTAssertTrue([dict getBool:&value forKey:YES]);
-  XCTAssertEqual(value, YES);
-  XCTAssertTrue([dict getBool:NULL forKey:NO]);
-  XCTAssertTrue([dict getBool:&value forKey:NO]);
-  XCTAssertEqual(value, YES);
-
-  [dict setBool:NO forKey:NO];
-  XCTAssertEqual(dict.count, 2U);
-  XCTAssertTrue([dict getBool:NULL forKey:YES]);
-  XCTAssertTrue([dict getBool:&value forKey:YES]);
-  XCTAssertEqual(value, YES);
-  XCTAssertTrue([dict getBool:NULL forKey:NO]);
-  XCTAssertTrue([dict getBool:&value forKey:NO]);
-  XCTAssertEqual(value, NO);
-
-  const BOOL kKeys2[] = { NO, YES };
-  const BOOL kValues2[] = { YES, NO };
-  GPBBoolBoolDictionary *dict2 =
-      [[GPBBoolBoolDictionary alloc] initWithBools:kValues2
-                                           forKeys:kKeys2
-                                             count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(dict2);
-  [dict addEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 2U);
-  XCTAssertTrue([dict getBool:NULL forKey:YES]);
-  XCTAssertTrue([dict getBool:&value forKey:YES]);
-  XCTAssertEqual(value, NO);
-  XCTAssertTrue([dict getBool:NULL forKey:NO]);
-  XCTAssertTrue([dict getBool:&value forKey:NO]);
-  XCTAssertEqual(value, YES);
-
-  [dict2 release];
-  [dict release];
-}
-
-@end
-
-// clang-format on
-//%PDDM-EXPAND BOOL_TESTS_FOR_POD_VALUE(Float, float, 500.f, 501.f)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-#pragma mark - Bool -> Float
-
-@interface GPBBoolFloatDictionaryTests : XCTestCase
-@end
-
-@implementation GPBBoolFloatDictionaryTests
-
-- (void)testEmpty {
-  GPBBoolFloatDictionary *dict = [[GPBBoolFloatDictionary alloc] init];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertFalse([dict getFloat:NULL forKey:YES]);
-  [dict enumerateKeysAndFloatsUsingBlock:^(BOOL aKey, float aValue, BOOL *stop) {
-    #pragma unused(aKey, aValue, stop)
-    XCTFail(@"Shouldn't get here!");
-  }];
-  [dict release];
-}
-
-- (void)testOne {
-  GPBBoolFloatDictionary *dict = [[GPBBoolFloatDictionary alloc] init];
-  [dict setFloat:500.f forKey:YES];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 1U);
-  float value;
-  XCTAssertTrue([dict getFloat:NULL forKey:YES]);
-  XCTAssertTrue([dict getFloat:&value forKey:YES]);
-  XCTAssertEqual(value, 500.f);
-  XCTAssertFalse([dict getFloat:NULL forKey:NO]);
-  [dict enumerateKeysAndFloatsUsingBlock:^(BOOL aKey, float aValue, BOOL *stop) {
-    XCTAssertEqual(aKey, YES);
-    XCTAssertEqual(aValue, 500.f);
-    XCTAssertNotEqual(stop, NULL);
-  }];
-  [dict release];
-}
-
-- (void)testBasics {
-  const BOOL kKeys[] = { YES, NO };
-  const float kValues[] = { 500.f, 501.f };
-  GPBBoolFloatDictionary *dict =
-      [[GPBBoolFloatDictionary alloc] initWithFloats:kValues
-                                             forKeys:kKeys
-                                               count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 2U);
-  float value;
-  XCTAssertTrue([dict getFloat:NULL forKey:YES]);
-  XCTAssertTrue([dict getFloat:&value forKey:YES]);
-  XCTAssertEqual(value, 500.f);
-  XCTAssertTrue([dict getFloat:NULL forKey:NO]);
-  XCTAssertTrue([dict getFloat:&value forKey:NO]);
-  XCTAssertEqual(value, 501.f);
-
-  __block NSUInteger idx = 0;
-  BOOL *seenKeys = malloc(2 * sizeof(BOOL));
-  float *seenValues = malloc(2 * sizeof(float));
-  [dict enumerateKeysAndFloatsUsingBlock:^(BOOL aKey, float aValue, BOOL *stop) {
-    XCTAssertLessThan(idx, 2U);
-    seenKeys[idx] = aKey;
-    seenValues[idx] = aValue;
-    XCTAssertNotEqual(stop, NULL);
-    ++idx;
-  }];
-  for (int i = 0; i < 2; ++i) {
-    BOOL foundKey = NO;
-    for (int j = 0; (j < 2) && !foundKey; ++j) {
-      if (kKeys[i] == seenKeys[j]) {
-        foundKey = YES;
-        XCTAssertEqual(kValues[i], seenValues[j], @"i = %d, j = %d", i, j);
-      }
-    }
-    XCTAssertTrue(foundKey, @"i = %d", i);
-  }
-  free(seenKeys);
-  free(seenValues);
-
-  // Stopping the enumeration.
-  idx = 0;
-  [dict enumerateKeysAndFloatsUsingBlock:^(BOOL aKey, float aValue, BOOL *stop) {
-    #pragma unused(aKey, aValue)
-    if (idx == 0) *stop = YES;
-    XCTAssertNotEqual(idx, 2U);
-    ++idx;
-  }];
-  [dict release];
-}
-
-- (void)testEquality {
-  const BOOL kKeys1[] = { YES, NO };
-  const BOOL kKeys2[] = { NO, YES };
-  const float kValues1[] = { 500.f, 501.f };
-  const float kValues2[] = { 501.f, 500.f };
-  const float kValues3[] = { 501.f };
-  GPBBoolFloatDictionary *dict1 =
-      [[GPBBoolFloatDictionary alloc] initWithFloats:kValues1
-                                             forKeys:kKeys1
-                                               count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict1);
-  GPBBoolFloatDictionary *dict1prime =
-      [[GPBBoolFloatDictionary alloc] initWithFloats:kValues1
-                                             forKeys:kKeys1
-                                               count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict1prime);
-  GPBBoolFloatDictionary *dict2 =
-      [[GPBBoolFloatDictionary alloc] initWithFloats:kValues2
-                                             forKeys:kKeys1
-                                               count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(dict2);
-  GPBBoolFloatDictionary *dict3 =
-      [[GPBBoolFloatDictionary alloc] initWithFloats:kValues1
-                                             forKeys:kKeys2
-                                               count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict3);
-  GPBBoolFloatDictionary *dict4 =
-      [[GPBBoolFloatDictionary alloc] initWithFloats:kValues3
-                                             forKeys:kKeys1
-                                               count:GPBARRAYSIZE(kValues3)];
-  XCTAssertNotNil(dict4);
-
-  // 1/1Prime should be different objects, but equal.
-  XCTAssertNotEqual(dict1, dict1prime);
-  XCTAssertEqualObjects(dict1, dict1prime);
-  // Equal, so they must have same hash.
-  XCTAssertEqual([dict1 hash], [dict1prime hash]);
-
-  // 2 is same keys, different values; not equal.
-  XCTAssertNotEqualObjects(dict1, dict2);
-
-  // 3 is different keys, same values; not equal.
-  XCTAssertNotEqualObjects(dict1, dict3);
-
-  // 4 Fewer pairs; not equal
-  XCTAssertNotEqualObjects(dict1, dict4);
-
-  [dict1 release];
-  [dict1prime release];
-  [dict2 release];
-  [dict3 release];
-  [dict4 release];
-}
-
-- (void)testCopy {
-  const BOOL kKeys[] = { YES, NO };
-  const float kValues[] = { 500.f, 501.f };
-  GPBBoolFloatDictionary *dict =
-      [[GPBBoolFloatDictionary alloc] initWithFloats:kValues
-                                             forKeys:kKeys
-                                               count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-
-  GPBBoolFloatDictionary *dict2 = [dict copy];
-  XCTAssertNotNil(dict2);
-
-  // Should be new object but equal.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  XCTAssertTrue([dict2 isKindOfClass:[GPBBoolFloatDictionary class]]);
-
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testDictionaryFromDictionary {
-  const BOOL kKeys[] = { YES, NO };
-  const float kValues[] = { 500.f, 501.f };
-  GPBBoolFloatDictionary *dict =
-      [[GPBBoolFloatDictionary alloc] initWithFloats:kValues
-                                             forKeys:kKeys
-                                               count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-
-  GPBBoolFloatDictionary *dict2 =
-      [[GPBBoolFloatDictionary alloc] initWithDictionary:dict];
-  XCTAssertNotNil(dict2);
-
-  // Should be new pointer, but equal objects.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testAdds {
-  GPBBoolFloatDictionary *dict = [[GPBBoolFloatDictionary alloc] init];
-  XCTAssertNotNil(dict);
-
-  XCTAssertEqual(dict.count, 0U);
-  [dict setFloat:500.f forKey:YES];
-  XCTAssertEqual(dict.count, 1U);
-
-  const BOOL kKeys[] = { NO };
-  const float kValues[] = { 501.f };
-  GPBBoolFloatDictionary *dict2 =
-      [[GPBBoolFloatDictionary alloc] initWithFloats:kValues
-                                             forKeys:kKeys
-                                               count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict2);
-  [dict addEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 2U);
-
-  float value;
-  XCTAssertTrue([dict getFloat:NULL forKey:YES]);
-  XCTAssertTrue([dict getFloat:&value forKey:YES]);
-  XCTAssertEqual(value, 500.f);
-  XCTAssertTrue([dict getFloat:NULL forKey:NO]);
-  XCTAssertTrue([dict getFloat:&value forKey:NO]);
-  XCTAssertEqual(value, 501.f);
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testRemove {
-  const BOOL kKeys[] = { YES, NO};
-  const float kValues[] = { 500.f, 501.f };
-  GPBBoolFloatDictionary *dict =
-      [[GPBBoolFloatDictionary alloc] initWithFloats:kValues
-                                      forKeys:kKeys
-                                        count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 2U);
-
-  [dict removeFloatForKey:NO];
-  XCTAssertEqual(dict.count, 1U);
-  float value;
-  XCTAssertTrue([dict getFloat:NULL forKey:YES]);
-  XCTAssertTrue([dict getFloat:&value forKey:YES]);
-  XCTAssertEqual(value, 500.f);
-  XCTAssertFalse([dict getFloat:NULL forKey:NO]);
-
-  // Remove again does nothing.
-  [dict removeFloatForKey:NO];
-  XCTAssertEqual(dict.count, 1U);
-  XCTAssertTrue([dict getFloat:NULL forKey:YES]);
-  XCTAssertTrue([dict getFloat:&value forKey:YES]);
-  XCTAssertEqual(value, 500.f);
-  XCTAssertFalse([dict getFloat:NULL forKey:NO]);
-
-  [dict removeAll];
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertFalse([dict getFloat:NULL forKey:YES]);
-  XCTAssertFalse([dict getFloat:NULL forKey:NO]);
-  [dict release];
-}
-
-- (void)testInplaceMutation {
-  const BOOL kKeys[] = { YES, NO };
-  const float kValues[] = { 500.f, 501.f };
-  GPBBoolFloatDictionary *dict =
-      [[GPBBoolFloatDictionary alloc] initWithFloats:kValues
-                                             forKeys:kKeys
-                                               count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 2U);
-  float value;
-  XCTAssertTrue([dict getFloat:NULL forKey:YES]);
-  XCTAssertTrue([dict getFloat:&value forKey:YES]);
-  XCTAssertEqual(value, 500.f);
-  XCTAssertTrue([dict getFloat:NULL forKey:NO]);
-  XCTAssertTrue([dict getFloat:&value forKey:NO]);
-  XCTAssertEqual(value, 501.f);
-
-  [dict setFloat:501.f forKey:YES];
-  XCTAssertEqual(dict.count, 2U);
-  XCTAssertTrue([dict getFloat:NULL forKey:YES]);
-  XCTAssertTrue([dict getFloat:&value forKey:YES]);
-  XCTAssertEqual(value, 501.f);
-  XCTAssertTrue([dict getFloat:NULL forKey:NO]);
-  XCTAssertTrue([dict getFloat:&value forKey:NO]);
-  XCTAssertEqual(value, 501.f);
-
-  [dict setFloat:500.f forKey:NO];
-  XCTAssertEqual(dict.count, 2U);
-  XCTAssertTrue([dict getFloat:NULL forKey:YES]);
-  XCTAssertTrue([dict getFloat:&value forKey:YES]);
-  XCTAssertEqual(value, 501.f);
-  XCTAssertTrue([dict getFloat:NULL forKey:NO]);
-  XCTAssertTrue([dict getFloat:&value forKey:NO]);
-  XCTAssertEqual(value, 500.f);
-
-  const BOOL kKeys2[] = { NO, YES };
-  const float kValues2[] = { 501.f, 500.f };
-  GPBBoolFloatDictionary *dict2 =
-      [[GPBBoolFloatDictionary alloc] initWithFloats:kValues2
-                                             forKeys:kKeys2
-                                               count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(dict2);
-  [dict addEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 2U);
-  XCTAssertTrue([dict getFloat:NULL forKey:YES]);
-  XCTAssertTrue([dict getFloat:&value forKey:YES]);
-  XCTAssertEqual(value, 500.f);
-  XCTAssertTrue([dict getFloat:NULL forKey:NO]);
-  XCTAssertTrue([dict getFloat:&value forKey:NO]);
-  XCTAssertEqual(value, 501.f);
-
-  [dict2 release];
-  [dict release];
-}
-
-@end
-
-// clang-format on
-//%PDDM-EXPAND BOOL_TESTS_FOR_POD_VALUE(Double, double, 600., 601.)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-#pragma mark - Bool -> Double
-
-@interface GPBBoolDoubleDictionaryTests : XCTestCase
-@end
-
-@implementation GPBBoolDoubleDictionaryTests
-
-- (void)testEmpty {
-  GPBBoolDoubleDictionary *dict = [[GPBBoolDoubleDictionary alloc] init];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertFalse([dict getDouble:NULL forKey:YES]);
-  [dict enumerateKeysAndDoublesUsingBlock:^(BOOL aKey, double aValue, BOOL *stop) {
-    #pragma unused(aKey, aValue, stop)
-    XCTFail(@"Shouldn't get here!");
-  }];
-  [dict release];
-}
-
-- (void)testOne {
-  GPBBoolDoubleDictionary *dict = [[GPBBoolDoubleDictionary alloc] init];
-  [dict setDouble:600. forKey:YES];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 1U);
-  double value;
-  XCTAssertTrue([dict getDouble:NULL forKey:YES]);
-  XCTAssertTrue([dict getDouble:&value forKey:YES]);
-  XCTAssertEqual(value, 600.);
-  XCTAssertFalse([dict getDouble:NULL forKey:NO]);
-  [dict enumerateKeysAndDoublesUsingBlock:^(BOOL aKey, double aValue, BOOL *stop) {
-    XCTAssertEqual(aKey, YES);
-    XCTAssertEqual(aValue, 600.);
-    XCTAssertNotEqual(stop, NULL);
-  }];
-  [dict release];
-}
-
-- (void)testBasics {
-  const BOOL kKeys[] = { YES, NO };
-  const double kValues[] = { 600., 601. };
-  GPBBoolDoubleDictionary *dict =
-      [[GPBBoolDoubleDictionary alloc] initWithDoubles:kValues
-                                               forKeys:kKeys
-                                                 count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 2U);
-  double value;
-  XCTAssertTrue([dict getDouble:NULL forKey:YES]);
-  XCTAssertTrue([dict getDouble:&value forKey:YES]);
-  XCTAssertEqual(value, 600.);
-  XCTAssertTrue([dict getDouble:NULL forKey:NO]);
-  XCTAssertTrue([dict getDouble:&value forKey:NO]);
-  XCTAssertEqual(value, 601.);
-
-  __block NSUInteger idx = 0;
-  BOOL *seenKeys = malloc(2 * sizeof(BOOL));
-  double *seenValues = malloc(2 * sizeof(double));
-  [dict enumerateKeysAndDoublesUsingBlock:^(BOOL aKey, double aValue, BOOL *stop) {
-    XCTAssertLessThan(idx, 2U);
-    seenKeys[idx] = aKey;
-    seenValues[idx] = aValue;
-    XCTAssertNotEqual(stop, NULL);
-    ++idx;
-  }];
-  for (int i = 0; i < 2; ++i) {
-    BOOL foundKey = NO;
-    for (int j = 0; (j < 2) && !foundKey; ++j) {
-      if (kKeys[i] == seenKeys[j]) {
-        foundKey = YES;
-        XCTAssertEqual(kValues[i], seenValues[j], @"i = %d, j = %d", i, j);
-      }
-    }
-    XCTAssertTrue(foundKey, @"i = %d", i);
-  }
-  free(seenKeys);
-  free(seenValues);
-
-  // Stopping the enumeration.
-  idx = 0;
-  [dict enumerateKeysAndDoublesUsingBlock:^(BOOL aKey, double aValue, BOOL *stop) {
-    #pragma unused(aKey, aValue)
-    if (idx == 0) *stop = YES;
-    XCTAssertNotEqual(idx, 2U);
-    ++idx;
-  }];
-  [dict release];
-}
-
-- (void)testEquality {
-  const BOOL kKeys1[] = { YES, NO };
-  const BOOL kKeys2[] = { NO, YES };
-  const double kValues1[] = { 600., 601. };
-  const double kValues2[] = { 601., 600. };
-  const double kValues3[] = { 601. };
-  GPBBoolDoubleDictionary *dict1 =
-      [[GPBBoolDoubleDictionary alloc] initWithDoubles:kValues1
-                                               forKeys:kKeys1
-                                                 count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict1);
-  GPBBoolDoubleDictionary *dict1prime =
-      [[GPBBoolDoubleDictionary alloc] initWithDoubles:kValues1
-                                               forKeys:kKeys1
-                                                 count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict1prime);
-  GPBBoolDoubleDictionary *dict2 =
-      [[GPBBoolDoubleDictionary alloc] initWithDoubles:kValues2
-                                               forKeys:kKeys1
-                                                 count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(dict2);
-  GPBBoolDoubleDictionary *dict3 =
-      [[GPBBoolDoubleDictionary alloc] initWithDoubles:kValues1
-                                               forKeys:kKeys2
-                                                 count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict3);
-  GPBBoolDoubleDictionary *dict4 =
-      [[GPBBoolDoubleDictionary alloc] initWithDoubles:kValues3
-                                               forKeys:kKeys1
-                                                 count:GPBARRAYSIZE(kValues3)];
-  XCTAssertNotNil(dict4);
-
-  // 1/1Prime should be different objects, but equal.
-  XCTAssertNotEqual(dict1, dict1prime);
-  XCTAssertEqualObjects(dict1, dict1prime);
-  // Equal, so they must have same hash.
-  XCTAssertEqual([dict1 hash], [dict1prime hash]);
-
-  // 2 is same keys, different values; not equal.
-  XCTAssertNotEqualObjects(dict1, dict2);
-
-  // 3 is different keys, same values; not equal.
-  XCTAssertNotEqualObjects(dict1, dict3);
-
-  // 4 Fewer pairs; not equal
-  XCTAssertNotEqualObjects(dict1, dict4);
-
-  [dict1 release];
-  [dict1prime release];
-  [dict2 release];
-  [dict3 release];
-  [dict4 release];
-}
-
-- (void)testCopy {
-  const BOOL kKeys[] = { YES, NO };
-  const double kValues[] = { 600., 601. };
-  GPBBoolDoubleDictionary *dict =
-      [[GPBBoolDoubleDictionary alloc] initWithDoubles:kValues
-                                               forKeys:kKeys
-                                                 count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-
-  GPBBoolDoubleDictionary *dict2 = [dict copy];
-  XCTAssertNotNil(dict2);
-
-  // Should be new object but equal.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  XCTAssertTrue([dict2 isKindOfClass:[GPBBoolDoubleDictionary class]]);
-
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testDictionaryFromDictionary {
-  const BOOL kKeys[] = { YES, NO };
-  const double kValues[] = { 600., 601. };
-  GPBBoolDoubleDictionary *dict =
-      [[GPBBoolDoubleDictionary alloc] initWithDoubles:kValues
-                                               forKeys:kKeys
-                                                 count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-
-  GPBBoolDoubleDictionary *dict2 =
-      [[GPBBoolDoubleDictionary alloc] initWithDictionary:dict];
-  XCTAssertNotNil(dict2);
-
-  // Should be new pointer, but equal objects.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testAdds {
-  GPBBoolDoubleDictionary *dict = [[GPBBoolDoubleDictionary alloc] init];
-  XCTAssertNotNil(dict);
-
-  XCTAssertEqual(dict.count, 0U);
-  [dict setDouble:600. forKey:YES];
-  XCTAssertEqual(dict.count, 1U);
-
-  const BOOL kKeys[] = { NO };
-  const double kValues[] = { 601. };
-  GPBBoolDoubleDictionary *dict2 =
-      [[GPBBoolDoubleDictionary alloc] initWithDoubles:kValues
-                                               forKeys:kKeys
-                                                 count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict2);
-  [dict addEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 2U);
-
-  double value;
-  XCTAssertTrue([dict getDouble:NULL forKey:YES]);
-  XCTAssertTrue([dict getDouble:&value forKey:YES]);
-  XCTAssertEqual(value, 600.);
-  XCTAssertTrue([dict getDouble:NULL forKey:NO]);
-  XCTAssertTrue([dict getDouble:&value forKey:NO]);
-  XCTAssertEqual(value, 601.);
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testRemove {
-  const BOOL kKeys[] = { YES, NO};
-  const double kValues[] = { 600., 601. };
-  GPBBoolDoubleDictionary *dict =
-      [[GPBBoolDoubleDictionary alloc] initWithDoubles:kValues
-                                        forKeys:kKeys
-                                          count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 2U);
-
-  [dict removeDoubleForKey:NO];
-  XCTAssertEqual(dict.count, 1U);
-  double value;
-  XCTAssertTrue([dict getDouble:NULL forKey:YES]);
-  XCTAssertTrue([dict getDouble:&value forKey:YES]);
-  XCTAssertEqual(value, 600.);
-  XCTAssertFalse([dict getDouble:NULL forKey:NO]);
-
-  // Remove again does nothing.
-  [dict removeDoubleForKey:NO];
-  XCTAssertEqual(dict.count, 1U);
-  XCTAssertTrue([dict getDouble:NULL forKey:YES]);
-  XCTAssertTrue([dict getDouble:&value forKey:YES]);
-  XCTAssertEqual(value, 600.);
-  XCTAssertFalse([dict getDouble:NULL forKey:NO]);
-
-  [dict removeAll];
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertFalse([dict getDouble:NULL forKey:YES]);
-  XCTAssertFalse([dict getDouble:NULL forKey:NO]);
-  [dict release];
-}
-
-- (void)testInplaceMutation {
-  const BOOL kKeys[] = { YES, NO };
-  const double kValues[] = { 600., 601. };
-  GPBBoolDoubleDictionary *dict =
-      [[GPBBoolDoubleDictionary alloc] initWithDoubles:kValues
-                                               forKeys:kKeys
-                                                 count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 2U);
-  double value;
-  XCTAssertTrue([dict getDouble:NULL forKey:YES]);
-  XCTAssertTrue([dict getDouble:&value forKey:YES]);
-  XCTAssertEqual(value, 600.);
-  XCTAssertTrue([dict getDouble:NULL forKey:NO]);
-  XCTAssertTrue([dict getDouble:&value forKey:NO]);
-  XCTAssertEqual(value, 601.);
-
-  [dict setDouble:601. forKey:YES];
-  XCTAssertEqual(dict.count, 2U);
-  XCTAssertTrue([dict getDouble:NULL forKey:YES]);
-  XCTAssertTrue([dict getDouble:&value forKey:YES]);
-  XCTAssertEqual(value, 601.);
-  XCTAssertTrue([dict getDouble:NULL forKey:NO]);
-  XCTAssertTrue([dict getDouble:&value forKey:NO]);
-  XCTAssertEqual(value, 601.);
-
-  [dict setDouble:600. forKey:NO];
-  XCTAssertEqual(dict.count, 2U);
-  XCTAssertTrue([dict getDouble:NULL forKey:YES]);
-  XCTAssertTrue([dict getDouble:&value forKey:YES]);
-  XCTAssertEqual(value, 601.);
-  XCTAssertTrue([dict getDouble:NULL forKey:NO]);
-  XCTAssertTrue([dict getDouble:&value forKey:NO]);
-  XCTAssertEqual(value, 600.);
-
-  const BOOL kKeys2[] = { NO, YES };
-  const double kValues2[] = { 601., 600. };
-  GPBBoolDoubleDictionary *dict2 =
-      [[GPBBoolDoubleDictionary alloc] initWithDoubles:kValues2
-                                               forKeys:kKeys2
-                                                 count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(dict2);
-  [dict addEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 2U);
-  XCTAssertTrue([dict getDouble:NULL forKey:YES]);
-  XCTAssertTrue([dict getDouble:&value forKey:YES]);
-  XCTAssertEqual(value, 600.);
-  XCTAssertTrue([dict getDouble:NULL forKey:NO]);
-  XCTAssertTrue([dict getDouble:&value forKey:NO]);
-  XCTAssertEqual(value, 601.);
-
-  [dict2 release];
-  [dict release];
-}
-
-@end
-
-// clang-format on
-//%PDDM-EXPAND TESTS_FOR_BOOL_KEY_OBJECT_VALUE(Object, NSString*, @"abc", @"def")
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-#pragma mark - Bool -> Object
-
-@interface GPBBoolObjectDictionaryTests : XCTestCase
-@end
-
-@implementation GPBBoolObjectDictionaryTests
-
-- (void)testEmpty {
-  GPBBoolObjectDictionary<NSString*> *dict = [[GPBBoolObjectDictionary alloc] init];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertNil([dict objectForKey:YES]);
-  [dict enumerateKeysAndObjectsUsingBlock:^(BOOL aKey, NSString* aObject, BOOL *stop) {
-    #pragma unused(aKey, aObject, stop)
-    XCTFail(@"Shouldn't get here!");
-  }];
-  [dict release];
-}
-
-- (void)testOne {
-  GPBBoolObjectDictionary<NSString*> *dict = [[GPBBoolObjectDictionary alloc] init];
-  [dict setObject:@"abc" forKey:YES];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 1U);
-  XCTAssertEqualObjects([dict objectForKey:YES], @"abc");
-  XCTAssertNil([dict objectForKey:NO]);
-  [dict enumerateKeysAndObjectsUsingBlock:^(BOOL aKey, NSString* aObject, BOOL *stop) {
-    XCTAssertEqual(aKey, YES);
-    XCTAssertEqualObjects(aObject, @"abc");
-    XCTAssertNotEqual(stop, NULL);
-  }];
-  [dict release];
-}
-
-- (void)testBasics {
-  const BOOL kKeys[] = { YES, NO };
-  const NSString* kObjects[] = { @"abc", @"def" };
-  GPBBoolObjectDictionary<NSString*> *dict =
-      [[GPBBoolObjectDictionary alloc] initWithObjects:kObjects
-                                               forKeys:kKeys
-                                                 count:GPBARRAYSIZE(kObjects)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 2U);
-  XCTAssertEqualObjects([dict objectForKey:YES], @"abc");
-  XCTAssertEqualObjects([dict objectForKey:NO], @"def");
-
-  __block NSUInteger idx = 0;
-  BOOL *seenKeys = malloc(2 * sizeof(BOOL));
-  NSString* *seenObjects = malloc(2 * sizeof(NSString*));
-  [dict enumerateKeysAndObjectsUsingBlock:^(BOOL aKey, NSString* aObject, BOOL *stop) {
-    XCTAssertLessThan(idx, 2U);
-    seenKeys[idx] = aKey;
-    seenObjects[idx] = aObject;
-    XCTAssertNotEqual(stop, NULL);
-    ++idx;
-  }];
-  for (int i = 0; i < 2; ++i) {
-    BOOL foundKey = NO;
-    for (int j = 0; (j < 2) && !foundKey; ++j) {
-      if (kKeys[i] == seenKeys[j]) {
-        foundKey = YES;
-        XCTAssertEqualObjects(kObjects[i], seenObjects[j], @"i = %d, j = %d", i, j);
-      }
-    }
-    XCTAssertTrue(foundKey, @"i = %d", i);
-  }
-  free(seenKeys);
-  free(seenObjects);
-
-  // Stopping the enumeration.
-  idx = 0;
-  [dict enumerateKeysAndObjectsUsingBlock:^(BOOL aKey, NSString* aObject, BOOL *stop) {
-    #pragma unused(aKey, aObject)
-    if (idx == 0) *stop = YES;
-    XCTAssertNotEqual(idx, 2U);
-    ++idx;
-  }];
-  [dict release];
-}
-
-- (void)testEquality {
-  const BOOL kKeys1[] = { YES, NO };
-  const BOOL kKeys2[] = { NO, YES };
-  const NSString* kObjects1[] = { @"abc", @"def" };
-  const NSString* kObjects2[] = { @"def", @"abc" };
-  const NSString* kObjects3[] = { @"def" };
-  GPBBoolObjectDictionary<NSString*> *dict1 =
-      [[GPBBoolObjectDictionary alloc] initWithObjects:kObjects1
-                                               forKeys:kKeys1
-                                                 count:GPBARRAYSIZE(kObjects1)];
-  XCTAssertNotNil(dict1);
-  GPBBoolObjectDictionary<NSString*> *dict1prime =
-      [[GPBBoolObjectDictionary alloc] initWithObjects:kObjects1
-                                               forKeys:kKeys1
-                                                 count:GPBARRAYSIZE(kObjects1)];
-  XCTAssertNotNil(dict1prime);
-  GPBBoolObjectDictionary<NSString*> *dict2 =
-      [[GPBBoolObjectDictionary alloc] initWithObjects:kObjects2
-                                               forKeys:kKeys1
-                                                 count:GPBARRAYSIZE(kObjects2)];
-  XCTAssertNotNil(dict2);
-  GPBBoolObjectDictionary<NSString*> *dict3 =
-      [[GPBBoolObjectDictionary alloc] initWithObjects:kObjects1
-                                               forKeys:kKeys2
-                                                 count:GPBARRAYSIZE(kObjects1)];
-  XCTAssertNotNil(dict3);
-  GPBBoolObjectDictionary<NSString*> *dict4 =
-      [[GPBBoolObjectDictionary alloc] initWithObjects:kObjects3
-                                               forKeys:kKeys1
-                                                 count:GPBARRAYSIZE(kObjects3)];
-  XCTAssertNotNil(dict4);
-
-  // 1/1Prime should be different objects, but equal.
-  XCTAssertNotEqual(dict1, dict1prime);
-  XCTAssertEqualObjects(dict1, dict1prime);
-  // Equal, so they must have same hash.
-  XCTAssertEqual([dict1 hash], [dict1prime hash]);
-
-  // 2 is same keys, different objects; not equal.
-  XCTAssertNotEqualObjects(dict1, dict2);
-
-  // 3 is different keys, same objects; not equal.
-  XCTAssertNotEqualObjects(dict1, dict3);
-
-  // 4 Fewer pairs; not equal
-  XCTAssertNotEqualObjects(dict1, dict4);
-
-  [dict1 release];
-  [dict1prime release];
-  [dict2 release];
-  [dict3 release];
-  [dict4 release];
-}
-
-- (void)testCopy {
-  const BOOL kKeys[] = { YES, NO };
-  const NSString* kObjects[] = { @"abc", @"def" };
-  GPBBoolObjectDictionary<NSString*> *dict =
-      [[GPBBoolObjectDictionary alloc] initWithObjects:kObjects
-                                               forKeys:kKeys
-                                                 count:GPBARRAYSIZE(kObjects)];
-  XCTAssertNotNil(dict);
-
-  GPBBoolObjectDictionary<NSString*> *dict2 = [dict copy];
-  XCTAssertNotNil(dict2);
-
-  // Should be new object but equal.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  XCTAssertTrue([dict2 isKindOfClass:[GPBBoolObjectDictionary class]]);
-
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testDictionaryFromDictionary {
-  const BOOL kKeys[] = { YES, NO };
-  const NSString* kObjects[] = { @"abc", @"def" };
-  GPBBoolObjectDictionary<NSString*> *dict =
-      [[GPBBoolObjectDictionary alloc] initWithObjects:kObjects
-                                               forKeys:kKeys
-                                                 count:GPBARRAYSIZE(kObjects)];
-  XCTAssertNotNil(dict);
-
-  GPBBoolObjectDictionary<NSString*> *dict2 =
-      [[GPBBoolObjectDictionary alloc] initWithDictionary:dict];
-  XCTAssertNotNil(dict2);
-
-  // Should be new pointer, but equal objects.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testAdds {
-  GPBBoolObjectDictionary<NSString*> *dict = [[GPBBoolObjectDictionary alloc] init];
-  XCTAssertNotNil(dict);
-
-  XCTAssertEqual(dict.count, 0U);
-  [dict setObject:@"abc" forKey:YES];
-  XCTAssertEqual(dict.count, 1U);
-
-  const BOOL kKeys[] = { NO };
-  const NSString* kObjects[] = { @"def" };
-  GPBBoolObjectDictionary<NSString*> *dict2 =
-      [[GPBBoolObjectDictionary alloc] initWithObjects:kObjects
-                                               forKeys:kKeys
-                                                 count:GPBARRAYSIZE(kObjects)];
-  XCTAssertNotNil(dict2);
-  [dict addEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 2U);
-
-  XCTAssertEqualObjects([dict objectForKey:YES], @"abc");
-  XCTAssertEqualObjects([dict objectForKey:NO], @"def");
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testRemove {
-  const BOOL kKeys[] = { YES, NO};
-  const NSString* kObjects[] = { @"abc", @"def" };
-  GPBBoolObjectDictionary<NSString*> *dict =
-      [[GPBBoolObjectDictionary alloc] initWithObjects:kObjects
-                                        forKeys:kKeys
-                                          count:GPBARRAYSIZE(kObjects)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 2U);
-
-  [dict removeObjectForKey:NO];
-  XCTAssertEqual(dict.count, 1U);
-  XCTAssertEqualObjects([dict objectForKey:YES], @"abc");
-  XCTAssertNil([dict objectForKey:NO]);
-
-  // Remove again does nothing.
-  [dict removeObjectForKey:NO];
-  XCTAssertEqual(dict.count, 1U);
-  XCTAssertEqualObjects([dict objectForKey:YES], @"abc");
-  XCTAssertNil([dict objectForKey:NO]);
-
-  [dict removeAll];
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertNil([dict objectForKey:YES]);
-  XCTAssertNil([dict objectForKey:NO]);
-  [dict release];
-}
-
-- (void)testInplaceMutation {
-  const BOOL kKeys[] = { YES, NO };
-  const NSString* kObjects[] = { @"abc", @"def" };
-  GPBBoolObjectDictionary<NSString*> *dict =
-      [[GPBBoolObjectDictionary alloc] initWithObjects:kObjects
-                                               forKeys:kKeys
-                                                 count:GPBARRAYSIZE(kObjects)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 2U);
-  XCTAssertEqualObjects([dict objectForKey:YES], @"abc");
-  XCTAssertEqualObjects([dict objectForKey:NO], @"def");
-
-  [dict setObject:@"def" forKey:YES];
-  XCTAssertEqual(dict.count, 2U);
-  XCTAssertEqualObjects([dict objectForKey:YES], @"def");
-  XCTAssertEqualObjects([dict objectForKey:NO], @"def");
-
-  [dict setObject:@"abc" forKey:NO];
-  XCTAssertEqual(dict.count, 2U);
-  XCTAssertEqualObjects([dict objectForKey:YES], @"def");
-  XCTAssertEqualObjects([dict objectForKey:NO], @"abc");
-
-  const BOOL kKeys2[] = { NO, YES };
-  const NSString* kObjects2[] = { @"def", @"abc" };
-  GPBBoolObjectDictionary<NSString*> *dict2 =
-      [[GPBBoolObjectDictionary alloc] initWithObjects:kObjects2
-                                               forKeys:kKeys2
-                                                 count:GPBARRAYSIZE(kObjects2)];
-  XCTAssertNotNil(dict2);
-  [dict addEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 2U);
-  XCTAssertEqualObjects([dict objectForKey:YES], @"abc");
-  XCTAssertEqualObjects([dict objectForKey:NO], @"def");
-
-  [dict2 release];
-  [dict release];
-}
-
-@end
-
-// clang-format on
-//%PDDM-EXPAND-END (8 expansions)
-
-
diff --git a/libs/protobuf/objectivec/Tests/GPBDictionaryTests+Int32.m b/libs/protobuf/objectivec/Tests/GPBDictionaryTests+Int32.m
deleted file mode 100644
index 8dafaac..0000000
--- a/libs/protobuf/objectivec/Tests/GPBDictionaryTests+Int32.m
+++ /dev/null
@@ -1,3678 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#import <Foundation/Foundation.h>
-#import <XCTest/XCTest.h>
-
-#import "GPBDictionary.h"
-
-#import "GPBTestUtilities.h"
-#import "google/protobuf/UnittestRuntimeProto2.pbobjc.h"
-
-// Pull in the macros (using an external file because expanding all tests
-// in a single file makes a file that is failing to work with within Xcode.
-//%PDDM-IMPORT-DEFINES GPBDictionaryTests.pddm
-
-//%PDDM-EXPAND TEST_FOR_POD_KEY(Int32, int32_t, 11, 12, 13, 14)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-// To let the testing macros work, add some extra methods to simplify things.
-@interface GPBInt32EnumDictionary (TestingTweak)
-- (instancetype)initWithEnums:(const int32_t [])values
-                      forKeys:(const int32_t [])keys
-                        count:(NSUInteger)count;
-@end
-
-static BOOL TestingEnum_IsValidValue(int32_t value) {
-  switch (value) {
-    case 700:
-    case 701:
-    case 702:
-    case 703:
-      return YES;
-    default:
-      return NO;
-  }
-}
-
-@implementation GPBInt32EnumDictionary (TestingTweak)
-- (instancetype)initWithEnums:(const int32_t [])values
-                      forKeys:(const int32_t [])keys
-                        count:(NSUInteger)count {
-  return [self initWithValidationFunction:TestingEnum_IsValidValue
-                                rawValues:values
-                                  forKeys:keys
-                                    count:count];
-}
-@end
-
-
-#pragma mark - Int32 -> UInt32
-
-@interface GPBInt32UInt32DictionaryTests : XCTestCase
-@end
-
-@implementation GPBInt32UInt32DictionaryTests
-
-- (void)testEmpty {
-  GPBInt32UInt32Dictionary *dict = [[GPBInt32UInt32Dictionary alloc] init];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertFalse([dict getUInt32:NULL forKey:11]);
-  [dict enumerateKeysAndUInt32sUsingBlock:^(int32_t aKey, uint32_t aValue, BOOL *stop) {
-    #pragma unused(aKey, aValue, stop)
-    XCTFail(@"Shouldn't get here!");
-  }];
-  [dict release];
-}
-
-- (void)testOne {
-  GPBInt32UInt32Dictionary *dict = [[GPBInt32UInt32Dictionary alloc] init];
-  [dict setUInt32:100U forKey:11];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 1U);
-  uint32_t value;
-  XCTAssertTrue([dict getUInt32:NULL forKey:11]);
-  XCTAssertTrue([dict getUInt32:&value forKey:11]);
-  XCTAssertEqual(value, 100U);
-  XCTAssertFalse([dict getUInt32:NULL forKey:12]);
-  [dict enumerateKeysAndUInt32sUsingBlock:^(int32_t aKey, uint32_t aValue, BOOL *stop) {
-    XCTAssertEqual(aKey, 11);
-    XCTAssertEqual(aValue, 100U);
-    XCTAssertNotEqual(stop, NULL);
-  }];
-  [dict release];
-}
-
-- (void)testBasics {
-  const int32_t kKeys[] = { 11, 12, 13 };
-  const uint32_t kValues[] = { 100U, 101U, 102U };
-  GPBInt32UInt32Dictionary *dict =
-      [[GPBInt32UInt32Dictionary alloc] initWithUInt32s:kValues
-                                                forKeys:kKeys
-                                                  count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 3U);
-  uint32_t value;
-  XCTAssertTrue([dict getUInt32:NULL forKey:11]);
-  XCTAssertTrue([dict getUInt32:&value forKey:11]);
-  XCTAssertEqual(value, 100U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:12]);
-  XCTAssertTrue([dict getUInt32:&value forKey:12]);
-  XCTAssertEqual(value, 101U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:13]);
-  XCTAssertTrue([dict getUInt32:&value forKey:13]);
-  XCTAssertEqual(value, 102U);
-  XCTAssertFalse([dict getUInt32:NULL forKey:14]);
-
-  __block NSUInteger idx = 0;
-  int32_t *seenKeys = malloc(3 * sizeof(int32_t));
-  uint32_t *seenValues = malloc(3 * sizeof(uint32_t));
-  [dict enumerateKeysAndUInt32sUsingBlock:^(int32_t aKey, uint32_t aValue, BOOL *stop) {
-    XCTAssertLessThan(idx, 3U);
-    seenKeys[idx] = aKey;
-    seenValues[idx] = aValue;
-    XCTAssertNotEqual(stop, NULL);
-    ++idx;
-  }];
-  for (int i = 0; i < 3; ++i) {
-    BOOL foundKey = NO;
-    for (int j = 0; (j < 3) && !foundKey; ++j) {
-      if (kKeys[i] == seenKeys[j]) {
-        foundKey = YES;
-        XCTAssertEqual(kValues[i], seenValues[j], @"i = %d, j = %d", i, j);
-      }
-    }
-    XCTAssertTrue(foundKey, @"i = %d", i);
-  }
-  free(seenKeys);
-  free(seenValues);
-
-  // Stopping the enumeration.
-  idx = 0;
-  [dict enumerateKeysAndUInt32sUsingBlock:^(int32_t aKey, uint32_t aValue, BOOL *stop) {
-    #pragma unused(aKey, aValue)
-    if (idx == 1) *stop = YES;
-    XCTAssertNotEqual(idx, 2U);
-    ++idx;
-  }];
-  [dict release];
-}
-
-- (void)testEquality {
-  const int32_t kKeys1[] = { 11, 12, 13, 14 };
-  const int32_t kKeys2[] = { 12, 11, 14 };
-  const uint32_t kValues1[] = { 100U, 101U, 102U };
-  const uint32_t kValues2[] = { 100U, 103U, 102U };
-  const uint32_t kValues3[] = { 100U, 101U, 102U, 103U };
-  GPBInt32UInt32Dictionary *dict1 =
-      [[GPBInt32UInt32Dictionary alloc] initWithUInt32s:kValues1
-                                                forKeys:kKeys1
-                                                  count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict1);
-  GPBInt32UInt32Dictionary *dict1prime =
-      [[GPBInt32UInt32Dictionary alloc] initWithUInt32s:kValues1
-                                                forKeys:kKeys1
-                                                  count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict1prime);
-  GPBInt32UInt32Dictionary *dict2 =
-      [[GPBInt32UInt32Dictionary alloc] initWithUInt32s:kValues2
-                                                forKeys:kKeys1
-                                                  count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(dict2);
-  GPBInt32UInt32Dictionary *dict3 =
-      [[GPBInt32UInt32Dictionary alloc] initWithUInt32s:kValues1
-                                                forKeys:kKeys2
-                                                  count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict3);
-  GPBInt32UInt32Dictionary *dict4 =
-      [[GPBInt32UInt32Dictionary alloc] initWithUInt32s:kValues3
-                                                forKeys:kKeys1
-                                                  count:GPBARRAYSIZE(kValues3)];
-  XCTAssertNotNil(dict4);
-
-  // 1/1Prime should be different objects, but equal.
-  XCTAssertNotEqual(dict1, dict1prime);
-  XCTAssertEqualObjects(dict1, dict1prime);
-  // Equal, so they must have same hash.
-  XCTAssertEqual([dict1 hash], [dict1prime hash]);
-
-  // 2 is same keys, different values; not equal.
-  XCTAssertNotEqualObjects(dict1, dict2);
-
-  // 3 is different keys, same values; not equal.
-  XCTAssertNotEqualObjects(dict1, dict3);
-
-  // 4 extra pair; not equal
-  XCTAssertNotEqualObjects(dict1, dict4);
-
-  [dict1 release];
-  [dict1prime release];
-  [dict2 release];
-  [dict3 release];
-  [dict4 release];
-}
-
-- (void)testCopy {
-  const int32_t kKeys[] = { 11, 12, 13, 14 };
-  const uint32_t kValues[] = { 100U, 101U, 102U, 103U };
-  GPBInt32UInt32Dictionary *dict =
-      [[GPBInt32UInt32Dictionary alloc] initWithUInt32s:kValues
-                                                forKeys:kKeys
-                                                  count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-
-  GPBInt32UInt32Dictionary *dict2 = [dict copy];
-  XCTAssertNotNil(dict2);
-
-  // Should be new object but equal.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  XCTAssertTrue([dict2 isKindOfClass:[GPBInt32UInt32Dictionary class]]);
-
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testDictionaryFromDictionary {
-  const int32_t kKeys[] = { 11, 12, 13, 14 };
-  const uint32_t kValues[] = { 100U, 101U, 102U, 103U };
-  GPBInt32UInt32Dictionary *dict =
-      [[GPBInt32UInt32Dictionary alloc] initWithUInt32s:kValues
-                                                forKeys:kKeys
-                                                  count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-
-  GPBInt32UInt32Dictionary *dict2 =
-      [[GPBInt32UInt32Dictionary alloc] initWithDictionary:dict];
-  XCTAssertNotNil(dict2);
-
-  // Should be new pointer, but equal objects.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testAdds {
-  GPBInt32UInt32Dictionary *dict = [[GPBInt32UInt32Dictionary alloc] init];
-  XCTAssertNotNil(dict);
-
-  XCTAssertEqual(dict.count, 0U);
-  [dict setUInt32:100U forKey:11];
-  XCTAssertEqual(dict.count, 1U);
-
-  const int32_t kKeys[] = { 12, 13, 14 };
-  const uint32_t kValues[] = { 101U, 102U, 103U };
-  GPBInt32UInt32Dictionary *dict2 =
-      [[GPBInt32UInt32Dictionary alloc] initWithUInt32s:kValues
-                                                forKeys:kKeys
-                                                  count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict2);
-  [dict addEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 4U);
-
-  uint32_t value;
-  XCTAssertTrue([dict getUInt32:NULL forKey:11]);
-  XCTAssertTrue([dict getUInt32:&value forKey:11]);
-  XCTAssertEqual(value, 100U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:12]);
-  XCTAssertTrue([dict getUInt32:&value forKey:12]);
-  XCTAssertEqual(value, 101U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:13]);
-  XCTAssertTrue([dict getUInt32:&value forKey:13]);
-  XCTAssertEqual(value, 102U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:14]);
-  XCTAssertTrue([dict getUInt32:&value forKey:14]);
-  XCTAssertEqual(value, 103U);
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testRemove {
-  const int32_t kKeys[] = { 11, 12, 13, 14 };
-  const uint32_t kValues[] = { 100U, 101U, 102U, 103U };
-  GPBInt32UInt32Dictionary *dict =
-      [[GPBInt32UInt32Dictionary alloc] initWithUInt32s:kValues
-                                                forKeys:kKeys
-                                                  count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 4U);
-
-  [dict removeUInt32ForKey:12];
-  XCTAssertEqual(dict.count, 3U);
-  uint32_t value;
-  XCTAssertTrue([dict getUInt32:NULL forKey:11]);
-  XCTAssertTrue([dict getUInt32:&value forKey:11]);
-  XCTAssertEqual(value, 100U);
-  XCTAssertFalse([dict getUInt32:NULL forKey:12]);
-  XCTAssertTrue([dict getUInt32:NULL forKey:13]);
-  XCTAssertTrue([dict getUInt32:&value forKey:13]);
-  XCTAssertEqual(value, 102U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:14]);
-  XCTAssertTrue([dict getUInt32:&value forKey:14]);
-  XCTAssertEqual(value, 103U);
-
-  // Remove again does nothing.
-  [dict removeUInt32ForKey:12];
-  XCTAssertEqual(dict.count, 3U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:11]);
-  XCTAssertTrue([dict getUInt32:&value forKey:11]);
-  XCTAssertEqual(value, 100U);
-  XCTAssertFalse([dict getUInt32:NULL forKey:12]);
-  XCTAssertTrue([dict getUInt32:NULL forKey:13]);
-  XCTAssertTrue([dict getUInt32:&value forKey:13]);
-  XCTAssertEqual(value, 102U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:14]);
-  XCTAssertTrue([dict getUInt32:&value forKey:14]);
-  XCTAssertEqual(value, 103U);
-
-  [dict removeUInt32ForKey:14];
-  XCTAssertEqual(dict.count, 2U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:11]);
-  XCTAssertTrue([dict getUInt32:&value forKey:11]);
-  XCTAssertEqual(value, 100U);
-  XCTAssertFalse([dict getUInt32:NULL forKey:12]);
-  XCTAssertTrue([dict getUInt32:NULL forKey:13]);
-  XCTAssertTrue([dict getUInt32:&value forKey:13]);
-  XCTAssertEqual(value, 102U);
-  XCTAssertFalse([dict getUInt32:NULL forKey:14]);
-
-  [dict removeAll];
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertFalse([dict getUInt32:NULL forKey:11]);
-  XCTAssertFalse([dict getUInt32:NULL forKey:12]);
-  XCTAssertFalse([dict getUInt32:NULL forKey:13]);
-  XCTAssertFalse([dict getUInt32:NULL forKey:14]);
-  [dict release];
-}
-
-- (void)testInplaceMutation {
-  const int32_t kKeys[] = { 11, 12, 13, 14 };
-  const uint32_t kValues[] = { 100U, 101U, 102U, 103U };
-  GPBInt32UInt32Dictionary *dict =
-      [[GPBInt32UInt32Dictionary alloc] initWithUInt32s:kValues
-                                                forKeys:kKeys
-                                                  count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 4U);
-  uint32_t value;
-  XCTAssertTrue([dict getUInt32:NULL forKey:11]);
-  XCTAssertTrue([dict getUInt32:&value forKey:11]);
-  XCTAssertEqual(value, 100U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:12]);
-  XCTAssertTrue([dict getUInt32:&value forKey:12]);
-  XCTAssertEqual(value, 101U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:13]);
-  XCTAssertTrue([dict getUInt32:&value forKey:13]);
-  XCTAssertEqual(value, 102U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:14]);
-  XCTAssertTrue([dict getUInt32:&value forKey:14]);
-  XCTAssertEqual(value, 103U);
-
-  [dict setUInt32:103U forKey:11];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:11]);
-  XCTAssertTrue([dict getUInt32:&value forKey:11]);
-  XCTAssertEqual(value, 103U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:12]);
-  XCTAssertTrue([dict getUInt32:&value forKey:12]);
-  XCTAssertEqual(value, 101U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:13]);
-  XCTAssertTrue([dict getUInt32:&value forKey:13]);
-  XCTAssertEqual(value, 102U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:14]);
-  XCTAssertTrue([dict getUInt32:&value forKey:14]);
-  XCTAssertEqual(value, 103U);
-
-  [dict setUInt32:101U forKey:14];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:11]);
-  XCTAssertTrue([dict getUInt32:&value forKey:11]);
-  XCTAssertEqual(value, 103U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:12]);
-  XCTAssertTrue([dict getUInt32:&value forKey:12]);
-  XCTAssertEqual(value, 101U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:13]);
-  XCTAssertTrue([dict getUInt32:&value forKey:13]);
-  XCTAssertEqual(value, 102U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:14]);
-  XCTAssertTrue([dict getUInt32:&value forKey:14]);
-  XCTAssertEqual(value, 101U);
-
-  const int32_t kKeys2[] = { 12, 13 };
-  const uint32_t kValues2[] = { 102U, 100U };
-  GPBInt32UInt32Dictionary *dict2 =
-      [[GPBInt32UInt32Dictionary alloc] initWithUInt32s:kValues2
-                                                forKeys:kKeys2
-                                                  count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(dict2);
-  [dict addEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:11]);
-  XCTAssertTrue([dict getUInt32:&value forKey:11]);
-  XCTAssertEqual(value, 103U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:12]);
-  XCTAssertTrue([dict getUInt32:&value forKey:12]);
-  XCTAssertEqual(value, 102U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:13]);
-  XCTAssertTrue([dict getUInt32:&value forKey:13]);
-  XCTAssertEqual(value, 100U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:14]);
-  XCTAssertTrue([dict getUInt32:&value forKey:14]);
-  XCTAssertEqual(value, 101U);
-
-  [dict2 release];
-  [dict release];
-}
-
-@end
-
-#pragma mark - Int32 -> Int32
-
-@interface GPBInt32Int32DictionaryTests : XCTestCase
-@end
-
-@implementation GPBInt32Int32DictionaryTests
-
-- (void)testEmpty {
-  GPBInt32Int32Dictionary *dict = [[GPBInt32Int32Dictionary alloc] init];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertFalse([dict getInt32:NULL forKey:11]);
-  [dict enumerateKeysAndInt32sUsingBlock:^(int32_t aKey, int32_t aValue, BOOL *stop) {
-    #pragma unused(aKey, aValue, stop)
-    XCTFail(@"Shouldn't get here!");
-  }];
-  [dict release];
-}
-
-- (void)testOne {
-  GPBInt32Int32Dictionary *dict = [[GPBInt32Int32Dictionary alloc] init];
-  [dict setInt32:200 forKey:11];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 1U);
-  int32_t value;
-  XCTAssertTrue([dict getInt32:NULL forKey:11]);
-  XCTAssertTrue([dict getInt32:&value forKey:11]);
-  XCTAssertEqual(value, 200);
-  XCTAssertFalse([dict getInt32:NULL forKey:12]);
-  [dict enumerateKeysAndInt32sUsingBlock:^(int32_t aKey, int32_t aValue, BOOL *stop) {
-    XCTAssertEqual(aKey, 11);
-    XCTAssertEqual(aValue, 200);
-    XCTAssertNotEqual(stop, NULL);
-  }];
-  [dict release];
-}
-
-- (void)testBasics {
-  const int32_t kKeys[] = { 11, 12, 13 };
-  const int32_t kValues[] = { 200, 201, 202 };
-  GPBInt32Int32Dictionary *dict =
-      [[GPBInt32Int32Dictionary alloc] initWithInt32s:kValues
-                                              forKeys:kKeys
-                                                count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 3U);
-  int32_t value;
-  XCTAssertTrue([dict getInt32:NULL forKey:11]);
-  XCTAssertTrue([dict getInt32:&value forKey:11]);
-  XCTAssertEqual(value, 200);
-  XCTAssertTrue([dict getInt32:NULL forKey:12]);
-  XCTAssertTrue([dict getInt32:&value forKey:12]);
-  XCTAssertEqual(value, 201);
-  XCTAssertTrue([dict getInt32:NULL forKey:13]);
-  XCTAssertTrue([dict getInt32:&value forKey:13]);
-  XCTAssertEqual(value, 202);
-  XCTAssertFalse([dict getInt32:NULL forKey:14]);
-
-  __block NSUInteger idx = 0;
-  int32_t *seenKeys = malloc(3 * sizeof(int32_t));
-  int32_t *seenValues = malloc(3 * sizeof(int32_t));
-  [dict enumerateKeysAndInt32sUsingBlock:^(int32_t aKey, int32_t aValue, BOOL *stop) {
-    XCTAssertLessThan(idx, 3U);
-    seenKeys[idx] = aKey;
-    seenValues[idx] = aValue;
-    XCTAssertNotEqual(stop, NULL);
-    ++idx;
-  }];
-  for (int i = 0; i < 3; ++i) {
-    BOOL foundKey = NO;
-    for (int j = 0; (j < 3) && !foundKey; ++j) {
-      if (kKeys[i] == seenKeys[j]) {
-        foundKey = YES;
-        XCTAssertEqual(kValues[i], seenValues[j], @"i = %d, j = %d", i, j);
-      }
-    }
-    XCTAssertTrue(foundKey, @"i = %d", i);
-  }
-  free(seenKeys);
-  free(seenValues);
-
-  // Stopping the enumeration.
-  idx = 0;
-  [dict enumerateKeysAndInt32sUsingBlock:^(int32_t aKey, int32_t aValue, BOOL *stop) {
-    #pragma unused(aKey, aValue)
-    if (idx == 1) *stop = YES;
-    XCTAssertNotEqual(idx, 2U);
-    ++idx;
-  }];
-  [dict release];
-}
-
-- (void)testEquality {
-  const int32_t kKeys1[] = { 11, 12, 13, 14 };
-  const int32_t kKeys2[] = { 12, 11, 14 };
-  const int32_t kValues1[] = { 200, 201, 202 };
-  const int32_t kValues2[] = { 200, 203, 202 };
-  const int32_t kValues3[] = { 200, 201, 202, 203 };
-  GPBInt32Int32Dictionary *dict1 =
-      [[GPBInt32Int32Dictionary alloc] initWithInt32s:kValues1
-                                              forKeys:kKeys1
-                                                count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict1);
-  GPBInt32Int32Dictionary *dict1prime =
-      [[GPBInt32Int32Dictionary alloc] initWithInt32s:kValues1
-                                              forKeys:kKeys1
-                                                count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict1prime);
-  GPBInt32Int32Dictionary *dict2 =
-      [[GPBInt32Int32Dictionary alloc] initWithInt32s:kValues2
-                                              forKeys:kKeys1
-                                                count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(dict2);
-  GPBInt32Int32Dictionary *dict3 =
-      [[GPBInt32Int32Dictionary alloc] initWithInt32s:kValues1
-                                              forKeys:kKeys2
-                                                count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict3);
-  GPBInt32Int32Dictionary *dict4 =
-      [[GPBInt32Int32Dictionary alloc] initWithInt32s:kValues3
-                                              forKeys:kKeys1
-                                                count:GPBARRAYSIZE(kValues3)];
-  XCTAssertNotNil(dict4);
-
-  // 1/1Prime should be different objects, but equal.
-  XCTAssertNotEqual(dict1, dict1prime);
-  XCTAssertEqualObjects(dict1, dict1prime);
-  // Equal, so they must have same hash.
-  XCTAssertEqual([dict1 hash], [dict1prime hash]);
-
-  // 2 is same keys, different values; not equal.
-  XCTAssertNotEqualObjects(dict1, dict2);
-
-  // 3 is different keys, same values; not equal.
-  XCTAssertNotEqualObjects(dict1, dict3);
-
-  // 4 extra pair; not equal
-  XCTAssertNotEqualObjects(dict1, dict4);
-
-  [dict1 release];
-  [dict1prime release];
-  [dict2 release];
-  [dict3 release];
-  [dict4 release];
-}
-
-- (void)testCopy {
-  const int32_t kKeys[] = { 11, 12, 13, 14 };
-  const int32_t kValues[] = { 200, 201, 202, 203 };
-  GPBInt32Int32Dictionary *dict =
-      [[GPBInt32Int32Dictionary alloc] initWithInt32s:kValues
-                                              forKeys:kKeys
-                                                count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-
-  GPBInt32Int32Dictionary *dict2 = [dict copy];
-  XCTAssertNotNil(dict2);
-
-  // Should be new object but equal.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  XCTAssertTrue([dict2 isKindOfClass:[GPBInt32Int32Dictionary class]]);
-
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testDictionaryFromDictionary {
-  const int32_t kKeys[] = { 11, 12, 13, 14 };
-  const int32_t kValues[] = { 200, 201, 202, 203 };
-  GPBInt32Int32Dictionary *dict =
-      [[GPBInt32Int32Dictionary alloc] initWithInt32s:kValues
-                                              forKeys:kKeys
-                                                count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-
-  GPBInt32Int32Dictionary *dict2 =
-      [[GPBInt32Int32Dictionary alloc] initWithDictionary:dict];
-  XCTAssertNotNil(dict2);
-
-  // Should be new pointer, but equal objects.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testAdds {
-  GPBInt32Int32Dictionary *dict = [[GPBInt32Int32Dictionary alloc] init];
-  XCTAssertNotNil(dict);
-
-  XCTAssertEqual(dict.count, 0U);
-  [dict setInt32:200 forKey:11];
-  XCTAssertEqual(dict.count, 1U);
-
-  const int32_t kKeys[] = { 12, 13, 14 };
-  const int32_t kValues[] = { 201, 202, 203 };
-  GPBInt32Int32Dictionary *dict2 =
-      [[GPBInt32Int32Dictionary alloc] initWithInt32s:kValues
-                                              forKeys:kKeys
-                                                count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict2);
-  [dict addEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 4U);
-
-  int32_t value;
-  XCTAssertTrue([dict getInt32:NULL forKey:11]);
-  XCTAssertTrue([dict getInt32:&value forKey:11]);
-  XCTAssertEqual(value, 200);
-  XCTAssertTrue([dict getInt32:NULL forKey:12]);
-  XCTAssertTrue([dict getInt32:&value forKey:12]);
-  XCTAssertEqual(value, 201);
-  XCTAssertTrue([dict getInt32:NULL forKey:13]);
-  XCTAssertTrue([dict getInt32:&value forKey:13]);
-  XCTAssertEqual(value, 202);
-  XCTAssertTrue([dict getInt32:NULL forKey:14]);
-  XCTAssertTrue([dict getInt32:&value forKey:14]);
-  XCTAssertEqual(value, 203);
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testRemove {
-  const int32_t kKeys[] = { 11, 12, 13, 14 };
-  const int32_t kValues[] = { 200, 201, 202, 203 };
-  GPBInt32Int32Dictionary *dict =
-      [[GPBInt32Int32Dictionary alloc] initWithInt32s:kValues
-                                              forKeys:kKeys
-                                                count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 4U);
-
-  [dict removeInt32ForKey:12];
-  XCTAssertEqual(dict.count, 3U);
-  int32_t value;
-  XCTAssertTrue([dict getInt32:NULL forKey:11]);
-  XCTAssertTrue([dict getInt32:&value forKey:11]);
-  XCTAssertEqual(value, 200);
-  XCTAssertFalse([dict getInt32:NULL forKey:12]);
-  XCTAssertTrue([dict getInt32:NULL forKey:13]);
-  XCTAssertTrue([dict getInt32:&value forKey:13]);
-  XCTAssertEqual(value, 202);
-  XCTAssertTrue([dict getInt32:NULL forKey:14]);
-  XCTAssertTrue([dict getInt32:&value forKey:14]);
-  XCTAssertEqual(value, 203);
-
-  // Remove again does nothing.
-  [dict removeInt32ForKey:12];
-  XCTAssertEqual(dict.count, 3U);
-  XCTAssertTrue([dict getInt32:NULL forKey:11]);
-  XCTAssertTrue([dict getInt32:&value forKey:11]);
-  XCTAssertEqual(value, 200);
-  XCTAssertFalse([dict getInt32:NULL forKey:12]);
-  XCTAssertTrue([dict getInt32:NULL forKey:13]);
-  XCTAssertTrue([dict getInt32:&value forKey:13]);
-  XCTAssertEqual(value, 202);
-  XCTAssertTrue([dict getInt32:NULL forKey:14]);
-  XCTAssertTrue([dict getInt32:&value forKey:14]);
-  XCTAssertEqual(value, 203);
-
-  [dict removeInt32ForKey:14];
-  XCTAssertEqual(dict.count, 2U);
-  XCTAssertTrue([dict getInt32:NULL forKey:11]);
-  XCTAssertTrue([dict getInt32:&value forKey:11]);
-  XCTAssertEqual(value, 200);
-  XCTAssertFalse([dict getInt32:NULL forKey:12]);
-  XCTAssertTrue([dict getInt32:NULL forKey:13]);
-  XCTAssertTrue([dict getInt32:&value forKey:13]);
-  XCTAssertEqual(value, 202);
-  XCTAssertFalse([dict getInt32:NULL forKey:14]);
-
-  [dict removeAll];
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertFalse([dict getInt32:NULL forKey:11]);
-  XCTAssertFalse([dict getInt32:NULL forKey:12]);
-  XCTAssertFalse([dict getInt32:NULL forKey:13]);
-  XCTAssertFalse([dict getInt32:NULL forKey:14]);
-  [dict release];
-}
-
-- (void)testInplaceMutation {
-  const int32_t kKeys[] = { 11, 12, 13, 14 };
-  const int32_t kValues[] = { 200, 201, 202, 203 };
-  GPBInt32Int32Dictionary *dict =
-      [[GPBInt32Int32Dictionary alloc] initWithInt32s:kValues
-                                              forKeys:kKeys
-                                                count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 4U);
-  int32_t value;
-  XCTAssertTrue([dict getInt32:NULL forKey:11]);
-  XCTAssertTrue([dict getInt32:&value forKey:11]);
-  XCTAssertEqual(value, 200);
-  XCTAssertTrue([dict getInt32:NULL forKey:12]);
-  XCTAssertTrue([dict getInt32:&value forKey:12]);
-  XCTAssertEqual(value, 201);
-  XCTAssertTrue([dict getInt32:NULL forKey:13]);
-  XCTAssertTrue([dict getInt32:&value forKey:13]);
-  XCTAssertEqual(value, 202);
-  XCTAssertTrue([dict getInt32:NULL forKey:14]);
-  XCTAssertTrue([dict getInt32:&value forKey:14]);
-  XCTAssertEqual(value, 203);
-
-  [dict setInt32:203 forKey:11];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getInt32:NULL forKey:11]);
-  XCTAssertTrue([dict getInt32:&value forKey:11]);
-  XCTAssertEqual(value, 203);
-  XCTAssertTrue([dict getInt32:NULL forKey:12]);
-  XCTAssertTrue([dict getInt32:&value forKey:12]);
-  XCTAssertEqual(value, 201);
-  XCTAssertTrue([dict getInt32:NULL forKey:13]);
-  XCTAssertTrue([dict getInt32:&value forKey:13]);
-  XCTAssertEqual(value, 202);
-  XCTAssertTrue([dict getInt32:NULL forKey:14]);
-  XCTAssertTrue([dict getInt32:&value forKey:14]);
-  XCTAssertEqual(value, 203);
-
-  [dict setInt32:201 forKey:14];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getInt32:NULL forKey:11]);
-  XCTAssertTrue([dict getInt32:&value forKey:11]);
-  XCTAssertEqual(value, 203);
-  XCTAssertTrue([dict getInt32:NULL forKey:12]);
-  XCTAssertTrue([dict getInt32:&value forKey:12]);
-  XCTAssertEqual(value, 201);
-  XCTAssertTrue([dict getInt32:NULL forKey:13]);
-  XCTAssertTrue([dict getInt32:&value forKey:13]);
-  XCTAssertEqual(value, 202);
-  XCTAssertTrue([dict getInt32:NULL forKey:14]);
-  XCTAssertTrue([dict getInt32:&value forKey:14]);
-  XCTAssertEqual(value, 201);
-
-  const int32_t kKeys2[] = { 12, 13 };
-  const int32_t kValues2[] = { 202, 200 };
-  GPBInt32Int32Dictionary *dict2 =
-      [[GPBInt32Int32Dictionary alloc] initWithInt32s:kValues2
-                                              forKeys:kKeys2
-                                                count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(dict2);
-  [dict addEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getInt32:NULL forKey:11]);
-  XCTAssertTrue([dict getInt32:&value forKey:11]);
-  XCTAssertEqual(value, 203);
-  XCTAssertTrue([dict getInt32:NULL forKey:12]);
-  XCTAssertTrue([dict getInt32:&value forKey:12]);
-  XCTAssertEqual(value, 202);
-  XCTAssertTrue([dict getInt32:NULL forKey:13]);
-  XCTAssertTrue([dict getInt32:&value forKey:13]);
-  XCTAssertEqual(value, 200);
-  XCTAssertTrue([dict getInt32:NULL forKey:14]);
-  XCTAssertTrue([dict getInt32:&value forKey:14]);
-  XCTAssertEqual(value, 201);
-
-  [dict2 release];
-  [dict release];
-}
-
-@end
-
-#pragma mark - Int32 -> UInt64
-
-@interface GPBInt32UInt64DictionaryTests : XCTestCase
-@end
-
-@implementation GPBInt32UInt64DictionaryTests
-
-- (void)testEmpty {
-  GPBInt32UInt64Dictionary *dict = [[GPBInt32UInt64Dictionary alloc] init];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertFalse([dict getUInt64:NULL forKey:11]);
-  [dict enumerateKeysAndUInt64sUsingBlock:^(int32_t aKey, uint64_t aValue, BOOL *stop) {
-    #pragma unused(aKey, aValue, stop)
-    XCTFail(@"Shouldn't get here!");
-  }];
-  [dict release];
-}
-
-- (void)testOne {
-  GPBInt32UInt64Dictionary *dict = [[GPBInt32UInt64Dictionary alloc] init];
-  [dict setUInt64:300U forKey:11];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 1U);
-  uint64_t value;
-  XCTAssertTrue([dict getUInt64:NULL forKey:11]);
-  XCTAssertTrue([dict getUInt64:&value forKey:11]);
-  XCTAssertEqual(value, 300U);
-  XCTAssertFalse([dict getUInt64:NULL forKey:12]);
-  [dict enumerateKeysAndUInt64sUsingBlock:^(int32_t aKey, uint64_t aValue, BOOL *stop) {
-    XCTAssertEqual(aKey, 11);
-    XCTAssertEqual(aValue, 300U);
-    XCTAssertNotEqual(stop, NULL);
-  }];
-  [dict release];
-}
-
-- (void)testBasics {
-  const int32_t kKeys[] = { 11, 12, 13 };
-  const uint64_t kValues[] = { 300U, 301U, 302U };
-  GPBInt32UInt64Dictionary *dict =
-      [[GPBInt32UInt64Dictionary alloc] initWithUInt64s:kValues
-                                                forKeys:kKeys
-                                                  count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 3U);
-  uint64_t value;
-  XCTAssertTrue([dict getUInt64:NULL forKey:11]);
-  XCTAssertTrue([dict getUInt64:&value forKey:11]);
-  XCTAssertEqual(value, 300U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:12]);
-  XCTAssertTrue([dict getUInt64:&value forKey:12]);
-  XCTAssertEqual(value, 301U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:13]);
-  XCTAssertTrue([dict getUInt64:&value forKey:13]);
-  XCTAssertEqual(value, 302U);
-  XCTAssertFalse([dict getUInt64:NULL forKey:14]);
-
-  __block NSUInteger idx = 0;
-  int32_t *seenKeys = malloc(3 * sizeof(int32_t));
-  uint64_t *seenValues = malloc(3 * sizeof(uint64_t));
-  [dict enumerateKeysAndUInt64sUsingBlock:^(int32_t aKey, uint64_t aValue, BOOL *stop) {
-    XCTAssertLessThan(idx, 3U);
-    seenKeys[idx] = aKey;
-    seenValues[idx] = aValue;
-    XCTAssertNotEqual(stop, NULL);
-    ++idx;
-  }];
-  for (int i = 0; i < 3; ++i) {
-    BOOL foundKey = NO;
-    for (int j = 0; (j < 3) && !foundKey; ++j) {
-      if (kKeys[i] == seenKeys[j]) {
-        foundKey = YES;
-        XCTAssertEqual(kValues[i], seenValues[j], @"i = %d, j = %d", i, j);
-      }
-    }
-    XCTAssertTrue(foundKey, @"i = %d", i);
-  }
-  free(seenKeys);
-  free(seenValues);
-
-  // Stopping the enumeration.
-  idx = 0;
-  [dict enumerateKeysAndUInt64sUsingBlock:^(int32_t aKey, uint64_t aValue, BOOL *stop) {
-    #pragma unused(aKey, aValue)
-    if (idx == 1) *stop = YES;
-    XCTAssertNotEqual(idx, 2U);
-    ++idx;
-  }];
-  [dict release];
-}
-
-- (void)testEquality {
-  const int32_t kKeys1[] = { 11, 12, 13, 14 };
-  const int32_t kKeys2[] = { 12, 11, 14 };
-  const uint64_t kValues1[] = { 300U, 301U, 302U };
-  const uint64_t kValues2[] = { 300U, 303U, 302U };
-  const uint64_t kValues3[] = { 300U, 301U, 302U, 303U };
-  GPBInt32UInt64Dictionary *dict1 =
-      [[GPBInt32UInt64Dictionary alloc] initWithUInt64s:kValues1
-                                                forKeys:kKeys1
-                                                  count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict1);
-  GPBInt32UInt64Dictionary *dict1prime =
-      [[GPBInt32UInt64Dictionary alloc] initWithUInt64s:kValues1
-                                                forKeys:kKeys1
-                                                  count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict1prime);
-  GPBInt32UInt64Dictionary *dict2 =
-      [[GPBInt32UInt64Dictionary alloc] initWithUInt64s:kValues2
-                                                forKeys:kKeys1
-                                                  count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(dict2);
-  GPBInt32UInt64Dictionary *dict3 =
-      [[GPBInt32UInt64Dictionary alloc] initWithUInt64s:kValues1
-                                                forKeys:kKeys2
-                                                  count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict3);
-  GPBInt32UInt64Dictionary *dict4 =
-      [[GPBInt32UInt64Dictionary alloc] initWithUInt64s:kValues3
-                                                forKeys:kKeys1
-                                                  count:GPBARRAYSIZE(kValues3)];
-  XCTAssertNotNil(dict4);
-
-  // 1/1Prime should be different objects, but equal.
-  XCTAssertNotEqual(dict1, dict1prime);
-  XCTAssertEqualObjects(dict1, dict1prime);
-  // Equal, so they must have same hash.
-  XCTAssertEqual([dict1 hash], [dict1prime hash]);
-
-  // 2 is same keys, different values; not equal.
-  XCTAssertNotEqualObjects(dict1, dict2);
-
-  // 3 is different keys, same values; not equal.
-  XCTAssertNotEqualObjects(dict1, dict3);
-
-  // 4 extra pair; not equal
-  XCTAssertNotEqualObjects(dict1, dict4);
-
-  [dict1 release];
-  [dict1prime release];
-  [dict2 release];
-  [dict3 release];
-  [dict4 release];
-}
-
-- (void)testCopy {
-  const int32_t kKeys[] = { 11, 12, 13, 14 };
-  const uint64_t kValues[] = { 300U, 301U, 302U, 303U };
-  GPBInt32UInt64Dictionary *dict =
-      [[GPBInt32UInt64Dictionary alloc] initWithUInt64s:kValues
-                                                forKeys:kKeys
-                                                  count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-
-  GPBInt32UInt64Dictionary *dict2 = [dict copy];
-  XCTAssertNotNil(dict2);
-
-  // Should be new object but equal.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  XCTAssertTrue([dict2 isKindOfClass:[GPBInt32UInt64Dictionary class]]);
-
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testDictionaryFromDictionary {
-  const int32_t kKeys[] = { 11, 12, 13, 14 };
-  const uint64_t kValues[] = { 300U, 301U, 302U, 303U };
-  GPBInt32UInt64Dictionary *dict =
-      [[GPBInt32UInt64Dictionary alloc] initWithUInt64s:kValues
-                                                forKeys:kKeys
-                                                  count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-
-  GPBInt32UInt64Dictionary *dict2 =
-      [[GPBInt32UInt64Dictionary alloc] initWithDictionary:dict];
-  XCTAssertNotNil(dict2);
-
-  // Should be new pointer, but equal objects.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testAdds {
-  GPBInt32UInt64Dictionary *dict = [[GPBInt32UInt64Dictionary alloc] init];
-  XCTAssertNotNil(dict);
-
-  XCTAssertEqual(dict.count, 0U);
-  [dict setUInt64:300U forKey:11];
-  XCTAssertEqual(dict.count, 1U);
-
-  const int32_t kKeys[] = { 12, 13, 14 };
-  const uint64_t kValues[] = { 301U, 302U, 303U };
-  GPBInt32UInt64Dictionary *dict2 =
-      [[GPBInt32UInt64Dictionary alloc] initWithUInt64s:kValues
-                                                forKeys:kKeys
-                                                  count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict2);
-  [dict addEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 4U);
-
-  uint64_t value;
-  XCTAssertTrue([dict getUInt64:NULL forKey:11]);
-  XCTAssertTrue([dict getUInt64:&value forKey:11]);
-  XCTAssertEqual(value, 300U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:12]);
-  XCTAssertTrue([dict getUInt64:&value forKey:12]);
-  XCTAssertEqual(value, 301U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:13]);
-  XCTAssertTrue([dict getUInt64:&value forKey:13]);
-  XCTAssertEqual(value, 302U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:14]);
-  XCTAssertTrue([dict getUInt64:&value forKey:14]);
-  XCTAssertEqual(value, 303U);
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testRemove {
-  const int32_t kKeys[] = { 11, 12, 13, 14 };
-  const uint64_t kValues[] = { 300U, 301U, 302U, 303U };
-  GPBInt32UInt64Dictionary *dict =
-      [[GPBInt32UInt64Dictionary alloc] initWithUInt64s:kValues
-                                                forKeys:kKeys
-                                                  count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 4U);
-
-  [dict removeUInt64ForKey:12];
-  XCTAssertEqual(dict.count, 3U);
-  uint64_t value;
-  XCTAssertTrue([dict getUInt64:NULL forKey:11]);
-  XCTAssertTrue([dict getUInt64:&value forKey:11]);
-  XCTAssertEqual(value, 300U);
-  XCTAssertFalse([dict getUInt64:NULL forKey:12]);
-  XCTAssertTrue([dict getUInt64:NULL forKey:13]);
-  XCTAssertTrue([dict getUInt64:&value forKey:13]);
-  XCTAssertEqual(value, 302U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:14]);
-  XCTAssertTrue([dict getUInt64:&value forKey:14]);
-  XCTAssertEqual(value, 303U);
-
-  // Remove again does nothing.
-  [dict removeUInt64ForKey:12];
-  XCTAssertEqual(dict.count, 3U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:11]);
-  XCTAssertTrue([dict getUInt64:&value forKey:11]);
-  XCTAssertEqual(value, 300U);
-  XCTAssertFalse([dict getUInt64:NULL forKey:12]);
-  XCTAssertTrue([dict getUInt64:NULL forKey:13]);
-  XCTAssertTrue([dict getUInt64:&value forKey:13]);
-  XCTAssertEqual(value, 302U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:14]);
-  XCTAssertTrue([dict getUInt64:&value forKey:14]);
-  XCTAssertEqual(value, 303U);
-
-  [dict removeUInt64ForKey:14];
-  XCTAssertEqual(dict.count, 2U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:11]);
-  XCTAssertTrue([dict getUInt64:&value forKey:11]);
-  XCTAssertEqual(value, 300U);
-  XCTAssertFalse([dict getUInt64:NULL forKey:12]);
-  XCTAssertTrue([dict getUInt64:NULL forKey:13]);
-  XCTAssertTrue([dict getUInt64:&value forKey:13]);
-  XCTAssertEqual(value, 302U);
-  XCTAssertFalse([dict getUInt64:NULL forKey:14]);
-
-  [dict removeAll];
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertFalse([dict getUInt64:NULL forKey:11]);
-  XCTAssertFalse([dict getUInt64:NULL forKey:12]);
-  XCTAssertFalse([dict getUInt64:NULL forKey:13]);
-  XCTAssertFalse([dict getUInt64:NULL forKey:14]);
-  [dict release];
-}
-
-- (void)testInplaceMutation {
-  const int32_t kKeys[] = { 11, 12, 13, 14 };
-  const uint64_t kValues[] = { 300U, 301U, 302U, 303U };
-  GPBInt32UInt64Dictionary *dict =
-      [[GPBInt32UInt64Dictionary alloc] initWithUInt64s:kValues
-                                                forKeys:kKeys
-                                                  count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 4U);
-  uint64_t value;
-  XCTAssertTrue([dict getUInt64:NULL forKey:11]);
-  XCTAssertTrue([dict getUInt64:&value forKey:11]);
-  XCTAssertEqual(value, 300U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:12]);
-  XCTAssertTrue([dict getUInt64:&value forKey:12]);
-  XCTAssertEqual(value, 301U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:13]);
-  XCTAssertTrue([dict getUInt64:&value forKey:13]);
-  XCTAssertEqual(value, 302U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:14]);
-  XCTAssertTrue([dict getUInt64:&value forKey:14]);
-  XCTAssertEqual(value, 303U);
-
-  [dict setUInt64:303U forKey:11];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:11]);
-  XCTAssertTrue([dict getUInt64:&value forKey:11]);
-  XCTAssertEqual(value, 303U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:12]);
-  XCTAssertTrue([dict getUInt64:&value forKey:12]);
-  XCTAssertEqual(value, 301U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:13]);
-  XCTAssertTrue([dict getUInt64:&value forKey:13]);
-  XCTAssertEqual(value, 302U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:14]);
-  XCTAssertTrue([dict getUInt64:&value forKey:14]);
-  XCTAssertEqual(value, 303U);
-
-  [dict setUInt64:301U forKey:14];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:11]);
-  XCTAssertTrue([dict getUInt64:&value forKey:11]);
-  XCTAssertEqual(value, 303U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:12]);
-  XCTAssertTrue([dict getUInt64:&value forKey:12]);
-  XCTAssertEqual(value, 301U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:13]);
-  XCTAssertTrue([dict getUInt64:&value forKey:13]);
-  XCTAssertEqual(value, 302U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:14]);
-  XCTAssertTrue([dict getUInt64:&value forKey:14]);
-  XCTAssertEqual(value, 301U);
-
-  const int32_t kKeys2[] = { 12, 13 };
-  const uint64_t kValues2[] = { 302U, 300U };
-  GPBInt32UInt64Dictionary *dict2 =
-      [[GPBInt32UInt64Dictionary alloc] initWithUInt64s:kValues2
-                                                forKeys:kKeys2
-                                                  count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(dict2);
-  [dict addEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:11]);
-  XCTAssertTrue([dict getUInt64:&value forKey:11]);
-  XCTAssertEqual(value, 303U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:12]);
-  XCTAssertTrue([dict getUInt64:&value forKey:12]);
-  XCTAssertEqual(value, 302U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:13]);
-  XCTAssertTrue([dict getUInt64:&value forKey:13]);
-  XCTAssertEqual(value, 300U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:14]);
-  XCTAssertTrue([dict getUInt64:&value forKey:14]);
-  XCTAssertEqual(value, 301U);
-
-  [dict2 release];
-  [dict release];
-}
-
-@end
-
-#pragma mark - Int32 -> Int64
-
-@interface GPBInt32Int64DictionaryTests : XCTestCase
-@end
-
-@implementation GPBInt32Int64DictionaryTests
-
-- (void)testEmpty {
-  GPBInt32Int64Dictionary *dict = [[GPBInt32Int64Dictionary alloc] init];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertFalse([dict getInt64:NULL forKey:11]);
-  [dict enumerateKeysAndInt64sUsingBlock:^(int32_t aKey, int64_t aValue, BOOL *stop) {
-    #pragma unused(aKey, aValue, stop)
-    XCTFail(@"Shouldn't get here!");
-  }];
-  [dict release];
-}
-
-- (void)testOne {
-  GPBInt32Int64Dictionary *dict = [[GPBInt32Int64Dictionary alloc] init];
-  [dict setInt64:400 forKey:11];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 1U);
-  int64_t value;
-  XCTAssertTrue([dict getInt64:NULL forKey:11]);
-  XCTAssertTrue([dict getInt64:&value forKey:11]);
-  XCTAssertEqual(value, 400);
-  XCTAssertFalse([dict getInt64:NULL forKey:12]);
-  [dict enumerateKeysAndInt64sUsingBlock:^(int32_t aKey, int64_t aValue, BOOL *stop) {
-    XCTAssertEqual(aKey, 11);
-    XCTAssertEqual(aValue, 400);
-    XCTAssertNotEqual(stop, NULL);
-  }];
-  [dict release];
-}
-
-- (void)testBasics {
-  const int32_t kKeys[] = { 11, 12, 13 };
-  const int64_t kValues[] = { 400, 401, 402 };
-  GPBInt32Int64Dictionary *dict =
-      [[GPBInt32Int64Dictionary alloc] initWithInt64s:kValues
-                                              forKeys:kKeys
-                                                count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 3U);
-  int64_t value;
-  XCTAssertTrue([dict getInt64:NULL forKey:11]);
-  XCTAssertTrue([dict getInt64:&value forKey:11]);
-  XCTAssertEqual(value, 400);
-  XCTAssertTrue([dict getInt64:NULL forKey:12]);
-  XCTAssertTrue([dict getInt64:&value forKey:12]);
-  XCTAssertEqual(value, 401);
-  XCTAssertTrue([dict getInt64:NULL forKey:13]);
-  XCTAssertTrue([dict getInt64:&value forKey:13]);
-  XCTAssertEqual(value, 402);
-  XCTAssertFalse([dict getInt64:NULL forKey:14]);
-
-  __block NSUInteger idx = 0;
-  int32_t *seenKeys = malloc(3 * sizeof(int32_t));
-  int64_t *seenValues = malloc(3 * sizeof(int64_t));
-  [dict enumerateKeysAndInt64sUsingBlock:^(int32_t aKey, int64_t aValue, BOOL *stop) {
-    XCTAssertLessThan(idx, 3U);
-    seenKeys[idx] = aKey;
-    seenValues[idx] = aValue;
-    XCTAssertNotEqual(stop, NULL);
-    ++idx;
-  }];
-  for (int i = 0; i < 3; ++i) {
-    BOOL foundKey = NO;
-    for (int j = 0; (j < 3) && !foundKey; ++j) {
-      if (kKeys[i] == seenKeys[j]) {
-        foundKey = YES;
-        XCTAssertEqual(kValues[i], seenValues[j], @"i = %d, j = %d", i, j);
-      }
-    }
-    XCTAssertTrue(foundKey, @"i = %d", i);
-  }
-  free(seenKeys);
-  free(seenValues);
-
-  // Stopping the enumeration.
-  idx = 0;
-  [dict enumerateKeysAndInt64sUsingBlock:^(int32_t aKey, int64_t aValue, BOOL *stop) {
-    #pragma unused(aKey, aValue)
-    if (idx == 1) *stop = YES;
-    XCTAssertNotEqual(idx, 2U);
-    ++idx;
-  }];
-  [dict release];
-}
-
-- (void)testEquality {
-  const int32_t kKeys1[] = { 11, 12, 13, 14 };
-  const int32_t kKeys2[] = { 12, 11, 14 };
-  const int64_t kValues1[] = { 400, 401, 402 };
-  const int64_t kValues2[] = { 400, 403, 402 };
-  const int64_t kValues3[] = { 400, 401, 402, 403 };
-  GPBInt32Int64Dictionary *dict1 =
-      [[GPBInt32Int64Dictionary alloc] initWithInt64s:kValues1
-                                              forKeys:kKeys1
-                                                count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict1);
-  GPBInt32Int64Dictionary *dict1prime =
-      [[GPBInt32Int64Dictionary alloc] initWithInt64s:kValues1
-                                              forKeys:kKeys1
-                                                count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict1prime);
-  GPBInt32Int64Dictionary *dict2 =
-      [[GPBInt32Int64Dictionary alloc] initWithInt64s:kValues2
-                                              forKeys:kKeys1
-                                                count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(dict2);
-  GPBInt32Int64Dictionary *dict3 =
-      [[GPBInt32Int64Dictionary alloc] initWithInt64s:kValues1
-                                              forKeys:kKeys2
-                                                count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict3);
-  GPBInt32Int64Dictionary *dict4 =
-      [[GPBInt32Int64Dictionary alloc] initWithInt64s:kValues3
-                                              forKeys:kKeys1
-                                                count:GPBARRAYSIZE(kValues3)];
-  XCTAssertNotNil(dict4);
-
-  // 1/1Prime should be different objects, but equal.
-  XCTAssertNotEqual(dict1, dict1prime);
-  XCTAssertEqualObjects(dict1, dict1prime);
-  // Equal, so they must have same hash.
-  XCTAssertEqual([dict1 hash], [dict1prime hash]);
-
-  // 2 is same keys, different values; not equal.
-  XCTAssertNotEqualObjects(dict1, dict2);
-
-  // 3 is different keys, same values; not equal.
-  XCTAssertNotEqualObjects(dict1, dict3);
-
-  // 4 extra pair; not equal
-  XCTAssertNotEqualObjects(dict1, dict4);
-
-  [dict1 release];
-  [dict1prime release];
-  [dict2 release];
-  [dict3 release];
-  [dict4 release];
-}
-
-- (void)testCopy {
-  const int32_t kKeys[] = { 11, 12, 13, 14 };
-  const int64_t kValues[] = { 400, 401, 402, 403 };
-  GPBInt32Int64Dictionary *dict =
-      [[GPBInt32Int64Dictionary alloc] initWithInt64s:kValues
-                                              forKeys:kKeys
-                                                count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-
-  GPBInt32Int64Dictionary *dict2 = [dict copy];
-  XCTAssertNotNil(dict2);
-
-  // Should be new object but equal.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  XCTAssertTrue([dict2 isKindOfClass:[GPBInt32Int64Dictionary class]]);
-
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testDictionaryFromDictionary {
-  const int32_t kKeys[] = { 11, 12, 13, 14 };
-  const int64_t kValues[] = { 400, 401, 402, 403 };
-  GPBInt32Int64Dictionary *dict =
-      [[GPBInt32Int64Dictionary alloc] initWithInt64s:kValues
-                                              forKeys:kKeys
-                                                count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-
-  GPBInt32Int64Dictionary *dict2 =
-      [[GPBInt32Int64Dictionary alloc] initWithDictionary:dict];
-  XCTAssertNotNil(dict2);
-
-  // Should be new pointer, but equal objects.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testAdds {
-  GPBInt32Int64Dictionary *dict = [[GPBInt32Int64Dictionary alloc] init];
-  XCTAssertNotNil(dict);
-
-  XCTAssertEqual(dict.count, 0U);
-  [dict setInt64:400 forKey:11];
-  XCTAssertEqual(dict.count, 1U);
-
-  const int32_t kKeys[] = { 12, 13, 14 };
-  const int64_t kValues[] = { 401, 402, 403 };
-  GPBInt32Int64Dictionary *dict2 =
-      [[GPBInt32Int64Dictionary alloc] initWithInt64s:kValues
-                                              forKeys:kKeys
-                                                count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict2);
-  [dict addEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 4U);
-
-  int64_t value;
-  XCTAssertTrue([dict getInt64:NULL forKey:11]);
-  XCTAssertTrue([dict getInt64:&value forKey:11]);
-  XCTAssertEqual(value, 400);
-  XCTAssertTrue([dict getInt64:NULL forKey:12]);
-  XCTAssertTrue([dict getInt64:&value forKey:12]);
-  XCTAssertEqual(value, 401);
-  XCTAssertTrue([dict getInt64:NULL forKey:13]);
-  XCTAssertTrue([dict getInt64:&value forKey:13]);
-  XCTAssertEqual(value, 402);
-  XCTAssertTrue([dict getInt64:NULL forKey:14]);
-  XCTAssertTrue([dict getInt64:&value forKey:14]);
-  XCTAssertEqual(value, 403);
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testRemove {
-  const int32_t kKeys[] = { 11, 12, 13, 14 };
-  const int64_t kValues[] = { 400, 401, 402, 403 };
-  GPBInt32Int64Dictionary *dict =
-      [[GPBInt32Int64Dictionary alloc] initWithInt64s:kValues
-                                              forKeys:kKeys
-                                                count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 4U);
-
-  [dict removeInt64ForKey:12];
-  XCTAssertEqual(dict.count, 3U);
-  int64_t value;
-  XCTAssertTrue([dict getInt64:NULL forKey:11]);
-  XCTAssertTrue([dict getInt64:&value forKey:11]);
-  XCTAssertEqual(value, 400);
-  XCTAssertFalse([dict getInt64:NULL forKey:12]);
-  XCTAssertTrue([dict getInt64:NULL forKey:13]);
-  XCTAssertTrue([dict getInt64:&value forKey:13]);
-  XCTAssertEqual(value, 402);
-  XCTAssertTrue([dict getInt64:NULL forKey:14]);
-  XCTAssertTrue([dict getInt64:&value forKey:14]);
-  XCTAssertEqual(value, 403);
-
-  // Remove again does nothing.
-  [dict removeInt64ForKey:12];
-  XCTAssertEqual(dict.count, 3U);
-  XCTAssertTrue([dict getInt64:NULL forKey:11]);
-  XCTAssertTrue([dict getInt64:&value forKey:11]);
-  XCTAssertEqual(value, 400);
-  XCTAssertFalse([dict getInt64:NULL forKey:12]);
-  XCTAssertTrue([dict getInt64:NULL forKey:13]);
-  XCTAssertTrue([dict getInt64:&value forKey:13]);
-  XCTAssertEqual(value, 402);
-  XCTAssertTrue([dict getInt64:NULL forKey:14]);
-  XCTAssertTrue([dict getInt64:&value forKey:14]);
-  XCTAssertEqual(value, 403);
-
-  [dict removeInt64ForKey:14];
-  XCTAssertEqual(dict.count, 2U);
-  XCTAssertTrue([dict getInt64:NULL forKey:11]);
-  XCTAssertTrue([dict getInt64:&value forKey:11]);
-  XCTAssertEqual(value, 400);
-  XCTAssertFalse([dict getInt64:NULL forKey:12]);
-  XCTAssertTrue([dict getInt64:NULL forKey:13]);
-  XCTAssertTrue([dict getInt64:&value forKey:13]);
-  XCTAssertEqual(value, 402);
-  XCTAssertFalse([dict getInt64:NULL forKey:14]);
-
-  [dict removeAll];
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertFalse([dict getInt64:NULL forKey:11]);
-  XCTAssertFalse([dict getInt64:NULL forKey:12]);
-  XCTAssertFalse([dict getInt64:NULL forKey:13]);
-  XCTAssertFalse([dict getInt64:NULL forKey:14]);
-  [dict release];
-}
-
-- (void)testInplaceMutation {
-  const int32_t kKeys[] = { 11, 12, 13, 14 };
-  const int64_t kValues[] = { 400, 401, 402, 403 };
-  GPBInt32Int64Dictionary *dict =
-      [[GPBInt32Int64Dictionary alloc] initWithInt64s:kValues
-                                              forKeys:kKeys
-                                                count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 4U);
-  int64_t value;
-  XCTAssertTrue([dict getInt64:NULL forKey:11]);
-  XCTAssertTrue([dict getInt64:&value forKey:11]);
-  XCTAssertEqual(value, 400);
-  XCTAssertTrue([dict getInt64:NULL forKey:12]);
-  XCTAssertTrue([dict getInt64:&value forKey:12]);
-  XCTAssertEqual(value, 401);
-  XCTAssertTrue([dict getInt64:NULL forKey:13]);
-  XCTAssertTrue([dict getInt64:&value forKey:13]);
-  XCTAssertEqual(value, 402);
-  XCTAssertTrue([dict getInt64:NULL forKey:14]);
-  XCTAssertTrue([dict getInt64:&value forKey:14]);
-  XCTAssertEqual(value, 403);
-
-  [dict setInt64:403 forKey:11];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getInt64:NULL forKey:11]);
-  XCTAssertTrue([dict getInt64:&value forKey:11]);
-  XCTAssertEqual(value, 403);
-  XCTAssertTrue([dict getInt64:NULL forKey:12]);
-  XCTAssertTrue([dict getInt64:&value forKey:12]);
-  XCTAssertEqual(value, 401);
-  XCTAssertTrue([dict getInt64:NULL forKey:13]);
-  XCTAssertTrue([dict getInt64:&value forKey:13]);
-  XCTAssertEqual(value, 402);
-  XCTAssertTrue([dict getInt64:NULL forKey:14]);
-  XCTAssertTrue([dict getInt64:&value forKey:14]);
-  XCTAssertEqual(value, 403);
-
-  [dict setInt64:401 forKey:14];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getInt64:NULL forKey:11]);
-  XCTAssertTrue([dict getInt64:&value forKey:11]);
-  XCTAssertEqual(value, 403);
-  XCTAssertTrue([dict getInt64:NULL forKey:12]);
-  XCTAssertTrue([dict getInt64:&value forKey:12]);
-  XCTAssertEqual(value, 401);
-  XCTAssertTrue([dict getInt64:NULL forKey:13]);
-  XCTAssertTrue([dict getInt64:&value forKey:13]);
-  XCTAssertEqual(value, 402);
-  XCTAssertTrue([dict getInt64:NULL forKey:14]);
-  XCTAssertTrue([dict getInt64:&value forKey:14]);
-  XCTAssertEqual(value, 401);
-
-  const int32_t kKeys2[] = { 12, 13 };
-  const int64_t kValues2[] = { 402, 400 };
-  GPBInt32Int64Dictionary *dict2 =
-      [[GPBInt32Int64Dictionary alloc] initWithInt64s:kValues2
-                                              forKeys:kKeys2
-                                                count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(dict2);
-  [dict addEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getInt64:NULL forKey:11]);
-  XCTAssertTrue([dict getInt64:&value forKey:11]);
-  XCTAssertEqual(value, 403);
-  XCTAssertTrue([dict getInt64:NULL forKey:12]);
-  XCTAssertTrue([dict getInt64:&value forKey:12]);
-  XCTAssertEqual(value, 402);
-  XCTAssertTrue([dict getInt64:NULL forKey:13]);
-  XCTAssertTrue([dict getInt64:&value forKey:13]);
-  XCTAssertEqual(value, 400);
-  XCTAssertTrue([dict getInt64:NULL forKey:14]);
-  XCTAssertTrue([dict getInt64:&value forKey:14]);
-  XCTAssertEqual(value, 401);
-
-  [dict2 release];
-  [dict release];
-}
-
-@end
-
-#pragma mark - Int32 -> Bool
-
-@interface GPBInt32BoolDictionaryTests : XCTestCase
-@end
-
-@implementation GPBInt32BoolDictionaryTests
-
-- (void)testEmpty {
-  GPBInt32BoolDictionary *dict = [[GPBInt32BoolDictionary alloc] init];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertFalse([dict getBool:NULL forKey:11]);
-  [dict enumerateKeysAndBoolsUsingBlock:^(int32_t aKey, BOOL aValue, BOOL *stop) {
-    #pragma unused(aKey, aValue, stop)
-    XCTFail(@"Shouldn't get here!");
-  }];
-  [dict release];
-}
-
-- (void)testOne {
-  GPBInt32BoolDictionary *dict = [[GPBInt32BoolDictionary alloc] init];
-  [dict setBool:YES forKey:11];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 1U);
-  BOOL value;
-  XCTAssertTrue([dict getBool:NULL forKey:11]);
-  XCTAssertTrue([dict getBool:&value forKey:11]);
-  XCTAssertEqual(value, YES);
-  XCTAssertFalse([dict getBool:NULL forKey:12]);
-  [dict enumerateKeysAndBoolsUsingBlock:^(int32_t aKey, BOOL aValue, BOOL *stop) {
-    XCTAssertEqual(aKey, 11);
-    XCTAssertEqual(aValue, YES);
-    XCTAssertNotEqual(stop, NULL);
-  }];
-  [dict release];
-}
-
-- (void)testBasics {
-  const int32_t kKeys[] = { 11, 12, 13 };
-  const BOOL kValues[] = { YES, YES, NO };
-  GPBInt32BoolDictionary *dict =
-      [[GPBInt32BoolDictionary alloc] initWithBools:kValues
-                                            forKeys:kKeys
-                                              count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 3U);
-  BOOL value;
-  XCTAssertTrue([dict getBool:NULL forKey:11]);
-  XCTAssertTrue([dict getBool:&value forKey:11]);
-  XCTAssertEqual(value, YES);
-  XCTAssertTrue([dict getBool:NULL forKey:12]);
-  XCTAssertTrue([dict getBool:&value forKey:12]);
-  XCTAssertEqual(value, YES);
-  XCTAssertTrue([dict getBool:NULL forKey:13]);
-  XCTAssertTrue([dict getBool:&value forKey:13]);
-  XCTAssertEqual(value, NO);
-  XCTAssertFalse([dict getBool:NULL forKey:14]);
-
-  __block NSUInteger idx = 0;
-  int32_t *seenKeys = malloc(3 * sizeof(int32_t));
-  BOOL *seenValues = malloc(3 * sizeof(BOOL));
-  [dict enumerateKeysAndBoolsUsingBlock:^(int32_t aKey, BOOL aValue, BOOL *stop) {
-    XCTAssertLessThan(idx, 3U);
-    seenKeys[idx] = aKey;
-    seenValues[idx] = aValue;
-    XCTAssertNotEqual(stop, NULL);
-    ++idx;
-  }];
-  for (int i = 0; i < 3; ++i) {
-    BOOL foundKey = NO;
-    for (int j = 0; (j < 3) && !foundKey; ++j) {
-      if (kKeys[i] == seenKeys[j]) {
-        foundKey = YES;
-        XCTAssertEqual(kValues[i], seenValues[j], @"i = %d, j = %d", i, j);
-      }
-    }
-    XCTAssertTrue(foundKey, @"i = %d", i);
-  }
-  free(seenKeys);
-  free(seenValues);
-
-  // Stopping the enumeration.
-  idx = 0;
-  [dict enumerateKeysAndBoolsUsingBlock:^(int32_t aKey, BOOL aValue, BOOL *stop) {
-    #pragma unused(aKey, aValue)
-    if (idx == 1) *stop = YES;
-    XCTAssertNotEqual(idx, 2U);
-    ++idx;
-  }];
-  [dict release];
-}
-
-- (void)testEquality {
-  const int32_t kKeys1[] = { 11, 12, 13, 14 };
-  const int32_t kKeys2[] = { 12, 11, 14 };
-  const BOOL kValues1[] = { YES, YES, NO };
-  const BOOL kValues2[] = { YES, NO, NO };
-  const BOOL kValues3[] = { YES, YES, NO, NO };
-  GPBInt32BoolDictionary *dict1 =
-      [[GPBInt32BoolDictionary alloc] initWithBools:kValues1
-                                            forKeys:kKeys1
-                                              count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict1);
-  GPBInt32BoolDictionary *dict1prime =
-      [[GPBInt32BoolDictionary alloc] initWithBools:kValues1
-                                            forKeys:kKeys1
-                                              count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict1prime);
-  GPBInt32BoolDictionary *dict2 =
-      [[GPBInt32BoolDictionary alloc] initWithBools:kValues2
-                                            forKeys:kKeys1
-                                              count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(dict2);
-  GPBInt32BoolDictionary *dict3 =
-      [[GPBInt32BoolDictionary alloc] initWithBools:kValues1
-                                            forKeys:kKeys2
-                                              count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict3);
-  GPBInt32BoolDictionary *dict4 =
-      [[GPBInt32BoolDictionary alloc] initWithBools:kValues3
-                                            forKeys:kKeys1
-                                              count:GPBARRAYSIZE(kValues3)];
-  XCTAssertNotNil(dict4);
-
-  // 1/1Prime should be different objects, but equal.
-  XCTAssertNotEqual(dict1, dict1prime);
-  XCTAssertEqualObjects(dict1, dict1prime);
-  // Equal, so they must have same hash.
-  XCTAssertEqual([dict1 hash], [dict1prime hash]);
-
-  // 2 is same keys, different values; not equal.
-  XCTAssertNotEqualObjects(dict1, dict2);
-
-  // 3 is different keys, same values; not equal.
-  XCTAssertNotEqualObjects(dict1, dict3);
-
-  // 4 extra pair; not equal
-  XCTAssertNotEqualObjects(dict1, dict4);
-
-  [dict1 release];
-  [dict1prime release];
-  [dict2 release];
-  [dict3 release];
-  [dict4 release];
-}
-
-- (void)testCopy {
-  const int32_t kKeys[] = { 11, 12, 13, 14 };
-  const BOOL kValues[] = { YES, YES, NO, NO };
-  GPBInt32BoolDictionary *dict =
-      [[GPBInt32BoolDictionary alloc] initWithBools:kValues
-                                            forKeys:kKeys
-                                              count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-
-  GPBInt32BoolDictionary *dict2 = [dict copy];
-  XCTAssertNotNil(dict2);
-
-  // Should be new object but equal.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  XCTAssertTrue([dict2 isKindOfClass:[GPBInt32BoolDictionary class]]);
-
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testDictionaryFromDictionary {
-  const int32_t kKeys[] = { 11, 12, 13, 14 };
-  const BOOL kValues[] = { YES, YES, NO, NO };
-  GPBInt32BoolDictionary *dict =
-      [[GPBInt32BoolDictionary alloc] initWithBools:kValues
-                                            forKeys:kKeys
-                                              count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-
-  GPBInt32BoolDictionary *dict2 =
-      [[GPBInt32BoolDictionary alloc] initWithDictionary:dict];
-  XCTAssertNotNil(dict2);
-
-  // Should be new pointer, but equal objects.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testAdds {
-  GPBInt32BoolDictionary *dict = [[GPBInt32BoolDictionary alloc] init];
-  XCTAssertNotNil(dict);
-
-  XCTAssertEqual(dict.count, 0U);
-  [dict setBool:YES forKey:11];
-  XCTAssertEqual(dict.count, 1U);
-
-  const int32_t kKeys[] = { 12, 13, 14 };
-  const BOOL kValues[] = { YES, NO, NO };
-  GPBInt32BoolDictionary *dict2 =
-      [[GPBInt32BoolDictionary alloc] initWithBools:kValues
-                                            forKeys:kKeys
-                                              count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict2);
-  [dict addEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 4U);
-
-  BOOL value;
-  XCTAssertTrue([dict getBool:NULL forKey:11]);
-  XCTAssertTrue([dict getBool:&value forKey:11]);
-  XCTAssertEqual(value, YES);
-  XCTAssertTrue([dict getBool:NULL forKey:12]);
-  XCTAssertTrue([dict getBool:&value forKey:12]);
-  XCTAssertEqual(value, YES);
-  XCTAssertTrue([dict getBool:NULL forKey:13]);
-  XCTAssertTrue([dict getBool:&value forKey:13]);
-  XCTAssertEqual(value, NO);
-  XCTAssertTrue([dict getBool:NULL forKey:14]);
-  XCTAssertTrue([dict getBool:&value forKey:14]);
-  XCTAssertEqual(value, NO);
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testRemove {
-  const int32_t kKeys[] = { 11, 12, 13, 14 };
-  const BOOL kValues[] = { YES, YES, NO, NO };
-  GPBInt32BoolDictionary *dict =
-      [[GPBInt32BoolDictionary alloc] initWithBools:kValues
-                                            forKeys:kKeys
-                                              count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 4U);
-
-  [dict removeBoolForKey:12];
-  XCTAssertEqual(dict.count, 3U);
-  BOOL value;
-  XCTAssertTrue([dict getBool:NULL forKey:11]);
-  XCTAssertTrue([dict getBool:&value forKey:11]);
-  XCTAssertEqual(value, YES);
-  XCTAssertFalse([dict getBool:NULL forKey:12]);
-  XCTAssertTrue([dict getBool:NULL forKey:13]);
-  XCTAssertTrue([dict getBool:&value forKey:13]);
-  XCTAssertEqual(value, NO);
-  XCTAssertTrue([dict getBool:NULL forKey:14]);
-  XCTAssertTrue([dict getBool:&value forKey:14]);
-  XCTAssertEqual(value, NO);
-
-  // Remove again does nothing.
-  [dict removeBoolForKey:12];
-  XCTAssertEqual(dict.count, 3U);
-  XCTAssertTrue([dict getBool:NULL forKey:11]);
-  XCTAssertTrue([dict getBool:&value forKey:11]);
-  XCTAssertEqual(value, YES);
-  XCTAssertFalse([dict getBool:NULL forKey:12]);
-  XCTAssertTrue([dict getBool:NULL forKey:13]);
-  XCTAssertTrue([dict getBool:&value forKey:13]);
-  XCTAssertEqual(value, NO);
-  XCTAssertTrue([dict getBool:NULL forKey:14]);
-  XCTAssertTrue([dict getBool:&value forKey:14]);
-  XCTAssertEqual(value, NO);
-
-  [dict removeBoolForKey:14];
-  XCTAssertEqual(dict.count, 2U);
-  XCTAssertTrue([dict getBool:NULL forKey:11]);
-  XCTAssertTrue([dict getBool:&value forKey:11]);
-  XCTAssertEqual(value, YES);
-  XCTAssertFalse([dict getBool:NULL forKey:12]);
-  XCTAssertTrue([dict getBool:NULL forKey:13]);
-  XCTAssertTrue([dict getBool:&value forKey:13]);
-  XCTAssertEqual(value, NO);
-  XCTAssertFalse([dict getBool:NULL forKey:14]);
-
-  [dict removeAll];
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertFalse([dict getBool:NULL forKey:11]);
-  XCTAssertFalse([dict getBool:NULL forKey:12]);
-  XCTAssertFalse([dict getBool:NULL forKey:13]);
-  XCTAssertFalse([dict getBool:NULL forKey:14]);
-  [dict release];
-}
-
-- (void)testInplaceMutation {
-  const int32_t kKeys[] = { 11, 12, 13, 14 };
-  const BOOL kValues[] = { YES, YES, NO, NO };
-  GPBInt32BoolDictionary *dict =
-      [[GPBInt32BoolDictionary alloc] initWithBools:kValues
-                                            forKeys:kKeys
-                                              count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 4U);
-  BOOL value;
-  XCTAssertTrue([dict getBool:NULL forKey:11]);
-  XCTAssertTrue([dict getBool:&value forKey:11]);
-  XCTAssertEqual(value, YES);
-  XCTAssertTrue([dict getBool:NULL forKey:12]);
-  XCTAssertTrue([dict getBool:&value forKey:12]);
-  XCTAssertEqual(value, YES);
-  XCTAssertTrue([dict getBool:NULL forKey:13]);
-  XCTAssertTrue([dict getBool:&value forKey:13]);
-  XCTAssertEqual(value, NO);
-  XCTAssertTrue([dict getBool:NULL forKey:14]);
-  XCTAssertTrue([dict getBool:&value forKey:14]);
-  XCTAssertEqual(value, NO);
-
-  [dict setBool:NO forKey:11];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getBool:NULL forKey:11]);
-  XCTAssertTrue([dict getBool:&value forKey:11]);
-  XCTAssertEqual(value, NO);
-  XCTAssertTrue([dict getBool:NULL forKey:12]);
-  XCTAssertTrue([dict getBool:&value forKey:12]);
-  XCTAssertEqual(value, YES);
-  XCTAssertTrue([dict getBool:NULL forKey:13]);
-  XCTAssertTrue([dict getBool:&value forKey:13]);
-  XCTAssertEqual(value, NO);
-  XCTAssertTrue([dict getBool:NULL forKey:14]);
-  XCTAssertTrue([dict getBool:&value forKey:14]);
-  XCTAssertEqual(value, NO);
-
-  [dict setBool:YES forKey:14];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getBool:NULL forKey:11]);
-  XCTAssertTrue([dict getBool:&value forKey:11]);
-  XCTAssertEqual(value, NO);
-  XCTAssertTrue([dict getBool:NULL forKey:12]);
-  XCTAssertTrue([dict getBool:&value forKey:12]);
-  XCTAssertEqual(value, YES);
-  XCTAssertTrue([dict getBool:NULL forKey:13]);
-  XCTAssertTrue([dict getBool:&value forKey:13]);
-  XCTAssertEqual(value, NO);
-  XCTAssertTrue([dict getBool:NULL forKey:14]);
-  XCTAssertTrue([dict getBool:&value forKey:14]);
-  XCTAssertEqual(value, YES);
-
-  const int32_t kKeys2[] = { 12, 13 };
-  const BOOL kValues2[] = { NO, YES };
-  GPBInt32BoolDictionary *dict2 =
-      [[GPBInt32BoolDictionary alloc] initWithBools:kValues2
-                                            forKeys:kKeys2
-                                              count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(dict2);
-  [dict addEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getBool:NULL forKey:11]);
-  XCTAssertTrue([dict getBool:&value forKey:11]);
-  XCTAssertEqual(value, NO);
-  XCTAssertTrue([dict getBool:NULL forKey:12]);
-  XCTAssertTrue([dict getBool:&value forKey:12]);
-  XCTAssertEqual(value, NO);
-  XCTAssertTrue([dict getBool:NULL forKey:13]);
-  XCTAssertTrue([dict getBool:&value forKey:13]);
-  XCTAssertEqual(value, YES);
-  XCTAssertTrue([dict getBool:NULL forKey:14]);
-  XCTAssertTrue([dict getBool:&value forKey:14]);
-  XCTAssertEqual(value, YES);
-
-  [dict2 release];
-  [dict release];
-}
-
-@end
-
-#pragma mark - Int32 -> Float
-
-@interface GPBInt32FloatDictionaryTests : XCTestCase
-@end
-
-@implementation GPBInt32FloatDictionaryTests
-
-- (void)testEmpty {
-  GPBInt32FloatDictionary *dict = [[GPBInt32FloatDictionary alloc] init];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertFalse([dict getFloat:NULL forKey:11]);
-  [dict enumerateKeysAndFloatsUsingBlock:^(int32_t aKey, float aValue, BOOL *stop) {
-    #pragma unused(aKey, aValue, stop)
-    XCTFail(@"Shouldn't get here!");
-  }];
-  [dict release];
-}
-
-- (void)testOne {
-  GPBInt32FloatDictionary *dict = [[GPBInt32FloatDictionary alloc] init];
-  [dict setFloat:500.f forKey:11];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 1U);
-  float value;
-  XCTAssertTrue([dict getFloat:NULL forKey:11]);
-  XCTAssertTrue([dict getFloat:&value forKey:11]);
-  XCTAssertEqual(value, 500.f);
-  XCTAssertFalse([dict getFloat:NULL forKey:12]);
-  [dict enumerateKeysAndFloatsUsingBlock:^(int32_t aKey, float aValue, BOOL *stop) {
-    XCTAssertEqual(aKey, 11);
-    XCTAssertEqual(aValue, 500.f);
-    XCTAssertNotEqual(stop, NULL);
-  }];
-  [dict release];
-}
-
-- (void)testBasics {
-  const int32_t kKeys[] = { 11, 12, 13 };
-  const float kValues[] = { 500.f, 501.f, 502.f };
-  GPBInt32FloatDictionary *dict =
-      [[GPBInt32FloatDictionary alloc] initWithFloats:kValues
-                                              forKeys:kKeys
-                                                count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 3U);
-  float value;
-  XCTAssertTrue([dict getFloat:NULL forKey:11]);
-  XCTAssertTrue([dict getFloat:&value forKey:11]);
-  XCTAssertEqual(value, 500.f);
-  XCTAssertTrue([dict getFloat:NULL forKey:12]);
-  XCTAssertTrue([dict getFloat:&value forKey:12]);
-  XCTAssertEqual(value, 501.f);
-  XCTAssertTrue([dict getFloat:NULL forKey:13]);
-  XCTAssertTrue([dict getFloat:&value forKey:13]);
-  XCTAssertEqual(value, 502.f);
-  XCTAssertFalse([dict getFloat:NULL forKey:14]);
-
-  __block NSUInteger idx = 0;
-  int32_t *seenKeys = malloc(3 * sizeof(int32_t));
-  float *seenValues = malloc(3 * sizeof(float));
-  [dict enumerateKeysAndFloatsUsingBlock:^(int32_t aKey, float aValue, BOOL *stop) {
-    XCTAssertLessThan(idx, 3U);
-    seenKeys[idx] = aKey;
-    seenValues[idx] = aValue;
-    XCTAssertNotEqual(stop, NULL);
-    ++idx;
-  }];
-  for (int i = 0; i < 3; ++i) {
-    BOOL foundKey = NO;
-    for (int j = 0; (j < 3) && !foundKey; ++j) {
-      if (kKeys[i] == seenKeys[j]) {
-        foundKey = YES;
-        XCTAssertEqual(kValues[i], seenValues[j], @"i = %d, j = %d", i, j);
-      }
-    }
-    XCTAssertTrue(foundKey, @"i = %d", i);
-  }
-  free(seenKeys);
-  free(seenValues);
-
-  // Stopping the enumeration.
-  idx = 0;
-  [dict enumerateKeysAndFloatsUsingBlock:^(int32_t aKey, float aValue, BOOL *stop) {
-    #pragma unused(aKey, aValue)
-    if (idx == 1) *stop = YES;
-    XCTAssertNotEqual(idx, 2U);
-    ++idx;
-  }];
-  [dict release];
-}
-
-- (void)testEquality {
-  const int32_t kKeys1[] = { 11, 12, 13, 14 };
-  const int32_t kKeys2[] = { 12, 11, 14 };
-  const float kValues1[] = { 500.f, 501.f, 502.f };
-  const float kValues2[] = { 500.f, 503.f, 502.f };
-  const float kValues3[] = { 500.f, 501.f, 502.f, 503.f };
-  GPBInt32FloatDictionary *dict1 =
-      [[GPBInt32FloatDictionary alloc] initWithFloats:kValues1
-                                              forKeys:kKeys1
-                                                count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict1);
-  GPBInt32FloatDictionary *dict1prime =
-      [[GPBInt32FloatDictionary alloc] initWithFloats:kValues1
-                                              forKeys:kKeys1
-                                                count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict1prime);
-  GPBInt32FloatDictionary *dict2 =
-      [[GPBInt32FloatDictionary alloc] initWithFloats:kValues2
-                                              forKeys:kKeys1
-                                                count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(dict2);
-  GPBInt32FloatDictionary *dict3 =
-      [[GPBInt32FloatDictionary alloc] initWithFloats:kValues1
-                                              forKeys:kKeys2
-                                                count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict3);
-  GPBInt32FloatDictionary *dict4 =
-      [[GPBInt32FloatDictionary alloc] initWithFloats:kValues3
-                                              forKeys:kKeys1
-                                                count:GPBARRAYSIZE(kValues3)];
-  XCTAssertNotNil(dict4);
-
-  // 1/1Prime should be different objects, but equal.
-  XCTAssertNotEqual(dict1, dict1prime);
-  XCTAssertEqualObjects(dict1, dict1prime);
-  // Equal, so they must have same hash.
-  XCTAssertEqual([dict1 hash], [dict1prime hash]);
-
-  // 2 is same keys, different values; not equal.
-  XCTAssertNotEqualObjects(dict1, dict2);
-
-  // 3 is different keys, same values; not equal.
-  XCTAssertNotEqualObjects(dict1, dict3);
-
-  // 4 extra pair; not equal
-  XCTAssertNotEqualObjects(dict1, dict4);
-
-  [dict1 release];
-  [dict1prime release];
-  [dict2 release];
-  [dict3 release];
-  [dict4 release];
-}
-
-- (void)testCopy {
-  const int32_t kKeys[] = { 11, 12, 13, 14 };
-  const float kValues[] = { 500.f, 501.f, 502.f, 503.f };
-  GPBInt32FloatDictionary *dict =
-      [[GPBInt32FloatDictionary alloc] initWithFloats:kValues
-                                              forKeys:kKeys
-                                                count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-
-  GPBInt32FloatDictionary *dict2 = [dict copy];
-  XCTAssertNotNil(dict2);
-
-  // Should be new object but equal.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  XCTAssertTrue([dict2 isKindOfClass:[GPBInt32FloatDictionary class]]);
-
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testDictionaryFromDictionary {
-  const int32_t kKeys[] = { 11, 12, 13, 14 };
-  const float kValues[] = { 500.f, 501.f, 502.f, 503.f };
-  GPBInt32FloatDictionary *dict =
-      [[GPBInt32FloatDictionary alloc] initWithFloats:kValues
-                                              forKeys:kKeys
-                                                count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-
-  GPBInt32FloatDictionary *dict2 =
-      [[GPBInt32FloatDictionary alloc] initWithDictionary:dict];
-  XCTAssertNotNil(dict2);
-
-  // Should be new pointer, but equal objects.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testAdds {
-  GPBInt32FloatDictionary *dict = [[GPBInt32FloatDictionary alloc] init];
-  XCTAssertNotNil(dict);
-
-  XCTAssertEqual(dict.count, 0U);
-  [dict setFloat:500.f forKey:11];
-  XCTAssertEqual(dict.count, 1U);
-
-  const int32_t kKeys[] = { 12, 13, 14 };
-  const float kValues[] = { 501.f, 502.f, 503.f };
-  GPBInt32FloatDictionary *dict2 =
-      [[GPBInt32FloatDictionary alloc] initWithFloats:kValues
-                                              forKeys:kKeys
-                                                count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict2);
-  [dict addEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 4U);
-
-  float value;
-  XCTAssertTrue([dict getFloat:NULL forKey:11]);
-  XCTAssertTrue([dict getFloat:&value forKey:11]);
-  XCTAssertEqual(value, 500.f);
-  XCTAssertTrue([dict getFloat:NULL forKey:12]);
-  XCTAssertTrue([dict getFloat:&value forKey:12]);
-  XCTAssertEqual(value, 501.f);
-  XCTAssertTrue([dict getFloat:NULL forKey:13]);
-  XCTAssertTrue([dict getFloat:&value forKey:13]);
-  XCTAssertEqual(value, 502.f);
-  XCTAssertTrue([dict getFloat:NULL forKey:14]);
-  XCTAssertTrue([dict getFloat:&value forKey:14]);
-  XCTAssertEqual(value, 503.f);
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testRemove {
-  const int32_t kKeys[] = { 11, 12, 13, 14 };
-  const float kValues[] = { 500.f, 501.f, 502.f, 503.f };
-  GPBInt32FloatDictionary *dict =
-      [[GPBInt32FloatDictionary alloc] initWithFloats:kValues
-                                              forKeys:kKeys
-                                                count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 4U);
-
-  [dict removeFloatForKey:12];
-  XCTAssertEqual(dict.count, 3U);
-  float value;
-  XCTAssertTrue([dict getFloat:NULL forKey:11]);
-  XCTAssertTrue([dict getFloat:&value forKey:11]);
-  XCTAssertEqual(value, 500.f);
-  XCTAssertFalse([dict getFloat:NULL forKey:12]);
-  XCTAssertTrue([dict getFloat:NULL forKey:13]);
-  XCTAssertTrue([dict getFloat:&value forKey:13]);
-  XCTAssertEqual(value, 502.f);
-  XCTAssertTrue([dict getFloat:NULL forKey:14]);
-  XCTAssertTrue([dict getFloat:&value forKey:14]);
-  XCTAssertEqual(value, 503.f);
-
-  // Remove again does nothing.
-  [dict removeFloatForKey:12];
-  XCTAssertEqual(dict.count, 3U);
-  XCTAssertTrue([dict getFloat:NULL forKey:11]);
-  XCTAssertTrue([dict getFloat:&value forKey:11]);
-  XCTAssertEqual(value, 500.f);
-  XCTAssertFalse([dict getFloat:NULL forKey:12]);
-  XCTAssertTrue([dict getFloat:NULL forKey:13]);
-  XCTAssertTrue([dict getFloat:&value forKey:13]);
-  XCTAssertEqual(value, 502.f);
-  XCTAssertTrue([dict getFloat:NULL forKey:14]);
-  XCTAssertTrue([dict getFloat:&value forKey:14]);
-  XCTAssertEqual(value, 503.f);
-
-  [dict removeFloatForKey:14];
-  XCTAssertEqual(dict.count, 2U);
-  XCTAssertTrue([dict getFloat:NULL forKey:11]);
-  XCTAssertTrue([dict getFloat:&value forKey:11]);
-  XCTAssertEqual(value, 500.f);
-  XCTAssertFalse([dict getFloat:NULL forKey:12]);
-  XCTAssertTrue([dict getFloat:NULL forKey:13]);
-  XCTAssertTrue([dict getFloat:&value forKey:13]);
-  XCTAssertEqual(value, 502.f);
-  XCTAssertFalse([dict getFloat:NULL forKey:14]);
-
-  [dict removeAll];
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertFalse([dict getFloat:NULL forKey:11]);
-  XCTAssertFalse([dict getFloat:NULL forKey:12]);
-  XCTAssertFalse([dict getFloat:NULL forKey:13]);
-  XCTAssertFalse([dict getFloat:NULL forKey:14]);
-  [dict release];
-}
-
-- (void)testInplaceMutation {
-  const int32_t kKeys[] = { 11, 12, 13, 14 };
-  const float kValues[] = { 500.f, 501.f, 502.f, 503.f };
-  GPBInt32FloatDictionary *dict =
-      [[GPBInt32FloatDictionary alloc] initWithFloats:kValues
-                                              forKeys:kKeys
-                                                count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 4U);
-  float value;
-  XCTAssertTrue([dict getFloat:NULL forKey:11]);
-  XCTAssertTrue([dict getFloat:&value forKey:11]);
-  XCTAssertEqual(value, 500.f);
-  XCTAssertTrue([dict getFloat:NULL forKey:12]);
-  XCTAssertTrue([dict getFloat:&value forKey:12]);
-  XCTAssertEqual(value, 501.f);
-  XCTAssertTrue([dict getFloat:NULL forKey:13]);
-  XCTAssertTrue([dict getFloat:&value forKey:13]);
-  XCTAssertEqual(value, 502.f);
-  XCTAssertTrue([dict getFloat:NULL forKey:14]);
-  XCTAssertTrue([dict getFloat:&value forKey:14]);
-  XCTAssertEqual(value, 503.f);
-
-  [dict setFloat:503.f forKey:11];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getFloat:NULL forKey:11]);
-  XCTAssertTrue([dict getFloat:&value forKey:11]);
-  XCTAssertEqual(value, 503.f);
-  XCTAssertTrue([dict getFloat:NULL forKey:12]);
-  XCTAssertTrue([dict getFloat:&value forKey:12]);
-  XCTAssertEqual(value, 501.f);
-  XCTAssertTrue([dict getFloat:NULL forKey:13]);
-  XCTAssertTrue([dict getFloat:&value forKey:13]);
-  XCTAssertEqual(value, 502.f);
-  XCTAssertTrue([dict getFloat:NULL forKey:14]);
-  XCTAssertTrue([dict getFloat:&value forKey:14]);
-  XCTAssertEqual(value, 503.f);
-
-  [dict setFloat:501.f forKey:14];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getFloat:NULL forKey:11]);
-  XCTAssertTrue([dict getFloat:&value forKey:11]);
-  XCTAssertEqual(value, 503.f);
-  XCTAssertTrue([dict getFloat:NULL forKey:12]);
-  XCTAssertTrue([dict getFloat:&value forKey:12]);
-  XCTAssertEqual(value, 501.f);
-  XCTAssertTrue([dict getFloat:NULL forKey:13]);
-  XCTAssertTrue([dict getFloat:&value forKey:13]);
-  XCTAssertEqual(value, 502.f);
-  XCTAssertTrue([dict getFloat:NULL forKey:14]);
-  XCTAssertTrue([dict getFloat:&value forKey:14]);
-  XCTAssertEqual(value, 501.f);
-
-  const int32_t kKeys2[] = { 12, 13 };
-  const float kValues2[] = { 502.f, 500.f };
-  GPBInt32FloatDictionary *dict2 =
-      [[GPBInt32FloatDictionary alloc] initWithFloats:kValues2
-                                              forKeys:kKeys2
-                                                count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(dict2);
-  [dict addEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getFloat:NULL forKey:11]);
-  XCTAssertTrue([dict getFloat:&value forKey:11]);
-  XCTAssertEqual(value, 503.f);
-  XCTAssertTrue([dict getFloat:NULL forKey:12]);
-  XCTAssertTrue([dict getFloat:&value forKey:12]);
-  XCTAssertEqual(value, 502.f);
-  XCTAssertTrue([dict getFloat:NULL forKey:13]);
-  XCTAssertTrue([dict getFloat:&value forKey:13]);
-  XCTAssertEqual(value, 500.f);
-  XCTAssertTrue([dict getFloat:NULL forKey:14]);
-  XCTAssertTrue([dict getFloat:&value forKey:14]);
-  XCTAssertEqual(value, 501.f);
-
-  [dict2 release];
-  [dict release];
-}
-
-@end
-
-#pragma mark - Int32 -> Double
-
-@interface GPBInt32DoubleDictionaryTests : XCTestCase
-@end
-
-@implementation GPBInt32DoubleDictionaryTests
-
-- (void)testEmpty {
-  GPBInt32DoubleDictionary *dict = [[GPBInt32DoubleDictionary alloc] init];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertFalse([dict getDouble:NULL forKey:11]);
-  [dict enumerateKeysAndDoublesUsingBlock:^(int32_t aKey, double aValue, BOOL *stop) {
-    #pragma unused(aKey, aValue, stop)
-    XCTFail(@"Shouldn't get here!");
-  }];
-  [dict release];
-}
-
-- (void)testOne {
-  GPBInt32DoubleDictionary *dict = [[GPBInt32DoubleDictionary alloc] init];
-  [dict setDouble:600. forKey:11];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 1U);
-  double value;
-  XCTAssertTrue([dict getDouble:NULL forKey:11]);
-  XCTAssertTrue([dict getDouble:&value forKey:11]);
-  XCTAssertEqual(value, 600.);
-  XCTAssertFalse([dict getDouble:NULL forKey:12]);
-  [dict enumerateKeysAndDoublesUsingBlock:^(int32_t aKey, double aValue, BOOL *stop) {
-    XCTAssertEqual(aKey, 11);
-    XCTAssertEqual(aValue, 600.);
-    XCTAssertNotEqual(stop, NULL);
-  }];
-  [dict release];
-}
-
-- (void)testBasics {
-  const int32_t kKeys[] = { 11, 12, 13 };
-  const double kValues[] = { 600., 601., 602. };
-  GPBInt32DoubleDictionary *dict =
-      [[GPBInt32DoubleDictionary alloc] initWithDoubles:kValues
-                                                forKeys:kKeys
-                                                  count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 3U);
-  double value;
-  XCTAssertTrue([dict getDouble:NULL forKey:11]);
-  XCTAssertTrue([dict getDouble:&value forKey:11]);
-  XCTAssertEqual(value, 600.);
-  XCTAssertTrue([dict getDouble:NULL forKey:12]);
-  XCTAssertTrue([dict getDouble:&value forKey:12]);
-  XCTAssertEqual(value, 601.);
-  XCTAssertTrue([dict getDouble:NULL forKey:13]);
-  XCTAssertTrue([dict getDouble:&value forKey:13]);
-  XCTAssertEqual(value, 602.);
-  XCTAssertFalse([dict getDouble:NULL forKey:14]);
-
-  __block NSUInteger idx = 0;
-  int32_t *seenKeys = malloc(3 * sizeof(int32_t));
-  double *seenValues = malloc(3 * sizeof(double));
-  [dict enumerateKeysAndDoublesUsingBlock:^(int32_t aKey, double aValue, BOOL *stop) {
-    XCTAssertLessThan(idx, 3U);
-    seenKeys[idx] = aKey;
-    seenValues[idx] = aValue;
-    XCTAssertNotEqual(stop, NULL);
-    ++idx;
-  }];
-  for (int i = 0; i < 3; ++i) {
-    BOOL foundKey = NO;
-    for (int j = 0; (j < 3) && !foundKey; ++j) {
-      if (kKeys[i] == seenKeys[j]) {
-        foundKey = YES;
-        XCTAssertEqual(kValues[i], seenValues[j], @"i = %d, j = %d", i, j);
-      }
-    }
-    XCTAssertTrue(foundKey, @"i = %d", i);
-  }
-  free(seenKeys);
-  free(seenValues);
-
-  // Stopping the enumeration.
-  idx = 0;
-  [dict enumerateKeysAndDoublesUsingBlock:^(int32_t aKey, double aValue, BOOL *stop) {
-    #pragma unused(aKey, aValue)
-    if (idx == 1) *stop = YES;
-    XCTAssertNotEqual(idx, 2U);
-    ++idx;
-  }];
-  [dict release];
-}
-
-- (void)testEquality {
-  const int32_t kKeys1[] = { 11, 12, 13, 14 };
-  const int32_t kKeys2[] = { 12, 11, 14 };
-  const double kValues1[] = { 600., 601., 602. };
-  const double kValues2[] = { 600., 603., 602. };
-  const double kValues3[] = { 600., 601., 602., 603. };
-  GPBInt32DoubleDictionary *dict1 =
-      [[GPBInt32DoubleDictionary alloc] initWithDoubles:kValues1
-                                                forKeys:kKeys1
-                                                  count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict1);
-  GPBInt32DoubleDictionary *dict1prime =
-      [[GPBInt32DoubleDictionary alloc] initWithDoubles:kValues1
-                                                forKeys:kKeys1
-                                                  count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict1prime);
-  GPBInt32DoubleDictionary *dict2 =
-      [[GPBInt32DoubleDictionary alloc] initWithDoubles:kValues2
-                                                forKeys:kKeys1
-                                                  count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(dict2);
-  GPBInt32DoubleDictionary *dict3 =
-      [[GPBInt32DoubleDictionary alloc] initWithDoubles:kValues1
-                                                forKeys:kKeys2
-                                                  count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict3);
-  GPBInt32DoubleDictionary *dict4 =
-      [[GPBInt32DoubleDictionary alloc] initWithDoubles:kValues3
-                                                forKeys:kKeys1
-                                                  count:GPBARRAYSIZE(kValues3)];
-  XCTAssertNotNil(dict4);
-
-  // 1/1Prime should be different objects, but equal.
-  XCTAssertNotEqual(dict1, dict1prime);
-  XCTAssertEqualObjects(dict1, dict1prime);
-  // Equal, so they must have same hash.
-  XCTAssertEqual([dict1 hash], [dict1prime hash]);
-
-  // 2 is same keys, different values; not equal.
-  XCTAssertNotEqualObjects(dict1, dict2);
-
-  // 3 is different keys, same values; not equal.
-  XCTAssertNotEqualObjects(dict1, dict3);
-
-  // 4 extra pair; not equal
-  XCTAssertNotEqualObjects(dict1, dict4);
-
-  [dict1 release];
-  [dict1prime release];
-  [dict2 release];
-  [dict3 release];
-  [dict4 release];
-}
-
-- (void)testCopy {
-  const int32_t kKeys[] = { 11, 12, 13, 14 };
-  const double kValues[] = { 600., 601., 602., 603. };
-  GPBInt32DoubleDictionary *dict =
-      [[GPBInt32DoubleDictionary alloc] initWithDoubles:kValues
-                                                forKeys:kKeys
-                                                  count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-
-  GPBInt32DoubleDictionary *dict2 = [dict copy];
-  XCTAssertNotNil(dict2);
-
-  // Should be new object but equal.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  XCTAssertTrue([dict2 isKindOfClass:[GPBInt32DoubleDictionary class]]);
-
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testDictionaryFromDictionary {
-  const int32_t kKeys[] = { 11, 12, 13, 14 };
-  const double kValues[] = { 600., 601., 602., 603. };
-  GPBInt32DoubleDictionary *dict =
-      [[GPBInt32DoubleDictionary alloc] initWithDoubles:kValues
-                                                forKeys:kKeys
-                                                  count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-
-  GPBInt32DoubleDictionary *dict2 =
-      [[GPBInt32DoubleDictionary alloc] initWithDictionary:dict];
-  XCTAssertNotNil(dict2);
-
-  // Should be new pointer, but equal objects.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testAdds {
-  GPBInt32DoubleDictionary *dict = [[GPBInt32DoubleDictionary alloc] init];
-  XCTAssertNotNil(dict);
-
-  XCTAssertEqual(dict.count, 0U);
-  [dict setDouble:600. forKey:11];
-  XCTAssertEqual(dict.count, 1U);
-
-  const int32_t kKeys[] = { 12, 13, 14 };
-  const double kValues[] = { 601., 602., 603. };
-  GPBInt32DoubleDictionary *dict2 =
-      [[GPBInt32DoubleDictionary alloc] initWithDoubles:kValues
-                                                forKeys:kKeys
-                                                  count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict2);
-  [dict addEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 4U);
-
-  double value;
-  XCTAssertTrue([dict getDouble:NULL forKey:11]);
-  XCTAssertTrue([dict getDouble:&value forKey:11]);
-  XCTAssertEqual(value, 600.);
-  XCTAssertTrue([dict getDouble:NULL forKey:12]);
-  XCTAssertTrue([dict getDouble:&value forKey:12]);
-  XCTAssertEqual(value, 601.);
-  XCTAssertTrue([dict getDouble:NULL forKey:13]);
-  XCTAssertTrue([dict getDouble:&value forKey:13]);
-  XCTAssertEqual(value, 602.);
-  XCTAssertTrue([dict getDouble:NULL forKey:14]);
-  XCTAssertTrue([dict getDouble:&value forKey:14]);
-  XCTAssertEqual(value, 603.);
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testRemove {
-  const int32_t kKeys[] = { 11, 12, 13, 14 };
-  const double kValues[] = { 600., 601., 602., 603. };
-  GPBInt32DoubleDictionary *dict =
-      [[GPBInt32DoubleDictionary alloc] initWithDoubles:kValues
-                                                forKeys:kKeys
-                                                  count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 4U);
-
-  [dict removeDoubleForKey:12];
-  XCTAssertEqual(dict.count, 3U);
-  double value;
-  XCTAssertTrue([dict getDouble:NULL forKey:11]);
-  XCTAssertTrue([dict getDouble:&value forKey:11]);
-  XCTAssertEqual(value, 600.);
-  XCTAssertFalse([dict getDouble:NULL forKey:12]);
-  XCTAssertTrue([dict getDouble:NULL forKey:13]);
-  XCTAssertTrue([dict getDouble:&value forKey:13]);
-  XCTAssertEqual(value, 602.);
-  XCTAssertTrue([dict getDouble:NULL forKey:14]);
-  XCTAssertTrue([dict getDouble:&value forKey:14]);
-  XCTAssertEqual(value, 603.);
-
-  // Remove again does nothing.
-  [dict removeDoubleForKey:12];
-  XCTAssertEqual(dict.count, 3U);
-  XCTAssertTrue([dict getDouble:NULL forKey:11]);
-  XCTAssertTrue([dict getDouble:&value forKey:11]);
-  XCTAssertEqual(value, 600.);
-  XCTAssertFalse([dict getDouble:NULL forKey:12]);
-  XCTAssertTrue([dict getDouble:NULL forKey:13]);
-  XCTAssertTrue([dict getDouble:&value forKey:13]);
-  XCTAssertEqual(value, 602.);
-  XCTAssertTrue([dict getDouble:NULL forKey:14]);
-  XCTAssertTrue([dict getDouble:&value forKey:14]);
-  XCTAssertEqual(value, 603.);
-
-  [dict removeDoubleForKey:14];
-  XCTAssertEqual(dict.count, 2U);
-  XCTAssertTrue([dict getDouble:NULL forKey:11]);
-  XCTAssertTrue([dict getDouble:&value forKey:11]);
-  XCTAssertEqual(value, 600.);
-  XCTAssertFalse([dict getDouble:NULL forKey:12]);
-  XCTAssertTrue([dict getDouble:NULL forKey:13]);
-  XCTAssertTrue([dict getDouble:&value forKey:13]);
-  XCTAssertEqual(value, 602.);
-  XCTAssertFalse([dict getDouble:NULL forKey:14]);
-
-  [dict removeAll];
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertFalse([dict getDouble:NULL forKey:11]);
-  XCTAssertFalse([dict getDouble:NULL forKey:12]);
-  XCTAssertFalse([dict getDouble:NULL forKey:13]);
-  XCTAssertFalse([dict getDouble:NULL forKey:14]);
-  [dict release];
-}
-
-- (void)testInplaceMutation {
-  const int32_t kKeys[] = { 11, 12, 13, 14 };
-  const double kValues[] = { 600., 601., 602., 603. };
-  GPBInt32DoubleDictionary *dict =
-      [[GPBInt32DoubleDictionary alloc] initWithDoubles:kValues
-                                                forKeys:kKeys
-                                                  count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 4U);
-  double value;
-  XCTAssertTrue([dict getDouble:NULL forKey:11]);
-  XCTAssertTrue([dict getDouble:&value forKey:11]);
-  XCTAssertEqual(value, 600.);
-  XCTAssertTrue([dict getDouble:NULL forKey:12]);
-  XCTAssertTrue([dict getDouble:&value forKey:12]);
-  XCTAssertEqual(value, 601.);
-  XCTAssertTrue([dict getDouble:NULL forKey:13]);
-  XCTAssertTrue([dict getDouble:&value forKey:13]);
-  XCTAssertEqual(value, 602.);
-  XCTAssertTrue([dict getDouble:NULL forKey:14]);
-  XCTAssertTrue([dict getDouble:&value forKey:14]);
-  XCTAssertEqual(value, 603.);
-
-  [dict setDouble:603. forKey:11];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getDouble:NULL forKey:11]);
-  XCTAssertTrue([dict getDouble:&value forKey:11]);
-  XCTAssertEqual(value, 603.);
-  XCTAssertTrue([dict getDouble:NULL forKey:12]);
-  XCTAssertTrue([dict getDouble:&value forKey:12]);
-  XCTAssertEqual(value, 601.);
-  XCTAssertTrue([dict getDouble:NULL forKey:13]);
-  XCTAssertTrue([dict getDouble:&value forKey:13]);
-  XCTAssertEqual(value, 602.);
-  XCTAssertTrue([dict getDouble:NULL forKey:14]);
-  XCTAssertTrue([dict getDouble:&value forKey:14]);
-  XCTAssertEqual(value, 603.);
-
-  [dict setDouble:601. forKey:14];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getDouble:NULL forKey:11]);
-  XCTAssertTrue([dict getDouble:&value forKey:11]);
-  XCTAssertEqual(value, 603.);
-  XCTAssertTrue([dict getDouble:NULL forKey:12]);
-  XCTAssertTrue([dict getDouble:&value forKey:12]);
-  XCTAssertEqual(value, 601.);
-  XCTAssertTrue([dict getDouble:NULL forKey:13]);
-  XCTAssertTrue([dict getDouble:&value forKey:13]);
-  XCTAssertEqual(value, 602.);
-  XCTAssertTrue([dict getDouble:NULL forKey:14]);
-  XCTAssertTrue([dict getDouble:&value forKey:14]);
-  XCTAssertEqual(value, 601.);
-
-  const int32_t kKeys2[] = { 12, 13 };
-  const double kValues2[] = { 602., 600. };
-  GPBInt32DoubleDictionary *dict2 =
-      [[GPBInt32DoubleDictionary alloc] initWithDoubles:kValues2
-                                                forKeys:kKeys2
-                                                  count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(dict2);
-  [dict addEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getDouble:NULL forKey:11]);
-  XCTAssertTrue([dict getDouble:&value forKey:11]);
-  XCTAssertEqual(value, 603.);
-  XCTAssertTrue([dict getDouble:NULL forKey:12]);
-  XCTAssertTrue([dict getDouble:&value forKey:12]);
-  XCTAssertEqual(value, 602.);
-  XCTAssertTrue([dict getDouble:NULL forKey:13]);
-  XCTAssertTrue([dict getDouble:&value forKey:13]);
-  XCTAssertEqual(value, 600.);
-  XCTAssertTrue([dict getDouble:NULL forKey:14]);
-  XCTAssertTrue([dict getDouble:&value forKey:14]);
-  XCTAssertEqual(value, 601.);
-
-  [dict2 release];
-  [dict release];
-}
-
-@end
-
-#pragma mark - Int32 -> Enum
-
-@interface GPBInt32EnumDictionaryTests : XCTestCase
-@end
-
-@implementation GPBInt32EnumDictionaryTests
-
-- (void)testEmpty {
-  GPBInt32EnumDictionary *dict = [[GPBInt32EnumDictionary alloc] init];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertFalse([dict getEnum:NULL forKey:11]);
-  [dict enumerateKeysAndEnumsUsingBlock:^(int32_t aKey, int32_t aValue, BOOL *stop) {
-    #pragma unused(aKey, aValue, stop)
-    XCTFail(@"Shouldn't get here!");
-  }];
-  [dict release];
-}
-
-- (void)testOne {
-  GPBInt32EnumDictionary *dict = [[GPBInt32EnumDictionary alloc] init];
-  [dict setEnum:700 forKey:11];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 1U);
-  int32_t value;
-  XCTAssertTrue([dict getEnum:NULL forKey:11]);
-  XCTAssertTrue([dict getEnum:&value forKey:11]);
-  XCTAssertEqual(value, 700);
-  XCTAssertFalse([dict getEnum:NULL forKey:12]);
-  [dict enumerateKeysAndEnumsUsingBlock:^(int32_t aKey, int32_t aValue, BOOL *stop) {
-    XCTAssertEqual(aKey, 11);
-    XCTAssertEqual(aValue, 700);
-    XCTAssertNotEqual(stop, NULL);
-  }];
-  [dict release];
-}
-
-- (void)testBasics {
-  const int32_t kKeys[] = { 11, 12, 13 };
-  const int32_t kValues[] = { 700, 701, 702 };
-  GPBInt32EnumDictionary *dict =
-      [[GPBInt32EnumDictionary alloc] initWithEnums:kValues
-                                            forKeys:kKeys
-                                              count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 3U);
-  int32_t value;
-  XCTAssertTrue([dict getEnum:NULL forKey:11]);
-  XCTAssertTrue([dict getEnum:&value forKey:11]);
-  XCTAssertEqual(value, 700);
-  XCTAssertTrue([dict getEnum:NULL forKey:12]);
-  XCTAssertTrue([dict getEnum:&value forKey:12]);
-  XCTAssertEqual(value, 701);
-  XCTAssertTrue([dict getEnum:NULL forKey:13]);
-  XCTAssertTrue([dict getEnum:&value forKey:13]);
-  XCTAssertEqual(value, 702);
-  XCTAssertFalse([dict getEnum:NULL forKey:14]);
-
-  __block NSUInteger idx = 0;
-  int32_t *seenKeys = malloc(3 * sizeof(int32_t));
-  int32_t *seenValues = malloc(3 * sizeof(int32_t));
-  [dict enumerateKeysAndEnumsUsingBlock:^(int32_t aKey, int32_t aValue, BOOL *stop) {
-    XCTAssertLessThan(idx, 3U);
-    seenKeys[idx] = aKey;
-    seenValues[idx] = aValue;
-    XCTAssertNotEqual(stop, NULL);
-    ++idx;
-  }];
-  for (int i = 0; i < 3; ++i) {
-    BOOL foundKey = NO;
-    for (int j = 0; (j < 3) && !foundKey; ++j) {
-      if (kKeys[i] == seenKeys[j]) {
-        foundKey = YES;
-        XCTAssertEqual(kValues[i], seenValues[j], @"i = %d, j = %d", i, j);
-      }
-    }
-    XCTAssertTrue(foundKey, @"i = %d", i);
-  }
-  free(seenKeys);
-  free(seenValues);
-
-  // Stopping the enumeration.
-  idx = 0;
-  [dict enumerateKeysAndEnumsUsingBlock:^(int32_t aKey, int32_t aValue, BOOL *stop) {
-    #pragma unused(aKey, aValue)
-    if (idx == 1) *stop = YES;
-    XCTAssertNotEqual(idx, 2U);
-    ++idx;
-  }];
-  [dict release];
-}
-
-- (void)testEquality {
-  const int32_t kKeys1[] = { 11, 12, 13, 14 };
-  const int32_t kKeys2[] = { 12, 11, 14 };
-  const int32_t kValues1[] = { 700, 701, 702 };
-  const int32_t kValues2[] = { 700, 703, 702 };
-  const int32_t kValues3[] = { 700, 701, 702, 703 };
-  GPBInt32EnumDictionary *dict1 =
-      [[GPBInt32EnumDictionary alloc] initWithEnums:kValues1
-                                            forKeys:kKeys1
-                                              count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict1);
-  GPBInt32EnumDictionary *dict1prime =
-      [[GPBInt32EnumDictionary alloc] initWithEnums:kValues1
-                                            forKeys:kKeys1
-                                              count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict1prime);
-  GPBInt32EnumDictionary *dict2 =
-      [[GPBInt32EnumDictionary alloc] initWithEnums:kValues2
-                                            forKeys:kKeys1
-                                              count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(dict2);
-  GPBInt32EnumDictionary *dict3 =
-      [[GPBInt32EnumDictionary alloc] initWithEnums:kValues1
-                                            forKeys:kKeys2
-                                              count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict3);
-  GPBInt32EnumDictionary *dict4 =
-      [[GPBInt32EnumDictionary alloc] initWithEnums:kValues3
-                                            forKeys:kKeys1
-                                              count:GPBARRAYSIZE(kValues3)];
-  XCTAssertNotNil(dict4);
-
-  // 1/1Prime should be different objects, but equal.
-  XCTAssertNotEqual(dict1, dict1prime);
-  XCTAssertEqualObjects(dict1, dict1prime);
-  // Equal, so they must have same hash.
-  XCTAssertEqual([dict1 hash], [dict1prime hash]);
-
-  // 2 is same keys, different values; not equal.
-  XCTAssertNotEqualObjects(dict1, dict2);
-
-  // 3 is different keys, same values; not equal.
-  XCTAssertNotEqualObjects(dict1, dict3);
-
-  // 4 extra pair; not equal
-  XCTAssertNotEqualObjects(dict1, dict4);
-
-  [dict1 release];
-  [dict1prime release];
-  [dict2 release];
-  [dict3 release];
-  [dict4 release];
-}
-
-- (void)testCopy {
-  const int32_t kKeys[] = { 11, 12, 13, 14 };
-  const int32_t kValues[] = { 700, 701, 702, 703 };
-  GPBInt32EnumDictionary *dict =
-      [[GPBInt32EnumDictionary alloc] initWithEnums:kValues
-                                            forKeys:kKeys
-                                              count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-
-  GPBInt32EnumDictionary *dict2 = [dict copy];
-  XCTAssertNotNil(dict2);
-
-  // Should be new object but equal.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  XCTAssertTrue([dict2 isKindOfClass:[GPBInt32EnumDictionary class]]);
-
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testDictionaryFromDictionary {
-  const int32_t kKeys[] = { 11, 12, 13, 14 };
-  const int32_t kValues[] = { 700, 701, 702, 703 };
-  GPBInt32EnumDictionary *dict =
-      [[GPBInt32EnumDictionary alloc] initWithEnums:kValues
-                                            forKeys:kKeys
-                                              count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-
-  GPBInt32EnumDictionary *dict2 =
-      [[GPBInt32EnumDictionary alloc] initWithDictionary:dict];
-  XCTAssertNotNil(dict2);
-
-  // Should be new pointer, but equal objects.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testAdds {
-  GPBInt32EnumDictionary *dict = [[GPBInt32EnumDictionary alloc] init];
-  XCTAssertNotNil(dict);
-
-  XCTAssertEqual(dict.count, 0U);
-  [dict setEnum:700 forKey:11];
-  XCTAssertEqual(dict.count, 1U);
-
-  const int32_t kKeys[] = { 12, 13, 14 };
-  const int32_t kValues[] = { 701, 702, 703 };
-  GPBInt32EnumDictionary *dict2 =
-      [[GPBInt32EnumDictionary alloc] initWithEnums:kValues
-                                            forKeys:kKeys
-                                              count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict2);
-  [dict addRawEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 4U);
-
-  int32_t value;
-  XCTAssertTrue([dict getEnum:NULL forKey:11]);
-  XCTAssertTrue([dict getEnum:&value forKey:11]);
-  XCTAssertEqual(value, 700);
-  XCTAssertTrue([dict getEnum:NULL forKey:12]);
-  XCTAssertTrue([dict getEnum:&value forKey:12]);
-  XCTAssertEqual(value, 701);
-  XCTAssertTrue([dict getEnum:NULL forKey:13]);
-  XCTAssertTrue([dict getEnum:&value forKey:13]);
-  XCTAssertEqual(value, 702);
-  XCTAssertTrue([dict getEnum:NULL forKey:14]);
-  XCTAssertTrue([dict getEnum:&value forKey:14]);
-  XCTAssertEqual(value, 703);
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testRemove {
-  const int32_t kKeys[] = { 11, 12, 13, 14 };
-  const int32_t kValues[] = { 700, 701, 702, 703 };
-  GPBInt32EnumDictionary *dict =
-      [[GPBInt32EnumDictionary alloc] initWithEnums:kValues
-                                            forKeys:kKeys
-                                              count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 4U);
-
-  [dict removeEnumForKey:12];
-  XCTAssertEqual(dict.count, 3U);
-  int32_t value;
-  XCTAssertTrue([dict getEnum:NULL forKey:11]);
-  XCTAssertTrue([dict getEnum:&value forKey:11]);
-  XCTAssertEqual(value, 700);
-  XCTAssertFalse([dict getEnum:NULL forKey:12]);
-  XCTAssertTrue([dict getEnum:NULL forKey:13]);
-  XCTAssertTrue([dict getEnum:&value forKey:13]);
-  XCTAssertEqual(value, 702);
-  XCTAssertTrue([dict getEnum:NULL forKey:14]);
-  XCTAssertTrue([dict getEnum:&value forKey:14]);
-  XCTAssertEqual(value, 703);
-
-  // Remove again does nothing.
-  [dict removeEnumForKey:12];
-  XCTAssertEqual(dict.count, 3U);
-  XCTAssertTrue([dict getEnum:NULL forKey:11]);
-  XCTAssertTrue([dict getEnum:&value forKey:11]);
-  XCTAssertEqual(value, 700);
-  XCTAssertFalse([dict getEnum:NULL forKey:12]);
-  XCTAssertTrue([dict getEnum:NULL forKey:13]);
-  XCTAssertTrue([dict getEnum:&value forKey:13]);
-  XCTAssertEqual(value, 702);
-  XCTAssertTrue([dict getEnum:NULL forKey:14]);
-  XCTAssertTrue([dict getEnum:&value forKey:14]);
-  XCTAssertEqual(value, 703);
-
-  [dict removeEnumForKey:14];
-  XCTAssertEqual(dict.count, 2U);
-  XCTAssertTrue([dict getEnum:NULL forKey:11]);
-  XCTAssertTrue([dict getEnum:&value forKey:11]);
-  XCTAssertEqual(value, 700);
-  XCTAssertFalse([dict getEnum:NULL forKey:12]);
-  XCTAssertTrue([dict getEnum:NULL forKey:13]);
-  XCTAssertTrue([dict getEnum:&value forKey:13]);
-  XCTAssertEqual(value, 702);
-  XCTAssertFalse([dict getEnum:NULL forKey:14]);
-
-  [dict removeAll];
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertFalse([dict getEnum:NULL forKey:11]);
-  XCTAssertFalse([dict getEnum:NULL forKey:12]);
-  XCTAssertFalse([dict getEnum:NULL forKey:13]);
-  XCTAssertFalse([dict getEnum:NULL forKey:14]);
-  [dict release];
-}
-
-- (void)testInplaceMutation {
-  const int32_t kKeys[] = { 11, 12, 13, 14 };
-  const int32_t kValues[] = { 700, 701, 702, 703 };
-  GPBInt32EnumDictionary *dict =
-      [[GPBInt32EnumDictionary alloc] initWithEnums:kValues
-                                            forKeys:kKeys
-                                              count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 4U);
-  int32_t value;
-  XCTAssertTrue([dict getEnum:NULL forKey:11]);
-  XCTAssertTrue([dict getEnum:&value forKey:11]);
-  XCTAssertEqual(value, 700);
-  XCTAssertTrue([dict getEnum:NULL forKey:12]);
-  XCTAssertTrue([dict getEnum:&value forKey:12]);
-  XCTAssertEqual(value, 701);
-  XCTAssertTrue([dict getEnum:NULL forKey:13]);
-  XCTAssertTrue([dict getEnum:&value forKey:13]);
-  XCTAssertEqual(value, 702);
-  XCTAssertTrue([dict getEnum:NULL forKey:14]);
-  XCTAssertTrue([dict getEnum:&value forKey:14]);
-  XCTAssertEqual(value, 703);
-
-  [dict setEnum:703 forKey:11];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getEnum:NULL forKey:11]);
-  XCTAssertTrue([dict getEnum:&value forKey:11]);
-  XCTAssertEqual(value, 703);
-  XCTAssertTrue([dict getEnum:NULL forKey:12]);
-  XCTAssertTrue([dict getEnum:&value forKey:12]);
-  XCTAssertEqual(value, 701);
-  XCTAssertTrue([dict getEnum:NULL forKey:13]);
-  XCTAssertTrue([dict getEnum:&value forKey:13]);
-  XCTAssertEqual(value, 702);
-  XCTAssertTrue([dict getEnum:NULL forKey:14]);
-  XCTAssertTrue([dict getEnum:&value forKey:14]);
-  XCTAssertEqual(value, 703);
-
-  [dict setEnum:701 forKey:14];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getEnum:NULL forKey:11]);
-  XCTAssertTrue([dict getEnum:&value forKey:11]);
-  XCTAssertEqual(value, 703);
-  XCTAssertTrue([dict getEnum:NULL forKey:12]);
-  XCTAssertTrue([dict getEnum:&value forKey:12]);
-  XCTAssertEqual(value, 701);
-  XCTAssertTrue([dict getEnum:NULL forKey:13]);
-  XCTAssertTrue([dict getEnum:&value forKey:13]);
-  XCTAssertEqual(value, 702);
-  XCTAssertTrue([dict getEnum:NULL forKey:14]);
-  XCTAssertTrue([dict getEnum:&value forKey:14]);
-  XCTAssertEqual(value, 701);
-
-  const int32_t kKeys2[] = { 12, 13 };
-  const int32_t kValues2[] = { 702, 700 };
-  GPBInt32EnumDictionary *dict2 =
-      [[GPBInt32EnumDictionary alloc] initWithEnums:kValues2
-                                            forKeys:kKeys2
-                                              count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(dict2);
-  [dict addRawEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getEnum:NULL forKey:11]);
-  XCTAssertTrue([dict getEnum:&value forKey:11]);
-  XCTAssertEqual(value, 703);
-  XCTAssertTrue([dict getEnum:NULL forKey:12]);
-  XCTAssertTrue([dict getEnum:&value forKey:12]);
-  XCTAssertEqual(value, 702);
-  XCTAssertTrue([dict getEnum:NULL forKey:13]);
-  XCTAssertTrue([dict getEnum:&value forKey:13]);
-  XCTAssertEqual(value, 700);
-  XCTAssertTrue([dict getEnum:NULL forKey:14]);
-  XCTAssertTrue([dict getEnum:&value forKey:14]);
-  XCTAssertEqual(value, 701);
-
-  [dict2 release];
-  [dict release];
-}
-
-@end
-
-#pragma mark - Int32 -> Enum (Unknown Enums)
-
-@interface GPBInt32EnumDictionaryUnknownEnumTests : XCTestCase
-@end
-
-@implementation GPBInt32EnumDictionaryUnknownEnumTests
-
-- (void)testRawBasics {
-  const int32_t kKeys[] = { 11, 12, 13 };
-  const int32_t kValues[] = { 700, 801, 702 };
-  GPBInt32EnumDictionary *dict =
-      [[GPBInt32EnumDictionary alloc] initWithValidationFunction:TestingEnum_IsValidValue
-                                                       rawValues:kValues
-                                                         forKeys:kKeys
-                                                           count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 3U);
-  XCTAssertTrue(dict.validationFunc == TestingEnum_IsValidValue);  // Pointer comparison
-  int32_t value;
-  XCTAssertTrue([dict getRawValue:NULL forKey:11]);
-  XCTAssertTrue([dict getRawValue:&value forKey:11]);
-  XCTAssertEqual(value, 700);
-  XCTAssertTrue([dict getEnum:NULL forKey:12]);
-  XCTAssertTrue([dict getEnum:&value forKey:12]);
-  XCTAssertEqual(value, kGPBUnrecognizedEnumeratorValue);
-  XCTAssertTrue([dict getRawValue:NULL forKey:12]);
-  XCTAssertTrue([dict getRawValue:&value forKey:12]);
-  XCTAssertEqual(value, 801);
-  XCTAssertTrue([dict getRawValue:NULL forKey:13]);
-  XCTAssertTrue([dict getRawValue:&value forKey:13]);
-  XCTAssertEqual(value, 702);
-  XCTAssertFalse([dict getRawValue:NULL forKey:14]);
-
-  __block NSUInteger idx = 0;
-  int32_t *seenKeys = malloc(3 * sizeof(int32_t));
-  int32_t *seenValues = malloc(3 * sizeof(int32_t));
-  [dict enumerateKeysAndEnumsUsingBlock:^(int32_t aKey, int32_t aValue, BOOL *stop) {
-    XCTAssertLessThan(idx, 3U);
-    seenKeys[idx] = aKey;
-    seenValues[idx] = aValue;
-    XCTAssertNotEqual(stop, NULL);
-    ++idx;
-  }];
-  for (int i = 0; i < 3; ++i) {
-    BOOL foundKey = NO;
-    for (int j = 0; (j < 3) && !foundKey; ++j) {
-      if (kKeys[i] == seenKeys[j]) {
-        foundKey = YES;
-        if (i == 1) {
-          XCTAssertEqual(kGPBUnrecognizedEnumeratorValue, seenValues[j], @"i = %d, j = %d", i, j);
-        } else {
-          XCTAssertEqual(kValues[i], seenValues[j], @"i = %d, j = %d", i, j);
-        }
-      }
-    }
-    XCTAssertTrue(foundKey, @"i = %d", i);
-  }
-  idx = 0;
-  [dict enumerateKeysAndRawValuesUsingBlock:^(int32_t aKey, int32_t aValue, BOOL *stop) {
-    XCTAssertLessThan(idx, 3U);
-    seenKeys[idx] = aKey;
-    seenValues[idx] = aValue;
-    XCTAssertNotEqual(stop, NULL);
-    ++idx;
-  }];
-  for (int i = 0; i < 3; ++i) {
-    BOOL foundKey = NO;
-    for (int j = 0; (j < 3) && !foundKey; ++j) {
-      if (kKeys[i] == seenKeys[j]) {
-        foundKey = YES;
-        XCTAssertEqual(kValues[i], seenValues[j], @"i = %d, j = %d", i, j);
-      }
-    }
-    XCTAssertTrue(foundKey, @"i = %d", i);
-  }
-  free(seenKeys);
-  free(seenValues);
-
-  // Stopping the enumeration.
-  idx = 0;
-  [dict enumerateKeysAndRawValuesUsingBlock:^(int32_t aKey, int32_t aValue, BOOL *stop) {
-    #pragma unused(aKey, aValue)
-    if (idx == 1) *stop = YES;
-    XCTAssertNotEqual(idx, 2U);
-    ++idx;
-  }];
-  [dict release];
-}
-
-- (void)testEqualityWithUnknowns {
-  const int32_t kKeys1[] = { 11, 12, 13, 14 };
-  const int32_t kKeys2[] = { 12, 11, 14 };
-  const int32_t kValues1[] = { 700, 801, 702 };  // Unknown
-  const int32_t kValues2[] = { 700, 803, 702 };  // Unknown
-  const int32_t kValues3[] = { 700, 801, 702, 803 };  // Unknowns
-  GPBInt32EnumDictionary *dict1 =
-      [[GPBInt32EnumDictionary alloc] initWithValidationFunction:TestingEnum_IsValidValue
-                                                       rawValues:kValues1
-                                                         forKeys:kKeys1
-                                                           count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict1);
-  GPBInt32EnumDictionary *dict1prime =
-      [[GPBInt32EnumDictionary alloc] initWithValidationFunction:TestingEnum_IsValidValue
-                                                       rawValues:kValues1
-                                                         forKeys:kKeys1
-                                                           count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict1prime);
-  GPBInt32EnumDictionary *dict2 =
-      [[GPBInt32EnumDictionary alloc] initWithValidationFunction:TestingEnum_IsValidValue
-                                                       rawValues:kValues2
-                                                         forKeys:kKeys1
-                                                           count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(dict2);
-  GPBInt32EnumDictionary *dict3 =
-      [[GPBInt32EnumDictionary alloc] initWithValidationFunction:TestingEnum_IsValidValue
-                                                       rawValues:kValues1
-                                                         forKeys:kKeys2
-                                                           count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict3);
-  GPBInt32EnumDictionary *dict4 =
-      [[GPBInt32EnumDictionary alloc] initWithValidationFunction:TestingEnum_IsValidValue
-                                                       rawValues:kValues3
-                                                         forKeys:kKeys1
-                                                           count:GPBARRAYSIZE(kValues3)];
-  XCTAssertNotNil(dict4);
-
-  // 1/1Prime should be different objects, but equal.
-  XCTAssertNotEqual(dict1, dict1prime);
-  XCTAssertEqualObjects(dict1, dict1prime);
-  // Equal, so they must have same hash.
-  XCTAssertEqual([dict1 hash], [dict1prime hash]);
-
-  // 2 is same keys, different values; not equal.
-  XCTAssertNotEqualObjects(dict1, dict2);
-
-  // 3 is different keys, same values; not equal.
-  XCTAssertNotEqualObjects(dict1, dict3);
-
-  // 4 extra pair; not equal
-  XCTAssertNotEqualObjects(dict1, dict4);
-
-  [dict1 release];
-  [dict1prime release];
-  [dict2 release];
-  [dict3 release];
-  [dict4 release];
-}
-
-- (void)testCopyWithUnknowns {
-  const int32_t kKeys[] = { 11, 12, 13, 14 };
-  const int32_t kValues[] = { 700, 801, 702, 803 };  // Unknown
-  GPBInt32EnumDictionary *dict =
-      [[GPBInt32EnumDictionary alloc] initWithValidationFunction:TestingEnum_IsValidValue
-                                                       rawValues:kValues
-                                                         forKeys:kKeys
-                                                           count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-
-  GPBInt32EnumDictionary *dict2 = [dict copy];
-  XCTAssertNotNil(dict2);
-
-  // Should be new pointer, but equal objects.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqual(dict.validationFunc, dict2.validationFunc);  // Pointer comparison
-  XCTAssertEqualObjects(dict, dict2);
-
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testDictionaryFromDictionary {
-  const int32_t kKeys[] = { 11, 12, 13, 14 };
-  const int32_t kValues[] = { 700, 801, 702, 803 };  // Unknowns
-  GPBInt32EnumDictionary *dict =
-      [[GPBInt32EnumDictionary alloc] initWithValidationFunction:TestingEnum_IsValidValue
-                                                       rawValues:kValues
-                                                         forKeys:kKeys
-                                                           count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-
-  GPBInt32EnumDictionary *dict2 =
-      [[GPBInt32EnumDictionary alloc] initWithDictionary:dict];
-  XCTAssertNotNil(dict2);
-
-  // Should be new pointer, but equal objects.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  XCTAssertEqual(dict.validationFunc, dict2.validationFunc);  // Pointer comparison
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testUnknownAdds {
-  GPBInt32EnumDictionary *dict =
-      [[GPBInt32EnumDictionary alloc] initWithValidationFunction:TestingEnum_IsValidValue];
-  XCTAssertNotNil(dict);
-
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertThrowsSpecificNamed([dict setEnum:801 forKey:12],  // Unknown
-                               NSException, NSInvalidArgumentException);
-  XCTAssertEqual(dict.count, 0U);
-  [dict setRawValue:801 forKey:12];  // Unknown
-  XCTAssertEqual(dict.count, 1U);
-
-  const int32_t kKeys[] = { 11, 13, 14 };
-  const int32_t kValues[] = { 700, 702, 803 };  // Unknown
-  GPBInt32EnumDictionary *dict2 =
-      [[GPBInt32EnumDictionary alloc] initWithEnums:kValues
-                                              forKeys:kKeys
-                                                count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict2);
-  [dict addRawEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 4U);
-
-  int32_t value;
-  XCTAssertTrue([dict getEnum:NULL forKey:11]);
-  XCTAssertTrue([dict getEnum:&value forKey:11]);
-  XCTAssertEqual(value, 700);
-  XCTAssertTrue([dict getEnum:NULL forKey:12]);
-  XCTAssertTrue([dict getEnum:&value forKey:12]);
-  XCTAssertEqual(value, kGPBUnrecognizedEnumeratorValue);
-  XCTAssertTrue([dict getRawValue:NULL forKey:12]);
-  XCTAssertTrue([dict getRawValue:&value forKey:12]);
-  XCTAssertEqual(value, 801);
-  XCTAssertTrue([dict getEnum:NULL forKey:13]);
-  XCTAssertTrue([dict getEnum:&value forKey:13]);
-  XCTAssertEqual(value, 702);
-  XCTAssertTrue([dict getEnum:NULL forKey:14]);
-  XCTAssertTrue([dict getEnum:&value forKey:14]);
-  XCTAssertEqual(value, kGPBUnrecognizedEnumeratorValue);
-  XCTAssertTrue([dict getRawValue:NULL forKey:14]);
-  XCTAssertTrue([dict getRawValue:&value forKey:14]);
-  XCTAssertEqual(value, 803);
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testUnknownRemove {
-  const int32_t kKeys[] = { 11, 12, 13, 14 };
-  const int32_t kValues[] = { 700, 801, 702, 803 };  // Unknowns
-  GPBInt32EnumDictionary *dict =
-      [[GPBInt32EnumDictionary alloc] initWithValidationFunction:TestingEnum_IsValidValue
-                                                       rawValues:kValues
-                                                         forKeys:kKeys
-                                                           count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 4U);
-
-  [dict removeEnumForKey:12];
-  XCTAssertEqual(dict.count, 3U);
-  int32_t value;
-  XCTAssertTrue([dict getEnum:NULL forKey:11]);
-  XCTAssertTrue([dict getEnum:&value forKey:11]);
-  XCTAssertEqual(value, 700);
-  XCTAssertFalse([dict getEnum:NULL forKey:12]);
-  XCTAssertTrue([dict getEnum:NULL forKey:13]);
-  XCTAssertTrue([dict getEnum:&value forKey:13]);
-  XCTAssertEqual(value, 702);
-  XCTAssertTrue([dict getRawValue:NULL forKey:14]);
-  XCTAssertTrue([dict getRawValue:&value forKey:14]);
-  XCTAssertEqual(value, 803);
-
-  // Remove again does nothing.
-  [dict removeEnumForKey:12];
-  XCTAssertEqual(dict.count, 3U);
-  XCTAssertTrue([dict getEnum:NULL forKey:11]);
-  XCTAssertTrue([dict getEnum:&value forKey:11]);
-  XCTAssertEqual(value, 700);
-  XCTAssertFalse([dict getEnum:NULL forKey:12]);
-  XCTAssertTrue([dict getEnum:NULL forKey:13]);
-  XCTAssertTrue([dict getEnum:&value forKey:13]);
-  XCTAssertEqual(value, 702);
-  XCTAssertTrue([dict getRawValue:NULL forKey:14]);
-  XCTAssertTrue([dict getRawValue:&value forKey:14]);
-  XCTAssertEqual(value, 803);
-
-  [dict removeEnumForKey:14];
-  XCTAssertEqual(dict.count, 2U);
-  XCTAssertTrue([dict getEnum:NULL forKey:11]);
-  XCTAssertTrue([dict getEnum:&value forKey:11]);
-  XCTAssertEqual(value, 700);
-  XCTAssertFalse([dict getEnum:NULL forKey:12]);
-  XCTAssertTrue([dict getEnum:NULL forKey:13]);
-  XCTAssertTrue([dict getEnum:&value forKey:13]);
-  XCTAssertEqual(value, 702);
-  XCTAssertFalse([dict getEnum:NULL forKey:14]);
-
-  [dict removeAll];
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertFalse([dict getEnum:NULL forKey:11]);
-  XCTAssertFalse([dict getEnum:NULL forKey:12]);
-  XCTAssertFalse([dict getEnum:NULL forKey:13]);
-  XCTAssertFalse([dict getEnum:NULL forKey:14]);
-  [dict release];
-}
-
-- (void)testInplaceMutationUnknowns {
-  const int32_t kKeys[] = { 11, 12, 13, 14 };
-  const int32_t kValues[] = { 700, 801, 702, 803 };  // Unknowns
-  GPBInt32EnumDictionary *dict =
-      [[GPBInt32EnumDictionary alloc] initWithValidationFunction:TestingEnum_IsValidValue
-                                                       rawValues:kValues
-                                                         forKeys:kKeys
-                                                           count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 4U);
-  int32_t value;
-  XCTAssertTrue([dict getEnum:NULL forKey:11]);
-  XCTAssertTrue([dict getEnum:&value forKey:11]);
-  XCTAssertEqual(value, 700);
-  XCTAssertTrue([dict getRawValue:NULL forKey:12]);
-  XCTAssertTrue([dict getRawValue:&value forKey:12]);
-  XCTAssertEqual(value, 801);
-  XCTAssertTrue([dict getEnum:NULL forKey:13]);
-  XCTAssertTrue([dict getEnum:&value forKey:13]);
-  XCTAssertEqual(value, 702);
-  XCTAssertTrue([dict getRawValue:NULL forKey:14]);
-  XCTAssertTrue([dict getRawValue:&value forKey:14]);
-  XCTAssertEqual(value, 803);
-
-  XCTAssertThrowsSpecificNamed([dict setEnum:803 forKey:11],  // Unknown
-                               NSException, NSInvalidArgumentException);
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getEnum:NULL forKey:11]);
-  XCTAssertTrue([dict getEnum:&value forKey:11]);
-  XCTAssertEqual(value, 700);
-  XCTAssertTrue([dict getRawValue:NULL forKey:12]);
-  XCTAssertTrue([dict getRawValue:&value forKey:12]);
-  XCTAssertEqual(value, 801);
-  XCTAssertTrue([dict getEnum:NULL forKey:13]);
-  XCTAssertTrue([dict getEnum:&value forKey:13]);
-  XCTAssertEqual(value, 702);
-  XCTAssertTrue([dict getRawValue:NULL forKey:14]);
-  XCTAssertTrue([dict getRawValue:&value forKey:14]);
-  XCTAssertEqual(value, 803);
-
-  [dict setRawValue:803 forKey:11];  // Unknown
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getRawValue:NULL forKey:11]);
-  XCTAssertTrue([dict getRawValue:&value forKey:11]);
-  XCTAssertEqual(value, 803);
-  XCTAssertTrue([dict getRawValue:NULL forKey:12]);
-  XCTAssertTrue([dict getRawValue:&value forKey:12]);
-  XCTAssertEqual(value, 801);
-  XCTAssertTrue([dict getEnum:NULL forKey:13]);
-  XCTAssertTrue([dict getEnum:&value forKey:13]);
-  XCTAssertEqual(value, 702);
-  XCTAssertTrue([dict getRawValue:NULL forKey:14]);
-  XCTAssertTrue([dict getRawValue:&value forKey:14]);
-  XCTAssertEqual(value, 803);
-
-  [dict setRawValue:700 forKey:14];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getRawValue:NULL forKey:11]);
-  XCTAssertTrue([dict getRawValue:&value forKey:11]);
-  XCTAssertEqual(value, 803);
-  XCTAssertTrue([dict getRawValue:NULL forKey:12]);
-  XCTAssertTrue([dict getRawValue:&value forKey:12]);
-  XCTAssertEqual(value, 801);
-  XCTAssertTrue([dict getEnum:NULL forKey:13]);
-  XCTAssertTrue([dict getEnum:&value forKey:13]);
-  XCTAssertEqual(value, 702);
-  XCTAssertTrue([dict getEnum:NULL forKey:14]);
-  XCTAssertTrue([dict getEnum:&value forKey:14]);
-  XCTAssertEqual(value, 700);
-
-  const int32_t kKeys2[] = { 12, 13 };
-  const int32_t kValues2[] = { 702, 801 };  // Unknown
-  GPBInt32EnumDictionary *dict2 =
-      [[GPBInt32EnumDictionary alloc] initWithValidationFunction:TestingEnum_IsValidValue
-                                                       rawValues:kValues2
-                                                         forKeys:kKeys2
-                                                           count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(dict2);
-  [dict addRawEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getRawValue:NULL forKey:11]);
-  XCTAssertTrue([dict getRawValue:&value forKey:11]);
-  XCTAssertEqual(value, 803);
-  XCTAssertTrue([dict getEnum:NULL forKey:12]);
-  XCTAssertTrue([dict getEnum:&value forKey:12]);
-  XCTAssertEqual(value, 702);
-  XCTAssertTrue([dict getRawValue:NULL forKey:13]);
-  XCTAssertTrue([dict getRawValue:&value forKey:13]);
-  XCTAssertEqual(value, 801);
-  XCTAssertTrue([dict getEnum:NULL forKey:14]);
-  XCTAssertTrue([dict getEnum:&value forKey:14]);
-  XCTAssertEqual(value, 700);
-
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testCopyUnknowns {
-  const int32_t kKeys[] = { 11, 12, 13, 14 };
-  const int32_t kValues[] = { 700, 801, 702, 803 };
-  GPBInt32EnumDictionary *dict =
-      [[GPBInt32EnumDictionary alloc] initWithValidationFunction:TestingEnum_IsValidValue
-                                                       rawValues:kValues
-                                                         forKeys:kKeys
-                                                           count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-
-  GPBInt32EnumDictionary *dict2 = [dict copy];
-  XCTAssertNotNil(dict2);
-
-  // Should be new pointer, but equal objects.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  XCTAssertEqual(dict.validationFunc, dict2.validationFunc);  // Pointer comparison
-  XCTAssertTrue([dict2 isKindOfClass:[GPBInt32EnumDictionary class]]);
-
-  [dict2 release];
-  [dict release];
-}
-
-@end
-
-#pragma mark - Int32 -> Object
-
-@interface GPBInt32ObjectDictionaryTests : XCTestCase
-@end
-
-@implementation GPBInt32ObjectDictionaryTests
-
-- (void)testEmpty {
-  GPBInt32ObjectDictionary<NSString*> *dict = [[GPBInt32ObjectDictionary alloc] init];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertNil([dict objectForKey:11]);
-  [dict enumerateKeysAndObjectsUsingBlock:^(int32_t aKey, NSString* aObject, BOOL *stop) {
-    #pragma unused(aKey, aObject, stop)
-    XCTFail(@"Shouldn't get here!");
-  }];
-  [dict release];
-}
-
-- (void)testOne {
-  GPBInt32ObjectDictionary<NSString*> *dict = [[GPBInt32ObjectDictionary alloc] init];
-  [dict setObject:@"abc" forKey:11];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 1U);
-  XCTAssertEqualObjects([dict objectForKey:11], @"abc");
-  XCTAssertNil([dict objectForKey:12]);
-  [dict enumerateKeysAndObjectsUsingBlock:^(int32_t aKey, NSString* aObject, BOOL *stop) {
-    XCTAssertEqual(aKey, 11);
-    XCTAssertEqualObjects(aObject, @"abc");
-    XCTAssertNotEqual(stop, NULL);
-  }];
-  [dict release];
-}
-
-- (void)testBasics {
-  const int32_t kKeys[] = { 11, 12, 13 };
-  const NSString* kObjects[] = { @"abc", @"def", @"ghi" };
-  GPBInt32ObjectDictionary<NSString*> *dict =
-      [[GPBInt32ObjectDictionary alloc] initWithObjects:kObjects
-                                                forKeys:kKeys
-                                                  count:GPBARRAYSIZE(kObjects)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 3U);
-  XCTAssertEqualObjects([dict objectForKey:11], @"abc");
-  XCTAssertEqualObjects([dict objectForKey:12], @"def");
-  XCTAssertEqualObjects([dict objectForKey:13], @"ghi");
-  XCTAssertNil([dict objectForKey:14]);
-
-  __block NSUInteger idx = 0;
-  int32_t *seenKeys = malloc(3 * sizeof(int32_t));
-  NSString* *seenObjects = malloc(3 * sizeof(NSString*));
-  [dict enumerateKeysAndObjectsUsingBlock:^(int32_t aKey, NSString* aObject, BOOL *stop) {
-    XCTAssertLessThan(idx, 3U);
-    seenKeys[idx] = aKey;
-    seenObjects[idx] = aObject;
-    XCTAssertNotEqual(stop, NULL);
-    ++idx;
-  }];
-  for (int i = 0; i < 3; ++i) {
-    BOOL foundKey = NO;
-    for (int j = 0; (j < 3) && !foundKey; ++j) {
-      if (kKeys[i] == seenKeys[j]) {
-        foundKey = YES;
-        XCTAssertEqualObjects(kObjects[i], seenObjects[j], @"i = %d, j = %d", i, j);
-      }
-    }
-    XCTAssertTrue(foundKey, @"i = %d", i);
-  }
-  free(seenKeys);
-  free(seenObjects);
-
-  // Stopping the enumeration.
-  idx = 0;
-  [dict enumerateKeysAndObjectsUsingBlock:^(int32_t aKey, NSString* aObject, BOOL *stop) {
-    #pragma unused(aKey, aObject)
-    if (idx == 1) *stop = YES;
-    XCTAssertNotEqual(idx, 2U);
-    ++idx;
-  }];
-  [dict release];
-}
-
-- (void)testEquality {
-  const int32_t kKeys1[] = { 11, 12, 13, 14 };
-  const int32_t kKeys2[] = { 12, 11, 14 };
-  const NSString* kObjects1[] = { @"abc", @"def", @"ghi" };
-  const NSString* kObjects2[] = { @"abc", @"jkl", @"ghi" };
-  const NSString* kObjects3[] = { @"abc", @"def", @"ghi", @"jkl" };
-  GPBInt32ObjectDictionary<NSString*> *dict1 =
-      [[GPBInt32ObjectDictionary alloc] initWithObjects:kObjects1
-                                                forKeys:kKeys1
-                                                  count:GPBARRAYSIZE(kObjects1)];
-  XCTAssertNotNil(dict1);
-  GPBInt32ObjectDictionary<NSString*> *dict1prime =
-      [[GPBInt32ObjectDictionary alloc] initWithObjects:kObjects1
-                                                forKeys:kKeys1
-                                                  count:GPBARRAYSIZE(kObjects1)];
-  XCTAssertNotNil(dict1prime);
-  GPBInt32ObjectDictionary<NSString*> *dict2 =
-      [[GPBInt32ObjectDictionary alloc] initWithObjects:kObjects2
-                                                forKeys:kKeys1
-                                                  count:GPBARRAYSIZE(kObjects2)];
-  XCTAssertNotNil(dict2);
-  GPBInt32ObjectDictionary<NSString*> *dict3 =
-      [[GPBInt32ObjectDictionary alloc] initWithObjects:kObjects1
-                                                forKeys:kKeys2
-                                                  count:GPBARRAYSIZE(kObjects1)];
-  XCTAssertNotNil(dict3);
-  GPBInt32ObjectDictionary<NSString*> *dict4 =
-      [[GPBInt32ObjectDictionary alloc] initWithObjects:kObjects3
-                                                forKeys:kKeys1
-                                                  count:GPBARRAYSIZE(kObjects3)];
-  XCTAssertNotNil(dict4);
-
-  // 1/1Prime should be different objects, but equal.
-  XCTAssertNotEqual(dict1, dict1prime);
-  XCTAssertEqualObjects(dict1, dict1prime);
-  // Equal, so they must have same hash.
-  XCTAssertEqual([dict1 hash], [dict1prime hash]);
-
-  // 2 is same keys, different objects; not equal.
-  XCTAssertNotEqualObjects(dict1, dict2);
-
-  // 3 is different keys, same objects; not equal.
-  XCTAssertNotEqualObjects(dict1, dict3);
-
-  // 4 extra pair; not equal
-  XCTAssertNotEqualObjects(dict1, dict4);
-
-  [dict1 release];
-  [dict1prime release];
-  [dict2 release];
-  [dict3 release];
-  [dict4 release];
-}
-
-- (void)testCopy {
-  const int32_t kKeys[] = { 11, 12, 13, 14 };
-  const NSString* kObjects[] = { @"abc", @"def", @"ghi", @"jkl" };
-  GPBInt32ObjectDictionary<NSString*> *dict =
-      [[GPBInt32ObjectDictionary alloc] initWithObjects:kObjects
-                                                forKeys:kKeys
-                                                  count:GPBARRAYSIZE(kObjects)];
-  XCTAssertNotNil(dict);
-
-  GPBInt32ObjectDictionary<NSString*> *dict2 = [dict copy];
-  XCTAssertNotNil(dict2);
-
-  // Should be new object but equal.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  XCTAssertTrue([dict2 isKindOfClass:[GPBInt32ObjectDictionary class]]);
-
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testDictionaryFromDictionary {
-  const int32_t kKeys[] = { 11, 12, 13, 14 };
-  const NSString* kObjects[] = { @"abc", @"def", @"ghi", @"jkl" };
-  GPBInt32ObjectDictionary<NSString*> *dict =
-      [[GPBInt32ObjectDictionary alloc] initWithObjects:kObjects
-                                                forKeys:kKeys
-                                                  count:GPBARRAYSIZE(kObjects)];
-  XCTAssertNotNil(dict);
-
-  GPBInt32ObjectDictionary<NSString*> *dict2 =
-      [[GPBInt32ObjectDictionary alloc] initWithDictionary:dict];
-  XCTAssertNotNil(dict2);
-
-  // Should be new pointer, but equal objects.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testAdds {
-  GPBInt32ObjectDictionary<NSString*> *dict = [[GPBInt32ObjectDictionary alloc] init];
-  XCTAssertNotNil(dict);
-
-  XCTAssertEqual(dict.count, 0U);
-  [dict setObject:@"abc" forKey:11];
-  XCTAssertEqual(dict.count, 1U);
-
-  const int32_t kKeys[] = { 12, 13, 14 };
-  const NSString* kObjects[] = { @"def", @"ghi", @"jkl" };
-  GPBInt32ObjectDictionary<NSString*> *dict2 =
-      [[GPBInt32ObjectDictionary alloc] initWithObjects:kObjects
-                                                forKeys:kKeys
-                                                  count:GPBARRAYSIZE(kObjects)];
-  XCTAssertNotNil(dict2);
-  [dict addEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 4U);
-
-  XCTAssertEqualObjects([dict objectForKey:11], @"abc");
-  XCTAssertEqualObjects([dict objectForKey:12], @"def");
-  XCTAssertEqualObjects([dict objectForKey:13], @"ghi");
-  XCTAssertEqualObjects([dict objectForKey:14], @"jkl");
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testRemove {
-  const int32_t kKeys[] = { 11, 12, 13, 14 };
-  const NSString* kObjects[] = { @"abc", @"def", @"ghi", @"jkl" };
-  GPBInt32ObjectDictionary<NSString*> *dict =
-      [[GPBInt32ObjectDictionary alloc] initWithObjects:kObjects
-                                                forKeys:kKeys
-                                                  count:GPBARRAYSIZE(kObjects)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 4U);
-
-  [dict removeObjectForKey:12];
-  XCTAssertEqual(dict.count, 3U);
-  XCTAssertEqualObjects([dict objectForKey:11], @"abc");
-  XCTAssertNil([dict objectForKey:12]);
-  XCTAssertEqualObjects([dict objectForKey:13], @"ghi");
-  XCTAssertEqualObjects([dict objectForKey:14], @"jkl");
-
-  // Remove again does nothing.
-  [dict removeObjectForKey:12];
-  XCTAssertEqual(dict.count, 3U);
-  XCTAssertEqualObjects([dict objectForKey:11], @"abc");
-  XCTAssertNil([dict objectForKey:12]);
-  XCTAssertEqualObjects([dict objectForKey:13], @"ghi");
-  XCTAssertEqualObjects([dict objectForKey:14], @"jkl");
-
-  [dict removeObjectForKey:14];
-  XCTAssertEqual(dict.count, 2U);
-  XCTAssertEqualObjects([dict objectForKey:11], @"abc");
-  XCTAssertNil([dict objectForKey:12]);
-  XCTAssertEqualObjects([dict objectForKey:13], @"ghi");
-  XCTAssertNil([dict objectForKey:14]);
-
-  [dict removeAll];
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertNil([dict objectForKey:11]);
-  XCTAssertNil([dict objectForKey:12]);
-  XCTAssertNil([dict objectForKey:13]);
-  XCTAssertNil([dict objectForKey:14]);
-  [dict release];
-}
-
-- (void)testInplaceMutation {
-  const int32_t kKeys[] = { 11, 12, 13, 14 };
-  const NSString* kObjects[] = { @"abc", @"def", @"ghi", @"jkl" };
-  GPBInt32ObjectDictionary<NSString*> *dict =
-      [[GPBInt32ObjectDictionary alloc] initWithObjects:kObjects
-                                                forKeys:kKeys
-                                                  count:GPBARRAYSIZE(kObjects)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertEqualObjects([dict objectForKey:11], @"abc");
-  XCTAssertEqualObjects([dict objectForKey:12], @"def");
-  XCTAssertEqualObjects([dict objectForKey:13], @"ghi");
-  XCTAssertEqualObjects([dict objectForKey:14], @"jkl");
-
-  [dict setObject:@"jkl" forKey:11];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertEqualObjects([dict objectForKey:11], @"jkl");
-  XCTAssertEqualObjects([dict objectForKey:12], @"def");
-  XCTAssertEqualObjects([dict objectForKey:13], @"ghi");
-  XCTAssertEqualObjects([dict objectForKey:14], @"jkl");
-
-  [dict setObject:@"def" forKey:14];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertEqualObjects([dict objectForKey:11], @"jkl");
-  XCTAssertEqualObjects([dict objectForKey:12], @"def");
-  XCTAssertEqualObjects([dict objectForKey:13], @"ghi");
-  XCTAssertEqualObjects([dict objectForKey:14], @"def");
-
-  const int32_t kKeys2[] = { 12, 13 };
-  const NSString* kObjects2[] = { @"ghi", @"abc" };
-  GPBInt32ObjectDictionary<NSString*> *dict2 =
-      [[GPBInt32ObjectDictionary alloc] initWithObjects:kObjects2
-                                                forKeys:kKeys2
-                                                  count:GPBARRAYSIZE(kObjects2)];
-  XCTAssertNotNil(dict2);
-  [dict addEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertEqualObjects([dict objectForKey:11], @"jkl");
-  XCTAssertEqualObjects([dict objectForKey:12], @"ghi");
-  XCTAssertEqualObjects([dict objectForKey:13], @"abc");
-  XCTAssertEqualObjects([dict objectForKey:14], @"def");
-
-  [dict2 release];
-  [dict release];
-}
-
-@end
-
-// clang-format on
-//%PDDM-EXPAND-END TEST_FOR_POD_KEY(Int32, int32_t, 11, 12, 13, 14)
-
diff --git a/libs/protobuf/objectivec/Tests/GPBDictionaryTests+Int64.m b/libs/protobuf/objectivec/Tests/GPBDictionaryTests+Int64.m
deleted file mode 100644
index a603356..0000000
--- a/libs/protobuf/objectivec/Tests/GPBDictionaryTests+Int64.m
+++ /dev/null
@@ -1,3678 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#import <Foundation/Foundation.h>
-#import <XCTest/XCTest.h>
-
-#import "GPBDictionary.h"
-
-#import "GPBTestUtilities.h"
-#import "google/protobuf/UnittestRuntimeProto2.pbobjc.h"
-
-// Pull in the macros (using an external file because expanding all tests
-// in a single file makes a file that is failing to work with within Xcode.
-//%PDDM-IMPORT-DEFINES GPBDictionaryTests.pddm
-
-//%PDDM-EXPAND TEST_FOR_POD_KEY(Int64, int64_t, 21LL, 22LL, 23LL, 24LL)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-// To let the testing macros work, add some extra methods to simplify things.
-@interface GPBInt64EnumDictionary (TestingTweak)
-- (instancetype)initWithEnums:(const int32_t [])values
-                      forKeys:(const int64_t [])keys
-                        count:(NSUInteger)count;
-@end
-
-static BOOL TestingEnum_IsValidValue(int32_t value) {
-  switch (value) {
-    case 700:
-    case 701:
-    case 702:
-    case 703:
-      return YES;
-    default:
-      return NO;
-  }
-}
-
-@implementation GPBInt64EnumDictionary (TestingTweak)
-- (instancetype)initWithEnums:(const int32_t [])values
-                      forKeys:(const int64_t [])keys
-                        count:(NSUInteger)count {
-  return [self initWithValidationFunction:TestingEnum_IsValidValue
-                                rawValues:values
-                                  forKeys:keys
-                                    count:count];
-}
-@end
-
-
-#pragma mark - Int64 -> UInt32
-
-@interface GPBInt64UInt32DictionaryTests : XCTestCase
-@end
-
-@implementation GPBInt64UInt32DictionaryTests
-
-- (void)testEmpty {
-  GPBInt64UInt32Dictionary *dict = [[GPBInt64UInt32Dictionary alloc] init];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertFalse([dict getUInt32:NULL forKey:21LL]);
-  [dict enumerateKeysAndUInt32sUsingBlock:^(int64_t aKey, uint32_t aValue, BOOL *stop) {
-    #pragma unused(aKey, aValue, stop)
-    XCTFail(@"Shouldn't get here!");
-  }];
-  [dict release];
-}
-
-- (void)testOne {
-  GPBInt64UInt32Dictionary *dict = [[GPBInt64UInt32Dictionary alloc] init];
-  [dict setUInt32:100U forKey:21LL];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 1U);
-  uint32_t value;
-  XCTAssertTrue([dict getUInt32:NULL forKey:21LL]);
-  XCTAssertTrue([dict getUInt32:&value forKey:21LL]);
-  XCTAssertEqual(value, 100U);
-  XCTAssertFalse([dict getUInt32:NULL forKey:22LL]);
-  [dict enumerateKeysAndUInt32sUsingBlock:^(int64_t aKey, uint32_t aValue, BOOL *stop) {
-    XCTAssertEqual(aKey, 21LL);
-    XCTAssertEqual(aValue, 100U);
-    XCTAssertNotEqual(stop, NULL);
-  }];
-  [dict release];
-}
-
-- (void)testBasics {
-  const int64_t kKeys[] = { 21LL, 22LL, 23LL };
-  const uint32_t kValues[] = { 100U, 101U, 102U };
-  GPBInt64UInt32Dictionary *dict =
-      [[GPBInt64UInt32Dictionary alloc] initWithUInt32s:kValues
-                                                forKeys:kKeys
-                                                  count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 3U);
-  uint32_t value;
-  XCTAssertTrue([dict getUInt32:NULL forKey:21LL]);
-  XCTAssertTrue([dict getUInt32:&value forKey:21LL]);
-  XCTAssertEqual(value, 100U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:22LL]);
-  XCTAssertTrue([dict getUInt32:&value forKey:22LL]);
-  XCTAssertEqual(value, 101U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:23LL]);
-  XCTAssertTrue([dict getUInt32:&value forKey:23LL]);
-  XCTAssertEqual(value, 102U);
-  XCTAssertFalse([dict getUInt32:NULL forKey:24LL]);
-
-  __block NSUInteger idx = 0;
-  int64_t *seenKeys = malloc(3 * sizeof(int64_t));
-  uint32_t *seenValues = malloc(3 * sizeof(uint32_t));
-  [dict enumerateKeysAndUInt32sUsingBlock:^(int64_t aKey, uint32_t aValue, BOOL *stop) {
-    XCTAssertLessThan(idx, 3U);
-    seenKeys[idx] = aKey;
-    seenValues[idx] = aValue;
-    XCTAssertNotEqual(stop, NULL);
-    ++idx;
-  }];
-  for (int i = 0; i < 3; ++i) {
-    BOOL foundKey = NO;
-    for (int j = 0; (j < 3) && !foundKey; ++j) {
-      if (kKeys[i] == seenKeys[j]) {
-        foundKey = YES;
-        XCTAssertEqual(kValues[i], seenValues[j], @"i = %d, j = %d", i, j);
-      }
-    }
-    XCTAssertTrue(foundKey, @"i = %d", i);
-  }
-  free(seenKeys);
-  free(seenValues);
-
-  // Stopping the enumeration.
-  idx = 0;
-  [dict enumerateKeysAndUInt32sUsingBlock:^(int64_t aKey, uint32_t aValue, BOOL *stop) {
-    #pragma unused(aKey, aValue)
-    if (idx == 1) *stop = YES;
-    XCTAssertNotEqual(idx, 2U);
-    ++idx;
-  }];
-  [dict release];
-}
-
-- (void)testEquality {
-  const int64_t kKeys1[] = { 21LL, 22LL, 23LL, 24LL };
-  const int64_t kKeys2[] = { 22LL, 21LL, 24LL };
-  const uint32_t kValues1[] = { 100U, 101U, 102U };
-  const uint32_t kValues2[] = { 100U, 103U, 102U };
-  const uint32_t kValues3[] = { 100U, 101U, 102U, 103U };
-  GPBInt64UInt32Dictionary *dict1 =
-      [[GPBInt64UInt32Dictionary alloc] initWithUInt32s:kValues1
-                                                forKeys:kKeys1
-                                                  count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict1);
-  GPBInt64UInt32Dictionary *dict1prime =
-      [[GPBInt64UInt32Dictionary alloc] initWithUInt32s:kValues1
-                                                forKeys:kKeys1
-                                                  count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict1prime);
-  GPBInt64UInt32Dictionary *dict2 =
-      [[GPBInt64UInt32Dictionary alloc] initWithUInt32s:kValues2
-                                                forKeys:kKeys1
-                                                  count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(dict2);
-  GPBInt64UInt32Dictionary *dict3 =
-      [[GPBInt64UInt32Dictionary alloc] initWithUInt32s:kValues1
-                                                forKeys:kKeys2
-                                                  count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict3);
-  GPBInt64UInt32Dictionary *dict4 =
-      [[GPBInt64UInt32Dictionary alloc] initWithUInt32s:kValues3
-                                                forKeys:kKeys1
-                                                  count:GPBARRAYSIZE(kValues3)];
-  XCTAssertNotNil(dict4);
-
-  // 1/1Prime should be different objects, but equal.
-  XCTAssertNotEqual(dict1, dict1prime);
-  XCTAssertEqualObjects(dict1, dict1prime);
-  // Equal, so they must have same hash.
-  XCTAssertEqual([dict1 hash], [dict1prime hash]);
-
-  // 2 is same keys, different values; not equal.
-  XCTAssertNotEqualObjects(dict1, dict2);
-
-  // 3 is different keys, same values; not equal.
-  XCTAssertNotEqualObjects(dict1, dict3);
-
-  // 4 extra pair; not equal
-  XCTAssertNotEqualObjects(dict1, dict4);
-
-  [dict1 release];
-  [dict1prime release];
-  [dict2 release];
-  [dict3 release];
-  [dict4 release];
-}
-
-- (void)testCopy {
-  const int64_t kKeys[] = { 21LL, 22LL, 23LL, 24LL };
-  const uint32_t kValues[] = { 100U, 101U, 102U, 103U };
-  GPBInt64UInt32Dictionary *dict =
-      [[GPBInt64UInt32Dictionary alloc] initWithUInt32s:kValues
-                                                forKeys:kKeys
-                                                  count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-
-  GPBInt64UInt32Dictionary *dict2 = [dict copy];
-  XCTAssertNotNil(dict2);
-
-  // Should be new object but equal.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  XCTAssertTrue([dict2 isKindOfClass:[GPBInt64UInt32Dictionary class]]);
-
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testDictionaryFromDictionary {
-  const int64_t kKeys[] = { 21LL, 22LL, 23LL, 24LL };
-  const uint32_t kValues[] = { 100U, 101U, 102U, 103U };
-  GPBInt64UInt32Dictionary *dict =
-      [[GPBInt64UInt32Dictionary alloc] initWithUInt32s:kValues
-                                                forKeys:kKeys
-                                                  count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-
-  GPBInt64UInt32Dictionary *dict2 =
-      [[GPBInt64UInt32Dictionary alloc] initWithDictionary:dict];
-  XCTAssertNotNil(dict2);
-
-  // Should be new pointer, but equal objects.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testAdds {
-  GPBInt64UInt32Dictionary *dict = [[GPBInt64UInt32Dictionary alloc] init];
-  XCTAssertNotNil(dict);
-
-  XCTAssertEqual(dict.count, 0U);
-  [dict setUInt32:100U forKey:21LL];
-  XCTAssertEqual(dict.count, 1U);
-
-  const int64_t kKeys[] = { 22LL, 23LL, 24LL };
-  const uint32_t kValues[] = { 101U, 102U, 103U };
-  GPBInt64UInt32Dictionary *dict2 =
-      [[GPBInt64UInt32Dictionary alloc] initWithUInt32s:kValues
-                                                forKeys:kKeys
-                                                  count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict2);
-  [dict addEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 4U);
-
-  uint32_t value;
-  XCTAssertTrue([dict getUInt32:NULL forKey:21LL]);
-  XCTAssertTrue([dict getUInt32:&value forKey:21LL]);
-  XCTAssertEqual(value, 100U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:22LL]);
-  XCTAssertTrue([dict getUInt32:&value forKey:22LL]);
-  XCTAssertEqual(value, 101U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:23LL]);
-  XCTAssertTrue([dict getUInt32:&value forKey:23LL]);
-  XCTAssertEqual(value, 102U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:24LL]);
-  XCTAssertTrue([dict getUInt32:&value forKey:24LL]);
-  XCTAssertEqual(value, 103U);
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testRemove {
-  const int64_t kKeys[] = { 21LL, 22LL, 23LL, 24LL };
-  const uint32_t kValues[] = { 100U, 101U, 102U, 103U };
-  GPBInt64UInt32Dictionary *dict =
-      [[GPBInt64UInt32Dictionary alloc] initWithUInt32s:kValues
-                                                forKeys:kKeys
-                                                  count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 4U);
-
-  [dict removeUInt32ForKey:22LL];
-  XCTAssertEqual(dict.count, 3U);
-  uint32_t value;
-  XCTAssertTrue([dict getUInt32:NULL forKey:21LL]);
-  XCTAssertTrue([dict getUInt32:&value forKey:21LL]);
-  XCTAssertEqual(value, 100U);
-  XCTAssertFalse([dict getUInt32:NULL forKey:22LL]);
-  XCTAssertTrue([dict getUInt32:NULL forKey:23LL]);
-  XCTAssertTrue([dict getUInt32:&value forKey:23LL]);
-  XCTAssertEqual(value, 102U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:24LL]);
-  XCTAssertTrue([dict getUInt32:&value forKey:24LL]);
-  XCTAssertEqual(value, 103U);
-
-  // Remove again does nothing.
-  [dict removeUInt32ForKey:22LL];
-  XCTAssertEqual(dict.count, 3U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:21LL]);
-  XCTAssertTrue([dict getUInt32:&value forKey:21LL]);
-  XCTAssertEqual(value, 100U);
-  XCTAssertFalse([dict getUInt32:NULL forKey:22LL]);
-  XCTAssertTrue([dict getUInt32:NULL forKey:23LL]);
-  XCTAssertTrue([dict getUInt32:&value forKey:23LL]);
-  XCTAssertEqual(value, 102U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:24LL]);
-  XCTAssertTrue([dict getUInt32:&value forKey:24LL]);
-  XCTAssertEqual(value, 103U);
-
-  [dict removeUInt32ForKey:24LL];
-  XCTAssertEqual(dict.count, 2U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:21LL]);
-  XCTAssertTrue([dict getUInt32:&value forKey:21LL]);
-  XCTAssertEqual(value, 100U);
-  XCTAssertFalse([dict getUInt32:NULL forKey:22LL]);
-  XCTAssertTrue([dict getUInt32:NULL forKey:23LL]);
-  XCTAssertTrue([dict getUInt32:&value forKey:23LL]);
-  XCTAssertEqual(value, 102U);
-  XCTAssertFalse([dict getUInt32:NULL forKey:24LL]);
-
-  [dict removeAll];
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertFalse([dict getUInt32:NULL forKey:21LL]);
-  XCTAssertFalse([dict getUInt32:NULL forKey:22LL]);
-  XCTAssertFalse([dict getUInt32:NULL forKey:23LL]);
-  XCTAssertFalse([dict getUInt32:NULL forKey:24LL]);
-  [dict release];
-}
-
-- (void)testInplaceMutation {
-  const int64_t kKeys[] = { 21LL, 22LL, 23LL, 24LL };
-  const uint32_t kValues[] = { 100U, 101U, 102U, 103U };
-  GPBInt64UInt32Dictionary *dict =
-      [[GPBInt64UInt32Dictionary alloc] initWithUInt32s:kValues
-                                                forKeys:kKeys
-                                                  count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 4U);
-  uint32_t value;
-  XCTAssertTrue([dict getUInt32:NULL forKey:21LL]);
-  XCTAssertTrue([dict getUInt32:&value forKey:21LL]);
-  XCTAssertEqual(value, 100U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:22LL]);
-  XCTAssertTrue([dict getUInt32:&value forKey:22LL]);
-  XCTAssertEqual(value, 101U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:23LL]);
-  XCTAssertTrue([dict getUInt32:&value forKey:23LL]);
-  XCTAssertEqual(value, 102U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:24LL]);
-  XCTAssertTrue([dict getUInt32:&value forKey:24LL]);
-  XCTAssertEqual(value, 103U);
-
-  [dict setUInt32:103U forKey:21LL];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:21LL]);
-  XCTAssertTrue([dict getUInt32:&value forKey:21LL]);
-  XCTAssertEqual(value, 103U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:22LL]);
-  XCTAssertTrue([dict getUInt32:&value forKey:22LL]);
-  XCTAssertEqual(value, 101U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:23LL]);
-  XCTAssertTrue([dict getUInt32:&value forKey:23LL]);
-  XCTAssertEqual(value, 102U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:24LL]);
-  XCTAssertTrue([dict getUInt32:&value forKey:24LL]);
-  XCTAssertEqual(value, 103U);
-
-  [dict setUInt32:101U forKey:24LL];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:21LL]);
-  XCTAssertTrue([dict getUInt32:&value forKey:21LL]);
-  XCTAssertEqual(value, 103U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:22LL]);
-  XCTAssertTrue([dict getUInt32:&value forKey:22LL]);
-  XCTAssertEqual(value, 101U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:23LL]);
-  XCTAssertTrue([dict getUInt32:&value forKey:23LL]);
-  XCTAssertEqual(value, 102U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:24LL]);
-  XCTAssertTrue([dict getUInt32:&value forKey:24LL]);
-  XCTAssertEqual(value, 101U);
-
-  const int64_t kKeys2[] = { 22LL, 23LL };
-  const uint32_t kValues2[] = { 102U, 100U };
-  GPBInt64UInt32Dictionary *dict2 =
-      [[GPBInt64UInt32Dictionary alloc] initWithUInt32s:kValues2
-                                                forKeys:kKeys2
-                                                  count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(dict2);
-  [dict addEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:21LL]);
-  XCTAssertTrue([dict getUInt32:&value forKey:21LL]);
-  XCTAssertEqual(value, 103U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:22LL]);
-  XCTAssertTrue([dict getUInt32:&value forKey:22LL]);
-  XCTAssertEqual(value, 102U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:23LL]);
-  XCTAssertTrue([dict getUInt32:&value forKey:23LL]);
-  XCTAssertEqual(value, 100U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:24LL]);
-  XCTAssertTrue([dict getUInt32:&value forKey:24LL]);
-  XCTAssertEqual(value, 101U);
-
-  [dict2 release];
-  [dict release];
-}
-
-@end
-
-#pragma mark - Int64 -> Int32
-
-@interface GPBInt64Int32DictionaryTests : XCTestCase
-@end
-
-@implementation GPBInt64Int32DictionaryTests
-
-- (void)testEmpty {
-  GPBInt64Int32Dictionary *dict = [[GPBInt64Int32Dictionary alloc] init];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertFalse([dict getInt32:NULL forKey:21LL]);
-  [dict enumerateKeysAndInt32sUsingBlock:^(int64_t aKey, int32_t aValue, BOOL *stop) {
-    #pragma unused(aKey, aValue, stop)
-    XCTFail(@"Shouldn't get here!");
-  }];
-  [dict release];
-}
-
-- (void)testOne {
-  GPBInt64Int32Dictionary *dict = [[GPBInt64Int32Dictionary alloc] init];
-  [dict setInt32:200 forKey:21LL];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 1U);
-  int32_t value;
-  XCTAssertTrue([dict getInt32:NULL forKey:21LL]);
-  XCTAssertTrue([dict getInt32:&value forKey:21LL]);
-  XCTAssertEqual(value, 200);
-  XCTAssertFalse([dict getInt32:NULL forKey:22LL]);
-  [dict enumerateKeysAndInt32sUsingBlock:^(int64_t aKey, int32_t aValue, BOOL *stop) {
-    XCTAssertEqual(aKey, 21LL);
-    XCTAssertEqual(aValue, 200);
-    XCTAssertNotEqual(stop, NULL);
-  }];
-  [dict release];
-}
-
-- (void)testBasics {
-  const int64_t kKeys[] = { 21LL, 22LL, 23LL };
-  const int32_t kValues[] = { 200, 201, 202 };
-  GPBInt64Int32Dictionary *dict =
-      [[GPBInt64Int32Dictionary alloc] initWithInt32s:kValues
-                                              forKeys:kKeys
-                                                count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 3U);
-  int32_t value;
-  XCTAssertTrue([dict getInt32:NULL forKey:21LL]);
-  XCTAssertTrue([dict getInt32:&value forKey:21LL]);
-  XCTAssertEqual(value, 200);
-  XCTAssertTrue([dict getInt32:NULL forKey:22LL]);
-  XCTAssertTrue([dict getInt32:&value forKey:22LL]);
-  XCTAssertEqual(value, 201);
-  XCTAssertTrue([dict getInt32:NULL forKey:23LL]);
-  XCTAssertTrue([dict getInt32:&value forKey:23LL]);
-  XCTAssertEqual(value, 202);
-  XCTAssertFalse([dict getInt32:NULL forKey:24LL]);
-
-  __block NSUInteger idx = 0;
-  int64_t *seenKeys = malloc(3 * sizeof(int64_t));
-  int32_t *seenValues = malloc(3 * sizeof(int32_t));
-  [dict enumerateKeysAndInt32sUsingBlock:^(int64_t aKey, int32_t aValue, BOOL *stop) {
-    XCTAssertLessThan(idx, 3U);
-    seenKeys[idx] = aKey;
-    seenValues[idx] = aValue;
-    XCTAssertNotEqual(stop, NULL);
-    ++idx;
-  }];
-  for (int i = 0; i < 3; ++i) {
-    BOOL foundKey = NO;
-    for (int j = 0; (j < 3) && !foundKey; ++j) {
-      if (kKeys[i] == seenKeys[j]) {
-        foundKey = YES;
-        XCTAssertEqual(kValues[i], seenValues[j], @"i = %d, j = %d", i, j);
-      }
-    }
-    XCTAssertTrue(foundKey, @"i = %d", i);
-  }
-  free(seenKeys);
-  free(seenValues);
-
-  // Stopping the enumeration.
-  idx = 0;
-  [dict enumerateKeysAndInt32sUsingBlock:^(int64_t aKey, int32_t aValue, BOOL *stop) {
-    #pragma unused(aKey, aValue)
-    if (idx == 1) *stop = YES;
-    XCTAssertNotEqual(idx, 2U);
-    ++idx;
-  }];
-  [dict release];
-}
-
-- (void)testEquality {
-  const int64_t kKeys1[] = { 21LL, 22LL, 23LL, 24LL };
-  const int64_t kKeys2[] = { 22LL, 21LL, 24LL };
-  const int32_t kValues1[] = { 200, 201, 202 };
-  const int32_t kValues2[] = { 200, 203, 202 };
-  const int32_t kValues3[] = { 200, 201, 202, 203 };
-  GPBInt64Int32Dictionary *dict1 =
-      [[GPBInt64Int32Dictionary alloc] initWithInt32s:kValues1
-                                              forKeys:kKeys1
-                                                count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict1);
-  GPBInt64Int32Dictionary *dict1prime =
-      [[GPBInt64Int32Dictionary alloc] initWithInt32s:kValues1
-                                              forKeys:kKeys1
-                                                count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict1prime);
-  GPBInt64Int32Dictionary *dict2 =
-      [[GPBInt64Int32Dictionary alloc] initWithInt32s:kValues2
-                                              forKeys:kKeys1
-                                                count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(dict2);
-  GPBInt64Int32Dictionary *dict3 =
-      [[GPBInt64Int32Dictionary alloc] initWithInt32s:kValues1
-                                              forKeys:kKeys2
-                                                count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict3);
-  GPBInt64Int32Dictionary *dict4 =
-      [[GPBInt64Int32Dictionary alloc] initWithInt32s:kValues3
-                                              forKeys:kKeys1
-                                                count:GPBARRAYSIZE(kValues3)];
-  XCTAssertNotNil(dict4);
-
-  // 1/1Prime should be different objects, but equal.
-  XCTAssertNotEqual(dict1, dict1prime);
-  XCTAssertEqualObjects(dict1, dict1prime);
-  // Equal, so they must have same hash.
-  XCTAssertEqual([dict1 hash], [dict1prime hash]);
-
-  // 2 is same keys, different values; not equal.
-  XCTAssertNotEqualObjects(dict1, dict2);
-
-  // 3 is different keys, same values; not equal.
-  XCTAssertNotEqualObjects(dict1, dict3);
-
-  // 4 extra pair; not equal
-  XCTAssertNotEqualObjects(dict1, dict4);
-
-  [dict1 release];
-  [dict1prime release];
-  [dict2 release];
-  [dict3 release];
-  [dict4 release];
-}
-
-- (void)testCopy {
-  const int64_t kKeys[] = { 21LL, 22LL, 23LL, 24LL };
-  const int32_t kValues[] = { 200, 201, 202, 203 };
-  GPBInt64Int32Dictionary *dict =
-      [[GPBInt64Int32Dictionary alloc] initWithInt32s:kValues
-                                              forKeys:kKeys
-                                                count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-
-  GPBInt64Int32Dictionary *dict2 = [dict copy];
-  XCTAssertNotNil(dict2);
-
-  // Should be new object but equal.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  XCTAssertTrue([dict2 isKindOfClass:[GPBInt64Int32Dictionary class]]);
-
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testDictionaryFromDictionary {
-  const int64_t kKeys[] = { 21LL, 22LL, 23LL, 24LL };
-  const int32_t kValues[] = { 200, 201, 202, 203 };
-  GPBInt64Int32Dictionary *dict =
-      [[GPBInt64Int32Dictionary alloc] initWithInt32s:kValues
-                                              forKeys:kKeys
-                                                count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-
-  GPBInt64Int32Dictionary *dict2 =
-      [[GPBInt64Int32Dictionary alloc] initWithDictionary:dict];
-  XCTAssertNotNil(dict2);
-
-  // Should be new pointer, but equal objects.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testAdds {
-  GPBInt64Int32Dictionary *dict = [[GPBInt64Int32Dictionary alloc] init];
-  XCTAssertNotNil(dict);
-
-  XCTAssertEqual(dict.count, 0U);
-  [dict setInt32:200 forKey:21LL];
-  XCTAssertEqual(dict.count, 1U);
-
-  const int64_t kKeys[] = { 22LL, 23LL, 24LL };
-  const int32_t kValues[] = { 201, 202, 203 };
-  GPBInt64Int32Dictionary *dict2 =
-      [[GPBInt64Int32Dictionary alloc] initWithInt32s:kValues
-                                              forKeys:kKeys
-                                                count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict2);
-  [dict addEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 4U);
-
-  int32_t value;
-  XCTAssertTrue([dict getInt32:NULL forKey:21LL]);
-  XCTAssertTrue([dict getInt32:&value forKey:21LL]);
-  XCTAssertEqual(value, 200);
-  XCTAssertTrue([dict getInt32:NULL forKey:22LL]);
-  XCTAssertTrue([dict getInt32:&value forKey:22LL]);
-  XCTAssertEqual(value, 201);
-  XCTAssertTrue([dict getInt32:NULL forKey:23LL]);
-  XCTAssertTrue([dict getInt32:&value forKey:23LL]);
-  XCTAssertEqual(value, 202);
-  XCTAssertTrue([dict getInt32:NULL forKey:24LL]);
-  XCTAssertTrue([dict getInt32:&value forKey:24LL]);
-  XCTAssertEqual(value, 203);
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testRemove {
-  const int64_t kKeys[] = { 21LL, 22LL, 23LL, 24LL };
-  const int32_t kValues[] = { 200, 201, 202, 203 };
-  GPBInt64Int32Dictionary *dict =
-      [[GPBInt64Int32Dictionary alloc] initWithInt32s:kValues
-                                              forKeys:kKeys
-                                                count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 4U);
-
-  [dict removeInt32ForKey:22LL];
-  XCTAssertEqual(dict.count, 3U);
-  int32_t value;
-  XCTAssertTrue([dict getInt32:NULL forKey:21LL]);
-  XCTAssertTrue([dict getInt32:&value forKey:21LL]);
-  XCTAssertEqual(value, 200);
-  XCTAssertFalse([dict getInt32:NULL forKey:22LL]);
-  XCTAssertTrue([dict getInt32:NULL forKey:23LL]);
-  XCTAssertTrue([dict getInt32:&value forKey:23LL]);
-  XCTAssertEqual(value, 202);
-  XCTAssertTrue([dict getInt32:NULL forKey:24LL]);
-  XCTAssertTrue([dict getInt32:&value forKey:24LL]);
-  XCTAssertEqual(value, 203);
-
-  // Remove again does nothing.
-  [dict removeInt32ForKey:22LL];
-  XCTAssertEqual(dict.count, 3U);
-  XCTAssertTrue([dict getInt32:NULL forKey:21LL]);
-  XCTAssertTrue([dict getInt32:&value forKey:21LL]);
-  XCTAssertEqual(value, 200);
-  XCTAssertFalse([dict getInt32:NULL forKey:22LL]);
-  XCTAssertTrue([dict getInt32:NULL forKey:23LL]);
-  XCTAssertTrue([dict getInt32:&value forKey:23LL]);
-  XCTAssertEqual(value, 202);
-  XCTAssertTrue([dict getInt32:NULL forKey:24LL]);
-  XCTAssertTrue([dict getInt32:&value forKey:24LL]);
-  XCTAssertEqual(value, 203);
-
-  [dict removeInt32ForKey:24LL];
-  XCTAssertEqual(dict.count, 2U);
-  XCTAssertTrue([dict getInt32:NULL forKey:21LL]);
-  XCTAssertTrue([dict getInt32:&value forKey:21LL]);
-  XCTAssertEqual(value, 200);
-  XCTAssertFalse([dict getInt32:NULL forKey:22LL]);
-  XCTAssertTrue([dict getInt32:NULL forKey:23LL]);
-  XCTAssertTrue([dict getInt32:&value forKey:23LL]);
-  XCTAssertEqual(value, 202);
-  XCTAssertFalse([dict getInt32:NULL forKey:24LL]);
-
-  [dict removeAll];
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertFalse([dict getInt32:NULL forKey:21LL]);
-  XCTAssertFalse([dict getInt32:NULL forKey:22LL]);
-  XCTAssertFalse([dict getInt32:NULL forKey:23LL]);
-  XCTAssertFalse([dict getInt32:NULL forKey:24LL]);
-  [dict release];
-}
-
-- (void)testInplaceMutation {
-  const int64_t kKeys[] = { 21LL, 22LL, 23LL, 24LL };
-  const int32_t kValues[] = { 200, 201, 202, 203 };
-  GPBInt64Int32Dictionary *dict =
-      [[GPBInt64Int32Dictionary alloc] initWithInt32s:kValues
-                                              forKeys:kKeys
-                                                count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 4U);
-  int32_t value;
-  XCTAssertTrue([dict getInt32:NULL forKey:21LL]);
-  XCTAssertTrue([dict getInt32:&value forKey:21LL]);
-  XCTAssertEqual(value, 200);
-  XCTAssertTrue([dict getInt32:NULL forKey:22LL]);
-  XCTAssertTrue([dict getInt32:&value forKey:22LL]);
-  XCTAssertEqual(value, 201);
-  XCTAssertTrue([dict getInt32:NULL forKey:23LL]);
-  XCTAssertTrue([dict getInt32:&value forKey:23LL]);
-  XCTAssertEqual(value, 202);
-  XCTAssertTrue([dict getInt32:NULL forKey:24LL]);
-  XCTAssertTrue([dict getInt32:&value forKey:24LL]);
-  XCTAssertEqual(value, 203);
-
-  [dict setInt32:203 forKey:21LL];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getInt32:NULL forKey:21LL]);
-  XCTAssertTrue([dict getInt32:&value forKey:21LL]);
-  XCTAssertEqual(value, 203);
-  XCTAssertTrue([dict getInt32:NULL forKey:22LL]);
-  XCTAssertTrue([dict getInt32:&value forKey:22LL]);
-  XCTAssertEqual(value, 201);
-  XCTAssertTrue([dict getInt32:NULL forKey:23LL]);
-  XCTAssertTrue([dict getInt32:&value forKey:23LL]);
-  XCTAssertEqual(value, 202);
-  XCTAssertTrue([dict getInt32:NULL forKey:24LL]);
-  XCTAssertTrue([dict getInt32:&value forKey:24LL]);
-  XCTAssertEqual(value, 203);
-
-  [dict setInt32:201 forKey:24LL];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getInt32:NULL forKey:21LL]);
-  XCTAssertTrue([dict getInt32:&value forKey:21LL]);
-  XCTAssertEqual(value, 203);
-  XCTAssertTrue([dict getInt32:NULL forKey:22LL]);
-  XCTAssertTrue([dict getInt32:&value forKey:22LL]);
-  XCTAssertEqual(value, 201);
-  XCTAssertTrue([dict getInt32:NULL forKey:23LL]);
-  XCTAssertTrue([dict getInt32:&value forKey:23LL]);
-  XCTAssertEqual(value, 202);
-  XCTAssertTrue([dict getInt32:NULL forKey:24LL]);
-  XCTAssertTrue([dict getInt32:&value forKey:24LL]);
-  XCTAssertEqual(value, 201);
-
-  const int64_t kKeys2[] = { 22LL, 23LL };
-  const int32_t kValues2[] = { 202, 200 };
-  GPBInt64Int32Dictionary *dict2 =
-      [[GPBInt64Int32Dictionary alloc] initWithInt32s:kValues2
-                                              forKeys:kKeys2
-                                                count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(dict2);
-  [dict addEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getInt32:NULL forKey:21LL]);
-  XCTAssertTrue([dict getInt32:&value forKey:21LL]);
-  XCTAssertEqual(value, 203);
-  XCTAssertTrue([dict getInt32:NULL forKey:22LL]);
-  XCTAssertTrue([dict getInt32:&value forKey:22LL]);
-  XCTAssertEqual(value, 202);
-  XCTAssertTrue([dict getInt32:NULL forKey:23LL]);
-  XCTAssertTrue([dict getInt32:&value forKey:23LL]);
-  XCTAssertEqual(value, 200);
-  XCTAssertTrue([dict getInt32:NULL forKey:24LL]);
-  XCTAssertTrue([dict getInt32:&value forKey:24LL]);
-  XCTAssertEqual(value, 201);
-
-  [dict2 release];
-  [dict release];
-}
-
-@end
-
-#pragma mark - Int64 -> UInt64
-
-@interface GPBInt64UInt64DictionaryTests : XCTestCase
-@end
-
-@implementation GPBInt64UInt64DictionaryTests
-
-- (void)testEmpty {
-  GPBInt64UInt64Dictionary *dict = [[GPBInt64UInt64Dictionary alloc] init];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertFalse([dict getUInt64:NULL forKey:21LL]);
-  [dict enumerateKeysAndUInt64sUsingBlock:^(int64_t aKey, uint64_t aValue, BOOL *stop) {
-    #pragma unused(aKey, aValue, stop)
-    XCTFail(@"Shouldn't get here!");
-  }];
-  [dict release];
-}
-
-- (void)testOne {
-  GPBInt64UInt64Dictionary *dict = [[GPBInt64UInt64Dictionary alloc] init];
-  [dict setUInt64:300U forKey:21LL];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 1U);
-  uint64_t value;
-  XCTAssertTrue([dict getUInt64:NULL forKey:21LL]);
-  XCTAssertTrue([dict getUInt64:&value forKey:21LL]);
-  XCTAssertEqual(value, 300U);
-  XCTAssertFalse([dict getUInt64:NULL forKey:22LL]);
-  [dict enumerateKeysAndUInt64sUsingBlock:^(int64_t aKey, uint64_t aValue, BOOL *stop) {
-    XCTAssertEqual(aKey, 21LL);
-    XCTAssertEqual(aValue, 300U);
-    XCTAssertNotEqual(stop, NULL);
-  }];
-  [dict release];
-}
-
-- (void)testBasics {
-  const int64_t kKeys[] = { 21LL, 22LL, 23LL };
-  const uint64_t kValues[] = { 300U, 301U, 302U };
-  GPBInt64UInt64Dictionary *dict =
-      [[GPBInt64UInt64Dictionary alloc] initWithUInt64s:kValues
-                                                forKeys:kKeys
-                                                  count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 3U);
-  uint64_t value;
-  XCTAssertTrue([dict getUInt64:NULL forKey:21LL]);
-  XCTAssertTrue([dict getUInt64:&value forKey:21LL]);
-  XCTAssertEqual(value, 300U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:22LL]);
-  XCTAssertTrue([dict getUInt64:&value forKey:22LL]);
-  XCTAssertEqual(value, 301U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:23LL]);
-  XCTAssertTrue([dict getUInt64:&value forKey:23LL]);
-  XCTAssertEqual(value, 302U);
-  XCTAssertFalse([dict getUInt64:NULL forKey:24LL]);
-
-  __block NSUInteger idx = 0;
-  int64_t *seenKeys = malloc(3 * sizeof(int64_t));
-  uint64_t *seenValues = malloc(3 * sizeof(uint64_t));
-  [dict enumerateKeysAndUInt64sUsingBlock:^(int64_t aKey, uint64_t aValue, BOOL *stop) {
-    XCTAssertLessThan(idx, 3U);
-    seenKeys[idx] = aKey;
-    seenValues[idx] = aValue;
-    XCTAssertNotEqual(stop, NULL);
-    ++idx;
-  }];
-  for (int i = 0; i < 3; ++i) {
-    BOOL foundKey = NO;
-    for (int j = 0; (j < 3) && !foundKey; ++j) {
-      if (kKeys[i] == seenKeys[j]) {
-        foundKey = YES;
-        XCTAssertEqual(kValues[i], seenValues[j], @"i = %d, j = %d", i, j);
-      }
-    }
-    XCTAssertTrue(foundKey, @"i = %d", i);
-  }
-  free(seenKeys);
-  free(seenValues);
-
-  // Stopping the enumeration.
-  idx = 0;
-  [dict enumerateKeysAndUInt64sUsingBlock:^(int64_t aKey, uint64_t aValue, BOOL *stop) {
-    #pragma unused(aKey, aValue)
-    if (idx == 1) *stop = YES;
-    XCTAssertNotEqual(idx, 2U);
-    ++idx;
-  }];
-  [dict release];
-}
-
-- (void)testEquality {
-  const int64_t kKeys1[] = { 21LL, 22LL, 23LL, 24LL };
-  const int64_t kKeys2[] = { 22LL, 21LL, 24LL };
-  const uint64_t kValues1[] = { 300U, 301U, 302U };
-  const uint64_t kValues2[] = { 300U, 303U, 302U };
-  const uint64_t kValues3[] = { 300U, 301U, 302U, 303U };
-  GPBInt64UInt64Dictionary *dict1 =
-      [[GPBInt64UInt64Dictionary alloc] initWithUInt64s:kValues1
-                                                forKeys:kKeys1
-                                                  count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict1);
-  GPBInt64UInt64Dictionary *dict1prime =
-      [[GPBInt64UInt64Dictionary alloc] initWithUInt64s:kValues1
-                                                forKeys:kKeys1
-                                                  count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict1prime);
-  GPBInt64UInt64Dictionary *dict2 =
-      [[GPBInt64UInt64Dictionary alloc] initWithUInt64s:kValues2
-                                                forKeys:kKeys1
-                                                  count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(dict2);
-  GPBInt64UInt64Dictionary *dict3 =
-      [[GPBInt64UInt64Dictionary alloc] initWithUInt64s:kValues1
-                                                forKeys:kKeys2
-                                                  count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict3);
-  GPBInt64UInt64Dictionary *dict4 =
-      [[GPBInt64UInt64Dictionary alloc] initWithUInt64s:kValues3
-                                                forKeys:kKeys1
-                                                  count:GPBARRAYSIZE(kValues3)];
-  XCTAssertNotNil(dict4);
-
-  // 1/1Prime should be different objects, but equal.
-  XCTAssertNotEqual(dict1, dict1prime);
-  XCTAssertEqualObjects(dict1, dict1prime);
-  // Equal, so they must have same hash.
-  XCTAssertEqual([dict1 hash], [dict1prime hash]);
-
-  // 2 is same keys, different values; not equal.
-  XCTAssertNotEqualObjects(dict1, dict2);
-
-  // 3 is different keys, same values; not equal.
-  XCTAssertNotEqualObjects(dict1, dict3);
-
-  // 4 extra pair; not equal
-  XCTAssertNotEqualObjects(dict1, dict4);
-
-  [dict1 release];
-  [dict1prime release];
-  [dict2 release];
-  [dict3 release];
-  [dict4 release];
-}
-
-- (void)testCopy {
-  const int64_t kKeys[] = { 21LL, 22LL, 23LL, 24LL };
-  const uint64_t kValues[] = { 300U, 301U, 302U, 303U };
-  GPBInt64UInt64Dictionary *dict =
-      [[GPBInt64UInt64Dictionary alloc] initWithUInt64s:kValues
-                                                forKeys:kKeys
-                                                  count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-
-  GPBInt64UInt64Dictionary *dict2 = [dict copy];
-  XCTAssertNotNil(dict2);
-
-  // Should be new object but equal.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  XCTAssertTrue([dict2 isKindOfClass:[GPBInt64UInt64Dictionary class]]);
-
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testDictionaryFromDictionary {
-  const int64_t kKeys[] = { 21LL, 22LL, 23LL, 24LL };
-  const uint64_t kValues[] = { 300U, 301U, 302U, 303U };
-  GPBInt64UInt64Dictionary *dict =
-      [[GPBInt64UInt64Dictionary alloc] initWithUInt64s:kValues
-                                                forKeys:kKeys
-                                                  count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-
-  GPBInt64UInt64Dictionary *dict2 =
-      [[GPBInt64UInt64Dictionary alloc] initWithDictionary:dict];
-  XCTAssertNotNil(dict2);
-
-  // Should be new pointer, but equal objects.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testAdds {
-  GPBInt64UInt64Dictionary *dict = [[GPBInt64UInt64Dictionary alloc] init];
-  XCTAssertNotNil(dict);
-
-  XCTAssertEqual(dict.count, 0U);
-  [dict setUInt64:300U forKey:21LL];
-  XCTAssertEqual(dict.count, 1U);
-
-  const int64_t kKeys[] = { 22LL, 23LL, 24LL };
-  const uint64_t kValues[] = { 301U, 302U, 303U };
-  GPBInt64UInt64Dictionary *dict2 =
-      [[GPBInt64UInt64Dictionary alloc] initWithUInt64s:kValues
-                                                forKeys:kKeys
-                                                  count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict2);
-  [dict addEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 4U);
-
-  uint64_t value;
-  XCTAssertTrue([dict getUInt64:NULL forKey:21LL]);
-  XCTAssertTrue([dict getUInt64:&value forKey:21LL]);
-  XCTAssertEqual(value, 300U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:22LL]);
-  XCTAssertTrue([dict getUInt64:&value forKey:22LL]);
-  XCTAssertEqual(value, 301U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:23LL]);
-  XCTAssertTrue([dict getUInt64:&value forKey:23LL]);
-  XCTAssertEqual(value, 302U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:24LL]);
-  XCTAssertTrue([dict getUInt64:&value forKey:24LL]);
-  XCTAssertEqual(value, 303U);
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testRemove {
-  const int64_t kKeys[] = { 21LL, 22LL, 23LL, 24LL };
-  const uint64_t kValues[] = { 300U, 301U, 302U, 303U };
-  GPBInt64UInt64Dictionary *dict =
-      [[GPBInt64UInt64Dictionary alloc] initWithUInt64s:kValues
-                                                forKeys:kKeys
-                                                  count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 4U);
-
-  [dict removeUInt64ForKey:22LL];
-  XCTAssertEqual(dict.count, 3U);
-  uint64_t value;
-  XCTAssertTrue([dict getUInt64:NULL forKey:21LL]);
-  XCTAssertTrue([dict getUInt64:&value forKey:21LL]);
-  XCTAssertEqual(value, 300U);
-  XCTAssertFalse([dict getUInt64:NULL forKey:22LL]);
-  XCTAssertTrue([dict getUInt64:NULL forKey:23LL]);
-  XCTAssertTrue([dict getUInt64:&value forKey:23LL]);
-  XCTAssertEqual(value, 302U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:24LL]);
-  XCTAssertTrue([dict getUInt64:&value forKey:24LL]);
-  XCTAssertEqual(value, 303U);
-
-  // Remove again does nothing.
-  [dict removeUInt64ForKey:22LL];
-  XCTAssertEqual(dict.count, 3U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:21LL]);
-  XCTAssertTrue([dict getUInt64:&value forKey:21LL]);
-  XCTAssertEqual(value, 300U);
-  XCTAssertFalse([dict getUInt64:NULL forKey:22LL]);
-  XCTAssertTrue([dict getUInt64:NULL forKey:23LL]);
-  XCTAssertTrue([dict getUInt64:&value forKey:23LL]);
-  XCTAssertEqual(value, 302U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:24LL]);
-  XCTAssertTrue([dict getUInt64:&value forKey:24LL]);
-  XCTAssertEqual(value, 303U);
-
-  [dict removeUInt64ForKey:24LL];
-  XCTAssertEqual(dict.count, 2U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:21LL]);
-  XCTAssertTrue([dict getUInt64:&value forKey:21LL]);
-  XCTAssertEqual(value, 300U);
-  XCTAssertFalse([dict getUInt64:NULL forKey:22LL]);
-  XCTAssertTrue([dict getUInt64:NULL forKey:23LL]);
-  XCTAssertTrue([dict getUInt64:&value forKey:23LL]);
-  XCTAssertEqual(value, 302U);
-  XCTAssertFalse([dict getUInt64:NULL forKey:24LL]);
-
-  [dict removeAll];
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertFalse([dict getUInt64:NULL forKey:21LL]);
-  XCTAssertFalse([dict getUInt64:NULL forKey:22LL]);
-  XCTAssertFalse([dict getUInt64:NULL forKey:23LL]);
-  XCTAssertFalse([dict getUInt64:NULL forKey:24LL]);
-  [dict release];
-}
-
-- (void)testInplaceMutation {
-  const int64_t kKeys[] = { 21LL, 22LL, 23LL, 24LL };
-  const uint64_t kValues[] = { 300U, 301U, 302U, 303U };
-  GPBInt64UInt64Dictionary *dict =
-      [[GPBInt64UInt64Dictionary alloc] initWithUInt64s:kValues
-                                                forKeys:kKeys
-                                                  count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 4U);
-  uint64_t value;
-  XCTAssertTrue([dict getUInt64:NULL forKey:21LL]);
-  XCTAssertTrue([dict getUInt64:&value forKey:21LL]);
-  XCTAssertEqual(value, 300U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:22LL]);
-  XCTAssertTrue([dict getUInt64:&value forKey:22LL]);
-  XCTAssertEqual(value, 301U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:23LL]);
-  XCTAssertTrue([dict getUInt64:&value forKey:23LL]);
-  XCTAssertEqual(value, 302U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:24LL]);
-  XCTAssertTrue([dict getUInt64:&value forKey:24LL]);
-  XCTAssertEqual(value, 303U);
-
-  [dict setUInt64:303U forKey:21LL];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:21LL]);
-  XCTAssertTrue([dict getUInt64:&value forKey:21LL]);
-  XCTAssertEqual(value, 303U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:22LL]);
-  XCTAssertTrue([dict getUInt64:&value forKey:22LL]);
-  XCTAssertEqual(value, 301U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:23LL]);
-  XCTAssertTrue([dict getUInt64:&value forKey:23LL]);
-  XCTAssertEqual(value, 302U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:24LL]);
-  XCTAssertTrue([dict getUInt64:&value forKey:24LL]);
-  XCTAssertEqual(value, 303U);
-
-  [dict setUInt64:301U forKey:24LL];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:21LL]);
-  XCTAssertTrue([dict getUInt64:&value forKey:21LL]);
-  XCTAssertEqual(value, 303U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:22LL]);
-  XCTAssertTrue([dict getUInt64:&value forKey:22LL]);
-  XCTAssertEqual(value, 301U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:23LL]);
-  XCTAssertTrue([dict getUInt64:&value forKey:23LL]);
-  XCTAssertEqual(value, 302U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:24LL]);
-  XCTAssertTrue([dict getUInt64:&value forKey:24LL]);
-  XCTAssertEqual(value, 301U);
-
-  const int64_t kKeys2[] = { 22LL, 23LL };
-  const uint64_t kValues2[] = { 302U, 300U };
-  GPBInt64UInt64Dictionary *dict2 =
-      [[GPBInt64UInt64Dictionary alloc] initWithUInt64s:kValues2
-                                                forKeys:kKeys2
-                                                  count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(dict2);
-  [dict addEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:21LL]);
-  XCTAssertTrue([dict getUInt64:&value forKey:21LL]);
-  XCTAssertEqual(value, 303U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:22LL]);
-  XCTAssertTrue([dict getUInt64:&value forKey:22LL]);
-  XCTAssertEqual(value, 302U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:23LL]);
-  XCTAssertTrue([dict getUInt64:&value forKey:23LL]);
-  XCTAssertEqual(value, 300U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:24LL]);
-  XCTAssertTrue([dict getUInt64:&value forKey:24LL]);
-  XCTAssertEqual(value, 301U);
-
-  [dict2 release];
-  [dict release];
-}
-
-@end
-
-#pragma mark - Int64 -> Int64
-
-@interface GPBInt64Int64DictionaryTests : XCTestCase
-@end
-
-@implementation GPBInt64Int64DictionaryTests
-
-- (void)testEmpty {
-  GPBInt64Int64Dictionary *dict = [[GPBInt64Int64Dictionary alloc] init];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertFalse([dict getInt64:NULL forKey:21LL]);
-  [dict enumerateKeysAndInt64sUsingBlock:^(int64_t aKey, int64_t aValue, BOOL *stop) {
-    #pragma unused(aKey, aValue, stop)
-    XCTFail(@"Shouldn't get here!");
-  }];
-  [dict release];
-}
-
-- (void)testOne {
-  GPBInt64Int64Dictionary *dict = [[GPBInt64Int64Dictionary alloc] init];
-  [dict setInt64:400 forKey:21LL];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 1U);
-  int64_t value;
-  XCTAssertTrue([dict getInt64:NULL forKey:21LL]);
-  XCTAssertTrue([dict getInt64:&value forKey:21LL]);
-  XCTAssertEqual(value, 400);
-  XCTAssertFalse([dict getInt64:NULL forKey:22LL]);
-  [dict enumerateKeysAndInt64sUsingBlock:^(int64_t aKey, int64_t aValue, BOOL *stop) {
-    XCTAssertEqual(aKey, 21LL);
-    XCTAssertEqual(aValue, 400);
-    XCTAssertNotEqual(stop, NULL);
-  }];
-  [dict release];
-}
-
-- (void)testBasics {
-  const int64_t kKeys[] = { 21LL, 22LL, 23LL };
-  const int64_t kValues[] = { 400, 401, 402 };
-  GPBInt64Int64Dictionary *dict =
-      [[GPBInt64Int64Dictionary alloc] initWithInt64s:kValues
-                                              forKeys:kKeys
-                                                count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 3U);
-  int64_t value;
-  XCTAssertTrue([dict getInt64:NULL forKey:21LL]);
-  XCTAssertTrue([dict getInt64:&value forKey:21LL]);
-  XCTAssertEqual(value, 400);
-  XCTAssertTrue([dict getInt64:NULL forKey:22LL]);
-  XCTAssertTrue([dict getInt64:&value forKey:22LL]);
-  XCTAssertEqual(value, 401);
-  XCTAssertTrue([dict getInt64:NULL forKey:23LL]);
-  XCTAssertTrue([dict getInt64:&value forKey:23LL]);
-  XCTAssertEqual(value, 402);
-  XCTAssertFalse([dict getInt64:NULL forKey:24LL]);
-
-  __block NSUInteger idx = 0;
-  int64_t *seenKeys = malloc(3 * sizeof(int64_t));
-  int64_t *seenValues = malloc(3 * sizeof(int64_t));
-  [dict enumerateKeysAndInt64sUsingBlock:^(int64_t aKey, int64_t aValue, BOOL *stop) {
-    XCTAssertLessThan(idx, 3U);
-    seenKeys[idx] = aKey;
-    seenValues[idx] = aValue;
-    XCTAssertNotEqual(stop, NULL);
-    ++idx;
-  }];
-  for (int i = 0; i < 3; ++i) {
-    BOOL foundKey = NO;
-    for (int j = 0; (j < 3) && !foundKey; ++j) {
-      if (kKeys[i] == seenKeys[j]) {
-        foundKey = YES;
-        XCTAssertEqual(kValues[i], seenValues[j], @"i = %d, j = %d", i, j);
-      }
-    }
-    XCTAssertTrue(foundKey, @"i = %d", i);
-  }
-  free(seenKeys);
-  free(seenValues);
-
-  // Stopping the enumeration.
-  idx = 0;
-  [dict enumerateKeysAndInt64sUsingBlock:^(int64_t aKey, int64_t aValue, BOOL *stop) {
-    #pragma unused(aKey, aValue)
-    if (idx == 1) *stop = YES;
-    XCTAssertNotEqual(idx, 2U);
-    ++idx;
-  }];
-  [dict release];
-}
-
-- (void)testEquality {
-  const int64_t kKeys1[] = { 21LL, 22LL, 23LL, 24LL };
-  const int64_t kKeys2[] = { 22LL, 21LL, 24LL };
-  const int64_t kValues1[] = { 400, 401, 402 };
-  const int64_t kValues2[] = { 400, 403, 402 };
-  const int64_t kValues3[] = { 400, 401, 402, 403 };
-  GPBInt64Int64Dictionary *dict1 =
-      [[GPBInt64Int64Dictionary alloc] initWithInt64s:kValues1
-                                              forKeys:kKeys1
-                                                count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict1);
-  GPBInt64Int64Dictionary *dict1prime =
-      [[GPBInt64Int64Dictionary alloc] initWithInt64s:kValues1
-                                              forKeys:kKeys1
-                                                count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict1prime);
-  GPBInt64Int64Dictionary *dict2 =
-      [[GPBInt64Int64Dictionary alloc] initWithInt64s:kValues2
-                                              forKeys:kKeys1
-                                                count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(dict2);
-  GPBInt64Int64Dictionary *dict3 =
-      [[GPBInt64Int64Dictionary alloc] initWithInt64s:kValues1
-                                              forKeys:kKeys2
-                                                count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict3);
-  GPBInt64Int64Dictionary *dict4 =
-      [[GPBInt64Int64Dictionary alloc] initWithInt64s:kValues3
-                                              forKeys:kKeys1
-                                                count:GPBARRAYSIZE(kValues3)];
-  XCTAssertNotNil(dict4);
-
-  // 1/1Prime should be different objects, but equal.
-  XCTAssertNotEqual(dict1, dict1prime);
-  XCTAssertEqualObjects(dict1, dict1prime);
-  // Equal, so they must have same hash.
-  XCTAssertEqual([dict1 hash], [dict1prime hash]);
-
-  // 2 is same keys, different values; not equal.
-  XCTAssertNotEqualObjects(dict1, dict2);
-
-  // 3 is different keys, same values; not equal.
-  XCTAssertNotEqualObjects(dict1, dict3);
-
-  // 4 extra pair; not equal
-  XCTAssertNotEqualObjects(dict1, dict4);
-
-  [dict1 release];
-  [dict1prime release];
-  [dict2 release];
-  [dict3 release];
-  [dict4 release];
-}
-
-- (void)testCopy {
-  const int64_t kKeys[] = { 21LL, 22LL, 23LL, 24LL };
-  const int64_t kValues[] = { 400, 401, 402, 403 };
-  GPBInt64Int64Dictionary *dict =
-      [[GPBInt64Int64Dictionary alloc] initWithInt64s:kValues
-                                              forKeys:kKeys
-                                                count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-
-  GPBInt64Int64Dictionary *dict2 = [dict copy];
-  XCTAssertNotNil(dict2);
-
-  // Should be new object but equal.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  XCTAssertTrue([dict2 isKindOfClass:[GPBInt64Int64Dictionary class]]);
-
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testDictionaryFromDictionary {
-  const int64_t kKeys[] = { 21LL, 22LL, 23LL, 24LL };
-  const int64_t kValues[] = { 400, 401, 402, 403 };
-  GPBInt64Int64Dictionary *dict =
-      [[GPBInt64Int64Dictionary alloc] initWithInt64s:kValues
-                                              forKeys:kKeys
-                                                count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-
-  GPBInt64Int64Dictionary *dict2 =
-      [[GPBInt64Int64Dictionary alloc] initWithDictionary:dict];
-  XCTAssertNotNil(dict2);
-
-  // Should be new pointer, but equal objects.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testAdds {
-  GPBInt64Int64Dictionary *dict = [[GPBInt64Int64Dictionary alloc] init];
-  XCTAssertNotNil(dict);
-
-  XCTAssertEqual(dict.count, 0U);
-  [dict setInt64:400 forKey:21LL];
-  XCTAssertEqual(dict.count, 1U);
-
-  const int64_t kKeys[] = { 22LL, 23LL, 24LL };
-  const int64_t kValues[] = { 401, 402, 403 };
-  GPBInt64Int64Dictionary *dict2 =
-      [[GPBInt64Int64Dictionary alloc] initWithInt64s:kValues
-                                              forKeys:kKeys
-                                                count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict2);
-  [dict addEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 4U);
-
-  int64_t value;
-  XCTAssertTrue([dict getInt64:NULL forKey:21LL]);
-  XCTAssertTrue([dict getInt64:&value forKey:21LL]);
-  XCTAssertEqual(value, 400);
-  XCTAssertTrue([dict getInt64:NULL forKey:22LL]);
-  XCTAssertTrue([dict getInt64:&value forKey:22LL]);
-  XCTAssertEqual(value, 401);
-  XCTAssertTrue([dict getInt64:NULL forKey:23LL]);
-  XCTAssertTrue([dict getInt64:&value forKey:23LL]);
-  XCTAssertEqual(value, 402);
-  XCTAssertTrue([dict getInt64:NULL forKey:24LL]);
-  XCTAssertTrue([dict getInt64:&value forKey:24LL]);
-  XCTAssertEqual(value, 403);
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testRemove {
-  const int64_t kKeys[] = { 21LL, 22LL, 23LL, 24LL };
-  const int64_t kValues[] = { 400, 401, 402, 403 };
-  GPBInt64Int64Dictionary *dict =
-      [[GPBInt64Int64Dictionary alloc] initWithInt64s:kValues
-                                              forKeys:kKeys
-                                                count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 4U);
-
-  [dict removeInt64ForKey:22LL];
-  XCTAssertEqual(dict.count, 3U);
-  int64_t value;
-  XCTAssertTrue([dict getInt64:NULL forKey:21LL]);
-  XCTAssertTrue([dict getInt64:&value forKey:21LL]);
-  XCTAssertEqual(value, 400);
-  XCTAssertFalse([dict getInt64:NULL forKey:22LL]);
-  XCTAssertTrue([dict getInt64:NULL forKey:23LL]);
-  XCTAssertTrue([dict getInt64:&value forKey:23LL]);
-  XCTAssertEqual(value, 402);
-  XCTAssertTrue([dict getInt64:NULL forKey:24LL]);
-  XCTAssertTrue([dict getInt64:&value forKey:24LL]);
-  XCTAssertEqual(value, 403);
-
-  // Remove again does nothing.
-  [dict removeInt64ForKey:22LL];
-  XCTAssertEqual(dict.count, 3U);
-  XCTAssertTrue([dict getInt64:NULL forKey:21LL]);
-  XCTAssertTrue([dict getInt64:&value forKey:21LL]);
-  XCTAssertEqual(value, 400);
-  XCTAssertFalse([dict getInt64:NULL forKey:22LL]);
-  XCTAssertTrue([dict getInt64:NULL forKey:23LL]);
-  XCTAssertTrue([dict getInt64:&value forKey:23LL]);
-  XCTAssertEqual(value, 402);
-  XCTAssertTrue([dict getInt64:NULL forKey:24LL]);
-  XCTAssertTrue([dict getInt64:&value forKey:24LL]);
-  XCTAssertEqual(value, 403);
-
-  [dict removeInt64ForKey:24LL];
-  XCTAssertEqual(dict.count, 2U);
-  XCTAssertTrue([dict getInt64:NULL forKey:21LL]);
-  XCTAssertTrue([dict getInt64:&value forKey:21LL]);
-  XCTAssertEqual(value, 400);
-  XCTAssertFalse([dict getInt64:NULL forKey:22LL]);
-  XCTAssertTrue([dict getInt64:NULL forKey:23LL]);
-  XCTAssertTrue([dict getInt64:&value forKey:23LL]);
-  XCTAssertEqual(value, 402);
-  XCTAssertFalse([dict getInt64:NULL forKey:24LL]);
-
-  [dict removeAll];
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertFalse([dict getInt64:NULL forKey:21LL]);
-  XCTAssertFalse([dict getInt64:NULL forKey:22LL]);
-  XCTAssertFalse([dict getInt64:NULL forKey:23LL]);
-  XCTAssertFalse([dict getInt64:NULL forKey:24LL]);
-  [dict release];
-}
-
-- (void)testInplaceMutation {
-  const int64_t kKeys[] = { 21LL, 22LL, 23LL, 24LL };
-  const int64_t kValues[] = { 400, 401, 402, 403 };
-  GPBInt64Int64Dictionary *dict =
-      [[GPBInt64Int64Dictionary alloc] initWithInt64s:kValues
-                                              forKeys:kKeys
-                                                count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 4U);
-  int64_t value;
-  XCTAssertTrue([dict getInt64:NULL forKey:21LL]);
-  XCTAssertTrue([dict getInt64:&value forKey:21LL]);
-  XCTAssertEqual(value, 400);
-  XCTAssertTrue([dict getInt64:NULL forKey:22LL]);
-  XCTAssertTrue([dict getInt64:&value forKey:22LL]);
-  XCTAssertEqual(value, 401);
-  XCTAssertTrue([dict getInt64:NULL forKey:23LL]);
-  XCTAssertTrue([dict getInt64:&value forKey:23LL]);
-  XCTAssertEqual(value, 402);
-  XCTAssertTrue([dict getInt64:NULL forKey:24LL]);
-  XCTAssertTrue([dict getInt64:&value forKey:24LL]);
-  XCTAssertEqual(value, 403);
-
-  [dict setInt64:403 forKey:21LL];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getInt64:NULL forKey:21LL]);
-  XCTAssertTrue([dict getInt64:&value forKey:21LL]);
-  XCTAssertEqual(value, 403);
-  XCTAssertTrue([dict getInt64:NULL forKey:22LL]);
-  XCTAssertTrue([dict getInt64:&value forKey:22LL]);
-  XCTAssertEqual(value, 401);
-  XCTAssertTrue([dict getInt64:NULL forKey:23LL]);
-  XCTAssertTrue([dict getInt64:&value forKey:23LL]);
-  XCTAssertEqual(value, 402);
-  XCTAssertTrue([dict getInt64:NULL forKey:24LL]);
-  XCTAssertTrue([dict getInt64:&value forKey:24LL]);
-  XCTAssertEqual(value, 403);
-
-  [dict setInt64:401 forKey:24LL];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getInt64:NULL forKey:21LL]);
-  XCTAssertTrue([dict getInt64:&value forKey:21LL]);
-  XCTAssertEqual(value, 403);
-  XCTAssertTrue([dict getInt64:NULL forKey:22LL]);
-  XCTAssertTrue([dict getInt64:&value forKey:22LL]);
-  XCTAssertEqual(value, 401);
-  XCTAssertTrue([dict getInt64:NULL forKey:23LL]);
-  XCTAssertTrue([dict getInt64:&value forKey:23LL]);
-  XCTAssertEqual(value, 402);
-  XCTAssertTrue([dict getInt64:NULL forKey:24LL]);
-  XCTAssertTrue([dict getInt64:&value forKey:24LL]);
-  XCTAssertEqual(value, 401);
-
-  const int64_t kKeys2[] = { 22LL, 23LL };
-  const int64_t kValues2[] = { 402, 400 };
-  GPBInt64Int64Dictionary *dict2 =
-      [[GPBInt64Int64Dictionary alloc] initWithInt64s:kValues2
-                                              forKeys:kKeys2
-                                                count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(dict2);
-  [dict addEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getInt64:NULL forKey:21LL]);
-  XCTAssertTrue([dict getInt64:&value forKey:21LL]);
-  XCTAssertEqual(value, 403);
-  XCTAssertTrue([dict getInt64:NULL forKey:22LL]);
-  XCTAssertTrue([dict getInt64:&value forKey:22LL]);
-  XCTAssertEqual(value, 402);
-  XCTAssertTrue([dict getInt64:NULL forKey:23LL]);
-  XCTAssertTrue([dict getInt64:&value forKey:23LL]);
-  XCTAssertEqual(value, 400);
-  XCTAssertTrue([dict getInt64:NULL forKey:24LL]);
-  XCTAssertTrue([dict getInt64:&value forKey:24LL]);
-  XCTAssertEqual(value, 401);
-
-  [dict2 release];
-  [dict release];
-}
-
-@end
-
-#pragma mark - Int64 -> Bool
-
-@interface GPBInt64BoolDictionaryTests : XCTestCase
-@end
-
-@implementation GPBInt64BoolDictionaryTests
-
-- (void)testEmpty {
-  GPBInt64BoolDictionary *dict = [[GPBInt64BoolDictionary alloc] init];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertFalse([dict getBool:NULL forKey:21LL]);
-  [dict enumerateKeysAndBoolsUsingBlock:^(int64_t aKey, BOOL aValue, BOOL *stop) {
-    #pragma unused(aKey, aValue, stop)
-    XCTFail(@"Shouldn't get here!");
-  }];
-  [dict release];
-}
-
-- (void)testOne {
-  GPBInt64BoolDictionary *dict = [[GPBInt64BoolDictionary alloc] init];
-  [dict setBool:YES forKey:21LL];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 1U);
-  BOOL value;
-  XCTAssertTrue([dict getBool:NULL forKey:21LL]);
-  XCTAssertTrue([dict getBool:&value forKey:21LL]);
-  XCTAssertEqual(value, YES);
-  XCTAssertFalse([dict getBool:NULL forKey:22LL]);
-  [dict enumerateKeysAndBoolsUsingBlock:^(int64_t aKey, BOOL aValue, BOOL *stop) {
-    XCTAssertEqual(aKey, 21LL);
-    XCTAssertEqual(aValue, YES);
-    XCTAssertNotEqual(stop, NULL);
-  }];
-  [dict release];
-}
-
-- (void)testBasics {
-  const int64_t kKeys[] = { 21LL, 22LL, 23LL };
-  const BOOL kValues[] = { YES, YES, NO };
-  GPBInt64BoolDictionary *dict =
-      [[GPBInt64BoolDictionary alloc] initWithBools:kValues
-                                            forKeys:kKeys
-                                              count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 3U);
-  BOOL value;
-  XCTAssertTrue([dict getBool:NULL forKey:21LL]);
-  XCTAssertTrue([dict getBool:&value forKey:21LL]);
-  XCTAssertEqual(value, YES);
-  XCTAssertTrue([dict getBool:NULL forKey:22LL]);
-  XCTAssertTrue([dict getBool:&value forKey:22LL]);
-  XCTAssertEqual(value, YES);
-  XCTAssertTrue([dict getBool:NULL forKey:23LL]);
-  XCTAssertTrue([dict getBool:&value forKey:23LL]);
-  XCTAssertEqual(value, NO);
-  XCTAssertFalse([dict getBool:NULL forKey:24LL]);
-
-  __block NSUInteger idx = 0;
-  int64_t *seenKeys = malloc(3 * sizeof(int64_t));
-  BOOL *seenValues = malloc(3 * sizeof(BOOL));
-  [dict enumerateKeysAndBoolsUsingBlock:^(int64_t aKey, BOOL aValue, BOOL *stop) {
-    XCTAssertLessThan(idx, 3U);
-    seenKeys[idx] = aKey;
-    seenValues[idx] = aValue;
-    XCTAssertNotEqual(stop, NULL);
-    ++idx;
-  }];
-  for (int i = 0; i < 3; ++i) {
-    BOOL foundKey = NO;
-    for (int j = 0; (j < 3) && !foundKey; ++j) {
-      if (kKeys[i] == seenKeys[j]) {
-        foundKey = YES;
-        XCTAssertEqual(kValues[i], seenValues[j], @"i = %d, j = %d", i, j);
-      }
-    }
-    XCTAssertTrue(foundKey, @"i = %d", i);
-  }
-  free(seenKeys);
-  free(seenValues);
-
-  // Stopping the enumeration.
-  idx = 0;
-  [dict enumerateKeysAndBoolsUsingBlock:^(int64_t aKey, BOOL aValue, BOOL *stop) {
-    #pragma unused(aKey, aValue)
-    if (idx == 1) *stop = YES;
-    XCTAssertNotEqual(idx, 2U);
-    ++idx;
-  }];
-  [dict release];
-}
-
-- (void)testEquality {
-  const int64_t kKeys1[] = { 21LL, 22LL, 23LL, 24LL };
-  const int64_t kKeys2[] = { 22LL, 21LL, 24LL };
-  const BOOL kValues1[] = { YES, YES, NO };
-  const BOOL kValues2[] = { YES, NO, NO };
-  const BOOL kValues3[] = { YES, YES, NO, NO };
-  GPBInt64BoolDictionary *dict1 =
-      [[GPBInt64BoolDictionary alloc] initWithBools:kValues1
-                                            forKeys:kKeys1
-                                              count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict1);
-  GPBInt64BoolDictionary *dict1prime =
-      [[GPBInt64BoolDictionary alloc] initWithBools:kValues1
-                                            forKeys:kKeys1
-                                              count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict1prime);
-  GPBInt64BoolDictionary *dict2 =
-      [[GPBInt64BoolDictionary alloc] initWithBools:kValues2
-                                            forKeys:kKeys1
-                                              count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(dict2);
-  GPBInt64BoolDictionary *dict3 =
-      [[GPBInt64BoolDictionary alloc] initWithBools:kValues1
-                                            forKeys:kKeys2
-                                              count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict3);
-  GPBInt64BoolDictionary *dict4 =
-      [[GPBInt64BoolDictionary alloc] initWithBools:kValues3
-                                            forKeys:kKeys1
-                                              count:GPBARRAYSIZE(kValues3)];
-  XCTAssertNotNil(dict4);
-
-  // 1/1Prime should be different objects, but equal.
-  XCTAssertNotEqual(dict1, dict1prime);
-  XCTAssertEqualObjects(dict1, dict1prime);
-  // Equal, so they must have same hash.
-  XCTAssertEqual([dict1 hash], [dict1prime hash]);
-
-  // 2 is same keys, different values; not equal.
-  XCTAssertNotEqualObjects(dict1, dict2);
-
-  // 3 is different keys, same values; not equal.
-  XCTAssertNotEqualObjects(dict1, dict3);
-
-  // 4 extra pair; not equal
-  XCTAssertNotEqualObjects(dict1, dict4);
-
-  [dict1 release];
-  [dict1prime release];
-  [dict2 release];
-  [dict3 release];
-  [dict4 release];
-}
-
-- (void)testCopy {
-  const int64_t kKeys[] = { 21LL, 22LL, 23LL, 24LL };
-  const BOOL kValues[] = { YES, YES, NO, NO };
-  GPBInt64BoolDictionary *dict =
-      [[GPBInt64BoolDictionary alloc] initWithBools:kValues
-                                            forKeys:kKeys
-                                              count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-
-  GPBInt64BoolDictionary *dict2 = [dict copy];
-  XCTAssertNotNil(dict2);
-
-  // Should be new object but equal.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  XCTAssertTrue([dict2 isKindOfClass:[GPBInt64BoolDictionary class]]);
-
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testDictionaryFromDictionary {
-  const int64_t kKeys[] = { 21LL, 22LL, 23LL, 24LL };
-  const BOOL kValues[] = { YES, YES, NO, NO };
-  GPBInt64BoolDictionary *dict =
-      [[GPBInt64BoolDictionary alloc] initWithBools:kValues
-                                            forKeys:kKeys
-                                              count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-
-  GPBInt64BoolDictionary *dict2 =
-      [[GPBInt64BoolDictionary alloc] initWithDictionary:dict];
-  XCTAssertNotNil(dict2);
-
-  // Should be new pointer, but equal objects.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testAdds {
-  GPBInt64BoolDictionary *dict = [[GPBInt64BoolDictionary alloc] init];
-  XCTAssertNotNil(dict);
-
-  XCTAssertEqual(dict.count, 0U);
-  [dict setBool:YES forKey:21LL];
-  XCTAssertEqual(dict.count, 1U);
-
-  const int64_t kKeys[] = { 22LL, 23LL, 24LL };
-  const BOOL kValues[] = { YES, NO, NO };
-  GPBInt64BoolDictionary *dict2 =
-      [[GPBInt64BoolDictionary alloc] initWithBools:kValues
-                                            forKeys:kKeys
-                                              count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict2);
-  [dict addEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 4U);
-
-  BOOL value;
-  XCTAssertTrue([dict getBool:NULL forKey:21LL]);
-  XCTAssertTrue([dict getBool:&value forKey:21LL]);
-  XCTAssertEqual(value, YES);
-  XCTAssertTrue([dict getBool:NULL forKey:22LL]);
-  XCTAssertTrue([dict getBool:&value forKey:22LL]);
-  XCTAssertEqual(value, YES);
-  XCTAssertTrue([dict getBool:NULL forKey:23LL]);
-  XCTAssertTrue([dict getBool:&value forKey:23LL]);
-  XCTAssertEqual(value, NO);
-  XCTAssertTrue([dict getBool:NULL forKey:24LL]);
-  XCTAssertTrue([dict getBool:&value forKey:24LL]);
-  XCTAssertEqual(value, NO);
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testRemove {
-  const int64_t kKeys[] = { 21LL, 22LL, 23LL, 24LL };
-  const BOOL kValues[] = { YES, YES, NO, NO };
-  GPBInt64BoolDictionary *dict =
-      [[GPBInt64BoolDictionary alloc] initWithBools:kValues
-                                            forKeys:kKeys
-                                              count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 4U);
-
-  [dict removeBoolForKey:22LL];
-  XCTAssertEqual(dict.count, 3U);
-  BOOL value;
-  XCTAssertTrue([dict getBool:NULL forKey:21LL]);
-  XCTAssertTrue([dict getBool:&value forKey:21LL]);
-  XCTAssertEqual(value, YES);
-  XCTAssertFalse([dict getBool:NULL forKey:22LL]);
-  XCTAssertTrue([dict getBool:NULL forKey:23LL]);
-  XCTAssertTrue([dict getBool:&value forKey:23LL]);
-  XCTAssertEqual(value, NO);
-  XCTAssertTrue([dict getBool:NULL forKey:24LL]);
-  XCTAssertTrue([dict getBool:&value forKey:24LL]);
-  XCTAssertEqual(value, NO);
-
-  // Remove again does nothing.
-  [dict removeBoolForKey:22LL];
-  XCTAssertEqual(dict.count, 3U);
-  XCTAssertTrue([dict getBool:NULL forKey:21LL]);
-  XCTAssertTrue([dict getBool:&value forKey:21LL]);
-  XCTAssertEqual(value, YES);
-  XCTAssertFalse([dict getBool:NULL forKey:22LL]);
-  XCTAssertTrue([dict getBool:NULL forKey:23LL]);
-  XCTAssertTrue([dict getBool:&value forKey:23LL]);
-  XCTAssertEqual(value, NO);
-  XCTAssertTrue([dict getBool:NULL forKey:24LL]);
-  XCTAssertTrue([dict getBool:&value forKey:24LL]);
-  XCTAssertEqual(value, NO);
-
-  [dict removeBoolForKey:24LL];
-  XCTAssertEqual(dict.count, 2U);
-  XCTAssertTrue([dict getBool:NULL forKey:21LL]);
-  XCTAssertTrue([dict getBool:&value forKey:21LL]);
-  XCTAssertEqual(value, YES);
-  XCTAssertFalse([dict getBool:NULL forKey:22LL]);
-  XCTAssertTrue([dict getBool:NULL forKey:23LL]);
-  XCTAssertTrue([dict getBool:&value forKey:23LL]);
-  XCTAssertEqual(value, NO);
-  XCTAssertFalse([dict getBool:NULL forKey:24LL]);
-
-  [dict removeAll];
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertFalse([dict getBool:NULL forKey:21LL]);
-  XCTAssertFalse([dict getBool:NULL forKey:22LL]);
-  XCTAssertFalse([dict getBool:NULL forKey:23LL]);
-  XCTAssertFalse([dict getBool:NULL forKey:24LL]);
-  [dict release];
-}
-
-- (void)testInplaceMutation {
-  const int64_t kKeys[] = { 21LL, 22LL, 23LL, 24LL };
-  const BOOL kValues[] = { YES, YES, NO, NO };
-  GPBInt64BoolDictionary *dict =
-      [[GPBInt64BoolDictionary alloc] initWithBools:kValues
-                                            forKeys:kKeys
-                                              count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 4U);
-  BOOL value;
-  XCTAssertTrue([dict getBool:NULL forKey:21LL]);
-  XCTAssertTrue([dict getBool:&value forKey:21LL]);
-  XCTAssertEqual(value, YES);
-  XCTAssertTrue([dict getBool:NULL forKey:22LL]);
-  XCTAssertTrue([dict getBool:&value forKey:22LL]);
-  XCTAssertEqual(value, YES);
-  XCTAssertTrue([dict getBool:NULL forKey:23LL]);
-  XCTAssertTrue([dict getBool:&value forKey:23LL]);
-  XCTAssertEqual(value, NO);
-  XCTAssertTrue([dict getBool:NULL forKey:24LL]);
-  XCTAssertTrue([dict getBool:&value forKey:24LL]);
-  XCTAssertEqual(value, NO);
-
-  [dict setBool:NO forKey:21LL];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getBool:NULL forKey:21LL]);
-  XCTAssertTrue([dict getBool:&value forKey:21LL]);
-  XCTAssertEqual(value, NO);
-  XCTAssertTrue([dict getBool:NULL forKey:22LL]);
-  XCTAssertTrue([dict getBool:&value forKey:22LL]);
-  XCTAssertEqual(value, YES);
-  XCTAssertTrue([dict getBool:NULL forKey:23LL]);
-  XCTAssertTrue([dict getBool:&value forKey:23LL]);
-  XCTAssertEqual(value, NO);
-  XCTAssertTrue([dict getBool:NULL forKey:24LL]);
-  XCTAssertTrue([dict getBool:&value forKey:24LL]);
-  XCTAssertEqual(value, NO);
-
-  [dict setBool:YES forKey:24LL];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getBool:NULL forKey:21LL]);
-  XCTAssertTrue([dict getBool:&value forKey:21LL]);
-  XCTAssertEqual(value, NO);
-  XCTAssertTrue([dict getBool:NULL forKey:22LL]);
-  XCTAssertTrue([dict getBool:&value forKey:22LL]);
-  XCTAssertEqual(value, YES);
-  XCTAssertTrue([dict getBool:NULL forKey:23LL]);
-  XCTAssertTrue([dict getBool:&value forKey:23LL]);
-  XCTAssertEqual(value, NO);
-  XCTAssertTrue([dict getBool:NULL forKey:24LL]);
-  XCTAssertTrue([dict getBool:&value forKey:24LL]);
-  XCTAssertEqual(value, YES);
-
-  const int64_t kKeys2[] = { 22LL, 23LL };
-  const BOOL kValues2[] = { NO, YES };
-  GPBInt64BoolDictionary *dict2 =
-      [[GPBInt64BoolDictionary alloc] initWithBools:kValues2
-                                            forKeys:kKeys2
-                                              count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(dict2);
-  [dict addEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getBool:NULL forKey:21LL]);
-  XCTAssertTrue([dict getBool:&value forKey:21LL]);
-  XCTAssertEqual(value, NO);
-  XCTAssertTrue([dict getBool:NULL forKey:22LL]);
-  XCTAssertTrue([dict getBool:&value forKey:22LL]);
-  XCTAssertEqual(value, NO);
-  XCTAssertTrue([dict getBool:NULL forKey:23LL]);
-  XCTAssertTrue([dict getBool:&value forKey:23LL]);
-  XCTAssertEqual(value, YES);
-  XCTAssertTrue([dict getBool:NULL forKey:24LL]);
-  XCTAssertTrue([dict getBool:&value forKey:24LL]);
-  XCTAssertEqual(value, YES);
-
-  [dict2 release];
-  [dict release];
-}
-
-@end
-
-#pragma mark - Int64 -> Float
-
-@interface GPBInt64FloatDictionaryTests : XCTestCase
-@end
-
-@implementation GPBInt64FloatDictionaryTests
-
-- (void)testEmpty {
-  GPBInt64FloatDictionary *dict = [[GPBInt64FloatDictionary alloc] init];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertFalse([dict getFloat:NULL forKey:21LL]);
-  [dict enumerateKeysAndFloatsUsingBlock:^(int64_t aKey, float aValue, BOOL *stop) {
-    #pragma unused(aKey, aValue, stop)
-    XCTFail(@"Shouldn't get here!");
-  }];
-  [dict release];
-}
-
-- (void)testOne {
-  GPBInt64FloatDictionary *dict = [[GPBInt64FloatDictionary alloc] init];
-  [dict setFloat:500.f forKey:21LL];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 1U);
-  float value;
-  XCTAssertTrue([dict getFloat:NULL forKey:21LL]);
-  XCTAssertTrue([dict getFloat:&value forKey:21LL]);
-  XCTAssertEqual(value, 500.f);
-  XCTAssertFalse([dict getFloat:NULL forKey:22LL]);
-  [dict enumerateKeysAndFloatsUsingBlock:^(int64_t aKey, float aValue, BOOL *stop) {
-    XCTAssertEqual(aKey, 21LL);
-    XCTAssertEqual(aValue, 500.f);
-    XCTAssertNotEqual(stop, NULL);
-  }];
-  [dict release];
-}
-
-- (void)testBasics {
-  const int64_t kKeys[] = { 21LL, 22LL, 23LL };
-  const float kValues[] = { 500.f, 501.f, 502.f };
-  GPBInt64FloatDictionary *dict =
-      [[GPBInt64FloatDictionary alloc] initWithFloats:kValues
-                                              forKeys:kKeys
-                                                count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 3U);
-  float value;
-  XCTAssertTrue([dict getFloat:NULL forKey:21LL]);
-  XCTAssertTrue([dict getFloat:&value forKey:21LL]);
-  XCTAssertEqual(value, 500.f);
-  XCTAssertTrue([dict getFloat:NULL forKey:22LL]);
-  XCTAssertTrue([dict getFloat:&value forKey:22LL]);
-  XCTAssertEqual(value, 501.f);
-  XCTAssertTrue([dict getFloat:NULL forKey:23LL]);
-  XCTAssertTrue([dict getFloat:&value forKey:23LL]);
-  XCTAssertEqual(value, 502.f);
-  XCTAssertFalse([dict getFloat:NULL forKey:24LL]);
-
-  __block NSUInteger idx = 0;
-  int64_t *seenKeys = malloc(3 * sizeof(int64_t));
-  float *seenValues = malloc(3 * sizeof(float));
-  [dict enumerateKeysAndFloatsUsingBlock:^(int64_t aKey, float aValue, BOOL *stop) {
-    XCTAssertLessThan(idx, 3U);
-    seenKeys[idx] = aKey;
-    seenValues[idx] = aValue;
-    XCTAssertNotEqual(stop, NULL);
-    ++idx;
-  }];
-  for (int i = 0; i < 3; ++i) {
-    BOOL foundKey = NO;
-    for (int j = 0; (j < 3) && !foundKey; ++j) {
-      if (kKeys[i] == seenKeys[j]) {
-        foundKey = YES;
-        XCTAssertEqual(kValues[i], seenValues[j], @"i = %d, j = %d", i, j);
-      }
-    }
-    XCTAssertTrue(foundKey, @"i = %d", i);
-  }
-  free(seenKeys);
-  free(seenValues);
-
-  // Stopping the enumeration.
-  idx = 0;
-  [dict enumerateKeysAndFloatsUsingBlock:^(int64_t aKey, float aValue, BOOL *stop) {
-    #pragma unused(aKey, aValue)
-    if (idx == 1) *stop = YES;
-    XCTAssertNotEqual(idx, 2U);
-    ++idx;
-  }];
-  [dict release];
-}
-
-- (void)testEquality {
-  const int64_t kKeys1[] = { 21LL, 22LL, 23LL, 24LL };
-  const int64_t kKeys2[] = { 22LL, 21LL, 24LL };
-  const float kValues1[] = { 500.f, 501.f, 502.f };
-  const float kValues2[] = { 500.f, 503.f, 502.f };
-  const float kValues3[] = { 500.f, 501.f, 502.f, 503.f };
-  GPBInt64FloatDictionary *dict1 =
-      [[GPBInt64FloatDictionary alloc] initWithFloats:kValues1
-                                              forKeys:kKeys1
-                                                count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict1);
-  GPBInt64FloatDictionary *dict1prime =
-      [[GPBInt64FloatDictionary alloc] initWithFloats:kValues1
-                                              forKeys:kKeys1
-                                                count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict1prime);
-  GPBInt64FloatDictionary *dict2 =
-      [[GPBInt64FloatDictionary alloc] initWithFloats:kValues2
-                                              forKeys:kKeys1
-                                                count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(dict2);
-  GPBInt64FloatDictionary *dict3 =
-      [[GPBInt64FloatDictionary alloc] initWithFloats:kValues1
-                                              forKeys:kKeys2
-                                                count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict3);
-  GPBInt64FloatDictionary *dict4 =
-      [[GPBInt64FloatDictionary alloc] initWithFloats:kValues3
-                                              forKeys:kKeys1
-                                                count:GPBARRAYSIZE(kValues3)];
-  XCTAssertNotNil(dict4);
-
-  // 1/1Prime should be different objects, but equal.
-  XCTAssertNotEqual(dict1, dict1prime);
-  XCTAssertEqualObjects(dict1, dict1prime);
-  // Equal, so they must have same hash.
-  XCTAssertEqual([dict1 hash], [dict1prime hash]);
-
-  // 2 is same keys, different values; not equal.
-  XCTAssertNotEqualObjects(dict1, dict2);
-
-  // 3 is different keys, same values; not equal.
-  XCTAssertNotEqualObjects(dict1, dict3);
-
-  // 4 extra pair; not equal
-  XCTAssertNotEqualObjects(dict1, dict4);
-
-  [dict1 release];
-  [dict1prime release];
-  [dict2 release];
-  [dict3 release];
-  [dict4 release];
-}
-
-- (void)testCopy {
-  const int64_t kKeys[] = { 21LL, 22LL, 23LL, 24LL };
-  const float kValues[] = { 500.f, 501.f, 502.f, 503.f };
-  GPBInt64FloatDictionary *dict =
-      [[GPBInt64FloatDictionary alloc] initWithFloats:kValues
-                                              forKeys:kKeys
-                                                count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-
-  GPBInt64FloatDictionary *dict2 = [dict copy];
-  XCTAssertNotNil(dict2);
-
-  // Should be new object but equal.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  XCTAssertTrue([dict2 isKindOfClass:[GPBInt64FloatDictionary class]]);
-
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testDictionaryFromDictionary {
-  const int64_t kKeys[] = { 21LL, 22LL, 23LL, 24LL };
-  const float kValues[] = { 500.f, 501.f, 502.f, 503.f };
-  GPBInt64FloatDictionary *dict =
-      [[GPBInt64FloatDictionary alloc] initWithFloats:kValues
-                                              forKeys:kKeys
-                                                count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-
-  GPBInt64FloatDictionary *dict2 =
-      [[GPBInt64FloatDictionary alloc] initWithDictionary:dict];
-  XCTAssertNotNil(dict2);
-
-  // Should be new pointer, but equal objects.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testAdds {
-  GPBInt64FloatDictionary *dict = [[GPBInt64FloatDictionary alloc] init];
-  XCTAssertNotNil(dict);
-
-  XCTAssertEqual(dict.count, 0U);
-  [dict setFloat:500.f forKey:21LL];
-  XCTAssertEqual(dict.count, 1U);
-
-  const int64_t kKeys[] = { 22LL, 23LL, 24LL };
-  const float kValues[] = { 501.f, 502.f, 503.f };
-  GPBInt64FloatDictionary *dict2 =
-      [[GPBInt64FloatDictionary alloc] initWithFloats:kValues
-                                              forKeys:kKeys
-                                                count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict2);
-  [dict addEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 4U);
-
-  float value;
-  XCTAssertTrue([dict getFloat:NULL forKey:21LL]);
-  XCTAssertTrue([dict getFloat:&value forKey:21LL]);
-  XCTAssertEqual(value, 500.f);
-  XCTAssertTrue([dict getFloat:NULL forKey:22LL]);
-  XCTAssertTrue([dict getFloat:&value forKey:22LL]);
-  XCTAssertEqual(value, 501.f);
-  XCTAssertTrue([dict getFloat:NULL forKey:23LL]);
-  XCTAssertTrue([dict getFloat:&value forKey:23LL]);
-  XCTAssertEqual(value, 502.f);
-  XCTAssertTrue([dict getFloat:NULL forKey:24LL]);
-  XCTAssertTrue([dict getFloat:&value forKey:24LL]);
-  XCTAssertEqual(value, 503.f);
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testRemove {
-  const int64_t kKeys[] = { 21LL, 22LL, 23LL, 24LL };
-  const float kValues[] = { 500.f, 501.f, 502.f, 503.f };
-  GPBInt64FloatDictionary *dict =
-      [[GPBInt64FloatDictionary alloc] initWithFloats:kValues
-                                              forKeys:kKeys
-                                                count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 4U);
-
-  [dict removeFloatForKey:22LL];
-  XCTAssertEqual(dict.count, 3U);
-  float value;
-  XCTAssertTrue([dict getFloat:NULL forKey:21LL]);
-  XCTAssertTrue([dict getFloat:&value forKey:21LL]);
-  XCTAssertEqual(value, 500.f);
-  XCTAssertFalse([dict getFloat:NULL forKey:22LL]);
-  XCTAssertTrue([dict getFloat:NULL forKey:23LL]);
-  XCTAssertTrue([dict getFloat:&value forKey:23LL]);
-  XCTAssertEqual(value, 502.f);
-  XCTAssertTrue([dict getFloat:NULL forKey:24LL]);
-  XCTAssertTrue([dict getFloat:&value forKey:24LL]);
-  XCTAssertEqual(value, 503.f);
-
-  // Remove again does nothing.
-  [dict removeFloatForKey:22LL];
-  XCTAssertEqual(dict.count, 3U);
-  XCTAssertTrue([dict getFloat:NULL forKey:21LL]);
-  XCTAssertTrue([dict getFloat:&value forKey:21LL]);
-  XCTAssertEqual(value, 500.f);
-  XCTAssertFalse([dict getFloat:NULL forKey:22LL]);
-  XCTAssertTrue([dict getFloat:NULL forKey:23LL]);
-  XCTAssertTrue([dict getFloat:&value forKey:23LL]);
-  XCTAssertEqual(value, 502.f);
-  XCTAssertTrue([dict getFloat:NULL forKey:24LL]);
-  XCTAssertTrue([dict getFloat:&value forKey:24LL]);
-  XCTAssertEqual(value, 503.f);
-
-  [dict removeFloatForKey:24LL];
-  XCTAssertEqual(dict.count, 2U);
-  XCTAssertTrue([dict getFloat:NULL forKey:21LL]);
-  XCTAssertTrue([dict getFloat:&value forKey:21LL]);
-  XCTAssertEqual(value, 500.f);
-  XCTAssertFalse([dict getFloat:NULL forKey:22LL]);
-  XCTAssertTrue([dict getFloat:NULL forKey:23LL]);
-  XCTAssertTrue([dict getFloat:&value forKey:23LL]);
-  XCTAssertEqual(value, 502.f);
-  XCTAssertFalse([dict getFloat:NULL forKey:24LL]);
-
-  [dict removeAll];
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertFalse([dict getFloat:NULL forKey:21LL]);
-  XCTAssertFalse([dict getFloat:NULL forKey:22LL]);
-  XCTAssertFalse([dict getFloat:NULL forKey:23LL]);
-  XCTAssertFalse([dict getFloat:NULL forKey:24LL]);
-  [dict release];
-}
-
-- (void)testInplaceMutation {
-  const int64_t kKeys[] = { 21LL, 22LL, 23LL, 24LL };
-  const float kValues[] = { 500.f, 501.f, 502.f, 503.f };
-  GPBInt64FloatDictionary *dict =
-      [[GPBInt64FloatDictionary alloc] initWithFloats:kValues
-                                              forKeys:kKeys
-                                                count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 4U);
-  float value;
-  XCTAssertTrue([dict getFloat:NULL forKey:21LL]);
-  XCTAssertTrue([dict getFloat:&value forKey:21LL]);
-  XCTAssertEqual(value, 500.f);
-  XCTAssertTrue([dict getFloat:NULL forKey:22LL]);
-  XCTAssertTrue([dict getFloat:&value forKey:22LL]);
-  XCTAssertEqual(value, 501.f);
-  XCTAssertTrue([dict getFloat:NULL forKey:23LL]);
-  XCTAssertTrue([dict getFloat:&value forKey:23LL]);
-  XCTAssertEqual(value, 502.f);
-  XCTAssertTrue([dict getFloat:NULL forKey:24LL]);
-  XCTAssertTrue([dict getFloat:&value forKey:24LL]);
-  XCTAssertEqual(value, 503.f);
-
-  [dict setFloat:503.f forKey:21LL];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getFloat:NULL forKey:21LL]);
-  XCTAssertTrue([dict getFloat:&value forKey:21LL]);
-  XCTAssertEqual(value, 503.f);
-  XCTAssertTrue([dict getFloat:NULL forKey:22LL]);
-  XCTAssertTrue([dict getFloat:&value forKey:22LL]);
-  XCTAssertEqual(value, 501.f);
-  XCTAssertTrue([dict getFloat:NULL forKey:23LL]);
-  XCTAssertTrue([dict getFloat:&value forKey:23LL]);
-  XCTAssertEqual(value, 502.f);
-  XCTAssertTrue([dict getFloat:NULL forKey:24LL]);
-  XCTAssertTrue([dict getFloat:&value forKey:24LL]);
-  XCTAssertEqual(value, 503.f);
-
-  [dict setFloat:501.f forKey:24LL];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getFloat:NULL forKey:21LL]);
-  XCTAssertTrue([dict getFloat:&value forKey:21LL]);
-  XCTAssertEqual(value, 503.f);
-  XCTAssertTrue([dict getFloat:NULL forKey:22LL]);
-  XCTAssertTrue([dict getFloat:&value forKey:22LL]);
-  XCTAssertEqual(value, 501.f);
-  XCTAssertTrue([dict getFloat:NULL forKey:23LL]);
-  XCTAssertTrue([dict getFloat:&value forKey:23LL]);
-  XCTAssertEqual(value, 502.f);
-  XCTAssertTrue([dict getFloat:NULL forKey:24LL]);
-  XCTAssertTrue([dict getFloat:&value forKey:24LL]);
-  XCTAssertEqual(value, 501.f);
-
-  const int64_t kKeys2[] = { 22LL, 23LL };
-  const float kValues2[] = { 502.f, 500.f };
-  GPBInt64FloatDictionary *dict2 =
-      [[GPBInt64FloatDictionary alloc] initWithFloats:kValues2
-                                              forKeys:kKeys2
-                                                count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(dict2);
-  [dict addEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getFloat:NULL forKey:21LL]);
-  XCTAssertTrue([dict getFloat:&value forKey:21LL]);
-  XCTAssertEqual(value, 503.f);
-  XCTAssertTrue([dict getFloat:NULL forKey:22LL]);
-  XCTAssertTrue([dict getFloat:&value forKey:22LL]);
-  XCTAssertEqual(value, 502.f);
-  XCTAssertTrue([dict getFloat:NULL forKey:23LL]);
-  XCTAssertTrue([dict getFloat:&value forKey:23LL]);
-  XCTAssertEqual(value, 500.f);
-  XCTAssertTrue([dict getFloat:NULL forKey:24LL]);
-  XCTAssertTrue([dict getFloat:&value forKey:24LL]);
-  XCTAssertEqual(value, 501.f);
-
-  [dict2 release];
-  [dict release];
-}
-
-@end
-
-#pragma mark - Int64 -> Double
-
-@interface GPBInt64DoubleDictionaryTests : XCTestCase
-@end
-
-@implementation GPBInt64DoubleDictionaryTests
-
-- (void)testEmpty {
-  GPBInt64DoubleDictionary *dict = [[GPBInt64DoubleDictionary alloc] init];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertFalse([dict getDouble:NULL forKey:21LL]);
-  [dict enumerateKeysAndDoublesUsingBlock:^(int64_t aKey, double aValue, BOOL *stop) {
-    #pragma unused(aKey, aValue, stop)
-    XCTFail(@"Shouldn't get here!");
-  }];
-  [dict release];
-}
-
-- (void)testOne {
-  GPBInt64DoubleDictionary *dict = [[GPBInt64DoubleDictionary alloc] init];
-  [dict setDouble:600. forKey:21LL];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 1U);
-  double value;
-  XCTAssertTrue([dict getDouble:NULL forKey:21LL]);
-  XCTAssertTrue([dict getDouble:&value forKey:21LL]);
-  XCTAssertEqual(value, 600.);
-  XCTAssertFalse([dict getDouble:NULL forKey:22LL]);
-  [dict enumerateKeysAndDoublesUsingBlock:^(int64_t aKey, double aValue, BOOL *stop) {
-    XCTAssertEqual(aKey, 21LL);
-    XCTAssertEqual(aValue, 600.);
-    XCTAssertNotEqual(stop, NULL);
-  }];
-  [dict release];
-}
-
-- (void)testBasics {
-  const int64_t kKeys[] = { 21LL, 22LL, 23LL };
-  const double kValues[] = { 600., 601., 602. };
-  GPBInt64DoubleDictionary *dict =
-      [[GPBInt64DoubleDictionary alloc] initWithDoubles:kValues
-                                                forKeys:kKeys
-                                                  count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 3U);
-  double value;
-  XCTAssertTrue([dict getDouble:NULL forKey:21LL]);
-  XCTAssertTrue([dict getDouble:&value forKey:21LL]);
-  XCTAssertEqual(value, 600.);
-  XCTAssertTrue([dict getDouble:NULL forKey:22LL]);
-  XCTAssertTrue([dict getDouble:&value forKey:22LL]);
-  XCTAssertEqual(value, 601.);
-  XCTAssertTrue([dict getDouble:NULL forKey:23LL]);
-  XCTAssertTrue([dict getDouble:&value forKey:23LL]);
-  XCTAssertEqual(value, 602.);
-  XCTAssertFalse([dict getDouble:NULL forKey:24LL]);
-
-  __block NSUInteger idx = 0;
-  int64_t *seenKeys = malloc(3 * sizeof(int64_t));
-  double *seenValues = malloc(3 * sizeof(double));
-  [dict enumerateKeysAndDoublesUsingBlock:^(int64_t aKey, double aValue, BOOL *stop) {
-    XCTAssertLessThan(idx, 3U);
-    seenKeys[idx] = aKey;
-    seenValues[idx] = aValue;
-    XCTAssertNotEqual(stop, NULL);
-    ++idx;
-  }];
-  for (int i = 0; i < 3; ++i) {
-    BOOL foundKey = NO;
-    for (int j = 0; (j < 3) && !foundKey; ++j) {
-      if (kKeys[i] == seenKeys[j]) {
-        foundKey = YES;
-        XCTAssertEqual(kValues[i], seenValues[j], @"i = %d, j = %d", i, j);
-      }
-    }
-    XCTAssertTrue(foundKey, @"i = %d", i);
-  }
-  free(seenKeys);
-  free(seenValues);
-
-  // Stopping the enumeration.
-  idx = 0;
-  [dict enumerateKeysAndDoublesUsingBlock:^(int64_t aKey, double aValue, BOOL *stop) {
-    #pragma unused(aKey, aValue)
-    if (idx == 1) *stop = YES;
-    XCTAssertNotEqual(idx, 2U);
-    ++idx;
-  }];
-  [dict release];
-}
-
-- (void)testEquality {
-  const int64_t kKeys1[] = { 21LL, 22LL, 23LL, 24LL };
-  const int64_t kKeys2[] = { 22LL, 21LL, 24LL };
-  const double kValues1[] = { 600., 601., 602. };
-  const double kValues2[] = { 600., 603., 602. };
-  const double kValues3[] = { 600., 601., 602., 603. };
-  GPBInt64DoubleDictionary *dict1 =
-      [[GPBInt64DoubleDictionary alloc] initWithDoubles:kValues1
-                                                forKeys:kKeys1
-                                                  count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict1);
-  GPBInt64DoubleDictionary *dict1prime =
-      [[GPBInt64DoubleDictionary alloc] initWithDoubles:kValues1
-                                                forKeys:kKeys1
-                                                  count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict1prime);
-  GPBInt64DoubleDictionary *dict2 =
-      [[GPBInt64DoubleDictionary alloc] initWithDoubles:kValues2
-                                                forKeys:kKeys1
-                                                  count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(dict2);
-  GPBInt64DoubleDictionary *dict3 =
-      [[GPBInt64DoubleDictionary alloc] initWithDoubles:kValues1
-                                                forKeys:kKeys2
-                                                  count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict3);
-  GPBInt64DoubleDictionary *dict4 =
-      [[GPBInt64DoubleDictionary alloc] initWithDoubles:kValues3
-                                                forKeys:kKeys1
-                                                  count:GPBARRAYSIZE(kValues3)];
-  XCTAssertNotNil(dict4);
-
-  // 1/1Prime should be different objects, but equal.
-  XCTAssertNotEqual(dict1, dict1prime);
-  XCTAssertEqualObjects(dict1, dict1prime);
-  // Equal, so they must have same hash.
-  XCTAssertEqual([dict1 hash], [dict1prime hash]);
-
-  // 2 is same keys, different values; not equal.
-  XCTAssertNotEqualObjects(dict1, dict2);
-
-  // 3 is different keys, same values; not equal.
-  XCTAssertNotEqualObjects(dict1, dict3);
-
-  // 4 extra pair; not equal
-  XCTAssertNotEqualObjects(dict1, dict4);
-
-  [dict1 release];
-  [dict1prime release];
-  [dict2 release];
-  [dict3 release];
-  [dict4 release];
-}
-
-- (void)testCopy {
-  const int64_t kKeys[] = { 21LL, 22LL, 23LL, 24LL };
-  const double kValues[] = { 600., 601., 602., 603. };
-  GPBInt64DoubleDictionary *dict =
-      [[GPBInt64DoubleDictionary alloc] initWithDoubles:kValues
-                                                forKeys:kKeys
-                                                  count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-
-  GPBInt64DoubleDictionary *dict2 = [dict copy];
-  XCTAssertNotNil(dict2);
-
-  // Should be new object but equal.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  XCTAssertTrue([dict2 isKindOfClass:[GPBInt64DoubleDictionary class]]);
-
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testDictionaryFromDictionary {
-  const int64_t kKeys[] = { 21LL, 22LL, 23LL, 24LL };
-  const double kValues[] = { 600., 601., 602., 603. };
-  GPBInt64DoubleDictionary *dict =
-      [[GPBInt64DoubleDictionary alloc] initWithDoubles:kValues
-                                                forKeys:kKeys
-                                                  count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-
-  GPBInt64DoubleDictionary *dict2 =
-      [[GPBInt64DoubleDictionary alloc] initWithDictionary:dict];
-  XCTAssertNotNil(dict2);
-
-  // Should be new pointer, but equal objects.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testAdds {
-  GPBInt64DoubleDictionary *dict = [[GPBInt64DoubleDictionary alloc] init];
-  XCTAssertNotNil(dict);
-
-  XCTAssertEqual(dict.count, 0U);
-  [dict setDouble:600. forKey:21LL];
-  XCTAssertEqual(dict.count, 1U);
-
-  const int64_t kKeys[] = { 22LL, 23LL, 24LL };
-  const double kValues[] = { 601., 602., 603. };
-  GPBInt64DoubleDictionary *dict2 =
-      [[GPBInt64DoubleDictionary alloc] initWithDoubles:kValues
-                                                forKeys:kKeys
-                                                  count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict2);
-  [dict addEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 4U);
-
-  double value;
-  XCTAssertTrue([dict getDouble:NULL forKey:21LL]);
-  XCTAssertTrue([dict getDouble:&value forKey:21LL]);
-  XCTAssertEqual(value, 600.);
-  XCTAssertTrue([dict getDouble:NULL forKey:22LL]);
-  XCTAssertTrue([dict getDouble:&value forKey:22LL]);
-  XCTAssertEqual(value, 601.);
-  XCTAssertTrue([dict getDouble:NULL forKey:23LL]);
-  XCTAssertTrue([dict getDouble:&value forKey:23LL]);
-  XCTAssertEqual(value, 602.);
-  XCTAssertTrue([dict getDouble:NULL forKey:24LL]);
-  XCTAssertTrue([dict getDouble:&value forKey:24LL]);
-  XCTAssertEqual(value, 603.);
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testRemove {
-  const int64_t kKeys[] = { 21LL, 22LL, 23LL, 24LL };
-  const double kValues[] = { 600., 601., 602., 603. };
-  GPBInt64DoubleDictionary *dict =
-      [[GPBInt64DoubleDictionary alloc] initWithDoubles:kValues
-                                                forKeys:kKeys
-                                                  count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 4U);
-
-  [dict removeDoubleForKey:22LL];
-  XCTAssertEqual(dict.count, 3U);
-  double value;
-  XCTAssertTrue([dict getDouble:NULL forKey:21LL]);
-  XCTAssertTrue([dict getDouble:&value forKey:21LL]);
-  XCTAssertEqual(value, 600.);
-  XCTAssertFalse([dict getDouble:NULL forKey:22LL]);
-  XCTAssertTrue([dict getDouble:NULL forKey:23LL]);
-  XCTAssertTrue([dict getDouble:&value forKey:23LL]);
-  XCTAssertEqual(value, 602.);
-  XCTAssertTrue([dict getDouble:NULL forKey:24LL]);
-  XCTAssertTrue([dict getDouble:&value forKey:24LL]);
-  XCTAssertEqual(value, 603.);
-
-  // Remove again does nothing.
-  [dict removeDoubleForKey:22LL];
-  XCTAssertEqual(dict.count, 3U);
-  XCTAssertTrue([dict getDouble:NULL forKey:21LL]);
-  XCTAssertTrue([dict getDouble:&value forKey:21LL]);
-  XCTAssertEqual(value, 600.);
-  XCTAssertFalse([dict getDouble:NULL forKey:22LL]);
-  XCTAssertTrue([dict getDouble:NULL forKey:23LL]);
-  XCTAssertTrue([dict getDouble:&value forKey:23LL]);
-  XCTAssertEqual(value, 602.);
-  XCTAssertTrue([dict getDouble:NULL forKey:24LL]);
-  XCTAssertTrue([dict getDouble:&value forKey:24LL]);
-  XCTAssertEqual(value, 603.);
-
-  [dict removeDoubleForKey:24LL];
-  XCTAssertEqual(dict.count, 2U);
-  XCTAssertTrue([dict getDouble:NULL forKey:21LL]);
-  XCTAssertTrue([dict getDouble:&value forKey:21LL]);
-  XCTAssertEqual(value, 600.);
-  XCTAssertFalse([dict getDouble:NULL forKey:22LL]);
-  XCTAssertTrue([dict getDouble:NULL forKey:23LL]);
-  XCTAssertTrue([dict getDouble:&value forKey:23LL]);
-  XCTAssertEqual(value, 602.);
-  XCTAssertFalse([dict getDouble:NULL forKey:24LL]);
-
-  [dict removeAll];
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertFalse([dict getDouble:NULL forKey:21LL]);
-  XCTAssertFalse([dict getDouble:NULL forKey:22LL]);
-  XCTAssertFalse([dict getDouble:NULL forKey:23LL]);
-  XCTAssertFalse([dict getDouble:NULL forKey:24LL]);
-  [dict release];
-}
-
-- (void)testInplaceMutation {
-  const int64_t kKeys[] = { 21LL, 22LL, 23LL, 24LL };
-  const double kValues[] = { 600., 601., 602., 603. };
-  GPBInt64DoubleDictionary *dict =
-      [[GPBInt64DoubleDictionary alloc] initWithDoubles:kValues
-                                                forKeys:kKeys
-                                                  count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 4U);
-  double value;
-  XCTAssertTrue([dict getDouble:NULL forKey:21LL]);
-  XCTAssertTrue([dict getDouble:&value forKey:21LL]);
-  XCTAssertEqual(value, 600.);
-  XCTAssertTrue([dict getDouble:NULL forKey:22LL]);
-  XCTAssertTrue([dict getDouble:&value forKey:22LL]);
-  XCTAssertEqual(value, 601.);
-  XCTAssertTrue([dict getDouble:NULL forKey:23LL]);
-  XCTAssertTrue([dict getDouble:&value forKey:23LL]);
-  XCTAssertEqual(value, 602.);
-  XCTAssertTrue([dict getDouble:NULL forKey:24LL]);
-  XCTAssertTrue([dict getDouble:&value forKey:24LL]);
-  XCTAssertEqual(value, 603.);
-
-  [dict setDouble:603. forKey:21LL];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getDouble:NULL forKey:21LL]);
-  XCTAssertTrue([dict getDouble:&value forKey:21LL]);
-  XCTAssertEqual(value, 603.);
-  XCTAssertTrue([dict getDouble:NULL forKey:22LL]);
-  XCTAssertTrue([dict getDouble:&value forKey:22LL]);
-  XCTAssertEqual(value, 601.);
-  XCTAssertTrue([dict getDouble:NULL forKey:23LL]);
-  XCTAssertTrue([dict getDouble:&value forKey:23LL]);
-  XCTAssertEqual(value, 602.);
-  XCTAssertTrue([dict getDouble:NULL forKey:24LL]);
-  XCTAssertTrue([dict getDouble:&value forKey:24LL]);
-  XCTAssertEqual(value, 603.);
-
-  [dict setDouble:601. forKey:24LL];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getDouble:NULL forKey:21LL]);
-  XCTAssertTrue([dict getDouble:&value forKey:21LL]);
-  XCTAssertEqual(value, 603.);
-  XCTAssertTrue([dict getDouble:NULL forKey:22LL]);
-  XCTAssertTrue([dict getDouble:&value forKey:22LL]);
-  XCTAssertEqual(value, 601.);
-  XCTAssertTrue([dict getDouble:NULL forKey:23LL]);
-  XCTAssertTrue([dict getDouble:&value forKey:23LL]);
-  XCTAssertEqual(value, 602.);
-  XCTAssertTrue([dict getDouble:NULL forKey:24LL]);
-  XCTAssertTrue([dict getDouble:&value forKey:24LL]);
-  XCTAssertEqual(value, 601.);
-
-  const int64_t kKeys2[] = { 22LL, 23LL };
-  const double kValues2[] = { 602., 600. };
-  GPBInt64DoubleDictionary *dict2 =
-      [[GPBInt64DoubleDictionary alloc] initWithDoubles:kValues2
-                                                forKeys:kKeys2
-                                                  count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(dict2);
-  [dict addEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getDouble:NULL forKey:21LL]);
-  XCTAssertTrue([dict getDouble:&value forKey:21LL]);
-  XCTAssertEqual(value, 603.);
-  XCTAssertTrue([dict getDouble:NULL forKey:22LL]);
-  XCTAssertTrue([dict getDouble:&value forKey:22LL]);
-  XCTAssertEqual(value, 602.);
-  XCTAssertTrue([dict getDouble:NULL forKey:23LL]);
-  XCTAssertTrue([dict getDouble:&value forKey:23LL]);
-  XCTAssertEqual(value, 600.);
-  XCTAssertTrue([dict getDouble:NULL forKey:24LL]);
-  XCTAssertTrue([dict getDouble:&value forKey:24LL]);
-  XCTAssertEqual(value, 601.);
-
-  [dict2 release];
-  [dict release];
-}
-
-@end
-
-#pragma mark - Int64 -> Enum
-
-@interface GPBInt64EnumDictionaryTests : XCTestCase
-@end
-
-@implementation GPBInt64EnumDictionaryTests
-
-- (void)testEmpty {
-  GPBInt64EnumDictionary *dict = [[GPBInt64EnumDictionary alloc] init];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertFalse([dict getEnum:NULL forKey:21LL]);
-  [dict enumerateKeysAndEnumsUsingBlock:^(int64_t aKey, int32_t aValue, BOOL *stop) {
-    #pragma unused(aKey, aValue, stop)
-    XCTFail(@"Shouldn't get here!");
-  }];
-  [dict release];
-}
-
-- (void)testOne {
-  GPBInt64EnumDictionary *dict = [[GPBInt64EnumDictionary alloc] init];
-  [dict setEnum:700 forKey:21LL];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 1U);
-  int32_t value;
-  XCTAssertTrue([dict getEnum:NULL forKey:21LL]);
-  XCTAssertTrue([dict getEnum:&value forKey:21LL]);
-  XCTAssertEqual(value, 700);
-  XCTAssertFalse([dict getEnum:NULL forKey:22LL]);
-  [dict enumerateKeysAndEnumsUsingBlock:^(int64_t aKey, int32_t aValue, BOOL *stop) {
-    XCTAssertEqual(aKey, 21LL);
-    XCTAssertEqual(aValue, 700);
-    XCTAssertNotEqual(stop, NULL);
-  }];
-  [dict release];
-}
-
-- (void)testBasics {
-  const int64_t kKeys[] = { 21LL, 22LL, 23LL };
-  const int32_t kValues[] = { 700, 701, 702 };
-  GPBInt64EnumDictionary *dict =
-      [[GPBInt64EnumDictionary alloc] initWithEnums:kValues
-                                            forKeys:kKeys
-                                              count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 3U);
-  int32_t value;
-  XCTAssertTrue([dict getEnum:NULL forKey:21LL]);
-  XCTAssertTrue([dict getEnum:&value forKey:21LL]);
-  XCTAssertEqual(value, 700);
-  XCTAssertTrue([dict getEnum:NULL forKey:22LL]);
-  XCTAssertTrue([dict getEnum:&value forKey:22LL]);
-  XCTAssertEqual(value, 701);
-  XCTAssertTrue([dict getEnum:NULL forKey:23LL]);
-  XCTAssertTrue([dict getEnum:&value forKey:23LL]);
-  XCTAssertEqual(value, 702);
-  XCTAssertFalse([dict getEnum:NULL forKey:24LL]);
-
-  __block NSUInteger idx = 0;
-  int64_t *seenKeys = malloc(3 * sizeof(int64_t));
-  int32_t *seenValues = malloc(3 * sizeof(int32_t));
-  [dict enumerateKeysAndEnumsUsingBlock:^(int64_t aKey, int32_t aValue, BOOL *stop) {
-    XCTAssertLessThan(idx, 3U);
-    seenKeys[idx] = aKey;
-    seenValues[idx] = aValue;
-    XCTAssertNotEqual(stop, NULL);
-    ++idx;
-  }];
-  for (int i = 0; i < 3; ++i) {
-    BOOL foundKey = NO;
-    for (int j = 0; (j < 3) && !foundKey; ++j) {
-      if (kKeys[i] == seenKeys[j]) {
-        foundKey = YES;
-        XCTAssertEqual(kValues[i], seenValues[j], @"i = %d, j = %d", i, j);
-      }
-    }
-    XCTAssertTrue(foundKey, @"i = %d", i);
-  }
-  free(seenKeys);
-  free(seenValues);
-
-  // Stopping the enumeration.
-  idx = 0;
-  [dict enumerateKeysAndEnumsUsingBlock:^(int64_t aKey, int32_t aValue, BOOL *stop) {
-    #pragma unused(aKey, aValue)
-    if (idx == 1) *stop = YES;
-    XCTAssertNotEqual(idx, 2U);
-    ++idx;
-  }];
-  [dict release];
-}
-
-- (void)testEquality {
-  const int64_t kKeys1[] = { 21LL, 22LL, 23LL, 24LL };
-  const int64_t kKeys2[] = { 22LL, 21LL, 24LL };
-  const int32_t kValues1[] = { 700, 701, 702 };
-  const int32_t kValues2[] = { 700, 703, 702 };
-  const int32_t kValues3[] = { 700, 701, 702, 703 };
-  GPBInt64EnumDictionary *dict1 =
-      [[GPBInt64EnumDictionary alloc] initWithEnums:kValues1
-                                            forKeys:kKeys1
-                                              count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict1);
-  GPBInt64EnumDictionary *dict1prime =
-      [[GPBInt64EnumDictionary alloc] initWithEnums:kValues1
-                                            forKeys:kKeys1
-                                              count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict1prime);
-  GPBInt64EnumDictionary *dict2 =
-      [[GPBInt64EnumDictionary alloc] initWithEnums:kValues2
-                                            forKeys:kKeys1
-                                              count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(dict2);
-  GPBInt64EnumDictionary *dict3 =
-      [[GPBInt64EnumDictionary alloc] initWithEnums:kValues1
-                                            forKeys:kKeys2
-                                              count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict3);
-  GPBInt64EnumDictionary *dict4 =
-      [[GPBInt64EnumDictionary alloc] initWithEnums:kValues3
-                                            forKeys:kKeys1
-                                              count:GPBARRAYSIZE(kValues3)];
-  XCTAssertNotNil(dict4);
-
-  // 1/1Prime should be different objects, but equal.
-  XCTAssertNotEqual(dict1, dict1prime);
-  XCTAssertEqualObjects(dict1, dict1prime);
-  // Equal, so they must have same hash.
-  XCTAssertEqual([dict1 hash], [dict1prime hash]);
-
-  // 2 is same keys, different values; not equal.
-  XCTAssertNotEqualObjects(dict1, dict2);
-
-  // 3 is different keys, same values; not equal.
-  XCTAssertNotEqualObjects(dict1, dict3);
-
-  // 4 extra pair; not equal
-  XCTAssertNotEqualObjects(dict1, dict4);
-
-  [dict1 release];
-  [dict1prime release];
-  [dict2 release];
-  [dict3 release];
-  [dict4 release];
-}
-
-- (void)testCopy {
-  const int64_t kKeys[] = { 21LL, 22LL, 23LL, 24LL };
-  const int32_t kValues[] = { 700, 701, 702, 703 };
-  GPBInt64EnumDictionary *dict =
-      [[GPBInt64EnumDictionary alloc] initWithEnums:kValues
-                                            forKeys:kKeys
-                                              count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-
-  GPBInt64EnumDictionary *dict2 = [dict copy];
-  XCTAssertNotNil(dict2);
-
-  // Should be new object but equal.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  XCTAssertTrue([dict2 isKindOfClass:[GPBInt64EnumDictionary class]]);
-
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testDictionaryFromDictionary {
-  const int64_t kKeys[] = { 21LL, 22LL, 23LL, 24LL };
-  const int32_t kValues[] = { 700, 701, 702, 703 };
-  GPBInt64EnumDictionary *dict =
-      [[GPBInt64EnumDictionary alloc] initWithEnums:kValues
-                                            forKeys:kKeys
-                                              count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-
-  GPBInt64EnumDictionary *dict2 =
-      [[GPBInt64EnumDictionary alloc] initWithDictionary:dict];
-  XCTAssertNotNil(dict2);
-
-  // Should be new pointer, but equal objects.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testAdds {
-  GPBInt64EnumDictionary *dict = [[GPBInt64EnumDictionary alloc] init];
-  XCTAssertNotNil(dict);
-
-  XCTAssertEqual(dict.count, 0U);
-  [dict setEnum:700 forKey:21LL];
-  XCTAssertEqual(dict.count, 1U);
-
-  const int64_t kKeys[] = { 22LL, 23LL, 24LL };
-  const int32_t kValues[] = { 701, 702, 703 };
-  GPBInt64EnumDictionary *dict2 =
-      [[GPBInt64EnumDictionary alloc] initWithEnums:kValues
-                                            forKeys:kKeys
-                                              count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict2);
-  [dict addRawEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 4U);
-
-  int32_t value;
-  XCTAssertTrue([dict getEnum:NULL forKey:21LL]);
-  XCTAssertTrue([dict getEnum:&value forKey:21LL]);
-  XCTAssertEqual(value, 700);
-  XCTAssertTrue([dict getEnum:NULL forKey:22LL]);
-  XCTAssertTrue([dict getEnum:&value forKey:22LL]);
-  XCTAssertEqual(value, 701);
-  XCTAssertTrue([dict getEnum:NULL forKey:23LL]);
-  XCTAssertTrue([dict getEnum:&value forKey:23LL]);
-  XCTAssertEqual(value, 702);
-  XCTAssertTrue([dict getEnum:NULL forKey:24LL]);
-  XCTAssertTrue([dict getEnum:&value forKey:24LL]);
-  XCTAssertEqual(value, 703);
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testRemove {
-  const int64_t kKeys[] = { 21LL, 22LL, 23LL, 24LL };
-  const int32_t kValues[] = { 700, 701, 702, 703 };
-  GPBInt64EnumDictionary *dict =
-      [[GPBInt64EnumDictionary alloc] initWithEnums:kValues
-                                            forKeys:kKeys
-                                              count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 4U);
-
-  [dict removeEnumForKey:22LL];
-  XCTAssertEqual(dict.count, 3U);
-  int32_t value;
-  XCTAssertTrue([dict getEnum:NULL forKey:21LL]);
-  XCTAssertTrue([dict getEnum:&value forKey:21LL]);
-  XCTAssertEqual(value, 700);
-  XCTAssertFalse([dict getEnum:NULL forKey:22LL]);
-  XCTAssertTrue([dict getEnum:NULL forKey:23LL]);
-  XCTAssertTrue([dict getEnum:&value forKey:23LL]);
-  XCTAssertEqual(value, 702);
-  XCTAssertTrue([dict getEnum:NULL forKey:24LL]);
-  XCTAssertTrue([dict getEnum:&value forKey:24LL]);
-  XCTAssertEqual(value, 703);
-
-  // Remove again does nothing.
-  [dict removeEnumForKey:22LL];
-  XCTAssertEqual(dict.count, 3U);
-  XCTAssertTrue([dict getEnum:NULL forKey:21LL]);
-  XCTAssertTrue([dict getEnum:&value forKey:21LL]);
-  XCTAssertEqual(value, 700);
-  XCTAssertFalse([dict getEnum:NULL forKey:22LL]);
-  XCTAssertTrue([dict getEnum:NULL forKey:23LL]);
-  XCTAssertTrue([dict getEnum:&value forKey:23LL]);
-  XCTAssertEqual(value, 702);
-  XCTAssertTrue([dict getEnum:NULL forKey:24LL]);
-  XCTAssertTrue([dict getEnum:&value forKey:24LL]);
-  XCTAssertEqual(value, 703);
-
-  [dict removeEnumForKey:24LL];
-  XCTAssertEqual(dict.count, 2U);
-  XCTAssertTrue([dict getEnum:NULL forKey:21LL]);
-  XCTAssertTrue([dict getEnum:&value forKey:21LL]);
-  XCTAssertEqual(value, 700);
-  XCTAssertFalse([dict getEnum:NULL forKey:22LL]);
-  XCTAssertTrue([dict getEnum:NULL forKey:23LL]);
-  XCTAssertTrue([dict getEnum:&value forKey:23LL]);
-  XCTAssertEqual(value, 702);
-  XCTAssertFalse([dict getEnum:NULL forKey:24LL]);
-
-  [dict removeAll];
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertFalse([dict getEnum:NULL forKey:21LL]);
-  XCTAssertFalse([dict getEnum:NULL forKey:22LL]);
-  XCTAssertFalse([dict getEnum:NULL forKey:23LL]);
-  XCTAssertFalse([dict getEnum:NULL forKey:24LL]);
-  [dict release];
-}
-
-- (void)testInplaceMutation {
-  const int64_t kKeys[] = { 21LL, 22LL, 23LL, 24LL };
-  const int32_t kValues[] = { 700, 701, 702, 703 };
-  GPBInt64EnumDictionary *dict =
-      [[GPBInt64EnumDictionary alloc] initWithEnums:kValues
-                                            forKeys:kKeys
-                                              count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 4U);
-  int32_t value;
-  XCTAssertTrue([dict getEnum:NULL forKey:21LL]);
-  XCTAssertTrue([dict getEnum:&value forKey:21LL]);
-  XCTAssertEqual(value, 700);
-  XCTAssertTrue([dict getEnum:NULL forKey:22LL]);
-  XCTAssertTrue([dict getEnum:&value forKey:22LL]);
-  XCTAssertEqual(value, 701);
-  XCTAssertTrue([dict getEnum:NULL forKey:23LL]);
-  XCTAssertTrue([dict getEnum:&value forKey:23LL]);
-  XCTAssertEqual(value, 702);
-  XCTAssertTrue([dict getEnum:NULL forKey:24LL]);
-  XCTAssertTrue([dict getEnum:&value forKey:24LL]);
-  XCTAssertEqual(value, 703);
-
-  [dict setEnum:703 forKey:21LL];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getEnum:NULL forKey:21LL]);
-  XCTAssertTrue([dict getEnum:&value forKey:21LL]);
-  XCTAssertEqual(value, 703);
-  XCTAssertTrue([dict getEnum:NULL forKey:22LL]);
-  XCTAssertTrue([dict getEnum:&value forKey:22LL]);
-  XCTAssertEqual(value, 701);
-  XCTAssertTrue([dict getEnum:NULL forKey:23LL]);
-  XCTAssertTrue([dict getEnum:&value forKey:23LL]);
-  XCTAssertEqual(value, 702);
-  XCTAssertTrue([dict getEnum:NULL forKey:24LL]);
-  XCTAssertTrue([dict getEnum:&value forKey:24LL]);
-  XCTAssertEqual(value, 703);
-
-  [dict setEnum:701 forKey:24LL];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getEnum:NULL forKey:21LL]);
-  XCTAssertTrue([dict getEnum:&value forKey:21LL]);
-  XCTAssertEqual(value, 703);
-  XCTAssertTrue([dict getEnum:NULL forKey:22LL]);
-  XCTAssertTrue([dict getEnum:&value forKey:22LL]);
-  XCTAssertEqual(value, 701);
-  XCTAssertTrue([dict getEnum:NULL forKey:23LL]);
-  XCTAssertTrue([dict getEnum:&value forKey:23LL]);
-  XCTAssertEqual(value, 702);
-  XCTAssertTrue([dict getEnum:NULL forKey:24LL]);
-  XCTAssertTrue([dict getEnum:&value forKey:24LL]);
-  XCTAssertEqual(value, 701);
-
-  const int64_t kKeys2[] = { 22LL, 23LL };
-  const int32_t kValues2[] = { 702, 700 };
-  GPBInt64EnumDictionary *dict2 =
-      [[GPBInt64EnumDictionary alloc] initWithEnums:kValues2
-                                            forKeys:kKeys2
-                                              count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(dict2);
-  [dict addRawEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getEnum:NULL forKey:21LL]);
-  XCTAssertTrue([dict getEnum:&value forKey:21LL]);
-  XCTAssertEqual(value, 703);
-  XCTAssertTrue([dict getEnum:NULL forKey:22LL]);
-  XCTAssertTrue([dict getEnum:&value forKey:22LL]);
-  XCTAssertEqual(value, 702);
-  XCTAssertTrue([dict getEnum:NULL forKey:23LL]);
-  XCTAssertTrue([dict getEnum:&value forKey:23LL]);
-  XCTAssertEqual(value, 700);
-  XCTAssertTrue([dict getEnum:NULL forKey:24LL]);
-  XCTAssertTrue([dict getEnum:&value forKey:24LL]);
-  XCTAssertEqual(value, 701);
-
-  [dict2 release];
-  [dict release];
-}
-
-@end
-
-#pragma mark - Int64 -> Enum (Unknown Enums)
-
-@interface GPBInt64EnumDictionaryUnknownEnumTests : XCTestCase
-@end
-
-@implementation GPBInt64EnumDictionaryUnknownEnumTests
-
-- (void)testRawBasics {
-  const int64_t kKeys[] = { 21LL, 22LL, 23LL };
-  const int32_t kValues[] = { 700, 801, 702 };
-  GPBInt64EnumDictionary *dict =
-      [[GPBInt64EnumDictionary alloc] initWithValidationFunction:TestingEnum_IsValidValue
-                                                       rawValues:kValues
-                                                         forKeys:kKeys
-                                                           count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 3U);
-  XCTAssertTrue(dict.validationFunc == TestingEnum_IsValidValue);  // Pointer comparison
-  int32_t value;
-  XCTAssertTrue([dict getRawValue:NULL forKey:21LL]);
-  XCTAssertTrue([dict getRawValue:&value forKey:21LL]);
-  XCTAssertEqual(value, 700);
-  XCTAssertTrue([dict getEnum:NULL forKey:22LL]);
-  XCTAssertTrue([dict getEnum:&value forKey:22LL]);
-  XCTAssertEqual(value, kGPBUnrecognizedEnumeratorValue);
-  XCTAssertTrue([dict getRawValue:NULL forKey:22LL]);
-  XCTAssertTrue([dict getRawValue:&value forKey:22LL]);
-  XCTAssertEqual(value, 801);
-  XCTAssertTrue([dict getRawValue:NULL forKey:23LL]);
-  XCTAssertTrue([dict getRawValue:&value forKey:23LL]);
-  XCTAssertEqual(value, 702);
-  XCTAssertFalse([dict getRawValue:NULL forKey:24LL]);
-
-  __block NSUInteger idx = 0;
-  int64_t *seenKeys = malloc(3 * sizeof(int64_t));
-  int32_t *seenValues = malloc(3 * sizeof(int32_t));
-  [dict enumerateKeysAndEnumsUsingBlock:^(int64_t aKey, int32_t aValue, BOOL *stop) {
-    XCTAssertLessThan(idx, 3U);
-    seenKeys[idx] = aKey;
-    seenValues[idx] = aValue;
-    XCTAssertNotEqual(stop, NULL);
-    ++idx;
-  }];
-  for (int i = 0; i < 3; ++i) {
-    BOOL foundKey = NO;
-    for (int j = 0; (j < 3) && !foundKey; ++j) {
-      if (kKeys[i] == seenKeys[j]) {
-        foundKey = YES;
-        if (i == 1) {
-          XCTAssertEqual(kGPBUnrecognizedEnumeratorValue, seenValues[j], @"i = %d, j = %d", i, j);
-        } else {
-          XCTAssertEqual(kValues[i], seenValues[j], @"i = %d, j = %d", i, j);
-        }
-      }
-    }
-    XCTAssertTrue(foundKey, @"i = %d", i);
-  }
-  idx = 0;
-  [dict enumerateKeysAndRawValuesUsingBlock:^(int64_t aKey, int32_t aValue, BOOL *stop) {
-    XCTAssertLessThan(idx, 3U);
-    seenKeys[idx] = aKey;
-    seenValues[idx] = aValue;
-    XCTAssertNotEqual(stop, NULL);
-    ++idx;
-  }];
-  for (int i = 0; i < 3; ++i) {
-    BOOL foundKey = NO;
-    for (int j = 0; (j < 3) && !foundKey; ++j) {
-      if (kKeys[i] == seenKeys[j]) {
-        foundKey = YES;
-        XCTAssertEqual(kValues[i], seenValues[j], @"i = %d, j = %d", i, j);
-      }
-    }
-    XCTAssertTrue(foundKey, @"i = %d", i);
-  }
-  free(seenKeys);
-  free(seenValues);
-
-  // Stopping the enumeration.
-  idx = 0;
-  [dict enumerateKeysAndRawValuesUsingBlock:^(int64_t aKey, int32_t aValue, BOOL *stop) {
-    #pragma unused(aKey, aValue)
-    if (idx == 1) *stop = YES;
-    XCTAssertNotEqual(idx, 2U);
-    ++idx;
-  }];
-  [dict release];
-}
-
-- (void)testEqualityWithUnknowns {
-  const int64_t kKeys1[] = { 21LL, 22LL, 23LL, 24LL };
-  const int64_t kKeys2[] = { 22LL, 21LL, 24LL };
-  const int32_t kValues1[] = { 700, 801, 702 };  // Unknown
-  const int32_t kValues2[] = { 700, 803, 702 };  // Unknown
-  const int32_t kValues3[] = { 700, 801, 702, 803 };  // Unknowns
-  GPBInt64EnumDictionary *dict1 =
-      [[GPBInt64EnumDictionary alloc] initWithValidationFunction:TestingEnum_IsValidValue
-                                                       rawValues:kValues1
-                                                         forKeys:kKeys1
-                                                           count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict1);
-  GPBInt64EnumDictionary *dict1prime =
-      [[GPBInt64EnumDictionary alloc] initWithValidationFunction:TestingEnum_IsValidValue
-                                                       rawValues:kValues1
-                                                         forKeys:kKeys1
-                                                           count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict1prime);
-  GPBInt64EnumDictionary *dict2 =
-      [[GPBInt64EnumDictionary alloc] initWithValidationFunction:TestingEnum_IsValidValue
-                                                       rawValues:kValues2
-                                                         forKeys:kKeys1
-                                                           count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(dict2);
-  GPBInt64EnumDictionary *dict3 =
-      [[GPBInt64EnumDictionary alloc] initWithValidationFunction:TestingEnum_IsValidValue
-                                                       rawValues:kValues1
-                                                         forKeys:kKeys2
-                                                           count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict3);
-  GPBInt64EnumDictionary *dict4 =
-      [[GPBInt64EnumDictionary alloc] initWithValidationFunction:TestingEnum_IsValidValue
-                                                       rawValues:kValues3
-                                                         forKeys:kKeys1
-                                                           count:GPBARRAYSIZE(kValues3)];
-  XCTAssertNotNil(dict4);
-
-  // 1/1Prime should be different objects, but equal.
-  XCTAssertNotEqual(dict1, dict1prime);
-  XCTAssertEqualObjects(dict1, dict1prime);
-  // Equal, so they must have same hash.
-  XCTAssertEqual([dict1 hash], [dict1prime hash]);
-
-  // 2 is same keys, different values; not equal.
-  XCTAssertNotEqualObjects(dict1, dict2);
-
-  // 3 is different keys, same values; not equal.
-  XCTAssertNotEqualObjects(dict1, dict3);
-
-  // 4 extra pair; not equal
-  XCTAssertNotEqualObjects(dict1, dict4);
-
-  [dict1 release];
-  [dict1prime release];
-  [dict2 release];
-  [dict3 release];
-  [dict4 release];
-}
-
-- (void)testCopyWithUnknowns {
-  const int64_t kKeys[] = { 21LL, 22LL, 23LL, 24LL };
-  const int32_t kValues[] = { 700, 801, 702, 803 };  // Unknown
-  GPBInt64EnumDictionary *dict =
-      [[GPBInt64EnumDictionary alloc] initWithValidationFunction:TestingEnum_IsValidValue
-                                                       rawValues:kValues
-                                                         forKeys:kKeys
-                                                           count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-
-  GPBInt64EnumDictionary *dict2 = [dict copy];
-  XCTAssertNotNil(dict2);
-
-  // Should be new pointer, but equal objects.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqual(dict.validationFunc, dict2.validationFunc);  // Pointer comparison
-  XCTAssertEqualObjects(dict, dict2);
-
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testDictionaryFromDictionary {
-  const int64_t kKeys[] = { 21LL, 22LL, 23LL, 24LL };
-  const int32_t kValues[] = { 700, 801, 702, 803 };  // Unknowns
-  GPBInt64EnumDictionary *dict =
-      [[GPBInt64EnumDictionary alloc] initWithValidationFunction:TestingEnum_IsValidValue
-                                                       rawValues:kValues
-                                                         forKeys:kKeys
-                                                           count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-
-  GPBInt64EnumDictionary *dict2 =
-      [[GPBInt64EnumDictionary alloc] initWithDictionary:dict];
-  XCTAssertNotNil(dict2);
-
-  // Should be new pointer, but equal objects.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  XCTAssertEqual(dict.validationFunc, dict2.validationFunc);  // Pointer comparison
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testUnknownAdds {
-  GPBInt64EnumDictionary *dict =
-      [[GPBInt64EnumDictionary alloc] initWithValidationFunction:TestingEnum_IsValidValue];
-  XCTAssertNotNil(dict);
-
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertThrowsSpecificNamed([dict setEnum:801 forKey:22LL],  // Unknown
-                               NSException, NSInvalidArgumentException);
-  XCTAssertEqual(dict.count, 0U);
-  [dict setRawValue:801 forKey:22LL];  // Unknown
-  XCTAssertEqual(dict.count, 1U);
-
-  const int64_t kKeys[] = { 21LL, 23LL, 24LL };
-  const int32_t kValues[] = { 700, 702, 803 };  // Unknown
-  GPBInt64EnumDictionary *dict2 =
-      [[GPBInt64EnumDictionary alloc] initWithEnums:kValues
-                                              forKeys:kKeys
-                                                count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict2);
-  [dict addRawEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 4U);
-
-  int32_t value;
-  XCTAssertTrue([dict getEnum:NULL forKey:21LL]);
-  XCTAssertTrue([dict getEnum:&value forKey:21LL]);
-  XCTAssertEqual(value, 700);
-  XCTAssertTrue([dict getEnum:NULL forKey:22LL]);
-  XCTAssertTrue([dict getEnum:&value forKey:22LL]);
-  XCTAssertEqual(value, kGPBUnrecognizedEnumeratorValue);
-  XCTAssertTrue([dict getRawValue:NULL forKey:22LL]);
-  XCTAssertTrue([dict getRawValue:&value forKey:22LL]);
-  XCTAssertEqual(value, 801);
-  XCTAssertTrue([dict getEnum:NULL forKey:23LL]);
-  XCTAssertTrue([dict getEnum:&value forKey:23LL]);
-  XCTAssertEqual(value, 702);
-  XCTAssertTrue([dict getEnum:NULL forKey:24LL]);
-  XCTAssertTrue([dict getEnum:&value forKey:24LL]);
-  XCTAssertEqual(value, kGPBUnrecognizedEnumeratorValue);
-  XCTAssertTrue([dict getRawValue:NULL forKey:24LL]);
-  XCTAssertTrue([dict getRawValue:&value forKey:24LL]);
-  XCTAssertEqual(value, 803);
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testUnknownRemove {
-  const int64_t kKeys[] = { 21LL, 22LL, 23LL, 24LL };
-  const int32_t kValues[] = { 700, 801, 702, 803 };  // Unknowns
-  GPBInt64EnumDictionary *dict =
-      [[GPBInt64EnumDictionary alloc] initWithValidationFunction:TestingEnum_IsValidValue
-                                                       rawValues:kValues
-                                                         forKeys:kKeys
-                                                           count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 4U);
-
-  [dict removeEnumForKey:22LL];
-  XCTAssertEqual(dict.count, 3U);
-  int32_t value;
-  XCTAssertTrue([dict getEnum:NULL forKey:21LL]);
-  XCTAssertTrue([dict getEnum:&value forKey:21LL]);
-  XCTAssertEqual(value, 700);
-  XCTAssertFalse([dict getEnum:NULL forKey:22LL]);
-  XCTAssertTrue([dict getEnum:NULL forKey:23LL]);
-  XCTAssertTrue([dict getEnum:&value forKey:23LL]);
-  XCTAssertEqual(value, 702);
-  XCTAssertTrue([dict getRawValue:NULL forKey:24LL]);
-  XCTAssertTrue([dict getRawValue:&value forKey:24LL]);
-  XCTAssertEqual(value, 803);
-
-  // Remove again does nothing.
-  [dict removeEnumForKey:22LL];
-  XCTAssertEqual(dict.count, 3U);
-  XCTAssertTrue([dict getEnum:NULL forKey:21LL]);
-  XCTAssertTrue([dict getEnum:&value forKey:21LL]);
-  XCTAssertEqual(value, 700);
-  XCTAssertFalse([dict getEnum:NULL forKey:22LL]);
-  XCTAssertTrue([dict getEnum:NULL forKey:23LL]);
-  XCTAssertTrue([dict getEnum:&value forKey:23LL]);
-  XCTAssertEqual(value, 702);
-  XCTAssertTrue([dict getRawValue:NULL forKey:24LL]);
-  XCTAssertTrue([dict getRawValue:&value forKey:24LL]);
-  XCTAssertEqual(value, 803);
-
-  [dict removeEnumForKey:24LL];
-  XCTAssertEqual(dict.count, 2U);
-  XCTAssertTrue([dict getEnum:NULL forKey:21LL]);
-  XCTAssertTrue([dict getEnum:&value forKey:21LL]);
-  XCTAssertEqual(value, 700);
-  XCTAssertFalse([dict getEnum:NULL forKey:22LL]);
-  XCTAssertTrue([dict getEnum:NULL forKey:23LL]);
-  XCTAssertTrue([dict getEnum:&value forKey:23LL]);
-  XCTAssertEqual(value, 702);
-  XCTAssertFalse([dict getEnum:NULL forKey:24LL]);
-
-  [dict removeAll];
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertFalse([dict getEnum:NULL forKey:21LL]);
-  XCTAssertFalse([dict getEnum:NULL forKey:22LL]);
-  XCTAssertFalse([dict getEnum:NULL forKey:23LL]);
-  XCTAssertFalse([dict getEnum:NULL forKey:24LL]);
-  [dict release];
-}
-
-- (void)testInplaceMutationUnknowns {
-  const int64_t kKeys[] = { 21LL, 22LL, 23LL, 24LL };
-  const int32_t kValues[] = { 700, 801, 702, 803 };  // Unknowns
-  GPBInt64EnumDictionary *dict =
-      [[GPBInt64EnumDictionary alloc] initWithValidationFunction:TestingEnum_IsValidValue
-                                                       rawValues:kValues
-                                                         forKeys:kKeys
-                                                           count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 4U);
-  int32_t value;
-  XCTAssertTrue([dict getEnum:NULL forKey:21LL]);
-  XCTAssertTrue([dict getEnum:&value forKey:21LL]);
-  XCTAssertEqual(value, 700);
-  XCTAssertTrue([dict getRawValue:NULL forKey:22LL]);
-  XCTAssertTrue([dict getRawValue:&value forKey:22LL]);
-  XCTAssertEqual(value, 801);
-  XCTAssertTrue([dict getEnum:NULL forKey:23LL]);
-  XCTAssertTrue([dict getEnum:&value forKey:23LL]);
-  XCTAssertEqual(value, 702);
-  XCTAssertTrue([dict getRawValue:NULL forKey:24LL]);
-  XCTAssertTrue([dict getRawValue:&value forKey:24LL]);
-  XCTAssertEqual(value, 803);
-
-  XCTAssertThrowsSpecificNamed([dict setEnum:803 forKey:21LL],  // Unknown
-                               NSException, NSInvalidArgumentException);
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getEnum:NULL forKey:21LL]);
-  XCTAssertTrue([dict getEnum:&value forKey:21LL]);
-  XCTAssertEqual(value, 700);
-  XCTAssertTrue([dict getRawValue:NULL forKey:22LL]);
-  XCTAssertTrue([dict getRawValue:&value forKey:22LL]);
-  XCTAssertEqual(value, 801);
-  XCTAssertTrue([dict getEnum:NULL forKey:23LL]);
-  XCTAssertTrue([dict getEnum:&value forKey:23LL]);
-  XCTAssertEqual(value, 702);
-  XCTAssertTrue([dict getRawValue:NULL forKey:24LL]);
-  XCTAssertTrue([dict getRawValue:&value forKey:24LL]);
-  XCTAssertEqual(value, 803);
-
-  [dict setRawValue:803 forKey:21LL];  // Unknown
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getRawValue:NULL forKey:21LL]);
-  XCTAssertTrue([dict getRawValue:&value forKey:21LL]);
-  XCTAssertEqual(value, 803);
-  XCTAssertTrue([dict getRawValue:NULL forKey:22LL]);
-  XCTAssertTrue([dict getRawValue:&value forKey:22LL]);
-  XCTAssertEqual(value, 801);
-  XCTAssertTrue([dict getEnum:NULL forKey:23LL]);
-  XCTAssertTrue([dict getEnum:&value forKey:23LL]);
-  XCTAssertEqual(value, 702);
-  XCTAssertTrue([dict getRawValue:NULL forKey:24LL]);
-  XCTAssertTrue([dict getRawValue:&value forKey:24LL]);
-  XCTAssertEqual(value, 803);
-
-  [dict setRawValue:700 forKey:24LL];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getRawValue:NULL forKey:21LL]);
-  XCTAssertTrue([dict getRawValue:&value forKey:21LL]);
-  XCTAssertEqual(value, 803);
-  XCTAssertTrue([dict getRawValue:NULL forKey:22LL]);
-  XCTAssertTrue([dict getRawValue:&value forKey:22LL]);
-  XCTAssertEqual(value, 801);
-  XCTAssertTrue([dict getEnum:NULL forKey:23LL]);
-  XCTAssertTrue([dict getEnum:&value forKey:23LL]);
-  XCTAssertEqual(value, 702);
-  XCTAssertTrue([dict getEnum:NULL forKey:24LL]);
-  XCTAssertTrue([dict getEnum:&value forKey:24LL]);
-  XCTAssertEqual(value, 700);
-
-  const int64_t kKeys2[] = { 22LL, 23LL };
-  const int32_t kValues2[] = { 702, 801 };  // Unknown
-  GPBInt64EnumDictionary *dict2 =
-      [[GPBInt64EnumDictionary alloc] initWithValidationFunction:TestingEnum_IsValidValue
-                                                       rawValues:kValues2
-                                                         forKeys:kKeys2
-                                                           count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(dict2);
-  [dict addRawEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getRawValue:NULL forKey:21LL]);
-  XCTAssertTrue([dict getRawValue:&value forKey:21LL]);
-  XCTAssertEqual(value, 803);
-  XCTAssertTrue([dict getEnum:NULL forKey:22LL]);
-  XCTAssertTrue([dict getEnum:&value forKey:22LL]);
-  XCTAssertEqual(value, 702);
-  XCTAssertTrue([dict getRawValue:NULL forKey:23LL]);
-  XCTAssertTrue([dict getRawValue:&value forKey:23LL]);
-  XCTAssertEqual(value, 801);
-  XCTAssertTrue([dict getEnum:NULL forKey:24LL]);
-  XCTAssertTrue([dict getEnum:&value forKey:24LL]);
-  XCTAssertEqual(value, 700);
-
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testCopyUnknowns {
-  const int64_t kKeys[] = { 21LL, 22LL, 23LL, 24LL };
-  const int32_t kValues[] = { 700, 801, 702, 803 };
-  GPBInt64EnumDictionary *dict =
-      [[GPBInt64EnumDictionary alloc] initWithValidationFunction:TestingEnum_IsValidValue
-                                                       rawValues:kValues
-                                                         forKeys:kKeys
-                                                           count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-
-  GPBInt64EnumDictionary *dict2 = [dict copy];
-  XCTAssertNotNil(dict2);
-
-  // Should be new pointer, but equal objects.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  XCTAssertEqual(dict.validationFunc, dict2.validationFunc);  // Pointer comparison
-  XCTAssertTrue([dict2 isKindOfClass:[GPBInt64EnumDictionary class]]);
-
-  [dict2 release];
-  [dict release];
-}
-
-@end
-
-#pragma mark - Int64 -> Object
-
-@interface GPBInt64ObjectDictionaryTests : XCTestCase
-@end
-
-@implementation GPBInt64ObjectDictionaryTests
-
-- (void)testEmpty {
-  GPBInt64ObjectDictionary<NSString*> *dict = [[GPBInt64ObjectDictionary alloc] init];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertNil([dict objectForKey:21LL]);
-  [dict enumerateKeysAndObjectsUsingBlock:^(int64_t aKey, NSString* aObject, BOOL *stop) {
-    #pragma unused(aKey, aObject, stop)
-    XCTFail(@"Shouldn't get here!");
-  }];
-  [dict release];
-}
-
-- (void)testOne {
-  GPBInt64ObjectDictionary<NSString*> *dict = [[GPBInt64ObjectDictionary alloc] init];
-  [dict setObject:@"abc" forKey:21LL];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 1U);
-  XCTAssertEqualObjects([dict objectForKey:21LL], @"abc");
-  XCTAssertNil([dict objectForKey:22LL]);
-  [dict enumerateKeysAndObjectsUsingBlock:^(int64_t aKey, NSString* aObject, BOOL *stop) {
-    XCTAssertEqual(aKey, 21LL);
-    XCTAssertEqualObjects(aObject, @"abc");
-    XCTAssertNotEqual(stop, NULL);
-  }];
-  [dict release];
-}
-
-- (void)testBasics {
-  const int64_t kKeys[] = { 21LL, 22LL, 23LL };
-  const NSString* kObjects[] = { @"abc", @"def", @"ghi" };
-  GPBInt64ObjectDictionary<NSString*> *dict =
-      [[GPBInt64ObjectDictionary alloc] initWithObjects:kObjects
-                                                forKeys:kKeys
-                                                  count:GPBARRAYSIZE(kObjects)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 3U);
-  XCTAssertEqualObjects([dict objectForKey:21LL], @"abc");
-  XCTAssertEqualObjects([dict objectForKey:22LL], @"def");
-  XCTAssertEqualObjects([dict objectForKey:23LL], @"ghi");
-  XCTAssertNil([dict objectForKey:24LL]);
-
-  __block NSUInteger idx = 0;
-  int64_t *seenKeys = malloc(3 * sizeof(int64_t));
-  NSString* *seenObjects = malloc(3 * sizeof(NSString*));
-  [dict enumerateKeysAndObjectsUsingBlock:^(int64_t aKey, NSString* aObject, BOOL *stop) {
-    XCTAssertLessThan(idx, 3U);
-    seenKeys[idx] = aKey;
-    seenObjects[idx] = aObject;
-    XCTAssertNotEqual(stop, NULL);
-    ++idx;
-  }];
-  for (int i = 0; i < 3; ++i) {
-    BOOL foundKey = NO;
-    for (int j = 0; (j < 3) && !foundKey; ++j) {
-      if (kKeys[i] == seenKeys[j]) {
-        foundKey = YES;
-        XCTAssertEqualObjects(kObjects[i], seenObjects[j], @"i = %d, j = %d", i, j);
-      }
-    }
-    XCTAssertTrue(foundKey, @"i = %d", i);
-  }
-  free(seenKeys);
-  free(seenObjects);
-
-  // Stopping the enumeration.
-  idx = 0;
-  [dict enumerateKeysAndObjectsUsingBlock:^(int64_t aKey, NSString* aObject, BOOL *stop) {
-    #pragma unused(aKey, aObject)
-    if (idx == 1) *stop = YES;
-    XCTAssertNotEqual(idx, 2U);
-    ++idx;
-  }];
-  [dict release];
-}
-
-- (void)testEquality {
-  const int64_t kKeys1[] = { 21LL, 22LL, 23LL, 24LL };
-  const int64_t kKeys2[] = { 22LL, 21LL, 24LL };
-  const NSString* kObjects1[] = { @"abc", @"def", @"ghi" };
-  const NSString* kObjects2[] = { @"abc", @"jkl", @"ghi" };
-  const NSString* kObjects3[] = { @"abc", @"def", @"ghi", @"jkl" };
-  GPBInt64ObjectDictionary<NSString*> *dict1 =
-      [[GPBInt64ObjectDictionary alloc] initWithObjects:kObjects1
-                                                forKeys:kKeys1
-                                                  count:GPBARRAYSIZE(kObjects1)];
-  XCTAssertNotNil(dict1);
-  GPBInt64ObjectDictionary<NSString*> *dict1prime =
-      [[GPBInt64ObjectDictionary alloc] initWithObjects:kObjects1
-                                                forKeys:kKeys1
-                                                  count:GPBARRAYSIZE(kObjects1)];
-  XCTAssertNotNil(dict1prime);
-  GPBInt64ObjectDictionary<NSString*> *dict2 =
-      [[GPBInt64ObjectDictionary alloc] initWithObjects:kObjects2
-                                                forKeys:kKeys1
-                                                  count:GPBARRAYSIZE(kObjects2)];
-  XCTAssertNotNil(dict2);
-  GPBInt64ObjectDictionary<NSString*> *dict3 =
-      [[GPBInt64ObjectDictionary alloc] initWithObjects:kObjects1
-                                                forKeys:kKeys2
-                                                  count:GPBARRAYSIZE(kObjects1)];
-  XCTAssertNotNil(dict3);
-  GPBInt64ObjectDictionary<NSString*> *dict4 =
-      [[GPBInt64ObjectDictionary alloc] initWithObjects:kObjects3
-                                                forKeys:kKeys1
-                                                  count:GPBARRAYSIZE(kObjects3)];
-  XCTAssertNotNil(dict4);
-
-  // 1/1Prime should be different objects, but equal.
-  XCTAssertNotEqual(dict1, dict1prime);
-  XCTAssertEqualObjects(dict1, dict1prime);
-  // Equal, so they must have same hash.
-  XCTAssertEqual([dict1 hash], [dict1prime hash]);
-
-  // 2 is same keys, different objects; not equal.
-  XCTAssertNotEqualObjects(dict1, dict2);
-
-  // 3 is different keys, same objects; not equal.
-  XCTAssertNotEqualObjects(dict1, dict3);
-
-  // 4 extra pair; not equal
-  XCTAssertNotEqualObjects(dict1, dict4);
-
-  [dict1 release];
-  [dict1prime release];
-  [dict2 release];
-  [dict3 release];
-  [dict4 release];
-}
-
-- (void)testCopy {
-  const int64_t kKeys[] = { 21LL, 22LL, 23LL, 24LL };
-  const NSString* kObjects[] = { @"abc", @"def", @"ghi", @"jkl" };
-  GPBInt64ObjectDictionary<NSString*> *dict =
-      [[GPBInt64ObjectDictionary alloc] initWithObjects:kObjects
-                                                forKeys:kKeys
-                                                  count:GPBARRAYSIZE(kObjects)];
-  XCTAssertNotNil(dict);
-
-  GPBInt64ObjectDictionary<NSString*> *dict2 = [dict copy];
-  XCTAssertNotNil(dict2);
-
-  // Should be new object but equal.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  XCTAssertTrue([dict2 isKindOfClass:[GPBInt64ObjectDictionary class]]);
-
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testDictionaryFromDictionary {
-  const int64_t kKeys[] = { 21LL, 22LL, 23LL, 24LL };
-  const NSString* kObjects[] = { @"abc", @"def", @"ghi", @"jkl" };
-  GPBInt64ObjectDictionary<NSString*> *dict =
-      [[GPBInt64ObjectDictionary alloc] initWithObjects:kObjects
-                                                forKeys:kKeys
-                                                  count:GPBARRAYSIZE(kObjects)];
-  XCTAssertNotNil(dict);
-
-  GPBInt64ObjectDictionary<NSString*> *dict2 =
-      [[GPBInt64ObjectDictionary alloc] initWithDictionary:dict];
-  XCTAssertNotNil(dict2);
-
-  // Should be new pointer, but equal objects.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testAdds {
-  GPBInt64ObjectDictionary<NSString*> *dict = [[GPBInt64ObjectDictionary alloc] init];
-  XCTAssertNotNil(dict);
-
-  XCTAssertEqual(dict.count, 0U);
-  [dict setObject:@"abc" forKey:21LL];
-  XCTAssertEqual(dict.count, 1U);
-
-  const int64_t kKeys[] = { 22LL, 23LL, 24LL };
-  const NSString* kObjects[] = { @"def", @"ghi", @"jkl" };
-  GPBInt64ObjectDictionary<NSString*> *dict2 =
-      [[GPBInt64ObjectDictionary alloc] initWithObjects:kObjects
-                                                forKeys:kKeys
-                                                  count:GPBARRAYSIZE(kObjects)];
-  XCTAssertNotNil(dict2);
-  [dict addEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 4U);
-
-  XCTAssertEqualObjects([dict objectForKey:21LL], @"abc");
-  XCTAssertEqualObjects([dict objectForKey:22LL], @"def");
-  XCTAssertEqualObjects([dict objectForKey:23LL], @"ghi");
-  XCTAssertEqualObjects([dict objectForKey:24LL], @"jkl");
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testRemove {
-  const int64_t kKeys[] = { 21LL, 22LL, 23LL, 24LL };
-  const NSString* kObjects[] = { @"abc", @"def", @"ghi", @"jkl" };
-  GPBInt64ObjectDictionary<NSString*> *dict =
-      [[GPBInt64ObjectDictionary alloc] initWithObjects:kObjects
-                                                forKeys:kKeys
-                                                  count:GPBARRAYSIZE(kObjects)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 4U);
-
-  [dict removeObjectForKey:22LL];
-  XCTAssertEqual(dict.count, 3U);
-  XCTAssertEqualObjects([dict objectForKey:21LL], @"abc");
-  XCTAssertNil([dict objectForKey:22LL]);
-  XCTAssertEqualObjects([dict objectForKey:23LL], @"ghi");
-  XCTAssertEqualObjects([dict objectForKey:24LL], @"jkl");
-
-  // Remove again does nothing.
-  [dict removeObjectForKey:22LL];
-  XCTAssertEqual(dict.count, 3U);
-  XCTAssertEqualObjects([dict objectForKey:21LL], @"abc");
-  XCTAssertNil([dict objectForKey:22LL]);
-  XCTAssertEqualObjects([dict objectForKey:23LL], @"ghi");
-  XCTAssertEqualObjects([dict objectForKey:24LL], @"jkl");
-
-  [dict removeObjectForKey:24LL];
-  XCTAssertEqual(dict.count, 2U);
-  XCTAssertEqualObjects([dict objectForKey:21LL], @"abc");
-  XCTAssertNil([dict objectForKey:22LL]);
-  XCTAssertEqualObjects([dict objectForKey:23LL], @"ghi");
-  XCTAssertNil([dict objectForKey:24LL]);
-
-  [dict removeAll];
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertNil([dict objectForKey:21LL]);
-  XCTAssertNil([dict objectForKey:22LL]);
-  XCTAssertNil([dict objectForKey:23LL]);
-  XCTAssertNil([dict objectForKey:24LL]);
-  [dict release];
-}
-
-- (void)testInplaceMutation {
-  const int64_t kKeys[] = { 21LL, 22LL, 23LL, 24LL };
-  const NSString* kObjects[] = { @"abc", @"def", @"ghi", @"jkl" };
-  GPBInt64ObjectDictionary<NSString*> *dict =
-      [[GPBInt64ObjectDictionary alloc] initWithObjects:kObjects
-                                                forKeys:kKeys
-                                                  count:GPBARRAYSIZE(kObjects)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertEqualObjects([dict objectForKey:21LL], @"abc");
-  XCTAssertEqualObjects([dict objectForKey:22LL], @"def");
-  XCTAssertEqualObjects([dict objectForKey:23LL], @"ghi");
-  XCTAssertEqualObjects([dict objectForKey:24LL], @"jkl");
-
-  [dict setObject:@"jkl" forKey:21LL];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertEqualObjects([dict objectForKey:21LL], @"jkl");
-  XCTAssertEqualObjects([dict objectForKey:22LL], @"def");
-  XCTAssertEqualObjects([dict objectForKey:23LL], @"ghi");
-  XCTAssertEqualObjects([dict objectForKey:24LL], @"jkl");
-
-  [dict setObject:@"def" forKey:24LL];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertEqualObjects([dict objectForKey:21LL], @"jkl");
-  XCTAssertEqualObjects([dict objectForKey:22LL], @"def");
-  XCTAssertEqualObjects([dict objectForKey:23LL], @"ghi");
-  XCTAssertEqualObjects([dict objectForKey:24LL], @"def");
-
-  const int64_t kKeys2[] = { 22LL, 23LL };
-  const NSString* kObjects2[] = { @"ghi", @"abc" };
-  GPBInt64ObjectDictionary<NSString*> *dict2 =
-      [[GPBInt64ObjectDictionary alloc] initWithObjects:kObjects2
-                                                forKeys:kKeys2
-                                                  count:GPBARRAYSIZE(kObjects2)];
-  XCTAssertNotNil(dict2);
-  [dict addEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertEqualObjects([dict objectForKey:21LL], @"jkl");
-  XCTAssertEqualObjects([dict objectForKey:22LL], @"ghi");
-  XCTAssertEqualObjects([dict objectForKey:23LL], @"abc");
-  XCTAssertEqualObjects([dict objectForKey:24LL], @"def");
-
-  [dict2 release];
-  [dict release];
-}
-
-@end
-
-// clang-format on
-//%PDDM-EXPAND-END TEST_FOR_POD_KEY(Int64, int64_t, 21LL, 22LL, 23LL, 24LL)
-
diff --git a/libs/protobuf/objectivec/Tests/GPBDictionaryTests+String.m b/libs/protobuf/objectivec/Tests/GPBDictionaryTests+String.m
deleted file mode 100644
index 8ad1cea..0000000
--- a/libs/protobuf/objectivec/Tests/GPBDictionaryTests+String.m
+++ /dev/null
@@ -1,3386 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#import <Foundation/Foundation.h>
-#import <XCTest/XCTest.h>
-
-#import "GPBDictionary.h"
-
-#import "GPBTestUtilities.h"
-#import "google/protobuf/UnittestRuntimeProto2.pbobjc.h"
-
-// Pull in the macros (using an external file because expanding all tests
-// in a single file makes a file that is failing to work with within Xcode.
-//%PDDM-IMPORT-DEFINES GPBDictionaryTests.pddm
-
-//%PDDM-EXPAND TESTS_FOR_POD_VALUES(String, NSString, *, Objects, @"foo", @"bar", @"baz", @"mumble")
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-// To let the testing macros work, add some extra methods to simplify things.
-@interface GPBStringEnumDictionary (TestingTweak)
-- (instancetype)initWithEnums:(const int32_t [])values
-                      forKeys:(const NSString * [])keys
-                        count:(NSUInteger)count;
-@end
-
-static BOOL TestingEnum_IsValidValue(int32_t value) {
-  switch (value) {
-    case 700:
-    case 701:
-    case 702:
-    case 703:
-      return YES;
-    default:
-      return NO;
-  }
-}
-
-@implementation GPBStringEnumDictionary (TestingTweak)
-- (instancetype)initWithEnums:(const int32_t [])values
-                      forKeys:(const NSString * [])keys
-                        count:(NSUInteger)count {
-  return [self initWithValidationFunction:TestingEnum_IsValidValue
-                                rawValues:values
-                                  forKeys:keys
-                                    count:count];
-}
-@end
-
-
-#pragma mark - String -> UInt32
-
-@interface GPBStringUInt32DictionaryTests : XCTestCase
-@end
-
-@implementation GPBStringUInt32DictionaryTests
-
-- (void)testEmpty {
-  GPBStringUInt32Dictionary *dict = [[GPBStringUInt32Dictionary alloc] init];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertFalse([dict getUInt32:NULL forKey:@"foo"]);
-  [dict enumerateKeysAndUInt32sUsingBlock:^(NSString *aKey, uint32_t aValue, BOOL *stop) {
-    #pragma unused(aKey, aValue, stop)
-    XCTFail(@"Shouldn't get here!");
-  }];
-  [dict release];
-}
-
-- (void)testOne {
-  GPBStringUInt32Dictionary *dict = [[GPBStringUInt32Dictionary alloc] init];
-  [dict setUInt32:100U forKey:@"foo"];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 1U);
-  uint32_t value;
-  XCTAssertTrue([dict getUInt32:NULL forKey:@"foo"]);
-  XCTAssertTrue([dict getUInt32:&value forKey:@"foo"]);
-  XCTAssertEqual(value, 100U);
-  XCTAssertFalse([dict getUInt32:NULL forKey:@"bar"]);
-  [dict enumerateKeysAndUInt32sUsingBlock:^(NSString *aKey, uint32_t aValue, BOOL *stop) {
-    XCTAssertEqualObjects(aKey, @"foo");
-    XCTAssertEqual(aValue, 100U);
-    XCTAssertNotEqual(stop, NULL);
-  }];
-  [dict release];
-}
-
-- (void)testBasics {
-  const NSString *kKeys[] = { @"foo", @"bar", @"baz" };
-  const uint32_t kValues[] = { 100U, 101U, 102U };
-  GPBStringUInt32Dictionary *dict =
-      [[GPBStringUInt32Dictionary alloc] initWithUInt32s:kValues
-                                                 forKeys:kKeys
-                                                   count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 3U);
-  uint32_t value;
-  XCTAssertTrue([dict getUInt32:NULL forKey:@"foo"]);
-  XCTAssertTrue([dict getUInt32:&value forKey:@"foo"]);
-  XCTAssertEqual(value, 100U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:@"bar"]);
-  XCTAssertTrue([dict getUInt32:&value forKey:@"bar"]);
-  XCTAssertEqual(value, 101U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:@"baz"]);
-  XCTAssertTrue([dict getUInt32:&value forKey:@"baz"]);
-  XCTAssertEqual(value, 102U);
-  XCTAssertFalse([dict getUInt32:NULL forKey:@"mumble"]);
-
-  __block NSUInteger idx = 0;
-  NSString **seenKeys = malloc(3 * sizeof(NSString*));
-  uint32_t *seenValues = malloc(3 * sizeof(uint32_t));
-  [dict enumerateKeysAndUInt32sUsingBlock:^(NSString *aKey, uint32_t aValue, BOOL *stop) {
-    XCTAssertLessThan(idx, 3U);
-    seenKeys[idx] = aKey;
-    seenValues[idx] = aValue;
-    XCTAssertNotEqual(stop, NULL);
-    ++idx;
-  }];
-  for (int i = 0; i < 3; ++i) {
-    BOOL foundKey = NO;
-    for (int j = 0; (j < 3) && !foundKey; ++j) {
-      if ([kKeys[i] isEqual:seenKeys[j]]) {
-        foundKey = YES;
-        XCTAssertEqual(kValues[i], seenValues[j], @"i = %d, j = %d", i, j);
-      }
-    }
-    XCTAssertTrue(foundKey, @"i = %d", i);
-  }
-  free(seenKeys);
-  free(seenValues);
-
-  // Stopping the enumeration.
-  idx = 0;
-  [dict enumerateKeysAndUInt32sUsingBlock:^(NSString *aKey, uint32_t aValue, BOOL *stop) {
-    #pragma unused(aKey, aValue)
-    if (idx == 1) *stop = YES;
-    XCTAssertNotEqual(idx, 2U);
-    ++idx;
-  }];
-  [dict release];
-}
-
-- (void)testEquality {
-  const NSString *kKeys1[] = { @"foo", @"bar", @"baz", @"mumble" };
-  const NSString *kKeys2[] = { @"bar", @"foo", @"mumble" };
-  const uint32_t kValues1[] = { 100U, 101U, 102U };
-  const uint32_t kValues2[] = { 100U, 103U, 102U };
-  const uint32_t kValues3[] = { 100U, 101U, 102U, 103U };
-  GPBStringUInt32Dictionary *dict1 =
-      [[GPBStringUInt32Dictionary alloc] initWithUInt32s:kValues1
-                                                 forKeys:kKeys1
-                                                   count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict1);
-  GPBStringUInt32Dictionary *dict1prime =
-      [[GPBStringUInt32Dictionary alloc] initWithUInt32s:kValues1
-                                                 forKeys:kKeys1
-                                                   count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict1prime);
-  GPBStringUInt32Dictionary *dict2 =
-      [[GPBStringUInt32Dictionary alloc] initWithUInt32s:kValues2
-                                                 forKeys:kKeys1
-                                                   count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(dict2);
-  GPBStringUInt32Dictionary *dict3 =
-      [[GPBStringUInt32Dictionary alloc] initWithUInt32s:kValues1
-                                                 forKeys:kKeys2
-                                                   count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict3);
-  GPBStringUInt32Dictionary *dict4 =
-      [[GPBStringUInt32Dictionary alloc] initWithUInt32s:kValues3
-                                                 forKeys:kKeys1
-                                                   count:GPBARRAYSIZE(kValues3)];
-  XCTAssertNotNil(dict4);
-
-  // 1/1Prime should be different objects, but equal.
-  XCTAssertNotEqual(dict1, dict1prime);
-  XCTAssertEqualObjects(dict1, dict1prime);
-  // Equal, so they must have same hash.
-  XCTAssertEqual([dict1 hash], [dict1prime hash]);
-
-  // 2 is same keys, different values; not equal.
-  XCTAssertNotEqualObjects(dict1, dict2);
-
-  // 3 is different keys, same values; not equal.
-  XCTAssertNotEqualObjects(dict1, dict3);
-
-  // 4 extra pair; not equal
-  XCTAssertNotEqualObjects(dict1, dict4);
-
-  [dict1 release];
-  [dict1prime release];
-  [dict2 release];
-  [dict3 release];
-  [dict4 release];
-}
-
-- (void)testCopy {
-  const NSString *kKeys[] = { @"foo", @"bar", @"baz", @"mumble" };
-  const uint32_t kValues[] = { 100U, 101U, 102U, 103U };
-  GPBStringUInt32Dictionary *dict =
-      [[GPBStringUInt32Dictionary alloc] initWithUInt32s:kValues
-                                                 forKeys:kKeys
-                                                   count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-
-  GPBStringUInt32Dictionary *dict2 = [dict copy];
-  XCTAssertNotNil(dict2);
-
-  // Should be new object but equal.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  XCTAssertTrue([dict2 isKindOfClass:[GPBStringUInt32Dictionary class]]);
-
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testDictionaryFromDictionary {
-  const NSString *kKeys[] = { @"foo", @"bar", @"baz", @"mumble" };
-  const uint32_t kValues[] = { 100U, 101U, 102U, 103U };
-  GPBStringUInt32Dictionary *dict =
-      [[GPBStringUInt32Dictionary alloc] initWithUInt32s:kValues
-                                                 forKeys:kKeys
-                                                   count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-
-  GPBStringUInt32Dictionary *dict2 =
-      [[GPBStringUInt32Dictionary alloc] initWithDictionary:dict];
-  XCTAssertNotNil(dict2);
-
-  // Should be new pointer, but equal objects.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testAdds {
-  GPBStringUInt32Dictionary *dict = [[GPBStringUInt32Dictionary alloc] init];
-  XCTAssertNotNil(dict);
-
-  XCTAssertEqual(dict.count, 0U);
-  [dict setUInt32:100U forKey:@"foo"];
-  XCTAssertEqual(dict.count, 1U);
-
-  const NSString *kKeys[] = { @"bar", @"baz", @"mumble" };
-  const uint32_t kValues[] = { 101U, 102U, 103U };
-  GPBStringUInt32Dictionary *dict2 =
-      [[GPBStringUInt32Dictionary alloc] initWithUInt32s:kValues
-                                                 forKeys:kKeys
-                                                   count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict2);
-  [dict addEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 4U);
-
-  uint32_t value;
-  XCTAssertTrue([dict getUInt32:NULL forKey:@"foo"]);
-  XCTAssertTrue([dict getUInt32:&value forKey:@"foo"]);
-  XCTAssertEqual(value, 100U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:@"bar"]);
-  XCTAssertTrue([dict getUInt32:&value forKey:@"bar"]);
-  XCTAssertEqual(value, 101U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:@"baz"]);
-  XCTAssertTrue([dict getUInt32:&value forKey:@"baz"]);
-  XCTAssertEqual(value, 102U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:@"mumble"]);
-  XCTAssertTrue([dict getUInt32:&value forKey:@"mumble"]);
-  XCTAssertEqual(value, 103U);
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testRemove {
-  const NSString *kKeys[] = { @"foo", @"bar", @"baz", @"mumble" };
-  const uint32_t kValues[] = { 100U, 101U, 102U, 103U };
-  GPBStringUInt32Dictionary *dict =
-      [[GPBStringUInt32Dictionary alloc] initWithUInt32s:kValues
-                                                 forKeys:kKeys
-                                                   count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 4U);
-
-  [dict removeUInt32ForKey:@"bar"];
-  XCTAssertEqual(dict.count, 3U);
-  uint32_t value;
-  XCTAssertTrue([dict getUInt32:NULL forKey:@"foo"]);
-  XCTAssertTrue([dict getUInt32:&value forKey:@"foo"]);
-  XCTAssertEqual(value, 100U);
-  XCTAssertFalse([dict getUInt32:NULL forKey:@"bar"]);
-  XCTAssertTrue([dict getUInt32:NULL forKey:@"baz"]);
-  XCTAssertTrue([dict getUInt32:&value forKey:@"baz"]);
-  XCTAssertEqual(value, 102U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:@"mumble"]);
-  XCTAssertTrue([dict getUInt32:&value forKey:@"mumble"]);
-  XCTAssertEqual(value, 103U);
-
-  // Remove again does nothing.
-  [dict removeUInt32ForKey:@"bar"];
-  XCTAssertEqual(dict.count, 3U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:@"foo"]);
-  XCTAssertTrue([dict getUInt32:&value forKey:@"foo"]);
-  XCTAssertEqual(value, 100U);
-  XCTAssertFalse([dict getUInt32:NULL forKey:@"bar"]);
-  XCTAssertTrue([dict getUInt32:NULL forKey:@"baz"]);
-  XCTAssertTrue([dict getUInt32:&value forKey:@"baz"]);
-  XCTAssertEqual(value, 102U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:@"mumble"]);
-  XCTAssertTrue([dict getUInt32:&value forKey:@"mumble"]);
-  XCTAssertEqual(value, 103U);
-
-  [dict removeUInt32ForKey:@"mumble"];
-  XCTAssertEqual(dict.count, 2U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:@"foo"]);
-  XCTAssertTrue([dict getUInt32:&value forKey:@"foo"]);
-  XCTAssertEqual(value, 100U);
-  XCTAssertFalse([dict getUInt32:NULL forKey:@"bar"]);
-  XCTAssertTrue([dict getUInt32:NULL forKey:@"baz"]);
-  XCTAssertTrue([dict getUInt32:&value forKey:@"baz"]);
-  XCTAssertEqual(value, 102U);
-  XCTAssertFalse([dict getUInt32:NULL forKey:@"mumble"]);
-
-  [dict removeAll];
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertFalse([dict getUInt32:NULL forKey:@"foo"]);
-  XCTAssertFalse([dict getUInt32:NULL forKey:@"bar"]);
-  XCTAssertFalse([dict getUInt32:NULL forKey:@"baz"]);
-  XCTAssertFalse([dict getUInt32:NULL forKey:@"mumble"]);
-  [dict release];
-}
-
-- (void)testInplaceMutation {
-  const NSString *kKeys[] = { @"foo", @"bar", @"baz", @"mumble" };
-  const uint32_t kValues[] = { 100U, 101U, 102U, 103U };
-  GPBStringUInt32Dictionary *dict =
-      [[GPBStringUInt32Dictionary alloc] initWithUInt32s:kValues
-                                                 forKeys:kKeys
-                                                   count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 4U);
-  uint32_t value;
-  XCTAssertTrue([dict getUInt32:NULL forKey:@"foo"]);
-  XCTAssertTrue([dict getUInt32:&value forKey:@"foo"]);
-  XCTAssertEqual(value, 100U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:@"bar"]);
-  XCTAssertTrue([dict getUInt32:&value forKey:@"bar"]);
-  XCTAssertEqual(value, 101U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:@"baz"]);
-  XCTAssertTrue([dict getUInt32:&value forKey:@"baz"]);
-  XCTAssertEqual(value, 102U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:@"mumble"]);
-  XCTAssertTrue([dict getUInt32:&value forKey:@"mumble"]);
-  XCTAssertEqual(value, 103U);
-
-  [dict setUInt32:103U forKey:@"foo"];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:@"foo"]);
-  XCTAssertTrue([dict getUInt32:&value forKey:@"foo"]);
-  XCTAssertEqual(value, 103U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:@"bar"]);
-  XCTAssertTrue([dict getUInt32:&value forKey:@"bar"]);
-  XCTAssertEqual(value, 101U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:@"baz"]);
-  XCTAssertTrue([dict getUInt32:&value forKey:@"baz"]);
-  XCTAssertEqual(value, 102U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:@"mumble"]);
-  XCTAssertTrue([dict getUInt32:&value forKey:@"mumble"]);
-  XCTAssertEqual(value, 103U);
-
-  [dict setUInt32:101U forKey:@"mumble"];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:@"foo"]);
-  XCTAssertTrue([dict getUInt32:&value forKey:@"foo"]);
-  XCTAssertEqual(value, 103U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:@"bar"]);
-  XCTAssertTrue([dict getUInt32:&value forKey:@"bar"]);
-  XCTAssertEqual(value, 101U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:@"baz"]);
-  XCTAssertTrue([dict getUInt32:&value forKey:@"baz"]);
-  XCTAssertEqual(value, 102U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:@"mumble"]);
-  XCTAssertTrue([dict getUInt32:&value forKey:@"mumble"]);
-  XCTAssertEqual(value, 101U);
-
-  const NSString *kKeys2[] = { @"bar", @"baz" };
-  const uint32_t kValues2[] = { 102U, 100U };
-  GPBStringUInt32Dictionary *dict2 =
-      [[GPBStringUInt32Dictionary alloc] initWithUInt32s:kValues2
-                                                 forKeys:kKeys2
-                                                   count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(dict2);
-  [dict addEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:@"foo"]);
-  XCTAssertTrue([dict getUInt32:&value forKey:@"foo"]);
-  XCTAssertEqual(value, 103U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:@"bar"]);
-  XCTAssertTrue([dict getUInt32:&value forKey:@"bar"]);
-  XCTAssertEqual(value, 102U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:@"baz"]);
-  XCTAssertTrue([dict getUInt32:&value forKey:@"baz"]);
-  XCTAssertEqual(value, 100U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:@"mumble"]);
-  XCTAssertTrue([dict getUInt32:&value forKey:@"mumble"]);
-  XCTAssertEqual(value, 101U);
-
-  [dict2 release];
-  [dict release];
-}
-
-@end
-
-#pragma mark - String -> Int32
-
-@interface GPBStringInt32DictionaryTests : XCTestCase
-@end
-
-@implementation GPBStringInt32DictionaryTests
-
-- (void)testEmpty {
-  GPBStringInt32Dictionary *dict = [[GPBStringInt32Dictionary alloc] init];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertFalse([dict getInt32:NULL forKey:@"foo"]);
-  [dict enumerateKeysAndInt32sUsingBlock:^(NSString *aKey, int32_t aValue, BOOL *stop) {
-    #pragma unused(aKey, aValue, stop)
-    XCTFail(@"Shouldn't get here!");
-  }];
-  [dict release];
-}
-
-- (void)testOne {
-  GPBStringInt32Dictionary *dict = [[GPBStringInt32Dictionary alloc] init];
-  [dict setInt32:200 forKey:@"foo"];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 1U);
-  int32_t value;
-  XCTAssertTrue([dict getInt32:NULL forKey:@"foo"]);
-  XCTAssertTrue([dict getInt32:&value forKey:@"foo"]);
-  XCTAssertEqual(value, 200);
-  XCTAssertFalse([dict getInt32:NULL forKey:@"bar"]);
-  [dict enumerateKeysAndInt32sUsingBlock:^(NSString *aKey, int32_t aValue, BOOL *stop) {
-    XCTAssertEqualObjects(aKey, @"foo");
-    XCTAssertEqual(aValue, 200);
-    XCTAssertNotEqual(stop, NULL);
-  }];
-  [dict release];
-}
-
-- (void)testBasics {
-  const NSString *kKeys[] = { @"foo", @"bar", @"baz" };
-  const int32_t kValues[] = { 200, 201, 202 };
-  GPBStringInt32Dictionary *dict =
-      [[GPBStringInt32Dictionary alloc] initWithInt32s:kValues
-                                               forKeys:kKeys
-                                                 count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 3U);
-  int32_t value;
-  XCTAssertTrue([dict getInt32:NULL forKey:@"foo"]);
-  XCTAssertTrue([dict getInt32:&value forKey:@"foo"]);
-  XCTAssertEqual(value, 200);
-  XCTAssertTrue([dict getInt32:NULL forKey:@"bar"]);
-  XCTAssertTrue([dict getInt32:&value forKey:@"bar"]);
-  XCTAssertEqual(value, 201);
-  XCTAssertTrue([dict getInt32:NULL forKey:@"baz"]);
-  XCTAssertTrue([dict getInt32:&value forKey:@"baz"]);
-  XCTAssertEqual(value, 202);
-  XCTAssertFalse([dict getInt32:NULL forKey:@"mumble"]);
-
-  __block NSUInteger idx = 0;
-  NSString **seenKeys = malloc(3 * sizeof(NSString*));
-  int32_t *seenValues = malloc(3 * sizeof(int32_t));
-  [dict enumerateKeysAndInt32sUsingBlock:^(NSString *aKey, int32_t aValue, BOOL *stop) {
-    XCTAssertLessThan(idx, 3U);
-    seenKeys[idx] = aKey;
-    seenValues[idx] = aValue;
-    XCTAssertNotEqual(stop, NULL);
-    ++idx;
-  }];
-  for (int i = 0; i < 3; ++i) {
-    BOOL foundKey = NO;
-    for (int j = 0; (j < 3) && !foundKey; ++j) {
-      if ([kKeys[i] isEqual:seenKeys[j]]) {
-        foundKey = YES;
-        XCTAssertEqual(kValues[i], seenValues[j], @"i = %d, j = %d", i, j);
-      }
-    }
-    XCTAssertTrue(foundKey, @"i = %d", i);
-  }
-  free(seenKeys);
-  free(seenValues);
-
-  // Stopping the enumeration.
-  idx = 0;
-  [dict enumerateKeysAndInt32sUsingBlock:^(NSString *aKey, int32_t aValue, BOOL *stop) {
-    #pragma unused(aKey, aValue)
-    if (idx == 1) *stop = YES;
-    XCTAssertNotEqual(idx, 2U);
-    ++idx;
-  }];
-  [dict release];
-}
-
-- (void)testEquality {
-  const NSString *kKeys1[] = { @"foo", @"bar", @"baz", @"mumble" };
-  const NSString *kKeys2[] = { @"bar", @"foo", @"mumble" };
-  const int32_t kValues1[] = { 200, 201, 202 };
-  const int32_t kValues2[] = { 200, 203, 202 };
-  const int32_t kValues3[] = { 200, 201, 202, 203 };
-  GPBStringInt32Dictionary *dict1 =
-      [[GPBStringInt32Dictionary alloc] initWithInt32s:kValues1
-                                               forKeys:kKeys1
-                                                 count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict1);
-  GPBStringInt32Dictionary *dict1prime =
-      [[GPBStringInt32Dictionary alloc] initWithInt32s:kValues1
-                                               forKeys:kKeys1
-                                                 count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict1prime);
-  GPBStringInt32Dictionary *dict2 =
-      [[GPBStringInt32Dictionary alloc] initWithInt32s:kValues2
-                                               forKeys:kKeys1
-                                                 count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(dict2);
-  GPBStringInt32Dictionary *dict3 =
-      [[GPBStringInt32Dictionary alloc] initWithInt32s:kValues1
-                                               forKeys:kKeys2
-                                                 count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict3);
-  GPBStringInt32Dictionary *dict4 =
-      [[GPBStringInt32Dictionary alloc] initWithInt32s:kValues3
-                                               forKeys:kKeys1
-                                                 count:GPBARRAYSIZE(kValues3)];
-  XCTAssertNotNil(dict4);
-
-  // 1/1Prime should be different objects, but equal.
-  XCTAssertNotEqual(dict1, dict1prime);
-  XCTAssertEqualObjects(dict1, dict1prime);
-  // Equal, so they must have same hash.
-  XCTAssertEqual([dict1 hash], [dict1prime hash]);
-
-  // 2 is same keys, different values; not equal.
-  XCTAssertNotEqualObjects(dict1, dict2);
-
-  // 3 is different keys, same values; not equal.
-  XCTAssertNotEqualObjects(dict1, dict3);
-
-  // 4 extra pair; not equal
-  XCTAssertNotEqualObjects(dict1, dict4);
-
-  [dict1 release];
-  [dict1prime release];
-  [dict2 release];
-  [dict3 release];
-  [dict4 release];
-}
-
-- (void)testCopy {
-  const NSString *kKeys[] = { @"foo", @"bar", @"baz", @"mumble" };
-  const int32_t kValues[] = { 200, 201, 202, 203 };
-  GPBStringInt32Dictionary *dict =
-      [[GPBStringInt32Dictionary alloc] initWithInt32s:kValues
-                                               forKeys:kKeys
-                                                 count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-
-  GPBStringInt32Dictionary *dict2 = [dict copy];
-  XCTAssertNotNil(dict2);
-
-  // Should be new object but equal.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  XCTAssertTrue([dict2 isKindOfClass:[GPBStringInt32Dictionary class]]);
-
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testDictionaryFromDictionary {
-  const NSString *kKeys[] = { @"foo", @"bar", @"baz", @"mumble" };
-  const int32_t kValues[] = { 200, 201, 202, 203 };
-  GPBStringInt32Dictionary *dict =
-      [[GPBStringInt32Dictionary alloc] initWithInt32s:kValues
-                                               forKeys:kKeys
-                                                 count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-
-  GPBStringInt32Dictionary *dict2 =
-      [[GPBStringInt32Dictionary alloc] initWithDictionary:dict];
-  XCTAssertNotNil(dict2);
-
-  // Should be new pointer, but equal objects.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testAdds {
-  GPBStringInt32Dictionary *dict = [[GPBStringInt32Dictionary alloc] init];
-  XCTAssertNotNil(dict);
-
-  XCTAssertEqual(dict.count, 0U);
-  [dict setInt32:200 forKey:@"foo"];
-  XCTAssertEqual(dict.count, 1U);
-
-  const NSString *kKeys[] = { @"bar", @"baz", @"mumble" };
-  const int32_t kValues[] = { 201, 202, 203 };
-  GPBStringInt32Dictionary *dict2 =
-      [[GPBStringInt32Dictionary alloc] initWithInt32s:kValues
-                                               forKeys:kKeys
-                                                 count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict2);
-  [dict addEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 4U);
-
-  int32_t value;
-  XCTAssertTrue([dict getInt32:NULL forKey:@"foo"]);
-  XCTAssertTrue([dict getInt32:&value forKey:@"foo"]);
-  XCTAssertEqual(value, 200);
-  XCTAssertTrue([dict getInt32:NULL forKey:@"bar"]);
-  XCTAssertTrue([dict getInt32:&value forKey:@"bar"]);
-  XCTAssertEqual(value, 201);
-  XCTAssertTrue([dict getInt32:NULL forKey:@"baz"]);
-  XCTAssertTrue([dict getInt32:&value forKey:@"baz"]);
-  XCTAssertEqual(value, 202);
-  XCTAssertTrue([dict getInt32:NULL forKey:@"mumble"]);
-  XCTAssertTrue([dict getInt32:&value forKey:@"mumble"]);
-  XCTAssertEqual(value, 203);
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testRemove {
-  const NSString *kKeys[] = { @"foo", @"bar", @"baz", @"mumble" };
-  const int32_t kValues[] = { 200, 201, 202, 203 };
-  GPBStringInt32Dictionary *dict =
-      [[GPBStringInt32Dictionary alloc] initWithInt32s:kValues
-                                               forKeys:kKeys
-                                                 count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 4U);
-
-  [dict removeInt32ForKey:@"bar"];
-  XCTAssertEqual(dict.count, 3U);
-  int32_t value;
-  XCTAssertTrue([dict getInt32:NULL forKey:@"foo"]);
-  XCTAssertTrue([dict getInt32:&value forKey:@"foo"]);
-  XCTAssertEqual(value, 200);
-  XCTAssertFalse([dict getInt32:NULL forKey:@"bar"]);
-  XCTAssertTrue([dict getInt32:NULL forKey:@"baz"]);
-  XCTAssertTrue([dict getInt32:&value forKey:@"baz"]);
-  XCTAssertEqual(value, 202);
-  XCTAssertTrue([dict getInt32:NULL forKey:@"mumble"]);
-  XCTAssertTrue([dict getInt32:&value forKey:@"mumble"]);
-  XCTAssertEqual(value, 203);
-
-  // Remove again does nothing.
-  [dict removeInt32ForKey:@"bar"];
-  XCTAssertEqual(dict.count, 3U);
-  XCTAssertTrue([dict getInt32:NULL forKey:@"foo"]);
-  XCTAssertTrue([dict getInt32:&value forKey:@"foo"]);
-  XCTAssertEqual(value, 200);
-  XCTAssertFalse([dict getInt32:NULL forKey:@"bar"]);
-  XCTAssertTrue([dict getInt32:NULL forKey:@"baz"]);
-  XCTAssertTrue([dict getInt32:&value forKey:@"baz"]);
-  XCTAssertEqual(value, 202);
-  XCTAssertTrue([dict getInt32:NULL forKey:@"mumble"]);
-  XCTAssertTrue([dict getInt32:&value forKey:@"mumble"]);
-  XCTAssertEqual(value, 203);
-
-  [dict removeInt32ForKey:@"mumble"];
-  XCTAssertEqual(dict.count, 2U);
-  XCTAssertTrue([dict getInt32:NULL forKey:@"foo"]);
-  XCTAssertTrue([dict getInt32:&value forKey:@"foo"]);
-  XCTAssertEqual(value, 200);
-  XCTAssertFalse([dict getInt32:NULL forKey:@"bar"]);
-  XCTAssertTrue([dict getInt32:NULL forKey:@"baz"]);
-  XCTAssertTrue([dict getInt32:&value forKey:@"baz"]);
-  XCTAssertEqual(value, 202);
-  XCTAssertFalse([dict getInt32:NULL forKey:@"mumble"]);
-
-  [dict removeAll];
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertFalse([dict getInt32:NULL forKey:@"foo"]);
-  XCTAssertFalse([dict getInt32:NULL forKey:@"bar"]);
-  XCTAssertFalse([dict getInt32:NULL forKey:@"baz"]);
-  XCTAssertFalse([dict getInt32:NULL forKey:@"mumble"]);
-  [dict release];
-}
-
-- (void)testInplaceMutation {
-  const NSString *kKeys[] = { @"foo", @"bar", @"baz", @"mumble" };
-  const int32_t kValues[] = { 200, 201, 202, 203 };
-  GPBStringInt32Dictionary *dict =
-      [[GPBStringInt32Dictionary alloc] initWithInt32s:kValues
-                                               forKeys:kKeys
-                                                 count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 4U);
-  int32_t value;
-  XCTAssertTrue([dict getInt32:NULL forKey:@"foo"]);
-  XCTAssertTrue([dict getInt32:&value forKey:@"foo"]);
-  XCTAssertEqual(value, 200);
-  XCTAssertTrue([dict getInt32:NULL forKey:@"bar"]);
-  XCTAssertTrue([dict getInt32:&value forKey:@"bar"]);
-  XCTAssertEqual(value, 201);
-  XCTAssertTrue([dict getInt32:NULL forKey:@"baz"]);
-  XCTAssertTrue([dict getInt32:&value forKey:@"baz"]);
-  XCTAssertEqual(value, 202);
-  XCTAssertTrue([dict getInt32:NULL forKey:@"mumble"]);
-  XCTAssertTrue([dict getInt32:&value forKey:@"mumble"]);
-  XCTAssertEqual(value, 203);
-
-  [dict setInt32:203 forKey:@"foo"];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getInt32:NULL forKey:@"foo"]);
-  XCTAssertTrue([dict getInt32:&value forKey:@"foo"]);
-  XCTAssertEqual(value, 203);
-  XCTAssertTrue([dict getInt32:NULL forKey:@"bar"]);
-  XCTAssertTrue([dict getInt32:&value forKey:@"bar"]);
-  XCTAssertEqual(value, 201);
-  XCTAssertTrue([dict getInt32:NULL forKey:@"baz"]);
-  XCTAssertTrue([dict getInt32:&value forKey:@"baz"]);
-  XCTAssertEqual(value, 202);
-  XCTAssertTrue([dict getInt32:NULL forKey:@"mumble"]);
-  XCTAssertTrue([dict getInt32:&value forKey:@"mumble"]);
-  XCTAssertEqual(value, 203);
-
-  [dict setInt32:201 forKey:@"mumble"];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getInt32:NULL forKey:@"foo"]);
-  XCTAssertTrue([dict getInt32:&value forKey:@"foo"]);
-  XCTAssertEqual(value, 203);
-  XCTAssertTrue([dict getInt32:NULL forKey:@"bar"]);
-  XCTAssertTrue([dict getInt32:&value forKey:@"bar"]);
-  XCTAssertEqual(value, 201);
-  XCTAssertTrue([dict getInt32:NULL forKey:@"baz"]);
-  XCTAssertTrue([dict getInt32:&value forKey:@"baz"]);
-  XCTAssertEqual(value, 202);
-  XCTAssertTrue([dict getInt32:NULL forKey:@"mumble"]);
-  XCTAssertTrue([dict getInt32:&value forKey:@"mumble"]);
-  XCTAssertEqual(value, 201);
-
-  const NSString *kKeys2[] = { @"bar", @"baz" };
-  const int32_t kValues2[] = { 202, 200 };
-  GPBStringInt32Dictionary *dict2 =
-      [[GPBStringInt32Dictionary alloc] initWithInt32s:kValues2
-                                               forKeys:kKeys2
-                                                 count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(dict2);
-  [dict addEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getInt32:NULL forKey:@"foo"]);
-  XCTAssertTrue([dict getInt32:&value forKey:@"foo"]);
-  XCTAssertEqual(value, 203);
-  XCTAssertTrue([dict getInt32:NULL forKey:@"bar"]);
-  XCTAssertTrue([dict getInt32:&value forKey:@"bar"]);
-  XCTAssertEqual(value, 202);
-  XCTAssertTrue([dict getInt32:NULL forKey:@"baz"]);
-  XCTAssertTrue([dict getInt32:&value forKey:@"baz"]);
-  XCTAssertEqual(value, 200);
-  XCTAssertTrue([dict getInt32:NULL forKey:@"mumble"]);
-  XCTAssertTrue([dict getInt32:&value forKey:@"mumble"]);
-  XCTAssertEqual(value, 201);
-
-  [dict2 release];
-  [dict release];
-}
-
-@end
-
-#pragma mark - String -> UInt64
-
-@interface GPBStringUInt64DictionaryTests : XCTestCase
-@end
-
-@implementation GPBStringUInt64DictionaryTests
-
-- (void)testEmpty {
-  GPBStringUInt64Dictionary *dict = [[GPBStringUInt64Dictionary alloc] init];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertFalse([dict getUInt64:NULL forKey:@"foo"]);
-  [dict enumerateKeysAndUInt64sUsingBlock:^(NSString *aKey, uint64_t aValue, BOOL *stop) {
-    #pragma unused(aKey, aValue, stop)
-    XCTFail(@"Shouldn't get here!");
-  }];
-  [dict release];
-}
-
-- (void)testOne {
-  GPBStringUInt64Dictionary *dict = [[GPBStringUInt64Dictionary alloc] init];
-  [dict setUInt64:300U forKey:@"foo"];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 1U);
-  uint64_t value;
-  XCTAssertTrue([dict getUInt64:NULL forKey:@"foo"]);
-  XCTAssertTrue([dict getUInt64:&value forKey:@"foo"]);
-  XCTAssertEqual(value, 300U);
-  XCTAssertFalse([dict getUInt64:NULL forKey:@"bar"]);
-  [dict enumerateKeysAndUInt64sUsingBlock:^(NSString *aKey, uint64_t aValue, BOOL *stop) {
-    XCTAssertEqualObjects(aKey, @"foo");
-    XCTAssertEqual(aValue, 300U);
-    XCTAssertNotEqual(stop, NULL);
-  }];
-  [dict release];
-}
-
-- (void)testBasics {
-  const NSString *kKeys[] = { @"foo", @"bar", @"baz" };
-  const uint64_t kValues[] = { 300U, 301U, 302U };
-  GPBStringUInt64Dictionary *dict =
-      [[GPBStringUInt64Dictionary alloc] initWithUInt64s:kValues
-                                                 forKeys:kKeys
-                                                   count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 3U);
-  uint64_t value;
-  XCTAssertTrue([dict getUInt64:NULL forKey:@"foo"]);
-  XCTAssertTrue([dict getUInt64:&value forKey:@"foo"]);
-  XCTAssertEqual(value, 300U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:@"bar"]);
-  XCTAssertTrue([dict getUInt64:&value forKey:@"bar"]);
-  XCTAssertEqual(value, 301U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:@"baz"]);
-  XCTAssertTrue([dict getUInt64:&value forKey:@"baz"]);
-  XCTAssertEqual(value, 302U);
-  XCTAssertFalse([dict getUInt64:NULL forKey:@"mumble"]);
-
-  __block NSUInteger idx = 0;
-  NSString **seenKeys = malloc(3 * sizeof(NSString*));
-  uint64_t *seenValues = malloc(3 * sizeof(uint64_t));
-  [dict enumerateKeysAndUInt64sUsingBlock:^(NSString *aKey, uint64_t aValue, BOOL *stop) {
-    XCTAssertLessThan(idx, 3U);
-    seenKeys[idx] = aKey;
-    seenValues[idx] = aValue;
-    XCTAssertNotEqual(stop, NULL);
-    ++idx;
-  }];
-  for (int i = 0; i < 3; ++i) {
-    BOOL foundKey = NO;
-    for (int j = 0; (j < 3) && !foundKey; ++j) {
-      if ([kKeys[i] isEqual:seenKeys[j]]) {
-        foundKey = YES;
-        XCTAssertEqual(kValues[i], seenValues[j], @"i = %d, j = %d", i, j);
-      }
-    }
-    XCTAssertTrue(foundKey, @"i = %d", i);
-  }
-  free(seenKeys);
-  free(seenValues);
-
-  // Stopping the enumeration.
-  idx = 0;
-  [dict enumerateKeysAndUInt64sUsingBlock:^(NSString *aKey, uint64_t aValue, BOOL *stop) {
-    #pragma unused(aKey, aValue)
-    if (idx == 1) *stop = YES;
-    XCTAssertNotEqual(idx, 2U);
-    ++idx;
-  }];
-  [dict release];
-}
-
-- (void)testEquality {
-  const NSString *kKeys1[] = { @"foo", @"bar", @"baz", @"mumble" };
-  const NSString *kKeys2[] = { @"bar", @"foo", @"mumble" };
-  const uint64_t kValues1[] = { 300U, 301U, 302U };
-  const uint64_t kValues2[] = { 300U, 303U, 302U };
-  const uint64_t kValues3[] = { 300U, 301U, 302U, 303U };
-  GPBStringUInt64Dictionary *dict1 =
-      [[GPBStringUInt64Dictionary alloc] initWithUInt64s:kValues1
-                                                 forKeys:kKeys1
-                                                   count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict1);
-  GPBStringUInt64Dictionary *dict1prime =
-      [[GPBStringUInt64Dictionary alloc] initWithUInt64s:kValues1
-                                                 forKeys:kKeys1
-                                                   count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict1prime);
-  GPBStringUInt64Dictionary *dict2 =
-      [[GPBStringUInt64Dictionary alloc] initWithUInt64s:kValues2
-                                                 forKeys:kKeys1
-                                                   count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(dict2);
-  GPBStringUInt64Dictionary *dict3 =
-      [[GPBStringUInt64Dictionary alloc] initWithUInt64s:kValues1
-                                                 forKeys:kKeys2
-                                                   count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict3);
-  GPBStringUInt64Dictionary *dict4 =
-      [[GPBStringUInt64Dictionary alloc] initWithUInt64s:kValues3
-                                                 forKeys:kKeys1
-                                                   count:GPBARRAYSIZE(kValues3)];
-  XCTAssertNotNil(dict4);
-
-  // 1/1Prime should be different objects, but equal.
-  XCTAssertNotEqual(dict1, dict1prime);
-  XCTAssertEqualObjects(dict1, dict1prime);
-  // Equal, so they must have same hash.
-  XCTAssertEqual([dict1 hash], [dict1prime hash]);
-
-  // 2 is same keys, different values; not equal.
-  XCTAssertNotEqualObjects(dict1, dict2);
-
-  // 3 is different keys, same values; not equal.
-  XCTAssertNotEqualObjects(dict1, dict3);
-
-  // 4 extra pair; not equal
-  XCTAssertNotEqualObjects(dict1, dict4);
-
-  [dict1 release];
-  [dict1prime release];
-  [dict2 release];
-  [dict3 release];
-  [dict4 release];
-}
-
-- (void)testCopy {
-  const NSString *kKeys[] = { @"foo", @"bar", @"baz", @"mumble" };
-  const uint64_t kValues[] = { 300U, 301U, 302U, 303U };
-  GPBStringUInt64Dictionary *dict =
-      [[GPBStringUInt64Dictionary alloc] initWithUInt64s:kValues
-                                                 forKeys:kKeys
-                                                   count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-
-  GPBStringUInt64Dictionary *dict2 = [dict copy];
-  XCTAssertNotNil(dict2);
-
-  // Should be new object but equal.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  XCTAssertTrue([dict2 isKindOfClass:[GPBStringUInt64Dictionary class]]);
-
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testDictionaryFromDictionary {
-  const NSString *kKeys[] = { @"foo", @"bar", @"baz", @"mumble" };
-  const uint64_t kValues[] = { 300U, 301U, 302U, 303U };
-  GPBStringUInt64Dictionary *dict =
-      [[GPBStringUInt64Dictionary alloc] initWithUInt64s:kValues
-                                                 forKeys:kKeys
-                                                   count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-
-  GPBStringUInt64Dictionary *dict2 =
-      [[GPBStringUInt64Dictionary alloc] initWithDictionary:dict];
-  XCTAssertNotNil(dict2);
-
-  // Should be new pointer, but equal objects.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testAdds {
-  GPBStringUInt64Dictionary *dict = [[GPBStringUInt64Dictionary alloc] init];
-  XCTAssertNotNil(dict);
-
-  XCTAssertEqual(dict.count, 0U);
-  [dict setUInt64:300U forKey:@"foo"];
-  XCTAssertEqual(dict.count, 1U);
-
-  const NSString *kKeys[] = { @"bar", @"baz", @"mumble" };
-  const uint64_t kValues[] = { 301U, 302U, 303U };
-  GPBStringUInt64Dictionary *dict2 =
-      [[GPBStringUInt64Dictionary alloc] initWithUInt64s:kValues
-                                                 forKeys:kKeys
-                                                   count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict2);
-  [dict addEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 4U);
-
-  uint64_t value;
-  XCTAssertTrue([dict getUInt64:NULL forKey:@"foo"]);
-  XCTAssertTrue([dict getUInt64:&value forKey:@"foo"]);
-  XCTAssertEqual(value, 300U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:@"bar"]);
-  XCTAssertTrue([dict getUInt64:&value forKey:@"bar"]);
-  XCTAssertEqual(value, 301U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:@"baz"]);
-  XCTAssertTrue([dict getUInt64:&value forKey:@"baz"]);
-  XCTAssertEqual(value, 302U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:@"mumble"]);
-  XCTAssertTrue([dict getUInt64:&value forKey:@"mumble"]);
-  XCTAssertEqual(value, 303U);
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testRemove {
-  const NSString *kKeys[] = { @"foo", @"bar", @"baz", @"mumble" };
-  const uint64_t kValues[] = { 300U, 301U, 302U, 303U };
-  GPBStringUInt64Dictionary *dict =
-      [[GPBStringUInt64Dictionary alloc] initWithUInt64s:kValues
-                                                 forKeys:kKeys
-                                                   count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 4U);
-
-  [dict removeUInt64ForKey:@"bar"];
-  XCTAssertEqual(dict.count, 3U);
-  uint64_t value;
-  XCTAssertTrue([dict getUInt64:NULL forKey:@"foo"]);
-  XCTAssertTrue([dict getUInt64:&value forKey:@"foo"]);
-  XCTAssertEqual(value, 300U);
-  XCTAssertFalse([dict getUInt64:NULL forKey:@"bar"]);
-  XCTAssertTrue([dict getUInt64:NULL forKey:@"baz"]);
-  XCTAssertTrue([dict getUInt64:&value forKey:@"baz"]);
-  XCTAssertEqual(value, 302U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:@"mumble"]);
-  XCTAssertTrue([dict getUInt64:&value forKey:@"mumble"]);
-  XCTAssertEqual(value, 303U);
-
-  // Remove again does nothing.
-  [dict removeUInt64ForKey:@"bar"];
-  XCTAssertEqual(dict.count, 3U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:@"foo"]);
-  XCTAssertTrue([dict getUInt64:&value forKey:@"foo"]);
-  XCTAssertEqual(value, 300U);
-  XCTAssertFalse([dict getUInt64:NULL forKey:@"bar"]);
-  XCTAssertTrue([dict getUInt64:NULL forKey:@"baz"]);
-  XCTAssertTrue([dict getUInt64:&value forKey:@"baz"]);
-  XCTAssertEqual(value, 302U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:@"mumble"]);
-  XCTAssertTrue([dict getUInt64:&value forKey:@"mumble"]);
-  XCTAssertEqual(value, 303U);
-
-  [dict removeUInt64ForKey:@"mumble"];
-  XCTAssertEqual(dict.count, 2U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:@"foo"]);
-  XCTAssertTrue([dict getUInt64:&value forKey:@"foo"]);
-  XCTAssertEqual(value, 300U);
-  XCTAssertFalse([dict getUInt64:NULL forKey:@"bar"]);
-  XCTAssertTrue([dict getUInt64:NULL forKey:@"baz"]);
-  XCTAssertTrue([dict getUInt64:&value forKey:@"baz"]);
-  XCTAssertEqual(value, 302U);
-  XCTAssertFalse([dict getUInt64:NULL forKey:@"mumble"]);
-
-  [dict removeAll];
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertFalse([dict getUInt64:NULL forKey:@"foo"]);
-  XCTAssertFalse([dict getUInt64:NULL forKey:@"bar"]);
-  XCTAssertFalse([dict getUInt64:NULL forKey:@"baz"]);
-  XCTAssertFalse([dict getUInt64:NULL forKey:@"mumble"]);
-  [dict release];
-}
-
-- (void)testInplaceMutation {
-  const NSString *kKeys[] = { @"foo", @"bar", @"baz", @"mumble" };
-  const uint64_t kValues[] = { 300U, 301U, 302U, 303U };
-  GPBStringUInt64Dictionary *dict =
-      [[GPBStringUInt64Dictionary alloc] initWithUInt64s:kValues
-                                                 forKeys:kKeys
-                                                   count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 4U);
-  uint64_t value;
-  XCTAssertTrue([dict getUInt64:NULL forKey:@"foo"]);
-  XCTAssertTrue([dict getUInt64:&value forKey:@"foo"]);
-  XCTAssertEqual(value, 300U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:@"bar"]);
-  XCTAssertTrue([dict getUInt64:&value forKey:@"bar"]);
-  XCTAssertEqual(value, 301U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:@"baz"]);
-  XCTAssertTrue([dict getUInt64:&value forKey:@"baz"]);
-  XCTAssertEqual(value, 302U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:@"mumble"]);
-  XCTAssertTrue([dict getUInt64:&value forKey:@"mumble"]);
-  XCTAssertEqual(value, 303U);
-
-  [dict setUInt64:303U forKey:@"foo"];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:@"foo"]);
-  XCTAssertTrue([dict getUInt64:&value forKey:@"foo"]);
-  XCTAssertEqual(value, 303U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:@"bar"]);
-  XCTAssertTrue([dict getUInt64:&value forKey:@"bar"]);
-  XCTAssertEqual(value, 301U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:@"baz"]);
-  XCTAssertTrue([dict getUInt64:&value forKey:@"baz"]);
-  XCTAssertEqual(value, 302U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:@"mumble"]);
-  XCTAssertTrue([dict getUInt64:&value forKey:@"mumble"]);
-  XCTAssertEqual(value, 303U);
-
-  [dict setUInt64:301U forKey:@"mumble"];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:@"foo"]);
-  XCTAssertTrue([dict getUInt64:&value forKey:@"foo"]);
-  XCTAssertEqual(value, 303U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:@"bar"]);
-  XCTAssertTrue([dict getUInt64:&value forKey:@"bar"]);
-  XCTAssertEqual(value, 301U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:@"baz"]);
-  XCTAssertTrue([dict getUInt64:&value forKey:@"baz"]);
-  XCTAssertEqual(value, 302U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:@"mumble"]);
-  XCTAssertTrue([dict getUInt64:&value forKey:@"mumble"]);
-  XCTAssertEqual(value, 301U);
-
-  const NSString *kKeys2[] = { @"bar", @"baz" };
-  const uint64_t kValues2[] = { 302U, 300U };
-  GPBStringUInt64Dictionary *dict2 =
-      [[GPBStringUInt64Dictionary alloc] initWithUInt64s:kValues2
-                                                 forKeys:kKeys2
-                                                   count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(dict2);
-  [dict addEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:@"foo"]);
-  XCTAssertTrue([dict getUInt64:&value forKey:@"foo"]);
-  XCTAssertEqual(value, 303U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:@"bar"]);
-  XCTAssertTrue([dict getUInt64:&value forKey:@"bar"]);
-  XCTAssertEqual(value, 302U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:@"baz"]);
-  XCTAssertTrue([dict getUInt64:&value forKey:@"baz"]);
-  XCTAssertEqual(value, 300U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:@"mumble"]);
-  XCTAssertTrue([dict getUInt64:&value forKey:@"mumble"]);
-  XCTAssertEqual(value, 301U);
-
-  [dict2 release];
-  [dict release];
-}
-
-@end
-
-#pragma mark - String -> Int64
-
-@interface GPBStringInt64DictionaryTests : XCTestCase
-@end
-
-@implementation GPBStringInt64DictionaryTests
-
-- (void)testEmpty {
-  GPBStringInt64Dictionary *dict = [[GPBStringInt64Dictionary alloc] init];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertFalse([dict getInt64:NULL forKey:@"foo"]);
-  [dict enumerateKeysAndInt64sUsingBlock:^(NSString *aKey, int64_t aValue, BOOL *stop) {
-    #pragma unused(aKey, aValue, stop)
-    XCTFail(@"Shouldn't get here!");
-  }];
-  [dict release];
-}
-
-- (void)testOne {
-  GPBStringInt64Dictionary *dict = [[GPBStringInt64Dictionary alloc] init];
-  [dict setInt64:400 forKey:@"foo"];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 1U);
-  int64_t value;
-  XCTAssertTrue([dict getInt64:NULL forKey:@"foo"]);
-  XCTAssertTrue([dict getInt64:&value forKey:@"foo"]);
-  XCTAssertEqual(value, 400);
-  XCTAssertFalse([dict getInt64:NULL forKey:@"bar"]);
-  [dict enumerateKeysAndInt64sUsingBlock:^(NSString *aKey, int64_t aValue, BOOL *stop) {
-    XCTAssertEqualObjects(aKey, @"foo");
-    XCTAssertEqual(aValue, 400);
-    XCTAssertNotEqual(stop, NULL);
-  }];
-  [dict release];
-}
-
-- (void)testBasics {
-  const NSString *kKeys[] = { @"foo", @"bar", @"baz" };
-  const int64_t kValues[] = { 400, 401, 402 };
-  GPBStringInt64Dictionary *dict =
-      [[GPBStringInt64Dictionary alloc] initWithInt64s:kValues
-                                               forKeys:kKeys
-                                                 count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 3U);
-  int64_t value;
-  XCTAssertTrue([dict getInt64:NULL forKey:@"foo"]);
-  XCTAssertTrue([dict getInt64:&value forKey:@"foo"]);
-  XCTAssertEqual(value, 400);
-  XCTAssertTrue([dict getInt64:NULL forKey:@"bar"]);
-  XCTAssertTrue([dict getInt64:&value forKey:@"bar"]);
-  XCTAssertEqual(value, 401);
-  XCTAssertTrue([dict getInt64:NULL forKey:@"baz"]);
-  XCTAssertTrue([dict getInt64:&value forKey:@"baz"]);
-  XCTAssertEqual(value, 402);
-  XCTAssertFalse([dict getInt64:NULL forKey:@"mumble"]);
-
-  __block NSUInteger idx = 0;
-  NSString **seenKeys = malloc(3 * sizeof(NSString*));
-  int64_t *seenValues = malloc(3 * sizeof(int64_t));
-  [dict enumerateKeysAndInt64sUsingBlock:^(NSString *aKey, int64_t aValue, BOOL *stop) {
-    XCTAssertLessThan(idx, 3U);
-    seenKeys[idx] = aKey;
-    seenValues[idx] = aValue;
-    XCTAssertNotEqual(stop, NULL);
-    ++idx;
-  }];
-  for (int i = 0; i < 3; ++i) {
-    BOOL foundKey = NO;
-    for (int j = 0; (j < 3) && !foundKey; ++j) {
-      if ([kKeys[i] isEqual:seenKeys[j]]) {
-        foundKey = YES;
-        XCTAssertEqual(kValues[i], seenValues[j], @"i = %d, j = %d", i, j);
-      }
-    }
-    XCTAssertTrue(foundKey, @"i = %d", i);
-  }
-  free(seenKeys);
-  free(seenValues);
-
-  // Stopping the enumeration.
-  idx = 0;
-  [dict enumerateKeysAndInt64sUsingBlock:^(NSString *aKey, int64_t aValue, BOOL *stop) {
-    #pragma unused(aKey, aValue)
-    if (idx == 1) *stop = YES;
-    XCTAssertNotEqual(idx, 2U);
-    ++idx;
-  }];
-  [dict release];
-}
-
-- (void)testEquality {
-  const NSString *kKeys1[] = { @"foo", @"bar", @"baz", @"mumble" };
-  const NSString *kKeys2[] = { @"bar", @"foo", @"mumble" };
-  const int64_t kValues1[] = { 400, 401, 402 };
-  const int64_t kValues2[] = { 400, 403, 402 };
-  const int64_t kValues3[] = { 400, 401, 402, 403 };
-  GPBStringInt64Dictionary *dict1 =
-      [[GPBStringInt64Dictionary alloc] initWithInt64s:kValues1
-                                               forKeys:kKeys1
-                                                 count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict1);
-  GPBStringInt64Dictionary *dict1prime =
-      [[GPBStringInt64Dictionary alloc] initWithInt64s:kValues1
-                                               forKeys:kKeys1
-                                                 count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict1prime);
-  GPBStringInt64Dictionary *dict2 =
-      [[GPBStringInt64Dictionary alloc] initWithInt64s:kValues2
-                                               forKeys:kKeys1
-                                                 count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(dict2);
-  GPBStringInt64Dictionary *dict3 =
-      [[GPBStringInt64Dictionary alloc] initWithInt64s:kValues1
-                                               forKeys:kKeys2
-                                                 count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict3);
-  GPBStringInt64Dictionary *dict4 =
-      [[GPBStringInt64Dictionary alloc] initWithInt64s:kValues3
-                                               forKeys:kKeys1
-                                                 count:GPBARRAYSIZE(kValues3)];
-  XCTAssertNotNil(dict4);
-
-  // 1/1Prime should be different objects, but equal.
-  XCTAssertNotEqual(dict1, dict1prime);
-  XCTAssertEqualObjects(dict1, dict1prime);
-  // Equal, so they must have same hash.
-  XCTAssertEqual([dict1 hash], [dict1prime hash]);
-
-  // 2 is same keys, different values; not equal.
-  XCTAssertNotEqualObjects(dict1, dict2);
-
-  // 3 is different keys, same values; not equal.
-  XCTAssertNotEqualObjects(dict1, dict3);
-
-  // 4 extra pair; not equal
-  XCTAssertNotEqualObjects(dict1, dict4);
-
-  [dict1 release];
-  [dict1prime release];
-  [dict2 release];
-  [dict3 release];
-  [dict4 release];
-}
-
-- (void)testCopy {
-  const NSString *kKeys[] = { @"foo", @"bar", @"baz", @"mumble" };
-  const int64_t kValues[] = { 400, 401, 402, 403 };
-  GPBStringInt64Dictionary *dict =
-      [[GPBStringInt64Dictionary alloc] initWithInt64s:kValues
-                                               forKeys:kKeys
-                                                 count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-
-  GPBStringInt64Dictionary *dict2 = [dict copy];
-  XCTAssertNotNil(dict2);
-
-  // Should be new object but equal.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  XCTAssertTrue([dict2 isKindOfClass:[GPBStringInt64Dictionary class]]);
-
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testDictionaryFromDictionary {
-  const NSString *kKeys[] = { @"foo", @"bar", @"baz", @"mumble" };
-  const int64_t kValues[] = { 400, 401, 402, 403 };
-  GPBStringInt64Dictionary *dict =
-      [[GPBStringInt64Dictionary alloc] initWithInt64s:kValues
-                                               forKeys:kKeys
-                                                 count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-
-  GPBStringInt64Dictionary *dict2 =
-      [[GPBStringInt64Dictionary alloc] initWithDictionary:dict];
-  XCTAssertNotNil(dict2);
-
-  // Should be new pointer, but equal objects.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testAdds {
-  GPBStringInt64Dictionary *dict = [[GPBStringInt64Dictionary alloc] init];
-  XCTAssertNotNil(dict);
-
-  XCTAssertEqual(dict.count, 0U);
-  [dict setInt64:400 forKey:@"foo"];
-  XCTAssertEqual(dict.count, 1U);
-
-  const NSString *kKeys[] = { @"bar", @"baz", @"mumble" };
-  const int64_t kValues[] = { 401, 402, 403 };
-  GPBStringInt64Dictionary *dict2 =
-      [[GPBStringInt64Dictionary alloc] initWithInt64s:kValues
-                                               forKeys:kKeys
-                                                 count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict2);
-  [dict addEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 4U);
-
-  int64_t value;
-  XCTAssertTrue([dict getInt64:NULL forKey:@"foo"]);
-  XCTAssertTrue([dict getInt64:&value forKey:@"foo"]);
-  XCTAssertEqual(value, 400);
-  XCTAssertTrue([dict getInt64:NULL forKey:@"bar"]);
-  XCTAssertTrue([dict getInt64:&value forKey:@"bar"]);
-  XCTAssertEqual(value, 401);
-  XCTAssertTrue([dict getInt64:NULL forKey:@"baz"]);
-  XCTAssertTrue([dict getInt64:&value forKey:@"baz"]);
-  XCTAssertEqual(value, 402);
-  XCTAssertTrue([dict getInt64:NULL forKey:@"mumble"]);
-  XCTAssertTrue([dict getInt64:&value forKey:@"mumble"]);
-  XCTAssertEqual(value, 403);
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testRemove {
-  const NSString *kKeys[] = { @"foo", @"bar", @"baz", @"mumble" };
-  const int64_t kValues[] = { 400, 401, 402, 403 };
-  GPBStringInt64Dictionary *dict =
-      [[GPBStringInt64Dictionary alloc] initWithInt64s:kValues
-                                               forKeys:kKeys
-                                                 count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 4U);
-
-  [dict removeInt64ForKey:@"bar"];
-  XCTAssertEqual(dict.count, 3U);
-  int64_t value;
-  XCTAssertTrue([dict getInt64:NULL forKey:@"foo"]);
-  XCTAssertTrue([dict getInt64:&value forKey:@"foo"]);
-  XCTAssertEqual(value, 400);
-  XCTAssertFalse([dict getInt64:NULL forKey:@"bar"]);
-  XCTAssertTrue([dict getInt64:NULL forKey:@"baz"]);
-  XCTAssertTrue([dict getInt64:&value forKey:@"baz"]);
-  XCTAssertEqual(value, 402);
-  XCTAssertTrue([dict getInt64:NULL forKey:@"mumble"]);
-  XCTAssertTrue([dict getInt64:&value forKey:@"mumble"]);
-  XCTAssertEqual(value, 403);
-
-  // Remove again does nothing.
-  [dict removeInt64ForKey:@"bar"];
-  XCTAssertEqual(dict.count, 3U);
-  XCTAssertTrue([dict getInt64:NULL forKey:@"foo"]);
-  XCTAssertTrue([dict getInt64:&value forKey:@"foo"]);
-  XCTAssertEqual(value, 400);
-  XCTAssertFalse([dict getInt64:NULL forKey:@"bar"]);
-  XCTAssertTrue([dict getInt64:NULL forKey:@"baz"]);
-  XCTAssertTrue([dict getInt64:&value forKey:@"baz"]);
-  XCTAssertEqual(value, 402);
-  XCTAssertTrue([dict getInt64:NULL forKey:@"mumble"]);
-  XCTAssertTrue([dict getInt64:&value forKey:@"mumble"]);
-  XCTAssertEqual(value, 403);
-
-  [dict removeInt64ForKey:@"mumble"];
-  XCTAssertEqual(dict.count, 2U);
-  XCTAssertTrue([dict getInt64:NULL forKey:@"foo"]);
-  XCTAssertTrue([dict getInt64:&value forKey:@"foo"]);
-  XCTAssertEqual(value, 400);
-  XCTAssertFalse([dict getInt64:NULL forKey:@"bar"]);
-  XCTAssertTrue([dict getInt64:NULL forKey:@"baz"]);
-  XCTAssertTrue([dict getInt64:&value forKey:@"baz"]);
-  XCTAssertEqual(value, 402);
-  XCTAssertFalse([dict getInt64:NULL forKey:@"mumble"]);
-
-  [dict removeAll];
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertFalse([dict getInt64:NULL forKey:@"foo"]);
-  XCTAssertFalse([dict getInt64:NULL forKey:@"bar"]);
-  XCTAssertFalse([dict getInt64:NULL forKey:@"baz"]);
-  XCTAssertFalse([dict getInt64:NULL forKey:@"mumble"]);
-  [dict release];
-}
-
-- (void)testInplaceMutation {
-  const NSString *kKeys[] = { @"foo", @"bar", @"baz", @"mumble" };
-  const int64_t kValues[] = { 400, 401, 402, 403 };
-  GPBStringInt64Dictionary *dict =
-      [[GPBStringInt64Dictionary alloc] initWithInt64s:kValues
-                                               forKeys:kKeys
-                                                 count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 4U);
-  int64_t value;
-  XCTAssertTrue([dict getInt64:NULL forKey:@"foo"]);
-  XCTAssertTrue([dict getInt64:&value forKey:@"foo"]);
-  XCTAssertEqual(value, 400);
-  XCTAssertTrue([dict getInt64:NULL forKey:@"bar"]);
-  XCTAssertTrue([dict getInt64:&value forKey:@"bar"]);
-  XCTAssertEqual(value, 401);
-  XCTAssertTrue([dict getInt64:NULL forKey:@"baz"]);
-  XCTAssertTrue([dict getInt64:&value forKey:@"baz"]);
-  XCTAssertEqual(value, 402);
-  XCTAssertTrue([dict getInt64:NULL forKey:@"mumble"]);
-  XCTAssertTrue([dict getInt64:&value forKey:@"mumble"]);
-  XCTAssertEqual(value, 403);
-
-  [dict setInt64:403 forKey:@"foo"];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getInt64:NULL forKey:@"foo"]);
-  XCTAssertTrue([dict getInt64:&value forKey:@"foo"]);
-  XCTAssertEqual(value, 403);
-  XCTAssertTrue([dict getInt64:NULL forKey:@"bar"]);
-  XCTAssertTrue([dict getInt64:&value forKey:@"bar"]);
-  XCTAssertEqual(value, 401);
-  XCTAssertTrue([dict getInt64:NULL forKey:@"baz"]);
-  XCTAssertTrue([dict getInt64:&value forKey:@"baz"]);
-  XCTAssertEqual(value, 402);
-  XCTAssertTrue([dict getInt64:NULL forKey:@"mumble"]);
-  XCTAssertTrue([dict getInt64:&value forKey:@"mumble"]);
-  XCTAssertEqual(value, 403);
-
-  [dict setInt64:401 forKey:@"mumble"];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getInt64:NULL forKey:@"foo"]);
-  XCTAssertTrue([dict getInt64:&value forKey:@"foo"]);
-  XCTAssertEqual(value, 403);
-  XCTAssertTrue([dict getInt64:NULL forKey:@"bar"]);
-  XCTAssertTrue([dict getInt64:&value forKey:@"bar"]);
-  XCTAssertEqual(value, 401);
-  XCTAssertTrue([dict getInt64:NULL forKey:@"baz"]);
-  XCTAssertTrue([dict getInt64:&value forKey:@"baz"]);
-  XCTAssertEqual(value, 402);
-  XCTAssertTrue([dict getInt64:NULL forKey:@"mumble"]);
-  XCTAssertTrue([dict getInt64:&value forKey:@"mumble"]);
-  XCTAssertEqual(value, 401);
-
-  const NSString *kKeys2[] = { @"bar", @"baz" };
-  const int64_t kValues2[] = { 402, 400 };
-  GPBStringInt64Dictionary *dict2 =
-      [[GPBStringInt64Dictionary alloc] initWithInt64s:kValues2
-                                               forKeys:kKeys2
-                                                 count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(dict2);
-  [dict addEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getInt64:NULL forKey:@"foo"]);
-  XCTAssertTrue([dict getInt64:&value forKey:@"foo"]);
-  XCTAssertEqual(value, 403);
-  XCTAssertTrue([dict getInt64:NULL forKey:@"bar"]);
-  XCTAssertTrue([dict getInt64:&value forKey:@"bar"]);
-  XCTAssertEqual(value, 402);
-  XCTAssertTrue([dict getInt64:NULL forKey:@"baz"]);
-  XCTAssertTrue([dict getInt64:&value forKey:@"baz"]);
-  XCTAssertEqual(value, 400);
-  XCTAssertTrue([dict getInt64:NULL forKey:@"mumble"]);
-  XCTAssertTrue([dict getInt64:&value forKey:@"mumble"]);
-  XCTAssertEqual(value, 401);
-
-  [dict2 release];
-  [dict release];
-}
-
-@end
-
-#pragma mark - String -> Bool
-
-@interface GPBStringBoolDictionaryTests : XCTestCase
-@end
-
-@implementation GPBStringBoolDictionaryTests
-
-- (void)testEmpty {
-  GPBStringBoolDictionary *dict = [[GPBStringBoolDictionary alloc] init];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertFalse([dict getBool:NULL forKey:@"foo"]);
-  [dict enumerateKeysAndBoolsUsingBlock:^(NSString *aKey, BOOL aValue, BOOL *stop) {
-    #pragma unused(aKey, aValue, stop)
-    XCTFail(@"Shouldn't get here!");
-  }];
-  [dict release];
-}
-
-- (void)testOne {
-  GPBStringBoolDictionary *dict = [[GPBStringBoolDictionary alloc] init];
-  [dict setBool:YES forKey:@"foo"];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 1U);
-  BOOL value;
-  XCTAssertTrue([dict getBool:NULL forKey:@"foo"]);
-  XCTAssertTrue([dict getBool:&value forKey:@"foo"]);
-  XCTAssertEqual(value, YES);
-  XCTAssertFalse([dict getBool:NULL forKey:@"bar"]);
-  [dict enumerateKeysAndBoolsUsingBlock:^(NSString *aKey, BOOL aValue, BOOL *stop) {
-    XCTAssertEqualObjects(aKey, @"foo");
-    XCTAssertEqual(aValue, YES);
-    XCTAssertNotEqual(stop, NULL);
-  }];
-  [dict release];
-}
-
-- (void)testBasics {
-  const NSString *kKeys[] = { @"foo", @"bar", @"baz" };
-  const BOOL kValues[] = { YES, YES, NO };
-  GPBStringBoolDictionary *dict =
-      [[GPBStringBoolDictionary alloc] initWithBools:kValues
-                                             forKeys:kKeys
-                                               count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 3U);
-  BOOL value;
-  XCTAssertTrue([dict getBool:NULL forKey:@"foo"]);
-  XCTAssertTrue([dict getBool:&value forKey:@"foo"]);
-  XCTAssertEqual(value, YES);
-  XCTAssertTrue([dict getBool:NULL forKey:@"bar"]);
-  XCTAssertTrue([dict getBool:&value forKey:@"bar"]);
-  XCTAssertEqual(value, YES);
-  XCTAssertTrue([dict getBool:NULL forKey:@"baz"]);
-  XCTAssertTrue([dict getBool:&value forKey:@"baz"]);
-  XCTAssertEqual(value, NO);
-  XCTAssertFalse([dict getBool:NULL forKey:@"mumble"]);
-
-  __block NSUInteger idx = 0;
-  NSString **seenKeys = malloc(3 * sizeof(NSString*));
-  BOOL *seenValues = malloc(3 * sizeof(BOOL));
-  [dict enumerateKeysAndBoolsUsingBlock:^(NSString *aKey, BOOL aValue, BOOL *stop) {
-    XCTAssertLessThan(idx, 3U);
-    seenKeys[idx] = aKey;
-    seenValues[idx] = aValue;
-    XCTAssertNotEqual(stop, NULL);
-    ++idx;
-  }];
-  for (int i = 0; i < 3; ++i) {
-    BOOL foundKey = NO;
-    for (int j = 0; (j < 3) && !foundKey; ++j) {
-      if ([kKeys[i] isEqual:seenKeys[j]]) {
-        foundKey = YES;
-        XCTAssertEqual(kValues[i], seenValues[j], @"i = %d, j = %d", i, j);
-      }
-    }
-    XCTAssertTrue(foundKey, @"i = %d", i);
-  }
-  free(seenKeys);
-  free(seenValues);
-
-  // Stopping the enumeration.
-  idx = 0;
-  [dict enumerateKeysAndBoolsUsingBlock:^(NSString *aKey, BOOL aValue, BOOL *stop) {
-    #pragma unused(aKey, aValue)
-    if (idx == 1) *stop = YES;
-    XCTAssertNotEqual(idx, 2U);
-    ++idx;
-  }];
-  [dict release];
-}
-
-- (void)testEquality {
-  const NSString *kKeys1[] = { @"foo", @"bar", @"baz", @"mumble" };
-  const NSString *kKeys2[] = { @"bar", @"foo", @"mumble" };
-  const BOOL kValues1[] = { YES, YES, NO };
-  const BOOL kValues2[] = { YES, NO, NO };
-  const BOOL kValues3[] = { YES, YES, NO, NO };
-  GPBStringBoolDictionary *dict1 =
-      [[GPBStringBoolDictionary alloc] initWithBools:kValues1
-                                             forKeys:kKeys1
-                                               count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict1);
-  GPBStringBoolDictionary *dict1prime =
-      [[GPBStringBoolDictionary alloc] initWithBools:kValues1
-                                             forKeys:kKeys1
-                                               count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict1prime);
-  GPBStringBoolDictionary *dict2 =
-      [[GPBStringBoolDictionary alloc] initWithBools:kValues2
-                                             forKeys:kKeys1
-                                               count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(dict2);
-  GPBStringBoolDictionary *dict3 =
-      [[GPBStringBoolDictionary alloc] initWithBools:kValues1
-                                             forKeys:kKeys2
-                                               count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict3);
-  GPBStringBoolDictionary *dict4 =
-      [[GPBStringBoolDictionary alloc] initWithBools:kValues3
-                                             forKeys:kKeys1
-                                               count:GPBARRAYSIZE(kValues3)];
-  XCTAssertNotNil(dict4);
-
-  // 1/1Prime should be different objects, but equal.
-  XCTAssertNotEqual(dict1, dict1prime);
-  XCTAssertEqualObjects(dict1, dict1prime);
-  // Equal, so they must have same hash.
-  XCTAssertEqual([dict1 hash], [dict1prime hash]);
-
-  // 2 is same keys, different values; not equal.
-  XCTAssertNotEqualObjects(dict1, dict2);
-
-  // 3 is different keys, same values; not equal.
-  XCTAssertNotEqualObjects(dict1, dict3);
-
-  // 4 extra pair; not equal
-  XCTAssertNotEqualObjects(dict1, dict4);
-
-  [dict1 release];
-  [dict1prime release];
-  [dict2 release];
-  [dict3 release];
-  [dict4 release];
-}
-
-- (void)testCopy {
-  const NSString *kKeys[] = { @"foo", @"bar", @"baz", @"mumble" };
-  const BOOL kValues[] = { YES, YES, NO, NO };
-  GPBStringBoolDictionary *dict =
-      [[GPBStringBoolDictionary alloc] initWithBools:kValues
-                                             forKeys:kKeys
-                                               count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-
-  GPBStringBoolDictionary *dict2 = [dict copy];
-  XCTAssertNotNil(dict2);
-
-  // Should be new object but equal.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  XCTAssertTrue([dict2 isKindOfClass:[GPBStringBoolDictionary class]]);
-
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testDictionaryFromDictionary {
-  const NSString *kKeys[] = { @"foo", @"bar", @"baz", @"mumble" };
-  const BOOL kValues[] = { YES, YES, NO, NO };
-  GPBStringBoolDictionary *dict =
-      [[GPBStringBoolDictionary alloc] initWithBools:kValues
-                                             forKeys:kKeys
-                                               count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-
-  GPBStringBoolDictionary *dict2 =
-      [[GPBStringBoolDictionary alloc] initWithDictionary:dict];
-  XCTAssertNotNil(dict2);
-
-  // Should be new pointer, but equal objects.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testAdds {
-  GPBStringBoolDictionary *dict = [[GPBStringBoolDictionary alloc] init];
-  XCTAssertNotNil(dict);
-
-  XCTAssertEqual(dict.count, 0U);
-  [dict setBool:YES forKey:@"foo"];
-  XCTAssertEqual(dict.count, 1U);
-
-  const NSString *kKeys[] = { @"bar", @"baz", @"mumble" };
-  const BOOL kValues[] = { YES, NO, NO };
-  GPBStringBoolDictionary *dict2 =
-      [[GPBStringBoolDictionary alloc] initWithBools:kValues
-                                             forKeys:kKeys
-                                               count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict2);
-  [dict addEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 4U);
-
-  BOOL value;
-  XCTAssertTrue([dict getBool:NULL forKey:@"foo"]);
-  XCTAssertTrue([dict getBool:&value forKey:@"foo"]);
-  XCTAssertEqual(value, YES);
-  XCTAssertTrue([dict getBool:NULL forKey:@"bar"]);
-  XCTAssertTrue([dict getBool:&value forKey:@"bar"]);
-  XCTAssertEqual(value, YES);
-  XCTAssertTrue([dict getBool:NULL forKey:@"baz"]);
-  XCTAssertTrue([dict getBool:&value forKey:@"baz"]);
-  XCTAssertEqual(value, NO);
-  XCTAssertTrue([dict getBool:NULL forKey:@"mumble"]);
-  XCTAssertTrue([dict getBool:&value forKey:@"mumble"]);
-  XCTAssertEqual(value, NO);
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testRemove {
-  const NSString *kKeys[] = { @"foo", @"bar", @"baz", @"mumble" };
-  const BOOL kValues[] = { YES, YES, NO, NO };
-  GPBStringBoolDictionary *dict =
-      [[GPBStringBoolDictionary alloc] initWithBools:kValues
-                                             forKeys:kKeys
-                                               count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 4U);
-
-  [dict removeBoolForKey:@"bar"];
-  XCTAssertEqual(dict.count, 3U);
-  BOOL value;
-  XCTAssertTrue([dict getBool:NULL forKey:@"foo"]);
-  XCTAssertTrue([dict getBool:&value forKey:@"foo"]);
-  XCTAssertEqual(value, YES);
-  XCTAssertFalse([dict getBool:NULL forKey:@"bar"]);
-  XCTAssertTrue([dict getBool:NULL forKey:@"baz"]);
-  XCTAssertTrue([dict getBool:&value forKey:@"baz"]);
-  XCTAssertEqual(value, NO);
-  XCTAssertTrue([dict getBool:NULL forKey:@"mumble"]);
-  XCTAssertTrue([dict getBool:&value forKey:@"mumble"]);
-  XCTAssertEqual(value, NO);
-
-  // Remove again does nothing.
-  [dict removeBoolForKey:@"bar"];
-  XCTAssertEqual(dict.count, 3U);
-  XCTAssertTrue([dict getBool:NULL forKey:@"foo"]);
-  XCTAssertTrue([dict getBool:&value forKey:@"foo"]);
-  XCTAssertEqual(value, YES);
-  XCTAssertFalse([dict getBool:NULL forKey:@"bar"]);
-  XCTAssertTrue([dict getBool:NULL forKey:@"baz"]);
-  XCTAssertTrue([dict getBool:&value forKey:@"baz"]);
-  XCTAssertEqual(value, NO);
-  XCTAssertTrue([dict getBool:NULL forKey:@"mumble"]);
-  XCTAssertTrue([dict getBool:&value forKey:@"mumble"]);
-  XCTAssertEqual(value, NO);
-
-  [dict removeBoolForKey:@"mumble"];
-  XCTAssertEqual(dict.count, 2U);
-  XCTAssertTrue([dict getBool:NULL forKey:@"foo"]);
-  XCTAssertTrue([dict getBool:&value forKey:@"foo"]);
-  XCTAssertEqual(value, YES);
-  XCTAssertFalse([dict getBool:NULL forKey:@"bar"]);
-  XCTAssertTrue([dict getBool:NULL forKey:@"baz"]);
-  XCTAssertTrue([dict getBool:&value forKey:@"baz"]);
-  XCTAssertEqual(value, NO);
-  XCTAssertFalse([dict getBool:NULL forKey:@"mumble"]);
-
-  [dict removeAll];
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertFalse([dict getBool:NULL forKey:@"foo"]);
-  XCTAssertFalse([dict getBool:NULL forKey:@"bar"]);
-  XCTAssertFalse([dict getBool:NULL forKey:@"baz"]);
-  XCTAssertFalse([dict getBool:NULL forKey:@"mumble"]);
-  [dict release];
-}
-
-- (void)testInplaceMutation {
-  const NSString *kKeys[] = { @"foo", @"bar", @"baz", @"mumble" };
-  const BOOL kValues[] = { YES, YES, NO, NO };
-  GPBStringBoolDictionary *dict =
-      [[GPBStringBoolDictionary alloc] initWithBools:kValues
-                                             forKeys:kKeys
-                                               count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 4U);
-  BOOL value;
-  XCTAssertTrue([dict getBool:NULL forKey:@"foo"]);
-  XCTAssertTrue([dict getBool:&value forKey:@"foo"]);
-  XCTAssertEqual(value, YES);
-  XCTAssertTrue([dict getBool:NULL forKey:@"bar"]);
-  XCTAssertTrue([dict getBool:&value forKey:@"bar"]);
-  XCTAssertEqual(value, YES);
-  XCTAssertTrue([dict getBool:NULL forKey:@"baz"]);
-  XCTAssertTrue([dict getBool:&value forKey:@"baz"]);
-  XCTAssertEqual(value, NO);
-  XCTAssertTrue([dict getBool:NULL forKey:@"mumble"]);
-  XCTAssertTrue([dict getBool:&value forKey:@"mumble"]);
-  XCTAssertEqual(value, NO);
-
-  [dict setBool:NO forKey:@"foo"];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getBool:NULL forKey:@"foo"]);
-  XCTAssertTrue([dict getBool:&value forKey:@"foo"]);
-  XCTAssertEqual(value, NO);
-  XCTAssertTrue([dict getBool:NULL forKey:@"bar"]);
-  XCTAssertTrue([dict getBool:&value forKey:@"bar"]);
-  XCTAssertEqual(value, YES);
-  XCTAssertTrue([dict getBool:NULL forKey:@"baz"]);
-  XCTAssertTrue([dict getBool:&value forKey:@"baz"]);
-  XCTAssertEqual(value, NO);
-  XCTAssertTrue([dict getBool:NULL forKey:@"mumble"]);
-  XCTAssertTrue([dict getBool:&value forKey:@"mumble"]);
-  XCTAssertEqual(value, NO);
-
-  [dict setBool:YES forKey:@"mumble"];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getBool:NULL forKey:@"foo"]);
-  XCTAssertTrue([dict getBool:&value forKey:@"foo"]);
-  XCTAssertEqual(value, NO);
-  XCTAssertTrue([dict getBool:NULL forKey:@"bar"]);
-  XCTAssertTrue([dict getBool:&value forKey:@"bar"]);
-  XCTAssertEqual(value, YES);
-  XCTAssertTrue([dict getBool:NULL forKey:@"baz"]);
-  XCTAssertTrue([dict getBool:&value forKey:@"baz"]);
-  XCTAssertEqual(value, NO);
-  XCTAssertTrue([dict getBool:NULL forKey:@"mumble"]);
-  XCTAssertTrue([dict getBool:&value forKey:@"mumble"]);
-  XCTAssertEqual(value, YES);
-
-  const NSString *kKeys2[] = { @"bar", @"baz" };
-  const BOOL kValues2[] = { NO, YES };
-  GPBStringBoolDictionary *dict2 =
-      [[GPBStringBoolDictionary alloc] initWithBools:kValues2
-                                             forKeys:kKeys2
-                                               count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(dict2);
-  [dict addEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getBool:NULL forKey:@"foo"]);
-  XCTAssertTrue([dict getBool:&value forKey:@"foo"]);
-  XCTAssertEqual(value, NO);
-  XCTAssertTrue([dict getBool:NULL forKey:@"bar"]);
-  XCTAssertTrue([dict getBool:&value forKey:@"bar"]);
-  XCTAssertEqual(value, NO);
-  XCTAssertTrue([dict getBool:NULL forKey:@"baz"]);
-  XCTAssertTrue([dict getBool:&value forKey:@"baz"]);
-  XCTAssertEqual(value, YES);
-  XCTAssertTrue([dict getBool:NULL forKey:@"mumble"]);
-  XCTAssertTrue([dict getBool:&value forKey:@"mumble"]);
-  XCTAssertEqual(value, YES);
-
-  [dict2 release];
-  [dict release];
-}
-
-@end
-
-#pragma mark - String -> Float
-
-@interface GPBStringFloatDictionaryTests : XCTestCase
-@end
-
-@implementation GPBStringFloatDictionaryTests
-
-- (void)testEmpty {
-  GPBStringFloatDictionary *dict = [[GPBStringFloatDictionary alloc] init];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertFalse([dict getFloat:NULL forKey:@"foo"]);
-  [dict enumerateKeysAndFloatsUsingBlock:^(NSString *aKey, float aValue, BOOL *stop) {
-    #pragma unused(aKey, aValue, stop)
-    XCTFail(@"Shouldn't get here!");
-  }];
-  [dict release];
-}
-
-- (void)testOne {
-  GPBStringFloatDictionary *dict = [[GPBStringFloatDictionary alloc] init];
-  [dict setFloat:500.f forKey:@"foo"];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 1U);
-  float value;
-  XCTAssertTrue([dict getFloat:NULL forKey:@"foo"]);
-  XCTAssertTrue([dict getFloat:&value forKey:@"foo"]);
-  XCTAssertEqual(value, 500.f);
-  XCTAssertFalse([dict getFloat:NULL forKey:@"bar"]);
-  [dict enumerateKeysAndFloatsUsingBlock:^(NSString *aKey, float aValue, BOOL *stop) {
-    XCTAssertEqualObjects(aKey, @"foo");
-    XCTAssertEqual(aValue, 500.f);
-    XCTAssertNotEqual(stop, NULL);
-  }];
-  [dict release];
-}
-
-- (void)testBasics {
-  const NSString *kKeys[] = { @"foo", @"bar", @"baz" };
-  const float kValues[] = { 500.f, 501.f, 502.f };
-  GPBStringFloatDictionary *dict =
-      [[GPBStringFloatDictionary alloc] initWithFloats:kValues
-                                               forKeys:kKeys
-                                                 count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 3U);
-  float value;
-  XCTAssertTrue([dict getFloat:NULL forKey:@"foo"]);
-  XCTAssertTrue([dict getFloat:&value forKey:@"foo"]);
-  XCTAssertEqual(value, 500.f);
-  XCTAssertTrue([dict getFloat:NULL forKey:@"bar"]);
-  XCTAssertTrue([dict getFloat:&value forKey:@"bar"]);
-  XCTAssertEqual(value, 501.f);
-  XCTAssertTrue([dict getFloat:NULL forKey:@"baz"]);
-  XCTAssertTrue([dict getFloat:&value forKey:@"baz"]);
-  XCTAssertEqual(value, 502.f);
-  XCTAssertFalse([dict getFloat:NULL forKey:@"mumble"]);
-
-  __block NSUInteger idx = 0;
-  NSString **seenKeys = malloc(3 * sizeof(NSString*));
-  float *seenValues = malloc(3 * sizeof(float));
-  [dict enumerateKeysAndFloatsUsingBlock:^(NSString *aKey, float aValue, BOOL *stop) {
-    XCTAssertLessThan(idx, 3U);
-    seenKeys[idx] = aKey;
-    seenValues[idx] = aValue;
-    XCTAssertNotEqual(stop, NULL);
-    ++idx;
-  }];
-  for (int i = 0; i < 3; ++i) {
-    BOOL foundKey = NO;
-    for (int j = 0; (j < 3) && !foundKey; ++j) {
-      if ([kKeys[i] isEqual:seenKeys[j]]) {
-        foundKey = YES;
-        XCTAssertEqual(kValues[i], seenValues[j], @"i = %d, j = %d", i, j);
-      }
-    }
-    XCTAssertTrue(foundKey, @"i = %d", i);
-  }
-  free(seenKeys);
-  free(seenValues);
-
-  // Stopping the enumeration.
-  idx = 0;
-  [dict enumerateKeysAndFloatsUsingBlock:^(NSString *aKey, float aValue, BOOL *stop) {
-    #pragma unused(aKey, aValue)
-    if (idx == 1) *stop = YES;
-    XCTAssertNotEqual(idx, 2U);
-    ++idx;
-  }];
-  [dict release];
-}
-
-- (void)testEquality {
-  const NSString *kKeys1[] = { @"foo", @"bar", @"baz", @"mumble" };
-  const NSString *kKeys2[] = { @"bar", @"foo", @"mumble" };
-  const float kValues1[] = { 500.f, 501.f, 502.f };
-  const float kValues2[] = { 500.f, 503.f, 502.f };
-  const float kValues3[] = { 500.f, 501.f, 502.f, 503.f };
-  GPBStringFloatDictionary *dict1 =
-      [[GPBStringFloatDictionary alloc] initWithFloats:kValues1
-                                               forKeys:kKeys1
-                                                 count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict1);
-  GPBStringFloatDictionary *dict1prime =
-      [[GPBStringFloatDictionary alloc] initWithFloats:kValues1
-                                               forKeys:kKeys1
-                                                 count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict1prime);
-  GPBStringFloatDictionary *dict2 =
-      [[GPBStringFloatDictionary alloc] initWithFloats:kValues2
-                                               forKeys:kKeys1
-                                                 count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(dict2);
-  GPBStringFloatDictionary *dict3 =
-      [[GPBStringFloatDictionary alloc] initWithFloats:kValues1
-                                               forKeys:kKeys2
-                                                 count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict3);
-  GPBStringFloatDictionary *dict4 =
-      [[GPBStringFloatDictionary alloc] initWithFloats:kValues3
-                                               forKeys:kKeys1
-                                                 count:GPBARRAYSIZE(kValues3)];
-  XCTAssertNotNil(dict4);
-
-  // 1/1Prime should be different objects, but equal.
-  XCTAssertNotEqual(dict1, dict1prime);
-  XCTAssertEqualObjects(dict1, dict1prime);
-  // Equal, so they must have same hash.
-  XCTAssertEqual([dict1 hash], [dict1prime hash]);
-
-  // 2 is same keys, different values; not equal.
-  XCTAssertNotEqualObjects(dict1, dict2);
-
-  // 3 is different keys, same values; not equal.
-  XCTAssertNotEqualObjects(dict1, dict3);
-
-  // 4 extra pair; not equal
-  XCTAssertNotEqualObjects(dict1, dict4);
-
-  [dict1 release];
-  [dict1prime release];
-  [dict2 release];
-  [dict3 release];
-  [dict4 release];
-}
-
-- (void)testCopy {
-  const NSString *kKeys[] = { @"foo", @"bar", @"baz", @"mumble" };
-  const float kValues[] = { 500.f, 501.f, 502.f, 503.f };
-  GPBStringFloatDictionary *dict =
-      [[GPBStringFloatDictionary alloc] initWithFloats:kValues
-                                               forKeys:kKeys
-                                                 count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-
-  GPBStringFloatDictionary *dict2 = [dict copy];
-  XCTAssertNotNil(dict2);
-
-  // Should be new object but equal.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  XCTAssertTrue([dict2 isKindOfClass:[GPBStringFloatDictionary class]]);
-
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testDictionaryFromDictionary {
-  const NSString *kKeys[] = { @"foo", @"bar", @"baz", @"mumble" };
-  const float kValues[] = { 500.f, 501.f, 502.f, 503.f };
-  GPBStringFloatDictionary *dict =
-      [[GPBStringFloatDictionary alloc] initWithFloats:kValues
-                                               forKeys:kKeys
-                                                 count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-
-  GPBStringFloatDictionary *dict2 =
-      [[GPBStringFloatDictionary alloc] initWithDictionary:dict];
-  XCTAssertNotNil(dict2);
-
-  // Should be new pointer, but equal objects.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testAdds {
-  GPBStringFloatDictionary *dict = [[GPBStringFloatDictionary alloc] init];
-  XCTAssertNotNil(dict);
-
-  XCTAssertEqual(dict.count, 0U);
-  [dict setFloat:500.f forKey:@"foo"];
-  XCTAssertEqual(dict.count, 1U);
-
-  const NSString *kKeys[] = { @"bar", @"baz", @"mumble" };
-  const float kValues[] = { 501.f, 502.f, 503.f };
-  GPBStringFloatDictionary *dict2 =
-      [[GPBStringFloatDictionary alloc] initWithFloats:kValues
-                                               forKeys:kKeys
-                                                 count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict2);
-  [dict addEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 4U);
-
-  float value;
-  XCTAssertTrue([dict getFloat:NULL forKey:@"foo"]);
-  XCTAssertTrue([dict getFloat:&value forKey:@"foo"]);
-  XCTAssertEqual(value, 500.f);
-  XCTAssertTrue([dict getFloat:NULL forKey:@"bar"]);
-  XCTAssertTrue([dict getFloat:&value forKey:@"bar"]);
-  XCTAssertEqual(value, 501.f);
-  XCTAssertTrue([dict getFloat:NULL forKey:@"baz"]);
-  XCTAssertTrue([dict getFloat:&value forKey:@"baz"]);
-  XCTAssertEqual(value, 502.f);
-  XCTAssertTrue([dict getFloat:NULL forKey:@"mumble"]);
-  XCTAssertTrue([dict getFloat:&value forKey:@"mumble"]);
-  XCTAssertEqual(value, 503.f);
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testRemove {
-  const NSString *kKeys[] = { @"foo", @"bar", @"baz", @"mumble" };
-  const float kValues[] = { 500.f, 501.f, 502.f, 503.f };
-  GPBStringFloatDictionary *dict =
-      [[GPBStringFloatDictionary alloc] initWithFloats:kValues
-                                               forKeys:kKeys
-                                                 count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 4U);
-
-  [dict removeFloatForKey:@"bar"];
-  XCTAssertEqual(dict.count, 3U);
-  float value;
-  XCTAssertTrue([dict getFloat:NULL forKey:@"foo"]);
-  XCTAssertTrue([dict getFloat:&value forKey:@"foo"]);
-  XCTAssertEqual(value, 500.f);
-  XCTAssertFalse([dict getFloat:NULL forKey:@"bar"]);
-  XCTAssertTrue([dict getFloat:NULL forKey:@"baz"]);
-  XCTAssertTrue([dict getFloat:&value forKey:@"baz"]);
-  XCTAssertEqual(value, 502.f);
-  XCTAssertTrue([dict getFloat:NULL forKey:@"mumble"]);
-  XCTAssertTrue([dict getFloat:&value forKey:@"mumble"]);
-  XCTAssertEqual(value, 503.f);
-
-  // Remove again does nothing.
-  [dict removeFloatForKey:@"bar"];
-  XCTAssertEqual(dict.count, 3U);
-  XCTAssertTrue([dict getFloat:NULL forKey:@"foo"]);
-  XCTAssertTrue([dict getFloat:&value forKey:@"foo"]);
-  XCTAssertEqual(value, 500.f);
-  XCTAssertFalse([dict getFloat:NULL forKey:@"bar"]);
-  XCTAssertTrue([dict getFloat:NULL forKey:@"baz"]);
-  XCTAssertTrue([dict getFloat:&value forKey:@"baz"]);
-  XCTAssertEqual(value, 502.f);
-  XCTAssertTrue([dict getFloat:NULL forKey:@"mumble"]);
-  XCTAssertTrue([dict getFloat:&value forKey:@"mumble"]);
-  XCTAssertEqual(value, 503.f);
-
-  [dict removeFloatForKey:@"mumble"];
-  XCTAssertEqual(dict.count, 2U);
-  XCTAssertTrue([dict getFloat:NULL forKey:@"foo"]);
-  XCTAssertTrue([dict getFloat:&value forKey:@"foo"]);
-  XCTAssertEqual(value, 500.f);
-  XCTAssertFalse([dict getFloat:NULL forKey:@"bar"]);
-  XCTAssertTrue([dict getFloat:NULL forKey:@"baz"]);
-  XCTAssertTrue([dict getFloat:&value forKey:@"baz"]);
-  XCTAssertEqual(value, 502.f);
-  XCTAssertFalse([dict getFloat:NULL forKey:@"mumble"]);
-
-  [dict removeAll];
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertFalse([dict getFloat:NULL forKey:@"foo"]);
-  XCTAssertFalse([dict getFloat:NULL forKey:@"bar"]);
-  XCTAssertFalse([dict getFloat:NULL forKey:@"baz"]);
-  XCTAssertFalse([dict getFloat:NULL forKey:@"mumble"]);
-  [dict release];
-}
-
-- (void)testInplaceMutation {
-  const NSString *kKeys[] = { @"foo", @"bar", @"baz", @"mumble" };
-  const float kValues[] = { 500.f, 501.f, 502.f, 503.f };
-  GPBStringFloatDictionary *dict =
-      [[GPBStringFloatDictionary alloc] initWithFloats:kValues
-                                               forKeys:kKeys
-                                                 count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 4U);
-  float value;
-  XCTAssertTrue([dict getFloat:NULL forKey:@"foo"]);
-  XCTAssertTrue([dict getFloat:&value forKey:@"foo"]);
-  XCTAssertEqual(value, 500.f);
-  XCTAssertTrue([dict getFloat:NULL forKey:@"bar"]);
-  XCTAssertTrue([dict getFloat:&value forKey:@"bar"]);
-  XCTAssertEqual(value, 501.f);
-  XCTAssertTrue([dict getFloat:NULL forKey:@"baz"]);
-  XCTAssertTrue([dict getFloat:&value forKey:@"baz"]);
-  XCTAssertEqual(value, 502.f);
-  XCTAssertTrue([dict getFloat:NULL forKey:@"mumble"]);
-  XCTAssertTrue([dict getFloat:&value forKey:@"mumble"]);
-  XCTAssertEqual(value, 503.f);
-
-  [dict setFloat:503.f forKey:@"foo"];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getFloat:NULL forKey:@"foo"]);
-  XCTAssertTrue([dict getFloat:&value forKey:@"foo"]);
-  XCTAssertEqual(value, 503.f);
-  XCTAssertTrue([dict getFloat:NULL forKey:@"bar"]);
-  XCTAssertTrue([dict getFloat:&value forKey:@"bar"]);
-  XCTAssertEqual(value, 501.f);
-  XCTAssertTrue([dict getFloat:NULL forKey:@"baz"]);
-  XCTAssertTrue([dict getFloat:&value forKey:@"baz"]);
-  XCTAssertEqual(value, 502.f);
-  XCTAssertTrue([dict getFloat:NULL forKey:@"mumble"]);
-  XCTAssertTrue([dict getFloat:&value forKey:@"mumble"]);
-  XCTAssertEqual(value, 503.f);
-
-  [dict setFloat:501.f forKey:@"mumble"];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getFloat:NULL forKey:@"foo"]);
-  XCTAssertTrue([dict getFloat:&value forKey:@"foo"]);
-  XCTAssertEqual(value, 503.f);
-  XCTAssertTrue([dict getFloat:NULL forKey:@"bar"]);
-  XCTAssertTrue([dict getFloat:&value forKey:@"bar"]);
-  XCTAssertEqual(value, 501.f);
-  XCTAssertTrue([dict getFloat:NULL forKey:@"baz"]);
-  XCTAssertTrue([dict getFloat:&value forKey:@"baz"]);
-  XCTAssertEqual(value, 502.f);
-  XCTAssertTrue([dict getFloat:NULL forKey:@"mumble"]);
-  XCTAssertTrue([dict getFloat:&value forKey:@"mumble"]);
-  XCTAssertEqual(value, 501.f);
-
-  const NSString *kKeys2[] = { @"bar", @"baz" };
-  const float kValues2[] = { 502.f, 500.f };
-  GPBStringFloatDictionary *dict2 =
-      [[GPBStringFloatDictionary alloc] initWithFloats:kValues2
-                                               forKeys:kKeys2
-                                                 count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(dict2);
-  [dict addEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getFloat:NULL forKey:@"foo"]);
-  XCTAssertTrue([dict getFloat:&value forKey:@"foo"]);
-  XCTAssertEqual(value, 503.f);
-  XCTAssertTrue([dict getFloat:NULL forKey:@"bar"]);
-  XCTAssertTrue([dict getFloat:&value forKey:@"bar"]);
-  XCTAssertEqual(value, 502.f);
-  XCTAssertTrue([dict getFloat:NULL forKey:@"baz"]);
-  XCTAssertTrue([dict getFloat:&value forKey:@"baz"]);
-  XCTAssertEqual(value, 500.f);
-  XCTAssertTrue([dict getFloat:NULL forKey:@"mumble"]);
-  XCTAssertTrue([dict getFloat:&value forKey:@"mumble"]);
-  XCTAssertEqual(value, 501.f);
-
-  [dict2 release];
-  [dict release];
-}
-
-@end
-
-#pragma mark - String -> Double
-
-@interface GPBStringDoubleDictionaryTests : XCTestCase
-@end
-
-@implementation GPBStringDoubleDictionaryTests
-
-- (void)testEmpty {
-  GPBStringDoubleDictionary *dict = [[GPBStringDoubleDictionary alloc] init];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertFalse([dict getDouble:NULL forKey:@"foo"]);
-  [dict enumerateKeysAndDoublesUsingBlock:^(NSString *aKey, double aValue, BOOL *stop) {
-    #pragma unused(aKey, aValue, stop)
-    XCTFail(@"Shouldn't get here!");
-  }];
-  [dict release];
-}
-
-- (void)testOne {
-  GPBStringDoubleDictionary *dict = [[GPBStringDoubleDictionary alloc] init];
-  [dict setDouble:600. forKey:@"foo"];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 1U);
-  double value;
-  XCTAssertTrue([dict getDouble:NULL forKey:@"foo"]);
-  XCTAssertTrue([dict getDouble:&value forKey:@"foo"]);
-  XCTAssertEqual(value, 600.);
-  XCTAssertFalse([dict getDouble:NULL forKey:@"bar"]);
-  [dict enumerateKeysAndDoublesUsingBlock:^(NSString *aKey, double aValue, BOOL *stop) {
-    XCTAssertEqualObjects(aKey, @"foo");
-    XCTAssertEqual(aValue, 600.);
-    XCTAssertNotEqual(stop, NULL);
-  }];
-  [dict release];
-}
-
-- (void)testBasics {
-  const NSString *kKeys[] = { @"foo", @"bar", @"baz" };
-  const double kValues[] = { 600., 601., 602. };
-  GPBStringDoubleDictionary *dict =
-      [[GPBStringDoubleDictionary alloc] initWithDoubles:kValues
-                                                 forKeys:kKeys
-                                                   count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 3U);
-  double value;
-  XCTAssertTrue([dict getDouble:NULL forKey:@"foo"]);
-  XCTAssertTrue([dict getDouble:&value forKey:@"foo"]);
-  XCTAssertEqual(value, 600.);
-  XCTAssertTrue([dict getDouble:NULL forKey:@"bar"]);
-  XCTAssertTrue([dict getDouble:&value forKey:@"bar"]);
-  XCTAssertEqual(value, 601.);
-  XCTAssertTrue([dict getDouble:NULL forKey:@"baz"]);
-  XCTAssertTrue([dict getDouble:&value forKey:@"baz"]);
-  XCTAssertEqual(value, 602.);
-  XCTAssertFalse([dict getDouble:NULL forKey:@"mumble"]);
-
-  __block NSUInteger idx = 0;
-  NSString **seenKeys = malloc(3 * sizeof(NSString*));
-  double *seenValues = malloc(3 * sizeof(double));
-  [dict enumerateKeysAndDoublesUsingBlock:^(NSString *aKey, double aValue, BOOL *stop) {
-    XCTAssertLessThan(idx, 3U);
-    seenKeys[idx] = aKey;
-    seenValues[idx] = aValue;
-    XCTAssertNotEqual(stop, NULL);
-    ++idx;
-  }];
-  for (int i = 0; i < 3; ++i) {
-    BOOL foundKey = NO;
-    for (int j = 0; (j < 3) && !foundKey; ++j) {
-      if ([kKeys[i] isEqual:seenKeys[j]]) {
-        foundKey = YES;
-        XCTAssertEqual(kValues[i], seenValues[j], @"i = %d, j = %d", i, j);
-      }
-    }
-    XCTAssertTrue(foundKey, @"i = %d", i);
-  }
-  free(seenKeys);
-  free(seenValues);
-
-  // Stopping the enumeration.
-  idx = 0;
-  [dict enumerateKeysAndDoublesUsingBlock:^(NSString *aKey, double aValue, BOOL *stop) {
-    #pragma unused(aKey, aValue)
-    if (idx == 1) *stop = YES;
-    XCTAssertNotEqual(idx, 2U);
-    ++idx;
-  }];
-  [dict release];
-}
-
-- (void)testEquality {
-  const NSString *kKeys1[] = { @"foo", @"bar", @"baz", @"mumble" };
-  const NSString *kKeys2[] = { @"bar", @"foo", @"mumble" };
-  const double kValues1[] = { 600., 601., 602. };
-  const double kValues2[] = { 600., 603., 602. };
-  const double kValues3[] = { 600., 601., 602., 603. };
-  GPBStringDoubleDictionary *dict1 =
-      [[GPBStringDoubleDictionary alloc] initWithDoubles:kValues1
-                                                 forKeys:kKeys1
-                                                   count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict1);
-  GPBStringDoubleDictionary *dict1prime =
-      [[GPBStringDoubleDictionary alloc] initWithDoubles:kValues1
-                                                 forKeys:kKeys1
-                                                   count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict1prime);
-  GPBStringDoubleDictionary *dict2 =
-      [[GPBStringDoubleDictionary alloc] initWithDoubles:kValues2
-                                                 forKeys:kKeys1
-                                                   count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(dict2);
-  GPBStringDoubleDictionary *dict3 =
-      [[GPBStringDoubleDictionary alloc] initWithDoubles:kValues1
-                                                 forKeys:kKeys2
-                                                   count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict3);
-  GPBStringDoubleDictionary *dict4 =
-      [[GPBStringDoubleDictionary alloc] initWithDoubles:kValues3
-                                                 forKeys:kKeys1
-                                                   count:GPBARRAYSIZE(kValues3)];
-  XCTAssertNotNil(dict4);
-
-  // 1/1Prime should be different objects, but equal.
-  XCTAssertNotEqual(dict1, dict1prime);
-  XCTAssertEqualObjects(dict1, dict1prime);
-  // Equal, so they must have same hash.
-  XCTAssertEqual([dict1 hash], [dict1prime hash]);
-
-  // 2 is same keys, different values; not equal.
-  XCTAssertNotEqualObjects(dict1, dict2);
-
-  // 3 is different keys, same values; not equal.
-  XCTAssertNotEqualObjects(dict1, dict3);
-
-  // 4 extra pair; not equal
-  XCTAssertNotEqualObjects(dict1, dict4);
-
-  [dict1 release];
-  [dict1prime release];
-  [dict2 release];
-  [dict3 release];
-  [dict4 release];
-}
-
-- (void)testCopy {
-  const NSString *kKeys[] = { @"foo", @"bar", @"baz", @"mumble" };
-  const double kValues[] = { 600., 601., 602., 603. };
-  GPBStringDoubleDictionary *dict =
-      [[GPBStringDoubleDictionary alloc] initWithDoubles:kValues
-                                                 forKeys:kKeys
-                                                   count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-
-  GPBStringDoubleDictionary *dict2 = [dict copy];
-  XCTAssertNotNil(dict2);
-
-  // Should be new object but equal.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  XCTAssertTrue([dict2 isKindOfClass:[GPBStringDoubleDictionary class]]);
-
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testDictionaryFromDictionary {
-  const NSString *kKeys[] = { @"foo", @"bar", @"baz", @"mumble" };
-  const double kValues[] = { 600., 601., 602., 603. };
-  GPBStringDoubleDictionary *dict =
-      [[GPBStringDoubleDictionary alloc] initWithDoubles:kValues
-                                                 forKeys:kKeys
-                                                   count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-
-  GPBStringDoubleDictionary *dict2 =
-      [[GPBStringDoubleDictionary alloc] initWithDictionary:dict];
-  XCTAssertNotNil(dict2);
-
-  // Should be new pointer, but equal objects.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testAdds {
-  GPBStringDoubleDictionary *dict = [[GPBStringDoubleDictionary alloc] init];
-  XCTAssertNotNil(dict);
-
-  XCTAssertEqual(dict.count, 0U);
-  [dict setDouble:600. forKey:@"foo"];
-  XCTAssertEqual(dict.count, 1U);
-
-  const NSString *kKeys[] = { @"bar", @"baz", @"mumble" };
-  const double kValues[] = { 601., 602., 603. };
-  GPBStringDoubleDictionary *dict2 =
-      [[GPBStringDoubleDictionary alloc] initWithDoubles:kValues
-                                                 forKeys:kKeys
-                                                   count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict2);
-  [dict addEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 4U);
-
-  double value;
-  XCTAssertTrue([dict getDouble:NULL forKey:@"foo"]);
-  XCTAssertTrue([dict getDouble:&value forKey:@"foo"]);
-  XCTAssertEqual(value, 600.);
-  XCTAssertTrue([dict getDouble:NULL forKey:@"bar"]);
-  XCTAssertTrue([dict getDouble:&value forKey:@"bar"]);
-  XCTAssertEqual(value, 601.);
-  XCTAssertTrue([dict getDouble:NULL forKey:@"baz"]);
-  XCTAssertTrue([dict getDouble:&value forKey:@"baz"]);
-  XCTAssertEqual(value, 602.);
-  XCTAssertTrue([dict getDouble:NULL forKey:@"mumble"]);
-  XCTAssertTrue([dict getDouble:&value forKey:@"mumble"]);
-  XCTAssertEqual(value, 603.);
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testRemove {
-  const NSString *kKeys[] = { @"foo", @"bar", @"baz", @"mumble" };
-  const double kValues[] = { 600., 601., 602., 603. };
-  GPBStringDoubleDictionary *dict =
-      [[GPBStringDoubleDictionary alloc] initWithDoubles:kValues
-                                                 forKeys:kKeys
-                                                   count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 4U);
-
-  [dict removeDoubleForKey:@"bar"];
-  XCTAssertEqual(dict.count, 3U);
-  double value;
-  XCTAssertTrue([dict getDouble:NULL forKey:@"foo"]);
-  XCTAssertTrue([dict getDouble:&value forKey:@"foo"]);
-  XCTAssertEqual(value, 600.);
-  XCTAssertFalse([dict getDouble:NULL forKey:@"bar"]);
-  XCTAssertTrue([dict getDouble:NULL forKey:@"baz"]);
-  XCTAssertTrue([dict getDouble:&value forKey:@"baz"]);
-  XCTAssertEqual(value, 602.);
-  XCTAssertTrue([dict getDouble:NULL forKey:@"mumble"]);
-  XCTAssertTrue([dict getDouble:&value forKey:@"mumble"]);
-  XCTAssertEqual(value, 603.);
-
-  // Remove again does nothing.
-  [dict removeDoubleForKey:@"bar"];
-  XCTAssertEqual(dict.count, 3U);
-  XCTAssertTrue([dict getDouble:NULL forKey:@"foo"]);
-  XCTAssertTrue([dict getDouble:&value forKey:@"foo"]);
-  XCTAssertEqual(value, 600.);
-  XCTAssertFalse([dict getDouble:NULL forKey:@"bar"]);
-  XCTAssertTrue([dict getDouble:NULL forKey:@"baz"]);
-  XCTAssertTrue([dict getDouble:&value forKey:@"baz"]);
-  XCTAssertEqual(value, 602.);
-  XCTAssertTrue([dict getDouble:NULL forKey:@"mumble"]);
-  XCTAssertTrue([dict getDouble:&value forKey:@"mumble"]);
-  XCTAssertEqual(value, 603.);
-
-  [dict removeDoubleForKey:@"mumble"];
-  XCTAssertEqual(dict.count, 2U);
-  XCTAssertTrue([dict getDouble:NULL forKey:@"foo"]);
-  XCTAssertTrue([dict getDouble:&value forKey:@"foo"]);
-  XCTAssertEqual(value, 600.);
-  XCTAssertFalse([dict getDouble:NULL forKey:@"bar"]);
-  XCTAssertTrue([dict getDouble:NULL forKey:@"baz"]);
-  XCTAssertTrue([dict getDouble:&value forKey:@"baz"]);
-  XCTAssertEqual(value, 602.);
-  XCTAssertFalse([dict getDouble:NULL forKey:@"mumble"]);
-
-  [dict removeAll];
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertFalse([dict getDouble:NULL forKey:@"foo"]);
-  XCTAssertFalse([dict getDouble:NULL forKey:@"bar"]);
-  XCTAssertFalse([dict getDouble:NULL forKey:@"baz"]);
-  XCTAssertFalse([dict getDouble:NULL forKey:@"mumble"]);
-  [dict release];
-}
-
-- (void)testInplaceMutation {
-  const NSString *kKeys[] = { @"foo", @"bar", @"baz", @"mumble" };
-  const double kValues[] = { 600., 601., 602., 603. };
-  GPBStringDoubleDictionary *dict =
-      [[GPBStringDoubleDictionary alloc] initWithDoubles:kValues
-                                                 forKeys:kKeys
-                                                   count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 4U);
-  double value;
-  XCTAssertTrue([dict getDouble:NULL forKey:@"foo"]);
-  XCTAssertTrue([dict getDouble:&value forKey:@"foo"]);
-  XCTAssertEqual(value, 600.);
-  XCTAssertTrue([dict getDouble:NULL forKey:@"bar"]);
-  XCTAssertTrue([dict getDouble:&value forKey:@"bar"]);
-  XCTAssertEqual(value, 601.);
-  XCTAssertTrue([dict getDouble:NULL forKey:@"baz"]);
-  XCTAssertTrue([dict getDouble:&value forKey:@"baz"]);
-  XCTAssertEqual(value, 602.);
-  XCTAssertTrue([dict getDouble:NULL forKey:@"mumble"]);
-  XCTAssertTrue([dict getDouble:&value forKey:@"mumble"]);
-  XCTAssertEqual(value, 603.);
-
-  [dict setDouble:603. forKey:@"foo"];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getDouble:NULL forKey:@"foo"]);
-  XCTAssertTrue([dict getDouble:&value forKey:@"foo"]);
-  XCTAssertEqual(value, 603.);
-  XCTAssertTrue([dict getDouble:NULL forKey:@"bar"]);
-  XCTAssertTrue([dict getDouble:&value forKey:@"bar"]);
-  XCTAssertEqual(value, 601.);
-  XCTAssertTrue([dict getDouble:NULL forKey:@"baz"]);
-  XCTAssertTrue([dict getDouble:&value forKey:@"baz"]);
-  XCTAssertEqual(value, 602.);
-  XCTAssertTrue([dict getDouble:NULL forKey:@"mumble"]);
-  XCTAssertTrue([dict getDouble:&value forKey:@"mumble"]);
-  XCTAssertEqual(value, 603.);
-
-  [dict setDouble:601. forKey:@"mumble"];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getDouble:NULL forKey:@"foo"]);
-  XCTAssertTrue([dict getDouble:&value forKey:@"foo"]);
-  XCTAssertEqual(value, 603.);
-  XCTAssertTrue([dict getDouble:NULL forKey:@"bar"]);
-  XCTAssertTrue([dict getDouble:&value forKey:@"bar"]);
-  XCTAssertEqual(value, 601.);
-  XCTAssertTrue([dict getDouble:NULL forKey:@"baz"]);
-  XCTAssertTrue([dict getDouble:&value forKey:@"baz"]);
-  XCTAssertEqual(value, 602.);
-  XCTAssertTrue([dict getDouble:NULL forKey:@"mumble"]);
-  XCTAssertTrue([dict getDouble:&value forKey:@"mumble"]);
-  XCTAssertEqual(value, 601.);
-
-  const NSString *kKeys2[] = { @"bar", @"baz" };
-  const double kValues2[] = { 602., 600. };
-  GPBStringDoubleDictionary *dict2 =
-      [[GPBStringDoubleDictionary alloc] initWithDoubles:kValues2
-                                                 forKeys:kKeys2
-                                                   count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(dict2);
-  [dict addEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getDouble:NULL forKey:@"foo"]);
-  XCTAssertTrue([dict getDouble:&value forKey:@"foo"]);
-  XCTAssertEqual(value, 603.);
-  XCTAssertTrue([dict getDouble:NULL forKey:@"bar"]);
-  XCTAssertTrue([dict getDouble:&value forKey:@"bar"]);
-  XCTAssertEqual(value, 602.);
-  XCTAssertTrue([dict getDouble:NULL forKey:@"baz"]);
-  XCTAssertTrue([dict getDouble:&value forKey:@"baz"]);
-  XCTAssertEqual(value, 600.);
-  XCTAssertTrue([dict getDouble:NULL forKey:@"mumble"]);
-  XCTAssertTrue([dict getDouble:&value forKey:@"mumble"]);
-  XCTAssertEqual(value, 601.);
-
-  [dict2 release];
-  [dict release];
-}
-
-@end
-
-#pragma mark - String -> Enum
-
-@interface GPBStringEnumDictionaryTests : XCTestCase
-@end
-
-@implementation GPBStringEnumDictionaryTests
-
-- (void)testEmpty {
-  GPBStringEnumDictionary *dict = [[GPBStringEnumDictionary alloc] init];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertFalse([dict getEnum:NULL forKey:@"foo"]);
-  [dict enumerateKeysAndEnumsUsingBlock:^(NSString *aKey, int32_t aValue, BOOL *stop) {
-    #pragma unused(aKey, aValue, stop)
-    XCTFail(@"Shouldn't get here!");
-  }];
-  [dict release];
-}
-
-- (void)testOne {
-  GPBStringEnumDictionary *dict = [[GPBStringEnumDictionary alloc] init];
-  [dict setEnum:700 forKey:@"foo"];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 1U);
-  int32_t value;
-  XCTAssertTrue([dict getEnum:NULL forKey:@"foo"]);
-  XCTAssertTrue([dict getEnum:&value forKey:@"foo"]);
-  XCTAssertEqual(value, 700);
-  XCTAssertFalse([dict getEnum:NULL forKey:@"bar"]);
-  [dict enumerateKeysAndEnumsUsingBlock:^(NSString *aKey, int32_t aValue, BOOL *stop) {
-    XCTAssertEqualObjects(aKey, @"foo");
-    XCTAssertEqual(aValue, 700);
-    XCTAssertNotEqual(stop, NULL);
-  }];
-  [dict release];
-}
-
-- (void)testBasics {
-  const NSString *kKeys[] = { @"foo", @"bar", @"baz" };
-  const int32_t kValues[] = { 700, 701, 702 };
-  GPBStringEnumDictionary *dict =
-      [[GPBStringEnumDictionary alloc] initWithEnums:kValues
-                                             forKeys:kKeys
-                                               count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 3U);
-  int32_t value;
-  XCTAssertTrue([dict getEnum:NULL forKey:@"foo"]);
-  XCTAssertTrue([dict getEnum:&value forKey:@"foo"]);
-  XCTAssertEqual(value, 700);
-  XCTAssertTrue([dict getEnum:NULL forKey:@"bar"]);
-  XCTAssertTrue([dict getEnum:&value forKey:@"bar"]);
-  XCTAssertEqual(value, 701);
-  XCTAssertTrue([dict getEnum:NULL forKey:@"baz"]);
-  XCTAssertTrue([dict getEnum:&value forKey:@"baz"]);
-  XCTAssertEqual(value, 702);
-  XCTAssertFalse([dict getEnum:NULL forKey:@"mumble"]);
-
-  __block NSUInteger idx = 0;
-  NSString **seenKeys = malloc(3 * sizeof(NSString*));
-  int32_t *seenValues = malloc(3 * sizeof(int32_t));
-  [dict enumerateKeysAndEnumsUsingBlock:^(NSString *aKey, int32_t aValue, BOOL *stop) {
-    XCTAssertLessThan(idx, 3U);
-    seenKeys[idx] = aKey;
-    seenValues[idx] = aValue;
-    XCTAssertNotEqual(stop, NULL);
-    ++idx;
-  }];
-  for (int i = 0; i < 3; ++i) {
-    BOOL foundKey = NO;
-    for (int j = 0; (j < 3) && !foundKey; ++j) {
-      if ([kKeys[i] isEqual:seenKeys[j]]) {
-        foundKey = YES;
-        XCTAssertEqual(kValues[i], seenValues[j], @"i = %d, j = %d", i, j);
-      }
-    }
-    XCTAssertTrue(foundKey, @"i = %d", i);
-  }
-  free(seenKeys);
-  free(seenValues);
-
-  // Stopping the enumeration.
-  idx = 0;
-  [dict enumerateKeysAndEnumsUsingBlock:^(NSString *aKey, int32_t aValue, BOOL *stop) {
-    #pragma unused(aKey, aValue)
-    if (idx == 1) *stop = YES;
-    XCTAssertNotEqual(idx, 2U);
-    ++idx;
-  }];
-  [dict release];
-}
-
-- (void)testEquality {
-  const NSString *kKeys1[] = { @"foo", @"bar", @"baz", @"mumble" };
-  const NSString *kKeys2[] = { @"bar", @"foo", @"mumble" };
-  const int32_t kValues1[] = { 700, 701, 702 };
-  const int32_t kValues2[] = { 700, 703, 702 };
-  const int32_t kValues3[] = { 700, 701, 702, 703 };
-  GPBStringEnumDictionary *dict1 =
-      [[GPBStringEnumDictionary alloc] initWithEnums:kValues1
-                                             forKeys:kKeys1
-                                               count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict1);
-  GPBStringEnumDictionary *dict1prime =
-      [[GPBStringEnumDictionary alloc] initWithEnums:kValues1
-                                             forKeys:kKeys1
-                                               count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict1prime);
-  GPBStringEnumDictionary *dict2 =
-      [[GPBStringEnumDictionary alloc] initWithEnums:kValues2
-                                             forKeys:kKeys1
-                                               count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(dict2);
-  GPBStringEnumDictionary *dict3 =
-      [[GPBStringEnumDictionary alloc] initWithEnums:kValues1
-                                             forKeys:kKeys2
-                                               count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict3);
-  GPBStringEnumDictionary *dict4 =
-      [[GPBStringEnumDictionary alloc] initWithEnums:kValues3
-                                             forKeys:kKeys1
-                                               count:GPBARRAYSIZE(kValues3)];
-  XCTAssertNotNil(dict4);
-
-  // 1/1Prime should be different objects, but equal.
-  XCTAssertNotEqual(dict1, dict1prime);
-  XCTAssertEqualObjects(dict1, dict1prime);
-  // Equal, so they must have same hash.
-  XCTAssertEqual([dict1 hash], [dict1prime hash]);
-
-  // 2 is same keys, different values; not equal.
-  XCTAssertNotEqualObjects(dict1, dict2);
-
-  // 3 is different keys, same values; not equal.
-  XCTAssertNotEqualObjects(dict1, dict3);
-
-  // 4 extra pair; not equal
-  XCTAssertNotEqualObjects(dict1, dict4);
-
-  [dict1 release];
-  [dict1prime release];
-  [dict2 release];
-  [dict3 release];
-  [dict4 release];
-}
-
-- (void)testCopy {
-  const NSString *kKeys[] = { @"foo", @"bar", @"baz", @"mumble" };
-  const int32_t kValues[] = { 700, 701, 702, 703 };
-  GPBStringEnumDictionary *dict =
-      [[GPBStringEnumDictionary alloc] initWithEnums:kValues
-                                             forKeys:kKeys
-                                               count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-
-  GPBStringEnumDictionary *dict2 = [dict copy];
-  XCTAssertNotNil(dict2);
-
-  // Should be new object but equal.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  XCTAssertTrue([dict2 isKindOfClass:[GPBStringEnumDictionary class]]);
-
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testDictionaryFromDictionary {
-  const NSString *kKeys[] = { @"foo", @"bar", @"baz", @"mumble" };
-  const int32_t kValues[] = { 700, 701, 702, 703 };
-  GPBStringEnumDictionary *dict =
-      [[GPBStringEnumDictionary alloc] initWithEnums:kValues
-                                             forKeys:kKeys
-                                               count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-
-  GPBStringEnumDictionary *dict2 =
-      [[GPBStringEnumDictionary alloc] initWithDictionary:dict];
-  XCTAssertNotNil(dict2);
-
-  // Should be new pointer, but equal objects.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testAdds {
-  GPBStringEnumDictionary *dict = [[GPBStringEnumDictionary alloc] init];
-  XCTAssertNotNil(dict);
-
-  XCTAssertEqual(dict.count, 0U);
-  [dict setEnum:700 forKey:@"foo"];
-  XCTAssertEqual(dict.count, 1U);
-
-  const NSString *kKeys[] = { @"bar", @"baz", @"mumble" };
-  const int32_t kValues[] = { 701, 702, 703 };
-  GPBStringEnumDictionary *dict2 =
-      [[GPBStringEnumDictionary alloc] initWithEnums:kValues
-                                             forKeys:kKeys
-                                               count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict2);
-  [dict addRawEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 4U);
-
-  int32_t value;
-  XCTAssertTrue([dict getEnum:NULL forKey:@"foo"]);
-  XCTAssertTrue([dict getEnum:&value forKey:@"foo"]);
-  XCTAssertEqual(value, 700);
-  XCTAssertTrue([dict getEnum:NULL forKey:@"bar"]);
-  XCTAssertTrue([dict getEnum:&value forKey:@"bar"]);
-  XCTAssertEqual(value, 701);
-  XCTAssertTrue([dict getEnum:NULL forKey:@"baz"]);
-  XCTAssertTrue([dict getEnum:&value forKey:@"baz"]);
-  XCTAssertEqual(value, 702);
-  XCTAssertTrue([dict getEnum:NULL forKey:@"mumble"]);
-  XCTAssertTrue([dict getEnum:&value forKey:@"mumble"]);
-  XCTAssertEqual(value, 703);
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testRemove {
-  const NSString *kKeys[] = { @"foo", @"bar", @"baz", @"mumble" };
-  const int32_t kValues[] = { 700, 701, 702, 703 };
-  GPBStringEnumDictionary *dict =
-      [[GPBStringEnumDictionary alloc] initWithEnums:kValues
-                                             forKeys:kKeys
-                                               count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 4U);
-
-  [dict removeEnumForKey:@"bar"];
-  XCTAssertEqual(dict.count, 3U);
-  int32_t value;
-  XCTAssertTrue([dict getEnum:NULL forKey:@"foo"]);
-  XCTAssertTrue([dict getEnum:&value forKey:@"foo"]);
-  XCTAssertEqual(value, 700);
-  XCTAssertFalse([dict getEnum:NULL forKey:@"bar"]);
-  XCTAssertTrue([dict getEnum:NULL forKey:@"baz"]);
-  XCTAssertTrue([dict getEnum:&value forKey:@"baz"]);
-  XCTAssertEqual(value, 702);
-  XCTAssertTrue([dict getEnum:NULL forKey:@"mumble"]);
-  XCTAssertTrue([dict getEnum:&value forKey:@"mumble"]);
-  XCTAssertEqual(value, 703);
-
-  // Remove again does nothing.
-  [dict removeEnumForKey:@"bar"];
-  XCTAssertEqual(dict.count, 3U);
-  XCTAssertTrue([dict getEnum:NULL forKey:@"foo"]);
-  XCTAssertTrue([dict getEnum:&value forKey:@"foo"]);
-  XCTAssertEqual(value, 700);
-  XCTAssertFalse([dict getEnum:NULL forKey:@"bar"]);
-  XCTAssertTrue([dict getEnum:NULL forKey:@"baz"]);
-  XCTAssertTrue([dict getEnum:&value forKey:@"baz"]);
-  XCTAssertEqual(value, 702);
-  XCTAssertTrue([dict getEnum:NULL forKey:@"mumble"]);
-  XCTAssertTrue([dict getEnum:&value forKey:@"mumble"]);
-  XCTAssertEqual(value, 703);
-
-  [dict removeEnumForKey:@"mumble"];
-  XCTAssertEqual(dict.count, 2U);
-  XCTAssertTrue([dict getEnum:NULL forKey:@"foo"]);
-  XCTAssertTrue([dict getEnum:&value forKey:@"foo"]);
-  XCTAssertEqual(value, 700);
-  XCTAssertFalse([dict getEnum:NULL forKey:@"bar"]);
-  XCTAssertTrue([dict getEnum:NULL forKey:@"baz"]);
-  XCTAssertTrue([dict getEnum:&value forKey:@"baz"]);
-  XCTAssertEqual(value, 702);
-  XCTAssertFalse([dict getEnum:NULL forKey:@"mumble"]);
-
-  [dict removeAll];
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertFalse([dict getEnum:NULL forKey:@"foo"]);
-  XCTAssertFalse([dict getEnum:NULL forKey:@"bar"]);
-  XCTAssertFalse([dict getEnum:NULL forKey:@"baz"]);
-  XCTAssertFalse([dict getEnum:NULL forKey:@"mumble"]);
-  [dict release];
-}
-
-- (void)testInplaceMutation {
-  const NSString *kKeys[] = { @"foo", @"bar", @"baz", @"mumble" };
-  const int32_t kValues[] = { 700, 701, 702, 703 };
-  GPBStringEnumDictionary *dict =
-      [[GPBStringEnumDictionary alloc] initWithEnums:kValues
-                                             forKeys:kKeys
-                                               count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 4U);
-  int32_t value;
-  XCTAssertTrue([dict getEnum:NULL forKey:@"foo"]);
-  XCTAssertTrue([dict getEnum:&value forKey:@"foo"]);
-  XCTAssertEqual(value, 700);
-  XCTAssertTrue([dict getEnum:NULL forKey:@"bar"]);
-  XCTAssertTrue([dict getEnum:&value forKey:@"bar"]);
-  XCTAssertEqual(value, 701);
-  XCTAssertTrue([dict getEnum:NULL forKey:@"baz"]);
-  XCTAssertTrue([dict getEnum:&value forKey:@"baz"]);
-  XCTAssertEqual(value, 702);
-  XCTAssertTrue([dict getEnum:NULL forKey:@"mumble"]);
-  XCTAssertTrue([dict getEnum:&value forKey:@"mumble"]);
-  XCTAssertEqual(value, 703);
-
-  [dict setEnum:703 forKey:@"foo"];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getEnum:NULL forKey:@"foo"]);
-  XCTAssertTrue([dict getEnum:&value forKey:@"foo"]);
-  XCTAssertEqual(value, 703);
-  XCTAssertTrue([dict getEnum:NULL forKey:@"bar"]);
-  XCTAssertTrue([dict getEnum:&value forKey:@"bar"]);
-  XCTAssertEqual(value, 701);
-  XCTAssertTrue([dict getEnum:NULL forKey:@"baz"]);
-  XCTAssertTrue([dict getEnum:&value forKey:@"baz"]);
-  XCTAssertEqual(value, 702);
-  XCTAssertTrue([dict getEnum:NULL forKey:@"mumble"]);
-  XCTAssertTrue([dict getEnum:&value forKey:@"mumble"]);
-  XCTAssertEqual(value, 703);
-
-  [dict setEnum:701 forKey:@"mumble"];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getEnum:NULL forKey:@"foo"]);
-  XCTAssertTrue([dict getEnum:&value forKey:@"foo"]);
-  XCTAssertEqual(value, 703);
-  XCTAssertTrue([dict getEnum:NULL forKey:@"bar"]);
-  XCTAssertTrue([dict getEnum:&value forKey:@"bar"]);
-  XCTAssertEqual(value, 701);
-  XCTAssertTrue([dict getEnum:NULL forKey:@"baz"]);
-  XCTAssertTrue([dict getEnum:&value forKey:@"baz"]);
-  XCTAssertEqual(value, 702);
-  XCTAssertTrue([dict getEnum:NULL forKey:@"mumble"]);
-  XCTAssertTrue([dict getEnum:&value forKey:@"mumble"]);
-  XCTAssertEqual(value, 701);
-
-  const NSString *kKeys2[] = { @"bar", @"baz" };
-  const int32_t kValues2[] = { 702, 700 };
-  GPBStringEnumDictionary *dict2 =
-      [[GPBStringEnumDictionary alloc] initWithEnums:kValues2
-                                             forKeys:kKeys2
-                                               count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(dict2);
-  [dict addRawEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getEnum:NULL forKey:@"foo"]);
-  XCTAssertTrue([dict getEnum:&value forKey:@"foo"]);
-  XCTAssertEqual(value, 703);
-  XCTAssertTrue([dict getEnum:NULL forKey:@"bar"]);
-  XCTAssertTrue([dict getEnum:&value forKey:@"bar"]);
-  XCTAssertEqual(value, 702);
-  XCTAssertTrue([dict getEnum:NULL forKey:@"baz"]);
-  XCTAssertTrue([dict getEnum:&value forKey:@"baz"]);
-  XCTAssertEqual(value, 700);
-  XCTAssertTrue([dict getEnum:NULL forKey:@"mumble"]);
-  XCTAssertTrue([dict getEnum:&value forKey:@"mumble"]);
-  XCTAssertEqual(value, 701);
-
-  [dict2 release];
-  [dict release];
-}
-
-@end
-
-#pragma mark - String -> Enum (Unknown Enums)
-
-@interface GPBStringEnumDictionaryUnknownEnumTests : XCTestCase
-@end
-
-@implementation GPBStringEnumDictionaryUnknownEnumTests
-
-- (void)testRawBasics {
-  const NSString *kKeys[] = { @"foo", @"bar", @"baz" };
-  const int32_t kValues[] = { 700, 801, 702 };
-  GPBStringEnumDictionary *dict =
-      [[GPBStringEnumDictionary alloc] initWithValidationFunction:TestingEnum_IsValidValue
-                                                        rawValues:kValues
-                                                          forKeys:kKeys
-                                                            count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 3U);
-  XCTAssertTrue(dict.validationFunc == TestingEnum_IsValidValue);  // Pointer comparison
-  int32_t value;
-  XCTAssertTrue([dict getRawValue:NULL forKey:@"foo"]);
-  XCTAssertTrue([dict getRawValue:&value forKey:@"foo"]);
-  XCTAssertEqual(value, 700);
-  XCTAssertTrue([dict getEnum:NULL forKey:@"bar"]);
-  XCTAssertTrue([dict getEnum:&value forKey:@"bar"]);
-  XCTAssertEqual(value, kGPBUnrecognizedEnumeratorValue);
-  XCTAssertTrue([dict getRawValue:NULL forKey:@"bar"]);
-  XCTAssertTrue([dict getRawValue:&value forKey:@"bar"]);
-  XCTAssertEqual(value, 801);
-  XCTAssertTrue([dict getRawValue:NULL forKey:@"baz"]);
-  XCTAssertTrue([dict getRawValue:&value forKey:@"baz"]);
-  XCTAssertEqual(value, 702);
-  XCTAssertFalse([dict getRawValue:NULL forKey:@"mumble"]);
-
-  __block NSUInteger idx = 0;
-  NSString **seenKeys = malloc(3 * sizeof(NSString*));
-  int32_t *seenValues = malloc(3 * sizeof(int32_t));
-  [dict enumerateKeysAndEnumsUsingBlock:^(NSString *aKey, int32_t aValue, BOOL *stop) {
-    XCTAssertLessThan(idx, 3U);
-    seenKeys[idx] = aKey;
-    seenValues[idx] = aValue;
-    XCTAssertNotEqual(stop, NULL);
-    ++idx;
-  }];
-  for (int i = 0; i < 3; ++i) {
-    BOOL foundKey = NO;
-    for (int j = 0; (j < 3) && !foundKey; ++j) {
-      if ([kKeys[i] isEqual:seenKeys[j]]) {
-        foundKey = YES;
-        if (i == 1) {
-          XCTAssertEqual(kGPBUnrecognizedEnumeratorValue, seenValues[j], @"i = %d, j = %d", i, j);
-        } else {
-          XCTAssertEqual(kValues[i], seenValues[j], @"i = %d, j = %d", i, j);
-        }
-      }
-    }
-    XCTAssertTrue(foundKey, @"i = %d", i);
-  }
-  idx = 0;
-  [dict enumerateKeysAndRawValuesUsingBlock:^(NSString *aKey, int32_t aValue, BOOL *stop) {
-    XCTAssertLessThan(idx, 3U);
-    seenKeys[idx] = aKey;
-    seenValues[idx] = aValue;
-    XCTAssertNotEqual(stop, NULL);
-    ++idx;
-  }];
-  for (int i = 0; i < 3; ++i) {
-    BOOL foundKey = NO;
-    for (int j = 0; (j < 3) && !foundKey; ++j) {
-      if ([kKeys[i] isEqual:seenKeys[j]]) {
-        foundKey = YES;
-        XCTAssertEqual(kValues[i], seenValues[j], @"i = %d, j = %d", i, j);
-      }
-    }
-    XCTAssertTrue(foundKey, @"i = %d", i);
-  }
-  free(seenKeys);
-  free(seenValues);
-
-  // Stopping the enumeration.
-  idx = 0;
-  [dict enumerateKeysAndRawValuesUsingBlock:^(NSString *aKey, int32_t aValue, BOOL *stop) {
-    #pragma unused(aKey, aValue)
-    if (idx == 1) *stop = YES;
-    XCTAssertNotEqual(idx, 2U);
-    ++idx;
-  }];
-  [dict release];
-}
-
-- (void)testEqualityWithUnknowns {
-  const NSString *kKeys1[] = { @"foo", @"bar", @"baz", @"mumble" };
-  const NSString *kKeys2[] = { @"bar", @"foo", @"mumble" };
-  const int32_t kValues1[] = { 700, 801, 702 };  // Unknown
-  const int32_t kValues2[] = { 700, 803, 702 };  // Unknown
-  const int32_t kValues3[] = { 700, 801, 702, 803 };  // Unknowns
-  GPBStringEnumDictionary *dict1 =
-      [[GPBStringEnumDictionary alloc] initWithValidationFunction:TestingEnum_IsValidValue
-                                                        rawValues:kValues1
-                                                          forKeys:kKeys1
-                                                            count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict1);
-  GPBStringEnumDictionary *dict1prime =
-      [[GPBStringEnumDictionary alloc] initWithValidationFunction:TestingEnum_IsValidValue
-                                                        rawValues:kValues1
-                                                          forKeys:kKeys1
-                                                            count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict1prime);
-  GPBStringEnumDictionary *dict2 =
-      [[GPBStringEnumDictionary alloc] initWithValidationFunction:TestingEnum_IsValidValue
-                                                        rawValues:kValues2
-                                                          forKeys:kKeys1
-                                                            count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(dict2);
-  GPBStringEnumDictionary *dict3 =
-      [[GPBStringEnumDictionary alloc] initWithValidationFunction:TestingEnum_IsValidValue
-                                                        rawValues:kValues1
-                                                          forKeys:kKeys2
-                                                            count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict3);
-  GPBStringEnumDictionary *dict4 =
-      [[GPBStringEnumDictionary alloc] initWithValidationFunction:TestingEnum_IsValidValue
-                                                        rawValues:kValues3
-                                                          forKeys:kKeys1
-                                                            count:GPBARRAYSIZE(kValues3)];
-  XCTAssertNotNil(dict4);
-
-  // 1/1Prime should be different objects, but equal.
-  XCTAssertNotEqual(dict1, dict1prime);
-  XCTAssertEqualObjects(dict1, dict1prime);
-  // Equal, so they must have same hash.
-  XCTAssertEqual([dict1 hash], [dict1prime hash]);
-
-  // 2 is same keys, different values; not equal.
-  XCTAssertNotEqualObjects(dict1, dict2);
-
-  // 3 is different keys, same values; not equal.
-  XCTAssertNotEqualObjects(dict1, dict3);
-
-  // 4 extra pair; not equal
-  XCTAssertNotEqualObjects(dict1, dict4);
-
-  [dict1 release];
-  [dict1prime release];
-  [dict2 release];
-  [dict3 release];
-  [dict4 release];
-}
-
-- (void)testCopyWithUnknowns {
-  const NSString *kKeys[] = { @"foo", @"bar", @"baz", @"mumble" };
-  const int32_t kValues[] = { 700, 801, 702, 803 };  // Unknown
-  GPBStringEnumDictionary *dict =
-      [[GPBStringEnumDictionary alloc] initWithValidationFunction:TestingEnum_IsValidValue
-                                                        rawValues:kValues
-                                                          forKeys:kKeys
-                                                            count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-
-  GPBStringEnumDictionary *dict2 = [dict copy];
-  XCTAssertNotNil(dict2);
-
-  // Should be new pointer, but equal objects.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqual(dict.validationFunc, dict2.validationFunc);  // Pointer comparison
-  XCTAssertEqualObjects(dict, dict2);
-
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testDictionaryFromDictionary {
-  const NSString *kKeys[] = { @"foo", @"bar", @"baz", @"mumble" };
-  const int32_t kValues[] = { 700, 801, 702, 803 };  // Unknowns
-  GPBStringEnumDictionary *dict =
-      [[GPBStringEnumDictionary alloc] initWithValidationFunction:TestingEnum_IsValidValue
-                                                        rawValues:kValues
-                                                          forKeys:kKeys
-                                                            count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-
-  GPBStringEnumDictionary *dict2 =
-      [[GPBStringEnumDictionary alloc] initWithDictionary:dict];
-  XCTAssertNotNil(dict2);
-
-  // Should be new pointer, but equal objects.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  XCTAssertEqual(dict.validationFunc, dict2.validationFunc);  // Pointer comparison
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testUnknownAdds {
-  GPBStringEnumDictionary *dict =
-      [[GPBStringEnumDictionary alloc] initWithValidationFunction:TestingEnum_IsValidValue];
-  XCTAssertNotNil(dict);
-
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertThrowsSpecificNamed([dict setEnum:801 forKey:@"bar"],  // Unknown
-                               NSException, NSInvalidArgumentException);
-  XCTAssertEqual(dict.count, 0U);
-  [dict setRawValue:801 forKey:@"bar"];  // Unknown
-  XCTAssertEqual(dict.count, 1U);
-
-  const NSString *kKeys[] = { @"foo", @"baz", @"mumble" };
-  const int32_t kValues[] = { 700, 702, 803 };  // Unknown
-  GPBStringEnumDictionary *dict2 =
-      [[GPBStringEnumDictionary alloc] initWithEnums:kValues
-                                               forKeys:kKeys
-                                                 count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict2);
-  [dict addRawEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 4U);
-
-  int32_t value;
-  XCTAssertTrue([dict getEnum:NULL forKey:@"foo"]);
-  XCTAssertTrue([dict getEnum:&value forKey:@"foo"]);
-  XCTAssertEqual(value, 700);
-  XCTAssertTrue([dict getEnum:NULL forKey:@"bar"]);
-  XCTAssertTrue([dict getEnum:&value forKey:@"bar"]);
-  XCTAssertEqual(value, kGPBUnrecognizedEnumeratorValue);
-  XCTAssertTrue([dict getRawValue:NULL forKey:@"bar"]);
-  XCTAssertTrue([dict getRawValue:&value forKey:@"bar"]);
-  XCTAssertEqual(value, 801);
-  XCTAssertTrue([dict getEnum:NULL forKey:@"baz"]);
-  XCTAssertTrue([dict getEnum:&value forKey:@"baz"]);
-  XCTAssertEqual(value, 702);
-  XCTAssertTrue([dict getEnum:NULL forKey:@"mumble"]);
-  XCTAssertTrue([dict getEnum:&value forKey:@"mumble"]);
-  XCTAssertEqual(value, kGPBUnrecognizedEnumeratorValue);
-  XCTAssertTrue([dict getRawValue:NULL forKey:@"mumble"]);
-  XCTAssertTrue([dict getRawValue:&value forKey:@"mumble"]);
-  XCTAssertEqual(value, 803);
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testUnknownRemove {
-  const NSString *kKeys[] = { @"foo", @"bar", @"baz", @"mumble" };
-  const int32_t kValues[] = { 700, 801, 702, 803 };  // Unknowns
-  GPBStringEnumDictionary *dict =
-      [[GPBStringEnumDictionary alloc] initWithValidationFunction:TestingEnum_IsValidValue
-                                                        rawValues:kValues
-                                                          forKeys:kKeys
-                                                            count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 4U);
-
-  [dict removeEnumForKey:@"bar"];
-  XCTAssertEqual(dict.count, 3U);
-  int32_t value;
-  XCTAssertTrue([dict getEnum:NULL forKey:@"foo"]);
-  XCTAssertTrue([dict getEnum:&value forKey:@"foo"]);
-  XCTAssertEqual(value, 700);
-  XCTAssertFalse([dict getEnum:NULL forKey:@"bar"]);
-  XCTAssertTrue([dict getEnum:NULL forKey:@"baz"]);
-  XCTAssertTrue([dict getEnum:&value forKey:@"baz"]);
-  XCTAssertEqual(value, 702);
-  XCTAssertTrue([dict getRawValue:NULL forKey:@"mumble"]);
-  XCTAssertTrue([dict getRawValue:&value forKey:@"mumble"]);
-  XCTAssertEqual(value, 803);
-
-  // Remove again does nothing.
-  [dict removeEnumForKey:@"bar"];
-  XCTAssertEqual(dict.count, 3U);
-  XCTAssertTrue([dict getEnum:NULL forKey:@"foo"]);
-  XCTAssertTrue([dict getEnum:&value forKey:@"foo"]);
-  XCTAssertEqual(value, 700);
-  XCTAssertFalse([dict getEnum:NULL forKey:@"bar"]);
-  XCTAssertTrue([dict getEnum:NULL forKey:@"baz"]);
-  XCTAssertTrue([dict getEnum:&value forKey:@"baz"]);
-  XCTAssertEqual(value, 702);
-  XCTAssertTrue([dict getRawValue:NULL forKey:@"mumble"]);
-  XCTAssertTrue([dict getRawValue:&value forKey:@"mumble"]);
-  XCTAssertEqual(value, 803);
-
-  [dict removeEnumForKey:@"mumble"];
-  XCTAssertEqual(dict.count, 2U);
-  XCTAssertTrue([dict getEnum:NULL forKey:@"foo"]);
-  XCTAssertTrue([dict getEnum:&value forKey:@"foo"]);
-  XCTAssertEqual(value, 700);
-  XCTAssertFalse([dict getEnum:NULL forKey:@"bar"]);
-  XCTAssertTrue([dict getEnum:NULL forKey:@"baz"]);
-  XCTAssertTrue([dict getEnum:&value forKey:@"baz"]);
-  XCTAssertEqual(value, 702);
-  XCTAssertFalse([dict getEnum:NULL forKey:@"mumble"]);
-
-  [dict removeAll];
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertFalse([dict getEnum:NULL forKey:@"foo"]);
-  XCTAssertFalse([dict getEnum:NULL forKey:@"bar"]);
-  XCTAssertFalse([dict getEnum:NULL forKey:@"baz"]);
-  XCTAssertFalse([dict getEnum:NULL forKey:@"mumble"]);
-  [dict release];
-}
-
-- (void)testInplaceMutationUnknowns {
-  const NSString *kKeys[] = { @"foo", @"bar", @"baz", @"mumble" };
-  const int32_t kValues[] = { 700, 801, 702, 803 };  // Unknowns
-  GPBStringEnumDictionary *dict =
-      [[GPBStringEnumDictionary alloc] initWithValidationFunction:TestingEnum_IsValidValue
-                                                        rawValues:kValues
-                                                          forKeys:kKeys
-                                                            count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 4U);
-  int32_t value;
-  XCTAssertTrue([dict getEnum:NULL forKey:@"foo"]);
-  XCTAssertTrue([dict getEnum:&value forKey:@"foo"]);
-  XCTAssertEqual(value, 700);
-  XCTAssertTrue([dict getRawValue:NULL forKey:@"bar"]);
-  XCTAssertTrue([dict getRawValue:&value forKey:@"bar"]);
-  XCTAssertEqual(value, 801);
-  XCTAssertTrue([dict getEnum:NULL forKey:@"baz"]);
-  XCTAssertTrue([dict getEnum:&value forKey:@"baz"]);
-  XCTAssertEqual(value, 702);
-  XCTAssertTrue([dict getRawValue:NULL forKey:@"mumble"]);
-  XCTAssertTrue([dict getRawValue:&value forKey:@"mumble"]);
-  XCTAssertEqual(value, 803);
-
-  XCTAssertThrowsSpecificNamed([dict setEnum:803 forKey:@"foo"],  // Unknown
-                               NSException, NSInvalidArgumentException);
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getEnum:NULL forKey:@"foo"]);
-  XCTAssertTrue([dict getEnum:&value forKey:@"foo"]);
-  XCTAssertEqual(value, 700);
-  XCTAssertTrue([dict getRawValue:NULL forKey:@"bar"]);
-  XCTAssertTrue([dict getRawValue:&value forKey:@"bar"]);
-  XCTAssertEqual(value, 801);
-  XCTAssertTrue([dict getEnum:NULL forKey:@"baz"]);
-  XCTAssertTrue([dict getEnum:&value forKey:@"baz"]);
-  XCTAssertEqual(value, 702);
-  XCTAssertTrue([dict getRawValue:NULL forKey:@"mumble"]);
-  XCTAssertTrue([dict getRawValue:&value forKey:@"mumble"]);
-  XCTAssertEqual(value, 803);
-
-  [dict setRawValue:803 forKey:@"foo"];  // Unknown
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getRawValue:NULL forKey:@"foo"]);
-  XCTAssertTrue([dict getRawValue:&value forKey:@"foo"]);
-  XCTAssertEqual(value, 803);
-  XCTAssertTrue([dict getRawValue:NULL forKey:@"bar"]);
-  XCTAssertTrue([dict getRawValue:&value forKey:@"bar"]);
-  XCTAssertEqual(value, 801);
-  XCTAssertTrue([dict getEnum:NULL forKey:@"baz"]);
-  XCTAssertTrue([dict getEnum:&value forKey:@"baz"]);
-  XCTAssertEqual(value, 702);
-  XCTAssertTrue([dict getRawValue:NULL forKey:@"mumble"]);
-  XCTAssertTrue([dict getRawValue:&value forKey:@"mumble"]);
-  XCTAssertEqual(value, 803);
-
-  [dict setRawValue:700 forKey:@"mumble"];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getRawValue:NULL forKey:@"foo"]);
-  XCTAssertTrue([dict getRawValue:&value forKey:@"foo"]);
-  XCTAssertEqual(value, 803);
-  XCTAssertTrue([dict getRawValue:NULL forKey:@"bar"]);
-  XCTAssertTrue([dict getRawValue:&value forKey:@"bar"]);
-  XCTAssertEqual(value, 801);
-  XCTAssertTrue([dict getEnum:NULL forKey:@"baz"]);
-  XCTAssertTrue([dict getEnum:&value forKey:@"baz"]);
-  XCTAssertEqual(value, 702);
-  XCTAssertTrue([dict getEnum:NULL forKey:@"mumble"]);
-  XCTAssertTrue([dict getEnum:&value forKey:@"mumble"]);
-  XCTAssertEqual(value, 700);
-
-  const NSString *kKeys2[] = { @"bar", @"baz" };
-  const int32_t kValues2[] = { 702, 801 };  // Unknown
-  GPBStringEnumDictionary *dict2 =
-      [[GPBStringEnumDictionary alloc] initWithValidationFunction:TestingEnum_IsValidValue
-                                                        rawValues:kValues2
-                                                          forKeys:kKeys2
-                                                            count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(dict2);
-  [dict addRawEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getRawValue:NULL forKey:@"foo"]);
-  XCTAssertTrue([dict getRawValue:&value forKey:@"foo"]);
-  XCTAssertEqual(value, 803);
-  XCTAssertTrue([dict getEnum:NULL forKey:@"bar"]);
-  XCTAssertTrue([dict getEnum:&value forKey:@"bar"]);
-  XCTAssertEqual(value, 702);
-  XCTAssertTrue([dict getRawValue:NULL forKey:@"baz"]);
-  XCTAssertTrue([dict getRawValue:&value forKey:@"baz"]);
-  XCTAssertEqual(value, 801);
-  XCTAssertTrue([dict getEnum:NULL forKey:@"mumble"]);
-  XCTAssertTrue([dict getEnum:&value forKey:@"mumble"]);
-  XCTAssertEqual(value, 700);
-
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testCopyUnknowns {
-  const NSString *kKeys[] = { @"foo", @"bar", @"baz", @"mumble" };
-  const int32_t kValues[] = { 700, 801, 702, 803 };
-  GPBStringEnumDictionary *dict =
-      [[GPBStringEnumDictionary alloc] initWithValidationFunction:TestingEnum_IsValidValue
-                                                        rawValues:kValues
-                                                          forKeys:kKeys
-                                                            count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-
-  GPBStringEnumDictionary *dict2 = [dict copy];
-  XCTAssertNotNil(dict2);
-
-  // Should be new pointer, but equal objects.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  XCTAssertEqual(dict.validationFunc, dict2.validationFunc);  // Pointer comparison
-  XCTAssertTrue([dict2 isKindOfClass:[GPBStringEnumDictionary class]]);
-
-  [dict2 release];
-  [dict release];
-}
-
-@end
-
-// clang-format on
-//%PDDM-EXPAND-END TESTS_FOR_POD_VALUES(String, NSString, *, Objects, @"foo", @"bar", @"baz", @"mumble")
-
diff --git a/libs/protobuf/objectivec/Tests/GPBDictionaryTests+UInt32.m b/libs/protobuf/objectivec/Tests/GPBDictionaryTests+UInt32.m
deleted file mode 100644
index f607538..0000000
--- a/libs/protobuf/objectivec/Tests/GPBDictionaryTests+UInt32.m
+++ /dev/null
@@ -1,3678 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#import <Foundation/Foundation.h>
-#import <XCTest/XCTest.h>
-
-#import "GPBDictionary.h"
-
-#import "GPBTestUtilities.h"
-#import "google/protobuf/UnittestRuntimeProto2.pbobjc.h"
-
-// Pull in the macros (using an external file because expanding all tests
-// in a single file makes a file that is failing to work with within Xcode.
-//%PDDM-IMPORT-DEFINES GPBDictionaryTests.pddm
-
-//%PDDM-EXPAND TEST_FOR_POD_KEY(UInt32, uint32_t, 1U, 2U, 3U, 4U)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-// To let the testing macros work, add some extra methods to simplify things.
-@interface GPBUInt32EnumDictionary (TestingTweak)
-- (instancetype)initWithEnums:(const int32_t [])values
-                      forKeys:(const uint32_t [])keys
-                        count:(NSUInteger)count;
-@end
-
-static BOOL TestingEnum_IsValidValue(int32_t value) {
-  switch (value) {
-    case 700:
-    case 701:
-    case 702:
-    case 703:
-      return YES;
-    default:
-      return NO;
-  }
-}
-
-@implementation GPBUInt32EnumDictionary (TestingTweak)
-- (instancetype)initWithEnums:(const int32_t [])values
-                      forKeys:(const uint32_t [])keys
-                        count:(NSUInteger)count {
-  return [self initWithValidationFunction:TestingEnum_IsValidValue
-                                rawValues:values
-                                  forKeys:keys
-                                    count:count];
-}
-@end
-
-
-#pragma mark - UInt32 -> UInt32
-
-@interface GPBUInt32UInt32DictionaryTests : XCTestCase
-@end
-
-@implementation GPBUInt32UInt32DictionaryTests
-
-- (void)testEmpty {
-  GPBUInt32UInt32Dictionary *dict = [[GPBUInt32UInt32Dictionary alloc] init];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertFalse([dict getUInt32:NULL forKey:1U]);
-  [dict enumerateKeysAndUInt32sUsingBlock:^(uint32_t aKey, uint32_t aValue, BOOL *stop) {
-    #pragma unused(aKey, aValue, stop)
-    XCTFail(@"Shouldn't get here!");
-  }];
-  [dict release];
-}
-
-- (void)testOne {
-  GPBUInt32UInt32Dictionary *dict = [[GPBUInt32UInt32Dictionary alloc] init];
-  [dict setUInt32:100U forKey:1U];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 1U);
-  uint32_t value;
-  XCTAssertTrue([dict getUInt32:NULL forKey:1U]);
-  XCTAssertTrue([dict getUInt32:&value forKey:1U]);
-  XCTAssertEqual(value, 100U);
-  XCTAssertFalse([dict getUInt32:NULL forKey:2U]);
-  [dict enumerateKeysAndUInt32sUsingBlock:^(uint32_t aKey, uint32_t aValue, BOOL *stop) {
-    XCTAssertEqual(aKey, 1U);
-    XCTAssertEqual(aValue, 100U);
-    XCTAssertNotEqual(stop, NULL);
-  }];
-  [dict release];
-}
-
-- (void)testBasics {
-  const uint32_t kKeys[] = { 1U, 2U, 3U };
-  const uint32_t kValues[] = { 100U, 101U, 102U };
-  GPBUInt32UInt32Dictionary *dict =
-      [[GPBUInt32UInt32Dictionary alloc] initWithUInt32s:kValues
-                                                 forKeys:kKeys
-                                                   count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 3U);
-  uint32_t value;
-  XCTAssertTrue([dict getUInt32:NULL forKey:1U]);
-  XCTAssertTrue([dict getUInt32:&value forKey:1U]);
-  XCTAssertEqual(value, 100U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:2U]);
-  XCTAssertTrue([dict getUInt32:&value forKey:2U]);
-  XCTAssertEqual(value, 101U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:3U]);
-  XCTAssertTrue([dict getUInt32:&value forKey:3U]);
-  XCTAssertEqual(value, 102U);
-  XCTAssertFalse([dict getUInt32:NULL forKey:4U]);
-
-  __block NSUInteger idx = 0;
-  uint32_t *seenKeys = malloc(3 * sizeof(uint32_t));
-  uint32_t *seenValues = malloc(3 * sizeof(uint32_t));
-  [dict enumerateKeysAndUInt32sUsingBlock:^(uint32_t aKey, uint32_t aValue, BOOL *stop) {
-    XCTAssertLessThan(idx, 3U);
-    seenKeys[idx] = aKey;
-    seenValues[idx] = aValue;
-    XCTAssertNotEqual(stop, NULL);
-    ++idx;
-  }];
-  for (int i = 0; i < 3; ++i) {
-    BOOL foundKey = NO;
-    for (int j = 0; (j < 3) && !foundKey; ++j) {
-      if (kKeys[i] == seenKeys[j]) {
-        foundKey = YES;
-        XCTAssertEqual(kValues[i], seenValues[j], @"i = %d, j = %d", i, j);
-      }
-    }
-    XCTAssertTrue(foundKey, @"i = %d", i);
-  }
-  free(seenKeys);
-  free(seenValues);
-
-  // Stopping the enumeration.
-  idx = 0;
-  [dict enumerateKeysAndUInt32sUsingBlock:^(uint32_t aKey, uint32_t aValue, BOOL *stop) {
-    #pragma unused(aKey, aValue)
-    if (idx == 1) *stop = YES;
-    XCTAssertNotEqual(idx, 2U);
-    ++idx;
-  }];
-  [dict release];
-}
-
-- (void)testEquality {
-  const uint32_t kKeys1[] = { 1U, 2U, 3U, 4U };
-  const uint32_t kKeys2[] = { 2U, 1U, 4U };
-  const uint32_t kValues1[] = { 100U, 101U, 102U };
-  const uint32_t kValues2[] = { 100U, 103U, 102U };
-  const uint32_t kValues3[] = { 100U, 101U, 102U, 103U };
-  GPBUInt32UInt32Dictionary *dict1 =
-      [[GPBUInt32UInt32Dictionary alloc] initWithUInt32s:kValues1
-                                                 forKeys:kKeys1
-                                                   count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict1);
-  GPBUInt32UInt32Dictionary *dict1prime =
-      [[GPBUInt32UInt32Dictionary alloc] initWithUInt32s:kValues1
-                                                 forKeys:kKeys1
-                                                   count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict1prime);
-  GPBUInt32UInt32Dictionary *dict2 =
-      [[GPBUInt32UInt32Dictionary alloc] initWithUInt32s:kValues2
-                                                 forKeys:kKeys1
-                                                   count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(dict2);
-  GPBUInt32UInt32Dictionary *dict3 =
-      [[GPBUInt32UInt32Dictionary alloc] initWithUInt32s:kValues1
-                                                 forKeys:kKeys2
-                                                   count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict3);
-  GPBUInt32UInt32Dictionary *dict4 =
-      [[GPBUInt32UInt32Dictionary alloc] initWithUInt32s:kValues3
-                                                 forKeys:kKeys1
-                                                   count:GPBARRAYSIZE(kValues3)];
-  XCTAssertNotNil(dict4);
-
-  // 1/1Prime should be different objects, but equal.
-  XCTAssertNotEqual(dict1, dict1prime);
-  XCTAssertEqualObjects(dict1, dict1prime);
-  // Equal, so they must have same hash.
-  XCTAssertEqual([dict1 hash], [dict1prime hash]);
-
-  // 2 is same keys, different values; not equal.
-  XCTAssertNotEqualObjects(dict1, dict2);
-
-  // 3 is different keys, same values; not equal.
-  XCTAssertNotEqualObjects(dict1, dict3);
-
-  // 4 extra pair; not equal
-  XCTAssertNotEqualObjects(dict1, dict4);
-
-  [dict1 release];
-  [dict1prime release];
-  [dict2 release];
-  [dict3 release];
-  [dict4 release];
-}
-
-- (void)testCopy {
-  const uint32_t kKeys[] = { 1U, 2U, 3U, 4U };
-  const uint32_t kValues[] = { 100U, 101U, 102U, 103U };
-  GPBUInt32UInt32Dictionary *dict =
-      [[GPBUInt32UInt32Dictionary alloc] initWithUInt32s:kValues
-                                                 forKeys:kKeys
-                                                   count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-
-  GPBUInt32UInt32Dictionary *dict2 = [dict copy];
-  XCTAssertNotNil(dict2);
-
-  // Should be new object but equal.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  XCTAssertTrue([dict2 isKindOfClass:[GPBUInt32UInt32Dictionary class]]);
-
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testDictionaryFromDictionary {
-  const uint32_t kKeys[] = { 1U, 2U, 3U, 4U };
-  const uint32_t kValues[] = { 100U, 101U, 102U, 103U };
-  GPBUInt32UInt32Dictionary *dict =
-      [[GPBUInt32UInt32Dictionary alloc] initWithUInt32s:kValues
-                                                 forKeys:kKeys
-                                                   count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-
-  GPBUInt32UInt32Dictionary *dict2 =
-      [[GPBUInt32UInt32Dictionary alloc] initWithDictionary:dict];
-  XCTAssertNotNil(dict2);
-
-  // Should be new pointer, but equal objects.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testAdds {
-  GPBUInt32UInt32Dictionary *dict = [[GPBUInt32UInt32Dictionary alloc] init];
-  XCTAssertNotNil(dict);
-
-  XCTAssertEqual(dict.count, 0U);
-  [dict setUInt32:100U forKey:1U];
-  XCTAssertEqual(dict.count, 1U);
-
-  const uint32_t kKeys[] = { 2U, 3U, 4U };
-  const uint32_t kValues[] = { 101U, 102U, 103U };
-  GPBUInt32UInt32Dictionary *dict2 =
-      [[GPBUInt32UInt32Dictionary alloc] initWithUInt32s:kValues
-                                                 forKeys:kKeys
-                                                   count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict2);
-  [dict addEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 4U);
-
-  uint32_t value;
-  XCTAssertTrue([dict getUInt32:NULL forKey:1U]);
-  XCTAssertTrue([dict getUInt32:&value forKey:1U]);
-  XCTAssertEqual(value, 100U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:2U]);
-  XCTAssertTrue([dict getUInt32:&value forKey:2U]);
-  XCTAssertEqual(value, 101U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:3U]);
-  XCTAssertTrue([dict getUInt32:&value forKey:3U]);
-  XCTAssertEqual(value, 102U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:4U]);
-  XCTAssertTrue([dict getUInt32:&value forKey:4U]);
-  XCTAssertEqual(value, 103U);
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testRemove {
-  const uint32_t kKeys[] = { 1U, 2U, 3U, 4U };
-  const uint32_t kValues[] = { 100U, 101U, 102U, 103U };
-  GPBUInt32UInt32Dictionary *dict =
-      [[GPBUInt32UInt32Dictionary alloc] initWithUInt32s:kValues
-                                                 forKeys:kKeys
-                                                   count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 4U);
-
-  [dict removeUInt32ForKey:2U];
-  XCTAssertEqual(dict.count, 3U);
-  uint32_t value;
-  XCTAssertTrue([dict getUInt32:NULL forKey:1U]);
-  XCTAssertTrue([dict getUInt32:&value forKey:1U]);
-  XCTAssertEqual(value, 100U);
-  XCTAssertFalse([dict getUInt32:NULL forKey:2U]);
-  XCTAssertTrue([dict getUInt32:NULL forKey:3U]);
-  XCTAssertTrue([dict getUInt32:&value forKey:3U]);
-  XCTAssertEqual(value, 102U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:4U]);
-  XCTAssertTrue([dict getUInt32:&value forKey:4U]);
-  XCTAssertEqual(value, 103U);
-
-  // Remove again does nothing.
-  [dict removeUInt32ForKey:2U];
-  XCTAssertEqual(dict.count, 3U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:1U]);
-  XCTAssertTrue([dict getUInt32:&value forKey:1U]);
-  XCTAssertEqual(value, 100U);
-  XCTAssertFalse([dict getUInt32:NULL forKey:2U]);
-  XCTAssertTrue([dict getUInt32:NULL forKey:3U]);
-  XCTAssertTrue([dict getUInt32:&value forKey:3U]);
-  XCTAssertEqual(value, 102U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:4U]);
-  XCTAssertTrue([dict getUInt32:&value forKey:4U]);
-  XCTAssertEqual(value, 103U);
-
-  [dict removeUInt32ForKey:4U];
-  XCTAssertEqual(dict.count, 2U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:1U]);
-  XCTAssertTrue([dict getUInt32:&value forKey:1U]);
-  XCTAssertEqual(value, 100U);
-  XCTAssertFalse([dict getUInt32:NULL forKey:2U]);
-  XCTAssertTrue([dict getUInt32:NULL forKey:3U]);
-  XCTAssertTrue([dict getUInt32:&value forKey:3U]);
-  XCTAssertEqual(value, 102U);
-  XCTAssertFalse([dict getUInt32:NULL forKey:4U]);
-
-  [dict removeAll];
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertFalse([dict getUInt32:NULL forKey:1U]);
-  XCTAssertFalse([dict getUInt32:NULL forKey:2U]);
-  XCTAssertFalse([dict getUInt32:NULL forKey:3U]);
-  XCTAssertFalse([dict getUInt32:NULL forKey:4U]);
-  [dict release];
-}
-
-- (void)testInplaceMutation {
-  const uint32_t kKeys[] = { 1U, 2U, 3U, 4U };
-  const uint32_t kValues[] = { 100U, 101U, 102U, 103U };
-  GPBUInt32UInt32Dictionary *dict =
-      [[GPBUInt32UInt32Dictionary alloc] initWithUInt32s:kValues
-                                                 forKeys:kKeys
-                                                   count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 4U);
-  uint32_t value;
-  XCTAssertTrue([dict getUInt32:NULL forKey:1U]);
-  XCTAssertTrue([dict getUInt32:&value forKey:1U]);
-  XCTAssertEqual(value, 100U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:2U]);
-  XCTAssertTrue([dict getUInt32:&value forKey:2U]);
-  XCTAssertEqual(value, 101U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:3U]);
-  XCTAssertTrue([dict getUInt32:&value forKey:3U]);
-  XCTAssertEqual(value, 102U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:4U]);
-  XCTAssertTrue([dict getUInt32:&value forKey:4U]);
-  XCTAssertEqual(value, 103U);
-
-  [dict setUInt32:103U forKey:1U];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:1U]);
-  XCTAssertTrue([dict getUInt32:&value forKey:1U]);
-  XCTAssertEqual(value, 103U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:2U]);
-  XCTAssertTrue([dict getUInt32:&value forKey:2U]);
-  XCTAssertEqual(value, 101U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:3U]);
-  XCTAssertTrue([dict getUInt32:&value forKey:3U]);
-  XCTAssertEqual(value, 102U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:4U]);
-  XCTAssertTrue([dict getUInt32:&value forKey:4U]);
-  XCTAssertEqual(value, 103U);
-
-  [dict setUInt32:101U forKey:4U];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:1U]);
-  XCTAssertTrue([dict getUInt32:&value forKey:1U]);
-  XCTAssertEqual(value, 103U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:2U]);
-  XCTAssertTrue([dict getUInt32:&value forKey:2U]);
-  XCTAssertEqual(value, 101U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:3U]);
-  XCTAssertTrue([dict getUInt32:&value forKey:3U]);
-  XCTAssertEqual(value, 102U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:4U]);
-  XCTAssertTrue([dict getUInt32:&value forKey:4U]);
-  XCTAssertEqual(value, 101U);
-
-  const uint32_t kKeys2[] = { 2U, 3U };
-  const uint32_t kValues2[] = { 102U, 100U };
-  GPBUInt32UInt32Dictionary *dict2 =
-      [[GPBUInt32UInt32Dictionary alloc] initWithUInt32s:kValues2
-                                                 forKeys:kKeys2
-                                                   count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(dict2);
-  [dict addEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:1U]);
-  XCTAssertTrue([dict getUInt32:&value forKey:1U]);
-  XCTAssertEqual(value, 103U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:2U]);
-  XCTAssertTrue([dict getUInt32:&value forKey:2U]);
-  XCTAssertEqual(value, 102U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:3U]);
-  XCTAssertTrue([dict getUInt32:&value forKey:3U]);
-  XCTAssertEqual(value, 100U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:4U]);
-  XCTAssertTrue([dict getUInt32:&value forKey:4U]);
-  XCTAssertEqual(value, 101U);
-
-  [dict2 release];
-  [dict release];
-}
-
-@end
-
-#pragma mark - UInt32 -> Int32
-
-@interface GPBUInt32Int32DictionaryTests : XCTestCase
-@end
-
-@implementation GPBUInt32Int32DictionaryTests
-
-- (void)testEmpty {
-  GPBUInt32Int32Dictionary *dict = [[GPBUInt32Int32Dictionary alloc] init];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertFalse([dict getInt32:NULL forKey:1U]);
-  [dict enumerateKeysAndInt32sUsingBlock:^(uint32_t aKey, int32_t aValue, BOOL *stop) {
-    #pragma unused(aKey, aValue, stop)
-    XCTFail(@"Shouldn't get here!");
-  }];
-  [dict release];
-}
-
-- (void)testOne {
-  GPBUInt32Int32Dictionary *dict = [[GPBUInt32Int32Dictionary alloc] init];
-  [dict setInt32:200 forKey:1U];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 1U);
-  int32_t value;
-  XCTAssertTrue([dict getInt32:NULL forKey:1U]);
-  XCTAssertTrue([dict getInt32:&value forKey:1U]);
-  XCTAssertEqual(value, 200);
-  XCTAssertFalse([dict getInt32:NULL forKey:2U]);
-  [dict enumerateKeysAndInt32sUsingBlock:^(uint32_t aKey, int32_t aValue, BOOL *stop) {
-    XCTAssertEqual(aKey, 1U);
-    XCTAssertEqual(aValue, 200);
-    XCTAssertNotEqual(stop, NULL);
-  }];
-  [dict release];
-}
-
-- (void)testBasics {
-  const uint32_t kKeys[] = { 1U, 2U, 3U };
-  const int32_t kValues[] = { 200, 201, 202 };
-  GPBUInt32Int32Dictionary *dict =
-      [[GPBUInt32Int32Dictionary alloc] initWithInt32s:kValues
-                                               forKeys:kKeys
-                                                 count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 3U);
-  int32_t value;
-  XCTAssertTrue([dict getInt32:NULL forKey:1U]);
-  XCTAssertTrue([dict getInt32:&value forKey:1U]);
-  XCTAssertEqual(value, 200);
-  XCTAssertTrue([dict getInt32:NULL forKey:2U]);
-  XCTAssertTrue([dict getInt32:&value forKey:2U]);
-  XCTAssertEqual(value, 201);
-  XCTAssertTrue([dict getInt32:NULL forKey:3U]);
-  XCTAssertTrue([dict getInt32:&value forKey:3U]);
-  XCTAssertEqual(value, 202);
-  XCTAssertFalse([dict getInt32:NULL forKey:4U]);
-
-  __block NSUInteger idx = 0;
-  uint32_t *seenKeys = malloc(3 * sizeof(uint32_t));
-  int32_t *seenValues = malloc(3 * sizeof(int32_t));
-  [dict enumerateKeysAndInt32sUsingBlock:^(uint32_t aKey, int32_t aValue, BOOL *stop) {
-    XCTAssertLessThan(idx, 3U);
-    seenKeys[idx] = aKey;
-    seenValues[idx] = aValue;
-    XCTAssertNotEqual(stop, NULL);
-    ++idx;
-  }];
-  for (int i = 0; i < 3; ++i) {
-    BOOL foundKey = NO;
-    for (int j = 0; (j < 3) && !foundKey; ++j) {
-      if (kKeys[i] == seenKeys[j]) {
-        foundKey = YES;
-        XCTAssertEqual(kValues[i], seenValues[j], @"i = %d, j = %d", i, j);
-      }
-    }
-    XCTAssertTrue(foundKey, @"i = %d", i);
-  }
-  free(seenKeys);
-  free(seenValues);
-
-  // Stopping the enumeration.
-  idx = 0;
-  [dict enumerateKeysAndInt32sUsingBlock:^(uint32_t aKey, int32_t aValue, BOOL *stop) {
-    #pragma unused(aKey, aValue)
-    if (idx == 1) *stop = YES;
-    XCTAssertNotEqual(idx, 2U);
-    ++idx;
-  }];
-  [dict release];
-}
-
-- (void)testEquality {
-  const uint32_t kKeys1[] = { 1U, 2U, 3U, 4U };
-  const uint32_t kKeys2[] = { 2U, 1U, 4U };
-  const int32_t kValues1[] = { 200, 201, 202 };
-  const int32_t kValues2[] = { 200, 203, 202 };
-  const int32_t kValues3[] = { 200, 201, 202, 203 };
-  GPBUInt32Int32Dictionary *dict1 =
-      [[GPBUInt32Int32Dictionary alloc] initWithInt32s:kValues1
-                                               forKeys:kKeys1
-                                                 count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict1);
-  GPBUInt32Int32Dictionary *dict1prime =
-      [[GPBUInt32Int32Dictionary alloc] initWithInt32s:kValues1
-                                               forKeys:kKeys1
-                                                 count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict1prime);
-  GPBUInt32Int32Dictionary *dict2 =
-      [[GPBUInt32Int32Dictionary alloc] initWithInt32s:kValues2
-                                               forKeys:kKeys1
-                                                 count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(dict2);
-  GPBUInt32Int32Dictionary *dict3 =
-      [[GPBUInt32Int32Dictionary alloc] initWithInt32s:kValues1
-                                               forKeys:kKeys2
-                                                 count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict3);
-  GPBUInt32Int32Dictionary *dict4 =
-      [[GPBUInt32Int32Dictionary alloc] initWithInt32s:kValues3
-                                               forKeys:kKeys1
-                                                 count:GPBARRAYSIZE(kValues3)];
-  XCTAssertNotNil(dict4);
-
-  // 1/1Prime should be different objects, but equal.
-  XCTAssertNotEqual(dict1, dict1prime);
-  XCTAssertEqualObjects(dict1, dict1prime);
-  // Equal, so they must have same hash.
-  XCTAssertEqual([dict1 hash], [dict1prime hash]);
-
-  // 2 is same keys, different values; not equal.
-  XCTAssertNotEqualObjects(dict1, dict2);
-
-  // 3 is different keys, same values; not equal.
-  XCTAssertNotEqualObjects(dict1, dict3);
-
-  // 4 extra pair; not equal
-  XCTAssertNotEqualObjects(dict1, dict4);
-
-  [dict1 release];
-  [dict1prime release];
-  [dict2 release];
-  [dict3 release];
-  [dict4 release];
-}
-
-- (void)testCopy {
-  const uint32_t kKeys[] = { 1U, 2U, 3U, 4U };
-  const int32_t kValues[] = { 200, 201, 202, 203 };
-  GPBUInt32Int32Dictionary *dict =
-      [[GPBUInt32Int32Dictionary alloc] initWithInt32s:kValues
-                                               forKeys:kKeys
-                                                 count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-
-  GPBUInt32Int32Dictionary *dict2 = [dict copy];
-  XCTAssertNotNil(dict2);
-
-  // Should be new object but equal.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  XCTAssertTrue([dict2 isKindOfClass:[GPBUInt32Int32Dictionary class]]);
-
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testDictionaryFromDictionary {
-  const uint32_t kKeys[] = { 1U, 2U, 3U, 4U };
-  const int32_t kValues[] = { 200, 201, 202, 203 };
-  GPBUInt32Int32Dictionary *dict =
-      [[GPBUInt32Int32Dictionary alloc] initWithInt32s:kValues
-                                               forKeys:kKeys
-                                                 count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-
-  GPBUInt32Int32Dictionary *dict2 =
-      [[GPBUInt32Int32Dictionary alloc] initWithDictionary:dict];
-  XCTAssertNotNil(dict2);
-
-  // Should be new pointer, but equal objects.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testAdds {
-  GPBUInt32Int32Dictionary *dict = [[GPBUInt32Int32Dictionary alloc] init];
-  XCTAssertNotNil(dict);
-
-  XCTAssertEqual(dict.count, 0U);
-  [dict setInt32:200 forKey:1U];
-  XCTAssertEqual(dict.count, 1U);
-
-  const uint32_t kKeys[] = { 2U, 3U, 4U };
-  const int32_t kValues[] = { 201, 202, 203 };
-  GPBUInt32Int32Dictionary *dict2 =
-      [[GPBUInt32Int32Dictionary alloc] initWithInt32s:kValues
-                                               forKeys:kKeys
-                                                 count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict2);
-  [dict addEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 4U);
-
-  int32_t value;
-  XCTAssertTrue([dict getInt32:NULL forKey:1U]);
-  XCTAssertTrue([dict getInt32:&value forKey:1U]);
-  XCTAssertEqual(value, 200);
-  XCTAssertTrue([dict getInt32:NULL forKey:2U]);
-  XCTAssertTrue([dict getInt32:&value forKey:2U]);
-  XCTAssertEqual(value, 201);
-  XCTAssertTrue([dict getInt32:NULL forKey:3U]);
-  XCTAssertTrue([dict getInt32:&value forKey:3U]);
-  XCTAssertEqual(value, 202);
-  XCTAssertTrue([dict getInt32:NULL forKey:4U]);
-  XCTAssertTrue([dict getInt32:&value forKey:4U]);
-  XCTAssertEqual(value, 203);
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testRemove {
-  const uint32_t kKeys[] = { 1U, 2U, 3U, 4U };
-  const int32_t kValues[] = { 200, 201, 202, 203 };
-  GPBUInt32Int32Dictionary *dict =
-      [[GPBUInt32Int32Dictionary alloc] initWithInt32s:kValues
-                                               forKeys:kKeys
-                                                 count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 4U);
-
-  [dict removeInt32ForKey:2U];
-  XCTAssertEqual(dict.count, 3U);
-  int32_t value;
-  XCTAssertTrue([dict getInt32:NULL forKey:1U]);
-  XCTAssertTrue([dict getInt32:&value forKey:1U]);
-  XCTAssertEqual(value, 200);
-  XCTAssertFalse([dict getInt32:NULL forKey:2U]);
-  XCTAssertTrue([dict getInt32:NULL forKey:3U]);
-  XCTAssertTrue([dict getInt32:&value forKey:3U]);
-  XCTAssertEqual(value, 202);
-  XCTAssertTrue([dict getInt32:NULL forKey:4U]);
-  XCTAssertTrue([dict getInt32:&value forKey:4U]);
-  XCTAssertEqual(value, 203);
-
-  // Remove again does nothing.
-  [dict removeInt32ForKey:2U];
-  XCTAssertEqual(dict.count, 3U);
-  XCTAssertTrue([dict getInt32:NULL forKey:1U]);
-  XCTAssertTrue([dict getInt32:&value forKey:1U]);
-  XCTAssertEqual(value, 200);
-  XCTAssertFalse([dict getInt32:NULL forKey:2U]);
-  XCTAssertTrue([dict getInt32:NULL forKey:3U]);
-  XCTAssertTrue([dict getInt32:&value forKey:3U]);
-  XCTAssertEqual(value, 202);
-  XCTAssertTrue([dict getInt32:NULL forKey:4U]);
-  XCTAssertTrue([dict getInt32:&value forKey:4U]);
-  XCTAssertEqual(value, 203);
-
-  [dict removeInt32ForKey:4U];
-  XCTAssertEqual(dict.count, 2U);
-  XCTAssertTrue([dict getInt32:NULL forKey:1U]);
-  XCTAssertTrue([dict getInt32:&value forKey:1U]);
-  XCTAssertEqual(value, 200);
-  XCTAssertFalse([dict getInt32:NULL forKey:2U]);
-  XCTAssertTrue([dict getInt32:NULL forKey:3U]);
-  XCTAssertTrue([dict getInt32:&value forKey:3U]);
-  XCTAssertEqual(value, 202);
-  XCTAssertFalse([dict getInt32:NULL forKey:4U]);
-
-  [dict removeAll];
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertFalse([dict getInt32:NULL forKey:1U]);
-  XCTAssertFalse([dict getInt32:NULL forKey:2U]);
-  XCTAssertFalse([dict getInt32:NULL forKey:3U]);
-  XCTAssertFalse([dict getInt32:NULL forKey:4U]);
-  [dict release];
-}
-
-- (void)testInplaceMutation {
-  const uint32_t kKeys[] = { 1U, 2U, 3U, 4U };
-  const int32_t kValues[] = { 200, 201, 202, 203 };
-  GPBUInt32Int32Dictionary *dict =
-      [[GPBUInt32Int32Dictionary alloc] initWithInt32s:kValues
-                                               forKeys:kKeys
-                                                 count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 4U);
-  int32_t value;
-  XCTAssertTrue([dict getInt32:NULL forKey:1U]);
-  XCTAssertTrue([dict getInt32:&value forKey:1U]);
-  XCTAssertEqual(value, 200);
-  XCTAssertTrue([dict getInt32:NULL forKey:2U]);
-  XCTAssertTrue([dict getInt32:&value forKey:2U]);
-  XCTAssertEqual(value, 201);
-  XCTAssertTrue([dict getInt32:NULL forKey:3U]);
-  XCTAssertTrue([dict getInt32:&value forKey:3U]);
-  XCTAssertEqual(value, 202);
-  XCTAssertTrue([dict getInt32:NULL forKey:4U]);
-  XCTAssertTrue([dict getInt32:&value forKey:4U]);
-  XCTAssertEqual(value, 203);
-
-  [dict setInt32:203 forKey:1U];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getInt32:NULL forKey:1U]);
-  XCTAssertTrue([dict getInt32:&value forKey:1U]);
-  XCTAssertEqual(value, 203);
-  XCTAssertTrue([dict getInt32:NULL forKey:2U]);
-  XCTAssertTrue([dict getInt32:&value forKey:2U]);
-  XCTAssertEqual(value, 201);
-  XCTAssertTrue([dict getInt32:NULL forKey:3U]);
-  XCTAssertTrue([dict getInt32:&value forKey:3U]);
-  XCTAssertEqual(value, 202);
-  XCTAssertTrue([dict getInt32:NULL forKey:4U]);
-  XCTAssertTrue([dict getInt32:&value forKey:4U]);
-  XCTAssertEqual(value, 203);
-
-  [dict setInt32:201 forKey:4U];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getInt32:NULL forKey:1U]);
-  XCTAssertTrue([dict getInt32:&value forKey:1U]);
-  XCTAssertEqual(value, 203);
-  XCTAssertTrue([dict getInt32:NULL forKey:2U]);
-  XCTAssertTrue([dict getInt32:&value forKey:2U]);
-  XCTAssertEqual(value, 201);
-  XCTAssertTrue([dict getInt32:NULL forKey:3U]);
-  XCTAssertTrue([dict getInt32:&value forKey:3U]);
-  XCTAssertEqual(value, 202);
-  XCTAssertTrue([dict getInt32:NULL forKey:4U]);
-  XCTAssertTrue([dict getInt32:&value forKey:4U]);
-  XCTAssertEqual(value, 201);
-
-  const uint32_t kKeys2[] = { 2U, 3U };
-  const int32_t kValues2[] = { 202, 200 };
-  GPBUInt32Int32Dictionary *dict2 =
-      [[GPBUInt32Int32Dictionary alloc] initWithInt32s:kValues2
-                                               forKeys:kKeys2
-                                                 count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(dict2);
-  [dict addEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getInt32:NULL forKey:1U]);
-  XCTAssertTrue([dict getInt32:&value forKey:1U]);
-  XCTAssertEqual(value, 203);
-  XCTAssertTrue([dict getInt32:NULL forKey:2U]);
-  XCTAssertTrue([dict getInt32:&value forKey:2U]);
-  XCTAssertEqual(value, 202);
-  XCTAssertTrue([dict getInt32:NULL forKey:3U]);
-  XCTAssertTrue([dict getInt32:&value forKey:3U]);
-  XCTAssertEqual(value, 200);
-  XCTAssertTrue([dict getInt32:NULL forKey:4U]);
-  XCTAssertTrue([dict getInt32:&value forKey:4U]);
-  XCTAssertEqual(value, 201);
-
-  [dict2 release];
-  [dict release];
-}
-
-@end
-
-#pragma mark - UInt32 -> UInt64
-
-@interface GPBUInt32UInt64DictionaryTests : XCTestCase
-@end
-
-@implementation GPBUInt32UInt64DictionaryTests
-
-- (void)testEmpty {
-  GPBUInt32UInt64Dictionary *dict = [[GPBUInt32UInt64Dictionary alloc] init];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertFalse([dict getUInt64:NULL forKey:1U]);
-  [dict enumerateKeysAndUInt64sUsingBlock:^(uint32_t aKey, uint64_t aValue, BOOL *stop) {
-    #pragma unused(aKey, aValue, stop)
-    XCTFail(@"Shouldn't get here!");
-  }];
-  [dict release];
-}
-
-- (void)testOne {
-  GPBUInt32UInt64Dictionary *dict = [[GPBUInt32UInt64Dictionary alloc] init];
-  [dict setUInt64:300U forKey:1U];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 1U);
-  uint64_t value;
-  XCTAssertTrue([dict getUInt64:NULL forKey:1U]);
-  XCTAssertTrue([dict getUInt64:&value forKey:1U]);
-  XCTAssertEqual(value, 300U);
-  XCTAssertFalse([dict getUInt64:NULL forKey:2U]);
-  [dict enumerateKeysAndUInt64sUsingBlock:^(uint32_t aKey, uint64_t aValue, BOOL *stop) {
-    XCTAssertEqual(aKey, 1U);
-    XCTAssertEqual(aValue, 300U);
-    XCTAssertNotEqual(stop, NULL);
-  }];
-  [dict release];
-}
-
-- (void)testBasics {
-  const uint32_t kKeys[] = { 1U, 2U, 3U };
-  const uint64_t kValues[] = { 300U, 301U, 302U };
-  GPBUInt32UInt64Dictionary *dict =
-      [[GPBUInt32UInt64Dictionary alloc] initWithUInt64s:kValues
-                                                 forKeys:kKeys
-                                                   count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 3U);
-  uint64_t value;
-  XCTAssertTrue([dict getUInt64:NULL forKey:1U]);
-  XCTAssertTrue([dict getUInt64:&value forKey:1U]);
-  XCTAssertEqual(value, 300U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:2U]);
-  XCTAssertTrue([dict getUInt64:&value forKey:2U]);
-  XCTAssertEqual(value, 301U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:3U]);
-  XCTAssertTrue([dict getUInt64:&value forKey:3U]);
-  XCTAssertEqual(value, 302U);
-  XCTAssertFalse([dict getUInt64:NULL forKey:4U]);
-
-  __block NSUInteger idx = 0;
-  uint32_t *seenKeys = malloc(3 * sizeof(uint32_t));
-  uint64_t *seenValues = malloc(3 * sizeof(uint64_t));
-  [dict enumerateKeysAndUInt64sUsingBlock:^(uint32_t aKey, uint64_t aValue, BOOL *stop) {
-    XCTAssertLessThan(idx, 3U);
-    seenKeys[idx] = aKey;
-    seenValues[idx] = aValue;
-    XCTAssertNotEqual(stop, NULL);
-    ++idx;
-  }];
-  for (int i = 0; i < 3; ++i) {
-    BOOL foundKey = NO;
-    for (int j = 0; (j < 3) && !foundKey; ++j) {
-      if (kKeys[i] == seenKeys[j]) {
-        foundKey = YES;
-        XCTAssertEqual(kValues[i], seenValues[j], @"i = %d, j = %d", i, j);
-      }
-    }
-    XCTAssertTrue(foundKey, @"i = %d", i);
-  }
-  free(seenKeys);
-  free(seenValues);
-
-  // Stopping the enumeration.
-  idx = 0;
-  [dict enumerateKeysAndUInt64sUsingBlock:^(uint32_t aKey, uint64_t aValue, BOOL *stop) {
-    #pragma unused(aKey, aValue)
-    if (idx == 1) *stop = YES;
-    XCTAssertNotEqual(idx, 2U);
-    ++idx;
-  }];
-  [dict release];
-}
-
-- (void)testEquality {
-  const uint32_t kKeys1[] = { 1U, 2U, 3U, 4U };
-  const uint32_t kKeys2[] = { 2U, 1U, 4U };
-  const uint64_t kValues1[] = { 300U, 301U, 302U };
-  const uint64_t kValues2[] = { 300U, 303U, 302U };
-  const uint64_t kValues3[] = { 300U, 301U, 302U, 303U };
-  GPBUInt32UInt64Dictionary *dict1 =
-      [[GPBUInt32UInt64Dictionary alloc] initWithUInt64s:kValues1
-                                                 forKeys:kKeys1
-                                                   count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict1);
-  GPBUInt32UInt64Dictionary *dict1prime =
-      [[GPBUInt32UInt64Dictionary alloc] initWithUInt64s:kValues1
-                                                 forKeys:kKeys1
-                                                   count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict1prime);
-  GPBUInt32UInt64Dictionary *dict2 =
-      [[GPBUInt32UInt64Dictionary alloc] initWithUInt64s:kValues2
-                                                 forKeys:kKeys1
-                                                   count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(dict2);
-  GPBUInt32UInt64Dictionary *dict3 =
-      [[GPBUInt32UInt64Dictionary alloc] initWithUInt64s:kValues1
-                                                 forKeys:kKeys2
-                                                   count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict3);
-  GPBUInt32UInt64Dictionary *dict4 =
-      [[GPBUInt32UInt64Dictionary alloc] initWithUInt64s:kValues3
-                                                 forKeys:kKeys1
-                                                   count:GPBARRAYSIZE(kValues3)];
-  XCTAssertNotNil(dict4);
-
-  // 1/1Prime should be different objects, but equal.
-  XCTAssertNotEqual(dict1, dict1prime);
-  XCTAssertEqualObjects(dict1, dict1prime);
-  // Equal, so they must have same hash.
-  XCTAssertEqual([dict1 hash], [dict1prime hash]);
-
-  // 2 is same keys, different values; not equal.
-  XCTAssertNotEqualObjects(dict1, dict2);
-
-  // 3 is different keys, same values; not equal.
-  XCTAssertNotEqualObjects(dict1, dict3);
-
-  // 4 extra pair; not equal
-  XCTAssertNotEqualObjects(dict1, dict4);
-
-  [dict1 release];
-  [dict1prime release];
-  [dict2 release];
-  [dict3 release];
-  [dict4 release];
-}
-
-- (void)testCopy {
-  const uint32_t kKeys[] = { 1U, 2U, 3U, 4U };
-  const uint64_t kValues[] = { 300U, 301U, 302U, 303U };
-  GPBUInt32UInt64Dictionary *dict =
-      [[GPBUInt32UInt64Dictionary alloc] initWithUInt64s:kValues
-                                                 forKeys:kKeys
-                                                   count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-
-  GPBUInt32UInt64Dictionary *dict2 = [dict copy];
-  XCTAssertNotNil(dict2);
-
-  // Should be new object but equal.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  XCTAssertTrue([dict2 isKindOfClass:[GPBUInt32UInt64Dictionary class]]);
-
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testDictionaryFromDictionary {
-  const uint32_t kKeys[] = { 1U, 2U, 3U, 4U };
-  const uint64_t kValues[] = { 300U, 301U, 302U, 303U };
-  GPBUInt32UInt64Dictionary *dict =
-      [[GPBUInt32UInt64Dictionary alloc] initWithUInt64s:kValues
-                                                 forKeys:kKeys
-                                                   count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-
-  GPBUInt32UInt64Dictionary *dict2 =
-      [[GPBUInt32UInt64Dictionary alloc] initWithDictionary:dict];
-  XCTAssertNotNil(dict2);
-
-  // Should be new pointer, but equal objects.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testAdds {
-  GPBUInt32UInt64Dictionary *dict = [[GPBUInt32UInt64Dictionary alloc] init];
-  XCTAssertNotNil(dict);
-
-  XCTAssertEqual(dict.count, 0U);
-  [dict setUInt64:300U forKey:1U];
-  XCTAssertEqual(dict.count, 1U);
-
-  const uint32_t kKeys[] = { 2U, 3U, 4U };
-  const uint64_t kValues[] = { 301U, 302U, 303U };
-  GPBUInt32UInt64Dictionary *dict2 =
-      [[GPBUInt32UInt64Dictionary alloc] initWithUInt64s:kValues
-                                                 forKeys:kKeys
-                                                   count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict2);
-  [dict addEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 4U);
-
-  uint64_t value;
-  XCTAssertTrue([dict getUInt64:NULL forKey:1U]);
-  XCTAssertTrue([dict getUInt64:&value forKey:1U]);
-  XCTAssertEqual(value, 300U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:2U]);
-  XCTAssertTrue([dict getUInt64:&value forKey:2U]);
-  XCTAssertEqual(value, 301U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:3U]);
-  XCTAssertTrue([dict getUInt64:&value forKey:3U]);
-  XCTAssertEqual(value, 302U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:4U]);
-  XCTAssertTrue([dict getUInt64:&value forKey:4U]);
-  XCTAssertEqual(value, 303U);
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testRemove {
-  const uint32_t kKeys[] = { 1U, 2U, 3U, 4U };
-  const uint64_t kValues[] = { 300U, 301U, 302U, 303U };
-  GPBUInt32UInt64Dictionary *dict =
-      [[GPBUInt32UInt64Dictionary alloc] initWithUInt64s:kValues
-                                                 forKeys:kKeys
-                                                   count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 4U);
-
-  [dict removeUInt64ForKey:2U];
-  XCTAssertEqual(dict.count, 3U);
-  uint64_t value;
-  XCTAssertTrue([dict getUInt64:NULL forKey:1U]);
-  XCTAssertTrue([dict getUInt64:&value forKey:1U]);
-  XCTAssertEqual(value, 300U);
-  XCTAssertFalse([dict getUInt64:NULL forKey:2U]);
-  XCTAssertTrue([dict getUInt64:NULL forKey:3U]);
-  XCTAssertTrue([dict getUInt64:&value forKey:3U]);
-  XCTAssertEqual(value, 302U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:4U]);
-  XCTAssertTrue([dict getUInt64:&value forKey:4U]);
-  XCTAssertEqual(value, 303U);
-
-  // Remove again does nothing.
-  [dict removeUInt64ForKey:2U];
-  XCTAssertEqual(dict.count, 3U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:1U]);
-  XCTAssertTrue([dict getUInt64:&value forKey:1U]);
-  XCTAssertEqual(value, 300U);
-  XCTAssertFalse([dict getUInt64:NULL forKey:2U]);
-  XCTAssertTrue([dict getUInt64:NULL forKey:3U]);
-  XCTAssertTrue([dict getUInt64:&value forKey:3U]);
-  XCTAssertEqual(value, 302U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:4U]);
-  XCTAssertTrue([dict getUInt64:&value forKey:4U]);
-  XCTAssertEqual(value, 303U);
-
-  [dict removeUInt64ForKey:4U];
-  XCTAssertEqual(dict.count, 2U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:1U]);
-  XCTAssertTrue([dict getUInt64:&value forKey:1U]);
-  XCTAssertEqual(value, 300U);
-  XCTAssertFalse([dict getUInt64:NULL forKey:2U]);
-  XCTAssertTrue([dict getUInt64:NULL forKey:3U]);
-  XCTAssertTrue([dict getUInt64:&value forKey:3U]);
-  XCTAssertEqual(value, 302U);
-  XCTAssertFalse([dict getUInt64:NULL forKey:4U]);
-
-  [dict removeAll];
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertFalse([dict getUInt64:NULL forKey:1U]);
-  XCTAssertFalse([dict getUInt64:NULL forKey:2U]);
-  XCTAssertFalse([dict getUInt64:NULL forKey:3U]);
-  XCTAssertFalse([dict getUInt64:NULL forKey:4U]);
-  [dict release];
-}
-
-- (void)testInplaceMutation {
-  const uint32_t kKeys[] = { 1U, 2U, 3U, 4U };
-  const uint64_t kValues[] = { 300U, 301U, 302U, 303U };
-  GPBUInt32UInt64Dictionary *dict =
-      [[GPBUInt32UInt64Dictionary alloc] initWithUInt64s:kValues
-                                                 forKeys:kKeys
-                                                   count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 4U);
-  uint64_t value;
-  XCTAssertTrue([dict getUInt64:NULL forKey:1U]);
-  XCTAssertTrue([dict getUInt64:&value forKey:1U]);
-  XCTAssertEqual(value, 300U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:2U]);
-  XCTAssertTrue([dict getUInt64:&value forKey:2U]);
-  XCTAssertEqual(value, 301U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:3U]);
-  XCTAssertTrue([dict getUInt64:&value forKey:3U]);
-  XCTAssertEqual(value, 302U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:4U]);
-  XCTAssertTrue([dict getUInt64:&value forKey:4U]);
-  XCTAssertEqual(value, 303U);
-
-  [dict setUInt64:303U forKey:1U];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:1U]);
-  XCTAssertTrue([dict getUInt64:&value forKey:1U]);
-  XCTAssertEqual(value, 303U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:2U]);
-  XCTAssertTrue([dict getUInt64:&value forKey:2U]);
-  XCTAssertEqual(value, 301U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:3U]);
-  XCTAssertTrue([dict getUInt64:&value forKey:3U]);
-  XCTAssertEqual(value, 302U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:4U]);
-  XCTAssertTrue([dict getUInt64:&value forKey:4U]);
-  XCTAssertEqual(value, 303U);
-
-  [dict setUInt64:301U forKey:4U];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:1U]);
-  XCTAssertTrue([dict getUInt64:&value forKey:1U]);
-  XCTAssertEqual(value, 303U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:2U]);
-  XCTAssertTrue([dict getUInt64:&value forKey:2U]);
-  XCTAssertEqual(value, 301U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:3U]);
-  XCTAssertTrue([dict getUInt64:&value forKey:3U]);
-  XCTAssertEqual(value, 302U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:4U]);
-  XCTAssertTrue([dict getUInt64:&value forKey:4U]);
-  XCTAssertEqual(value, 301U);
-
-  const uint32_t kKeys2[] = { 2U, 3U };
-  const uint64_t kValues2[] = { 302U, 300U };
-  GPBUInt32UInt64Dictionary *dict2 =
-      [[GPBUInt32UInt64Dictionary alloc] initWithUInt64s:kValues2
-                                                 forKeys:kKeys2
-                                                   count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(dict2);
-  [dict addEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:1U]);
-  XCTAssertTrue([dict getUInt64:&value forKey:1U]);
-  XCTAssertEqual(value, 303U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:2U]);
-  XCTAssertTrue([dict getUInt64:&value forKey:2U]);
-  XCTAssertEqual(value, 302U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:3U]);
-  XCTAssertTrue([dict getUInt64:&value forKey:3U]);
-  XCTAssertEqual(value, 300U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:4U]);
-  XCTAssertTrue([dict getUInt64:&value forKey:4U]);
-  XCTAssertEqual(value, 301U);
-
-  [dict2 release];
-  [dict release];
-}
-
-@end
-
-#pragma mark - UInt32 -> Int64
-
-@interface GPBUInt32Int64DictionaryTests : XCTestCase
-@end
-
-@implementation GPBUInt32Int64DictionaryTests
-
-- (void)testEmpty {
-  GPBUInt32Int64Dictionary *dict = [[GPBUInt32Int64Dictionary alloc] init];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertFalse([dict getInt64:NULL forKey:1U]);
-  [dict enumerateKeysAndInt64sUsingBlock:^(uint32_t aKey, int64_t aValue, BOOL *stop) {
-    #pragma unused(aKey, aValue, stop)
-    XCTFail(@"Shouldn't get here!");
-  }];
-  [dict release];
-}
-
-- (void)testOne {
-  GPBUInt32Int64Dictionary *dict = [[GPBUInt32Int64Dictionary alloc] init];
-  [dict setInt64:400 forKey:1U];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 1U);
-  int64_t value;
-  XCTAssertTrue([dict getInt64:NULL forKey:1U]);
-  XCTAssertTrue([dict getInt64:&value forKey:1U]);
-  XCTAssertEqual(value, 400);
-  XCTAssertFalse([dict getInt64:NULL forKey:2U]);
-  [dict enumerateKeysAndInt64sUsingBlock:^(uint32_t aKey, int64_t aValue, BOOL *stop) {
-    XCTAssertEqual(aKey, 1U);
-    XCTAssertEqual(aValue, 400);
-    XCTAssertNotEqual(stop, NULL);
-  }];
-  [dict release];
-}
-
-- (void)testBasics {
-  const uint32_t kKeys[] = { 1U, 2U, 3U };
-  const int64_t kValues[] = { 400, 401, 402 };
-  GPBUInt32Int64Dictionary *dict =
-      [[GPBUInt32Int64Dictionary alloc] initWithInt64s:kValues
-                                               forKeys:kKeys
-                                                 count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 3U);
-  int64_t value;
-  XCTAssertTrue([dict getInt64:NULL forKey:1U]);
-  XCTAssertTrue([dict getInt64:&value forKey:1U]);
-  XCTAssertEqual(value, 400);
-  XCTAssertTrue([dict getInt64:NULL forKey:2U]);
-  XCTAssertTrue([dict getInt64:&value forKey:2U]);
-  XCTAssertEqual(value, 401);
-  XCTAssertTrue([dict getInt64:NULL forKey:3U]);
-  XCTAssertTrue([dict getInt64:&value forKey:3U]);
-  XCTAssertEqual(value, 402);
-  XCTAssertFalse([dict getInt64:NULL forKey:4U]);
-
-  __block NSUInteger idx = 0;
-  uint32_t *seenKeys = malloc(3 * sizeof(uint32_t));
-  int64_t *seenValues = malloc(3 * sizeof(int64_t));
-  [dict enumerateKeysAndInt64sUsingBlock:^(uint32_t aKey, int64_t aValue, BOOL *stop) {
-    XCTAssertLessThan(idx, 3U);
-    seenKeys[idx] = aKey;
-    seenValues[idx] = aValue;
-    XCTAssertNotEqual(stop, NULL);
-    ++idx;
-  }];
-  for (int i = 0; i < 3; ++i) {
-    BOOL foundKey = NO;
-    for (int j = 0; (j < 3) && !foundKey; ++j) {
-      if (kKeys[i] == seenKeys[j]) {
-        foundKey = YES;
-        XCTAssertEqual(kValues[i], seenValues[j], @"i = %d, j = %d", i, j);
-      }
-    }
-    XCTAssertTrue(foundKey, @"i = %d", i);
-  }
-  free(seenKeys);
-  free(seenValues);
-
-  // Stopping the enumeration.
-  idx = 0;
-  [dict enumerateKeysAndInt64sUsingBlock:^(uint32_t aKey, int64_t aValue, BOOL *stop) {
-    #pragma unused(aKey, aValue)
-    if (idx == 1) *stop = YES;
-    XCTAssertNotEqual(idx, 2U);
-    ++idx;
-  }];
-  [dict release];
-}
-
-- (void)testEquality {
-  const uint32_t kKeys1[] = { 1U, 2U, 3U, 4U };
-  const uint32_t kKeys2[] = { 2U, 1U, 4U };
-  const int64_t kValues1[] = { 400, 401, 402 };
-  const int64_t kValues2[] = { 400, 403, 402 };
-  const int64_t kValues3[] = { 400, 401, 402, 403 };
-  GPBUInt32Int64Dictionary *dict1 =
-      [[GPBUInt32Int64Dictionary alloc] initWithInt64s:kValues1
-                                               forKeys:kKeys1
-                                                 count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict1);
-  GPBUInt32Int64Dictionary *dict1prime =
-      [[GPBUInt32Int64Dictionary alloc] initWithInt64s:kValues1
-                                               forKeys:kKeys1
-                                                 count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict1prime);
-  GPBUInt32Int64Dictionary *dict2 =
-      [[GPBUInt32Int64Dictionary alloc] initWithInt64s:kValues2
-                                               forKeys:kKeys1
-                                                 count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(dict2);
-  GPBUInt32Int64Dictionary *dict3 =
-      [[GPBUInt32Int64Dictionary alloc] initWithInt64s:kValues1
-                                               forKeys:kKeys2
-                                                 count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict3);
-  GPBUInt32Int64Dictionary *dict4 =
-      [[GPBUInt32Int64Dictionary alloc] initWithInt64s:kValues3
-                                               forKeys:kKeys1
-                                                 count:GPBARRAYSIZE(kValues3)];
-  XCTAssertNotNil(dict4);
-
-  // 1/1Prime should be different objects, but equal.
-  XCTAssertNotEqual(dict1, dict1prime);
-  XCTAssertEqualObjects(dict1, dict1prime);
-  // Equal, so they must have same hash.
-  XCTAssertEqual([dict1 hash], [dict1prime hash]);
-
-  // 2 is same keys, different values; not equal.
-  XCTAssertNotEqualObjects(dict1, dict2);
-
-  // 3 is different keys, same values; not equal.
-  XCTAssertNotEqualObjects(dict1, dict3);
-
-  // 4 extra pair; not equal
-  XCTAssertNotEqualObjects(dict1, dict4);
-
-  [dict1 release];
-  [dict1prime release];
-  [dict2 release];
-  [dict3 release];
-  [dict4 release];
-}
-
-- (void)testCopy {
-  const uint32_t kKeys[] = { 1U, 2U, 3U, 4U };
-  const int64_t kValues[] = { 400, 401, 402, 403 };
-  GPBUInt32Int64Dictionary *dict =
-      [[GPBUInt32Int64Dictionary alloc] initWithInt64s:kValues
-                                               forKeys:kKeys
-                                                 count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-
-  GPBUInt32Int64Dictionary *dict2 = [dict copy];
-  XCTAssertNotNil(dict2);
-
-  // Should be new object but equal.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  XCTAssertTrue([dict2 isKindOfClass:[GPBUInt32Int64Dictionary class]]);
-
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testDictionaryFromDictionary {
-  const uint32_t kKeys[] = { 1U, 2U, 3U, 4U };
-  const int64_t kValues[] = { 400, 401, 402, 403 };
-  GPBUInt32Int64Dictionary *dict =
-      [[GPBUInt32Int64Dictionary alloc] initWithInt64s:kValues
-                                               forKeys:kKeys
-                                                 count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-
-  GPBUInt32Int64Dictionary *dict2 =
-      [[GPBUInt32Int64Dictionary alloc] initWithDictionary:dict];
-  XCTAssertNotNil(dict2);
-
-  // Should be new pointer, but equal objects.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testAdds {
-  GPBUInt32Int64Dictionary *dict = [[GPBUInt32Int64Dictionary alloc] init];
-  XCTAssertNotNil(dict);
-
-  XCTAssertEqual(dict.count, 0U);
-  [dict setInt64:400 forKey:1U];
-  XCTAssertEqual(dict.count, 1U);
-
-  const uint32_t kKeys[] = { 2U, 3U, 4U };
-  const int64_t kValues[] = { 401, 402, 403 };
-  GPBUInt32Int64Dictionary *dict2 =
-      [[GPBUInt32Int64Dictionary alloc] initWithInt64s:kValues
-                                               forKeys:kKeys
-                                                 count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict2);
-  [dict addEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 4U);
-
-  int64_t value;
-  XCTAssertTrue([dict getInt64:NULL forKey:1U]);
-  XCTAssertTrue([dict getInt64:&value forKey:1U]);
-  XCTAssertEqual(value, 400);
-  XCTAssertTrue([dict getInt64:NULL forKey:2U]);
-  XCTAssertTrue([dict getInt64:&value forKey:2U]);
-  XCTAssertEqual(value, 401);
-  XCTAssertTrue([dict getInt64:NULL forKey:3U]);
-  XCTAssertTrue([dict getInt64:&value forKey:3U]);
-  XCTAssertEqual(value, 402);
-  XCTAssertTrue([dict getInt64:NULL forKey:4U]);
-  XCTAssertTrue([dict getInt64:&value forKey:4U]);
-  XCTAssertEqual(value, 403);
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testRemove {
-  const uint32_t kKeys[] = { 1U, 2U, 3U, 4U };
-  const int64_t kValues[] = { 400, 401, 402, 403 };
-  GPBUInt32Int64Dictionary *dict =
-      [[GPBUInt32Int64Dictionary alloc] initWithInt64s:kValues
-                                               forKeys:kKeys
-                                                 count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 4U);
-
-  [dict removeInt64ForKey:2U];
-  XCTAssertEqual(dict.count, 3U);
-  int64_t value;
-  XCTAssertTrue([dict getInt64:NULL forKey:1U]);
-  XCTAssertTrue([dict getInt64:&value forKey:1U]);
-  XCTAssertEqual(value, 400);
-  XCTAssertFalse([dict getInt64:NULL forKey:2U]);
-  XCTAssertTrue([dict getInt64:NULL forKey:3U]);
-  XCTAssertTrue([dict getInt64:&value forKey:3U]);
-  XCTAssertEqual(value, 402);
-  XCTAssertTrue([dict getInt64:NULL forKey:4U]);
-  XCTAssertTrue([dict getInt64:&value forKey:4U]);
-  XCTAssertEqual(value, 403);
-
-  // Remove again does nothing.
-  [dict removeInt64ForKey:2U];
-  XCTAssertEqual(dict.count, 3U);
-  XCTAssertTrue([dict getInt64:NULL forKey:1U]);
-  XCTAssertTrue([dict getInt64:&value forKey:1U]);
-  XCTAssertEqual(value, 400);
-  XCTAssertFalse([dict getInt64:NULL forKey:2U]);
-  XCTAssertTrue([dict getInt64:NULL forKey:3U]);
-  XCTAssertTrue([dict getInt64:&value forKey:3U]);
-  XCTAssertEqual(value, 402);
-  XCTAssertTrue([dict getInt64:NULL forKey:4U]);
-  XCTAssertTrue([dict getInt64:&value forKey:4U]);
-  XCTAssertEqual(value, 403);
-
-  [dict removeInt64ForKey:4U];
-  XCTAssertEqual(dict.count, 2U);
-  XCTAssertTrue([dict getInt64:NULL forKey:1U]);
-  XCTAssertTrue([dict getInt64:&value forKey:1U]);
-  XCTAssertEqual(value, 400);
-  XCTAssertFalse([dict getInt64:NULL forKey:2U]);
-  XCTAssertTrue([dict getInt64:NULL forKey:3U]);
-  XCTAssertTrue([dict getInt64:&value forKey:3U]);
-  XCTAssertEqual(value, 402);
-  XCTAssertFalse([dict getInt64:NULL forKey:4U]);
-
-  [dict removeAll];
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertFalse([dict getInt64:NULL forKey:1U]);
-  XCTAssertFalse([dict getInt64:NULL forKey:2U]);
-  XCTAssertFalse([dict getInt64:NULL forKey:3U]);
-  XCTAssertFalse([dict getInt64:NULL forKey:4U]);
-  [dict release];
-}
-
-- (void)testInplaceMutation {
-  const uint32_t kKeys[] = { 1U, 2U, 3U, 4U };
-  const int64_t kValues[] = { 400, 401, 402, 403 };
-  GPBUInt32Int64Dictionary *dict =
-      [[GPBUInt32Int64Dictionary alloc] initWithInt64s:kValues
-                                               forKeys:kKeys
-                                                 count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 4U);
-  int64_t value;
-  XCTAssertTrue([dict getInt64:NULL forKey:1U]);
-  XCTAssertTrue([dict getInt64:&value forKey:1U]);
-  XCTAssertEqual(value, 400);
-  XCTAssertTrue([dict getInt64:NULL forKey:2U]);
-  XCTAssertTrue([dict getInt64:&value forKey:2U]);
-  XCTAssertEqual(value, 401);
-  XCTAssertTrue([dict getInt64:NULL forKey:3U]);
-  XCTAssertTrue([dict getInt64:&value forKey:3U]);
-  XCTAssertEqual(value, 402);
-  XCTAssertTrue([dict getInt64:NULL forKey:4U]);
-  XCTAssertTrue([dict getInt64:&value forKey:4U]);
-  XCTAssertEqual(value, 403);
-
-  [dict setInt64:403 forKey:1U];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getInt64:NULL forKey:1U]);
-  XCTAssertTrue([dict getInt64:&value forKey:1U]);
-  XCTAssertEqual(value, 403);
-  XCTAssertTrue([dict getInt64:NULL forKey:2U]);
-  XCTAssertTrue([dict getInt64:&value forKey:2U]);
-  XCTAssertEqual(value, 401);
-  XCTAssertTrue([dict getInt64:NULL forKey:3U]);
-  XCTAssertTrue([dict getInt64:&value forKey:3U]);
-  XCTAssertEqual(value, 402);
-  XCTAssertTrue([dict getInt64:NULL forKey:4U]);
-  XCTAssertTrue([dict getInt64:&value forKey:4U]);
-  XCTAssertEqual(value, 403);
-
-  [dict setInt64:401 forKey:4U];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getInt64:NULL forKey:1U]);
-  XCTAssertTrue([dict getInt64:&value forKey:1U]);
-  XCTAssertEqual(value, 403);
-  XCTAssertTrue([dict getInt64:NULL forKey:2U]);
-  XCTAssertTrue([dict getInt64:&value forKey:2U]);
-  XCTAssertEqual(value, 401);
-  XCTAssertTrue([dict getInt64:NULL forKey:3U]);
-  XCTAssertTrue([dict getInt64:&value forKey:3U]);
-  XCTAssertEqual(value, 402);
-  XCTAssertTrue([dict getInt64:NULL forKey:4U]);
-  XCTAssertTrue([dict getInt64:&value forKey:4U]);
-  XCTAssertEqual(value, 401);
-
-  const uint32_t kKeys2[] = { 2U, 3U };
-  const int64_t kValues2[] = { 402, 400 };
-  GPBUInt32Int64Dictionary *dict2 =
-      [[GPBUInt32Int64Dictionary alloc] initWithInt64s:kValues2
-                                               forKeys:kKeys2
-                                                 count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(dict2);
-  [dict addEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getInt64:NULL forKey:1U]);
-  XCTAssertTrue([dict getInt64:&value forKey:1U]);
-  XCTAssertEqual(value, 403);
-  XCTAssertTrue([dict getInt64:NULL forKey:2U]);
-  XCTAssertTrue([dict getInt64:&value forKey:2U]);
-  XCTAssertEqual(value, 402);
-  XCTAssertTrue([dict getInt64:NULL forKey:3U]);
-  XCTAssertTrue([dict getInt64:&value forKey:3U]);
-  XCTAssertEqual(value, 400);
-  XCTAssertTrue([dict getInt64:NULL forKey:4U]);
-  XCTAssertTrue([dict getInt64:&value forKey:4U]);
-  XCTAssertEqual(value, 401);
-
-  [dict2 release];
-  [dict release];
-}
-
-@end
-
-#pragma mark - UInt32 -> Bool
-
-@interface GPBUInt32BoolDictionaryTests : XCTestCase
-@end
-
-@implementation GPBUInt32BoolDictionaryTests
-
-- (void)testEmpty {
-  GPBUInt32BoolDictionary *dict = [[GPBUInt32BoolDictionary alloc] init];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertFalse([dict getBool:NULL forKey:1U]);
-  [dict enumerateKeysAndBoolsUsingBlock:^(uint32_t aKey, BOOL aValue, BOOL *stop) {
-    #pragma unused(aKey, aValue, stop)
-    XCTFail(@"Shouldn't get here!");
-  }];
-  [dict release];
-}
-
-- (void)testOne {
-  GPBUInt32BoolDictionary *dict = [[GPBUInt32BoolDictionary alloc] init];
-  [dict setBool:YES forKey:1U];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 1U);
-  BOOL value;
-  XCTAssertTrue([dict getBool:NULL forKey:1U]);
-  XCTAssertTrue([dict getBool:&value forKey:1U]);
-  XCTAssertEqual(value, YES);
-  XCTAssertFalse([dict getBool:NULL forKey:2U]);
-  [dict enumerateKeysAndBoolsUsingBlock:^(uint32_t aKey, BOOL aValue, BOOL *stop) {
-    XCTAssertEqual(aKey, 1U);
-    XCTAssertEqual(aValue, YES);
-    XCTAssertNotEqual(stop, NULL);
-  }];
-  [dict release];
-}
-
-- (void)testBasics {
-  const uint32_t kKeys[] = { 1U, 2U, 3U };
-  const BOOL kValues[] = { YES, YES, NO };
-  GPBUInt32BoolDictionary *dict =
-      [[GPBUInt32BoolDictionary alloc] initWithBools:kValues
-                                             forKeys:kKeys
-                                               count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 3U);
-  BOOL value;
-  XCTAssertTrue([dict getBool:NULL forKey:1U]);
-  XCTAssertTrue([dict getBool:&value forKey:1U]);
-  XCTAssertEqual(value, YES);
-  XCTAssertTrue([dict getBool:NULL forKey:2U]);
-  XCTAssertTrue([dict getBool:&value forKey:2U]);
-  XCTAssertEqual(value, YES);
-  XCTAssertTrue([dict getBool:NULL forKey:3U]);
-  XCTAssertTrue([dict getBool:&value forKey:3U]);
-  XCTAssertEqual(value, NO);
-  XCTAssertFalse([dict getBool:NULL forKey:4U]);
-
-  __block NSUInteger idx = 0;
-  uint32_t *seenKeys = malloc(3 * sizeof(uint32_t));
-  BOOL *seenValues = malloc(3 * sizeof(BOOL));
-  [dict enumerateKeysAndBoolsUsingBlock:^(uint32_t aKey, BOOL aValue, BOOL *stop) {
-    XCTAssertLessThan(idx, 3U);
-    seenKeys[idx] = aKey;
-    seenValues[idx] = aValue;
-    XCTAssertNotEqual(stop, NULL);
-    ++idx;
-  }];
-  for (int i = 0; i < 3; ++i) {
-    BOOL foundKey = NO;
-    for (int j = 0; (j < 3) && !foundKey; ++j) {
-      if (kKeys[i] == seenKeys[j]) {
-        foundKey = YES;
-        XCTAssertEqual(kValues[i], seenValues[j], @"i = %d, j = %d", i, j);
-      }
-    }
-    XCTAssertTrue(foundKey, @"i = %d", i);
-  }
-  free(seenKeys);
-  free(seenValues);
-
-  // Stopping the enumeration.
-  idx = 0;
-  [dict enumerateKeysAndBoolsUsingBlock:^(uint32_t aKey, BOOL aValue, BOOL *stop) {
-    #pragma unused(aKey, aValue)
-    if (idx == 1) *stop = YES;
-    XCTAssertNotEqual(idx, 2U);
-    ++idx;
-  }];
-  [dict release];
-}
-
-- (void)testEquality {
-  const uint32_t kKeys1[] = { 1U, 2U, 3U, 4U };
-  const uint32_t kKeys2[] = { 2U, 1U, 4U };
-  const BOOL kValues1[] = { YES, YES, NO };
-  const BOOL kValues2[] = { YES, NO, NO };
-  const BOOL kValues3[] = { YES, YES, NO, NO };
-  GPBUInt32BoolDictionary *dict1 =
-      [[GPBUInt32BoolDictionary alloc] initWithBools:kValues1
-                                             forKeys:kKeys1
-                                               count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict1);
-  GPBUInt32BoolDictionary *dict1prime =
-      [[GPBUInt32BoolDictionary alloc] initWithBools:kValues1
-                                             forKeys:kKeys1
-                                               count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict1prime);
-  GPBUInt32BoolDictionary *dict2 =
-      [[GPBUInt32BoolDictionary alloc] initWithBools:kValues2
-                                             forKeys:kKeys1
-                                               count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(dict2);
-  GPBUInt32BoolDictionary *dict3 =
-      [[GPBUInt32BoolDictionary alloc] initWithBools:kValues1
-                                             forKeys:kKeys2
-                                               count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict3);
-  GPBUInt32BoolDictionary *dict4 =
-      [[GPBUInt32BoolDictionary alloc] initWithBools:kValues3
-                                             forKeys:kKeys1
-                                               count:GPBARRAYSIZE(kValues3)];
-  XCTAssertNotNil(dict4);
-
-  // 1/1Prime should be different objects, but equal.
-  XCTAssertNotEqual(dict1, dict1prime);
-  XCTAssertEqualObjects(dict1, dict1prime);
-  // Equal, so they must have same hash.
-  XCTAssertEqual([dict1 hash], [dict1prime hash]);
-
-  // 2 is same keys, different values; not equal.
-  XCTAssertNotEqualObjects(dict1, dict2);
-
-  // 3 is different keys, same values; not equal.
-  XCTAssertNotEqualObjects(dict1, dict3);
-
-  // 4 extra pair; not equal
-  XCTAssertNotEqualObjects(dict1, dict4);
-
-  [dict1 release];
-  [dict1prime release];
-  [dict2 release];
-  [dict3 release];
-  [dict4 release];
-}
-
-- (void)testCopy {
-  const uint32_t kKeys[] = { 1U, 2U, 3U, 4U };
-  const BOOL kValues[] = { YES, YES, NO, NO };
-  GPBUInt32BoolDictionary *dict =
-      [[GPBUInt32BoolDictionary alloc] initWithBools:kValues
-                                             forKeys:kKeys
-                                               count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-
-  GPBUInt32BoolDictionary *dict2 = [dict copy];
-  XCTAssertNotNil(dict2);
-
-  // Should be new object but equal.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  XCTAssertTrue([dict2 isKindOfClass:[GPBUInt32BoolDictionary class]]);
-
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testDictionaryFromDictionary {
-  const uint32_t kKeys[] = { 1U, 2U, 3U, 4U };
-  const BOOL kValues[] = { YES, YES, NO, NO };
-  GPBUInt32BoolDictionary *dict =
-      [[GPBUInt32BoolDictionary alloc] initWithBools:kValues
-                                             forKeys:kKeys
-                                               count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-
-  GPBUInt32BoolDictionary *dict2 =
-      [[GPBUInt32BoolDictionary alloc] initWithDictionary:dict];
-  XCTAssertNotNil(dict2);
-
-  // Should be new pointer, but equal objects.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testAdds {
-  GPBUInt32BoolDictionary *dict = [[GPBUInt32BoolDictionary alloc] init];
-  XCTAssertNotNil(dict);
-
-  XCTAssertEqual(dict.count, 0U);
-  [dict setBool:YES forKey:1U];
-  XCTAssertEqual(dict.count, 1U);
-
-  const uint32_t kKeys[] = { 2U, 3U, 4U };
-  const BOOL kValues[] = { YES, NO, NO };
-  GPBUInt32BoolDictionary *dict2 =
-      [[GPBUInt32BoolDictionary alloc] initWithBools:kValues
-                                             forKeys:kKeys
-                                               count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict2);
-  [dict addEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 4U);
-
-  BOOL value;
-  XCTAssertTrue([dict getBool:NULL forKey:1U]);
-  XCTAssertTrue([dict getBool:&value forKey:1U]);
-  XCTAssertEqual(value, YES);
-  XCTAssertTrue([dict getBool:NULL forKey:2U]);
-  XCTAssertTrue([dict getBool:&value forKey:2U]);
-  XCTAssertEqual(value, YES);
-  XCTAssertTrue([dict getBool:NULL forKey:3U]);
-  XCTAssertTrue([dict getBool:&value forKey:3U]);
-  XCTAssertEqual(value, NO);
-  XCTAssertTrue([dict getBool:NULL forKey:4U]);
-  XCTAssertTrue([dict getBool:&value forKey:4U]);
-  XCTAssertEqual(value, NO);
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testRemove {
-  const uint32_t kKeys[] = { 1U, 2U, 3U, 4U };
-  const BOOL kValues[] = { YES, YES, NO, NO };
-  GPBUInt32BoolDictionary *dict =
-      [[GPBUInt32BoolDictionary alloc] initWithBools:kValues
-                                             forKeys:kKeys
-                                               count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 4U);
-
-  [dict removeBoolForKey:2U];
-  XCTAssertEqual(dict.count, 3U);
-  BOOL value;
-  XCTAssertTrue([dict getBool:NULL forKey:1U]);
-  XCTAssertTrue([dict getBool:&value forKey:1U]);
-  XCTAssertEqual(value, YES);
-  XCTAssertFalse([dict getBool:NULL forKey:2U]);
-  XCTAssertTrue([dict getBool:NULL forKey:3U]);
-  XCTAssertTrue([dict getBool:&value forKey:3U]);
-  XCTAssertEqual(value, NO);
-  XCTAssertTrue([dict getBool:NULL forKey:4U]);
-  XCTAssertTrue([dict getBool:&value forKey:4U]);
-  XCTAssertEqual(value, NO);
-
-  // Remove again does nothing.
-  [dict removeBoolForKey:2U];
-  XCTAssertEqual(dict.count, 3U);
-  XCTAssertTrue([dict getBool:NULL forKey:1U]);
-  XCTAssertTrue([dict getBool:&value forKey:1U]);
-  XCTAssertEqual(value, YES);
-  XCTAssertFalse([dict getBool:NULL forKey:2U]);
-  XCTAssertTrue([dict getBool:NULL forKey:3U]);
-  XCTAssertTrue([dict getBool:&value forKey:3U]);
-  XCTAssertEqual(value, NO);
-  XCTAssertTrue([dict getBool:NULL forKey:4U]);
-  XCTAssertTrue([dict getBool:&value forKey:4U]);
-  XCTAssertEqual(value, NO);
-
-  [dict removeBoolForKey:4U];
-  XCTAssertEqual(dict.count, 2U);
-  XCTAssertTrue([dict getBool:NULL forKey:1U]);
-  XCTAssertTrue([dict getBool:&value forKey:1U]);
-  XCTAssertEqual(value, YES);
-  XCTAssertFalse([dict getBool:NULL forKey:2U]);
-  XCTAssertTrue([dict getBool:NULL forKey:3U]);
-  XCTAssertTrue([dict getBool:&value forKey:3U]);
-  XCTAssertEqual(value, NO);
-  XCTAssertFalse([dict getBool:NULL forKey:4U]);
-
-  [dict removeAll];
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertFalse([dict getBool:NULL forKey:1U]);
-  XCTAssertFalse([dict getBool:NULL forKey:2U]);
-  XCTAssertFalse([dict getBool:NULL forKey:3U]);
-  XCTAssertFalse([dict getBool:NULL forKey:4U]);
-  [dict release];
-}
-
-- (void)testInplaceMutation {
-  const uint32_t kKeys[] = { 1U, 2U, 3U, 4U };
-  const BOOL kValues[] = { YES, YES, NO, NO };
-  GPBUInt32BoolDictionary *dict =
-      [[GPBUInt32BoolDictionary alloc] initWithBools:kValues
-                                             forKeys:kKeys
-                                               count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 4U);
-  BOOL value;
-  XCTAssertTrue([dict getBool:NULL forKey:1U]);
-  XCTAssertTrue([dict getBool:&value forKey:1U]);
-  XCTAssertEqual(value, YES);
-  XCTAssertTrue([dict getBool:NULL forKey:2U]);
-  XCTAssertTrue([dict getBool:&value forKey:2U]);
-  XCTAssertEqual(value, YES);
-  XCTAssertTrue([dict getBool:NULL forKey:3U]);
-  XCTAssertTrue([dict getBool:&value forKey:3U]);
-  XCTAssertEqual(value, NO);
-  XCTAssertTrue([dict getBool:NULL forKey:4U]);
-  XCTAssertTrue([dict getBool:&value forKey:4U]);
-  XCTAssertEqual(value, NO);
-
-  [dict setBool:NO forKey:1U];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getBool:NULL forKey:1U]);
-  XCTAssertTrue([dict getBool:&value forKey:1U]);
-  XCTAssertEqual(value, NO);
-  XCTAssertTrue([dict getBool:NULL forKey:2U]);
-  XCTAssertTrue([dict getBool:&value forKey:2U]);
-  XCTAssertEqual(value, YES);
-  XCTAssertTrue([dict getBool:NULL forKey:3U]);
-  XCTAssertTrue([dict getBool:&value forKey:3U]);
-  XCTAssertEqual(value, NO);
-  XCTAssertTrue([dict getBool:NULL forKey:4U]);
-  XCTAssertTrue([dict getBool:&value forKey:4U]);
-  XCTAssertEqual(value, NO);
-
-  [dict setBool:YES forKey:4U];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getBool:NULL forKey:1U]);
-  XCTAssertTrue([dict getBool:&value forKey:1U]);
-  XCTAssertEqual(value, NO);
-  XCTAssertTrue([dict getBool:NULL forKey:2U]);
-  XCTAssertTrue([dict getBool:&value forKey:2U]);
-  XCTAssertEqual(value, YES);
-  XCTAssertTrue([dict getBool:NULL forKey:3U]);
-  XCTAssertTrue([dict getBool:&value forKey:3U]);
-  XCTAssertEqual(value, NO);
-  XCTAssertTrue([dict getBool:NULL forKey:4U]);
-  XCTAssertTrue([dict getBool:&value forKey:4U]);
-  XCTAssertEqual(value, YES);
-
-  const uint32_t kKeys2[] = { 2U, 3U };
-  const BOOL kValues2[] = { NO, YES };
-  GPBUInt32BoolDictionary *dict2 =
-      [[GPBUInt32BoolDictionary alloc] initWithBools:kValues2
-                                             forKeys:kKeys2
-                                               count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(dict2);
-  [dict addEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getBool:NULL forKey:1U]);
-  XCTAssertTrue([dict getBool:&value forKey:1U]);
-  XCTAssertEqual(value, NO);
-  XCTAssertTrue([dict getBool:NULL forKey:2U]);
-  XCTAssertTrue([dict getBool:&value forKey:2U]);
-  XCTAssertEqual(value, NO);
-  XCTAssertTrue([dict getBool:NULL forKey:3U]);
-  XCTAssertTrue([dict getBool:&value forKey:3U]);
-  XCTAssertEqual(value, YES);
-  XCTAssertTrue([dict getBool:NULL forKey:4U]);
-  XCTAssertTrue([dict getBool:&value forKey:4U]);
-  XCTAssertEqual(value, YES);
-
-  [dict2 release];
-  [dict release];
-}
-
-@end
-
-#pragma mark - UInt32 -> Float
-
-@interface GPBUInt32FloatDictionaryTests : XCTestCase
-@end
-
-@implementation GPBUInt32FloatDictionaryTests
-
-- (void)testEmpty {
-  GPBUInt32FloatDictionary *dict = [[GPBUInt32FloatDictionary alloc] init];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertFalse([dict getFloat:NULL forKey:1U]);
-  [dict enumerateKeysAndFloatsUsingBlock:^(uint32_t aKey, float aValue, BOOL *stop) {
-    #pragma unused(aKey, aValue, stop)
-    XCTFail(@"Shouldn't get here!");
-  }];
-  [dict release];
-}
-
-- (void)testOne {
-  GPBUInt32FloatDictionary *dict = [[GPBUInt32FloatDictionary alloc] init];
-  [dict setFloat:500.f forKey:1U];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 1U);
-  float value;
-  XCTAssertTrue([dict getFloat:NULL forKey:1U]);
-  XCTAssertTrue([dict getFloat:&value forKey:1U]);
-  XCTAssertEqual(value, 500.f);
-  XCTAssertFalse([dict getFloat:NULL forKey:2U]);
-  [dict enumerateKeysAndFloatsUsingBlock:^(uint32_t aKey, float aValue, BOOL *stop) {
-    XCTAssertEqual(aKey, 1U);
-    XCTAssertEqual(aValue, 500.f);
-    XCTAssertNotEqual(stop, NULL);
-  }];
-  [dict release];
-}
-
-- (void)testBasics {
-  const uint32_t kKeys[] = { 1U, 2U, 3U };
-  const float kValues[] = { 500.f, 501.f, 502.f };
-  GPBUInt32FloatDictionary *dict =
-      [[GPBUInt32FloatDictionary alloc] initWithFloats:kValues
-                                               forKeys:kKeys
-                                                 count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 3U);
-  float value;
-  XCTAssertTrue([dict getFloat:NULL forKey:1U]);
-  XCTAssertTrue([dict getFloat:&value forKey:1U]);
-  XCTAssertEqual(value, 500.f);
-  XCTAssertTrue([dict getFloat:NULL forKey:2U]);
-  XCTAssertTrue([dict getFloat:&value forKey:2U]);
-  XCTAssertEqual(value, 501.f);
-  XCTAssertTrue([dict getFloat:NULL forKey:3U]);
-  XCTAssertTrue([dict getFloat:&value forKey:3U]);
-  XCTAssertEqual(value, 502.f);
-  XCTAssertFalse([dict getFloat:NULL forKey:4U]);
-
-  __block NSUInteger idx = 0;
-  uint32_t *seenKeys = malloc(3 * sizeof(uint32_t));
-  float *seenValues = malloc(3 * sizeof(float));
-  [dict enumerateKeysAndFloatsUsingBlock:^(uint32_t aKey, float aValue, BOOL *stop) {
-    XCTAssertLessThan(idx, 3U);
-    seenKeys[idx] = aKey;
-    seenValues[idx] = aValue;
-    XCTAssertNotEqual(stop, NULL);
-    ++idx;
-  }];
-  for (int i = 0; i < 3; ++i) {
-    BOOL foundKey = NO;
-    for (int j = 0; (j < 3) && !foundKey; ++j) {
-      if (kKeys[i] == seenKeys[j]) {
-        foundKey = YES;
-        XCTAssertEqual(kValues[i], seenValues[j], @"i = %d, j = %d", i, j);
-      }
-    }
-    XCTAssertTrue(foundKey, @"i = %d", i);
-  }
-  free(seenKeys);
-  free(seenValues);
-
-  // Stopping the enumeration.
-  idx = 0;
-  [dict enumerateKeysAndFloatsUsingBlock:^(uint32_t aKey, float aValue, BOOL *stop) {
-    #pragma unused(aKey, aValue)
-    if (idx == 1) *stop = YES;
-    XCTAssertNotEqual(idx, 2U);
-    ++idx;
-  }];
-  [dict release];
-}
-
-- (void)testEquality {
-  const uint32_t kKeys1[] = { 1U, 2U, 3U, 4U };
-  const uint32_t kKeys2[] = { 2U, 1U, 4U };
-  const float kValues1[] = { 500.f, 501.f, 502.f };
-  const float kValues2[] = { 500.f, 503.f, 502.f };
-  const float kValues3[] = { 500.f, 501.f, 502.f, 503.f };
-  GPBUInt32FloatDictionary *dict1 =
-      [[GPBUInt32FloatDictionary alloc] initWithFloats:kValues1
-                                               forKeys:kKeys1
-                                                 count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict1);
-  GPBUInt32FloatDictionary *dict1prime =
-      [[GPBUInt32FloatDictionary alloc] initWithFloats:kValues1
-                                               forKeys:kKeys1
-                                                 count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict1prime);
-  GPBUInt32FloatDictionary *dict2 =
-      [[GPBUInt32FloatDictionary alloc] initWithFloats:kValues2
-                                               forKeys:kKeys1
-                                                 count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(dict2);
-  GPBUInt32FloatDictionary *dict3 =
-      [[GPBUInt32FloatDictionary alloc] initWithFloats:kValues1
-                                               forKeys:kKeys2
-                                                 count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict3);
-  GPBUInt32FloatDictionary *dict4 =
-      [[GPBUInt32FloatDictionary alloc] initWithFloats:kValues3
-                                               forKeys:kKeys1
-                                                 count:GPBARRAYSIZE(kValues3)];
-  XCTAssertNotNil(dict4);
-
-  // 1/1Prime should be different objects, but equal.
-  XCTAssertNotEqual(dict1, dict1prime);
-  XCTAssertEqualObjects(dict1, dict1prime);
-  // Equal, so they must have same hash.
-  XCTAssertEqual([dict1 hash], [dict1prime hash]);
-
-  // 2 is same keys, different values; not equal.
-  XCTAssertNotEqualObjects(dict1, dict2);
-
-  // 3 is different keys, same values; not equal.
-  XCTAssertNotEqualObjects(dict1, dict3);
-
-  // 4 extra pair; not equal
-  XCTAssertNotEqualObjects(dict1, dict4);
-
-  [dict1 release];
-  [dict1prime release];
-  [dict2 release];
-  [dict3 release];
-  [dict4 release];
-}
-
-- (void)testCopy {
-  const uint32_t kKeys[] = { 1U, 2U, 3U, 4U };
-  const float kValues[] = { 500.f, 501.f, 502.f, 503.f };
-  GPBUInt32FloatDictionary *dict =
-      [[GPBUInt32FloatDictionary alloc] initWithFloats:kValues
-                                               forKeys:kKeys
-                                                 count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-
-  GPBUInt32FloatDictionary *dict2 = [dict copy];
-  XCTAssertNotNil(dict2);
-
-  // Should be new object but equal.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  XCTAssertTrue([dict2 isKindOfClass:[GPBUInt32FloatDictionary class]]);
-
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testDictionaryFromDictionary {
-  const uint32_t kKeys[] = { 1U, 2U, 3U, 4U };
-  const float kValues[] = { 500.f, 501.f, 502.f, 503.f };
-  GPBUInt32FloatDictionary *dict =
-      [[GPBUInt32FloatDictionary alloc] initWithFloats:kValues
-                                               forKeys:kKeys
-                                                 count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-
-  GPBUInt32FloatDictionary *dict2 =
-      [[GPBUInt32FloatDictionary alloc] initWithDictionary:dict];
-  XCTAssertNotNil(dict2);
-
-  // Should be new pointer, but equal objects.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testAdds {
-  GPBUInt32FloatDictionary *dict = [[GPBUInt32FloatDictionary alloc] init];
-  XCTAssertNotNil(dict);
-
-  XCTAssertEqual(dict.count, 0U);
-  [dict setFloat:500.f forKey:1U];
-  XCTAssertEqual(dict.count, 1U);
-
-  const uint32_t kKeys[] = { 2U, 3U, 4U };
-  const float kValues[] = { 501.f, 502.f, 503.f };
-  GPBUInt32FloatDictionary *dict2 =
-      [[GPBUInt32FloatDictionary alloc] initWithFloats:kValues
-                                               forKeys:kKeys
-                                                 count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict2);
-  [dict addEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 4U);
-
-  float value;
-  XCTAssertTrue([dict getFloat:NULL forKey:1U]);
-  XCTAssertTrue([dict getFloat:&value forKey:1U]);
-  XCTAssertEqual(value, 500.f);
-  XCTAssertTrue([dict getFloat:NULL forKey:2U]);
-  XCTAssertTrue([dict getFloat:&value forKey:2U]);
-  XCTAssertEqual(value, 501.f);
-  XCTAssertTrue([dict getFloat:NULL forKey:3U]);
-  XCTAssertTrue([dict getFloat:&value forKey:3U]);
-  XCTAssertEqual(value, 502.f);
-  XCTAssertTrue([dict getFloat:NULL forKey:4U]);
-  XCTAssertTrue([dict getFloat:&value forKey:4U]);
-  XCTAssertEqual(value, 503.f);
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testRemove {
-  const uint32_t kKeys[] = { 1U, 2U, 3U, 4U };
-  const float kValues[] = { 500.f, 501.f, 502.f, 503.f };
-  GPBUInt32FloatDictionary *dict =
-      [[GPBUInt32FloatDictionary alloc] initWithFloats:kValues
-                                               forKeys:kKeys
-                                                 count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 4U);
-
-  [dict removeFloatForKey:2U];
-  XCTAssertEqual(dict.count, 3U);
-  float value;
-  XCTAssertTrue([dict getFloat:NULL forKey:1U]);
-  XCTAssertTrue([dict getFloat:&value forKey:1U]);
-  XCTAssertEqual(value, 500.f);
-  XCTAssertFalse([dict getFloat:NULL forKey:2U]);
-  XCTAssertTrue([dict getFloat:NULL forKey:3U]);
-  XCTAssertTrue([dict getFloat:&value forKey:3U]);
-  XCTAssertEqual(value, 502.f);
-  XCTAssertTrue([dict getFloat:NULL forKey:4U]);
-  XCTAssertTrue([dict getFloat:&value forKey:4U]);
-  XCTAssertEqual(value, 503.f);
-
-  // Remove again does nothing.
-  [dict removeFloatForKey:2U];
-  XCTAssertEqual(dict.count, 3U);
-  XCTAssertTrue([dict getFloat:NULL forKey:1U]);
-  XCTAssertTrue([dict getFloat:&value forKey:1U]);
-  XCTAssertEqual(value, 500.f);
-  XCTAssertFalse([dict getFloat:NULL forKey:2U]);
-  XCTAssertTrue([dict getFloat:NULL forKey:3U]);
-  XCTAssertTrue([dict getFloat:&value forKey:3U]);
-  XCTAssertEqual(value, 502.f);
-  XCTAssertTrue([dict getFloat:NULL forKey:4U]);
-  XCTAssertTrue([dict getFloat:&value forKey:4U]);
-  XCTAssertEqual(value, 503.f);
-
-  [dict removeFloatForKey:4U];
-  XCTAssertEqual(dict.count, 2U);
-  XCTAssertTrue([dict getFloat:NULL forKey:1U]);
-  XCTAssertTrue([dict getFloat:&value forKey:1U]);
-  XCTAssertEqual(value, 500.f);
-  XCTAssertFalse([dict getFloat:NULL forKey:2U]);
-  XCTAssertTrue([dict getFloat:NULL forKey:3U]);
-  XCTAssertTrue([dict getFloat:&value forKey:3U]);
-  XCTAssertEqual(value, 502.f);
-  XCTAssertFalse([dict getFloat:NULL forKey:4U]);
-
-  [dict removeAll];
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertFalse([dict getFloat:NULL forKey:1U]);
-  XCTAssertFalse([dict getFloat:NULL forKey:2U]);
-  XCTAssertFalse([dict getFloat:NULL forKey:3U]);
-  XCTAssertFalse([dict getFloat:NULL forKey:4U]);
-  [dict release];
-}
-
-- (void)testInplaceMutation {
-  const uint32_t kKeys[] = { 1U, 2U, 3U, 4U };
-  const float kValues[] = { 500.f, 501.f, 502.f, 503.f };
-  GPBUInt32FloatDictionary *dict =
-      [[GPBUInt32FloatDictionary alloc] initWithFloats:kValues
-                                               forKeys:kKeys
-                                                 count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 4U);
-  float value;
-  XCTAssertTrue([dict getFloat:NULL forKey:1U]);
-  XCTAssertTrue([dict getFloat:&value forKey:1U]);
-  XCTAssertEqual(value, 500.f);
-  XCTAssertTrue([dict getFloat:NULL forKey:2U]);
-  XCTAssertTrue([dict getFloat:&value forKey:2U]);
-  XCTAssertEqual(value, 501.f);
-  XCTAssertTrue([dict getFloat:NULL forKey:3U]);
-  XCTAssertTrue([dict getFloat:&value forKey:3U]);
-  XCTAssertEqual(value, 502.f);
-  XCTAssertTrue([dict getFloat:NULL forKey:4U]);
-  XCTAssertTrue([dict getFloat:&value forKey:4U]);
-  XCTAssertEqual(value, 503.f);
-
-  [dict setFloat:503.f forKey:1U];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getFloat:NULL forKey:1U]);
-  XCTAssertTrue([dict getFloat:&value forKey:1U]);
-  XCTAssertEqual(value, 503.f);
-  XCTAssertTrue([dict getFloat:NULL forKey:2U]);
-  XCTAssertTrue([dict getFloat:&value forKey:2U]);
-  XCTAssertEqual(value, 501.f);
-  XCTAssertTrue([dict getFloat:NULL forKey:3U]);
-  XCTAssertTrue([dict getFloat:&value forKey:3U]);
-  XCTAssertEqual(value, 502.f);
-  XCTAssertTrue([dict getFloat:NULL forKey:4U]);
-  XCTAssertTrue([dict getFloat:&value forKey:4U]);
-  XCTAssertEqual(value, 503.f);
-
-  [dict setFloat:501.f forKey:4U];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getFloat:NULL forKey:1U]);
-  XCTAssertTrue([dict getFloat:&value forKey:1U]);
-  XCTAssertEqual(value, 503.f);
-  XCTAssertTrue([dict getFloat:NULL forKey:2U]);
-  XCTAssertTrue([dict getFloat:&value forKey:2U]);
-  XCTAssertEqual(value, 501.f);
-  XCTAssertTrue([dict getFloat:NULL forKey:3U]);
-  XCTAssertTrue([dict getFloat:&value forKey:3U]);
-  XCTAssertEqual(value, 502.f);
-  XCTAssertTrue([dict getFloat:NULL forKey:4U]);
-  XCTAssertTrue([dict getFloat:&value forKey:4U]);
-  XCTAssertEqual(value, 501.f);
-
-  const uint32_t kKeys2[] = { 2U, 3U };
-  const float kValues2[] = { 502.f, 500.f };
-  GPBUInt32FloatDictionary *dict2 =
-      [[GPBUInt32FloatDictionary alloc] initWithFloats:kValues2
-                                               forKeys:kKeys2
-                                                 count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(dict2);
-  [dict addEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getFloat:NULL forKey:1U]);
-  XCTAssertTrue([dict getFloat:&value forKey:1U]);
-  XCTAssertEqual(value, 503.f);
-  XCTAssertTrue([dict getFloat:NULL forKey:2U]);
-  XCTAssertTrue([dict getFloat:&value forKey:2U]);
-  XCTAssertEqual(value, 502.f);
-  XCTAssertTrue([dict getFloat:NULL forKey:3U]);
-  XCTAssertTrue([dict getFloat:&value forKey:3U]);
-  XCTAssertEqual(value, 500.f);
-  XCTAssertTrue([dict getFloat:NULL forKey:4U]);
-  XCTAssertTrue([dict getFloat:&value forKey:4U]);
-  XCTAssertEqual(value, 501.f);
-
-  [dict2 release];
-  [dict release];
-}
-
-@end
-
-#pragma mark - UInt32 -> Double
-
-@interface GPBUInt32DoubleDictionaryTests : XCTestCase
-@end
-
-@implementation GPBUInt32DoubleDictionaryTests
-
-- (void)testEmpty {
-  GPBUInt32DoubleDictionary *dict = [[GPBUInt32DoubleDictionary alloc] init];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertFalse([dict getDouble:NULL forKey:1U]);
-  [dict enumerateKeysAndDoublesUsingBlock:^(uint32_t aKey, double aValue, BOOL *stop) {
-    #pragma unused(aKey, aValue, stop)
-    XCTFail(@"Shouldn't get here!");
-  }];
-  [dict release];
-}
-
-- (void)testOne {
-  GPBUInt32DoubleDictionary *dict = [[GPBUInt32DoubleDictionary alloc] init];
-  [dict setDouble:600. forKey:1U];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 1U);
-  double value;
-  XCTAssertTrue([dict getDouble:NULL forKey:1U]);
-  XCTAssertTrue([dict getDouble:&value forKey:1U]);
-  XCTAssertEqual(value, 600.);
-  XCTAssertFalse([dict getDouble:NULL forKey:2U]);
-  [dict enumerateKeysAndDoublesUsingBlock:^(uint32_t aKey, double aValue, BOOL *stop) {
-    XCTAssertEqual(aKey, 1U);
-    XCTAssertEqual(aValue, 600.);
-    XCTAssertNotEqual(stop, NULL);
-  }];
-  [dict release];
-}
-
-- (void)testBasics {
-  const uint32_t kKeys[] = { 1U, 2U, 3U };
-  const double kValues[] = { 600., 601., 602. };
-  GPBUInt32DoubleDictionary *dict =
-      [[GPBUInt32DoubleDictionary alloc] initWithDoubles:kValues
-                                                 forKeys:kKeys
-                                                   count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 3U);
-  double value;
-  XCTAssertTrue([dict getDouble:NULL forKey:1U]);
-  XCTAssertTrue([dict getDouble:&value forKey:1U]);
-  XCTAssertEqual(value, 600.);
-  XCTAssertTrue([dict getDouble:NULL forKey:2U]);
-  XCTAssertTrue([dict getDouble:&value forKey:2U]);
-  XCTAssertEqual(value, 601.);
-  XCTAssertTrue([dict getDouble:NULL forKey:3U]);
-  XCTAssertTrue([dict getDouble:&value forKey:3U]);
-  XCTAssertEqual(value, 602.);
-  XCTAssertFalse([dict getDouble:NULL forKey:4U]);
-
-  __block NSUInteger idx = 0;
-  uint32_t *seenKeys = malloc(3 * sizeof(uint32_t));
-  double *seenValues = malloc(3 * sizeof(double));
-  [dict enumerateKeysAndDoublesUsingBlock:^(uint32_t aKey, double aValue, BOOL *stop) {
-    XCTAssertLessThan(idx, 3U);
-    seenKeys[idx] = aKey;
-    seenValues[idx] = aValue;
-    XCTAssertNotEqual(stop, NULL);
-    ++idx;
-  }];
-  for (int i = 0; i < 3; ++i) {
-    BOOL foundKey = NO;
-    for (int j = 0; (j < 3) && !foundKey; ++j) {
-      if (kKeys[i] == seenKeys[j]) {
-        foundKey = YES;
-        XCTAssertEqual(kValues[i], seenValues[j], @"i = %d, j = %d", i, j);
-      }
-    }
-    XCTAssertTrue(foundKey, @"i = %d", i);
-  }
-  free(seenKeys);
-  free(seenValues);
-
-  // Stopping the enumeration.
-  idx = 0;
-  [dict enumerateKeysAndDoublesUsingBlock:^(uint32_t aKey, double aValue, BOOL *stop) {
-    #pragma unused(aKey, aValue)
-    if (idx == 1) *stop = YES;
-    XCTAssertNotEqual(idx, 2U);
-    ++idx;
-  }];
-  [dict release];
-}
-
-- (void)testEquality {
-  const uint32_t kKeys1[] = { 1U, 2U, 3U, 4U };
-  const uint32_t kKeys2[] = { 2U, 1U, 4U };
-  const double kValues1[] = { 600., 601., 602. };
-  const double kValues2[] = { 600., 603., 602. };
-  const double kValues3[] = { 600., 601., 602., 603. };
-  GPBUInt32DoubleDictionary *dict1 =
-      [[GPBUInt32DoubleDictionary alloc] initWithDoubles:kValues1
-                                                 forKeys:kKeys1
-                                                   count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict1);
-  GPBUInt32DoubleDictionary *dict1prime =
-      [[GPBUInt32DoubleDictionary alloc] initWithDoubles:kValues1
-                                                 forKeys:kKeys1
-                                                   count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict1prime);
-  GPBUInt32DoubleDictionary *dict2 =
-      [[GPBUInt32DoubleDictionary alloc] initWithDoubles:kValues2
-                                                 forKeys:kKeys1
-                                                   count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(dict2);
-  GPBUInt32DoubleDictionary *dict3 =
-      [[GPBUInt32DoubleDictionary alloc] initWithDoubles:kValues1
-                                                 forKeys:kKeys2
-                                                   count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict3);
-  GPBUInt32DoubleDictionary *dict4 =
-      [[GPBUInt32DoubleDictionary alloc] initWithDoubles:kValues3
-                                                 forKeys:kKeys1
-                                                   count:GPBARRAYSIZE(kValues3)];
-  XCTAssertNotNil(dict4);
-
-  // 1/1Prime should be different objects, but equal.
-  XCTAssertNotEqual(dict1, dict1prime);
-  XCTAssertEqualObjects(dict1, dict1prime);
-  // Equal, so they must have same hash.
-  XCTAssertEqual([dict1 hash], [dict1prime hash]);
-
-  // 2 is same keys, different values; not equal.
-  XCTAssertNotEqualObjects(dict1, dict2);
-
-  // 3 is different keys, same values; not equal.
-  XCTAssertNotEqualObjects(dict1, dict3);
-
-  // 4 extra pair; not equal
-  XCTAssertNotEqualObjects(dict1, dict4);
-
-  [dict1 release];
-  [dict1prime release];
-  [dict2 release];
-  [dict3 release];
-  [dict4 release];
-}
-
-- (void)testCopy {
-  const uint32_t kKeys[] = { 1U, 2U, 3U, 4U };
-  const double kValues[] = { 600., 601., 602., 603. };
-  GPBUInt32DoubleDictionary *dict =
-      [[GPBUInt32DoubleDictionary alloc] initWithDoubles:kValues
-                                                 forKeys:kKeys
-                                                   count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-
-  GPBUInt32DoubleDictionary *dict2 = [dict copy];
-  XCTAssertNotNil(dict2);
-
-  // Should be new object but equal.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  XCTAssertTrue([dict2 isKindOfClass:[GPBUInt32DoubleDictionary class]]);
-
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testDictionaryFromDictionary {
-  const uint32_t kKeys[] = { 1U, 2U, 3U, 4U };
-  const double kValues[] = { 600., 601., 602., 603. };
-  GPBUInt32DoubleDictionary *dict =
-      [[GPBUInt32DoubleDictionary alloc] initWithDoubles:kValues
-                                                 forKeys:kKeys
-                                                   count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-
-  GPBUInt32DoubleDictionary *dict2 =
-      [[GPBUInt32DoubleDictionary alloc] initWithDictionary:dict];
-  XCTAssertNotNil(dict2);
-
-  // Should be new pointer, but equal objects.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testAdds {
-  GPBUInt32DoubleDictionary *dict = [[GPBUInt32DoubleDictionary alloc] init];
-  XCTAssertNotNil(dict);
-
-  XCTAssertEqual(dict.count, 0U);
-  [dict setDouble:600. forKey:1U];
-  XCTAssertEqual(dict.count, 1U);
-
-  const uint32_t kKeys[] = { 2U, 3U, 4U };
-  const double kValues[] = { 601., 602., 603. };
-  GPBUInt32DoubleDictionary *dict2 =
-      [[GPBUInt32DoubleDictionary alloc] initWithDoubles:kValues
-                                                 forKeys:kKeys
-                                                   count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict2);
-  [dict addEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 4U);
-
-  double value;
-  XCTAssertTrue([dict getDouble:NULL forKey:1U]);
-  XCTAssertTrue([dict getDouble:&value forKey:1U]);
-  XCTAssertEqual(value, 600.);
-  XCTAssertTrue([dict getDouble:NULL forKey:2U]);
-  XCTAssertTrue([dict getDouble:&value forKey:2U]);
-  XCTAssertEqual(value, 601.);
-  XCTAssertTrue([dict getDouble:NULL forKey:3U]);
-  XCTAssertTrue([dict getDouble:&value forKey:3U]);
-  XCTAssertEqual(value, 602.);
-  XCTAssertTrue([dict getDouble:NULL forKey:4U]);
-  XCTAssertTrue([dict getDouble:&value forKey:4U]);
-  XCTAssertEqual(value, 603.);
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testRemove {
-  const uint32_t kKeys[] = { 1U, 2U, 3U, 4U };
-  const double kValues[] = { 600., 601., 602., 603. };
-  GPBUInt32DoubleDictionary *dict =
-      [[GPBUInt32DoubleDictionary alloc] initWithDoubles:kValues
-                                                 forKeys:kKeys
-                                                   count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 4U);
-
-  [dict removeDoubleForKey:2U];
-  XCTAssertEqual(dict.count, 3U);
-  double value;
-  XCTAssertTrue([dict getDouble:NULL forKey:1U]);
-  XCTAssertTrue([dict getDouble:&value forKey:1U]);
-  XCTAssertEqual(value, 600.);
-  XCTAssertFalse([dict getDouble:NULL forKey:2U]);
-  XCTAssertTrue([dict getDouble:NULL forKey:3U]);
-  XCTAssertTrue([dict getDouble:&value forKey:3U]);
-  XCTAssertEqual(value, 602.);
-  XCTAssertTrue([dict getDouble:NULL forKey:4U]);
-  XCTAssertTrue([dict getDouble:&value forKey:4U]);
-  XCTAssertEqual(value, 603.);
-
-  // Remove again does nothing.
-  [dict removeDoubleForKey:2U];
-  XCTAssertEqual(dict.count, 3U);
-  XCTAssertTrue([dict getDouble:NULL forKey:1U]);
-  XCTAssertTrue([dict getDouble:&value forKey:1U]);
-  XCTAssertEqual(value, 600.);
-  XCTAssertFalse([dict getDouble:NULL forKey:2U]);
-  XCTAssertTrue([dict getDouble:NULL forKey:3U]);
-  XCTAssertTrue([dict getDouble:&value forKey:3U]);
-  XCTAssertEqual(value, 602.);
-  XCTAssertTrue([dict getDouble:NULL forKey:4U]);
-  XCTAssertTrue([dict getDouble:&value forKey:4U]);
-  XCTAssertEqual(value, 603.);
-
-  [dict removeDoubleForKey:4U];
-  XCTAssertEqual(dict.count, 2U);
-  XCTAssertTrue([dict getDouble:NULL forKey:1U]);
-  XCTAssertTrue([dict getDouble:&value forKey:1U]);
-  XCTAssertEqual(value, 600.);
-  XCTAssertFalse([dict getDouble:NULL forKey:2U]);
-  XCTAssertTrue([dict getDouble:NULL forKey:3U]);
-  XCTAssertTrue([dict getDouble:&value forKey:3U]);
-  XCTAssertEqual(value, 602.);
-  XCTAssertFalse([dict getDouble:NULL forKey:4U]);
-
-  [dict removeAll];
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertFalse([dict getDouble:NULL forKey:1U]);
-  XCTAssertFalse([dict getDouble:NULL forKey:2U]);
-  XCTAssertFalse([dict getDouble:NULL forKey:3U]);
-  XCTAssertFalse([dict getDouble:NULL forKey:4U]);
-  [dict release];
-}
-
-- (void)testInplaceMutation {
-  const uint32_t kKeys[] = { 1U, 2U, 3U, 4U };
-  const double kValues[] = { 600., 601., 602., 603. };
-  GPBUInt32DoubleDictionary *dict =
-      [[GPBUInt32DoubleDictionary alloc] initWithDoubles:kValues
-                                                 forKeys:kKeys
-                                                   count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 4U);
-  double value;
-  XCTAssertTrue([dict getDouble:NULL forKey:1U]);
-  XCTAssertTrue([dict getDouble:&value forKey:1U]);
-  XCTAssertEqual(value, 600.);
-  XCTAssertTrue([dict getDouble:NULL forKey:2U]);
-  XCTAssertTrue([dict getDouble:&value forKey:2U]);
-  XCTAssertEqual(value, 601.);
-  XCTAssertTrue([dict getDouble:NULL forKey:3U]);
-  XCTAssertTrue([dict getDouble:&value forKey:3U]);
-  XCTAssertEqual(value, 602.);
-  XCTAssertTrue([dict getDouble:NULL forKey:4U]);
-  XCTAssertTrue([dict getDouble:&value forKey:4U]);
-  XCTAssertEqual(value, 603.);
-
-  [dict setDouble:603. forKey:1U];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getDouble:NULL forKey:1U]);
-  XCTAssertTrue([dict getDouble:&value forKey:1U]);
-  XCTAssertEqual(value, 603.);
-  XCTAssertTrue([dict getDouble:NULL forKey:2U]);
-  XCTAssertTrue([dict getDouble:&value forKey:2U]);
-  XCTAssertEqual(value, 601.);
-  XCTAssertTrue([dict getDouble:NULL forKey:3U]);
-  XCTAssertTrue([dict getDouble:&value forKey:3U]);
-  XCTAssertEqual(value, 602.);
-  XCTAssertTrue([dict getDouble:NULL forKey:4U]);
-  XCTAssertTrue([dict getDouble:&value forKey:4U]);
-  XCTAssertEqual(value, 603.);
-
-  [dict setDouble:601. forKey:4U];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getDouble:NULL forKey:1U]);
-  XCTAssertTrue([dict getDouble:&value forKey:1U]);
-  XCTAssertEqual(value, 603.);
-  XCTAssertTrue([dict getDouble:NULL forKey:2U]);
-  XCTAssertTrue([dict getDouble:&value forKey:2U]);
-  XCTAssertEqual(value, 601.);
-  XCTAssertTrue([dict getDouble:NULL forKey:3U]);
-  XCTAssertTrue([dict getDouble:&value forKey:3U]);
-  XCTAssertEqual(value, 602.);
-  XCTAssertTrue([dict getDouble:NULL forKey:4U]);
-  XCTAssertTrue([dict getDouble:&value forKey:4U]);
-  XCTAssertEqual(value, 601.);
-
-  const uint32_t kKeys2[] = { 2U, 3U };
-  const double kValues2[] = { 602., 600. };
-  GPBUInt32DoubleDictionary *dict2 =
-      [[GPBUInt32DoubleDictionary alloc] initWithDoubles:kValues2
-                                                 forKeys:kKeys2
-                                                   count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(dict2);
-  [dict addEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getDouble:NULL forKey:1U]);
-  XCTAssertTrue([dict getDouble:&value forKey:1U]);
-  XCTAssertEqual(value, 603.);
-  XCTAssertTrue([dict getDouble:NULL forKey:2U]);
-  XCTAssertTrue([dict getDouble:&value forKey:2U]);
-  XCTAssertEqual(value, 602.);
-  XCTAssertTrue([dict getDouble:NULL forKey:3U]);
-  XCTAssertTrue([dict getDouble:&value forKey:3U]);
-  XCTAssertEqual(value, 600.);
-  XCTAssertTrue([dict getDouble:NULL forKey:4U]);
-  XCTAssertTrue([dict getDouble:&value forKey:4U]);
-  XCTAssertEqual(value, 601.);
-
-  [dict2 release];
-  [dict release];
-}
-
-@end
-
-#pragma mark - UInt32 -> Enum
-
-@interface GPBUInt32EnumDictionaryTests : XCTestCase
-@end
-
-@implementation GPBUInt32EnumDictionaryTests
-
-- (void)testEmpty {
-  GPBUInt32EnumDictionary *dict = [[GPBUInt32EnumDictionary alloc] init];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertFalse([dict getEnum:NULL forKey:1U]);
-  [dict enumerateKeysAndEnumsUsingBlock:^(uint32_t aKey, int32_t aValue, BOOL *stop) {
-    #pragma unused(aKey, aValue, stop)
-    XCTFail(@"Shouldn't get here!");
-  }];
-  [dict release];
-}
-
-- (void)testOne {
-  GPBUInt32EnumDictionary *dict = [[GPBUInt32EnumDictionary alloc] init];
-  [dict setEnum:700 forKey:1U];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 1U);
-  int32_t value;
-  XCTAssertTrue([dict getEnum:NULL forKey:1U]);
-  XCTAssertTrue([dict getEnum:&value forKey:1U]);
-  XCTAssertEqual(value, 700);
-  XCTAssertFalse([dict getEnum:NULL forKey:2U]);
-  [dict enumerateKeysAndEnumsUsingBlock:^(uint32_t aKey, int32_t aValue, BOOL *stop) {
-    XCTAssertEqual(aKey, 1U);
-    XCTAssertEqual(aValue, 700);
-    XCTAssertNotEqual(stop, NULL);
-  }];
-  [dict release];
-}
-
-- (void)testBasics {
-  const uint32_t kKeys[] = { 1U, 2U, 3U };
-  const int32_t kValues[] = { 700, 701, 702 };
-  GPBUInt32EnumDictionary *dict =
-      [[GPBUInt32EnumDictionary alloc] initWithEnums:kValues
-                                             forKeys:kKeys
-                                               count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 3U);
-  int32_t value;
-  XCTAssertTrue([dict getEnum:NULL forKey:1U]);
-  XCTAssertTrue([dict getEnum:&value forKey:1U]);
-  XCTAssertEqual(value, 700);
-  XCTAssertTrue([dict getEnum:NULL forKey:2U]);
-  XCTAssertTrue([dict getEnum:&value forKey:2U]);
-  XCTAssertEqual(value, 701);
-  XCTAssertTrue([dict getEnum:NULL forKey:3U]);
-  XCTAssertTrue([dict getEnum:&value forKey:3U]);
-  XCTAssertEqual(value, 702);
-  XCTAssertFalse([dict getEnum:NULL forKey:4U]);
-
-  __block NSUInteger idx = 0;
-  uint32_t *seenKeys = malloc(3 * sizeof(uint32_t));
-  int32_t *seenValues = malloc(3 * sizeof(int32_t));
-  [dict enumerateKeysAndEnumsUsingBlock:^(uint32_t aKey, int32_t aValue, BOOL *stop) {
-    XCTAssertLessThan(idx, 3U);
-    seenKeys[idx] = aKey;
-    seenValues[idx] = aValue;
-    XCTAssertNotEqual(stop, NULL);
-    ++idx;
-  }];
-  for (int i = 0; i < 3; ++i) {
-    BOOL foundKey = NO;
-    for (int j = 0; (j < 3) && !foundKey; ++j) {
-      if (kKeys[i] == seenKeys[j]) {
-        foundKey = YES;
-        XCTAssertEqual(kValues[i], seenValues[j], @"i = %d, j = %d", i, j);
-      }
-    }
-    XCTAssertTrue(foundKey, @"i = %d", i);
-  }
-  free(seenKeys);
-  free(seenValues);
-
-  // Stopping the enumeration.
-  idx = 0;
-  [dict enumerateKeysAndEnumsUsingBlock:^(uint32_t aKey, int32_t aValue, BOOL *stop) {
-    #pragma unused(aKey, aValue)
-    if (idx == 1) *stop = YES;
-    XCTAssertNotEqual(idx, 2U);
-    ++idx;
-  }];
-  [dict release];
-}
-
-- (void)testEquality {
-  const uint32_t kKeys1[] = { 1U, 2U, 3U, 4U };
-  const uint32_t kKeys2[] = { 2U, 1U, 4U };
-  const int32_t kValues1[] = { 700, 701, 702 };
-  const int32_t kValues2[] = { 700, 703, 702 };
-  const int32_t kValues3[] = { 700, 701, 702, 703 };
-  GPBUInt32EnumDictionary *dict1 =
-      [[GPBUInt32EnumDictionary alloc] initWithEnums:kValues1
-                                             forKeys:kKeys1
-                                               count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict1);
-  GPBUInt32EnumDictionary *dict1prime =
-      [[GPBUInt32EnumDictionary alloc] initWithEnums:kValues1
-                                             forKeys:kKeys1
-                                               count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict1prime);
-  GPBUInt32EnumDictionary *dict2 =
-      [[GPBUInt32EnumDictionary alloc] initWithEnums:kValues2
-                                             forKeys:kKeys1
-                                               count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(dict2);
-  GPBUInt32EnumDictionary *dict3 =
-      [[GPBUInt32EnumDictionary alloc] initWithEnums:kValues1
-                                             forKeys:kKeys2
-                                               count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict3);
-  GPBUInt32EnumDictionary *dict4 =
-      [[GPBUInt32EnumDictionary alloc] initWithEnums:kValues3
-                                             forKeys:kKeys1
-                                               count:GPBARRAYSIZE(kValues3)];
-  XCTAssertNotNil(dict4);
-
-  // 1/1Prime should be different objects, but equal.
-  XCTAssertNotEqual(dict1, dict1prime);
-  XCTAssertEqualObjects(dict1, dict1prime);
-  // Equal, so they must have same hash.
-  XCTAssertEqual([dict1 hash], [dict1prime hash]);
-
-  // 2 is same keys, different values; not equal.
-  XCTAssertNotEqualObjects(dict1, dict2);
-
-  // 3 is different keys, same values; not equal.
-  XCTAssertNotEqualObjects(dict1, dict3);
-
-  // 4 extra pair; not equal
-  XCTAssertNotEqualObjects(dict1, dict4);
-
-  [dict1 release];
-  [dict1prime release];
-  [dict2 release];
-  [dict3 release];
-  [dict4 release];
-}
-
-- (void)testCopy {
-  const uint32_t kKeys[] = { 1U, 2U, 3U, 4U };
-  const int32_t kValues[] = { 700, 701, 702, 703 };
-  GPBUInt32EnumDictionary *dict =
-      [[GPBUInt32EnumDictionary alloc] initWithEnums:kValues
-                                             forKeys:kKeys
-                                               count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-
-  GPBUInt32EnumDictionary *dict2 = [dict copy];
-  XCTAssertNotNil(dict2);
-
-  // Should be new object but equal.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  XCTAssertTrue([dict2 isKindOfClass:[GPBUInt32EnumDictionary class]]);
-
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testDictionaryFromDictionary {
-  const uint32_t kKeys[] = { 1U, 2U, 3U, 4U };
-  const int32_t kValues[] = { 700, 701, 702, 703 };
-  GPBUInt32EnumDictionary *dict =
-      [[GPBUInt32EnumDictionary alloc] initWithEnums:kValues
-                                             forKeys:kKeys
-                                               count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-
-  GPBUInt32EnumDictionary *dict2 =
-      [[GPBUInt32EnumDictionary alloc] initWithDictionary:dict];
-  XCTAssertNotNil(dict2);
-
-  // Should be new pointer, but equal objects.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testAdds {
-  GPBUInt32EnumDictionary *dict = [[GPBUInt32EnumDictionary alloc] init];
-  XCTAssertNotNil(dict);
-
-  XCTAssertEqual(dict.count, 0U);
-  [dict setEnum:700 forKey:1U];
-  XCTAssertEqual(dict.count, 1U);
-
-  const uint32_t kKeys[] = { 2U, 3U, 4U };
-  const int32_t kValues[] = { 701, 702, 703 };
-  GPBUInt32EnumDictionary *dict2 =
-      [[GPBUInt32EnumDictionary alloc] initWithEnums:kValues
-                                             forKeys:kKeys
-                                               count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict2);
-  [dict addRawEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 4U);
-
-  int32_t value;
-  XCTAssertTrue([dict getEnum:NULL forKey:1U]);
-  XCTAssertTrue([dict getEnum:&value forKey:1U]);
-  XCTAssertEqual(value, 700);
-  XCTAssertTrue([dict getEnum:NULL forKey:2U]);
-  XCTAssertTrue([dict getEnum:&value forKey:2U]);
-  XCTAssertEqual(value, 701);
-  XCTAssertTrue([dict getEnum:NULL forKey:3U]);
-  XCTAssertTrue([dict getEnum:&value forKey:3U]);
-  XCTAssertEqual(value, 702);
-  XCTAssertTrue([dict getEnum:NULL forKey:4U]);
-  XCTAssertTrue([dict getEnum:&value forKey:4U]);
-  XCTAssertEqual(value, 703);
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testRemove {
-  const uint32_t kKeys[] = { 1U, 2U, 3U, 4U };
-  const int32_t kValues[] = { 700, 701, 702, 703 };
-  GPBUInt32EnumDictionary *dict =
-      [[GPBUInt32EnumDictionary alloc] initWithEnums:kValues
-                                             forKeys:kKeys
-                                               count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 4U);
-
-  [dict removeEnumForKey:2U];
-  XCTAssertEqual(dict.count, 3U);
-  int32_t value;
-  XCTAssertTrue([dict getEnum:NULL forKey:1U]);
-  XCTAssertTrue([dict getEnum:&value forKey:1U]);
-  XCTAssertEqual(value, 700);
-  XCTAssertFalse([dict getEnum:NULL forKey:2U]);
-  XCTAssertTrue([dict getEnum:NULL forKey:3U]);
-  XCTAssertTrue([dict getEnum:&value forKey:3U]);
-  XCTAssertEqual(value, 702);
-  XCTAssertTrue([dict getEnum:NULL forKey:4U]);
-  XCTAssertTrue([dict getEnum:&value forKey:4U]);
-  XCTAssertEqual(value, 703);
-
-  // Remove again does nothing.
-  [dict removeEnumForKey:2U];
-  XCTAssertEqual(dict.count, 3U);
-  XCTAssertTrue([dict getEnum:NULL forKey:1U]);
-  XCTAssertTrue([dict getEnum:&value forKey:1U]);
-  XCTAssertEqual(value, 700);
-  XCTAssertFalse([dict getEnum:NULL forKey:2U]);
-  XCTAssertTrue([dict getEnum:NULL forKey:3U]);
-  XCTAssertTrue([dict getEnum:&value forKey:3U]);
-  XCTAssertEqual(value, 702);
-  XCTAssertTrue([dict getEnum:NULL forKey:4U]);
-  XCTAssertTrue([dict getEnum:&value forKey:4U]);
-  XCTAssertEqual(value, 703);
-
-  [dict removeEnumForKey:4U];
-  XCTAssertEqual(dict.count, 2U);
-  XCTAssertTrue([dict getEnum:NULL forKey:1U]);
-  XCTAssertTrue([dict getEnum:&value forKey:1U]);
-  XCTAssertEqual(value, 700);
-  XCTAssertFalse([dict getEnum:NULL forKey:2U]);
-  XCTAssertTrue([dict getEnum:NULL forKey:3U]);
-  XCTAssertTrue([dict getEnum:&value forKey:3U]);
-  XCTAssertEqual(value, 702);
-  XCTAssertFalse([dict getEnum:NULL forKey:4U]);
-
-  [dict removeAll];
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertFalse([dict getEnum:NULL forKey:1U]);
-  XCTAssertFalse([dict getEnum:NULL forKey:2U]);
-  XCTAssertFalse([dict getEnum:NULL forKey:3U]);
-  XCTAssertFalse([dict getEnum:NULL forKey:4U]);
-  [dict release];
-}
-
-- (void)testInplaceMutation {
-  const uint32_t kKeys[] = { 1U, 2U, 3U, 4U };
-  const int32_t kValues[] = { 700, 701, 702, 703 };
-  GPBUInt32EnumDictionary *dict =
-      [[GPBUInt32EnumDictionary alloc] initWithEnums:kValues
-                                             forKeys:kKeys
-                                               count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 4U);
-  int32_t value;
-  XCTAssertTrue([dict getEnum:NULL forKey:1U]);
-  XCTAssertTrue([dict getEnum:&value forKey:1U]);
-  XCTAssertEqual(value, 700);
-  XCTAssertTrue([dict getEnum:NULL forKey:2U]);
-  XCTAssertTrue([dict getEnum:&value forKey:2U]);
-  XCTAssertEqual(value, 701);
-  XCTAssertTrue([dict getEnum:NULL forKey:3U]);
-  XCTAssertTrue([dict getEnum:&value forKey:3U]);
-  XCTAssertEqual(value, 702);
-  XCTAssertTrue([dict getEnum:NULL forKey:4U]);
-  XCTAssertTrue([dict getEnum:&value forKey:4U]);
-  XCTAssertEqual(value, 703);
-
-  [dict setEnum:703 forKey:1U];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getEnum:NULL forKey:1U]);
-  XCTAssertTrue([dict getEnum:&value forKey:1U]);
-  XCTAssertEqual(value, 703);
-  XCTAssertTrue([dict getEnum:NULL forKey:2U]);
-  XCTAssertTrue([dict getEnum:&value forKey:2U]);
-  XCTAssertEqual(value, 701);
-  XCTAssertTrue([dict getEnum:NULL forKey:3U]);
-  XCTAssertTrue([dict getEnum:&value forKey:3U]);
-  XCTAssertEqual(value, 702);
-  XCTAssertTrue([dict getEnum:NULL forKey:4U]);
-  XCTAssertTrue([dict getEnum:&value forKey:4U]);
-  XCTAssertEqual(value, 703);
-
-  [dict setEnum:701 forKey:4U];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getEnum:NULL forKey:1U]);
-  XCTAssertTrue([dict getEnum:&value forKey:1U]);
-  XCTAssertEqual(value, 703);
-  XCTAssertTrue([dict getEnum:NULL forKey:2U]);
-  XCTAssertTrue([dict getEnum:&value forKey:2U]);
-  XCTAssertEqual(value, 701);
-  XCTAssertTrue([dict getEnum:NULL forKey:3U]);
-  XCTAssertTrue([dict getEnum:&value forKey:3U]);
-  XCTAssertEqual(value, 702);
-  XCTAssertTrue([dict getEnum:NULL forKey:4U]);
-  XCTAssertTrue([dict getEnum:&value forKey:4U]);
-  XCTAssertEqual(value, 701);
-
-  const uint32_t kKeys2[] = { 2U, 3U };
-  const int32_t kValues2[] = { 702, 700 };
-  GPBUInt32EnumDictionary *dict2 =
-      [[GPBUInt32EnumDictionary alloc] initWithEnums:kValues2
-                                             forKeys:kKeys2
-                                               count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(dict2);
-  [dict addRawEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getEnum:NULL forKey:1U]);
-  XCTAssertTrue([dict getEnum:&value forKey:1U]);
-  XCTAssertEqual(value, 703);
-  XCTAssertTrue([dict getEnum:NULL forKey:2U]);
-  XCTAssertTrue([dict getEnum:&value forKey:2U]);
-  XCTAssertEqual(value, 702);
-  XCTAssertTrue([dict getEnum:NULL forKey:3U]);
-  XCTAssertTrue([dict getEnum:&value forKey:3U]);
-  XCTAssertEqual(value, 700);
-  XCTAssertTrue([dict getEnum:NULL forKey:4U]);
-  XCTAssertTrue([dict getEnum:&value forKey:4U]);
-  XCTAssertEqual(value, 701);
-
-  [dict2 release];
-  [dict release];
-}
-
-@end
-
-#pragma mark - UInt32 -> Enum (Unknown Enums)
-
-@interface GPBUInt32EnumDictionaryUnknownEnumTests : XCTestCase
-@end
-
-@implementation GPBUInt32EnumDictionaryUnknownEnumTests
-
-- (void)testRawBasics {
-  const uint32_t kKeys[] = { 1U, 2U, 3U };
-  const int32_t kValues[] = { 700, 801, 702 };
-  GPBUInt32EnumDictionary *dict =
-      [[GPBUInt32EnumDictionary alloc] initWithValidationFunction:TestingEnum_IsValidValue
-                                                        rawValues:kValues
-                                                          forKeys:kKeys
-                                                            count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 3U);
-  XCTAssertTrue(dict.validationFunc == TestingEnum_IsValidValue);  // Pointer comparison
-  int32_t value;
-  XCTAssertTrue([dict getRawValue:NULL forKey:1U]);
-  XCTAssertTrue([dict getRawValue:&value forKey:1U]);
-  XCTAssertEqual(value, 700);
-  XCTAssertTrue([dict getEnum:NULL forKey:2U]);
-  XCTAssertTrue([dict getEnum:&value forKey:2U]);
-  XCTAssertEqual(value, kGPBUnrecognizedEnumeratorValue);
-  XCTAssertTrue([dict getRawValue:NULL forKey:2U]);
-  XCTAssertTrue([dict getRawValue:&value forKey:2U]);
-  XCTAssertEqual(value, 801);
-  XCTAssertTrue([dict getRawValue:NULL forKey:3U]);
-  XCTAssertTrue([dict getRawValue:&value forKey:3U]);
-  XCTAssertEqual(value, 702);
-  XCTAssertFalse([dict getRawValue:NULL forKey:4U]);
-
-  __block NSUInteger idx = 0;
-  uint32_t *seenKeys = malloc(3 * sizeof(uint32_t));
-  int32_t *seenValues = malloc(3 * sizeof(int32_t));
-  [dict enumerateKeysAndEnumsUsingBlock:^(uint32_t aKey, int32_t aValue, BOOL *stop) {
-    XCTAssertLessThan(idx, 3U);
-    seenKeys[idx] = aKey;
-    seenValues[idx] = aValue;
-    XCTAssertNotEqual(stop, NULL);
-    ++idx;
-  }];
-  for (int i = 0; i < 3; ++i) {
-    BOOL foundKey = NO;
-    for (int j = 0; (j < 3) && !foundKey; ++j) {
-      if (kKeys[i] == seenKeys[j]) {
-        foundKey = YES;
-        if (i == 1) {
-          XCTAssertEqual(kGPBUnrecognizedEnumeratorValue, seenValues[j], @"i = %d, j = %d", i, j);
-        } else {
-          XCTAssertEqual(kValues[i], seenValues[j], @"i = %d, j = %d", i, j);
-        }
-      }
-    }
-    XCTAssertTrue(foundKey, @"i = %d", i);
-  }
-  idx = 0;
-  [dict enumerateKeysAndRawValuesUsingBlock:^(uint32_t aKey, int32_t aValue, BOOL *stop) {
-    XCTAssertLessThan(idx, 3U);
-    seenKeys[idx] = aKey;
-    seenValues[idx] = aValue;
-    XCTAssertNotEqual(stop, NULL);
-    ++idx;
-  }];
-  for (int i = 0; i < 3; ++i) {
-    BOOL foundKey = NO;
-    for (int j = 0; (j < 3) && !foundKey; ++j) {
-      if (kKeys[i] == seenKeys[j]) {
-        foundKey = YES;
-        XCTAssertEqual(kValues[i], seenValues[j], @"i = %d, j = %d", i, j);
-      }
-    }
-    XCTAssertTrue(foundKey, @"i = %d", i);
-  }
-  free(seenKeys);
-  free(seenValues);
-
-  // Stopping the enumeration.
-  idx = 0;
-  [dict enumerateKeysAndRawValuesUsingBlock:^(uint32_t aKey, int32_t aValue, BOOL *stop) {
-    #pragma unused(aKey, aValue)
-    if (idx == 1) *stop = YES;
-    XCTAssertNotEqual(idx, 2U);
-    ++idx;
-  }];
-  [dict release];
-}
-
-- (void)testEqualityWithUnknowns {
-  const uint32_t kKeys1[] = { 1U, 2U, 3U, 4U };
-  const uint32_t kKeys2[] = { 2U, 1U, 4U };
-  const int32_t kValues1[] = { 700, 801, 702 };  // Unknown
-  const int32_t kValues2[] = { 700, 803, 702 };  // Unknown
-  const int32_t kValues3[] = { 700, 801, 702, 803 };  // Unknowns
-  GPBUInt32EnumDictionary *dict1 =
-      [[GPBUInt32EnumDictionary alloc] initWithValidationFunction:TestingEnum_IsValidValue
-                                                        rawValues:kValues1
-                                                          forKeys:kKeys1
-                                                            count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict1);
-  GPBUInt32EnumDictionary *dict1prime =
-      [[GPBUInt32EnumDictionary alloc] initWithValidationFunction:TestingEnum_IsValidValue
-                                                        rawValues:kValues1
-                                                          forKeys:kKeys1
-                                                            count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict1prime);
-  GPBUInt32EnumDictionary *dict2 =
-      [[GPBUInt32EnumDictionary alloc] initWithValidationFunction:TestingEnum_IsValidValue
-                                                        rawValues:kValues2
-                                                          forKeys:kKeys1
-                                                            count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(dict2);
-  GPBUInt32EnumDictionary *dict3 =
-      [[GPBUInt32EnumDictionary alloc] initWithValidationFunction:TestingEnum_IsValidValue
-                                                        rawValues:kValues1
-                                                          forKeys:kKeys2
-                                                            count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict3);
-  GPBUInt32EnumDictionary *dict4 =
-      [[GPBUInt32EnumDictionary alloc] initWithValidationFunction:TestingEnum_IsValidValue
-                                                        rawValues:kValues3
-                                                          forKeys:kKeys1
-                                                            count:GPBARRAYSIZE(kValues3)];
-  XCTAssertNotNil(dict4);
-
-  // 1/1Prime should be different objects, but equal.
-  XCTAssertNotEqual(dict1, dict1prime);
-  XCTAssertEqualObjects(dict1, dict1prime);
-  // Equal, so they must have same hash.
-  XCTAssertEqual([dict1 hash], [dict1prime hash]);
-
-  // 2 is same keys, different values; not equal.
-  XCTAssertNotEqualObjects(dict1, dict2);
-
-  // 3 is different keys, same values; not equal.
-  XCTAssertNotEqualObjects(dict1, dict3);
-
-  // 4 extra pair; not equal
-  XCTAssertNotEqualObjects(dict1, dict4);
-
-  [dict1 release];
-  [dict1prime release];
-  [dict2 release];
-  [dict3 release];
-  [dict4 release];
-}
-
-- (void)testCopyWithUnknowns {
-  const uint32_t kKeys[] = { 1U, 2U, 3U, 4U };
-  const int32_t kValues[] = { 700, 801, 702, 803 };  // Unknown
-  GPBUInt32EnumDictionary *dict =
-      [[GPBUInt32EnumDictionary alloc] initWithValidationFunction:TestingEnum_IsValidValue
-                                                        rawValues:kValues
-                                                          forKeys:kKeys
-                                                            count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-
-  GPBUInt32EnumDictionary *dict2 = [dict copy];
-  XCTAssertNotNil(dict2);
-
-  // Should be new pointer, but equal objects.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqual(dict.validationFunc, dict2.validationFunc);  // Pointer comparison
-  XCTAssertEqualObjects(dict, dict2);
-
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testDictionaryFromDictionary {
-  const uint32_t kKeys[] = { 1U, 2U, 3U, 4U };
-  const int32_t kValues[] = { 700, 801, 702, 803 };  // Unknowns
-  GPBUInt32EnumDictionary *dict =
-      [[GPBUInt32EnumDictionary alloc] initWithValidationFunction:TestingEnum_IsValidValue
-                                                        rawValues:kValues
-                                                          forKeys:kKeys
-                                                            count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-
-  GPBUInt32EnumDictionary *dict2 =
-      [[GPBUInt32EnumDictionary alloc] initWithDictionary:dict];
-  XCTAssertNotNil(dict2);
-
-  // Should be new pointer, but equal objects.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  XCTAssertEqual(dict.validationFunc, dict2.validationFunc);  // Pointer comparison
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testUnknownAdds {
-  GPBUInt32EnumDictionary *dict =
-      [[GPBUInt32EnumDictionary alloc] initWithValidationFunction:TestingEnum_IsValidValue];
-  XCTAssertNotNil(dict);
-
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertThrowsSpecificNamed([dict setEnum:801 forKey:2U],  // Unknown
-                               NSException, NSInvalidArgumentException);
-  XCTAssertEqual(dict.count, 0U);
-  [dict setRawValue:801 forKey:2U];  // Unknown
-  XCTAssertEqual(dict.count, 1U);
-
-  const uint32_t kKeys[] = { 1U, 3U, 4U };
-  const int32_t kValues[] = { 700, 702, 803 };  // Unknown
-  GPBUInt32EnumDictionary *dict2 =
-      [[GPBUInt32EnumDictionary alloc] initWithEnums:kValues
-                                               forKeys:kKeys
-                                                 count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict2);
-  [dict addRawEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 4U);
-
-  int32_t value;
-  XCTAssertTrue([dict getEnum:NULL forKey:1U]);
-  XCTAssertTrue([dict getEnum:&value forKey:1U]);
-  XCTAssertEqual(value, 700);
-  XCTAssertTrue([dict getEnum:NULL forKey:2U]);
-  XCTAssertTrue([dict getEnum:&value forKey:2U]);
-  XCTAssertEqual(value, kGPBUnrecognizedEnumeratorValue);
-  XCTAssertTrue([dict getRawValue:NULL forKey:2U]);
-  XCTAssertTrue([dict getRawValue:&value forKey:2U]);
-  XCTAssertEqual(value, 801);
-  XCTAssertTrue([dict getEnum:NULL forKey:3U]);
-  XCTAssertTrue([dict getEnum:&value forKey:3U]);
-  XCTAssertEqual(value, 702);
-  XCTAssertTrue([dict getEnum:NULL forKey:4U]);
-  XCTAssertTrue([dict getEnum:&value forKey:4U]);
-  XCTAssertEqual(value, kGPBUnrecognizedEnumeratorValue);
-  XCTAssertTrue([dict getRawValue:NULL forKey:4U]);
-  XCTAssertTrue([dict getRawValue:&value forKey:4U]);
-  XCTAssertEqual(value, 803);
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testUnknownRemove {
-  const uint32_t kKeys[] = { 1U, 2U, 3U, 4U };
-  const int32_t kValues[] = { 700, 801, 702, 803 };  // Unknowns
-  GPBUInt32EnumDictionary *dict =
-      [[GPBUInt32EnumDictionary alloc] initWithValidationFunction:TestingEnum_IsValidValue
-                                                        rawValues:kValues
-                                                          forKeys:kKeys
-                                                            count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 4U);
-
-  [dict removeEnumForKey:2U];
-  XCTAssertEqual(dict.count, 3U);
-  int32_t value;
-  XCTAssertTrue([dict getEnum:NULL forKey:1U]);
-  XCTAssertTrue([dict getEnum:&value forKey:1U]);
-  XCTAssertEqual(value, 700);
-  XCTAssertFalse([dict getEnum:NULL forKey:2U]);
-  XCTAssertTrue([dict getEnum:NULL forKey:3U]);
-  XCTAssertTrue([dict getEnum:&value forKey:3U]);
-  XCTAssertEqual(value, 702);
-  XCTAssertTrue([dict getRawValue:NULL forKey:4U]);
-  XCTAssertTrue([dict getRawValue:&value forKey:4U]);
-  XCTAssertEqual(value, 803);
-
-  // Remove again does nothing.
-  [dict removeEnumForKey:2U];
-  XCTAssertEqual(dict.count, 3U);
-  XCTAssertTrue([dict getEnum:NULL forKey:1U]);
-  XCTAssertTrue([dict getEnum:&value forKey:1U]);
-  XCTAssertEqual(value, 700);
-  XCTAssertFalse([dict getEnum:NULL forKey:2U]);
-  XCTAssertTrue([dict getEnum:NULL forKey:3U]);
-  XCTAssertTrue([dict getEnum:&value forKey:3U]);
-  XCTAssertEqual(value, 702);
-  XCTAssertTrue([dict getRawValue:NULL forKey:4U]);
-  XCTAssertTrue([dict getRawValue:&value forKey:4U]);
-  XCTAssertEqual(value, 803);
-
-  [dict removeEnumForKey:4U];
-  XCTAssertEqual(dict.count, 2U);
-  XCTAssertTrue([dict getEnum:NULL forKey:1U]);
-  XCTAssertTrue([dict getEnum:&value forKey:1U]);
-  XCTAssertEqual(value, 700);
-  XCTAssertFalse([dict getEnum:NULL forKey:2U]);
-  XCTAssertTrue([dict getEnum:NULL forKey:3U]);
-  XCTAssertTrue([dict getEnum:&value forKey:3U]);
-  XCTAssertEqual(value, 702);
-  XCTAssertFalse([dict getEnum:NULL forKey:4U]);
-
-  [dict removeAll];
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertFalse([dict getEnum:NULL forKey:1U]);
-  XCTAssertFalse([dict getEnum:NULL forKey:2U]);
-  XCTAssertFalse([dict getEnum:NULL forKey:3U]);
-  XCTAssertFalse([dict getEnum:NULL forKey:4U]);
-  [dict release];
-}
-
-- (void)testInplaceMutationUnknowns {
-  const uint32_t kKeys[] = { 1U, 2U, 3U, 4U };
-  const int32_t kValues[] = { 700, 801, 702, 803 };  // Unknowns
-  GPBUInt32EnumDictionary *dict =
-      [[GPBUInt32EnumDictionary alloc] initWithValidationFunction:TestingEnum_IsValidValue
-                                                        rawValues:kValues
-                                                          forKeys:kKeys
-                                                            count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 4U);
-  int32_t value;
-  XCTAssertTrue([dict getEnum:NULL forKey:1U]);
-  XCTAssertTrue([dict getEnum:&value forKey:1U]);
-  XCTAssertEqual(value, 700);
-  XCTAssertTrue([dict getRawValue:NULL forKey:2U]);
-  XCTAssertTrue([dict getRawValue:&value forKey:2U]);
-  XCTAssertEqual(value, 801);
-  XCTAssertTrue([dict getEnum:NULL forKey:3U]);
-  XCTAssertTrue([dict getEnum:&value forKey:3U]);
-  XCTAssertEqual(value, 702);
-  XCTAssertTrue([dict getRawValue:NULL forKey:4U]);
-  XCTAssertTrue([dict getRawValue:&value forKey:4U]);
-  XCTAssertEqual(value, 803);
-
-  XCTAssertThrowsSpecificNamed([dict setEnum:803 forKey:1U],  // Unknown
-                               NSException, NSInvalidArgumentException);
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getEnum:NULL forKey:1U]);
-  XCTAssertTrue([dict getEnum:&value forKey:1U]);
-  XCTAssertEqual(value, 700);
-  XCTAssertTrue([dict getRawValue:NULL forKey:2U]);
-  XCTAssertTrue([dict getRawValue:&value forKey:2U]);
-  XCTAssertEqual(value, 801);
-  XCTAssertTrue([dict getEnum:NULL forKey:3U]);
-  XCTAssertTrue([dict getEnum:&value forKey:3U]);
-  XCTAssertEqual(value, 702);
-  XCTAssertTrue([dict getRawValue:NULL forKey:4U]);
-  XCTAssertTrue([dict getRawValue:&value forKey:4U]);
-  XCTAssertEqual(value, 803);
-
-  [dict setRawValue:803 forKey:1U];  // Unknown
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getRawValue:NULL forKey:1U]);
-  XCTAssertTrue([dict getRawValue:&value forKey:1U]);
-  XCTAssertEqual(value, 803);
-  XCTAssertTrue([dict getRawValue:NULL forKey:2U]);
-  XCTAssertTrue([dict getRawValue:&value forKey:2U]);
-  XCTAssertEqual(value, 801);
-  XCTAssertTrue([dict getEnum:NULL forKey:3U]);
-  XCTAssertTrue([dict getEnum:&value forKey:3U]);
-  XCTAssertEqual(value, 702);
-  XCTAssertTrue([dict getRawValue:NULL forKey:4U]);
-  XCTAssertTrue([dict getRawValue:&value forKey:4U]);
-  XCTAssertEqual(value, 803);
-
-  [dict setRawValue:700 forKey:4U];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getRawValue:NULL forKey:1U]);
-  XCTAssertTrue([dict getRawValue:&value forKey:1U]);
-  XCTAssertEqual(value, 803);
-  XCTAssertTrue([dict getRawValue:NULL forKey:2U]);
-  XCTAssertTrue([dict getRawValue:&value forKey:2U]);
-  XCTAssertEqual(value, 801);
-  XCTAssertTrue([dict getEnum:NULL forKey:3U]);
-  XCTAssertTrue([dict getEnum:&value forKey:3U]);
-  XCTAssertEqual(value, 702);
-  XCTAssertTrue([dict getEnum:NULL forKey:4U]);
-  XCTAssertTrue([dict getEnum:&value forKey:4U]);
-  XCTAssertEqual(value, 700);
-
-  const uint32_t kKeys2[] = { 2U, 3U };
-  const int32_t kValues2[] = { 702, 801 };  // Unknown
-  GPBUInt32EnumDictionary *dict2 =
-      [[GPBUInt32EnumDictionary alloc] initWithValidationFunction:TestingEnum_IsValidValue
-                                                        rawValues:kValues2
-                                                          forKeys:kKeys2
-                                                            count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(dict2);
-  [dict addRawEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getRawValue:NULL forKey:1U]);
-  XCTAssertTrue([dict getRawValue:&value forKey:1U]);
-  XCTAssertEqual(value, 803);
-  XCTAssertTrue([dict getEnum:NULL forKey:2U]);
-  XCTAssertTrue([dict getEnum:&value forKey:2U]);
-  XCTAssertEqual(value, 702);
-  XCTAssertTrue([dict getRawValue:NULL forKey:3U]);
-  XCTAssertTrue([dict getRawValue:&value forKey:3U]);
-  XCTAssertEqual(value, 801);
-  XCTAssertTrue([dict getEnum:NULL forKey:4U]);
-  XCTAssertTrue([dict getEnum:&value forKey:4U]);
-  XCTAssertEqual(value, 700);
-
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testCopyUnknowns {
-  const uint32_t kKeys[] = { 1U, 2U, 3U, 4U };
-  const int32_t kValues[] = { 700, 801, 702, 803 };
-  GPBUInt32EnumDictionary *dict =
-      [[GPBUInt32EnumDictionary alloc] initWithValidationFunction:TestingEnum_IsValidValue
-                                                        rawValues:kValues
-                                                          forKeys:kKeys
-                                                            count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-
-  GPBUInt32EnumDictionary *dict2 = [dict copy];
-  XCTAssertNotNil(dict2);
-
-  // Should be new pointer, but equal objects.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  XCTAssertEqual(dict.validationFunc, dict2.validationFunc);  // Pointer comparison
-  XCTAssertTrue([dict2 isKindOfClass:[GPBUInt32EnumDictionary class]]);
-
-  [dict2 release];
-  [dict release];
-}
-
-@end
-
-#pragma mark - UInt32 -> Object
-
-@interface GPBUInt32ObjectDictionaryTests : XCTestCase
-@end
-
-@implementation GPBUInt32ObjectDictionaryTests
-
-- (void)testEmpty {
-  GPBUInt32ObjectDictionary<NSString*> *dict = [[GPBUInt32ObjectDictionary alloc] init];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertNil([dict objectForKey:1U]);
-  [dict enumerateKeysAndObjectsUsingBlock:^(uint32_t aKey, NSString* aObject, BOOL *stop) {
-    #pragma unused(aKey, aObject, stop)
-    XCTFail(@"Shouldn't get here!");
-  }];
-  [dict release];
-}
-
-- (void)testOne {
-  GPBUInt32ObjectDictionary<NSString*> *dict = [[GPBUInt32ObjectDictionary alloc] init];
-  [dict setObject:@"abc" forKey:1U];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 1U);
-  XCTAssertEqualObjects([dict objectForKey:1U], @"abc");
-  XCTAssertNil([dict objectForKey:2U]);
-  [dict enumerateKeysAndObjectsUsingBlock:^(uint32_t aKey, NSString* aObject, BOOL *stop) {
-    XCTAssertEqual(aKey, 1U);
-    XCTAssertEqualObjects(aObject, @"abc");
-    XCTAssertNotEqual(stop, NULL);
-  }];
-  [dict release];
-}
-
-- (void)testBasics {
-  const uint32_t kKeys[] = { 1U, 2U, 3U };
-  const NSString* kObjects[] = { @"abc", @"def", @"ghi" };
-  GPBUInt32ObjectDictionary<NSString*> *dict =
-      [[GPBUInt32ObjectDictionary alloc] initWithObjects:kObjects
-                                                 forKeys:kKeys
-                                                   count:GPBARRAYSIZE(kObjects)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 3U);
-  XCTAssertEqualObjects([dict objectForKey:1U], @"abc");
-  XCTAssertEqualObjects([dict objectForKey:2U], @"def");
-  XCTAssertEqualObjects([dict objectForKey:3U], @"ghi");
-  XCTAssertNil([dict objectForKey:4U]);
-
-  __block NSUInteger idx = 0;
-  uint32_t *seenKeys = malloc(3 * sizeof(uint32_t));
-  NSString* *seenObjects = malloc(3 * sizeof(NSString*));
-  [dict enumerateKeysAndObjectsUsingBlock:^(uint32_t aKey, NSString* aObject, BOOL *stop) {
-    XCTAssertLessThan(idx, 3U);
-    seenKeys[idx] = aKey;
-    seenObjects[idx] = aObject;
-    XCTAssertNotEqual(stop, NULL);
-    ++idx;
-  }];
-  for (int i = 0; i < 3; ++i) {
-    BOOL foundKey = NO;
-    for (int j = 0; (j < 3) && !foundKey; ++j) {
-      if (kKeys[i] == seenKeys[j]) {
-        foundKey = YES;
-        XCTAssertEqualObjects(kObjects[i], seenObjects[j], @"i = %d, j = %d", i, j);
-      }
-    }
-    XCTAssertTrue(foundKey, @"i = %d", i);
-  }
-  free(seenKeys);
-  free(seenObjects);
-
-  // Stopping the enumeration.
-  idx = 0;
-  [dict enumerateKeysAndObjectsUsingBlock:^(uint32_t aKey, NSString* aObject, BOOL *stop) {
-    #pragma unused(aKey, aObject)
-    if (idx == 1) *stop = YES;
-    XCTAssertNotEqual(idx, 2U);
-    ++idx;
-  }];
-  [dict release];
-}
-
-- (void)testEquality {
-  const uint32_t kKeys1[] = { 1U, 2U, 3U, 4U };
-  const uint32_t kKeys2[] = { 2U, 1U, 4U };
-  const NSString* kObjects1[] = { @"abc", @"def", @"ghi" };
-  const NSString* kObjects2[] = { @"abc", @"jkl", @"ghi" };
-  const NSString* kObjects3[] = { @"abc", @"def", @"ghi", @"jkl" };
-  GPBUInt32ObjectDictionary<NSString*> *dict1 =
-      [[GPBUInt32ObjectDictionary alloc] initWithObjects:kObjects1
-                                                 forKeys:kKeys1
-                                                   count:GPBARRAYSIZE(kObjects1)];
-  XCTAssertNotNil(dict1);
-  GPBUInt32ObjectDictionary<NSString*> *dict1prime =
-      [[GPBUInt32ObjectDictionary alloc] initWithObjects:kObjects1
-                                                 forKeys:kKeys1
-                                                   count:GPBARRAYSIZE(kObjects1)];
-  XCTAssertNotNil(dict1prime);
-  GPBUInt32ObjectDictionary<NSString*> *dict2 =
-      [[GPBUInt32ObjectDictionary alloc] initWithObjects:kObjects2
-                                                 forKeys:kKeys1
-                                                   count:GPBARRAYSIZE(kObjects2)];
-  XCTAssertNotNil(dict2);
-  GPBUInt32ObjectDictionary<NSString*> *dict3 =
-      [[GPBUInt32ObjectDictionary alloc] initWithObjects:kObjects1
-                                                 forKeys:kKeys2
-                                                   count:GPBARRAYSIZE(kObjects1)];
-  XCTAssertNotNil(dict3);
-  GPBUInt32ObjectDictionary<NSString*> *dict4 =
-      [[GPBUInt32ObjectDictionary alloc] initWithObjects:kObjects3
-                                                 forKeys:kKeys1
-                                                   count:GPBARRAYSIZE(kObjects3)];
-  XCTAssertNotNil(dict4);
-
-  // 1/1Prime should be different objects, but equal.
-  XCTAssertNotEqual(dict1, dict1prime);
-  XCTAssertEqualObjects(dict1, dict1prime);
-  // Equal, so they must have same hash.
-  XCTAssertEqual([dict1 hash], [dict1prime hash]);
-
-  // 2 is same keys, different objects; not equal.
-  XCTAssertNotEqualObjects(dict1, dict2);
-
-  // 3 is different keys, same objects; not equal.
-  XCTAssertNotEqualObjects(dict1, dict3);
-
-  // 4 extra pair; not equal
-  XCTAssertNotEqualObjects(dict1, dict4);
-
-  [dict1 release];
-  [dict1prime release];
-  [dict2 release];
-  [dict3 release];
-  [dict4 release];
-}
-
-- (void)testCopy {
-  const uint32_t kKeys[] = { 1U, 2U, 3U, 4U };
-  const NSString* kObjects[] = { @"abc", @"def", @"ghi", @"jkl" };
-  GPBUInt32ObjectDictionary<NSString*> *dict =
-      [[GPBUInt32ObjectDictionary alloc] initWithObjects:kObjects
-                                                 forKeys:kKeys
-                                                   count:GPBARRAYSIZE(kObjects)];
-  XCTAssertNotNil(dict);
-
-  GPBUInt32ObjectDictionary<NSString*> *dict2 = [dict copy];
-  XCTAssertNotNil(dict2);
-
-  // Should be new object but equal.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  XCTAssertTrue([dict2 isKindOfClass:[GPBUInt32ObjectDictionary class]]);
-
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testDictionaryFromDictionary {
-  const uint32_t kKeys[] = { 1U, 2U, 3U, 4U };
-  const NSString* kObjects[] = { @"abc", @"def", @"ghi", @"jkl" };
-  GPBUInt32ObjectDictionary<NSString*> *dict =
-      [[GPBUInt32ObjectDictionary alloc] initWithObjects:kObjects
-                                                 forKeys:kKeys
-                                                   count:GPBARRAYSIZE(kObjects)];
-  XCTAssertNotNil(dict);
-
-  GPBUInt32ObjectDictionary<NSString*> *dict2 =
-      [[GPBUInt32ObjectDictionary alloc] initWithDictionary:dict];
-  XCTAssertNotNil(dict2);
-
-  // Should be new pointer, but equal objects.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testAdds {
-  GPBUInt32ObjectDictionary<NSString*> *dict = [[GPBUInt32ObjectDictionary alloc] init];
-  XCTAssertNotNil(dict);
-
-  XCTAssertEqual(dict.count, 0U);
-  [dict setObject:@"abc" forKey:1U];
-  XCTAssertEqual(dict.count, 1U);
-
-  const uint32_t kKeys[] = { 2U, 3U, 4U };
-  const NSString* kObjects[] = { @"def", @"ghi", @"jkl" };
-  GPBUInt32ObjectDictionary<NSString*> *dict2 =
-      [[GPBUInt32ObjectDictionary alloc] initWithObjects:kObjects
-                                                 forKeys:kKeys
-                                                   count:GPBARRAYSIZE(kObjects)];
-  XCTAssertNotNil(dict2);
-  [dict addEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 4U);
-
-  XCTAssertEqualObjects([dict objectForKey:1U], @"abc");
-  XCTAssertEqualObjects([dict objectForKey:2U], @"def");
-  XCTAssertEqualObjects([dict objectForKey:3U], @"ghi");
-  XCTAssertEqualObjects([dict objectForKey:4U], @"jkl");
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testRemove {
-  const uint32_t kKeys[] = { 1U, 2U, 3U, 4U };
-  const NSString* kObjects[] = { @"abc", @"def", @"ghi", @"jkl" };
-  GPBUInt32ObjectDictionary<NSString*> *dict =
-      [[GPBUInt32ObjectDictionary alloc] initWithObjects:kObjects
-                                                 forKeys:kKeys
-                                                   count:GPBARRAYSIZE(kObjects)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 4U);
-
-  [dict removeObjectForKey:2U];
-  XCTAssertEqual(dict.count, 3U);
-  XCTAssertEqualObjects([dict objectForKey:1U], @"abc");
-  XCTAssertNil([dict objectForKey:2U]);
-  XCTAssertEqualObjects([dict objectForKey:3U], @"ghi");
-  XCTAssertEqualObjects([dict objectForKey:4U], @"jkl");
-
-  // Remove again does nothing.
-  [dict removeObjectForKey:2U];
-  XCTAssertEqual(dict.count, 3U);
-  XCTAssertEqualObjects([dict objectForKey:1U], @"abc");
-  XCTAssertNil([dict objectForKey:2U]);
-  XCTAssertEqualObjects([dict objectForKey:3U], @"ghi");
-  XCTAssertEqualObjects([dict objectForKey:4U], @"jkl");
-
-  [dict removeObjectForKey:4U];
-  XCTAssertEqual(dict.count, 2U);
-  XCTAssertEqualObjects([dict objectForKey:1U], @"abc");
-  XCTAssertNil([dict objectForKey:2U]);
-  XCTAssertEqualObjects([dict objectForKey:3U], @"ghi");
-  XCTAssertNil([dict objectForKey:4U]);
-
-  [dict removeAll];
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertNil([dict objectForKey:1U]);
-  XCTAssertNil([dict objectForKey:2U]);
-  XCTAssertNil([dict objectForKey:3U]);
-  XCTAssertNil([dict objectForKey:4U]);
-  [dict release];
-}
-
-- (void)testInplaceMutation {
-  const uint32_t kKeys[] = { 1U, 2U, 3U, 4U };
-  const NSString* kObjects[] = { @"abc", @"def", @"ghi", @"jkl" };
-  GPBUInt32ObjectDictionary<NSString*> *dict =
-      [[GPBUInt32ObjectDictionary alloc] initWithObjects:kObjects
-                                                 forKeys:kKeys
-                                                   count:GPBARRAYSIZE(kObjects)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertEqualObjects([dict objectForKey:1U], @"abc");
-  XCTAssertEqualObjects([dict objectForKey:2U], @"def");
-  XCTAssertEqualObjects([dict objectForKey:3U], @"ghi");
-  XCTAssertEqualObjects([dict objectForKey:4U], @"jkl");
-
-  [dict setObject:@"jkl" forKey:1U];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertEqualObjects([dict objectForKey:1U], @"jkl");
-  XCTAssertEqualObjects([dict objectForKey:2U], @"def");
-  XCTAssertEqualObjects([dict objectForKey:3U], @"ghi");
-  XCTAssertEqualObjects([dict objectForKey:4U], @"jkl");
-
-  [dict setObject:@"def" forKey:4U];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertEqualObjects([dict objectForKey:1U], @"jkl");
-  XCTAssertEqualObjects([dict objectForKey:2U], @"def");
-  XCTAssertEqualObjects([dict objectForKey:3U], @"ghi");
-  XCTAssertEqualObjects([dict objectForKey:4U], @"def");
-
-  const uint32_t kKeys2[] = { 2U, 3U };
-  const NSString* kObjects2[] = { @"ghi", @"abc" };
-  GPBUInt32ObjectDictionary<NSString*> *dict2 =
-      [[GPBUInt32ObjectDictionary alloc] initWithObjects:kObjects2
-                                                 forKeys:kKeys2
-                                                   count:GPBARRAYSIZE(kObjects2)];
-  XCTAssertNotNil(dict2);
-  [dict addEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertEqualObjects([dict objectForKey:1U], @"jkl");
-  XCTAssertEqualObjects([dict objectForKey:2U], @"ghi");
-  XCTAssertEqualObjects([dict objectForKey:3U], @"abc");
-  XCTAssertEqualObjects([dict objectForKey:4U], @"def");
-
-  [dict2 release];
-  [dict release];
-}
-
-@end
-
-// clang-format on
-//%PDDM-EXPAND-END TEST_FOR_POD_KEY(UInt32, uint32_t, 1U, 2U, 3U, 4U)
-
diff --git a/libs/protobuf/objectivec/Tests/GPBDictionaryTests+UInt64.m b/libs/protobuf/objectivec/Tests/GPBDictionaryTests+UInt64.m
deleted file mode 100644
index b5dd91e..0000000
--- a/libs/protobuf/objectivec/Tests/GPBDictionaryTests+UInt64.m
+++ /dev/null
@@ -1,3677 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#import <Foundation/Foundation.h>
-#import <XCTest/XCTest.h>
-
-#import "GPBDictionary.h"
-
-#import "GPBTestUtilities.h"
-#import "google/protobuf/UnittestRuntimeProto2.pbobjc.h"
-
-// Pull in the macros (using an external file because expanding all tests
-// in a single file makes a file that is failing to work with within Xcode.
-//%PDDM-IMPORT-DEFINES GPBDictionaryTests.pddm
-
-//%PDDM-EXPAND TEST_FOR_POD_KEY(UInt64, uint64_t, 31ULL, 32ULL, 33ULL, 34ULL)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-// To let the testing macros work, add some extra methods to simplify things.
-@interface GPBUInt64EnumDictionary (TestingTweak)
-- (instancetype)initWithEnums:(const int32_t [])values
-                      forKeys:(const uint64_t [])keys
-                        count:(NSUInteger)count;
-@end
-
-static BOOL TestingEnum_IsValidValue(int32_t value) {
-  switch (value) {
-    case 700:
-    case 701:
-    case 702:
-    case 703:
-      return YES;
-    default:
-      return NO;
-  }
-}
-
-@implementation GPBUInt64EnumDictionary (TestingTweak)
-- (instancetype)initWithEnums:(const int32_t [])values
-                      forKeys:(const uint64_t [])keys
-                        count:(NSUInteger)count {
-  return [self initWithValidationFunction:TestingEnum_IsValidValue
-                                rawValues:values
-                                  forKeys:keys
-                                    count:count];
-}
-@end
-
-
-#pragma mark - UInt64 -> UInt32
-
-@interface GPBUInt64UInt32DictionaryTests : XCTestCase
-@end
-
-@implementation GPBUInt64UInt32DictionaryTests
-
-- (void)testEmpty {
-  GPBUInt64UInt32Dictionary *dict = [[GPBUInt64UInt32Dictionary alloc] init];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertFalse([dict getUInt32:NULL forKey:31ULL]);
-  [dict enumerateKeysAndUInt32sUsingBlock:^(uint64_t aKey, uint32_t aValue, BOOL *stop) {
-    #pragma unused(aKey, aValue, stop)
-    XCTFail(@"Shouldn't get here!");
-  }];
-  [dict release];
-}
-
-- (void)testOne {
-  GPBUInt64UInt32Dictionary *dict = [[GPBUInt64UInt32Dictionary alloc] init];
-  [dict setUInt32:100U forKey:31ULL];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 1U);
-  uint32_t value;
-  XCTAssertTrue([dict getUInt32:NULL forKey:31ULL]);
-  XCTAssertTrue([dict getUInt32:&value forKey:31ULL]);
-  XCTAssertEqual(value, 100U);
-  XCTAssertFalse([dict getUInt32:NULL forKey:32ULL]);
-  [dict enumerateKeysAndUInt32sUsingBlock:^(uint64_t aKey, uint32_t aValue, BOOL *stop) {
-    XCTAssertEqual(aKey, 31ULL);
-    XCTAssertEqual(aValue, 100U);
-    XCTAssertNotEqual(stop, NULL);
-  }];
-  [dict release];
-}
-
-- (void)testBasics {
-  const uint64_t kKeys[] = { 31ULL, 32ULL, 33ULL };
-  const uint32_t kValues[] = { 100U, 101U, 102U };
-  GPBUInt64UInt32Dictionary *dict =
-      [[GPBUInt64UInt32Dictionary alloc] initWithUInt32s:kValues
-                                                 forKeys:kKeys
-                                                   count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 3U);
-  uint32_t value;
-  XCTAssertTrue([dict getUInt32:NULL forKey:31ULL]);
-  XCTAssertTrue([dict getUInt32:&value forKey:31ULL]);
-  XCTAssertEqual(value, 100U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:32ULL]);
-  XCTAssertTrue([dict getUInt32:&value forKey:32ULL]);
-  XCTAssertEqual(value, 101U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:33ULL]);
-  XCTAssertTrue([dict getUInt32:&value forKey:33ULL]);
-  XCTAssertEqual(value, 102U);
-  XCTAssertFalse([dict getUInt32:NULL forKey:34ULL]);
-
-  __block NSUInteger idx = 0;
-  uint64_t *seenKeys = malloc(3 * sizeof(uint64_t));
-  uint32_t *seenValues = malloc(3 * sizeof(uint32_t));
-  [dict enumerateKeysAndUInt32sUsingBlock:^(uint64_t aKey, uint32_t aValue, BOOL *stop) {
-    XCTAssertLessThan(idx, 3U);
-    seenKeys[idx] = aKey;
-    seenValues[idx] = aValue;
-    XCTAssertNotEqual(stop, NULL);
-    ++idx;
-  }];
-  for (int i = 0; i < 3; ++i) {
-    BOOL foundKey = NO;
-    for (int j = 0; (j < 3) && !foundKey; ++j) {
-      if (kKeys[i] == seenKeys[j]) {
-        foundKey = YES;
-        XCTAssertEqual(kValues[i], seenValues[j], @"i = %d, j = %d", i, j);
-      }
-    }
-    XCTAssertTrue(foundKey, @"i = %d", i);
-  }
-  free(seenKeys);
-  free(seenValues);
-
-  // Stopping the enumeration.
-  idx = 0;
-  [dict enumerateKeysAndUInt32sUsingBlock:^(uint64_t aKey, uint32_t aValue, BOOL *stop) {
-    #pragma unused(aKey, aValue)
-    if (idx == 1) *stop = YES;
-    XCTAssertNotEqual(idx, 2U);
-    ++idx;
-  }];
-  [dict release];
-}
-
-- (void)testEquality {
-  const uint64_t kKeys1[] = { 31ULL, 32ULL, 33ULL, 34ULL };
-  const uint64_t kKeys2[] = { 32ULL, 31ULL, 34ULL };
-  const uint32_t kValues1[] = { 100U, 101U, 102U };
-  const uint32_t kValues2[] = { 100U, 103U, 102U };
-  const uint32_t kValues3[] = { 100U, 101U, 102U, 103U };
-  GPBUInt64UInt32Dictionary *dict1 =
-      [[GPBUInt64UInt32Dictionary alloc] initWithUInt32s:kValues1
-                                                 forKeys:kKeys1
-                                                   count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict1);
-  GPBUInt64UInt32Dictionary *dict1prime =
-      [[GPBUInt64UInt32Dictionary alloc] initWithUInt32s:kValues1
-                                                 forKeys:kKeys1
-                                                   count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict1prime);
-  GPBUInt64UInt32Dictionary *dict2 =
-      [[GPBUInt64UInt32Dictionary alloc] initWithUInt32s:kValues2
-                                                 forKeys:kKeys1
-                                                   count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(dict2);
-  GPBUInt64UInt32Dictionary *dict3 =
-      [[GPBUInt64UInt32Dictionary alloc] initWithUInt32s:kValues1
-                                                 forKeys:kKeys2
-                                                   count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict3);
-  GPBUInt64UInt32Dictionary *dict4 =
-      [[GPBUInt64UInt32Dictionary alloc] initWithUInt32s:kValues3
-                                                 forKeys:kKeys1
-                                                   count:GPBARRAYSIZE(kValues3)];
-  XCTAssertNotNil(dict4);
-
-  // 1/1Prime should be different objects, but equal.
-  XCTAssertNotEqual(dict1, dict1prime);
-  XCTAssertEqualObjects(dict1, dict1prime);
-  // Equal, so they must have same hash.
-  XCTAssertEqual([dict1 hash], [dict1prime hash]);
-
-  // 2 is same keys, different values; not equal.
-  XCTAssertNotEqualObjects(dict1, dict2);
-
-  // 3 is different keys, same values; not equal.
-  XCTAssertNotEqualObjects(dict1, dict3);
-
-  // 4 extra pair; not equal
-  XCTAssertNotEqualObjects(dict1, dict4);
-
-  [dict1 release];
-  [dict1prime release];
-  [dict2 release];
-  [dict3 release];
-  [dict4 release];
-}
-
-- (void)testCopy {
-  const uint64_t kKeys[] = { 31ULL, 32ULL, 33ULL, 34ULL };
-  const uint32_t kValues[] = { 100U, 101U, 102U, 103U };
-  GPBUInt64UInt32Dictionary *dict =
-      [[GPBUInt64UInt32Dictionary alloc] initWithUInt32s:kValues
-                                                 forKeys:kKeys
-                                                   count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-
-  GPBUInt64UInt32Dictionary *dict2 = [dict copy];
-  XCTAssertNotNil(dict2);
-
-  // Should be new object but equal.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  XCTAssertTrue([dict2 isKindOfClass:[GPBUInt64UInt32Dictionary class]]);
-
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testDictionaryFromDictionary {
-  const uint64_t kKeys[] = { 31ULL, 32ULL, 33ULL, 34ULL };
-  const uint32_t kValues[] = { 100U, 101U, 102U, 103U };
-  GPBUInt64UInt32Dictionary *dict =
-      [[GPBUInt64UInt32Dictionary alloc] initWithUInt32s:kValues
-                                                 forKeys:kKeys
-                                                   count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-
-  GPBUInt64UInt32Dictionary *dict2 =
-      [[GPBUInt64UInt32Dictionary alloc] initWithDictionary:dict];
-  XCTAssertNotNil(dict2);
-
-  // Should be new pointer, but equal objects.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testAdds {
-  GPBUInt64UInt32Dictionary *dict = [[GPBUInt64UInt32Dictionary alloc] init];
-  XCTAssertNotNil(dict);
-
-  XCTAssertEqual(dict.count, 0U);
-  [dict setUInt32:100U forKey:31ULL];
-  XCTAssertEqual(dict.count, 1U);
-
-  const uint64_t kKeys[] = { 32ULL, 33ULL, 34ULL };
-  const uint32_t kValues[] = { 101U, 102U, 103U };
-  GPBUInt64UInt32Dictionary *dict2 =
-      [[GPBUInt64UInt32Dictionary alloc] initWithUInt32s:kValues
-                                                 forKeys:kKeys
-                                                   count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict2);
-  [dict addEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 4U);
-
-  uint32_t value;
-  XCTAssertTrue([dict getUInt32:NULL forKey:31ULL]);
-  XCTAssertTrue([dict getUInt32:&value forKey:31ULL]);
-  XCTAssertEqual(value, 100U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:32ULL]);
-  XCTAssertTrue([dict getUInt32:&value forKey:32ULL]);
-  XCTAssertEqual(value, 101U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:33ULL]);
-  XCTAssertTrue([dict getUInt32:&value forKey:33ULL]);
-  XCTAssertEqual(value, 102U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:34ULL]);
-  XCTAssertTrue([dict getUInt32:&value forKey:34ULL]);
-  XCTAssertEqual(value, 103U);
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testRemove {
-  const uint64_t kKeys[] = { 31ULL, 32ULL, 33ULL, 34ULL };
-  const uint32_t kValues[] = { 100U, 101U, 102U, 103U };
-  GPBUInt64UInt32Dictionary *dict =
-      [[GPBUInt64UInt32Dictionary alloc] initWithUInt32s:kValues
-                                                 forKeys:kKeys
-                                                   count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 4U);
-
-  [dict removeUInt32ForKey:32ULL];
-  XCTAssertEqual(dict.count, 3U);
-  uint32_t value;
-  XCTAssertTrue([dict getUInt32:NULL forKey:31ULL]);
-  XCTAssertTrue([dict getUInt32:&value forKey:31ULL]);
-  XCTAssertEqual(value, 100U);
-  XCTAssertFalse([dict getUInt32:NULL forKey:32ULL]);
-  XCTAssertTrue([dict getUInt32:NULL forKey:33ULL]);
-  XCTAssertTrue([dict getUInt32:&value forKey:33ULL]);
-  XCTAssertEqual(value, 102U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:34ULL]);
-  XCTAssertTrue([dict getUInt32:&value forKey:34ULL]);
-  XCTAssertEqual(value, 103U);
-
-  // Remove again does nothing.
-  [dict removeUInt32ForKey:32ULL];
-  XCTAssertEqual(dict.count, 3U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:31ULL]);
-  XCTAssertTrue([dict getUInt32:&value forKey:31ULL]);
-  XCTAssertEqual(value, 100U);
-  XCTAssertFalse([dict getUInt32:NULL forKey:32ULL]);
-  XCTAssertTrue([dict getUInt32:NULL forKey:33ULL]);
-  XCTAssertTrue([dict getUInt32:&value forKey:33ULL]);
-  XCTAssertEqual(value, 102U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:34ULL]);
-  XCTAssertTrue([dict getUInt32:&value forKey:34ULL]);
-  XCTAssertEqual(value, 103U);
-
-  [dict removeUInt32ForKey:34ULL];
-  XCTAssertEqual(dict.count, 2U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:31ULL]);
-  XCTAssertTrue([dict getUInt32:&value forKey:31ULL]);
-  XCTAssertEqual(value, 100U);
-  XCTAssertFalse([dict getUInt32:NULL forKey:32ULL]);
-  XCTAssertTrue([dict getUInt32:NULL forKey:33ULL]);
-  XCTAssertTrue([dict getUInt32:&value forKey:33ULL]);
-  XCTAssertEqual(value, 102U);
-  XCTAssertFalse([dict getUInt32:NULL forKey:34ULL]);
-
-  [dict removeAll];
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertFalse([dict getUInt32:NULL forKey:31ULL]);
-  XCTAssertFalse([dict getUInt32:NULL forKey:32ULL]);
-  XCTAssertFalse([dict getUInt32:NULL forKey:33ULL]);
-  XCTAssertFalse([dict getUInt32:NULL forKey:34ULL]);
-  [dict release];
-}
-
-- (void)testInplaceMutation {
-  const uint64_t kKeys[] = { 31ULL, 32ULL, 33ULL, 34ULL };
-  const uint32_t kValues[] = { 100U, 101U, 102U, 103U };
-  GPBUInt64UInt32Dictionary *dict =
-      [[GPBUInt64UInt32Dictionary alloc] initWithUInt32s:kValues
-                                                 forKeys:kKeys
-                                                   count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 4U);
-  uint32_t value;
-  XCTAssertTrue([dict getUInt32:NULL forKey:31ULL]);
-  XCTAssertTrue([dict getUInt32:&value forKey:31ULL]);
-  XCTAssertEqual(value, 100U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:32ULL]);
-  XCTAssertTrue([dict getUInt32:&value forKey:32ULL]);
-  XCTAssertEqual(value, 101U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:33ULL]);
-  XCTAssertTrue([dict getUInt32:&value forKey:33ULL]);
-  XCTAssertEqual(value, 102U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:34ULL]);
-  XCTAssertTrue([dict getUInt32:&value forKey:34ULL]);
-  XCTAssertEqual(value, 103U);
-
-  [dict setUInt32:103U forKey:31ULL];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:31ULL]);
-  XCTAssertTrue([dict getUInt32:&value forKey:31ULL]);
-  XCTAssertEqual(value, 103U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:32ULL]);
-  XCTAssertTrue([dict getUInt32:&value forKey:32ULL]);
-  XCTAssertEqual(value, 101U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:33ULL]);
-  XCTAssertTrue([dict getUInt32:&value forKey:33ULL]);
-  XCTAssertEqual(value, 102U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:34ULL]);
-  XCTAssertTrue([dict getUInt32:&value forKey:34ULL]);
-  XCTAssertEqual(value, 103U);
-
-  [dict setUInt32:101U forKey:34ULL];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:31ULL]);
-  XCTAssertTrue([dict getUInt32:&value forKey:31ULL]);
-  XCTAssertEqual(value, 103U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:32ULL]);
-  XCTAssertTrue([dict getUInt32:&value forKey:32ULL]);
-  XCTAssertEqual(value, 101U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:33ULL]);
-  XCTAssertTrue([dict getUInt32:&value forKey:33ULL]);
-  XCTAssertEqual(value, 102U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:34ULL]);
-  XCTAssertTrue([dict getUInt32:&value forKey:34ULL]);
-  XCTAssertEqual(value, 101U);
-
-  const uint64_t kKeys2[] = { 32ULL, 33ULL };
-  const uint32_t kValues2[] = { 102U, 100U };
-  GPBUInt64UInt32Dictionary *dict2 =
-      [[GPBUInt64UInt32Dictionary alloc] initWithUInt32s:kValues2
-                                                 forKeys:kKeys2
-                                                   count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(dict2);
-  [dict addEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:31ULL]);
-  XCTAssertTrue([dict getUInt32:&value forKey:31ULL]);
-  XCTAssertEqual(value, 103U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:32ULL]);
-  XCTAssertTrue([dict getUInt32:&value forKey:32ULL]);
-  XCTAssertEqual(value, 102U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:33ULL]);
-  XCTAssertTrue([dict getUInt32:&value forKey:33ULL]);
-  XCTAssertEqual(value, 100U);
-  XCTAssertTrue([dict getUInt32:NULL forKey:34ULL]);
-  XCTAssertTrue([dict getUInt32:&value forKey:34ULL]);
-  XCTAssertEqual(value, 101U);
-
-  [dict2 release];
-  [dict release];
-}
-
-@end
-
-#pragma mark - UInt64 -> Int32
-
-@interface GPBUInt64Int32DictionaryTests : XCTestCase
-@end
-
-@implementation GPBUInt64Int32DictionaryTests
-
-- (void)testEmpty {
-  GPBUInt64Int32Dictionary *dict = [[GPBUInt64Int32Dictionary alloc] init];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertFalse([dict getInt32:NULL forKey:31ULL]);
-  [dict enumerateKeysAndInt32sUsingBlock:^(uint64_t aKey, int32_t aValue, BOOL *stop) {
-    #pragma unused(aKey, aValue, stop)
-    XCTFail(@"Shouldn't get here!");
-  }];
-  [dict release];
-}
-
-- (void)testOne {
-  GPBUInt64Int32Dictionary *dict = [[GPBUInt64Int32Dictionary alloc] init];
-  [dict setInt32:200 forKey:31ULL];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 1U);
-  int32_t value;
-  XCTAssertTrue([dict getInt32:NULL forKey:31ULL]);
-  XCTAssertTrue([dict getInt32:&value forKey:31ULL]);
-  XCTAssertEqual(value, 200);
-  XCTAssertFalse([dict getInt32:NULL forKey:32ULL]);
-  [dict enumerateKeysAndInt32sUsingBlock:^(uint64_t aKey, int32_t aValue, BOOL *stop) {
-    XCTAssertEqual(aKey, 31ULL);
-    XCTAssertEqual(aValue, 200);
-    XCTAssertNotEqual(stop, NULL);
-  }];
-  [dict release];
-}
-
-- (void)testBasics {
-  const uint64_t kKeys[] = { 31ULL, 32ULL, 33ULL };
-  const int32_t kValues[] = { 200, 201, 202 };
-  GPBUInt64Int32Dictionary *dict =
-      [[GPBUInt64Int32Dictionary alloc] initWithInt32s:kValues
-                                               forKeys:kKeys
-                                                 count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 3U);
-  int32_t value;
-  XCTAssertTrue([dict getInt32:NULL forKey:31ULL]);
-  XCTAssertTrue([dict getInt32:&value forKey:31ULL]);
-  XCTAssertEqual(value, 200);
-  XCTAssertTrue([dict getInt32:NULL forKey:32ULL]);
-  XCTAssertTrue([dict getInt32:&value forKey:32ULL]);
-  XCTAssertEqual(value, 201);
-  XCTAssertTrue([dict getInt32:NULL forKey:33ULL]);
-  XCTAssertTrue([dict getInt32:&value forKey:33ULL]);
-  XCTAssertEqual(value, 202);
-  XCTAssertFalse([dict getInt32:NULL forKey:34ULL]);
-
-  __block NSUInteger idx = 0;
-  uint64_t *seenKeys = malloc(3 * sizeof(uint64_t));
-  int32_t *seenValues = malloc(3 * sizeof(int32_t));
-  [dict enumerateKeysAndInt32sUsingBlock:^(uint64_t aKey, int32_t aValue, BOOL *stop) {
-    XCTAssertLessThan(idx, 3U);
-    seenKeys[idx] = aKey;
-    seenValues[idx] = aValue;
-    XCTAssertNotEqual(stop, NULL);
-    ++idx;
-  }];
-  for (int i = 0; i < 3; ++i) {
-    BOOL foundKey = NO;
-    for (int j = 0; (j < 3) && !foundKey; ++j) {
-      if (kKeys[i] == seenKeys[j]) {
-        foundKey = YES;
-        XCTAssertEqual(kValues[i], seenValues[j], @"i = %d, j = %d", i, j);
-      }
-    }
-    XCTAssertTrue(foundKey, @"i = %d", i);
-  }
-  free(seenKeys);
-  free(seenValues);
-
-  // Stopping the enumeration.
-  idx = 0;
-  [dict enumerateKeysAndInt32sUsingBlock:^(uint64_t aKey, int32_t aValue, BOOL *stop) {
-    #pragma unused(aKey, aValue)
-    if (idx == 1) *stop = YES;
-    XCTAssertNotEqual(idx, 2U);
-    ++idx;
-  }];
-  [dict release];
-}
-
-- (void)testEquality {
-  const uint64_t kKeys1[] = { 31ULL, 32ULL, 33ULL, 34ULL };
-  const uint64_t kKeys2[] = { 32ULL, 31ULL, 34ULL };
-  const int32_t kValues1[] = { 200, 201, 202 };
-  const int32_t kValues2[] = { 200, 203, 202 };
-  const int32_t kValues3[] = { 200, 201, 202, 203 };
-  GPBUInt64Int32Dictionary *dict1 =
-      [[GPBUInt64Int32Dictionary alloc] initWithInt32s:kValues1
-                                               forKeys:kKeys1
-                                                 count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict1);
-  GPBUInt64Int32Dictionary *dict1prime =
-      [[GPBUInt64Int32Dictionary alloc] initWithInt32s:kValues1
-                                               forKeys:kKeys1
-                                                 count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict1prime);
-  GPBUInt64Int32Dictionary *dict2 =
-      [[GPBUInt64Int32Dictionary alloc] initWithInt32s:kValues2
-                                               forKeys:kKeys1
-                                                 count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(dict2);
-  GPBUInt64Int32Dictionary *dict3 =
-      [[GPBUInt64Int32Dictionary alloc] initWithInt32s:kValues1
-                                               forKeys:kKeys2
-                                                 count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict3);
-  GPBUInt64Int32Dictionary *dict4 =
-      [[GPBUInt64Int32Dictionary alloc] initWithInt32s:kValues3
-                                               forKeys:kKeys1
-                                                 count:GPBARRAYSIZE(kValues3)];
-  XCTAssertNotNil(dict4);
-
-  // 1/1Prime should be different objects, but equal.
-  XCTAssertNotEqual(dict1, dict1prime);
-  XCTAssertEqualObjects(dict1, dict1prime);
-  // Equal, so they must have same hash.
-  XCTAssertEqual([dict1 hash], [dict1prime hash]);
-
-  // 2 is same keys, different values; not equal.
-  XCTAssertNotEqualObjects(dict1, dict2);
-
-  // 3 is different keys, same values; not equal.
-  XCTAssertNotEqualObjects(dict1, dict3);
-
-  // 4 extra pair; not equal
-  XCTAssertNotEqualObjects(dict1, dict4);
-
-  [dict1 release];
-  [dict1prime release];
-  [dict2 release];
-  [dict3 release];
-  [dict4 release];
-}
-
-- (void)testCopy {
-  const uint64_t kKeys[] = { 31ULL, 32ULL, 33ULL, 34ULL };
-  const int32_t kValues[] = { 200, 201, 202, 203 };
-  GPBUInt64Int32Dictionary *dict =
-      [[GPBUInt64Int32Dictionary alloc] initWithInt32s:kValues
-                                               forKeys:kKeys
-                                                 count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-
-  GPBUInt64Int32Dictionary *dict2 = [dict copy];
-  XCTAssertNotNil(dict2);
-
-  // Should be new object but equal.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  XCTAssertTrue([dict2 isKindOfClass:[GPBUInt64Int32Dictionary class]]);
-
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testDictionaryFromDictionary {
-  const uint64_t kKeys[] = { 31ULL, 32ULL, 33ULL, 34ULL };
-  const int32_t kValues[] = { 200, 201, 202, 203 };
-  GPBUInt64Int32Dictionary *dict =
-      [[GPBUInt64Int32Dictionary alloc] initWithInt32s:kValues
-                                               forKeys:kKeys
-                                                 count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-
-  GPBUInt64Int32Dictionary *dict2 =
-      [[GPBUInt64Int32Dictionary alloc] initWithDictionary:dict];
-  XCTAssertNotNil(dict2);
-
-  // Should be new pointer, but equal objects.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testAdds {
-  GPBUInt64Int32Dictionary *dict = [[GPBUInt64Int32Dictionary alloc] init];
-  XCTAssertNotNil(dict);
-
-  XCTAssertEqual(dict.count, 0U);
-  [dict setInt32:200 forKey:31ULL];
-  XCTAssertEqual(dict.count, 1U);
-
-  const uint64_t kKeys[] = { 32ULL, 33ULL, 34ULL };
-  const int32_t kValues[] = { 201, 202, 203 };
-  GPBUInt64Int32Dictionary *dict2 =
-      [[GPBUInt64Int32Dictionary alloc] initWithInt32s:kValues
-                                               forKeys:kKeys
-                                                 count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict2);
-  [dict addEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 4U);
-
-  int32_t value;
-  XCTAssertTrue([dict getInt32:NULL forKey:31ULL]);
-  XCTAssertTrue([dict getInt32:&value forKey:31ULL]);
-  XCTAssertEqual(value, 200);
-  XCTAssertTrue([dict getInt32:NULL forKey:32ULL]);
-  XCTAssertTrue([dict getInt32:&value forKey:32ULL]);
-  XCTAssertEqual(value, 201);
-  XCTAssertTrue([dict getInt32:NULL forKey:33ULL]);
-  XCTAssertTrue([dict getInt32:&value forKey:33ULL]);
-  XCTAssertEqual(value, 202);
-  XCTAssertTrue([dict getInt32:NULL forKey:34ULL]);
-  XCTAssertTrue([dict getInt32:&value forKey:34ULL]);
-  XCTAssertEqual(value, 203);
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testRemove {
-  const uint64_t kKeys[] = { 31ULL, 32ULL, 33ULL, 34ULL };
-  const int32_t kValues[] = { 200, 201, 202, 203 };
-  GPBUInt64Int32Dictionary *dict =
-      [[GPBUInt64Int32Dictionary alloc] initWithInt32s:kValues
-                                               forKeys:kKeys
-                                                 count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 4U);
-
-  [dict removeInt32ForKey:32ULL];
-  XCTAssertEqual(dict.count, 3U);
-  int32_t value;
-  XCTAssertTrue([dict getInt32:NULL forKey:31ULL]);
-  XCTAssertTrue([dict getInt32:&value forKey:31ULL]);
-  XCTAssertEqual(value, 200);
-  XCTAssertFalse([dict getInt32:NULL forKey:32ULL]);
-  XCTAssertTrue([dict getInt32:NULL forKey:33ULL]);
-  XCTAssertTrue([dict getInt32:&value forKey:33ULL]);
-  XCTAssertEqual(value, 202);
-  XCTAssertTrue([dict getInt32:NULL forKey:34ULL]);
-  XCTAssertTrue([dict getInt32:&value forKey:34ULL]);
-  XCTAssertEqual(value, 203);
-
-  // Remove again does nothing.
-  [dict removeInt32ForKey:32ULL];
-  XCTAssertEqual(dict.count, 3U);
-  XCTAssertTrue([dict getInt32:NULL forKey:31ULL]);
-  XCTAssertTrue([dict getInt32:&value forKey:31ULL]);
-  XCTAssertEqual(value, 200);
-  XCTAssertFalse([dict getInt32:NULL forKey:32ULL]);
-  XCTAssertTrue([dict getInt32:NULL forKey:33ULL]);
-  XCTAssertTrue([dict getInt32:&value forKey:33ULL]);
-  XCTAssertEqual(value, 202);
-  XCTAssertTrue([dict getInt32:NULL forKey:34ULL]);
-  XCTAssertTrue([dict getInt32:&value forKey:34ULL]);
-  XCTAssertEqual(value, 203);
-
-  [dict removeInt32ForKey:34ULL];
-  XCTAssertEqual(dict.count, 2U);
-  XCTAssertTrue([dict getInt32:NULL forKey:31ULL]);
-  XCTAssertTrue([dict getInt32:&value forKey:31ULL]);
-  XCTAssertEqual(value, 200);
-  XCTAssertFalse([dict getInt32:NULL forKey:32ULL]);
-  XCTAssertTrue([dict getInt32:NULL forKey:33ULL]);
-  XCTAssertTrue([dict getInt32:&value forKey:33ULL]);
-  XCTAssertEqual(value, 202);
-  XCTAssertFalse([dict getInt32:NULL forKey:34ULL]);
-
-  [dict removeAll];
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertFalse([dict getInt32:NULL forKey:31ULL]);
-  XCTAssertFalse([dict getInt32:NULL forKey:32ULL]);
-  XCTAssertFalse([dict getInt32:NULL forKey:33ULL]);
-  XCTAssertFalse([dict getInt32:NULL forKey:34ULL]);
-  [dict release];
-}
-
-- (void)testInplaceMutation {
-  const uint64_t kKeys[] = { 31ULL, 32ULL, 33ULL, 34ULL };
-  const int32_t kValues[] = { 200, 201, 202, 203 };
-  GPBUInt64Int32Dictionary *dict =
-      [[GPBUInt64Int32Dictionary alloc] initWithInt32s:kValues
-                                               forKeys:kKeys
-                                                 count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 4U);
-  int32_t value;
-  XCTAssertTrue([dict getInt32:NULL forKey:31ULL]);
-  XCTAssertTrue([dict getInt32:&value forKey:31ULL]);
-  XCTAssertEqual(value, 200);
-  XCTAssertTrue([dict getInt32:NULL forKey:32ULL]);
-  XCTAssertTrue([dict getInt32:&value forKey:32ULL]);
-  XCTAssertEqual(value, 201);
-  XCTAssertTrue([dict getInt32:NULL forKey:33ULL]);
-  XCTAssertTrue([dict getInt32:&value forKey:33ULL]);
-  XCTAssertEqual(value, 202);
-  XCTAssertTrue([dict getInt32:NULL forKey:34ULL]);
-  XCTAssertTrue([dict getInt32:&value forKey:34ULL]);
-  XCTAssertEqual(value, 203);
-
-  [dict setInt32:203 forKey:31ULL];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getInt32:NULL forKey:31ULL]);
-  XCTAssertTrue([dict getInt32:&value forKey:31ULL]);
-  XCTAssertEqual(value, 203);
-  XCTAssertTrue([dict getInt32:NULL forKey:32ULL]);
-  XCTAssertTrue([dict getInt32:&value forKey:32ULL]);
-  XCTAssertEqual(value, 201);
-  XCTAssertTrue([dict getInt32:NULL forKey:33ULL]);
-  XCTAssertTrue([dict getInt32:&value forKey:33ULL]);
-  XCTAssertEqual(value, 202);
-  XCTAssertTrue([dict getInt32:NULL forKey:34ULL]);
-  XCTAssertTrue([dict getInt32:&value forKey:34ULL]);
-  XCTAssertEqual(value, 203);
-
-  [dict setInt32:201 forKey:34ULL];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getInt32:NULL forKey:31ULL]);
-  XCTAssertTrue([dict getInt32:&value forKey:31ULL]);
-  XCTAssertEqual(value, 203);
-  XCTAssertTrue([dict getInt32:NULL forKey:32ULL]);
-  XCTAssertTrue([dict getInt32:&value forKey:32ULL]);
-  XCTAssertEqual(value, 201);
-  XCTAssertTrue([dict getInt32:NULL forKey:33ULL]);
-  XCTAssertTrue([dict getInt32:&value forKey:33ULL]);
-  XCTAssertEqual(value, 202);
-  XCTAssertTrue([dict getInt32:NULL forKey:34ULL]);
-  XCTAssertTrue([dict getInt32:&value forKey:34ULL]);
-  XCTAssertEqual(value, 201);
-
-  const uint64_t kKeys2[] = { 32ULL, 33ULL };
-  const int32_t kValues2[] = { 202, 200 };
-  GPBUInt64Int32Dictionary *dict2 =
-      [[GPBUInt64Int32Dictionary alloc] initWithInt32s:kValues2
-                                               forKeys:kKeys2
-                                                 count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(dict2);
-  [dict addEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getInt32:NULL forKey:31ULL]);
-  XCTAssertTrue([dict getInt32:&value forKey:31ULL]);
-  XCTAssertEqual(value, 203);
-  XCTAssertTrue([dict getInt32:NULL forKey:32ULL]);
-  XCTAssertTrue([dict getInt32:&value forKey:32ULL]);
-  XCTAssertEqual(value, 202);
-  XCTAssertTrue([dict getInt32:NULL forKey:33ULL]);
-  XCTAssertTrue([dict getInt32:&value forKey:33ULL]);
-  XCTAssertEqual(value, 200);
-  XCTAssertTrue([dict getInt32:NULL forKey:34ULL]);
-  XCTAssertTrue([dict getInt32:&value forKey:34ULL]);
-  XCTAssertEqual(value, 201);
-
-  [dict2 release];
-  [dict release];
-}
-
-@end
-
-#pragma mark - UInt64 -> UInt64
-
-@interface GPBUInt64UInt64DictionaryTests : XCTestCase
-@end
-
-@implementation GPBUInt64UInt64DictionaryTests
-
-- (void)testEmpty {
-  GPBUInt64UInt64Dictionary *dict = [[GPBUInt64UInt64Dictionary alloc] init];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertFalse([dict getUInt64:NULL forKey:31ULL]);
-  [dict enumerateKeysAndUInt64sUsingBlock:^(uint64_t aKey, uint64_t aValue, BOOL *stop) {
-    #pragma unused(aKey, aValue, stop)
-    XCTFail(@"Shouldn't get here!");
-  }];
-  [dict release];
-}
-
-- (void)testOne {
-  GPBUInt64UInt64Dictionary *dict = [[GPBUInt64UInt64Dictionary alloc] init];
-  [dict setUInt64:300U forKey:31ULL];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 1U);
-  uint64_t value;
-  XCTAssertTrue([dict getUInt64:NULL forKey:31ULL]);
-  XCTAssertTrue([dict getUInt64:&value forKey:31ULL]);
-  XCTAssertEqual(value, 300U);
-  XCTAssertFalse([dict getUInt64:NULL forKey:32ULL]);
-  [dict enumerateKeysAndUInt64sUsingBlock:^(uint64_t aKey, uint64_t aValue, BOOL *stop) {
-    XCTAssertEqual(aKey, 31ULL);
-    XCTAssertEqual(aValue, 300U);
-    XCTAssertNotEqual(stop, NULL);
-  }];
-  [dict release];
-}
-
-- (void)testBasics {
-  const uint64_t kKeys[] = { 31ULL, 32ULL, 33ULL };
-  const uint64_t kValues[] = { 300U, 301U, 302U };
-  GPBUInt64UInt64Dictionary *dict =
-      [[GPBUInt64UInt64Dictionary alloc] initWithUInt64s:kValues
-                                                 forKeys:kKeys
-                                                   count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 3U);
-  uint64_t value;
-  XCTAssertTrue([dict getUInt64:NULL forKey:31ULL]);
-  XCTAssertTrue([dict getUInt64:&value forKey:31ULL]);
-  XCTAssertEqual(value, 300U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:32ULL]);
-  XCTAssertTrue([dict getUInt64:&value forKey:32ULL]);
-  XCTAssertEqual(value, 301U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:33ULL]);
-  XCTAssertTrue([dict getUInt64:&value forKey:33ULL]);
-  XCTAssertEqual(value, 302U);
-  XCTAssertFalse([dict getUInt64:NULL forKey:34ULL]);
-
-  __block NSUInteger idx = 0;
-  uint64_t *seenKeys = malloc(3 * sizeof(uint64_t));
-  uint64_t *seenValues = malloc(3 * sizeof(uint64_t));
-  [dict enumerateKeysAndUInt64sUsingBlock:^(uint64_t aKey, uint64_t aValue, BOOL *stop) {
-    XCTAssertLessThan(idx, 3U);
-    seenKeys[idx] = aKey;
-    seenValues[idx] = aValue;
-    XCTAssertNotEqual(stop, NULL);
-    ++idx;
-  }];
-  for (int i = 0; i < 3; ++i) {
-    BOOL foundKey = NO;
-    for (int j = 0; (j < 3) && !foundKey; ++j) {
-      if (kKeys[i] == seenKeys[j]) {
-        foundKey = YES;
-        XCTAssertEqual(kValues[i], seenValues[j], @"i = %d, j = %d", i, j);
-      }
-    }
-    XCTAssertTrue(foundKey, @"i = %d", i);
-  }
-  free(seenKeys);
-  free(seenValues);
-
-  // Stopping the enumeration.
-  idx = 0;
-  [dict enumerateKeysAndUInt64sUsingBlock:^(uint64_t aKey, uint64_t aValue, BOOL *stop) {
-    #pragma unused(aKey, aValue)
-    if (idx == 1) *stop = YES;
-    XCTAssertNotEqual(idx, 2U);
-    ++idx;
-  }];
-  [dict release];
-}
-
-- (void)testEquality {
-  const uint64_t kKeys1[] = { 31ULL, 32ULL, 33ULL, 34ULL };
-  const uint64_t kKeys2[] = { 32ULL, 31ULL, 34ULL };
-  const uint64_t kValues1[] = { 300U, 301U, 302U };
-  const uint64_t kValues2[] = { 300U, 303U, 302U };
-  const uint64_t kValues3[] = { 300U, 301U, 302U, 303U };
-  GPBUInt64UInt64Dictionary *dict1 =
-      [[GPBUInt64UInt64Dictionary alloc] initWithUInt64s:kValues1
-                                                 forKeys:kKeys1
-                                                   count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict1);
-  GPBUInt64UInt64Dictionary *dict1prime =
-      [[GPBUInt64UInt64Dictionary alloc] initWithUInt64s:kValues1
-                                                 forKeys:kKeys1
-                                                   count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict1prime);
-  GPBUInt64UInt64Dictionary *dict2 =
-      [[GPBUInt64UInt64Dictionary alloc] initWithUInt64s:kValues2
-                                                 forKeys:kKeys1
-                                                   count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(dict2);
-  GPBUInt64UInt64Dictionary *dict3 =
-      [[GPBUInt64UInt64Dictionary alloc] initWithUInt64s:kValues1
-                                                 forKeys:kKeys2
-                                                   count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict3);
-  GPBUInt64UInt64Dictionary *dict4 =
-      [[GPBUInt64UInt64Dictionary alloc] initWithUInt64s:kValues3
-                                                 forKeys:kKeys1
-                                                   count:GPBARRAYSIZE(kValues3)];
-  XCTAssertNotNil(dict4);
-
-  // 1/1Prime should be different objects, but equal.
-  XCTAssertNotEqual(dict1, dict1prime);
-  XCTAssertEqualObjects(dict1, dict1prime);
-  // Equal, so they must have same hash.
-  XCTAssertEqual([dict1 hash], [dict1prime hash]);
-
-  // 2 is same keys, different values; not equal.
-  XCTAssertNotEqualObjects(dict1, dict2);
-
-  // 3 is different keys, same values; not equal.
-  XCTAssertNotEqualObjects(dict1, dict3);
-
-  // 4 extra pair; not equal
-  XCTAssertNotEqualObjects(dict1, dict4);
-
-  [dict1 release];
-  [dict1prime release];
-  [dict2 release];
-  [dict3 release];
-  [dict4 release];
-}
-
-- (void)testCopy {
-  const uint64_t kKeys[] = { 31ULL, 32ULL, 33ULL, 34ULL };
-  const uint64_t kValues[] = { 300U, 301U, 302U, 303U };
-  GPBUInt64UInt64Dictionary *dict =
-      [[GPBUInt64UInt64Dictionary alloc] initWithUInt64s:kValues
-                                                 forKeys:kKeys
-                                                   count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-
-  GPBUInt64UInt64Dictionary *dict2 = [dict copy];
-  XCTAssertNotNil(dict2);
-
-  // Should be new object but equal.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  XCTAssertTrue([dict2 isKindOfClass:[GPBUInt64UInt64Dictionary class]]);
-
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testDictionaryFromDictionary {
-  const uint64_t kKeys[] = { 31ULL, 32ULL, 33ULL, 34ULL };
-  const uint64_t kValues[] = { 300U, 301U, 302U, 303U };
-  GPBUInt64UInt64Dictionary *dict =
-      [[GPBUInt64UInt64Dictionary alloc] initWithUInt64s:kValues
-                                                 forKeys:kKeys
-                                                   count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-
-  GPBUInt64UInt64Dictionary *dict2 =
-      [[GPBUInt64UInt64Dictionary alloc] initWithDictionary:dict];
-  XCTAssertNotNil(dict2);
-
-  // Should be new pointer, but equal objects.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testAdds {
-  GPBUInt64UInt64Dictionary *dict = [[GPBUInt64UInt64Dictionary alloc] init];
-  XCTAssertNotNil(dict);
-
-  XCTAssertEqual(dict.count, 0U);
-  [dict setUInt64:300U forKey:31ULL];
-  XCTAssertEqual(dict.count, 1U);
-
-  const uint64_t kKeys[] = { 32ULL, 33ULL, 34ULL };
-  const uint64_t kValues[] = { 301U, 302U, 303U };
-  GPBUInt64UInt64Dictionary *dict2 =
-      [[GPBUInt64UInt64Dictionary alloc] initWithUInt64s:kValues
-                                                 forKeys:kKeys
-                                                   count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict2);
-  [dict addEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 4U);
-
-  uint64_t value;
-  XCTAssertTrue([dict getUInt64:NULL forKey:31ULL]);
-  XCTAssertTrue([dict getUInt64:&value forKey:31ULL]);
-  XCTAssertEqual(value, 300U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:32ULL]);
-  XCTAssertTrue([dict getUInt64:&value forKey:32ULL]);
-  XCTAssertEqual(value, 301U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:33ULL]);
-  XCTAssertTrue([dict getUInt64:&value forKey:33ULL]);
-  XCTAssertEqual(value, 302U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:34ULL]);
-  XCTAssertTrue([dict getUInt64:&value forKey:34ULL]);
-  XCTAssertEqual(value, 303U);
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testRemove {
-  const uint64_t kKeys[] = { 31ULL, 32ULL, 33ULL, 34ULL };
-  const uint64_t kValues[] = { 300U, 301U, 302U, 303U };
-  GPBUInt64UInt64Dictionary *dict =
-      [[GPBUInt64UInt64Dictionary alloc] initWithUInt64s:kValues
-                                                 forKeys:kKeys
-                                                   count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 4U);
-
-  [dict removeUInt64ForKey:32ULL];
-  XCTAssertEqual(dict.count, 3U);
-  uint64_t value;
-  XCTAssertTrue([dict getUInt64:NULL forKey:31ULL]);
-  XCTAssertTrue([dict getUInt64:&value forKey:31ULL]);
-  XCTAssertEqual(value, 300U);
-  XCTAssertFalse([dict getUInt64:NULL forKey:32ULL]);
-  XCTAssertTrue([dict getUInt64:NULL forKey:33ULL]);
-  XCTAssertTrue([dict getUInt64:&value forKey:33ULL]);
-  XCTAssertEqual(value, 302U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:34ULL]);
-  XCTAssertTrue([dict getUInt64:&value forKey:34ULL]);
-  XCTAssertEqual(value, 303U);
-
-  // Remove again does nothing.
-  [dict removeUInt64ForKey:32ULL];
-  XCTAssertEqual(dict.count, 3U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:31ULL]);
-  XCTAssertTrue([dict getUInt64:&value forKey:31ULL]);
-  XCTAssertEqual(value, 300U);
-  XCTAssertFalse([dict getUInt64:NULL forKey:32ULL]);
-  XCTAssertTrue([dict getUInt64:NULL forKey:33ULL]);
-  XCTAssertTrue([dict getUInt64:&value forKey:33ULL]);
-  XCTAssertEqual(value, 302U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:34ULL]);
-  XCTAssertTrue([dict getUInt64:&value forKey:34ULL]);
-  XCTAssertEqual(value, 303U);
-
-  [dict removeUInt64ForKey:34ULL];
-  XCTAssertEqual(dict.count, 2U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:31ULL]);
-  XCTAssertTrue([dict getUInt64:&value forKey:31ULL]);
-  XCTAssertEqual(value, 300U);
-  XCTAssertFalse([dict getUInt64:NULL forKey:32ULL]);
-  XCTAssertTrue([dict getUInt64:NULL forKey:33ULL]);
-  XCTAssertTrue([dict getUInt64:&value forKey:33ULL]);
-  XCTAssertEqual(value, 302U);
-  XCTAssertFalse([dict getUInt64:NULL forKey:34ULL]);
-
-  [dict removeAll];
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertFalse([dict getUInt64:NULL forKey:31ULL]);
-  XCTAssertFalse([dict getUInt64:NULL forKey:32ULL]);
-  XCTAssertFalse([dict getUInt64:NULL forKey:33ULL]);
-  XCTAssertFalse([dict getUInt64:NULL forKey:34ULL]);
-  [dict release];
-}
-
-- (void)testInplaceMutation {
-  const uint64_t kKeys[] = { 31ULL, 32ULL, 33ULL, 34ULL };
-  const uint64_t kValues[] = { 300U, 301U, 302U, 303U };
-  GPBUInt64UInt64Dictionary *dict =
-      [[GPBUInt64UInt64Dictionary alloc] initWithUInt64s:kValues
-                                                 forKeys:kKeys
-                                                   count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 4U);
-  uint64_t value;
-  XCTAssertTrue([dict getUInt64:NULL forKey:31ULL]);
-  XCTAssertTrue([dict getUInt64:&value forKey:31ULL]);
-  XCTAssertEqual(value, 300U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:32ULL]);
-  XCTAssertTrue([dict getUInt64:&value forKey:32ULL]);
-  XCTAssertEqual(value, 301U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:33ULL]);
-  XCTAssertTrue([dict getUInt64:&value forKey:33ULL]);
-  XCTAssertEqual(value, 302U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:34ULL]);
-  XCTAssertTrue([dict getUInt64:&value forKey:34ULL]);
-  XCTAssertEqual(value, 303U);
-
-  [dict setUInt64:303U forKey:31ULL];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:31ULL]);
-  XCTAssertTrue([dict getUInt64:&value forKey:31ULL]);
-  XCTAssertEqual(value, 303U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:32ULL]);
-  XCTAssertTrue([dict getUInt64:&value forKey:32ULL]);
-  XCTAssertEqual(value, 301U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:33ULL]);
-  XCTAssertTrue([dict getUInt64:&value forKey:33ULL]);
-  XCTAssertEqual(value, 302U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:34ULL]);
-  XCTAssertTrue([dict getUInt64:&value forKey:34ULL]);
-  XCTAssertEqual(value, 303U);
-
-  [dict setUInt64:301U forKey:34ULL];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:31ULL]);
-  XCTAssertTrue([dict getUInt64:&value forKey:31ULL]);
-  XCTAssertEqual(value, 303U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:32ULL]);
-  XCTAssertTrue([dict getUInt64:&value forKey:32ULL]);
-  XCTAssertEqual(value, 301U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:33ULL]);
-  XCTAssertTrue([dict getUInt64:&value forKey:33ULL]);
-  XCTAssertEqual(value, 302U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:34ULL]);
-  XCTAssertTrue([dict getUInt64:&value forKey:34ULL]);
-  XCTAssertEqual(value, 301U);
-
-  const uint64_t kKeys2[] = { 32ULL, 33ULL };
-  const uint64_t kValues2[] = { 302U, 300U };
-  GPBUInt64UInt64Dictionary *dict2 =
-      [[GPBUInt64UInt64Dictionary alloc] initWithUInt64s:kValues2
-                                                 forKeys:kKeys2
-                                                   count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(dict2);
-  [dict addEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:31ULL]);
-  XCTAssertTrue([dict getUInt64:&value forKey:31ULL]);
-  XCTAssertEqual(value, 303U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:32ULL]);
-  XCTAssertTrue([dict getUInt64:&value forKey:32ULL]);
-  XCTAssertEqual(value, 302U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:33ULL]);
-  XCTAssertTrue([dict getUInt64:&value forKey:33ULL]);
-  XCTAssertEqual(value, 300U);
-  XCTAssertTrue([dict getUInt64:NULL forKey:34ULL]);
-  XCTAssertTrue([dict getUInt64:&value forKey:34ULL]);
-  XCTAssertEqual(value, 301U);
-
-  [dict2 release];
-  [dict release];
-}
-
-@end
-
-#pragma mark - UInt64 -> Int64
-
-@interface GPBUInt64Int64DictionaryTests : XCTestCase
-@end
-
-@implementation GPBUInt64Int64DictionaryTests
-
-- (void)testEmpty {
-  GPBUInt64Int64Dictionary *dict = [[GPBUInt64Int64Dictionary alloc] init];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertFalse([dict getInt64:NULL forKey:31ULL]);
-  [dict enumerateKeysAndInt64sUsingBlock:^(uint64_t aKey, int64_t aValue, BOOL *stop) {
-    #pragma unused(aKey, aValue, stop)
-    XCTFail(@"Shouldn't get here!");
-  }];
-  [dict release];
-}
-
-- (void)testOne {
-  GPBUInt64Int64Dictionary *dict = [[GPBUInt64Int64Dictionary alloc] init];
-  [dict setInt64:400 forKey:31ULL];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 1U);
-  int64_t value;
-  XCTAssertTrue([dict getInt64:NULL forKey:31ULL]);
-  XCTAssertTrue([dict getInt64:&value forKey:31ULL]);
-  XCTAssertEqual(value, 400);
-  XCTAssertFalse([dict getInt64:NULL forKey:32ULL]);
-  [dict enumerateKeysAndInt64sUsingBlock:^(uint64_t aKey, int64_t aValue, BOOL *stop) {
-    XCTAssertEqual(aKey, 31ULL);
-    XCTAssertEqual(aValue, 400);
-    XCTAssertNotEqual(stop, NULL);
-  }];
-  [dict release];
-}
-
-- (void)testBasics {
-  const uint64_t kKeys[] = { 31ULL, 32ULL, 33ULL };
-  const int64_t kValues[] = { 400, 401, 402 };
-  GPBUInt64Int64Dictionary *dict =
-      [[GPBUInt64Int64Dictionary alloc] initWithInt64s:kValues
-                                               forKeys:kKeys
-                                                 count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 3U);
-  int64_t value;
-  XCTAssertTrue([dict getInt64:NULL forKey:31ULL]);
-  XCTAssertTrue([dict getInt64:&value forKey:31ULL]);
-  XCTAssertEqual(value, 400);
-  XCTAssertTrue([dict getInt64:NULL forKey:32ULL]);
-  XCTAssertTrue([dict getInt64:&value forKey:32ULL]);
-  XCTAssertEqual(value, 401);
-  XCTAssertTrue([dict getInt64:NULL forKey:33ULL]);
-  XCTAssertTrue([dict getInt64:&value forKey:33ULL]);
-  XCTAssertEqual(value, 402);
-  XCTAssertFalse([dict getInt64:NULL forKey:34ULL]);
-
-  __block NSUInteger idx = 0;
-  uint64_t *seenKeys = malloc(3 * sizeof(uint64_t));
-  int64_t *seenValues = malloc(3 * sizeof(int64_t));
-  [dict enumerateKeysAndInt64sUsingBlock:^(uint64_t aKey, int64_t aValue, BOOL *stop) {
-    XCTAssertLessThan(idx, 3U);
-    seenKeys[idx] = aKey;
-    seenValues[idx] = aValue;
-    XCTAssertNotEqual(stop, NULL);
-    ++idx;
-  }];
-  for (int i = 0; i < 3; ++i) {
-    BOOL foundKey = NO;
-    for (int j = 0; (j < 3) && !foundKey; ++j) {
-      if (kKeys[i] == seenKeys[j]) {
-        foundKey = YES;
-        XCTAssertEqual(kValues[i], seenValues[j], @"i = %d, j = %d", i, j);
-      }
-    }
-    XCTAssertTrue(foundKey, @"i = %d", i);
-  }
-  free(seenKeys);
-  free(seenValues);
-
-  // Stopping the enumeration.
-  idx = 0;
-  [dict enumerateKeysAndInt64sUsingBlock:^(uint64_t aKey, int64_t aValue, BOOL *stop) {
-    #pragma unused(aKey, aValue)
-    if (idx == 1) *stop = YES;
-    XCTAssertNotEqual(idx, 2U);
-    ++idx;
-  }];
-  [dict release];
-}
-
-- (void)testEquality {
-  const uint64_t kKeys1[] = { 31ULL, 32ULL, 33ULL, 34ULL };
-  const uint64_t kKeys2[] = { 32ULL, 31ULL, 34ULL };
-  const int64_t kValues1[] = { 400, 401, 402 };
-  const int64_t kValues2[] = { 400, 403, 402 };
-  const int64_t kValues3[] = { 400, 401, 402, 403 };
-  GPBUInt64Int64Dictionary *dict1 =
-      [[GPBUInt64Int64Dictionary alloc] initWithInt64s:kValues1
-                                               forKeys:kKeys1
-                                                 count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict1);
-  GPBUInt64Int64Dictionary *dict1prime =
-      [[GPBUInt64Int64Dictionary alloc] initWithInt64s:kValues1
-                                               forKeys:kKeys1
-                                                 count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict1prime);
-  GPBUInt64Int64Dictionary *dict2 =
-      [[GPBUInt64Int64Dictionary alloc] initWithInt64s:kValues2
-                                               forKeys:kKeys1
-                                                 count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(dict2);
-  GPBUInt64Int64Dictionary *dict3 =
-      [[GPBUInt64Int64Dictionary alloc] initWithInt64s:kValues1
-                                               forKeys:kKeys2
-                                                 count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict3);
-  GPBUInt64Int64Dictionary *dict4 =
-      [[GPBUInt64Int64Dictionary alloc] initWithInt64s:kValues3
-                                               forKeys:kKeys1
-                                                 count:GPBARRAYSIZE(kValues3)];
-  XCTAssertNotNil(dict4);
-
-  // 1/1Prime should be different objects, but equal.
-  XCTAssertNotEqual(dict1, dict1prime);
-  XCTAssertEqualObjects(dict1, dict1prime);
-  // Equal, so they must have same hash.
-  XCTAssertEqual([dict1 hash], [dict1prime hash]);
-
-  // 2 is same keys, different values; not equal.
-  XCTAssertNotEqualObjects(dict1, dict2);
-
-  // 3 is different keys, same values; not equal.
-  XCTAssertNotEqualObjects(dict1, dict3);
-
-  // 4 extra pair; not equal
-  XCTAssertNotEqualObjects(dict1, dict4);
-
-  [dict1 release];
-  [dict1prime release];
-  [dict2 release];
-  [dict3 release];
-  [dict4 release];
-}
-
-- (void)testCopy {
-  const uint64_t kKeys[] = { 31ULL, 32ULL, 33ULL, 34ULL };
-  const int64_t kValues[] = { 400, 401, 402, 403 };
-  GPBUInt64Int64Dictionary *dict =
-      [[GPBUInt64Int64Dictionary alloc] initWithInt64s:kValues
-                                               forKeys:kKeys
-                                                 count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-
-  GPBUInt64Int64Dictionary *dict2 = [dict copy];
-  XCTAssertNotNil(dict2);
-
-  // Should be new object but equal.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  XCTAssertTrue([dict2 isKindOfClass:[GPBUInt64Int64Dictionary class]]);
-
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testDictionaryFromDictionary {
-  const uint64_t kKeys[] = { 31ULL, 32ULL, 33ULL, 34ULL };
-  const int64_t kValues[] = { 400, 401, 402, 403 };
-  GPBUInt64Int64Dictionary *dict =
-      [[GPBUInt64Int64Dictionary alloc] initWithInt64s:kValues
-                                               forKeys:kKeys
-                                                 count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-
-  GPBUInt64Int64Dictionary *dict2 =
-      [[GPBUInt64Int64Dictionary alloc] initWithDictionary:dict];
-  XCTAssertNotNil(dict2);
-
-  // Should be new pointer, but equal objects.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testAdds {
-  GPBUInt64Int64Dictionary *dict = [[GPBUInt64Int64Dictionary alloc] init];
-  XCTAssertNotNil(dict);
-
-  XCTAssertEqual(dict.count, 0U);
-  [dict setInt64:400 forKey:31ULL];
-  XCTAssertEqual(dict.count, 1U);
-
-  const uint64_t kKeys[] = { 32ULL, 33ULL, 34ULL };
-  const int64_t kValues[] = { 401, 402, 403 };
-  GPBUInt64Int64Dictionary *dict2 =
-      [[GPBUInt64Int64Dictionary alloc] initWithInt64s:kValues
-                                               forKeys:kKeys
-                                                 count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict2);
-  [dict addEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 4U);
-
-  int64_t value;
-  XCTAssertTrue([dict getInt64:NULL forKey:31ULL]);
-  XCTAssertTrue([dict getInt64:&value forKey:31ULL]);
-  XCTAssertEqual(value, 400);
-  XCTAssertTrue([dict getInt64:NULL forKey:32ULL]);
-  XCTAssertTrue([dict getInt64:&value forKey:32ULL]);
-  XCTAssertEqual(value, 401);
-  XCTAssertTrue([dict getInt64:NULL forKey:33ULL]);
-  XCTAssertTrue([dict getInt64:&value forKey:33ULL]);
-  XCTAssertEqual(value, 402);
-  XCTAssertTrue([dict getInt64:NULL forKey:34ULL]);
-  XCTAssertTrue([dict getInt64:&value forKey:34ULL]);
-  XCTAssertEqual(value, 403);
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testRemove {
-  const uint64_t kKeys[] = { 31ULL, 32ULL, 33ULL, 34ULL };
-  const int64_t kValues[] = { 400, 401, 402, 403 };
-  GPBUInt64Int64Dictionary *dict =
-      [[GPBUInt64Int64Dictionary alloc] initWithInt64s:kValues
-                                               forKeys:kKeys
-                                                 count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 4U);
-
-  [dict removeInt64ForKey:32ULL];
-  XCTAssertEqual(dict.count, 3U);
-  int64_t value;
-  XCTAssertTrue([dict getInt64:NULL forKey:31ULL]);
-  XCTAssertTrue([dict getInt64:&value forKey:31ULL]);
-  XCTAssertEqual(value, 400);
-  XCTAssertFalse([dict getInt64:NULL forKey:32ULL]);
-  XCTAssertTrue([dict getInt64:NULL forKey:33ULL]);
-  XCTAssertTrue([dict getInt64:&value forKey:33ULL]);
-  XCTAssertEqual(value, 402);
-  XCTAssertTrue([dict getInt64:NULL forKey:34ULL]);
-  XCTAssertTrue([dict getInt64:&value forKey:34ULL]);
-  XCTAssertEqual(value, 403);
-
-  // Remove again does nothing.
-  [dict removeInt64ForKey:32ULL];
-  XCTAssertEqual(dict.count, 3U);
-  XCTAssertTrue([dict getInt64:NULL forKey:31ULL]);
-  XCTAssertTrue([dict getInt64:&value forKey:31ULL]);
-  XCTAssertEqual(value, 400);
-  XCTAssertFalse([dict getInt64:NULL forKey:32ULL]);
-  XCTAssertTrue([dict getInt64:NULL forKey:33ULL]);
-  XCTAssertTrue([dict getInt64:&value forKey:33ULL]);
-  XCTAssertEqual(value, 402);
-  XCTAssertTrue([dict getInt64:NULL forKey:34ULL]);
-  XCTAssertTrue([dict getInt64:&value forKey:34ULL]);
-  XCTAssertEqual(value, 403);
-
-  [dict removeInt64ForKey:34ULL];
-  XCTAssertEqual(dict.count, 2U);
-  XCTAssertTrue([dict getInt64:NULL forKey:31ULL]);
-  XCTAssertTrue([dict getInt64:&value forKey:31ULL]);
-  XCTAssertEqual(value, 400);
-  XCTAssertFalse([dict getInt64:NULL forKey:32ULL]);
-  XCTAssertTrue([dict getInt64:NULL forKey:33ULL]);
-  XCTAssertTrue([dict getInt64:&value forKey:33ULL]);
-  XCTAssertEqual(value, 402);
-  XCTAssertFalse([dict getInt64:NULL forKey:34ULL]);
-
-  [dict removeAll];
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertFalse([dict getInt64:NULL forKey:31ULL]);
-  XCTAssertFalse([dict getInt64:NULL forKey:32ULL]);
-  XCTAssertFalse([dict getInt64:NULL forKey:33ULL]);
-  XCTAssertFalse([dict getInt64:NULL forKey:34ULL]);
-  [dict release];
-}
-
-- (void)testInplaceMutation {
-  const uint64_t kKeys[] = { 31ULL, 32ULL, 33ULL, 34ULL };
-  const int64_t kValues[] = { 400, 401, 402, 403 };
-  GPBUInt64Int64Dictionary *dict =
-      [[GPBUInt64Int64Dictionary alloc] initWithInt64s:kValues
-                                               forKeys:kKeys
-                                                 count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 4U);
-  int64_t value;
-  XCTAssertTrue([dict getInt64:NULL forKey:31ULL]);
-  XCTAssertTrue([dict getInt64:&value forKey:31ULL]);
-  XCTAssertEqual(value, 400);
-  XCTAssertTrue([dict getInt64:NULL forKey:32ULL]);
-  XCTAssertTrue([dict getInt64:&value forKey:32ULL]);
-  XCTAssertEqual(value, 401);
-  XCTAssertTrue([dict getInt64:NULL forKey:33ULL]);
-  XCTAssertTrue([dict getInt64:&value forKey:33ULL]);
-  XCTAssertEqual(value, 402);
-  XCTAssertTrue([dict getInt64:NULL forKey:34ULL]);
-  XCTAssertTrue([dict getInt64:&value forKey:34ULL]);
-  XCTAssertEqual(value, 403);
-
-  [dict setInt64:403 forKey:31ULL];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getInt64:NULL forKey:31ULL]);
-  XCTAssertTrue([dict getInt64:&value forKey:31ULL]);
-  XCTAssertEqual(value, 403);
-  XCTAssertTrue([dict getInt64:NULL forKey:32ULL]);
-  XCTAssertTrue([dict getInt64:&value forKey:32ULL]);
-  XCTAssertEqual(value, 401);
-  XCTAssertTrue([dict getInt64:NULL forKey:33ULL]);
-  XCTAssertTrue([dict getInt64:&value forKey:33ULL]);
-  XCTAssertEqual(value, 402);
-  XCTAssertTrue([dict getInt64:NULL forKey:34ULL]);
-  XCTAssertTrue([dict getInt64:&value forKey:34ULL]);
-  XCTAssertEqual(value, 403);
-
-  [dict setInt64:401 forKey:34ULL];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getInt64:NULL forKey:31ULL]);
-  XCTAssertTrue([dict getInt64:&value forKey:31ULL]);
-  XCTAssertEqual(value, 403);
-  XCTAssertTrue([dict getInt64:NULL forKey:32ULL]);
-  XCTAssertTrue([dict getInt64:&value forKey:32ULL]);
-  XCTAssertEqual(value, 401);
-  XCTAssertTrue([dict getInt64:NULL forKey:33ULL]);
-  XCTAssertTrue([dict getInt64:&value forKey:33ULL]);
-  XCTAssertEqual(value, 402);
-  XCTAssertTrue([dict getInt64:NULL forKey:34ULL]);
-  XCTAssertTrue([dict getInt64:&value forKey:34ULL]);
-  XCTAssertEqual(value, 401);
-
-  const uint64_t kKeys2[] = { 32ULL, 33ULL };
-  const int64_t kValues2[] = { 402, 400 };
-  GPBUInt64Int64Dictionary *dict2 =
-      [[GPBUInt64Int64Dictionary alloc] initWithInt64s:kValues2
-                                               forKeys:kKeys2
-                                                 count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(dict2);
-  [dict addEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getInt64:NULL forKey:31ULL]);
-  XCTAssertTrue([dict getInt64:&value forKey:31ULL]);
-  XCTAssertEqual(value, 403);
-  XCTAssertTrue([dict getInt64:NULL forKey:32ULL]);
-  XCTAssertTrue([dict getInt64:&value forKey:32ULL]);
-  XCTAssertEqual(value, 402);
-  XCTAssertTrue([dict getInt64:NULL forKey:33ULL]);
-  XCTAssertTrue([dict getInt64:&value forKey:33ULL]);
-  XCTAssertEqual(value, 400);
-  XCTAssertTrue([dict getInt64:NULL forKey:34ULL]);
-  XCTAssertTrue([dict getInt64:&value forKey:34ULL]);
-  XCTAssertEqual(value, 401);
-
-  [dict2 release];
-  [dict release];
-}
-
-@end
-
-#pragma mark - UInt64 -> Bool
-
-@interface GPBUInt64BoolDictionaryTests : XCTestCase
-@end
-
-@implementation GPBUInt64BoolDictionaryTests
-
-- (void)testEmpty {
-  GPBUInt64BoolDictionary *dict = [[GPBUInt64BoolDictionary alloc] init];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertFalse([dict getBool:NULL forKey:31ULL]);
-  [dict enumerateKeysAndBoolsUsingBlock:^(uint64_t aKey, BOOL aValue, BOOL *stop) {
-    #pragma unused(aKey, aValue, stop)
-    XCTFail(@"Shouldn't get here!");
-  }];
-  [dict release];
-}
-
-- (void)testOne {
-  GPBUInt64BoolDictionary *dict = [[GPBUInt64BoolDictionary alloc] init];
-  [dict setBool:YES forKey:31ULL];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 1U);
-  BOOL value;
-  XCTAssertTrue([dict getBool:NULL forKey:31ULL]);
-  XCTAssertTrue([dict getBool:&value forKey:31ULL]);
-  XCTAssertEqual(value, YES);
-  XCTAssertFalse([dict getBool:NULL forKey:32ULL]);
-  [dict enumerateKeysAndBoolsUsingBlock:^(uint64_t aKey, BOOL aValue, BOOL *stop) {
-    XCTAssertEqual(aKey, 31ULL);
-    XCTAssertEqual(aValue, YES);
-    XCTAssertNotEqual(stop, NULL);
-  }];
-  [dict release];
-}
-
-- (void)testBasics {
-  const uint64_t kKeys[] = { 31ULL, 32ULL, 33ULL };
-  const BOOL kValues[] = { YES, YES, NO };
-  GPBUInt64BoolDictionary *dict =
-      [[GPBUInt64BoolDictionary alloc] initWithBools:kValues
-                                             forKeys:kKeys
-                                               count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 3U);
-  BOOL value;
-  XCTAssertTrue([dict getBool:NULL forKey:31ULL]);
-  XCTAssertTrue([dict getBool:&value forKey:31ULL]);
-  XCTAssertEqual(value, YES);
-  XCTAssertTrue([dict getBool:NULL forKey:32ULL]);
-  XCTAssertTrue([dict getBool:&value forKey:32ULL]);
-  XCTAssertEqual(value, YES);
-  XCTAssertTrue([dict getBool:NULL forKey:33ULL]);
-  XCTAssertTrue([dict getBool:&value forKey:33ULL]);
-  XCTAssertEqual(value, NO);
-  XCTAssertFalse([dict getBool:NULL forKey:34ULL]);
-
-  __block NSUInteger idx = 0;
-  uint64_t *seenKeys = malloc(3 * sizeof(uint64_t));
-  BOOL *seenValues = malloc(3 * sizeof(BOOL));
-  [dict enumerateKeysAndBoolsUsingBlock:^(uint64_t aKey, BOOL aValue, BOOL *stop) {
-    XCTAssertLessThan(idx, 3U);
-    seenKeys[idx] = aKey;
-    seenValues[idx] = aValue;
-    XCTAssertNotEqual(stop, NULL);
-    ++idx;
-  }];
-  for (int i = 0; i < 3; ++i) {
-    BOOL foundKey = NO;
-    for (int j = 0; (j < 3) && !foundKey; ++j) {
-      if (kKeys[i] == seenKeys[j]) {
-        foundKey = YES;
-        XCTAssertEqual(kValues[i], seenValues[j], @"i = %d, j = %d", i, j);
-      }
-    }
-    XCTAssertTrue(foundKey, @"i = %d", i);
-  }
-  free(seenKeys);
-  free(seenValues);
-
-  // Stopping the enumeration.
-  idx = 0;
-  [dict enumerateKeysAndBoolsUsingBlock:^(uint64_t aKey, BOOL aValue, BOOL *stop) {
-    #pragma unused(aKey, aValue)
-    if (idx == 1) *stop = YES;
-    XCTAssertNotEqual(idx, 2U);
-    ++idx;
-  }];
-  [dict release];
-}
-
-- (void)testEquality {
-  const uint64_t kKeys1[] = { 31ULL, 32ULL, 33ULL, 34ULL };
-  const uint64_t kKeys2[] = { 32ULL, 31ULL, 34ULL };
-  const BOOL kValues1[] = { YES, YES, NO };
-  const BOOL kValues2[] = { YES, NO, NO };
-  const BOOL kValues3[] = { YES, YES, NO, NO };
-  GPBUInt64BoolDictionary *dict1 =
-      [[GPBUInt64BoolDictionary alloc] initWithBools:kValues1
-                                             forKeys:kKeys1
-                                               count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict1);
-  GPBUInt64BoolDictionary *dict1prime =
-      [[GPBUInt64BoolDictionary alloc] initWithBools:kValues1
-                                             forKeys:kKeys1
-                                               count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict1prime);
-  GPBUInt64BoolDictionary *dict2 =
-      [[GPBUInt64BoolDictionary alloc] initWithBools:kValues2
-                                             forKeys:kKeys1
-                                               count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(dict2);
-  GPBUInt64BoolDictionary *dict3 =
-      [[GPBUInt64BoolDictionary alloc] initWithBools:kValues1
-                                             forKeys:kKeys2
-                                               count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict3);
-  GPBUInt64BoolDictionary *dict4 =
-      [[GPBUInt64BoolDictionary alloc] initWithBools:kValues3
-                                             forKeys:kKeys1
-                                               count:GPBARRAYSIZE(kValues3)];
-  XCTAssertNotNil(dict4);
-
-  // 1/1Prime should be different objects, but equal.
-  XCTAssertNotEqual(dict1, dict1prime);
-  XCTAssertEqualObjects(dict1, dict1prime);
-  // Equal, so they must have same hash.
-  XCTAssertEqual([dict1 hash], [dict1prime hash]);
-
-  // 2 is same keys, different values; not equal.
-  XCTAssertNotEqualObjects(dict1, dict2);
-
-  // 3 is different keys, same values; not equal.
-  XCTAssertNotEqualObjects(dict1, dict3);
-
-  // 4 extra pair; not equal
-  XCTAssertNotEqualObjects(dict1, dict4);
-
-  [dict1 release];
-  [dict1prime release];
-  [dict2 release];
-  [dict3 release];
-  [dict4 release];
-}
-
-- (void)testCopy {
-  const uint64_t kKeys[] = { 31ULL, 32ULL, 33ULL, 34ULL };
-  const BOOL kValues[] = { YES, YES, NO, NO };
-  GPBUInt64BoolDictionary *dict =
-      [[GPBUInt64BoolDictionary alloc] initWithBools:kValues
-                                             forKeys:kKeys
-                                               count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-
-  GPBUInt64BoolDictionary *dict2 = [dict copy];
-  XCTAssertNotNil(dict2);
-
-  // Should be new object but equal.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  XCTAssertTrue([dict2 isKindOfClass:[GPBUInt64BoolDictionary class]]);
-
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testDictionaryFromDictionary {
-  const uint64_t kKeys[] = { 31ULL, 32ULL, 33ULL, 34ULL };
-  const BOOL kValues[] = { YES, YES, NO, NO };
-  GPBUInt64BoolDictionary *dict =
-      [[GPBUInt64BoolDictionary alloc] initWithBools:kValues
-                                             forKeys:kKeys
-                                               count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-
-  GPBUInt64BoolDictionary *dict2 =
-      [[GPBUInt64BoolDictionary alloc] initWithDictionary:dict];
-  XCTAssertNotNil(dict2);
-
-  // Should be new pointer, but equal objects.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testAdds {
-  GPBUInt64BoolDictionary *dict = [[GPBUInt64BoolDictionary alloc] init];
-  XCTAssertNotNil(dict);
-
-  XCTAssertEqual(dict.count, 0U);
-  [dict setBool:YES forKey:31ULL];
-  XCTAssertEqual(dict.count, 1U);
-
-  const uint64_t kKeys[] = { 32ULL, 33ULL, 34ULL };
-  const BOOL kValues[] = { YES, NO, NO };
-  GPBUInt64BoolDictionary *dict2 =
-      [[GPBUInt64BoolDictionary alloc] initWithBools:kValues
-                                             forKeys:kKeys
-                                               count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict2);
-  [dict addEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 4U);
-
-  BOOL value;
-  XCTAssertTrue([dict getBool:NULL forKey:31ULL]);
-  XCTAssertTrue([dict getBool:&value forKey:31ULL]);
-  XCTAssertEqual(value, YES);
-  XCTAssertTrue([dict getBool:NULL forKey:32ULL]);
-  XCTAssertTrue([dict getBool:&value forKey:32ULL]);
-  XCTAssertEqual(value, YES);
-  XCTAssertTrue([dict getBool:NULL forKey:33ULL]);
-  XCTAssertTrue([dict getBool:&value forKey:33ULL]);
-  XCTAssertEqual(value, NO);
-  XCTAssertTrue([dict getBool:NULL forKey:34ULL]);
-  XCTAssertTrue([dict getBool:&value forKey:34ULL]);
-  XCTAssertEqual(value, NO);
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testRemove {
-  const uint64_t kKeys[] = { 31ULL, 32ULL, 33ULL, 34ULL };
-  const BOOL kValues[] = { YES, YES, NO, NO };
-  GPBUInt64BoolDictionary *dict =
-      [[GPBUInt64BoolDictionary alloc] initWithBools:kValues
-                                             forKeys:kKeys
-                                               count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 4U);
-
-  [dict removeBoolForKey:32ULL];
-  XCTAssertEqual(dict.count, 3U);
-  BOOL value;
-  XCTAssertTrue([dict getBool:NULL forKey:31ULL]);
-  XCTAssertTrue([dict getBool:&value forKey:31ULL]);
-  XCTAssertEqual(value, YES);
-  XCTAssertFalse([dict getBool:NULL forKey:32ULL]);
-  XCTAssertTrue([dict getBool:NULL forKey:33ULL]);
-  XCTAssertTrue([dict getBool:&value forKey:33ULL]);
-  XCTAssertEqual(value, NO);
-  XCTAssertTrue([dict getBool:NULL forKey:34ULL]);
-  XCTAssertTrue([dict getBool:&value forKey:34ULL]);
-  XCTAssertEqual(value, NO);
-
-  // Remove again does nothing.
-  [dict removeBoolForKey:32ULL];
-  XCTAssertEqual(dict.count, 3U);
-  XCTAssertTrue([dict getBool:NULL forKey:31ULL]);
-  XCTAssertTrue([dict getBool:&value forKey:31ULL]);
-  XCTAssertEqual(value, YES);
-  XCTAssertFalse([dict getBool:NULL forKey:32ULL]);
-  XCTAssertTrue([dict getBool:NULL forKey:33ULL]);
-  XCTAssertTrue([dict getBool:&value forKey:33ULL]);
-  XCTAssertEqual(value, NO);
-  XCTAssertTrue([dict getBool:NULL forKey:34ULL]);
-  XCTAssertTrue([dict getBool:&value forKey:34ULL]);
-  XCTAssertEqual(value, NO);
-
-  [dict removeBoolForKey:34ULL];
-  XCTAssertEqual(dict.count, 2U);
-  XCTAssertTrue([dict getBool:NULL forKey:31ULL]);
-  XCTAssertTrue([dict getBool:&value forKey:31ULL]);
-  XCTAssertEqual(value, YES);
-  XCTAssertFalse([dict getBool:NULL forKey:32ULL]);
-  XCTAssertTrue([dict getBool:NULL forKey:33ULL]);
-  XCTAssertTrue([dict getBool:&value forKey:33ULL]);
-  XCTAssertEqual(value, NO);
-  XCTAssertFalse([dict getBool:NULL forKey:34ULL]);
-
-  [dict removeAll];
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertFalse([dict getBool:NULL forKey:31ULL]);
-  XCTAssertFalse([dict getBool:NULL forKey:32ULL]);
-  XCTAssertFalse([dict getBool:NULL forKey:33ULL]);
-  XCTAssertFalse([dict getBool:NULL forKey:34ULL]);
-  [dict release];
-}
-
-- (void)testInplaceMutation {
-  const uint64_t kKeys[] = { 31ULL, 32ULL, 33ULL, 34ULL };
-  const BOOL kValues[] = { YES, YES, NO, NO };
-  GPBUInt64BoolDictionary *dict =
-      [[GPBUInt64BoolDictionary alloc] initWithBools:kValues
-                                             forKeys:kKeys
-                                               count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 4U);
-  BOOL value;
-  XCTAssertTrue([dict getBool:NULL forKey:31ULL]);
-  XCTAssertTrue([dict getBool:&value forKey:31ULL]);
-  XCTAssertEqual(value, YES);
-  XCTAssertTrue([dict getBool:NULL forKey:32ULL]);
-  XCTAssertTrue([dict getBool:&value forKey:32ULL]);
-  XCTAssertEqual(value, YES);
-  XCTAssertTrue([dict getBool:NULL forKey:33ULL]);
-  XCTAssertTrue([dict getBool:&value forKey:33ULL]);
-  XCTAssertEqual(value, NO);
-  XCTAssertTrue([dict getBool:NULL forKey:34ULL]);
-  XCTAssertTrue([dict getBool:&value forKey:34ULL]);
-  XCTAssertEqual(value, NO);
-
-  [dict setBool:NO forKey:31ULL];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getBool:NULL forKey:31ULL]);
-  XCTAssertTrue([dict getBool:&value forKey:31ULL]);
-  XCTAssertEqual(value, NO);
-  XCTAssertTrue([dict getBool:NULL forKey:32ULL]);
-  XCTAssertTrue([dict getBool:&value forKey:32ULL]);
-  XCTAssertEqual(value, YES);
-  XCTAssertTrue([dict getBool:NULL forKey:33ULL]);
-  XCTAssertTrue([dict getBool:&value forKey:33ULL]);
-  XCTAssertEqual(value, NO);
-  XCTAssertTrue([dict getBool:NULL forKey:34ULL]);
-  XCTAssertTrue([dict getBool:&value forKey:34ULL]);
-  XCTAssertEqual(value, NO);
-
-  [dict setBool:YES forKey:34ULL];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getBool:NULL forKey:31ULL]);
-  XCTAssertTrue([dict getBool:&value forKey:31ULL]);
-  XCTAssertEqual(value, NO);
-  XCTAssertTrue([dict getBool:NULL forKey:32ULL]);
-  XCTAssertTrue([dict getBool:&value forKey:32ULL]);
-  XCTAssertEqual(value, YES);
-  XCTAssertTrue([dict getBool:NULL forKey:33ULL]);
-  XCTAssertTrue([dict getBool:&value forKey:33ULL]);
-  XCTAssertEqual(value, NO);
-  XCTAssertTrue([dict getBool:NULL forKey:34ULL]);
-  XCTAssertTrue([dict getBool:&value forKey:34ULL]);
-  XCTAssertEqual(value, YES);
-
-  const uint64_t kKeys2[] = { 32ULL, 33ULL };
-  const BOOL kValues2[] = { NO, YES };
-  GPBUInt64BoolDictionary *dict2 =
-      [[GPBUInt64BoolDictionary alloc] initWithBools:kValues2
-                                             forKeys:kKeys2
-                                               count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(dict2);
-  [dict addEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getBool:NULL forKey:31ULL]);
-  XCTAssertTrue([dict getBool:&value forKey:31ULL]);
-  XCTAssertEqual(value, NO);
-  XCTAssertTrue([dict getBool:NULL forKey:32ULL]);
-  XCTAssertTrue([dict getBool:&value forKey:32ULL]);
-  XCTAssertEqual(value, NO);
-  XCTAssertTrue([dict getBool:NULL forKey:33ULL]);
-  XCTAssertTrue([dict getBool:&value forKey:33ULL]);
-  XCTAssertEqual(value, YES);
-  XCTAssertTrue([dict getBool:NULL forKey:34ULL]);
-  XCTAssertTrue([dict getBool:&value forKey:34ULL]);
-  XCTAssertEqual(value, YES);
-
-  [dict2 release];
-  [dict release];
-}
-
-@end
-
-#pragma mark - UInt64 -> Float
-
-@interface GPBUInt64FloatDictionaryTests : XCTestCase
-@end
-
-@implementation GPBUInt64FloatDictionaryTests
-
-- (void)testEmpty {
-  GPBUInt64FloatDictionary *dict = [[GPBUInt64FloatDictionary alloc] init];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertFalse([dict getFloat:NULL forKey:31ULL]);
-  [dict enumerateKeysAndFloatsUsingBlock:^(uint64_t aKey, float aValue, BOOL *stop) {
-    #pragma unused(aKey, aValue, stop)
-    XCTFail(@"Shouldn't get here!");
-  }];
-  [dict release];
-}
-
-- (void)testOne {
-  GPBUInt64FloatDictionary *dict = [[GPBUInt64FloatDictionary alloc] init];
-  [dict setFloat:500.f forKey:31ULL];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 1U);
-  float value;
-  XCTAssertTrue([dict getFloat:NULL forKey:31ULL]);
-  XCTAssertTrue([dict getFloat:&value forKey:31ULL]);
-  XCTAssertEqual(value, 500.f);
-  XCTAssertFalse([dict getFloat:NULL forKey:32ULL]);
-  [dict enumerateKeysAndFloatsUsingBlock:^(uint64_t aKey, float aValue, BOOL *stop) {
-    XCTAssertEqual(aKey, 31ULL);
-    XCTAssertEqual(aValue, 500.f);
-    XCTAssertNotEqual(stop, NULL);
-  }];
-  [dict release];
-}
-
-- (void)testBasics {
-  const uint64_t kKeys[] = { 31ULL, 32ULL, 33ULL };
-  const float kValues[] = { 500.f, 501.f, 502.f };
-  GPBUInt64FloatDictionary *dict =
-      [[GPBUInt64FloatDictionary alloc] initWithFloats:kValues
-                                               forKeys:kKeys
-                                                 count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 3U);
-  float value;
-  XCTAssertTrue([dict getFloat:NULL forKey:31ULL]);
-  XCTAssertTrue([dict getFloat:&value forKey:31ULL]);
-  XCTAssertEqual(value, 500.f);
-  XCTAssertTrue([dict getFloat:NULL forKey:32ULL]);
-  XCTAssertTrue([dict getFloat:&value forKey:32ULL]);
-  XCTAssertEqual(value, 501.f);
-  XCTAssertTrue([dict getFloat:NULL forKey:33ULL]);
-  XCTAssertTrue([dict getFloat:&value forKey:33ULL]);
-  XCTAssertEqual(value, 502.f);
-  XCTAssertFalse([dict getFloat:NULL forKey:34ULL]);
-
-  __block NSUInteger idx = 0;
-  uint64_t *seenKeys = malloc(3 * sizeof(uint64_t));
-  float *seenValues = malloc(3 * sizeof(float));
-  [dict enumerateKeysAndFloatsUsingBlock:^(uint64_t aKey, float aValue, BOOL *stop) {
-    XCTAssertLessThan(idx, 3U);
-    seenKeys[idx] = aKey;
-    seenValues[idx] = aValue;
-    XCTAssertNotEqual(stop, NULL);
-    ++idx;
-  }];
-  for (int i = 0; i < 3; ++i) {
-    BOOL foundKey = NO;
-    for (int j = 0; (j < 3) && !foundKey; ++j) {
-      if (kKeys[i] == seenKeys[j]) {
-        foundKey = YES;
-        XCTAssertEqual(kValues[i], seenValues[j], @"i = %d, j = %d", i, j);
-      }
-    }
-    XCTAssertTrue(foundKey, @"i = %d", i);
-  }
-  free(seenKeys);
-  free(seenValues);
-
-  // Stopping the enumeration.
-  idx = 0;
-  [dict enumerateKeysAndFloatsUsingBlock:^(uint64_t aKey, float aValue, BOOL *stop) {
-    #pragma unused(aKey, aValue)
-    if (idx == 1) *stop = YES;
-    XCTAssertNotEqual(idx, 2U);
-    ++idx;
-  }];
-  [dict release];
-}
-
-- (void)testEquality {
-  const uint64_t kKeys1[] = { 31ULL, 32ULL, 33ULL, 34ULL };
-  const uint64_t kKeys2[] = { 32ULL, 31ULL, 34ULL };
-  const float kValues1[] = { 500.f, 501.f, 502.f };
-  const float kValues2[] = { 500.f, 503.f, 502.f };
-  const float kValues3[] = { 500.f, 501.f, 502.f, 503.f };
-  GPBUInt64FloatDictionary *dict1 =
-      [[GPBUInt64FloatDictionary alloc] initWithFloats:kValues1
-                                               forKeys:kKeys1
-                                                 count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict1);
-  GPBUInt64FloatDictionary *dict1prime =
-      [[GPBUInt64FloatDictionary alloc] initWithFloats:kValues1
-                                               forKeys:kKeys1
-                                                 count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict1prime);
-  GPBUInt64FloatDictionary *dict2 =
-      [[GPBUInt64FloatDictionary alloc] initWithFloats:kValues2
-                                               forKeys:kKeys1
-                                                 count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(dict2);
-  GPBUInt64FloatDictionary *dict3 =
-      [[GPBUInt64FloatDictionary alloc] initWithFloats:kValues1
-                                               forKeys:kKeys2
-                                                 count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict3);
-  GPBUInt64FloatDictionary *dict4 =
-      [[GPBUInt64FloatDictionary alloc] initWithFloats:kValues3
-                                               forKeys:kKeys1
-                                                 count:GPBARRAYSIZE(kValues3)];
-  XCTAssertNotNil(dict4);
-
-  // 1/1Prime should be different objects, but equal.
-  XCTAssertNotEqual(dict1, dict1prime);
-  XCTAssertEqualObjects(dict1, dict1prime);
-  // Equal, so they must have same hash.
-  XCTAssertEqual([dict1 hash], [dict1prime hash]);
-
-  // 2 is same keys, different values; not equal.
-  XCTAssertNotEqualObjects(dict1, dict2);
-
-  // 3 is different keys, same values; not equal.
-  XCTAssertNotEqualObjects(dict1, dict3);
-
-  // 4 extra pair; not equal
-  XCTAssertNotEqualObjects(dict1, dict4);
-
-  [dict1 release];
-  [dict1prime release];
-  [dict2 release];
-  [dict3 release];
-  [dict4 release];
-}
-
-- (void)testCopy {
-  const uint64_t kKeys[] = { 31ULL, 32ULL, 33ULL, 34ULL };
-  const float kValues[] = { 500.f, 501.f, 502.f, 503.f };
-  GPBUInt64FloatDictionary *dict =
-      [[GPBUInt64FloatDictionary alloc] initWithFloats:kValues
-                                               forKeys:kKeys
-                                                 count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-
-  GPBUInt64FloatDictionary *dict2 = [dict copy];
-  XCTAssertNotNil(dict2);
-
-  // Should be new object but equal.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  XCTAssertTrue([dict2 isKindOfClass:[GPBUInt64FloatDictionary class]]);
-
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testDictionaryFromDictionary {
-  const uint64_t kKeys[] = { 31ULL, 32ULL, 33ULL, 34ULL };
-  const float kValues[] = { 500.f, 501.f, 502.f, 503.f };
-  GPBUInt64FloatDictionary *dict =
-      [[GPBUInt64FloatDictionary alloc] initWithFloats:kValues
-                                               forKeys:kKeys
-                                                 count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-
-  GPBUInt64FloatDictionary *dict2 =
-      [[GPBUInt64FloatDictionary alloc] initWithDictionary:dict];
-  XCTAssertNotNil(dict2);
-
-  // Should be new pointer, but equal objects.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testAdds {
-  GPBUInt64FloatDictionary *dict = [[GPBUInt64FloatDictionary alloc] init];
-  XCTAssertNotNil(dict);
-
-  XCTAssertEqual(dict.count, 0U);
-  [dict setFloat:500.f forKey:31ULL];
-  XCTAssertEqual(dict.count, 1U);
-
-  const uint64_t kKeys[] = { 32ULL, 33ULL, 34ULL };
-  const float kValues[] = { 501.f, 502.f, 503.f };
-  GPBUInt64FloatDictionary *dict2 =
-      [[GPBUInt64FloatDictionary alloc] initWithFloats:kValues
-                                               forKeys:kKeys
-                                                 count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict2);
-  [dict addEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 4U);
-
-  float value;
-  XCTAssertTrue([dict getFloat:NULL forKey:31ULL]);
-  XCTAssertTrue([dict getFloat:&value forKey:31ULL]);
-  XCTAssertEqual(value, 500.f);
-  XCTAssertTrue([dict getFloat:NULL forKey:32ULL]);
-  XCTAssertTrue([dict getFloat:&value forKey:32ULL]);
-  XCTAssertEqual(value, 501.f);
-  XCTAssertTrue([dict getFloat:NULL forKey:33ULL]);
-  XCTAssertTrue([dict getFloat:&value forKey:33ULL]);
-  XCTAssertEqual(value, 502.f);
-  XCTAssertTrue([dict getFloat:NULL forKey:34ULL]);
-  XCTAssertTrue([dict getFloat:&value forKey:34ULL]);
-  XCTAssertEqual(value, 503.f);
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testRemove {
-  const uint64_t kKeys[] = { 31ULL, 32ULL, 33ULL, 34ULL };
-  const float kValues[] = { 500.f, 501.f, 502.f, 503.f };
-  GPBUInt64FloatDictionary *dict =
-      [[GPBUInt64FloatDictionary alloc] initWithFloats:kValues
-                                               forKeys:kKeys
-                                                 count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 4U);
-
-  [dict removeFloatForKey:32ULL];
-  XCTAssertEqual(dict.count, 3U);
-  float value;
-  XCTAssertTrue([dict getFloat:NULL forKey:31ULL]);
-  XCTAssertTrue([dict getFloat:&value forKey:31ULL]);
-  XCTAssertEqual(value, 500.f);
-  XCTAssertFalse([dict getFloat:NULL forKey:32ULL]);
-  XCTAssertTrue([dict getFloat:NULL forKey:33ULL]);
-  XCTAssertTrue([dict getFloat:&value forKey:33ULL]);
-  XCTAssertEqual(value, 502.f);
-  XCTAssertTrue([dict getFloat:NULL forKey:34ULL]);
-  XCTAssertTrue([dict getFloat:&value forKey:34ULL]);
-  XCTAssertEqual(value, 503.f);
-
-  // Remove again does nothing.
-  [dict removeFloatForKey:32ULL];
-  XCTAssertEqual(dict.count, 3U);
-  XCTAssertTrue([dict getFloat:NULL forKey:31ULL]);
-  XCTAssertTrue([dict getFloat:&value forKey:31ULL]);
-  XCTAssertEqual(value, 500.f);
-  XCTAssertFalse([dict getFloat:NULL forKey:32ULL]);
-  XCTAssertTrue([dict getFloat:NULL forKey:33ULL]);
-  XCTAssertTrue([dict getFloat:&value forKey:33ULL]);
-  XCTAssertEqual(value, 502.f);
-  XCTAssertTrue([dict getFloat:NULL forKey:34ULL]);
-  XCTAssertTrue([dict getFloat:&value forKey:34ULL]);
-  XCTAssertEqual(value, 503.f);
-
-  [dict removeFloatForKey:34ULL];
-  XCTAssertEqual(dict.count, 2U);
-  XCTAssertTrue([dict getFloat:NULL forKey:31ULL]);
-  XCTAssertTrue([dict getFloat:&value forKey:31ULL]);
-  XCTAssertEqual(value, 500.f);
-  XCTAssertFalse([dict getFloat:NULL forKey:32ULL]);
-  XCTAssertTrue([dict getFloat:NULL forKey:33ULL]);
-  XCTAssertTrue([dict getFloat:&value forKey:33ULL]);
-  XCTAssertEqual(value, 502.f);
-  XCTAssertFalse([dict getFloat:NULL forKey:34ULL]);
-
-  [dict removeAll];
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertFalse([dict getFloat:NULL forKey:31ULL]);
-  XCTAssertFalse([dict getFloat:NULL forKey:32ULL]);
-  XCTAssertFalse([dict getFloat:NULL forKey:33ULL]);
-  XCTAssertFalse([dict getFloat:NULL forKey:34ULL]);
-  [dict release];
-}
-
-- (void)testInplaceMutation {
-  const uint64_t kKeys[] = { 31ULL, 32ULL, 33ULL, 34ULL };
-  const float kValues[] = { 500.f, 501.f, 502.f, 503.f };
-  GPBUInt64FloatDictionary *dict =
-      [[GPBUInt64FloatDictionary alloc] initWithFloats:kValues
-                                               forKeys:kKeys
-                                                 count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 4U);
-  float value;
-  XCTAssertTrue([dict getFloat:NULL forKey:31ULL]);
-  XCTAssertTrue([dict getFloat:&value forKey:31ULL]);
-  XCTAssertEqual(value, 500.f);
-  XCTAssertTrue([dict getFloat:NULL forKey:32ULL]);
-  XCTAssertTrue([dict getFloat:&value forKey:32ULL]);
-  XCTAssertEqual(value, 501.f);
-  XCTAssertTrue([dict getFloat:NULL forKey:33ULL]);
-  XCTAssertTrue([dict getFloat:&value forKey:33ULL]);
-  XCTAssertEqual(value, 502.f);
-  XCTAssertTrue([dict getFloat:NULL forKey:34ULL]);
-  XCTAssertTrue([dict getFloat:&value forKey:34ULL]);
-  XCTAssertEqual(value, 503.f);
-
-  [dict setFloat:503.f forKey:31ULL];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getFloat:NULL forKey:31ULL]);
-  XCTAssertTrue([dict getFloat:&value forKey:31ULL]);
-  XCTAssertEqual(value, 503.f);
-  XCTAssertTrue([dict getFloat:NULL forKey:32ULL]);
-  XCTAssertTrue([dict getFloat:&value forKey:32ULL]);
-  XCTAssertEqual(value, 501.f);
-  XCTAssertTrue([dict getFloat:NULL forKey:33ULL]);
-  XCTAssertTrue([dict getFloat:&value forKey:33ULL]);
-  XCTAssertEqual(value, 502.f);
-  XCTAssertTrue([dict getFloat:NULL forKey:34ULL]);
-  XCTAssertTrue([dict getFloat:&value forKey:34ULL]);
-  XCTAssertEqual(value, 503.f);
-
-  [dict setFloat:501.f forKey:34ULL];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getFloat:NULL forKey:31ULL]);
-  XCTAssertTrue([dict getFloat:&value forKey:31ULL]);
-  XCTAssertEqual(value, 503.f);
-  XCTAssertTrue([dict getFloat:NULL forKey:32ULL]);
-  XCTAssertTrue([dict getFloat:&value forKey:32ULL]);
-  XCTAssertEqual(value, 501.f);
-  XCTAssertTrue([dict getFloat:NULL forKey:33ULL]);
-  XCTAssertTrue([dict getFloat:&value forKey:33ULL]);
-  XCTAssertEqual(value, 502.f);
-  XCTAssertTrue([dict getFloat:NULL forKey:34ULL]);
-  XCTAssertTrue([dict getFloat:&value forKey:34ULL]);
-  XCTAssertEqual(value, 501.f);
-
-  const uint64_t kKeys2[] = { 32ULL, 33ULL };
-  const float kValues2[] = { 502.f, 500.f };
-  GPBUInt64FloatDictionary *dict2 =
-      [[GPBUInt64FloatDictionary alloc] initWithFloats:kValues2
-                                               forKeys:kKeys2
-                                                 count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(dict2);
-  [dict addEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getFloat:NULL forKey:31ULL]);
-  XCTAssertTrue([dict getFloat:&value forKey:31ULL]);
-  XCTAssertEqual(value, 503.f);
-  XCTAssertTrue([dict getFloat:NULL forKey:32ULL]);
-  XCTAssertTrue([dict getFloat:&value forKey:32ULL]);
-  XCTAssertEqual(value, 502.f);
-  XCTAssertTrue([dict getFloat:NULL forKey:33ULL]);
-  XCTAssertTrue([dict getFloat:&value forKey:33ULL]);
-  XCTAssertEqual(value, 500.f);
-  XCTAssertTrue([dict getFloat:NULL forKey:34ULL]);
-  XCTAssertTrue([dict getFloat:&value forKey:34ULL]);
-  XCTAssertEqual(value, 501.f);
-
-  [dict2 release];
-  [dict release];
-}
-
-@end
-
-#pragma mark - UInt64 -> Double
-
-@interface GPBUInt64DoubleDictionaryTests : XCTestCase
-@end
-
-@implementation GPBUInt64DoubleDictionaryTests
-
-- (void)testEmpty {
-  GPBUInt64DoubleDictionary *dict = [[GPBUInt64DoubleDictionary alloc] init];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertFalse([dict getDouble:NULL forKey:31ULL]);
-  [dict enumerateKeysAndDoublesUsingBlock:^(uint64_t aKey, double aValue, BOOL *stop) {
-    #pragma unused(aKey, aValue, stop)
-    XCTFail(@"Shouldn't get here!");
-  }];
-  [dict release];
-}
-
-- (void)testOne {
-  GPBUInt64DoubleDictionary *dict = [[GPBUInt64DoubleDictionary alloc] init];
-  [dict setDouble:600. forKey:31ULL];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 1U);
-  double value;
-  XCTAssertTrue([dict getDouble:NULL forKey:31ULL]);
-  XCTAssertTrue([dict getDouble:&value forKey:31ULL]);
-  XCTAssertEqual(value, 600.);
-  XCTAssertFalse([dict getDouble:NULL forKey:32ULL]);
-  [dict enumerateKeysAndDoublesUsingBlock:^(uint64_t aKey, double aValue, BOOL *stop) {
-    XCTAssertEqual(aKey, 31ULL);
-    XCTAssertEqual(aValue, 600.);
-    XCTAssertNotEqual(stop, NULL);
-  }];
-  [dict release];
-}
-
-- (void)testBasics {
-  const uint64_t kKeys[] = { 31ULL, 32ULL, 33ULL };
-  const double kValues[] = { 600., 601., 602. };
-  GPBUInt64DoubleDictionary *dict =
-      [[GPBUInt64DoubleDictionary alloc] initWithDoubles:kValues
-                                                 forKeys:kKeys
-                                                   count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 3U);
-  double value;
-  XCTAssertTrue([dict getDouble:NULL forKey:31ULL]);
-  XCTAssertTrue([dict getDouble:&value forKey:31ULL]);
-  XCTAssertEqual(value, 600.);
-  XCTAssertTrue([dict getDouble:NULL forKey:32ULL]);
-  XCTAssertTrue([dict getDouble:&value forKey:32ULL]);
-  XCTAssertEqual(value, 601.);
-  XCTAssertTrue([dict getDouble:NULL forKey:33ULL]);
-  XCTAssertTrue([dict getDouble:&value forKey:33ULL]);
-  XCTAssertEqual(value, 602.);
-  XCTAssertFalse([dict getDouble:NULL forKey:34ULL]);
-
-  __block NSUInteger idx = 0;
-  uint64_t *seenKeys = malloc(3 * sizeof(uint64_t));
-  double *seenValues = malloc(3 * sizeof(double));
-  [dict enumerateKeysAndDoublesUsingBlock:^(uint64_t aKey, double aValue, BOOL *stop) {
-    XCTAssertLessThan(idx, 3U);
-    seenKeys[idx] = aKey;
-    seenValues[idx] = aValue;
-    XCTAssertNotEqual(stop, NULL);
-    ++idx;
-  }];
-  for (int i = 0; i < 3; ++i) {
-    BOOL foundKey = NO;
-    for (int j = 0; (j < 3) && !foundKey; ++j) {
-      if (kKeys[i] == seenKeys[j]) {
-        foundKey = YES;
-        XCTAssertEqual(kValues[i], seenValues[j], @"i = %d, j = %d", i, j);
-      }
-    }
-    XCTAssertTrue(foundKey, @"i = %d", i);
-  }
-  free(seenKeys);
-  free(seenValues);
-
-  // Stopping the enumeration.
-  idx = 0;
-  [dict enumerateKeysAndDoublesUsingBlock:^(uint64_t aKey, double aValue, BOOL *stop) {
-    #pragma unused(aKey, aValue)
-    if (idx == 1) *stop = YES;
-    XCTAssertNotEqual(idx, 2U);
-    ++idx;
-  }];
-  [dict release];
-}
-
-- (void)testEquality {
-  const uint64_t kKeys1[] = { 31ULL, 32ULL, 33ULL, 34ULL };
-  const uint64_t kKeys2[] = { 32ULL, 31ULL, 34ULL };
-  const double kValues1[] = { 600., 601., 602. };
-  const double kValues2[] = { 600., 603., 602. };
-  const double kValues3[] = { 600., 601., 602., 603. };
-  GPBUInt64DoubleDictionary *dict1 =
-      [[GPBUInt64DoubleDictionary alloc] initWithDoubles:kValues1
-                                                 forKeys:kKeys1
-                                                   count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict1);
-  GPBUInt64DoubleDictionary *dict1prime =
-      [[GPBUInt64DoubleDictionary alloc] initWithDoubles:kValues1
-                                                 forKeys:kKeys1
-                                                   count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict1prime);
-  GPBUInt64DoubleDictionary *dict2 =
-      [[GPBUInt64DoubleDictionary alloc] initWithDoubles:kValues2
-                                                 forKeys:kKeys1
-                                                   count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(dict2);
-  GPBUInt64DoubleDictionary *dict3 =
-      [[GPBUInt64DoubleDictionary alloc] initWithDoubles:kValues1
-                                                 forKeys:kKeys2
-                                                   count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict3);
-  GPBUInt64DoubleDictionary *dict4 =
-      [[GPBUInt64DoubleDictionary alloc] initWithDoubles:kValues3
-                                                 forKeys:kKeys1
-                                                   count:GPBARRAYSIZE(kValues3)];
-  XCTAssertNotNil(dict4);
-
-  // 1/1Prime should be different objects, but equal.
-  XCTAssertNotEqual(dict1, dict1prime);
-  XCTAssertEqualObjects(dict1, dict1prime);
-  // Equal, so they must have same hash.
-  XCTAssertEqual([dict1 hash], [dict1prime hash]);
-
-  // 2 is same keys, different values; not equal.
-  XCTAssertNotEqualObjects(dict1, dict2);
-
-  // 3 is different keys, same values; not equal.
-  XCTAssertNotEqualObjects(dict1, dict3);
-
-  // 4 extra pair; not equal
-  XCTAssertNotEqualObjects(dict1, dict4);
-
-  [dict1 release];
-  [dict1prime release];
-  [dict2 release];
-  [dict3 release];
-  [dict4 release];
-}
-
-- (void)testCopy {
-  const uint64_t kKeys[] = { 31ULL, 32ULL, 33ULL, 34ULL };
-  const double kValues[] = { 600., 601., 602., 603. };
-  GPBUInt64DoubleDictionary *dict =
-      [[GPBUInt64DoubleDictionary alloc] initWithDoubles:kValues
-                                                 forKeys:kKeys
-                                                   count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-
-  GPBUInt64DoubleDictionary *dict2 = [dict copy];
-  XCTAssertNotNil(dict2);
-
-  // Should be new object but equal.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  XCTAssertTrue([dict2 isKindOfClass:[GPBUInt64DoubleDictionary class]]);
-
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testDictionaryFromDictionary {
-  const uint64_t kKeys[] = { 31ULL, 32ULL, 33ULL, 34ULL };
-  const double kValues[] = { 600., 601., 602., 603. };
-  GPBUInt64DoubleDictionary *dict =
-      [[GPBUInt64DoubleDictionary alloc] initWithDoubles:kValues
-                                                 forKeys:kKeys
-                                                   count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-
-  GPBUInt64DoubleDictionary *dict2 =
-      [[GPBUInt64DoubleDictionary alloc] initWithDictionary:dict];
-  XCTAssertNotNil(dict2);
-
-  // Should be new pointer, but equal objects.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testAdds {
-  GPBUInt64DoubleDictionary *dict = [[GPBUInt64DoubleDictionary alloc] init];
-  XCTAssertNotNil(dict);
-
-  XCTAssertEqual(dict.count, 0U);
-  [dict setDouble:600. forKey:31ULL];
-  XCTAssertEqual(dict.count, 1U);
-
-  const uint64_t kKeys[] = { 32ULL, 33ULL, 34ULL };
-  const double kValues[] = { 601., 602., 603. };
-  GPBUInt64DoubleDictionary *dict2 =
-      [[GPBUInt64DoubleDictionary alloc] initWithDoubles:kValues
-                                                 forKeys:kKeys
-                                                   count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict2);
-  [dict addEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 4U);
-
-  double value;
-  XCTAssertTrue([dict getDouble:NULL forKey:31ULL]);
-  XCTAssertTrue([dict getDouble:&value forKey:31ULL]);
-  XCTAssertEqual(value, 600.);
-  XCTAssertTrue([dict getDouble:NULL forKey:32ULL]);
-  XCTAssertTrue([dict getDouble:&value forKey:32ULL]);
-  XCTAssertEqual(value, 601.);
-  XCTAssertTrue([dict getDouble:NULL forKey:33ULL]);
-  XCTAssertTrue([dict getDouble:&value forKey:33ULL]);
-  XCTAssertEqual(value, 602.);
-  XCTAssertTrue([dict getDouble:NULL forKey:34ULL]);
-  XCTAssertTrue([dict getDouble:&value forKey:34ULL]);
-  XCTAssertEqual(value, 603.);
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testRemove {
-  const uint64_t kKeys[] = { 31ULL, 32ULL, 33ULL, 34ULL };
-  const double kValues[] = { 600., 601., 602., 603. };
-  GPBUInt64DoubleDictionary *dict =
-      [[GPBUInt64DoubleDictionary alloc] initWithDoubles:kValues
-                                                 forKeys:kKeys
-                                                   count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 4U);
-
-  [dict removeDoubleForKey:32ULL];
-  XCTAssertEqual(dict.count, 3U);
-  double value;
-  XCTAssertTrue([dict getDouble:NULL forKey:31ULL]);
-  XCTAssertTrue([dict getDouble:&value forKey:31ULL]);
-  XCTAssertEqual(value, 600.);
-  XCTAssertFalse([dict getDouble:NULL forKey:32ULL]);
-  XCTAssertTrue([dict getDouble:NULL forKey:33ULL]);
-  XCTAssertTrue([dict getDouble:&value forKey:33ULL]);
-  XCTAssertEqual(value, 602.);
-  XCTAssertTrue([dict getDouble:NULL forKey:34ULL]);
-  XCTAssertTrue([dict getDouble:&value forKey:34ULL]);
-  XCTAssertEqual(value, 603.);
-
-  // Remove again does nothing.
-  [dict removeDoubleForKey:32ULL];
-  XCTAssertEqual(dict.count, 3U);
-  XCTAssertTrue([dict getDouble:NULL forKey:31ULL]);
-  XCTAssertTrue([dict getDouble:&value forKey:31ULL]);
-  XCTAssertEqual(value, 600.);
-  XCTAssertFalse([dict getDouble:NULL forKey:32ULL]);
-  XCTAssertTrue([dict getDouble:NULL forKey:33ULL]);
-  XCTAssertTrue([dict getDouble:&value forKey:33ULL]);
-  XCTAssertEqual(value, 602.);
-  XCTAssertTrue([dict getDouble:NULL forKey:34ULL]);
-  XCTAssertTrue([dict getDouble:&value forKey:34ULL]);
-  XCTAssertEqual(value, 603.);
-
-  [dict removeDoubleForKey:34ULL];
-  XCTAssertEqual(dict.count, 2U);
-  XCTAssertTrue([dict getDouble:NULL forKey:31ULL]);
-  XCTAssertTrue([dict getDouble:&value forKey:31ULL]);
-  XCTAssertEqual(value, 600.);
-  XCTAssertFalse([dict getDouble:NULL forKey:32ULL]);
-  XCTAssertTrue([dict getDouble:NULL forKey:33ULL]);
-  XCTAssertTrue([dict getDouble:&value forKey:33ULL]);
-  XCTAssertEqual(value, 602.);
-  XCTAssertFalse([dict getDouble:NULL forKey:34ULL]);
-
-  [dict removeAll];
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertFalse([dict getDouble:NULL forKey:31ULL]);
-  XCTAssertFalse([dict getDouble:NULL forKey:32ULL]);
-  XCTAssertFalse([dict getDouble:NULL forKey:33ULL]);
-  XCTAssertFalse([dict getDouble:NULL forKey:34ULL]);
-  [dict release];
-}
-
-- (void)testInplaceMutation {
-  const uint64_t kKeys[] = { 31ULL, 32ULL, 33ULL, 34ULL };
-  const double kValues[] = { 600., 601., 602., 603. };
-  GPBUInt64DoubleDictionary *dict =
-      [[GPBUInt64DoubleDictionary alloc] initWithDoubles:kValues
-                                                 forKeys:kKeys
-                                                   count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 4U);
-  double value;
-  XCTAssertTrue([dict getDouble:NULL forKey:31ULL]);
-  XCTAssertTrue([dict getDouble:&value forKey:31ULL]);
-  XCTAssertEqual(value, 600.);
-  XCTAssertTrue([dict getDouble:NULL forKey:32ULL]);
-  XCTAssertTrue([dict getDouble:&value forKey:32ULL]);
-  XCTAssertEqual(value, 601.);
-  XCTAssertTrue([dict getDouble:NULL forKey:33ULL]);
-  XCTAssertTrue([dict getDouble:&value forKey:33ULL]);
-  XCTAssertEqual(value, 602.);
-  XCTAssertTrue([dict getDouble:NULL forKey:34ULL]);
-  XCTAssertTrue([dict getDouble:&value forKey:34ULL]);
-  XCTAssertEqual(value, 603.);
-
-  [dict setDouble:603. forKey:31ULL];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getDouble:NULL forKey:31ULL]);
-  XCTAssertTrue([dict getDouble:&value forKey:31ULL]);
-  XCTAssertEqual(value, 603.);
-  XCTAssertTrue([dict getDouble:NULL forKey:32ULL]);
-  XCTAssertTrue([dict getDouble:&value forKey:32ULL]);
-  XCTAssertEqual(value, 601.);
-  XCTAssertTrue([dict getDouble:NULL forKey:33ULL]);
-  XCTAssertTrue([dict getDouble:&value forKey:33ULL]);
-  XCTAssertEqual(value, 602.);
-  XCTAssertTrue([dict getDouble:NULL forKey:34ULL]);
-  XCTAssertTrue([dict getDouble:&value forKey:34ULL]);
-  XCTAssertEqual(value, 603.);
-
-  [dict setDouble:601. forKey:34ULL];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getDouble:NULL forKey:31ULL]);
-  XCTAssertTrue([dict getDouble:&value forKey:31ULL]);
-  XCTAssertEqual(value, 603.);
-  XCTAssertTrue([dict getDouble:NULL forKey:32ULL]);
-  XCTAssertTrue([dict getDouble:&value forKey:32ULL]);
-  XCTAssertEqual(value, 601.);
-  XCTAssertTrue([dict getDouble:NULL forKey:33ULL]);
-  XCTAssertTrue([dict getDouble:&value forKey:33ULL]);
-  XCTAssertEqual(value, 602.);
-  XCTAssertTrue([dict getDouble:NULL forKey:34ULL]);
-  XCTAssertTrue([dict getDouble:&value forKey:34ULL]);
-  XCTAssertEqual(value, 601.);
-
-  const uint64_t kKeys2[] = { 32ULL, 33ULL };
-  const double kValues2[] = { 602., 600. };
-  GPBUInt64DoubleDictionary *dict2 =
-      [[GPBUInt64DoubleDictionary alloc] initWithDoubles:kValues2
-                                                 forKeys:kKeys2
-                                                   count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(dict2);
-  [dict addEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getDouble:NULL forKey:31ULL]);
-  XCTAssertTrue([dict getDouble:&value forKey:31ULL]);
-  XCTAssertEqual(value, 603.);
-  XCTAssertTrue([dict getDouble:NULL forKey:32ULL]);
-  XCTAssertTrue([dict getDouble:&value forKey:32ULL]);
-  XCTAssertEqual(value, 602.);
-  XCTAssertTrue([dict getDouble:NULL forKey:33ULL]);
-  XCTAssertTrue([dict getDouble:&value forKey:33ULL]);
-  XCTAssertEqual(value, 600.);
-  XCTAssertTrue([dict getDouble:NULL forKey:34ULL]);
-  XCTAssertTrue([dict getDouble:&value forKey:34ULL]);
-  XCTAssertEqual(value, 601.);
-
-  [dict2 release];
-  [dict release];
-}
-
-@end
-
-#pragma mark - UInt64 -> Enum
-
-@interface GPBUInt64EnumDictionaryTests : XCTestCase
-@end
-
-@implementation GPBUInt64EnumDictionaryTests
-
-- (void)testEmpty {
-  GPBUInt64EnumDictionary *dict = [[GPBUInt64EnumDictionary alloc] init];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertFalse([dict getEnum:NULL forKey:31ULL]);
-  [dict enumerateKeysAndEnumsUsingBlock:^(uint64_t aKey, int32_t aValue, BOOL *stop) {
-    #pragma unused(aKey, aValue, stop)
-    XCTFail(@"Shouldn't get here!");
-  }];
-  [dict release];
-}
-
-- (void)testOne {
-  GPBUInt64EnumDictionary *dict = [[GPBUInt64EnumDictionary alloc] init];
-  [dict setEnum:700 forKey:31ULL];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 1U);
-  int32_t value;
-  XCTAssertTrue([dict getEnum:NULL forKey:31ULL]);
-  XCTAssertTrue([dict getEnum:&value forKey:31ULL]);
-  XCTAssertEqual(value, 700);
-  XCTAssertFalse([dict getEnum:NULL forKey:32ULL]);
-  [dict enumerateKeysAndEnumsUsingBlock:^(uint64_t aKey, int32_t aValue, BOOL *stop) {
-    XCTAssertEqual(aKey, 31ULL);
-    XCTAssertEqual(aValue, 700);
-    XCTAssertNotEqual(stop, NULL);
-  }];
-  [dict release];
-}
-
-- (void)testBasics {
-  const uint64_t kKeys[] = { 31ULL, 32ULL, 33ULL };
-  const int32_t kValues[] = { 700, 701, 702 };
-  GPBUInt64EnumDictionary *dict =
-      [[GPBUInt64EnumDictionary alloc] initWithEnums:kValues
-                                             forKeys:kKeys
-                                               count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 3U);
-  int32_t value;
-  XCTAssertTrue([dict getEnum:NULL forKey:31ULL]);
-  XCTAssertTrue([dict getEnum:&value forKey:31ULL]);
-  XCTAssertEqual(value, 700);
-  XCTAssertTrue([dict getEnum:NULL forKey:32ULL]);
-  XCTAssertTrue([dict getEnum:&value forKey:32ULL]);
-  XCTAssertEqual(value, 701);
-  XCTAssertTrue([dict getEnum:NULL forKey:33ULL]);
-  XCTAssertTrue([dict getEnum:&value forKey:33ULL]);
-  XCTAssertEqual(value, 702);
-  XCTAssertFalse([dict getEnum:NULL forKey:34ULL]);
-
-  __block NSUInteger idx = 0;
-  uint64_t *seenKeys = malloc(3 * sizeof(uint64_t));
-  int32_t *seenValues = malloc(3 * sizeof(int32_t));
-  [dict enumerateKeysAndEnumsUsingBlock:^(uint64_t aKey, int32_t aValue, BOOL *stop) {
-    XCTAssertLessThan(idx, 3U);
-    seenKeys[idx] = aKey;
-    seenValues[idx] = aValue;
-    XCTAssertNotEqual(stop, NULL);
-    ++idx;
-  }];
-  for (int i = 0; i < 3; ++i) {
-    BOOL foundKey = NO;
-    for (int j = 0; (j < 3) && !foundKey; ++j) {
-      if (kKeys[i] == seenKeys[j]) {
-        foundKey = YES;
-        XCTAssertEqual(kValues[i], seenValues[j], @"i = %d, j = %d", i, j);
-      }
-    }
-    XCTAssertTrue(foundKey, @"i = %d", i);
-  }
-  free(seenKeys);
-  free(seenValues);
-
-  // Stopping the enumeration.
-  idx = 0;
-  [dict enumerateKeysAndEnumsUsingBlock:^(uint64_t aKey, int32_t aValue, BOOL *stop) {
-    #pragma unused(aKey, aValue)
-    if (idx == 1) *stop = YES;
-    XCTAssertNotEqual(idx, 2U);
-    ++idx;
-  }];
-  [dict release];
-}
-
-- (void)testEquality {
-  const uint64_t kKeys1[] = { 31ULL, 32ULL, 33ULL, 34ULL };
-  const uint64_t kKeys2[] = { 32ULL, 31ULL, 34ULL };
-  const int32_t kValues1[] = { 700, 701, 702 };
-  const int32_t kValues2[] = { 700, 703, 702 };
-  const int32_t kValues3[] = { 700, 701, 702, 703 };
-  GPBUInt64EnumDictionary *dict1 =
-      [[GPBUInt64EnumDictionary alloc] initWithEnums:kValues1
-                                             forKeys:kKeys1
-                                               count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict1);
-  GPBUInt64EnumDictionary *dict1prime =
-      [[GPBUInt64EnumDictionary alloc] initWithEnums:kValues1
-                                             forKeys:kKeys1
-                                               count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict1prime);
-  GPBUInt64EnumDictionary *dict2 =
-      [[GPBUInt64EnumDictionary alloc] initWithEnums:kValues2
-                                             forKeys:kKeys1
-                                               count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(dict2);
-  GPBUInt64EnumDictionary *dict3 =
-      [[GPBUInt64EnumDictionary alloc] initWithEnums:kValues1
-                                             forKeys:kKeys2
-                                               count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict3);
-  GPBUInt64EnumDictionary *dict4 =
-      [[GPBUInt64EnumDictionary alloc] initWithEnums:kValues3
-                                             forKeys:kKeys1
-                                               count:GPBARRAYSIZE(kValues3)];
-  XCTAssertNotNil(dict4);
-
-  // 1/1Prime should be different objects, but equal.
-  XCTAssertNotEqual(dict1, dict1prime);
-  XCTAssertEqualObjects(dict1, dict1prime);
-  // Equal, so they must have same hash.
-  XCTAssertEqual([dict1 hash], [dict1prime hash]);
-
-  // 2 is same keys, different values; not equal.
-  XCTAssertNotEqualObjects(dict1, dict2);
-
-  // 3 is different keys, same values; not equal.
-  XCTAssertNotEqualObjects(dict1, dict3);
-
-  // 4 extra pair; not equal
-  XCTAssertNotEqualObjects(dict1, dict4);
-
-  [dict1 release];
-  [dict1prime release];
-  [dict2 release];
-  [dict3 release];
-  [dict4 release];
-}
-
-- (void)testCopy {
-  const uint64_t kKeys[] = { 31ULL, 32ULL, 33ULL, 34ULL };
-  const int32_t kValues[] = { 700, 701, 702, 703 };
-  GPBUInt64EnumDictionary *dict =
-      [[GPBUInt64EnumDictionary alloc] initWithEnums:kValues
-                                             forKeys:kKeys
-                                               count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-
-  GPBUInt64EnumDictionary *dict2 = [dict copy];
-  XCTAssertNotNil(dict2);
-
-  // Should be new object but equal.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  XCTAssertTrue([dict2 isKindOfClass:[GPBUInt64EnumDictionary class]]);
-
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testDictionaryFromDictionary {
-  const uint64_t kKeys[] = { 31ULL, 32ULL, 33ULL, 34ULL };
-  const int32_t kValues[] = { 700, 701, 702, 703 };
-  GPBUInt64EnumDictionary *dict =
-      [[GPBUInt64EnumDictionary alloc] initWithEnums:kValues
-                                             forKeys:kKeys
-                                               count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-
-  GPBUInt64EnumDictionary *dict2 =
-      [[GPBUInt64EnumDictionary alloc] initWithDictionary:dict];
-  XCTAssertNotNil(dict2);
-
-  // Should be new pointer, but equal objects.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testAdds {
-  GPBUInt64EnumDictionary *dict = [[GPBUInt64EnumDictionary alloc] init];
-  XCTAssertNotNil(dict);
-
-  XCTAssertEqual(dict.count, 0U);
-  [dict setEnum:700 forKey:31ULL];
-  XCTAssertEqual(dict.count, 1U);
-
-  const uint64_t kKeys[] = { 32ULL, 33ULL, 34ULL };
-  const int32_t kValues[] = { 701, 702, 703 };
-  GPBUInt64EnumDictionary *dict2 =
-      [[GPBUInt64EnumDictionary alloc] initWithEnums:kValues
-                                             forKeys:kKeys
-                                               count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict2);
-  [dict addRawEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 4U);
-
-  int32_t value;
-  XCTAssertTrue([dict getEnum:NULL forKey:31ULL]);
-  XCTAssertTrue([dict getEnum:&value forKey:31ULL]);
-  XCTAssertEqual(value, 700);
-  XCTAssertTrue([dict getEnum:NULL forKey:32ULL]);
-  XCTAssertTrue([dict getEnum:&value forKey:32ULL]);
-  XCTAssertEqual(value, 701);
-  XCTAssertTrue([dict getEnum:NULL forKey:33ULL]);
-  XCTAssertTrue([dict getEnum:&value forKey:33ULL]);
-  XCTAssertEqual(value, 702);
-  XCTAssertTrue([dict getEnum:NULL forKey:34ULL]);
-  XCTAssertTrue([dict getEnum:&value forKey:34ULL]);
-  XCTAssertEqual(value, 703);
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testRemove {
-  const uint64_t kKeys[] = { 31ULL, 32ULL, 33ULL, 34ULL };
-  const int32_t kValues[] = { 700, 701, 702, 703 };
-  GPBUInt64EnumDictionary *dict =
-      [[GPBUInt64EnumDictionary alloc] initWithEnums:kValues
-                                             forKeys:kKeys
-                                               count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 4U);
-
-  [dict removeEnumForKey:32ULL];
-  XCTAssertEqual(dict.count, 3U);
-  int32_t value;
-  XCTAssertTrue([dict getEnum:NULL forKey:31ULL]);
-  XCTAssertTrue([dict getEnum:&value forKey:31ULL]);
-  XCTAssertEqual(value, 700);
-  XCTAssertFalse([dict getEnum:NULL forKey:32ULL]);
-  XCTAssertTrue([dict getEnum:NULL forKey:33ULL]);
-  XCTAssertTrue([dict getEnum:&value forKey:33ULL]);
-  XCTAssertEqual(value, 702);
-  XCTAssertTrue([dict getEnum:NULL forKey:34ULL]);
-  XCTAssertTrue([dict getEnum:&value forKey:34ULL]);
-  XCTAssertEqual(value, 703);
-
-  // Remove again does nothing.
-  [dict removeEnumForKey:32ULL];
-  XCTAssertEqual(dict.count, 3U);
-  XCTAssertTrue([dict getEnum:NULL forKey:31ULL]);
-  XCTAssertTrue([dict getEnum:&value forKey:31ULL]);
-  XCTAssertEqual(value, 700);
-  XCTAssertFalse([dict getEnum:NULL forKey:32ULL]);
-  XCTAssertTrue([dict getEnum:NULL forKey:33ULL]);
-  XCTAssertTrue([dict getEnum:&value forKey:33ULL]);
-  XCTAssertEqual(value, 702);
-  XCTAssertTrue([dict getEnum:NULL forKey:34ULL]);
-  XCTAssertTrue([dict getEnum:&value forKey:34ULL]);
-  XCTAssertEqual(value, 703);
-
-  [dict removeEnumForKey:34ULL];
-  XCTAssertEqual(dict.count, 2U);
-  XCTAssertTrue([dict getEnum:NULL forKey:31ULL]);
-  XCTAssertTrue([dict getEnum:&value forKey:31ULL]);
-  XCTAssertEqual(value, 700);
-  XCTAssertFalse([dict getEnum:NULL forKey:32ULL]);
-  XCTAssertTrue([dict getEnum:NULL forKey:33ULL]);
-  XCTAssertTrue([dict getEnum:&value forKey:33ULL]);
-  XCTAssertEqual(value, 702);
-  XCTAssertFalse([dict getEnum:NULL forKey:34ULL]);
-
-  [dict removeAll];
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertFalse([dict getEnum:NULL forKey:31ULL]);
-  XCTAssertFalse([dict getEnum:NULL forKey:32ULL]);
-  XCTAssertFalse([dict getEnum:NULL forKey:33ULL]);
-  XCTAssertFalse([dict getEnum:NULL forKey:34ULL]);
-  [dict release];
-}
-
-- (void)testInplaceMutation {
-  const uint64_t kKeys[] = { 31ULL, 32ULL, 33ULL, 34ULL };
-  const int32_t kValues[] = { 700, 701, 702, 703 };
-  GPBUInt64EnumDictionary *dict =
-      [[GPBUInt64EnumDictionary alloc] initWithEnums:kValues
-                                             forKeys:kKeys
-                                               count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 4U);
-  int32_t value;
-  XCTAssertTrue([dict getEnum:NULL forKey:31ULL]);
-  XCTAssertTrue([dict getEnum:&value forKey:31ULL]);
-  XCTAssertEqual(value, 700);
-  XCTAssertTrue([dict getEnum:NULL forKey:32ULL]);
-  XCTAssertTrue([dict getEnum:&value forKey:32ULL]);
-  XCTAssertEqual(value, 701);
-  XCTAssertTrue([dict getEnum:NULL forKey:33ULL]);
-  XCTAssertTrue([dict getEnum:&value forKey:33ULL]);
-  XCTAssertEqual(value, 702);
-  XCTAssertTrue([dict getEnum:NULL forKey:34ULL]);
-  XCTAssertTrue([dict getEnum:&value forKey:34ULL]);
-  XCTAssertEqual(value, 703);
-
-  [dict setEnum:703 forKey:31ULL];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getEnum:NULL forKey:31ULL]);
-  XCTAssertTrue([dict getEnum:&value forKey:31ULL]);
-  XCTAssertEqual(value, 703);
-  XCTAssertTrue([dict getEnum:NULL forKey:32ULL]);
-  XCTAssertTrue([dict getEnum:&value forKey:32ULL]);
-  XCTAssertEqual(value, 701);
-  XCTAssertTrue([dict getEnum:NULL forKey:33ULL]);
-  XCTAssertTrue([dict getEnum:&value forKey:33ULL]);
-  XCTAssertEqual(value, 702);
-  XCTAssertTrue([dict getEnum:NULL forKey:34ULL]);
-  XCTAssertTrue([dict getEnum:&value forKey:34ULL]);
-  XCTAssertEqual(value, 703);
-
-  [dict setEnum:701 forKey:34ULL];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getEnum:NULL forKey:31ULL]);
-  XCTAssertTrue([dict getEnum:&value forKey:31ULL]);
-  XCTAssertEqual(value, 703);
-  XCTAssertTrue([dict getEnum:NULL forKey:32ULL]);
-  XCTAssertTrue([dict getEnum:&value forKey:32ULL]);
-  XCTAssertEqual(value, 701);
-  XCTAssertTrue([dict getEnum:NULL forKey:33ULL]);
-  XCTAssertTrue([dict getEnum:&value forKey:33ULL]);
-  XCTAssertEqual(value, 702);
-  XCTAssertTrue([dict getEnum:NULL forKey:34ULL]);
-  XCTAssertTrue([dict getEnum:&value forKey:34ULL]);
-  XCTAssertEqual(value, 701);
-
-  const uint64_t kKeys2[] = { 32ULL, 33ULL };
-  const int32_t kValues2[] = { 702, 700 };
-  GPBUInt64EnumDictionary *dict2 =
-      [[GPBUInt64EnumDictionary alloc] initWithEnums:kValues2
-                                             forKeys:kKeys2
-                                               count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(dict2);
-  [dict addRawEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getEnum:NULL forKey:31ULL]);
-  XCTAssertTrue([dict getEnum:&value forKey:31ULL]);
-  XCTAssertEqual(value, 703);
-  XCTAssertTrue([dict getEnum:NULL forKey:32ULL]);
-  XCTAssertTrue([dict getEnum:&value forKey:32ULL]);
-  XCTAssertEqual(value, 702);
-  XCTAssertTrue([dict getEnum:NULL forKey:33ULL]);
-  XCTAssertTrue([dict getEnum:&value forKey:33ULL]);
-  XCTAssertEqual(value, 700);
-  XCTAssertTrue([dict getEnum:NULL forKey:34ULL]);
-  XCTAssertTrue([dict getEnum:&value forKey:34ULL]);
-  XCTAssertEqual(value, 701);
-
-  [dict2 release];
-  [dict release];
-}
-
-@end
-
-#pragma mark - UInt64 -> Enum (Unknown Enums)
-
-@interface GPBUInt64EnumDictionaryUnknownEnumTests : XCTestCase
-@end
-
-@implementation GPBUInt64EnumDictionaryUnknownEnumTests
-
-- (void)testRawBasics {
-  const uint64_t kKeys[] = { 31ULL, 32ULL, 33ULL };
-  const int32_t kValues[] = { 700, 801, 702 };
-  GPBUInt64EnumDictionary *dict =
-      [[GPBUInt64EnumDictionary alloc] initWithValidationFunction:TestingEnum_IsValidValue
-                                                        rawValues:kValues
-                                                          forKeys:kKeys
-                                                            count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 3U);
-  XCTAssertTrue(dict.validationFunc == TestingEnum_IsValidValue);  // Pointer comparison
-  int32_t value;
-  XCTAssertTrue([dict getRawValue:NULL forKey:31ULL]);
-  XCTAssertTrue([dict getRawValue:&value forKey:31ULL]);
-  XCTAssertEqual(value, 700);
-  XCTAssertTrue([dict getEnum:NULL forKey:32ULL]);
-  XCTAssertTrue([dict getEnum:&value forKey:32ULL]);
-  XCTAssertEqual(value, kGPBUnrecognizedEnumeratorValue);
-  XCTAssertTrue([dict getRawValue:NULL forKey:32ULL]);
-  XCTAssertTrue([dict getRawValue:&value forKey:32ULL]);
-  XCTAssertEqual(value, 801);
-  XCTAssertTrue([dict getRawValue:NULL forKey:33ULL]);
-  XCTAssertTrue([dict getRawValue:&value forKey:33ULL]);
-  XCTAssertEqual(value, 702);
-  XCTAssertFalse([dict getRawValue:NULL forKey:34ULL]);
-
-  __block NSUInteger idx = 0;
-  uint64_t *seenKeys = malloc(3 * sizeof(uint64_t));
-  int32_t *seenValues = malloc(3 * sizeof(int32_t));
-  [dict enumerateKeysAndEnumsUsingBlock:^(uint64_t aKey, int32_t aValue, BOOL *stop) {
-    XCTAssertLessThan(idx, 3U);
-    seenKeys[idx] = aKey;
-    seenValues[idx] = aValue;
-    XCTAssertNotEqual(stop, NULL);
-    ++idx;
-  }];
-  for (int i = 0; i < 3; ++i) {
-    BOOL foundKey = NO;
-    for (int j = 0; (j < 3) && !foundKey; ++j) {
-      if (kKeys[i] == seenKeys[j]) {
-        foundKey = YES;
-        if (i == 1) {
-          XCTAssertEqual(kGPBUnrecognizedEnumeratorValue, seenValues[j], @"i = %d, j = %d", i, j);
-        } else {
-          XCTAssertEqual(kValues[i], seenValues[j], @"i = %d, j = %d", i, j);
-        }
-      }
-    }
-    XCTAssertTrue(foundKey, @"i = %d", i);
-  }
-  idx = 0;
-  [dict enumerateKeysAndRawValuesUsingBlock:^(uint64_t aKey, int32_t aValue, BOOL *stop) {
-    XCTAssertLessThan(idx, 3U);
-    seenKeys[idx] = aKey;
-    seenValues[idx] = aValue;
-    XCTAssertNotEqual(stop, NULL);
-    ++idx;
-  }];
-  for (int i = 0; i < 3; ++i) {
-    BOOL foundKey = NO;
-    for (int j = 0; (j < 3) && !foundKey; ++j) {
-      if (kKeys[i] == seenKeys[j]) {
-        foundKey = YES;
-        XCTAssertEqual(kValues[i], seenValues[j], @"i = %d, j = %d", i, j);
-      }
-    }
-    XCTAssertTrue(foundKey, @"i = %d", i);
-  }
-  free(seenKeys);
-  free(seenValues);
-
-  // Stopping the enumeration.
-  idx = 0;
-  [dict enumerateKeysAndRawValuesUsingBlock:^(uint64_t aKey, int32_t aValue, BOOL *stop) {
-    #pragma unused(aKey, aValue)
-    if (idx == 1) *stop = YES;
-    XCTAssertNotEqual(idx, 2U);
-    ++idx;
-  }];
-  [dict release];
-}
-
-- (void)testEqualityWithUnknowns {
-  const uint64_t kKeys1[] = { 31ULL, 32ULL, 33ULL, 34ULL };
-  const uint64_t kKeys2[] = { 32ULL, 31ULL, 34ULL };
-  const int32_t kValues1[] = { 700, 801, 702 };  // Unknown
-  const int32_t kValues2[] = { 700, 803, 702 };  // Unknown
-  const int32_t kValues3[] = { 700, 801, 702, 803 };  // Unknowns
-  GPBUInt64EnumDictionary *dict1 =
-      [[GPBUInt64EnumDictionary alloc] initWithValidationFunction:TestingEnum_IsValidValue
-                                                        rawValues:kValues1
-                                                          forKeys:kKeys1
-                                                            count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict1);
-  GPBUInt64EnumDictionary *dict1prime =
-      [[GPBUInt64EnumDictionary alloc] initWithValidationFunction:TestingEnum_IsValidValue
-                                                        rawValues:kValues1
-                                                          forKeys:kKeys1
-                                                            count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict1prime);
-  GPBUInt64EnumDictionary *dict2 =
-      [[GPBUInt64EnumDictionary alloc] initWithValidationFunction:TestingEnum_IsValidValue
-                                                        rawValues:kValues2
-                                                          forKeys:kKeys1
-                                                            count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(dict2);
-  GPBUInt64EnumDictionary *dict3 =
-      [[GPBUInt64EnumDictionary alloc] initWithValidationFunction:TestingEnum_IsValidValue
-                                                        rawValues:kValues1
-                                                          forKeys:kKeys2
-                                                            count:GPBARRAYSIZE(kValues1)];
-  XCTAssertNotNil(dict3);
-  GPBUInt64EnumDictionary *dict4 =
-      [[GPBUInt64EnumDictionary alloc] initWithValidationFunction:TestingEnum_IsValidValue
-                                                        rawValues:kValues3
-                                                          forKeys:kKeys1
-                                                            count:GPBARRAYSIZE(kValues3)];
-  XCTAssertNotNil(dict4);
-
-  // 1/1Prime should be different objects, but equal.
-  XCTAssertNotEqual(dict1, dict1prime);
-  XCTAssertEqualObjects(dict1, dict1prime);
-  // Equal, so they must have same hash.
-  XCTAssertEqual([dict1 hash], [dict1prime hash]);
-
-  // 2 is same keys, different values; not equal.
-  XCTAssertNotEqualObjects(dict1, dict2);
-
-  // 3 is different keys, same values; not equal.
-  XCTAssertNotEqualObjects(dict1, dict3);
-
-  // 4 extra pair; not equal
-  XCTAssertNotEqualObjects(dict1, dict4);
-
-  [dict1 release];
-  [dict1prime release];
-  [dict2 release];
-  [dict3 release];
-  [dict4 release];
-}
-
-- (void)testCopyWithUnknowns {
-  const uint64_t kKeys[] = { 31ULL, 32ULL, 33ULL, 34ULL };
-  const int32_t kValues[] = { 700, 801, 702, 803 };  // Unknown
-  GPBUInt64EnumDictionary *dict =
-      [[GPBUInt64EnumDictionary alloc] initWithValidationFunction:TestingEnum_IsValidValue
-                                                        rawValues:kValues
-                                                          forKeys:kKeys
-                                                            count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-
-  GPBUInt64EnumDictionary *dict2 = [dict copy];
-  XCTAssertNotNil(dict2);
-
-  // Should be new pointer, but equal objects.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqual(dict.validationFunc, dict2.validationFunc);  // Pointer comparison
-  XCTAssertEqualObjects(dict, dict2);
-
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testDictionaryFromDictionary {
-  const uint64_t kKeys[] = { 31ULL, 32ULL, 33ULL, 34ULL };
-  const int32_t kValues[] = { 700, 801, 702, 803 };  // Unknowns
-  GPBUInt64EnumDictionary *dict =
-      [[GPBUInt64EnumDictionary alloc] initWithValidationFunction:TestingEnum_IsValidValue
-                                                        rawValues:kValues
-                                                          forKeys:kKeys
-                                                            count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-
-  GPBUInt64EnumDictionary *dict2 =
-      [[GPBUInt64EnumDictionary alloc] initWithDictionary:dict];
-  XCTAssertNotNil(dict2);
-
-  // Should be new pointer, but equal objects.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  XCTAssertEqual(dict.validationFunc, dict2.validationFunc);  // Pointer comparison
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testUnknownAdds {
-  GPBUInt64EnumDictionary *dict =
-      [[GPBUInt64EnumDictionary alloc] initWithValidationFunction:TestingEnum_IsValidValue];
-  XCTAssertNotNil(dict);
-
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertThrowsSpecificNamed([dict setEnum:801 forKey:32ULL],  // Unknown
-                               NSException, NSInvalidArgumentException);
-  XCTAssertEqual(dict.count, 0U);
-  [dict setRawValue:801 forKey:32ULL];  // Unknown
-  XCTAssertEqual(dict.count, 1U);
-
-  const uint64_t kKeys[] = { 31ULL, 33ULL, 34ULL };
-  const int32_t kValues[] = { 700, 702, 803 };  // Unknown
-  GPBUInt64EnumDictionary *dict2 =
-      [[GPBUInt64EnumDictionary alloc] initWithEnums:kValues
-                                               forKeys:kKeys
-                                                 count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict2);
-  [dict addRawEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 4U);
-
-  int32_t value;
-  XCTAssertTrue([dict getEnum:NULL forKey:31ULL]);
-  XCTAssertTrue([dict getEnum:&value forKey:31ULL]);
-  XCTAssertEqual(value, 700);
-  XCTAssertTrue([dict getEnum:NULL forKey:32ULL]);
-  XCTAssertTrue([dict getEnum:&value forKey:32ULL]);
-  XCTAssertEqual(value, kGPBUnrecognizedEnumeratorValue);
-  XCTAssertTrue([dict getRawValue:NULL forKey:32ULL]);
-  XCTAssertTrue([dict getRawValue:&value forKey:32ULL]);
-  XCTAssertEqual(value, 801);
-  XCTAssertTrue([dict getEnum:NULL forKey:33ULL]);
-  XCTAssertTrue([dict getEnum:&value forKey:33ULL]);
-  XCTAssertEqual(value, 702);
-  XCTAssertTrue([dict getEnum:NULL forKey:34ULL]);
-  XCTAssertTrue([dict getEnum:&value forKey:34ULL]);
-  XCTAssertEqual(value, kGPBUnrecognizedEnumeratorValue);
-  XCTAssertTrue([dict getRawValue:NULL forKey:34ULL]);
-  XCTAssertTrue([dict getRawValue:&value forKey:34ULL]);
-  XCTAssertEqual(value, 803);
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testUnknownRemove {
-  const uint64_t kKeys[] = { 31ULL, 32ULL, 33ULL, 34ULL };
-  const int32_t kValues[] = { 700, 801, 702, 803 };  // Unknowns
-  GPBUInt64EnumDictionary *dict =
-      [[GPBUInt64EnumDictionary alloc] initWithValidationFunction:TestingEnum_IsValidValue
-                                                        rawValues:kValues
-                                                          forKeys:kKeys
-                                                            count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 4U);
-
-  [dict removeEnumForKey:32ULL];
-  XCTAssertEqual(dict.count, 3U);
-  int32_t value;
-  XCTAssertTrue([dict getEnum:NULL forKey:31ULL]);
-  XCTAssertTrue([dict getEnum:&value forKey:31ULL]);
-  XCTAssertEqual(value, 700);
-  XCTAssertFalse([dict getEnum:NULL forKey:32ULL]);
-  XCTAssertTrue([dict getEnum:NULL forKey:33ULL]);
-  XCTAssertTrue([dict getEnum:&value forKey:33ULL]);
-  XCTAssertEqual(value, 702);
-  XCTAssertTrue([dict getRawValue:NULL forKey:34ULL]);
-  XCTAssertTrue([dict getRawValue:&value forKey:34ULL]);
-  XCTAssertEqual(value, 803);
-
-  // Remove again does nothing.
-  [dict removeEnumForKey:32ULL];
-  XCTAssertEqual(dict.count, 3U);
-  XCTAssertTrue([dict getEnum:NULL forKey:31ULL]);
-  XCTAssertTrue([dict getEnum:&value forKey:31ULL]);
-  XCTAssertEqual(value, 700);
-  XCTAssertFalse([dict getEnum:NULL forKey:32ULL]);
-  XCTAssertTrue([dict getEnum:NULL forKey:33ULL]);
-  XCTAssertTrue([dict getEnum:&value forKey:33ULL]);
-  XCTAssertEqual(value, 702);
-  XCTAssertTrue([dict getRawValue:NULL forKey:34ULL]);
-  XCTAssertTrue([dict getRawValue:&value forKey:34ULL]);
-  XCTAssertEqual(value, 803);
-
-  [dict removeEnumForKey:34ULL];
-  XCTAssertEqual(dict.count, 2U);
-  XCTAssertTrue([dict getEnum:NULL forKey:31ULL]);
-  XCTAssertTrue([dict getEnum:&value forKey:31ULL]);
-  XCTAssertEqual(value, 700);
-  XCTAssertFalse([dict getEnum:NULL forKey:32ULL]);
-  XCTAssertTrue([dict getEnum:NULL forKey:33ULL]);
-  XCTAssertTrue([dict getEnum:&value forKey:33ULL]);
-  XCTAssertEqual(value, 702);
-  XCTAssertFalse([dict getEnum:NULL forKey:34ULL]);
-
-  [dict removeAll];
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertFalse([dict getEnum:NULL forKey:31ULL]);
-  XCTAssertFalse([dict getEnum:NULL forKey:32ULL]);
-  XCTAssertFalse([dict getEnum:NULL forKey:33ULL]);
-  XCTAssertFalse([dict getEnum:NULL forKey:34ULL]);
-  [dict release];
-}
-
-- (void)testInplaceMutationUnknowns {
-  const uint64_t kKeys[] = { 31ULL, 32ULL, 33ULL, 34ULL };
-  const int32_t kValues[] = { 700, 801, 702, 803 };  // Unknowns
-  GPBUInt64EnumDictionary *dict =
-      [[GPBUInt64EnumDictionary alloc] initWithValidationFunction:TestingEnum_IsValidValue
-                                                        rawValues:kValues
-                                                          forKeys:kKeys
-                                                            count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 4U);
-  int32_t value;
-  XCTAssertTrue([dict getEnum:NULL forKey:31ULL]);
-  XCTAssertTrue([dict getEnum:&value forKey:31ULL]);
-  XCTAssertEqual(value, 700);
-  XCTAssertTrue([dict getRawValue:NULL forKey:32ULL]);
-  XCTAssertTrue([dict getRawValue:&value forKey:32ULL]);
-  XCTAssertEqual(value, 801);
-  XCTAssertTrue([dict getEnum:NULL forKey:33ULL]);
-  XCTAssertTrue([dict getEnum:&value forKey:33ULL]);
-  XCTAssertEqual(value, 702);
-  XCTAssertTrue([dict getRawValue:NULL forKey:34ULL]);
-  XCTAssertTrue([dict getRawValue:&value forKey:34ULL]);
-  XCTAssertEqual(value, 803);
-
-  XCTAssertThrowsSpecificNamed([dict setEnum:803 forKey:31ULL],  // Unknown
-                               NSException, NSInvalidArgumentException);
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getEnum:NULL forKey:31ULL]);
-  XCTAssertTrue([dict getEnum:&value forKey:31ULL]);
-  XCTAssertEqual(value, 700);
-  XCTAssertTrue([dict getRawValue:NULL forKey:32ULL]);
-  XCTAssertTrue([dict getRawValue:&value forKey:32ULL]);
-  XCTAssertEqual(value, 801);
-  XCTAssertTrue([dict getEnum:NULL forKey:33ULL]);
-  XCTAssertTrue([dict getEnum:&value forKey:33ULL]);
-  XCTAssertEqual(value, 702);
-  XCTAssertTrue([dict getRawValue:NULL forKey:34ULL]);
-  XCTAssertTrue([dict getRawValue:&value forKey:34ULL]);
-  XCTAssertEqual(value, 803);
-
-  [dict setRawValue:803 forKey:31ULL];  // Unknown
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getRawValue:NULL forKey:31ULL]);
-  XCTAssertTrue([dict getRawValue:&value forKey:31ULL]);
-  XCTAssertEqual(value, 803);
-  XCTAssertTrue([dict getRawValue:NULL forKey:32ULL]);
-  XCTAssertTrue([dict getRawValue:&value forKey:32ULL]);
-  XCTAssertEqual(value, 801);
-  XCTAssertTrue([dict getEnum:NULL forKey:33ULL]);
-  XCTAssertTrue([dict getEnum:&value forKey:33ULL]);
-  XCTAssertEqual(value, 702);
-  XCTAssertTrue([dict getRawValue:NULL forKey:34ULL]);
-  XCTAssertTrue([dict getRawValue:&value forKey:34ULL]);
-  XCTAssertEqual(value, 803);
-
-  [dict setRawValue:700 forKey:34ULL];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getRawValue:NULL forKey:31ULL]);
-  XCTAssertTrue([dict getRawValue:&value forKey:31ULL]);
-  XCTAssertEqual(value, 803);
-  XCTAssertTrue([dict getRawValue:NULL forKey:32ULL]);
-  XCTAssertTrue([dict getRawValue:&value forKey:32ULL]);
-  XCTAssertEqual(value, 801);
-  XCTAssertTrue([dict getEnum:NULL forKey:33ULL]);
-  XCTAssertTrue([dict getEnum:&value forKey:33ULL]);
-  XCTAssertEqual(value, 702);
-  XCTAssertTrue([dict getEnum:NULL forKey:34ULL]);
-  XCTAssertTrue([dict getEnum:&value forKey:34ULL]);
-  XCTAssertEqual(value, 700);
-
-  const uint64_t kKeys2[] = { 32ULL, 33ULL };
-  const int32_t kValues2[] = { 702, 801 };  // Unknown
-  GPBUInt64EnumDictionary *dict2 =
-      [[GPBUInt64EnumDictionary alloc] initWithValidationFunction:TestingEnum_IsValidValue
-                                                        rawValues:kValues2
-                                                          forKeys:kKeys2
-                                                            count:GPBARRAYSIZE(kValues2)];
-  XCTAssertNotNil(dict2);
-  [dict addRawEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertTrue([dict getRawValue:NULL forKey:31ULL]);
-  XCTAssertTrue([dict getRawValue:&value forKey:31ULL]);
-  XCTAssertEqual(value, 803);
-  XCTAssertTrue([dict getEnum:NULL forKey:32ULL]);
-  XCTAssertTrue([dict getEnum:&value forKey:32ULL]);
-  XCTAssertEqual(value, 702);
-  XCTAssertTrue([dict getRawValue:NULL forKey:33ULL]);
-  XCTAssertTrue([dict getRawValue:&value forKey:33ULL]);
-  XCTAssertEqual(value, 801);
-  XCTAssertTrue([dict getEnum:NULL forKey:34ULL]);
-  XCTAssertTrue([dict getEnum:&value forKey:34ULL]);
-  XCTAssertEqual(value, 700);
-
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testCopyUnknowns {
-  const uint64_t kKeys[] = { 31ULL, 32ULL, 33ULL, 34ULL };
-  const int32_t kValues[] = { 700, 801, 702, 803 };
-  GPBUInt64EnumDictionary *dict =
-      [[GPBUInt64EnumDictionary alloc] initWithValidationFunction:TestingEnum_IsValidValue
-                                                        rawValues:kValues
-                                                          forKeys:kKeys
-                                                            count:GPBARRAYSIZE(kValues)];
-  XCTAssertNotNil(dict);
-
-  GPBUInt64EnumDictionary *dict2 = [dict copy];
-  XCTAssertNotNil(dict2);
-
-  // Should be new pointer, but equal objects.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  XCTAssertEqual(dict.validationFunc, dict2.validationFunc);  // Pointer comparison
-  XCTAssertTrue([dict2 isKindOfClass:[GPBUInt64EnumDictionary class]]);
-
-  [dict2 release];
-  [dict release];
-}
-
-@end
-
-#pragma mark - UInt64 -> Object
-
-@interface GPBUInt64ObjectDictionaryTests : XCTestCase
-@end
-
-@implementation GPBUInt64ObjectDictionaryTests
-
-- (void)testEmpty {
-  GPBUInt64ObjectDictionary<NSString*> *dict = [[GPBUInt64ObjectDictionary alloc] init];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertNil([dict objectForKey:31ULL]);
-  [dict enumerateKeysAndObjectsUsingBlock:^(uint64_t aKey, NSString* aObject, BOOL *stop) {
-    #pragma unused(aKey, aObject, stop)
-    XCTFail(@"Shouldn't get here!");
-  }];
-  [dict release];
-}
-
-- (void)testOne {
-  GPBUInt64ObjectDictionary<NSString*> *dict = [[GPBUInt64ObjectDictionary alloc] init];
-  [dict setObject:@"abc" forKey:31ULL];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 1U);
-  XCTAssertEqualObjects([dict objectForKey:31ULL], @"abc");
-  XCTAssertNil([dict objectForKey:32ULL]);
-  [dict enumerateKeysAndObjectsUsingBlock:^(uint64_t aKey, NSString* aObject, BOOL *stop) {
-    XCTAssertEqual(aKey, 31ULL);
-    XCTAssertEqualObjects(aObject, @"abc");
-    XCTAssertNotEqual(stop, NULL);
-  }];
-  [dict release];
-}
-
-- (void)testBasics {
-  const uint64_t kKeys[] = { 31ULL, 32ULL, 33ULL };
-  const NSString* kObjects[] = { @"abc", @"def", @"ghi" };
-  GPBUInt64ObjectDictionary<NSString*> *dict =
-      [[GPBUInt64ObjectDictionary alloc] initWithObjects:kObjects
-                                                 forKeys:kKeys
-                                                   count:GPBARRAYSIZE(kObjects)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 3U);
-  XCTAssertEqualObjects([dict objectForKey:31ULL], @"abc");
-  XCTAssertEqualObjects([dict objectForKey:32ULL], @"def");
-  XCTAssertEqualObjects([dict objectForKey:33ULL], @"ghi");
-  XCTAssertNil([dict objectForKey:34ULL]);
-
-  __block NSUInteger idx = 0;
-  uint64_t *seenKeys = malloc(3 * sizeof(uint64_t));
-  NSString* *seenObjects = malloc(3 * sizeof(NSString*));
-  [dict enumerateKeysAndObjectsUsingBlock:^(uint64_t aKey, NSString* aObject, BOOL *stop) {
-    XCTAssertLessThan(idx, 3U);
-    seenKeys[idx] = aKey;
-    seenObjects[idx] = aObject;
-    XCTAssertNotEqual(stop, NULL);
-    ++idx;
-  }];
-  for (int i = 0; i < 3; ++i) {
-    BOOL foundKey = NO;
-    for (int j = 0; (j < 3) && !foundKey; ++j) {
-      if (kKeys[i] == seenKeys[j]) {
-        foundKey = YES;
-        XCTAssertEqualObjects(kObjects[i], seenObjects[j], @"i = %d, j = %d", i, j);
-      }
-    }
-    XCTAssertTrue(foundKey, @"i = %d", i);
-  }
-  free(seenKeys);
-  free(seenObjects);
-
-  // Stopping the enumeration.
-  idx = 0;
-  [dict enumerateKeysAndObjectsUsingBlock:^(uint64_t aKey, NSString* aObject, BOOL *stop) {
-    #pragma unused(aKey, aObject)
-    if (idx == 1) *stop = YES;
-    XCTAssertNotEqual(idx, 2U);
-    ++idx;
-  }];
-  [dict release];
-}
-
-- (void)testEquality {
-  const uint64_t kKeys1[] = { 31ULL, 32ULL, 33ULL, 34ULL };
-  const uint64_t kKeys2[] = { 32ULL, 31ULL, 34ULL };
-  const NSString* kObjects1[] = { @"abc", @"def", @"ghi" };
-  const NSString* kObjects2[] = { @"abc", @"jkl", @"ghi" };
-  const NSString* kObjects3[] = { @"abc", @"def", @"ghi", @"jkl" };
-  GPBUInt64ObjectDictionary<NSString*> *dict1 =
-      [[GPBUInt64ObjectDictionary alloc] initWithObjects:kObjects1
-                                                 forKeys:kKeys1
-                                                   count:GPBARRAYSIZE(kObjects1)];
-  XCTAssertNotNil(dict1);
-  GPBUInt64ObjectDictionary<NSString*> *dict1prime =
-      [[GPBUInt64ObjectDictionary alloc] initWithObjects:kObjects1
-                                                 forKeys:kKeys1
-                                                   count:GPBARRAYSIZE(kObjects1)];
-  XCTAssertNotNil(dict1prime);
-  GPBUInt64ObjectDictionary<NSString*> *dict2 =
-      [[GPBUInt64ObjectDictionary alloc] initWithObjects:kObjects2
-                                                 forKeys:kKeys1
-                                                   count:GPBARRAYSIZE(kObjects2)];
-  XCTAssertNotNil(dict2);
-  GPBUInt64ObjectDictionary<NSString*> *dict3 =
-      [[GPBUInt64ObjectDictionary alloc] initWithObjects:kObjects1
-                                                 forKeys:kKeys2
-                                                   count:GPBARRAYSIZE(kObjects1)];
-  XCTAssertNotNil(dict3);
-  GPBUInt64ObjectDictionary<NSString*> *dict4 =
-      [[GPBUInt64ObjectDictionary alloc] initWithObjects:kObjects3
-                                                 forKeys:kKeys1
-                                                   count:GPBARRAYSIZE(kObjects3)];
-  XCTAssertNotNil(dict4);
-
-  // 1/1Prime should be different objects, but equal.
-  XCTAssertNotEqual(dict1, dict1prime);
-  XCTAssertEqualObjects(dict1, dict1prime);
-  // Equal, so they must have same hash.
-  XCTAssertEqual([dict1 hash], [dict1prime hash]);
-
-  // 2 is same keys, different objects; not equal.
-  XCTAssertNotEqualObjects(dict1, dict2);
-
-  // 3 is different keys, same objects; not equal.
-  XCTAssertNotEqualObjects(dict1, dict3);
-
-  // 4 extra pair; not equal
-  XCTAssertNotEqualObjects(dict1, dict4);
-
-  [dict1 release];
-  [dict1prime release];
-  [dict2 release];
-  [dict3 release];
-  [dict4 release];
-}
-
-- (void)testCopy {
-  const uint64_t kKeys[] = { 31ULL, 32ULL, 33ULL, 34ULL };
-  const NSString* kObjects[] = { @"abc", @"def", @"ghi", @"jkl" };
-  GPBUInt64ObjectDictionary<NSString*> *dict =
-      [[GPBUInt64ObjectDictionary alloc] initWithObjects:kObjects
-                                                 forKeys:kKeys
-                                                   count:GPBARRAYSIZE(kObjects)];
-  XCTAssertNotNil(dict);
-
-  GPBUInt64ObjectDictionary<NSString*> *dict2 = [dict copy];
-  XCTAssertNotNil(dict2);
-
-  // Should be new object but equal.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  XCTAssertTrue([dict2 isKindOfClass:[GPBUInt64ObjectDictionary class]]);
-
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testDictionaryFromDictionary {
-  const uint64_t kKeys[] = { 31ULL, 32ULL, 33ULL, 34ULL };
-  const NSString* kObjects[] = { @"abc", @"def", @"ghi", @"jkl" };
-  GPBUInt64ObjectDictionary<NSString*> *dict =
-      [[GPBUInt64ObjectDictionary alloc] initWithObjects:kObjects
-                                                 forKeys:kKeys
-                                                   count:GPBARRAYSIZE(kObjects)];
-  XCTAssertNotNil(dict);
-
-  GPBUInt64ObjectDictionary<NSString*> *dict2 =
-      [[GPBUInt64ObjectDictionary alloc] initWithDictionary:dict];
-  XCTAssertNotNil(dict2);
-
-  // Should be new pointer, but equal objects.
-  XCTAssertNotEqual(dict, dict2);
-  XCTAssertEqualObjects(dict, dict2);
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testAdds {
-  GPBUInt64ObjectDictionary<NSString*> *dict = [[GPBUInt64ObjectDictionary alloc] init];
-  XCTAssertNotNil(dict);
-
-  XCTAssertEqual(dict.count, 0U);
-  [dict setObject:@"abc" forKey:31ULL];
-  XCTAssertEqual(dict.count, 1U);
-
-  const uint64_t kKeys[] = { 32ULL, 33ULL, 34ULL };
-  const NSString* kObjects[] = { @"def", @"ghi", @"jkl" };
-  GPBUInt64ObjectDictionary<NSString*> *dict2 =
-      [[GPBUInt64ObjectDictionary alloc] initWithObjects:kObjects
-                                                 forKeys:kKeys
-                                                   count:GPBARRAYSIZE(kObjects)];
-  XCTAssertNotNil(dict2);
-  [dict addEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 4U);
-
-  XCTAssertEqualObjects([dict objectForKey:31ULL], @"abc");
-  XCTAssertEqualObjects([dict objectForKey:32ULL], @"def");
-  XCTAssertEqualObjects([dict objectForKey:33ULL], @"ghi");
-  XCTAssertEqualObjects([dict objectForKey:34ULL], @"jkl");
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testRemove {
-  const uint64_t kKeys[] = { 31ULL, 32ULL, 33ULL, 34ULL };
-  const NSString* kObjects[] = { @"abc", @"def", @"ghi", @"jkl" };
-  GPBUInt64ObjectDictionary<NSString*> *dict =
-      [[GPBUInt64ObjectDictionary alloc] initWithObjects:kObjects
-                                                 forKeys:kKeys
-                                                   count:GPBARRAYSIZE(kObjects)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 4U);
-
-  [dict removeObjectForKey:32ULL];
-  XCTAssertEqual(dict.count, 3U);
-  XCTAssertEqualObjects([dict objectForKey:31ULL], @"abc");
-  XCTAssertNil([dict objectForKey:32ULL]);
-  XCTAssertEqualObjects([dict objectForKey:33ULL], @"ghi");
-  XCTAssertEqualObjects([dict objectForKey:34ULL], @"jkl");
-
-  // Remove again does nothing.
-  [dict removeObjectForKey:32ULL];
-  XCTAssertEqual(dict.count, 3U);
-  XCTAssertEqualObjects([dict objectForKey:31ULL], @"abc");
-  XCTAssertNil([dict objectForKey:32ULL]);
-  XCTAssertEqualObjects([dict objectForKey:33ULL], @"ghi");
-  XCTAssertEqualObjects([dict objectForKey:34ULL], @"jkl");
-
-  [dict removeObjectForKey:34ULL];
-  XCTAssertEqual(dict.count, 2U);
-  XCTAssertEqualObjects([dict objectForKey:31ULL], @"abc");
-  XCTAssertNil([dict objectForKey:32ULL]);
-  XCTAssertEqualObjects([dict objectForKey:33ULL], @"ghi");
-  XCTAssertNil([dict objectForKey:34ULL]);
-
-  [dict removeAll];
-  XCTAssertEqual(dict.count, 0U);
-  XCTAssertNil([dict objectForKey:31ULL]);
-  XCTAssertNil([dict objectForKey:32ULL]);
-  XCTAssertNil([dict objectForKey:33ULL]);
-  XCTAssertNil([dict objectForKey:34ULL]);
-  [dict release];
-}
-
-- (void)testInplaceMutation {
-  const uint64_t kKeys[] = { 31ULL, 32ULL, 33ULL, 34ULL };
-  const NSString* kObjects[] = { @"abc", @"def", @"ghi", @"jkl" };
-  GPBUInt64ObjectDictionary<NSString*> *dict =
-      [[GPBUInt64ObjectDictionary alloc] initWithObjects:kObjects
-                                                 forKeys:kKeys
-                                                   count:GPBARRAYSIZE(kObjects)];
-  XCTAssertNotNil(dict);
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertEqualObjects([dict objectForKey:31ULL], @"abc");
-  XCTAssertEqualObjects([dict objectForKey:32ULL], @"def");
-  XCTAssertEqualObjects([dict objectForKey:33ULL], @"ghi");
-  XCTAssertEqualObjects([dict objectForKey:34ULL], @"jkl");
-
-  [dict setObject:@"jkl" forKey:31ULL];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertEqualObjects([dict objectForKey:31ULL], @"jkl");
-  XCTAssertEqualObjects([dict objectForKey:32ULL], @"def");
-  XCTAssertEqualObjects([dict objectForKey:33ULL], @"ghi");
-  XCTAssertEqualObjects([dict objectForKey:34ULL], @"jkl");
-
-  [dict setObject:@"def" forKey:34ULL];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertEqualObjects([dict objectForKey:31ULL], @"jkl");
-  XCTAssertEqualObjects([dict objectForKey:32ULL], @"def");
-  XCTAssertEqualObjects([dict objectForKey:33ULL], @"ghi");
-  XCTAssertEqualObjects([dict objectForKey:34ULL], @"def");
-
-  const uint64_t kKeys2[] = { 32ULL, 33ULL };
-  const NSString* kObjects2[] = { @"ghi", @"abc" };
-  GPBUInt64ObjectDictionary<NSString*> *dict2 =
-      [[GPBUInt64ObjectDictionary alloc] initWithObjects:kObjects2
-                                                 forKeys:kKeys2
-                                                   count:GPBARRAYSIZE(kObjects2)];
-  XCTAssertNotNil(dict2);
-  [dict addEntriesFromDictionary:dict2];
-  XCTAssertEqual(dict.count, 4U);
-  XCTAssertEqualObjects([dict objectForKey:31ULL], @"jkl");
-  XCTAssertEqualObjects([dict objectForKey:32ULL], @"ghi");
-  XCTAssertEqualObjects([dict objectForKey:33ULL], @"abc");
-  XCTAssertEqualObjects([dict objectForKey:34ULL], @"def");
-
-  [dict2 release];
-  [dict release];
-}
-
-@end
-
-// clang-format on
-//%PDDM-EXPAND-END TEST_FOR_POD_KEY(UInt64, uint64_t, 31ULL, 32ULL, 33ULL, 34ULL)
diff --git a/libs/protobuf/objectivec/Tests/GPBDictionaryTests.m b/libs/protobuf/objectivec/Tests/GPBDictionaryTests.m
deleted file mode 100644
index 52b4b32..0000000
--- a/libs/protobuf/objectivec/Tests/GPBDictionaryTests.m
+++ /dev/null
@@ -1,186 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2017 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#import <Foundation/Foundation.h>
-#import <XCTest/XCTest.h>
-
-#import "GPBDictionary.h"
-#import "GPBDictionary_PackagePrivate.h"
-
-#import "GPBTestUtilities.h"
-
-#pragma mark - GPBAutocreatedDictionary Tests
-
-// These are hand written tests to double check some behaviors of the
-// GPBAutocreatedDictionary.  The GPBDictionary+[type]Tests files are generate
-// tests.
-
-// NOTE: GPBAutocreatedDictionary is private to the library, users of the
-// library should never have to directly deal with this class.
-
-@interface GPBAutocreatedDictionaryTests : XCTestCase
-@end
-
-@implementation GPBAutocreatedDictionaryTests
-
-- (void)testEquality {
-  GPBAutocreatedDictionary *dict = [[GPBAutocreatedDictionary alloc] init];
-
-  XCTAssertTrue([dict isEqual:@{}]);
-  XCTAssertTrue([dict isEqualToDictionary:@{}]);
-
-  XCTAssertFalse([dict isEqual:@{ @"foo" : @"bar" }]);
-  XCTAssertFalse([dict isEqualToDictionary:@{ @"foo" : @"bar" }]);
-
-  [dict setObject:@"bar" forKey:@"foo"];
-
-  XCTAssertFalse([dict isEqual:@{}]);
-  XCTAssertFalse([dict isEqualToDictionary:@{}]);
-  XCTAssertTrue([dict isEqual:@{ @"foo" : @"bar" }]);
-  XCTAssertTrue([dict isEqualToDictionary:@{ @"foo" : @"bar" }]);
-  XCTAssertFalse([dict isEqual:@{ @"bar" : @"baz" }]);
-  XCTAssertFalse([dict isEqualToDictionary:@{ @"bar" : @"baz" }]);
-
-  GPBAutocreatedDictionary *dict2 = [[GPBAutocreatedDictionary alloc] init];
-
-  XCTAssertFalse([dict isEqual:dict2]);
-  XCTAssertFalse([dict isEqualToDictionary:dict2]);
-
-  [dict2 setObject:@"mumble" forKey:@"foo"];
-  XCTAssertFalse([dict isEqual:dict2]);
-  XCTAssertFalse([dict isEqualToDictionary:dict2]);
-
-  [dict2 setObject:@"bar" forKey:@"foo"];
-  XCTAssertTrue([dict isEqual:dict2]);
-  XCTAssertTrue([dict isEqualToDictionary:dict2]);
-
-  [dict2 release];
-  [dict release];
-}
-
-- (void)testCopy {
-  {
-    GPBAutocreatedDictionary *dict = [[GPBAutocreatedDictionary alloc] init];
-
-    NSDictionary *cpy = [dict copy];
-    XCTAssertTrue(cpy != dict); // Ptr compare
-    XCTAssertTrue([cpy isKindOfClass:[NSDictionary class]]);
-    XCTAssertFalse([cpy isKindOfClass:[GPBAutocreatedDictionary class]]);
-    XCTAssertEqual(cpy.count, (NSUInteger)0);
-
-    NSDictionary *cpy2 = [dict copy];
-    XCTAssertTrue(cpy2 != dict); // Ptr compare
-    XCTAssertTrue(cpy2 != cpy); // Ptr compare
-    XCTAssertTrue([cpy2 isKindOfClass:[NSDictionary class]]);
-    XCTAssertFalse([cpy2 isKindOfClass:[GPBAutocreatedDictionary class]]);
-    XCTAssertEqual(cpy2.count, (NSUInteger)0);
-
-    [cpy2 release];
-    [cpy release];
-    [dict release];
-  }
-
-  {
-    GPBAutocreatedDictionary *dict = [[GPBAutocreatedDictionary alloc] init];
-
-    NSMutableDictionary *cpy = [dict mutableCopy];
-    XCTAssertTrue(cpy != dict); // Ptr compare
-    XCTAssertTrue([cpy isKindOfClass:[NSMutableDictionary class]]);
-    XCTAssertFalse([cpy isKindOfClass:[GPBAutocreatedDictionary class]]);
-    XCTAssertEqual(cpy.count, (NSUInteger)0);
-
-    NSMutableDictionary *cpy2 = [dict mutableCopy];
-    XCTAssertTrue(cpy2 != dict); // Ptr compare
-    XCTAssertTrue(cpy2 != cpy); // Ptr compare
-    XCTAssertTrue([cpy2 isKindOfClass:[NSMutableDictionary class]]);
-    XCTAssertFalse([cpy2 isKindOfClass:[GPBAutocreatedDictionary class]]);
-    XCTAssertEqual(cpy2.count, (NSUInteger)0);
-
-    [cpy2 release];
-    [cpy release];
-    [dict release];
-  }
-
-  {
-    GPBAutocreatedDictionary *dict = [[GPBAutocreatedDictionary alloc] init];
-    dict[@"foo"] = @"bar";
-    dict[@"baz"] = @"mumble";
-
-    NSDictionary *cpy = [dict copy];
-    XCTAssertTrue(cpy != dict); // Ptr compare
-    XCTAssertTrue([cpy isKindOfClass:[NSDictionary class]]);
-    XCTAssertFalse([cpy isKindOfClass:[GPBAutocreatedDictionary class]]);
-    XCTAssertEqual(cpy.count, (NSUInteger)2);
-    XCTAssertEqualObjects(cpy[@"foo"], @"bar");
-    XCTAssertEqualObjects(cpy[@"baz"], @"mumble");
-
-    NSDictionary *cpy2 = [dict copy];
-    XCTAssertTrue(cpy2 != dict); // Ptr compare
-    XCTAssertTrue(cpy2 != cpy); // Ptr compare
-    XCTAssertTrue([cpy2 isKindOfClass:[NSDictionary class]]);
-    XCTAssertFalse([cpy2 isKindOfClass:[GPBAutocreatedDictionary class]]);
-    XCTAssertEqual(cpy2.count, (NSUInteger)2);
-    XCTAssertEqualObjects(cpy2[@"foo"], @"bar");
-    XCTAssertEqualObjects(cpy2[@"baz"], @"mumble");
-
-    [cpy2 release];
-    [cpy release];
-    [dict release];
-  }
-
-  {
-    GPBAutocreatedDictionary *dict = [[GPBAutocreatedDictionary alloc] init];
-    dict[@"foo"] = @"bar";
-    dict[@"baz"] = @"mumble";
-
-    NSMutableDictionary *cpy = [dict mutableCopy];
-    XCTAssertTrue(cpy != dict); // Ptr compare
-    XCTAssertTrue([cpy isKindOfClass:[NSMutableDictionary class]]);
-    XCTAssertFalse([cpy isKindOfClass:[GPBAutocreatedDictionary class]]);
-    XCTAssertEqual(cpy.count, (NSUInteger)2);
-    XCTAssertEqualObjects(cpy[@"foo"], @"bar");
-    XCTAssertEqualObjects(cpy[@"baz"], @"mumble");
-
-    NSMutableDictionary *cpy2 = [dict mutableCopy];
-    XCTAssertTrue(cpy2 != dict); // Ptr compare
-    XCTAssertTrue(cpy2 != cpy); // Ptr compare
-    XCTAssertTrue([cpy2 isKindOfClass:[NSMutableDictionary class]]);
-    XCTAssertFalse([cpy2 isKindOfClass:[GPBAutocreatedDictionary class]]);
-    XCTAssertEqual(cpy2.count, (NSUInteger)2);
-    XCTAssertEqualObjects(cpy2[@"foo"], @"bar");
-    XCTAssertEqualObjects(cpy2[@"baz"], @"mumble");
-
-    [cpy2 release];
-    [cpy release];
-    [dict release];
-  }
-}
-
-@end
diff --git a/libs/protobuf/objectivec/Tests/GPBDictionaryTests.pddm b/libs/protobuf/objectivec/Tests/GPBDictionaryTests.pddm
deleted file mode 100644
index 17f12c2..0000000
--- a/libs/protobuf/objectivec/Tests/GPBDictionaryTests.pddm
+++ /dev/null
@@ -1,1048 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-//%PDDM-DEFINE TEST_FOR_POD_KEY(KEY_NAME, KEY_TYPE, KEY1, KEY2, KEY3, KEY4)
-//%TESTS_FOR_POD_VALUES(KEY_NAME, KEY_TYPE, , , KEY1, KEY2, KEY3, KEY4)
-//%TESTS_FOR_POD_KEY_OBJECT_VALUE(KEY_NAME, KEY_TYPE, KEY1, KEY2, KEY3, KEY4, Object, NSString*, @"abc", @"def", @"ghi", @"jkl")
-
-//%PDDM-DEFINE TESTS_FOR_POD_VALUES(KEY_NAME, KEY_TYPE, KisP, KSUFFIX, KEY1, KEY2, KEY3, KEY4)
-//%TEST_HELPERS(KEY_NAME, KEY_TYPE, KisP)
-//%TESTS_FOR_POD_VALUE(KEY_NAME, KEY_TYPE, KisP, KSUFFIX, KEY1, KEY2, KEY3, KEY4, UInt32, uint32_t, , 100U, 101U, 102U, 103U)
-//%TESTS_FOR_POD_VALUE(KEY_NAME, KEY_TYPE, KisP, KSUFFIX, KEY1, KEY2, KEY3, KEY4, Int32, int32_t, , 200, 201, 202, 203)
-//%TESTS_FOR_POD_VALUE(KEY_NAME, KEY_TYPE, KisP, KSUFFIX, KEY1, KEY2, KEY3, KEY4, UInt64, uint64_t, , 300U, 301U, 302U, 303U)
-//%TESTS_FOR_POD_VALUE(KEY_NAME, KEY_TYPE, KisP, KSUFFIX, KEY1, KEY2, KEY3, KEY4, Int64, int64_t, , 400, 401, 402, 403)
-//%TESTS_FOR_POD_VALUE(KEY_NAME, KEY_TYPE, KisP, KSUFFIX, KEY1, KEY2, KEY3, KEY4, Bool, BOOL, , YES, YES, NO, NO)
-//%TESTS_FOR_POD_VALUE(KEY_NAME, KEY_TYPE, KisP, KSUFFIX, KEY1, KEY2, KEY3, KEY4, Float, float, , 500.f, 501.f, 502.f, 503.f)
-//%TESTS_FOR_POD_VALUE(KEY_NAME, KEY_TYPE, KisP, KSUFFIX, KEY1, KEY2, KEY3, KEY4, Double, double, , 600., 601., 602., 603.)
-//%TESTS_FOR_POD_VALUE(KEY_NAME, KEY_TYPE, KisP, KSUFFIX, KEY1, KEY2, KEY3, KEY4, Enum, int32_t, Raw, 700, 701, 702, 703)
-//%TESTS_FOR_ENUM_VALUE_RAW_ADDITIONS(KEY_NAME, KEY_TYPE, KisP, KSUFFIX, KEY1, KEY2, KEY3, KEY4)
-
-//%PDDM-DEFINE TESTS_FOR_POD_VALUE(KEY_NAME, KEY_TYPE, KisP, KSUFFIX, KEY1, KEY2, KEY3, KEY4, VALUE_NAME, VALUE_TYPE, VACCESSOR, VAL1, VAL2, VAL3, VAL4)
-//%TESTS_COMMON(KEY_NAME, KEY_TYPE, KisP, KSUFFIX, KEY1, KEY2, KEY3, KEY4, VALUE_NAME, VALUE_TYPE, , value, POD, VACCESSOR, VAL1, VAL2, VAL3, VAL4)
-
-//%PDDM-DEFINE TESTS_FOR_POD_KEY_OBJECT_VALUE(KEY_NAME, KEY_TYPE, KEY1, KEY2, KEY3, KEY4, VALUE_NAME, VALUE_TYPE, VAL1, VAL2, VAL3, VAL4)
-//%TESTS_COMMON(KEY_NAME, KEY_TYPE, , , KEY1, KEY2, KEY3, KEY4, VALUE_NAME, VALUE_TYPE, Objects, object, OBJECT, , VAL1, VAL2, VAL3, VAL4)
-
-//%PDDM-DEFINE DICTIONARY_CLASS_DECLPOD(KEY_NAME, VALUE_NAME, VALUE_TYPE)
-//%GPB##KEY_NAME##VALUE_NAME##Dictionary
-//%PDDM-DEFINE DICTIONARY_CLASS_DECLEnum(KEY_NAME, VALUE_NAME, VALUE_TYPE)
-//%GPB##KEY_NAME##VALUE_NAME##Dictionary
-//%PDDM-DEFINE DICTIONARY_CLASS_DECLOBJECT(KEY_NAME, VALUE_NAME, VALUE_TYPE)
-//%GPB##KEY_NAME##VALUE_NAME##Dictionary<VALUE_TYPE>
-
-//%PDDM-DEFINE TESTS_COMMON(KEY_NAME, KEY_TYPE, KisP, KSUFFIX, KEY1, KEY2, KEY3, KEY4, VALUE_NAME, VALUE_TYPE, VSUFFIX, VNAME, VHELPER, VACCESSOR, VAL1, VAL2, VAL3, VAL4)
-//%#pragma mark - KEY_NAME -> VALUE_NAME
-//%
-//%@interface GPB##KEY_NAME##VALUE_NAME##DictionaryTests : XCTestCase
-//%@end
-//%
-//%@implementation GPB##KEY_NAME##VALUE_NAME##DictionaryTests
-//%
-//%- (void)testEmpty {
-//%  DICTIONARY_CLASS_DECL##VHELPER(KEY_NAME, VALUE_NAME, VALUE_TYPE) *dict = [[GPB##KEY_NAME##VALUE_NAME##Dictionary alloc] init];
-//%  XCTAssertNotNil(dict);
-//%  XCTAssertEqual(dict.count, 0U);
-//%VALUE_NOT_FOUND##VHELPER(VALUE_NAME, dict, KEY1)
-//%  [dict enumerateKeysAnd##VALUE_NAME$u##sUsingBlock:^(KEY_TYPE KisP##aKey, VALUE_TYPE a##VNAME$u, BOOL *stop) {
-//%    #pragma unused(aKey, a##VNAME$u, stop)
-//%    XCTFail(@"Shouldn't get here!");
-//%  }];
-//%  [dict release];
-//%}
-//%
-//%- (void)testOne {
-//%  DICTIONARY_CLASS_DECL##VHELPER(KEY_NAME, VALUE_NAME, VALUE_TYPE) *dict = [[GPB##KEY_NAME##VALUE_NAME##Dictionary alloc] init];
-//%  [dict set##VALUE_NAME$u##:VAL1 forKey:KEY1];
-//%  XCTAssertNotNil(dict);
-//%  XCTAssertEqual(dict.count, 1U);
-//%DECLARE_VALUE_STORAGE##VHELPER(VALUE_TYPE, VNAME)TEST_VALUE##VHELPER(VALUE_NAME, dict, VNAME, KEY1, VAL1)
-//%VALUE_NOT_FOUND##VHELPER(VALUE_NAME, dict, KEY2)
-//%  [dict enumerateKeysAnd##VALUE_NAME$u##sUsingBlock:^(KEY_TYPE KisP##aKey, VALUE_TYPE a##VNAME$u, BOOL *stop) {
-//%    XCTAssertEqual##KSUFFIX(aKey, KEY1);
-//%    XCTAssertEqual##VSUFFIX(a##VNAME$u, VAL1);
-//%    XCTAssertNotEqual(stop, NULL);
-//%  }];
-//%  [dict release];
-//%}
-//%
-//%- (void)testBasics {
-//%  const KEY_TYPE KisP##kKeys[] = { KEY1, KEY2, KEY3 };
-//%  const VALUE_TYPE k##VNAME$u##s[] = { VAL1, VAL2, VAL3 };
-//%  DICTIONARY_CLASS_DECL##VHELPER(KEY_NAME, VALUE_NAME, VALUE_TYPE) *dict =
-//%      [[GPB##KEY_NAME##VALUE_NAME##Dictionary alloc] initWith##VALUE_NAME$u##s:k##VNAME$u##s
-//%           KEY_NAME$S VALUE_NAME$S                 ##VALUE_NAME$S##  forKeys:kKeys
-//%           KEY_NAME$S VALUE_NAME$S                 ##VALUE_NAME$S##    count:GPBARRAYSIZE(k##VNAME$u##s)];
-//%  XCTAssertNotNil(dict);
-//%  XCTAssertEqual(dict.count, 3U);
-//%DECLARE_VALUE_STORAGE##VHELPER(VALUE_TYPE, VNAME)TEST_VALUE##VHELPER(VALUE_NAME, dict, VNAME, KEY1, VAL1)
-//%TEST_VALUE##VHELPER(VALUE_NAME, dict, VNAME, KEY2, VAL2)
-//%TEST_VALUE##VHELPER(VALUE_NAME, dict, VNAME, KEY3, VAL3)
-//%VALUE_NOT_FOUND##VHELPER(VALUE_NAME, dict, KEY4)
-//%
-//%  __block NSUInteger idx = 0;
-//%  KEY_TYPE KisP##*seenKeys = malloc(3 * sizeof(KEY_TYPE##KisP));
-//%  VALUE_TYPE *seen##VNAME$u##s = malloc(3 * sizeof(VALUE_TYPE));
-//%  [dict enumerateKeysAnd##VALUE_NAME$u##sUsingBlock:^(KEY_TYPE KisP##aKey, VALUE_TYPE a##VNAME$u, BOOL *stop) {
-//%    XCTAssertLessThan(idx, 3U);
-//%    seenKeys[idx] = aKey;
-//%    seen##VNAME$u##s[idx] = a##VNAME$u##;
-//%    XCTAssertNotEqual(stop, NULL);
-//%    ++idx;
-//%  }];
-//%  for (int i = 0; i < 3; ++i) {
-//%    BOOL foundKey = NO;
-//%    for (int j = 0; (j < 3) && !foundKey; ++j) {
-//%      if (COMPARE_KEYS##KSUFFIX(kKeys[i], seenKeys[j])) {
-//%        foundKey = YES;
-//%        XCTAssertEqual##VSUFFIX(k##VNAME$u##s[i], seen##VNAME$u##s[j], @"i = %d, j = %d", i, j);
-//%      }
-//%    }
-//%    XCTAssertTrue(foundKey, @"i = %d", i);
-//%  }
-//%  free(seenKeys);
-//%  free(seen##VNAME$u##s);
-//%
-//%  // Stopping the enumeration.
-//%  idx = 0;
-//%  [dict enumerateKeysAnd##VALUE_NAME$u##sUsingBlock:^(KEY_TYPE KisP##aKey, VALUE_TYPE a##VNAME$u, BOOL *stop) {
-//%    #pragma unused(aKey, a##VNAME$u)
-//%    if (idx == 1) *stop = YES;
-//%    XCTAssertNotEqual(idx, 2U);
-//%    ++idx;
-//%  }];
-//%  [dict release];
-//%}
-//%
-//%- (void)testEquality {
-//%  const KEY_TYPE KisP##kKeys1[] = { KEY1, KEY2, KEY3, KEY4 };
-//%  const KEY_TYPE KisP##kKeys2[] = { KEY2, KEY1, KEY4 };
-//%  const VALUE_TYPE k##VNAME$u##s1[] = { VAL1, VAL2, VAL3 };
-//%  const VALUE_TYPE k##VNAME$u##s2[] = { VAL1, VAL4, VAL3 };
-//%  const VALUE_TYPE k##VNAME$u##s3[] = { VAL1, VAL2, VAL3, VAL4 };
-//%  DICTIONARY_CLASS_DECL##VHELPER(KEY_NAME, VALUE_NAME, VALUE_TYPE) *dict1 =
-//%      [[GPB##KEY_NAME##VALUE_NAME##Dictionary alloc] initWith##VALUE_NAME##s:k##VNAME$u##s1
-//%           KEY_NAME$S VALUE_NAME$S                 ##VALUE_NAME$S##  forKeys:kKeys1
-//%           KEY_NAME$S VALUE_NAME$S                 ##VALUE_NAME$S##    count:GPBARRAYSIZE(k##VNAME$u##s1)];
-//%  XCTAssertNotNil(dict1);
-//%  DICTIONARY_CLASS_DECL##VHELPER(KEY_NAME, VALUE_NAME, VALUE_TYPE) *dict1prime =
-//%      [[GPB##KEY_NAME##VALUE_NAME##Dictionary alloc] initWith##VALUE_NAME##s:k##VNAME$u##s1
-//%           KEY_NAME$S VALUE_NAME$S                 ##VALUE_NAME$S##  forKeys:kKeys1
-//%           KEY_NAME$S VALUE_NAME$S                 ##VALUE_NAME$S##    count:GPBARRAYSIZE(k##VNAME$u##s1)];
-//%  XCTAssertNotNil(dict1prime);
-//%  DICTIONARY_CLASS_DECL##VHELPER(KEY_NAME, VALUE_NAME, VALUE_TYPE) *dict2 =
-//%      [[GPB##KEY_NAME##VALUE_NAME##Dictionary alloc] initWith##VALUE_NAME##s:k##VNAME$u##s2
-//%           KEY_NAME$S VALUE_NAME$S                 ##VALUE_NAME$S##  forKeys:kKeys1
-//%           KEY_NAME$S VALUE_NAME$S                 ##VALUE_NAME$S##    count:GPBARRAYSIZE(k##VNAME$u##s2)];
-//%  XCTAssertNotNil(dict2);
-//%  DICTIONARY_CLASS_DECL##VHELPER(KEY_NAME, VALUE_NAME, VALUE_TYPE) *dict3 =
-//%      [[GPB##KEY_NAME##VALUE_NAME##Dictionary alloc] initWith##VALUE_NAME##s:k##VNAME$u##s1
-//%           KEY_NAME$S VALUE_NAME$S                 ##VALUE_NAME$S##  forKeys:kKeys2
-//%           KEY_NAME$S VALUE_NAME$S                 ##VALUE_NAME$S##    count:GPBARRAYSIZE(k##VNAME$u##s1)];
-//%  XCTAssertNotNil(dict3);
-//%  DICTIONARY_CLASS_DECL##VHELPER(KEY_NAME, VALUE_NAME, VALUE_TYPE) *dict4 =
-//%      [[GPB##KEY_NAME##VALUE_NAME##Dictionary alloc] initWith##VALUE_NAME##s:k##VNAME$u##s3
-//%           KEY_NAME$S VALUE_NAME$S                 ##VALUE_NAME$S##  forKeys:kKeys1
-//%           KEY_NAME$S VALUE_NAME$S                 ##VALUE_NAME$S##    count:GPBARRAYSIZE(k##VNAME$u##s3)];
-//%  XCTAssertNotNil(dict4);
-//%
-//%  // 1/1Prime should be different objects, but equal.
-//%  XCTAssertNotEqual(dict1, dict1prime);
-//%  XCTAssertEqualObjects(dict1, dict1prime);
-//%  // Equal, so they must have same hash.
-//%  XCTAssertEqual([dict1 hash], [dict1prime hash]);
-//%
-//%  // 2 is same keys, different ##VNAME##s; not equal.
-//%  XCTAssertNotEqualObjects(dict1, dict2);
-//%
-//%  // 3 is different keys, same ##VNAME##s; not equal.
-//%  XCTAssertNotEqualObjects(dict1, dict3);
-//%
-//%  // 4 extra pair; not equal
-//%  XCTAssertNotEqualObjects(dict1, dict4);
-//%
-//%  [dict1 release];
-//%  [dict1prime release];
-//%  [dict2 release];
-//%  [dict3 release];
-//%  [dict4 release];
-//%}
-//%
-//%- (void)testCopy {
-//%  const KEY_TYPE KisP##kKeys[] = { KEY1, KEY2, KEY3, KEY4 };
-//%  const VALUE_TYPE k##VNAME$u##s[] = { VAL1, VAL2, VAL3, VAL4 };
-//%  DICTIONARY_CLASS_DECL##VHELPER(KEY_NAME, VALUE_NAME, VALUE_TYPE) *dict =
-//%      [[GPB##KEY_NAME##VALUE_NAME##Dictionary alloc] initWith##VALUE_NAME##s:k##VNAME$u##s
-//%           KEY_NAME$S VALUE_NAME$S                 ##VALUE_NAME$S##  forKeys:kKeys
-//%           KEY_NAME$S VALUE_NAME$S                 ##VALUE_NAME$S##    count:GPBARRAYSIZE(k##VNAME$u##s)];
-//%  XCTAssertNotNil(dict);
-//%
-//%  DICTIONARY_CLASS_DECL##VHELPER(KEY_NAME, VALUE_NAME, VALUE_TYPE) *dict2 = [dict copy];
-//%  XCTAssertNotNil(dict2);
-//%
-//%  // Should be new object but equal.
-//%  XCTAssertNotEqual(dict, dict2);
-//%  XCTAssertEqualObjects(dict, dict2);
-//%  XCTAssertTrue([dict2 isKindOfClass:[GPB##KEY_NAME##VALUE_NAME##Dictionary class]]);
-//%
-//%  [dict2 release];
-//%  [dict release];
-//%}
-//%
-//%- (void)testDictionaryFromDictionary {
-//%  const KEY_TYPE KisP##kKeys[] = { KEY1, KEY2, KEY3, KEY4 };
-//%  const VALUE_TYPE k##VNAME$u##s[] = { VAL1, VAL2, VAL3, VAL4 };
-//%  DICTIONARY_CLASS_DECL##VHELPER(KEY_NAME, VALUE_NAME, VALUE_TYPE) *dict =
-//%      [[GPB##KEY_NAME##VALUE_NAME##Dictionary alloc] initWith##VALUE_NAME##s:k##VNAME$u##s
-//%           KEY_NAME$S VALUE_NAME$S                 ##VALUE_NAME$S##  forKeys:kKeys
-//%           KEY_NAME$S VALUE_NAME$S                 ##VALUE_NAME$S##    count:GPBARRAYSIZE(k##VNAME$u##s)];
-//%  XCTAssertNotNil(dict);
-//%
-//%  DICTIONARY_CLASS_DECL##VHELPER(KEY_NAME, VALUE_NAME, VALUE_TYPE) *dict2 =
-//%      [[GPB##KEY_NAME##VALUE_NAME##Dictionary alloc] initWithDictionary:dict];
-//%  XCTAssertNotNil(dict2);
-//%
-//%  // Should be new pointer, but equal objects.
-//%  XCTAssertNotEqual(dict, dict2);
-//%  XCTAssertEqualObjects(dict, dict2);
-//%  [dict2 release];
-//%  [dict release];
-//%}
-//%
-//%- (void)testAdds {
-//%  DICTIONARY_CLASS_DECL##VHELPER(KEY_NAME, VALUE_NAME, VALUE_TYPE) *dict = [[GPB##KEY_NAME##VALUE_NAME##Dictionary alloc] init];
-//%  XCTAssertNotNil(dict);
-//%
-//%  XCTAssertEqual(dict.count, 0U);
-//%  [dict set##VALUE_NAME##:VAL1 forKey:KEY1];
-//%  XCTAssertEqual(dict.count, 1U);
-//%
-//%  const KEY_TYPE KisP##kKeys[] = { KEY2, KEY3, KEY4 };
-//%  const VALUE_TYPE k##VNAME$u##s[] = { VAL2, VAL3, VAL4 };
-//%  DICTIONARY_CLASS_DECL##VHELPER(KEY_NAME, VALUE_NAME, VALUE_TYPE) *dict2 =
-//%      [[GPB##KEY_NAME##VALUE_NAME##Dictionary alloc] initWith##VALUE_NAME##s:k##VNAME$u##s
-//%           KEY_NAME$S VALUE_NAME$S                 ##VALUE_NAME$S##  forKeys:kKeys
-//%           KEY_NAME$S VALUE_NAME$S                 ##VALUE_NAME$S##    count:GPBARRAYSIZE(k##VNAME$u##s)];
-//%  XCTAssertNotNil(dict2);
-//%  [dict add##VACCESSOR##EntriesFromDictionary:dict2];
-//%  XCTAssertEqual(dict.count, 4U);
-//%
-//%DECLARE_VALUE_STORAGE##VHELPER(VALUE_TYPE, VNAME)TEST_VALUE##VHELPER(VALUE_NAME, dict, VNAME, KEY1, VAL1)
-//%TEST_VALUE##VHELPER(VALUE_NAME, dict, VNAME, KEY2, VAL2)
-//%TEST_VALUE##VHELPER(VALUE_NAME, dict, VNAME, KEY3, VAL3)
-//%TEST_VALUE##VHELPER(VALUE_NAME, dict, VNAME, KEY4, VAL4)
-//%  [dict2 release];
-//%  [dict release];
-//%}
-//%
-//%- (void)testRemove {
-//%  const KEY_TYPE KisP##kKeys[] = { KEY1, KEY2, KEY3, KEY4 };
-//%  const VALUE_TYPE k##VNAME$u##s[] = { VAL1, VAL2, VAL3, VAL4 };
-//%  DICTIONARY_CLASS_DECL##VHELPER(KEY_NAME, VALUE_NAME, VALUE_TYPE) *dict =
-//%      [[GPB##KEY_NAME##VALUE_NAME##Dictionary alloc] initWith##VALUE_NAME##s:k##VNAME$u##s
-//%           KEY_NAME$S VALUE_NAME$S                 ##VALUE_NAME$S##  forKeys:kKeys
-//%           KEY_NAME$S VALUE_NAME$S                 ##VALUE_NAME$S##    count:GPBARRAYSIZE(k##VNAME$u##s)];
-//%  XCTAssertNotNil(dict);
-//%  XCTAssertEqual(dict.count, 4U);
-//%
-//%  [dict remove##VALUE_NAME##ForKey:KEY2];
-//%  XCTAssertEqual(dict.count, 3U);
-//%DECLARE_VALUE_STORAGE##VHELPER(VALUE_TYPE, VNAME)TEST_VALUE##VHELPER(VALUE_NAME, dict, VNAME, KEY1, VAL1)
-//%VALUE_NOT_FOUND##VHELPER(VALUE_NAME, dict, KEY2)
-//%TEST_VALUE##VHELPER(VALUE_NAME, dict, VNAME, KEY3, VAL3)
-//%TEST_VALUE##VHELPER(VALUE_NAME, dict, VNAME, KEY4, VAL4)
-//%
-//%  // Remove again does nothing.
-//%  [dict remove##VALUE_NAME##ForKey:KEY2];
-//%  XCTAssertEqual(dict.count, 3U);
-//%TEST_VALUE##VHELPER(VALUE_NAME, dict, VNAME, KEY1, VAL1)
-//%VALUE_NOT_FOUND##VHELPER(VALUE_NAME, dict, KEY2)
-//%TEST_VALUE##VHELPER(VALUE_NAME, dict, VNAME, KEY3, VAL3)
-//%TEST_VALUE##VHELPER(VALUE_NAME, dict, VNAME, KEY4, VAL4)
-//%
-//%  [dict remove##VALUE_NAME##ForKey:KEY4];
-//%  XCTAssertEqual(dict.count, 2U);
-//%TEST_VALUE##VHELPER(VALUE_NAME, dict, VNAME, KEY1, VAL1)
-//%VALUE_NOT_FOUND##VHELPER(VALUE_NAME, dict, KEY2)
-//%TEST_VALUE##VHELPER(VALUE_NAME, dict, VNAME, KEY3, VAL3)
-//%VALUE_NOT_FOUND##VHELPER(VALUE_NAME, dict, KEY4)
-//%
-//%  [dict removeAll];
-//%  XCTAssertEqual(dict.count, 0U);
-//%VALUE_NOT_FOUND##VHELPER(VALUE_NAME, dict, KEY1)
-//%VALUE_NOT_FOUND##VHELPER(VALUE_NAME, dict, KEY2)
-//%VALUE_NOT_FOUND##VHELPER(VALUE_NAME, dict, KEY3)
-//%VALUE_NOT_FOUND##VHELPER(VALUE_NAME, dict, KEY4)
-//%  [dict release];
-//%}
-//%
-//%- (void)testInplaceMutation {
-//%  const KEY_TYPE KisP##kKeys[] = { KEY1, KEY2, KEY3, KEY4 };
-//%  const VALUE_TYPE k##VNAME$u##s[] = { VAL1, VAL2, VAL3, VAL4 };
-//%  DICTIONARY_CLASS_DECL##VHELPER(KEY_NAME, VALUE_NAME, VALUE_TYPE) *dict =
-//%      [[GPB##KEY_NAME##VALUE_NAME##Dictionary alloc] initWith##VALUE_NAME##s:k##VNAME$u##s
-//%           KEY_NAME$S VALUE_NAME$S                 ##VALUE_NAME$S##  forKeys:kKeys
-//%           KEY_NAME$S VALUE_NAME$S                 ##VALUE_NAME$S##    count:GPBARRAYSIZE(k##VNAME$u##s)];
-//%  XCTAssertNotNil(dict);
-//%  XCTAssertEqual(dict.count, 4U);
-//%DECLARE_VALUE_STORAGE##VHELPER(VALUE_TYPE, VNAME)TEST_VALUE##VHELPER(VALUE_NAME, dict, VNAME, KEY1, VAL1)
-//%TEST_VALUE##VHELPER(VALUE_NAME, dict, VNAME, KEY2, VAL2)
-//%TEST_VALUE##VHELPER(VALUE_NAME, dict, VNAME, KEY3, VAL3)
-//%TEST_VALUE##VHELPER(VALUE_NAME, dict, VNAME, KEY4, VAL4)
-//%
-//%  [dict set##VALUE_NAME##:VAL4 forKey:KEY1];
-//%  XCTAssertEqual(dict.count, 4U);
-//%TEST_VALUE##VHELPER(VALUE_NAME, dict, VNAME, KEY1, VAL4)
-//%TEST_VALUE##VHELPER(VALUE_NAME, dict, VNAME, KEY2, VAL2)
-//%TEST_VALUE##VHELPER(VALUE_NAME, dict, VNAME, KEY3, VAL3)
-//%TEST_VALUE##VHELPER(VALUE_NAME, dict, VNAME, KEY4, VAL4)
-//%
-//%  [dict set##VALUE_NAME##:VAL2 forKey:KEY4];
-//%  XCTAssertEqual(dict.count, 4U);
-//%TEST_VALUE##VHELPER(VALUE_NAME, dict, VNAME, KEY1, VAL4)
-//%TEST_VALUE##VHELPER(VALUE_NAME, dict, VNAME, KEY2, VAL2)
-//%TEST_VALUE##VHELPER(VALUE_NAME, dict, VNAME, KEY3, VAL3)
-//%TEST_VALUE##VHELPER(VALUE_NAME, dict, VNAME, KEY4, VAL2)
-//%
-//%  const KEY_TYPE KisP##kKeys2[] = { KEY2, KEY3 };
-//%  const VALUE_TYPE k##VNAME$u##s2[] = { VAL3, VAL1 };
-//%  DICTIONARY_CLASS_DECL##VHELPER(KEY_NAME, VALUE_NAME, VALUE_TYPE) *dict2 =
-//%      [[GPB##KEY_NAME##VALUE_NAME##Dictionary alloc] initWith##VALUE_NAME##s:k##VNAME$u##s2
-//%           KEY_NAME$S VALUE_NAME$S                 ##VALUE_NAME$S##  forKeys:kKeys2
-//%           KEY_NAME$S VALUE_NAME$S                 ##VALUE_NAME$S##    count:GPBARRAYSIZE(k##VNAME$u##s2)];
-//%  XCTAssertNotNil(dict2);
-//%  [dict add##VACCESSOR##EntriesFromDictionary:dict2];
-//%  XCTAssertEqual(dict.count, 4U);
-//%TEST_VALUE##VHELPER(VALUE_NAME, dict, VNAME, KEY1, VAL4)
-//%TEST_VALUE##VHELPER(VALUE_NAME, dict, VNAME, KEY2, VAL3)
-//%TEST_VALUE##VHELPER(VALUE_NAME, dict, VNAME, KEY3, VAL1)
-//%TEST_VALUE##VHELPER(VALUE_NAME, dict, VNAME, KEY4, VAL2)
-//%
-//%  [dict2 release];
-//%  [dict release];
-//%}
-//%
-//%@end
-//%
-
-//%PDDM-DEFINE TESTS_FOR_ENUM_VALUE_RAW_ADDITIONS(KEY_NAME, KEY_TYPE, KisP, KSUFFIX, KEY1, KEY2, KEY3, KEY4)
-//%TESTS_FOR_ENUM_VALUE_RAW_ADDITIONS2(KEY_NAME, KEY_TYPE, KisP, KSUFFIX, KEY1, KEY2, KEY3, KEY4, Enum, int32_t, , POD, 700, 801, 702, 803)
-//%PDDM-DEFINE TESTS_FOR_ENUM_VALUE_RAW_ADDITIONS2(KEY_NAME, KEY_TYPE, KisP, KSUFFIX, KEY1, KEY2, KEY3, KEY4, VALUE_NAME, VALUE_TYPE, VSUFFIX, VHELPER, VAL1, VAL2, VAL3, VAL4)
-//%#pragma mark - KEY_NAME -> VALUE_NAME (Unknown Enums)
-//%
-//%@interface GPB##KEY_NAME##VALUE_NAME##DictionaryUnknownEnumTests : XCTestCase
-//%@end
-//%
-//%@implementation GPB##KEY_NAME##VALUE_NAME##DictionaryUnknownEnumTests
-//%
-//%- (void)testRawBasics {
-//%  const KEY_TYPE KisP##kKeys[] = { KEY1, KEY2, KEY3 };
-//%  const VALUE_TYPE kValues[] = { VAL1, VAL2, VAL3 };
-//%  DICTIONARY_CLASS_DECL##VHELPER(KEY_NAME, VALUE_NAME, VALUE_TYPE) *dict =
-//%      [[GPB##KEY_NAME##VALUE_NAME##Dictionary alloc] initWithValidationFunction:TestingEnum_IsValidValue
-//%           KEY_NAME$S VALUE_NAME$S                                  rawValues:kValues
-//%           KEY_NAME$S VALUE_NAME$S                                    forKeys:kKeys
-//%           KEY_NAME$S VALUE_NAME$S                                      count:GPBARRAYSIZE(kValues)];
-//%  XCTAssertNotNil(dict);
-//%  XCTAssertEqual(dict.count, 3U);
-//%  XCTAssertTrue(dict.validationFunc == TestingEnum_IsValidValue);  // Pointer comparison
-//%DECLARE_VALUE_STORAGE##VHELPER(VALUE_TYPE, value)TEST_RAW_VALUE##VHELPER(dict, value, KEY1, VAL1)
-//%TEST_VALUE##VHELPER(VALUE_NAME, dict, value, KEY2, kGPBUnrecognizedEnumeratorValue)
-//%TEST_RAW_VALUE##VHELPER(dict, value, KEY2, VAL2)
-//%TEST_RAW_VALUE##VHELPER(dict, value, KEY3, VAL3)
-//%RAW_VALUE_NOT_FOUND##VHELPER(VALUE_NAME, dict, KEY4)
-//%
-//%  __block NSUInteger idx = 0;
-//%  KEY_TYPE KisP##*seenKeys = malloc(3 * sizeof(KEY_TYPE##KisP));
-//%  VALUE_TYPE *seenValues = malloc(3 * sizeof(VALUE_TYPE));
-//%  [dict enumerateKeysAndEnumsUsingBlock:^(KEY_TYPE KisP##aKey, VALUE_TYPE aValue, BOOL *stop) {
-//%    XCTAssertLessThan(idx, 3U);
-//%    seenKeys[idx] = aKey;
-//%    seenValues[idx] = aValue;
-//%    XCTAssertNotEqual(stop, NULL);
-//%    ++idx;
-//%  }];
-//%  for (int i = 0; i < 3; ++i) {
-//%    BOOL foundKey = NO;
-//%    for (int j = 0; (j < 3) && !foundKey; ++j) {
-//%      if (COMPARE_KEYS##KSUFFIX(kKeys[i], seenKeys[j])) {
-//%        foundKey = YES;
-//%        if (i == 1) {
-//%          XCTAssertEqual##VSUFFIX(kGPBUnrecognizedEnumeratorValue, seenValues[j], @"i = %d, j = %d", i, j);
-//%        } else {
-//%          XCTAssertEqual##VSUFFIX(kValues[i], seenValues[j], @"i = %d, j = %d", i, j);
-//%        }
-//%      }
-//%    }
-//%    XCTAssertTrue(foundKey, @"i = %d", i);
-//%  }
-//%  idx = 0;
-//%  [dict enumerateKeysAndRawValuesUsingBlock:^(KEY_TYPE KisP##aKey, VALUE_TYPE aValue, BOOL *stop) {
-//%    XCTAssertLessThan(idx, 3U);
-//%    seenKeys[idx] = aKey;
-//%    seenValues[idx] = aValue;
-//%    XCTAssertNotEqual(stop, NULL);
-//%    ++idx;
-//%  }];
-//%  for (int i = 0; i < 3; ++i) {
-//%    BOOL foundKey = NO;
-//%    for (int j = 0; (j < 3) && !foundKey; ++j) {
-//%      if (COMPARE_KEYS##KSUFFIX(kKeys[i], seenKeys[j])) {
-//%        foundKey = YES;
-//%        XCTAssertEqual##VSUFFIX(kValues[i], seenValues[j], @"i = %d, j = %d", i, j);
-//%      }
-//%    }
-//%    XCTAssertTrue(foundKey, @"i = %d", i);
-//%  }
-//%  free(seenKeys);
-//%  free(seenValues);
-//%
-//%  // Stopping the enumeration.
-//%  idx = 0;
-//%  [dict enumerateKeysAndRawValuesUsingBlock:^(KEY_TYPE KisP##aKey, VALUE_TYPE aValue, BOOL *stop) {
-//%    #pragma unused(aKey, aValue)
-//%    if (idx == 1) *stop = YES;
-//%    XCTAssertNotEqual(idx, 2U);
-//%    ++idx;
-//%  }];
-//%  [dict release];
-//%}
-//%
-//%- (void)testEqualityWithUnknowns {
-//%  const KEY_TYPE KisP##kKeys1[] = { KEY1, KEY2, KEY3, KEY4 };
-//%  const KEY_TYPE KisP##kKeys2[] = { KEY2, KEY1, KEY4 };
-//%  const VALUE_TYPE kValues1[] = { VAL1, VAL2, VAL3 };  // Unknown
-//%  const VALUE_TYPE kValues2[] = { VAL1, VAL4, VAL3 };  // Unknown
-//%  const VALUE_TYPE kValues3[] = { VAL1, VAL2, VAL3, VAL4 };  // Unknowns
-//%  DICTIONARY_CLASS_DECL##VHELPER(KEY_NAME, VALUE_NAME, VALUE_TYPE) *dict1 =
-//%      [[GPB##KEY_NAME##VALUE_NAME##Dictionary alloc] initWithValidationFunction:TestingEnum_IsValidValue
-//%           KEY_NAME$S VALUE_NAME$S                                  rawValues:kValues1
-//%           KEY_NAME$S VALUE_NAME$S                                    forKeys:kKeys1
-//%           KEY_NAME$S VALUE_NAME$S                                      count:GPBARRAYSIZE(kValues1)];
-//%  XCTAssertNotNil(dict1);
-//%  DICTIONARY_CLASS_DECL##VHELPER(KEY_NAME, VALUE_NAME, VALUE_TYPE) *dict1prime =
-//%      [[GPB##KEY_NAME##VALUE_NAME##Dictionary alloc] initWithValidationFunction:TestingEnum_IsValidValue
-//%           KEY_NAME$S VALUE_NAME$S                                  rawValues:kValues1
-//%           KEY_NAME$S VALUE_NAME$S                                    forKeys:kKeys1
-//%           KEY_NAME$S VALUE_NAME$S                                      count:GPBARRAYSIZE(kValues1)];
-//%  XCTAssertNotNil(dict1prime);
-//%  DICTIONARY_CLASS_DECL##VHELPER(KEY_NAME, VALUE_NAME, VALUE_TYPE) *dict2 =
-//%      [[GPB##KEY_NAME##VALUE_NAME##Dictionary alloc] initWithValidationFunction:TestingEnum_IsValidValue
-//%           KEY_NAME$S VALUE_NAME$S                                  rawValues:kValues2
-//%           KEY_NAME$S VALUE_NAME$S                                    forKeys:kKeys1
-//%           KEY_NAME$S VALUE_NAME$S                                      count:GPBARRAYSIZE(kValues2)];
-//%  XCTAssertNotNil(dict2);
-//%  DICTIONARY_CLASS_DECL##VHELPER(KEY_NAME, VALUE_NAME, VALUE_TYPE) *dict3 =
-//%      [[GPB##KEY_NAME##VALUE_NAME##Dictionary alloc] initWithValidationFunction:TestingEnum_IsValidValue
-//%           KEY_NAME$S VALUE_NAME$S                                  rawValues:kValues1
-//%           KEY_NAME$S VALUE_NAME$S                                    forKeys:kKeys2
-//%           KEY_NAME$S VALUE_NAME$S                                      count:GPBARRAYSIZE(kValues1)];
-//%  XCTAssertNotNil(dict3);
-//%  DICTIONARY_CLASS_DECL##VHELPER(KEY_NAME, VALUE_NAME, VALUE_TYPE) *dict4 =
-//%      [[GPB##KEY_NAME##VALUE_NAME##Dictionary alloc] initWithValidationFunction:TestingEnum_IsValidValue
-//%           KEY_NAME$S VALUE_NAME$S                                  rawValues:kValues3
-//%           KEY_NAME$S VALUE_NAME$S                                    forKeys:kKeys1
-//%           KEY_NAME$S VALUE_NAME$S                                      count:GPBARRAYSIZE(kValues3)];
-//%  XCTAssertNotNil(dict4);
-//%
-//%  // 1/1Prime should be different objects, but equal.
-//%  XCTAssertNotEqual(dict1, dict1prime);
-//%  XCTAssertEqualObjects(dict1, dict1prime);
-//%  // Equal, so they must have same hash.
-//%  XCTAssertEqual([dict1 hash], [dict1prime hash]);
-//%
-//%  // 2 is same keys, different values; not equal.
-//%  XCTAssertNotEqualObjects(dict1, dict2);
-//%
-//%  // 3 is different keys, same values; not equal.
-//%  XCTAssertNotEqualObjects(dict1, dict3);
-//%
-//%  // 4 extra pair; not equal
-//%  XCTAssertNotEqualObjects(dict1, dict4);
-//%
-//%  [dict1 release];
-//%  [dict1prime release];
-//%  [dict2 release];
-//%  [dict3 release];
-//%  [dict4 release];
-//%}
-//%
-//%- (void)testCopyWithUnknowns {
-//%  const KEY_TYPE KisP##kKeys[] = { KEY1, KEY2, KEY3, KEY4 };
-//%  const VALUE_TYPE kValues[] = { VAL1, VAL2, VAL3, VAL4 };  // Unknown
-//%  DICTIONARY_CLASS_DECL##VHELPER(KEY_NAME, VALUE_NAME, VALUE_TYPE) *dict =
-//%      [[GPB##KEY_NAME##VALUE_NAME##Dictionary alloc] initWithValidationFunction:TestingEnum_IsValidValue
-//%           KEY_NAME$S VALUE_NAME$S                                  rawValues:kValues
-//%           KEY_NAME$S VALUE_NAME$S                                    forKeys:kKeys
-//%           KEY_NAME$S VALUE_NAME$S                                      count:GPBARRAYSIZE(kValues)];
-//%  XCTAssertNotNil(dict);
-//%
-//%  DICTIONARY_CLASS_DECL##VHELPER(KEY_NAME, VALUE_NAME, VALUE_TYPE) *dict2 = [dict copy];
-//%  XCTAssertNotNil(dict2);
-//%
-//%  // Should be new pointer, but equal objects.
-//%  XCTAssertNotEqual(dict, dict2);
-//%  XCTAssertEqual(dict.validationFunc, dict2.validationFunc);  // Pointer comparison
-//%  XCTAssertEqualObjects(dict, dict2);
-//%
-//%  [dict2 release];
-//%  [dict release];
-//%}
-//%
-//%- (void)testDictionaryFromDictionary {
-//%  const KEY_TYPE KisP##kKeys[] = { KEY1, KEY2, KEY3, KEY4 };
-//%  const VALUE_TYPE kValues[] = { VAL1, VAL2, VAL3, VAL4 };  // Unknowns
-//%  DICTIONARY_CLASS_DECL##VHELPER(KEY_NAME, VALUE_NAME, VALUE_TYPE) *dict =
-//%      [[GPB##KEY_NAME##VALUE_NAME##Dictionary alloc] initWithValidationFunction:TestingEnum_IsValidValue
-//%           KEY_NAME$S VALUE_NAME$S                                  rawValues:kValues
-//%           KEY_NAME$S VALUE_NAME$S                                    forKeys:kKeys
-//%           KEY_NAME$S VALUE_NAME$S                                      count:GPBARRAYSIZE(kValues)];
-//%  XCTAssertNotNil(dict);
-//%
-//%  DICTIONARY_CLASS_DECL##VHELPER(KEY_NAME, VALUE_NAME, VALUE_TYPE) *dict2 =
-//%      [[GPB##KEY_NAME##VALUE_NAME##Dictionary alloc] initWithDictionary:dict];
-//%  XCTAssertNotNil(dict2);
-//%
-//%  // Should be new pointer, but equal objects.
-//%  XCTAssertNotEqual(dict, dict2);
-//%  XCTAssertEqualObjects(dict, dict2);
-//%  XCTAssertEqual(dict.validationFunc, dict2.validationFunc);  // Pointer comparison
-//%  [dict2 release];
-//%  [dict release];
-//%}
-//%
-//%- (void)testUnknownAdds {
-//%  DICTIONARY_CLASS_DECL##VHELPER(KEY_NAME, VALUE_NAME, VALUE_TYPE) *dict =
-//%      [[GPB##KEY_NAME##VALUE_NAME##Dictionary alloc] initWithValidationFunction:TestingEnum_IsValidValue];
-//%  XCTAssertNotNil(dict);
-//%
-//%  XCTAssertEqual(dict.count, 0U);
-//%  XCTAssertThrowsSpecificNamed([dict setEnum:VAL2 forKey:KEY2],  // Unknown
-//%                               NSException, NSInvalidArgumentException);
-//%  XCTAssertEqual(dict.count, 0U);
-//%  [dict setRawValue:VAL2 forKey:KEY2];  // Unknown
-//%  XCTAssertEqual(dict.count, 1U);
-//%
-//%  const KEY_TYPE KisP##kKeys[] = { KEY1, KEY3, KEY4 };
-//%  const VALUE_TYPE kValues[] = { VAL1, VAL3, VAL4 };  // Unknown
-//%  DICTIONARY_CLASS_DECL##VHELPER(KEY_NAME, VALUE_NAME, VALUE_TYPE) *dict2 =
-//%      [[GPB##KEY_NAME##VALUE_NAME##Dictionary alloc] initWithEnums:kValues
-//%           KEY_NAME$S VALUE_NAME$S                         forKeys:kKeys
-//%           KEY_NAME$S VALUE_NAME$S                           count:GPBARRAYSIZE(kValues)];
-//%  XCTAssertNotNil(dict2);
-//%  [dict addRawEntriesFromDictionary:dict2];
-//%  XCTAssertEqual(dict.count, 4U);
-//%
-//%DECLARE_VALUE_STORAGE##VHELPER(VALUE_TYPE, value)TEST_VALUE##VHELPER(VALUE_NAME, dict, value, KEY1, VAL1)
-//%TEST_VALUE##VHELPER(VALUE_NAME, dict, value, KEY2, kGPBUnrecognizedEnumeratorValue)
-//%TEST_RAW_VALUE##VHELPER(dict, value, KEY2, VAL2)
-//%TEST_VALUE##VHELPER(VALUE_NAME, dict, value, KEY3, VAL3)
-//%TEST_VALUE##VHELPER(VALUE_NAME, dict, value, KEY4, kGPBUnrecognizedEnumeratorValue)
-//%TEST_RAW_VALUE##VHELPER(dict, value, KEY4, VAL4)
-//%  [dict2 release];
-//%  [dict release];
-//%}
-//%
-//%- (void)testUnknownRemove {
-//%  const KEY_TYPE KisP##kKeys[] = { KEY1, KEY2, KEY3, KEY4 };
-//%  const VALUE_TYPE kValues[] = { VAL1, VAL2, VAL3, VAL4 };  // Unknowns
-//%  DICTIONARY_CLASS_DECL##VHELPER(KEY_NAME, VALUE_NAME, VALUE_TYPE) *dict =
-//%      [[GPB##KEY_NAME##VALUE_NAME##Dictionary alloc] initWithValidationFunction:TestingEnum_IsValidValue
-//%           KEY_NAME$S VALUE_NAME$S                                  rawValues:kValues
-//%           KEY_NAME$S VALUE_NAME$S                                    forKeys:kKeys
-//%           KEY_NAME$S VALUE_NAME$S                                      count:GPBARRAYSIZE(kValues)];
-//%  XCTAssertNotNil(dict);
-//%  XCTAssertEqual(dict.count, 4U);
-//%
-//%  [dict removeEnumForKey:KEY2];
-//%  XCTAssertEqual(dict.count, 3U);
-//%DECLARE_VALUE_STORAGE##VHELPER(VALUE_TYPE, value)TEST_VALUE##VHELPER(VALUE_NAME, dict, value, KEY1, VAL1)
-//%VALUE_NOT_FOUND##VHELPER(VALUE_NAME, dict, KEY2)
-//%TEST_VALUE##VHELPER(VALUE_NAME, dict, value, KEY3, VAL3)
-//%TEST_RAW_VALUE##VHELPER(dict, value, KEY4, VAL4)
-//%
-//%  // Remove again does nothing.
-//%  [dict removeEnumForKey:KEY2];
-//%  XCTAssertEqual(dict.count, 3U);
-//%TEST_VALUE##VHELPER(VALUE_NAME, dict, value, KEY1, VAL1)
-//%VALUE_NOT_FOUND##VHELPER(VALUE_NAME, dict, KEY2)
-//%TEST_VALUE##VHELPER(VALUE_NAME, dict, value, KEY3, VAL3)
-//%TEST_RAW_VALUE##VHELPER(dict, value, KEY4, VAL4)
-//%
-//%  [dict removeEnumForKey:KEY4];
-//%  XCTAssertEqual(dict.count, 2U);
-//%TEST_VALUE##VHELPER(VALUE_NAME, dict, value, KEY1, VAL1)
-//%VALUE_NOT_FOUND##VHELPER(VALUE_NAME, dict, KEY2)
-//%TEST_VALUE##VHELPER(VALUE_NAME, dict, value, KEY3, VAL3)
-//%VALUE_NOT_FOUND##VHELPER(VALUE_NAME, dict, KEY4)
-//%
-//%  [dict removeAll];
-//%  XCTAssertEqual(dict.count, 0U);
-//%VALUE_NOT_FOUND##VHELPER(VALUE_NAME, dict, KEY1)
-//%VALUE_NOT_FOUND##VHELPER(VALUE_NAME, dict, KEY2)
-//%VALUE_NOT_FOUND##VHELPER(VALUE_NAME, dict, KEY3)
-//%VALUE_NOT_FOUND##VHELPER(VALUE_NAME, dict, KEY4)
-//%  [dict release];
-//%}
-//%
-//%- (void)testInplaceMutationUnknowns {
-//%  const KEY_TYPE KisP##kKeys[] = { KEY1, KEY2, KEY3, KEY4 };
-//%  const VALUE_TYPE kValues[] = { VAL1, VAL2, VAL3, VAL4 };  // Unknowns
-//%  DICTIONARY_CLASS_DECL##VHELPER(KEY_NAME, VALUE_NAME, VALUE_TYPE) *dict =
-//%      [[GPB##KEY_NAME##VALUE_NAME##Dictionary alloc] initWithValidationFunction:TestingEnum_IsValidValue
-//%           KEY_NAME$S VALUE_NAME$S                                  rawValues:kValues
-//%           KEY_NAME$S VALUE_NAME$S                                    forKeys:kKeys
-//%           KEY_NAME$S VALUE_NAME$S                                      count:GPBARRAYSIZE(kValues)];
-//%  XCTAssertNotNil(dict);
-//%  XCTAssertEqual(dict.count, 4U);
-//%DECLARE_VALUE_STORAGE##VHELPER(VALUE_TYPE, value)TEST_VALUE##VHELPER(VALUE_NAME, dict, value, KEY1, VAL1)
-//%TEST_RAW_VALUE##VHELPER(dict, value, KEY2, VAL2)
-//%TEST_VALUE##VHELPER(VALUE_NAME, dict, value, KEY3, VAL3)
-//%TEST_RAW_VALUE##VHELPER(dict, value, KEY4, VAL4)
-//%
-//%  XCTAssertThrowsSpecificNamed([dict setEnum:VAL4 forKey:KEY1],  // Unknown
-//%                               NSException, NSInvalidArgumentException);
-//%  XCTAssertEqual(dict.count, 4U);
-//%TEST_VALUE##VHELPER(VALUE_NAME, dict, value, KEY1, VAL1)
-//%TEST_RAW_VALUE##VHELPER(dict, value, KEY2, VAL2)
-//%TEST_VALUE##VHELPER(VALUE_NAME, dict, value, KEY3, VAL3)
-//%TEST_RAW_VALUE##VHELPER(dict, value, KEY4, VAL4)
-//%
-//%  [dict setRawValue:VAL4 forKey:KEY1];  // Unknown
-//%  XCTAssertEqual(dict.count, 4U);
-//%TEST_RAW_VALUE##VHELPER(dict, value, KEY1, VAL4)
-//%TEST_RAW_VALUE##VHELPER(dict, value, KEY2, VAL2)
-//%TEST_VALUE##VHELPER(VALUE_NAME, dict, value, KEY3, VAL3)
-//%TEST_RAW_VALUE##VHELPER(dict, value, KEY4, VAL4)
-//%
-//%  [dict setRawValue:VAL1 forKey:KEY4];
-//%  XCTAssertEqual(dict.count, 4U);
-//%TEST_RAW_VALUE##VHELPER(dict, value, KEY1, VAL4)
-//%TEST_RAW_VALUE##VHELPER(dict, value, KEY2, VAL2)
-//%TEST_VALUE##VHELPER(VALUE_NAME, dict, value, KEY3, VAL3)
-//%TEST_VALUE##VHELPER(VALUE_NAME, dict, value, KEY4, VAL1)
-//%
-//%  const KEY_TYPE KisP##kKeys2[] = { KEY2, KEY3 };
-//%  const VALUE_TYPE kValues2[] = { VAL3, VAL2 };  // Unknown
-//%  DICTIONARY_CLASS_DECL##VHELPER(KEY_NAME, VALUE_NAME, VALUE_TYPE) *dict2 =
-//%      [[GPB##KEY_NAME##VALUE_NAME##Dictionary alloc] initWithValidationFunction:TestingEnum_IsValidValue
-//%           KEY_NAME$S VALUE_NAME$S                                  rawValues:kValues2
-//%           KEY_NAME$S VALUE_NAME$S                                    forKeys:kKeys2
-//%           KEY_NAME$S VALUE_NAME$S                                      count:GPBARRAYSIZE(kValues2)];
-//%  XCTAssertNotNil(dict2);
-//%  [dict addRawEntriesFromDictionary:dict2];
-//%  XCTAssertEqual(dict.count, 4U);
-//%TEST_RAW_VALUE##VHELPER(dict, value, KEY1, VAL4)
-//%TEST_VALUE##VHELPER(VALUE_NAME, dict, value, KEY2, VAL3)
-//%TEST_RAW_VALUE##VHELPER(dict, value, KEY3, VAL2)
-//%TEST_VALUE##VHELPER(VALUE_NAME, dict, value, KEY4, VAL1)
-//%
-//%  [dict2 release];
-//%  [dict release];
-//%}
-//%
-//%- (void)testCopyUnknowns {
-//%  const KEY_TYPE KisP##kKeys[] = { KEY1, KEY2, KEY3, KEY4 };
-//%  const VALUE_TYPE kValues[] = { VAL1, VAL2, VAL3, VAL4 };
-//%  DICTIONARY_CLASS_DECL##VHELPER(KEY_NAME, VALUE_NAME, VALUE_TYPE) *dict =
-//%      [[GPB##KEY_NAME##VALUE_NAME##Dictionary alloc] initWithValidationFunction:TestingEnum_IsValidValue
-//%           KEY_NAME$S VALUE_NAME$S                                  rawValues:kValues
-//%           KEY_NAME$S VALUE_NAME$S                                    forKeys:kKeys
-//%           KEY_NAME$S VALUE_NAME$S                                      count:GPBARRAYSIZE(kValues)];
-//%  XCTAssertNotNil(dict);
-//%
-//%  DICTIONARY_CLASS_DECL##VHELPER(KEY_NAME, VALUE_NAME, VALUE_TYPE) *dict2 = [dict copy];
-//%  XCTAssertNotNil(dict2);
-//%
-//%  // Should be new pointer, but equal objects.
-//%  XCTAssertNotEqual(dict, dict2);
-//%  XCTAssertEqualObjects(dict, dict2);
-//%  XCTAssertEqual(dict.validationFunc, dict2.validationFunc);  // Pointer comparison
-//%  XCTAssertTrue([dict2 isKindOfClass:[GPB##KEY_NAME##VALUE_NAME##Dictionary class]]);
-//%
-//%  [dict2 release];
-//%  [dict release];
-//%}
-//%
-//%@end
-//%
-
-//
-// Helpers for PODs
-//
-
-//%PDDM-DEFINE DECLARE_VALUE_STORAGEPOD(VALUE_TYPE, NAME)
-//%  VALUE_TYPE NAME;
-//%
-//%PDDM-DEFINE VALUE_NOT_FOUNDPOD(VALUE_NAME, DICT, KEY)
-//%  XCTAssertFalse([DICT get##VALUE_NAME##:NULL forKey:KEY]);
-//%PDDM-DEFINE TEST_VALUEPOD(VALUE_NAME, DICT, STORAGE, KEY, VALUE)
-//%  XCTAssertTrue([DICT get##VALUE_NAME##:NULL forKey:KEY]);
-//%  XCTAssertTrue([DICT get##VALUE_NAME##:&STORAGE forKey:KEY]);
-//%  XCTAssertEqual(STORAGE, VALUE);
-//%PDDM-DEFINE COMPARE_KEYS(KEY1, KEY2)
-//%KEY1 == KEY2
-//%PDDM-DEFINE RAW_VALUE_NOT_FOUNDPOD(VALUE_NAME, DICT, KEY)
-//%  XCTAssertFalse([DICT getRawValue:NULL forKey:KEY]);
-//%PDDM-DEFINE TEST_RAW_VALUEPOD(DICT, STORAGE, KEY, VALUE)
-//%  XCTAssertTrue([DICT getRawValue:NULL forKey:KEY]);
-//%  XCTAssertTrue([DICT getRawValue:&STORAGE forKey:KEY]);
-//%  XCTAssertEqual(STORAGE, VALUE);
-
-//
-// Helpers for Objects
-//
-
-//%PDDM-DEFINE DECLARE_VALUE_STORAGEOBJECT(VALUE_TYPE, NAME)
-// Empty
-//%PDDM-DEFINE VALUE_NOT_FOUNDOBJECT(VALUE_NAME, DICT, KEY)
-//%  XCTAssertNil([DICT objectForKey:KEY]);
-//%PDDM-DEFINE TEST_VALUEOBJECT(VALUE_NAME, DICT, STORAGE, KEY, VALUE)
-//%  XCTAssertEqualObjects([DICT objectForKey:KEY], VALUE);
-//%PDDM-DEFINE COMPARE_KEYSObjects(KEY1, KEY2)
-//%[KEY1 isEqual:KEY2]
-
-//
-// Helpers for tests.
-//
-
-//%PDDM-DEFINE TEST_HELPERS(KEY_NAME, KEY_TYPE, KisP)
-//%// To let the testing macros work, add some extra methods to simplify things.
-//%@interface GPB##KEY_NAME##EnumDictionary (TestingTweak)
-//%- (instancetype)initWithEnums:(const int32_t [])values
-//%                      forKeys:(const KEY_TYPE##KisP$S##KisP [])keys
-//%                        count:(NSUInteger)count;
-//%@end
-//%
-//%static BOOL TestingEnum_IsValidValue(int32_t value) {
-//%  switch (value) {
-//%    case 700:
-//%    case 701:
-//%    case 702:
-//%    case 703:
-//%      return YES;
-//%    default:
-//%      return NO;
-//%  }
-//%}
-//%
-//%@implementation GPB##KEY_NAME##EnumDictionary (TestingTweak)
-//%- (instancetype)initWithEnums:(const int32_t [])values
-//%                      forKeys:(const KEY_TYPE##KisP$S##KisP [])keys
-//%                        count:(NSUInteger)count {
-//%  return [self initWithValidationFunction:TestingEnum_IsValidValue
-//%                                rawValues:values
-//%                                  forKeys:keys
-//%                                    count:count];
-//%}
-//%@end
-//%
-//%
-
-
-//
-// BOOL test macros
-//
-//TODO(thomasvl): enum tests
-
-//%PDDM-DEFINE BOOL_TESTS_FOR_POD_VALUE(VALUE_NAME, VALUE_TYPE, VAL1, VAL2)
-//%BOOL_TESTS_COMMON(Bool, BOOL, , , YES, NO, VALUE_NAME, VALUE_TYPE, , value, POD, VAL1, VAL2)
-
-//%PDDM-DEFINE TESTS_FOR_BOOL_KEY_OBJECT_VALUE(VALUE_NAME, VALUE_TYPE, VAL1, VAL2)
-//%BOOL_TESTS_COMMON(Bool, BOOL, , , YES, NO, VALUE_NAME, VALUE_TYPE, Objects, object, OBJECT, VAL1, VAL2)
-
-//%PDDM-DEFINE BOOL_TESTS_COMMON(KEY_NAME, KEY_TYPE, KisP, KSUFFIX, KEY1, KEY2, VALUE_NAME, VALUE_TYPE, VSUFFIX, VNAME, VHELPER, VAL1, VAL2)
-//%#pragma mark - KEY_NAME -> VALUE_NAME
-//%
-//%@interface GPB##KEY_NAME##VALUE_NAME##DictionaryTests : XCTestCase
-//%@end
-//%
-//%@implementation GPB##KEY_NAME##VALUE_NAME##DictionaryTests
-//%
-//%- (void)testEmpty {
-//%  DICTIONARY_CLASS_DECL##VHELPER(KEY_NAME, VALUE_NAME, VALUE_TYPE) *dict = [[GPB##KEY_NAME##VALUE_NAME##Dictionary alloc] init];
-//%  XCTAssertNotNil(dict);
-//%  XCTAssertEqual(dict.count, 0U);
-//%VALUE_NOT_FOUND##VHELPER(VALUE_NAME, dict, KEY1)
-//%  [dict enumerateKeysAnd##VALUE_NAME##sUsingBlock:^(KEY_TYPE KisP##aKey, VALUE_TYPE a##VNAME$u##, BOOL *stop) {
-//%    #pragma unused(aKey, a##VNAME$u##, stop)
-//%    XCTFail(@"Shouldn't get here!");
-//%  }];
-//%  [dict release];
-//%}
-//%
-//%- (void)testOne {
-//%  DICTIONARY_CLASS_DECL##VHELPER(KEY_NAME, VALUE_NAME, VALUE_TYPE) *dict = [[GPB##KEY_NAME##VALUE_NAME##Dictionary alloc] init];
-//%  [dict set##VALUE_NAME$u##:VAL1 forKey:KEY1];
-//%  XCTAssertNotNil(dict);
-//%  XCTAssertEqual(dict.count, 1U);
-//%DECLARE_VALUE_STORAGE##VHELPER(VALUE_TYPE, VNAME)TEST_VALUE##VHELPER(VALUE_NAME, dict, VNAME, KEY1, VAL1)
-//%VALUE_NOT_FOUND##VHELPER(VALUE_NAME, dict, KEY2)
-//%  [dict enumerateKeysAnd##VALUE_NAME$u##sUsingBlock:^(KEY_TYPE KisP##aKey, VALUE_TYPE a##VNAME$u, BOOL *stop) {
-//%    XCTAssertEqual##KSUFFIX(aKey, KEY1);
-//%    XCTAssertEqual##VSUFFIX(a##VNAME$u, VAL1);
-//%    XCTAssertNotEqual(stop, NULL);
-//%  }];
-//%  [dict release];
-//%}
-//%
-//%- (void)testBasics {
-//%  const KEY_TYPE KisP##kKeys[] = { KEY1, KEY2 };
-//%  const VALUE_TYPE k##VNAME$u##s[] = { VAL1, VAL2 };
-//%  DICTIONARY_CLASS_DECL##VHELPER(KEY_NAME, VALUE_NAME, VALUE_TYPE) *dict =
-//%      [[GPB##KEY_NAME##VALUE_NAME##Dictionary alloc] initWith##VALUE_NAME##s:k##VNAME$u##s
-//%           KEY_NAME$S VALUE_NAME$S                 ##VALUE_NAME$S##  forKeys:kKeys
-//%           KEY_NAME$S VALUE_NAME$S                 ##VALUE_NAME$S##    count:GPBARRAYSIZE(k##VNAME$u##s)];
-//%  XCTAssertNotNil(dict);
-//%  XCTAssertEqual(dict.count, 2U);
-//%DECLARE_VALUE_STORAGE##VHELPER(VALUE_TYPE, VNAME)TEST_VALUE##VHELPER(VALUE_NAME, dict, VNAME, KEY1, VAL1)
-//%TEST_VALUE##VHELPER(VALUE_NAME, dict, VNAME, KEY2, VAL2)
-//%
-//%  __block NSUInteger idx = 0;
-//%  KEY_TYPE KisP##*seenKeys = malloc(2 * sizeof(KEY_TYPE##KisP));
-//%  VALUE_TYPE *seen##VNAME$u##s = malloc(2 * sizeof(VALUE_TYPE));
-//%  [dict enumerateKeysAnd##VALUE_NAME$u##sUsingBlock:^(KEY_TYPE KisP##aKey, VALUE_TYPE a##VNAME$u##, BOOL *stop) {
-//%    XCTAssertLessThan(idx, 2U);
-//%    seenKeys[idx] = aKey;
-//%    seen##VNAME$u##s[idx] = a##VNAME$u;
-//%    XCTAssertNotEqual(stop, NULL);
-//%    ++idx;
-//%  }];
-//%  for (int i = 0; i < 2; ++i) {
-//%    BOOL foundKey = NO;
-//%    for (int j = 0; (j < 2) && !foundKey; ++j) {
-//%      if (COMPARE_KEYS##KSUFFIX(kKeys[i], seenKeys[j])) {
-//%        foundKey = YES;
-//%        XCTAssertEqual##VSUFFIX(k##VNAME$u##s[i], seen##VNAME$u##s[j], @"i = %d, j = %d", i, j);
-//%      }
-//%    }
-//%    XCTAssertTrue(foundKey, @"i = %d", i);
-//%  }
-//%  free(seenKeys);
-//%  free(seen##VNAME$u##s);
-//%
-//%  // Stopping the enumeration.
-//%  idx = 0;
-//%  [dict enumerateKeysAnd##VALUE_NAME$u##sUsingBlock:^(KEY_TYPE KisP##aKey, VALUE_TYPE a##VNAME$u##, BOOL *stop) {
-//%    #pragma unused(aKey, a##VNAME$u)
-//%    if (idx == 0) *stop = YES;
-//%    XCTAssertNotEqual(idx, 2U);
-//%    ++idx;
-//%  }];
-//%  [dict release];
-//%}
-//%
-//%- (void)testEquality {
-//%  const KEY_TYPE KisP##kKeys1[] = { KEY1, KEY2 };
-//%  const KEY_TYPE KisP##kKeys2[] = { KEY2, KEY1 };
-//%  const VALUE_TYPE k##VNAME$u##s1[] = { VAL1, VAL2 };
-//%  const VALUE_TYPE k##VNAME$u##s2[] = { VAL2, VAL1 };
-//%  const VALUE_TYPE k##VNAME$u##s3[] = { VAL2 };
-//%  DICTIONARY_CLASS_DECL##VHELPER(KEY_NAME, VALUE_NAME, VALUE_TYPE) *dict1 =
-//%      [[GPB##KEY_NAME##VALUE_NAME##Dictionary alloc] initWith##VALUE_NAME##s:k##VNAME$u##s1
-//%           KEY_NAME$S VALUE_NAME$S                 ##VALUE_NAME$S##  forKeys:kKeys1
-//%           KEY_NAME$S VALUE_NAME$S                 ##VALUE_NAME$S##    count:GPBARRAYSIZE(k##VNAME$u##s1)];
-//%  XCTAssertNotNil(dict1);
-//%  DICTIONARY_CLASS_DECL##VHELPER(KEY_NAME, VALUE_NAME, VALUE_TYPE) *dict1prime =
-//%      [[GPB##KEY_NAME##VALUE_NAME##Dictionary alloc] initWith##VALUE_NAME##s:k##VNAME$u##s1
-//%           KEY_NAME$S VALUE_NAME$S                 ##VALUE_NAME$S##  forKeys:kKeys1
-//%           KEY_NAME$S VALUE_NAME$S                 ##VALUE_NAME$S##    count:GPBARRAYSIZE(k##VNAME$u##s1)];
-//%  XCTAssertNotNil(dict1prime);
-//%  DICTIONARY_CLASS_DECL##VHELPER(KEY_NAME, VALUE_NAME, VALUE_TYPE) *dict2 =
-//%      [[GPB##KEY_NAME##VALUE_NAME##Dictionary alloc] initWith##VALUE_NAME##s:k##VNAME$u##s2
-//%           KEY_NAME$S VALUE_NAME$S                 ##VALUE_NAME$S##  forKeys:kKeys1
-//%           KEY_NAME$S VALUE_NAME$S                 ##VALUE_NAME$S##    count:GPBARRAYSIZE(k##VNAME$u##s2)];
-//%  XCTAssertNotNil(dict2);
-//%  DICTIONARY_CLASS_DECL##VHELPER(KEY_NAME, VALUE_NAME, VALUE_TYPE) *dict3 =
-//%      [[GPB##KEY_NAME##VALUE_NAME##Dictionary alloc] initWith##VALUE_NAME##s:k##VNAME$u##s1
-//%           KEY_NAME$S VALUE_NAME$S                 ##VALUE_NAME$S##  forKeys:kKeys2
-//%           KEY_NAME$S VALUE_NAME$S                 ##VALUE_NAME$S##    count:GPBARRAYSIZE(k##VNAME$u##s1)];
-//%  XCTAssertNotNil(dict3);
-//%  DICTIONARY_CLASS_DECL##VHELPER(KEY_NAME, VALUE_NAME, VALUE_TYPE) *dict4 =
-//%      [[GPB##KEY_NAME##VALUE_NAME##Dictionary alloc] initWith##VALUE_NAME##s:k##VNAME$u##s3
-//%           KEY_NAME$S VALUE_NAME$S                 ##VALUE_NAME$S##  forKeys:kKeys1
-//%           KEY_NAME$S VALUE_NAME$S                 ##VALUE_NAME$S##    count:GPBARRAYSIZE(k##VNAME$u##s3)];
-//%  XCTAssertNotNil(dict4);
-//%
-//%  // 1/1Prime should be different objects, but equal.
-//%  XCTAssertNotEqual(dict1, dict1prime);
-//%  XCTAssertEqualObjects(dict1, dict1prime);
-//%  // Equal, so they must have same hash.
-//%  XCTAssertEqual([dict1 hash], [dict1prime hash]);
-//%
-//%  // 2 is same keys, different ##VNAME##s; not equal.
-//%  XCTAssertNotEqualObjects(dict1, dict2);
-//%
-//%  // 3 is different keys, same ##VNAME##s; not equal.
-//%  XCTAssertNotEqualObjects(dict1, dict3);
-//%
-//%  // 4 Fewer pairs; not equal
-//%  XCTAssertNotEqualObjects(dict1, dict4);
-//%
-//%  [dict1 release];
-//%  [dict1prime release];
-//%  [dict2 release];
-//%  [dict3 release];
-//%  [dict4 release];
-//%}
-//%
-//%- (void)testCopy {
-//%  const KEY_TYPE KisP##kKeys[] = { KEY1, KEY2 };
-//%  const VALUE_TYPE k##VNAME$u##s[] = { VAL1, VAL2 };
-//%  DICTIONARY_CLASS_DECL##VHELPER(KEY_NAME, VALUE_NAME, VALUE_TYPE) *dict =
-//%      [[GPB##KEY_NAME##VALUE_NAME##Dictionary alloc] initWith##VALUE_NAME##s:k##VNAME$u##s
-//%           KEY_NAME$S VALUE_NAME$S                 ##VALUE_NAME$S##  forKeys:kKeys
-//%           KEY_NAME$S VALUE_NAME$S                 ##VALUE_NAME$S##    count:GPBARRAYSIZE(k##VNAME$u##s)];
-//%  XCTAssertNotNil(dict);
-//%
-//%  DICTIONARY_CLASS_DECL##VHELPER(KEY_NAME, VALUE_NAME, VALUE_TYPE) *dict2 = [dict copy];
-//%  XCTAssertNotNil(dict2);
-//%
-//%  // Should be new object but equal.
-//%  XCTAssertNotEqual(dict, dict2);
-//%  XCTAssertEqualObjects(dict, dict2);
-//%  XCTAssertTrue([dict2 isKindOfClass:[GPB##KEY_NAME##VALUE_NAME##Dictionary class]]);
-//%
-//%  [dict2 release];
-//%  [dict release];
-//%}
-//%
-//%- (void)testDictionaryFromDictionary {
-//%  const KEY_TYPE KisP##kKeys[] = { KEY1, KEY2 };
-//%  const VALUE_TYPE k##VNAME$u##s[] = { VAL1, VAL2 };
-//%  DICTIONARY_CLASS_DECL##VHELPER(KEY_NAME, VALUE_NAME, VALUE_TYPE) *dict =
-//%      [[GPB##KEY_NAME##VALUE_NAME##Dictionary alloc] initWith##VALUE_NAME##s:k##VNAME$u##s
-//%           KEY_NAME$S VALUE_NAME$S                 ##VALUE_NAME$S##  forKeys:kKeys
-//%           KEY_NAME$S VALUE_NAME$S                 ##VALUE_NAME$S##    count:GPBARRAYSIZE(k##VNAME$u##s)];
-//%  XCTAssertNotNil(dict);
-//%
-//%  DICTIONARY_CLASS_DECL##VHELPER(KEY_NAME, VALUE_NAME, VALUE_TYPE) *dict2 =
-//%      [[GPB##KEY_NAME##VALUE_NAME##Dictionary alloc] initWithDictionary:dict];
-//%  XCTAssertNotNil(dict2);
-//%
-//%  // Should be new pointer, but equal objects.
-//%  XCTAssertNotEqual(dict, dict2);
-//%  XCTAssertEqualObjects(dict, dict2);
-//%  [dict2 release];
-//%  [dict release];
-//%}
-//%
-//%- (void)testAdds {
-//%  DICTIONARY_CLASS_DECL##VHELPER(KEY_NAME, VALUE_NAME, VALUE_TYPE) *dict = [[GPB##KEY_NAME##VALUE_NAME##Dictionary alloc] init];
-//%  XCTAssertNotNil(dict);
-//%
-//%  XCTAssertEqual(dict.count, 0U);
-//%  [dict set##VALUE_NAME:VAL1 forKey:KEY1];
-//%  XCTAssertEqual(dict.count, 1U);
-//%
-//%  const KEY_TYPE KisP##kKeys[] = { KEY2 };
-//%  const VALUE_TYPE k##VNAME$u##s[] = { VAL2 };
-//%  DICTIONARY_CLASS_DECL##VHELPER(KEY_NAME, VALUE_NAME, VALUE_TYPE) *dict2 =
-//%      [[GPB##KEY_NAME##VALUE_NAME##Dictionary alloc] initWith##VALUE_NAME##s:k##VNAME$u##s
-//%           KEY_NAME$S VALUE_NAME$S                 ##VALUE_NAME$S##  forKeys:kKeys
-//%           KEY_NAME$S VALUE_NAME$S                 ##VALUE_NAME$S##    count:GPBARRAYSIZE(k##VNAME$u##s)];
-//%  XCTAssertNotNil(dict2);
-//%  [dict addEntriesFromDictionary:dict2];
-//%  XCTAssertEqual(dict.count, 2U);
-//%
-//%DECLARE_VALUE_STORAGE##VHELPER(VALUE_TYPE, VNAME)TEST_VALUE##VHELPER(VALUE_NAME, dict, VNAME, KEY1, VAL1)
-//%TEST_VALUE##VHELPER(VALUE_NAME, dict, VNAME, KEY2, VAL2)
-//%  [dict2 release];
-//%  [dict release];
-//%}
-//%
-//%- (void)testRemove {
-//%  const KEY_TYPE KisP##kKeys[] = { KEY1, KEY2};
-//%  const VALUE_TYPE k##VNAME$u##s[] = { VAL1, VAL2 };
-//%  DICTIONARY_CLASS_DECL##VHELPER(KEY_NAME, VALUE_NAME, VALUE_TYPE) *dict =
-//%      [[GPB##KEY_NAME##VALUE_NAME##Dictionary alloc] initWith##VALUE_NAME##s:k##VNAME$u##s
-//%           KEY_NAME$S VALUE_NAME$S          ##VALUE_NAME$S##  forKeys:kKeys
-//%           KEY_NAME$S VALUE_NAME$S          ##VALUE_NAME$S##    count:GPBARRAYSIZE(k##VNAME$u##s)];
-//%  XCTAssertNotNil(dict);
-//%  XCTAssertEqual(dict.count, 2U);
-//%
-//%  [dict remove##VALUE_NAME##ForKey:KEY2];
-//%  XCTAssertEqual(dict.count, 1U);
-//%DECLARE_VALUE_STORAGE##VHELPER(VALUE_TYPE, VNAME)TEST_VALUE##VHELPER(VALUE_NAME, dict, VNAME, KEY1, VAL1)
-//%VALUE_NOT_FOUND##VHELPER(VALUE_NAME, dict, KEY2)
-//%
-//%  // Remove again does nothing.
-//%  [dict remove##VALUE_NAME##ForKey:KEY2];
-//%  XCTAssertEqual(dict.count, 1U);
-//%TEST_VALUE##VHELPER(VALUE_NAME, dict, VNAME, KEY1, VAL1)
-//%VALUE_NOT_FOUND##VHELPER(VALUE_NAME, dict, KEY2)
-//%
-//%  [dict removeAll];
-//%  XCTAssertEqual(dict.count, 0U);
-//%VALUE_NOT_FOUND##VHELPER(VALUE_NAME, dict, KEY1)
-//%VALUE_NOT_FOUND##VHELPER(VALUE_NAME, dict, KEY2)
-//%  [dict release];
-//%}
-//%
-//%- (void)testInplaceMutation {
-//%  const KEY_TYPE KisP##kKeys[] = { KEY1, KEY2 };
-//%  const VALUE_TYPE k##VNAME$u##s[] = { VAL1, VAL2 };
-//%  DICTIONARY_CLASS_DECL##VHELPER(KEY_NAME, VALUE_NAME, VALUE_TYPE) *dict =
-//%      [[GPB##KEY_NAME##VALUE_NAME##Dictionary alloc] initWith##VALUE_NAME##s:k##VNAME$u##s
-//%           KEY_NAME$S VALUE_NAME$S                 ##VALUE_NAME$S##  forKeys:kKeys
-//%           KEY_NAME$S VALUE_NAME$S                 ##VALUE_NAME$S##    count:GPBARRAYSIZE(k##VNAME$u##s)];
-//%  XCTAssertNotNil(dict);
-//%  XCTAssertEqual(dict.count, 2U);
-//%DECLARE_VALUE_STORAGE##VHELPER(VALUE_TYPE, VNAME)TEST_VALUE##VHELPER(VALUE_NAME, dict, VNAME, KEY1, VAL1)
-//%TEST_VALUE##VHELPER(VALUE_NAME, dict, VNAME, KEY2, VAL2)
-//%
-//%  [dict set##VALUE_NAME##:VAL2 forKey:KEY1];
-//%  XCTAssertEqual(dict.count, 2U);
-//%TEST_VALUE##VHELPER(VALUE_NAME, dict, VNAME, KEY1, VAL2)
-//%TEST_VALUE##VHELPER(VALUE_NAME, dict, VNAME, KEY2, VAL2)
-//%
-//%  [dict set##VALUE_NAME##:VAL1 forKey:KEY2];
-//%  XCTAssertEqual(dict.count, 2U);
-//%TEST_VALUE##VHELPER(VALUE_NAME, dict, VNAME, KEY1, VAL2)
-//%TEST_VALUE##VHELPER(VALUE_NAME, dict, VNAME, KEY2, VAL1)
-//%
-//%  const KEY_TYPE KisP##kKeys2[] = { KEY2, KEY1 };
-//%  const VALUE_TYPE k##VNAME$u##s2[] = { VAL2, VAL1 };
-//%  DICTIONARY_CLASS_DECL##VHELPER(KEY_NAME, VALUE_NAME, VALUE_TYPE) *dict2 =
-//%      [[GPB##KEY_NAME##VALUE_NAME##Dictionary alloc] initWith##VALUE_NAME##s:k##VNAME$u##s2
-//%           KEY_NAME$S VALUE_NAME$S                 ##VALUE_NAME$S##  forKeys:kKeys2
-//%           KEY_NAME$S VALUE_NAME$S                 ##VALUE_NAME$S##    count:GPBARRAYSIZE(k##VNAME$u##s2)];
-//%  XCTAssertNotNil(dict2);
-//%  [dict addEntriesFromDictionary:dict2];
-//%  XCTAssertEqual(dict.count, 2U);
-//%TEST_VALUE##VHELPER(VALUE_NAME, dict, VNAME, KEY1, VAL1)
-//%TEST_VALUE##VHELPER(VALUE_NAME, dict, VNAME, KEY2, VAL2)
-//%
-//%  [dict2 release];
-//%  [dict release];
-//%}
-//%
-//%@end
-//%
-
diff --git a/libs/protobuf/objectivec/Tests/GPBExtensionRegistryTest.m b/libs/protobuf/objectivec/Tests/GPBExtensionRegistryTest.m
deleted file mode 100644
index b116882..0000000
--- a/libs/protobuf/objectivec/Tests/GPBExtensionRegistryTest.m
+++ /dev/null
@@ -1,138 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2017 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#import "GPBTestUtilities.h"
-
-#import "GPBExtensionRegistry.h"
-#import "google/protobuf/Unittest.pbobjc.h"
-
-@interface GPBExtensionRegistryTest : GPBTestCase
-@end
-
-@implementation GPBExtensionRegistryTest
-
-- (void)testBasics {
-  GPBExtensionRegistry *reg = [[[GPBExtensionRegistry alloc] init] autorelease];
-  XCTAssertNotNil(reg);
-
-  XCTAssertNil([reg extensionForDescriptor:[TestAllExtensions descriptor]
-                               fieldNumber:1]);
-  XCTAssertNil([reg extensionForDescriptor:[TestAllTypes descriptor]
-                               fieldNumber:1]);
-
-  [reg addExtension:[UnittestRoot optionalInt32Extension]];
-  [reg addExtension:[UnittestRoot packedInt64Extension]];
-
-  XCTAssertTrue([reg extensionForDescriptor:[TestAllExtensions descriptor] fieldNumber:1] ==
-                [UnittestRoot optionalInt32Extension]); // ptr equality
-  XCTAssertNil([reg extensionForDescriptor:[TestAllTypes descriptor]
-                               fieldNumber:1]);
-  XCTAssertTrue([reg extensionForDescriptor:[TestPackedExtensions descriptor] fieldNumber:91] ==
-                [UnittestRoot packedInt64Extension]); // ptr equality
-}
-
-- (void)testCopy {
-  GPBExtensionRegistry *reg1 = [[[GPBExtensionRegistry alloc] init] autorelease];
-  [reg1 addExtension:[UnittestRoot optionalInt32Extension]];
-
-  GPBExtensionRegistry *reg2 = [[reg1 copy] autorelease];
-  XCTAssertNotNil(reg2);
-
-  XCTAssertTrue([reg1 extensionForDescriptor:[TestAllExtensions descriptor] fieldNumber:1] ==
-                [UnittestRoot optionalInt32Extension]); // ptr equality
-  XCTAssertTrue([reg2 extensionForDescriptor:[TestAllExtensions descriptor] fieldNumber:1] ==
-                [UnittestRoot optionalInt32Extension]); // ptr equality
-
-  // Message class that had registered extension(s) at the -copy time.
-
-  [reg1 addExtension:[UnittestRoot optionalBoolExtension]];
-  [reg2 addExtension:[UnittestRoot optionalStringExtension]];
-
-  XCTAssertTrue([reg1 extensionForDescriptor:[TestAllExtensions descriptor] fieldNumber:13] ==
-                [UnittestRoot optionalBoolExtension]); // ptr equality
-  XCTAssertNil([reg1 extensionForDescriptor:[TestAllExtensions descriptor] fieldNumber:14]);
-  XCTAssertNil([reg2 extensionForDescriptor:[TestAllExtensions descriptor] fieldNumber:13]);
-  XCTAssertTrue([reg2 extensionForDescriptor:[TestAllExtensions descriptor] fieldNumber:14] ==
-                [UnittestRoot optionalStringExtension]); // ptr equality
-
-  // Message class that did not have any registered extensions at the -copy time.
-
-  [reg1 addExtension:[UnittestRoot packedInt64Extension]];
-  [reg2 addExtension:[UnittestRoot packedSint32Extension]];
-
-  XCTAssertTrue([reg1 extensionForDescriptor:[TestPackedExtensions descriptor] fieldNumber:91] ==
-                [UnittestRoot packedInt64Extension]); // ptr equality
-  XCTAssertNil([reg1 extensionForDescriptor:[TestPackedExtensions descriptor] fieldNumber:94]);
-  XCTAssertNil([reg2 extensionForDescriptor:[TestPackedExtensions descriptor] fieldNumber:91]);
-  XCTAssertTrue([reg2 extensionForDescriptor:[TestPackedExtensions descriptor] fieldNumber:94] ==
-                [UnittestRoot packedSint32Extension]); // ptr equality
-
-}
-
-- (void)testAddExtensions {
-  GPBExtensionRegistry *reg1 = [[[GPBExtensionRegistry alloc] init] autorelease];
-  [reg1 addExtension:[UnittestRoot optionalInt32Extension]];
-
-  GPBExtensionRegistry *reg2 = [[[GPBExtensionRegistry alloc] init] autorelease];
-
-  XCTAssertNil([reg2 extensionForDescriptor:[TestAllExtensions descriptor]
-                                fieldNumber:1]);
-
-  [reg2 addExtensions:reg1];
-
-  XCTAssertTrue([reg2 extensionForDescriptor:[TestAllExtensions descriptor] fieldNumber:1] ==
-                [UnittestRoot optionalInt32Extension]); // ptr equality
-
-  // Confirm adding to the first doesn't add to the second.
-
-  [reg1 addExtension:[UnittestRoot optionalBoolExtension]];
-  [reg1 addExtension:[UnittestRoot packedInt64Extension]];
-
-  XCTAssertTrue([reg1 extensionForDescriptor:[TestAllExtensions descriptor] fieldNumber:13] ==
-                [UnittestRoot optionalBoolExtension]); // ptr equality
-  XCTAssertTrue([reg1 extensionForDescriptor:[TestPackedExtensions descriptor] fieldNumber:91] ==
-                [UnittestRoot packedInt64Extension]); // ptr equality
-  XCTAssertNil([reg2 extensionForDescriptor:[TestAllExtensions descriptor] fieldNumber:13]);
-  XCTAssertNil([reg2 extensionForDescriptor:[TestPackedExtensions descriptor] fieldNumber:91]);
-
-  // Confirm adding to the second doesn't add to the first.
-
-  [reg2 addExtension:[UnittestRoot optionalStringExtension]];
-  [reg2 addExtension:[UnittestRoot packedSint32Extension]];
-
-  XCTAssertNil([reg1 extensionForDescriptor:[TestAllExtensions descriptor] fieldNumber:14]);
-  XCTAssertNil([reg1 extensionForDescriptor:[TestPackedExtensions descriptor] fieldNumber:94]);
-  XCTAssertTrue([reg2 extensionForDescriptor:[TestAllExtensions descriptor] fieldNumber:14] ==
-                [UnittestRoot optionalStringExtension]); // ptr equality
-  XCTAssertTrue([reg2 extensionForDescriptor:[TestPackedExtensions descriptor] fieldNumber:94] ==
-                [UnittestRoot packedSint32Extension]); // ptr equality
-}
-
-@end
diff --git a/libs/protobuf/objectivec/Tests/GPBMessageTests+ClassNames.m b/libs/protobuf/objectivec/Tests/GPBMessageTests+ClassNames.m
deleted file mode 100644
index b5a5c51..0000000
--- a/libs/protobuf/objectivec/Tests/GPBMessageTests+ClassNames.m
+++ /dev/null
@@ -1,164 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#import "GPBTestUtilities.h"
-
-#import <objc/runtime.h>
-
-#import "GPBDescriptor_PackagePrivate.h"
-#import "GPBExtensionRegistry.h"
-#import "GPBMessage.h"
-#import "GPBRootObject_PackagePrivate.h"
-
-// Support classes for tests using old class name (vs classrefs) interfaces.
-GPB_FINAL @interface MessageLackingClazzRoot : GPBRootObject
-@end
-
-@interface MessageLackingClazzRoot (DynamicMethods)
-+ (GPBExtensionDescriptor *)ext1;
-@end
-
-GPB_FINAL @interface MessageLackingClazz : GPBMessage
-@property(copy, nonatomic) NSString *foo;
-@end
-
-@implementation MessageLackingClazz
-
-@dynamic foo;
-
-typedef struct MessageLackingClazz_storage_ {
-  uint32_t _has_storage_[1];
-  NSString *foo;
-} MessageLackingClazz_storage_;
-
-+ (GPBDescriptor *)descriptor {
-  static GPBDescriptor *descriptor = nil;
-  if (!descriptor) {
-    static GPBMessageFieldDescription fields[] = {
-      {
-        .name = "foo",
-        .dataTypeSpecific.className = "NSString",
-        .number = 1,
-        .hasIndex = 0,
-        .offset = (uint32_t)offsetof(MessageLackingClazz_storage_, foo),
-        .flags = (GPBFieldFlags)(GPBFieldOptional),
-        .dataType = GPBDataTypeMessage,
-      },
-    };
-    GPBFileDescriptor *desc =
-        [[[GPBFileDescriptor alloc] initWithPackage:@"test"
-                                         objcPrefix:@"TEST"
-                                             syntax:GPBFileSyntaxProto3] autorelease];
-
-    // GPBDescriptorInitializationFlag_UsesClassRefs intentionally not set here
-    descriptor =
-        [GPBDescriptor allocDescriptorForClass:[MessageLackingClazz class]
-                                     rootClass:[MessageLackingClazzRoot class]
-                                          file:desc
-                                        fields:fields
-                                    fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
-                                   storageSize:sizeof(MessageLackingClazz_storage_)
-                                         flags:GPBDescriptorInitializationFlag_None];
-    [descriptor setupContainingMessageClassName:"MessageLackingClazz"];
-  }
-  return descriptor;
-}
-@end
-
-@implementation MessageLackingClazzRoot
-
-+ (GPBExtensionRegistry*)extensionRegistry {
-  // This is called by +initialize so there is no need to worry
-  // about thread safety and initialization of registry.
-  static GPBExtensionRegistry* registry = nil;
-  if (!registry) {
-    registry = [[GPBExtensionRegistry alloc] init];
-    static GPBExtensionDescription descriptions[] = {
-      {
-        .defaultValue.valueMessage = NULL,
-        .singletonName = "MessageLackingClazzRoot_ext1",
-        .extendedClass.name = "MessageLackingClazz",
-        .messageOrGroupClass.name = "MessageLackingClazz",
-        .enumDescriptorFunc = NULL,
-        .fieldNumber = 1,
-        .dataType = GPBDataTypeMessage,
-        // GPBExtensionUsesClazz Intentionally not set
-        .options = 0,
-      },
-    };
-    for (size_t i = 0; i < sizeof(descriptions) / sizeof(descriptions[0]); ++i) {
-      // Intentionall using `-initWithExtensionDescription:` and not `
-      // -initWithExtensionDescription:usesClassRefs:` to test backwards
-      // compatibility
-      GPBExtensionDescriptor *extension =
-          [[GPBExtensionDescriptor alloc] initWithExtensionDescription:&descriptions[i]];
-      [registry addExtension:extension];
-      [self globallyRegisterExtension:extension];
-      [extension release];
-    }
-    // None of the imports (direct or indirect) defined extensions, so no need to add
-    // them to this registry.
-  }
-  return registry;
-}
-@end
-
-@interface MessageClassNameTests : GPBTestCase
-@end
-
-@implementation MessageClassNameTests
-
-- (void)testClassNameSupported {
-  // This tests backwards compatibility to make sure we support older sources
-  // that use class names instead of references.
-  GPBDescriptor *desc = [MessageLackingClazz descriptor];
-  GPBFieldDescriptor *fieldDesc = [desc fieldWithName:@"foo"];
-  XCTAssertEqualObjects(fieldDesc.msgClass, [NSString class]);
-}
-
-- (void)testSetupContainingMessageClassNameSupported {
-  // This tests backwards compatibility to make sure we support older sources
-  // that use class names instead of references.
-  GPBDescriptor *desc = [MessageLackingClazz descriptor];
-  GPBDescriptor *container = [desc containingType];
-  XCTAssertEqualObjects(container.messageClass, [MessageLackingClazz class]);
-}
-
-- (void)testExtensionsNameSupported {
-  // This tests backwards compatibility to make sure we support older sources
-  // that use class names instead of references.
-  GPBExtensionDescriptor *desc = [MessageLackingClazzRoot ext1];
-  Class containerClass = [desc containingMessageClass];
-  XCTAssertEqualObjects(containerClass, [MessageLackingClazz class]);
-  Class msgClass = [desc msgClass];
-  XCTAssertEqualObjects(msgClass, [MessageLackingClazz class]);
-}
-
-@end
diff --git a/libs/protobuf/objectivec/Tests/GPBMessageTests+Merge.m b/libs/protobuf/objectivec/Tests/GPBMessageTests+Merge.m
deleted file mode 100644
index f895542..0000000
--- a/libs/protobuf/objectivec/Tests/GPBMessageTests+Merge.m
+++ /dev/null
@@ -1,756 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#import "GPBTestUtilities.h"
-
-#import <objc/runtime.h>
-
-#import "GPBMessage.h"
-
-#import "google/protobuf/MapUnittest.pbobjc.h"
-#import "google/protobuf/Unittest.pbobjc.h"
-#import "google/protobuf/UnittestPreserveUnknownEnum.pbobjc.h"
-#import "google/protobuf/UnittestRuntimeProto2.pbobjc.h"
-#import "google/protobuf/UnittestRuntimeProto3.pbobjc.h"
-
-@interface MessageMergeTests : GPBTestCase
-@end
-
-@implementation MessageMergeTests
-
-// TODO(thomasvl): Pull tests over from GPBMessageTests that are merge specific.
-
-- (void)testProto3MergingAndZeroValues {
-  // Proto2 covered in other tests.
-
-  Message3 *src = [[Message3 alloc] init];
-  Message3 *dst = [[Message3 alloc] init];
-  NSData *testData1 = [@"abc" dataUsingEncoding:NSUTF8StringEncoding];
-  NSData *testData2 = [@"def" dataUsingEncoding:NSUTF8StringEncoding];
-
-  dst.optionalInt32 = 1;
-  dst.optionalInt64 = 1;
-  dst.optionalUint32 = 1;
-  dst.optionalUint64 = 1;
-  dst.optionalSint32 = 1;
-  dst.optionalSint64 = 1;
-  dst.optionalFixed32 = 1;
-  dst.optionalFixed64 = 1;
-  dst.optionalSfixed32 = 1;
-  dst.optionalSfixed64 = 1;
-  dst.optionalFloat = 1.0f;
-  dst.optionalDouble = 1.0;
-  dst.optionalBool = YES;
-  dst.optionalString = @"bar";
-  dst.optionalBytes = testData1;
-  dst.optionalEnum = Message3_Enum_Bar;
-
-  // All zeros, nothing should overright.
-
-  src.optionalInt32 = 0;
-  src.optionalInt64 = 0;
-  src.optionalUint32 = 0;
-  src.optionalUint64 = 0;
-  src.optionalSint32 = 0;
-  src.optionalSint64 = 0;
-  src.optionalFixed32 = 0;
-  src.optionalFixed64 = 0;
-  src.optionalSfixed32 = 0;
-  src.optionalSfixed64 = 0;
-  src.optionalFloat = 0.0f;
-  src.optionalDouble = 0.0;
-  src.optionalBool = NO;
-  src.optionalString = @"";
-  src.optionalBytes = [NSData data];
-  src.optionalEnum = Message3_Enum_Foo;  // first value
-
-  [dst mergeFrom:src];
-
-  XCTAssertEqual(dst.optionalInt32, 1);
-  XCTAssertEqual(dst.optionalInt64, 1);
-  XCTAssertEqual(dst.optionalUint32, 1U);
-  XCTAssertEqual(dst.optionalUint64, 1U);
-  XCTAssertEqual(dst.optionalSint32, 1);
-  XCTAssertEqual(dst.optionalSint64, 1);
-  XCTAssertEqual(dst.optionalFixed32, 1U);
-  XCTAssertEqual(dst.optionalFixed64, 1U);
-  XCTAssertEqual(dst.optionalSfixed32, 1);
-  XCTAssertEqual(dst.optionalSfixed64, 1);
-  XCTAssertEqual(dst.optionalFloat, 1.0f);
-  XCTAssertEqual(dst.optionalDouble, 1.0);
-  XCTAssertEqual(dst.optionalBool, YES);
-  XCTAssertEqualObjects(dst.optionalString, @"bar");
-  XCTAssertEqualObjects(dst.optionalBytes, testData1);
-  XCTAssertEqual(dst.optionalEnum, Message3_Enum_Bar);
-
-  // Half the values that will replace.
-
-  src.optionalInt32 = 0;
-  src.optionalInt64 = 2;
-  src.optionalUint32 = 0;
-  src.optionalUint64 = 2;
-  src.optionalSint32 = 0;
-  src.optionalSint64 = 2;
-  src.optionalFixed32 = 0;
-  src.optionalFixed64 = 2;
-  src.optionalSfixed32 = 0;
-  src.optionalSfixed64 = 2;
-  src.optionalFloat = 0.0f;
-  src.optionalDouble = 2.0;
-  src.optionalBool = YES;  // No other value to use.  :(
-  src.optionalString = @"baz";
-  src.optionalBytes = nil;
-  src.optionalEnum = Message3_Enum_Baz;
-
-  [dst mergeFrom:src];
-
-  XCTAssertEqual(dst.optionalInt32, 1);
-  XCTAssertEqual(dst.optionalInt64, 2);
-  XCTAssertEqual(dst.optionalUint32, 1U);
-  XCTAssertEqual(dst.optionalUint64, 2U);
-  XCTAssertEqual(dst.optionalSint32, 1);
-  XCTAssertEqual(dst.optionalSint64, 2);
-  XCTAssertEqual(dst.optionalFixed32, 1U);
-  XCTAssertEqual(dst.optionalFixed64, 2U);
-  XCTAssertEqual(dst.optionalSfixed32, 1);
-  XCTAssertEqual(dst.optionalSfixed64, 2);
-  XCTAssertEqual(dst.optionalFloat, 1.0f);
-  XCTAssertEqual(dst.optionalDouble, 2.0);
-  XCTAssertEqual(dst.optionalBool, YES);
-  XCTAssertEqualObjects(dst.optionalString, @"baz");
-  XCTAssertEqualObjects(dst.optionalBytes, testData1);
-  XCTAssertEqual(dst.optionalEnum, Message3_Enum_Baz);
-
-  // Other half the values that will replace.
-
-  src.optionalInt32 = 3;
-  src.optionalInt64 = 0;
-  src.optionalUint32 = 3;
-  src.optionalUint64 = 0;
-  src.optionalSint32 = 3;
-  src.optionalSint64 = 0;
-  src.optionalFixed32 = 3;
-  src.optionalFixed64 = 0;
-  src.optionalSfixed32 = 3;
-  src.optionalSfixed64 = 0;
-  src.optionalFloat = 3.0f;
-  src.optionalDouble = 0.0;
-  src.optionalBool = YES;  // No other value to use.  :(
-  src.optionalString = nil;
-  src.optionalBytes = testData2;
-  src.optionalEnum = Message3_Enum_Foo;
-
-  [dst mergeFrom:src];
-
-  XCTAssertEqual(dst.optionalInt32, 3);
-  XCTAssertEqual(dst.optionalInt64, 2);
-  XCTAssertEqual(dst.optionalUint32, 3U);
-  XCTAssertEqual(dst.optionalUint64, 2U);
-  XCTAssertEqual(dst.optionalSint32, 3);
-  XCTAssertEqual(dst.optionalSint64, 2);
-  XCTAssertEqual(dst.optionalFixed32, 3U);
-  XCTAssertEqual(dst.optionalFixed64, 2U);
-  XCTAssertEqual(dst.optionalSfixed32, 3);
-  XCTAssertEqual(dst.optionalSfixed64, 2);
-  XCTAssertEqual(dst.optionalFloat, 3.0f);
-  XCTAssertEqual(dst.optionalDouble, 2.0);
-  XCTAssertEqual(dst.optionalBool, YES);
-  XCTAssertEqualObjects(dst.optionalString, @"baz");
-  XCTAssertEqualObjects(dst.optionalBytes, testData2);
-  XCTAssertEqual(dst.optionalEnum, Message3_Enum_Baz);
-
-  [src release];
-  [dst release];
-}
-
-- (void)testProto3MergingEnums {
-  UnknownEnumsMyMessage *src = [UnknownEnumsMyMessage message];
-  UnknownEnumsMyMessage *dst = [UnknownEnumsMyMessage message];
-
-  // Known value.
-
-  src.e = UnknownEnumsMyEnum_Bar;
-  src.repeatedEArray =
-      [GPBEnumArray arrayWithValidationFunction:UnknownEnumsMyEnum_IsValidValue
-                                       rawValue:UnknownEnumsMyEnum_Bar];
-  src.repeatedPackedEArray =
-      [GPBEnumArray arrayWithValidationFunction:UnknownEnumsMyEnum_IsValidValue
-                                       rawValue:UnknownEnumsMyEnum_Bar];
-  src.oneofE1 = UnknownEnumsMyEnum_Bar;
-
-  [dst mergeFrom:src];
-
-  XCTAssertEqual(dst.e, UnknownEnumsMyEnum_Bar);
-  XCTAssertEqual(dst.repeatedEArray.count, 1U);
-  XCTAssertEqual([dst.repeatedEArray valueAtIndex:0], UnknownEnumsMyEnum_Bar);
-  XCTAssertEqual(dst.repeatedPackedEArray.count, 1U);
-  XCTAssertEqual([dst.repeatedPackedEArray valueAtIndex:0],
-                 UnknownEnumsMyEnum_Bar);
-  XCTAssertEqual(dst.oneofE1, UnknownEnumsMyEnum_Bar);
-
-  // Unknown value.
-
-  const int32_t kUnknownValue = 666;
-
-  SetUnknownEnumsMyMessage_E_RawValue(src, kUnknownValue);
-  src.repeatedEArray =
-      [GPBEnumArray arrayWithValidationFunction:UnknownEnumsMyEnum_IsValidValue
-                                       rawValue:kUnknownValue];
-  src.repeatedPackedEArray =
-      [GPBEnumArray arrayWithValidationFunction:UnknownEnumsMyEnum_IsValidValue
-                                       rawValue:kUnknownValue];
-  SetUnknownEnumsMyMessage_OneofE1_RawValue(src, kUnknownValue);
-
-  [dst mergeFrom:src];
-
-  XCTAssertEqual(dst.e, UnknownEnumsMyEnum_GPBUnrecognizedEnumeratorValue);
-  XCTAssertEqual(UnknownEnumsMyMessage_E_RawValue(dst), kUnknownValue);
-  XCTAssertEqual(dst.repeatedEArray.count, 2U);
-  XCTAssertEqual([dst.repeatedEArray valueAtIndex:0], UnknownEnumsMyEnum_Bar);
-  XCTAssertEqual([dst.repeatedEArray valueAtIndex:1],
-                 UnknownEnumsMyEnum_GPBUnrecognizedEnumeratorValue);
-  XCTAssertEqual([dst.repeatedEArray rawValueAtIndex:1], kUnknownValue);
-  XCTAssertEqual(dst.repeatedPackedEArray.count, 2U);
-  XCTAssertEqual([dst.repeatedPackedEArray valueAtIndex:0],
-                 UnknownEnumsMyEnum_Bar);
-  XCTAssertEqual([dst.repeatedPackedEArray valueAtIndex:1],
-                 UnknownEnumsMyEnum_GPBUnrecognizedEnumeratorValue);
-  XCTAssertEqual([dst.repeatedPackedEArray rawValueAtIndex:1], kUnknownValue);
-  XCTAssertEqual(dst.oneofE1,
-                 UnknownEnumsMyEnum_GPBUnrecognizedEnumeratorValue);
-  XCTAssertEqual(UnknownEnumsMyMessage_OneofE1_RawValue(dst), kUnknownValue);
-}
-
-- (void)testProto2MergeOneof {
-  Message2 *src = [Message2 message];
-  Message2 *dst = [Message2 message];
-
-  //
-  // Make sure whatever is in dst gets cleared out be merging in something else.
-  //
-
-  dst.oneofEnum = Message2_Enum_Bar;
-
-//%PDDM-DEFINE MERGE2_TEST(SET_NAME, SET_VALUE, CLEARED_NAME, CLEARED_DEFAULT)
-//%  src.oneof##SET_NAME = SET_VALUE;
-//%  [dst mergeFrom:src];
-//%  XCTAssertEqual(dst.oOneOfCase, Message2_O_OneOfCase_Oneof##SET_NAME);
-//%  XCTAssertEqual(dst.oneof##SET_NAME, SET_VALUE);
-//%  XCTAssertEqual(dst.oneof##CLEARED_NAME, CLEARED_DEFAULT);
-//%
-//%PDDM-EXPAND MERGE2_TEST(Int32, 10, Enum, Message2_Enum_Baz)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-  src.oneofInt32 = 10;
-  [dst mergeFrom:src];
-  XCTAssertEqual(dst.oOneOfCase, Message2_O_OneOfCase_OneofInt32);
-  XCTAssertEqual(dst.oneofInt32, 10);
-  XCTAssertEqual(dst.oneofEnum, Message2_Enum_Baz);
-
-// clang-format on
-//%PDDM-EXPAND MERGE2_TEST(Int64, 11, Int32, 100)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-  src.oneofInt64 = 11;
-  [dst mergeFrom:src];
-  XCTAssertEqual(dst.oOneOfCase, Message2_O_OneOfCase_OneofInt64);
-  XCTAssertEqual(dst.oneofInt64, 11);
-  XCTAssertEqual(dst.oneofInt32, 100);
-
-// clang-format on
-//%PDDM-EXPAND MERGE2_TEST(Uint32, 12U, Int64, 101)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-  src.oneofUint32 = 12U;
-  [dst mergeFrom:src];
-  XCTAssertEqual(dst.oOneOfCase, Message2_O_OneOfCase_OneofUint32);
-  XCTAssertEqual(dst.oneofUint32, 12U);
-  XCTAssertEqual(dst.oneofInt64, 101);
-
-// clang-format on
-//%PDDM-EXPAND MERGE2_TEST(Uint64, 13U, Uint32, 102U)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-  src.oneofUint64 = 13U;
-  [dst mergeFrom:src];
-  XCTAssertEqual(dst.oOneOfCase, Message2_O_OneOfCase_OneofUint64);
-  XCTAssertEqual(dst.oneofUint64, 13U);
-  XCTAssertEqual(dst.oneofUint32, 102U);
-
-// clang-format on
-//%PDDM-EXPAND MERGE2_TEST(Sint32, 14, Uint64, 103U)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-  src.oneofSint32 = 14;
-  [dst mergeFrom:src];
-  XCTAssertEqual(dst.oOneOfCase, Message2_O_OneOfCase_OneofSint32);
-  XCTAssertEqual(dst.oneofSint32, 14);
-  XCTAssertEqual(dst.oneofUint64, 103U);
-
-// clang-format on
-//%PDDM-EXPAND MERGE2_TEST(Sint64, 15, Sint32, 104)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-  src.oneofSint64 = 15;
-  [dst mergeFrom:src];
-  XCTAssertEqual(dst.oOneOfCase, Message2_O_OneOfCase_OneofSint64);
-  XCTAssertEqual(dst.oneofSint64, 15);
-  XCTAssertEqual(dst.oneofSint32, 104);
-
-// clang-format on
-//%PDDM-EXPAND MERGE2_TEST(Fixed32, 16U, Sint64, 105)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-  src.oneofFixed32 = 16U;
-  [dst mergeFrom:src];
-  XCTAssertEqual(dst.oOneOfCase, Message2_O_OneOfCase_OneofFixed32);
-  XCTAssertEqual(dst.oneofFixed32, 16U);
-  XCTAssertEqual(dst.oneofSint64, 105);
-
-// clang-format on
-//%PDDM-EXPAND MERGE2_TEST(Fixed64, 17U, Fixed32, 106U)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-  src.oneofFixed64 = 17U;
-  [dst mergeFrom:src];
-  XCTAssertEqual(dst.oOneOfCase, Message2_O_OneOfCase_OneofFixed64);
-  XCTAssertEqual(dst.oneofFixed64, 17U);
-  XCTAssertEqual(dst.oneofFixed32, 106U);
-
-// clang-format on
-//%PDDM-EXPAND MERGE2_TEST(Sfixed32, 18, Fixed64, 107U)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-  src.oneofSfixed32 = 18;
-  [dst mergeFrom:src];
-  XCTAssertEqual(dst.oOneOfCase, Message2_O_OneOfCase_OneofSfixed32);
-  XCTAssertEqual(dst.oneofSfixed32, 18);
-  XCTAssertEqual(dst.oneofFixed64, 107U);
-
-// clang-format on
-//%PDDM-EXPAND MERGE2_TEST(Sfixed64, 19, Sfixed32, 108)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-  src.oneofSfixed64 = 19;
-  [dst mergeFrom:src];
-  XCTAssertEqual(dst.oOneOfCase, Message2_O_OneOfCase_OneofSfixed64);
-  XCTAssertEqual(dst.oneofSfixed64, 19);
-  XCTAssertEqual(dst.oneofSfixed32, 108);
-
-// clang-format on
-//%PDDM-EXPAND MERGE2_TEST(Float, 20.0f, Sfixed64, 109)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-  src.oneofFloat = 20.0f;
-  [dst mergeFrom:src];
-  XCTAssertEqual(dst.oOneOfCase, Message2_O_OneOfCase_OneofFloat);
-  XCTAssertEqual(dst.oneofFloat, 20.0f);
-  XCTAssertEqual(dst.oneofSfixed64, 109);
-
-// clang-format on
-//%PDDM-EXPAND MERGE2_TEST(Double, 21.0, Float, 110.0f)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-  src.oneofDouble = 21.0;
-  [dst mergeFrom:src];
-  XCTAssertEqual(dst.oOneOfCase, Message2_O_OneOfCase_OneofDouble);
-  XCTAssertEqual(dst.oneofDouble, 21.0);
-  XCTAssertEqual(dst.oneofFloat, 110.0f);
-
-// clang-format on
-//%PDDM-EXPAND MERGE2_TEST(Bool, NO, Double, 111.0)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-  src.oneofBool = NO;
-  [dst mergeFrom:src];
-  XCTAssertEqual(dst.oOneOfCase, Message2_O_OneOfCase_OneofBool);
-  XCTAssertEqual(dst.oneofBool, NO);
-  XCTAssertEqual(dst.oneofDouble, 111.0);
-
-// clang-format on
-//%PDDM-EXPAND MERGE2_TEST(Enum, Message2_Enum_Bar, Bool, YES)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-  src.oneofEnum = Message2_Enum_Bar;
-  [dst mergeFrom:src];
-  XCTAssertEqual(dst.oOneOfCase, Message2_O_OneOfCase_OneofEnum);
-  XCTAssertEqual(dst.oneofEnum, Message2_Enum_Bar);
-  XCTAssertEqual(dst.oneofBool, YES);
-
-// clang-format on
-//%PDDM-EXPAND-END (14 expansions)
-
-  NSString *oneofStringDefault = @"string";
-  NSData *oneofBytesDefault = [@"data" dataUsingEncoding:NSUTF8StringEncoding];
-
-  src.oneofString = @"foo";
-  [dst mergeFrom:src];
-  XCTAssertEqual(dst.oOneOfCase, Message2_O_OneOfCase_OneofString);
-  XCTAssertEqualObjects(dst.oneofString, @"foo");
-  XCTAssertEqual(dst.oneofEnum, Message2_Enum_Baz);
-
-  src.oneofBytes = [@"bar" dataUsingEncoding:NSUTF8StringEncoding];
-  [dst mergeFrom:src];
-  XCTAssertEqual(dst.oOneOfCase, Message2_O_OneOfCase_OneofBytes);
-  XCTAssertEqualObjects(dst.oneofBytes,
-                        [@"bar" dataUsingEncoding:NSUTF8StringEncoding]);
-  XCTAssertEqualObjects(dst.oneofString, oneofStringDefault);
-
-  Message2_OneofGroup *group = [Message2_OneofGroup message];
-  group.a = 666;
-  src.oneofGroup = group;
-  [dst mergeFrom:src];
-  XCTAssertEqual(dst.oOneOfCase, Message2_O_OneOfCase_OneofGroup);
-  Message2_OneofGroup *mergedGroup = [[dst.oneofGroup retain] autorelease];
-  XCTAssertNotNil(mergedGroup);
-  XCTAssertNotEqual(mergedGroup, group);  // Pointer comparison.
-  XCTAssertEqualObjects(mergedGroup, group);
-  XCTAssertEqualObjects(dst.oneofBytes, oneofBytesDefault);
-
-  Message2 *subMessage = [Message2 message];
-  subMessage.optionalInt32 = 777;
-  src.oneofMessage = subMessage;
-  [dst mergeFrom:src];
-  XCTAssertEqual(dst.oOneOfCase, Message2_O_OneOfCase_OneofMessage);
-  Message2 *mergedSubMessage = [[dst.oneofMessage retain] autorelease];
-  XCTAssertNotNil(mergedSubMessage);
-  XCTAssertNotEqual(mergedSubMessage, subMessage);  // Pointer comparison.
-  XCTAssertEqualObjects(mergedSubMessage, subMessage);
-  XCTAssertNotNil(dst.oneofGroup);
-  XCTAssertNotEqual(dst.oneofGroup, mergedGroup);  // Pointer comparison.
-
-  // Back to something else to make sure message clears out ok.
-
-  src.oneofInt32 = 10;
-  [dst mergeFrom:src];
-  XCTAssertEqual(dst.oOneOfCase, Message2_O_OneOfCase_OneofInt32);
-  XCTAssertNotNil(dst.oneofMessage);
-  XCTAssertNotEqual(dst.oneofMessage,
-                    mergedSubMessage);  // Pointer comparison.
-
-  //
-  // Test merging in to message/group when they already had something.
-  //
-
-  src.oneofGroup = group;
-  mergedGroup = [Message2_OneofGroup message];
-  mergedGroup.b = 888;
-  dst.oneofGroup = mergedGroup;
-  [dst mergeFrom:src];
-  XCTAssertEqual(dst.oOneOfCase, Message2_O_OneOfCase_OneofGroup);
-  // Shouldn't have been a new object.
-  XCTAssertEqual(dst.oneofGroup, mergedGroup);  // Pointer comparison.
-  XCTAssertEqual(dst.oneofGroup.a, 666);        // Pointer comparison.
-  XCTAssertEqual(dst.oneofGroup.b, 888);        // Pointer comparison.
-
-  src.oneofMessage = subMessage;
-  mergedSubMessage = [Message2 message];
-  mergedSubMessage.optionalInt64 = 999;
-  dst.oneofMessage = mergedSubMessage;
-  [dst mergeFrom:src];
-  XCTAssertEqual(dst.oOneOfCase, Message2_O_OneOfCase_OneofMessage);
-  // Shouldn't have been a new object.
-  XCTAssertEqual(dst.oneofMessage, mergedSubMessage);   // Pointer comparison.
-  XCTAssertEqual(dst.oneofMessage.optionalInt32, 777);  // Pointer comparison.
-  XCTAssertEqual(dst.oneofMessage.optionalInt64, 999);  // Pointer comparison.
-}
-
-- (void)testProto3MergeOneof {
-  Message3 *src = [Message3 message];
-  Message3 *dst = [Message3 message];
-
-  //
-  // Make sure whatever is in dst gets cleared out be merging in something else.
-  //
-
-  dst.oneofEnum = Message3_Enum_Bar;
-
-//%PDDM-DEFINE MERGE3_TEST(SET_NAME, SET_VALUE, CLEARED_NAME, CLEARED_DEFAULT)
-//%  src.oneof##SET_NAME = SET_VALUE;
-//%  [dst mergeFrom:src];
-//%  XCTAssertEqual(dst.oOneOfCase, Message3_O_OneOfCase_Oneof##SET_NAME);
-//%  XCTAssertEqual(dst.oneof##SET_NAME, SET_VALUE);
-//%  XCTAssertEqual(dst.oneof##CLEARED_NAME, CLEARED_DEFAULT);
-//%
-//%PDDM-EXPAND MERGE3_TEST(Int32, 10, Enum, Message3_Enum_Foo)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-  src.oneofInt32 = 10;
-  [dst mergeFrom:src];
-  XCTAssertEqual(dst.oOneOfCase, Message3_O_OneOfCase_OneofInt32);
-  XCTAssertEqual(dst.oneofInt32, 10);
-  XCTAssertEqual(dst.oneofEnum, Message3_Enum_Foo);
-
-// clang-format on
-//%PDDM-EXPAND MERGE3_TEST(Int64, 11, Int32, 0)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-  src.oneofInt64 = 11;
-  [dst mergeFrom:src];
-  XCTAssertEqual(dst.oOneOfCase, Message3_O_OneOfCase_OneofInt64);
-  XCTAssertEqual(dst.oneofInt64, 11);
-  XCTAssertEqual(dst.oneofInt32, 0);
-
-// clang-format on
-//%PDDM-EXPAND MERGE3_TEST(Uint32, 12U, Int64, 0)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-  src.oneofUint32 = 12U;
-  [dst mergeFrom:src];
-  XCTAssertEqual(dst.oOneOfCase, Message3_O_OneOfCase_OneofUint32);
-  XCTAssertEqual(dst.oneofUint32, 12U);
-  XCTAssertEqual(dst.oneofInt64, 0);
-
-// clang-format on
-//%PDDM-EXPAND MERGE3_TEST(Uint64, 13U, Uint32, 0U)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-  src.oneofUint64 = 13U;
-  [dst mergeFrom:src];
-  XCTAssertEqual(dst.oOneOfCase, Message3_O_OneOfCase_OneofUint64);
-  XCTAssertEqual(dst.oneofUint64, 13U);
-  XCTAssertEqual(dst.oneofUint32, 0U);
-
-// clang-format on
-//%PDDM-EXPAND MERGE3_TEST(Sint32, 14, Uint64, 0U)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-  src.oneofSint32 = 14;
-  [dst mergeFrom:src];
-  XCTAssertEqual(dst.oOneOfCase, Message3_O_OneOfCase_OneofSint32);
-  XCTAssertEqual(dst.oneofSint32, 14);
-  XCTAssertEqual(dst.oneofUint64, 0U);
-
-// clang-format on
-//%PDDM-EXPAND MERGE3_TEST(Sint64, 15, Sint32, 0)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-  src.oneofSint64 = 15;
-  [dst mergeFrom:src];
-  XCTAssertEqual(dst.oOneOfCase, Message3_O_OneOfCase_OneofSint64);
-  XCTAssertEqual(dst.oneofSint64, 15);
-  XCTAssertEqual(dst.oneofSint32, 0);
-
-// clang-format on
-//%PDDM-EXPAND MERGE3_TEST(Fixed32, 16U, Sint64, 0)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-  src.oneofFixed32 = 16U;
-  [dst mergeFrom:src];
-  XCTAssertEqual(dst.oOneOfCase, Message3_O_OneOfCase_OneofFixed32);
-  XCTAssertEqual(dst.oneofFixed32, 16U);
-  XCTAssertEqual(dst.oneofSint64, 0);
-
-// clang-format on
-//%PDDM-EXPAND MERGE3_TEST(Fixed64, 17U, Fixed32, 0U)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-  src.oneofFixed64 = 17U;
-  [dst mergeFrom:src];
-  XCTAssertEqual(dst.oOneOfCase, Message3_O_OneOfCase_OneofFixed64);
-  XCTAssertEqual(dst.oneofFixed64, 17U);
-  XCTAssertEqual(dst.oneofFixed32, 0U);
-
-// clang-format on
-//%PDDM-EXPAND MERGE3_TEST(Sfixed32, 18, Fixed64, 0U)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-  src.oneofSfixed32 = 18;
-  [dst mergeFrom:src];
-  XCTAssertEqual(dst.oOneOfCase, Message3_O_OneOfCase_OneofSfixed32);
-  XCTAssertEqual(dst.oneofSfixed32, 18);
-  XCTAssertEqual(dst.oneofFixed64, 0U);
-
-// clang-format on
-//%PDDM-EXPAND MERGE3_TEST(Sfixed64, 19, Sfixed32, 0)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-  src.oneofSfixed64 = 19;
-  [dst mergeFrom:src];
-  XCTAssertEqual(dst.oOneOfCase, Message3_O_OneOfCase_OneofSfixed64);
-  XCTAssertEqual(dst.oneofSfixed64, 19);
-  XCTAssertEqual(dst.oneofSfixed32, 0);
-
-// clang-format on
-//%PDDM-EXPAND MERGE3_TEST(Float, 20.0f, Sfixed64, 0)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-  src.oneofFloat = 20.0f;
-  [dst mergeFrom:src];
-  XCTAssertEqual(dst.oOneOfCase, Message3_O_OneOfCase_OneofFloat);
-  XCTAssertEqual(dst.oneofFloat, 20.0f);
-  XCTAssertEqual(dst.oneofSfixed64, 0);
-
-// clang-format on
-//%PDDM-EXPAND MERGE3_TEST(Double, 21.0, Float, 0.0f)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-  src.oneofDouble = 21.0;
-  [dst mergeFrom:src];
-  XCTAssertEqual(dst.oOneOfCase, Message3_O_OneOfCase_OneofDouble);
-  XCTAssertEqual(dst.oneofDouble, 21.0);
-  XCTAssertEqual(dst.oneofFloat, 0.0f);
-
-// clang-format on
-//%PDDM-EXPAND MERGE3_TEST(Bool, YES, Double, 0.0)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-  src.oneofBool = YES;
-  [dst mergeFrom:src];
-  XCTAssertEqual(dst.oOneOfCase, Message3_O_OneOfCase_OneofBool);
-  XCTAssertEqual(dst.oneofBool, YES);
-  XCTAssertEqual(dst.oneofDouble, 0.0);
-
-// clang-format on
-//%PDDM-EXPAND MERGE3_TEST(Enum, Message3_Enum_Bar, Bool, NO)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-  src.oneofEnum = Message3_Enum_Bar;
-  [dst mergeFrom:src];
-  XCTAssertEqual(dst.oOneOfCase, Message3_O_OneOfCase_OneofEnum);
-  XCTAssertEqual(dst.oneofEnum, Message3_Enum_Bar);
-  XCTAssertEqual(dst.oneofBool, NO);
-
-// clang-format on
-//%PDDM-EXPAND-END (14 expansions)
-
-  NSString *oneofStringDefault = @"";
-  NSData *oneofBytesDefault = [NSData data];
-
-  src.oneofString = @"foo";
-  [dst mergeFrom:src];
-  XCTAssertEqual(dst.oOneOfCase, Message3_O_OneOfCase_OneofString);
-  XCTAssertEqualObjects(dst.oneofString, @"foo");
-  XCTAssertEqual(dst.oneofEnum, Message3_Enum_Foo);
-
-  src.oneofBytes = [@"bar" dataUsingEncoding:NSUTF8StringEncoding];
-  [dst mergeFrom:src];
-  XCTAssertEqual(dst.oOneOfCase, Message3_O_OneOfCase_OneofBytes);
-  XCTAssertEqualObjects(dst.oneofBytes,
-                        [@"bar" dataUsingEncoding:NSUTF8StringEncoding]);
-  XCTAssertEqualObjects(dst.oneofString, oneofStringDefault);
-
-
-  Message3 *subMessage = [Message3 message];
-  subMessage.optionalInt32 = 777;
-  src.oneofMessage = subMessage;
-  [dst mergeFrom:src];
-  XCTAssertEqual(dst.oOneOfCase, Message3_O_OneOfCase_OneofMessage);
-  Message3 *mergedSubMessage = [[dst.oneofMessage retain] autorelease];
-  XCTAssertNotNil(mergedSubMessage);
-  XCTAssertNotEqual(mergedSubMessage, subMessage);  // Pointer comparison.
-  XCTAssertEqualObjects(mergedSubMessage, subMessage);
-  XCTAssertEqualObjects(dst.oneofBytes, oneofBytesDefault);
-
-  // Back to something else to make sure message clears out ok.
-
-  src.oneofInt32 = 10;
-  [dst mergeFrom:src];
-  XCTAssertEqual(dst.oOneOfCase, Message3_O_OneOfCase_OneofInt32);
-  XCTAssertNotNil(dst.oneofMessage);
-  XCTAssertNotEqual(dst.oneofMessage,
-                    mergedSubMessage);  // Pointer comparison.
-
-  //
-  // Test merging in to message when they already had something.
-  //
-
-  src.oneofMessage = subMessage;
-  mergedSubMessage = [Message3 message];
-  mergedSubMessage.optionalInt64 = 999;
-  dst.oneofMessage = mergedSubMessage;
-  [dst mergeFrom:src];
-  XCTAssertEqual(dst.oOneOfCase, Message3_O_OneOfCase_OneofMessage);
-  // Shouldn't have been a new object.
-  XCTAssertEqual(dst.oneofMessage, mergedSubMessage);   // Pointer comparison.
-  XCTAssertEqual(dst.oneofMessage.optionalInt32, 777);  // Pointer comparison.
-  XCTAssertEqual(dst.oneofMessage.optionalInt64, 999);  // Pointer comparison.
-}
-
-#pragma mark - Subset from from map_tests.cc
-
-// TEST(GeneratedMapFieldTest, CopyFromMessageMap)
-- (void)testMap_CopyFromMessageMap {
-  TestMessageMap *msg1 = [[TestMessageMap alloc] init];
-  TestMessageMap *msg2 = [[TestMessageMap alloc] init];
-
-  TestAllTypes *subMsg = [TestAllTypes message];
-  subMsg.repeatedInt32Array = [GPBInt32Array arrayWithValue:100];
-  [msg1.mapInt32Message setObject:subMsg forKey:0];
-  subMsg = nil;
-
-  subMsg = [TestAllTypes message];
-  subMsg.repeatedInt32Array = [GPBInt32Array arrayWithValue:101];
-
-  [msg2.mapInt32Message setObject:subMsg forKey:0];
-  subMsg = nil;
-
-  [msg1 mergeFrom:msg2];
-
-  // Checks repeated field is overwritten.
-  XCTAssertEqual(msg1.mapInt32Message.count, 1U);
-  subMsg = [msg1.mapInt32Message objectForKey:0];
-  XCTAssertNotNil(subMsg);
-  XCTAssertEqual(subMsg.repeatedInt32Array.count, 1U);
-  XCTAssertEqual([subMsg.repeatedInt32Array valueAtIndex:0], 101);
-
-  [msg2 release];
-  [msg1 release];
-}
-
-@end
diff --git a/libs/protobuf/objectivec/Tests/GPBMessageTests+Runtime.m b/libs/protobuf/objectivec/Tests/GPBMessageTests+Runtime.m
deleted file mode 100644
index baad082..0000000
--- a/libs/protobuf/objectivec/Tests/GPBMessageTests+Runtime.m
+++ /dev/null
@@ -1,2845 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#import "GPBTestUtilities.h"
-
-#import <objc/runtime.h>
-
-#import "GPBMessage.h"
-
-#import "google/protobuf/MapUnittest.pbobjc.h"
-#import "google/protobuf/Unittest.pbobjc.h"
-#import "google/protobuf/UnittestCycle.pbobjc.h"
-#import "google/protobuf/UnittestObjcStartup.pbobjc.h"
-#import "google/protobuf/UnittestRuntimeProto2.pbobjc.h"
-#import "google/protobuf/UnittestRuntimeProto3.pbobjc.h"
-
-@interface MessageRuntimeTests : GPBTestCase
-@end
-
-@implementation MessageRuntimeTests
-
-// TODO(thomasvl): Pull tests over from GPBMessageTests that are runtime
-// specific.
-
-- (void)testStartupOrdering {
-  // Message class/Root class initialization is a little tricky, so these just
-  // create some possible patterns that can be a problem. The messages don't
-  // have to be exercised, just creating them is enough to test.  If there
-  // is a problem, the runtime should assert or hang.
-  //
-  // Note: the messages from these proto files should not be used in any other
-  // tests, that way when they are referenced here it will be the first use and
-  // initialization will take place now.
-
-  TestObjCStartupMessage *message = [TestObjCStartupMessage message];
-  XCTAssertNotNil(message);
-
-  CycleBaz *baz = [CycleBaz message];
-  CycleBar *bar = [CycleBar message];
-  CycleFoo *foo = [CycleFoo message];
-  XCTAssertNotNil(baz);
-  XCTAssertNotNil(bar);
-  XCTAssertNotNil(foo);
-}
-
-- (void)testProto2HasMethodSupport {
-  NSArray *names = @[
-    @"Int32",
-    @"Int64",
-    @"Uint32",
-    @"Uint64",
-    @"Sint32",
-    @"Sint64",
-    @"Fixed32",
-    @"Fixed64",
-    @"Sfixed32",
-    @"Sfixed64",
-    @"Float",
-    @"Double",
-    @"Bool",
-    @"String",
-    @"Bytes",
-    @"Group",
-    @"Message",
-    @"Enum",
-  ];
-
-  // Proto2 gets:
-
-  // Single fields - has*/setHas* is valid.
-
-  for (NSString *name in names) {
-    // build the selector, i.e. - hasOptionalInt32/setHasOptionalInt32:
-    SEL hasSel = NSSelectorFromString(
-        [NSString stringWithFormat:@"hasOptional%@", name]);
-    SEL setHasSel = NSSelectorFromString(
-        [NSString stringWithFormat:@"setHasOptional%@:", name]);
-    XCTAssertTrue([Message2 instancesRespondToSelector:hasSel], @"field: %@",
-                  name);
-    XCTAssertTrue([Message2 instancesRespondToSelector:setHasSel], @"field: %@",
-                  name);
-  }
-
-  // Repeated fields
-  //  - no has*/setHas*
-  //  - *Count
-
-  for (NSString *name in names) {
-    // build the selector, i.e. - hasRepeatedInt32Array/setHasRepeatedInt32Array:
-    SEL hasSel = NSSelectorFromString(
-        [NSString stringWithFormat:@"hasRepeated%@Array", name]);
-    SEL setHasSel = NSSelectorFromString(
-        [NSString stringWithFormat:@"setHasRepeated%@Array:", name]);
-    XCTAssertFalse([Message2 instancesRespondToSelector:hasSel], @"field: %@",
-                   name);
-    XCTAssertFalse([Message2 instancesRespondToSelector:setHasSel],
-                   @"field: %@", name);
-    // build the selector, i.e. - repeatedInt32Array_Count
-    SEL countSel = NSSelectorFromString(
-        [NSString stringWithFormat:@"repeated%@Array_Count", name]);
-    XCTAssertTrue([Message2 instancesRespondToSelector:countSel], @"field: %@",
-                   name);
-  }
-
-  // OneOf fields - no has*/setHas*
-
-  for (NSString *name in names) {
-    // build the selector, i.e. - hasOneofInt32/setHasOneofInt32:
-    SEL hasSel =
-        NSSelectorFromString([NSString stringWithFormat:@"hasOneof%@", name]);
-    SEL setHasSel = NSSelectorFromString(
-        [NSString stringWithFormat:@"setHasOneof%@:", name]);
-    XCTAssertFalse([Message2 instancesRespondToSelector:hasSel], @"field: %@",
-                   name);
-    XCTAssertFalse([Message2 instancesRespondToSelector:setHasSel],
-                   @"field: %@", name);
-  }
-
-  // map<> fields
-  //  - no has*/setHas*
-  //  - *Count
-
-  NSArray *mapNames = @[
-    @"Int32Int32",
-    @"Int64Int64",
-    @"Uint32Uint32",
-    @"Uint64Uint64",
-    @"Sint32Sint32",
-    @"Sint64Sint64",
-    @"Fixed32Fixed32",
-    @"Fixed64Fixed64",
-    @"Sfixed32Sfixed32",
-    @"Sfixed64Sfixed64",
-    @"Int32Float",
-    @"Int32Double",
-    @"BoolBool",
-    @"StringString",
-    @"StringBytes",
-    @"StringMessage",
-    @"Int32Bytes",
-    @"Int32Enum",
-    @"Int32Message",
-  ];
-
-  for (NSString *name in mapNames) {
-    // build the selector, i.e. - hasMapInt32Int32/setHasMapInt32Int32:
-    SEL hasSel = NSSelectorFromString(
-        [NSString stringWithFormat:@"hasMap%@", name]);
-    SEL setHasSel = NSSelectorFromString(
-        [NSString stringWithFormat:@"setHasMap%@:", name]);
-    XCTAssertFalse([Message2 instancesRespondToSelector:hasSel], @"field: %@",
-                   name);
-    XCTAssertFalse([Message2 instancesRespondToSelector:setHasSel],
-                   @"field: %@", name);
-    // build the selector, i.e. - mapInt32Int32Count
-    SEL countSel = NSSelectorFromString(
-        [NSString stringWithFormat:@"map%@_Count", name]);
-    XCTAssertTrue([Message2 instancesRespondToSelector:countSel], @"field: %@",
-                   name);
-  }
-
-}
-
-- (void)testProto3HasMethodSupport {
-  NSArray *names = @[
-    @"Int32",
-    @"Int64",
-    @"Uint32",
-    @"Uint64",
-    @"Sint32",
-    @"Sint64",
-    @"Fixed32",
-    @"Fixed64",
-    @"Sfixed32",
-    @"Sfixed64",
-    @"Float",
-    @"Double",
-    @"Bool",
-    @"String",
-    @"Bytes",
-    @"Message",
-    @"Enum",
-  ];
-
-  // Proto3 gets:
-
-  // Single fields
-  //  - has*/setHas* invalid for primitive types.
-  //  - has*/setHas* valid for Message.
-
-  for (NSString *name in names) {
-    // build the selector, i.e. - hasOptionalInt32/setHasOptionalInt32:
-    SEL hasSel = NSSelectorFromString(
-        [NSString stringWithFormat:@"hasOptional%@", name]);
-    SEL setHasSel = NSSelectorFromString(
-        [NSString stringWithFormat:@"setHasOptional%@:", name]);
-    if ([name isEqual:@"Message"]) {
-      // Sub messages/groups are the exception.
-      XCTAssertTrue([Message3 instancesRespondToSelector:hasSel], @"field: %@",
-                    name);
-      XCTAssertTrue([Message3 instancesRespondToSelector:setHasSel],
-                    @"field: %@", name);
-    } else {
-      XCTAssertFalse([Message3 instancesRespondToSelector:hasSel], @"field: %@",
-                     name);
-      XCTAssertFalse([Message3 instancesRespondToSelector:setHasSel],
-                     @"field: %@", name);
-    }
-  }
-
-  // Repeated fields
-  //  - no has*/setHas*
-  //  - *Count
-
-  for (NSString *name in names) {
-    // build the selector, i.e. - hasRepeatedInt32Array/setHasRepeatedInt32Array:
-    SEL hasSel = NSSelectorFromString(
-        [NSString stringWithFormat:@"hasRepeated%@Array", name]);
-    SEL setHasSel = NSSelectorFromString(
-        [NSString stringWithFormat:@"setHasRepeated%@Array:", name]);
-    XCTAssertFalse([Message3 instancesRespondToSelector:hasSel], @"field: %@",
-                   name);
-    XCTAssertFalse([Message3 instancesRespondToSelector:setHasSel],
-                   @"field: %@", name);
-    // build the selector, i.e. - repeatedInt32Array_Count
-    SEL countSel = NSSelectorFromString(
-        [NSString stringWithFormat:@"repeated%@Array_Count", name]);
-    XCTAssertTrue([Message3 instancesRespondToSelector:countSel], @"field: %@",
-                  name);
-  }
-
-  // OneOf fields - no has*/setHas*
-
-  for (NSString *name in names) {
-    // build the selector, i.e. - hasOneofInt32/setHasOneofInt32:
-    SEL hasSel =
-        NSSelectorFromString([NSString stringWithFormat:@"hasOneof%@", name]);
-    SEL setHasSel = NSSelectorFromString(
-        [NSString stringWithFormat:@"setHasOneof%@:", name]);
-    XCTAssertFalse([Message3 instancesRespondToSelector:hasSel], @"field: %@",
-                   name);
-    XCTAssertFalse([Message3 instancesRespondToSelector:setHasSel],
-                   @"field: %@", name);
-  }
-
-  // Single Optional fields
-  //  - has*/setHas* thanks to the optional keyword in proto3, they exist
-  //    for primitive types.
-  //  - has*/setHas* valid for Message.
-
-  for (NSString *name in names) {
-    // build the selector, i.e. - hasOptionalInt32/setHasOptionalInt32:
-    SEL hasSel = NSSelectorFromString(
-        [NSString stringWithFormat:@"hasOptional%@", name]);
-    SEL setHasSel = NSSelectorFromString(
-        [NSString stringWithFormat:@"setHasOptional%@:", name]);
-    XCTAssertTrue([Message3Optional instancesRespondToSelector:hasSel], @"field: %@",
-                  name);
-    XCTAssertTrue([Message3Optional instancesRespondToSelector:setHasSel],
-                  @"field: %@", name);
-  }
-
-  // map<> fields
-  //  - no has*/setHas*
-  //  - *Count
-
-  NSArray *mapNames = @[
-    @"Int32Int32",
-    @"Int64Int64",
-    @"Uint32Uint32",
-    @"Uint64Uint64",
-    @"Sint32Sint32",
-    @"Sint64Sint64",
-    @"Fixed32Fixed32",
-    @"Fixed64Fixed64",
-    @"Sfixed32Sfixed32",
-    @"Sfixed64Sfixed64",
-    @"Int32Float",
-    @"Int32Double",
-    @"BoolBool",
-    @"StringString",
-    @"StringBytes",
-    @"StringMessage",
-    @"Int32Bytes",
-    @"Int32Enum",
-    @"Int32Message",
-  ];
-
-  for (NSString *name in mapNames) {
-    // build the selector, i.e. - hasMapInt32Int32/setHasMapInt32Int32:
-    SEL hasSel = NSSelectorFromString(
-        [NSString stringWithFormat:@"hasMap%@", name]);
-    SEL setHasSel = NSSelectorFromString(
-        [NSString stringWithFormat:@"setHasMap%@:", name]);
-    XCTAssertFalse([Message3 instancesRespondToSelector:hasSel], @"field: %@",
-                   name);
-    XCTAssertFalse([Message3 instancesRespondToSelector:setHasSel],
-                   @"field: %@", name);
-    // build the selector, i.e. - mapInt32Int32Count
-    SEL countSel = NSSelectorFromString(
-        [NSString stringWithFormat:@"map%@_Count", name]);
-    XCTAssertTrue([Message3 instancesRespondToSelector:countSel], @"field: %@",
-                   name);
-  }
-}
-
-- (void)testProto2SingleFieldHasBehavior {
-  //
-  // Setting to any value including the default value (0) should result has*
-  // being true.
-  //
-
-//%PDDM-DEFINE PROTO2_TEST_HAS_FIELD(FIELD, NON_ZERO_VALUE, ZERO_VALUE)
-//%  {  // optional##FIELD :: NON_ZERO_VALUE
-//%    Message2 *msg = [[Message2 alloc] init];
-//%    XCTAssertFalse(msg.hasOptional##FIELD);
-//%    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message2_FieldNumber_Optional##FIELD));
-//%    msg.optional##FIELD = NON_ZERO_VALUE;
-//%    XCTAssertTrue(msg.hasOptional##FIELD);
-//%    XCTAssertTrue(GPBMessageHasFieldNumberSet(msg, Message2_FieldNumber_Optional##FIELD));
-//%    [msg release];
-//%  }
-//%  {  // optional##FIELD :: ZERO_VALUE
-//%    Message2 *msg = [[Message2 alloc] init];
-//%    XCTAssertFalse(msg.hasOptional##FIELD);
-//%    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message2_FieldNumber_Optional##FIELD));
-//%    msg.optional##FIELD = ZERO_VALUE;
-//%    XCTAssertTrue(msg.hasOptional##FIELD);
-//%    XCTAssertTrue(GPBMessageHasFieldNumberSet(msg, Message2_FieldNumber_Optional##FIELD));
-//%    [msg release];
-//%  }
-//%
-//%PDDM-DEFINE PROTO2_TEST_CLEAR_FIELD_WITH_NIL(FIELD, VALUE)
-//%  {  // optional##FIELD
-//%    Message2 *msg = [[Message2 alloc] init];
-//%    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message2_FieldNumber_Optional##FIELD));
-//%    msg.optional##FIELD = VALUE;
-//%    XCTAssertTrue(GPBMessageHasFieldNumberSet(msg, Message2_FieldNumber_Optional##FIELD));
-//%    msg.optional##FIELD = nil;
-//%    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message2_FieldNumber_Optional##FIELD));
-//%    [msg release];
-//%  }
-//%
-//%PDDM-DEFINE PROTO2_TEST_HAS_FIELDS()
-//%PROTO2_TEST_HAS_FIELD(Int32, 1, 0)
-//%PROTO2_TEST_HAS_FIELD(Int64, 1, 0)
-//%PROTO2_TEST_HAS_FIELD(Uint32, 1, 0)
-//%PROTO2_TEST_HAS_FIELD(Uint64, 1, 0)
-//%PROTO2_TEST_HAS_FIELD(Sint32, 1, 0)
-//%PROTO2_TEST_HAS_FIELD(Sint64, 1, 0)
-//%PROTO2_TEST_HAS_FIELD(Fixed32, 1, 0)
-//%PROTO2_TEST_HAS_FIELD(Fixed64, 1, 0)
-//%PROTO2_TEST_HAS_FIELD(Sfixed32, 1, 0)
-//%PROTO2_TEST_HAS_FIELD(Sfixed64, 1, 0)
-//%PROTO2_TEST_HAS_FIELD(Float, 1.0f, 0.0f)
-//%PROTO2_TEST_HAS_FIELD(Double, 1.0, 0.0)
-//%PROTO2_TEST_HAS_FIELD(Bool, YES, NO)
-//%PROTO2_TEST_HAS_FIELD(String, @"foo", @"")
-//%PROTO2_TEST_HAS_FIELD(Bytes, [@"foo" dataUsingEncoding:NSUTF8StringEncoding], [NSData data])
-//%  //
-//%  // Test doesn't apply to optionalGroup/optionalMessage.
-//%  //
-//%
-//%PROTO2_TEST_HAS_FIELD(Enum, Message2_Enum_Bar, Message2_Enum_Foo)
-//%  //
-//%  // Nil can also be used to clear strings, bytes, groups, and messages.
-//%  //
-//%
-//%PROTO2_TEST_CLEAR_FIELD_WITH_NIL(String, @"foo")
-//%PROTO2_TEST_CLEAR_FIELD_WITH_NIL(Bytes, [@"foo" dataUsingEncoding:NSUTF8StringEncoding])
-//%PROTO2_TEST_CLEAR_FIELD_WITH_NIL(Group, [Message2_OptionalGroup message])
-//%PROTO2_TEST_CLEAR_FIELD_WITH_NIL(Message, [Message2 message])
-//%PDDM-EXPAND PROTO2_TEST_HAS_FIELDS()
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-  {  // optionalInt32 :: 1
-    Message2 *msg = [[Message2 alloc] init];
-    XCTAssertFalse(msg.hasOptionalInt32);
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message2_FieldNumber_OptionalInt32));
-    msg.optionalInt32 = 1;
-    XCTAssertTrue(msg.hasOptionalInt32);
-    XCTAssertTrue(GPBMessageHasFieldNumberSet(msg, Message2_FieldNumber_OptionalInt32));
-    [msg release];
-  }
-  {  // optionalInt32 :: 0
-    Message2 *msg = [[Message2 alloc] init];
-    XCTAssertFalse(msg.hasOptionalInt32);
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message2_FieldNumber_OptionalInt32));
-    msg.optionalInt32 = 0;
-    XCTAssertTrue(msg.hasOptionalInt32);
-    XCTAssertTrue(GPBMessageHasFieldNumberSet(msg, Message2_FieldNumber_OptionalInt32));
-    [msg release];
-  }
-
-  {  // optionalInt64 :: 1
-    Message2 *msg = [[Message2 alloc] init];
-    XCTAssertFalse(msg.hasOptionalInt64);
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message2_FieldNumber_OptionalInt64));
-    msg.optionalInt64 = 1;
-    XCTAssertTrue(msg.hasOptionalInt64);
-    XCTAssertTrue(GPBMessageHasFieldNumberSet(msg, Message2_FieldNumber_OptionalInt64));
-    [msg release];
-  }
-  {  // optionalInt64 :: 0
-    Message2 *msg = [[Message2 alloc] init];
-    XCTAssertFalse(msg.hasOptionalInt64);
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message2_FieldNumber_OptionalInt64));
-    msg.optionalInt64 = 0;
-    XCTAssertTrue(msg.hasOptionalInt64);
-    XCTAssertTrue(GPBMessageHasFieldNumberSet(msg, Message2_FieldNumber_OptionalInt64));
-    [msg release];
-  }
-
-  {  // optionalUint32 :: 1
-    Message2 *msg = [[Message2 alloc] init];
-    XCTAssertFalse(msg.hasOptionalUint32);
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message2_FieldNumber_OptionalUint32));
-    msg.optionalUint32 = 1;
-    XCTAssertTrue(msg.hasOptionalUint32);
-    XCTAssertTrue(GPBMessageHasFieldNumberSet(msg, Message2_FieldNumber_OptionalUint32));
-    [msg release];
-  }
-  {  // optionalUint32 :: 0
-    Message2 *msg = [[Message2 alloc] init];
-    XCTAssertFalse(msg.hasOptionalUint32);
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message2_FieldNumber_OptionalUint32));
-    msg.optionalUint32 = 0;
-    XCTAssertTrue(msg.hasOptionalUint32);
-    XCTAssertTrue(GPBMessageHasFieldNumberSet(msg, Message2_FieldNumber_OptionalUint32));
-    [msg release];
-  }
-
-  {  // optionalUint64 :: 1
-    Message2 *msg = [[Message2 alloc] init];
-    XCTAssertFalse(msg.hasOptionalUint64);
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message2_FieldNumber_OptionalUint64));
-    msg.optionalUint64 = 1;
-    XCTAssertTrue(msg.hasOptionalUint64);
-    XCTAssertTrue(GPBMessageHasFieldNumberSet(msg, Message2_FieldNumber_OptionalUint64));
-    [msg release];
-  }
-  {  // optionalUint64 :: 0
-    Message2 *msg = [[Message2 alloc] init];
-    XCTAssertFalse(msg.hasOptionalUint64);
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message2_FieldNumber_OptionalUint64));
-    msg.optionalUint64 = 0;
-    XCTAssertTrue(msg.hasOptionalUint64);
-    XCTAssertTrue(GPBMessageHasFieldNumberSet(msg, Message2_FieldNumber_OptionalUint64));
-    [msg release];
-  }
-
-  {  // optionalSint32 :: 1
-    Message2 *msg = [[Message2 alloc] init];
-    XCTAssertFalse(msg.hasOptionalSint32);
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message2_FieldNumber_OptionalSint32));
-    msg.optionalSint32 = 1;
-    XCTAssertTrue(msg.hasOptionalSint32);
-    XCTAssertTrue(GPBMessageHasFieldNumberSet(msg, Message2_FieldNumber_OptionalSint32));
-    [msg release];
-  }
-  {  // optionalSint32 :: 0
-    Message2 *msg = [[Message2 alloc] init];
-    XCTAssertFalse(msg.hasOptionalSint32);
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message2_FieldNumber_OptionalSint32));
-    msg.optionalSint32 = 0;
-    XCTAssertTrue(msg.hasOptionalSint32);
-    XCTAssertTrue(GPBMessageHasFieldNumberSet(msg, Message2_FieldNumber_OptionalSint32));
-    [msg release];
-  }
-
-  {  // optionalSint64 :: 1
-    Message2 *msg = [[Message2 alloc] init];
-    XCTAssertFalse(msg.hasOptionalSint64);
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message2_FieldNumber_OptionalSint64));
-    msg.optionalSint64 = 1;
-    XCTAssertTrue(msg.hasOptionalSint64);
-    XCTAssertTrue(GPBMessageHasFieldNumberSet(msg, Message2_FieldNumber_OptionalSint64));
-    [msg release];
-  }
-  {  // optionalSint64 :: 0
-    Message2 *msg = [[Message2 alloc] init];
-    XCTAssertFalse(msg.hasOptionalSint64);
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message2_FieldNumber_OptionalSint64));
-    msg.optionalSint64 = 0;
-    XCTAssertTrue(msg.hasOptionalSint64);
-    XCTAssertTrue(GPBMessageHasFieldNumberSet(msg, Message2_FieldNumber_OptionalSint64));
-    [msg release];
-  }
-
-  {  // optionalFixed32 :: 1
-    Message2 *msg = [[Message2 alloc] init];
-    XCTAssertFalse(msg.hasOptionalFixed32);
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message2_FieldNumber_OptionalFixed32));
-    msg.optionalFixed32 = 1;
-    XCTAssertTrue(msg.hasOptionalFixed32);
-    XCTAssertTrue(GPBMessageHasFieldNumberSet(msg, Message2_FieldNumber_OptionalFixed32));
-    [msg release];
-  }
-  {  // optionalFixed32 :: 0
-    Message2 *msg = [[Message2 alloc] init];
-    XCTAssertFalse(msg.hasOptionalFixed32);
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message2_FieldNumber_OptionalFixed32));
-    msg.optionalFixed32 = 0;
-    XCTAssertTrue(msg.hasOptionalFixed32);
-    XCTAssertTrue(GPBMessageHasFieldNumberSet(msg, Message2_FieldNumber_OptionalFixed32));
-    [msg release];
-  }
-
-  {  // optionalFixed64 :: 1
-    Message2 *msg = [[Message2 alloc] init];
-    XCTAssertFalse(msg.hasOptionalFixed64);
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message2_FieldNumber_OptionalFixed64));
-    msg.optionalFixed64 = 1;
-    XCTAssertTrue(msg.hasOptionalFixed64);
-    XCTAssertTrue(GPBMessageHasFieldNumberSet(msg, Message2_FieldNumber_OptionalFixed64));
-    [msg release];
-  }
-  {  // optionalFixed64 :: 0
-    Message2 *msg = [[Message2 alloc] init];
-    XCTAssertFalse(msg.hasOptionalFixed64);
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message2_FieldNumber_OptionalFixed64));
-    msg.optionalFixed64 = 0;
-    XCTAssertTrue(msg.hasOptionalFixed64);
-    XCTAssertTrue(GPBMessageHasFieldNumberSet(msg, Message2_FieldNumber_OptionalFixed64));
-    [msg release];
-  }
-
-  {  // optionalSfixed32 :: 1
-    Message2 *msg = [[Message2 alloc] init];
-    XCTAssertFalse(msg.hasOptionalSfixed32);
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message2_FieldNumber_OptionalSfixed32));
-    msg.optionalSfixed32 = 1;
-    XCTAssertTrue(msg.hasOptionalSfixed32);
-    XCTAssertTrue(GPBMessageHasFieldNumberSet(msg, Message2_FieldNumber_OptionalSfixed32));
-    [msg release];
-  }
-  {  // optionalSfixed32 :: 0
-    Message2 *msg = [[Message2 alloc] init];
-    XCTAssertFalse(msg.hasOptionalSfixed32);
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message2_FieldNumber_OptionalSfixed32));
-    msg.optionalSfixed32 = 0;
-    XCTAssertTrue(msg.hasOptionalSfixed32);
-    XCTAssertTrue(GPBMessageHasFieldNumberSet(msg, Message2_FieldNumber_OptionalSfixed32));
-    [msg release];
-  }
-
-  {  // optionalSfixed64 :: 1
-    Message2 *msg = [[Message2 alloc] init];
-    XCTAssertFalse(msg.hasOptionalSfixed64);
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message2_FieldNumber_OptionalSfixed64));
-    msg.optionalSfixed64 = 1;
-    XCTAssertTrue(msg.hasOptionalSfixed64);
-    XCTAssertTrue(GPBMessageHasFieldNumberSet(msg, Message2_FieldNumber_OptionalSfixed64));
-    [msg release];
-  }
-  {  // optionalSfixed64 :: 0
-    Message2 *msg = [[Message2 alloc] init];
-    XCTAssertFalse(msg.hasOptionalSfixed64);
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message2_FieldNumber_OptionalSfixed64));
-    msg.optionalSfixed64 = 0;
-    XCTAssertTrue(msg.hasOptionalSfixed64);
-    XCTAssertTrue(GPBMessageHasFieldNumberSet(msg, Message2_FieldNumber_OptionalSfixed64));
-    [msg release];
-  }
-
-  {  // optionalFloat :: 1.0f
-    Message2 *msg = [[Message2 alloc] init];
-    XCTAssertFalse(msg.hasOptionalFloat);
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message2_FieldNumber_OptionalFloat));
-    msg.optionalFloat = 1.0f;
-    XCTAssertTrue(msg.hasOptionalFloat);
-    XCTAssertTrue(GPBMessageHasFieldNumberSet(msg, Message2_FieldNumber_OptionalFloat));
-    [msg release];
-  }
-  {  // optionalFloat :: 0.0f
-    Message2 *msg = [[Message2 alloc] init];
-    XCTAssertFalse(msg.hasOptionalFloat);
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message2_FieldNumber_OptionalFloat));
-    msg.optionalFloat = 0.0f;
-    XCTAssertTrue(msg.hasOptionalFloat);
-    XCTAssertTrue(GPBMessageHasFieldNumberSet(msg, Message2_FieldNumber_OptionalFloat));
-    [msg release];
-  }
-
-  {  // optionalDouble :: 1.0
-    Message2 *msg = [[Message2 alloc] init];
-    XCTAssertFalse(msg.hasOptionalDouble);
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message2_FieldNumber_OptionalDouble));
-    msg.optionalDouble = 1.0;
-    XCTAssertTrue(msg.hasOptionalDouble);
-    XCTAssertTrue(GPBMessageHasFieldNumberSet(msg, Message2_FieldNumber_OptionalDouble));
-    [msg release];
-  }
-  {  // optionalDouble :: 0.0
-    Message2 *msg = [[Message2 alloc] init];
-    XCTAssertFalse(msg.hasOptionalDouble);
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message2_FieldNumber_OptionalDouble));
-    msg.optionalDouble = 0.0;
-    XCTAssertTrue(msg.hasOptionalDouble);
-    XCTAssertTrue(GPBMessageHasFieldNumberSet(msg, Message2_FieldNumber_OptionalDouble));
-    [msg release];
-  }
-
-  {  // optionalBool :: YES
-    Message2 *msg = [[Message2 alloc] init];
-    XCTAssertFalse(msg.hasOptionalBool);
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message2_FieldNumber_OptionalBool));
-    msg.optionalBool = YES;
-    XCTAssertTrue(msg.hasOptionalBool);
-    XCTAssertTrue(GPBMessageHasFieldNumberSet(msg, Message2_FieldNumber_OptionalBool));
-    [msg release];
-  }
-  {  // optionalBool :: NO
-    Message2 *msg = [[Message2 alloc] init];
-    XCTAssertFalse(msg.hasOptionalBool);
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message2_FieldNumber_OptionalBool));
-    msg.optionalBool = NO;
-    XCTAssertTrue(msg.hasOptionalBool);
-    XCTAssertTrue(GPBMessageHasFieldNumberSet(msg, Message2_FieldNumber_OptionalBool));
-    [msg release];
-  }
-
-  {  // optionalString :: @"foo"
-    Message2 *msg = [[Message2 alloc] init];
-    XCTAssertFalse(msg.hasOptionalString);
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message2_FieldNumber_OptionalString));
-    msg.optionalString = @"foo";
-    XCTAssertTrue(msg.hasOptionalString);
-    XCTAssertTrue(GPBMessageHasFieldNumberSet(msg, Message2_FieldNumber_OptionalString));
-    [msg release];
-  }
-  {  // optionalString :: @""
-    Message2 *msg = [[Message2 alloc] init];
-    XCTAssertFalse(msg.hasOptionalString);
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message2_FieldNumber_OptionalString));
-    msg.optionalString = @"";
-    XCTAssertTrue(msg.hasOptionalString);
-    XCTAssertTrue(GPBMessageHasFieldNumberSet(msg, Message2_FieldNumber_OptionalString));
-    [msg release];
-  }
-
-  {  // optionalBytes :: [@"foo" dataUsingEncoding:NSUTF8StringEncoding]
-    Message2 *msg = [[Message2 alloc] init];
-    XCTAssertFalse(msg.hasOptionalBytes);
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message2_FieldNumber_OptionalBytes));
-    msg.optionalBytes = [@"foo" dataUsingEncoding:NSUTF8StringEncoding];
-    XCTAssertTrue(msg.hasOptionalBytes);
-    XCTAssertTrue(GPBMessageHasFieldNumberSet(msg, Message2_FieldNumber_OptionalBytes));
-    [msg release];
-  }
-  {  // optionalBytes :: [NSData data]
-    Message2 *msg = [[Message2 alloc] init];
-    XCTAssertFalse(msg.hasOptionalBytes);
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message2_FieldNumber_OptionalBytes));
-    msg.optionalBytes = [NSData data];
-    XCTAssertTrue(msg.hasOptionalBytes);
-    XCTAssertTrue(GPBMessageHasFieldNumberSet(msg, Message2_FieldNumber_OptionalBytes));
-    [msg release];
-  }
-
-  //
-  // Test doesn't apply to optionalGroup/optionalMessage.
-  //
-
-  {  // optionalEnum :: Message2_Enum_Bar
-    Message2 *msg = [[Message2 alloc] init];
-    XCTAssertFalse(msg.hasOptionalEnum);
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message2_FieldNumber_OptionalEnum));
-    msg.optionalEnum = Message2_Enum_Bar;
-    XCTAssertTrue(msg.hasOptionalEnum);
-    XCTAssertTrue(GPBMessageHasFieldNumberSet(msg, Message2_FieldNumber_OptionalEnum));
-    [msg release];
-  }
-  {  // optionalEnum :: Message2_Enum_Foo
-    Message2 *msg = [[Message2 alloc] init];
-    XCTAssertFalse(msg.hasOptionalEnum);
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message2_FieldNumber_OptionalEnum));
-    msg.optionalEnum = Message2_Enum_Foo;
-    XCTAssertTrue(msg.hasOptionalEnum);
-    XCTAssertTrue(GPBMessageHasFieldNumberSet(msg, Message2_FieldNumber_OptionalEnum));
-    [msg release];
-  }
-
-  //
-  // Nil can also be used to clear strings, bytes, groups, and messages.
-  //
-
-  {  // optionalString
-    Message2 *msg = [[Message2 alloc] init];
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message2_FieldNumber_OptionalString));
-    msg.optionalString = @"foo";
-    XCTAssertTrue(GPBMessageHasFieldNumberSet(msg, Message2_FieldNumber_OptionalString));
-    msg.optionalString = nil;
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message2_FieldNumber_OptionalString));
-    [msg release];
-  }
-
-  {  // optionalBytes
-    Message2 *msg = [[Message2 alloc] init];
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message2_FieldNumber_OptionalBytes));
-    msg.optionalBytes = [@"foo" dataUsingEncoding:NSUTF8StringEncoding];
-    XCTAssertTrue(GPBMessageHasFieldNumberSet(msg, Message2_FieldNumber_OptionalBytes));
-    msg.optionalBytes = nil;
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message2_FieldNumber_OptionalBytes));
-    [msg release];
-  }
-
-  {  // optionalGroup
-    Message2 *msg = [[Message2 alloc] init];
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message2_FieldNumber_OptionalGroup));
-    msg.optionalGroup = [Message2_OptionalGroup message];
-    XCTAssertTrue(GPBMessageHasFieldNumberSet(msg, Message2_FieldNumber_OptionalGroup));
-    msg.optionalGroup = nil;
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message2_FieldNumber_OptionalGroup));
-    [msg release];
-  }
-
-  {  // optionalMessage
-    Message2 *msg = [[Message2 alloc] init];
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message2_FieldNumber_OptionalMessage));
-    msg.optionalMessage = [Message2 message];
-    XCTAssertTrue(GPBMessageHasFieldNumberSet(msg, Message2_FieldNumber_OptionalMessage));
-    msg.optionalMessage = nil;
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message2_FieldNumber_OptionalMessage));
-    [msg release];
-  }
-
-// clang-format on
-//%PDDM-EXPAND-END PROTO2_TEST_HAS_FIELDS()
-}
-
-- (void)testProto3SingleFieldHasBehavior {
-  //
-  // Setting to any value but the default value (0) should result has*
-  // being true.  When set to the default, shouldn't be true.
-  //
-
-//%PDDM-DEFINE PROTO3_TEST_HAS_FIELD(FIELD, NON_ZERO_VALUE, ZERO_VALUE)
-//%  {  // optional##FIELD
-//%    Message3 *msg = [[Message3 alloc] init];
-//%    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message3_FieldNumber_Optional##FIELD));
-//%    msg.optional##FIELD = NON_ZERO_VALUE;
-//%    XCTAssertTrue(GPBMessageHasFieldNumberSet(msg, Message3_FieldNumber_Optional##FIELD));
-//%    msg.optional##FIELD = ZERO_VALUE;
-//%    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message3_FieldNumber_Optional##FIELD));
-//%    [msg release];
-//%  }
-//%
-//%PDDM-DEFINE PROTO3_TEST_CLEAR_FIELD_WITH_NIL(FIELD, VALUE)
-//%  {  // optional##FIELD
-//%    Message3 *msg = [[Message3 alloc] init];
-//%    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message3_FieldNumber_Optional##FIELD));
-//%    msg.optional##FIELD = VALUE;
-//%    XCTAssertTrue(GPBMessageHasFieldNumberSet(msg, Message3_FieldNumber_Optional##FIELD));
-//%    msg.optional##FIELD = nil;
-//%    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message3_FieldNumber_Optional##FIELD));
-//%    [msg release];
-//%  }
-//%
-//%PDDM-DEFINE PROTO3_TEST_HAS_FIELDS()
-//%PROTO3_TEST_HAS_FIELD(Int32, 1, 0)
-//%PROTO3_TEST_HAS_FIELD(Int64, 1, 0)
-//%PROTO3_TEST_HAS_FIELD(Uint32, 1, 0)
-//%PROTO3_TEST_HAS_FIELD(Uint64, 1, 0)
-//%PROTO3_TEST_HAS_FIELD(Sint32, 1, 0)
-//%PROTO3_TEST_HAS_FIELD(Sint64, 1, 0)
-//%PROTO3_TEST_HAS_FIELD(Fixed32, 1, 0)
-//%PROTO3_TEST_HAS_FIELD(Fixed64, 1, 0)
-//%PROTO3_TEST_HAS_FIELD(Sfixed32, 1, 0)
-//%PROTO3_TEST_HAS_FIELD(Sfixed64, 1, 0)
-//%PROTO3_TEST_HAS_FIELD(Float, 1.0f, 0.0f)
-//%PROTO3_TEST_HAS_FIELD(Double, 1.0, 0.0)
-//%PROTO3_TEST_HAS_FIELD(Bool, YES, NO)
-//%PROTO3_TEST_HAS_FIELD(String, @"foo", @"")
-//%PROTO3_TEST_HAS_FIELD(Bytes, [@"foo" dataUsingEncoding:NSUTF8StringEncoding], [NSData data])
-//%  //
-//%  // Test doesn't apply to optionalMessage (no groups in proto3).
-//%  //
-//%
-//%PROTO3_TEST_HAS_FIELD(Enum, Message3_Enum_Bar, Message3_Enum_Foo)
-//%  //
-//%  // Nil can also be used to clear strings, bytes, and messages (no groups in proto3).
-//%  //
-//%
-//%PROTO3_TEST_CLEAR_FIELD_WITH_NIL(String, @"foo")
-//%PROTO3_TEST_CLEAR_FIELD_WITH_NIL(Bytes, [@"foo" dataUsingEncoding:NSUTF8StringEncoding])
-//%PROTO3_TEST_CLEAR_FIELD_WITH_NIL(Message, [Message3 message])
-//%PDDM-EXPAND PROTO3_TEST_HAS_FIELDS()
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-  {  // optionalInt32
-    Message3 *msg = [[Message3 alloc] init];
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message3_FieldNumber_OptionalInt32));
-    msg.optionalInt32 = 1;
-    XCTAssertTrue(GPBMessageHasFieldNumberSet(msg, Message3_FieldNumber_OptionalInt32));
-    msg.optionalInt32 = 0;
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message3_FieldNumber_OptionalInt32));
-    [msg release];
-  }
-
-  {  // optionalInt64
-    Message3 *msg = [[Message3 alloc] init];
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message3_FieldNumber_OptionalInt64));
-    msg.optionalInt64 = 1;
-    XCTAssertTrue(GPBMessageHasFieldNumberSet(msg, Message3_FieldNumber_OptionalInt64));
-    msg.optionalInt64 = 0;
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message3_FieldNumber_OptionalInt64));
-    [msg release];
-  }
-
-  {  // optionalUint32
-    Message3 *msg = [[Message3 alloc] init];
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message3_FieldNumber_OptionalUint32));
-    msg.optionalUint32 = 1;
-    XCTAssertTrue(GPBMessageHasFieldNumberSet(msg, Message3_FieldNumber_OptionalUint32));
-    msg.optionalUint32 = 0;
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message3_FieldNumber_OptionalUint32));
-    [msg release];
-  }
-
-  {  // optionalUint64
-    Message3 *msg = [[Message3 alloc] init];
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message3_FieldNumber_OptionalUint64));
-    msg.optionalUint64 = 1;
-    XCTAssertTrue(GPBMessageHasFieldNumberSet(msg, Message3_FieldNumber_OptionalUint64));
-    msg.optionalUint64 = 0;
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message3_FieldNumber_OptionalUint64));
-    [msg release];
-  }
-
-  {  // optionalSint32
-    Message3 *msg = [[Message3 alloc] init];
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message3_FieldNumber_OptionalSint32));
-    msg.optionalSint32 = 1;
-    XCTAssertTrue(GPBMessageHasFieldNumberSet(msg, Message3_FieldNumber_OptionalSint32));
-    msg.optionalSint32 = 0;
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message3_FieldNumber_OptionalSint32));
-    [msg release];
-  }
-
-  {  // optionalSint64
-    Message3 *msg = [[Message3 alloc] init];
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message3_FieldNumber_OptionalSint64));
-    msg.optionalSint64 = 1;
-    XCTAssertTrue(GPBMessageHasFieldNumberSet(msg, Message3_FieldNumber_OptionalSint64));
-    msg.optionalSint64 = 0;
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message3_FieldNumber_OptionalSint64));
-    [msg release];
-  }
-
-  {  // optionalFixed32
-    Message3 *msg = [[Message3 alloc] init];
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message3_FieldNumber_OptionalFixed32));
-    msg.optionalFixed32 = 1;
-    XCTAssertTrue(GPBMessageHasFieldNumberSet(msg, Message3_FieldNumber_OptionalFixed32));
-    msg.optionalFixed32 = 0;
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message3_FieldNumber_OptionalFixed32));
-    [msg release];
-  }
-
-  {  // optionalFixed64
-    Message3 *msg = [[Message3 alloc] init];
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message3_FieldNumber_OptionalFixed64));
-    msg.optionalFixed64 = 1;
-    XCTAssertTrue(GPBMessageHasFieldNumberSet(msg, Message3_FieldNumber_OptionalFixed64));
-    msg.optionalFixed64 = 0;
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message3_FieldNumber_OptionalFixed64));
-    [msg release];
-  }
-
-  {  // optionalSfixed32
-    Message3 *msg = [[Message3 alloc] init];
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message3_FieldNumber_OptionalSfixed32));
-    msg.optionalSfixed32 = 1;
-    XCTAssertTrue(GPBMessageHasFieldNumberSet(msg, Message3_FieldNumber_OptionalSfixed32));
-    msg.optionalSfixed32 = 0;
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message3_FieldNumber_OptionalSfixed32));
-    [msg release];
-  }
-
-  {  // optionalSfixed64
-    Message3 *msg = [[Message3 alloc] init];
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message3_FieldNumber_OptionalSfixed64));
-    msg.optionalSfixed64 = 1;
-    XCTAssertTrue(GPBMessageHasFieldNumberSet(msg, Message3_FieldNumber_OptionalSfixed64));
-    msg.optionalSfixed64 = 0;
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message3_FieldNumber_OptionalSfixed64));
-    [msg release];
-  }
-
-  {  // optionalFloat
-    Message3 *msg = [[Message3 alloc] init];
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message3_FieldNumber_OptionalFloat));
-    msg.optionalFloat = 1.0f;
-    XCTAssertTrue(GPBMessageHasFieldNumberSet(msg, Message3_FieldNumber_OptionalFloat));
-    msg.optionalFloat = 0.0f;
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message3_FieldNumber_OptionalFloat));
-    [msg release];
-  }
-
-  {  // optionalDouble
-    Message3 *msg = [[Message3 alloc] init];
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message3_FieldNumber_OptionalDouble));
-    msg.optionalDouble = 1.0;
-    XCTAssertTrue(GPBMessageHasFieldNumberSet(msg, Message3_FieldNumber_OptionalDouble));
-    msg.optionalDouble = 0.0;
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message3_FieldNumber_OptionalDouble));
-    [msg release];
-  }
-
-  {  // optionalBool
-    Message3 *msg = [[Message3 alloc] init];
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message3_FieldNumber_OptionalBool));
-    msg.optionalBool = YES;
-    XCTAssertTrue(GPBMessageHasFieldNumberSet(msg, Message3_FieldNumber_OptionalBool));
-    msg.optionalBool = NO;
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message3_FieldNumber_OptionalBool));
-    [msg release];
-  }
-
-  {  // optionalString
-    Message3 *msg = [[Message3 alloc] init];
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message3_FieldNumber_OptionalString));
-    msg.optionalString = @"foo";
-    XCTAssertTrue(GPBMessageHasFieldNumberSet(msg, Message3_FieldNumber_OptionalString));
-    msg.optionalString = @"";
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message3_FieldNumber_OptionalString));
-    [msg release];
-  }
-
-  {  // optionalBytes
-    Message3 *msg = [[Message3 alloc] init];
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message3_FieldNumber_OptionalBytes));
-    msg.optionalBytes = [@"foo" dataUsingEncoding:NSUTF8StringEncoding];
-    XCTAssertTrue(GPBMessageHasFieldNumberSet(msg, Message3_FieldNumber_OptionalBytes));
-    msg.optionalBytes = [NSData data];
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message3_FieldNumber_OptionalBytes));
-    [msg release];
-  }
-
-  //
-  // Test doesn't apply to optionalMessage (no groups in proto3).
-  //
-
-  {  // optionalEnum
-    Message3 *msg = [[Message3 alloc] init];
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message3_FieldNumber_OptionalEnum));
-    msg.optionalEnum = Message3_Enum_Bar;
-    XCTAssertTrue(GPBMessageHasFieldNumberSet(msg, Message3_FieldNumber_OptionalEnum));
-    msg.optionalEnum = Message3_Enum_Foo;
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message3_FieldNumber_OptionalEnum));
-    [msg release];
-  }
-
-  //
-  // Nil can also be used to clear strings, bytes, and messages (no groups in proto3).
-  //
-
-  {  // optionalString
-    Message3 *msg = [[Message3 alloc] init];
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message3_FieldNumber_OptionalString));
-    msg.optionalString = @"foo";
-    XCTAssertTrue(GPBMessageHasFieldNumberSet(msg, Message3_FieldNumber_OptionalString));
-    msg.optionalString = nil;
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message3_FieldNumber_OptionalString));
-    [msg release];
-  }
-
-  {  // optionalBytes
-    Message3 *msg = [[Message3 alloc] init];
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message3_FieldNumber_OptionalBytes));
-    msg.optionalBytes = [@"foo" dataUsingEncoding:NSUTF8StringEncoding];
-    XCTAssertTrue(GPBMessageHasFieldNumberSet(msg, Message3_FieldNumber_OptionalBytes));
-    msg.optionalBytes = nil;
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message3_FieldNumber_OptionalBytes));
-    [msg release];
-  }
-
-  {  // optionalMessage
-    Message3 *msg = [[Message3 alloc] init];
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message3_FieldNumber_OptionalMessage));
-    msg.optionalMessage = [Message3 message];
-    XCTAssertTrue(GPBMessageHasFieldNumberSet(msg, Message3_FieldNumber_OptionalMessage));
-    msg.optionalMessage = nil;
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message3_FieldNumber_OptionalMessage));
-    [msg release];
-  }
-
-// clang-format on
-//%PDDM-EXPAND-END PROTO3_TEST_HAS_FIELDS()
-}
-
-- (void)testProto3SingleOptionalFieldHasBehavior {
-  //
-  // Setting to any value including the default (0) should result in true.
-  //
-
-//%PDDM-DEFINE PROTO3_TEST_OPTIONAL_HAS_FIELD(FIELD, NON_ZERO_VALUE, ZERO_VALUE)
-//%  {  // optional##FIELD
-//%    Message3Optional *msg = [[Message3Optional alloc] init];
-//%    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message3Optional_FieldNumber_Optional##FIELD));
-//%    msg.optional##FIELD = NON_ZERO_VALUE;
-//%    XCTAssertTrue(GPBMessageHasFieldNumberSet(msg, Message3Optional_FieldNumber_Optional##FIELD));
-//%    msg.hasOptional##FIELD = NO;
-//%    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message3Optional_FieldNumber_Optional##FIELD));
-//%    msg.optional##FIELD = ZERO_VALUE;
-//%    XCTAssertTrue(GPBMessageHasFieldNumberSet(msg, Message3Optional_FieldNumber_Optional##FIELD));
-//%    [msg release];
-//%  }
-//%
-//%PDDM-DEFINE PROTO3_TEST_OPTIONAL_HAS_FIELDS()
-//%PROTO3_TEST_OPTIONAL_HAS_FIELD(Int32, 1, 0)
-//%PROTO3_TEST_OPTIONAL_HAS_FIELD(Int64, 1, 0)
-//%PROTO3_TEST_OPTIONAL_HAS_FIELD(Uint32, 1, 0)
-//%PROTO3_TEST_OPTIONAL_HAS_FIELD(Uint64, 1, 0)
-//%PROTO3_TEST_OPTIONAL_HAS_FIELD(Sint32, 1, 0)
-//%PROTO3_TEST_OPTIONAL_HAS_FIELD(Sint64, 1, 0)
-//%PROTO3_TEST_OPTIONAL_HAS_FIELD(Fixed32, 1, 0)
-//%PROTO3_TEST_OPTIONAL_HAS_FIELD(Fixed64, 1, 0)
-//%PROTO3_TEST_OPTIONAL_HAS_FIELD(Sfixed32, 1, 0)
-//%PROTO3_TEST_OPTIONAL_HAS_FIELD(Sfixed64, 1, 0)
-//%PROTO3_TEST_OPTIONAL_HAS_FIELD(Float, 1.0f, 0.0f)
-//%PROTO3_TEST_OPTIONAL_HAS_FIELD(Double, 1.0, 0.0)
-//%PROTO3_TEST_OPTIONAL_HAS_FIELD(Bool, YES, NO)
-//%PROTO3_TEST_OPTIONAL_HAS_FIELD(String, @"foo", @"")
-//%PROTO3_TEST_OPTIONAL_HAS_FIELD(Bytes, [@"foo" dataUsingEncoding:NSUTF8StringEncoding], [NSData data])
-//%  //
-//%  // Test doesn't apply to optionalMessage (no groups in proto3).
-//%  //
-//%
-//%PROTO3_TEST_OPTIONAL_HAS_FIELD(Enum, Message3Optional_Enum_Bar, Message3Optional_Enum_Foo)
-//%PDDM-EXPAND PROTO3_TEST_OPTIONAL_HAS_FIELDS()
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-  {  // optionalInt32
-    Message3Optional *msg = [[Message3Optional alloc] init];
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message3Optional_FieldNumber_OptionalInt32));
-    msg.optionalInt32 = 1;
-    XCTAssertTrue(GPBMessageHasFieldNumberSet(msg, Message3Optional_FieldNumber_OptionalInt32));
-    msg.hasOptionalInt32 = NO;
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message3Optional_FieldNumber_OptionalInt32));
-    msg.optionalInt32 = 0;
-    XCTAssertTrue(GPBMessageHasFieldNumberSet(msg, Message3Optional_FieldNumber_OptionalInt32));
-    [msg release];
-  }
-
-  {  // optionalInt64
-    Message3Optional *msg = [[Message3Optional alloc] init];
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message3Optional_FieldNumber_OptionalInt64));
-    msg.optionalInt64 = 1;
-    XCTAssertTrue(GPBMessageHasFieldNumberSet(msg, Message3Optional_FieldNumber_OptionalInt64));
-    msg.hasOptionalInt64 = NO;
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message3Optional_FieldNumber_OptionalInt64));
-    msg.optionalInt64 = 0;
-    XCTAssertTrue(GPBMessageHasFieldNumberSet(msg, Message3Optional_FieldNumber_OptionalInt64));
-    [msg release];
-  }
-
-  {  // optionalUint32
-    Message3Optional *msg = [[Message3Optional alloc] init];
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message3Optional_FieldNumber_OptionalUint32));
-    msg.optionalUint32 = 1;
-    XCTAssertTrue(GPBMessageHasFieldNumberSet(msg, Message3Optional_FieldNumber_OptionalUint32));
-    msg.hasOptionalUint32 = NO;
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message3Optional_FieldNumber_OptionalUint32));
-    msg.optionalUint32 = 0;
-    XCTAssertTrue(GPBMessageHasFieldNumberSet(msg, Message3Optional_FieldNumber_OptionalUint32));
-    [msg release];
-  }
-
-  {  // optionalUint64
-    Message3Optional *msg = [[Message3Optional alloc] init];
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message3Optional_FieldNumber_OptionalUint64));
-    msg.optionalUint64 = 1;
-    XCTAssertTrue(GPBMessageHasFieldNumberSet(msg, Message3Optional_FieldNumber_OptionalUint64));
-    msg.hasOptionalUint64 = NO;
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message3Optional_FieldNumber_OptionalUint64));
-    msg.optionalUint64 = 0;
-    XCTAssertTrue(GPBMessageHasFieldNumberSet(msg, Message3Optional_FieldNumber_OptionalUint64));
-    [msg release];
-  }
-
-  {  // optionalSint32
-    Message3Optional *msg = [[Message3Optional alloc] init];
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message3Optional_FieldNumber_OptionalSint32));
-    msg.optionalSint32 = 1;
-    XCTAssertTrue(GPBMessageHasFieldNumberSet(msg, Message3Optional_FieldNumber_OptionalSint32));
-    msg.hasOptionalSint32 = NO;
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message3Optional_FieldNumber_OptionalSint32));
-    msg.optionalSint32 = 0;
-    XCTAssertTrue(GPBMessageHasFieldNumberSet(msg, Message3Optional_FieldNumber_OptionalSint32));
-    [msg release];
-  }
-
-  {  // optionalSint64
-    Message3Optional *msg = [[Message3Optional alloc] init];
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message3Optional_FieldNumber_OptionalSint64));
-    msg.optionalSint64 = 1;
-    XCTAssertTrue(GPBMessageHasFieldNumberSet(msg, Message3Optional_FieldNumber_OptionalSint64));
-    msg.hasOptionalSint64 = NO;
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message3Optional_FieldNumber_OptionalSint64));
-    msg.optionalSint64 = 0;
-    XCTAssertTrue(GPBMessageHasFieldNumberSet(msg, Message3Optional_FieldNumber_OptionalSint64));
-    [msg release];
-  }
-
-  {  // optionalFixed32
-    Message3Optional *msg = [[Message3Optional alloc] init];
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message3Optional_FieldNumber_OptionalFixed32));
-    msg.optionalFixed32 = 1;
-    XCTAssertTrue(GPBMessageHasFieldNumberSet(msg, Message3Optional_FieldNumber_OptionalFixed32));
-    msg.hasOptionalFixed32 = NO;
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message3Optional_FieldNumber_OptionalFixed32));
-    msg.optionalFixed32 = 0;
-    XCTAssertTrue(GPBMessageHasFieldNumberSet(msg, Message3Optional_FieldNumber_OptionalFixed32));
-    [msg release];
-  }
-
-  {  // optionalFixed64
-    Message3Optional *msg = [[Message3Optional alloc] init];
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message3Optional_FieldNumber_OptionalFixed64));
-    msg.optionalFixed64 = 1;
-    XCTAssertTrue(GPBMessageHasFieldNumberSet(msg, Message3Optional_FieldNumber_OptionalFixed64));
-    msg.hasOptionalFixed64 = NO;
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message3Optional_FieldNumber_OptionalFixed64));
-    msg.optionalFixed64 = 0;
-    XCTAssertTrue(GPBMessageHasFieldNumberSet(msg, Message3Optional_FieldNumber_OptionalFixed64));
-    [msg release];
-  }
-
-  {  // optionalSfixed32
-    Message3Optional *msg = [[Message3Optional alloc] init];
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message3Optional_FieldNumber_OptionalSfixed32));
-    msg.optionalSfixed32 = 1;
-    XCTAssertTrue(GPBMessageHasFieldNumberSet(msg, Message3Optional_FieldNumber_OptionalSfixed32));
-    msg.hasOptionalSfixed32 = NO;
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message3Optional_FieldNumber_OptionalSfixed32));
-    msg.optionalSfixed32 = 0;
-    XCTAssertTrue(GPBMessageHasFieldNumberSet(msg, Message3Optional_FieldNumber_OptionalSfixed32));
-    [msg release];
-  }
-
-  {  // optionalSfixed64
-    Message3Optional *msg = [[Message3Optional alloc] init];
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message3Optional_FieldNumber_OptionalSfixed64));
-    msg.optionalSfixed64 = 1;
-    XCTAssertTrue(GPBMessageHasFieldNumberSet(msg, Message3Optional_FieldNumber_OptionalSfixed64));
-    msg.hasOptionalSfixed64 = NO;
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message3Optional_FieldNumber_OptionalSfixed64));
-    msg.optionalSfixed64 = 0;
-    XCTAssertTrue(GPBMessageHasFieldNumberSet(msg, Message3Optional_FieldNumber_OptionalSfixed64));
-    [msg release];
-  }
-
-  {  // optionalFloat
-    Message3Optional *msg = [[Message3Optional alloc] init];
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message3Optional_FieldNumber_OptionalFloat));
-    msg.optionalFloat = 1.0f;
-    XCTAssertTrue(GPBMessageHasFieldNumberSet(msg, Message3Optional_FieldNumber_OptionalFloat));
-    msg.hasOptionalFloat = NO;
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message3Optional_FieldNumber_OptionalFloat));
-    msg.optionalFloat = 0.0f;
-    XCTAssertTrue(GPBMessageHasFieldNumberSet(msg, Message3Optional_FieldNumber_OptionalFloat));
-    [msg release];
-  }
-
-  {  // optionalDouble
-    Message3Optional *msg = [[Message3Optional alloc] init];
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message3Optional_FieldNumber_OptionalDouble));
-    msg.optionalDouble = 1.0;
-    XCTAssertTrue(GPBMessageHasFieldNumberSet(msg, Message3Optional_FieldNumber_OptionalDouble));
-    msg.hasOptionalDouble = NO;
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message3Optional_FieldNumber_OptionalDouble));
-    msg.optionalDouble = 0.0;
-    XCTAssertTrue(GPBMessageHasFieldNumberSet(msg, Message3Optional_FieldNumber_OptionalDouble));
-    [msg release];
-  }
-
-  {  // optionalBool
-    Message3Optional *msg = [[Message3Optional alloc] init];
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message3Optional_FieldNumber_OptionalBool));
-    msg.optionalBool = YES;
-    XCTAssertTrue(GPBMessageHasFieldNumberSet(msg, Message3Optional_FieldNumber_OptionalBool));
-    msg.hasOptionalBool = NO;
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message3Optional_FieldNumber_OptionalBool));
-    msg.optionalBool = NO;
-    XCTAssertTrue(GPBMessageHasFieldNumberSet(msg, Message3Optional_FieldNumber_OptionalBool));
-    [msg release];
-  }
-
-  {  // optionalString
-    Message3Optional *msg = [[Message3Optional alloc] init];
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message3Optional_FieldNumber_OptionalString));
-    msg.optionalString = @"foo";
-    XCTAssertTrue(GPBMessageHasFieldNumberSet(msg, Message3Optional_FieldNumber_OptionalString));
-    msg.hasOptionalString = NO;
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message3Optional_FieldNumber_OptionalString));
-    msg.optionalString = @"";
-    XCTAssertTrue(GPBMessageHasFieldNumberSet(msg, Message3Optional_FieldNumber_OptionalString));
-    [msg release];
-  }
-
-  {  // optionalBytes
-    Message3Optional *msg = [[Message3Optional alloc] init];
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message3Optional_FieldNumber_OptionalBytes));
-    msg.optionalBytes = [@"foo" dataUsingEncoding:NSUTF8StringEncoding];
-    XCTAssertTrue(GPBMessageHasFieldNumberSet(msg, Message3Optional_FieldNumber_OptionalBytes));
-    msg.hasOptionalBytes = NO;
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message3Optional_FieldNumber_OptionalBytes));
-    msg.optionalBytes = [NSData data];
-    XCTAssertTrue(GPBMessageHasFieldNumberSet(msg, Message3Optional_FieldNumber_OptionalBytes));
-    [msg release];
-  }
-
-  //
-  // Test doesn't apply to optionalMessage (no groups in proto3).
-  //
-
-  {  // optionalEnum
-    Message3Optional *msg = [[Message3Optional alloc] init];
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message3Optional_FieldNumber_OptionalEnum));
-    msg.optionalEnum = Message3Optional_Enum_Bar;
-    XCTAssertTrue(GPBMessageHasFieldNumberSet(msg, Message3Optional_FieldNumber_OptionalEnum));
-    msg.hasOptionalEnum = NO;
-    XCTAssertFalse(GPBMessageHasFieldNumberSet(msg, Message3Optional_FieldNumber_OptionalEnum));
-    msg.optionalEnum = Message3Optional_Enum_Foo;
-    XCTAssertTrue(GPBMessageHasFieldNumberSet(msg, Message3Optional_FieldNumber_OptionalEnum));
-    [msg release];
-  }
-
-// clang-format on
-//%PDDM-EXPAND-END PROTO3_TEST_OPTIONAL_HAS_FIELDS()
-}
-
-- (void)testAccessingProto2UnknownEnumValues {
-  Message2 *msg = [[Message2 alloc] init];
-
-  // Set it to something non zero, try and confirm it doesn't change.
-
-  msg.optionalEnum = Message2_Enum_Bar;
-  XCTAssertThrowsSpecificNamed(msg.optionalEnum = 666, NSException,
-                               NSInvalidArgumentException);
-  XCTAssertEqual(msg.optionalEnum, Message2_Enum_Bar);
-
-  msg.oneofEnum = Message2_Enum_Bar;
-  XCTAssertThrowsSpecificNamed(msg.oneofEnum = 666, NSException,
-                               NSInvalidArgumentException);
-  XCTAssertEqual(msg.oneofEnum, Message2_Enum_Bar);
-
-  [msg release];
-}
-
-- (void)testAccessingProto3UnknownEnumValues {
-  Message3 *msg = [[Message3 alloc] init];
-
-  // Set it to something non zero, try and confirm it doesn't change.
-
-  msg.optionalEnum = Message3_Enum_Bar;
-  XCTAssertThrowsSpecificNamed(msg.optionalEnum = 666, NSException,
-                               NSInvalidArgumentException);
-  XCTAssertEqual(msg.optionalEnum, Message3_Enum_Bar);
-
-  msg.oneofEnum = Message3_Enum_Bar;
-  XCTAssertThrowsSpecificNamed(msg.oneofEnum = 666, NSException,
-                               NSInvalidArgumentException);
-  XCTAssertEqual(msg.oneofEnum, Message3_Enum_Bar);
-
-  // Set via raw api to confirm it works.
-
-  SetMessage3_OptionalEnum_RawValue(msg, 666);
-  XCTAssertEqual(msg.optionalEnum,
-                 Message3_Enum_GPBUnrecognizedEnumeratorValue);
-  XCTAssertEqual(Message3_OptionalEnum_RawValue(msg), 666);
-
-  SetMessage3_OneofEnum_RawValue(msg, 666);
-  XCTAssertEqual(msg.oneofEnum, Message3_Enum_GPBUnrecognizedEnumeratorValue);
-  XCTAssertEqual(Message3_OneofEnum_RawValue(msg), 666);
-
-  [msg release];
-}
-
-- (void)testProto2OneofBasicBehaviors {
-  Message2 *msg = [[Message2 alloc] init];
-
-  NSString *oneofStringDefault = @"string";
-  NSData *oneofBytesDefault = [@"data" dataUsingEncoding:NSUTF8StringEncoding];
-
-  // Nothing set.
-  XCTAssertEqual(msg.oOneOfCase, Message2_O_OneOfCase_GPBUnsetOneOfCase);
-  XCTAssertEqual(msg.oneofInt32, 100);
-  XCTAssertEqual(msg.oneofInt64, 101);
-  XCTAssertEqual(msg.oneofUint32, 102U);
-  XCTAssertEqual(msg.oneofUint64, 103U);
-  XCTAssertEqual(msg.oneofSint32, 104);
-  XCTAssertEqual(msg.oneofSint64, 105);
-  XCTAssertEqual(msg.oneofFixed32, 106U);
-  XCTAssertEqual(msg.oneofFixed64, 107U);
-  XCTAssertEqual(msg.oneofSfixed32, 108);
-  XCTAssertEqual(msg.oneofSfixed64, 109);
-  XCTAssertEqual(msg.oneofFloat, 110.0f);
-  XCTAssertEqual(msg.oneofDouble, 111.0);
-  XCTAssertEqual(msg.oneofBool, YES);
-  XCTAssertEqualObjects(msg.oneofString, oneofStringDefault);
-  XCTAssertEqualObjects(msg.oneofBytes, oneofBytesDefault);
-  XCTAssertNotNil(msg.oneofGroup);
-  XCTAssertNotNil(msg.oneofMessage);
-  XCTAssertEqual(msg.oneofEnum, Message2_Enum_Baz);
-
-  // Set, check the case, check everyone has default but the one, confirm case
-  // didn't change.
-
-  msg.oneofInt32 = 1;
-  XCTAssertEqual(msg.oOneOfCase, Message2_O_OneOfCase_OneofInt32);
-  XCTAssertEqual(msg.oneofInt32, 1);
-  XCTAssertEqual(msg.oneofInt64, 101);
-  XCTAssertEqual(msg.oneofUint32, 102U);
-  XCTAssertEqual(msg.oneofUint64, 103U);
-  XCTAssertEqual(msg.oneofSint32, 104);
-  XCTAssertEqual(msg.oneofSint64, 105);
-  XCTAssertEqual(msg.oneofFixed32, 106U);
-  XCTAssertEqual(msg.oneofFixed64, 107U);
-  XCTAssertEqual(msg.oneofSfixed32, 108);
-  XCTAssertEqual(msg.oneofSfixed64, 109);
-  XCTAssertEqual(msg.oneofFloat, 110.0f);
-  XCTAssertEqual(msg.oneofDouble, 111.0);
-  XCTAssertEqual(msg.oneofBool, YES);
-  XCTAssertEqualObjects(msg.oneofString, oneofStringDefault);
-  XCTAssertEqualObjects(msg.oneofBytes, oneofBytesDefault);
-  XCTAssertNotNil(msg.oneofGroup);
-  XCTAssertNotNil(msg.oneofMessage);
-  XCTAssertEqual(msg.oneofEnum, Message2_Enum_Baz);
-  XCTAssertEqual(msg.oOneOfCase, Message2_O_OneOfCase_OneofInt32);
-
-  msg.oneofInt64 = 2;
-  XCTAssertEqual(msg.oOneOfCase, Message2_O_OneOfCase_OneofInt64);
-  XCTAssertEqual(msg.oneofInt32, 100);
-  XCTAssertEqual(msg.oneofInt64, 2);
-  XCTAssertEqual(msg.oneofUint32, 102U);
-  XCTAssertEqual(msg.oneofUint64, 103U);
-  XCTAssertEqual(msg.oneofSint32, 104);
-  XCTAssertEqual(msg.oneofSint64, 105);
-  XCTAssertEqual(msg.oneofFixed32, 106U);
-  XCTAssertEqual(msg.oneofFixed64, 107U);
-  XCTAssertEqual(msg.oneofSfixed32, 108);
-  XCTAssertEqual(msg.oneofSfixed64, 109);
-  XCTAssertEqual(msg.oneofFloat, 110.0f);
-  XCTAssertEqual(msg.oneofDouble, 111.0);
-  XCTAssertEqual(msg.oneofBool, YES);
-  XCTAssertEqualObjects(msg.oneofString, oneofStringDefault);
-  XCTAssertEqualObjects(msg.oneofBytes, oneofBytesDefault);
-  XCTAssertNotNil(msg.oneofGroup);
-  XCTAssertNotNil(msg.oneofMessage);
-  XCTAssertEqual(msg.oneofEnum, Message2_Enum_Baz);
-  XCTAssertEqual(msg.oOneOfCase, Message2_O_OneOfCase_OneofInt64);
-
-  msg.oneofUint32 = 3;
-  XCTAssertEqual(msg.oOneOfCase, Message2_O_OneOfCase_OneofUint32);
-  XCTAssertEqual(msg.oneofInt32, 100);
-  XCTAssertEqual(msg.oneofInt64, 101);
-  XCTAssertEqual(msg.oneofUint32, 3U);
-  XCTAssertEqual(msg.oneofUint64, 103U);
-  XCTAssertEqual(msg.oneofSint32, 104);
-  XCTAssertEqual(msg.oneofSint64, 105);
-  XCTAssertEqual(msg.oneofFixed32, 106U);
-  XCTAssertEqual(msg.oneofFixed64, 107U);
-  XCTAssertEqual(msg.oneofSfixed32, 108);
-  XCTAssertEqual(msg.oneofSfixed64, 109);
-  XCTAssertEqual(msg.oneofFloat, 110.0f);
-  XCTAssertEqual(msg.oneofDouble, 111.0);
-  XCTAssertEqual(msg.oneofBool, YES);
-  XCTAssertEqualObjects(msg.oneofString, oneofStringDefault);
-  XCTAssertEqualObjects(msg.oneofBytes, oneofBytesDefault);
-  XCTAssertNotNil(msg.oneofGroup);
-  XCTAssertNotNil(msg.oneofMessage);
-  XCTAssertEqual(msg.oneofEnum, Message2_Enum_Baz);
-  XCTAssertEqual(msg.oOneOfCase, Message2_O_OneOfCase_OneofUint32);
-
-  msg.oneofUint64 = 4;
-  XCTAssertEqual(msg.oOneOfCase, Message2_O_OneOfCase_OneofUint64);
-  XCTAssertEqual(msg.oneofInt32, 100);
-  XCTAssertEqual(msg.oneofInt64, 101);
-  XCTAssertEqual(msg.oneofUint32, 102U);
-  XCTAssertEqual(msg.oneofUint64, 4U);
-  XCTAssertEqual(msg.oneofSint32, 104);
-  XCTAssertEqual(msg.oneofSint64, 105);
-  XCTAssertEqual(msg.oneofFixed32, 106U);
-  XCTAssertEqual(msg.oneofFixed64, 107U);
-  XCTAssertEqual(msg.oneofSfixed32, 108);
-  XCTAssertEqual(msg.oneofSfixed64, 109);
-  XCTAssertEqual(msg.oneofFloat, 110.0f);
-  XCTAssertEqual(msg.oneofDouble, 111.0);
-  XCTAssertEqual(msg.oneofBool, YES);
-  XCTAssertEqualObjects(msg.oneofString, oneofStringDefault);
-  XCTAssertEqualObjects(msg.oneofBytes, oneofBytesDefault);
-  XCTAssertNotNil(msg.oneofGroup);
-  XCTAssertNotNil(msg.oneofMessage);
-  XCTAssertEqual(msg.oneofEnum, Message2_Enum_Baz);
-  XCTAssertEqual(msg.oOneOfCase, Message2_O_OneOfCase_OneofUint64);
-
-  msg.oneofSint32 = 5;
-  XCTAssertEqual(msg.oOneOfCase, Message2_O_OneOfCase_OneofSint32);
-  XCTAssertEqual(msg.oneofInt32, 100);
-  XCTAssertEqual(msg.oneofInt64, 101);
-  XCTAssertEqual(msg.oneofUint32, 102U);
-  XCTAssertEqual(msg.oneofUint64, 103U);
-  XCTAssertEqual(msg.oneofSint32, 5);
-  XCTAssertEqual(msg.oneofSint64, 105);
-  XCTAssertEqual(msg.oneofFixed32, 106U);
-  XCTAssertEqual(msg.oneofFixed64, 107U);
-  XCTAssertEqual(msg.oneofSfixed32, 108);
-  XCTAssertEqual(msg.oneofSfixed64, 109);
-  XCTAssertEqual(msg.oneofFloat, 110.0f);
-  XCTAssertEqual(msg.oneofDouble, 111.0);
-  XCTAssertEqual(msg.oneofBool, YES);
-  XCTAssertEqualObjects(msg.oneofString, oneofStringDefault);
-  XCTAssertEqualObjects(msg.oneofBytes, oneofBytesDefault);
-  XCTAssertNotNil(msg.oneofGroup);
-  XCTAssertNotNil(msg.oneofMessage);
-  XCTAssertEqual(msg.oneofEnum, Message2_Enum_Baz);
-  XCTAssertEqual(msg.oOneOfCase, Message2_O_OneOfCase_OneofSint32);
-
-  msg.oneofSint64 = 6;
-  XCTAssertEqual(msg.oOneOfCase, Message2_O_OneOfCase_OneofSint64);
-  XCTAssertEqual(msg.oneofInt32, 100);
-  XCTAssertEqual(msg.oneofInt64, 101);
-  XCTAssertEqual(msg.oneofUint32, 102U);
-  XCTAssertEqual(msg.oneofUint64, 103U);
-  XCTAssertEqual(msg.oneofSint32, 104);
-  XCTAssertEqual(msg.oneofSint64, 6);
-  XCTAssertEqual(msg.oneofFixed32, 106U);
-  XCTAssertEqual(msg.oneofFixed64, 107U);
-  XCTAssertEqual(msg.oneofSfixed32, 108);
-  XCTAssertEqual(msg.oneofSfixed64, 109);
-  XCTAssertEqual(msg.oneofFloat, 110.0f);
-  XCTAssertEqual(msg.oneofDouble, 111.0);
-  XCTAssertEqual(msg.oneofBool, YES);
-  XCTAssertEqualObjects(msg.oneofString, oneofStringDefault);
-  XCTAssertEqualObjects(msg.oneofBytes, oneofBytesDefault);
-  XCTAssertNotNil(msg.oneofGroup);
-  XCTAssertNotNil(msg.oneofMessage);
-  XCTAssertEqual(msg.oneofEnum, Message2_Enum_Baz);
-  XCTAssertEqual(msg.oOneOfCase, Message2_O_OneOfCase_OneofSint64);
-
-  msg.oneofFixed32 = 7;
-  XCTAssertEqual(msg.oOneOfCase, Message2_O_OneOfCase_OneofFixed32);
-  XCTAssertEqual(msg.oneofInt32, 100);
-  XCTAssertEqual(msg.oneofInt64, 101);
-  XCTAssertEqual(msg.oneofUint32, 102U);
-  XCTAssertEqual(msg.oneofUint64, 103U);
-  XCTAssertEqual(msg.oneofSint32, 104);
-  XCTAssertEqual(msg.oneofSint64, 105);
-  XCTAssertEqual(msg.oneofFixed32, 7U);
-  XCTAssertEqual(msg.oneofFixed64, 107U);
-  XCTAssertEqual(msg.oneofSfixed32, 108);
-  XCTAssertEqual(msg.oneofSfixed64, 109);
-  XCTAssertEqual(msg.oneofFloat, 110.0f);
-  XCTAssertEqual(msg.oneofDouble, 111.0);
-  XCTAssertEqual(msg.oneofBool, YES);
-  XCTAssertEqualObjects(msg.oneofString, oneofStringDefault);
-  XCTAssertEqualObjects(msg.oneofBytes, oneofBytesDefault);
-  XCTAssertNotNil(msg.oneofGroup);
-  XCTAssertNotNil(msg.oneofMessage);
-  XCTAssertEqual(msg.oneofEnum, Message2_Enum_Baz);
-  XCTAssertEqual(msg.oOneOfCase, Message2_O_OneOfCase_OneofFixed32);
-
-  msg.oneofFixed64 = 8;
-  XCTAssertEqual(msg.oOneOfCase, Message2_O_OneOfCase_OneofFixed64);
-  XCTAssertEqual(msg.oneofInt32, 100);
-  XCTAssertEqual(msg.oneofInt64, 101);
-  XCTAssertEqual(msg.oneofUint32, 102U);
-  XCTAssertEqual(msg.oneofUint64, 103U);
-  XCTAssertEqual(msg.oneofSint32, 104);
-  XCTAssertEqual(msg.oneofSint64, 105);
-  XCTAssertEqual(msg.oneofFixed32, 106U);
-  XCTAssertEqual(msg.oneofFixed64, 8U);
-  XCTAssertEqual(msg.oneofSfixed32, 108);
-  XCTAssertEqual(msg.oneofSfixed64, 109);
-  XCTAssertEqual(msg.oneofFloat, 110.0f);
-  XCTAssertEqual(msg.oneofDouble, 111.0);
-  XCTAssertEqual(msg.oneofBool, YES);
-  XCTAssertEqualObjects(msg.oneofString, oneofStringDefault);
-  XCTAssertEqualObjects(msg.oneofBytes, oneofBytesDefault);
-  XCTAssertNotNil(msg.oneofGroup);
-  XCTAssertNotNil(msg.oneofMessage);
-  XCTAssertEqual(msg.oneofEnum, Message2_Enum_Baz);
-  XCTAssertEqual(msg.oOneOfCase, Message2_O_OneOfCase_OneofFixed64);
-
-  msg.oneofSfixed32 = 9;
-  XCTAssertEqual(msg.oOneOfCase, Message2_O_OneOfCase_OneofSfixed32);
-  XCTAssertEqual(msg.oneofInt32, 100);
-  XCTAssertEqual(msg.oneofInt64, 101);
-  XCTAssertEqual(msg.oneofUint32, 102U);
-  XCTAssertEqual(msg.oneofUint64, 103U);
-  XCTAssertEqual(msg.oneofSint32, 104);
-  XCTAssertEqual(msg.oneofSint64, 105);
-  XCTAssertEqual(msg.oneofFixed32, 106U);
-  XCTAssertEqual(msg.oneofFixed64, 107U);
-  XCTAssertEqual(msg.oneofSfixed32, 9);
-  XCTAssertEqual(msg.oneofSfixed64, 109);
-  XCTAssertEqual(msg.oneofFloat, 110.0f);
-  XCTAssertEqual(msg.oneofDouble, 111.0);
-  XCTAssertEqual(msg.oneofBool, YES);
-  XCTAssertEqualObjects(msg.oneofString, oneofStringDefault);
-  XCTAssertEqualObjects(msg.oneofBytes, oneofBytesDefault);
-  XCTAssertNotNil(msg.oneofGroup);
-  XCTAssertNotNil(msg.oneofMessage);
-  XCTAssertEqual(msg.oneofEnum, Message2_Enum_Baz);
-  XCTAssertEqual(msg.oOneOfCase, Message2_O_OneOfCase_OneofSfixed32);
-
-  msg.oneofSfixed64 = 10;
-  XCTAssertEqual(msg.oOneOfCase, Message2_O_OneOfCase_OneofSfixed64);
-  XCTAssertEqual(msg.oneofInt32, 100);
-  XCTAssertEqual(msg.oneofInt64, 101);
-  XCTAssertEqual(msg.oneofUint32, 102U);
-  XCTAssertEqual(msg.oneofUint64, 103U);
-  XCTAssertEqual(msg.oneofSint32, 104);
-  XCTAssertEqual(msg.oneofSint64, 105);
-  XCTAssertEqual(msg.oneofFixed32, 106U);
-  XCTAssertEqual(msg.oneofFixed64, 107U);
-  XCTAssertEqual(msg.oneofSfixed32, 108);
-  XCTAssertEqual(msg.oneofSfixed64, 10);
-  XCTAssertEqual(msg.oneofFloat, 110.0f);
-  XCTAssertEqual(msg.oneofDouble, 111.0);
-  XCTAssertEqual(msg.oneofBool, YES);
-  XCTAssertEqualObjects(msg.oneofString, oneofStringDefault);
-  XCTAssertEqualObjects(msg.oneofBytes, oneofBytesDefault);
-  XCTAssertNotNil(msg.oneofGroup);
-  XCTAssertNotNil(msg.oneofMessage);
-  XCTAssertEqual(msg.oneofEnum, Message2_Enum_Baz);
-  XCTAssertEqual(msg.oOneOfCase, Message2_O_OneOfCase_OneofSfixed64);
-
-  msg.oneofFloat = 11.0f;
-  XCTAssertEqual(msg.oOneOfCase, Message2_O_OneOfCase_OneofFloat);
-  XCTAssertEqual(msg.oneofInt32, 100);
-  XCTAssertEqual(msg.oneofInt64, 101);
-  XCTAssertEqual(msg.oneofUint32, 102U);
-  XCTAssertEqual(msg.oneofUint64, 103U);
-  XCTAssertEqual(msg.oneofSint32, 104);
-  XCTAssertEqual(msg.oneofSint64, 105);
-  XCTAssertEqual(msg.oneofFixed32, 106U);
-  XCTAssertEqual(msg.oneofFixed64, 107U);
-  XCTAssertEqual(msg.oneofSfixed32, 108);
-  XCTAssertEqual(msg.oneofSfixed64, 109);
-  XCTAssertEqual(msg.oneofFloat, 11.0f);
-  XCTAssertEqual(msg.oneofDouble, 111.0);
-  XCTAssertEqual(msg.oneofBool, YES);
-  XCTAssertEqualObjects(msg.oneofString, oneofStringDefault);
-  XCTAssertEqualObjects(msg.oneofBytes, oneofBytesDefault);
-  XCTAssertNotNil(msg.oneofGroup);
-  XCTAssertNotNil(msg.oneofMessage);
-  XCTAssertEqual(msg.oneofEnum, Message2_Enum_Baz);
-  XCTAssertEqual(msg.oOneOfCase, Message2_O_OneOfCase_OneofFloat);
-
-  msg.oneofDouble = 12.0;
-  XCTAssertEqual(msg.oOneOfCase, Message2_O_OneOfCase_OneofDouble);
-  XCTAssertEqual(msg.oneofInt32, 100);
-  XCTAssertEqual(msg.oneofInt64, 101);
-  XCTAssertEqual(msg.oneofUint32, 102U);
-  XCTAssertEqual(msg.oneofUint64, 103U);
-  XCTAssertEqual(msg.oneofSint32, 104);
-  XCTAssertEqual(msg.oneofSint64, 105);
-  XCTAssertEqual(msg.oneofFixed32, 106U);
-  XCTAssertEqual(msg.oneofFixed64, 107U);
-  XCTAssertEqual(msg.oneofSfixed32, 108);
-  XCTAssertEqual(msg.oneofSfixed64, 109);
-  XCTAssertEqual(msg.oneofFloat, 110.0f);
-  XCTAssertEqual(msg.oneofDouble, 12.0);
-  XCTAssertEqual(msg.oneofBool, YES);
-  XCTAssertEqualObjects(msg.oneofString, oneofStringDefault);
-  XCTAssertEqualObjects(msg.oneofBytes, oneofBytesDefault);
-  XCTAssertNotNil(msg.oneofGroup);
-  XCTAssertNotNil(msg.oneofMessage);
-  XCTAssertEqual(msg.oneofEnum, Message2_Enum_Baz);
-  XCTAssertEqual(msg.oOneOfCase, Message2_O_OneOfCase_OneofDouble);
-
-  msg.oneofBool = NO;
-  XCTAssertEqual(msg.oOneOfCase, Message2_O_OneOfCase_OneofBool);
-  XCTAssertEqual(msg.oneofInt32, 100);
-  XCTAssertEqual(msg.oneofInt64, 101);
-  XCTAssertEqual(msg.oneofUint32, 102U);
-  XCTAssertEqual(msg.oneofUint64, 103U);
-  XCTAssertEqual(msg.oneofSint32, 104);
-  XCTAssertEqual(msg.oneofSint64, 105);
-  XCTAssertEqual(msg.oneofFixed32, 106U);
-  XCTAssertEqual(msg.oneofFixed64, 107U);
-  XCTAssertEqual(msg.oneofSfixed32, 108);
-  XCTAssertEqual(msg.oneofSfixed64, 109);
-  XCTAssertEqual(msg.oneofFloat, 110.0f);
-  XCTAssertEqual(msg.oneofDouble, 111.0);
-  XCTAssertEqual(msg.oneofBool, NO);
-  XCTAssertEqualObjects(msg.oneofString, oneofStringDefault);
-  XCTAssertEqualObjects(msg.oneofBytes, oneofBytesDefault);
-  XCTAssertNotNil(msg.oneofGroup);
-  XCTAssertNotNil(msg.oneofMessage);
-  XCTAssertEqual(msg.oneofEnum, Message2_Enum_Baz);
-  XCTAssertEqual(msg.oOneOfCase, Message2_O_OneOfCase_OneofBool);
-
-  msg.oneofString = @"foo";
-  XCTAssertEqual(msg.oOneOfCase, Message2_O_OneOfCase_OneofString);
-  XCTAssertEqual(msg.oneofInt32, 100);
-  XCTAssertEqual(msg.oneofInt64, 101);
-  XCTAssertEqual(msg.oneofUint32, 102U);
-  XCTAssertEqual(msg.oneofUint64, 103U);
-  XCTAssertEqual(msg.oneofSint32, 104);
-  XCTAssertEqual(msg.oneofSint64, 105);
-  XCTAssertEqual(msg.oneofFixed32, 106U);
-  XCTAssertEqual(msg.oneofFixed64, 107U);
-  XCTAssertEqual(msg.oneofSfixed32, 108);
-  XCTAssertEqual(msg.oneofSfixed64, 109);
-  XCTAssertEqual(msg.oneofFloat, 110.0f);
-  XCTAssertEqual(msg.oneofDouble, 111.0);
-  XCTAssertEqual(msg.oneofBool, YES);
-  XCTAssertEqualObjects(msg.oneofString, @"foo");
-  XCTAssertEqualObjects(msg.oneofBytes, oneofBytesDefault);
-  XCTAssertNotNil(msg.oneofGroup);
-  XCTAssertNotNil(msg.oneofMessage);
-  XCTAssertEqual(msg.oneofEnum, Message2_Enum_Baz);
-  XCTAssertEqual(msg.oOneOfCase, Message2_O_OneOfCase_OneofString);
-
-  msg.oneofBytes = [@"bar" dataUsingEncoding:NSUTF8StringEncoding];
-  XCTAssertEqual(msg.oOneOfCase, Message2_O_OneOfCase_OneofBytes);
-  XCTAssertEqual(msg.oneofInt32, 100);
-  XCTAssertEqual(msg.oneofInt64, 101);
-  XCTAssertEqual(msg.oneofUint32, 102U);
-  XCTAssertEqual(msg.oneofUint64, 103U);
-  XCTAssertEqual(msg.oneofSint32, 104);
-  XCTAssertEqual(msg.oneofSint64, 105);
-  XCTAssertEqual(msg.oneofFixed32, 106U);
-  XCTAssertEqual(msg.oneofFixed64, 107U);
-  XCTAssertEqual(msg.oneofSfixed32, 108);
-  XCTAssertEqual(msg.oneofSfixed64, 109);
-  XCTAssertEqual(msg.oneofFloat, 110.0f);
-  XCTAssertEqual(msg.oneofDouble, 111.0);
-  XCTAssertEqual(msg.oneofBool, YES);
-  XCTAssertEqualObjects(msg.oneofString, oneofStringDefault);
-  XCTAssertEqualObjects(msg.oneofBytes,
-                        [@"bar" dataUsingEncoding:NSUTF8StringEncoding]);
-  XCTAssertNotNil(msg.oneofGroup);
-  XCTAssertNotNil(msg.oneofMessage);
-  XCTAssertEqual(msg.oneofEnum, Message2_Enum_Baz);
-  XCTAssertEqual(msg.oOneOfCase, Message2_O_OneOfCase_OneofBytes);
-
-  Message2_OneofGroup *group = [Message2_OneofGroup message];
-  msg.oneofGroup = group;
-  XCTAssertEqual(msg.oOneOfCase, Message2_O_OneOfCase_OneofGroup);
-  XCTAssertEqual(msg.oneofInt32, 100);
-  XCTAssertEqual(msg.oneofInt64, 101);
-  XCTAssertEqual(msg.oneofUint32, 102U);
-  XCTAssertEqual(msg.oneofUint64, 103U);
-  XCTAssertEqual(msg.oneofSint32, 104);
-  XCTAssertEqual(msg.oneofSint64, 105);
-  XCTAssertEqual(msg.oneofFixed32, 106U);
-  XCTAssertEqual(msg.oneofFixed64, 107U);
-  XCTAssertEqual(msg.oneofSfixed32, 108);
-  XCTAssertEqual(msg.oneofSfixed64, 109);
-  XCTAssertEqual(msg.oneofFloat, 110.0f);
-  XCTAssertEqual(msg.oneofDouble, 111.0);
-  XCTAssertEqual(msg.oneofBool, YES);
-  XCTAssertEqualObjects(msg.oneofString, oneofStringDefault);
-  XCTAssertEqualObjects(msg.oneofBytes, oneofBytesDefault);
-  XCTAssertEqual(msg.oneofGroup, group);  // Pointer compare.
-  XCTAssertNotNil(msg.oneofMessage);
-  XCTAssertEqual(msg.oneofEnum, Message2_Enum_Baz);
-  XCTAssertEqual(msg.oOneOfCase, Message2_O_OneOfCase_OneofGroup);
-
-  Message2 *subMessage = [Message2 message];
-  msg.oneofMessage = subMessage;
-  XCTAssertEqual(msg.oOneOfCase, Message2_O_OneOfCase_OneofMessage);
-  XCTAssertEqual(msg.oneofInt32, 100);
-  XCTAssertEqual(msg.oneofInt64, 101);
-  XCTAssertEqual(msg.oneofUint32, 102U);
-  XCTAssertEqual(msg.oneofUint64, 103U);
-  XCTAssertEqual(msg.oneofSint32, 104);
-  XCTAssertEqual(msg.oneofSint64, 105);
-  XCTAssertEqual(msg.oneofFixed32, 106U);
-  XCTAssertEqual(msg.oneofFixed64, 107U);
-  XCTAssertEqual(msg.oneofSfixed32, 108);
-  XCTAssertEqual(msg.oneofSfixed64, 109);
-  XCTAssertEqual(msg.oneofFloat, 110.0f);
-  XCTAssertEqual(msg.oneofDouble, 111.0);
-  XCTAssertEqual(msg.oneofBool, YES);
-  XCTAssertEqualObjects(msg.oneofString, oneofStringDefault);
-  XCTAssertEqualObjects(msg.oneofBytes, oneofBytesDefault);
-  XCTAssertNotNil(msg.oneofGroup);
-  XCTAssertNotEqual(msg.oneofGroup, group);      // Pointer compare.
-  XCTAssertEqual(msg.oneofMessage, subMessage);  // Pointer compare.
-  XCTAssertEqual(msg.oneofEnum, Message2_Enum_Baz);
-  XCTAssertEqual(msg.oOneOfCase, Message2_O_OneOfCase_OneofMessage);
-
-  msg.oneofEnum = Message2_Enum_Bar;
-  XCTAssertEqual(msg.oOneOfCase, Message2_O_OneOfCase_OneofEnum);
-  XCTAssertEqual(msg.oneofInt32, 100);
-  XCTAssertEqual(msg.oneofInt64, 101);
-  XCTAssertEqual(msg.oneofUint32, 102U);
-  XCTAssertEqual(msg.oneofUint64, 103U);
-  XCTAssertEqual(msg.oneofSint32, 104);
-  XCTAssertEqual(msg.oneofSint64, 105);
-  XCTAssertEqual(msg.oneofFixed32, 106U);
-  XCTAssertEqual(msg.oneofFixed64, 107U);
-  XCTAssertEqual(msg.oneofSfixed32, 108);
-  XCTAssertEqual(msg.oneofSfixed64, 109);
-  XCTAssertEqual(msg.oneofFloat, 110.0f);
-  XCTAssertEqual(msg.oneofDouble, 111.0);
-  XCTAssertEqual(msg.oneofBool, YES);
-  XCTAssertEqualObjects(msg.oneofString, oneofStringDefault);
-  XCTAssertEqualObjects(msg.oneofBytes, oneofBytesDefault);
-  XCTAssertNotNil(msg.oneofGroup);
-  XCTAssertNotEqual(msg.oneofGroup, group);  // Pointer compare.
-  XCTAssertNotNil(msg.oneofMessage);
-  XCTAssertNotEqual(msg.oneofMessage, subMessage);  // Pointer compare.
-  XCTAssertEqual(msg.oneofEnum, Message2_Enum_Bar);
-  XCTAssertEqual(msg.oOneOfCase, Message2_O_OneOfCase_OneofEnum);
-
-  // Test setting/calling clear clearing.
-
-  [msg release];
-  msg = [[Message2 alloc] init];
-
-  int32_t values[] = {
-    Message2_O_OneOfCase_OneofInt32,
-    Message2_O_OneOfCase_OneofInt64,
-    Message2_O_OneOfCase_OneofUint32,
-    Message2_O_OneOfCase_OneofUint64,
-    Message2_O_OneOfCase_OneofSint32,
-    Message2_O_OneOfCase_OneofSint64,
-    Message2_O_OneOfCase_OneofFixed32,
-    Message2_O_OneOfCase_OneofFixed64,
-    Message2_O_OneOfCase_OneofSfixed32,
-    Message2_O_OneOfCase_OneofSfixed64,
-    Message2_O_OneOfCase_OneofFloat,
-    Message2_O_OneOfCase_OneofDouble,
-    Message2_O_OneOfCase_OneofBool,
-    Message2_O_OneOfCase_OneofString,
-    Message2_O_OneOfCase_OneofBytes,
-    Message2_O_OneOfCase_OneofGroup,
-    Message2_O_OneOfCase_OneofMessage,
-    Message2_O_OneOfCase_OneofEnum,
-  };
-
-  for (size_t i = 0; i < GPBARRAYSIZE(values); ++i) {
-    switch (values[i]) {
-      case Message2_O_OneOfCase_OneofInt32:
-        msg.oneofInt32 = 1;
-        break;
-      case Message2_O_OneOfCase_OneofInt64:
-        msg.oneofInt64 = 2;
-        break;
-      case Message2_O_OneOfCase_OneofUint32:
-        msg.oneofUint32 = 3;
-        break;
-      case Message2_O_OneOfCase_OneofUint64:
-        msg.oneofUint64 = 4;
-        break;
-      case Message2_O_OneOfCase_OneofSint32:
-        msg.oneofSint32 = 5;
-        break;
-      case Message2_O_OneOfCase_OneofSint64:
-        msg.oneofSint64 = 6;
-        break;
-      case Message2_O_OneOfCase_OneofFixed32:
-        msg.oneofFixed32 = 7;
-        break;
-      case Message2_O_OneOfCase_OneofFixed64:
-        msg.oneofFixed64 = 8;
-        break;
-      case Message2_O_OneOfCase_OneofSfixed32:
-        msg.oneofSfixed32 = 9;
-        break;
-      case Message2_O_OneOfCase_OneofSfixed64:
-        msg.oneofSfixed64 = 10;
-        break;
-      case Message2_O_OneOfCase_OneofFloat:
-        msg.oneofFloat = 11.0f;
-        break;
-      case Message2_O_OneOfCase_OneofDouble:
-        msg.oneofDouble = 12.0;
-        break;
-      case Message2_O_OneOfCase_OneofBool:
-        msg.oneofBool = YES;
-        break;
-      case Message2_O_OneOfCase_OneofString:
-        msg.oneofString = @"foo";
-        break;
-      case Message2_O_OneOfCase_OneofBytes:
-        msg.oneofBytes = [@"bar" dataUsingEncoding:NSUTF8StringEncoding];
-        break;
-      case Message2_O_OneOfCase_OneofGroup:
-        msg.oneofGroup = group;
-        break;
-      case Message2_O_OneOfCase_OneofMessage:
-        msg.oneofMessage = subMessage;
-        break;
-      case Message2_O_OneOfCase_OneofEnum:
-        msg.oneofEnum = Message2_Enum_Bar;
-        break;
-      default:
-        XCTFail(@"shouldn't happen, loop: %zd, value: %d", i, values[i]);
-        break;
-    }
-
-    XCTAssertEqual(msg.oOneOfCase, values[i], "Loop: %zd", i);
-    // No need to check the value was set, the above tests did that.
-    Message2_ClearOOneOfCase(msg);
-    // Nothing in the case.
-    XCTAssertEqual(msg.oOneOfCase, Message2_O_OneOfCase_GPBUnsetOneOfCase,
-                   "Loop: %zd", i);
-    // Confirm everything is back to defaults after a clear.
-    XCTAssertEqual(msg.oneofInt32, 100, "Loop: %zd", i);
-    XCTAssertEqual(msg.oneofInt64, 101, "Loop: %zd", i);
-    XCTAssertEqual(msg.oneofUint32, 102U, "Loop: %zd", i);
-    XCTAssertEqual(msg.oneofUint64, 103U, "Loop: %zd", i);
-    XCTAssertEqual(msg.oneofSint32, 104, "Loop: %zd", i);
-    XCTAssertEqual(msg.oneofSint64, 105, "Loop: %zd", i);
-    XCTAssertEqual(msg.oneofFixed32, 106U, "Loop: %zd", i);
-    XCTAssertEqual(msg.oneofFixed64, 107U, "Loop: %zd", i);
-    XCTAssertEqual(msg.oneofSfixed32, 108, "Loop: %zd", i);
-    XCTAssertEqual(msg.oneofSfixed64, 109, "Loop: %zd", i);
-    XCTAssertEqual(msg.oneofFloat, 110.0f, "Loop: %zd", i);
-    XCTAssertEqual(msg.oneofDouble, 111.0, "Loop: %zd", i);
-    XCTAssertEqual(msg.oneofBool, YES, "Loop: %zd", i);
-    XCTAssertEqualObjects(msg.oneofString, oneofStringDefault, "Loop: %zd", i);
-    XCTAssertEqualObjects(msg.oneofBytes, oneofBytesDefault, "Loop: %zd", i);
-    XCTAssertNotNil(msg.oneofGroup, "Loop: %zd", i);
-    XCTAssertNotEqual(msg.oneofGroup, group, "Loop: %zd",
-                      i);  // Pointer compare.
-    XCTAssertNotNil(msg.oneofMessage, "Loop: %zd", i);
-    XCTAssertNotEqual(msg.oneofMessage, subMessage, "Loop: %zd",
-                      i);  // Pointer compare.
-    XCTAssertEqual(msg.oneofEnum, Message2_Enum_Baz, "Loop: %zd", i);
-  }
-
-  [msg release];
-}
-
-- (void)testProto3OneofBasicBehaviors {
-  Message3 *msg = [[Message3 alloc] init];
-
-  NSString *oneofStringDefault = @"";
-  NSData *oneofBytesDefault = [NSData data];
-
-  // Nothing set.
-  XCTAssertEqual(msg.oOneOfCase, Message3_O_OneOfCase_GPBUnsetOneOfCase);
-  XCTAssertEqual(msg.oneofInt32, 0);
-  XCTAssertEqual(msg.oneofInt64, 0);
-  XCTAssertEqual(msg.oneofUint32, 0U);
-  XCTAssertEqual(msg.oneofUint64, 0U);
-  XCTAssertEqual(msg.oneofSint32, 0);
-  XCTAssertEqual(msg.oneofSint64, 0);
-  XCTAssertEqual(msg.oneofFixed32, 0U);
-  XCTAssertEqual(msg.oneofFixed64, 0U);
-  XCTAssertEqual(msg.oneofSfixed32, 0);
-  XCTAssertEqual(msg.oneofSfixed64, 0);
-  XCTAssertEqual(msg.oneofFloat, 0.0f);
-  XCTAssertEqual(msg.oneofDouble, 0.0);
-  XCTAssertEqual(msg.oneofBool, NO);
-  XCTAssertEqualObjects(msg.oneofString, oneofStringDefault);
-  XCTAssertEqualObjects(msg.oneofBytes, oneofBytesDefault);
-  XCTAssertNotNil(msg.oneofMessage);
-  XCTAssertEqual(msg.oneofEnum, Message3_Enum_Foo);
-
-  // Set, check the case, check everyone has default but the one, confirm case
-  // didn't change.
-
-  msg.oneofInt32 = 1;
-  XCTAssertEqual(msg.oOneOfCase, Message3_O_OneOfCase_OneofInt32);
-  XCTAssertEqual(msg.oneofInt32, 1);
-  XCTAssertEqual(msg.oneofInt64, 0);
-  XCTAssertEqual(msg.oneofUint32, 0U);
-  XCTAssertEqual(msg.oneofUint64, 0U);
-  XCTAssertEqual(msg.oneofSint32, 0);
-  XCTAssertEqual(msg.oneofSint64, 0);
-  XCTAssertEqual(msg.oneofFixed32, 0U);
-  XCTAssertEqual(msg.oneofFixed64, 0U);
-  XCTAssertEqual(msg.oneofSfixed32, 0);
-  XCTAssertEqual(msg.oneofSfixed64, 0);
-  XCTAssertEqual(msg.oneofFloat, 0.0f);
-  XCTAssertEqual(msg.oneofDouble, 0.0);
-  XCTAssertEqual(msg.oneofBool, NO);
-  XCTAssertEqualObjects(msg.oneofString, oneofStringDefault);
-  XCTAssertEqualObjects(msg.oneofBytes, oneofBytesDefault);
-  XCTAssertNotNil(msg.oneofMessage);
-  XCTAssertEqual(msg.oneofEnum, Message3_Enum_Foo);
-  XCTAssertEqual(msg.oOneOfCase, Message3_O_OneOfCase_OneofInt32);
-
-  msg.oneofInt64 = 2;
-  XCTAssertEqual(msg.oOneOfCase, Message3_O_OneOfCase_OneofInt64);
-  XCTAssertEqual(msg.oneofInt32, 0);
-  XCTAssertEqual(msg.oneofInt64, 2);
-  XCTAssertEqual(msg.oneofUint32, 0U);
-  XCTAssertEqual(msg.oneofUint64, 0U);
-  XCTAssertEqual(msg.oneofSint32, 0);
-  XCTAssertEqual(msg.oneofSint64, 0);
-  XCTAssertEqual(msg.oneofFixed32, 0U);
-  XCTAssertEqual(msg.oneofFixed64, 0U);
-  XCTAssertEqual(msg.oneofSfixed32, 0);
-  XCTAssertEqual(msg.oneofSfixed64, 0);
-  XCTAssertEqual(msg.oneofFloat, 0.0f);
-  XCTAssertEqual(msg.oneofDouble, 0.0);
-  XCTAssertEqual(msg.oneofBool, NO);
-  XCTAssertEqualObjects(msg.oneofString, oneofStringDefault);
-  XCTAssertEqualObjects(msg.oneofBytes, oneofBytesDefault);
-  XCTAssertNotNil(msg.oneofMessage);
-  XCTAssertEqual(msg.oneofEnum, Message3_Enum_Foo);
-  XCTAssertEqual(msg.oOneOfCase, Message3_O_OneOfCase_OneofInt64);
-
-  msg.oneofUint32 = 3;
-  XCTAssertEqual(msg.oOneOfCase, Message3_O_OneOfCase_OneofUint32);
-  XCTAssertEqual(msg.oneofInt32, 0);
-  XCTAssertEqual(msg.oneofInt64, 0);
-  XCTAssertEqual(msg.oneofUint32, 3U);
-  XCTAssertEqual(msg.oneofUint64, 0U);
-  XCTAssertEqual(msg.oneofSint32, 0);
-  XCTAssertEqual(msg.oneofSint64, 0);
-  XCTAssertEqual(msg.oneofFixed32, 0U);
-  XCTAssertEqual(msg.oneofFixed64, 0U);
-  XCTAssertEqual(msg.oneofSfixed32, 0);
-  XCTAssertEqual(msg.oneofSfixed64, 0);
-  XCTAssertEqual(msg.oneofFloat, 0.0f);
-  XCTAssertEqual(msg.oneofDouble, 0.0);
-  XCTAssertEqual(msg.oneofBool, NO);
-  XCTAssertEqualObjects(msg.oneofString, oneofStringDefault);
-  XCTAssertEqualObjects(msg.oneofBytes, oneofBytesDefault);
-  XCTAssertNotNil(msg.oneofMessage);
-  XCTAssertEqual(msg.oneofEnum, Message3_Enum_Foo);
-  XCTAssertEqual(msg.oOneOfCase, Message3_O_OneOfCase_OneofUint32);
-
-  msg.oneofUint64 = 4;
-  XCTAssertEqual(msg.oOneOfCase, Message3_O_OneOfCase_OneofUint64);
-  XCTAssertEqual(msg.oneofInt32, 0);
-  XCTAssertEqual(msg.oneofInt64, 0);
-  XCTAssertEqual(msg.oneofUint32, 0U);
-  XCTAssertEqual(msg.oneofUint64, 4U);
-  XCTAssertEqual(msg.oneofSint32, 0);
-  XCTAssertEqual(msg.oneofSint64, 0);
-  XCTAssertEqual(msg.oneofFixed32, 0U);
-  XCTAssertEqual(msg.oneofFixed64, 0U);
-  XCTAssertEqual(msg.oneofSfixed32, 0);
-  XCTAssertEqual(msg.oneofSfixed64, 0);
-  XCTAssertEqual(msg.oneofFloat, 0.0f);
-  XCTAssertEqual(msg.oneofDouble, 0.0);
-  XCTAssertEqual(msg.oneofBool, NO);
-  XCTAssertEqualObjects(msg.oneofString, oneofStringDefault);
-  XCTAssertEqualObjects(msg.oneofBytes, oneofBytesDefault);
-  XCTAssertNotNil(msg.oneofMessage);
-  XCTAssertEqual(msg.oneofEnum, Message3_Enum_Foo);
-  XCTAssertEqual(msg.oOneOfCase, Message3_O_OneOfCase_OneofUint64);
-
-  msg.oneofSint32 = 5;
-  XCTAssertEqual(msg.oOneOfCase, Message3_O_OneOfCase_OneofSint32);
-  XCTAssertEqual(msg.oneofInt32, 0);
-  XCTAssertEqual(msg.oneofInt64, 0);
-  XCTAssertEqual(msg.oneofUint32, 0U);
-  XCTAssertEqual(msg.oneofUint64, 0U);
-  XCTAssertEqual(msg.oneofSint32, 5);
-  XCTAssertEqual(msg.oneofSint64, 0);
-  XCTAssertEqual(msg.oneofFixed32, 0U);
-  XCTAssertEqual(msg.oneofFixed64, 0U);
-  XCTAssertEqual(msg.oneofSfixed32, 0);
-  XCTAssertEqual(msg.oneofSfixed64, 0);
-  XCTAssertEqual(msg.oneofFloat, 0.0f);
-  XCTAssertEqual(msg.oneofDouble, 0.0);
-  XCTAssertEqual(msg.oneofBool, NO);
-  XCTAssertEqualObjects(msg.oneofString, oneofStringDefault);
-  XCTAssertEqualObjects(msg.oneofBytes, oneofBytesDefault);
-  XCTAssertNotNil(msg.oneofMessage);
-  XCTAssertEqual(msg.oneofEnum, Message3_Enum_Foo);
-  XCTAssertEqual(msg.oOneOfCase, Message3_O_OneOfCase_OneofSint32);
-
-  msg.oneofSint64 = 6;
-  XCTAssertEqual(msg.oOneOfCase, Message3_O_OneOfCase_OneofSint64);
-  XCTAssertEqual(msg.oneofInt32, 0);
-  XCTAssertEqual(msg.oneofInt64, 0);
-  XCTAssertEqual(msg.oneofUint32, 0U);
-  XCTAssertEqual(msg.oneofUint64, 0U);
-  XCTAssertEqual(msg.oneofSint32, 0);
-  XCTAssertEqual(msg.oneofSint64, 6);
-  XCTAssertEqual(msg.oneofFixed32, 0U);
-  XCTAssertEqual(msg.oneofFixed64, 0U);
-  XCTAssertEqual(msg.oneofSfixed32, 0);
-  XCTAssertEqual(msg.oneofSfixed64, 0);
-  XCTAssertEqual(msg.oneofFloat, 0.0f);
-  XCTAssertEqual(msg.oneofDouble, 0.0);
-  XCTAssertEqual(msg.oneofBool, NO);
-  XCTAssertEqualObjects(msg.oneofString, oneofStringDefault);
-  XCTAssertEqualObjects(msg.oneofBytes, oneofBytesDefault);
-  XCTAssertNotNil(msg.oneofMessage);
-  XCTAssertEqual(msg.oneofEnum, Message3_Enum_Foo);
-  XCTAssertEqual(msg.oOneOfCase, Message3_O_OneOfCase_OneofSint64);
-
-  msg.oneofFixed32 = 7;
-  XCTAssertEqual(msg.oOneOfCase, Message3_O_OneOfCase_OneofFixed32);
-  XCTAssertEqual(msg.oneofInt32, 0);
-  XCTAssertEqual(msg.oneofInt64, 0);
-  XCTAssertEqual(msg.oneofUint32, 0U);
-  XCTAssertEqual(msg.oneofUint64, 0U);
-  XCTAssertEqual(msg.oneofSint32, 0);
-  XCTAssertEqual(msg.oneofSint64, 0);
-  XCTAssertEqual(msg.oneofFixed32, 7U);
-  XCTAssertEqual(msg.oneofFixed64, 0U);
-  XCTAssertEqual(msg.oneofSfixed32, 0);
-  XCTAssertEqual(msg.oneofSfixed64, 0);
-  XCTAssertEqual(msg.oneofFloat, 0.0f);
-  XCTAssertEqual(msg.oneofDouble, 0.0);
-  XCTAssertEqual(msg.oneofBool, NO);
-  XCTAssertEqualObjects(msg.oneofString, oneofStringDefault);
-  XCTAssertEqualObjects(msg.oneofBytes, oneofBytesDefault);
-  XCTAssertNotNil(msg.oneofMessage);
-  XCTAssertEqual(msg.oneofEnum, Message3_Enum_Foo);
-  XCTAssertEqual(msg.oOneOfCase, Message3_O_OneOfCase_OneofFixed32);
-
-  msg.oneofFixed64 = 8;
-  XCTAssertEqual(msg.oOneOfCase, Message3_O_OneOfCase_OneofFixed64);
-  XCTAssertEqual(msg.oneofInt32, 0);
-  XCTAssertEqual(msg.oneofInt64, 0);
-  XCTAssertEqual(msg.oneofUint32, 0U);
-  XCTAssertEqual(msg.oneofUint64, 0U);
-  XCTAssertEqual(msg.oneofSint32, 0);
-  XCTAssertEqual(msg.oneofSint64, 0);
-  XCTAssertEqual(msg.oneofFixed32, 0U);
-  XCTAssertEqual(msg.oneofFixed64, 8U);
-  XCTAssertEqual(msg.oneofSfixed32, 0);
-  XCTAssertEqual(msg.oneofSfixed64, 0);
-  XCTAssertEqual(msg.oneofFloat, 0.0f);
-  XCTAssertEqual(msg.oneofDouble, 0.0);
-  XCTAssertEqual(msg.oneofBool, NO);
-  XCTAssertEqualObjects(msg.oneofString, oneofStringDefault);
-  XCTAssertEqualObjects(msg.oneofBytes, oneofBytesDefault);
-  XCTAssertNotNil(msg.oneofMessage);
-  XCTAssertEqual(msg.oneofEnum, Message3_Enum_Foo);
-  XCTAssertEqual(msg.oOneOfCase, Message3_O_OneOfCase_OneofFixed64);
-
-  msg.oneofSfixed32 = 9;
-  XCTAssertEqual(msg.oOneOfCase, Message3_O_OneOfCase_OneofSfixed32);
-  XCTAssertEqual(msg.oneofInt32, 0);
-  XCTAssertEqual(msg.oneofInt64, 0);
-  XCTAssertEqual(msg.oneofUint32, 0U);
-  XCTAssertEqual(msg.oneofUint64, 0U);
-  XCTAssertEqual(msg.oneofSint32, 0);
-  XCTAssertEqual(msg.oneofSint64, 0);
-  XCTAssertEqual(msg.oneofFixed32, 0U);
-  XCTAssertEqual(msg.oneofFixed64, 0U);
-  XCTAssertEqual(msg.oneofSfixed32, 9);
-  XCTAssertEqual(msg.oneofSfixed64, 0);
-  XCTAssertEqual(msg.oneofFloat, 0.0f);
-  XCTAssertEqual(msg.oneofDouble, 0.0);
-  XCTAssertEqual(msg.oneofBool, NO);
-  XCTAssertEqualObjects(msg.oneofString, oneofStringDefault);
-  XCTAssertEqualObjects(msg.oneofBytes, oneofBytesDefault);
-  XCTAssertNotNil(msg.oneofMessage);
-  XCTAssertEqual(msg.oneofEnum, Message3_Enum_Foo);
-  XCTAssertEqual(msg.oOneOfCase, Message3_O_OneOfCase_OneofSfixed32);
-
-  msg.oneofSfixed64 = 10;
-  XCTAssertEqual(msg.oOneOfCase, Message3_O_OneOfCase_OneofSfixed64);
-  XCTAssertEqual(msg.oneofInt32, 0);
-  XCTAssertEqual(msg.oneofInt64, 0);
-  XCTAssertEqual(msg.oneofUint32, 0U);
-  XCTAssertEqual(msg.oneofUint64, 0U);
-  XCTAssertEqual(msg.oneofSint32, 0);
-  XCTAssertEqual(msg.oneofSint64, 0);
-  XCTAssertEqual(msg.oneofFixed32, 0U);
-  XCTAssertEqual(msg.oneofFixed64, 0U);
-  XCTAssertEqual(msg.oneofSfixed32, 0);
-  XCTAssertEqual(msg.oneofSfixed64, 10);
-  XCTAssertEqual(msg.oneofFloat, 0.0f);
-  XCTAssertEqual(msg.oneofDouble, 0.0);
-  XCTAssertEqual(msg.oneofBool, NO);
-  XCTAssertEqualObjects(msg.oneofString, oneofStringDefault);
-  XCTAssertEqualObjects(msg.oneofBytes, oneofBytesDefault);
-  XCTAssertNotNil(msg.oneofMessage);
-  XCTAssertEqual(msg.oneofEnum, Message3_Enum_Foo);
-  XCTAssertEqual(msg.oOneOfCase, Message3_O_OneOfCase_OneofSfixed64);
-
-  msg.oneofFloat = 11.0f;
-  XCTAssertEqual(msg.oOneOfCase, Message3_O_OneOfCase_OneofFloat);
-  XCTAssertEqual(msg.oneofInt32, 0);
-  XCTAssertEqual(msg.oneofInt64, 0);
-  XCTAssertEqual(msg.oneofUint32, 0U);
-  XCTAssertEqual(msg.oneofUint64, 0U);
-  XCTAssertEqual(msg.oneofSint32, 0);
-  XCTAssertEqual(msg.oneofSint64, 0);
-  XCTAssertEqual(msg.oneofFixed32, 0U);
-  XCTAssertEqual(msg.oneofFixed64, 0U);
-  XCTAssertEqual(msg.oneofSfixed32, 0);
-  XCTAssertEqual(msg.oneofSfixed64, 0);
-  XCTAssertEqual(msg.oneofFloat, 11.0f);
-  XCTAssertEqual(msg.oneofDouble, 0.0);
-  XCTAssertEqual(msg.oneofBool, NO);
-  XCTAssertEqualObjects(msg.oneofString, oneofStringDefault);
-  XCTAssertEqualObjects(msg.oneofBytes, oneofBytesDefault);
-  XCTAssertNotNil(msg.oneofMessage);
-  XCTAssertEqual(msg.oneofEnum, Message3_Enum_Foo);
-  XCTAssertEqual(msg.oOneOfCase, Message3_O_OneOfCase_OneofFloat);
-
-  msg.oneofDouble = 12.0;
-  XCTAssertEqual(msg.oOneOfCase, Message3_O_OneOfCase_OneofDouble);
-  XCTAssertEqual(msg.oneofInt32, 0);
-  XCTAssertEqual(msg.oneofInt64, 0);
-  XCTAssertEqual(msg.oneofUint32, 0U);
-  XCTAssertEqual(msg.oneofUint64, 0U);
-  XCTAssertEqual(msg.oneofSint32, 0);
-  XCTAssertEqual(msg.oneofSint64, 0);
-  XCTAssertEqual(msg.oneofFixed32, 0U);
-  XCTAssertEqual(msg.oneofFixed64, 0U);
-  XCTAssertEqual(msg.oneofSfixed32, 0);
-  XCTAssertEqual(msg.oneofSfixed64, 0);
-  XCTAssertEqual(msg.oneofFloat, 0.0f);
-  XCTAssertEqual(msg.oneofDouble, 12.0);
-  XCTAssertEqual(msg.oneofBool, NO);
-  XCTAssertEqualObjects(msg.oneofString, oneofStringDefault);
-  XCTAssertEqualObjects(msg.oneofBytes, oneofBytesDefault);
-  XCTAssertNotNil(msg.oneofMessage);
-  XCTAssertEqual(msg.oneofEnum, Message3_Enum_Foo);
-  XCTAssertEqual(msg.oOneOfCase, Message3_O_OneOfCase_OneofDouble);
-
-  msg.oneofBool = YES;
-  XCTAssertEqual(msg.oOneOfCase, Message3_O_OneOfCase_OneofBool);
-  XCTAssertEqual(msg.oneofInt32, 0);
-  XCTAssertEqual(msg.oneofInt64, 0);
-  XCTAssertEqual(msg.oneofUint32, 0U);
-  XCTAssertEqual(msg.oneofUint64, 0U);
-  XCTAssertEqual(msg.oneofSint32, 0);
-  XCTAssertEqual(msg.oneofSint64, 0);
-  XCTAssertEqual(msg.oneofFixed32, 0U);
-  XCTAssertEqual(msg.oneofFixed64, 0U);
-  XCTAssertEqual(msg.oneofSfixed32, 0);
-  XCTAssertEqual(msg.oneofSfixed64, 0);
-  XCTAssertEqual(msg.oneofFloat, 0.0f);
-  XCTAssertEqual(msg.oneofDouble, 0.0);
-  XCTAssertEqual(msg.oneofBool, YES);
-  XCTAssertEqualObjects(msg.oneofString, oneofStringDefault);
-  XCTAssertEqualObjects(msg.oneofBytes, oneofBytesDefault);
-  XCTAssertNotNil(msg.oneofMessage);
-  XCTAssertEqual(msg.oneofEnum, Message3_Enum_Foo);
-  XCTAssertEqual(msg.oOneOfCase, Message3_O_OneOfCase_OneofBool);
-
-  msg.oneofString = @"foo";
-  XCTAssertEqual(msg.oOneOfCase, Message3_O_OneOfCase_OneofString);
-  XCTAssertEqual(msg.oneofInt32, 0);
-  XCTAssertEqual(msg.oneofInt64, 0);
-  XCTAssertEqual(msg.oneofUint32, 0U);
-  XCTAssertEqual(msg.oneofUint64, 0U);
-  XCTAssertEqual(msg.oneofSint32, 0);
-  XCTAssertEqual(msg.oneofSint64, 0);
-  XCTAssertEqual(msg.oneofFixed32, 0U);
-  XCTAssertEqual(msg.oneofFixed64, 0U);
-  XCTAssertEqual(msg.oneofSfixed32, 0);
-  XCTAssertEqual(msg.oneofSfixed64, 0);
-  XCTAssertEqual(msg.oneofFloat, 0.0f);
-  XCTAssertEqual(msg.oneofDouble, 0.0);
-  XCTAssertEqual(msg.oneofBool, NO);
-  XCTAssertEqualObjects(msg.oneofString, @"foo");
-  XCTAssertEqualObjects(msg.oneofBytes, oneofBytesDefault);
-  XCTAssertNotNil(msg.oneofMessage);
-  XCTAssertEqual(msg.oneofEnum, Message3_Enum_Foo);
-  XCTAssertEqual(msg.oOneOfCase, Message3_O_OneOfCase_OneofString);
-
-  msg.oneofBytes = [@"bar" dataUsingEncoding:NSUTF8StringEncoding];
-  XCTAssertEqual(msg.oOneOfCase, Message3_O_OneOfCase_OneofBytes);
-  XCTAssertEqual(msg.oneofInt32, 0);
-  XCTAssertEqual(msg.oneofInt64, 0);
-  XCTAssertEqual(msg.oneofUint32, 0U);
-  XCTAssertEqual(msg.oneofUint64, 0U);
-  XCTAssertEqual(msg.oneofSint32, 0);
-  XCTAssertEqual(msg.oneofSint64, 0);
-  XCTAssertEqual(msg.oneofFixed32, 0U);
-  XCTAssertEqual(msg.oneofFixed64, 0U);
-  XCTAssertEqual(msg.oneofSfixed32, 0);
-  XCTAssertEqual(msg.oneofSfixed64, 0);
-  XCTAssertEqual(msg.oneofFloat, 0.0f);
-  XCTAssertEqual(msg.oneofDouble, 0.0);
-  XCTAssertEqual(msg.oneofBool, NO);
-  XCTAssertEqualObjects(msg.oneofString, oneofStringDefault);
-  XCTAssertEqualObjects(msg.oneofBytes,
-                        [@"bar" dataUsingEncoding:NSUTF8StringEncoding]);
-  XCTAssertNotNil(msg.oneofMessage);
-  XCTAssertEqual(msg.oneofEnum, Message3_Enum_Foo);
-  XCTAssertEqual(msg.oOneOfCase, Message3_O_OneOfCase_OneofBytes);
-
-  Message3 *subMessage = [Message3 message];
-  msg.oneofMessage = subMessage;
-  XCTAssertEqual(msg.oOneOfCase, Message3_O_OneOfCase_OneofMessage);
-  XCTAssertEqual(msg.oneofInt32, 0);
-  XCTAssertEqual(msg.oneofInt64, 0);
-  XCTAssertEqual(msg.oneofUint32, 0U);
-  XCTAssertEqual(msg.oneofUint64, 0U);
-  XCTAssertEqual(msg.oneofSint32, 0);
-  XCTAssertEqual(msg.oneofSint64, 0);
-  XCTAssertEqual(msg.oneofFixed32, 0U);
-  XCTAssertEqual(msg.oneofFixed64, 0U);
-  XCTAssertEqual(msg.oneofSfixed32, 0);
-  XCTAssertEqual(msg.oneofSfixed64, 0);
-  XCTAssertEqual(msg.oneofFloat, 0.0f);
-  XCTAssertEqual(msg.oneofDouble, 0.0);
-  XCTAssertEqual(msg.oneofBool, NO);
-  XCTAssertEqualObjects(msg.oneofString, oneofStringDefault);
-  XCTAssertEqualObjects(msg.oneofBytes, oneofBytesDefault);
-  XCTAssertEqual(msg.oneofMessage, subMessage);  // Pointer compare.
-  XCTAssertEqual(msg.oneofEnum, Message3_Enum_Foo);
-  XCTAssertEqual(msg.oOneOfCase, Message3_O_OneOfCase_OneofMessage);
-
-  msg.oneofEnum = Message3_Enum_Bar;
-  XCTAssertEqual(msg.oOneOfCase, Message3_O_OneOfCase_OneofEnum);
-  XCTAssertEqual(msg.oneofInt32, 0);
-  XCTAssertEqual(msg.oneofInt64, 0);
-  XCTAssertEqual(msg.oneofUint32, 0U);
-  XCTAssertEqual(msg.oneofUint64, 0U);
-  XCTAssertEqual(msg.oneofSint32, 0);
-  XCTAssertEqual(msg.oneofSint64, 0);
-  XCTAssertEqual(msg.oneofFixed32, 0U);
-  XCTAssertEqual(msg.oneofFixed64, 0U);
-  XCTAssertEqual(msg.oneofSfixed32, 0);
-  XCTAssertEqual(msg.oneofSfixed64, 0);
-  XCTAssertEqual(msg.oneofFloat, 0.0f);
-  XCTAssertEqual(msg.oneofDouble, 0.0);
-  XCTAssertEqual(msg.oneofBool, NO);
-  XCTAssertEqualObjects(msg.oneofString, oneofStringDefault);
-  XCTAssertEqualObjects(msg.oneofBytes, oneofBytesDefault);
-  XCTAssertNotNil(msg.oneofMessage);
-  XCTAssertNotEqual(msg.oneofMessage, subMessage);  // Pointer compare.
-  XCTAssertEqual(msg.oneofEnum, Message3_Enum_Bar);
-  XCTAssertEqual(msg.oOneOfCase, Message3_O_OneOfCase_OneofEnum);
-
-  // Test setting/calling clear clearing.
-
-  [msg release];
-  msg = [[Message3 alloc] init];
-
-  int32_t values[] = {
-    Message3_O_OneOfCase_OneofInt32,
-    Message3_O_OneOfCase_OneofInt64,
-    Message3_O_OneOfCase_OneofUint32,
-    Message3_O_OneOfCase_OneofUint64,
-    Message3_O_OneOfCase_OneofSint32,
-    Message3_O_OneOfCase_OneofSint64,
-    Message3_O_OneOfCase_OneofFixed32,
-    Message3_O_OneOfCase_OneofFixed64,
-    Message3_O_OneOfCase_OneofSfixed32,
-    Message3_O_OneOfCase_OneofSfixed64,
-    Message3_O_OneOfCase_OneofFloat,
-    Message3_O_OneOfCase_OneofDouble,
-    Message3_O_OneOfCase_OneofBool,
-    Message3_O_OneOfCase_OneofString,
-    Message3_O_OneOfCase_OneofBytes,
-    Message3_O_OneOfCase_OneofMessage,
-    Message3_O_OneOfCase_OneofEnum,
-  };
-
-  for (size_t i = 0; i < GPBARRAYSIZE(values); ++i) {
-    switch (values[i]) {
-      case Message3_O_OneOfCase_OneofInt32:
-        msg.oneofInt32 = 1;
-        break;
-      case Message3_O_OneOfCase_OneofInt64:
-        msg.oneofInt64 = 2;
-        break;
-      case Message3_O_OneOfCase_OneofUint32:
-        msg.oneofUint32 = 3;
-        break;
-      case Message3_O_OneOfCase_OneofUint64:
-        msg.oneofUint64 = 4;
-        break;
-      case Message3_O_OneOfCase_OneofSint32:
-        msg.oneofSint32 = 5;
-        break;
-      case Message3_O_OneOfCase_OneofSint64:
-        msg.oneofSint64 = 6;
-        break;
-      case Message3_O_OneOfCase_OneofFixed32:
-        msg.oneofFixed32 = 7;
-        break;
-      case Message3_O_OneOfCase_OneofFixed64:
-        msg.oneofFixed64 = 8;
-        break;
-      case Message3_O_OneOfCase_OneofSfixed32:
-        msg.oneofSfixed32 = 9;
-        break;
-      case Message3_O_OneOfCase_OneofSfixed64:
-        msg.oneofSfixed64 = 10;
-        break;
-      case Message3_O_OneOfCase_OneofFloat:
-        msg.oneofFloat = 11.0f;
-        break;
-      case Message3_O_OneOfCase_OneofDouble:
-        msg.oneofDouble = 12.0;
-        break;
-      case Message3_O_OneOfCase_OneofBool:
-        msg.oneofBool = YES;
-        break;
-      case Message3_O_OneOfCase_OneofString:
-        msg.oneofString = @"foo";
-        break;
-      case Message3_O_OneOfCase_OneofBytes:
-        msg.oneofBytes = [@"bar" dataUsingEncoding:NSUTF8StringEncoding];
-        break;
-      case Message3_O_OneOfCase_OneofMessage:
-        msg.oneofMessage = subMessage;
-        break;
-      case Message3_O_OneOfCase_OneofEnum:
-        msg.oneofEnum = Message3_Enum_Baz;
-        break;
-      default:
-        XCTFail(@"shouldn't happen, loop: %zd, value: %d", i, values[i]);
-        break;
-    }
-
-    XCTAssertEqual(msg.oOneOfCase, values[i], "Loop: %zd", i);
-    // No need to check the value was set, the above tests did that.
-    Message3_ClearOOneOfCase(msg);
-    // Nothing in the case.
-    XCTAssertEqual(msg.oOneOfCase, Message3_O_OneOfCase_GPBUnsetOneOfCase,
-                   "Loop: %zd", i);
-    // Confirm everything is back to defaults after a clear.
-    XCTAssertEqual(msg.oneofInt32, 0, "Loop: %zd", i);
-    XCTAssertEqual(msg.oneofInt64, 0, "Loop: %zd", i);
-    XCTAssertEqual(msg.oneofUint32, 0U, "Loop: %zd", i);
-    XCTAssertEqual(msg.oneofUint64, 0U, "Loop: %zd", i);
-    XCTAssertEqual(msg.oneofSint32, 0, "Loop: %zd", i);
-    XCTAssertEqual(msg.oneofSint64, 0, "Loop: %zd", i);
-    XCTAssertEqual(msg.oneofFixed32, 0U, "Loop: %zd", i);
-    XCTAssertEqual(msg.oneofFixed64, 0U, "Loop: %zd", i);
-    XCTAssertEqual(msg.oneofSfixed32, 0, "Loop: %zd", i);
-    XCTAssertEqual(msg.oneofSfixed64, 0, "Loop: %zd", i);
-    XCTAssertEqual(msg.oneofFloat, 0.0f, "Loop: %zd", i);
-    XCTAssertEqual(msg.oneofDouble, 0.0, "Loop: %zd", i);
-    XCTAssertEqual(msg.oneofBool, NO, "Loop: %zd", i);
-    XCTAssertEqualObjects(msg.oneofString, oneofStringDefault, "Loop: %zd", i);
-    XCTAssertEqualObjects(msg.oneofBytes, oneofBytesDefault, "Loop: %zd", i);
-    XCTAssertNotNil(msg.oneofMessage, "Loop: %zd", i);
-    XCTAssertNotEqual(msg.oneofMessage, subMessage, "Loop: %zd",
-                      i);  // Pointer compare.
-    XCTAssertEqual(msg.oneofEnum, Message3_Enum_Foo, "Loop: %zd", i);
-  }
-
-  [msg release];
-}
-
-- (void)testProto2OneofSetToDefault {
-
-  // proto3 doesn't normally write out zero (default) fields, but if they are
-  // in a oneof it does.  proto2 doesn't have this special behavior, but we
-  // still confirm setting to the explicit default does set the case to be
-  // sure the runtime is working correctly.
-
-  NSString *oneofStringDefault = @"string";
-  NSData *oneofBytesDefault = [@"data" dataUsingEncoding:NSUTF8StringEncoding];
-
-  Message2 *msg = [[Message2 alloc] init];
-
-  int32_t values[] = {
-    Message2_O_OneOfCase_OneofInt32,
-    Message2_O_OneOfCase_OneofInt64,
-    Message2_O_OneOfCase_OneofUint32,
-    Message2_O_OneOfCase_OneofUint64,
-    Message2_O_OneOfCase_OneofSint32,
-    Message2_O_OneOfCase_OneofSint64,
-    Message2_O_OneOfCase_OneofFixed32,
-    Message2_O_OneOfCase_OneofFixed64,
-    Message2_O_OneOfCase_OneofSfixed32,
-    Message2_O_OneOfCase_OneofSfixed64,
-    Message2_O_OneOfCase_OneofFloat,
-    Message2_O_OneOfCase_OneofDouble,
-    Message2_O_OneOfCase_OneofBool,
-    Message2_O_OneOfCase_OneofString,
-    Message2_O_OneOfCase_OneofBytes,
-    // Skip group
-    // Skip message
-    Message2_O_OneOfCase_OneofEnum,
-  };
-
-  for (size_t i = 0; i < GPBARRAYSIZE(values); ++i) {
-    switch (values[i]) {
-      case Message2_O_OneOfCase_OneofInt32:
-        msg.oneofInt32 = 100;
-        break;
-      case Message2_O_OneOfCase_OneofInt64:
-        msg.oneofInt64 = 101;
-        break;
-      case Message2_O_OneOfCase_OneofUint32:
-        msg.oneofUint32 = 102;
-        break;
-      case Message2_O_OneOfCase_OneofUint64:
-        msg.oneofUint64 = 103;
-        break;
-      case Message2_O_OneOfCase_OneofSint32:
-        msg.oneofSint32 = 104;
-        break;
-      case Message2_O_OneOfCase_OneofSint64:
-        msg.oneofSint64 = 105;
-        break;
-      case Message2_O_OneOfCase_OneofFixed32:
-        msg.oneofFixed32 = 106;
-        break;
-      case Message2_O_OneOfCase_OneofFixed64:
-        msg.oneofFixed64 = 107;
-        break;
-      case Message2_O_OneOfCase_OneofSfixed32:
-        msg.oneofSfixed32 = 108;
-        break;
-      case Message2_O_OneOfCase_OneofSfixed64:
-        msg.oneofSfixed64 = 109;
-        break;
-      case Message2_O_OneOfCase_OneofFloat:
-        msg.oneofFloat = 110.0f;
-        break;
-      case Message2_O_OneOfCase_OneofDouble:
-        msg.oneofDouble = 111.0;
-        break;
-      case Message2_O_OneOfCase_OneofBool:
-        msg.oneofBool = YES;
-        break;
-      case Message2_O_OneOfCase_OneofString:
-        msg.oneofString = oneofStringDefault;
-        break;
-      case Message2_O_OneOfCase_OneofBytes:
-        msg.oneofBytes = oneofBytesDefault;
-        break;
-      case Message2_O_OneOfCase_OneofEnum:
-        msg.oneofEnum = Message2_Enum_Baz;
-        break;
-      default:
-        XCTFail(@"shouldn't happen, loop: %zd, value: %d", i, values[i]);
-        break;
-    }
-
-    // Should be set to the correct case.
-    XCTAssertEqual(msg.oOneOfCase, values[i], "Loop: %zd", i);
-
-    // Confirm everything is the defaults.
-    XCTAssertEqual(msg.oneofInt32, 100, "Loop: %zd", i);
-    XCTAssertEqual(msg.oneofInt64, 101, "Loop: %zd", i);
-    XCTAssertEqual(msg.oneofUint32, 102U, "Loop: %zd", i);
-    XCTAssertEqual(msg.oneofUint64, 103U, "Loop: %zd", i);
-    XCTAssertEqual(msg.oneofSint32, 104, "Loop: %zd", i);
-    XCTAssertEqual(msg.oneofSint64, 105, "Loop: %zd", i);
-    XCTAssertEqual(msg.oneofFixed32, 106U, "Loop: %zd", i);
-    XCTAssertEqual(msg.oneofFixed64, 107U, "Loop: %zd", i);
-    XCTAssertEqual(msg.oneofSfixed32, 108, "Loop: %zd", i);
-    XCTAssertEqual(msg.oneofSfixed64, 109, "Loop: %zd", i);
-    XCTAssertEqual(msg.oneofFloat, 110.0f, "Loop: %zd", i);
-    XCTAssertEqual(msg.oneofDouble, 111.0, "Loop: %zd", i);
-    XCTAssertEqual(msg.oneofBool, YES, "Loop: %zd", i);
-    XCTAssertEqualObjects(msg.oneofString, oneofStringDefault, "Loop: %zd", i);
-    XCTAssertEqualObjects(msg.oneofBytes, oneofBytesDefault, "Loop: %zd", i);
-    // Skip group, no default to consider.
-    // Skip message, no default to consider.
-    XCTAssertEqual(msg.oneofEnum, Message2_Enum_Baz, "Loop: %zd", i);
-  }
-
-  // We special case nil on string, data, group, and message, ensure they work
-  // as expected. i.e. - it clears the case.
-  msg.oneofString = nil;
-  XCTAssertEqualObjects(msg.oneofString, oneofStringDefault);
-  XCTAssertEqual(msg.oOneOfCase, Message2_O_OneOfCase_GPBUnsetOneOfCase);
-  msg.oneofBytes = nil;
-  XCTAssertEqual(msg.oOneOfCase, Message2_O_OneOfCase_GPBUnsetOneOfCase);
-  XCTAssertEqualObjects(msg.oneofBytes, oneofBytesDefault);
-  msg.oneofGroup = nil;
-  XCTAssertEqual(msg.oOneOfCase, Message2_O_OneOfCase_GPBUnsetOneOfCase);
-  XCTAssertNotNil(msg.oneofGroup);
-  msg.oneofMessage = nil;
-  XCTAssertEqual(msg.oOneOfCase, Message2_O_OneOfCase_GPBUnsetOneOfCase);
-  XCTAssertNotNil(msg.oneofMessage);
-
-  [msg release];
-}
-
-- (void)testProto3OneofSetToZero {
-
-  // Normally setting a proto3 field to the zero value should result in it being
-  // reset/cleared.  But in a oneof, it still gets recorded so it can go out
-  // over the wire and the other side can see what was set in the oneof.
-
-  NSString *oneofStringDefault = @"";
-  NSData *oneofBytesDefault = [NSData data];
-
-  Message3 *msg = [[Message3 alloc] init];
-
-  int32_t values[] = {
-    Message3_O_OneOfCase_OneofInt32,
-    Message3_O_OneOfCase_OneofInt64,
-    Message3_O_OneOfCase_OneofUint32,
-    Message3_O_OneOfCase_OneofUint64,
-    Message3_O_OneOfCase_OneofSint32,
-    Message3_O_OneOfCase_OneofSint64,
-    Message3_O_OneOfCase_OneofFixed32,
-    Message3_O_OneOfCase_OneofFixed64,
-    Message3_O_OneOfCase_OneofSfixed32,
-    Message3_O_OneOfCase_OneofSfixed64,
-    Message3_O_OneOfCase_OneofFloat,
-    Message3_O_OneOfCase_OneofDouble,
-    Message3_O_OneOfCase_OneofBool,
-    Message3_O_OneOfCase_OneofString,
-    Message3_O_OneOfCase_OneofBytes,
-    Message3_O_OneOfCase_OneofMessage,
-    Message3_O_OneOfCase_OneofEnum,
-  };
-
-  for (size_t i = 0; i < GPBARRAYSIZE(values); ++i) {
-    switch (values[i]) {
-      case Message3_O_OneOfCase_OneofInt32:
-        msg.oneofInt32 = 0;
-        break;
-      case Message3_O_OneOfCase_OneofInt64:
-        msg.oneofInt64 = 0;
-        break;
-      case Message3_O_OneOfCase_OneofUint32:
-        msg.oneofUint32 = 0;
-        break;
-      case Message3_O_OneOfCase_OneofUint64:
-        msg.oneofUint64 = 0;
-        break;
-      case Message3_O_OneOfCase_OneofSint32:
-        msg.oneofSint32 = 0;
-        break;
-      case Message3_O_OneOfCase_OneofSint64:
-        msg.oneofSint64 = 0;
-        break;
-      case Message3_O_OneOfCase_OneofFixed32:
-        msg.oneofFixed32 = 0;
-        break;
-      case Message3_O_OneOfCase_OneofFixed64:
-        msg.oneofFixed64 = 0;
-        break;
-      case Message3_O_OneOfCase_OneofSfixed32:
-        msg.oneofSfixed32 = 0;
-        break;
-      case Message3_O_OneOfCase_OneofSfixed64:
-        msg.oneofSfixed64 = 0;
-        break;
-      case Message3_O_OneOfCase_OneofFloat:
-        msg.oneofFloat = 0.0f;
-        break;
-      case Message3_O_OneOfCase_OneofDouble:
-        msg.oneofDouble = 0.0;
-        break;
-      case Message3_O_OneOfCase_OneofBool:
-        msg.oneofBool = NO;
-        break;
-      case Message3_O_OneOfCase_OneofString:
-        msg.oneofString = oneofStringDefault;
-        break;
-      case Message3_O_OneOfCase_OneofBytes:
-        msg.oneofBytes = oneofBytesDefault;
-        break;
-      case Message3_O_OneOfCase_OneofMessage:
-        msg.oneofMessage.optionalInt32 = 0;
-        break;
-      case Message3_O_OneOfCase_OneofEnum:
-        msg.oneofEnum = Message3_Enum_Foo;
-        break;
-      default:
-        XCTFail(@"shouldn't happen, loop: %zd, value: %d", i, values[i]);
-        break;
-    }
-
-    // Should be set to the correct case.
-    XCTAssertEqual(msg.oOneOfCase, values[i], "Loop: %zd", i);
-
-    // Confirm everything is still zeros.
-    XCTAssertEqual(msg.oneofInt32, 0, "Loop: %zd", i);
-    XCTAssertEqual(msg.oneofInt64, 0, "Loop: %zd", i);
-    XCTAssertEqual(msg.oneofUint32, 0U, "Loop: %zd", i);
-    XCTAssertEqual(msg.oneofUint64, 0U, "Loop: %zd", i);
-    XCTAssertEqual(msg.oneofSint32, 0, "Loop: %zd", i);
-    XCTAssertEqual(msg.oneofSint64, 0, "Loop: %zd", i);
-    XCTAssertEqual(msg.oneofFixed32, 0U, "Loop: %zd", i);
-    XCTAssertEqual(msg.oneofFixed64, 0U, "Loop: %zd", i);
-    XCTAssertEqual(msg.oneofSfixed32, 0, "Loop: %zd", i);
-    XCTAssertEqual(msg.oneofSfixed64, 0, "Loop: %zd", i);
-    XCTAssertEqual(msg.oneofFloat, 0.0f, "Loop: %zd", i);
-    XCTAssertEqual(msg.oneofDouble, 0.0, "Loop: %zd", i);
-    XCTAssertEqual(msg.oneofBool, NO, "Loop: %zd", i);
-    XCTAssertEqualObjects(msg.oneofString, oneofStringDefault, "Loop: %zd", i);
-    XCTAssertEqualObjects(msg.oneofBytes, oneofBytesDefault, "Loop: %zd", i);
-    XCTAssertNotNil(msg.oneofMessage, "Loop: %zd", i);
-    XCTAssertEqual(msg.oneofEnum, Message3_Enum_Foo, "Loop: %zd", i);
-  }
-
-  // We special case nil on string, data, message, ensure they work as expected.
-  msg.oneofString = nil;
-  XCTAssertEqual(msg.oOneOfCase, Message3_O_OneOfCase_GPBUnsetOneOfCase);
-  XCTAssertEqualObjects(msg.oneofString, oneofStringDefault);
-  msg.oneofBytes = nil;
-  XCTAssertEqual(msg.oOneOfCase, Message3_O_OneOfCase_GPBUnsetOneOfCase);
-  XCTAssertEqualObjects(msg.oneofBytes, oneofBytesDefault);
-  msg.oneofMessage = nil;
-  XCTAssertEqual(msg.oOneOfCase, Message3_O_OneOfCase_GPBUnsetOneOfCase);
-  XCTAssertNotNil(msg.oneofMessage);
-
-  [msg release];
-}
-
-- (void)testCopyingMakesUniqueObjects {
-  const int repeatCount = 5;
-  TestAllTypes *msg1 = [TestAllTypes message];
-  [self setAllFields:msg1 repeatedCount:repeatCount];
-
-  TestAllTypes *msg2 = [[msg1 copy] autorelease];
-
-  XCTAssertNotEqual(msg1, msg2);      // Ptr compare, new object.
-  XCTAssertEqualObjects(msg1, msg2);  // Equal values.
-
-  // Pointer comparisons, different objects.
-
-  XCTAssertNotEqual(msg1.optionalGroup, msg2.optionalGroup);
-  XCTAssertNotEqual(msg1.optionalNestedMessage, msg2.optionalNestedMessage);
-  XCTAssertNotEqual(msg1.optionalForeignMessage, msg2.optionalForeignMessage);
-  XCTAssertNotEqual(msg1.optionalImportMessage, msg2.optionalImportMessage);
-
-  XCTAssertNotEqual(msg1.repeatedInt32Array, msg2.repeatedInt32Array);
-  XCTAssertNotEqual(msg1.repeatedInt64Array, msg2.repeatedInt64Array);
-  XCTAssertNotEqual(msg1.repeatedUint32Array, msg2.repeatedUint32Array);
-  XCTAssertNotEqual(msg1.repeatedUint64Array, msg2.repeatedUint64Array);
-  XCTAssertNotEqual(msg1.repeatedSint32Array, msg2.repeatedSint32Array);
-  XCTAssertNotEqual(msg1.repeatedSint64Array, msg2.repeatedSint64Array);
-  XCTAssertNotEqual(msg1.repeatedFixed32Array, msg2.repeatedFixed32Array);
-  XCTAssertNotEqual(msg1.repeatedFixed64Array, msg2.repeatedFixed64Array);
-  XCTAssertNotEqual(msg1.repeatedSfixed32Array, msg2.repeatedSfixed32Array);
-  XCTAssertNotEqual(msg1.repeatedSfixed64Array, msg2.repeatedSfixed64Array);
-  XCTAssertNotEqual(msg1.repeatedFloatArray, msg2.repeatedFloatArray);
-  XCTAssertNotEqual(msg1.repeatedDoubleArray, msg2.repeatedDoubleArray);
-  XCTAssertNotEqual(msg1.repeatedBoolArray, msg2.repeatedBoolArray);
-  XCTAssertNotEqual(msg1.repeatedStringArray, msg2.repeatedStringArray);
-  XCTAssertNotEqual(msg1.repeatedBytesArray, msg2.repeatedBytesArray);
-  XCTAssertNotEqual(msg1.repeatedGroupArray, msg2.repeatedGroupArray);
-  XCTAssertNotEqual(msg1.repeatedNestedMessageArray,
-                    msg2.repeatedNestedMessageArray);
-  XCTAssertNotEqual(msg1.repeatedForeignMessageArray,
-                    msg2.repeatedForeignMessageArray);
-  XCTAssertNotEqual(msg1.repeatedImportMessageArray,
-                    msg2.repeatedImportMessageArray);
-  XCTAssertNotEqual(msg1.repeatedNestedEnumArray, msg2.repeatedNestedEnumArray);
-  XCTAssertNotEqual(msg1.repeatedForeignEnumArray,
-                    msg2.repeatedForeignEnumArray);
-  XCTAssertNotEqual(msg1.repeatedImportEnumArray, msg2.repeatedImportEnumArray);
-  XCTAssertNotEqual(msg1.repeatedStringPieceArray,
-                    msg2.repeatedStringPieceArray);
-  XCTAssertNotEqual(msg1.repeatedCordArray, msg2.repeatedCordArray);
-
-  for (int i = 0; i < repeatCount; i++) {
-    XCTAssertNotEqual(msg1.repeatedNestedMessageArray[i],
-                      msg2.repeatedNestedMessageArray[i]);
-    XCTAssertNotEqual(msg1.repeatedForeignMessageArray[i],
-                      msg2.repeatedForeignMessageArray[i]);
-    XCTAssertNotEqual(msg1.repeatedImportMessageArray[i],
-                      msg2.repeatedImportMessageArray[i]);
-  }
-}
-
-- (void)testCopyingMapsMakesUniqueObjects {
-  TestMap *msg1 = [TestMap message];
-  [self setAllMapFields:msg1 numEntries:5];
-
-  TestMap *msg2 = [[msg1 copy] autorelease];
-
-  XCTAssertNotEqual(msg1, msg2);      // Ptr compare, new object.
-  XCTAssertEqualObjects(msg1, msg2);  // Equal values.
-
-  // Pointer comparisons, different objects.
-  XCTAssertNotEqual(msg1.mapInt32Int32, msg2.mapInt32Int32);
-  XCTAssertNotEqual(msg1.mapInt64Int64, msg2.mapInt64Int64);
-  XCTAssertNotEqual(msg1.mapUint32Uint32, msg2.mapUint32Uint32);
-  XCTAssertNotEqual(msg1.mapUint64Uint64, msg2.mapUint64Uint64);
-  XCTAssertNotEqual(msg1.mapSint32Sint32, msg2.mapSint32Sint32);
-  XCTAssertNotEqual(msg1.mapSint64Sint64, msg2.mapSint64Sint64);
-  XCTAssertNotEqual(msg1.mapFixed32Fixed32, msg2.mapFixed32Fixed32);
-  XCTAssertNotEqual(msg1.mapFixed64Fixed64, msg2.mapFixed64Fixed64);
-  XCTAssertNotEqual(msg1.mapSfixed32Sfixed32, msg2.mapSfixed32Sfixed32);
-  XCTAssertNotEqual(msg1.mapSfixed64Sfixed64, msg2.mapSfixed64Sfixed64);
-  XCTAssertNotEqual(msg1.mapInt32Float, msg2.mapInt32Float);
-  XCTAssertNotEqual(msg1.mapInt32Double, msg2.mapInt32Double);
-  XCTAssertNotEqual(msg1.mapBoolBool, msg2.mapBoolBool);
-  XCTAssertNotEqual(msg1.mapStringString, msg2.mapStringString);
-  XCTAssertNotEqual(msg1.mapInt32Bytes, msg2.mapInt32Bytes);
-  XCTAssertNotEqual(msg1.mapInt32Enum, msg2.mapInt32Enum);
-  XCTAssertNotEqual(msg1.mapInt32ForeignMessage, msg2.mapInt32ForeignMessage);
-
-  // Ensure the messages are unique per map.
-  [msg1.mapInt32ForeignMessage
-      enumerateKeysAndObjectsUsingBlock:^(int32_t key, id value, BOOL *stop) {
-#pragma unused(stop)
-        ForeignMessage *subMsg2 = [msg2.mapInt32ForeignMessage objectForKey:key];
-        XCTAssertNotEqual(value, subMsg2);  // Ptr compare, new object.
-      }];
-}
-
-- (void)test_GPBGetMessageRepeatedField {
-  TestAllTypes *message = [TestAllTypes message];
-  GPBFieldDescriptor *fieldDescriptor = [[message descriptor] fieldWithName:@"repeatedStringArray"];
-  XCTAssertNotNil(fieldDescriptor);
-  NSMutableArray *fieldArray = GPBGetMessageRepeatedField(message, fieldDescriptor);
-  XCTAssertNotNil(fieldArray);  // Should have autocreated.
-  XCTAssertTrue(fieldArray == message.repeatedStringArray);  // Same pointer
-}
-
-- (void)test_GPBSetMessageRepeatedField {
-  TestAllTypes *message = [TestAllTypes message];
-  GPBFieldDescriptor *fieldDescriptor = [[message descriptor] fieldWithName:@"repeatedStringArray"];
-  XCTAssertNotNil(fieldDescriptor);
-
-  NSMutableArray *fieldArray = [NSMutableArray arrayWithObject:@"foo"];
-  GPBSetMessageRepeatedField(message, fieldDescriptor, fieldArray);
-  XCTAssertTrue(fieldArray == message.repeatedStringArray);  // Same pointer
-  XCTAssertEqualObjects(@"foo", message.repeatedStringArray.firstObject);
-}
-
-- (void)test_GPBGetMessageMapField {
-  TestMap *message = [TestMap message];
-  GPBFieldDescriptor *fieldDescriptor = [[message descriptor] fieldWithName:@"mapStringString"];
-  XCTAssertNotNil(fieldDescriptor);
-  NSMutableDictionary *fieldMap = GPBGetMessageMapField(message, fieldDescriptor);
-  XCTAssertNotNil(fieldMap);  // Should have autocreated.
-  XCTAssertTrue(fieldMap == message.mapStringString);  // Same pointer
-}
-
-- (void)test_GPBSetMessageMapField {
-  TestMap *message = [TestMap message];
-  GPBFieldDescriptor *fieldDescriptor = [[message descriptor] fieldWithName:@"mapStringString"];
-  XCTAssertNotNil(fieldDescriptor);
-
-  NSMutableDictionary *fieldMap = [NSMutableDictionary dictionaryWithObject:@"bar" forKey:@"foo"];
-  GPBSetMessageMapField(message, fieldDescriptor, fieldMap);
-  XCTAssertTrue(fieldMap == message.mapStringString);  // Same pointer
-  XCTAssertEqualObjects(@"bar", message.mapStringString[@"foo"]);
-}
-
-- (void)test_StringFieldsCopy {
-  // ObjC conventions call for NSString properties to be copy, ensure
-  // that is done correctly and the string isn't simply retained.
-
-  Message2 *msg1 = [Message2 message];
-  Message2 *msg2 = [Message2 message];
-
-  GPBFieldDescriptor *fieldDesc =
-      [[Message2 descriptor] fieldWithNumber:Message2_FieldNumber_OptionalString];
-  NSMutableString *mutableStr = [NSMutableString stringWithString:@"foo"];
-
-  msg1.optionalString = mutableStr;
-  GPBSetMessageStringField(msg2, fieldDesc, mutableStr);
-
-  XCTAssertEqualObjects(msg1.optionalString, mutableStr);
-  XCTAssertEqualObjects(msg1.optionalString, @"foo");
-  XCTAssertTrue(msg1.optionalString != mutableStr);  // Ptr comparison.
-
-  XCTAssertEqualObjects(msg2.optionalString, mutableStr);
-  XCTAssertEqualObjects(msg2.optionalString, @"foo");
-  XCTAssertTrue(msg2.optionalString != mutableStr);  // Ptr comparison.
-
-  [mutableStr appendString:@"bar"];
-
-  XCTAssertNotEqualObjects(msg1.optionalString, mutableStr);
-  XCTAssertEqualObjects(msg1.optionalString, @"foo");
-  XCTAssertTrue(msg1.optionalString != mutableStr);  // Ptr comparison.
-
-  XCTAssertNotEqualObjects(msg2.optionalString, mutableStr);
-  XCTAssertEqualObjects(msg2.optionalString, @"foo");
-  XCTAssertTrue(msg2.optionalString != mutableStr);  // Ptr comparison.
-}
-
-- (void)test_BytesFieldsCopy {
-  // ObjC conventions call for NSData properties to be copy, ensure
-  // that is done correctly and the data isn't simply retained.
-
-  Message2 *msg1 = [Message2 message];
-  Message2 *msg2 = [Message2 message];
-
-  GPBFieldDescriptor *fieldDesc =
-      [[Message2 descriptor] fieldWithNumber:Message2_FieldNumber_OptionalBytes];
-  NSMutableData *mutableData = [NSMutableData dataWithData:DataFromCStr("abc")];
-
-  msg1.optionalBytes = mutableData;
-  GPBSetMessageBytesField(msg2, fieldDesc, mutableData);
-
-  XCTAssertEqualObjects(msg1.optionalBytes, mutableData);
-  XCTAssertEqualObjects(msg1.optionalBytes, DataFromCStr("abc"));
-  XCTAssertTrue(msg1.optionalBytes != mutableData);  // Ptr comparison.
-
-  XCTAssertEqualObjects(msg2.optionalBytes, mutableData);
-  XCTAssertEqualObjects(msg2.optionalBytes, DataFromCStr("abc"));
-  XCTAssertTrue(msg2.optionalBytes != mutableData);  // Ptr comparison.
-
-  [mutableData appendData:DataFromCStr("123")];
-
-  XCTAssertNotEqualObjects(msg1.optionalBytes, mutableData);
-  XCTAssertEqualObjects(msg1.optionalBytes, DataFromCStr("abc"));
-  XCTAssertTrue(msg1.optionalBytes != mutableData);  // Ptr comparison.
-
-  XCTAssertNotEqualObjects(msg2.optionalBytes, mutableData);
-  XCTAssertEqualObjects(msg2.optionalBytes, DataFromCStr("abc"));
-  XCTAssertTrue(msg2.optionalBytes != mutableData);  // Ptr comparison.
-}
-
-#pragma mark - Subset from from map_tests.cc
-
-// TEST(GeneratedMapFieldTest, IsInitialized)
-- (void)testMap_IsInitialized {
-  TestRequiredMessageMap *msg = [[TestRequiredMessageMap alloc] init];
-
-  // Add an uninitialized message.
-  TestRequired *subMsg = [[TestRequired alloc] init];
-  [msg.mapField setObject:subMsg forKey:0];
-  XCTAssertFalse(msg.initialized);
-
-  // Initialize uninitialized message
-  subMsg.a = 0;
-  subMsg.b = 0;
-  subMsg.c = 0;
-  XCTAssertTrue(msg.initialized);
-
-  [subMsg release];
-  [msg release];
-}
-
-@end
diff --git a/libs/protobuf/objectivec/Tests/GPBMessageTests+Serialization.m b/libs/protobuf/objectivec/Tests/GPBMessageTests+Serialization.m
deleted file mode 100644
index bb63ec3..0000000
--- a/libs/protobuf/objectivec/Tests/GPBMessageTests+Serialization.m
+++ /dev/null
@@ -1,1542 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#import "GPBTestUtilities.h"
-
-#import <objc/runtime.h>
-
-#import "GPBMessage.h"
-
-#import "google/protobuf/MapProto2Unittest.pbobjc.h"
-#import "google/protobuf/MapUnittest.pbobjc.h"
-#import "google/protobuf/Unittest.pbobjc.h"
-#import "google/protobuf/UnittestDropUnknownFields.pbobjc.h"
-#import "google/protobuf/UnittestPreserveUnknownEnum.pbobjc.h"
-#import "google/protobuf/UnittestRuntimeProto2.pbobjc.h"
-#import "google/protobuf/UnittestRuntimeProto3.pbobjc.h"
-
-@interface MessageSerializationTests : GPBTestCase
-@end
-
-@implementation MessageSerializationTests
-
-// TODO(thomasvl): Pull tests over from GPBMessageTests that are serialization
-// specific.
-
-- (void)testProto3SerializationHandlingDefaults {
-  // Proto2 covered in other tests.
-
-  Message3 *msg = [[Message3 alloc] init];
-
-  // Add defaults, no output.
-
-  NSData *data = [msg data];
-  XCTAssertEqual([data length], 0U);
-
-  // All zeros, still nothing.
-
-  msg.optionalInt32 = 0;
-  msg.optionalInt64 = 0;
-  msg.optionalUint32 = 0;
-  msg.optionalUint64 = 0;
-  msg.optionalSint32 = 0;
-  msg.optionalSint64 = 0;
-  msg.optionalFixed32 = 0;
-  msg.optionalFixed64 = 0;
-  msg.optionalSfixed32 = 0;
-  msg.optionalSfixed64 = 0;
-  msg.optionalFloat = 0.0f;
-  msg.optionalDouble = 0.0;
-  msg.optionalBool = NO;
-  msg.optionalString = @"";
-  msg.optionalBytes = [NSData data];
-  msg.optionalEnum = Message3_Enum_Foo;  // first value
-
-  data = [msg data];
-  XCTAssertEqual([data length], 0U);
-
-  // The two that also take nil as nothing.
-
-  msg.optionalString = nil;
-  msg.optionalBytes = nil;
-
-  data = [msg data];
-  XCTAssertEqual([data length], 0U);
-
-  // Set one field...
-
-  msg.optionalInt32 = 1;
-
-  data = [msg data];
-  const uint8_t expectedBytes[] = {0x08, 0x01};
-  NSData *expected = [NSData dataWithBytes:expectedBytes length:2];
-  XCTAssertEqualObjects(data, expected);
-
-  // Back to zero...
-
-  msg.optionalInt32 = 0;
-
-  data = [msg data];
-  XCTAssertEqual([data length], 0U);
-
-  [msg release];
-}
-
-- (void)testProto3SerializationHandlingOptionals {
-  //
-  // Proto3 optionals should be just like proto2, zero values also get serialized.
-  //
-
-//%PDDM-DEFINE PROTO3_TEST_SERIALIZE_OPTIONAL_FIELD(FIELD, ZERO_VALUE, EXPECTED_LEN)
-//%  {  // optional##FIELD
-//%    Message3Optional *msg = [[Message3Optional alloc] init];
-//%    NSData *data = [msg data];
-//%    XCTAssertEqual([data length], 0U);
-//%    msg.optional##FIELD = ZERO_VALUE;
-//%    data = [msg data];
-//%    XCTAssertEqual(data.length, EXPECTED_LEN);
-//%    NSError *err = nil;
-//%    Message3Optional *msg2 = [Message3Optional parseFromData:data error:&err];
-//%    XCTAssertNotNil(msg2);
-//%    XCTAssertNil(err);
-//%    XCTAssertTrue(msg2.hasOptional##FIELD);
-//%    XCTAssertEqualObjects(msg, msg2);
-//%    [msg release];
-//%  }
-//%
-//%PDDM-DEFINE PROTO3_TEST_SERIALIZE_OPTIONAL_FIELDS()
-//%PROTO3_TEST_SERIALIZE_OPTIONAL_FIELD(Int32, 0, 2)
-//%PROTO3_TEST_SERIALIZE_OPTIONAL_FIELD(Int64, 0, 2)
-//%PROTO3_TEST_SERIALIZE_OPTIONAL_FIELD(Uint32, 0, 2)
-//%PROTO3_TEST_SERIALIZE_OPTIONAL_FIELD(Uint64, 0, 2)
-//%PROTO3_TEST_SERIALIZE_OPTIONAL_FIELD(Sint32, 0, 2)
-//%PROTO3_TEST_SERIALIZE_OPTIONAL_FIELD(Sint64, 0, 2)
-//%PROTO3_TEST_SERIALIZE_OPTIONAL_FIELD(Fixed32, 0, 5)
-//%PROTO3_TEST_SERIALIZE_OPTIONAL_FIELD(Fixed64, 0, 9)
-//%PROTO3_TEST_SERIALIZE_OPTIONAL_FIELD(Sfixed32, 0, 5)
-//%PROTO3_TEST_SERIALIZE_OPTIONAL_FIELD(Sfixed64, 0, 9)
-//%PROTO3_TEST_SERIALIZE_OPTIONAL_FIELD(Float, 0.0f, 5)
-//%PROTO3_TEST_SERIALIZE_OPTIONAL_FIELD(Double, 0.0, 9)
-//%PROTO3_TEST_SERIALIZE_OPTIONAL_FIELD(Bool, NO, 2)
-//%PROTO3_TEST_SERIALIZE_OPTIONAL_FIELD(String, @"", 2)
-//%PROTO3_TEST_SERIALIZE_OPTIONAL_FIELD(Bytes, [NSData data], 2)
-//%  //
-//%  // Test doesn't apply to optionalMessage (no groups in proto3).
-//%  //
-//%
-//%PROTO3_TEST_SERIALIZE_OPTIONAL_FIELD(Enum, Message3Optional_Enum_Foo, 3)
-//%PDDM-EXPAND PROTO3_TEST_SERIALIZE_OPTIONAL_FIELDS()
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-  {  // optionalInt32
-    Message3Optional *msg = [[Message3Optional alloc] init];
-    NSData *data = [msg data];
-    XCTAssertEqual([data length], 0U);
-    msg.optionalInt32 = 0;
-    data = [msg data];
-    XCTAssertEqual(data.length, 2);
-    NSError *err = nil;
-    Message3Optional *msg2 = [Message3Optional parseFromData:data error:&err];
-    XCTAssertNotNil(msg2);
-    XCTAssertNil(err);
-    XCTAssertTrue(msg2.hasOptionalInt32);
-    XCTAssertEqualObjects(msg, msg2);
-    [msg release];
-  }
-
-  {  // optionalInt64
-    Message3Optional *msg = [[Message3Optional alloc] init];
-    NSData *data = [msg data];
-    XCTAssertEqual([data length], 0U);
-    msg.optionalInt64 = 0;
-    data = [msg data];
-    XCTAssertEqual(data.length, 2);
-    NSError *err = nil;
-    Message3Optional *msg2 = [Message3Optional parseFromData:data error:&err];
-    XCTAssertNotNil(msg2);
-    XCTAssertNil(err);
-    XCTAssertTrue(msg2.hasOptionalInt64);
-    XCTAssertEqualObjects(msg, msg2);
-    [msg release];
-  }
-
-  {  // optionalUint32
-    Message3Optional *msg = [[Message3Optional alloc] init];
-    NSData *data = [msg data];
-    XCTAssertEqual([data length], 0U);
-    msg.optionalUint32 = 0;
-    data = [msg data];
-    XCTAssertEqual(data.length, 2);
-    NSError *err = nil;
-    Message3Optional *msg2 = [Message3Optional parseFromData:data error:&err];
-    XCTAssertNotNil(msg2);
-    XCTAssertNil(err);
-    XCTAssertTrue(msg2.hasOptionalUint32);
-    XCTAssertEqualObjects(msg, msg2);
-    [msg release];
-  }
-
-  {  // optionalUint64
-    Message3Optional *msg = [[Message3Optional alloc] init];
-    NSData *data = [msg data];
-    XCTAssertEqual([data length], 0U);
-    msg.optionalUint64 = 0;
-    data = [msg data];
-    XCTAssertEqual(data.length, 2);
-    NSError *err = nil;
-    Message3Optional *msg2 = [Message3Optional parseFromData:data error:&err];
-    XCTAssertNotNil(msg2);
-    XCTAssertNil(err);
-    XCTAssertTrue(msg2.hasOptionalUint64);
-    XCTAssertEqualObjects(msg, msg2);
-    [msg release];
-  }
-
-  {  // optionalSint32
-    Message3Optional *msg = [[Message3Optional alloc] init];
-    NSData *data = [msg data];
-    XCTAssertEqual([data length], 0U);
-    msg.optionalSint32 = 0;
-    data = [msg data];
-    XCTAssertEqual(data.length, 2);
-    NSError *err = nil;
-    Message3Optional *msg2 = [Message3Optional parseFromData:data error:&err];
-    XCTAssertNotNil(msg2);
-    XCTAssertNil(err);
-    XCTAssertTrue(msg2.hasOptionalSint32);
-    XCTAssertEqualObjects(msg, msg2);
-    [msg release];
-  }
-
-  {  // optionalSint64
-    Message3Optional *msg = [[Message3Optional alloc] init];
-    NSData *data = [msg data];
-    XCTAssertEqual([data length], 0U);
-    msg.optionalSint64 = 0;
-    data = [msg data];
-    XCTAssertEqual(data.length, 2);
-    NSError *err = nil;
-    Message3Optional *msg2 = [Message3Optional parseFromData:data error:&err];
-    XCTAssertNotNil(msg2);
-    XCTAssertNil(err);
-    XCTAssertTrue(msg2.hasOptionalSint64);
-    XCTAssertEqualObjects(msg, msg2);
-    [msg release];
-  }
-
-  {  // optionalFixed32
-    Message3Optional *msg = [[Message3Optional alloc] init];
-    NSData *data = [msg data];
-    XCTAssertEqual([data length], 0U);
-    msg.optionalFixed32 = 0;
-    data = [msg data];
-    XCTAssertEqual(data.length, 5);
-    NSError *err = nil;
-    Message3Optional *msg2 = [Message3Optional parseFromData:data error:&err];
-    XCTAssertNotNil(msg2);
-    XCTAssertNil(err);
-    XCTAssertTrue(msg2.hasOptionalFixed32);
-    XCTAssertEqualObjects(msg, msg2);
-    [msg release];
-  }
-
-  {  // optionalFixed64
-    Message3Optional *msg = [[Message3Optional alloc] init];
-    NSData *data = [msg data];
-    XCTAssertEqual([data length], 0U);
-    msg.optionalFixed64 = 0;
-    data = [msg data];
-    XCTAssertEqual(data.length, 9);
-    NSError *err = nil;
-    Message3Optional *msg2 = [Message3Optional parseFromData:data error:&err];
-    XCTAssertNotNil(msg2);
-    XCTAssertNil(err);
-    XCTAssertTrue(msg2.hasOptionalFixed64);
-    XCTAssertEqualObjects(msg, msg2);
-    [msg release];
-  }
-
-  {  // optionalSfixed32
-    Message3Optional *msg = [[Message3Optional alloc] init];
-    NSData *data = [msg data];
-    XCTAssertEqual([data length], 0U);
-    msg.optionalSfixed32 = 0;
-    data = [msg data];
-    XCTAssertEqual(data.length, 5);
-    NSError *err = nil;
-    Message3Optional *msg2 = [Message3Optional parseFromData:data error:&err];
-    XCTAssertNotNil(msg2);
-    XCTAssertNil(err);
-    XCTAssertTrue(msg2.hasOptionalSfixed32);
-    XCTAssertEqualObjects(msg, msg2);
-    [msg release];
-  }
-
-  {  // optionalSfixed64
-    Message3Optional *msg = [[Message3Optional alloc] init];
-    NSData *data = [msg data];
-    XCTAssertEqual([data length], 0U);
-    msg.optionalSfixed64 = 0;
-    data = [msg data];
-    XCTAssertEqual(data.length, 9);
-    NSError *err = nil;
-    Message3Optional *msg2 = [Message3Optional parseFromData:data error:&err];
-    XCTAssertNotNil(msg2);
-    XCTAssertNil(err);
-    XCTAssertTrue(msg2.hasOptionalSfixed64);
-    XCTAssertEqualObjects(msg, msg2);
-    [msg release];
-  }
-
-  {  // optionalFloat
-    Message3Optional *msg = [[Message3Optional alloc] init];
-    NSData *data = [msg data];
-    XCTAssertEqual([data length], 0U);
-    msg.optionalFloat = 0.0f;
-    data = [msg data];
-    XCTAssertEqual(data.length, 5);
-    NSError *err = nil;
-    Message3Optional *msg2 = [Message3Optional parseFromData:data error:&err];
-    XCTAssertNotNil(msg2);
-    XCTAssertNil(err);
-    XCTAssertTrue(msg2.hasOptionalFloat);
-    XCTAssertEqualObjects(msg, msg2);
-    [msg release];
-  }
-
-  {  // optionalDouble
-    Message3Optional *msg = [[Message3Optional alloc] init];
-    NSData *data = [msg data];
-    XCTAssertEqual([data length], 0U);
-    msg.optionalDouble = 0.0;
-    data = [msg data];
-    XCTAssertEqual(data.length, 9);
-    NSError *err = nil;
-    Message3Optional *msg2 = [Message3Optional parseFromData:data error:&err];
-    XCTAssertNotNil(msg2);
-    XCTAssertNil(err);
-    XCTAssertTrue(msg2.hasOptionalDouble);
-    XCTAssertEqualObjects(msg, msg2);
-    [msg release];
-  }
-
-  {  // optionalBool
-    Message3Optional *msg = [[Message3Optional alloc] init];
-    NSData *data = [msg data];
-    XCTAssertEqual([data length], 0U);
-    msg.optionalBool = NO;
-    data = [msg data];
-    XCTAssertEqual(data.length, 2);
-    NSError *err = nil;
-    Message3Optional *msg2 = [Message3Optional parseFromData:data error:&err];
-    XCTAssertNotNil(msg2);
-    XCTAssertNil(err);
-    XCTAssertTrue(msg2.hasOptionalBool);
-    XCTAssertEqualObjects(msg, msg2);
-    [msg release];
-  }
-
-  {  // optionalString
-    Message3Optional *msg = [[Message3Optional alloc] init];
-    NSData *data = [msg data];
-    XCTAssertEqual([data length], 0U);
-    msg.optionalString = @"";
-    data = [msg data];
-    XCTAssertEqual(data.length, 2);
-    NSError *err = nil;
-    Message3Optional *msg2 = [Message3Optional parseFromData:data error:&err];
-    XCTAssertNotNil(msg2);
-    XCTAssertNil(err);
-    XCTAssertTrue(msg2.hasOptionalString);
-    XCTAssertEqualObjects(msg, msg2);
-    [msg release];
-  }
-
-  {  // optionalBytes
-    Message3Optional *msg = [[Message3Optional alloc] init];
-    NSData *data = [msg data];
-    XCTAssertEqual([data length], 0U);
-    msg.optionalBytes = [NSData data];
-    data = [msg data];
-    XCTAssertEqual(data.length, 2);
-    NSError *err = nil;
-    Message3Optional *msg2 = [Message3Optional parseFromData:data error:&err];
-    XCTAssertNotNil(msg2);
-    XCTAssertNil(err);
-    XCTAssertTrue(msg2.hasOptionalBytes);
-    XCTAssertEqualObjects(msg, msg2);
-    [msg release];
-  }
-
-  //
-  // Test doesn't apply to optionalMessage (no groups in proto3).
-  //
-
-  {  // optionalEnum
-    Message3Optional *msg = [[Message3Optional alloc] init];
-    NSData *data = [msg data];
-    XCTAssertEqual([data length], 0U);
-    msg.optionalEnum = Message3Optional_Enum_Foo;
-    data = [msg data];
-    XCTAssertEqual(data.length, 3);
-    NSError *err = nil;
-    Message3Optional *msg2 = [Message3Optional parseFromData:data error:&err];
-    XCTAssertNotNil(msg2);
-    XCTAssertNil(err);
-    XCTAssertTrue(msg2.hasOptionalEnum);
-    XCTAssertEqualObjects(msg, msg2);
-    [msg release];
-  }
-
-// clang-format on
-//%PDDM-EXPAND-END PROTO3_TEST_SERIALIZE_OPTIONAL_FIELDS()
-}
-
-- (void)testProto2UnknownEnumToUnknownField {
-  Message3 *orig = [[Message3 alloc] init];
-
-  orig.optionalEnum = Message3_Enum_Extra3;
-  orig.repeatedEnumArray =
-      [GPBEnumArray arrayWithValidationFunction:Message3_Enum_IsValidValue
-                                       rawValue:Message3_Enum_Extra3];
-  orig.oneofEnum = Message3_Enum_Extra3;
-
-  NSData *data = [orig data];
-  XCTAssertNotNil(data);
-  Message2 *msg = [[Message2 alloc] initWithData:data error:NULL];
-
-  // None of the fields should be set.
-
-  XCTAssertFalse(msg.hasOptionalEnum);
-  XCTAssertEqual(msg.repeatedEnumArray.count, 0U);
-  XCTAssertEqual(msg.oOneOfCase, Message3_O_OneOfCase_GPBUnsetOneOfCase);
-
-  // All the values should be in unknown fields.
-
-  GPBUnknownFieldSet *unknownFields = msg.unknownFields;
-
-  XCTAssertEqual([unknownFields countOfFields], 3U);
-  XCTAssertTrue([unknownFields hasField:Message2_FieldNumber_OptionalEnum]);
-  XCTAssertTrue(
-      [unknownFields hasField:Message2_FieldNumber_RepeatedEnumArray]);
-  XCTAssertTrue([unknownFields hasField:Message2_FieldNumber_OneofEnum]);
-
-  GPBUnknownField *field =
-      [unknownFields getField:Message2_FieldNumber_OptionalEnum];
-  XCTAssertEqual(field.varintList.count, 1U);
-  XCTAssertEqual([field.varintList valueAtIndex:0],
-                 (uint64_t)Message3_Enum_Extra3);
-
-  field = [unknownFields getField:Message2_FieldNumber_RepeatedEnumArray];
-  XCTAssertEqual(field.varintList.count, 1U);
-  XCTAssertEqual([field.varintList valueAtIndex:0], (uint64_t)Message3_Enum_Extra3);
-
-  field = [unknownFields getField:Message2_FieldNumber_OneofEnum];
-  XCTAssertEqual(field.varintList.count, 1U);
-  XCTAssertEqual([field.varintList valueAtIndex:0],
-                 (uint64_t)Message3_Enum_Extra3);
-
-  [msg release];
-  [orig release];
-}
-
-- (void)testProto3UnknownEnumPreserving {
-  UnknownEnumsMyMessagePlusExtra *orig =
-      [UnknownEnumsMyMessagePlusExtra message];
-
-  orig.e = UnknownEnumsMyEnumPlusExtra_EExtra;
-  orig.repeatedEArray = [GPBEnumArray
-      arrayWithValidationFunction:UnknownEnumsMyEnumPlusExtra_IsValidValue
-                         rawValue:UnknownEnumsMyEnumPlusExtra_EExtra];
-  orig.repeatedPackedEArray = [GPBEnumArray
-      arrayWithValidationFunction:UnknownEnumsMyEnumPlusExtra_IsValidValue
-                         rawValue:UnknownEnumsMyEnumPlusExtra_EExtra];
-  orig.oneofE1 = UnknownEnumsMyEnumPlusExtra_EExtra;
-
-  // Everything should be there via raw values.
-
-  NSData *data = [orig data];
-  XCTAssertNotNil(data);
-  UnknownEnumsMyMessage *msg =
-      [UnknownEnumsMyMessage parseFromData:data error:NULL];
-
-  XCTAssertEqual(msg.e, UnknownEnumsMyEnum_GPBUnrecognizedEnumeratorValue);
-  XCTAssertEqual(UnknownEnumsMyMessage_E_RawValue(msg),
-                 UnknownEnumsMyEnumPlusExtra_EExtra);
-  XCTAssertEqual(msg.repeatedEArray.count, 1U);
-  XCTAssertEqual([msg.repeatedEArray valueAtIndex:0],
-                 UnknownEnumsMyEnum_GPBUnrecognizedEnumeratorValue);
-  XCTAssertEqual([msg.repeatedEArray rawValueAtIndex:0],
-                 (UnknownEnumsMyEnum)UnknownEnumsMyEnumPlusExtra_EExtra);
-  XCTAssertEqual(msg.repeatedPackedEArray.count, 1U);
-  XCTAssertEqual([msg.repeatedPackedEArray valueAtIndex:0],
-                 UnknownEnumsMyEnum_GPBUnrecognizedEnumeratorValue);
-  XCTAssertEqual([msg.repeatedPackedEArray rawValueAtIndex:0],
-                 (UnknownEnumsMyEnum)UnknownEnumsMyEnumPlusExtra_EExtra);
-  XCTAssertEqual(msg.oneofE1,
-                 UnknownEnumsMyEnum_GPBUnrecognizedEnumeratorValue);
-  XCTAssertEqual(UnknownEnumsMyMessage_OneofE1_RawValue(msg),
-                 UnknownEnumsMyEnumPlusExtra_EExtra);
-
-  // Everything should go out and come back.
-
-  data = [msg data];
-  orig = [UnknownEnumsMyMessagePlusExtra parseFromData:data error:NULL];
-
-  XCTAssertEqual(orig.e, UnknownEnumsMyEnumPlusExtra_EExtra);
-  XCTAssertEqual(orig.repeatedEArray.count, 1U);
-  XCTAssertEqual([orig.repeatedEArray valueAtIndex:0],
-                 UnknownEnumsMyEnumPlusExtra_EExtra);
-  XCTAssertEqual(orig.repeatedPackedEArray.count, 1U);
-  XCTAssertEqual([orig.repeatedPackedEArray valueAtIndex:0],
-                 UnknownEnumsMyEnumPlusExtra_EExtra);
-  XCTAssertEqual(orig.oneofE1, UnknownEnumsMyEnumPlusExtra_EExtra);
-}
-
-//%PDDM-DEFINE TEST_ROUNDTRIP_ONEOF(MESSAGE, FIELD, VALUE)
-//%TEST_ROUNDTRIP_ONEOF_ADV(MESSAGE, FIELD, VALUE, )
-//%PDDM-DEFINE TEST_ROUNDTRIP_ONEOF_ADV(MESSAGE, FIELD, VALUE, EQ_SUFFIX)
-//%  {  // oneof##FIELD
-//%    MESSAGE *orig = [[MESSAGE alloc] init];
-//%    orig.oneof##FIELD = VALUE;
-//%    XCTAssertEqual(orig.oOneOfCase, MESSAGE##_O_OneOfCase_Oneof##FIELD);
-//%    NSData *data = [orig data];
-//%    XCTAssertNotNil(data);
-//%    MESSAGE *msg = [MESSAGE parseFromData:data error:NULL];
-//%    XCTAssertEqual(msg.oOneOfCase, MESSAGE##_O_OneOfCase_Oneof##FIELD);
-//%    XCTAssertEqual##EQ_SUFFIX(msg.oneof##FIELD, VALUE);
-//%    [orig release];
-//%  }
-//%
-//%PDDM-DEFINE TEST_ROUNDTRIP_ONEOFS(SYNTAX, BOOL_NON_DEFAULT)
-//%- (void)testProto##SYNTAX##RoundTripOneof {
-//%
-//%GROUP_INIT##SYNTAX()  Message##SYNTAX *subMessage = [[Message##SYNTAX alloc] init];
-//%  XCTAssertNotNil(subMessage);
-//%  subMessage.optionalInt32 = 666;
-//%
-//%TEST_ROUNDTRIP_ONEOF(Message##SYNTAX, Int32, 1)
-//%TEST_ROUNDTRIP_ONEOF(Message##SYNTAX, Int64, 2)
-//%TEST_ROUNDTRIP_ONEOF(Message##SYNTAX, Uint32, 3U)
-//%TEST_ROUNDTRIP_ONEOF(Message##SYNTAX, Uint64, 4U)
-//%TEST_ROUNDTRIP_ONEOF(Message##SYNTAX, Sint32, 5)
-//%TEST_ROUNDTRIP_ONEOF(Message##SYNTAX, Sint64, 6)
-//%TEST_ROUNDTRIP_ONEOF(Message##SYNTAX, Fixed32, 7U)
-//%TEST_ROUNDTRIP_ONEOF(Message##SYNTAX, Fixed64, 8U)
-//%TEST_ROUNDTRIP_ONEOF(Message##SYNTAX, Sfixed32, 9)
-//%TEST_ROUNDTRIP_ONEOF(Message##SYNTAX, Sfixed64, 10)
-//%TEST_ROUNDTRIP_ONEOF(Message##SYNTAX, Float, 11.0f)
-//%TEST_ROUNDTRIP_ONEOF(Message##SYNTAX, Double, 12.0)
-//%TEST_ROUNDTRIP_ONEOF(Message##SYNTAX, Bool, BOOL_NON_DEFAULT)
-//%TEST_ROUNDTRIP_ONEOF_ADV(Message##SYNTAX, String, @"foo", Objects)
-//%TEST_ROUNDTRIP_ONEOF_ADV(Message##SYNTAX, Bytes, [@"bar" dataUsingEncoding:NSUTF8StringEncoding], Objects)
-//%GROUP_TEST##SYNTAX()TEST_ROUNDTRIP_ONEOF_ADV(Message##SYNTAX, Message, subMessage, Objects)
-//%TEST_ROUNDTRIP_ONEOF(Message##SYNTAX, Enum, Message##SYNTAX##_Enum_Bar)
-//%GROUP_CLEANUP##SYNTAX()  [subMessage release];
-//%}
-//%
-//%PDDM-DEFINE GROUP_INIT2()
-//%  Message2_OneofGroup *group = [[Message2_OneofGroup alloc] init];
-//%  XCTAssertNotNil(group);
-//%  group.a = 777;
-//%
-//%PDDM-DEFINE GROUP_CLEANUP2()
-//%  [group release];
-//%
-//%PDDM-DEFINE GROUP_TEST2()
-//%TEST_ROUNDTRIP_ONEOF_ADV(Message2, Group, group, Objects)
-//%
-//%PDDM-DEFINE GROUP_INIT3()
-// Empty
-//%PDDM-DEFINE GROUP_CLEANUP3()
-// Empty
-//%PDDM-DEFINE GROUP_TEST3()
-//%  // Not "group" in proto3.
-//%
-//%
-//%PDDM-EXPAND TEST_ROUNDTRIP_ONEOFS(2, NO)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-- (void)testProto2RoundTripOneof {
-
-  Message2_OneofGroup *group = [[Message2_OneofGroup alloc] init];
-  XCTAssertNotNil(group);
-  group.a = 777;
-  Message2 *subMessage = [[Message2 alloc] init];
-  XCTAssertNotNil(subMessage);
-  subMessage.optionalInt32 = 666;
-
-  {  // oneofInt32
-    Message2 *orig = [[Message2 alloc] init];
-    orig.oneofInt32 = 1;
-    XCTAssertEqual(orig.oOneOfCase, Message2_O_OneOfCase_OneofInt32);
-    NSData *data = [orig data];
-    XCTAssertNotNil(data);
-    Message2 *msg = [Message2 parseFromData:data error:NULL];
-    XCTAssertEqual(msg.oOneOfCase, Message2_O_OneOfCase_OneofInt32);
-    XCTAssertEqual(msg.oneofInt32, 1);
-    [orig release];
-  }
-
-  {  // oneofInt64
-    Message2 *orig = [[Message2 alloc] init];
-    orig.oneofInt64 = 2;
-    XCTAssertEqual(orig.oOneOfCase, Message2_O_OneOfCase_OneofInt64);
-    NSData *data = [orig data];
-    XCTAssertNotNil(data);
-    Message2 *msg = [Message2 parseFromData:data error:NULL];
-    XCTAssertEqual(msg.oOneOfCase, Message2_O_OneOfCase_OneofInt64);
-    XCTAssertEqual(msg.oneofInt64, 2);
-    [orig release];
-  }
-
-  {  // oneofUint32
-    Message2 *orig = [[Message2 alloc] init];
-    orig.oneofUint32 = 3U;
-    XCTAssertEqual(orig.oOneOfCase, Message2_O_OneOfCase_OneofUint32);
-    NSData *data = [orig data];
-    XCTAssertNotNil(data);
-    Message2 *msg = [Message2 parseFromData:data error:NULL];
-    XCTAssertEqual(msg.oOneOfCase, Message2_O_OneOfCase_OneofUint32);
-    XCTAssertEqual(msg.oneofUint32, 3U);
-    [orig release];
-  }
-
-  {  // oneofUint64
-    Message2 *orig = [[Message2 alloc] init];
-    orig.oneofUint64 = 4U;
-    XCTAssertEqual(orig.oOneOfCase, Message2_O_OneOfCase_OneofUint64);
-    NSData *data = [orig data];
-    XCTAssertNotNil(data);
-    Message2 *msg = [Message2 parseFromData:data error:NULL];
-    XCTAssertEqual(msg.oOneOfCase, Message2_O_OneOfCase_OneofUint64);
-    XCTAssertEqual(msg.oneofUint64, 4U);
-    [orig release];
-  }
-
-  {  // oneofSint32
-    Message2 *orig = [[Message2 alloc] init];
-    orig.oneofSint32 = 5;
-    XCTAssertEqual(orig.oOneOfCase, Message2_O_OneOfCase_OneofSint32);
-    NSData *data = [orig data];
-    XCTAssertNotNil(data);
-    Message2 *msg = [Message2 parseFromData:data error:NULL];
-    XCTAssertEqual(msg.oOneOfCase, Message2_O_OneOfCase_OneofSint32);
-    XCTAssertEqual(msg.oneofSint32, 5);
-    [orig release];
-  }
-
-  {  // oneofSint64
-    Message2 *orig = [[Message2 alloc] init];
-    orig.oneofSint64 = 6;
-    XCTAssertEqual(orig.oOneOfCase, Message2_O_OneOfCase_OneofSint64);
-    NSData *data = [orig data];
-    XCTAssertNotNil(data);
-    Message2 *msg = [Message2 parseFromData:data error:NULL];
-    XCTAssertEqual(msg.oOneOfCase, Message2_O_OneOfCase_OneofSint64);
-    XCTAssertEqual(msg.oneofSint64, 6);
-    [orig release];
-  }
-
-  {  // oneofFixed32
-    Message2 *orig = [[Message2 alloc] init];
-    orig.oneofFixed32 = 7U;
-    XCTAssertEqual(orig.oOneOfCase, Message2_O_OneOfCase_OneofFixed32);
-    NSData *data = [orig data];
-    XCTAssertNotNil(data);
-    Message2 *msg = [Message2 parseFromData:data error:NULL];
-    XCTAssertEqual(msg.oOneOfCase, Message2_O_OneOfCase_OneofFixed32);
-    XCTAssertEqual(msg.oneofFixed32, 7U);
-    [orig release];
-  }
-
-  {  // oneofFixed64
-    Message2 *orig = [[Message2 alloc] init];
-    orig.oneofFixed64 = 8U;
-    XCTAssertEqual(orig.oOneOfCase, Message2_O_OneOfCase_OneofFixed64);
-    NSData *data = [orig data];
-    XCTAssertNotNil(data);
-    Message2 *msg = [Message2 parseFromData:data error:NULL];
-    XCTAssertEqual(msg.oOneOfCase, Message2_O_OneOfCase_OneofFixed64);
-    XCTAssertEqual(msg.oneofFixed64, 8U);
-    [orig release];
-  }
-
-  {  // oneofSfixed32
-    Message2 *orig = [[Message2 alloc] init];
-    orig.oneofSfixed32 = 9;
-    XCTAssertEqual(orig.oOneOfCase, Message2_O_OneOfCase_OneofSfixed32);
-    NSData *data = [orig data];
-    XCTAssertNotNil(data);
-    Message2 *msg = [Message2 parseFromData:data error:NULL];
-    XCTAssertEqual(msg.oOneOfCase, Message2_O_OneOfCase_OneofSfixed32);
-    XCTAssertEqual(msg.oneofSfixed32, 9);
-    [orig release];
-  }
-
-  {  // oneofSfixed64
-    Message2 *orig = [[Message2 alloc] init];
-    orig.oneofSfixed64 = 10;
-    XCTAssertEqual(orig.oOneOfCase, Message2_O_OneOfCase_OneofSfixed64);
-    NSData *data = [orig data];
-    XCTAssertNotNil(data);
-    Message2 *msg = [Message2 parseFromData:data error:NULL];
-    XCTAssertEqual(msg.oOneOfCase, Message2_O_OneOfCase_OneofSfixed64);
-    XCTAssertEqual(msg.oneofSfixed64, 10);
-    [orig release];
-  }
-
-  {  // oneofFloat
-    Message2 *orig = [[Message2 alloc] init];
-    orig.oneofFloat = 11.0f;
-    XCTAssertEqual(orig.oOneOfCase, Message2_O_OneOfCase_OneofFloat);
-    NSData *data = [orig data];
-    XCTAssertNotNil(data);
-    Message2 *msg = [Message2 parseFromData:data error:NULL];
-    XCTAssertEqual(msg.oOneOfCase, Message2_O_OneOfCase_OneofFloat);
-    XCTAssertEqual(msg.oneofFloat, 11.0f);
-    [orig release];
-  }
-
-  {  // oneofDouble
-    Message2 *orig = [[Message2 alloc] init];
-    orig.oneofDouble = 12.0;
-    XCTAssertEqual(orig.oOneOfCase, Message2_O_OneOfCase_OneofDouble);
-    NSData *data = [orig data];
-    XCTAssertNotNil(data);
-    Message2 *msg = [Message2 parseFromData:data error:NULL];
-    XCTAssertEqual(msg.oOneOfCase, Message2_O_OneOfCase_OneofDouble);
-    XCTAssertEqual(msg.oneofDouble, 12.0);
-    [orig release];
-  }
-
-  {  // oneofBool
-    Message2 *orig = [[Message2 alloc] init];
-    orig.oneofBool = NO;
-    XCTAssertEqual(orig.oOneOfCase, Message2_O_OneOfCase_OneofBool);
-    NSData *data = [orig data];
-    XCTAssertNotNil(data);
-    Message2 *msg = [Message2 parseFromData:data error:NULL];
-    XCTAssertEqual(msg.oOneOfCase, Message2_O_OneOfCase_OneofBool);
-    XCTAssertEqual(msg.oneofBool, NO);
-    [orig release];
-  }
-
-  {  // oneofString
-    Message2 *orig = [[Message2 alloc] init];
-    orig.oneofString = @"foo";
-    XCTAssertEqual(orig.oOneOfCase, Message2_O_OneOfCase_OneofString);
-    NSData *data = [orig data];
-    XCTAssertNotNil(data);
-    Message2 *msg = [Message2 parseFromData:data error:NULL];
-    XCTAssertEqual(msg.oOneOfCase, Message2_O_OneOfCase_OneofString);
-    XCTAssertEqualObjects(msg.oneofString, @"foo");
-    [orig release];
-  }
-
-  {  // oneofBytes
-    Message2 *orig = [[Message2 alloc] init];
-    orig.oneofBytes = [@"bar" dataUsingEncoding:NSUTF8StringEncoding];
-    XCTAssertEqual(orig.oOneOfCase, Message2_O_OneOfCase_OneofBytes);
-    NSData *data = [orig data];
-    XCTAssertNotNil(data);
-    Message2 *msg = [Message2 parseFromData:data error:NULL];
-    XCTAssertEqual(msg.oOneOfCase, Message2_O_OneOfCase_OneofBytes);
-    XCTAssertEqualObjects(msg.oneofBytes, [@"bar" dataUsingEncoding:NSUTF8StringEncoding]);
-    [orig release];
-  }
-
-  {  // oneofGroup
-    Message2 *orig = [[Message2 alloc] init];
-    orig.oneofGroup = group;
-    XCTAssertEqual(orig.oOneOfCase, Message2_O_OneOfCase_OneofGroup);
-    NSData *data = [orig data];
-    XCTAssertNotNil(data);
-    Message2 *msg = [Message2 parseFromData:data error:NULL];
-    XCTAssertEqual(msg.oOneOfCase, Message2_O_OneOfCase_OneofGroup);
-    XCTAssertEqualObjects(msg.oneofGroup, group);
-    [orig release];
-  }
-
-  {  // oneofMessage
-    Message2 *orig = [[Message2 alloc] init];
-    orig.oneofMessage = subMessage;
-    XCTAssertEqual(orig.oOneOfCase, Message2_O_OneOfCase_OneofMessage);
-    NSData *data = [orig data];
-    XCTAssertNotNil(data);
-    Message2 *msg = [Message2 parseFromData:data error:NULL];
-    XCTAssertEqual(msg.oOneOfCase, Message2_O_OneOfCase_OneofMessage);
-    XCTAssertEqualObjects(msg.oneofMessage, subMessage);
-    [orig release];
-  }
-
-  {  // oneofEnum
-    Message2 *orig = [[Message2 alloc] init];
-    orig.oneofEnum = Message2_Enum_Bar;
-    XCTAssertEqual(orig.oOneOfCase, Message2_O_OneOfCase_OneofEnum);
-    NSData *data = [orig data];
-    XCTAssertNotNil(data);
-    Message2 *msg = [Message2 parseFromData:data error:NULL];
-    XCTAssertEqual(msg.oOneOfCase, Message2_O_OneOfCase_OneofEnum);
-    XCTAssertEqual(msg.oneofEnum, Message2_Enum_Bar);
-    [orig release];
-  }
-
-  [group release];
-  [subMessage release];
-}
-
-// clang-format on
-//%PDDM-EXPAND TEST_ROUNDTRIP_ONEOFS(3, YES)
-// This block of code is generated, do not edit it directly.
-// clang-format off
-
-- (void)testProto3RoundTripOneof {
-
-  Message3 *subMessage = [[Message3 alloc] init];
-  XCTAssertNotNil(subMessage);
-  subMessage.optionalInt32 = 666;
-
-  {  // oneofInt32
-    Message3 *orig = [[Message3 alloc] init];
-    orig.oneofInt32 = 1;
-    XCTAssertEqual(orig.oOneOfCase, Message3_O_OneOfCase_OneofInt32);
-    NSData *data = [orig data];
-    XCTAssertNotNil(data);
-    Message3 *msg = [Message3 parseFromData:data error:NULL];
-    XCTAssertEqual(msg.oOneOfCase, Message3_O_OneOfCase_OneofInt32);
-    XCTAssertEqual(msg.oneofInt32, 1);
-    [orig release];
-  }
-
-  {  // oneofInt64
-    Message3 *orig = [[Message3 alloc] init];
-    orig.oneofInt64 = 2;
-    XCTAssertEqual(orig.oOneOfCase, Message3_O_OneOfCase_OneofInt64);
-    NSData *data = [orig data];
-    XCTAssertNotNil(data);
-    Message3 *msg = [Message3 parseFromData:data error:NULL];
-    XCTAssertEqual(msg.oOneOfCase, Message3_O_OneOfCase_OneofInt64);
-    XCTAssertEqual(msg.oneofInt64, 2);
-    [orig release];
-  }
-
-  {  // oneofUint32
-    Message3 *orig = [[Message3 alloc] init];
-    orig.oneofUint32 = 3U;
-    XCTAssertEqual(orig.oOneOfCase, Message3_O_OneOfCase_OneofUint32);
-    NSData *data = [orig data];
-    XCTAssertNotNil(data);
-    Message3 *msg = [Message3 parseFromData:data error:NULL];
-    XCTAssertEqual(msg.oOneOfCase, Message3_O_OneOfCase_OneofUint32);
-    XCTAssertEqual(msg.oneofUint32, 3U);
-    [orig release];
-  }
-
-  {  // oneofUint64
-    Message3 *orig = [[Message3 alloc] init];
-    orig.oneofUint64 = 4U;
-    XCTAssertEqual(orig.oOneOfCase, Message3_O_OneOfCase_OneofUint64);
-    NSData *data = [orig data];
-    XCTAssertNotNil(data);
-    Message3 *msg = [Message3 parseFromData:data error:NULL];
-    XCTAssertEqual(msg.oOneOfCase, Message3_O_OneOfCase_OneofUint64);
-    XCTAssertEqual(msg.oneofUint64, 4U);
-    [orig release];
-  }
-
-  {  // oneofSint32
-    Message3 *orig = [[Message3 alloc] init];
-    orig.oneofSint32 = 5;
-    XCTAssertEqual(orig.oOneOfCase, Message3_O_OneOfCase_OneofSint32);
-    NSData *data = [orig data];
-    XCTAssertNotNil(data);
-    Message3 *msg = [Message3 parseFromData:data error:NULL];
-    XCTAssertEqual(msg.oOneOfCase, Message3_O_OneOfCase_OneofSint32);
-    XCTAssertEqual(msg.oneofSint32, 5);
-    [orig release];
-  }
-
-  {  // oneofSint64
-    Message3 *orig = [[Message3 alloc] init];
-    orig.oneofSint64 = 6;
-    XCTAssertEqual(orig.oOneOfCase, Message3_O_OneOfCase_OneofSint64);
-    NSData *data = [orig data];
-    XCTAssertNotNil(data);
-    Message3 *msg = [Message3 parseFromData:data error:NULL];
-    XCTAssertEqual(msg.oOneOfCase, Message3_O_OneOfCase_OneofSint64);
-    XCTAssertEqual(msg.oneofSint64, 6);
-    [orig release];
-  }
-
-  {  // oneofFixed32
-    Message3 *orig = [[Message3 alloc] init];
-    orig.oneofFixed32 = 7U;
-    XCTAssertEqual(orig.oOneOfCase, Message3_O_OneOfCase_OneofFixed32);
-    NSData *data = [orig data];
-    XCTAssertNotNil(data);
-    Message3 *msg = [Message3 parseFromData:data error:NULL];
-    XCTAssertEqual(msg.oOneOfCase, Message3_O_OneOfCase_OneofFixed32);
-    XCTAssertEqual(msg.oneofFixed32, 7U);
-    [orig release];
-  }
-
-  {  // oneofFixed64
-    Message3 *orig = [[Message3 alloc] init];
-    orig.oneofFixed64 = 8U;
-    XCTAssertEqual(orig.oOneOfCase, Message3_O_OneOfCase_OneofFixed64);
-    NSData *data = [orig data];
-    XCTAssertNotNil(data);
-    Message3 *msg = [Message3 parseFromData:data error:NULL];
-    XCTAssertEqual(msg.oOneOfCase, Message3_O_OneOfCase_OneofFixed64);
-    XCTAssertEqual(msg.oneofFixed64, 8U);
-    [orig release];
-  }
-
-  {  // oneofSfixed32
-    Message3 *orig = [[Message3 alloc] init];
-    orig.oneofSfixed32 = 9;
-    XCTAssertEqual(orig.oOneOfCase, Message3_O_OneOfCase_OneofSfixed32);
-    NSData *data = [orig data];
-    XCTAssertNotNil(data);
-    Message3 *msg = [Message3 parseFromData:data error:NULL];
-    XCTAssertEqual(msg.oOneOfCase, Message3_O_OneOfCase_OneofSfixed32);
-    XCTAssertEqual(msg.oneofSfixed32, 9);
-    [orig release];
-  }
-
-  {  // oneofSfixed64
-    Message3 *orig = [[Message3 alloc] init];
-    orig.oneofSfixed64 = 10;
-    XCTAssertEqual(orig.oOneOfCase, Message3_O_OneOfCase_OneofSfixed64);
-    NSData *data = [orig data];
-    XCTAssertNotNil(data);
-    Message3 *msg = [Message3 parseFromData:data error:NULL];
-    XCTAssertEqual(msg.oOneOfCase, Message3_O_OneOfCase_OneofSfixed64);
-    XCTAssertEqual(msg.oneofSfixed64, 10);
-    [orig release];
-  }
-
-  {  // oneofFloat
-    Message3 *orig = [[Message3 alloc] init];
-    orig.oneofFloat = 11.0f;
-    XCTAssertEqual(orig.oOneOfCase, Message3_O_OneOfCase_OneofFloat);
-    NSData *data = [orig data];
-    XCTAssertNotNil(data);
-    Message3 *msg = [Message3 parseFromData:data error:NULL];
-    XCTAssertEqual(msg.oOneOfCase, Message3_O_OneOfCase_OneofFloat);
-    XCTAssertEqual(msg.oneofFloat, 11.0f);
-    [orig release];
-  }
-
-  {  // oneofDouble
-    Message3 *orig = [[Message3 alloc] init];
-    orig.oneofDouble = 12.0;
-    XCTAssertEqual(orig.oOneOfCase, Message3_O_OneOfCase_OneofDouble);
-    NSData *data = [orig data];
-    XCTAssertNotNil(data);
-    Message3 *msg = [Message3 parseFromData:data error:NULL];
-    XCTAssertEqual(msg.oOneOfCase, Message3_O_OneOfCase_OneofDouble);
-    XCTAssertEqual(msg.oneofDouble, 12.0);
-    [orig release];
-  }
-
-  {  // oneofBool
-    Message3 *orig = [[Message3 alloc] init];
-    orig.oneofBool = YES;
-    XCTAssertEqual(orig.oOneOfCase, Message3_O_OneOfCase_OneofBool);
-    NSData *data = [orig data];
-    XCTAssertNotNil(data);
-    Message3 *msg = [Message3 parseFromData:data error:NULL];
-    XCTAssertEqual(msg.oOneOfCase, Message3_O_OneOfCase_OneofBool);
-    XCTAssertEqual(msg.oneofBool, YES);
-    [orig release];
-  }
-
-  {  // oneofString
-    Message3 *orig = [[Message3 alloc] init];
-    orig.oneofString = @"foo";
-    XCTAssertEqual(orig.oOneOfCase, Message3_O_OneOfCase_OneofString);
-    NSData *data = [orig data];
-    XCTAssertNotNil(data);
-    Message3 *msg = [Message3 parseFromData:data error:NULL];
-    XCTAssertEqual(msg.oOneOfCase, Message3_O_OneOfCase_OneofString);
-    XCTAssertEqualObjects(msg.oneofString, @"foo");
-    [orig release];
-  }
-
-  {  // oneofBytes
-    Message3 *orig = [[Message3 alloc] init];
-    orig.oneofBytes = [@"bar" dataUsingEncoding:NSUTF8StringEncoding];
-    XCTAssertEqual(orig.oOneOfCase, Message3_O_OneOfCase_OneofBytes);
-    NSData *data = [orig data];
-    XCTAssertNotNil(data);
-    Message3 *msg = [Message3 parseFromData:data error:NULL];
-    XCTAssertEqual(msg.oOneOfCase, Message3_O_OneOfCase_OneofBytes);
-    XCTAssertEqualObjects(msg.oneofBytes, [@"bar" dataUsingEncoding:NSUTF8StringEncoding]);
-    [orig release];
-  }
-
-  // Not "group" in proto3.
-
-  {  // oneofMessage
-    Message3 *orig = [[Message3 alloc] init];
-    orig.oneofMessage = subMessage;
-    XCTAssertEqual(orig.oOneOfCase, Message3_O_OneOfCase_OneofMessage);
-    NSData *data = [orig data];
-    XCTAssertNotNil(data);
-    Message3 *msg = [Message3 parseFromData:data error:NULL];
-    XCTAssertEqual(msg.oOneOfCase, Message3_O_OneOfCase_OneofMessage);
-    XCTAssertEqualObjects(msg.oneofMessage, subMessage);
-    [orig release];
-  }
-
-  {  // oneofEnum
-    Message3 *orig = [[Message3 alloc] init];
-    orig.oneofEnum = Message3_Enum_Bar;
-    XCTAssertEqual(orig.oOneOfCase, Message3_O_OneOfCase_OneofEnum);
-    NSData *data = [orig data];
-    XCTAssertNotNil(data);
-    Message3 *msg = [Message3 parseFromData:data error:NULL];
-    XCTAssertEqual(msg.oOneOfCase, Message3_O_OneOfCase_OneofEnum);
-    XCTAssertEqual(msg.oneofEnum, Message3_Enum_Bar);
-    [orig release];
-  }
-
-  [subMessage release];
-}
-
-// clang-format on
-//%PDDM-EXPAND-END (2 expansions)
-
-- (void)testPackedUnpackedMessageParsing {
-  // packed is optional, a repeated field should parse when packed or unpacked.
-
-  TestPackedTypes *packedOrig = [TestPackedTypes message];
-  TestUnpackedTypes *unpackedOrig = [TestUnpackedTypes message];
-  [self setPackedFields:packedOrig repeatedCount:4];
-  [self setUnpackedFields:unpackedOrig repeatedCount:4];
-
-  NSData *packedData = [packedOrig data];
-  NSData *unpackedData = [unpackedOrig data];
-  XCTAssertNotNil(packedData);
-  XCTAssertNotNil(unpackedData);
-  XCTAssertNotEqualObjects(packedData, unpackedData,
-                           @"Data should differ (packed vs unpacked) use");
-
-  NSError *error = nil;
-  TestPackedTypes *packedParse =
-      [TestPackedTypes parseFromData:unpackedData error:&error];
-  XCTAssertNotNil(packedParse);
-  XCTAssertNil(error);
-  XCTAssertEqualObjects(packedParse, packedOrig);
-
-  error = nil;
-  TestUnpackedTypes *unpackedParsed =
-      [TestUnpackedTypes parseFromData:packedData error:&error];
-  XCTAssertNotNil(unpackedParsed);
-  XCTAssertNil(error);
-  XCTAssertEqualObjects(unpackedParsed, unpackedOrig);
-}
-
-- (void)testPackedUnpackedExtensionParsing {
-  // packed is optional, a repeated extension should parse when packed or
-  // unpacked.
-
-  TestPackedExtensions *packedOrig = [TestPackedExtensions message];
-  TestUnpackedExtensions *unpackedOrig = [TestUnpackedExtensions message];
-  [self setPackedExtensions:packedOrig repeatedCount:kGPBDefaultRepeatCount];
-  [self setUnpackedExtensions:unpackedOrig repeatedCount:kGPBDefaultRepeatCount];
-
-  NSData *packedData = [packedOrig data];
-  NSData *unpackedData = [unpackedOrig data];
-  XCTAssertNotNil(packedData);
-  XCTAssertNotNil(unpackedData);
-  XCTAssertNotEqualObjects(packedData, unpackedData,
-                           @"Data should differ (packed vs unpacked) use");
-
-  NSError *error = nil;
-  TestPackedExtensions *packedParse =
-      [TestPackedExtensions parseFromData:unpackedData
-                        extensionRegistry:[UnittestRoot extensionRegistry]
-                                    error:&error];
-  XCTAssertNotNil(packedParse);
-  XCTAssertNil(error);
-  XCTAssertEqualObjects(packedParse, packedOrig);
-
-  error = nil;
-  TestUnpackedExtensions *unpackedParsed =
-      [TestUnpackedExtensions parseFromData:packedData
-                          extensionRegistry:[UnittestRoot extensionRegistry]
-                                      error:&error];
-  XCTAssertNotNil(unpackedParsed);
-  XCTAssertNil(error);
-  XCTAssertEqualObjects(unpackedParsed, unpackedOrig);
-}
-
-- (void)testPackedExtensionVsFieldParsing {
-  // Extensions and fields end up on the wire the same way, so they can parse
-  // each other.
-
-  TestPackedTypes *fieldsOrig = [TestPackedTypes message];
-  TestPackedExtensions *extsOrig = [TestPackedExtensions message];
-  [self setPackedFields:fieldsOrig repeatedCount:kGPBDefaultRepeatCount];
-  [self setPackedExtensions:extsOrig repeatedCount:kGPBDefaultRepeatCount];
-
-  NSData *fieldsData = [fieldsOrig data];
-  NSData *extsData = [extsOrig data];
-  XCTAssertNotNil(fieldsData);
-  XCTAssertNotNil(extsData);
-  XCTAssertEqualObjects(fieldsData, extsData);
-
-  NSError *error = nil;
-  TestPackedTypes *fieldsParse =
-      [TestPackedTypes parseFromData:extsData error:&error];
-  XCTAssertNotNil(fieldsParse);
-  XCTAssertNil(error);
-  XCTAssertEqualObjects(fieldsParse, fieldsOrig);
-
-  error = nil;
-  TestPackedExtensions *extsParse =
-      [TestPackedExtensions parseFromData:fieldsData
-                        extensionRegistry:[UnittestRoot extensionRegistry]
-                                    error:&error];
-  XCTAssertNotNil(extsParse);
-  XCTAssertNil(error);
-  XCTAssertEqualObjects(extsParse, extsOrig);
-}
-
-- (void)testUnpackedExtensionVsFieldParsing {
-  // Extensions and fields end up on the wire the same way, so they can parse
-  // each other.
-
-  TestUnpackedTypes *fieldsOrig = [TestUnpackedTypes message];
-  TestUnpackedExtensions *extsOrig = [TestUnpackedExtensions message];
-  [self setUnpackedFields:fieldsOrig repeatedCount:3];
-  [self setUnpackedExtensions:extsOrig repeatedCount:3];
-
-  NSData *fieldsData = [fieldsOrig data];
-  NSData *extsData = [extsOrig data];
-  XCTAssertNotNil(fieldsData);
-  XCTAssertNotNil(extsData);
-  XCTAssertEqualObjects(fieldsData, extsData);
-
-  TestUnpackedTypes *fieldsParse =
-      [TestUnpackedTypes parseFromData:extsData error:NULL];
-  XCTAssertNotNil(fieldsParse);
-  XCTAssertEqualObjects(fieldsParse, fieldsOrig);
-
-  TestUnpackedExtensions *extsParse =
-      [TestUnpackedExtensions parseFromData:fieldsData
-                          extensionRegistry:[UnittestRoot extensionRegistry]
-                                      error:NULL];
-  XCTAssertNotNil(extsParse);
-  XCTAssertEqualObjects(extsParse, extsOrig);
-}
-
-- (void)testErrorSubsectionInvalidLimit {
-  NSData *data = DataFromCStr(
-      "\x0A\x08\x0A\x07\x12\x04\x72\x02\x4B\x50\x12\x04\x72\x02\x4B\x50");
-  NSError *error = nil;
-  NestedTestAllTypes *msg = [NestedTestAllTypes parseFromData:data
-                                                        error:&error];
-  XCTAssertNil(msg);
-  XCTAssertNotNil(error);
-  XCTAssertEqualObjects(error.domain, GPBCodedInputStreamErrorDomain);
-  XCTAssertEqual(error.code, GPBCodedInputStreamErrorInvalidSubsectionLimit);
-}
-
-- (void)testErrorSubsectionLimitReached {
-  NSData *data = DataFromCStr("\x0A\x06\x12\x03\x72\x02\x4B\x50");
-  NSError *error = nil;
-  NestedTestAllTypes *msg = [NestedTestAllTypes parseFromData:data
-                                                        error:&error];
-  XCTAssertNil(msg);
-  XCTAssertNotNil(error);
-  XCTAssertEqualObjects(error.domain, GPBCodedInputStreamErrorDomain);
-  XCTAssertEqual(error.code, GPBCodedInputStreamErrorSubsectionLimitReached);
-}
-
-- (void)testErrorInvalidVarint {
-  NSData *data = DataFromCStr("\x72\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF");
-  NSError *error = nil;
-  TestAllTypes *msg = [TestAllTypes parseFromData:data error:&error];
-  XCTAssertNil(msg);
-  XCTAssertNotNil(error);
-  XCTAssertEqualObjects(error.domain, GPBCodedInputStreamErrorDomain);
-  XCTAssertEqual(error.code, GPBCodedInputStreamErrorInvalidVarInt);
-}
-
-- (void)testErrorInvalidUTF8 {
-  NSData *data = DataFromCStr("\x72\x04\xF4\xFF\xFF\xFF");
-  NSError *error = nil;
-  TestAllTypes *msg = [TestAllTypes parseFromData:data error:&error];
-  XCTAssertNil(msg);
-  XCTAssertNotNil(error);
-  XCTAssertEqualObjects(error.domain, GPBCodedInputStreamErrorDomain);
-  XCTAssertEqual(error.code, GPBCodedInputStreamErrorInvalidUTF8);
-}
-
-- (void)testErrorInvalidSize {
-  NSData *data = DataFromCStr("\x72\x03\x4B\x50");
-  NSError *error = nil;
-  NestedTestAllTypes *msg = [NestedTestAllTypes parseFromData:data
-                                                        error:&error];
-  XCTAssertNil(msg);
-  XCTAssertNotNil(error);
-  XCTAssertEqualObjects(error.domain, GPBCodedInputStreamErrorDomain);
-  XCTAssertEqual(error.code, GPBCodedInputStreamErrorInvalidSize);
-}
-
-- (void)testErrorInvalidTag {
-  NSData *data = DataFromCStr("\x0F");
-  NSError *error = nil;
-  NestedTestAllTypes *msg = [NestedTestAllTypes parseFromData:data
-                                                        error:&error];
-  XCTAssertNil(msg);
-  XCTAssertNotNil(error);
-  XCTAssertEqualObjects(error.domain, GPBCodedInputStreamErrorDomain);
-  XCTAssertEqual(error.code, GPBCodedInputStreamErrorInvalidTag);
-}
-
-- (void)testZeroFieldNum {
-  // These are ConformanceTestSuite::TestIllegalTags.
-
-  const char *tests[] = {
-    "\1DEADBEEF",
-    "\2\1\1",
-    "\3\4",
-    "\5DEAD"
-  };
-
-  for (size_t i = 0; i < GPBARRAYSIZE(tests); ++i) {
-    NSData *data = DataFromCStr(tests[i]);
-
-    {
-      // Message from proto2 syntax file
-      NSError *error = nil;
-      Message2 *msg = [Message2 parseFromData:data error:&error];
-      XCTAssertNil(msg, @"i = %zd", i);
-      XCTAssertNotNil(error, @"i = %zd", i);
-      XCTAssertEqualObjects(error.domain, GPBCodedInputStreamErrorDomain, @"i = %zd", i);
-      XCTAssertEqual(error.code, GPBCodedInputStreamErrorInvalidTag, @"i = %zd", i);
-    }
-
-    {
-      // Message from proto3 syntax file
-      NSError *error = nil;
-      Message3 *msg = [Message3 parseFromData:data error:&error];
-      XCTAssertNil(msg, @"i = %zd", i);
-      XCTAssertNotNil(error, @"i = %zd", i);
-      XCTAssertEqualObjects(error.domain, GPBCodedInputStreamErrorDomain, @"i = %zd", i);
-      XCTAssertEqual(error.code, GPBCodedInputStreamErrorInvalidTag, @"i = %zd", i);
-    }
-  }
-}
-
-- (void)testErrorRecursionDepthReached {
-  NSData *data = DataFromCStr(
-      "\x0A\xF2\x01\x0A\xEF\x01\x0A\xEC\x01\x0A\xE9\x01\x0A\xE6\x01"
-      "\x0A\xE3\x01\x0A\xE0\x01\x0A\xDD\x01\x0A\xDA\x01\x0A\xD7\x01"
-      "\x0A\xD4\x01\x0A\xD1\x01\x0A\xCE\x01\x0A\xCB\x01\x0A\xC8\x01"
-      "\x0A\xC5\x01\x0A\xC2\x01\x0A\xBF\x01\x0A\xBC\x01\x0A\xB9\x01"
-      "\x0A\xB6\x01\x0A\xB3\x01\x0A\xB0\x01\x0A\xAD\x01\x0A\xAA\x01"
-      "\x0A\xA7\x01\x0A\xA4\x01\x0A\xA1\x01\x0A\x9E\x01\x0A\x9B\x01"
-      "\x0A\x98\x01\x0A\x95\x01\x0A\x92\x01\x0A\x8F\x01\x0A\x8C\x01"
-      "\x0A\x89\x01\x0A\x86\x01\x0A\x83\x01\x0A\x80\x01\x0A\x7E"
-      "\x0A\x7C\x0A\x7A\x0A\x78\x0A\x76\x0A\x74\x0A\x72\x0A\x70"
-      "\x0A\x6E\x0A\x6C\x0A\x6A\x0A\x68\x0A\x66\x0A\x64\x0A\x62"
-      "\x0A\x60\x0A\x5E\x0A\x5C\x0A\x5A\x0A\x58\x0A\x56\x0A\x54"
-      "\x0A\x52\x0A\x50\x0A\x4E\x0A\x4C\x0A\x4A\x0A\x48\x0A\x46"
-      "\x0A\x44\x0A\x42\x0A\x40\x0A\x3E\x0A\x3C\x0A\x3A\x0A\x38"
-      "\x0A\x36\x0A\x34\x0A\x32\x0A\x30\x0A\x2E\x0A\x2C\x0A\x2A"
-      "\x0A\x28\x0A\x26\x0A\x24\x0A\x22\x0A\x20\x0A\x1E\x0A\x1C"
-      "\x0A\x1A\x0A\x18\x0A\x16\x0A\x14\x0A\x12\x0A\x10\x0A\x0E"
-      "\x0A\x0C\x0A\x0A\x0A\x08\x0A\x06\x12\x04\x72\x02\x4B\x50");
-  NSError *error = nil;
-  NestedTestAllTypes *msg = [NestedTestAllTypes parseFromData:data
-                                                        error:&error];
-  XCTAssertNil(msg);
-  XCTAssertNotNil(error);
-  XCTAssertEqualObjects(error.domain, GPBCodedInputStreamErrorDomain);
-  XCTAssertEqual(error.code, GPBCodedInputStreamErrorRecursionDepthExceeded);
-}
-
-- (void)testParseDelimitedDataWithNegativeSize {
-  NSData *data = DataFromCStr("\xFF\xFF\xFF\xFF\x0F");
-  GPBCodedInputStream *input = [GPBCodedInputStream streamWithData:data];
-  NSError *error;
-  [GPBMessage parseDelimitedFromCodedInputStream:input
-                               extensionRegistry:nil
-                                           error:&error];
-  XCTAssertNil(error);
-}
-
-#ifdef DEBUG
-- (void)testErrorMissingRequiredField {
-  NSData *data = DataFromCStr("");
-  NSError *error = nil;
-  TestRequired *msg = [TestRequired parseFromData:data error:&error];
-  XCTAssertNil(msg);
-  XCTAssertNotNil(error);
-  XCTAssertEqualObjects(error.domain, GPBMessageErrorDomain);
-  XCTAssertEqual(error.code, GPBMessageErrorCodeMissingRequiredField);
-}
-#endif
-
-#pragma mark - Subset from from map_tests.cc
-
-// TEST(GeneratedMapFieldTest, StandardWireFormat)
-- (void)testMap_StandardWireFormat {
-  NSData *data = DataFromCStr("\x0A\x04\x08\x01\x10\x01");
-
-  TestMap *msg = [[TestMap alloc] initWithData:data error:NULL];
-  XCTAssertEqual(msg.mapInt32Int32.count, 1U);
-  int32_t val = 666;
-  XCTAssertTrue([msg.mapInt32Int32 getInt32:&val forKey:1]);
-  XCTAssertEqual(val, 1);
-
-  [msg release];
-}
-
-// TEST(GeneratedMapFieldTest, UnorderedWireFormat)
-- (void)testMap_UnorderedWireFormat {
-  // put value before key in wire format
-  NSData *data = DataFromCStr("\x0A\x04\x10\x01\x08\x02");
-
-  TestMap *msg = [[TestMap alloc] initWithData:data error:NULL];
-  XCTAssertEqual(msg.mapInt32Int32.count, 1U);
-  int32_t val = 666;
-  XCTAssertTrue([msg.mapInt32Int32 getInt32:&val forKey:2]);
-  XCTAssertEqual(val, 1);
-
-  [msg release];
-}
-
-// TEST(GeneratedMapFieldTest, DuplicatedKeyWireFormat)
-- (void)testMap_DuplicatedKeyWireFormat {
-  // Two key fields in wire format
-  NSData *data = DataFromCStr("\x0A\x06\x08\x01\x08\x02\x10\x01");
-
-  TestMap *msg = [[TestMap alloc] initWithData:data error:NULL];
-  XCTAssertEqual(msg.mapInt32Int32.count, 1U);
-  int32_t val = 666;
-  XCTAssertTrue([msg.mapInt32Int32 getInt32:&val forKey:2]);
-  XCTAssertEqual(val, 1);
-
-  [msg release];
-}
-
-// TEST(GeneratedMapFieldTest, DuplicatedValueWireFormat)
-- (void)testMap_DuplicatedValueWireFormat {
-  // Two value fields in wire format
-  NSData *data = DataFromCStr("\x0A\x06\x08\x01\x10\x01\x10\x02");
-
-  TestMap *msg = [[TestMap alloc] initWithData:data error:NULL];
-  XCTAssertEqual(msg.mapInt32Int32.count, 1U);
-  int32_t val = 666;
-  XCTAssertTrue([msg.mapInt32Int32 getInt32:&val forKey:1]);
-  XCTAssertEqual(val, 2);
-
-  [msg release];
-}
-
-// TEST(GeneratedMapFieldTest, MissedKeyWireFormat)
-- (void)testMap_MissedKeyWireFormat {
-  // No key field in wire format
-  NSData *data = DataFromCStr("\x0A\x02\x10\x01");
-
-  TestMap *msg = [[TestMap alloc] initWithData:data error:NULL];
-  XCTAssertEqual(msg.mapInt32Int32.count, 1U);
-  int32_t val = 666;
-  XCTAssertTrue([msg.mapInt32Int32 getInt32:&val forKey:0]);
-  XCTAssertEqual(val, 1);
-
-  [msg release];
-}
-
-// TEST(GeneratedMapFieldTest, MissedValueWireFormat)
-- (void)testMap_MissedValueWireFormat {
-  // No value field in wire format
-  NSData *data = DataFromCStr("\x0A\x02\x08\x01");
-
-  TestMap *msg = [[TestMap alloc] initWithData:data error:NULL];
-  XCTAssertEqual(msg.mapInt32Int32.count, 1U);
-  int32_t val = 666;
-  XCTAssertTrue([msg.mapInt32Int32 getInt32:&val forKey:1]);
-  XCTAssertEqual(val, 0);
-
-  [msg release];
-}
-
-// TEST(GeneratedMapFieldTest, UnknownFieldWireFormat)
-- (void)testMap_UnknownFieldWireFormat {
-  // Unknown field in wire format
-  NSData *data = DataFromCStr("\x0A\x06\x08\x02\x10\x03\x18\x01");
-
-  TestMap *msg = [[TestMap alloc] initWithData:data error:NULL];
-  XCTAssertEqual(msg.mapInt32Int32.count, 1U);
-  int32_t val = 666;
-  XCTAssertTrue([msg.mapInt32Int32 getInt32:&val forKey:2]);
-  XCTAssertEqual(val, 3);
-
-  [msg release];
-}
-
-// TEST(GeneratedMapFieldTest, CorruptedWireFormat)
-- (void)testMap_CorruptedWireFormat {
-  // corrupted data in wire format
-  NSData *data = DataFromCStr("\x0A\x06\x08\x02\x11\x03");
-
-  NSError *error = nil;
-  TestMap *msg = [TestMap parseFromData:data error:&error];
-  XCTAssertNil(msg);
-  XCTAssertNotNil(error);
-  XCTAssertEqualObjects(error.domain, GPBCodedInputStreamErrorDomain);
-  XCTAssertEqual(error.code, GPBCodedInputStreamErrorInvalidSubsectionLimit);
-}
-
-// TEST(GeneratedMapFieldTest, Proto2UnknownEnum)
-- (void)testMap_Proto2UnknownEnum {
-  TestEnumMapPlusExtra *orig = [[TestEnumMapPlusExtra alloc] init];
-
-  orig.knownMapField = [[[GPBInt32EnumDictionary alloc]
-      initWithValidationFunction:Proto2MapEnumPlusExtra_IsValidValue] autorelease];
-  orig.unknownMapField = [[[GPBInt32EnumDictionary alloc]
-      initWithValidationFunction:Proto2MapEnumPlusExtra_IsValidValue] autorelease];
-  [orig.knownMapField setEnum:Proto2MapEnumPlusExtra_EProto2MapEnumFoo
-                       forKey:0];
-  [orig.unknownMapField setEnum:Proto2MapEnumPlusExtra_EProto2MapEnumExtra
-                         forKey:0];
-
-  NSData *data = [orig data];
-  XCTAssertNotNil(data);
-  TestEnumMap *msg1 = [TestEnumMap parseFromData:data error:NULL];
-  XCTAssertEqual(msg1.knownMapField.count, 1U);
-  int32_t val = -1;
-  XCTAssertTrue([msg1.knownMapField getEnum:&val forKey:0]);
-  XCTAssertEqual(val, Proto2MapEnum_Proto2MapEnumFoo);
-  XCTAssertEqual(msg1.unknownFields.countOfFields, 1U);
-
-  data = [msg1 data];
-  TestEnumMapPlusExtra *msg2 =
-      [TestEnumMapPlusExtra parseFromData:data error:NULL];
-  val = -1;
-  XCTAssertEqual(msg2.knownMapField.count, 1U);
-  XCTAssertTrue([msg2.knownMapField getEnum:&val forKey:0]);
-  XCTAssertEqual(val, Proto2MapEnumPlusExtra_EProto2MapEnumFoo);
-  val = -1;
-  XCTAssertEqual(msg2.unknownMapField.count, 1U);
-  XCTAssertTrue([msg2.unknownMapField getEnum:&val forKey:0]);
-  XCTAssertEqual(val, Proto2MapEnumPlusExtra_EProto2MapEnumExtra);
-  XCTAssertEqual(msg2.unknownFields.countOfFields, 0U);
-
-  XCTAssertEqualObjects(orig, msg2);
-
-  [orig release];
-}
-
-#pragma mark - Map Round Tripping
-
-- (void)testProto2MapRoundTripping {
-  Message2 *msg = [[Message2 alloc] init];
-
-  // Key/Value data should result in different byte lengths on wire to ensure
-  // everything is right.
-  [msg.mapInt32Int32 setInt32:1000 forKey:200];
-  [msg.mapInt32Int32 setInt32:101 forKey:2001];
-  [msg.mapInt64Int64 setInt64:1002 forKey:202];
-  [msg.mapInt64Int64 setInt64:103 forKey:2003];
-  [msg.mapInt64Int64 setInt64:4294967296 forKey:4294967297];
-  [msg.mapUint32Uint32 setUInt32:1004 forKey:204];
-  [msg.mapUint32Uint32 setUInt32:105 forKey:2005];
-  [msg.mapUint64Uint64 setUInt64:1006 forKey:206];
-  [msg.mapUint64Uint64 setUInt64:107 forKey:2007];
-  [msg.mapUint64Uint64 setUInt64:4294967298 forKey:4294967299];
-  [msg.mapSint32Sint32 setInt32:1008 forKey:208];
-  [msg.mapSint32Sint32 setInt32:109 forKey:2009];
-  [msg.mapSint64Sint64 setInt64:1010 forKey:210];
-  [msg.mapSint64Sint64 setInt64:111 forKey:2011];
-  [msg.mapSint64Sint64 setInt64:4294967300 forKey:4294967301];
-  [msg.mapFixed32Fixed32 setUInt32:1012 forKey:212];
-  [msg.mapFixed32Fixed32 setUInt32:113 forKey:2013];
-  [msg.mapFixed64Fixed64 setUInt64:1014 forKey:214];
-  [msg.mapFixed64Fixed64 setUInt64:115 forKey:2015];
-  [msg.mapFixed64Fixed64 setUInt64:4294967302 forKey:4294967303];
-  [msg.mapSfixed32Sfixed32 setInt32:1016 forKey:216];
-  [msg.mapSfixed32Sfixed32 setInt32:117 forKey:2017];
-  [msg.mapSfixed64Sfixed64 setInt64:1018 forKey:218];
-  [msg.mapSfixed64Sfixed64 setInt64:119 forKey:2019];
-  [msg.mapSfixed64Sfixed64 setInt64:4294967304 forKey:4294967305];
-  [msg.mapInt32Float setFloat:1020.f forKey:220];
-  [msg.mapInt32Float setFloat:121.f forKey:2021];
-  [msg.mapInt32Double setDouble:1022. forKey:222];
-  [msg.mapInt32Double setDouble:123. forKey:2023];
-  [msg.mapBoolBool setBool:false forKey:true];
-  [msg.mapBoolBool setBool:true forKey:false];
-  msg.mapStringString[@"224"] = @"1024";
-  msg.mapStringString[@"2025"] = @"125";
-  msg.mapStringBytes[@"226"] = DataFromCStr("1026");
-  msg.mapStringBytes[@"2027"] = DataFromCStr("127");
-  Message2 *val1 = [[Message2 alloc] init];
-  val1.optionalInt32 = 1028;
-  Message2 *val2 = [[Message2 alloc] init];
-  val2.optionalInt32 = 129;
-  [msg.mapStringMessage setObject:val1 forKey:@"228"];
-  [msg.mapStringMessage setObject:val2 forKey:@"2029"];
-  [msg.mapInt32Bytes setObject:DataFromCStr("1030 bytes") forKey:230];
-  [msg.mapInt32Bytes setObject:DataFromCStr("131") forKey:2031];
-  [msg.mapInt32Enum setEnum:Message2_Enum_Bar forKey:232];
-  [msg.mapInt32Enum setEnum:Message2_Enum_Baz forKey:2033];
-  Message2 *val3 = [[Message2 alloc] init];
-  val3.optionalInt32 = 1034;
-  Message2 *val4 = [[Message2 alloc] init];
-  val4.optionalInt32 = 135;
-  [msg.mapInt32Message setObject:val3 forKey:234];
-  [msg.mapInt32Message setObject:val4 forKey:2035];
-
-  NSData *data = [msg data];
-  XCTAssertNotNil(data);
-  Message2 *msg2 = [[Message2 alloc] initWithData:data error:NULL];
-
-  XCTAssertNotEqual(msg2, msg);  // Pointer comparison
-  XCTAssertEqualObjects(msg2, msg);
-
-  [val4 release];
-  [val3 release];
-  [val2 release];
-  [val1 release];
-  [msg2 release];
-  [msg release];
-}
-
-@end
diff --git a/libs/protobuf/objectivec/Tests/GPBMessageTests.m b/libs/protobuf/objectivec/Tests/GPBMessageTests.m
deleted file mode 100644
index b2c75ba..0000000
--- a/libs/protobuf/objectivec/Tests/GPBMessageTests.m
+++ /dev/null
@@ -1,2310 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#import "GPBTestUtilities.h"
-
-#import <objc/runtime.h>
-
-#import "GPBArray_PackagePrivate.h"
-#import "GPBDescriptor.h"
-#import "GPBDictionary_PackagePrivate.h"
-#import "GPBMessage_PackagePrivate.h"
-#import "GPBUnknownField_PackagePrivate.h"
-#import "GPBUnknownFieldSet_PackagePrivate.h"
-#import "google/protobuf/Unittest.pbobjc.h"
-#import "google/protobuf/UnittestObjc.pbobjc.h"
-#import "google/protobuf/UnittestObjcOptions.pbobjc.h"
-#import "google/protobuf/UnittestImport.pbobjc.h"
-
-// Helper class to test KVO.
-@interface GPBKVOTestObserver : NSObject {
-  id observee_;
-  NSString *keyPath_;
-}
-
-@property (nonatomic) BOOL didObserve;
-- (id)initWithObservee:(id)observee keyPath:(NSString *)keyPath;
-@end
-
-@implementation GPBKVOTestObserver
-
-@synthesize didObserve;
-
-- (id)initWithObservee:(id)observee keyPath:(NSString *)keyPath {
-  if (self = [super init]) {
-    observee_ = [observee retain];
-    keyPath_ = [keyPath copy];
-    [observee_ addObserver:self forKeyPath:keyPath_ options:0 context:NULL];
-  }
-  return self;
-}
-
-- (void)dealloc {
-  [observee_ removeObserver:self forKeyPath:keyPath_];
-  [observee_ release];
-  [keyPath_ release];
-  [super dealloc];
-}
-
-- (void)observeValueForKeyPath:(NSString *)keyPath
-                      ofObject:(id)object
-                        change:(NSDictionary *)change
-                       context:(void *)context
-{
-#pragma unused(object)
-#pragma unused(change)
-#pragma unused(context)
-  if ([keyPath isEqualToString:keyPath_]) {
-    self.didObserve = YES;
-  }
-}
-
-@end
-
-@interface MessageTests : GPBTestCase
-@end
-
-@implementation MessageTests
-
-// TODO(thomasvl): this should get split into a few files of logic junks, it is
-// a jumble of things at the moment (and the testutils have a bunch of the real
-// assertions).
-
-- (TestAllTypes *)mergeSource {
-  TestAllTypes *message = [TestAllTypes message];
-  [message setOptionalInt32:1];
-  [message setOptionalString:@"foo"];
-  [message setOptionalForeignMessage:[ForeignMessage message]];
-  [message.repeatedStringArray addObject:@"bar"];
-  return message;
-}
-
-- (TestAllTypes *)mergeDestination {
-  TestAllTypes *message = [TestAllTypes message];
-  [message setOptionalInt64:2];
-  [message setOptionalString:@"baz"];
-  ForeignMessage *foreignMessage = [ForeignMessage message];
-  [foreignMessage setC:3];
-  [message setOptionalForeignMessage:foreignMessage];
-  [message.repeatedStringArray addObject:@"qux"];
-  return message;
-}
-
-- (TestAllTypes *)mergeDestinationWithoutForeignMessageIvar {
-  TestAllTypes *message = [TestAllTypes message];
-  [message setOptionalInt64:2];
-  [message setOptionalString:@"baz"];
-  [message.repeatedStringArray addObject:@"qux"];
-  return message;
-}
-
-- (TestAllTypes *)mergeResult {
-  TestAllTypes *message = [TestAllTypes message];
-  [message setOptionalInt32:1];
-  [message setOptionalInt64:2];
-  [message setOptionalString:@"foo"];
-  ForeignMessage *foreignMessage = [ForeignMessage message];
-  [foreignMessage setC:3];
-  [message setOptionalForeignMessage:foreignMessage];
-  [message.repeatedStringArray addObject:@"qux"];
-  [message.repeatedStringArray addObject:@"bar"];
-  return message;
-}
-
-- (TestAllTypes *)mergeResultForDestinationWithoutForeignMessageIvar {
-  TestAllTypes *message = [TestAllTypes message];
-  [message setOptionalInt32:1];
-  [message setOptionalInt64:2];
-  [message setOptionalString:@"foo"];
-  ForeignMessage *foreignMessage = [ForeignMessage message];
-  [message setOptionalForeignMessage:foreignMessage];
-  [message.repeatedStringArray addObject:@"qux"];
-  [message.repeatedStringArray addObject:@"bar"];
-  return message;
-}
-
-- (TestAllExtensions *)mergeExtensionsDestination {
-  TestAllExtensions *message = [TestAllExtensions message];
-  [message setExtension:[UnittestRoot optionalInt32Extension] value:@5];
-  [message setExtension:[UnittestRoot optionalStringExtension] value:@"foo"];
-  ForeignMessage *foreignMessage = [ForeignMessage message];
-  foreignMessage.c = 4;
-  [message setExtension:[UnittestRoot optionalForeignMessageExtension]
-                  value:foreignMessage];
-  TestAllTypes_NestedMessage *nestedMessage =
-      [TestAllTypes_NestedMessage message];
-  [message setExtension:[UnittestRoot optionalNestedMessageExtension]
-                  value:nestedMessage];
-  return message;
-}
-
-- (TestAllExtensions *)mergeExtensionsSource {
-  TestAllExtensions *message = [TestAllExtensions message];
-  [message setExtension:[UnittestRoot optionalInt64Extension] value:@6];
-  [message setExtension:[UnittestRoot optionalStringExtension] value:@"bar"];
-  ForeignMessage *foreignMessage = [ForeignMessage message];
-  [message setExtension:[UnittestRoot optionalForeignMessageExtension]
-                  value:foreignMessage];
-  TestAllTypes_NestedMessage *nestedMessage =
-      [TestAllTypes_NestedMessage message];
-  nestedMessage.bb = 7;
-  [message setExtension:[UnittestRoot optionalNestedMessageExtension]
-                  value:nestedMessage];
-  return message;
-}
-
-- (TestAllExtensions *)mergeExtensionsResult {
-  TestAllExtensions *message = [TestAllExtensions message];
-  [message setExtension:[UnittestRoot optionalInt32Extension] value:@5];
-  [message setExtension:[UnittestRoot optionalInt64Extension] value:@6];
-  [message setExtension:[UnittestRoot optionalStringExtension] value:@"bar"];
-  ForeignMessage *foreignMessage = [ForeignMessage message];
-  foreignMessage.c = 4;
-  [message setExtension:[UnittestRoot optionalForeignMessageExtension]
-                  value:foreignMessage];
-  TestAllTypes_NestedMessage *nestedMessage =
-      [TestAllTypes_NestedMessage message];
-  nestedMessage.bb = 7;
-  [message setExtension:[UnittestRoot optionalNestedMessageExtension]
-                  value:nestedMessage];
-  return message;
-}
-
-- (void)testMergeFrom {
-  TestAllTypes *result = [[self.mergeDestination copy] autorelease];
-  [result mergeFrom:self.mergeSource];
-  NSData *resultData = [result data];
-  NSData *mergeResultData = [self.mergeResult data];
-  XCTAssertEqualObjects(resultData, mergeResultData);
-  XCTAssertEqualObjects(result, self.mergeResult);
-
-  // Test when destination does not have an Ivar (type is an object) but source
-  // has such Ivar.
-  // The result must has the Ivar which is same as the one in source.
-  result = [[self.mergeDestinationWithoutForeignMessageIvar copy] autorelease];
-  [result mergeFrom:self.mergeSource];
-  resultData = [result data];
-  mergeResultData =
-      [self.mergeResultForDestinationWithoutForeignMessageIvar data];
-  XCTAssertEqualObjects(resultData, mergeResultData);
-  XCTAssertEqualObjects(
-      result, self.mergeResultForDestinationWithoutForeignMessageIvar);
-
-  // Test when destination is empty.
-  // The result must is same as the source.
-  result = [TestAllTypes message];
-  [result mergeFrom:self.mergeSource];
-  resultData = [result data];
-  mergeResultData = [self.mergeSource data];
-  XCTAssertEqualObjects(resultData, mergeResultData);
-  XCTAssertEqualObjects(result, self.mergeSource);
-}
-
-- (void)testMergeFromWithExtensions {
-  TestAllExtensions *result = [self mergeExtensionsDestination];
-  [result mergeFrom:[self mergeExtensionsSource]];
-  NSData *resultData = [result data];
-  NSData *mergeResultData = [[self mergeExtensionsResult] data];
-  XCTAssertEqualObjects(resultData, mergeResultData);
-  XCTAssertEqualObjects(result, [self mergeExtensionsResult]);
-
-  // Test merging from data.
-  result = [self mergeExtensionsDestination];
-  NSData *data = [[self mergeExtensionsSource] data];
-  XCTAssertNotNil(data);
-  [result mergeFromData:data
-      extensionRegistry:[UnittestRoot extensionRegistry]];
-  resultData = [result data];
-  XCTAssertEqualObjects(resultData, mergeResultData);
-  XCTAssertEqualObjects(result, [self mergeExtensionsResult]);
-}
-
-- (void)testIsEquals {
-  TestAllTypes *result = [[self.mergeDestination copy] autorelease];
-  [result mergeFrom:self.mergeSource];
-  XCTAssertEqualObjects(result.data, self.mergeResult.data);
-  XCTAssertEqualObjects(result, self.mergeResult);
-  TestAllTypes *result2 = [[self.mergeDestination copy] autorelease];
-  XCTAssertNotEqualObjects(result2.data, self.mergeResult.data);
-  XCTAssertNotEqualObjects(result2, self.mergeResult);
-}
-
-// =================================================================
-// Required-field-related tests.
-
-- (TestRequired *)testRequiredInitialized {
-  TestRequired *message = [TestRequired message];
-  [message setA:1];
-  [message setB:2];
-  [message setC:3];
-  return message;
-}
-
-- (void)testRequired {
-  TestRequired *message = [TestRequired message];
-
-  XCTAssertFalse(message.initialized);
-  [message setA:1];
-  XCTAssertFalse(message.initialized);
-  [message setB:1];
-  XCTAssertFalse(message.initialized);
-  [message setC:1];
-  XCTAssertTrue(message.initialized);
-}
-
-- (void)testRequiredForeign {
-  TestRequiredForeign *message = [TestRequiredForeign message];
-
-  XCTAssertTrue(message.initialized);
-
-  [message setOptionalMessage:[TestRequired message]];
-  XCTAssertFalse(message.initialized);
-
-  [message setOptionalMessage:self.testRequiredInitialized];
-  XCTAssertTrue(message.initialized);
-
-  [message.repeatedMessageArray addObject:[TestRequired message]];
-  XCTAssertFalse(message.initialized);
-
-  [message.repeatedMessageArray removeAllObjects];
-  [message.repeatedMessageArray addObject:self.testRequiredInitialized];
-  XCTAssertTrue(message.initialized);
-}
-
-- (void)testRequiredExtension {
-  TestAllExtensions *message = [TestAllExtensions message];
-
-  XCTAssertTrue(message.initialized);
-
-  [message setExtension:[TestRequired single] value:[TestRequired message]];
-  XCTAssertFalse(message.initialized);
-
-  [message setExtension:[TestRequired single]
-                  value:self.testRequiredInitialized];
-  XCTAssertTrue(message.initialized);
-
-  [message addExtension:[TestRequired multi] value:[TestRequired message]];
-  XCTAssertFalse(message.initialized);
-
-  [message setExtension:[TestRequired multi]
-                  index:0
-                  value:self.testRequiredInitialized];
-  XCTAssertTrue(message.initialized);
-}
-
-- (void)testDataFromUninitialized {
-  TestRequired *message = [TestRequired message];
-  NSData *data = [message data];
-  // In DEBUG, the data generation will fail, but in non DEBUG, it passes
-  // because the check isn't done (for speed).
-#ifdef DEBUG
-  XCTAssertNil(data);
-#else
-  XCTAssertNotNil(data);
-  XCTAssertFalse(message.initialized);
-#endif  // DEBUG
-}
-
-- (void)testInitialized {
-  // We're mostly testing that no exception is thrown.
-  TestRequired *message = [TestRequired message];
-  XCTAssertFalse(message.initialized);
-}
-
-- (void)testDataFromNestedUninitialized {
-  TestRequiredForeign *message = [TestRequiredForeign message];
-  [message setOptionalMessage:[TestRequired message]];
-  [message.repeatedMessageArray addObject:[TestRequired message]];
-  [message.repeatedMessageArray addObject:[TestRequired message]];
-  NSData *data = [message data];
-  // In DEBUG, the data generation will fail, but in non DEBUG, it passes
-  // because the check isn't done (for speed).
-#ifdef DEBUG
-  XCTAssertNil(data);
-#else
-  XCTAssertNotNil(data);
-  XCTAssertFalse(message.initialized);
-#endif  // DEBUG
-}
-
-- (void)testNestedInitialized {
-  // We're mostly testing that no exception is thrown.
-
-  TestRequiredForeign *message = [TestRequiredForeign message];
-  [message setOptionalMessage:[TestRequired message]];
-  [message.repeatedMessageArray addObject:[TestRequired message]];
-  [message.repeatedMessageArray addObject:[TestRequired message]];
-
-  XCTAssertFalse(message.initialized);
-}
-
-- (void)testParseUninitialized {
-  NSError *error = nil;
-  TestRequired *msg =
-      [TestRequired parseFromData:GPBEmptyNSData() error:&error];
-  // In DEBUG, the parse will fail, but in non DEBUG, it passes because
-  // the check isn't done (for speed).
-#ifdef DEBUG
-  XCTAssertNil(msg);
-  XCTAssertNotNil(error);
-  XCTAssertEqualObjects(error.domain, GPBMessageErrorDomain);
-  XCTAssertEqual(error.code, GPBMessageErrorCodeMissingRequiredField);
-#else
-  XCTAssertNotNil(msg);
-  XCTAssertNil(error);
-  XCTAssertFalse(msg.initialized);
-#endif  // DEBUG
-}
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-
-- (void)testCoding {
-  GPBMessage *original = [self mergeResult];
-  NSData *data =
-      [NSKeyedArchiver archivedDataWithRootObject:original];
-  id unarchivedObject = [NSKeyedUnarchiver unarchiveObjectWithData:data];
-
-  XCTAssertEqualObjects(unarchivedObject, original);
-
-  // Intentionally doing a pointer comparison.
-  XCTAssertNotEqual(unarchivedObject, original);
-}
-
-- (void)testSecureCoding {
-  GPBMessage *original = [self mergeResult];
-
-  NSString *key = @"testing123";
-
-  NSMutableData *data = [NSMutableData data];
-  NSKeyedArchiver *archiver = [[NSKeyedArchiver alloc] initForWritingWithMutableData:data];
-  [archiver setRequiresSecureCoding:YES];
-  [archiver encodeObject:original forKey:key];
-  [archiver finishEncoding];
-
-  NSKeyedUnarchiver *unarchiver = [[NSKeyedUnarchiver alloc] initForReadingWithData:data];
-  [unarchiver setRequiresSecureCoding:YES];
-  id unarchivedObject = [unarchiver decodeObjectOfClass:[GPBMessage class]
-                                                 forKey:key];
-  [unarchiver finishDecoding];
-
-  XCTAssertEqualObjects(unarchivedObject, original);
-
-  // Intentionally doing a pointer comparison.
-  XCTAssertNotEqual(unarchivedObject, original);
-}
-
-#pragma clang diagnostic pop
-
-- (void)testObjectReset {
-  // Tests a failure where clearing out defaults values caused an over release.
-  TestAllTypes *message = [TestAllTypes message];
-  message.hasOptionalNestedMessage = NO;
-  [message setOptionalNestedMessage:[TestAllTypes_NestedMessage message]];
-  message.hasOptionalNestedMessage = NO;
-  [message setOptionalNestedMessage:[TestAllTypes_NestedMessage message]];
-  [message setOptionalNestedMessage:nil];
-  message.hasOptionalNestedMessage = NO;
-}
-
-- (void)testSettingHasToYes {
-  TestAllTypes *message = [TestAllTypes message];
-  XCTAssertThrows([message setHasOptionalNestedMessage:YES]);
-}
-
-- (void)testRoot {
-  XCTAssertNotNil([UnittestRoot extensionRegistry]);
-}
-
-- (void)testGPBMessageSize {
-  // See the note in GPBMessage_PackagePrivate.h about why we want to keep the
-  // base instance size pointer size aligned.
-  size_t messageSize = class_getInstanceSize([GPBMessage class]);
-  XCTAssertEqual((messageSize % sizeof(void *)), (size_t)0,
-                 @"Base size isn't pointer size aligned");
-
-  // Since we add storage ourselves (see +allocWithZone: in GPBMessage), confirm
-  // that the size of some generated classes is still the same as the base for
-  // that logic to work as desired.
-  size_t testMessageSize = class_getInstanceSize([TestAllTypes class]);
-  XCTAssertEqual(testMessageSize, messageSize);
-}
-
-- (void)testInit {
-  TestAllTypes *message = [TestAllTypes message];
-  [self assertClear:message];
-}
-
-- (void)testAccessors {
-  TestAllTypes *message = [TestAllTypes message];
-  [self setAllFields:message repeatedCount:kGPBDefaultRepeatCount];
-  [self assertAllFieldsSet:message repeatedCount:kGPBDefaultRepeatCount];
-}
-
-- (void)testKVC_ValueForKey {
-  TestAllTypes *message = [TestAllTypes message];
-  [self setAllFields:message repeatedCount:kGPBDefaultRepeatCount];
-  [self assertAllFieldsKVCMatch:message];
-}
-
-- (void)testKVC_SetValue_ForKey {
-  TestAllTypes *message = [TestAllTypes message];
-  [self setAllFieldsViaKVC:message repeatedCount:kGPBDefaultRepeatCount];
-  [self assertAllFieldsKVCMatch:message];
-  [self assertAllFieldsSet:message repeatedCount:kGPBDefaultRepeatCount];
-  [self assertAllFieldsKVCMatch:message];
-}
-
-- (void)testKVOBasic {
-  TestAllTypes *message = [TestAllTypes message];
-  GPBKVOTestObserver *observer =
-      [[[GPBKVOTestObserver alloc] initWithObservee:message
-                                            keyPath:@"optionalString"]
-       autorelease];
-  XCTAssertFalse(observer.didObserve);
-  message.defaultString = @"Hello";
-  XCTAssertFalse(observer.didObserve);
-  message.optionalString = @"Hello";
-  XCTAssertTrue(observer.didObserve);
-}
-
-- (void)testKVOAutocreate {
-  TestAllTypes *message = [TestAllTypes message];
-  GPBKVOTestObserver *autocreateObserver =
-      [[[GPBKVOTestObserver alloc] initWithObservee:message
-                                            keyPath:@"optionalImportMessage"]
-       autorelease];
- GPBKVOTestObserver *innerFieldObserver =
-     [[[GPBKVOTestObserver alloc] initWithObservee:message
-                                           keyPath:@"optionalImportMessage.d"]
-      autorelease];
-  XCTAssertFalse(autocreateObserver.didObserve);
-  XCTAssertFalse(innerFieldObserver.didObserve);
-
-  int a = message.optionalImportMessage.d;
-  XCTAssertEqual(a, 0);
-
-  // Autocreation of fields is not observed by KVO when getting values.
-  XCTAssertFalse(autocreateObserver.didObserve);
-  XCTAssertFalse(innerFieldObserver.didObserve);
-
-  message.optionalImportMessage.d = 2;
-
-  // Autocreation of fields is not observed by KVO.
-  // This is undefined behavior. The library makes no guarantees with regards
-  // to KVO firing if an autocreation occurs as part of a setter.
-  // This test exists just to be aware if the behavior changes.
-  XCTAssertFalse(autocreateObserver.didObserve);
-
-  // Values set inside of an autocreated field are observed.
-  XCTAssertTrue(innerFieldObserver.didObserve);
-
-  // Explicit setting of a message field is observed.
-  message.optionalImportMessage = [ImportMessage message];
-  XCTAssertTrue(autocreateObserver.didObserve);
-}
-
-- (void)testDescription {
-  // No real test, just exercise code
-  TestAllTypes *message = [TestAllTypes message];
-  [self setAllFields:message repeatedCount:kGPBDefaultRepeatCount];
-
-  GPBUnknownFieldSet *unknownFields =
-      [[[GPBUnknownFieldSet alloc] init] autorelease];
-  GPBUnknownField *field =
-      [[[GPBUnknownField alloc] initWithNumber:2] autorelease];
-  [field addVarint:2];
-  [unknownFields addField:field];
-  field = [[[GPBUnknownField alloc] initWithNumber:3] autorelease];
-  [field addVarint:4];
-  [unknownFields addField:field];
-
-  [message setUnknownFields:unknownFields];
-
-  NSString *description = [message description];
-  XCTAssertGreaterThan([description length], 0U);
-
-  GPBMessage *message2 = [TestAllExtensions message];
-  [message2 setExtension:[UnittestRoot optionalInt32Extension] value:@1];
-
-  [message2 addExtension:[UnittestRoot repeatedInt32Extension] value:@2];
-
-  description = [message2 description];
-  XCTAssertGreaterThan([description length], 0U);
-}
-
-- (void)testSetter {
-  // Test to make sure that if we set a value that has a default value
-  // with the default, that the has is set, and the value gets put into the
-  // message correctly.
-  TestAllTypes *message = [TestAllTypes message];
-  GPBDescriptor *descriptor = [[message class] descriptor];
-  XCTAssertNotNil(descriptor);
-  GPBFieldDescriptor *fieldDescriptor =
-      [descriptor fieldWithName:@"defaultInt32"];
-  XCTAssertNotNil(fieldDescriptor);
-  GPBGenericValue defaultValue = [fieldDescriptor defaultValue];
-  [message setDefaultInt32:defaultValue.valueInt32];
-  XCTAssertTrue(message.hasDefaultInt32);
-  XCTAssertEqual(message.defaultInt32, defaultValue.valueInt32);
-
-  // Do the same thing with an object type.
-  message = [TestAllTypes message];
-  fieldDescriptor = [descriptor fieldWithName:@"defaultString"];
-  XCTAssertNotNil(fieldDescriptor);
-  defaultValue = [fieldDescriptor defaultValue];
-  [message setDefaultString:defaultValue.valueString];
-  XCTAssertTrue(message.hasDefaultString);
-  XCTAssertEqualObjects(message.defaultString, defaultValue.valueString);
-
-  // Test default string type.
-  message = [TestAllTypes message];
-  XCTAssertEqualObjects(message.defaultString, @"hello");
-  XCTAssertFalse(message.hasDefaultString);
-  fieldDescriptor = [descriptor fieldWithName:@"defaultString"];
-  XCTAssertNotNil(fieldDescriptor);
-  defaultValue = [fieldDescriptor defaultValue];
-  [message setDefaultString:defaultValue.valueString];
-  XCTAssertEqualObjects(message.defaultString, @"hello");
-  XCTAssertTrue(message.hasDefaultString);
-  [message setDefaultString:nil];
-  XCTAssertEqualObjects(message.defaultString, @"hello");
-  XCTAssertFalse(message.hasDefaultString);
-  message.hasDefaultString = NO;
-  XCTAssertFalse(message.hasDefaultString);
-  XCTAssertEqualObjects(message.defaultString, @"hello");
-
-  // Test default bytes type.
-  NSData *defaultBytes = [@"world" dataUsingEncoding:NSUTF8StringEncoding];
-  XCTAssertEqualObjects(message.defaultBytes, defaultBytes);
-  XCTAssertFalse(message.hasDefaultString);
-  fieldDescriptor = [descriptor fieldWithName:@"defaultBytes"];
-  XCTAssertNotNil(fieldDescriptor);
-  defaultValue = [fieldDescriptor defaultValue];
-  [message setDefaultBytes:defaultValue.valueData];
-  XCTAssertEqualObjects(message.defaultBytes, defaultBytes);
-  XCTAssertTrue(message.hasDefaultBytes);
-  [message setDefaultBytes:nil];
-  XCTAssertEqualObjects(message.defaultBytes, defaultBytes);
-  XCTAssertFalse(message.hasDefaultBytes);
-  message.hasDefaultBytes = NO;
-  XCTAssertFalse(message.hasDefaultBytes);
-  XCTAssertEqualObjects(message.defaultBytes, defaultBytes);
-
-  // Test optional string.
-  XCTAssertFalse(message.hasOptionalString);
-  XCTAssertEqualObjects(message.optionalString, @"");
-  XCTAssertFalse(message.hasOptionalString);
-  message.optionalString = nil;
-  XCTAssertFalse(message.hasOptionalString);
-  XCTAssertEqualObjects(message.optionalString, @"");
-  NSString *string = @"string";
-  message.optionalString = string;
-  XCTAssertEqualObjects(message.optionalString, string);
-  XCTAssertTrue(message.hasOptionalString);
-  message.optionalString = nil;
-  XCTAssertFalse(message.hasOptionalString);
-  XCTAssertEqualObjects(message.optionalString, @"");
-
-  // Test optional data.
-  XCTAssertFalse(message.hasOptionalBytes);
-  XCTAssertEqualObjects(message.optionalBytes, GPBEmptyNSData());
-  XCTAssertFalse(message.hasOptionalBytes);
-  message.optionalBytes = nil;
-  XCTAssertFalse(message.hasOptionalBytes);
-  XCTAssertEqualObjects(message.optionalBytes, GPBEmptyNSData());
-  NSData *data = [@"bytes" dataUsingEncoding:NSUTF8StringEncoding];
-  message.optionalBytes = data;
-  XCTAssertEqualObjects(message.optionalBytes, data);
-  XCTAssertTrue(message.hasOptionalBytes);
-  message.optionalBytes = nil;
-  XCTAssertFalse(message.hasOptionalBytes);
-  XCTAssertEqualObjects(message.optionalBytes, GPBEmptyNSData());
-
-  // Test lazy message setting
-  XCTAssertFalse(message.hasOptionalLazyMessage);
-  XCTAssertNotNil(message.optionalLazyMessage);
-  XCTAssertFalse(message.hasOptionalLazyMessage);
-  message.hasOptionalLazyMessage = NO;
-  XCTAssertFalse(message.hasOptionalLazyMessage);
-  XCTAssertNotNil(message.optionalLazyMessage);
-  XCTAssertFalse(message.hasOptionalLazyMessage);
-  message.optionalLazyMessage = nil;
-  XCTAssertFalse(message.hasOptionalLazyMessage);
-
-  // Test nested messages
-  XCTAssertFalse(message.hasOptionalLazyMessage);
-  message.optionalLazyMessage.bb = 1;
-  XCTAssertTrue(message.hasOptionalLazyMessage);
-  XCTAssertEqual(message.optionalLazyMessage.bb, 1);
-  XCTAssertNotNil(message.optionalLazyMessage);
-  message.optionalLazyMessage = nil;
-  XCTAssertFalse(message.hasOptionalLazyMessage);
-  XCTAssertEqual(message.optionalLazyMessage.bb, 0);
-  XCTAssertFalse(message.hasOptionalLazyMessage);
-  XCTAssertNotNil(message.optionalLazyMessage);
-
-  // -testDefaultSubMessages tests the "defaulting" handling of fields
-  // containing messages.
-}
-
-- (void)testRepeatedSetters {
-  TestAllTypes *message = [TestAllTypes message];
-  [self setAllFields:message repeatedCount:kGPBDefaultRepeatCount];
-  [self modifyRepeatedFields:message];
-  [self assertRepeatedFieldsModified:message
-                       repeatedCount:kGPBDefaultRepeatCount];
-}
-
-- (void)testClear {
-  TestAllTypes *message = [TestAllTypes message];
-  [self setAllFields:message repeatedCount:kGPBDefaultRepeatCount];
-  [self clearAllFields:message];
-  [self assertClear:message];
-  TestAllTypes *message2 = [TestAllTypes message];
-  XCTAssertEqualObjects(message, message2);
-}
-
-- (void)testClearKVC {
-  TestAllTypes *message = [TestAllTypes message];
-  [self setAllFields:message repeatedCount:kGPBDefaultRepeatCount];
-  [self clearAllFields:message];
-  [self assertClear:message];
-  [self assertClearKVC:message];
-}
-
-- (void)testClearExtension {
-  // clearExtension() is not actually used in TestUtil, so try it manually.
-  GPBMessage *message1 = [TestAllExtensions message];
-  [message1 setExtension:[UnittestRoot optionalInt32Extension] value:@1];
-
-  XCTAssertTrue([message1 hasExtension:[UnittestRoot optionalInt32Extension]]);
-  [message1 clearExtension:[UnittestRoot optionalInt32Extension]];
-  XCTAssertFalse([message1 hasExtension:[UnittestRoot optionalInt32Extension]]);
-
-  GPBMessage *message2 = [TestAllExtensions message];
-  [message2 addExtension:[UnittestRoot repeatedInt32Extension] value:@1];
-
-  XCTAssertEqual(
-      [[message2 getExtension:[UnittestRoot repeatedInt32Extension]] count],
-      (NSUInteger)1);
-  [message2 clearExtension:[UnittestRoot repeatedInt32Extension]];
-  XCTAssertEqual(
-      [[message2 getExtension:[UnittestRoot repeatedInt32Extension]] count],
-      (NSUInteger)0);
-
-  // Clearing an unset extension field shouldn't make the target message
-  // visible.
-  GPBMessage *message3 = [TestAllExtensions message];
-  GPBMessage *extension_msg =
-      [message3 getExtension:[UnittestObjcRoot recursiveExtension]];
-  XCTAssertFalse([message3 hasExtension:[UnittestObjcRoot recursiveExtension]]);
-  [extension_msg clearExtension:[UnittestRoot optionalInt32Extension]];
-  XCTAssertFalse([message3 hasExtension:[UnittestObjcRoot recursiveExtension]]);
-}
-
-- (void)testDefaultingSubMessages {
-  TestAllTypes *message = [TestAllTypes message];
-
-  // Initially they should all not have values.
-
-  XCTAssertFalse(message.hasOptionalGroup);
-  XCTAssertFalse(message.hasOptionalNestedMessage);
-  XCTAssertFalse(message.hasOptionalForeignMessage);
-  XCTAssertFalse(message.hasOptionalImportMessage);
-  XCTAssertFalse(message.hasOptionalPublicImportMessage);
-  XCTAssertFalse(message.hasOptionalLazyMessage);
-
-  // They should auto create something when fetched.
-
-  TestAllTypes_OptionalGroup *optionalGroup = [message.optionalGroup retain];
-  TestAllTypes_NestedMessage *optionalNestedMessage =
-      [message.optionalNestedMessage retain];
-  ForeignMessage *optionalForeignMessage =
-      [message.optionalForeignMessage retain];
-  ImportMessage *optionalImportMessage = [message.optionalImportMessage retain];
-  PublicImportMessage *optionalPublicImportMessage =
-      [message.optionalPublicImportMessage retain];
-  TestAllTypes_NestedMessage *optionalLazyMessage =
-      [message.optionalLazyMessage retain];
-
-  XCTAssertNotNil(optionalGroup);
-  XCTAssertNotNil(optionalNestedMessage);
-  XCTAssertNotNil(optionalForeignMessage);
-  XCTAssertNotNil(optionalImportMessage);
-  XCTAssertNotNil(optionalPublicImportMessage);
-  XCTAssertNotNil(optionalLazyMessage);
-
-  // Although they were created, they should not respond to hasValue until that
-  // submessage is mutated.
-
-  XCTAssertFalse(message.hasOptionalGroup);
-  XCTAssertFalse(message.hasOptionalNestedMessage);
-  XCTAssertFalse(message.hasOptionalForeignMessage);
-  XCTAssertFalse(message.hasOptionalImportMessage);
-  XCTAssertFalse(message.hasOptionalPublicImportMessage);
-  XCTAssertFalse(message.hasOptionalLazyMessage);
-
-  // And they set that value back in to the message since the value created was
-  // mutable (so a second fetch should give the same object).
-
-  XCTAssertEqual(message.optionalGroup, optionalGroup);
-  XCTAssertEqual(message.optionalNestedMessage, optionalNestedMessage);
-  XCTAssertEqual(message.optionalForeignMessage, optionalForeignMessage);
-  XCTAssertEqual(message.optionalImportMessage, optionalImportMessage);
-  XCTAssertEqual(message.optionalPublicImportMessage,
-                 optionalPublicImportMessage);
-  XCTAssertEqual(message.optionalLazyMessage, optionalLazyMessage);
-
-  // And the default objects for a second message should be distinct (again,
-  // since they are mutable, each needs their own copy).
-
-  TestAllTypes *message2 = [TestAllTypes message];
-
-  // Intentionally doing a pointer comparison.
-  XCTAssertNotEqual(message2.optionalGroup, optionalGroup);
-  XCTAssertNotEqual(message2.optionalNestedMessage, optionalNestedMessage);
-  XCTAssertNotEqual(message2.optionalForeignMessage, optionalForeignMessage);
-  XCTAssertNotEqual(message2.optionalImportMessage, optionalImportMessage);
-  XCTAssertNotEqual(message2.optionalPublicImportMessage,
-                    optionalPublicImportMessage);
-  XCTAssertNotEqual(message2.optionalLazyMessage, optionalLazyMessage);
-
-  // Setting the values to nil will clear the has flag, and on next access you
-  // get back new submessages.
-
-  message.optionalGroup = nil;
-  message.optionalNestedMessage = nil;
-  message.optionalForeignMessage = nil;
-  message.optionalImportMessage = nil;
-  message.optionalPublicImportMessage = nil;
-  message.optionalLazyMessage = nil;
-
-  XCTAssertFalse(message.hasOptionalGroup);
-  XCTAssertFalse(message.hasOptionalNestedMessage);
-  XCTAssertFalse(message.hasOptionalForeignMessage);
-  XCTAssertFalse(message.hasOptionalImportMessage);
-  XCTAssertFalse(message.hasOptionalPublicImportMessage);
-  XCTAssertFalse(message.hasOptionalLazyMessage);
-
-  // Intentionally doing a pointer comparison.
-  XCTAssertNotEqual(message.optionalGroup, optionalGroup);
-  XCTAssertNotEqual(message.optionalNestedMessage, optionalNestedMessage);
-  XCTAssertNotEqual(message.optionalForeignMessage, optionalForeignMessage);
-  XCTAssertNotEqual(message.optionalImportMessage, optionalImportMessage);
-  XCTAssertNotEqual(message.optionalPublicImportMessage,
-                    optionalPublicImportMessage);
-  XCTAssertNotEqual(message.optionalLazyMessage, optionalLazyMessage);
-
-  [optionalGroup release];
-  [optionalNestedMessage release];
-  [optionalForeignMessage release];
-  [optionalImportMessage release];
-  [optionalPublicImportMessage release];
-  [optionalLazyMessage release];
-}
-
-- (void)testMultiplePointersToAutocreatedMessage {
-  // Multiple objects pointing to the same autocreated message.
-  TestAllTypes *message = [TestAllTypes message];
-  TestAllTypes *message2 = [TestAllTypes message];
-  message2.optionalGroup = message.optionalGroup;
-  XCTAssertTrue([message2 hasOptionalGroup]);
-  XCTAssertFalse([message hasOptionalGroup]);
-  message2.optionalGroup.a = 42;
-  XCTAssertTrue([message hasOptionalGroup]);
-  XCTAssertTrue([message2 hasOptionalGroup]);
-}
-
-- (void)testCopyWithAutocreatedMessage {
-  // Mutable copy should not copy autocreated messages.
-  TestAllTypes *message = [TestAllTypes message];
-  message.optionalGroup.a = 42;
-  XCTAssertNotNil(message.optionalNestedMessage);
-  TestAllTypes *message2 = [[message copy] autorelease];
-  XCTAssertTrue([message2 hasOptionalGroup]);
-  XCTAssertFalse([message2 hasOptionalNestedMessage]);
-
-  // Intentionally doing a pointer comparison.
-  XCTAssertNotEqual(message.optionalNestedMessage,
-                    message2.optionalNestedMessage);
-}
-
-- (void)testClearAutocreatedSubmessage {
-  // Call clear on an intermediate submessage should cause it to get recreated
-  // on the next call.
-  TestRecursiveMessage *message = [TestRecursiveMessage message];
-  TestRecursiveMessage *message_inner = [message.a.a.a retain];
-  XCTAssertNotNil(message_inner);
-  XCTAssertTrue(GPBWasMessageAutocreatedBy(message_inner, message.a.a));
-  [message.a.a clear];
-  XCTAssertFalse(GPBWasMessageAutocreatedBy(message_inner, message.a.a));
-
-  // Intentionally doing a pointer comparison.
-  XCTAssertNotEqual(message.a.a.a, message_inner);
-  [message_inner release];
-}
-
-- (void)testRetainAutocreatedSubmessage {
-  // Should be able to retain autocreated submessage while the creator is
-  // dealloced.
-  TestAllTypes *message = [TestAllTypes message];
-
-  ForeignMessage *subMessage;
-  @autoreleasepool {
-    TestAllTypes *message2 = [TestAllTypes message];
-    subMessage = message2.optionalForeignMessage; // Autocreated
-    message.optionalForeignMessage = subMessage;
-    XCTAssertTrue(GPBWasMessageAutocreatedBy(message.optionalForeignMessage,
-                                             message2));
-  }
-
-  // Should be the same object, and should still be live.
-  XCTAssertEqual(message.optionalForeignMessage, subMessage);
-  XCTAssertNotNil([subMessage description]);
-}
-
-- (void)testSetNilAutocreatedSubmessage {
-  TestRecursiveMessage *message = [TestRecursiveMessage message];
-  TestRecursiveMessage *message_inner = [message.a.a retain];
-  XCTAssertFalse([message hasA]);
-  XCTAssertFalse([message.a hasA]);
-  message.a.a = nil;
-
-  // |message.a| has to be made visible, but |message.a.a| was set to nil so
-  // shouldn't be.
-  XCTAssertTrue([message hasA]);
-  XCTAssertFalse([message.a hasA]);
-
-  // Setting submessage to nil should cause it to lose its creator.
-  XCTAssertFalse(GPBWasMessageAutocreatedBy(message_inner, message.a));
-
-  // After setting to nil, getting it again should create a new autocreated
-  // message.
-  // Intentionally doing a pointer comparison.
-  XCTAssertNotEqual(message.a.a, message_inner);
-
-  [message_inner release];
-}
-
-- (void)testSetDoesntHaveAutocreatedSubmessage {
-  // Clearing submessage (set has == NO) should NOT cause it to lose its
-  // creator.
-  TestAllTypes *message = [TestAllTypes message];
-  TestAllTypes_NestedMessage *nestedMessage = message.optionalNestedMessage;
-  XCTAssertFalse([message hasOptionalNestedMessage]);
-  [message setHasOptionalNestedMessage:NO];
-  XCTAssertFalse([message hasOptionalNestedMessage]);
-  XCTAssertEqual(message.optionalNestedMessage, nestedMessage);
-}
-
-- (void)testSetAutocreatedMessageBecomesVisible {
-  // Setting a value should cause the submessage to appear to its creator.
-  // Test this several levels deep.
-  TestRecursiveMessage *message = [TestRecursiveMessage message];
-  message.a.a.a.a.i = 42;
-  XCTAssertTrue([message hasA]);
-  XCTAssertTrue([message.a hasA]);
-  XCTAssertTrue([message.a.a hasA]);
-  XCTAssertTrue([message.a.a.a hasA]);
-  XCTAssertFalse([message.a.a.a.a hasA]);
-  XCTAssertEqual(message.a.a.a.a.i, 42);
-}
-
-- (void)testClearUnsetFieldOfAutocreatedMessage {
-  // Clearing an unset field should not cause the submessage to appear to its
-  // creator.
-  TestRecursiveMessage *message = [TestRecursiveMessage message];
-  message.a.a.a.a.hasI = NO;
-  XCTAssertFalse([message hasA]);
-  XCTAssertFalse([message.a hasA]);
-  XCTAssertFalse([message.a.a hasA]);
-  XCTAssertFalse([message.a.a.a hasA]);
-}
-
-- (void)testAutocreatedSubmessageAssignSkip {
-  TestRecursiveMessage *message = [TestRecursiveMessage message];
-  TestRecursiveMessage *messageLevel1 = [message.a retain];
-  TestRecursiveMessage *messageLevel2 = [message.a.a retain];
-  TestRecursiveMessage *messageLevel3 = [message.a.a.a retain];
-  TestRecursiveMessage *messageLevel4 = [message.a.a.a.a retain];
-  XCTAssertTrue(GPBWasMessageAutocreatedBy(messageLevel1, message));
-  XCTAssertTrue(GPBWasMessageAutocreatedBy(messageLevel2, messageLevel1));
-  XCTAssertTrue(GPBWasMessageAutocreatedBy(messageLevel3, messageLevel2));
-  XCTAssertTrue(GPBWasMessageAutocreatedBy(messageLevel4, messageLevel3));
-
-  // Test skipping over an autocreated submessage and ensure it gets unset.
-  message.a = message.a.a;
-  XCTAssertEqual(message.a, messageLevel2);
-  XCTAssertTrue([message hasA]);
-  XCTAssertEqual(message.a.a, messageLevel3);
-  XCTAssertFalse([message.a hasA]);
-  XCTAssertEqual(message.a.a.a, messageLevel4);
-  XCTAssertFalse(GPBWasMessageAutocreatedBy(messageLevel1,
-                                            message));  // Because it was orphaned.
-  XCTAssertTrue(GPBWasMessageAutocreatedBy(messageLevel2, messageLevel1));
-  XCTAssertTrue(GPBWasMessageAutocreatedBy(messageLevel3, messageLevel2));
-
-  [messageLevel1 release];
-  [messageLevel2 release];
-  [messageLevel3 release];
-  [messageLevel4 release];
-}
-
-- (void)testAutocreatedSubmessageAssignLoop {
-  TestRecursiveMessage *message = [TestRecursiveMessage message];
-  TestRecursiveMessage *messageLevel1 = [message.a retain];
-  TestRecursiveMessage *messageLevel2 = [message.a.a retain];
-  TestRecursiveMessage *messageLevel3 = [message.a.a.a retain];
-  TestRecursiveMessage *messageLevel4 = [message.a.a.a.a retain];
-  XCTAssertTrue(GPBWasMessageAutocreatedBy(messageLevel1, message));
-  XCTAssertTrue(GPBWasMessageAutocreatedBy(messageLevel2, messageLevel1));
-  XCTAssertTrue(GPBWasMessageAutocreatedBy(messageLevel3, messageLevel2));
-  XCTAssertTrue(GPBWasMessageAutocreatedBy(messageLevel4, messageLevel3));
-
-  // Test a property with a loop. You'd never do this but at least ensure the
-  // autocreated submessages behave sanely.
-  message.a.a = message.a;
-  XCTAssertTrue([message hasA]);
-  XCTAssertEqual(message.a, messageLevel1);
-  XCTAssertTrue([message.a hasA]);
-  XCTAssertEqual(message.a.a, messageLevel1);
-  XCTAssertTrue([message.a.a hasA]);
-  XCTAssertEqual(message.a.a.a, messageLevel1);
-  XCTAssertFalse(GPBWasMessageAutocreatedBy(messageLevel1,
-                                            message));  // Because it was assigned.
-  XCTAssertFalse(GPBWasMessageAutocreatedBy(messageLevel2,
-                                            messageLevel1));  // Because it was orphaned.
-  XCTAssertFalse([messageLevel2 hasA]);
-
-  // Break the retain loop.
-  message.a.a = nil;
-  XCTAssertTrue([message hasA]);
-  XCTAssertFalse([message.a hasA]);
-
-  [messageLevel1 release];
-  [messageLevel2 release];
-  [messageLevel3 release];
-  [messageLevel4 release];
-}
-
-- (void)testSetAutocreatedSubmessage {
-  // Setting autocreated submessage to another value should cause the old one to
-  // lose its creator.
-  TestAllTypes *message = [TestAllTypes message];
-  TestAllTypes_NestedMessage *nestedMessage =
-      [message.optionalNestedMessage retain];
-
-  message.optionalNestedMessage = [TestAllTypes_NestedMessage message];
-  XCTAssertTrue([message hasOptionalNestedMessage]);
-  XCTAssertTrue(message.optionalNestedMessage != nestedMessage);
-  XCTAssertFalse(GPBWasMessageAutocreatedBy(nestedMessage, message));
-
-  [nestedMessage release];
-}
-
-- (void)testAutocreatedUnknownFields {
-  // Doing anything with (except reading) unknown fields should cause the
-  // submessage to become visible.
-  TestAllTypes *message = [TestAllTypes message];
-  XCTAssertNotNil(message.optionalNestedMessage);
-  XCTAssertFalse([message hasOptionalNestedMessage]);
-  XCTAssertNil(message.optionalNestedMessage.unknownFields);
-  XCTAssertFalse([message hasOptionalNestedMessage]);
-
-  GPBUnknownFieldSet *unknownFields =
-      [[[GPBUnknownFieldSet alloc] init] autorelease];
-  message.optionalNestedMessage.unknownFields = unknownFields;
-  XCTAssertTrue([message hasOptionalNestedMessage]);
-
-  message.optionalNestedMessage = nil;
-  XCTAssertFalse([message hasOptionalNestedMessage]);
-  [message.optionalNestedMessage setUnknownFields:unknownFields];
-  XCTAssertTrue([message hasOptionalNestedMessage]);
-}
-
-- (void)testSetAutocreatedSubmessageToSelf {
-  // Setting submessage to itself should cause it to become visible.
-  TestAllTypes *message = [TestAllTypes message];
-  XCTAssertNotNil(message.optionalNestedMessage);
-  XCTAssertFalse([message hasOptionalNestedMessage]);
-  message.optionalNestedMessage = message.optionalNestedMessage;
-  XCTAssertTrue([message hasOptionalNestedMessage]);
-}
-
-- (void)testAutocreatedSubmessageMemoryLeaks {
-  // Test for memory leaks with autocreated submessages.
-  TestRecursiveMessage *message;
-  TestRecursiveMessage *messageLevel1;
-  TestRecursiveMessage *messageLevel2;
-  TestRecursiveMessage *messageLevel3;
-  TestRecursiveMessage *messageLevel4;
-  @autoreleasepool {
-    message = [[TestRecursiveMessage alloc] init];
-    messageLevel1 = [message.a retain];
-    messageLevel2 = [message.a.a retain];
-    messageLevel3 = [message.a.a.a retain];
-    messageLevel4 = [message.a.a.a.a retain];
-    message.a.i = 1;
-  }
-
-  XCTAssertEqual(message.retainCount, (NSUInteger)1);
-  [message release];
-  XCTAssertEqual(messageLevel1.retainCount, (NSUInteger)1);
-  [messageLevel1 release];
-  XCTAssertEqual(messageLevel2.retainCount, (NSUInteger)1);
-  [messageLevel2 release];
-  XCTAssertEqual(messageLevel3.retainCount, (NSUInteger)1);
-  [messageLevel3 release];
-  XCTAssertEqual(messageLevel4.retainCount, (NSUInteger)1);
-  [messageLevel4 release];
-}
-
-- (void)testDefaultingArrays {
-  // Basic tests for default creation of arrays in a message.
-  TestRecursiveMessageWithRepeatedField *message =
-      [TestRecursiveMessageWithRepeatedField message];
-  TestRecursiveMessageWithRepeatedField *message2 =
-      [TestRecursiveMessageWithRepeatedField message];
-
-  // Simply accessing the array should not make any fields visible.
-  XCTAssertNotNil(message.a.a.iArray);
-  XCTAssertFalse([message hasA]);
-  XCTAssertFalse([message.a hasA]);
-  XCTAssertNotNil(message2.a.a.strArray);
-  XCTAssertFalse([message2 hasA]);
-  XCTAssertFalse([message2.a hasA]);
-
-  // But adding an element to the array should.
-  [message.a.a.iArray addValue:42];
-  XCTAssertTrue([message hasA]);
-  XCTAssertTrue([message.a hasA]);
-  XCTAssertEqual([message.a.a.iArray count], (NSUInteger)1);
-  [message2.a.a.strArray addObject:@"foo"];
-  XCTAssertTrue([message2 hasA]);
-  XCTAssertTrue([message2.a hasA]);
-  XCTAssertEqual([message2.a.a.strArray count], (NSUInteger)1);
-}
-
-- (void)testAutocreatedArrayShared {
-  // Multiple objects pointing to the same array.
-  TestRecursiveMessageWithRepeatedField *message1a =
-      [TestRecursiveMessageWithRepeatedField message];
-  TestRecursiveMessageWithRepeatedField *message1b =
-      [TestRecursiveMessageWithRepeatedField message];
-  message1a.a.iArray = message1b.a.iArray;
-  XCTAssertTrue([message1a hasA]);
-  XCTAssertFalse([message1b hasA]);
-  [message1a.a.iArray addValue:1];
-  XCTAssertTrue([message1a hasA]);
-  XCTAssertTrue([message1b hasA]);
-  XCTAssertEqual(message1a.a.iArray, message1b.a.iArray);
-
-  TestRecursiveMessageWithRepeatedField *message2a =
-      [TestRecursiveMessageWithRepeatedField message];
-  TestRecursiveMessageWithRepeatedField *message2b =
-      [TestRecursiveMessageWithRepeatedField message];
-  message2a.a.strArray = message2b.a.strArray;
-  XCTAssertTrue([message2a hasA]);
-  XCTAssertFalse([message2b hasA]);
-  [message2a.a.strArray addObject:@"bar"];
-  XCTAssertTrue([message2a hasA]);
-  XCTAssertTrue([message2b hasA]);
-  XCTAssertEqual(message2a.a.strArray, message2b.a.strArray);
-}
-
-- (void)testAutocreatedArrayCopy {
-  // Copy should not copy autocreated arrays.
-  TestAllTypes *message = [TestAllTypes message];
-  XCTAssertNotNil(message.repeatedStringArray);
-  XCTAssertNotNil(message.repeatedInt32Array);
-  TestAllTypes *message2 = [[message copy] autorelease];
-  // Pointer conparisions.
-  XCTAssertNotEqual(message.repeatedStringArray, message2.repeatedStringArray);
-  XCTAssertNotEqual(message.repeatedInt32Array, message2.repeatedInt32Array);
-
-  // Mutable copy should copy empty arrays that were explicitly set (end up
-  // with different objects that are equal).
-  TestAllTypes *message3 = [TestAllTypes message];
-  message3.repeatedInt32Array = [GPBInt32Array arrayWithValue:42];
-  message3.repeatedStringArray = [NSMutableArray arrayWithObject:@"wee"];
-  XCTAssertNotNil(message.repeatedInt32Array);
-  XCTAssertNotNil(message.repeatedStringArray);
-  TestAllTypes *message4 = [[message3 copy] autorelease];
-  XCTAssertNotEqual(message3.repeatedInt32Array, message4.repeatedInt32Array);
-  XCTAssertEqualObjects(message3.repeatedInt32Array,
-                        message4.repeatedInt32Array);
-  XCTAssertNotEqual(message3.repeatedStringArray, message4.repeatedStringArray);
-  XCTAssertEqualObjects(message3.repeatedStringArray,
-                        message4.repeatedStringArray);
-}
-
-- (void)testAutocreatedArrayRetain {
-  // Should be able to retain autocreated array while the creator is dealloced.
-  TestAllTypes *message = [TestAllTypes message];
-
-  @autoreleasepool {
-    TestAllTypes *message2 = [TestAllTypes message];
-    message.repeatedInt32Array = message2.repeatedInt32Array;
-    message.repeatedStringArray = message2.repeatedStringArray;
-    // Pointer conparision
-    XCTAssertEqual(message.repeatedInt32Array->_autocreator, message2);
-    XCTAssertTrue([message.repeatedStringArray
-        isKindOfClass:[GPBAutocreatedArray class]]);
-    XCTAssertEqual(
-        ((GPBAutocreatedArray *)message.repeatedStringArray)->_autocreator,
-        message2);
-  }
-
-  XCTAssertNil(message.repeatedInt32Array->_autocreator);
-  XCTAssertTrue(
-      [message.repeatedStringArray isKindOfClass:[GPBAutocreatedArray class]]);
-  XCTAssertNil(
-      ((GPBAutocreatedArray *)message.repeatedStringArray)->_autocreator);
-}
-
-- (void)testSetNilAutocreatedArray {
-  // Setting array to nil should cause it to lose its delegate.
-  TestAllTypes *message = [TestAllTypes message];
-  GPBInt32Array *repeatedInt32Array = [message.repeatedInt32Array retain];
-  GPBAutocreatedArray *repeatedStringArray =
-      (GPBAutocreatedArray *)[message.repeatedStringArray retain];
-  XCTAssertTrue([repeatedStringArray isKindOfClass:[GPBAutocreatedArray class]]);
-  XCTAssertEqual(repeatedInt32Array->_autocreator, message);
-  XCTAssertEqual(repeatedStringArray->_autocreator, message);
-  message.repeatedInt32Array = nil;
-  message.repeatedStringArray = nil;
-  XCTAssertNil(repeatedInt32Array->_autocreator);
-  XCTAssertNil(repeatedStringArray->_autocreator);
-  [repeatedInt32Array release];
-  [repeatedStringArray release];
-}
-
-- (void)testSetOverAutocreatedArrayAndSetAgain {
-  // Ensure when dealing with replacing an array it is handled being either
-  // an autocreated one or a straight NSArray.
-
-  // The real test here is that nothing crashes while doing the work.
-  TestAllTypes *message = [TestAllTypes message];
-  [message.repeatedStringArray addObject:@"foo"];
-  XCTAssertEqual(message.repeatedStringArray_Count, (NSUInteger)1);
-  message.repeatedStringArray = [NSMutableArray arrayWithObjects:@"bar", @"bar2", nil];
-  XCTAssertEqual(message.repeatedStringArray_Count, (NSUInteger)2);
-  message.repeatedStringArray = [NSMutableArray arrayWithObject:@"baz"];
-  XCTAssertEqual(message.repeatedStringArray_Count, (NSUInteger)1);
-}
-
-- (void)testReplaceAutocreatedArray {
-  // Replacing array should orphan the old one and cause its creator to become
-  // visible.
-  {
-    TestRecursiveMessageWithRepeatedField *message =
-        [TestRecursiveMessageWithRepeatedField message];
-    XCTAssertNotNil(message.a);
-    XCTAssertNotNil(message.a.iArray);
-    XCTAssertFalse([message hasA]);
-    GPBInt32Array *iArray = [message.a.iArray retain];
-    XCTAssertEqual(iArray->_autocreator, message.a);  // Pointer comparison
-    message.a.iArray = [GPBInt32Array arrayWithValue:1];
-    XCTAssertTrue([message hasA]);
-    XCTAssertNotEqual(message.a.iArray, iArray);  // Pointer comparison
-    XCTAssertNil(iArray->_autocreator);
-    [iArray release];
-  }
-
-  {
-    TestRecursiveMessageWithRepeatedField *message =
-        [TestRecursiveMessageWithRepeatedField message];
-    XCTAssertNotNil(message.a);
-    XCTAssertNotNil(message.a.strArray);
-    XCTAssertFalse([message hasA]);
-    GPBAutocreatedArray *strArray =
-        (GPBAutocreatedArray *)[message.a.strArray retain];
-    XCTAssertTrue([strArray isKindOfClass:[GPBAutocreatedArray class]]);
-    XCTAssertEqual(strArray->_autocreator, message.a);  // Pointer comparison
-    message.a.strArray = [NSMutableArray arrayWithObject:@"foo"];
-    XCTAssertTrue([message hasA]);
-    XCTAssertNotEqual(message.a.strArray, strArray);  // Pointer comparison
-    XCTAssertNil(strArray->_autocreator);
-    [strArray release];
-  }
-}
-
-- (void)testSetAutocreatedArrayToSelf {
-  // Setting array to itself should cause it to become visible.
-  {
-    TestRecursiveMessageWithRepeatedField *message =
-        [TestRecursiveMessageWithRepeatedField message];
-    XCTAssertNotNil(message.a);
-    XCTAssertNotNil(message.a.iArray);
-    XCTAssertFalse([message hasA]);
-    message.a.iArray = message.a.iArray;
-    XCTAssertTrue([message hasA]);
-    XCTAssertNil(message.a.iArray->_autocreator);
-  }
-
-  {
-    TestRecursiveMessageWithRepeatedField *message =
-        [TestRecursiveMessageWithRepeatedField message];
-    XCTAssertNotNil(message.a);
-    XCTAssertNotNil(message.a.strArray);
-    XCTAssertFalse([message hasA]);
-    message.a.strArray = message.a.strArray;
-    XCTAssertTrue([message hasA]);
-    XCTAssertTrue([message.a.strArray isKindOfClass:[GPBAutocreatedArray class]]);
-    XCTAssertNil(((GPBAutocreatedArray *)message.a.strArray)->_autocreator);
-  }
-}
-
-- (void)testAutocreatedArrayRemoveAllValues {
-  // Calling removeAllValues on autocreated array should not cause it to be
-  // visible.
-  TestRecursiveMessageWithRepeatedField *message =
-      [TestRecursiveMessageWithRepeatedField message];
-  [message.a.iArray removeAll];
-  XCTAssertFalse([message hasA]);
-  [message.a.strArray removeAllObjects];
-  XCTAssertFalse([message hasA]);
-}
-
-- (void)testDefaultingMaps {
-  // Basic tests for default creation of maps in a message.
-  TestRecursiveMessageWithRepeatedField *message =
-      [TestRecursiveMessageWithRepeatedField message];
-  TestRecursiveMessageWithRepeatedField *message2 =
-      [TestRecursiveMessageWithRepeatedField message];
-
-  // Simply accessing the map should not make any fields visible.
-  XCTAssertNotNil(message.a.a.iToI);
-  XCTAssertFalse([message hasA]);
-  XCTAssertFalse([message.a hasA]);
-  XCTAssertNotNil(message2.a.a.strToStr);
-  XCTAssertFalse([message2 hasA]);
-  XCTAssertFalse([message2.a hasA]);
-
-  // But adding an element to the map should.
-  [message.a.a.iToI setInt32:100 forKey:200];
-  XCTAssertTrue([message hasA]);
-  XCTAssertTrue([message.a hasA]);
-  XCTAssertEqual([message.a.a.iToI count], (NSUInteger)1);
-  [message2.a.a.strToStr setObject:@"foo" forKey:@"bar"];
-  XCTAssertTrue([message2 hasA]);
-  XCTAssertTrue([message2.a hasA]);
-  XCTAssertEqual([message2.a.a.strToStr count], (NSUInteger)1);
-}
-
-- (void)testAutocreatedMapShared {
-  // Multiple objects pointing to the same map.
-  TestRecursiveMessageWithRepeatedField *message1a =
-      [TestRecursiveMessageWithRepeatedField message];
-  TestRecursiveMessageWithRepeatedField *message1b =
-      [TestRecursiveMessageWithRepeatedField message];
-  message1a.a.iToI = message1b.a.iToI;
-  XCTAssertTrue([message1a hasA]);
-  XCTAssertFalse([message1b hasA]);
-  [message1a.a.iToI setInt32:1 forKey:2];
-  XCTAssertTrue([message1a hasA]);
-  XCTAssertTrue([message1b hasA]);
-  XCTAssertEqual(message1a.a.iToI, message1b.a.iToI);
-
-  TestRecursiveMessageWithRepeatedField *message2a =
-      [TestRecursiveMessageWithRepeatedField message];
-  TestRecursiveMessageWithRepeatedField *message2b =
-      [TestRecursiveMessageWithRepeatedField message];
-  message2a.a.strToStr = message2b.a.strToStr;
-  XCTAssertTrue([message2a hasA]);
-  XCTAssertFalse([message2b hasA]);
-  [message2a.a.strToStr setObject:@"bar" forKey:@"foo"];
-  XCTAssertTrue([message2a hasA]);
-  XCTAssertTrue([message2b hasA]);
-  XCTAssertEqual(message2a.a.strToStr, message2b.a.strToStr);
-}
-
-- (void)testAutocreatedMapCopy {
-  // Copy should not copy autocreated maps.
-  TestRecursiveMessageWithRepeatedField *message =
-      [TestRecursiveMessageWithRepeatedField message];
-  XCTAssertNotNil(message.strToStr);
-  XCTAssertNotNil(message.iToI);
-  TestRecursiveMessageWithRepeatedField *message2 =
-      [[message copy] autorelease];
-  // Pointer conparisions.
-  XCTAssertNotEqual(message.strToStr, message2.strToStr);
-  XCTAssertNotEqual(message.iToI, message2.iToI);
-
-  // Mutable copy should copy empty arrays that were explicitly set (end up
-  // with different objects that are equal).
-  TestRecursiveMessageWithRepeatedField *message3 =
-      [TestRecursiveMessageWithRepeatedField message];
-  message3.iToI = [[[GPBInt32Int32Dictionary alloc] init] autorelease];
-  [message3.iToI setInt32:10 forKey:20];
-  message3.strToStr =
-      [NSMutableDictionary dictionaryWithObject:@"abc" forKey:@"123"];
-  XCTAssertNotNil(message.iToI);
-  XCTAssertNotNil(message.iToI);
-  TestRecursiveMessageWithRepeatedField *message4 =
-      [[message3 copy] autorelease];
-  XCTAssertNotEqual(message3.iToI, message4.iToI);
-  XCTAssertEqualObjects(message3.iToI, message4.iToI);
-  XCTAssertNotEqual(message3.strToStr, message4.strToStr);
-  XCTAssertEqualObjects(message3.strToStr, message4.strToStr);
-}
-
-- (void)testAutocreatedMapRetain {
-  // Should be able to retain autocreated map while the creator is dealloced.
-  TestRecursiveMessageWithRepeatedField *message =
-      [TestRecursiveMessageWithRepeatedField message];
-
-  @autoreleasepool {
-    TestRecursiveMessageWithRepeatedField *message2 =
-        [TestRecursiveMessageWithRepeatedField message];
-    message.iToI = message2.iToI;
-    message.strToStr = message2.strToStr;
-    // Pointer conparision
-    XCTAssertEqual(message.iToI->_autocreator, message2);
-    XCTAssertTrue([message.strToStr
-        isKindOfClass:[GPBAutocreatedDictionary class]]);
-    XCTAssertEqual(
-        ((GPBAutocreatedDictionary *)message.strToStr)->_autocreator,
-        message2);
-  }
-
-  XCTAssertNil(message.iToI->_autocreator);
-  XCTAssertTrue(
-      [message.strToStr isKindOfClass:[GPBAutocreatedDictionary class]]);
-  XCTAssertNil(
-      ((GPBAutocreatedDictionary *)message.strToStr)->_autocreator);
-}
-
-- (void)testSetNilAutocreatedMap {
-  // Setting map to nil should cause it to lose its delegate.
-  TestRecursiveMessageWithRepeatedField *message =
-      [TestRecursiveMessageWithRepeatedField message];
-  GPBInt32Int32Dictionary *iToI = [message.iToI retain];
-  GPBAutocreatedDictionary *strToStr =
-      (GPBAutocreatedDictionary *)[message.strToStr retain];
-  XCTAssertTrue([strToStr isKindOfClass:[GPBAutocreatedDictionary class]]);
-  XCTAssertEqual(iToI->_autocreator, message);
-  XCTAssertEqual(strToStr->_autocreator, message);
-  message.iToI = nil;
-  message.strToStr = nil;
-  XCTAssertNil(iToI->_autocreator);
-  XCTAssertNil(strToStr->_autocreator);
-  [iToI release];
-  [strToStr release];
-}
-
-- (void)testSetOverAutocreatedMapAndSetAgain {
-  // Ensure when dealing with replacing a map it is handled being either
-  // an autocreated one or a straight NSDictionary.
-
-  // The real test here is that nothing crashes while doing the work.
-  TestRecursiveMessageWithRepeatedField *message =
-      [TestRecursiveMessageWithRepeatedField message];
-  message.strToStr[@"foo"] = @"bar";
-  XCTAssertEqual(message.strToStr_Count, (NSUInteger)1);
-  message.strToStr =
-      [NSMutableDictionary dictionaryWithObjectsAndKeys:@"bar", @"key1", @"baz", @"key2", nil];
-  XCTAssertEqual(message.strToStr_Count, (NSUInteger)2);
-  message.strToStr =
-      [NSMutableDictionary dictionaryWithObject:@"baz" forKey:@"mumble"];
-  XCTAssertEqual(message.strToStr_Count, (NSUInteger)1);
-}
-
-- (void)testReplaceAutocreatedMap {
-  // Replacing map should orphan the old one and cause its creator to become
-  // visible.
-  {
-    TestRecursiveMessageWithRepeatedField *message =
-        [TestRecursiveMessageWithRepeatedField message];
-    XCTAssertNotNil(message.a);
-    XCTAssertNotNil(message.a.iToI);
-    XCTAssertFalse([message hasA]);
-    GPBInt32Int32Dictionary *iToI = [message.a.iToI retain];
-    XCTAssertEqual(iToI->_autocreator, message.a);  // Pointer comparison
-    message.a.iToI = [[[GPBInt32Int32Dictionary alloc] init] autorelease];
-    [message.a.iToI setInt32:6 forKey:7];
-    XCTAssertTrue([message hasA]);
-    XCTAssertNotEqual(message.a.iToI, iToI);  // Pointer comparison
-    XCTAssertNil(iToI->_autocreator);
-    [iToI release];
-  }
-
-  {
-    TestRecursiveMessageWithRepeatedField *message =
-        [TestRecursiveMessageWithRepeatedField message];
-    XCTAssertNotNil(message.a);
-    XCTAssertNotNil(message.a.strToStr);
-    XCTAssertFalse([message hasA]);
-    GPBAutocreatedDictionary *strToStr =
-        (GPBAutocreatedDictionary *)[message.a.strToStr retain];
-    XCTAssertTrue([strToStr isKindOfClass:[GPBAutocreatedDictionary class]]);
-    XCTAssertEqual(strToStr->_autocreator, message.a);  // Pointer comparison
-    message.a.strToStr =
-        [NSMutableDictionary dictionaryWithObject:@"abc" forKey:@"def"];
-    XCTAssertTrue([message hasA]);
-    XCTAssertNotEqual(message.a.strToStr, strToStr);  // Pointer comparison
-    XCTAssertNil(strToStr->_autocreator);
-    [strToStr release];
-  }
-}
-
-- (void)testSetAutocreatedMapToSelf {
-  // Setting map to itself should cause it to become visible.
-  {
-    TestRecursiveMessageWithRepeatedField *message =
-        [TestRecursiveMessageWithRepeatedField message];
-    XCTAssertNotNil(message.a);
-    XCTAssertNotNil(message.a.iToI);
-    XCTAssertFalse([message hasA]);
-    message.a.iToI = message.a.iToI;
-    XCTAssertTrue([message hasA]);
-    XCTAssertNil(message.a.iToI->_autocreator);
-  }
-
-  {
-    TestRecursiveMessageWithRepeatedField *message =
-        [TestRecursiveMessageWithRepeatedField message];
-    XCTAssertNotNil(message.a);
-    XCTAssertNotNil(message.a.strToStr);
-    XCTAssertFalse([message hasA]);
-    message.a.strToStr = message.a.strToStr;
-    XCTAssertTrue([message hasA]);
-    XCTAssertTrue([message.a.strToStr isKindOfClass:[GPBAutocreatedDictionary class]]);
-    XCTAssertNil(((GPBAutocreatedDictionary *)message.a.strToStr)->_autocreator);
-  }
-}
-
-- (void)testAutocreatedMapRemoveAllValues {
-  // Calling removeAll on autocreated map should not cause it to be visible.
-  TestRecursiveMessageWithRepeatedField *message =
-      [TestRecursiveMessageWithRepeatedField message];
-  [message.a.iToI removeAll];
-  XCTAssertFalse([message hasA]);
-  [message.a.strToStr removeAllObjects];
-  XCTAssertFalse([message hasA]);
-}
-
-- (void)testExtensionAccessors {
-  TestAllExtensions *message = [TestAllExtensions message];
-  [self setAllExtensions:message repeatedCount:kGPBDefaultRepeatCount];
-  [self assertAllExtensionsSet:message repeatedCount:kGPBDefaultRepeatCount];
-}
-
-- (void)testExtensionRepeatedSetters {
-  TestAllExtensions *message = [TestAllExtensions message];
-  [self setAllExtensions:message repeatedCount:kGPBDefaultRepeatCount];
-  [self modifyRepeatedExtensions:message];
-  [self assertRepeatedExtensionsModified:message
-                           repeatedCount:kGPBDefaultRepeatCount];
-}
-
-- (void)testExtensionDefaults {
-  [self assertExtensionsClear:[TestAllExtensions message]];
-}
-
-- (void)testExtensionIsEquals {
-  TestAllExtensions *message = [TestAllExtensions message];
-  [self setAllExtensions:message repeatedCount:kGPBDefaultRepeatCount];
-  [self modifyRepeatedExtensions:message];
-  TestAllExtensions *message2 = [TestAllExtensions message];
-  [self setAllExtensions:message2 repeatedCount:kGPBDefaultRepeatCount];
-  XCTAssertFalse([message isEqual:message2]);
-  message2 = [TestAllExtensions message];
-  [self setAllExtensions:message2 repeatedCount:kGPBDefaultRepeatCount];
-  [self modifyRepeatedExtensions:message2];
-  XCTAssertEqualObjects(message, message2);
-}
-
-- (void)testExtensionsMergeFrom {
-  TestAllExtensions *message = [TestAllExtensions message];
-  [self setAllExtensions:message repeatedCount:kGPBDefaultRepeatCount];
-  [self modifyRepeatedExtensions:message];
-
-  message = [TestAllExtensions message];
-  [self setAllExtensions:message repeatedCount:kGPBDefaultRepeatCount];
-  TestAllExtensions *message2 = [TestAllExtensions message];
-  [self modifyRepeatedExtensions:message2];
-  [message2 mergeFrom:message];
-
-  XCTAssertEqualObjects(message, message2);
-}
-
-- (void)testDefaultingExtensionMessages {
-  TestAllExtensions *message = [TestAllExtensions message];
-
-  // Initially they should all not have values.
-
-  XCTAssertFalse([message hasExtension:[UnittestRoot optionalGroupExtension]]);
-  XCTAssertFalse([message hasExtension:[UnittestRoot optionalGroupExtension]]);
-  XCTAssertFalse(
-      [message hasExtension:[UnittestRoot optionalNestedMessageExtension]]);
-  XCTAssertFalse(
-      [message hasExtension:[UnittestRoot optionalForeignMessageExtension]]);
-  XCTAssertFalse(
-      [message hasExtension:[UnittestRoot optionalImportMessageExtension]]);
-  XCTAssertFalse([message
-      hasExtension:[UnittestRoot optionalPublicImportMessageExtension]]);
-  XCTAssertFalse(
-      [message hasExtension:[UnittestRoot optionalLazyMessageExtension]]);
-
-  // They should auto create something when fetched.
-
-  TestAllTypes_OptionalGroup *optionalGroup =
-      [message getExtension:[UnittestRoot optionalGroupExtension]];
-  TestAllTypes_NestedMessage *optionalNestedMessage =
-      [message getExtension:[UnittestRoot optionalNestedMessageExtension]];
-  ForeignMessage *optionalForeignMessage =
-      [message getExtension:[UnittestRoot optionalForeignMessageExtension]];
-  ImportMessage *optionalImportMessage =
-      [message getExtension:[UnittestRoot optionalImportMessageExtension]];
-  PublicImportMessage *optionalPublicImportMessage = [message
-      getExtension:[UnittestRoot optionalPublicImportMessageExtension]];
-  TestAllTypes_NestedMessage *optionalLazyMessage =
-      [message getExtension:[UnittestRoot optionalLazyMessageExtension]];
-
-  XCTAssertNotNil(optionalGroup);
-  XCTAssertNotNil(optionalNestedMessage);
-  XCTAssertNotNil(optionalForeignMessage);
-  XCTAssertNotNil(optionalImportMessage);
-  XCTAssertNotNil(optionalPublicImportMessage);
-  XCTAssertNotNil(optionalLazyMessage);
-
-  // Although it auto-created empty messages, it should not show that it has
-  // them.
-
-  XCTAssertFalse([message hasExtension:[UnittestRoot optionalGroupExtension]]);
-  XCTAssertFalse([message hasExtension:[UnittestRoot optionalGroupExtension]]);
-  XCTAssertFalse([message hasExtension:[UnittestRoot optionalNestedMessageExtension]]);
-  XCTAssertFalse([message hasExtension:[UnittestRoot optionalForeignMessageExtension]]);
-  XCTAssertFalse([message hasExtension:[UnittestRoot optionalImportMessageExtension]]);
-  XCTAssertFalse([message hasExtension:[UnittestRoot optionalPublicImportMessageExtension]]);
-  XCTAssertFalse([message hasExtension:[UnittestRoot optionalLazyMessageExtension]]);
-
-  // And they set that value back in to the message since the value created was
-  // mutable (so a second fetch should give the same object).
-
-  XCTAssertEqual([message getExtension:[UnittestRoot optionalGroupExtension]],
-                 optionalGroup);
-  XCTAssertEqual(
-      [message getExtension:[UnittestRoot optionalNestedMessageExtension]],
-      optionalNestedMessage);
-  XCTAssertEqual(
-      [message getExtension:[UnittestRoot optionalForeignMessageExtension]],
-      optionalForeignMessage);
-  XCTAssertEqual(
-      [message getExtension:[UnittestRoot optionalImportMessageExtension]],
-      optionalImportMessage);
-  XCTAssertEqual(
-      [message getExtension:[UnittestRoot optionalPublicImportMessageExtension]],
-      optionalPublicImportMessage);
-  XCTAssertEqual(
-      [message getExtension:[UnittestRoot optionalLazyMessageExtension]],
-      optionalLazyMessage);
-
-  // And the default objects for a second message should be distinct (again,
-  // since they are mutable, each needs their own copy).
-
-  TestAllExtensions *message2 = [TestAllExtensions message];
-
-  // Intentionally doing a pointer comparison.
-  XCTAssertNotEqual(
-      [message2 getExtension:[UnittestRoot optionalGroupExtension]],
-      optionalGroup);
-  XCTAssertNotEqual(
-      [message2 getExtension:[UnittestRoot optionalNestedMessageExtension]],
-      optionalNestedMessage);
-  XCTAssertNotEqual(
-      [message2 getExtension:[UnittestRoot optionalForeignMessageExtension]],
-      optionalForeignMessage);
-  XCTAssertNotEqual(
-      [message2 getExtension:[UnittestRoot optionalImportMessageExtension]],
-      optionalImportMessage);
-  XCTAssertNotEqual(
-      [message2 getExtension:[UnittestRoot optionalPublicImportMessageExtension]],
-      optionalPublicImportMessage);
-  XCTAssertNotEqual(
-      [message2 getExtension:[UnittestRoot optionalLazyMessageExtension]],
-      optionalLazyMessage);
-
-  // Clear values, and on next access you get back new submessages.
-
-  [message setExtension:[UnittestRoot optionalGroupExtension] value:nil];
-  [message setExtension:[UnittestRoot optionalGroupExtension] value:nil];
-  [message setExtension:[UnittestRoot optionalNestedMessageExtension]
-                  value:nil];
-  [message setExtension:[UnittestRoot optionalForeignMessageExtension]
-                  value:nil];
-  [message setExtension:[UnittestRoot optionalImportMessageExtension]
-                  value:nil];
-  [message setExtension:[UnittestRoot optionalPublicImportMessageExtension]
-                  value:nil];
-  [message setExtension:[UnittestRoot optionalLazyMessageExtension] value:nil];
-
-  XCTAssertFalse([message hasExtension:[UnittestRoot optionalGroupExtension]]);
-  XCTAssertFalse([message hasExtension:[UnittestRoot optionalGroupExtension]]);
-  XCTAssertFalse(
-      [message hasExtension:[UnittestRoot optionalNestedMessageExtension]]);
-  XCTAssertFalse(
-      [message hasExtension:[UnittestRoot optionalForeignMessageExtension]]);
-  XCTAssertFalse(
-      [message hasExtension:[UnittestRoot optionalImportMessageExtension]]);
-  XCTAssertFalse([message
-      hasExtension:[UnittestRoot optionalPublicImportMessageExtension]]);
-  XCTAssertFalse(
-      [message hasExtension:[UnittestRoot optionalLazyMessageExtension]]);
-
-  XCTAssertEqual([message getExtension:[UnittestRoot optionalGroupExtension]],
-                 optionalGroup);
-  XCTAssertEqual(
-      [message getExtension:[UnittestRoot optionalNestedMessageExtension]],
-      optionalNestedMessage);
-  XCTAssertEqual(
-      [message getExtension:[UnittestRoot optionalForeignMessageExtension]],
-      optionalForeignMessage);
-  XCTAssertEqual(
-      [message getExtension:[UnittestRoot optionalImportMessageExtension]],
-      optionalImportMessage);
-  XCTAssertEqual(
-      [message
-          getExtension:[UnittestRoot optionalPublicImportMessageExtension]],
-      optionalPublicImportMessage);
-  XCTAssertEqual(
-      [message getExtension:[UnittestRoot optionalLazyMessageExtension]],
-      optionalLazyMessage);
-}
-
-- (void)testMultiplePointersToAutocreatedExtension {
-  // 2 objects point to the same auto-created extension. One should "has" it.
-  // The other should not.
-  TestAllExtensions *message = [TestAllExtensions message];
-  TestAllExtensions *message2 = [TestAllExtensions message];
-  GPBExtensionDescriptor *extension = [UnittestRoot optionalGroupExtension];
-  [message setExtension:extension value:[message2 getExtension:extension]];
-  XCTAssertEqual([message getExtension:extension],
-                 [message2 getExtension:extension]);
-  XCTAssertFalse([message2 hasExtension:extension]);
-  XCTAssertTrue([message hasExtension:extension]);
-
-  TestAllTypes_OptionalGroup *extensionValue =
-      [message2 getExtension:extension];
-  extensionValue.a = 1;
-  XCTAssertTrue([message2 hasExtension:extension]);
-  XCTAssertTrue([message hasExtension:extension]);
-}
-
-- (void)testCopyWithAutocreatedExtension {
-  // Mutable copy shouldn't copy autocreated extensions.
-  TestAllExtensions *message = [TestAllExtensions message];
-  GPBExtensionDescriptor *optionalGroupExtension =
-      [UnittestRoot optionalGroupExtension];
-  GPBExtensionDescriptor *optionalNestedMessageExtesion =
-      [UnittestRoot optionalNestedMessageExtension];
-  TestAllTypes_OptionalGroup *optionalGroup =
-      [message getExtension:optionalGroupExtension];
-  optionalGroup.a = 42;
-  XCTAssertNotNil(optionalGroup);
-  XCTAssertNotNil([message getExtension:optionalNestedMessageExtesion]);
-  XCTAssertTrue([message hasExtension:optionalGroupExtension]);
-  XCTAssertFalse([message hasExtension:optionalNestedMessageExtesion]);
-
-  TestAllExtensions *message2 = [[message copy] autorelease];
-
-  // message2 should end up with its own copy of the optional group.
-  XCTAssertTrue([message2 hasExtension:optionalGroupExtension]);
-  XCTAssertEqualObjects([message getExtension:optionalGroupExtension],
-                        [message2 getExtension:optionalGroupExtension]);
-  // Intentionally doing a pointer comparison.
-  XCTAssertNotEqual([message getExtension:optionalGroupExtension],
-                    [message2 getExtension:optionalGroupExtension]);
-
-  XCTAssertFalse([message2 hasExtension:optionalNestedMessageExtesion]);
-  // Intentionally doing a pointer comparison (auto creation should be
-  // different)
-  XCTAssertNotEqual([message getExtension:optionalNestedMessageExtesion],
-                    [message2 getExtension:optionalNestedMessageExtesion]);
-}
-
-- (void)testClearMessageAutocreatedExtension {
-  // Call clear should cause it to recreate its autocreated extensions.
-  TestAllExtensions *message = [TestAllExtensions message];
-  GPBExtensionDescriptor *optionalGroupExtension =
-      [UnittestRoot optionalGroupExtension];
-  TestAllTypes_OptionalGroup *optionalGroup =
-      [[message getExtension:optionalGroupExtension] retain];
-  [message clear];
-  TestAllTypes_OptionalGroup *optionalGroupNew =
-      [message getExtension:optionalGroupExtension];
-
-  // Intentionally doing a pointer comparison.
-  XCTAssertNotEqual(optionalGroup, optionalGroupNew);
-  [optionalGroup release];
-}
-
-- (void)testRetainAutocreatedExtension {
-  // Should be able to retain autocreated extension while the creator is
-  // dealloced.
-  TestAllExtensions *message = [TestAllExtensions message];
-  GPBExtensionDescriptor *optionalGroupExtension =
-      [UnittestRoot optionalGroupExtension];
-
-  @autoreleasepool {
-    TestAllExtensions *message2 = [TestAllExtensions message];
-    [message setExtension:optionalGroupExtension
-                    value:[message2 getExtension:optionalGroupExtension]];
-    XCTAssertTrue(GPBWasMessageAutocreatedBy(
-        [message getExtension:optionalGroupExtension], message2));
-  }
-
-  XCTAssertFalse(GPBWasMessageAutocreatedBy(
-      [message getExtension:optionalGroupExtension], message));
-}
-
-- (void)testClearAutocreatedExtension {
-  // Clearing autocreated extension should NOT cause it to lose its creator.
-  TestAllExtensions *message = [TestAllExtensions message];
-  GPBExtensionDescriptor *optionalGroupExtension =
-      [UnittestRoot optionalGroupExtension];
-  TestAllTypes_OptionalGroup *optionalGroup =
-      [[message getExtension:optionalGroupExtension] retain];
-  [message clearExtension:optionalGroupExtension];
-  TestAllTypes_OptionalGroup *optionalGroupNew =
-      [message getExtension:optionalGroupExtension];
-  XCTAssertEqual(optionalGroup, optionalGroupNew);
-  XCTAssertFalse([message hasExtension:optionalGroupExtension]);
-  [optionalGroup release];
-
-  // Clearing autocreated extension should not cause its creator to become
-  // visible
-  GPBExtensionDescriptor *recursiveExtension =
-      [UnittestObjcRoot recursiveExtension];
-  TestAllExtensions *message_lvl2 = [message getExtension:recursiveExtension];
-  TestAllExtensions *message_lvl3 =
-      [message_lvl2 getExtension:recursiveExtension];
-  [message_lvl3 clearExtension:recursiveExtension];
-  XCTAssertFalse([message hasExtension:recursiveExtension]);
-}
-
-- (void)testSetAutocreatedExtensionBecomesVisible {
-  // Setting an extension should cause the extension to appear to its creator.
-  // Test this several levels deep.
-  TestAllExtensions *message = [TestAllExtensions message];
-  GPBExtensionDescriptor *recursiveExtension =
-      [UnittestObjcRoot recursiveExtension];
-  TestAllExtensions *message_lvl2 = [message getExtension:recursiveExtension];
-  TestAllExtensions *message_lvl3 =
-      [message_lvl2 getExtension:recursiveExtension];
-  TestAllExtensions *message_lvl4 =
-      [message_lvl3 getExtension:recursiveExtension];
-  XCTAssertFalse([message hasExtension:recursiveExtension]);
-  XCTAssertFalse([message_lvl2 hasExtension:recursiveExtension]);
-  XCTAssertFalse([message_lvl3 hasExtension:recursiveExtension]);
-  XCTAssertFalse([message_lvl4 hasExtension:recursiveExtension]);
-  [message_lvl4 setExtension:[UnittestRoot optionalInt32Extension] value:@(1)];
-  XCTAssertTrue([message hasExtension:recursiveExtension]);
-  XCTAssertTrue([message_lvl2 hasExtension:recursiveExtension]);
-  XCTAssertTrue([message_lvl3 hasExtension:recursiveExtension]);
-  XCTAssertFalse([message_lvl4 hasExtension:recursiveExtension]);
-  XCTAssertFalse(GPBWasMessageAutocreatedBy(message_lvl4, message_lvl3));
-  XCTAssertFalse(GPBWasMessageAutocreatedBy(message_lvl3, message_lvl2));
-  XCTAssertFalse(GPBWasMessageAutocreatedBy(message_lvl2, message));
-}
-
-- (void)testSetAutocreatedExtensionToSelf {
-  // Setting extension to itself should cause it to become visible.
-  TestAllExtensions *message = [TestAllExtensions message];
-  GPBExtensionDescriptor *optionalGroupExtension =
-      [UnittestRoot optionalGroupExtension];
-  XCTAssertNotNil([message getExtension:optionalGroupExtension]);
-  XCTAssertFalse([message hasExtension:optionalGroupExtension]);
-  [message setExtension:optionalGroupExtension
-                  value:[message getExtension:optionalGroupExtension]];
-  XCTAssertTrue([message hasExtension:optionalGroupExtension]);
-}
-
-- (void)testAutocreatedExtensionMemoryLeaks {
-  GPBExtensionDescriptor *recursiveExtension =
-      [UnittestObjcRoot recursiveExtension];
-
-  // Test for memory leaks with autocreated extensions.
-  TestAllExtensions *message;
-  TestAllExtensions *message_lvl2;
-  TestAllExtensions *message_lvl3;
-  TestAllExtensions *message_lvl4;
-  @autoreleasepool {
-    message = [[TestAllExtensions alloc] init];
-    message_lvl2 = [[message getExtension:recursiveExtension] retain];
-    message_lvl3 = [[message_lvl2 getExtension:recursiveExtension] retain];
-    message_lvl4 = [[message_lvl3 getExtension:recursiveExtension] retain];
-    [message_lvl2 setExtension:[UnittestRoot optionalInt32Extension]
-                         value:@(1)];
-  }
-
-  XCTAssertEqual(message.retainCount, (NSUInteger)1);
-  @autoreleasepool {
-    [message release];
-  }
-  XCTAssertEqual(message_lvl2.retainCount, (NSUInteger)1);
-  @autoreleasepool {
-    [message_lvl2 release];
-  }
-  XCTAssertEqual(message_lvl3.retainCount, (NSUInteger)1);
-  @autoreleasepool {
-    [message_lvl3 release];
-  }
-  XCTAssertEqual(message_lvl4.retainCount, (NSUInteger)1);
-  [message_lvl4 release];
-}
-
-- (void)testSetExtensionWithAutocreatedValue {
-  GPBExtensionDescriptor *recursiveExtension =
-      [UnittestObjcRoot recursiveExtension];
-
-  TestAllExtensions *message;
-  @autoreleasepool {
-    message = [[TestAllExtensions alloc] init];
-    [message getExtension:recursiveExtension];
-  }
-
-  // This statements checks that the extension value isn't accidentally
-  // dealloced when removing it from the autocreated map.
-  [message setExtension:recursiveExtension
-                  value:[message getExtension:recursiveExtension]];
-  XCTAssertTrue([message hasExtension:recursiveExtension]);
-  [message release];
-}
-
-- (void)testRecursion {
-  TestRecursiveMessage *message = [TestRecursiveMessage message];
-  XCTAssertNotNil(message.a);
-  XCTAssertNotNil(message.a.a);
-  XCTAssertEqual(message.a.a.i, 0);
-}
-
-- (void)testGenerateAndParseUnknownMessage {
-  GPBUnknownFieldSet *unknowns =
-      [[[GPBUnknownFieldSet alloc] init] autorelease];
-  [unknowns mergeVarintField:123 value:456];
-  GPBMessage *message = [GPBMessage message];
-  [message setUnknownFields:unknowns];
-  NSData *data = [message data];
-  GPBMessage *message2 =
-      [GPBMessage parseFromData:data extensionRegistry:nil error:NULL];
-  XCTAssertEqualObjects(message, message2);
-}
-
-- (void)testDelimitedWriteAndParseMultipleMessages {
-  GPBUnknownFieldSet *unknowns1 =
-      [[[GPBUnknownFieldSet alloc] init] autorelease];
-  [unknowns1 mergeVarintField:123 value:456];
-  GPBMessage *message1 = [GPBMessage message];
-  [message1 setUnknownFields:unknowns1];
-
-  GPBUnknownFieldSet *unknowns2 =
-      [[[GPBUnknownFieldSet alloc] init] autorelease];
-  [unknowns2 mergeVarintField:789 value:987];
-  [unknowns2 mergeVarintField:654 value:321];
-  GPBMessage *message2 = [GPBMessage message];
-  [message2 setUnknownFields:unknowns2];
-
-  NSMutableData *delimitedData = [NSMutableData data];
-  [delimitedData appendData:[message1 delimitedData]];
-  [delimitedData appendData:[message2 delimitedData]];
-  GPBCodedInputStream *input =
-      [GPBCodedInputStream streamWithData:delimitedData];
-  GPBMessage *message3 = [GPBMessage parseDelimitedFromCodedInputStream:input
-                                                      extensionRegistry:nil
-                                                                  error:NULL];
-  GPBMessage *message4 = [GPBMessage parseDelimitedFromCodedInputStream:input
-                                                      extensionRegistry:nil
-                                                                  error:NULL];
-  XCTAssertEqualObjects(message1, message3);
-  XCTAssertEqualObjects(message2, message4);
-}
-
-- (void)testDuplicateEnums {
-  XCTAssertEqual(TestEnumWithDupValue_Foo1, TestEnumWithDupValue_Foo2);
-}
-
-- (void)testWeirdDefaults {
-  ObjcWeirdDefaults *message = [ObjcWeirdDefaults message];
-  GPBDescriptor *descriptor = [[message class] descriptor];
-  GPBFieldDescriptor *fieldDesc = [descriptor fieldWithName:@"foo"];
-  XCTAssertNotNil(fieldDesc);
-  XCTAssertTrue(fieldDesc.hasDefaultValue);
-  XCTAssertFalse(message.hasFoo);
-  XCTAssertEqualObjects(message.foo, @"");
-
-  fieldDesc = [descriptor fieldWithName:@"bar"];
-  XCTAssertNotNil(fieldDesc);
-  XCTAssertTrue(fieldDesc.hasDefaultValue);
-  XCTAssertFalse(message.hasBar);
-  XCTAssertEqualObjects(message.bar, GPBEmptyNSData());
-}
-
-- (void)testEnumDescriptorFromExtensionDescriptor {
-  GPBExtensionDescriptor *extDescriptor =
-      [UnittestRoot optionalForeignEnumExtension];
-  XCTAssertEqual(extDescriptor.dataType, GPBDataTypeEnum);
-  GPBEnumDescriptor *enumDescriptor = extDescriptor.enumDescriptor;
-  GPBEnumDescriptor *expectedDescriptor = ForeignEnum_EnumDescriptor();
-  XCTAssertEqualObjects(enumDescriptor, expectedDescriptor);
-}
-
-- (void)testPropertyNaming {
-  // objectivec_helpers.cc has some special handing to get proper all caps
-  // for a few cases to meet objc developer expectations.
-  //
-  // This "test" confirms that the expected names are generated, otherwise the
-  // test itself will fail to compile.
-  ObjCPropertyNaming *msg = [ObjCPropertyNaming message];
-  // On their own, at the end, in the middle.
-  msg.URL = @"good";
-  msg.thumbnailURL = @"good";
-  msg.URLFoo = @"good";
-  msg.someURLBlah = @"good";
-  msg.HTTP = @"good";
-  msg.HTTPS = @"good";
-  // No caps since it was "urls".
-  [msg.urlsArray addObject:@"good"];
-}
-
-- (void)testEnumNaming {
-  // objectivec_helpers.cc has some interesting cases to deal with in
-  // EnumValueName/EnumValueShortName.  Confirm that things generated as
-  // expected.
-
-  // This block just has to compile to confirm we got the expected types/names.
-  // The *_IsValidValue() calls are just there to keep the projects warnings
-  // flags happy by providing use of the variables/values.
-
-  Foo aFoo = Foo_SerializedSize;
-  Foo_IsValidValue(aFoo);
-  aFoo = Foo_Size;
-  Foo_IsValidValue(aFoo);
-
-  Category_Enum aCat = Category_Enum_Red;
-  Category_Enum_IsValidValue(aCat);
-
-  Time aTime = Time_Base;
-  Time_IsValidValue(aTime);
-  aTime = Time_SomethingElse;
-  Time_IsValidValue(aTime);
-
-  // This block confirms the names in the descriptors is what we wanted.
-
-  GPBEnumDescriptor *descriptor;
-  NSString *valueName;
-
-  descriptor = Foo_EnumDescriptor();
-  XCTAssertNotNil(descriptor);
-  XCTAssertEqualObjects(@"Foo", descriptor.name);
-  valueName = [descriptor enumNameForValue:Foo_SerializedSize];
-  XCTAssertEqualObjects(@"Foo_SerializedSize", valueName);
-  valueName = [descriptor enumNameForValue:Foo_Size];
-  XCTAssertEqualObjects(@"Foo_Size", valueName);
-
-  descriptor = Category_Enum_EnumDescriptor();
-  XCTAssertNotNil(descriptor);
-  XCTAssertEqualObjects(@"Category_Enum", descriptor.name);
-  valueName = [descriptor enumNameForValue:Category_Enum_Red];
-  XCTAssertEqualObjects(@"Category_Enum_Red", valueName);
-
-  descriptor = Time_EnumDescriptor();
-  XCTAssertNotNil(descriptor);
-  XCTAssertEqualObjects(@"Time", descriptor.name);
-  valueName = [descriptor enumNameForValue:Time_Base];
-  XCTAssertEqualObjects(@"Time_Base", valueName);
-  valueName = [descriptor enumNameForValue:Time_SomethingElse];
-  XCTAssertEqualObjects(@"Time_SomethingElse", valueName);
-}
-
-- (void)testNegativeEnums {
-  EnumTestMsg *msg = [EnumTestMsg message];
-
-  // Defaults
-  XCTAssertEqual(msg.foo, EnumTestMsg_MyEnum_Zero);
-  XCTAssertEqual(msg.bar, EnumTestMsg_MyEnum_One);
-  XCTAssertEqual(msg.baz, EnumTestMsg_MyEnum_NegOne);
-  // Bounce to wire and back.
-  NSData *data = [msg data];
-  XCTAssertNotNil(data);
-  EnumTestMsg *msgPrime = [EnumTestMsg parseFromData:data error:NULL];
-  XCTAssertEqualObjects(msgPrime, msg);
-  XCTAssertEqual(msgPrime.foo, EnumTestMsg_MyEnum_Zero);
-  XCTAssertEqual(msgPrime.bar, EnumTestMsg_MyEnum_One);
-  XCTAssertEqual(msgPrime.baz, EnumTestMsg_MyEnum_NegOne);
-
-  // Other values
-  msg.bar = EnumTestMsg_MyEnum_Two;
-  msg.baz = EnumTestMsg_MyEnum_NegTwo;
-  XCTAssertEqual(msg.bar, EnumTestMsg_MyEnum_Two);
-  XCTAssertEqual(msg.baz, EnumTestMsg_MyEnum_NegTwo);
-  // Bounce to wire and back.
-  data = [msg data];
-  XCTAssertNotNil(data);
-  msgPrime = [EnumTestMsg parseFromData:data error:NULL];
-  XCTAssertEqualObjects(msgPrime, msg);
-  XCTAssertEqual(msgPrime.foo, EnumTestMsg_MyEnum_Zero);
-  XCTAssertEqual(msgPrime.bar, EnumTestMsg_MyEnum_Two);
-  XCTAssertEqual(msgPrime.baz, EnumTestMsg_MyEnum_NegTwo);
-
-  // Repeated field (shouldn't ever be an issue since developer has to use the
-  // right GPBArray methods themselves).
-  msg.mumbleArray = [GPBEnumArray
-      arrayWithValidationFunction:EnumTestMsg_MyEnum_IsValidValue];
-  [msg.mumbleArray addValue:EnumTestMsg_MyEnum_Zero];
-  [msg.mumbleArray addValue:EnumTestMsg_MyEnum_One];
-  [msg.mumbleArray addValue:EnumTestMsg_MyEnum_Two];
-  [msg.mumbleArray addValue:EnumTestMsg_MyEnum_NegOne];
-  [msg.mumbleArray addValue:EnumTestMsg_MyEnum_NegTwo];
-  XCTAssertEqual([msg.mumbleArray valueAtIndex:0], EnumTestMsg_MyEnum_Zero);
-  XCTAssertEqual([msg.mumbleArray valueAtIndex:1], EnumTestMsg_MyEnum_One);
-  XCTAssertEqual([msg.mumbleArray valueAtIndex:2], EnumTestMsg_MyEnum_Two);
-  XCTAssertEqual([msg.mumbleArray valueAtIndex:3], EnumTestMsg_MyEnum_NegOne);
-  XCTAssertEqual([msg.mumbleArray valueAtIndex:4], EnumTestMsg_MyEnum_NegTwo);
-  // Bounce to wire and back.
-  data = [msg data];
-  XCTAssertNotNil(data);
-  msgPrime = [EnumTestMsg parseFromData:data error:NULL];
-  XCTAssertEqualObjects(msgPrime, msg);
-  XCTAssertEqual([msgPrime.mumbleArray valueAtIndex:0],
-                 EnumTestMsg_MyEnum_Zero);
-  XCTAssertEqual([msgPrime.mumbleArray valueAtIndex:1], EnumTestMsg_MyEnum_One);
-  XCTAssertEqual([msgPrime.mumbleArray valueAtIndex:2], EnumTestMsg_MyEnum_Two);
-  XCTAssertEqual([msgPrime.mumbleArray valueAtIndex:3],
-                 EnumTestMsg_MyEnum_NegOne);
-  XCTAssertEqual([msgPrime.mumbleArray valueAtIndex:4],
-                 EnumTestMsg_MyEnum_NegTwo);
-}
-
-- (void)testReservedWordNaming {
-  // objectivec_helpers.cc has some special handing to make sure that
-  // some "reserved" objc names get renamed in a way so they
-  // don't conflict.
-  //
-  // This "test" confirms that the expected names are generated,
-  // otherwise the test itself will fail to compile.
-  self_Class *msg = [self_Class message];
-
-  // Some ObjC/C/C++ keywords.
-  msg.className_p = msg.hasClassName_p;
-  msg.cmd = msg.hasCmd;
-  msg.nullable_p = msg.hasNullable_p;
-  msg.typeof_p = msg.hasTypeof_p;
-  msg.instancetype_p = msg.hasInstancetype_p;
-  msg.nil_p = msg.hasNil_p;
-  msg.instancetype_p = msg.hasInstancetype_p;
-  msg.public_p = msg.hasPublic_p;
-
-  // Some that would override NSObject methods
-  msg.camltype = msg.hasCamltype;
-  msg.isNsdictionary = msg.hasIsNsdictionary;
-  msg.dealloc_p = msg.hasDealloc_p;
-  msg.zone_p = msg.hasZone_p;
-  msg.accessibilityLabel_p = msg.hasAccessibilityLabel_p;
-
-  // Some that we shouldn't need to handle.
-  msg.atomic = msg.hasAtomic;
-  msg.nonatomic = msg.hasNonatomic;
-  msg.strong = msg.hasStrong;
-  msg.nullResettable = msg.hasNullResettable;
-
-  // Some that would override GPBMessage methods
-  msg.clear_p = msg.hasClear_p;
-  msg.data_p = msg.hasData_p;
-
-  // Some MacTypes
-  msg.fixed = msg.hasFixed;
-  msg.style = msg.hasStyle;
-
-  // Some C Identifiers
-  msg.generic = msg.hasGeneric;
-  msg.block = msg.hasBlock;
-}
-
-- (void)testOneBasedEnumHolder {
-  // Test case for https://github.com/protocolbuffers/protobuf/issues/1453
-  // Message with no explicit defaults, but a non zero default for an enum.
-  MessageWithOneBasedEnum *enumMsg = [MessageWithOneBasedEnum message];
-  XCTAssertEqual(enumMsg.enumField, MessageWithOneBasedEnum_OneBasedEnum_One);
-}
-
-- (void)testBoolOffsetUsage {
-  // Bools use storage within has_bits; this test ensures that this is honored
-  // in all places where things should crash or fail based on reading out of
-  // field storage instead.
-  BoolOnlyMessage *msg1 = [BoolOnlyMessage message];
-  BoolOnlyMessage *msg2 = [BoolOnlyMessage message];
-
-  msg1.boolField1 = YES;
-  msg2.boolField1 = YES;
-  msg1.boolField3 = YES;
-  msg2.boolField3 = YES;
-  msg1.boolField5 = YES;
-  msg2.boolField5 = YES;
-  msg1.boolField7 = YES;
-  msg2.boolField7 = YES;
-  msg1.boolField9 = YES;
-  msg2.boolField9 = YES;
-  msg1.boolField11 = YES;
-  msg2.boolField11 = YES;
-  msg1.boolField13 = YES;
-  msg2.boolField13 = YES;
-  msg1.boolField15 = YES;
-  msg2.boolField15 = YES;
-  msg1.boolField17 = YES;
-  msg2.boolField17 = YES;
-  msg1.boolField19 = YES;
-  msg2.boolField19 = YES;
-  msg1.boolField21 = YES;
-  msg2.boolField21 = YES;
-  msg1.boolField23 = YES;
-  msg2.boolField23 = YES;
-  msg1.boolField25 = YES;
-  msg2.boolField25 = YES;
-  msg1.boolField27 = YES;
-  msg2.boolField27 = YES;
-  msg1.boolField29 = YES;
-  msg2.boolField29 = YES;
-  msg1.boolField31 = YES;
-  msg2.boolField31 = YES;
-
-  msg1.boolField32 = YES;
-  msg2.boolField32 = YES;
-
-  XCTAssertTrue(msg1 != msg2); // Different pointers.
-  XCTAssertEqual([msg1 hash], [msg2 hash]);
-  XCTAssertEqualObjects(msg1, msg2);
-
-  BoolOnlyMessage *msg1Prime = [[msg1 copy] autorelease];
-  XCTAssertTrue(msg1Prime != msg1); // Different pointers.
-  XCTAssertEqual([msg1 hash], [msg1Prime hash]);
-  XCTAssertEqualObjects(msg1, msg1Prime);
-
-  // Field set in one, but not the other means they don't match (even if
-  // set to default value).
-  msg1Prime.boolField2 = NO;
-  XCTAssertNotEqualObjects(msg1Prime, msg1);
-  // And when set to different values.
-  msg1.boolField2 = YES;
-  XCTAssertNotEqualObjects(msg1Prime, msg1);
-  // And then they match again.
-  msg1.boolField2 = NO;
-  XCTAssertEqualObjects(msg1Prime, msg1);
-  XCTAssertEqual([msg1 hash], [msg1Prime hash]);
-}
-
-- (void)testCopyingMapFields {
-  TestMessageOfMaps *msg = [TestMessageOfMaps message];
-
-  msg.strToStr[@"foo"] = @"bar";
-
-  [msg.strToInt setInt32:1 forKey:@"mumble"];
-  [msg.intToStr setObject:@"wee" forKey:42];
-  [msg.intToInt setInt32:123 forKey:321];
-
-  [msg.strToBool setBool:YES forKey:@"one"];
-  [msg.boolToStr setObject:@"something" forKey:YES];
-  [msg.boolToBool setBool:YES forKey:NO];
-
-  [msg.intToBool setBool:YES forKey:13];
-  [msg.boolToInt setInt32:111 forKey:NO];
-
-  TestAllTypes *subMsg1 = [TestAllTypes message];
-  subMsg1.optionalInt32 = 1;
-  TestAllTypes *subMsg2 = [TestAllTypes message];
-  subMsg1.optionalInt32 = 2;
-  TestAllTypes *subMsg3 = [TestAllTypes message];
-  subMsg1.optionalInt32 = 3;
-
-  msg.strToMsg[@"baz"] = subMsg1;
-  [msg.intToMsg setObject:subMsg2 forKey:222];
-  [msg.boolToMsg setObject:subMsg3 forKey:YES];
-
-  TestMessageOfMaps *msg2 = [[msg copy] autorelease];
-  XCTAssertNotNil(msg2);
-  XCTAssertEqualObjects(msg2, msg);
-  XCTAssertTrue(msg2 != msg);  // ptr compare
-  XCTAssertTrue(msg.strToStr != msg2.strToStr);  // ptr compare
-  XCTAssertTrue(msg.intToStr != msg2.intToStr);  // ptr compare
-  XCTAssertTrue(msg.intToInt != msg2.intToInt);  // ptr compare
-  XCTAssertTrue(msg.strToBool != msg2.strToBool);  // ptr compare
-  XCTAssertTrue(msg.boolToStr != msg2.boolToStr);  // ptr compare
-  XCTAssertTrue(msg.boolToBool != msg2.boolToBool);  // ptr compare
-  XCTAssertTrue(msg.intToBool != msg2.intToBool);  // ptr compare
-  XCTAssertTrue(msg.boolToInt != msg2.boolToInt);  // ptr compare
-  XCTAssertTrue(msg.strToMsg != msg2.strToMsg);  // ptr compare
-  XCTAssertTrue(msg.intToMsg != msg2.intToMsg);  // ptr compare
-  XCTAssertTrue(msg.boolToMsg != msg2.boolToMsg);  // ptr compare
-
-  XCTAssertTrue(msg.strToMsg[@"baz"] != msg2.strToMsg[@"baz"]);  // ptr compare
-  XCTAssertEqualObjects(msg.strToMsg[@"baz"], msg2.strToMsg[@"baz"]);
-  XCTAssertTrue([msg.intToMsg objectForKey:222] != [msg2.intToMsg objectForKey:222]);  // ptr compare
-  XCTAssertEqualObjects([msg.intToMsg objectForKey:222], [msg2.intToMsg objectForKey:222]);
-  XCTAssertTrue([msg.boolToMsg objectForKey:YES] != [msg2.boolToMsg objectForKey:YES]);  // ptr compare
-  XCTAssertEqualObjects([msg.boolToMsg objectForKey:YES], [msg2.boolToMsg objectForKey:YES]);
-}
-
-- (void)testPrefixedNames {
-  // The fact that this compiles is sufficient as a test.
-  // The assertions are just there to avoid "not-used" warnings.
-
-  // Verify that enum types and values get the prefix.
-  GPBTESTTestObjcProtoPrefixEnum value = GPBTESTTestObjcProtoPrefixEnum_Value;
-  XCTAssertNotEqual(value, 0);
-
-  // Verify that roots get the prefix.
-  GPBTESTUnittestObjcOptionsRoot *root = nil;
-  XCTAssertNil(root);
-
-  // Verify that messages that don't already have the prefix get a prefix.
-  GPBTESTTestObjcProtoPrefixMessage *prefixedMessage = nil;
-  XCTAssertNil(prefixedMessage);
-
-  // Verify that messages that already have a prefix aren't prefixed twice.
-  GPBTESTTestHasAPrefixMessage *alreadyPrefixedMessage = nil;
-  XCTAssertNil(alreadyPrefixedMessage);
-
-  // Verify that enums that already have a prefix aren't prefixed twice.
-  GPBTESTTestHasAPrefixEnum prefixedValue = GPBTESTTestHasAPrefixEnum_ValueB;
-  XCTAssertNotEqual(prefixedValue, 0);
-
-  // Verify that classes named the same as prefixes are prefixed.
-  GPBTESTGPBTEST *prefixMessage = nil;
-  XCTAssertNil(prefixMessage);
-
-  // Verify that classes that have the prefix followed by a lowercase
-  // letter DO get the prefix.
-  GPBTESTGPBTESTshouldGetAPrefixMessage *shouldGetAPrefixMessage = nil;
-  XCTAssertNil(shouldGetAPrefixMessage);
-}
-
-@end
diff --git a/libs/protobuf/objectivec/Tests/GPBObjectiveCPlusPlusTest.mm b/libs/protobuf/objectivec/Tests/GPBObjectiveCPlusPlusTest.mm
deleted file mode 100644
index fb67495..0000000
--- a/libs/protobuf/objectivec/Tests/GPBObjectiveCPlusPlusTest.mm
+++ /dev/null
@@ -1,69 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2013 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-#import "GPBTestUtilities.h"
-
-
-//
-// This is just a compile test (here to make sure things never regress).
-//
-// Objective C++ can run into issues with how the NS_ENUM/CF_ENUM declaration
-// works because of the C++ spec being used for that compilation unit. So
-// the fact that these imports all work without errors/warning means things
-// are still good.
-//
-// The "well know types" should have cross file enums needing imports.
-#import "GPBProtocolBuffers.h"
-// Some of the tests explicitly use cross file enums also.
-#import "google/protobuf/Unittest.pbobjc.h"
-#import "google/protobuf/UnittestImport.pbobjc.h"
-
-// Sanity check the conditions of the test within the Xcode project.
-#if !__cplusplus
-  #error This isn't compiled as Objective C++?
-#elif __cplusplus >= 201103L
-  // If this trips, it means the Xcode default might have change (or someone
-  // edited the testing project) and it might be time to revisit the GPB_ENUM
-  // define in GPBBootstrap.h.
-  #warning Did the Xcode default for C++ spec change?
-#endif
-
-
-// Dummy XCTest.
-@interface GPBObjectiveCPlusPlusTests : GPBTestCase
-@end
-
-@implementation GPBObjectiveCPlusPlusTests
-- (void)testCPlusPlus {
-  // Nothing, This was a compile test.
-  XCTAssertTrue(YES);
-}
-@end
diff --git a/libs/protobuf/objectivec/Tests/GPBPerfTests.m b/libs/protobuf/objectivec/Tests/GPBPerfTests.m
deleted file mode 100644
index 8dd0ffc..0000000
--- a/libs/protobuf/objectivec/Tests/GPBPerfTests.m
+++ /dev/null
@@ -1,413 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2013 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#import "GPBTestUtilities.h"
-#import "google/protobuf/Unittest.pbobjc.h"
-#import "google/protobuf/UnittestImport.pbobjc.h"
-#import "google/protobuf/UnittestObjc.pbobjc.h"
-
-//
-// This file really just uses the unittests framework as a testbed to
-// run some simple performance tests. The data can then be used to help
-// evaluate changes to the runtime.
-//
-
-static const uint32_t kRepeatedCount = 100;
-
-@interface PerfTests : GPBTestCase
-@end
-
-@implementation PerfTests
-
-- (void)setUp {
-  // A convenient place to put a break point if you want to connect instruments.
-  [super setUp];
-}
-
-- (void)testMessagePerformance {
-  [self measureBlock:^{
-    for (int i = 0; i < 200; ++i) {
-      TestAllTypes* message = [[TestAllTypes alloc] init];
-      [self setAllFields:message repeatedCount:kRepeatedCount];
-      NSData* rawBytes = [message data];
-      [message release];
-      message = [[TestAllTypes alloc] initWithData:rawBytes error:NULL];
-      [message release];
-    }
-  }];
-}
-
-- (void)testMessageSerialParsingPerformance {
-  // This and the next test are meant to monitor that the parsing functionality of protos does not
-  // lock across threads when parsing different instances. The Serial version of the test should run
-  // around ~2 times slower than the Parallel version since it's parsing the protos in the same
-  // thread.
-  TestAllTypes *allTypesMessage = [TestAllTypes message];
-  [self setAllFields:allTypesMessage repeatedCount:2];
-  NSData *allTypesData = allTypesMessage.data;
-
-  [self measureBlock:^{
-    for (int i = 0; i < 500; ++i) {
-      [TestAllTypes parseFromData:allTypesData error:NULL];
-      [TestAllTypes parseFromData:allTypesData error:NULL];
-    }
-  }];
-}
-
-- (void)testMessageParallelParsingPerformance {
-  // This and the previous test are meant to monitor that the parsing functionality of protos does
-  // not lock across threads when parsing different instances. The Serial version of the test should
-  // run around ~2 times slower than the Parallel version since it's parsing the protos in the same
-  // thread.
-  TestAllTypes *allTypesMessage = [TestAllTypes message];
-  [self setAllFields:allTypesMessage repeatedCount:2];
-  NSData *allTypesData = allTypesMessage.data;
-
-  dispatch_queue_t concurrentQueue = dispatch_queue_create("perfQueue", DISPATCH_QUEUE_CONCURRENT);
-
-  [self measureBlock:^{
-    for (int i = 0; i < 500; ++i) {
-      dispatch_group_t group = dispatch_group_create();
-
-      dispatch_group_async(group, concurrentQueue, ^{
-        [TestAllTypes parseFromData:allTypesData error:NULL];
-      });
-
-      dispatch_group_async(group, concurrentQueue, ^{
-        [TestAllTypes parseFromData:allTypesData error:NULL];
-      });
-
-      dispatch_group_notify(group, concurrentQueue, ^{});
-
-      dispatch_release(group);
-    }
-  }];
-
-  dispatch_release(concurrentQueue);
-}
-
-- (void)testMessageSerialExtensionsParsingPerformance {
-  // This and the next test are meant to monitor that the parsing functionality of protos does not
-  // lock across threads when parsing different instances when using extensions. The Serial version
-  // of the test should run around ~2 times slower than the Parallel version since it's parsing the
-  // protos in the same thread.
-  TestAllExtensions *allExtensionsMessage = [TestAllExtensions message];
-  [self setAllExtensions:allExtensionsMessage repeatedCount:2];
-  NSData *allExtensionsData = allExtensionsMessage.data;
-
-  [self measureBlock:^{
-    for (int i = 0; i < 500; ++i) {
-      [TestAllExtensions parseFromData:allExtensionsData
-                     extensionRegistry:[self extensionRegistry]
-                                 error:NULL];
-      [TestAllExtensions parseFromData:allExtensionsData
-                     extensionRegistry:[self extensionRegistry]
-                                 error:NULL];
-    }
-  }];
-}
-
-- (void)testMessageParallelExtensionsParsingPerformance {
-  // This and the previous test are meant to monitor that the parsing functionality of protos does
-  // not lock across threads when parsing different instances when using extensions. The Serial
-  // version of the test should run around ~2 times slower than the Parallel version since it's
-  // parsing the protos in the same thread.
-  TestAllExtensions *allExtensionsMessage = [TestAllExtensions message];
-  [self setAllExtensions:allExtensionsMessage repeatedCount:2];
-  NSData *allExtensionsData = allExtensionsMessage.data;
-
-  dispatch_queue_t concurrentQueue = dispatch_queue_create("perfQueue", DISPATCH_QUEUE_CONCURRENT);
-
-  [self measureBlock:^{
-    for (int i = 0; i < 500; ++i) {
-      dispatch_group_t group = dispatch_group_create();
-
-      dispatch_group_async(group, concurrentQueue, ^{
-        [TestAllExtensions parseFromData:allExtensionsData
-                       extensionRegistry:[UnittestRoot extensionRegistry]
-                                   error:NULL];
-      });
-
-      dispatch_group_async(group, concurrentQueue, ^{
-        [TestAllExtensions parseFromData:allExtensionsData
-                       extensionRegistry:[UnittestRoot extensionRegistry]
-                                   error:NULL];
-      });
-
-      dispatch_group_notify(group, concurrentQueue, ^{});
-
-      dispatch_release(group);
-    }
-  }];
-
-  dispatch_release(concurrentQueue);
-}
-
-- (void)testExtensionsPerformance {
-  [self measureBlock:^{
-    for (int i = 0; i < 200; ++i) {
-      TestAllExtensions* message = [[TestAllExtensions alloc] init];
-      [self setAllExtensions:message repeatedCount:kRepeatedCount];
-      NSData* rawBytes = [message data];
-      [message release];
-      TestAllExtensions* message2 =
-          [[TestAllExtensions alloc] initWithData:rawBytes error:NULL];
-      [message2 release];
-    }
-  }];
-}
-
-- (void)testPackedTypesPerformance {
-  [self measureBlock:^{
-    for (int i = 0; i < 1000; ++i) {
-      TestPackedTypes* message = [[TestPackedTypes alloc] init];
-      [self setPackedFields:message repeatedCount:kRepeatedCount];
-      NSData* rawBytes = [message data];
-      [message release];
-      message = [[TestPackedTypes alloc] initWithData:rawBytes error:NULL];
-      [message release];
-    }
-  }];
-}
-
-- (void)testPackedExtensionsPerformance {
-  [self measureBlock:^{
-    for (int i = 0; i < 1000; ++i) {
-      TestPackedExtensions* message = [[TestPackedExtensions alloc] init];
-      [self setPackedExtensions:message repeatedCount:kRepeatedCount];
-      NSData* rawBytes = [message data];
-      [message release];
-      TestPackedExtensions* message2 =
-          [[TestPackedExtensions alloc] initWithData:rawBytes error:NULL];
-      [message2 release];
-    }
-  }];
-}
-
-- (void)testHas {
-  TestAllTypes* message = [self allSetRepeatedCount:1];
-  [self measureBlock:^{
-    for (int i = 0; i < 10000; ++i) {
-      [message hasOptionalInt32];
-      message.hasOptionalInt32 = NO;
-      [message hasOptionalInt32];
-
-      [message hasOptionalInt64];
-      message.hasOptionalInt64 = NO;
-      [message hasOptionalInt64];
-
-      [message hasOptionalUint32];
-      message.hasOptionalUint32 = NO;
-      [message hasOptionalUint32];
-
-      [message hasOptionalUint64];
-      message.hasOptionalUint64 = NO;
-      [message hasOptionalUint64];
-
-      [message hasOptionalSint32];
-      message.hasOptionalSint32 = NO;
-      [message hasOptionalSint32];
-
-      [message hasOptionalSint64];
-      message.hasOptionalSint64 = NO;
-      [message hasOptionalSint64];
-
-      [message hasOptionalFixed32];
-      message.hasOptionalFixed32 = NO;
-      [message hasOptionalFixed32];
-
-      [message hasOptionalFixed64];
-      message.hasOptionalFixed64 = NO;
-      [message hasOptionalFixed64];
-
-      [message hasOptionalSfixed32];
-      message.hasOptionalSfixed32 = NO;
-      [message hasOptionalSfixed32];
-
-      [message hasOptionalSfixed64];
-      message.hasOptionalSfixed64 = NO;
-      [message hasOptionalSfixed64];
-
-      [message hasOptionalFloat];
-      message.hasOptionalFloat = NO;
-      [message hasOptionalFloat];
-
-      [message hasOptionalDouble];
-      message.hasOptionalDouble = NO;
-      [message hasOptionalDouble];
-
-      [message hasOptionalBool];
-      message.hasOptionalBool = NO;
-      [message hasOptionalBool];
-
-      [message hasOptionalString];
-      message.hasOptionalString = NO;
-      [message hasOptionalString];
-
-      [message hasOptionalBytes];
-      message.hasOptionalBytes = NO;
-      [message hasOptionalBytes];
-
-      [message hasOptionalGroup];
-      message.hasOptionalGroup = NO;
-      [message hasOptionalGroup];
-
-      [message hasOptionalNestedMessage];
-      message.hasOptionalNestedMessage = NO;
-      [message hasOptionalNestedMessage];
-
-      [message hasOptionalForeignMessage];
-      message.hasOptionalForeignMessage = NO;
-      [message hasOptionalForeignMessage];
-
-      [message hasOptionalImportMessage];
-      message.hasOptionalImportMessage = NO;
-      [message hasOptionalImportMessage];
-
-      [message.optionalGroup hasA];
-      message.optionalGroup.hasA = NO;
-      [message.optionalGroup hasA];
-
-      [message.optionalNestedMessage hasBb];
-      message.optionalNestedMessage.hasBb = NO;
-      [message.optionalNestedMessage hasBb];
-
-      [message.optionalForeignMessage hasC];
-      message.optionalForeignMessage.hasC = NO;
-      [message.optionalForeignMessage hasC];
-
-      [message.optionalImportMessage hasD];
-      message.optionalImportMessage.hasD = NO;
-      [message.optionalImportMessage hasD];
-
-      [message hasOptionalNestedEnum];
-      message.hasOptionalNestedEnum = NO;
-      [message hasOptionalNestedEnum];
-
-      [message hasOptionalForeignEnum];
-      message.hasOptionalForeignEnum = NO;
-      [message hasOptionalForeignEnum];
-
-      [message hasOptionalImportEnum];
-      message.hasOptionalImportEnum = NO;
-      [message hasOptionalImportEnum];
-
-      [message hasOptionalStringPiece];
-      message.hasOptionalStringPiece = NO;
-      [message hasOptionalStringPiece];
-
-      [message hasOptionalCord];
-      message.hasOptionalCord = NO;
-      [message hasOptionalCord];
-
-      [message hasDefaultInt32];
-      message.hasDefaultInt32 = NO;
-      [message hasDefaultInt32];
-
-      [message hasDefaultInt64];
-      message.hasDefaultInt64 = NO;
-      [message hasDefaultInt64];
-
-      [message hasDefaultUint32];
-      message.hasDefaultUint32 = NO;
-      [message hasDefaultUint32];
-
-      [message hasDefaultUint64];
-      message.hasDefaultUint64 = NO;
-      [message hasDefaultUint64];
-
-      [message hasDefaultSint32];
-      message.hasDefaultSint32 = NO;
-      [message hasDefaultSint32];
-
-      [message hasDefaultSint64];
-      message.hasDefaultSint64 = NO;
-      [message hasDefaultSint64];
-
-      [message hasDefaultFixed32];
-      message.hasDefaultFixed32 = NO;
-      [message hasDefaultFixed32];
-
-      [message hasDefaultFixed64];
-      message.hasDefaultFixed64 = NO;
-      [message hasDefaultFixed64];
-
-      [message hasDefaultSfixed32];
-      message.hasDefaultSfixed32 = NO;
-      [message hasDefaultSfixed32];
-
-      [message hasDefaultSfixed64];
-      message.hasDefaultSfixed64 = NO;
-      [message hasDefaultSfixed64];
-
-      [message hasDefaultFloat];
-      message.hasDefaultFloat = NO;
-      [message hasDefaultFloat];
-
-      [message hasDefaultDouble];
-      message.hasDefaultDouble = NO;
-      [message hasDefaultDouble];
-
-      [message hasDefaultBool];
-      message.hasDefaultBool = NO;
-      [message hasDefaultBool];
-
-      [message hasDefaultString];
-      message.hasDefaultString = NO;
-      [message hasDefaultString];
-
-      [message hasDefaultBytes];
-      message.hasDefaultBytes = NO;
-      [message hasDefaultBytes];
-
-      [message hasDefaultNestedEnum];
-      message.hasDefaultNestedEnum = NO;
-      [message hasDefaultNestedEnum];
-
-      [message hasDefaultForeignEnum];
-      message.hasDefaultForeignEnum = NO;
-      [message hasDefaultForeignEnum];
-
-      [message hasDefaultImportEnum];
-      message.hasDefaultImportEnum = NO;
-      [message hasDefaultImportEnum];
-
-      [message hasDefaultStringPiece];
-      message.hasDefaultStringPiece = NO;
-      [message hasDefaultStringPiece];
-
-      [message hasDefaultCord];
-      message.hasDefaultCord = NO;
-      [message hasDefaultCord];
-    }
-  }];
-}
-
-@end
diff --git a/libs/protobuf/objectivec/Tests/GPBSwiftTests.swift b/libs/protobuf/objectivec/Tests/GPBSwiftTests.swift
deleted file mode 100644
index 03d7510..0000000
--- a/libs/protobuf/objectivec/Tests/GPBSwiftTests.swift
+++ /dev/null
@@ -1,460 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-import Foundation
-import XCTest
-
-// Test some usage of the ObjC library from Swift.
-
-class GPBBridgeTests: XCTestCase {
-
-  func testProto2Basics() {
-    let msg = Message2()
-    let msg2 = Message2()
-    let msg3 = Message2_OptionalGroup()
-
-    msg.optionalInt32 = 100
-    msg.optionalString = "abc"
-    msg.optionalEnum = .bar
-    msg2.optionalString = "other"
-    msg.optional = msg2
-    msg3.a = 200
-    msg.optionalGroup = msg3
-    msg.repeatedInt32Array.addValue(300)
-    msg.repeatedInt32Array.addValue(301)
-    msg.repeatedStringArray.add("mno")
-    msg.repeatedStringArray.add("pqr")
-    msg.repeatedEnumArray.addValue(Message2_Enum.bar.rawValue)
-    msg.repeatedEnumArray.addValue(Message2_Enum.baz.rawValue)
-    msg.mapInt32Int32.setInt32(400, forKey:500)
-    msg.mapInt32Int32.setInt32(401, forKey:501)
-    msg.mapStringString.setObject("foo", forKey:"bar" as NSString)
-    msg.mapStringString.setObject("abc", forKey:"xyz" as NSString)
-    msg.mapInt32Enum.setEnum(Message2_Enum.bar.rawValue, forKey:600)
-    msg.mapInt32Enum.setEnum(Message2_Enum.baz.rawValue, forKey:601)
-
-    // Check has*.
-    XCTAssertTrue(msg.hasOptionalInt32)
-    XCTAssertTrue(msg.hasOptionalString)
-    XCTAssertTrue(msg.hasOptionalEnum)
-    XCTAssertTrue(msg2.hasOptionalString)
-    XCTAssertTrue(msg.hasOptionalMessage)
-    XCTAssertTrue(msg3.hasA)
-    XCTAssertTrue(msg.hasOptionalGroup)
-    XCTAssertFalse(msg.hasOptionalInt64)
-    XCTAssertFalse(msg.hasOptionalFloat)
-
-    // Check values.
-    XCTAssertEqual(msg.optionalInt32, Int32(100))
-    XCTAssertEqual(msg.optionalString, "abc")
-    XCTAssertEqual(msg2.optionalString, "other")
-    XCTAssertTrue(msg.optional === msg2)
-    XCTAssertEqual(msg.optionalEnum, Message2_Enum.bar)
-    XCTAssertEqual(msg3.a, Int32(200))
-    XCTAssertTrue(msg.optionalGroup === msg3)
-    XCTAssertEqual(msg.repeatedInt32Array.count, UInt(2))
-    XCTAssertEqual(msg.repeatedInt32Array.value(at: 0), Int32(300))
-    XCTAssertEqual(msg.repeatedInt32Array.value(at: 1), Int32(301))
-    XCTAssertEqual(msg.repeatedStringArray.count, Int(2))
-    XCTAssertEqual(msg.repeatedStringArray.object(at: 0) as? String, "mno")
-    XCTAssertEqual(msg.repeatedStringArray.object(at: 1) as? String, "pqr")
-    XCTAssertEqual(msg.repeatedEnumArray.count, UInt(2))
-    XCTAssertEqual(msg.repeatedEnumArray.value(at: 0), Message2_Enum.bar.rawValue)
-    XCTAssertEqual(msg.repeatedEnumArray.value(at: 1), Message2_Enum.baz.rawValue)
-    XCTAssertEqual(msg.repeatedInt64Array.count, UInt(0))
-    XCTAssertEqual(msg.mapInt32Int32.count, UInt(2))
-    var intValue: Int32 = 0
-    XCTAssertTrue(msg.mapInt32Int32.getInt32(&intValue, forKey: 500))
-    XCTAssertEqual(intValue, Int32(400))
-    XCTAssertTrue(msg.mapInt32Int32.getInt32(&intValue, forKey: 501))
-    XCTAssertEqual(intValue, Int32(401))
-    XCTAssertEqual(msg.mapStringString.count, Int(2))
-    XCTAssertEqual(msg.mapStringString.object(forKey: "bar") as? String, "foo")
-    XCTAssertEqual(msg.mapStringString.object(forKey: "xyz") as? String, "abc")
-    XCTAssertEqual(msg.mapInt32Enum.count, UInt(2))
-    XCTAssertTrue(msg.mapInt32Enum.getEnum(&intValue, forKey:600))
-    XCTAssertEqual(intValue, Message2_Enum.bar.rawValue)
-    XCTAssertTrue(msg.mapInt32Enum.getEnum(&intValue, forKey:601))
-    XCTAssertEqual(intValue, Message2_Enum.baz.rawValue)
-
-    // Clearing a string with nil.
-    msg2.optionalString = nil
-    XCTAssertFalse(msg2.hasOptionalString)
-    XCTAssertEqual(msg2.optionalString, "")
-
-    // Clearing a message with nil.
-    msg.optionalGroup = nil
-    XCTAssertFalse(msg.hasOptionalGroup)
-    XCTAssertTrue(msg.optionalGroup !== msg3)  // New instance
-
-    // Clear.
-    msg.clear()
-    XCTAssertFalse(msg.hasOptionalInt32)
-    XCTAssertFalse(msg.hasOptionalString)
-    XCTAssertFalse(msg.hasOptionalEnum)
-    XCTAssertFalse(msg.hasOptionalMessage)
-    XCTAssertFalse(msg.hasOptionalInt64)
-    XCTAssertFalse(msg.hasOptionalFloat)
-    XCTAssertEqual(msg.optionalInt32, Int32(0))
-    XCTAssertEqual(msg.optionalString, "")
-    XCTAssertTrue(msg.optional !== msg2)  // New instance
-    XCTAssertEqual(msg.optionalEnum, Message2_Enum.foo)  // Default
-    XCTAssertEqual(msg.repeatedInt32Array.count, UInt(0))
-    XCTAssertEqual(msg.repeatedStringArray.count, Int(0))
-    XCTAssertEqual(msg.repeatedEnumArray.count, UInt(0))
-    XCTAssertEqual(msg.mapInt32Int32.count, UInt(0))
-    XCTAssertEqual(msg.mapStringString.count, Int(0))
-    XCTAssertEqual(msg.mapInt32Enum.count, UInt(0))
-  }
-
-  func testProto3Basics() {
-    let msg = Message3()
-    let msg2 = Message3()
-
-    msg.optionalInt32 = 100
-    msg.optionalString = "abc"
-    msg.optionalEnum = .bar
-    msg2.optionalString = "other"
-    msg.optional = msg2
-    msg.repeatedInt32Array.addValue(300)
-    msg.repeatedInt32Array.addValue(301)
-    msg.repeatedStringArray.add("mno")
-    msg.repeatedStringArray.add("pqr")
-    // "proto3" syntax lets enum get unknown values.
-    msg.repeatedEnumArray.addValue(Message3_Enum.bar.rawValue)
-    msg.repeatedEnumArray.addRawValue(666)
-    SetMessage3_OptionalEnum_RawValue(msg2, 666)
-    msg.mapInt32Int32.setInt32(400, forKey:500)
-    msg.mapInt32Int32.setInt32(401, forKey:501)
-    msg.mapStringString.setObject("foo", forKey:"bar" as NSString)
-    msg.mapStringString.setObject("abc", forKey:"xyz" as NSString)
-    msg.mapInt32Enum.setEnum(Message2_Enum.bar.rawValue, forKey:600)
-    // "proto3" syntax lets enum get unknown values.
-    msg.mapInt32Enum.setRawValue(666, forKey:601)
-
-    // Has only exists on for message fields.
-    XCTAssertTrue(msg.hasOptionalMessage)
-    XCTAssertFalse(msg2.hasOptionalMessage)
-
-    // Check values.
-    XCTAssertEqual(msg.optionalInt32, Int32(100))
-    XCTAssertEqual(msg.optionalString, "abc")
-    XCTAssertEqual(msg2.optionalString, "other")
-    XCTAssertTrue(msg.optional === msg2)
-    XCTAssertEqual(msg.optionalEnum, Message3_Enum.bar)
-    XCTAssertEqual(msg.repeatedInt32Array.count, UInt(2))
-    XCTAssertEqual(msg.repeatedInt32Array.value(at: 0), Int32(300))
-    XCTAssertEqual(msg.repeatedInt32Array.value(at: 1), Int32(301))
-    XCTAssertEqual(msg.repeatedStringArray.count, Int(2))
-    XCTAssertEqual(msg.repeatedStringArray.object(at: 0) as? String, "mno")
-    XCTAssertEqual(msg.repeatedStringArray.object(at: 1) as? String, "pqr")
-    XCTAssertEqual(msg.repeatedInt64Array.count, UInt(0))
-    XCTAssertEqual(msg.repeatedEnumArray.count, UInt(2))
-    XCTAssertEqual(msg.repeatedEnumArray.value(at: 0), Message3_Enum.bar.rawValue)
-    XCTAssertEqual(msg.repeatedEnumArray.value(at: 1), Message3_Enum.gpbUnrecognizedEnumeratorValue.rawValue)
-    XCTAssertEqual(msg.repeatedEnumArray.rawValue(at: 1), 666)
-    XCTAssertEqual(msg2.optionalEnum, Message3_Enum.gpbUnrecognizedEnumeratorValue)
-    XCTAssertEqual(Message3_OptionalEnum_RawValue(msg2), Int32(666))
-    XCTAssertEqual(msg.mapInt32Int32.count, UInt(2))
-    var intValue: Int32 = 0
-    XCTAssertTrue(msg.mapInt32Int32.getInt32(&intValue, forKey:500))
-    XCTAssertEqual(intValue, Int32(400))
-    XCTAssertTrue(msg.mapInt32Int32.getInt32(&intValue, forKey:501))
-    XCTAssertEqual(intValue, Int32(401))
-    XCTAssertEqual(msg.mapStringString.count, Int(2))
-    XCTAssertEqual(msg.mapStringString.object(forKey: "bar") as? String, "foo")
-    XCTAssertEqual(msg.mapStringString.object(forKey: "xyz") as? String, "abc")
-    XCTAssertEqual(msg.mapInt32Enum.count, UInt(2))
-    XCTAssertTrue(msg.mapInt32Enum.getEnum(&intValue, forKey:600))
-    XCTAssertEqual(intValue, Message2_Enum.bar.rawValue)
-    XCTAssertTrue(msg.mapInt32Enum.getEnum(&intValue, forKey:601))
-    XCTAssertEqual(intValue, Message3_Enum.gpbUnrecognizedEnumeratorValue.rawValue)
-    XCTAssertTrue(msg.mapInt32Enum.getRawValue(&intValue, forKey:601))
-    XCTAssertEqual(intValue, 666)
-
-    // Clearing a string with nil.
-    msg2.optionalString = nil
-    XCTAssertEqual(msg2.optionalString, "")
-
-    // Clearing a message with nil.
-    msg.optional = nil
-    XCTAssertFalse(msg.hasOptionalMessage)
-    XCTAssertTrue(msg.optional !== msg2)  // New instance
-
-    // Clear.
-    msg.clear()
-    XCTAssertFalse(msg.hasOptionalMessage)
-    XCTAssertEqual(msg.optionalInt32, Int32(0))
-    XCTAssertEqual(msg.optionalString, "")
-    XCTAssertTrue(msg.optional !== msg2)  // New instance
-    XCTAssertEqual(msg.optionalEnum, Message3_Enum.foo)  // Default
-    XCTAssertEqual(msg.repeatedInt32Array.count, UInt(0))
-    XCTAssertEqual(msg.repeatedStringArray.count, Int(0))
-    XCTAssertEqual(msg.repeatedEnumArray.count, UInt(0))
-    msg2.clear()
-    XCTAssertEqual(msg2.optionalEnum, Message3_Enum.foo)  // Default
-    XCTAssertEqual(Message3_OptionalEnum_RawValue(msg2), Message3_Enum.foo.rawValue)
-    XCTAssertEqual(msg.mapInt32Int32.count, UInt(0))
-    XCTAssertEqual(msg.mapStringString.count, Int(0))
-    XCTAssertEqual(msg.mapInt32Enum.count, UInt(0))
-  }
-
-  func testAutoCreation() {
-    let msg = Message2()
-
-    XCTAssertFalse(msg.hasOptionalGroup)
-    XCTAssertFalse(msg.hasOptionalMessage)
-
-    // Access shouldn't result in has* but should return objects.
-    let msg2 = msg.optionalGroup
-    let msg3 = msg.optional.optional
-    let msg4 = msg.optional
-    XCTAssertNotNil(msg2)
-    XCTAssertNotNil(msg3)
-    XCTAssertFalse(msg.hasOptionalGroup)
-    XCTAssertFalse(msg.optional.hasOptionalMessage)
-    XCTAssertFalse(msg.hasOptionalMessage)
-
-    // Setting things should trigger has* getting set.
-    msg.optionalGroup.a = 10
-    msg.optional.optional.optionalInt32 = 100
-    XCTAssertTrue(msg.hasOptionalGroup)
-    XCTAssertTrue(msg.optional.hasOptionalMessage)
-    XCTAssertTrue(msg.hasOptionalMessage)
-
-    // And they should be the same pointer as before.
-    XCTAssertTrue(msg2 === msg.optionalGroup)
-    XCTAssertTrue(msg3 === msg.optional.optional)
-    XCTAssertTrue(msg4 === msg.optional)
-
-    // Clear gets us new objects next time around.
-    msg.clear()
-    XCTAssertFalse(msg.hasOptionalGroup)
-    XCTAssertFalse(msg.optional.hasOptionalMessage)
-    XCTAssertFalse(msg.hasOptionalMessage)
-    msg.optionalGroup.a = 20
-    msg.optional.optional.optionalInt32 = 200
-    XCTAssertTrue(msg.hasOptionalGroup)
-    XCTAssertTrue(msg.optional.hasOptionalMessage)
-    XCTAssertTrue(msg.hasOptionalMessage)
-    XCTAssertTrue(msg2 !== msg.optionalGroup)
-    XCTAssertTrue(msg3 !== msg.optional.optional)
-    XCTAssertTrue(msg4 !== msg.optional)
-
-    // Explicit set of a message, means autocreated object doesn't bind.
-    msg.clear()
-    let autoCreated = msg.optional
-    XCTAssertFalse(msg.hasOptionalMessage)
-    let msg5 = Message2()
-    msg5.optionalInt32 = 123
-    msg.optional = msg5
-    XCTAssertTrue(msg.hasOptionalMessage)
-    // Modifying the autocreated doesn't replaced the explicit set one.
-    autoCreated?.optionalInt32 = 456
-    XCTAssertTrue(msg.hasOptionalMessage)
-    XCTAssertTrue(msg.optional === msg5)
-    XCTAssertEqual(msg.optional.optionalInt32, Int32(123))
-  }
-
-  func testProto2OneOfSupport() {
-    let msg = Message2()
-
-    XCTAssertEqual(msg.oOneOfCase, Message2_O_OneOfCase.gpbUnsetOneOfCase)
-    XCTAssertEqual(msg.oneofInt32, Int32(100))  // Default
-    XCTAssertEqual(msg.oneofFloat, Float(110.0))  // Default
-    XCTAssertEqual(msg.oneofEnum, Message2_Enum.baz)  // Default
-    let autoCreated = msg.oneof  // Default create one.
-    XCTAssertNotNil(autoCreated)
-    XCTAssertEqual(msg.oOneOfCase, Message2_O_OneOfCase.gpbUnsetOneOfCase)
-
-    msg.oneofInt32 = 10
-    XCTAssertEqual(msg.oneofInt32, Int32(10))
-    XCTAssertEqual(msg.oneofFloat, Float(110.0))  // Default
-    XCTAssertEqual(msg.oneofEnum, Message2_Enum.baz)  // Default
-    XCTAssertTrue(msg.oneof === autoCreated)  // Still the same
-    XCTAssertEqual(msg.oOneOfCase, Message2_O_OneOfCase.oneofInt32)
-
-    msg.oneofFloat = 20.0
-    XCTAssertEqual(msg.oneofInt32, Int32(100))  // Default
-    XCTAssertEqual(msg.oneofFloat, Float(20.0))
-    XCTAssertEqual(msg.oneofEnum, Message2_Enum.baz)  // Default
-    XCTAssertTrue(msg.oneof === autoCreated)  // Still the same
-    XCTAssertEqual(msg.oOneOfCase, Message2_O_OneOfCase.oneofFloat)
-
-    msg.oneofEnum = .bar
-    XCTAssertEqual(msg.oneofInt32, Int32(100))  // Default
-    XCTAssertEqual(msg.oneofFloat, Float(110.0))  // Default
-    XCTAssertEqual(msg.oneofEnum, Message2_Enum.bar)
-    XCTAssertTrue(msg.oneof === autoCreated)  // Still the same
-    XCTAssertEqual(msg.oOneOfCase, Message2_O_OneOfCase.oneofEnum)
-
-    // Sets via the autocreated instance.
-    msg.oneof.optionalInt32 = 200
-    XCTAssertEqual(msg.oneofInt32, Int32(100))  // Default
-    XCTAssertEqual(msg.oneofFloat, Float(110.0))  // Default
-    XCTAssertEqual(msg.oneofEnum, Message2_Enum.baz)  // Default
-    XCTAssertTrue(msg.oneof === autoCreated)  // Still the same
-    XCTAssertEqual(msg.oneof.optionalInt32, Int32(200))
-    XCTAssertEqual(msg.oOneOfCase, Message2_O_OneOfCase.oneofMessage)
-
-    // Clear the oneof.
-    Message2_ClearOOneOfCase(msg)
-    XCTAssertEqual(msg.oneofInt32, Int32(100))  // Default
-    XCTAssertEqual(msg.oneofFloat, Float(110.0))  // Default
-    XCTAssertEqual(msg.oneofEnum, Message2_Enum.baz)  // Default
-    let autoCreated2 = msg.oneof  // Default create one
-    XCTAssertNotNil(autoCreated2)
-    XCTAssertTrue(autoCreated2 !== autoCreated)  // New instance
-    XCTAssertEqual(msg.oneof.optionalInt32, Int32(0))  // Default
-    XCTAssertEqual(msg.oOneOfCase, Message2_O_OneOfCase.gpbUnsetOneOfCase)
-
-    msg.oneofInt32 = 10
-    XCTAssertEqual(msg.oneofInt32, Int32(10))
-    XCTAssertEqual(msg.oOneOfCase, Message2_O_OneOfCase.oneofInt32)
-
-    // Confirm Message.clear() handles the oneof correctly.
-    msg.clear()
-    XCTAssertEqual(msg.oneofInt32, Int32(100))  // Default
-    XCTAssertEqual(msg.oOneOfCase, Message2_O_OneOfCase.gpbUnsetOneOfCase)
-
-    // Sets via the autocreated instance.
-    msg.oneof.optionalInt32 = 300
-    XCTAssertTrue(msg.oneof !== autoCreated)  // New instance
-    XCTAssertTrue(msg.oneof !== autoCreated2)  // New instance
-    XCTAssertEqual(msg.oneof.optionalInt32, Int32(300))
-    XCTAssertEqual(msg.oOneOfCase, Message2_O_OneOfCase.oneofMessage)
-
-    // Set message to nil clears the oneof.
-    msg.oneof = nil
-    XCTAssertEqual(msg.oneof.optionalInt32, Int32(0))  // Default
-    XCTAssertEqual(msg.oOneOfCase, Message2_O_OneOfCase.gpbUnsetOneOfCase)
-  }
-
-  func testProto3OneOfSupport() {
-    let msg = Message3()
-
-    XCTAssertEqual(msg.oOneOfCase, Message3_O_OneOfCase.gpbUnsetOneOfCase)
-    XCTAssertEqual(msg.oneofInt32, Int32(0))  // Default
-    XCTAssertEqual(msg.oneofFloat, Float(0.0))  // Default
-    XCTAssertEqual(msg.oneofEnum, Message3_Enum.foo)  // Default
-    let autoCreated = msg.oneof  // Default create one.
-    XCTAssertNotNil(autoCreated)
-    XCTAssertEqual(msg.oOneOfCase, Message3_O_OneOfCase.gpbUnsetOneOfCase)
-
-    msg.oneofInt32 = 10
-    XCTAssertEqual(msg.oneofInt32, Int32(10))
-    XCTAssertEqual(msg.oneofFloat, Float(0.0))  // Default
-    XCTAssertEqual(msg.oneofEnum, Message3_Enum.foo)  // Default
-    XCTAssertTrue(msg.oneof === autoCreated)  // Still the same
-    XCTAssertEqual(msg.oOneOfCase, Message3_O_OneOfCase.oneofInt32)
-
-    msg.oneofFloat = 20.0
-    XCTAssertEqual(msg.oneofInt32, Int32(0))  // Default
-    XCTAssertEqual(msg.oneofFloat, Float(20.0))
-    XCTAssertEqual(msg.oneofEnum, Message3_Enum.foo)  // Default
-    XCTAssertTrue(msg.oneof === autoCreated)  // Still the same
-    XCTAssertEqual(msg.oOneOfCase, Message3_O_OneOfCase.oneofFloat)
-
-    msg.oneofEnum = .bar
-    XCTAssertEqual(msg.oneofInt32, Int32(0))  // Default
-    XCTAssertEqual(msg.oneofFloat, Float(0.0))  // Default
-    XCTAssertEqual(msg.oneofEnum, Message3_Enum.bar)
-    XCTAssertTrue(msg.oneof === autoCreated)  // Still the same
-    XCTAssertEqual(msg.oOneOfCase, Message3_O_OneOfCase.oneofEnum)
-
-    // Sets via the autocreated instance.
-    msg.oneof.optionalInt32 = 200
-    XCTAssertEqual(msg.oneofInt32, Int32(0))  // Default
-    XCTAssertEqual(msg.oneofFloat, Float(0.0))  // Default
-    XCTAssertEqual(msg.oneofEnum, Message3_Enum.foo)  // Default
-    XCTAssertTrue(msg.oneof === autoCreated)  // Still the same
-    XCTAssertEqual(msg.oneof.optionalInt32, Int32(200))
-    XCTAssertEqual(msg.oOneOfCase, Message3_O_OneOfCase.oneofMessage)
-
-    // Clear the oneof.
-    Message3_ClearOOneOfCase(msg)
-    XCTAssertEqual(msg.oneofInt32, Int32(0))  // Default
-    XCTAssertEqual(msg.oneofFloat, Float(0.0))  // Default
-    XCTAssertEqual(msg.oneofEnum, Message3_Enum.foo)  // Default
-    let autoCreated2 = msg.oneof  // Default create one
-    XCTAssertNotNil(autoCreated2)
-    XCTAssertTrue(autoCreated2 !== autoCreated)  // New instance
-    XCTAssertEqual(msg.oneof.optionalInt32, Int32(0))  // Default
-    XCTAssertEqual(msg.oOneOfCase, Message3_O_OneOfCase.gpbUnsetOneOfCase)
-
-    msg.oneofInt32 = 10
-    XCTAssertEqual(msg.oneofInt32, Int32(10))
-    XCTAssertEqual(msg.oOneOfCase, Message3_O_OneOfCase.oneofInt32)
-
-    // Confirm Message.clear() handles the oneof correctly.
-    msg.clear()
-    XCTAssertEqual(msg.oneofInt32, Int32(0))  // Default
-    XCTAssertEqual(msg.oOneOfCase, Message3_O_OneOfCase.gpbUnsetOneOfCase)
-
-    // Sets via the autocreated instance.
-    msg.oneof.optionalInt32 = 300
-    XCTAssertTrue(msg.oneof !== autoCreated)  // New instance
-    XCTAssertTrue(msg.oneof !== autoCreated2)  // New instance
-    XCTAssertEqual(msg.oneof.optionalInt32, Int32(300))
-    XCTAssertEqual(msg.oOneOfCase, Message3_O_OneOfCase.oneofMessage)
-
-    // Set message to nil clears the oneof.
-    msg.oneof = nil
-    XCTAssertEqual(msg.oneof.optionalInt32, Int32(0))  // Default
-    XCTAssertEqual(msg.oOneOfCase, Message3_O_OneOfCase.gpbUnsetOneOfCase)
-  }
-
-  func testSerialization() {
-    let msg = Message2()
-
-    msg.optionalInt32 = 100
-    msg.optionalInt64 = 101
-    msg.optionalGroup.a = 102
-    msg.repeatedStringArray.add("abc")
-    msg.repeatedStringArray.add("def")
-    msg.mapInt32Int32.setInt32(200, forKey:300)
-    msg.mapInt32Int32.setInt32(201, forKey:201)
-    msg.mapStringString.setObject("foo", forKey:"bar" as NSString)
-    msg.mapStringString.setObject("abc", forKey:"xyz" as NSString)
-
-    let data = msg.data()
-
-    let msg2 = try! Message2(data: data!)
-    XCTAssertTrue(msg2 !== msg)  // New instance
-    XCTAssertEqual(msg.optionalInt32, Int32(100))
-    XCTAssertEqual(msg.optionalInt64, Int64(101))
-    XCTAssertEqual(msg.optionalGroup.a, Int32(102))
-    XCTAssertEqual(msg.repeatedStringArray.count, Int(2))
-    XCTAssertEqual(msg.mapInt32Int32.count, UInt(2))
-    XCTAssertEqual(msg.mapStringString.count, Int(2))
-    XCTAssertEqual(msg2, msg)
-  }
-
-}
diff --git a/libs/protobuf/objectivec/Tests/GPBTestUtilities.h b/libs/protobuf/objectivec/Tests/GPBTestUtilities.h
deleted file mode 100644
index 780184b..0000000
--- a/libs/protobuf/objectivec/Tests/GPBTestUtilities.h
+++ /dev/null
@@ -1,103 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#import <XCTest/XCTest.h>
-
-@class TestAllExtensions;
-@class TestAllTypes;
-@class TestMap;
-@class TestPackedTypes;
-@class TestPackedExtensions;
-@class TestUnpackedTypes;
-@class TestUnpackedExtensions;
-@class GPBExtensionRegistry;
-
-static inline NSData *DataFromCStr(const char *str) {
-  return [NSData dataWithBytes:str length:strlen(str)];
-}
-
-// Helper for uses of C arrays in tests cases.
-#ifndef GPBARRAYSIZE
-#define GPBARRAYSIZE(a) ((sizeof(a) / sizeof((a[0]))))
-#endif  // GPBARRAYSIZE
-
-
-// The number of repetitions of any repeated objects inside of test messages.
-extern const uint32_t kGPBDefaultRepeatCount;
-
-@interface GPBTestCase : XCTestCase
-
-- (void)setAllFields:(TestAllTypes *)message repeatedCount:(uint32_t)count;
-- (void)clearAllFields:(TestAllTypes *)message;
-- (void)setAllExtensions:(TestAllExtensions *)message
-           repeatedCount:(uint32_t)count;
-- (void)setPackedFields:(TestPackedTypes *)message
-          repeatedCount:(uint32_t)count;
-- (void)setUnpackedFields:(TestUnpackedTypes *)message
-            repeatedCount:(uint32_t)count;
-- (void)setPackedExtensions:(TestPackedExtensions *)message
-              repeatedCount:(uint32_t)count;
-- (void)setUnpackedExtensions:(TestUnpackedExtensions *)message
-              repeatedCount:(uint32_t)count;
-- (void)setAllMapFields:(TestMap *)message numEntries:(uint32_t)count;
-
-- (TestAllTypes *)allSetRepeatedCount:(uint32_t)count;
-- (TestAllExtensions *)allExtensionsSetRepeatedCount:(uint32_t)count;
-- (TestPackedTypes *)packedSetRepeatedCount:(uint32_t)count;
-- (TestPackedExtensions *)packedExtensionsSetRepeatedCount:(uint32_t)count;
-
-- (void)assertAllFieldsSet:(TestAllTypes *)message
-             repeatedCount:(uint32_t)count;
-- (void)assertAllExtensionsSet:(TestAllExtensions *)message
-                 repeatedCount:(uint32_t)count;
-- (void)assertRepeatedFieldsModified:(TestAllTypes *)message
-                       repeatedCount:(uint32_t)count;
-- (void)assertRepeatedExtensionsModified:(TestAllExtensions *)message
-                           repeatedCount:(uint32_t)count;
-- (void)assertExtensionsClear:(TestAllExtensions *)message;
-- (void)assertClear:(TestAllTypes *)message;
-- (void)assertPackedFieldsSet:(TestPackedTypes *)message
-                repeatedCount:(uint32_t)count;
-- (void)assertPackedExtensionsSet:(TestPackedExtensions *)message
-                    repeatedCount:(uint32_t)count;
-
-- (void)modifyRepeatedExtensions:(TestAllExtensions *)message;
-- (void)modifyRepeatedFields:(TestAllTypes *)message;
-
-- (GPBExtensionRegistry *)extensionRegistry;
-
-- (NSData *)getDataFileNamed:(NSString *)name dataToWrite:(NSData *)dataToWrite;
-
-- (void)assertAllFieldsKVCMatch:(TestAllTypes *)message;
-- (void)setAllFieldsViaKVC:(TestAllTypes *)message
-             repeatedCount:(uint32_t)count;
-- (void)assertClearKVC:(TestAllTypes *)message;
-
-@end
diff --git a/libs/protobuf/objectivec/Tests/GPBTestUtilities.m b/libs/protobuf/objectivec/Tests/GPBTestUtilities.m
deleted file mode 100644
index 48d75e7..0000000
--- a/libs/protobuf/objectivec/Tests/GPBTestUtilities.m
+++ /dev/null
@@ -1,2546 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#import "GPBTestUtilities.h"
-
-#import "google/protobuf/MapUnittest.pbobjc.h"
-#import "google/protobuf/Unittest.pbobjc.h"
-#import "google/protobuf/UnittestImport.pbobjc.h"
-
-const uint32_t kGPBDefaultRepeatCount = 2;
-
-// Small category to easily turn a CString into an NSData.
-@interface NSData (GPBTestCase)
-+ (NSData *)gpbtu_dataWithCString:(char *)buffer;
-+ (instancetype)gpbtu_dataWithEmbeddedNulls;
-@end
-
-@implementation NSData (GPBTestCase)
-+ (NSData *)gpbtu_dataWithCString:(char *)buffer {
-  return [NSData dataWithBytes:buffer length:strlen(buffer)];
-}
-
-+ (instancetype)gpbtu_dataWithUint32:(uint32_t)value {
-  return [[[self alloc] initWithUint32_gpbtu:value] autorelease];
-}
-
-- (instancetype)initWithUint32_gpbtu:(uint32_t)value {
-  value = CFSwapInt32HostToLittle(value);
-  return [self initWithBytes:&value length:sizeof(value)];
-}
-
-+ (instancetype)gpbtu_dataWithEmbeddedNulls {
-  char bytes[6] = "\1\0\2\3\0\5";
-  return [self dataWithBytes:bytes length:sizeof(bytes)];
-}
-@end
-
-@implementation GPBTestCase
-
-// Return data for name. Optionally (based on #if setting) write out dataToWrite
-// to replace that data. Useful for setting golden masters.
-- (NSData *)getDataFileNamed:(NSString *)name
-                 dataToWrite:(NSData *)dataToWrite {
-  NSBundle *bundle = [NSBundle bundleForClass:[self class]];
-  NSString *path = [bundle pathForResource:[name stringByDeletingPathExtension]
-                                    ofType:[name pathExtension]];
-  XCTAssertNotNil(path, @"Unable to find %@", name);
-  NSData *data = [NSData dataWithContentsOfFile:path];
-  XCTAssertNotNil(data, @"Unable to load from %@", path);
-#if 0
-  // Enable to write out golden master files.
-  if (!path) {
-    path = [[bundle resourcePath] stringByAppendingPathComponent:name];
-  }
-  NSError *error = nil;
-  BOOL wrote = [dataToWrite writeToFile:path options:NSDataWritingAtomic error:&error];
-  XCTAssertTrue(wrote, @"Unable to write %@ (%@)", path, error);
-  NSLog(@"Wrote data file to %@", path);
-#else
-  // Kill off the unused variable warning.
-  (void)dataToWrite;
-#endif
-  return data;
-}
-
-// -------------------------------------------------------------------
-
-- (void)modifyRepeatedExtensions:(TestAllExtensions *)message {
-  [message setExtension:[UnittestRoot repeatedInt32Extension]
-                  index:1
-                  value:@501];
-  [message setExtension:[UnittestRoot repeatedInt64Extension]
-                  index:1
-                  value:@502];
-  [message setExtension:[UnittestRoot repeatedUint32Extension]
-                  index:1
-                  value:@503];
-  [message setExtension:[UnittestRoot repeatedUint64Extension]
-                  index:1
-                  value:@504];
-  [message setExtension:[UnittestRoot repeatedSint32Extension]
-                  index:1
-                  value:@505];
-  [message setExtension:[UnittestRoot repeatedSint64Extension]
-                  index:1
-                  value:@506];
-  [message setExtension:[UnittestRoot repeatedFixed32Extension]
-                  index:1
-                  value:@507];
-  [message setExtension:[UnittestRoot repeatedFixed64Extension]
-                  index:1
-                  value:@508];
-  [message setExtension:[UnittestRoot repeatedSfixed32Extension]
-                  index:1
-                  value:@509];
-  [message setExtension:[UnittestRoot repeatedSfixed64Extension]
-                  index:1
-                  value:@510];
-  [message setExtension:[UnittestRoot repeatedFloatExtension]
-                  index:1
-                  value:@511.0f];
-  [message setExtension:[UnittestRoot repeatedDoubleExtension]
-                  index:1
-                  value:@512.0];
-  [message setExtension:[UnittestRoot repeatedBoolExtension]
-                  index:1
-                  value:@YES];
-  [message setExtension:[UnittestRoot repeatedStringExtension]
-                  index:1
-                  value:@"515"];
-  [message setExtension:[UnittestRoot repeatedBytesExtension]
-                  index:1
-                  value:[NSData gpbtu_dataWithUint32:516]];
-
-  RepeatedGroup_extension *repeatedGroup = [RepeatedGroup_extension message];
-  [repeatedGroup setA:517];
-  [message setExtension:[UnittestRoot repeatedGroupExtension]
-                  index:1
-                  value:repeatedGroup];
-  TestAllTypes_NestedMessage *nestedMessage =
-      [TestAllTypes_NestedMessage message];
-  [nestedMessage setBb:518];
-  [message setExtension:[UnittestRoot repeatedNestedMessageExtension]
-                  index:1
-                  value:nestedMessage];
-  ForeignMessage *foreignMessage = [ForeignMessage message];
-  [foreignMessage setC:519];
-  [message setExtension:[UnittestRoot repeatedForeignMessageExtension]
-                  index:1
-                  value:foreignMessage];
-  ImportMessage *importMessage = [ImportMessage message];
-  [importMessage setD:520];
-  [message setExtension:[UnittestRoot repeatedImportMessageExtension]
-                  index:1
-                  value:importMessage];
-
-  [message setExtension:[UnittestRoot repeatedNestedEnumExtension]
-                  index:1
-                  value:@(TestAllTypes_NestedEnum_Foo)];
-  [message setExtension:[UnittestRoot repeatedForeignEnumExtension]
-                  index:1
-                  value:@(ForeignEnum_ForeignFoo)];
-  [message setExtension:[UnittestRoot repeatedImportEnumExtension]
-                  index:1
-                  value:@(ImportEnum_ImportFoo)];
-
-  [message setExtension:[UnittestRoot repeatedStringPieceExtension]
-                  index:1
-                  value:@"524"];
-  [message setExtension:[UnittestRoot repeatedCordExtension]
-                  index:1
-                  value:@"525"];
-}
-
-- (void)assertAllExtensionsSet:(TestAllExtensions *)message
-                 repeatedCount:(uint32_t)count {
-  XCTAssertTrue([message hasExtension:[UnittestRoot optionalInt32Extension]]);
-  XCTAssertTrue([message hasExtension:[UnittestRoot optionalInt64Extension]]);
-  XCTAssertTrue([message hasExtension:[UnittestRoot optionalUint32Extension]]);
-  XCTAssertTrue([message hasExtension:[UnittestRoot optionalUint64Extension]]);
-  XCTAssertTrue([message hasExtension:[UnittestRoot optionalSint32Extension]]);
-  XCTAssertTrue([message hasExtension:[UnittestRoot optionalSint64Extension]]);
-  XCTAssertTrue([message hasExtension:[UnittestRoot optionalFixed32Extension]]);
-  XCTAssertTrue([message hasExtension:[UnittestRoot optionalFixed64Extension]]);
-  XCTAssertTrue([message hasExtension:[UnittestRoot optionalSfixed32Extension]]);
-  XCTAssertTrue([message hasExtension:[UnittestRoot optionalSfixed64Extension]]);
-  XCTAssertTrue([message hasExtension:[UnittestRoot optionalFloatExtension]]);
-  XCTAssertTrue([message hasExtension:[UnittestRoot optionalDoubleExtension]]);
-  XCTAssertTrue([message hasExtension:[UnittestRoot optionalBoolExtension]]);
-  XCTAssertTrue([message hasExtension:[UnittestRoot optionalStringExtension]]);
-  XCTAssertTrue([message hasExtension:[UnittestRoot optionalBytesExtension]]);
-
-  XCTAssertTrue([message hasExtension:[UnittestRoot optionalGroupExtension]]);
-  XCTAssertTrue([message hasExtension:[UnittestRoot optionalNestedMessageExtension]]);
-  XCTAssertTrue([message hasExtension:[UnittestRoot optionalForeignMessageExtension]]);
-  XCTAssertTrue([message hasExtension:[UnittestRoot optionalImportMessageExtension]]);
-
-  XCTAssertTrue([[message getExtension:[UnittestRoot optionalGroupExtension]] hasA]);
-  XCTAssertTrue([[message getExtension:[UnittestRoot optionalNestedMessageExtension]] hasBb]);
-  XCTAssertTrue([[message getExtension:[UnittestRoot optionalForeignMessageExtension]] hasC]);
-  XCTAssertTrue([[message getExtension:[UnittestRoot optionalImportMessageExtension]] hasD]);
-
-  XCTAssertTrue([message hasExtension:[UnittestRoot optionalNestedEnumExtension]]);
-  XCTAssertTrue([message hasExtension:[UnittestRoot optionalForeignEnumExtension]]);
-  XCTAssertTrue([message hasExtension:[UnittestRoot optionalImportEnumExtension]]);
-
-  XCTAssertTrue([message hasExtension:[UnittestRoot optionalStringPieceExtension]]);
-  XCTAssertTrue([message hasExtension:[UnittestRoot optionalCordExtension]]);
-
-  XCTAssertTrue([message hasExtension:[UnittestRoot defaultInt32Extension]]);
-  XCTAssertTrue([message hasExtension:[UnittestRoot defaultInt64Extension]]);
-  XCTAssertTrue([message hasExtension:[UnittestRoot defaultUint32Extension]]);
-  XCTAssertTrue([message hasExtension:[UnittestRoot defaultUint64Extension]]);
-  XCTAssertTrue([message hasExtension:[UnittestRoot defaultSint32Extension]]);
-  XCTAssertTrue([message hasExtension:[UnittestRoot defaultSint64Extension]]);
-  XCTAssertTrue([message hasExtension:[UnittestRoot defaultFixed32Extension]]);
-  XCTAssertTrue([message hasExtension:[UnittestRoot defaultFixed64Extension]]);
-  XCTAssertTrue([message hasExtension:[UnittestRoot defaultSfixed32Extension]]);
-  XCTAssertTrue([message hasExtension:[UnittestRoot defaultSfixed64Extension]]);
-  XCTAssertTrue([message hasExtension:[UnittestRoot defaultFloatExtension]]);
-  XCTAssertTrue([message hasExtension:[UnittestRoot defaultDoubleExtension]]);
-  XCTAssertTrue([message hasExtension:[UnittestRoot defaultBoolExtension]]);
-  XCTAssertTrue([message hasExtension:[UnittestRoot defaultStringExtension]]);
-  XCTAssertTrue([message hasExtension:[UnittestRoot defaultBytesExtension]]);
-
-  XCTAssertTrue([message hasExtension:[UnittestRoot defaultNestedEnumExtension]]);
-  XCTAssertTrue([message hasExtension:[UnittestRoot defaultForeignEnumExtension]]);
-  XCTAssertTrue([message hasExtension:[UnittestRoot defaultImportEnumExtension]]);
-
-  XCTAssertTrue([message hasExtension:[UnittestRoot defaultStringPieceExtension]]);
-  XCTAssertTrue([message hasExtension:[UnittestRoot defaultCordExtension]]);
-
-  XCTAssertEqual(101, [[message getExtension:[UnittestRoot optionalInt32Extension]] intValue]);
-  XCTAssertEqual(102LL, [[message getExtension:[UnittestRoot optionalInt64Extension]] longLongValue]);
-  XCTAssertEqual(103U, [[message getExtension:[UnittestRoot optionalUint32Extension]] unsignedIntValue]);
-  XCTAssertEqual(104ULL, [[message getExtension:[UnittestRoot optionalUint64Extension]] unsignedLongLongValue]);
-  XCTAssertEqual(105, [[message getExtension:[UnittestRoot optionalSint32Extension]] intValue]);
-  XCTAssertEqual(106LL, [[message getExtension:[UnittestRoot optionalSint64Extension]] longLongValue]);
-  XCTAssertEqual(107U, [[message getExtension:[UnittestRoot optionalFixed32Extension]] unsignedIntValue]);
-  XCTAssertEqual(108ULL, [[message getExtension:[UnittestRoot optionalFixed64Extension]] unsignedLongLongValue]);
-  XCTAssertEqual(109, [[message getExtension:[UnittestRoot optionalSfixed32Extension]] intValue]);
-  XCTAssertEqual(110LL, [[message getExtension:[UnittestRoot optionalSfixed64Extension]] longLongValue]);
-  XCTAssertEqualWithAccuracy(111.0f, [[message getExtension:[UnittestRoot optionalFloatExtension]] floatValue], 0.01);
-  XCTAssertEqualWithAccuracy(112.0, [[message getExtension:[UnittestRoot optionalDoubleExtension]] doubleValue], 0.01);
-  XCTAssertTrue([[message getExtension:[UnittestRoot optionalBoolExtension]] boolValue]);
-  XCTAssertEqualObjects(@"115", [message getExtension:[UnittestRoot optionalStringExtension]]);
-  XCTAssertEqualObjects([NSData gpbtu_dataWithEmbeddedNulls], [message getExtension:[UnittestRoot optionalBytesExtension]]);
-
-  XCTAssertEqual(117, [(TestAllTypes_OptionalGroup*)[message getExtension:[UnittestRoot optionalGroupExtension]] a]);
-  XCTAssertEqual(118, [(TestAllTypes_NestedMessage*)[message getExtension:[UnittestRoot optionalNestedMessageExtension]] bb]);
-  XCTAssertEqual(119, [[message getExtension:[UnittestRoot optionalForeignMessageExtension]] c]);
-  XCTAssertEqual(120, [[message getExtension:[UnittestRoot optionalImportMessageExtension]] d]);
-
-  XCTAssertEqual(TestAllTypes_NestedEnum_Baz, [[message getExtension:[UnittestRoot optionalNestedEnumExtension]] intValue]);
-  XCTAssertEqual(ForeignEnum_ForeignBaz, [[message getExtension:[UnittestRoot optionalForeignEnumExtension]] intValue]);
-  XCTAssertEqual(ImportEnum_ImportBaz, [[message getExtension:[UnittestRoot optionalImportEnumExtension]] intValue]);
-
-  XCTAssertEqualObjects(@"124", [message getExtension:[UnittestRoot optionalStringPieceExtension]]);
-  XCTAssertEqualObjects(@"125", [message getExtension:[UnittestRoot optionalCordExtension]]);
-
-  // -----------------------------------------------------------------
-
-  XCTAssertEqual(count, [[message getExtension:[UnittestRoot repeatedInt32Extension]] count]);
-  XCTAssertEqual(count, [[message getExtension:[UnittestRoot repeatedInt64Extension]] count]);
-  XCTAssertEqual(count, [[message getExtension:[UnittestRoot repeatedUint32Extension]] count]);
-  XCTAssertEqual(count, [[message getExtension:[UnittestRoot repeatedUint64Extension]] count]);
-  XCTAssertEqual(count, [[message getExtension:[UnittestRoot repeatedSint32Extension]] count]);
-  XCTAssertEqual(count, [[message getExtension:[UnittestRoot repeatedSint64Extension]] count]);
-  XCTAssertEqual(count, [[message getExtension:[UnittestRoot repeatedFixed32Extension]] count]);
-  XCTAssertEqual(count, [[message getExtension:[UnittestRoot repeatedFixed64Extension]] count]);
-  XCTAssertEqual(count, [[message getExtension:[UnittestRoot repeatedSfixed32Extension]] count]);
-  XCTAssertEqual(count, [[message getExtension:[UnittestRoot repeatedSfixed64Extension]] count]);
-  XCTAssertEqual(count, [[message getExtension:[UnittestRoot repeatedFloatExtension]] count]);
-  XCTAssertEqual(count, [[message getExtension:[UnittestRoot repeatedDoubleExtension]] count]);
-  XCTAssertEqual(count, [[message getExtension:[UnittestRoot repeatedBoolExtension]] count]);
-  XCTAssertEqual(count, [[message getExtension:[UnittestRoot repeatedStringExtension]] count]);
-  XCTAssertEqual(count, [[message getExtension:[UnittestRoot repeatedBytesExtension]] count]);
-
-  XCTAssertEqual(count, [[message getExtension:[UnittestRoot repeatedGroupExtension]] count]);
-  XCTAssertEqual(count, [[message getExtension:[UnittestRoot repeatedNestedMessageExtension]] count]);
-  XCTAssertEqual(count, [[message getExtension:[UnittestRoot repeatedForeignMessageExtension]] count]);
-  XCTAssertEqual(count, [[message getExtension:[UnittestRoot repeatedImportMessageExtension]] count]);
-  XCTAssertEqual(count, [[message getExtension:[UnittestRoot repeatedNestedEnumExtension]] count]);
-  XCTAssertEqual(count, [[message getExtension:[UnittestRoot repeatedForeignEnumExtension]] count]);
-  XCTAssertEqual(count, [[message getExtension:[UnittestRoot repeatedImportEnumExtension]] count]);
-
-  XCTAssertEqual(count, [[message getExtension:[UnittestRoot repeatedStringPieceExtension]] count]);
-  XCTAssertEqual(count, [[message getExtension:[UnittestRoot repeatedCordExtension]] count]);
-
-  for (uint32_t i = 0; i < count; ++i) {
-    id extension = [message getExtension:[UnittestRoot repeatedInt32Extension]];
-    XCTAssertEqual((int)(201 + i * 100), [extension[i] intValue]);
-    extension = [message getExtension:[UnittestRoot repeatedInt64Extension]];
-    XCTAssertEqual(202 + i * 100, [extension[i] longLongValue]);
-    extension = [message getExtension:[UnittestRoot repeatedUint32Extension]];
-    XCTAssertEqual(203 + i * 100, [extension[i] unsignedIntValue]);
-    extension = [message getExtension:[UnittestRoot repeatedUint64Extension]];
-    XCTAssertEqual(204 + i * 100, [extension[i] unsignedLongLongValue]);
-    extension = [message getExtension:[UnittestRoot repeatedSint32Extension]];
-    XCTAssertEqual((int)(205 + i * 100), [extension[i] intValue]);
-    extension = [message getExtension:[UnittestRoot repeatedSint64Extension]];
-    XCTAssertEqual(206 + i * 100, [extension[i] longLongValue]);
-    extension = [message getExtension:[UnittestRoot repeatedFixed32Extension]];
-    XCTAssertEqual(207 + i * 100, [extension[i] unsignedIntValue]);
-    extension = [message getExtension:[UnittestRoot repeatedFixed64Extension]];
-    XCTAssertEqual(208 + i * 100, [extension[i] unsignedLongLongValue]);
-    extension = [message getExtension:[UnittestRoot repeatedSfixed32Extension]];
-    XCTAssertEqual((int)(209 + i * 100), [extension[i] intValue]);
-    extension = [message getExtension:[UnittestRoot repeatedSfixed64Extension]];
-    XCTAssertEqual(210 + i * 100, [extension[i] longLongValue]);
-    extension = [message getExtension:[UnittestRoot repeatedFloatExtension]];
-    XCTAssertEqualWithAccuracy(211 + i * 100, [extension[i] floatValue], 0.01);
-    extension = [message getExtension:[UnittestRoot repeatedDoubleExtension]];
-    XCTAssertEqualWithAccuracy(212 + i * 100, [extension[i] doubleValue], 0.01);
-    extension = [message getExtension:[UnittestRoot repeatedBoolExtension]];
-    XCTAssertEqual((i % 2) ? YES : NO, [extension[i] boolValue]);
-
-    NSString *string = [[NSString alloc] initWithFormat:@"%d", 215 + i * 100];
-    extension = [message getExtension:[UnittestRoot repeatedStringExtension]];
-    XCTAssertEqualObjects(string, extension[i]);
-    [string release];
-
-    NSData *data = [[NSData alloc] initWithUint32_gpbtu:216 + i * 100];
-    extension = [message getExtension:[UnittestRoot repeatedBytesExtension]];
-    XCTAssertEqualObjects(data, extension[i]);
-    [data release];
-
-    extension = [message getExtension:[UnittestRoot repeatedGroupExtension]];
-    XCTAssertEqual((int)(217 + i * 100), [(TestAllTypes_OptionalGroup*)extension[i] a]);
-    extension = [message getExtension:[UnittestRoot repeatedNestedMessageExtension]];
-    XCTAssertEqual((int)(218 + i * 100), [(TestAllTypes_NestedMessage*)extension[i] bb]);
-    extension = [message getExtension:[UnittestRoot repeatedForeignMessageExtension]];
-    XCTAssertEqual((int)(219 + i * 100), [extension[i] c]);
-    extension = [message getExtension:[UnittestRoot repeatedImportMessageExtension]];
-    XCTAssertEqual((int)(220 + i * 100), [extension[i] d]);
-
-    extension = [message getExtension:[UnittestRoot repeatedNestedEnumExtension]];
-    XCTAssertEqual((i % 2) ? TestAllTypes_NestedEnum_Bar : TestAllTypes_NestedEnum_Baz, [extension[i] intValue]);
-    extension = [message getExtension:[UnittestRoot repeatedForeignEnumExtension]];
-    XCTAssertEqual((i % 2) ? ForeignEnum_ForeignBar : ForeignEnum_ForeignBaz, [extension[i] intValue]);
-    extension = [message getExtension:[UnittestRoot repeatedImportEnumExtension]];
-    XCTAssertEqual((i % 2) ? ImportEnum_ImportBar : ImportEnum_ImportBaz, [extension[i] intValue]);
-
-    string = [[NSString alloc] initWithFormat:@"%d", 224 + i * 100];
-    extension = [message getExtension:[UnittestRoot repeatedStringPieceExtension]];
-    XCTAssertEqualObjects(string, extension[i]);
-    [string release];
-
-    string = [[NSString alloc] initWithFormat:@"%d", 225 + i * 100];
-    extension = [message getExtension:[UnittestRoot repeatedCordExtension]];
-    XCTAssertEqualObjects(string, extension[i]);
-    [string release];
-  }
-
-  // -----------------------------------------------------------------
-
-  XCTAssertTrue([message hasExtension:[UnittestRoot defaultInt32Extension]]);
-  XCTAssertTrue([message hasExtension:[UnittestRoot defaultInt64Extension]]);
-  XCTAssertTrue([message hasExtension:[UnittestRoot defaultUint32Extension]]);
-  XCTAssertTrue([message hasExtension:[UnittestRoot defaultUint64Extension]]);
-  XCTAssertTrue([message hasExtension:[UnittestRoot defaultSint32Extension]]);
-  XCTAssertTrue([message hasExtension:[UnittestRoot defaultSint64Extension]]);
-  XCTAssertTrue([message hasExtension:[UnittestRoot defaultFixed32Extension]]);
-  XCTAssertTrue([message hasExtension:[UnittestRoot defaultFixed64Extension]]);
-  XCTAssertTrue([message hasExtension:[UnittestRoot defaultSfixed32Extension]]);
-  XCTAssertTrue([message hasExtension:[UnittestRoot defaultSfixed64Extension]]);
-  XCTAssertTrue([message hasExtension:[UnittestRoot defaultFloatExtension]]);
-  XCTAssertTrue([message hasExtension:[UnittestRoot defaultDoubleExtension]]);
-  XCTAssertTrue([message hasExtension:[UnittestRoot defaultBoolExtension]]);
-  XCTAssertTrue([message hasExtension:[UnittestRoot defaultStringExtension]]);
-  XCTAssertTrue([message hasExtension:[UnittestRoot defaultBytesExtension]]);
-
-  XCTAssertTrue([message hasExtension:[UnittestRoot defaultNestedEnumExtension]]);
-  XCTAssertTrue([message hasExtension:[UnittestRoot defaultForeignEnumExtension]]);
-  XCTAssertTrue([message hasExtension:[UnittestRoot defaultImportEnumExtension]]);
-
-  XCTAssertTrue([message hasExtension:[UnittestRoot defaultStringPieceExtension]]);
-  XCTAssertTrue([message hasExtension:[UnittestRoot defaultCordExtension]]);
-
-  XCTAssertEqual(401, [[message getExtension:[UnittestRoot defaultInt32Extension]] intValue]);
-  XCTAssertEqual(402LL, [[message getExtension:[UnittestRoot defaultInt64Extension]] longLongValue]);
-  XCTAssertEqual(403U, [[message getExtension:[UnittestRoot defaultUint32Extension]] unsignedIntValue]);
-  XCTAssertEqual(404ULL, [[message getExtension:[UnittestRoot defaultUint64Extension]] unsignedLongLongValue]);
-  XCTAssertEqual(405, [[message getExtension:[UnittestRoot defaultSint32Extension]] intValue]);
-  XCTAssertEqual(406LL, [[message getExtension:[UnittestRoot defaultSint64Extension]] longLongValue]);
-  XCTAssertEqual(407U, [[message getExtension:[UnittestRoot defaultFixed32Extension]] unsignedIntValue]);
-  XCTAssertEqual(408ULL, [[message getExtension:[UnittestRoot defaultFixed64Extension]] unsignedLongLongValue]);
-  XCTAssertEqual(409, [[message getExtension:[UnittestRoot defaultSfixed32Extension]] intValue]);
-  XCTAssertEqual(410LL,[[message getExtension:[UnittestRoot defaultSfixed64Extension]] longLongValue]);
-  XCTAssertEqualWithAccuracy(411.0f, [[message getExtension:[UnittestRoot defaultFloatExtension]] floatValue], 0.01);
-  XCTAssertEqualWithAccuracy(412.0, [[message getExtension:[UnittestRoot defaultDoubleExtension]] doubleValue], 0.01);
-  XCTAssertFalse([[message getExtension:[UnittestRoot defaultBoolExtension]] boolValue]);
-  XCTAssertEqualObjects(@"415", [message getExtension:[UnittestRoot defaultStringExtension]]);
-  XCTAssertEqualObjects([NSData gpbtu_dataWithUint32:416], [message getExtension:[UnittestRoot defaultBytesExtension]]);
-
-  XCTAssertEqual(TestAllTypes_NestedEnum_Foo, [[message getExtension:[UnittestRoot defaultNestedEnumExtension]] intValue]);
-  XCTAssertEqual(ForeignEnum_ForeignFoo, [[message getExtension:[UnittestRoot defaultForeignEnumExtension]] intValue]);
-  XCTAssertEqual(ImportEnum_ImportFoo, [[message getExtension:[UnittestRoot defaultImportEnumExtension]] intValue]);
-
-  XCTAssertEqualObjects(@"424", [message getExtension:[UnittestRoot defaultStringPieceExtension]]);
-  XCTAssertEqualObjects(@"425", [message getExtension:[UnittestRoot defaultCordExtension]]);
-}
-
-- (void)assertRepeatedExtensionsModified:(TestAllExtensions *)message
-                           repeatedCount:(uint32_t)count {
-  // ModifyRepeatedFields only sets the second repeated element of each
-  // field.  In addition to verifying this, we also verify that the first
-  // element and size were *not* modified.
-  XCTAssertEqual(count, [[message getExtension:[UnittestRoot repeatedInt32Extension]] count]);
-  XCTAssertEqual(count, [[message getExtension:[UnittestRoot repeatedInt64Extension]] count]);
-  XCTAssertEqual(count, [[message getExtension:[UnittestRoot repeatedUint32Extension]] count]);
-  XCTAssertEqual(count, [[message getExtension:[UnittestRoot repeatedUint64Extension]] count]);
-  XCTAssertEqual(count, [[message getExtension:[UnittestRoot repeatedSint32Extension]] count]);
-  XCTAssertEqual(count, [[message getExtension:[UnittestRoot repeatedSint64Extension]] count]);
-  XCTAssertEqual(count, [[message getExtension:[UnittestRoot repeatedFixed32Extension]] count]);
-  XCTAssertEqual(count, [[message getExtension:[UnittestRoot repeatedFixed64Extension]] count]);
-  XCTAssertEqual(count, [[message getExtension:[UnittestRoot repeatedSfixed32Extension]] count]);
-  XCTAssertEqual(count, [[message getExtension:[UnittestRoot repeatedSfixed64Extension]] count]);
-  XCTAssertEqual(count, [[message getExtension:[UnittestRoot repeatedFloatExtension]] count]);
-  XCTAssertEqual(count, [[message getExtension:[UnittestRoot repeatedDoubleExtension]] count]);
-  XCTAssertEqual(count, [[message getExtension:[UnittestRoot repeatedBoolExtension]] count]);
-  XCTAssertEqual(count, [[message getExtension:[UnittestRoot repeatedStringExtension]] count]);
-  XCTAssertEqual(count, [[message getExtension:[UnittestRoot repeatedBytesExtension]] count]);
-
-  XCTAssertEqual(count, [[message getExtension:[UnittestRoot repeatedGroupExtension]] count]);
-  XCTAssertEqual(count, [[message getExtension:[UnittestRoot repeatedNestedMessageExtension]] count]);
-  XCTAssertEqual(count, [[message getExtension:[UnittestRoot repeatedForeignMessageExtension]] count]);
-  XCTAssertEqual(count, [[message getExtension:[UnittestRoot repeatedImportMessageExtension]] count]);
-  XCTAssertEqual(count, [[message getExtension:[UnittestRoot repeatedNestedEnumExtension]] count]);
-  XCTAssertEqual(count, [[message getExtension:[UnittestRoot repeatedForeignEnumExtension]] count]);
-  XCTAssertEqual(count, [[message getExtension:[UnittestRoot repeatedImportEnumExtension]] count]);
-
-  XCTAssertEqual(count, [[message getExtension:[UnittestRoot repeatedStringPieceExtension]] count]);
-  XCTAssertEqual(count, [[message getExtension:[UnittestRoot repeatedCordExtension]] count]);
-
-  XCTAssertEqual(201,[[message getExtension:[UnittestRoot repeatedInt32Extension]][0] intValue]);
-  XCTAssertEqual(202LL, [[message getExtension:[UnittestRoot repeatedInt64Extension]][0] longLongValue]);
-  XCTAssertEqual(203U, [[message getExtension:[UnittestRoot repeatedUint32Extension]][0] unsignedIntValue]);
-  XCTAssertEqual(204ULL, [[message getExtension:[UnittestRoot repeatedUint64Extension]][0] unsignedLongLongValue]);
-  XCTAssertEqual(205, [[message getExtension:[UnittestRoot repeatedSint32Extension]][0] intValue]);
-  XCTAssertEqual(206LL, [[message getExtension:[UnittestRoot repeatedSint64Extension]][0] longLongValue]);
-  XCTAssertEqual(207U, [[message getExtension:[UnittestRoot repeatedFixed32Extension]][0] unsignedIntValue]);
-  XCTAssertEqual(208ULL, [[message getExtension:[UnittestRoot repeatedFixed64Extension]][0] unsignedLongLongValue]);
-  XCTAssertEqual(209, [[message getExtension:[UnittestRoot repeatedSfixed32Extension]][0] intValue]);
-  XCTAssertEqual(210LL, [[message getExtension:[UnittestRoot repeatedSfixed64Extension]][0] longLongValue]);
-  XCTAssertEqualWithAccuracy(211.0f, [[message getExtension:[UnittestRoot repeatedFloatExtension]][0] floatValue], 0.01);
-  XCTAssertEqualWithAccuracy(212.0, [[message getExtension:[UnittestRoot repeatedDoubleExtension]][0] doubleValue], 0.01);
-  XCTAssertFalse([[message getExtension:[UnittestRoot repeatedBoolExtension]][0] boolValue]);
-  XCTAssertEqualObjects(@"215", [message getExtension:[UnittestRoot repeatedStringExtension]][0]);
-  XCTAssertEqualObjects([NSData gpbtu_dataWithUint32:216], [message getExtension:[UnittestRoot repeatedBytesExtension]][0]);
-
-  XCTAssertEqual(217, [(TestAllTypes_OptionalGroup*)[message getExtension:[UnittestRoot repeatedGroupExtension]][0] a]);
-  XCTAssertEqual(218, [(TestAllTypes_NestedMessage*)[message getExtension:[UnittestRoot repeatedNestedMessageExtension]][0] bb]);
-  XCTAssertEqual(219, [[message getExtension:[UnittestRoot repeatedForeignMessageExtension]][0] c]);
-  XCTAssertEqual(220, [[message getExtension:[UnittestRoot repeatedImportMessageExtension]][0] d]);
-
-  XCTAssertEqual(TestAllTypes_NestedEnum_Baz,
-                 [[message getExtension:[UnittestRoot repeatedNestedEnumExtension]][0] intValue]);
-  XCTAssertEqual(ForeignEnum_ForeignBaz,
-                 [[message getExtension:[UnittestRoot repeatedForeignEnumExtension]][0] intValue]);
-  XCTAssertEqual(ImportEnum_ImportBaz,
-                 [[message getExtension:[UnittestRoot repeatedImportEnumExtension]][0] intValue]);
-
-  XCTAssertEqualObjects(@"224", [message getExtension:[UnittestRoot repeatedStringPieceExtension]][0]);
-  XCTAssertEqualObjects(@"225", [message getExtension:[UnittestRoot repeatedCordExtension]][0]);
-
-  // Actually verify the second (modified) elements now.
-  XCTAssertEqual(501, [[message getExtension:[UnittestRoot repeatedInt32Extension]][1] intValue]);
-  XCTAssertEqual(502LL, [[message getExtension:[UnittestRoot repeatedInt64Extension]][1] longLongValue]);
-  XCTAssertEqual(503U, [[message getExtension:[UnittestRoot repeatedUint32Extension]][1] unsignedIntValue]);
-  XCTAssertEqual(504ULL, [[message getExtension:[UnittestRoot repeatedUint64Extension]][1] unsignedLongLongValue]);
-  XCTAssertEqual(505, [[message getExtension:[UnittestRoot repeatedSint32Extension]][1] intValue]);
-  XCTAssertEqual(506LL, [[message getExtension:[UnittestRoot repeatedSint64Extension]][1] longLongValue]);
-  XCTAssertEqual(507U, [[message getExtension:[UnittestRoot repeatedFixed32Extension]][1] unsignedIntValue]);
-  XCTAssertEqual(508ULL, [[message getExtension:[UnittestRoot repeatedFixed64Extension]][1] unsignedLongLongValue]);
-  XCTAssertEqual(509, [[message getExtension:[UnittestRoot repeatedSfixed32Extension]][1] intValue]);
-  XCTAssertEqual(510LL, [[message getExtension:[UnittestRoot repeatedSfixed64Extension]][1] longLongValue]);
-  XCTAssertEqualWithAccuracy(511.0f, [[message getExtension:[UnittestRoot repeatedFloatExtension]][1] floatValue], 0.01);
-  XCTAssertEqualWithAccuracy(512.0, [[message getExtension:[UnittestRoot repeatedDoubleExtension]][1] doubleValue], 0.01);
-  XCTAssertTrue([[message getExtension:[UnittestRoot repeatedBoolExtension]][1] boolValue]);
-  XCTAssertEqualObjects(@"515", [message getExtension:[UnittestRoot repeatedStringExtension]][1]);
-  XCTAssertEqualObjects([NSData gpbtu_dataWithUint32:516], [message getExtension:[UnittestRoot repeatedBytesExtension]][1]);
-
-  XCTAssertEqual(517, [(TestAllTypes_OptionalGroup*)[message getExtension:[UnittestRoot repeatedGroupExtension]][1] a]);
-  XCTAssertEqual(518, [(TestAllTypes_NestedMessage*)[message getExtension:[UnittestRoot repeatedNestedMessageExtension]][1] bb]);
-  XCTAssertEqual(519, [[message getExtension:[UnittestRoot repeatedForeignMessageExtension]][1] c]);
-  XCTAssertEqual(520, [[message getExtension:[UnittestRoot repeatedImportMessageExtension]][1] d]);
-
-  XCTAssertEqual(TestAllTypes_NestedEnum_Foo,
-                 [[message getExtension:[UnittestRoot repeatedNestedEnumExtension]][1] intValue]);
-  XCTAssertEqual(ForeignEnum_ForeignFoo,
-                 [[message getExtension:[UnittestRoot repeatedForeignEnumExtension]][1] intValue]);
-  XCTAssertEqual(ImportEnum_ImportFoo,
-                 [[message getExtension:[UnittestRoot repeatedImportEnumExtension]][1] intValue]);
-
-  XCTAssertEqualObjects(@"524", [message getExtension:[UnittestRoot repeatedStringPieceExtension]][1]);
-  XCTAssertEqualObjects(@"525", [message getExtension:[UnittestRoot repeatedCordExtension]][1]);
-}
-
-// -------------------------------------------------------------------
-
-- (void)assertAllFieldsSet:(TestAllTypes *)message
-             repeatedCount:(uint32_t)count {
-  XCTAssertTrue(message.hasOptionalInt32);
-  XCTAssertTrue(message.hasOptionalInt64);
-  XCTAssertTrue(message.hasOptionalUint32);
-  XCTAssertTrue(message.hasOptionalUint64);
-  XCTAssertTrue(message.hasOptionalSint32);
-  XCTAssertTrue(message.hasOptionalSint64);
-  XCTAssertTrue(message.hasOptionalFixed32);
-  XCTAssertTrue(message.hasOptionalFixed64);
-  XCTAssertTrue(message.hasOptionalSfixed32);
-  XCTAssertTrue(message.hasOptionalSfixed64);
-  XCTAssertTrue(message.hasOptionalFloat);
-  XCTAssertTrue(message.hasOptionalDouble);
-  XCTAssertTrue(message.hasOptionalBool);
-  XCTAssertTrue(message.hasOptionalString);
-  XCTAssertTrue(message.hasOptionalBytes);
-
-  XCTAssertTrue(message.hasOptionalGroup);
-  XCTAssertTrue(message.hasOptionalNestedMessage);
-  XCTAssertTrue(message.hasOptionalForeignMessage);
-  XCTAssertTrue(message.hasOptionalImportMessage);
-
-  XCTAssertTrue(message.optionalGroup.hasA);
-  XCTAssertTrue(message.optionalNestedMessage.hasBb);
-  XCTAssertTrue(message.optionalForeignMessage.hasC);
-  XCTAssertTrue(message.optionalImportMessage.hasD);
-
-  XCTAssertTrue(message.hasOptionalNestedEnum);
-  XCTAssertTrue(message.hasOptionalForeignEnum);
-  XCTAssertTrue(message.hasOptionalImportEnum);
-
-  XCTAssertTrue(message.hasOptionalStringPiece);
-  XCTAssertTrue(message.hasOptionalCord);
-
-  XCTAssertEqual(101, message.optionalInt32);
-  XCTAssertEqual(102LL, message.optionalInt64);
-  XCTAssertEqual(103U, message.optionalUint32);
-  XCTAssertEqual(104ULL, message.optionalUint64);
-  XCTAssertEqual(105, message.optionalSint32);
-  XCTAssertEqual(106LL, message.optionalSint64);
-  XCTAssertEqual(107U, message.optionalFixed32);
-  XCTAssertEqual(108ULL, message.optionalFixed64);
-  XCTAssertEqual(109, message.optionalSfixed32);
-  XCTAssertEqual(110LL, message.optionalSfixed64);
-  XCTAssertEqualWithAccuracy(111.0f, message.optionalFloat, 0.1);
-  XCTAssertEqualWithAccuracy(112.0, message.optionalDouble, 0.1);
-  XCTAssertTrue(message.optionalBool);
-  XCTAssertEqualObjects(@"115", message.optionalString);
-  XCTAssertEqualObjects([NSData gpbtu_dataWithEmbeddedNulls],
-                        message.optionalBytes);
-
-  XCTAssertEqual(117, message.optionalGroup.a);
-  XCTAssertEqual(118, message.optionalNestedMessage.bb);
-  XCTAssertEqual(119, message.optionalForeignMessage.c);
-  XCTAssertEqual(120, message.optionalImportMessage.d);
-
-  XCTAssertEqual(TestAllTypes_NestedEnum_Baz, message.optionalNestedEnum);
-  XCTAssertEqual(ForeignEnum_ForeignBaz, message.optionalForeignEnum);
-  XCTAssertEqual(ImportEnum_ImportBaz, message.optionalImportEnum);
-
-  XCTAssertEqualObjects(@"124", message.optionalStringPiece);
-  XCTAssertEqualObjects(@"125", message.optionalCord);
-
-  // -----------------------------------------------------------------
-
-  XCTAssertEqual(count, message.repeatedInt32Array.count);
-  XCTAssertEqual(count, message.repeatedInt64Array.count);
-  XCTAssertEqual(count, message.repeatedUint32Array.count);
-  XCTAssertEqual(count, message.repeatedUint64Array.count);
-  XCTAssertEqual(count, message.repeatedSint32Array.count);
-  XCTAssertEqual(count, message.repeatedSint64Array.count);
-  XCTAssertEqual(count, message.repeatedFixed32Array.count);
-  XCTAssertEqual(count, message.repeatedFixed64Array.count);
-  XCTAssertEqual(count, message.repeatedSfixed32Array.count);
-  XCTAssertEqual(count, message.repeatedSfixed64Array.count);
-  XCTAssertEqual(count, message.repeatedFloatArray.count);
-  XCTAssertEqual(count, message.repeatedDoubleArray.count);
-  XCTAssertEqual(count, message.repeatedBoolArray.count);
-  XCTAssertEqual(count, message.repeatedStringArray.count);
-  XCTAssertEqual(count, message.repeatedBytesArray.count);
-
-  XCTAssertEqual(count, message.repeatedGroupArray.count);
-  XCTAssertEqual(count, message.repeatedNestedMessageArray.count);
-  XCTAssertEqual(count, message.repeatedForeignMessageArray.count);
-  XCTAssertEqual(count, message.repeatedImportMessageArray.count);
-  XCTAssertEqual(count, message.repeatedNestedEnumArray.count);
-  XCTAssertEqual(count, message.repeatedForeignEnumArray.count);
-  XCTAssertEqual(count, message.repeatedImportEnumArray.count);
-
-  XCTAssertEqual(count, message.repeatedStringPieceArray.count);
-  XCTAssertEqual(count, message.repeatedCordArray.count);
-
-  XCTAssertEqual(count, message.repeatedInt32Array_Count);
-  XCTAssertEqual(count, message.repeatedInt64Array_Count);
-  XCTAssertEqual(count, message.repeatedUint32Array_Count);
-  XCTAssertEqual(count, message.repeatedUint64Array_Count);
-  XCTAssertEqual(count, message.repeatedSint32Array_Count);
-  XCTAssertEqual(count, message.repeatedSint64Array_Count);
-  XCTAssertEqual(count, message.repeatedFixed32Array_Count);
-  XCTAssertEqual(count, message.repeatedFixed64Array_Count);
-  XCTAssertEqual(count, message.repeatedSfixed32Array_Count);
-  XCTAssertEqual(count, message.repeatedSfixed64Array_Count);
-  XCTAssertEqual(count, message.repeatedFloatArray_Count);
-  XCTAssertEqual(count, message.repeatedDoubleArray_Count);
-  XCTAssertEqual(count, message.repeatedBoolArray_Count);
-  XCTAssertEqual(count, message.repeatedStringArray_Count);
-  XCTAssertEqual(count, message.repeatedBytesArray_Count);
-
-  XCTAssertEqual(count, message.repeatedGroupArray_Count);
-  XCTAssertEqual(count, message.repeatedNestedMessageArray_Count);
-  XCTAssertEqual(count, message.repeatedForeignMessageArray_Count);
-  XCTAssertEqual(count, message.repeatedImportMessageArray_Count);
-  XCTAssertEqual(count, message.repeatedNestedEnumArray_Count);
-  XCTAssertEqual(count, message.repeatedForeignEnumArray_Count);
-  XCTAssertEqual(count, message.repeatedImportEnumArray_Count);
-
-  XCTAssertEqual(count, message.repeatedStringPieceArray_Count);
-  XCTAssertEqual(count, message.repeatedCordArray_Count);
-
-  for (uint32_t i = 0; i < count; ++i) {
-    XCTAssertEqual((int)(201 + i * 100),
-                   [message.repeatedInt32Array valueAtIndex:i]);
-    XCTAssertEqual(202 + i * 100, [message.repeatedInt64Array valueAtIndex:i]);
-    XCTAssertEqual(203 + i * 100, [message.repeatedUint32Array valueAtIndex:i]);
-    XCTAssertEqual(204 + i * 100, [message.repeatedUint64Array valueAtIndex:i]);
-    XCTAssertEqual((int)(205 + i * 100),
-                   [message.repeatedSint32Array valueAtIndex:i]);
-    XCTAssertEqual(206 + i * 100, [message.repeatedSint64Array valueAtIndex:i]);
-    XCTAssertEqual(207 + i * 100,
-                   [message.repeatedFixed32Array valueAtIndex:i]);
-    XCTAssertEqual(208 + i * 100,
-                   [message.repeatedFixed64Array valueAtIndex:i]);
-    XCTAssertEqual((int)(209 + i * 100),
-                   [message.repeatedSfixed32Array valueAtIndex:i]);
-    XCTAssertEqual(210 + i * 100,
-                   [message.repeatedSfixed64Array valueAtIndex:i]);
-    XCTAssertEqualWithAccuracy(
-        211 + i * 100, [message.repeatedFloatArray valueAtIndex:i], 0.1);
-    XCTAssertEqualWithAccuracy(
-        212 + i * 100, [message.repeatedDoubleArray valueAtIndex:i], 0.1);
-    XCTAssertEqual((i % 2) ? YES : NO,
-                   [message.repeatedBoolArray valueAtIndex:i]);
-
-    NSString *string = [[NSString alloc] initWithFormat:@"%d", 215 + i * 100];
-    XCTAssertEqualObjects(string, message.repeatedStringArray[i]);
-    [string release];
-
-    NSData *data = [[NSData alloc] initWithUint32_gpbtu:216 + i * 100];
-    XCTAssertEqualObjects(data, message.repeatedBytesArray[i]);
-    [data release];
-
-    XCTAssertEqual((int)(217 + i * 100), ((TestAllTypes_RepeatedGroup*)message.repeatedGroupArray[i]).a);
-    XCTAssertEqual((int)(218 + i * 100), ((TestAllTypes_NestedMessage*)message.repeatedNestedMessageArray[i]).bb);
-    XCTAssertEqual((int)(219 + i * 100), ((ForeignMessage*)message.repeatedForeignMessageArray[i]).c);
-    XCTAssertEqual((int)(220 + i * 100), ((ImportMessage*)message.repeatedImportMessageArray[i]).d);
-
-    XCTAssertEqual((i % 2) ? TestAllTypes_NestedEnum_Bar : TestAllTypes_NestedEnum_Baz, [message.repeatedNestedEnumArray valueAtIndex:i]);
-    XCTAssertEqual((i % 2) ? ForeignEnum_ForeignBar : ForeignEnum_ForeignBaz, [message.repeatedForeignEnumArray valueAtIndex:i]);
-    XCTAssertEqual((i % 2) ? ImportEnum_ImportBar : ImportEnum_ImportBaz, [message.repeatedImportEnumArray valueAtIndex:i]);
-
-    string = [[NSString alloc] initWithFormat:@"%d", 224 + i * 100];
-    XCTAssertEqualObjects(string, message.repeatedStringPieceArray[i]);
-    [string release];
-
-    string = [[NSString alloc] initWithFormat:@"%d", 225 + i * 100];
-    XCTAssertEqualObjects(string, message.repeatedCordArray[i]);
-    [string release];
-  }
-
-  // -----------------------------------------------------------------
-
-  XCTAssertTrue(message.hasDefaultInt32);
-  XCTAssertTrue(message.hasDefaultInt64);
-  XCTAssertTrue(message.hasDefaultUint32);
-  XCTAssertTrue(message.hasDefaultUint64);
-  XCTAssertTrue(message.hasDefaultSint32);
-  XCTAssertTrue(message.hasDefaultSint64);
-  XCTAssertTrue(message.hasDefaultFixed32);
-  XCTAssertTrue(message.hasDefaultFixed64);
-  XCTAssertTrue(message.hasDefaultSfixed32);
-  XCTAssertTrue(message.hasDefaultSfixed64);
-  XCTAssertTrue(message.hasDefaultFloat);
-  XCTAssertTrue(message.hasDefaultDouble);
-  XCTAssertTrue(message.hasDefaultBool);
-  XCTAssertTrue(message.hasDefaultString);
-  XCTAssertTrue(message.hasDefaultBytes);
-
-  XCTAssertTrue(message.hasDefaultNestedEnum);
-  XCTAssertTrue(message.hasDefaultForeignEnum);
-  XCTAssertTrue(message.hasDefaultImportEnum);
-
-  XCTAssertTrue(message.hasDefaultStringPiece);
-  XCTAssertTrue(message.hasDefaultCord);
-
-  XCTAssertEqual(401, message.defaultInt32);
-  XCTAssertEqual(402LL, message.defaultInt64);
-  XCTAssertEqual(403U, message.defaultUint32);
-  XCTAssertEqual(404ULL, message.defaultUint64);
-  XCTAssertEqual(405, message.defaultSint32);
-  XCTAssertEqual(406LL, message.defaultSint64);
-  XCTAssertEqual(407U, message.defaultFixed32);
-  XCTAssertEqual(408ULL, message.defaultFixed64);
-  XCTAssertEqual(409, message.defaultSfixed32);
-  XCTAssertEqual(410LL, message.defaultSfixed64);
-  XCTAssertEqualWithAccuracy(411.0f, message.defaultFloat, 0.1);
-  XCTAssertEqualWithAccuracy(412.0, message.defaultDouble, 0.1);
-  XCTAssertFalse(message.defaultBool);
-  XCTAssertEqualObjects(@"415", message.defaultString);
-  XCTAssertEqualObjects([NSData gpbtu_dataWithUint32:416],
-                        message.defaultBytes);
-
-  XCTAssertEqual(TestAllTypes_NestedEnum_Foo, message.defaultNestedEnum);
-  XCTAssertEqual(ForeignEnum_ForeignFoo, message.defaultForeignEnum);
-  XCTAssertEqual(ImportEnum_ImportFoo, message.defaultImportEnum);
-
-  XCTAssertEqualObjects(@"424", message.defaultStringPiece);
-  XCTAssertEqualObjects(@"425", message.defaultCord);
-}
-
-- (void)setAllFields:(TestAllTypes *)message repeatedCount:(uint32_t)count {
-  [message setOptionalInt32:101];
-  [message setOptionalInt64:102];
-  [message setOptionalUint32:103];
-  [message setOptionalUint64:104];
-  [message setOptionalSint32:105];
-  [message setOptionalSint64:106];
-  [message setOptionalFixed32:107];
-  [message setOptionalFixed64:108];
-  [message setOptionalSfixed32:109];
-  [message setOptionalSfixed64:110];
-  [message setOptionalFloat:111];
-  [message setOptionalDouble:112];
-  [message setOptionalBool:YES];
-  [message setOptionalString:@"115"];
-  [message setOptionalBytes:[NSData gpbtu_dataWithEmbeddedNulls]];
-
-  TestAllTypes_OptionalGroup *allTypes = [TestAllTypes_OptionalGroup message];
-  [allTypes setA:117];
-  [message setOptionalGroup:allTypes];
-  TestAllTypes_NestedMessage *nestedMessage =
-      [TestAllTypes_NestedMessage message];
-  [nestedMessage setBb:118];
-  [message setOptionalNestedMessage:nestedMessage];
-  ForeignMessage *foreignMessage = [ForeignMessage message];
-  [foreignMessage setC:119];
-  [message setOptionalForeignMessage:foreignMessage];
-  ImportMessage *importMessage = [ImportMessage message];
-  [importMessage setD:120];
-  [message setOptionalImportMessage:importMessage];
-
-  [message setOptionalNestedEnum:TestAllTypes_NestedEnum_Baz];
-  [message setOptionalForeignEnum:ForeignEnum_ForeignBaz];
-  [message setOptionalImportEnum:ImportEnum_ImportBaz];
-
-  [message setOptionalStringPiece:@"124"];
-  [message setOptionalCord:@"125"];
-
-  // -----------------------------------------------------------------
-
-  for (uint32_t i = 0; i < count; i++) {
-    [message.repeatedInt32Array addValue:201 + i * 100];
-    [message.repeatedInt64Array addValue:202 + i * 100];
-    [message.repeatedUint32Array addValue:203 + i * 100];
-    [message.repeatedUint64Array addValue:204 + i * 100];
-    [message.repeatedSint32Array addValue:205 + i * 100];
-    [message.repeatedSint64Array addValue:206 + i * 100];
-    [message.repeatedFixed32Array addValue:207 + i * 100];
-    [message.repeatedFixed64Array addValue:208 + i * 100];
-    [message.repeatedSfixed32Array addValue:209 + i * 100];
-    [message.repeatedSfixed64Array addValue:210 + i * 100];
-    [message.repeatedFloatArray addValue:211 + i * 100];
-    [message.repeatedDoubleArray addValue:212 + i * 100];
-    [message.repeatedBoolArray addValue:(BOOL)(i % 2)];
-    NSString *string = [[NSString alloc] initWithFormat:@"%d", 215 + i * 100];
-    [message.repeatedStringArray addObject:string];
-    [string release];
-
-    NSData *data = [[NSData alloc] initWithUint32_gpbtu:216 + i * 100];
-    [message.repeatedBytesArray addObject:data];
-    [data release];
-
-    TestAllTypes_RepeatedGroup *testAll =
-        [[TestAllTypes_RepeatedGroup alloc] init];
-    [testAll setA:217 + i * 100];
-    [message.repeatedGroupArray addObject:testAll];
-    [testAll release];
-
-    nestedMessage = [[TestAllTypes_NestedMessage alloc] init];
-    [nestedMessage setBb:218 + i * 100];
-    [message.repeatedNestedMessageArray addObject:nestedMessage];
-    [nestedMessage release];
-
-    foreignMessage = [[ForeignMessage alloc] init];
-    [foreignMessage setC:219 + i * 100];
-    [message.repeatedForeignMessageArray addObject:foreignMessage];
-    [foreignMessage release];
-
-    importMessage = [[ImportMessage alloc] init];
-    [importMessage setD:220 + i * 100];
-    [message.repeatedImportMessageArray addObject:importMessage];
-    [importMessage release];
-
-    [message.repeatedNestedEnumArray addValue:(i % 2) ? TestAllTypes_NestedEnum_Bar : TestAllTypes_NestedEnum_Baz];
-
-    [message.repeatedForeignEnumArray addValue:(i % 2) ? ForeignEnum_ForeignBar : ForeignEnum_ForeignBaz];
-    [message.repeatedImportEnumArray addValue:(i % 2) ? ImportEnum_ImportBar : ImportEnum_ImportBaz];
-
-    string = [[NSString alloc] initWithFormat:@"%d", 224 + i * 100];
-    [message.repeatedStringPieceArray addObject:string];
-    [string release];
-
-    string = [[NSString alloc] initWithFormat:@"%d", 225 + i * 100];
-    [message.repeatedCordArray addObject:string];
-    [string release];
-  }
-  // -----------------------------------------------------------------
-
-  message.defaultInt32 = 401;
-  message.defaultInt64 = 402;
-  message.defaultUint32 = 403;
-  message.defaultUint64 = 404;
-  message.defaultSint32 = 405;
-  message.defaultSint64 = 406;
-  message.defaultFixed32 = 407;
-  message.defaultFixed64 = 408;
-  message.defaultSfixed32 = 409;
-  message.defaultSfixed64 = 410;
-  message.defaultFloat = 411;
-  message.defaultDouble = 412;
-  message.defaultBool = NO;
-  message.defaultString = @"415";
-  message.defaultBytes = [NSData gpbtu_dataWithUint32:416];
-
-  message.defaultNestedEnum = TestAllTypes_NestedEnum_Foo;
-  message.defaultForeignEnum = ForeignEnum_ForeignFoo;
-  message.defaultImportEnum = ImportEnum_ImportFoo;
-
-  message.defaultStringPiece = @"424";
-  message.defaultCord = @"425";
-}
-
-- (void)clearAllFields:(TestAllTypes *)message {
-  message.hasOptionalInt32 = NO;
-  message.hasOptionalInt64 = NO;
-  message.hasOptionalUint32 = NO;
-  message.hasOptionalUint64 = NO;
-  message.hasOptionalSint32 = NO;
-  message.hasOptionalSint64 = NO;
-  message.hasOptionalFixed32 = NO;
-  message.hasOptionalFixed64 = NO;
-  message.hasOptionalSfixed32 = NO;
-  message.hasOptionalSfixed64 = NO;
-  message.hasOptionalFloat = NO;
-  message.hasOptionalDouble = NO;
-  message.hasOptionalBool = NO;
-  message.hasOptionalString = NO;
-  message.hasOptionalBytes = NO;
-
-  message.hasOptionalGroup = NO;
-  message.hasOptionalNestedMessage = NO;
-  message.hasOptionalForeignMessage = NO;
-  message.hasOptionalImportMessage = NO;
-
-  message.hasOptionalNestedEnum = NO;
-  message.hasOptionalForeignEnum = NO;
-  message.hasOptionalImportEnum = NO;
-
-  message.hasOptionalStringPiece = NO;
-  message.hasOptionalCord = NO;
-
-  // -----------------------------------------------------------------
-
-  [message.repeatedInt32Array removeAll];
-  [message.repeatedInt64Array removeAll];
-  [message.repeatedUint32Array removeAll];
-  [message.repeatedUint64Array removeAll];
-  [message.repeatedSint32Array removeAll];
-  [message.repeatedSint64Array removeAll];
-  [message.repeatedFixed32Array removeAll];
-  [message.repeatedFixed64Array removeAll];
-  [message.repeatedSfixed32Array removeAll];
-  [message.repeatedSfixed64Array removeAll];
-  [message.repeatedFloatArray removeAll];
-  [message.repeatedDoubleArray removeAll];
-  [message.repeatedBoolArray removeAll];
-  [message.repeatedStringArray removeAllObjects];
-  [message.repeatedBytesArray removeAllObjects];
-
-  [message.repeatedGroupArray removeAllObjects];
-  [message.repeatedNestedMessageArray removeAllObjects];
-  [message.repeatedForeignMessageArray removeAllObjects];
-  [message.repeatedImportMessageArray removeAllObjects];
-
-  [message.repeatedNestedEnumArray removeAll];
-  [message.repeatedForeignEnumArray removeAll];
-  [message.repeatedImportEnumArray removeAll];
-
-  [message.repeatedStringPieceArray removeAllObjects];
-  [message.repeatedCordArray removeAllObjects];
-
-  // -----------------------------------------------------------------
-
-  message.hasDefaultInt32 = NO;
-  message.hasDefaultInt64 = NO;
-  message.hasDefaultUint32 = NO;
-  message.hasDefaultUint64 = NO;
-  message.hasDefaultSint32 = NO;
-  message.hasDefaultSint64 = NO;
-  message.hasDefaultFixed32 = NO;
-  message.hasDefaultFixed64 = NO;
-  message.hasDefaultSfixed32 = NO;
-  message.hasDefaultSfixed64 = NO;
-  message.hasDefaultFloat = NO;
-  message.hasDefaultDouble = NO;
-  message.hasDefaultBool = NO;
-  message.hasDefaultString = NO;
-  message.hasDefaultBytes = NO;
-
-  message.hasDefaultNestedEnum = NO;
-  message.hasDefaultForeignEnum = NO;
-  message.hasDefaultImportEnum = NO;
-
-  message.hasDefaultStringPiece = NO;
-  message.hasDefaultCord = NO;
-}
-
-- (void)setAllExtensions:(TestAllExtensions *)message
-           repeatedCount:(uint32_t)count {
-  [message setExtension:[UnittestRoot optionalInt32Extension] value:@101];
-  [message setExtension:[UnittestRoot optionalInt64Extension] value:@102L];
-  [message setExtension:[UnittestRoot optionalUint32Extension] value:@103];
-  [message setExtension:[UnittestRoot optionalUint64Extension] value:@104L];
-  [message setExtension:[UnittestRoot optionalSint32Extension] value:@105];
-  [message setExtension:[UnittestRoot optionalSint64Extension] value:@106L];
-  [message setExtension:[UnittestRoot optionalFixed32Extension] value:@107];
-  [message setExtension:[UnittestRoot optionalFixed64Extension] value:@108L];
-  [message setExtension:[UnittestRoot optionalSfixed32Extension] value:@109];
-  [message setExtension:[UnittestRoot optionalSfixed64Extension] value:@110L];
-  [message setExtension:[UnittestRoot optionalFloatExtension] value:@111.0f];
-  [message setExtension:[UnittestRoot optionalDoubleExtension] value:@112.0];
-  [message setExtension:[UnittestRoot optionalBoolExtension] value:@YES];
-  [message setExtension:[UnittestRoot optionalStringExtension] value:@"115"];
-  [message setExtension:[UnittestRoot optionalBytesExtension]
-                  value:[NSData gpbtu_dataWithEmbeddedNulls]];
-
-  OptionalGroup_extension *optionalGroup = [OptionalGroup_extension message];
-  [optionalGroup setA:117];
-  [message setExtension:[UnittestRoot optionalGroupExtension]
-                  value:optionalGroup];
-  TestAllTypes_NestedMessage *nestedMessage =
-      [TestAllTypes_NestedMessage message];
-  [nestedMessage setBb:118];
-  [message setExtension:[UnittestRoot optionalNestedMessageExtension]
-                  value:nestedMessage];
-  ForeignMessage *foreignMessage = [ForeignMessage message];
-  [foreignMessage setC:119];
-  [message setExtension:[UnittestRoot optionalForeignMessageExtension]
-                  value:foreignMessage];
-  ImportMessage *importMessage = [ImportMessage message];
-  [importMessage setD:120];
-  [message setExtension:[UnittestRoot optionalImportMessageExtension]
-                  value:importMessage];
-
-  [message setExtension:[UnittestRoot optionalNestedEnumExtension]
-                  value:@(TestAllTypes_NestedEnum_Baz)];
-  [message setExtension:[UnittestRoot optionalForeignEnumExtension]
-                  value:@(ForeignEnum_ForeignBaz)];
-  [message setExtension:[UnittestRoot optionalImportEnumExtension]
-                  value:@(ImportEnum_ImportBaz)];
-
-  [message setExtension:[UnittestRoot optionalStringPieceExtension]
-                  value:@"124"];
-  [message setExtension:[UnittestRoot optionalCordExtension] value:@"125"];
-
-  for (uint32_t i = 0; i < count; ++i) {
-    [message addExtension:[UnittestRoot repeatedInt32Extension]
-                    value:@(201 + i * 100)];
-    [message addExtension:[UnittestRoot repeatedInt64Extension]
-                    value:@(202 + i * 100)];
-    [message addExtension:[UnittestRoot repeatedUint32Extension]
-                    value:@(203 + i * 100)];
-    [message addExtension:[UnittestRoot repeatedUint64Extension]
-                    value:@(204 + i * 100)];
-    [message addExtension:[UnittestRoot repeatedSint32Extension]
-                    value:@(205 + i * 100)];
-    [message addExtension:[UnittestRoot repeatedSint64Extension]
-                    value:@(206 + i * 100)];
-    [message addExtension:[UnittestRoot repeatedFixed32Extension]
-                    value:@(207 + i * 100)];
-    [message addExtension:[UnittestRoot repeatedFixed64Extension]
-                    value:@(208 + i * 100)];
-    [message addExtension:[UnittestRoot repeatedSfixed32Extension]
-                    value:@(209 + i * 100)];
-    [message addExtension:[UnittestRoot repeatedSfixed64Extension]
-                    value:@(210 + i * 100)];
-    [message addExtension:[UnittestRoot repeatedFloatExtension]
-                    value:@(211 + i * 100)];
-    [message addExtension:[UnittestRoot repeatedDoubleExtension]
-                    value:@(212 + i * 100)];
-    [message addExtension:[UnittestRoot repeatedBoolExtension]
-                    value:@((i % 2) ? YES : NO)];
-    NSString *string = [[NSString alloc] initWithFormat:@"%d", 215 + i * 100];
-    [message addExtension:[UnittestRoot repeatedStringExtension] value:string];
-    [string release];
-    NSData *data = [[NSData alloc] initWithUint32_gpbtu:216 + i * 100];
-    [message addExtension:[UnittestRoot repeatedBytesExtension] value:data];
-    [data release];
-
-    RepeatedGroup_extension *repeatedGroup =
-        [[RepeatedGroup_extension alloc] init];
-    [repeatedGroup setA:217 + i * 100];
-    [message addExtension:[UnittestRoot repeatedGroupExtension]
-                    value:repeatedGroup];
-    [repeatedGroup release];
-    nestedMessage = [[TestAllTypes_NestedMessage alloc] init];
-    [nestedMessage setBb:218 + i * 100];
-    [message addExtension:[UnittestRoot repeatedNestedMessageExtension]
-                    value:nestedMessage];
-    [nestedMessage release];
-    foreignMessage = [[ForeignMessage alloc] init];
-    [foreignMessage setC:219 + i * 100];
-    [message addExtension:[UnittestRoot repeatedForeignMessageExtension]
-                    value:foreignMessage];
-    [foreignMessage release];
-    importMessage = [[ImportMessage alloc] init];
-    [importMessage setD:220 + i * 100];
-    [message addExtension:[UnittestRoot repeatedImportMessageExtension]
-                    value:importMessage];
-    [importMessage release];
-    [message addExtension:[UnittestRoot repeatedNestedEnumExtension]
-                    value:@((i % 2) ? TestAllTypes_NestedEnum_Bar
-                                    : TestAllTypes_NestedEnum_Baz)];
-    [message addExtension:[UnittestRoot repeatedForeignEnumExtension]
-                    value:@((i % 2) ? ForeignEnum_ForeignBar
-                                    : ForeignEnum_ForeignBaz)];
-    [message
-        addExtension:[UnittestRoot repeatedImportEnumExtension]
-               value:@((i % 2) ? ImportEnum_ImportBar : ImportEnum_ImportBaz)];
-
-    string = [[NSString alloc] initWithFormat:@"%d", 224 + i * 100];
-    [message addExtension:[UnittestRoot repeatedStringPieceExtension]
-                    value:string];
-    [string release];
-
-    string = [[NSString alloc] initWithFormat:@"%d", 225 + i * 100];
-    [message addExtension:[UnittestRoot repeatedCordExtension] value:string];
-    [string release];
-  }
-
-  // -----------------------------------------------------------------
-
-  [message setExtension:[UnittestRoot defaultInt32Extension] value:@401];
-  [message setExtension:[UnittestRoot defaultInt64Extension] value:@402L];
-  [message setExtension:[UnittestRoot defaultUint32Extension] value:@403];
-  [message setExtension:[UnittestRoot defaultUint64Extension] value:@404L];
-  [message setExtension:[UnittestRoot defaultSint32Extension] value:@405];
-  [message setExtension:[UnittestRoot defaultSint64Extension] value:@406L];
-  [message setExtension:[UnittestRoot defaultFixed32Extension] value:@407];
-  [message setExtension:[UnittestRoot defaultFixed64Extension] value:@408L];
-  [message setExtension:[UnittestRoot defaultSfixed32Extension] value:@409];
-  [message setExtension:[UnittestRoot defaultSfixed64Extension] value:@410L];
-  [message setExtension:[UnittestRoot defaultFloatExtension] value:@411.0f];
-  [message setExtension:[UnittestRoot defaultDoubleExtension] value:@412.0];
-  [message setExtension:[UnittestRoot defaultBoolExtension] value:@NO];
-  [message setExtension:[UnittestRoot defaultStringExtension] value:@"415"];
-  [message setExtension:[UnittestRoot defaultBytesExtension]
-                  value:[NSData gpbtu_dataWithUint32:416]];
-
-  [message setExtension:[UnittestRoot defaultNestedEnumExtension]
-                  value:@(TestAllTypes_NestedEnum_Foo)];
-  [message setExtension:[UnittestRoot defaultForeignEnumExtension]
-                  value:@(ForeignEnum_ForeignFoo)];
-  [message setExtension:[UnittestRoot defaultImportEnumExtension]
-                  value:@(ImportEnum_ImportFoo)];
-
-  [message setExtension:[UnittestRoot defaultStringPieceExtension]
-                  value:@"424"];
-  [message setExtension:[UnittestRoot defaultCordExtension] value:@"425"];
-}
-
-- (void)setAllMapFields:(TestMap *)message numEntries:(uint32_t)count {
-  for (uint32_t i = 0; i < count; i++) {
-    [message.mapInt32Int32 setInt32:(i + 1) forKey:100 + i * 100];
-    [message.mapInt64Int64 setInt64:(i + 1) forKey:101 + i * 100];
-    [message.mapUint32Uint32 setUInt32:(i + 1) forKey:102 + i * 100];
-    [message.mapUint64Uint64 setUInt64:(i + 1) forKey:103 + i * 100];
-    [message.mapSint32Sint32 setInt32:(i + 1) forKey:104 + i * 100];
-    [message.mapSint64Sint64 setInt64:(i + 1) forKey:105 + i * 100];
-    [message.mapFixed32Fixed32 setUInt32:(i + 1) forKey:106 + i * 100];
-    [message.mapFixed64Fixed64 setUInt64:(i + 1) forKey:107 + i * 100];
-    [message.mapSfixed32Sfixed32 setInt32:(i + 1) forKey:108 + i * 100];
-    [message.mapSfixed64Sfixed64 setInt64:(i + 1) forKey:109 + i * 100];
-    [message.mapInt32Float setFloat:(i + 1) forKey:110 + i * 100];
-    [message.mapInt32Double setDouble:(i + 1) forKey:111 + i * 100];
-    [message.mapBoolBool setBool:((i % 2) == 1) forKey:((i % 2) == 0)];
-
-    NSString *keyStr = [[NSString alloc] initWithFormat:@"%d", 112 + i * 100];
-    NSString *dataStr = [[NSString alloc] initWithFormat:@"%d", i + 1];
-    [message.mapStringString setObject:dataStr forKey:keyStr];
-    [keyStr release];
-    [dataStr release];
-
-    NSData *data = [[NSData alloc] initWithUint32_gpbtu:i + 1];
-    [message.mapInt32Bytes setObject:data forKey:113 + i * 100];
-    [data release];
-
-    [message.mapInt32Enum
-        setEnum:(i % 2) ? MapEnum_MapEnumBar : MapEnum_MapEnumBaz
-         forKey:114 + i * 100];
-
-    ForeignMessage *subMsg = [[ForeignMessage alloc] init];
-    subMsg.c = i + 1;
-    [message.mapInt32ForeignMessage setObject:subMsg forKey:115 + i * 100];
-    [subMsg release];
-  }
-}
-
-- (void)setAllTestPackedFields:(TestPackedTypes *)message {
-  // Must match -setAllTestUnpackedFields:
-  [message.packedInt32Array addValue:101];
-  [message.packedInt64Array addValue:102];
-  [message.packedUint32Array addValue:103];
-  [message.packedUint64Array addValue:104];
-  [message.packedSint32Array addValue:105];
-  [message.packedSint64Array addValue:106];
-  [message.packedFixed32Array addValue:107];
-  [message.packedFixed64Array addValue:108];
-  [message.packedSfixed32Array addValue:109];
-  [message.packedSfixed64Array addValue:110];
-  [message.packedFloatArray addValue:111.f];
-  [message.packedDoubleArray addValue:112.];
-  [message.packedBoolArray addValue:YES];
-  [message.packedEnumArray addValue:ForeignEnum_ForeignBar];
-
-  [message.packedInt32Array addValue:201];
-  [message.packedInt64Array addValue:302];
-  [message.packedUint32Array addValue:203];
-  [message.packedUint64Array addValue:204];
-  [message.packedSint32Array addValue:205];
-  [message.packedSint64Array addValue:206];
-  [message.packedFixed32Array addValue:207];
-  [message.packedFixed64Array addValue:208];
-  [message.packedSfixed32Array addValue:209];
-  [message.packedSfixed64Array addValue:210];
-  [message.packedFloatArray addValue:211.f];
-  [message.packedDoubleArray addValue:212.];
-  [message.packedBoolArray addValue:NO];
-  [message.packedEnumArray addValue:ForeignEnum_ForeignBaz];
-}
-
-- (void)setAllTestUnpackedFields:(TestUnpackedTypes *)message {
-  // Must match -setAllTestPackedFields:
-  [message.unpackedInt32Array addValue:101];
-  [message.unpackedInt64Array addValue:102];
-  [message.unpackedUint32Array addValue:103];
-  [message.unpackedUint64Array addValue:104];
-  [message.unpackedSint32Array addValue:105];
-  [message.unpackedSint64Array addValue:106];
-  [message.unpackedFixed32Array addValue:107];
-  [message.unpackedFixed64Array addValue:108];
-  [message.unpackedSfixed32Array addValue:109];
-  [message.unpackedSfixed64Array addValue:110];
-  [message.unpackedFloatArray addValue:111.f];
-  [message.unpackedDoubleArray addValue:112.];
-  [message.unpackedBoolArray addValue:YES];
-  [message.unpackedEnumArray addValue:ForeignEnum_ForeignBar];
-
-  [message.unpackedInt32Array addValue:201];
-  [message.unpackedInt64Array addValue:302];
-  [message.unpackedUint32Array addValue:203];
-  [message.unpackedUint64Array addValue:204];
-  [message.unpackedSint32Array addValue:205];
-  [message.unpackedSint64Array addValue:206];
-  [message.unpackedFixed32Array addValue:207];
-  [message.unpackedFixed64Array addValue:208];
-  [message.unpackedSfixed32Array addValue:209];
-  [message.unpackedSfixed64Array addValue:210];
-  [message.unpackedFloatArray addValue:211.f];
-  [message.unpackedDoubleArray addValue:212.];
-  [message.unpackedBoolArray addValue:NO];
-  [message.unpackedEnumArray addValue:ForeignEnum_ForeignBaz];
-}
-
-- (GPBExtensionRegistry *)extensionRegistry {
-  return [UnittestRoot extensionRegistry];
-}
-
-- (TestAllTypes *)allSetRepeatedCount:(uint32_t)count {
-  TestAllTypes *message = [TestAllTypes message];
-  [self setAllFields:message repeatedCount:count];
-  return message;
-}
-
-- (TestAllExtensions *)allExtensionsSetRepeatedCount:(uint32_t)count {
-  TestAllExtensions *message = [TestAllExtensions message];
-  [self setAllExtensions:message repeatedCount:count];
-  return message;
-}
-
-- (TestPackedTypes *)packedSetRepeatedCount:(uint32_t)count {
-  TestPackedTypes *message = [TestPackedTypes message];
-  [self setPackedFields:message repeatedCount:count];
-  return message;
-}
-
-- (TestPackedExtensions *)packedExtensionsSetRepeatedCount:(uint32_t)count {
-  TestPackedExtensions *message = [TestPackedExtensions message];
-  [self setPackedExtensions:message repeatedCount:count];
-  return message;
-}
-
-// -------------------------------------------------------------------
-
-- (void)assertClear:(TestAllTypes *)message {
-  // hasBlah() should initially be NO for all optional fields.
-  XCTAssertFalse(message.hasOptionalInt32);
-  XCTAssertFalse(message.hasOptionalInt64);
-  XCTAssertFalse(message.hasOptionalUint32);
-  XCTAssertFalse(message.hasOptionalUint64);
-  XCTAssertFalse(message.hasOptionalSint32);
-  XCTAssertFalse(message.hasOptionalSint64);
-  XCTAssertFalse(message.hasOptionalFixed32);
-  XCTAssertFalse(message.hasOptionalFixed64);
-  XCTAssertFalse(message.hasOptionalSfixed32);
-  XCTAssertFalse(message.hasOptionalSfixed64);
-  XCTAssertFalse(message.hasOptionalFloat);
-  XCTAssertFalse(message.hasOptionalDouble);
-  XCTAssertFalse(message.hasOptionalBool);
-  XCTAssertFalse(message.hasOptionalString);
-  XCTAssertFalse(message.hasOptionalBytes);
-
-  XCTAssertFalse(message.hasOptionalGroup);
-  XCTAssertFalse(message.hasOptionalNestedMessage);
-  XCTAssertFalse(message.hasOptionalForeignMessage);
-  XCTAssertFalse(message.hasOptionalImportMessage);
-
-  XCTAssertFalse(message.hasOptionalNestedEnum);
-  XCTAssertFalse(message.hasOptionalForeignEnum);
-  XCTAssertFalse(message.hasOptionalImportEnum);
-
-  XCTAssertFalse(message.hasOptionalStringPiece);
-  XCTAssertFalse(message.hasOptionalCord);
-
-  // Optional fields without defaults are set to zero or something like it.
-  XCTAssertEqual(0, message.optionalInt32);
-  XCTAssertEqual(0LL, message.optionalInt64);
-  XCTAssertEqual(0U, message.optionalUint32);
-  XCTAssertEqual(0ULL, message.optionalUint64);
-  XCTAssertEqual(0, message.optionalSint32);
-  XCTAssertEqual(0LL, message.optionalSint64);
-  XCTAssertEqual(0U, message.optionalFixed32);
-  XCTAssertEqual(0ULL, message.optionalFixed64);
-  XCTAssertEqual(0, message.optionalSfixed32);
-  XCTAssertEqual(0LL, message.optionalSfixed64);
-  XCTAssertEqual(0.0f, message.optionalFloat);
-  XCTAssertEqual(0.0, message.optionalDouble);
-  XCTAssertFalse(message.optionalBool);
-  XCTAssertEqualObjects(message.optionalString, @"");
-  XCTAssertEqualObjects(message.optionalBytes, GPBEmptyNSData());
-
-  // Embedded messages should also be clear.
-  XCTAssertFalse(message.hasOptionalGroup);
-  XCTAssertFalse(message.hasOptionalNestedMessage);
-  XCTAssertFalse(message.hasOptionalForeignMessage);
-  XCTAssertFalse(message.hasOptionalImportMessage);
-
-  // Enums without defaults are set to the first value in the enum.
-  XCTAssertEqual(TestAllTypes_NestedEnum_Foo, message.optionalNestedEnum);
-  XCTAssertEqual(ForeignEnum_ForeignFoo, message.optionalForeignEnum);
-  XCTAssertEqual(ImportEnum_ImportFoo, message.optionalImportEnum);
-
-  XCTAssertEqualObjects(message.optionalStringPiece, @"");
-  XCTAssertEqualObjects(message.optionalCord, @"");
-
-  // Repeated fields are empty.
-
-  XCTAssertEqual(0U, message.repeatedInt32Array.count);
-  XCTAssertEqual(0U, message.repeatedInt64Array.count);
-  XCTAssertEqual(0U, message.repeatedUint32Array.count);
-  XCTAssertEqual(0U, message.repeatedUint64Array.count);
-  XCTAssertEqual(0U, message.repeatedSint32Array.count);
-  XCTAssertEqual(0U, message.repeatedSint64Array.count);
-  XCTAssertEqual(0U, message.repeatedFixed32Array.count);
-  XCTAssertEqual(0U, message.repeatedFixed64Array.count);
-  XCTAssertEqual(0U, message.repeatedSfixed32Array.count);
-  XCTAssertEqual(0U, message.repeatedSfixed64Array.count);
-  XCTAssertEqual(0U, message.repeatedFloatArray.count);
-  XCTAssertEqual(0U, message.repeatedDoubleArray.count);
-  XCTAssertEqual(0U, message.repeatedBoolArray.count);
-  XCTAssertEqual(0U, message.repeatedStringArray.count);
-  XCTAssertEqual(0U, message.repeatedBytesArray.count);
-
-  XCTAssertEqual(0U, message.repeatedGroupArray.count);
-  XCTAssertEqual(0U, message.repeatedNestedMessageArray.count);
-  XCTAssertEqual(0U, message.repeatedForeignMessageArray.count);
-  XCTAssertEqual(0U, message.repeatedImportMessageArray.count);
-  XCTAssertEqual(0U, message.repeatedNestedEnumArray.count);
-  XCTAssertEqual(0U, message.repeatedForeignEnumArray.count);
-  XCTAssertEqual(0U, message.repeatedImportEnumArray.count);
-
-  XCTAssertEqual(0U, message.repeatedStringPieceArray.count);
-  XCTAssertEqual(0U, message.repeatedCordArray.count);
-
-  XCTAssertEqual(0U, message.repeatedInt32Array_Count);
-  XCTAssertEqual(0U, message.repeatedInt64Array_Count);
-  XCTAssertEqual(0U, message.repeatedUint32Array_Count);
-  XCTAssertEqual(0U, message.repeatedUint64Array_Count);
-  XCTAssertEqual(0U, message.repeatedSint32Array_Count);
-  XCTAssertEqual(0U, message.repeatedSint64Array_Count);
-  XCTAssertEqual(0U, message.repeatedFixed32Array_Count);
-  XCTAssertEqual(0U, message.repeatedFixed64Array_Count);
-  XCTAssertEqual(0U, message.repeatedSfixed32Array_Count);
-  XCTAssertEqual(0U, message.repeatedSfixed64Array_Count);
-  XCTAssertEqual(0U, message.repeatedFloatArray_Count);
-  XCTAssertEqual(0U, message.repeatedDoubleArray_Count);
-  XCTAssertEqual(0U, message.repeatedBoolArray_Count);
-  XCTAssertEqual(0U, message.repeatedStringArray_Count);
-  XCTAssertEqual(0U, message.repeatedBytesArray_Count);
-
-  XCTAssertEqual(0U, message.repeatedGroupArray_Count);
-  XCTAssertEqual(0U, message.repeatedNestedMessageArray_Count);
-  XCTAssertEqual(0U, message.repeatedForeignMessageArray_Count);
-  XCTAssertEqual(0U, message.repeatedImportMessageArray_Count);
-  XCTAssertEqual(0U, message.repeatedNestedEnumArray_Count);
-  XCTAssertEqual(0U, message.repeatedForeignEnumArray_Count);
-  XCTAssertEqual(0U, message.repeatedImportEnumArray_Count);
-
-  XCTAssertEqual(0U, message.repeatedStringPieceArray_Count);
-  XCTAssertEqual(0U, message.repeatedCordArray_Count);
-
-  // hasBlah() should also be NO for all default fields.
-  XCTAssertFalse(message.hasDefaultInt32);
-  XCTAssertFalse(message.hasDefaultInt64);
-  XCTAssertFalse(message.hasDefaultUint32);
-  XCTAssertFalse(message.hasDefaultUint64);
-  XCTAssertFalse(message.hasDefaultSint32);
-  XCTAssertFalse(message.hasDefaultSint64);
-  XCTAssertFalse(message.hasDefaultFixed32);
-  XCTAssertFalse(message.hasDefaultFixed64);
-  XCTAssertFalse(message.hasDefaultSfixed32);
-  XCTAssertFalse(message.hasDefaultSfixed64);
-  XCTAssertFalse(message.hasDefaultFloat);
-  XCTAssertFalse(message.hasDefaultDouble);
-  XCTAssertFalse(message.hasDefaultBool);
-  XCTAssertFalse(message.hasDefaultString);
-  XCTAssertFalse(message.hasDefaultBytes);
-
-  XCTAssertFalse(message.hasDefaultNestedEnum);
-  XCTAssertFalse(message.hasDefaultForeignEnum);
-  XCTAssertFalse(message.hasDefaultImportEnum);
-
-  XCTAssertFalse(message.hasDefaultStringPiece);
-  XCTAssertFalse(message.hasDefaultCord);
-
-  // Fields with defaults have their default values (duh).
-  XCTAssertEqual(41, message.defaultInt32);
-  XCTAssertEqual(42LL, message.defaultInt64);
-  XCTAssertEqual(43U, message.defaultUint32);
-  XCTAssertEqual(44ULL, message.defaultUint64);
-  XCTAssertEqual(-45, message.defaultSint32);
-  XCTAssertEqual(46LL, message.defaultSint64);
-  XCTAssertEqual(47U, message.defaultFixed32);
-  XCTAssertEqual(48ULL, message.defaultFixed64);
-  XCTAssertEqual(49, message.defaultSfixed32);
-  XCTAssertEqual(-50LL, message.defaultSfixed64);
-  XCTAssertEqualWithAccuracy(51.5f, message.defaultFloat, 0.1);
-  XCTAssertEqualWithAccuracy(52e3, message.defaultDouble, 0.1);
-  XCTAssertTrue(message.defaultBool);
-  XCTAssertEqualObjects(@"hello", message.defaultString);
-  XCTAssertEqualObjects([NSData gpbtu_dataWithCString:"world"],
-                        message.defaultBytes);
-
-  XCTAssertEqual(TestAllTypes_NestedEnum_Bar, message.defaultNestedEnum);
-  XCTAssertEqual(ForeignEnum_ForeignBar, message.defaultForeignEnum);
-  XCTAssertEqual(ImportEnum_ImportBar, message.defaultImportEnum);
-
-  XCTAssertEqualObjects(@"abc", message.defaultStringPiece);
-  XCTAssertEqualObjects(@"123", message.defaultCord);
-}
-
-- (void)assertExtensionsClear:(TestAllExtensions *)message {
-  // hasBlah() should initially be NO for all optional fields.
-  XCTAssertFalse([message hasExtension:[UnittestRoot optionalInt32Extension]]);
-  XCTAssertFalse([message hasExtension:[UnittestRoot optionalInt64Extension]]);
-  XCTAssertFalse([message hasExtension:[UnittestRoot optionalUint32Extension]]);
-  XCTAssertFalse([message hasExtension:[UnittestRoot optionalUint64Extension]]);
-  XCTAssertFalse([message hasExtension:[UnittestRoot optionalSint32Extension]]);
-  XCTAssertFalse([message hasExtension:[UnittestRoot optionalSint64Extension]]);
-  XCTAssertFalse([message hasExtension:[UnittestRoot optionalFixed32Extension]]);
-  XCTAssertFalse([message hasExtension:[UnittestRoot optionalFixed64Extension]]);
-  XCTAssertFalse([message hasExtension:[UnittestRoot optionalSfixed32Extension]]);
-  XCTAssertFalse([message hasExtension:[UnittestRoot optionalSfixed64Extension]]);
-  XCTAssertFalse([message hasExtension:[UnittestRoot optionalFloatExtension]]);
-  XCTAssertFalse([message hasExtension:[UnittestRoot optionalDoubleExtension]]);
-  XCTAssertFalse([message hasExtension:[UnittestRoot optionalBoolExtension]]);
-  XCTAssertFalse([message hasExtension:[UnittestRoot optionalStringExtension]]);
-  XCTAssertFalse([message hasExtension:[UnittestRoot optionalBytesExtension]]);
-
-  XCTAssertFalse([message hasExtension:[UnittestRoot optionalGroupExtension]]);
-  XCTAssertFalse([message hasExtension:[UnittestRoot optionalNestedMessageExtension]]);
-  XCTAssertFalse([message hasExtension:[UnittestRoot optionalForeignMessageExtension]]);
-  XCTAssertFalse([message hasExtension:[UnittestRoot optionalImportMessageExtension]]);
-
-  XCTAssertFalse([message hasExtension:[UnittestRoot optionalNestedEnumExtension]]);
-  XCTAssertFalse([message hasExtension:[UnittestRoot optionalForeignEnumExtension]]);
-  XCTAssertFalse([message hasExtension:[UnittestRoot optionalImportEnumExtension]]);
-
-  XCTAssertFalse([message hasExtension:[UnittestRoot optionalStringPieceExtension]]);
-  XCTAssertFalse([message hasExtension:[UnittestRoot optionalCordExtension]]);
-
-  // Optional fields without defaults are set to zero or something like it.
-  XCTAssertEqual(0, [[message getExtension:[UnittestRoot optionalInt32Extension]] intValue]);
-  XCTAssertEqual(0LL,[[message getExtension:[UnittestRoot optionalInt64Extension]] longLongValue]);
-  XCTAssertEqual(0U, [[message getExtension:[UnittestRoot optionalUint32Extension]] unsignedIntValue]);
-  XCTAssertEqual(0ULL, [[message getExtension:[UnittestRoot optionalUint64Extension]] unsignedLongLongValue]);
-  XCTAssertEqual(0, [[message getExtension:[UnittestRoot optionalSint32Extension]] intValue]);
-  XCTAssertEqual(0LL, [[message getExtension:[UnittestRoot optionalSint64Extension]] longLongValue]);
-  XCTAssertEqual(0U, [[message getExtension:[UnittestRoot optionalFixed32Extension]] unsignedIntValue]);
-  XCTAssertEqual(0ULL, [[message getExtension:[UnittestRoot optionalFixed64Extension]] unsignedLongLongValue]);
-  XCTAssertEqual(0, [[message getExtension:[UnittestRoot optionalSfixed32Extension]] intValue]);
-  XCTAssertEqual(0LL, [[message getExtension:[UnittestRoot optionalSfixed64Extension]] longLongValue]);
-  XCTAssertEqualWithAccuracy(0.0f, [[message getExtension:[UnittestRoot optionalFloatExtension]] floatValue], 0.01);
-  XCTAssertEqualWithAccuracy(0.0, [[message getExtension:[UnittestRoot optionalDoubleExtension]] doubleValue], 0.01);
-  XCTAssertFalse([[message getExtension:[UnittestRoot optionalBoolExtension]] boolValue]);
-  XCTAssertEqualObjects(@"", [message getExtension:[UnittestRoot optionalStringExtension]]);
-  XCTAssertEqualObjects(GPBEmptyNSData(), [message getExtension:[UnittestRoot optionalBytesExtension]]);
-
-  // Embedded messages should also be clear.
-
-  XCTAssertFalse([[message getExtension:[UnittestRoot optionalGroupExtension]] hasA]);
-  XCTAssertFalse([[message getExtension:[UnittestRoot optionalNestedMessageExtension]] hasBb]);
-  XCTAssertFalse([[message getExtension:[UnittestRoot optionalForeignMessageExtension]] hasC]);
-  XCTAssertFalse([[message getExtension:[UnittestRoot optionalImportMessageExtension]] hasD]);
-
-  XCTAssertEqual(0, [(TestAllTypes_OptionalGroup*)[message getExtension:[UnittestRoot optionalGroupExtension]] a]);
-  XCTAssertEqual(0, [(TestAllTypes_NestedMessage*)[message getExtension:[UnittestRoot optionalNestedMessageExtension]] bb]);
-  XCTAssertEqual(0, [[message getExtension:[UnittestRoot optionalForeignMessageExtension]] c]);
-  XCTAssertEqual(0, [[message getExtension:[UnittestRoot optionalImportMessageExtension]] d]);
-
-  // Enums without defaults are set to the first value in the enum.
-  XCTAssertEqual(TestAllTypes_NestedEnum_Foo,
-               [[message getExtension:[UnittestRoot optionalNestedEnumExtension]] intValue]);
-  XCTAssertEqual(ForeignEnum_ForeignFoo,
-               [[message getExtension:[UnittestRoot optionalForeignEnumExtension]] intValue]);
-  XCTAssertEqual(ImportEnum_ImportFoo,
-               [[message getExtension:[UnittestRoot optionalImportEnumExtension]] intValue]);
-
-  XCTAssertEqualObjects(@"", [message getExtension:[UnittestRoot optionalStringPieceExtension]]);
-  XCTAssertEqualObjects(@"", [message getExtension:[UnittestRoot optionalCordExtension]]);
-
-  // Repeated fields are empty.
-  XCTAssertEqual(0U, [[message getExtension:[UnittestRoot repeatedInt32Extension]] count]);
-  XCTAssertEqual(0U, [[message getExtension:[UnittestRoot repeatedInt64Extension]] count]);
-  XCTAssertEqual(0U, [[message getExtension:[UnittestRoot repeatedUint32Extension]] count]);
-  XCTAssertEqual(0U, [[message getExtension:[UnittestRoot repeatedUint64Extension]] count]);
-  XCTAssertEqual(0U, [[message getExtension:[UnittestRoot repeatedSint32Extension]] count]);
-  XCTAssertEqual(0U, [[message getExtension:[UnittestRoot repeatedSint64Extension]] count]);
-  XCTAssertEqual(0U, [[message getExtension:[UnittestRoot repeatedFixed32Extension]] count]);
-  XCTAssertEqual(0U, [[message getExtension:[UnittestRoot repeatedFixed64Extension]] count]);
-  XCTAssertEqual(0U, [[message getExtension:[UnittestRoot repeatedSfixed32Extension]] count]);
-  XCTAssertEqual(0U, [[message getExtension:[UnittestRoot repeatedSfixed64Extension]] count]);
-  XCTAssertEqual(0U, [[message getExtension:[UnittestRoot repeatedFloatExtension]] count]);
-  XCTAssertEqual(0U, [[message getExtension:[UnittestRoot repeatedDoubleExtension]] count]);
-  XCTAssertEqual(0U, [[message getExtension:[UnittestRoot repeatedBoolExtension]] count]);
-  XCTAssertEqual(0U, [[message getExtension:[UnittestRoot repeatedStringExtension]] count]);
-  XCTAssertEqual(0U, [[message getExtension:[UnittestRoot repeatedBytesExtension]] count]);
-
-  XCTAssertEqual(0U, [[message getExtension:[UnittestRoot repeatedGroupExtension]] count]);
-  XCTAssertEqual(0U, [[message getExtension:[UnittestRoot repeatedNestedMessageExtension]] count]);
-  XCTAssertEqual(0U, [[message getExtension:[UnittestRoot repeatedForeignMessageExtension]] count]);
-  XCTAssertEqual(0U, [[message getExtension:[UnittestRoot repeatedImportMessageExtension]] count]);
-  XCTAssertEqual(0U, [[message getExtension:[UnittestRoot repeatedNestedEnumExtension]] count]);
-  XCTAssertEqual(0U, [[message getExtension:[UnittestRoot repeatedForeignEnumExtension]] count]);
-  XCTAssertEqual(0U, [[message getExtension:[UnittestRoot repeatedImportEnumExtension]] count]);
-
-  XCTAssertEqual(0U, [[message getExtension:[UnittestRoot repeatedStringPieceExtension]] count]);
-  XCTAssertEqual(0U, [[message getExtension:[UnittestRoot repeatedCordExtension]] count]);
-
-  // hasBlah() should also be NO for all default fields.
-  XCTAssertFalse([message hasExtension:[UnittestRoot defaultInt32Extension]]);
-  XCTAssertFalse([message hasExtension:[UnittestRoot defaultInt64Extension]]);
-  XCTAssertFalse([message hasExtension:[UnittestRoot defaultUint32Extension]]);
-  XCTAssertFalse([message hasExtension:[UnittestRoot defaultUint64Extension]]);
-  XCTAssertFalse([message hasExtension:[UnittestRoot defaultSint32Extension]]);
-  XCTAssertFalse([message hasExtension:[UnittestRoot defaultSint64Extension]]);
-  XCTAssertFalse([message hasExtension:[UnittestRoot defaultFixed32Extension]]);
-  XCTAssertFalse([message hasExtension:[UnittestRoot defaultFixed64Extension]]);
-  XCTAssertFalse([message hasExtension:[UnittestRoot defaultSfixed32Extension]]);
-  XCTAssertFalse([message hasExtension:[UnittestRoot defaultSfixed64Extension]]);
-  XCTAssertFalse([message hasExtension:[UnittestRoot defaultFloatExtension]]);
-  XCTAssertFalse([message hasExtension:[UnittestRoot defaultDoubleExtension]]);
-  XCTAssertFalse([message hasExtension:[UnittestRoot defaultBoolExtension]]);
-  XCTAssertFalse([message hasExtension:[UnittestRoot defaultStringExtension]]);
-  XCTAssertFalse([message hasExtension:[UnittestRoot defaultBytesExtension]]);
-
-  XCTAssertFalse([message hasExtension:[UnittestRoot defaultNestedEnumExtension]]);
-  XCTAssertFalse([message hasExtension:[UnittestRoot defaultForeignEnumExtension]]);
-  XCTAssertFalse([message hasExtension:[UnittestRoot defaultImportEnumExtension]]);
-
-  XCTAssertFalse([message hasExtension:[UnittestRoot defaultStringPieceExtension]]);
-  XCTAssertFalse([message hasExtension:[UnittestRoot defaultCordExtension]]);
-
-  // Fields with defaults have their default values (duh).
-  XCTAssertEqual( 41, [[message getExtension:[UnittestRoot defaultInt32Extension]] intValue]);
-  XCTAssertEqual( 42LL, [[message getExtension:[UnittestRoot defaultInt64Extension]] longLongValue]);
-  XCTAssertEqual( 43U, [[message getExtension:[UnittestRoot defaultUint32Extension]] unsignedIntValue]);
-  XCTAssertEqual( 44ULL, [[message getExtension:[UnittestRoot defaultUint64Extension]] unsignedLongLongValue]);
-  XCTAssertEqual(-45, [[message getExtension:[UnittestRoot defaultSint32Extension]] intValue]);
-  XCTAssertEqual( 46LL, [[message getExtension:[UnittestRoot defaultSint64Extension]] longLongValue]);
-  XCTAssertEqual( 47, [[message getExtension:[UnittestRoot defaultFixed32Extension]] intValue]);
-  XCTAssertEqual( 48ULL, [[message getExtension:[UnittestRoot defaultFixed64Extension]] unsignedLongLongValue]);
-  XCTAssertEqual( 49, [[message getExtension:[UnittestRoot defaultSfixed32Extension]] intValue]);
-  XCTAssertEqual(-50LL, [[message getExtension:[UnittestRoot defaultSfixed64Extension]] longLongValue]);
-  XCTAssertEqualWithAccuracy( 51.5f, [[message getExtension:[UnittestRoot defaultFloatExtension]] floatValue], 0.01);
-  XCTAssertEqualWithAccuracy( 52e3, [[message getExtension:[UnittestRoot defaultDoubleExtension]] doubleValue], 0.01);
-  XCTAssertTrue([[message getExtension:[UnittestRoot defaultBoolExtension]] boolValue]);
-  XCTAssertEqualObjects(@"hello", [message getExtension:[UnittestRoot defaultStringExtension]]);
-  XCTAssertEqualObjects([NSData gpbtu_dataWithCString:"world"], [message getExtension:[UnittestRoot defaultBytesExtension]]);
-
-  XCTAssertEqual(TestAllTypes_NestedEnum_Bar,
-               [[message getExtension:[UnittestRoot defaultNestedEnumExtension]] intValue]);
-  XCTAssertEqual(ForeignEnum_ForeignBar,
-               [[message getExtension:[UnittestRoot defaultForeignEnumExtension]] intValue]);
-  XCTAssertEqual(ImportEnum_ImportBar,
-               [[message getExtension:[UnittestRoot defaultImportEnumExtension]] intValue]);
-
-  XCTAssertEqualObjects(@"abc", [message getExtension:[UnittestRoot defaultStringPieceExtension]]);
-  XCTAssertEqualObjects(@"123", [message getExtension:[UnittestRoot defaultCordExtension]]);
-}
-
-- (void)modifyRepeatedFields:(TestAllTypes *)message {
-  [message.repeatedInt32Array replaceValueAtIndex:1 withValue:501];
-  [message.repeatedInt64Array replaceValueAtIndex:1 withValue:502];
-  [message.repeatedUint32Array replaceValueAtIndex:1 withValue:503];
-  [message.repeatedUint64Array replaceValueAtIndex:1 withValue:504];
-  [message.repeatedSint32Array replaceValueAtIndex:1 withValue:505];
-  [message.repeatedSint64Array replaceValueAtIndex:1 withValue:506];
-  [message.repeatedFixed32Array replaceValueAtIndex:1 withValue:507];
-  [message.repeatedFixed64Array replaceValueAtIndex:1 withValue:508];
-  [message.repeatedSfixed32Array replaceValueAtIndex:1 withValue:509];
-  [message.repeatedSfixed64Array replaceValueAtIndex:1 withValue:510];
-  [message.repeatedFloatArray replaceValueAtIndex:1 withValue:511];
-  [message.repeatedDoubleArray replaceValueAtIndex:1 withValue:512];
-  [message.repeatedBoolArray replaceValueAtIndex:1 withValue:YES];
-  [message.repeatedStringArray replaceObjectAtIndex:1 withObject:@"515"];
-
-  NSData *data = [[NSData alloc] initWithUint32_gpbtu:516];
-  [message.repeatedBytesArray replaceObjectAtIndex:1 withObject:data];
-  [data release];
-
-  TestAllTypes_RepeatedGroup *testAll =
-      [[TestAllTypes_RepeatedGroup alloc] init];
-  [testAll setA:517];
-  [message.repeatedGroupArray replaceObjectAtIndex:1 withObject:testAll];
-  [testAll release];
-
-  TestAllTypes_NestedMessage *nestedMessage =
-      [[TestAllTypes_NestedMessage alloc] init];
-  [nestedMessage setBb:518];
-  [message.repeatedNestedMessageArray replaceObjectAtIndex:1
-                                                withObject:nestedMessage];
-  [nestedMessage release];
-
-  ForeignMessage *foreignMessage = [[ForeignMessage alloc] init];
-  [foreignMessage setC:519];
-  [message.repeatedForeignMessageArray replaceObjectAtIndex:1
-                                                 withObject:foreignMessage];
-  [foreignMessage release];
-
-  ImportMessage *importMessage = [[ImportMessage alloc] init];
-  [importMessage setD:520];
-  [message.repeatedImportMessageArray replaceObjectAtIndex:1
-                                                withObject:importMessage];
-  [importMessage release];
-
-  [message.repeatedNestedEnumArray replaceValueAtIndex:1 withValue:TestAllTypes_NestedEnum_Foo];
-  [message.repeatedForeignEnumArray replaceValueAtIndex:1 withValue:ForeignEnum_ForeignFoo];
-  [message.repeatedImportEnumArray replaceValueAtIndex:1 withValue:ImportEnum_ImportFoo];
-
-  [message.repeatedStringPieceArray replaceObjectAtIndex:1 withObject:@"524"];
-  [message.repeatedCordArray replaceObjectAtIndex:1 withObject:@"525"];
-}
-
-- (void)assertRepeatedFieldsModified:(TestAllTypes *)message
-                       repeatedCount:(uint32_t)count {
-  // ModifyRepeatedFields only sets the second repeated element of each
-  // field.  In addition to verifying this, we also verify that the first
-  // element and size were *not* modified.
-
-  XCTAssertEqual(count, message.repeatedInt32Array.count);
-  XCTAssertEqual(count, message.repeatedInt64Array.count);
-  XCTAssertEqual(count, message.repeatedUint32Array.count);
-  XCTAssertEqual(count, message.repeatedUint64Array.count);
-  XCTAssertEqual(count, message.repeatedSint32Array.count);
-  XCTAssertEqual(count, message.repeatedSint64Array.count);
-  XCTAssertEqual(count, message.repeatedFixed32Array.count);
-  XCTAssertEqual(count, message.repeatedFixed64Array.count);
-  XCTAssertEqual(count, message.repeatedSfixed32Array.count);
-  XCTAssertEqual(count, message.repeatedSfixed64Array.count);
-  XCTAssertEqual(count, message.repeatedFloatArray.count);
-  XCTAssertEqual(count, message.repeatedDoubleArray.count);
-  XCTAssertEqual(count, message.repeatedBoolArray.count);
-  XCTAssertEqual(count, message.repeatedStringArray.count);
-  XCTAssertEqual(count, message.repeatedBytesArray.count);
-
-  XCTAssertEqual(count, message.repeatedGroupArray.count);
-  XCTAssertEqual(count, message.repeatedNestedMessageArray.count);
-  XCTAssertEqual(count, message.repeatedForeignMessageArray.count);
-  XCTAssertEqual(count, message.repeatedImportMessageArray.count);
-  XCTAssertEqual(count, message.repeatedNestedEnumArray.count);
-  XCTAssertEqual(count, message.repeatedForeignEnumArray.count);
-  XCTAssertEqual(count, message.repeatedImportEnumArray.count);
-
-  XCTAssertEqual(count, message.repeatedStringPieceArray.count);
-  XCTAssertEqual(count, message.repeatedCordArray.count);
-
-  XCTAssertEqual(count, message.repeatedInt32Array_Count);
-  XCTAssertEqual(count, message.repeatedInt64Array_Count);
-  XCTAssertEqual(count, message.repeatedUint32Array_Count);
-  XCTAssertEqual(count, message.repeatedUint64Array_Count);
-  XCTAssertEqual(count, message.repeatedSint32Array_Count);
-  XCTAssertEqual(count, message.repeatedSint64Array_Count);
-  XCTAssertEqual(count, message.repeatedFixed32Array_Count);
-  XCTAssertEqual(count, message.repeatedFixed64Array_Count);
-  XCTAssertEqual(count, message.repeatedSfixed32Array_Count);
-  XCTAssertEqual(count, message.repeatedSfixed64Array_Count);
-  XCTAssertEqual(count, message.repeatedFloatArray_Count);
-  XCTAssertEqual(count, message.repeatedDoubleArray_Count);
-  XCTAssertEqual(count, message.repeatedBoolArray_Count);
-  XCTAssertEqual(count, message.repeatedStringArray_Count);
-  XCTAssertEqual(count, message.repeatedBytesArray_Count);
-
-  XCTAssertEqual(count, message.repeatedGroupArray_Count);
-  XCTAssertEqual(count, message.repeatedNestedMessageArray_Count);
-  XCTAssertEqual(count, message.repeatedForeignMessageArray_Count);
-  XCTAssertEqual(count, message.repeatedImportMessageArray_Count);
-  XCTAssertEqual(count, message.repeatedNestedEnumArray_Count);
-  XCTAssertEqual(count, message.repeatedForeignEnumArray_Count);
-  XCTAssertEqual(count, message.repeatedImportEnumArray_Count);
-
-  XCTAssertEqual(count, message.repeatedStringPieceArray_Count);
-  XCTAssertEqual(count, message.repeatedCordArray_Count);
-
-  XCTAssertEqual(201, [message.repeatedInt32Array valueAtIndex:0]);
-  XCTAssertEqual(202LL, [message.repeatedInt64Array valueAtIndex:0]);
-  XCTAssertEqual(203U, [message.repeatedUint32Array valueAtIndex:0]);
-  XCTAssertEqual(204ULL, [message.repeatedUint64Array valueAtIndex:0]);
-  XCTAssertEqual(205, [message.repeatedSint32Array valueAtIndex:0]);
-  XCTAssertEqual(206LL, [message.repeatedSint64Array valueAtIndex:0]);
-  XCTAssertEqual(207U, [message.repeatedFixed32Array valueAtIndex:0]);
-  XCTAssertEqual(208ULL, [message.repeatedFixed64Array valueAtIndex:0]);
-  XCTAssertEqual(209, [message.repeatedSfixed32Array valueAtIndex:0]);
-  XCTAssertEqual(210LL, [message.repeatedSfixed64Array valueAtIndex:0]);
-  XCTAssertEqualWithAccuracy(211.0f, [message.repeatedFloatArray valueAtIndex:0], 0.01);
-  XCTAssertEqualWithAccuracy(212.0, [message.repeatedDoubleArray valueAtIndex:0], 0.01);
-  XCTAssertFalse([message.repeatedBoolArray valueAtIndex:0]);
-  XCTAssertEqualObjects(@"215", message.repeatedStringArray[0]);
-  XCTAssertEqualObjects([NSData gpbtu_dataWithUint32:216],
-                        message.repeatedBytesArray[0]);
-
-  XCTAssertEqual(217, ((TestAllTypes_RepeatedGroup*)message.repeatedGroupArray[0]).a);
-  XCTAssertEqual(218, ((TestAllTypes_NestedMessage*)message.repeatedNestedMessageArray[0]).bb);
-  XCTAssertEqual(219, ((ForeignMessage*)message.repeatedForeignMessageArray[0]).c);
-  XCTAssertEqual(220, ((ImportMessage*)message.repeatedImportMessageArray[0]).d);
-
-  XCTAssertEqual(TestAllTypes_NestedEnum_Baz, [message.repeatedNestedEnumArray valueAtIndex:0]);
-  XCTAssertEqual(ForeignEnum_ForeignBaz, [message.repeatedForeignEnumArray valueAtIndex:0]);
-  XCTAssertEqual(ImportEnum_ImportBaz, [message.repeatedImportEnumArray valueAtIndex:0]);
-
-  XCTAssertEqualObjects(@"224", message.repeatedStringPieceArray[0]);
-  XCTAssertEqualObjects(@"225", message.repeatedCordArray[0]);
-
-  // Actually verify the second (modified) elements now.
-  XCTAssertEqual(501, [message.repeatedInt32Array valueAtIndex:1]);
-  XCTAssertEqual(502LL, [message.repeatedInt64Array valueAtIndex:1]);
-  XCTAssertEqual(503U, [message.repeatedUint32Array valueAtIndex:1]);
-  XCTAssertEqual(504ULL, [message.repeatedUint64Array valueAtIndex:1]);
-  XCTAssertEqual(505, [message.repeatedSint32Array valueAtIndex:1]);
-  XCTAssertEqual(506LL, [message.repeatedSint64Array valueAtIndex:1]);
-  XCTAssertEqual(507U, [message.repeatedFixed32Array valueAtIndex:1]);
-  XCTAssertEqual(508ULL, [message.repeatedFixed64Array valueAtIndex:1]);
-  XCTAssertEqual(509, [message.repeatedSfixed32Array valueAtIndex:1]);
-  XCTAssertEqual(510LL, [message.repeatedSfixed64Array valueAtIndex:1]);
-  XCTAssertEqualWithAccuracy(511.0f, [message.repeatedFloatArray valueAtIndex:1], 0.01);
-  XCTAssertEqualWithAccuracy(512.0, [message.repeatedDoubleArray valueAtIndex:1], 0.01);
-  XCTAssertTrue([message.repeatedBoolArray valueAtIndex:1]);
-  XCTAssertEqualObjects(@"515", message.repeatedStringArray[1]);
-  XCTAssertEqualObjects([NSData gpbtu_dataWithUint32:516],
-                        message.repeatedBytesArray[1]);
-
-  XCTAssertEqual(517, ((TestAllTypes_RepeatedGroup*)message.repeatedGroupArray[1]).a);
-  XCTAssertEqual(518, ((TestAllTypes_NestedMessage*)message.repeatedNestedMessageArray[1]).bb);
-  XCTAssertEqual(519, ((ForeignMessage*)message.repeatedForeignMessageArray[1]).c);
-  XCTAssertEqual(520, ((ImportMessage*)message.repeatedImportMessageArray[1]).d);
-
-  XCTAssertEqual(TestAllTypes_NestedEnum_Foo, [message.repeatedNestedEnumArray valueAtIndex:1]);
-  XCTAssertEqual(ForeignEnum_ForeignFoo, [message.repeatedForeignEnumArray valueAtIndex:1]);
-  XCTAssertEqual(ImportEnum_ImportFoo, [message.repeatedImportEnumArray valueAtIndex:1]);
-
-  XCTAssertEqualObjects(@"524", message.repeatedStringPieceArray[1]);
-  XCTAssertEqualObjects(@"525", message.repeatedCordArray[1]);
-}
-
-- (void)setPackedFields:(TestPackedTypes *)message
-          repeatedCount:(uint32_t)count {
-  // Must match -setUnpackedFields:repeatedCount:
-  // Must match -setPackedExtensions:repeatedCount:
-  // Must match -setUnpackedExtensions:repeatedCount:
-  for (uint32_t i = 0; i < count; ++i) {
-    [message.packedInt32Array addValue:601 + i * 100];
-  }
-  for (uint32_t i = 0; i < count; ++i) {
-    [message.packedInt64Array addValue:602 + i * 100];
-  }
-  for (uint32_t i = 0; i < count; ++i) {
-    [message.packedUint32Array addValue:603 + i * 100];
-  }
-  for (uint32_t i = 0; i < count; ++i) {
-    [message.packedUint64Array addValue:604 + i * 100];
-  }
-  for (uint32_t i = 0; i < count; ++i) {
-    [message.packedSint32Array addValue:605 + i * 100];
-  }
-  for (uint32_t i = 0; i < count; ++i) {
-    [message.packedSint64Array addValue:606 + i * 100];
-  }
-  for (uint32_t i = 0; i < count; ++i) {
-    [message.packedFixed32Array addValue:607 + i * 100];
-  }
-  for (uint32_t i = 0; i < count; ++i) {
-    [message.packedFixed64Array addValue:608 + i * 100];
-  }
-  for (uint32_t i = 0; i < count; ++i) {
-    [message.packedSfixed32Array addValue:609 + i * 100];
-  }
-  for (uint32_t i = 0; i < count; ++i) {
-    [message.packedSfixed64Array addValue:610 + i * 100];
-  }
-  for (uint32_t i = 0; i < count; ++i) {
-    [message.packedFloatArray addValue:611 + i * 100];
-  }
-  for (uint32_t i = 0; i < count; ++i) {
-    [message.packedDoubleArray addValue:612 + i * 100];
-  }
-  for (uint32_t i = 0; i < count; ++i) {
-    [message.packedBoolArray addValue:(i % 2) ? YES : NO];
-  }
-  for (uint32_t i = 0; i < count; ++i) {
-    [message.packedEnumArray
-        addValue:(i % 2) ? ForeignEnum_ForeignBar : ForeignEnum_ForeignBaz];
-  }
-}
-
-- (void)setUnpackedFields:(TestUnpackedTypes *)message
-            repeatedCount:(uint32_t)count {
-  // Must match -setPackedFields:repeatedCount:
-  // Must match -setPackedExtensions:repeatedCount:
-  // Must match -setUnpackedExtensions:repeatedCount:
-  for (uint32_t i = 0; i < count; ++i) {
-    [message.unpackedInt32Array addValue:601 + i * 100];
-  }
-  for (uint32_t i = 0; i < count; ++i) {
-    [message.unpackedInt64Array addValue:602 + i * 100];
-  }
-  for (uint32_t i = 0; i < count; ++i) {
-    [message.unpackedUint32Array addValue:603 + i * 100];
-  }
-  for (uint32_t i = 0; i < count; ++i) {
-    [message.unpackedUint64Array addValue:604 + i * 100];
-  }
-  for (uint32_t i = 0; i < count; ++i) {
-    [message.unpackedSint32Array addValue:605 + i * 100];
-  }
-  for (uint32_t i = 0; i < count; ++i) {
-    [message.unpackedSint64Array addValue:606 + i * 100];
-  }
-  for (uint32_t i = 0; i < count; ++i) {
-    [message.unpackedFixed32Array addValue:607 + i * 100];
-  }
-  for (uint32_t i = 0; i < count; ++i) {
-    [message.unpackedFixed64Array addValue:608 + i * 100];
-  }
-  for (uint32_t i = 0; i < count; ++i) {
-    [message.unpackedSfixed32Array addValue:609 + i * 100];
-  }
-  for (uint32_t i = 0; i < count; ++i) {
-    [message.unpackedSfixed64Array addValue:610 + i * 100];
-  }
-  for (uint32_t i = 0; i < count; ++i) {
-    [message.unpackedFloatArray addValue:611 + i * 100];
-  }
-  for (uint32_t i = 0; i < count; ++i) {
-    [message.unpackedDoubleArray addValue:612 + i * 100];
-  }
-  for (uint32_t i = 0; i < count; ++i) {
-    [message.unpackedBoolArray addValue:(i % 2) ? YES : NO];
-  }
-  for (uint32_t i = 0; i < count; ++i) {
-    [message.unpackedEnumArray
-        addValue:(i % 2) ? ForeignEnum_ForeignBar : ForeignEnum_ForeignBaz];
-  }
-}
-
-- (void)assertPackedFieldsSet:(TestPackedTypes *)message
-                repeatedCount:(uint32_t)count {
-  XCTAssertEqual(count, message.packedInt32Array.count);
-  XCTAssertEqual(count, message.packedInt64Array.count);
-  XCTAssertEqual(count, message.packedUint32Array.count);
-  XCTAssertEqual(count, message.packedUint64Array.count);
-  XCTAssertEqual(count, message.packedSint32Array.count);
-  XCTAssertEqual(count, message.packedSint64Array.count);
-  XCTAssertEqual(count, message.packedFixed32Array.count);
-  XCTAssertEqual(count, message.packedFixed64Array.count);
-  XCTAssertEqual(count, message.packedSfixed32Array.count);
-  XCTAssertEqual(count, message.packedSfixed64Array.count);
-  XCTAssertEqual(count, message.packedFloatArray.count);
-  XCTAssertEqual(count, message.packedDoubleArray.count);
-  XCTAssertEqual(count, message.packedBoolArray.count);
-  XCTAssertEqual(count, message.packedEnumArray.count);
-  for (uint32_t i = 0; i < count; ++i) {
-    XCTAssertEqual((int)(601 + i * 100),
-                   [message.packedInt32Array valueAtIndex:i]);
-    XCTAssertEqual(602 + i * 100, [message.packedInt64Array valueAtIndex:i]);
-    XCTAssertEqual(603 + i * 100, [message.packedUint32Array valueAtIndex:i]);
-    XCTAssertEqual(604 + i * 100, [message.packedUint64Array valueAtIndex:i]);
-    XCTAssertEqual((int)(605 + i * 100),
-                   [message.packedSint32Array valueAtIndex:i]);
-    XCTAssertEqual(606 + i * 100, [message.packedSint64Array valueAtIndex:i]);
-    XCTAssertEqual(607 + i * 100, [message.packedFixed32Array valueAtIndex:i]);
-    XCTAssertEqual(608 + i * 100, [message.packedFixed64Array valueAtIndex:i]);
-    XCTAssertEqual((int)(609 + i * 100),
-                   [message.packedSfixed32Array valueAtIndex:i]);
-    XCTAssertEqual(610 + i * 100, [message.packedSfixed64Array valueAtIndex:i]);
-    XCTAssertEqualWithAccuracy(611 + i * 100,
-                               [message.packedFloatArray valueAtIndex:i], 0.01);
-    XCTAssertEqualWithAccuracy(
-        612 + i * 100, [message.packedDoubleArray valueAtIndex:i], 0.01);
-    XCTAssertEqual((i % 2) ? YES : NO,
-                   [message.packedBoolArray valueAtIndex:i]);
-    XCTAssertEqual((i % 2) ? ForeignEnum_ForeignBar : ForeignEnum_ForeignBaz,
-                   [message.packedEnumArray valueAtIndex:i]);
-  }
-}
-
-- (void)setPackedExtensions:(TestPackedExtensions *)message
-              repeatedCount:(uint32_t)count {
-  // Must match -setPackedFields:repeatedCount:
-  // Must match -setUnpackedFields:repeatedCount:
-  // Must match -setUnpackedExtensions:repeatedCount:
-  for (uint32_t i = 0; i < count; i++) {
-    [message addExtension:[UnittestRoot packedInt32Extension]
-                    value:@(601 + i * 100)];
-    [message addExtension:[UnittestRoot packedInt64Extension]
-                    value:@(602 + i * 100)];
-    [message addExtension:[UnittestRoot packedUint32Extension]
-                    value:@(603 + i * 100)];
-    [message addExtension:[UnittestRoot packedUint64Extension]
-                    value:@(604 + i * 100)];
-    [message addExtension:[UnittestRoot packedSint32Extension]
-                    value:@(605 + i * 100)];
-    [message addExtension:[UnittestRoot packedSint64Extension]
-                    value:@(606 + i * 100)];
-    [message addExtension:[UnittestRoot packedFixed32Extension]
-                    value:@(607 + i * 100)];
-    [message addExtension:[UnittestRoot packedFixed64Extension]
-                    value:@(608 + i * 100)];
-    [message addExtension:[UnittestRoot packedSfixed32Extension]
-                    value:@(609 + i * 100)];
-    [message addExtension:[UnittestRoot packedSfixed64Extension]
-                    value:@(610 + i * 100)];
-    [message addExtension:[UnittestRoot packedFloatExtension]
-                    value:@(611 + i * 100)];
-    [message addExtension:[UnittestRoot packedDoubleExtension]
-                    value:@(612 + i * 100)];
-    [message addExtension:[UnittestRoot packedBoolExtension]
-                    value:@((i % 2) ? YES : NO)];
-    [message addExtension:[UnittestRoot packedEnumExtension]
-                    value:@((i % 2) ? ForeignEnum_ForeignBar
-                                    : ForeignEnum_ForeignBaz)];
-  }
-}
-
-- (void)setUnpackedExtensions:(TestUnpackedExtensions *)message
-                repeatedCount:(uint32_t)count {
-  // Must match -setPackedFields:repeatedCount:
-  // Must match -setUnpackedFields:repeatedCount:
-  // Must match -setPackedExtensions:repeatedCount:
-  for (uint32_t i = 0; i < count; i++) {
-    [message addExtension:[UnittestRoot unpackedInt32Extension]
-                    value:@(601 + i * 100)];
-    [message addExtension:[UnittestRoot unpackedInt64Extension]
-                    value:@(602 + i * 100)];
-    [message addExtension:[UnittestRoot unpackedUint32Extension]
-                    value:@(603 + i * 100)];
-    [message addExtension:[UnittestRoot unpackedUint64Extension]
-                    value:@(604 + i * 100)];
-    [message addExtension:[UnittestRoot unpackedSint32Extension]
-                    value:@(605 + i * 100)];
-    [message addExtension:[UnittestRoot unpackedSint64Extension]
-                    value:@(606 + i * 100)];
-    [message addExtension:[UnittestRoot unpackedFixed32Extension]
-                    value:@(607 + i * 100)];
-    [message addExtension:[UnittestRoot unpackedFixed64Extension]
-                    value:@(608 + i * 100)];
-    [message addExtension:[UnittestRoot unpackedSfixed32Extension]
-                    value:@(609 + i * 100)];
-    [message addExtension:[UnittestRoot unpackedSfixed64Extension]
-                    value:@(610 + i * 100)];
-    [message addExtension:[UnittestRoot unpackedFloatExtension]
-                    value:@(611 + i * 100)];
-    [message addExtension:[UnittestRoot unpackedDoubleExtension]
-                    value:@(612 + i * 100)];
-    [message addExtension:[UnittestRoot unpackedBoolExtension]
-                    value:@((i % 2) ? YES : NO)];
-    [message addExtension:[UnittestRoot unpackedEnumExtension]
-                    value:@((i % 2) ? ForeignEnum_ForeignBar
-                         : ForeignEnum_ForeignBaz)];
-  }
-}
-
-- (void)assertPackedExtensionsSet:(TestPackedExtensions *)message
-                    repeatedCount:(uint32_t)count{
-  XCTAssertEqual(count, [[message getExtension:[UnittestRoot packedInt32Extension]] count]);
-  XCTAssertEqual(count, [[message getExtension:[UnittestRoot packedInt64Extension]] count]);
-  XCTAssertEqual(count, [[message getExtension:[UnittestRoot packedUint32Extension]] count]);
-  XCTAssertEqual(count, [[message getExtension:[UnittestRoot packedUint64Extension]] count]);
-  XCTAssertEqual(count, [[message getExtension:[UnittestRoot packedSint32Extension]] count]);
-  XCTAssertEqual(count, [[message getExtension:[UnittestRoot packedSint64Extension]] count]);
-  XCTAssertEqual(count, [[message getExtension:[UnittestRoot packedFixed32Extension]] count]);
-  XCTAssertEqual(count, [[message getExtension:[UnittestRoot packedFixed64Extension]] count]);
-  XCTAssertEqual(count, [[message getExtension:[UnittestRoot packedSfixed32Extension]] count]);
-  XCTAssertEqual(count, [[message getExtension:[UnittestRoot packedSfixed64Extension]] count]);
-  XCTAssertEqual(count, [[message getExtension:[UnittestRoot packedFloatExtension]] count]);
-  XCTAssertEqual(count, [[message getExtension:[UnittestRoot packedDoubleExtension]] count]);
-  XCTAssertEqual(count, [[message getExtension:[UnittestRoot packedBoolExtension]] count]);
-  XCTAssertEqual(count, [[message getExtension:[UnittestRoot packedEnumExtension]] count]);
-
-  for (uint32_t i = 0; i < count; ++i) {
-    id extension = [message getExtension:[UnittestRoot packedInt32Extension]];
-    XCTAssertEqual((int)(601 + i * 100), [extension[i] intValue]);
-    extension = [message getExtension:[UnittestRoot packedInt64Extension]];
-    XCTAssertEqual(602 + i * 100, [extension[i] longLongValue]);
-    extension = [message getExtension:[UnittestRoot packedUint32Extension]];
-    XCTAssertEqual(603 + i * 100, [extension[i] unsignedIntValue]);
-    extension = [message getExtension:[UnittestRoot packedUint64Extension]];
-    XCTAssertEqual(604 + i * 100, [extension[i] unsignedLongLongValue]);
-    extension = [message getExtension:[UnittestRoot packedSint32Extension]];
-    XCTAssertEqual((int)(605 + i * 100), [extension[i] intValue]);
-    extension = [message getExtension:[UnittestRoot packedSint64Extension]];
-    XCTAssertEqual(606 + i * 100, [extension[i] longLongValue]);
-    extension = [message getExtension:[UnittestRoot packedFixed32Extension]];
-    XCTAssertEqual(607 + i * 100, [extension[i] unsignedIntValue]);
-    extension = [message getExtension:[UnittestRoot packedFixed64Extension]];
-    XCTAssertEqual(608 + i * 100, [extension[i] unsignedLongLongValue]);
-    extension = [message getExtension:[UnittestRoot packedSfixed32Extension]];
-    XCTAssertEqual((int)(609 + i * 100), [extension[i] intValue]);
-    extension = [message getExtension:[UnittestRoot packedSfixed64Extension]];
-    XCTAssertEqual(610 + i * 100, [extension[i] longLongValue]);
-    extension = [message getExtension:[UnittestRoot packedFloatExtension]];
-    XCTAssertEqualWithAccuracy(611 + i * 100, [extension[i] floatValue], 0.01);
-    extension = [message getExtension:[UnittestRoot packedDoubleExtension]];
-    XCTAssertEqualWithAccuracy(612 + i * 100, [extension[i] doubleValue], 0.01);
-    extension = [message getExtension:[UnittestRoot packedBoolExtension]];
-    XCTAssertEqual((i % 2) ? YES : NO, [extension[i] boolValue]);
-    extension = [message getExtension:[UnittestRoot packedEnumExtension]];
-    XCTAssertEqual((i % 2) ? ForeignEnum_ForeignBar : ForeignEnum_ForeignBaz,
-                   [extension[i] intValue]);
-  }
-}
-
-- (void)assertAllFieldsKVCMatch:(TestAllTypes *)message {
-  XCTAssertEqualObjects([message valueForKey:@"hasOptionalInt32"], @YES);
-  XCTAssertEqualObjects(@(message.optionalInt32), [message valueForKey:@"optionalInt32"]);
-  XCTAssertEqualObjects([message valueForKey:@"hasOptionalInt64"], @YES);
-  XCTAssertEqualObjects(@(message.optionalInt64), [message valueForKey:@"optionalInt64"]);
-  XCTAssertEqualObjects([message valueForKey:@"hasOptionalUint32"], @YES);
-  XCTAssertEqualObjects(@(message.optionalUint32), [message valueForKey:@"optionalUint32"]);
-  XCTAssertEqualObjects([message valueForKey:@"hasOptionalUint64"], @YES);
-  XCTAssertEqualObjects(@(message.optionalUint64), [message valueForKey:@"optionalUint64"]);
-  XCTAssertEqualObjects([message valueForKey:@"hasOptionalSint32"], @YES);
-  XCTAssertEqualObjects(@(message.optionalSint32), [message valueForKey:@"optionalSint32"]);
-  XCTAssertEqualObjects([message valueForKey:@"hasOptionalSint64"], @YES);
-  XCTAssertEqualObjects(@(message.optionalSint64), [message valueForKey:@"optionalSint64"]);
-  XCTAssertEqualObjects([message valueForKey:@"hasOptionalFixed32"], @YES);
-  XCTAssertEqualObjects(@(message.optionalFixed32), [message valueForKey:@"optionalFixed32"]);
-  XCTAssertEqualObjects([message valueForKey:@"hasOptionalFixed64"], @YES);
-  XCTAssertEqualObjects(@(message.optionalFixed64), [message valueForKey:@"optionalFixed64"]);
-  XCTAssertEqualObjects([message valueForKey:@"hasOptionalSfixed32"], @YES);
-  XCTAssertEqualObjects(@(message.optionalSfixed32), [message valueForKey:@"optionalSfixed32"]);
-  XCTAssertEqualObjects([message valueForKey:@"hasOptionalSfixed64"], @YES);
-  XCTAssertEqualObjects(@(message.optionalSfixed64), [message valueForKey:@"optionalSfixed64"]);
-  XCTAssertEqualObjects([message valueForKey:@"hasOptionalFloat"], @YES);
-  XCTAssertEqualObjects(@(message.optionalFloat), [message valueForKey:@"optionalFloat"]);
-  XCTAssertEqualObjects([message valueForKey:@"hasOptionalDouble"], @YES);
-  XCTAssertEqualObjects(@(message.optionalDouble), [message valueForKey:@"optionalDouble"]);
-  XCTAssertEqualObjects([message valueForKey:@"hasOptionalBool"], @YES);
-  XCTAssertEqualObjects(@(message.optionalBool), [message valueForKey:@"optionalBool"]);
-  XCTAssertEqualObjects([message valueForKey:@"hasOptionalString"], @YES);
-  XCTAssertEqualObjects(message.optionalString, [message valueForKey:@"optionalString"]);
-  XCTAssertEqualObjects([message valueForKey:@"hasOptionalBytes"], @YES);
-  XCTAssertEqualObjects(message.optionalBytes, [message valueForKey:@"optionalBytes"]);
-
-  XCTAssertEqualObjects([message valueForKey:@"hasOptionalGroup"], @YES);
-  XCTAssertNotNil(message.optionalGroup);
-  XCTAssertEqualObjects([message valueForKeyPath:@"optionalGroup.hasA"], @YES);
-  XCTAssertEqualObjects(@(message.optionalGroup.a), [message valueForKeyPath:@"optionalGroup.a"]);
-  XCTAssertEqualObjects([message valueForKey:@"hasOptionalNestedMessage"], @YES);
-  XCTAssertNotNil(message.optionalNestedMessage);
-  XCTAssertEqualObjects([message valueForKeyPath:@"optionalNestedMessage.hasBb"], @YES);
-  XCTAssertEqualObjects(@(message.optionalNestedMessage.bb), [message valueForKeyPath:@"optionalNestedMessage.bb"]);
-  XCTAssertEqualObjects([message valueForKey:@"hasOptionalForeignMessage"], @YES);
-  XCTAssertNotNil(message.optionalForeignMessage);
-  XCTAssertEqualObjects([message valueForKeyPath:@"optionalForeignMessage.hasC"], @YES);
-  XCTAssertEqualObjects(@(message.optionalForeignMessage.c), [message valueForKeyPath:@"optionalForeignMessage.c"]);
-  XCTAssertEqualObjects([message valueForKey:@"hasOptionalImportMessage"], @YES);
-  XCTAssertNotNil(message.optionalForeignMessage);
-  XCTAssertEqualObjects([message valueForKeyPath:@"optionalImportMessage.hasD"], @YES);
-  XCTAssertEqualObjects(@(message.optionalImportMessage.d), [message valueForKeyPath:@"optionalImportMessage.d"]);
-
-  XCTAssertEqualObjects([message valueForKey:@"hasOptionalNestedEnum"], @YES);
-  XCTAssertEqualObjects(@(message.optionalNestedEnum), [message valueForKey:@"optionalNestedEnum"]);
-  XCTAssertEqualObjects([message valueForKey:@"hasOptionalForeignEnum"], @YES);
-  XCTAssertEqualObjects(@(message.optionalForeignEnum), [message valueForKey:@"optionalForeignEnum"]);
-  XCTAssertEqualObjects([message valueForKey:@"hasOptionalImportEnum"], @YES);
-  XCTAssertEqualObjects(@(message.optionalImportEnum), [message valueForKey:@"optionalImportEnum"]);
-
-  XCTAssertEqualObjects([message valueForKey:@"hasOptionalStringPiece"], @YES);
-  XCTAssertEqualObjects(message.optionalStringPiece, [message valueForKey:@"optionalStringPiece"]);
-  XCTAssertEqualObjects([message valueForKey:@"hasOptionalCord"], @YES);
-  XCTAssertEqualObjects(message.optionalCord, [message valueForKey:@"optionalCord"]);
-
-  // -----------------------------------------------------------------
-
-  // GPBArray interface for repeated
-
-  XCTAssertEqualObjects(message.repeatedInt32Array, [message valueForKey:@"repeatedInt32Array"]);
-  XCTAssertEqualObjects(message.repeatedInt64Array, [message valueForKey:@"repeatedInt64Array"]);
-  XCTAssertEqualObjects(message.repeatedUint32Array, [message valueForKey:@"repeatedUint32Array"]);
-  XCTAssertEqualObjects(message.repeatedUint64Array, [message valueForKey:@"repeatedUint64Array"]);
-  XCTAssertEqualObjects(message.repeatedSint32Array, [message valueForKey:@"repeatedSint32Array"]);
-  XCTAssertEqualObjects(message.repeatedSint64Array, [message valueForKey:@"repeatedSint64Array"]);
-  XCTAssertEqualObjects(message.repeatedFixed32Array, [message valueForKey:@"repeatedFixed32Array"]);
-  XCTAssertEqualObjects(message.repeatedFixed64Array, [message valueForKey:@"repeatedFixed64Array"]);
-  XCTAssertEqualObjects(message.repeatedSfixed32Array, [message valueForKey:@"repeatedSfixed32Array"]);
-  XCTAssertEqualObjects(message.repeatedSfixed64Array, [message valueForKey:@"repeatedSfixed64Array"]);
-  XCTAssertEqualObjects(message.repeatedFloatArray, [message valueForKey:@"repeatedFloatArray"]);
-  XCTAssertEqualObjects(message.repeatedDoubleArray, [message valueForKey:@"repeatedDoubleArray"]);
-  XCTAssertEqualObjects(message.repeatedBoolArray, [message valueForKey:@"repeatedBoolArray"]);
-  XCTAssertEqualObjects(message.repeatedStringArray, [message valueForKey:@"repeatedStringArray"]);
-  XCTAssertEqualObjects(message.repeatedBytesArray, [message valueForKey:@"repeatedBytesArray"]);
-
-  XCTAssertEqualObjects(message.repeatedGroupArray, [message valueForKey:@"repeatedGroupArray"]);
-  XCTAssertEqualObjects(message.repeatedNestedMessageArray, [message valueForKey:@"repeatedNestedMessageArray"]);
-  XCTAssertEqualObjects(message.repeatedForeignMessageArray, [message valueForKey:@"repeatedForeignMessageArray"]);
-  XCTAssertEqualObjects(message.repeatedImportMessageArray, [message valueForKey:@"repeatedImportMessageArray"]);
-
-  XCTAssertEqualObjects(message.repeatedNestedEnumArray, [message valueForKey:@"repeatedNestedEnumArray"]);
-  XCTAssertEqualObjects(message.repeatedForeignEnumArray, [message valueForKey:@"repeatedForeignEnumArray"]);
-  XCTAssertEqualObjects(message.repeatedImportEnumArray, [message valueForKey:@"repeatedImportEnumArray"]);
-
-  XCTAssertEqualObjects(message.repeatedStringPieceArray, [message valueForKey:@"repeatedStringPieceArray"]);
-  XCTAssertEqualObjects(message.repeatedCordArray, [message valueForKey:@"repeatedCordArray"]);
-
-  XCTAssertEqualObjects(@(message.repeatedInt32Array_Count), [message valueForKey:@"repeatedInt32Array_Count"]);
-  XCTAssertEqualObjects(@(message.repeatedInt64Array_Count), [message valueForKey:@"repeatedInt64Array_Count"]);
-  XCTAssertEqualObjects(@(message.repeatedUint32Array_Count), [message valueForKey:@"repeatedUint32Array_Count"]);
-  XCTAssertEqualObjects(@(message.repeatedUint64Array_Count), [message valueForKey:@"repeatedUint64Array_Count"]);
-  XCTAssertEqualObjects(@(message.repeatedSint32Array_Count), [message valueForKey:@"repeatedSint32Array_Count"]);
-  XCTAssertEqualObjects(@(message.repeatedSint64Array_Count), [message valueForKey:@"repeatedSint64Array_Count"]);
-  XCTAssertEqualObjects(@(message.repeatedFixed32Array_Count), [message valueForKey:@"repeatedFixed32Array_Count"]);
-  XCTAssertEqualObjects(@(message.repeatedFixed64Array_Count), [message valueForKey:@"repeatedFixed64Array_Count"]);
-  XCTAssertEqualObjects(@(message.repeatedSfixed32Array_Count), [message valueForKey:@"repeatedSfixed32Array_Count"]);
-  XCTAssertEqualObjects(@(message.repeatedSfixed64Array_Count), [message valueForKey:@"repeatedSfixed64Array_Count"]);
-  XCTAssertEqualObjects(@(message.repeatedFloatArray_Count), [message valueForKey:@"repeatedFloatArray_Count"]);
-  XCTAssertEqualObjects(@(message.repeatedDoubleArray_Count), [message valueForKey:@"repeatedDoubleArray_Count"]);
-  XCTAssertEqualObjects(@(message.repeatedBoolArray_Count), [message valueForKey:@"repeatedBoolArray_Count"]);
-  XCTAssertEqualObjects(@(message.repeatedStringArray_Count), [message valueForKey:@"repeatedStringArray_Count"]);
-  XCTAssertEqualObjects(@(message.repeatedBytesArray_Count), [message valueForKey:@"repeatedBytesArray_Count"]);
-
-  XCTAssertEqualObjects(@(message.repeatedGroupArray_Count), [message valueForKey:@"repeatedGroupArray_Count"]);
-  XCTAssertEqualObjects(@(message.repeatedNestedMessageArray_Count), [message valueForKey:@"repeatedNestedMessageArray_Count"]);
-  XCTAssertEqualObjects(@(message.repeatedForeignMessageArray_Count), [message valueForKey:@"repeatedForeignMessageArray_Count"]);
-  XCTAssertEqualObjects(@(message.repeatedImportMessageArray_Count), [message valueForKey:@"repeatedImportMessageArray_Count"]);
-
-  XCTAssertEqualObjects(@(message.repeatedNestedEnumArray_Count), [message valueForKey:@"repeatedNestedEnumArray_Count"]);
-  XCTAssertEqualObjects(@(message.repeatedForeignEnumArray_Count), [message valueForKey:@"repeatedForeignEnumArray_Count"]);
-  XCTAssertEqualObjects(@(message.repeatedImportEnumArray_Count), [message valueForKey:@"repeatedImportEnumArray_Count"]);
-
-  XCTAssertEqualObjects(@(message.repeatedStringPieceArray_Count), [message valueForKey:@"repeatedStringPieceArray_Count"]);
-  XCTAssertEqualObjects(@(message.repeatedCordArray_Count), [message valueForKey:@"repeatedCordArray_Count"]);
-
-  // -----------------------------------------------------------------
-
-  XCTAssertEqualObjects([message valueForKey:@"hasDefaultInt32"], @YES);
-  XCTAssertEqualObjects(@(message.defaultInt32), [message valueForKey:@"defaultInt32"]);
-  XCTAssertEqualObjects([message valueForKey:@"hasDefaultInt64"], @YES);
-  XCTAssertEqualObjects(@(message.defaultInt64), [message valueForKey:@"defaultInt64"]);
-  XCTAssertEqualObjects([message valueForKey:@"hasDefaultUint32"], @YES);
-  XCTAssertEqualObjects(@(message.defaultUint32), [message valueForKey:@"defaultUint32"]);
-  XCTAssertEqualObjects([message valueForKey:@"hasDefaultUint64"], @YES);
-  XCTAssertEqualObjects(@(message.defaultUint64), [message valueForKey:@"defaultUint64"]);
-  XCTAssertEqualObjects([message valueForKey:@"hasDefaultSint32"], @YES);
-  XCTAssertEqualObjects(@(message.defaultSint32), [message valueForKey:@"defaultSint32"]);
-  XCTAssertEqualObjects([message valueForKey:@"hasDefaultSint64"], @YES);
-  XCTAssertEqualObjects(@(message.defaultSint64), [message valueForKey:@"defaultSint64"]);
-  XCTAssertEqualObjects([message valueForKey:@"hasDefaultFixed32"], @YES);
-  XCTAssertEqualObjects(@(message.defaultFixed32), [message valueForKey:@"defaultFixed32"]);
-  XCTAssertEqualObjects([message valueForKey:@"hasDefaultFixed64"], @YES);
-  XCTAssertEqualObjects(@(message.defaultFixed64), [message valueForKey:@"defaultFixed64"]);
-  XCTAssertEqualObjects([message valueForKey:@"hasDefaultSfixed32"], @YES);
-  XCTAssertEqualObjects(@(message.defaultSfixed32), [message valueForKey:@"defaultSfixed32"]);
-  XCTAssertEqualObjects([message valueForKey:@"hasDefaultSfixed64"], @YES);
-  XCTAssertEqualObjects(@(message.defaultSfixed64), [message valueForKey:@"defaultSfixed64"]);
-  XCTAssertEqualObjects([message valueForKey:@"hasDefaultFloat"], @YES);
-  XCTAssertEqualObjects(@(message.defaultFloat), [message valueForKey:@"defaultFloat"]);
-  XCTAssertEqualObjects([message valueForKey:@"hasDefaultDouble"], @YES);
-  XCTAssertEqualObjects(@(message.defaultDouble), [message valueForKey:@"defaultDouble"]);
-  XCTAssertEqualObjects([message valueForKey:@"hasDefaultBool"], @YES);
-  XCTAssertEqualObjects(@(message.defaultBool), [message valueForKey:@"defaultBool"]);
-  XCTAssertEqualObjects([message valueForKey:@"hasDefaultString"], @YES);
-  XCTAssertEqualObjects(message.defaultString, [message valueForKey:@"defaultString"]);
-  XCTAssertEqualObjects([message valueForKey:@"hasDefaultBytes"], @YES);
-  XCTAssertEqualObjects(message.defaultBytes, [message valueForKey:@"defaultBytes"]);
-
-  XCTAssertEqualObjects([message valueForKey:@"hasDefaultNestedEnum"], @YES);
-  XCTAssertEqualObjects(@(message.defaultNestedEnum), [message valueForKey:@"defaultNestedEnum"]);
-  XCTAssertEqualObjects([message valueForKey:@"hasDefaultForeignEnum"], @YES);
-  XCTAssertEqualObjects(@(message.defaultForeignEnum), [message valueForKey:@"defaultForeignEnum"]);
-  XCTAssertEqualObjects([message valueForKey:@"hasDefaultImportEnum"], @YES);
-  XCTAssertEqualObjects(@(message.defaultImportEnum), [message valueForKey:@"defaultImportEnum"]);
-
-  XCTAssertEqualObjects([message valueForKey:@"hasDefaultStringPiece"], @YES);
-  XCTAssertEqualObjects(message.defaultStringPiece, [message valueForKey:@"defaultStringPiece"]);
-  XCTAssertEqualObjects([message valueForKey:@"hasDefaultCord"], @YES);
-  XCTAssertEqualObjects(message.defaultCord, [message valueForKey:@"defaultCord"]);
-}
-
-- (void)setAllFieldsViaKVC:(TestAllTypes *)message
-             repeatedCount:(uint32_t)count {
-  [message setValue:@101 forKey:@"optionalInt32"];
-  [message setValue:@102 forKey:@"optionalInt64"];
-  [message setValue:@103 forKey:@"optionalUint32"];
-  [message setValue:@104 forKey:@"optionalUint64"];
-  [message setValue:@105 forKey:@"optionalSint32"];
-  [message setValue:@106 forKey:@"optionalSint64"];
-  [message setValue:@107 forKey:@"optionalFixed32"];
-  [message setValue:@108 forKey:@"optionalFixed64"];
-  [message setValue:@109 forKey:@"optionalSfixed32"];
-  [message setValue:@110 forKey:@"optionalSfixed64"];
-  [message setValue:@111 forKey:@"optionalFloat"];
-  [message setValue:@112 forKey:@"optionalDouble"];
-  [message setValue:@YES forKey:@"optionalBool"];
-  [message setValue:@"115" forKey:@"optionalString"];
-  [message setValue:[NSData gpbtu_dataWithEmbeddedNulls]
-             forKey:@"optionalBytes"];
-
-  TestAllTypes_OptionalGroup *allTypes = [TestAllTypes_OptionalGroup message];
-  [allTypes setValue:@117 forKey:@"a"];
-  [message setValue:allTypes forKey:@"optionalGroup"];
-  TestAllTypes_NestedMessage *nestedMessage =
-      [TestAllTypes_NestedMessage message];
-  [nestedMessage setValue:@118 forKey:@"bb"];
-  [message setValue:nestedMessage forKey:@"optionalNestedMessage"];
-  ForeignMessage *foreignMessage = [ForeignMessage message];
-  [foreignMessage setValue:@119 forKey:@"c"];
-  [message setValue:foreignMessage forKey:@"optionalForeignMessage"];
-  ImportMessage *importMessage = [ImportMessage message];
-  [importMessage setValue:@120 forKey:@"d"];
-  [message setValue:importMessage forKey:@"optionalImportMessage"];
-
-  [message setValue:@(TestAllTypes_NestedEnum_Baz)
-             forKey:@"optionalNestedEnum"];
-  [message setValue:@(ForeignEnum_ForeignBaz) forKey:@"optionalForeignEnum"];
-  [message setValue:@(ImportEnum_ImportBaz) forKey:@"optionalImportEnum"];
-
-  [message setValue:@"124" forKey:@"optionalStringPiece"];
-  [message setValue:@"125" forKey:@"optionalCord"];
-
-  // -----------------------------------------------------------------
-
-  {
-    GPBInt32Array *scratch = [GPBInt32Array array];
-    for (uint32_t i = 0; i < count; ++i) {
-      [scratch addValue:201 + i * 100];
-    }
-    [message setValue:scratch forKey:@"repeatedInt32Array"];
-  }
-  {
-    GPBInt64Array *scratch = [GPBInt64Array array];
-    for (uint32_t i = 0; i < count; ++i) {
-      [scratch addValue:202 + i * 100];
-    }
-    [message setValue:scratch forKey:@"repeatedInt64Array"];
-  }
-  {
-    GPBUInt32Array *scratch = [GPBUInt32Array array];
-    for (uint32_t i = 0; i < count; ++i) {
-      [scratch addValue:203 + i * 100];
-    }
-    [message setValue:scratch forKey:@"repeatedUint32Array"];
-  }
-  {
-    GPBUInt64Array *scratch = [GPBUInt64Array array];
-    for (uint32_t i = 0; i < count; ++i) {
-      [scratch addValue:204 + i * 100];
-    }
-    [message setValue:scratch forKey:@"repeatedUint64Array"];
-  }
-  {
-    GPBInt32Array *scratch = [GPBInt32Array array];
-    for (uint32_t i = 0; i < count; ++i) {
-      [scratch addValue:205 + i * 100];
-    }
-    [message setValue:scratch forKey:@"repeatedSint32Array"];
-  }
-  {
-    GPBInt64Array *scratch = [GPBInt64Array array];
-    for (uint32_t i = 0; i < count; ++i) {
-      [scratch addValue:206 + i * 100];
-    }
-    [message setValue:scratch forKey:@"repeatedSint64Array"];
-  }
-  {
-    GPBUInt32Array *scratch = [GPBUInt32Array array];
-    for (uint32_t i = 0; i < count; ++i) {
-      [scratch addValue:207 + i * 100];
-    }
-    [message setValue:scratch forKey:@"repeatedFixed32Array"];
-  }
-  {
-    GPBUInt64Array *scratch = [GPBUInt64Array array];
-    for (uint32_t i = 0; i < count; ++i) {
-      [scratch addValue:208 + i * 100];
-    }
-    [message setValue:scratch forKey:@"repeatedFixed64Array"];
-  }
-  {
-    GPBInt32Array *scratch = [GPBInt32Array array];
-    for (uint32_t i = 0; i < count; ++i) {
-      [scratch addValue:209 + i * 100];
-    }
-    [message setValue:scratch forKey:@"repeatedSfixed32Array"];
-  }
-  {
-    GPBInt64Array *scratch = [GPBInt64Array array];
-    for (uint32_t i = 0; i < count; ++i) {
-      [scratch addValue:210 + i * 100];
-    }
-    [message setValue:scratch forKey:@"repeatedSfixed64Array"];
-  }
-  {
-    GPBFloatArray *scratch = [GPBFloatArray array];
-    for (uint32_t i = 0; i < count; ++i) {
-      [scratch addValue:211 + i * 100];
-    }
-    [message setValue:scratch forKey:@"repeatedFloatArray"];
-  }
-  {
-    GPBDoubleArray *scratch = [GPBDoubleArray array];
-    for (uint32_t i = 0; i < count; ++i) {
-      [scratch addValue:212 + i * 100];
-    }
-    [message setValue:scratch forKey:@"repeatedDoubleArray"];
-  }
-  {
-    GPBBoolArray *scratch = [GPBBoolArray array];
-    for (uint32_t i = 0; i < count; ++i) {
-      [scratch addValue:(i % 2) ? YES : NO];
-    }
-    [message setValue:scratch forKey:@"repeatedBoolArray"];
-  }
-
-  NSMutableArray *array = [[NSMutableArray alloc] initWithCapacity:count];
-  for (uint32_t i = 0; i < count; ++i) {
-    NSString *string = [[NSString alloc] initWithFormat:@"%d", 215 + i * 100];
-    [array addObject:string];
-    [string release];
-  }
-  [message setValue:array forKey:@"repeatedStringArray"];
-  [array release];
-
-  array = [[NSMutableArray alloc] initWithCapacity:count];
-  for (uint32_t i = 0; i < count; ++i) {
-    NSData *data = [[NSData alloc] initWithUint32_gpbtu:216 + i * 100];
-    [array addObject:data];
-    [data release];
-  }
-  [message setValue:array forKey:@"repeatedBytesArray"];
-  [array release];
-
-  array = [[NSMutableArray alloc] initWithCapacity:count];
-  for (uint32_t i = 0; i < count; ++i) {
-    TestAllTypes_RepeatedGroup *testAll =
-        [[TestAllTypes_RepeatedGroup alloc] init];
-    [testAll setA:217 + i * 100];
-    [array addObject:testAll];
-    [testAll release];
-  }
-  [message setValue:array forKey:@"repeatedGroupArray"];
-  [array release];
-
-  array = [[NSMutableArray alloc] initWithCapacity:count];
-  for (uint32_t i = 0; i < count; ++i) {
-    nestedMessage = [[TestAllTypes_NestedMessage alloc] init];
-    [nestedMessage setBb:218 + i * 100];
-    [array addObject:nestedMessage];
-    [nestedMessage release];
-  }
-  [message setValue:array forKey:@"repeatedNestedMessageArray"];
-  [array release];
-
-  array = [[NSMutableArray alloc] initWithCapacity:count];
-  for (uint32_t i = 0; i < count; ++i) {
-    foreignMessage = [[ForeignMessage alloc] init];
-    [foreignMessage setC:219 + i * 100];
-    [array addObject:foreignMessage];
-    [foreignMessage release];
-  }
-  [message setValue:array forKey:@"repeatedForeignMessageArray"];
-  [array release];
-
-  array = [[NSMutableArray alloc] initWithCapacity:count];
-  for (uint32_t i = 0; i < count; ++i) {
-    importMessage = [[ImportMessage alloc] init];
-    [importMessage setD:220 + i * 100];
-    [array addObject:importMessage];
-    [importMessage release];
-  }
-  [message setValue:array forKey:@"repeatedImportMessageArray"];
-  [array release];
-
-  {
-    GPBEnumArray *scratch = [GPBEnumArray
-        arrayWithValidationFunction:TestAllTypes_NestedEnum_IsValidValue];
-    for (uint32_t i = 0; i < count; ++i) {
-      [scratch addValue:(i % 2) ? TestAllTypes_NestedEnum_Bar
-                                : TestAllTypes_NestedEnum_Baz];
-    }
-    [message setValue:scratch forKey:@"repeatedNestedEnumArray"];
-  }
-  {
-    GPBEnumArray *scratch =
-        [GPBEnumArray arrayWithValidationFunction:ForeignEnum_IsValidValue];
-    for (uint32_t i = 0; i < count; ++i) {
-      [scratch
-          addValue:(i % 2) ? ForeignEnum_ForeignBar : ForeignEnum_ForeignBaz];
-    }
-    [message setValue:scratch forKey:@"repeatedForeignEnumArray"];
-  }
-  {
-    GPBEnumArray *scratch =
-        [GPBEnumArray arrayWithValidationFunction:ImportEnum_IsValidValue];
-    for (uint32_t i = 0; i < count; ++i) {
-      [scratch addValue:(i % 2) ? ImportEnum_ImportBar : ImportEnum_ImportBaz];
-    }
-    [message setValue:scratch forKey:@"repeatedImportEnumArray"];
-  }
-
-  array = [[NSMutableArray alloc] initWithCapacity:count];
-  for (uint32_t i = 0; i < count; ++i) {
-    NSString *string = [[NSString alloc] initWithFormat:@"%d", 224 + i * 100];
-    [array addObject:string];
-    [string release];
-  }
-  [message setValue:array forKey:@"repeatedStringPieceArray"];
-  [array release];
-
-  array = [[NSMutableArray alloc] initWithCapacity:count];
-  for (uint32_t i = 0; i < count; ++i) {
-    NSString *string = [[NSString alloc] initWithFormat:@"%d", 225 + i * 100];
-    [array addObject:string];
-    [string release];
-  }
-  [message setValue:array forKey:@"repeatedCordArray"];
-  [array release];
-
-  // -----------------------------------------------------------------
-
-  [message setValue:@401 forKey:@"defaultInt32"];
-  [message setValue:@402 forKey:@"defaultInt64"];
-  [message setValue:@403 forKey:@"defaultUint32"];
-  [message setValue:@404 forKey:@"defaultUint64"];
-  [message setValue:@405 forKey:@"defaultSint32"];
-  [message setValue:@406 forKey:@"defaultSint64"];
-  [message setValue:@407 forKey:@"defaultFixed32"];
-  [message setValue:@408 forKey:@"defaultFixed64"];
-  [message setValue:@409 forKey:@"defaultSfixed32"];
-  [message setValue:@410 forKey:@"defaultSfixed64"];
-  [message setValue:@411 forKey:@"defaultFloat"];
-  [message setValue:@412 forKey:@"defaultDouble"];
-  [message setValue:@NO forKey:@"defaultBool"];
-  [message setValue:@"415" forKey:@"defaultString"];
-  [message setValue:[NSData gpbtu_dataWithUint32:416] forKey:@"defaultBytes"];
-
-  [message setValue:@(TestAllTypes_NestedEnum_Foo) forKey:@"defaultNestedEnum"];
-  [message setValue:@(ForeignEnum_ForeignFoo) forKey:@"defaultForeignEnum"];
-  [message setValue:@(ImportEnum_ImportFoo) forKey:@"defaultImportEnum"];
-
-  [message setValue:@"424" forKey:@"defaultStringPiece"];
-  [message setValue:@"425" forKey:@"defaultCord"];
-}
-
-- (void)assertClearKVC:(TestAllTypes *)message {
-  XCTAssertEqualObjects([message valueForKey:@"hasOptionalInt32"], @NO);
-  XCTAssertEqualObjects([message valueForKey:@"hasOptionalInt64"], @NO);
-  XCTAssertEqualObjects([message valueForKey:@"hasOptionalUint32"], @NO);
-  XCTAssertEqualObjects([message valueForKey:@"hasOptionalUint64"], @NO);
-  XCTAssertEqualObjects([message valueForKey:@"hasOptionalSint32"], @NO);
-  XCTAssertEqualObjects([message valueForKey:@"hasOptionalSint64"], @NO);
-  XCTAssertEqualObjects([message valueForKey:@"hasOptionalFixed32"], @NO);
-  XCTAssertEqualObjects([message valueForKey:@"hasOptionalFixed64"], @NO);
-  XCTAssertEqualObjects([message valueForKey:@"hasOptionalSfixed32"], @NO);
-  XCTAssertEqualObjects([message valueForKey:@"hasOptionalSfixed64"], @NO);
-  XCTAssertEqualObjects([message valueForKey:@"hasOptionalFloat"], @NO);
-  XCTAssertEqualObjects([message valueForKey:@"hasOptionalDouble"], @NO);
-  XCTAssertEqualObjects([message valueForKey:@"hasOptionalBool"], @NO);
-  XCTAssertEqualObjects([message valueForKey:@"hasOptionalString"], @NO);
-  XCTAssertEqualObjects([message valueForKey:@"hasOptionalBytes"], @NO);
-
-  XCTAssertEqualObjects([message valueForKey:@"hasOptionalGroup"], @NO);
-  XCTAssertEqualObjects([message valueForKey:@"hasOptionalNestedMessage"], @NO);
-  XCTAssertEqualObjects([message valueForKey:@"hasOptionalForeignMessage"],
-                        @NO);
-  XCTAssertEqualObjects([message valueForKey:@"hasOptionalImportMessage"], @NO);
-
-  XCTAssertEqualObjects([message valueForKey:@"hasOptionalNestedEnum"], @NO);
-  XCTAssertEqualObjects([message valueForKey:@"hasOptionalForeignEnum"], @NO);
-  XCTAssertEqualObjects([message valueForKey:@"hasOptionalImportEnum"], @NO);
-
-  XCTAssertEqualObjects([message valueForKey:@"hasOptionalStringPiece"], @NO);
-  XCTAssertEqualObjects([message valueForKey:@"hasOptionalCord"], @NO);
-
-  // Optional fields without defaults are set to zero or something like it.
-  XCTAssertEqualObjects([message valueForKey:@"optionalInt32"], @0);
-  XCTAssertEqualObjects([message valueForKey:@"optionalInt64"], @0);
-  XCTAssertEqualObjects([message valueForKey:@"optionalUint32"], @0);
-  XCTAssertEqualObjects([message valueForKey:@"optionalUint64"], @0);
-  XCTAssertEqualObjects([message valueForKey:@"optionalSint32"], @0);
-  XCTAssertEqualObjects([message valueForKey:@"optionalSint64"], @0);
-  XCTAssertEqualObjects([message valueForKey:@"optionalFixed32"], @0);
-  XCTAssertEqualObjects([message valueForKey:@"optionalFixed64"], @0);
-  XCTAssertEqualObjects([message valueForKey:@"optionalSfixed32"], @0);
-  XCTAssertEqualObjects([message valueForKey:@"optionalSfixed64"], @0);
-  XCTAssertEqualObjects([message valueForKey:@"optionalFloat"], @0);
-  XCTAssertEqualObjects([message valueForKey:@"optionalDouble"], @0);
-  XCTAssertEqualObjects([message valueForKey:@"optionalBool"], @NO);
-  XCTAssertEqualObjects([message valueForKey:@"optionalString"], @"");
-  XCTAssertEqualObjects([message valueForKey:@"optionalBytes"],
-                        GPBEmptyNSData());
-
-  // Embedded messages should also be exist, but be clear.
-  XCTAssertNotNil([message valueForKeyPath:@"optionalGroup"]);
-  XCTAssertNotNil([message valueForKeyPath:@"optionalNestedMessage"]);
-  XCTAssertNotNil([message valueForKeyPath:@"optionalForeignMessage"]);
-  XCTAssertNotNil([message valueForKeyPath:@"optionalImportMessage"]);
-  XCTAssertEqualObjects([message valueForKeyPath:@"optionalGroup.hasA"], @NO);
-  XCTAssertEqualObjects(
-      [message valueForKeyPath:@"optionalNestedMessage.hasBb"], @NO);
-  XCTAssertEqualObjects(
-      [message valueForKeyPath:@"optionalForeignMessage.hasC"], @NO);
-  XCTAssertEqualObjects([message valueForKeyPath:@"optionalImportMessage.hasD"],
-                        @NO);
-
-  XCTAssertEqualObjects([message valueForKeyPath:@"optionalGroup.a"], @0);
-  XCTAssertEqualObjects([message valueForKeyPath:@"optionalNestedMessage.bb"],
-                        @0);
-  XCTAssertEqualObjects([message valueForKeyPath:@"optionalForeignMessage.c"],
-                        @0);
-  XCTAssertEqualObjects([message valueForKeyPath:@"optionalImportMessage.d"],
-                        @0);
-
-  // Enums without defaults are set to the first value in the enum.
-  XCTAssertEqualObjects([message valueForKey:@"optionalNestedEnum"],
-                        @(TestAllTypes_NestedEnum_Foo));
-  XCTAssertEqualObjects([message valueForKey:@"optionalForeignEnum"],
-                        @(ForeignEnum_ForeignFoo));
-  XCTAssertEqualObjects([message valueForKey:@"optionalImportEnum"],
-                        @(ImportEnum_ImportFoo));
-
-  XCTAssertEqualObjects([message valueForKey:@"optionalStringPiece"], @"");
-  XCTAssertEqualObjects([message valueForKey:@"optionalCord"], @"");
-
-  // NSArray interface for repeated doesn't have has*, nil means no value.
-
-  XCTAssertEqualObjects([message valueForKey:@"hasDefaultInt32"], @NO);
-  XCTAssertEqualObjects([message valueForKey:@"hasDefaultInt64"], @NO);
-  XCTAssertEqualObjects([message valueForKey:@"hasDefaultUint32"], @NO);
-  XCTAssertEqualObjects([message valueForKey:@"hasDefaultUint64"], @NO);
-  XCTAssertEqualObjects([message valueForKey:@"hasDefaultSint32"], @NO);
-  XCTAssertEqualObjects([message valueForKey:@"hasDefaultSint64"], @NO);
-  XCTAssertEqualObjects([message valueForKey:@"hasDefaultFixed32"], @NO);
-  XCTAssertEqualObjects([message valueForKey:@"hasDefaultFixed64"], @NO);
-  XCTAssertEqualObjects([message valueForKey:@"hasDefaultSfixed32"], @NO);
-  XCTAssertEqualObjects([message valueForKey:@"hasDefaultSfixed64"], @NO);
-  XCTAssertEqualObjects([message valueForKey:@"hasDefaultFloat"], @NO);
-  XCTAssertEqualObjects([message valueForKey:@"hasDefaultDouble"], @NO);
-  XCTAssertEqualObjects([message valueForKey:@"hasDefaultBool"], @NO);
-  XCTAssertEqualObjects([message valueForKey:@"hasDefaultString"], @NO);
-  XCTAssertEqualObjects([message valueForKey:@"hasDefaultBytes"], @NO);
-
-  XCTAssertEqualObjects([message valueForKey:@"hasDefaultNestedEnum"], @NO);
-  XCTAssertEqualObjects([message valueForKey:@"hasDefaultForeignEnum"], @NO);
-  XCTAssertEqualObjects([message valueForKey:@"hasDefaultImportEnum"], @NO);
-
-  XCTAssertEqualObjects([message valueForKey:@"hasDefaultStringPiece"], @NO);
-  XCTAssertEqualObjects([message valueForKey:@"hasDefaultCord"], @NO);
-
-  // Fields with defaults have their default values (duh).
-  XCTAssertEqualObjects([message valueForKey:@"defaultInt32"], @41);
-  XCTAssertEqualObjects([message valueForKey:@"defaultInt64"], @42);
-  XCTAssertEqualObjects([message valueForKey:@"defaultUint32"], @43);
-  XCTAssertEqualObjects([message valueForKey:@"defaultUint64"], @44);
-  XCTAssertEqualObjects([message valueForKey:@"defaultSint32"], @-45);
-  XCTAssertEqualObjects([message valueForKey:@"defaultSint64"], @46);
-  XCTAssertEqualObjects([message valueForKey:@"defaultFixed32"], @47);
-  XCTAssertEqualObjects([message valueForKey:@"defaultFixed64"], @48);
-  XCTAssertEqualObjects([message valueForKey:@"defaultSfixed32"], @49);
-  XCTAssertEqualObjects([message valueForKey:@"defaultSfixed64"], @-50);
-  XCTAssertEqualObjects([message valueForKey:@"defaultFloat"], @51.5);
-  XCTAssertEqualObjects([message valueForKey:@"defaultDouble"], @52e3);
-  XCTAssertEqualObjects([message valueForKey:@"defaultBool"], @YES);
-  XCTAssertEqualObjects([message valueForKey:@"defaultString"], @"hello");
-  XCTAssertEqualObjects([message valueForKey:@"defaultBytes"],
-                        [NSData gpbtu_dataWithCString:"world"]);
-
-  XCTAssertEqualObjects([message valueForKey:@"defaultNestedEnum"],
-                        @(TestAllTypes_NestedEnum_Bar));
-  XCTAssertEqualObjects([message valueForKey:@"defaultForeignEnum"],
-                        @(ForeignEnum_ForeignBar));
-  XCTAssertEqualObjects([message valueForKey:@"defaultImportEnum"],
-                        @(ImportEnum_ImportBar));
-
-  XCTAssertEqualObjects([message valueForKey:@"defaultStringPiece"], @"abc");
-  XCTAssertEqualObjects([message valueForKey:@"defaultCord"], @"123");
-}
-
-@end
diff --git a/libs/protobuf/objectivec/Tests/GPBUnittestProtos.m b/libs/protobuf/objectivec/Tests/GPBUnittestProtos.m
deleted file mode 100644
index 1c6eddf..0000000
--- a/libs/protobuf/objectivec/Tests/GPBUnittestProtos.m
+++ /dev/null
@@ -1,73 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Collects all the compiled protos into one file and compiles them to make sure
-// the compiler is generating valid code.
-
-// The unittest_custom_options.proto extends the messages in descriptor.proto
-// so we build it in to test extending in general. The library doesn't provide
-// a descriptor as it doesn't use the classes/enums.
-#import "google/protobuf/Descriptor.pbobjc.m"
-
-#import "google/protobuf/AnyTest.pbobjc.m"
-#import "google/protobuf/MapProto2Unittest.pbobjc.m"
-#import "google/protobuf/MapUnittest.pbobjc.m"
-#import "google/protobuf/Unittest.pbobjc.m"
-#import "google/protobuf/UnittestArena.pbobjc.m"
-#import "google/protobuf/UnittestCustomOptions.pbobjc.m"
-#import "google/protobuf/UnittestCycle.pbobjc.m"
-#import "google/protobuf/UnittestDeprecated.pbobjc.m"
-#import "google/protobuf/UnittestDeprecatedFile.pbobjc.m"
-#import "google/protobuf/UnittestDropUnknownFields.pbobjc.m"
-#import "google/protobuf/UnittestEmbedOptimizeFor.pbobjc.m"
-#import "google/protobuf/UnittestEmpty.pbobjc.m"
-#import "google/protobuf/UnittestEnormousDescriptor.pbobjc.m"
-#import "google/protobuf/UnittestImport.pbobjc.m"
-#import "google/protobuf/UnittestImportLite.pbobjc.m"
-#import "google/protobuf/UnittestImportPublic.pbobjc.m"
-#import "google/protobuf/UnittestImportPublicLite.pbobjc.m"
-#import "google/protobuf/UnittestLite.pbobjc.m"
-#import "google/protobuf/UnittestMset.pbobjc.m"
-#import "google/protobuf/UnittestMsetWireFormat.pbobjc.m"
-#import "google/protobuf/UnittestNoGenericServices.pbobjc.m"
-#import "google/protobuf/UnittestObjc.pbobjc.m"
-#import "google/protobuf/UnittestObjcStartup.pbobjc.m"
-#import "google/protobuf/UnittestOptimizeFor.pbobjc.m"
-#import "google/protobuf/UnittestPreserveUnknownEnum.pbobjc.m"
-#import "google/protobuf/UnittestRuntimeProto2.pbobjc.m"
-#import "google/protobuf/UnittestRuntimeProto3.pbobjc.m"
-
-#import "google/protobuf/UnittestExtensionChainA.pbobjc.m"
-#import "google/protobuf/UnittestExtensionChainB.pbobjc.m"
-#import "google/protobuf/UnittestExtensionChainC.pbobjc.m"
-#import "google/protobuf/UnittestExtensionChainD.pbobjc.m"
-#import "google/protobuf/UnittestExtensionChainE.pbobjc.m"
-// See GPBUnittestProtos2.m for for "UnittestExtensionChainF.pbobjc.m"
-#import "google/protobuf/UnittestExtensionChainG.pbobjc.m"
diff --git a/libs/protobuf/objectivec/Tests/GPBUnittestProtos2.m b/libs/protobuf/objectivec/Tests/GPBUnittestProtos2.m
deleted file mode 100644
index ef9f070..0000000
--- a/libs/protobuf/objectivec/Tests/GPBUnittestProtos2.m
+++ /dev/null
@@ -1,34 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2016 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// This one file in the chain tests is compiled by itself to ensure if was
-// generated with the extra #imports needed to pull in the indirect Root class
-// used in its Root registry.
-#import "google/protobuf/UnittestExtensionChainF.pbobjc.m"
diff --git a/libs/protobuf/objectivec/Tests/GPBUnknownFieldSetTest.m b/libs/protobuf/objectivec/Tests/GPBUnknownFieldSetTest.m
deleted file mode 100644
index 5fa60b2..0000000
--- a/libs/protobuf/objectivec/Tests/GPBUnknownFieldSetTest.m
+++ /dev/null
@@ -1,511 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#import "GPBTestUtilities.h"
-
-#import "GPBUnknownField_PackagePrivate.h"
-#import "GPBUnknownFieldSet_PackagePrivate.h"
-#import "google/protobuf/Unittest.pbobjc.h"
-
-@interface GPBUnknownFieldSet (GPBUnknownFieldSetTest)
-- (void)getTags:(int32_t*)tags;
-@end
-
-@interface UnknownFieldSetTest : GPBTestCase {
- @private
-  TestAllTypes* allFields_;
-  NSData* allFieldsData_;
-
-  // An empty message that has been parsed from allFieldsData.  So, it has
-  // unknown fields of every type.
-  TestEmptyMessage* emptyMessage_;
-  GPBUnknownFieldSet* unknownFields_;
-}
-
-@end
-
-@implementation UnknownFieldSetTest
-
-- (void)setUp {
-  allFields_ = [self allSetRepeatedCount:kGPBDefaultRepeatCount];
-  allFieldsData_ = [allFields_ data];
-  emptyMessage_ = [TestEmptyMessage parseFromData:allFieldsData_ error:NULL];
-  unknownFields_ = emptyMessage_.unknownFields;
-}
-
-- (void)testInvalidFieldNumber {
-  GPBUnknownFieldSet *set = [[[GPBUnknownFieldSet alloc] init] autorelease];
-  GPBUnknownField* field = [[[GPBUnknownField alloc] initWithNumber:0] autorelease];
-  XCTAssertThrowsSpecificNamed([set addField:field], NSException, NSInvalidArgumentException);
-}
-
-- (void)testEqualityAndHash {
-  // Empty
-
-  GPBUnknownFieldSet *set1 = [[[GPBUnknownFieldSet alloc] init] autorelease];
-  XCTAssertTrue([set1 isEqual:set1]);
-  XCTAssertFalse([set1 isEqual:@"foo"]);
-  GPBUnknownFieldSet *set2 = [[[GPBUnknownFieldSet alloc] init] autorelease];
-  XCTAssertEqualObjects(set1, set2);
-  XCTAssertEqual([set1 hash], [set2 hash]);
-
-  // Varint
-
-  GPBUnknownField* field1 = [[[GPBUnknownField alloc] initWithNumber:1] autorelease];
-  [field1 addVarint:1];
-  [set1 addField:field1];
-  XCTAssertNotEqualObjects(set1, set2);
-  GPBUnknownField* field2 = [[[GPBUnknownField alloc] initWithNumber:1] autorelease];
-  [field2 addVarint:1];
-  [set2 addField:field2];
-  XCTAssertEqualObjects(set1, set2);
-  XCTAssertEqual([set1 hash], [set2 hash]);
-
-  // Fixed32
-
-  field1 = [[[GPBUnknownField alloc] initWithNumber:2] autorelease];
-  [field1 addFixed32:2];
-  [set1 addField:field1];
-  XCTAssertNotEqualObjects(set1, set2);
-  field2 = [[[GPBUnknownField alloc] initWithNumber:2] autorelease];
-  [field2 addFixed32:2];
-  [set2 addField:field2];
-  XCTAssertEqualObjects(set1, set2);
-  XCTAssertEqual([set1 hash], [set2 hash]);
-
-  // Fixed64
-
-  field1 = [[[GPBUnknownField alloc] initWithNumber:3] autorelease];
-  [field1 addFixed64:3];
-  [set1 addField:field1];
-  XCTAssertNotEqualObjects(set1, set2);
-  field2 = [[[GPBUnknownField alloc] initWithNumber:3] autorelease];
-  [field2 addFixed64:3];
-  [set2 addField:field2];
-  XCTAssertEqualObjects(set1, set2);
-  XCTAssertEqual([set1 hash], [set2 hash]);
-
-  // LengthDelimited
-
-  field1 = [[[GPBUnknownField alloc] initWithNumber:4] autorelease];
-  [field1 addLengthDelimited:DataFromCStr("foo")];
-  [set1 addField:field1];
-  XCTAssertNotEqualObjects(set1, set2);
-  field2 = [[[GPBUnknownField alloc] initWithNumber:4] autorelease];
-  [field2 addLengthDelimited:DataFromCStr("foo")];
-  [set2 addField:field2];
-  XCTAssertEqualObjects(set1, set2);
-  XCTAssertEqual([set1 hash], [set2 hash]);
-
-  // Group
-
-  GPBUnknownFieldSet *group1 = [[[GPBUnknownFieldSet alloc] init] autorelease];
-  GPBUnknownField* fieldGroup1 = [[[GPBUnknownField alloc] initWithNumber:10] autorelease];
-  [fieldGroup1 addVarint:1];
-  [group1 addField:fieldGroup1];
-  GPBUnknownFieldSet *group2 = [[[GPBUnknownFieldSet alloc] init] autorelease];
-  GPBUnknownField* fieldGroup2 = [[[GPBUnknownField alloc] initWithNumber:10] autorelease];
-  [fieldGroup2 addVarint:1];
-  [group2 addField:fieldGroup2];
-
-  field1 = [[[GPBUnknownField alloc] initWithNumber:5] autorelease];
-  [field1 addGroup:group1];
-  [set1 addField:field1];
-  XCTAssertNotEqualObjects(set1, set2);
-  field2 = [[[GPBUnknownField alloc] initWithNumber:5] autorelease];
-  [field2 addGroup:group2];
-  [set2 addField:field2];
-  XCTAssertEqualObjects(set1, set2);
-  XCTAssertEqual([set1 hash], [set2 hash]);
-
-  // Exercise description for completeness.
-  XCTAssertTrue(set1.description.length > 10);
-}
-
-// Constructs a protocol buffer which contains fields with all the same
-// numbers as allFieldsData except that each field is some other wire
-// type.
-- (NSData*)getBizarroData {
-  GPBUnknownFieldSet* bizarroFields =
-      [[[GPBUnknownFieldSet alloc] init] autorelease];
-  NSUInteger count = [unknownFields_ countOfFields];
-  int32_t *tags = malloc(count * sizeof(int32_t));
-  if (!tags) {
-    XCTFail(@"Failed to make scratch buffer for testing");
-    return [NSData data];
-  }
-  @try {
-    [unknownFields_ getTags:tags];
-    for (NSUInteger i = 0; i < count; ++i) {
-      int32_t tag = tags[i];
-      GPBUnknownField* field = [unknownFields_ getField:tag];
-      if (field.varintList.count == 0) {
-        // Original field is not a varint, so use a varint.
-        GPBUnknownField* varintField =
-            [[[GPBUnknownField alloc] initWithNumber:tag] autorelease];
-        [varintField addVarint:1];
-        [bizarroFields addField:varintField];
-      } else {
-        // Original field *is* a varint, so use something else.
-        GPBUnknownField* fixed32Field =
-            [[[GPBUnknownField alloc] initWithNumber:tag] autorelease];
-        [fixed32Field addFixed32:1];
-        [bizarroFields addField:fixed32Field];
-      }
-    }
-  }
-  @finally {
-    free(tags);
-  }
-
-  return [bizarroFields data];
-}
-
-- (void)testSerialize {
-  // Check that serializing the UnknownFieldSet produces the original data
-  // again.
-  NSData* data = [emptyMessage_ data];
-  XCTAssertEqualObjects(allFieldsData_, data);
-}
-
-- (void)testCopyFrom {
-  TestEmptyMessage* message = [TestEmptyMessage message];
-  [message mergeFrom:emptyMessage_];
-
-  XCTAssertEqualObjects(emptyMessage_.data, message.data);
-}
-
-- (void)testMergeFrom {
-  GPBUnknownFieldSet* set1 = [[[GPBUnknownFieldSet alloc] init] autorelease];
-  GPBUnknownField* field = [[[GPBUnknownField alloc] initWithNumber:2] autorelease];
-  [field addVarint:2];
-  [set1 addField:field];
-  field = [[[GPBUnknownField alloc] initWithNumber:3] autorelease];
-  [field addVarint:4];
-  [set1 addField:field];
-  field = [[[GPBUnknownField alloc] initWithNumber:4] autorelease];
-  [field addFixed32:6];
-  [set1 addField:field];
-  field = [[[GPBUnknownField alloc] initWithNumber:5] autorelease];
-  [field addFixed64:20];
-  [set1 addField:field];
-  field = [[[GPBUnknownField alloc] initWithNumber:10] autorelease];
-  [field addLengthDelimited:DataFromCStr("data1")];
-  [set1 addField:field];
-
-  GPBUnknownFieldSet *group1 = [[[GPBUnknownFieldSet alloc] init] autorelease];
-  GPBUnknownField* fieldGroup1 = [[[GPBUnknownField alloc] initWithNumber:200] autorelease];
-  [fieldGroup1 addVarint:100];
-  [group1 addField:fieldGroup1];
-
-  field = [[[GPBUnknownField alloc] initWithNumber:11] autorelease];
-  [field addGroup:group1];
-  [set1 addField:field];
-
-  GPBUnknownFieldSet* set2 = [[[GPBUnknownFieldSet alloc] init] autorelease];
-  field = [[[GPBUnknownField alloc] initWithNumber:1] autorelease];
-  [field addVarint:1];
-  [set2 addField:field];
-  field = [[[GPBUnknownField alloc] initWithNumber:3] autorelease];
-  [field addVarint:3];
-  [set2 addField:field];
-  field = [[[GPBUnknownField alloc] initWithNumber:4] autorelease];
-  [field addFixed32:7];
-  [set2 addField:field];
-  field = [[[GPBUnknownField alloc] initWithNumber:5] autorelease];
-  [field addFixed64:30];
-  [set2 addField:field];
-  field = [[[GPBUnknownField alloc] initWithNumber:10] autorelease];
-  [field addLengthDelimited:DataFromCStr("data2")];
-  [set2 addField:field];
-
-  GPBUnknownFieldSet *group2 = [[[GPBUnknownFieldSet alloc] init] autorelease];
-  GPBUnknownField* fieldGroup2 = [[[GPBUnknownField alloc] initWithNumber:201] autorelease];
-  [fieldGroup2 addVarint:99];
-  [group2 addField:fieldGroup2];
-
-  field = [[[GPBUnknownField alloc] initWithNumber:11] autorelease];
-  [field addGroup:group2];
-  [set2 addField:field];
-
-  GPBUnknownFieldSet* set3 = [[[GPBUnknownFieldSet alloc] init] autorelease];
-  field = [[[GPBUnknownField alloc] initWithNumber:1] autorelease];
-  [field addVarint:1];
-  [set3 addField:field];
-  field = [[[GPBUnknownField alloc] initWithNumber:2] autorelease];
-  [field addVarint:2];
-  [set3 addField:field];
-  field = [[[GPBUnknownField alloc] initWithNumber:3] autorelease];
-  [field addVarint:4];
-  [set3 addField:field];
-  [field addVarint:3];
-  [set3 addField:field];
-  field = [[[GPBUnknownField alloc] initWithNumber:4] autorelease];
-  [field addFixed32:6];
-  [field addFixed32:7];
-  [set3 addField:field];
-  field = [[[GPBUnknownField alloc] initWithNumber:5] autorelease];
-  [field addFixed64:20];
-  [field addFixed64:30];
-  [set3 addField:field];
-  field = [[[GPBUnknownField alloc] initWithNumber:10] autorelease];
-  [field addLengthDelimited:DataFromCStr("data1")];
-  [field addLengthDelimited:DataFromCStr("data2")];
-  [set3 addField:field];
-
-  GPBUnknownFieldSet *group3a = [[[GPBUnknownFieldSet alloc] init] autorelease];
-  GPBUnknownField* fieldGroup3a1 = [[[GPBUnknownField alloc] initWithNumber:200] autorelease];
-  [fieldGroup3a1 addVarint:100];
-  [group3a addField:fieldGroup3a1];
-  GPBUnknownFieldSet *group3b = [[[GPBUnknownFieldSet alloc] init] autorelease];
-  GPBUnknownField* fieldGroup3b2 = [[[GPBUnknownField alloc] initWithNumber:201] autorelease];
-  [fieldGroup3b2 addVarint:99];
-  [group3b addField:fieldGroup3b2];
-
-  field = [[[GPBUnknownField alloc] initWithNumber:11] autorelease];
-  [field addGroup:group1];
-  [field addGroup:group3b];
-  [set3 addField:field];
-
-  TestEmptyMessage* source1 = [TestEmptyMessage message];
-  [source1 setUnknownFields:set1];
-  TestEmptyMessage* source2 = [TestEmptyMessage message];
-  [source2 setUnknownFields:set2];
-  TestEmptyMessage* source3 = [TestEmptyMessage message];
-  [source3 setUnknownFields:set3];
-
-  TestEmptyMessage* destination1 = [TestEmptyMessage message];
-  [destination1 mergeFrom:source1];
-  [destination1 mergeFrom:source2];
-
-  TestEmptyMessage* destination2 = [TestEmptyMessage message];
-  [destination2 mergeFrom:source3];
-
-  XCTAssertEqualObjects(destination1.data, destination2.data);
-  XCTAssertEqualObjects(destination1.data, source3.data);
-  XCTAssertEqualObjects(destination2.data, source3.data);
-}
-
-- (void)testClearMessage {
-  TestEmptyMessage *message = [TestEmptyMessage message];
-  [message mergeFrom:emptyMessage_];
-  [message clear];
-  XCTAssertEqual(message.serializedSize, (size_t)0);
-}
-
-- (void)testParseKnownAndUnknown {
-  // Test mixing known and unknown fields when parsing.
-  GPBUnknownFieldSet *fields = [[unknownFields_ copy] autorelease];
-  GPBUnknownField *field =
-    [[[GPBUnknownField alloc] initWithNumber:123456] autorelease];
-  [field addVarint:654321];
-  [fields addField:field];
-
-  NSData* data = fields.data;
-  TestAllTypes* destination = [TestAllTypes parseFromData:data error:NULL];
-
-  [self assertAllFieldsSet:destination repeatedCount:kGPBDefaultRepeatCount];
-  XCTAssertEqual(destination.unknownFields.countOfFields, (NSUInteger)1);
-
-  GPBUnknownField* field2 = [destination.unknownFields getField:123456];
-  XCTAssertEqual(field2.varintList.count, (NSUInteger)1);
-  XCTAssertEqual(654321ULL, [field2.varintList valueAtIndex:0]);
-}
-
-- (void)testWrongTypeTreatedAsUnknown {
-  // Test that fields of the wrong wire type are treated like unknown fields
-  // when parsing.
-
-  NSData* bizarroData = [self getBizarroData];
-  TestAllTypes* allTypesMessage =
-      [TestAllTypes parseFromData:bizarroData error:NULL];
-  TestEmptyMessage* emptyMessage =
-      [TestEmptyMessage parseFromData:bizarroData error:NULL];
-
-  // All fields should have been interpreted as unknown, so the debug strings
-  // should be the same.
-  XCTAssertEqualObjects(emptyMessage.data, allTypesMessage.data);
-}
-
-- (void)testUnknownExtensions {
-  // Make sure fields are properly parsed to the UnknownFieldSet even when
-  // they are declared as extension numbers.
-
-  TestEmptyMessageWithExtensions* message =
-      [TestEmptyMessageWithExtensions parseFromData:allFieldsData_ error:NULL];
-
-  XCTAssertEqual(unknownFields_.countOfFields,
-                 message.unknownFields.countOfFields);
-  XCTAssertEqualObjects(allFieldsData_, message.data);
-}
-
-- (void)testWrongExtensionTypeTreatedAsUnknown {
-  // Test that fields of the wrong wire type are treated like unknown fields
-  // when parsing extensions.
-
-  NSData* bizarroData = [self getBizarroData];
-  TestAllExtensions* allExtensionsMessage =
-      [TestAllExtensions parseFromData:bizarroData error:NULL];
-  TestEmptyMessage* emptyMessage =
-      [TestEmptyMessage parseFromData:bizarroData error:NULL];
-
-  // All fields should have been interpreted as unknown, so the debug strings
-  // should be the same.
-  XCTAssertEqualObjects(emptyMessage.data, allExtensionsMessage.data);
-}
-
-- (void)testLargeVarint {
-  GPBUnknownFieldSet* fields = [[unknownFields_ copy] autorelease];
-  GPBUnknownField* field = [[[GPBUnknownField alloc] initWithNumber:1] autorelease];
-  [field addVarint:0x7FFFFFFFFFFFFFFFL];
-  [fields addField:field];
-
-  NSData* data = [fields data];
-
-  GPBUnknownFieldSet* parsed = [[[GPBUnknownFieldSet alloc] init] autorelease];
-  [parsed mergeFromData:data];
-  GPBUnknownField* field2 = [parsed getField:1];
-  XCTAssertEqual(field2.varintList.count, (NSUInteger)1);
-  XCTAssertEqual(0x7FFFFFFFFFFFFFFFULL, [field2.varintList valueAtIndex:0]);
-}
-
-#pragma mark - Field tests
-// Some tests directly on fields since the dictionary in FieldSet can gate
-// testing some of these.
-
-- (void)testFieldEqualityAndHash {
-  GPBUnknownField* field1 = [[[GPBUnknownField alloc] initWithNumber:1] autorelease];
-  XCTAssertTrue([field1 isEqual:field1]);
-  XCTAssertFalse([field1 isEqual:@"foo"]);
-  GPBUnknownField* field2 = [[[GPBUnknownField alloc] initWithNumber:2] autorelease];
-  XCTAssertNotEqualObjects(field1, field2);
-
-  field2 = [[[GPBUnknownField alloc] initWithNumber:1] autorelease];
-  XCTAssertEqualObjects(field1, field2);
-  XCTAssertEqual([field1 hash], [field2 hash]);
-
-  // Varint
-
-  [field1 addVarint:10];
-  XCTAssertNotEqualObjects(field1, field2);
-  [field2 addVarint:10];
-  XCTAssertEqualObjects(field1, field2);
-  XCTAssertEqual([field1 hash], [field2 hash]);
-  [field1 addVarint:11];
-  XCTAssertNotEqualObjects(field1, field2);
-  [field2 addVarint:11];
-  XCTAssertEqualObjects(field1, field2);
-  XCTAssertEqual([field1 hash], [field2 hash]);
-
-  // Fixed32
-
-  [field1 addFixed32:20];
-  XCTAssertNotEqualObjects(field1, field2);
-  [field2 addFixed32:20];
-  XCTAssertEqualObjects(field1, field2);
-  XCTAssertEqual([field1 hash], [field2 hash]);
-  [field1 addFixed32:21];
-  XCTAssertNotEqualObjects(field1, field2);
-  [field2 addFixed32:21];
-  XCTAssertEqualObjects(field1, field2);
-  XCTAssertEqual([field1 hash], [field2 hash]);
-
-  // Fixed64
-
-  [field1 addFixed64:30];
-  XCTAssertNotEqualObjects(field1, field2);
-  [field2 addFixed64:30];
-  XCTAssertEqualObjects(field1, field2);
-  XCTAssertEqual([field1 hash], [field2 hash]);
-  [field1 addFixed64:31];
-  XCTAssertNotEqualObjects(field1, field2);
-  [field2 addFixed64:31];
-  XCTAssertEqualObjects(field1, field2);
-  XCTAssertEqual([field1 hash], [field2 hash]);
-
-  // LengthDelimited
-
-  [field1 addLengthDelimited:DataFromCStr("foo")];
-  XCTAssertNotEqualObjects(field1, field2);
-  [field2 addLengthDelimited:DataFromCStr("foo")];
-  XCTAssertEqualObjects(field1, field2);
-  XCTAssertEqual([field1 hash], [field2 hash]);
-  [field1 addLengthDelimited:DataFromCStr("bar")];
-  XCTAssertNotEqualObjects(field1, field2);
-  [field2 addLengthDelimited:DataFromCStr("bar")];
-  XCTAssertEqualObjects(field1, field2);
-  XCTAssertEqual([field1 hash], [field2 hash]);
-
-  // Group
-
-  GPBUnknownFieldSet *group = [[[GPBUnknownFieldSet alloc] init] autorelease];
-  GPBUnknownField* fieldGroup = [[[GPBUnknownField alloc] initWithNumber:100] autorelease];
-  [fieldGroup addVarint:100];
-  [group addField:fieldGroup];
-  [field1 addGroup:group];
-  XCTAssertNotEqualObjects(field1, field2);
-  group = [[[GPBUnknownFieldSet alloc] init] autorelease];
-  fieldGroup = [[[GPBUnknownField alloc] initWithNumber:100] autorelease];
-  [fieldGroup addVarint:100];
-  [group addField:fieldGroup];
-  [field2 addGroup:group];
-  XCTAssertEqualObjects(field1, field2);
-  XCTAssertEqual([field1 hash], [field2 hash]);
-
-  group = [[[GPBUnknownFieldSet alloc] init] autorelease];
-  fieldGroup = [[[GPBUnknownField alloc] initWithNumber:101] autorelease];
-  [fieldGroup addVarint:101];
-  [group addField:fieldGroup];
-  [field1 addGroup:group];
-  XCTAssertNotEqualObjects(field1, field2);
-  group = [[[GPBUnknownFieldSet alloc] init] autorelease];
-  fieldGroup = [[[GPBUnknownField alloc] initWithNumber:101] autorelease];
-  [fieldGroup addVarint:101];
-  [group addField:fieldGroup];
-  [field2 addGroup:group];
-  XCTAssertEqualObjects(field1, field2);
-  XCTAssertEqual([field1 hash], [field2 hash]);
-
-  // Exercise description for completeness.
-  XCTAssertTrue(field1.description.length > 10);
-}
-
-- (void)testMergingFields {
-  GPBUnknownField* field1 = [[[GPBUnknownField alloc] initWithNumber:1] autorelease];
-  [field1 addVarint:1];
-  [field1 addFixed32:2];
-  [field1 addFixed64:3];
-  [field1 addLengthDelimited:[NSData dataWithBytes:"hello" length:5]];
-  [field1 addGroup:[[unknownFields_ copy] autorelease]];
-  GPBUnknownField* field2 = [[[GPBUnknownField alloc] initWithNumber:1] autorelease];
-  [field2 mergeFromField:field1];
-}
-
-@end
diff --git a/libs/protobuf/objectivec/Tests/GPBUtilitiesTests.m b/libs/protobuf/objectivec/Tests/GPBUtilitiesTests.m
deleted file mode 100644
index f4a09de..0000000
--- a/libs/protobuf/objectivec/Tests/GPBUtilitiesTests.m
+++ /dev/null
@@ -1,420 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#import <XCTest/XCTest.h>
-
-#import "GPBUtilities_PackagePrivate.h"
-
-#import <objc/runtime.h>
-
-#import "GPBTestUtilities.h"
-
-#import "GPBDescriptor.h"
-#import "GPBDescriptor_PackagePrivate.h"
-#import "GPBMessage.h"
-#import "GPBUnknownField_PackagePrivate.h"
-
-#import "google/protobuf/MapUnittest.pbobjc.h"
-#import "google/protobuf/Unittest.pbobjc.h"
-#import "google/protobuf/UnittestObjc.pbobjc.h"
-
-@interface UtilitiesTests : GPBTestCase
-@end
-
-@implementation UtilitiesTests
-
-- (void)testRightShiftFunctions {
-  XCTAssertEqual((1UL << 31) >> 31, 1UL);
-  XCTAssertEqual((int32_t)(1U << 31) >> 31, -1);
-  XCTAssertEqual((1ULL << 63) >> 63, 1ULL);
-  XCTAssertEqual((int64_t)(1ULL << 63) >> 63, -1LL);
-
-  XCTAssertEqual(GPBLogicalRightShift32((1U << 31), 31), 1);
-  XCTAssertEqual(GPBLogicalRightShift64((1ULL << 63), 63), 1LL);
-}
-
-- (void)testGPBDecodeTextFormatName {
-  uint8_t decodeData[] = {
-    0x6,
-    // An inlined string (first to make sure the leading null is handled
-    // correctly, and with a key of zero to check that).
-    0x0, 0x0, 'z', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'I', 'J', 0x0,
-    // All as is (00 op)
-    0x1, 0x0A, 0x0,
-    // Underscore, upper + 9 (10 op)
-    0x3, 0xCA, 0x0,
-    //  Upper + 3 (10 op), underscore, upper + 5 (10 op)
-    0x2, 0x44, 0xC6, 0x0,
-    // All Upper for 4 (11 op), underscore, underscore, upper + 5 (10 op),
-    // underscore, lower + 0 (01 op)
-    0x4, 0x64, 0x80, 0xC5, 0xA1, 0x0,
-    // 2 byte key: as is + 3 (00 op), underscore, lower + 4 (01 op),
-    //   underscore, lower + 3 (01 op), underscore, lower + 1 (01 op),
-    //   underscore, lower + 30 (01 op), as is + 30 (00 op), as is + 13 (00 op),
-    //   underscore, as is + 3 (00 op)
-    0xE8, 0x07, 0x04, 0xA5, 0xA4, 0xA2, 0xBF, 0x1F, 0x0E, 0x84, 0x0,
-  };
-  NSString *inputStr = @"abcdefghIJ";
-
-  // Empty inputs
-
-  XCTAssertNil(GPBDecodeTextFormatName(nil, 1, NULL));
-  XCTAssertNil(GPBDecodeTextFormatName(decodeData, 1, NULL));
-  XCTAssertNil(GPBDecodeTextFormatName(nil, 1, inputStr));
-
-  // Keys not found.
-
-  XCTAssertNil(GPBDecodeTextFormatName(decodeData, 5, inputStr));
-  XCTAssertNil(GPBDecodeTextFormatName(decodeData, -1, inputStr));
-
-  // Some name decodes.
-
-  XCTAssertEqualObjects(GPBDecodeTextFormatName(decodeData, 1, inputStr), @"abcdefghIJ");
-  XCTAssertEqualObjects(GPBDecodeTextFormatName(decodeData, 2, inputStr), @"Abcd_EfghIJ");
-  XCTAssertEqualObjects(GPBDecodeTextFormatName(decodeData, 3, inputStr), @"_AbcdefghIJ");
-  XCTAssertEqualObjects(GPBDecodeTextFormatName(decodeData, 4, inputStr), @"ABCD__EfghI_j");
-
-  // An inlined string (and key of zero).
-  XCTAssertEqualObjects(GPBDecodeTextFormatName(decodeData, 0, inputStr), @"zbcdefghIJ");
-
-  // Long name so multiple decode ops are needed.
-  inputStr = @"longFieldNameIsLooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong1000";
-  XCTAssertEqualObjects(GPBDecodeTextFormatName(decodeData, 1000, inputStr),
-                        @"long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_1000");
-}
-
-- (void)testTextFormat {
-  TestAllTypes *message = [TestAllTypes message];
-
-  // Not kGPBDefaultRepeatCount because we are comparing to golden master file
-  // which was generated with 2.
-  [self setAllFields:message repeatedCount:2];
-
-  NSString *result = GPBTextFormatForMessage(message, nil);
-
-  NSString *fileName = @"text_format_unittest_data.txt";
-  NSData *resultData = [result dataUsingEncoding:NSUTF8StringEncoding];
-  NSData *expectedData =
-      [self getDataFileNamed:fileName dataToWrite:resultData];
-  NSString *expected = [[NSString alloc] initWithData:expectedData
-                                             encoding:NSUTF8StringEncoding];
-  XCTAssertEqualObjects(expected, result);
-  [expected release];
-}
-
-- (void)testTextFormatExtra {
-  // -testTextFormat uses all protos with fields that don't require special
-  // handing for figuring out the names.  The ObjC proto has a bunch of oddball
-  // field and enum names that require the decode info to get right, so this
-  // confirms they generated and decoded correctly.
-
-  self_Class *message = [self_Class message];
-  message.cmd = YES;
-  message.isProxy_p = YES;
-  message.subEnum = self_autorelease_RetainCount;
-  message.new_p.copy_p = @"foo";
-
-  NSString *expected = @"_cmd: true\n"
-                       @"isProxy: true\n"
-                       @"SubEnum: retainCount\n"
-                       @"New {\n"
-                       @"  copy: \"foo\"\n"
-                       @"}\n";
-  NSString *result = GPBTextFormatForMessage(message, nil);
-  XCTAssertEqualObjects(expected, result);
-}
-
-- (void)testTextFormatMaps {
-  TestMap *message = [TestMap message];
-
-  // Map iteration order doesn't have to be stable, so use only one entry.
-  [self setAllMapFields:message numEntries:1];
-
-  NSString *result = GPBTextFormatForMessage(message, nil);
-
-  NSString *fileName = @"text_format_map_unittest_data.txt";
-  NSData *resultData = [result dataUsingEncoding:NSUTF8StringEncoding];
-  NSData *expectedData =
-      [self getDataFileNamed:fileName dataToWrite:resultData];
-  NSString *expected = [[NSString alloc] initWithData:expectedData
-                                             encoding:NSUTF8StringEncoding];
-  XCTAssertEqualObjects(expected, result);
-  [expected release];
-}
-
-- (void)testTextFormatExtensions {
-  TestAllExtensions *message = [TestAllExtensions message];
-
-  // Not kGPBDefaultRepeatCount because we are comparing to golden master file
-  // which was generated with 2.
-  [self setAllExtensions:message repeatedCount:2];
-
-  NSString *result = GPBTextFormatForMessage(message, nil);
-
-  // NOTE: ObjC TextFormat doesn't have the proper extension names so it
-  // uses comments for the ObjC name and raw numbers for the fields instead
-  // of the bracketed extension name.
-  NSString *fileName = @"text_format_extensions_unittest_data.txt";
-  NSData *resultData = [result dataUsingEncoding:NSUTF8StringEncoding];
-  NSData *expectedData =
-      [self getDataFileNamed:fileName dataToWrite:resultData];
-  NSString *expected = [[NSString alloc] initWithData:expectedData
-                                             encoding:NSUTF8StringEncoding];
-  XCTAssertEqualObjects(expected, result);
-  [expected release];
-}
-
-- (void)testSetRepeatedFields {
-  TestAllTypes *message = [TestAllTypes message];
-
-  NSDictionary *repeatedFieldValues = @{
-    @"repeatedStringArray" : [@[@"foo", @"bar"] mutableCopy],
-    @"repeatedBoolArray" : [GPBBoolArray arrayWithValue:YES],
-    @"repeatedInt32Array" : [GPBInt32Array arrayWithValue:14],
-    @"repeatedInt64Array" : [GPBInt64Array arrayWithValue:15],
-    @"repeatedUint32Array" : [GPBUInt32Array arrayWithValue:16],
-    @"repeatedUint64Array" : [GPBUInt64Array arrayWithValue:16],
-    @"repeatedFloatArray" : [GPBFloatArray arrayWithValue:16],
-    @"repeatedDoubleArray" : [GPBDoubleArray arrayWithValue:16],
-    @"repeatedNestedEnumArray" :
-        [GPBEnumArray arrayWithValidationFunction:TestAllTypes_NestedEnum_IsValidValue
-                                         rawValue:TestAllTypes_NestedEnum_Foo],
-  };
-  for (NSString *fieldName in repeatedFieldValues) {
-    GPBFieldDescriptor *field =
-        [message.descriptor fieldWithName:fieldName];
-    XCTAssertNotNil(field, @"No field with name: %@", fieldName);
-    id expectedValues = repeatedFieldValues[fieldName];
-    GPBSetMessageRepeatedField(message, field, expectedValues);
-    XCTAssertEqualObjects(expectedValues,
-                          [message valueForKeyPath:fieldName]);
-  }
-}
-
-// Helper to make an unknown field set with something in it.
-static GPBUnknownFieldSet *UnknownFieldsSetHelper(int num) {
-  GPBUnknownFieldSet *result =
-      [[[GPBUnknownFieldSet alloc] init] autorelease];
-
-  GPBUnknownField *field =
-      [[[GPBUnknownField alloc] initWithNumber:num] autorelease];
-  [field addVarint:num];
-  [result addField:field];
-
-  return result;
-}
-
-- (void)testDropMessageUnknownFieldsRecursively {
-  TestAllExtensions *message = [TestAllExtensions message];
-
-  // Give it unknownFields.
-  message.unknownFields = UnknownFieldsSetHelper(777);
-
-  // Given it extensions that include a message with unknown fields of its own.
-  {
-    // Int
-    [message setExtension:[UnittestRoot optionalInt32Extension] value:@5];
-
-    // Group
-    OptionalGroup_extension *optionalGroup = [OptionalGroup_extension message];
-    optionalGroup.a = 123;
-    optionalGroup.unknownFields = UnknownFieldsSetHelper(779);
-    [message setExtension:[UnittestRoot optionalGroupExtension]
-                    value:optionalGroup];
-
-    // Message
-    TestAllTypes_NestedMessage *nestedMessage =
-        [TestAllTypes_NestedMessage message];
-    nestedMessage.bb = 456;
-    nestedMessage.unknownFields = UnknownFieldsSetHelper(778);
-    [message setExtension:[UnittestRoot optionalNestedMessageExtension]
-                    value:nestedMessage];
-
-    // Repeated Group
-    RepeatedGroup_extension *repeatedGroup =
-      [[RepeatedGroup_extension alloc] init];
-    repeatedGroup.a = 567;
-    repeatedGroup.unknownFields = UnknownFieldsSetHelper(780);
-    [message addExtension:[UnittestRoot repeatedGroupExtension]
-                    value:repeatedGroup];
-    [repeatedGroup release];
-
-    // Repeated Message
-    nestedMessage = [[TestAllTypes_NestedMessage alloc] init];
-    nestedMessage.bb = 678;
-    nestedMessage.unknownFields = UnknownFieldsSetHelper(781);
-    [message addExtension:[UnittestRoot repeatedNestedMessageExtension]
-                    value:nestedMessage];
-    [nestedMessage release];
-  }
-
-  // Confirm everything is there.
-
-  XCTAssertNotNil(message);
-  XCTAssertNotNil(message.unknownFields);
-  XCTAssertTrue([message hasExtension:[UnittestRoot optionalInt32Extension]]);
-
-  {
-    XCTAssertTrue([message hasExtension:[UnittestRoot optionalGroupExtension]]);
-    OptionalGroup_extension *optionalGroup =
-        [message getExtension:[UnittestRoot optionalGroupExtension]];
-    XCTAssertNotNil(optionalGroup);
-    XCTAssertEqual(optionalGroup.a, 123);
-    XCTAssertNotNil(optionalGroup.unknownFields);
-  }
-
-  {
-    XCTAssertTrue([message hasExtension:[UnittestRoot optionalNestedMessageExtension]]);
-    TestAllTypes_NestedMessage *nestedMessage =
-        [message getExtension:[UnittestRoot optionalNestedMessageExtension]];
-    XCTAssertNotNil(nestedMessage);
-    XCTAssertEqual(nestedMessage.bb, 456);
-    XCTAssertNotNil(nestedMessage.unknownFields);
-  }
-
-  {
-    XCTAssertTrue([message hasExtension:[UnittestRoot repeatedGroupExtension]]);
-    NSArray *repeatedGroups = [message getExtension:[UnittestRoot repeatedGroupExtension]];
-    XCTAssertEqual(repeatedGroups.count, (NSUInteger)1);
-    RepeatedGroup_extension *repeatedGroup = repeatedGroups.firstObject;
-    XCTAssertNotNil(repeatedGroup);
-    XCTAssertEqual(repeatedGroup.a, 567);
-    XCTAssertNotNil(repeatedGroup.unknownFields);
-  }
-
-  {
-    XCTAssertTrue([message hasExtension:[UnittestRoot repeatedNestedMessageExtension]]);
-    NSArray *repeatedNestedMessages = [message getExtension:[UnittestRoot repeatedNestedMessageExtension]];
-    XCTAssertEqual(repeatedNestedMessages.count, (NSUInteger)1);
-    TestAllTypes_NestedMessage *repeatedNestedMessage = repeatedNestedMessages.firstObject;
-    XCTAssertNotNil(repeatedNestedMessage);
-    XCTAssertEqual(repeatedNestedMessage.bb, 678);
-    XCTAssertNotNil(repeatedNestedMessage.unknownFields);
-  }
-
-  // Drop them.
-  GPBMessageDropUnknownFieldsRecursively(message);
-
-  // Confirm unknowns are gone from within the messages.
-
-  XCTAssertNotNil(message);
-  XCTAssertNil(message.unknownFields);
-  XCTAssertTrue([message hasExtension:[UnittestRoot optionalInt32Extension]]);
-
-  {
-    XCTAssertTrue([message hasExtension:[UnittestRoot optionalGroupExtension]]);
-    OptionalGroup_extension *optionalGroup =
-        [message getExtension:[UnittestRoot optionalGroupExtension]];
-    XCTAssertNotNil(optionalGroup);
-    XCTAssertEqual(optionalGroup.a, 123);
-    XCTAssertNil(optionalGroup.unknownFields);
-  }
-
-  {
-    XCTAssertTrue([message hasExtension:[UnittestRoot optionalNestedMessageExtension]]);
-    TestAllTypes_NestedMessage *nestedMessage =
-        [message getExtension:[UnittestRoot optionalNestedMessageExtension]];
-    XCTAssertNotNil(nestedMessage);
-    XCTAssertEqual(nestedMessage.bb, 456);
-    XCTAssertNil(nestedMessage.unknownFields);
-  }
-
-  {
-    XCTAssertTrue([message hasExtension:[UnittestRoot repeatedGroupExtension]]);
-    NSArray *repeatedGroups = [message getExtension:[UnittestRoot repeatedGroupExtension]];
-    XCTAssertEqual(repeatedGroups.count, (NSUInteger)1);
-    RepeatedGroup_extension *repeatedGroup = repeatedGroups.firstObject;
-    XCTAssertNotNil(repeatedGroup);
-    XCTAssertEqual(repeatedGroup.a, 567);
-    XCTAssertNil(repeatedGroup.unknownFields);
-  }
-
-  {
-    XCTAssertTrue([message hasExtension:[UnittestRoot repeatedNestedMessageExtension]]);
-    NSArray *repeatedNestedMessages = [message getExtension:[UnittestRoot repeatedNestedMessageExtension]];
-    XCTAssertEqual(repeatedNestedMessages.count, (NSUInteger)1);
-    TestAllTypes_NestedMessage *repeatedNestedMessage = repeatedNestedMessages.firstObject;
-    XCTAssertNotNil(repeatedNestedMessage);
-    XCTAssertEqual(repeatedNestedMessage.bb, 678);
-    XCTAssertNil(repeatedNestedMessage.unknownFields);
-  }
-
-}
-
-- (void)testDropMessageUnknownFieldsRecursively_Maps {
-  TestMap *message = [TestMap message];
-
-  {
-    ForeignMessage *foreignMessage = [ForeignMessage message];
-    foreignMessage.unknownFields = UnknownFieldsSetHelper(100);
-    [message.mapInt32ForeignMessage setObject:foreignMessage forKey:100];
-
-    foreignMessage = [ForeignMessage message];
-    foreignMessage.unknownFields = UnknownFieldsSetHelper(101);
-    [message.mapStringForeignMessage setObject:foreignMessage forKey:@"101"];
-  }
-
-  // Confirm everything is there.
-
-  XCTAssertNotNil(message);
-
-  {
-    ForeignMessage *foreignMessage = [message.mapInt32ForeignMessage objectForKey:100];
-    XCTAssertNotNil(foreignMessage);
-    XCTAssertNotNil(foreignMessage.unknownFields);
-  }
-
-  {
-    ForeignMessage *foreignMessage = [message.mapStringForeignMessage objectForKey:@"101"];
-    XCTAssertNotNil(foreignMessage);
-    XCTAssertNotNil(foreignMessage.unknownFields);
-  }
-
-  GPBMessageDropUnknownFieldsRecursively(message);
-
-  // Confirm unknowns are gone from within the messages.
-
-  XCTAssertNotNil(message);
-
-  {
-    ForeignMessage *foreignMessage = [message.mapInt32ForeignMessage objectForKey:100];
-    XCTAssertNotNil(foreignMessage);
-    XCTAssertNil(foreignMessage.unknownFields);
-  }
-
-  {
-    ForeignMessage *foreignMessage = [message.mapStringForeignMessage objectForKey:@"101"];
-    XCTAssertNotNil(foreignMessage);
-    XCTAssertNil(foreignMessage.unknownFields);
-  }
-
-}
-
-@end
diff --git a/libs/protobuf/objectivec/Tests/GPBWellKnownTypesTest.m b/libs/protobuf/objectivec/Tests/GPBWellKnownTypesTest.m
deleted file mode 100644
index 592d5af..0000000
--- a/libs/protobuf/objectivec/Tests/GPBWellKnownTypesTest.m
+++ /dev/null
@@ -1,214 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#import "GPBWellKnownTypes.h"
-
-#import <XCTest/XCTest.h>
-
-#import "GPBTestUtilities.h"
-#import "google/protobuf/AnyTest.pbobjc.h"
-
-// Nanosecond time accuracy
-static const NSTimeInterval kTimeAccuracy = 1e-9;
-
-@interface WellKnownTypesTest : XCTestCase
-@end
-
-@implementation WellKnownTypesTest
-
-- (void)testTimeStamp {
-  // Test negative and positive values.
-  NSTimeInterval values[] = {
-      -428027599.483999967, -1234567.0, -0.5, 0, 0.75, 54321.0, 2468086,483999967
-  };
-  for (size_t i = 0; i < GPBARRAYSIZE(values); ++i) {
-    NSTimeInterval value = values[i];
-
-    // Test Creation - date.
-    NSDate *date = [NSDate dateWithTimeIntervalSince1970:value];
-    GPBTimestamp *timeStamp = [[GPBTimestamp alloc] initWithDate:date];
-
-    XCTAssertGreaterThanOrEqual(timeStamp.nanos, 0,
-                                @"Offset %f - Date: %@", (double)value, date);
-    XCTAssertLessThan(timeStamp.nanos, 1e9,
-                      @"Offset %f - Date: %@", (double)value, date);
-
-    // Comparing timeIntervals instead of directly comparing dates because date
-    // equality requires the time intervals to be exactly the same, and the
-    // timeintervals go through a bit of floating point error as they are
-    // converted back and forth from the internal representation.
-    XCTAssertEqualWithAccuracy(value, timeStamp.date.timeIntervalSince1970,
-                               kTimeAccuracy,
-                               @"Offset %f - Date: %@", (double)value, date);
-    [timeStamp release];
-
-    // Test Creation - timeIntervalSince1970.
-    timeStamp = [[GPBTimestamp alloc] initWithTimeIntervalSince1970:value];
-
-    XCTAssertGreaterThanOrEqual(timeStamp.nanos, 0,
-                                @"Offset %f - Date: %@", (double)value, date);
-    XCTAssertLessThan(timeStamp.nanos, 1e9,
-                      @"Offset %f - Date: %@", (double)value, date);
-
-    XCTAssertEqualWithAccuracy(value, timeStamp.timeIntervalSince1970,
-                               kTimeAccuracy,
-                               @"Offset %f - Date: %@", (double)value, date);
-    [timeStamp release];
-
-    // Test Mutation - date.
-    timeStamp = [[GPBTimestamp alloc] init];
-    timeStamp.date = date;
-
-    XCTAssertGreaterThanOrEqual(timeStamp.nanos, 0,
-                                @"Offset %f - Date: %@", (double)value, date);
-    XCTAssertLessThan(timeStamp.nanos, 1e9,
-                      @"Offset %f - Date: %@", (double)value, date);
-
-    XCTAssertEqualWithAccuracy(value, timeStamp.date.timeIntervalSince1970,
-                               kTimeAccuracy,
-                               @"Offset %f - Date: %@", (double)value, date);
-    [timeStamp release];
-
-    // Test Mutation - timeIntervalSince1970.
-    timeStamp = [[GPBTimestamp alloc] init];
-    timeStamp.timeIntervalSince1970 = value;
-
-    XCTAssertGreaterThanOrEqual(timeStamp.nanos, 0,
-                                @"Offset %f - Date: %@", (double)value, date);
-    XCTAssertLessThan(timeStamp.nanos, 1e9,
-                      @"Offset %f - Date: %@", (double)value, date);
-
-    XCTAssertEqualWithAccuracy(value, timeStamp.date.timeIntervalSince1970,
-                               kTimeAccuracy,
-                               @"Offset %f - Date: %@", (double)value, date);
-
-    [timeStamp release];
-  }
-}
-
-- (void)testDuration {
-  // Test negative and positive values.
-  NSTimeInterval values[] = { -1000.0001, -500.0, -0.5, 0, 0.75, 1000.0, 2000.0002 };
-  for (size_t i = 0; i < GPBARRAYSIZE(values); ++i) {
-    NSTimeInterval value = values[i];
-
-    // Test Creation.
-    GPBDuration *duration =
-        [[GPBDuration alloc] initWithTimeInterval:value];
-    XCTAssertEqualWithAccuracy(value, duration.timeInterval, kTimeAccuracy,
-                               @"For interval %f", (double)value);
-    if (value > 0) {
-      XCTAssertGreaterThanOrEqual(duration.seconds, 0,
-                                  @"For interval %f", (double)value);
-      XCTAssertGreaterThanOrEqual(duration.nanos, 0,
-                                  @"For interval %f", (double)value);
-    } else {
-      XCTAssertLessThanOrEqual(duration.seconds, 0,
-                               @"For interval %f", (double)value);
-      XCTAssertLessThanOrEqual(duration.nanos, 0,
-                               @"For interval %f", (double)value);
-    }
-    [duration release];
-
-    // Test Mutation.
-    duration = [[GPBDuration alloc] init];
-    duration.timeInterval = value;
-    XCTAssertEqualWithAccuracy(value, duration.timeInterval, kTimeAccuracy,
-                               @"For interval %f", (double)value);
-    if (value > 0) {
-      XCTAssertGreaterThanOrEqual(duration.seconds, 0,
-                                  @"For interval %f", (double)value);
-      XCTAssertGreaterThanOrEqual(duration.nanos, 0,
-                                  @"For interval %f", (double)value);
-    } else {
-      XCTAssertLessThanOrEqual(duration.seconds, 0,
-                               @"For interval %f", (double)value);
-      XCTAssertLessThanOrEqual(duration.nanos, 0,
-                               @"For interval %f", (double)value);
-    }
-    [duration release];
-  }
-}
-
-- (void)testAnyHelpers {
-
-  // Set and extract covers most of the code.
-
-  TestAny *subMessage = [TestAny message];
-  subMessage.int32Value = 12345;
-  TestAny *message = [TestAny message];
-  NSError *err = nil;
-  message.anyValue = [GPBAny anyWithMessage:subMessage error:&err];
-  XCTAssertNil(err);
-
-  NSData *data = message.data;
-  XCTAssertNotNil(data);
-
-  TestAny *message2 = [TestAny parseFromData:data error:&err];
-  XCTAssertNil(err);
-  XCTAssertNotNil(message2);
-  XCTAssertTrue(message2.hasAnyValue);
-
-  TestAny *subMessage2 =
-      (TestAny *)[message.anyValue unpackMessageClass:[TestAny class]
-                                                error:&err];
-  XCTAssertNil(err);
-  XCTAssertNotNil(subMessage2);
-  XCTAssertEqual(subMessage2.int32Value, 12345);
-
-  // NULL errorPtr in the two calls.
-
-  message.anyValue = [GPBAny anyWithMessage:subMessage error:NULL];
-  NSData *data2 = message.data;
-  XCTAssertEqualObjects(data2, data);
-
-  TestAny *subMessage3 =
-      (TestAny *)[message.anyValue unpackMessageClass:[TestAny class]
-                                                error:NULL];
-  XCTAssertNotNil(subMessage3);
-  XCTAssertEqualObjects(subMessage2, subMessage3);
-
-  // Try to extract wrong type.
-
-  GPBTimestamp *wrongMessage =
-      (GPBTimestamp *)[message.anyValue unpackMessageClass:[GPBTimestamp class]
-                                                     error:&err];
-  XCTAssertNotNil(err);
-  XCTAssertNil(wrongMessage);
-  XCTAssertEqualObjects(err.domain, GPBWellKnownTypesErrorDomain);
-  XCTAssertEqual(err.code, GPBWellKnownTypesErrorCodeTypeURLMismatch);
-
-  wrongMessage =
-      (GPBTimestamp *)[message.anyValue unpackMessageClass:[GPBTimestamp class]
-                                                     error:NULL];
-  XCTAssertNil(wrongMessage);
-}
-
-@end
diff --git a/libs/protobuf/objectivec/Tests/GPBWireFormatTests.m b/libs/protobuf/objectivec/Tests/GPBWireFormatTests.m
deleted file mode 100644
index dbeab21..0000000
--- a/libs/protobuf/objectivec/Tests/GPBWireFormatTests.m
+++ /dev/null
@@ -1,258 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#import "GPBTestUtilities.h"
-
-#import "GPBCodedInputStream.h"
-#import "GPBMessage_PackagePrivate.h"
-#import "GPBUnknownField_PackagePrivate.h"
-#import "google/protobuf/Unittest.pbobjc.h"
-#import "google/protobuf/UnittestMset.pbobjc.h"
-#import "google/protobuf/UnittestMsetWireFormat.pbobjc.h"
-
-@interface WireFormatTests : GPBTestCase
-@end
-
-@implementation WireFormatTests
-
-- (void)testSerialization {
-  TestAllTypes* message = [self allSetRepeatedCount:kGPBDefaultRepeatCount];
-
-  NSData* rawBytes = message.data;
-  [self assertFieldsInOrder:rawBytes];
-  XCTAssertEqual(message.serializedSize, (size_t)rawBytes.length);
-
-  TestAllTypes* message2 = [TestAllTypes parseFromData:rawBytes error:NULL];
-
-  [self assertAllFieldsSet:message2 repeatedCount:kGPBDefaultRepeatCount];
-}
-
-- (void)testSerializationPacked {
-  TestPackedTypes* message =
-      [self packedSetRepeatedCount:kGPBDefaultRepeatCount];
-
-  NSData* rawBytes = message.data;
-  [self assertFieldsInOrder:rawBytes];
-  XCTAssertEqual(message.serializedSize, (size_t)rawBytes.length);
-
-  TestPackedTypes* message2 =
-      [TestPackedTypes parseFromData:rawBytes error:NULL];
-
-  [self assertPackedFieldsSet:message2 repeatedCount:kGPBDefaultRepeatCount];
-}
-
-- (void)testSerializeExtensions {
-  // TestAllTypes and TestAllExtensions should have compatible wire formats,
-  // so if we serealize a TestAllExtensions then parse it as TestAllTypes
-  // it should work.
-
-  TestAllExtensions* message =
-      [self allExtensionsSetRepeatedCount:kGPBDefaultRepeatCount];
-  NSData* rawBytes = message.data;
-  [self assertFieldsInOrder:rawBytes];
-  XCTAssertEqual(message.serializedSize, (size_t)rawBytes.length);
-
-  TestAllTypes* message2 = [TestAllTypes parseFromData:rawBytes error:NULL];
-
-  [self assertAllFieldsSet:message2 repeatedCount:kGPBDefaultRepeatCount];
-}
-
-- (void)testSerializePackedExtensions {
-  // TestPackedTypes and TestPackedExtensions should have compatible wire
-  // formats; check that they serialize to the same string.
-  TestPackedExtensions* message =
-      [self packedExtensionsSetRepeatedCount:kGPBDefaultRepeatCount];
-  NSData* rawBytes = message.data;
-  [self assertFieldsInOrder:rawBytes];
-
-  TestPackedTypes* message2 =
-      [self packedSetRepeatedCount:kGPBDefaultRepeatCount];
-  NSData* rawBytes2 = message2.data;
-
-  XCTAssertEqualObjects(rawBytes, rawBytes2);
-}
-
-- (void)testParseExtensions {
-  // TestAllTypes and TestAllExtensions should have compatible wire formats,
-  // so if we serialize a TestAllTypes then parse it as TestAllExtensions
-  // it should work.
-
-  TestAllTypes* message = [self allSetRepeatedCount:kGPBDefaultRepeatCount];
-  NSData* rawBytes = message.data;
-  [self assertFieldsInOrder:rawBytes];
-
-  GPBExtensionRegistry* registry = [self extensionRegistry];
-
-  TestAllExtensions* message2 = [TestAllExtensions parseFromData:rawBytes
-                                               extensionRegistry:registry
-                                                           error:NULL];
-
-  [self assertAllExtensionsSet:message2 repeatedCount:kGPBDefaultRepeatCount];
-}
-
-
-- (void)testExtensionsSerializedSize {
-  size_t allSet = [self allSetRepeatedCount:kGPBDefaultRepeatCount].serializedSize;
-  size_t extensionSet = [self allExtensionsSetRepeatedCount:kGPBDefaultRepeatCount].serializedSize;
-  XCTAssertEqual(allSet, extensionSet);
-}
-
-- (void)testParsePackedExtensions {
-  // Ensure that packed extensions can be properly parsed.
-  TestPackedExtensions* message =
-      [self packedExtensionsSetRepeatedCount:kGPBDefaultRepeatCount];
-  NSData* rawBytes = message.data;
-  [self assertFieldsInOrder:rawBytes];
-
-  GPBExtensionRegistry* registry = [self extensionRegistry];
-
-  TestPackedExtensions* message2 = [TestPackedExtensions parseFromData:rawBytes
-                                                     extensionRegistry:registry
-                                                                 error:NULL];
-
-  [self assertPackedExtensionsSet:message2
-                    repeatedCount:kGPBDefaultRepeatCount];
-}
-
-const int kUnknownTypeId = 1550055;
-
-- (void)testSerializeMessageSet {
-  // Set up a TestMessageSet with two known messages and an unknown one.
-  TestMessageSet* message_set = [TestMessageSet message];
-  [[message_set getExtension:[TestMessageSetExtension1 messageSetExtension]]
-      setI:123];
-  [[message_set getExtension:[TestMessageSetExtension2 messageSetExtension]]
-      setStr:@"foo"];
-  GPBUnknownField* unknownField =
-      [[[GPBUnknownField alloc] initWithNumber:kUnknownTypeId] autorelease];
-  [unknownField addLengthDelimited:[NSData dataWithBytes:"bar" length:3]];
-  GPBUnknownFieldSet* unknownFieldSet =
-      [[[GPBUnknownFieldSet alloc] init] autorelease];
-  [unknownFieldSet addField:unknownField];
-  [message_set setUnknownFields:unknownFieldSet];
-
-  NSData* data = [message_set data];
-
-  // Parse back using RawMessageSet and check the contents.
-  RawMessageSet* raw = [RawMessageSet parseFromData:data error:NULL];
-
-  XCTAssertEqual([raw.unknownFields countOfFields], (NSUInteger)0);
-
-  XCTAssertEqual(raw.itemArray.count, (NSUInteger)3);
-  XCTAssertEqual((uint32_t)[raw.itemArray[0] typeId],
-                 [TestMessageSetExtension1 messageSetExtension].fieldNumber);
-  XCTAssertEqual((uint32_t)[raw.itemArray[1] typeId],
-                 [TestMessageSetExtension2 messageSetExtension].fieldNumber);
-  XCTAssertEqual([raw.itemArray[2] typeId], kUnknownTypeId);
-
-  TestMessageSetExtension1* message1 =
-      [TestMessageSetExtension1 parseFromData:[((RawMessageSet_Item*)raw.itemArray[0]) message]
-                                        error:NULL];
-  XCTAssertEqual(message1.i, 123);
-
-  TestMessageSetExtension2* message2 =
-      [TestMessageSetExtension2 parseFromData:[((RawMessageSet_Item*)raw.itemArray[1]) message]
-                                        error:NULL];
-  XCTAssertEqualObjects(message2.str, @"foo");
-
-  XCTAssertEqualObjects([raw.itemArray[2] message],
-                        [NSData dataWithBytes:"bar" length:3]);
-}
-
-- (void)testParseMessageSet {
-  // Set up a RawMessageSet with two known messages and an unknown one.
-  RawMessageSet* raw = [RawMessageSet message];
-
-  {
-    RawMessageSet_Item* item = [RawMessageSet_Item message];
-    item.typeId = [TestMessageSetExtension1 messageSetExtension].fieldNumber;
-    TestMessageSetExtension1* message = [TestMessageSetExtension1 message];
-    message.i = 123;
-    item.message = [message data];
-    [raw.itemArray addObject:item];
-  }
-
-  {
-    RawMessageSet_Item* item = [RawMessageSet_Item message];
-    item.typeId = [TestMessageSetExtension2 messageSetExtension].fieldNumber;
-    TestMessageSetExtension2* message = [TestMessageSetExtension2 message];
-    message.str = @"foo";
-    item.message = [message data];
-    [raw.itemArray addObject:item];
-  }
-
-  {
-    RawMessageSet_Item* item = [RawMessageSet_Item message];
-    item.typeId = kUnknownTypeId;
-    item.message = [NSData dataWithBytes:"bar" length:3];
-    [raw.itemArray addObject:item];
-  }
-
-  NSData* data = [raw data];
-
-  // Parse as a TestMessageSet and check the contents.
-  TestMessageSet* messageSet =
-      [TestMessageSet parseFromData:data
-                  extensionRegistry:[UnittestMsetRoot extensionRegistry]
-                              error:NULL];
-
-  XCTAssertEqual(
-      [[messageSet
-          getExtension:[TestMessageSetExtension1 messageSetExtension]] i],
-      123);
-  XCTAssertEqualObjects(
-      [[messageSet
-          getExtension:[TestMessageSetExtension2 messageSetExtension]] str],
-      @"foo");
-
-  XCTAssertEqual([messageSet.unknownFields countOfFields], (NSUInteger)1);
-  GPBUnknownField* unknownField = [messageSet.unknownFields getField:kUnknownTypeId];
-  XCTAssertNotNil(unknownField);
-  XCTAssertEqual(unknownField.lengthDelimitedList.count, (NSUInteger)1);
-  XCTAssertEqualObjects(unknownField.lengthDelimitedList[0],
-                        [NSData dataWithBytes:"bar" length:3]);
-}
-
-- (void)assertFieldsInOrder:(NSData*)data {
-  GPBCodedInputStream* input = [GPBCodedInputStream streamWithData:data];
-  int32_t previousTag = 0;
-
-  while (YES) {
-    int32_t tag = [input readTag];
-    if (tag == 0) {
-      break;
-    }
-
-    XCTAssertGreaterThan(tag, previousTag);
-    [input skipField:tag];
-  }
-}
-
-@end
diff --git a/libs/protobuf/objectivec/Tests/UnitTests-Bridging-Header.h b/libs/protobuf/objectivec/Tests/UnitTests-Bridging-Header.h
deleted file mode 100644
index 46292fc..0000000
--- a/libs/protobuf/objectivec/Tests/UnitTests-Bridging-Header.h
+++ /dev/null
@@ -1,6 +0,0 @@
-//
-//  Use this file to import your target's public headers that you would like to expose to Swift.
-//
-
-#import "google/protobuf/UnittestRuntimeProto2.pbobjc.h"
-#import "google/protobuf/UnittestRuntimeProto3.pbobjc.h"
diff --git a/libs/protobuf/objectivec/Tests/UnitTests-Info.plist b/libs/protobuf/objectivec/Tests/UnitTests-Info.plist
deleted file mode 100644
index 460a7d9..0000000
--- a/libs/protobuf/objectivec/Tests/UnitTests-Info.plist
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>English</string>
-	<key>CFBundleExecutable</key>
-	<string>${EXECUTABLE_NAME}</string>
-	<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundlePackageType</key>
-	<string>BNDL</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>1.0</string>
-</dict>
-</plist>
diff --git a/libs/protobuf/objectivec/Tests/golden_message b/libs/protobuf/objectivec/Tests/golden_message
deleted file mode 100644
index 7bceab4..0000000
Binary files a/libs/protobuf/objectivec/Tests/golden_message and /dev/null differ
diff --git a/libs/protobuf/objectivec/Tests/golden_packed_fields_message b/libs/protobuf/objectivec/Tests/golden_packed_fields_message
deleted file mode 100644
index 7bceab4..0000000
Binary files a/libs/protobuf/objectivec/Tests/golden_packed_fields_message and /dev/null differ
diff --git a/libs/protobuf/objectivec/Tests/text_format_extensions_unittest_data.txt b/libs/protobuf/objectivec/Tests/text_format_extensions_unittest_data.txt
deleted file mode 100644
index d520545..0000000
--- a/libs/protobuf/objectivec/Tests/text_format_extensions_unittest_data.txt
+++ /dev/null
@@ -1,140 +0,0 @@
-1: 101  # [UnittestRoot_optionalInt32Extension]
-2: 102  # [UnittestRoot_optionalInt64Extension]
-3: 103  # [UnittestRoot_optionalUint32Extension]
-4: 104  # [UnittestRoot_optionalUint64Extension]
-5: 105  # [UnittestRoot_optionalSint32Extension]
-6: 106  # [UnittestRoot_optionalSint64Extension]
-7: 107  # [UnittestRoot_optionalFixed32Extension]
-8: 108  # [UnittestRoot_optionalFixed64Extension]
-9: 109  # [UnittestRoot_optionalSfixed32Extension]
-10: 110  # [UnittestRoot_optionalSfixed64Extension]
-11: 111  # [UnittestRoot_optionalFloatExtension]
-12: 112  # [UnittestRoot_optionalDoubleExtension]
-13: true  # [UnittestRoot_optionalBoolExtension]
-14: "115"  # [UnittestRoot_optionalStringExtension]
-15: "\001\000\002\003\000\005"  # [UnittestRoot_optionalBytesExtension]
-16 {  # [UnittestRoot_optionalGroupExtension]
-  a: 117
-}
-18 {  # [UnittestRoot_optionalNestedMessageExtension]
-  bb: 118
-}
-19 {  # [UnittestRoot_optionalForeignMessageExtension]
-  c: 119
-}
-20 {  # [UnittestRoot_optionalImportMessageExtension]
-  d: 120
-}
-21: 3  # [UnittestRoot_optionalNestedEnumExtension]
-22: 6  # [UnittestRoot_optionalForeignEnumExtension]
-23: 9  # [UnittestRoot_optionalImportEnumExtension]
-24: "124"  # [UnittestRoot_optionalStringPieceExtension]
-25: "125"  # [UnittestRoot_optionalCordExtension]
-# [UnittestRoot_repeatedInt32Extension]
-31: 201
-31: 301
-# [UnittestRoot_repeatedInt64Extension]
-32: 202
-32: 302
-# [UnittestRoot_repeatedUint32Extension]
-33: 203
-33: 303
-# [UnittestRoot_repeatedUint64Extension]
-34: 204
-34: 304
-# [UnittestRoot_repeatedSint32Extension]
-35: 205
-35: 305
-# [UnittestRoot_repeatedSint64Extension]
-36: 206
-36: 306
-# [UnittestRoot_repeatedFixed32Extension]
-37: 207
-37: 307
-# [UnittestRoot_repeatedFixed64Extension]
-38: 208
-38: 308
-# [UnittestRoot_repeatedSfixed32Extension]
-39: 209
-39: 309
-# [UnittestRoot_repeatedSfixed64Extension]
-40: 210
-40: 310
-# [UnittestRoot_repeatedFloatExtension]
-41: 211
-41: 311
-# [UnittestRoot_repeatedDoubleExtension]
-42: 212
-42: 312
-# [UnittestRoot_repeatedBoolExtension]
-43: false
-43: true
-# [UnittestRoot_repeatedStringExtension]
-44: "215"
-44: "315"
-# [UnittestRoot_repeatedBytesExtension]
-45: "\330\000\000\000"
-45: "<\001\000\000"
-# [UnittestRoot_repeatedGroupExtension]
-46 {
-  a: 217
-}
-46 {
-  a: 317
-}
-# [UnittestRoot_repeatedNestedMessageExtension]
-48 {
-  bb: 218
-}
-48 {
-  bb: 318
-}
-# [UnittestRoot_repeatedForeignMessageExtension]
-49 {
-  c: 219
-}
-49 {
-  c: 319
-}
-# [UnittestRoot_repeatedImportMessageExtension]
-50 {
-  d: 220
-}
-50 {
-  d: 320
-}
-# [UnittestRoot_repeatedNestedEnumExtension]
-51: 3
-51: 2
-# [UnittestRoot_repeatedForeignEnumExtension]
-52: 6
-52: 5
-# [UnittestRoot_repeatedImportEnumExtension]
-53: 9
-53: 8
-# [UnittestRoot_repeatedStringPieceExtension]
-54: "224"
-54: "324"
-# [UnittestRoot_repeatedCordExtension]
-55: "225"
-55: "325"
-61: 401  # [UnittestRoot_defaultInt32Extension]
-62: 402  # [UnittestRoot_defaultInt64Extension]
-63: 403  # [UnittestRoot_defaultUint32Extension]
-64: 404  # [UnittestRoot_defaultUint64Extension]
-65: 405  # [UnittestRoot_defaultSint32Extension]
-66: 406  # [UnittestRoot_defaultSint64Extension]
-67: 407  # [UnittestRoot_defaultFixed32Extension]
-68: 408  # [UnittestRoot_defaultFixed64Extension]
-69: 409  # [UnittestRoot_defaultSfixed32Extension]
-70: 410  # [UnittestRoot_defaultSfixed64Extension]
-71: 411  # [UnittestRoot_defaultFloatExtension]
-72: 412  # [UnittestRoot_defaultDoubleExtension]
-73: false  # [UnittestRoot_defaultBoolExtension]
-74: "415"  # [UnittestRoot_defaultStringExtension]
-75: "\240\001\000\000"  # [UnittestRoot_defaultBytesExtension]
-81: 1  # [UnittestRoot_defaultNestedEnumExtension]
-82: 4  # [UnittestRoot_defaultForeignEnumExtension]
-83: 7  # [UnittestRoot_defaultImportEnumExtension]
-84: "424"  # [UnittestRoot_defaultStringPieceExtension]
-85: "425"  # [UnittestRoot_defaultCordExtension]
diff --git a/libs/protobuf/objectivec/Tests/text_format_map_unittest_data.txt b/libs/protobuf/objectivec/Tests/text_format_map_unittest_data.txt
deleted file mode 100644
index ad1195e..0000000
--- a/libs/protobuf/objectivec/Tests/text_format_map_unittest_data.txt
+++ /dev/null
@@ -1,70 +0,0 @@
-map_int32_int32 {
-  key: 100
-  value: 1
-}
-map_int64_int64 {
-  key: 101
-  value: 1
-}
-map_uint32_uint32 {
-  key: 102
-  value: 1
-}
-map_uint64_uint64 {
-  key: 103
-  value: 1
-}
-map_sint32_sint32 {
-  key: 104
-  value: 1
-}
-map_sint64_sint64 {
-  key: 105
-  value: 1
-}
-map_fixed32_fixed32 {
-  key: 106
-  value: 1
-}
-map_fixed64_fixed64 {
-  key: 107
-  value: 1
-}
-map_sfixed32_sfixed32 {
-  key: 108
-  value: 1
-}
-map_sfixed64_sfixed64 {
-  key: 109
-  value: 1
-}
-map_int32_float {
-  key: 110
-  value: 1
-}
-map_int32_double {
-  key: 111
-  value: 1
-}
-map_bool_bool {
-  key: true
-  value: false
-}
-map_string_string {
-  key: "112"
-  value: "1"
-}
-map_int32_bytes {
-  key: 113
-  value: "\001\000\000\000"
-}
-map_int32_enum {
-  key: 114
-  value: MAP_ENUM_BAZ
-}
-map_int32_foreign_message {
-  key: 115
-  value {
-    c: 1
-  }
-}
diff --git a/libs/protobuf/objectivec/Tests/text_format_unittest_data.txt b/libs/protobuf/objectivec/Tests/text_format_unittest_data.txt
deleted file mode 100644
index d10f100..0000000
--- a/libs/protobuf/objectivec/Tests/text_format_unittest_data.txt
+++ /dev/null
@@ -1,116 +0,0 @@
-optional_int32: 101
-optional_int64: 102
-optional_uint32: 103
-optional_uint64: 104
-optional_sint32: 105
-optional_sint64: 106
-optional_fixed32: 107
-optional_fixed64: 108
-optional_sfixed32: 109
-optional_sfixed64: 110
-optional_float: 111
-optional_double: 112
-optional_bool: true
-optional_string: "115"
-optional_bytes: "\001\000\002\003\000\005"
-OptionalGroup {
-  a: 117
-}
-optional_nested_message {
-  bb: 118
-}
-optional_foreign_message {
-  c: 119
-}
-optional_import_message {
-  d: 120
-}
-optional_nested_enum: BAZ
-optional_foreign_enum: FOREIGN_BAZ
-optional_import_enum: IMPORT_BAZ
-optional_string_piece: "124"
-optional_cord: "125"
-repeated_int32: 201
-repeated_int32: 301
-repeated_int64: 202
-repeated_int64: 302
-repeated_uint32: 203
-repeated_uint32: 303
-repeated_uint64: 204
-repeated_uint64: 304
-repeated_sint32: 205
-repeated_sint32: 305
-repeated_sint64: 206
-repeated_sint64: 306
-repeated_fixed32: 207
-repeated_fixed32: 307
-repeated_fixed64: 208
-repeated_fixed64: 308
-repeated_sfixed32: 209
-repeated_sfixed32: 309
-repeated_sfixed64: 210
-repeated_sfixed64: 310
-repeated_float: 211
-repeated_float: 311
-repeated_double: 212
-repeated_double: 312
-repeated_bool: false
-repeated_bool: true
-repeated_string: "215"
-repeated_string: "315"
-repeated_bytes: "\330\000\000\000"
-repeated_bytes: "<\001\000\000"
-RepeatedGroup {
-  a: 217
-}
-RepeatedGroup {
-  a: 317
-}
-repeated_nested_message {
-  bb: 218
-}
-repeated_nested_message {
-  bb: 318
-}
-repeated_foreign_message {
-  c: 219
-}
-repeated_foreign_message {
-  c: 319
-}
-repeated_import_message {
-  d: 220
-}
-repeated_import_message {
-  d: 320
-}
-repeated_nested_enum: BAZ
-repeated_nested_enum: BAR
-repeated_foreign_enum: FOREIGN_BAZ
-repeated_foreign_enum: FOREIGN_BAR
-repeated_import_enum: IMPORT_BAZ
-repeated_import_enum: IMPORT_BAR
-repeated_string_piece: "224"
-repeated_string_piece: "324"
-repeated_cord: "225"
-repeated_cord: "325"
-default_int32: 401
-default_int64: 402
-default_uint32: 403
-default_uint64: 404
-default_sint32: 405
-default_sint64: 406
-default_fixed32: 407
-default_fixed64: 408
-default_sfixed32: 409
-default_sfixed64: 410
-default_float: 411
-default_double: 412
-default_bool: false
-default_string: "415"
-default_bytes: "\240\001\000\000"
-default_nested_enum: FOO
-default_foreign_enum: FOREIGN_FOO
-default_import_enum: IMPORT_FOO
-default_string_piece: "424"
-default_cord: "425"
diff --git a/libs/protobuf/objectivec/Tests/unittest_cycle.proto b/libs/protobuf/objectivec/Tests/unittest_cycle.proto
deleted file mode 100644
index afc1b0f..0000000
--- a/libs/protobuf/objectivec/Tests/unittest_cycle.proto
+++ /dev/null
@@ -1,56 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto2";
-
-package protobuf_unittest;
-
-// Cycles in the Message graph can cause problems for message class
-// initialization order.
-
-// You can't make a object graph that spans files, so this can only be done
-// within a single proto file.
-
-message CycleFoo {
-  optional CycleFoo a_foo = 1;
-  optional CycleBar a_bar = 2;
-  optional CycleBaz a_baz = 3;
-}
-
-message CycleBar {
-  optional CycleBar a_bar = 1;
-  optional CycleBaz a_baz = 2;
-  optional CycleFoo a_foo = 3;
-}
-
-message CycleBaz {
-  optional CycleBaz a_baz = 1;
-  optional CycleFoo a_foo = 2;
-  optional CycleBar a_bar = 3;
-}
diff --git a/libs/protobuf/objectivec/Tests/unittest_deprecated.proto b/libs/protobuf/objectivec/Tests/unittest_deprecated.proto
deleted file mode 100644
index 96a52bb..0000000
--- a/libs/protobuf/objectivec/Tests/unittest_deprecated.proto
+++ /dev/null
@@ -1,95 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2016 Google Inc.  All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto2";
-
-package protobuf_deprecated;
-option objc_class_prefix = "Dep";
-
-//
-// This file is like unittest_deprecated_file.proto, but uses message, enum,
-// enum value, and field level deprecation.
-//
-// The source generated from this file needs to be inspect to confirm it has
-// all of the expected annotations. It also will be compiled into the unittest
-// and that compile should be clean without errors.
-//
-
-// Mix of field types marked as deprecated.
-message Msg1 {
-  extensions 100 to max;
-
-  optional string string_field = 1 [deprecated=true];
-  required int32 int_field = 2 [deprecated=true];
-  repeated fixed32 fixed_field = 3 [deprecated=true];
-  optional Msg1 msg_field = 4 [deprecated=true];
-}
-
-// Mix of extension field types marked as deprecated.
-extend Msg1 {
-  optional string string_ext_field = 101 [deprecated=true];
-  optional int32 int_ext_field = 102 [deprecated=true];
-  repeated fixed32 fixed_ext_field = 103 [deprecated=true];
-  optional Msg1 msg_ext_field = 104 [deprecated=true];
-}
-
-// Mix of extension field types (scoped to a message) marked as deprecated.
-message Msg1A {
-  extend Msg1 {
-    optional string string_ext2_field = 201 [deprecated=true];
-    optional int32 int_ext2_field = 202 [deprecated=true];
-    repeated fixed32 fixed_ext2_field = 203 [deprecated=true];
-    optional Msg1 msg_ext2_field = 204 [deprecated=true];
-  }
-}
-
-// Enum value marked as deprecated.
-enum Enum1 {
-  ENUM1_ONE   = 1;
-  ENUM1_TWO   = 2;
-  ENUM1_THREE = 3 [deprecated=true];
-}
-
-// Message marked as deprecated.
-message Msg2 {
-  option deprecated = true;
-
-  optional string string_field = 1;
-  required int32 int_field = 2;
-  repeated fixed32 fixed_field = 3;
-}
-
-// Enum marked as deprecated.
-enum Enum2 {
-  option deprecated = true;
-
-  ENUM2_ONE   = 1;
-  ENUM2_TWO   = 2;
-  ENUM2_THREE = 3;
-}
diff --git a/libs/protobuf/objectivec/Tests/unittest_deprecated_file.proto b/libs/protobuf/objectivec/Tests/unittest_deprecated_file.proto
deleted file mode 100644
index ef92e7d..0000000
--- a/libs/protobuf/objectivec/Tests/unittest_deprecated_file.proto
+++ /dev/null
@@ -1,76 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2016 Google Inc.  All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto2";
-
-package protobuf_deprecated_file;
-option objc_class_prefix = "FileDep";
-
-//
-// This file is like unittest_deprecated.proto, but does NOT use message, enum,
-// enum value, or field level deprecation; instead it uses the file level option
-// to mark everything.
-//
-// The source generated from this file needs to be inspect to confirm it has
-// all of the expected annotations. It also will be compiled into the unittest
-// and that compile should be clean without errors.
-//
-option deprecated = true;
-
-// Message to catch the deprecation.
-message Msg1 {
-  extensions 100 to max;
-
-  optional string string_field = 1;
-}
-
-// Mix of extension field types to catch the deprecation.
-extend Msg1 {
-  optional string string_ext_field = 101;
-  optional int32 int_ext_field = 102;
-  repeated fixed32 fixed_ext_field = 103;
-  optional Msg1 msg_ext_field = 104;
-}
-
-// Mix of extension field types (scoped to a message) to catch the deprecation.
-message Msg1A {
-  extend Msg1 {
-    optional string string_ext2_field = 201;
-    optional int32 int_ext2_field = 202;
-    repeated fixed32 fixed_ext2_field = 203;
-    optional Msg1 msg_ext2_field = 204;
-  }
-}
-
-// Enum to catch the deprecation.
-enum Enum1 {
-  ENUM1_ONE   = 1;
-  ENUM1_TWO   = 2;
-  ENUM1_THREE = 3;
-}
diff --git a/libs/protobuf/objectivec/Tests/unittest_extension_chain_a.proto b/libs/protobuf/objectivec/Tests/unittest_extension_chain_a.proto
deleted file mode 100644
index 6a227eb..0000000
--- a/libs/protobuf/objectivec/Tests/unittest_extension_chain_a.proto
+++ /dev/null
@@ -1,51 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2016 Google Inc.  All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto2";
-
-package protobuf_unittest;
-
-import "google/protobuf/unittest.proto";
-
-import "unittest_extension_chain_b.proto";
-import "unittest_extension_chain_c.proto";
-import "unittest_extension_chain_d.proto";
-
-// The Root for this file should end up adding the local extension and merging
-// in the extensions from D's Root (unittest and C will come via D's).
-
-message ChainAMessage {
-  optional ChainBMessage b = 1;
-  optional ChainCMessage c = 2;
-  optional ChainDMessage d = 3;
-}
-
-extend TestAllExtensions {
-  optional int32 chain_a_extension = 10001;
-}
diff --git a/libs/protobuf/objectivec/Tests/unittest_extension_chain_b.proto b/libs/protobuf/objectivec/Tests/unittest_extension_chain_b.proto
deleted file mode 100644
index 0da7ed3..0000000
--- a/libs/protobuf/objectivec/Tests/unittest_extension_chain_b.proto
+++ /dev/null
@@ -1,47 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2016 Google Inc.  All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto2";
-
-package protobuf_unittest;
-
-import "google/protobuf/unittest.proto";
-
-import "unittest_extension_chain_c.proto";
-
-// The Root for this file should end up adding the local extension and merging
-// in the extensions from C's Root (unittest will come via C's).
-
-message ChainBMessage {
-  optional ChainCMessage c = 1;
-}
-
-extend TestAllExtensions {
-  optional int32 chain_b_extension = 10002;
-}
diff --git a/libs/protobuf/objectivec/Tests/unittest_extension_chain_c.proto b/libs/protobuf/objectivec/Tests/unittest_extension_chain_c.proto
deleted file mode 100644
index c702900..0000000
--- a/libs/protobuf/objectivec/Tests/unittest_extension_chain_c.proto
+++ /dev/null
@@ -1,45 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2016 Google Inc.  All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto2";
-
-package protobuf_unittest;
-
-import "google/protobuf/unittest.proto";
-
-// The Root for this file should end up adding the local extension and merging
-// in the extensions from unittest.proto's Root.
-
-message ChainCMessage {
-  optional int32 my_field = 1;
-}
-
-extend TestAllExtensions {
-  optional int32 chain_c_extension = 10003;
-}
diff --git a/libs/protobuf/objectivec/Tests/unittest_extension_chain_d.proto b/libs/protobuf/objectivec/Tests/unittest_extension_chain_d.proto
deleted file mode 100644
index f9abe3b..0000000
--- a/libs/protobuf/objectivec/Tests/unittest_extension_chain_d.proto
+++ /dev/null
@@ -1,49 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2016 Google Inc.  All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto2";
-
-package protobuf_unittest;
-
-import "google/protobuf/unittest.proto";
-
-import "unittest_extension_chain_b.proto";
-import "unittest_extension_chain_c.proto";
-
-// The root should end up needing to merge B (C will be merged into B, so it
-// doesn't need to be directly merged).
-
-message ChainDMessage {
-  optional ChainBMessage b = 1;
-  optional ChainCMessage c = 2;
-}
-
-extend TestAllExtensions {
-  optional int32 chain_d_extension = 10004;
-}
diff --git a/libs/protobuf/objectivec/Tests/unittest_extension_chain_e.proto b/libs/protobuf/objectivec/Tests/unittest_extension_chain_e.proto
deleted file mode 100644
index fe11663..0000000
--- a/libs/protobuf/objectivec/Tests/unittest_extension_chain_e.proto
+++ /dev/null
@@ -1,40 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2016 Google Inc.  All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto2";
-
-package protobuf_unittest;
-
-import "google/protobuf/unittest.proto";
-
-// The Root for this file should end up just merging in unittest's Root.
-
-message ChainEMessage {
-  optional TestAllTypes my_field = 1;
-}
diff --git a/libs/protobuf/objectivec/Tests/unittest_extension_chain_f.proto b/libs/protobuf/objectivec/Tests/unittest_extension_chain_f.proto
deleted file mode 100644
index 096598d..0000000
--- a/libs/protobuf/objectivec/Tests/unittest_extension_chain_f.proto
+++ /dev/null
@@ -1,44 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2016 Google Inc.  All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto2";
-
-package protobuf_unittest;
-
-import "unittest_extension_chain_g.proto";
-
-// The Root for this file should just be merging in the extensions from C's
-// Root (because G doesn't define anything itself).
-
-// The generated source will also have to directly import C's .h file so it can
-// compile the reference to C's Root class.
-
-message ChainFMessage {
-  optional ChainGMessage g = 1;
-}
diff --git a/libs/protobuf/objectivec/Tests/unittest_extension_chain_g.proto b/libs/protobuf/objectivec/Tests/unittest_extension_chain_g.proto
deleted file mode 100644
index aee827b..0000000
--- a/libs/protobuf/objectivec/Tests/unittest_extension_chain_g.proto
+++ /dev/null
@@ -1,41 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2016 Google Inc.  All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto2";
-
-package protobuf_unittest;
-
-import "unittest_extension_chain_c.proto";
-
-// The Root for this file should just be merging in the extensions from C's
-// Root.
-
-message ChainGMessage {
-  optional ChainCMessage c = 1;
-}
diff --git a/libs/protobuf/objectivec/Tests/unittest_objc.proto b/libs/protobuf/objectivec/Tests/unittest_objc.proto
deleted file mode 100644
index 91c2139..0000000
--- a/libs/protobuf/objectivec/Tests/unittest_objc.proto
+++ /dev/null
@@ -1,884 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2011 Google Inc.  All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto2";
-
-import "google/protobuf/any.proto";
-import "google/protobuf/unittest.proto";
-
-package protobuf_unittest;
-
-// Used to check that Headerdocs and appledoc work correctly. If these comments
-// are not handled correctly, Xcode will fail to build the tests.
-message TestGeneratedComments {
-  // This is a string that could contain stuff like
-  // mime types as image/* or */plain. Maybe twitter usernames
-  // like @protobuf, @google or @something.
-  optional string string_field = 1;
-}
-
-// Using the messages in unittest.proto, setup for recursive cases for testing
-// extensions at various depths.
-extend TestAllExtensions {
-  optional TestAllExtensions recursive_extension = 86;
-}
-
-// Recursive message to for testing autocreators at different depths.
-message TestRecursiveMessageWithRepeatedField {
-  optional TestRecursiveMessageWithRepeatedField a = 1;
-  repeated int32 i = 2;
-  repeated string str = 3;
-  map<int32, int32> i_to_i = 4;
-  map<string, string> str_to_str = 5;
-}
-
-// Message with a few types of maps to cover the different custom flows
-// in the runtime.
-message TestMessageOfMaps {
-  map<string, string> str_to_str = 1;
-
-  map<string, int32> str_to_int = 2;
-  map<int32, string> int_to_str = 3;
-  map<int32, int32> int_to_int = 4;
-
-  map<string, bool> str_to_bool = 5;
-  map<bool, string> bool_to_str = 6;
-  map<bool, bool> bool_to_bool = 7;
-
-  map<int32, bool> int_to_bool = 8;
-  map<bool, int32> bool_to_int = 9;
-
-  map<string, TestAllTypes> str_to_msg = 10;
-  map<int32, TestAllTypes> int_to_msg = 11;
-  map<bool, TestAllTypes> bool_to_msg = 12;
-}
-
-// Recursive message and extension to for testing autocreators at different
-// depths.
-message TestRecursiveExtension {
-  optional TestRecursiveExtension recursive_sub_message = 1;
-  repeated int32 repeated_value = 2;
-  extensions 1000 to max;
-}
-
-extend TestRecursiveExtension {
-  optional TestRecursiveExtension recursive_message_extension = 1000;
-}
-
-message self {
-  message super {
-    optional int32 description = 1;
-  }
-
-  enum autorelease {
-    retain      = 1;
-    release     = 2;
-    retainCount = 3;
-  }
-
-  // Singular
-  // Objective C Keywords
-  optional bool id                =  1;
-  optional bool _cmd              =  2;
-  // super is used as submessage above
-  optional bool in                =  4;
-  optional bool out               =  5;
-  optional bool inout             =  6;
-  optional bool bycopy            =  7;
-  optional bool byref             =  8;
-  optional bool oneway            =  9;
-  optional bool self              =  10;
-  optional bool instancetype      =  11;
-  optional bool nullable          =  12;
-  optional bool nonnull           =  13;
-  optional bool nil               =  14;
-  // Nil and nil can't be in the same message
-  optional bool YES               =  16;
-  optional bool NO                =  17;
-  optional bool weak              =  18;
-
-  // Some C/C++ Keywords
-  optional bool case              = 30;
-  optional bool if                = 31;
-  optional bool and_eq            = 32;
-  optional bool public            = 33;
-  optional bool private           = 34;
-  optional bool typename          = 35;
-  optional bool static_cast       = 36;
-  optional bool typeof            = 37;
-  optional bool restrict          = 38;
-  optional bool NULL              = 39;
-
-  // Some NSObject Methods
-  optional bool dealloc           = 110;
-  optional bool isProxy           = 111;
-  optional bool copy              = 112;
-  optional bool description       = 113;
-  optional bool zone              = 114;
-  optional bool className         = 115;
-  optional bool __retain_OA       = 116;
-  optional bool CAMLType          = 117;
-  optional bool isNSDictionary__  = 118;
-  optional bool accessibilityLabel = 119;
-
-  // Some Objc "keywords" that we shouldn't
-  // have to worry about because they
-  // can only appear in specialized areas.
-  optional bool assign            = 200;
-  optional bool getter            = 201;
-  optional bool setter            = 202;
-  optional bool atomic            = 203;
-  optional bool nonatomic         = 204;
-  optional bool strong            = 205;
-  optional bool null_resettable   = 206;
-  optional bool readonly          = 207;
-
-  // Some GPBMessage methods
-  optional bool clear             = 300;
-  optional bool data              = 301;
-  optional bool descriptor        = 302;
-  optional bool delimitedData     = 303;
-
-  // Some MacTypes
-  optional bool Fixed             = 400;
-  optional bool Point             = 401;
-  optional bool FixedPoint        = 402;
-  optional bool Style             = 403;
-
-  // C/C++ reserved identifiers
-  optional bool _Generic          = 500;
-  optional bool __block           = 501;
-
-  // Try a keyword as a type
-  optional autorelease SubEnum    = 1000;
-
-  optional group New = 2000 {
-   optional string copy = 1;
-  }
-  optional group MutableCopy = 2001 {
-    optional int32 extensionRegistry = 1;
-  }
-
-  extensions 3000 to 3999;
-
-}
-
-enum retain {
-  count          = 4;
-  initialized    = 5;
-  serializedSize = 6;
-}
-
-message ObjCPropertyNaming {
-  // Test that the properties properly get things all caps.
-  optional string url           = 1;
-  optional string thumbnail_url = 2;
-  optional string url_foo       = 3;
-  optional string some_url_blah = 4;
-  optional string http          = 5;
-  optional string https         = 6;
-  // This one doesn't.
-  repeated string urls          = 7;
-}
-
-// EnumValueShortName: The short names shouldn't get suffixes/prefixes.
-enum Foo {
-  SERIALIZED_SIZE = 1;
-  SIZE            = 2;
-  OTHER           = 3;
-}
-
-// EnumValueShortName: The enum name gets a prefix.
-enum Category {
-  RED  = 1;
-  BLUE = 2;
-}
-
-// EnumValueShortName: Twist case, full name gets PB, but the short names
-// should still end up correct.
-enum Time {
-  BASE            = 1;
-  RECORD          = 2;
-  SOMETHING_ELSE  = 3;
-}
-
-extend self {
-  repeated    int32 debugDescription    =  3000 [packed = true];
-  repeated    int64 finalize            =  3001 [packed = true];
-  repeated   uint32 hash                =  3002 [packed = true];
-  repeated   uint64 classForCoder       =  3003 [packed = true];
-  repeated   sint32 byref               =  3004 [packed = true];
-}
-
-// Test handing of fields that start with init* since Xcode 5's ARC support
-// doesn't like messages that look like initializers but aren't.
-message ObjCInitFoo {
-  optional string init_val = 11;
-  optional int32 init_size = 12;
-  optional self init_self = 13;
-
-  repeated string init_vals = 21;
-  repeated int32 init_sizes = 22;
-  repeated self init_selfs = 23;
-}
-
-// Test handling of fields that start with retained names.
-message ObjCRetainedFoo {
-  optional string new_val_lower_complex = 11;
-  optional string new_Val_upper_complex = 12;
-  optional string newvalue_lower_no_underscore_complex = 13;
-  optional string newValue_upper_no_underscore_complex = 14;
-
-  optional int32 new_val_lower_primitive = 15;
-  optional int32 new_Val_upper_primitive = 16;
-  optional int32 newvalue_lower_no_underscore_primitive = 17;
-  optional int32 newValue_upper_no_underscore_primitive = 18;
-
-  optional self new_val_lower_message = 19;
-  optional self new_Val_upper_message = 20;
-  optional self newvalue_lower_no_underscore_message = 21;
-  optional self newValue_upper_no_underscore_message = 22;
-
-  optional Foo new_val_lower_enum = 23;
-  optional Foo new_Val_upper_enum = 24;
-  optional Foo newvalue_lower_no_underscore_enum = 25;
-  optional Foo newValue_upper_no_underscore_enum = 26;
-
-  repeated string new_val_lower_complex_repeated = 111;
-  repeated string new_Val_upper_complex_repeated = 112;
-  repeated string newvalue_lower_no_underscore_complex_repeated = 113;
-  repeated string newValue_upper_no_underscore_complex_repeated = 114;
-
-  repeated int32 new_val_lower_primitive_repeated = 115;
-  repeated int32 new_Val_upper_primitive_repeated = 116;
-  repeated int32 newvalue_lower_no_underscore_primitive_repeated = 117;
-  repeated int32 newValue_upper_no_underscore_primitive_repeated = 118;
-
-  repeated self new_val_lower_message_repeated = 119;
-  repeated self new_Val_upper_message_repeated = 120;
-  repeated self newvalue_lower_no_underscore_message_repeated = 121;
-  repeated self newValue_upper_no_underscore_message_repeated = 122;
-
-  repeated Foo new_val_lower_enum_repeated = 123;
-  repeated Foo new_Val_upper_enum_repeated = 124;
-  repeated Foo newvalue_lower_no_underscore_enum_repeated = 125;
-  repeated Foo newValue_upper_no_underscore_enum_repeated = 126;
-
-  optional string alloc_val_lower_complex = 211;
-  optional string alloc_Val_upper_complex = 212;
-  optional string allocvalue_lower_no_underscore_complex = 213;
-  optional string allocValue_upper_no_underscore_complex = 214;
-
-  optional int32 alloc_val_lower_primitive = 215;
-  optional int32 alloc_Val_upper_primitive = 216;
-  optional int32 allocvalue_lower_no_underscore_primitive = 217;
-  optional int32 allocValue_upper_no_underscore_primitive = 218;
-
-  optional self alloc_val_lower_message = 219;
-  optional self alloc_Val_upper_message = 220;
-  optional self allocvalue_lower_no_underscore_message = 221;
-  optional self allocValue_upper_no_underscore_message = 222;
-
-  optional Foo alloc_val_lower_enum = 223;
-  optional Foo alloc_Val_upper_enum = 224;
-  optional Foo allocvalue_lower_no_underscore_enum = 225;
-  optional Foo allocValue_upper_no_underscore_enum = 226;
-
-  repeated string alloc_val_lower_complex_repeated = 311;
-  repeated string alloc_Val_upper_complex_repeated = 312;
-  repeated string allocvalue_lower_no_underscore_complex_repeated = 313;
-  repeated string allocValue_upper_no_underscore_complex_repeated = 314;
-
-  repeated int32 alloc_val_lower_primitive_repeated = 315;
-  repeated int32 alloc_Val_upper_primitive_repeated = 316;
-  repeated int32 allocvalue_lower_no_underscore_primitive_repeated = 317;
-  repeated int32 allocValue_upper_no_underscore_primitive_repeated = 318;
-
-  repeated self alloc_val_lower_message_repeated = 319;
-  repeated self alloc_Val_upper_message_repeated = 320;
-  repeated self allocvalue_lower_no_underscore_message_repeated = 321;
-  repeated self allocValue_upper_no_underscore_message_repeated = 322;
-
-  repeated Foo alloc_val_lower_enum_repeated = 323;
-  repeated Foo alloc_Val_upper_enum_repeated = 324;
-  repeated Foo allocvalue_lower_no_underscore_enum_repeated = 325;
-  repeated Foo allocValue_upper_no_underscore_enum_repeated = 326;
-
-  optional string copy_val_lower_complex = 411;
-  optional string copy_Val_upper_complex = 412;
-  optional string copyvalue_lower_no_underscore_complex = 413;
-  optional string copyValue_upper_no_underscore_complex = 414;
-
-  optional int32 copy_val_lower_primitive = 415;
-  optional int32 copy_Val_upper_primitive = 416;
-  optional int32 copyvalue_lower_no_underscore_primitive = 417;
-  optional int32 copyValue_upper_no_underscore_primitive = 418;
-
-  optional self copy_val_lower_message = 419;
-  optional self copy_Val_upper_message = 420;
-  optional self copyvalue_lower_no_underscore_message = 421;
-  optional self copyValue_upper_no_underscore_message = 422;
-
-  optional Foo copy_val_lower_enum = 423;
-  optional Foo copy_Val_upper_enum = 424;
-  optional Foo copyvalue_lower_no_underscore_enum = 425;
-  optional Foo copyValue_upper_no_underscore_enum = 426;
-
-  repeated string copy_val_lower_complex_repeated = 511;
-  repeated string copy_Val_upper_complex_repeated = 512;
-  repeated string copyvalue_lower_no_underscore_complex_repeated = 513;
-  repeated string copyValue_upper_no_underscore_complex_repeated = 514;
-
-  repeated int32 copy_val_lower_primitive_repeated = 515;
-  repeated int32 copy_Val_upper_primitive_repeated = 516;
-  repeated int32 copyvalue_lower_no_underscore_primitive_repeated = 517;
-  repeated int32 copyValue_upper_no_underscore_primitive_repeated = 518;
-
-  repeated self copy_val_lower_message_repeated = 519;
-  repeated self copy_Val_upper_message_repeated = 520;
-  repeated self copyvalue_lower_no_underscore_message_repeated = 521;
-  repeated self copyValue_upper_no_underscore_message_repeated = 522;
-
-  repeated Foo copy_val_lower_enum_repeated = 523;
-  repeated Foo copy_Val_upper_enum_repeated = 524;
-  repeated Foo copyvalue_lower_no_underscore_enum_repeated = 525;
-  repeated Foo copyValue_upper_no_underscore_enum_repeated = 526;
-
-  optional string mutableCopy_val_lower_complex = 611;
-  optional string mutableCopy_Val_upper_complex = 612;
-  optional string mutableCopyvalue_lower_no_underscore_complex = 613;
-  optional string mutableCopyValue_upper_no_underscore_complex = 614;
-
-  optional int32 mutableCopy_val_lower_primitive = 615;
-  optional int32 mutableCopy_Val_upper_primitive = 616;
-  optional int32 mutableCopyvalue_lower_no_underscore_primitive = 617;
-  optional int32 mutableCopyValue_upper_no_underscore_primitive = 618;
-
-  optional self mutableCopy_val_lower_message = 619;
-  optional self mutableCopy_Val_upper_message = 620;
-  optional self mutableCopyvalue_lower_no_underscore_message = 621;
-  optional self mutableCopyValue_upper_no_underscore_message = 622;
-
-  optional Foo mutableCopy_val_lower_enum = 623;
-  optional Foo mutableCopy_Val_upper_enum = 624;
-  optional Foo mutableCopyvalue_lower_no_underscore_enum = 625;
-  optional Foo mutableCopyValue_upper_no_underscore_enum = 626;
-
-  repeated string mutableCopy_val_lower_complex_repeated = 711;
-  repeated string mutableCopy_Val_upper_complex_repeated = 712;
-  repeated string mutableCopyvalue_lower_no_underscore_complex_repeated = 713;
-  repeated string mutableCopyValue_upper_no_underscore_complex_repeated = 714;
-
-  repeated int32 mutableCopy_val_lower_primitive_repeated = 715;
-  repeated int32 mutableCopy_Val_upper_primitive_repeated = 716;
-  repeated int32 mutableCopyvalue_lower_no_underscore_primitive_repeated = 717;
-  repeated int32 mutableCopyValue_upper_no_underscore_primitive_repeated = 718;
-
-  repeated self mutableCopy_val_lower_message_repeated = 719;
-  repeated self mutableCopy_Val_upper_message_repeated = 720;
-  repeated self mutableCopyvalue_lower_no_underscore_message_repeated = 721;
-  repeated self mutableCopyValue_upper_no_underscore_message_repeated = 722;
-
-  repeated Foo mutableCopy_val_lower_enum_repeated = 723;
-  repeated Foo mutableCopy_Val_upper_enum_repeated = 724;
-  repeated Foo mutableCopyvalue_lower_no_underscore_enum_repeated = 725;
-  repeated Foo mutableCopyValue_upper_no_underscore_enum_repeated = 726;
-
-  extensions 1000 to 3999;
-}
-
-// Extension fields with retained names.
-extend ObjCRetainedFoo {
-  optional string new_val_lower_complex = 1011;
-  optional string new_Val_upper_complex = 1012;
-  optional string newvalue_lower_no_underscore_complex = 1013;
-  optional string newValue_upper_no_underscore_complex = 1014;
-
-  optional int32 new_val_lower_primitive = 1015;
-  optional int32 new_Val_upper_primitive = 1016;
-  optional int32 newvalue_lower_no_underscore_primitive = 1017;
-  optional int32 newValue_upper_no_underscore_primitive = 1018;
-
-  optional self new_val_lower_message = 1019;
-  optional self new_Val_upper_message = 1020;
-  optional self newvalue_lower_no_underscore_message = 1021;
-  optional self newValue_upper_no_underscore_message = 1022;
-
-  optional Foo new_val_lower_enum = 1023;
-  optional Foo new_Val_upper_enum = 1024;
-  optional Foo newvalue_lower_no_underscore_enum = 1025;
-  optional Foo newValue_upper_no_underscore_enum = 1026;
-
-  repeated string new_val_lower_complex_repeated = 1111;
-  repeated string new_Val_upper_complex_repeated = 1112;
-  repeated string newvalue_lower_no_underscore_complex_repeated = 1113;
-  repeated string newValue_upper_no_underscore_complex_repeated = 1114;
-
-  repeated int32 new_val_lower_primitive_repeated = 1115;
-  repeated int32 new_Val_upper_primitive_repeated = 1116;
-  repeated int32 newvalue_lower_no_underscore_primitive_repeated = 1117;
-  repeated int32 newValue_upper_no_underscore_primitive_repeated = 1118;
-
-  repeated self new_val_lower_message_repeated = 1119;
-  repeated self new_Val_upper_message_repeated = 1120;
-  repeated self newvalue_lower_no_underscore_message_repeated = 1121;
-  repeated self newValue_upper_no_underscore_message_repeated = 1122;
-
-  repeated Foo new_val_lower_enum_repeated = 1123;
-  repeated Foo new_Val_upper_enum_repeated = 1124;
-  repeated Foo newvalue_lower_no_underscore_enum_repeated = 1125;
-  repeated Foo newValue_upper_no_underscore_enum_repeated = 1126;
-
-  optional string alloc_val_lower_complex = 1211;
-  optional string alloc_Val_upper_complex = 1212;
-  optional string allocvalue_lower_no_underscore_complex = 1213;
-  optional string allocValue_upper_no_underscore_complex = 1214;
-
-  optional int32 alloc_val_lower_primitive = 1215;
-  optional int32 alloc_Val_upper_primitive = 1216;
-  optional int32 allocvalue_lower_no_underscore_primitive = 1217;
-  optional int32 allocValue_upper_no_underscore_primitive = 1218;
-
-  optional self alloc_val_lower_message = 1219;
-  optional self alloc_Val_upper_message = 1220;
-  optional self allocvalue_lower_no_underscore_message = 1221;
-  optional self allocValue_upper_no_underscore_message = 1222;
-
-  optional Foo alloc_val_lower_enum = 1223;
-  optional Foo alloc_Val_upper_enum = 1224;
-  optional Foo allocvalue_lower_no_underscore_enum = 1225;
-  optional Foo allocValue_upper_no_underscore_enum = 1226;
-
-  repeated string alloc_val_lower_complex_repeated = 1311;
-  repeated string alloc_Val_upper_complex_repeated = 1312;
-  repeated string allocvalue_lower_no_underscore_complex_repeated = 1313;
-  repeated string allocValue_upper_no_underscore_complex_repeated = 1314;
-
-  repeated int32 alloc_val_lower_primitive_repeated = 1315;
-  repeated int32 alloc_Val_upper_primitive_repeated = 1316;
-  repeated int32 allocvalue_lower_no_underscore_primitive_repeated = 1317;
-  repeated int32 allocValue_upper_no_underscore_primitive_repeated = 1318;
-
-  repeated self alloc_val_lower_message_repeated = 1319;
-  repeated self alloc_Val_upper_message_repeated = 1320;
-  repeated self allocvalue_lower_no_underscore_message_repeated = 1321;
-  repeated self allocValue_upper_no_underscore_message_repeated = 1322;
-
-  repeated Foo alloc_val_lower_enum_repeated = 1323;
-  repeated Foo alloc_Val_upper_enum_repeated = 1324;
-  repeated Foo allocvalue_lower_no_underscore_enum_repeated = 1325;
-  repeated Foo allocValue_upper_no_underscore_enum_repeated = 1326;
-
-  optional string copy_val_lower_complex = 1411;
-  optional string copy_Val_upper_complex = 1412;
-  optional string copyvalue_lower_no_underscore_complex = 1413;
-  optional string copyValue_upper_no_underscore_complex = 1414;
-
-  optional int32 copy_val_lower_primitive = 1415;
-  optional int32 copy_Val_upper_primitive = 1416;
-  optional int32 copyvalue_lower_no_underscore_primitive = 1417;
-  optional int32 copyValue_upper_no_underscore_primitive = 1418;
-
-  optional self copy_val_lower_message = 1419;
-  optional self copy_Val_upper_message = 1420;
-  optional self copyvalue_lower_no_underscore_message = 1421;
-  optional self copyValue_upper_no_underscore_message = 1422;
-
-  optional Foo copy_val_lower_enum = 1423;
-  optional Foo copy_Val_upper_enum = 1424;
-  optional Foo copyvalue_lower_no_underscore_enum = 1425;
-  optional Foo copyValue_upper_no_underscore_enum = 1426;
-
-  repeated string copy_val_lower_complex_repeated = 1511;
-  repeated string copy_Val_upper_complex_repeated = 1512;
-  repeated string copyvalue_lower_no_underscore_complex_repeated = 1513;
-  repeated string copyValue_upper_no_underscore_complex_repeated = 1514;
-
-  repeated int32 copy_val_lower_primitive_repeated = 1515;
-  repeated int32 copy_Val_upper_primitive_repeated = 1516;
-  repeated int32 copyvalue_lower_no_underscore_primitive_repeated = 1517;
-  repeated int32 copyValue_upper_no_underscore_primitive_repeated = 1518;
-
-  repeated self copy_val_lower_message_repeated = 1519;
-  repeated self copy_Val_upper_message_repeated = 1520;
-  repeated self copyvalue_lower_no_underscore_message_repeated = 1521;
-  repeated self copyValue_upper_no_underscore_message_repeated = 1522;
-
-  repeated Foo copy_val_lower_enum_repeated = 1523;
-  repeated Foo copy_Val_upper_enum_repeated = 1524;
-  repeated Foo copyvalue_lower_no_underscore_enum_repeated = 1525;
-  repeated Foo copyValue_upper_no_underscore_enum_repeated = 1526;
-
-  optional string mutableCopy_val_lower_complex = 1611;
-  optional string mutableCopy_Val_upper_complex = 1612;
-  optional string mutableCopyvalue_lower_no_underscore_complex = 1613;
-  optional string mutableCopyValue_upper_no_underscore_complex = 1614;
-
-  optional int32 mutableCopy_val_lower_primitive = 1615;
-  optional int32 mutableCopy_Val_upper_primitive = 1616;
-  optional int32 mutableCopyvalue_lower_no_underscore_primitive = 1617;
-  optional int32 mutableCopyValue_upper_no_underscore_primitive = 1618;
-
-  optional self mutableCopy_val_lower_message = 1619;
-  optional self mutableCopy_Val_upper_message = 1620;
-  optional self mutableCopyvalue_lower_no_underscore_message = 1621;
-  optional self mutableCopyValue_upper_no_underscore_message = 1622;
-
-  optional Foo mutableCopy_val_lower_enum = 1623;
-  optional Foo mutableCopy_Val_upper_enum = 1624;
-  optional Foo mutableCopyvalue_lower_no_underscore_enum = 1625;
-  optional Foo mutableCopyValue_upper_no_underscore_enum = 1626;
-
-  repeated string mutableCopy_val_lower_complex_repeated = 1711;
-  repeated string mutableCopy_Val_upper_complex_repeated = 1712;
-  repeated string mutableCopyvalue_lower_no_underscore_complex_repeated = 1713;
-  repeated string mutableCopyValue_upper_no_underscore_complex_repeated = 1714;
-
-  repeated int32 mutableCopy_val_lower_primitive_repeated = 1715;
-  repeated int32 mutableCopy_Val_upper_primitive_repeated = 1716;
-  repeated int32 mutableCopyvalue_lower_no_underscore_primitive_repeated = 1717;
-  repeated int32 mutableCopyValue_upper_no_underscore_primitive_repeated = 1718;
-
-  repeated self mutableCopy_val_lower_message_repeated = 1719;
-  repeated self mutableCopy_Val_upper_message_repeated = 1720;
-  repeated self mutableCopyvalue_lower_no_underscore_message_repeated = 1721;
-  repeated self mutableCopyValue_upper_no_underscore_message_repeated = 1722;
-
-  repeated Foo mutableCopy_val_lower_enum_repeated = 1723;
-  repeated Foo mutableCopy_Val_upper_enum_repeated = 1724;
-  repeated Foo mutableCopyvalue_lower_no_underscore_enum_repeated = 1725;
-  repeated Foo mutableCopyValue_upper_no_underscore_enum_repeated = 1726;
-}
-
-message JustToScopeExtensions {
-  extend ObjCRetainedFoo {
-    optional string new_val_lower_complex = 2011;
-    optional string new_Val_upper_complex = 2012;
-    optional string newvalue_lower_no_underscore_complex = 2013;
-    optional string newValue_upper_no_underscore_complex = 2014;
-
-    optional int32 new_val_lower_primitive = 2015;
-    optional int32 new_Val_upper_primitive = 2016;
-    optional int32 newvalue_lower_no_underscore_primitive = 2017;
-    optional int32 newValue_upper_no_underscore_primitive = 2018;
-
-    optional self new_val_lower_message = 2019;
-    optional self new_Val_upper_message = 2020;
-    optional self newvalue_lower_no_underscore_message = 2021;
-    optional self newValue_upper_no_underscore_message = 2022;
-
-    optional Foo new_val_lower_enum = 2023;
-    optional Foo new_Val_upper_enum = 2024;
-    optional Foo newvalue_lower_no_underscore_enum = 2025;
-    optional Foo newValue_upper_no_underscore_enum = 2026;
-
-    repeated string new_val_lower_complex_repeated = 2111;
-    repeated string new_Val_upper_complex_repeated = 2112;
-    repeated string newvalue_lower_no_underscore_complex_repeated = 2113;
-    repeated string newValue_upper_no_underscore_complex_repeated = 2114;
-
-    repeated int32 new_val_lower_primitive_repeated = 2115;
-    repeated int32 new_Val_upper_primitive_repeated = 2116;
-    repeated int32 newvalue_lower_no_underscore_primitive_repeated = 2117;
-    repeated int32 newValue_upper_no_underscore_primitive_repeated = 2118;
-
-    repeated self new_val_lower_message_repeated = 2119;
-    repeated self new_Val_upper_message_repeated = 2120;
-    repeated self newvalue_lower_no_underscore_message_repeated = 2121;
-    repeated self newValue_upper_no_underscore_message_repeated = 2122;
-
-    repeated Foo new_val_lower_enum_repeated = 2123;
-    repeated Foo new_Val_upper_enum_repeated = 2124;
-    repeated Foo newvalue_lower_no_underscore_enum_repeated = 2125;
-    repeated Foo newValue_upper_no_underscore_enum_repeated = 2126;
-
-    optional string alloc_val_lower_complex = 2211;
-    optional string alloc_Val_upper_complex = 2212;
-    optional string allocvalue_lower_no_underscore_complex = 2213;
-    optional string allocValue_upper_no_underscore_complex = 2214;
-
-    optional int32 alloc_val_lower_primitive = 2215;
-    optional int32 alloc_Val_upper_primitive = 2216;
-    optional int32 allocvalue_lower_no_underscore_primitive = 2217;
-    optional int32 allocValue_upper_no_underscore_primitive = 2218;
-
-    optional self alloc_val_lower_message = 2219;
-    optional self alloc_Val_upper_message = 2220;
-    optional self allocvalue_lower_no_underscore_message = 2221;
-    optional self allocValue_upper_no_underscore_message = 2222;
-
-    optional Foo alloc_val_lower_enum = 2223;
-    optional Foo alloc_Val_upper_enum = 2224;
-    optional Foo allocvalue_lower_no_underscore_enum = 2225;
-    optional Foo allocValue_upper_no_underscore_enum = 2226;
-
-    repeated string alloc_val_lower_complex_repeated = 2311;
-    repeated string alloc_Val_upper_complex_repeated = 2312;
-    repeated string allocvalue_lower_no_underscore_complex_repeated = 2313;
-    repeated string allocValue_upper_no_underscore_complex_repeated = 2314;
-
-    repeated int32 alloc_val_lower_primitive_repeated = 2315;
-    repeated int32 alloc_Val_upper_primitive_repeated = 2316;
-    repeated int32 allocvalue_lower_no_underscore_primitive_repeated = 2317;
-    repeated int32 allocValue_upper_no_underscore_primitive_repeated = 2318;
-
-    repeated self alloc_val_lower_message_repeated = 2319;
-    repeated self alloc_Val_upper_message_repeated = 2320;
-    repeated self allocvalue_lower_no_underscore_message_repeated = 2321;
-    repeated self allocValue_upper_no_underscore_message_repeated = 2322;
-
-    repeated Foo alloc_val_lower_enum_repeated = 2323;
-    repeated Foo alloc_Val_upper_enum_repeated = 2324;
-    repeated Foo allocvalue_lower_no_underscore_enum_repeated = 2325;
-    repeated Foo allocValue_upper_no_underscore_enum_repeated = 2326;
-
-    optional string copy_val_lower_complex = 2411;
-    optional string copy_Val_upper_complex = 2412;
-    optional string copyvalue_lower_no_underscore_complex = 2413;
-    optional string copyValue_upper_no_underscore_complex = 2414;
-
-    optional int32 copy_val_lower_primitive = 2415;
-    optional int32 copy_Val_upper_primitive = 2416;
-    optional int32 copyvalue_lower_no_underscore_primitive = 2417;
-    optional int32 copyValue_upper_no_underscore_primitive = 2418;
-
-    optional self copy_val_lower_message = 2419;
-    optional self copy_Val_upper_message = 2420;
-    optional self copyvalue_lower_no_underscore_message = 2421;
-    optional self copyValue_upper_no_underscore_message = 2422;
-
-    optional Foo copy_val_lower_enum = 2423;
-    optional Foo copy_Val_upper_enum = 2424;
-    optional Foo copyvalue_lower_no_underscore_enum = 2425;
-    optional Foo copyValue_upper_no_underscore_enum = 2426;
-
-    repeated string copy_val_lower_complex_repeated = 2511;
-    repeated string copy_Val_upper_complex_repeated = 2512;
-    repeated string copyvalue_lower_no_underscore_complex_repeated = 2513;
-    repeated string copyValue_upper_no_underscore_complex_repeated = 2514;
-
-    repeated int32 copy_val_lower_primitive_repeated = 2515;
-    repeated int32 copy_Val_upper_primitive_repeated = 2516;
-    repeated int32 copyvalue_lower_no_underscore_primitive_repeated = 2517;
-    repeated int32 copyValue_upper_no_underscore_primitive_repeated = 2518;
-
-    repeated self copy_val_lower_message_repeated = 2519;
-    repeated self copy_Val_upper_message_repeated = 2520;
-    repeated self copyvalue_lower_no_underscore_message_repeated = 2521;
-    repeated self copyValue_upper_no_underscore_message_repeated = 2522;
-
-    repeated Foo copy_val_lower_enum_repeated = 2523;
-    repeated Foo copy_Val_upper_enum_repeated = 2524;
-    repeated Foo copyvalue_lower_no_underscore_enum_repeated = 2525;
-    repeated Foo copyValue_upper_no_underscore_enum_repeated = 2526;
-
-    optional string mutableCopy_val_lower_complex = 2611;
-    optional string mutableCopy_Val_upper_complex = 2612;
-    optional string mutableCopyvalue_lower_no_underscore_complex = 2613;
-    optional string mutableCopyValue_upper_no_underscore_complex = 2614;
-
-    optional int32 mutableCopy_val_lower_primitive = 2615;
-    optional int32 mutableCopy_Val_upper_primitive = 2616;
-    optional int32 mutableCopyvalue_lower_no_underscore_primitive = 2617;
-    optional int32 mutableCopyValue_upper_no_underscore_primitive = 2618;
-
-    optional self mutableCopy_val_lower_message = 2619;
-    optional self mutableCopy_Val_upper_message = 2620;
-    optional self mutableCopyvalue_lower_no_underscore_message = 2621;
-    optional self mutableCopyValue_upper_no_underscore_message = 2622;
-
-    optional Foo mutableCopy_val_lower_enum = 2623;
-    optional Foo mutableCopy_Val_upper_enum = 2624;
-    optional Foo mutableCopyvalue_lower_no_underscore_enum = 2625;
-    optional Foo mutableCopyValue_upper_no_underscore_enum = 2626;
-
-    repeated string mutableCopy_val_lower_complex_repeated = 2711;
-    repeated string mutableCopy_Val_upper_complex_repeated = 2712;
-    repeated string mutableCopyvalue_lower_no_underscore_complex_repeated = 2713;
-    repeated string mutableCopyValue_upper_no_underscore_complex_repeated = 2714;
-
-    repeated int32 mutableCopy_val_lower_primitive_repeated = 2715;
-    repeated int32 mutableCopy_Val_upper_primitive_repeated = 2716;
-    repeated int32 mutableCopyvalue_lower_no_underscore_primitive_repeated = 2717;
-    repeated int32 mutableCopyValue_upper_no_underscore_primitive_repeated = 2718;
-
-    repeated self mutableCopy_val_lower_message_repeated = 2719;
-    repeated self mutableCopy_Val_upper_message_repeated = 2720;
-    repeated self mutableCopyvalue_lower_no_underscore_message_repeated = 2721;
-    repeated self mutableCopyValue_upper_no_underscore_message_repeated = 2722;
-
-    repeated Foo mutableCopy_val_lower_enum_repeated = 2723;
-    repeated Foo mutableCopy_Val_upper_enum_repeated = 2724;
-    repeated Foo mutableCopyvalue_lower_no_underscore_enum_repeated = 2725;
-    repeated Foo mutableCopyValue_upper_no_underscore_enum_repeated = 2726;
-  }
-}
-
-// Test handling of fields that are the retained names.
-message ObjCRetainedComplex {
-  optional string new = 1;
-  optional string alloc = 2;
-  optional string copy = 3;
-  optional string mutableCopy = 4;
-}
-
-message ObjCRetainedComplexRepeated {
-  repeated string new = 1;
-  repeated string alloc = 2;
-  repeated string copy = 3;
-  repeated string mutableCopy = 4;
-}
-
-message ObjCRetainedPrimitive {
-  optional int32 new = 1;
-  optional int32 alloc = 2;
-  optional int32 copy = 3;
-  optional int32 mutableCopy = 4;
-}
-
-message ObjCRetainedPrimitiveRepeated {
-  repeated int32 new = 1;
-  repeated int32 alloc = 2;
-  repeated int32 copy = 3;
-  repeated int32 mutableCopy = 4;
-}
-
-message ObjCRetainedMessage {
-  optional self new = 1;
-  optional self alloc = 2;
-  optional self copy = 3;
-  optional self mutableCopy = 4;
-}
-
-message ObjCRetainedMessageRepeated {
-  repeated self new = 1;
-  repeated self alloc = 2;
-  repeated self copy = 3;
-  repeated self mutableCopy = 4;
-}
-
-// Test Handling some MacTypes
-message Point {
-  message Rect {
-    optional int32 TimeValue = 1;
-  }
-}
-
-// Test some weird defaults that we see in protos.
-message ObjcWeirdDefaults {
-  // Set default values that match the protocol buffer defined defaults to
-  // confirm hasDefault and the default values are set correctly.
-  optional string foo = 1 [default = ""];
-  optional bytes bar = 2 [default = ""];
-}
-
-// Used to confirm negative enum values work as expected.
-message EnumTestMsg {
-  enum MyEnum {
-    ZERO    = 0;
-    ONE     = 1;
-    TWO     = 2;
-    NEG_ONE = -1;
-    NEG_TWO = -2;
-  }
-  optional MyEnum foo = 1;
-  optional MyEnum bar = 2 [default = ONE];
-  optional MyEnum baz = 3 [default = NEG_ONE];
-
-  repeated MyEnum mumble = 4;
-}
-
-// Test case for https://github.com/protocolbuffers/protobuf/issues/1453
-// Message with no explicit defaults, but a non zero default for an enum.
-message MessageWithOneBasedEnum {
-  enum OneBasedEnum {
-    ONE = 1;
-    TWO = 2;
-  }
-  optional OneBasedEnum enum_field = 1;
-}
-
-// Message with all bools for testing things related to bool storage.
-message BoolOnlyMessage {
-  optional bool bool_field_1 = 1;
-  optional bool bool_field_2 = 2;
-  optional bool bool_field_3 = 3;
-  optional bool bool_field_4 = 4;
-  optional bool bool_field_5 = 5;
-  optional bool bool_field_6 = 6;
-  optional bool bool_field_7 = 7;
-  optional bool bool_field_8 = 8;
-  optional bool bool_field_9 = 9;
-  optional bool bool_field_10 = 10;
-  optional bool bool_field_11 = 11;
-  optional bool bool_field_12 = 12;
-  optional bool bool_field_13 = 13;
-  optional bool bool_field_14 = 14;
-  optional bool bool_field_15 = 15;
-  optional bool bool_field_16 = 16;
-  optional bool bool_field_17 = 17;
-  optional bool bool_field_18 = 18;
-  optional bool bool_field_19 = 19;
-  optional bool bool_field_20 = 20;
-  optional bool bool_field_21 = 21;
-  optional bool bool_field_22 = 22;
-  optional bool bool_field_23 = 23;
-  optional bool bool_field_24 = 24;
-  optional bool bool_field_25 = 25;
-  optional bool bool_field_26 = 26;
-  optional bool bool_field_27 = 27;
-  optional bool bool_field_28 = 28;
-  optional bool bool_field_29 = 29;
-  optional bool bool_field_30 = 30;
-  optional bool bool_field_31 = 31;
-  optional bool bool_field_32 = 32;
-}
-
-// Reference to a WKT to test (via generated code inspection), the handling
-// of #imports.  Within the WKTs, references to each other are just path
-// based imports, but when reference from another proto file, they should be
-// conditional to support the framework import style.
-message WKTRefereceMessage {
-  optional google.protobuf.Any an_any = 1;
-}
-
-// This is in part a compile test, it ensures that when aliases end up with
-// the same ObjC name, we drop them to avoid the duplication names. There
-// is a test to ensure the descriptors are still generated to support
-// reflection and TextFormat.
-enum TestEnumObjCNameCollision {
-  option allow_alias = true;
-
-  FOO = 1;
-  foo = 1;
-
-  BAR = 2;
-  mumble = 2;
-  MUMBLE = 2;
-}
diff --git a/libs/protobuf/objectivec/Tests/unittest_objc_options.proto b/libs/protobuf/objectivec/Tests/unittest_objc_options.proto
deleted file mode 100644
index 6129b85..0000000
--- a/libs/protobuf/objectivec/Tests/unittest_objc_options.proto
+++ /dev/null
@@ -1,61 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto2";
-
-package protobuf_objc_unittest;
-option objc_class_prefix = "GPBTEST";
-
-// Verify that enum types and values get the prefix.
-message TestObjcProtoPrefixMessage {
-}
-
-// Verify that messages that don't already have the prefix get a prefix.
-enum TestObjcProtoPrefixEnum {
-  value = 1;
-}
-
-// Verify that messages that already have a prefix aren't prefixed twice.
-message GPBTESTTestHasAPrefixMessage {
-}
-
-// Verify that enums that already have a prefix aren't prefixed twice.
-enum GPBTESTTestHasAPrefixEnum {
-  valueB = 1;
-}
-
-// Verify that classes that have the prefix followed by a lowercase
-// letter DO get the prefix.
-message GPBTESTshouldGetAPrefixMessage {
-}
-
-// Verify that classes named the same as prefixes are prefixed.
-message GPBTEST {
-}
diff --git a/libs/protobuf/objectivec/Tests/unittest_objc_startup.proto b/libs/protobuf/objectivec/Tests/unittest_objc_startup.proto
deleted file mode 100644
index aee7bd5..0000000
--- a/libs/protobuf/objectivec/Tests/unittest_objc_startup.proto
+++ /dev/null
@@ -1,49 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto2";
-
-package protobuf_objc_unittest;
-
-message TestObjCStartupMessage {
-  extensions 1 to max;
-}
-
-extend TestObjCStartupMessage {
-  // Singular
-  optional    int32 optional_int32_extension    = 1;
-  repeated    int32 repeated_int32_extension    = 2;
-}
-
-message TestObjCStartupNested {
-  extend TestObjCStartupMessage {
-    optional string nested_string_extension = 3;
-  }
-}
diff --git a/libs/protobuf/objectivec/Tests/unittest_runtime_proto2.proto b/libs/protobuf/objectivec/Tests/unittest_runtime_proto2.proto
deleted file mode 100644
index ed83502..0000000
--- a/libs/protobuf/objectivec/Tests/unittest_runtime_proto2.proto
+++ /dev/null
@@ -1,128 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto2";
-
-package protobuf_unittest;
-
-message Message2 {
-  enum Enum {
-    FOO = 0;
-    BAR = 1;
-    BAZ = 2;
-    EXTRA_2 = 20;
-  }
-
-  optional    int32 optional_int32    =  1;
-  optional    int64 optional_int64    =  2;
-  optional   uint32 optional_uint32   =  3;
-  optional   uint64 optional_uint64   =  4;
-  optional   sint32 optional_sint32   =  5;
-  optional   sint64 optional_sint64   =  6;
-  optional  fixed32 optional_fixed32  =  7;
-  optional  fixed64 optional_fixed64  =  8;
-  optional sfixed32 optional_sfixed32 =  9;
-  optional sfixed64 optional_sfixed64 = 10;
-  optional    float optional_float    = 11;
-  optional   double optional_double   = 12;
-  optional     bool optional_bool     = 13;
-  optional   string optional_string   = 14;
-  optional    bytes optional_bytes    = 15;
-  optional group OptionalGroup = 16 {
-    optional int32 a = 17;
-  }
-  optional Message2  optional_message = 18;
-  optional Enum         optional_enum = 19;
-
-  repeated    int32 repeated_int32    = 31;
-  repeated    int64 repeated_int64    = 32;
-  repeated   uint32 repeated_uint32   = 33;
-  repeated   uint64 repeated_uint64   = 34;
-  repeated   sint32 repeated_sint32   = 35;
-  repeated   sint64 repeated_sint64   = 36;
-  repeated  fixed32 repeated_fixed32  = 37;
-  repeated  fixed64 repeated_fixed64  = 38;
-  repeated sfixed32 repeated_sfixed32 = 39;
-  repeated sfixed64 repeated_sfixed64 = 40;
-  repeated    float repeated_float    = 41;
-  repeated   double repeated_double   = 42;
-  repeated     bool repeated_bool     = 43;
-  repeated   string repeated_string   = 44;
-  repeated    bytes repeated_bytes    = 45;
-  repeated group RepeatedGroup = 46 {
-    optional int32 a = 47;
-  }
-  repeated Message2 repeated_message  = 48;
-  repeated Enum     repeated_enum     = 49;
-
-  oneof o {
-       int32 oneof_int32    = 51 [default = 100];
-       int64 oneof_int64    = 52 [default = 101];
-      uint32 oneof_uint32   = 53 [default = 102];
-      uint64 oneof_uint64   = 54 [default = 103];
-      sint32 oneof_sint32   = 55 [default = 104];
-      sint64 oneof_sint64   = 56 [default = 105];
-     fixed32 oneof_fixed32  = 57 [default = 106];
-     fixed64 oneof_fixed64  = 58 [default = 107];
-    sfixed32 oneof_sfixed32 = 59 [default = 108];
-    sfixed64 oneof_sfixed64 = 60 [default = 109];
-       float oneof_float    = 61 [default = 110];
-      double oneof_double   = 62 [default = 111];
-        bool oneof_bool     = 63 [default = true];
-      string oneof_string   = 64 [default = "string"];
-       bytes oneof_bytes    = 65 [default = "data"];
-       group OneofGroup     = 66 {
-         optional int32 a = 67;
-         optional int32 b = 167;
-       }
-     Message2 oneof_message = 68;
-     Enum        oneof_enum = 69 [default = BAZ];
-  }
-
-  // Some token map cases, too many combinations to list them all.
-  map<int32   , int32   > map_int32_int32       = 70;
-  map<int64   , int64   > map_int64_int64       = 71;
-  map<uint32  , uint32  > map_uint32_uint32     = 72;
-  map<uint64  , uint64  > map_uint64_uint64     = 73;
-  map<sint32  , sint32  > map_sint32_sint32     = 74;
-  map<sint64  , sint64  > map_sint64_sint64     = 75;
-  map<fixed32 , fixed32 > map_fixed32_fixed32   = 76;
-  map<fixed64 , fixed64 > map_fixed64_fixed64   = 77;
-  map<sfixed32, sfixed32> map_sfixed32_sfixed32 = 78;
-  map<sfixed64, sfixed64> map_sfixed64_sfixed64 = 79;
-  map<int32   , float   > map_int32_float       = 80;
-  map<int32   , double  > map_int32_double      = 81;
-  map<bool    , bool    > map_bool_bool         = 82;
-  map<string  , string  > map_string_string     = 83;
-  map<string  , bytes   > map_string_bytes      = 84;
-  map<string  , Message2> map_string_message    = 85;
-  map<int32   , bytes   > map_int32_bytes       = 86;
-  map<int32   , Enum    > map_int32_enum        = 87;
-  map<int32   , Message2> map_int32_message     = 88;
-}
diff --git a/libs/protobuf/objectivec/Tests/unittest_runtime_proto3.proto b/libs/protobuf/objectivec/Tests/unittest_runtime_proto3.proto
deleted file mode 100644
index c2ee5fb..0000000
--- a/libs/protobuf/objectivec/Tests/unittest_runtime_proto3.proto
+++ /dev/null
@@ -1,149 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto3";
-
-package protobuf_unittest;
-
-message Message3 {
-  enum Enum {
-    FOO = 0;
-    BAR = 1;
-    BAZ = 2;
-    EXTRA_3 = 30;
-  }
-
-     int32 optional_int32    =  1;
-     int64 optional_int64    =  2;
-    uint32 optional_uint32   =  3;
-    uint64 optional_uint64   =  4;
-    sint32 optional_sint32   =  5;
-    sint64 optional_sint64   =  6;
-   fixed32 optional_fixed32  =  7;
-   fixed64 optional_fixed64  =  8;
-  sfixed32 optional_sfixed32 =  9;
-  sfixed64 optional_sfixed64 = 10;
-     float optional_float    = 11;
-    double optional_double   = 12;
-      bool optional_bool     = 13;
-    string optional_string   = 14;
-     bytes optional_bytes    = 15;
-  // No 'group' in proto3.
-  Message3 optional_message  = 18;
-      Enum optional_enum     = 19;
-
-  repeated    int32 repeated_int32    = 31;
-  repeated    int64 repeated_int64    = 32;
-  repeated   uint32 repeated_uint32   = 33;
-  repeated   uint64 repeated_uint64   = 34;
-  repeated   sint32 repeated_sint32   = 35;
-  repeated   sint64 repeated_sint64   = 36;
-  repeated  fixed32 repeated_fixed32  = 37;
-  repeated  fixed64 repeated_fixed64  = 38;
-  repeated sfixed32 repeated_sfixed32 = 39;
-  repeated sfixed64 repeated_sfixed64 = 40;
-  repeated    float repeated_float    = 41;
-  repeated   double repeated_double   = 42;
-  repeated     bool repeated_bool     = 43;
-  repeated   string repeated_string   = 44;
-  repeated    bytes repeated_bytes    = 45;
-  // No 'group' in proto3.
-  repeated Message3 repeated_message  = 48;
-  repeated     Enum repeated_enum     = 49;
-
-  oneof o {
-       int32 oneof_int32    = 51;
-       int64 oneof_int64    = 52;
-      uint32 oneof_uint32   = 53;
-      uint64 oneof_uint64   = 54;
-      sint32 oneof_sint32   = 55;
-      sint64 oneof_sint64   = 56;
-     fixed32 oneof_fixed32  = 57;
-     fixed64 oneof_fixed64  = 58;
-    sfixed32 oneof_sfixed32 = 59;
-    sfixed64 oneof_sfixed64 = 60;
-       float oneof_float    = 61;
-      double oneof_double   = 62;
-        bool oneof_bool     = 63;
-      string oneof_string   = 64;
-       bytes oneof_bytes    = 65;
-    // No 'group' in proto3.
-    Message3 oneof_message  = 68;
-        Enum oneof_enum     = 69;
-  }
-
-  // Some token map cases, too many combinations to list them all.
-  map<int32   , int32   > map_int32_int32       = 70;
-  map<int64   , int64   > map_int64_int64       = 71;
-  map<uint32  , uint32  > map_uint32_uint32     = 72;
-  map<uint64  , uint64  > map_uint64_uint64     = 73;
-  map<sint32  , sint32  > map_sint32_sint32     = 74;
-  map<sint64  , sint64  > map_sint64_sint64     = 75;
-  map<fixed32 , fixed32 > map_fixed32_fixed32   = 76;
-  map<fixed64 , fixed64 > map_fixed64_fixed64   = 77;
-  map<sfixed32, sfixed32> map_sfixed32_sfixed32 = 78;
-  map<sfixed64, sfixed64> map_sfixed64_sfixed64 = 79;
-  map<int32   , float   > map_int32_float       = 80;
-  map<int32   , double  > map_int32_double      = 81;
-  map<bool    , bool    > map_bool_bool         = 82;
-  map<string  , string  > map_string_string     = 83;
-  map<string  , bytes   > map_string_bytes      = 84;
-  map<string  , Message3> map_string_message    = 85;
-  map<int32   , bytes   > map_int32_bytes       = 86;
-  map<int32   , Enum    > map_int32_enum        = 87;
-  map<int32   , Message3> map_int32_message     = 88;
-}
-
-message Message3Optional {
-  enum Enum {
-    FOO = 0;
-    BAR = 1;
-    BAZ = 2;
-    EXTRA_3 = 30;
-  }
-
-  optional    int32 optional_int32    =  1;
-  optional    int64 optional_int64    =  2;
-  optional   uint32 optional_uint32   =  3;
-  optional   uint64 optional_uint64   =  4;
-  optional   sint32 optional_sint32   =  5;
-  optional   sint64 optional_sint64   =  6;
-  optional  fixed32 optional_fixed32  =  7;
-  optional  fixed64 optional_fixed64  =  8;
-  optional sfixed32 optional_sfixed32 =  9;
-  optional sfixed64 optional_sfixed64 = 10;
-  optional    float optional_float    = 11;
-  optional   double optional_double   = 12;
-  optional     bool optional_bool     = 13;
-  optional   string optional_string   = 14;
-  optional    bytes optional_bytes    = 15;
-  // No 'group' in proto3.
-  optional Message3  optional_message = 18;
-  optional Enum         optional_enum = 19;
-}
diff --git a/libs/protobuf/objectivec/generate_well_known_types.sh b/libs/protobuf/objectivec/generate_well_known_types.sh
deleted file mode 100755
index 1b9de6e..0000000
--- a/libs/protobuf/objectivec/generate_well_known_types.sh
+++ /dev/null
@@ -1,89 +0,0 @@
-#!/bin/bash
-
-# Run this script to regenerate *.pbobjc.{h,m} for the well known types after
-# the protocol compiler changes.
-
-# HINT:  Flags passed to generate_well_known_types.sh will be passed directly
-#   to make when building protoc.  This is particularly useful for passing
-#   -j4 to run 4 jobs simultaneously.
-
-set -eu
-
-readonly ScriptDir=$(dirname "$(echo $0 | sed -e "s,^\([^/]\),$(pwd)/\1,")")
-readonly ObjCDir="${ScriptDir}"
-readonly ProtoRootDir="${ObjCDir}/.."
-
-# Flag for continuous integration to check that everything is current.
-CHECK_ONLY=0
-if [[ $# -ge 1 && ( "$1" == "--check-only" ) ]] ; then
-  CHECK_ONLY=1
-  shift
-fi
-
-cd "${ProtoRootDir}"
-
-if [[ ! -e src/google/protobuf/stubs/common.h ]]; then
-  cat >&2 << __EOF__
-Could not find source code.  Make sure you are running this script from the
-root of the distribution tree.
-__EOF__
-  exit 1
-fi
-
-if [[ ! -e src/Makefile ]]; then
-  cat >&2 << __EOF__
-Could not find src/Makefile.  You must run ./configure (and perhaps
-./autogen.sh) first.
-__EOF__
-  exit 1
-fi
-
-# Make sure the compiler is current.
-cd src
-make $@ protoc
-
-declare -a RUNTIME_PROTO_FILES=( \
-  google/protobuf/any.proto \
-  google/protobuf/api.proto \
-  google/protobuf/duration.proto \
-  google/protobuf/empty.proto \
-  google/protobuf/field_mask.proto \
-  google/protobuf/source_context.proto \
-  google/protobuf/struct.proto \
-  google/protobuf/timestamp.proto \
-  google/protobuf/type.proto \
-  google/protobuf/wrappers.proto)
-
-declare -a OBJC_EXTENSIONS=( .pbobjc.h .pbobjc.m )
-
-# Generate to a temp directory to see if they match.
-TMP_DIR=$(mktemp -d)
-trap "rm -rf ${TMP_DIR}" EXIT
-./protoc --objc_out="${TMP_DIR}" ${RUNTIME_PROTO_FILES[@]}
-
-DID_COPY=0
-for PROTO_FILE in "${RUNTIME_PROTO_FILES[@]}"; do
-  DIR=${PROTO_FILE%/*}
-  BASE_NAME=${PROTO_FILE##*/}
-  # Drop the extension
-  BASE_NAME=${BASE_NAME%.*}
-  OBJC_NAME=$(echo "${BASE_NAME}" | awk -F _ '{for(i=1; i<=NF; i++) printf "%s", toupper(substr($i,1,1)) substr($i,2);}')
-
-  for EXT in "${OBJC_EXTENSIONS[@]}"; do
-    if ! diff "${ObjCDir}/GPB${OBJC_NAME}${EXT}" "${TMP_DIR}/${DIR}/${OBJC_NAME}${EXT}" > /dev/null 2>&1 ; then
-      if [[ "${CHECK_ONLY}" == 1 ]] ; then
-        echo "ERROR: The WKTs need to be regenerated! Run $0"
-        exit 1
-      fi
-
-      echo "INFO: Updating GPB${OBJC_NAME}${EXT}"
-      cp "${TMP_DIR}/${DIR}/${OBJC_NAME}${EXT}" "${ObjCDir}/GPB${OBJC_NAME}${EXT}"
-      DID_COPY=1
-    fi
-  done
-done
-
-if [[ "${DID_COPY}" == 0 ]]; then
-  echo "INFO: Generated source for WellKnownTypes is current."
-  exit 0
-fi
diff --git a/libs/protobuf/objectivec/google/protobuf/Any.pbobjc.h b/libs/protobuf/objectivec/google/protobuf/Any.pbobjc.h
deleted file mode 100644
index e6d1b74..0000000
--- a/libs/protobuf/objectivec/google/protobuf/Any.pbobjc.h
+++ /dev/null
@@ -1,2 +0,0 @@
-// Moved to root of objectivec directory, shim to keep anyone's imports working.
-#import "GPBAny.pbobjc.h"
diff --git a/libs/protobuf/objectivec/google/protobuf/Api.pbobjc.h b/libs/protobuf/objectivec/google/protobuf/Api.pbobjc.h
deleted file mode 100644
index e7957db..0000000
--- a/libs/protobuf/objectivec/google/protobuf/Api.pbobjc.h
+++ /dev/null
@@ -1,2 +0,0 @@
-// Moved to root of objectivec directory, shim to keep anyone's imports working.
-#import "GPBApi.pbobjc.h"
diff --git a/libs/protobuf/objectivec/google/protobuf/Duration.pbobjc.h b/libs/protobuf/objectivec/google/protobuf/Duration.pbobjc.h
deleted file mode 100644
index fabf00f..0000000
--- a/libs/protobuf/objectivec/google/protobuf/Duration.pbobjc.h
+++ /dev/null
@@ -1,2 +0,0 @@
-// Moved to root of objectivec directory, shim to keep anyone's imports working.
-#import "GPBDuration.pbobjc.h"
diff --git a/libs/protobuf/objectivec/google/protobuf/Empty.pbobjc.h b/libs/protobuf/objectivec/google/protobuf/Empty.pbobjc.h
deleted file mode 100644
index 4de9108..0000000
--- a/libs/protobuf/objectivec/google/protobuf/Empty.pbobjc.h
+++ /dev/null
@@ -1,2 +0,0 @@
-// Moved to root of objectivec directory, shim to keep anyone's imports working.
-#import "GPBEmpty.pbobjc.h"
diff --git a/libs/protobuf/objectivec/google/protobuf/FieldMask.pbobjc.h b/libs/protobuf/objectivec/google/protobuf/FieldMask.pbobjc.h
deleted file mode 100644
index 2691320..0000000
--- a/libs/protobuf/objectivec/google/protobuf/FieldMask.pbobjc.h
+++ /dev/null
@@ -1,2 +0,0 @@
-// Moved to root of objectivec directory, shim to keep anyone's imports working.
-#import "GPBFieldMask.pbobjc.h"
diff --git a/libs/protobuf/objectivec/google/protobuf/SourceContext.pbobjc.h b/libs/protobuf/objectivec/google/protobuf/SourceContext.pbobjc.h
deleted file mode 100644
index 321dfec..0000000
--- a/libs/protobuf/objectivec/google/protobuf/SourceContext.pbobjc.h
+++ /dev/null
@@ -1,2 +0,0 @@
-// Moved to root of objectivec directory, shim to keep anyone's imports working.
-#import "GPBSourceContext.pbobjc.h"
diff --git a/libs/protobuf/objectivec/google/protobuf/Struct.pbobjc.h b/libs/protobuf/objectivec/google/protobuf/Struct.pbobjc.h
deleted file mode 100644
index 1173d16..0000000
--- a/libs/protobuf/objectivec/google/protobuf/Struct.pbobjc.h
+++ /dev/null
@@ -1,2 +0,0 @@
-// Moved to root of objectivec directory, shim to keep anyone's imports working.
-#import "GPBStruct.pbobjc.h"
diff --git a/libs/protobuf/objectivec/google/protobuf/Timestamp.pbobjc.h b/libs/protobuf/objectivec/google/protobuf/Timestamp.pbobjc.h
deleted file mode 100644
index 6a7cef8..0000000
--- a/libs/protobuf/objectivec/google/protobuf/Timestamp.pbobjc.h
+++ /dev/null
@@ -1,2 +0,0 @@
-// Moved to root of objectivec directory, shim to keep anyone's imports working.
-#import "GPBTimestamp.pbobjc.h"
diff --git a/libs/protobuf/objectivec/google/protobuf/Type.pbobjc.h b/libs/protobuf/objectivec/google/protobuf/Type.pbobjc.h
deleted file mode 100644
index e14e7cd..0000000
--- a/libs/protobuf/objectivec/google/protobuf/Type.pbobjc.h
+++ /dev/null
@@ -1,2 +0,0 @@
-// Moved to root of objectivec directory, shim to keep anyone's imports working.
-#import "GPBType.pbobjc.h"
diff --git a/libs/protobuf/objectivec/google/protobuf/Wrappers.pbobjc.h b/libs/protobuf/objectivec/google/protobuf/Wrappers.pbobjc.h
deleted file mode 100644
index 8365afc..0000000
--- a/libs/protobuf/objectivec/google/protobuf/Wrappers.pbobjc.h
+++ /dev/null
@@ -1,2 +0,0 @@
-// Moved to root of objectivec directory, shim to keep anyone's imports working.
-#import "GPBWrappers.pbobjc.h"
diff --git a/libs/protobuf/php/BUILD.bazel b/libs/protobuf/php/BUILD.bazel
deleted file mode 100644
index 7fededa..0000000
--- a/libs/protobuf/php/BUILD.bazel
+++ /dev/null
@@ -1,107 +0,0 @@
-# Protobuf PHP runtime
-#
-# See also code generation logic under /src/google/protobuf/compiler/php.
-
-load("@rules_pkg//:pkg.bzl", "pkg_tar")
-load("@rules_pkg//:mappings.bzl", "pkg_files", "pkg_filegroup", "strip_prefix")
-load("//:protobuf_version.bzl", "PROTOBUF_PHP_VERSION")
-
-pkg_files(
-    name = "dist_files",
-    srcs = glob([
-        "ext/google/protobuf/**/*",
-        "src/GPBMetadata/Google/Protobuf/**/*.php",
-        "src/Google/Protobuf/**/*.php",
-        "tests/*.php",
-        "tests/*.sh",
-        "tests/generated_previous/**/*.php",
-        "tests/proto/**/*.proto",
-        "tests/proto_previous/*.proto",
-    ]) + [
-        "BUILD.bazel",
-        "README.md",
-        "REFCOUNTING.md",
-        "composer.json",
-        "generate_descriptor_protos.sh",
-        "generate_test_protos.sh",
-        "release.sh",
-        "src/phpdoc.dist.xml",
-        "tests/valgrind.supp",
-    ],
-    prefix = "php",
-    strip_prefix = strip_prefix.from_pkg(""),
-    visibility = ["//pkg:__pkg__"],
-)
-
-################################################################################
-# PECL .tgz Release
-################################################################################
-
-pkg_files(
-  name = "php_ext_source_files",
-  srcs = glob([
-    "ext/google/protobuf/*.h",
-    "ext/google/protobuf/*.c",
-  ]) + [
-    "//:LICENSE",
-    "ext/google/protobuf/config.m4",
-    "ext/google/protobuf/wkt.inc",
-  ],
-)
-
-pkg_files(
-  name = "utf8_range_files",
-  srcs = [
-    "//third_party/utf8_range:utf8_range_srcs",
-     "//third_party/utf8_range:LICENSE",
-
-  ],
-  prefix = "third_party/utf8_range",
-)
-
-pkg_filegroup(
-  name = "pecl_release_files",
-  srcs = [
-    ":php_ext_source_files",
-    ":utf8_range_files",
-  ],
-  prefix = "protobuf-%s" % PROTOBUF_PHP_VERSION,
-)
-
-# PECL .tgz without package.xml
-pkg_tar(
-  name = "release_without_package",
-  extension = "tgz",
-  srcs = [
-    ":pecl_release_files",
-  ],
-  out = "release_without_package.tgz",
-)
-
-# Generate PECL package.xml
-genrule(
-    name = "generate_package_xml",
-    srcs = [
-      ":release_without_package",
-      "ext/google/protobuf/template_package.xml",
-    ],
-    outs = ["package.xml"],
-    cmd = " ".join([
-      "$(location ext/google/protobuf/generate_package_xml.sh)",
-      "$(location ext/google/protobuf/template_package.xml)",
-      PROTOBUF_PHP_VERSION,
-      "$$(tar -tf $(location :release_without_package) | sed -z -e 's;\\n;,;g')",
-      "$(location package.xml)"
-    ]),
-    tools = ["ext/google/protobuf/generate_package_xml.sh"],
-)
-
-pkg_tar(
-  name = "release",
-  extension = "tgz",
-  srcs = [
-    ":pecl_release_files",
-    ":generate_package_xml",
-  ],
-  out = "protobuf-%s.tgz" % PROTOBUF_PHP_VERSION,
-)
\ No newline at end of file
diff --git a/libs/protobuf/php/README.md b/libs/protobuf/php/README.md
deleted file mode 100644
index c4292cf..0000000
--- a/libs/protobuf/php/README.md
+++ /dev/null
@@ -1,139 +0,0 @@
-This directory contains the Protocol Buffers runtime implementation via both a
-pure PHP package and a native c extension. The pure PHP package is intended to
-provide usability to wider range of PHP platforms, while the c extension is
-intended to provide higher performance. Both implementations provide the same
-runtime APIs and share the same generated code. Users don’t need to re-generate
-code for the same proto definition when they want to switch the implementation
-later.
-
-Both implementations make use of generated PHP code that defines message and
-enum types in PHP. We strongly recommend using protoc's PHP generation support
-with .proto files. The build process in this directory only installs the
-extension/package; you need to install protoc as well to have PHP code
-generation functionality.
-
-## Requirements
-
-To use PHP runtime library requires:
-
-- C extension: PHP 7.x, 8.0
-- [PHP package](http://php.net/downloads.php): PHP 5.5, 5.6, 7.x, or 8.0.
-
-## Installation
-
-### C Extension
-
-#### Prerequirements
-
-To install the c extension, the following tools are needed:
-* autoconf
-* automake
-* libtool
-* make
-* gcc
-* pear
-* pecl
-
-On Ubuntu, you can install them with:
-```
-sudo apt-get install -y php-pear php5-dev autoconf automake libtool make gcc
-```
-On other platforms, please use the corresponding package managing tool to
-install them before proceeding.
-
-#### Installation from Source (Building extension)
-
-To build the c extension, run the following command:
-```
-cd ext/google/protobuf
-pear package
-sudo pecl install protobuf-{VERSION}.tgz
-```
-
-#### Installation from PECL
-
-When we release a version of Protocol Buffers, we will upload the extension to
-[PECL](https://pecl.php.net/). To use this pre-packaged extension, simply
-install it as you would any other extension:
-
-```
-sudo pecl install protobuf-{VERSION}
-```
-
-### PHP Package
-
-#### Installation from composer
-
-Simply add "google/protobuf" to the 'require' section of composer.json in your
-project.
-
-### Protoc
-
-Once the extension or package is installed, if you wish to generate PHP code
-from a `.proto` file, you will also want to install the Protocol Buffers
-compiler (protoc), as described in this repository's main `README` file.  The
-version of `protoc` included in the latest release supports the `--php_out`
-option to generate PHP code:
-```
-protoc --php_out=out_dir test.proto
-```
-
-## Usage
-
-For generated code:
-  https://developers.google.com/protocol-buffers/docs/reference/php-generated
-
-Known Issues
-------------
-
-* Missing native support for well known types.
-* Missing support for proto2.
-* No API provided for clear/copy messages.
-* No API provided for encoding/decoding with stream.
-* Map fields may not be garbage-collected if there is cycle reference.
-* No debug information for messages in c extension.
-* HHVM not tested.
-* C extension not tested on windows, mac, php 7.0.
-* Message name cannot be Empty.
-
-## Development
-
-### Docker Image
-
-We provide a docker image for php development, which is also used in our automatic tests:
-```
-docker run --security-opt seccomp=unconfined -it protobuftesting/php_8dbe419c6df1a8b3af0ae3a267c112efb436b45c
-```
-
-### Test Native PHP
-
-```
-# Download protobuf
-git clone https://github.com/protocolbuffers/protobuf.git
-cd protobuf
-
-# Build protoc
-./autogen.sh
-./configure
-make -j4
-
-# Test native php
-cd php
-composer install
-composer test
-```
-
-### Test C Extension
-
-After you have finished testing the native php, you can test the c extension:
-```
-cd tests
-./test.sh 5.6 # The php runtime version.
-              # We provide 5.5, 5.5-zts, 5.6, 5.6-zts, 7.0, 7.0-zts, 7.1, 7.1-zts, 7.2, 7.2-zts, 7.3 and 7.3-zts
-              # ls /usr/local for more details
-```
-
-If you want to use gdb to debug the c extension, you can do:
-```
-./gdb_test.sh
-```
diff --git a/libs/protobuf/php/REFCOUNTING.md b/libs/protobuf/php/REFCOUNTING.md
deleted file mode 100644
index 26ca717..0000000
--- a/libs/protobuf/php/REFCOUNTING.md
+++ /dev/null
@@ -1,112 +0,0 @@
-
-# Refcounting Tips
-
-One of the trickiest parts of the C extension for PHP is getting the refcounting
-right.  These are some notes about the basics of what you should know,
-especially if you're not super familiar with PHP's C API.
-
-These notes cover the same general material as [the Memory Management chapter of
-the PHP internal's
-book](https://www.phpinternalsbook.com/php7/zvals/memory_management.html), but
-calls out some points that were not immediately clear to me.
-
-##  Zvals
-
-In the PHP C API, the `zval` type is roughly analogous to a variable in PHP, eg:
-
-```php
-    // Think of $a as a "zval".
-    $a = [];
-```
-
-The equivalent PHP C code would be:
-
-```c
-    zval a;
-    ZVAL_NEW_ARR(&a);  // Allocates and assigns a new array.
-```
-
-PHP is reference counted, so each variable -- and thus each zval -- will have a
-reference on whatever it points to (unless its holding a data type that isn't
-refcounted at all, like numbers). Since the zval owns a reference, it must be
-explicitly destroyed in order to release this reference.
-
-```c
-    zval a;
-    ZVAL_NEW_ARR(&a);
-
-    // The destructor for a zval, this must be called or the ref will be leaked.
-    zval_ptr_dtor(&a);
-```
-
-Whenever you see a `zval`, you can assume it owns a ref (or is storing a
-non-refcounted type). If you see a `zval*`, which is also quite common, then
-this is *pointing to* something that owns a ref, but it does not own a ref
-itself.
-
-The [`ZVAL_*` family of
-macros](https://github.com/php/php-src/blob/4030a00e8b6453aff929362bf9b25c193f72c94a/Zend/zend_types.h#L883-L1109)
-initializes a `zval` from a specific value type.  A few examples:
-
-* `ZVAL_NULL(&zv)`: initializes the value to `null`
-* `ZVAL_LONG(&zv, 5)`: initializes a `zend_long` (integer) value
-* `ZVAL_ARR(&zv, arr)`: initializes a `zend_array*` value (refcounted)
-* `ZVAL_OBJ(&zv, obj)`: initializes a `zend_object*` value (refcounted)
-
-Note that all of our custom objects (messages, repeated fields, descriptors,
-etc) are `zend_object*`.
-
-The variants that initialize from a refcounted type do *not* increase the
-refcount. This makes them suitable for initializing from a newly-created object:
-
-```c
-    zval zv;
-    ZVAL_OBJ(&zv, CreateObject());
-```
-
-Once in a while, we want to initialize a `zval` while also increasing the
-reference count. For this we can use `ZVAL_OBJ_COPY()`:
-
-```c
-zend_object *some_global;
-
-void GetGlobal(zval *zv) {
-    // We want to create a new ref to an existing object.
-    ZVAL_OBJ_COPY(zv, some_global);
-}
-```
-
-## Transferring references
-
-A `zval`'s ref must be released at some point. While `zval_ptr_dtor()` is the
-simplest way of releasing a ref, it is not the most common (at least in our code
-base). More often, we are returning the `zval` back to PHP from C.
-
-```c
-    zval zv;
-    InitializeOurZval(&zv);
-    // Returns the value of zv to the caller and donates our ref.
-    RETURN_COPY_VALUE(&zv);
-```
-
-The `RETURN_COPY_VALUE()` macro (standard in PHP 8.x, and polyfilled in earlier
-versions) is the most common way we return a value back to PHP, because it
-donates our `zval`'s refcount to the caller, and thus saves us from needing to
-destroy our `zval` explicitly. This is ideal when we have a full `zval` to
-return.
-
-Once in a while we have a `zval*` to return instead. For example when we parse
-parameters to our function and ask for a `zval`, PHP will give us pointers to
-the existing `zval` structures instead of creating new ones.
-
-```c
-    zval *val;
-    if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &val) == FAILURE) {
-      return;
-    }
-    // Returns a copy of this zval, adding a ref in the process.
-    RETURN_COPY(val);
-```
-
-When we use `RETURN_COPY`, the refcount is increased; this is perfect for
-returning a `zval*` when we do not own a ref on it.
diff --git a/libs/protobuf/php/composer.json b/libs/protobuf/php/composer.json
deleted file mode 100644
index 436142f..0000000
--- a/libs/protobuf/php/composer.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "name": "google/protobuf",
-  "type": "library",
-  "description": "proto library for PHP",
-  "keywords": ["proto"],
-  "homepage": "https://developers.google.com/protocol-buffers/",
-  "license": "BSD-3-Clause",
-  "require": {
-    "php": ">=7.0.0"
-  },
-  "require-dev": {
-    "phpunit/phpunit": ">=5.0.0 <8.5.27"
-  },
-  "autoload": {
-    "psr-4": {
-      "Google\\Protobuf\\": "src/Google/Protobuf",
-      "GPBMetadata\\Google\\Protobuf\\": "src/GPBMetadata/Google/Protobuf"
-    }
-  },
-  "autoload-dev": {
-    "psr-4": {
-      "": "tmp"
-    },
-    "classmap": [
-      "tests/generated_previous"
-    ]
-  },
-  "scripts": {
-    "test_c": "./generate_test_protos.sh && ./tests/compile_extension.sh && php -dextension=ext/google/protobuf/modules/protobuf.so vendor/bin/phpunit --bootstrap tests/force_c_ext.php tests",
-    "test_valgrind": "./generate_test_protos.sh && ./tests/compile_extension.sh && ZEND_DONT_UNLOAD_MODULES=1 USE_ZEND_ALLOC=0 valgrind --leak-check=full --error-exitcode=1 php -dextension=ext/google/protobuf/modules/protobuf.so vendor/bin/phpunit --bootstrap tests/force_c_ext.php tests",
-    "test": "./generate_test_protos.sh && vendor/bin/phpunit tests",
-    "aggregate_metadata_test": "./generate_test_protos.sh --aggregate_metadata && vendor/bin/phpunit tests"
-  }
-}
diff --git a/libs/protobuf/php/composer.json.dist b/libs/protobuf/php/composer.json.dist
deleted file mode 100644
index 70af0a0..0000000
--- a/libs/protobuf/php/composer.json.dist
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "name": "google/protobuf",
-  "type": "library",
-  "description": "proto library for PHP",
-  "keywords": ["proto"],
-  "homepage": "https://developers.google.com/protocol-buffers/",
-  "license": "BSD-3-Clause",
-  "require": {
-    "php": ">=7.0.0"
-  },
-  "require-dev": {
-    "phpunit/phpunit": ">=5.0.0"
-  },
-  "suggest": {
-    "ext-bcmath": "Need to support JSON deserialization"
-  },
-  "autoload": {
-    "psr-4": {
-      "Google\\Protobuf\\": "src/Google/Protobuf",
-      "GPBMetadata\\Google\\Protobuf\\": "src/GPBMetadata/Google/Protobuf"
-    }
-  }
-}
diff --git a/libs/protobuf/php/ext/google/protobuf/arena.c b/libs/protobuf/php/ext/google/protobuf/arena.c
deleted file mode 100644
index bc639ba..0000000
--- a/libs/protobuf/php/ext/google/protobuf/arena.c
+++ /dev/null
@@ -1,95 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <Zend/zend_API.h>
-
-#include "php-upb.h"
-
-// -----------------------------------------------------------------------------
-// Arena
-// -----------------------------------------------------------------------------
-
-typedef struct Arena {
-  zend_object std;
-  upb_Arena* arena;
-} Arena;
-
-zend_class_entry *Arena_class_entry;
-static zend_object_handlers Arena_object_handlers;
-
-// PHP Object Handlers /////////////////////////////////////////////////////////
-
-static zend_object* Arena_Create(zend_class_entry *class_type) {
-  Arena *intern = emalloc(sizeof(Arena));
-  zend_object_std_init(&intern->std, class_type);
-  intern->std.handlers = &Arena_object_handlers;
-  intern->arena = upb_Arena_New();
-  // Skip object_properties_init(), we don't allow derived classes.
-  return &intern->std;
-}
-
-static void Arena_Free(zend_object* obj) {
-  Arena* intern = (Arena*)obj;
-  upb_Arena_Free(intern->arena);
-  zend_object_std_dtor(&intern->std);
-}
-
-// C Functions from arena.h ////////////////////////////////////////////////////
-
-void Arena_Init(zval* val) {
-  ZVAL_OBJ(val, Arena_Create(Arena_class_entry));
-}
-
-upb_Arena *Arena_Get(zval *val) {
-  Arena *a = (Arena*)Z_OBJ_P(val);
-  return a->arena;
-}
-
-// -----------------------------------------------------------------------------
-// Module init.
-// -----------------------------------------------------------------------------
-
-// No public methods.
-static const zend_function_entry Arena_methods[] = {
-  ZEND_FE_END
-};
-
-void Arena_ModuleInit() {
-  zend_class_entry tmp_ce;
-
-  INIT_CLASS_ENTRY(tmp_ce, "Google\\Protobuf\\Internal\\Arena", Arena_methods);
-  Arena_class_entry = zend_register_internal_class(&tmp_ce);
-  Arena_class_entry->create_object = Arena_Create;
-  Arena_class_entry->ce_flags |= ZEND_ACC_FINAL;
-
-  memcpy(&Arena_object_handlers, &std_object_handlers,
-         sizeof(zend_object_handlers));
-  Arena_object_handlers.free_obj = Arena_Free;
-}
diff --git a/libs/protobuf/php/ext/google/protobuf/arena.h b/libs/protobuf/php/ext/google/protobuf/arena.h
deleted file mode 100644
index 00895fc..0000000
--- a/libs/protobuf/php/ext/google/protobuf/arena.h
+++ /dev/null
@@ -1,47 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef PHP_PROTOBUF_ARENA_H_
-#define PHP_PROTOBUF_ARENA_H_
-
-#include <php.h>
-
-#include "php-upb.h"
-
-// Registers the PHP Arena class.
-void Arena_ModuleInit();
-
-// Creates and returns a new arena object that wraps a new upb_Arena*.
-void Arena_Init(zval *val);
-
-// Gets the underlying upb_Arena from this arena object.
-upb_Arena *Arena_Get(zval *arena);
-
-#endif  // PHP_PROTOBUF_ARENA_H_
diff --git a/libs/protobuf/php/ext/google/protobuf/array.c b/libs/protobuf/php/ext/google/protobuf/array.c
deleted file mode 100644
index 72c7809..0000000
--- a/libs/protobuf/php/ext/google/protobuf/array.c
+++ /dev/null
@@ -1,701 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include "array.h"
-
-#include <Zend/zend_API.h>
-#include <Zend/zend_interfaces.h>
-
-#include <ext/spl/spl_iterators.h>
-
-// This is not self-contained: it must be after other Zend includes.
-#include <Zend/zend_exceptions.h>
-
-#include "arena.h"
-#include "convert.h"
-#include "def.h"
-#include "message.h"
-#include "php-upb.h"
-#include "protobuf.h"
-
-static void RepeatedFieldIter_make(zval *val, zval *repeated_field);
-
-// -----------------------------------------------------------------------------
-// RepeatedField
-// -----------------------------------------------------------------------------
-
-typedef struct {
-  zend_object std;
-  zval arena;
-  upb_Array *array;
-  TypeInfo type;
-} RepeatedField;
-
-zend_class_entry *RepeatedField_class_entry;
-static zend_object_handlers RepeatedField_object_handlers;
-
-// PHP Object Handlers /////////////////////////////////////////////////////////
-
-/**
- * RepeatedField_create()
- *
- * PHP class entry function to allocate and initialize a new RepeatedField
- * object.
- */
-static zend_object* RepeatedField_create(zend_class_entry *class_type) {
-  RepeatedField *intern = emalloc(sizeof(RepeatedField));
-  zend_object_std_init(&intern->std, class_type);
-  intern->std.handlers = &RepeatedField_object_handlers;
-  Arena_Init(&intern->arena);
-  intern->array = NULL;
-  // Skip object_properties_init(), we don't allow derived classes.
-  return &intern->std;
-}
-
-/**
- * RepeatedField_dtor()
- *
- * Object handler to destroy a RepeatedField. This releases all resources
- * associated with the message. Note that it is possible to access a destroyed
- * object from PHP in rare cases.
- */
-static void RepeatedField_destructor(zend_object* obj) {
-  RepeatedField* intern = (RepeatedField*)obj;
-  ObjCache_Delete(intern->array);
-  zval_ptr_dtor(&intern->arena);
-  zend_object_std_dtor(&intern->std);
-}
-
-/**
- * RepeatedField_compare_objects()
- *
- * Object handler for comparing two repeated field objects. Called whenever PHP
- * code does:
- *
- *   $rf1 == $rf2
- */
-static int RepeatedField_compare_objects(zval *rf1, zval *rf2) {
-  RepeatedField* intern1 = (RepeatedField*)Z_OBJ_P(rf1);
-  RepeatedField* intern2 = (RepeatedField*)Z_OBJ_P(rf2);
-
-  return TypeInfo_Eq(intern1->type, intern2->type) &&
-                 ArrayEq(intern1->array, intern2->array, intern1->type)
-             ? 0
-             : 1;
-}
-
-/**
- * RepeatedField_clone_obj()
- *
- * Object handler for cloning an object in PHP. Called when PHP code does:
- *
- *   $rf2 = clone $rf1;
- */
-static zend_object *RepeatedField_clone_obj(PROTO_VAL *object) {
-  RepeatedField* intern = PROTO_VAL_P(object);
-  upb_Arena *arena = Arena_Get(&intern->arena);
-  upb_Array *clone = upb_Array_New(arena, intern->type.type);
-  size_t n = upb_Array_Size(intern->array);
-  size_t i;
-
-  for (i = 0; i < n; i++) {
-    upb_MessageValue msgval = upb_Array_Get(intern->array, i);
-    upb_Array_Append(clone, msgval, arena);
-  }
-
-  zval ret;
-  RepeatedField_GetPhpWrapper(&ret, clone, intern->type, &intern->arena);
-  return Z_OBJ_P(&ret);
-}
-
-static HashTable *RepeatedField_GetProperties(PROTO_VAL *object) {
-  return NULL;  // We do not have a properties table.
-}
-
-static zval *RepeatedField_GetPropertyPtrPtr(PROTO_VAL *object,
-                                             PROTO_STR *member,
-                                             int type, void **cache_slot) {
-  return NULL;  // We don't offer direct references to our properties.
-}
-
-// C Functions from array.h ////////////////////////////////////////////////////
-
-// These are documented in the header file.
-
-void RepeatedField_GetPhpWrapper(zval *val, upb_Array *arr, TypeInfo type,
-                                 zval *arena) {
-  if (!arr) {
-    ZVAL_NULL(val);
-    return;
-  }
-
-  if (!ObjCache_Get(arr, val)) {
-    RepeatedField *intern = emalloc(sizeof(RepeatedField));
-    zend_object_std_init(&intern->std, RepeatedField_class_entry);
-    intern->std.handlers = &RepeatedField_object_handlers;
-    ZVAL_COPY(&intern->arena, arena);
-    intern->array = arr;
-    intern->type = type;
-    // Skip object_properties_init(), we don't allow derived classes.
-    ObjCache_Add(intern->array, &intern->std);
-    ZVAL_OBJ(val, &intern->std);
-  }
-}
-
-upb_Array *RepeatedField_GetUpbArray(zval *val, TypeInfo type,
-                                     upb_Arena *arena) {
-  if (Z_ISREF_P(val)) {
-    ZVAL_DEREF(val);
-  }
-
-  if (Z_TYPE_P(val) == IS_ARRAY) {
-    // Auto-construct, eg. [1, 2, 3] -> upb_Array([1, 2, 3]).
-    upb_Array *arr = upb_Array_New(arena, type.type);
-    HashTable *table = HASH_OF(val);
-    HashPosition pos;
-
-    zend_hash_internal_pointer_reset_ex(table, &pos);
-
-    while (true) {
-      zval *zv = zend_hash_get_current_data_ex(table, &pos);
-      upb_MessageValue val;
-
-      if (!zv) return arr;
-
-      if (!Convert_PhpToUpbAutoWrap(zv, &val, type, arena)) {
-        return NULL;
-      }
-
-      upb_Array_Append(arr, val, arena);
-      zend_hash_move_forward_ex(table, &pos);
-    }
-  } else if (Z_TYPE_P(val) == IS_OBJECT &&
-             Z_OBJCE_P(val) == RepeatedField_class_entry) {
-    // Unwrap existing RepeatedField object to get the upb_Array* inside.
-    RepeatedField *intern = (RepeatedField*)Z_OBJ_P(val);
-
-    if (!TypeInfo_Eq(intern->type, type)) {
-      php_error_docref(NULL, E_USER_ERROR,
-                       "Wrong type for this repeated field.");
-    }
-
-    upb_Arena_Fuse(arena, Arena_Get(&intern->arena));
-    return intern->array;
-  } else {
-    php_error_docref(NULL, E_USER_ERROR, "Must be a repeated field");
-    return NULL;
-  }
-}
-
-bool ArrayEq(const upb_Array *a1, const upb_Array *a2, TypeInfo type) {
-  size_t i;
-  size_t n;
-
-  if ((a1 == NULL) != (a2 == NULL)) return false;
-  if (a1 == NULL) return true;
-
-  n = upb_Array_Size(a1);
-  if (n != upb_Array_Size(a2)) return false;
-
-  for (i = 0; i < n; i++) {
-    upb_MessageValue val1 = upb_Array_Get(a1, i);
-    upb_MessageValue val2 = upb_Array_Get(a2, i);
-    if (!ValueEq(val1, val2, type)) return false;
-  }
-
-  return true;
-}
-
-
-// RepeatedField PHP methods ///////////////////////////////////////////////////
-
-/**
- * RepeatedField::__construct()
- *
- * Constructs an instance of RepeatedField.
- * @param long Type of the stored element.
- * @param string Message/Enum class.
- */
-PHP_METHOD(RepeatedField, __construct) {
-  RepeatedField *intern = (RepeatedField*)Z_OBJ_P(getThis());
-  upb_Arena *arena = Arena_Get(&intern->arena);
-  zend_long type;
-  zend_class_entry* klass = NULL;
-
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "l|C", &type, &klass) != SUCCESS) {
-    return;
-  }
-
-  intern->type.type = pbphp_dtype_to_type(type);
-  intern->type.desc = Descriptor_GetFromClassEntry(klass);
-
-  if (intern->type.type == kUpb_CType_Message && klass == NULL) {
-    php_error_docref(NULL, E_USER_ERROR,
-                     "Message/enum type must have concrete class.");
-    return;
-  }
-
-  intern->array = upb_Array_New(arena, intern->type.type);
-  ObjCache_Add(intern->array, &intern->std);
-}
-
-/**
- * RepeatedField::append()
- *
- * Append element to the end of the repeated field.
- * @param object The element to be added.
- */
-PHP_METHOD(RepeatedField, append) {
-  RepeatedField *intern = (RepeatedField*)Z_OBJ_P(getThis());
-  upb_Arena *arena = Arena_Get(&intern->arena);
-  zval *php_val;
-  upb_MessageValue msgval;
-
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &php_val) != SUCCESS ||
-      !Convert_PhpToUpb(php_val, &msgval, intern->type, arena)) {
-    return;
-  }
-
-  upb_Array_Append(intern->array, msgval, arena);
-}
-
-/**
- * RepeatedField::offsetExists(): bool
- *
- * Implements the ArrayAccess interface. Invoked when PHP code calls:
- *
- *   isset($arr[$idx]);
- *   empty($arr[$idx]);
- *
- * @param long The index to be checked.
- * @return bool True if the element at the given index exists.
- */
-PHP_METHOD(RepeatedField, offsetExists) {
-  RepeatedField *intern = (RepeatedField*)Z_OBJ_P(getThis());
-  zend_long index;
-
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "l", &index) == FAILURE) {
-    return;
-  }
-
-  RETURN_BOOL(index >= 0 && index < upb_Array_Size(intern->array));
-}
-
-/**
- * RepeatedField::offsetGet(): mixed
- *
- * Implements the ArrayAccess interface. Invoked when PHP code calls:
- *
- *   $x = $arr[$idx];
- *
- * @param long The index of the element to be fetched.
- * @return object The stored element at given index.
- * @exception Invalid type for index.
- * @exception Non-existing index.
- */
-PHP_METHOD(RepeatedField, offsetGet) {
-  RepeatedField *intern = (RepeatedField*)Z_OBJ_P(getThis());
-  zend_long index;
-  upb_MessageValue msgval;
-  zval ret;
-
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "l", &index) == FAILURE) {
-    return;
-  }
-
-  if (index < 0 || index >= upb_Array_Size(intern->array)) {
-    zend_error(E_USER_ERROR, "Element at %ld doesn't exist.\n", index);
-    return;
-  }
-
-  msgval = upb_Array_Get(intern->array, index);
-  Convert_UpbToPhp(msgval, &ret, intern->type, &intern->arena);
-  RETURN_COPY_VALUE(&ret);
-}
-
-/**
- * RepeatedField::offsetSet(): void
- *
- * Implements the ArrayAccess interface. Invoked when PHP code calls:
- *
- *   $arr[$idx] = $x;
- *   $arr []= $x;  // Append
- *
- * @param long The index of the element to be assigned.
- * @param object The element to be assigned.
- * @exception Invalid type for index.
- * @exception Non-existing index.
- * @exception Incorrect type of the element.
- */
-PHP_METHOD(RepeatedField, offsetSet) {
-  RepeatedField *intern = (RepeatedField*)Z_OBJ_P(getThis());
-  upb_Arena *arena = Arena_Get(&intern->arena);
-  size_t size = upb_Array_Size(intern->array);
-  zval *offset, *val;
-  int64_t index;
-  upb_MessageValue msgval;
-
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "zz", &offset, &val) != SUCCESS) {
-    return;
-  }
-
-  if (Z_TYPE_P(offset) == IS_NULL) {
-    index = size;
-  } else if (!Convert_PhpToInt64(offset, &index)) {
-    return;
-  }
-
-  if (!Convert_PhpToUpb(val, &msgval, intern->type, arena)) {
-    return;
-  }
-
-  if (index > size) {
-    zend_error(E_USER_ERROR, "Element at index %ld doesn't exist.\n", index);
-  } else if (index == size) {
-    upb_Array_Append(intern->array, msgval, Arena_Get(&intern->arena));
-  } else {
-    upb_Array_Set(intern->array, index, msgval);
-  }
-}
-
-/**
- * RepeatedField::offsetUnset(): void
- *
- * Implements the ArrayAccess interface. Invoked when PHP code calls:
- *
- *   unset($arr[$idx]);
- *
- * @param long The index of the element to be removed.
- * @exception Invalid type for index.
- * @exception The element to be removed is not at the end of the RepeatedField.
- */
-PHP_METHOD(RepeatedField, offsetUnset) {
-  RepeatedField *intern = (RepeatedField*)Z_OBJ_P(getThis());
-  zend_long index;
-  zend_long size = upb_Array_Size(intern->array);
-
-  // Only the element at the end of the array can be removed.
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "l", &index) != SUCCESS) {
-    return;
-  }
-
-  if (size == 0 || index != size - 1) {
-    php_error_docref(NULL, E_USER_ERROR, "Cannot remove element at %ld.\n",
-                     index);
-    return;
-  }
-
-  upb_Array_Resize(intern->array, size - 1, Arena_Get(&intern->arena));
-}
-
-/**
- * RepeatedField::count(): int
- *
- * Implements the Countable interface. Invoked when PHP code calls:
- *
- *   $len = count($arr);
- * Return the number of stored elements.
- * This will also be called for: count($arr)
- * @return long The number of stored elements.
- */
-PHP_METHOD(RepeatedField, count) {
-  RepeatedField *intern = (RepeatedField*)Z_OBJ_P(getThis());
-
-  if (zend_parse_parameters_none() == FAILURE) {
-    return;
-  }
-
-  RETURN_LONG(upb_Array_Size(intern->array));
-}
-
-/**
- * RepeatedField::getIterator(): Traversable
- *
- * Implements the IteratorAggregate interface. Invoked when PHP code calls:
- *
- *   foreach ($arr) {}
- *
- * @return object Beginning iterator.
- */
-PHP_METHOD(RepeatedField, getIterator) {
-  zval ret;
-  RepeatedFieldIter_make(&ret, getThis());
-  RETURN_COPY_VALUE(&ret);
-}
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_construct, 0, 0, 1)
-  ZEND_ARG_INFO(0, type)
-  ZEND_ARG_INFO(0, class)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_append, 0, 0, 1)
-  ZEND_ARG_INFO(0, newval)
-ZEND_END_ARG_INFO()
-
-PROTOBUF_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_offsetExists, 0, 0, _IS_BOOL, 0)
-  ZEND_ARG_INFO(0, index)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_offsetGet, 0, 0, IS_MIXED, 1)
-  ZEND_ARG_INFO(0, index)
-ZEND_END_ARG_INFO()
-
-PROTOBUF_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_offsetSet, 0, 2, IS_VOID, 0)
-  ZEND_ARG_INFO(0, index)
-  ZEND_ARG_INFO(0, newval)
-ZEND_END_ARG_INFO()
-
-PROTOBUF_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_offsetUnset, 0, 0, IS_VOID, 0)
-  ZEND_ARG_INFO(0, index)
-ZEND_END_ARG_INFO()
-
-PROTOBUF_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_count, 0, 0, IS_LONG, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_getIterator, 0, 0, Traversable, 0)
-ZEND_END_ARG_INFO()
-
-static zend_function_entry repeated_field_methods[] = {
-  PHP_ME(RepeatedField, __construct,  arginfo_construct,    ZEND_ACC_PUBLIC)
-  PHP_ME(RepeatedField, append,       arginfo_append,       ZEND_ACC_PUBLIC)
-  PHP_ME(RepeatedField, offsetExists, arginfo_offsetExists, ZEND_ACC_PUBLIC)
-  PHP_ME(RepeatedField, offsetGet,    arginfo_offsetGet,    ZEND_ACC_PUBLIC)
-  PHP_ME(RepeatedField, offsetSet,    arginfo_offsetSet,    ZEND_ACC_PUBLIC)
-  PHP_ME(RepeatedField, offsetUnset,  arginfo_offsetUnset,  ZEND_ACC_PUBLIC)
-  PHP_ME(RepeatedField, count,        arginfo_count,        ZEND_ACC_PUBLIC)
-  PHP_ME(RepeatedField, getIterator,  arginfo_getIterator,  ZEND_ACC_PUBLIC)
-  ZEND_FE_END
-};
-
-// -----------------------------------------------------------------------------
-// PHP RepeatedFieldIter
-// -----------------------------------------------------------------------------
-
-typedef struct {
-  zend_object std;
-  zval repeated_field;
-  zend_long position;
-} RepeatedFieldIter;
-
-zend_class_entry *RepeatedFieldIter_class_entry;
-static zend_object_handlers repeated_field_iter_object_handlers;
-
-/**
- * RepeatedFieldIter_create()
- *
- * PHP class entry function to allocate and initialize a new RepeatedFieldIter
- * object.
- */
-zend_object* RepeatedFieldIter_create(zend_class_entry *class_type) {
-  RepeatedFieldIter *intern = emalloc(sizeof(RepeatedFieldIter));
-  zend_object_std_init(&intern->std, class_type);
-  intern->std.handlers = &repeated_field_iter_object_handlers;
-  ZVAL_NULL(&intern->repeated_field);
-  intern->position = 0;
-  // Skip object_properties_init(), we don't allow derived classes.
-  return &intern->std;
-}
-
-/**
- * RepeatedFieldIter_dtor()
- *
- * Object handler to destroy a RepeatedFieldIter. This releases all resources
- * associated with the message. Note that it is possible to access a destroyed
- * object from PHP in rare cases.
- */
-static void RepeatedFieldIter_dtor(zend_object* obj) {
-  RepeatedFieldIter* intern = (RepeatedFieldIter*)obj;
-  zval_ptr_dtor(&intern->repeated_field);
-  zend_object_std_dtor(&intern->std);
-}
-
-/**
- * RepeatedFieldIter_make()
- *
- * C function to create a RepeatedFieldIter.
- */
-static void RepeatedFieldIter_make(zval *val, zval *repeated_field) {
-  RepeatedFieldIter *iter;
-  ZVAL_OBJ(val, RepeatedFieldIter_class_entry->create_object(
-                    RepeatedFieldIter_class_entry));
-  iter = (RepeatedFieldIter*)Z_OBJ_P(val);
-  ZVAL_COPY(&iter->repeated_field, repeated_field);
-}
-
-/*
- * When a user writes:
- *
- *   foreach($arr as $key => $val) {}
- *
- * PHP's iterator protocol is:
- *
- *   $iter = $arr->getIterator();
- *   for ($iter->rewind(); $iter->valid(); $iter->next()) {
- *     $key = $iter->key();
- *     $val = $iter->current();
- *   }
- */
-
-/**
- * RepeatedFieldIter::rewind(): void
- *
- * Implements the Iterator interface. Sets the iterator to the first element.
- */
-PHP_METHOD(RepeatedFieldIter, rewind) {
-  RepeatedFieldIter *intern = (RepeatedFieldIter*)Z_OBJ_P(getThis());
-  intern->position = 0;
-}
-
-/**
- * RepeatedFieldIter::current(): mixed
- *
- * Implements the Iterator interface. Returns the current value.
- */
-PHP_METHOD(RepeatedFieldIter, current) {
-  RepeatedFieldIter *intern = (RepeatedFieldIter*)Z_OBJ_P(getThis());
-  RepeatedField *field = (RepeatedField*)Z_OBJ_P(&intern->repeated_field);
-  upb_Array *array = field->array;
-  zend_long index = intern->position;
-  upb_MessageValue msgval;
-  zval ret;
-
-  if (index < 0 || index >= upb_Array_Size(array)) {
-    zend_error(E_USER_ERROR, "Element at %ld doesn't exist.\n", index);
-  }
-
-  msgval = upb_Array_Get(array, index);
-
-  Convert_UpbToPhp(msgval, &ret, field->type, &field->arena);
-  RETURN_COPY_VALUE(&ret);
-}
-
-/**
- * RepeatedFieldIter::key(): mixed
- *
- * Implements the Iterator interface. Returns the current key.
- */
-PHP_METHOD(RepeatedFieldIter, key) {
-  RepeatedFieldIter *intern = (RepeatedFieldIter*)Z_OBJ_P(getThis());
-  RETURN_LONG(intern->position);
-}
-
-/**
- * RepeatedFieldIter::next(): void
- *
- * Implements the Iterator interface. Advances to the next element.
- */
-PHP_METHOD(RepeatedFieldIter, next) {
-  RepeatedFieldIter *intern = (RepeatedFieldIter*)Z_OBJ_P(getThis());
-  ++intern->position;
-}
-
-/**
- * RepeatedFieldIter::valid(): bool
- *
- * Implements the Iterator interface. Returns true if this is a valid element.
- */
-PHP_METHOD(RepeatedFieldIter, valid) {
-  RepeatedFieldIter *intern = (RepeatedFieldIter*)Z_OBJ_P(getThis());
-  RepeatedField *field = (RepeatedField*)Z_OBJ_P(&intern->repeated_field);
-  RETURN_BOOL(intern->position < upb_Array_Size(field->array));
-}
-
-ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_current, 0, 0, IS_MIXED, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_key, 0, 0, IS_MIXED, 0)
-ZEND_END_ARG_INFO()
-
-PROTOBUF_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_next, 0, 0, IS_VOID, 0)
-ZEND_END_ARG_INFO()
-
-PROTOBUF_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_valid, 0, 0, _IS_BOOL, 0)
-ZEND_END_ARG_INFO()
-
-PROTOBUF_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_rewind, 0, 0, IS_VOID, 0)
-ZEND_END_ARG_INFO()
-
-static zend_function_entry repeated_field_iter_methods[] = {
-  PHP_ME(RepeatedFieldIter, rewind,      arginfo_rewind,  ZEND_ACC_PUBLIC)
-  PHP_ME(RepeatedFieldIter, current,     arginfo_current, ZEND_ACC_PUBLIC)
-  PHP_ME(RepeatedFieldIter, key,         arginfo_key,     ZEND_ACC_PUBLIC)
-  PHP_ME(RepeatedFieldIter, next,        arginfo_next,    ZEND_ACC_PUBLIC)
-  PHP_ME(RepeatedFieldIter, valid,       arginfo_valid,   ZEND_ACC_PUBLIC)
-  ZEND_FE_END
-};
-
-// -----------------------------------------------------------------------------
-// Module init.
-// -----------------------------------------------------------------------------
-
-/**
- * Array_ModuleInit()
- *
- * Called when the C extension is loaded to register all types.
- */
-void Array_ModuleInit() {
-  zend_class_entry tmp_ce;
-  zend_object_handlers *h;
-
-  // RepeatedField.
-  INIT_CLASS_ENTRY(tmp_ce, "Google\\Protobuf\\Internal\\RepeatedField",
-                   repeated_field_methods);
-
-  RepeatedField_class_entry = zend_register_internal_class(&tmp_ce);
-  zend_class_implements(RepeatedField_class_entry, 3, zend_ce_arrayaccess,
-                        zend_ce_aggregate, zend_ce_countable);
-  RepeatedField_class_entry->ce_flags |= ZEND_ACC_FINAL;
-  RepeatedField_class_entry->create_object = RepeatedField_create;
-
-  h = &RepeatedField_object_handlers;
-  memcpy(h, &std_object_handlers, sizeof(zend_object_handlers));
-  h->dtor_obj = RepeatedField_destructor;
-#if PHP_VERSION_ID < 80000
-  h->compare_objects = RepeatedField_compare_objects;
-#else
-  h->compare = RepeatedField_compare_objects;
-#endif
-  h->clone_obj = RepeatedField_clone_obj;
-  h->get_properties = RepeatedField_GetProperties;
-  h->get_property_ptr_ptr = RepeatedField_GetPropertyPtrPtr;
-
-  // RepeatedFieldIter
-  INIT_CLASS_ENTRY(tmp_ce, "Google\\Protobuf\\Internal\\RepeatedFieldIter",
-                   repeated_field_iter_methods);
-
-  RepeatedFieldIter_class_entry = zend_register_internal_class(&tmp_ce);
-  zend_class_implements(RepeatedFieldIter_class_entry, 1, zend_ce_iterator);
-  RepeatedFieldIter_class_entry->ce_flags |= ZEND_ACC_FINAL;
-  RepeatedFieldIter_class_entry->create_object = RepeatedFieldIter_create;
-
-  h = &repeated_field_iter_object_handlers;
-  memcpy(h, &std_object_handlers, sizeof(zend_object_handlers));
-  h->dtor_obj = RepeatedFieldIter_dtor;
-}
diff --git a/libs/protobuf/php/ext/google/protobuf/array.h b/libs/protobuf/php/ext/google/protobuf/array.h
deleted file mode 100644
index a6691e7..0000000
--- a/libs/protobuf/php/ext/google/protobuf/array.h
+++ /dev/null
@@ -1,67 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef PHP_PROTOBUF_ARRAY_H_
-#define PHP_PROTOBUF_ARRAY_H_
-
-#include <php.h>
-
-#include "def.h"
-#include "php-upb.h"
-
-// Registers PHP classes for RepeatedField.
-void Array_ModuleInit();
-
-// Gets a upb_Array* for the PHP object |val|:
-//  * If |val| is a RepeatedField object, we first check its type and verify
-//    that that the elements have the correct type for |type|. If so, we return
-//    the wrapped upb_Array*. We also make sure that this array's arena is fused
-//    to |arena|, so the returned upb_Array is guaranteed to live as long as
-//    |arena|.
-//  * If |val| is a PHP Array, we attempt to create a new upb_Array using
-//    |arena| and add all of the PHP elements to it.
-//
-// If an error occurs, we raise a PHP error and return NULL.
-upb_Array *RepeatedField_GetUpbArray(zval *val, TypeInfo type,
-                                     upb_Arena *arena);
-
-// Creates a PHP RepeatedField object for the given upb_Array* and |type| and
-// returns it in |val|. The PHP object will keep a reference to this |arena| to
-// ensure the underlying array data stays alive.
-//
-// If |arr| is NULL, this will return a PHP null object.
-void RepeatedField_GetPhpWrapper(zval *val, upb_Array *arr, TypeInfo type,
-                                 zval *arena);
-
-// Returns true if the given arrays are equal. Both arrays must be of this
-// |type| and, if the type is |kUpb_CType_Message|, must have the same |m|.
-bool ArrayEq(const upb_Array *a1, const upb_Array *a2, TypeInfo type);
-
-#endif  // PHP_PROTOBUF_ARRAY_H_
diff --git a/libs/protobuf/php/ext/google/protobuf/config.m4 b/libs/protobuf/php/ext/google/protobuf/config.m4
deleted file mode 100644
index 01bedb8..0000000
--- a/libs/protobuf/php/ext/google/protobuf/config.m4
+++ /dev/null
@@ -1,11 +0,0 @@
-PHP_ARG_ENABLE(protobuf, whether to enable Protobuf extension, [  --enable-protobuf   Enable Protobuf extension])
-
-if test "$PHP_PROTOBUF" != "no"; then
-
-  PHP_NEW_EXTENSION(
-    protobuf,
-    arena.c array.c convert.c def.c map.c message.c names.c php-upb.c protobuf.c third_party/utf8_range/naive.c third_party/utf8_range/range2-neon.c third_party/utf8_range/range2-sse.c,
-    $ext_shared, , -std=gnu99)
-  PHP_ADD_BUILD_DIR($ext_builddir/third_party/utf8_range)
-
-fi
diff --git a/libs/protobuf/php/ext/google/protobuf/convert.c b/libs/protobuf/php/ext/google/protobuf/convert.c
deleted file mode 100644
index bedbcca..0000000
--- a/libs/protobuf/php/ext/google/protobuf/convert.c
+++ /dev/null
@@ -1,536 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include "convert.h"
-
-#include <php.h>
-
-// This is not self-contained: it must be after other Zend includes.
-#include <Zend/zend_exceptions.h>
-
-#include "array.h"
-#include "map.h"
-#include "message.h"
-#include "php-upb.h"
-#include "protobuf.h"
-
-// -----------------------------------------------------------------------------
-// GPBUtil
-// -----------------------------------------------------------------------------
-
-static zend_class_entry* GPBUtil_class_entry;
-
-// The implementation of type checking for primitive fields is empty. This is
-// because type checking is done when direct assigning message fields (e.g.,
-// foo->a = 1). Functions defined here are place holders in generated code for
-// pure PHP implementation (c extension and pure PHP share the same generated
-// code).
-
-PHP_METHOD(Util, checkInt32) {}
-PHP_METHOD(Util, checkUint32) {}
-PHP_METHOD(Util, checkInt64) {}
-PHP_METHOD(Util, checkUint64) {}
-PHP_METHOD(Util, checkEnum) {}
-PHP_METHOD(Util, checkFloat) {}
-PHP_METHOD(Util, checkDouble) {}
-PHP_METHOD(Util, checkBool) {}
-PHP_METHOD(Util, checkString) {}
-PHP_METHOD(Util, checkBytes) {}
-PHP_METHOD(Util, checkMessage) {}
-
-// The result of checkMapField() is assigned, so we need to return the first
-// param:
-//   $arr = GPBUtil::checkMapField($var,
-//                                 \Google\Protobuf\Internal\GPBType::INT64,
-//                                 \Google\Protobuf\Internal\GPBType::INT32);
-PHP_METHOD(Util, checkMapField) {
-  zval *val, *key_type, *val_type, *klass;
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "zzz|z", &val, &key_type,
-                            &val_type, &klass) == FAILURE) {
-    return;
-  }
-  RETURN_COPY(val);
-}
-
-// The result of checkRepeatedField() is assigned, so we need to return the
-// first param:
-// $arr = GPBUtil::checkRepeatedField(
-//     $var, \Google\Protobuf\Internal\GPBType::STRING);
-PHP_METHOD(Util, checkRepeatedField) {
-  zval *val, *type, *klass;
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "zz|z", &val, &type, &klass) ==
-      FAILURE) {
-    return;
-  }
-  RETURN_COPY(val);
-}
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_checkPrimitive, 0, 0, 1)
-  ZEND_ARG_INFO(0, value)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_checkString, 0, 0, 1)
-  ZEND_ARG_INFO(0, value)
-  ZEND_ARG_INFO(0, check_utf8)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_checkMessage, 0, 0, 2)
-  ZEND_ARG_INFO(0, value)
-  ZEND_ARG_INFO(0, class)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_checkMapField, 0, 0, 3)
-  ZEND_ARG_INFO(0, value)
-  ZEND_ARG_INFO(0, key_type)
-  ZEND_ARG_INFO(0, value_type)
-  ZEND_ARG_INFO(0, value_class)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_checkRepeatedField, 0, 0, 2)
-  ZEND_ARG_INFO(0, value)
-  ZEND_ARG_INFO(0, type)
-  ZEND_ARG_INFO(0, class)
-ZEND_END_ARG_INFO()
-
-static zend_function_entry util_methods[] = {
-  PHP_ME(Util, checkInt32,  arginfo_checkPrimitive,
-         ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
-  PHP_ME(Util, checkUint32, arginfo_checkPrimitive,
-         ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
-  PHP_ME(Util, checkInt64,  arginfo_checkPrimitive,
-         ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
-  PHP_ME(Util, checkUint64, arginfo_checkPrimitive,
-         ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
-  PHP_ME(Util, checkEnum,   arginfo_checkMessage,
-         ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
-  PHP_ME(Util, checkFloat,  arginfo_checkPrimitive,
-         ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
-  PHP_ME(Util, checkDouble, arginfo_checkPrimitive,
-         ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
-  PHP_ME(Util, checkBool,   arginfo_checkPrimitive,
-         ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
-  PHP_ME(Util, checkString, arginfo_checkString,
-         ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
-  PHP_ME(Util, checkBytes,  arginfo_checkPrimitive,
-         ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
-  PHP_ME(Util, checkMessage, arginfo_checkMessage,
-         ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
-  PHP_ME(Util, checkMapField, arginfo_checkMapField,
-         ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
-  PHP_ME(Util, checkRepeatedField, arginfo_checkRepeatedField,
-         ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
-  ZEND_FE_END
-};
-
-// -----------------------------------------------------------------------------
-// Conversion functions used from C
-// -----------------------------------------------------------------------------
-
-upb_CType pbphp_dtype_to_type(upb_FieldType type) {
-  switch (type) {
-#define CASE(descriptor_type, type)           \
-  case kUpb_FieldType_##descriptor_type: \
-    return kUpb_CType_##type;
-
-  CASE(Float,    Float);
-  CASE(Double,   Double);
-  CASE(Bool,     Bool);
-  CASE(String,   String);
-  CASE(Bytes,    Bytes);
-  CASE(Message,  Message);
-  CASE(Group,    Message);
-  CASE(Enum,     Enum);
-  CASE(Int32,    Int32);
-  CASE(Int64,    Int64);
-  CASE(UInt32,   Int32);
-  CASE(UInt64,   UInt64);
-  CASE(SInt32,   Int32);
-  CASE(SInt64,   Int64);
-  CASE(Fixed32,  UInt32);
-  CASE(Fixed64,  UInt64);
-  CASE(SFixed32, Int32);
-  CASE(SFixed64, Int64);
-
-#undef CASE
-
-  }
-
-  zend_error(E_ERROR, "Unknown field type.");
-  return 0;
-}
-
-static bool buftouint64(const char *ptr, const char *end, uint64_t *val) {
-  uint64_t u64 = 0;
-  while (ptr < end) {
-    unsigned ch = (unsigned)(*ptr - '0');
-    if (ch >= 10) break;
-    if (u64 > UINT64_MAX / 10 || u64 * 10 > UINT64_MAX - ch) {
-      return false;
-    }
-    u64 *= 10;
-    u64 += ch;
-    ptr++;
-  }
-
-  if (ptr != end) {
-    // In PHP tradition, we allow truncation: "1.1" -> 1.
-    // But we don't allow 'e', eg. '1.1e2' or any other non-numeric chars.
-    if (*ptr++ != '.') return false;
-
-    for (;ptr < end; ptr++) {
-      if (*ptr < '0' || *ptr > '9') {
-        return false;
-      }
-    }
-  }
-
-  *val = u64;
-  return true;
-}
-
-static bool buftoint64(const char *ptr, const char *end, int64_t *val) {
-  bool neg = false;
-  uint64_t u64;
-
-  if (ptr != end && *ptr == '-') {
-    ptr++;
-    neg = true;
-  }
-
-  if (!buftouint64(ptr, end, &u64) ||
-      u64 > (uint64_t)INT64_MAX + neg) {
-    return false;
-  }
-
-  *val = neg ? -u64 : u64;
-  return true;
-}
-
-static void throw_conversion_exception(const char *to, const zval *zv) {
-  zval tmp;
-  ZVAL_COPY(&tmp, zv);
-  convert_to_string(&tmp);
-
-  zend_throw_exception_ex(NULL, 0, "Cannot convert '%s' to %s",
-                          Z_STRVAL_P(&tmp), to);
-
-  zval_ptr_dtor(&tmp);
-}
-
-bool Convert_PhpToInt64(const zval *php_val, int64_t *i64) {
-  switch (Z_TYPE_P(php_val)) {
-    case IS_LONG:
-      *i64 = Z_LVAL_P(php_val);
-      return true;
-    case IS_DOUBLE: {
-      double dbl = Z_DVAL_P(php_val);
-      if (dbl > 9223372036854774784.0 || dbl < -9223372036854775808.0) {
-        zend_throw_exception_ex(NULL, 0, "Out of range");
-        return false;
-      }
-      *i64 = dbl; /* must be guarded, overflow here is UB */
-      return true;
-    }
-    case IS_STRING: {
-      const char *buf = Z_STRVAL_P(php_val);
-      // PHP would accept scientific notation here, but we're going to be a
-      // little more discerning and only accept pure integers.
-      bool ok = buftoint64(buf, buf + Z_STRLEN_P(php_val), i64);
-      if (!ok) {
-        throw_conversion_exception("integer", php_val);
-      }
-      return ok;
-    }
-    default:
-      throw_conversion_exception("integer", php_val);
-      return false;
-  }
-}
-
-static bool to_double(zval *php_val, double *dbl) {
-  switch (Z_TYPE_P(php_val)) {
-    case IS_LONG:
-      *dbl = Z_LVAL_P(php_val);
-      return true;
-    case IS_DOUBLE:
-      *dbl = Z_DVAL_P(php_val);
-      return true;
-    case IS_STRING: {
-      zend_long lval;
-      switch (is_numeric_string(Z_STRVAL_P(php_val), Z_STRLEN_P(php_val), &lval,
-                                dbl, false)) {
-        case IS_LONG:
-          *dbl = lval;
-          return true;
-        case IS_DOUBLE:
-          return true;
-        default:
-          goto fail;
-      }
-    }
-    default:
-     fail:
-      throw_conversion_exception("double", php_val);
-      return false;
-  }
-}
-
-static bool to_bool(zval* from, bool* to) {
-  switch (Z_TYPE_P(from)) {
-    case IS_TRUE:
-      *to = true;
-      return true;
-    case IS_FALSE:
-      *to = false;
-      return true;
-    case IS_LONG:
-      *to = (Z_LVAL_P(from) != 0);
-      return true;
-    case IS_DOUBLE:
-      *to = (Z_LVAL_P(from) != 0);
-      return true;
-    case IS_STRING:
-      if (Z_STRLEN_P(from) == 0 ||
-          (Z_STRLEN_P(from) == 1 && Z_STRVAL_P(from)[0] == '0')) {
-        *to = false;
-      } else {
-        *to = true;
-      }
-      return true;
-    default:
-      throw_conversion_exception("bool", from);
-      return false;
-  }
-}
-
-static bool to_string(zval* from) {
-  if (Z_ISREF_P(from)) {
-    ZVAL_DEREF(from);
-  }
-
-  switch (Z_TYPE_P(from)) {
-    case IS_STRING:
-      return true;
-    case IS_TRUE:
-    case IS_FALSE:
-    case IS_LONG:
-    case IS_DOUBLE: {
-      zval tmp;
-      zend_make_printable_zval(from, &tmp);
-      ZVAL_COPY_VALUE(from, &tmp);
-      return true;
-    }
-    default:
-      throw_conversion_exception("string", from);
-      return false;
-  }
-}
-
-bool Convert_PhpToUpb(zval *php_val, upb_MessageValue *upb_val, TypeInfo type,
-                      upb_Arena *arena) {
-  int64_t i64;
-
-  if (Z_ISREF_P(php_val)) {
-    ZVAL_DEREF(php_val);
-  }
-
-  switch (type.type) {
-    case kUpb_CType_Int64:
-      return Convert_PhpToInt64(php_val, &upb_val->int64_val);
-    case kUpb_CType_Int32:
-    case kUpb_CType_Enum:
-      if (!Convert_PhpToInt64(php_val, &i64)) {
-        return false;
-      }
-      upb_val->int32_val = i64;
-      return true;
-    case kUpb_CType_UInt64:
-      if (!Convert_PhpToInt64(php_val, &i64)) {
-        return false;
-      }
-      upb_val->uint64_val = i64;
-      return true;
-    case kUpb_CType_UInt32:
-      if (!Convert_PhpToInt64(php_val, &i64)) {
-        return false;
-      }
-      upb_val->uint32_val = i64;
-      return true;
-    case kUpb_CType_Double:
-      return to_double(php_val, &upb_val->double_val);
-    case kUpb_CType_Float:
-      if (!to_double(php_val, &upb_val->double_val)) return false;
-      upb_val->float_val = upb_val->double_val;
-      return true;
-    case kUpb_CType_Bool:
-      return to_bool(php_val, &upb_val->bool_val);
-    case kUpb_CType_String:
-    case kUpb_CType_Bytes: {
-      char *ptr;
-      size_t size;
-
-      if (!to_string(php_val)) return false;
-
-      size = Z_STRLEN_P(php_val);
-
-      // If arena is NULL we reference the input zval.
-      // The resulting upb_StringView will only be value while the zval is alive.
-      if (arena) {
-        ptr = upb_Arena_Malloc(arena, size);
-        memcpy(ptr, Z_STRVAL_P(php_val), size);
-      } else {
-        ptr = Z_STRVAL_P(php_val);
-      }
-
-      upb_val->str_val = upb_StringView_FromDataAndSize(ptr, size);
-      return true;
-    }
-    case kUpb_CType_Message:
-      PBPHP_ASSERT(type.desc);
-      return Message_GetUpbMessage(php_val, type.desc, arena,
-                                   (upb_Message **)&upb_val->msg_val);
-  }
-
-  return false;
-}
-
-void Convert_UpbToPhp(upb_MessageValue upb_val, zval *php_val, TypeInfo type,
-                      zval *arena) {
-  switch (type.type) {
-    case kUpb_CType_Int64:
-#if SIZEOF_ZEND_LONG == 8
-      ZVAL_LONG(php_val, upb_val.int64_val);
-#else
-      {
-        char buf[20];
-        int size = sprintf(buf, "%lld", upb_val.int64_val);
-        ZVAL_NEW_STR(php_val, zend_string_init(buf, size, 0));
-      }
-#endif
-      break;
-    case kUpb_CType_UInt64:
-#if SIZEOF_ZEND_LONG == 8
-      ZVAL_LONG(php_val, upb_val.uint64_val);
-#else
-      {
-        char buf[20];
-        int size = sprintf(buf, "%lld", (int64_t)upb_val.uint64_val);
-        ZVAL_NEW_STR(php_val, zend_string_init(buf, size, 0));
-      }
-#endif
-      break;
-    case kUpb_CType_Int32:
-    case kUpb_CType_Enum:
-      ZVAL_LONG(php_val, upb_val.int32_val);
-      break;
-    case kUpb_CType_UInt32: {
-      // Sign-extend for consistency between 32/64-bit builds.
-      zend_long val = (int32_t)upb_val.uint32_val;
-      ZVAL_LONG(php_val, val);
-      break;
-    }
-    case kUpb_CType_Double:
-      ZVAL_DOUBLE(php_val, upb_val.double_val);
-      break;
-    case kUpb_CType_Float:
-      ZVAL_DOUBLE(php_val, upb_val.float_val);
-      break;
-    case kUpb_CType_Bool:
-      ZVAL_BOOL(php_val, upb_val.bool_val);
-      break;
-    case kUpb_CType_String:
-    case kUpb_CType_Bytes: {
-      upb_StringView str = upb_val.str_val;
-      ZVAL_NEW_STR(php_val, zend_string_init(str.data, str.size, 0));
-      break;
-    }
-    case kUpb_CType_Message:
-      PBPHP_ASSERT(type.desc);
-      Message_GetPhpWrapper(php_val, type.desc, (upb_Message *)upb_val.msg_val,
-                            arena);
-      break;
-  }
-}
-
-// Check if the field is a well known wrapper type
-static bool IsWrapper(const upb_MessageDef* m) {
-  if (!m) return false;
-  switch (upb_MessageDef_WellKnownType(m)) {
-    case kUpb_WellKnown_DoubleValue:
-    case kUpb_WellKnown_FloatValue:
-    case kUpb_WellKnown_Int64Value:
-    case kUpb_WellKnown_UInt64Value:
-    case kUpb_WellKnown_Int32Value:
-    case kUpb_WellKnown_UInt32Value:
-    case kUpb_WellKnown_StringValue:
-    case kUpb_WellKnown_BytesValue:
-    case kUpb_WellKnown_BoolValue:
-      return true;
-    default:
-      return false;
-  }
-}
-
-bool Convert_PhpToUpbAutoWrap(zval *val, upb_MessageValue *upb_val, TypeInfo type,
-                              upb_Arena *arena) {
-  const upb_MessageDef *subm = type.desc ? type.desc->msgdef : NULL;
-  if (subm && IsWrapper(subm) && Z_TYPE_P(val) != IS_OBJECT) {
-    // Assigning a scalar to a wrapper-typed value. We will automatically wrap
-    // the value, so the user doesn't need to create a FooWrapper(['value': X])
-    // message manually.
-    upb_Message *wrapper = upb_Message_New(subm, arena);
-    const upb_FieldDef *val_f = upb_MessageDef_FindFieldByNumber(subm, 1);
-    upb_MessageValue msgval;
-    if (!Convert_PhpToUpb(val, &msgval, TypeInfo_Get(val_f), arena)) return false;
-    upb_Message_Set(wrapper, val_f, msgval, arena);
-    upb_val->msg_val = wrapper;
-    return true;
-  } else {
-    // Convert_PhpToUpb doesn't auto-construct messages. This means that we only
-    // allow:
-    //   ['foo_submsg': new Foo(['a' => 1])]
-    // not:
-    //   ['foo_submsg': ['a' => 1]]
-    return Convert_PhpToUpb(val, upb_val, type, arena);
-  }
-}
-
-void Convert_ModuleInit(void) {
-  const char *prefix_name = "TYPE_URL_PREFIX";
-  zend_class_entry class_type;
-
-  INIT_CLASS_ENTRY(class_type, "Google\\Protobuf\\Internal\\GPBUtil",
-                   util_methods);
-  GPBUtil_class_entry = zend_register_internal_class(&class_type);
-
-  zend_declare_class_constant_string(GPBUtil_class_entry, prefix_name,
-                                     strlen(prefix_name),
-                                     "type.googleapis.com/");
-}
diff --git a/libs/protobuf/php/ext/google/protobuf/convert.h b/libs/protobuf/php/ext/google/protobuf/convert.h
deleted file mode 100644
index 5f3cc07..0000000
--- a/libs/protobuf/php/ext/google/protobuf/convert.h
+++ /dev/null
@@ -1,73 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef PHP_PROTOBUF_CONVERT_H_
-#define PHP_PROTOBUF_CONVERT_H_
-
-#include <php.h>
-
-#include "php-upb.h"
-#include "def.h"
-
-upb_CType pbphp_dtype_to_type(upb_FieldType type);
-
-// Converts |php_val| to an int64_t. Returns false if the value cannot be
-// converted.
-bool Convert_PhpToInt64(const zval *php_val, int64_t *i64);
-
-// Converts |php_val| to a upb_MessageValue according to |type|. If type is
-// kUpb_CType_Message, then |desc| must be the Descriptor for this message type.
-// If type is string, message, or bytes, then |arena| will be used to copy
-// string data or fuse this arena to the given message's arena.
-bool Convert_PhpToUpb(zval *php_val, upb_MessageValue *upb_val, TypeInfo type,
-                      upb_Arena *arena);
-
-// Similar to Convert_PhpToUpb, but supports automatically wrapping the wrapper
-// types if a primitive is specified:
-//
-//   5 -> Int64Wrapper(value=5)
-//
-// We currently allow this implicit conversion in initializers, but not for
-// assignment.
-bool Convert_PhpToUpbAutoWrap(zval *val, upb_MessageValue *upb_val, TypeInfo type,
-                              upb_Arena *arena);
-
-// Converts |upb_val| to a PHP zval according to |type|. This may involve
-// creating a PHP wrapper object. Any newly created wrapper object
-// will reference |arena|.
-//
-// The caller owns a reference to the returned value.
-void Convert_UpbToPhp(upb_MessageValue upb_val, zval *php_val, TypeInfo type,
-                      zval *arena);
-
-// Registers the GPBUtil class.
-void Convert_ModuleInit(void);
-
-#endif  // PHP_PROTOBUF_CONVERT_H_
diff --git a/libs/protobuf/php/ext/google/protobuf/def.c b/libs/protobuf/php/ext/google/protobuf/def.c
deleted file mode 100644
index 8c3266e..0000000
--- a/libs/protobuf/php/ext/google/protobuf/def.c
+++ /dev/null
@@ -1,1168 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include "def.h"
-
-#include <php.h>
-
-// This is not self-contained: it must be after other Zend includes.
-#include <Zend/zend_exceptions.h>
-
-#include "names.h"
-#include "php-upb.h"
-#include "protobuf.h"
-
-static void CheckUpbStatus(const upb_Status* status, const char* msg) {
-  if (!upb_Status_IsOk(status)) {
-    zend_error(E_ERROR, "%s: %s\n", msg, upb_Status_ErrorMessage(status));
-  }
-}
-
-static void FieldDescriptor_FromFieldDef(zval *val, const upb_FieldDef *f);
-
-// We use this for objects that should not be created directly from PHP.
-static zend_object *CreateHandler_ReturnNull(zend_class_entry *class_type) {
-  return NULL;  // Nobody should call this.
-}
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_getByIndex, 0, 0, 1)
-  ZEND_ARG_INFO(0, index)
-ZEND_END_ARG_INFO()
-
-// -----------------------------------------------------------------------------
-// EnumValueDescriptor
-// -----------------------------------------------------------------------------
-
-typedef struct {
-  zend_object std;
-  const char *name;
-  int32_t number;
-} EnumValueDescriptor;
-
-zend_class_entry *EnumValueDescriptor_class_entry;
-static zend_object_handlers EnumValueDescriptor_object_handlers;
-
-/*
- * EnumValueDescriptor_Make()
- *
- * Function to create an EnumValueDescriptor object from C.
- */
-static void EnumValueDescriptor_Make(zval *val, const char *name,
-                                     int32_t number) {
-  EnumValueDescriptor *intern = emalloc(sizeof(EnumValueDescriptor));
-  zend_object_std_init(&intern->std, EnumValueDescriptor_class_entry);
-  intern->std.handlers = &EnumValueDescriptor_object_handlers;
-  intern->name = name;
-  intern->number = number;
-  // Skip object_properties_init(), we don't allow derived classes.
-  ZVAL_OBJ(val, &intern->std);
-}
-
-/*
- * EnumValueDescriptor::getName()
- *
- * Returns the name for this enum value.
- */
-PHP_METHOD(EnumValueDescriptor, getName) {
-  EnumValueDescriptor *intern = (EnumValueDescriptor*)Z_OBJ_P(getThis());
-  RETURN_STRING(intern->name);
-}
-
-/*
- * EnumValueDescriptor::getNumber()
- *
- * Returns the number for this enum value.
- */
-PHP_METHOD(EnumValueDescriptor, getNumber) {
-  EnumValueDescriptor *intern = (EnumValueDescriptor*)Z_OBJ_P(getThis());
-  RETURN_LONG(intern->number);
-}
-
-static zend_function_entry EnumValueDescriptor_methods[] = {
-  PHP_ME(EnumValueDescriptor, getName, arginfo_void, ZEND_ACC_PUBLIC)
-  PHP_ME(EnumValueDescriptor, getNumber, arginfo_void, ZEND_ACC_PUBLIC)
-  ZEND_FE_END
-};
-
-// -----------------------------------------------------------------------------
-// EnumDescriptor
-// -----------------------------------------------------------------------------
-
-typedef struct {
-  zend_object std;
-  const upb_EnumDef *enumdef;
-  void *cache_key;
-} EnumDescriptor;
-
-zend_class_entry *EnumDescriptor_class_entry;
-static zend_object_handlers EnumDescriptor_object_handlers;
-
-static void EnumDescriptor_destructor(zend_object* obj) {
-  EnumDescriptor *intern = (EnumDescriptor*)obj;
-  ObjCache_Delete(intern->cache_key);
-}
-
-// Caller owns a ref on the returned zval.
-static void EnumDescriptor_FromClassEntry(zval *val, zend_class_entry *ce) {
-  // To differentiate enums from classes, we pointer-tag the class entry.
-  void* key = (void*)((uintptr_t)ce | 1);
-  PBPHP_ASSERT(key != ce);
-
-  if (ce == NULL) {
-    ZVAL_NULL(val);
-    return;
-  }
-
-  if (!ObjCache_Get(key, val)) {
-    const upb_EnumDef *e = NameMap_GetEnum(ce);
-    if (!e) {
-      ZVAL_NULL(val);
-      return;
-    }
-    EnumDescriptor* ret = emalloc(sizeof(EnumDescriptor));
-    zend_object_std_init(&ret->std, EnumDescriptor_class_entry);
-    ret->std.handlers = &EnumDescriptor_object_handlers;
-    ret->enumdef = e;
-    ret->cache_key = key;
-    ObjCache_Add(key, &ret->std);
-    ZVAL_OBJ(val, &ret->std);
-  }
-}
-
-// Caller owns a ref on the returned zval.
-static void EnumDescriptor_FromEnumDef(zval *val, const upb_EnumDef *m) {
-  if (!m) {
-    ZVAL_NULL(val);
-  } else {
-    char *classname =
-        GetPhpClassname(upb_EnumDef_File(m), upb_EnumDef_FullName(m), false);
-    zend_string *str = zend_string_init(classname, strlen(classname), 0);
-    zend_class_entry *ce = zend_lookup_class(str);  // May autoload the class.
-
-    zend_string_release (str);
-
-    if (!ce) {
-      zend_error(E_ERROR, "Couldn't load generated class %s", classname);
-    }
-
-    free(classname);
-    EnumDescriptor_FromClassEntry(val, ce);
-  }
-}
-
-/*
- * EnumDescriptor::getValue()
- *
- * Returns an EnumValueDescriptor for this index. Note: we are not looking
- * up by numeric enum value, but by the index in the list of enum values.
- */
-PHP_METHOD(EnumDescriptor, getValue) {
-  EnumDescriptor *intern = (EnumDescriptor*)Z_OBJ_P(getThis());
-  zend_long index;
-  zval ret;
-
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "l", &index) == FAILURE) {
-    zend_error(E_USER_ERROR, "Expect integer for index.\n");
-    return;
-  }
-
-  if (index < 0 || index >= upb_EnumDef_ValueCount(intern->enumdef)) {
-    zend_error(E_USER_ERROR, "Cannot get element at %ld.\n", index);
-    return;
-  }
-
-  const upb_EnumValueDef* ev = upb_EnumDef_Value(intern->enumdef, index);
-  EnumValueDescriptor_Make(&ret, upb_EnumValueDef_Name(ev),
-                           upb_EnumValueDef_Number(ev));
-  RETURN_COPY_VALUE(&ret);
-}
-
-/*
- * EnumDescriptor::getValueCount()
- *
- * Returns the number of values in this enum.
- */
-PHP_METHOD(EnumDescriptor, getValueCount) {
-  EnumDescriptor *intern = (EnumDescriptor*)Z_OBJ_P(getThis());
-  RETURN_LONG(upb_EnumDef_ValueCount(intern->enumdef));
-}
-
-/*
- * EnumDescriptor::getPublicDescriptor()
- *
- * Returns this EnumDescriptor. Unlike the pure-PHP descriptor, we do not
- * have two separate EnumDescriptor classes. We use a single class for both
- * the public and private descriptor.
- */
-PHP_METHOD(EnumDescriptor, getPublicDescriptor) {
-  RETURN_COPY(getThis());
-}
-
-static zend_function_entry EnumDescriptor_methods[] = {
-  PHP_ME(EnumDescriptor, getPublicDescriptor, arginfo_void, ZEND_ACC_PUBLIC)
-  PHP_ME(EnumDescriptor, getValueCount, arginfo_void, ZEND_ACC_PUBLIC)
-  PHP_ME(EnumDescriptor, getValue, arginfo_getByIndex, ZEND_ACC_PUBLIC)
-  ZEND_FE_END
-};
-
-// -----------------------------------------------------------------------------
-// Oneof
-// -----------------------------------------------------------------------------
-
-typedef struct {
-  zend_object std;
-  const upb_OneofDef *oneofdef;
-} OneofDescriptor;
-
-zend_class_entry *OneofDescriptor_class_entry;
-static zend_object_handlers OneofDescriptor_object_handlers;
-
-static void OneofDescriptor_destructor(zend_object* obj) {
-  OneofDescriptor *intern = (OneofDescriptor*)obj;
-  ObjCache_Delete(intern->oneofdef);
-}
-
-static void OneofDescriptor_FromOneofDef(zval *val, const upb_OneofDef *o) {
-  if (o == NULL) {
-    ZVAL_NULL(val);
-    return;
-  }
-
-  if (!ObjCache_Get(o, val)) {
-    OneofDescriptor* ret = emalloc(sizeof(OneofDescriptor));
-    zend_object_std_init(&ret->std, OneofDescriptor_class_entry);
-    ret->std.handlers = &OneofDescriptor_object_handlers;
-    ret->oneofdef = o;
-    ObjCache_Add(o, &ret->std);
-    ZVAL_OBJ(val, &ret->std);
-  }
-}
-
-/*
- * OneofDescriptor::getName()
- *
- * Returns the name of this oneof.
- */
-PHP_METHOD(OneofDescriptor, getName) {
-  OneofDescriptor *intern = (OneofDescriptor*)Z_OBJ_P(getThis());
-  RETURN_STRING(upb_OneofDef_Name(intern->oneofdef));
-}
-
-/*
- * OneofDescriptor::getField()
- *
- * Returns a field from this oneof. The given index must be in the range
- *   [0, getFieldCount() - 1].
- */
-PHP_METHOD(OneofDescriptor, getField) {
-  OneofDescriptor *intern = (OneofDescriptor*)Z_OBJ_P(getThis());
-  zend_long index;
-  zval ret;
-
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "l", &index) == FAILURE) {
-    zend_error(E_USER_ERROR, "Expect integer for index.\n");
-    return;
-  }
-
-  if (index < 0 || index >= upb_OneofDef_FieldCount(intern->oneofdef)) {
-    zend_error(E_USER_ERROR, "Cannot get element at %ld.\n", index);
-    return;
-  }
-
-  const upb_FieldDef* field = upb_OneofDef_Field(intern->oneofdef, index);
-  FieldDescriptor_FromFieldDef(&ret, field);
-  RETURN_COPY_VALUE(&ret);
-}
-
-/*
- * OneofDescriptor::getFieldCount()
- *
- * Returns the number of fields in this oneof.
- */
-PHP_METHOD(OneofDescriptor, getFieldCount) {
-  OneofDescriptor *intern = (OneofDescriptor*)Z_OBJ_P(getThis());
-  RETURN_LONG(upb_OneofDef_FieldCount(intern->oneofdef));
-}
-
-static zend_function_entry OneofDescriptor_methods[] = {
-  PHP_ME(OneofDescriptor, getName,  arginfo_void, ZEND_ACC_PUBLIC)
-  PHP_ME(OneofDescriptor, getField, arginfo_getByIndex, ZEND_ACC_PUBLIC)
-  PHP_ME(OneofDescriptor, getFieldCount, arginfo_void, ZEND_ACC_PUBLIC)
-  ZEND_FE_END
-};
-
-// -----------------------------------------------------------------------------
-// FieldDescriptor
-// -----------------------------------------------------------------------------
-
-typedef struct {
-  zend_object std;
-  const upb_FieldDef *fielddef;
-} FieldDescriptor;
-
-zend_class_entry *FieldDescriptor_class_entry;
-static zend_object_handlers FieldDescriptor_object_handlers;
-
-static void FieldDescriptor_destructor(zend_object* obj) {
-  FieldDescriptor *intern = (FieldDescriptor*)obj;
-  ObjCache_Delete(intern->fielddef);
-}
-
-// Caller owns a ref on the returned zval.
-static void FieldDescriptor_FromFieldDef(zval *val, const upb_FieldDef *f) {
-  if (f == NULL) {
-    ZVAL_NULL(val);
-    return;
-  }
-
-  if (!ObjCache_Get(f, val)) {
-    FieldDescriptor* ret = emalloc(sizeof(FieldDescriptor));
-    zend_object_std_init(&ret->std, FieldDescriptor_class_entry);
-    ret->std.handlers = &FieldDescriptor_object_handlers;
-    ret->fielddef = f;
-    ObjCache_Add(f, &ret->std);
-    ZVAL_OBJ(val, &ret->std);
-  }
-}
-
-upb_CType to_fieldtype(upb_FieldType type) {
-  switch (type) {
-#define CASE(descriptor_type, type)           \
-  case kUpb_FieldType_##descriptor_type: \
-    return kUpb_CType_##type;
-
-  CASE(Float,    Float);
-  CASE(Double,   Double);
-  CASE(Bool,     Bool);
-  CASE(String,   String);
-  CASE(Bytes,    Bytes);
-  CASE(Message,  Message);
-  CASE(Group,    Message);
-  CASE(Enum,     Enum);
-  CASE(Int32,    Int32);
-  CASE(Int64,    Int64);
-  CASE(UInt32,   UInt32);
-  CASE(UInt64,   UInt64);
-  CASE(SInt32,   Int32);
-  CASE(SInt64,   Int64);
-  CASE(Fixed32,  UInt32);
-  CASE(Fixed64,  UInt64);
-  CASE(SFixed32, Int32);
-  CASE(SFixed64, Int64);
-
-#undef CONVERT
-
-  }
-
-  zend_error(E_ERROR, "Unknown field type.");
-  return 0;
-}
-
-/*
- * FieldDescriptor::getName()
- *
- * Returns the name of this field.
- */
-PHP_METHOD(FieldDescriptor, getName) {
-  FieldDescriptor *intern = (FieldDescriptor*)Z_OBJ_P(getThis());
-  RETURN_STRING(upb_FieldDef_Name(intern->fielddef));
-}
-
-/*
- * FieldDescriptor::getNumber()
- *
- * Returns the number of this field.
- */
-PHP_METHOD(FieldDescriptor, getNumber) {
-  FieldDescriptor *intern = (FieldDescriptor*)Z_OBJ_P(getThis());
-  RETURN_LONG(upb_FieldDef_Number(intern->fielddef));
-}
-
-/*
- * FieldDescriptor::getLabel()
- *
- * Returns the label of this field as an integer.
- */
-PHP_METHOD(FieldDescriptor, getLabel) {
-  FieldDescriptor *intern = (FieldDescriptor*)Z_OBJ_P(getThis());
-  RETURN_LONG(upb_FieldDef_Label(intern->fielddef));
-}
-
-/*
- * FieldDescriptor::getType()
- *
- * Returns the type of this field as an integer.
- */
-PHP_METHOD(FieldDescriptor, getType) {
-  FieldDescriptor *intern = (FieldDescriptor*)Z_OBJ_P(getThis());
-  RETURN_LONG(upb_FieldDef_Type(intern->fielddef));
-}
-
-/*
- * FieldDescriptor::isMap()
- *
- * Returns true if this field is a map.
- */
-PHP_METHOD(FieldDescriptor, isMap) {
-  FieldDescriptor *intern = (FieldDescriptor*)Z_OBJ_P(getThis());
-  RETURN_BOOL(upb_FieldDef_IsMap(intern->fielddef));
-}
-
-/*
- * FieldDescriptor::getEnumType()
- *
- * Returns the EnumDescriptor for this field, which must be an enum.
- */
-PHP_METHOD(FieldDescriptor, getEnumType) {
-  FieldDescriptor *intern = (FieldDescriptor*)Z_OBJ_P(getThis());
-  const upb_EnumDef *e = upb_FieldDef_EnumSubDef(intern->fielddef);
-  zval ret;
-
-  if (!e) {
-    zend_throw_exception_ex(NULL, 0,
-                            "Cannot get enum type for non-enum field '%s'",
-                            upb_FieldDef_Name(intern->fielddef));
-    return;
-  }
-
-  EnumDescriptor_FromEnumDef(&ret, e);
-  RETURN_COPY_VALUE(&ret);
-}
-
-/*
- * FieldDescriptor::getContainingOneof()
- *
- * Returns the OneofDescriptor for this field, or null if it is not inside
- * a oneof.
- */
-PHP_METHOD(FieldDescriptor, getContainingOneof) {
-  FieldDescriptor *intern = (FieldDescriptor*)Z_OBJ_P(getThis());
-  const upb_OneofDef *o = upb_FieldDef_ContainingOneof(intern->fielddef);
-  zval ret;
-
-  if (!o) {
-    RETURN_NULL();
-  }
-
-  OneofDescriptor_FromOneofDef(&ret, o);
-  RETURN_COPY_VALUE(&ret);
-}
-
-/*
- * FieldDescriptor::getRealContainingOneof()
- *
- * Returns the non-synthetic OneofDescriptor for this field, or null if it is
- * not inside a oneof.
- */
-PHP_METHOD(FieldDescriptor, getRealContainingOneof) {
-  FieldDescriptor *intern = (FieldDescriptor*)Z_OBJ_P(getThis());
-  const upb_OneofDef *o = upb_FieldDef_RealContainingOneof(intern->fielddef);
-  zval ret;
-
-  if (!o) {
-    RETURN_NULL();
-  }
-
-  OneofDescriptor_FromOneofDef(&ret, o);
-  RETURN_COPY_VALUE(&ret);
-}
-
-/*
- * FieldDescriptor::getMessageType()
- *
- * Returns the Descriptor for this field, which must be a message.
- */
-PHP_METHOD(FieldDescriptor, getMessageType) {
-  FieldDescriptor *intern = (FieldDescriptor*)Z_OBJ_P(getThis());
-  Descriptor* desc = Descriptor_GetFromFieldDef(intern->fielddef);
-
-  if (!desc) {
-    zend_throw_exception_ex(
-        NULL, 0, "Cannot get message type for non-message field '%s'",
-        upb_FieldDef_Name(intern->fielddef));
-    return;
-  }
-
-  RETURN_OBJ_COPY(&desc->std);
-}
-
-static zend_function_entry FieldDescriptor_methods[] = {
-  PHP_ME(FieldDescriptor, getName,   arginfo_void, ZEND_ACC_PUBLIC)
-  PHP_ME(FieldDescriptor, getNumber, arginfo_void, ZEND_ACC_PUBLIC)
-  PHP_ME(FieldDescriptor, getLabel,  arginfo_void, ZEND_ACC_PUBLIC)
-  PHP_ME(FieldDescriptor, getType,   arginfo_void, ZEND_ACC_PUBLIC)
-  PHP_ME(FieldDescriptor, isMap,     arginfo_void, ZEND_ACC_PUBLIC)
-  PHP_ME(FieldDescriptor, getEnumType, arginfo_void, ZEND_ACC_PUBLIC)
-  PHP_ME(FieldDescriptor, getContainingOneof, arginfo_void, ZEND_ACC_PUBLIC)
-  PHP_ME(FieldDescriptor, getRealContainingOneof, arginfo_void, ZEND_ACC_PUBLIC)
-  PHP_ME(FieldDescriptor, getMessageType, arginfo_void, ZEND_ACC_PUBLIC)
-  ZEND_FE_END
-};
-
-// -----------------------------------------------------------------------------
-// Descriptor
-// -----------------------------------------------------------------------------
-
-zend_class_entry *Descriptor_class_entry;
-static zend_object_handlers Descriptor_object_handlers;
-
-static void Descriptor_destructor(zend_object* obj) {
-  // We don't really need to do anything here, we don't allow this to be
-  // collected before the end of the request.
-}
-
-static zend_class_entry *Descriptor_GetGeneratedClass(const upb_MessageDef *m) {
-  for (int i = 0; i < 2; ++i) {
-    char *classname =
-        GetPhpClassname(upb_MessageDef_File(m), upb_MessageDef_FullName(m), (bool)i);
-    zend_string *str = zend_string_init(classname, strlen(classname), 0);
-    zend_class_entry *ce = zend_lookup_class(str);  // May autoload the class.
-
-    zend_string_release (str);
-    free(classname);
-
-    if (ce) {
-      return ce;
-    }
-  }
-
-  char *classname =
-    GetPhpClassname(upb_MessageDef_File(m), upb_MessageDef_FullName(m), false);
-  zend_error(E_ERROR, "Couldn't load generated class %s", classname);
-  return NULL;
-}
-
-void Descriptor_FromMessageDef(zval *val, const upb_MessageDef *m) {
-  if (m == NULL) {
-    ZVAL_NULL(val);
-    return;
-  }
-
-  if (!ObjCache_Get(m, val)) {
-    zend_class_entry *ce = NULL;
-    if (!upb_MessageDef_IsMapEntry(m)) {  // Map entries don't have a class.
-      ce = Descriptor_GetGeneratedClass(m);
-      if (!ce) {
-        ZVAL_NULL(val);
-        return;
-      }
-    }
-    Descriptor* ret = emalloc(sizeof(Descriptor));
-    zend_object_std_init(&ret->std, Descriptor_class_entry);
-    ret->std.handlers = &Descriptor_object_handlers;
-    ret->class_entry = ce;
-    ret->msgdef = m;
-    ObjCache_Add(m, &ret->std);
-    Descriptors_Add(&ret->std);
-    ZVAL_OBJ(val, &ret->std);
-  }
-}
-
-static void Descriptor_FromClassEntry(zval *val, zend_class_entry *ce) {
-  if (ce) {
-    Descriptor_FromMessageDef(val, NameMap_GetMessage(ce));
-  } else {
-    ZVAL_NULL(val);
-  }
-}
-
-static Descriptor* Descriptor_GetFromZval(zval *val) {
-  if (Z_TYPE_P(val) == IS_NULL) {
-    return NULL;
-  } else {
-    zend_object* ret = Z_OBJ_P(val);
-    zval_ptr_dtor(val);
-    return (Descriptor*)ret;
-  }
-}
-
-// C Functions from def.h //////////////////////////////////////////////////////
-
-// These are documented in the header file.
-
-Descriptor* Descriptor_GetFromClassEntry(zend_class_entry *ce) {
-  zval desc;
-  Descriptor_FromClassEntry(&desc, ce);
-  return Descriptor_GetFromZval(&desc);
-}
-
-Descriptor* Descriptor_GetFromMessageDef(const upb_MessageDef *m) {
-  zval desc;
-  Descriptor_FromMessageDef(&desc, m);
-  return Descriptor_GetFromZval(&desc);
-}
-
-Descriptor* Descriptor_GetFromFieldDef(const upb_FieldDef *f) {
-  return Descriptor_GetFromMessageDef(upb_FieldDef_MessageSubDef(f));
-}
-
-/*
- * Descriptor::getPublicDescriptor()
- *
- * Returns this EnumDescriptor. Unlike the pure-PHP descriptor, we do not
- * have two separate EnumDescriptor classes. We use a single class for both
- * the public and private descriptor.
- */
-PHP_METHOD(Descriptor, getPublicDescriptor) {
-  RETURN_COPY(getThis());
-}
-
-/*
- * Descriptor::getFullName()
- *
- * Returns the full name for this message type.
- */
-PHP_METHOD(Descriptor, getFullName) {
-  Descriptor *intern = (Descriptor*)Z_OBJ_P(getThis());
-  RETURN_STRING(upb_MessageDef_FullName(intern->msgdef));
-}
-
-/*
- * Descriptor::getField()
- *
- * Returns a FieldDescriptor for the given index, which must be in the range
- * [0, getFieldCount()-1].
- */
-PHP_METHOD(Descriptor, getField) {
-  Descriptor *intern = (Descriptor*)Z_OBJ_P(getThis());
-  int count = upb_MessageDef_FieldCount(intern->msgdef);
-  zval ret;
-  zend_long index;
-
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "l", &index) == FAILURE) {
-    zend_error(E_USER_ERROR, "Expect integer for index.\n");
-    return;
-  }
-
-  if (index < 0 || index >= count) {
-    zend_error(E_USER_ERROR, "Cannot get element at %ld.\n", index);
-    return;
-  }
-
-  FieldDescriptor_FromFieldDef(&ret, upb_MessageDef_Field(intern->msgdef, index));
-  RETURN_COPY_VALUE(&ret);
-}
-
-/*
- * Descriptor::getFieldCount()
- *
- * Returns the number of fields in this message.
- */
-PHP_METHOD(Descriptor, getFieldCount) {
-  Descriptor *intern = (Descriptor*)Z_OBJ_P(getThis());
-  RETURN_LONG(upb_MessageDef_FieldCount(intern->msgdef));
-}
-
-/*
- * Descriptor::getOneofDecl()
- *
- * Returns a OneofDescriptor for the given index, which must be in the range
- * [0, getOneofDeclCount()].
- */
-PHP_METHOD(Descriptor, getOneofDecl) {
-  Descriptor *intern = (Descriptor*)Z_OBJ_P(getThis());
-  zend_long index;
-  zval ret;
-
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "l", &index) == FAILURE) {
-    zend_error(E_USER_ERROR, "Expect integer for index.\n");
-    return;
-  }
-
-  if (index < 0 || index >= upb_MessageDef_OneofCount(intern->msgdef)) {
-    zend_error(E_USER_ERROR, "Cannot get element at %ld.\n", index);
-    return;
-  }
-
-  OneofDescriptor_FromOneofDef(&ret, upb_MessageDef_Oneof(intern->msgdef, index));
-  RETURN_COPY_VALUE(&ret);
-}
-
-/*
- * Descriptor::getOneofDeclCount()
- *
- * Returns the number of oneofs in this message.
- */
-PHP_METHOD(Descriptor, getOneofDeclCount) {
-  Descriptor *intern = (Descriptor*)Z_OBJ_P(getThis());
-  RETURN_LONG(upb_MessageDef_OneofCount(intern->msgdef));
-}
-
-/*
- * Descriptor::getClass()
- *
- * Returns the name of the PHP class for this message.
- */
-PHP_METHOD(Descriptor, getClass) {
-  Descriptor *intern = (Descriptor*)Z_OBJ_P(getThis());
-  const char* classname = ZSTR_VAL(intern->class_entry->name);
-  RETURN_STRING(classname);
-}
-
-
-static zend_function_entry Descriptor_methods[] = {
-  PHP_ME(Descriptor, getClass, arginfo_void, ZEND_ACC_PUBLIC)
-  PHP_ME(Descriptor, getFullName, arginfo_void, ZEND_ACC_PUBLIC)
-  PHP_ME(Descriptor, getField, arginfo_getByIndex, ZEND_ACC_PUBLIC)
-  PHP_ME(Descriptor, getFieldCount, arginfo_void, ZEND_ACC_PUBLIC)
-  PHP_ME(Descriptor, getOneofDecl, arginfo_getByIndex, ZEND_ACC_PUBLIC)
-  PHP_ME(Descriptor, getOneofDeclCount, arginfo_void, ZEND_ACC_PUBLIC)
-  PHP_ME(Descriptor, getPublicDescriptor, arginfo_void, ZEND_ACC_PUBLIC)
-  ZEND_FE_END
-};
-
-// -----------------------------------------------------------------------------
-// DescriptorPool
-// -----------------------------------------------------------------------------
-
-typedef struct DescriptorPool {
-  zend_object std;
-  upb_DefPool *symtab;
-} DescriptorPool;
-
-zend_class_entry *DescriptorPool_class_entry;
-static zend_object_handlers DescriptorPool_object_handlers;
-
-static DescriptorPool *GetPool(const zval* this_ptr) {
-  return (DescriptorPool*)Z_OBJ_P(this_ptr);
-}
-
-/**
- * Object handler to free an DescriptorPool.
- */
-static void DescriptorPool_destructor(zend_object* obj) {
-  DescriptorPool* intern = (DescriptorPool*)obj;
-
-  // We can't free our underlying symtab here, because user code may create
-  // messages from destructors that will refer to it. The symtab will be freed
-  // by our RSHUTDOWN() handler in protobuf.c
-
-  zend_object_std_dtor(&intern->std);
-}
-
-void DescriptorPool_CreateWithSymbolTable(zval *zv, upb_DefPool *symtab) {
-  DescriptorPool *intern = emalloc(sizeof(DescriptorPool));
-  zend_object_std_init(&intern->std, DescriptorPool_class_entry);
-  intern->std.handlers = &DescriptorPool_object_handlers;
-  intern->symtab = symtab;
-
-  ZVAL_OBJ(zv, &intern->std);
-}
-
-upb_DefPool *DescriptorPool_GetSymbolTable() {
-  return get_global_symtab();
-}
-
-/*
- * DescriptorPool::getGeneratedPool()
- *
- * Returns the generated DescriptorPool.
- */
-PHP_METHOD(DescriptorPool, getGeneratedPool) {
-  DescriptorPool_CreateWithSymbolTable(return_value, get_global_symtab());
-}
-
-/*
- * DescriptorPool::getDescriptorByClassName()
- *
- * Returns a Descriptor object for the given PHP class name.
- */
-PHP_METHOD(DescriptorPool, getDescriptorByClassName) {
-  char *classname = NULL;
-  zend_long classname_len;
-  zend_class_entry *ce;
-  zend_string *str;
-  zval ret;
-
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &classname, &classname_len) ==
-      FAILURE) {
-    return;
-  }
-
-  str = zend_string_init(classname, strlen(classname), 0);
-  ce = zend_lookup_class(str);  // May autoload the class.
-  zend_string_release (str);
-
-  if (!ce) {
-    RETURN_NULL();
-  }
-
-  Descriptor_FromClassEntry(&ret, ce);
-  RETURN_COPY_VALUE(&ret);
-}
-
-/*
- * DescriptorPool::getEnumDescriptorByClassName()
- *
- * Returns a EnumDescriptor object for the given PHP class name.
- */
-PHP_METHOD(DescriptorPool, getEnumDescriptorByClassName) {
-  char *classname = NULL;
-  zend_long classname_len;
-  zend_class_entry *ce;
-  zend_string *str;
-  zval ret;
-
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &classname, &classname_len) ==
-      FAILURE) {
-    return;
-  }
-
-  str = zend_string_init(classname, strlen(classname), 0);
-  ce = zend_lookup_class(str);  // May autoload the class.
-  zend_string_release (str);
-
-  if (!ce) {
-    RETURN_NULL();
-  }
-
-  EnumDescriptor_FromClassEntry(&ret, ce);
-  RETURN_COPY_VALUE(&ret);
-}
-
-/*
- * DescriptorPool::getEnumDescriptorByProtoName()
- *
- * Returns a Descriptor object for the given protobuf message name.
- */
-PHP_METHOD(DescriptorPool, getDescriptorByProtoName) {
-  DescriptorPool *intern = GetPool(getThis());
-  char *protoname = NULL;
-  zend_long protoname_len;
-  const upb_MessageDef *m;
-
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &protoname, &protoname_len) ==
-      FAILURE) {
-    return;
-  }
-
-  if (*protoname == '.') protoname++;
-
-  m = upb_DefPool_FindMessageByName(intern->symtab, protoname);
-
-  if (m) {
-    RETURN_OBJ_COPY(&Descriptor_GetFromMessageDef(m)->std);
-  } else {
-    RETURN_NULL();
-  }
-}
-
-/*
- * depends_on_descriptor()
- *
- * Returns true if this FileDescriptorProto depends on descriptor.proto.
- */
-bool depends_on_descriptor(const google_protobuf_FileDescriptorProto* file) {
-  const upb_StringView *deps;
-  upb_StringView name = upb_StringView_FromString("google/protobuf/descriptor.proto");
-  size_t i, n;
-
-  deps = google_protobuf_FileDescriptorProto_dependency(file, &n);
-  for (i = 0; i < n; i++) {
-    if (upb_StringView_IsEqual(deps[i], name)) {
-      return true;
-    }
-  }
-
-  return false;
-}
-
-static void add_message_name_mappings(const upb_MessageDef *message) {
-  NameMap_AddMessage(message);
-  int msg_n = upb_MessageDef_NestedMessageCount(message);
-  for (int i = 0; i < msg_n; i++) {
-    add_message_name_mappings(upb_MessageDef_NestedMessage(message, i));
-  }
-  int enum_n = upb_MessageDef_NestedEnumCount(message);
-  for (int i = 0; i < enum_n; i++) {
-    NameMap_AddEnum(upb_MessageDef_NestedEnum(message, i));
-  }
-}
-
-/*
- * add_name_mappings()
- *
- * Adds the messages and enums in this file to the NameMap.
- */
-static void add_name_mappings(const upb_FileDef *file) {
-  for (int i = 0; i < upb_FileDef_TopLevelMessageCount(file); i++) {
-    add_message_name_mappings(upb_FileDef_TopLevelMessage(file, i));
-  }
-
-  for (int i = 0; i < upb_FileDef_TopLevelEnumCount(file); i++) {
-    NameMap_AddEnum(upb_FileDef_TopLevelEnum(file, i));
-  }
-}
-
-static void add_descriptor(upb_DefPool *symtab,
-                           const google_protobuf_FileDescriptorProto *file) {
-  upb_StringView name = google_protobuf_FileDescriptorProto_name(file);
-  upb_Status status;
-  const upb_FileDef *file_def;
-  upb_Status_Clear(&status);
-
-  if (upb_DefPool_FindFileByNameWithSize(symtab, name.data, name.size)) {
-    // Already added.
-    // TODO(teboring): Re-enable this warning when aggregate metadata is
-    // deprecated.
-    // zend_error(E_USER_WARNING,
-    //            "proto descriptor was previously loaded (included in multiple "
-    //            "metadata bundles?): " UPB_STRINGVIEW_FORMAT,
-    //            UPB_STRINGVIEW_ARGS(name));
-    return;
-  }
-
-  // The PHP code generator currently special-cases descriptor.proto.  It
-  // doesn't add it as a dependency even if the proto file actually does
-  // depend on it.
-  if (depends_on_descriptor(file)) {
-    google_protobuf_FileDescriptorProto_getmsgdef(symtab);
-  }
-
-  file_def = upb_DefPool_AddFile(symtab, file, &status);
-  CheckUpbStatus(&status, "Unable to load descriptor");
-  add_name_mappings(file_def);
-}
-
-/*
- * add_descriptor()
- *
- * Adds the given descriptor data to this DescriptorPool.
- */
-static void add_descriptor_set(upb_DefPool *symtab, const char *data,
-                               int data_len, upb_Arena *arena) {
-  size_t i, n;
-  google_protobuf_FileDescriptorSet *set;
-  const google_protobuf_FileDescriptorProto* const* files;
-
-  set = google_protobuf_FileDescriptorSet_parse(data, data_len, arena);
-
-  if (!set) {
-    zend_error(E_ERROR, "Failed to parse binary descriptor\n");
-    return;
-  }
-
-  files = google_protobuf_FileDescriptorSet_file(set, &n);
-
-  for (i = 0; i < n; i++) {
-    const google_protobuf_FileDescriptorProto* file = files[i];
-    add_descriptor(symtab, file);
-  }
-}
-
-bool DescriptorPool_HasFile(const char *filename) {
-  return upb_DefPool_FindFileByName(get_global_symtab(), filename) != NULL;
-}
-
-void DescriptorPool_AddDescriptor(const char *filename, const char *data,
-                                  int size) {
-  upb_Arena *arena = upb_Arena_New();
-  const google_protobuf_FileDescriptorProto *file =
-      google_protobuf_FileDescriptorProto_parse(data, size, arena);
-
-  if (!file) {
-    zend_error(E_ERROR, "Failed to parse binary descriptor for %s\n", filename);
-    return;
-  }
-
-  add_descriptor(get_global_symtab(), file);
-  upb_Arena_Free(arena);
-}
-
-/*
- * DescriptorPool::internalAddGeneratedFile()
- *
- * Adds the given descriptor data to this DescriptorPool.
- */
-PHP_METHOD(DescriptorPool, internalAddGeneratedFile) {
-  DescriptorPool *intern = GetPool(getThis());
-  char *data = NULL;
-  zend_long data_len;
-  zend_bool use_nested_submsg = false;
-  upb_Arena *arena;
-
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "s|b", &data, &data_len,
-                            &use_nested_submsg) != SUCCESS) {
-    return;
-  }
-
-  arena = upb_Arena_New();
-  add_descriptor_set(intern->symtab, data, data_len, arena);
-  upb_Arena_Free(arena);
-}
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_lookupByName, 0, 0, 1)
-  ZEND_ARG_INFO(0, name)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_addgeneratedfile, 0, 0, 2)
-  ZEND_ARG_INFO(0, data)
-  ZEND_ARG_INFO(0, data_len)
-ZEND_END_ARG_INFO()
-
-static zend_function_entry DescriptorPool_methods[] = {
-  PHP_ME(DescriptorPool, getGeneratedPool, arginfo_void,
-         ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
-  PHP_ME(DescriptorPool, getDescriptorByClassName, arginfo_lookupByName, ZEND_ACC_PUBLIC)
-  PHP_ME(DescriptorPool, getDescriptorByProtoName, arginfo_lookupByName, ZEND_ACC_PUBLIC)
-  PHP_ME(DescriptorPool, getEnumDescriptorByClassName, arginfo_lookupByName, ZEND_ACC_PUBLIC)
-  PHP_ME(DescriptorPool, internalAddGeneratedFile, arginfo_addgeneratedfile, ZEND_ACC_PUBLIC)
-  ZEND_FE_END
-};
-
-// -----------------------------------------------------------------------------
-// InternalDescriptorPool
-// -----------------------------------------------------------------------------
-
-// For the C extension, Google\Protobuf\Internal\DescriptorPool is not a
-// separate instantiable object, it just returns a
-// Google\Protobuf\DescriptorPool.
-
-zend_class_entry *InternalDescriptorPool_class_entry;
-
-/*
- * InternalDescriptorPool::getGeneratedPool()
- *
- * Returns the generated DescriptorPool. Note that this is identical to
- * DescriptorPool::getGeneratedPool(), and in fact returns a DescriptorPool
- * instance.
- */
-PHP_METHOD(InternalDescriptorPool, getGeneratedPool) {
-  DescriptorPool_CreateWithSymbolTable(return_value, get_global_symtab());
-}
-
-static zend_function_entry InternalDescriptorPool_methods[] = {
-  PHP_ME(InternalDescriptorPool, getGeneratedPool, arginfo_void,
-         ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
-  ZEND_FE_END
-};
-
-// -----------------------------------------------------------------------------
-// GPBType
-// -----------------------------------------------------------------------------
-
-zend_class_entry* gpb_type_type;
-
-static zend_function_entry gpb_type_methods[] = {
-  ZEND_FE_END
-};
-
-// -----------------------------------------------------------------------------
-// Module Init
-// -----------------------------------------------------------------------------
-
-void Def_ModuleInit() {
-  zend_class_entry tmp_ce;
-  zend_object_handlers *h;
-
-  INIT_CLASS_ENTRY(tmp_ce, "Google\\Protobuf\\OneofDescriptor",
-                   OneofDescriptor_methods);
-  OneofDescriptor_class_entry = zend_register_internal_class(&tmp_ce);
-  OneofDescriptor_class_entry->ce_flags |= ZEND_ACC_FINAL;
-  OneofDescriptor_class_entry->create_object = CreateHandler_ReturnNull;
-  h = &OneofDescriptor_object_handlers;
-  memcpy(h, &std_object_handlers, sizeof(zend_object_handlers));
-  h->dtor_obj = &OneofDescriptor_destructor;
-
-  INIT_CLASS_ENTRY(tmp_ce, "Google\\Protobuf\\EnumValueDescriptor",
-                   EnumValueDescriptor_methods);
-  EnumValueDescriptor_class_entry = zend_register_internal_class(&tmp_ce);
-  EnumValueDescriptor_class_entry->ce_flags |= ZEND_ACC_FINAL;
-  EnumValueDescriptor_class_entry->create_object = CreateHandler_ReturnNull;
-  h = &EnumValueDescriptor_object_handlers;
-  memcpy(h, &std_object_handlers, sizeof(zend_object_handlers));
-
-  INIT_CLASS_ENTRY(tmp_ce, "Google\\Protobuf\\EnumDescriptor",
-                   EnumDescriptor_methods);
-  EnumDescriptor_class_entry = zend_register_internal_class(&tmp_ce);
-  EnumDescriptor_class_entry->ce_flags |= ZEND_ACC_FINAL;
-  EnumDescriptor_class_entry->create_object = CreateHandler_ReturnNull;
-  h = &EnumDescriptor_object_handlers;
-  memcpy(h, &std_object_handlers, sizeof(zend_object_handlers));
-  h->dtor_obj = &EnumDescriptor_destructor;
-
-  INIT_CLASS_ENTRY(tmp_ce, "Google\\Protobuf\\Descriptor",
-                   Descriptor_methods);
-
-  Descriptor_class_entry = zend_register_internal_class(&tmp_ce);
-  Descriptor_class_entry->ce_flags |= ZEND_ACC_FINAL;
-  Descriptor_class_entry->create_object = CreateHandler_ReturnNull;
-  h = &Descriptor_object_handlers;
-  memcpy(h, &std_object_handlers, sizeof(zend_object_handlers));
-  h->dtor_obj = Descriptor_destructor;
-
-  INIT_CLASS_ENTRY(tmp_ce, "Google\\Protobuf\\FieldDescriptor",
-                   FieldDescriptor_methods);
-  FieldDescriptor_class_entry = zend_register_internal_class(&tmp_ce);
-  FieldDescriptor_class_entry->ce_flags |= ZEND_ACC_FINAL;
-  FieldDescriptor_class_entry->create_object = CreateHandler_ReturnNull;
-  h = &FieldDescriptor_object_handlers;
-  memcpy(h, &std_object_handlers, sizeof(zend_object_handlers));
-  h->dtor_obj = &FieldDescriptor_destructor;
-
-  INIT_CLASS_ENTRY(tmp_ce, "Google\\Protobuf\\DescriptorPool",
-                   DescriptorPool_methods);
-  DescriptorPool_class_entry = zend_register_internal_class(&tmp_ce);
-  DescriptorPool_class_entry->ce_flags |= ZEND_ACC_FINAL;
-  DescriptorPool_class_entry->create_object = CreateHandler_ReturnNull;
-  h = &DescriptorPool_object_handlers;
-  memcpy(h, &std_object_handlers, sizeof(zend_object_handlers));
-  h->dtor_obj = DescriptorPool_destructor;
-
-  INIT_CLASS_ENTRY(tmp_ce, "Google\\Protobuf\\Internal\\DescriptorPool",
-                   InternalDescriptorPool_methods);
-  InternalDescriptorPool_class_entry = zend_register_internal_class(&tmp_ce);
-
-  // GPBType.
-#define STR(str) (str), strlen(str)
-  zend_class_entry class_type;
-  INIT_CLASS_ENTRY(class_type, "Google\\Protobuf\\Internal\\GPBType",
-                   gpb_type_methods);
-  gpb_type_type = zend_register_internal_class(&class_type);
-  zend_declare_class_constant_long(gpb_type_type, STR("DOUBLE"), 1);
-  zend_declare_class_constant_long(gpb_type_type, STR("FLOAT"), 2);
-  zend_declare_class_constant_long(gpb_type_type, STR("INT64"), 3);
-  zend_declare_class_constant_long(gpb_type_type, STR("UINT64"), 4);
-  zend_declare_class_constant_long(gpb_type_type, STR("INT32"), 5);
-  zend_declare_class_constant_long(gpb_type_type, STR("FIXED64"), 6);
-  zend_declare_class_constant_long(gpb_type_type, STR("FIXED32"), 7);
-  zend_declare_class_constant_long(gpb_type_type, STR("BOOL"), 8);
-  zend_declare_class_constant_long(gpb_type_type, STR("STRING"), 9);
-  zend_declare_class_constant_long(gpb_type_type, STR("GROUP"), 10);
-  zend_declare_class_constant_long(gpb_type_type, STR("MESSAGE"), 11);
-  zend_declare_class_constant_long(gpb_type_type, STR("BYTES"), 12);
-  zend_declare_class_constant_long(gpb_type_type, STR("UINT32"), 13);
-  zend_declare_class_constant_long(gpb_type_type, STR("ENUM"), 14);
-  zend_declare_class_constant_long(gpb_type_type, STR("SFIXED32"), 15);
-  zend_declare_class_constant_long(gpb_type_type, STR("SFIXED64"), 16);
-  zend_declare_class_constant_long(gpb_type_type, STR("SINT32"), 17);
-  zend_declare_class_constant_long(gpb_type_type, STR("SINT64"), 18);
-#undef STR
-}
diff --git a/libs/protobuf/php/ext/google/protobuf/def.h b/libs/protobuf/php/ext/google/protobuf/def.h
deleted file mode 100644
index 8d82797..0000000
--- a/libs/protobuf/php/ext/google/protobuf/def.h
+++ /dev/null
@@ -1,90 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef PHP_PROTOBUF_DEF_H_
-#define PHP_PROTOBUF_DEF_H_
-
-#include <php.h>
-
-#include "php-upb.h"
-
-// Initializes the Def module, which defines all of the descriptor classes.
-void Def_ModuleInit();
-
-// Creates a new DescriptorPool to wrap the given symtab, which must not be
-// NULL.
-void DescriptorPool_CreateWithSymbolTable(zval *zv, upb_DefPool *symtab);
-
-upb_DefPool *DescriptorPool_GetSymbolTable();
-
-// Returns true if the global descriptor pool already has the given filename.
-bool DescriptorPool_HasFile(const char *filename);
-
-// Adds the given descriptor with the given filename to the global pool.
-void DescriptorPool_AddDescriptor(const char *filename, const char *data, int size);
-
-typedef struct Descriptor {
-  zend_object std;
-  const upb_MessageDef *msgdef;
-  zend_class_entry *class_entry;
-} Descriptor;
-
-// Gets or creates a Descriptor* for the given class entry, upb_MessageDef, or
-// upb_FieldDef. The returned Descriptor* will live for the entire request,
-// so no ref is necessary to keep it alive. The caller does *not* own a ref
-// on the returned object.
-Descriptor* Descriptor_GetFromClassEntry(zend_class_entry *ce);
-Descriptor* Descriptor_GetFromMessageDef(const upb_MessageDef *m);
-Descriptor* Descriptor_GetFromFieldDef(const upb_FieldDef *f);
-
-// Packages up a upb_CType with a Descriptor, since many functions need
-// both.
-typedef struct {
-  upb_CType type;
-  const Descriptor *desc;  // When type == kUpb_CType_Message.
-} TypeInfo;
-
-static inline TypeInfo TypeInfo_Get(const upb_FieldDef *f) {
-  TypeInfo ret = {upb_FieldDef_CType(f), Descriptor_GetFromFieldDef(f)};
-  return ret;
-}
-
-static inline TypeInfo TypeInfo_FromType(upb_CType type) {
-  TypeInfo ret = {type};
-  return ret;
-}
-
-static inline bool TypeInfo_Eq(TypeInfo a, TypeInfo b) {
-  if (a.type != b.type) return false;
-  if (a.type == kUpb_CType_Message && a.desc != b.desc) return false;
-  return true;
-}
-
-#endif  // PHP_PROTOBUF_DEF_H_
diff --git a/libs/protobuf/php/ext/google/protobuf/generate_package_xml.sh b/libs/protobuf/php/ext/google/protobuf/generate_package_xml.sh
deleted file mode 100755
index 3228785..0000000
--- a/libs/protobuf/php/ext/google/protobuf/generate_package_xml.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-template_package_xml=$1
-release_version=$2
-release_files=$3
-out=$4
-
-date=$(date +%Y-%m-%d)
-time=$(date +%H:%M:%S)
-
-php_version_array=(${release_version//RC/ })
-api_version=${php_version_array[0]}
-if [ ${#php_version_array[@]} -eq 2 ]; then
-    rc=${php_version_array[1]}
-    stability='beta'
-else
-    stability='stable'
-fi
-
-files="\\n"
-for file in ${release_files//,/ }; do
-  name=$(echo $file | grep .*[^/]\$ | sed -e "s;protobuf-${release_version}/;;")
-  if [ ! -z $name ]; then
-    if [[ $name =~ LICENSE$ ]]; then
-      role='doc'
-    else
-      role='src'
-    fi
-    files+="    <file baseinstalldir=\"/\" name=\"${name}\" role=\"${role}\"/>\\n"
-  fi
-done
-
-cat $template_package_xml |
-sed -e "s;TEMPLATE_DATE;${date};" |
-sed -e "s;TEMPLATE_TIME;${time};" |
-sed -e "s;TEMPLATE_PHP_RELEASE;${release_version};" |
-sed -e "s;TEMPLATE_PHP_API;${api_version};" |
-sed -e "s;TEMPLATE_PHP_STABILITY;${stability};g" |
-sed -e "s;TEMPLATE_FILES;${files};" > $out
\ No newline at end of file
diff --git a/libs/protobuf/php/ext/google/protobuf/map.c b/libs/protobuf/php/ext/google/protobuf/map.c
deleted file mode 100644
index fce88b2..0000000
--- a/libs/protobuf/php/ext/google/protobuf/map.c
+++ /dev/null
@@ -1,698 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include "map.h"
-
-#include <Zend/zend_API.h>
-#include <Zend/zend_interfaces.h>
-
-#include <ext/spl/spl_iterators.h>
-
-#include "arena.h"
-#include "convert.h"
-#include "message.h"
-#include "php-upb.h"
-#include "protobuf.h"
-
-static void MapFieldIter_make(zval *val, zval *map_field);
-
-// -----------------------------------------------------------------------------
-// MapField
-// -----------------------------------------------------------------------------
-
-typedef struct {
-  zend_object std;
-  zval arena;
-  upb_Map *map;
-  MapField_Type type;
-} MapField;
-
-zend_class_entry *MapField_class_entry;
-static zend_object_handlers MapField_object_handlers;
-
-static bool MapType_Eq(MapField_Type a, MapField_Type b) {
-  return a.key_type == b.key_type && TypeInfo_Eq(a.val_type, b.val_type);
-}
-
-static TypeInfo KeyType(MapField_Type type) {
-  TypeInfo ret = {type.key_type};
-  return ret;
-}
-
-MapField_Type MapType_Get(const upb_FieldDef *f) {
-  const upb_MessageDef *ent = upb_FieldDef_MessageSubDef(f);
-  const upb_FieldDef *key_f = upb_MessageDef_FindFieldByNumber(ent, 1);
-  const upb_FieldDef *val_f = upb_MessageDef_FindFieldByNumber(ent, 2);
-  MapField_Type type = {
-      upb_FieldDef_CType(key_f),
-      {upb_FieldDef_CType(val_f), Descriptor_GetFromFieldDef(val_f)}};
-  return type;
-}
-
-// PHP Object Handlers /////////////////////////////////////////////////////////
-
-/**
- * MapField_create()
- *
- * PHP class entry function to allocate and initialize a new MapField
- * object.
- */
-static zend_object* MapField_create(zend_class_entry *class_type) {
-  MapField *intern = emalloc(sizeof(MapField));
-  zend_object_std_init(&intern->std, class_type);
-  intern->std.handlers = &MapField_object_handlers;
-  Arena_Init(&intern->arena);
-  intern->map = NULL;
-  // Skip object_properties_init(), we don't allow derived classes.
-  return &intern->std;
-}
-
-/**
- * MapField_dtor()
- *
- * Object handler to destroy a MapField. This releases all resources
- * associated with the message. Note that it is possible to access a destroyed
- * object from PHP in rare cases.
- */
-static void MapField_destructor(zend_object* obj) {
-  MapField* intern = (MapField*)obj;
-  ObjCache_Delete(intern->map);
-  zval_ptr_dtor(&intern->arena);
-  zend_object_std_dtor(&intern->std);
-}
-
-/**
- * MapField_compare_objects()
- *
- * Object handler for comparing two repeated field objects. Called whenever PHP
- * code does:
- *
- *   $map1 == $map2
- */
-static int MapField_compare_objects(zval *map1, zval *map2) {
-  MapField* intern1 = (MapField*)Z_OBJ_P(map1);
-  MapField* intern2 = (MapField*)Z_OBJ_P(map2);
-
-  return MapType_Eq(intern1->type, intern2->type) &&
-                 MapEq(intern1->map, intern2->map, intern1->type)
-             ? 0
-             : 1;
-}
-
-/**
- * MapField_clone_obj()
- *
- * Object handler for cloning an object in PHP. Called when PHP code does:
- *
- *   $map2 = clone $map1;
- */
-static zend_object *MapField_clone_obj(PROTO_VAL *object) {
-  MapField* intern = PROTO_VAL_P(object);
-  upb_Arena *arena = Arena_Get(&intern->arena);
-  upb_Map *clone =
-      upb_Map_New(arena, intern->type.key_type, intern->type.val_type.type);
-  size_t iter = kUpb_Map_Begin;
-
-  while (upb_MapIterator_Next(intern->map, &iter)) {
-    upb_MessageValue key = upb_MapIterator_Key(intern->map, iter);
-    upb_MessageValue val = upb_MapIterator_Value(intern->map, iter);
-    upb_Map_Set(clone, key, val, arena);
-  }
-
-  zval ret;
-  MapField_GetPhpWrapper(&ret, clone, intern->type, &intern->arena);
-  return Z_OBJ_P(&ret);
-}
-
-static zval *Map_GetPropertyPtrPtr(PROTO_VAL *object, PROTO_STR *member,
-                                   int type, void **cache_slot) {
-  return NULL;  // We don't offer direct references to our properties.
-}
-
-static HashTable *Map_GetProperties(PROTO_VAL *object) {
-  return NULL;  // We do not have a properties table.
-}
-
-// C Functions from map.h //////////////////////////////////////////////////////
-
-// These are documented in the header file.
-
-void MapField_GetPhpWrapper(zval *val, upb_Map *map, MapField_Type type,
-                            zval *arena) {
-  if (!map) {
-    ZVAL_NULL(val);
-    return;
-  }
-
-  if (!ObjCache_Get(map, val)) {
-    MapField *intern = emalloc(sizeof(MapField));
-    zend_object_std_init(&intern->std, MapField_class_entry);
-    intern->std.handlers = &MapField_object_handlers;
-    ZVAL_COPY(&intern->arena, arena);
-    intern->map = map;
-    intern->type = type;
-    // Skip object_properties_init(), we don't allow derived classes.
-    ObjCache_Add(intern->map, &intern->std);
-    ZVAL_OBJ(val, &intern->std);
-  }
-}
-
-upb_Map *MapField_GetUpbMap(zval *val, MapField_Type type, upb_Arena *arena) {
-  if (Z_ISREF_P(val)) {
-    ZVAL_DEREF(val);
-  }
-
-  if (Z_TYPE_P(val) == IS_ARRAY) {
-    upb_Map *map = upb_Map_New(arena, type.key_type, type.val_type.type);
-    HashTable *table = HASH_OF(val);
-    HashPosition pos;
-
-    zend_hash_internal_pointer_reset_ex(table, &pos);
-
-    while (true) {
-      zval php_key;
-      zval *php_val;
-      upb_MessageValue upb_key;
-      upb_MessageValue upb_val;
-
-      zend_hash_get_current_key_zval_ex(table, &php_key, &pos);
-      php_val = zend_hash_get_current_data_ex(table, &pos);
-
-      if (!php_val) return map;
-
-      if (!Convert_PhpToUpb(&php_key, &upb_key, KeyType(type), arena) ||
-          !Convert_PhpToUpbAutoWrap(php_val, &upb_val, type.val_type, arena)) {
-        return NULL;
-      }
-
-      upb_Map_Set(map, upb_key, upb_val, arena);
-      zend_hash_move_forward_ex(table, &pos);
-      zval_dtor(&php_key);
-    }
-  } else if (Z_TYPE_P(val) == IS_OBJECT &&
-             Z_OBJCE_P(val) == MapField_class_entry) {
-    MapField *intern = (MapField*)Z_OBJ_P(val);
-
-    if (!MapType_Eq(intern->type, type)) {
-      php_error_docref(NULL, E_USER_ERROR, "Wrong type for this map field.");
-      return NULL;
-    }
-
-    upb_Arena_Fuse(arena, Arena_Get(&intern->arena));
-    return intern->map;
-  } else {
-    php_error_docref(NULL, E_USER_ERROR, "Must be a map");
-    return NULL;
-  }
-}
-
-bool MapEq(const upb_Map *m1, const upb_Map *m2, MapField_Type type) {
-  size_t iter = kUpb_Map_Begin;
-
-  if ((m1 == NULL) != (m2 == NULL)) return false;
-  if (m1 == NULL) return true;
-  if (upb_Map_Size(m1) != upb_Map_Size(m2)) return false;
-
-  while (upb_MapIterator_Next(m1, &iter)) {
-    upb_MessageValue key = upb_MapIterator_Key(m1, iter);
-    upb_MessageValue val1 = upb_MapIterator_Value(m1, iter);
-    upb_MessageValue val2;
-
-    if (!upb_Map_Get(m2, key, &val2)) return false;
-    if (!ValueEq(val1, val2, type.val_type)) return false;
-  }
-
-  return true;
-}
-
-
-// MapField PHP methods ////////////////////////////////////////////////////////
-
-/**
- * MapField::__construct()
- *
- * Constructs an instance of MapField.
- * @param long Key type.
- * @param long Value type.
- * @param string Message/Enum class (message/enum value types only).
- */
-PHP_METHOD(MapField, __construct) {
-  MapField *intern = (MapField*)Z_OBJ_P(getThis());
-  upb_Arena *arena = Arena_Get(&intern->arena);
-  zend_long key_type, val_type;
-  zend_class_entry* klass = NULL;
-
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "ll|C", &key_type, &val_type,
-                            &klass) != SUCCESS) {
-    return;
-  }
-
-  intern->type.key_type = pbphp_dtype_to_type(key_type);
-  intern->type.val_type.type = pbphp_dtype_to_type(val_type);
-  intern->type.val_type.desc = Descriptor_GetFromClassEntry(klass);
-
-  // Check that the key type is an allowed type.
-  switch (intern->type.key_type) {
-    case kUpb_CType_Int32:
-    case kUpb_CType_Int64:
-    case kUpb_CType_UInt32:
-    case kUpb_CType_UInt64:
-    case kUpb_CType_Bool:
-    case kUpb_CType_String:
-    case kUpb_CType_Bytes:
-      // These are OK.
-      break;
-    default:
-      zend_error(E_USER_ERROR, "Invalid key type for map.");
-  }
-
-  if (intern->type.val_type.type == kUpb_CType_Message && klass == NULL) {
-    php_error_docref(NULL, E_USER_ERROR,
-                     "Message/enum type must have concrete class.");
-    return;
-  }
-
-  intern->map =
-      upb_Map_New(arena, intern->type.key_type, intern->type.val_type.type);
-  ObjCache_Add(intern->map, &intern->std);
-}
-
-/**
- * MapField::offsetExists(): bool
- *
- * Implements the ArrayAccess interface. Invoked when PHP code calls:
- *
- *   isset($map[$idx]);
- *   empty($map[$idx]);
- *
- * @param long The index to be checked.
- * @return bool True if the element at the given index exists.
- */
-PHP_METHOD(MapField, offsetExists) {
-  MapField *intern = (MapField*)Z_OBJ_P(getThis());
-  zval *key;
-  upb_MessageValue upb_key;
-
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &key) != SUCCESS ||
-      !Convert_PhpToUpb(key, &upb_key, KeyType(intern->type), NULL)) {
-    return;
-  }
-
-  RETURN_BOOL(upb_Map_Get(intern->map, upb_key, NULL));
-}
-
-/**
- * MapField::offsetGet(): mixed
- *
- * Implements the ArrayAccess interface. Invoked when PHP code calls:
- *
- *   $x = $map[$idx];
- *
- * @param long The index of the element to be fetched.
- * @return object The stored element at given index.
- * @exception Invalid type for index.
- * @exception Non-existing index.
- */
-PHP_METHOD(MapField, offsetGet) {
-  MapField *intern = (MapField*)Z_OBJ_P(getThis());
-  zval *key;
-  zval ret;
-  upb_MessageValue upb_key, upb_val;
-
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &key) != SUCCESS ||
-      !Convert_PhpToUpb(key, &upb_key, KeyType(intern->type), NULL)) {
-    return;
-  }
-
-  if (!upb_Map_Get(intern->map, upb_key, &upb_val)) {
-    zend_error(E_USER_ERROR, "Given key doesn't exist.");
-    return;
-  }
-
-  Convert_UpbToPhp(upb_val, &ret, intern->type.val_type, &intern->arena);
-  RETURN_COPY_VALUE(&ret);
-}
-
-/**
- * MapField::offsetSet(): void
- *
- * Implements the ArrayAccess interface. Invoked when PHP code calls:
- *
- *   $map[$idx] = $x;
- *
- * @param long The index of the element to be assigned.
- * @param object The element to be assigned.
- * @exception Invalid type for index.
- * @exception Non-existing index.
- * @exception Incorrect type of the element.
- */
-PHP_METHOD(MapField, offsetSet) {
-  MapField *intern = (MapField*)Z_OBJ_P(getThis());
-  upb_Arena *arena = Arena_Get(&intern->arena);
-  zval *key, *val;
-  upb_MessageValue upb_key, upb_val;
-
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "zz", &key, &val) != SUCCESS ||
-      !Convert_PhpToUpb(key, &upb_key, KeyType(intern->type), NULL) ||
-      !Convert_PhpToUpb(val, &upb_val, intern->type.val_type, arena)) {
-    return;
-  }
-
-  upb_Map_Set(intern->map, upb_key, upb_val, arena);
-}
-
-/**
- * MapField::offsetUnset(): void
- *
- * Implements the ArrayAccess interface. Invoked when PHP code calls:
- *
- *   unset($map[$idx]);
- *
- * @param long The index of the element to be removed.
- * @exception Invalid type for index.
- * @exception The element to be removed is not at the end of the MapField.
- */
-PHP_METHOD(MapField, offsetUnset) {
-  MapField *intern = (MapField*)Z_OBJ_P(getThis());
-  zval *key;
-  upb_MessageValue upb_key;
-
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &key) != SUCCESS ||
-      !Convert_PhpToUpb(key, &upb_key, KeyType(intern->type), NULL)) {
-    return;
-  }
-
-  upb_Map_Delete(intern->map, upb_key);
-}
-
-/**
- * MapField::count(): int
- *
- * Implements the Countable interface. Invoked when PHP code calls:
- *
- *   $len = count($map);
- * Return the number of stored elements.
- * This will also be called for: count($map)
- * @return long The number of stored elements.
- */
-PHP_METHOD(MapField, count) {
-  MapField *intern = (MapField*)Z_OBJ_P(getThis());
-
-  if (zend_parse_parameters_none() == FAILURE) {
-    return;
-  }
-
-  RETURN_LONG(upb_Map_Size(intern->map));
-}
-
-/**
- * MapField::getIterator(): Traversable
- *
- * Implements the IteratorAggregate interface. Invoked when PHP code calls:
- *
- *   foreach ($arr) {}
- *
- * @return object Beginning iterator.
- */
-PHP_METHOD(MapField, getIterator) {
-  zval ret;
-  MapFieldIter_make(&ret, getThis());
-  RETURN_COPY_VALUE(&ret);
-}
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_construct, 0, 0, 2)
-  ZEND_ARG_INFO(0, key_type)
-  ZEND_ARG_INFO(0, value_type)
-  ZEND_ARG_INFO(0, value_class)
-ZEND_END_ARG_INFO()
-
-
-ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_offsetGet, 0, 0, IS_MIXED, 1)
-  ZEND_ARG_INFO(0, index)
-ZEND_END_ARG_INFO()
-
-PROTOBUF_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_offsetSet, 0, 2, IS_VOID, 0)
-  ZEND_ARG_INFO(0, index)
-  ZEND_ARG_INFO(0, newval)
-ZEND_END_ARG_INFO()
-
-PROTOBUF_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_offsetUnset, 0, 0, IS_VOID, 0)
-  ZEND_ARG_INFO(0, index)
-ZEND_END_ARG_INFO()
-
-PROTOBUF_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_offsetExists, 0, 0, _IS_BOOL, 0)
-  ZEND_ARG_INFO(0, index)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_getIterator, 0, 0, Traversable, 0)
-ZEND_END_ARG_INFO()
-
-PROTOBUF_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_count, 0, 0, IS_LONG, 0)
-ZEND_END_ARG_INFO()
-
-static zend_function_entry MapField_methods[] = {
-  PHP_ME(MapField, __construct,  arginfo_construct,    ZEND_ACC_PUBLIC)
-  PHP_ME(MapField, offsetExists, arginfo_offsetExists, ZEND_ACC_PUBLIC)
-  PHP_ME(MapField, offsetGet,    arginfo_offsetGet,    ZEND_ACC_PUBLIC)
-  PHP_ME(MapField, offsetSet,    arginfo_offsetSet,    ZEND_ACC_PUBLIC)
-  PHP_ME(MapField, offsetUnset,  arginfo_offsetUnset,  ZEND_ACC_PUBLIC)
-  PHP_ME(MapField, count,        arginfo_count,        ZEND_ACC_PUBLIC)
-  PHP_ME(MapField, getIterator,  arginfo_getIterator,  ZEND_ACC_PUBLIC)
-  ZEND_FE_END
-};
-
-// -----------------------------------------------------------------------------
-// MapFieldIter
-// -----------------------------------------------------------------------------
-
-typedef struct {
-  zend_object std;
-  zval map_field;
-  size_t position;
-} MapFieldIter;
-
-zend_class_entry *MapFieldIter_class_entry;
-static zend_object_handlers MapFieldIter_object_handlers;
-
-/**
- * MapFieldIter_create()
- *
- * PHP class entry function to allocate and initialize a new MapFieldIter
- * object.
- */
-zend_object* MapFieldIter_create(zend_class_entry *class_type) {
-  MapFieldIter *intern = emalloc(sizeof(MapFieldIter));
-  zend_object_std_init(&intern->std, class_type);
-  intern->std.handlers = &MapFieldIter_object_handlers;
-  ZVAL_NULL(&intern->map_field);
-  intern->position = 0;
-  // Skip object_properties_init(), we don't allow derived classes.
-  return &intern->std;
-}
-
-/**
- * MapFieldIter_dtor()
- *
- * Object handler to destroy a MapFieldIter. This releases all resources
- * associated with the message. Note that it is possible to access a destroyed
- * object from PHP in rare cases.
- */
-static void map_field_iter_dtor(zend_object* obj) {
-  MapFieldIter* intern = (MapFieldIter*)obj;
-  zval_ptr_dtor(&intern->map_field);
-  zend_object_std_dtor(&intern->std);
-}
-
-/**
- * MapFieldIter_make()
- *
- * Function to create a MapFieldIter directly from C.
- */
-static void MapFieldIter_make(zval *val, zval *map_field) {
-  MapFieldIter *iter;
-  ZVAL_OBJ(val,
-           MapFieldIter_class_entry->create_object(MapFieldIter_class_entry));
-  iter = (MapFieldIter*)Z_OBJ_P(val);
-  ZVAL_COPY(&iter->map_field, map_field);
-}
-
-// -----------------------------------------------------------------------------
-// PHP MapFieldIter Methods
-// -----------------------------------------------------------------------------
-
-/*
- * When a user writes:
- *
- *   foreach($arr as $key => $val) {}
- *
- * PHP translates this into:
- *
- *   $iter = $arr->getIterator();
- *   for ($iter->rewind(); $iter->valid(); $iter->next()) {
- *     $key = $iter->key();
- *     $val = $iter->current();
- *   }
- */
-
-/**
- * MapFieldIter::rewind(): void
- *
- * Implements the Iterator interface. Sets the iterator to the first element.
- */
-PHP_METHOD(MapFieldIter, rewind) {
-  MapFieldIter *intern = (MapFieldIter*)Z_OBJ_P(getThis());
-  MapField *map_field = (MapField*)Z_OBJ_P(&intern->map_field);
-  intern->position = kUpb_Map_Begin;
-  upb_MapIterator_Next(map_field->map, &intern->position);
-}
-
-/**
- * MapFieldIter::current(): mixed
- *
- * Implements the Iterator interface. Returns the current value.
- */
-PHP_METHOD(MapFieldIter, current) {
-  MapFieldIter *intern = (MapFieldIter*)Z_OBJ_P(getThis());
-  MapField *field = (MapField*)Z_OBJ_P(&intern->map_field);
-  upb_MessageValue upb_val = upb_MapIterator_Value(field->map, intern->position);
-  zval ret;
-  Convert_UpbToPhp(upb_val, &ret, field->type.val_type, &field->arena);
-  RETURN_COPY_VALUE(&ret);
-}
-
-/**
- * MapFieldIter::key()
- *
- * Implements the Iterator interface. Returns the current key.
- */
-PHP_METHOD(MapFieldIter, key) {
-  MapFieldIter *intern = (MapFieldIter*)Z_OBJ_P(getThis());
-  MapField *field = (MapField*)Z_OBJ_P(&intern->map_field);
-  upb_MessageValue upb_key = upb_MapIterator_Key(field->map, intern->position);
-  zval ret;
-  Convert_UpbToPhp(upb_key, &ret, KeyType(field->type), NULL);
-  RETURN_COPY_VALUE(&ret);
-}
-
-/**
- * MapFieldIter::next(): void
- *
- * Implements the Iterator interface. Advances to the next element.
- */
-PHP_METHOD(MapFieldIter, next) {
-  MapFieldIter *intern = (MapFieldIter*)Z_OBJ_P(getThis());
-  MapField *field = (MapField*)Z_OBJ_P(&intern->map_field);
-  upb_MapIterator_Next(field->map, &intern->position);
-}
-
-/**
- * MapFieldIter::valid(): bool
- *
- * Implements the Iterator interface. Returns true if this is a valid element.
- */
-PHP_METHOD(MapFieldIter, valid) {
-  MapFieldIter *intern = (MapFieldIter*)Z_OBJ_P(getThis());
-  MapField *field = (MapField*)Z_OBJ_P(&intern->map_field);
-  bool done = upb_MapIterator_Done(field->map, intern->position);
-  RETURN_BOOL(!done);
-}
-
-PROTOBUF_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_rewind, 0, 0, IS_VOID, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_current, 0, 0, IS_MIXED, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(arginfo_key, 0, 0, IS_MIXED, 0)
-ZEND_END_ARG_INFO()
-
-PROTOBUF_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_next, 0, 0, IS_VOID, 0)
-ZEND_END_ARG_INFO()
-
-PROTOBUF_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_valid, 0, 0, _IS_BOOL, 0)
-ZEND_END_ARG_INFO()
-
-static zend_function_entry map_field_iter_methods[] = {
-  PHP_ME(MapFieldIter, rewind,      arginfo_rewind,  ZEND_ACC_PUBLIC)
-  PHP_ME(MapFieldIter, current,     arginfo_current, ZEND_ACC_PUBLIC)
-  PHP_ME(MapFieldIter, key,         arginfo_key,     ZEND_ACC_PUBLIC)
-  PHP_ME(MapFieldIter, next,        arginfo_next,    ZEND_ACC_PUBLIC)
-  PHP_ME(MapFieldIter, valid,       arginfo_valid,   ZEND_ACC_PUBLIC)
-  ZEND_FE_END
-};
-
-// -----------------------------------------------------------------------------
-// Module init.
-// -----------------------------------------------------------------------------
-
-/**
- * Map_ModuleInit()
- *
- * Called when the C extension is loaded to register all types.
- */
-
-void Map_ModuleInit() {
-  zend_class_entry tmp_ce;
-  zend_object_handlers *h;
-
-  INIT_CLASS_ENTRY(tmp_ce, "Google\\Protobuf\\Internal\\MapField",
-                   MapField_methods);
-
-  MapField_class_entry = zend_register_internal_class(&tmp_ce);
-  zend_class_implements(MapField_class_entry, 3, zend_ce_arrayaccess,
-                        zend_ce_aggregate, zend_ce_countable);
-  MapField_class_entry->ce_flags |= ZEND_ACC_FINAL;
-  MapField_class_entry->create_object = MapField_create;
-
-  h = &MapField_object_handlers;
-  memcpy(h, &std_object_handlers, sizeof(zend_object_handlers));
-  h->dtor_obj = MapField_destructor;
-#if PHP_VERSION_ID < 80000
-  h->compare_objects = MapField_compare_objects;
-#else
-  h->compare = MapField_compare_objects;
-#endif
-  h->clone_obj = MapField_clone_obj;
-  h->get_properties = Map_GetProperties;
-  h->get_property_ptr_ptr = Map_GetPropertyPtrPtr;
-
-  INIT_CLASS_ENTRY(tmp_ce, "Google\\Protobuf\\Internal\\MapFieldIter",
-                   map_field_iter_methods);
-
-  MapFieldIter_class_entry = zend_register_internal_class(&tmp_ce);
-  zend_class_implements(MapFieldIter_class_entry, 1, zend_ce_iterator);
-  MapFieldIter_class_entry->ce_flags |= ZEND_ACC_FINAL;
-  MapFieldIter_class_entry->ce_flags |= ZEND_ACC_FINAL;
-  MapFieldIter_class_entry->create_object = MapFieldIter_create;
-
-  h = &MapFieldIter_object_handlers;
-  memcpy(h, &std_object_handlers, sizeof(zend_object_handlers));
-  h->dtor_obj = map_field_iter_dtor;
-}
diff --git a/libs/protobuf/php/ext/google/protobuf/map.h b/libs/protobuf/php/ext/google/protobuf/map.h
deleted file mode 100644
index d104ec9..0000000
--- a/libs/protobuf/php/ext/google/protobuf/map.h
+++ /dev/null
@@ -1,70 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef PHP_PROTOBUF_MAP_H_
-#define PHP_PROTOBUF_MAP_H_
-
-#include <php.h>
-
-#include "def.h"
-#include "php-upb.h"
-
-void Map_ModuleInit();
-
-typedef struct {
-  upb_CType key_type;
-  TypeInfo val_type;
-} MapField_Type;
-
-MapField_Type MapType_Get(const upb_FieldDef *f);
-
-// Gets a upb_Map* for the PHP object |val|:
-//  * If |val| is a RepeatedField object, we first check its type and verify
-//    that that the elements have the correct type for |f|. If so, we return the
-//    wrapped upb_Map*. We also make sure that this map's arena is fused to
-//    |arena|, so the returned upb_Map is guaranteed to live as long as
-//    |arena|.
-//  * If |val| is a PHP Map, we attempt to create a new upb_Map using
-//    |arena| and add all of the PHP elements to it.
-//
-// If an error occurs, we raise a PHP error and return NULL.
-upb_Map *MapField_GetUpbMap(zval *val, MapField_Type type, upb_Arena *arena);
-
-// Creates a PHP MapField object for the given upb_Map* and |f| and returns it
-// in |val|. The PHP object will keep a reference to this |arena| to ensure the
-// underlying array data stays alive.
-//
-// If |map| is NULL, this will return a PHP null object.
-void MapField_GetPhpWrapper(zval *val, upb_Map *arr, MapField_Type type,
-                            zval *arena);
-
-bool MapEq(const upb_Map *m1, const upb_Map *m2, MapField_Type type);
-
-#endif  // PHP_PROTOBUF_MAP_H_
diff --git a/libs/protobuf/php/ext/google/protobuf/message.c b/libs/protobuf/php/ext/google/protobuf/message.c
deleted file mode 100644
index 55f4f4d..0000000
--- a/libs/protobuf/php/ext/google/protobuf/message.c
+++ /dev/null
@@ -1,1414 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2014 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include "message.h"
-
-#include <inttypes.h>
-#include <php.h>
-#include <stdlib.h>
-
-// This is not self-contained: it must be after other Zend includes.
-#include <Zend/zend_exceptions.h>
-#include <Zend/zend_inheritance.h>
-
-#include "arena.h"
-#include "array.h"
-#include "convert.h"
-#include "def.h"
-#include "map.h"
-#include "php-upb.h"
-#include "protobuf.h"
-
-// -----------------------------------------------------------------------------
-// Message
-// -----------------------------------------------------------------------------
-
-typedef struct {
-  zend_object std;
-  zval arena;
-  const Descriptor* desc;
-  upb_Message *msg;
-} Message;
-
-zend_class_entry *message_ce;
-static zend_object_handlers message_object_handlers;
-
-static void Message_SuppressDefaultProperties(zend_class_entry *class_type) {
-  // We suppress all default properties, because all our properties are handled
-  // by our read_property handler.
-  //
-  // This also allows us to put our zend_object member at the beginning of our
-  // struct -- instead of putting it at the end with pointer fixups to access
-  // our own data, as recommended in the docs -- because Zend won't add any of
-  // its own storage directly after the zend_object if default_properties_count
-  // == 0.
-  //
-  // This is not officially supported, but since it simplifies the code, we'll
-  // do it for as long as it works in practice.
-  class_type->default_properties_count = 0;
-}
-
-// PHP Object Handlers /////////////////////////////////////////////////////////
-
-/**
- * Message_create()
- *
- * PHP class entry function to allocate and initialize a new Message object.
- */
-static zend_object* Message_create(zend_class_entry *class_type) {
-  Message *intern = emalloc(sizeof(Message));
-  Message_SuppressDefaultProperties(class_type);
-  zend_object_std_init(&intern->std, class_type);
-  intern->std.handlers = &message_object_handlers;
-  Arena_Init(&intern->arena);
-  return &intern->std;
-}
-
-/**
- * Message_dtor()
- *
- * Object handler to destroy a Message. This releases all resources associated
- * with the message. Note that it is possible to access a destroyed object from
- * PHP in rare cases.
- */
-static void Message_dtor(zend_object* obj) {
-  Message* intern = (Message*)obj;
-  ObjCache_Delete(intern->msg);
-  zval_dtor(&intern->arena);
-  zend_object_std_dtor(&intern->std);
-}
-
-/**
- * get_field()
- *
- * Helper function to look up a field given a member name (as a string).
- */
-static const upb_FieldDef *get_field(Message *msg, PROTO_STR *member) {
-  const upb_MessageDef *m = msg->desc->msgdef;
-  const upb_FieldDef *f =
-      upb_MessageDef_FindFieldByNameWithSize(m, PROTO_STRVAL_P(member), PROTO_STRLEN_P(member));
-
-  if (!f) {
-    zend_throw_exception_ex(NULL, 0, "No such property %s.",
-                            ZSTR_VAL(msg->desc->class_entry->name));
-  }
-
-  return f;
-}
-
-// Check if the field is a well known wrapper type
-static bool IsWrapper(const upb_MessageDef* m) {
-  if (!m) return false;
-  switch (upb_MessageDef_WellKnownType(m)) {
-    case kUpb_WellKnown_DoubleValue:
-    case kUpb_WellKnown_FloatValue:
-    case kUpb_WellKnown_Int64Value:
-    case kUpb_WellKnown_UInt64Value:
-    case kUpb_WellKnown_Int32Value:
-    case kUpb_WellKnown_UInt32Value:
-    case kUpb_WellKnown_StringValue:
-    case kUpb_WellKnown_BytesValue:
-    case kUpb_WellKnown_BoolValue:
-      return true;
-    default:
-      return false;
-  }
-}
-
-static void Message_get(Message *intern, const upb_FieldDef *f, zval *rv) {
-  upb_Arena *arena = Arena_Get(&intern->arena);
-
-  if (upb_FieldDef_IsMap(f)) {
-    upb_MutableMessageValue msgval = upb_Message_Mutable(intern->msg, f, arena);
-    MapField_GetPhpWrapper(rv, msgval.map, MapType_Get(f), &intern->arena);
-  } else if (upb_FieldDef_IsRepeated(f)) {
-    upb_MutableMessageValue msgval = upb_Message_Mutable(intern->msg, f, arena);
-    RepeatedField_GetPhpWrapper(rv, msgval.array, TypeInfo_Get(f),
-                                &intern->arena);
-  } else {
-    if (upb_FieldDef_IsSubMessage(f) && !upb_Message_Has(intern->msg, f)) {
-      ZVAL_NULL(rv);
-      return;
-    }
-    upb_MessageValue msgval = upb_Message_Get(intern->msg, f);
-    Convert_UpbToPhp(msgval, rv, TypeInfo_Get(f), &intern->arena);
-  }
-}
-
-static bool Message_set(Message *intern, const upb_FieldDef *f, zval *val) {
-  upb_Arena *arena = Arena_Get(&intern->arena);
-  upb_MessageValue msgval;
-
-  if (upb_FieldDef_IsMap(f)) {
-    msgval.map_val = MapField_GetUpbMap(val, MapType_Get(f), arena);
-    if (!msgval.map_val) return false;
-  } else if (upb_FieldDef_IsRepeated(f)) {
-    msgval.array_val = RepeatedField_GetUpbArray(val, TypeInfo_Get(f), arena);
-    if (!msgval.array_val) return false;
-  } else if (upb_FieldDef_IsSubMessage(f) && Z_TYPE_P(val) == IS_NULL) {
-    upb_Message_ClearField(intern->msg, f);
-    return true;
-  } else {
-    if (!Convert_PhpToUpb(val, &msgval, TypeInfo_Get(f), arena)) return false;
-  }
-
-  upb_Message_Set(intern->msg, f, msgval, arena);
-  return true;
-}
-
-static bool MessageEq(const upb_Message *m1, const upb_Message *m2, const upb_MessageDef *m);
-
-/**
- * ValueEq()
- */
-bool ValueEq(upb_MessageValue val1, upb_MessageValue val2, TypeInfo type) {
-  switch (type.type) {
-    case kUpb_CType_Bool:
-      return val1.bool_val == val2.bool_val;
-    case kUpb_CType_Int32:
-    case kUpb_CType_UInt32:
-    case kUpb_CType_Enum:
-      return val1.int32_val == val2.int32_val;
-    case kUpb_CType_Int64:
-    case kUpb_CType_UInt64:
-      return val1.int64_val == val2.int64_val;
-    case kUpb_CType_Float:
-      return val1.float_val == val2.float_val;
-    case kUpb_CType_Double:
-      return val1.double_val == val2.double_val;
-    case kUpb_CType_String:
-    case kUpb_CType_Bytes:
-      return val1.str_val.size == val2.str_val.size &&
-          memcmp(val1.str_val.data, val2.str_val.data, val1.str_val.size) == 0;
-    case kUpb_CType_Message:
-      return MessageEq(val1.msg_val, val2.msg_val, type.desc->msgdef);
-    default:
-      return false;
-  }
-}
-
-/**
- * MessageEq()
- */
-static bool MessageEq(const upb_Message *m1, const upb_Message *m2, const upb_MessageDef *m) {
-  int n = upb_MessageDef_FieldCount(m);
-
-  for(int i = 0; i < n; i++) {
-    const upb_FieldDef *f = upb_MessageDef_Field(m, i);
-
-    if (upb_FieldDef_HasPresence(f)) {
-      if (upb_Message_Has(m1, f) != upb_Message_Has(m2, f)) {
-        return false;
-      }
-      if (!upb_Message_Has(m1, f)) continue;
-    }
-
-    upb_MessageValue val1 = upb_Message_Get(m1, f);
-    upb_MessageValue val2 = upb_Message_Get(m2, f);
-
-    if (upb_FieldDef_IsMap(f)) {
-      if (!MapEq(val1.map_val, val2.map_val, MapType_Get(f))) return false;
-    } else if (upb_FieldDef_IsRepeated(f)) {
-      if (!ArrayEq(val1.array_val, val2.array_val, TypeInfo_Get(f))) return false;
-    } else {
-      if (!ValueEq(val1, val2, TypeInfo_Get(f))) return false;
-    }
-  }
-
-  return true;
-}
-
-/**
- * Message_compare_objects()
- *
- * Object handler for comparing two message objects. Called whenever PHP code
- * does:
- *
- *   $m1 == $m2
- */
-static int Message_compare_objects(zval *m1, zval *m2) {
-  Message* intern1 = (Message*)Z_OBJ_P(m1);
-  Message* intern2 = (Message*)Z_OBJ_P(m2);
-  const upb_MessageDef *m = intern1->desc->msgdef;
-
-  if (intern2->desc->msgdef != m) return 1;
-
-  return MessageEq(intern1->msg, intern2->msg, m) ? 0 : 1;
-}
-
-/**
- * Message_has_property()
- *
- * Object handler for testing whether a property exists. Called when PHP code
- * does any of:
- *
- *   isset($message->foobar);
- *   property_exists($message->foobar);
- *
- * Note that all properties of generated messages are private, so this should
- * only be possible to invoke from generated code, which has accessors like this
- * (if the field has presence):
- *
- *   public function hasOptionalInt32()
- *   {
- *       return isset($this->optional_int32);
- *   }
- */
-static int Message_has_property(PROTO_VAL *obj, PROTO_STR *member,
-                                int has_set_exists,
-                                void **cache_slot) {
-  Message* intern = PROTO_VAL_P(obj);
-  const upb_FieldDef *f = get_field(intern, member);
-
-  if (!f) return 0;
-
-  if (!upb_FieldDef_HasPresence(f)) {
-    zend_throw_exception_ex(
-        NULL, 0,
-        "Cannot call isset() on field %s which does not have presence.",
-        upb_FieldDef_Name(f));
-    return 0;
-  }
-
-  return upb_Message_Has(intern->msg, f);
-}
-
-/**
- * Message_unset_property()
- *
- * Object handler for unsetting a property. Called when PHP code calls:
- *
- *   unset($message->foobar);
- *
- * Note that all properties of generated messages are private, so this should
- * only be possible to invoke from generated code, which has accessors like this
- * (if the field has presence):
- *
- *   public function clearOptionalInt32()
- *   {
- *       unset($this->optional_int32);
- *   }
- */
-static void Message_unset_property(PROTO_VAL *obj, PROTO_STR *member,
-                                   void **cache_slot) {
-  Message* intern = PROTO_VAL_P(obj);
-  const upb_FieldDef *f = get_field(intern, member);
-
-  if (!f) return;
-
-  if (!upb_FieldDef_HasPresence(f)) {
-    zend_throw_exception_ex(
-        NULL, 0,
-        "Cannot call unset() on field %s which does not have presence.",
-        upb_FieldDef_Name(f));
-    return;
-  }
-
-  upb_Message_ClearField(intern->msg, f);
-}
-
-
-/**
- * Message_read_property()
- *
- * Object handler for reading a property in PHP. Called when PHP code does:
- *
- *   $x = $message->foobar;
- *
- * Note that all properties of generated messages are private, so this should
- * only be possible to invoke from generated code, which has accessors like:
- *
- *   public function getOptionalInt32()
- *   {
- *       return $this->optional_int32;
- *   }
- *
- * We lookup the field and return the scalar, RepeatedField, or MapField for
- * this field.
- */
-static zval *Message_read_property(PROTO_VAL *obj, PROTO_STR *member,
-                                   int type, void **cache_slot, zval *rv) {
-  Message* intern = PROTO_VAL_P(obj);
-  const upb_FieldDef *f = get_field(intern, member);
-
-  if (!f) return &EG(uninitialized_zval);
-  Message_get(intern, f, rv);
-  return rv;
-}
-
-/**
- * Message_write_property()
- *
- * Object handler for writing a property in PHP. Called when PHP code does:
- *
- *   $message->foobar = $x;
- *
- * Note that all properties of generated messages are private, so this should
- * only be possible to invoke from generated code, which has accessors like:
- *
- *   public function setOptionalInt32($var)
- *   {
- *       GPBUtil::checkInt32($var);
- *       $this->optional_int32 = $var;
- *
- *       return $this;
- *   }
- *
- * The C extension version of checkInt32() doesn't actually check anything, so
- * we perform all checking and conversion in this function.
- */
-static PROTO_RETURN_VAL Message_write_property(
-    PROTO_VAL *obj, PROTO_STR *member, zval *val, void **cache_slot) {
-  Message* intern = PROTO_VAL_P(obj);
-  const upb_FieldDef *f = get_field(intern, member);
-
-  if (f && Message_set(intern, f, val)) {
-#if PHP_VERSION_ID < 70400
-    return;
-#else
-    return val;
-#endif
-  } else {
-#if PHP_VERSION_ID < 70400
-    return;
-#else
-    return &EG(error_zval);
-#endif
-  }
-}
-
-/**
- * Message_get_property_ptr_ptr()
- *
- * Object handler for the get_property_ptr_ptr event in PHP. This returns a
- * reference to our internal properties. We don't support this, so we return
- * NULL.
- */
-static zval *Message_get_property_ptr_ptr(PROTO_VAL *object, PROTO_STR *member,
-                                          int type,
-                                          void **cache_slot) {
-  return NULL;  // We do not have a properties table.
-}
-
-/**
- * Message_clone_obj()
- *
- * Object handler for cloning an object in PHP. Called when PHP code does:
- *
- *   $msg2 = clone $msg;
- */
-static zend_object *Message_clone_obj(PROTO_VAL *object) {
-  Message* intern = PROTO_VAL_P(object);
-  upb_Message *clone = upb_Message_New(intern->desc->msgdef, Arena_Get(&intern->arena));
-
-  // TODO: copy unknown fields?
-  // TODO: use official upb msg copy function
-  memcpy(clone, intern->msg, upb_MessageDef_MiniTable(intern->desc->msgdef)->size);
-  zval ret;
-  Message_GetPhpWrapper(&ret, intern->desc, clone, &intern->arena);
-  return Z_OBJ_P(&ret);
-}
-
-/**
- * Message_get_properties()
- *
- * Object handler for the get_properties event in PHP. This returns a HashTable
- * of our internal properties. We don't support this, so we return NULL.
- */
-static HashTable *Message_get_properties(PROTO_VAL *object) {
-  return NULL;  // We don't offer direct references to our properties.
-}
-
-// C Functions from message.h. /////////////////////////////////////////////////
-
-// These are documented in the header file.
-
-void Message_GetPhpWrapper(zval *val, const Descriptor *desc, upb_Message *msg,
-                           zval *arena) {
-  if (!msg) {
-    ZVAL_NULL(val);
-    return;
-  }
-
-  if (!ObjCache_Get(msg, val)) {
-    Message *intern = emalloc(sizeof(Message));
-    Message_SuppressDefaultProperties(desc->class_entry);
-    zend_object_std_init(&intern->std, desc->class_entry);
-    intern->std.handlers = &message_object_handlers;
-    ZVAL_COPY(&intern->arena, arena);
-    intern->desc = desc;
-    intern->msg = msg;
-    ZVAL_OBJ(val, &intern->std);
-    ObjCache_Add(intern->msg, &intern->std);
-  }
-}
-
-bool Message_GetUpbMessage(zval *val, const Descriptor *desc, upb_Arena *arena,
-                           upb_Message **msg) {
-  PBPHP_ASSERT(desc);
-
-  if (Z_ISREF_P(val)) {
-    ZVAL_DEREF(val);
-  }
-
-  if (Z_TYPE_P(val) == IS_OBJECT &&
-      instanceof_function(Z_OBJCE_P(val), desc->class_entry)) {
-    Message *intern = (Message*)Z_OBJ_P(val);
-    upb_Arena_Fuse(arena, Arena_Get(&intern->arena));
-    *msg = intern->msg;
-    return true;
-  } else {
-    zend_throw_exception_ex(zend_ce_type_error, 0,
-                            "Given value is not an instance of %s.",
-                            ZSTR_VAL(desc->class_entry->name));
-    return false;
-  }
-}
-
-// Message PHP methods /////////////////////////////////////////////////////////
-
-/**
- * Message_InitFromPhp()
- *
- * Helper method to handle the initialization of a message from a PHP value, eg.
- *
- *   $m = new TestMessage([
- *       'optional_int32' => -42,
- *       'optional_bool' => true,
- *       'optional_string' => 'a',
- *       'optional_enum' => TestEnum::ONE,
- *       'optional_message' => new Sub([
- *           'a' => 33
- *       ]),
- *       'repeated_int32' => [-42, -52],
- *       'repeated_enum' => [TestEnum::ZERO, TestEnum::ONE],
- *       'repeated_message' => [new Sub(['a' => 34]),
- *                              new Sub(['a' => 35])],
- *       'map_int32_int32' => [-62 => -62],
- *       'map_int32_enum' => [1 => TestEnum::ONE],
- *       'map_int32_message' => [1 => new Sub(['a' => 36])],
- *   ]);
- *
- * The initializer must be an array.
- */
-bool Message_InitFromPhp(upb_Message *msg, const upb_MessageDef *m, zval *init,
-                         upb_Arena *arena) {
-  HashTable* table = HASH_OF(init);
-  HashPosition pos;
-
-  if (Z_ISREF_P(init)) {
-    ZVAL_DEREF(init);
-  }
-
-  if (Z_TYPE_P(init) != IS_ARRAY) {
-    zend_throw_exception_ex(NULL, 0,
-                            "Initializer for a message %s must be an array.",
-                            upb_MessageDef_FullName(m));
-    return false;
-  }
-
-  zend_hash_internal_pointer_reset_ex(table, &pos);
-
-  while (true) {  // Iterate over key/value pairs.
-    zval key;
-    zval *val;
-    const upb_FieldDef *f;
-    upb_MessageValue msgval;
-
-    zend_hash_get_current_key_zval_ex(table, &key, &pos);
-    val = zend_hash_get_current_data_ex(table, &pos);
-
-    if (!val) return true;  // Finished iteration.
-
-    if (Z_ISREF_P(val)) {
-      ZVAL_DEREF(val);
-    }
-
-    f = upb_MessageDef_FindFieldByNameWithSize(m, Z_STRVAL_P(&key), Z_STRLEN_P(&key));
-
-    if (!f) {
-      zend_throw_exception_ex(NULL, 0,
-                              "No such field %s", Z_STRVAL_P(&key));
-      return false;
-    }
-
-    if (upb_FieldDef_IsMap(f)) {
-      msgval.map_val = MapField_GetUpbMap(val, MapType_Get(f), arena);
-      if (!msgval.map_val) return false;
-    } else if (upb_FieldDef_IsRepeated(f)) {
-      msgval.array_val = RepeatedField_GetUpbArray(val, TypeInfo_Get(f), arena);
-      if (!msgval.array_val) return false;
-    } else {
-      if (!Convert_PhpToUpbAutoWrap(val, &msgval, TypeInfo_Get(f), arena)) {
-        return false;
-      }
-    }
-
-    upb_Message_Set(msg, f, msgval, arena);
-    zend_hash_move_forward_ex(table, &pos);
-    zval_dtor(&key);
-  }
-}
-
-static void Message_Initialize(Message *intern, const Descriptor *desc) {
-  intern->desc = desc;
-  intern->msg = upb_Message_New(desc->msgdef, Arena_Get(&intern->arena));
-  ObjCache_Add(intern->msg, &intern->std);
-}
-
-/**
- * Message::__construct()
- *
- * Constructor for Message.
- * @param array Map of initial values ['k' = val]
- */
-PHP_METHOD(Message, __construct) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const Descriptor* desc;
-  zend_class_entry *ce = Z_OBJCE_P(getThis());
-  upb_Arena *arena = Arena_Get(&intern->arena);
-  zval *init_arr = NULL;
-
-  // This descriptor should always be available, as the generated __construct
-  // method calls initOnce() to load the descriptor prior to calling us.
-  //
-  // However, if the user created their own class derived from Message, this
-  // will trigger an infinite construction loop and blow the stack.  We
-  // temporarily clear create_object to break this loop (see check in
-  // NameMap_GetMessage()).
-  NameMap_EnterConstructor(ce);
-  desc = Descriptor_GetFromClassEntry(ce);
-  NameMap_ExitConstructor(ce);
-
-  if (!desc) {
-    zend_throw_exception_ex(
-        NULL, 0,
-        "Couldn't find descriptor. Note only generated code may derive from "
-        "\\Google\\Protobuf\\Internal\\Message");
-    return;
-  }
-
-  Message_Initialize(intern, desc);
-
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "|a!", &init_arr) == FAILURE) {
-    return;
-  }
-
-  if (init_arr) {
-    Message_InitFromPhp(intern->msg, desc->msgdef, init_arr, arena);
-  }
-}
-
-/**
- * Message::discardUnknownFields()
- *
- * Discards any unknown fields for this message or any submessages.
- */
-PHP_METHOD(Message, discardUnknownFields) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  upb_Message_DiscardUnknown(intern->msg, intern->desc->msgdef, 64);
-}
-
-/**
- * Message::clear()
- *
- * Clears all fields of this message.
- */
-PHP_METHOD(Message, clear) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  upb_Message_Clear(intern->msg, intern->desc->msgdef);
-}
-
-/**
- * Message::mergeFrom()
- *
- * Merges from the given message, which must be of the same class as us.
- * @param object Message to merge from.
- */
-PHP_METHOD(Message, mergeFrom) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  Message* from;
-  upb_Arena *arena = Arena_Get(&intern->arena);
-  const upb_MiniTable *l = upb_MessageDef_MiniTable(intern->desc->msgdef);
-  zval* value;
-  char *pb;
-  size_t size;
-  bool ok;
-
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "O", &value,
-                            intern->desc->class_entry) == FAILURE) {
-    return;
-  }
-
-  from = (Message*)Z_OBJ_P(value);
-
-  // Should be guaranteed since we passed the class type to
-  // zend_parse_parameters().
-  PBPHP_ASSERT(from->desc == intern->desc);
-
-  // TODO(haberman): use a temp arena for this once we can make upb_decode()
-  // copy strings.
-  pb = upb_Encode(from->msg, l, 0, arena, &size);
-
-  if (!pb) {
-    zend_throw_exception_ex(NULL, 0, "Max nesting exceeded");
-    return;
-  }
-
-  ok = upb_Decode(pb, size, intern->msg, l, NULL, 0, arena) ==
-       kUpb_DecodeStatus_Ok;
-  PBPHP_ASSERT(ok);
-}
-
-/**
- * Message::mergeFromString()
- *
- * Merges from the given string.
- * @param string Binary protobuf data to merge.
- */
-PHP_METHOD(Message, mergeFromString) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  char *data = NULL;
-  char *data_copy = NULL;
-  zend_long data_len;
-  const upb_MiniTable *l = upb_MessageDef_MiniTable(intern->desc->msgdef);
-  upb_Arena *arena = Arena_Get(&intern->arena);
-
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &data, &data_len) ==
-      FAILURE) {
-    return;
-  }
-
-  // TODO(haberman): avoid this copy when we can make the decoder copy.
-  data_copy = upb_Arena_Malloc(arena, data_len);
-  memcpy(data_copy, data, data_len);
-
-  if (upb_Decode(data_copy, data_len, intern->msg, l, NULL, 0, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    zend_throw_exception_ex(NULL, 0, "Error occurred during parsing");
-    return;
-  }
-}
-
-/**
- * Message::serializeToString()
- *
- * Serializes this message instance to protobuf data.
- * @return string Serialized protobuf data.
- */
-PHP_METHOD(Message, serializeToString) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_MiniTable *l = upb_MessageDef_MiniTable(intern->desc->msgdef);
-  upb_Arena *tmp_arena = upb_Arena_New();
-  char *data;
-  size_t size;
-
-  data = upb_Encode(intern->msg, l, 0, tmp_arena, &size);
-
-  if (!data) {
-    zend_throw_exception_ex(NULL, 0, "Error occurred during serialization");
-    upb_Arena_Free(tmp_arena);
-    return;
-  }
-
-  RETVAL_STRINGL(data, size);
-  upb_Arena_Free(tmp_arena);
-}
-
-/**
- * Message::mergeFromJsonString()
- *
- * Merges the JSON data parsed from the given string.
- * @param string Serialized JSON data.
- */
-PHP_METHOD(Message, mergeFromJsonString) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  char *data = NULL;
-  char *data_copy = NULL;
-  zend_long data_len;
-  upb_Arena *arena = Arena_Get(&intern->arena);
-  upb_Status status;
-  zend_bool ignore_json_unknown = false;
-  int options = 0;
-
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "s|b", &data, &data_len,
-                            &ignore_json_unknown) == FAILURE) {
-    return;
-  }
-
-  // TODO(haberman): avoid this copy when we can make the decoder copy.
-  data_copy = upb_Arena_Malloc(arena, data_len + 1);
-  memcpy(data_copy, data, data_len);
-  data_copy[data_len] = '\0';
-
-  if (ignore_json_unknown) {
-    options |= upb_JsonDecode_IgnoreUnknown;
-  }
-
-  upb_Status_Clear(&status);
-  if (!upb_JsonDecode(data_copy, data_len, intern->msg, intern->desc->msgdef,
-                       DescriptorPool_GetSymbolTable(), options, arena,
-                       &status)) {
-    zend_throw_exception_ex(NULL, 0, "Error occurred during parsing: %s",
-                            upb_Status_ErrorMessage(&status));
-    return;
-  }
-}
-
-/**
- * Message::serializeToJsonString()
- *
- * Serializes this object to JSON.
- * @return string Serialized JSON data.
- */
-PHP_METHOD(Message, serializeToJsonString) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  size_t size;
-  int options = 0;
-  char buf[1024];
-  zend_bool preserve_proto_fieldnames = false;
-  upb_Status status;
-
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "|b",
-                            &preserve_proto_fieldnames) == FAILURE) {
-    return;
-  }
-
-  if (preserve_proto_fieldnames) {
-    options |= upb_JsonEncode_UseProtoNames;
-  }
-
-  upb_Status_Clear(&status);
-  size = upb_JsonEncode(intern->msg, intern->desc->msgdef,
-                         DescriptorPool_GetSymbolTable(), options, buf,
-                         sizeof(buf), &status);
-
-  if (!upb_Status_IsOk(&status)) {
-    zend_throw_exception_ex(NULL, 0,
-                            "Error occurred during JSON serialization: %s",
-                            upb_Status_ErrorMessage(&status));
-    return;
-  }
-
-  if (size >= sizeof(buf)) {
-    char *buf2 = malloc(size + 1);
-    upb_JsonEncode(intern->msg, intern->desc->msgdef,
-                    DescriptorPool_GetSymbolTable(), options, buf2, size + 1,
-                    &status);
-    RETVAL_STRINGL(buf2, size);
-    free(buf2);
-  } else {
-    RETVAL_STRINGL(buf, size);
-  }
-}
-
-/**
- * Message::readWrapperValue()
- *
- * Returns an unboxed value for the given field. This is called from generated
- * methods for wrapper fields, eg.
- *
- *   public function getDoubleValueUnwrapped()
- *   {
- *       return $this->readWrapperValue("double_value");
- *   }
- *
- * @return Unwrapped field value or null.
- */
-PHP_METHOD(Message, readWrapperValue) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  char* member;
-  const upb_FieldDef *f;
-  zend_long size;
-
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &member, &size) == FAILURE) {
-    return;
-  }
-
-  f = upb_MessageDef_FindFieldByNameWithSize(intern->desc->msgdef, member, size);
-
-  if (!f || !IsWrapper(upb_FieldDef_MessageSubDef(f))) {
-    zend_throw_exception_ex(NULL, 0, "Message %s has no field %s",
-                            upb_MessageDef_FullName(intern->desc->msgdef), member);
-    return;
-  }
-
-  if (upb_Message_Has(intern->msg, f)) {
-    const upb_Message *wrapper = upb_Message_Get(intern->msg, f).msg_val;
-    const upb_MessageDef *m = upb_FieldDef_MessageSubDef(f);
-    const upb_FieldDef *val_f = upb_MessageDef_FindFieldByNumber(m, 1);
-    upb_MessageValue msgval = upb_Message_Get(wrapper, val_f);
-    zval ret;
-    Convert_UpbToPhp(msgval, &ret, TypeInfo_Get(val_f), &intern->arena);
-    RETURN_COPY_VALUE(&ret);
-  } else {
-    RETURN_NULL();
-  }
-}
-
-/**
- * Message::writeWrapperValue()
- *
- * Sets the given wrapper field to the given unboxed value. This is called from
- * generated methods for wrapper fields, eg.
- *
- *
- *   public function setDoubleValueUnwrapped($var)
- *   {
- *       $this->writeWrapperValue("double_value", $var);
- *       return $this;
- *   }
- *
- * @param Unwrapped field value or null.
- */
-PHP_METHOD(Message, writeWrapperValue) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  upb_Arena *arena = Arena_Get(&intern->arena);
-  char* member;
-  const upb_FieldDef *f;
-  upb_MessageValue msgval;
-  zend_long size;
-  zval* val;
-
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "sz", &member, &size, &val) ==
-      FAILURE) {
-    return;
-  }
-
-  f = upb_MessageDef_FindFieldByNameWithSize(intern->desc->msgdef, member, size);
-
-  if (!f || !IsWrapper(upb_FieldDef_MessageSubDef(f))) {
-    zend_throw_exception_ex(NULL, 0, "Message %s has no field %s",
-                            upb_MessageDef_FullName(intern->desc->msgdef), member);
-    return;
-  }
-
-  if (Z_ISREF_P(val)) {
-    ZVAL_DEREF(val);
-  }
-
-  if (Z_TYPE_P(val) == IS_NULL) {
-    upb_Message_ClearField(intern->msg, f);
-  } else {
-    const upb_MessageDef *m = upb_FieldDef_MessageSubDef(f);
-    const upb_FieldDef *val_f = upb_MessageDef_FindFieldByNumber(m, 1);
-    upb_Message *wrapper;
-
-    if (!Convert_PhpToUpb(val, &msgval, TypeInfo_Get(val_f), arena)) {
-      return;  // Error is already set.
-    }
-
-    wrapper = upb_Message_Mutable(intern->msg, f, arena).msg;
-    upb_Message_Set(wrapper, val_f, msgval, arena);
-  }
-}
-
-/**
- * Message::whichOneof()
- *
- * Given a oneof name, returns the name of the field that is set for this oneof,
- * or otherwise the empty string.
- *
- * @return string The field name in this oneof that is currently set.
- */
-PHP_METHOD(Message, whichOneof) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_OneofDef* oneof;
-  const upb_FieldDef* field;
-  char* name;
-  zend_long len;
-
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &name, &len) == FAILURE) {
-    return;
-  }
-
-  oneof = upb_MessageDef_FindOneofByNameWithSize(intern->desc->msgdef, name, len);
-
-  if (!oneof) {
-    zend_throw_exception_ex(NULL, 0, "Message %s has no oneof %s",
-                            upb_MessageDef_FullName(intern->desc->msgdef), name);
-    return;
-  }
-
-  field = upb_Message_WhichOneof(intern->msg, oneof);
-  RETURN_STRING(field ? upb_FieldDef_Name(field) : "");
-}
-
-/**
- * Message::hasOneof()
- *
- * Returns the presence of the given oneof field, given a field number. Called
- * from generated code methods such as:
- *
- *    public function hasDoubleValueOneof()
- *    {
- *        return $this->hasOneof(10);
- *    }
- *
- * @return boolean
- */
-PHP_METHOD(Message, hasOneof) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  zend_long field_num;
-  const upb_FieldDef* f;
-
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "l", &field_num) == FAILURE) {
-    return;
-  }
-
-  f = upb_MessageDef_FindFieldByNumber(intern->desc->msgdef, field_num);
-
-  if (!f || !upb_FieldDef_RealContainingOneof(f)) {
-    php_error_docref(NULL, E_USER_ERROR,
-                     "Internal error, no such oneof field %d\n",
-                     (int)field_num);
-  }
-
-  RETVAL_BOOL(upb_Message_Has(intern->msg, f));
-}
-
-/**
- * Message::readOneof()
- *
- * Returns the contents of the given oneof field, given a field number. Called
- * from generated code methods such as:
- *
- *    public function getDoubleValueOneof()
- *    {
- *        return $this->readOneof(10);
- *    }
- *
- * @return object The oneof's field value.
- */
-PHP_METHOD(Message, readOneof) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  zend_long field_num;
-  const upb_FieldDef* f;
-  zval ret;
-
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "l", &field_num) == FAILURE) {
-    return;
-  }
-
-  f = upb_MessageDef_FindFieldByNumber(intern->desc->msgdef, field_num);
-
-  if (!f || !upb_FieldDef_RealContainingOneof(f)) {
-    php_error_docref(NULL, E_USER_ERROR,
-                     "Internal error, no such oneof field %d\n",
-                     (int)field_num);
-  }
-
-  if (upb_FieldDef_IsSubMessage(f) && !upb_Message_Has(intern->msg, f)) {
-    RETURN_NULL();
-  }
-
-  {
-    upb_MessageValue msgval = upb_Message_Get(intern->msg, f);
-    Convert_UpbToPhp(msgval, &ret, TypeInfo_Get(f), &intern->arena);
-  }
-
-  RETURN_COPY_VALUE(&ret);
-}
-
-/**
- * Message::writeOneof()
- *
- * Sets the contents of the given oneof field, given a field number. Called
- * from generated code methods such as:
- *
- *    public function setDoubleValueOneof($var)
- *   {
- *       GPBUtil::checkMessage($var, \Google\Protobuf\DoubleValue::class);
- *       $this->writeOneof(10, $var);
- *
- *       return $this;
- *   }
- *
- * The C extension version of GPBUtil::check*() does nothing, so we perform
- * all type checking and conversion here.
- *
- * @param integer The field number we are setting.
- * @param object The field value we want to set.
- */
-PHP_METHOD(Message, writeOneof) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  zend_long field_num;
-  const upb_FieldDef* f;
-  upb_Arena *arena = Arena_Get(&intern->arena);
-  upb_MessageValue msgval;
-  zval* val;
-
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "lz", &field_num, &val) ==
-      FAILURE) {
-    return;
-  }
-
-  f = upb_MessageDef_FindFieldByNumber(intern->desc->msgdef, field_num);
-
-  if (upb_FieldDef_IsSubMessage(f) && Z_TYPE_P(val) == IS_NULL) {
-    upb_Message_ClearField(intern->msg, f);
-    return;
-  } else if (!Convert_PhpToUpb(val, &msgval, TypeInfo_Get(f), arena)) {
-    return;
-  }
-
-  upb_Message_Set(intern->msg, f, msgval, arena);
-}
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_construct, 0, 0, 0)
-  ZEND_ARG_INFO(0, data)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_mergeFrom, 0, 0, 1)
-  ZEND_ARG_INFO(0, data)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_mergeFromWithArg, 0, 0, 1)
-  ZEND_ARG_INFO(0, data)
-  ZEND_ARG_INFO(0, arg)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_read, 0, 0, 1)
-  ZEND_ARG_INFO(0, field)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_write, 0, 0, 2)
-  ZEND_ARG_INFO(0, field)
-  ZEND_ARG_INFO(0, value)
-ZEND_END_ARG_INFO()
-
-static zend_function_entry Message_methods[] = {
-  PHP_ME(Message, clear,                 arginfo_void,      ZEND_ACC_PUBLIC)
-  PHP_ME(Message, discardUnknownFields,  arginfo_void,      ZEND_ACC_PUBLIC)
-  PHP_ME(Message, serializeToString,     arginfo_void,      ZEND_ACC_PUBLIC)
-  PHP_ME(Message, mergeFromString,       arginfo_mergeFrom, ZEND_ACC_PUBLIC)
-  PHP_ME(Message, serializeToJsonString, arginfo_void,      ZEND_ACC_PUBLIC)
-  PHP_ME(Message, mergeFromJsonString,   arginfo_mergeFromWithArg, ZEND_ACC_PUBLIC)
-  PHP_ME(Message, mergeFrom,             arginfo_mergeFrom, ZEND_ACC_PUBLIC)
-  PHP_ME(Message, readWrapperValue,      arginfo_read,      ZEND_ACC_PROTECTED)
-  PHP_ME(Message, writeWrapperValue,     arginfo_write,     ZEND_ACC_PROTECTED)
-  PHP_ME(Message, hasOneof,              arginfo_read,      ZEND_ACC_PROTECTED)
-  PHP_ME(Message, readOneof,             arginfo_read,      ZEND_ACC_PROTECTED)
-  PHP_ME(Message, writeOneof,            arginfo_write,     ZEND_ACC_PROTECTED)
-  PHP_ME(Message, whichOneof,            arginfo_read,      ZEND_ACC_PROTECTED)
-  PHP_ME(Message, __construct,           arginfo_construct, ZEND_ACC_PROTECTED)
-  ZEND_FE_END
-};
-
-// Well-known types ////////////////////////////////////////////////////////////
-
-static const char TYPE_URL_PREFIX[] = "type.googleapis.com/";
-
-static upb_MessageValue Message_getval(Message *intern, const char *field_name) {
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(intern->desc->msgdef, field_name);
-  PBPHP_ASSERT(f);
-  return upb_Message_Get(intern->msg, f);
-}
-
-static void Message_setval(Message *intern, const char *field_name,
-                           upb_MessageValue val) {
-  const upb_FieldDef *f =
-      upb_MessageDef_FindFieldByName(intern->desc->msgdef, field_name);
-  PBPHP_ASSERT(f);
-  upb_Message_Set(intern->msg, f, val, Arena_Get(&intern->arena));
-}
-
-static upb_MessageValue StringVal(upb_StringView view) {
-  upb_MessageValue ret;
-  ret.str_val = view;
-  return ret;
-}
-
-static bool TryStripUrlPrefix(upb_StringView *str) {
-  size_t size = strlen(TYPE_URL_PREFIX);
-  if (str->size < size || memcmp(TYPE_URL_PREFIX, str->data, size) != 0) {
-    return false;
-  }
-  str->data += size;
-  str->size -= size;
-  return true;
-}
-
-static bool StrViewEq(upb_StringView view, const char *str) {
-  size_t size = strlen(str);
-  return view.size == size && memcmp(view.data, str, size) == 0;
-}
-
-PHP_METHOD(google_protobuf_Any, unpack) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  upb_StringView type_url = Message_getval(intern, "type_url").str_val;
-  upb_StringView value = Message_getval(intern, "value").str_val;
-  upb_DefPool *symtab = DescriptorPool_GetSymbolTable();
-  const upb_MessageDef *m;
-  Descriptor *desc;
-  zval ret;
-
-  // Ensure that type_url has TYPE_URL_PREFIX as a prefix.
-  if (!TryStripUrlPrefix(&type_url)) {
-    zend_throw_exception(
-        NULL, "Type url needs to be type.googleapis.com/fully-qualified",
-        0);
-    return;
-  }
-
-  m = upb_DefPool_FindMessageByNameWithSize(symtab, type_url.data, type_url.size);
-
-  if (m == NULL) {
-    zend_throw_exception(
-        NULL, "Specified message in any hasn't been added to descriptor pool",
-        0);
-    return;
-  }
-
-  desc = Descriptor_GetFromMessageDef(m);
-  PBPHP_ASSERT(desc->class_entry->create_object == Message_create);
-  zend_object *obj = Message_create(desc->class_entry);
-  Message *msg = (Message*)obj;
-  Message_Initialize(msg, desc);
-  ZVAL_OBJ(&ret, obj);
-
-  // Get value.
-  if (upb_Decode(value.data, value.size, msg->msg,
-                 upb_MessageDef_MiniTable(desc->msgdef), NULL, 0,
-                 Arena_Get(&msg->arena)) != kUpb_DecodeStatus_Ok) {
-    zend_throw_exception_ex(NULL, 0, "Error occurred during parsing");
-    zval_dtor(&ret);
-    return;
-  }
-
-  // Fuse since the parsed message could alias "value".
-  upb_Arena_Fuse(Arena_Get(&intern->arena), Arena_Get(&msg->arena));
-
-  RETURN_COPY_VALUE(&ret);
-}
-
-PHP_METHOD(google_protobuf_Any, pack) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  upb_Arena *arena = Arena_Get(&intern->arena);
-  zval *val;
-  Message *msg;
-  upb_StringView value;
-  upb_StringView type_url;
-  const char *full_name;
-  char *buf;
-
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "o", &val) ==
-      FAILURE) {
-    return;
-  }
-
-  if (!instanceof_function(Z_OBJCE_P(val), message_ce)) {
-    zend_error(E_USER_ERROR, "Given value is not an instance of Message.");
-    return;
-  }
-
-  msg = (Message*)Z_OBJ_P(val);
-
-  // Serialize and set value.
-  value.data = upb_Encode(msg->msg, upb_MessageDef_MiniTable(msg->desc->msgdef),
-                          0, arena, &value.size);
-  Message_setval(intern, "value", StringVal(value));
-
-  // Set type url: type_url_prefix + fully_qualified_name
-  full_name = upb_MessageDef_FullName(msg->desc->msgdef);
-  type_url.size = strlen(TYPE_URL_PREFIX) + strlen(full_name);
-  buf = upb_Arena_Malloc(arena, type_url.size + 1);
-  memcpy(buf, TYPE_URL_PREFIX, strlen(TYPE_URL_PREFIX));
-  memcpy(buf + strlen(TYPE_URL_PREFIX), full_name, strlen(full_name));
-  type_url.data = buf;
-  Message_setval(intern, "type_url", StringVal(type_url));
-}
-
-PHP_METHOD(google_protobuf_Any, is) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  upb_StringView type_url = Message_getval(intern, "type_url").str_val;
-  zend_class_entry *klass = NULL;
-  const upb_MessageDef *m;
-
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "C", &klass) ==
-      FAILURE) {
-    return;
-  }
-
-  m = NameMap_GetMessage(klass);
-
-  if (m == NULL) {
-    RETURN_BOOL(false);
-  }
-
-  RETURN_BOOL(TryStripUrlPrefix(&type_url) &&
-              StrViewEq(type_url, upb_MessageDef_FullName(m)));
-}
-
-PHP_METHOD(google_protobuf_Timestamp, fromDateTime) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  zval* datetime;
-  const char *classname = "\\DatetimeInterface";
-  zend_string *classname_str = zend_string_init(classname, strlen(classname), 0);
-  zend_class_entry *date_interface_ce = zend_lookup_class(classname_str);
-  zend_string_release(classname_str);
-
-  if (date_interface_ce == NULL) {
-    zend_error(E_ERROR, "Make sure date extension is enabled.");
-    return;
-  }
-
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "O", &datetime,
-                            date_interface_ce) == FAILURE) {
-    zend_error(E_USER_ERROR, "Expect DatetimeInterface.");
-    return;
-  }
-
-  upb_MessageValue timestamp_seconds;
-  {
-    zval retval;
-    zval function_name;
-
-    ZVAL_STRING(&function_name, "date_timestamp_get");
-
-    if (call_user_function(EG(function_table), NULL, &function_name, &retval, 1,
-                           datetime) == FAILURE ||
-        !Convert_PhpToUpb(&retval, &timestamp_seconds,
-                          TypeInfo_FromType(kUpb_CType_Int64), NULL)) {
-      zend_error(E_ERROR, "Cannot get timestamp from DateTime.");
-      return;
-    }
-
-    zval_dtor(&retval);
-    zval_dtor(&function_name);
-  }
-
-  upb_MessageValue timestamp_nanos;
-  {
-    zval retval;
-    zval function_name;
-    zval format_string;
-
-    ZVAL_STRING(&function_name, "date_format");
-    ZVAL_STRING(&format_string, "u");
-
-    zval params[2] = {
-        *datetime,
-        format_string,
-    };
-
-    if (call_user_function(EG(function_table), NULL, &function_name, &retval, 2,
-                           params) == FAILURE ||
-        !Convert_PhpToUpb(&retval, &timestamp_nanos,
-                          TypeInfo_FromType(kUpb_CType_Int32), NULL)) {
-      zend_error(E_ERROR, "Cannot format DateTime.");
-      return;
-    }
-
-    timestamp_nanos.int32_val *= 1000;
-
-    zval_dtor(&retval);
-    zval_dtor(&function_name);
-    zval_dtor(&format_string);
-  }
-
-  Message_setval(intern, "seconds", timestamp_seconds);
-  Message_setval(intern, "nanos", timestamp_nanos);
-
-  RETURN_NULL();
-}
-
-PHP_METHOD(google_protobuf_Timestamp, toDateTime) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  upb_MessageValue seconds = Message_getval(intern, "seconds");
-  upb_MessageValue nanos = Message_getval(intern, "nanos");
-
-  // Get formatted time string.
-  char formatted_time[32];
-  snprintf(formatted_time, sizeof(formatted_time), "%" PRId64 ".%06" PRId32,
-           seconds.int64_val, nanos.int32_val / 1000);
-
-  // Create Datetime object.
-  zval datetime;
-  zval function_name;
-  zval format_string;
-  zval formatted_time_php;
-
-  ZVAL_STRING(&function_name, "date_create_from_format");
-  ZVAL_STRING(&format_string, "U.u");
-  ZVAL_STRING(&formatted_time_php, formatted_time);
-
-  zval params[2] = {
-    format_string,
-    formatted_time_php,
-  };
-
-  if (call_user_function(EG(function_table), NULL, &function_name, &datetime, 2,
-                         params) == FAILURE) {
-    zend_error(E_ERROR, "Cannot create DateTime.");
-    return;
-  }
-
-  zval_dtor(&function_name);
-  zval_dtor(&format_string);
-  zval_dtor(&formatted_time_php);
-
-  ZVAL_OBJ(return_value, Z_OBJ(datetime));
-}
-
-#include "wkt.inc"
-
-/**
- * Message_ModuleInit()
- *
- * Called when the C extension is loaded to register all types.
- */
-void Message_ModuleInit() {
-  zend_class_entry tmp_ce;
-  zend_object_handlers *h = &message_object_handlers;
-
-  INIT_CLASS_ENTRY(tmp_ce, "Google\\Protobuf\\Internal\\Message",
-                   Message_methods);
-
-  message_ce = zend_register_internal_class(&tmp_ce);
-  message_ce->create_object = Message_create;
-
-  memcpy(h, &std_object_handlers, sizeof(zend_object_handlers));
-  h->dtor_obj = Message_dtor;
-#if PHP_VERSION_ID < 80000
-  h->compare_objects = Message_compare_objects;
-#else
-  h->compare = Message_compare_objects;
-#endif
-  h->read_property = Message_read_property;
-  h->write_property = Message_write_property;
-  h->has_property = Message_has_property;
-  h->unset_property = Message_unset_property;
-  h->get_properties = Message_get_properties;
-  h->get_property_ptr_ptr = Message_get_property_ptr_ptr;
-  h->clone_obj = Message_clone_obj;
-
-  WellKnownTypes_ModuleInit();  /* From wkt.inc. */
-}
diff --git a/libs/protobuf/php/ext/google/protobuf/message.h b/libs/protobuf/php/ext/google/protobuf/message.h
deleted file mode 100644
index 5b3ba0f..0000000
--- a/libs/protobuf/php/ext/google/protobuf/message.h
+++ /dev/null
@@ -1,61 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef PHP_PROTOBUF_MESSAGE_H_
-#define PHP_PROTOBUF_MESSAGE_H_
-
-#include <stdbool.h>
-
-#include "def.h"
-
-// Registers the PHP Message class.
-void Message_ModuleInit();
-
-// Gets a upb_Message* for the PHP object |val|, which must either be a Message
-// object or 'null'. Returns true and stores the message in |msg| if the
-// conversion succeeded (we can't return upb_Message* because null->NULL is a valid
-// conversion). Returns false and raises a PHP error if this isn't a Message
-// object or null, or if the Message object doesn't match this Descriptor.
-//
-// The given |arena| will be fused to this message's arena.
-bool Message_GetUpbMessage(zval *val, const Descriptor *desc, upb_Arena *arena,
-                           upb_Message **msg);
-
-// Gets or creates a PHP Message object to wrap the given upb_Message* and |desc|
-// and returns it in |val|. The PHP object will keep a reference to this |arena|
-// to ensure the underlying message data stays alive.
-//
-// If |msg| is NULL, this will return a PHP null.
-void Message_GetPhpWrapper(zval *val, const Descriptor *desc, upb_Message *msg,
-                           zval *arena);
-
-bool ValueEq(upb_MessageValue val1, upb_MessageValue val2, TypeInfo type);
-
-#endif  // PHP_PROTOBUF_MESSAGE_H_
diff --git a/libs/protobuf/php/ext/google/protobuf/names.c b/libs/protobuf/php/ext/google/protobuf/names.c
deleted file mode 100644
index e359d01..0000000
--- a/libs/protobuf/php/ext/google/protobuf/names.c
+++ /dev/null
@@ -1,287 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include "names.h"
-
-#include <stdlib.h>
-
-#include "protobuf.h"
-
-/* stringsink *****************************************************************/
-
-typedef struct {
-  char *ptr;
-  size_t len, size;
-} stringsink;
-
-static size_t stringsink_string(stringsink *sink, const char *ptr, size_t len) {
-  size_t new_size = sink->size;
-
-  while (sink->len + len > new_size) {
-    new_size *= 2;
-  }
-
-  if (new_size != sink->size) {
-    sink->ptr = realloc(sink->ptr, new_size);
-    sink->size = new_size;
-  }
-
-  memcpy(sink->ptr + sink->len, ptr, len);
-  sink->len += len;
-
-  return len;
-}
-
-static void stringsink_init(stringsink *sink) {
-  sink->size = 32;
-  sink->ptr = malloc(sink->size);
-  PBPHP_ASSERT(sink->ptr != NULL);
-  sink->len = 0;
-}
-
-static void stringsink_uninit(stringsink *sink) { free(sink->ptr); }
-
-/* def name -> classname ******************************************************/
-
-const char *const kReservedNames[] = {
-    "abstract",   "and",         "array",        "as",           "break",
-    "callable",   "case",        "catch",        "class",        "clone",
-    "const",      "continue",    "declare",      "default",      "die",
-    "do",         "echo",        "else",         "elseif",       "empty",
-    "enddeclare", "endfor",      "endforeach",   "endif",        "endswitch",
-    "endwhile",   "eval",        "exit",         "extends",      "final",
-    "finally",    "fn",          "for",          "foreach",      "function",
-    "if",         "implements",  "include",      "include_once", "instanceof",
-    "global",     "goto",        "insteadof",    "interface",    "isset",
-    "list",       "match",       "namespace",    "new",          "object",
-    "or",         "parent",      "print",        "private",      "protected",
-    "public",     "readonly",    "require",      "require_once", "return",
-    "self",       "static",      "switch",       "throw",        "trait",
-    "try",        "unset",       "use",          "var",          "while",
-    "xor",        "yield",       "int",          "float",        "bool",
-    "string",     "true",        "false",        "null",         "void",
-    "iterable",   NULL};
-
-const char *const kPreviouslyUnreservedNames[] = {
-    "readonly", NULL};
-
-bool is_reserved_name(const char* name) {
-  int i;
-  for (i = 0; kReservedNames[i]; i++) {
-    if (strcmp(kReservedNames[i], name) == 0) {
-      return true;
-    }
-  }
-  return false;
-}
-
-bool is_previously_unreserved_name(const char* name) {
-  for (int i = 0; kPreviouslyUnreservedNames[i]; i++) {
-    if (strcmp(kPreviouslyUnreservedNames[i], name) == 0) {
-      return true;
-    }
-  }
-  return false;
-}
-
-static char nolocale_tolower(char ch) {
-  if (ch >= 'A' && ch <= 'Z') {
-    return ch - ('A' - 'a');
-  } else {
-    return ch;
-  }
-}
-
-static char nolocale_toupper(char ch) {
-  if (ch >= 'a' && ch <= 'z') {
-    return ch - ('a' - 'A');
-  } else {
-    return ch;
-  }
-}
-
-static char *strdup_nolocale_lower(char *str, int length) {
-  char* lower = malloc(length + 1);
-  lower[length] = '\0';
-  for(int i = 0; i < length; ++i) {
-    lower[i] = nolocale_tolower(str[i]);
-  }
-  return lower;
-}
-
-static bool is_reserved(const char *segment, int length, bool previous) {
-  bool result;
-  char* lower = strdup_nolocale_lower(segment, length);
-  result = is_reserved_name(lower);
-  if (result && previous && is_previously_unreserved_name(lower)) {
-    result = false;
-  }
-  free(lower);
-  return result;
-}
-
-static void fill_prefix(const char *segment, int length,
-                        const char *prefix_given,
-                        const char *package_name,
-                        stringsink *classname,
-                        bool previous) {
-  if (prefix_given != NULL && strcmp(prefix_given, "") != 0) {
-    stringsink_string(classname, prefix_given, strlen(prefix_given));
-  } else {
-    if (is_reserved(segment, length, previous)) {
-      if (package_name != NULL &&
-          strcmp("google.protobuf", package_name) == 0) {
-        stringsink_string(classname, "GPB", 3);
-      } else {
-        stringsink_string(classname, "PB", 2);
-      }
-    }
-  }
-}
-
-static void fill_segment(const char *segment, int length,
-                         stringsink *classname, bool use_camel) {
-  if (use_camel && (segment[0] < 'A' || segment[0] > 'Z')) {
-    char first = nolocale_toupper(segment[0]);
-    stringsink_string(classname, &first, 1);
-    stringsink_string(classname, segment + 1, length - 1);
-  } else {
-    stringsink_string(classname, segment, length);
-  }
-}
-
-static void fill_namespace(const char *package, const char *php_namespace,
-                           stringsink *classname, bool previous) {
-  if (php_namespace != NULL) {
-    if (strlen(php_namespace) != 0) {
-      stringsink_string(classname, php_namespace, strlen(php_namespace));
-      stringsink_string(classname, "\\", 1);
-    }
-  } else if (package != NULL) {
-    int i = 0, j = 0;
-    size_t package_len = strlen(package);
-    while (i < package_len) {
-      j = i;
-      while (j < package_len && package[j] != '.') {
-        j++;
-      }
-      fill_prefix(package + i, j - i, "", package, classname, previous);
-      fill_segment(package + i, j - i, classname, true);
-      stringsink_string(classname, "\\", 1);
-      i = j + 1;
-    }
-  }
-}
-
-static void fill_classname(const char *fullname,
-                           const char *package,
-                           const char *prefix,
-                           stringsink *classname,
-                           bool previous) {
-  int classname_start = 0;
-  if (package != NULL) {
-    size_t package_len = strlen(package);
-    classname_start = package_len == 0 ? 0 : package_len + 1;
-  }
-  size_t fullname_len = strlen(fullname);
-
-  int i = classname_start, j;
-  while (i < fullname_len) {
-    j = i;
-    while (j < fullname_len && fullname[j] != '.') {
-      j++;
-    }
-    fill_prefix(fullname + i, j - i, prefix, package, classname, previous);
-    fill_segment(fullname + i, j - i, classname, false);
-    if (j != fullname_len) {
-      stringsink_string(classname, "\\", 1);
-    }
-    i = j + 1;
-  }
-}
-
-char *str_view_dup(upb_StringView str) {
-  char *ret = malloc(str.size + 1);
-  memcpy(ret, str.data, str.size);
-  ret[str.size] = '\0';
-  return ret;
-}
-
-char *GetPhpClassname(const upb_FileDef *file, const char *fullname, bool previous) {
-  // Prepend '.' to package name to make it absolute. In the 5 additional
-  // bytes allocated, one for '.', one for trailing 0, and 3 for 'GPB' if
-  // given message is google.protobuf.Empty.
-  const google_protobuf_FileOptions* opts = upb_FileDef_Options(file);
-  const char *package = upb_FileDef_Package(file);
-  char *php_namespace =
-      google_protobuf_FileOptions_has_php_namespace(opts)
-          ? str_view_dup(google_protobuf_FileOptions_php_namespace(opts))
-          : NULL;
-  char *prefix =
-      google_protobuf_FileOptions_has_php_class_prefix(opts)
-          ? str_view_dup(google_protobuf_FileOptions_php_class_prefix(opts))
-          : NULL;
-  char *ret;
-
-  stringsink namesink;
-  stringsink_init(&namesink);
-
-  fill_namespace(package, php_namespace, &namesink, previous);
-  fill_classname(fullname, package, prefix, &namesink, previous);
-  stringsink_string(&namesink, "\0", 1);
-  ret = strdup(namesink.ptr);
-  stringsink_uninit(&namesink);
-  free(php_namespace);
-  free(prefix);
-  return ret;
-}
-
-bool IsPreviouslyUnreservedClassName(const char* fullname) {
-  const char *classname = strrchr(fullname, '\\');
-  if (classname) {
-    classname += 1;
-  } else {
-    classname = fullname;
-  }
-  if (strncmp(classname, "PB", 2) != 0) {
-    return false;
-  }
-  classname += 2;
-  int length = strlen(classname);
-  char* lower = strdup_nolocale_lower(classname, length);
-  for (int j = 0; kPreviouslyUnreservedNames[j]; j++) {
-    if (strcmp(kPreviouslyUnreservedNames[j], lower) == 0) {
-      free(lower);
-      return true;
-    }
-  }
-  free(lower);
-  return false;
-}
diff --git a/libs/protobuf/php/ext/google/protobuf/names.h b/libs/protobuf/php/ext/google/protobuf/names.h
deleted file mode 100644
index cc42dc8..0000000
--- a/libs/protobuf/php/ext/google/protobuf/names.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef PHP_PROTOBUF_NAMES_H_
-#define PHP_PROTOBUF_NAMES_H_
-
-#include "php-upb.h"
-
-// Translates a protobuf symbol name (eg. foo.bar.Baz) into a PHP class name
-// (eg. \Foo\Bar\Baz).
-char *GetPhpClassname(const upb_FileDef *file, const char *fullname, bool previous);
-bool IsPreviouslyUnreservedClassName(const char* fullname);
-
-#endif  // PHP_PROTOBUF_NAMES_H_
diff --git a/libs/protobuf/php/ext/google/protobuf/php-upb.c b/libs/protobuf/php/ext/google/protobuf/php-upb.c
deleted file mode 100644
index 7ccb946..0000000
--- a/libs/protobuf/php/ext/google/protobuf/php-upb.c
+++ /dev/null
@@ -1,12858 +0,0 @@
-/* Amalgamated source file */
-#include "php-upb.h"
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * This is where we define macros used across upb.
- *
- * All of these macros are undef'd in port_undef.inc to avoid leaking them to
- * users.
- *
- * The correct usage is:
- *
- *   #include "upb/foobar.h"
- *   #include "upb/baz.h"
- *
- *   // MUST be last included header.
- *   #include "upb/port_def.inc"
- *
- *   // Code for this file.
- *   // <...>
- *
- *   // Can be omitted for .c files, required for .h.
- *   #include "upb/port_undef.inc"
- *
- * This file is private and must not be included by users!
- */
-
-#if !((defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || \
-      (defined(__cplusplus) && __cplusplus >= 201103L) ||           \
-      (defined(_MSC_VER) && _MSC_VER >= 1900))
-#error upb requires C99 or C++11 or MSVC >= 2015.
-#endif
-
-#include <stdint.h>
-#include <stddef.h>
-
-#if UINTPTR_MAX == 0xffffffff
-#define UPB_SIZE(size32, size64) size32
-#else
-#define UPB_SIZE(size32, size64) size64
-#endif
-
-/* If we always read/write as a consistent type to each address, this shouldn't
- * violate aliasing.
- */
-#define UPB_PTR_AT(msg, ofs, type) ((type*)((char*)(msg) + (ofs)))
-
-#define UPB_READ_ONEOF(msg, fieldtype, offset, case_offset, case_val, default) \
-  *UPB_PTR_AT(msg, case_offset, int) == case_val                              \
-      ? *UPB_PTR_AT(msg, offset, fieldtype)                                   \
-      : default
-
-#define UPB_WRITE_ONEOF(msg, fieldtype, offset, value, case_offset, case_val) \
-  *UPB_PTR_AT(msg, case_offset, int) = case_val;                             \
-  *UPB_PTR_AT(msg, offset, fieldtype) = value;
-
-#define UPB_MAPTYPE_STRING 0
-
-/* UPB_INLINE: inline if possible, emit standalone code if required. */
-#ifdef __cplusplus
-#define UPB_INLINE inline
-#elif defined (__GNUC__) || defined(__clang__)
-#define UPB_INLINE static __inline__
-#else
-#define UPB_INLINE static
-#endif
-
-#define UPB_MALLOC_ALIGN 8
-#define UPB_ALIGN_UP(size, align) (((size) + (align) - 1) / (align) * (align))
-#define UPB_ALIGN_DOWN(size, align) ((size) / (align) * (align))
-#define UPB_ALIGN_MALLOC(size) UPB_ALIGN_UP(size, UPB_MALLOC_ALIGN)
-#define UPB_ALIGN_OF(type) offsetof (struct { char c; type member; }, member)
-
-// Hints to the compiler about likely/unlikely branches.
-#if defined (__GNUC__) || defined(__clang__)
-#define UPB_LIKELY(x) __builtin_expect((bool)(x), 1)
-#define UPB_UNLIKELY(x) __builtin_expect((bool)(x), 0)
-#else
-#define UPB_LIKELY(x) (x)
-#define UPB_UNLIKELY(x) (x)
-#endif
-
-// Macros for function attributes on compilers that support them.
-#ifdef __GNUC__
-#define UPB_FORCEINLINE __inline__ __attribute__((always_inline))
-#define UPB_NOINLINE __attribute__((noinline))
-#define UPB_NORETURN __attribute__((__noreturn__))
-#define UPB_PRINTF(str, first_vararg) __attribute__((format (printf, str, first_vararg)))
-#elif defined(_MSC_VER)
-#define UPB_NOINLINE
-#define UPB_FORCEINLINE
-#define UPB_NORETURN __declspec(noreturn)
-#define UPB_PRINTF(str, first_vararg)
-#else  /* !defined(__GNUC__) */
-#define UPB_FORCEINLINE
-#define UPB_NOINLINE
-#define UPB_NORETURN
-#define UPB_PRINTF(str, first_vararg)
-#endif
-
-#define UPB_MAX(x, y) ((x) > (y) ? (x) : (y))
-#define UPB_MIN(x, y) ((x) < (y) ? (x) : (y))
-
-#define UPB_UNUSED(var) (void)var
-
-// UPB_ASSUME(): in release mode, we tell the compiler to assume this is true.
-#ifdef NDEBUG
-#ifdef __GNUC__
-#define UPB_ASSUME(expr) if (!(expr)) __builtin_unreachable()
-#elif defined _MSC_VER
-#define UPB_ASSUME(expr) if (!(expr)) __assume(0)
-#else
-#define UPB_ASSUME(expr) do {} while (false && (expr))
-#endif
-#else
-#define UPB_ASSUME(expr) assert(expr)
-#endif
-
-/* UPB_ASSERT(): in release mode, we use the expression without letting it be
- * evaluated.  This prevents "unused variable" warnings. */
-#ifdef NDEBUG
-#define UPB_ASSERT(expr) do {} while (false && (expr))
-#else
-#define UPB_ASSERT(expr) assert(expr)
-#endif
-
-#if defined(__GNUC__) || defined(__clang__)
-#define UPB_UNREACHABLE() do { assert(0); __builtin_unreachable(); } while(0)
-#else
-#define UPB_UNREACHABLE() do { assert(0); } while(0)
-#endif
-
-/* UPB_SETJMP() / UPB_LONGJMP(): avoid setting/restoring signal mask. */
-#ifdef __APPLE__
-#define UPB_SETJMP(buf) _setjmp(buf)
-#define UPB_LONGJMP(buf, val) _longjmp(buf, val)
-#else
-#define UPB_SETJMP(buf) setjmp(buf)
-#define UPB_LONGJMP(buf, val) longjmp(buf, val)
-#endif
-
-/* UPB_PTRADD(ptr, ofs): add pointer while avoiding "NULL + 0" UB */
-#define UPB_PTRADD(ptr, ofs) ((ofs) ? (ptr) + (ofs) : (ptr))
-
-/* Configure whether fasttable is switched on or not. *************************/
-
-#ifdef __has_attribute
-#define UPB_HAS_ATTRIBUTE(x) __has_attribute(x)
-#else
-#define UPB_HAS_ATTRIBUTE(x) 0
-#endif
-
-#if UPB_HAS_ATTRIBUTE(musttail)
-#define UPB_MUSTTAIL __attribute__((musttail))
-#else
-#define UPB_MUSTTAIL
-#endif
-
-#undef UPB_HAS_ATTRIBUTE
-
-/* This check is not fully robust: it does not require that we have "musttail"
- * support available. We need tail calls to avoid consuming arbitrary amounts
- * of stack space.
- *
- * GCC/Clang can mostly be trusted to generate tail calls as long as
- * optimization is enabled, but, debug builds will not generate tail calls
- * unless "musttail" is available.
- *
- * We should probably either:
- *   1. require that the compiler supports musttail.
- *   2. add some fallback code for when musttail isn't available (ie. return
- *      instead of tail calling). This is safe and portable, but this comes at
- *      a CPU cost.
- */
-#if (defined(__x86_64__) || defined(__aarch64__)) && defined(__GNUC__)
-#define UPB_FASTTABLE_SUPPORTED 1
-#else
-#define UPB_FASTTABLE_SUPPORTED 0
-#endif
-
-/* define UPB_ENABLE_FASTTABLE to force fast table support.
- * This is useful when we want to ensure we are really getting fasttable,
- * for example for testing or benchmarking. */
-#if defined(UPB_ENABLE_FASTTABLE)
-#if !UPB_FASTTABLE_SUPPORTED
-#error fasttable is x86-64/ARM64 only and requires GCC or Clang.
-#endif
-#define UPB_FASTTABLE 1
-/* Define UPB_TRY_ENABLE_FASTTABLE to use fasttable if possible.
- * This is useful for releasing code that might be used on multiple platforms,
- * for example the PHP or Ruby C extensions. */
-#elif defined(UPB_TRY_ENABLE_FASTTABLE)
-#define UPB_FASTTABLE UPB_FASTTABLE_SUPPORTED
-#else
-#define UPB_FASTTABLE 0
-#endif
-
-/* UPB_FASTTABLE_INIT() allows protos compiled for fasttable to gracefully
- * degrade to non-fasttable if we are using UPB_TRY_ENABLE_FASTTABLE. */
-#if !UPB_FASTTABLE && defined(UPB_TRY_ENABLE_FASTTABLE)
-#define UPB_FASTTABLE_INIT(...)
-#else
-#define UPB_FASTTABLE_INIT(...) __VA_ARGS__
-#endif
-
-#undef UPB_FASTTABLE_SUPPORTED
-
-/* ASAN poisoning (for arena) *************************************************/
-
-#if defined(__SANITIZE_ADDRESS__)
-#define UPB_ASAN 1
-#ifdef __cplusplus
-extern "C" {
-#endif
-void __asan_poison_memory_region(void const volatile *addr, size_t size);
-void __asan_unpoison_memory_region(void const volatile *addr, size_t size);
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-#define UPB_POISON_MEMORY_REGION(addr, size) \
-  __asan_poison_memory_region((addr), (size))
-#define UPB_UNPOISON_MEMORY_REGION(addr, size) \
-  __asan_unpoison_memory_region((addr), (size))
-#else
-#define UPB_ASAN 0
-#define UPB_POISON_MEMORY_REGION(addr, size) \
-  ((void)(addr), (void)(size))
-#define UPB_UNPOISON_MEMORY_REGION(addr, size) \
-  ((void)(addr), (void)(size))
-#endif
-
-/* Disable proto2 arena behavior (TEMPORARY) **********************************/
-
-#ifdef UPB_DISABLE_PROTO2_ENUM_CHECKING
-#define UPB_TREAT_PROTO2_ENUMS_LIKE_PROTO3 1
-#else
-#define UPB_TREAT_PROTO2_ENUMS_LIKE_PROTO3 0
-#endif
-
-/** upb/collections.c ************************************************************/
-
-#include <string.h>
-
-
-/* Strings/bytes are special-cased in maps. */
-static char _upb_CTypeo_mapsize[12] = {
-    0,
-    1,             /* kUpb_CType_Bool */
-    4,             /* kUpb_CType_Float */
-    4,             /* kUpb_CType_Int32 */
-    4,             /* kUpb_CType_UInt32 */
-    4,             /* kUpb_CType_Enum */
-    sizeof(void*), /* kUpb_CType_Message */
-    8,             /* kUpb_CType_Double */
-    8,             /* kUpb_CType_Int64 */
-    8,             /* kUpb_CType_UInt64 */
-    0,             /* kUpb_CType_String */
-    0,             /* kUpb_CType_Bytes */
-};
-
-static const char _upb_CTypeo_sizelg2[12] = {
-    0,
-    0,              /* kUpb_CType_Bool */
-    2,              /* kUpb_CType_Float */
-    2,              /* kUpb_CType_Int32 */
-    2,              /* kUpb_CType_UInt32 */
-    2,              /* kUpb_CType_Enum */
-    UPB_SIZE(2, 3), /* kUpb_CType_Message */
-    3,              /* kUpb_CType_Double */
-    3,              /* kUpb_CType_Int64 */
-    3,              /* kUpb_CType_UInt64 */
-    UPB_SIZE(3, 4), /* kUpb_CType_String */
-    UPB_SIZE(3, 4), /* kUpb_CType_Bytes */
-};
-
-/** upb_Array *****************************************************************/
-
-upb_Array* upb_Array_New(upb_Arena* a, upb_CType type) {
-  return _upb_Array_New(a, 4, _upb_CTypeo_sizelg2[type]);
-}
-
-size_t upb_Array_Size(const upb_Array* arr) { return arr->len; }
-
-upb_MessageValue upb_Array_Get(const upb_Array* arr, size_t i) {
-  upb_MessageValue ret;
-  const char* data = _upb_array_constptr(arr);
-  int lg2 = arr->data & 7;
-  UPB_ASSERT(i < arr->len);
-  memcpy(&ret, data + (i << lg2), 1 << lg2);
-  return ret;
-}
-
-void upb_Array_Set(upb_Array* arr, size_t i, upb_MessageValue val) {
-  char* data = _upb_array_ptr(arr);
-  int lg2 = arr->data & 7;
-  UPB_ASSERT(i < arr->len);
-  memcpy(data + (i << lg2), &val, 1 << lg2);
-}
-
-bool upb_Array_Append(upb_Array* arr, upb_MessageValue val, upb_Arena* arena) {
-  if (!upb_Array_Resize(arr, arr->len + 1, arena)) {
-    return false;
-  }
-  upb_Array_Set(arr, arr->len - 1, val);
-  return true;
-}
-
-void upb_Array_Move(upb_Array* arr, size_t dst_idx, size_t src_idx,
-                    size_t count) {
-  char* data = _upb_array_ptr(arr);
-  int lg2 = arr->data & 7;
-  memmove(&data[dst_idx << lg2], &data[src_idx << lg2], count << lg2);
-}
-
-bool upb_Array_Insert(upb_Array* arr, size_t i, size_t count,
-                      upb_Arena* arena) {
-  UPB_ASSERT(i <= arr->len);
-  UPB_ASSERT(count + arr->len >= count);
-  size_t oldsize = arr->len;
-  if (!upb_Array_Resize(arr, arr->len + count, arena)) {
-    return false;
-  }
-  upb_Array_Move(arr, i + count, i, oldsize - i);
-  return true;
-}
-
-/*
- *              i        end      arr->len
- * |------------|XXXXXXXX|--------|
- */
-void upb_Array_Delete(upb_Array* arr, size_t i, size_t count) {
-  size_t end = i + count;
-  UPB_ASSERT(i <= end);
-  UPB_ASSERT(end <= arr->len);
-  upb_Array_Move(arr, i, end, arr->len - end);
-  arr->len -= count;
-}
-
-bool upb_Array_Resize(upb_Array* arr, size_t size, upb_Arena* arena) {
-  return _upb_Array_Resize(arr, size, arena);
-}
-
-/** upb_Map *******************************************************************/
-
-upb_Map* upb_Map_New(upb_Arena* a, upb_CType key_type, upb_CType value_type) {
-  return _upb_Map_New(a, _upb_CTypeo_mapsize[key_type],
-                      _upb_CTypeo_mapsize[value_type]);
-}
-
-size_t upb_Map_Size(const upb_Map* map) { return _upb_Map_Size(map); }
-
-bool upb_Map_Get(const upb_Map* map, upb_MessageValue key,
-                 upb_MessageValue* val) {
-  return _upb_Map_Get(map, &key, map->key_size, val, map->val_size);
-}
-
-void upb_Map_Clear(upb_Map* map) { _upb_Map_Clear(map); }
-
-upb_MapInsertStatus upb_Map_Insert(upb_Map* map, upb_MessageValue key,
-                                   upb_MessageValue val, upb_Arena* arena) {
-  return (upb_MapInsertStatus)_upb_Map_Insert(map, &key, map->key_size, &val,
-                                              map->val_size, arena);
-}
-
-bool upb_Map_Delete(upb_Map* map, upb_MessageValue key) {
-  return _upb_Map_Delete(map, &key, map->key_size);
-}
-
-bool upb_MapIterator_Next(const upb_Map* map, size_t* iter) {
-  return _upb_map_next(map, iter);
-}
-
-bool upb_MapIterator_Done(const upb_Map* map, size_t iter) {
-  upb_strtable_iter i;
-  UPB_ASSERT(iter != kUpb_Map_Begin);
-  i.t = &map->table;
-  i.index = iter;
-  return upb_strtable_done(&i);
-}
-
-/* Returns the key and value for this entry of the map. */
-upb_MessageValue upb_MapIterator_Key(const upb_Map* map, size_t iter) {
-  upb_strtable_iter i;
-  upb_MessageValue ret;
-  i.t = &map->table;
-  i.index = iter;
-  _upb_map_fromkey(upb_strtable_iter_key(&i), &ret, map->key_size);
-  return ret;
-}
-
-upb_MessageValue upb_MapIterator_Value(const upb_Map* map, size_t iter) {
-  upb_strtable_iter i;
-  upb_MessageValue ret;
-  i.t = &map->table;
-  i.index = iter;
-  _upb_map_fromvalue(upb_strtable_iter_value(&i), &ret, map->val_size);
-  return ret;
-}
-
-/* void upb_MapIterator_SetValue(upb_Map *map, size_t iter, upb_MessageValue
- * value); */
-
-/** bazel-out/k8-fastbuild/bin/external/com_google_protobuf/google/protobuf/descriptor.upb.c ************************************************************//* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     google/protobuf/descriptor.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-
-
-static const upb_MiniTable_Sub google_protobuf_FileDescriptorSet_submsgs[1] = {
-  {.submsg = &google_protobuf_FileDescriptorProto_msginit},
-};
-
-static const upb_MiniTable_Field google_protobuf_FileDescriptorSet__fields[1] = {
-  {1, UPB_SIZE(0, 0), UPB_SIZE(0, 0), 0, 11, kUpb_FieldMode_Array | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_FileDescriptorSet_msginit = {
-  &google_protobuf_FileDescriptorSet_submsgs[0],
-  &google_protobuf_FileDescriptorSet__fields[0],
-  UPB_SIZE(8, 8), 1, kUpb_ExtMode_NonExtendable, 1, 255, 0,
-};
-
-static const upb_MiniTable_Sub google_protobuf_FileDescriptorProto_submsgs[6] = {
-  {.submsg = &google_protobuf_DescriptorProto_msginit},
-  {.submsg = &google_protobuf_EnumDescriptorProto_msginit},
-  {.submsg = &google_protobuf_ServiceDescriptorProto_msginit},
-  {.submsg = &google_protobuf_FieldDescriptorProto_msginit},
-  {.submsg = &google_protobuf_FileOptions_msginit},
-  {.submsg = &google_protobuf_SourceCodeInfo_msginit},
-};
-
-static const upb_MiniTable_Field google_protobuf_FileDescriptorProto__fields[12] = {
-  {1, UPB_SIZE(4, 8), UPB_SIZE(1, 1), kUpb_NoSub, 12, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(12, 24), UPB_SIZE(2, 2), kUpb_NoSub, 12, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(20, 40), UPB_SIZE(0, 0), kUpb_NoSub, 12, kUpb_FieldMode_Array | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(24, 48), UPB_SIZE(0, 0), 0, 11, kUpb_FieldMode_Array | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(28, 56), UPB_SIZE(0, 0), 1, 11, kUpb_FieldMode_Array | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(32, 64), UPB_SIZE(0, 0), 2, 11, kUpb_FieldMode_Array | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
-  {7, UPB_SIZE(36, 72), UPB_SIZE(0, 0), 3, 11, kUpb_FieldMode_Array | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
-  {8, UPB_SIZE(40, 80), UPB_SIZE(3, 3), 4, 11, kUpb_FieldMode_Scalar | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
-  {9, UPB_SIZE(44, 88), UPB_SIZE(4, 4), 5, 11, kUpb_FieldMode_Scalar | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
-  {10, UPB_SIZE(48, 96), UPB_SIZE(0, 0), kUpb_NoSub, 5, kUpb_FieldMode_Array | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
-  {11, UPB_SIZE(52, 104), UPB_SIZE(0, 0), kUpb_NoSub, 5, kUpb_FieldMode_Array | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
-  {12, UPB_SIZE(56, 112), UPB_SIZE(5, 5), kUpb_NoSub, 12, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_FileDescriptorProto_msginit = {
-  &google_protobuf_FileDescriptorProto_submsgs[0],
-  &google_protobuf_FileDescriptorProto__fields[0],
-  UPB_SIZE(64, 128), 12, kUpb_ExtMode_NonExtendable, 12, 255, 0,
-};
-
-static const upb_MiniTable_Sub google_protobuf_DescriptorProto_submsgs[8] = {
-  {.submsg = &google_protobuf_FieldDescriptorProto_msginit},
-  {.submsg = &google_protobuf_DescriptorProto_msginit},
-  {.submsg = &google_protobuf_EnumDescriptorProto_msginit},
-  {.submsg = &google_protobuf_DescriptorProto_ExtensionRange_msginit},
-  {.submsg = &google_protobuf_FieldDescriptorProto_msginit},
-  {.submsg = &google_protobuf_MessageOptions_msginit},
-  {.submsg = &google_protobuf_OneofDescriptorProto_msginit},
-  {.submsg = &google_protobuf_DescriptorProto_ReservedRange_msginit},
-};
-
-static const upb_MiniTable_Field google_protobuf_DescriptorProto__fields[10] = {
-  {1, UPB_SIZE(4, 8), UPB_SIZE(1, 1), kUpb_NoSub, 12, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(12, 24), UPB_SIZE(0, 0), 0, 11, kUpb_FieldMode_Array | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(16, 32), UPB_SIZE(0, 0), 1, 11, kUpb_FieldMode_Array | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(20, 40), UPB_SIZE(0, 0), 2, 11, kUpb_FieldMode_Array | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(24, 48), UPB_SIZE(0, 0), 3, 11, kUpb_FieldMode_Array | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(28, 56), UPB_SIZE(0, 0), 4, 11, kUpb_FieldMode_Array | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
-  {7, UPB_SIZE(32, 64), UPB_SIZE(2, 2), 5, 11, kUpb_FieldMode_Scalar | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
-  {8, UPB_SIZE(36, 72), UPB_SIZE(0, 0), 6, 11, kUpb_FieldMode_Array | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
-  {9, UPB_SIZE(40, 80), UPB_SIZE(0, 0), 7, 11, kUpb_FieldMode_Array | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
-  {10, UPB_SIZE(44, 88), UPB_SIZE(0, 0), kUpb_NoSub, 12, kUpb_FieldMode_Array | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_DescriptorProto_msginit = {
-  &google_protobuf_DescriptorProto_submsgs[0],
-  &google_protobuf_DescriptorProto__fields[0],
-  UPB_SIZE(48, 96), 10, kUpb_ExtMode_NonExtendable, 10, 255, 0,
-};
-
-static const upb_MiniTable_Sub google_protobuf_DescriptorProto_ExtensionRange_submsgs[1] = {
-  {.submsg = &google_protobuf_ExtensionRangeOptions_msginit},
-};
-
-static const upb_MiniTable_Field google_protobuf_DescriptorProto_ExtensionRange__fields[3] = {
-  {1, UPB_SIZE(4, 4), UPB_SIZE(1, 1), kUpb_NoSub, 5, kUpb_FieldMode_Scalar | (kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 8), UPB_SIZE(2, 2), kUpb_NoSub, 5, kUpb_FieldMode_Scalar | (kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(12, 16), UPB_SIZE(3, 3), 0, 11, kUpb_FieldMode_Scalar | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_DescriptorProto_ExtensionRange_msginit = {
-  &google_protobuf_DescriptorProto_ExtensionRange_submsgs[0],
-  &google_protobuf_DescriptorProto_ExtensionRange__fields[0],
-  UPB_SIZE(16, 24), 3, kUpb_ExtMode_NonExtendable, 3, 255, 0,
-};
-
-static const upb_MiniTable_Field google_protobuf_DescriptorProto_ReservedRange__fields[2] = {
-  {1, UPB_SIZE(4, 4), UPB_SIZE(1, 1), kUpb_NoSub, 5, kUpb_FieldMode_Scalar | (kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 8), UPB_SIZE(2, 2), kUpb_NoSub, 5, kUpb_FieldMode_Scalar | (kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_DescriptorProto_ReservedRange_msginit = {
-  NULL,
-  &google_protobuf_DescriptorProto_ReservedRange__fields[0],
-  UPB_SIZE(16, 16), 2, kUpb_ExtMode_NonExtendable, 2, 255, 0,
-};
-
-static const upb_MiniTable_Sub google_protobuf_ExtensionRangeOptions_submsgs[1] = {
-  {.submsg = &google_protobuf_UninterpretedOption_msginit},
-};
-
-static const upb_MiniTable_Field google_protobuf_ExtensionRangeOptions__fields[1] = {
-  {999, UPB_SIZE(0, 0), UPB_SIZE(0, 0), 0, 11, kUpb_FieldMode_Array | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_ExtensionRangeOptions_msginit = {
-  &google_protobuf_ExtensionRangeOptions_submsgs[0],
-  &google_protobuf_ExtensionRangeOptions__fields[0],
-  UPB_SIZE(8, 8), 1, kUpb_ExtMode_Extendable, 0, 255, 0,
-};
-
-static const upb_MiniTable_Sub google_protobuf_FieldDescriptorProto_submsgs[3] = {
-  {.subenum = &google_protobuf_FieldDescriptorProto_Label_enuminit},
-  {.subenum = &google_protobuf_FieldDescriptorProto_Type_enuminit},
-  {.submsg = &google_protobuf_FieldOptions_msginit},
-};
-
-static const upb_MiniTable_Field google_protobuf_FieldDescriptorProto__fields[11] = {
-  {1, UPB_SIZE(24, 24), UPB_SIZE(1, 1), kUpb_NoSub, 12, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(32, 40), UPB_SIZE(2, 2), kUpb_NoSub, 12, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(4, 4), UPB_SIZE(3, 3), kUpb_NoSub, 5, kUpb_FieldMode_Scalar | (kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(8, 8), UPB_SIZE(4, 4), 0, 14, kUpb_FieldMode_Scalar | (kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(12, 12), UPB_SIZE(5, 5), 1, 14, kUpb_FieldMode_Scalar | (kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(40, 56), UPB_SIZE(6, 6), kUpb_NoSub, 12, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {7, UPB_SIZE(48, 72), UPB_SIZE(7, 7), kUpb_NoSub, 12, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {8, UPB_SIZE(56, 88), UPB_SIZE(8, 8), 2, 11, kUpb_FieldMode_Scalar | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
-  {9, UPB_SIZE(16, 16), UPB_SIZE(9, 9), kUpb_NoSub, 5, kUpb_FieldMode_Scalar | (kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {10, UPB_SIZE(60, 96), UPB_SIZE(10, 10), kUpb_NoSub, 12, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {17, UPB_SIZE(20, 20), UPB_SIZE(11, 11), kUpb_NoSub, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_FieldDescriptorProto_msginit = {
-  &google_protobuf_FieldDescriptorProto_submsgs[0],
-  &google_protobuf_FieldDescriptorProto__fields[0],
-  UPB_SIZE(72, 112), 11, kUpb_ExtMode_NonExtendable, 10, 255, 0,
-};
-
-static const upb_MiniTable_Sub google_protobuf_OneofDescriptorProto_submsgs[1] = {
-  {.submsg = &google_protobuf_OneofOptions_msginit},
-};
-
-static const upb_MiniTable_Field google_protobuf_OneofDescriptorProto__fields[2] = {
-  {1, UPB_SIZE(4, 8), UPB_SIZE(1, 1), kUpb_NoSub, 12, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(12, 24), UPB_SIZE(2, 2), 0, 11, kUpb_FieldMode_Scalar | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_OneofDescriptorProto_msginit = {
-  &google_protobuf_OneofDescriptorProto_submsgs[0],
-  &google_protobuf_OneofDescriptorProto__fields[0],
-  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, 255, 0,
-};
-
-static const upb_MiniTable_Sub google_protobuf_EnumDescriptorProto_submsgs[3] = {
-  {.submsg = &google_protobuf_EnumValueDescriptorProto_msginit},
-  {.submsg = &google_protobuf_EnumOptions_msginit},
-  {.submsg = &google_protobuf_EnumDescriptorProto_EnumReservedRange_msginit},
-};
-
-static const upb_MiniTable_Field google_protobuf_EnumDescriptorProto__fields[5] = {
-  {1, UPB_SIZE(4, 8), UPB_SIZE(1, 1), kUpb_NoSub, 12, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(12, 24), UPB_SIZE(0, 0), 0, 11, kUpb_FieldMode_Array | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(16, 32), UPB_SIZE(2, 2), 1, 11, kUpb_FieldMode_Scalar | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(20, 40), UPB_SIZE(0, 0), 2, 11, kUpb_FieldMode_Array | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(24, 48), UPB_SIZE(0, 0), kUpb_NoSub, 12, kUpb_FieldMode_Array | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_EnumDescriptorProto_msginit = {
-  &google_protobuf_EnumDescriptorProto_submsgs[0],
-  &google_protobuf_EnumDescriptorProto__fields[0],
-  UPB_SIZE(32, 56), 5, kUpb_ExtMode_NonExtendable, 5, 255, 0,
-};
-
-static const upb_MiniTable_Field google_protobuf_EnumDescriptorProto_EnumReservedRange__fields[2] = {
-  {1, UPB_SIZE(4, 4), UPB_SIZE(1, 1), kUpb_NoSub, 5, kUpb_FieldMode_Scalar | (kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 8), UPB_SIZE(2, 2), kUpb_NoSub, 5, kUpb_FieldMode_Scalar | (kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_EnumDescriptorProto_EnumReservedRange_msginit = {
-  NULL,
-  &google_protobuf_EnumDescriptorProto_EnumReservedRange__fields[0],
-  UPB_SIZE(16, 16), 2, kUpb_ExtMode_NonExtendable, 2, 255, 0,
-};
-
-static const upb_MiniTable_Sub google_protobuf_EnumValueDescriptorProto_submsgs[1] = {
-  {.submsg = &google_protobuf_EnumValueOptions_msginit},
-};
-
-static const upb_MiniTable_Field google_protobuf_EnumValueDescriptorProto__fields[3] = {
-  {1, UPB_SIZE(8, 8), UPB_SIZE(1, 1), kUpb_NoSub, 12, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 4), UPB_SIZE(2, 2), kUpb_NoSub, 5, kUpb_FieldMode_Scalar | (kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(16, 24), UPB_SIZE(3, 3), 0, 11, kUpb_FieldMode_Scalar | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_EnumValueDescriptorProto_msginit = {
-  &google_protobuf_EnumValueDescriptorProto_submsgs[0],
-  &google_protobuf_EnumValueDescriptorProto__fields[0],
-  UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 3, 255, 0,
-};
-
-static const upb_MiniTable_Sub google_protobuf_ServiceDescriptorProto_submsgs[2] = {
-  {.submsg = &google_protobuf_MethodDescriptorProto_msginit},
-  {.submsg = &google_protobuf_ServiceOptions_msginit},
-};
-
-static const upb_MiniTable_Field google_protobuf_ServiceDescriptorProto__fields[3] = {
-  {1, UPB_SIZE(4, 8), UPB_SIZE(1, 1), kUpb_NoSub, 12, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(12, 24), UPB_SIZE(0, 0), 0, 11, kUpb_FieldMode_Array | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(16, 32), UPB_SIZE(2, 2), 1, 11, kUpb_FieldMode_Scalar | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_ServiceDescriptorProto_msginit = {
-  &google_protobuf_ServiceDescriptorProto_submsgs[0],
-  &google_protobuf_ServiceDescriptorProto__fields[0],
-  UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 3, 255, 0,
-};
-
-static const upb_MiniTable_Sub google_protobuf_MethodDescriptorProto_submsgs[1] = {
-  {.submsg = &google_protobuf_MethodOptions_msginit},
-};
-
-static const upb_MiniTable_Field google_protobuf_MethodDescriptorProto__fields[6] = {
-  {1, UPB_SIZE(4, 8), UPB_SIZE(1, 1), kUpb_NoSub, 12, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(12, 24), UPB_SIZE(2, 2), kUpb_NoSub, 12, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(20, 40), UPB_SIZE(3, 3), kUpb_NoSub, 12, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(28, 56), UPB_SIZE(4, 4), 0, 11, kUpb_FieldMode_Scalar | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(1, 1), UPB_SIZE(5, 5), kUpb_NoSub, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(2, 2), UPB_SIZE(6, 6), kUpb_NoSub, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_MethodDescriptorProto_msginit = {
-  &google_protobuf_MethodDescriptorProto_submsgs[0],
-  &google_protobuf_MethodDescriptorProto__fields[0],
-  UPB_SIZE(32, 64), 6, kUpb_ExtMode_NonExtendable, 6, 255, 0,
-};
-
-static const upb_MiniTable_Sub google_protobuf_FileOptions_submsgs[2] = {
-  {.subenum = &google_protobuf_FileOptions_OptimizeMode_enuminit},
-  {.submsg = &google_protobuf_UninterpretedOption_msginit},
-};
-
-static const upb_MiniTable_Field google_protobuf_FileOptions__fields[21] = {
-  {1, UPB_SIZE(20, 24), UPB_SIZE(1, 1), kUpb_NoSub, 12, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {8, UPB_SIZE(28, 40), UPB_SIZE(2, 2), kUpb_NoSub, 12, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {9, UPB_SIZE(4, 4), UPB_SIZE(3, 3), 0, 14, kUpb_FieldMode_Scalar | (kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {10, UPB_SIZE(8, 8), UPB_SIZE(4, 4), kUpb_NoSub, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {11, UPB_SIZE(36, 56), UPB_SIZE(5, 5), kUpb_NoSub, 12, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {16, UPB_SIZE(9, 9), UPB_SIZE(6, 6), kUpb_NoSub, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {17, UPB_SIZE(10, 10), UPB_SIZE(7, 7), kUpb_NoSub, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {18, UPB_SIZE(11, 11), UPB_SIZE(8, 8), kUpb_NoSub, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {20, UPB_SIZE(12, 12), UPB_SIZE(9, 9), kUpb_NoSub, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {23, UPB_SIZE(13, 13), UPB_SIZE(10, 10), kUpb_NoSub, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {27, UPB_SIZE(14, 14), UPB_SIZE(11, 11), kUpb_NoSub, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {31, UPB_SIZE(15, 15), UPB_SIZE(12, 12), kUpb_NoSub, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {36, UPB_SIZE(44, 72), UPB_SIZE(13, 13), kUpb_NoSub, 12, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {37, UPB_SIZE(52, 88), UPB_SIZE(14, 14), kUpb_NoSub, 12, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {39, UPB_SIZE(60, 104), UPB_SIZE(15, 15), kUpb_NoSub, 12, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {40, UPB_SIZE(68, 120), UPB_SIZE(16, 16), kUpb_NoSub, 12, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {41, UPB_SIZE(76, 136), UPB_SIZE(17, 17), kUpb_NoSub, 12, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {42, UPB_SIZE(16, 16), UPB_SIZE(18, 18), kUpb_NoSub, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {44, UPB_SIZE(84, 152), UPB_SIZE(19, 19), kUpb_NoSub, 12, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {45, UPB_SIZE(92, 168), UPB_SIZE(20, 20), kUpb_NoSub, 12, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {999, UPB_SIZE(100, 184), UPB_SIZE(0, 0), 1, 11, kUpb_FieldMode_Array | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_FileOptions_msginit = {
-  &google_protobuf_FileOptions_submsgs[0],
-  &google_protobuf_FileOptions__fields[0],
-  UPB_SIZE(104, 192), 21, kUpb_ExtMode_Extendable, 1, 255, 0,
-};
-
-static const upb_MiniTable_Sub google_protobuf_MessageOptions_submsgs[1] = {
-  {.submsg = &google_protobuf_UninterpretedOption_msginit},
-};
-
-static const upb_MiniTable_Field google_protobuf_MessageOptions__fields[5] = {
-  {1, UPB_SIZE(1, 1), UPB_SIZE(1, 1), kUpb_NoSub, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(2, 2), UPB_SIZE(2, 2), kUpb_NoSub, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(3, 3), UPB_SIZE(3, 3), kUpb_NoSub, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {7, UPB_SIZE(4, 4), UPB_SIZE(4, 4), kUpb_NoSub, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {999, UPB_SIZE(8, 8), UPB_SIZE(0, 0), 0, 11, kUpb_FieldMode_Array | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_MessageOptions_msginit = {
-  &google_protobuf_MessageOptions_submsgs[0],
-  &google_protobuf_MessageOptions__fields[0],
-  UPB_SIZE(16, 16), 5, kUpb_ExtMode_Extendable, 3, 255, 0,
-};
-
-static const upb_MiniTable_Sub google_protobuf_FieldOptions_submsgs[3] = {
-  {.subenum = &google_protobuf_FieldOptions_CType_enuminit},
-  {.subenum = &google_protobuf_FieldOptions_JSType_enuminit},
-  {.submsg = &google_protobuf_UninterpretedOption_msginit},
-};
-
-static const upb_MiniTable_Field google_protobuf_FieldOptions__fields[8] = {
-  {1, UPB_SIZE(4, 4), UPB_SIZE(1, 1), 0, 14, kUpb_FieldMode_Scalar | (kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 8), UPB_SIZE(2, 2), kUpb_NoSub, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(9, 9), UPB_SIZE(3, 3), kUpb_NoSub, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(10, 10), UPB_SIZE(4, 4), kUpb_NoSub, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(12, 12), UPB_SIZE(5, 5), 1, 14, kUpb_FieldMode_Scalar | (kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {10, UPB_SIZE(16, 16), UPB_SIZE(6, 6), kUpb_NoSub, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {15, UPB_SIZE(17, 17), UPB_SIZE(7, 7), kUpb_NoSub, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {999, UPB_SIZE(20, 24), UPB_SIZE(0, 0), 2, 11, kUpb_FieldMode_Array | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_FieldOptions_msginit = {
-  &google_protobuf_FieldOptions_submsgs[0],
-  &google_protobuf_FieldOptions__fields[0],
-  UPB_SIZE(24, 32), 8, kUpb_ExtMode_Extendable, 3, 255, 0,
-};
-
-static const upb_MiniTable_Sub google_protobuf_OneofOptions_submsgs[1] = {
-  {.submsg = &google_protobuf_UninterpretedOption_msginit},
-};
-
-static const upb_MiniTable_Field google_protobuf_OneofOptions__fields[1] = {
-  {999, UPB_SIZE(0, 0), UPB_SIZE(0, 0), 0, 11, kUpb_FieldMode_Array | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_OneofOptions_msginit = {
-  &google_protobuf_OneofOptions_submsgs[0],
-  &google_protobuf_OneofOptions__fields[0],
-  UPB_SIZE(8, 8), 1, kUpb_ExtMode_Extendable, 0, 255, 0,
-};
-
-static const upb_MiniTable_Sub google_protobuf_EnumOptions_submsgs[1] = {
-  {.submsg = &google_protobuf_UninterpretedOption_msginit},
-};
-
-static const upb_MiniTable_Field google_protobuf_EnumOptions__fields[3] = {
-  {2, UPB_SIZE(1, 1), UPB_SIZE(1, 1), kUpb_NoSub, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(2, 2), UPB_SIZE(2, 2), kUpb_NoSub, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {999, UPB_SIZE(4, 8), UPB_SIZE(0, 0), 0, 11, kUpb_FieldMode_Array | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_EnumOptions_msginit = {
-  &google_protobuf_EnumOptions_submsgs[0],
-  &google_protobuf_EnumOptions__fields[0],
-  UPB_SIZE(8, 16), 3, kUpb_ExtMode_Extendable, 0, 255, 0,
-};
-
-static const upb_MiniTable_Sub google_protobuf_EnumValueOptions_submsgs[1] = {
-  {.submsg = &google_protobuf_UninterpretedOption_msginit},
-};
-
-static const upb_MiniTable_Field google_protobuf_EnumValueOptions__fields[2] = {
-  {1, UPB_SIZE(1, 1), UPB_SIZE(1, 1), kUpb_NoSub, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {999, UPB_SIZE(4, 8), UPB_SIZE(0, 0), 0, 11, kUpb_FieldMode_Array | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_EnumValueOptions_msginit = {
-  &google_protobuf_EnumValueOptions_submsgs[0],
-  &google_protobuf_EnumValueOptions__fields[0],
-  UPB_SIZE(8, 16), 2, kUpb_ExtMode_Extendable, 1, 255, 0,
-};
-
-static const upb_MiniTable_Sub google_protobuf_ServiceOptions_submsgs[1] = {
-  {.submsg = &google_protobuf_UninterpretedOption_msginit},
-};
-
-static const upb_MiniTable_Field google_protobuf_ServiceOptions__fields[2] = {
-  {33, UPB_SIZE(1, 1), UPB_SIZE(1, 1), kUpb_NoSub, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {999, UPB_SIZE(4, 8), UPB_SIZE(0, 0), 0, 11, kUpb_FieldMode_Array | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_ServiceOptions_msginit = {
-  &google_protobuf_ServiceOptions_submsgs[0],
-  &google_protobuf_ServiceOptions__fields[0],
-  UPB_SIZE(8, 16), 2, kUpb_ExtMode_Extendable, 0, 255, 0,
-};
-
-static const upb_MiniTable_Sub google_protobuf_MethodOptions_submsgs[2] = {
-  {.subenum = &google_protobuf_MethodOptions_IdempotencyLevel_enuminit},
-  {.submsg = &google_protobuf_UninterpretedOption_msginit},
-};
-
-static const upb_MiniTable_Field google_protobuf_MethodOptions__fields[3] = {
-  {33, UPB_SIZE(1, 1), UPB_SIZE(1, 1), kUpb_NoSub, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {34, UPB_SIZE(4, 4), UPB_SIZE(2, 2), 0, 14, kUpb_FieldMode_Scalar | (kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {999, UPB_SIZE(8, 8), UPB_SIZE(0, 0), 1, 11, kUpb_FieldMode_Array | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_MethodOptions_msginit = {
-  &google_protobuf_MethodOptions_submsgs[0],
-  &google_protobuf_MethodOptions__fields[0],
-  UPB_SIZE(16, 16), 3, kUpb_ExtMode_Extendable, 0, 255, 0,
-};
-
-static const upb_MiniTable_Sub google_protobuf_UninterpretedOption_submsgs[1] = {
-  {.submsg = &google_protobuf_UninterpretedOption_NamePart_msginit},
-};
-
-static const upb_MiniTable_Field google_protobuf_UninterpretedOption__fields[7] = {
-  {2, UPB_SIZE(4, 8), UPB_SIZE(0, 0), 0, 11, kUpb_FieldMode_Array | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(8, 16), UPB_SIZE(1, 1), kUpb_NoSub, 12, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(32, 64), UPB_SIZE(2, 2), kUpb_NoSub, 4, kUpb_FieldMode_Scalar | (kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(40, 72), UPB_SIZE(3, 3), kUpb_NoSub, 3, kUpb_FieldMode_Scalar | (kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(48, 80), UPB_SIZE(4, 4), kUpb_NoSub, 1, kUpb_FieldMode_Scalar | (kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {7, UPB_SIZE(16, 32), UPB_SIZE(5, 5), kUpb_NoSub, 12, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {8, UPB_SIZE(24, 48), UPB_SIZE(6, 6), kUpb_NoSub, 12, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_UninterpretedOption_msginit = {
-  &google_protobuf_UninterpretedOption_submsgs[0],
-  &google_protobuf_UninterpretedOption__fields[0],
-  UPB_SIZE(56, 88), 7, kUpb_ExtMode_NonExtendable, 0, 255, 0,
-};
-
-static const upb_MiniTable_Field google_protobuf_UninterpretedOption_NamePart__fields[2] = {
-  {1, UPB_SIZE(4, 8), UPB_SIZE(1, 1), kUpb_NoSub, 12, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(1, 1), UPB_SIZE(2, 2), kUpb_NoSub, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_UninterpretedOption_NamePart_msginit = {
-  NULL,
-  &google_protobuf_UninterpretedOption_NamePart__fields[0],
-  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, 255, 2,
-};
-
-static const upb_MiniTable_Sub google_protobuf_SourceCodeInfo_submsgs[1] = {
-  {.submsg = &google_protobuf_SourceCodeInfo_Location_msginit},
-};
-
-static const upb_MiniTable_Field google_protobuf_SourceCodeInfo__fields[1] = {
-  {1, UPB_SIZE(0, 0), UPB_SIZE(0, 0), 0, 11, kUpb_FieldMode_Array | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_SourceCodeInfo_msginit = {
-  &google_protobuf_SourceCodeInfo_submsgs[0],
-  &google_protobuf_SourceCodeInfo__fields[0],
-  UPB_SIZE(8, 8), 1, kUpb_ExtMode_NonExtendable, 1, 255, 0,
-};
-
-static const upb_MiniTable_Field google_protobuf_SourceCodeInfo_Location__fields[5] = {
-  {1, UPB_SIZE(4, 8), UPB_SIZE(0, 0), kUpb_NoSub, 5, kUpb_FieldMode_Array | kUpb_LabelFlags_IsPacked | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), UPB_SIZE(0, 0), kUpb_NoSub, 5, kUpb_FieldMode_Array | kUpb_LabelFlags_IsPacked | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(12, 24), UPB_SIZE(1, 1), kUpb_NoSub, 12, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(20, 40), UPB_SIZE(2, 2), kUpb_NoSub, 12, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(28, 56), UPB_SIZE(0, 0), kUpb_NoSub, 12, kUpb_FieldMode_Array | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_SourceCodeInfo_Location_msginit = {
-  NULL,
-  &google_protobuf_SourceCodeInfo_Location__fields[0],
-  UPB_SIZE(32, 64), 5, kUpb_ExtMode_NonExtendable, 4, 255, 0,
-};
-
-static const upb_MiniTable_Sub google_protobuf_GeneratedCodeInfo_submsgs[1] = {
-  {.submsg = &google_protobuf_GeneratedCodeInfo_Annotation_msginit},
-};
-
-static const upb_MiniTable_Field google_protobuf_GeneratedCodeInfo__fields[1] = {
-  {1, UPB_SIZE(0, 0), UPB_SIZE(0, 0), 0, 11, kUpb_FieldMode_Array | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_GeneratedCodeInfo_msginit = {
-  &google_protobuf_GeneratedCodeInfo_submsgs[0],
-  &google_protobuf_GeneratedCodeInfo__fields[0],
-  UPB_SIZE(8, 8), 1, kUpb_ExtMode_NonExtendable, 1, 255, 0,
-};
-
-static const upb_MiniTable_Field google_protobuf_GeneratedCodeInfo_Annotation__fields[4] = {
-  {1, UPB_SIZE(12, 16), UPB_SIZE(0, 0), kUpb_NoSub, 5, kUpb_FieldMode_Array | kUpb_LabelFlags_IsPacked | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(16, 24), UPB_SIZE(1, 1), kUpb_NoSub, 12, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(4, 4), UPB_SIZE(2, 2), kUpb_NoSub, 5, kUpb_FieldMode_Scalar | (kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(8, 8), UPB_SIZE(3, 3), kUpb_NoSub, 5, kUpb_FieldMode_Scalar | (kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_GeneratedCodeInfo_Annotation_msginit = {
-  NULL,
-  &google_protobuf_GeneratedCodeInfo_Annotation__fields[0],
-  UPB_SIZE(24, 40), 4, kUpb_ExtMode_NonExtendable, 4, 255, 0,
-};
-
-static const upb_MiniTable *messages_layout[27] = {
-  &google_protobuf_FileDescriptorSet_msginit,
-  &google_protobuf_FileDescriptorProto_msginit,
-  &google_protobuf_DescriptorProto_msginit,
-  &google_protobuf_DescriptorProto_ExtensionRange_msginit,
-  &google_protobuf_DescriptorProto_ReservedRange_msginit,
-  &google_protobuf_ExtensionRangeOptions_msginit,
-  &google_protobuf_FieldDescriptorProto_msginit,
-  &google_protobuf_OneofDescriptorProto_msginit,
-  &google_protobuf_EnumDescriptorProto_msginit,
-  &google_protobuf_EnumDescriptorProto_EnumReservedRange_msginit,
-  &google_protobuf_EnumValueDescriptorProto_msginit,
-  &google_protobuf_ServiceDescriptorProto_msginit,
-  &google_protobuf_MethodDescriptorProto_msginit,
-  &google_protobuf_FileOptions_msginit,
-  &google_protobuf_MessageOptions_msginit,
-  &google_protobuf_FieldOptions_msginit,
-  &google_protobuf_OneofOptions_msginit,
-  &google_protobuf_EnumOptions_msginit,
-  &google_protobuf_EnumValueOptions_msginit,
-  &google_protobuf_ServiceOptions_msginit,
-  &google_protobuf_MethodOptions_msginit,
-  &google_protobuf_UninterpretedOption_msginit,
-  &google_protobuf_UninterpretedOption_NamePart_msginit,
-  &google_protobuf_SourceCodeInfo_msginit,
-  &google_protobuf_SourceCodeInfo_Location_msginit,
-  &google_protobuf_GeneratedCodeInfo_msginit,
-  &google_protobuf_GeneratedCodeInfo_Annotation_msginit,
-};
-
-const upb_MiniTable_Enum google_protobuf_FieldDescriptorProto_Type_enuminit = {
-    NULL,
-    0x7fffeULL,
-    0,
-};
-
-const upb_MiniTable_Enum google_protobuf_FieldDescriptorProto_Label_enuminit = {
-    NULL,
-    0xeULL,
-    0,
-};
-
-const upb_MiniTable_Enum google_protobuf_FileOptions_OptimizeMode_enuminit = {
-    NULL,
-    0xeULL,
-    0,
-};
-
-const upb_MiniTable_Enum google_protobuf_FieldOptions_CType_enuminit = {
-    NULL,
-    0x7ULL,
-    0,
-};
-
-const upb_MiniTable_Enum google_protobuf_FieldOptions_JSType_enuminit = {
-    NULL,
-    0x7ULL,
-    0,
-};
-
-const upb_MiniTable_Enum google_protobuf_MethodOptions_IdempotencyLevel_enuminit = {
-    NULL,
-    0x7ULL,
-    0,
-};
-
-static const upb_MiniTable_Enum *enums_layout[6] = {
-  &google_protobuf_FieldDescriptorProto_Type_enuminit,
-  &google_protobuf_FieldDescriptorProto_Label_enuminit,
-  &google_protobuf_FileOptions_OptimizeMode_enuminit,
-  &google_protobuf_FieldOptions_CType_enuminit,
-  &google_protobuf_FieldOptions_JSType_enuminit,
-  &google_protobuf_MethodOptions_IdempotencyLevel_enuminit,
-};
-
-const upb_MiniTable_File google_protobuf_descriptor_proto_upb_file_layout = {
-  messages_layout,
-  enums_layout,
-  NULL,
-  27,
-  6,
-  0,
-};
-
-
-
-/** bazel-out/k8-fastbuild/bin/external/com_google_protobuf/google/protobuf/descriptor.upbdefs.c ************************************************************//* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     google/protobuf/descriptor.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-
-static const char descriptor[7667] = {'\n', ' ', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'd', 'e', 's', 'c', 'r', 'i', 'p', 
-'t', 'o', 'r', '.', 'p', 'r', 'o', 't', 'o', '\022', '\017', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 
-'f', '\"', 'M', '\n', '\021', 'F', 'i', 'l', 'e', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'S', 'e', 't', '\022', '8', '\n', 
-'\004', 'f', 'i', 'l', 'e', '\030', '\001', ' ', '\003', '(', '\013', '2', '$', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 
-'o', 'b', 'u', 'f', '.', 'F', 'i', 'l', 'e', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', 'R', 
-'\004', 'f', 'i', 'l', 'e', '\"', '\344', '\004', '\n', '\023', 'F', 'i', 'l', 'e', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 
-'r', 'o', 't', 'o', '\022', '\022', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\004', 'n', 'a', 'm', 'e', '\022', 
-'\030', '\n', '\007', 'p', 'a', 'c', 'k', 'a', 'g', 'e', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\007', 'p', 'a', 'c', 'k', 'a', 'g', 'e', 
-'\022', '\036', '\n', '\n', 'd', 'e', 'p', 'e', 'n', 'd', 'e', 'n', 'c', 'y', '\030', '\003', ' ', '\003', '(', '\t', 'R', '\n', 'd', 'e', 'p', 
-'e', 'n', 'd', 'e', 'n', 'c', 'y', '\022', '+', '\n', '\021', 'p', 'u', 'b', 'l', 'i', 'c', '_', 'd', 'e', 'p', 'e', 'n', 'd', 'e', 
-'n', 'c', 'y', '\030', '\n', ' ', '\003', '(', '\005', 'R', '\020', 'p', 'u', 'b', 'l', 'i', 'c', 'D', 'e', 'p', 'e', 'n', 'd', 'e', 'n', 
-'c', 'y', '\022', '\'', '\n', '\017', 'w', 'e', 'a', 'k', '_', 'd', 'e', 'p', 'e', 'n', 'd', 'e', 'n', 'c', 'y', '\030', '\013', ' ', '\003', 
-'(', '\005', 'R', '\016', 'w', 'e', 'a', 'k', 'D', 'e', 'p', 'e', 'n', 'd', 'e', 'n', 'c', 'y', '\022', 'C', '\n', '\014', 'm', 'e', 's', 
-'s', 'a', 'g', 'e', '_', 't', 'y', 'p', 'e', '\030', '\004', ' ', '\003', '(', '\013', '2', ' ', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 
-'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', 'R', 
-'\013', 'm', 'e', 's', 's', 'a', 'g', 'e', 'T', 'y', 'p', 'e', '\022', 'A', '\n', '\t', 'e', 'n', 'u', 'm', '_', 't', 'y', 'p', 'e', 
-'\030', '\005', ' ', '\003', '(', '\013', '2', '$', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 
-'E', 'n', 'u', 'm', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', 'R', '\010', 'e', 'n', 'u', 'm', 
-'T', 'y', 'p', 'e', '\022', 'A', '\n', '\007', 's', 'e', 'r', 'v', 'i', 'c', 'e', '\030', '\006', ' ', '\003', '(', '\013', '2', '\'', '.', 'g', 
-'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'S', 'e', 'r', 'v', 'i', 'c', 'e', 'D', 'e', 's', 
-'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', 'R', '\007', 's', 'e', 'r', 'v', 'i', 'c', 'e', '\022', 'C', '\n', '\t', 
-'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', '\030', '\007', ' ', '\003', '(', '\013', '2', '%', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 
-'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'i', 'e', 'l', 'd', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 
-'r', 'o', 't', 'o', 'R', '\t', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', '\022', '6', '\n', '\007', 'o', 'p', 't', 'i', 'o', 'n', 
-'s', '\030', '\010', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', 
-'.', 'F', 'i', 'l', 'e', 'O', 'p', 't', 'i', 'o', 'n', 's', 'R', '\007', 'o', 'p', 't', 'i', 'o', 'n', 's', '\022', 'I', '\n', '\020', 
-'s', 'o', 'u', 'r', 'c', 'e', '_', 'c', 'o', 'd', 'e', '_', 'i', 'n', 'f', 'o', '\030', '\t', ' ', '\001', '(', '\013', '2', '\037', '.', 
-'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'S', 'o', 'u', 'r', 'c', 'e', 'C', 'o', 'd', 
-'e', 'I', 'n', 'f', 'o', 'R', '\016', 's', 'o', 'u', 'r', 'c', 'e', 'C', 'o', 'd', 'e', 'I', 'n', 'f', 'o', '\022', '\026', '\n', '\006', 
-'s', 'y', 'n', 't', 'a', 'x', '\030', '\014', ' ', '\001', '(', '\t', 'R', '\006', 's', 'y', 'n', 't', 'a', 'x', '\"', '\271', '\006', '\n', '\017', 
-'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', '\022', '\022', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', 
-' ', '\001', '(', '\t', 'R', '\004', 'n', 'a', 'm', 'e', '\022', ';', '\n', '\005', 'f', 'i', 'e', 'l', 'd', '\030', '\002', ' ', '\003', '(', '\013', 
-'2', '%', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'i', 'e', 'l', 'd', 'D', 
-'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', 'R', '\005', 'f', 'i', 'e', 'l', 'd', '\022', 'C', '\n', '\t', 
-'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', '\030', '\006', ' ', '\003', '(', '\013', '2', '%', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 
-'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'i', 'e', 'l', 'd', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 
-'r', 'o', 't', 'o', 'R', '\t', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', '\022', 'A', '\n', '\013', 'n', 'e', 's', 't', 'e', 'd', 
-'_', 't', 'y', 'p', 'e', '\030', '\003', ' ', '\003', '(', '\013', '2', ' ', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 
-'o', 'b', 'u', 'f', '.', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', 'R', '\n', 'n', 'e', 's', 
-'t', 'e', 'd', 'T', 'y', 'p', 'e', '\022', 'A', '\n', '\t', 'e', 'n', 'u', 'm', '_', 't', 'y', 'p', 'e', '\030', '\004', ' ', '\003', '(', 
-'\013', '2', '$', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'E', 'n', 'u', 'm', 'D', 
-'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', 'R', '\010', 'e', 'n', 'u', 'm', 'T', 'y', 'p', 'e', '\022', 
-'X', '\n', '\017', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', '_', 'r', 'a', 'n', 'g', 'e', '\030', '\005', ' ', '\003', '(', '\013', '2', 
-'/', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'e', 's', 'c', 'r', 'i', 'p', 
-'t', 'o', 'r', 'P', 'r', 'o', 't', 'o', '.', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'R', 'a', 'n', 'g', 'e', 'R', '\016', 
-'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'R', 'a', 'n', 'g', 'e', '\022', 'D', '\n', '\n', 'o', 'n', 'e', 'o', 'f', '_', 'd', 
-'e', 'c', 'l', '\030', '\010', ' ', '\003', '(', '\013', '2', '%', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 
-'u', 'f', '.', 'O', 'n', 'e', 'o', 'f', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', 'R', '\t', 
-'o', 'n', 'e', 'o', 'f', 'D', 'e', 'c', 'l', '\022', '9', '\n', '\007', 'o', 'p', 't', 'i', 'o', 'n', 's', '\030', '\007', ' ', '\001', '(', 
-'\013', '2', '\037', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'M', 'e', 's', 's', 'a', 
-'g', 'e', 'O', 'p', 't', 'i', 'o', 'n', 's', 'R', '\007', 'o', 'p', 't', 'i', 'o', 'n', 's', '\022', 'U', '\n', '\016', 'r', 'e', 's', 
-'e', 'r', 'v', 'e', 'd', '_', 'r', 'a', 'n', 'g', 'e', '\030', '\t', ' ', '\003', '(', '\013', '2', '.', '.', 'g', 'o', 'o', 'g', 'l', 
-'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 
-'o', '.', 'R', 'e', 's', 'e', 'r', 'v', 'e', 'd', 'R', 'a', 'n', 'g', 'e', 'R', '\r', 'r', 'e', 's', 'e', 'r', 'v', 'e', 'd', 
-'R', 'a', 'n', 'g', 'e', '\022', '#', '\n', '\r', 'r', 'e', 's', 'e', 'r', 'v', 'e', 'd', '_', 'n', 'a', 'm', 'e', '\030', '\n', ' ', 
-'\003', '(', '\t', 'R', '\014', 'r', 'e', 's', 'e', 'r', 'v', 'e', 'd', 'N', 'a', 'm', 'e', '\032', 'z', '\n', '\016', 'E', 'x', 't', 'e', 
-'n', 's', 'i', 'o', 'n', 'R', 'a', 'n', 'g', 'e', '\022', '\024', '\n', '\005', 's', 't', 'a', 'r', 't', '\030', '\001', ' ', '\001', '(', '\005', 
-'R', '\005', 's', 't', 'a', 'r', 't', '\022', '\020', '\n', '\003', 'e', 'n', 'd', '\030', '\002', ' ', '\001', '(', '\005', 'R', '\003', 'e', 'n', 'd', 
-'\022', '@', '\n', '\007', 'o', 'p', 't', 'i', 'o', 'n', 's', '\030', '\003', ' ', '\001', '(', '\013', '2', '&', '.', 'g', 'o', 'o', 'g', 'l', 
-'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'R', 'a', 'n', 'g', 'e', 
-'O', 'p', 't', 'i', 'o', 'n', 's', 'R', '\007', 'o', 'p', 't', 'i', 'o', 'n', 's', '\032', '7', '\n', '\r', 'R', 'e', 's', 'e', 'r', 
-'v', 'e', 'd', 'R', 'a', 'n', 'g', 'e', '\022', '\024', '\n', '\005', 's', 't', 'a', 'r', 't', '\030', '\001', ' ', '\001', '(', '\005', 'R', '\005', 
-'s', 't', 'a', 'r', 't', '\022', '\020', '\n', '\003', 'e', 'n', 'd', '\030', '\002', ' ', '\001', '(', '\005', 'R', '\003', 'e', 'n', 'd', '\"', '|', 
-'\n', '\025', 'E', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', 'R', 'a', 'n', 'g', 'e', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', 'X', 
-'\n', '\024', 'u', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', '_', 'o', 'p', 't', 'i', 'o', 'n', '\030', '\347', '\007', 
-' ', '\003', '(', '\013', '2', '$', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'n', 
-'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', 'R', '\023', 'u', 'n', 'i', 'n', 't', 'e', 
-'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', '*', '\t', '\010', '\350', '\007', '\020', '\200', '\200', '\200', '\200', '\002', '\"', 
-'\301', '\006', '\n', '\024', 'F', 'i', 'e', 'l', 'd', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', '\022', 
-'\022', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\004', 'n', 'a', 'm', 'e', '\022', '\026', '\n', '\006', 'n', 'u', 
-'m', 'b', 'e', 'r', '\030', '\003', ' ', '\001', '(', '\005', 'R', '\006', 'n', 'u', 'm', 'b', 'e', 'r', '\022', 'A', '\n', '\005', 'l', 'a', 'b', 
-'e', 'l', '\030', '\004', ' ', '\001', '(', '\016', '2', '+', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 
-'f', '.', 'F', 'i', 'e', 'l', 'd', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', '.', 'L', 'a', 
-'b', 'e', 'l', 'R', '\005', 'l', 'a', 'b', 'e', 'l', '\022', '>', '\n', '\004', 't', 'y', 'p', 'e', '\030', '\005', ' ', '\001', '(', '\016', '2', 
-'*', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'i', 'e', 'l', 'd', 'D', 'e', 
-'s', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', '.', 'T', 'y', 'p', 'e', 'R', '\004', 't', 'y', 'p', 'e', '\022', 
-'\033', '\n', '\t', 't', 'y', 'p', 'e', '_', 'n', 'a', 'm', 'e', '\030', '\006', ' ', '\001', '(', '\t', 'R', '\010', 't', 'y', 'p', 'e', 'N', 
-'a', 'm', 'e', '\022', '\032', '\n', '\010', 'e', 'x', 't', 'e', 'n', 'd', 'e', 'e', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\010', 'e', 'x', 
-'t', 'e', 'n', 'd', 'e', 'e', '\022', '#', '\n', '\r', 'd', 'e', 'f', 'a', 'u', 'l', 't', '_', 'v', 'a', 'l', 'u', 'e', '\030', '\007', 
-' ', '\001', '(', '\t', 'R', '\014', 'd', 'e', 'f', 'a', 'u', 'l', 't', 'V', 'a', 'l', 'u', 'e', '\022', '\037', '\n', '\013', 'o', 'n', 'e', 
-'o', 'f', '_', 'i', 'n', 'd', 'e', 'x', '\030', '\t', ' ', '\001', '(', '\005', 'R', '\n', 'o', 'n', 'e', 'o', 'f', 'I', 'n', 'd', 'e', 
-'x', '\022', '\033', '\n', '\t', 'j', 's', 'o', 'n', '_', 'n', 'a', 'm', 'e', '\030', '\n', ' ', '\001', '(', '\t', 'R', '\010', 'j', 's', 'o', 
-'n', 'N', 'a', 'm', 'e', '\022', '7', '\n', '\007', 'o', 'p', 't', 'i', 'o', 'n', 's', '\030', '\010', ' ', '\001', '(', '\013', '2', '\035', '.', 
-'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'i', 'e', 'l', 'd', 'O', 'p', 't', 'i', 
-'o', 'n', 's', 'R', '\007', 'o', 'p', 't', 'i', 'o', 'n', 's', '\022', '\'', '\n', '\017', 'p', 'r', 'o', 't', 'o', '3', '_', 'o', 'p', 
-'t', 'i', 'o', 'n', 'a', 'l', '\030', '\021', ' ', '\001', '(', '\010', 'R', '\016', 'p', 'r', 'o', 't', 'o', '3', 'O', 'p', 't', 'i', 'o', 
-'n', 'a', 'l', '\"', '\266', '\002', '\n', '\004', 'T', 'y', 'p', 'e', '\022', '\017', '\n', '\013', 'T', 'Y', 'P', 'E', '_', 'D', 'O', 'U', 'B', 
-'L', 'E', '\020', '\001', '\022', '\016', '\n', '\n', 'T', 'Y', 'P', 'E', '_', 'F', 'L', 'O', 'A', 'T', '\020', '\002', '\022', '\016', '\n', '\n', 'T', 
-'Y', 'P', 'E', '_', 'I', 'N', 'T', '6', '4', '\020', '\003', '\022', '\017', '\n', '\013', 'T', 'Y', 'P', 'E', '_', 'U', 'I', 'N', 'T', '6', 
-'4', '\020', '\004', '\022', '\016', '\n', '\n', 'T', 'Y', 'P', 'E', '_', 'I', 'N', 'T', '3', '2', '\020', '\005', '\022', '\020', '\n', '\014', 'T', 'Y', 
-'P', 'E', '_', 'F', 'I', 'X', 'E', 'D', '6', '4', '\020', '\006', '\022', '\020', '\n', '\014', 'T', 'Y', 'P', 'E', '_', 'F', 'I', 'X', 'E', 
-'D', '3', '2', '\020', '\007', '\022', '\r', '\n', '\t', 'T', 'Y', 'P', 'E', '_', 'B', 'O', 'O', 'L', '\020', '\010', '\022', '\017', '\n', '\013', 'T', 
-'Y', 'P', 'E', '_', 'S', 'T', 'R', 'I', 'N', 'G', '\020', '\t', '\022', '\016', '\n', '\n', 'T', 'Y', 'P', 'E', '_', 'G', 'R', 'O', 'U', 
-'P', '\020', '\n', '\022', '\020', '\n', '\014', 'T', 'Y', 'P', 'E', '_', 'M', 'E', 'S', 'S', 'A', 'G', 'E', '\020', '\013', '\022', '\016', '\n', '\n', 
-'T', 'Y', 'P', 'E', '_', 'B', 'Y', 'T', 'E', 'S', '\020', '\014', '\022', '\017', '\n', '\013', 'T', 'Y', 'P', 'E', '_', 'U', 'I', 'N', 'T', 
-'3', '2', '\020', '\r', '\022', '\r', '\n', '\t', 'T', 'Y', 'P', 'E', '_', 'E', 'N', 'U', 'M', '\020', '\016', '\022', '\021', '\n', '\r', 'T', 'Y', 
-'P', 'E', '_', 'S', 'F', 'I', 'X', 'E', 'D', '3', '2', '\020', '\017', '\022', '\021', '\n', '\r', 'T', 'Y', 'P', 'E', '_', 'S', 'F', 'I', 
-'X', 'E', 'D', '6', '4', '\020', '\020', '\022', '\017', '\n', '\013', 'T', 'Y', 'P', 'E', '_', 'S', 'I', 'N', 'T', '3', '2', '\020', '\021', '\022', 
-'\017', '\n', '\013', 'T', 'Y', 'P', 'E', '_', 'S', 'I', 'N', 'T', '6', '4', '\020', '\022', '\"', 'C', '\n', '\005', 'L', 'a', 'b', 'e', 'l', 
-'\022', '\022', '\n', '\016', 'L', 'A', 'B', 'E', 'L', '_', 'O', 'P', 'T', 'I', 'O', 'N', 'A', 'L', '\020', '\001', '\022', '\022', '\n', '\016', 'L', 
-'A', 'B', 'E', 'L', '_', 'R', 'E', 'Q', 'U', 'I', 'R', 'E', 'D', '\020', '\002', '\022', '\022', '\n', '\016', 'L', 'A', 'B', 'E', 'L', '_', 
-'R', 'E', 'P', 'E', 'A', 'T', 'E', 'D', '\020', '\003', '\"', 'c', '\n', '\024', 'O', 'n', 'e', 'o', 'f', 'D', 'e', 's', 'c', 'r', 'i', 
-'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', '\022', '\022', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\004', 
-'n', 'a', 'm', 'e', '\022', '7', '\n', '\007', 'o', 'p', 't', 'i', 'o', 'n', 's', '\030', '\002', ' ', '\001', '(', '\013', '2', '\035', '.', 'g', 
-'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'O', 'n', 'e', 'o', 'f', 'O', 'p', 't', 'i', 'o', 
-'n', 's', 'R', '\007', 'o', 'p', 't', 'i', 'o', 'n', 's', '\"', '\343', '\002', '\n', '\023', 'E', 'n', 'u', 'm', 'D', 'e', 's', 'c', 'r', 
-'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', '\022', '\022', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'R', 
-'\004', 'n', 'a', 'm', 'e', '\022', '?', '\n', '\005', 'v', 'a', 'l', 'u', 'e', '\030', '\002', ' ', '\003', '(', '\013', '2', ')', '.', 'g', 'o', 
-'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'E', 'n', 'u', 'm', 'V', 'a', 'l', 'u', 'e', 'D', 'e', 
-'s', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', 'R', '\005', 'v', 'a', 'l', 'u', 'e', '\022', '6', '\n', '\007', 'o', 
-'p', 't', 'i', 'o', 'n', 's', '\030', '\003', ' ', '\001', '(', '\013', '2', '\034', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 
-'t', 'o', 'b', 'u', 'f', '.', 'E', 'n', 'u', 'm', 'O', 'p', 't', 'i', 'o', 'n', 's', 'R', '\007', 'o', 'p', 't', 'i', 'o', 'n', 
-'s', '\022', ']', '\n', '\016', 'r', 'e', 's', 'e', 'r', 'v', 'e', 'd', '_', 'r', 'a', 'n', 'g', 'e', '\030', '\004', ' ', '\003', '(', '\013', 
-'2', '6', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'E', 'n', 'u', 'm', 'D', 'e', 
-'s', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', '.', 'E', 'n', 'u', 'm', 'R', 'e', 's', 'e', 'r', 'v', 'e', 
-'d', 'R', 'a', 'n', 'g', 'e', 'R', '\r', 'r', 'e', 's', 'e', 'r', 'v', 'e', 'd', 'R', 'a', 'n', 'g', 'e', '\022', '#', '\n', '\r', 
-'r', 'e', 's', 'e', 'r', 'v', 'e', 'd', '_', 'n', 'a', 'm', 'e', '\030', '\005', ' ', '\003', '(', '\t', 'R', '\014', 'r', 'e', 's', 'e', 
-'r', 'v', 'e', 'd', 'N', 'a', 'm', 'e', '\032', ';', '\n', '\021', 'E', 'n', 'u', 'm', 'R', 'e', 's', 'e', 'r', 'v', 'e', 'd', 'R', 
-'a', 'n', 'g', 'e', '\022', '\024', '\n', '\005', 's', 't', 'a', 'r', 't', '\030', '\001', ' ', '\001', '(', '\005', 'R', '\005', 's', 't', 'a', 'r', 
-'t', '\022', '\020', '\n', '\003', 'e', 'n', 'd', '\030', '\002', ' ', '\001', '(', '\005', 'R', '\003', 'e', 'n', 'd', '\"', '\203', '\001', '\n', '\030', 'E', 
-'n', 'u', 'm', 'V', 'a', 'l', 'u', 'e', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', '\022', '\022', 
-'\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\004', 'n', 'a', 'm', 'e', '\022', '\026', '\n', '\006', 'n', 'u', 'm', 
-'b', 'e', 'r', '\030', '\002', ' ', '\001', '(', '\005', 'R', '\006', 'n', 'u', 'm', 'b', 'e', 'r', '\022', ';', '\n', '\007', 'o', 'p', 't', 'i', 
-'o', 'n', 's', '\030', '\003', ' ', '\001', '(', '\013', '2', '!', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 
-'u', 'f', '.', 'E', 'n', 'u', 'm', 'V', 'a', 'l', 'u', 'e', 'O', 'p', 't', 'i', 'o', 'n', 's', 'R', '\007', 'o', 'p', 't', 'i', 
-'o', 'n', 's', '\"', '\247', '\001', '\n', '\026', 'S', 'e', 'r', 'v', 'i', 'c', 'e', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 
-'P', 'r', 'o', 't', 'o', '\022', '\022', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\004', 'n', 'a', 'm', 'e', 
-'\022', '>', '\n', '\006', 'm', 'e', 't', 'h', 'o', 'd', '\030', '\002', ' ', '\003', '(', '\013', '2', '&', '.', 'g', 'o', 'o', 'g', 'l', 'e', 
-'.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'M', 'e', 't', 'h', 'o', 'd', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 
-'r', 'P', 'r', 'o', 't', 'o', 'R', '\006', 'm', 'e', 't', 'h', 'o', 'd', '\022', '9', '\n', '\007', 'o', 'p', 't', 'i', 'o', 'n', 's', 
-'\030', '\003', ' ', '\001', '(', '\013', '2', '\037', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 
-'S', 'e', 'r', 'v', 'i', 'c', 'e', 'O', 'p', 't', 'i', 'o', 'n', 's', 'R', '\007', 'o', 'p', 't', 'i', 'o', 'n', 's', '\"', '\211', 
-'\002', '\n', '\025', 'M', 'e', 't', 'h', 'o', 'd', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 'r', 'o', 't', 'o', '\022', 
-'\022', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\004', 'n', 'a', 'm', 'e', '\022', '\035', '\n', '\n', 'i', 'n', 
-'p', 'u', 't', '_', 't', 'y', 'p', 'e', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\t', 'i', 'n', 'p', 'u', 't', 'T', 'y', 'p', 'e', 
-'\022', '\037', '\n', '\013', 'o', 'u', 't', 'p', 'u', 't', '_', 't', 'y', 'p', 'e', '\030', '\003', ' ', '\001', '(', '\t', 'R', '\n', 'o', 'u', 
-'t', 'p', 'u', 't', 'T', 'y', 'p', 'e', '\022', '8', '\n', '\007', 'o', 'p', 't', 'i', 'o', 'n', 's', '\030', '\004', ' ', '\001', '(', '\013', 
-'2', '\036', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'M', 'e', 't', 'h', 'o', 'd', 
-'O', 'p', 't', 'i', 'o', 'n', 's', 'R', '\007', 'o', 'p', 't', 'i', 'o', 'n', 's', '\022', '0', '\n', '\020', 'c', 'l', 'i', 'e', 'n', 
-'t', '_', 's', 't', 'r', 'e', 'a', 'm', 'i', 'n', 'g', '\030', '\005', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', 
-'\017', 'c', 'l', 'i', 'e', 'n', 't', 'S', 't', 'r', 'e', 'a', 'm', 'i', 'n', 'g', '\022', '0', '\n', '\020', 's', 'e', 'r', 'v', 'e', 
-'r', '_', 's', 't', 'r', 'e', 'a', 'm', 'i', 'n', 'g', '\030', '\006', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', 
-'\017', 's', 'e', 'r', 'v', 'e', 'r', 'S', 't', 'r', 'e', 'a', 'm', 'i', 'n', 'g', '\"', '\221', '\t', '\n', '\013', 'F', 'i', 'l', 'e', 
-'O', 'p', 't', 'i', 'o', 'n', 's', '\022', '!', '\n', '\014', 'j', 'a', 'v', 'a', '_', 'p', 'a', 'c', 'k', 'a', 'g', 'e', '\030', '\001', 
-' ', '\001', '(', '\t', 'R', '\013', 'j', 'a', 'v', 'a', 'P', 'a', 'c', 'k', 'a', 'g', 'e', '\022', '0', '\n', '\024', 'j', 'a', 'v', 'a', 
-'_', 'o', 'u', 't', 'e', 'r', '_', 'c', 'l', 'a', 's', 's', 'n', 'a', 'm', 'e', '\030', '\010', ' ', '\001', '(', '\t', 'R', '\022', 'j', 
-'a', 'v', 'a', 'O', 'u', 't', 'e', 'r', 'C', 'l', 'a', 's', 's', 'n', 'a', 'm', 'e', '\022', '5', '\n', '\023', 'j', 'a', 'v', 'a', 
-'_', 'm', 'u', 'l', 't', 'i', 'p', 'l', 'e', '_', 'f', 'i', 'l', 'e', 's', '\030', '\n', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 
-'l', 's', 'e', 'R', '\021', 'j', 'a', 'v', 'a', 'M', 'u', 'l', 't', 'i', 'p', 'l', 'e', 'F', 'i', 'l', 'e', 's', '\022', 'D', '\n', 
-'\035', 'j', 'a', 'v', 'a', '_', 'g', 'e', 'n', 'e', 'r', 'a', 't', 'e', '_', 'e', 'q', 'u', 'a', 'l', 's', '_', 'a', 'n', 'd', 
-'_', 'h', 'a', 's', 'h', '\030', '\024', ' ', '\001', '(', '\010', 'B', '\002', '\030', '\001', 'R', '\031', 'j', 'a', 'v', 'a', 'G', 'e', 'n', 'e', 
-'r', 'a', 't', 'e', 'E', 'q', 'u', 'a', 'l', 's', 'A', 'n', 'd', 'H', 'a', 's', 'h', '\022', ':', '\n', '\026', 'j', 'a', 'v', 'a', 
-'_', 's', 't', 'r', 'i', 'n', 'g', '_', 'c', 'h', 'e', 'c', 'k', '_', 'u', 't', 'f', '8', '\030', '\033', ' ', '\001', '(', '\010', ':', 
-'\005', 'f', 'a', 'l', 's', 'e', 'R', '\023', 'j', 'a', 'v', 'a', 'S', 't', 'r', 'i', 'n', 'g', 'C', 'h', 'e', 'c', 'k', 'U', 't', 
-'f', '8', '\022', 'S', '\n', '\014', 'o', 'p', 't', 'i', 'm', 'i', 'z', 'e', '_', 'f', 'o', 'r', '\030', '\t', ' ', '\001', '(', '\016', '2', 
-')', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'i', 'l', 'e', 'O', 'p', 't', 
-'i', 'o', 'n', 's', '.', 'O', 'p', 't', 'i', 'm', 'i', 'z', 'e', 'M', 'o', 'd', 'e', ':', '\005', 'S', 'P', 'E', 'E', 'D', 'R', 
-'\013', 'o', 'p', 't', 'i', 'm', 'i', 'z', 'e', 'F', 'o', 'r', '\022', '\035', '\n', '\n', 'g', 'o', '_', 'p', 'a', 'c', 'k', 'a', 'g', 
-'e', '\030', '\013', ' ', '\001', '(', '\t', 'R', '\t', 'g', 'o', 'P', 'a', 'c', 'k', 'a', 'g', 'e', '\022', '5', '\n', '\023', 'c', 'c', '_', 
-'g', 'e', 'n', 'e', 'r', 'i', 'c', '_', 's', 'e', 'r', 'v', 'i', 'c', 'e', 's', '\030', '\020', ' ', '\001', '(', '\010', ':', '\005', 'f', 
-'a', 'l', 's', 'e', 'R', '\021', 'c', 'c', 'G', 'e', 'n', 'e', 'r', 'i', 'c', 'S', 'e', 'r', 'v', 'i', 'c', 'e', 's', '\022', '9', 
-'\n', '\025', 'j', 'a', 'v', 'a', '_', 'g', 'e', 'n', 'e', 'r', 'i', 'c', '_', 's', 'e', 'r', 'v', 'i', 'c', 'e', 's', '\030', '\021', 
-' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\023', 'j', 'a', 'v', 'a', 'G', 'e', 'n', 'e', 'r', 'i', 'c', 'S', 
-'e', 'r', 'v', 'i', 'c', 'e', 's', '\022', '5', '\n', '\023', 'p', 'y', '_', 'g', 'e', 'n', 'e', 'r', 'i', 'c', '_', 's', 'e', 'r', 
-'v', 'i', 'c', 'e', 's', '\030', '\022', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\021', 'p', 'y', 'G', 'e', 'n', 
-'e', 'r', 'i', 'c', 'S', 'e', 'r', 'v', 'i', 'c', 'e', 's', '\022', '7', '\n', '\024', 'p', 'h', 'p', '_', 'g', 'e', 'n', 'e', 'r', 
-'i', 'c', '_', 's', 'e', 'r', 'v', 'i', 'c', 'e', 's', '\030', '*', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', 
-'\022', 'p', 'h', 'p', 'G', 'e', 'n', 'e', 'r', 'i', 'c', 'S', 'e', 'r', 'v', 'i', 'c', 'e', 's', '\022', '%', '\n', '\n', 'd', 'e', 
-'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', '\030', '\027', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\n', 'd', 'e', 
-'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', '\022', '.', '\n', '\020', 'c', 'c', '_', 'e', 'n', 'a', 'b', 'l', 'e', '_', 'a', 'r', 'e', 
-'n', 'a', 's', '\030', '\037', ' ', '\001', '(', '\010', ':', '\004', 't', 'r', 'u', 'e', 'R', '\016', 'c', 'c', 'E', 'n', 'a', 'b', 'l', 'e', 
-'A', 'r', 'e', 'n', 'a', 's', '\022', '*', '\n', '\021', 'o', 'b', 'j', 'c', '_', 'c', 'l', 'a', 's', 's', '_', 'p', 'r', 'e', 'f', 
-'i', 'x', '\030', '$', ' ', '\001', '(', '\t', 'R', '\017', 'o', 'b', 'j', 'c', 'C', 'l', 'a', 's', 's', 'P', 'r', 'e', 'f', 'i', 'x', 
-'\022', ')', '\n', '\020', 'c', 's', 'h', 'a', 'r', 'p', '_', 'n', 'a', 'm', 'e', 's', 'p', 'a', 'c', 'e', '\030', '%', ' ', '\001', '(', 
-'\t', 'R', '\017', 'c', 's', 'h', 'a', 'r', 'p', 'N', 'a', 'm', 'e', 's', 'p', 'a', 'c', 'e', '\022', '!', '\n', '\014', 's', 'w', 'i', 
-'f', 't', '_', 'p', 'r', 'e', 'f', 'i', 'x', '\030', '\'', ' ', '\001', '(', '\t', 'R', '\013', 's', 'w', 'i', 'f', 't', 'P', 'r', 'e', 
-'f', 'i', 'x', '\022', '(', '\n', '\020', 'p', 'h', 'p', '_', 'c', 'l', 'a', 's', 's', '_', 'p', 'r', 'e', 'f', 'i', 'x', '\030', '(', 
-' ', '\001', '(', '\t', 'R', '\016', 'p', 'h', 'p', 'C', 'l', 'a', 's', 's', 'P', 'r', 'e', 'f', 'i', 'x', '\022', '#', '\n', '\r', 'p', 
-'h', 'p', '_', 'n', 'a', 'm', 'e', 's', 'p', 'a', 'c', 'e', '\030', ')', ' ', '\001', '(', '\t', 'R', '\014', 'p', 'h', 'p', 'N', 'a', 
-'m', 'e', 's', 'p', 'a', 'c', 'e', '\022', '4', '\n', '\026', 'p', 'h', 'p', '_', 'm', 'e', 't', 'a', 'd', 'a', 't', 'a', '_', 'n', 
-'a', 'm', 'e', 's', 'p', 'a', 'c', 'e', '\030', ',', ' ', '\001', '(', '\t', 'R', '\024', 'p', 'h', 'p', 'M', 'e', 't', 'a', 'd', 'a', 
-'t', 'a', 'N', 'a', 'm', 'e', 's', 'p', 'a', 'c', 'e', '\022', '!', '\n', '\014', 'r', 'u', 'b', 'y', '_', 'p', 'a', 'c', 'k', 'a', 
-'g', 'e', '\030', '-', ' ', '\001', '(', '\t', 'R', '\013', 'r', 'u', 'b', 'y', 'P', 'a', 'c', 'k', 'a', 'g', 'e', '\022', 'X', '\n', '\024', 
-'u', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', '_', 'o', 'p', 't', 'i', 'o', 'n', '\030', '\347', '\007', ' ', '\003', 
-'(', '\013', '2', '$', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'n', 'i', 'n', 
-'t', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', 'R', '\023', 'u', 'n', 'i', 'n', 't', 'e', 'r', 'p', 
-'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', '\"', ':', '\n', '\014', 'O', 'p', 't', 'i', 'm', 'i', 'z', 'e', 'M', 'o', 
-'d', 'e', '\022', '\t', '\n', '\005', 'S', 'P', 'E', 'E', 'D', '\020', '\001', '\022', '\r', '\n', '\t', 'C', 'O', 'D', 'E', '_', 'S', 'I', 'Z', 
-'E', '\020', '\002', '\022', '\020', '\n', '\014', 'L', 'I', 'T', 'E', '_', 'R', 'U', 'N', 'T', 'I', 'M', 'E', '\020', '\003', '*', '\t', '\010', '\350', 
-'\007', '\020', '\200', '\200', '\200', '\200', '\002', 'J', '\004', '\010', '&', '\020', '\'', '\"', '\343', '\002', '\n', '\016', 'M', 'e', 's', 's', 'a', 'g', 'e', 
-'O', 'p', 't', 'i', 'o', 'n', 's', '\022', '<', '\n', '\027', 'm', 'e', 's', 's', 'a', 'g', 'e', '_', 's', 'e', 't', '_', 'w', 'i', 
-'r', 'e', '_', 'f', 'o', 'r', 'm', 'a', 't', '\030', '\001', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\024', 'm', 
-'e', 's', 's', 'a', 'g', 'e', 'S', 'e', 't', 'W', 'i', 'r', 'e', 'F', 'o', 'r', 'm', 'a', 't', '\022', 'L', '\n', '\037', 'n', 'o', 
-'_', 's', 't', 'a', 'n', 'd', 'a', 'r', 'd', '_', 'd', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', '_', 'a', 'c', 'c', 'e', 
-'s', 's', 'o', 'r', '\030', '\002', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\034', 'n', 'o', 'S', 't', 'a', 'n', 
-'d', 'a', 'r', 'd', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'A', 'c', 'c', 'e', 's', 's', 'o', 'r', '\022', '%', '\n', 
-'\n', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', '\030', '\003', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', 
-'\n', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', '\022', '\033', '\n', '\t', 'm', 'a', 'p', '_', 'e', 'n', 't', 'r', 'y', '\030', 
-'\007', ' ', '\001', '(', '\010', 'R', '\010', 'm', 'a', 'p', 'E', 'n', 't', 'r', 'y', '\022', 'X', '\n', '\024', 'u', 'n', 'i', 'n', 't', 'e', 
-'r', 'p', 'r', 'e', 't', 'e', 'd', '_', 'o', 'p', 't', 'i', 'o', 'n', '\030', '\347', '\007', ' ', '\003', '(', '\013', '2', '$', '.', 'g', 
-'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 
-'t', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', 'R', '\023', 'u', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 
-'p', 't', 'i', 'o', 'n', '*', '\t', '\010', '\350', '\007', '\020', '\200', '\200', '\200', '\200', '\002', 'J', '\004', '\010', '\004', '\020', '\005', 'J', '\004', '\010', 
-'\005', '\020', '\006', 'J', '\004', '\010', '\006', '\020', '\007', 'J', '\004', '\010', '\010', '\020', '\t', 'J', '\004', '\010', '\t', '\020', '\n', '\"', '\222', '\004', '\n', 
-'\014', 'F', 'i', 'e', 'l', 'd', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', 'A', '\n', '\005', 'c', 't', 'y', 'p', 'e', '\030', '\001', ' ', 
-'\001', '(', '\016', '2', '#', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'i', 'e', 
-'l', 'd', 'O', 'p', 't', 'i', 'o', 'n', 's', '.', 'C', 'T', 'y', 'p', 'e', ':', '\006', 'S', 'T', 'R', 'I', 'N', 'G', 'R', '\005', 
-'c', 't', 'y', 'p', 'e', '\022', '\026', '\n', '\006', 'p', 'a', 'c', 'k', 'e', 'd', '\030', '\002', ' ', '\001', '(', '\010', 'R', '\006', 'p', 'a', 
-'c', 'k', 'e', 'd', '\022', 'G', '\n', '\006', 'j', 's', 't', 'y', 'p', 'e', '\030', '\006', ' ', '\001', '(', '\016', '2', '$', '.', 'g', 'o', 
-'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'i', 'e', 'l', 'd', 'O', 'p', 't', 'i', 'o', 'n', 
-'s', '.', 'J', 'S', 'T', 'y', 'p', 'e', ':', '\t', 'J', 'S', '_', 'N', 'O', 'R', 'M', 'A', 'L', 'R', '\006', 'j', 's', 't', 'y', 
-'p', 'e', '\022', '\031', '\n', '\004', 'l', 'a', 'z', 'y', '\030', '\005', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\004', 
-'l', 'a', 'z', 'y', '\022', '.', '\n', '\017', 'u', 'n', 'v', 'e', 'r', 'i', 'f', 'i', 'e', 'd', '_', 'l', 'a', 'z', 'y', '\030', '\017', 
-' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\016', 'u', 'n', 'v', 'e', 'r', 'i', 'f', 'i', 'e', 'd', 'L', 'a', 
-'z', 'y', '\022', '%', '\n', '\n', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', '\030', '\003', ' ', '\001', '(', '\010', ':', '\005', 'f', 
-'a', 'l', 's', 'e', 'R', '\n', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', '\022', '\031', '\n', '\004', 'w', 'e', 'a', 'k', '\030', 
-'\n', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\004', 'w', 'e', 'a', 'k', '\022', 'X', '\n', '\024', 'u', 'n', 'i', 
-'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', '_', 'o', 'p', 't', 'i', 'o', 'n', '\030', '\347', '\007', ' ', '\003', '(', '\013', '2', 
-'$', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'n', 'i', 'n', 't', 'e', 'r', 
-'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', 'R', '\023', 'u', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 
-'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', '\"', '/', '\n', '\005', 'C', 'T', 'y', 'p', 'e', '\022', '\n', '\n', '\006', 'S', 'T', 'R', 'I', 
-'N', 'G', '\020', '\000', '\022', '\010', '\n', '\004', 'C', 'O', 'R', 'D', '\020', '\001', '\022', '\020', '\n', '\014', 'S', 'T', 'R', 'I', 'N', 'G', '_', 
-'P', 'I', 'E', 'C', 'E', '\020', '\002', '\"', '5', '\n', '\006', 'J', 'S', 'T', 'y', 'p', 'e', '\022', '\r', '\n', '\t', 'J', 'S', '_', 'N', 
-'O', 'R', 'M', 'A', 'L', '\020', '\000', '\022', '\r', '\n', '\t', 'J', 'S', '_', 'S', 'T', 'R', 'I', 'N', 'G', '\020', '\001', '\022', '\r', '\n', 
-'\t', 'J', 'S', '_', 'N', 'U', 'M', 'B', 'E', 'R', '\020', '\002', '*', '\t', '\010', '\350', '\007', '\020', '\200', '\200', '\200', '\200', '\002', 'J', '\004', 
-'\010', '\004', '\020', '\005', '\"', 's', '\n', '\014', 'O', 'n', 'e', 'o', 'f', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', 'X', '\n', '\024', 'u', 
-'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', '_', 'o', 'p', 't', 'i', 'o', 'n', '\030', '\347', '\007', ' ', '\003', '(', 
-'\013', '2', '$', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'n', 'i', 'n', 't', 
-'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', 'R', '\023', 'u', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 
-'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', '*', '\t', '\010', '\350', '\007', '\020', '\200', '\200', '\200', '\200', '\002', '\"', '\300', '\001', '\n', 
-'\013', 'E', 'n', 'u', 'm', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', '\037', '\n', '\013', 'a', 'l', 'l', 'o', 'w', '_', 'a', 'l', 'i', 
-'a', 's', '\030', '\002', ' ', '\001', '(', '\010', 'R', '\n', 'a', 'l', 'l', 'o', 'w', 'A', 'l', 'i', 'a', 's', '\022', '%', '\n', '\n', 'd', 
-'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', '\030', '\003', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\n', 'd', 
-'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', '\022', 'X', '\n', '\024', 'u', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 
-'d', '_', 'o', 'p', 't', 'i', 'o', 'n', '\030', '\347', '\007', ' ', '\003', '(', '\013', '2', '$', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 
-'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 
-'i', 'o', 'n', 'R', '\023', 'u', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', '*', 
-'\t', '\010', '\350', '\007', '\020', '\200', '\200', '\200', '\200', '\002', 'J', '\004', '\010', '\005', '\020', '\006', '\"', '\236', '\001', '\n', '\020', 'E', 'n', 'u', 'm', 
-'V', 'a', 'l', 'u', 'e', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', '%', '\n', '\n', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 
-'d', '\030', '\001', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\n', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 
-'d', '\022', 'X', '\n', '\024', 'u', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', '_', 'o', 'p', 't', 'i', 'o', 'n', 
-'\030', '\347', '\007', ' ', '\003', '(', '\013', '2', '$', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', 
-'.', 'U', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', 'R', '\023', 'u', 'n', 'i', 
-'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', '*', '\t', '\010', '\350', '\007', '\020', '\200', '\200', '\200', 
-'\200', '\002', '\"', '\234', '\001', '\n', '\016', 'S', 'e', 'r', 'v', 'i', 'c', 'e', 'O', 'p', 't', 'i', 'o', 'n', 's', '\022', '%', '\n', '\n', 
-'d', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', '\030', '!', ' ', '\001', '(', '\010', ':', '\005', 'f', 'a', 'l', 's', 'e', 'R', '\n', 
-'d', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', '\022', 'X', '\n', '\024', 'u', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 
-'e', 'd', '_', 'o', 'p', 't', 'i', 'o', 'n', '\030', '\347', '\007', ' ', '\003', '(', '\013', '2', '$', '.', 'g', 'o', 'o', 'g', 'l', 'e', 
-'.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 
-'t', 'i', 'o', 'n', 'R', '\023', 'u', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', 
-'*', '\t', '\010', '\350', '\007', '\020', '\200', '\200', '\200', '\200', '\002', '\"', '\340', '\002', '\n', '\r', 'M', 'e', 't', 'h', 'o', 'd', 'O', 'p', 't', 
-'i', 'o', 'n', 's', '\022', '%', '\n', '\n', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', '\030', '!', ' ', '\001', '(', '\010', ':', 
-'\005', 'f', 'a', 'l', 's', 'e', 'R', '\n', 'd', 'e', 'p', 'r', 'e', 'c', 'a', 't', 'e', 'd', '\022', 'q', '\n', '\021', 'i', 'd', 'e', 
-'m', 'p', 'o', 't', 'e', 'n', 'c', 'y', '_', 'l', 'e', 'v', 'e', 'l', '\030', '\"', ' ', '\001', '(', '\016', '2', '/', '.', 'g', 'o', 
-'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'M', 'e', 't', 'h', 'o', 'd', 'O', 'p', 't', 'i', 'o', 
-'n', 's', '.', 'I', 'd', 'e', 'm', 'p', 'o', 't', 'e', 'n', 'c', 'y', 'L', 'e', 'v', 'e', 'l', ':', '\023', 'I', 'D', 'E', 'M', 
-'P', 'O', 'T', 'E', 'N', 'C', 'Y', '_', 'U', 'N', 'K', 'N', 'O', 'W', 'N', 'R', '\020', 'i', 'd', 'e', 'm', 'p', 'o', 't', 'e', 
-'n', 'c', 'y', 'L', 'e', 'v', 'e', 'l', '\022', 'X', '\n', '\024', 'u', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 
-'_', 'o', 'p', 't', 'i', 'o', 'n', '\030', '\347', '\007', ' ', '\003', '(', '\013', '2', '$', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 
-'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 
-'o', 'n', 'R', '\023', 'u', 'n', 'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', '\"', 'P', 
-'\n', '\020', 'I', 'd', 'e', 'm', 'p', 'o', 't', 'e', 'n', 'c', 'y', 'L', 'e', 'v', 'e', 'l', '\022', '\027', '\n', '\023', 'I', 'D', 'E', 
-'M', 'P', 'O', 'T', 'E', 'N', 'C', 'Y', '_', 'U', 'N', 'K', 'N', 'O', 'W', 'N', '\020', '\000', '\022', '\023', '\n', '\017', 'N', 'O', '_', 
-'S', 'I', 'D', 'E', '_', 'E', 'F', 'F', 'E', 'C', 'T', 'S', '\020', '\001', '\022', '\016', '\n', '\n', 'I', 'D', 'E', 'M', 'P', 'O', 'T', 
-'E', 'N', 'T', '\020', '\002', '*', '\t', '\010', '\350', '\007', '\020', '\200', '\200', '\200', '\200', '\002', '\"', '\232', '\003', '\n', '\023', 'U', 'n', 'i', 'n', 
-'t', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', '\022', 'A', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\002', 
-' ', '\003', '(', '\013', '2', '-', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'U', 'n', 
-'i', 'n', 't', 'e', 'r', 'p', 'r', 'e', 't', 'e', 'd', 'O', 'p', 't', 'i', 'o', 'n', '.', 'N', 'a', 'm', 'e', 'P', 'a', 'r', 
-'t', 'R', '\004', 'n', 'a', 'm', 'e', '\022', ')', '\n', '\020', 'i', 'd', 'e', 'n', 't', 'i', 'f', 'i', 'e', 'r', '_', 'v', 'a', 'l', 
-'u', 'e', '\030', '\003', ' ', '\001', '(', '\t', 'R', '\017', 'i', 'd', 'e', 'n', 't', 'i', 'f', 'i', 'e', 'r', 'V', 'a', 'l', 'u', 'e', 
-'\022', ',', '\n', '\022', 'p', 'o', 's', 'i', 't', 'i', 'v', 'e', '_', 'i', 'n', 't', '_', 'v', 'a', 'l', 'u', 'e', '\030', '\004', ' ', 
-'\001', '(', '\004', 'R', '\020', 'p', 'o', 's', 'i', 't', 'i', 'v', 'e', 'I', 'n', 't', 'V', 'a', 'l', 'u', 'e', '\022', ',', '\n', '\022', 
-'n', 'e', 'g', 'a', 't', 'i', 'v', 'e', '_', 'i', 'n', 't', '_', 'v', 'a', 'l', 'u', 'e', '\030', '\005', ' ', '\001', '(', '\003', 'R', 
-'\020', 'n', 'e', 'g', 'a', 't', 'i', 'v', 'e', 'I', 'n', 't', 'V', 'a', 'l', 'u', 'e', '\022', '!', '\n', '\014', 'd', 'o', 'u', 'b', 
-'l', 'e', '_', 'v', 'a', 'l', 'u', 'e', '\030', '\006', ' ', '\001', '(', '\001', 'R', '\013', 'd', 'o', 'u', 'b', 'l', 'e', 'V', 'a', 'l', 
-'u', 'e', '\022', '!', '\n', '\014', 's', 't', 'r', 'i', 'n', 'g', '_', 'v', 'a', 'l', 'u', 'e', '\030', '\007', ' ', '\001', '(', '\014', 'R', 
-'\013', 's', 't', 'r', 'i', 'n', 'g', 'V', 'a', 'l', 'u', 'e', '\022', '\'', '\n', '\017', 'a', 'g', 'g', 'r', 'e', 'g', 'a', 't', 'e', 
-'_', 'v', 'a', 'l', 'u', 'e', '\030', '\010', ' ', '\001', '(', '\t', 'R', '\016', 'a', 'g', 'g', 'r', 'e', 'g', 'a', 't', 'e', 'V', 'a', 
-'l', 'u', 'e', '\032', 'J', '\n', '\010', 'N', 'a', 'm', 'e', 'P', 'a', 'r', 't', '\022', '\033', '\n', '\t', 'n', 'a', 'm', 'e', '_', 'p', 
-'a', 'r', 't', '\030', '\001', ' ', '\002', '(', '\t', 'R', '\010', 'n', 'a', 'm', 'e', 'P', 'a', 'r', 't', '\022', '!', '\n', '\014', 'i', 's', 
-'_', 'e', 'x', 't', 'e', 'n', 's', 'i', 'o', 'n', '\030', '\002', ' ', '\002', '(', '\010', 'R', '\013', 'i', 's', 'E', 'x', 't', 'e', 'n', 
-'s', 'i', 'o', 'n', '\"', '\247', '\002', '\n', '\016', 'S', 'o', 'u', 'r', 'c', 'e', 'C', 'o', 'd', 'e', 'I', 'n', 'f', 'o', '\022', 'D', 
-'\n', '\010', 'l', 'o', 'c', 'a', 't', 'i', 'o', 'n', '\030', '\001', ' ', '\003', '(', '\013', '2', '(', '.', 'g', 'o', 'o', 'g', 'l', 'e', 
-'.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'S', 'o', 'u', 'r', 'c', 'e', 'C', 'o', 'd', 'e', 'I', 'n', 'f', 'o', '.', 
-'L', 'o', 'c', 'a', 't', 'i', 'o', 'n', 'R', '\010', 'l', 'o', 'c', 'a', 't', 'i', 'o', 'n', '\032', '\316', '\001', '\n', '\010', 'L', 'o', 
-'c', 'a', 't', 'i', 'o', 'n', '\022', '\026', '\n', '\004', 'p', 'a', 't', 'h', '\030', '\001', ' ', '\003', '(', '\005', 'B', '\002', '\020', '\001', 'R', 
-'\004', 'p', 'a', 't', 'h', '\022', '\026', '\n', '\004', 's', 'p', 'a', 'n', '\030', '\002', ' ', '\003', '(', '\005', 'B', '\002', '\020', '\001', 'R', '\004', 
-'s', 'p', 'a', 'n', '\022', ')', '\n', '\020', 'l', 'e', 'a', 'd', 'i', 'n', 'g', '_', 'c', 'o', 'm', 'm', 'e', 'n', 't', 's', '\030', 
-'\003', ' ', '\001', '(', '\t', 'R', '\017', 'l', 'e', 'a', 'd', 'i', 'n', 'g', 'C', 'o', 'm', 'm', 'e', 'n', 't', 's', '\022', '+', '\n', 
-'\021', 't', 'r', 'a', 'i', 'l', 'i', 'n', 'g', '_', 'c', 'o', 'm', 'm', 'e', 'n', 't', 's', '\030', '\004', ' ', '\001', '(', '\t', 'R', 
-'\020', 't', 'r', 'a', 'i', 'l', 'i', 'n', 'g', 'C', 'o', 'm', 'm', 'e', 'n', 't', 's', '\022', ':', '\n', '\031', 'l', 'e', 'a', 'd', 
-'i', 'n', 'g', '_', 'd', 'e', 't', 'a', 'c', 'h', 'e', 'd', '_', 'c', 'o', 'm', 'm', 'e', 'n', 't', 's', '\030', '\006', ' ', '\003', 
-'(', '\t', 'R', '\027', 'l', 'e', 'a', 'd', 'i', 'n', 'g', 'D', 'e', 't', 'a', 'c', 'h', 'e', 'd', 'C', 'o', 'm', 'm', 'e', 'n', 
-'t', 's', '\"', '\321', '\001', '\n', '\021', 'G', 'e', 'n', 'e', 'r', 'a', 't', 'e', 'd', 'C', 'o', 'd', 'e', 'I', 'n', 'f', 'o', '\022', 
-'M', '\n', '\n', 'a', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', '\030', '\001', ' ', '\003', '(', '\013', '2', '-', '.', 'g', 'o', 'o', 
-'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'G', 'e', 'n', 'e', 'r', 'a', 't', 'e', 'd', 'C', 'o', 'd', 
-'e', 'I', 'n', 'f', 'o', '.', 'A', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', 'R', '\n', 'a', 'n', 'n', 'o', 't', 'a', 't', 
-'i', 'o', 'n', '\032', 'm', '\n', '\n', 'A', 'n', 'n', 'o', 't', 'a', 't', 'i', 'o', 'n', '\022', '\026', '\n', '\004', 'p', 'a', 't', 'h', 
-'\030', '\001', ' ', '\003', '(', '\005', 'B', '\002', '\020', '\001', 'R', '\004', 'p', 'a', 't', 'h', '\022', '\037', '\n', '\013', 's', 'o', 'u', 'r', 'c', 
-'e', '_', 'f', 'i', 'l', 'e', '\030', '\002', ' ', '\001', '(', '\t', 'R', '\n', 's', 'o', 'u', 'r', 'c', 'e', 'F', 'i', 'l', 'e', '\022', 
-'\024', '\n', '\005', 'b', 'e', 'g', 'i', 'n', '\030', '\003', ' ', '\001', '(', '\005', 'R', '\005', 'b', 'e', 'g', 'i', 'n', '\022', '\020', '\n', '\003', 
-'e', 'n', 'd', '\030', '\004', ' ', '\001', '(', '\005', 'R', '\003', 'e', 'n', 'd', 'B', '~', '\n', '\023', 'c', 'o', 'm', '.', 'g', 'o', 'o', 
-'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', 'B', '\020', 'D', 'e', 's', 'c', 'r', 'i', 'p', 't', 'o', 'r', 'P', 
-'r', 'o', 't', 'o', 's', 'H', '\001', 'Z', '-', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'g', 'o', 'l', 'a', 'n', 'g', '.', 'o', 'r', 
-'g', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 't', 'y', 'p', 'e', 's', '/', 'd', 'e', 's', 'c', 'r', 'i', 'p', 't', 
-'o', 'r', 'p', 'b', '\370', '\001', '\001', '\242', '\002', '\003', 'G', 'P', 'B', '\252', '\002', '\032', 'G', 'o', 'o', 'g', 'l', 'e', '.', 'P', 'r', 
-'o', 't', 'o', 'b', 'u', 'f', '.', 'R', 'e', 'f', 'l', 'e', 'c', 't', 'i', 'o', 'n', 
-};
-
-static _upb_DefPool_Init *deps[1] = {
-  NULL
-};
-
-_upb_DefPool_Init google_protobuf_descriptor_proto_upbdefinit = {
-  deps,
-  &google_protobuf_descriptor_proto_upb_file_layout,
-  "google/protobuf/descriptor.proto",
-  UPB_STRINGVIEW_INIT(descriptor, 7667)
-};
-
-/** upb/decode_fast.c ************************************************************/
-// Fast decoder: ~3x the speed of decode.c, but requires x86-64/ARM64.
-// Also the table size grows by 2x.
-//
-// Could potentially be ported to other 64-bit archs that pass at least six
-// arguments in registers and have 8 unused high bits in pointers.
-//
-// The overall design is to create specialized functions for every possible
-// field type (eg. oneof boolean field with a 1 byte tag) and then dispatch
-// to the specialized function as quickly as possible.
-
-
-
-/* Must be last. */
-
-#if UPB_FASTTABLE
-
-// The standard set of arguments passed to each parsing function.
-// Thanks to x86-64 calling conventions, these will stay in registers.
-#define UPB_PARSE_PARAMS                                             \
-  upb_Decoder *d, const char *ptr, upb_Message *msg, intptr_t table, \
-      uint64_t hasbits, uint64_t data
-
-#define UPB_PARSE_ARGS d, ptr, msg, table, hasbits, data
-
-#define RETURN_GENERIC(m)                                 \
-  /* Uncomment either of these for debugging purposes. */ \
-  /* fprintf(stderr, m); */                               \
-  /*__builtin_trap(); */                                  \
-  return fastdecode_generic(d, ptr, msg, table, hasbits, 0);
-
-typedef enum {
-  CARD_s = 0, /* Singular (optional, non-repeated) */
-  CARD_o = 1, /* Oneof */
-  CARD_r = 2, /* Repeated */
-  CARD_p = 3  /* Packed Repeated */
-} upb_card;
-
-UPB_NOINLINE
-static const char* fastdecode_isdonefallback(UPB_PARSE_PARAMS) {
-  int overrun = data;
-  int status;
-  ptr = decode_isdonefallback_inl(d, ptr, overrun, &status);
-  if (ptr == NULL) {
-    return fastdecode_err(d, status);
-  }
-  data = fastdecode_loadtag(ptr);
-  UPB_MUSTTAIL return fastdecode_tagdispatch(UPB_PARSE_ARGS);
-}
-
-UPB_FORCEINLINE
-static const char* fastdecode_dispatch(UPB_PARSE_PARAMS) {
-  if (UPB_UNLIKELY(ptr >= d->limit_ptr)) {
-    int overrun = ptr - d->end;
-    if (UPB_LIKELY(overrun == d->limit)) {
-      // Parse is finished.
-      *(uint32_t*)msg |= hasbits;  // Sync hasbits.
-      const upb_MiniTable* l = decode_totablep(table);
-      return UPB_UNLIKELY(l->required_count)
-                 ? decode_checkrequired(d, ptr, msg, l)
-                 : ptr;
-    } else {
-      data = overrun;
-      UPB_MUSTTAIL return fastdecode_isdonefallback(UPB_PARSE_ARGS);
-    }
-  }
-
-  // Read two bytes of tag data (for a one-byte tag, the high byte is junk).
-  data = fastdecode_loadtag(ptr);
-  UPB_MUSTTAIL return fastdecode_tagdispatch(UPB_PARSE_ARGS);
-}
-
-UPB_FORCEINLINE
-static bool fastdecode_checktag(uint16_t data, int tagbytes) {
-  if (tagbytes == 1) {
-    return (data & 0xff) == 0;
-  } else {
-    return data == 0;
-  }
-}
-
-UPB_FORCEINLINE
-static const char* fastdecode_longsize(const char* ptr, int* size) {
-  int i;
-  UPB_ASSERT(*size & 0x80);
-  *size &= 0xff;
-  for (i = 0; i < 3; i++) {
-    ptr++;
-    size_t byte = (uint8_t)ptr[-1];
-    *size += (byte - 1) << (7 + 7 * i);
-    if (UPB_LIKELY((byte & 0x80) == 0)) return ptr;
-  }
-  ptr++;
-  size_t byte = (uint8_t)ptr[-1];
-  // len is limited by 2gb not 4gb, hence 8 and not 16 as normally expected
-  // for a 32 bit varint.
-  if (UPB_UNLIKELY(byte >= 8)) return NULL;
-  *size += (byte - 1) << 28;
-  return ptr;
-}
-
-UPB_FORCEINLINE
-static bool fastdecode_boundscheck(const char* ptr, size_t len,
-                                   const char* end) {
-  uintptr_t uptr = (uintptr_t)ptr;
-  uintptr_t uend = (uintptr_t)end + 16;
-  uintptr_t res = uptr + len;
-  return res < uptr || res > uend;
-}
-
-UPB_FORCEINLINE
-static bool fastdecode_boundscheck2(const char* ptr, size_t len,
-                                    const char* end) {
-  // This is one extra branch compared to the more normal:
-  //   return (size_t)(end - ptr) < size;
-  // However it is one less computation if we are just about to use "ptr + len":
-  //   https://godbolt.org/z/35YGPz
-  // In microbenchmarks this shows an overall 4% improvement.
-  uintptr_t uptr = (uintptr_t)ptr;
-  uintptr_t uend = (uintptr_t)end;
-  uintptr_t res = uptr + len;
-  return res < uptr || res > uend;
-}
-
-typedef const char* fastdecode_delimfunc(upb_Decoder* d, const char* ptr,
-                                         void* ctx);
-
-UPB_FORCEINLINE
-static const char* fastdecode_delimited(upb_Decoder* d, const char* ptr,
-                                        fastdecode_delimfunc* func, void* ctx) {
-  ptr++;
-  int len = (int8_t)ptr[-1];
-  if (fastdecode_boundscheck2(ptr, len, d->limit_ptr)) {
-    // Slow case: Sub-message is >=128 bytes and/or exceeds the current buffer.
-    // If it exceeds the buffer limit, limit/limit_ptr will change during
-    // sub-message parsing, so we need to preserve delta, not limit.
-    if (UPB_UNLIKELY(len & 0x80)) {
-      // Size varint >1 byte (length >= 128).
-      ptr = fastdecode_longsize(ptr, &len);
-      if (!ptr) {
-        // Corrupt wire format: size exceeded INT_MAX.
-        return NULL;
-      }
-    }
-    if (ptr - d->end + (int)len > d->limit) {
-      // Corrupt wire format: invalid limit.
-      return NULL;
-    }
-    int delta = decode_pushlimit(d, ptr, len);
-    ptr = func(d, ptr, ctx);
-    decode_poplimit(d, ptr, delta);
-  } else {
-    // Fast case: Sub-message is <128 bytes and fits in the current buffer.
-    // This means we can preserve limit/limit_ptr verbatim.
-    const char* saved_limit_ptr = d->limit_ptr;
-    int saved_limit = d->limit;
-    d->limit_ptr = ptr + len;
-    d->limit = d->limit_ptr - d->end;
-    UPB_ASSERT(d->limit_ptr == d->end + UPB_MIN(0, d->limit));
-    ptr = func(d, ptr, ctx);
-    d->limit_ptr = saved_limit_ptr;
-    d->limit = saved_limit;
-    UPB_ASSERT(d->limit_ptr == d->end + UPB_MIN(0, d->limit));
-  }
-  return ptr;
-}
-
-/* singular, oneof, repeated field handling ***********************************/
-
-typedef struct {
-  upb_Array* arr;
-  void* end;
-} fastdecode_arr;
-
-typedef enum {
-  FD_NEXT_ATLIMIT,
-  FD_NEXT_SAMEFIELD,
-  FD_NEXT_OTHERFIELD
-} fastdecode_next;
-
-typedef struct {
-  void* dst;
-  fastdecode_next next;
-  uint32_t tag;
-} fastdecode_nextret;
-
-UPB_FORCEINLINE
-static void* fastdecode_resizearr(upb_Decoder* d, void* dst,
-                                  fastdecode_arr* farr, int valbytes) {
-  if (UPB_UNLIKELY(dst == farr->end)) {
-    size_t old_size = farr->arr->size;
-    size_t old_bytes = old_size * valbytes;
-    size_t new_size = old_size * 2;
-    size_t new_bytes = new_size * valbytes;
-    char* old_ptr = _upb_array_ptr(farr->arr);
-    char* new_ptr = upb_Arena_Realloc(&d->arena, old_ptr, old_bytes, new_bytes);
-    uint8_t elem_size_lg2 = __builtin_ctz(valbytes);
-    farr->arr->size = new_size;
-    farr->arr->data = _upb_array_tagptr(new_ptr, elem_size_lg2);
-    dst = (void*)(new_ptr + (old_size * valbytes));
-    farr->end = (void*)(new_ptr + (new_size * valbytes));
-  }
-  return dst;
-}
-
-UPB_FORCEINLINE
-static bool fastdecode_tagmatch(uint32_t tag, uint64_t data, int tagbytes) {
-  if (tagbytes == 1) {
-    return (uint8_t)tag == (uint8_t)data;
-  } else {
-    return (uint16_t)tag == (uint16_t)data;
-  }
-}
-
-UPB_FORCEINLINE
-static void fastdecode_commitarr(void* dst, fastdecode_arr* farr,
-                                 int valbytes) {
-  farr->arr->len =
-      (size_t)((char*)dst - (char*)_upb_array_ptr(farr->arr)) / valbytes;
-}
-
-UPB_FORCEINLINE
-static fastdecode_nextret fastdecode_nextrepeated(upb_Decoder* d, void* dst,
-                                                  const char** ptr,
-                                                  fastdecode_arr* farr,
-                                                  uint64_t data, int tagbytes,
-                                                  int valbytes) {
-  fastdecode_nextret ret;
-  dst = (char*)dst + valbytes;
-
-  if (UPB_LIKELY(!decode_isdone(d, ptr))) {
-    ret.tag = fastdecode_loadtag(*ptr);
-    if (fastdecode_tagmatch(ret.tag, data, tagbytes)) {
-      ret.next = FD_NEXT_SAMEFIELD;
-    } else {
-      fastdecode_commitarr(dst, farr, valbytes);
-      ret.next = FD_NEXT_OTHERFIELD;
-    }
-  } else {
-    fastdecode_commitarr(dst, farr, valbytes);
-    ret.next = FD_NEXT_ATLIMIT;
-  }
-
-  ret.dst = dst;
-  return ret;
-}
-
-UPB_FORCEINLINE
-static void* fastdecode_fieldmem(upb_Message* msg, uint64_t data) {
-  size_t ofs = data >> 48;
-  return (char*)msg + ofs;
-}
-
-UPB_FORCEINLINE
-static void* fastdecode_getfield(upb_Decoder* d, const char* ptr,
-                                 upb_Message* msg, uint64_t* data,
-                                 uint64_t* hasbits, fastdecode_arr* farr,
-                                 int valbytes, upb_card card) {
-  switch (card) {
-    case CARD_s: {
-      uint8_t hasbit_index = *data >> 24;
-      // Set hasbit and return pointer to scalar field.
-      *hasbits |= 1ull << hasbit_index;
-      return fastdecode_fieldmem(msg, *data);
-    }
-    case CARD_o: {
-      uint16_t case_ofs = *data >> 32;
-      uint32_t* oneof_case = UPB_PTR_AT(msg, case_ofs, uint32_t);
-      uint8_t field_number = *data >> 24;
-      *oneof_case = field_number;
-      return fastdecode_fieldmem(msg, *data);
-    }
-    case CARD_r: {
-      // Get pointer to upb_Array and allocate/expand if necessary.
-      uint8_t elem_size_lg2 = __builtin_ctz(valbytes);
-      upb_Array** arr_p = fastdecode_fieldmem(msg, *data);
-      char* begin;
-      *(uint32_t*)msg |= *hasbits;
-      *hasbits = 0;
-      if (UPB_LIKELY(!*arr_p)) {
-        farr->arr = _upb_Array_New(&d->arena, 8, elem_size_lg2);
-        *arr_p = farr->arr;
-      } else {
-        farr->arr = *arr_p;
-      }
-      begin = _upb_array_ptr(farr->arr);
-      farr->end = begin + (farr->arr->size * valbytes);
-      *data = fastdecode_loadtag(ptr);
-      return begin + (farr->arr->len * valbytes);
-    }
-    default:
-      UPB_UNREACHABLE();
-  }
-}
-
-UPB_FORCEINLINE
-static bool fastdecode_flippacked(uint64_t* data, int tagbytes) {
-  *data ^= (0x2 ^ 0x0);  // Patch data to match packed wiretype.
-  return fastdecode_checktag(*data, tagbytes);
-}
-
-#define FASTDECODE_CHECKPACKED(tagbytes, card, func)                \
-  if (UPB_UNLIKELY(!fastdecode_checktag(data, tagbytes))) {         \
-    if (card == CARD_r && fastdecode_flippacked(&data, tagbytes)) { \
-      UPB_MUSTTAIL return func(UPB_PARSE_ARGS);                     \
-    }                                                               \
-    RETURN_GENERIC("packed check tag mismatch\n");                  \
-  }
-
-/* varint fields **************************************************************/
-
-UPB_FORCEINLINE
-static uint64_t fastdecode_munge(uint64_t val, int valbytes, bool zigzag) {
-  if (valbytes == 1) {
-    return val != 0;
-  } else if (zigzag) {
-    if (valbytes == 4) {
-      uint32_t n = val;
-      return (n >> 1) ^ -(int32_t)(n & 1);
-    } else if (valbytes == 8) {
-      return (val >> 1) ^ -(int64_t)(val & 1);
-    }
-    UPB_UNREACHABLE();
-  }
-  return val;
-}
-
-UPB_FORCEINLINE
-static const char* fastdecode_varint64(const char* ptr, uint64_t* val) {
-  ptr++;
-  *val = (uint8_t)ptr[-1];
-  if (UPB_UNLIKELY(*val & 0x80)) {
-    int i;
-    for (i = 0; i < 8; i++) {
-      ptr++;
-      uint64_t byte = (uint8_t)ptr[-1];
-      *val += (byte - 1) << (7 + 7 * i);
-      if (UPB_LIKELY((byte & 0x80) == 0)) goto done;
-    }
-    ptr++;
-    uint64_t byte = (uint8_t)ptr[-1];
-    if (byte > 1) {
-      return NULL;
-    }
-    *val += (byte - 1) << 63;
-  }
-done:
-  UPB_ASSUME(ptr != NULL);
-  return ptr;
-}
-
-#define FASTDECODE_UNPACKEDVARINT(d, ptr, msg, table, hasbits, data, tagbytes, \
-                                  valbytes, card, zigzag, packed)              \
-  uint64_t val;                                                                \
-  void* dst;                                                                   \
-  fastdecode_arr farr;                                                         \
-                                                                               \
-  FASTDECODE_CHECKPACKED(tagbytes, card, packed);                              \
-                                                                               \
-  dst = fastdecode_getfield(d, ptr, msg, &data, &hasbits, &farr, valbytes,     \
-                            card);                                             \
-  if (card == CARD_r) {                                                        \
-    if (UPB_UNLIKELY(!dst)) {                                                  \
-      RETURN_GENERIC("need array resize\n");                                   \
-    }                                                                          \
-  }                                                                            \
-                                                                               \
-  again:                                                                       \
-  if (card == CARD_r) {                                                        \
-    dst = fastdecode_resizearr(d, dst, &farr, valbytes);                       \
-  }                                                                            \
-                                                                               \
-  ptr += tagbytes;                                                             \
-  ptr = fastdecode_varint64(ptr, &val);                                        \
-  if (ptr == NULL) return fastdecode_err(d, kUpb_DecodeStatus_Malformed);      \
-  val = fastdecode_munge(val, valbytes, zigzag);                               \
-  memcpy(dst, &val, valbytes);                                                 \
-                                                                               \
-  if (card == CARD_r) {                                                        \
-    fastdecode_nextret ret = fastdecode_nextrepeated(                          \
-        d, dst, &ptr, &farr, data, tagbytes, valbytes);                        \
-    switch (ret.next) {                                                        \
-      case FD_NEXT_SAMEFIELD:                                                  \
-        dst = ret.dst;                                                         \
-        goto again;                                                            \
-      case FD_NEXT_OTHERFIELD:                                                 \
-        data = ret.tag;                                                        \
-        UPB_MUSTTAIL return fastdecode_tagdispatch(UPB_PARSE_ARGS);            \
-      case FD_NEXT_ATLIMIT:                                                    \
-        return ptr;                                                            \
-    }                                                                          \
-  }                                                                            \
-                                                                               \
-  UPB_MUSTTAIL return fastdecode_dispatch(UPB_PARSE_ARGS);
-
-typedef struct {
-  uint8_t valbytes;
-  bool zigzag;
-  void* dst;
-  fastdecode_arr farr;
-} fastdecode_varintdata;
-
-UPB_FORCEINLINE
-static const char* fastdecode_topackedvarint(upb_Decoder* d, const char* ptr,
-                                             void* ctx) {
-  fastdecode_varintdata* data = ctx;
-  void* dst = data->dst;
-  uint64_t val;
-
-  while (!decode_isdone(d, &ptr)) {
-    dst = fastdecode_resizearr(d, dst, &data->farr, data->valbytes);
-    ptr = fastdecode_varint64(ptr, &val);
-    if (ptr == NULL) return NULL;
-    val = fastdecode_munge(val, data->valbytes, data->zigzag);
-    memcpy(dst, &val, data->valbytes);
-    dst = (char*)dst + data->valbytes;
-  }
-
-  fastdecode_commitarr(dst, &data->farr, data->valbytes);
-  return ptr;
-}
-
-#define FASTDECODE_PACKEDVARINT(d, ptr, msg, table, hasbits, data, tagbytes, \
-                                valbytes, zigzag, unpacked)                  \
-  fastdecode_varintdata ctx = {valbytes, zigzag};                            \
-                                                                             \
-  FASTDECODE_CHECKPACKED(tagbytes, CARD_r, unpacked);                        \
-                                                                             \
-  ctx.dst = fastdecode_getfield(d, ptr, msg, &data, &hasbits, &ctx.farr,     \
-                                valbytes, CARD_r);                           \
-  if (UPB_UNLIKELY(!ctx.dst)) {                                              \
-    RETURN_GENERIC("need array resize\n");                                   \
-  }                                                                          \
-                                                                             \
-  ptr += tagbytes;                                                           \
-  ptr = fastdecode_delimited(d, ptr, &fastdecode_topackedvarint, &ctx);      \
-                                                                             \
-  if (UPB_UNLIKELY(ptr == NULL)) {                                           \
-    return fastdecode_err(d, kUpb_DecodeStatus_Malformed);                   \
-  }                                                                          \
-                                                                             \
-  UPB_MUSTTAIL return fastdecode_dispatch(d, ptr, msg, table, hasbits, 0);
-
-#define FASTDECODE_VARINT(d, ptr, msg, table, hasbits, data, tagbytes,     \
-                          valbytes, card, zigzag, unpacked, packed)        \
-  if (card == CARD_p) {                                                    \
-    FASTDECODE_PACKEDVARINT(d, ptr, msg, table, hasbits, data, tagbytes,   \
-                            valbytes, zigzag, unpacked);                   \
-  } else {                                                                 \
-    FASTDECODE_UNPACKEDVARINT(d, ptr, msg, table, hasbits, data, tagbytes, \
-                              valbytes, card, zigzag, packed);             \
-  }
-
-#define z_ZZ true
-#define b_ZZ false
-#define v_ZZ false
-
-/* Generate all combinations:
- * {s,o,r,p} x {b1,v4,z4,v8,z8} x {1bt,2bt} */
-
-#define F(card, type, valbytes, tagbytes)                                      \
-  UPB_NOINLINE                                                                 \
-  const char* upb_p##card##type##valbytes##_##tagbytes##bt(UPB_PARSE_PARAMS) { \
-    FASTDECODE_VARINT(d, ptr, msg, table, hasbits, data, tagbytes, valbytes,   \
-                      CARD_##card, type##_ZZ,                                  \
-                      upb_pr##type##valbytes##_##tagbytes##bt,                 \
-                      upb_pp##type##valbytes##_##tagbytes##bt);                \
-  }
-
-#define TYPES(card, tagbytes) \
-  F(card, b, 1, tagbytes)     \
-  F(card, v, 4, tagbytes)     \
-  F(card, v, 8, tagbytes)     \
-  F(card, z, 4, tagbytes)     \
-  F(card, z, 8, tagbytes)
-
-#define TAGBYTES(card) \
-  TYPES(card, 1)       \
-  TYPES(card, 2)
-
-TAGBYTES(s)
-TAGBYTES(o)
-TAGBYTES(r)
-TAGBYTES(p)
-
-#undef z_ZZ
-#undef b_ZZ
-#undef v_ZZ
-#undef o_ONEOF
-#undef s_ONEOF
-#undef r_ONEOF
-#undef F
-#undef TYPES
-#undef TAGBYTES
-#undef FASTDECODE_UNPACKEDVARINT
-#undef FASTDECODE_PACKEDVARINT
-#undef FASTDECODE_VARINT
-
-/* fixed fields ***************************************************************/
-
-#define FASTDECODE_UNPACKEDFIXED(d, ptr, msg, table, hasbits, data, tagbytes, \
-                                 valbytes, card, packed)                      \
-  void* dst;                                                                  \
-  fastdecode_arr farr;                                                        \
-                                                                              \
-  FASTDECODE_CHECKPACKED(tagbytes, card, packed)                              \
-                                                                              \
-  dst = fastdecode_getfield(d, ptr, msg, &data, &hasbits, &farr, valbytes,    \
-                            card);                                            \
-  if (card == CARD_r) {                                                       \
-    if (UPB_UNLIKELY(!dst)) {                                                 \
-      RETURN_GENERIC("couldn't allocate array in arena\n");                   \
-    }                                                                         \
-  }                                                                           \
-                                                                              \
-  again:                                                                      \
-  if (card == CARD_r) {                                                       \
-    dst = fastdecode_resizearr(d, dst, &farr, valbytes);                      \
-  }                                                                           \
-                                                                              \
-  ptr += tagbytes;                                                            \
-  memcpy(dst, ptr, valbytes);                                                 \
-  ptr += valbytes;                                                            \
-                                                                              \
-  if (card == CARD_r) {                                                       \
-    fastdecode_nextret ret = fastdecode_nextrepeated(                         \
-        d, dst, &ptr, &farr, data, tagbytes, valbytes);                       \
-    switch (ret.next) {                                                       \
-      case FD_NEXT_SAMEFIELD:                                                 \
-        dst = ret.dst;                                                        \
-        goto again;                                                           \
-      case FD_NEXT_OTHERFIELD:                                                \
-        data = ret.tag;                                                       \
-        UPB_MUSTTAIL return fastdecode_tagdispatch(UPB_PARSE_ARGS);           \
-      case FD_NEXT_ATLIMIT:                                                   \
-        return ptr;                                                           \
-    }                                                                         \
-  }                                                                           \
-                                                                              \
-  UPB_MUSTTAIL return fastdecode_dispatch(UPB_PARSE_ARGS);
-
-#define FASTDECODE_PACKEDFIXED(d, ptr, msg, table, hasbits, data, tagbytes, \
-                               valbytes, unpacked)                          \
-  FASTDECODE_CHECKPACKED(tagbytes, CARD_r, unpacked)                        \
-                                                                            \
-  ptr += tagbytes;                                                          \
-  int size = (uint8_t)ptr[0];                                               \
-  ptr++;                                                                    \
-  if (size & 0x80) {                                                        \
-    ptr = fastdecode_longsize(ptr, &size);                                  \
-  }                                                                         \
-                                                                            \
-  if (UPB_UNLIKELY(fastdecode_boundscheck(ptr, size, d->limit_ptr) ||       \
-                   (size % valbytes) != 0)) {                               \
-    return fastdecode_err(d, kUpb_DecodeStatus_Malformed);                  \
-  }                                                                         \
-                                                                            \
-  upb_Array** arr_p = fastdecode_fieldmem(msg, data);                       \
-  upb_Array* arr = *arr_p;                                                  \
-  uint8_t elem_size_lg2 = __builtin_ctz(valbytes);                          \
-  int elems = size / valbytes;                                              \
-                                                                            \
-  if (UPB_LIKELY(!arr)) {                                                   \
-    *arr_p = arr = _upb_Array_New(&d->arena, elems, elem_size_lg2);         \
-    if (!arr) {                                                             \
-      return fastdecode_err(d, kUpb_DecodeStatus_Malformed);                \
-    }                                                                       \
-  } else {                                                                  \
-    _upb_Array_Resize(arr, elems, &d->arena);                               \
-  }                                                                         \
-                                                                            \
-  char* dst = _upb_array_ptr(arr);                                          \
-  memcpy(dst, ptr, size);                                                   \
-  arr->len = elems;                                                         \
-                                                                            \
-  ptr += size;                                                              \
-  UPB_MUSTTAIL return fastdecode_dispatch(UPB_PARSE_ARGS);
-
-#define FASTDECODE_FIXED(d, ptr, msg, table, hasbits, data, tagbytes,     \
-                         valbytes, card, unpacked, packed)                \
-  if (card == CARD_p) {                                                   \
-    FASTDECODE_PACKEDFIXED(d, ptr, msg, table, hasbits, data, tagbytes,   \
-                           valbytes, unpacked);                           \
-  } else {                                                                \
-    FASTDECODE_UNPACKEDFIXED(d, ptr, msg, table, hasbits, data, tagbytes, \
-                             valbytes, card, packed);                     \
-  }
-
-/* Generate all combinations:
- * {s,o,r,p} x {f4,f8} x {1bt,2bt} */
-
-#define F(card, valbytes, tagbytes)                                         \
-  UPB_NOINLINE                                                              \
-  const char* upb_p##card##f##valbytes##_##tagbytes##bt(UPB_PARSE_PARAMS) { \
-    FASTDECODE_FIXED(d, ptr, msg, table, hasbits, data, tagbytes, valbytes, \
-                     CARD_##card, upb_ppf##valbytes##_##tagbytes##bt,       \
-                     upb_prf##valbytes##_##tagbytes##bt);                   \
-  }
-
-#define TYPES(card, tagbytes) \
-  F(card, 4, tagbytes)        \
-  F(card, 8, tagbytes)
-
-#define TAGBYTES(card) \
-  TYPES(card, 1)       \
-  TYPES(card, 2)
-
-TAGBYTES(s)
-TAGBYTES(o)
-TAGBYTES(r)
-TAGBYTES(p)
-
-#undef F
-#undef TYPES
-#undef TAGBYTES
-#undef FASTDECODE_UNPACKEDFIXED
-#undef FASTDECODE_PACKEDFIXED
-
-/* string fields **************************************************************/
-
-typedef const char* fastdecode_copystr_func(struct upb_Decoder* d,
-                                            const char* ptr, upb_Message* msg,
-                                            const upb_MiniTable* table,
-                                            uint64_t hasbits,
-                                            upb_StringView* dst);
-
-UPB_NOINLINE
-static const char* fastdecode_verifyutf8(upb_Decoder* d, const char* ptr,
-                                         upb_Message* msg, intptr_t table,
-                                         uint64_t hasbits, uint64_t data) {
-  upb_StringView* dst = (upb_StringView*)data;
-  if (!decode_verifyutf8_inl(dst->data, dst->size)) {
-    return fastdecode_err(d, kUpb_DecodeStatus_BadUtf8);
-  }
-  UPB_MUSTTAIL return fastdecode_dispatch(UPB_PARSE_ARGS);
-}
-
-#define FASTDECODE_LONGSTRING(d, ptr, msg, table, hasbits, dst, validate_utf8) \
-  int size = (uint8_t)ptr[0]; /* Could plumb through hasbits. */               \
-  ptr++;                                                                       \
-  if (size & 0x80) {                                                           \
-    ptr = fastdecode_longsize(ptr, &size);                                     \
-  }                                                                            \
-                                                                               \
-  if (UPB_UNLIKELY(fastdecode_boundscheck(ptr, size, d->limit_ptr))) {         \
-    dst->size = 0;                                                             \
-    return fastdecode_err(d, kUpb_DecodeStatus_Malformed);                     \
-  }                                                                            \
-                                                                               \
-  if (d->options & kUpb_DecodeOption_AliasString) {                            \
-    dst->data = ptr;                                                           \
-    dst->size = size;                                                          \
-  } else {                                                                     \
-    char* data = upb_Arena_Malloc(&d->arena, size);                            \
-    if (!data) {                                                               \
-      return fastdecode_err(d, kUpb_DecodeStatus_OutOfMemory);                 \
-    }                                                                          \
-    memcpy(data, ptr, size);                                                   \
-    dst->data = data;                                                          \
-    dst->size = size;                                                          \
-  }                                                                            \
-                                                                               \
-  ptr += size;                                                                 \
-  if (validate_utf8) {                                                         \
-    data = (uint64_t)dst;                                                      \
-    UPB_MUSTTAIL return fastdecode_verifyutf8(UPB_PARSE_ARGS);                 \
-  } else {                                                                     \
-    UPB_MUSTTAIL return fastdecode_dispatch(UPB_PARSE_ARGS);                   \
-  }
-
-UPB_NOINLINE
-static const char* fastdecode_longstring_utf8(struct upb_Decoder* d,
-                                              const char* ptr, upb_Message* msg,
-                                              intptr_t table, uint64_t hasbits,
-                                              uint64_t data) {
-  upb_StringView* dst = (upb_StringView*)data;
-  FASTDECODE_LONGSTRING(d, ptr, msg, table, hasbits, dst, true);
-}
-
-UPB_NOINLINE
-static const char* fastdecode_longstring_noutf8(
-    struct upb_Decoder* d, const char* ptr, upb_Message* msg, intptr_t table,
-    uint64_t hasbits, uint64_t data) {
-  upb_StringView* dst = (upb_StringView*)data;
-  FASTDECODE_LONGSTRING(d, ptr, msg, table, hasbits, dst, false);
-}
-
-UPB_FORCEINLINE
-static void fastdecode_docopy(upb_Decoder* d, const char* ptr, uint32_t size,
-                              int copy, char* data, upb_StringView* dst) {
-  d->arena.head.ptr += copy;
-  dst->data = data;
-  UPB_UNPOISON_MEMORY_REGION(data, copy);
-  memcpy(data, ptr, copy);
-  UPB_POISON_MEMORY_REGION(data + size, copy - size);
-}
-
-#define FASTDECODE_COPYSTRING(d, ptr, msg, table, hasbits, data, tagbytes,    \
-                              card, validate_utf8)                            \
-  upb_StringView* dst;                                                        \
-  fastdecode_arr farr;                                                        \
-  int64_t size;                                                               \
-  size_t arena_has;                                                           \
-  size_t common_has;                                                          \
-  char* buf;                                                                  \
-                                                                              \
-  UPB_ASSERT((d->options & kUpb_DecodeOption_AliasString) == 0);              \
-  UPB_ASSERT(fastdecode_checktag(data, tagbytes));                            \
-                                                                              \
-  dst = fastdecode_getfield(d, ptr, msg, &data, &hasbits, &farr,              \
-                            sizeof(upb_StringView), card);                    \
-                                                                              \
-  again:                                                                      \
-  if (card == CARD_r) {                                                       \
-    dst = fastdecode_resizearr(d, dst, &farr, sizeof(upb_StringView));        \
-  }                                                                           \
-                                                                              \
-  size = (uint8_t)ptr[tagbytes];                                              \
-  ptr += tagbytes + 1;                                                        \
-  dst->size = size;                                                           \
-                                                                              \
-  buf = d->arena.head.ptr;                                                    \
-  arena_has = _upb_ArenaHas(&d->arena);                                       \
-  common_has = UPB_MIN(arena_has, (d->end - ptr) + 16);                       \
-                                                                              \
-  if (UPB_LIKELY(size <= 15 - tagbytes)) {                                    \
-    if (arena_has < 16) goto longstr;                                         \
-    d->arena.head.ptr += 16;                                                  \
-    memcpy(buf, ptr - tagbytes - 1, 16);                                      \
-    dst->data = buf + tagbytes + 1;                                           \
-  } else if (UPB_LIKELY(size <= 32)) {                                        \
-    if (UPB_UNLIKELY(common_has < 32)) goto longstr;                          \
-    fastdecode_docopy(d, ptr, size, 32, buf, dst);                            \
-  } else if (UPB_LIKELY(size <= 64)) {                                        \
-    if (UPB_UNLIKELY(common_has < 64)) goto longstr;                          \
-    fastdecode_docopy(d, ptr, size, 64, buf, dst);                            \
-  } else if (UPB_LIKELY(size < 128)) {                                        \
-    if (UPB_UNLIKELY(common_has < 128)) goto longstr;                         \
-    fastdecode_docopy(d, ptr, size, 128, buf, dst);                           \
-  } else {                                                                    \
-    goto longstr;                                                             \
-  }                                                                           \
-                                                                              \
-  ptr += size;                                                                \
-                                                                              \
-  if (card == CARD_r) {                                                       \
-    if (validate_utf8 && !decode_verifyutf8_inl(dst->data, dst->size)) {      \
-      return fastdecode_err(d, kUpb_DecodeStatus_BadUtf8);                    \
-    }                                                                         \
-    fastdecode_nextret ret = fastdecode_nextrepeated(                         \
-        d, dst, &ptr, &farr, data, tagbytes, sizeof(upb_StringView));         \
-    switch (ret.next) {                                                       \
-      case FD_NEXT_SAMEFIELD:                                                 \
-        dst = ret.dst;                                                        \
-        goto again;                                                           \
-      case FD_NEXT_OTHERFIELD:                                                \
-        data = ret.tag;                                                       \
-        UPB_MUSTTAIL return fastdecode_tagdispatch(UPB_PARSE_ARGS);           \
-      case FD_NEXT_ATLIMIT:                                                   \
-        return ptr;                                                           \
-    }                                                                         \
-  }                                                                           \
-                                                                              \
-  if (card != CARD_r && validate_utf8) {                                      \
-    data = (uint64_t)dst;                                                     \
-    UPB_MUSTTAIL return fastdecode_verifyutf8(UPB_PARSE_ARGS);                \
-  }                                                                           \
-                                                                              \
-  UPB_MUSTTAIL return fastdecode_dispatch(UPB_PARSE_ARGS);                    \
-                                                                              \
-  longstr:                                                                    \
-  if (card == CARD_r) {                                                       \
-    fastdecode_commitarr(dst + 1, &farr, sizeof(upb_StringView));             \
-  }                                                                           \
-  ptr--;                                                                      \
-  if (validate_utf8) {                                                        \
-    UPB_MUSTTAIL return fastdecode_longstring_utf8(d, ptr, msg, table,        \
-                                                   hasbits, (uint64_t)dst);   \
-  } else {                                                                    \
-    UPB_MUSTTAIL return fastdecode_longstring_noutf8(d, ptr, msg, table,      \
-                                                     hasbits, (uint64_t)dst); \
-  }
-
-#define FASTDECODE_STRING(d, ptr, msg, table, hasbits, data, tagbytes, card,   \
-                          copyfunc, validate_utf8)                             \
-  upb_StringView* dst;                                                         \
-  fastdecode_arr farr;                                                         \
-  int64_t size;                                                                \
-                                                                               \
-  if (UPB_UNLIKELY(!fastdecode_checktag(data, tagbytes))) {                    \
-    RETURN_GENERIC("string field tag mismatch\n");                             \
-  }                                                                            \
-                                                                               \
-  if (UPB_UNLIKELY((d->options & kUpb_DecodeOption_AliasString) == 0)) {       \
-    UPB_MUSTTAIL return copyfunc(UPB_PARSE_ARGS);                              \
-  }                                                                            \
-                                                                               \
-  dst = fastdecode_getfield(d, ptr, msg, &data, &hasbits, &farr,               \
-                            sizeof(upb_StringView), card);                     \
-                                                                               \
-  again:                                                                       \
-  if (card == CARD_r) {                                                        \
-    dst = fastdecode_resizearr(d, dst, &farr, sizeof(upb_StringView));         \
-  }                                                                            \
-                                                                               \
-  size = (int8_t)ptr[tagbytes];                                                \
-  ptr += tagbytes + 1;                                                         \
-  dst->data = ptr;                                                             \
-  dst->size = size;                                                            \
-                                                                               \
-  if (UPB_UNLIKELY(fastdecode_boundscheck(ptr, size, d->end))) {               \
-    ptr--;                                                                     \
-    if (validate_utf8) {                                                       \
-      return fastdecode_longstring_utf8(d, ptr, msg, table, hasbits,           \
-                                        (uint64_t)dst);                        \
-    } else {                                                                   \
-      return fastdecode_longstring_noutf8(d, ptr, msg, table, hasbits,         \
-                                          (uint64_t)dst);                      \
-    }                                                                          \
-  }                                                                            \
-                                                                               \
-  ptr += size;                                                                 \
-                                                                               \
-  if (card == CARD_r) {                                                        \
-    if (validate_utf8 && !decode_verifyutf8_inl(dst->data, dst->size)) {       \
-      return fastdecode_err(d, kUpb_DecodeStatus_BadUtf8);                     \
-    }                                                                          \
-    fastdecode_nextret ret = fastdecode_nextrepeated(                          \
-        d, dst, &ptr, &farr, data, tagbytes, sizeof(upb_StringView));          \
-    switch (ret.next) {                                                        \
-      case FD_NEXT_SAMEFIELD:                                                  \
-        dst = ret.dst;                                                         \
-        if (UPB_UNLIKELY((d->options & kUpb_DecodeOption_AliasString) == 0)) { \
-          /* Buffer flipped and we can't alias any more. Bounce to */          \
-          /* copyfunc(), but via dispatch since we need to reload table */     \
-          /* data also. */                                                     \
-          fastdecode_commitarr(dst, &farr, sizeof(upb_StringView));            \
-          data = ret.tag;                                                      \
-          UPB_MUSTTAIL return fastdecode_tagdispatch(UPB_PARSE_ARGS);          \
-        }                                                                      \
-        goto again;                                                            \
-      case FD_NEXT_OTHERFIELD:                                                 \
-        data = ret.tag;                                                        \
-        UPB_MUSTTAIL return fastdecode_tagdispatch(UPB_PARSE_ARGS);            \
-      case FD_NEXT_ATLIMIT:                                                    \
-        return ptr;                                                            \
-    }                                                                          \
-  }                                                                            \
-                                                                               \
-  if (card != CARD_r && validate_utf8) {                                       \
-    data = (uint64_t)dst;                                                      \
-    UPB_MUSTTAIL return fastdecode_verifyutf8(UPB_PARSE_ARGS);                 \
-  }                                                                            \
-                                                                               \
-  UPB_MUSTTAIL return fastdecode_dispatch(UPB_PARSE_ARGS);
-
-/* Generate all combinations:
- * {p,c} x {s,o,r} x {s, b} x {1bt,2bt} */
-
-#define s_VALIDATE true
-#define b_VALIDATE false
-
-#define F(card, tagbytes, type)                                        \
-  UPB_NOINLINE                                                         \
-  const char* upb_c##card##type##_##tagbytes##bt(UPB_PARSE_PARAMS) {   \
-    FASTDECODE_COPYSTRING(d, ptr, msg, table, hasbits, data, tagbytes, \
-                          CARD_##card, type##_VALIDATE);               \
-  }                                                                    \
-  const char* upb_p##card##type##_##tagbytes##bt(UPB_PARSE_PARAMS) {   \
-    FASTDECODE_STRING(d, ptr, msg, table, hasbits, data, tagbytes,     \
-                      CARD_##card, upb_c##card##type##_##tagbytes##bt, \
-                      type##_VALIDATE);                                \
-  }
-
-#define UTF8(card, tagbytes) \
-  F(card, tagbytes, s)       \
-  F(card, tagbytes, b)
-
-#define TAGBYTES(card) \
-  UTF8(card, 1)        \
-  UTF8(card, 2)
-
-TAGBYTES(s)
-TAGBYTES(o)
-TAGBYTES(r)
-
-#undef s_VALIDATE
-#undef b_VALIDATE
-#undef F
-#undef TAGBYTES
-#undef FASTDECODE_LONGSTRING
-#undef FASTDECODE_COPYSTRING
-#undef FASTDECODE_STRING
-
-/* message fields *************************************************************/
-
-UPB_INLINE
-upb_Message* decode_newmsg_ceil(upb_Decoder* d, const upb_MiniTable* l,
-                                int msg_ceil_bytes) {
-  size_t size = l->size + sizeof(upb_Message_Internal);
-  char* msg_data;
-  if (UPB_LIKELY(msg_ceil_bytes > 0 &&
-                 _upb_ArenaHas(&d->arena) >= msg_ceil_bytes)) {
-    UPB_ASSERT(size <= (size_t)msg_ceil_bytes);
-    msg_data = d->arena.head.ptr;
-    d->arena.head.ptr += size;
-    UPB_UNPOISON_MEMORY_REGION(msg_data, msg_ceil_bytes);
-    memset(msg_data, 0, msg_ceil_bytes);
-    UPB_POISON_MEMORY_REGION(msg_data + size, msg_ceil_bytes - size);
-  } else {
-    msg_data = (char*)upb_Arena_Malloc(&d->arena, size);
-    memset(msg_data, 0, size);
-  }
-  return msg_data + sizeof(upb_Message_Internal);
-}
-
-typedef struct {
-  intptr_t table;
-  upb_Message* msg;
-} fastdecode_submsgdata;
-
-UPB_FORCEINLINE
-static const char* fastdecode_tosubmsg(upb_Decoder* d, const char* ptr,
-                                       void* ctx) {
-  fastdecode_submsgdata* submsg = ctx;
-  ptr = fastdecode_dispatch(d, ptr, submsg->msg, submsg->table, 0, 0);
-  UPB_ASSUME(ptr != NULL);
-  return ptr;
-}
-
-#define FASTDECODE_SUBMSG(d, ptr, msg, table, hasbits, data, tagbytes,    \
-                          msg_ceil_bytes, card)                           \
-                                                                          \
-  if (UPB_UNLIKELY(!fastdecode_checktag(data, tagbytes))) {               \
-    RETURN_GENERIC("submessage field tag mismatch\n");                    \
-  }                                                                       \
-                                                                          \
-  if (--d->depth == 0) {                                                  \
-    return fastdecode_err(d, kUpb_DecodeStatus_MaxDepthExceeded);         \
-  }                                                                       \
-                                                                          \
-  upb_Message** dst;                                                      \
-  uint32_t submsg_idx = (data >> 16) & 0xff;                              \
-  const upb_MiniTable* tablep = decode_totablep(table);                   \
-  const upb_MiniTable* subtablep = tablep->subs[submsg_idx].submsg;       \
-  fastdecode_submsgdata submsg = {decode_totable(subtablep)};             \
-  fastdecode_arr farr;                                                    \
-                                                                          \
-  if (subtablep->table_mask == (uint8_t)-1) {                             \
-    RETURN_GENERIC("submessage doesn't have fast tables.");               \
-  }                                                                       \
-                                                                          \
-  dst = fastdecode_getfield(d, ptr, msg, &data, &hasbits, &farr,          \
-                            sizeof(upb_Message*), card);                  \
-                                                                          \
-  if (card == CARD_s) {                                                   \
-    *(uint32_t*)msg |= hasbits;                                           \
-    hasbits = 0;                                                          \
-  }                                                                       \
-                                                                          \
-  again:                                                                  \
-  if (card == CARD_r) {                                                   \
-    dst = fastdecode_resizearr(d, dst, &farr, sizeof(upb_Message*));      \
-  }                                                                       \
-                                                                          \
-  submsg.msg = *dst;                                                      \
-                                                                          \
-  if (card == CARD_r || UPB_LIKELY(!submsg.msg)) {                        \
-    *dst = submsg.msg = decode_newmsg_ceil(d, subtablep, msg_ceil_bytes); \
-  }                                                                       \
-                                                                          \
-  ptr += tagbytes;                                                        \
-  ptr = fastdecode_delimited(d, ptr, fastdecode_tosubmsg, &submsg);       \
-                                                                          \
-  if (UPB_UNLIKELY(ptr == NULL || d->end_group != DECODE_NOGROUP)) {      \
-    return fastdecode_err(d, kUpb_DecodeStatus_Malformed);                \
-  }                                                                       \
-                                                                          \
-  if (card == CARD_r) {                                                   \
-    fastdecode_nextret ret = fastdecode_nextrepeated(                     \
-        d, dst, &ptr, &farr, data, tagbytes, sizeof(upb_Message*));       \
-    switch (ret.next) {                                                   \
-      case FD_NEXT_SAMEFIELD:                                             \
-        dst = ret.dst;                                                    \
-        goto again;                                                       \
-      case FD_NEXT_OTHERFIELD:                                            \
-        d->depth++;                                                       \
-        data = ret.tag;                                                   \
-        UPB_MUSTTAIL return fastdecode_tagdispatch(UPB_PARSE_ARGS);       \
-      case FD_NEXT_ATLIMIT:                                               \
-        d->depth++;                                                       \
-        return ptr;                                                       \
-    }                                                                     \
-  }                                                                       \
-                                                                          \
-  d->depth++;                                                             \
-  UPB_MUSTTAIL return fastdecode_dispatch(UPB_PARSE_ARGS);
-
-#define F(card, tagbytes, size_ceil, ceil_arg)                               \
-  const char* upb_p##card##m_##tagbytes##bt_max##size_ceil##b(               \
-      UPB_PARSE_PARAMS) {                                                    \
-    FASTDECODE_SUBMSG(d, ptr, msg, table, hasbits, data, tagbytes, ceil_arg, \
-                      CARD_##card);                                          \
-  }
-
-#define SIZES(card, tagbytes) \
-  F(card, tagbytes, 64, 64)   \
-  F(card, tagbytes, 128, 128) \
-  F(card, tagbytes, 192, 192) \
-  F(card, tagbytes, 256, 256) \
-  F(card, tagbytes, max, -1)
-
-#define TAGBYTES(card) \
-  SIZES(card, 1)       \
-  SIZES(card, 2)
-
-TAGBYTES(s)
-TAGBYTES(o)
-TAGBYTES(r)
-
-#undef TAGBYTES
-#undef SIZES
-#undef F
-#undef FASTDECODE_SUBMSG
-
-#endif /* UPB_FASTTABLE */
-
-/** upb/json_decode.c ************************************************************/
-
-#include <errno.h>
-#include <float.h>
-#include <inttypes.h>
-#include <limits.h>
-#include <math.h>
-#include <setjmp.h>
-#include <stdlib.h>
-#include <string.h>
-
-
-/* Special header, must be included last. */
-
-typedef struct {
-  const char *ptr, *end;
-  upb_Arena* arena; /* TODO: should we have a tmp arena for tmp data? */
-  const upb_DefPool* symtab;
-  int depth;
-  upb_Status* status;
-  jmp_buf err;
-  int line;
-  const char* line_begin;
-  bool is_first;
-  int options;
-  const upb_FieldDef* debug_field;
-} jsondec;
-
-enum { JD_OBJECT, JD_ARRAY, JD_STRING, JD_NUMBER, JD_TRUE, JD_FALSE, JD_NULL };
-
-/* Forward declarations of mutually-recursive functions. */
-static void jsondec_wellknown(jsondec* d, upb_Message* msg,
-                              const upb_MessageDef* m);
-static upb_MessageValue jsondec_value(jsondec* d, const upb_FieldDef* f);
-static void jsondec_wellknownvalue(jsondec* d, upb_Message* msg,
-                                   const upb_MessageDef* m);
-static void jsondec_object(jsondec* d, upb_Message* msg,
-                           const upb_MessageDef* m);
-
-static bool jsondec_streql(upb_StringView str, const char* lit) {
-  return str.size == strlen(lit) && memcmp(str.data, lit, str.size) == 0;
-}
-
-static bool jsondec_isnullvalue(const upb_FieldDef* f) {
-  return upb_FieldDef_CType(f) == kUpb_CType_Enum &&
-         strcmp(upb_EnumDef_FullName(upb_FieldDef_EnumSubDef(f)),
-                "google.protobuf.NullValue") == 0;
-}
-
-static bool jsondec_isvalue(const upb_FieldDef* f) {
-  return (upb_FieldDef_CType(f) == kUpb_CType_Message &&
-          upb_MessageDef_WellKnownType(upb_FieldDef_MessageSubDef(f)) ==
-              kUpb_WellKnown_Value) ||
-         jsondec_isnullvalue(f);
-}
-
-UPB_NORETURN static void jsondec_err(jsondec* d, const char* msg) {
-  upb_Status_SetErrorFormat(d->status, "Error parsing JSON @%d:%d: %s", d->line,
-                            (int)(d->ptr - d->line_begin), msg);
-  UPB_LONGJMP(d->err, 1);
-}
-
-UPB_PRINTF(2, 3)
-UPB_NORETURN static void jsondec_errf(jsondec* d, const char* fmt, ...) {
-  va_list argp;
-  upb_Status_SetErrorFormat(d->status, "Error parsing JSON @%d:%d: ", d->line,
-                            (int)(d->ptr - d->line_begin));
-  va_start(argp, fmt);
-  upb_Status_VAppendErrorFormat(d->status, fmt, argp);
-  va_end(argp);
-  UPB_LONGJMP(d->err, 1);
-}
-
-static void jsondec_skipws(jsondec* d) {
-  while (d->ptr != d->end) {
-    switch (*d->ptr) {
-      case '\n':
-        d->line++;
-        d->line_begin = d->ptr;
-        /* Fallthrough. */
-      case '\r':
-      case '\t':
-      case ' ':
-        d->ptr++;
-        break;
-      default:
-        return;
-    }
-  }
-  jsondec_err(d, "Unexpected EOF");
-}
-
-static bool jsondec_tryparsech(jsondec* d, char ch) {
-  if (d->ptr == d->end || *d->ptr != ch) return false;
-  d->ptr++;
-  return true;
-}
-
-static void jsondec_parselit(jsondec* d, const char* lit) {
-  size_t avail = d->end - d->ptr;
-  size_t len = strlen(lit);
-  if (avail < len || memcmp(d->ptr, lit, len) != 0) {
-    jsondec_errf(d, "Expected: '%s'", lit);
-  }
-  d->ptr += len;
-}
-
-static void jsondec_wsch(jsondec* d, char ch) {
-  jsondec_skipws(d);
-  if (!jsondec_tryparsech(d, ch)) {
-    jsondec_errf(d, "Expected: '%c'", ch);
-  }
-}
-
-static void jsondec_true(jsondec* d) { jsondec_parselit(d, "true"); }
-static void jsondec_false(jsondec* d) { jsondec_parselit(d, "false"); }
-static void jsondec_null(jsondec* d) { jsondec_parselit(d, "null"); }
-
-static void jsondec_entrysep(jsondec* d) {
-  jsondec_skipws(d);
-  jsondec_parselit(d, ":");
-}
-
-static int jsondec_rawpeek(jsondec* d) {
-  switch (*d->ptr) {
-    case '{':
-      return JD_OBJECT;
-    case '[':
-      return JD_ARRAY;
-    case '"':
-      return JD_STRING;
-    case '-':
-    case '0':
-    case '1':
-    case '2':
-    case '3':
-    case '4':
-    case '5':
-    case '6':
-    case '7':
-    case '8':
-    case '9':
-      return JD_NUMBER;
-    case 't':
-      return JD_TRUE;
-    case 'f':
-      return JD_FALSE;
-    case 'n':
-      return JD_NULL;
-    default:
-      jsondec_errf(d, "Unexpected character: '%c'", *d->ptr);
-  }
-}
-
-/* JSON object/array **********************************************************/
-
-/* These are used like so:
- *
- * jsondec_objstart(d);
- * while (jsondec_objnext(d)) {
- *   ...
- * }
- * jsondec_objend(d) */
-
-static int jsondec_peek(jsondec* d) {
-  jsondec_skipws(d);
-  return jsondec_rawpeek(d);
-}
-
-static void jsondec_push(jsondec* d) {
-  if (--d->depth < 0) {
-    jsondec_err(d, "Recursion limit exceeded");
-  }
-  d->is_first = true;
-}
-
-static bool jsondec_seqnext(jsondec* d, char end_ch) {
-  bool is_first = d->is_first;
-  d->is_first = false;
-  jsondec_skipws(d);
-  if (*d->ptr == end_ch) return false;
-  if (!is_first) jsondec_parselit(d, ",");
-  return true;
-}
-
-static void jsondec_arrstart(jsondec* d) {
-  jsondec_push(d);
-  jsondec_wsch(d, '[');
-}
-
-static void jsondec_arrend(jsondec* d) {
-  d->depth++;
-  jsondec_wsch(d, ']');
-}
-
-static bool jsondec_arrnext(jsondec* d) { return jsondec_seqnext(d, ']'); }
-
-static void jsondec_objstart(jsondec* d) {
-  jsondec_push(d);
-  jsondec_wsch(d, '{');
-}
-
-static void jsondec_objend(jsondec* d) {
-  d->depth++;
-  jsondec_wsch(d, '}');
-}
-
-static bool jsondec_objnext(jsondec* d) {
-  if (!jsondec_seqnext(d, '}')) return false;
-  if (jsondec_peek(d) != JD_STRING) {
-    jsondec_err(d, "Object must start with string");
-  }
-  return true;
-}
-
-/* JSON number ****************************************************************/
-
-static bool jsondec_tryskipdigits(jsondec* d) {
-  const char* start = d->ptr;
-
-  while (d->ptr < d->end) {
-    if (*d->ptr < '0' || *d->ptr > '9') {
-      break;
-    }
-    d->ptr++;
-  }
-
-  return d->ptr != start;
-}
-
-static void jsondec_skipdigits(jsondec* d) {
-  if (!jsondec_tryskipdigits(d)) {
-    jsondec_err(d, "Expected one or more digits");
-  }
-}
-
-static double jsondec_number(jsondec* d) {
-  const char* start = d->ptr;
-
-  assert(jsondec_rawpeek(d) == JD_NUMBER);
-
-  /* Skip over the syntax of a number, as specified by JSON. */
-  if (*d->ptr == '-') d->ptr++;
-
-  if (jsondec_tryparsech(d, '0')) {
-    if (jsondec_tryskipdigits(d)) {
-      jsondec_err(d, "number cannot have leading zero");
-    }
-  } else {
-    jsondec_skipdigits(d);
-  }
-
-  if (d->ptr == d->end) goto parse;
-  if (jsondec_tryparsech(d, '.')) {
-    jsondec_skipdigits(d);
-  }
-  if (d->ptr == d->end) goto parse;
-
-  if (*d->ptr == 'e' || *d->ptr == 'E') {
-    d->ptr++;
-    if (d->ptr == d->end) {
-      jsondec_err(d, "Unexpected EOF in number");
-    }
-    if (*d->ptr == '+' || *d->ptr == '-') {
-      d->ptr++;
-    }
-    jsondec_skipdigits(d);
-  }
-
-parse:
-  /* Having verified the syntax of a JSON number, use strtod() to parse
-   * (strtod() accepts a superset of JSON syntax). */
-  errno = 0;
-  {
-    char* end;
-    double val = strtod(start, &end);
-    assert(end == d->ptr);
-
-    /* Currently the min/max-val conformance tests fail if we check this.  Does
-     * this mean the conformance tests are wrong or strtod() is wrong, or
-     * something else?  Investigate further. */
-    /*
-    if (errno == ERANGE) {
-      jsondec_err(d, "Number out of range");
-    }
-    */
-
-    if (val > DBL_MAX || val < -DBL_MAX) {
-      jsondec_err(d, "Number out of range");
-    }
-
-    return val;
-  }
-}
-
-/* JSON string ****************************************************************/
-
-static char jsondec_escape(jsondec* d) {
-  switch (*d->ptr++) {
-    case '"':
-      return '\"';
-    case '\\':
-      return '\\';
-    case '/':
-      return '/';
-    case 'b':
-      return '\b';
-    case 'f':
-      return '\f';
-    case 'n':
-      return '\n';
-    case 'r':
-      return '\r';
-    case 't':
-      return '\t';
-    default:
-      jsondec_err(d, "Invalid escape char");
-  }
-}
-
-static uint32_t jsondec_codepoint(jsondec* d) {
-  uint32_t cp = 0;
-  const char* end;
-
-  if (d->end - d->ptr < 4) {
-    jsondec_err(d, "EOF inside string");
-  }
-
-  end = d->ptr + 4;
-  while (d->ptr < end) {
-    char ch = *d->ptr++;
-    if (ch >= '0' && ch <= '9') {
-      ch -= '0';
-    } else if (ch >= 'a' && ch <= 'f') {
-      ch = ch - 'a' + 10;
-    } else if (ch >= 'A' && ch <= 'F') {
-      ch = ch - 'A' + 10;
-    } else {
-      jsondec_err(d, "Invalid hex digit");
-    }
-    cp = (cp << 4) | ch;
-  }
-
-  return cp;
-}
-
-/* Parses a \uXXXX unicode escape (possibly a surrogate pair). */
-static size_t jsondec_unicode(jsondec* d, char* out) {
-  uint32_t cp = jsondec_codepoint(d);
-  if (cp >= 0xd800 && cp <= 0xdbff) {
-    /* Surrogate pair: two 16-bit codepoints become a 32-bit codepoint. */
-    uint32_t high = cp;
-    uint32_t low;
-    jsondec_parselit(d, "\\u");
-    low = jsondec_codepoint(d);
-    if (low < 0xdc00 || low > 0xdfff) {
-      jsondec_err(d, "Invalid low surrogate");
-    }
-    cp = (high & 0x3ff) << 10;
-    cp |= (low & 0x3ff);
-    cp += 0x10000;
-  } else if (cp >= 0xdc00 && cp <= 0xdfff) {
-    jsondec_err(d, "Unpaired low surrogate");
-  }
-
-  /* Write to UTF-8 */
-  if (cp <= 0x7f) {
-    out[0] = cp;
-    return 1;
-  } else if (cp <= 0x07FF) {
-    out[0] = ((cp >> 6) & 0x1F) | 0xC0;
-    out[1] = ((cp >> 0) & 0x3F) | 0x80;
-    return 2;
-  } else if (cp <= 0xFFFF) {
-    out[0] = ((cp >> 12) & 0x0F) | 0xE0;
-    out[1] = ((cp >> 6) & 0x3F) | 0x80;
-    out[2] = ((cp >> 0) & 0x3F) | 0x80;
-    return 3;
-  } else if (cp < 0x10FFFF) {
-    out[0] = ((cp >> 18) & 0x07) | 0xF0;
-    out[1] = ((cp >> 12) & 0x3f) | 0x80;
-    out[2] = ((cp >> 6) & 0x3f) | 0x80;
-    out[3] = ((cp >> 0) & 0x3f) | 0x80;
-    return 4;
-  } else {
-    jsondec_err(d, "Invalid codepoint");
-  }
-}
-
-static void jsondec_resize(jsondec* d, char** buf, char** end, char** buf_end) {
-  size_t oldsize = *buf_end - *buf;
-  size_t len = *end - *buf;
-  size_t size = UPB_MAX(8, 2 * oldsize);
-
-  *buf = upb_Arena_Realloc(d->arena, *buf, len, size);
-  if (!*buf) jsondec_err(d, "Out of memory");
-
-  *end = *buf + len;
-  *buf_end = *buf + size;
-}
-
-static upb_StringView jsondec_string(jsondec* d) {
-  char* buf = NULL;
-  char* end = NULL;
-  char* buf_end = NULL;
-
-  jsondec_skipws(d);
-
-  if (*d->ptr++ != '"') {
-    jsondec_err(d, "Expected string");
-  }
-
-  while (d->ptr < d->end) {
-    char ch = *d->ptr++;
-
-    if (end == buf_end) {
-      jsondec_resize(d, &buf, &end, &buf_end);
-    }
-
-    switch (ch) {
-      case '"': {
-        upb_StringView ret;
-        ret.data = buf;
-        ret.size = end - buf;
-        *end = '\0'; /* Needed for possible strtod(). */
-        return ret;
-      }
-      case '\\':
-        if (d->ptr == d->end) goto eof;
-        if (*d->ptr == 'u') {
-          d->ptr++;
-          if (buf_end - end < 4) {
-            /* Allow space for maximum-sized code point (4 bytes). */
-            jsondec_resize(d, &buf, &end, &buf_end);
-          }
-          end += jsondec_unicode(d, end);
-        } else {
-          *end++ = jsondec_escape(d);
-        }
-        break;
-      default:
-        if ((unsigned char)*d->ptr < 0x20) {
-          jsondec_err(d, "Invalid char in JSON string");
-        }
-        *end++ = ch;
-        break;
-    }
-  }
-
-eof:
-  jsondec_err(d, "EOF inside string");
-}
-
-static void jsondec_skipval(jsondec* d) {
-  switch (jsondec_peek(d)) {
-    case JD_OBJECT:
-      jsondec_objstart(d);
-      while (jsondec_objnext(d)) {
-        jsondec_string(d);
-        jsondec_entrysep(d);
-        jsondec_skipval(d);
-      }
-      jsondec_objend(d);
-      break;
-    case JD_ARRAY:
-      jsondec_arrstart(d);
-      while (jsondec_arrnext(d)) {
-        jsondec_skipval(d);
-      }
-      jsondec_arrend(d);
-      break;
-    case JD_TRUE:
-      jsondec_true(d);
-      break;
-    case JD_FALSE:
-      jsondec_false(d);
-      break;
-    case JD_NULL:
-      jsondec_null(d);
-      break;
-    case JD_STRING:
-      jsondec_string(d);
-      break;
-    case JD_NUMBER:
-      jsondec_number(d);
-      break;
-  }
-}
-
-/* Base64 decoding for bytes fields. ******************************************/
-
-static unsigned int jsondec_base64_tablelookup(const char ch) {
-  /* Table includes the normal base64 chars plus the URL-safe variant. */
-  const signed char table[256] = {
-      -1,       -1,       -1,       -1,       -1,       -1,        -1,
-      -1,       -1,       -1,       -1,       -1,       -1,        -1,
-      -1,       -1,       -1,       -1,       -1,       -1,        -1,
-      -1,       -1,       -1,       -1,       -1,       -1,        -1,
-      -1,       -1,       -1,       -1,       -1,       -1,        -1,
-      -1,       -1,       -1,       -1,       -1,       -1,        -1,
-      -1,       62 /*+*/, -1,       62 /*-*/, -1,       63 /*/ */, 52 /*0*/,
-      53 /*1*/, 54 /*2*/, 55 /*3*/, 56 /*4*/, 57 /*5*/, 58 /*6*/,  59 /*7*/,
-      60 /*8*/, 61 /*9*/, -1,       -1,       -1,       -1,        -1,
-      -1,       -1,       0 /*A*/,  1 /*B*/,  2 /*C*/,  3 /*D*/,   4 /*E*/,
-      5 /*F*/,  6 /*G*/,  07 /*H*/, 8 /*I*/,  9 /*J*/,  10 /*K*/,  11 /*L*/,
-      12 /*M*/, 13 /*N*/, 14 /*O*/, 15 /*P*/, 16 /*Q*/, 17 /*R*/,  18 /*S*/,
-      19 /*T*/, 20 /*U*/, 21 /*V*/, 22 /*W*/, 23 /*X*/, 24 /*Y*/,  25 /*Z*/,
-      -1,       -1,       -1,       -1,       63 /*_*/, -1,        26 /*a*/,
-      27 /*b*/, 28 /*c*/, 29 /*d*/, 30 /*e*/, 31 /*f*/, 32 /*g*/,  33 /*h*/,
-      34 /*i*/, 35 /*j*/, 36 /*k*/, 37 /*l*/, 38 /*m*/, 39 /*n*/,  40 /*o*/,
-      41 /*p*/, 42 /*q*/, 43 /*r*/, 44 /*s*/, 45 /*t*/, 46 /*u*/,  47 /*v*/,
-      48 /*w*/, 49 /*x*/, 50 /*y*/, 51 /*z*/, -1,       -1,        -1,
-      -1,       -1,       -1,       -1,       -1,       -1,        -1,
-      -1,       -1,       -1,       -1,       -1,       -1,        -1,
-      -1,       -1,       -1,       -1,       -1,       -1,        -1,
-      -1,       -1,       -1,       -1,       -1,       -1,        -1,
-      -1,       -1,       -1,       -1,       -1,       -1,        -1,
-      -1,       -1,       -1,       -1,       -1,       -1,        -1,
-      -1,       -1,       -1,       -1,       -1,       -1,        -1,
-      -1,       -1,       -1,       -1,       -1,       -1,        -1,
-      -1,       -1,       -1,       -1,       -1,       -1,        -1,
-      -1,       -1,       -1,       -1,       -1,       -1,        -1,
-      -1,       -1,       -1,       -1,       -1,       -1,        -1,
-      -1,       -1,       -1,       -1,       -1,       -1,        -1,
-      -1,       -1,       -1,       -1,       -1,       -1,        -1,
-      -1,       -1,       -1,       -1,       -1,       -1,        -1,
-      -1,       -1,       -1,       -1,       -1,       -1,        -1,
-      -1,       -1,       -1,       -1,       -1,       -1,        -1,
-      -1,       -1,       -1,       -1,       -1,       -1,        -1,
-      -1,       -1,       -1,       -1,       -1,       -1,        -1,
-      -1,       -1,       -1,       -1};
-
-  /* Sign-extend return value so high bit will be set on any unexpected char. */
-  return table[(unsigned)ch];
-}
-
-static char* jsondec_partialbase64(jsondec* d, const char* ptr, const char* end,
-                                   char* out) {
-  int32_t val = -1;
-
-  switch (end - ptr) {
-    case 2:
-      val = jsondec_base64_tablelookup(ptr[0]) << 18 |
-            jsondec_base64_tablelookup(ptr[1]) << 12;
-      out[0] = val >> 16;
-      out += 1;
-      break;
-    case 3:
-      val = jsondec_base64_tablelookup(ptr[0]) << 18 |
-            jsondec_base64_tablelookup(ptr[1]) << 12 |
-            jsondec_base64_tablelookup(ptr[2]) << 6;
-      out[0] = val >> 16;
-      out[1] = (val >> 8) & 0xff;
-      out += 2;
-      break;
-  }
-
-  if (val < 0) {
-    jsondec_err(d, "Corrupt base64");
-  }
-
-  return out;
-}
-
-static size_t jsondec_base64(jsondec* d, upb_StringView str) {
-  /* We decode in place. This is safe because this is a new buffer (not
-   * aliasing the input) and because base64 decoding shrinks 4 bytes into 3. */
-  char* out = (char*)str.data;
-  const char* ptr = str.data;
-  const char* end = ptr + str.size;
-  const char* end4 = ptr + (str.size & -4); /* Round down to multiple of 4. */
-
-  for (; ptr < end4; ptr += 4, out += 3) {
-    int val = jsondec_base64_tablelookup(ptr[0]) << 18 |
-              jsondec_base64_tablelookup(ptr[1]) << 12 |
-              jsondec_base64_tablelookup(ptr[2]) << 6 |
-              jsondec_base64_tablelookup(ptr[3]) << 0;
-
-    if (val < 0) {
-      /* Junk chars or padding. Remove trailing padding, if any. */
-      if (end - ptr == 4 && ptr[3] == '=') {
-        if (ptr[2] == '=') {
-          end -= 2;
-        } else {
-          end -= 1;
-        }
-      }
-      break;
-    }
-
-    out[0] = val >> 16;
-    out[1] = (val >> 8) & 0xff;
-    out[2] = val & 0xff;
-  }
-
-  if (ptr < end) {
-    /* Process remaining chars. We do not require padding. */
-    out = jsondec_partialbase64(d, ptr, end, out);
-  }
-
-  return out - str.data;
-}
-
-/* Low-level integer parsing **************************************************/
-
-/* We use these hand-written routines instead of strto[u]l() because the "long
- * long" variants aren't in c89. Also our version allows setting a ptr limit. */
-
-static const char* jsondec_buftouint64(jsondec* d, const char* ptr,
-                                       const char* end, uint64_t* val) {
-  uint64_t u64 = 0;
-  while (ptr < end) {
-    unsigned ch = *ptr - '0';
-    if (ch >= 10) break;
-    if (u64 > UINT64_MAX / 10 || u64 * 10 > UINT64_MAX - ch) {
-      jsondec_err(d, "Integer overflow");
-    }
-    u64 *= 10;
-    u64 += ch;
-    ptr++;
-  }
-
-  *val = u64;
-  return ptr;
-}
-
-static const char* jsondec_buftoint64(jsondec* d, const char* ptr,
-                                      const char* end, int64_t* val) {
-  bool neg = false;
-  uint64_t u64;
-
-  if (ptr != end && *ptr == '-') {
-    ptr++;
-    neg = true;
-  }
-
-  ptr = jsondec_buftouint64(d, ptr, end, &u64);
-  if (u64 > (uint64_t)INT64_MAX + neg) {
-    jsondec_err(d, "Integer overflow");
-  }
-
-  *val = neg ? -u64 : u64;
-  return ptr;
-}
-
-static uint64_t jsondec_strtouint64(jsondec* d, upb_StringView str) {
-  const char* end = str.data + str.size;
-  uint64_t ret;
-  if (jsondec_buftouint64(d, str.data, end, &ret) != end) {
-    jsondec_err(d, "Non-number characters in quoted integer");
-  }
-  return ret;
-}
-
-static int64_t jsondec_strtoint64(jsondec* d, upb_StringView str) {
-  const char* end = str.data + str.size;
-  int64_t ret;
-  if (jsondec_buftoint64(d, str.data, end, &ret) != end) {
-    jsondec_err(d, "Non-number characters in quoted integer");
-  }
-  return ret;
-}
-
-/* Primitive value types ******************************************************/
-
-/* Parse INT32 or INT64 value. */
-static upb_MessageValue jsondec_int(jsondec* d, const upb_FieldDef* f) {
-  upb_MessageValue val;
-
-  switch (jsondec_peek(d)) {
-    case JD_NUMBER: {
-      double dbl = jsondec_number(d);
-      if (dbl > 9223372036854774784.0 || dbl < -9223372036854775808.0) {
-        jsondec_err(d, "JSON number is out of range.");
-      }
-      val.int64_val = dbl; /* must be guarded, overflow here is UB */
-      if (val.int64_val != dbl) {
-        jsondec_errf(d, "JSON number was not integral (%f != %" PRId64 ")", dbl,
-                     val.int64_val);
-      }
-      break;
-    }
-    case JD_STRING: {
-      upb_StringView str = jsondec_string(d);
-      val.int64_val = jsondec_strtoint64(d, str);
-      break;
-    }
-    default:
-      jsondec_err(d, "Expected number or string");
-  }
-
-  if (upb_FieldDef_CType(f) == kUpb_CType_Int32 ||
-      upb_FieldDef_CType(f) == kUpb_CType_Enum) {
-    if (val.int64_val > INT32_MAX || val.int64_val < INT32_MIN) {
-      jsondec_err(d, "Integer out of range.");
-    }
-    val.int32_val = (int32_t)val.int64_val;
-  }
-
-  return val;
-}
-
-/* Parse UINT32 or UINT64 value. */
-static upb_MessageValue jsondec_uint(jsondec* d, const upb_FieldDef* f) {
-  upb_MessageValue val = {0};
-
-  switch (jsondec_peek(d)) {
-    case JD_NUMBER: {
-      double dbl = jsondec_number(d);
-      if (dbl > 18446744073709549568.0 || dbl < 0) {
-        jsondec_err(d, "JSON number is out of range.");
-      }
-      val.uint64_val = dbl; /* must be guarded, overflow here is UB */
-      if (val.uint64_val != dbl) {
-        jsondec_errf(d, "JSON number was not integral (%f != %" PRIu64 ")", dbl,
-                     val.uint64_val);
-      }
-      break;
-    }
-    case JD_STRING: {
-      upb_StringView str = jsondec_string(d);
-      val.uint64_val = jsondec_strtouint64(d, str);
-      break;
-    }
-    default:
-      jsondec_err(d, "Expected number or string");
-  }
-
-  if (upb_FieldDef_CType(f) == kUpb_CType_UInt32) {
-    if (val.uint64_val > UINT32_MAX) {
-      jsondec_err(d, "Integer out of range.");
-    }
-    val.uint32_val = (uint32_t)val.uint64_val;
-  }
-
-  return val;
-}
-
-/* Parse DOUBLE or FLOAT value. */
-static upb_MessageValue jsondec_double(jsondec* d, const upb_FieldDef* f) {
-  upb_StringView str;
-  upb_MessageValue val = {0};
-
-  switch (jsondec_peek(d)) {
-    case JD_NUMBER:
-      val.double_val = jsondec_number(d);
-      break;
-    case JD_STRING:
-      str = jsondec_string(d);
-      if (jsondec_streql(str, "NaN")) {
-        val.double_val = NAN;
-      } else if (jsondec_streql(str, "Infinity")) {
-        val.double_val = INFINITY;
-      } else if (jsondec_streql(str, "-Infinity")) {
-        val.double_val = -INFINITY;
-      } else {
-        val.double_val = strtod(str.data, NULL);
-      }
-      break;
-    default:
-      jsondec_err(d, "Expected number or string");
-  }
-
-  if (upb_FieldDef_CType(f) == kUpb_CType_Float) {
-    if (val.double_val != INFINITY && val.double_val != -INFINITY &&
-        (val.double_val > FLT_MAX || val.double_val < -FLT_MAX)) {
-      jsondec_err(d, "Float out of range");
-    }
-    val.float_val = val.double_val;
-  }
-
-  return val;
-}
-
-/* Parse STRING or BYTES value. */
-static upb_MessageValue jsondec_strfield(jsondec* d, const upb_FieldDef* f) {
-  upb_MessageValue val;
-  val.str_val = jsondec_string(d);
-  if (upb_FieldDef_CType(f) == kUpb_CType_Bytes) {
-    val.str_val.size = jsondec_base64(d, val.str_val);
-  }
-  return val;
-}
-
-static upb_MessageValue jsondec_enum(jsondec* d, const upb_FieldDef* f) {
-  switch (jsondec_peek(d)) {
-    case JD_STRING: {
-      upb_StringView str = jsondec_string(d);
-      const upb_EnumDef* e = upb_FieldDef_EnumSubDef(f);
-      const upb_EnumValueDef* ev =
-          upb_EnumDef_FindValueByNameWithSize(e, str.data, str.size);
-      upb_MessageValue val;
-      if (ev) {
-        val.int32_val = upb_EnumValueDef_Number(ev);
-      } else {
-        if (d->options & upb_JsonDecode_IgnoreUnknown) {
-          val.int32_val = 0;
-        } else {
-          jsondec_errf(d, "Unknown enumerator: '" UPB_STRINGVIEW_FORMAT "'",
-                       UPB_STRINGVIEW_ARGS(str));
-        }
-      }
-      return val;
-    }
-    case JD_NULL: {
-      if (jsondec_isnullvalue(f)) {
-        upb_MessageValue val;
-        jsondec_null(d);
-        val.int32_val = 0;
-        return val;
-      }
-    }
-      /* Fallthrough. */
-    default:
-      return jsondec_int(d, f);
-  }
-}
-
-static upb_MessageValue jsondec_bool(jsondec* d, const upb_FieldDef* f) {
-  bool is_map_key = upb_FieldDef_Number(f) == 1 &&
-                    upb_MessageDef_IsMapEntry(upb_FieldDef_ContainingType(f));
-  upb_MessageValue val;
-
-  if (is_map_key) {
-    upb_StringView str = jsondec_string(d);
-    if (jsondec_streql(str, "true")) {
-      val.bool_val = true;
-    } else if (jsondec_streql(str, "false")) {
-      val.bool_val = false;
-    } else {
-      jsondec_err(d, "Invalid boolean map key");
-    }
-  } else {
-    switch (jsondec_peek(d)) {
-      case JD_TRUE:
-        val.bool_val = true;
-        jsondec_true(d);
-        break;
-      case JD_FALSE:
-        val.bool_val = false;
-        jsondec_false(d);
-        break;
-      default:
-        jsondec_err(d, "Expected true or false");
-    }
-  }
-
-  return val;
-}
-
-/* Composite types (array/message/map) ****************************************/
-
-static void jsondec_array(jsondec* d, upb_Message* msg, const upb_FieldDef* f) {
-  upb_Array* arr = upb_Message_Mutable(msg, f, d->arena).array;
-
-  jsondec_arrstart(d);
-  while (jsondec_arrnext(d)) {
-    upb_MessageValue elem = jsondec_value(d, f);
-    upb_Array_Append(arr, elem, d->arena);
-  }
-  jsondec_arrend(d);
-}
-
-static void jsondec_map(jsondec* d, upb_Message* msg, const upb_FieldDef* f) {
-  upb_Map* map = upb_Message_Mutable(msg, f, d->arena).map;
-  const upb_MessageDef* entry = upb_FieldDef_MessageSubDef(f);
-  const upb_FieldDef* key_f = upb_MessageDef_FindFieldByNumber(entry, 1);
-  const upb_FieldDef* val_f = upb_MessageDef_FindFieldByNumber(entry, 2);
-
-  jsondec_objstart(d);
-  while (jsondec_objnext(d)) {
-    upb_MessageValue key, val;
-    key = jsondec_value(d, key_f);
-    jsondec_entrysep(d);
-    val = jsondec_value(d, val_f);
-    upb_Map_Set(map, key, val, d->arena);
-  }
-  jsondec_objend(d);
-}
-
-static void jsondec_tomsg(jsondec* d, upb_Message* msg,
-                          const upb_MessageDef* m) {
-  if (upb_MessageDef_WellKnownType(m) == kUpb_WellKnown_Unspecified) {
-    jsondec_object(d, msg, m);
-  } else {
-    jsondec_wellknown(d, msg, m);
-  }
-}
-
-static upb_MessageValue jsondec_msg(jsondec* d, const upb_FieldDef* f) {
-  const upb_MessageDef* m = upb_FieldDef_MessageSubDef(f);
-  upb_Message* msg = upb_Message_New(m, d->arena);
-  upb_MessageValue val;
-
-  jsondec_tomsg(d, msg, m);
-  val.msg_val = msg;
-  return val;
-}
-
-static void jsondec_field(jsondec* d, upb_Message* msg,
-                          const upb_MessageDef* m) {
-  upb_StringView name;
-  const upb_FieldDef* f;
-  const upb_FieldDef* preserved;
-
-  name = jsondec_string(d);
-  jsondec_entrysep(d);
-
-  if (name.size >= 2 && name.data[0] == '[' &&
-      name.data[name.size - 1] == ']') {
-    f = upb_DefPool_FindExtensionByNameWithSize(d->symtab, name.data + 1,
-                                                name.size - 2);
-    if (f && upb_FieldDef_ContainingType(f) != m) {
-      jsondec_errf(
-          d, "Extension %s extends message %s, but was seen in message %s",
-          upb_FieldDef_FullName(f),
-          upb_MessageDef_FullName(upb_FieldDef_ContainingType(f)),
-          upb_MessageDef_FullName(m));
-    }
-  } else {
-    f = upb_MessageDef_FindByJsonNameWithSize(m, name.data, name.size);
-  }
-
-  if (!f) {
-    if ((d->options & upb_JsonDecode_IgnoreUnknown) == 0) {
-      jsondec_errf(d, "No such field: " UPB_STRINGVIEW_FORMAT,
-                   UPB_STRINGVIEW_ARGS(name));
-    }
-    jsondec_skipval(d);
-    return;
-  }
-
-  if (jsondec_peek(d) == JD_NULL && !jsondec_isvalue(f)) {
-    /* JSON "null" indicates a default value, so no need to set anything. */
-    jsondec_null(d);
-    return;
-  }
-
-  if (upb_FieldDef_RealContainingOneof(f) &&
-      upb_Message_WhichOneof(msg, upb_FieldDef_ContainingOneof(f))) {
-    jsondec_err(d, "More than one field for this oneof.");
-  }
-
-  preserved = d->debug_field;
-  d->debug_field = f;
-
-  if (upb_FieldDef_IsMap(f)) {
-    jsondec_map(d, msg, f);
-  } else if (upb_FieldDef_IsRepeated(f)) {
-    jsondec_array(d, msg, f);
-  } else if (upb_FieldDef_IsSubMessage(f)) {
-    upb_Message* submsg = upb_Message_Mutable(msg, f, d->arena).msg;
-    const upb_MessageDef* subm = upb_FieldDef_MessageSubDef(f);
-    jsondec_tomsg(d, submsg, subm);
-  } else {
-    upb_MessageValue val = jsondec_value(d, f);
-    upb_Message_Set(msg, f, val, d->arena);
-  }
-
-  d->debug_field = preserved;
-}
-
-static void jsondec_object(jsondec* d, upb_Message* msg,
-                           const upb_MessageDef* m) {
-  jsondec_objstart(d);
-  while (jsondec_objnext(d)) {
-    jsondec_field(d, msg, m);
-  }
-  jsondec_objend(d);
-}
-
-static upb_MessageValue jsondec_value(jsondec* d, const upb_FieldDef* f) {
-  switch (upb_FieldDef_CType(f)) {
-    case kUpb_CType_Bool:
-      return jsondec_bool(d, f);
-    case kUpb_CType_Float:
-    case kUpb_CType_Double:
-      return jsondec_double(d, f);
-    case kUpb_CType_UInt32:
-    case kUpb_CType_UInt64:
-      return jsondec_uint(d, f);
-    case kUpb_CType_Int32:
-    case kUpb_CType_Int64:
-      return jsondec_int(d, f);
-    case kUpb_CType_String:
-    case kUpb_CType_Bytes:
-      return jsondec_strfield(d, f);
-    case kUpb_CType_Enum:
-      return jsondec_enum(d, f);
-    case kUpb_CType_Message:
-      return jsondec_msg(d, f);
-    default:
-      UPB_UNREACHABLE();
-  }
-}
-
-/* Well-known types ***********************************************************/
-
-static int jsondec_tsdigits(jsondec* d, const char** ptr, size_t digits,
-                            const char* after) {
-  uint64_t val;
-  const char* p = *ptr;
-  const char* end = p + digits;
-  size_t after_len = after ? strlen(after) : 0;
-
-  UPB_ASSERT(digits <= 9); /* int can't overflow. */
-
-  if (jsondec_buftouint64(d, p, end, &val) != end ||
-      (after_len && memcmp(end, after, after_len) != 0)) {
-    jsondec_err(d, "Malformed timestamp");
-  }
-
-  UPB_ASSERT(val < INT_MAX);
-
-  *ptr = end + after_len;
-  return (int)val;
-}
-
-static int jsondec_nanos(jsondec* d, const char** ptr, const char* end) {
-  uint64_t nanos = 0;
-  const char* p = *ptr;
-
-  if (p != end && *p == '.') {
-    const char* nano_end = jsondec_buftouint64(d, p + 1, end, &nanos);
-    int digits = (int)(nano_end - p - 1);
-    int exp_lg10 = 9 - digits;
-    if (digits > 9) {
-      jsondec_err(d, "Too many digits for partial seconds");
-    }
-    while (exp_lg10--) nanos *= 10;
-    *ptr = nano_end;
-  }
-
-  UPB_ASSERT(nanos < INT_MAX);
-
-  return (int)nanos;
-}
-
-/* jsondec_epochdays(1970, 1, 1) == 1970-01-01 == 0. */
-int jsondec_epochdays(int y, int m, int d) {
-  const uint32_t year_base = 4800; /* Before min year, multiple of 400. */
-  const uint32_t m_adj = m - 3;    /* March-based month. */
-  const uint32_t carry = m_adj > (uint32_t)m ? 1 : 0;
-  const uint32_t adjust = carry ? 12 : 0;
-  const uint32_t y_adj = y + year_base - carry;
-  const uint32_t month_days = ((m_adj + adjust) * 62719 + 769) / 2048;
-  const uint32_t leap_days = y_adj / 4 - y_adj / 100 + y_adj / 400;
-  return y_adj * 365 + leap_days + month_days + (d - 1) - 2472632;
-}
-
-static int64_t jsondec_unixtime(int y, int m, int d, int h, int min, int s) {
-  return (int64_t)jsondec_epochdays(y, m, d) * 86400 + h * 3600 + min * 60 + s;
-}
-
-static void jsondec_timestamp(jsondec* d, upb_Message* msg,
-                              const upb_MessageDef* m) {
-  upb_MessageValue seconds;
-  upb_MessageValue nanos;
-  upb_StringView str = jsondec_string(d);
-  const char* ptr = str.data;
-  const char* end = ptr + str.size;
-
-  if (str.size < 20) goto malformed;
-
-  {
-    /* 1972-01-01T01:00:00 */
-    int year = jsondec_tsdigits(d, &ptr, 4, "-");
-    int mon = jsondec_tsdigits(d, &ptr, 2, "-");
-    int day = jsondec_tsdigits(d, &ptr, 2, "T");
-    int hour = jsondec_tsdigits(d, &ptr, 2, ":");
-    int min = jsondec_tsdigits(d, &ptr, 2, ":");
-    int sec = jsondec_tsdigits(d, &ptr, 2, NULL);
-
-    seconds.int64_val = jsondec_unixtime(year, mon, day, hour, min, sec);
-  }
-
-  nanos.int32_val = jsondec_nanos(d, &ptr, end);
-
-  {
-    /* [+-]08:00 or Z */
-    int ofs_hour = 0;
-    int ofs_min = 0;
-    bool neg = false;
-
-    if (ptr == end) goto malformed;
-
-    switch (*ptr++) {
-      case '-':
-        neg = true;
-        /* fallthrough */
-      case '+':
-        if ((end - ptr) != 5) goto malformed;
-        ofs_hour = jsondec_tsdigits(d, &ptr, 2, ":");
-        ofs_min = jsondec_tsdigits(d, &ptr, 2, NULL);
-        ofs_min = ((ofs_hour * 60) + ofs_min) * 60;
-        seconds.int64_val += (neg ? ofs_min : -ofs_min);
-        break;
-      case 'Z':
-        if (ptr != end) goto malformed;
-        break;
-      default:
-        goto malformed;
-    }
-  }
-
-  if (seconds.int64_val < -62135596800) {
-    jsondec_err(d, "Timestamp out of range");
-  }
-
-  upb_Message_Set(msg, upb_MessageDef_FindFieldByNumber(m, 1), seconds,
-                  d->arena);
-  upb_Message_Set(msg, upb_MessageDef_FindFieldByNumber(m, 2), nanos, d->arena);
-  return;
-
-malformed:
-  jsondec_err(d, "Malformed timestamp");
-}
-
-static void jsondec_duration(jsondec* d, upb_Message* msg,
-                             const upb_MessageDef* m) {
-  upb_MessageValue seconds;
-  upb_MessageValue nanos;
-  upb_StringView str = jsondec_string(d);
-  const char* ptr = str.data;
-  const char* end = ptr + str.size;
-  const int64_t max = (uint64_t)3652500 * 86400;
-
-  /* "3.000000001s", "3s", etc. */
-  ptr = jsondec_buftoint64(d, ptr, end, &seconds.int64_val);
-  nanos.int32_val = jsondec_nanos(d, &ptr, end);
-
-  if (end - ptr != 1 || *ptr != 's') {
-    jsondec_err(d, "Malformed duration");
-  }
-
-  if (seconds.int64_val < -max || seconds.int64_val > max) {
-    jsondec_err(d, "Duration out of range");
-  }
-
-  if (seconds.int64_val < 0) {
-    nanos.int32_val = -nanos.int32_val;
-  }
-
-  upb_Message_Set(msg, upb_MessageDef_FindFieldByNumber(m, 1), seconds,
-                  d->arena);
-  upb_Message_Set(msg, upb_MessageDef_FindFieldByNumber(m, 2), nanos, d->arena);
-}
-
-static void jsondec_listvalue(jsondec* d, upb_Message* msg,
-                              const upb_MessageDef* m) {
-  const upb_FieldDef* values_f = upb_MessageDef_FindFieldByNumber(m, 1);
-  const upb_MessageDef* value_m = upb_FieldDef_MessageSubDef(values_f);
-  upb_Array* values = upb_Message_Mutable(msg, values_f, d->arena).array;
-
-  jsondec_arrstart(d);
-  while (jsondec_arrnext(d)) {
-    upb_Message* value_msg = upb_Message_New(value_m, d->arena);
-    upb_MessageValue value;
-    value.msg_val = value_msg;
-    upb_Array_Append(values, value, d->arena);
-    jsondec_wellknownvalue(d, value_msg, value_m);
-  }
-  jsondec_arrend(d);
-}
-
-static void jsondec_struct(jsondec* d, upb_Message* msg,
-                           const upb_MessageDef* m) {
-  const upb_FieldDef* fields_f = upb_MessageDef_FindFieldByNumber(m, 1);
-  const upb_MessageDef* entry_m = upb_FieldDef_MessageSubDef(fields_f);
-  const upb_FieldDef* value_f = upb_MessageDef_FindFieldByNumber(entry_m, 2);
-  const upb_MessageDef* value_m = upb_FieldDef_MessageSubDef(value_f);
-  upb_Map* fields = upb_Message_Mutable(msg, fields_f, d->arena).map;
-
-  jsondec_objstart(d);
-  while (jsondec_objnext(d)) {
-    upb_MessageValue key, value;
-    upb_Message* value_msg = upb_Message_New(value_m, d->arena);
-    key.str_val = jsondec_string(d);
-    value.msg_val = value_msg;
-    upb_Map_Set(fields, key, value, d->arena);
-    jsondec_entrysep(d);
-    jsondec_wellknownvalue(d, value_msg, value_m);
-  }
-  jsondec_objend(d);
-}
-
-static void jsondec_wellknownvalue(jsondec* d, upb_Message* msg,
-                                   const upb_MessageDef* m) {
-  upb_MessageValue val;
-  const upb_FieldDef* f;
-  upb_Message* submsg;
-
-  switch (jsondec_peek(d)) {
-    case JD_NUMBER:
-      /* double number_value = 2; */
-      f = upb_MessageDef_FindFieldByNumber(m, 2);
-      val.double_val = jsondec_number(d);
-      break;
-    case JD_STRING:
-      /* string string_value = 3; */
-      f = upb_MessageDef_FindFieldByNumber(m, 3);
-      val.str_val = jsondec_string(d);
-      break;
-    case JD_FALSE:
-      /* bool bool_value = 4; */
-      f = upb_MessageDef_FindFieldByNumber(m, 4);
-      val.bool_val = false;
-      jsondec_false(d);
-      break;
-    case JD_TRUE:
-      /* bool bool_value = 4; */
-      f = upb_MessageDef_FindFieldByNumber(m, 4);
-      val.bool_val = true;
-      jsondec_true(d);
-      break;
-    case JD_NULL:
-      /* NullValue null_value = 1; */
-      f = upb_MessageDef_FindFieldByNumber(m, 1);
-      val.int32_val = 0;
-      jsondec_null(d);
-      break;
-    /* Note: these cases return, because upb_Message_Mutable() is enough. */
-    case JD_OBJECT:
-      /* Struct struct_value = 5; */
-      f = upb_MessageDef_FindFieldByNumber(m, 5);
-      submsg = upb_Message_Mutable(msg, f, d->arena).msg;
-      jsondec_struct(d, submsg, upb_FieldDef_MessageSubDef(f));
-      return;
-    case JD_ARRAY:
-      /* ListValue list_value = 6; */
-      f = upb_MessageDef_FindFieldByNumber(m, 6);
-      submsg = upb_Message_Mutable(msg, f, d->arena).msg;
-      jsondec_listvalue(d, submsg, upb_FieldDef_MessageSubDef(f));
-      return;
-    default:
-      UPB_UNREACHABLE();
-  }
-
-  upb_Message_Set(msg, f, val, d->arena);
-}
-
-static upb_StringView jsondec_mask(jsondec* d, const char* buf,
-                                   const char* end) {
-  /* FieldMask fields grow due to inserted '_' characters, so we can't do the
-   * transform in place. */
-  const char* ptr = buf;
-  upb_StringView ret;
-  char* out;
-
-  ret.size = end - ptr;
-  while (ptr < end) {
-    ret.size += (*ptr >= 'A' && *ptr <= 'Z');
-    ptr++;
-  }
-
-  out = upb_Arena_Malloc(d->arena, ret.size);
-  ptr = buf;
-  ret.data = out;
-
-  while (ptr < end) {
-    char ch = *ptr++;
-    if (ch >= 'A' && ch <= 'Z') {
-      *out++ = '_';
-      *out++ = ch + 32;
-    } else if (ch == '_') {
-      jsondec_err(d, "field mask may not contain '_'");
-    } else {
-      *out++ = ch;
-    }
-  }
-
-  return ret;
-}
-
-static void jsondec_fieldmask(jsondec* d, upb_Message* msg,
-                              const upb_MessageDef* m) {
-  /* repeated string paths = 1; */
-  const upb_FieldDef* paths_f = upb_MessageDef_FindFieldByNumber(m, 1);
-  upb_Array* arr = upb_Message_Mutable(msg, paths_f, d->arena).array;
-  upb_StringView str = jsondec_string(d);
-  const char* ptr = str.data;
-  const char* end = ptr + str.size;
-  upb_MessageValue val;
-
-  while (ptr < end) {
-    const char* elem_end = memchr(ptr, ',', end - ptr);
-    if (elem_end) {
-      val.str_val = jsondec_mask(d, ptr, elem_end);
-      ptr = elem_end + 1;
-    } else {
-      val.str_val = jsondec_mask(d, ptr, end);
-      ptr = end;
-    }
-    upb_Array_Append(arr, val, d->arena);
-  }
-}
-
-static void jsondec_anyfield(jsondec* d, upb_Message* msg,
-                             const upb_MessageDef* m) {
-  if (upb_MessageDef_WellKnownType(m) == kUpb_WellKnown_Unspecified) {
-    /* For regular types: {"@type": "[user type]", "f1": <V1>, "f2": <V2>}
-     * where f1, f2, etc. are the normal fields of this type. */
-    jsondec_field(d, msg, m);
-  } else {
-    /* For well-known types: {"@type": "[well-known type]", "value": <X>}
-     * where <X> is whatever encoding the WKT normally uses. */
-    upb_StringView str = jsondec_string(d);
-    jsondec_entrysep(d);
-    if (!jsondec_streql(str, "value")) {
-      jsondec_err(d, "Key for well-known type must be 'value'");
-    }
-    jsondec_wellknown(d, msg, m);
-  }
-}
-
-static const upb_MessageDef* jsondec_typeurl(jsondec* d, upb_Message* msg,
-                                             const upb_MessageDef* m) {
-  const upb_FieldDef* type_url_f = upb_MessageDef_FindFieldByNumber(m, 1);
-  const upb_MessageDef* type_m;
-  upb_StringView type_url = jsondec_string(d);
-  const char* end = type_url.data + type_url.size;
-  const char* ptr = end;
-  upb_MessageValue val;
-
-  val.str_val = type_url;
-  upb_Message_Set(msg, type_url_f, val, d->arena);
-
-  /* Find message name after the last '/' */
-  while (ptr > type_url.data && *--ptr != '/') {
-  }
-
-  if (ptr == type_url.data || ptr == end) {
-    jsondec_err(d, "Type url must have at least one '/' and non-empty host");
-  }
-
-  ptr++;
-  type_m = upb_DefPool_FindMessageByNameWithSize(d->symtab, ptr, end - ptr);
-
-  if (!type_m) {
-    jsondec_err(d, "Type was not found");
-  }
-
-  return type_m;
-}
-
-static void jsondec_any(jsondec* d, upb_Message* msg, const upb_MessageDef* m) {
-  /* string type_url = 1;
-   * bytes value = 2; */
-  const upb_FieldDef* value_f = upb_MessageDef_FindFieldByNumber(m, 2);
-  upb_Message* any_msg;
-  const upb_MessageDef* any_m = NULL;
-  const char* pre_type_data = NULL;
-  const char* pre_type_end = NULL;
-  upb_MessageValue encoded;
-
-  jsondec_objstart(d);
-
-  /* Scan looking for "@type", which is not necessarily first. */
-  while (!any_m && jsondec_objnext(d)) {
-    const char* start = d->ptr;
-    upb_StringView name = jsondec_string(d);
-    jsondec_entrysep(d);
-    if (jsondec_streql(name, "@type")) {
-      any_m = jsondec_typeurl(d, msg, m);
-      if (pre_type_data) {
-        pre_type_end = start;
-        while (*pre_type_end != ',') pre_type_end--;
-      }
-    } else {
-      if (!pre_type_data) pre_type_data = start;
-      jsondec_skipval(d);
-    }
-  }
-
-  if (!any_m) {
-    jsondec_err(d, "Any object didn't contain a '@type' field");
-  }
-
-  any_msg = upb_Message_New(any_m, d->arena);
-
-  if (pre_type_data) {
-    size_t len = pre_type_end - pre_type_data + 1;
-    char* tmp = upb_Arena_Malloc(d->arena, len);
-    const char* saved_ptr = d->ptr;
-    const char* saved_end = d->end;
-    memcpy(tmp, pre_type_data, len - 1);
-    tmp[len - 1] = '}';
-    d->ptr = tmp;
-    d->end = tmp + len;
-    d->is_first = true;
-    while (jsondec_objnext(d)) {
-      jsondec_anyfield(d, any_msg, any_m);
-    }
-    d->ptr = saved_ptr;
-    d->end = saved_end;
-  }
-
-  while (jsondec_objnext(d)) {
-    jsondec_anyfield(d, any_msg, any_m);
-  }
-
-  jsondec_objend(d);
-
-  encoded.str_val.data = upb_Encode(any_msg, upb_MessageDef_MiniTable(any_m), 0,
-                                    d->arena, &encoded.str_val.size);
-  upb_Message_Set(msg, value_f, encoded, d->arena);
-}
-
-static void jsondec_wrapper(jsondec* d, upb_Message* msg,
-                            const upb_MessageDef* m) {
-  const upb_FieldDef* value_f = upb_MessageDef_FindFieldByNumber(m, 1);
-  upb_MessageValue val = jsondec_value(d, value_f);
-  upb_Message_Set(msg, value_f, val, d->arena);
-}
-
-static void jsondec_wellknown(jsondec* d, upb_Message* msg,
-                              const upb_MessageDef* m) {
-  switch (upb_MessageDef_WellKnownType(m)) {
-    case kUpb_WellKnown_Any:
-      jsondec_any(d, msg, m);
-      break;
-    case kUpb_WellKnown_FieldMask:
-      jsondec_fieldmask(d, msg, m);
-      break;
-    case kUpb_WellKnown_Duration:
-      jsondec_duration(d, msg, m);
-      break;
-    case kUpb_WellKnown_Timestamp:
-      jsondec_timestamp(d, msg, m);
-      break;
-    case kUpb_WellKnown_Value:
-      jsondec_wellknownvalue(d, msg, m);
-      break;
-    case kUpb_WellKnown_ListValue:
-      jsondec_listvalue(d, msg, m);
-      break;
-    case kUpb_WellKnown_Struct:
-      jsondec_struct(d, msg, m);
-      break;
-    case kUpb_WellKnown_DoubleValue:
-    case kUpb_WellKnown_FloatValue:
-    case kUpb_WellKnown_Int64Value:
-    case kUpb_WellKnown_UInt64Value:
-    case kUpb_WellKnown_Int32Value:
-    case kUpb_WellKnown_UInt32Value:
-    case kUpb_WellKnown_StringValue:
-    case kUpb_WellKnown_BytesValue:
-    case kUpb_WellKnown_BoolValue:
-      jsondec_wrapper(d, msg, m);
-      break;
-    default:
-      UPB_UNREACHABLE();
-  }
-}
-
-bool upb_JsonDecode(const char* buf, size_t size, upb_Message* msg,
-                    const upb_MessageDef* m, const upb_DefPool* symtab,
-                    int options, upb_Arena* arena, upb_Status* status) {
-  jsondec d;
-
-  if (size == 0) return true;
-
-  d.ptr = buf;
-  d.end = buf + size;
-  d.arena = arena;
-  d.symtab = symtab;
-  d.status = status;
-  d.options = options;
-  d.depth = 64;
-  d.line = 1;
-  d.line_begin = d.ptr;
-  d.debug_field = NULL;
-  d.is_first = false;
-
-  if (UPB_SETJMP(d.err)) return false;
-
-  jsondec_tomsg(&d, msg, m);
-  return true;
-}
-
-/** upb/json_encode.c ************************************************************/
-
-#include <ctype.h>
-#include <float.h>
-#include <inttypes.h>
-#include <math.h>
-#include <setjmp.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <string.h>
-
-
-/* Must be last. */
-
-typedef struct {
-  char *buf, *ptr, *end;
-  size_t overflow;
-  int indent_depth;
-  int options;
-  const upb_DefPool* ext_pool;
-  jmp_buf err;
-  upb_Status* status;
-  upb_Arena* arena;
-} jsonenc;
-
-static void jsonenc_msg(jsonenc* e, const upb_Message* msg,
-                        const upb_MessageDef* m);
-static void jsonenc_scalar(jsonenc* e, upb_MessageValue val,
-                           const upb_FieldDef* f);
-static void jsonenc_msgfield(jsonenc* e, const upb_Message* msg,
-                             const upb_MessageDef* m);
-static void jsonenc_msgfields(jsonenc* e, const upb_Message* msg,
-                              const upb_MessageDef* m, bool first);
-static void jsonenc_value(jsonenc* e, const upb_Message* msg,
-                          const upb_MessageDef* m);
-
-UPB_NORETURN static void jsonenc_err(jsonenc* e, const char* msg) {
-  upb_Status_SetErrorMessage(e->status, msg);
-  longjmp(e->err, 1);
-}
-
-UPB_PRINTF(2, 3)
-UPB_NORETURN static void jsonenc_errf(jsonenc* e, const char* fmt, ...) {
-  va_list argp;
-  va_start(argp, fmt);
-  upb_Status_VSetErrorFormat(e->status, fmt, argp);
-  va_end(argp);
-  longjmp(e->err, 1);
-}
-
-static upb_Arena* jsonenc_arena(jsonenc* e) {
-  /* Create lazily, since it's only needed for Any */
-  if (!e->arena) {
-    e->arena = upb_Arena_New();
-  }
-  return e->arena;
-}
-
-static void jsonenc_putbytes(jsonenc* e, const void* data, size_t len) {
-  size_t have = e->end - e->ptr;
-  if (UPB_LIKELY(have >= len)) {
-    memcpy(e->ptr, data, len);
-    e->ptr += len;
-  } else {
-    if (have) {
-      memcpy(e->ptr, data, have);
-      e->ptr += have;
-    }
-    e->overflow += (len - have);
-  }
-}
-
-static void jsonenc_putstr(jsonenc* e, const char* str) {
-  jsonenc_putbytes(e, str, strlen(str));
-}
-
-UPB_PRINTF(2, 3)
-static void jsonenc_printf(jsonenc* e, const char* fmt, ...) {
-  size_t n;
-  size_t have = e->end - e->ptr;
-  va_list args;
-
-  va_start(args, fmt);
-  n = _upb_vsnprintf(e->ptr, have, fmt, args);
-  va_end(args);
-
-  if (UPB_LIKELY(have > n)) {
-    e->ptr += n;
-  } else {
-    e->ptr = UPB_PTRADD(e->ptr, have);
-    e->overflow += (n - have);
-  }
-}
-
-static void jsonenc_nanos(jsonenc* e, int32_t nanos) {
-  int digits = 9;
-
-  if (nanos == 0) return;
-  if (nanos < 0 || nanos >= 1000000000) {
-    jsonenc_err(e, "error formatting timestamp as JSON: invalid nanos");
-  }
-
-  while (nanos % 1000 == 0) {
-    nanos /= 1000;
-    digits -= 3;
-  }
-
-  jsonenc_printf(e, ".%.*" PRId32, digits, nanos);
-}
-
-static void jsonenc_timestamp(jsonenc* e, const upb_Message* msg,
-                              const upb_MessageDef* m) {
-  const upb_FieldDef* seconds_f = upb_MessageDef_FindFieldByNumber(m, 1);
-  const upb_FieldDef* nanos_f = upb_MessageDef_FindFieldByNumber(m, 2);
-  int64_t seconds = upb_Message_Get(msg, seconds_f).int64_val;
-  int32_t nanos = upb_Message_Get(msg, nanos_f).int32_val;
-  int L, N, I, J, K, hour, min, sec;
-
-  if (seconds < -62135596800) {
-    jsonenc_err(e,
-                "error formatting timestamp as JSON: minimum acceptable value "
-                "is 0001-01-01T00:00:00Z");
-  } else if (seconds > 253402300799) {
-    jsonenc_err(e,
-                "error formatting timestamp as JSON: maximum acceptable value "
-                "is 9999-12-31T23:59:59Z");
-  }
-
-  /* Julian Day -> Y/M/D, Algorithm from:
-   * Fliegel, H. F., and Van Flandern, T. C., "A Machine Algorithm for
-   *   Processing Calendar Dates," Communications of the Association of
-   *   Computing Machines, vol. 11 (1968), p. 657.  */
-  seconds += 62135596800;  // Ensure seconds is positive.
-  L = (int)(seconds / 86400) - 719162 + 68569 + 2440588;
-  N = 4 * L / 146097;
-  L = L - (146097 * N + 3) / 4;
-  I = 4000 * (L + 1) / 1461001;
-  L = L - 1461 * I / 4 + 31;
-  J = 80 * L / 2447;
-  K = L - 2447 * J / 80;
-  L = J / 11;
-  J = J + 2 - 12 * L;
-  I = 100 * (N - 49) + I + L;
-
-  sec = seconds % 60;
-  min = (seconds / 60) % 60;
-  hour = (seconds / 3600) % 24;
-
-  jsonenc_printf(e, "\"%04d-%02d-%02dT%02d:%02d:%02d", I, J, K, hour, min, sec);
-  jsonenc_nanos(e, nanos);
-  jsonenc_putstr(e, "Z\"");
-}
-
-static void jsonenc_duration(jsonenc* e, const upb_Message* msg,
-                             const upb_MessageDef* m) {
-  const upb_FieldDef* seconds_f = upb_MessageDef_FindFieldByNumber(m, 1);
-  const upb_FieldDef* nanos_f = upb_MessageDef_FindFieldByNumber(m, 2);
-  int64_t seconds = upb_Message_Get(msg, seconds_f).int64_val;
-  int32_t nanos = upb_Message_Get(msg, nanos_f).int32_val;
-
-  if (seconds > 315576000000 || seconds < -315576000000 ||
-      (seconds < 0) != (nanos < 0)) {
-    jsonenc_err(e, "bad duration");
-  }
-
-  if (nanos < 0) {
-    nanos = -nanos;
-  }
-
-  jsonenc_printf(e, "\"%" PRId64, seconds);
-  jsonenc_nanos(e, nanos);
-  jsonenc_putstr(e, "s\"");
-}
-
-static void jsonenc_enum(int32_t val, const upb_FieldDef* f, jsonenc* e) {
-  const upb_EnumDef* e_def = upb_FieldDef_EnumSubDef(f);
-
-  if (strcmp(upb_EnumDef_FullName(e_def), "google.protobuf.NullValue") == 0) {
-    jsonenc_putstr(e, "null");
-  } else {
-    const upb_EnumValueDef* ev = upb_EnumDef_FindValueByNumber(e_def, val);
-
-    if (ev) {
-      jsonenc_printf(e, "\"%s\"", upb_EnumValueDef_Name(ev));
-    } else {
-      jsonenc_printf(e, "%" PRId32, val);
-    }
-  }
-}
-
-static void jsonenc_bytes(jsonenc* e, upb_StringView str) {
-  /* This is the regular base64, not the "web-safe" version. */
-  static const char base64[] =
-      "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-  const unsigned char* ptr = (unsigned char*)str.data;
-  const unsigned char* end = UPB_PTRADD(ptr, str.size);
-  char buf[4];
-
-  jsonenc_putstr(e, "\"");
-
-  while (end - ptr >= 3) {
-    buf[0] = base64[ptr[0] >> 2];
-    buf[1] = base64[((ptr[0] & 0x3) << 4) | (ptr[1] >> 4)];
-    buf[2] = base64[((ptr[1] & 0xf) << 2) | (ptr[2] >> 6)];
-    buf[3] = base64[ptr[2] & 0x3f];
-    jsonenc_putbytes(e, buf, 4);
-    ptr += 3;
-  }
-
-  switch (end - ptr) {
-    case 2:
-      buf[0] = base64[ptr[0] >> 2];
-      buf[1] = base64[((ptr[0] & 0x3) << 4) | (ptr[1] >> 4)];
-      buf[2] = base64[(ptr[1] & 0xf) << 2];
-      buf[3] = '=';
-      jsonenc_putbytes(e, buf, 4);
-      break;
-    case 1:
-      buf[0] = base64[ptr[0] >> 2];
-      buf[1] = base64[((ptr[0] & 0x3) << 4)];
-      buf[2] = '=';
-      buf[3] = '=';
-      jsonenc_putbytes(e, buf, 4);
-      break;
-  }
-
-  jsonenc_putstr(e, "\"");
-}
-
-static void jsonenc_stringbody(jsonenc* e, upb_StringView str) {
-  const char* ptr = str.data;
-  const char* end = UPB_PTRADD(ptr, str.size);
-
-  while (ptr < end) {
-    switch (*ptr) {
-      case '\n':
-        jsonenc_putstr(e, "\\n");
-        break;
-      case '\r':
-        jsonenc_putstr(e, "\\r");
-        break;
-      case '\t':
-        jsonenc_putstr(e, "\\t");
-        break;
-      case '\"':
-        jsonenc_putstr(e, "\\\"");
-        break;
-      case '\f':
-        jsonenc_putstr(e, "\\f");
-        break;
-      case '\b':
-        jsonenc_putstr(e, "\\b");
-        break;
-      case '\\':
-        jsonenc_putstr(e, "\\\\");
-        break;
-      default:
-        if ((uint8_t)*ptr < 0x20) {
-          jsonenc_printf(e, "\\u%04x", (int)(uint8_t)*ptr);
-        } else {
-          /* This could be a non-ASCII byte.  We rely on the string being valid
-           * UTF-8. */
-          jsonenc_putbytes(e, ptr, 1);
-        }
-        break;
-    }
-    ptr++;
-  }
-}
-
-static void jsonenc_string(jsonenc* e, upb_StringView str) {
-  jsonenc_putstr(e, "\"");
-  jsonenc_stringbody(e, str);
-  jsonenc_putstr(e, "\"");
-}
-
-static bool upb_JsonEncode_HandleSpecialDoubles(jsonenc* e, double val) {
-  if (val == INFINITY) {
-    jsonenc_putstr(e, "\"Infinity\"");
-  } else if (val == -INFINITY) {
-    jsonenc_putstr(e, "\"-Infinity\"");
-  } else if (val != val) {
-    jsonenc_putstr(e, "\"NaN\"");
-  } else {
-    return false;
-  }
-  return true;
-}
-
-static void upb_JsonEncode_Double(jsonenc* e, double val) {
-  if (upb_JsonEncode_HandleSpecialDoubles(e, val)) return;
-  char buf[32];
-  _upb_EncodeRoundTripDouble(val, buf, sizeof(buf));
-  jsonenc_putstr(e, buf);
-}
-
-static void upb_JsonEncode_Float(jsonenc* e, float val) {
-  if (upb_JsonEncode_HandleSpecialDoubles(e, val)) return;
-  char buf[32];
-  _upb_EncodeRoundTripFloat(val, buf, sizeof(buf));
-  jsonenc_putstr(e, buf);
-}
-
-static void jsonenc_wrapper(jsonenc* e, const upb_Message* msg,
-                            const upb_MessageDef* m) {
-  const upb_FieldDef* val_f = upb_MessageDef_FindFieldByNumber(m, 1);
-  upb_MessageValue val = upb_Message_Get(msg, val_f);
-  jsonenc_scalar(e, val, val_f);
-}
-
-static const upb_MessageDef* jsonenc_getanymsg(jsonenc* e,
-                                               upb_StringView type_url) {
-  /* Find last '/', if any. */
-  const char* end = type_url.data + type_url.size;
-  const char* ptr = end;
-  const upb_MessageDef* ret;
-
-  if (!e->ext_pool) {
-    jsonenc_err(e, "Tried to encode Any, but no symtab was provided");
-  }
-
-  if (type_url.size == 0) goto badurl;
-
-  while (true) {
-    if (--ptr == type_url.data) {
-      /* Type URL must contain at least one '/', with host before. */
-      goto badurl;
-    }
-    if (*ptr == '/') {
-      ptr++;
-      break;
-    }
-  }
-
-  ret = upb_DefPool_FindMessageByNameWithSize(e->ext_pool, ptr, end - ptr);
-
-  if (!ret) {
-    jsonenc_errf(e, "Couldn't find Any type: %.*s", (int)(end - ptr), ptr);
-  }
-
-  return ret;
-
-badurl:
-  jsonenc_errf(e, "Bad type URL: " UPB_STRINGVIEW_FORMAT,
-               UPB_STRINGVIEW_ARGS(type_url));
-}
-
-static void jsonenc_any(jsonenc* e, const upb_Message* msg,
-                        const upb_MessageDef* m) {
-  const upb_FieldDef* type_url_f = upb_MessageDef_FindFieldByNumber(m, 1);
-  const upb_FieldDef* value_f = upb_MessageDef_FindFieldByNumber(m, 2);
-  upb_StringView type_url = upb_Message_Get(msg, type_url_f).str_val;
-  upb_StringView value = upb_Message_Get(msg, value_f).str_val;
-  const upb_MessageDef* any_m = jsonenc_getanymsg(e, type_url);
-  const upb_MiniTable* any_layout = upb_MessageDef_MiniTable(any_m);
-  upb_Arena* arena = jsonenc_arena(e);
-  upb_Message* any = upb_Message_New(any_m, arena);
-
-  if (upb_Decode(value.data, value.size, any, any_layout, NULL, 0, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    jsonenc_err(e, "Error decoding message in Any");
-  }
-
-  jsonenc_putstr(e, "{\"@type\":");
-  jsonenc_string(e, type_url);
-
-  if (upb_MessageDef_WellKnownType(any_m) == kUpb_WellKnown_Unspecified) {
-    /* Regular messages: {"@type": "...","foo": 1, "bar": 2} */
-    jsonenc_msgfields(e, any, any_m, false);
-  } else {
-    /* Well-known type: {"@type": "...","value": <well-known encoding>} */
-    jsonenc_putstr(e, ",\"value\":");
-    jsonenc_msgfield(e, any, any_m);
-  }
-
-  jsonenc_putstr(e, "}");
-}
-
-static void jsonenc_putsep(jsonenc* e, const char* str, bool* first) {
-  if (*first) {
-    *first = false;
-  } else {
-    jsonenc_putstr(e, str);
-  }
-}
-
-static void jsonenc_fieldpath(jsonenc* e, upb_StringView path) {
-  const char* ptr = path.data;
-  const char* end = ptr + path.size;
-
-  while (ptr < end) {
-    char ch = *ptr;
-
-    if (ch >= 'A' && ch <= 'Z') {
-      jsonenc_err(e, "Field mask element may not have upper-case letter.");
-    } else if (ch == '_') {
-      if (ptr == end - 1 || *(ptr + 1) < 'a' || *(ptr + 1) > 'z') {
-        jsonenc_err(e, "Underscore must be followed by a lowercase letter.");
-      }
-      ch = *++ptr - 32;
-    }
-
-    jsonenc_putbytes(e, &ch, 1);
-    ptr++;
-  }
-}
-
-static void jsonenc_fieldmask(jsonenc* e, const upb_Message* msg,
-                              const upb_MessageDef* m) {
-  const upb_FieldDef* paths_f = upb_MessageDef_FindFieldByNumber(m, 1);
-  const upb_Array* paths = upb_Message_Get(msg, paths_f).array_val;
-  bool first = true;
-  size_t i, n = 0;
-
-  if (paths) n = upb_Array_Size(paths);
-
-  jsonenc_putstr(e, "\"");
-
-  for (i = 0; i < n; i++) {
-    jsonenc_putsep(e, ",", &first);
-    jsonenc_fieldpath(e, upb_Array_Get(paths, i).str_val);
-  }
-
-  jsonenc_putstr(e, "\"");
-}
-
-static void jsonenc_struct(jsonenc* e, const upb_Message* msg,
-                           const upb_MessageDef* m) {
-  const upb_FieldDef* fields_f = upb_MessageDef_FindFieldByNumber(m, 1);
-  const upb_Map* fields = upb_Message_Get(msg, fields_f).map_val;
-  const upb_MessageDef* entry_m = upb_FieldDef_MessageSubDef(fields_f);
-  const upb_FieldDef* value_f = upb_MessageDef_FindFieldByNumber(entry_m, 2);
-  size_t iter = kUpb_Map_Begin;
-  bool first = true;
-
-  jsonenc_putstr(e, "{");
-
-  if (fields) {
-    while (upb_MapIterator_Next(fields, &iter)) {
-      upb_MessageValue key = upb_MapIterator_Key(fields, iter);
-      upb_MessageValue val = upb_MapIterator_Value(fields, iter);
-
-      jsonenc_putsep(e, ",", &first);
-      jsonenc_string(e, key.str_val);
-      jsonenc_putstr(e, ":");
-      jsonenc_value(e, val.msg_val, upb_FieldDef_MessageSubDef(value_f));
-    }
-  }
-
-  jsonenc_putstr(e, "}");
-}
-
-static void jsonenc_listvalue(jsonenc* e, const upb_Message* msg,
-                              const upb_MessageDef* m) {
-  const upb_FieldDef* values_f = upb_MessageDef_FindFieldByNumber(m, 1);
-  const upb_MessageDef* values_m = upb_FieldDef_MessageSubDef(values_f);
-  const upb_Array* values = upb_Message_Get(msg, values_f).array_val;
-  size_t i;
-  bool first = true;
-
-  jsonenc_putstr(e, "[");
-
-  if (values) {
-    const size_t size = upb_Array_Size(values);
-    for (i = 0; i < size; i++) {
-      upb_MessageValue elem = upb_Array_Get(values, i);
-
-      jsonenc_putsep(e, ",", &first);
-      jsonenc_value(e, elem.msg_val, values_m);
-    }
-  }
-
-  jsonenc_putstr(e, "]");
-}
-
-static void jsonenc_value(jsonenc* e, const upb_Message* msg,
-                          const upb_MessageDef* m) {
-  /* TODO(haberman): do we want a reflection method to get oneof case? */
-  size_t iter = kUpb_Message_Begin;
-  const upb_FieldDef* f;
-  upb_MessageValue val;
-
-  if (!upb_Message_Next(msg, m, NULL, &f, &val, &iter)) {
-    jsonenc_err(e, "No value set in Value proto");
-  }
-
-  switch (upb_FieldDef_Number(f)) {
-    case 1:
-      jsonenc_putstr(e, "null");
-      break;
-    case 2:
-      upb_JsonEncode_Double(e, val.double_val);
-      break;
-    case 3:
-      jsonenc_string(e, val.str_val);
-      break;
-    case 4:
-      jsonenc_putstr(e, val.bool_val ? "true" : "false");
-      break;
-    case 5:
-      jsonenc_struct(e, val.msg_val, upb_FieldDef_MessageSubDef(f));
-      break;
-    case 6:
-      jsonenc_listvalue(e, val.msg_val, upb_FieldDef_MessageSubDef(f));
-      break;
-  }
-}
-
-static void jsonenc_msgfield(jsonenc* e, const upb_Message* msg,
-                             const upb_MessageDef* m) {
-  switch (upb_MessageDef_WellKnownType(m)) {
-    case kUpb_WellKnown_Unspecified:
-      jsonenc_msg(e, msg, m);
-      break;
-    case kUpb_WellKnown_Any:
-      jsonenc_any(e, msg, m);
-      break;
-    case kUpb_WellKnown_FieldMask:
-      jsonenc_fieldmask(e, msg, m);
-      break;
-    case kUpb_WellKnown_Duration:
-      jsonenc_duration(e, msg, m);
-      break;
-    case kUpb_WellKnown_Timestamp:
-      jsonenc_timestamp(e, msg, m);
-      break;
-    case kUpb_WellKnown_DoubleValue:
-    case kUpb_WellKnown_FloatValue:
-    case kUpb_WellKnown_Int64Value:
-    case kUpb_WellKnown_UInt64Value:
-    case kUpb_WellKnown_Int32Value:
-    case kUpb_WellKnown_UInt32Value:
-    case kUpb_WellKnown_StringValue:
-    case kUpb_WellKnown_BytesValue:
-    case kUpb_WellKnown_BoolValue:
-      jsonenc_wrapper(e, msg, m);
-      break;
-    case kUpb_WellKnown_Value:
-      jsonenc_value(e, msg, m);
-      break;
-    case kUpb_WellKnown_ListValue:
-      jsonenc_listvalue(e, msg, m);
-      break;
-    case kUpb_WellKnown_Struct:
-      jsonenc_struct(e, msg, m);
-      break;
-  }
-}
-
-static void jsonenc_scalar(jsonenc* e, upb_MessageValue val,
-                           const upb_FieldDef* f) {
-  switch (upb_FieldDef_CType(f)) {
-    case kUpb_CType_Bool:
-      jsonenc_putstr(e, val.bool_val ? "true" : "false");
-      break;
-    case kUpb_CType_Float:
-      upb_JsonEncode_Float(e, val.float_val);
-      break;
-    case kUpb_CType_Double:
-      upb_JsonEncode_Double(e, val.double_val);
-      break;
-    case kUpb_CType_Int32:
-      jsonenc_printf(e, "%" PRId32, val.int32_val);
-      break;
-    case kUpb_CType_UInt32:
-      jsonenc_printf(e, "%" PRIu32, val.uint32_val);
-      break;
-    case kUpb_CType_Int64:
-      jsonenc_printf(e, "\"%" PRId64 "\"", val.int64_val);
-      break;
-    case kUpb_CType_UInt64:
-      jsonenc_printf(e, "\"%" PRIu64 "\"", val.uint64_val);
-      break;
-    case kUpb_CType_String:
-      jsonenc_string(e, val.str_val);
-      break;
-    case kUpb_CType_Bytes:
-      jsonenc_bytes(e, val.str_val);
-      break;
-    case kUpb_CType_Enum:
-      jsonenc_enum(val.int32_val, f, e);
-      break;
-    case kUpb_CType_Message:
-      jsonenc_msgfield(e, val.msg_val, upb_FieldDef_MessageSubDef(f));
-      break;
-  }
-}
-
-static void jsonenc_mapkey(jsonenc* e, upb_MessageValue val,
-                           const upb_FieldDef* f) {
-  jsonenc_putstr(e, "\"");
-
-  switch (upb_FieldDef_CType(f)) {
-    case kUpb_CType_Bool:
-      jsonenc_putstr(e, val.bool_val ? "true" : "false");
-      break;
-    case kUpb_CType_Int32:
-      jsonenc_printf(e, "%" PRId32, val.int32_val);
-      break;
-    case kUpb_CType_UInt32:
-      jsonenc_printf(e, "%" PRIu32, val.uint32_val);
-      break;
-    case kUpb_CType_Int64:
-      jsonenc_printf(e, "%" PRId64, val.int64_val);
-      break;
-    case kUpb_CType_UInt64:
-      jsonenc_printf(e, "%" PRIu64, val.uint64_val);
-      break;
-    case kUpb_CType_String:
-      jsonenc_stringbody(e, val.str_val);
-      break;
-    default:
-      UPB_UNREACHABLE();
-  }
-
-  jsonenc_putstr(e, "\":");
-}
-
-static void jsonenc_array(jsonenc* e, const upb_Array* arr,
-                          const upb_FieldDef* f) {
-  size_t i;
-  size_t size = arr ? upb_Array_Size(arr) : 0;
-  bool first = true;
-
-  jsonenc_putstr(e, "[");
-
-  for (i = 0; i < size; i++) {
-    jsonenc_putsep(e, ",", &first);
-    jsonenc_scalar(e, upb_Array_Get(arr, i), f);
-  }
-
-  jsonenc_putstr(e, "]");
-}
-
-static void jsonenc_map(jsonenc* e, const upb_Map* map, const upb_FieldDef* f) {
-  const upb_MessageDef* entry = upb_FieldDef_MessageSubDef(f);
-  const upb_FieldDef* key_f = upb_MessageDef_FindFieldByNumber(entry, 1);
-  const upb_FieldDef* val_f = upb_MessageDef_FindFieldByNumber(entry, 2);
-  size_t iter = kUpb_Map_Begin;
-  bool first = true;
-
-  jsonenc_putstr(e, "{");
-
-  if (map) {
-    while (upb_MapIterator_Next(map, &iter)) {
-      jsonenc_putsep(e, ",", &first);
-      jsonenc_mapkey(e, upb_MapIterator_Key(map, iter), key_f);
-      jsonenc_scalar(e, upb_MapIterator_Value(map, iter), val_f);
-    }
-  }
-
-  jsonenc_putstr(e, "}");
-}
-
-static void jsonenc_fieldval(jsonenc* e, const upb_FieldDef* f,
-                             upb_MessageValue val, bool* first) {
-  const char* name;
-
-  jsonenc_putsep(e, ",", first);
-
-  if (upb_FieldDef_IsExtension(f)) {
-    // TODO: For MessageSet, I would have expected this to print the message
-    // name here, but Python doesn't appear to do this. We should do more
-    // research here about what various implementations do.
-    jsonenc_printf(e, "\"[%s]\":", upb_FieldDef_FullName(f));
-  } else {
-    if (e->options & upb_JsonEncode_UseProtoNames) {
-      name = upb_FieldDef_Name(f);
-    } else {
-      name = upb_FieldDef_JsonName(f);
-    }
-    jsonenc_printf(e, "\"%s\":", name);
-  }
-
-  if (upb_FieldDef_IsMap(f)) {
-    jsonenc_map(e, val.map_val, f);
-  } else if (upb_FieldDef_IsRepeated(f)) {
-    jsonenc_array(e, val.array_val, f);
-  } else {
-    jsonenc_scalar(e, val, f);
-  }
-}
-
-static void jsonenc_msgfields(jsonenc* e, const upb_Message* msg,
-                              const upb_MessageDef* m, bool first) {
-  upb_MessageValue val;
-  const upb_FieldDef* f;
-
-  if (e->options & upb_JsonEncode_EmitDefaults) {
-    /* Iterate over all fields. */
-    int i = 0;
-    int n = upb_MessageDef_FieldCount(m);
-    for (i = 0; i < n; i++) {
-      f = upb_MessageDef_Field(m, i);
-      if (!upb_FieldDef_HasPresence(f) || upb_Message_Has(msg, f)) {
-        jsonenc_fieldval(e, f, upb_Message_Get(msg, f), &first);
-      }
-    }
-  } else {
-    /* Iterate over non-empty fields. */
-    size_t iter = kUpb_Message_Begin;
-    while (upb_Message_Next(msg, m, e->ext_pool, &f, &val, &iter)) {
-      jsonenc_fieldval(e, f, val, &first);
-    }
-  }
-}
-
-static void jsonenc_msg(jsonenc* e, const upb_Message* msg,
-                        const upb_MessageDef* m) {
-  jsonenc_putstr(e, "{");
-  jsonenc_msgfields(e, msg, m, true);
-  jsonenc_putstr(e, "}");
-}
-
-static size_t jsonenc_nullz(jsonenc* e, size_t size) {
-  size_t ret = e->ptr - e->buf + e->overflow;
-
-  if (size > 0) {
-    if (e->ptr == e->end) e->ptr--;
-    *e->ptr = '\0';
-  }
-
-  return ret;
-}
-
-size_t upb_JsonEncode(const upb_Message* msg, const upb_MessageDef* m,
-                      const upb_DefPool* ext_pool, int options, char* buf,
-                      size_t size, upb_Status* status) {
-  jsonenc e;
-
-  e.buf = buf;
-  e.ptr = buf;
-  e.end = UPB_PTRADD(buf, size);
-  e.overflow = 0;
-  e.options = options;
-  e.ext_pool = ext_pool;
-  e.status = status;
-  e.arena = NULL;
-
-  if (setjmp(e.err)) return -1;
-
-  jsonenc_msgfield(&e, msg, m);
-  if (e.arena) upb_Arena_Free(e.arena);
-  return jsonenc_nullz(&e, size);
-}
-
-/** upb/mini_table.c ************************************************************/
-
-#include <inttypes.h>
-#include <setjmp.h>
-
-
-// Must be last.
-
-typedef enum {
-  kUpb_EncodedType_Double = 0,
-  kUpb_EncodedType_Float = 1,
-  kUpb_EncodedType_Fixed32 = 2,
-  kUpb_EncodedType_Fixed64 = 3,
-  kUpb_EncodedType_SFixed32 = 4,
-  kUpb_EncodedType_SFixed64 = 5,
-  kUpb_EncodedType_Int32 = 6,
-  kUpb_EncodedType_UInt32 = 7,
-  kUpb_EncodedType_SInt32 = 8,
-  kUpb_EncodedType_Int64 = 9,
-  kUpb_EncodedType_UInt64 = 10,
-  kUpb_EncodedType_SInt64 = 11,
-  kUpb_EncodedType_Enum = 12,
-  kUpb_EncodedType_Bool = 13,
-  kUpb_EncodedType_Bytes = 14,
-  kUpb_EncodedType_String = 15,
-  kUpb_EncodedType_Group = 16,
-  kUpb_EncodedType_Message = 17,
-
-  kUpb_EncodedType_RepeatedBase = 20,
-} upb_EncodedType;
-
-typedef enum {
-  kUpb_EncodedFieldModifier_FlipPacked = 1 << 0,
-  kUpb_EncodedFieldModifier_IsClosedEnum = 1 << 1,
-  // upb only.
-  kUpb_EncodedFieldModifier_IsProto3Singular = 1 << 2,
-  kUpb_EncodedFieldModifier_IsRequired = 1 << 3,
-} upb_EncodedFieldModifier;
-
-enum {
-  kUpb_EncodedValue_MinField = ' ',
-  kUpb_EncodedValue_MaxField = 'K',
-  kUpb_EncodedValue_MinModifier = 'L',
-  kUpb_EncodedValue_MaxModifier = '[',
-  kUpb_EncodedValue_End = '^',
-  kUpb_EncodedValue_MinSkip = '_',
-  kUpb_EncodedValue_MaxSkip = '~',
-  kUpb_EncodedValue_OneofSeparator = '~',
-  kUpb_EncodedValue_FieldSeparator = '|',
-  kUpb_EncodedValue_MinOneofField = ' ',
-  kUpb_EncodedValue_MaxOneofField = 'b',
-  kUpb_EncodedValue_MaxEnumMask = 'A',
-};
-
-char upb_ToBase92(int8_t ch) {
-  static const char kUpb_ToBase92[] = {
-      ' ', '!', '#', '$', '%', '&', '(', ')', '*', '+', ',', '-', '.', '/',
-      '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', ':', ';', '<', '=',
-      '>', '?', '@', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K',
-      'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y',
-      'Z', '[', ']', '^', '_', '`', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h',
-      'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v',
-      'w', 'x', 'y', 'z', '{', '|', '}', '~',
-  };
-
-  UPB_ASSERT(0 <= ch && ch < 92);
-  return kUpb_ToBase92[ch];
-}
-
-char upb_FromBase92(uint8_t ch) {
-  static const int8_t kUpb_FromBase92[] = {
-      0,  1,  -1, 2,  3,  4,  5,  -1, 6,  7,  8,  9,  10, 11, 12, 13,
-      14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
-      30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45,
-      46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, -1, 58, 59, 60,
-      61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76,
-      77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91,
-  };
-
-  if (' ' > ch || ch > '~') return -1;
-  return kUpb_FromBase92[ch - ' '];
-}
-
-bool upb_IsTypePackable(upb_FieldType type) {
-  // clang-format off
-  static const unsigned kUnpackableTypes =
-      (1 << kUpb_FieldType_String) |
-      (1 << kUpb_FieldType_Bytes) |
-      (1 << kUpb_FieldType_Message) |
-      (1 << kUpb_FieldType_Group);
-  // clang-format on
-  return (1 << type) & ~kUnpackableTypes;
-}
-
-/** upb_MtDataEncoder *********************************************************/
-
-typedef struct {
-  uint64_t present_values_mask;
-  uint32_t last_written_value;
-} upb_MtDataEncoderInternal_EnumState;
-
-typedef struct {
-  uint64_t msg_modifiers;
-  uint32_t last_field_num;
-  enum {
-    kUpb_OneofState_NotStarted,
-    kUpb_OneofState_StartedOneof,
-    kUpb_OneofState_EmittedOneofField,
-  } oneof_state;
-} upb_MtDataEncoderInternal_MsgState;
-
-typedef struct {
-  char* buf_start;  // Only for checking kUpb_MtDataEncoder_MinSize.
-  union {
-    upb_MtDataEncoderInternal_EnumState enum_state;
-    upb_MtDataEncoderInternal_MsgState msg_state;
-  } state;
-} upb_MtDataEncoderInternal;
-
-static upb_MtDataEncoderInternal* upb_MtDataEncoder_GetInternal(
-    upb_MtDataEncoder* e, char* buf_start) {
-  UPB_ASSERT(sizeof(upb_MtDataEncoderInternal) <= sizeof(e->internal));
-  upb_MtDataEncoderInternal* ret = (upb_MtDataEncoderInternal*)e->internal;
-  ret->buf_start = buf_start;
-  return ret;
-}
-
-static char* upb_MtDataEncoder_Put(upb_MtDataEncoder* e, char* ptr, char ch) {
-  upb_MtDataEncoderInternal* in = (upb_MtDataEncoderInternal*)e->internal;
-  UPB_ASSERT(ptr - in->buf_start < kUpb_MtDataEncoder_MinSize);
-  if (ptr == e->end) return NULL;
-  *ptr++ = upb_ToBase92(ch);
-  return ptr;
-}
-
-static char* upb_MtDataEncoder_PutBase92Varint(upb_MtDataEncoder* e, char* ptr,
-                                               uint32_t val, int min, int max) {
-  int shift = _upb_Log2Ceiling(upb_FromBase92(max) - upb_FromBase92(min) + 1);
-  UPB_ASSERT(shift <= 6);
-  uint32_t mask = (1 << shift) - 1;
-  do {
-    uint32_t bits = val & mask;
-    ptr = upb_MtDataEncoder_Put(e, ptr, bits + upb_FromBase92(min));
-    if (!ptr) return NULL;
-    val >>= shift;
-  } while (val);
-  return ptr;
-}
-
-char* upb_MtDataEncoder_PutModifier(upb_MtDataEncoder* e, char* ptr,
-                                    uint64_t mod) {
-  if (mod) {
-    ptr = upb_MtDataEncoder_PutBase92Varint(e, ptr, mod,
-                                            kUpb_EncodedValue_MinModifier,
-                                            kUpb_EncodedValue_MaxModifier);
-  }
-  return ptr;
-}
-
-char* upb_MtDataEncoder_StartMessage(upb_MtDataEncoder* e, char* ptr,
-                                     uint64_t msg_mod) {
-  upb_MtDataEncoderInternal* in = upb_MtDataEncoder_GetInternal(e, ptr);
-  in->state.msg_state.msg_modifiers = msg_mod;
-  in->state.msg_state.last_field_num = 0;
-  in->state.msg_state.oneof_state = kUpb_OneofState_NotStarted;
-  return upb_MtDataEncoder_PutModifier(e, ptr, msg_mod);
-}
-
-char* upb_MtDataEncoder_PutField(upb_MtDataEncoder* e, char* ptr,
-                                 upb_FieldType type, uint32_t field_num,
-                                 uint64_t field_mod) {
-  static const char kUpb_TypeToEncoded[] = {
-      [kUpb_FieldType_Double] = kUpb_EncodedType_Double,
-      [kUpb_FieldType_Float] = kUpb_EncodedType_Float,
-      [kUpb_FieldType_Int64] = kUpb_EncodedType_Int64,
-      [kUpb_FieldType_UInt64] = kUpb_EncodedType_UInt64,
-      [kUpb_FieldType_Int32] = kUpb_EncodedType_Int32,
-      [kUpb_FieldType_Fixed64] = kUpb_EncodedType_Fixed64,
-      [kUpb_FieldType_Fixed32] = kUpb_EncodedType_Fixed32,
-      [kUpb_FieldType_Bool] = kUpb_EncodedType_Bool,
-      [kUpb_FieldType_String] = kUpb_EncodedType_String,
-      [kUpb_FieldType_Group] = kUpb_EncodedType_Group,
-      [kUpb_FieldType_Message] = kUpb_EncodedType_Message,
-      [kUpb_FieldType_Bytes] = kUpb_EncodedType_Bytes,
-      [kUpb_FieldType_UInt32] = kUpb_EncodedType_UInt32,
-      [kUpb_FieldType_Enum] = kUpb_EncodedType_Enum,
-      [kUpb_FieldType_SFixed32] = kUpb_EncodedType_SFixed32,
-      [kUpb_FieldType_SFixed64] = kUpb_EncodedType_SFixed64,
-      [kUpb_FieldType_SInt32] = kUpb_EncodedType_SInt32,
-      [kUpb_FieldType_SInt64] = kUpb_EncodedType_SInt64,
-  };
-
-  upb_MtDataEncoderInternal* in = upb_MtDataEncoder_GetInternal(e, ptr);
-  if (field_num <= in->state.msg_state.last_field_num) return NULL;
-  if (in->state.msg_state.last_field_num + 1 != field_num) {
-    // Put skip.
-    UPB_ASSERT(field_num > in->state.msg_state.last_field_num);
-    uint32_t skip = field_num - in->state.msg_state.last_field_num;
-    ptr = upb_MtDataEncoder_PutBase92Varint(
-        e, ptr, skip, kUpb_EncodedValue_MinSkip, kUpb_EncodedValue_MaxSkip);
-    if (!ptr) return NULL;
-  }
-  in->state.msg_state.last_field_num = field_num;
-
-  uint32_t encoded_modifiers = 0;
-
-  // Put field type.
-  if (type == kUpb_FieldType_Enum &&
-      !(field_mod & kUpb_FieldModifier_IsClosedEnum)) {
-    type = kUpb_FieldType_Int32;
-  }
-
-  int encoded_type = kUpb_TypeToEncoded[type];
-  if (field_mod & kUpb_FieldModifier_IsRepeated) {
-    // Repeated fields shift the type number up (unlike other modifiers which
-    // are bit flags).
-    encoded_type += kUpb_EncodedType_RepeatedBase;
-
-    if (upb_IsTypePackable(type)) {
-      bool field_is_packed = field_mod & kUpb_FieldModifier_IsPacked;
-      bool default_is_packed = in->state.msg_state.msg_modifiers &
-                               kUpb_MessageModifier_DefaultIsPacked;
-      if (field_is_packed != default_is_packed) {
-        encoded_modifiers |= kUpb_EncodedFieldModifier_FlipPacked;
-      }
-    }
-  }
-  ptr = upb_MtDataEncoder_Put(e, ptr, encoded_type);
-  if (!ptr) return NULL;
-
-  if (field_mod & kUpb_FieldModifier_IsProto3Singular) {
-    encoded_modifiers |= kUpb_EncodedFieldModifier_IsProto3Singular;
-  }
-  if (field_mod & kUpb_FieldModifier_IsRequired) {
-    encoded_modifiers |= kUpb_EncodedFieldModifier_IsRequired;
-  }
-  return upb_MtDataEncoder_PutModifier(e, ptr, encoded_modifiers);
-}
-
-char* upb_MtDataEncoder_StartOneof(upb_MtDataEncoder* e, char* ptr) {
-  upb_MtDataEncoderInternal* in = upb_MtDataEncoder_GetInternal(e, ptr);
-  if (in->state.msg_state.oneof_state == kUpb_OneofState_NotStarted) {
-    ptr = upb_MtDataEncoder_Put(e, ptr, upb_FromBase92(kUpb_EncodedValue_End));
-  } else {
-    ptr = upb_MtDataEncoder_Put(
-        e, ptr, upb_FromBase92(kUpb_EncodedValue_OneofSeparator));
-  }
-  in->state.msg_state.oneof_state = kUpb_OneofState_StartedOneof;
-  return ptr;
-}
-
-char* upb_MtDataEncoder_PutOneofField(upb_MtDataEncoder* e, char* ptr,
-                                      uint32_t field_num) {
-  upb_MtDataEncoderInternal* in = upb_MtDataEncoder_GetInternal(e, ptr);
-  if (in->state.msg_state.oneof_state == kUpb_OneofState_EmittedOneofField) {
-    ptr = upb_MtDataEncoder_Put(
-        e, ptr, upb_FromBase92(kUpb_EncodedValue_FieldSeparator));
-    if (!ptr) return NULL;
-  }
-  ptr = upb_MtDataEncoder_PutBase92Varint(e, ptr, field_num, upb_ToBase92(0),
-                                          upb_ToBase92(63));
-  in->state.msg_state.oneof_state = kUpb_OneofState_EmittedOneofField;
-  return ptr;
-}
-
-void upb_MtDataEncoder_StartEnum(upb_MtDataEncoder* e) {
-  upb_MtDataEncoderInternal* in = upb_MtDataEncoder_GetInternal(e, NULL);
-  in->state.enum_state.present_values_mask = 0;
-  in->state.enum_state.last_written_value = 0;
-}
-
-static char* upb_MtDataEncoder_FlushDenseEnumMask(upb_MtDataEncoder* e,
-                                                  char* ptr) {
-  upb_MtDataEncoderInternal* in = (upb_MtDataEncoderInternal*)e->internal;
-  ptr = upb_MtDataEncoder_Put(e, ptr, in->state.enum_state.present_values_mask);
-  in->state.enum_state.present_values_mask = 0;
-  in->state.enum_state.last_written_value += 5;
-  return ptr;
-}
-
-char* upb_MtDataEncoder_PutEnumValue(upb_MtDataEncoder* e, char* ptr,
-                                     uint32_t val) {
-  // TODO(b/229641772): optimize this encoding.
-  upb_MtDataEncoderInternal* in = upb_MtDataEncoder_GetInternal(e, ptr);
-  UPB_ASSERT(val >= in->state.enum_state.last_written_value);
-  uint32_t delta = val - in->state.enum_state.last_written_value;
-  if (delta >= 5 && in->state.enum_state.present_values_mask) {
-    ptr = upb_MtDataEncoder_FlushDenseEnumMask(e, ptr);
-    delta -= 5;
-  }
-
-  if (delta >= 5) {
-    ptr = upb_MtDataEncoder_PutBase92Varint(
-        e, ptr, delta, kUpb_EncodedValue_MinSkip, kUpb_EncodedValue_MaxSkip);
-    in->state.enum_state.last_written_value += delta;
-    delta = 0;
-  }
-
-  UPB_ASSERT((in->state.enum_state.present_values_mask >> delta) == 0);
-  in->state.enum_state.present_values_mask |= 1ULL << delta;
-  return ptr;
-}
-
-char* upb_MtDataEncoder_EndEnum(upb_MtDataEncoder* e, char* ptr) {
-  upb_MtDataEncoderInternal* in = upb_MtDataEncoder_GetInternal(e, ptr);
-  if (!in->state.enum_state.present_values_mask) return ptr;
-  return upb_MtDataEncoder_FlushDenseEnumMask(e, ptr);
-}
-
-const upb_MiniTable_Field* upb_MiniTable_FindFieldByNumber(
-    const upb_MiniTable* table, uint32_t number) {
-  int n = table->field_count;
-  for (int i = 0; i < n; i++) {
-    if (table->fields[i].number == number) {
-      return &table->fields[i];
-    }
-  }
-  return NULL;
-}
-
-/** Data decoder **************************************************************/
-
-// Note: we sort by this number when calculating layout order.
-typedef enum {
-  kUpb_LayoutItemType_OneofCase,   // Oneof case.
-  kUpb_LayoutItemType_OneofField,  // Oneof field data.
-  kUpb_LayoutItemType_Field,       // Non-oneof field data.
-
-  kUpb_LayoutItemType_Max = kUpb_LayoutItemType_Field,
-} upb_LayoutItemType;
-
-#define kUpb_LayoutItem_IndexSentinel ((uint16_t)-1)
-
-typedef struct {
-  // Index of the corresponding field.  When this is a oneof field, the field's
-  // offset will be the index of the next field in a linked list.
-  uint16_t field_index;
-  uint16_t offset;
-  upb_FieldRep rep;
-  upb_LayoutItemType type;
-} upb_LayoutItem;
-
-typedef struct {
-  upb_LayoutItem* data;
-  size_t size;
-  size_t capacity;
-} upb_LayoutItemVector;
-
-typedef struct {
-  const char* end;
-  upb_MiniTable* table;
-  upb_MiniTable_Field* fields;
-  upb_MiniTablePlatform platform;
-  upb_LayoutItemVector vec;
-  upb_Arena* arena;
-  upb_Status* status;
-  jmp_buf err;
-} upb_MtDecoder;
-
-UPB_PRINTF(2, 3)
-UPB_NORETURN static void upb_MtDecoder_ErrorFormat(upb_MtDecoder* d,
-                                                   const char* fmt, ...) {
-  va_list argp;
-  upb_Status_SetErrorMessage(d->status, "Error building mini table: ");
-  va_start(argp, fmt);
-  upb_Status_VAppendErrorFormat(d->status, fmt, argp);
-  va_end(argp);
-  UPB_LONGJMP(d->err, 1);
-}
-
-static void upb_MtDecoder_CheckOutOfMemory(upb_MtDecoder* d, const void* ptr) {
-  if (!ptr) upb_MtDecoder_ErrorFormat(d, "Out of memory");
-}
-
-// In each field's offset, we temporarily store a presence classifier:
-enum PresenceClass {
-  kNoPresence = 0,
-  kHasbitPresence = 1,
-  kRequiredPresence = 2,
-  kOneofBase = 3,
-  // Negative values refer to a specific oneof with that number.  Positive
-  // values >= kOneofBase indicate that this field is in a oneof, and specify
-  // the next field in this oneof's linked list.
-};
-
-static const char* upb_MiniTable_DecodeBase92Varint(upb_MtDecoder* d,
-                                                    const char* ptr,
-                                                    char first_ch, uint8_t min,
-                                                    uint8_t max,
-                                                    uint32_t* out_val) {
-  uint32_t val = 0;
-  uint32_t shift = 0;
-  const int bits_per_char =
-      _upb_Log2Ceiling(upb_FromBase92(max) - upb_FromBase92(min));
-  char ch = first_ch;
-  while (1) {
-    uint32_t bits = upb_FromBase92(ch) - upb_FromBase92(min);
-    UPB_ASSERT(shift < 32);
-    val |= bits << shift;
-    if (ptr == d->end || *ptr < min || max < *ptr) {
-      *out_val = val;
-      return ptr;
-    }
-    ch = *ptr++;
-    shift += bits_per_char;
-  }
-}
-
-static bool upb_MiniTable_HasSub(upb_MiniTable_Field* field,
-                                 uint64_t msg_modifiers) {
-  switch (field->descriptortype) {
-    case kUpb_FieldType_Message:
-    case kUpb_FieldType_Group:
-    case kUpb_FieldType_Enum:
-      return true;
-    case kUpb_FieldType_String:
-      if (!(msg_modifiers & kUpb_MessageModifier_ValidateUtf8)) {
-        field->descriptortype = kUpb_FieldType_Bytes;
-      }
-      return false;
-    default:
-      return false;
-  }
-}
-
-static bool upb_MtDecoder_FieldIsPackable(upb_MiniTable_Field* field) {
-  return (field->mode & kUpb_FieldMode_Array) &&
-         upb_IsTypePackable(field->descriptortype);
-}
-
-static void upb_MiniTable_SetTypeAndSub(upb_MiniTable_Field* field,
-                                        upb_FieldType type, uint32_t* sub_count,
-                                        uint64_t msg_modifiers) {
-  field->descriptortype = type;
-  if (upb_MiniTable_HasSub(field, msg_modifiers)) {
-    field->submsg_index = sub_count ? (*sub_count)++ : 0;
-  } else {
-    field->submsg_index = kUpb_NoSub;
-  }
-
-  if (upb_MtDecoder_FieldIsPackable(field) &&
-      (msg_modifiers & kUpb_MessageModifier_DefaultIsPacked)) {
-    field->mode |= kUpb_LabelFlags_IsPacked;
-  }
-}
-
-static void upb_MiniTable_SetField(upb_MtDecoder* d, uint8_t ch,
-                                   upb_MiniTable_Field* field,
-                                   uint64_t msg_modifiers,
-                                   uint32_t* sub_count) {
-  static const char kUpb_EncodedToFieldRep[] = {
-      [kUpb_EncodedType_Double] = kUpb_FieldRep_8Byte,
-      [kUpb_EncodedType_Float] = kUpb_FieldRep_4Byte,
-      [kUpb_EncodedType_Int64] = kUpb_FieldRep_8Byte,
-      [kUpb_EncodedType_UInt64] = kUpb_FieldRep_8Byte,
-      [kUpb_EncodedType_Int32] = kUpb_FieldRep_4Byte,
-      [kUpb_EncodedType_Fixed64] = kUpb_FieldRep_8Byte,
-      [kUpb_EncodedType_Fixed32] = kUpb_FieldRep_4Byte,
-      [kUpb_EncodedType_Bool] = kUpb_FieldRep_1Byte,
-      [kUpb_EncodedType_String] = kUpb_FieldRep_StringView,
-      [kUpb_EncodedType_Group] = kUpb_FieldRep_Pointer,
-      [kUpb_EncodedType_Message] = kUpb_FieldRep_Pointer,
-      [kUpb_EncodedType_Bytes] = kUpb_FieldRep_StringView,
-      [kUpb_EncodedType_UInt32] = kUpb_FieldRep_4Byte,
-      [kUpb_EncodedType_Enum] = kUpb_FieldRep_4Byte,
-      [kUpb_EncodedType_SFixed32] = kUpb_FieldRep_4Byte,
-      [kUpb_EncodedType_SFixed64] = kUpb_FieldRep_8Byte,
-      [kUpb_EncodedType_SInt32] = kUpb_FieldRep_4Byte,
-      [kUpb_EncodedType_SInt64] = kUpb_FieldRep_8Byte,
-  };
-
-  static const char kUpb_EncodedToType[] = {
-      [kUpb_EncodedType_Double] = kUpb_FieldType_Double,
-      [kUpb_EncodedType_Float] = kUpb_FieldType_Float,
-      [kUpb_EncodedType_Int64] = kUpb_FieldType_Int64,
-      [kUpb_EncodedType_UInt64] = kUpb_FieldType_UInt64,
-      [kUpb_EncodedType_Int32] = kUpb_FieldType_Int32,
-      [kUpb_EncodedType_Fixed64] = kUpb_FieldType_Fixed64,
-      [kUpb_EncodedType_Fixed32] = kUpb_FieldType_Fixed32,
-      [kUpb_EncodedType_Bool] = kUpb_FieldType_Bool,
-      [kUpb_EncodedType_String] = kUpb_FieldType_String,
-      [kUpb_EncodedType_Group] = kUpb_FieldType_Group,
-      [kUpb_EncodedType_Message] = kUpb_FieldType_Message,
-      [kUpb_EncodedType_Bytes] = kUpb_FieldType_Bytes,
-      [kUpb_EncodedType_UInt32] = kUpb_FieldType_UInt32,
-      [kUpb_EncodedType_Enum] = kUpb_FieldType_Enum,
-      [kUpb_EncodedType_SFixed32] = kUpb_FieldType_SFixed32,
-      [kUpb_EncodedType_SFixed64] = kUpb_FieldType_SFixed64,
-      [kUpb_EncodedType_SInt32] = kUpb_FieldType_SInt32,
-      [kUpb_EncodedType_SInt64] = kUpb_FieldType_SInt64,
-  };
-
-  int8_t type = upb_FromBase92(ch);
-  if (ch >= upb_ToBase92(kUpb_EncodedType_RepeatedBase)) {
-    type -= kUpb_EncodedType_RepeatedBase;
-    field->mode = kUpb_FieldMode_Array;
-    field->mode |= kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift;
-    field->offset = kNoPresence;
-  } else {
-    field->mode = kUpb_FieldMode_Scalar;
-    field->mode |= kUpb_EncodedToFieldRep[type] << kUpb_FieldRep_Shift;
-    field->offset = kHasbitPresence;
-  }
-  if (type >= 18) {
-    upb_MtDecoder_ErrorFormat(d, "Invalid field type: %d", (int)type);
-    UPB_UNREACHABLE();
-  }
-  upb_MiniTable_SetTypeAndSub(field, kUpb_EncodedToType[type], sub_count,
-                              msg_modifiers);
-}
-
-static void upb_MtDecoder_ModifyField(upb_MtDecoder* d,
-                                      uint32_t message_modifiers,
-                                      uint32_t field_modifiers,
-                                      upb_MiniTable_Field* field) {
-  if (field_modifiers & kUpb_EncodedFieldModifier_FlipPacked) {
-    if (!upb_MtDecoder_FieldIsPackable(field)) {
-      upb_MtDecoder_ErrorFormat(
-          d, "Cannot flip packed on unpackable field %" PRIu32, field->number);
-      UPB_UNREACHABLE();
-    }
-    field->mode ^= kUpb_LabelFlags_IsPacked;
-  }
-
-  bool singular = field_modifiers & kUpb_EncodedFieldModifier_IsProto3Singular;
-  bool required = field_modifiers & kUpb_EncodedFieldModifier_IsRequired;
-
-  // Validate.
-  if ((singular || required) && field->offset != kHasbitPresence) {
-    upb_MtDecoder_ErrorFormat(
-        d, "Invalid modifier(s) for repeated field %" PRIu32, field->number);
-    UPB_UNREACHABLE();
-  }
-  if (singular && required) {
-    upb_MtDecoder_ErrorFormat(
-        d, "Field %" PRIu32 " cannot be both singular and required",
-        field->number);
-    UPB_UNREACHABLE();
-  }
-
-  if (singular) field->offset = kNoPresence;
-  if (required) {
-    field->offset = kRequiredPresence;
-  }
-}
-
-static void upb_MtDecoder_PushItem(upb_MtDecoder* d, upb_LayoutItem item) {
-  if (d->vec.size == d->vec.capacity) {
-    size_t new_cap = UPB_MAX(8, d->vec.size * 2);
-    d->vec.data = realloc(d->vec.data, new_cap * sizeof(*d->vec.data));
-    upb_MtDecoder_CheckOutOfMemory(d, d->vec.data);
-    d->vec.capacity = new_cap;
-  }
-  d->vec.data[d->vec.size++] = item;
-}
-
-static void upb_MtDecoder_PushOneof(upb_MtDecoder* d, upb_LayoutItem item) {
-  if (item.field_index == kUpb_LayoutItem_IndexSentinel) {
-    upb_MtDecoder_ErrorFormat(d, "Empty oneof");
-    UPB_UNREACHABLE();
-  }
-  item.field_index -= kOneofBase;
-
-  // Push oneof data.
-  item.type = kUpb_LayoutItemType_OneofField;
-  upb_MtDecoder_PushItem(d, item);
-
-  // Push oneof case.
-  item.rep = kUpb_FieldRep_4Byte;  // Field Number.
-  item.type = kUpb_LayoutItemType_OneofCase;
-  upb_MtDecoder_PushItem(d, item);
-}
-
-size_t upb_MtDecoder_SizeOfRep(upb_FieldRep rep,
-                               upb_MiniTablePlatform platform) {
-  static const uint8_t kRepToSize32[] = {
-      [kUpb_FieldRep_1Byte] = 1,   [kUpb_FieldRep_4Byte] = 4,
-      [kUpb_FieldRep_Pointer] = 4, [kUpb_FieldRep_StringView] = 8,
-      [kUpb_FieldRep_8Byte] = 8,
-  };
-  static const uint8_t kRepToSize64[] = {
-      [kUpb_FieldRep_1Byte] = 1,   [kUpb_FieldRep_4Byte] = 4,
-      [kUpb_FieldRep_Pointer] = 8, [kUpb_FieldRep_StringView] = 16,
-      [kUpb_FieldRep_8Byte] = 8,
-  };
-  UPB_ASSERT(sizeof(upb_StringView) ==
-             UPB_SIZE(kRepToSize32, kRepToSize64)[kUpb_FieldRep_StringView]);
-  return platform == kUpb_MiniTablePlatform_32Bit ? kRepToSize32[rep]
-                                                  : kRepToSize64[rep];
-}
-
-size_t upb_MtDecoder_AlignOfRep(upb_FieldRep rep,
-                                upb_MiniTablePlatform platform) {
-  static const uint8_t kRepToAlign32[] = {
-      [kUpb_FieldRep_1Byte] = 1,   [kUpb_FieldRep_4Byte] = 4,
-      [kUpb_FieldRep_Pointer] = 4, [kUpb_FieldRep_StringView] = 4,
-      [kUpb_FieldRep_8Byte] = 8,
-  };
-  static const uint8_t kRepToAlign64[] = {
-      [kUpb_FieldRep_1Byte] = 1,   [kUpb_FieldRep_4Byte] = 4,
-      [kUpb_FieldRep_Pointer] = 8, [kUpb_FieldRep_StringView] = 8,
-      [kUpb_FieldRep_8Byte] = 8,
-  };
-  UPB_ASSERT(UPB_ALIGN_OF(upb_StringView) ==
-             UPB_SIZE(kRepToAlign32, kRepToAlign64)[kUpb_FieldRep_StringView]);
-  return platform == kUpb_MiniTablePlatform_32Bit ? kRepToAlign32[rep]
-                                                  : kRepToAlign64[rep];
-}
-
-static const char* upb_MtDecoder_DecodeOneofField(upb_MtDecoder* d,
-                                                  const char* ptr,
-                                                  char first_ch,
-                                                  upb_LayoutItem* item) {
-  uint32_t field_num;
-  ptr = upb_MiniTable_DecodeBase92Varint(
-      d, ptr, first_ch, kUpb_EncodedValue_MinOneofField,
-      kUpb_EncodedValue_MaxOneofField, &field_num);
-  upb_MiniTable_Field* f =
-      (void*)upb_MiniTable_FindFieldByNumber(d->table, field_num);
-
-  if (!f) {
-    upb_MtDecoder_ErrorFormat(d,
-                              "Couldn't add field number %" PRIu32
-                              " to oneof, no such field number.",
-                              field_num);
-    UPB_UNREACHABLE();
-  }
-  if (f->offset != kHasbitPresence) {
-    upb_MtDecoder_ErrorFormat(
-        d,
-        "Cannot add repeated, required, or singular field %" PRIu32
-        " to oneof.",
-        field_num);
-    UPB_UNREACHABLE();
-  }
-
-  // Oneof storage must be large enough to accommodate the largest member.
-  int rep = f->mode >> kUpb_FieldRep_Shift;
-  if (upb_MtDecoder_SizeOfRep(rep, d->platform) >
-      upb_MtDecoder_SizeOfRep(item->rep, d->platform)) {
-    item->rep = rep;
-  }
-  // Prepend this field to the linked list.
-  f->offset = item->field_index;
-  item->field_index = (f - d->fields) + kOneofBase;
-  return ptr;
-}
-
-static const char* upb_MtDecoder_DecodeOneofs(upb_MtDecoder* d,
-                                              const char* ptr) {
-  upb_LayoutItem item = {.rep = 0,
-                         .field_index = kUpb_LayoutItem_IndexSentinel};
-  while (ptr < d->end) {
-    char ch = *ptr++;
-    if (ch == kUpb_EncodedValue_FieldSeparator) {
-      // Field separator, no action needed.
-    } else if (ch == kUpb_EncodedValue_OneofSeparator) {
-      // End of oneof.
-      upb_MtDecoder_PushOneof(d, item);
-      item.field_index = kUpb_LayoutItem_IndexSentinel;  // Move to next oneof.
-    } else {
-      ptr = upb_MtDecoder_DecodeOneofField(d, ptr, ch, &item);
-    }
-  }
-
-  // Push final oneof.
-  upb_MtDecoder_PushOneof(d, item);
-  return ptr;
-}
-
-static const char* upb_MtDecoder_ParseModifier(upb_MtDecoder* d,
-                                               const char* ptr, char first_ch,
-                                               upb_MiniTable_Field* last_field,
-                                               uint64_t* msg_modifiers) {
-  uint32_t mod;
-  ptr = upb_MiniTable_DecodeBase92Varint(d, ptr, first_ch,
-                                         kUpb_EncodedValue_MinModifier,
-                                         kUpb_EncodedValue_MaxModifier, &mod);
-  if (last_field) {
-    upb_MtDecoder_ModifyField(d, *msg_modifiers, mod, last_field);
-  } else {
-    if (!d->table) {
-      upb_MtDecoder_ErrorFormat(d, "Extensions cannot have message modifiers");
-      UPB_UNREACHABLE();
-    }
-    *msg_modifiers = mod;
-  }
-
-  return ptr;
-}
-
-static void upb_MtDecoder_AllocateSubs(upb_MtDecoder* d, uint32_t sub_count) {
-  size_t subs_bytes = sizeof(*d->table->subs) * sub_count;
-  d->table->subs = upb_Arena_Malloc(d->arena, subs_bytes);
-  upb_MtDecoder_CheckOutOfMemory(d, d->table->subs);
-}
-
-static void upb_MtDecoder_Parse(upb_MtDecoder* d, const char* ptr, size_t len,
-                                void* fields, size_t field_size,
-                                uint16_t* field_count, uint32_t* sub_count) {
-  uint64_t msg_modifiers = 0;
-  uint32_t last_field_number = 0;
-  upb_MiniTable_Field* last_field = NULL;
-  bool need_dense_below = d->table != NULL;
-
-  d->end = UPB_PTRADD(ptr, len);
-
-  while (ptr < d->end) {
-    char ch = *ptr++;
-    if (ch <= kUpb_EncodedValue_MaxField) {
-      upb_MiniTable_Field* field = fields;
-      *field_count += 1;
-      fields = (char*)fields + field_size;
-      field->number = ++last_field_number;
-      last_field = field;
-      upb_MiniTable_SetField(d, ch, field, msg_modifiers, sub_count);
-    } else if (kUpb_EncodedValue_MinModifier <= ch &&
-               ch <= kUpb_EncodedValue_MaxModifier) {
-      ptr = upb_MtDecoder_ParseModifier(d, ptr, ch, last_field, &msg_modifiers);
-      if (msg_modifiers & kUpb_MessageModifier_IsExtendable) {
-        d->table->ext |= kUpb_ExtMode_Extendable;
-      }
-    } else if (ch == kUpb_EncodedValue_End) {
-      if (!d->table) {
-        upb_MtDecoder_ErrorFormat(d, "Extensions cannot have oneofs.");
-        UPB_UNREACHABLE();
-      }
-      ptr = upb_MtDecoder_DecodeOneofs(d, ptr);
-    } else if (kUpb_EncodedValue_MinSkip <= ch &&
-               ch <= kUpb_EncodedValue_MaxSkip) {
-      if (need_dense_below) {
-        d->table->dense_below = d->table->field_count;
-        need_dense_below = false;
-      }
-      uint32_t skip;
-      ptr = upb_MiniTable_DecodeBase92Varint(d, ptr, ch,
-                                             kUpb_EncodedValue_MinSkip,
-                                             kUpb_EncodedValue_MaxSkip, &skip);
-      last_field_number += skip;
-      last_field_number--;  // Next field seen will increment.
-    }
-  }
-
-  if (need_dense_below) {
-    d->table->dense_below = d->table->field_count;
-  }
-}
-
-static void upb_MtDecoder_ParseMessage(upb_MtDecoder* d, const char* data,
-                                       size_t len) {
-  // Buffer length is an upper bound on the number of fields. We will return
-  // what we don't use.
-  d->fields = upb_Arena_Malloc(d->arena, sizeof(*d->fields) * len);
-  upb_MtDecoder_CheckOutOfMemory(d, d->fields);
-
-  uint32_t sub_count = 0;
-  d->table->field_count = 0;
-  d->table->fields = d->fields;
-  upb_MtDecoder_Parse(d, data, len, d->fields, sizeof(*d->fields),
-                      &d->table->field_count, &sub_count);
-
-  upb_Arena_ShrinkLast(d->arena, d->fields, sizeof(*d->fields) * len,
-                       sizeof(*d->fields) * d->table->field_count);
-  d->table->fields = d->fields;
-  upb_MtDecoder_AllocateSubs(d, sub_count);
-}
-
-int upb_MtDecoder_CompareFields(const void* _a, const void* _b) {
-  const upb_LayoutItem* a = _a;
-  const upb_LayoutItem* b = _b;
-  // Currently we just sort by:
-  //  1. rep (smallest fields first)
-  //  2. type (oneof cases first)
-  //  2. field_index (smallest numbers first)
-  // The main goal of this is to reduce space lost to padding.
-  // Later we may have more subtle reasons to prefer a different ordering.
-  const int rep_bits = _upb_Log2Ceiling(kUpb_FieldRep_Max);
-  const int type_bits = _upb_Log2Ceiling(kUpb_LayoutItemType_Max);
-  const int idx_bits = (sizeof(a->field_index) * 8);
-  UPB_ASSERT(idx_bits + rep_bits + type_bits < 32);
-#define UPB_COMBINE(rep, ty, idx) (((rep << type_bits) | ty) << idx_bits) | idx
-  uint32_t a_packed = UPB_COMBINE(a->rep, a->type, a->field_index);
-  uint32_t b_packed = UPB_COMBINE(b->rep, b->type, b->field_index);
-  assert(a_packed != b_packed);
-#undef UPB_COMBINE
-  return a_packed < b_packed ? -1 : 1;
-}
-
-static bool upb_MtDecoder_SortLayoutItems(upb_MtDecoder* d) {
-  // Add items for all non-oneof fields (oneofs were already added).
-  int n = d->table->field_count;
-  for (int i = 0; i < n; i++) {
-    upb_MiniTable_Field* f = &d->fields[i];
-    if (f->offset >= kOneofBase) continue;
-    upb_LayoutItem item = {.field_index = i,
-                           .rep = f->mode >> kUpb_FieldRep_Shift,
-                           .type = kUpb_LayoutItemType_Field};
-    upb_MtDecoder_PushItem(d, item);
-  }
-
-  if (d->vec.size) {
-    qsort(d->vec.data, d->vec.size, sizeof(*d->vec.data),
-          upb_MtDecoder_CompareFields);
-  }
-
-  return true;
-}
-
-static size_t upb_MiniTable_DivideRoundUp(size_t n, size_t d) {
-  return (n + d - 1) / d;
-}
-
-static void upb_MtDecoder_AssignHasbits(upb_MiniTable* ret) {
-  int n = ret->field_count;
-  int last_hasbit = 0;  // 0 cannot be used.
-
-  // First assign required fields, which must have the lowest hasbits.
-  for (int i = 0; i < n; i++) {
-    upb_MiniTable_Field* field = (upb_MiniTable_Field*)&ret->fields[i];
-    if (field->offset == kRequiredPresence) {
-      field->presence = ++last_hasbit;
-    } else if (field->offset == kNoPresence) {
-      field->presence = 0;
-    }
-  }
-  ret->required_count = last_hasbit;
-
-  // Next assign non-required hasbit fields.
-  for (int i = 0; i < n; i++) {
-    upb_MiniTable_Field* field = (upb_MiniTable_Field*)&ret->fields[i];
-    if (field->offset == kHasbitPresence) {
-      field->presence = ++last_hasbit;
-    }
-  }
-
-  ret->size = last_hasbit ? upb_MiniTable_DivideRoundUp(last_hasbit + 1, 8) : 0;
-}
-
-size_t upb_MtDecoder_Place(upb_MtDecoder* d, upb_FieldRep rep) {
-  size_t size = upb_MtDecoder_SizeOfRep(rep, d->platform);
-  size_t align = upb_MtDecoder_AlignOfRep(rep, d->platform);
-  size_t ret = UPB_ALIGN_UP(d->table->size, align);
-  d->table->size = ret + size;
-  return ret;
-}
-
-static void upb_MtDecoder_AssignOffsets(upb_MtDecoder* d) {
-  upb_LayoutItem* end = UPB_PTRADD(d->vec.data, d->vec.size);
-
-  // Compute offsets.
-  for (upb_LayoutItem* item = d->vec.data; item < end; item++) {
-    item->offset = upb_MtDecoder_Place(d, item->rep);
-  }
-
-  // Assign oneof case offsets.  We must do these first, since assigning
-  // actual offsets will overwrite the links of the linked list.
-  for (upb_LayoutItem* item = d->vec.data; item < end; item++) {
-    if (item->type != kUpb_LayoutItemType_OneofCase) continue;
-    upb_MiniTable_Field* f = &d->fields[item->field_index];
-    while (true) {
-      f->presence = ~item->offset;
-      if (f->offset == kUpb_LayoutItem_IndexSentinel) break;
-      UPB_ASSERT(f->offset - kOneofBase < d->table->field_count);
-      f = &d->fields[f->offset - kOneofBase];
-    }
-  }
-
-  // Assign offsets.
-  for (upb_LayoutItem* item = d->vec.data; item < end; item++) {
-    upb_MiniTable_Field* f = &d->fields[item->field_index];
-    switch (item->type) {
-      case kUpb_LayoutItemType_OneofField:
-        while (true) {
-          uint16_t next_offset = f->offset;
-          f->offset = item->offset;
-          if (next_offset == kUpb_LayoutItem_IndexSentinel) break;
-          f = &d->fields[next_offset - kOneofBase];
-        }
-        break;
-      case kUpb_LayoutItemType_Field:
-        f->offset = item->offset;
-        break;
-      default:
-        break;
-    }
-  }
-
-  // The fasttable parser (supported on 64-bit only) depends on this being a
-  // multiple of 8 in order to satisfy UPB_MALLOC_ALIGN, which is also 8.
-  //
-  // On 32-bit we could potentially make this smaller, but there is no
-  // compelling reason to optimize this right now.
-  d->table->size = UPB_ALIGN_UP(d->table->size, 8);
-}
-
-upb_MiniTable* upb_MiniTable_BuildWithBuf(const char* data, size_t len,
-                                          upb_MiniTablePlatform platform,
-                                          upb_Arena* arena, void** buf,
-                                          size_t* buf_size,
-                                          upb_Status* status) {
-  upb_MtDecoder decoder = {
-      .platform = platform,
-      .vec =
-          {
-              .data = *buf,
-              .capacity = *buf_size / sizeof(*decoder.vec.data),
-              .size = 0,
-          },
-      .arena = arena,
-      .status = status,
-      .table = upb_Arena_Malloc(arena, sizeof(*decoder.table)),
-  };
-
-  if (UPB_SETJMP(decoder.err)) {
-    decoder.table = NULL;
-    goto done;
-  }
-
-  upb_MtDecoder_CheckOutOfMemory(&decoder, decoder.table);
-
-  decoder.table->size = 0;
-  decoder.table->field_count = 0;
-  decoder.table->ext = kUpb_ExtMode_NonExtendable;
-  decoder.table->dense_below = 0;
-  decoder.table->table_mask = -1;
-  decoder.table->required_count = 0;
-
-  upb_MtDecoder_ParseMessage(&decoder, data, len);
-  upb_MtDecoder_AssignHasbits(decoder.table);
-  upb_MtDecoder_SortLayoutItems(&decoder);
-  upb_MtDecoder_AssignOffsets(&decoder);
-
-done:
-  *buf = decoder.vec.data;
-  *buf_size = decoder.vec.capacity / sizeof(*decoder.vec.data);
-  return decoder.table;
-}
-
-upb_MiniTable* upb_MiniTable_BuildMessageSet(upb_MiniTablePlatform platform,
-                                             upb_Arena* arena) {
-  upb_MiniTable* ret = upb_Arena_Malloc(arena, sizeof(*ret));
-  if (!ret) return NULL;
-
-  ret->size = 0;
-  ret->field_count = 0;
-  ret->ext = kUpb_ExtMode_IsMessageSet;
-  ret->dense_below = 0;
-  ret->table_mask = -1;
-  ret->required_count = 0;
-  return ret;
-}
-
-upb_MiniTable* upb_MiniTable_BuildMapEntry(upb_FieldType key_type,
-                                           upb_FieldType value_type,
-                                           bool value_is_proto3_enum,
-                                           upb_MiniTablePlatform platform,
-                                           upb_Arena* arena) {
-  upb_MiniTable* ret = upb_Arena_Malloc(arena, sizeof(*ret));
-  upb_MiniTable_Field* fields = upb_Arena_Malloc(arena, sizeof(*fields) * 2);
-  if (!ret || !fields) return NULL;
-
-  upb_MiniTable_Sub* subs = NULL;
-  if (value_is_proto3_enum) value_type = kUpb_FieldType_Int32;
-  if (value_type == kUpb_FieldType_Message ||
-      value_type == kUpb_FieldType_Group || value_type == kUpb_FieldType_Enum) {
-    subs = upb_Arena_Malloc(arena, sizeof(*subs));
-    if (!subs) return NULL;
-  }
-
-  size_t field_size =
-      upb_MtDecoder_SizeOfRep(kUpb_FieldRep_StringView, platform);
-
-  fields[0].number = 1;
-  fields[1].number = 2;
-  fields[0].mode = kUpb_FieldMode_Scalar;
-  fields[1].mode = kUpb_FieldMode_Scalar;
-  fields[0].presence = 0;
-  fields[1].presence = 0;
-  fields[0].offset = 0;
-  fields[1].offset = field_size;
-
-  upb_MiniTable_SetTypeAndSub(&fields[0], key_type, NULL, 0);
-  upb_MiniTable_SetTypeAndSub(&fields[1], value_type, NULL, 0);
-
-  ret->size = UPB_ALIGN_UP(2 * field_size, 8);
-  ret->field_count = 2;
-  ret->ext = kUpb_ExtMode_NonExtendable | kUpb_ExtMode_IsMapEntry;
-  ret->dense_below = 2;
-  ret->table_mask = -1;
-  ret->required_count = 0;
-  ret->subs = subs;
-  ret->fields = fields;
-  return ret;
-}
-
-static bool upb_MiniTable_BuildEnumValue(upb_MtDecoder* d,
-                                         upb_MiniTable_Enum* table,
-                                         uint32_t val, upb_Arena* arena) {
-  if (val < 64) {
-    table->mask |= 1ULL << val;
-    return true;
-  }
-
-  int32_t* values = (void*)table->values;
-  values = upb_Arena_Realloc(arena, values, table->value_count * 4,
-                             (table->value_count + 1) * 4);
-  upb_MtDecoder_CheckOutOfMemory(d, values);
-  values[table->value_count++] = (int32_t)val;
-  table->values = values;
-  return true;
-}
-
-upb_MiniTable_Enum* upb_MiniTable_BuildEnum(const char* data, size_t len,
-                                            upb_Arena* arena,
-                                            upb_Status* status) {
-  upb_MtDecoder d = {
-      .status = status,
-      .end = UPB_PTRADD(data, len),
-  };
-
-  if (UPB_SETJMP(d.err)) {
-    return NULL;
-  }
-
-  upb_MiniTable_Enum* table = upb_Arena_Malloc(arena, sizeof(*table));
-  upb_MtDecoder_CheckOutOfMemory(&d, table);
-
-  table->mask = 0;
-  table->value_count = 0;
-  table->values = NULL;
-
-  const char* ptr = data;
-  uint32_t base = 0;
-
-  while (ptr < d.end) {
-    char ch = *ptr++;
-    if (ch <= kUpb_EncodedValue_MaxEnumMask) {
-      uint32_t mask = upb_FromBase92(ch);
-      for (int i = 0; i < 5; i++, base++, mask >>= 1) {
-        if (mask & 1) {
-          if (!upb_MiniTable_BuildEnumValue(&d, table, base, arena)) {
-            return NULL;
-          }
-        }
-      }
-    } else if (kUpb_EncodedValue_MinSkip <= ch &&
-               ch <= kUpb_EncodedValue_MaxSkip) {
-      uint32_t skip;
-      ptr = upb_MiniTable_DecodeBase92Varint(&d, ptr, ch,
-                                             kUpb_EncodedValue_MinSkip,
-                                             kUpb_EncodedValue_MaxSkip, &skip);
-      base += skip;
-    } else {
-      upb_Status_SetErrorFormat(status, "Unexpected character: %c", ch);
-      return NULL;
-    }
-  }
-
-  return table;
-}
-
-bool upb_MiniTable_BuildExtension(const char* data, size_t len,
-                                  upb_MiniTable_Extension* ext,
-                                  upb_MiniTable_Sub sub, upb_Status* status) {
-  upb_MtDecoder decoder = {
-      .arena = NULL,
-      .status = status,
-      .table = NULL,
-  };
-
-  if (UPB_SETJMP(decoder.err)) {
-    return false;
-  }
-
-  uint16_t count = 0;
-  upb_MtDecoder_Parse(&decoder, data, len, ext, sizeof(*ext), &count, NULL);
-  ext->field.mode |= kUpb_LabelFlags_IsExtension;
-  ext->field.offset = 0;
-  return true;
-}
-
-upb_MiniTable* upb_MiniTable_Build(const char* data, size_t len,
-                                   upb_MiniTablePlatform platform,
-                                   upb_Arena* arena, upb_Status* status) {
-  void* buf = NULL;
-  size_t size = 0;
-  upb_MiniTable* ret = upb_MiniTable_BuildWithBuf(data, len, platform, arena,
-                                                  &buf, &size, status);
-  free(buf);
-  return ret;
-}
-
-void upb_MiniTable_SetSubMessage(upb_MiniTable* table,
-                                 upb_MiniTable_Field* field,
-                                 const upb_MiniTable* sub) {
-  UPB_ASSERT((uintptr_t)table->fields <= (uintptr_t)field &&
-             (uintptr_t)field <
-                 (uintptr_t)(table->fields + table->field_count));
-  if (sub->ext & kUpb_ExtMode_IsMapEntry) {
-    field->mode =
-        (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift) | kUpb_FieldMode_Map;
-  }
-  upb_MiniTable_Sub* table_sub = (void*)&table->subs[field->submsg_index];
-  table_sub->submsg = sub;
-}
-
-void upb_MiniTable_SetSubEnum(upb_MiniTable* table, upb_MiniTable_Field* field,
-                              const upb_MiniTable_Enum* sub) {
-  UPB_ASSERT((uintptr_t)table->fields <= (uintptr_t)field &&
-             (uintptr_t)field <
-                 (uintptr_t)(table->fields + table->field_count));
-  upb_MiniTable_Sub* table_sub = (void*)&table->subs[field->submsg_index];
-  table_sub->subenum = sub;
-}
-
-/** upb/def.c ************************************************************/
-
-#include <ctype.h>
-#include <errno.h>
-#include <setjmp.h>
-#include <stdlib.h>
-#include <string.h>
-
-
-/* Must be last. */
-
-typedef struct {
-  size_t len;
-  char str[1]; /* Null-terminated string data follows. */
-} str_t;
-
-/* The upb core does not generally have a concept of default instances. However
- * for descriptor options we make an exception since the max size is known and
- * modest (<200 bytes). All types can share a default instance since it is
- * initialized to zeroes.
- *
- * We have to allocate an extra pointer for upb's internal metadata. */
-static const char opt_default_buf[_UPB_MAXOPT_SIZE + sizeof(void*)] = {0};
-static const char* opt_default = &opt_default_buf[sizeof(void*)];
-
-struct upb_FieldDef {
-  const google_protobuf_FieldOptions* opts;
-  const upb_FileDef* file;
-  const upb_MessageDef* msgdef;
-  const char* full_name;
-  const char* json_name;
-  union {
-    int64_t sint;
-    uint64_t uint;
-    double dbl;
-    float flt;
-    bool boolean;
-    str_t* str;
-  } defaultval;
-  union {
-    const upb_OneofDef* oneof;
-    const upb_MessageDef* extension_scope;
-  } scope;
-  union {
-    const upb_MessageDef* msgdef;
-    const upb_EnumDef* enumdef;
-    const google_protobuf_FieldDescriptorProto* unresolved;
-  } sub;
-  uint32_t number_;
-  uint16_t index_;
-  uint16_t layout_index; /* Index into msgdef->layout->fields or file->exts */
-  bool has_default;
-  bool is_extension_;
-  bool packed_;
-  bool proto3_optional_;
-  bool has_json_name_;
-  upb_FieldType type_;
-  upb_Label label_;
-#if UINTPTR_MAX == 0xffffffff
-  uint32_t padding;  // Increase size to a multiple of 8.
-#endif
-};
-
-struct upb_ExtensionRange {
-  const google_protobuf_ExtensionRangeOptions* opts;
-  int32_t start;
-  int32_t end;
-};
-
-struct upb_MessageDef {
-  const google_protobuf_MessageOptions* opts;
-  const upb_MiniTable* layout;
-  const upb_FileDef* file;
-  const upb_MessageDef* containing_type;
-  const char* full_name;
-
-  /* Tables for looking up fields by number and name. */
-  upb_inttable itof;
-  upb_strtable ntof;
-
-  /* All nested defs.
-   * MEM: We could save some space here by putting nested defs in a contiguous
-   * region and calculating counts from offsets or vice-versa. */
-  const upb_FieldDef* fields;
-  const upb_OneofDef* oneofs;
-  const upb_ExtensionRange* ext_ranges;
-  const upb_StringView* res_names;
-  const upb_MessageDef* nested_msgs;
-  const upb_MessageReservedRange* res_ranges;
-  const upb_EnumDef* nested_enums;
-  const upb_FieldDef* nested_exts;
-  int field_count;
-  int real_oneof_count;
-  int oneof_count;
-  int ext_range_count;
-  int res_range_count;
-  int res_name_count;
-  int nested_msg_count;
-  int nested_enum_count;
-  int nested_ext_count;
-  bool in_message_set;
-  upb_WellKnown well_known_type;
-#if UINTPTR_MAX == 0xffffffff
-  uint32_t padding;  // Increase size to a multiple of 8.
-#endif
-};
-
-struct upb_EnumDef {
-  const google_protobuf_EnumOptions* opts;
-  const upb_MiniTable_Enum* layout;  // Only for proto2.
-  const upb_FileDef* file;
-  const upb_MessageDef* containing_type;  // Could be merged with "file".
-  const char* full_name;
-  upb_strtable ntoi;
-  upb_inttable iton;
-  const upb_EnumValueDef* values;
-  const upb_EnumReservedRange* res_ranges;
-  const upb_StringView* res_names;
-  int value_count;
-  int res_range_count;
-  int res_name_count;
-  int32_t defaultval;
-#if UINTPTR_MAX == 0xffffffff
-  uint32_t padding;  // Increase size to a multiple of 8.
-#endif
-};
-
-struct upb_EnumValueDef {
-  const google_protobuf_EnumValueOptions* opts;
-  const upb_EnumDef* parent;
-  const char* full_name;
-  int32_t number;
-};
-
-struct upb_OneofDef {
-  const google_protobuf_OneofOptions* opts;
-  const upb_MessageDef* parent;
-  const char* full_name;
-  int field_count;
-  bool synthetic;
-  const upb_FieldDef** fields;
-  upb_strtable ntof;
-  upb_inttable itof;
-#if UINTPTR_MAX == 0xffffffff
-  uint32_t padding;  // Increase size to a multiple of 8.
-#endif
-};
-
-struct upb_FileDef {
-  const google_protobuf_FileOptions* opts;
-  const char* name;
-  const char* package;
-
-  const upb_FileDef** deps;
-  const int32_t* public_deps;
-  const int32_t* weak_deps;
-  const upb_MessageDef* top_lvl_msgs;
-  const upb_EnumDef* top_lvl_enums;
-  const upb_FieldDef* top_lvl_exts;
-  const upb_ServiceDef* services;
-  const upb_MiniTable_Extension** ext_layouts;
-  const upb_DefPool* symtab;
-
-  int dep_count;
-  int public_dep_count;
-  int weak_dep_count;
-  int top_lvl_msg_count;
-  int top_lvl_enum_count;
-  int top_lvl_ext_count;
-  int service_count;
-  int ext_count; /* All exts in the file. */
-  upb_Syntax syntax;
-};
-
-struct upb_MethodDef {
-  const google_protobuf_MethodOptions* opts;
-  upb_ServiceDef* service;
-  const char* full_name;
-  const upb_MessageDef* input_type;
-  const upb_MessageDef* output_type;
-  int index;
-  bool client_streaming;
-  bool server_streaming;
-};
-
-struct upb_ServiceDef {
-  const google_protobuf_ServiceOptions* opts;
-  const upb_FileDef* file;
-  const char* full_name;
-  upb_MethodDef* methods;
-  int method_count;
-  int index;
-};
-
-struct upb_DefPool {
-  upb_Arena* arena;
-  upb_strtable syms;  /* full_name -> packed def ptr */
-  upb_strtable files; /* file_name -> upb_FileDef* */
-  upb_inttable exts;  /* upb_MiniTable_Extension* -> upb_FieldDef* */
-  upb_ExtensionRegistry* extreg;
-  size_t bytes_loaded;
-};
-
-/* Inside a symtab we store tagged pointers to specific def types. */
-typedef enum {
-  UPB_DEFTYPE_MASK = 7,
-
-  /* Only inside symtab table. */
-  UPB_DEFTYPE_EXT = 0,
-  UPB_DEFTYPE_MSG = 1,
-  UPB_DEFTYPE_ENUM = 2,
-  UPB_DEFTYPE_ENUMVAL = 3,
-  UPB_DEFTYPE_SERVICE = 4,
-
-  /* Only inside message table. */
-  UPB_DEFTYPE_FIELD = 0,
-  UPB_DEFTYPE_ONEOF = 1,
-  UPB_DEFTYPE_FIELD_JSONNAME = 2,
-
-  /* Only inside file table. */
-  UPB_DEFTYPE_FILE = 0,
-  UPB_DEFTYPE_LAYOUT = 1
-} upb_deftype_t;
-
-#define FIELD_TYPE_UNSPECIFIED 0
-
-struct upb_MessageReservedRange {
-  int32_t start;
-  int32_t end;
-};
-
-struct symtab_addctx {
-  upb_DefPool* symtab;
-  upb_FileDef* file;                /* File we are building. */
-  upb_Arena* arena;                 /* Allocate defs here. */
-  upb_Arena* tmp_arena;             /* For temporary allocations. */
-  const upb_MiniTable_File* layout; /* NULL if we should build layouts. */
-  int enum_count;                   /* Count of enums built so far. */
-  int msg_count;                    /* Count of messages built so far. */
-  int ext_count;                    /* Count of extensions built so far. */
-  upb_Status* status;               /* Record errors here. */
-  jmp_buf err;                      /* longjmp() on error. */
-};
-
-static upb_deftype_t deftype(upb_value v) {
-  uintptr_t num = (uintptr_t)upb_value_getconstptr(v);
-  return num & UPB_DEFTYPE_MASK;
-}
-
-static const void* unpack_def(upb_value v, upb_deftype_t type) {
-  uintptr_t num = (uintptr_t)upb_value_getconstptr(v);
-  return (num & UPB_DEFTYPE_MASK) == type
-             ? (const void*)(num & ~UPB_DEFTYPE_MASK)
-             : NULL;
-}
-
-static upb_value pack_def(const void* ptr, upb_deftype_t type) {
-  // Our 3-bit pointer tagging requires all pointers to be multiples of 8.
-  // The arena will always yield 8-byte-aligned addresses, however we put
-  // the defs into arrays.  For each element in the array to be 8-byte-aligned,
-  // the sizes of each def type must also be a multiple of 8.
-  //
-  // If any of these asserts fail, we need to add or remove padding on 32-bit
-  // machines (64-bit machines will have 8-byte alignment already due to
-  // pointers, which all of these structs have).
-  UPB_ASSERT((sizeof(upb_FieldDef) & UPB_DEFTYPE_MASK) == 0);
-  UPB_ASSERT((sizeof(upb_MessageDef) & UPB_DEFTYPE_MASK) == 0);
-  UPB_ASSERT((sizeof(upb_EnumDef) & UPB_DEFTYPE_MASK) == 0);
-  UPB_ASSERT((sizeof(upb_EnumValueDef) & UPB_DEFTYPE_MASK) == 0);
-  UPB_ASSERT((sizeof(upb_ServiceDef) & UPB_DEFTYPE_MASK) == 0);
-  UPB_ASSERT((sizeof(upb_OneofDef) & UPB_DEFTYPE_MASK) == 0);
-  uintptr_t num = (uintptr_t)ptr;
-  UPB_ASSERT((num & UPB_DEFTYPE_MASK) == 0);
-  num |= type;
-  return upb_value_constptr((const void*)num);
-}
-
-/* isalpha() etc. from <ctype.h> are locale-dependent, which we don't want. */
-static bool upb_isbetween(uint8_t c, uint8_t low, uint8_t high) {
-  return c >= low && c <= high;
-}
-
-static char upb_ascii_lower(char ch) {
-  // Per ASCII this will lower-case a letter.  If the result is a letter, the
-  // input was definitely a letter.  If the output is not a letter, this may
-  // have transformed the character unpredictably.
-  return ch | 0x20;
-}
-
-static bool upb_isletter(char c) {
-  char lower = upb_ascii_lower(c);
-  return upb_isbetween(lower, 'a', 'z') || c == '_';
-}
-
-static bool upb_isalphanum(char c) {
-  return upb_isletter(c) || upb_isbetween(c, '0', '9');
-}
-
-static const char* shortdefname(const char* fullname) {
-  const char* p;
-
-  if (fullname == NULL) {
-    return NULL;
-  } else if ((p = strrchr(fullname, '.')) == NULL) {
-    /* No '.' in the name, return the full string. */
-    return fullname;
-  } else {
-    /* Return one past the last '.'. */
-    return p + 1;
-  }
-}
-
-/* All submessage fields are lower than all other fields.
- * Secondly, fields are increasing in order. */
-uint32_t field_rank(const upb_FieldDef* f) {
-  uint32_t ret = upb_FieldDef_Number(f);
-  const uint32_t high_bit = 1 << 30;
-  UPB_ASSERT(ret < high_bit);
-  if (!upb_FieldDef_IsSubMessage(f)) ret |= high_bit;
-  return ret;
-}
-
-int cmp_fields(const void* p1, const void* p2) {
-  const upb_FieldDef* f1 = *(upb_FieldDef* const*)p1;
-  const upb_FieldDef* f2 = *(upb_FieldDef* const*)p2;
-  return field_rank(f1) - field_rank(f2);
-}
-
-static void upb_Status_setoom(upb_Status* status) {
-  upb_Status_SetErrorMessage(status, "out of memory");
-}
-
-static void assign_msg_wellknowntype(upb_MessageDef* m) {
-  const char* name = upb_MessageDef_FullName(m);
-  if (name == NULL) {
-    m->well_known_type = kUpb_WellKnown_Unspecified;
-    return;
-  }
-  if (!strcmp(name, "google.protobuf.Any")) {
-    m->well_known_type = kUpb_WellKnown_Any;
-  } else if (!strcmp(name, "google.protobuf.FieldMask")) {
-    m->well_known_type = kUpb_WellKnown_FieldMask;
-  } else if (!strcmp(name, "google.protobuf.Duration")) {
-    m->well_known_type = kUpb_WellKnown_Duration;
-  } else if (!strcmp(name, "google.protobuf.Timestamp")) {
-    m->well_known_type = kUpb_WellKnown_Timestamp;
-  } else if (!strcmp(name, "google.protobuf.DoubleValue")) {
-    m->well_known_type = kUpb_WellKnown_DoubleValue;
-  } else if (!strcmp(name, "google.protobuf.FloatValue")) {
-    m->well_known_type = kUpb_WellKnown_FloatValue;
-  } else if (!strcmp(name, "google.protobuf.Int64Value")) {
-    m->well_known_type = kUpb_WellKnown_Int64Value;
-  } else if (!strcmp(name, "google.protobuf.UInt64Value")) {
-    m->well_known_type = kUpb_WellKnown_UInt64Value;
-  } else if (!strcmp(name, "google.protobuf.Int32Value")) {
-    m->well_known_type = kUpb_WellKnown_Int32Value;
-  } else if (!strcmp(name, "google.protobuf.UInt32Value")) {
-    m->well_known_type = kUpb_WellKnown_UInt32Value;
-  } else if (!strcmp(name, "google.protobuf.BoolValue")) {
-    m->well_known_type = kUpb_WellKnown_BoolValue;
-  } else if (!strcmp(name, "google.protobuf.StringValue")) {
-    m->well_known_type = kUpb_WellKnown_StringValue;
-  } else if (!strcmp(name, "google.protobuf.BytesValue")) {
-    m->well_known_type = kUpb_WellKnown_BytesValue;
-  } else if (!strcmp(name, "google.protobuf.Value")) {
-    m->well_known_type = kUpb_WellKnown_Value;
-  } else if (!strcmp(name, "google.protobuf.ListValue")) {
-    m->well_known_type = kUpb_WellKnown_ListValue;
-  } else if (!strcmp(name, "google.protobuf.Struct")) {
-    m->well_known_type = kUpb_WellKnown_Struct;
-  } else {
-    m->well_known_type = kUpb_WellKnown_Unspecified;
-  }
-}
-
-/* upb_EnumDef ****************************************************************/
-
-const google_protobuf_EnumOptions* upb_EnumDef_Options(const upb_EnumDef* e) {
-  return e->opts;
-}
-
-bool upb_EnumDef_HasOptions(const upb_EnumDef* e) {
-  return e->opts != (void*)opt_default;
-}
-
-const char* upb_EnumDef_FullName(const upb_EnumDef* e) { return e->full_name; }
-
-const char* upb_EnumDef_Name(const upb_EnumDef* e) {
-  return shortdefname(e->full_name);
-}
-
-const upb_FileDef* upb_EnumDef_File(const upb_EnumDef* e) { return e->file; }
-
-const upb_MessageDef* upb_EnumDef_ContainingType(const upb_EnumDef* e) {
-  return e->containing_type;
-}
-
-int32_t upb_EnumDef_Default(const upb_EnumDef* e) {
-  UPB_ASSERT(upb_EnumDef_FindValueByNumber(e, e->defaultval));
-  return e->defaultval;
-}
-
-int upb_EnumDef_ReservedRangeCount(const upb_EnumDef* e) {
-  return e->res_range_count;
-}
-
-/* upb_EnumReservedRange ******************************************************/
-
-struct upb_EnumReservedRange {
-  int32_t start;
-  int32_t end;
-};
-
-upb_EnumReservedRange* _upb_EnumReservedRange_At(const upb_EnumReservedRange* r,
-                                                 int i) {
-  return (upb_EnumReservedRange*)&r[i];
-}
-
-int32_t upb_EnumReservedRange_Start(const upb_EnumReservedRange* r) {
-  return r->start;
-}
-int32_t upb_EnumReservedRange_End(const upb_EnumReservedRange* r) {
-  return r->end;
-}
-
-UPB_NORETURN UPB_NOINLINE UPB_PRINTF(2, 3) static void symtab_errf(
-    symtab_addctx* ctx, const char* fmt, ...) {
-  va_list argp;
-  va_start(argp, fmt);
-  upb_Status_VSetErrorFormat(ctx->status, fmt, argp);
-  va_end(argp);
-  UPB_LONGJMP(ctx->err, 1);
-}
-
-upb_EnumReservedRange* _upb_EnumReservedRanges_New(
-    symtab_addctx* ctx, int n,
-    const google_protobuf_EnumDescriptorProto_EnumReservedRange* const* protos,
-    const upb_EnumDef* e) {
-  upb_EnumReservedRange* r =
-      upb_Arena_Malloc(ctx->arena, sizeof(upb_EnumReservedRange) * n);
-
-  for (int i = 0; i < n; i++) {
-    const int32_t start =
-        google_protobuf_EnumDescriptorProto_EnumReservedRange_start(protos[i]);
-    const int32_t end =
-        google_protobuf_EnumDescriptorProto_EnumReservedRange_end(protos[i]);
-
-    // A full validation would also check that each range is disjoint, and that
-    // none of the fields overlap with the extension ranges, but we are just
-    // sanity checking here.
-
-    // Note: Not a typo! Unlike extension ranges and message reserved ranges,
-    // the end value of an enum reserved range is *inclusive*!
-    if (end < start) {
-      symtab_errf(ctx, "Reserved range (%d, %d) is invalid, enum=%s\n",
-                           (int)start, (int)end, upb_EnumDef_FullName(e));
-    }
-
-    r[i].start = start;
-    r[i].end = end;
-  }
-
-  return r;
-}
-
-const upb_EnumReservedRange* upb_EnumDef_ReservedRange(const upb_EnumDef* e,
-                                                       int i) {
-  UPB_ASSERT(0 <= i && i < e->res_range_count);
-  return _upb_EnumReservedRange_At(e->res_ranges, i);
-}
-
-int upb_EnumDef_ReservedNameCount(const upb_EnumDef* e) {
-  return e->res_name_count;
-}
-
-upb_StringView upb_EnumDef_ReservedName(const upb_EnumDef* e, int i) {
-  UPB_ASSERT(0 <= i && i < e->res_name_count);
-  return e->res_names[i];
-}
-
-int upb_EnumDef_ValueCount(const upb_EnumDef* e) { return e->value_count; }
-
-const upb_EnumValueDef* upb_EnumDef_FindValueByNameWithSize(
-    const upb_EnumDef* def, const char* name, size_t len) {
-  upb_value v;
-  return upb_strtable_lookup2(&def->ntoi, name, len, &v)
-             ? upb_value_getconstptr(v)
-             : NULL;
-}
-
-const upb_EnumValueDef* upb_EnumDef_FindValueByNumber(const upb_EnumDef* def,
-                                                      int32_t num) {
-  upb_value v;
-  return upb_inttable_lookup(&def->iton, num, &v) ? upb_value_getconstptr(v)
-                                                  : NULL;
-}
-
-bool upb_EnumDef_CheckNumber(const upb_EnumDef* e, int32_t num) {
-  // We could use upb_EnumDef_FindValueByNumber(e, num) != NULL, but we expect
-  // this to be faster (especially for small numbers).
-  return upb_MiniTable_Enum_CheckValue(e->layout, num);
-}
-
-const upb_EnumValueDef* upb_EnumDef_Value(const upb_EnumDef* e, int i) {
-  UPB_ASSERT(0 <= i && i < e->value_count);
-  return &e->values[i];
-}
-
-/* upb_EnumValueDef ***********************************************************/
-
-const google_protobuf_EnumValueOptions* upb_EnumValueDef_Options(
-    const upb_EnumValueDef* e) {
-  return e->opts;
-}
-
-bool upb_EnumValueDef_HasOptions(const upb_EnumValueDef* e) {
-  return e->opts != (void*)opt_default;
-}
-
-const upb_EnumDef* upb_EnumValueDef_Enum(const upb_EnumValueDef* ev) {
-  return ev->parent;
-}
-
-const char* upb_EnumValueDef_FullName(const upb_EnumValueDef* ev) {
-  return ev->full_name;
-}
-
-const char* upb_EnumValueDef_Name(const upb_EnumValueDef* ev) {
-  return shortdefname(ev->full_name);
-}
-
-int32_t upb_EnumValueDef_Number(const upb_EnumValueDef* ev) {
-  return ev->number;
-}
-
-uint32_t upb_EnumValueDef_Index(const upb_EnumValueDef* ev) {
-  // Compute index in our parent's array.
-  return ev - ev->parent->values;
-}
-
-/* upb_ExtensionRange
- * ***************************************************************/
-
-const google_protobuf_ExtensionRangeOptions* upb_ExtensionRange_Options(
-    const upb_ExtensionRange* r) {
-  return r->opts;
-}
-
-bool upb_ExtensionRange_HasOptions(const upb_ExtensionRange* r) {
-  return r->opts != (void*)opt_default;
-}
-
-int32_t upb_ExtensionRange_Start(const upb_ExtensionRange* e) {
-  return e->start;
-}
-
-int32_t upb_ExtensionRange_End(const upb_ExtensionRange* e) { return e->end; }
-
-/* upb_FieldDef ***************************************************************/
-
-const google_protobuf_FieldOptions* upb_FieldDef_Options(
-    const upb_FieldDef* f) {
-  return f->opts;
-}
-
-bool upb_FieldDef_HasOptions(const upb_FieldDef* f) {
-  return f->opts != (void*)opt_default;
-}
-
-const char* upb_FieldDef_FullName(const upb_FieldDef* f) {
-  return f->full_name;
-}
-
-upb_CType upb_FieldDef_CType(const upb_FieldDef* f) {
-  switch (f->type_) {
-    case kUpb_FieldType_Double:
-      return kUpb_CType_Double;
-    case kUpb_FieldType_Float:
-      return kUpb_CType_Float;
-    case kUpb_FieldType_Int64:
-    case kUpb_FieldType_SInt64:
-    case kUpb_FieldType_SFixed64:
-      return kUpb_CType_Int64;
-    case kUpb_FieldType_Int32:
-    case kUpb_FieldType_SFixed32:
-    case kUpb_FieldType_SInt32:
-      return kUpb_CType_Int32;
-    case kUpb_FieldType_UInt64:
-    case kUpb_FieldType_Fixed64:
-      return kUpb_CType_UInt64;
-    case kUpb_FieldType_UInt32:
-    case kUpb_FieldType_Fixed32:
-      return kUpb_CType_UInt32;
-    case kUpb_FieldType_Enum:
-      return kUpb_CType_Enum;
-    case kUpb_FieldType_Bool:
-      return kUpb_CType_Bool;
-    case kUpb_FieldType_String:
-      return kUpb_CType_String;
-    case kUpb_FieldType_Bytes:
-      return kUpb_CType_Bytes;
-    case kUpb_FieldType_Group:
-    case kUpb_FieldType_Message:
-      return kUpb_CType_Message;
-  }
-  UPB_UNREACHABLE();
-}
-
-upb_FieldType upb_FieldDef_Type(const upb_FieldDef* f) { return f->type_; }
-
-uint32_t upb_FieldDef_Index(const upb_FieldDef* f) { return f->index_; }
-
-upb_Label upb_FieldDef_Label(const upb_FieldDef* f) { return f->label_; }
-
-uint32_t upb_FieldDef_Number(const upb_FieldDef* f) { return f->number_; }
-
-bool upb_FieldDef_IsExtension(const upb_FieldDef* f) {
-  return f->is_extension_;
-}
-
-bool upb_FieldDef_IsPacked(const upb_FieldDef* f) { return f->packed_; }
-
-const char* upb_FieldDef_Name(const upb_FieldDef* f) {
-  return shortdefname(f->full_name);
-}
-
-const char* upb_FieldDef_JsonName(const upb_FieldDef* f) {
-  return f->json_name;
-}
-
-bool upb_FieldDef_HasJsonName(const upb_FieldDef* f) {
-  return f->has_json_name_;
-}
-
-const upb_FileDef* upb_FieldDef_File(const upb_FieldDef* f) { return f->file; }
-
-const upb_MessageDef* upb_FieldDef_ContainingType(const upb_FieldDef* f) {
-  return f->msgdef;
-}
-
-const upb_MessageDef* upb_FieldDef_ExtensionScope(const upb_FieldDef* f) {
-  return f->is_extension_ ? f->scope.extension_scope : NULL;
-}
-
-const upb_OneofDef* upb_FieldDef_ContainingOneof(const upb_FieldDef* f) {
-  return f->is_extension_ ? NULL : f->scope.oneof;
-}
-
-const upb_OneofDef* upb_FieldDef_RealContainingOneof(const upb_FieldDef* f) {
-  const upb_OneofDef* oneof = upb_FieldDef_ContainingOneof(f);
-  if (!oneof || upb_OneofDef_IsSynthetic(oneof)) return NULL;
-  return oneof;
-}
-
-upb_MessageValue upb_FieldDef_Default(const upb_FieldDef* f) {
-  UPB_ASSERT(!upb_FieldDef_IsSubMessage(f));
-  upb_MessageValue ret;
-
-  switch (upb_FieldDef_CType(f)) {
-    case kUpb_CType_Bool:
-      return (upb_MessageValue){.bool_val = f->defaultval.boolean};
-    case kUpb_CType_Int64:
-      return (upb_MessageValue){.int64_val = f->defaultval.sint};
-    case kUpb_CType_UInt64:
-      return (upb_MessageValue){.uint64_val = f->defaultval.uint};
-    case kUpb_CType_Enum:
-    case kUpb_CType_Int32:
-      return (upb_MessageValue){.int32_val = (int32_t)f->defaultval.sint};
-    case kUpb_CType_UInt32:
-      return (upb_MessageValue){.uint32_val = (uint32_t)f->defaultval.uint};
-    case kUpb_CType_Float:
-      return (upb_MessageValue){.float_val = f->defaultval.flt};
-    case kUpb_CType_Double:
-      return (upb_MessageValue){.double_val = f->defaultval.dbl};
-    case kUpb_CType_String:
-    case kUpb_CType_Bytes: {
-      str_t* str = f->defaultval.str;
-      if (str) {
-        return (upb_MessageValue){
-            .str_val = (upb_StringView){.data = str->str, .size = str->len}};
-      } else {
-        return (upb_MessageValue){
-            .str_val = (upb_StringView){.data = NULL, .size = 0}};
-      }
-    }
-    default:
-      UPB_UNREACHABLE();
-  }
-
-  return ret;
-}
-
-const upb_MessageDef* upb_FieldDef_MessageSubDef(const upb_FieldDef* f) {
-  return upb_FieldDef_CType(f) == kUpb_CType_Message ? f->sub.msgdef : NULL;
-}
-
-const upb_EnumDef* upb_FieldDef_EnumSubDef(const upb_FieldDef* f) {
-  return upb_FieldDef_CType(f) == kUpb_CType_Enum ? f->sub.enumdef : NULL;
-}
-
-const upb_MiniTable_Field* upb_FieldDef_MiniTable(const upb_FieldDef* f) {
-  UPB_ASSERT(!upb_FieldDef_IsExtension(f));
-  return &f->msgdef->layout->fields[f->layout_index];
-}
-
-const upb_MiniTable_Extension* _upb_FieldDef_ExtensionMiniTable(
-    const upb_FieldDef* f) {
-  UPB_ASSERT(upb_FieldDef_IsExtension(f));
-  return f->file->ext_layouts[f->layout_index];
-}
-
-bool _upb_FieldDef_IsProto3Optional(const upb_FieldDef* f) {
-  return f->proto3_optional_;
-}
-
-bool upb_FieldDef_IsSubMessage(const upb_FieldDef* f) {
-  return upb_FieldDef_CType(f) == kUpb_CType_Message;
-}
-
-bool upb_FieldDef_IsString(const upb_FieldDef* f) {
-  return upb_FieldDef_CType(f) == kUpb_CType_String ||
-         upb_FieldDef_CType(f) == kUpb_CType_Bytes;
-}
-
-bool upb_FieldDef_IsRepeated(const upb_FieldDef* f) {
-  return upb_FieldDef_Label(f) == kUpb_Label_Repeated;
-}
-
-bool upb_FieldDef_IsPrimitive(const upb_FieldDef* f) {
-  return !upb_FieldDef_IsString(f) && !upb_FieldDef_IsSubMessage(f);
-}
-
-bool upb_FieldDef_IsMap(const upb_FieldDef* f) {
-  return upb_FieldDef_IsRepeated(f) && upb_FieldDef_IsSubMessage(f) &&
-         upb_MessageDef_IsMapEntry(upb_FieldDef_MessageSubDef(f));
-}
-
-bool upb_FieldDef_HasDefault(const upb_FieldDef* f) { return f->has_default; }
-
-bool upb_FieldDef_HasSubDef(const upb_FieldDef* f) {
-  return upb_FieldDef_IsSubMessage(f) ||
-         upb_FieldDef_CType(f) == kUpb_CType_Enum;
-}
-
-bool upb_FieldDef_HasPresence(const upb_FieldDef* f) {
-  if (upb_FieldDef_IsRepeated(f)) return false;
-  return upb_FieldDef_IsSubMessage(f) || upb_FieldDef_ContainingOneof(f) ||
-         f->file->syntax == kUpb_Syntax_Proto2;
-}
-
-static bool between(int32_t x, int32_t low, int32_t high) {
-  return x >= low && x <= high;
-}
-
-bool upb_FieldDef_checklabel(int32_t label) { return between(label, 1, 3); }
-bool upb_FieldDef_checktype(int32_t type) { return between(type, 1, 11); }
-bool upb_FieldDef_checkintfmt(int32_t fmt) { return between(fmt, 1, 3); }
-
-bool upb_FieldDef_checkdescriptortype(int32_t type) {
-  return between(type, 1, 18);
-}
-
-/* upb_MessageDef
- * *****************************************************************/
-
-const google_protobuf_MessageOptions* upb_MessageDef_Options(
-    const upb_MessageDef* m) {
-  return m->opts;
-}
-
-bool upb_MessageDef_HasOptions(const upb_MessageDef* m) {
-  return m->opts != (void*)opt_default;
-}
-
-const char* upb_MessageDef_FullName(const upb_MessageDef* m) {
-  return m->full_name;
-}
-
-const upb_FileDef* upb_MessageDef_File(const upb_MessageDef* m) {
-  return m->file;
-}
-
-const upb_MessageDef* upb_MessageDef_ContainingType(const upb_MessageDef* m) {
-  return m->containing_type;
-}
-
-const char* upb_MessageDef_Name(const upb_MessageDef* m) {
-  return shortdefname(m->full_name);
-}
-
-upb_Syntax upb_MessageDef_Syntax(const upb_MessageDef* m) {
-  return m->file->syntax;
-}
-
-const upb_FieldDef* upb_MessageDef_FindFieldByNumber(const upb_MessageDef* m,
-                                                     uint32_t i) {
-  upb_value val;
-  return upb_inttable_lookup(&m->itof, i, &val) ? upb_value_getconstptr(val)
-                                                : NULL;
-}
-
-const upb_FieldDef* upb_MessageDef_FindFieldByNameWithSize(
-    const upb_MessageDef* m, const char* name, size_t len) {
-  upb_value val;
-
-  if (!upb_strtable_lookup2(&m->ntof, name, len, &val)) {
-    return NULL;
-  }
-
-  return unpack_def(val, UPB_DEFTYPE_FIELD);
-}
-
-const upb_OneofDef* upb_MessageDef_FindOneofByNameWithSize(
-    const upb_MessageDef* m, const char* name, size_t len) {
-  upb_value val;
-
-  if (!upb_strtable_lookup2(&m->ntof, name, len, &val)) {
-    return NULL;
-  }
-
-  return unpack_def(val, UPB_DEFTYPE_ONEOF);
-}
-
-bool upb_MessageDef_FindByNameWithSize(const upb_MessageDef* m,
-                                       const char* name, size_t len,
-                                       const upb_FieldDef** out_f,
-                                       const upb_OneofDef** out_o) {
-  upb_value val;
-
-  if (!upb_strtable_lookup2(&m->ntof, name, len, &val)) {
-    return false;
-  }
-
-  const upb_FieldDef* f = unpack_def(val, UPB_DEFTYPE_FIELD);
-  const upb_OneofDef* o = unpack_def(val, UPB_DEFTYPE_ONEOF);
-  if (out_f) *out_f = f;
-  if (out_o) *out_o = o;
-  return f || o; /* False if this was a JSON name. */
-}
-
-const upb_FieldDef* upb_MessageDef_FindByJsonNameWithSize(
-    const upb_MessageDef* m, const char* name, size_t len) {
-  upb_value val;
-  const upb_FieldDef* f;
-
-  if (!upb_strtable_lookup2(&m->ntof, name, len, &val)) {
-    return NULL;
-  }
-
-  f = unpack_def(val, UPB_DEFTYPE_FIELD);
-  if (!f) f = unpack_def(val, UPB_DEFTYPE_FIELD_JSONNAME);
-
-  return f;
-}
-
-int upb_MessageDef_numfields(const upb_MessageDef* m) { return m->field_count; }
-
-int upb_MessageDef_numoneofs(const upb_MessageDef* m) { return m->oneof_count; }
-
-int upb_MessageDef_numrealoneofs(const upb_MessageDef* m) {
-  return m->real_oneof_count;
-}
-
-int upb_MessageDef_ExtensionRangeCount(const upb_MessageDef* m) {
-  return m->ext_range_count;
-}
-
-int upb_MessageDef_ReservedRangeCount(const upb_MessageDef* m) {
-  return m->res_range_count;
-}
-
-int upb_MessageDef_ReservedNameCount(const upb_MessageDef* m) {
-  return m->res_name_count;
-}
-
-int upb_MessageDef_FieldCount(const upb_MessageDef* m) {
-  return m->field_count;
-}
-
-int upb_MessageDef_OneofCount(const upb_MessageDef* m) {
-  return m->oneof_count;
-}
-
-int upb_MessageDef_NestedMessageCount(const upb_MessageDef* m) {
-  return m->nested_msg_count;
-}
-
-int upb_MessageDef_NestedEnumCount(const upb_MessageDef* m) {
-  return m->nested_enum_count;
-}
-
-int upb_MessageDef_NestedExtensionCount(const upb_MessageDef* m) {
-  return m->nested_ext_count;
-}
-
-int upb_MessageDef_realoneofcount(const upb_MessageDef* m) {
-  return m->real_oneof_count;
-}
-
-const upb_MiniTable* upb_MessageDef_MiniTable(const upb_MessageDef* m) {
-  return m->layout;
-}
-
-const upb_ExtensionRange* upb_MessageDef_ExtensionRange(const upb_MessageDef* m,
-                                                        int i) {
-  UPB_ASSERT(0 <= i && i < m->ext_range_count);
-  return &m->ext_ranges[i];
-}
-
-upb_MessageReservedRange* _upb_MessageReservedRange_At(
-    const upb_MessageReservedRange* r, int i) {
-  return (upb_MessageReservedRange*)&r[i];
-}
-
-const upb_MessageReservedRange* upb_MessageDef_ReservedRange(
-    const upb_MessageDef* m, int i) {
-  UPB_ASSERT(0 <= i && i < m->res_range_count);
-  return _upb_MessageReservedRange_At(m->res_ranges, i);
-}
-
-upb_StringView upb_MessageDef_ReservedName(const upb_MessageDef* m, int i) {
-  UPB_ASSERT(0 <= i && i < m->res_name_count);
-  return m->res_names[i];
-}
-
-int32_t upb_MessageReservedRange_Start(const upb_MessageReservedRange* r) {
-  return r->start;
-}
-int32_t upb_MessageReservedRange_End(const upb_MessageReservedRange* r) {
-  return r->end;
-}
-
-upb_MessageReservedRange* _upb_MessageReservedRanges_New(
-    symtab_addctx* ctx, int n,
-    const google_protobuf_DescriptorProto_ReservedRange* const* protos,
-    const upb_MessageDef* m) {
-  upb_MessageReservedRange* r =
-      upb_Arena_Malloc(ctx->arena, sizeof(upb_MessageReservedRange) * n);
-
-  for (int i = 0; i < n; i++) {
-    const int32_t start = google_protobuf_DescriptorProto_ReservedRange_start(protos[i]);
-    const int32_t end = google_protobuf_DescriptorProto_ReservedRange_end(protos[i]);
-    const int32_t max = kUpb_MaxFieldNumber + 1;
-
-    // A full validation would also check that each range is disjoint, and that
-    // none of the fields overlap with the extension ranges, but we are just
-    // sanity checking here.
-    if (start < 1 || end <= start || end > max) {
-      symtab_errf(ctx,
-                           "Reserved range (%d, %d) is invalid, message=%s\n",
-                           (int)start, (int)end, upb_MessageDef_FullName(m));
-    }
-
-    r[i].start = start;
-    r[i].end = end;
-  }
-
-  return r;
-}
-
-const upb_FieldDef* upb_MessageDef_Field(const upb_MessageDef* m, int i) {
-  UPB_ASSERT(0 <= i && i < m->field_count);
-  return &m->fields[i];
-}
-
-const upb_OneofDef* upb_MessageDef_Oneof(const upb_MessageDef* m, int i) {
-  UPB_ASSERT(0 <= i && i < m->oneof_count);
-  return &m->oneofs[i];
-}
-
-const upb_MessageDef* upb_MessageDef_NestedMessage(const upb_MessageDef* m,
-                                                   int i) {
-  UPB_ASSERT(0 <= i && i < m->nested_msg_count);
-  return &m->nested_msgs[i];
-}
-
-const upb_EnumDef* upb_MessageDef_NestedEnum(const upb_MessageDef* m, int i) {
-  UPB_ASSERT(0 <= i && i < m->nested_enum_count);
-  return &m->nested_enums[i];
-}
-
-const upb_FieldDef* upb_MessageDef_NestedExtension(const upb_MessageDef* m,
-                                                   int i) {
-  UPB_ASSERT(0 <= i && i < m->nested_ext_count);
-  return &m->nested_exts[i];
-}
-
-upb_WellKnown upb_MessageDef_WellKnownType(const upb_MessageDef* m) {
-  return m->well_known_type;
-}
-
-/* upb_OneofDef ***************************************************************/
-
-const google_protobuf_OneofOptions* upb_OneofDef_Options(
-    const upb_OneofDef* o) {
-  return o->opts;
-}
-
-bool upb_OneofDef_HasOptions(const upb_OneofDef* o) {
-  return o->opts != (void*)opt_default;
-}
-
-const char* upb_OneofDef_Name(const upb_OneofDef* o) {
-  return shortdefname(o->full_name);
-}
-
-const upb_MessageDef* upb_OneofDef_ContainingType(const upb_OneofDef* o) {
-  return o->parent;
-}
-
-int upb_OneofDef_FieldCount(const upb_OneofDef* o) { return o->field_count; }
-
-const upb_FieldDef* upb_OneofDef_Field(const upb_OneofDef* o, int i) {
-  UPB_ASSERT(i < o->field_count);
-  return o->fields[i];
-}
-
-int upb_OneofDef_numfields(const upb_OneofDef* o) { return o->field_count; }
-
-uint32_t upb_OneofDef_Index(const upb_OneofDef* o) {
-  // Compute index in our parent's array.
-  return o - o->parent->oneofs;
-}
-
-bool upb_OneofDef_IsSynthetic(const upb_OneofDef* o) { return o->synthetic; }
-
-const upb_FieldDef* upb_OneofDef_LookupNameWithSize(const upb_OneofDef* o,
-                                                    const char* name,
-                                                    size_t length) {
-  upb_value val;
-  return upb_strtable_lookup2(&o->ntof, name, length, &val)
-             ? upb_value_getptr(val)
-             : NULL;
-}
-
-const upb_FieldDef* upb_OneofDef_LookupNumber(const upb_OneofDef* o,
-                                              uint32_t num) {
-  upb_value val;
-  return upb_inttable_lookup(&o->itof, num, &val) ? upb_value_getptr(val)
-                                                  : NULL;
-}
-
-/* upb_FileDef ****************************************************************/
-
-const google_protobuf_FileOptions* upb_FileDef_Options(const upb_FileDef* f) {
-  return f->opts;
-}
-
-bool upb_FileDef_HasOptions(const upb_FileDef* f) {
-  return f->opts != (void*)opt_default;
-}
-
-const char* upb_FileDef_Name(const upb_FileDef* f) { return f->name; }
-
-const char* upb_FileDef_Package(const upb_FileDef* f) {
-  return f->package ? f->package : "";
-}
-
-upb_Syntax upb_FileDef_Syntax(const upb_FileDef* f) { return f->syntax; }
-
-int upb_FileDef_TopLevelMessageCount(const upb_FileDef* f) {
-  return f->top_lvl_msg_count;
-}
-
-int upb_FileDef_DependencyCount(const upb_FileDef* f) { return f->dep_count; }
-
-int upb_FileDef_PublicDependencyCount(const upb_FileDef* f) {
-  return f->public_dep_count;
-}
-
-int upb_FileDef_WeakDependencyCount(const upb_FileDef* f) {
-  return f->weak_dep_count;
-}
-
-const int32_t* _upb_FileDef_PublicDependencyIndexes(const upb_FileDef* f) {
-  return f->public_deps;
-}
-
-const int32_t* _upb_FileDef_WeakDependencyIndexes(const upb_FileDef* f) {
-  return f->weak_deps;
-}
-
-int upb_FileDef_TopLevelEnumCount(const upb_FileDef* f) {
-  return f->top_lvl_enum_count;
-}
-
-int upb_FileDef_TopLevelExtensionCount(const upb_FileDef* f) {
-  return f->top_lvl_ext_count;
-}
-
-int upb_FileDef_ServiceCount(const upb_FileDef* f) { return f->service_count; }
-
-const upb_FileDef* upb_FileDef_Dependency(const upb_FileDef* f, int i) {
-  UPB_ASSERT(0 <= i && i < f->dep_count);
-  return f->deps[i];
-}
-
-const upb_FileDef* upb_FileDef_PublicDependency(const upb_FileDef* f, int i) {
-  UPB_ASSERT(0 <= i && i < f->public_dep_count);
-  return f->deps[f->public_deps[i]];
-}
-
-const upb_FileDef* upb_FileDef_WeakDependency(const upb_FileDef* f, int i) {
-  UPB_ASSERT(0 <= i && i < f->public_dep_count);
-  return f->deps[f->weak_deps[i]];
-}
-
-const upb_MessageDef* upb_FileDef_TopLevelMessage(const upb_FileDef* f, int i) {
-  UPB_ASSERT(0 <= i && i < f->top_lvl_msg_count);
-  return &f->top_lvl_msgs[i];
-}
-
-const upb_EnumDef* upb_FileDef_TopLevelEnum(const upb_FileDef* f, int i) {
-  UPB_ASSERT(0 <= i && i < f->top_lvl_enum_count);
-  return &f->top_lvl_enums[i];
-}
-
-const upb_FieldDef* upb_FileDef_TopLevelExtension(const upb_FileDef* f, int i) {
-  UPB_ASSERT(0 <= i && i < f->top_lvl_ext_count);
-  return &f->top_lvl_exts[i];
-}
-
-const upb_ServiceDef* upb_FileDef_Service(const upb_FileDef* f, int i) {
-  UPB_ASSERT(0 <= i && i < f->service_count);
-  return &f->services[i];
-}
-
-const upb_DefPool* upb_FileDef_Pool(const upb_FileDef* f) { return f->symtab; }
-
-/* upb_MethodDef **************************************************************/
-
-const google_protobuf_MethodOptions* upb_MethodDef_Options(
-    const upb_MethodDef* m) {
-  return m->opts;
-}
-
-bool upb_MethodDef_HasOptions(const upb_MethodDef* m) {
-  return m->opts != (void*)opt_default;
-}
-
-const char* upb_MethodDef_FullName(const upb_MethodDef* m) {
-  return m->full_name;
-}
-
-int upb_MethodDef_Index(const upb_MethodDef* m) { return m->index; }
-
-const char* upb_MethodDef_Name(const upb_MethodDef* m) {
-  return shortdefname(m->full_name);
-}
-
-const upb_ServiceDef* upb_MethodDef_Service(const upb_MethodDef* m) {
-  return m->service;
-}
-
-const upb_MessageDef* upb_MethodDef_InputType(const upb_MethodDef* m) {
-  return m->input_type;
-}
-
-const upb_MessageDef* upb_MethodDef_OutputType(const upb_MethodDef* m) {
-  return m->output_type;
-}
-
-bool upb_MethodDef_ClientStreaming(const upb_MethodDef* m) {
-  return m->client_streaming;
-}
-
-bool upb_MethodDef_ServerStreaming(const upb_MethodDef* m) {
-  return m->server_streaming;
-}
-
-/* upb_ServiceDef *************************************************************/
-
-const google_protobuf_ServiceOptions* upb_ServiceDef_Options(
-    const upb_ServiceDef* s) {
-  return s->opts;
-}
-
-bool upb_ServiceDef_HasOptions(const upb_ServiceDef* s) {
-  return s->opts != (void*)opt_default;
-}
-
-const char* upb_ServiceDef_FullName(const upb_ServiceDef* s) {
-  return s->full_name;
-}
-
-const char* upb_ServiceDef_Name(const upb_ServiceDef* s) {
-  return shortdefname(s->full_name);
-}
-
-int upb_ServiceDef_Index(const upb_ServiceDef* s) { return s->index; }
-
-const upb_FileDef* upb_ServiceDef_File(const upb_ServiceDef* s) {
-  return s->file;
-}
-
-int upb_ServiceDef_MethodCount(const upb_ServiceDef* s) {
-  return s->method_count;
-}
-
-const upb_MethodDef* upb_ServiceDef_Method(const upb_ServiceDef* s, int i) {
-  return i < 0 || i >= s->method_count ? NULL : &s->methods[i];
-}
-
-const upb_MethodDef* upb_ServiceDef_FindMethodByName(const upb_ServiceDef* s,
-                                                     const char* name) {
-  for (int i = 0; i < s->method_count; i++) {
-    if (strcmp(name, upb_MethodDef_Name(&s->methods[i])) == 0) {
-      return &s->methods[i];
-    }
-  }
-  return NULL;
-}
-
-/* upb_DefPool ****************************************************************/
-
-void upb_DefPool_Free(upb_DefPool* s) {
-  upb_Arena_Free(s->arena);
-  upb_gfree(s);
-}
-
-upb_DefPool* upb_DefPool_New(void) {
-  upb_DefPool* s = upb_gmalloc(sizeof(*s));
-
-  if (!s) {
-    return NULL;
-  }
-
-  s->arena = upb_Arena_New();
-  s->bytes_loaded = 0;
-
-  if (!upb_strtable_init(&s->syms, 32, s->arena) ||
-      !upb_strtable_init(&s->files, 4, s->arena) ||
-      !upb_inttable_init(&s->exts, s->arena)) {
-    goto err;
-  }
-
-  s->extreg = upb_ExtensionRegistry_New(s->arena);
-  if (!s->extreg) goto err;
-  return s;
-
-err:
-  upb_Arena_Free(s->arena);
-  upb_gfree(s);
-  return NULL;
-}
-
-static const void* symtab_lookup(const upb_DefPool* s, const char* sym,
-                                 upb_deftype_t type) {
-  upb_value v;
-  return upb_strtable_lookup(&s->syms, sym, &v) ? unpack_def(v, type) : NULL;
-}
-
-static const void* symtab_lookup2(const upb_DefPool* s, const char* sym,
-                                  size_t size, upb_deftype_t type) {
-  upb_value v;
-  return upb_strtable_lookup2(&s->syms, sym, size, &v) ? unpack_def(v, type)
-                                                       : NULL;
-}
-
-const upb_MessageDef* upb_DefPool_FindMessageByName(const upb_DefPool* s,
-                                                    const char* sym) {
-  return symtab_lookup(s, sym, UPB_DEFTYPE_MSG);
-}
-
-const upb_MessageDef* upb_DefPool_FindMessageByNameWithSize(
-    const upb_DefPool* s, const char* sym, size_t len) {
-  return symtab_lookup2(s, sym, len, UPB_DEFTYPE_MSG);
-}
-
-const upb_EnumDef* upb_DefPool_FindEnumByName(const upb_DefPool* s,
-                                              const char* sym) {
-  return symtab_lookup(s, sym, UPB_DEFTYPE_ENUM);
-}
-
-const upb_EnumValueDef* upb_DefPool_FindEnumByNameval(const upb_DefPool* s,
-                                                      const char* sym) {
-  return symtab_lookup(s, sym, UPB_DEFTYPE_ENUMVAL);
-}
-
-const upb_FileDef* upb_DefPool_FindFileByName(const upb_DefPool* s,
-                                              const char* name) {
-  upb_value v;
-  return upb_strtable_lookup(&s->files, name, &v)
-             ? unpack_def(v, UPB_DEFTYPE_FILE)
-             : NULL;
-}
-
-const upb_FileDef* upb_DefPool_FindFileByNameWithSize(const upb_DefPool* s,
-                                                      const char* name,
-                                                      size_t len) {
-  upb_value v;
-  return upb_strtable_lookup2(&s->files, name, len, &v)
-             ? unpack_def(v, UPB_DEFTYPE_FILE)
-             : NULL;
-}
-
-const upb_FieldDef* upb_DefPool_FindExtensionByNameWithSize(
-    const upb_DefPool* s, const char* name, size_t size) {
-  upb_value v;
-  if (!upb_strtable_lookup2(&s->syms, name, size, &v)) return NULL;
-
-  switch (deftype(v)) {
-    case UPB_DEFTYPE_FIELD:
-      return unpack_def(v, UPB_DEFTYPE_FIELD);
-    case UPB_DEFTYPE_MSG: {
-      const upb_MessageDef* m = unpack_def(v, UPB_DEFTYPE_MSG);
-      return m->in_message_set ? &m->nested_exts[0] : NULL;
-    }
-    default:
-      break;
-  }
-
-  return NULL;
-}
-
-const upb_FieldDef* upb_DefPool_FindExtensionByName(const upb_DefPool* s,
-                                                    const char* sym) {
-  return upb_DefPool_FindExtensionByNameWithSize(s, sym, strlen(sym));
-}
-
-const upb_ServiceDef* upb_DefPool_FindServiceByName(const upb_DefPool* s,
-                                                    const char* name) {
-  return symtab_lookup(s, name, UPB_DEFTYPE_SERVICE);
-}
-
-const upb_ServiceDef* upb_DefPool_FindServiceByNameWithSize(
-    const upb_DefPool* s, const char* name, size_t size) {
-  return symtab_lookup2(s, name, size, UPB_DEFTYPE_SERVICE);
-}
-
-const upb_FileDef* upb_DefPool_FindFileContainingSymbol(const upb_DefPool* s,
-                                                        const char* name) {
-  upb_value v;
-  // TODO(haberman): non-extension fields and oneofs.
-  if (upb_strtable_lookup(&s->syms, name, &v)) {
-    switch (deftype(v)) {
-      case UPB_DEFTYPE_EXT: {
-        const upb_FieldDef* f = unpack_def(v, UPB_DEFTYPE_EXT);
-        return upb_FieldDef_File(f);
-      }
-      case UPB_DEFTYPE_MSG: {
-        const upb_MessageDef* m = unpack_def(v, UPB_DEFTYPE_MSG);
-        return upb_MessageDef_File(m);
-      }
-      case UPB_DEFTYPE_ENUM: {
-        const upb_EnumDef* e = unpack_def(v, UPB_DEFTYPE_ENUM);
-        return upb_EnumDef_File(e);
-      }
-      case UPB_DEFTYPE_ENUMVAL: {
-        const upb_EnumValueDef* ev = unpack_def(v, UPB_DEFTYPE_ENUMVAL);
-        return upb_EnumDef_File(upb_EnumValueDef_Enum(ev));
-      }
-      case UPB_DEFTYPE_SERVICE: {
-        const upb_ServiceDef* service = unpack_def(v, UPB_DEFTYPE_SERVICE);
-        return upb_ServiceDef_File(service);
-      }
-      default:
-        UPB_UNREACHABLE();
-    }
-  }
-
-  const char* last_dot = strrchr(name, '.');
-  if (last_dot) {
-    const upb_MessageDef* parent =
-        upb_DefPool_FindMessageByNameWithSize(s, name, last_dot - name);
-    if (parent) {
-      const char* shortname = last_dot + 1;
-      if (upb_MessageDef_FindByNameWithSize(parent, shortname,
-                                            strlen(shortname), NULL, NULL)) {
-        return upb_MessageDef_File(parent);
-      }
-    }
-  }
-
-  return NULL;
-}
-
-/* Code to build defs from descriptor protos. *********************************/
-
-/* There is a question of how much validation to do here.  It will be difficult
- * to perfectly match the amount of validation performed by proto2.  But since
- * this code is used to directly build defs from Ruby (for example) we do need
- * to validate important constraints like uniqueness of names and numbers. */
-
-#define CHK_OOM(x)      \
-  if (!(x)) {           \
-    symtab_oomerr(ctx); \
-  }
-
-UPB_NORETURN UPB_NOINLINE static void symtab_oomerr(symtab_addctx* ctx) {
-  upb_Status_setoom(ctx->status);
-  UPB_LONGJMP(ctx->err, 1);
-}
-
-void* symtab_alloc(symtab_addctx* ctx, size_t bytes) {
-  if (bytes == 0) return NULL;
-  void* ret = upb_Arena_Malloc(ctx->arena, bytes);
-  if (!ret) symtab_oomerr(ctx);
-  return ret;
-}
-
-// We want to copy the options verbatim into the destination options proto.
-// We use serialize+parse as our deep copy.
-#define SET_OPTIONS(target, desc_type, options_type, proto)                   \
-  if (google_protobuf_##desc_type##_has_options(proto)) {                     \
-    size_t size;                                                              \
-    char* pb = google_protobuf_##options_type##_serialize(                    \
-        google_protobuf_##desc_type##_options(proto), ctx->tmp_arena, &size); \
-    CHK_OOM(pb);                                                              \
-    target = google_protobuf_##options_type##_parse(pb, size, ctx->arena);    \
-    CHK_OOM(target);                                                          \
-  } else {                                                                    \
-    target = (const google_protobuf_##options_type*)opt_default;              \
-  }
-
-static void check_ident(symtab_addctx* ctx, upb_StringView name, bool full) {
-  const char* str = name.data;
-  size_t len = name.size;
-  bool start = true;
-  size_t i;
-  for (i = 0; i < len; i++) {
-    char c = str[i];
-    if (c == '.') {
-      if (start || !full) {
-        symtab_errf(ctx, "invalid name: unexpected '.' (%.*s)", (int)len, str);
-      }
-      start = true;
-    } else if (start) {
-      if (!upb_isletter(c)) {
-        symtab_errf(
-            ctx,
-            "invalid name: path components must start with a letter (%.*s)",
-            (int)len, str);
-      }
-      start = false;
-    } else {
-      if (!upb_isalphanum(c)) {
-        symtab_errf(ctx, "invalid name: non-alphanumeric character (%.*s)",
-                    (int)len, str);
-      }
-    }
-  }
-  if (start) {
-    symtab_errf(ctx, "invalid name: empty part (%.*s)", (int)len, str);
-  }
-}
-
-static size_t div_round_up(size_t n, size_t d) { return (n + d - 1) / d; }
-
-static size_t upb_MessageValue_sizeof(upb_CType type) {
-  switch (type) {
-    case kUpb_CType_Double:
-    case kUpb_CType_Int64:
-    case kUpb_CType_UInt64:
-      return 8;
-    case kUpb_CType_Enum:
-    case kUpb_CType_Int32:
-    case kUpb_CType_UInt32:
-    case kUpb_CType_Float:
-      return 4;
-    case kUpb_CType_Bool:
-      return 1;
-    case kUpb_CType_Message:
-      return sizeof(void*);
-    case kUpb_CType_Bytes:
-    case kUpb_CType_String:
-      return sizeof(upb_StringView);
-  }
-  UPB_UNREACHABLE();
-}
-
-static uint8_t upb_msg_fielddefsize(const upb_FieldDef* f) {
-  if (upb_MessageDef_IsMapEntry(upb_FieldDef_ContainingType(f))) {
-    upb_MapEntry ent;
-    UPB_ASSERT(sizeof(ent.k) == sizeof(ent.v));
-    return sizeof(ent.k);
-  } else if (upb_FieldDef_IsRepeated(f)) {
-    return sizeof(void*);
-  } else {
-    return upb_MessageValue_sizeof(upb_FieldDef_CType(f));
-  }
-}
-
-static uint32_t upb_MiniTable_place(symtab_addctx* ctx, upb_MiniTable* l,
-                                    size_t size, const upb_MessageDef* m) {
-  size_t ofs = UPB_ALIGN_UP(l->size, size);
-  size_t next = ofs + size;
-
-  if (next > UINT16_MAX) {
-    symtab_errf(ctx, "size of message %s exceeded max size of %zu bytes",
-                upb_MessageDef_FullName(m), (size_t)UINT16_MAX);
-  }
-
-  l->size = next;
-  return ofs;
-}
-
-static int field_number_cmp(const void* p1, const void* p2) {
-  const upb_MiniTable_Field* f1 = p1;
-  const upb_MiniTable_Field* f2 = p2;
-  return f1->number - f2->number;
-}
-
-static void assign_layout_indices(const upb_MessageDef* m, upb_MiniTable* l,
-                                  upb_MiniTable_Field* fields) {
-  int i;
-  int n = upb_MessageDef_numfields(m);
-  int dense_below = 0;
-  for (i = 0; i < n; i++) {
-    upb_FieldDef* f =
-        (upb_FieldDef*)upb_MessageDef_FindFieldByNumber(m, fields[i].number);
-    UPB_ASSERT(f);
-    f->layout_index = i;
-    if (i < UINT8_MAX && fields[i].number == i + 1 &&
-        (i == 0 || fields[i - 1].number == i)) {
-      dense_below = i + 1;
-    }
-  }
-  l->dense_below = dense_below;
-}
-
-static uint8_t map_descriptortype(const upb_FieldDef* f) {
-  uint8_t type = upb_FieldDef_Type(f);
-  /* See TableDescriptorType() in upbc/generator.cc for details and
-   * rationale of these exceptions. */
-  if (type == kUpb_FieldType_String && f->file->syntax == kUpb_Syntax_Proto2) {
-    return kUpb_FieldType_Bytes;
-  } else if (type == kUpb_FieldType_Enum &&
-             (f->sub.enumdef->file->syntax == kUpb_Syntax_Proto3 ||
-              UPB_TREAT_PROTO2_ENUMS_LIKE_PROTO3 ||
-              // TODO(https://github.com/protocolbuffers/upb/issues/541):
-              // fix map enum values to check for unknown enum values and put
-              // them in the unknown field set.
-              upb_MessageDef_IsMapEntry(upb_FieldDef_ContainingType(f)))) {
-    return kUpb_FieldType_Int32;
-  }
-  return type;
-}
-
-static void fill_fieldlayout(upb_MiniTable_Field* field,
-                             const upb_FieldDef* f) {
-  field->number = upb_FieldDef_Number(f);
-  field->descriptortype = map_descriptortype(f);
-
-  if (upb_FieldDef_IsMap(f)) {
-    field->mode =
-        kUpb_FieldMode_Map | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift);
-  } else if (upb_FieldDef_IsRepeated(f)) {
-    field->mode =
-        kUpb_FieldMode_Array | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift);
-  } else {
-    /* Maps descriptor type -> elem_size_lg2.  */
-    static const uint8_t sizes[] = {
-        -1,                       /* invalid descriptor type */
-        kUpb_FieldRep_8Byte,      /* DOUBLE */
-        kUpb_FieldRep_4Byte,      /* FLOAT */
-        kUpb_FieldRep_8Byte,      /* INT64 */
-        kUpb_FieldRep_8Byte,      /* UINT64 */
-        kUpb_FieldRep_4Byte,      /* INT32 */
-        kUpb_FieldRep_8Byte,      /* FIXED64 */
-        kUpb_FieldRep_4Byte,      /* FIXED32 */
-        kUpb_FieldRep_1Byte,      /* BOOL */
-        kUpb_FieldRep_StringView, /* STRING */
-        kUpb_FieldRep_Pointer,    /* GROUP */
-        kUpb_FieldRep_Pointer,    /* MESSAGE */
-        kUpb_FieldRep_StringView, /* BYTES */
-        kUpb_FieldRep_4Byte,      /* UINT32 */
-        kUpb_FieldRep_4Byte,      /* ENUM */
-        kUpb_FieldRep_4Byte,      /* SFIXED32 */
-        kUpb_FieldRep_8Byte,      /* SFIXED64 */
-        kUpb_FieldRep_4Byte,      /* SINT32 */
-        kUpb_FieldRep_8Byte,      /* SINT64 */
-    };
-    field->mode = kUpb_FieldMode_Scalar |
-                  (sizes[field->descriptortype] << kUpb_FieldRep_Shift);
-  }
-
-  if (upb_FieldDef_IsPacked(f)) {
-    field->mode |= kUpb_LabelFlags_IsPacked;
-  }
-
-  if (upb_FieldDef_IsExtension(f)) {
-    field->mode |= kUpb_LabelFlags_IsExtension;
-  }
-}
-
-/* This function is the dynamic equivalent of message_layout.{cc,h} in upbc.
- * It computes a dynamic layout for all of the fields in |m|. */
-static void make_layout(symtab_addctx* ctx, const upb_MessageDef* m) {
-  upb_MiniTable* l = (upb_MiniTable*)m->layout;
-  size_t field_count = upb_MessageDef_numfields(m);
-  size_t sublayout_count = 0;
-  upb_MiniTable_Sub* subs;
-  upb_MiniTable_Field* fields;
-
-  memset(l, 0, sizeof(*l) + sizeof(_upb_FastTable_Entry));
-
-  /* Count sub-messages. */
-  for (size_t i = 0; i < field_count; i++) {
-    const upb_FieldDef* f = &m->fields[i];
-    if (upb_FieldDef_IsSubMessage(f)) {
-      sublayout_count++;
-    }
-    if (upb_FieldDef_CType(f) == kUpb_CType_Enum &&
-        f->sub.enumdef->file->syntax == kUpb_Syntax_Proto2) {
-      sublayout_count++;
-    }
-  }
-
-  fields = symtab_alloc(ctx, field_count * sizeof(*fields));
-  subs = symtab_alloc(ctx, sublayout_count * sizeof(*subs));
-
-  l->field_count = upb_MessageDef_numfields(m);
-  l->fields = fields;
-  l->subs = subs;
-  l->table_mask = 0;
-  l->required_count = 0;
-
-  if (upb_MessageDef_ExtensionRangeCount(m) > 0) {
-    if (google_protobuf_MessageOptions_message_set_wire_format(m->opts)) {
-      l->ext = kUpb_ExtMode_IsMessageSet;
-    } else {
-      l->ext = kUpb_ExtMode_Extendable;
-    }
-  } else {
-    l->ext = kUpb_ExtMode_NonExtendable;
-  }
-
-  /* TODO(haberman): initialize fast tables so that reflection-based parsing
-   * can get the same speeds as linked-in types. */
-  l->fasttable[0].field_parser = &fastdecode_generic;
-  l->fasttable[0].field_data = 0;
-
-  if (upb_MessageDef_IsMapEntry(m)) {
-    /* TODO(haberman): refactor this method so this special case is more
-     * elegant. */
-    const upb_FieldDef* key = upb_MessageDef_FindFieldByNumber(m, 1);
-    const upb_FieldDef* val = upb_MessageDef_FindFieldByNumber(m, 2);
-    if (key == NULL || val == NULL) {
-      symtab_errf(ctx, "Malformed map entry from message: %s",
-                  upb_MessageDef_FullName(m));
-    }
-    fields[0].number = 1;
-    fields[1].number = 2;
-    fields[0].mode = kUpb_FieldMode_Scalar;
-    fields[1].mode = kUpb_FieldMode_Scalar;
-    fields[0].presence = 0;
-    fields[1].presence = 0;
-    fields[0].descriptortype = map_descriptortype(key);
-    fields[1].descriptortype = map_descriptortype(val);
-    fields[0].offset = 0;
-    fields[1].offset = sizeof(upb_StringView);
-    fields[1].submsg_index = 0;
-
-    if (upb_FieldDef_CType(val) == kUpb_CType_Message) {
-      subs[0].submsg = upb_FieldDef_MessageSubDef(val)->layout;
-    }
-
-    upb_FieldDef* fielddefs = (upb_FieldDef*)&m->fields[0];
-    UPB_ASSERT(fielddefs[0].number_ == 1);
-    UPB_ASSERT(fielddefs[1].number_ == 2);
-    fielddefs[0].layout_index = 0;
-    fielddefs[1].layout_index = 1;
-
-    l->field_count = 2;
-    l->size = 2 * sizeof(upb_StringView);
-    l->size = UPB_ALIGN_UP(l->size, 8);
-    l->dense_below = 2;
-    return;
-  }
-
-  /* Allocate data offsets in three stages:
-   *
-   * 1. hasbits.
-   * 2. regular fields.
-   * 3. oneof fields.
-   *
-   * OPT: There is a lot of room for optimization here to minimize the size.
-   */
-
-  /* Assign hasbits for required fields first. */
-  size_t hasbit = 0;
-
-  for (int i = 0; i < m->field_count; i++) {
-    const upb_FieldDef* f = &m->fields[i];
-    upb_MiniTable_Field* field = &fields[upb_FieldDef_Index(f)];
-    if (upb_FieldDef_Label(f) == kUpb_Label_Required) {
-      field->presence = ++hasbit;
-      if (hasbit >= 63) {
-        symtab_errf(ctx, "Message with >=63 required fields: %s",
-                    upb_MessageDef_FullName(m));
-      }
-      l->required_count++;
-    }
-  }
-
-  /* Allocate hasbits and set basic field attributes. */
-  sublayout_count = 0;
-  for (int i = 0; i < m->field_count; i++) {
-    const upb_FieldDef* f = &m->fields[i];
-    upb_MiniTable_Field* field = &fields[upb_FieldDef_Index(f)];
-
-    fill_fieldlayout(field, f);
-
-    if (field->descriptortype == kUpb_FieldType_Message ||
-        field->descriptortype == kUpb_FieldType_Group) {
-      field->submsg_index = sublayout_count++;
-      subs[field->submsg_index].submsg = upb_FieldDef_MessageSubDef(f)->layout;
-    } else if (field->descriptortype == kUpb_FieldType_Enum) {
-      field->submsg_index = sublayout_count++;
-      subs[field->submsg_index].subenum = upb_FieldDef_EnumSubDef(f)->layout;
-      UPB_ASSERT(subs[field->submsg_index].subenum);
-    }
-
-    if (upb_FieldDef_Label(f) == kUpb_Label_Required) {
-      /* Hasbit was already assigned. */
-    } else if (upb_FieldDef_HasPresence(f) &&
-               !upb_FieldDef_RealContainingOneof(f)) {
-      /* We don't use hasbit 0, so that 0 can indicate "no presence" in the
-       * table. This wastes one hasbit, but we don't worry about it for now. */
-      field->presence = ++hasbit;
-    } else {
-      field->presence = 0;
-    }
-  }
-
-  /* Account for space used by hasbits. */
-  l->size = hasbit ? div_round_up(hasbit + 1, 8) : 0;
-
-  /* Allocate non-oneof fields. */
-  for (int i = 0; i < m->field_count; i++) {
-    const upb_FieldDef* f = &m->fields[i];
-    size_t field_size = upb_msg_fielddefsize(f);
-    size_t index = upb_FieldDef_Index(f);
-
-    if (upb_FieldDef_RealContainingOneof(f)) {
-      /* Oneofs are handled separately below. */
-      continue;
-    }
-
-    fields[index].offset = upb_MiniTable_place(ctx, l, field_size, m);
-  }
-
-  /* Allocate oneof fields.  Each oneof field consists of a uint32 for the case
-   * and space for the actual data. */
-  for (int i = 0; i < m->oneof_count; i++) {
-    const upb_OneofDef* o = &m->oneofs[i];
-    size_t case_size = sizeof(uint32_t); /* Could potentially optimize this. */
-    size_t field_size = 0;
-    uint32_t case_offset;
-    uint32_t data_offset;
-
-    if (upb_OneofDef_IsSynthetic(o)) continue;
-
-    if (o->field_count == 0) {
-      symtab_errf(ctx, "Oneof must have at least one field (%s)", o->full_name);
-    }
-
-    /* Calculate field size: the max of all field sizes. */
-    for (int j = 0; j < o->field_count; j++) {
-      const upb_FieldDef* f = o->fields[j];
-      field_size = UPB_MAX(field_size, upb_msg_fielddefsize(f));
-    }
-
-    /* Align and allocate case offset. */
-    case_offset = upb_MiniTable_place(ctx, l, case_size, m);
-    data_offset = upb_MiniTable_place(ctx, l, field_size, m);
-
-    for (int i = 0; i < o->field_count; i++) {
-      const upb_FieldDef* f = o->fields[i];
-      fields[upb_FieldDef_Index(f)].offset = data_offset;
-      fields[upb_FieldDef_Index(f)].presence = ~case_offset;
-    }
-  }
-
-  /* Size of the entire structure should be a multiple of its greatest
-   * alignment.  TODO: track overall alignment for real? */
-  l->size = UPB_ALIGN_UP(l->size, 8);
-
-  /* Sort fields by number. */
-  if (fields) {
-    qsort(fields, upb_MessageDef_numfields(m), sizeof(*fields),
-          field_number_cmp);
-  }
-  assign_layout_indices(m, l, fields);
-}
-
-static char* strviewdup(symtab_addctx* ctx, upb_StringView view) {
-  char* ret = upb_strdup2(view.data, view.size, ctx->arena);
-  CHK_OOM(ret);
-  return ret;
-}
-
-static bool streql2(const char* a, size_t n, const char* b) {
-  return n == strlen(b) && memcmp(a, b, n) == 0;
-}
-
-static bool streql_view(upb_StringView view, const char* b) {
-  return streql2(view.data, view.size, b);
-}
-
-static const char* makefullname(symtab_addctx* ctx, const char* prefix,
-                                upb_StringView name) {
-  if (prefix) {
-    /* ret = prefix + '.' + name; */
-    size_t n = strlen(prefix);
-    char* ret = symtab_alloc(ctx, n + name.size + 2);
-    strcpy(ret, prefix);
-    ret[n] = '.';
-    memcpy(&ret[n + 1], name.data, name.size);
-    ret[n + 1 + name.size] = '\0';
-    return ret;
-  } else {
-    return strviewdup(ctx, name);
-  }
-}
-
-static void finalize_oneofs(symtab_addctx* ctx, upb_MessageDef* m) {
-  int i;
-  int synthetic_count = 0;
-  upb_OneofDef* mutable_oneofs = (upb_OneofDef*)m->oneofs;
-
-  for (i = 0; i < m->oneof_count; i++) {
-    upb_OneofDef* o = &mutable_oneofs[i];
-
-    if (o->synthetic && o->field_count != 1) {
-      symtab_errf(ctx, "Synthetic oneofs must have one field, not %d: %s",
-                  o->field_count, upb_OneofDef_Name(o));
-    }
-
-    if (o->synthetic) {
-      synthetic_count++;
-    } else if (synthetic_count != 0) {
-      symtab_errf(ctx, "Synthetic oneofs must be after all other oneofs: %s",
-                  upb_OneofDef_Name(o));
-    }
-
-    o->fields = symtab_alloc(ctx, sizeof(upb_FieldDef*) * o->field_count);
-    o->field_count = 0;
-  }
-
-  for (i = 0; i < m->field_count; i++) {
-    const upb_FieldDef* f = &m->fields[i];
-    upb_OneofDef* o = (upb_OneofDef*)upb_FieldDef_ContainingOneof(f);
-    if (o) {
-      o->fields[o->field_count++] = f;
-    }
-  }
-
-  m->real_oneof_count = m->oneof_count - synthetic_count;
-}
-
-size_t getjsonname(const char* name, char* buf, size_t len) {
-  size_t src, dst = 0;
-  bool ucase_next = false;
-
-#define WRITE(byte)      \
-  ++dst;                 \
-  if (dst < len)         \
-    buf[dst - 1] = byte; \
-  else if (dst == len)   \
-  buf[dst - 1] = '\0'
-
-  if (!name) {
-    WRITE('\0');
-    return 0;
-  }
-
-  /* Implement the transformation as described in the spec:
-   *   1. upper case all letters after an underscore.
-   *   2. remove all underscores.
-   */
-  for (src = 0; name[src]; src++) {
-    if (name[src] == '_') {
-      ucase_next = true;
-      continue;
-    }
-
-    if (ucase_next) {
-      WRITE(toupper(name[src]));
-      ucase_next = false;
-    } else {
-      WRITE(name[src]);
-    }
-  }
-
-  WRITE('\0');
-  return dst;
-
-#undef WRITE
-}
-
-static char* makejsonname(symtab_addctx* ctx, const char* name) {
-  size_t size = getjsonname(name, NULL, 0);
-  char* json_name = symtab_alloc(ctx, size);
-  getjsonname(name, json_name, size);
-  return json_name;
-}
-
-/* Adds a symbol |v| to the symtab, which must be a def pointer previously
- * packed with pack_def().  The def's pointer to upb_FileDef* must be set before
- * adding, so we know which entries to remove if building this file fails. */
-static void symtab_add(symtab_addctx* ctx, const char* name, upb_value v) {
-  // TODO: table should support an operation "tryinsert" to avoid the double
-  // lookup.
-  if (upb_strtable_lookup(&ctx->symtab->syms, name, NULL)) {
-    symtab_errf(ctx, "duplicate symbol '%s'", name);
-  }
-  size_t len = strlen(name);
-  CHK_OOM(upb_strtable_insert(&ctx->symtab->syms, name, len, v,
-                              ctx->symtab->arena));
-}
-
-static bool remove_component(char* base, size_t* len) {
-  if (*len == 0) return false;
-
-  for (size_t i = *len - 1; i > 0; i--) {
-    if (base[i] == '.') {
-      *len = i;
-      return true;
-    }
-  }
-
-  *len = 0;
-  return true;
-}
-
-/* Given a symbol and the base symbol inside which it is defined, find the
- * symbol's definition in t. */
-static const void* symtab_resolveany(symtab_addctx* ctx,
-                                     const char* from_name_dbg,
-                                     const char* base, upb_StringView sym,
-                                     upb_deftype_t* type) {
-  const upb_strtable* t = &ctx->symtab->syms;
-  if (sym.size == 0) goto notfound;
-  upb_value v;
-  if (sym.data[0] == '.') {
-    /* Symbols starting with '.' are absolute, so we do a single lookup.
-     * Slice to omit the leading '.' */
-    if (!upb_strtable_lookup2(t, sym.data + 1, sym.size - 1, &v)) {
-      goto notfound;
-    }
-  } else {
-    /* Remove components from base until we find an entry or run out. */
-    size_t baselen = base ? strlen(base) : 0;
-    char* tmp = malloc(sym.size + baselen + 1);
-    while (1) {
-      char* p = tmp;
-      if (baselen) {
-        memcpy(p, base, baselen);
-        p[baselen] = '.';
-        p += baselen + 1;
-      }
-      memcpy(p, sym.data, sym.size);
-      p += sym.size;
-      if (upb_strtable_lookup2(t, tmp, p - tmp, &v)) {
-        break;
-      }
-      if (!remove_component(tmp, &baselen)) {
-        free(tmp);
-        goto notfound;
-      }
-    }
-    free(tmp);
-  }
-
-  *type = deftype(v);
-  return unpack_def(v, *type);
-
-notfound:
-  symtab_errf(ctx, "couldn't resolve name '" UPB_STRINGVIEW_FORMAT "'",
-              UPB_STRINGVIEW_ARGS(sym));
-}
-
-static const void* symtab_resolve(symtab_addctx* ctx, const char* from_name_dbg,
-                                  const char* base, upb_StringView sym,
-                                  upb_deftype_t type) {
-  upb_deftype_t found_type;
-  const void* ret =
-      symtab_resolveany(ctx, from_name_dbg, base, sym, &found_type);
-  if (ret && found_type != type) {
-    symtab_errf(ctx,
-                "type mismatch when resolving %s: couldn't find "
-                "name " UPB_STRINGVIEW_FORMAT " with type=%d",
-                from_name_dbg, UPB_STRINGVIEW_ARGS(sym), (int)type);
-  }
-  return ret;
-}
-
-static void create_oneofdef(
-    symtab_addctx* ctx, upb_MessageDef* m,
-    const google_protobuf_OneofDescriptorProto* oneof_proto,
-    const upb_OneofDef* _o) {
-  upb_OneofDef* o = (upb_OneofDef*)_o;
-  upb_StringView name = google_protobuf_OneofDescriptorProto_name(oneof_proto);
-  upb_value v;
-
-  o->parent = m;
-  o->full_name = makefullname(ctx, m->full_name, name);
-  o->field_count = 0;
-  o->synthetic = false;
-
-  SET_OPTIONS(o->opts, OneofDescriptorProto, OneofOptions, oneof_proto);
-
-  upb_value existing_v;
-  if (upb_strtable_lookup2(&m->ntof, name.data, name.size, &existing_v)) {
-    symtab_errf(ctx, "duplicate oneof name (%s)", o->full_name);
-  }
-
-  v = pack_def(o, UPB_DEFTYPE_ONEOF);
-  CHK_OOM(upb_strtable_insert(&m->ntof, name.data, name.size, v, ctx->arena));
-
-  CHK_OOM(upb_inttable_init(&o->itof, ctx->arena));
-  CHK_OOM(upb_strtable_init(&o->ntof, 4, ctx->arena));
-}
-
-static str_t* newstr(symtab_addctx* ctx, const char* data, size_t len) {
-  str_t* ret = symtab_alloc(ctx, sizeof(*ret) + len);
-  CHK_OOM(ret);
-  ret->len = len;
-  if (len) memcpy(ret->str, data, len);
-  ret->str[len] = '\0';
-  return ret;
-}
-
-static bool upb_DefPool_TryGetChar(const char** src, const char* end,
-                                   char* ch) {
-  if (*src == end) return false;
-  *ch = **src;
-  *src += 1;
-  return true;
-}
-
-static char upb_DefPool_TryGetHexDigit(symtab_addctx* ctx,
-                                       const upb_FieldDef* f, const char** src,
-                                       const char* end) {
-  char ch;
-  if (!upb_DefPool_TryGetChar(src, end, &ch)) return -1;
-  if ('0' <= ch && ch <= '9') {
-    return ch - '0';
-  }
-  ch = upb_ascii_lower(ch);
-  if ('a' <= ch && ch <= 'f') {
-    return ch - 'a' + 0xa;
-  }
-  *src -= 1;  // Char wasn't actually a hex digit.
-  return -1;
-}
-
-static char upb_DefPool_ParseHexEscape(symtab_addctx* ctx,
-                                       const upb_FieldDef* f, const char** src,
-                                       const char* end) {
-  char hex_digit = upb_DefPool_TryGetHexDigit(ctx, f, src, end);
-  if (hex_digit < 0) {
-    symtab_errf(ctx,
-                "\\x cannot be followed by non-hex digit in field '%s' default",
-                upb_FieldDef_FullName(f));
-    return 0;
-  }
-  unsigned int ret = hex_digit;
-  while ((hex_digit = upb_DefPool_TryGetHexDigit(ctx, f, src, end)) >= 0) {
-    ret = (ret << 4) | hex_digit;
-  }
-  if (ret > 0xff) {
-    symtab_errf(ctx, "Value of hex escape in field %s exceeds 8 bits",
-                upb_FieldDef_FullName(f));
-    return 0;
-  }
-  return ret;
-}
-
-char upb_DefPool_TryGetOctalDigit(const char** src, const char* end) {
-  char ch;
-  if (!upb_DefPool_TryGetChar(src, end, &ch)) return -1;
-  if ('0' <= ch && ch <= '7') {
-    return ch - '0';
-  }
-  *src -= 1;  // Char wasn't actually an octal digit.
-  return -1;
-}
-
-static char upb_DefPool_ParseOctalEscape(symtab_addctx* ctx,
-                                         const upb_FieldDef* f,
-                                         const char** src, const char* end) {
-  char ch = 0;
-  for (int i = 0; i < 3; i++) {
-    char digit;
-    if ((digit = upb_DefPool_TryGetOctalDigit(src, end)) >= 0) {
-      ch = (ch << 3) | digit;
-    }
-  }
-  return ch;
-}
-
-static char upb_DefPool_ParseEscape(symtab_addctx* ctx, const upb_FieldDef* f,
-                                    const char** src, const char* end) {
-  char ch;
-  if (!upb_DefPool_TryGetChar(src, end, &ch)) {
-    symtab_errf(ctx, "unterminated escape sequence in field %s",
-                upb_FieldDef_FullName(f));
-    return 0;
-  }
-  switch (ch) {
-    case 'a':
-      return '\a';
-    case 'b':
-      return '\b';
-    case 'f':
-      return '\f';
-    case 'n':
-      return '\n';
-    case 'r':
-      return '\r';
-    case 't':
-      return '\t';
-    case 'v':
-      return '\v';
-    case '\\':
-      return '\\';
-    case '\'':
-      return '\'';
-    case '\"':
-      return '\"';
-    case '?':
-      return '\?';
-    case 'x':
-    case 'X':
-      return upb_DefPool_ParseHexEscape(ctx, f, src, end);
-    case '0':
-    case '1':
-    case '2':
-    case '3':
-    case '4':
-    case '5':
-    case '6':
-    case '7':
-      *src -= 1;
-      return upb_DefPool_ParseOctalEscape(ctx, f, src, end);
-  }
-  symtab_errf(ctx, "Unknown escape sequence: \\%c", ch);
-}
-
-static str_t* unescape(symtab_addctx* ctx, const upb_FieldDef* f,
-                       const char* data, size_t len) {
-  // Size here is an upper bound; escape sequences could ultimately shrink it.
-  str_t* ret = symtab_alloc(ctx, sizeof(*ret) + len);
-  char* dst = &ret->str[0];
-  const char* src = data;
-  const char* end = data + len;
-
-  while (src < end) {
-    if (*src == '\\') {
-      src++;
-      *dst++ = upb_DefPool_ParseEscape(ctx, f, &src, end);
-    } else {
-      *dst++ = *src++;
-    }
-  }
-
-  ret->len = dst - &ret->str[0];
-  return ret;
-}
-
-static void parse_default(symtab_addctx* ctx, const char* str, size_t len,
-                          upb_FieldDef* f) {
-  char* end;
-  char nullz[64];
-  errno = 0;
-
-  switch (upb_FieldDef_CType(f)) {
-    case kUpb_CType_Int32:
-    case kUpb_CType_Int64:
-    case kUpb_CType_UInt32:
-    case kUpb_CType_UInt64:
-    case kUpb_CType_Double:
-    case kUpb_CType_Float:
-      /* Standard C number parsing functions expect null-terminated strings. */
-      if (len >= sizeof(nullz) - 1) {
-        symtab_errf(ctx, "Default too long: %.*s", (int)len, str);
-      }
-      memcpy(nullz, str, len);
-      nullz[len] = '\0';
-      str = nullz;
-      break;
-    default:
-      break;
-  }
-
-  switch (upb_FieldDef_CType(f)) {
-    case kUpb_CType_Int32: {
-      long val = strtol(str, &end, 0);
-      if (val > INT32_MAX || val < INT32_MIN || errno == ERANGE || *end) {
-        goto invalid;
-      }
-      f->defaultval.sint = val;
-      break;
-    }
-    case kUpb_CType_Enum: {
-      const upb_EnumDef* e = f->sub.enumdef;
-      const upb_EnumValueDef* ev =
-          upb_EnumDef_FindValueByNameWithSize(e, str, len);
-      if (!ev) {
-        goto invalid;
-      }
-      f->defaultval.sint = ev->number;
-      break;
-    }
-    case kUpb_CType_Int64: {
-      long long val = strtoll(str, &end, 0);
-      if (val > INT64_MAX || val < INT64_MIN || errno == ERANGE || *end) {
-        goto invalid;
-      }
-      f->defaultval.sint = val;
-      break;
-    }
-    case kUpb_CType_UInt32: {
-      unsigned long val = strtoul(str, &end, 0);
-      if (val > UINT32_MAX || errno == ERANGE || *end) {
-        goto invalid;
-      }
-      f->defaultval.uint = val;
-      break;
-    }
-    case kUpb_CType_UInt64: {
-      unsigned long long val = strtoull(str, &end, 0);
-      if (val > UINT64_MAX || errno == ERANGE || *end) {
-        goto invalid;
-      }
-      f->defaultval.uint = val;
-      break;
-    }
-    case kUpb_CType_Double: {
-      double val = strtod(str, &end);
-      if (errno == ERANGE || *end) {
-        goto invalid;
-      }
-      f->defaultval.dbl = val;
-      break;
-    }
-    case kUpb_CType_Float: {
-      float val = strtof(str, &end);
-      if (errno == ERANGE || *end) {
-        goto invalid;
-      }
-      f->defaultval.flt = val;
-      break;
-    }
-    case kUpb_CType_Bool: {
-      if (streql2(str, len, "false")) {
-        f->defaultval.boolean = false;
-      } else if (streql2(str, len, "true")) {
-        f->defaultval.boolean = true;
-      } else {
-        goto invalid;
-      }
-      break;
-    }
-    case kUpb_CType_String:
-      f->defaultval.str = newstr(ctx, str, len);
-      break;
-    case kUpb_CType_Bytes:
-      f->defaultval.str = unescape(ctx, f, str, len);
-      break;
-    case kUpb_CType_Message:
-      /* Should not have a default value. */
-      symtab_errf(ctx, "Message should not have a default (%s)",
-                  upb_FieldDef_FullName(f));
-  }
-
-  return;
-
-invalid:
-  symtab_errf(ctx, "Invalid default '%.*s' for field %s of type %d", (int)len,
-              str, upb_FieldDef_FullName(f), (int)upb_FieldDef_Type(f));
-}
-
-static void set_default_default(symtab_addctx* ctx, upb_FieldDef* f) {
-  switch (upb_FieldDef_CType(f)) {
-    case kUpb_CType_Int32:
-    case kUpb_CType_Int64:
-      f->defaultval.sint = 0;
-      break;
-    case kUpb_CType_UInt64:
-    case kUpb_CType_UInt32:
-      f->defaultval.uint = 0;
-      break;
-    case kUpb_CType_Double:
-    case kUpb_CType_Float:
-      f->defaultval.dbl = 0;
-      break;
-    case kUpb_CType_String:
-    case kUpb_CType_Bytes:
-      f->defaultval.str = newstr(ctx, NULL, 0);
-      break;
-    case kUpb_CType_Bool:
-      f->defaultval.boolean = false;
-      break;
-    case kUpb_CType_Enum:
-      f->defaultval.sint = f->sub.enumdef->values[0].number;
-    case kUpb_CType_Message:
-      break;
-  }
-}
-
-static void create_fielddef(
-    symtab_addctx* ctx, const char* prefix, upb_MessageDef* m,
-    const google_protobuf_FieldDescriptorProto* field_proto,
-    const upb_FieldDef* _f, bool is_extension) {
-  upb_FieldDef* f = (upb_FieldDef*)_f;
-  upb_StringView name;
-  const char* full_name;
-  const char* json_name;
-  const char* shortname;
-  int32_t field_number;
-
-  f->file = ctx->file; /* Must happen prior to symtab_add(). */
-
-  if (!google_protobuf_FieldDescriptorProto_has_name(field_proto)) {
-    symtab_errf(ctx, "field has no name");
-  }
-
-  name = google_protobuf_FieldDescriptorProto_name(field_proto);
-  check_ident(ctx, name, false);
-  full_name = makefullname(ctx, prefix, name);
-  shortname = shortdefname(full_name);
-
-  if (google_protobuf_FieldDescriptorProto_has_json_name(field_proto)) {
-    json_name = strviewdup(
-        ctx, google_protobuf_FieldDescriptorProto_json_name(field_proto));
-    f->has_json_name_ = true;
-  } else {
-    json_name = makejsonname(ctx, shortname);
-    f->has_json_name_ = false;
-  }
-
-  field_number = google_protobuf_FieldDescriptorProto_number(field_proto);
-
-  f->full_name = full_name;
-  f->json_name = json_name;
-  f->label_ = (int)google_protobuf_FieldDescriptorProto_label(field_proto);
-  f->number_ = field_number;
-  f->scope.oneof = NULL;
-  f->proto3_optional_ =
-      google_protobuf_FieldDescriptorProto_proto3_optional(field_proto);
-
-  bool has_type = google_protobuf_FieldDescriptorProto_has_type(field_proto);
-  bool has_type_name =
-      google_protobuf_FieldDescriptorProto_has_type_name(field_proto);
-
-  f->type_ = (int)google_protobuf_FieldDescriptorProto_type(field_proto);
-
-  if (has_type) {
-    switch (f->type_) {
-      case kUpb_FieldType_Message:
-      case kUpb_FieldType_Group:
-      case kUpb_FieldType_Enum:
-        if (!has_type_name) {
-          symtab_errf(ctx, "field of type %d requires type name (%s)",
-                      (int)f->type_, full_name);
-        }
-        break;
-      default:
-        if (has_type_name) {
-          symtab_errf(ctx, "invalid type for field with type_name set (%s, %d)",
-                      full_name, (int)f->type_);
-        }
-    }
-  } else if (has_type_name) {
-    f->type_ =
-        FIELD_TYPE_UNSPECIFIED;  // We'll fill this in in resolve_fielddef().
-  }
-
-  if (!is_extension) {
-    /* direct message field. */
-    upb_value v, field_v, json_v, existing_v;
-    size_t json_size;
-
-    if (field_number <= 0 || field_number > kUpb_MaxFieldNumber) {
-      symtab_errf(ctx, "invalid field number (%u)", field_number);
-    }
-
-    f->index_ = f - m->fields;
-    f->msgdef = m;
-    f->is_extension_ = false;
-
-    field_v = pack_def(f, UPB_DEFTYPE_FIELD);
-    json_v = pack_def(f, UPB_DEFTYPE_FIELD_JSONNAME);
-    v = upb_value_constptr(f);
-    json_size = strlen(json_name);
-
-    if (upb_strtable_lookup(&m->ntof, shortname, &existing_v)) {
-      symtab_errf(ctx, "duplicate field name (%s)", shortname);
-    }
-
-    CHK_OOM(upb_strtable_insert(&m->ntof, name.data, name.size, field_v,
-                                ctx->arena));
-
-    if (strcmp(shortname, json_name) != 0) {
-      if (upb_strtable_lookup(&m->ntof, json_name, &v)) {
-        symtab_errf(ctx, "duplicate json_name (%s)", json_name);
-      } else {
-        CHK_OOM(upb_strtable_insert(&m->ntof, json_name, json_size, json_v,
-                                    ctx->arena));
-      }
-    }
-
-    if (upb_inttable_lookup(&m->itof, field_number, NULL)) {
-      symtab_errf(ctx, "duplicate field number (%u)", field_number);
-    }
-
-    CHK_OOM(upb_inttable_insert(&m->itof, field_number, v, ctx->arena));
-
-    if (ctx->layout) {
-      const upb_MiniTable_Field* fields = m->layout->fields;
-      int count = m->layout->field_count;
-      bool found = false;
-      for (int i = 0; i < count; i++) {
-        if (fields[i].number == field_number) {
-          f->layout_index = i;
-          found = true;
-          break;
-        }
-      }
-      UPB_ASSERT(found);
-    }
-  } else {
-    /* extension field. */
-    f->is_extension_ = true;
-    f->scope.extension_scope = m;
-    symtab_add(ctx, full_name, pack_def(f, UPB_DEFTYPE_EXT));
-    f->layout_index = ctx->ext_count++;
-    if (ctx->layout) {
-      UPB_ASSERT(ctx->file->ext_layouts[f->layout_index]->field.number ==
-                 field_number);
-    }
-  }
-
-  if (f->type_ < kUpb_FieldType_Double || f->type_ > kUpb_FieldType_SInt64) {
-    symtab_errf(ctx, "invalid type for field %s (%d)", f->full_name, f->type_);
-  }
-
-  if (f->label_ < kUpb_Label_Optional || f->label_ > kUpb_Label_Repeated) {
-    symtab_errf(ctx, "invalid label for field %s (%d)", f->full_name,
-                f->label_);
-  }
-
-  /* We can't resolve the subdef or (in the case of extensions) the containing
-   * message yet, because it may not have been defined yet.  We stash a pointer
-   * to the field_proto until later when we can properly resolve it. */
-  f->sub.unresolved = field_proto;
-
-  if (f->label_ == kUpb_Label_Required &&
-      f->file->syntax == kUpb_Syntax_Proto3) {
-    symtab_errf(ctx, "proto3 fields cannot be required (%s)", f->full_name);
-  }
-
-  if (google_protobuf_FieldDescriptorProto_has_oneof_index(field_proto)) {
-    uint32_t oneof_index = google_protobuf_FieldDescriptorProto_oneof_index(field_proto);
-    upb_OneofDef* oneof;
-    upb_value v = upb_value_constptr(f);
-
-    if (upb_FieldDef_Label(f) != kUpb_Label_Optional) {
-      symtab_errf(ctx, "fields in oneof must have OPTIONAL label (%s)",
-                  f->full_name);
-    }
-
-    if (!m) {
-      symtab_errf(ctx, "oneof_index provided for extension field (%s)",
-                  f->full_name);
-    }
-
-    if (oneof_index >= m->oneof_count) {
-      symtab_errf(ctx, "oneof_index out of range (%s)", f->full_name);
-    }
-
-    oneof = (upb_OneofDef*)&m->oneofs[oneof_index];
-    f->scope.oneof = oneof;
-
-    oneof->field_count++;
-    if (f->proto3_optional_) {
-      oneof->synthetic = true;
-    }
-    CHK_OOM(upb_inttable_insert(&oneof->itof, f->number_, v, ctx->arena));
-    CHK_OOM(
-        upb_strtable_insert(&oneof->ntof, name.data, name.size, v, ctx->arena));
-  } else {
-    if (f->proto3_optional_ && !is_extension) {
-      symtab_errf(ctx, "field with proto3_optional was not in a oneof (%s)",
-                  f->full_name);
-    }
-  }
-
-  SET_OPTIONS(f->opts, FieldDescriptorProto, FieldOptions, field_proto);
-
-  if (google_protobuf_FieldOptions_has_packed(f->opts)) {
-    f->packed_ = google_protobuf_FieldOptions_packed(f->opts);
-  } else {
-    /* Repeated fields default to packed for proto3 only. */
-    f->packed_ = upb_FieldDef_IsPrimitive(f) &&
-                 f->label_ == kUpb_Label_Repeated &&
-                 f->file->syntax == kUpb_Syntax_Proto3;
-  }
-}
-
-static void create_service(
-    symtab_addctx* ctx, const google_protobuf_ServiceDescriptorProto* svc_proto,
-    const upb_ServiceDef* _s) {
-  upb_ServiceDef* s = (upb_ServiceDef*)_s;
-  upb_StringView name;
-  const google_protobuf_MethodDescriptorProto* const* methods;
-  size_t i, n;
-
-  s->file = ctx->file; /* Must happen prior to symtab_add. */
-
-  name = google_protobuf_ServiceDescriptorProto_name(svc_proto);
-  check_ident(ctx, name, false);
-  s->full_name = makefullname(ctx, ctx->file->package, name);
-  symtab_add(ctx, s->full_name, pack_def(s, UPB_DEFTYPE_SERVICE));
-
-  methods = google_protobuf_ServiceDescriptorProto_method(svc_proto, &n);
-
-  s->method_count = n;
-  s->methods = symtab_alloc(ctx, sizeof(*s->methods) * n);
-
-  SET_OPTIONS(s->opts, ServiceDescriptorProto, ServiceOptions, svc_proto);
-
-  for (i = 0; i < n; i++) {
-    const google_protobuf_MethodDescriptorProto* method_proto = methods[i];
-    upb_MethodDef* m = (upb_MethodDef*)&s->methods[i];
-    upb_StringView name =
-        google_protobuf_MethodDescriptorProto_name(method_proto);
-
-    m->service = s;
-    m->full_name = makefullname(ctx, s->full_name, name);
-    m->index = i;
-    m->client_streaming =
-        google_protobuf_MethodDescriptorProto_client_streaming(method_proto);
-    m->server_streaming =
-        google_protobuf_MethodDescriptorProto_server_streaming(method_proto);
-    m->input_type = symtab_resolve(
-        ctx, m->full_name, m->full_name,
-        google_protobuf_MethodDescriptorProto_input_type(method_proto),
-        UPB_DEFTYPE_MSG);
-    m->output_type = symtab_resolve(
-        ctx, m->full_name, m->full_name,
-        google_protobuf_MethodDescriptorProto_output_type(method_proto),
-        UPB_DEFTYPE_MSG);
-
-    SET_OPTIONS(m->opts, MethodDescriptorProto, MethodOptions, method_proto);
-  }
-}
-
-static int count_bits_debug(uint64_t x) {
-  // For assertions only, speed does not matter.
-  int n = 0;
-  while (x) {
-    if (x & 1) n++;
-    x >>= 1;
-  }
-  return n;
-}
-
-static int compare_int32(const void* a_ptr, const void* b_ptr) {
-  int32_t a = *(int32_t*)a_ptr;
-  int32_t b = *(int32_t*)b_ptr;
-  return a < b ? -1 : (a == b ? 0 : 1);
-}
-
-upb_MiniTable_Enum* create_enumlayout(symtab_addctx* ctx,
-                                      const upb_EnumDef* e) {
-  int n = 0;
-  uint64_t mask = 0;
-
-  for (int i = 0; i < e->value_count; i++) {
-    uint32_t val = (uint32_t)e->values[i].number;
-    if (val < 64) {
-      mask |= 1ULL << val;
-    } else {
-      n++;
-    }
-  }
-
-  int32_t* values = symtab_alloc(ctx, sizeof(*values) * n);
-
-  if (n) {
-    int32_t* p = values;
-
-    // Add values outside the bitmask range to the list, as described in the
-    // comments for upb_MiniTable_Enum.
-    for (int i = 0; i < e->value_count; i++) {
-      int32_t val = e->values[i].number;
-      if ((uint32_t)val >= 64) {
-        *p++ = val;
-      }
-    }
-    UPB_ASSERT(p == values + n);
-  }
-
-  // Enums can have duplicate values; we must sort+uniq them.
-  if (values) qsort(values, n, sizeof(*values), &compare_int32);
-
-  int dst = 0;
-  for (int i = 0; i < n; dst++) {
-    int32_t val = values[i];
-    while (i < n && values[i] == val) i++;  // Skip duplicates.
-    values[dst] = val;
-  }
-  n = dst;
-
-  UPB_ASSERT(upb_inttable_count(&e->iton) == n + count_bits_debug(mask));
-
-  upb_MiniTable_Enum* layout = symtab_alloc(ctx, sizeof(*layout));
-  layout->value_count = n;
-  layout->mask = mask;
-  layout->values = values;
-
-  return layout;
-}
-
-static void create_enumvaldef(
-    symtab_addctx* ctx, const char* prefix,
-    const google_protobuf_EnumValueDescriptorProto* val_proto, upb_EnumDef* e,
-    int i) {
-  upb_EnumValueDef* val = (upb_EnumValueDef*)&e->values[i];
-  upb_StringView name =
-      google_protobuf_EnumValueDescriptorProto_name(val_proto);
-  upb_value v = upb_value_constptr(val);
-
-  val->parent = e; /* Must happen prior to symtab_add(). */
-  val->full_name = makefullname(ctx, prefix, name);
-  val->number = google_protobuf_EnumValueDescriptorProto_number(val_proto);
-  symtab_add(ctx, val->full_name, pack_def(val, UPB_DEFTYPE_ENUMVAL));
-
-  SET_OPTIONS(val->opts, EnumValueDescriptorProto, EnumValueOptions, val_proto);
-
-  if (i == 0 && e->file->syntax == kUpb_Syntax_Proto3 && val->number != 0) {
-    symtab_errf(ctx, "for proto3, the first enum value must be zero (%s)",
-                e->full_name);
-  }
-
-  CHK_OOM(upb_strtable_insert(&e->ntoi, name.data, name.size, v, ctx->arena));
-
-  // Multiple enumerators can have the same number, first one wins.
-  if (!upb_inttable_lookup(&e->iton, val->number, NULL)) {
-    CHK_OOM(upb_inttable_insert(&e->iton, val->number, v, ctx->arena));
-  }
-}
-
-static upb_StringView* _upb_EnumReservedNames_New(
-    symtab_addctx* ctx, int n, const upb_StringView* protos) {
-  upb_StringView* sv =
-      upb_Arena_Malloc(ctx->arena, sizeof(upb_StringView) * n);
-  for (size_t i = 0; i < n; i++) {
-    sv[i].data =
-        upb_strdup2(protos[i].data, protos[i].size, ctx->arena);
-    sv[i].size = protos[i].size;
-  }
-  return sv;
-}
-
-static void create_enumdef(
-    symtab_addctx* ctx, const char* prefix,
-    const google_protobuf_EnumDescriptorProto* enum_proto,
-    const upb_MessageDef* containing_type, const upb_EnumDef* _e) {
-  upb_EnumDef* e = (upb_EnumDef*)_e;
-  ;
-  const google_protobuf_EnumValueDescriptorProto* const* values;
-  const google_protobuf_EnumDescriptorProto_EnumReservedRange* const* res_ranges;
-  const upb_StringView* res_names;
-  upb_StringView name;
-  size_t i, n, n_res_range, n_res_name;
-
-  e->file = ctx->file; /* Must happen prior to symtab_add() */
-  e->containing_type = containing_type;
-
-  name = google_protobuf_EnumDescriptorProto_name(enum_proto);
-  check_ident(ctx, name, false);
-
-  e->full_name = makefullname(ctx, prefix, name);
-  symtab_add(ctx, e->full_name, pack_def(e, UPB_DEFTYPE_ENUM));
-
-  values = google_protobuf_EnumDescriptorProto_value(enum_proto, &n);
-  CHK_OOM(upb_strtable_init(&e->ntoi, n, ctx->arena));
-  CHK_OOM(upb_inttable_init(&e->iton, ctx->arena));
-
-  e->defaultval = 0;
-  e->value_count = n;
-  e->values = symtab_alloc(ctx, sizeof(*e->values) * n);
-
-  if (n == 0) {
-    symtab_errf(ctx, "enums must contain at least one value (%s)",
-                e->full_name);
-  }
-
-  res_ranges =
-      google_protobuf_EnumDescriptorProto_reserved_range(enum_proto, &n_res_range);
-  e->res_range_count = n_res_range;
-  e->res_ranges = _upb_EnumReservedRanges_New(ctx, n_res_range, res_ranges, e);
-
-  res_names = google_protobuf_EnumDescriptorProto_reserved_name(enum_proto, &n_res_name);
-  e->res_name_count = n_res_name;
-  e->res_names = _upb_EnumReservedNames_New(ctx, n_res_name, res_names);
-
-  SET_OPTIONS(e->opts, EnumDescriptorProto, EnumOptions, enum_proto);
-
-  for (i = 0; i < n; i++) {
-    create_enumvaldef(ctx, prefix, values[i], e, i);
-  }
-
-  upb_inttable_compact(&e->iton, ctx->arena);
-
-  if (e->file->syntax == kUpb_Syntax_Proto2) {
-    if (ctx->layout) {
-      UPB_ASSERT(ctx->enum_count < ctx->layout->enum_count);
-      e->layout = ctx->layout->enums[ctx->enum_count++];
-      UPB_ASSERT(upb_inttable_count(&e->iton) ==
-                 e->layout->value_count + count_bits_debug(e->layout->mask));
-    } else {
-      e->layout = create_enumlayout(ctx, e);
-    }
-  } else {
-    e->layout = NULL;
-  }
-}
-
-static void msgdef_create_nested(
-    symtab_addctx* ctx, const google_protobuf_DescriptorProto* msg_proto,
-    upb_MessageDef* m);
-
-static upb_StringView* _upb_ReservedNames_New(symtab_addctx* ctx, int n,
-                                              const upb_StringView* protos) {
-  upb_StringView* sv = upb_Arena_Malloc(ctx->arena, sizeof(upb_StringView) * n);
-  for (size_t i = 0; i < n; i++) {
-    sv[i].data =
-        upb_strdup2(protos[i].data, protos[i].size, ctx->arena);
-    sv[i].size = protos[i].size;
-  }
-  return sv;
-}
-
-static void create_msgdef(symtab_addctx* ctx, const char* prefix,
-                          const google_protobuf_DescriptorProto* msg_proto,
-                          const upb_MessageDef* containing_type,
-                          const upb_MessageDef* _m) {
-  upb_MessageDef* m = (upb_MessageDef*)_m;
-  const google_protobuf_OneofDescriptorProto* const* oneofs;
-  const google_protobuf_FieldDescriptorProto* const* fields;
-  const google_protobuf_DescriptorProto_ExtensionRange* const* ext_ranges;
-
-  const google_protobuf_DescriptorProto_ReservedRange* const* res_ranges;
-  const upb_StringView* res_names;
-  size_t i, n_oneof, n_field, n_ext_range;
-  size_t n_res_range, n_res_name;
-  upb_StringView name;
-
-  m->file = ctx->file; /* Must happen prior to symtab_add(). */
-  m->containing_type = containing_type;
-
-  name = google_protobuf_DescriptorProto_name(msg_proto);
-  check_ident(ctx, name, false);
-
-  m->full_name = makefullname(ctx, prefix, name);
-  symtab_add(ctx, m->full_name, pack_def(m, UPB_DEFTYPE_MSG));
-
-  oneofs = google_protobuf_DescriptorProto_oneof_decl(msg_proto, &n_oneof);
-  fields = google_protobuf_DescriptorProto_field(msg_proto, &n_field);
-  ext_ranges =
-      google_protobuf_DescriptorProto_extension_range(msg_proto, &n_ext_range);
-  res_ranges = google_protobuf_DescriptorProto_reserved_range(msg_proto, &n_res_range);
-  res_names = google_protobuf_DescriptorProto_reserved_name(msg_proto, &n_res_name);
-
-  CHK_OOM(upb_inttable_init(&m->itof, ctx->arena));
-  CHK_OOM(upb_strtable_init(&m->ntof, n_oneof + n_field, ctx->arena));
-
-  if (ctx->layout) {
-    /* create_fielddef() below depends on this being set. */
-    UPB_ASSERT(ctx->msg_count < ctx->layout->msg_count);
-    m->layout = ctx->layout->msgs[ctx->msg_count++];
-    UPB_ASSERT(n_field == m->layout->field_count);
-  } else {
-    /* Allocate now (to allow cross-linking), populate later. */
-    m->layout =
-        symtab_alloc(ctx, sizeof(*m->layout) + sizeof(_upb_FastTable_Entry));
-  }
-
-  SET_OPTIONS(m->opts, DescriptorProto, MessageOptions, msg_proto);
-
-  m->oneof_count = n_oneof;
-  m->oneofs = symtab_alloc(ctx, sizeof(*m->oneofs) * n_oneof);
-  for (i = 0; i < n_oneof; i++) {
-    create_oneofdef(ctx, m, oneofs[i], &m->oneofs[i]);
-  }
-
-  m->field_count = n_field;
-  m->fields = symtab_alloc(ctx, sizeof(*m->fields) * n_field);
-  for (i = 0; i < n_field; i++) {
-    create_fielddef(ctx, m->full_name, m, fields[i], &m->fields[i],
-                    /* is_extension= */ false);
-  }
-
-  m->ext_range_count = n_ext_range;
-  m->ext_ranges = symtab_alloc(ctx, sizeof(*m->ext_ranges) * n_ext_range);
-  for (i = 0; i < n_ext_range; i++) {
-    const google_protobuf_DescriptorProto_ExtensionRange* r = ext_ranges[i];
-    upb_ExtensionRange* r_def = (upb_ExtensionRange*)&m->ext_ranges[i];
-    int32_t start = google_protobuf_DescriptorProto_ExtensionRange_start(r);
-    int32_t end = google_protobuf_DescriptorProto_ExtensionRange_end(r);
-    int32_t max =
-        google_protobuf_MessageOptions_message_set_wire_format(m->opts)
-            ? INT32_MAX
-            : kUpb_MaxFieldNumber + 1;
-
-    // A full validation would also check that each range is disjoint, and that
-    // none of the fields overlap with the extension ranges, but we are just
-    // sanity checking here.
-    if (start < 1 || end <= start || end > max) {
-      symtab_errf(ctx, "Extension range (%d, %d) is invalid, message=%s\n",
-                  (int)start, (int)end, m->full_name);
-    }
-
-    r_def->start = start;
-    r_def->end = end;
-    SET_OPTIONS(r_def->opts, DescriptorProto_ExtensionRange,
-                ExtensionRangeOptions, r);
-  }
-
-  m->res_range_count = n_res_range;
-  m->res_ranges =
-      _upb_MessageReservedRanges_New(ctx, n_res_range, res_ranges, m);
-
-  m->res_name_count = n_res_name;
-  m->res_names = _upb_ReservedNames_New(ctx, n_res_name, res_names);
-
-  finalize_oneofs(ctx, m);
-  assign_msg_wellknowntype(m);
-  upb_inttable_compact(&m->itof, ctx->arena);
-  msgdef_create_nested(ctx, msg_proto, m);
-}
-
-static void msgdef_create_nested(
-    symtab_addctx* ctx, const google_protobuf_DescriptorProto* msg_proto,
-    upb_MessageDef* m) {
-  size_t n;
-
-  const google_protobuf_EnumDescriptorProto* const* enums =
-      google_protobuf_DescriptorProto_enum_type(msg_proto, &n);
-  m->nested_enum_count = n;
-  m->nested_enums = symtab_alloc(ctx, sizeof(*m->nested_enums) * n);
-  for (size_t i = 0; i < n; i++) {
-    m->nested_enum_count = i + 1;
-    create_enumdef(ctx, m->full_name, enums[i], m, &m->nested_enums[i]);
-  }
-
-  const google_protobuf_FieldDescriptorProto* const* exts =
-      google_protobuf_DescriptorProto_extension(msg_proto, &n);
-  m->nested_ext_count = n;
-  m->nested_exts = symtab_alloc(ctx, sizeof(*m->nested_exts) * n);
-  for (size_t i = 0; i < n; i++) {
-    create_fielddef(ctx, m->full_name, m, exts[i], &m->nested_exts[i],
-                    /* is_extension= */ true);
-    ((upb_FieldDef*)&m->nested_exts[i])->index_ = i;
-  }
-
-  const google_protobuf_DescriptorProto* const* msgs =
-      google_protobuf_DescriptorProto_nested_type(msg_proto, &n);
-  m->nested_msg_count = n;
-  m->nested_msgs = symtab_alloc(ctx, sizeof(*m->nested_msgs) * n);
-  for (size_t i = 0; i < n; i++) {
-    create_msgdef(ctx, m->full_name, msgs[i], m, &m->nested_msgs[i]);
-  }
-}
-
-static void resolve_subdef(symtab_addctx* ctx, const char* prefix,
-                           upb_FieldDef* f) {
-  const google_protobuf_FieldDescriptorProto* field_proto = f->sub.unresolved;
-  upb_StringView name =
-      google_protobuf_FieldDescriptorProto_type_name(field_proto);
-  bool has_name =
-      google_protobuf_FieldDescriptorProto_has_type_name(field_proto);
-  switch ((int)f->type_) {
-    case FIELD_TYPE_UNSPECIFIED: {
-      // Type was not specified and must be inferred.
-      UPB_ASSERT(has_name);
-      upb_deftype_t type;
-      const void* def =
-          symtab_resolveany(ctx, f->full_name, prefix, name, &type);
-      switch (type) {
-        case UPB_DEFTYPE_ENUM:
-          f->sub.enumdef = def;
-          f->type_ = kUpb_FieldType_Enum;
-          break;
-        case UPB_DEFTYPE_MSG:
-          f->sub.msgdef = def;
-          f->type_ = kUpb_FieldType_Message;  // It appears there is no way of
-                                              // this being a group.
-          break;
-        default:
-          symtab_errf(ctx, "Couldn't resolve type name for field %s",
-                      f->full_name);
-      }
-    }
-    case kUpb_FieldType_Message:
-    case kUpb_FieldType_Group:
-      UPB_ASSERT(has_name);
-      f->sub.msgdef =
-          symtab_resolve(ctx, f->full_name, prefix, name, UPB_DEFTYPE_MSG);
-      break;
-    case kUpb_FieldType_Enum:
-      UPB_ASSERT(has_name);
-      f->sub.enumdef =
-          symtab_resolve(ctx, f->full_name, prefix, name, UPB_DEFTYPE_ENUM);
-      break;
-    default:
-      // No resolution necessary.
-      break;
-  }
-}
-
-static void resolve_extension(
-    symtab_addctx* ctx, const char* prefix, upb_FieldDef* f,
-    const google_protobuf_FieldDescriptorProto* field_proto) {
-  if (!google_protobuf_FieldDescriptorProto_has_extendee(field_proto)) {
-    symtab_errf(ctx, "extension for field '%s' had no extendee", f->full_name);
-  }
-
-  upb_StringView name =
-      google_protobuf_FieldDescriptorProto_extendee(field_proto);
-  const upb_MessageDef* m =
-      symtab_resolve(ctx, f->full_name, prefix, name, UPB_DEFTYPE_MSG);
-  f->msgdef = m;
-
-  bool found = false;
-
-  for (int i = 0, n = m->ext_range_count; i < n; i++) {
-    const upb_ExtensionRange* r = &m->ext_ranges[i];
-    if (r->start <= f->number_ && f->number_ < r->end) {
-      found = true;
-      break;
-    }
-  }
-
-  if (!found) {
-    symtab_errf(ctx,
-                "field number %u in extension %s has no extension range in "
-                "message %s",
-                (unsigned)f->number_, f->full_name, f->msgdef->full_name);
-  }
-
-  const upb_MiniTable_Extension* ext = ctx->file->ext_layouts[f->layout_index];
-  if (ctx->layout) {
-    UPB_ASSERT(upb_FieldDef_Number(f) == ext->field.number);
-  } else {
-    upb_MiniTable_Extension* mut_ext = (upb_MiniTable_Extension*)ext;
-    fill_fieldlayout(&mut_ext->field, f);
-    mut_ext->field.presence = 0;
-    mut_ext->field.offset = 0;
-    mut_ext->field.submsg_index = 0;
-    mut_ext->extendee = f->msgdef->layout;
-    mut_ext->sub.submsg = f->sub.msgdef->layout;
-  }
-
-  CHK_OOM(upb_inttable_insert(&ctx->symtab->exts, (uintptr_t)ext,
-                              upb_value_constptr(f), ctx->arena));
-}
-
-static void resolve_default(
-    symtab_addctx* ctx, upb_FieldDef* f,
-    const google_protobuf_FieldDescriptorProto* field_proto) {
-  // Have to delay resolving of the default value until now because of the enum
-  // case, since enum defaults are specified with a label.
-  if (google_protobuf_FieldDescriptorProto_has_default_value(field_proto)) {
-    upb_StringView defaultval =
-        google_protobuf_FieldDescriptorProto_default_value(field_proto);
-
-    if (f->file->syntax == kUpb_Syntax_Proto3) {
-      symtab_errf(ctx, "proto3 fields cannot have explicit defaults (%s)",
-                  f->full_name);
-    }
-
-    if (upb_FieldDef_IsSubMessage(f)) {
-      symtab_errf(ctx, "message fields cannot have explicit defaults (%s)",
-                  f->full_name);
-    }
-
-    parse_default(ctx, defaultval.data, defaultval.size, f);
-    f->has_default = true;
-  } else {
-    set_default_default(ctx, f);
-    f->has_default = false;
-  }
-}
-
-static void resolve_fielddef(symtab_addctx* ctx, const char* prefix,
-                             upb_FieldDef* f) {
-  // We have to stash this away since resolve_subdef() may overwrite it.
-  const google_protobuf_FieldDescriptorProto* field_proto = f->sub.unresolved;
-
-  resolve_subdef(ctx, prefix, f);
-  resolve_default(ctx, f, field_proto);
-
-  if (f->is_extension_) {
-    resolve_extension(ctx, prefix, f, field_proto);
-  }
-}
-
-static void resolve_msgdef(symtab_addctx* ctx, upb_MessageDef* m) {
-  for (int i = 0; i < m->field_count; i++) {
-    resolve_fielddef(ctx, m->full_name, (upb_FieldDef*)&m->fields[i]);
-  }
-
-  m->in_message_set = false;
-  for (int i = 0; i < m->nested_ext_count; i++) {
-    upb_FieldDef* ext = (upb_FieldDef*)&m->nested_exts[i];
-    resolve_fielddef(ctx, m->full_name, ext);
-    if (ext->type_ == kUpb_FieldType_Message &&
-        ext->label_ == kUpb_Label_Optional && ext->sub.msgdef == m &&
-        google_protobuf_MessageOptions_message_set_wire_format(
-            ext->msgdef->opts)) {
-      m->in_message_set = true;
-    }
-  }
-
-  if (!ctx->layout) make_layout(ctx, m);
-
-  for (int i = 0; i < m->nested_msg_count; i++) {
-    resolve_msgdef(ctx, (upb_MessageDef*)&m->nested_msgs[i]);
-  }
-}
-
-static int count_exts_in_msg(const google_protobuf_DescriptorProto* msg_proto) {
-  size_t n;
-  google_protobuf_DescriptorProto_extension(msg_proto, &n);
-  int ext_count = n;
-
-  const google_protobuf_DescriptorProto* const* nested_msgs =
-      google_protobuf_DescriptorProto_nested_type(msg_proto, &n);
-  for (size_t i = 0; i < n; i++) {
-    ext_count += count_exts_in_msg(nested_msgs[i]);
-  }
-
-  return ext_count;
-}
-
-static void build_filedef(
-    symtab_addctx* ctx, upb_FileDef* file,
-    const google_protobuf_FileDescriptorProto* file_proto) {
-  const google_protobuf_DescriptorProto* const* msgs;
-  const google_protobuf_EnumDescriptorProto* const* enums;
-  const google_protobuf_FieldDescriptorProto* const* exts;
-  const google_protobuf_ServiceDescriptorProto* const* services;
-  const upb_StringView* strs;
-  const int32_t* public_deps;
-  const int32_t* weak_deps;
-  size_t i, n;
-
-  file->symtab = ctx->symtab;
-
-  /* Count all extensions in the file, to build a flat array of layouts. */
-  google_protobuf_FileDescriptorProto_extension(file_proto, &n);
-  int ext_count = n;
-  msgs = google_protobuf_FileDescriptorProto_message_type(file_proto, &n);
-  for (int i = 0; i < n; i++) {
-    ext_count += count_exts_in_msg(msgs[i]);
-  }
-  file->ext_count = ext_count;
-
-  if (ctx->layout) {
-    /* We are using the ext layouts that were passed in. */
-    file->ext_layouts = ctx->layout->exts;
-    if (ctx->layout->ext_count != file->ext_count) {
-      symtab_errf(ctx, "Extension count did not match layout (%d vs %d)",
-                  ctx->layout->ext_count, file->ext_count);
-    }
-  } else {
-    /* We are building ext layouts from scratch. */
-    file->ext_layouts =
-        symtab_alloc(ctx, sizeof(*file->ext_layouts) * file->ext_count);
-    upb_MiniTable_Extension* ext =
-        symtab_alloc(ctx, sizeof(*ext) * file->ext_count);
-    for (int i = 0; i < file->ext_count; i++) {
-      file->ext_layouts[i] = &ext[i];
-    }
-  }
-
-  if (!google_protobuf_FileDescriptorProto_has_name(file_proto)) {
-    symtab_errf(ctx, "File has no name");
-  }
-
-  file->name =
-      strviewdup(ctx, google_protobuf_FileDescriptorProto_name(file_proto));
-
-  upb_StringView package = google_protobuf_FileDescriptorProto_package(file_proto);
-  if (package.size) {
-    check_ident(ctx, package, true);
-    file->package = strviewdup(ctx, package);
-  } else {
-    file->package = NULL;
-  }
-
-  if (google_protobuf_FileDescriptorProto_has_syntax(file_proto)) {
-    upb_StringView syntax =
-        google_protobuf_FileDescriptorProto_syntax(file_proto);
-
-    if (streql_view(syntax, "proto2")) {
-      file->syntax = kUpb_Syntax_Proto2;
-    } else if (streql_view(syntax, "proto3")) {
-      file->syntax = kUpb_Syntax_Proto3;
-    } else {
-      symtab_errf(ctx, "Invalid syntax '" UPB_STRINGVIEW_FORMAT "'",
-                  UPB_STRINGVIEW_ARGS(syntax));
-    }
-  } else {
-    file->syntax = kUpb_Syntax_Proto2;
-  }
-
-  /* Read options. */
-  SET_OPTIONS(file->opts, FileDescriptorProto, FileOptions, file_proto);
-
-  /* Verify dependencies. */
-  strs = google_protobuf_FileDescriptorProto_dependency(file_proto, &n);
-  file->dep_count = n;
-  file->deps = symtab_alloc(ctx, sizeof(*file->deps) * n);
-
-  for (i = 0; i < n; i++) {
-    upb_StringView str = strs[i];
-    file->deps[i] =
-        upb_DefPool_FindFileByNameWithSize(ctx->symtab, str.data, str.size);
-    if (!file->deps[i]) {
-      symtab_errf(ctx,
-                  "Depends on file '" UPB_STRINGVIEW_FORMAT
-                  "', but it has not been loaded",
-                  UPB_STRINGVIEW_ARGS(str));
-    }
-  }
-
-  public_deps =
-      google_protobuf_FileDescriptorProto_public_dependency(file_proto, &n);
-  file->public_dep_count = n;
-  file->public_deps = symtab_alloc(ctx, sizeof(*file->public_deps) * n);
-  int32_t* mutable_public_deps = (int32_t*)file->public_deps;
-  for (i = 0; i < n; i++) {
-    if (public_deps[i] >= file->dep_count) {
-      symtab_errf(ctx, "public_dep %d is out of range", (int)public_deps[i]);
-    }
-    mutable_public_deps[i] = public_deps[i];
-  }
-
-  weak_deps =
-      google_protobuf_FileDescriptorProto_weak_dependency(file_proto, &n);
-  file->weak_dep_count = n;
-  file->weak_deps = symtab_alloc(ctx, sizeof(*file->weak_deps) * n);
-  int32_t* mutable_weak_deps = (int32_t*)file->weak_deps;
-  for (i = 0; i < n; i++) {
-    if (weak_deps[i] >= file->dep_count) {
-      symtab_errf(ctx, "weak_dep %d is out of range", (int)weak_deps[i]);
-    }
-    mutable_weak_deps[i] = weak_deps[i];
-  }
-
-  /* Create enums. */
-  enums = google_protobuf_FileDescriptorProto_enum_type(file_proto, &n);
-  file->top_lvl_enum_count = n;
-  file->top_lvl_enums = symtab_alloc(ctx, sizeof(*file->top_lvl_enums) * n);
-  for (i = 0; i < n; i++) {
-    create_enumdef(ctx, file->package, enums[i], NULL, &file->top_lvl_enums[i]);
-  }
-
-  /* Create extensions. */
-  exts = google_protobuf_FileDescriptorProto_extension(file_proto, &n);
-  file->top_lvl_ext_count = n;
-  file->top_lvl_exts = symtab_alloc(ctx, sizeof(*file->top_lvl_exts) * n);
-  for (i = 0; i < n; i++) {
-    create_fielddef(ctx, file->package, NULL, exts[i], &file->top_lvl_exts[i],
-                    /* is_extension= */ true);
-    ((upb_FieldDef*)&file->top_lvl_exts[i])->index_ = i;
-  }
-
-  /* Create messages. */
-  msgs = google_protobuf_FileDescriptorProto_message_type(file_proto, &n);
-  file->top_lvl_msg_count = n;
-  file->top_lvl_msgs = symtab_alloc(ctx, sizeof(*file->top_lvl_msgs) * n);
-  for (i = 0; i < n; i++) {
-    create_msgdef(ctx, file->package, msgs[i], NULL, &file->top_lvl_msgs[i]);
-  }
-
-  /* Create services. */
-  services = google_protobuf_FileDescriptorProto_service(file_proto, &n);
-  file->service_count = n;
-  file->services = symtab_alloc(ctx, sizeof(*file->services) * n);
-  for (i = 0; i < n; i++) {
-    create_service(ctx, services[i], &file->services[i]);
-    ((upb_ServiceDef*)&file->services[i])->index = i;
-  }
-
-  /* Now that all names are in the table, build layouts and resolve refs. */
-  for (i = 0; i < (size_t)file->top_lvl_ext_count; i++) {
-    resolve_fielddef(ctx, file->package, (upb_FieldDef*)&file->top_lvl_exts[i]);
-  }
-
-  for (i = 0; i < (size_t)file->top_lvl_msg_count; i++) {
-    resolve_msgdef(ctx, (upb_MessageDef*)&file->top_lvl_msgs[i]);
-  }
-
-  if (file->ext_count) {
-    CHK_OOM(_upb_extreg_add(ctx->symtab->extreg, file->ext_layouts,
-                            file->ext_count));
-  }
-}
-
-static void remove_filedef(upb_DefPool* s, upb_FileDef* file) {
-  intptr_t iter = UPB_INTTABLE_BEGIN;
-  upb_StringView key;
-  upb_value val;
-  while (upb_strtable_next2(&s->syms, &key, &val, &iter)) {
-    const upb_FileDef* f;
-    switch (deftype(val)) {
-      case UPB_DEFTYPE_EXT:
-        f = upb_FieldDef_File(unpack_def(val, UPB_DEFTYPE_EXT));
-        break;
-      case UPB_DEFTYPE_MSG:
-        f = upb_MessageDef_File(unpack_def(val, UPB_DEFTYPE_MSG));
-        break;
-      case UPB_DEFTYPE_ENUM:
-        f = upb_EnumDef_File(unpack_def(val, UPB_DEFTYPE_ENUM));
-        break;
-      case UPB_DEFTYPE_ENUMVAL:
-        f = upb_EnumDef_File(
-            upb_EnumValueDef_Enum(unpack_def(val, UPB_DEFTYPE_ENUMVAL)));
-        break;
-      case UPB_DEFTYPE_SERVICE:
-        f = upb_ServiceDef_File(unpack_def(val, UPB_DEFTYPE_SERVICE));
-        break;
-      default:
-        UPB_UNREACHABLE();
-    }
-
-    if (f == file) upb_strtable_removeiter(&s->syms, &iter);
-  }
-}
-
-static const upb_FileDef* _upb_DefPool_AddFile(
-    upb_DefPool* s, const google_protobuf_FileDescriptorProto* file_proto,
-    const upb_MiniTable_File* layout, upb_Status* status) {
-  symtab_addctx ctx;
-  upb_StringView name = google_protobuf_FileDescriptorProto_name(file_proto);
-  upb_value v;
-
-  if (upb_strtable_lookup2(&s->files, name.data, name.size, &v)) {
-    if (unpack_def(v, UPB_DEFTYPE_FILE)) {
-      upb_Status_SetErrorFormat(status, "duplicate file name (%.*s)",
-                                UPB_STRINGVIEW_ARGS(name));
-      return NULL;
-    }
-    const upb_MiniTable_File* registered = unpack_def(v, UPB_DEFTYPE_LAYOUT);
-    UPB_ASSERT(registered);
-    if (layout && layout != registered) {
-      upb_Status_SetErrorFormat(
-          status, "tried to build with a different layout (filename=%.*s)",
-          UPB_STRINGVIEW_ARGS(name));
-      return NULL;
-    }
-    layout = registered;
-  }
-
-  ctx.symtab = s;
-  ctx.layout = layout;
-  ctx.msg_count = 0;
-  ctx.enum_count = 0;
-  ctx.ext_count = 0;
-  ctx.status = status;
-  ctx.file = NULL;
-  ctx.arena = upb_Arena_New();
-  ctx.tmp_arena = upb_Arena_New();
-
-  if (!ctx.arena || !ctx.tmp_arena) {
-    if (ctx.arena) upb_Arena_Free(ctx.arena);
-    if (ctx.tmp_arena) upb_Arena_Free(ctx.tmp_arena);
-    upb_Status_setoom(status);
-    return NULL;
-  }
-
-  if (UPB_UNLIKELY(UPB_SETJMP(ctx.err))) {
-    UPB_ASSERT(!upb_Status_IsOk(status));
-    if (ctx.file) {
-      remove_filedef(s, ctx.file);
-      ctx.file = NULL;
-    }
-  } else {
-    ctx.file = symtab_alloc(&ctx, sizeof(*ctx.file));
-    build_filedef(&ctx, ctx.file, file_proto);
-    upb_strtable_insert(&s->files, name.data, name.size,
-                        pack_def(ctx.file, UPB_DEFTYPE_FILE), ctx.arena);
-    UPB_ASSERT(upb_Status_IsOk(status));
-    upb_Arena_Fuse(s->arena, ctx.arena);
-  }
-
-  upb_Arena_Free(ctx.arena);
-  upb_Arena_Free(ctx.tmp_arena);
-  return ctx.file;
-}
-
-const upb_FileDef* upb_DefPool_AddFile(
-    upb_DefPool* s, const google_protobuf_FileDescriptorProto* file_proto,
-    upb_Status* status) {
-  return _upb_DefPool_AddFile(s, file_proto, NULL, status);
-}
-
-/* Include here since we want most of this file to be stdio-free. */
-#include <stdio.h>
-
-bool _upb_DefPool_LoadDefInitEx(upb_DefPool* s, const _upb_DefPool_Init* init,
-                                bool rebuild_minitable) {
-  /* Since this function should never fail (it would indicate a bug in upb) we
-   * print errors to stderr instead of returning error status to the user. */
-  _upb_DefPool_Init** deps = init->deps;
-  google_protobuf_FileDescriptorProto* file;
-  upb_Arena* arena;
-  upb_Status status;
-
-  upb_Status_Clear(&status);
-
-  if (upb_DefPool_FindFileByName(s, init->filename)) {
-    return true;
-  }
-
-  arena = upb_Arena_New();
-
-  for (; *deps; deps++) {
-    if (!_upb_DefPool_LoadDefInitEx(s, *deps, rebuild_minitable)) goto err;
-  }
-
-  file = google_protobuf_FileDescriptorProto_parse_ex(
-      init->descriptor.data, init->descriptor.size, NULL,
-      kUpb_DecodeOption_AliasString, arena);
-  s->bytes_loaded += init->descriptor.size;
-
-  if (!file) {
-    upb_Status_SetErrorFormat(
-        &status,
-        "Failed to parse compiled-in descriptor for file '%s'. This should "
-        "never happen.",
-        init->filename);
-    goto err;
-  }
-
-  const upb_MiniTable_File* mt = rebuild_minitable ? NULL : init->layout;
-  if (!_upb_DefPool_AddFile(s, file, mt, &status)) {
-    goto err;
-  }
-
-  upb_Arena_Free(arena);
-  return true;
-
-err:
-  fprintf(stderr,
-          "Error loading compiled-in descriptor for file '%s' (this should "
-          "never happen): %s\n",
-          init->filename, upb_Status_ErrorMessage(&status));
-  upb_Arena_Free(arena);
-  return false;
-}
-
-size_t _upb_DefPool_BytesLoaded(const upb_DefPool* s) {
-  return s->bytes_loaded;
-}
-
-upb_Arena* _upb_DefPool_Arena(const upb_DefPool* s) { return s->arena; }
-
-const upb_FieldDef* _upb_DefPool_FindExtensionByMiniTable(
-    const upb_DefPool* s, const upb_MiniTable_Extension* ext) {
-  upb_value v;
-  bool ok = upb_inttable_lookup(&s->exts, (uintptr_t)ext, &v);
-  UPB_ASSERT(ok);
-  return upb_value_getconstptr(v);
-}
-
-const upb_FieldDef* upb_DefPool_FindExtensionByNumber(const upb_DefPool* s,
-                                                      const upb_MessageDef* m,
-                                                      int32_t fieldnum) {
-  const upb_MiniTable* l = upb_MessageDef_MiniTable(m);
-  const upb_MiniTable_Extension* ext = _upb_extreg_get(s->extreg, l, fieldnum);
-  return ext ? _upb_DefPool_FindExtensionByMiniTable(s, ext) : NULL;
-}
-
-bool _upb_DefPool_registerlayout(upb_DefPool* s, const char* filename,
-                                 const upb_MiniTable_File* file) {
-  if (upb_DefPool_FindFileByName(s, filename)) return false;
-  upb_value v = pack_def(file, UPB_DEFTYPE_LAYOUT);
-  return upb_strtable_insert(&s->files, filename, strlen(filename), v,
-                             s->arena);
-}
-
-const upb_ExtensionRegistry* upb_DefPool_ExtensionRegistry(
-    const upb_DefPool* s) {
-  return s->extreg;
-}
-
-const upb_FieldDef** upb_DefPool_GetAllExtensions(const upb_DefPool* s,
-                                                  const upb_MessageDef* m,
-                                                  size_t* count) {
-  size_t n = 0;
-  intptr_t iter = UPB_INTTABLE_BEGIN;
-  uintptr_t key;
-  upb_value val;
-  // This is O(all exts) instead of O(exts for m).  If we need this to be
-  // efficient we may need to make extreg into a two-level table, or have a
-  // second per-message index.
-  while (upb_inttable_next2(&s->exts, &key, &val, &iter)) {
-    const upb_FieldDef* f = upb_value_getconstptr(val);
-    if (upb_FieldDef_ContainingType(f) == m) n++;
-  }
-  const upb_FieldDef** exts = malloc(n * sizeof(*exts));
-  iter = UPB_INTTABLE_BEGIN;
-  size_t i = 0;
-  while (upb_inttable_next2(&s->exts, &key, &val, &iter)) {
-    const upb_FieldDef* f = upb_value_getconstptr(val);
-    if (upb_FieldDef_ContainingType(f) == m) exts[i++] = f;
-  }
-  *count = n;
-  return exts;
-}
-
-#undef CHK_OOM
-
-/** upb/reflection.c ************************************************************/
-
-#include <string.h>
-
-
-static size_t get_field_size(const upb_MiniTable_Field* f) {
-  static unsigned char sizes[] = {
-      0,                      /* 0 */
-      8,                      /* kUpb_FieldType_Double */
-      4,                      /* kUpb_FieldType_Float */
-      8,                      /* kUpb_FieldType_Int64 */
-      8,                      /* kUpb_FieldType_UInt64 */
-      4,                      /* kUpb_FieldType_Int32 */
-      8,                      /* kUpb_FieldType_Fixed64 */
-      4,                      /* kUpb_FieldType_Fixed32 */
-      1,                      /* kUpb_FieldType_Bool */
-      sizeof(upb_StringView), /* kUpb_FieldType_String */
-      sizeof(void*),          /* kUpb_FieldType_Group */
-      sizeof(void*),          /* kUpb_FieldType_Message */
-      sizeof(upb_StringView), /* kUpb_FieldType_Bytes */
-      4,                      /* kUpb_FieldType_UInt32 */
-      4,                      /* kUpb_FieldType_Enum */
-      4,                      /* kUpb_FieldType_SFixed32 */
-      8,                      /* kUpb_FieldType_SFixed64 */
-      4,                      /* kUpb_FieldType_SInt32 */
-      8,                      /* kUpb_FieldType_SInt64 */
-  };
-  return upb_IsRepeatedOrMap(f) ? sizeof(void*) : sizes[f->descriptortype];
-}
-
-/** upb_Message
- * *******************************************************************/
-
-upb_Message* upb_Message_New(const upb_MessageDef* m, upb_Arena* a) {
-  return _upb_Message_New(upb_MessageDef_MiniTable(m), a);
-}
-
-static bool in_oneof(const upb_MiniTable_Field* field) {
-  return field->presence < 0;
-}
-
-static upb_MessageValue _upb_Message_Getraw(const upb_Message* msg,
-                                            const upb_FieldDef* f) {
-  const upb_MiniTable_Field* field = upb_FieldDef_MiniTable(f);
-  const char* mem = UPB_PTR_AT(msg, field->offset, char);
-  upb_MessageValue val = {0};
-  memcpy(&val, mem, get_field_size(field));
-  return val;
-}
-
-bool upb_Message_Has(const upb_Message* msg, const upb_FieldDef* f) {
-  assert(upb_FieldDef_HasPresence(f));
-  if (upb_FieldDef_IsExtension(f)) {
-    const upb_MiniTable_Extension* ext = _upb_FieldDef_ExtensionMiniTable(f);
-    return _upb_Message_Getext(msg, ext) != NULL;
-  } else {
-    const upb_MiniTable_Field* field = upb_FieldDef_MiniTable(f);
-    if (in_oneof(field)) {
-      return _upb_getoneofcase_field(msg, field) == field->number;
-    } else if (field->presence > 0) {
-      return _upb_hasbit_field(msg, field);
-    } else {
-      UPB_ASSERT(field->descriptortype == kUpb_FieldType_Message ||
-                 field->descriptortype == kUpb_FieldType_Group);
-      return _upb_Message_Getraw(msg, f).msg_val != NULL;
-    }
-  }
-}
-
-const upb_FieldDef* upb_Message_WhichOneof(const upb_Message* msg,
-                                           const upb_OneofDef* o) {
-  const upb_FieldDef* f = upb_OneofDef_Field(o, 0);
-  if (upb_OneofDef_IsSynthetic(o)) {
-    UPB_ASSERT(upb_OneofDef_FieldCount(o) == 1);
-    return upb_Message_Has(msg, f) ? f : NULL;
-  } else {
-    const upb_MiniTable_Field* field = upb_FieldDef_MiniTable(f);
-    uint32_t oneof_case = _upb_getoneofcase_field(msg, field);
-    f = oneof_case ? upb_OneofDef_LookupNumber(o, oneof_case) : NULL;
-    UPB_ASSERT((f != NULL) == (oneof_case != 0));
-    return f;
-  }
-}
-
-upb_MessageValue upb_Message_Get(const upb_Message* msg,
-                                 const upb_FieldDef* f) {
-  if (upb_FieldDef_IsExtension(f)) {
-    const upb_Message_Extension* ext =
-        _upb_Message_Getext(msg, _upb_FieldDef_ExtensionMiniTable(f));
-    if (ext) {
-      upb_MessageValue val;
-      memcpy(&val, &ext->data, sizeof(val));
-      return val;
-    } else if (upb_FieldDef_IsRepeated(f)) {
-      return (upb_MessageValue){.array_val = NULL};
-    }
-  } else if (!upb_FieldDef_HasPresence(f) || upb_Message_Has(msg, f)) {
-    return _upb_Message_Getraw(msg, f);
-  }
-  return upb_FieldDef_Default(f);
-}
-
-upb_MutableMessageValue upb_Message_Mutable(upb_Message* msg,
-                                            const upb_FieldDef* f,
-                                            upb_Arena* a) {
-  UPB_ASSERT(upb_FieldDef_IsSubMessage(f) || upb_FieldDef_IsRepeated(f));
-  if (upb_FieldDef_HasPresence(f) && !upb_Message_Has(msg, f)) {
-    // We need to skip the upb_Message_Get() call in this case.
-    goto make;
-  }
-
-  upb_MessageValue val = upb_Message_Get(msg, f);
-  if (val.array_val) {
-    return (upb_MutableMessageValue){.array = (upb_Array*)val.array_val};
-  }
-
-  upb_MutableMessageValue ret;
-make:
-  if (!a) return (upb_MutableMessageValue){.array = NULL};
-  if (upb_FieldDef_IsMap(f)) {
-    const upb_MessageDef* entry = upb_FieldDef_MessageSubDef(f);
-    const upb_FieldDef* key =
-        upb_MessageDef_FindFieldByNumber(entry, kUpb_MapEntry_KeyFieldNumber);
-    const upb_FieldDef* value =
-        upb_MessageDef_FindFieldByNumber(entry, kUpb_MapEntry_ValueFieldNumber);
-    ret.map =
-        upb_Map_New(a, upb_FieldDef_CType(key), upb_FieldDef_CType(value));
-  } else if (upb_FieldDef_IsRepeated(f)) {
-    ret.array = upb_Array_New(a, upb_FieldDef_CType(f));
-  } else {
-    UPB_ASSERT(upb_FieldDef_IsSubMessage(f));
-    ret.msg = upb_Message_New(upb_FieldDef_MessageSubDef(f), a);
-  }
-
-  val.array_val = ret.array;
-  upb_Message_Set(msg, f, val, a);
-
-  return ret;
-}
-
-bool upb_Message_Set(upb_Message* msg, const upb_FieldDef* f,
-                     upb_MessageValue val, upb_Arena* a) {
-  if (upb_FieldDef_IsExtension(f)) {
-    upb_Message_Extension* ext = _upb_Message_GetOrCreateExtension(
-        msg, _upb_FieldDef_ExtensionMiniTable(f), a);
-    if (!ext) return false;
-    memcpy(&ext->data, &val, sizeof(val));
-  } else {
-    const upb_MiniTable_Field* field = upb_FieldDef_MiniTable(f);
-    char* mem = UPB_PTR_AT(msg, field->offset, char);
-    memcpy(mem, &val, get_field_size(field));
-    if (field->presence > 0) {
-      _upb_sethas_field(msg, field);
-    } else if (in_oneof(field)) {
-      *_upb_oneofcase_field(msg, field) = field->number;
-    }
-  }
-  return true;
-}
-
-void upb_Message_ClearField(upb_Message* msg, const upb_FieldDef* f) {
-  if (upb_FieldDef_IsExtension(f)) {
-    _upb_Message_Clearext(msg, _upb_FieldDef_ExtensionMiniTable(f));
-  } else {
-    const upb_MiniTable_Field* field = upb_FieldDef_MiniTable(f);
-    char* mem = UPB_PTR_AT(msg, field->offset, char);
-
-    if (field->presence > 0) {
-      _upb_clearhas_field(msg, field);
-    } else if (in_oneof(field)) {
-      uint32_t* oneof_case = _upb_oneofcase_field(msg, field);
-      if (*oneof_case != field->number) return;
-      *oneof_case = 0;
-    }
-
-    memset(mem, 0, get_field_size(field));
-  }
-}
-
-void upb_Message_Clear(upb_Message* msg, const upb_MessageDef* m) {
-  _upb_Message_Clear(msg, upb_MessageDef_MiniTable(m));
-}
-
-bool upb_Message_Next(const upb_Message* msg, const upb_MessageDef* m,
-                      const upb_DefPool* ext_pool, const upb_FieldDef** out_f,
-                      upb_MessageValue* out_val, size_t* iter) {
-  size_t i = *iter;
-  size_t n = upb_MessageDef_FieldCount(m);
-  const upb_MessageValue zero = {0};
-  UPB_UNUSED(ext_pool);
-
-  /* Iterate over normal fields, returning the first one that is set. */
-  while (++i < n) {
-    const upb_FieldDef* f = upb_MessageDef_Field(m, i);
-    upb_MessageValue val = _upb_Message_Getraw(msg, f);
-
-    /* Skip field if unset or empty. */
-    if (upb_FieldDef_HasPresence(f)) {
-      if (!upb_Message_Has(msg, f)) continue;
-    } else {
-      upb_MessageValue test = val;
-      if (upb_FieldDef_IsString(f) && !upb_FieldDef_IsRepeated(f)) {
-        /* Clear string pointer, only size matters (ptr could be non-NULL). */
-        test.str_val.data = NULL;
-      }
-      /* Continue if NULL or 0. */
-      if (memcmp(&test, &zero, sizeof(test)) == 0) continue;
-
-      /* Continue on empty array or map. */
-      if (upb_FieldDef_IsMap(f)) {
-        if (upb_Map_Size(test.map_val) == 0) continue;
-      } else if (upb_FieldDef_IsRepeated(f)) {
-        if (upb_Array_Size(test.array_val) == 0) continue;
-      }
-    }
-
-    *out_val = val;
-    *out_f = f;
-    *iter = i;
-    return true;
-  }
-
-  if (ext_pool) {
-    /* Return any extensions that are set. */
-    size_t count;
-    const upb_Message_Extension* ext = _upb_Message_Getexts(msg, &count);
-    if (i - n < count) {
-      ext += count - 1 - (i - n);
-      memcpy(out_val, &ext->data, sizeof(*out_val));
-      *out_f = _upb_DefPool_FindExtensionByMiniTable(ext_pool, ext->ext);
-      *iter = i;
-      return true;
-    }
-  }
-
-  *iter = i;
-  return false;
-}
-
-bool _upb_Message_DiscardUnknown(upb_Message* msg, const upb_MessageDef* m,
-                                 int depth) {
-  size_t iter = kUpb_Message_Begin;
-  const upb_FieldDef* f;
-  upb_MessageValue val;
-  bool ret = true;
-
-  if (--depth == 0) return false;
-
-  _upb_Message_DiscardUnknown_shallow(msg);
-
-  while (upb_Message_Next(msg, m, NULL /*ext_pool*/, &f, &val, &iter)) {
-    const upb_MessageDef* subm = upb_FieldDef_MessageSubDef(f);
-    if (!subm) continue;
-    if (upb_FieldDef_IsMap(f)) {
-      const upb_FieldDef* val_f = upb_MessageDef_FindFieldByNumber(subm, 2);
-      const upb_MessageDef* val_m = upb_FieldDef_MessageSubDef(val_f);
-      upb_Map* map = (upb_Map*)val.map_val;
-      size_t iter = kUpb_Map_Begin;
-
-      if (!val_m) continue;
-
-      while (upb_MapIterator_Next(map, &iter)) {
-        upb_MessageValue map_val = upb_MapIterator_Value(map, iter);
-        if (!_upb_Message_DiscardUnknown((upb_Message*)map_val.msg_val, val_m,
-                                         depth)) {
-          ret = false;
-        }
-      }
-    } else if (upb_FieldDef_IsRepeated(f)) {
-      const upb_Array* arr = val.array_val;
-      size_t i, n = upb_Array_Size(arr);
-      for (i = 0; i < n; i++) {
-        upb_MessageValue elem = upb_Array_Get(arr, i);
-        if (!_upb_Message_DiscardUnknown((upb_Message*)elem.msg_val, subm,
-                                         depth)) {
-          ret = false;
-        }
-      }
-    } else {
-      if (!_upb_Message_DiscardUnknown((upb_Message*)val.msg_val, subm,
-                                       depth)) {
-        ret = false;
-      }
-    }
-  }
-
-  return ret;
-}
-
-bool upb_Message_DiscardUnknown(upb_Message* msg, const upb_MessageDef* m,
-                                int maxdepth) {
-  return _upb_Message_DiscardUnknown(msg, m, maxdepth);
-}
-
-/** upb/decode.c ************************************************************/
-
-#include <setjmp.h>
-#include <string.h>
-
-
-/* Must be last. */
-
-/* Maps descriptor type -> elem_size_lg2.  */
-static const uint8_t desctype_to_elem_size_lg2[] = {
-    -1,             /* invalid descriptor type */
-    3,              /* DOUBLE */
-    2,              /* FLOAT */
-    3,              /* INT64 */
-    3,              /* UINT64 */
-    2,              /* INT32 */
-    3,              /* FIXED64 */
-    2,              /* FIXED32 */
-    0,              /* BOOL */
-    UPB_SIZE(3, 4), /* STRING */
-    UPB_SIZE(2, 3), /* GROUP */
-    UPB_SIZE(2, 3), /* MESSAGE */
-    UPB_SIZE(3, 4), /* BYTES */
-    2,              /* UINT32 */
-    2,              /* ENUM */
-    2,              /* SFIXED32 */
-    3,              /* SFIXED64 */
-    2,              /* SINT32 */
-    3,              /* SINT64 */
-};
-
-/* Maps descriptor type -> upb map size.  */
-static const uint8_t desctype_to_mapsize[] = {
-    -1,                 /* invalid descriptor type */
-    8,                  /* DOUBLE */
-    4,                  /* FLOAT */
-    8,                  /* INT64 */
-    8,                  /* UINT64 */
-    4,                  /* INT32 */
-    8,                  /* FIXED64 */
-    4,                  /* FIXED32 */
-    1,                  /* BOOL */
-    UPB_MAPTYPE_STRING, /* STRING */
-    sizeof(void*),      /* GROUP */
-    sizeof(void*),      /* MESSAGE */
-    UPB_MAPTYPE_STRING, /* BYTES */
-    4,                  /* UINT32 */
-    4,                  /* ENUM */
-    4,                  /* SFIXED32 */
-    8,                  /* SFIXED64 */
-    4,                  /* SINT32 */
-    8,                  /* SINT64 */
-};
-
-static const unsigned FIXED32_OK_MASK = (1 << kUpb_FieldType_Float) |
-                                        (1 << kUpb_FieldType_Fixed32) |
-                                        (1 << kUpb_FieldType_SFixed32);
-
-static const unsigned FIXED64_OK_MASK = (1 << kUpb_FieldType_Double) |
-                                        (1 << kUpb_FieldType_Fixed64) |
-                                        (1 << kUpb_FieldType_SFixed64);
-
-/* Three fake field types for MessageSet. */
-#define TYPE_MSGSET_ITEM 19
-#define TYPE_COUNT 19
-
-/* Op: an action to be performed for a wire-type/field-type combination. */
-#define OP_UNKNOWN -1 /* Unknown field. */
-#define OP_MSGSET_ITEM -2
-#define OP_SCALAR_LG2(n) (n) /* n in [0, 2, 3] => op in [0, 2, 3] */
-#define OP_ENUM 1
-#define OP_STRING 4
-#define OP_BYTES 5
-#define OP_SUBMSG 6
-/* Scalar fields use only ops above. Repeated fields can use any op.  */
-#define OP_FIXPCK_LG2(n) (n + 5) /* n in [2, 3] => op in [7, 8] */
-#define OP_VARPCK_LG2(n) (n + 9) /* n in [0, 2, 3] => op in [9, 11, 12] */
-#define OP_PACKED_ENUM 13
-
-static const int8_t varint_ops[] = {
-    OP_UNKNOWN,       /* field not found */
-    OP_UNKNOWN,       /* DOUBLE */
-    OP_UNKNOWN,       /* FLOAT */
-    OP_SCALAR_LG2(3), /* INT64 */
-    OP_SCALAR_LG2(3), /* UINT64 */
-    OP_SCALAR_LG2(2), /* INT32 */
-    OP_UNKNOWN,       /* FIXED64 */
-    OP_UNKNOWN,       /* FIXED32 */
-    OP_SCALAR_LG2(0), /* BOOL */
-    OP_UNKNOWN,       /* STRING */
-    OP_UNKNOWN,       /* GROUP */
-    OP_UNKNOWN,       /* MESSAGE */
-    OP_UNKNOWN,       /* BYTES */
-    OP_SCALAR_LG2(2), /* UINT32 */
-    OP_ENUM,          /* ENUM */
-    OP_UNKNOWN,       /* SFIXED32 */
-    OP_UNKNOWN,       /* SFIXED64 */
-    OP_SCALAR_LG2(2), /* SINT32 */
-    OP_SCALAR_LG2(3), /* SINT64 */
-    OP_UNKNOWN,       /* MSGSET_ITEM */
-};
-
-static const int8_t delim_ops[] = {
-    /* For non-repeated field type. */
-    OP_UNKNOWN, /* field not found */
-    OP_UNKNOWN, /* DOUBLE */
-    OP_UNKNOWN, /* FLOAT */
-    OP_UNKNOWN, /* INT64 */
-    OP_UNKNOWN, /* UINT64 */
-    OP_UNKNOWN, /* INT32 */
-    OP_UNKNOWN, /* FIXED64 */
-    OP_UNKNOWN, /* FIXED32 */
-    OP_UNKNOWN, /* BOOL */
-    OP_STRING,  /* STRING */
-    OP_UNKNOWN, /* GROUP */
-    OP_SUBMSG,  /* MESSAGE */
-    OP_BYTES,   /* BYTES */
-    OP_UNKNOWN, /* UINT32 */
-    OP_UNKNOWN, /* ENUM */
-    OP_UNKNOWN, /* SFIXED32 */
-    OP_UNKNOWN, /* SFIXED64 */
-    OP_UNKNOWN, /* SINT32 */
-    OP_UNKNOWN, /* SINT64 */
-    OP_UNKNOWN, /* MSGSET_ITEM */
-    /* For repeated field type. */
-    OP_FIXPCK_LG2(3), /* REPEATED DOUBLE */
-    OP_FIXPCK_LG2(2), /* REPEATED FLOAT */
-    OP_VARPCK_LG2(3), /* REPEATED INT64 */
-    OP_VARPCK_LG2(3), /* REPEATED UINT64 */
-    OP_VARPCK_LG2(2), /* REPEATED INT32 */
-    OP_FIXPCK_LG2(3), /* REPEATED FIXED64 */
-    OP_FIXPCK_LG2(2), /* REPEATED FIXED32 */
-    OP_VARPCK_LG2(0), /* REPEATED BOOL */
-    OP_STRING,        /* REPEATED STRING */
-    OP_SUBMSG,        /* REPEATED GROUP */
-    OP_SUBMSG,        /* REPEATED MESSAGE */
-    OP_BYTES,         /* REPEATED BYTES */
-    OP_VARPCK_LG2(2), /* REPEATED UINT32 */
-    OP_PACKED_ENUM,   /* REPEATED ENUM */
-    OP_FIXPCK_LG2(2), /* REPEATED SFIXED32 */
-    OP_FIXPCK_LG2(3), /* REPEATED SFIXED64 */
-    OP_VARPCK_LG2(2), /* REPEATED SINT32 */
-    OP_VARPCK_LG2(3), /* REPEATED SINT64 */
-    /* Omitting MSGSET_*, because we never emit a repeated msgset type */
-};
-
-typedef union {
-  bool bool_val;
-  uint32_t uint32_val;
-  uint64_t uint64_val;
-  uint32_t size;
-} wireval;
-
-static const char* decode_msg(upb_Decoder* d, const char* ptr, upb_Message* msg,
-                              const upb_MiniTable* layout);
-
-UPB_NORETURN static void* decode_err(upb_Decoder* d, upb_DecodeStatus status) {
-  assert(status != kUpb_DecodeStatus_Ok);
-  UPB_LONGJMP(d->err, status);
-}
-
-const char* fastdecode_err(upb_Decoder* d, int status) {
-  assert(status != kUpb_DecodeStatus_Ok);
-  UPB_LONGJMP(d->err, status);
-  return NULL;
-}
-static void decode_verifyutf8(upb_Decoder* d, const char* buf, int len) {
-  if (!decode_verifyutf8_inl(buf, len))
-    decode_err(d, kUpb_DecodeStatus_BadUtf8);
-}
-
-static bool decode_reserve(upb_Decoder* d, upb_Array* arr, size_t elem) {
-  bool need_realloc = arr->size - arr->len < elem;
-  if (need_realloc && !_upb_array_realloc(arr, arr->len + elem, &d->arena)) {
-    decode_err(d, kUpb_DecodeStatus_OutOfMemory);
-  }
-  return need_realloc;
-}
-
-typedef struct {
-  const char* ptr;
-  uint64_t val;
-} decode_vret;
-
-UPB_NOINLINE
-static decode_vret decode_longvarint64(const char* ptr, uint64_t val) {
-  decode_vret ret = {NULL, 0};
-  uint64_t byte;
-  int i;
-  for (i = 1; i < 10; i++) {
-    byte = (uint8_t)ptr[i];
-    val += (byte - 1) << (i * 7);
-    if (!(byte & 0x80)) {
-      ret.ptr = ptr + i + 1;
-      ret.val = val;
-      return ret;
-    }
-  }
-  return ret;
-}
-
-UPB_FORCEINLINE
-static const char* decode_varint64(upb_Decoder* d, const char* ptr,
-                                   uint64_t* val) {
-  uint64_t byte = (uint8_t)*ptr;
-  if (UPB_LIKELY((byte & 0x80) == 0)) {
-    *val = byte;
-    return ptr + 1;
-  } else {
-    decode_vret res = decode_longvarint64(ptr, byte);
-    if (!res.ptr) return decode_err(d, kUpb_DecodeStatus_Malformed);
-    *val = res.val;
-    return res.ptr;
-  }
-}
-
-UPB_FORCEINLINE
-static const char* decode_tag(upb_Decoder* d, const char* ptr, uint32_t* val) {
-  uint64_t byte = (uint8_t)*ptr;
-  if (UPB_LIKELY((byte & 0x80) == 0)) {
-    *val = byte;
-    return ptr + 1;
-  } else {
-    const char* start = ptr;
-    decode_vret res = decode_longvarint64(ptr, byte);
-    if (!res.ptr || res.ptr - start > 5 || res.val > UINT32_MAX) {
-      return decode_err(d, kUpb_DecodeStatus_Malformed);
-    }
-    *val = res.val;
-    return res.ptr;
-  }
-}
-
-UPB_FORCEINLINE
-static const char* upb_Decoder_DecodeSize(upb_Decoder* d, const char* ptr,
-                                          uint32_t* size) {
-  uint64_t size64;
-  ptr = decode_varint64(d, ptr, &size64);
-  if (size64 >= INT32_MAX || ptr - d->end + (int)size64 > d->limit) {
-    decode_err(d, kUpb_DecodeStatus_Malformed);
-  }
-  *size = size64;
-  return ptr;
-}
-
-static void decode_munge_int32(wireval* val) {
-  if (!_upb_IsLittleEndian()) {
-    /* The next stage will memcpy(dst, &val, 4) */
-    val->uint32_val = val->uint64_val;
-  }
-}
-
-static void decode_munge(int type, wireval* val) {
-  switch (type) {
-    case kUpb_FieldType_Bool:
-      val->bool_val = val->uint64_val != 0;
-      break;
-    case kUpb_FieldType_SInt32: {
-      uint32_t n = val->uint64_val;
-      val->uint32_val = (n >> 1) ^ -(int32_t)(n & 1);
-      break;
-    }
-    case kUpb_FieldType_SInt64: {
-      uint64_t n = val->uint64_val;
-      val->uint64_val = (n >> 1) ^ -(int64_t)(n & 1);
-      break;
-    }
-    case kUpb_FieldType_Int32:
-    case kUpb_FieldType_UInt32:
-    case kUpb_FieldType_Enum:
-      decode_munge_int32(val);
-      break;
-  }
-}
-
-static upb_Message* decode_newsubmsg(upb_Decoder* d,
-                                     const upb_MiniTable_Sub* subs,
-                                     const upb_MiniTable_Field* field) {
-  const upb_MiniTable* subl = subs[field->submsg_index].submsg;
-  upb_Message* msg = _upb_Message_New_inl(subl, &d->arena);
-  if (!msg) decode_err(d, kUpb_DecodeStatus_OutOfMemory);
-  return msg;
-}
-
-UPB_NOINLINE
-const char* decode_isdonefallback(upb_Decoder* d, const char* ptr,
-                                  int overrun) {
-  int status;
-  ptr = decode_isdonefallback_inl(d, ptr, overrun, &status);
-  if (ptr == NULL) {
-    return decode_err(d, status);
-  }
-  return ptr;
-}
-
-static const char* decode_readstr(upb_Decoder* d, const char* ptr, int size,
-                                  upb_StringView* str) {
-  if (d->options & kUpb_DecodeOption_AliasString) {
-    str->data = ptr;
-  } else {
-    char* data = upb_Arena_Malloc(&d->arena, size);
-    if (!data) return decode_err(d, kUpb_DecodeStatus_OutOfMemory);
-    memcpy(data, ptr, size);
-    str->data = data;
-  }
-  str->size = size;
-  return ptr + size;
-}
-
-UPB_FORCEINLINE
-static const char* decode_tosubmsg2(upb_Decoder* d, const char* ptr,
-                                    upb_Message* submsg,
-                                    const upb_MiniTable* subl, int size) {
-  int saved_delta = decode_pushlimit(d, ptr, size);
-  if (--d->depth < 0) return decode_err(d, kUpb_DecodeStatus_MaxDepthExceeded);
-  ptr = decode_msg(d, ptr, submsg, subl);
-  if (d->end_group != DECODE_NOGROUP)
-    return decode_err(d, kUpb_DecodeStatus_Malformed);
-  decode_poplimit(d, ptr, saved_delta);
-  d->depth++;
-  return ptr;
-}
-
-UPB_FORCEINLINE
-static const char* decode_tosubmsg(upb_Decoder* d, const char* ptr,
-                                   upb_Message* submsg,
-                                   const upb_MiniTable_Sub* subs,
-                                   const upb_MiniTable_Field* field, int size) {
-  return decode_tosubmsg2(d, ptr, submsg, subs[field->submsg_index].submsg,
-                          size);
-}
-
-UPB_FORCEINLINE
-static const char* decode_group(upb_Decoder* d, const char* ptr,
-                                upb_Message* submsg, const upb_MiniTable* subl,
-                                uint32_t number) {
-  if (--d->depth < 0) return decode_err(d, kUpb_DecodeStatus_MaxDepthExceeded);
-  if (decode_isdone(d, &ptr)) {
-    return decode_err(d, kUpb_DecodeStatus_Malformed);
-  }
-  ptr = decode_msg(d, ptr, submsg, subl);
-  if (d->end_group != number) return decode_err(d, kUpb_DecodeStatus_Malformed);
-  d->end_group = DECODE_NOGROUP;
-  d->depth++;
-  return ptr;
-}
-
-UPB_FORCEINLINE
-static const char* decode_togroup(upb_Decoder* d, const char* ptr,
-                                  upb_Message* submsg,
-                                  const upb_MiniTable_Sub* subs,
-                                  const upb_MiniTable_Field* field) {
-  const upb_MiniTable* subl = subs[field->submsg_index].submsg;
-  return decode_group(d, ptr, submsg, subl, field->number);
-}
-
-static char* upb_Decoder_EncodeVarint32(uint32_t val, char* ptr) {
-  do {
-    uint8_t byte = val & 0x7fU;
-    val >>= 7;
-    if (val) byte |= 0x80U;
-    *(ptr++) = byte;
-  } while (val);
-  return ptr;
-}
-
-static void upb_Decode_AddUnknownVarints(upb_Decoder* d, upb_Message* msg,
-                                         uint32_t val1, uint32_t val2) {
-  char buf[20];
-  char* end = buf;
-  end = upb_Decoder_EncodeVarint32(val1, end);
-  end = upb_Decoder_EncodeVarint32(val2, end);
-
-  if (!_upb_Message_AddUnknown(msg, buf, end - buf, &d->arena)) {
-    decode_err(d, kUpb_DecodeStatus_OutOfMemory);
-  }
-}
-
-UPB_NOINLINE
-static bool decode_checkenum_slow(upb_Decoder* d, const char* ptr,
-                                  upb_Message* msg, const upb_MiniTable_Enum* e,
-                                  const upb_MiniTable_Field* field,
-                                  uint32_t v) {
-  // OPT: binary search long lists?
-  int n = e->value_count;
-  for (int i = 0; i < n; i++) {
-    if ((uint32_t)e->values[i] == v) return true;
-  }
-
-  // Unrecognized enum goes into unknown fields.
-  // For packed fields the tag could be arbitrarily far in the past, so we
-  // just re-encode the tag and value here.
-  uint32_t tag = ((uint32_t)field->number << 3) | kUpb_WireType_Varint;
-  upb_Message* unknown_msg =
-      field->mode & kUpb_LabelFlags_IsExtension ? d->unknown_msg : msg;
-  upb_Decode_AddUnknownVarints(d, unknown_msg, tag, v);
-  return false;
-}
-
-UPB_FORCEINLINE
-static bool decode_checkenum(upb_Decoder* d, const char* ptr, upb_Message* msg,
-                             const upb_MiniTable_Enum* e,
-                             const upb_MiniTable_Field* field, wireval* val) {
-  uint32_t v = val->uint32_val;
-
-  if (UPB_LIKELY(v < 64) && UPB_LIKELY(((1ULL << v) & e->mask))) return true;
-
-  return decode_checkenum_slow(d, ptr, msg, e, field, v);
-}
-
-UPB_NOINLINE
-static const char* decode_enum_toarray(upb_Decoder* d, const char* ptr,
-                                       upb_Message* msg, upb_Array* arr,
-                                       const upb_MiniTable_Sub* subs,
-                                       const upb_MiniTable_Field* field,
-                                       wireval* val) {
-  const upb_MiniTable_Enum* e = subs[field->submsg_index].subenum;
-  if (!decode_checkenum(d, ptr, msg, e, field, val)) return ptr;
-  void* mem = UPB_PTR_AT(_upb_array_ptr(arr), arr->len * 4, void);
-  arr->len++;
-  memcpy(mem, val, 4);
-  return ptr;
-}
-
-UPB_FORCEINLINE
-static const char* decode_fixed_packed(upb_Decoder* d, const char* ptr,
-                                       upb_Array* arr, wireval* val,
-                                       const upb_MiniTable_Field* field,
-                                       int lg2) {
-  int mask = (1 << lg2) - 1;
-  size_t count = val->size >> lg2;
-  if ((val->size & mask) != 0) {
-    // Length isn't a round multiple of elem size.
-    return decode_err(d, kUpb_DecodeStatus_Malformed);
-  }
-  decode_reserve(d, arr, count);
-  void* mem = UPB_PTR_AT(_upb_array_ptr(arr), arr->len << lg2, void);
-  arr->len += count;
-  // Note: if/when the decoder supports multi-buffer input, we will need to
-  // handle buffer seams here.
-  if (_upb_IsLittleEndian()) {
-    memcpy(mem, ptr, val->size);
-    ptr += val->size;
-  } else {
-    const char* end = ptr + val->size;
-    char* dst = mem;
-    while (ptr < end) {
-      if (lg2 == 2) {
-        uint32_t val;
-        memcpy(&val, ptr, sizeof(val));
-        val = _upb_BigEndian_Swap32(val);
-        memcpy(dst, &val, sizeof(val));
-      } else {
-        UPB_ASSERT(lg2 == 3);
-        uint64_t val;
-        memcpy(&val, ptr, sizeof(val));
-        val = _upb_BigEndian_Swap64(val);
-        memcpy(dst, &val, sizeof(val));
-      }
-      ptr += 1 << lg2;
-      dst += 1 << lg2;
-    }
-  }
-
-  return ptr;
-}
-
-UPB_FORCEINLINE
-static const char* decode_varint_packed(upb_Decoder* d, const char* ptr,
-                                        upb_Array* arr, wireval* val,
-                                        const upb_MiniTable_Field* field,
-                                        int lg2) {
-  int scale = 1 << lg2;
-  int saved_limit = decode_pushlimit(d, ptr, val->size);
-  char* out = UPB_PTR_AT(_upb_array_ptr(arr), arr->len << lg2, void);
-  while (!decode_isdone(d, &ptr)) {
-    wireval elem;
-    ptr = decode_varint64(d, ptr, &elem.uint64_val);
-    decode_munge(field->descriptortype, &elem);
-    if (decode_reserve(d, arr, 1)) {
-      out = UPB_PTR_AT(_upb_array_ptr(arr), arr->len << lg2, void);
-    }
-    arr->len++;
-    memcpy(out, &elem, scale);
-    out += scale;
-  }
-  decode_poplimit(d, ptr, saved_limit);
-  return ptr;
-}
-
-UPB_NOINLINE
-static const char* decode_enum_packed(upb_Decoder* d, const char* ptr,
-                                      upb_Message* msg, upb_Array* arr,
-                                      const upb_MiniTable_Sub* subs,
-                                      const upb_MiniTable_Field* field,
-                                      wireval* val) {
-  const upb_MiniTable_Enum* e = subs[field->submsg_index].subenum;
-  int saved_limit = decode_pushlimit(d, ptr, val->size);
-  char* out = UPB_PTR_AT(_upb_array_ptr(arr), arr->len * 4, void);
-  while (!decode_isdone(d, &ptr)) {
-    wireval elem;
-    ptr = decode_varint64(d, ptr, &elem.uint64_val);
-    decode_munge_int32(&elem);
-    if (!decode_checkenum(d, ptr, msg, e, field, &elem)) {
-      continue;
-    }
-    if (decode_reserve(d, arr, 1)) {
-      out = UPB_PTR_AT(_upb_array_ptr(arr), arr->len * 4, void);
-    }
-    arr->len++;
-    memcpy(out, &elem, 4);
-    out += 4;
-  }
-  decode_poplimit(d, ptr, saved_limit);
-  return ptr;
-}
-
-static const char* decode_toarray(upb_Decoder* d, const char* ptr,
-                                  upb_Message* msg,
-                                  const upb_MiniTable_Sub* subs,
-                                  const upb_MiniTable_Field* field,
-                                  wireval* val, int op) {
-  upb_Array** arrp = UPB_PTR_AT(msg, field->offset, void);
-  upb_Array* arr = *arrp;
-  void* mem;
-
-  if (arr) {
-    decode_reserve(d, arr, 1);
-  } else {
-    size_t lg2 = desctype_to_elem_size_lg2[field->descriptortype];
-    arr = _upb_Array_New(&d->arena, 4, lg2);
-    if (!arr) return decode_err(d, kUpb_DecodeStatus_OutOfMemory);
-    *arrp = arr;
-  }
-
-  switch (op) {
-    case OP_SCALAR_LG2(0):
-    case OP_SCALAR_LG2(2):
-    case OP_SCALAR_LG2(3):
-      /* Append scalar value. */
-      mem = UPB_PTR_AT(_upb_array_ptr(arr), arr->len << op, void);
-      arr->len++;
-      memcpy(mem, val, 1 << op);
-      return ptr;
-    case OP_STRING:
-      decode_verifyutf8(d, ptr, val->size);
-      /* Fallthrough. */
-    case OP_BYTES: {
-      /* Append bytes. */
-      upb_StringView* str = (upb_StringView*)_upb_array_ptr(arr) + arr->len;
-      arr->len++;
-      return decode_readstr(d, ptr, val->size, str);
-    }
-    case OP_SUBMSG: {
-      /* Append submessage / group. */
-      upb_Message* submsg = decode_newsubmsg(d, subs, field);
-      *UPB_PTR_AT(_upb_array_ptr(arr), arr->len * sizeof(void*), upb_Message*) =
-          submsg;
-      arr->len++;
-      if (UPB_UNLIKELY(field->descriptortype == kUpb_FieldType_Group)) {
-        return decode_togroup(d, ptr, submsg, subs, field);
-      } else {
-        return decode_tosubmsg(d, ptr, submsg, subs, field, val->size);
-      }
-    }
-    case OP_FIXPCK_LG2(2):
-    case OP_FIXPCK_LG2(3):
-      return decode_fixed_packed(d, ptr, arr, val, field,
-                                 op - OP_FIXPCK_LG2(0));
-    case OP_VARPCK_LG2(0):
-    case OP_VARPCK_LG2(2):
-    case OP_VARPCK_LG2(3):
-      return decode_varint_packed(d, ptr, arr, val, field,
-                                  op - OP_VARPCK_LG2(0));
-    case OP_ENUM:
-      return decode_enum_toarray(d, ptr, msg, arr, subs, field, val);
-    case OP_PACKED_ENUM:
-      return decode_enum_packed(d, ptr, msg, arr, subs, field, val);
-    default:
-      UPB_UNREACHABLE();
-  }
-}
-
-static const char* decode_tomap(upb_Decoder* d, const char* ptr,
-                                upb_Message* msg, const upb_MiniTable_Sub* subs,
-                                const upb_MiniTable_Field* field,
-                                wireval* val) {
-  upb_Map** map_p = UPB_PTR_AT(msg, field->offset, upb_Map*);
-  upb_Map* map = *map_p;
-  upb_MapEntry ent;
-  const upb_MiniTable* entry = subs[field->submsg_index].submsg;
-
-  if (!map) {
-    /* Lazily create map. */
-    const upb_MiniTable_Field* key_field = &entry->fields[0];
-    const upb_MiniTable_Field* val_field = &entry->fields[1];
-    char key_size = desctype_to_mapsize[key_field->descriptortype];
-    char val_size = desctype_to_mapsize[val_field->descriptortype];
-    UPB_ASSERT(key_field->offset == 0);
-    UPB_ASSERT(val_field->offset == sizeof(upb_StringView));
-    map = _upb_Map_New(&d->arena, key_size, val_size);
-    *map_p = map;
-  }
-
-  /* Parse map entry. */
-  memset(&ent, 0, sizeof(ent));
-
-  if (entry->fields[1].descriptortype == kUpb_FieldType_Message ||
-      entry->fields[1].descriptortype == kUpb_FieldType_Group) {
-    /* Create proactively to handle the case where it doesn't appear. */
-    ent.v.val =
-        upb_value_ptr(_upb_Message_New(entry->subs[0].submsg, &d->arena));
-  }
-
-  const char* start = ptr;
-  ptr = decode_tosubmsg(d, ptr, &ent.k, subs, field, val->size);
-  // check if ent had any unknown fields
-  size_t size;
-  upb_Message_GetUnknown(&ent.k, &size);
-  if (size != 0) {
-    uint32_t tag = ((uint32_t)field->number << 3) | kUpb_WireType_Delimited;
-    upb_Decode_AddUnknownVarints(d, msg, tag, (uint32_t)(ptr - start));
-    if (!_upb_Message_AddUnknown(msg, start, ptr - start, &d->arena)) {
-      decode_err(d, kUpb_DecodeStatus_OutOfMemory);
-    }
-  } else {
-    if (_upb_Map_Insert(map, &ent.k, map->key_size, &ent.v, map->val_size,
-                        &d->arena) == _kUpb_MapInsertStatus_OutOfMemory) {
-      decode_err(d, kUpb_DecodeStatus_OutOfMemory);
-    }
-  }
-  return ptr;
-}
-
-static const char* decode_tomsg(upb_Decoder* d, const char* ptr,
-                                upb_Message* msg, const upb_MiniTable_Sub* subs,
-                                const upb_MiniTable_Field* field, wireval* val,
-                                int op) {
-  void* mem = UPB_PTR_AT(msg, field->offset, void);
-  int type = field->descriptortype;
-
-  if (UPB_UNLIKELY(op == OP_ENUM) &&
-      !decode_checkenum(d, ptr, msg, subs[field->submsg_index].subenum, field,
-                        val)) {
-    return ptr;
-  }
-
-  /* Set presence if necessary. */
-  if (field->presence > 0) {
-    _upb_sethas_field(msg, field);
-  } else if (field->presence < 0) {
-    /* Oneof case */
-    uint32_t* oneof_case = _upb_oneofcase_field(msg, field);
-    if (op == OP_SUBMSG && *oneof_case != field->number) {
-      memset(mem, 0, sizeof(void*));
-    }
-    *oneof_case = field->number;
-  }
-
-  /* Store into message. */
-  switch (op) {
-    case OP_SUBMSG: {
-      upb_Message** submsgp = mem;
-      upb_Message* submsg = *submsgp;
-      if (!submsg) {
-        submsg = decode_newsubmsg(d, subs, field);
-        *submsgp = submsg;
-      }
-      if (UPB_UNLIKELY(type == kUpb_FieldType_Group)) {
-        ptr = decode_togroup(d, ptr, submsg, subs, field);
-      } else {
-        ptr = decode_tosubmsg(d, ptr, submsg, subs, field, val->size);
-      }
-      break;
-    }
-    case OP_STRING:
-      decode_verifyutf8(d, ptr, val->size);
-      /* Fallthrough. */
-    case OP_BYTES:
-      return decode_readstr(d, ptr, val->size, mem);
-    case OP_SCALAR_LG2(3):
-      memcpy(mem, val, 8);
-      break;
-    case OP_ENUM:
-    case OP_SCALAR_LG2(2):
-      memcpy(mem, val, 4);
-      break;
-    case OP_SCALAR_LG2(0):
-      memcpy(mem, val, 1);
-      break;
-    default:
-      UPB_UNREACHABLE();
-  }
-
-  return ptr;
-}
-
-UPB_NOINLINE
-const char* decode_checkrequired(upb_Decoder* d, const char* ptr,
-                                 const upb_Message* msg,
-                                 const upb_MiniTable* l) {
-  assert(l->required_count);
-  if (UPB_LIKELY((d->options & kUpb_DecodeOption_CheckRequired) == 0)) {
-    return ptr;
-  }
-  uint64_t msg_head;
-  memcpy(&msg_head, msg, 8);
-  msg_head = _upb_BigEndian_Swap64(msg_head);
-  if (upb_MiniTable_requiredmask(l) & ~msg_head) {
-    d->missing_required = true;
-  }
-  return ptr;
-}
-
-UPB_FORCEINLINE
-static bool decode_tryfastdispatch(upb_Decoder* d, const char** ptr,
-                                   upb_Message* msg,
-                                   const upb_MiniTable* layout) {
-#if UPB_FASTTABLE
-  if (layout && layout->table_mask != (unsigned char)-1) {
-    uint16_t tag = fastdecode_loadtag(*ptr);
-    intptr_t table = decode_totable(layout);
-    *ptr = fastdecode_tagdispatch(d, *ptr, msg, table, 0, tag);
-    return true;
-  }
-#endif
-  return false;
-}
-
-static const char* upb_Decoder_SkipField(upb_Decoder* d, const char* ptr,
-                                         uint32_t tag) {
-  int field_number = tag >> 3;
-  int wire_type = tag & 7;
-  switch (wire_type) {
-    case kUpb_WireType_Varint: {
-      uint64_t val;
-      return decode_varint64(d, ptr, &val);
-    }
-    case kUpb_WireType_64Bit:
-      return ptr + 8;
-    case kUpb_WireType_32Bit:
-      return ptr + 4;
-    case kUpb_WireType_Delimited: {
-      uint32_t size;
-      ptr = upb_Decoder_DecodeSize(d, ptr, &size);
-      return ptr + size;
-    }
-    case kUpb_WireType_StartGroup:
-      return decode_group(d, ptr, NULL, NULL, field_number);
-    default:
-      decode_err(d, kUpb_DecodeStatus_Malformed);
-  }
-}
-
-enum {
-  kStartItemTag = ((1 << 3) | kUpb_WireType_StartGroup),
-  kEndItemTag = ((1 << 3) | kUpb_WireType_EndGroup),
-  kTypeIdTag = ((2 << 3) | kUpb_WireType_Varint),
-  kMessageTag = ((3 << 3) | kUpb_WireType_Delimited),
-};
-
-static void upb_Decoder_AddKnownMessageSetItem(
-    upb_Decoder* d, upb_Message* msg, const upb_MiniTable_Extension* item_mt,
-    const char* data, uint32_t size) {
-  upb_Message_Extension* ext =
-      _upb_Message_GetOrCreateExtension(msg, item_mt, &d->arena);
-  if (UPB_UNLIKELY(!ext)) decode_err(d, kUpb_DecodeStatus_OutOfMemory);
-  upb_Message* submsg = decode_newsubmsg(d, &ext->ext->sub, &ext->ext->field);
-  upb_DecodeStatus status = upb_Decode(data, size, submsg, item_mt->sub.submsg,
-                                       d->extreg, d->options, &d->arena);
-  memcpy(&ext->data, &submsg, sizeof(submsg));
-  if (status != kUpb_DecodeStatus_Ok) decode_err(d, status);
-}
-
-static void upb_Decoder_AddUnknownMessageSetItem(upb_Decoder* d,
-                                                 upb_Message* msg,
-                                                 uint32_t type_id,
-                                                 const char* message_data,
-                                                 uint32_t message_size) {
-  char buf[60];
-  char* ptr = buf;
-  ptr = upb_Decoder_EncodeVarint32(kStartItemTag, ptr);
-  ptr = upb_Decoder_EncodeVarint32(kTypeIdTag, ptr);
-  ptr = upb_Decoder_EncodeVarint32(type_id, ptr);
-  ptr = upb_Decoder_EncodeVarint32(kMessageTag, ptr);
-  ptr = upb_Decoder_EncodeVarint32(message_size, ptr);
-  char* split = ptr;
-
-  ptr = upb_Decoder_EncodeVarint32(kEndItemTag, ptr);
-  char* end = ptr;
-
-  if (!_upb_Message_AddUnknown(msg, buf, split - buf, &d->arena) ||
-      !_upb_Message_AddUnknown(msg, message_data, message_size, &d->arena) ||
-      !_upb_Message_AddUnknown(msg, split, end - split, &d->arena)) {
-    decode_err(d, kUpb_DecodeStatus_OutOfMemory);
-  }
-}
-
-static void upb_Decoder_AddMessageSetItem(upb_Decoder* d, upb_Message* msg,
-                                          const upb_MiniTable* layout,
-                                          uint32_t type_id, const char* data,
-                                          uint32_t size) {
-  const upb_MiniTable_Extension* item_mt =
-      _upb_extreg_get(d->extreg, layout, type_id);
-  if (item_mt) {
-    upb_Decoder_AddKnownMessageSetItem(d, msg, item_mt, data, size);
-  } else {
-    upb_Decoder_AddUnknownMessageSetItem(d, msg, type_id, data, size);
-  }
-}
-
-static const char* upb_Decoder_DecodeMessageSetItem(
-    upb_Decoder* d, const char* ptr, upb_Message* msg,
-    const upb_MiniTable* layout) {
-  uint32_t type_id = 0;
-  upb_StringView preserved = {NULL, 0};
-  typedef enum {
-    kUpb_HaveId = 1 << 0,
-    kUpb_HavePayload = 1 << 1,
-  } StateMask;
-  StateMask state_mask = 0;
-  while (!decode_isdone(d, &ptr)) {
-    uint32_t tag;
-    ptr = decode_tag(d, ptr, &tag);
-    switch (tag) {
-      case kEndItemTag:
-        return ptr;
-      case kTypeIdTag: {
-        uint64_t tmp;
-        ptr = decode_varint64(d, ptr, &tmp);
-        if (state_mask & kUpb_HaveId) break;  // Ignore dup.
-        state_mask |= kUpb_HaveId;
-        type_id = tmp;
-        if (state_mask & kUpb_HavePayload) {
-          upb_Decoder_AddMessageSetItem(d, msg, layout, type_id, preserved.data,
-                                        preserved.size);
-        }
-        break;
-      }
-      case kMessageTag: {
-        uint32_t size;
-        ptr = upb_Decoder_DecodeSize(d, ptr, &size);
-        const char* data = ptr;
-        ptr += size;
-        if (state_mask & kUpb_HavePayload) break;  // Ignore dup.
-        state_mask |= kUpb_HavePayload;
-        if (state_mask & kUpb_HaveId) {
-          upb_Decoder_AddMessageSetItem(d, msg, layout, type_id, data, size);
-        } else {
-          // Out of order, we must preserve the payload.
-          preserved.data = data;
-          preserved.size = size;
-        }
-        break;
-      }
-      default:
-        // We do not preserve unexpected fields inside a message set item.
-        ptr = upb_Decoder_SkipField(d, ptr, tag);
-        break;
-    }
-  }
-  decode_err(d, kUpb_DecodeStatus_Malformed);
-}
-
-static const upb_MiniTable_Field* decode_findfield(upb_Decoder* d,
-                                                   const upb_MiniTable* l,
-                                                   uint32_t field_number,
-                                                   int* last_field_index) {
-  static upb_MiniTable_Field none = {0, 0, 0, 0, 0, 0};
-  if (l == NULL) return &none;
-
-  size_t idx = ((size_t)field_number) - 1;  // 0 wraps to SIZE_MAX
-  if (idx < l->dense_below) {
-    /* Fastest case: index into dense fields. */
-    goto found;
-  }
-
-  if (l->dense_below < l->field_count) {
-    /* Linear search non-dense fields. Resume scanning from last_field_index
-     * since fields are usually in order. */
-    int last = *last_field_index;
-    for (idx = last; idx < l->field_count; idx++) {
-      if (l->fields[idx].number == field_number) {
-        goto found;
-      }
-    }
-
-    for (idx = l->dense_below; idx < last; idx++) {
-      if (l->fields[idx].number == field_number) {
-        goto found;
-      }
-    }
-  }
-
-  if (d->extreg) {
-    switch (l->ext) {
-      case kUpb_ExtMode_Extendable: {
-        const upb_MiniTable_Extension* ext =
-            _upb_extreg_get(d->extreg, l, field_number);
-        if (ext) return &ext->field;
-        break;
-      }
-      case kUpb_ExtMode_IsMessageSet:
-        if (field_number == _UPB_MSGSET_ITEM) {
-          static upb_MiniTable_Field item = {0, 0, 0, 0, TYPE_MSGSET_ITEM, 0};
-          return &item;
-        }
-        break;
-    }
-  }
-
-  return &none; /* Unknown field. */
-
-found:
-  UPB_ASSERT(l->fields[idx].number == field_number);
-  *last_field_index = idx;
-  return &l->fields[idx];
-}
-
-UPB_FORCEINLINE
-static const char* decode_wireval(upb_Decoder* d, const char* ptr,
-                                  const upb_MiniTable_Field* field,
-                                  int wire_type, wireval* val, int* op) {
-  switch (wire_type) {
-    case kUpb_WireType_Varint:
-      ptr = decode_varint64(d, ptr, &val->uint64_val);
-      *op = varint_ops[field->descriptortype];
-      decode_munge(field->descriptortype, val);
-      return ptr;
-    case kUpb_WireType_32Bit:
-      memcpy(&val->uint32_val, ptr, 4);
-      val->uint32_val = _upb_BigEndian_Swap32(val->uint32_val);
-      *op = OP_SCALAR_LG2(2);
-      if (((1 << field->descriptortype) & FIXED32_OK_MASK) == 0) {
-        *op = OP_UNKNOWN;
-      }
-      return ptr + 4;
-    case kUpb_WireType_64Bit:
-      memcpy(&val->uint64_val, ptr, 8);
-      val->uint64_val = _upb_BigEndian_Swap64(val->uint64_val);
-      *op = OP_SCALAR_LG2(3);
-      if (((1 << field->descriptortype) & FIXED64_OK_MASK) == 0) {
-        *op = OP_UNKNOWN;
-      }
-      return ptr + 8;
-    case kUpb_WireType_Delimited: {
-      int ndx = field->descriptortype;
-      if (upb_FieldMode_Get(field) == kUpb_FieldMode_Array) ndx += TYPE_COUNT;
-      ptr = upb_Decoder_DecodeSize(d, ptr, &val->size);
-      *op = delim_ops[ndx];
-      return ptr;
-    }
-    case kUpb_WireType_StartGroup:
-      val->uint32_val = field->number;
-      if (field->descriptortype == kUpb_FieldType_Group) {
-        *op = OP_SUBMSG;
-      } else if (field->descriptortype == TYPE_MSGSET_ITEM) {
-        *op = OP_MSGSET_ITEM;
-      } else {
-        *op = OP_UNKNOWN;
-      }
-      return ptr;
-    default:
-      break;
-  }
-  return decode_err(d, kUpb_DecodeStatus_Malformed);
-}
-
-UPB_FORCEINLINE
-static const char* decode_known(upb_Decoder* d, const char* ptr,
-                                upb_Message* msg, const upb_MiniTable* layout,
-                                const upb_MiniTable_Field* field, int op,
-                                wireval* val) {
-  const upb_MiniTable_Sub* subs = layout->subs;
-  uint8_t mode = field->mode;
-
-  if (UPB_UNLIKELY(mode & kUpb_LabelFlags_IsExtension)) {
-    const upb_MiniTable_Extension* ext_layout =
-        (const upb_MiniTable_Extension*)field;
-    upb_Message_Extension* ext =
-        _upb_Message_GetOrCreateExtension(msg, ext_layout, &d->arena);
-    if (UPB_UNLIKELY(!ext)) return decode_err(d, kUpb_DecodeStatus_OutOfMemory);
-    d->unknown_msg = msg;
-    msg = &ext->data;
-    subs = &ext->ext->sub;
-  }
-
-  switch (mode & kUpb_FieldMode_Mask) {
-    case kUpb_FieldMode_Array:
-      return decode_toarray(d, ptr, msg, subs, field, val, op);
-    case kUpb_FieldMode_Map:
-      return decode_tomap(d, ptr, msg, subs, field, val);
-    case kUpb_FieldMode_Scalar:
-      return decode_tomsg(d, ptr, msg, subs, field, val, op);
-    default:
-      UPB_UNREACHABLE();
-  }
-}
-
-static const char* decode_reverse_skip_varint(const char* ptr, uint32_t val) {
-  uint32_t seen = 0;
-  do {
-    ptr--;
-    seen <<= 7;
-    seen |= *ptr & 0x7f;
-  } while (seen != val);
-  return ptr;
-}
-
-static const char* decode_unknown(upb_Decoder* d, const char* ptr,
-                                  upb_Message* msg, int field_number,
-                                  int wire_type, wireval val) {
-  if (field_number == 0) return decode_err(d, kUpb_DecodeStatus_Malformed);
-
-  // Since unknown fields are the uncommon case, we do a little extra work here
-  // to walk backwards through the buffer to find the field start.  This frees
-  // up a register in the fast paths (when the field is known), which leads to
-  // significant speedups in benchmarks.
-  const char* start = ptr;
-
-  if (wire_type == kUpb_WireType_Delimited) ptr += val.size;
-  if (msg) {
-    switch (wire_type) {
-      case kUpb_WireType_Varint:
-      case kUpb_WireType_Delimited:
-        start--;
-        while (start[-1] & 0x80) start--;
-        break;
-      case kUpb_WireType_32Bit:
-        start -= 4;
-        break;
-      case kUpb_WireType_64Bit:
-        start -= 8;
-        break;
-      default:
-        break;
-    }
-
-    assert(start == d->debug_valstart);
-    uint32_t tag = ((uint32_t)field_number << 3) | wire_type;
-    start = decode_reverse_skip_varint(start, tag);
-    assert(start == d->debug_tagstart);
-
-    if (wire_type == kUpb_WireType_StartGroup) {
-      d->unknown = start;
-      d->unknown_msg = msg;
-      ptr = decode_group(d, ptr, NULL, NULL, field_number);
-      start = d->unknown;
-      d->unknown = NULL;
-    }
-    if (!_upb_Message_AddUnknown(msg, start, ptr - start, &d->arena)) {
-      return decode_err(d, kUpb_DecodeStatus_OutOfMemory);
-    }
-  } else if (wire_type == kUpb_WireType_StartGroup) {
-    ptr = decode_group(d, ptr, NULL, NULL, field_number);
-  }
-  return ptr;
-}
-
-UPB_NOINLINE
-static const char* decode_msg(upb_Decoder* d, const char* ptr, upb_Message* msg,
-                              const upb_MiniTable* layout) {
-  int last_field_index = 0;
-
-#if UPB_FASTTABLE
-  // The first time we want to skip fast dispatch, because we may have just been
-  // invoked by the fast parser to handle a case that it bailed on.
-  if (!decode_isdone(d, &ptr)) goto nofast;
-#endif
-
-  while (!decode_isdone(d, &ptr)) {
-    uint32_t tag;
-    const upb_MiniTable_Field* field;
-    int field_number;
-    int wire_type;
-    wireval val;
-    int op;
-
-    if (decode_tryfastdispatch(d, &ptr, msg, layout)) break;
-
-#if UPB_FASTTABLE
-  nofast:
-#endif
-
-#ifndef NDEBUG
-    d->debug_tagstart = ptr;
-#endif
-
-    UPB_ASSERT(ptr < d->limit_ptr);
-    ptr = decode_tag(d, ptr, &tag);
-    field_number = tag >> 3;
-    wire_type = tag & 7;
-
-#ifndef NDEBUG
-    d->debug_valstart = ptr;
-#endif
-
-    if (wire_type == kUpb_WireType_EndGroup) {
-      d->end_group = field_number;
-      return ptr;
-    }
-
-    field = decode_findfield(d, layout, field_number, &last_field_index);
-    ptr = decode_wireval(d, ptr, field, wire_type, &val, &op);
-
-    if (op >= 0) {
-      ptr = decode_known(d, ptr, msg, layout, field, op, &val);
-    } else {
-      switch (op) {
-        case OP_UNKNOWN:
-          ptr = decode_unknown(d, ptr, msg, field_number, wire_type, val);
-          break;
-        case OP_MSGSET_ITEM:
-          ptr = upb_Decoder_DecodeMessageSetItem(d, ptr, msg, layout);
-          break;
-      }
-    }
-  }
-
-  return UPB_UNLIKELY(layout && layout->required_count)
-             ? decode_checkrequired(d, ptr, msg, layout)
-             : ptr;
-}
-
-const char* fastdecode_generic(struct upb_Decoder* d, const char* ptr,
-                               upb_Message* msg, intptr_t table,
-                               uint64_t hasbits, uint64_t data) {
-  (void)data;
-  *(uint32_t*)msg |= hasbits;
-  return decode_msg(d, ptr, msg, decode_totablep(table));
-}
-
-static upb_DecodeStatus decode_top(struct upb_Decoder* d, const char* buf,
-                                   void* msg, const upb_MiniTable* l) {
-  if (!decode_tryfastdispatch(d, &buf, msg, l)) {
-    decode_msg(d, buf, msg, l);
-  }
-  if (d->end_group != DECODE_NOGROUP) return kUpb_DecodeStatus_Malformed;
-  if (d->missing_required) return kUpb_DecodeStatus_MissingRequired;
-  return kUpb_DecodeStatus_Ok;
-}
-
-upb_DecodeStatus upb_Decode(const char* buf, size_t size, void* msg,
-                            const upb_MiniTable* l,
-                            const upb_ExtensionRegistry* extreg, int options,
-                            upb_Arena* arena) {
-  upb_Decoder state;
-  unsigned depth = (unsigned)options >> 16;
-
-  if (size <= 16) {
-    memset(&state.patch, 0, 32);
-    if (size) memcpy(&state.patch, buf, size);
-    buf = state.patch;
-    state.end = buf + size;
-    state.limit = 0;
-    options &= ~kUpb_DecodeOption_AliasString;  // Can't alias patch buf.
-  } else {
-    state.end = buf + size - 16;
-    state.limit = 16;
-  }
-
-  state.extreg = extreg;
-  state.limit_ptr = state.end;
-  state.unknown = NULL;
-  state.depth = depth ? depth : 64;
-  state.end_group = DECODE_NOGROUP;
-  state.options = (uint16_t)options;
-  state.missing_required = false;
-  state.arena.head = arena->head;
-  state.arena.last_size = arena->last_size;
-  state.arena.cleanup_metadata = arena->cleanup_metadata;
-  state.arena.parent = arena;
-
-  upb_DecodeStatus status = UPB_SETJMP(state.err);
-  if (UPB_LIKELY(status == kUpb_DecodeStatus_Ok)) {
-    status = decode_top(&state, buf, msg, l);
-  }
-
-  arena->head.ptr = state.arena.head.ptr;
-  arena->head.end = state.arena.head.end;
-  arena->cleanup_metadata = state.arena.cleanup_metadata;
-  return status;
-}
-
-#undef OP_UNKNOWN
-#undef OP_SKIP
-#undef OP_SCALAR_LG2
-#undef OP_FIXPCK_LG2
-#undef OP_VARPCK_LG2
-#undef OP_STRING
-#undef OP_BYTES
-#undef OP_SUBMSG
-
-/** upb/encode.c ************************************************************/
-/* We encode backwards, to avoid pre-computing lengths (one-pass encode). */
-
-
-#include <setjmp.h>
-#include <string.h>
-
-
-/* Must be last. */
-
-#define UPB_PB_VARINT_MAX_LEN 10
-
-UPB_NOINLINE
-static size_t encode_varint64(uint64_t val, char* buf) {
-  size_t i = 0;
-  do {
-    uint8_t byte = val & 0x7fU;
-    val >>= 7;
-    if (val) byte |= 0x80U;
-    buf[i++] = byte;
-  } while (val);
-  return i;
-}
-
-static uint32_t encode_zz32(int32_t n) {
-  return ((uint32_t)n << 1) ^ (n >> 31);
-}
-static uint64_t encode_zz64(int64_t n) {
-  return ((uint64_t)n << 1) ^ (n >> 63);
-}
-
-typedef struct {
-  jmp_buf err;
-  upb_alloc* alloc;
-  char *buf, *ptr, *limit;
-  int options;
-  int depth;
-  _upb_mapsorter sorter;
-} upb_encstate;
-
-static size_t upb_roundup_pow2(size_t bytes) {
-  size_t ret = 128;
-  while (ret < bytes) {
-    ret *= 2;
-  }
-  return ret;
-}
-
-UPB_NORETURN static void encode_err(upb_encstate* e) { UPB_LONGJMP(e->err, 1); }
-
-UPB_NOINLINE
-static void encode_growbuffer(upb_encstate* e, size_t bytes) {
-  size_t old_size = e->limit - e->buf;
-  size_t new_size = upb_roundup_pow2(bytes + (e->limit - e->ptr));
-  char* new_buf = upb_realloc(e->alloc, e->buf, old_size, new_size);
-
-  if (!new_buf) encode_err(e);
-
-  /* We want previous data at the end, realloc() put it at the beginning. */
-  if (old_size > 0) {
-    memmove(new_buf + new_size - old_size, e->buf, old_size);
-  }
-
-  e->ptr = new_buf + new_size - (e->limit - e->ptr);
-  e->limit = new_buf + new_size;
-  e->buf = new_buf;
-
-  e->ptr -= bytes;
-}
-
-/* Call to ensure that at least "bytes" bytes are available for writing at
- * e->ptr.  Returns false if the bytes could not be allocated. */
-UPB_FORCEINLINE
-static void encode_reserve(upb_encstate* e, size_t bytes) {
-  if ((size_t)(e->ptr - e->buf) < bytes) {
-    encode_growbuffer(e, bytes);
-    return;
-  }
-
-  e->ptr -= bytes;
-}
-
-/* Writes the given bytes to the buffer, handling reserve/advance. */
-static void encode_bytes(upb_encstate* e, const void* data, size_t len) {
-  if (len == 0) return; /* memcpy() with zero size is UB */
-  encode_reserve(e, len);
-  memcpy(e->ptr, data, len);
-}
-
-static void encode_fixed64(upb_encstate* e, uint64_t val) {
-  val = _upb_BigEndian_Swap64(val);
-  encode_bytes(e, &val, sizeof(uint64_t));
-}
-
-static void encode_fixed32(upb_encstate* e, uint32_t val) {
-  val = _upb_BigEndian_Swap32(val);
-  encode_bytes(e, &val, sizeof(uint32_t));
-}
-
-UPB_NOINLINE
-static void encode_longvarint(upb_encstate* e, uint64_t val) {
-  size_t len;
-  char* start;
-
-  encode_reserve(e, UPB_PB_VARINT_MAX_LEN);
-  len = encode_varint64(val, e->ptr);
-  start = e->ptr + UPB_PB_VARINT_MAX_LEN - len;
-  memmove(start, e->ptr, len);
-  e->ptr = start;
-}
-
-UPB_FORCEINLINE
-static void encode_varint(upb_encstate* e, uint64_t val) {
-  if (val < 128 && e->ptr != e->buf) {
-    --e->ptr;
-    *e->ptr = val;
-  } else {
-    encode_longvarint(e, val);
-  }
-}
-
-static void encode_double(upb_encstate* e, double d) {
-  uint64_t u64;
-  UPB_ASSERT(sizeof(double) == sizeof(uint64_t));
-  memcpy(&u64, &d, sizeof(uint64_t));
-  encode_fixed64(e, u64);
-}
-
-static void encode_float(upb_encstate* e, float d) {
-  uint32_t u32;
-  UPB_ASSERT(sizeof(float) == sizeof(uint32_t));
-  memcpy(&u32, &d, sizeof(uint32_t));
-  encode_fixed32(e, u32);
-}
-
-static void encode_tag(upb_encstate* e, uint32_t field_number,
-                       uint8_t wire_type) {
-  encode_varint(e, (field_number << 3) | wire_type);
-}
-
-static void encode_fixedarray(upb_encstate* e, const upb_Array* arr,
-                              size_t elem_size, uint32_t tag) {
-  size_t bytes = arr->len * elem_size;
-  const char* data = _upb_array_constptr(arr);
-  const char* ptr = data + bytes - elem_size;
-
-  if (tag || !_upb_IsLittleEndian()) {
-    while (true) {
-      if (elem_size == 4) {
-        uint32_t val;
-        memcpy(&val, ptr, sizeof(val));
-        val = _upb_BigEndian_Swap32(val);
-        encode_bytes(e, &val, elem_size);
-      } else {
-        UPB_ASSERT(elem_size == 8);
-        uint64_t val;
-        memcpy(&val, ptr, sizeof(val));
-        val = _upb_BigEndian_Swap64(val);
-        encode_bytes(e, &val, elem_size);
-      }
-
-      if (tag) encode_varint(e, tag);
-      if (ptr == data) break;
-      ptr -= elem_size;
-    }
-  } else {
-    encode_bytes(e, data, bytes);
-  }
-}
-
-static void encode_message(upb_encstate* e, const upb_Message* msg,
-                           const upb_MiniTable* m, size_t* size);
-
-static void encode_scalar(upb_encstate* e, const void* _field_mem,
-                          const upb_MiniTable_Sub* subs,
-                          const upb_MiniTable_Field* f) {
-  const char* field_mem = _field_mem;
-  int wire_type;
-
-#define CASE(ctype, type, wtype, encodeval) \
-  {                                         \
-    ctype val = *(ctype*)field_mem;         \
-    encode_##type(e, encodeval);            \
-    wire_type = wtype;                      \
-    break;                                  \
-  }
-
-  switch (f->descriptortype) {
-    case kUpb_FieldType_Double:
-      CASE(double, double, kUpb_WireType_64Bit, val);
-    case kUpb_FieldType_Float:
-      CASE(float, float, kUpb_WireType_32Bit, val);
-    case kUpb_FieldType_Int64:
-    case kUpb_FieldType_UInt64:
-      CASE(uint64_t, varint, kUpb_WireType_Varint, val);
-    case kUpb_FieldType_UInt32:
-      CASE(uint32_t, varint, kUpb_WireType_Varint, val);
-    case kUpb_FieldType_Int32:
-    case kUpb_FieldType_Enum:
-      CASE(int32_t, varint, kUpb_WireType_Varint, (int64_t)val);
-    case kUpb_FieldType_SFixed64:
-    case kUpb_FieldType_Fixed64:
-      CASE(uint64_t, fixed64, kUpb_WireType_64Bit, val);
-    case kUpb_FieldType_Fixed32:
-    case kUpb_FieldType_SFixed32:
-      CASE(uint32_t, fixed32, kUpb_WireType_32Bit, val);
-    case kUpb_FieldType_Bool:
-      CASE(bool, varint, kUpb_WireType_Varint, val);
-    case kUpb_FieldType_SInt32:
-      CASE(int32_t, varint, kUpb_WireType_Varint, encode_zz32(val));
-    case kUpb_FieldType_SInt64:
-      CASE(int64_t, varint, kUpb_WireType_Varint, encode_zz64(val));
-    case kUpb_FieldType_String:
-    case kUpb_FieldType_Bytes: {
-      upb_StringView view = *(upb_StringView*)field_mem;
-      encode_bytes(e, view.data, view.size);
-      encode_varint(e, view.size);
-      wire_type = kUpb_WireType_Delimited;
-      break;
-    }
-    case kUpb_FieldType_Group: {
-      size_t size;
-      void* submsg = *(void**)field_mem;
-      const upb_MiniTable* subm = subs[f->submsg_index].submsg;
-      if (submsg == NULL) {
-        return;
-      }
-      if (--e->depth == 0) encode_err(e);
-      encode_tag(e, f->number, kUpb_WireType_EndGroup);
-      encode_message(e, submsg, subm, &size);
-      wire_type = kUpb_WireType_StartGroup;
-      e->depth++;
-      break;
-    }
-    case kUpb_FieldType_Message: {
-      size_t size;
-      void* submsg = *(void**)field_mem;
-      const upb_MiniTable* subm = subs[f->submsg_index].submsg;
-      if (submsg == NULL) {
-        return;
-      }
-      if (--e->depth == 0) encode_err(e);
-      encode_message(e, submsg, subm, &size);
-      encode_varint(e, size);
-      wire_type = kUpb_WireType_Delimited;
-      e->depth++;
-      break;
-    }
-    default:
-      UPB_UNREACHABLE();
-  }
-#undef CASE
-
-  encode_tag(e, f->number, wire_type);
-}
-
-static void encode_array(upb_encstate* e, const upb_Message* msg,
-                         const upb_MiniTable_Sub* subs,
-                         const upb_MiniTable_Field* f) {
-  const upb_Array* arr = *UPB_PTR_AT(msg, f->offset, upb_Array*);
-  bool packed = f->mode & kUpb_LabelFlags_IsPacked;
-  size_t pre_len = e->limit - e->ptr;
-
-  if (arr == NULL || arr->len == 0) {
-    return;
-  }
-
-#define VARINT_CASE(ctype, encode)                                       \
-  {                                                                      \
-    const ctype* start = _upb_array_constptr(arr);                       \
-    const ctype* ptr = start + arr->len;                                 \
-    uint32_t tag = packed ? 0 : (f->number << 3) | kUpb_WireType_Varint; \
-    do {                                                                 \
-      ptr--;                                                             \
-      encode_varint(e, encode);                                          \
-      if (tag) encode_varint(e, tag);                                    \
-    } while (ptr != start);                                              \
-  }                                                                      \
-  break;
-
-#define TAG(wire_type) (packed ? 0 : (f->number << 3 | wire_type))
-
-  switch (f->descriptortype) {
-    case kUpb_FieldType_Double:
-      encode_fixedarray(e, arr, sizeof(double), TAG(kUpb_WireType_64Bit));
-      break;
-    case kUpb_FieldType_Float:
-      encode_fixedarray(e, arr, sizeof(float), TAG(kUpb_WireType_32Bit));
-      break;
-    case kUpb_FieldType_SFixed64:
-    case kUpb_FieldType_Fixed64:
-      encode_fixedarray(e, arr, sizeof(uint64_t), TAG(kUpb_WireType_64Bit));
-      break;
-    case kUpb_FieldType_Fixed32:
-    case kUpb_FieldType_SFixed32:
-      encode_fixedarray(e, arr, sizeof(uint32_t), TAG(kUpb_WireType_32Bit));
-      break;
-    case kUpb_FieldType_Int64:
-    case kUpb_FieldType_UInt64:
-      VARINT_CASE(uint64_t, *ptr);
-    case kUpb_FieldType_UInt32:
-      VARINT_CASE(uint32_t, *ptr);
-    case kUpb_FieldType_Int32:
-    case kUpb_FieldType_Enum:
-      VARINT_CASE(int32_t, (int64_t)*ptr);
-    case kUpb_FieldType_Bool:
-      VARINT_CASE(bool, *ptr);
-    case kUpb_FieldType_SInt32:
-      VARINT_CASE(int32_t, encode_zz32(*ptr));
-    case kUpb_FieldType_SInt64:
-      VARINT_CASE(int64_t, encode_zz64(*ptr));
-    case kUpb_FieldType_String:
-    case kUpb_FieldType_Bytes: {
-      const upb_StringView* start = _upb_array_constptr(arr);
-      const upb_StringView* ptr = start + arr->len;
-      do {
-        ptr--;
-        encode_bytes(e, ptr->data, ptr->size);
-        encode_varint(e, ptr->size);
-        encode_tag(e, f->number, kUpb_WireType_Delimited);
-      } while (ptr != start);
-      return;
-    }
-    case kUpb_FieldType_Group: {
-      const void* const* start = _upb_array_constptr(arr);
-      const void* const* ptr = start + arr->len;
-      const upb_MiniTable* subm = subs[f->submsg_index].submsg;
-      if (--e->depth == 0) encode_err(e);
-      do {
-        size_t size;
-        ptr--;
-        encode_tag(e, f->number, kUpb_WireType_EndGroup);
-        encode_message(e, *ptr, subm, &size);
-        encode_tag(e, f->number, kUpb_WireType_StartGroup);
-      } while (ptr != start);
-      e->depth++;
-      return;
-    }
-    case kUpb_FieldType_Message: {
-      const void* const* start = _upb_array_constptr(arr);
-      const void* const* ptr = start + arr->len;
-      const upb_MiniTable* subm = subs[f->submsg_index].submsg;
-      if (--e->depth == 0) encode_err(e);
-      do {
-        size_t size;
-        ptr--;
-        encode_message(e, *ptr, subm, &size);
-        encode_varint(e, size);
-        encode_tag(e, f->number, kUpb_WireType_Delimited);
-      } while (ptr != start);
-      e->depth++;
-      return;
-    }
-  }
-#undef VARINT_CASE
-
-  if (packed) {
-    encode_varint(e, e->limit - e->ptr - pre_len);
-    encode_tag(e, f->number, kUpb_WireType_Delimited);
-  }
-}
-
-static void encode_mapentry(upb_encstate* e, uint32_t number,
-                            const upb_MiniTable* layout,
-                            const upb_MapEntry* ent) {
-  const upb_MiniTable_Field* key_field = &layout->fields[0];
-  const upb_MiniTable_Field* val_field = &layout->fields[1];
-  size_t pre_len = e->limit - e->ptr;
-  size_t size;
-  encode_scalar(e, &ent->v, layout->subs, val_field);
-  encode_scalar(e, &ent->k, layout->subs, key_field);
-  size = (e->limit - e->ptr) - pre_len;
-  encode_varint(e, size);
-  encode_tag(e, number, kUpb_WireType_Delimited);
-}
-
-static void encode_map(upb_encstate* e, const upb_Message* msg,
-                       const upb_MiniTable_Sub* subs,
-                       const upb_MiniTable_Field* f) {
-  const upb_Map* map = *UPB_PTR_AT(msg, f->offset, const upb_Map*);
-  const upb_MiniTable* layout = subs[f->submsg_index].submsg;
-  UPB_ASSERT(layout->field_count == 2);
-
-  if (map == NULL) return;
-
-  if (e->options & kUpb_Encode_Deterministic) {
-    _upb_sortedmap sorted;
-    _upb_mapsorter_pushmap(&e->sorter, layout->fields[0].descriptortype, map,
-                           &sorted);
-    upb_MapEntry ent;
-    while (_upb_sortedmap_next(&e->sorter, map, &sorted, &ent)) {
-      encode_mapentry(e, f->number, layout, &ent);
-    }
-    _upb_mapsorter_popmap(&e->sorter, &sorted);
-  } else {
-    upb_strtable_iter i;
-    upb_strtable_begin(&i, &map->table);
-    for (; !upb_strtable_done(&i); upb_strtable_next(&i)) {
-      upb_StringView key = upb_strtable_iter_key(&i);
-      const upb_value val = upb_strtable_iter_value(&i);
-      upb_MapEntry ent;
-      _upb_map_fromkey(key, &ent.k, map->key_size);
-      _upb_map_fromvalue(val, &ent.v, map->val_size);
-      encode_mapentry(e, f->number, layout, &ent);
-    }
-  }
-}
-
-static bool encode_shouldencode(upb_encstate* e, const upb_Message* msg,
-                                const upb_MiniTable_Sub* subs,
-                                const upb_MiniTable_Field* f) {
-  if (f->presence == 0) {
-    /* Proto3 presence or map/array. */
-    const void* mem = UPB_PTR_AT(msg, f->offset, void);
-    switch (f->mode >> kUpb_FieldRep_Shift) {
-      case kUpb_FieldRep_1Byte: {
-        char ch;
-        memcpy(&ch, mem, 1);
-        return ch != 0;
-      }
-#if UINTPTR_MAX == 0xffffffff
-      case kUpb_FieldRep_Pointer:
-#endif
-      case kUpb_FieldRep_4Byte: {
-        uint32_t u32;
-        memcpy(&u32, mem, 4);
-        return u32 != 0;
-      }
-#if UINTPTR_MAX != 0xffffffff
-      case kUpb_FieldRep_Pointer:
-#endif
-      case kUpb_FieldRep_8Byte: {
-        uint64_t u64;
-        memcpy(&u64, mem, 8);
-        return u64 != 0;
-      }
-      case kUpb_FieldRep_StringView: {
-        const upb_StringView* str = (const upb_StringView*)mem;
-        return str->size != 0;
-      }
-      default:
-        UPB_UNREACHABLE();
-    }
-  } else if (f->presence > 0) {
-    /* Proto2 presence: hasbit. */
-    return _upb_hasbit_field(msg, f);
-  } else {
-    /* Field is in a oneof. */
-    return _upb_getoneofcase_field(msg, f) == f->number;
-  }
-}
-
-static void encode_field(upb_encstate* e, const upb_Message* msg,
-                         const upb_MiniTable_Sub* subs,
-                         const upb_MiniTable_Field* field) {
-  switch (upb_FieldMode_Get(field)) {
-    case kUpb_FieldMode_Array:
-      encode_array(e, msg, subs, field);
-      break;
-    case kUpb_FieldMode_Map:
-      encode_map(e, msg, subs, field);
-      break;
-    case kUpb_FieldMode_Scalar:
-      encode_scalar(e, UPB_PTR_AT(msg, field->offset, void), subs, field);
-      break;
-    default:
-      UPB_UNREACHABLE();
-  }
-}
-
-/* message MessageSet {
- *   repeated group Item = 1 {
- *     required int32 type_id = 2;
- *     required string message = 3;
- *   }
- * } */
-static void encode_msgset_item(upb_encstate* e,
-                               const upb_Message_Extension* ext) {
-  size_t size;
-  encode_tag(e, 1, kUpb_WireType_EndGroup);
-  encode_message(e, ext->data.ptr, ext->ext->sub.submsg, &size);
-  encode_varint(e, size);
-  encode_tag(e, 3, kUpb_WireType_Delimited);
-  encode_varint(e, ext->ext->field.number);
-  encode_tag(e, 2, kUpb_WireType_Varint);
-  encode_tag(e, 1, kUpb_WireType_StartGroup);
-}
-
-static void encode_message(upb_encstate* e, const upb_Message* msg,
-                           const upb_MiniTable* m, size_t* size) {
-  size_t pre_len = e->limit - e->ptr;
-
-  if ((e->options & kUpb_Encode_CheckRequired) && m->required_count) {
-    uint64_t msg_head;
-    memcpy(&msg_head, msg, 8);
-    msg_head = _upb_BigEndian_Swap64(msg_head);
-    if (upb_MiniTable_requiredmask(m) & ~msg_head) {
-      encode_err(e);
-    }
-  }
-
-  if ((e->options & kUpb_Encode_SkipUnknown) == 0) {
-    size_t unknown_size;
-    const char* unknown = upb_Message_GetUnknown(msg, &unknown_size);
-
-    if (unknown) {
-      encode_bytes(e, unknown, unknown_size);
-    }
-  }
-
-  if (m->ext != kUpb_ExtMode_NonExtendable) {
-    /* Encode all extensions together. Unlike C++, we do not attempt to keep
-     * these in field number order relative to normal fields or even to each
-     * other. */
-    size_t ext_count;
-    const upb_Message_Extension* ext = _upb_Message_Getexts(msg, &ext_count);
-    if (ext_count) {
-      const upb_Message_Extension* end = ext + ext_count;
-      for (; ext != end; ext++) {
-        if (UPB_UNLIKELY(m->ext == kUpb_ExtMode_IsMessageSet)) {
-          encode_msgset_item(e, ext);
-        } else {
-          encode_field(e, &ext->data, &ext->ext->sub, &ext->ext->field);
-        }
-      }
-    }
-  }
-
-  if (m->field_count) {
-    const upb_MiniTable_Field* f = &m->fields[m->field_count];
-    const upb_MiniTable_Field* first = &m->fields[0];
-    while (f != first) {
-      f--;
-      if (encode_shouldencode(e, msg, m->subs, f)) {
-        encode_field(e, msg, m->subs, f);
-      }
-    }
-  }
-
-  *size = (e->limit - e->ptr) - pre_len;
-}
-
-char* upb_Encode(const void* msg, const upb_MiniTable* l, int options,
-                 upb_Arena* arena, size_t* size) {
-  upb_encstate e;
-  unsigned depth = (unsigned)options >> 16;
-
-  e.alloc = upb_Arena_Alloc(arena);
-  e.buf = NULL;
-  e.limit = NULL;
-  e.ptr = NULL;
-  e.depth = depth ? depth : 64;
-  e.options = options;
-  _upb_mapsorter_init(&e.sorter);
-  char* ret = NULL;
-
-  if (UPB_SETJMP(e.err)) {
-    *size = 0;
-    ret = NULL;
-  } else {
-    encode_message(&e, msg, l, size);
-    *size = e.limit - e.ptr;
-    if (*size == 0) {
-      static char ch;
-      ret = &ch;
-    } else {
-      UPB_ASSERT(e.ptr);
-      ret = e.ptr;
-    }
-  }
-
-  _upb_mapsorter_destroy(&e.sorter);
-  return ret;
-}
-
-/** upb/msg.c ************************************************************/
-
-
-/** upb_Message ***************************************************************/
-
-static const size_t overhead = sizeof(upb_Message_InternalData);
-
-static const upb_Message_Internal* upb_Message_Getinternal_const(
-    const upb_Message* msg) {
-  ptrdiff_t size = sizeof(upb_Message_Internal);
-  return (upb_Message_Internal*)((char*)msg - size);
-}
-
-upb_Message* _upb_Message_New(const upb_MiniTable* l, upb_Arena* a) {
-  return _upb_Message_New_inl(l, a);
-}
-
-void _upb_Message_Clear(upb_Message* msg, const upb_MiniTable* l) {
-  void* mem = UPB_PTR_AT(msg, -sizeof(upb_Message_Internal), char);
-  memset(mem, 0, upb_msg_sizeof(l));
-}
-
-static bool realloc_internal(upb_Message* msg, size_t need, upb_Arena* arena) {
-  upb_Message_Internal* in = upb_Message_Getinternal(msg);
-  if (!in->internal) {
-    /* No internal data, allocate from scratch. */
-    size_t size = UPB_MAX(128, _upb_Log2CeilingSize(need + overhead));
-    upb_Message_InternalData* internal = upb_Arena_Malloc(arena, size);
-    if (!internal) return false;
-    internal->size = size;
-    internal->unknown_end = overhead;
-    internal->ext_begin = size;
-    in->internal = internal;
-  } else if (in->internal->ext_begin - in->internal->unknown_end < need) {
-    /* Internal data is too small, reallocate. */
-    size_t new_size = _upb_Log2CeilingSize(in->internal->size + need);
-    size_t ext_bytes = in->internal->size - in->internal->ext_begin;
-    size_t new_ext_begin = new_size - ext_bytes;
-    upb_Message_InternalData* internal =
-        upb_Arena_Realloc(arena, in->internal, in->internal->size, new_size);
-    if (!internal) return false;
-    if (ext_bytes) {
-      /* Need to move extension data to the end. */
-      char* ptr = (char*)internal;
-      memmove(ptr + new_ext_begin, ptr + internal->ext_begin, ext_bytes);
-    }
-    internal->ext_begin = new_ext_begin;
-    internal->size = new_size;
-    in->internal = internal;
-  }
-  UPB_ASSERT(in->internal->ext_begin - in->internal->unknown_end >= need);
-  return true;
-}
-
-bool _upb_Message_AddUnknown(upb_Message* msg, const char* data, size_t len,
-                             upb_Arena* arena) {
-  if (!realloc_internal(msg, len, arena)) return false;
-  upb_Message_Internal* in = upb_Message_Getinternal(msg);
-  memcpy(UPB_PTR_AT(in->internal, in->internal->unknown_end, char), data, len);
-  in->internal->unknown_end += len;
-  return true;
-}
-
-void _upb_Message_DiscardUnknown_shallow(upb_Message* msg) {
-  upb_Message_Internal* in = upb_Message_Getinternal(msg);
-  if (in->internal) {
-    in->internal->unknown_end = overhead;
-  }
-}
-
-const char* upb_Message_GetUnknown(const upb_Message* msg, size_t* len) {
-  const upb_Message_Internal* in = upb_Message_Getinternal_const(msg);
-  if (in->internal) {
-    *len = in->internal->unknown_end - overhead;
-    return (char*)(in->internal + 1);
-  } else {
-    *len = 0;
-    return NULL;
-  }
-}
-
-const upb_Message_Extension* _upb_Message_Getexts(const upb_Message* msg,
-                                                  size_t* count) {
-  const upb_Message_Internal* in = upb_Message_Getinternal_const(msg);
-  if (in->internal) {
-    *count = (in->internal->size - in->internal->ext_begin) /
-             sizeof(upb_Message_Extension);
-    return UPB_PTR_AT(in->internal, in->internal->ext_begin, void);
-  } else {
-    *count = 0;
-    return NULL;
-  }
-}
-
-const upb_Message_Extension* _upb_Message_Getext(
-    const upb_Message* msg, const upb_MiniTable_Extension* e) {
-  size_t n;
-  const upb_Message_Extension* ext = _upb_Message_Getexts(msg, &n);
-
-  /* For now we use linear search exclusively to find extensions. If this
-   * becomes an issue due to messages with lots of extensions, we can introduce
-   * a table of some sort. */
-  for (size_t i = 0; i < n; i++) {
-    if (ext[i].ext == e) {
-      return &ext[i];
-    }
-  }
-
-  return NULL;
-}
-
-void _upb_Message_Clearext(upb_Message* msg,
-                           const upb_MiniTable_Extension* ext_l) {
-  upb_Message_Internal* in = upb_Message_Getinternal(msg);
-  if (!in->internal) return;
-  const upb_Message_Extension* base =
-      UPB_PTR_AT(in->internal, in->internal->ext_begin, void);
-  upb_Message_Extension* ext =
-      (upb_Message_Extension*)_upb_Message_Getext(msg, ext_l);
-  if (ext) {
-    *ext = *base;
-    in->internal->ext_begin += sizeof(upb_Message_Extension);
-  }
-}
-
-upb_Message_Extension* _upb_Message_GetOrCreateExtension(
-    upb_Message* msg, const upb_MiniTable_Extension* e, upb_Arena* arena) {
-  upb_Message_Extension* ext =
-      (upb_Message_Extension*)_upb_Message_Getext(msg, e);
-  if (ext) return ext;
-  if (!realloc_internal(msg, sizeof(upb_Message_Extension), arena)) return NULL;
-  upb_Message_Internal* in = upb_Message_Getinternal(msg);
-  in->internal->ext_begin -= sizeof(upb_Message_Extension);
-  ext = UPB_PTR_AT(in->internal, in->internal->ext_begin, void);
-  memset(ext, 0, sizeof(upb_Message_Extension));
-  ext->ext = e;
-  return ext;
-}
-
-size_t upb_Message_ExtensionCount(const upb_Message* msg) {
-  size_t count;
-  _upb_Message_Getexts(msg, &count);
-  return count;
-}
-
-/** upb_Array *****************************************************************/
-
-bool _upb_array_realloc(upb_Array* arr, size_t min_size, upb_Arena* arena) {
-  size_t new_size = UPB_MAX(arr->size, 4);
-  int elem_size_lg2 = arr->data & 7;
-  size_t old_bytes = arr->size << elem_size_lg2;
-  size_t new_bytes;
-  void* ptr = _upb_array_ptr(arr);
-
-  /* Log2 ceiling of size. */
-  while (new_size < min_size) new_size *= 2;
-
-  new_bytes = new_size << elem_size_lg2;
-  ptr = upb_Arena_Realloc(arena, ptr, old_bytes, new_bytes);
-
-  if (!ptr) {
-    return false;
-  }
-
-  arr->data = _upb_tag_arrptr(ptr, elem_size_lg2);
-  arr->size = new_size;
-  return true;
-}
-
-static upb_Array* getorcreate_array(upb_Array** arr_ptr, int elem_size_lg2,
-                                    upb_Arena* arena) {
-  upb_Array* arr = *arr_ptr;
-  if (!arr) {
-    arr = _upb_Array_New(arena, 4, elem_size_lg2);
-    if (!arr) return NULL;
-    *arr_ptr = arr;
-  }
-  return arr;
-}
-
-void* _upb_Array_Resize_fallback(upb_Array** arr_ptr, size_t size,
-                                 int elem_size_lg2, upb_Arena* arena) {
-  upb_Array* arr = getorcreate_array(arr_ptr, elem_size_lg2, arena);
-  return arr && _upb_Array_Resize(arr, size, arena) ? _upb_array_ptr(arr)
-                                                    : NULL;
-}
-
-bool _upb_Array_Append_fallback(upb_Array** arr_ptr, const void* value,
-                                int elem_size_lg2, upb_Arena* arena) {
-  upb_Array* arr = getorcreate_array(arr_ptr, elem_size_lg2, arena);
-  if (!arr) return false;
-
-  size_t elems = arr->len;
-
-  if (!_upb_Array_Resize(arr, elems + 1, arena)) {
-    return false;
-  }
-
-  char* data = _upb_array_ptr(arr);
-  memcpy(data + (elems << elem_size_lg2), value, 1 << elem_size_lg2);
-  return true;
-}
-
-/** upb_Map *******************************************************************/
-
-upb_Map* _upb_Map_New(upb_Arena* a, size_t key_size, size_t value_size) {
-  upb_Map* map = upb_Arena_Malloc(a, sizeof(upb_Map));
-
-  if (!map) {
-    return NULL;
-  }
-
-  upb_strtable_init(&map->table, 4, a);
-  map->key_size = key_size;
-  map->val_size = value_size;
-
-  return map;
-}
-
-static void _upb_mapsorter_getkeys(const void* _a, const void* _b, void* a_key,
-                                   void* b_key, size_t size) {
-  const upb_tabent* const* a = _a;
-  const upb_tabent* const* b = _b;
-  upb_StringView a_tabkey = upb_tabstrview((*a)->key);
-  upb_StringView b_tabkey = upb_tabstrview((*b)->key);
-  _upb_map_fromkey(a_tabkey, a_key, size);
-  _upb_map_fromkey(b_tabkey, b_key, size);
-}
-
-#define UPB_COMPARE_INTEGERS(a, b) ((a) < (b) ? -1 : ((a) == (b) ? 0 : 1))
-
-static int _upb_mapsorter_cmpi64(const void* _a, const void* _b) {
-  int64_t a, b;
-  _upb_mapsorter_getkeys(_a, _b, &a, &b, 8);
-  return UPB_COMPARE_INTEGERS(a, b);
-}
-
-static int _upb_mapsorter_cmpu64(const void* _a, const void* _b) {
-  uint64_t a, b;
-  _upb_mapsorter_getkeys(_a, _b, &a, &b, 8);
-  return UPB_COMPARE_INTEGERS(a, b);
-}
-
-static int _upb_mapsorter_cmpi32(const void* _a, const void* _b) {
-  int32_t a, b;
-  _upb_mapsorter_getkeys(_a, _b, &a, &b, 4);
-  return UPB_COMPARE_INTEGERS(a, b);
-}
-
-static int _upb_mapsorter_cmpu32(const void* _a, const void* _b) {
-  uint32_t a, b;
-  _upb_mapsorter_getkeys(_a, _b, &a, &b, 4);
-  return UPB_COMPARE_INTEGERS(a, b);
-}
-
-static int _upb_mapsorter_cmpbool(const void* _a, const void* _b) {
-  bool a, b;
-  _upb_mapsorter_getkeys(_a, _b, &a, &b, 1);
-  return UPB_COMPARE_INTEGERS(a, b);
-}
-
-static int _upb_mapsorter_cmpstr(const void* _a, const void* _b) {
-  upb_StringView a, b;
-  _upb_mapsorter_getkeys(_a, _b, &a, &b, UPB_MAPTYPE_STRING);
-  size_t common_size = UPB_MIN(a.size, b.size);
-  int cmp = memcmp(a.data, b.data, common_size);
-  if (cmp) return -cmp;
-  return UPB_COMPARE_INTEGERS(a.size, b.size);
-}
-
-#undef UPB_COMPARE_INTEGERS
-
-bool _upb_mapsorter_pushmap(_upb_mapsorter* s, upb_FieldType key_type,
-                            const upb_Map* map, _upb_sortedmap* sorted) {
-  int map_size = _upb_Map_Size(map);
-  sorted->start = s->size;
-  sorted->pos = sorted->start;
-  sorted->end = sorted->start + map_size;
-
-  /* Grow s->entries if necessary. */
-  if (sorted->end > s->cap) {
-    s->cap = _upb_Log2CeilingSize(sorted->end);
-    s->entries = realloc(s->entries, s->cap * sizeof(*s->entries));
-    if (!s->entries) return false;
-  }
-
-  s->size = sorted->end;
-
-  /* Copy non-empty entries from the table to s->entries. */
-  upb_tabent const** dst = &s->entries[sorted->start];
-  const upb_tabent* src = map->table.t.entries;
-  const upb_tabent* end = src + upb_table_size(&map->table.t);
-  for (; src < end; src++) {
-    if (!upb_tabent_isempty(src)) {
-      *dst = src;
-      dst++;
-    }
-  }
-  UPB_ASSERT(dst == &s->entries[sorted->end]);
-
-  /* Sort entries according to the key type. */
-
-  int (*compar)(const void*, const void*);
-
-  switch (key_type) {
-    case kUpb_FieldType_Int64:
-    case kUpb_FieldType_SFixed64:
-    case kUpb_FieldType_SInt64:
-      compar = _upb_mapsorter_cmpi64;
-      break;
-    case kUpb_FieldType_UInt64:
-    case kUpb_FieldType_Fixed64:
-      compar = _upb_mapsorter_cmpu64;
-      break;
-    case kUpb_FieldType_Int32:
-    case kUpb_FieldType_SInt32:
-    case kUpb_FieldType_SFixed32:
-    case kUpb_FieldType_Enum:
-      compar = _upb_mapsorter_cmpi32;
-      break;
-    case kUpb_FieldType_UInt32:
-    case kUpb_FieldType_Fixed32:
-      compar = _upb_mapsorter_cmpu32;
-      break;
-    case kUpb_FieldType_Bool:
-      compar = _upb_mapsorter_cmpbool;
-      break;
-    case kUpb_FieldType_String:
-    case kUpb_FieldType_Bytes:
-      compar = _upb_mapsorter_cmpstr;
-      break;
-    default:
-      UPB_UNREACHABLE();
-  }
-
-  qsort(&s->entries[sorted->start], map_size, sizeof(*s->entries), compar);
-  return true;
-}
-
-/** upb_ExtensionRegistry *****************************************************/
-
-struct upb_ExtensionRegistry {
-  upb_Arena* arena;
-  upb_strtable exts; /* Key is upb_MiniTable* concatenated with fieldnum. */
-};
-
-#define EXTREG_KEY_SIZE (sizeof(upb_MiniTable*) + sizeof(uint32_t))
-
-static void extreg_key(char* buf, const upb_MiniTable* l, uint32_t fieldnum) {
-  memcpy(buf, &l, sizeof(l));
-  memcpy(buf + sizeof(l), &fieldnum, sizeof(fieldnum));
-}
-
-upb_ExtensionRegistry* upb_ExtensionRegistry_New(upb_Arena* arena) {
-  upb_ExtensionRegistry* r = upb_Arena_Malloc(arena, sizeof(*r));
-  if (!r) return NULL;
-  r->arena = arena;
-  if (!upb_strtable_init(&r->exts, 8, arena)) return NULL;
-  return r;
-}
-
-bool _upb_extreg_add(upb_ExtensionRegistry* r,
-                     const upb_MiniTable_Extension** e, size_t count) {
-  char buf[EXTREG_KEY_SIZE];
-  const upb_MiniTable_Extension** start = e;
-  const upb_MiniTable_Extension** end = UPB_PTRADD(e, count);
-  for (; e < end; e++) {
-    const upb_MiniTable_Extension* ext = *e;
-    extreg_key(buf, ext->extendee, ext->field.number);
-    upb_value v;
-    if (upb_strtable_lookup2(&r->exts, buf, EXTREG_KEY_SIZE, &v)) {
-      goto failure;
-    }
-    if (!upb_strtable_insert(&r->exts, buf, EXTREG_KEY_SIZE,
-                             upb_value_constptr(ext), r->arena)) {
-      goto failure;
-    }
-  }
-  return true;
-
-failure:
-  /* Back out the entries previously added. */
-  for (end = e, e = start; e < end; e++) {
-    const upb_MiniTable_Extension* ext = *e;
-    extreg_key(buf, ext->extendee, ext->field.number);
-    upb_strtable_remove2(&r->exts, buf, EXTREG_KEY_SIZE, NULL);
-  }
-  return false;
-}
-
-const upb_MiniTable_Extension* _upb_extreg_get(const upb_ExtensionRegistry* r,
-                                               const upb_MiniTable* l,
-                                               uint32_t num) {
-  char buf[EXTREG_KEY_SIZE];
-  upb_value v;
-  extreg_key(buf, l, num);
-  if (upb_strtable_lookup2(&r->exts, buf, EXTREG_KEY_SIZE, &v)) {
-    return upb_value_getconstptr(v);
-  } else {
-    return NULL;
-  }
-}
-
-/** upb/table.c ************************************************************/
-/*
- * upb_table Implementation
- *
- * Implementation is heavily inspired by Lua's ltable.c.
- */
-
-#include <string.h>
-
-
-/* Must be last. */
-
-#define UPB_MAXARRSIZE 16 /* 64k. */
-
-/* From Chromium. */
-#define ARRAY_SIZE(x) \
-  ((sizeof(x) / sizeof(0 [x])) / ((size_t)(!(sizeof(x) % sizeof(0 [x])))))
-
-static const double MAX_LOAD = 0.85;
-
-/* The minimum utilization of the array part of a mixed hash/array table.  This
- * is a speed/memory-usage tradeoff (though it's not straightforward because of
- * cache effects).  The lower this is, the more memory we'll use. */
-static const double MIN_DENSITY = 0.1;
-
-static bool is_pow2(uint64_t v) { return v == 0 || (v & (v - 1)) == 0; }
-
-static upb_value _upb_value_val(uint64_t val) {
-  upb_value ret;
-  _upb_value_setval(&ret, val);
-  return ret;
-}
-
-static int log2ceil(uint64_t v) {
-  int ret = 0;
-  bool pow2 = is_pow2(v);
-  while (v >>= 1) ret++;
-  ret = pow2 ? ret : ret + 1; /* Ceiling. */
-  return UPB_MIN(UPB_MAXARRSIZE, ret);
-}
-
-char* upb_strdup2(const char* s, size_t len, upb_Arena* a) {
-  size_t n;
-  char* p;
-
-  /* Prevent overflow errors. */
-  if (len == SIZE_MAX) return NULL;
-  /* Always null-terminate, even if binary data; but don't rely on the input to
-   * have a null-terminating byte since it may be a raw binary buffer. */
-  n = len + 1;
-  p = upb_Arena_Malloc(a, n);
-  if (p) {
-    memcpy(p, s, len);
-    p[len] = 0;
-  }
-  return p;
-}
-
-/* A type to represent the lookup key of either a strtable or an inttable. */
-typedef union {
-  uintptr_t num;
-  struct {
-    const char* str;
-    size_t len;
-  } str;
-} lookupkey_t;
-
-static lookupkey_t strkey2(const char* str, size_t len) {
-  lookupkey_t k;
-  k.str.str = str;
-  k.str.len = len;
-  return k;
-}
-
-static lookupkey_t intkey(uintptr_t key) {
-  lookupkey_t k;
-  k.num = key;
-  return k;
-}
-
-typedef uint32_t hashfunc_t(upb_tabkey key);
-typedef bool eqlfunc_t(upb_tabkey k1, lookupkey_t k2);
-
-/* Base table (shared code) ***************************************************/
-
-static uint32_t upb_inthash(uintptr_t key) { return (uint32_t)key; }
-
-static const upb_tabent* upb_getentry(const upb_table* t, uint32_t hash) {
-  return t->entries + (hash & t->mask);
-}
-
-static bool upb_arrhas(upb_tabval key) { return key.val != (uint64_t)-1; }
-
-static bool isfull(upb_table* t) { return t->count == t->max_count; }
-
-static bool init(upb_table* t, uint8_t size_lg2, upb_Arena* a) {
-  size_t bytes;
-
-  t->count = 0;
-  t->size_lg2 = size_lg2;
-  t->mask = upb_table_size(t) ? upb_table_size(t) - 1 : 0;
-  t->max_count = upb_table_size(t) * MAX_LOAD;
-  bytes = upb_table_size(t) * sizeof(upb_tabent);
-  if (bytes > 0) {
-    t->entries = upb_Arena_Malloc(a, bytes);
-    if (!t->entries) return false;
-    memset(t->entries, 0, bytes);
-  } else {
-    t->entries = NULL;
-  }
-  return true;
-}
-
-static upb_tabent* emptyent(upb_table* t, upb_tabent* e) {
-  upb_tabent* begin = t->entries;
-  upb_tabent* end = begin + upb_table_size(t);
-  for (e = e + 1; e < end; e++) {
-    if (upb_tabent_isempty(e)) return e;
-  }
-  for (e = begin; e < end; e++) {
-    if (upb_tabent_isempty(e)) return e;
-  }
-  UPB_ASSERT(false);
-  return NULL;
-}
-
-static upb_tabent* getentry_mutable(upb_table* t, uint32_t hash) {
-  return (upb_tabent*)upb_getentry(t, hash);
-}
-
-static const upb_tabent* findentry(const upb_table* t, lookupkey_t key,
-                                   uint32_t hash, eqlfunc_t* eql) {
-  const upb_tabent* e;
-
-  if (t->size_lg2 == 0) return NULL;
-  e = upb_getentry(t, hash);
-  if (upb_tabent_isempty(e)) return NULL;
-  while (1) {
-    if (eql(e->key, key)) return e;
-    if ((e = e->next) == NULL) return NULL;
-  }
-}
-
-static upb_tabent* findentry_mutable(upb_table* t, lookupkey_t key,
-                                     uint32_t hash, eqlfunc_t* eql) {
-  return (upb_tabent*)findentry(t, key, hash, eql);
-}
-
-static bool lookup(const upb_table* t, lookupkey_t key, upb_value* v,
-                   uint32_t hash, eqlfunc_t* eql) {
-  const upb_tabent* e = findentry(t, key, hash, eql);
-  if (e) {
-    if (v) {
-      _upb_value_setval(v, e->val.val);
-    }
-    return true;
-  } else {
-    return false;
-  }
-}
-
-/* The given key must not already exist in the table. */
-static void insert(upb_table* t, lookupkey_t key, upb_tabkey tabkey,
-                   upb_value val, uint32_t hash, hashfunc_t* hashfunc,
-                   eqlfunc_t* eql) {
-  upb_tabent* mainpos_e;
-  upb_tabent* our_e;
-
-  UPB_ASSERT(findentry(t, key, hash, eql) == NULL);
-
-  t->count++;
-  mainpos_e = getentry_mutable(t, hash);
-  our_e = mainpos_e;
-
-  if (upb_tabent_isempty(mainpos_e)) {
-    /* Our main position is empty; use it. */
-    our_e->next = NULL;
-  } else {
-    /* Collision. */
-    upb_tabent* new_e = emptyent(t, mainpos_e);
-    /* Head of collider's chain. */
-    upb_tabent* chain = getentry_mutable(t, hashfunc(mainpos_e->key));
-    if (chain == mainpos_e) {
-      /* Existing ent is in its main position (it has the same hash as us, and
-       * is the head of our chain).  Insert to new ent and append to this chain.
-       */
-      new_e->next = mainpos_e->next;
-      mainpos_e->next = new_e;
-      our_e = new_e;
-    } else {
-      /* Existing ent is not in its main position (it is a node in some other
-       * chain).  This implies that no existing ent in the table has our hash.
-       * Evict it (updating its chain) and use its ent for head of our chain. */
-      *new_e = *mainpos_e; /* copies next. */
-      while (chain->next != mainpos_e) {
-        chain = (upb_tabent*)chain->next;
-        UPB_ASSERT(chain);
-      }
-      chain->next = new_e;
-      our_e = mainpos_e;
-      our_e->next = NULL;
-    }
-  }
-  our_e->key = tabkey;
-  our_e->val.val = val.val;
-  UPB_ASSERT(findentry(t, key, hash, eql) == our_e);
-}
-
-static bool rm(upb_table* t, lookupkey_t key, upb_value* val,
-               upb_tabkey* removed, uint32_t hash, eqlfunc_t* eql) {
-  upb_tabent* chain = getentry_mutable(t, hash);
-  if (upb_tabent_isempty(chain)) return false;
-  if (eql(chain->key, key)) {
-    /* Element to remove is at the head of its chain. */
-    t->count--;
-    if (val) _upb_value_setval(val, chain->val.val);
-    if (removed) *removed = chain->key;
-    if (chain->next) {
-      upb_tabent* move = (upb_tabent*)chain->next;
-      *chain = *move;
-      move->key = 0; /* Make the slot empty. */
-    } else {
-      chain->key = 0; /* Make the slot empty. */
-    }
-    return true;
-  } else {
-    /* Element to remove is either in a non-head position or not in the
-     * table. */
-    while (chain->next && !eql(chain->next->key, key)) {
-      chain = (upb_tabent*)chain->next;
-    }
-    if (chain->next) {
-      /* Found element to remove. */
-      upb_tabent* rm = (upb_tabent*)chain->next;
-      t->count--;
-      if (val) _upb_value_setval(val, chain->next->val.val);
-      if (removed) *removed = rm->key;
-      rm->key = 0; /* Make the slot empty. */
-      chain->next = rm->next;
-      return true;
-    } else {
-      /* Element to remove is not in the table. */
-      return false;
-    }
-  }
-}
-
-static size_t next(const upb_table* t, size_t i) {
-  do {
-    if (++i >= upb_table_size(t)) return SIZE_MAX - 1; /* Distinct from -1. */
-  } while (upb_tabent_isempty(&t->entries[i]));
-
-  return i;
-}
-
-static size_t begin(const upb_table* t) { return next(t, -1); }
-
-/* upb_strtable ***************************************************************/
-
-/* A simple "subclass" of upb_table that only adds a hash function for strings.
- */
-
-static upb_tabkey strcopy(lookupkey_t k2, upb_Arena* a) {
-  uint32_t len = (uint32_t)k2.str.len;
-  char* str = upb_Arena_Malloc(a, k2.str.len + sizeof(uint32_t) + 1);
-  if (str == NULL) return 0;
-  memcpy(str, &len, sizeof(uint32_t));
-  if (k2.str.len) memcpy(str + sizeof(uint32_t), k2.str.str, k2.str.len);
-  str[sizeof(uint32_t) + k2.str.len] = '\0';
-  return (uintptr_t)str;
-}
-
-/* Adapted from ABSL's wyhash. */
-
-static uint64_t UnalignedLoad64(const void* p) {
-  uint64_t val;
-  memcpy(&val, p, 8);
-  return val;
-}
-
-static uint32_t UnalignedLoad32(const void* p) {
-  uint32_t val;
-  memcpy(&val, p, 4);
-  return val;
-}
-
-#if defined(_MSC_VER) && defined(_M_X64)
-#include <intrin.h>
-#endif
-
-/* Computes a * b, returning the low 64 bits of the result and storing the high
- * 64 bits in |*high|. */
-static uint64_t upb_umul128(uint64_t v0, uint64_t v1, uint64_t* out_high) {
-#ifdef __SIZEOF_INT128__
-  __uint128_t p = v0;
-  p *= v1;
-  *out_high = (uint64_t)(p >> 64);
-  return (uint64_t)p;
-#elif defined(_MSC_VER) && defined(_M_X64)
-  return _umul128(v0, v1, out_high);
-#else
-  uint64_t a32 = v0 >> 32;
-  uint64_t a00 = v0 & 0xffffffff;
-  uint64_t b32 = v1 >> 32;
-  uint64_t b00 = v1 & 0xffffffff;
-  uint64_t high = a32 * b32;
-  uint64_t low = a00 * b00;
-  uint64_t mid1 = a32 * b00;
-  uint64_t mid2 = a00 * b32;
-  low += (mid1 << 32) + (mid2 << 32);
-  // Omit carry bit, for mixing we do not care about exact numerical precision.
-  high += (mid1 >> 32) + (mid2 >> 32);
-  *out_high = high;
-  return low;
-#endif
-}
-
-static uint64_t WyhashMix(uint64_t v0, uint64_t v1) {
-  uint64_t high;
-  uint64_t low = upb_umul128(v0, v1, &high);
-  return low ^ high;
-}
-
-static uint64_t Wyhash(const void* data, size_t len, uint64_t seed,
-                       const uint64_t salt[]) {
-  const uint8_t* ptr = (const uint8_t*)data;
-  uint64_t starting_length = (uint64_t)len;
-  uint64_t current_state = seed ^ salt[0];
-
-  if (len > 64) {
-    // If we have more than 64 bytes, we're going to handle chunks of 64
-    // bytes at a time. We're going to build up two separate hash states
-    // which we will then hash together.
-    uint64_t duplicated_state = current_state;
-
-    do {
-      uint64_t a = UnalignedLoad64(ptr);
-      uint64_t b = UnalignedLoad64(ptr + 8);
-      uint64_t c = UnalignedLoad64(ptr + 16);
-      uint64_t d = UnalignedLoad64(ptr + 24);
-      uint64_t e = UnalignedLoad64(ptr + 32);
-      uint64_t f = UnalignedLoad64(ptr + 40);
-      uint64_t g = UnalignedLoad64(ptr + 48);
-      uint64_t h = UnalignedLoad64(ptr + 56);
-
-      uint64_t cs0 = WyhashMix(a ^ salt[1], b ^ current_state);
-      uint64_t cs1 = WyhashMix(c ^ salt[2], d ^ current_state);
-      current_state = (cs0 ^ cs1);
-
-      uint64_t ds0 = WyhashMix(e ^ salt[3], f ^ duplicated_state);
-      uint64_t ds1 = WyhashMix(g ^ salt[4], h ^ duplicated_state);
-      duplicated_state = (ds0 ^ ds1);
-
-      ptr += 64;
-      len -= 64;
-    } while (len > 64);
-
-    current_state = current_state ^ duplicated_state;
-  }
-
-  // We now have a data `ptr` with at most 64 bytes and the current state
-  // of the hashing state machine stored in current_state.
-  while (len > 16) {
-    uint64_t a = UnalignedLoad64(ptr);
-    uint64_t b = UnalignedLoad64(ptr + 8);
-
-    current_state = WyhashMix(a ^ salt[1], b ^ current_state);
-
-    ptr += 16;
-    len -= 16;
-  }
-
-  // We now have a data `ptr` with at most 16 bytes.
-  uint64_t a = 0;
-  uint64_t b = 0;
-  if (len > 8) {
-    // When we have at least 9 and at most 16 bytes, set A to the first 64
-    // bits of the input and B to the last 64 bits of the input. Yes, they will
-    // overlap in the middle if we are working with less than the full 16
-    // bytes.
-    a = UnalignedLoad64(ptr);
-    b = UnalignedLoad64(ptr + len - 8);
-  } else if (len > 3) {
-    // If we have at least 4 and at most 8 bytes, set A to the first 32
-    // bits and B to the last 32 bits.
-    a = UnalignedLoad32(ptr);
-    b = UnalignedLoad32(ptr + len - 4);
-  } else if (len > 0) {
-    // If we have at least 1 and at most 3 bytes, read all of the provided
-    // bits into A, with some adjustments.
-    a = ((ptr[0] << 16) | (ptr[len >> 1] << 8) | ptr[len - 1]);
-    b = 0;
-  } else {
-    a = 0;
-    b = 0;
-  }
-
-  uint64_t w = WyhashMix(a ^ salt[1], b ^ current_state);
-  uint64_t z = salt[1] ^ starting_length;
-  return WyhashMix(w, z);
-}
-
-const uint64_t kWyhashSalt[5] = {
-    0x243F6A8885A308D3ULL, 0x13198A2E03707344ULL, 0xA4093822299F31D0ULL,
-    0x082EFA98EC4E6C89ULL, 0x452821E638D01377ULL,
-};
-
-uint32_t _upb_Hash(const void* p, size_t n, uint64_t seed) {
-  return Wyhash(p, n, seed, kWyhashSalt);
-}
-
-static uint32_t _upb_Hash_NoSeed(const char* p, size_t n) {
-  return _upb_Hash(p, n, 0);
-}
-
-static uint32_t strhash(upb_tabkey key) {
-  uint32_t len;
-  char* str = upb_tabstr(key, &len);
-  return _upb_Hash_NoSeed(str, len);
-}
-
-static bool streql(upb_tabkey k1, lookupkey_t k2) {
-  uint32_t len;
-  char* str = upb_tabstr(k1, &len);
-  return len == k2.str.len && (len == 0 || memcmp(str, k2.str.str, len) == 0);
-}
-
-bool upb_strtable_init(upb_strtable* t, size_t expected_size, upb_Arena* a) {
-  // Multiply by approximate reciprocal of MAX_LOAD (0.85), with pow2
-  // denominator.
-  size_t need_entries = (expected_size + 1) * 1204 / 1024;
-  UPB_ASSERT(need_entries >= expected_size * 0.85);
-  int size_lg2 = _upb_Log2Ceiling(need_entries);
-  return init(&t->t, size_lg2, a);
-}
-
-void upb_strtable_clear(upb_strtable* t) {
-  size_t bytes = upb_table_size(&t->t) * sizeof(upb_tabent);
-  t->t.count = 0;
-  memset((char*)t->t.entries, 0, bytes);
-}
-
-bool upb_strtable_resize(upb_strtable* t, size_t size_lg2, upb_Arena* a) {
-  upb_strtable new_table;
-  upb_strtable_iter i;
-
-  if (!init(&new_table.t, size_lg2, a)) return false;
-  upb_strtable_begin(&i, t);
-  for (; !upb_strtable_done(&i); upb_strtable_next(&i)) {
-    upb_StringView key = upb_strtable_iter_key(&i);
-    upb_strtable_insert(&new_table, key.data, key.size,
-                        upb_strtable_iter_value(&i), a);
-  }
-  *t = new_table;
-  return true;
-}
-
-bool upb_strtable_insert(upb_strtable* t, const char* k, size_t len,
-                         upb_value v, upb_Arena* a) {
-  lookupkey_t key;
-  upb_tabkey tabkey;
-  uint32_t hash;
-
-  if (isfull(&t->t)) {
-    /* Need to resize.  New table of double the size, add old elements to it. */
-    if (!upb_strtable_resize(t, t->t.size_lg2 + 1, a)) {
-      return false;
-    }
-  }
-
-  key = strkey2(k, len);
-  tabkey = strcopy(key, a);
-  if (tabkey == 0) return false;
-
-  hash = _upb_Hash_NoSeed(key.str.str, key.str.len);
-  insert(&t->t, key, tabkey, v, hash, &strhash, &streql);
-  return true;
-}
-
-bool upb_strtable_lookup2(const upb_strtable* t, const char* key, size_t len,
-                          upb_value* v) {
-  uint32_t hash = _upb_Hash_NoSeed(key, len);
-  return lookup(&t->t, strkey2(key, len), v, hash, &streql);
-}
-
-bool upb_strtable_remove2(upb_strtable* t, const char* key, size_t len,
-                          upb_value* val) {
-  uint32_t hash = _upb_Hash_NoSeed(key, len);
-  upb_tabkey tabkey;
-  return rm(&t->t, strkey2(key, len), val, &tabkey, hash, &streql);
-}
-
-/* Iteration */
-
-void upb_strtable_begin(upb_strtable_iter* i, const upb_strtable* t) {
-  i->t = t;
-  i->index = begin(&t->t);
-}
-
-void upb_strtable_next(upb_strtable_iter* i) {
-  i->index = next(&i->t->t, i->index);
-}
-
-bool upb_strtable_done(const upb_strtable_iter* i) {
-  if (!i->t) return true;
-  return i->index >= upb_table_size(&i->t->t) ||
-         upb_tabent_isempty(str_tabent(i));
-}
-
-upb_StringView upb_strtable_iter_key(const upb_strtable_iter* i) {
-  upb_StringView key;
-  uint32_t len;
-  UPB_ASSERT(!upb_strtable_done(i));
-  key.data = upb_tabstr(str_tabent(i)->key, &len);
-  key.size = len;
-  return key;
-}
-
-upb_value upb_strtable_iter_value(const upb_strtable_iter* i) {
-  UPB_ASSERT(!upb_strtable_done(i));
-  return _upb_value_val(str_tabent(i)->val.val);
-}
-
-void upb_strtable_iter_setdone(upb_strtable_iter* i) {
-  i->t = NULL;
-  i->index = SIZE_MAX;
-}
-
-bool upb_strtable_iter_isequal(const upb_strtable_iter* i1,
-                               const upb_strtable_iter* i2) {
-  if (upb_strtable_done(i1) && upb_strtable_done(i2)) return true;
-  return i1->t == i2->t && i1->index == i2->index;
-}
-
-/* upb_inttable ***************************************************************/
-
-/* For inttables we use a hybrid structure where small keys are kept in an
- * array and large keys are put in the hash table. */
-
-static uint32_t inthash(upb_tabkey key) { return upb_inthash(key); }
-
-static bool inteql(upb_tabkey k1, lookupkey_t k2) { return k1 == k2.num; }
-
-static upb_tabval* mutable_array(upb_inttable* t) {
-  return (upb_tabval*)t->array;
-}
-
-static upb_tabval* inttable_val(upb_inttable* t, uintptr_t key) {
-  if (key < t->array_size) {
-    return upb_arrhas(t->array[key]) ? &(mutable_array(t)[key]) : NULL;
-  } else {
-    upb_tabent* e =
-        findentry_mutable(&t->t, intkey(key), upb_inthash(key), &inteql);
-    return e ? &e->val : NULL;
-  }
-}
-
-static const upb_tabval* inttable_val_const(const upb_inttable* t,
-                                            uintptr_t key) {
-  return inttable_val((upb_inttable*)t, key);
-}
-
-size_t upb_inttable_count(const upb_inttable* t) {
-  return t->t.count + t->array_count;
-}
-
-static void check(upb_inttable* t) {
-  UPB_UNUSED(t);
-#if defined(UPB_DEBUG_TABLE) && !defined(NDEBUG)
-  {
-    /* This check is very expensive (makes inserts/deletes O(N)). */
-    size_t count = 0;
-    upb_inttable_iter i;
-    upb_inttable_begin(&i, t);
-    for (; !upb_inttable_done(&i); upb_inttable_next(&i), count++) {
-      UPB_ASSERT(upb_inttable_lookup(t, upb_inttable_iter_key(&i), NULL));
-    }
-    UPB_ASSERT(count == upb_inttable_count(t));
-  }
-#endif
-}
-
-bool upb_inttable_sizedinit(upb_inttable* t, size_t asize, int hsize_lg2,
-                            upb_Arena* a) {
-  size_t array_bytes;
-
-  if (!init(&t->t, hsize_lg2, a)) return false;
-  /* Always make the array part at least 1 long, so that we know key 0
-   * won't be in the hash part, which simplifies things. */
-  t->array_size = UPB_MAX(1, asize);
-  t->array_count = 0;
-  array_bytes = t->array_size * sizeof(upb_value);
-  t->array = upb_Arena_Malloc(a, array_bytes);
-  if (!t->array) {
-    return false;
-  }
-  memset(mutable_array(t), 0xff, array_bytes);
-  check(t);
-  return true;
-}
-
-bool upb_inttable_init(upb_inttable* t, upb_Arena* a) {
-  return upb_inttable_sizedinit(t, 0, 4, a);
-}
-
-bool upb_inttable_insert(upb_inttable* t, uintptr_t key, upb_value val,
-                         upb_Arena* a) {
-  upb_tabval tabval;
-  tabval.val = val.val;
-  UPB_ASSERT(
-      upb_arrhas(tabval)); /* This will reject (uint64_t)-1.  Fix this. */
-
-  if (key < t->array_size) {
-    UPB_ASSERT(!upb_arrhas(t->array[key]));
-    t->array_count++;
-    mutable_array(t)[key].val = val.val;
-  } else {
-    if (isfull(&t->t)) {
-      /* Need to resize the hash part, but we re-use the array part. */
-      size_t i;
-      upb_table new_table;
-
-      if (!init(&new_table, t->t.size_lg2 + 1, a)) {
-        return false;
-      }
-
-      for (i = begin(&t->t); i < upb_table_size(&t->t); i = next(&t->t, i)) {
-        const upb_tabent* e = &t->t.entries[i];
-        uint32_t hash;
-        upb_value v;
-
-        _upb_value_setval(&v, e->val.val);
-        hash = upb_inthash(e->key);
-        insert(&new_table, intkey(e->key), e->key, v, hash, &inthash, &inteql);
-      }
-
-      UPB_ASSERT(t->t.count == new_table.count);
-
-      t->t = new_table;
-    }
-    insert(&t->t, intkey(key), key, val, upb_inthash(key), &inthash, &inteql);
-  }
-  check(t);
-  return true;
-}
-
-bool upb_inttable_lookup(const upb_inttable* t, uintptr_t key, upb_value* v) {
-  const upb_tabval* table_v = inttable_val_const(t, key);
-  if (!table_v) return false;
-  if (v) _upb_value_setval(v, table_v->val);
-  return true;
-}
-
-bool upb_inttable_replace(upb_inttable* t, uintptr_t key, upb_value val) {
-  upb_tabval* table_v = inttable_val(t, key);
-  if (!table_v) return false;
-  table_v->val = val.val;
-  return true;
-}
-
-bool upb_inttable_remove(upb_inttable* t, uintptr_t key, upb_value* val) {
-  bool success;
-  if (key < t->array_size) {
-    if (upb_arrhas(t->array[key])) {
-      upb_tabval empty = UPB_TABVALUE_EMPTY_INIT;
-      t->array_count--;
-      if (val) {
-        _upb_value_setval(val, t->array[key].val);
-      }
-      mutable_array(t)[key] = empty;
-      success = true;
-    } else {
-      success = false;
-    }
-  } else {
-    success = rm(&t->t, intkey(key), val, NULL, upb_inthash(key), &inteql);
-  }
-  check(t);
-  return success;
-}
-
-void upb_inttable_compact(upb_inttable* t, upb_Arena* a) {
-  /* A power-of-two histogram of the table keys. */
-  size_t counts[UPB_MAXARRSIZE + 1] = {0};
-
-  /* The max key in each bucket. */
-  uintptr_t max[UPB_MAXARRSIZE + 1] = {0};
-
-  upb_inttable_iter i;
-  size_t arr_count;
-  int size_lg2;
-  upb_inttable new_t;
-
-  upb_inttable_begin(&i, t);
-  for (; !upb_inttable_done(&i); upb_inttable_next(&i)) {
-    uintptr_t key = upb_inttable_iter_key(&i);
-    int bucket = log2ceil(key);
-    max[bucket] = UPB_MAX(max[bucket], key);
-    counts[bucket]++;
-  }
-
-  /* Find the largest power of two that satisfies the MIN_DENSITY
-   * definition (while actually having some keys). */
-  arr_count = upb_inttable_count(t);
-
-  for (size_lg2 = ARRAY_SIZE(counts) - 1; size_lg2 > 0; size_lg2--) {
-    if (counts[size_lg2] == 0) {
-      /* We can halve again without losing any entries. */
-      continue;
-    } else if (arr_count >= (1 << size_lg2) * MIN_DENSITY) {
-      break;
-    }
-
-    arr_count -= counts[size_lg2];
-  }
-
-  UPB_ASSERT(arr_count <= upb_inttable_count(t));
-
-  {
-    /* Insert all elements into new, perfectly-sized table. */
-    size_t arr_size = max[size_lg2] + 1; /* +1 so arr[max] will fit. */
-    size_t hash_count = upb_inttable_count(t) - arr_count;
-    size_t hash_size = hash_count ? (hash_count / MAX_LOAD) + 1 : 0;
-    int hashsize_lg2 = log2ceil(hash_size);
-
-    upb_inttable_sizedinit(&new_t, arr_size, hashsize_lg2, a);
-    upb_inttable_begin(&i, t);
-    for (; !upb_inttable_done(&i); upb_inttable_next(&i)) {
-      uintptr_t k = upb_inttable_iter_key(&i);
-      upb_inttable_insert(&new_t, k, upb_inttable_iter_value(&i), a);
-    }
-    UPB_ASSERT(new_t.array_size == arr_size);
-    UPB_ASSERT(new_t.t.size_lg2 == hashsize_lg2);
-  }
-  *t = new_t;
-}
-
-/* Iteration. */
-
-static const upb_tabent* int_tabent(const upb_inttable_iter* i) {
-  UPB_ASSERT(!i->array_part);
-  return &i->t->t.entries[i->index];
-}
-
-static upb_tabval int_arrent(const upb_inttable_iter* i) {
-  UPB_ASSERT(i->array_part);
-  return i->t->array[i->index];
-}
-
-void upb_inttable_begin(upb_inttable_iter* i, const upb_inttable* t) {
-  i->t = t;
-  i->index = -1;
-  i->array_part = true;
-  upb_inttable_next(i);
-}
-
-void upb_inttable_next(upb_inttable_iter* iter) {
-  const upb_inttable* t = iter->t;
-  if (iter->array_part) {
-    while (++iter->index < t->array_size) {
-      if (upb_arrhas(int_arrent(iter))) {
-        return;
-      }
-    }
-    iter->array_part = false;
-    iter->index = begin(&t->t);
-  } else {
-    iter->index = next(&t->t, iter->index);
-  }
-}
-
-bool upb_inttable_next2(const upb_inttable* t, uintptr_t* key, upb_value* val,
-                        intptr_t* iter) {
-  intptr_t i = *iter;
-  if (i < t->array_size) {
-    while (++i < t->array_size) {
-      upb_tabval ent = t->array[i];
-      if (upb_arrhas(ent)) {
-        *key = i;
-        *val = _upb_value_val(ent.val);
-        *iter = i;
-        return true;
-      }
-    }
-  }
-
-  size_t tab_idx = next(&t->t, i == -1 ? -1 : i - t->array_size);
-  if (tab_idx < upb_table_size(&t->t)) {
-    upb_tabent* ent = &t->t.entries[tab_idx];
-    *key = ent->key;
-    *val = _upb_value_val(ent->val.val);
-    *iter = tab_idx + t->array_size;
-    return true;
-  }
-
-  return false;
-}
-
-void upb_inttable_removeiter(upb_inttable* t, intptr_t* iter) {
-  intptr_t i = *iter;
-  if (i < t->array_size) {
-    t->array_count--;
-    mutable_array(t)[i].val = -1;
-  } else {
-    upb_tabent* ent = &t->t.entries[i - t->array_size];
-    upb_tabent* prev = NULL;
-
-    // Linear search, not great.
-    upb_tabent* end = &t->t.entries[upb_table_size(&t->t)];
-    for (upb_tabent* e = t->t.entries; e != end; e++) {
-      if (e->next == ent) {
-        prev = e;
-        break;
-      }
-    }
-
-    if (prev) {
-      prev->next = ent->next;
-    }
-
-    t->t.count--;
-    ent->key = 0;
-    ent->next = NULL;
-  }
-}
-
-bool upb_strtable_next2(const upb_strtable* t, upb_StringView* key,
-                        upb_value* val, intptr_t* iter) {
-  size_t tab_idx = next(&t->t, *iter);
-  if (tab_idx < upb_table_size(&t->t)) {
-    upb_tabent* ent = &t->t.entries[tab_idx];
-    uint32_t len;
-    key->data = upb_tabstr(ent->key, &len);
-    key->size = len;
-    *val = _upb_value_val(ent->val.val);
-    *iter = tab_idx;
-    return true;
-  }
-
-  return false;
-}
-
-void upb_strtable_removeiter(upb_strtable* t, intptr_t* iter) {
-  intptr_t i = *iter;
-  upb_tabent* ent = &t->t.entries[i];
-  upb_tabent* prev = NULL;
-
-  // Linear search, not great.
-  upb_tabent* end = &t->t.entries[upb_table_size(&t->t)];
-  for (upb_tabent* e = t->t.entries; e != end; e++) {
-    if (e->next == ent) {
-      prev = e;
-      break;
-    }
-  }
-
-  if (prev) {
-    prev->next = ent->next;
-  }
-
-  t->t.count--;
-  ent->key = 0;
-  ent->next = NULL;
-}
-
-bool upb_inttable_done(const upb_inttable_iter* i) {
-  if (!i->t) return true;
-  if (i->array_part) {
-    return i->index >= i->t->array_size || !upb_arrhas(int_arrent(i));
-  } else {
-    return i->index >= upb_table_size(&i->t->t) ||
-           upb_tabent_isempty(int_tabent(i));
-  }
-}
-
-uintptr_t upb_inttable_iter_key(const upb_inttable_iter* i) {
-  UPB_ASSERT(!upb_inttable_done(i));
-  return i->array_part ? i->index : int_tabent(i)->key;
-}
-
-upb_value upb_inttable_iter_value(const upb_inttable_iter* i) {
-  UPB_ASSERT(!upb_inttable_done(i));
-  return _upb_value_val(i->array_part ? i->t->array[i->index].val
-                                      : int_tabent(i)->val.val);
-}
-
-void upb_inttable_iter_setdone(upb_inttable_iter* i) {
-  i->t = NULL;
-  i->index = SIZE_MAX;
-  i->array_part = false;
-}
-
-bool upb_inttable_iter_isequal(const upb_inttable_iter* i1,
-                               const upb_inttable_iter* i2) {
-  if (upb_inttable_done(i1) && upb_inttable_done(i2)) return true;
-  return i1->t == i2->t && i1->index == i2->index &&
-         i1->array_part == i2->array_part;
-}
-
-/** upb/upb.c ************************************************************/
-#include <errno.h>
-#include <float.h>
-#include <stdarg.h>
-#include <stddef.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-
-// Must be last.
-
-/* upb_Status *****************************************************************/
-
-void upb_Status_Clear(upb_Status* status) {
-  if (!status) return;
-  status->ok = true;
-  status->msg[0] = '\0';
-}
-
-bool upb_Status_IsOk(const upb_Status* status) { return status->ok; }
-
-const char* upb_Status_ErrorMessage(const upb_Status* status) {
-  return status->msg;
-}
-
-void upb_Status_SetErrorMessage(upb_Status* status, const char* msg) {
-  if (!status) return;
-  status->ok = false;
-  strncpy(status->msg, msg, _kUpb_Status_MaxMessage - 1);
-  status->msg[_kUpb_Status_MaxMessage - 1] = '\0';
-}
-
-void upb_Status_SetErrorFormat(upb_Status* status, const char* fmt, ...) {
-  va_list args;
-  va_start(args, fmt);
-  upb_Status_VSetErrorFormat(status, fmt, args);
-  va_end(args);
-}
-
-void upb_Status_VSetErrorFormat(upb_Status* status, const char* fmt,
-                                va_list args) {
-  if (!status) return;
-  status->ok = false;
-  vsnprintf(status->msg, sizeof(status->msg), fmt, args);
-  status->msg[_kUpb_Status_MaxMessage - 1] = '\0';
-}
-
-void upb_Status_VAppendErrorFormat(upb_Status* status, const char* fmt,
-                                   va_list args) {
-  size_t len;
-  if (!status) return;
-  status->ok = false;
-  len = strlen(status->msg);
-  vsnprintf(status->msg + len, sizeof(status->msg) - len, fmt, args);
-  status->msg[_kUpb_Status_MaxMessage - 1] = '\0';
-}
-
-/* upb_alloc ******************************************************************/
-
-static void* upb_global_allocfunc(upb_alloc* alloc, void* ptr, size_t oldsize,
-                                  size_t size) {
-  UPB_UNUSED(alloc);
-  UPB_UNUSED(oldsize);
-  if (size == 0) {
-    free(ptr);
-    return NULL;
-  } else {
-    return realloc(ptr, size);
-  }
-}
-
-static uint32_t* upb_cleanup_pointer(uintptr_t cleanup_metadata) {
-  return (uint32_t*)(cleanup_metadata & ~0x1);
-}
-
-static bool upb_cleanup_has_initial_block(uintptr_t cleanup_metadata) {
-  return cleanup_metadata & 0x1;
-}
-
-static uintptr_t upb_cleanup_metadata(uint32_t* cleanup,
-                                      bool has_initial_block) {
-  return (uintptr_t)cleanup | has_initial_block;
-}
-
-upb_alloc upb_alloc_global = {&upb_global_allocfunc};
-
-/* upb_Arena ******************************************************************/
-
-struct mem_block {
-  struct mem_block* next;
-  uint32_t size;
-  uint32_t cleanups;
-  /* Data follows. */
-};
-
-typedef struct cleanup_ent {
-  upb_CleanupFunc* cleanup;
-  void* ud;
-} cleanup_ent;
-
-static const size_t memblock_reserve =
-    UPB_ALIGN_UP(sizeof(mem_block), UPB_MALLOC_ALIGN);
-
-static upb_Arena* arena_findroot(upb_Arena* a) {
-  /* Path splitting keeps time complexity down, see:
-   *   https://en.wikipedia.org/wiki/Disjoint-set_data_structure */
-  while (a->parent != a) {
-    upb_Arena* next = a->parent;
-    a->parent = next->parent;
-    a = next;
-  }
-  return a;
-}
-
-static void upb_Arena_addblock(upb_Arena* a, upb_Arena* root, void* ptr,
-                               size_t size) {
-  mem_block* block = ptr;
-
-  /* The block is for arena |a|, but should appear in the freelist of |root|. */
-  block->next = root->freelist;
-  block->size = (uint32_t)size;
-  block->cleanups = 0;
-  root->freelist = block;
-  a->last_size = block->size;
-  if (!root->freelist_tail) root->freelist_tail = block;
-
-  a->head.ptr = UPB_PTR_AT(block, memblock_reserve, char);
-  a->head.end = UPB_PTR_AT(block, size, char);
-  a->cleanup_metadata = upb_cleanup_metadata(
-      &block->cleanups, upb_cleanup_has_initial_block(a->cleanup_metadata));
-
-  UPB_POISON_MEMORY_REGION(a->head.ptr, a->head.end - a->head.ptr);
-}
-
-static bool upb_Arena_Allocblock(upb_Arena* a, size_t size) {
-  upb_Arena* root = arena_findroot(a);
-  size_t block_size = UPB_MAX(size, a->last_size * 2) + memblock_reserve;
-  mem_block* block = upb_malloc(root->block_alloc, block_size);
-
-  if (!block) return false;
-  upb_Arena_addblock(a, root, block, block_size);
-  return true;
-}
-
-void* _upb_Arena_SlowMalloc(upb_Arena* a, size_t size) {
-  if (!upb_Arena_Allocblock(a, size)) return NULL; /* Out of memory. */
-  UPB_ASSERT(_upb_ArenaHas(a) >= size);
-  return upb_Arena_Malloc(a, size);
-}
-
-static void* upb_Arena_doalloc(upb_alloc* alloc, void* ptr, size_t oldsize,
-                               size_t size) {
-  upb_Arena* a = (upb_Arena*)alloc; /* upb_alloc is initial member. */
-  return upb_Arena_Realloc(a, ptr, oldsize, size);
-}
-
-/* Public Arena API ***********************************************************/
-
-upb_Arena* arena_initslow(void* mem, size_t n, upb_alloc* alloc) {
-  const size_t first_block_overhead = sizeof(upb_Arena) + memblock_reserve;
-  upb_Arena* a;
-
-  /* We need to malloc the initial block. */
-  n = first_block_overhead + 256;
-  if (!alloc || !(mem = upb_malloc(alloc, n))) {
-    return NULL;
-  }
-
-  a = UPB_PTR_AT(mem, n - sizeof(*a), upb_Arena);
-  n -= sizeof(*a);
-
-  a->head.alloc.func = &upb_Arena_doalloc;
-  a->block_alloc = alloc;
-  a->parent = a;
-  a->refcount = 1;
-  a->freelist = NULL;
-  a->freelist_tail = NULL;
-  a->cleanup_metadata = upb_cleanup_metadata(NULL, false);
-
-  upb_Arena_addblock(a, a, mem, n);
-
-  return a;
-}
-
-upb_Arena* upb_Arena_Init(void* mem, size_t n, upb_alloc* alloc) {
-  upb_Arena* a;
-
-  if (n) {
-    /* Align initial pointer up so that we return properly-aligned pointers. */
-    void* aligned = (void*)UPB_ALIGN_UP((uintptr_t)mem, UPB_MALLOC_ALIGN);
-    size_t delta = (uintptr_t)aligned - (uintptr_t)mem;
-    n = delta <= n ? n - delta : 0;
-    mem = aligned;
-  }
-
-  /* Round block size down to alignof(*a) since we will allocate the arena
-   * itself at the end. */
-  n = UPB_ALIGN_DOWN(n, UPB_ALIGN_OF(upb_Arena));
-
-  if (UPB_UNLIKELY(n < sizeof(upb_Arena))) {
-    return arena_initslow(mem, n, alloc);
-  }
-
-  a = UPB_PTR_AT(mem, n - sizeof(*a), upb_Arena);
-
-  a->head.alloc.func = &upb_Arena_doalloc;
-  a->block_alloc = alloc;
-  a->parent = a;
-  a->refcount = 1;
-  a->last_size = UPB_MAX(128, n);
-  a->head.ptr = mem;
-  a->head.end = UPB_PTR_AT(mem, n - sizeof(*a), char);
-  a->freelist = NULL;
-  a->cleanup_metadata = upb_cleanup_metadata(NULL, true);
-
-  return a;
-}
-
-static void arena_dofree(upb_Arena* a) {
-  mem_block* block = a->freelist;
-  UPB_ASSERT(a->parent == a);
-  UPB_ASSERT(a->refcount == 0);
-
-  while (block) {
-    /* Load first since we are deleting block. */
-    mem_block* next = block->next;
-
-    if (block->cleanups > 0) {
-      cleanup_ent* end = UPB_PTR_AT(block, block->size, void);
-      cleanup_ent* ptr = end - block->cleanups;
-
-      for (; ptr < end; ptr++) {
-        ptr->cleanup(ptr->ud);
-      }
-    }
-
-    upb_free(a->block_alloc, block);
-    block = next;
-  }
-}
-
-void upb_Arena_Free(upb_Arena* a) {
-  a = arena_findroot(a);
-  if (--a->refcount == 0) arena_dofree(a);
-}
-
-bool upb_Arena_AddCleanup(upb_Arena* a, void* ud, upb_CleanupFunc* func) {
-  cleanup_ent* ent;
-  uint32_t* cleanups = upb_cleanup_pointer(a->cleanup_metadata);
-
-  if (!cleanups || _upb_ArenaHas(a) < sizeof(cleanup_ent)) {
-    if (!upb_Arena_Allocblock(a, 128)) return false; /* Out of memory. */
-    UPB_ASSERT(_upb_ArenaHas(a) >= sizeof(cleanup_ent));
-    cleanups = upb_cleanup_pointer(a->cleanup_metadata);
-  }
-
-  a->head.end -= sizeof(cleanup_ent);
-  ent = (cleanup_ent*)a->head.end;
-  (*cleanups)++;
-  UPB_UNPOISON_MEMORY_REGION(ent, sizeof(cleanup_ent));
-
-  ent->cleanup = func;
-  ent->ud = ud;
-
-  return true;
-}
-
-bool upb_Arena_Fuse(upb_Arena* a1, upb_Arena* a2) {
-  upb_Arena* r1 = arena_findroot(a1);
-  upb_Arena* r2 = arena_findroot(a2);
-
-  if (r1 == r2) return true; /* Already fused. */
-
-  /* Do not fuse initial blocks since we cannot lifetime extend them. */
-  if (upb_cleanup_has_initial_block(r1->cleanup_metadata)) return false;
-  if (upb_cleanup_has_initial_block(r2->cleanup_metadata)) return false;
-
-  /* Only allow fuse with a common allocator */
-  if (r1->block_alloc != r2->block_alloc) return false;
-
-  /* We want to join the smaller tree to the larger tree.
-   * So swap first if they are backwards. */
-  if (r1->refcount < r2->refcount) {
-    upb_Arena* tmp = r1;
-    r1 = r2;
-    r2 = tmp;
-  }
-
-  /* r1 takes over r2's freelist and refcount. */
-  r1->refcount += r2->refcount;
-  if (r2->freelist_tail) {
-    UPB_ASSERT(r2->freelist_tail->next == NULL);
-    r2->freelist_tail->next = r1->freelist;
-    r1->freelist = r2->freelist;
-  }
-  r2->parent = r1;
-  return true;
-}
-
-/* Miscellaneous utilities ****************************************************/
-
-static void upb_FixLocale(char* p) {
-  /* printf() is dependent on locales; sadly there is no easy and portable way
-   * to avoid this. This little post-processing step will translate 1,2 -> 1.2
-   * since JSON needs the latter. Arguably a hack, but it is simple and the
-   * alternatives are far more complicated, platform-dependent, and/or larger
-   * in code size. */
-  for (; *p; p++) {
-    if (*p == ',') *p = '.';
-  }
-}
-
-void _upb_EncodeRoundTripDouble(double val, char* buf, size_t size) {
-  assert(size >= kUpb_RoundTripBufferSize);
-  snprintf(buf, size, "%.*g", DBL_DIG, val);
-  if (strtod(buf, NULL) != val) {
-    snprintf(buf, size, "%.*g", DBL_DIG + 2, val);
-    assert(strtod(buf, NULL) == val);
-  }
-  upb_FixLocale(buf);
-}
-
-void _upb_EncodeRoundTripFloat(float val, char* buf, size_t size) {
-  assert(size >= kUpb_RoundTripBufferSize);
-  snprintf(buf, size, "%.*g", FLT_DIG, val);
-  if (strtof(buf, NULL) != val) {
-    snprintf(buf, size, "%.*g", FLT_DIG + 3, val);
-    assert(strtof(buf, NULL) == val);
-  }
-  upb_FixLocale(buf);
-}
-
-/** upb/port_undef.inc ************************************************************/
-/* See port_def.inc.  This should #undef all macros #defined there. */
-
-#undef UPB_SIZE
-#undef UPB_PTR_AT
-#undef UPB_READ_ONEOF
-#undef UPB_WRITE_ONEOF
-#undef UPB_MAPTYPE_STRING
-#undef UPB_INLINE
-#undef UPB_ALIGN_UP
-#undef UPB_ALIGN_DOWN
-#undef UPB_ALIGN_MALLOC
-#undef UPB_ALIGN_OF
-#undef UPB_MALLOC_ALIGN
-#undef UPB_LIKELY
-#undef UPB_UNLIKELY
-#undef UPB_FORCEINLINE
-#undef UPB_NOINLINE
-#undef UPB_NORETURN
-#undef UPB_PRINTF
-#undef UPB_MAX
-#undef UPB_MIN
-#undef UPB_UNUSED
-#undef UPB_ASSUME
-#undef UPB_ASSERT
-#undef UPB_UNREACHABLE
-#undef UPB_SETJMP
-#undef UPB_LONGJMP
-#undef UPB_PTRADD
-#undef UPB_MUSTTAIL
-#undef UPB_FASTTABLE_SUPPORTED
-#undef UPB_FASTTABLE
-#undef UPB_FASTTABLE_INIT
-#undef UPB_POISON_MEMORY_REGION
-#undef UPB_UNPOISON_MEMORY_REGION
-#undef UPB_ASAN
-#undef UPB_TREAT_PROTO2_ENUMS_LIKE_PROTO3
diff --git a/libs/protobuf/php/ext/google/protobuf/php-upb.h b/libs/protobuf/php/ext/google/protobuf/php-upb.h
deleted file mode 100644
index 8291daa..0000000
--- a/libs/protobuf/php/ext/google/protobuf/php-upb.h
+++ /dev/null
@@ -1,6500 +0,0 @@
-/* Amalgamated source file */
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * This is where we define macros used across upb.
- *
- * All of these macros are undef'd in port_undef.inc to avoid leaking them to
- * users.
- *
- * The correct usage is:
- *
- *   #include "upb/foobar.h"
- *   #include "upb/baz.h"
- *
- *   // MUST be last included header.
- *   #include "upb/port_def.inc"
- *
- *   // Code for this file.
- *   // <...>
- *
- *   // Can be omitted for .c files, required for .h.
- *   #include "upb/port_undef.inc"
- *
- * This file is private and must not be included by users!
- */
-
-#if !((defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || \
-      (defined(__cplusplus) && __cplusplus >= 201103L) ||           \
-      (defined(_MSC_VER) && _MSC_VER >= 1900))
-#error upb requires C99 or C++11 or MSVC >= 2015.
-#endif
-
-#include <stdint.h>
-#include <stddef.h>
-
-#if UINTPTR_MAX == 0xffffffff
-#define UPB_SIZE(size32, size64) size32
-#else
-#define UPB_SIZE(size32, size64) size64
-#endif
-
-/* If we always read/write as a consistent type to each address, this shouldn't
- * violate aliasing.
- */
-#define UPB_PTR_AT(msg, ofs, type) ((type*)((char*)(msg) + (ofs)))
-
-#define UPB_READ_ONEOF(msg, fieldtype, offset, case_offset, case_val, default) \
-  *UPB_PTR_AT(msg, case_offset, int) == case_val                              \
-      ? *UPB_PTR_AT(msg, offset, fieldtype)                                   \
-      : default
-
-#define UPB_WRITE_ONEOF(msg, fieldtype, offset, value, case_offset, case_val) \
-  *UPB_PTR_AT(msg, case_offset, int) = case_val;                             \
-  *UPB_PTR_AT(msg, offset, fieldtype) = value;
-
-#define UPB_MAPTYPE_STRING 0
-
-/* UPB_INLINE: inline if possible, emit standalone code if required. */
-#ifdef __cplusplus
-#define UPB_INLINE inline
-#elif defined (__GNUC__) || defined(__clang__)
-#define UPB_INLINE static __inline__
-#else
-#define UPB_INLINE static
-#endif
-
-#define UPB_MALLOC_ALIGN 8
-#define UPB_ALIGN_UP(size, align) (((size) + (align) - 1) / (align) * (align))
-#define UPB_ALIGN_DOWN(size, align) ((size) / (align) * (align))
-#define UPB_ALIGN_MALLOC(size) UPB_ALIGN_UP(size, UPB_MALLOC_ALIGN)
-#define UPB_ALIGN_OF(type) offsetof (struct { char c; type member; }, member)
-
-// Hints to the compiler about likely/unlikely branches.
-#if defined (__GNUC__) || defined(__clang__)
-#define UPB_LIKELY(x) __builtin_expect((bool)(x), 1)
-#define UPB_UNLIKELY(x) __builtin_expect((bool)(x), 0)
-#else
-#define UPB_LIKELY(x) (x)
-#define UPB_UNLIKELY(x) (x)
-#endif
-
-// Macros for function attributes on compilers that support them.
-#ifdef __GNUC__
-#define UPB_FORCEINLINE __inline__ __attribute__((always_inline))
-#define UPB_NOINLINE __attribute__((noinline))
-#define UPB_NORETURN __attribute__((__noreturn__))
-#define UPB_PRINTF(str, first_vararg) __attribute__((format (printf, str, first_vararg)))
-#elif defined(_MSC_VER)
-#define UPB_NOINLINE
-#define UPB_FORCEINLINE
-#define UPB_NORETURN __declspec(noreturn)
-#define UPB_PRINTF(str, first_vararg)
-#else  /* !defined(__GNUC__) */
-#define UPB_FORCEINLINE
-#define UPB_NOINLINE
-#define UPB_NORETURN
-#define UPB_PRINTF(str, first_vararg)
-#endif
-
-#define UPB_MAX(x, y) ((x) > (y) ? (x) : (y))
-#define UPB_MIN(x, y) ((x) < (y) ? (x) : (y))
-
-#define UPB_UNUSED(var) (void)var
-
-// UPB_ASSUME(): in release mode, we tell the compiler to assume this is true.
-#ifdef NDEBUG
-#ifdef __GNUC__
-#define UPB_ASSUME(expr) if (!(expr)) __builtin_unreachable()
-#elif defined _MSC_VER
-#define UPB_ASSUME(expr) if (!(expr)) __assume(0)
-#else
-#define UPB_ASSUME(expr) do {} while (false && (expr))
-#endif
-#else
-#define UPB_ASSUME(expr) assert(expr)
-#endif
-
-/* UPB_ASSERT(): in release mode, we use the expression without letting it be
- * evaluated.  This prevents "unused variable" warnings. */
-#ifdef NDEBUG
-#define UPB_ASSERT(expr) do {} while (false && (expr))
-#else
-#define UPB_ASSERT(expr) assert(expr)
-#endif
-
-#if defined(__GNUC__) || defined(__clang__)
-#define UPB_UNREACHABLE() do { assert(0); __builtin_unreachable(); } while(0)
-#else
-#define UPB_UNREACHABLE() do { assert(0); } while(0)
-#endif
-
-/* UPB_SETJMP() / UPB_LONGJMP(): avoid setting/restoring signal mask. */
-#ifdef __APPLE__
-#define UPB_SETJMP(buf) _setjmp(buf)
-#define UPB_LONGJMP(buf, val) _longjmp(buf, val)
-#else
-#define UPB_SETJMP(buf) setjmp(buf)
-#define UPB_LONGJMP(buf, val) longjmp(buf, val)
-#endif
-
-/* UPB_PTRADD(ptr, ofs): add pointer while avoiding "NULL + 0" UB */
-#define UPB_PTRADD(ptr, ofs) ((ofs) ? (ptr) + (ofs) : (ptr))
-
-/* Configure whether fasttable is switched on or not. *************************/
-
-#ifdef __has_attribute
-#define UPB_HAS_ATTRIBUTE(x) __has_attribute(x)
-#else
-#define UPB_HAS_ATTRIBUTE(x) 0
-#endif
-
-#if UPB_HAS_ATTRIBUTE(musttail)
-#define UPB_MUSTTAIL __attribute__((musttail))
-#else
-#define UPB_MUSTTAIL
-#endif
-
-#undef UPB_HAS_ATTRIBUTE
-
-/* This check is not fully robust: it does not require that we have "musttail"
- * support available. We need tail calls to avoid consuming arbitrary amounts
- * of stack space.
- *
- * GCC/Clang can mostly be trusted to generate tail calls as long as
- * optimization is enabled, but, debug builds will not generate tail calls
- * unless "musttail" is available.
- *
- * We should probably either:
- *   1. require that the compiler supports musttail.
- *   2. add some fallback code for when musttail isn't available (ie. return
- *      instead of tail calling). This is safe and portable, but this comes at
- *      a CPU cost.
- */
-#if (defined(__x86_64__) || defined(__aarch64__)) && defined(__GNUC__)
-#define UPB_FASTTABLE_SUPPORTED 1
-#else
-#define UPB_FASTTABLE_SUPPORTED 0
-#endif
-
-/* define UPB_ENABLE_FASTTABLE to force fast table support.
- * This is useful when we want to ensure we are really getting fasttable,
- * for example for testing or benchmarking. */
-#if defined(UPB_ENABLE_FASTTABLE)
-#if !UPB_FASTTABLE_SUPPORTED
-#error fasttable is x86-64/ARM64 only and requires GCC or Clang.
-#endif
-#define UPB_FASTTABLE 1
-/* Define UPB_TRY_ENABLE_FASTTABLE to use fasttable if possible.
- * This is useful for releasing code that might be used on multiple platforms,
- * for example the PHP or Ruby C extensions. */
-#elif defined(UPB_TRY_ENABLE_FASTTABLE)
-#define UPB_FASTTABLE UPB_FASTTABLE_SUPPORTED
-#else
-#define UPB_FASTTABLE 0
-#endif
-
-/* UPB_FASTTABLE_INIT() allows protos compiled for fasttable to gracefully
- * degrade to non-fasttable if we are using UPB_TRY_ENABLE_FASTTABLE. */
-#if !UPB_FASTTABLE && defined(UPB_TRY_ENABLE_FASTTABLE)
-#define UPB_FASTTABLE_INIT(...)
-#else
-#define UPB_FASTTABLE_INIT(...) __VA_ARGS__
-#endif
-
-#undef UPB_FASTTABLE_SUPPORTED
-
-/* ASAN poisoning (for arena) *************************************************/
-
-#if defined(__SANITIZE_ADDRESS__)
-#define UPB_ASAN 1
-#ifdef __cplusplus
-extern "C" {
-#endif
-void __asan_poison_memory_region(void const volatile *addr, size_t size);
-void __asan_unpoison_memory_region(void const volatile *addr, size_t size);
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-#define UPB_POISON_MEMORY_REGION(addr, size) \
-  __asan_poison_memory_region((addr), (size))
-#define UPB_UNPOISON_MEMORY_REGION(addr, size) \
-  __asan_unpoison_memory_region((addr), (size))
-#else
-#define UPB_ASAN 0
-#define UPB_POISON_MEMORY_REGION(addr, size) \
-  ((void)(addr), (void)(size))
-#define UPB_UNPOISON_MEMORY_REGION(addr, size) \
-  ((void)(addr), (void)(size))
-#endif
-
-/* Disable proto2 arena behavior (TEMPORARY) **********************************/
-
-#ifdef UPB_DISABLE_PROTO2_ENUM_CHECKING
-#define UPB_TREAT_PROTO2_ENUMS_LIKE_PROTO3 1
-#else
-#define UPB_TREAT_PROTO2_ENUMS_LIKE_PROTO3 0
-#endif
-
-/** upb/collections.h ************************************************************/
-#ifndef UPB_COLLECTIONS_H_
-#define UPB_COLLECTIONS_H_
-
-
-/** google/protobuf/descriptor.upb.h ************************************************************//* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     google/protobuf/descriptor.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#ifndef GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H_
-#define GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H_
-
-
-/** upb/msg_internal.h ************************************************************/
-/*
-** Our memory representation for parsing tables and messages themselves.
-** Functions in this file are used by generated code and possibly reflection.
-**
-** The definitions in this file are internal to upb.
-**/
-
-#ifndef UPB_MSG_INT_H_
-#define UPB_MSG_INT_H_
-
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
-
-
-/** upb/msg.h ************************************************************/
-/*
- * Public APIs for message operations that do not require descriptors.
- * These functions can be used even in build that does not want to depend on
- * reflection or descriptors.
- *
- * Descriptor-based reflection functionality lives in reflection.h.
- */
-
-#ifndef UPB_MSG_H_
-#define UPB_MSG_H_
-
-#include <stddef.h>
-
-
-/** upb/upb.h ************************************************************/
-/*
- * This file contains shared definitions that are widely used across upb.
- */
-
-#ifndef UPB_H_
-#define UPB_H_
-
-#include <assert.h>
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stddef.h>
-#include <stdint.h>
-#include <string.h>
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* upb_Status *****************************************************************/
-
-#define _kUpb_Status_MaxMessage 127
-
-typedef struct {
-  bool ok;
-  char msg[_kUpb_Status_MaxMessage]; /* Error message; NULL-terminated. */
-} upb_Status;
-
-const char* upb_Status_ErrorMessage(const upb_Status* status);
-bool upb_Status_IsOk(const upb_Status* status);
-
-/* These are no-op if |status| is NULL. */
-void upb_Status_Clear(upb_Status* status);
-void upb_Status_SetErrorMessage(upb_Status* status, const char* msg);
-void upb_Status_SetErrorFormat(upb_Status* status, const char* fmt, ...)
-    UPB_PRINTF(2, 3);
-void upb_Status_VSetErrorFormat(upb_Status* status, const char* fmt,
-                                va_list args) UPB_PRINTF(2, 0);
-void upb_Status_VAppendErrorFormat(upb_Status* status, const char* fmt,
-                                   va_list args) UPB_PRINTF(2, 0);
-
-/** upb_StringView ************************************************************/
-
-typedef struct {
-  const char* data;
-  size_t size;
-} upb_StringView;
-
-UPB_INLINE upb_StringView upb_StringView_FromDataAndSize(const char* data,
-                                                         size_t size) {
-  upb_StringView ret;
-  ret.data = data;
-  ret.size = size;
-  return ret;
-}
-
-UPB_INLINE upb_StringView upb_StringView_FromString(const char* data) {
-  return upb_StringView_FromDataAndSize(data, strlen(data));
-}
-
-UPB_INLINE bool upb_StringView_IsEqual(upb_StringView a, upb_StringView b) {
-  return a.size == b.size && memcmp(a.data, b.data, a.size) == 0;
-}
-
-#define UPB_STRINGVIEW_INIT(ptr, len) \
-  { ptr, len }
-
-#define UPB_STRINGVIEW_FORMAT "%.*s"
-#define UPB_STRINGVIEW_ARGS(view) (int)(view).size, (view).data
-
-/** upb_alloc *****************************************************************/
-
-/* A upb_alloc is a possibly-stateful allocator object.
- *
- * It could either be an arena allocator (which doesn't require individual
- * free() calls) or a regular malloc() (which does).  The client must therefore
- * free memory unless it knows that the allocator is an arena allocator. */
-
-struct upb_alloc;
-typedef struct upb_alloc upb_alloc;
-
-/* A malloc()/free() function.
- * If "size" is 0 then the function acts like free(), otherwise it acts like
- * realloc().  Only "oldsize" bytes from a previous allocation are preserved. */
-typedef void* upb_alloc_func(upb_alloc* alloc, void* ptr, size_t oldsize,
-                             size_t size);
-
-struct upb_alloc {
-  upb_alloc_func* func;
-};
-
-UPB_INLINE void* upb_malloc(upb_alloc* alloc, size_t size) {
-  UPB_ASSERT(alloc);
-  return alloc->func(alloc, NULL, 0, size);
-}
-
-UPB_INLINE void* upb_realloc(upb_alloc* alloc, void* ptr, size_t oldsize,
-                             size_t size) {
-  UPB_ASSERT(alloc);
-  return alloc->func(alloc, ptr, oldsize, size);
-}
-
-UPB_INLINE void upb_free(upb_alloc* alloc, void* ptr) {
-  assert(alloc);
-  alloc->func(alloc, ptr, 0, 0);
-}
-
-/* The global allocator used by upb.  Uses the standard malloc()/free(). */
-
-extern upb_alloc upb_alloc_global;
-
-/* Functions that hard-code the global malloc.
- *
- * We still get benefit because we can put custom logic into our global
- * allocator, like injecting out-of-memory faults in debug/testing builds. */
-
-UPB_INLINE void* upb_gmalloc(size_t size) {
-  return upb_malloc(&upb_alloc_global, size);
-}
-
-UPB_INLINE void* upb_grealloc(void* ptr, size_t oldsize, size_t size) {
-  return upb_realloc(&upb_alloc_global, ptr, oldsize, size);
-}
-
-UPB_INLINE void upb_gfree(void* ptr) { upb_free(&upb_alloc_global, ptr); }
-
-/* upb_Arena ******************************************************************/
-
-/* upb_Arena is a specific allocator implementation that uses arena allocation.
- * The user provides an allocator that will be used to allocate the underlying
- * arena blocks.  Arenas by nature do not require the individual allocations
- * to be freed.  However the Arena does allow users to register cleanup
- * functions that will run when the arena is destroyed.
- *
- * A upb_Arena is *not* thread-safe.
- *
- * You could write a thread-safe arena allocator that satisfies the
- * upb_alloc interface, but it would not be as efficient for the
- * single-threaded case. */
-
-typedef void upb_CleanupFunc(void* ud);
-
-struct upb_Arena;
-typedef struct upb_Arena upb_Arena;
-
-typedef struct {
-  /* We implement the allocator interface.
-   * This must be the first member of upb_Arena!
-   * TODO(haberman): remove once handlers are gone. */
-  upb_alloc alloc;
-
-  char *ptr, *end;
-} _upb_ArenaHead;
-
-/* Creates an arena from the given initial block (if any -- n may be 0).
- * Additional blocks will be allocated from |alloc|.  If |alloc| is NULL, this
- * is a fixed-size arena and cannot grow. */
-upb_Arena* upb_Arena_Init(void* mem, size_t n, upb_alloc* alloc);
-void upb_Arena_Free(upb_Arena* a);
-bool upb_Arena_AddCleanup(upb_Arena* a, void* ud, upb_CleanupFunc* func);
-bool upb_Arena_Fuse(upb_Arena* a, upb_Arena* b);
-void* _upb_Arena_SlowMalloc(upb_Arena* a, size_t size);
-
-UPB_INLINE upb_alloc* upb_Arena_Alloc(upb_Arena* a) { return (upb_alloc*)a; }
-
-UPB_INLINE size_t _upb_ArenaHas(upb_Arena* a) {
-  _upb_ArenaHead* h = (_upb_ArenaHead*)a;
-  return (size_t)(h->end - h->ptr);
-}
-
-UPB_INLINE void* _upb_Arena_FastMalloc(upb_Arena* a, size_t size) {
-  _upb_ArenaHead* h = (_upb_ArenaHead*)a;
-  void* ret = h->ptr;
-  UPB_ASSERT(UPB_ALIGN_MALLOC((uintptr_t)ret) == (uintptr_t)ret);
-  UPB_ASSERT(UPB_ALIGN_MALLOC(size) == size);
-  UPB_UNPOISON_MEMORY_REGION(ret, size);
-
-  h->ptr += size;
-
-#if UPB_ASAN
-  {
-    size_t guard_size = 32;
-    if (_upb_ArenaHas(a) >= guard_size) {
-      h->ptr += guard_size;
-    } else {
-      h->ptr = h->end;
-    }
-  }
-#endif
-
-  return ret;
-}
-
-UPB_INLINE void* upb_Arena_Malloc(upb_Arena* a, size_t size) {
-  size = UPB_ALIGN_MALLOC(size);
-
-  if (UPB_UNLIKELY(_upb_ArenaHas(a) < size)) {
-    return _upb_Arena_SlowMalloc(a, size);
-  }
-
-  return _upb_Arena_FastMalloc(a, size);
-}
-
-// Shrinks the last alloc from arena.
-// REQUIRES: (ptr, oldsize) was the last malloc/realloc from this arena.
-// We could also add a upb_Arena_TryShrinkLast() which is simply a no-op if
-// this was not the last alloc.
-UPB_INLINE void upb_Arena_ShrinkLast(upb_Arena* a, void* ptr, size_t oldsize,
-                                     size_t size) {
-  _upb_ArenaHead* h = (_upb_ArenaHead*)a;
-  oldsize = UPB_ALIGN_MALLOC(oldsize);
-  size = UPB_ALIGN_MALLOC(size);
-  UPB_ASSERT((char*)ptr + oldsize == h->ptr);  // Must be the last alloc.
-  UPB_ASSERT(size <= oldsize);
-  h->ptr = (char*)ptr + size;
-}
-
-UPB_INLINE void* upb_Arena_Realloc(upb_Arena* a, void* ptr, size_t oldsize,
-                                   size_t size) {
-  _upb_ArenaHead* h = (_upb_ArenaHead*)a;
-  oldsize = UPB_ALIGN_MALLOC(oldsize);
-  size = UPB_ALIGN_MALLOC(size);
-  bool is_most_recent_alloc = (uintptr_t)ptr + oldsize == (uintptr_t)h->ptr;
-
-  if (is_most_recent_alloc) {
-    ptrdiff_t diff = size - oldsize;
-    if ((ptrdiff_t)_upb_ArenaHas(a) >= diff) {
-      h->ptr += diff;
-      return ptr;
-    }
-  } else if (size <= oldsize) {
-    return ptr;
-  }
-
-  void* ret = upb_Arena_Malloc(a, size);
-
-  if (ret && oldsize > 0) {
-    memcpy(ret, ptr, UPB_MIN(oldsize, size));
-  }
-
-  return ret;
-}
-
-UPB_INLINE upb_Arena* upb_Arena_New(void) {
-  return upb_Arena_Init(NULL, 0, &upb_alloc_global);
-}
-
-/* Constants ******************************************************************/
-
-/* A list of types as they are encoded on-the-wire. */
-typedef enum {
-  kUpb_WireType_Varint = 0,
-  kUpb_WireType_64Bit = 1,
-  kUpb_WireType_Delimited = 2,
-  kUpb_WireType_StartGroup = 3,
-  kUpb_WireType_EndGroup = 4,
-  kUpb_WireType_32Bit = 5
-} upb_WireType;
-
-/* The types a field can have.  Note that this list is not identical to the
- * types defined in descriptor.proto, which gives INT32 and SINT32 separate
- * types (we distinguish the two with the "integer encoding" enum below). */
-typedef enum {
-  kUpb_CType_Bool = 1,
-  kUpb_CType_Float = 2,
-  kUpb_CType_Int32 = 3,
-  kUpb_CType_UInt32 = 4,
-  kUpb_CType_Enum = 5, /* Enum values are int32. */
-  kUpb_CType_Message = 6,
-  kUpb_CType_Double = 7,
-  kUpb_CType_Int64 = 8,
-  kUpb_CType_UInt64 = 9,
-  kUpb_CType_String = 10,
-  kUpb_CType_Bytes = 11
-} upb_CType;
-
-/* The repeated-ness of each field; this matches descriptor.proto. */
-typedef enum {
-  kUpb_Label_Optional = 1,
-  kUpb_Label_Required = 2,
-  kUpb_Label_Repeated = 3
-} upb_Label;
-
-/* Descriptor types, as defined in descriptor.proto. */
-typedef enum {
-  kUpb_FieldType_Double = 1,
-  kUpb_FieldType_Float = 2,
-  kUpb_FieldType_Int64 = 3,
-  kUpb_FieldType_UInt64 = 4,
-  kUpb_FieldType_Int32 = 5,
-  kUpb_FieldType_Fixed64 = 6,
-  kUpb_FieldType_Fixed32 = 7,
-  kUpb_FieldType_Bool = 8,
-  kUpb_FieldType_String = 9,
-  kUpb_FieldType_Group = 10,
-  kUpb_FieldType_Message = 11,
-  kUpb_FieldType_Bytes = 12,
-  kUpb_FieldType_UInt32 = 13,
-  kUpb_FieldType_Enum = 14,
-  kUpb_FieldType_SFixed32 = 15,
-  kUpb_FieldType_SFixed64 = 16,
-  kUpb_FieldType_SInt32 = 17,
-  kUpb_FieldType_SInt64 = 18
-} upb_FieldType;
-
-#define kUpb_Map_Begin ((size_t)-1)
-
-UPB_INLINE bool _upb_IsLittleEndian(void) {
-  int x = 1;
-  return *(char*)&x == 1;
-}
-
-UPB_INLINE uint32_t _upb_BigEndian_Swap32(uint32_t val) {
-  if (_upb_IsLittleEndian()) {
-    return val;
-  } else {
-    return ((val & 0xff) << 24) | ((val & 0xff00) << 8) |
-           ((val & 0xff0000) >> 8) | ((val & 0xff000000) >> 24);
-  }
-}
-
-UPB_INLINE uint64_t _upb_BigEndian_Swap64(uint64_t val) {
-  if (_upb_IsLittleEndian()) {
-    return val;
-  } else {
-    return ((uint64_t)_upb_BigEndian_Swap32((uint32_t)val) << 32) |
-           _upb_BigEndian_Swap32((uint32_t)(val >> 32));
-  }
-}
-
-UPB_INLINE int _upb_Log2Ceiling(int x) {
-  if (x <= 1) return 0;
-#ifdef __GNUC__
-  return 32 - __builtin_clz(x - 1);
-#else
-  int lg2 = 0;
-  while (1 << lg2 < x) lg2++;
-  return lg2;
-#endif
-}
-
-UPB_INLINE int _upb_Log2CeilingSize(int x) { return 1 << _upb_Log2Ceiling(x); }
-
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#endif /* UPB_H_ */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** upb_Message ***************************************************************/
-
-typedef void upb_Message;
-
-/* For users these are opaque. They can be obtained from
- * upb_MessageDef_MiniTable() but users cannot access any of the members. */
-struct upb_MiniTable;
-typedef struct upb_MiniTable upb_MiniTable;
-
-/* Adds unknown data (serialized protobuf data) to the given message.  The data
- * is copied into the message instance. */
-void upb_Message_AddUnknown(upb_Message* msg, const char* data, size_t len,
-                            upb_Arena* arena);
-
-/* Returns a reference to the message's unknown data. */
-const char* upb_Message_GetUnknown(const upb_Message* msg, size_t* len);
-
-/* Returns the number of extensions present in this message. */
-size_t upb_Message_ExtensionCount(const upb_Message* msg);
-
-/** upb_ExtensionRegistry *****************************************************/
-
-/* Extension registry: a dynamic data structure that stores a map of:
- *   (upb_MiniTable, number) -> extension info
- *
- * upb_decode() uses upb_ExtensionRegistry to look up extensions while parsing
- * binary format.
- *
- * upb_ExtensionRegistry is part of the mini-table (msglayout) family of
- * objects. Like all mini-table objects, it is suitable for reflection-less
- * builds that do not want to expose names into the binary.
- *
- * Unlike most mini-table types, upb_ExtensionRegistry requires dynamic memory
- * allocation and dynamic initialization:
- * * If reflection is being used, then upb_DefPool will construct an appropriate
- *   upb_ExtensionRegistry automatically.
- * * For a mini-table only build, the user must manually construct the
- *   upb_ExtensionRegistry and populate it with all of the extensions the user
- * cares about.
- * * A third alternative is to manually unpack relevant extensions after the
- *   main parse is complete, similar to how Any works. This is perhaps the
- *   nicest solution from the perspective of reducing dependencies, avoiding
- *   dynamic memory allocation, and avoiding the need to parse uninteresting
- *   extensions.  The downsides are:
- *     (1) parse errors are not caught during the main parse
- *     (2) the CPU hit of parsing comes during access, which could cause an
- *         undesirable stutter in application performance.
- *
- * Users cannot directly get or put into this map. Users can only add the
- * extensions from a generated module and pass the extension registry to the
- * binary decoder.
- *
- * A upb_DefPool provides a upb_ExtensionRegistry, so any users who use
- * reflection do not need to populate a upb_ExtensionRegistry directly.
- */
-
-struct upb_ExtensionRegistry;
-typedef struct upb_ExtensionRegistry upb_ExtensionRegistry;
-
-/* Creates a upb_ExtensionRegistry in the given arena.  The arena must outlive
- * any use of the extreg. */
-upb_ExtensionRegistry* upb_ExtensionRegistry_New(upb_Arena* arena);
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#endif /* UPB_MSG_INT_H_ */
-
-/** upb/table_internal.h ************************************************************/
-/*
- * upb_table
- *
- * This header is INTERNAL-ONLY!  Its interfaces are not public or stable!
- * This file defines very fast int->upb_value (inttable) and string->upb_value
- * (strtable) hash tables.
- *
- * The table uses chained scatter with Brent's variation (inspired by the Lua
- * implementation of hash tables).  The hash function for strings is Austin
- * Appleby's "MurmurHash."
- *
- * The inttable uses uintptr_t as its key, which guarantees it can be used to
- * store pointers or integers of at least 32 bits (upb isn't really useful on
- * systems where sizeof(void*) < 4).
- *
- * The table must be homogeneous (all values of the same type).  In debug
- * mode, we check this on insert and lookup.
- */
-
-#ifndef UPB_TABLE_H_
-#define UPB_TABLE_H_
-
-#include <stdint.h>
-#include <string.h>
-
-
-// Must be last.
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* upb_value ******************************************************************/
-
-typedef struct {
-  uint64_t val;
-} upb_value;
-
-/* Variant that works with a length-delimited rather than NULL-delimited string,
- * as supported by strtable. */
-char* upb_strdup2(const char* s, size_t len, upb_Arena* a);
-
-UPB_INLINE void _upb_value_setval(upb_value* v, uint64_t val) { v->val = val; }
-
-/* For each value ctype, define the following set of functions:
- *
- * // Get/set an int32 from a upb_value.
- * int32_t upb_value_getint32(upb_value val);
- * void upb_value_setint32(upb_value *val, int32_t cval);
- *
- * // Construct a new upb_value from an int32.
- * upb_value upb_value_int32(int32_t val); */
-#define FUNCS(name, membername, type_t, converter, proto_type)       \
-  UPB_INLINE void upb_value_set##name(upb_value* val, type_t cval) { \
-    val->val = (converter)cval;                                      \
-  }                                                                  \
-  UPB_INLINE upb_value upb_value_##name(type_t val) {                \
-    upb_value ret;                                                   \
-    upb_value_set##name(&ret, val);                                  \
-    return ret;                                                      \
-  }                                                                  \
-  UPB_INLINE type_t upb_value_get##name(upb_value val) {             \
-    return (type_t)(converter)val.val;                               \
-  }
-
-FUNCS(int32, int32, int32_t, int32_t, UPB_CTYPE_INT32)
-FUNCS(int64, int64, int64_t, int64_t, UPB_CTYPE_INT64)
-FUNCS(uint32, uint32, uint32_t, uint32_t, UPB_CTYPE_UINT32)
-FUNCS(uint64, uint64, uint64_t, uint64_t, UPB_CTYPE_UINT64)
-FUNCS(bool, _bool, bool, bool, UPB_CTYPE_BOOL)
-FUNCS(cstr, cstr, char*, uintptr_t, UPB_CTYPE_CSTR)
-FUNCS(ptr, ptr, void*, uintptr_t, UPB_CTYPE_PTR)
-FUNCS(constptr, constptr, const void*, uintptr_t, UPB_CTYPE_CONSTPTR)
-
-#undef FUNCS
-
-UPB_INLINE void upb_value_setfloat(upb_value* val, float cval) {
-  memcpy(&val->val, &cval, sizeof(cval));
-}
-
-UPB_INLINE void upb_value_setdouble(upb_value* val, double cval) {
-  memcpy(&val->val, &cval, sizeof(cval));
-}
-
-UPB_INLINE upb_value upb_value_float(float cval) {
-  upb_value ret;
-  upb_value_setfloat(&ret, cval);
-  return ret;
-}
-
-UPB_INLINE upb_value upb_value_double(double cval) {
-  upb_value ret;
-  upb_value_setdouble(&ret, cval);
-  return ret;
-}
-
-#undef SET_TYPE
-
-/* upb_tabkey *****************************************************************/
-
-/* Either:
- *   1. an actual integer key, or
- *   2. a pointer to a string prefixed by its uint32_t length, owned by us.
- *
- * ...depending on whether this is a string table or an int table.  We would
- * make this a union of those two types, but C89 doesn't support statically
- * initializing a non-first union member. */
-typedef uintptr_t upb_tabkey;
-
-UPB_INLINE char* upb_tabstr(upb_tabkey key, uint32_t* len) {
-  char* mem = (char*)key;
-  if (len) memcpy(len, mem, sizeof(*len));
-  return mem + sizeof(*len);
-}
-
-UPB_INLINE upb_StringView upb_tabstrview(upb_tabkey key) {
-  upb_StringView ret;
-  uint32_t len;
-  ret.data = upb_tabstr(key, &len);
-  ret.size = len;
-  return ret;
-}
-
-/* upb_tabval *****************************************************************/
-
-typedef struct upb_tabval {
-  uint64_t val;
-} upb_tabval;
-
-#define UPB_TABVALUE_EMPTY_INIT \
-  { -1 }
-
-/* upb_table ******************************************************************/
-
-typedef struct _upb_tabent {
-  upb_tabkey key;
-  upb_tabval val;
-
-  /* Internal chaining.  This is const so we can create static initializers for
-   * tables.  We cast away const sometimes, but *only* when the containing
-   * upb_table is known to be non-const.  This requires a bit of care, but
-   * the subtlety is confined to table.c. */
-  const struct _upb_tabent* next;
-} upb_tabent;
-
-typedef struct {
-  size_t count;       /* Number of entries in the hash part. */
-  uint32_t mask;      /* Mask to turn hash value -> bucket. */
-  uint32_t max_count; /* Max count before we hit our load limit. */
-  uint8_t size_lg2;   /* Size of the hashtable part is 2^size_lg2 entries. */
-  upb_tabent* entries;
-} upb_table;
-
-typedef struct {
-  upb_table t;
-} upb_strtable;
-
-typedef struct {
-  upb_table t;             /* For entries that don't fit in the array part. */
-  const upb_tabval* array; /* Array part of the table. See const note above. */
-  size_t array_size;       /* Array part size. */
-  size_t array_count;      /* Array part number of elements. */
-} upb_inttable;
-
-UPB_INLINE size_t upb_table_size(const upb_table* t) {
-  if (t->size_lg2 == 0)
-    return 0;
-  else
-    return 1 << t->size_lg2;
-}
-
-/* Internal-only functions, in .h file only out of necessity. */
-UPB_INLINE bool upb_tabent_isempty(const upb_tabent* e) { return e->key == 0; }
-
-/* Initialize and uninitialize a table, respectively.  If memory allocation
- * failed, false is returned that the table is uninitialized. */
-bool upb_inttable_init(upb_inttable* table, upb_Arena* a);
-bool upb_strtable_init(upb_strtable* table, size_t expected_size, upb_Arena* a);
-
-/* Returns the number of values in the table. */
-size_t upb_inttable_count(const upb_inttable* t);
-UPB_INLINE size_t upb_strtable_count(const upb_strtable* t) {
-  return t->t.count;
-}
-
-void upb_strtable_clear(upb_strtable* t);
-
-/* Inserts the given key into the hashtable with the given value.  The key must
- * not already exist in the hash table.  For string tables, the key must be
- * NULL-terminated, and the table will make an internal copy of the key.
- * Inttables must not insert a value of UINTPTR_MAX.
- *
- * If a table resize was required but memory allocation failed, false is
- * returned and the table is unchanged. */
-bool upb_inttable_insert(upb_inttable* t, uintptr_t key, upb_value val,
-                         upb_Arena* a);
-bool upb_strtable_insert(upb_strtable* t, const char* key, size_t len,
-                         upb_value val, upb_Arena* a);
-
-/* Looks up key in this table, returning "true" if the key was found.
- * If v is non-NULL, copies the value for this key into *v. */
-bool upb_inttable_lookup(const upb_inttable* t, uintptr_t key, upb_value* v);
-bool upb_strtable_lookup2(const upb_strtable* t, const char* key, size_t len,
-                          upb_value* v);
-
-/* For NULL-terminated strings. */
-UPB_INLINE bool upb_strtable_lookup(const upb_strtable* t, const char* key,
-                                    upb_value* v) {
-  return upb_strtable_lookup2(t, key, strlen(key), v);
-}
-
-/* Removes an item from the table.  Returns true if the remove was successful,
- * and stores the removed item in *val if non-NULL. */
-bool upb_inttable_remove(upb_inttable* t, uintptr_t key, upb_value* val);
-bool upb_strtable_remove2(upb_strtable* t, const char* key, size_t len,
-                          upb_value* val);
-
-UPB_INLINE bool upb_strtable_remove(upb_strtable* t, const char* key,
-                                    upb_value* v) {
-  return upb_strtable_remove2(t, key, strlen(key), v);
-}
-
-/* Updates an existing entry in an inttable.  If the entry does not exist,
- * returns false and does nothing.  Unlike insert/remove, this does not
- * invalidate iterators. */
-bool upb_inttable_replace(upb_inttable* t, uintptr_t key, upb_value val);
-
-/* Optimizes the table for the current set of entries, for both memory use and
- * lookup time.  Client should call this after all entries have been inserted;
- * inserting more entries is legal, but will likely require a table resize. */
-void upb_inttable_compact(upb_inttable* t, upb_Arena* a);
-
-/* Exposed for testing only. */
-bool upb_strtable_resize(upb_strtable* t, size_t size_lg2, upb_Arena* a);
-
-/* Iterators ******************************************************************/
-
-/* Iteration over inttable.
- *
- *   intptr_t iter = UPB_INTTABLE_BEGIN;
- *   uintptr_t key;
- *   upb_value val;
- *   while (upb_inttable_next2(t, &key, &val, &iter)) {
- *      // ...
- *   }
- */
-
-#define UPB_INTTABLE_BEGIN -1
-
-bool upb_inttable_next2(const upb_inttable* t, uintptr_t* key, upb_value* val,
-                        intptr_t* iter);
-void upb_inttable_removeiter(upb_inttable* t, intptr_t* iter);
-
-/* Iteration over strtable.
- *
- *   intptr_t iter = UPB_INTTABLE_BEGIN;
- *   upb_StringView key;
- *   upb_value val;
- *   while (upb_strtable_next2(t, &key, &val, &iter)) {
- *      // ...
- *   }
- */
-
-#define UPB_STRTABLE_BEGIN -1
-
-bool upb_strtable_next2(const upb_strtable* t, upb_StringView* key,
-                        upb_value* val, intptr_t* iter);
-void upb_strtable_removeiter(upb_strtable* t, intptr_t* iter);
-
-/* DEPRECATED iterators, slated for removal.
- *
- * Iterators for int and string tables.  We are subject to some kind of unusual
- * design constraints:
- *
- * For high-level languages:
- *  - we must be able to guarantee that we don't crash or corrupt memory even if
- *    the program accesses an invalidated iterator.
- *
- * For C++11 range-based for:
- *  - iterators must be copyable
- *  - iterators must be comparable
- *  - it must be possible to construct an "end" value.
- *
- * Iteration order is undefined.
- *
- * Modifying the table invalidates iterators.  upb_{str,int}table_done() is
- * guaranteed to work even on an invalidated iterator, as long as the table it
- * is iterating over has not been freed.  Calling next() or accessing data from
- * an invalidated iterator yields unspecified elements from the table, but it is
- * guaranteed not to crash and to return real table elements (except when done()
- * is true). */
-
-/* upb_strtable_iter **********************************************************/
-
-/*   upb_strtable_iter i;
- *   upb_strtable_begin(&i, t);
- *   for(; !upb_strtable_done(&i); upb_strtable_next(&i)) {
- *     const char *key = upb_strtable_iter_key(&i);
- *     const upb_value val = upb_strtable_iter_value(&i);
- *     // ...
- *   }
- */
-
-typedef struct {
-  const upb_strtable* t;
-  size_t index;
-} upb_strtable_iter;
-
-void upb_strtable_begin(upb_strtable_iter* i, const upb_strtable* t);
-void upb_strtable_next(upb_strtable_iter* i);
-bool upb_strtable_done(const upb_strtable_iter* i);
-upb_StringView upb_strtable_iter_key(const upb_strtable_iter* i);
-upb_value upb_strtable_iter_value(const upb_strtable_iter* i);
-void upb_strtable_iter_setdone(upb_strtable_iter* i);
-bool upb_strtable_iter_isequal(const upb_strtable_iter* i1,
-                               const upb_strtable_iter* i2);
-
-/* upb_inttable_iter **********************************************************/
-
-/*   upb_inttable_iter i;
- *   upb_inttable_begin(&i, t);
- *   for(; !upb_inttable_done(&i); upb_inttable_next(&i)) {
- *     uintptr_t key = upb_inttable_iter_key(&i);
- *     upb_value val = upb_inttable_iter_value(&i);
- *     // ...
- *   }
- */
-
-typedef struct {
-  const upb_inttable* t;
-  size_t index;
-  bool array_part;
-} upb_inttable_iter;
-
-UPB_INLINE const upb_tabent* str_tabent(const upb_strtable_iter* i) {
-  return &i->t->t.entries[i->index];
-}
-
-void upb_inttable_begin(upb_inttable_iter* i, const upb_inttable* t);
-void upb_inttable_next(upb_inttable_iter* i);
-bool upb_inttable_done(const upb_inttable_iter* i);
-uintptr_t upb_inttable_iter_key(const upb_inttable_iter* i);
-upb_value upb_inttable_iter_value(const upb_inttable_iter* i);
-void upb_inttable_iter_setdone(upb_inttable_iter* i);
-bool upb_inttable_iter_isequal(const upb_inttable_iter* i1,
-                               const upb_inttable_iter* i2);
-
-uint32_t _upb_Hash(const void* p, size_t n, uint64_t seed);
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-
-#endif /* UPB_TABLE_H_ */
-
-/* Must be last. */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** upb_*Int* conversion routines ********************************************/
-
-UPB_INLINE int32_t _upb_Int32_FromI(int v) { return (int32_t)v; }
-
-UPB_INLINE int64_t _upb_Int64_FromLL(long long v) { return (int64_t)v; }
-
-UPB_INLINE uint32_t _upb_UInt32_FromU(unsigned v) { return (uint32_t)v; }
-
-UPB_INLINE uint64_t _upb_UInt64_FromULL(unsigned long long v) {
-  return (uint64_t)v;
-}
-
-/** upb_MiniTable *************************************************************/
-
-/* upb_MiniTable represents the memory layout of a given upb_MessageDef.  The
- * members are public so generated code can initialize them, but users MUST NOT
- * read or write any of its members. */
-
-typedef struct {
-  uint32_t number;
-  uint16_t offset;
-  int16_t presence;       // If >0, hasbit_index.  If <0, ~oneof_index
-  uint16_t submsg_index;  // kUpb_NoSub if descriptortype != MESSAGE/GROUP/ENUM
-  uint8_t descriptortype;
-  uint8_t mode; /* upb_FieldMode | upb_LabelFlags |
-                   (upb_FieldRep << kUpb_FieldRep_Shift) */
-} upb_MiniTable_Field;
-
-#define kUpb_NoSub ((uint16_t)-1)
-
-typedef enum {
-  kUpb_FieldMode_Map = 0,
-  kUpb_FieldMode_Array = 1,
-  kUpb_FieldMode_Scalar = 2,
-} upb_FieldMode;
-
-// Mask to isolate the upb_FieldMode from field.mode.
-#define kUpb_FieldMode_Mask 3
-
-/* Extra flags on the mode field. */
-typedef enum {
-  kUpb_LabelFlags_IsPacked = 4,
-  kUpb_LabelFlags_IsExtension = 8,
-} upb_LabelFlags;
-
-// Note: we sort by this number when calculating layout order.
-typedef enum {
-  kUpb_FieldRep_1Byte = 0,
-  kUpb_FieldRep_4Byte = 1,
-  kUpb_FieldRep_StringView = 2,
-  kUpb_FieldRep_Pointer = 3,
-  kUpb_FieldRep_8Byte = 4,
-
-  kUpb_FieldRep_Shift = 5,  // Bit offset of the rep in upb_MiniTable_Field.mode
-  kUpb_FieldRep_Max = kUpb_FieldRep_8Byte,
-} upb_FieldRep;
-
-UPB_INLINE upb_FieldMode upb_FieldMode_Get(const upb_MiniTable_Field* field) {
-  return (upb_FieldMode)(field->mode & 3);
-}
-
-UPB_INLINE bool upb_IsRepeatedOrMap(const upb_MiniTable_Field* field) {
-  /* This works because upb_FieldMode has no value 3. */
-  return !(field->mode & kUpb_FieldMode_Scalar);
-}
-
-UPB_INLINE bool upb_IsSubMessage(const upb_MiniTable_Field* field) {
-  return field->descriptortype == kUpb_FieldType_Message ||
-         field->descriptortype == kUpb_FieldType_Group;
-}
-
-struct upb_Decoder;
-struct upb_MiniTable;
-
-typedef const char* _upb_FieldParser(struct upb_Decoder* d, const char* ptr,
-                                     upb_Message* msg, intptr_t table,
-                                     uint64_t hasbits, uint64_t data);
-
-typedef struct {
-  uint64_t field_data;
-  _upb_FieldParser* field_parser;
-} _upb_FastTable_Entry;
-
-typedef struct {
-  const int32_t* values;  // List of values <0 or >63
-  uint64_t mask;          // Bits are set for acceptable value 0 <= x < 64
-  int value_count;
-} upb_MiniTable_Enum;
-
-typedef union {
-  const struct upb_MiniTable* submsg;
-  const upb_MiniTable_Enum* subenum;
-} upb_MiniTable_Sub;
-
-typedef enum {
-  kUpb_ExtMode_NonExtendable = 0,  // Non-extendable message.
-  kUpb_ExtMode_Extendable = 1,     // Normal extendable message.
-  kUpb_ExtMode_IsMessageSet = 2,   // MessageSet message.
-  kUpb_ExtMode_IsMessageSet_ITEM =
-      3,  // MessageSet item (temporary only, see decode.c)
-
-  // During table building we steal a bit to indicate that the message is a map
-  // entry.  *Only* used during table building!
-  kUpb_ExtMode_IsMapEntry = 4,
-} upb_ExtMode;
-
-/* MessageSet wire format is:
- *   message MessageSet {
- *     repeated group Item = 1 {
- *       required int32 type_id = 2;
- *       required bytes message = 3;
- *     }
- *   }
- */
-typedef enum {
-  _UPB_MSGSET_ITEM = 1,
-  _UPB_MSGSET_TYPEID = 2,
-  _UPB_MSGSET_MESSAGE = 3,
-} upb_msgext_fieldnum;
-
-struct upb_MiniTable {
-  const upb_MiniTable_Sub* subs;
-  const upb_MiniTable_Field* fields;
-  /* Must be aligned to sizeof(void*).  Doesn't include internal members like
-   * unknown fields, extension dict, pointer to msglayout, etc. */
-  uint16_t size;
-  uint16_t field_count;
-  uint8_t ext;  // upb_ExtMode, declared as uint8_t so sizeof(ext) == 1
-  uint8_t dense_below;
-  uint8_t table_mask;
-  uint8_t required_count;  // Required fields have the lowest hasbits.
-  /* To statically initialize the tables of variable length, we need a flexible
-   * array member, and we need to compile in gnu99 mode (constant initialization
-   * of flexible array members is a GNU extension, not in C99 unfortunately. */
-  _upb_FastTable_Entry fasttable[];
-};
-
-typedef struct {
-  upb_MiniTable_Field field;
-  const upb_MiniTable* extendee;
-  upb_MiniTable_Sub sub; /* NULL unless submessage or proto2 enum */
-} upb_MiniTable_Extension;
-
-typedef struct {
-  const upb_MiniTable** msgs;
-  const upb_MiniTable_Enum** enums;
-  const upb_MiniTable_Extension** exts;
-  int msg_count;
-  int enum_count;
-  int ext_count;
-} upb_MiniTable_File;
-
-// Computes a bitmask in which the |l->required_count| lowest bits are set,
-// except that we skip the lowest bit (because upb never uses hasbit 0).
-//
-// Sample output:
-//    requiredmask(1) => 0b10 (0x2)
-//    requiredmask(5) => 0b111110 (0x3e)
-UPB_INLINE uint64_t upb_MiniTable_requiredmask(const upb_MiniTable* l) {
-  int n = l->required_count;
-  assert(0 < n && n <= 63);
-  return ((1ULL << n) - 1) << 1;
-}
-
-/** upb_ExtensionRegistry *****************************************************/
-
-/* Adds the given extension info for message type |l| and field number |num|
- * into the registry. Returns false if this message type and field number were
- * already in the map, or if memory allocation fails. */
-bool _upb_extreg_add(upb_ExtensionRegistry* r,
-                     const upb_MiniTable_Extension** e, size_t count);
-
-/* Looks up the extension (if any) defined for message type |l| and field
- * number |num|.  If an extension was found, copies the field info into |*ext|
- * and returns true. Otherwise returns false. */
-const upb_MiniTable_Extension* _upb_extreg_get(const upb_ExtensionRegistry* r,
-                                               const upb_MiniTable* l,
-                                               uint32_t num);
-
-/** upb_Message ***************************************************************/
-
-/* Internal members of a upb_Message that track unknown fields and/or
- * extensions. We can change this without breaking binary compatibility.  We put
- * these before the user's data.  The user's upb_Message* points after the
- * upb_Message_Internal. */
-
-typedef struct {
-  /* Total size of this structure, including the data that follows.
-   * Must be aligned to 8, which is alignof(upb_Message_Extension) */
-  uint32_t size;
-
-  /* Offsets relative to the beginning of this structure.
-   *
-   * Unknown data grows forward from the beginning to unknown_end.
-   * Extension data grows backward from size to ext_begin.
-   * When the two meet, we're out of data and have to realloc.
-   *
-   * If we imagine that the final member of this struct is:
-   *   char data[size - overhead];  // overhead =
-   * sizeof(upb_Message_InternalData)
-   *
-   * Then we have:
-   *   unknown data: data[0 .. (unknown_end - overhead)]
-   *   extensions data: data[(ext_begin - overhead) .. (size - overhead)] */
-  uint32_t unknown_end;
-  uint32_t ext_begin;
-  /* Data follows, as if there were an array:
-   *   char data[size - sizeof(upb_Message_InternalData)]; */
-} upb_Message_InternalData;
-
-typedef struct {
-  upb_Message_InternalData* internal;
-  /* Message data follows. */
-} upb_Message_Internal;
-
-/* Maps upb_CType -> memory size. */
-extern char _upb_CTypeo_size[12];
-
-UPB_INLINE size_t upb_msg_sizeof(const upb_MiniTable* l) {
-  return l->size + sizeof(upb_Message_Internal);
-}
-
-UPB_INLINE upb_Message* _upb_Message_New_inl(const upb_MiniTable* l,
-                                             upb_Arena* a) {
-  size_t size = upb_msg_sizeof(l);
-  void* mem = upb_Arena_Malloc(a, size + sizeof(upb_Message_Internal));
-  upb_Message* msg;
-  if (UPB_UNLIKELY(!mem)) return NULL;
-  msg = UPB_PTR_AT(mem, sizeof(upb_Message_Internal), upb_Message);
-  memset(mem, 0, size);
-  return msg;
-}
-
-/* Creates a new messages with the given layout on the given arena. */
-upb_Message* _upb_Message_New(const upb_MiniTable* l, upb_Arena* a);
-
-UPB_INLINE upb_Message_Internal* upb_Message_Getinternal(upb_Message* msg) {
-  ptrdiff_t size = sizeof(upb_Message_Internal);
-  return (upb_Message_Internal*)((char*)msg - size);
-}
-
-/* Clears the given message. */
-void _upb_Message_Clear(upb_Message* msg, const upb_MiniTable* l);
-
-/* Discards the unknown fields for this message only. */
-void _upb_Message_DiscardUnknown_shallow(upb_Message* msg);
-
-/* Adds unknown data (serialized protobuf data) to the given message.  The data
- * is copied into the message instance. */
-bool _upb_Message_AddUnknown(upb_Message* msg, const char* data, size_t len,
-                             upb_Arena* arena);
-
-/** upb_Message_Extension *****************************************************/
-
-/* The internal representation of an extension is self-describing: it contains
- * enough information that we can serialize it to binary format without needing
- * to look it up in a upb_ExtensionRegistry.
- *
- * This representation allocates 16 bytes to data on 64-bit platforms.  This is
- * rather wasteful for scalars (in the extreme case of bool, it wastes 15
- * bytes). We accept this because we expect messages to be the most common
- * extension type. */
-typedef struct {
-  const upb_MiniTable_Extension* ext;
-  union {
-    upb_StringView str;
-    void* ptr;
-    char scalar_data[8];
-  } data;
-} upb_Message_Extension;
-
-/* Adds the given extension data to the given message. |ext| is copied into the
- * message instance. This logically replaces any previously-added extension with
- * this number */
-upb_Message_Extension* _upb_Message_GetOrCreateExtension(
-    upb_Message* msg, const upb_MiniTable_Extension* ext, upb_Arena* arena);
-
-/* Returns an array of extensions for this message. Note: the array is
- * ordered in reverse relative to the order of creation. */
-const upb_Message_Extension* _upb_Message_Getexts(const upb_Message* msg,
-                                                  size_t* count);
-
-/* Returns an extension for the given field number, or NULL if no extension
- * exists for this field number. */
-const upb_Message_Extension* _upb_Message_Getext(
-    const upb_Message* msg, const upb_MiniTable_Extension* ext);
-
-void _upb_Message_Clearext(upb_Message* msg,
-                           const upb_MiniTable_Extension* ext);
-
-void _upb_Message_Clearext(upb_Message* msg,
-                           const upb_MiniTable_Extension* ext);
-
-/** Hasbit access *************************************************************/
-
-UPB_INLINE bool _upb_hasbit(const upb_Message* msg, size_t idx) {
-  return (*UPB_PTR_AT(msg, idx / 8, const char) & (1 << (idx % 8))) != 0;
-}
-
-UPB_INLINE void _upb_sethas(const upb_Message* msg, size_t idx) {
-  (*UPB_PTR_AT(msg, idx / 8, char)) |= (char)(1 << (idx % 8));
-}
-
-UPB_INLINE void _upb_clearhas(const upb_Message* msg, size_t idx) {
-  (*UPB_PTR_AT(msg, idx / 8, char)) &= (char)(~(1 << (idx % 8)));
-}
-
-UPB_INLINE size_t _upb_Message_Hasidx(const upb_MiniTable_Field* f) {
-  UPB_ASSERT(f->presence > 0);
-  return f->presence;
-}
-
-UPB_INLINE bool _upb_hasbit_field(const upb_Message* msg,
-                                  const upb_MiniTable_Field* f) {
-  return _upb_hasbit(msg, _upb_Message_Hasidx(f));
-}
-
-UPB_INLINE void _upb_sethas_field(const upb_Message* msg,
-                                  const upb_MiniTable_Field* f) {
-  _upb_sethas(msg, _upb_Message_Hasidx(f));
-}
-
-UPB_INLINE void _upb_clearhas_field(const upb_Message* msg,
-                                    const upb_MiniTable_Field* f) {
-  _upb_clearhas(msg, _upb_Message_Hasidx(f));
-}
-
-/** Oneof case access *********************************************************/
-
-UPB_INLINE uint32_t* _upb_oneofcase(upb_Message* msg, size_t case_ofs) {
-  return UPB_PTR_AT(msg, case_ofs, uint32_t);
-}
-
-UPB_INLINE uint32_t _upb_getoneofcase(const void* msg, size_t case_ofs) {
-  return *UPB_PTR_AT(msg, case_ofs, uint32_t);
-}
-
-UPB_INLINE size_t _upb_oneofcase_ofs(const upb_MiniTable_Field* f) {
-  UPB_ASSERT(f->presence < 0);
-  return ~(ptrdiff_t)f->presence;
-}
-
-UPB_INLINE uint32_t* _upb_oneofcase_field(upb_Message* msg,
-                                          const upb_MiniTable_Field* f) {
-  return _upb_oneofcase(msg, _upb_oneofcase_ofs(f));
-}
-
-UPB_INLINE uint32_t _upb_getoneofcase_field(const upb_Message* msg,
-                                            const upb_MiniTable_Field* f) {
-  return _upb_getoneofcase(msg, _upb_oneofcase_ofs(f));
-}
-
-UPB_INLINE bool _upb_has_submsg_nohasbit(const upb_Message* msg, size_t ofs) {
-  return *UPB_PTR_AT(msg, ofs, const upb_Message*) != NULL;
-}
-
-/** upb_Array *****************************************************************/
-
-/* Our internal representation for repeated fields.  */
-typedef struct {
-  uintptr_t data; /* Tagged ptr: low 3 bits of ptr are lg2(elem size). */
-  size_t len;     /* Measured in elements. */
-  size_t size;    /* Measured in elements. */
-  uint64_t junk;
-} upb_Array;
-
-UPB_INLINE const void* _upb_array_constptr(const upb_Array* arr) {
-  UPB_ASSERT((arr->data & 7) <= 4);
-  return (void*)(arr->data & ~(uintptr_t)7);
-}
-
-UPB_INLINE uintptr_t _upb_array_tagptr(void* ptr, int elem_size_lg2) {
-  UPB_ASSERT(elem_size_lg2 <= 4);
-  return (uintptr_t)ptr | elem_size_lg2;
-}
-
-UPB_INLINE void* _upb_array_ptr(upb_Array* arr) {
-  return (void*)_upb_array_constptr(arr);
-}
-
-UPB_INLINE uintptr_t _upb_tag_arrptr(void* ptr, int elem_size_lg2) {
-  UPB_ASSERT(elem_size_lg2 <= 4);
-  UPB_ASSERT(((uintptr_t)ptr & 7) == 0);
-  return (uintptr_t)ptr | (unsigned)elem_size_lg2;
-}
-
-UPB_INLINE upb_Array* _upb_Array_New(upb_Arena* a, size_t init_size,
-                                     int elem_size_lg2) {
-  const size_t arr_size = UPB_ALIGN_UP(sizeof(upb_Array), UPB_MALLOC_ALIGN);
-  const size_t bytes = arr_size + (init_size << elem_size_lg2);
-  upb_Array* arr = (upb_Array*)upb_Arena_Malloc(a, bytes);
-  if (!arr) return NULL;
-  arr->data = _upb_tag_arrptr(UPB_PTR_AT(arr, arr_size, void), elem_size_lg2);
-  arr->len = 0;
-  arr->size = init_size;
-  return arr;
-}
-
-/* Resizes the capacity of the array to be at least min_size. */
-bool _upb_array_realloc(upb_Array* arr, size_t min_size, upb_Arena* arena);
-
-/* Fallback functions for when the accessors require a resize. */
-void* _upb_Array_Resize_fallback(upb_Array** arr_ptr, size_t size,
-                                 int elem_size_lg2, upb_Arena* arena);
-bool _upb_Array_Append_fallback(upb_Array** arr_ptr, const void* value,
-                                int elem_size_lg2, upb_Arena* arena);
-
-UPB_INLINE bool _upb_array_reserve(upb_Array* arr, size_t size,
-                                   upb_Arena* arena) {
-  if (arr->size < size) return _upb_array_realloc(arr, size, arena);
-  return true;
-}
-
-UPB_INLINE bool _upb_Array_Resize(upb_Array* arr, size_t size,
-                                  upb_Arena* arena) {
-  if (!_upb_array_reserve(arr, size, arena)) return false;
-  arr->len = size;
-  return true;
-}
-
-UPB_INLINE void _upb_array_detach(const void* msg, size_t ofs) {
-  *UPB_PTR_AT(msg, ofs, upb_Array*) = NULL;
-}
-
-UPB_INLINE const void* _upb_array_accessor(const void* msg, size_t ofs,
-                                           size_t* size) {
-  const upb_Array* arr = *UPB_PTR_AT(msg, ofs, const upb_Array*);
-  if (arr) {
-    if (size) *size = arr->len;
-    return _upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-
-UPB_INLINE void* _upb_array_mutable_accessor(void* msg, size_t ofs,
-                                             size_t* size) {
-  upb_Array* arr = *UPB_PTR_AT(msg, ofs, upb_Array*);
-  if (arr) {
-    if (size) *size = arr->len;
-    return _upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-
-UPB_INLINE void* _upb_Array_Resize_accessor2(void* msg, size_t ofs, size_t size,
-                                             int elem_size_lg2,
-                                             upb_Arena* arena) {
-  upb_Array** arr_ptr = UPB_PTR_AT(msg, ofs, upb_Array*);
-  upb_Array* arr = *arr_ptr;
-  if (!arr || arr->size < size) {
-    return _upb_Array_Resize_fallback(arr_ptr, size, elem_size_lg2, arena);
-  }
-  arr->len = size;
-  return _upb_array_ptr(arr);
-}
-
-UPB_INLINE bool _upb_Array_Append_accessor2(void* msg, size_t ofs,
-                                            int elem_size_lg2,
-                                            const void* value,
-                                            upb_Arena* arena) {
-  upb_Array** arr_ptr = UPB_PTR_AT(msg, ofs, upb_Array*);
-  size_t elem_size = 1 << elem_size_lg2;
-  upb_Array* arr = *arr_ptr;
-  void* ptr;
-  if (!arr || arr->len == arr->size) {
-    return _upb_Array_Append_fallback(arr_ptr, value, elem_size_lg2, arena);
-  }
-  ptr = _upb_array_ptr(arr);
-  memcpy(UPB_PTR_AT(ptr, arr->len * elem_size, char), value, elem_size);
-  arr->len++;
-  return true;
-}
-
-/* Used by old generated code, remove once all code has been regenerated. */
-UPB_INLINE int _upb_sizelg2(upb_CType type) {
-  switch (type) {
-    case kUpb_CType_Bool:
-      return 0;
-    case kUpb_CType_Float:
-    case kUpb_CType_Int32:
-    case kUpb_CType_UInt32:
-    case kUpb_CType_Enum:
-      return 2;
-    case kUpb_CType_Message:
-      return UPB_SIZE(2, 3);
-    case kUpb_CType_Double:
-    case kUpb_CType_Int64:
-    case kUpb_CType_UInt64:
-      return 3;
-    case kUpb_CType_String:
-    case kUpb_CType_Bytes:
-      return UPB_SIZE(3, 4);
-  }
-  UPB_UNREACHABLE();
-}
-UPB_INLINE void* _upb_Array_Resize_accessor(void* msg, size_t ofs, size_t size,
-                                            upb_CType type, upb_Arena* arena) {
-  return _upb_Array_Resize_accessor2(msg, ofs, size, _upb_sizelg2(type), arena);
-}
-UPB_INLINE bool _upb_Array_Append_accessor(void* msg, size_t ofs,
-                                           size_t elem_size, upb_CType type,
-                                           const void* value,
-                                           upb_Arena* arena) {
-  (void)elem_size;
-  return _upb_Array_Append_accessor2(msg, ofs, _upb_sizelg2(type), value,
-                                     arena);
-}
-
-/** upb_Map *******************************************************************/
-
-/* Right now we use strmaps for everything.  We'll likely want to use
- * integer-specific maps for integer-keyed maps.*/
-typedef struct {
-  /* Size of key and val, based on the map type.  Strings are represented as '0'
-   * because they must be handled specially. */
-  char key_size;
-  char val_size;
-
-  upb_strtable table;
-} upb_Map;
-
-/* Map entries aren't actually stored, they are only used during parsing.  For
- * parsing, it helps a lot if all map entry messages have the same layout.
- * The compiler and def.c must ensure that all map entries have this layout. */
-typedef struct {
-  upb_Message_Internal internal;
-  union {
-    upb_StringView str; /* For str/bytes. */
-    upb_value val;      /* For all other types. */
-  } k;
-  union {
-    upb_StringView str; /* For str/bytes. */
-    upb_value val;      /* For all other types. */
-  } v;
-} upb_MapEntry;
-
-/* Creates a new map on the given arena with this key/value type. */
-upb_Map* _upb_Map_New(upb_Arena* a, size_t key_size, size_t value_size);
-
-/* Converting between internal table representation and user values.
- *
- * _upb_map_tokey() and _upb_map_fromkey() are inverses.
- * _upb_map_tovalue() and _upb_map_fromvalue() are inverses.
- *
- * These functions account for the fact that strings are treated differently
- * from other types when stored in a map.
- */
-
-UPB_INLINE upb_StringView _upb_map_tokey(const void* key, size_t size) {
-  if (size == UPB_MAPTYPE_STRING) {
-    return *(upb_StringView*)key;
-  } else {
-    return upb_StringView_FromDataAndSize((const char*)key, size);
-  }
-}
-
-UPB_INLINE void _upb_map_fromkey(upb_StringView key, void* out, size_t size) {
-  if (size == UPB_MAPTYPE_STRING) {
-    memcpy(out, &key, sizeof(key));
-  } else {
-    memcpy(out, key.data, size);
-  }
-}
-
-UPB_INLINE bool _upb_map_tovalue(const void* val, size_t size,
-                                 upb_value* msgval, upb_Arena* a) {
-  if (size == UPB_MAPTYPE_STRING) {
-    upb_StringView* strp = (upb_StringView*)upb_Arena_Malloc(a, sizeof(*strp));
-    if (!strp) return false;
-    *strp = *(upb_StringView*)val;
-    *msgval = upb_value_ptr(strp);
-  } else {
-    memcpy(msgval, val, size);
-  }
-  return true;
-}
-
-UPB_INLINE void _upb_map_fromvalue(upb_value val, void* out, size_t size) {
-  if (size == UPB_MAPTYPE_STRING) {
-    const upb_StringView* strp = (const upb_StringView*)upb_value_getptr(val);
-    memcpy(out, strp, sizeof(upb_StringView));
-  } else {
-    memcpy(out, &val, size);
-  }
-}
-
-/* Map operations, shared by reflection and generated code. */
-
-UPB_INLINE size_t _upb_Map_Size(const upb_Map* map) {
-  return map->table.t.count;
-}
-
-UPB_INLINE bool _upb_Map_Get(const upb_Map* map, const void* key,
-                             size_t key_size, void* val, size_t val_size) {
-  upb_value tabval;
-  upb_StringView k = _upb_map_tokey(key, key_size);
-  bool ret = upb_strtable_lookup2(&map->table, k.data, k.size, &tabval);
-  if (ret && val) {
-    _upb_map_fromvalue(tabval, val, val_size);
-  }
-  return ret;
-}
-
-UPB_INLINE void* _upb_map_next(const upb_Map* map, size_t* iter) {
-  upb_strtable_iter it;
-  it.t = &map->table;
-  it.index = *iter;
-  upb_strtable_next(&it);
-  *iter = it.index;
-  if (upb_strtable_done(&it)) return NULL;
-  return (void*)str_tabent(&it);
-}
-
-typedef enum {
-  // LINT.IfChange
-  _kUpb_MapInsertStatus_Inserted = 0,
-  _kUpb_MapInsertStatus_Replaced = 1,
-  _kUpb_MapInsertStatus_OutOfMemory = 2,
-  // LINT.ThenChange(//depot/google3/third_party/upb/upb/collections.h)
-} _upb_MapInsertStatus;
-
-UPB_INLINE _upb_MapInsertStatus _upb_Map_Insert(upb_Map* map, const void* key,
-                                                size_t key_size, void* val,
-                                                size_t val_size, upb_Arena* a) {
-  upb_StringView strkey = _upb_map_tokey(key, key_size);
-  upb_value tabval = {0};
-  if (!_upb_map_tovalue(val, val_size, &tabval, a)) {
-    return _kUpb_MapInsertStatus_OutOfMemory;
-  }
-
-  /* TODO(haberman): add overwrite operation to minimize number of lookups. */
-  bool removed =
-      upb_strtable_remove2(&map->table, strkey.data, strkey.size, NULL);
-  if (!upb_strtable_insert(&map->table, strkey.data, strkey.size, tabval, a)) {
-    return _kUpb_MapInsertStatus_OutOfMemory;
-  }
-  return removed ? _kUpb_MapInsertStatus_Replaced
-                 : _kUpb_MapInsertStatus_Inserted;
-}
-
-UPB_INLINE bool _upb_Map_Delete(upb_Map* map, const void* key,
-                                size_t key_size) {
-  upb_StringView k = _upb_map_tokey(key, key_size);
-  return upb_strtable_remove2(&map->table, k.data, k.size, NULL);
-}
-
-UPB_INLINE void _upb_Map_Clear(upb_Map* map) {
-  upb_strtable_clear(&map->table);
-}
-
-/* Message map operations, these get the map from the message first. */
-
-UPB_INLINE size_t _upb_msg_map_size(const upb_Message* msg, size_t ofs) {
-  upb_Map* map = *UPB_PTR_AT(msg, ofs, upb_Map*);
-  return map ? _upb_Map_Size(map) : 0;
-}
-
-UPB_INLINE bool _upb_msg_map_get(const upb_Message* msg, size_t ofs,
-                                 const void* key, size_t key_size, void* val,
-                                 size_t val_size) {
-  upb_Map* map = *UPB_PTR_AT(msg, ofs, upb_Map*);
-  if (!map) return false;
-  return _upb_Map_Get(map, key, key_size, val, val_size);
-}
-
-UPB_INLINE void* _upb_msg_map_next(const upb_Message* msg, size_t ofs,
-                                   size_t* iter) {
-  upb_Map* map = *UPB_PTR_AT(msg, ofs, upb_Map*);
-  if (!map) return NULL;
-  return _upb_map_next(map, iter);
-}
-
-UPB_INLINE bool _upb_msg_map_set(upb_Message* msg, size_t ofs, const void* key,
-                                 size_t key_size, void* val, size_t val_size,
-                                 upb_Arena* arena) {
-  upb_Map** map = UPB_PTR_AT(msg, ofs, upb_Map*);
-  if (!*map) {
-    *map = _upb_Map_New(arena, key_size, val_size);
-  }
-  return _upb_Map_Insert(*map, key, key_size, val, val_size, arena) !=
-         _kUpb_MapInsertStatus_OutOfMemory;
-}
-
-UPB_INLINE bool _upb_msg_map_delete(upb_Message* msg, size_t ofs,
-                                    const void* key, size_t key_size) {
-  upb_Map* map = *UPB_PTR_AT(msg, ofs, upb_Map*);
-  if (!map) return false;
-  return _upb_Map_Delete(map, key, key_size);
-}
-
-UPB_INLINE void _upb_msg_map_clear(upb_Message* msg, size_t ofs) {
-  upb_Map* map = *UPB_PTR_AT(msg, ofs, upb_Map*);
-  if (!map) return;
-  _upb_Map_Clear(map);
-}
-
-/* Accessing map key/value from a pointer, used by generated code only. */
-
-UPB_INLINE void _upb_msg_map_key(const void* msg, void* key, size_t size) {
-  const upb_tabent* ent = (const upb_tabent*)msg;
-  uint32_t u32len;
-  upb_StringView k;
-  k.data = upb_tabstr(ent->key, &u32len);
-  k.size = u32len;
-  _upb_map_fromkey(k, key, size);
-}
-
-UPB_INLINE void _upb_msg_map_value(const void* msg, void* val, size_t size) {
-  const upb_tabent* ent = (const upb_tabent*)msg;
-  upb_value v = {ent->val.val};
-  _upb_map_fromvalue(v, val, size);
-}
-
-UPB_INLINE void _upb_msg_map_set_value(void* msg, const void* val,
-                                       size_t size) {
-  upb_tabent* ent = (upb_tabent*)msg;
-  /* This is like _upb_map_tovalue() except the entry already exists so we can
-   * reuse the allocated upb_StringView for string fields. */
-  if (size == UPB_MAPTYPE_STRING) {
-    upb_StringView* strp = (upb_StringView*)(uintptr_t)ent->val.val;
-    memcpy(strp, val, sizeof(*strp));
-  } else {
-    memcpy(&ent->val.val, val, size);
-  }
-}
-
-/** _upb_mapsorter ************************************************************/
-
-/* _upb_mapsorter sorts maps and provides ordered iteration over the entries.
- * Since maps can be recursive (map values can be messages which contain other
- * maps). _upb_mapsorter can contain a stack of maps. */
-
-typedef struct {
-  upb_tabent const** entries;
-  int size;
-  int cap;
-} _upb_mapsorter;
-
-typedef struct {
-  int start;
-  int pos;
-  int end;
-} _upb_sortedmap;
-
-UPB_INLINE void _upb_mapsorter_init(_upb_mapsorter* s) {
-  s->entries = NULL;
-  s->size = 0;
-  s->cap = 0;
-}
-
-UPB_INLINE void _upb_mapsorter_destroy(_upb_mapsorter* s) {
-  if (s->entries) free(s->entries);
-}
-
-bool _upb_mapsorter_pushmap(_upb_mapsorter* s, upb_FieldType key_type,
-                            const upb_Map* map, _upb_sortedmap* sorted);
-
-UPB_INLINE void _upb_mapsorter_popmap(_upb_mapsorter* s,
-                                      _upb_sortedmap* sorted) {
-  s->size = sorted->start;
-}
-
-UPB_INLINE bool _upb_sortedmap_next(_upb_mapsorter* s, const upb_Map* map,
-                                    _upb_sortedmap* sorted, upb_MapEntry* ent) {
-  if (sorted->pos == sorted->end) return false;
-  const upb_tabent* tabent = s->entries[sorted->pos++];
-  upb_StringView key = upb_tabstrview(tabent->key);
-  _upb_map_fromkey(key, &ent->k, map->key_size);
-  upb_value val = {tabent->val.val};
-  _upb_map_fromvalue(val, &ent->v, map->val_size);
-  return true;
-}
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-
-#endif /* UPB_MSG_INT_H_ */
-
-/** upb/decode.h ************************************************************/
-/*
- * upb_decode: parsing into a upb_Message using a upb_MiniTable.
- */
-
-#ifndef UPB_DECODE_H_
-#define UPB_DECODE_H_
-
-
-/* Must be last. */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-enum {
-  /* If set, strings will alias the input buffer instead of copying into the
-   * arena. */
-  kUpb_DecodeOption_AliasString = 1,
-
-  /* If set, the parse will return failure if any message is missing any
-   * required fields when the message data ends.  The parse will still continue,
-   * and the failure will only be reported at the end.
-   *
-   * IMPORTANT CAVEATS:
-   *
-   * 1. This can throw a false positive failure if an incomplete message is seen
-   *    on the wire but is later completed when the sub-message occurs again.
-   *    For this reason, a second pass is required to verify a failure, to be
-   *    truly robust.
-   *
-   * 2. This can return a false success if you are decoding into a message that
-   *    already has some sub-message fields present.  If the sub-message does
-   *    not occur in the binary payload, we will never visit it and discover the
-   *    incomplete sub-message.  For this reason, this check is only useful for
-   *    implemting ParseFromString() semantics.  For MergeFromString(), a
-   *    post-parse validation step will always be necessary. */
-  kUpb_DecodeOption_CheckRequired = 2,
-};
-
-#define UPB_DECODE_MAXDEPTH(depth) ((depth) << 16)
-
-typedef enum {
-  kUpb_DecodeStatus_Ok = 0,
-  kUpb_DecodeStatus_Malformed = 1,         // Wire format was corrupt
-  kUpb_DecodeStatus_OutOfMemory = 2,       // Arena alloc failed
-  kUpb_DecodeStatus_BadUtf8 = 3,           // String field had bad UTF-8
-  kUpb_DecodeStatus_MaxDepthExceeded = 4,  // Exceeded UPB_DECODE_MAXDEPTH
-
-  // kUpb_DecodeOption_CheckRequired failed (see above), but the parse otherwise
-  // succeeded.
-  kUpb_DecodeStatus_MissingRequired = 5,
-} upb_DecodeStatus;
-
-upb_DecodeStatus upb_Decode(const char* buf, size_t size, upb_Message* msg,
-                            const upb_MiniTable* l,
-                            const upb_ExtensionRegistry* extreg, int options,
-                            upb_Arena* arena);
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-
-#endif /* UPB_DECODE_H_ */
-
-/** upb/decode_fast.h ************************************************************/
-// These are the specialized field parser functions for the fast parser.
-// Generated tables will refer to these by name.
-//
-// The function names are encoded with names like:
-//
-//   //  123 4
-//   upb_pss_1bt();   // Parse singular string, 1 byte tag.
-//
-// In position 1:
-//   - 'p' for parse, most function use this
-//   - 'c' for copy, for when we are copying strings instead of aliasing
-//
-// In position 2 (cardinality):
-//   - 's' for singular, with or without hasbit
-//   - 'o' for oneof
-//   - 'r' for non-packed repeated
-//   - 'p' for packed repeated
-//
-// In position 3 (type):
-//   - 'b1' for bool
-//   - 'v4' for 4-byte varint
-//   - 'v8' for 8-byte varint
-//   - 'z4' for zig-zag-encoded 4-byte varint
-//   - 'z8' for zig-zag-encoded 8-byte varint
-//   - 'f4' for 4-byte fixed
-//   - 'f8' for 8-byte fixed
-//   - 'm' for sub-message
-//   - 's' for string (validate UTF-8)
-//   - 'b' for bytes
-//
-// In position 4 (tag length):
-//   - '1' for one-byte tags (field numbers 1-15)
-//   - '2' for two-byte tags (field numbers 16-2048)
-
-#ifndef UPB_DECODE_FAST_H_
-#define UPB_DECODE_FAST_H_
-
-
-struct upb_Decoder;
-
-// The fallback, generic parsing function that can handle any field type.
-// This just uses the regular (non-fast) parser to parse a single field.
-const char* fastdecode_generic(struct upb_Decoder* d, const char* ptr,
-                               upb_Message* msg, intptr_t table,
-                               uint64_t hasbits, uint64_t data);
-
-#define UPB_PARSE_PARAMS                                                    \
-  struct upb_Decoder *d, const char *ptr, upb_Message *msg, intptr_t table, \
-      uint64_t hasbits, uint64_t data
-
-/* primitive fields ***********************************************************/
-
-#define F(card, type, valbytes, tagbytes) \
-  const char* upb_p##card##type##valbytes##_##tagbytes##bt(UPB_PARSE_PARAMS);
-
-#define TYPES(card, tagbytes) \
-  F(card, b, 1, tagbytes)     \
-  F(card, v, 4, tagbytes)     \
-  F(card, v, 8, tagbytes)     \
-  F(card, z, 4, tagbytes)     \
-  F(card, z, 8, tagbytes)     \
-  F(card, f, 4, tagbytes)     \
-  F(card, f, 8, tagbytes)
-
-#define TAGBYTES(card) \
-  TYPES(card, 1)       \
-  TYPES(card, 2)
-
-TAGBYTES(s)
-TAGBYTES(o)
-TAGBYTES(r)
-TAGBYTES(p)
-
-#undef F
-#undef TYPES
-#undef TAGBYTES
-
-/* string fields **************************************************************/
-
-#define F(card, tagbytes, type)                                     \
-  const char* upb_p##card##type##_##tagbytes##bt(UPB_PARSE_PARAMS); \
-  const char* upb_c##card##type##_##tagbytes##bt(UPB_PARSE_PARAMS);
-
-#define UTF8(card, tagbytes) \
-  F(card, tagbytes, s)       \
-  F(card, tagbytes, b)
-
-#define TAGBYTES(card) \
-  UTF8(card, 1)        \
-  UTF8(card, 2)
-
-TAGBYTES(s)
-TAGBYTES(o)
-TAGBYTES(r)
-
-#undef F
-#undef TAGBYTES
-
-/* sub-message fields *********************************************************/
-
-#define F(card, tagbytes, size_ceil, ceil_arg) \
-  const char* upb_p##card##m_##tagbytes##bt_max##size_ceil##b(UPB_PARSE_PARAMS);
-
-#define SIZES(card, tagbytes) \
-  F(card, tagbytes, 64, 64)   \
-  F(card, tagbytes, 128, 128) \
-  F(card, tagbytes, 192, 192) \
-  F(card, tagbytes, 256, 256) \
-  F(card, tagbytes, max, -1)
-
-#define TAGBYTES(card) \
-  SIZES(card, 1)       \
-  SIZES(card, 2)
-
-TAGBYTES(s)
-TAGBYTES(o)
-TAGBYTES(r)
-
-#undef TAGBYTES
-#undef SIZES
-#undef F
-
-#undef UPB_PARSE_PARAMS
-
-#endif /* UPB_DECODE_FAST_H_ */
-
-/** upb/encode.h ************************************************************/
-/*
- * upb_Encode: parsing into a upb_Message using a upb_MiniTable.
- */
-
-#ifndef UPB_ENCODE_H_
-#define UPB_ENCODE_H_
-
-
-/* Must be last. */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-enum {
-  /* If set, the results of serializing will be deterministic across all
-   * instances of this binary. There are no guarantees across different
-   * binary builds.
-   *
-   * If your proto contains maps, the encoder will need to malloc()/free()
-   * memory during encode. */
-  kUpb_Encode_Deterministic = 1,
-
-  /* When set, unknown fields are not printed. */
-  kUpb_Encode_SkipUnknown = 2,
-
-  /* When set, the encode will fail if any required fields are missing. */
-  kUpb_Encode_CheckRequired = 4,
-};
-
-#define UPB_ENCODE_MAXDEPTH(depth) ((depth) << 16)
-
-char* upb_Encode(const void* msg, const upb_MiniTable* l, int options,
-                 upb_Arena* arena, size_t* size);
-
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#endif /* UPB_ENCODE_H_ */
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct google_protobuf_FileDescriptorSet;
-struct google_protobuf_FileDescriptorProto;
-struct google_protobuf_DescriptorProto;
-struct google_protobuf_DescriptorProto_ExtensionRange;
-struct google_protobuf_DescriptorProto_ReservedRange;
-struct google_protobuf_ExtensionRangeOptions;
-struct google_protobuf_FieldDescriptorProto;
-struct google_protobuf_OneofDescriptorProto;
-struct google_protobuf_EnumDescriptorProto;
-struct google_protobuf_EnumDescriptorProto_EnumReservedRange;
-struct google_protobuf_EnumValueDescriptorProto;
-struct google_protobuf_ServiceDescriptorProto;
-struct google_protobuf_MethodDescriptorProto;
-struct google_protobuf_FileOptions;
-struct google_protobuf_MessageOptions;
-struct google_protobuf_FieldOptions;
-struct google_protobuf_OneofOptions;
-struct google_protobuf_EnumOptions;
-struct google_protobuf_EnumValueOptions;
-struct google_protobuf_ServiceOptions;
-struct google_protobuf_MethodOptions;
-struct google_protobuf_UninterpretedOption;
-struct google_protobuf_UninterpretedOption_NamePart;
-struct google_protobuf_SourceCodeInfo;
-struct google_protobuf_SourceCodeInfo_Location;
-struct google_protobuf_GeneratedCodeInfo;
-struct google_protobuf_GeneratedCodeInfo_Annotation;
-typedef struct google_protobuf_FileDescriptorSet google_protobuf_FileDescriptorSet;
-typedef struct google_protobuf_FileDescriptorProto google_protobuf_FileDescriptorProto;
-typedef struct google_protobuf_DescriptorProto google_protobuf_DescriptorProto;
-typedef struct google_protobuf_DescriptorProto_ExtensionRange google_protobuf_DescriptorProto_ExtensionRange;
-typedef struct google_protobuf_DescriptorProto_ReservedRange google_protobuf_DescriptorProto_ReservedRange;
-typedef struct google_protobuf_ExtensionRangeOptions google_protobuf_ExtensionRangeOptions;
-typedef struct google_protobuf_FieldDescriptorProto google_protobuf_FieldDescriptorProto;
-typedef struct google_protobuf_OneofDescriptorProto google_protobuf_OneofDescriptorProto;
-typedef struct google_protobuf_EnumDescriptorProto google_protobuf_EnumDescriptorProto;
-typedef struct google_protobuf_EnumDescriptorProto_EnumReservedRange google_protobuf_EnumDescriptorProto_EnumReservedRange;
-typedef struct google_protobuf_EnumValueDescriptorProto google_protobuf_EnumValueDescriptorProto;
-typedef struct google_protobuf_ServiceDescriptorProto google_protobuf_ServiceDescriptorProto;
-typedef struct google_protobuf_MethodDescriptorProto google_protobuf_MethodDescriptorProto;
-typedef struct google_protobuf_FileOptions google_protobuf_FileOptions;
-typedef struct google_protobuf_MessageOptions google_protobuf_MessageOptions;
-typedef struct google_protobuf_FieldOptions google_protobuf_FieldOptions;
-typedef struct google_protobuf_OneofOptions google_protobuf_OneofOptions;
-typedef struct google_protobuf_EnumOptions google_protobuf_EnumOptions;
-typedef struct google_protobuf_EnumValueOptions google_protobuf_EnumValueOptions;
-typedef struct google_protobuf_ServiceOptions google_protobuf_ServiceOptions;
-typedef struct google_protobuf_MethodOptions google_protobuf_MethodOptions;
-typedef struct google_protobuf_UninterpretedOption google_protobuf_UninterpretedOption;
-typedef struct google_protobuf_UninterpretedOption_NamePart google_protobuf_UninterpretedOption_NamePart;
-typedef struct google_protobuf_SourceCodeInfo google_protobuf_SourceCodeInfo;
-typedef struct google_protobuf_SourceCodeInfo_Location google_protobuf_SourceCodeInfo_Location;
-typedef struct google_protobuf_GeneratedCodeInfo google_protobuf_GeneratedCodeInfo;
-typedef struct google_protobuf_GeneratedCodeInfo_Annotation google_protobuf_GeneratedCodeInfo_Annotation;
-extern const upb_MiniTable google_protobuf_FileDescriptorSet_msginit;
-extern const upb_MiniTable google_protobuf_FileDescriptorProto_msginit;
-extern const upb_MiniTable google_protobuf_DescriptorProto_msginit;
-extern const upb_MiniTable google_protobuf_DescriptorProto_ExtensionRange_msginit;
-extern const upb_MiniTable google_protobuf_DescriptorProto_ReservedRange_msginit;
-extern const upb_MiniTable google_protobuf_ExtensionRangeOptions_msginit;
-extern const upb_MiniTable google_protobuf_FieldDescriptorProto_msginit;
-extern const upb_MiniTable google_protobuf_OneofDescriptorProto_msginit;
-extern const upb_MiniTable google_protobuf_EnumDescriptorProto_msginit;
-extern const upb_MiniTable google_protobuf_EnumDescriptorProto_EnumReservedRange_msginit;
-extern const upb_MiniTable google_protobuf_EnumValueDescriptorProto_msginit;
-extern const upb_MiniTable google_protobuf_ServiceDescriptorProto_msginit;
-extern const upb_MiniTable google_protobuf_MethodDescriptorProto_msginit;
-extern const upb_MiniTable google_protobuf_FileOptions_msginit;
-extern const upb_MiniTable google_protobuf_MessageOptions_msginit;
-extern const upb_MiniTable google_protobuf_FieldOptions_msginit;
-extern const upb_MiniTable google_protobuf_OneofOptions_msginit;
-extern const upb_MiniTable google_protobuf_EnumOptions_msginit;
-extern const upb_MiniTable google_protobuf_EnumValueOptions_msginit;
-extern const upb_MiniTable google_protobuf_ServiceOptions_msginit;
-extern const upb_MiniTable google_protobuf_MethodOptions_msginit;
-extern const upb_MiniTable google_protobuf_UninterpretedOption_msginit;
-extern const upb_MiniTable google_protobuf_UninterpretedOption_NamePart_msginit;
-extern const upb_MiniTable google_protobuf_SourceCodeInfo_msginit;
-extern const upb_MiniTable google_protobuf_SourceCodeInfo_Location_msginit;
-extern const upb_MiniTable google_protobuf_GeneratedCodeInfo_msginit;
-extern const upb_MiniTable google_protobuf_GeneratedCodeInfo_Annotation_msginit;
-
-typedef enum {
-  google_protobuf_FieldDescriptorProto_LABEL_OPTIONAL = 1,
-  google_protobuf_FieldDescriptorProto_LABEL_REQUIRED = 2,
-  google_protobuf_FieldDescriptorProto_LABEL_REPEATED = 3
-} google_protobuf_FieldDescriptorProto_Label;
-
-typedef enum {
-  google_protobuf_FieldDescriptorProto_TYPE_DOUBLE = 1,
-  google_protobuf_FieldDescriptorProto_TYPE_FLOAT = 2,
-  google_protobuf_FieldDescriptorProto_TYPE_INT64 = 3,
-  google_protobuf_FieldDescriptorProto_TYPE_UINT64 = 4,
-  google_protobuf_FieldDescriptorProto_TYPE_INT32 = 5,
-  google_protobuf_FieldDescriptorProto_TYPE_FIXED64 = 6,
-  google_protobuf_FieldDescriptorProto_TYPE_FIXED32 = 7,
-  google_protobuf_FieldDescriptorProto_TYPE_BOOL = 8,
-  google_protobuf_FieldDescriptorProto_TYPE_STRING = 9,
-  google_protobuf_FieldDescriptorProto_TYPE_GROUP = 10,
-  google_protobuf_FieldDescriptorProto_TYPE_MESSAGE = 11,
-  google_protobuf_FieldDescriptorProto_TYPE_BYTES = 12,
-  google_protobuf_FieldDescriptorProto_TYPE_UINT32 = 13,
-  google_protobuf_FieldDescriptorProto_TYPE_ENUM = 14,
-  google_protobuf_FieldDescriptorProto_TYPE_SFIXED32 = 15,
-  google_protobuf_FieldDescriptorProto_TYPE_SFIXED64 = 16,
-  google_protobuf_FieldDescriptorProto_TYPE_SINT32 = 17,
-  google_protobuf_FieldDescriptorProto_TYPE_SINT64 = 18
-} google_protobuf_FieldDescriptorProto_Type;
-
-typedef enum {
-  google_protobuf_FieldOptions_STRING = 0,
-  google_protobuf_FieldOptions_CORD = 1,
-  google_protobuf_FieldOptions_STRING_PIECE = 2
-} google_protobuf_FieldOptions_CType;
-
-typedef enum {
-  google_protobuf_FieldOptions_JS_NORMAL = 0,
-  google_protobuf_FieldOptions_JS_STRING = 1,
-  google_protobuf_FieldOptions_JS_NUMBER = 2
-} google_protobuf_FieldOptions_JSType;
-
-typedef enum {
-  google_protobuf_FileOptions_SPEED = 1,
-  google_protobuf_FileOptions_CODE_SIZE = 2,
-  google_protobuf_FileOptions_LITE_RUNTIME = 3
-} google_protobuf_FileOptions_OptimizeMode;
-
-typedef enum {
-  google_protobuf_MethodOptions_IDEMPOTENCY_UNKNOWN = 0,
-  google_protobuf_MethodOptions_NO_SIDE_EFFECTS = 1,
-  google_protobuf_MethodOptions_IDEMPOTENT = 2
-} google_protobuf_MethodOptions_IdempotencyLevel;
-
-
-extern const upb_MiniTable_Enum google_protobuf_FieldDescriptorProto_Label_enuminit;
-extern const upb_MiniTable_Enum google_protobuf_FieldDescriptorProto_Type_enuminit;
-extern const upb_MiniTable_Enum google_protobuf_FieldOptions_CType_enuminit;
-extern const upb_MiniTable_Enum google_protobuf_FieldOptions_JSType_enuminit;
-extern const upb_MiniTable_Enum google_protobuf_FileOptions_OptimizeMode_enuminit;
-extern const upb_MiniTable_Enum google_protobuf_MethodOptions_IdempotencyLevel_enuminit;
-
-/* google.protobuf.FileDescriptorSet */
-
-UPB_INLINE google_protobuf_FileDescriptorSet* google_protobuf_FileDescriptorSet_new(upb_Arena* arena) {
-  return (google_protobuf_FileDescriptorSet*)_upb_Message_New(&google_protobuf_FileDescriptorSet_msginit, arena);
-}
-UPB_INLINE google_protobuf_FileDescriptorSet* google_protobuf_FileDescriptorSet_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_FileDescriptorSet* ret = google_protobuf_FileDescriptorSet_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_FileDescriptorSet_msginit, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_FileDescriptorSet* google_protobuf_FileDescriptorSet_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_FileDescriptorSet* ret = google_protobuf_FileDescriptorSet_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_FileDescriptorSet_msginit, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_FileDescriptorSet_serialize(const google_protobuf_FileDescriptorSet* msg, upb_Arena* arena, size_t* len) {
-  return upb_Encode(msg, &google_protobuf_FileDescriptorSet_msginit, 0, arena, len);
-}
-UPB_INLINE char* google_protobuf_FileDescriptorSet_serialize_ex(const google_protobuf_FileDescriptorSet* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  return upb_Encode(msg, &google_protobuf_FileDescriptorSet_msginit, options, arena, len);
-}
-UPB_INLINE bool google_protobuf_FileDescriptorSet_has_file(const google_protobuf_FileDescriptorSet* msg) {
-  return _upb_has_submsg_nohasbit(msg, UPB_SIZE(0, 0));
-}
-UPB_INLINE void google_protobuf_FileDescriptorSet_clear_file(const google_protobuf_FileDescriptorSet* msg) {
-  _upb_array_detach(msg, UPB_SIZE(0, 0));
-}
-UPB_INLINE const google_protobuf_FileDescriptorProto* const* google_protobuf_FileDescriptorSet_file(const google_protobuf_FileDescriptorSet* msg, size_t* len) {
-  return (const google_protobuf_FileDescriptorProto* const*)_upb_array_accessor(msg, UPB_SIZE(0, 0), len);
-}
-
-UPB_INLINE google_protobuf_FileDescriptorProto** google_protobuf_FileDescriptorSet_mutable_file(google_protobuf_FileDescriptorSet* msg, size_t* len) {
-  return (google_protobuf_FileDescriptorProto**)_upb_array_mutable_accessor(msg, UPB_SIZE(0, 0), len);
-}
-UPB_INLINE google_protobuf_FileDescriptorProto** google_protobuf_FileDescriptorSet_resize_file(google_protobuf_FileDescriptorSet* msg, size_t len, upb_Arena* arena) {
-  return (google_protobuf_FileDescriptorProto**)_upb_Array_Resize_accessor2(msg, UPB_SIZE(0, 0), len, UPB_SIZE(2, 3), arena);
-}
-UPB_INLINE struct google_protobuf_FileDescriptorProto* google_protobuf_FileDescriptorSet_add_file(google_protobuf_FileDescriptorSet* msg, upb_Arena* arena) {
-  struct google_protobuf_FileDescriptorProto* sub = (struct google_protobuf_FileDescriptorProto*)_upb_Message_New(&google_protobuf_FileDescriptorProto_msginit, arena);
-  bool ok = _upb_Array_Append_accessor2(msg, UPB_SIZE(0, 0), UPB_SIZE(2, 3), &sub, arena);
-  if (!ok) return NULL;
-  return sub;
-}
-
-/* google.protobuf.FileDescriptorProto */
-
-UPB_INLINE google_protobuf_FileDescriptorProto* google_protobuf_FileDescriptorProto_new(upb_Arena* arena) {
-  return (google_protobuf_FileDescriptorProto*)_upb_Message_New(&google_protobuf_FileDescriptorProto_msginit, arena);
-}
-UPB_INLINE google_protobuf_FileDescriptorProto* google_protobuf_FileDescriptorProto_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_FileDescriptorProto* ret = google_protobuf_FileDescriptorProto_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_FileDescriptorProto_msginit, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_FileDescriptorProto* google_protobuf_FileDescriptorProto_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_FileDescriptorProto* ret = google_protobuf_FileDescriptorProto_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_FileDescriptorProto_msginit, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_FileDescriptorProto_serialize(const google_protobuf_FileDescriptorProto* msg, upb_Arena* arena, size_t* len) {
-  return upb_Encode(msg, &google_protobuf_FileDescriptorProto_msginit, 0, arena, len);
-}
-UPB_INLINE char* google_protobuf_FileDescriptorProto_serialize_ex(const google_protobuf_FileDescriptorProto* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  return upb_Encode(msg, &google_protobuf_FileDescriptorProto_msginit, options, arena, len);
-}
-UPB_INLINE bool google_protobuf_FileDescriptorProto_has_name(const google_protobuf_FileDescriptorProto* msg) {
-  return _upb_hasbit(msg, 1);
-}
-UPB_INLINE void google_protobuf_FileDescriptorProto_clear_name(const google_protobuf_FileDescriptorProto* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_StringView) = upb_StringView_FromDataAndSize(NULL, 0);
-  _upb_clearhas(msg, 1);
-}
-UPB_INLINE upb_StringView google_protobuf_FileDescriptorProto_name(const google_protobuf_FileDescriptorProto* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_StringView);
-}
-UPB_INLINE bool google_protobuf_FileDescriptorProto_has_package(const google_protobuf_FileDescriptorProto* msg) {
-  return _upb_hasbit(msg, 2);
-}
-UPB_INLINE void google_protobuf_FileDescriptorProto_clear_package(const google_protobuf_FileDescriptorProto* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(12, 24), upb_StringView) = upb_StringView_FromDataAndSize(NULL, 0);
-  _upb_clearhas(msg, 2);
-}
-UPB_INLINE upb_StringView google_protobuf_FileDescriptorProto_package(const google_protobuf_FileDescriptorProto* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(12, 24), upb_StringView);
-}
-UPB_INLINE void google_protobuf_FileDescriptorProto_clear_dependency(const google_protobuf_FileDescriptorProto* msg) {
-  _upb_array_detach(msg, UPB_SIZE(20, 40));
-}
-UPB_INLINE upb_StringView const* google_protobuf_FileDescriptorProto_dependency(const google_protobuf_FileDescriptorProto* msg, size_t* len) {
-  return (upb_StringView const*)_upb_array_accessor(msg, UPB_SIZE(20, 40), len);
-}
-UPB_INLINE bool google_protobuf_FileDescriptorProto_has_message_type(const google_protobuf_FileDescriptorProto* msg) {
-  return _upb_has_submsg_nohasbit(msg, UPB_SIZE(24, 48));
-}
-UPB_INLINE void google_protobuf_FileDescriptorProto_clear_message_type(const google_protobuf_FileDescriptorProto* msg) {
-  _upb_array_detach(msg, UPB_SIZE(24, 48));
-}
-UPB_INLINE const google_protobuf_DescriptorProto* const* google_protobuf_FileDescriptorProto_message_type(const google_protobuf_FileDescriptorProto* msg, size_t* len) {
-  return (const google_protobuf_DescriptorProto* const*)_upb_array_accessor(msg, UPB_SIZE(24, 48), len);
-}
-UPB_INLINE bool google_protobuf_FileDescriptorProto_has_enum_type(const google_protobuf_FileDescriptorProto* msg) {
-  return _upb_has_submsg_nohasbit(msg, UPB_SIZE(28, 56));
-}
-UPB_INLINE void google_protobuf_FileDescriptorProto_clear_enum_type(const google_protobuf_FileDescriptorProto* msg) {
-  _upb_array_detach(msg, UPB_SIZE(28, 56));
-}
-UPB_INLINE const google_protobuf_EnumDescriptorProto* const* google_protobuf_FileDescriptorProto_enum_type(const google_protobuf_FileDescriptorProto* msg, size_t* len) {
-  return (const google_protobuf_EnumDescriptorProto* const*)_upb_array_accessor(msg, UPB_SIZE(28, 56), len);
-}
-UPB_INLINE bool google_protobuf_FileDescriptorProto_has_service(const google_protobuf_FileDescriptorProto* msg) {
-  return _upb_has_submsg_nohasbit(msg, UPB_SIZE(32, 64));
-}
-UPB_INLINE void google_protobuf_FileDescriptorProto_clear_service(const google_protobuf_FileDescriptorProto* msg) {
-  _upb_array_detach(msg, UPB_SIZE(32, 64));
-}
-UPB_INLINE const google_protobuf_ServiceDescriptorProto* const* google_protobuf_FileDescriptorProto_service(const google_protobuf_FileDescriptorProto* msg, size_t* len) {
-  return (const google_protobuf_ServiceDescriptorProto* const*)_upb_array_accessor(msg, UPB_SIZE(32, 64), len);
-}
-UPB_INLINE bool google_protobuf_FileDescriptorProto_has_extension(const google_protobuf_FileDescriptorProto* msg) {
-  return _upb_has_submsg_nohasbit(msg, UPB_SIZE(36, 72));
-}
-UPB_INLINE void google_protobuf_FileDescriptorProto_clear_extension(const google_protobuf_FileDescriptorProto* msg) {
-  _upb_array_detach(msg, UPB_SIZE(36, 72));
-}
-UPB_INLINE const google_protobuf_FieldDescriptorProto* const* google_protobuf_FileDescriptorProto_extension(const google_protobuf_FileDescriptorProto* msg, size_t* len) {
-  return (const google_protobuf_FieldDescriptorProto* const*)_upb_array_accessor(msg, UPB_SIZE(36, 72), len);
-}
-UPB_INLINE bool google_protobuf_FileDescriptorProto_has_options(const google_protobuf_FileDescriptorProto* msg) {
-  return _upb_hasbit(msg, 3);
-}
-UPB_INLINE void google_protobuf_FileDescriptorProto_clear_options(const google_protobuf_FileDescriptorProto* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(40, 80), const upb_Message*) = NULL;
-}
-UPB_INLINE const google_protobuf_FileOptions* google_protobuf_FileDescriptorProto_options(const google_protobuf_FileDescriptorProto* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(40, 80), const google_protobuf_FileOptions*);
-}
-UPB_INLINE bool google_protobuf_FileDescriptorProto_has_source_code_info(const google_protobuf_FileDescriptorProto* msg) {
-  return _upb_hasbit(msg, 4);
-}
-UPB_INLINE void google_protobuf_FileDescriptorProto_clear_source_code_info(const google_protobuf_FileDescriptorProto* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(44, 88), const upb_Message*) = NULL;
-}
-UPB_INLINE const google_protobuf_SourceCodeInfo* google_protobuf_FileDescriptorProto_source_code_info(const google_protobuf_FileDescriptorProto* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(44, 88), const google_protobuf_SourceCodeInfo*);
-}
-UPB_INLINE void google_protobuf_FileDescriptorProto_clear_public_dependency(const google_protobuf_FileDescriptorProto* msg) {
-  _upb_array_detach(msg, UPB_SIZE(48, 96));
-}
-UPB_INLINE int32_t const* google_protobuf_FileDescriptorProto_public_dependency(const google_protobuf_FileDescriptorProto* msg, size_t* len) {
-  return (int32_t const*)_upb_array_accessor(msg, UPB_SIZE(48, 96), len);
-}
-UPB_INLINE void google_protobuf_FileDescriptorProto_clear_weak_dependency(const google_protobuf_FileDescriptorProto* msg) {
-  _upb_array_detach(msg, UPB_SIZE(52, 104));
-}
-UPB_INLINE int32_t const* google_protobuf_FileDescriptorProto_weak_dependency(const google_protobuf_FileDescriptorProto* msg, size_t* len) {
-  return (int32_t const*)_upb_array_accessor(msg, UPB_SIZE(52, 104), len);
-}
-UPB_INLINE bool google_protobuf_FileDescriptorProto_has_syntax(const google_protobuf_FileDescriptorProto* msg) {
-  return _upb_hasbit(msg, 5);
-}
-UPB_INLINE void google_protobuf_FileDescriptorProto_clear_syntax(const google_protobuf_FileDescriptorProto* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(56, 112), upb_StringView) = upb_StringView_FromDataAndSize(NULL, 0);
-  _upb_clearhas(msg, 5);
-}
-UPB_INLINE upb_StringView google_protobuf_FileDescriptorProto_syntax(const google_protobuf_FileDescriptorProto* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(56, 112), upb_StringView);
-}
-
-UPB_INLINE void google_protobuf_FileDescriptorProto_set_name(google_protobuf_FileDescriptorProto *msg, upb_StringView value) {
-  _upb_sethas(msg, 1);
-  *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_StringView) = value;
-}
-UPB_INLINE void google_protobuf_FileDescriptorProto_set_package(google_protobuf_FileDescriptorProto *msg, upb_StringView value) {
-  _upb_sethas(msg, 2);
-  *UPB_PTR_AT(msg, UPB_SIZE(12, 24), upb_StringView) = value;
-}
-UPB_INLINE upb_StringView* google_protobuf_FileDescriptorProto_mutable_dependency(google_protobuf_FileDescriptorProto* msg, size_t* len) {
-  return (upb_StringView*)_upb_array_mutable_accessor(msg, UPB_SIZE(20, 40), len);
-}
-UPB_INLINE upb_StringView* google_protobuf_FileDescriptorProto_resize_dependency(google_protobuf_FileDescriptorProto* msg, size_t len, upb_Arena* arena) {
-  return (upb_StringView*)_upb_Array_Resize_accessor2(msg, UPB_SIZE(20, 40), len, UPB_SIZE(3, 4), arena);
-}
-UPB_INLINE bool google_protobuf_FileDescriptorProto_add_dependency(google_protobuf_FileDescriptorProto* msg, upb_StringView val, upb_Arena* arena) {
-  return _upb_Array_Append_accessor2(msg, UPB_SIZE(20, 40), UPB_SIZE(3, 4), &val, arena);
-}
-UPB_INLINE google_protobuf_DescriptorProto** google_protobuf_FileDescriptorProto_mutable_message_type(google_protobuf_FileDescriptorProto* msg, size_t* len) {
-  return (google_protobuf_DescriptorProto**)_upb_array_mutable_accessor(msg, UPB_SIZE(24, 48), len);
-}
-UPB_INLINE google_protobuf_DescriptorProto** google_protobuf_FileDescriptorProto_resize_message_type(google_protobuf_FileDescriptorProto* msg, size_t len, upb_Arena* arena) {
-  return (google_protobuf_DescriptorProto**)_upb_Array_Resize_accessor2(msg, UPB_SIZE(24, 48), len, UPB_SIZE(2, 3), arena);
-}
-UPB_INLINE struct google_protobuf_DescriptorProto* google_protobuf_FileDescriptorProto_add_message_type(google_protobuf_FileDescriptorProto* msg, upb_Arena* arena) {
-  struct google_protobuf_DescriptorProto* sub = (struct google_protobuf_DescriptorProto*)_upb_Message_New(&google_protobuf_DescriptorProto_msginit, arena);
-  bool ok = _upb_Array_Append_accessor2(msg, UPB_SIZE(24, 48), UPB_SIZE(2, 3), &sub, arena);
-  if (!ok) return NULL;
-  return sub;
-}
-UPB_INLINE google_protobuf_EnumDescriptorProto** google_protobuf_FileDescriptorProto_mutable_enum_type(google_protobuf_FileDescriptorProto* msg, size_t* len) {
-  return (google_protobuf_EnumDescriptorProto**)_upb_array_mutable_accessor(msg, UPB_SIZE(28, 56), len);
-}
-UPB_INLINE google_protobuf_EnumDescriptorProto** google_protobuf_FileDescriptorProto_resize_enum_type(google_protobuf_FileDescriptorProto* msg, size_t len, upb_Arena* arena) {
-  return (google_protobuf_EnumDescriptorProto**)_upb_Array_Resize_accessor2(msg, UPB_SIZE(28, 56), len, UPB_SIZE(2, 3), arena);
-}
-UPB_INLINE struct google_protobuf_EnumDescriptorProto* google_protobuf_FileDescriptorProto_add_enum_type(google_protobuf_FileDescriptorProto* msg, upb_Arena* arena) {
-  struct google_protobuf_EnumDescriptorProto* sub = (struct google_protobuf_EnumDescriptorProto*)_upb_Message_New(&google_protobuf_EnumDescriptorProto_msginit, arena);
-  bool ok = _upb_Array_Append_accessor2(msg, UPB_SIZE(28, 56), UPB_SIZE(2, 3), &sub, arena);
-  if (!ok) return NULL;
-  return sub;
-}
-UPB_INLINE google_protobuf_ServiceDescriptorProto** google_protobuf_FileDescriptorProto_mutable_service(google_protobuf_FileDescriptorProto* msg, size_t* len) {
-  return (google_protobuf_ServiceDescriptorProto**)_upb_array_mutable_accessor(msg, UPB_SIZE(32, 64), len);
-}
-UPB_INLINE google_protobuf_ServiceDescriptorProto** google_protobuf_FileDescriptorProto_resize_service(google_protobuf_FileDescriptorProto* msg, size_t len, upb_Arena* arena) {
-  return (google_protobuf_ServiceDescriptorProto**)_upb_Array_Resize_accessor2(msg, UPB_SIZE(32, 64), len, UPB_SIZE(2, 3), arena);
-}
-UPB_INLINE struct google_protobuf_ServiceDescriptorProto* google_protobuf_FileDescriptorProto_add_service(google_protobuf_FileDescriptorProto* msg, upb_Arena* arena) {
-  struct google_protobuf_ServiceDescriptorProto* sub = (struct google_protobuf_ServiceDescriptorProto*)_upb_Message_New(&google_protobuf_ServiceDescriptorProto_msginit, arena);
-  bool ok = _upb_Array_Append_accessor2(msg, UPB_SIZE(32, 64), UPB_SIZE(2, 3), &sub, arena);
-  if (!ok) return NULL;
-  return sub;
-}
-UPB_INLINE google_protobuf_FieldDescriptorProto** google_protobuf_FileDescriptorProto_mutable_extension(google_protobuf_FileDescriptorProto* msg, size_t* len) {
-  return (google_protobuf_FieldDescriptorProto**)_upb_array_mutable_accessor(msg, UPB_SIZE(36, 72), len);
-}
-UPB_INLINE google_protobuf_FieldDescriptorProto** google_protobuf_FileDescriptorProto_resize_extension(google_protobuf_FileDescriptorProto* msg, size_t len, upb_Arena* arena) {
-  return (google_protobuf_FieldDescriptorProto**)_upb_Array_Resize_accessor2(msg, UPB_SIZE(36, 72), len, UPB_SIZE(2, 3), arena);
-}
-UPB_INLINE struct google_protobuf_FieldDescriptorProto* google_protobuf_FileDescriptorProto_add_extension(google_protobuf_FileDescriptorProto* msg, upb_Arena* arena) {
-  struct google_protobuf_FieldDescriptorProto* sub = (struct google_protobuf_FieldDescriptorProto*)_upb_Message_New(&google_protobuf_FieldDescriptorProto_msginit, arena);
-  bool ok = _upb_Array_Append_accessor2(msg, UPB_SIZE(36, 72), UPB_SIZE(2, 3), &sub, arena);
-  if (!ok) return NULL;
-  return sub;
-}
-UPB_INLINE void google_protobuf_FileDescriptorProto_set_options(google_protobuf_FileDescriptorProto *msg, google_protobuf_FileOptions* value) {
-  _upb_sethas(msg, 3);
-  *UPB_PTR_AT(msg, UPB_SIZE(40, 80), google_protobuf_FileOptions*) = value;
-}
-UPB_INLINE struct google_protobuf_FileOptions* google_protobuf_FileDescriptorProto_mutable_options(google_protobuf_FileDescriptorProto* msg, upb_Arena* arena) {
-  struct google_protobuf_FileOptions* sub = (struct google_protobuf_FileOptions*)google_protobuf_FileDescriptorProto_options(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_FileOptions*)_upb_Message_New(&google_protobuf_FileOptions_msginit, arena);
-    if (!sub) return NULL;
-    google_protobuf_FileDescriptorProto_set_options(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void google_protobuf_FileDescriptorProto_set_source_code_info(google_protobuf_FileDescriptorProto *msg, google_protobuf_SourceCodeInfo* value) {
-  _upb_sethas(msg, 4);
-  *UPB_PTR_AT(msg, UPB_SIZE(44, 88), google_protobuf_SourceCodeInfo*) = value;
-}
-UPB_INLINE struct google_protobuf_SourceCodeInfo* google_protobuf_FileDescriptorProto_mutable_source_code_info(google_protobuf_FileDescriptorProto* msg, upb_Arena* arena) {
-  struct google_protobuf_SourceCodeInfo* sub = (struct google_protobuf_SourceCodeInfo*)google_protobuf_FileDescriptorProto_source_code_info(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_SourceCodeInfo*)_upb_Message_New(&google_protobuf_SourceCodeInfo_msginit, arena);
-    if (!sub) return NULL;
-    google_protobuf_FileDescriptorProto_set_source_code_info(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE int32_t* google_protobuf_FileDescriptorProto_mutable_public_dependency(google_protobuf_FileDescriptorProto* msg, size_t* len) {
-  return (int32_t*)_upb_array_mutable_accessor(msg, UPB_SIZE(48, 96), len);
-}
-UPB_INLINE int32_t* google_protobuf_FileDescriptorProto_resize_public_dependency(google_protobuf_FileDescriptorProto* msg, size_t len, upb_Arena* arena) {
-  return (int32_t*)_upb_Array_Resize_accessor2(msg, UPB_SIZE(48, 96), len, 2, arena);
-}
-UPB_INLINE bool google_protobuf_FileDescriptorProto_add_public_dependency(google_protobuf_FileDescriptorProto* msg, int32_t val, upb_Arena* arena) {
-  return _upb_Array_Append_accessor2(msg, UPB_SIZE(48, 96), 2, &val, arena);
-}
-UPB_INLINE int32_t* google_protobuf_FileDescriptorProto_mutable_weak_dependency(google_protobuf_FileDescriptorProto* msg, size_t* len) {
-  return (int32_t*)_upb_array_mutable_accessor(msg, UPB_SIZE(52, 104), len);
-}
-UPB_INLINE int32_t* google_protobuf_FileDescriptorProto_resize_weak_dependency(google_protobuf_FileDescriptorProto* msg, size_t len, upb_Arena* arena) {
-  return (int32_t*)_upb_Array_Resize_accessor2(msg, UPB_SIZE(52, 104), len, 2, arena);
-}
-UPB_INLINE bool google_protobuf_FileDescriptorProto_add_weak_dependency(google_protobuf_FileDescriptorProto* msg, int32_t val, upb_Arena* arena) {
-  return _upb_Array_Append_accessor2(msg, UPB_SIZE(52, 104), 2, &val, arena);
-}
-UPB_INLINE void google_protobuf_FileDescriptorProto_set_syntax(google_protobuf_FileDescriptorProto *msg, upb_StringView value) {
-  _upb_sethas(msg, 5);
-  *UPB_PTR_AT(msg, UPB_SIZE(56, 112), upb_StringView) = value;
-}
-
-/* google.protobuf.DescriptorProto */
-
-UPB_INLINE google_protobuf_DescriptorProto* google_protobuf_DescriptorProto_new(upb_Arena* arena) {
-  return (google_protobuf_DescriptorProto*)_upb_Message_New(&google_protobuf_DescriptorProto_msginit, arena);
-}
-UPB_INLINE google_protobuf_DescriptorProto* google_protobuf_DescriptorProto_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_DescriptorProto* ret = google_protobuf_DescriptorProto_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_DescriptorProto_msginit, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_DescriptorProto* google_protobuf_DescriptorProto_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_DescriptorProto* ret = google_protobuf_DescriptorProto_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_DescriptorProto_msginit, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_DescriptorProto_serialize(const google_protobuf_DescriptorProto* msg, upb_Arena* arena, size_t* len) {
-  return upb_Encode(msg, &google_protobuf_DescriptorProto_msginit, 0, arena, len);
-}
-UPB_INLINE char* google_protobuf_DescriptorProto_serialize_ex(const google_protobuf_DescriptorProto* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  return upb_Encode(msg, &google_protobuf_DescriptorProto_msginit, options, arena, len);
-}
-UPB_INLINE bool google_protobuf_DescriptorProto_has_name(const google_protobuf_DescriptorProto* msg) {
-  return _upb_hasbit(msg, 1);
-}
-UPB_INLINE void google_protobuf_DescriptorProto_clear_name(const google_protobuf_DescriptorProto* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_StringView) = upb_StringView_FromDataAndSize(NULL, 0);
-  _upb_clearhas(msg, 1);
-}
-UPB_INLINE upb_StringView google_protobuf_DescriptorProto_name(const google_protobuf_DescriptorProto* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_StringView);
-}
-UPB_INLINE bool google_protobuf_DescriptorProto_has_field(const google_protobuf_DescriptorProto* msg) {
-  return _upb_has_submsg_nohasbit(msg, UPB_SIZE(12, 24));
-}
-UPB_INLINE void google_protobuf_DescriptorProto_clear_field(const google_protobuf_DescriptorProto* msg) {
-  _upb_array_detach(msg, UPB_SIZE(12, 24));
-}
-UPB_INLINE const google_protobuf_FieldDescriptorProto* const* google_protobuf_DescriptorProto_field(const google_protobuf_DescriptorProto* msg, size_t* len) {
-  return (const google_protobuf_FieldDescriptorProto* const*)_upb_array_accessor(msg, UPB_SIZE(12, 24), len);
-}
-UPB_INLINE bool google_protobuf_DescriptorProto_has_nested_type(const google_protobuf_DescriptorProto* msg) {
-  return _upb_has_submsg_nohasbit(msg, UPB_SIZE(16, 32));
-}
-UPB_INLINE void google_protobuf_DescriptorProto_clear_nested_type(const google_protobuf_DescriptorProto* msg) {
-  _upb_array_detach(msg, UPB_SIZE(16, 32));
-}
-UPB_INLINE const google_protobuf_DescriptorProto* const* google_protobuf_DescriptorProto_nested_type(const google_protobuf_DescriptorProto* msg, size_t* len) {
-  return (const google_protobuf_DescriptorProto* const*)_upb_array_accessor(msg, UPB_SIZE(16, 32), len);
-}
-UPB_INLINE bool google_protobuf_DescriptorProto_has_enum_type(const google_protobuf_DescriptorProto* msg) {
-  return _upb_has_submsg_nohasbit(msg, UPB_SIZE(20, 40));
-}
-UPB_INLINE void google_protobuf_DescriptorProto_clear_enum_type(const google_protobuf_DescriptorProto* msg) {
-  _upb_array_detach(msg, UPB_SIZE(20, 40));
-}
-UPB_INLINE const google_protobuf_EnumDescriptorProto* const* google_protobuf_DescriptorProto_enum_type(const google_protobuf_DescriptorProto* msg, size_t* len) {
-  return (const google_protobuf_EnumDescriptorProto* const*)_upb_array_accessor(msg, UPB_SIZE(20, 40), len);
-}
-UPB_INLINE bool google_protobuf_DescriptorProto_has_extension_range(const google_protobuf_DescriptorProto* msg) {
-  return _upb_has_submsg_nohasbit(msg, UPB_SIZE(24, 48));
-}
-UPB_INLINE void google_protobuf_DescriptorProto_clear_extension_range(const google_protobuf_DescriptorProto* msg) {
-  _upb_array_detach(msg, UPB_SIZE(24, 48));
-}
-UPB_INLINE const google_protobuf_DescriptorProto_ExtensionRange* const* google_protobuf_DescriptorProto_extension_range(const google_protobuf_DescriptorProto* msg, size_t* len) {
-  return (const google_protobuf_DescriptorProto_ExtensionRange* const*)_upb_array_accessor(msg, UPB_SIZE(24, 48), len);
-}
-UPB_INLINE bool google_protobuf_DescriptorProto_has_extension(const google_protobuf_DescriptorProto* msg) {
-  return _upb_has_submsg_nohasbit(msg, UPB_SIZE(28, 56));
-}
-UPB_INLINE void google_protobuf_DescriptorProto_clear_extension(const google_protobuf_DescriptorProto* msg) {
-  _upb_array_detach(msg, UPB_SIZE(28, 56));
-}
-UPB_INLINE const google_protobuf_FieldDescriptorProto* const* google_protobuf_DescriptorProto_extension(const google_protobuf_DescriptorProto* msg, size_t* len) {
-  return (const google_protobuf_FieldDescriptorProto* const*)_upb_array_accessor(msg, UPB_SIZE(28, 56), len);
-}
-UPB_INLINE bool google_protobuf_DescriptorProto_has_options(const google_protobuf_DescriptorProto* msg) {
-  return _upb_hasbit(msg, 2);
-}
-UPB_INLINE void google_protobuf_DescriptorProto_clear_options(const google_protobuf_DescriptorProto* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(32, 64), const upb_Message*) = NULL;
-}
-UPB_INLINE const google_protobuf_MessageOptions* google_protobuf_DescriptorProto_options(const google_protobuf_DescriptorProto* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(32, 64), const google_protobuf_MessageOptions*);
-}
-UPB_INLINE bool google_protobuf_DescriptorProto_has_oneof_decl(const google_protobuf_DescriptorProto* msg) {
-  return _upb_has_submsg_nohasbit(msg, UPB_SIZE(36, 72));
-}
-UPB_INLINE void google_protobuf_DescriptorProto_clear_oneof_decl(const google_protobuf_DescriptorProto* msg) {
-  _upb_array_detach(msg, UPB_SIZE(36, 72));
-}
-UPB_INLINE const google_protobuf_OneofDescriptorProto* const* google_protobuf_DescriptorProto_oneof_decl(const google_protobuf_DescriptorProto* msg, size_t* len) {
-  return (const google_protobuf_OneofDescriptorProto* const*)_upb_array_accessor(msg, UPB_SIZE(36, 72), len);
-}
-UPB_INLINE bool google_protobuf_DescriptorProto_has_reserved_range(const google_protobuf_DescriptorProto* msg) {
-  return _upb_has_submsg_nohasbit(msg, UPB_SIZE(40, 80));
-}
-UPB_INLINE void google_protobuf_DescriptorProto_clear_reserved_range(const google_protobuf_DescriptorProto* msg) {
-  _upb_array_detach(msg, UPB_SIZE(40, 80));
-}
-UPB_INLINE const google_protobuf_DescriptorProto_ReservedRange* const* google_protobuf_DescriptorProto_reserved_range(const google_protobuf_DescriptorProto* msg, size_t* len) {
-  return (const google_protobuf_DescriptorProto_ReservedRange* const*)_upb_array_accessor(msg, UPB_SIZE(40, 80), len);
-}
-UPB_INLINE void google_protobuf_DescriptorProto_clear_reserved_name(const google_protobuf_DescriptorProto* msg) {
-  _upb_array_detach(msg, UPB_SIZE(44, 88));
-}
-UPB_INLINE upb_StringView const* google_protobuf_DescriptorProto_reserved_name(const google_protobuf_DescriptorProto* msg, size_t* len) {
-  return (upb_StringView const*)_upb_array_accessor(msg, UPB_SIZE(44, 88), len);
-}
-
-UPB_INLINE void google_protobuf_DescriptorProto_set_name(google_protobuf_DescriptorProto *msg, upb_StringView value) {
-  _upb_sethas(msg, 1);
-  *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_StringView) = value;
-}
-UPB_INLINE google_protobuf_FieldDescriptorProto** google_protobuf_DescriptorProto_mutable_field(google_protobuf_DescriptorProto* msg, size_t* len) {
-  return (google_protobuf_FieldDescriptorProto**)_upb_array_mutable_accessor(msg, UPB_SIZE(12, 24), len);
-}
-UPB_INLINE google_protobuf_FieldDescriptorProto** google_protobuf_DescriptorProto_resize_field(google_protobuf_DescriptorProto* msg, size_t len, upb_Arena* arena) {
-  return (google_protobuf_FieldDescriptorProto**)_upb_Array_Resize_accessor2(msg, UPB_SIZE(12, 24), len, UPB_SIZE(2, 3), arena);
-}
-UPB_INLINE struct google_protobuf_FieldDescriptorProto* google_protobuf_DescriptorProto_add_field(google_protobuf_DescriptorProto* msg, upb_Arena* arena) {
-  struct google_protobuf_FieldDescriptorProto* sub = (struct google_protobuf_FieldDescriptorProto*)_upb_Message_New(&google_protobuf_FieldDescriptorProto_msginit, arena);
-  bool ok = _upb_Array_Append_accessor2(msg, UPB_SIZE(12, 24), UPB_SIZE(2, 3), &sub, arena);
-  if (!ok) return NULL;
-  return sub;
-}
-UPB_INLINE google_protobuf_DescriptorProto** google_protobuf_DescriptorProto_mutable_nested_type(google_protobuf_DescriptorProto* msg, size_t* len) {
-  return (google_protobuf_DescriptorProto**)_upb_array_mutable_accessor(msg, UPB_SIZE(16, 32), len);
-}
-UPB_INLINE google_protobuf_DescriptorProto** google_protobuf_DescriptorProto_resize_nested_type(google_protobuf_DescriptorProto* msg, size_t len, upb_Arena* arena) {
-  return (google_protobuf_DescriptorProto**)_upb_Array_Resize_accessor2(msg, UPB_SIZE(16, 32), len, UPB_SIZE(2, 3), arena);
-}
-UPB_INLINE struct google_protobuf_DescriptorProto* google_protobuf_DescriptorProto_add_nested_type(google_protobuf_DescriptorProto* msg, upb_Arena* arena) {
-  struct google_protobuf_DescriptorProto* sub = (struct google_protobuf_DescriptorProto*)_upb_Message_New(&google_protobuf_DescriptorProto_msginit, arena);
-  bool ok = _upb_Array_Append_accessor2(msg, UPB_SIZE(16, 32), UPB_SIZE(2, 3), &sub, arena);
-  if (!ok) return NULL;
-  return sub;
-}
-UPB_INLINE google_protobuf_EnumDescriptorProto** google_protobuf_DescriptorProto_mutable_enum_type(google_protobuf_DescriptorProto* msg, size_t* len) {
-  return (google_protobuf_EnumDescriptorProto**)_upb_array_mutable_accessor(msg, UPB_SIZE(20, 40), len);
-}
-UPB_INLINE google_protobuf_EnumDescriptorProto** google_protobuf_DescriptorProto_resize_enum_type(google_protobuf_DescriptorProto* msg, size_t len, upb_Arena* arena) {
-  return (google_protobuf_EnumDescriptorProto**)_upb_Array_Resize_accessor2(msg, UPB_SIZE(20, 40), len, UPB_SIZE(2, 3), arena);
-}
-UPB_INLINE struct google_protobuf_EnumDescriptorProto* google_protobuf_DescriptorProto_add_enum_type(google_protobuf_DescriptorProto* msg, upb_Arena* arena) {
-  struct google_protobuf_EnumDescriptorProto* sub = (struct google_protobuf_EnumDescriptorProto*)_upb_Message_New(&google_protobuf_EnumDescriptorProto_msginit, arena);
-  bool ok = _upb_Array_Append_accessor2(msg, UPB_SIZE(20, 40), UPB_SIZE(2, 3), &sub, arena);
-  if (!ok) return NULL;
-  return sub;
-}
-UPB_INLINE google_protobuf_DescriptorProto_ExtensionRange** google_protobuf_DescriptorProto_mutable_extension_range(google_protobuf_DescriptorProto* msg, size_t* len) {
-  return (google_protobuf_DescriptorProto_ExtensionRange**)_upb_array_mutable_accessor(msg, UPB_SIZE(24, 48), len);
-}
-UPB_INLINE google_protobuf_DescriptorProto_ExtensionRange** google_protobuf_DescriptorProto_resize_extension_range(google_protobuf_DescriptorProto* msg, size_t len, upb_Arena* arena) {
-  return (google_protobuf_DescriptorProto_ExtensionRange**)_upb_Array_Resize_accessor2(msg, UPB_SIZE(24, 48), len, UPB_SIZE(2, 3), arena);
-}
-UPB_INLINE struct google_protobuf_DescriptorProto_ExtensionRange* google_protobuf_DescriptorProto_add_extension_range(google_protobuf_DescriptorProto* msg, upb_Arena* arena) {
-  struct google_protobuf_DescriptorProto_ExtensionRange* sub = (struct google_protobuf_DescriptorProto_ExtensionRange*)_upb_Message_New(&google_protobuf_DescriptorProto_ExtensionRange_msginit, arena);
-  bool ok = _upb_Array_Append_accessor2(msg, UPB_SIZE(24, 48), UPB_SIZE(2, 3), &sub, arena);
-  if (!ok) return NULL;
-  return sub;
-}
-UPB_INLINE google_protobuf_FieldDescriptorProto** google_protobuf_DescriptorProto_mutable_extension(google_protobuf_DescriptorProto* msg, size_t* len) {
-  return (google_protobuf_FieldDescriptorProto**)_upb_array_mutable_accessor(msg, UPB_SIZE(28, 56), len);
-}
-UPB_INLINE google_protobuf_FieldDescriptorProto** google_protobuf_DescriptorProto_resize_extension(google_protobuf_DescriptorProto* msg, size_t len, upb_Arena* arena) {
-  return (google_protobuf_FieldDescriptorProto**)_upb_Array_Resize_accessor2(msg, UPB_SIZE(28, 56), len, UPB_SIZE(2, 3), arena);
-}
-UPB_INLINE struct google_protobuf_FieldDescriptorProto* google_protobuf_DescriptorProto_add_extension(google_protobuf_DescriptorProto* msg, upb_Arena* arena) {
-  struct google_protobuf_FieldDescriptorProto* sub = (struct google_protobuf_FieldDescriptorProto*)_upb_Message_New(&google_protobuf_FieldDescriptorProto_msginit, arena);
-  bool ok = _upb_Array_Append_accessor2(msg, UPB_SIZE(28, 56), UPB_SIZE(2, 3), &sub, arena);
-  if (!ok) return NULL;
-  return sub;
-}
-UPB_INLINE void google_protobuf_DescriptorProto_set_options(google_protobuf_DescriptorProto *msg, google_protobuf_MessageOptions* value) {
-  _upb_sethas(msg, 2);
-  *UPB_PTR_AT(msg, UPB_SIZE(32, 64), google_protobuf_MessageOptions*) = value;
-}
-UPB_INLINE struct google_protobuf_MessageOptions* google_protobuf_DescriptorProto_mutable_options(google_protobuf_DescriptorProto* msg, upb_Arena* arena) {
-  struct google_protobuf_MessageOptions* sub = (struct google_protobuf_MessageOptions*)google_protobuf_DescriptorProto_options(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_MessageOptions*)_upb_Message_New(&google_protobuf_MessageOptions_msginit, arena);
-    if (!sub) return NULL;
-    google_protobuf_DescriptorProto_set_options(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE google_protobuf_OneofDescriptorProto** google_protobuf_DescriptorProto_mutable_oneof_decl(google_protobuf_DescriptorProto* msg, size_t* len) {
-  return (google_protobuf_OneofDescriptorProto**)_upb_array_mutable_accessor(msg, UPB_SIZE(36, 72), len);
-}
-UPB_INLINE google_protobuf_OneofDescriptorProto** google_protobuf_DescriptorProto_resize_oneof_decl(google_protobuf_DescriptorProto* msg, size_t len, upb_Arena* arena) {
-  return (google_protobuf_OneofDescriptorProto**)_upb_Array_Resize_accessor2(msg, UPB_SIZE(36, 72), len, UPB_SIZE(2, 3), arena);
-}
-UPB_INLINE struct google_protobuf_OneofDescriptorProto* google_protobuf_DescriptorProto_add_oneof_decl(google_protobuf_DescriptorProto* msg, upb_Arena* arena) {
-  struct google_protobuf_OneofDescriptorProto* sub = (struct google_protobuf_OneofDescriptorProto*)_upb_Message_New(&google_protobuf_OneofDescriptorProto_msginit, arena);
-  bool ok = _upb_Array_Append_accessor2(msg, UPB_SIZE(36, 72), UPB_SIZE(2, 3), &sub, arena);
-  if (!ok) return NULL;
-  return sub;
-}
-UPB_INLINE google_protobuf_DescriptorProto_ReservedRange** google_protobuf_DescriptorProto_mutable_reserved_range(google_protobuf_DescriptorProto* msg, size_t* len) {
-  return (google_protobuf_DescriptorProto_ReservedRange**)_upb_array_mutable_accessor(msg, UPB_SIZE(40, 80), len);
-}
-UPB_INLINE google_protobuf_DescriptorProto_ReservedRange** google_protobuf_DescriptorProto_resize_reserved_range(google_protobuf_DescriptorProto* msg, size_t len, upb_Arena* arena) {
-  return (google_protobuf_DescriptorProto_ReservedRange**)_upb_Array_Resize_accessor2(msg, UPB_SIZE(40, 80), len, UPB_SIZE(2, 3), arena);
-}
-UPB_INLINE struct google_protobuf_DescriptorProto_ReservedRange* google_protobuf_DescriptorProto_add_reserved_range(google_protobuf_DescriptorProto* msg, upb_Arena* arena) {
-  struct google_protobuf_DescriptorProto_ReservedRange* sub = (struct google_protobuf_DescriptorProto_ReservedRange*)_upb_Message_New(&google_protobuf_DescriptorProto_ReservedRange_msginit, arena);
-  bool ok = _upb_Array_Append_accessor2(msg, UPB_SIZE(40, 80), UPB_SIZE(2, 3), &sub, arena);
-  if (!ok) return NULL;
-  return sub;
-}
-UPB_INLINE upb_StringView* google_protobuf_DescriptorProto_mutable_reserved_name(google_protobuf_DescriptorProto* msg, size_t* len) {
-  return (upb_StringView*)_upb_array_mutable_accessor(msg, UPB_SIZE(44, 88), len);
-}
-UPB_INLINE upb_StringView* google_protobuf_DescriptorProto_resize_reserved_name(google_protobuf_DescriptorProto* msg, size_t len, upb_Arena* arena) {
-  return (upb_StringView*)_upb_Array_Resize_accessor2(msg, UPB_SIZE(44, 88), len, UPB_SIZE(3, 4), arena);
-}
-UPB_INLINE bool google_protobuf_DescriptorProto_add_reserved_name(google_protobuf_DescriptorProto* msg, upb_StringView val, upb_Arena* arena) {
-  return _upb_Array_Append_accessor2(msg, UPB_SIZE(44, 88), UPB_SIZE(3, 4), &val, arena);
-}
-
-/* google.protobuf.DescriptorProto.ExtensionRange */
-
-UPB_INLINE google_protobuf_DescriptorProto_ExtensionRange* google_protobuf_DescriptorProto_ExtensionRange_new(upb_Arena* arena) {
-  return (google_protobuf_DescriptorProto_ExtensionRange*)_upb_Message_New(&google_protobuf_DescriptorProto_ExtensionRange_msginit, arena);
-}
-UPB_INLINE google_protobuf_DescriptorProto_ExtensionRange* google_protobuf_DescriptorProto_ExtensionRange_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_DescriptorProto_ExtensionRange* ret = google_protobuf_DescriptorProto_ExtensionRange_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_DescriptorProto_ExtensionRange_msginit, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_DescriptorProto_ExtensionRange* google_protobuf_DescriptorProto_ExtensionRange_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_DescriptorProto_ExtensionRange* ret = google_protobuf_DescriptorProto_ExtensionRange_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_DescriptorProto_ExtensionRange_msginit, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_DescriptorProto_ExtensionRange_serialize(const google_protobuf_DescriptorProto_ExtensionRange* msg, upb_Arena* arena, size_t* len) {
-  return upb_Encode(msg, &google_protobuf_DescriptorProto_ExtensionRange_msginit, 0, arena, len);
-}
-UPB_INLINE char* google_protobuf_DescriptorProto_ExtensionRange_serialize_ex(const google_protobuf_DescriptorProto_ExtensionRange* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  return upb_Encode(msg, &google_protobuf_DescriptorProto_ExtensionRange_msginit, options, arena, len);
-}
-UPB_INLINE bool google_protobuf_DescriptorProto_ExtensionRange_has_start(const google_protobuf_DescriptorProto_ExtensionRange* msg) {
-  return _upb_hasbit(msg, 1);
-}
-UPB_INLINE void google_protobuf_DescriptorProto_ExtensionRange_clear_start(const google_protobuf_DescriptorProto_ExtensionRange* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(4, 4), int32_t) = 0;
-  _upb_clearhas(msg, 1);
-}
-UPB_INLINE int32_t google_protobuf_DescriptorProto_ExtensionRange_start(const google_protobuf_DescriptorProto_ExtensionRange* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(4, 4), int32_t);
-}
-UPB_INLINE bool google_protobuf_DescriptorProto_ExtensionRange_has_end(const google_protobuf_DescriptorProto_ExtensionRange* msg) {
-  return _upb_hasbit(msg, 2);
-}
-UPB_INLINE void google_protobuf_DescriptorProto_ExtensionRange_clear_end(const google_protobuf_DescriptorProto_ExtensionRange* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(8, 8), int32_t) = 0;
-  _upb_clearhas(msg, 2);
-}
-UPB_INLINE int32_t google_protobuf_DescriptorProto_ExtensionRange_end(const google_protobuf_DescriptorProto_ExtensionRange* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(8, 8), int32_t);
-}
-UPB_INLINE bool google_protobuf_DescriptorProto_ExtensionRange_has_options(const google_protobuf_DescriptorProto_ExtensionRange* msg) {
-  return _upb_hasbit(msg, 3);
-}
-UPB_INLINE void google_protobuf_DescriptorProto_ExtensionRange_clear_options(const google_protobuf_DescriptorProto_ExtensionRange* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(12, 16), const upb_Message*) = NULL;
-}
-UPB_INLINE const google_protobuf_ExtensionRangeOptions* google_protobuf_DescriptorProto_ExtensionRange_options(const google_protobuf_DescriptorProto_ExtensionRange* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(12, 16), const google_protobuf_ExtensionRangeOptions*);
-}
-
-UPB_INLINE void google_protobuf_DescriptorProto_ExtensionRange_set_start(google_protobuf_DescriptorProto_ExtensionRange *msg, int32_t value) {
-  _upb_sethas(msg, 1);
-  *UPB_PTR_AT(msg, UPB_SIZE(4, 4), int32_t) = value;
-}
-UPB_INLINE void google_protobuf_DescriptorProto_ExtensionRange_set_end(google_protobuf_DescriptorProto_ExtensionRange *msg, int32_t value) {
-  _upb_sethas(msg, 2);
-  *UPB_PTR_AT(msg, UPB_SIZE(8, 8), int32_t) = value;
-}
-UPB_INLINE void google_protobuf_DescriptorProto_ExtensionRange_set_options(google_protobuf_DescriptorProto_ExtensionRange *msg, google_protobuf_ExtensionRangeOptions* value) {
-  _upb_sethas(msg, 3);
-  *UPB_PTR_AT(msg, UPB_SIZE(12, 16), google_protobuf_ExtensionRangeOptions*) = value;
-}
-UPB_INLINE struct google_protobuf_ExtensionRangeOptions* google_protobuf_DescriptorProto_ExtensionRange_mutable_options(google_protobuf_DescriptorProto_ExtensionRange* msg, upb_Arena* arena) {
-  struct google_protobuf_ExtensionRangeOptions* sub = (struct google_protobuf_ExtensionRangeOptions*)google_protobuf_DescriptorProto_ExtensionRange_options(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_ExtensionRangeOptions*)_upb_Message_New(&google_protobuf_ExtensionRangeOptions_msginit, arena);
-    if (!sub) return NULL;
-    google_protobuf_DescriptorProto_ExtensionRange_set_options(msg, sub);
-  }
-  return sub;
-}
-
-/* google.protobuf.DescriptorProto.ReservedRange */
-
-UPB_INLINE google_protobuf_DescriptorProto_ReservedRange* google_protobuf_DescriptorProto_ReservedRange_new(upb_Arena* arena) {
-  return (google_protobuf_DescriptorProto_ReservedRange*)_upb_Message_New(&google_protobuf_DescriptorProto_ReservedRange_msginit, arena);
-}
-UPB_INLINE google_protobuf_DescriptorProto_ReservedRange* google_protobuf_DescriptorProto_ReservedRange_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_DescriptorProto_ReservedRange* ret = google_protobuf_DescriptorProto_ReservedRange_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_DescriptorProto_ReservedRange_msginit, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_DescriptorProto_ReservedRange* google_protobuf_DescriptorProto_ReservedRange_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_DescriptorProto_ReservedRange* ret = google_protobuf_DescriptorProto_ReservedRange_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_DescriptorProto_ReservedRange_msginit, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_DescriptorProto_ReservedRange_serialize(const google_protobuf_DescriptorProto_ReservedRange* msg, upb_Arena* arena, size_t* len) {
-  return upb_Encode(msg, &google_protobuf_DescriptorProto_ReservedRange_msginit, 0, arena, len);
-}
-UPB_INLINE char* google_protobuf_DescriptorProto_ReservedRange_serialize_ex(const google_protobuf_DescriptorProto_ReservedRange* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  return upb_Encode(msg, &google_protobuf_DescriptorProto_ReservedRange_msginit, options, arena, len);
-}
-UPB_INLINE bool google_protobuf_DescriptorProto_ReservedRange_has_start(const google_protobuf_DescriptorProto_ReservedRange* msg) {
-  return _upb_hasbit(msg, 1);
-}
-UPB_INLINE void google_protobuf_DescriptorProto_ReservedRange_clear_start(const google_protobuf_DescriptorProto_ReservedRange* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(4, 4), int32_t) = 0;
-  _upb_clearhas(msg, 1);
-}
-UPB_INLINE int32_t google_protobuf_DescriptorProto_ReservedRange_start(const google_protobuf_DescriptorProto_ReservedRange* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(4, 4), int32_t);
-}
-UPB_INLINE bool google_protobuf_DescriptorProto_ReservedRange_has_end(const google_protobuf_DescriptorProto_ReservedRange* msg) {
-  return _upb_hasbit(msg, 2);
-}
-UPB_INLINE void google_protobuf_DescriptorProto_ReservedRange_clear_end(const google_protobuf_DescriptorProto_ReservedRange* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(8, 8), int32_t) = 0;
-  _upb_clearhas(msg, 2);
-}
-UPB_INLINE int32_t google_protobuf_DescriptorProto_ReservedRange_end(const google_protobuf_DescriptorProto_ReservedRange* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(8, 8), int32_t);
-}
-
-UPB_INLINE void google_protobuf_DescriptorProto_ReservedRange_set_start(google_protobuf_DescriptorProto_ReservedRange *msg, int32_t value) {
-  _upb_sethas(msg, 1);
-  *UPB_PTR_AT(msg, UPB_SIZE(4, 4), int32_t) = value;
-}
-UPB_INLINE void google_protobuf_DescriptorProto_ReservedRange_set_end(google_protobuf_DescriptorProto_ReservedRange *msg, int32_t value) {
-  _upb_sethas(msg, 2);
-  *UPB_PTR_AT(msg, UPB_SIZE(8, 8), int32_t) = value;
-}
-
-/* google.protobuf.ExtensionRangeOptions */
-
-UPB_INLINE google_protobuf_ExtensionRangeOptions* google_protobuf_ExtensionRangeOptions_new(upb_Arena* arena) {
-  return (google_protobuf_ExtensionRangeOptions*)_upb_Message_New(&google_protobuf_ExtensionRangeOptions_msginit, arena);
-}
-UPB_INLINE google_protobuf_ExtensionRangeOptions* google_protobuf_ExtensionRangeOptions_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_ExtensionRangeOptions* ret = google_protobuf_ExtensionRangeOptions_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_ExtensionRangeOptions_msginit, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_ExtensionRangeOptions* google_protobuf_ExtensionRangeOptions_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_ExtensionRangeOptions* ret = google_protobuf_ExtensionRangeOptions_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_ExtensionRangeOptions_msginit, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_ExtensionRangeOptions_serialize(const google_protobuf_ExtensionRangeOptions* msg, upb_Arena* arena, size_t* len) {
-  return upb_Encode(msg, &google_protobuf_ExtensionRangeOptions_msginit, 0, arena, len);
-}
-UPB_INLINE char* google_protobuf_ExtensionRangeOptions_serialize_ex(const google_protobuf_ExtensionRangeOptions* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  return upb_Encode(msg, &google_protobuf_ExtensionRangeOptions_msginit, options, arena, len);
-}
-UPB_INLINE bool google_protobuf_ExtensionRangeOptions_has_uninterpreted_option(const google_protobuf_ExtensionRangeOptions* msg) {
-  return _upb_has_submsg_nohasbit(msg, UPB_SIZE(0, 0));
-}
-UPB_INLINE void google_protobuf_ExtensionRangeOptions_clear_uninterpreted_option(const google_protobuf_ExtensionRangeOptions* msg) {
-  _upb_array_detach(msg, UPB_SIZE(0, 0));
-}
-UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_ExtensionRangeOptions_uninterpreted_option(const google_protobuf_ExtensionRangeOptions* msg, size_t* len) {
-  return (const google_protobuf_UninterpretedOption* const*)_upb_array_accessor(msg, UPB_SIZE(0, 0), len);
-}
-
-UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_ExtensionRangeOptions_mutable_uninterpreted_option(google_protobuf_ExtensionRangeOptions* msg, size_t* len) {
-  return (google_protobuf_UninterpretedOption**)_upb_array_mutable_accessor(msg, UPB_SIZE(0, 0), len);
-}
-UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_ExtensionRangeOptions_resize_uninterpreted_option(google_protobuf_ExtensionRangeOptions* msg, size_t len, upb_Arena* arena) {
-  return (google_protobuf_UninterpretedOption**)_upb_Array_Resize_accessor2(msg, UPB_SIZE(0, 0), len, UPB_SIZE(2, 3), arena);
-}
-UPB_INLINE struct google_protobuf_UninterpretedOption* google_protobuf_ExtensionRangeOptions_add_uninterpreted_option(google_protobuf_ExtensionRangeOptions* msg, upb_Arena* arena) {
-  struct google_protobuf_UninterpretedOption* sub = (struct google_protobuf_UninterpretedOption*)_upb_Message_New(&google_protobuf_UninterpretedOption_msginit, arena);
-  bool ok = _upb_Array_Append_accessor2(msg, UPB_SIZE(0, 0), UPB_SIZE(2, 3), &sub, arena);
-  if (!ok) return NULL;
-  return sub;
-}
-
-/* google.protobuf.FieldDescriptorProto */
-
-UPB_INLINE google_protobuf_FieldDescriptorProto* google_protobuf_FieldDescriptorProto_new(upb_Arena* arena) {
-  return (google_protobuf_FieldDescriptorProto*)_upb_Message_New(&google_protobuf_FieldDescriptorProto_msginit, arena);
-}
-UPB_INLINE google_protobuf_FieldDescriptorProto* google_protobuf_FieldDescriptorProto_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_FieldDescriptorProto* ret = google_protobuf_FieldDescriptorProto_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_FieldDescriptorProto_msginit, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_FieldDescriptorProto* google_protobuf_FieldDescriptorProto_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_FieldDescriptorProto* ret = google_protobuf_FieldDescriptorProto_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_FieldDescriptorProto_msginit, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_FieldDescriptorProto_serialize(const google_protobuf_FieldDescriptorProto* msg, upb_Arena* arena, size_t* len) {
-  return upb_Encode(msg, &google_protobuf_FieldDescriptorProto_msginit, 0, arena, len);
-}
-UPB_INLINE char* google_protobuf_FieldDescriptorProto_serialize_ex(const google_protobuf_FieldDescriptorProto* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  return upb_Encode(msg, &google_protobuf_FieldDescriptorProto_msginit, options, arena, len);
-}
-UPB_INLINE bool google_protobuf_FieldDescriptorProto_has_name(const google_protobuf_FieldDescriptorProto* msg) {
-  return _upb_hasbit(msg, 1);
-}
-UPB_INLINE void google_protobuf_FieldDescriptorProto_clear_name(const google_protobuf_FieldDescriptorProto* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(24, 24), upb_StringView) = upb_StringView_FromDataAndSize(NULL, 0);
-  _upb_clearhas(msg, 1);
-}
-UPB_INLINE upb_StringView google_protobuf_FieldDescriptorProto_name(const google_protobuf_FieldDescriptorProto* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(24, 24), upb_StringView);
-}
-UPB_INLINE bool google_protobuf_FieldDescriptorProto_has_extendee(const google_protobuf_FieldDescriptorProto* msg) {
-  return _upb_hasbit(msg, 2);
-}
-UPB_INLINE void google_protobuf_FieldDescriptorProto_clear_extendee(const google_protobuf_FieldDescriptorProto* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(32, 40), upb_StringView) = upb_StringView_FromDataAndSize(NULL, 0);
-  _upb_clearhas(msg, 2);
-}
-UPB_INLINE upb_StringView google_protobuf_FieldDescriptorProto_extendee(const google_protobuf_FieldDescriptorProto* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(32, 40), upb_StringView);
-}
-UPB_INLINE bool google_protobuf_FieldDescriptorProto_has_number(const google_protobuf_FieldDescriptorProto* msg) {
-  return _upb_hasbit(msg, 3);
-}
-UPB_INLINE void google_protobuf_FieldDescriptorProto_clear_number(const google_protobuf_FieldDescriptorProto* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(4, 4), int32_t) = 0;
-  _upb_clearhas(msg, 3);
-}
-UPB_INLINE int32_t google_protobuf_FieldDescriptorProto_number(const google_protobuf_FieldDescriptorProto* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(4, 4), int32_t);
-}
-UPB_INLINE bool google_protobuf_FieldDescriptorProto_has_label(const google_protobuf_FieldDescriptorProto* msg) {
-  return _upb_hasbit(msg, 4);
-}
-UPB_INLINE void google_protobuf_FieldDescriptorProto_clear_label(const google_protobuf_FieldDescriptorProto* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(8, 8), int32_t) = 0;
-  _upb_clearhas(msg, 4);
-}
-UPB_INLINE int32_t google_protobuf_FieldDescriptorProto_label(const google_protobuf_FieldDescriptorProto* msg) {
-  return google_protobuf_FieldDescriptorProto_has_label(msg) ? *UPB_PTR_AT(msg, UPB_SIZE(8, 8), int32_t) : 1;
-}
-UPB_INLINE bool google_protobuf_FieldDescriptorProto_has_type(const google_protobuf_FieldDescriptorProto* msg) {
-  return _upb_hasbit(msg, 5);
-}
-UPB_INLINE void google_protobuf_FieldDescriptorProto_clear_type(const google_protobuf_FieldDescriptorProto* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(12, 12), int32_t) = 0;
-  _upb_clearhas(msg, 5);
-}
-UPB_INLINE int32_t google_protobuf_FieldDescriptorProto_type(const google_protobuf_FieldDescriptorProto* msg) {
-  return google_protobuf_FieldDescriptorProto_has_type(msg) ? *UPB_PTR_AT(msg, UPB_SIZE(12, 12), int32_t) : 1;
-}
-UPB_INLINE bool google_protobuf_FieldDescriptorProto_has_type_name(const google_protobuf_FieldDescriptorProto* msg) {
-  return _upb_hasbit(msg, 6);
-}
-UPB_INLINE void google_protobuf_FieldDescriptorProto_clear_type_name(const google_protobuf_FieldDescriptorProto* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(40, 56), upb_StringView) = upb_StringView_FromDataAndSize(NULL, 0);
-  _upb_clearhas(msg, 6);
-}
-UPB_INLINE upb_StringView google_protobuf_FieldDescriptorProto_type_name(const google_protobuf_FieldDescriptorProto* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(40, 56), upb_StringView);
-}
-UPB_INLINE bool google_protobuf_FieldDescriptorProto_has_default_value(const google_protobuf_FieldDescriptorProto* msg) {
-  return _upb_hasbit(msg, 7);
-}
-UPB_INLINE void google_protobuf_FieldDescriptorProto_clear_default_value(const google_protobuf_FieldDescriptorProto* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(48, 72), upb_StringView) = upb_StringView_FromDataAndSize(NULL, 0);
-  _upb_clearhas(msg, 7);
-}
-UPB_INLINE upb_StringView google_protobuf_FieldDescriptorProto_default_value(const google_protobuf_FieldDescriptorProto* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(48, 72), upb_StringView);
-}
-UPB_INLINE bool google_protobuf_FieldDescriptorProto_has_options(const google_protobuf_FieldDescriptorProto* msg) {
-  return _upb_hasbit(msg, 8);
-}
-UPB_INLINE void google_protobuf_FieldDescriptorProto_clear_options(const google_protobuf_FieldDescriptorProto* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(56, 88), const upb_Message*) = NULL;
-}
-UPB_INLINE const google_protobuf_FieldOptions* google_protobuf_FieldDescriptorProto_options(const google_protobuf_FieldDescriptorProto* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(56, 88), const google_protobuf_FieldOptions*);
-}
-UPB_INLINE bool google_protobuf_FieldDescriptorProto_has_oneof_index(const google_protobuf_FieldDescriptorProto* msg) {
-  return _upb_hasbit(msg, 9);
-}
-UPB_INLINE void google_protobuf_FieldDescriptorProto_clear_oneof_index(const google_protobuf_FieldDescriptorProto* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(16, 16), int32_t) = 0;
-  _upb_clearhas(msg, 9);
-}
-UPB_INLINE int32_t google_protobuf_FieldDescriptorProto_oneof_index(const google_protobuf_FieldDescriptorProto* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(16, 16), int32_t);
-}
-UPB_INLINE bool google_protobuf_FieldDescriptorProto_has_json_name(const google_protobuf_FieldDescriptorProto* msg) {
-  return _upb_hasbit(msg, 10);
-}
-UPB_INLINE void google_protobuf_FieldDescriptorProto_clear_json_name(const google_protobuf_FieldDescriptorProto* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(60, 96), upb_StringView) = upb_StringView_FromDataAndSize(NULL, 0);
-  _upb_clearhas(msg, 10);
-}
-UPB_INLINE upb_StringView google_protobuf_FieldDescriptorProto_json_name(const google_protobuf_FieldDescriptorProto* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(60, 96), upb_StringView);
-}
-UPB_INLINE bool google_protobuf_FieldDescriptorProto_has_proto3_optional(const google_protobuf_FieldDescriptorProto* msg) {
-  return _upb_hasbit(msg, 11);
-}
-UPB_INLINE void google_protobuf_FieldDescriptorProto_clear_proto3_optional(const google_protobuf_FieldDescriptorProto* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(20, 20), bool) = 0;
-  _upb_clearhas(msg, 11);
-}
-UPB_INLINE bool google_protobuf_FieldDescriptorProto_proto3_optional(const google_protobuf_FieldDescriptorProto* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(20, 20), bool);
-}
-
-UPB_INLINE void google_protobuf_FieldDescriptorProto_set_name(google_protobuf_FieldDescriptorProto *msg, upb_StringView value) {
-  _upb_sethas(msg, 1);
-  *UPB_PTR_AT(msg, UPB_SIZE(24, 24), upb_StringView) = value;
-}
-UPB_INLINE void google_protobuf_FieldDescriptorProto_set_extendee(google_protobuf_FieldDescriptorProto *msg, upb_StringView value) {
-  _upb_sethas(msg, 2);
-  *UPB_PTR_AT(msg, UPB_SIZE(32, 40), upb_StringView) = value;
-}
-UPB_INLINE void google_protobuf_FieldDescriptorProto_set_number(google_protobuf_FieldDescriptorProto *msg, int32_t value) {
-  _upb_sethas(msg, 3);
-  *UPB_PTR_AT(msg, UPB_SIZE(4, 4), int32_t) = value;
-}
-UPB_INLINE void google_protobuf_FieldDescriptorProto_set_label(google_protobuf_FieldDescriptorProto *msg, int32_t value) {
-  _upb_sethas(msg, 4);
-  *UPB_PTR_AT(msg, UPB_SIZE(8, 8), int32_t) = value;
-}
-UPB_INLINE void google_protobuf_FieldDescriptorProto_set_type(google_protobuf_FieldDescriptorProto *msg, int32_t value) {
-  _upb_sethas(msg, 5);
-  *UPB_PTR_AT(msg, UPB_SIZE(12, 12), int32_t) = value;
-}
-UPB_INLINE void google_protobuf_FieldDescriptorProto_set_type_name(google_protobuf_FieldDescriptorProto *msg, upb_StringView value) {
-  _upb_sethas(msg, 6);
-  *UPB_PTR_AT(msg, UPB_SIZE(40, 56), upb_StringView) = value;
-}
-UPB_INLINE void google_protobuf_FieldDescriptorProto_set_default_value(google_protobuf_FieldDescriptorProto *msg, upb_StringView value) {
-  _upb_sethas(msg, 7);
-  *UPB_PTR_AT(msg, UPB_SIZE(48, 72), upb_StringView) = value;
-}
-UPB_INLINE void google_protobuf_FieldDescriptorProto_set_options(google_protobuf_FieldDescriptorProto *msg, google_protobuf_FieldOptions* value) {
-  _upb_sethas(msg, 8);
-  *UPB_PTR_AT(msg, UPB_SIZE(56, 88), google_protobuf_FieldOptions*) = value;
-}
-UPB_INLINE struct google_protobuf_FieldOptions* google_protobuf_FieldDescriptorProto_mutable_options(google_protobuf_FieldDescriptorProto* msg, upb_Arena* arena) {
-  struct google_protobuf_FieldOptions* sub = (struct google_protobuf_FieldOptions*)google_protobuf_FieldDescriptorProto_options(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_FieldOptions*)_upb_Message_New(&google_protobuf_FieldOptions_msginit, arena);
-    if (!sub) return NULL;
-    google_protobuf_FieldDescriptorProto_set_options(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void google_protobuf_FieldDescriptorProto_set_oneof_index(google_protobuf_FieldDescriptorProto *msg, int32_t value) {
-  _upb_sethas(msg, 9);
-  *UPB_PTR_AT(msg, UPB_SIZE(16, 16), int32_t) = value;
-}
-UPB_INLINE void google_protobuf_FieldDescriptorProto_set_json_name(google_protobuf_FieldDescriptorProto *msg, upb_StringView value) {
-  _upb_sethas(msg, 10);
-  *UPB_PTR_AT(msg, UPB_SIZE(60, 96), upb_StringView) = value;
-}
-UPB_INLINE void google_protobuf_FieldDescriptorProto_set_proto3_optional(google_protobuf_FieldDescriptorProto *msg, bool value) {
-  _upb_sethas(msg, 11);
-  *UPB_PTR_AT(msg, UPB_SIZE(20, 20), bool) = value;
-}
-
-/* google.protobuf.OneofDescriptorProto */
-
-UPB_INLINE google_protobuf_OneofDescriptorProto* google_protobuf_OneofDescriptorProto_new(upb_Arena* arena) {
-  return (google_protobuf_OneofDescriptorProto*)_upb_Message_New(&google_protobuf_OneofDescriptorProto_msginit, arena);
-}
-UPB_INLINE google_protobuf_OneofDescriptorProto* google_protobuf_OneofDescriptorProto_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_OneofDescriptorProto* ret = google_protobuf_OneofDescriptorProto_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_OneofDescriptorProto_msginit, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_OneofDescriptorProto* google_protobuf_OneofDescriptorProto_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_OneofDescriptorProto* ret = google_protobuf_OneofDescriptorProto_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_OneofDescriptorProto_msginit, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_OneofDescriptorProto_serialize(const google_protobuf_OneofDescriptorProto* msg, upb_Arena* arena, size_t* len) {
-  return upb_Encode(msg, &google_protobuf_OneofDescriptorProto_msginit, 0, arena, len);
-}
-UPB_INLINE char* google_protobuf_OneofDescriptorProto_serialize_ex(const google_protobuf_OneofDescriptorProto* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  return upb_Encode(msg, &google_protobuf_OneofDescriptorProto_msginit, options, arena, len);
-}
-UPB_INLINE bool google_protobuf_OneofDescriptorProto_has_name(const google_protobuf_OneofDescriptorProto* msg) {
-  return _upb_hasbit(msg, 1);
-}
-UPB_INLINE void google_protobuf_OneofDescriptorProto_clear_name(const google_protobuf_OneofDescriptorProto* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_StringView) = upb_StringView_FromDataAndSize(NULL, 0);
-  _upb_clearhas(msg, 1);
-}
-UPB_INLINE upb_StringView google_protobuf_OneofDescriptorProto_name(const google_protobuf_OneofDescriptorProto* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_StringView);
-}
-UPB_INLINE bool google_protobuf_OneofDescriptorProto_has_options(const google_protobuf_OneofDescriptorProto* msg) {
-  return _upb_hasbit(msg, 2);
-}
-UPB_INLINE void google_protobuf_OneofDescriptorProto_clear_options(const google_protobuf_OneofDescriptorProto* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(12, 24), const upb_Message*) = NULL;
-}
-UPB_INLINE const google_protobuf_OneofOptions* google_protobuf_OneofDescriptorProto_options(const google_protobuf_OneofDescriptorProto* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(12, 24), const google_protobuf_OneofOptions*);
-}
-
-UPB_INLINE void google_protobuf_OneofDescriptorProto_set_name(google_protobuf_OneofDescriptorProto *msg, upb_StringView value) {
-  _upb_sethas(msg, 1);
-  *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_StringView) = value;
-}
-UPB_INLINE void google_protobuf_OneofDescriptorProto_set_options(google_protobuf_OneofDescriptorProto *msg, google_protobuf_OneofOptions* value) {
-  _upb_sethas(msg, 2);
-  *UPB_PTR_AT(msg, UPB_SIZE(12, 24), google_protobuf_OneofOptions*) = value;
-}
-UPB_INLINE struct google_protobuf_OneofOptions* google_protobuf_OneofDescriptorProto_mutable_options(google_protobuf_OneofDescriptorProto* msg, upb_Arena* arena) {
-  struct google_protobuf_OneofOptions* sub = (struct google_protobuf_OneofOptions*)google_protobuf_OneofDescriptorProto_options(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_OneofOptions*)_upb_Message_New(&google_protobuf_OneofOptions_msginit, arena);
-    if (!sub) return NULL;
-    google_protobuf_OneofDescriptorProto_set_options(msg, sub);
-  }
-  return sub;
-}
-
-/* google.protobuf.EnumDescriptorProto */
-
-UPB_INLINE google_protobuf_EnumDescriptorProto* google_protobuf_EnumDescriptorProto_new(upb_Arena* arena) {
-  return (google_protobuf_EnumDescriptorProto*)_upb_Message_New(&google_protobuf_EnumDescriptorProto_msginit, arena);
-}
-UPB_INLINE google_protobuf_EnumDescriptorProto* google_protobuf_EnumDescriptorProto_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_EnumDescriptorProto* ret = google_protobuf_EnumDescriptorProto_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_EnumDescriptorProto_msginit, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_EnumDescriptorProto* google_protobuf_EnumDescriptorProto_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_EnumDescriptorProto* ret = google_protobuf_EnumDescriptorProto_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_EnumDescriptorProto_msginit, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_EnumDescriptorProto_serialize(const google_protobuf_EnumDescriptorProto* msg, upb_Arena* arena, size_t* len) {
-  return upb_Encode(msg, &google_protobuf_EnumDescriptorProto_msginit, 0, arena, len);
-}
-UPB_INLINE char* google_protobuf_EnumDescriptorProto_serialize_ex(const google_protobuf_EnumDescriptorProto* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  return upb_Encode(msg, &google_protobuf_EnumDescriptorProto_msginit, options, arena, len);
-}
-UPB_INLINE bool google_protobuf_EnumDescriptorProto_has_name(const google_protobuf_EnumDescriptorProto* msg) {
-  return _upb_hasbit(msg, 1);
-}
-UPB_INLINE void google_protobuf_EnumDescriptorProto_clear_name(const google_protobuf_EnumDescriptorProto* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_StringView) = upb_StringView_FromDataAndSize(NULL, 0);
-  _upb_clearhas(msg, 1);
-}
-UPB_INLINE upb_StringView google_protobuf_EnumDescriptorProto_name(const google_protobuf_EnumDescriptorProto* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_StringView);
-}
-UPB_INLINE bool google_protobuf_EnumDescriptorProto_has_value(const google_protobuf_EnumDescriptorProto* msg) {
-  return _upb_has_submsg_nohasbit(msg, UPB_SIZE(12, 24));
-}
-UPB_INLINE void google_protobuf_EnumDescriptorProto_clear_value(const google_protobuf_EnumDescriptorProto* msg) {
-  _upb_array_detach(msg, UPB_SIZE(12, 24));
-}
-UPB_INLINE const google_protobuf_EnumValueDescriptorProto* const* google_protobuf_EnumDescriptorProto_value(const google_protobuf_EnumDescriptorProto* msg, size_t* len) {
-  return (const google_protobuf_EnumValueDescriptorProto* const*)_upb_array_accessor(msg, UPB_SIZE(12, 24), len);
-}
-UPB_INLINE bool google_protobuf_EnumDescriptorProto_has_options(const google_protobuf_EnumDescriptorProto* msg) {
-  return _upb_hasbit(msg, 2);
-}
-UPB_INLINE void google_protobuf_EnumDescriptorProto_clear_options(const google_protobuf_EnumDescriptorProto* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(16, 32), const upb_Message*) = NULL;
-}
-UPB_INLINE const google_protobuf_EnumOptions* google_protobuf_EnumDescriptorProto_options(const google_protobuf_EnumDescriptorProto* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(16, 32), const google_protobuf_EnumOptions*);
-}
-UPB_INLINE bool google_protobuf_EnumDescriptorProto_has_reserved_range(const google_protobuf_EnumDescriptorProto* msg) {
-  return _upb_has_submsg_nohasbit(msg, UPB_SIZE(20, 40));
-}
-UPB_INLINE void google_protobuf_EnumDescriptorProto_clear_reserved_range(const google_protobuf_EnumDescriptorProto* msg) {
-  _upb_array_detach(msg, UPB_SIZE(20, 40));
-}
-UPB_INLINE const google_protobuf_EnumDescriptorProto_EnumReservedRange* const* google_protobuf_EnumDescriptorProto_reserved_range(const google_protobuf_EnumDescriptorProto* msg, size_t* len) {
-  return (const google_protobuf_EnumDescriptorProto_EnumReservedRange* const*)_upb_array_accessor(msg, UPB_SIZE(20, 40), len);
-}
-UPB_INLINE void google_protobuf_EnumDescriptorProto_clear_reserved_name(const google_protobuf_EnumDescriptorProto* msg) {
-  _upb_array_detach(msg, UPB_SIZE(24, 48));
-}
-UPB_INLINE upb_StringView const* google_protobuf_EnumDescriptorProto_reserved_name(const google_protobuf_EnumDescriptorProto* msg, size_t* len) {
-  return (upb_StringView const*)_upb_array_accessor(msg, UPB_SIZE(24, 48), len);
-}
-
-UPB_INLINE void google_protobuf_EnumDescriptorProto_set_name(google_protobuf_EnumDescriptorProto *msg, upb_StringView value) {
-  _upb_sethas(msg, 1);
-  *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_StringView) = value;
-}
-UPB_INLINE google_protobuf_EnumValueDescriptorProto** google_protobuf_EnumDescriptorProto_mutable_value(google_protobuf_EnumDescriptorProto* msg, size_t* len) {
-  return (google_protobuf_EnumValueDescriptorProto**)_upb_array_mutable_accessor(msg, UPB_SIZE(12, 24), len);
-}
-UPB_INLINE google_protobuf_EnumValueDescriptorProto** google_protobuf_EnumDescriptorProto_resize_value(google_protobuf_EnumDescriptorProto* msg, size_t len, upb_Arena* arena) {
-  return (google_protobuf_EnumValueDescriptorProto**)_upb_Array_Resize_accessor2(msg, UPB_SIZE(12, 24), len, UPB_SIZE(2, 3), arena);
-}
-UPB_INLINE struct google_protobuf_EnumValueDescriptorProto* google_protobuf_EnumDescriptorProto_add_value(google_protobuf_EnumDescriptorProto* msg, upb_Arena* arena) {
-  struct google_protobuf_EnumValueDescriptorProto* sub = (struct google_protobuf_EnumValueDescriptorProto*)_upb_Message_New(&google_protobuf_EnumValueDescriptorProto_msginit, arena);
-  bool ok = _upb_Array_Append_accessor2(msg, UPB_SIZE(12, 24), UPB_SIZE(2, 3), &sub, arena);
-  if (!ok) return NULL;
-  return sub;
-}
-UPB_INLINE void google_protobuf_EnumDescriptorProto_set_options(google_protobuf_EnumDescriptorProto *msg, google_protobuf_EnumOptions* value) {
-  _upb_sethas(msg, 2);
-  *UPB_PTR_AT(msg, UPB_SIZE(16, 32), google_protobuf_EnumOptions*) = value;
-}
-UPB_INLINE struct google_protobuf_EnumOptions* google_protobuf_EnumDescriptorProto_mutable_options(google_protobuf_EnumDescriptorProto* msg, upb_Arena* arena) {
-  struct google_protobuf_EnumOptions* sub = (struct google_protobuf_EnumOptions*)google_protobuf_EnumDescriptorProto_options(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_EnumOptions*)_upb_Message_New(&google_protobuf_EnumOptions_msginit, arena);
-    if (!sub) return NULL;
-    google_protobuf_EnumDescriptorProto_set_options(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE google_protobuf_EnumDescriptorProto_EnumReservedRange** google_protobuf_EnumDescriptorProto_mutable_reserved_range(google_protobuf_EnumDescriptorProto* msg, size_t* len) {
-  return (google_protobuf_EnumDescriptorProto_EnumReservedRange**)_upb_array_mutable_accessor(msg, UPB_SIZE(20, 40), len);
-}
-UPB_INLINE google_protobuf_EnumDescriptorProto_EnumReservedRange** google_protobuf_EnumDescriptorProto_resize_reserved_range(google_protobuf_EnumDescriptorProto* msg, size_t len, upb_Arena* arena) {
-  return (google_protobuf_EnumDescriptorProto_EnumReservedRange**)_upb_Array_Resize_accessor2(msg, UPB_SIZE(20, 40), len, UPB_SIZE(2, 3), arena);
-}
-UPB_INLINE struct google_protobuf_EnumDescriptorProto_EnumReservedRange* google_protobuf_EnumDescriptorProto_add_reserved_range(google_protobuf_EnumDescriptorProto* msg, upb_Arena* arena) {
-  struct google_protobuf_EnumDescriptorProto_EnumReservedRange* sub = (struct google_protobuf_EnumDescriptorProto_EnumReservedRange*)_upb_Message_New(&google_protobuf_EnumDescriptorProto_EnumReservedRange_msginit, arena);
-  bool ok = _upb_Array_Append_accessor2(msg, UPB_SIZE(20, 40), UPB_SIZE(2, 3), &sub, arena);
-  if (!ok) return NULL;
-  return sub;
-}
-UPB_INLINE upb_StringView* google_protobuf_EnumDescriptorProto_mutable_reserved_name(google_protobuf_EnumDescriptorProto* msg, size_t* len) {
-  return (upb_StringView*)_upb_array_mutable_accessor(msg, UPB_SIZE(24, 48), len);
-}
-UPB_INLINE upb_StringView* google_protobuf_EnumDescriptorProto_resize_reserved_name(google_protobuf_EnumDescriptorProto* msg, size_t len, upb_Arena* arena) {
-  return (upb_StringView*)_upb_Array_Resize_accessor2(msg, UPB_SIZE(24, 48), len, UPB_SIZE(3, 4), arena);
-}
-UPB_INLINE bool google_protobuf_EnumDescriptorProto_add_reserved_name(google_protobuf_EnumDescriptorProto* msg, upb_StringView val, upb_Arena* arena) {
-  return _upb_Array_Append_accessor2(msg, UPB_SIZE(24, 48), UPB_SIZE(3, 4), &val, arena);
-}
-
-/* google.protobuf.EnumDescriptorProto.EnumReservedRange */
-
-UPB_INLINE google_protobuf_EnumDescriptorProto_EnumReservedRange* google_protobuf_EnumDescriptorProto_EnumReservedRange_new(upb_Arena* arena) {
-  return (google_protobuf_EnumDescriptorProto_EnumReservedRange*)_upb_Message_New(&google_protobuf_EnumDescriptorProto_EnumReservedRange_msginit, arena);
-}
-UPB_INLINE google_protobuf_EnumDescriptorProto_EnumReservedRange* google_protobuf_EnumDescriptorProto_EnumReservedRange_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_EnumDescriptorProto_EnumReservedRange* ret = google_protobuf_EnumDescriptorProto_EnumReservedRange_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_EnumDescriptorProto_EnumReservedRange_msginit, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_EnumDescriptorProto_EnumReservedRange* google_protobuf_EnumDescriptorProto_EnumReservedRange_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_EnumDescriptorProto_EnumReservedRange* ret = google_protobuf_EnumDescriptorProto_EnumReservedRange_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_EnumDescriptorProto_EnumReservedRange_msginit, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_EnumDescriptorProto_EnumReservedRange_serialize(const google_protobuf_EnumDescriptorProto_EnumReservedRange* msg, upb_Arena* arena, size_t* len) {
-  return upb_Encode(msg, &google_protobuf_EnumDescriptorProto_EnumReservedRange_msginit, 0, arena, len);
-}
-UPB_INLINE char* google_protobuf_EnumDescriptorProto_EnumReservedRange_serialize_ex(const google_protobuf_EnumDescriptorProto_EnumReservedRange* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  return upb_Encode(msg, &google_protobuf_EnumDescriptorProto_EnumReservedRange_msginit, options, arena, len);
-}
-UPB_INLINE bool google_protobuf_EnumDescriptorProto_EnumReservedRange_has_start(const google_protobuf_EnumDescriptorProto_EnumReservedRange* msg) {
-  return _upb_hasbit(msg, 1);
-}
-UPB_INLINE void google_protobuf_EnumDescriptorProto_EnumReservedRange_clear_start(const google_protobuf_EnumDescriptorProto_EnumReservedRange* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(4, 4), int32_t) = 0;
-  _upb_clearhas(msg, 1);
-}
-UPB_INLINE int32_t google_protobuf_EnumDescriptorProto_EnumReservedRange_start(const google_protobuf_EnumDescriptorProto_EnumReservedRange* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(4, 4), int32_t);
-}
-UPB_INLINE bool google_protobuf_EnumDescriptorProto_EnumReservedRange_has_end(const google_protobuf_EnumDescriptorProto_EnumReservedRange* msg) {
-  return _upb_hasbit(msg, 2);
-}
-UPB_INLINE void google_protobuf_EnumDescriptorProto_EnumReservedRange_clear_end(const google_protobuf_EnumDescriptorProto_EnumReservedRange* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(8, 8), int32_t) = 0;
-  _upb_clearhas(msg, 2);
-}
-UPB_INLINE int32_t google_protobuf_EnumDescriptorProto_EnumReservedRange_end(const google_protobuf_EnumDescriptorProto_EnumReservedRange* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(8, 8), int32_t);
-}
-
-UPB_INLINE void google_protobuf_EnumDescriptorProto_EnumReservedRange_set_start(google_protobuf_EnumDescriptorProto_EnumReservedRange *msg, int32_t value) {
-  _upb_sethas(msg, 1);
-  *UPB_PTR_AT(msg, UPB_SIZE(4, 4), int32_t) = value;
-}
-UPB_INLINE void google_protobuf_EnumDescriptorProto_EnumReservedRange_set_end(google_protobuf_EnumDescriptorProto_EnumReservedRange *msg, int32_t value) {
-  _upb_sethas(msg, 2);
-  *UPB_PTR_AT(msg, UPB_SIZE(8, 8), int32_t) = value;
-}
-
-/* google.protobuf.EnumValueDescriptorProto */
-
-UPB_INLINE google_protobuf_EnumValueDescriptorProto* google_protobuf_EnumValueDescriptorProto_new(upb_Arena* arena) {
-  return (google_protobuf_EnumValueDescriptorProto*)_upb_Message_New(&google_protobuf_EnumValueDescriptorProto_msginit, arena);
-}
-UPB_INLINE google_protobuf_EnumValueDescriptorProto* google_protobuf_EnumValueDescriptorProto_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_EnumValueDescriptorProto* ret = google_protobuf_EnumValueDescriptorProto_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_EnumValueDescriptorProto_msginit, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_EnumValueDescriptorProto* google_protobuf_EnumValueDescriptorProto_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_EnumValueDescriptorProto* ret = google_protobuf_EnumValueDescriptorProto_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_EnumValueDescriptorProto_msginit, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_EnumValueDescriptorProto_serialize(const google_protobuf_EnumValueDescriptorProto* msg, upb_Arena* arena, size_t* len) {
-  return upb_Encode(msg, &google_protobuf_EnumValueDescriptorProto_msginit, 0, arena, len);
-}
-UPB_INLINE char* google_protobuf_EnumValueDescriptorProto_serialize_ex(const google_protobuf_EnumValueDescriptorProto* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  return upb_Encode(msg, &google_protobuf_EnumValueDescriptorProto_msginit, options, arena, len);
-}
-UPB_INLINE bool google_protobuf_EnumValueDescriptorProto_has_name(const google_protobuf_EnumValueDescriptorProto* msg) {
-  return _upb_hasbit(msg, 1);
-}
-UPB_INLINE void google_protobuf_EnumValueDescriptorProto_clear_name(const google_protobuf_EnumValueDescriptorProto* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(8, 8), upb_StringView) = upb_StringView_FromDataAndSize(NULL, 0);
-  _upb_clearhas(msg, 1);
-}
-UPB_INLINE upb_StringView google_protobuf_EnumValueDescriptorProto_name(const google_protobuf_EnumValueDescriptorProto* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(8, 8), upb_StringView);
-}
-UPB_INLINE bool google_protobuf_EnumValueDescriptorProto_has_number(const google_protobuf_EnumValueDescriptorProto* msg) {
-  return _upb_hasbit(msg, 2);
-}
-UPB_INLINE void google_protobuf_EnumValueDescriptorProto_clear_number(const google_protobuf_EnumValueDescriptorProto* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(4, 4), int32_t) = 0;
-  _upb_clearhas(msg, 2);
-}
-UPB_INLINE int32_t google_protobuf_EnumValueDescriptorProto_number(const google_protobuf_EnumValueDescriptorProto* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(4, 4), int32_t);
-}
-UPB_INLINE bool google_protobuf_EnumValueDescriptorProto_has_options(const google_protobuf_EnumValueDescriptorProto* msg) {
-  return _upb_hasbit(msg, 3);
-}
-UPB_INLINE void google_protobuf_EnumValueDescriptorProto_clear_options(const google_protobuf_EnumValueDescriptorProto* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(16, 24), const upb_Message*) = NULL;
-}
-UPB_INLINE const google_protobuf_EnumValueOptions* google_protobuf_EnumValueDescriptorProto_options(const google_protobuf_EnumValueDescriptorProto* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(16, 24), const google_protobuf_EnumValueOptions*);
-}
-
-UPB_INLINE void google_protobuf_EnumValueDescriptorProto_set_name(google_protobuf_EnumValueDescriptorProto *msg, upb_StringView value) {
-  _upb_sethas(msg, 1);
-  *UPB_PTR_AT(msg, UPB_SIZE(8, 8), upb_StringView) = value;
-}
-UPB_INLINE void google_protobuf_EnumValueDescriptorProto_set_number(google_protobuf_EnumValueDescriptorProto *msg, int32_t value) {
-  _upb_sethas(msg, 2);
-  *UPB_PTR_AT(msg, UPB_SIZE(4, 4), int32_t) = value;
-}
-UPB_INLINE void google_protobuf_EnumValueDescriptorProto_set_options(google_protobuf_EnumValueDescriptorProto *msg, google_protobuf_EnumValueOptions* value) {
-  _upb_sethas(msg, 3);
-  *UPB_PTR_AT(msg, UPB_SIZE(16, 24), google_protobuf_EnumValueOptions*) = value;
-}
-UPB_INLINE struct google_protobuf_EnumValueOptions* google_protobuf_EnumValueDescriptorProto_mutable_options(google_protobuf_EnumValueDescriptorProto* msg, upb_Arena* arena) {
-  struct google_protobuf_EnumValueOptions* sub = (struct google_protobuf_EnumValueOptions*)google_protobuf_EnumValueDescriptorProto_options(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_EnumValueOptions*)_upb_Message_New(&google_protobuf_EnumValueOptions_msginit, arena);
-    if (!sub) return NULL;
-    google_protobuf_EnumValueDescriptorProto_set_options(msg, sub);
-  }
-  return sub;
-}
-
-/* google.protobuf.ServiceDescriptorProto */
-
-UPB_INLINE google_protobuf_ServiceDescriptorProto* google_protobuf_ServiceDescriptorProto_new(upb_Arena* arena) {
-  return (google_protobuf_ServiceDescriptorProto*)_upb_Message_New(&google_protobuf_ServiceDescriptorProto_msginit, arena);
-}
-UPB_INLINE google_protobuf_ServiceDescriptorProto* google_protobuf_ServiceDescriptorProto_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_ServiceDescriptorProto* ret = google_protobuf_ServiceDescriptorProto_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_ServiceDescriptorProto_msginit, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_ServiceDescriptorProto* google_protobuf_ServiceDescriptorProto_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_ServiceDescriptorProto* ret = google_protobuf_ServiceDescriptorProto_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_ServiceDescriptorProto_msginit, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_ServiceDescriptorProto_serialize(const google_protobuf_ServiceDescriptorProto* msg, upb_Arena* arena, size_t* len) {
-  return upb_Encode(msg, &google_protobuf_ServiceDescriptorProto_msginit, 0, arena, len);
-}
-UPB_INLINE char* google_protobuf_ServiceDescriptorProto_serialize_ex(const google_protobuf_ServiceDescriptorProto* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  return upb_Encode(msg, &google_protobuf_ServiceDescriptorProto_msginit, options, arena, len);
-}
-UPB_INLINE bool google_protobuf_ServiceDescriptorProto_has_name(const google_protobuf_ServiceDescriptorProto* msg) {
-  return _upb_hasbit(msg, 1);
-}
-UPB_INLINE void google_protobuf_ServiceDescriptorProto_clear_name(const google_protobuf_ServiceDescriptorProto* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_StringView) = upb_StringView_FromDataAndSize(NULL, 0);
-  _upb_clearhas(msg, 1);
-}
-UPB_INLINE upb_StringView google_protobuf_ServiceDescriptorProto_name(const google_protobuf_ServiceDescriptorProto* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_StringView);
-}
-UPB_INLINE bool google_protobuf_ServiceDescriptorProto_has_method(const google_protobuf_ServiceDescriptorProto* msg) {
-  return _upb_has_submsg_nohasbit(msg, UPB_SIZE(12, 24));
-}
-UPB_INLINE void google_protobuf_ServiceDescriptorProto_clear_method(const google_protobuf_ServiceDescriptorProto* msg) {
-  _upb_array_detach(msg, UPB_SIZE(12, 24));
-}
-UPB_INLINE const google_protobuf_MethodDescriptorProto* const* google_protobuf_ServiceDescriptorProto_method(const google_protobuf_ServiceDescriptorProto* msg, size_t* len) {
-  return (const google_protobuf_MethodDescriptorProto* const*)_upb_array_accessor(msg, UPB_SIZE(12, 24), len);
-}
-UPB_INLINE bool google_protobuf_ServiceDescriptorProto_has_options(const google_protobuf_ServiceDescriptorProto* msg) {
-  return _upb_hasbit(msg, 2);
-}
-UPB_INLINE void google_protobuf_ServiceDescriptorProto_clear_options(const google_protobuf_ServiceDescriptorProto* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(16, 32), const upb_Message*) = NULL;
-}
-UPB_INLINE const google_protobuf_ServiceOptions* google_protobuf_ServiceDescriptorProto_options(const google_protobuf_ServiceDescriptorProto* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(16, 32), const google_protobuf_ServiceOptions*);
-}
-
-UPB_INLINE void google_protobuf_ServiceDescriptorProto_set_name(google_protobuf_ServiceDescriptorProto *msg, upb_StringView value) {
-  _upb_sethas(msg, 1);
-  *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_StringView) = value;
-}
-UPB_INLINE google_protobuf_MethodDescriptorProto** google_protobuf_ServiceDescriptorProto_mutable_method(google_protobuf_ServiceDescriptorProto* msg, size_t* len) {
-  return (google_protobuf_MethodDescriptorProto**)_upb_array_mutable_accessor(msg, UPB_SIZE(12, 24), len);
-}
-UPB_INLINE google_protobuf_MethodDescriptorProto** google_protobuf_ServiceDescriptorProto_resize_method(google_protobuf_ServiceDescriptorProto* msg, size_t len, upb_Arena* arena) {
-  return (google_protobuf_MethodDescriptorProto**)_upb_Array_Resize_accessor2(msg, UPB_SIZE(12, 24), len, UPB_SIZE(2, 3), arena);
-}
-UPB_INLINE struct google_protobuf_MethodDescriptorProto* google_protobuf_ServiceDescriptorProto_add_method(google_protobuf_ServiceDescriptorProto* msg, upb_Arena* arena) {
-  struct google_protobuf_MethodDescriptorProto* sub = (struct google_protobuf_MethodDescriptorProto*)_upb_Message_New(&google_protobuf_MethodDescriptorProto_msginit, arena);
-  bool ok = _upb_Array_Append_accessor2(msg, UPB_SIZE(12, 24), UPB_SIZE(2, 3), &sub, arena);
-  if (!ok) return NULL;
-  return sub;
-}
-UPB_INLINE void google_protobuf_ServiceDescriptorProto_set_options(google_protobuf_ServiceDescriptorProto *msg, google_protobuf_ServiceOptions* value) {
-  _upb_sethas(msg, 2);
-  *UPB_PTR_AT(msg, UPB_SIZE(16, 32), google_protobuf_ServiceOptions*) = value;
-}
-UPB_INLINE struct google_protobuf_ServiceOptions* google_protobuf_ServiceDescriptorProto_mutable_options(google_protobuf_ServiceDescriptorProto* msg, upb_Arena* arena) {
-  struct google_protobuf_ServiceOptions* sub = (struct google_protobuf_ServiceOptions*)google_protobuf_ServiceDescriptorProto_options(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_ServiceOptions*)_upb_Message_New(&google_protobuf_ServiceOptions_msginit, arena);
-    if (!sub) return NULL;
-    google_protobuf_ServiceDescriptorProto_set_options(msg, sub);
-  }
-  return sub;
-}
-
-/* google.protobuf.MethodDescriptorProto */
-
-UPB_INLINE google_protobuf_MethodDescriptorProto* google_protobuf_MethodDescriptorProto_new(upb_Arena* arena) {
-  return (google_protobuf_MethodDescriptorProto*)_upb_Message_New(&google_protobuf_MethodDescriptorProto_msginit, arena);
-}
-UPB_INLINE google_protobuf_MethodDescriptorProto* google_protobuf_MethodDescriptorProto_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_MethodDescriptorProto* ret = google_protobuf_MethodDescriptorProto_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_MethodDescriptorProto_msginit, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_MethodDescriptorProto* google_protobuf_MethodDescriptorProto_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_MethodDescriptorProto* ret = google_protobuf_MethodDescriptorProto_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_MethodDescriptorProto_msginit, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_MethodDescriptorProto_serialize(const google_protobuf_MethodDescriptorProto* msg, upb_Arena* arena, size_t* len) {
-  return upb_Encode(msg, &google_protobuf_MethodDescriptorProto_msginit, 0, arena, len);
-}
-UPB_INLINE char* google_protobuf_MethodDescriptorProto_serialize_ex(const google_protobuf_MethodDescriptorProto* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  return upb_Encode(msg, &google_protobuf_MethodDescriptorProto_msginit, options, arena, len);
-}
-UPB_INLINE bool google_protobuf_MethodDescriptorProto_has_name(const google_protobuf_MethodDescriptorProto* msg) {
-  return _upb_hasbit(msg, 1);
-}
-UPB_INLINE void google_protobuf_MethodDescriptorProto_clear_name(const google_protobuf_MethodDescriptorProto* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_StringView) = upb_StringView_FromDataAndSize(NULL, 0);
-  _upb_clearhas(msg, 1);
-}
-UPB_INLINE upb_StringView google_protobuf_MethodDescriptorProto_name(const google_protobuf_MethodDescriptorProto* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_StringView);
-}
-UPB_INLINE bool google_protobuf_MethodDescriptorProto_has_input_type(const google_protobuf_MethodDescriptorProto* msg) {
-  return _upb_hasbit(msg, 2);
-}
-UPB_INLINE void google_protobuf_MethodDescriptorProto_clear_input_type(const google_protobuf_MethodDescriptorProto* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(12, 24), upb_StringView) = upb_StringView_FromDataAndSize(NULL, 0);
-  _upb_clearhas(msg, 2);
-}
-UPB_INLINE upb_StringView google_protobuf_MethodDescriptorProto_input_type(const google_protobuf_MethodDescriptorProto* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(12, 24), upb_StringView);
-}
-UPB_INLINE bool google_protobuf_MethodDescriptorProto_has_output_type(const google_protobuf_MethodDescriptorProto* msg) {
-  return _upb_hasbit(msg, 3);
-}
-UPB_INLINE void google_protobuf_MethodDescriptorProto_clear_output_type(const google_protobuf_MethodDescriptorProto* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(20, 40), upb_StringView) = upb_StringView_FromDataAndSize(NULL, 0);
-  _upb_clearhas(msg, 3);
-}
-UPB_INLINE upb_StringView google_protobuf_MethodDescriptorProto_output_type(const google_protobuf_MethodDescriptorProto* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(20, 40), upb_StringView);
-}
-UPB_INLINE bool google_protobuf_MethodDescriptorProto_has_options(const google_protobuf_MethodDescriptorProto* msg) {
-  return _upb_hasbit(msg, 4);
-}
-UPB_INLINE void google_protobuf_MethodDescriptorProto_clear_options(const google_protobuf_MethodDescriptorProto* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(28, 56), const upb_Message*) = NULL;
-}
-UPB_INLINE const google_protobuf_MethodOptions* google_protobuf_MethodDescriptorProto_options(const google_protobuf_MethodDescriptorProto* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(28, 56), const google_protobuf_MethodOptions*);
-}
-UPB_INLINE bool google_protobuf_MethodDescriptorProto_has_client_streaming(const google_protobuf_MethodDescriptorProto* msg) {
-  return _upb_hasbit(msg, 5);
-}
-UPB_INLINE void google_protobuf_MethodDescriptorProto_clear_client_streaming(const google_protobuf_MethodDescriptorProto* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(1, 1), bool) = 0;
-  _upb_clearhas(msg, 5);
-}
-UPB_INLINE bool google_protobuf_MethodDescriptorProto_client_streaming(const google_protobuf_MethodDescriptorProto* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(1, 1), bool);
-}
-UPB_INLINE bool google_protobuf_MethodDescriptorProto_has_server_streaming(const google_protobuf_MethodDescriptorProto* msg) {
-  return _upb_hasbit(msg, 6);
-}
-UPB_INLINE void google_protobuf_MethodDescriptorProto_clear_server_streaming(const google_protobuf_MethodDescriptorProto* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(2, 2), bool) = 0;
-  _upb_clearhas(msg, 6);
-}
-UPB_INLINE bool google_protobuf_MethodDescriptorProto_server_streaming(const google_protobuf_MethodDescriptorProto* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(2, 2), bool);
-}
-
-UPB_INLINE void google_protobuf_MethodDescriptorProto_set_name(google_protobuf_MethodDescriptorProto *msg, upb_StringView value) {
-  _upb_sethas(msg, 1);
-  *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_StringView) = value;
-}
-UPB_INLINE void google_protobuf_MethodDescriptorProto_set_input_type(google_protobuf_MethodDescriptorProto *msg, upb_StringView value) {
-  _upb_sethas(msg, 2);
-  *UPB_PTR_AT(msg, UPB_SIZE(12, 24), upb_StringView) = value;
-}
-UPB_INLINE void google_protobuf_MethodDescriptorProto_set_output_type(google_protobuf_MethodDescriptorProto *msg, upb_StringView value) {
-  _upb_sethas(msg, 3);
-  *UPB_PTR_AT(msg, UPB_SIZE(20, 40), upb_StringView) = value;
-}
-UPB_INLINE void google_protobuf_MethodDescriptorProto_set_options(google_protobuf_MethodDescriptorProto *msg, google_protobuf_MethodOptions* value) {
-  _upb_sethas(msg, 4);
-  *UPB_PTR_AT(msg, UPB_SIZE(28, 56), google_protobuf_MethodOptions*) = value;
-}
-UPB_INLINE struct google_protobuf_MethodOptions* google_protobuf_MethodDescriptorProto_mutable_options(google_protobuf_MethodDescriptorProto* msg, upb_Arena* arena) {
-  struct google_protobuf_MethodOptions* sub = (struct google_protobuf_MethodOptions*)google_protobuf_MethodDescriptorProto_options(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_MethodOptions*)_upb_Message_New(&google_protobuf_MethodOptions_msginit, arena);
-    if (!sub) return NULL;
-    google_protobuf_MethodDescriptorProto_set_options(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void google_protobuf_MethodDescriptorProto_set_client_streaming(google_protobuf_MethodDescriptorProto *msg, bool value) {
-  _upb_sethas(msg, 5);
-  *UPB_PTR_AT(msg, UPB_SIZE(1, 1), bool) = value;
-}
-UPB_INLINE void google_protobuf_MethodDescriptorProto_set_server_streaming(google_protobuf_MethodDescriptorProto *msg, bool value) {
-  _upb_sethas(msg, 6);
-  *UPB_PTR_AT(msg, UPB_SIZE(2, 2), bool) = value;
-}
-
-/* google.protobuf.FileOptions */
-
-UPB_INLINE google_protobuf_FileOptions* google_protobuf_FileOptions_new(upb_Arena* arena) {
-  return (google_protobuf_FileOptions*)_upb_Message_New(&google_protobuf_FileOptions_msginit, arena);
-}
-UPB_INLINE google_protobuf_FileOptions* google_protobuf_FileOptions_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_FileOptions* ret = google_protobuf_FileOptions_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_FileOptions_msginit, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_FileOptions* google_protobuf_FileOptions_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_FileOptions* ret = google_protobuf_FileOptions_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_FileOptions_msginit, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_FileOptions_serialize(const google_protobuf_FileOptions* msg, upb_Arena* arena, size_t* len) {
-  return upb_Encode(msg, &google_protobuf_FileOptions_msginit, 0, arena, len);
-}
-UPB_INLINE char* google_protobuf_FileOptions_serialize_ex(const google_protobuf_FileOptions* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  return upb_Encode(msg, &google_protobuf_FileOptions_msginit, options, arena, len);
-}
-UPB_INLINE bool google_protobuf_FileOptions_has_java_package(const google_protobuf_FileOptions* msg) {
-  return _upb_hasbit(msg, 1);
-}
-UPB_INLINE void google_protobuf_FileOptions_clear_java_package(const google_protobuf_FileOptions* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(20, 24), upb_StringView) = upb_StringView_FromDataAndSize(NULL, 0);
-  _upb_clearhas(msg, 1);
-}
-UPB_INLINE upb_StringView google_protobuf_FileOptions_java_package(const google_protobuf_FileOptions* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(20, 24), upb_StringView);
-}
-UPB_INLINE bool google_protobuf_FileOptions_has_java_outer_classname(const google_protobuf_FileOptions* msg) {
-  return _upb_hasbit(msg, 2);
-}
-UPB_INLINE void google_protobuf_FileOptions_clear_java_outer_classname(const google_protobuf_FileOptions* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(28, 40), upb_StringView) = upb_StringView_FromDataAndSize(NULL, 0);
-  _upb_clearhas(msg, 2);
-}
-UPB_INLINE upb_StringView google_protobuf_FileOptions_java_outer_classname(const google_protobuf_FileOptions* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(28, 40), upb_StringView);
-}
-UPB_INLINE bool google_protobuf_FileOptions_has_optimize_for(const google_protobuf_FileOptions* msg) {
-  return _upb_hasbit(msg, 3);
-}
-UPB_INLINE void google_protobuf_FileOptions_clear_optimize_for(const google_protobuf_FileOptions* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(4, 4), int32_t) = 0;
-  _upb_clearhas(msg, 3);
-}
-UPB_INLINE int32_t google_protobuf_FileOptions_optimize_for(const google_protobuf_FileOptions* msg) {
-  return google_protobuf_FileOptions_has_optimize_for(msg) ? *UPB_PTR_AT(msg, UPB_SIZE(4, 4), int32_t) : 1;
-}
-UPB_INLINE bool google_protobuf_FileOptions_has_java_multiple_files(const google_protobuf_FileOptions* msg) {
-  return _upb_hasbit(msg, 4);
-}
-UPB_INLINE void google_protobuf_FileOptions_clear_java_multiple_files(const google_protobuf_FileOptions* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(8, 8), bool) = 0;
-  _upb_clearhas(msg, 4);
-}
-UPB_INLINE bool google_protobuf_FileOptions_java_multiple_files(const google_protobuf_FileOptions* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(8, 8), bool);
-}
-UPB_INLINE bool google_protobuf_FileOptions_has_go_package(const google_protobuf_FileOptions* msg) {
-  return _upb_hasbit(msg, 5);
-}
-UPB_INLINE void google_protobuf_FileOptions_clear_go_package(const google_protobuf_FileOptions* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(36, 56), upb_StringView) = upb_StringView_FromDataAndSize(NULL, 0);
-  _upb_clearhas(msg, 5);
-}
-UPB_INLINE upb_StringView google_protobuf_FileOptions_go_package(const google_protobuf_FileOptions* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(36, 56), upb_StringView);
-}
-UPB_INLINE bool google_protobuf_FileOptions_has_cc_generic_services(const google_protobuf_FileOptions* msg) {
-  return _upb_hasbit(msg, 6);
-}
-UPB_INLINE void google_protobuf_FileOptions_clear_cc_generic_services(const google_protobuf_FileOptions* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(9, 9), bool) = 0;
-  _upb_clearhas(msg, 6);
-}
-UPB_INLINE bool google_protobuf_FileOptions_cc_generic_services(const google_protobuf_FileOptions* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(9, 9), bool);
-}
-UPB_INLINE bool google_protobuf_FileOptions_has_java_generic_services(const google_protobuf_FileOptions* msg) {
-  return _upb_hasbit(msg, 7);
-}
-UPB_INLINE void google_protobuf_FileOptions_clear_java_generic_services(const google_protobuf_FileOptions* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(10, 10), bool) = 0;
-  _upb_clearhas(msg, 7);
-}
-UPB_INLINE bool google_protobuf_FileOptions_java_generic_services(const google_protobuf_FileOptions* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(10, 10), bool);
-}
-UPB_INLINE bool google_protobuf_FileOptions_has_py_generic_services(const google_protobuf_FileOptions* msg) {
-  return _upb_hasbit(msg, 8);
-}
-UPB_INLINE void google_protobuf_FileOptions_clear_py_generic_services(const google_protobuf_FileOptions* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(11, 11), bool) = 0;
-  _upb_clearhas(msg, 8);
-}
-UPB_INLINE bool google_protobuf_FileOptions_py_generic_services(const google_protobuf_FileOptions* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(11, 11), bool);
-}
-UPB_INLINE bool google_protobuf_FileOptions_has_java_generate_equals_and_hash(const google_protobuf_FileOptions* msg) {
-  return _upb_hasbit(msg, 9);
-}
-UPB_INLINE void google_protobuf_FileOptions_clear_java_generate_equals_and_hash(const google_protobuf_FileOptions* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(12, 12), bool) = 0;
-  _upb_clearhas(msg, 9);
-}
-UPB_INLINE bool google_protobuf_FileOptions_java_generate_equals_and_hash(const google_protobuf_FileOptions* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(12, 12), bool);
-}
-UPB_INLINE bool google_protobuf_FileOptions_has_deprecated(const google_protobuf_FileOptions* msg) {
-  return _upb_hasbit(msg, 10);
-}
-UPB_INLINE void google_protobuf_FileOptions_clear_deprecated(const google_protobuf_FileOptions* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(13, 13), bool) = 0;
-  _upb_clearhas(msg, 10);
-}
-UPB_INLINE bool google_protobuf_FileOptions_deprecated(const google_protobuf_FileOptions* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(13, 13), bool);
-}
-UPB_INLINE bool google_protobuf_FileOptions_has_java_string_check_utf8(const google_protobuf_FileOptions* msg) {
-  return _upb_hasbit(msg, 11);
-}
-UPB_INLINE void google_protobuf_FileOptions_clear_java_string_check_utf8(const google_protobuf_FileOptions* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(14, 14), bool) = 0;
-  _upb_clearhas(msg, 11);
-}
-UPB_INLINE bool google_protobuf_FileOptions_java_string_check_utf8(const google_protobuf_FileOptions* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(14, 14), bool);
-}
-UPB_INLINE bool google_protobuf_FileOptions_has_cc_enable_arenas(const google_protobuf_FileOptions* msg) {
-  return _upb_hasbit(msg, 12);
-}
-UPB_INLINE void google_protobuf_FileOptions_clear_cc_enable_arenas(const google_protobuf_FileOptions* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(15, 15), bool) = 0;
-  _upb_clearhas(msg, 12);
-}
-UPB_INLINE bool google_protobuf_FileOptions_cc_enable_arenas(const google_protobuf_FileOptions* msg) {
-  return google_protobuf_FileOptions_has_cc_enable_arenas(msg) ? *UPB_PTR_AT(msg, UPB_SIZE(15, 15), bool) : true;
-}
-UPB_INLINE bool google_protobuf_FileOptions_has_objc_class_prefix(const google_protobuf_FileOptions* msg) {
-  return _upb_hasbit(msg, 13);
-}
-UPB_INLINE void google_protobuf_FileOptions_clear_objc_class_prefix(const google_protobuf_FileOptions* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(44, 72), upb_StringView) = upb_StringView_FromDataAndSize(NULL, 0);
-  _upb_clearhas(msg, 13);
-}
-UPB_INLINE upb_StringView google_protobuf_FileOptions_objc_class_prefix(const google_protobuf_FileOptions* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(44, 72), upb_StringView);
-}
-UPB_INLINE bool google_protobuf_FileOptions_has_csharp_namespace(const google_protobuf_FileOptions* msg) {
-  return _upb_hasbit(msg, 14);
-}
-UPB_INLINE void google_protobuf_FileOptions_clear_csharp_namespace(const google_protobuf_FileOptions* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(52, 88), upb_StringView) = upb_StringView_FromDataAndSize(NULL, 0);
-  _upb_clearhas(msg, 14);
-}
-UPB_INLINE upb_StringView google_protobuf_FileOptions_csharp_namespace(const google_protobuf_FileOptions* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(52, 88), upb_StringView);
-}
-UPB_INLINE bool google_protobuf_FileOptions_has_swift_prefix(const google_protobuf_FileOptions* msg) {
-  return _upb_hasbit(msg, 15);
-}
-UPB_INLINE void google_protobuf_FileOptions_clear_swift_prefix(const google_protobuf_FileOptions* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(60, 104), upb_StringView) = upb_StringView_FromDataAndSize(NULL, 0);
-  _upb_clearhas(msg, 15);
-}
-UPB_INLINE upb_StringView google_protobuf_FileOptions_swift_prefix(const google_protobuf_FileOptions* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(60, 104), upb_StringView);
-}
-UPB_INLINE bool google_protobuf_FileOptions_has_php_class_prefix(const google_protobuf_FileOptions* msg) {
-  return _upb_hasbit(msg, 16);
-}
-UPB_INLINE void google_protobuf_FileOptions_clear_php_class_prefix(const google_protobuf_FileOptions* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(68, 120), upb_StringView) = upb_StringView_FromDataAndSize(NULL, 0);
-  _upb_clearhas(msg, 16);
-}
-UPB_INLINE upb_StringView google_protobuf_FileOptions_php_class_prefix(const google_protobuf_FileOptions* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(68, 120), upb_StringView);
-}
-UPB_INLINE bool google_protobuf_FileOptions_has_php_namespace(const google_protobuf_FileOptions* msg) {
-  return _upb_hasbit(msg, 17);
-}
-UPB_INLINE void google_protobuf_FileOptions_clear_php_namespace(const google_protobuf_FileOptions* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(76, 136), upb_StringView) = upb_StringView_FromDataAndSize(NULL, 0);
-  _upb_clearhas(msg, 17);
-}
-UPB_INLINE upb_StringView google_protobuf_FileOptions_php_namespace(const google_protobuf_FileOptions* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(76, 136), upb_StringView);
-}
-UPB_INLINE bool google_protobuf_FileOptions_has_php_generic_services(const google_protobuf_FileOptions* msg) {
-  return _upb_hasbit(msg, 18);
-}
-UPB_INLINE void google_protobuf_FileOptions_clear_php_generic_services(const google_protobuf_FileOptions* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(16, 16), bool) = 0;
-  _upb_clearhas(msg, 18);
-}
-UPB_INLINE bool google_protobuf_FileOptions_php_generic_services(const google_protobuf_FileOptions* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(16, 16), bool);
-}
-UPB_INLINE bool google_protobuf_FileOptions_has_php_metadata_namespace(const google_protobuf_FileOptions* msg) {
-  return _upb_hasbit(msg, 19);
-}
-UPB_INLINE void google_protobuf_FileOptions_clear_php_metadata_namespace(const google_protobuf_FileOptions* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(84, 152), upb_StringView) = upb_StringView_FromDataAndSize(NULL, 0);
-  _upb_clearhas(msg, 19);
-}
-UPB_INLINE upb_StringView google_protobuf_FileOptions_php_metadata_namespace(const google_protobuf_FileOptions* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(84, 152), upb_StringView);
-}
-UPB_INLINE bool google_protobuf_FileOptions_has_ruby_package(const google_protobuf_FileOptions* msg) {
-  return _upb_hasbit(msg, 20);
-}
-UPB_INLINE void google_protobuf_FileOptions_clear_ruby_package(const google_protobuf_FileOptions* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(92, 168), upb_StringView) = upb_StringView_FromDataAndSize(NULL, 0);
-  _upb_clearhas(msg, 20);
-}
-UPB_INLINE upb_StringView google_protobuf_FileOptions_ruby_package(const google_protobuf_FileOptions* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(92, 168), upb_StringView);
-}
-UPB_INLINE bool google_protobuf_FileOptions_has_uninterpreted_option(const google_protobuf_FileOptions* msg) {
-  return _upb_has_submsg_nohasbit(msg, UPB_SIZE(100, 184));
-}
-UPB_INLINE void google_protobuf_FileOptions_clear_uninterpreted_option(const google_protobuf_FileOptions* msg) {
-  _upb_array_detach(msg, UPB_SIZE(100, 184));
-}
-UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_FileOptions_uninterpreted_option(const google_protobuf_FileOptions* msg, size_t* len) {
-  return (const google_protobuf_UninterpretedOption* const*)_upb_array_accessor(msg, UPB_SIZE(100, 184), len);
-}
-
-UPB_INLINE void google_protobuf_FileOptions_set_java_package(google_protobuf_FileOptions *msg, upb_StringView value) {
-  _upb_sethas(msg, 1);
-  *UPB_PTR_AT(msg, UPB_SIZE(20, 24), upb_StringView) = value;
-}
-UPB_INLINE void google_protobuf_FileOptions_set_java_outer_classname(google_protobuf_FileOptions *msg, upb_StringView value) {
-  _upb_sethas(msg, 2);
-  *UPB_PTR_AT(msg, UPB_SIZE(28, 40), upb_StringView) = value;
-}
-UPB_INLINE void google_protobuf_FileOptions_set_optimize_for(google_protobuf_FileOptions *msg, int32_t value) {
-  _upb_sethas(msg, 3);
-  *UPB_PTR_AT(msg, UPB_SIZE(4, 4), int32_t) = value;
-}
-UPB_INLINE void google_protobuf_FileOptions_set_java_multiple_files(google_protobuf_FileOptions *msg, bool value) {
-  _upb_sethas(msg, 4);
-  *UPB_PTR_AT(msg, UPB_SIZE(8, 8), bool) = value;
-}
-UPB_INLINE void google_protobuf_FileOptions_set_go_package(google_protobuf_FileOptions *msg, upb_StringView value) {
-  _upb_sethas(msg, 5);
-  *UPB_PTR_AT(msg, UPB_SIZE(36, 56), upb_StringView) = value;
-}
-UPB_INLINE void google_protobuf_FileOptions_set_cc_generic_services(google_protobuf_FileOptions *msg, bool value) {
-  _upb_sethas(msg, 6);
-  *UPB_PTR_AT(msg, UPB_SIZE(9, 9), bool) = value;
-}
-UPB_INLINE void google_protobuf_FileOptions_set_java_generic_services(google_protobuf_FileOptions *msg, bool value) {
-  _upb_sethas(msg, 7);
-  *UPB_PTR_AT(msg, UPB_SIZE(10, 10), bool) = value;
-}
-UPB_INLINE void google_protobuf_FileOptions_set_py_generic_services(google_protobuf_FileOptions *msg, bool value) {
-  _upb_sethas(msg, 8);
-  *UPB_PTR_AT(msg, UPB_SIZE(11, 11), bool) = value;
-}
-UPB_INLINE void google_protobuf_FileOptions_set_java_generate_equals_and_hash(google_protobuf_FileOptions *msg, bool value) {
-  _upb_sethas(msg, 9);
-  *UPB_PTR_AT(msg, UPB_SIZE(12, 12), bool) = value;
-}
-UPB_INLINE void google_protobuf_FileOptions_set_deprecated(google_protobuf_FileOptions *msg, bool value) {
-  _upb_sethas(msg, 10);
-  *UPB_PTR_AT(msg, UPB_SIZE(13, 13), bool) = value;
-}
-UPB_INLINE void google_protobuf_FileOptions_set_java_string_check_utf8(google_protobuf_FileOptions *msg, bool value) {
-  _upb_sethas(msg, 11);
-  *UPB_PTR_AT(msg, UPB_SIZE(14, 14), bool) = value;
-}
-UPB_INLINE void google_protobuf_FileOptions_set_cc_enable_arenas(google_protobuf_FileOptions *msg, bool value) {
-  _upb_sethas(msg, 12);
-  *UPB_PTR_AT(msg, UPB_SIZE(15, 15), bool) = value;
-}
-UPB_INLINE void google_protobuf_FileOptions_set_objc_class_prefix(google_protobuf_FileOptions *msg, upb_StringView value) {
-  _upb_sethas(msg, 13);
-  *UPB_PTR_AT(msg, UPB_SIZE(44, 72), upb_StringView) = value;
-}
-UPB_INLINE void google_protobuf_FileOptions_set_csharp_namespace(google_protobuf_FileOptions *msg, upb_StringView value) {
-  _upb_sethas(msg, 14);
-  *UPB_PTR_AT(msg, UPB_SIZE(52, 88), upb_StringView) = value;
-}
-UPB_INLINE void google_protobuf_FileOptions_set_swift_prefix(google_protobuf_FileOptions *msg, upb_StringView value) {
-  _upb_sethas(msg, 15);
-  *UPB_PTR_AT(msg, UPB_SIZE(60, 104), upb_StringView) = value;
-}
-UPB_INLINE void google_protobuf_FileOptions_set_php_class_prefix(google_protobuf_FileOptions *msg, upb_StringView value) {
-  _upb_sethas(msg, 16);
-  *UPB_PTR_AT(msg, UPB_SIZE(68, 120), upb_StringView) = value;
-}
-UPB_INLINE void google_protobuf_FileOptions_set_php_namespace(google_protobuf_FileOptions *msg, upb_StringView value) {
-  _upb_sethas(msg, 17);
-  *UPB_PTR_AT(msg, UPB_SIZE(76, 136), upb_StringView) = value;
-}
-UPB_INLINE void google_protobuf_FileOptions_set_php_generic_services(google_protobuf_FileOptions *msg, bool value) {
-  _upb_sethas(msg, 18);
-  *UPB_PTR_AT(msg, UPB_SIZE(16, 16), bool) = value;
-}
-UPB_INLINE void google_protobuf_FileOptions_set_php_metadata_namespace(google_protobuf_FileOptions *msg, upb_StringView value) {
-  _upb_sethas(msg, 19);
-  *UPB_PTR_AT(msg, UPB_SIZE(84, 152), upb_StringView) = value;
-}
-UPB_INLINE void google_protobuf_FileOptions_set_ruby_package(google_protobuf_FileOptions *msg, upb_StringView value) {
-  _upb_sethas(msg, 20);
-  *UPB_PTR_AT(msg, UPB_SIZE(92, 168), upb_StringView) = value;
-}
-UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_FileOptions_mutable_uninterpreted_option(google_protobuf_FileOptions* msg, size_t* len) {
-  return (google_protobuf_UninterpretedOption**)_upb_array_mutable_accessor(msg, UPB_SIZE(100, 184), len);
-}
-UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_FileOptions_resize_uninterpreted_option(google_protobuf_FileOptions* msg, size_t len, upb_Arena* arena) {
-  return (google_protobuf_UninterpretedOption**)_upb_Array_Resize_accessor2(msg, UPB_SIZE(100, 184), len, UPB_SIZE(2, 3), arena);
-}
-UPB_INLINE struct google_protobuf_UninterpretedOption* google_protobuf_FileOptions_add_uninterpreted_option(google_protobuf_FileOptions* msg, upb_Arena* arena) {
-  struct google_protobuf_UninterpretedOption* sub = (struct google_protobuf_UninterpretedOption*)_upb_Message_New(&google_protobuf_UninterpretedOption_msginit, arena);
-  bool ok = _upb_Array_Append_accessor2(msg, UPB_SIZE(100, 184), UPB_SIZE(2, 3), &sub, arena);
-  if (!ok) return NULL;
-  return sub;
-}
-
-/* google.protobuf.MessageOptions */
-
-UPB_INLINE google_protobuf_MessageOptions* google_protobuf_MessageOptions_new(upb_Arena* arena) {
-  return (google_protobuf_MessageOptions*)_upb_Message_New(&google_protobuf_MessageOptions_msginit, arena);
-}
-UPB_INLINE google_protobuf_MessageOptions* google_protobuf_MessageOptions_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_MessageOptions* ret = google_protobuf_MessageOptions_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_MessageOptions_msginit, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_MessageOptions* google_protobuf_MessageOptions_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_MessageOptions* ret = google_protobuf_MessageOptions_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_MessageOptions_msginit, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_MessageOptions_serialize(const google_protobuf_MessageOptions* msg, upb_Arena* arena, size_t* len) {
-  return upb_Encode(msg, &google_protobuf_MessageOptions_msginit, 0, arena, len);
-}
-UPB_INLINE char* google_protobuf_MessageOptions_serialize_ex(const google_protobuf_MessageOptions* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  return upb_Encode(msg, &google_protobuf_MessageOptions_msginit, options, arena, len);
-}
-UPB_INLINE bool google_protobuf_MessageOptions_has_message_set_wire_format(const google_protobuf_MessageOptions* msg) {
-  return _upb_hasbit(msg, 1);
-}
-UPB_INLINE void google_protobuf_MessageOptions_clear_message_set_wire_format(const google_protobuf_MessageOptions* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(1, 1), bool) = 0;
-  _upb_clearhas(msg, 1);
-}
-UPB_INLINE bool google_protobuf_MessageOptions_message_set_wire_format(const google_protobuf_MessageOptions* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(1, 1), bool);
-}
-UPB_INLINE bool google_protobuf_MessageOptions_has_no_standard_descriptor_accessor(const google_protobuf_MessageOptions* msg) {
-  return _upb_hasbit(msg, 2);
-}
-UPB_INLINE void google_protobuf_MessageOptions_clear_no_standard_descriptor_accessor(const google_protobuf_MessageOptions* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(2, 2), bool) = 0;
-  _upb_clearhas(msg, 2);
-}
-UPB_INLINE bool google_protobuf_MessageOptions_no_standard_descriptor_accessor(const google_protobuf_MessageOptions* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(2, 2), bool);
-}
-UPB_INLINE bool google_protobuf_MessageOptions_has_deprecated(const google_protobuf_MessageOptions* msg) {
-  return _upb_hasbit(msg, 3);
-}
-UPB_INLINE void google_protobuf_MessageOptions_clear_deprecated(const google_protobuf_MessageOptions* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(3, 3), bool) = 0;
-  _upb_clearhas(msg, 3);
-}
-UPB_INLINE bool google_protobuf_MessageOptions_deprecated(const google_protobuf_MessageOptions* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(3, 3), bool);
-}
-UPB_INLINE bool google_protobuf_MessageOptions_has_map_entry(const google_protobuf_MessageOptions* msg) {
-  return _upb_hasbit(msg, 4);
-}
-UPB_INLINE void google_protobuf_MessageOptions_clear_map_entry(const google_protobuf_MessageOptions* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(4, 4), bool) = 0;
-  _upb_clearhas(msg, 4);
-}
-UPB_INLINE bool google_protobuf_MessageOptions_map_entry(const google_protobuf_MessageOptions* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(4, 4), bool);
-}
-UPB_INLINE bool google_protobuf_MessageOptions_has_uninterpreted_option(const google_protobuf_MessageOptions* msg) {
-  return _upb_has_submsg_nohasbit(msg, UPB_SIZE(8, 8));
-}
-UPB_INLINE void google_protobuf_MessageOptions_clear_uninterpreted_option(const google_protobuf_MessageOptions* msg) {
-  _upb_array_detach(msg, UPB_SIZE(8, 8));
-}
-UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_MessageOptions_uninterpreted_option(const google_protobuf_MessageOptions* msg, size_t* len) {
-  return (const google_protobuf_UninterpretedOption* const*)_upb_array_accessor(msg, UPB_SIZE(8, 8), len);
-}
-
-UPB_INLINE void google_protobuf_MessageOptions_set_message_set_wire_format(google_protobuf_MessageOptions *msg, bool value) {
-  _upb_sethas(msg, 1);
-  *UPB_PTR_AT(msg, UPB_SIZE(1, 1), bool) = value;
-}
-UPB_INLINE void google_protobuf_MessageOptions_set_no_standard_descriptor_accessor(google_protobuf_MessageOptions *msg, bool value) {
-  _upb_sethas(msg, 2);
-  *UPB_PTR_AT(msg, UPB_SIZE(2, 2), bool) = value;
-}
-UPB_INLINE void google_protobuf_MessageOptions_set_deprecated(google_protobuf_MessageOptions *msg, bool value) {
-  _upb_sethas(msg, 3);
-  *UPB_PTR_AT(msg, UPB_SIZE(3, 3), bool) = value;
-}
-UPB_INLINE void google_protobuf_MessageOptions_set_map_entry(google_protobuf_MessageOptions *msg, bool value) {
-  _upb_sethas(msg, 4);
-  *UPB_PTR_AT(msg, UPB_SIZE(4, 4), bool) = value;
-}
-UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_MessageOptions_mutable_uninterpreted_option(google_protobuf_MessageOptions* msg, size_t* len) {
-  return (google_protobuf_UninterpretedOption**)_upb_array_mutable_accessor(msg, UPB_SIZE(8, 8), len);
-}
-UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_MessageOptions_resize_uninterpreted_option(google_protobuf_MessageOptions* msg, size_t len, upb_Arena* arena) {
-  return (google_protobuf_UninterpretedOption**)_upb_Array_Resize_accessor2(msg, UPB_SIZE(8, 8), len, UPB_SIZE(2, 3), arena);
-}
-UPB_INLINE struct google_protobuf_UninterpretedOption* google_protobuf_MessageOptions_add_uninterpreted_option(google_protobuf_MessageOptions* msg, upb_Arena* arena) {
-  struct google_protobuf_UninterpretedOption* sub = (struct google_protobuf_UninterpretedOption*)_upb_Message_New(&google_protobuf_UninterpretedOption_msginit, arena);
-  bool ok = _upb_Array_Append_accessor2(msg, UPB_SIZE(8, 8), UPB_SIZE(2, 3), &sub, arena);
-  if (!ok) return NULL;
-  return sub;
-}
-
-/* google.protobuf.FieldOptions */
-
-UPB_INLINE google_protobuf_FieldOptions* google_protobuf_FieldOptions_new(upb_Arena* arena) {
-  return (google_protobuf_FieldOptions*)_upb_Message_New(&google_protobuf_FieldOptions_msginit, arena);
-}
-UPB_INLINE google_protobuf_FieldOptions* google_protobuf_FieldOptions_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_FieldOptions* ret = google_protobuf_FieldOptions_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_FieldOptions_msginit, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_FieldOptions* google_protobuf_FieldOptions_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_FieldOptions* ret = google_protobuf_FieldOptions_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_FieldOptions_msginit, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_FieldOptions_serialize(const google_protobuf_FieldOptions* msg, upb_Arena* arena, size_t* len) {
-  return upb_Encode(msg, &google_protobuf_FieldOptions_msginit, 0, arena, len);
-}
-UPB_INLINE char* google_protobuf_FieldOptions_serialize_ex(const google_protobuf_FieldOptions* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  return upb_Encode(msg, &google_protobuf_FieldOptions_msginit, options, arena, len);
-}
-UPB_INLINE bool google_protobuf_FieldOptions_has_ctype(const google_protobuf_FieldOptions* msg) {
-  return _upb_hasbit(msg, 1);
-}
-UPB_INLINE void google_protobuf_FieldOptions_clear_ctype(const google_protobuf_FieldOptions* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(4, 4), int32_t) = 0;
-  _upb_clearhas(msg, 1);
-}
-UPB_INLINE int32_t google_protobuf_FieldOptions_ctype(const google_protobuf_FieldOptions* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(4, 4), int32_t);
-}
-UPB_INLINE bool google_protobuf_FieldOptions_has_packed(const google_protobuf_FieldOptions* msg) {
-  return _upb_hasbit(msg, 2);
-}
-UPB_INLINE void google_protobuf_FieldOptions_clear_packed(const google_protobuf_FieldOptions* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(8, 8), bool) = 0;
-  _upb_clearhas(msg, 2);
-}
-UPB_INLINE bool google_protobuf_FieldOptions_packed(const google_protobuf_FieldOptions* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(8, 8), bool);
-}
-UPB_INLINE bool google_protobuf_FieldOptions_has_deprecated(const google_protobuf_FieldOptions* msg) {
-  return _upb_hasbit(msg, 3);
-}
-UPB_INLINE void google_protobuf_FieldOptions_clear_deprecated(const google_protobuf_FieldOptions* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(9, 9), bool) = 0;
-  _upb_clearhas(msg, 3);
-}
-UPB_INLINE bool google_protobuf_FieldOptions_deprecated(const google_protobuf_FieldOptions* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(9, 9), bool);
-}
-UPB_INLINE bool google_protobuf_FieldOptions_has_lazy(const google_protobuf_FieldOptions* msg) {
-  return _upb_hasbit(msg, 4);
-}
-UPB_INLINE void google_protobuf_FieldOptions_clear_lazy(const google_protobuf_FieldOptions* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(10, 10), bool) = 0;
-  _upb_clearhas(msg, 4);
-}
-UPB_INLINE bool google_protobuf_FieldOptions_lazy(const google_protobuf_FieldOptions* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(10, 10), bool);
-}
-UPB_INLINE bool google_protobuf_FieldOptions_has_jstype(const google_protobuf_FieldOptions* msg) {
-  return _upb_hasbit(msg, 5);
-}
-UPB_INLINE void google_protobuf_FieldOptions_clear_jstype(const google_protobuf_FieldOptions* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(12, 12), int32_t) = 0;
-  _upb_clearhas(msg, 5);
-}
-UPB_INLINE int32_t google_protobuf_FieldOptions_jstype(const google_protobuf_FieldOptions* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(12, 12), int32_t);
-}
-UPB_INLINE bool google_protobuf_FieldOptions_has_weak(const google_protobuf_FieldOptions* msg) {
-  return _upb_hasbit(msg, 6);
-}
-UPB_INLINE void google_protobuf_FieldOptions_clear_weak(const google_protobuf_FieldOptions* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(16, 16), bool) = 0;
-  _upb_clearhas(msg, 6);
-}
-UPB_INLINE bool google_protobuf_FieldOptions_weak(const google_protobuf_FieldOptions* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(16, 16), bool);
-}
-UPB_INLINE bool google_protobuf_FieldOptions_has_unverified_lazy(const google_protobuf_FieldOptions* msg) {
-  return _upb_hasbit(msg, 7);
-}
-UPB_INLINE void google_protobuf_FieldOptions_clear_unverified_lazy(const google_protobuf_FieldOptions* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(17, 17), bool) = 0;
-  _upb_clearhas(msg, 7);
-}
-UPB_INLINE bool google_protobuf_FieldOptions_unverified_lazy(const google_protobuf_FieldOptions* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(17, 17), bool);
-}
-UPB_INLINE bool google_protobuf_FieldOptions_has_uninterpreted_option(const google_protobuf_FieldOptions* msg) {
-  return _upb_has_submsg_nohasbit(msg, UPB_SIZE(20, 24));
-}
-UPB_INLINE void google_protobuf_FieldOptions_clear_uninterpreted_option(const google_protobuf_FieldOptions* msg) {
-  _upb_array_detach(msg, UPB_SIZE(20, 24));
-}
-UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_FieldOptions_uninterpreted_option(const google_protobuf_FieldOptions* msg, size_t* len) {
-  return (const google_protobuf_UninterpretedOption* const*)_upb_array_accessor(msg, UPB_SIZE(20, 24), len);
-}
-
-UPB_INLINE void google_protobuf_FieldOptions_set_ctype(google_protobuf_FieldOptions *msg, int32_t value) {
-  _upb_sethas(msg, 1);
-  *UPB_PTR_AT(msg, UPB_SIZE(4, 4), int32_t) = value;
-}
-UPB_INLINE void google_protobuf_FieldOptions_set_packed(google_protobuf_FieldOptions *msg, bool value) {
-  _upb_sethas(msg, 2);
-  *UPB_PTR_AT(msg, UPB_SIZE(8, 8), bool) = value;
-}
-UPB_INLINE void google_protobuf_FieldOptions_set_deprecated(google_protobuf_FieldOptions *msg, bool value) {
-  _upb_sethas(msg, 3);
-  *UPB_PTR_AT(msg, UPB_SIZE(9, 9), bool) = value;
-}
-UPB_INLINE void google_protobuf_FieldOptions_set_lazy(google_protobuf_FieldOptions *msg, bool value) {
-  _upb_sethas(msg, 4);
-  *UPB_PTR_AT(msg, UPB_SIZE(10, 10), bool) = value;
-}
-UPB_INLINE void google_protobuf_FieldOptions_set_jstype(google_protobuf_FieldOptions *msg, int32_t value) {
-  _upb_sethas(msg, 5);
-  *UPB_PTR_AT(msg, UPB_SIZE(12, 12), int32_t) = value;
-}
-UPB_INLINE void google_protobuf_FieldOptions_set_weak(google_protobuf_FieldOptions *msg, bool value) {
-  _upb_sethas(msg, 6);
-  *UPB_PTR_AT(msg, UPB_SIZE(16, 16), bool) = value;
-}
-UPB_INLINE void google_protobuf_FieldOptions_set_unverified_lazy(google_protobuf_FieldOptions *msg, bool value) {
-  _upb_sethas(msg, 7);
-  *UPB_PTR_AT(msg, UPB_SIZE(17, 17), bool) = value;
-}
-UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_FieldOptions_mutable_uninterpreted_option(google_protobuf_FieldOptions* msg, size_t* len) {
-  return (google_protobuf_UninterpretedOption**)_upb_array_mutable_accessor(msg, UPB_SIZE(20, 24), len);
-}
-UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_FieldOptions_resize_uninterpreted_option(google_protobuf_FieldOptions* msg, size_t len, upb_Arena* arena) {
-  return (google_protobuf_UninterpretedOption**)_upb_Array_Resize_accessor2(msg, UPB_SIZE(20, 24), len, UPB_SIZE(2, 3), arena);
-}
-UPB_INLINE struct google_protobuf_UninterpretedOption* google_protobuf_FieldOptions_add_uninterpreted_option(google_protobuf_FieldOptions* msg, upb_Arena* arena) {
-  struct google_protobuf_UninterpretedOption* sub = (struct google_protobuf_UninterpretedOption*)_upb_Message_New(&google_protobuf_UninterpretedOption_msginit, arena);
-  bool ok = _upb_Array_Append_accessor2(msg, UPB_SIZE(20, 24), UPB_SIZE(2, 3), &sub, arena);
-  if (!ok) return NULL;
-  return sub;
-}
-
-/* google.protobuf.OneofOptions */
-
-UPB_INLINE google_protobuf_OneofOptions* google_protobuf_OneofOptions_new(upb_Arena* arena) {
-  return (google_protobuf_OneofOptions*)_upb_Message_New(&google_protobuf_OneofOptions_msginit, arena);
-}
-UPB_INLINE google_protobuf_OneofOptions* google_protobuf_OneofOptions_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_OneofOptions* ret = google_protobuf_OneofOptions_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_OneofOptions_msginit, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_OneofOptions* google_protobuf_OneofOptions_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_OneofOptions* ret = google_protobuf_OneofOptions_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_OneofOptions_msginit, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_OneofOptions_serialize(const google_protobuf_OneofOptions* msg, upb_Arena* arena, size_t* len) {
-  return upb_Encode(msg, &google_protobuf_OneofOptions_msginit, 0, arena, len);
-}
-UPB_INLINE char* google_protobuf_OneofOptions_serialize_ex(const google_protobuf_OneofOptions* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  return upb_Encode(msg, &google_protobuf_OneofOptions_msginit, options, arena, len);
-}
-UPB_INLINE bool google_protobuf_OneofOptions_has_uninterpreted_option(const google_protobuf_OneofOptions* msg) {
-  return _upb_has_submsg_nohasbit(msg, UPB_SIZE(0, 0));
-}
-UPB_INLINE void google_protobuf_OneofOptions_clear_uninterpreted_option(const google_protobuf_OneofOptions* msg) {
-  _upb_array_detach(msg, UPB_SIZE(0, 0));
-}
-UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_OneofOptions_uninterpreted_option(const google_protobuf_OneofOptions* msg, size_t* len) {
-  return (const google_protobuf_UninterpretedOption* const*)_upb_array_accessor(msg, UPB_SIZE(0, 0), len);
-}
-
-UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_OneofOptions_mutable_uninterpreted_option(google_protobuf_OneofOptions* msg, size_t* len) {
-  return (google_protobuf_UninterpretedOption**)_upb_array_mutable_accessor(msg, UPB_SIZE(0, 0), len);
-}
-UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_OneofOptions_resize_uninterpreted_option(google_protobuf_OneofOptions* msg, size_t len, upb_Arena* arena) {
-  return (google_protobuf_UninterpretedOption**)_upb_Array_Resize_accessor2(msg, UPB_SIZE(0, 0), len, UPB_SIZE(2, 3), arena);
-}
-UPB_INLINE struct google_protobuf_UninterpretedOption* google_protobuf_OneofOptions_add_uninterpreted_option(google_protobuf_OneofOptions* msg, upb_Arena* arena) {
-  struct google_protobuf_UninterpretedOption* sub = (struct google_protobuf_UninterpretedOption*)_upb_Message_New(&google_protobuf_UninterpretedOption_msginit, arena);
-  bool ok = _upb_Array_Append_accessor2(msg, UPB_SIZE(0, 0), UPB_SIZE(2, 3), &sub, arena);
-  if (!ok) return NULL;
-  return sub;
-}
-
-/* google.protobuf.EnumOptions */
-
-UPB_INLINE google_protobuf_EnumOptions* google_protobuf_EnumOptions_new(upb_Arena* arena) {
-  return (google_protobuf_EnumOptions*)_upb_Message_New(&google_protobuf_EnumOptions_msginit, arena);
-}
-UPB_INLINE google_protobuf_EnumOptions* google_protobuf_EnumOptions_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_EnumOptions* ret = google_protobuf_EnumOptions_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_EnumOptions_msginit, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_EnumOptions* google_protobuf_EnumOptions_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_EnumOptions* ret = google_protobuf_EnumOptions_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_EnumOptions_msginit, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_EnumOptions_serialize(const google_protobuf_EnumOptions* msg, upb_Arena* arena, size_t* len) {
-  return upb_Encode(msg, &google_protobuf_EnumOptions_msginit, 0, arena, len);
-}
-UPB_INLINE char* google_protobuf_EnumOptions_serialize_ex(const google_protobuf_EnumOptions* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  return upb_Encode(msg, &google_protobuf_EnumOptions_msginit, options, arena, len);
-}
-UPB_INLINE bool google_protobuf_EnumOptions_has_allow_alias(const google_protobuf_EnumOptions* msg) {
-  return _upb_hasbit(msg, 1);
-}
-UPB_INLINE void google_protobuf_EnumOptions_clear_allow_alias(const google_protobuf_EnumOptions* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(1, 1), bool) = 0;
-  _upb_clearhas(msg, 1);
-}
-UPB_INLINE bool google_protobuf_EnumOptions_allow_alias(const google_protobuf_EnumOptions* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(1, 1), bool);
-}
-UPB_INLINE bool google_protobuf_EnumOptions_has_deprecated(const google_protobuf_EnumOptions* msg) {
-  return _upb_hasbit(msg, 2);
-}
-UPB_INLINE void google_protobuf_EnumOptions_clear_deprecated(const google_protobuf_EnumOptions* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(2, 2), bool) = 0;
-  _upb_clearhas(msg, 2);
-}
-UPB_INLINE bool google_protobuf_EnumOptions_deprecated(const google_protobuf_EnumOptions* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(2, 2), bool);
-}
-UPB_INLINE bool google_protobuf_EnumOptions_has_uninterpreted_option(const google_protobuf_EnumOptions* msg) {
-  return _upb_has_submsg_nohasbit(msg, UPB_SIZE(4, 8));
-}
-UPB_INLINE void google_protobuf_EnumOptions_clear_uninterpreted_option(const google_protobuf_EnumOptions* msg) {
-  _upb_array_detach(msg, UPB_SIZE(4, 8));
-}
-UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_EnumOptions_uninterpreted_option(const google_protobuf_EnumOptions* msg, size_t* len) {
-  return (const google_protobuf_UninterpretedOption* const*)_upb_array_accessor(msg, UPB_SIZE(4, 8), len);
-}
-
-UPB_INLINE void google_protobuf_EnumOptions_set_allow_alias(google_protobuf_EnumOptions *msg, bool value) {
-  _upb_sethas(msg, 1);
-  *UPB_PTR_AT(msg, UPB_SIZE(1, 1), bool) = value;
-}
-UPB_INLINE void google_protobuf_EnumOptions_set_deprecated(google_protobuf_EnumOptions *msg, bool value) {
-  _upb_sethas(msg, 2);
-  *UPB_PTR_AT(msg, UPB_SIZE(2, 2), bool) = value;
-}
-UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_EnumOptions_mutable_uninterpreted_option(google_protobuf_EnumOptions* msg, size_t* len) {
-  return (google_protobuf_UninterpretedOption**)_upb_array_mutable_accessor(msg, UPB_SIZE(4, 8), len);
-}
-UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_EnumOptions_resize_uninterpreted_option(google_protobuf_EnumOptions* msg, size_t len, upb_Arena* arena) {
-  return (google_protobuf_UninterpretedOption**)_upb_Array_Resize_accessor2(msg, UPB_SIZE(4, 8), len, UPB_SIZE(2, 3), arena);
-}
-UPB_INLINE struct google_protobuf_UninterpretedOption* google_protobuf_EnumOptions_add_uninterpreted_option(google_protobuf_EnumOptions* msg, upb_Arena* arena) {
-  struct google_protobuf_UninterpretedOption* sub = (struct google_protobuf_UninterpretedOption*)_upb_Message_New(&google_protobuf_UninterpretedOption_msginit, arena);
-  bool ok = _upb_Array_Append_accessor2(msg, UPB_SIZE(4, 8), UPB_SIZE(2, 3), &sub, arena);
-  if (!ok) return NULL;
-  return sub;
-}
-
-/* google.protobuf.EnumValueOptions */
-
-UPB_INLINE google_protobuf_EnumValueOptions* google_protobuf_EnumValueOptions_new(upb_Arena* arena) {
-  return (google_protobuf_EnumValueOptions*)_upb_Message_New(&google_protobuf_EnumValueOptions_msginit, arena);
-}
-UPB_INLINE google_protobuf_EnumValueOptions* google_protobuf_EnumValueOptions_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_EnumValueOptions* ret = google_protobuf_EnumValueOptions_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_EnumValueOptions_msginit, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_EnumValueOptions* google_protobuf_EnumValueOptions_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_EnumValueOptions* ret = google_protobuf_EnumValueOptions_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_EnumValueOptions_msginit, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_EnumValueOptions_serialize(const google_protobuf_EnumValueOptions* msg, upb_Arena* arena, size_t* len) {
-  return upb_Encode(msg, &google_protobuf_EnumValueOptions_msginit, 0, arena, len);
-}
-UPB_INLINE char* google_protobuf_EnumValueOptions_serialize_ex(const google_protobuf_EnumValueOptions* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  return upb_Encode(msg, &google_protobuf_EnumValueOptions_msginit, options, arena, len);
-}
-UPB_INLINE bool google_protobuf_EnumValueOptions_has_deprecated(const google_protobuf_EnumValueOptions* msg) {
-  return _upb_hasbit(msg, 1);
-}
-UPB_INLINE void google_protobuf_EnumValueOptions_clear_deprecated(const google_protobuf_EnumValueOptions* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(1, 1), bool) = 0;
-  _upb_clearhas(msg, 1);
-}
-UPB_INLINE bool google_protobuf_EnumValueOptions_deprecated(const google_protobuf_EnumValueOptions* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(1, 1), bool);
-}
-UPB_INLINE bool google_protobuf_EnumValueOptions_has_uninterpreted_option(const google_protobuf_EnumValueOptions* msg) {
-  return _upb_has_submsg_nohasbit(msg, UPB_SIZE(4, 8));
-}
-UPB_INLINE void google_protobuf_EnumValueOptions_clear_uninterpreted_option(const google_protobuf_EnumValueOptions* msg) {
-  _upb_array_detach(msg, UPB_SIZE(4, 8));
-}
-UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_EnumValueOptions_uninterpreted_option(const google_protobuf_EnumValueOptions* msg, size_t* len) {
-  return (const google_protobuf_UninterpretedOption* const*)_upb_array_accessor(msg, UPB_SIZE(4, 8), len);
-}
-
-UPB_INLINE void google_protobuf_EnumValueOptions_set_deprecated(google_protobuf_EnumValueOptions *msg, bool value) {
-  _upb_sethas(msg, 1);
-  *UPB_PTR_AT(msg, UPB_SIZE(1, 1), bool) = value;
-}
-UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_EnumValueOptions_mutable_uninterpreted_option(google_protobuf_EnumValueOptions* msg, size_t* len) {
-  return (google_protobuf_UninterpretedOption**)_upb_array_mutable_accessor(msg, UPB_SIZE(4, 8), len);
-}
-UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_EnumValueOptions_resize_uninterpreted_option(google_protobuf_EnumValueOptions* msg, size_t len, upb_Arena* arena) {
-  return (google_protobuf_UninterpretedOption**)_upb_Array_Resize_accessor2(msg, UPB_SIZE(4, 8), len, UPB_SIZE(2, 3), arena);
-}
-UPB_INLINE struct google_protobuf_UninterpretedOption* google_protobuf_EnumValueOptions_add_uninterpreted_option(google_protobuf_EnumValueOptions* msg, upb_Arena* arena) {
-  struct google_protobuf_UninterpretedOption* sub = (struct google_protobuf_UninterpretedOption*)_upb_Message_New(&google_protobuf_UninterpretedOption_msginit, arena);
-  bool ok = _upb_Array_Append_accessor2(msg, UPB_SIZE(4, 8), UPB_SIZE(2, 3), &sub, arena);
-  if (!ok) return NULL;
-  return sub;
-}
-
-/* google.protobuf.ServiceOptions */
-
-UPB_INLINE google_protobuf_ServiceOptions* google_protobuf_ServiceOptions_new(upb_Arena* arena) {
-  return (google_protobuf_ServiceOptions*)_upb_Message_New(&google_protobuf_ServiceOptions_msginit, arena);
-}
-UPB_INLINE google_protobuf_ServiceOptions* google_protobuf_ServiceOptions_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_ServiceOptions* ret = google_protobuf_ServiceOptions_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_ServiceOptions_msginit, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_ServiceOptions* google_protobuf_ServiceOptions_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_ServiceOptions* ret = google_protobuf_ServiceOptions_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_ServiceOptions_msginit, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_ServiceOptions_serialize(const google_protobuf_ServiceOptions* msg, upb_Arena* arena, size_t* len) {
-  return upb_Encode(msg, &google_protobuf_ServiceOptions_msginit, 0, arena, len);
-}
-UPB_INLINE char* google_protobuf_ServiceOptions_serialize_ex(const google_protobuf_ServiceOptions* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  return upb_Encode(msg, &google_protobuf_ServiceOptions_msginit, options, arena, len);
-}
-UPB_INLINE bool google_protobuf_ServiceOptions_has_deprecated(const google_protobuf_ServiceOptions* msg) {
-  return _upb_hasbit(msg, 1);
-}
-UPB_INLINE void google_protobuf_ServiceOptions_clear_deprecated(const google_protobuf_ServiceOptions* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(1, 1), bool) = 0;
-  _upb_clearhas(msg, 1);
-}
-UPB_INLINE bool google_protobuf_ServiceOptions_deprecated(const google_protobuf_ServiceOptions* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(1, 1), bool);
-}
-UPB_INLINE bool google_protobuf_ServiceOptions_has_uninterpreted_option(const google_protobuf_ServiceOptions* msg) {
-  return _upb_has_submsg_nohasbit(msg, UPB_SIZE(4, 8));
-}
-UPB_INLINE void google_protobuf_ServiceOptions_clear_uninterpreted_option(const google_protobuf_ServiceOptions* msg) {
-  _upb_array_detach(msg, UPB_SIZE(4, 8));
-}
-UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_ServiceOptions_uninterpreted_option(const google_protobuf_ServiceOptions* msg, size_t* len) {
-  return (const google_protobuf_UninterpretedOption* const*)_upb_array_accessor(msg, UPB_SIZE(4, 8), len);
-}
-
-UPB_INLINE void google_protobuf_ServiceOptions_set_deprecated(google_protobuf_ServiceOptions *msg, bool value) {
-  _upb_sethas(msg, 1);
-  *UPB_PTR_AT(msg, UPB_SIZE(1, 1), bool) = value;
-}
-UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_ServiceOptions_mutable_uninterpreted_option(google_protobuf_ServiceOptions* msg, size_t* len) {
-  return (google_protobuf_UninterpretedOption**)_upb_array_mutable_accessor(msg, UPB_SIZE(4, 8), len);
-}
-UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_ServiceOptions_resize_uninterpreted_option(google_protobuf_ServiceOptions* msg, size_t len, upb_Arena* arena) {
-  return (google_protobuf_UninterpretedOption**)_upb_Array_Resize_accessor2(msg, UPB_SIZE(4, 8), len, UPB_SIZE(2, 3), arena);
-}
-UPB_INLINE struct google_protobuf_UninterpretedOption* google_protobuf_ServiceOptions_add_uninterpreted_option(google_protobuf_ServiceOptions* msg, upb_Arena* arena) {
-  struct google_protobuf_UninterpretedOption* sub = (struct google_protobuf_UninterpretedOption*)_upb_Message_New(&google_protobuf_UninterpretedOption_msginit, arena);
-  bool ok = _upb_Array_Append_accessor2(msg, UPB_SIZE(4, 8), UPB_SIZE(2, 3), &sub, arena);
-  if (!ok) return NULL;
-  return sub;
-}
-
-/* google.protobuf.MethodOptions */
-
-UPB_INLINE google_protobuf_MethodOptions* google_protobuf_MethodOptions_new(upb_Arena* arena) {
-  return (google_protobuf_MethodOptions*)_upb_Message_New(&google_protobuf_MethodOptions_msginit, arena);
-}
-UPB_INLINE google_protobuf_MethodOptions* google_protobuf_MethodOptions_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_MethodOptions* ret = google_protobuf_MethodOptions_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_MethodOptions_msginit, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_MethodOptions* google_protobuf_MethodOptions_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_MethodOptions* ret = google_protobuf_MethodOptions_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_MethodOptions_msginit, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_MethodOptions_serialize(const google_protobuf_MethodOptions* msg, upb_Arena* arena, size_t* len) {
-  return upb_Encode(msg, &google_protobuf_MethodOptions_msginit, 0, arena, len);
-}
-UPB_INLINE char* google_protobuf_MethodOptions_serialize_ex(const google_protobuf_MethodOptions* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  return upb_Encode(msg, &google_protobuf_MethodOptions_msginit, options, arena, len);
-}
-UPB_INLINE bool google_protobuf_MethodOptions_has_deprecated(const google_protobuf_MethodOptions* msg) {
-  return _upb_hasbit(msg, 1);
-}
-UPB_INLINE void google_protobuf_MethodOptions_clear_deprecated(const google_protobuf_MethodOptions* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(1, 1), bool) = 0;
-  _upb_clearhas(msg, 1);
-}
-UPB_INLINE bool google_protobuf_MethodOptions_deprecated(const google_protobuf_MethodOptions* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(1, 1), bool);
-}
-UPB_INLINE bool google_protobuf_MethodOptions_has_idempotency_level(const google_protobuf_MethodOptions* msg) {
-  return _upb_hasbit(msg, 2);
-}
-UPB_INLINE void google_protobuf_MethodOptions_clear_idempotency_level(const google_protobuf_MethodOptions* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(4, 4), int32_t) = 0;
-  _upb_clearhas(msg, 2);
-}
-UPB_INLINE int32_t google_protobuf_MethodOptions_idempotency_level(const google_protobuf_MethodOptions* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(4, 4), int32_t);
-}
-UPB_INLINE bool google_protobuf_MethodOptions_has_uninterpreted_option(const google_protobuf_MethodOptions* msg) {
-  return _upb_has_submsg_nohasbit(msg, UPB_SIZE(8, 8));
-}
-UPB_INLINE void google_protobuf_MethodOptions_clear_uninterpreted_option(const google_protobuf_MethodOptions* msg) {
-  _upb_array_detach(msg, UPB_SIZE(8, 8));
-}
-UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_MethodOptions_uninterpreted_option(const google_protobuf_MethodOptions* msg, size_t* len) {
-  return (const google_protobuf_UninterpretedOption* const*)_upb_array_accessor(msg, UPB_SIZE(8, 8), len);
-}
-
-UPB_INLINE void google_protobuf_MethodOptions_set_deprecated(google_protobuf_MethodOptions *msg, bool value) {
-  _upb_sethas(msg, 1);
-  *UPB_PTR_AT(msg, UPB_SIZE(1, 1), bool) = value;
-}
-UPB_INLINE void google_protobuf_MethodOptions_set_idempotency_level(google_protobuf_MethodOptions *msg, int32_t value) {
-  _upb_sethas(msg, 2);
-  *UPB_PTR_AT(msg, UPB_SIZE(4, 4), int32_t) = value;
-}
-UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_MethodOptions_mutable_uninterpreted_option(google_protobuf_MethodOptions* msg, size_t* len) {
-  return (google_protobuf_UninterpretedOption**)_upb_array_mutable_accessor(msg, UPB_SIZE(8, 8), len);
-}
-UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_MethodOptions_resize_uninterpreted_option(google_protobuf_MethodOptions* msg, size_t len, upb_Arena* arena) {
-  return (google_protobuf_UninterpretedOption**)_upb_Array_Resize_accessor2(msg, UPB_SIZE(8, 8), len, UPB_SIZE(2, 3), arena);
-}
-UPB_INLINE struct google_protobuf_UninterpretedOption* google_protobuf_MethodOptions_add_uninterpreted_option(google_protobuf_MethodOptions* msg, upb_Arena* arena) {
-  struct google_protobuf_UninterpretedOption* sub = (struct google_protobuf_UninterpretedOption*)_upb_Message_New(&google_protobuf_UninterpretedOption_msginit, arena);
-  bool ok = _upb_Array_Append_accessor2(msg, UPB_SIZE(8, 8), UPB_SIZE(2, 3), &sub, arena);
-  if (!ok) return NULL;
-  return sub;
-}
-
-/* google.protobuf.UninterpretedOption */
-
-UPB_INLINE google_protobuf_UninterpretedOption* google_protobuf_UninterpretedOption_new(upb_Arena* arena) {
-  return (google_protobuf_UninterpretedOption*)_upb_Message_New(&google_protobuf_UninterpretedOption_msginit, arena);
-}
-UPB_INLINE google_protobuf_UninterpretedOption* google_protobuf_UninterpretedOption_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_UninterpretedOption* ret = google_protobuf_UninterpretedOption_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_UninterpretedOption_msginit, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_UninterpretedOption* google_protobuf_UninterpretedOption_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_UninterpretedOption* ret = google_protobuf_UninterpretedOption_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_UninterpretedOption_msginit, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_UninterpretedOption_serialize(const google_protobuf_UninterpretedOption* msg, upb_Arena* arena, size_t* len) {
-  return upb_Encode(msg, &google_protobuf_UninterpretedOption_msginit, 0, arena, len);
-}
-UPB_INLINE char* google_protobuf_UninterpretedOption_serialize_ex(const google_protobuf_UninterpretedOption* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  return upb_Encode(msg, &google_protobuf_UninterpretedOption_msginit, options, arena, len);
-}
-UPB_INLINE bool google_protobuf_UninterpretedOption_has_name(const google_protobuf_UninterpretedOption* msg) {
-  return _upb_has_submsg_nohasbit(msg, UPB_SIZE(4, 8));
-}
-UPB_INLINE void google_protobuf_UninterpretedOption_clear_name(const google_protobuf_UninterpretedOption* msg) {
-  _upb_array_detach(msg, UPB_SIZE(4, 8));
-}
-UPB_INLINE const google_protobuf_UninterpretedOption_NamePart* const* google_protobuf_UninterpretedOption_name(const google_protobuf_UninterpretedOption* msg, size_t* len) {
-  return (const google_protobuf_UninterpretedOption_NamePart* const*)_upb_array_accessor(msg, UPB_SIZE(4, 8), len);
-}
-UPB_INLINE bool google_protobuf_UninterpretedOption_has_identifier_value(const google_protobuf_UninterpretedOption* msg) {
-  return _upb_hasbit(msg, 1);
-}
-UPB_INLINE void google_protobuf_UninterpretedOption_clear_identifier_value(const google_protobuf_UninterpretedOption* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(8, 16), upb_StringView) = upb_StringView_FromDataAndSize(NULL, 0);
-  _upb_clearhas(msg, 1);
-}
-UPB_INLINE upb_StringView google_protobuf_UninterpretedOption_identifier_value(const google_protobuf_UninterpretedOption* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(8, 16), upb_StringView);
-}
-UPB_INLINE bool google_protobuf_UninterpretedOption_has_positive_int_value(const google_protobuf_UninterpretedOption* msg) {
-  return _upb_hasbit(msg, 2);
-}
-UPB_INLINE void google_protobuf_UninterpretedOption_clear_positive_int_value(const google_protobuf_UninterpretedOption* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(32, 64), uint64_t) = 0;
-  _upb_clearhas(msg, 2);
-}
-UPB_INLINE uint64_t google_protobuf_UninterpretedOption_positive_int_value(const google_protobuf_UninterpretedOption* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(32, 64), uint64_t);
-}
-UPB_INLINE bool google_protobuf_UninterpretedOption_has_negative_int_value(const google_protobuf_UninterpretedOption* msg) {
-  return _upb_hasbit(msg, 3);
-}
-UPB_INLINE void google_protobuf_UninterpretedOption_clear_negative_int_value(const google_protobuf_UninterpretedOption* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(40, 72), int64_t) = 0;
-  _upb_clearhas(msg, 3);
-}
-UPB_INLINE int64_t google_protobuf_UninterpretedOption_negative_int_value(const google_protobuf_UninterpretedOption* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(40, 72), int64_t);
-}
-UPB_INLINE bool google_protobuf_UninterpretedOption_has_double_value(const google_protobuf_UninterpretedOption* msg) {
-  return _upb_hasbit(msg, 4);
-}
-UPB_INLINE void google_protobuf_UninterpretedOption_clear_double_value(const google_protobuf_UninterpretedOption* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(48, 80), double) = 0;
-  _upb_clearhas(msg, 4);
-}
-UPB_INLINE double google_protobuf_UninterpretedOption_double_value(const google_protobuf_UninterpretedOption* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(48, 80), double);
-}
-UPB_INLINE bool google_protobuf_UninterpretedOption_has_string_value(const google_protobuf_UninterpretedOption* msg) {
-  return _upb_hasbit(msg, 5);
-}
-UPB_INLINE void google_protobuf_UninterpretedOption_clear_string_value(const google_protobuf_UninterpretedOption* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(16, 32), upb_StringView) = upb_StringView_FromDataAndSize(NULL, 0);
-  _upb_clearhas(msg, 5);
-}
-UPB_INLINE upb_StringView google_protobuf_UninterpretedOption_string_value(const google_protobuf_UninterpretedOption* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(16, 32), upb_StringView);
-}
-UPB_INLINE bool google_protobuf_UninterpretedOption_has_aggregate_value(const google_protobuf_UninterpretedOption* msg) {
-  return _upb_hasbit(msg, 6);
-}
-UPB_INLINE void google_protobuf_UninterpretedOption_clear_aggregate_value(const google_protobuf_UninterpretedOption* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(24, 48), upb_StringView) = upb_StringView_FromDataAndSize(NULL, 0);
-  _upb_clearhas(msg, 6);
-}
-UPB_INLINE upb_StringView google_protobuf_UninterpretedOption_aggregate_value(const google_protobuf_UninterpretedOption* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(24, 48), upb_StringView);
-}
-
-UPB_INLINE google_protobuf_UninterpretedOption_NamePart** google_protobuf_UninterpretedOption_mutable_name(google_protobuf_UninterpretedOption* msg, size_t* len) {
-  return (google_protobuf_UninterpretedOption_NamePart**)_upb_array_mutable_accessor(msg, UPB_SIZE(4, 8), len);
-}
-UPB_INLINE google_protobuf_UninterpretedOption_NamePart** google_protobuf_UninterpretedOption_resize_name(google_protobuf_UninterpretedOption* msg, size_t len, upb_Arena* arena) {
-  return (google_protobuf_UninterpretedOption_NamePart**)_upb_Array_Resize_accessor2(msg, UPB_SIZE(4, 8), len, UPB_SIZE(2, 3), arena);
-}
-UPB_INLINE struct google_protobuf_UninterpretedOption_NamePart* google_protobuf_UninterpretedOption_add_name(google_protobuf_UninterpretedOption* msg, upb_Arena* arena) {
-  struct google_protobuf_UninterpretedOption_NamePart* sub = (struct google_protobuf_UninterpretedOption_NamePart*)_upb_Message_New(&google_protobuf_UninterpretedOption_NamePart_msginit, arena);
-  bool ok = _upb_Array_Append_accessor2(msg, UPB_SIZE(4, 8), UPB_SIZE(2, 3), &sub, arena);
-  if (!ok) return NULL;
-  return sub;
-}
-UPB_INLINE void google_protobuf_UninterpretedOption_set_identifier_value(google_protobuf_UninterpretedOption *msg, upb_StringView value) {
-  _upb_sethas(msg, 1);
-  *UPB_PTR_AT(msg, UPB_SIZE(8, 16), upb_StringView) = value;
-}
-UPB_INLINE void google_protobuf_UninterpretedOption_set_positive_int_value(google_protobuf_UninterpretedOption *msg, uint64_t value) {
-  _upb_sethas(msg, 2);
-  *UPB_PTR_AT(msg, UPB_SIZE(32, 64), uint64_t) = value;
-}
-UPB_INLINE void google_protobuf_UninterpretedOption_set_negative_int_value(google_protobuf_UninterpretedOption *msg, int64_t value) {
-  _upb_sethas(msg, 3);
-  *UPB_PTR_AT(msg, UPB_SIZE(40, 72), int64_t) = value;
-}
-UPB_INLINE void google_protobuf_UninterpretedOption_set_double_value(google_protobuf_UninterpretedOption *msg, double value) {
-  _upb_sethas(msg, 4);
-  *UPB_PTR_AT(msg, UPB_SIZE(48, 80), double) = value;
-}
-UPB_INLINE void google_protobuf_UninterpretedOption_set_string_value(google_protobuf_UninterpretedOption *msg, upb_StringView value) {
-  _upb_sethas(msg, 5);
-  *UPB_PTR_AT(msg, UPB_SIZE(16, 32), upb_StringView) = value;
-}
-UPB_INLINE void google_protobuf_UninterpretedOption_set_aggregate_value(google_protobuf_UninterpretedOption *msg, upb_StringView value) {
-  _upb_sethas(msg, 6);
-  *UPB_PTR_AT(msg, UPB_SIZE(24, 48), upb_StringView) = value;
-}
-
-/* google.protobuf.UninterpretedOption.NamePart */
-
-UPB_INLINE google_protobuf_UninterpretedOption_NamePart* google_protobuf_UninterpretedOption_NamePart_new(upb_Arena* arena) {
-  return (google_protobuf_UninterpretedOption_NamePart*)_upb_Message_New(&google_protobuf_UninterpretedOption_NamePart_msginit, arena);
-}
-UPB_INLINE google_protobuf_UninterpretedOption_NamePart* google_protobuf_UninterpretedOption_NamePart_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_UninterpretedOption_NamePart* ret = google_protobuf_UninterpretedOption_NamePart_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_UninterpretedOption_NamePart_msginit, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_UninterpretedOption_NamePart* google_protobuf_UninterpretedOption_NamePart_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_UninterpretedOption_NamePart* ret = google_protobuf_UninterpretedOption_NamePart_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_UninterpretedOption_NamePart_msginit, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_UninterpretedOption_NamePart_serialize(const google_protobuf_UninterpretedOption_NamePart* msg, upb_Arena* arena, size_t* len) {
-  return upb_Encode(msg, &google_protobuf_UninterpretedOption_NamePart_msginit, 0, arena, len);
-}
-UPB_INLINE char* google_protobuf_UninterpretedOption_NamePart_serialize_ex(const google_protobuf_UninterpretedOption_NamePart* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  return upb_Encode(msg, &google_protobuf_UninterpretedOption_NamePart_msginit, options, arena, len);
-}
-UPB_INLINE bool google_protobuf_UninterpretedOption_NamePart_has_name_part(const google_protobuf_UninterpretedOption_NamePart* msg) {
-  return _upb_hasbit(msg, 1);
-}
-UPB_INLINE void google_protobuf_UninterpretedOption_NamePart_clear_name_part(const google_protobuf_UninterpretedOption_NamePart* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_StringView) = upb_StringView_FromDataAndSize(NULL, 0);
-  _upb_clearhas(msg, 1);
-}
-UPB_INLINE upb_StringView google_protobuf_UninterpretedOption_NamePart_name_part(const google_protobuf_UninterpretedOption_NamePart* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_StringView);
-}
-UPB_INLINE bool google_protobuf_UninterpretedOption_NamePart_has_is_extension(const google_protobuf_UninterpretedOption_NamePart* msg) {
-  return _upb_hasbit(msg, 2);
-}
-UPB_INLINE void google_protobuf_UninterpretedOption_NamePart_clear_is_extension(const google_protobuf_UninterpretedOption_NamePart* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(1, 1), bool) = 0;
-  _upb_clearhas(msg, 2);
-}
-UPB_INLINE bool google_protobuf_UninterpretedOption_NamePart_is_extension(const google_protobuf_UninterpretedOption_NamePart* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(1, 1), bool);
-}
-
-UPB_INLINE void google_protobuf_UninterpretedOption_NamePart_set_name_part(google_protobuf_UninterpretedOption_NamePart *msg, upb_StringView value) {
-  _upb_sethas(msg, 1);
-  *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_StringView) = value;
-}
-UPB_INLINE void google_protobuf_UninterpretedOption_NamePart_set_is_extension(google_protobuf_UninterpretedOption_NamePart *msg, bool value) {
-  _upb_sethas(msg, 2);
-  *UPB_PTR_AT(msg, UPB_SIZE(1, 1), bool) = value;
-}
-
-/* google.protobuf.SourceCodeInfo */
-
-UPB_INLINE google_protobuf_SourceCodeInfo* google_protobuf_SourceCodeInfo_new(upb_Arena* arena) {
-  return (google_protobuf_SourceCodeInfo*)_upb_Message_New(&google_protobuf_SourceCodeInfo_msginit, arena);
-}
-UPB_INLINE google_protobuf_SourceCodeInfo* google_protobuf_SourceCodeInfo_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_SourceCodeInfo* ret = google_protobuf_SourceCodeInfo_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_SourceCodeInfo_msginit, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_SourceCodeInfo* google_protobuf_SourceCodeInfo_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_SourceCodeInfo* ret = google_protobuf_SourceCodeInfo_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_SourceCodeInfo_msginit, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_SourceCodeInfo_serialize(const google_protobuf_SourceCodeInfo* msg, upb_Arena* arena, size_t* len) {
-  return upb_Encode(msg, &google_protobuf_SourceCodeInfo_msginit, 0, arena, len);
-}
-UPB_INLINE char* google_protobuf_SourceCodeInfo_serialize_ex(const google_protobuf_SourceCodeInfo* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  return upb_Encode(msg, &google_protobuf_SourceCodeInfo_msginit, options, arena, len);
-}
-UPB_INLINE bool google_protobuf_SourceCodeInfo_has_location(const google_protobuf_SourceCodeInfo* msg) {
-  return _upb_has_submsg_nohasbit(msg, UPB_SIZE(0, 0));
-}
-UPB_INLINE void google_protobuf_SourceCodeInfo_clear_location(const google_protobuf_SourceCodeInfo* msg) {
-  _upb_array_detach(msg, UPB_SIZE(0, 0));
-}
-UPB_INLINE const google_protobuf_SourceCodeInfo_Location* const* google_protobuf_SourceCodeInfo_location(const google_protobuf_SourceCodeInfo* msg, size_t* len) {
-  return (const google_protobuf_SourceCodeInfo_Location* const*)_upb_array_accessor(msg, UPB_SIZE(0, 0), len);
-}
-
-UPB_INLINE google_protobuf_SourceCodeInfo_Location** google_protobuf_SourceCodeInfo_mutable_location(google_protobuf_SourceCodeInfo* msg, size_t* len) {
-  return (google_protobuf_SourceCodeInfo_Location**)_upb_array_mutable_accessor(msg, UPB_SIZE(0, 0), len);
-}
-UPB_INLINE google_protobuf_SourceCodeInfo_Location** google_protobuf_SourceCodeInfo_resize_location(google_protobuf_SourceCodeInfo* msg, size_t len, upb_Arena* arena) {
-  return (google_protobuf_SourceCodeInfo_Location**)_upb_Array_Resize_accessor2(msg, UPB_SIZE(0, 0), len, UPB_SIZE(2, 3), arena);
-}
-UPB_INLINE struct google_protobuf_SourceCodeInfo_Location* google_protobuf_SourceCodeInfo_add_location(google_protobuf_SourceCodeInfo* msg, upb_Arena* arena) {
-  struct google_protobuf_SourceCodeInfo_Location* sub = (struct google_protobuf_SourceCodeInfo_Location*)_upb_Message_New(&google_protobuf_SourceCodeInfo_Location_msginit, arena);
-  bool ok = _upb_Array_Append_accessor2(msg, UPB_SIZE(0, 0), UPB_SIZE(2, 3), &sub, arena);
-  if (!ok) return NULL;
-  return sub;
-}
-
-/* google.protobuf.SourceCodeInfo.Location */
-
-UPB_INLINE google_protobuf_SourceCodeInfo_Location* google_protobuf_SourceCodeInfo_Location_new(upb_Arena* arena) {
-  return (google_protobuf_SourceCodeInfo_Location*)_upb_Message_New(&google_protobuf_SourceCodeInfo_Location_msginit, arena);
-}
-UPB_INLINE google_protobuf_SourceCodeInfo_Location* google_protobuf_SourceCodeInfo_Location_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_SourceCodeInfo_Location* ret = google_protobuf_SourceCodeInfo_Location_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_SourceCodeInfo_Location_msginit, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_SourceCodeInfo_Location* google_protobuf_SourceCodeInfo_Location_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_SourceCodeInfo_Location* ret = google_protobuf_SourceCodeInfo_Location_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_SourceCodeInfo_Location_msginit, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_SourceCodeInfo_Location_serialize(const google_protobuf_SourceCodeInfo_Location* msg, upb_Arena* arena, size_t* len) {
-  return upb_Encode(msg, &google_protobuf_SourceCodeInfo_Location_msginit, 0, arena, len);
-}
-UPB_INLINE char* google_protobuf_SourceCodeInfo_Location_serialize_ex(const google_protobuf_SourceCodeInfo_Location* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  return upb_Encode(msg, &google_protobuf_SourceCodeInfo_Location_msginit, options, arena, len);
-}
-UPB_INLINE void google_protobuf_SourceCodeInfo_Location_clear_path(const google_protobuf_SourceCodeInfo_Location* msg) {
-  _upb_array_detach(msg, UPB_SIZE(4, 8));
-}
-UPB_INLINE int32_t const* google_protobuf_SourceCodeInfo_Location_path(const google_protobuf_SourceCodeInfo_Location* msg, size_t* len) {
-  return (int32_t const*)_upb_array_accessor(msg, UPB_SIZE(4, 8), len);
-}
-UPB_INLINE void google_protobuf_SourceCodeInfo_Location_clear_span(const google_protobuf_SourceCodeInfo_Location* msg) {
-  _upb_array_detach(msg, UPB_SIZE(8, 16));
-}
-UPB_INLINE int32_t const* google_protobuf_SourceCodeInfo_Location_span(const google_protobuf_SourceCodeInfo_Location* msg, size_t* len) {
-  return (int32_t const*)_upb_array_accessor(msg, UPB_SIZE(8, 16), len);
-}
-UPB_INLINE bool google_protobuf_SourceCodeInfo_Location_has_leading_comments(const google_protobuf_SourceCodeInfo_Location* msg) {
-  return _upb_hasbit(msg, 1);
-}
-UPB_INLINE void google_protobuf_SourceCodeInfo_Location_clear_leading_comments(const google_protobuf_SourceCodeInfo_Location* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(12, 24), upb_StringView) = upb_StringView_FromDataAndSize(NULL, 0);
-  _upb_clearhas(msg, 1);
-}
-UPB_INLINE upb_StringView google_protobuf_SourceCodeInfo_Location_leading_comments(const google_protobuf_SourceCodeInfo_Location* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(12, 24), upb_StringView);
-}
-UPB_INLINE bool google_protobuf_SourceCodeInfo_Location_has_trailing_comments(const google_protobuf_SourceCodeInfo_Location* msg) {
-  return _upb_hasbit(msg, 2);
-}
-UPB_INLINE void google_protobuf_SourceCodeInfo_Location_clear_trailing_comments(const google_protobuf_SourceCodeInfo_Location* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(20, 40), upb_StringView) = upb_StringView_FromDataAndSize(NULL, 0);
-  _upb_clearhas(msg, 2);
-}
-UPB_INLINE upb_StringView google_protobuf_SourceCodeInfo_Location_trailing_comments(const google_protobuf_SourceCodeInfo_Location* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(20, 40), upb_StringView);
-}
-UPB_INLINE void google_protobuf_SourceCodeInfo_Location_clear_leading_detached_comments(const google_protobuf_SourceCodeInfo_Location* msg) {
-  _upb_array_detach(msg, UPB_SIZE(28, 56));
-}
-UPB_INLINE upb_StringView const* google_protobuf_SourceCodeInfo_Location_leading_detached_comments(const google_protobuf_SourceCodeInfo_Location* msg, size_t* len) {
-  return (upb_StringView const*)_upb_array_accessor(msg, UPB_SIZE(28, 56), len);
-}
-
-UPB_INLINE int32_t* google_protobuf_SourceCodeInfo_Location_mutable_path(google_protobuf_SourceCodeInfo_Location* msg, size_t* len) {
-  return (int32_t*)_upb_array_mutable_accessor(msg, UPB_SIZE(4, 8), len);
-}
-UPB_INLINE int32_t* google_protobuf_SourceCodeInfo_Location_resize_path(google_protobuf_SourceCodeInfo_Location* msg, size_t len, upb_Arena* arena) {
-  return (int32_t*)_upb_Array_Resize_accessor2(msg, UPB_SIZE(4, 8), len, 2, arena);
-}
-UPB_INLINE bool google_protobuf_SourceCodeInfo_Location_add_path(google_protobuf_SourceCodeInfo_Location* msg, int32_t val, upb_Arena* arena) {
-  return _upb_Array_Append_accessor2(msg, UPB_SIZE(4, 8), 2, &val, arena);
-}
-UPB_INLINE int32_t* google_protobuf_SourceCodeInfo_Location_mutable_span(google_protobuf_SourceCodeInfo_Location* msg, size_t* len) {
-  return (int32_t*)_upb_array_mutable_accessor(msg, UPB_SIZE(8, 16), len);
-}
-UPB_INLINE int32_t* google_protobuf_SourceCodeInfo_Location_resize_span(google_protobuf_SourceCodeInfo_Location* msg, size_t len, upb_Arena* arena) {
-  return (int32_t*)_upb_Array_Resize_accessor2(msg, UPB_SIZE(8, 16), len, 2, arena);
-}
-UPB_INLINE bool google_protobuf_SourceCodeInfo_Location_add_span(google_protobuf_SourceCodeInfo_Location* msg, int32_t val, upb_Arena* arena) {
-  return _upb_Array_Append_accessor2(msg, UPB_SIZE(8, 16), 2, &val, arena);
-}
-UPB_INLINE void google_protobuf_SourceCodeInfo_Location_set_leading_comments(google_protobuf_SourceCodeInfo_Location *msg, upb_StringView value) {
-  _upb_sethas(msg, 1);
-  *UPB_PTR_AT(msg, UPB_SIZE(12, 24), upb_StringView) = value;
-}
-UPB_INLINE void google_protobuf_SourceCodeInfo_Location_set_trailing_comments(google_protobuf_SourceCodeInfo_Location *msg, upb_StringView value) {
-  _upb_sethas(msg, 2);
-  *UPB_PTR_AT(msg, UPB_SIZE(20, 40), upb_StringView) = value;
-}
-UPB_INLINE upb_StringView* google_protobuf_SourceCodeInfo_Location_mutable_leading_detached_comments(google_protobuf_SourceCodeInfo_Location* msg, size_t* len) {
-  return (upb_StringView*)_upb_array_mutable_accessor(msg, UPB_SIZE(28, 56), len);
-}
-UPB_INLINE upb_StringView* google_protobuf_SourceCodeInfo_Location_resize_leading_detached_comments(google_protobuf_SourceCodeInfo_Location* msg, size_t len, upb_Arena* arena) {
-  return (upb_StringView*)_upb_Array_Resize_accessor2(msg, UPB_SIZE(28, 56), len, UPB_SIZE(3, 4), arena);
-}
-UPB_INLINE bool google_protobuf_SourceCodeInfo_Location_add_leading_detached_comments(google_protobuf_SourceCodeInfo_Location* msg, upb_StringView val, upb_Arena* arena) {
-  return _upb_Array_Append_accessor2(msg, UPB_SIZE(28, 56), UPB_SIZE(3, 4), &val, arena);
-}
-
-/* google.protobuf.GeneratedCodeInfo */
-
-UPB_INLINE google_protobuf_GeneratedCodeInfo* google_protobuf_GeneratedCodeInfo_new(upb_Arena* arena) {
-  return (google_protobuf_GeneratedCodeInfo*)_upb_Message_New(&google_protobuf_GeneratedCodeInfo_msginit, arena);
-}
-UPB_INLINE google_protobuf_GeneratedCodeInfo* google_protobuf_GeneratedCodeInfo_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_GeneratedCodeInfo* ret = google_protobuf_GeneratedCodeInfo_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_GeneratedCodeInfo_msginit, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_GeneratedCodeInfo* google_protobuf_GeneratedCodeInfo_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_GeneratedCodeInfo* ret = google_protobuf_GeneratedCodeInfo_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_GeneratedCodeInfo_msginit, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_GeneratedCodeInfo_serialize(const google_protobuf_GeneratedCodeInfo* msg, upb_Arena* arena, size_t* len) {
-  return upb_Encode(msg, &google_protobuf_GeneratedCodeInfo_msginit, 0, arena, len);
-}
-UPB_INLINE char* google_protobuf_GeneratedCodeInfo_serialize_ex(const google_protobuf_GeneratedCodeInfo* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  return upb_Encode(msg, &google_protobuf_GeneratedCodeInfo_msginit, options, arena, len);
-}
-UPB_INLINE bool google_protobuf_GeneratedCodeInfo_has_annotation(const google_protobuf_GeneratedCodeInfo* msg) {
-  return _upb_has_submsg_nohasbit(msg, UPB_SIZE(0, 0));
-}
-UPB_INLINE void google_protobuf_GeneratedCodeInfo_clear_annotation(const google_protobuf_GeneratedCodeInfo* msg) {
-  _upb_array_detach(msg, UPB_SIZE(0, 0));
-}
-UPB_INLINE const google_protobuf_GeneratedCodeInfo_Annotation* const* google_protobuf_GeneratedCodeInfo_annotation(const google_protobuf_GeneratedCodeInfo* msg, size_t* len) {
-  return (const google_protobuf_GeneratedCodeInfo_Annotation* const*)_upb_array_accessor(msg, UPB_SIZE(0, 0), len);
-}
-
-UPB_INLINE google_protobuf_GeneratedCodeInfo_Annotation** google_protobuf_GeneratedCodeInfo_mutable_annotation(google_protobuf_GeneratedCodeInfo* msg, size_t* len) {
-  return (google_protobuf_GeneratedCodeInfo_Annotation**)_upb_array_mutable_accessor(msg, UPB_SIZE(0, 0), len);
-}
-UPB_INLINE google_protobuf_GeneratedCodeInfo_Annotation** google_protobuf_GeneratedCodeInfo_resize_annotation(google_protobuf_GeneratedCodeInfo* msg, size_t len, upb_Arena* arena) {
-  return (google_protobuf_GeneratedCodeInfo_Annotation**)_upb_Array_Resize_accessor2(msg, UPB_SIZE(0, 0), len, UPB_SIZE(2, 3), arena);
-}
-UPB_INLINE struct google_protobuf_GeneratedCodeInfo_Annotation* google_protobuf_GeneratedCodeInfo_add_annotation(google_protobuf_GeneratedCodeInfo* msg, upb_Arena* arena) {
-  struct google_protobuf_GeneratedCodeInfo_Annotation* sub = (struct google_protobuf_GeneratedCodeInfo_Annotation*)_upb_Message_New(&google_protobuf_GeneratedCodeInfo_Annotation_msginit, arena);
-  bool ok = _upb_Array_Append_accessor2(msg, UPB_SIZE(0, 0), UPB_SIZE(2, 3), &sub, arena);
-  if (!ok) return NULL;
-  return sub;
-}
-
-/* google.protobuf.GeneratedCodeInfo.Annotation */
-
-UPB_INLINE google_protobuf_GeneratedCodeInfo_Annotation* google_protobuf_GeneratedCodeInfo_Annotation_new(upb_Arena* arena) {
-  return (google_protobuf_GeneratedCodeInfo_Annotation*)_upb_Message_New(&google_protobuf_GeneratedCodeInfo_Annotation_msginit, arena);
-}
-UPB_INLINE google_protobuf_GeneratedCodeInfo_Annotation* google_protobuf_GeneratedCodeInfo_Annotation_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_GeneratedCodeInfo_Annotation* ret = google_protobuf_GeneratedCodeInfo_Annotation_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_GeneratedCodeInfo_Annotation_msginit, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_GeneratedCodeInfo_Annotation* google_protobuf_GeneratedCodeInfo_Annotation_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_GeneratedCodeInfo_Annotation* ret = google_protobuf_GeneratedCodeInfo_Annotation_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_GeneratedCodeInfo_Annotation_msginit, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_GeneratedCodeInfo_Annotation_serialize(const google_protobuf_GeneratedCodeInfo_Annotation* msg, upb_Arena* arena, size_t* len) {
-  return upb_Encode(msg, &google_protobuf_GeneratedCodeInfo_Annotation_msginit, 0, arena, len);
-}
-UPB_INLINE char* google_protobuf_GeneratedCodeInfo_Annotation_serialize_ex(const google_protobuf_GeneratedCodeInfo_Annotation* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  return upb_Encode(msg, &google_protobuf_GeneratedCodeInfo_Annotation_msginit, options, arena, len);
-}
-UPB_INLINE void google_protobuf_GeneratedCodeInfo_Annotation_clear_path(const google_protobuf_GeneratedCodeInfo_Annotation* msg) {
-  _upb_array_detach(msg, UPB_SIZE(12, 16));
-}
-UPB_INLINE int32_t const* google_protobuf_GeneratedCodeInfo_Annotation_path(const google_protobuf_GeneratedCodeInfo_Annotation* msg, size_t* len) {
-  return (int32_t const*)_upb_array_accessor(msg, UPB_SIZE(12, 16), len);
-}
-UPB_INLINE bool google_protobuf_GeneratedCodeInfo_Annotation_has_source_file(const google_protobuf_GeneratedCodeInfo_Annotation* msg) {
-  return _upb_hasbit(msg, 1);
-}
-UPB_INLINE void google_protobuf_GeneratedCodeInfo_Annotation_clear_source_file(const google_protobuf_GeneratedCodeInfo_Annotation* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(16, 24), upb_StringView) = upb_StringView_FromDataAndSize(NULL, 0);
-  _upb_clearhas(msg, 1);
-}
-UPB_INLINE upb_StringView google_protobuf_GeneratedCodeInfo_Annotation_source_file(const google_protobuf_GeneratedCodeInfo_Annotation* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(16, 24), upb_StringView);
-}
-UPB_INLINE bool google_protobuf_GeneratedCodeInfo_Annotation_has_begin(const google_protobuf_GeneratedCodeInfo_Annotation* msg) {
-  return _upb_hasbit(msg, 2);
-}
-UPB_INLINE void google_protobuf_GeneratedCodeInfo_Annotation_clear_begin(const google_protobuf_GeneratedCodeInfo_Annotation* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(4, 4), int32_t) = 0;
-  _upb_clearhas(msg, 2);
-}
-UPB_INLINE int32_t google_protobuf_GeneratedCodeInfo_Annotation_begin(const google_protobuf_GeneratedCodeInfo_Annotation* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(4, 4), int32_t);
-}
-UPB_INLINE bool google_protobuf_GeneratedCodeInfo_Annotation_has_end(const google_protobuf_GeneratedCodeInfo_Annotation* msg) {
-  return _upb_hasbit(msg, 3);
-}
-UPB_INLINE void google_protobuf_GeneratedCodeInfo_Annotation_clear_end(const google_protobuf_GeneratedCodeInfo_Annotation* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(8, 8), int32_t) = 0;
-  _upb_clearhas(msg, 3);
-}
-UPB_INLINE int32_t google_protobuf_GeneratedCodeInfo_Annotation_end(const google_protobuf_GeneratedCodeInfo_Annotation* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(8, 8), int32_t);
-}
-
-UPB_INLINE int32_t* google_protobuf_GeneratedCodeInfo_Annotation_mutable_path(google_protobuf_GeneratedCodeInfo_Annotation* msg, size_t* len) {
-  return (int32_t*)_upb_array_mutable_accessor(msg, UPB_SIZE(12, 16), len);
-}
-UPB_INLINE int32_t* google_protobuf_GeneratedCodeInfo_Annotation_resize_path(google_protobuf_GeneratedCodeInfo_Annotation* msg, size_t len, upb_Arena* arena) {
-  return (int32_t*)_upb_Array_Resize_accessor2(msg, UPB_SIZE(12, 16), len, 2, arena);
-}
-UPB_INLINE bool google_protobuf_GeneratedCodeInfo_Annotation_add_path(google_protobuf_GeneratedCodeInfo_Annotation* msg, int32_t val, upb_Arena* arena) {
-  return _upb_Array_Append_accessor2(msg, UPB_SIZE(12, 16), 2, &val, arena);
-}
-UPB_INLINE void google_protobuf_GeneratedCodeInfo_Annotation_set_source_file(google_protobuf_GeneratedCodeInfo_Annotation *msg, upb_StringView value) {
-  _upb_sethas(msg, 1);
-  *UPB_PTR_AT(msg, UPB_SIZE(16, 24), upb_StringView) = value;
-}
-UPB_INLINE void google_protobuf_GeneratedCodeInfo_Annotation_set_begin(google_protobuf_GeneratedCodeInfo_Annotation *msg, int32_t value) {
-  _upb_sethas(msg, 2);
-  *UPB_PTR_AT(msg, UPB_SIZE(4, 4), int32_t) = value;
-}
-UPB_INLINE void google_protobuf_GeneratedCodeInfo_Annotation_set_end(google_protobuf_GeneratedCodeInfo_Annotation *msg, int32_t value) {
-  _upb_sethas(msg, 3);
-  *UPB_PTR_AT(msg, UPB_SIZE(8, 8), int32_t) = value;
-}
-
-extern const upb_MiniTable_File google_protobuf_descriptor_proto_upb_file_layout;
-
-/* Max size 32 is google.protobuf.FileOptions */
-/* Max size 64 is google.protobuf.FileOptions */
-#define _UPB_MAXOPT_SIZE UPB_SIZE(104, 192)
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-
-#endif  /* GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H_ */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef union {
-  bool bool_val;
-  float float_val;
-  double double_val;
-  int32_t int32_val;
-  int64_t int64_val;
-  uint32_t uint32_val;
-  uint64_t uint64_val;
-  const upb_Map* map_val;
-  const upb_Message* msg_val;
-  const upb_Array* array_val;
-  upb_StringView str_val;
-} upb_MessageValue;
-
-typedef union {
-  upb_Map* map;
-  upb_Message* msg;
-  upb_Array* array;
-} upb_MutableMessageValue;
-
-/** upb_Array *****************************************************************/
-
-/* Creates a new array on the given arena that holds elements of this type. */
-upb_Array* upb_Array_New(upb_Arena* a, upb_CType type);
-
-/* Returns the size of the array. */
-size_t upb_Array_Size(const upb_Array* arr);
-
-/* Returns the given element, which must be within the array's current size. */
-upb_MessageValue upb_Array_Get(const upb_Array* arr, size_t i);
-
-/* Sets the given element, which must be within the array's current size. */
-void upb_Array_Set(upb_Array* arr, size_t i, upb_MessageValue val);
-
-/* Appends an element to the array.  Returns false on allocation failure. */
-bool upb_Array_Append(upb_Array* array, upb_MessageValue val, upb_Arena* arena);
-
-/* Moves elements within the array using memmove(). Like memmove(), the source
- * and destination elements may be overlapping. */
-void upb_Array_Move(upb_Array* array, size_t dst_idx, size_t src_idx,
-                    size_t count);
-
-/* Inserts one or more empty elements into the array.  Existing elements are
- * shifted right.  The new elements have undefined state and must be set with
- * `upb_Array_Set()`.
- * REQUIRES: `i <= upb_Array_Size(arr)` */
-bool upb_Array_Insert(upb_Array* array, size_t i, size_t count,
-                      upb_Arena* arena);
-
-/* Deletes one or more elements from the array.  Existing elements are shifted
- * left.
- * REQUIRES: `i + count <= upb_Array_Size(arr)` */
-void upb_Array_Delete(upb_Array* array, size_t i, size_t count);
-
-/* Changes the size of a vector.  New elements are initialized to empty/0.
- * Returns false on allocation failure. */
-bool upb_Array_Resize(upb_Array* array, size_t size, upb_Arena* arena);
-
-/** upb_Map *******************************************************************/
-
-/* Creates a new map on the given arena with the given key/value size. */
-upb_Map* upb_Map_New(upb_Arena* a, upb_CType key_type, upb_CType value_type);
-
-/* Returns the number of entries in the map. */
-size_t upb_Map_Size(const upb_Map* map);
-
-/* Stores a value for the given key into |*val| (or the zero value if the key is
- * not present).  Returns whether the key was present.  The |val| pointer may be
- * NULL, in which case the function tests whether the given key is present.  */
-bool upb_Map_Get(const upb_Map* map, upb_MessageValue key,
-                 upb_MessageValue* val);
-
-/* Removes all entries in the map. */
-void upb_Map_Clear(upb_Map* map);
-
-typedef enum {
-  // LINT.IfChange
-  kUpb_MapInsertStatus_Inserted = 0,
-  kUpb_MapInsertStatus_Replaced = 1,
-  kUpb_MapInsertStatus_OutOfMemory = 2,
-  // LINT.ThenChange(//depot/google3/third_party/upb/upb/msg_internal.h)
-} upb_MapInsertStatus;
-
-/* Sets the given key to the given value, returning whether the key was inserted
- * or replaced.  If the key was inserted, then any existing iterators will be
- * invalidated. */
-upb_MapInsertStatus upb_Map_Insert(upb_Map* map, upb_MessageValue key,
-                                   upb_MessageValue val, upb_Arena* arena);
-
-/* Sets the given key to the given value.  Returns false if memory allocation
- * failed. If the key is newly inserted, then any existing iterators will be
- * invalidated. */
-UPB_INLINE bool upb_Map_Set(upb_Map* map, upb_MessageValue key,
-                            upb_MessageValue val, upb_Arena* arena) {
-  return upb_Map_Insert(map, key, val, arena) !=
-         kUpb_MapInsertStatus_OutOfMemory;
-}
-
-/* Deletes this key from the table.  Returns true if the key was present. */
-bool upb_Map_Delete(upb_Map* map, upb_MessageValue key);
-
-/* Map iteration:
- *
- * size_t iter = kUpb_Map_Begin;
- * while (upb_MapIterator_Next(map, &iter)) {
- *   upb_MessageValue key = upb_MapIterator_Key(map, iter);
- *   upb_MessageValue val = upb_MapIterator_Value(map, iter);
- *
- *   // If mutating is desired.
- *   upb_MapIterator_SetValue(map, iter, value2);
- * }
- */
-
-/* Advances to the next entry.  Returns false if no more entries are present. */
-bool upb_MapIterator_Next(const upb_Map* map, size_t* iter);
-
-/* Returns true if the iterator still points to a valid entry, or false if the
- * iterator is past the last element. It is an error to call this function with
- * kUpb_Map_Begin (you must call next() at least once first). */
-bool upb_MapIterator_Done(const upb_Map* map, size_t iter);
-
-/* Returns the key and value for this entry of the map. */
-upb_MessageValue upb_MapIterator_Key(const upb_Map* map, size_t iter);
-upb_MessageValue upb_MapIterator_Value(const upb_Map* map, size_t iter);
-
-/* Sets the value for this entry.  The iterator must not be done, and the
- * iterator must not have been initialized const. */
-void upb_MapIterator_SetValue(upb_Map* map, size_t iter,
-                              upb_MessageValue value);
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-
-#endif /* UPB_COLLECTIONS_H_ */
-
-/** upb/def.h ************************************************************/
-#ifndef UPB_DEF_H_
-#define UPB_DEF_H_
-
-
-/* Must be last. */
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-struct upb_EnumDef;
-typedef struct upb_EnumDef upb_EnumDef;
-struct upb_EnumValueDef;
-typedef struct upb_EnumValueDef upb_EnumValueDef;
-struct upb_ExtensionRange;
-typedef struct upb_ExtensionRange upb_ExtensionRange;
-struct upb_FieldDef;
-typedef struct upb_FieldDef upb_FieldDef;
-struct upb_FileDef;
-typedef struct upb_FileDef upb_FileDef;
-struct upb_MethodDef;
-typedef struct upb_MethodDef upb_MethodDef;
-struct upb_MessageDef;
-typedef struct upb_MessageDef upb_MessageDef;
-struct upb_OneofDef;
-typedef struct upb_OneofDef upb_OneofDef;
-struct upb_ServiceDef;
-typedef struct upb_ServiceDef upb_ServiceDef;
-struct upb_streamdef;
-typedef struct upb_streamdef upb_streamdef;
-struct upb_DefPool;
-typedef struct upb_DefPool upb_DefPool;
-typedef struct upb_EnumReservedRange upb_EnumReservedRange;
-typedef struct upb_MessageReservedRange upb_MessageReservedRange;
-typedef struct symtab_addctx symtab_addctx;
-
-typedef enum { kUpb_Syntax_Proto2 = 2, kUpb_Syntax_Proto3 = 3 } upb_Syntax;
-
-/* All the different kind of well known type messages. For simplicity of check,
- * number wrappers and string wrappers are grouped together. Make sure the
- * order and merber of these groups are not changed.
- */
-typedef enum {
-  kUpb_WellKnown_Unspecified,
-  kUpb_WellKnown_Any,
-  kUpb_WellKnown_FieldMask,
-  kUpb_WellKnown_Duration,
-  kUpb_WellKnown_Timestamp,
-  /* number wrappers */
-  kUpb_WellKnown_DoubleValue,
-  kUpb_WellKnown_FloatValue,
-  kUpb_WellKnown_Int64Value,
-  kUpb_WellKnown_UInt64Value,
-  kUpb_WellKnown_Int32Value,
-  kUpb_WellKnown_UInt32Value,
-  /* string wrappers */
-  kUpb_WellKnown_StringValue,
-  kUpb_WellKnown_BytesValue,
-  kUpb_WellKnown_BoolValue,
-  kUpb_WellKnown_Value,
-  kUpb_WellKnown_ListValue,
-  kUpb_WellKnown_Struct
-} upb_WellKnown;
-
-/* upb_FieldDef ***************************************************************/
-
-/* Maximum field number allowed for FieldDefs.  This is an inherent limit of the
- * protobuf wire format. */
-#define kUpb_MaxFieldNumber ((1 << 29) - 1)
-
-const google_protobuf_FieldOptions* upb_FieldDef_Options(const upb_FieldDef* f);
-bool upb_FieldDef_HasOptions(const upb_FieldDef* f);
-const char* upb_FieldDef_FullName(const upb_FieldDef* f);
-upb_CType upb_FieldDef_CType(const upb_FieldDef* f);
-upb_FieldType upb_FieldDef_Type(const upb_FieldDef* f);
-upb_Label upb_FieldDef_Label(const upb_FieldDef* f);
-uint32_t upb_FieldDef_Number(const upb_FieldDef* f);
-const char* upb_FieldDef_Name(const upb_FieldDef* f);
-const char* upb_FieldDef_JsonName(const upb_FieldDef* f);
-bool upb_FieldDef_HasJsonName(const upb_FieldDef* f);
-bool upb_FieldDef_IsExtension(const upb_FieldDef* f);
-bool upb_FieldDef_IsPacked(const upb_FieldDef* f);
-const upb_FileDef* upb_FieldDef_File(const upb_FieldDef* f);
-const upb_MessageDef* upb_FieldDef_ContainingType(const upb_FieldDef* f);
-const upb_MessageDef* upb_FieldDef_ExtensionScope(const upb_FieldDef* f);
-const upb_OneofDef* upb_FieldDef_ContainingOneof(const upb_FieldDef* f);
-const upb_OneofDef* upb_FieldDef_RealContainingOneof(const upb_FieldDef* f);
-uint32_t upb_FieldDef_Index(const upb_FieldDef* f);
-bool upb_FieldDef_IsSubMessage(const upb_FieldDef* f);
-bool upb_FieldDef_IsString(const upb_FieldDef* f);
-bool upb_FieldDef_IsRepeated(const upb_FieldDef* f);
-bool upb_FieldDef_IsPrimitive(const upb_FieldDef* f);
-bool upb_FieldDef_IsMap(const upb_FieldDef* f);
-bool upb_FieldDef_HasDefault(const upb_FieldDef* f);
-bool upb_FieldDef_HasSubDef(const upb_FieldDef* f);
-bool upb_FieldDef_HasPresence(const upb_FieldDef* f);
-const upb_MessageDef* upb_FieldDef_MessageSubDef(const upb_FieldDef* f);
-const upb_EnumDef* upb_FieldDef_EnumSubDef(const upb_FieldDef* f);
-const upb_MiniTable_Field* upb_FieldDef_MiniTable(const upb_FieldDef* f);
-const upb_MiniTable_Extension* _upb_FieldDef_ExtensionMiniTable(
-    const upb_FieldDef* f);
-bool _upb_FieldDef_IsProto3Optional(const upb_FieldDef* f);
-
-/* upb_OneofDef ***************************************************************/
-
-const google_protobuf_OneofOptions* upb_OneofDef_Options(const upb_OneofDef* o);
-bool upb_OneofDef_HasOptions(const upb_OneofDef* o);
-const char* upb_OneofDef_Name(const upb_OneofDef* o);
-const upb_MessageDef* upb_OneofDef_ContainingType(const upb_OneofDef* o);
-uint32_t upb_OneofDef_Index(const upb_OneofDef* o);
-bool upb_OneofDef_IsSynthetic(const upb_OneofDef* o);
-int upb_OneofDef_FieldCount(const upb_OneofDef* o);
-const upb_FieldDef* upb_OneofDef_Field(const upb_OneofDef* o, int i);
-
-/* Oneof lookups:
- * - ntof:  look up a field by name.
- * - ntofz: look up a field by name (as a null-terminated string).
- * - itof:  look up a field by number. */
-const upb_FieldDef* upb_OneofDef_LookupNameWithSize(const upb_OneofDef* o,
-                                                    const char* name,
-                                                    size_t length);
-UPB_INLINE const upb_FieldDef* upb_OneofDef_LookupName(const upb_OneofDef* o,
-                                                       const char* name) {
-  return upb_OneofDef_LookupNameWithSize(o, name, strlen(name));
-}
-const upb_FieldDef* upb_OneofDef_LookupNumber(const upb_OneofDef* o,
-                                              uint32_t num);
-
-/* upb_MessageDef *************************************************************/
-
-/* Well-known field tag numbers for map-entry messages. */
-#define kUpb_MapEntry_KeyFieldNumber 1
-#define kUpb_MapEntry_ValueFieldNumber 2
-
-/* Well-known field tag numbers for Any messages. */
-#define kUpb_Any_TypeFieldNumber 1
-#define kUpb_Any_ValueFieldNumber 2
-
-/* Well-known field tag numbers for duration messages. */
-#define kUpb_Duration_SecondsFieldNumber 1
-#define kUpb_Duration_NanosFieldNumber 2
-
-/* Well-known field tag numbers for timestamp messages. */
-#define kUpb_Timestamp_SecondsFieldNumber 1
-#define kUpb_Timestamp_NanosFieldNumber 2
-
-const google_protobuf_MessageOptions* upb_MessageDef_Options(
-    const upb_MessageDef* m);
-bool upb_MessageDef_HasOptions(const upb_MessageDef* m);
-const char* upb_MessageDef_FullName(const upb_MessageDef* m);
-const upb_FileDef* upb_MessageDef_File(const upb_MessageDef* m);
-const upb_MessageDef* upb_MessageDef_ContainingType(const upb_MessageDef* m);
-const char* upb_MessageDef_Name(const upb_MessageDef* m);
-upb_Syntax upb_MessageDef_Syntax(const upb_MessageDef* m);
-upb_WellKnown upb_MessageDef_WellKnownType(const upb_MessageDef* m);
-int upb_MessageDef_ExtensionRangeCount(const upb_MessageDef* m);
-int upb_MessageDef_FieldCount(const upb_MessageDef* m);
-int upb_MessageDef_OneofCount(const upb_MessageDef* m);
-const upb_ExtensionRange* upb_MessageDef_ExtensionRange(const upb_MessageDef* m,
-                                                        int i);
-const upb_FieldDef* upb_MessageDef_Field(const upb_MessageDef* m, int i);
-const upb_OneofDef* upb_MessageDef_Oneof(const upb_MessageDef* m, int i);
-const upb_FieldDef* upb_MessageDef_FindFieldByNumber(const upb_MessageDef* m,
-                                                     uint32_t i);
-const upb_FieldDef* upb_MessageDef_FindFieldByNameWithSize(
-    const upb_MessageDef* m, const char* name, size_t len);
-const upb_OneofDef* upb_MessageDef_FindOneofByNameWithSize(
-    const upb_MessageDef* m, const char* name, size_t len);
-const upb_MiniTable* upb_MessageDef_MiniTable(const upb_MessageDef* m);
-
-UPB_INLINE const upb_OneofDef* upb_MessageDef_FindOneofByName(
-    const upb_MessageDef* m, const char* name) {
-  return upb_MessageDef_FindOneofByNameWithSize(m, name, strlen(name));
-}
-
-UPB_INLINE const upb_FieldDef* upb_MessageDef_FindFieldByName(
-    const upb_MessageDef* m, const char* name) {
-  return upb_MessageDef_FindFieldByNameWithSize(m, name, strlen(name));
-}
-
-UPB_INLINE bool upb_MessageDef_IsMapEntry(const upb_MessageDef* m) {
-  return google_protobuf_MessageOptions_map_entry(upb_MessageDef_Options(m));
-}
-
-UPB_INLINE bool upb_MessageDef_IsMessageSet(const upb_MessageDef* m) {
-  return google_protobuf_MessageOptions_message_set_wire_format(
-      upb_MessageDef_Options(m));
-}
-
-/* Nested entities. */
-int upb_MessageDef_NestedMessageCount(const upb_MessageDef* m);
-int upb_MessageDef_NestedEnumCount(const upb_MessageDef* m);
-int upb_MessageDef_NestedExtensionCount(const upb_MessageDef* m);
-const upb_MessageDef* upb_MessageDef_NestedMessage(const upb_MessageDef* m,
-                                                   int i);
-const upb_EnumDef* upb_MessageDef_NestedEnum(const upb_MessageDef* m, int i);
-const upb_FieldDef* upb_MessageDef_NestedExtension(const upb_MessageDef* m,
-                                                   int i);
-
-/* Lookup of either field or oneof by name.  Returns whether either was found.
- * If the return is true, then the found def will be set, and the non-found
- * one set to NULL. */
-bool upb_MessageDef_FindByNameWithSize(const upb_MessageDef* m,
-                                       const char* name, size_t len,
-                                       const upb_FieldDef** f,
-                                       const upb_OneofDef** o);
-
-UPB_INLINE bool upb_MessageDef_FindByName(const upb_MessageDef* m,
-                                          const char* name,
-                                          const upb_FieldDef** f,
-                                          const upb_OneofDef** o) {
-  return upb_MessageDef_FindByNameWithSize(m, name, strlen(name), f, o);
-}
-
-/* Returns a field by either JSON name or regular proto name. */
-const upb_FieldDef* upb_MessageDef_FindByJsonNameWithSize(
-    const upb_MessageDef* m, const char* name, size_t len);
-UPB_INLINE const upb_FieldDef* upb_MessageDef_FindByJsonName(
-    const upb_MessageDef* m, const char* name) {
-  return upb_MessageDef_FindByJsonNameWithSize(m, name, strlen(name));
-}
-
-upb_StringView upb_MessageDef_ReservedName(const upb_MessageDef* m, int i);
-int upb_MessageDef_ReservedNameCount(const upb_MessageDef* m);
-
-const upb_MessageReservedRange* upb_MessageDef_ReservedRange(
-    const upb_MessageDef* m, int i);
-int upb_MessageDef_ReservedRangeCount(const upb_MessageDef* m);
-
-int32_t upb_MessageReservedRange_Start(const upb_MessageReservedRange* r);
-int32_t upb_MessageReservedRange_End(const upb_MessageReservedRange* r);
-
-/* upb_ExtensionRange *********************************************************/
-
-const google_protobuf_ExtensionRangeOptions* upb_ExtensionRange_Options(
-    const upb_ExtensionRange* r);
-bool upb_ExtensionRange_HasOptions(const upb_ExtensionRange* r);
-int32_t upb_ExtensionRange_Start(const upb_ExtensionRange* r);
-int32_t upb_ExtensionRange_End(const upb_ExtensionRange* r);
-
-/* upb_EnumDef ****************************************************************/
-
-const google_protobuf_EnumOptions* upb_EnumDef_Options(const upb_EnumDef* e);
-bool upb_EnumDef_HasOptions(const upb_EnumDef* e);
-const char* upb_EnumDef_FullName(const upb_EnumDef* e);
-const char* upb_EnumDef_Name(const upb_EnumDef* e);
-const upb_FileDef* upb_EnumDef_File(const upb_EnumDef* e);
-const upb_MessageDef* upb_EnumDef_ContainingType(const upb_EnumDef* e);
-int32_t upb_EnumDef_Default(const upb_EnumDef* e);
-int upb_EnumDef_ValueCount(const upb_EnumDef* e);
-const upb_EnumValueDef* upb_EnumDef_Value(const upb_EnumDef* e, int i);
-
-const upb_EnumValueDef* upb_EnumDef_FindValueByNameWithSize(
-    const upb_EnumDef* e, const char* name, size_t len);
-const upb_EnumValueDef* upb_EnumDef_FindValueByNumber(const upb_EnumDef* e,
-                                                      int32_t num);
-bool upb_EnumDef_CheckNumber(const upb_EnumDef* e, int32_t num);
-
-// Convenience wrapper.
-UPB_INLINE const upb_EnumValueDef* upb_EnumDef_FindValueByName(
-    const upb_EnumDef* e, const char* name) {
-  return upb_EnumDef_FindValueByNameWithSize(e, name, strlen(name));
-}
-
-upb_StringView upb_EnumDef_ReservedName(const upb_EnumDef* e, int i);
-int upb_EnumDef_ReservedNameCount(const upb_EnumDef* e);
-
-const upb_EnumReservedRange* upb_EnumDef_ReservedRange(const upb_EnumDef* e,
-                                                       int i);
-int upb_EnumDef_ReservedRangeCount(const upb_EnumDef* e);
-
-int32_t upb_EnumReservedRange_Start(const upb_EnumReservedRange* r);
-int32_t upb_EnumReservedRange_End(const upb_EnumReservedRange* r);
-
-/* upb_EnumValueDef ***********************************************************/
-
-const google_protobuf_EnumValueOptions* upb_EnumValueDef_Options(
-    const upb_EnumValueDef* e);
-bool upb_EnumValueDef_HasOptions(const upb_EnumValueDef* e);
-const char* upb_EnumValueDef_FullName(const upb_EnumValueDef* e);
-const char* upb_EnumValueDef_Name(const upb_EnumValueDef* e);
-int32_t upb_EnumValueDef_Number(const upb_EnumValueDef* e);
-uint32_t upb_EnumValueDef_Index(const upb_EnumValueDef* e);
-const upb_EnumDef* upb_EnumValueDef_Enum(const upb_EnumValueDef* e);
-
-/* upb_FileDef ****************************************************************/
-
-const google_protobuf_FileOptions* upb_FileDef_Options(const upb_FileDef* f);
-bool upb_FileDef_HasOptions(const upb_FileDef* f);
-const char* upb_FileDef_Name(const upb_FileDef* f);
-const char* upb_FileDef_Package(const upb_FileDef* f);
-upb_Syntax upb_FileDef_Syntax(const upb_FileDef* f);
-int upb_FileDef_DependencyCount(const upb_FileDef* f);
-int upb_FileDef_PublicDependencyCount(const upb_FileDef* f);
-int upb_FileDef_WeakDependencyCount(const upb_FileDef* f);
-int upb_FileDef_TopLevelMessageCount(const upb_FileDef* f);
-int upb_FileDef_TopLevelEnumCount(const upb_FileDef* f);
-int upb_FileDef_TopLevelExtensionCount(const upb_FileDef* f);
-int upb_FileDef_ServiceCount(const upb_FileDef* f);
-const upb_FileDef* upb_FileDef_Dependency(const upb_FileDef* f, int i);
-const upb_FileDef* upb_FileDef_PublicDependency(const upb_FileDef* f, int i);
-const upb_FileDef* upb_FileDef_WeakDependency(const upb_FileDef* f, int i);
-const upb_MessageDef* upb_FileDef_TopLevelMessage(const upb_FileDef* f, int i);
-const upb_EnumDef* upb_FileDef_TopLevelEnum(const upb_FileDef* f, int i);
-const upb_FieldDef* upb_FileDef_TopLevelExtension(const upb_FileDef* f, int i);
-const upb_ServiceDef* upb_FileDef_Service(const upb_FileDef* f, int i);
-const upb_DefPool* upb_FileDef_Pool(const upb_FileDef* f);
-const int32_t* _upb_FileDef_PublicDependencyIndexes(const upb_FileDef* f);
-const int32_t* _upb_FileDef_WeakDependencyIndexes(const upb_FileDef* f);
-
-/* upb_MethodDef **************************************************************/
-
-const google_protobuf_MethodOptions* upb_MethodDef_Options(
-    const upb_MethodDef* m);
-bool upb_MethodDef_HasOptions(const upb_MethodDef* m);
-const char* upb_MethodDef_FullName(const upb_MethodDef* m);
-int upb_MethodDef_Index(const upb_MethodDef* m);
-const char* upb_MethodDef_Name(const upb_MethodDef* m);
-const upb_ServiceDef* upb_MethodDef_Service(const upb_MethodDef* m);
-const upb_MessageDef* upb_MethodDef_InputType(const upb_MethodDef* m);
-const upb_MessageDef* upb_MethodDef_OutputType(const upb_MethodDef* m);
-bool upb_MethodDef_ClientStreaming(const upb_MethodDef* m);
-bool upb_MethodDef_ServerStreaming(const upb_MethodDef* m);
-
-/* upb_ServiceDef *************************************************************/
-
-const google_protobuf_ServiceOptions* upb_ServiceDef_Options(
-    const upb_ServiceDef* s);
-bool upb_ServiceDef_HasOptions(const upb_ServiceDef* s);
-const char* upb_ServiceDef_FullName(const upb_ServiceDef* s);
-const char* upb_ServiceDef_Name(const upb_ServiceDef* s);
-int upb_ServiceDef_Index(const upb_ServiceDef* s);
-const upb_FileDef* upb_ServiceDef_File(const upb_ServiceDef* s);
-int upb_ServiceDef_MethodCount(const upb_ServiceDef* s);
-const upb_MethodDef* upb_ServiceDef_Method(const upb_ServiceDef* s, int i);
-const upb_MethodDef* upb_ServiceDef_FindMethodByName(const upb_ServiceDef* s,
-                                                     const char* name);
-
-/* upb_DefPool ****************************************************************/
-
-upb_DefPool* upb_DefPool_New(void);
-void upb_DefPool_Free(upb_DefPool* s);
-const upb_MessageDef* upb_DefPool_FindMessageByName(const upb_DefPool* s,
-                                                    const char* sym);
-const upb_MessageDef* upb_DefPool_FindMessageByNameWithSize(
-    const upb_DefPool* s, const char* sym, size_t len);
-const upb_EnumDef* upb_DefPool_FindEnumByName(const upb_DefPool* s,
-                                              const char* sym);
-const upb_EnumValueDef* upb_DefPool_FindEnumByNameval(const upb_DefPool* s,
-                                                      const char* sym);
-const upb_FieldDef* upb_DefPool_FindExtensionByName(const upb_DefPool* s,
-                                                    const char* sym);
-const upb_FieldDef* upb_DefPool_FindExtensionByNameWithSize(
-    const upb_DefPool* s, const char* sym, size_t len);
-const upb_FileDef* upb_DefPool_FindFileByName(const upb_DefPool* s,
-                                              const char* name);
-const upb_ServiceDef* upb_DefPool_FindServiceByName(const upb_DefPool* s,
-                                                    const char* name);
-const upb_ServiceDef* upb_DefPool_FindServiceByNameWithSize(
-    const upb_DefPool* s, const char* name, size_t size);
-const upb_FileDef* upb_DefPool_FindFileContainingSymbol(const upb_DefPool* s,
-                                                        const char* name);
-const upb_FileDef* upb_DefPool_FindFileByNameWithSize(const upb_DefPool* s,
-                                                      const char* name,
-                                                      size_t len);
-const upb_FileDef* upb_DefPool_AddFile(
-    upb_DefPool* s, const google_protobuf_FileDescriptorProto* file,
-    upb_Status* status);
-size_t _upb_DefPool_BytesLoaded(const upb_DefPool* s);
-upb_Arena* _upb_DefPool_Arena(const upb_DefPool* s);
-const upb_FieldDef* _upb_DefPool_FindExtensionByMiniTable(
-    const upb_DefPool* s, const upb_MiniTable_Extension* ext);
-const upb_FieldDef* upb_DefPool_FindExtensionByNumber(const upb_DefPool* s,
-                                                      const upb_MessageDef* m,
-                                                      int32_t fieldnum);
-const upb_ExtensionRegistry* upb_DefPool_ExtensionRegistry(
-    const upb_DefPool* s);
-const upb_FieldDef** upb_DefPool_GetAllExtensions(const upb_DefPool* s,
-                                                  const upb_MessageDef* m,
-                                                  size_t* count);
-
-/* For generated code only: loads a generated descriptor. */
-typedef struct _upb_DefPool_Init {
-  struct _upb_DefPool_Init** deps; /* Dependencies of this file. */
-  const upb_MiniTable_File* layout;
-  const char* filename;
-  upb_StringView descriptor; /* Serialized descriptor. */
-} _upb_DefPool_Init;
-
-// Should only be directly called by tests.  This variant lets us suppress
-// the use of compiled-in tables, forcing a rebuild of the tables at runtime.
-bool _upb_DefPool_LoadDefInitEx(upb_DefPool* s, const _upb_DefPool_Init* init,
-                                bool rebuild_minitable);
-
-UPB_INLINE bool _upb_DefPool_LoadDefInit(upb_DefPool* s,
-                                         const _upb_DefPool_Init* init) {
-  return _upb_DefPool_LoadDefInitEx(s, init, false);
-}
-
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif /* __cplusplus */
-
-#endif /* UPB_DEF_H_ */
-
-/** google/protobuf/descriptor.upbdefs.h ************************************************************//* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     google/protobuf/descriptor.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#ifndef GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPBDEFS_H_
-#define GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPBDEFS_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-
-extern _upb_DefPool_Init google_protobuf_descriptor_proto_upbdefinit;
-
-UPB_INLINE const upb_MessageDef *google_protobuf_FileDescriptorSet_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &google_protobuf_descriptor_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "google.protobuf.FileDescriptorSet");
-}
-
-UPB_INLINE const upb_MessageDef *google_protobuf_FileDescriptorProto_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &google_protobuf_descriptor_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "google.protobuf.FileDescriptorProto");
-}
-
-UPB_INLINE const upb_MessageDef *google_protobuf_DescriptorProto_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &google_protobuf_descriptor_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "google.protobuf.DescriptorProto");
-}
-
-UPB_INLINE const upb_MessageDef *google_protobuf_DescriptorProto_ExtensionRange_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &google_protobuf_descriptor_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "google.protobuf.DescriptorProto.ExtensionRange");
-}
-
-UPB_INLINE const upb_MessageDef *google_protobuf_DescriptorProto_ReservedRange_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &google_protobuf_descriptor_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "google.protobuf.DescriptorProto.ReservedRange");
-}
-
-UPB_INLINE const upb_MessageDef *google_protobuf_ExtensionRangeOptions_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &google_protobuf_descriptor_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "google.protobuf.ExtensionRangeOptions");
-}
-
-UPB_INLINE const upb_MessageDef *google_protobuf_FieldDescriptorProto_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &google_protobuf_descriptor_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "google.protobuf.FieldDescriptorProto");
-}
-
-UPB_INLINE const upb_MessageDef *google_protobuf_OneofDescriptorProto_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &google_protobuf_descriptor_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "google.protobuf.OneofDescriptorProto");
-}
-
-UPB_INLINE const upb_MessageDef *google_protobuf_EnumDescriptorProto_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &google_protobuf_descriptor_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "google.protobuf.EnumDescriptorProto");
-}
-
-UPB_INLINE const upb_MessageDef *google_protobuf_EnumDescriptorProto_EnumReservedRange_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &google_protobuf_descriptor_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "google.protobuf.EnumDescriptorProto.EnumReservedRange");
-}
-
-UPB_INLINE const upb_MessageDef *google_protobuf_EnumValueDescriptorProto_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &google_protobuf_descriptor_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "google.protobuf.EnumValueDescriptorProto");
-}
-
-UPB_INLINE const upb_MessageDef *google_protobuf_ServiceDescriptorProto_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &google_protobuf_descriptor_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "google.protobuf.ServiceDescriptorProto");
-}
-
-UPB_INLINE const upb_MessageDef *google_protobuf_MethodDescriptorProto_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &google_protobuf_descriptor_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "google.protobuf.MethodDescriptorProto");
-}
-
-UPB_INLINE const upb_MessageDef *google_protobuf_FileOptions_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &google_protobuf_descriptor_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "google.protobuf.FileOptions");
-}
-
-UPB_INLINE const upb_MessageDef *google_protobuf_MessageOptions_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &google_protobuf_descriptor_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "google.protobuf.MessageOptions");
-}
-
-UPB_INLINE const upb_MessageDef *google_protobuf_FieldOptions_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &google_protobuf_descriptor_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "google.protobuf.FieldOptions");
-}
-
-UPB_INLINE const upb_MessageDef *google_protobuf_OneofOptions_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &google_protobuf_descriptor_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "google.protobuf.OneofOptions");
-}
-
-UPB_INLINE const upb_MessageDef *google_protobuf_EnumOptions_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &google_protobuf_descriptor_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "google.protobuf.EnumOptions");
-}
-
-UPB_INLINE const upb_MessageDef *google_protobuf_EnumValueOptions_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &google_protobuf_descriptor_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "google.protobuf.EnumValueOptions");
-}
-
-UPB_INLINE const upb_MessageDef *google_protobuf_ServiceOptions_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &google_protobuf_descriptor_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "google.protobuf.ServiceOptions");
-}
-
-UPB_INLINE const upb_MessageDef *google_protobuf_MethodOptions_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &google_protobuf_descriptor_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "google.protobuf.MethodOptions");
-}
-
-UPB_INLINE const upb_MessageDef *google_protobuf_UninterpretedOption_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &google_protobuf_descriptor_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "google.protobuf.UninterpretedOption");
-}
-
-UPB_INLINE const upb_MessageDef *google_protobuf_UninterpretedOption_NamePart_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &google_protobuf_descriptor_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "google.protobuf.UninterpretedOption.NamePart");
-}
-
-UPB_INLINE const upb_MessageDef *google_protobuf_SourceCodeInfo_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &google_protobuf_descriptor_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "google.protobuf.SourceCodeInfo");
-}
-
-UPB_INLINE const upb_MessageDef *google_protobuf_SourceCodeInfo_Location_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &google_protobuf_descriptor_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "google.protobuf.SourceCodeInfo.Location");
-}
-
-UPB_INLINE const upb_MessageDef *google_protobuf_GeneratedCodeInfo_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &google_protobuf_descriptor_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "google.protobuf.GeneratedCodeInfo");
-}
-
-UPB_INLINE const upb_MessageDef *google_protobuf_GeneratedCodeInfo_Annotation_getmsgdef(upb_DefPool *s) {
-  _upb_DefPool_LoadDefInit(s, &google_protobuf_descriptor_proto_upbdefinit);
-  return upb_DefPool_FindMessageByName(s, "google.protobuf.GeneratedCodeInfo.Annotation");
-}
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-
-#endif  /* GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPBDEFS_H_ */
-
-/** upb/decode_internal.h ************************************************************/
-/*
- * Internal implementation details of the decoder that are shared between
- * decode.c and decode_fast.c.
- */
-
-#ifndef UPB_DECODE_INT_H_
-#define UPB_DECODE_INT_H_
-
-#include <setjmp.h>
-
-#include "third_party/utf8_range/utf8_range.h"
-
-/** upb/upb_internal.h ************************************************************/
-#ifndef UPB_INT_H_
-#define UPB_INT_H_
-
-
-struct mem_block;
-typedef struct mem_block mem_block;
-
-struct upb_Arena {
-  _upb_ArenaHead head;
-  /* Stores cleanup metadata for this arena.
-   * - a pointer to the current cleanup counter.
-   * - a boolean indicating if there is an unowned initial block.  */
-  uintptr_t cleanup_metadata;
-
-  /* Allocator to allocate arena blocks.  We are responsible for freeing these
-   * when we are destroyed. */
-  upb_alloc* block_alloc;
-  uint32_t last_size;
-
-  /* When multiple arenas are fused together, each arena points to a parent
-   * arena (root points to itself). The root tracks how many live arenas
-   * reference it. */
-  uint32_t refcount; /* Only used when a->parent == a */
-  struct upb_Arena* parent;
-
-  /* Linked list of blocks to free/cleanup. */
-  mem_block *freelist, *freelist_tail;
-};
-
-// Encodes a float or double that is round-trippable, but as short as possible.
-// These routines are not fully optimal (not guaranteed to be shortest), but are
-// short-ish and match the implementation that has been used in protobuf since
-// the beginning.
-//
-// The given buffer size must be at least kUpb_RoundTripBufferSize.
-enum { kUpb_RoundTripBufferSize = 32 };
-void _upb_EncodeRoundTripDouble(double val, char* buf, size_t size);
-void _upb_EncodeRoundTripFloat(float val, char* buf, size_t size);
-
-#endif /* UPB_INT_H_ */
-
-/* Must be last. */
-
-#define DECODE_NOGROUP (uint32_t) - 1
-
-typedef struct upb_Decoder {
-  const char* end;          /* Can read up to 16 bytes slop beyond this. */
-  const char* limit_ptr;    /* = end + UPB_MIN(limit, 0) */
-  upb_Message* unknown_msg; /* Used for preserving unknown data. */
-  const char* unknown; /* Start of unknown data, preserve at buffer flip. */
-  const upb_ExtensionRegistry*
-      extreg;         /* For looking up extensions during the parse. */
-  int limit;          /* Submessage limit relative to end. */
-  int depth;          /* Tracks recursion depth to bound stack usage. */
-  uint32_t end_group; /* field number of END_GROUP tag, else DECODE_NOGROUP */
-  uint16_t options;
-  bool missing_required;
-  char patch[32];
-  upb_Arena arena;
-  jmp_buf err;
-
-#ifndef NDEBUG
-  const char* debug_tagstart;
-  const char* debug_valstart;
-#endif
-} upb_Decoder;
-
-/* Error function that will abort decoding with longjmp(). We can't declare this
- * UPB_NORETURN, even though it is appropriate, because if we do then compilers
- * will "helpfully" refuse to tailcall to it
- * (see: https://stackoverflow.com/a/55657013), which will defeat a major goal
- * of our optimizations. That is also why we must declare it in a separate file,
- * otherwise the compiler will see that it calls longjmp() and deduce that it is
- * noreturn. */
-const char* fastdecode_err(upb_Decoder* d, int status);
-
-extern const uint8_t upb_utf8_offsets[];
-
-UPB_INLINE
-bool decode_verifyutf8_inl(const char* ptr, int len) {
-  const char* end = ptr + len;
-
-  // Check 8 bytes at a time for any non-ASCII char.
-  while (end - ptr >= 8) {
-    uint64_t data;
-    memcpy(&data, ptr, 8);
-    if (data & 0x8080808080808080) goto non_ascii;
-    ptr += 8;
-  }
-
-  // Check one byte at a time for non-ASCII.
-  while (ptr < end) {
-    if (*ptr & 0x80) goto non_ascii;
-    ptr++;
-  }
-
-  return true;
-
-non_ascii:
-  return utf8_range2((const unsigned char*)ptr, end - ptr) == 0;
-}
-
-const char* decode_checkrequired(upb_Decoder* d, const char* ptr,
-                                 const upb_Message* msg,
-                                 const upb_MiniTable* l);
-
-/* x86-64 pointers always have the high 16 bits matching. So we can shift
- * left 8 and right 8 without loss of information. */
-UPB_INLINE intptr_t decode_totable(const upb_MiniTable* tablep) {
-  return ((intptr_t)tablep << 8) | tablep->table_mask;
-}
-
-UPB_INLINE const upb_MiniTable* decode_totablep(intptr_t table) {
-  return (const upb_MiniTable*)(table >> 8);
-}
-
-UPB_INLINE
-const char* decode_isdonefallback_inl(upb_Decoder* d, const char* ptr,
-                                      int overrun, int* status) {
-  if (overrun < d->limit) {
-    /* Need to copy remaining data into patch buffer. */
-    UPB_ASSERT(overrun < 16);
-    if (d->unknown) {
-      if (!_upb_Message_AddUnknown(d->unknown_msg, d->unknown, ptr - d->unknown,
-                                   &d->arena)) {
-        *status = kUpb_DecodeStatus_OutOfMemory;
-        return NULL;
-      }
-      d->unknown = &d->patch[0] + overrun;
-    }
-    memset(d->patch + 16, 0, 16);
-    memcpy(d->patch, d->end, 16);
-    ptr = &d->patch[0] + overrun;
-    d->end = &d->patch[16];
-    d->limit -= 16;
-    d->limit_ptr = d->end + d->limit;
-    d->options &= ~kUpb_DecodeOption_AliasString;
-    UPB_ASSERT(ptr < d->limit_ptr);
-    return ptr;
-  } else {
-    *status = kUpb_DecodeStatus_Malformed;
-    return NULL;
-  }
-}
-
-const char* decode_isdonefallback(upb_Decoder* d, const char* ptr, int overrun);
-
-UPB_INLINE
-bool decode_isdone(upb_Decoder* d, const char** ptr) {
-  int overrun = *ptr - d->end;
-  if (UPB_LIKELY(*ptr < d->limit_ptr)) {
-    return false;
-  } else if (UPB_LIKELY(overrun == d->limit)) {
-    return true;
-  } else {
-    *ptr = decode_isdonefallback(d, *ptr, overrun);
-    return false;
-  }
-}
-
-#if UPB_FASTTABLE
-UPB_INLINE
-const char* fastdecode_tagdispatch(upb_Decoder* d, const char* ptr,
-                                   upb_Message* msg, intptr_t table,
-                                   uint64_t hasbits, uint64_t tag) {
-  const upb_MiniTable* table_p = decode_totablep(table);
-  uint8_t mask = table;
-  uint64_t data;
-  size_t idx = tag & mask;
-  UPB_ASSUME((idx & 7) == 0);
-  idx >>= 3;
-  data = table_p->fasttable[idx].field_data ^ tag;
-  UPB_MUSTTAIL return table_p->fasttable[idx].field_parser(d, ptr, msg, table,
-                                                           hasbits, data);
-}
-#endif
-
-UPB_INLINE uint32_t fastdecode_loadtag(const char* ptr) {
-  uint16_t tag;
-  memcpy(&tag, ptr, 2);
-  return tag;
-}
-
-UPB_INLINE void decode_checklimit(upb_Decoder* d) {
-  UPB_ASSERT(d->limit_ptr == d->end + UPB_MIN(0, d->limit));
-}
-
-UPB_INLINE int decode_pushlimit(upb_Decoder* d, const char* ptr, int size) {
-  int limit = size + (int)(ptr - d->end);
-  int delta = d->limit - limit;
-  decode_checklimit(d);
-  d->limit = limit;
-  d->limit_ptr = d->end + UPB_MIN(0, limit);
-  decode_checklimit(d);
-  return delta;
-}
-
-UPB_INLINE void decode_poplimit(upb_Decoder* d, const char* ptr,
-                                int saved_delta) {
-  UPB_ASSERT(ptr - d->end == d->limit);
-  decode_checklimit(d);
-  d->limit += saved_delta;
-  d->limit_ptr = d->end + UPB_MIN(0, d->limit);
-  decode_checklimit(d);
-}
-
-
-#endif /* UPB_DECODE_INT_H_ */
-
-/** upb/json_decode.h ************************************************************/
-#ifndef UPB_JSONDECODE_H_
-#define UPB_JSONDECODE_H_
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-enum { upb_JsonDecode_IgnoreUnknown = 1 };
-
-bool upb_JsonDecode(const char* buf, size_t size, upb_Message* msg,
-                    const upb_MessageDef* m, const upb_DefPool* symtab,
-                    int options, upb_Arena* arena, upb_Status* status);
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#endif /* UPB_JSONDECODE_H_ */
-
-/** upb/reflection.h ************************************************************/
-#ifndef UPB_REFLECTION_H_
-#define UPB_REFLECTION_H_
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-upb_MessageValue upb_FieldDef_Default(const upb_FieldDef* f);
-
-/** upb_Message
- * *******************************************************************/
-
-/* Creates a new message of the given type in the given arena. */
-upb_Message* upb_Message_New(const upb_MessageDef* m, upb_Arena* a);
-
-/* Returns the value associated with this field. */
-upb_MessageValue upb_Message_Get(const upb_Message* msg, const upb_FieldDef* f);
-
-/* Returns a mutable pointer to a map, array, or submessage value.  If the given
- * arena is non-NULL this will construct a new object if it was not previously
- * present.  May not be called for primitive fields. */
-upb_MutableMessageValue upb_Message_Mutable(upb_Message* msg,
-                                            const upb_FieldDef* f,
-                                            upb_Arena* a);
-
-/* May only be called for fields where upb_FieldDef_HasPresence(f) == true. */
-bool upb_Message_Has(const upb_Message* msg, const upb_FieldDef* f);
-
-/* Returns the field that is set in the oneof, or NULL if none are set. */
-const upb_FieldDef* upb_Message_WhichOneof(const upb_Message* msg,
-                                           const upb_OneofDef* o);
-
-/* Sets the given field to the given value.  For a msg/array/map/string, the
- * caller must ensure that the target data outlives |msg| (by living either in
- * the same arena or a different arena that outlives it).
- *
- * Returns false if allocation fails. */
-bool upb_Message_Set(upb_Message* msg, const upb_FieldDef* f,
-                     upb_MessageValue val, upb_Arena* a);
-
-/* Clears any field presence and sets the value back to its default. */
-void upb_Message_ClearField(upb_Message* msg, const upb_FieldDef* f);
-
-/* Clear all data and unknown fields. */
-void upb_Message_Clear(upb_Message* msg, const upb_MessageDef* m);
-
-/* Iterate over present fields.
- *
- * size_t iter = kUpb_Message_Begin;
- * const upb_FieldDef *f;
- * upb_MessageValue val;
- * while (upb_Message_Next(msg, m, ext_pool, &f, &val, &iter)) {
- *   process_field(f, val);
- * }
- *
- * If ext_pool is NULL, no extensions will be returned.  If the given symtab
- * returns extensions that don't match what is in this message, those extensions
- * will be skipped.
- */
-
-#define kUpb_Message_Begin -1
-bool upb_Message_Next(const upb_Message* msg, const upb_MessageDef* m,
-                      const upb_DefPool* ext_pool, const upb_FieldDef** f,
-                      upb_MessageValue* val, size_t* iter);
-
-/* Clears all unknown field data from this message and all submessages. */
-bool upb_Message_DiscardUnknown(upb_Message* msg, const upb_MessageDef* m,
-                                int maxdepth);
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-
-#endif /* UPB_REFLECTION_H_ */
-
-/** upb/json_encode.h ************************************************************/
-#ifndef UPB_JSONENCODE_H_
-#define UPB_JSONENCODE_H_
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-enum {
-  /* When set, emits 0/default values.  TODO(haberman): proto3 only? */
-  upb_JsonEncode_EmitDefaults = 1,
-
-  /* When set, use normal (snake_caes) field names instead of JSON (camelCase)
-     names. */
-  upb_JsonEncode_UseProtoNames = 2
-};
-
-/* Encodes the given |msg| to JSON format.  The message's reflection is given in
- * |m|.  The symtab in |symtab| is used to find extensions (if NULL, extensions
- * will not be printed).
- *
- * Output is placed in the given buffer, and always NULL-terminated.  The output
- * size (excluding NULL) is returned.  This means that a return value >= |size|
- * implies that the output was truncated.  (These are the same semantics as
- * snprintf()). */
-size_t upb_JsonEncode(const upb_Message* msg, const upb_MessageDef* m,
-                      const upb_DefPool* ext_pool, int options, char* buf,
-                      size_t size, upb_Status* status);
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#endif /* UPB_JSONENCODE_H_ */
-
-/** upb/internal/vsnprintf_compat.h ************************************************************/
-#ifndef UPB_INTERNAL_VSNPRINTF_COMPAT_H_
-#define UPB_INTERNAL_VSNPRINTF_COMPAT_H_
-
-#include <stdio.h>
-
-// Must be last.
-
-UPB_INLINE int _upb_vsnprintf(char* buf, size_t size, const char* fmt,
-                              va_list ap) {
-#if defined(__MINGW64__) || defined(__MINGW32__) || defined(_MSC_VER)
-  // The msvc runtime has a non-conforming vsnprintf() that requires the
-  // following compatibility code to become conformant.
-  int n = -1;
-  if (size != 0) n = _vsnprintf_s(buf, size, _TRUNCATE, fmt, ap);
-  if (n == -1) n = _vscprintf(fmt, ap);
-  return n;
-#else
-  return vsnprintf(buf, size, fmt, ap);
-#endif
-}
-
-
-#endif  // UPB_INTERNAL_VSNPRINTF_COMPAT_H_
-
-/** upb/mini_table.h ************************************************************/
-#ifndef UPB_MINI_TABLE_H_
-#define UPB_MINI_TABLE_H_
-
-
-// Must be last.
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-const upb_MiniTable_Field* upb_MiniTable_FindFieldByNumber(
-    const upb_MiniTable* table, uint32_t number);
-
-UPB_INLINE const upb_MiniTable* upb_MiniTable_GetSubMessageTable(
-    const upb_MiniTable* mini_table, const upb_MiniTable_Field* field) {
-  return mini_table->subs[field->submsg_index].submsg;
-}
-
-UPB_INLINE bool upb_MiniTable_Enum_CheckValue(const upb_MiniTable_Enum* e,
-                                              int32_t val) {
-  uint32_t uval = (uint32_t)val;
-  if (uval < 64) return e->mask & (1ULL << uval);
-  // OPT: binary search long lists?
-  int n = e->value_count;
-  for (int i = 0; i < n; i++) {
-    if (e->values[i] == val) return true;
-  }
-  return false;
-}
-
-/** upb_MtDataEncoder *********************************************************/
-
-// Functions to encode a string in a format that can be loaded by
-// upb_MiniTable_Build().
-
-typedef enum {
-  kUpb_MessageModifier_ValidateUtf8 = 1 << 0,
-  kUpb_MessageModifier_DefaultIsPacked = 1 << 1,
-  kUpb_MessageModifier_IsExtendable = 1 << 2,
-} kUpb_MessageModifier;
-
-typedef enum {
-  kUpb_FieldModifier_IsRepeated = 1 << 0,
-  kUpb_FieldModifier_IsPacked = 1 << 1,
-  kUpb_FieldModifier_IsClosedEnum = 1 << 2,
-  kUpb_FieldModifier_IsProto3Singular = 1 << 3,
-  kUpb_FieldModifier_IsRequired = 1 << 4,
-} kUpb_FieldModifier;
-
-typedef struct {
-  char* end;  // Limit of the buffer passed as a parameter.
-  // Aliased to internal-only members in .cc.
-  char internal[32];
-} upb_MtDataEncoder;
-
-// If the input buffer has at least this many bytes available, the encoder call
-// is guaranteed to succeed (as long as field number order is maintained).
-#define kUpb_MtDataEncoder_MinSize 16
-
-// Encodes field/oneof information for a given message.  The sequence of calls
-// should look like:
-//
-//   upb_MtDataEncoder e;
-//   char buf[256];
-//   char* ptr = buf;
-//   e.end = ptr + sizeof(buf);
-//   ptr = upb_MtDataEncoder_StartMessage(&e, ptr);
-//   // Fields *must* be in field number order.
-//   ptr = upb_MtDataEncoder_PutField(&e, ptr, ...);
-//   ptr = upb_MtDataEncoder_PutField(&e, ptr, ...);
-//   ptr = upb_MtDataEncoder_PutField(&e, ptr, ...);
-//
-//   // If oneofs are present.  Oneofs must be encoded after regular fields.
-//   ptr = upb_MiniTable_StartOneof(&e, ptr)
-//   ptr = upb_MiniTable_PutOneofField(&e, ptr, ...);
-//   ptr = upb_MiniTable_PutOneofField(&e, ptr, ...);
-//
-//   ptr = upb_MiniTable_StartOneof(&e, ptr);
-//   ptr = upb_MiniTable_PutOneofField(&e, ptr, ...);
-//   ptr = upb_MiniTable_PutOneofField(&e, ptr, ...);
-//
-// Oneofs must be encoded after all regular fields.
-char* upb_MtDataEncoder_StartMessage(upb_MtDataEncoder* e, char* ptr,
-                                     uint64_t msg_mod);
-char* upb_MtDataEncoder_PutField(upb_MtDataEncoder* e, char* ptr,
-                                 upb_FieldType type, uint32_t field_num,
-                                 uint64_t field_mod);
-char* upb_MtDataEncoder_StartOneof(upb_MtDataEncoder* e, char* ptr);
-char* upb_MtDataEncoder_PutOneofField(upb_MtDataEncoder* e, char* ptr,
-                                      uint32_t field_num);
-
-// Encodes the set of values for a given enum.  The values must be given in
-// order (after casting to uint32_t), and repeats are not allowed.
-void upb_MtDataEncoder_StartEnum(upb_MtDataEncoder* e);
-char* upb_MtDataEncoder_PutEnumValue(upb_MtDataEncoder* e, char* ptr,
-                                     uint32_t val);
-char* upb_MtDataEncoder_EndEnum(upb_MtDataEncoder* e, char* ptr);
-
-/** upb_MiniTable *************************************************************/
-
-typedef enum {
-  kUpb_MiniTablePlatform_32Bit,
-  kUpb_MiniTablePlatform_64Bit,
-  kUpb_MiniTablePlatform_Native =
-      UPB_SIZE(kUpb_MiniTablePlatform_32Bit, kUpb_MiniTablePlatform_64Bit),
-} upb_MiniTablePlatform;
-
-// Builds a mini table from the data encoded in the buffer [data, len]. If any
-// errors occur, returns NULL and sets a status message. In the success case,
-// the caller must call upb_MiniTable_SetSub*() for all message or proto2 enum
-// fields to link the table to the appropriate sub-tables.
-upb_MiniTable* upb_MiniTable_Build(const char* data, size_t len,
-                                   upb_MiniTablePlatform platform,
-                                   upb_Arena* arena, upb_Status* status);
-void upb_MiniTable_SetSubMessage(upb_MiniTable* table,
-                                 upb_MiniTable_Field* field,
-                                 const upb_MiniTable* sub);
-void upb_MiniTable_SetSubEnum(upb_MiniTable* table, upb_MiniTable_Field* field,
-                              const upb_MiniTable_Enum* sub);
-
-bool upb_MiniTable_BuildExtension(const char* data, size_t len,
-                                  upb_MiniTable_Extension* ext,
-                                  upb_MiniTable_Sub sub, upb_Status* status);
-
-// Special-case functions for MessageSet layout and map entries.
-upb_MiniTable* upb_MiniTable_BuildMessageSet(upb_MiniTablePlatform platform,
-                                             upb_Arena* arena);
-upb_MiniTable* upb_MiniTable_BuildMapEntry(upb_FieldType key_type,
-                                           upb_FieldType value_type,
-                                           bool value_is_proto3_enum,
-                                           upb_MiniTablePlatform platform,
-                                           upb_Arena* arena);
-
-upb_MiniTable_Enum* upb_MiniTable_BuildEnum(const char* data, size_t len,
-                                            upb_Arena* arena,
-                                            upb_Status* status);
-
-// Like upb_MiniTable_Build(), but the user provides a buffer of layout data so
-// it can be reused from call to call, avoiding repeated realloc()/free().
-//
-// The caller owns `*buf` both before and after the call, and must free() it
-// when it is no longer in use.  The function will realloc() `*buf` as
-// necessary, updating `*size` accordingly.
-upb_MiniTable* upb_MiniTable_BuildWithBuf(const char* data, size_t len,
-                                          upb_MiniTablePlatform platform,
-                                          upb_Arena* arena, void** buf,
-                                          size_t* buf_size, upb_Status* status);
-
-// For testing only.
-char upb_ToBase92(int8_t ch);
-char upb_FromBase92(uint8_t ch);
-bool upb_IsTypePackable(upb_FieldType type);
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-
-#endif /* UPB_MINI_TABLE_H_ */
-
-/** upb/port_undef.inc ************************************************************/
-/* See port_def.inc.  This should #undef all macros #defined there. */
-
-#undef UPB_SIZE
-#undef UPB_PTR_AT
-#undef UPB_READ_ONEOF
-#undef UPB_WRITE_ONEOF
-#undef UPB_MAPTYPE_STRING
-#undef UPB_INLINE
-#undef UPB_ALIGN_UP
-#undef UPB_ALIGN_DOWN
-#undef UPB_ALIGN_MALLOC
-#undef UPB_ALIGN_OF
-#undef UPB_MALLOC_ALIGN
-#undef UPB_LIKELY
-#undef UPB_UNLIKELY
-#undef UPB_FORCEINLINE
-#undef UPB_NOINLINE
-#undef UPB_NORETURN
-#undef UPB_PRINTF
-#undef UPB_MAX
-#undef UPB_MIN
-#undef UPB_UNUSED
-#undef UPB_ASSUME
-#undef UPB_ASSERT
-#undef UPB_UNREACHABLE
-#undef UPB_SETJMP
-#undef UPB_LONGJMP
-#undef UPB_PTRADD
-#undef UPB_MUSTTAIL
-#undef UPB_FASTTABLE_SUPPORTED
-#undef UPB_FASTTABLE
-#undef UPB_FASTTABLE_INIT
-#undef UPB_POISON_MEMORY_REGION
-#undef UPB_UNPOISON_MEMORY_REGION
-#undef UPB_ASAN
-#undef UPB_TREAT_PROTO2_ENUMS_LIKE_PROTO3
diff --git a/libs/protobuf/php/ext/google/protobuf/php_protobuf.h b/libs/protobuf/php/ext/google/protobuf/php_protobuf.h
deleted file mode 100644
index 59a6610..0000000
--- a/libs/protobuf/php/ext/google/protobuf/php_protobuf.h
+++ /dev/null
@@ -1,45 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2022 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-// ! THIS FILE ONLY APPROACHING IN-TREE PHP EXTENSION BUILD !
-// ! DOES NOT USE NORMALLY.                                 !
-// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#ifndef PHP_PROTOBUF_H
-# define PHP_PROTOBUF_H
-
-# ifdef HAVE_CONFIG_H
-#  include "config.h"
-# endif
-
-extern zend_module_entry protobuf_module_entry;
-# define phpext_protobuf_ptr &protobuf_module_entry
-
-#endif	/* PHP_PROTOBUF_H */
diff --git a/libs/protobuf/php/ext/google/protobuf/protobuf.c b/libs/protobuf/php/ext/google/protobuf/protobuf.c
deleted file mode 100644
index a5aba23..0000000
--- a/libs/protobuf/php/ext/google/protobuf/protobuf.c
+++ /dev/null
@@ -1,357 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include "protobuf.h"
-
-#include <php.h>
-#include <Zend/zend_interfaces.h>
-
-#include "arena.h"
-#include "array.h"
-#include "convert.h"
-#include "def.h"
-#include "map.h"
-#include "message.h"
-#include "names.h"
-
-// -----------------------------------------------------------------------------
-// Module "globals"
-// -----------------------------------------------------------------------------
-
-// Despite the name, module "globals" are really thread-locals:
-//  * PROTOBUF_G(var) accesses the thread-local variable for 'var'. Either:
-//    * PROTOBUF_G(var) -> protobuf_globals.var (Non-ZTS / non-thread-safe)
-//    * PROTOBUF_G(var) -> <Zend magic>         (ZTS / thread-safe builds)
-
-#define PROTOBUF_G(v) ZEND_MODULE_GLOBALS_ACCESSOR(protobuf, v)
-
-ZEND_BEGIN_MODULE_GLOBALS(protobuf)
-  // Set by the user to make the descriptor pool persist between requests.
-  zend_bool keep_descriptor_pool_after_request;
-
-  // Set by the user to make the descriptor pool persist between requests.
-  zend_class_entry* constructing_class;
-
-  // A upb_DefPool that we are saving for the next request so that we don't have
-  // to rebuild it from scratch. When keep_descriptor_pool_after_request==true,
-  // we steal the upb_DefPool from the global DescriptorPool object just before
-  // destroying it.
-  upb_DefPool *global_symtab;
-
-  // Object cache (see interface in protobuf.h).
-  HashTable object_cache;
-
-  // Name cache (see interface in protobuf.h).
-  HashTable name_msg_cache;
-  HashTable name_enum_cache;
-
-  // An array of descriptor objects constructed during this request. These are
-  // logically referenced by the corresponding class entry, but since we can't
-  // actually write a class entry destructor, we reference them here, to be
-  // destroyed on request shutdown.
-  HashTable descriptors;
-ZEND_END_MODULE_GLOBALS(protobuf)
-
-void free_protobuf_globals(zend_protobuf_globals *globals) {
-  zend_hash_destroy(&globals->name_msg_cache);
-  zend_hash_destroy(&globals->name_enum_cache);
-  upb_DefPool_Free(globals->global_symtab);
-  globals->global_symtab = NULL;
-}
-
-ZEND_DECLARE_MODULE_GLOBALS(protobuf)
-
-upb_DefPool *get_global_symtab() {
-  return PROTOBUF_G(global_symtab);
-}
-
-// This is a PHP extension (not a Zend extension). What follows is a summary of
-// a PHP extension's lifetime and when various handlers are called.
-//
-//  * PHP_GINIT_FUNCTION(protobuf) / PHP_GSHUTDOWN_FUNCTION(protobuf)
-//    are the constructor/destructor for the globals. The sequence over the
-//    course of a process lifetime is:
-//
-//    # Process startup
-//    GINIT(<Main Thread Globals>)
-//    MINIT
-//
-//    foreach request:
-//      RINIT
-//        # Request is processed here.
-//      RSHUTDOWN
-//
-//    foreach thread:
-//      GINIT(<This Thread Globals>)
-//        # Code for the thread runs here.
-//      GSHUTDOWN(<This Thread Globals>)
-//
-//    # Process Shutdown
-//    #
-//    # These should be running per the docs, but I have not been able to
-//    # actually get the process-wide shutdown functions to run.
-//    #
-//    # MSHUTDOWN
-//    # GSHUTDOWN(<Main Thread Globals>)
-//
-//  * Threads can be created either explicitly by the user, inside a request,
-//    or implicitly by the runtime, to process multiple requests concurrently.
-//    If the latter is being used, then the "foreach thread" block above
-//    actually looks like this:
-//
-//    foreach thread:
-//      GINIT(<This Thread Globals>)
-//      # A non-main thread will only receive requests when using a threaded
-//      # MPM with Apache
-//      foreach request:
-//        RINIT
-//          # Request is processed here.
-//        RSHUTDOWN
-//      GSHUTDOWN(<This Thread Globals>)
-//
-// That said, it appears that few people use threads with PHP:
-//   * The pthread package documented at
-//     https://www.php.net/manual/en/class.thread.php nas not been released
-//     since 2016, and the current release fails to compile against any PHP
-//     newer than 7.0.33.
-//     * The GitHub master branch supports 7.2+, but this has not been released
-//       to PECL.
-//     * Its owner has disavowed it as "broken by design" and "in an untenable
-//       position for the future": https://github.com/krakjoe/pthreads/issues/929
-//   * The only way to use PHP with requests in different threads is to use the
-//     Apache 2 mod_php with the "worker" MPM. But this is explicitly
-//     discouraged by the documentation: https://serverfault.com/a/231660
-
-static PHP_GSHUTDOWN_FUNCTION(protobuf) {
-  if (protobuf_globals->global_symtab) {
-    free_protobuf_globals(protobuf_globals);
-  }
-}
-
-static PHP_GINIT_FUNCTION(protobuf) {
-  protobuf_globals->global_symtab = NULL;
-}
-
-/**
- * PHP_RINIT_FUNCTION(protobuf)
- *
- * This function is run at the beginning of processing each request.
- */
-static PHP_RINIT_FUNCTION(protobuf) {
-  // Create the global generated pool.
-  // Reuse the symtab (if any) left to us by the last request.
-  upb_DefPool *symtab = PROTOBUF_G(global_symtab);
-  if (!symtab) {
-    PROTOBUF_G(global_symtab) = symtab = upb_DefPool_New();
-    zend_hash_init(&PROTOBUF_G(name_msg_cache), 64, NULL, NULL, 0);
-    zend_hash_init(&PROTOBUF_G(name_enum_cache), 64, NULL, NULL, 0);
-  }
-
-  zend_hash_init(&PROTOBUF_G(object_cache), 64, NULL, NULL, 0);
-  zend_hash_init(&PROTOBUF_G(descriptors), 64, NULL, ZVAL_PTR_DTOR, 0);
-  PROTOBUF_G(constructing_class) = NULL;
-
-  return SUCCESS;
-}
-
-/**
- * PHP_RSHUTDOWN_FUNCTION(protobuf)
- *
- * This function is run at the end of processing each request.
- */
-static PHP_RSHUTDOWN_FUNCTION(protobuf) {
-  // Preserve the symtab if requested.
-  if (!PROTOBUF_G(keep_descriptor_pool_after_request)) {
-    free_protobuf_globals(ZEND_MODULE_GLOBALS_BULK(protobuf));
-  }
-
-  zend_hash_destroy(&PROTOBUF_G(object_cache));
-  zend_hash_destroy(&PROTOBUF_G(descriptors));
-
-  return SUCCESS;
-}
-
-// -----------------------------------------------------------------------------
-// Object Cache.
-// -----------------------------------------------------------------------------
-
-void Descriptors_Add(zend_object *desc) {
-  // The hash table will own a ref (it will destroy it when the table is
-  // destroyed), but for some reason the insert operation does not add a ref, so
-  // we do that here with ZVAL_OBJ_COPY().
-  zval zv;
-  ZVAL_OBJ_COPY(&zv, desc);
-  zend_hash_next_index_insert(&PROTOBUF_G(descriptors), &zv);
-}
-
-void ObjCache_Add(const void *upb_obj, zend_object *php_obj) {
-  zend_ulong k = (zend_ulong)upb_obj;
-  zend_hash_index_add_ptr(&PROTOBUF_G(object_cache), k, php_obj);
-}
-
-void ObjCache_Delete(const void *upb_obj) {
-  if (upb_obj) {
-    zend_ulong k = (zend_ulong)upb_obj;
-    int ret = zend_hash_index_del(&PROTOBUF_G(object_cache), k);
-    PBPHP_ASSERT(ret == SUCCESS);
-  }
-}
-
-bool ObjCache_Get(const void *upb_obj, zval *val) {
-  zend_ulong k = (zend_ulong)upb_obj;
-  zend_object *obj = zend_hash_index_find_ptr(&PROTOBUF_G(object_cache), k);
-
-  if (obj) {
-    ZVAL_OBJ_COPY(val, obj);
-    return true;
-  } else {
-    ZVAL_NULL(val);
-    return false;
-  }
-}
-
-// -----------------------------------------------------------------------------
-// Name Cache.
-// -----------------------------------------------------------------------------
-
-void NameMap_AddMessage(const upb_MessageDef *m) {
-  for (int i = 0; i < 2; ++i) {
-    char *k = GetPhpClassname(upb_MessageDef_File(m), upb_MessageDef_FullName(m), (bool)i);
-    zend_hash_str_add_ptr(&PROTOBUF_G(name_msg_cache), k, strlen(k), (void*)m);
-    if (!IsPreviouslyUnreservedClassName(k)) {
-      free(k);
-      return;
-    }
-    free(k);
-  }
-}
-
-void NameMap_AddEnum(const upb_EnumDef *e) {
-  char *k = GetPhpClassname(upb_EnumDef_File(e), upb_EnumDef_FullName(e), false);
-  zend_hash_str_add_ptr(&PROTOBUF_G(name_enum_cache), k, strlen(k), (void*)e);
-  free(k);
-}
-
-const upb_MessageDef *NameMap_GetMessage(zend_class_entry *ce) {
-  const upb_MessageDef *ret =
-      zend_hash_find_ptr(&PROTOBUF_G(name_msg_cache), ce->name);
-
-  if (!ret && ce->create_object && ce != PROTOBUF_G(constructing_class)) {
-#if PHP_VERSION_ID < 80000
-    zval tmp;
-    zval zv;
-    ZVAL_OBJ(&tmp, ce->create_object(ce));
-    zend_call_method_with_0_params(&tmp, ce, NULL, "__construct", &zv);
-    zval_ptr_dtor(&tmp);
-#else
-    zval zv;
-    zend_object *tmp = ce->create_object(ce);
-    zend_call_method_with_0_params(tmp, ce, NULL, "__construct", &zv);
-    OBJ_RELEASE(tmp);
-#endif
-    zval_ptr_dtor(&zv);
-    ret = zend_hash_find_ptr(&PROTOBUF_G(name_msg_cache), ce->name);
-  }
-
-  return ret;
-}
-
-const upb_EnumDef *NameMap_GetEnum(zend_class_entry *ce) {
-  const upb_EnumDef *ret =
-      zend_hash_find_ptr(&PROTOBUF_G(name_enum_cache), ce->name);
-  return ret;
-}
-
-void NameMap_EnterConstructor(zend_class_entry* ce) {
-  assert(!PROTOBUF_G(constructing_class));
-  PROTOBUF_G(constructing_class) = ce;
-}
-
-void NameMap_ExitConstructor(zend_class_entry* ce) {
-  assert(PROTOBUF_G(constructing_class) == ce);
-  PROTOBUF_G(constructing_class) = NULL;
-}
-
-// -----------------------------------------------------------------------------
-// Module init.
-// -----------------------------------------------------------------------------
-
-zend_function_entry protobuf_functions[] = {
-  ZEND_FE_END
-};
-
-static const zend_module_dep protobuf_deps[] = {
-  ZEND_MOD_OPTIONAL("date")
-  ZEND_MOD_END
-};
-
-PHP_INI_BEGIN()
-STD_PHP_INI_ENTRY("protobuf.keep_descriptor_pool_after_request", "0",
-                  PHP_INI_ALL, OnUpdateBool,
-                  keep_descriptor_pool_after_request, zend_protobuf_globals,
-                  protobuf_globals)
-PHP_INI_END()
-
-static PHP_MINIT_FUNCTION(protobuf) {
-  REGISTER_INI_ENTRIES();
-  Arena_ModuleInit();
-  Array_ModuleInit();
-  Convert_ModuleInit();
-  Def_ModuleInit();
-  Map_ModuleInit();
-  Message_ModuleInit();
-  return SUCCESS;
-}
-
-static PHP_MSHUTDOWN_FUNCTION(protobuf) {
-  UNREGISTER_INI_ENTRIES();
-  return SUCCESS;
-}
-
-zend_module_entry protobuf_module_entry = {
-  STANDARD_MODULE_HEADER_EX,
-  NULL,
-  protobuf_deps,
-  "protobuf",               // extension name
-  protobuf_functions,       // function list
-  PHP_MINIT(protobuf),      // process startup
-  PHP_MSHUTDOWN(protobuf),  // process shutdown
-  PHP_RINIT(protobuf),      // request shutdown
-  PHP_RSHUTDOWN(protobuf),  // request shutdown
-  NULL,                     // extension info
-  PHP_PROTOBUF_VERSION,     // extension version
-  PHP_MODULE_GLOBALS(protobuf),  // globals descriptor
-  PHP_GINIT(protobuf),      // globals ctor
-  PHP_GSHUTDOWN(protobuf),  // globals dtor
-  NULL,                     // post deactivate
-  STANDARD_MODULE_PROPERTIES_EX
-};
-
-ZEND_GET_MODULE(protobuf)
diff --git a/libs/protobuf/php/ext/google/protobuf/protobuf.h b/libs/protobuf/php/ext/google/protobuf/protobuf.h
deleted file mode 100644
index efbd45e..0000000
--- a/libs/protobuf/php/ext/google/protobuf/protobuf.h
+++ /dev/null
@@ -1,182 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef PHP_PROTOBUF_H_
-#define PHP_PROTOBUF_H_
-
-#include <php.h>
-#include <stdbool.h>
-
-#include "php-upb.h"
-
-upb_DefPool *get_global_symtab();
-
-#if PHP_VERSION_ID < 70300
-#define GC_ADDREF(h) ++GC_REFCOUNT(h)
-#define GC_DELREF(h) --GC_REFCOUNT(h)
-#endif
-
-// Since php 7.4, the write_property() object handler now returns the assigned
-// value (after possible type coercions) rather than void.
-// https://github.com/php/php-src/blob/PHP-7.4.0/UPGRADING.INTERNALS#L171-L173
-#if PHP_VERSION_ID < 70400
-#define PROTO_RETURN_VAL void
-#else
-#define PROTO_RETURN_VAL zval*
-#endif
-
-// Since php 8.0, the Object Handlers API was changed to receive zend_object*
-// instead of zval* and zend_string* instead of zval* for property names.
-// https://github.com/php/php-src/blob/php-8.0.0beta1/UPGRADING.INTERNALS#L37-L39
-#if PHP_VERSION_ID < 80000
-#define PROTO_VAL zval
-#define PROTO_STR zval
-#define PROTO_VAL_P(obj) (void*)Z_OBJ_P(obj)
-#define PROTO_STRVAL_P(obj) Z_STRVAL_P(obj)
-#define PROTO_STRLEN_P(obj) Z_STRLEN_P(obj)
-#define ZVAL_OBJ_COPY(z, o) do { ZVAL_OBJ(z, o); GC_ADDREF(o); } while (0)
-#define RETVAL_OBJ_COPY(r) ZVAL_OBJ_COPY(return_value, r)
-#define RETURN_OBJ_COPY(r) do { RETVAL_OBJ_COPY(r); return; } while (0)
-#define RETURN_COPY(zv) do { ZVAL_COPY(return_value, zv); return; } while (0)
-#define RETURN_COPY_VALUE(zv) do { ZVAL_COPY_VALUE(return_value, zv); return; } while (0)
-#else
-#define PROTO_VAL zend_object
-#define PROTO_STR zend_string
-#define PROTO_VAL_P(obj) (void*)(obj)
-#define PROTO_STRVAL_P(obj) ZSTR_VAL(obj)
-#define PROTO_STRLEN_P(obj) ZSTR_LEN(obj)
-#endif
-
-// In PHP 8.1, several old interfaces are removed:
-// https://github.com/php/php-src/blob/14f599ea7def7c7a59c40aff763ce8b105573e7a/UPGRADING.INTERNALS#L27-L31
-//
-// We now use the new interfaces (zend_ce_arrayaccess and zend_ce_countable).
-// However we have to polyfill zend_ce_countable, which was only introduced in
-// PHP 7.2.0.
-#if PHP_VERSION_ID < 70200
-#define zend_ce_countable spl_ce_Countable
-#define ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(name, return_reference, required_num_args, class_name, allow_null) \
-        ZEND_BEGIN_ARG_INFO_EX(name, return_reference, required_num_args, allow_null)
-#endif
-
-// polyfill for ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX, which changes between 7.1 and 7.2
-#if PHP_VERSION_ID < 70200
-#define PROTOBUF_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(name, return_reference, required_num_args, type, allow_null) \
-        ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(name, return_reference, required_num_args, type, /*class_name*/ 0, allow_null)
-#else
-#define PROTOBUF_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(name, return_reference, required_num_args, type, allow_null) \
-        ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(name, return_reference, required_num_args, type, allow_null)
-#endif
-
-// In PHP 8.1, mismatched tentative return types emit a deprecation notice.
-// https://wiki.php.net/rfc/internal_method_return_types
-//
-// When compiling for earlier php versions, the return type is dropped.
-#if PHP_VERSION_ID < 80100
-#define ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(name, return_reference, required_num_args, type, allow_null) \
-        ZEND_BEGIN_ARG_INFO_EX(name, return_reference, required_num_args, allow_null)
-#endif
-
-#ifndef IS_VOID
-#define IS_VOID 99
-#endif
-
-#ifndef IS_MIXED
-#define IS_MIXED 99
-#endif
-
-#ifndef _IS_BOOL
-#define _IS_BOOL 99
-#endif
-
-#ifndef IS_LONG
-#define IS_LONG 99
-#endif
-
-ZEND_BEGIN_ARG_INFO(arginfo_void, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_setter, 0, 0, 1)
-  ZEND_ARG_INFO(0, value)
-ZEND_END_ARG_INFO()
-
-#define PHP_PROTOBUF_VERSION "3.21.12"
-
-// ptr -> PHP object cache. This is a weak map that caches lazily-created
-// wrapper objects around upb types:
-//  * upb_Message* -> Message
-//  * upb_Array* -> RepeatedField
-//  * upb_Map*, -> MapField
-//  * upb_MessageDef* -> Descriptor
-//  * upb_EnumDef* -> EnumDescriptor
-//  * upb_MessageDef* -> Descriptor
-//
-// Each wrapped object should add itself to the map when it is constructed, and
-// remove itself from the map when it is destroyed. This is how we ensure that
-// the map only contains live objects. The map is weak so it does not actually
-// take references to the cached objects.
-void ObjCache_Add(const void *key, zend_object *php_obj);
-void ObjCache_Delete(const void *key);
-bool ObjCache_Get(const void *key, zval *val);
-
-// PHP class name map. This is necessary because the pb_name->php_class_name
-// transformation is non-reversible, so when we need to look up a msgdef or
-// enumdef by PHP class, we can't turn the class name into a pb_name.
-//  * php_class_name -> upb_MessageDef*
-//  * php_class_name -> upb_EnumDef*
-void NameMap_AddMessage(const upb_MessageDef *m);
-void NameMap_AddEnum(const upb_EnumDef *m);
-const upb_MessageDef *NameMap_GetMessage(zend_class_entry *ce);
-const upb_EnumDef *NameMap_GetEnum(zend_class_entry *ce);
-void NameMap_EnterConstructor(zend_class_entry* ce);
-void NameMap_ExitConstructor(zend_class_entry* ce);
-
-// Add this descriptor object to the global list of descriptors that will be
-// kept alive for the duration of the request but destroyed when the request
-// is ending.
-void Descriptors_Add(zend_object *desc);
-
-// We need our own assert() because PHP takes control of NDEBUG in its headers.
-#ifdef PBPHP_ENABLE_ASSERTS
-#define PBPHP_ASSERT(x)                                                    \
-  do {                                                                     \
-    if (!(x)) {                                                            \
-      fprintf(stderr, "Assertion failure at %s:%d %s", __FILE__, __LINE__, \
-              #x);                                                         \
-      abort();                                                             \
-    }                                                                      \
-  } while (false)
-#else
-#define PBPHP_ASSERT(x) \
-  do {                  \
-  } while (false && (x))
-#endif
-
-#endif  // PHP_PROTOBUF_H_
diff --git a/libs/protobuf/php/ext/google/protobuf/template_package.xml b/libs/protobuf/php/ext/google/protobuf/template_package.xml
deleted file mode 100644
index c6d2619..0000000
--- a/libs/protobuf/php/ext/google/protobuf/template_package.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<package xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" packagerversion="1.9.5" version="2.0" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0 http://pear.php.net/dtd/tasks-1.0.xsd http://pear.php.net/dtd/package-2.0 http://pear.php.net/dtd/package-2.0.xsd">
- <name>protobuf</name>
- <channel>pecl.php.net</channel>
- <summary>Google's language-neutral, platform-neutral, extensible mechanism for serializing structured data.</summary>
- <description>https://developers.google.com/protocol-buffers/</description>
- <lead>
-  <name>Protobuf Team</name>
-  <user>protobufpackages</user>
-  <email>protobuf-packages@google.com</email>
-  <active>yes</active>
- </lead>
- <date>TEMPLATE_DATE</date>
- <time>TEMPLATE_TIME</time>
- <version>
-  <release>TEMPLATE_PHP_RELEASE</release>
-  <api>TEMPLATE_PHP_API</api>
- </version>
- <stability>
-  <release>TEMPLATE_PHP_STABILITY</release>
-  <api>TEMPLATE_PHP_STABILITY</api>
- </stability>
- <license uri="https://opensource.org/licenses/BSD-3-Clause">BSD-3-Clause</license>
- <notes>
- * See github.com/protocolbuffers/protobuf/releases for release notes.
- </notes>
- <contents>
-  <dir baseinstalldir="/" name="/">TEMPLATE_FILES</dir>
- </contents>
- <dependencies>
-  <required>
-   <php>
-    <min>7.0.0</min>
-   </php>
-   <pearinstaller>
-    <min>1.4.0</min>
-   </pearinstaller>
-  </required>
- </dependencies>
- <providesextension>protobuf</providesextension>
- <extsrcrelease/>
-</package>
\ No newline at end of file
diff --git a/libs/protobuf/php/ext/google/protobuf/tests/unnecessary_zval.phpt b/libs/protobuf/php/ext/google/protobuf/tests/unnecessary_zval.phpt
deleted file mode 100644
index 9a169ab..0000000
--- a/libs/protobuf/php/ext/google/protobuf/tests/unnecessary_zval.phpt
+++ /dev/null
@@ -1,9 +0,0 @@
---TEST--
-unnecessary zval
---FILE--
-<?php
-var_dump(new \stdClass());
-?>
---EXPECT--
-object(stdClass)#1 (0) {
-}
diff --git a/libs/protobuf/php/ext/google/protobuf/wkt.inc b/libs/protobuf/php/ext/google/protobuf/wkt.inc
deleted file mode 100644
index 4579c7e..0000000
--- a/libs/protobuf/php/ext/google/protobuf/wkt.inc
+++ /dev/null
@@ -1,3250 +0,0 @@
-// This file is generated from the .proto files for the well-known
-// types. Do not edit!
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_lookup, 0, 0, 1)
-  ZEND_ARG_INFO(0, key)
-ZEND_END_ARG_INFO()
-
-static void google_protobuf_any_proto_AddDescriptor();
-static void google_protobuf_api_proto_AddDescriptor();
-static void google_protobuf_duration_proto_AddDescriptor();
-static void google_protobuf_empty_proto_AddDescriptor();
-static void google_protobuf_field_mask_proto_AddDescriptor();
-static void google_protobuf_source_context_proto_AddDescriptor();
-static void google_protobuf_struct_proto_AddDescriptor();
-static void google_protobuf_type_proto_AddDescriptor();
-static void google_protobuf_timestamp_proto_AddDescriptor();
-static void google_protobuf_wrappers_proto_AddDescriptor();
-/* google/protobuf/any.proto */
-
-zend_class_entry* GPBMetadata_Google_Protobuf_Any_ce;
-
-const char google_protobuf_any_proto_descriptor [212] = {
-'\n', '\031', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'a', 'n', 'y', '.', 'p', 'r', 'o', 
-'t', 'o', '\022', '\017', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '\"', '&', '\n', '\003', 'A', 'n', 
-'y', '\022', '\020', '\n', '\010', 't', 'y', 'p', 'e', '_', 'u', 'r', 'l', '\030', '\001', ' ', '\001', '(', '\t', '\022', '\r', '\n', '\005', 'v', 'a', 
-'l', 'u', 'e', '\030', '\002', ' ', '\001', '(', '\014', 'B', 'v', '\n', '\023', 'c', 'o', 'm', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 
-'r', 'o', 't', 'o', 'b', 'u', 'f', 'B', '\010', 'A', 'n', 'y', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', ',', 'g', 'o', 'o', 'g', 
-'l', 'e', '.', 'g', 'o', 'l', 'a', 'n', 'g', '.', 'o', 'r', 'g', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 't', 'y', 
-'p', 'e', 's', '/', 'k', 'n', 'o', 'w', 'n', '/', 'a', 'n', 'y', 'p', 'b', '\242', '\002', '\003', 'G', 'P', 'B', '\252', '\002', '\036', 'G', 
-'o', 'o', 'g', 'l', 'e', '.', 'P', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'W', 'e', 'l', 'l', 'K', 'n', 'o', 'w', 'n', 'T', 
-'y', 'p', 'e', 's', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', 
-};
-
-static void google_protobuf_any_proto_AddDescriptor() {
-  if (DescriptorPool_HasFile("google/protobuf/any.proto")) return;
-  DescriptorPool_AddDescriptor("google/protobuf/any.proto", google_protobuf_any_proto_descriptor,
-                               sizeof(google_protobuf_any_proto_descriptor));
-}
-
-static PHP_METHOD(GPBMetadata_Google_Protobuf_Any, initOnce) {
-  google_protobuf_any_proto_AddDescriptor();
-}
-
-static zend_function_entry GPBMetadata_Google_Protobuf_Any_methods[] = {
-  PHP_ME(GPBMetadata_Google_Protobuf_Any, initOnce, arginfo_void, ZEND_ACC_PUBLIC | ZEND_ACC_STATIC)
-  ZEND_FE_END
-};
-
-static void GPBMetadata_Google_Protobuf_Any_ModuleInit() {
-  zend_class_entry tmp_ce;
-
-  INIT_CLASS_ENTRY(tmp_ce, "GPBMetadata\\Google\\Protobuf\\Any",
-                   GPBMetadata_Google_Protobuf_Any_methods);
-
-  GPBMetadata_Google_Protobuf_Any_ce = zend_register_internal_class(&tmp_ce);
-}
-
-/* google_protobuf_Any */
-
-zend_class_entry* google_protobuf_Any_ce;
-
-static PHP_METHOD(google_protobuf_Any, __construct) {
-  google_protobuf_any_proto_AddDescriptor();
-  zim_Message___construct(INTERNAL_FUNCTION_PARAM_PASSTHRU);
-}
-
-static PHP_METHOD(google_protobuf_Any, getTypeUrl) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "type_url");
-  zval ret;
-  Message_get(intern, f, &ret);
-  RETURN_COPY_VALUE(&ret);
-}
-
-static PHP_METHOD(google_protobuf_Any, setTypeUrl) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "type_url");
-  zval *val;
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &val)
-      == FAILURE) {
-    return;
-  }
-  Message_set(intern, f, val);
-  RETURN_COPY(getThis());
-}
-
-static PHP_METHOD(google_protobuf_Any, getValue) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "value");
-  zval ret;
-  Message_get(intern, f, &ret);
-  RETURN_COPY_VALUE(&ret);
-}
-
-static PHP_METHOD(google_protobuf_Any, setValue) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "value");
-  zval *val;
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &val)
-      == FAILURE) {
-    return;
-  }
-  Message_set(intern, f, val);
-  RETURN_COPY(getThis());
-}
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_is, 0, 0, 1)
-  ZEND_ARG_INFO(0, proto)
-ZEND_END_ARG_INFO()
-
-static zend_function_entry google_protobuf_Any_phpmethods[] = {
-  PHP_ME(google_protobuf_Any, __construct, arginfo_construct, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Any, getTypeUrl, arginfo_void, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Any, setTypeUrl, arginfo_setter, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Any, getValue, arginfo_void, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Any, setValue, arginfo_setter, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Any, is, arginfo_is, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Any, pack, arginfo_setter, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Any, unpack, arginfo_void, ZEND_ACC_PUBLIC)
-  ZEND_FE_END
-};
-
-static void google_protobuf_Any_ModuleInit() {
-  zend_class_entry tmp_ce;
-
-  INIT_CLASS_ENTRY(tmp_ce, "Google\\Protobuf\\Any",
-                   google_protobuf_Any_phpmethods);
-
-  google_protobuf_Any_ce = zend_register_internal_class(&tmp_ce);
-  google_protobuf_Any_ce->ce_flags |= ZEND_ACC_FINAL;
-  google_protobuf_Any_ce->create_object = Message_create;
-  zend_do_inheritance(google_protobuf_Any_ce, message_ce);
-}
-
-/* google/protobuf/api.proto */
-
-zend_class_entry* GPBMetadata_Google_Protobuf_Api_ce;
-
-const char google_protobuf_api_proto_descriptor [751] = {
-'\n', '\031', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'a', 'p', 'i', '.', 'p', 'r', 'o', 
-'t', 'o', '\022', '\017', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '\032', '$', 'g', 'o', 'o', 'g', 
-'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 's', 'o', 'u', 'r', 'c', 'e', '_', 'c', 'o', 'n', 't', 'e', 'x', 
-'t', '.', 'p', 'r', 'o', 't', 'o', '\032', '\032', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 
-'t', 'y', 'p', 'e', '.', 'p', 'r', 'o', 't', 'o', '\"', '\201', '\002', '\n', '\003', 'A', 'p', 'i', '\022', '\014', '\n', '\004', 'n', 'a', 'm', 
-'e', '\030', '\001', ' ', '\001', '(', '\t', '\022', '(', '\n', '\007', 'm', 'e', 't', 'h', 'o', 'd', 's', '\030', '\002', ' ', '\003', '(', '\013', '2', 
-'\027', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'M', 'e', 't', 'h', 'o', 'd', '\022', 
-'(', '\n', '\007', 'o', 'p', 't', 'i', 'o', 'n', 's', '\030', '\003', ' ', '\003', '(', '\013', '2', '\027', '.', 'g', 'o', 'o', 'g', 'l', 'e', 
-'.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'O', 'p', 't', 'i', 'o', 'n', '\022', '\017', '\n', '\007', 'v', 'e', 'r', 's', 'i', 
-'o', 'n', '\030', '\004', ' ', '\001', '(', '\t', '\022', '6', '\n', '\016', 's', 'o', 'u', 'r', 'c', 'e', '_', 'c', 'o', 'n', 't', 'e', 'x', 
-'t', '\030', '\005', ' ', '\001', '(', '\013', '2', '\036', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', 
-'.', 'S', 'o', 'u', 'r', 'c', 'e', 'C', 'o', 'n', 't', 'e', 'x', 't', '\022', '&', '\n', '\006', 'm', 'i', 'x', 'i', 'n', 's', '\030', 
-'\006', ' ', '\003', '(', '\013', '2', '\026', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'M', 
-'i', 'x', 'i', 'n', '\022', '\'', '\n', '\006', 's', 'y', 'n', 't', 'a', 'x', '\030', '\007', ' ', '\001', '(', '\016', '2', '\027', '.', 'g', 'o', 
-'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'S', 'y', 'n', 't', 'a', 'x', '\"', '\325', '\001', '\n', '\006', 
-'M', 'e', 't', 'h', 'o', 'd', '\022', '\014', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', '\022', '\030', '\n', '\020', 'r', 
-'e', 'q', 'u', 'e', 's', 't', '_', 't', 'y', 'p', 'e', '_', 'u', 'r', 'l', '\030', '\002', ' ', '\001', '(', '\t', '\022', '\031', '\n', '\021', 
-'r', 'e', 'q', 'u', 'e', 's', 't', '_', 's', 't', 'r', 'e', 'a', 'm', 'i', 'n', 'g', '\030', '\003', ' ', '\001', '(', '\010', '\022', '\031', 
-'\n', '\021', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', '_', 't', 'y', 'p', 'e', '_', 'u', 'r', 'l', '\030', '\004', ' ', '\001', '(', '\t', 
-'\022', '\032', '\n', '\022', 'r', 'e', 's', 'p', 'o', 'n', 's', 'e', '_', 's', 't', 'r', 'e', 'a', 'm', 'i', 'n', 'g', '\030', '\005', ' ', 
-'\001', '(', '\010', '\022', '(', '\n', '\007', 'o', 'p', 't', 'i', 'o', 'n', 's', '\030', '\006', ' ', '\003', '(', '\013', '2', '\027', '.', 'g', 'o', 
-'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'O', 'p', 't', 'i', 'o', 'n', '\022', '\'', '\n', '\006', 's', 
-'y', 'n', 't', 'a', 'x', '\030', '\007', ' ', '\001', '(', '\016', '2', '\027', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 
-'o', 'b', 'u', 'f', '.', 'S', 'y', 'n', 't', 'a', 'x', '\"', '#', '\n', '\005', 'M', 'i', 'x', 'i', 'n', '\022', '\014', '\n', '\004', 'n', 
-'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', '\022', '\014', '\n', '\004', 'r', 'o', 'o', 't', '\030', '\002', ' ', '\001', '(', '\t', 'B', 'v', 
-'\n', '\023', 'c', 'o', 'm', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', 'B', '\010', 'A', 'p', 
-'i', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', ',', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'g', 'o', 'l', 'a', 'n', 'g', '.', 'o', 
-'r', 'g', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 't', 'y', 'p', 'e', 's', '/', 'k', 'n', 'o', 'w', 'n', '/', 'a', 
-'p', 'i', 'p', 'b', '\242', '\002', '\003', 'G', 'P', 'B', '\252', '\002', '\036', 'G', 'o', 'o', 'g', 'l', 'e', '.', 'P', 'r', 'o', 't', 'o', 
-'b', 'u', 'f', '.', 'W', 'e', 'l', 'l', 'K', 'n', 'o', 'w', 'n', 'T', 'y', 'p', 'e', 's', 'b', '\006', 'p', 'r', 'o', 't', 'o', 
-'3', 
-};
-
-static void google_protobuf_api_proto_AddDescriptor() {
-  if (DescriptorPool_HasFile("google/protobuf/api.proto")) return;
-  google_protobuf_source_context_proto_AddDescriptor();
-  google_protobuf_type_proto_AddDescriptor();
-  DescriptorPool_AddDescriptor("google/protobuf/api.proto", google_protobuf_api_proto_descriptor,
-                               sizeof(google_protobuf_api_proto_descriptor));
-}
-
-static PHP_METHOD(GPBMetadata_Google_Protobuf_Api, initOnce) {
-  google_protobuf_api_proto_AddDescriptor();
-}
-
-static zend_function_entry GPBMetadata_Google_Protobuf_Api_methods[] = {
-  PHP_ME(GPBMetadata_Google_Protobuf_Api, initOnce, arginfo_void, ZEND_ACC_PUBLIC | ZEND_ACC_STATIC)
-  ZEND_FE_END
-};
-
-static void GPBMetadata_Google_Protobuf_Api_ModuleInit() {
-  zend_class_entry tmp_ce;
-
-  INIT_CLASS_ENTRY(tmp_ce, "GPBMetadata\\Google\\Protobuf\\Api",
-                   GPBMetadata_Google_Protobuf_Api_methods);
-
-  GPBMetadata_Google_Protobuf_Api_ce = zend_register_internal_class(&tmp_ce);
-}
-
-/* google_protobuf_Api */
-
-zend_class_entry* google_protobuf_Api_ce;
-
-static PHP_METHOD(google_protobuf_Api, __construct) {
-  google_protobuf_api_proto_AddDescriptor();
-  zim_Message___construct(INTERNAL_FUNCTION_PARAM_PASSTHRU);
-}
-
-static PHP_METHOD(google_protobuf_Api, getName) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "name");
-  zval ret;
-  Message_get(intern, f, &ret);
-  RETURN_COPY_VALUE(&ret);
-}
-
-static PHP_METHOD(google_protobuf_Api, setName) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "name");
-  zval *val;
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &val)
-      == FAILURE) {
-    return;
-  }
-  Message_set(intern, f, val);
-  RETURN_COPY(getThis());
-}
-
-static PHP_METHOD(google_protobuf_Api, getMethods) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "methods");
-  zval ret;
-  Message_get(intern, f, &ret);
-  RETURN_COPY_VALUE(&ret);
-}
-
-static PHP_METHOD(google_protobuf_Api, setMethods) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "methods");
-  zval *val;
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &val)
-      == FAILURE) {
-    return;
-  }
-  Message_set(intern, f, val);
-  RETURN_COPY(getThis());
-}
-
-static PHP_METHOD(google_protobuf_Api, getOptions) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "options");
-  zval ret;
-  Message_get(intern, f, &ret);
-  RETURN_COPY_VALUE(&ret);
-}
-
-static PHP_METHOD(google_protobuf_Api, setOptions) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "options");
-  zval *val;
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &val)
-      == FAILURE) {
-    return;
-  }
-  Message_set(intern, f, val);
-  RETURN_COPY(getThis());
-}
-
-static PHP_METHOD(google_protobuf_Api, getVersion) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "version");
-  zval ret;
-  Message_get(intern, f, &ret);
-  RETURN_COPY_VALUE(&ret);
-}
-
-static PHP_METHOD(google_protobuf_Api, setVersion) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "version");
-  zval *val;
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &val)
-      == FAILURE) {
-    return;
-  }
-  Message_set(intern, f, val);
-  RETURN_COPY(getThis());
-}
-
-static PHP_METHOD(google_protobuf_Api, getSourceContext) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "source_context");
-  zval ret;
-  Message_get(intern, f, &ret);
-  RETURN_COPY_VALUE(&ret);
-}
-
-static PHP_METHOD(google_protobuf_Api, setSourceContext) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "source_context");
-  zval *val;
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &val)
-      == FAILURE) {
-    return;
-  }
-  Message_set(intern, f, val);
-  RETURN_COPY(getThis());
-}
-
-static PHP_METHOD(google_protobuf_Api, getMixins) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "mixins");
-  zval ret;
-  Message_get(intern, f, &ret);
-  RETURN_COPY_VALUE(&ret);
-}
-
-static PHP_METHOD(google_protobuf_Api, setMixins) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "mixins");
-  zval *val;
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &val)
-      == FAILURE) {
-    return;
-  }
-  Message_set(intern, f, val);
-  RETURN_COPY(getThis());
-}
-
-static PHP_METHOD(google_protobuf_Api, getSyntax) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "syntax");
-  zval ret;
-  Message_get(intern, f, &ret);
-  RETURN_COPY_VALUE(&ret);
-}
-
-static PHP_METHOD(google_protobuf_Api, setSyntax) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "syntax");
-  zval *val;
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &val)
-      == FAILURE) {
-    return;
-  }
-  Message_set(intern, f, val);
-  RETURN_COPY(getThis());
-}
-
-static zend_function_entry google_protobuf_Api_phpmethods[] = {
-  PHP_ME(google_protobuf_Api, __construct, arginfo_construct, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Api, getName, arginfo_void, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Api, setName, arginfo_setter, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Api, getMethods, arginfo_void, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Api, setMethods, arginfo_setter, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Api, getOptions, arginfo_void, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Api, setOptions, arginfo_setter, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Api, getVersion, arginfo_void, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Api, setVersion, arginfo_setter, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Api, getSourceContext, arginfo_void, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Api, setSourceContext, arginfo_setter, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Api, getMixins, arginfo_void, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Api, setMixins, arginfo_setter, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Api, getSyntax, arginfo_void, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Api, setSyntax, arginfo_setter, ZEND_ACC_PUBLIC)
-  ZEND_FE_END
-};
-
-static void google_protobuf_Api_ModuleInit() {
-  zend_class_entry tmp_ce;
-
-  INIT_CLASS_ENTRY(tmp_ce, "Google\\Protobuf\\Api",
-                   google_protobuf_Api_phpmethods);
-
-  google_protobuf_Api_ce = zend_register_internal_class(&tmp_ce);
-  google_protobuf_Api_ce->ce_flags |= ZEND_ACC_FINAL;
-  google_protobuf_Api_ce->create_object = Message_create;
-  zend_do_inheritance(google_protobuf_Api_ce, message_ce);
-}
-
-/* google_protobuf_Method */
-
-zend_class_entry* google_protobuf_Method_ce;
-
-static PHP_METHOD(google_protobuf_Method, __construct) {
-  google_protobuf_api_proto_AddDescriptor();
-  zim_Message___construct(INTERNAL_FUNCTION_PARAM_PASSTHRU);
-}
-
-static PHP_METHOD(google_protobuf_Method, getName) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "name");
-  zval ret;
-  Message_get(intern, f, &ret);
-  RETURN_COPY_VALUE(&ret);
-}
-
-static PHP_METHOD(google_protobuf_Method, setName) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "name");
-  zval *val;
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &val)
-      == FAILURE) {
-    return;
-  }
-  Message_set(intern, f, val);
-  RETURN_COPY(getThis());
-}
-
-static PHP_METHOD(google_protobuf_Method, getRequestTypeUrl) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "request_type_url");
-  zval ret;
-  Message_get(intern, f, &ret);
-  RETURN_COPY_VALUE(&ret);
-}
-
-static PHP_METHOD(google_protobuf_Method, setRequestTypeUrl) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "request_type_url");
-  zval *val;
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &val)
-      == FAILURE) {
-    return;
-  }
-  Message_set(intern, f, val);
-  RETURN_COPY(getThis());
-}
-
-static PHP_METHOD(google_protobuf_Method, getRequestStreaming) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "request_streaming");
-  zval ret;
-  Message_get(intern, f, &ret);
-  RETURN_COPY_VALUE(&ret);
-}
-
-static PHP_METHOD(google_protobuf_Method, setRequestStreaming) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "request_streaming");
-  zval *val;
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &val)
-      == FAILURE) {
-    return;
-  }
-  Message_set(intern, f, val);
-  RETURN_COPY(getThis());
-}
-
-static PHP_METHOD(google_protobuf_Method, getResponseTypeUrl) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "response_type_url");
-  zval ret;
-  Message_get(intern, f, &ret);
-  RETURN_COPY_VALUE(&ret);
-}
-
-static PHP_METHOD(google_protobuf_Method, setResponseTypeUrl) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "response_type_url");
-  zval *val;
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &val)
-      == FAILURE) {
-    return;
-  }
-  Message_set(intern, f, val);
-  RETURN_COPY(getThis());
-}
-
-static PHP_METHOD(google_protobuf_Method, getResponseStreaming) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "response_streaming");
-  zval ret;
-  Message_get(intern, f, &ret);
-  RETURN_COPY_VALUE(&ret);
-}
-
-static PHP_METHOD(google_protobuf_Method, setResponseStreaming) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "response_streaming");
-  zval *val;
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &val)
-      == FAILURE) {
-    return;
-  }
-  Message_set(intern, f, val);
-  RETURN_COPY(getThis());
-}
-
-static PHP_METHOD(google_protobuf_Method, getOptions) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "options");
-  zval ret;
-  Message_get(intern, f, &ret);
-  RETURN_COPY_VALUE(&ret);
-}
-
-static PHP_METHOD(google_protobuf_Method, setOptions) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "options");
-  zval *val;
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &val)
-      == FAILURE) {
-    return;
-  }
-  Message_set(intern, f, val);
-  RETURN_COPY(getThis());
-}
-
-static PHP_METHOD(google_protobuf_Method, getSyntax) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "syntax");
-  zval ret;
-  Message_get(intern, f, &ret);
-  RETURN_COPY_VALUE(&ret);
-}
-
-static PHP_METHOD(google_protobuf_Method, setSyntax) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "syntax");
-  zval *val;
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &val)
-      == FAILURE) {
-    return;
-  }
-  Message_set(intern, f, val);
-  RETURN_COPY(getThis());
-}
-
-static zend_function_entry google_protobuf_Method_phpmethods[] = {
-  PHP_ME(google_protobuf_Method, __construct, arginfo_construct, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Method, getName, arginfo_void, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Method, setName, arginfo_setter, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Method, getRequestTypeUrl, arginfo_void, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Method, setRequestTypeUrl, arginfo_setter, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Method, getRequestStreaming, arginfo_void, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Method, setRequestStreaming, arginfo_setter, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Method, getResponseTypeUrl, arginfo_void, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Method, setResponseTypeUrl, arginfo_setter, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Method, getResponseStreaming, arginfo_void, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Method, setResponseStreaming, arginfo_setter, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Method, getOptions, arginfo_void, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Method, setOptions, arginfo_setter, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Method, getSyntax, arginfo_void, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Method, setSyntax, arginfo_setter, ZEND_ACC_PUBLIC)
-  ZEND_FE_END
-};
-
-static void google_protobuf_Method_ModuleInit() {
-  zend_class_entry tmp_ce;
-
-  INIT_CLASS_ENTRY(tmp_ce, "Google\\Protobuf\\Method",
-                   google_protobuf_Method_phpmethods);
-
-  google_protobuf_Method_ce = zend_register_internal_class(&tmp_ce);
-  google_protobuf_Method_ce->ce_flags |= ZEND_ACC_FINAL;
-  google_protobuf_Method_ce->create_object = Message_create;
-  zend_do_inheritance(google_protobuf_Method_ce, message_ce);
-}
-
-/* google_protobuf_Mixin */
-
-zend_class_entry* google_protobuf_Mixin_ce;
-
-static PHP_METHOD(google_protobuf_Mixin, __construct) {
-  google_protobuf_api_proto_AddDescriptor();
-  zim_Message___construct(INTERNAL_FUNCTION_PARAM_PASSTHRU);
-}
-
-static PHP_METHOD(google_protobuf_Mixin, getName) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "name");
-  zval ret;
-  Message_get(intern, f, &ret);
-  RETURN_COPY_VALUE(&ret);
-}
-
-static PHP_METHOD(google_protobuf_Mixin, setName) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "name");
-  zval *val;
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &val)
-      == FAILURE) {
-    return;
-  }
-  Message_set(intern, f, val);
-  RETURN_COPY(getThis());
-}
-
-static PHP_METHOD(google_protobuf_Mixin, getRoot) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "root");
-  zval ret;
-  Message_get(intern, f, &ret);
-  RETURN_COPY_VALUE(&ret);
-}
-
-static PHP_METHOD(google_protobuf_Mixin, setRoot) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "root");
-  zval *val;
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &val)
-      == FAILURE) {
-    return;
-  }
-  Message_set(intern, f, val);
-  RETURN_COPY(getThis());
-}
-
-static zend_function_entry google_protobuf_Mixin_phpmethods[] = {
-  PHP_ME(google_protobuf_Mixin, __construct, arginfo_construct, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Mixin, getName, arginfo_void, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Mixin, setName, arginfo_setter, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Mixin, getRoot, arginfo_void, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Mixin, setRoot, arginfo_setter, ZEND_ACC_PUBLIC)
-  ZEND_FE_END
-};
-
-static void google_protobuf_Mixin_ModuleInit() {
-  zend_class_entry tmp_ce;
-
-  INIT_CLASS_ENTRY(tmp_ce, "Google\\Protobuf\\Mixin",
-                   google_protobuf_Mixin_phpmethods);
-
-  google_protobuf_Mixin_ce = zend_register_internal_class(&tmp_ce);
-  google_protobuf_Mixin_ce->ce_flags |= ZEND_ACC_FINAL;
-  google_protobuf_Mixin_ce->create_object = Message_create;
-  zend_do_inheritance(google_protobuf_Mixin_ce, message_ce);
-}
-
-/* google/protobuf/duration.proto */
-
-zend_class_entry* GPBMetadata_Google_Protobuf_Duration_ce;
-
-const char google_protobuf_duration_proto_descriptor [235] = {
-'\n', '\036', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'd', 'u', 'r', 'a', 't', 'i', 'o', 
-'n', '.', 'p', 'r', 'o', 't', 'o', '\022', '\017', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '\"', 
-'*', '\n', '\010', 'D', 'u', 'r', 'a', 't', 'i', 'o', 'n', '\022', '\017', '\n', '\007', 's', 'e', 'c', 'o', 'n', 'd', 's', '\030', '\001', ' ', 
-'\001', '(', '\003', '\022', '\r', '\n', '\005', 'n', 'a', 'n', 'o', 's', '\030', '\002', ' ', '\001', '(', '\005', 'B', '\203', '\001', '\n', '\023', 'c', 'o', 
-'m', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', 'B', '\r', 'D', 'u', 'r', 'a', 't', 'i', 
-'o', 'n', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', '1', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'g', 'o', 'l', 'a', 'n', 'g', '.', 
-'o', 'r', 'g', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 't', 'y', 'p', 'e', 's', '/', 'k', 'n', 'o', 'w', 'n', '/', 
-'d', 'u', 'r', 'a', 't', 'i', 'o', 'n', 'p', 'b', '\370', '\001', '\001', '\242', '\002', '\003', 'G', 'P', 'B', '\252', '\002', '\036', 'G', 'o', 'o', 
-'g', 'l', 'e', '.', 'P', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'W', 'e', 'l', 'l', 'K', 'n', 'o', 'w', 'n', 'T', 'y', 'p', 
-'e', 's', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', 
-};
-
-static void google_protobuf_duration_proto_AddDescriptor() {
-  if (DescriptorPool_HasFile("google/protobuf/duration.proto")) return;
-  DescriptorPool_AddDescriptor("google/protobuf/duration.proto", google_protobuf_duration_proto_descriptor,
-                               sizeof(google_protobuf_duration_proto_descriptor));
-}
-
-static PHP_METHOD(GPBMetadata_Google_Protobuf_Duration, initOnce) {
-  google_protobuf_duration_proto_AddDescriptor();
-}
-
-static zend_function_entry GPBMetadata_Google_Protobuf_Duration_methods[] = {
-  PHP_ME(GPBMetadata_Google_Protobuf_Duration, initOnce, arginfo_void, ZEND_ACC_PUBLIC | ZEND_ACC_STATIC)
-  ZEND_FE_END
-};
-
-static void GPBMetadata_Google_Protobuf_Duration_ModuleInit() {
-  zend_class_entry tmp_ce;
-
-  INIT_CLASS_ENTRY(tmp_ce, "GPBMetadata\\Google\\Protobuf\\Duration",
-                   GPBMetadata_Google_Protobuf_Duration_methods);
-
-  GPBMetadata_Google_Protobuf_Duration_ce = zend_register_internal_class(&tmp_ce);
-}
-
-/* google_protobuf_Duration */
-
-zend_class_entry* google_protobuf_Duration_ce;
-
-static PHP_METHOD(google_protobuf_Duration, __construct) {
-  google_protobuf_duration_proto_AddDescriptor();
-  zim_Message___construct(INTERNAL_FUNCTION_PARAM_PASSTHRU);
-}
-
-static PHP_METHOD(google_protobuf_Duration, getSeconds) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "seconds");
-  zval ret;
-  Message_get(intern, f, &ret);
-  RETURN_COPY_VALUE(&ret);
-}
-
-static PHP_METHOD(google_protobuf_Duration, setSeconds) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "seconds");
-  zval *val;
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &val)
-      == FAILURE) {
-    return;
-  }
-  Message_set(intern, f, val);
-  RETURN_COPY(getThis());
-}
-
-static PHP_METHOD(google_protobuf_Duration, getNanos) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "nanos");
-  zval ret;
-  Message_get(intern, f, &ret);
-  RETURN_COPY_VALUE(&ret);
-}
-
-static PHP_METHOD(google_protobuf_Duration, setNanos) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "nanos");
-  zval *val;
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &val)
-      == FAILURE) {
-    return;
-  }
-  Message_set(intern, f, val);
-  RETURN_COPY(getThis());
-}
-
-static zend_function_entry google_protobuf_Duration_phpmethods[] = {
-  PHP_ME(google_protobuf_Duration, __construct, arginfo_construct, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Duration, getSeconds, arginfo_void, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Duration, setSeconds, arginfo_setter, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Duration, getNanos, arginfo_void, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Duration, setNanos, arginfo_setter, ZEND_ACC_PUBLIC)
-  ZEND_FE_END
-};
-
-static void google_protobuf_Duration_ModuleInit() {
-  zend_class_entry tmp_ce;
-
-  INIT_CLASS_ENTRY(tmp_ce, "Google\\Protobuf\\Duration",
-                   google_protobuf_Duration_phpmethods);
-
-  google_protobuf_Duration_ce = zend_register_internal_class(&tmp_ce);
-  google_protobuf_Duration_ce->ce_flags |= ZEND_ACC_FINAL;
-  google_protobuf_Duration_ce->create_object = Message_create;
-  zend_do_inheritance(google_protobuf_Duration_ce, message_ce);
-}
-
-/* google/protobuf/empty.proto */
-
-zend_class_entry* GPBMetadata_Google_Protobuf_GPBEmpty_ce;
-
-const char google_protobuf_empty_proto_descriptor [190] = {
-'\n', '\033', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'e', 'm', 'p', 't', 'y', '.', 'p', 
-'r', 'o', 't', 'o', '\022', '\017', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '\"', '\007', '\n', '\005', 
-'E', 'm', 'p', 't', 'y', 'B', '}', '\n', '\023', 'c', 'o', 'm', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 
-'b', 'u', 'f', 'B', '\n', 'E', 'm', 'p', 't', 'y', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', '.', 'g', 'o', 'o', 'g', 'l', 'e', 
-'.', 'g', 'o', 'l', 'a', 'n', 'g', '.', 'o', 'r', 'g', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 't', 'y', 'p', 'e', 
-'s', '/', 'k', 'n', 'o', 'w', 'n', '/', 'e', 'm', 'p', 't', 'y', 'p', 'b', '\370', '\001', '\001', '\242', '\002', '\003', 'G', 'P', 'B', '\252', 
-'\002', '\036', 'G', 'o', 'o', 'g', 'l', 'e', '.', 'P', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'W', 'e', 'l', 'l', 'K', 'n', 'o', 
-'w', 'n', 'T', 'y', 'p', 'e', 's', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', 
-};
-
-static void google_protobuf_empty_proto_AddDescriptor() {
-  if (DescriptorPool_HasFile("google/protobuf/empty.proto")) return;
-  DescriptorPool_AddDescriptor("google/protobuf/empty.proto", google_protobuf_empty_proto_descriptor,
-                               sizeof(google_protobuf_empty_proto_descriptor));
-}
-
-static PHP_METHOD(GPBMetadata_Google_Protobuf_GPBEmpty, initOnce) {
-  google_protobuf_empty_proto_AddDescriptor();
-}
-
-static zend_function_entry GPBMetadata_Google_Protobuf_GPBEmpty_methods[] = {
-  PHP_ME(GPBMetadata_Google_Protobuf_GPBEmpty, initOnce, arginfo_void, ZEND_ACC_PUBLIC | ZEND_ACC_STATIC)
-  ZEND_FE_END
-};
-
-static void GPBMetadata_Google_Protobuf_GPBEmpty_ModuleInit() {
-  zend_class_entry tmp_ce;
-
-  INIT_CLASS_ENTRY(tmp_ce, "GPBMetadata\\Google\\Protobuf\\GPBEmpty",
-                   GPBMetadata_Google_Protobuf_GPBEmpty_methods);
-
-  GPBMetadata_Google_Protobuf_GPBEmpty_ce = zend_register_internal_class(&tmp_ce);
-}
-
-/* google_protobuf_Empty */
-
-zend_class_entry* google_protobuf_Empty_ce;
-
-static PHP_METHOD(google_protobuf_Empty, __construct) {
-  google_protobuf_empty_proto_AddDescriptor();
-  zim_Message___construct(INTERNAL_FUNCTION_PARAM_PASSTHRU);
-}
-
-static zend_function_entry google_protobuf_Empty_phpmethods[] = {
-  PHP_ME(google_protobuf_Empty, __construct, arginfo_construct, ZEND_ACC_PUBLIC)
-  ZEND_FE_END
-};
-
-static void google_protobuf_Empty_ModuleInit() {
-  zend_class_entry tmp_ce;
-
-  INIT_CLASS_ENTRY(tmp_ce, "Google\\Protobuf\\GPBEmpty",
-                   google_protobuf_Empty_phpmethods);
-
-  google_protobuf_Empty_ce = zend_register_internal_class(&tmp_ce);
-  google_protobuf_Empty_ce->ce_flags |= ZEND_ACC_FINAL;
-  google_protobuf_Empty_ce->create_object = Message_create;
-  zend_do_inheritance(google_protobuf_Empty_ce, message_ce);
-}
-
-/* google/protobuf/field_mask.proto */
-
-zend_class_entry* GPBMetadata_Google_Protobuf_FieldMask_ce;
-
-const char google_protobuf_field_mask_proto_descriptor [223] = {
-'\n', ' ', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'f', 'i', 'e', 'l', 'd', '_', 'm', 
-'a', 's', 'k', '.', 'p', 'r', 'o', 't', 'o', '\022', '\017', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 
-'f', '\"', '\032', '\n', '\t', 'F', 'i', 'e', 'l', 'd', 'M', 'a', 's', 'k', '\022', '\r', '\n', '\005', 'p', 'a', 't', 'h', 's', '\030', '\001', 
-' ', '\003', '(', '\t', 'B', '\205', '\001', '\n', '\023', 'c', 'o', 'm', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 
-'b', 'u', 'f', 'B', '\016', 'F', 'i', 'e', 'l', 'd', 'M', 'a', 's', 'k', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', '2', 'g', 'o', 
-'o', 'g', 'l', 'e', '.', 'g', 'o', 'l', 'a', 'n', 'g', '.', 'o', 'r', 'g', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 
-'t', 'y', 'p', 'e', 's', '/', 'k', 'n', 'o', 'w', 'n', '/', 'f', 'i', 'e', 'l', 'd', 'm', 'a', 's', 'k', 'p', 'b', '\370', '\001', 
-'\001', '\242', '\002', '\003', 'G', 'P', 'B', '\252', '\002', '\036', 'G', 'o', 'o', 'g', 'l', 'e', '.', 'P', 'r', 'o', 't', 'o', 'b', 'u', 'f', 
-'.', 'W', 'e', 'l', 'l', 'K', 'n', 'o', 'w', 'n', 'T', 'y', 'p', 'e', 's', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', 
-};
-
-static void google_protobuf_field_mask_proto_AddDescriptor() {
-  if (DescriptorPool_HasFile("google/protobuf/field_mask.proto")) return;
-  DescriptorPool_AddDescriptor("google/protobuf/field_mask.proto", google_protobuf_field_mask_proto_descriptor,
-                               sizeof(google_protobuf_field_mask_proto_descriptor));
-}
-
-static PHP_METHOD(GPBMetadata_Google_Protobuf_FieldMask, initOnce) {
-  google_protobuf_field_mask_proto_AddDescriptor();
-}
-
-static zend_function_entry GPBMetadata_Google_Protobuf_FieldMask_methods[] = {
-  PHP_ME(GPBMetadata_Google_Protobuf_FieldMask, initOnce, arginfo_void, ZEND_ACC_PUBLIC | ZEND_ACC_STATIC)
-  ZEND_FE_END
-};
-
-static void GPBMetadata_Google_Protobuf_FieldMask_ModuleInit() {
-  zend_class_entry tmp_ce;
-
-  INIT_CLASS_ENTRY(tmp_ce, "GPBMetadata\\Google\\Protobuf\\FieldMask",
-                   GPBMetadata_Google_Protobuf_FieldMask_methods);
-
-  GPBMetadata_Google_Protobuf_FieldMask_ce = zend_register_internal_class(&tmp_ce);
-}
-
-/* google_protobuf_FieldMask */
-
-zend_class_entry* google_protobuf_FieldMask_ce;
-
-static PHP_METHOD(google_protobuf_FieldMask, __construct) {
-  google_protobuf_field_mask_proto_AddDescriptor();
-  zim_Message___construct(INTERNAL_FUNCTION_PARAM_PASSTHRU);
-}
-
-static PHP_METHOD(google_protobuf_FieldMask, getPaths) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "paths");
-  zval ret;
-  Message_get(intern, f, &ret);
-  RETURN_COPY_VALUE(&ret);
-}
-
-static PHP_METHOD(google_protobuf_FieldMask, setPaths) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "paths");
-  zval *val;
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &val)
-      == FAILURE) {
-    return;
-  }
-  Message_set(intern, f, val);
-  RETURN_COPY(getThis());
-}
-
-static zend_function_entry google_protobuf_FieldMask_phpmethods[] = {
-  PHP_ME(google_protobuf_FieldMask, __construct, arginfo_construct, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_FieldMask, getPaths, arginfo_void, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_FieldMask, setPaths, arginfo_setter, ZEND_ACC_PUBLIC)
-  ZEND_FE_END
-};
-
-static void google_protobuf_FieldMask_ModuleInit() {
-  zend_class_entry tmp_ce;
-
-  INIT_CLASS_ENTRY(tmp_ce, "Google\\Protobuf\\FieldMask",
-                   google_protobuf_FieldMask_phpmethods);
-
-  google_protobuf_FieldMask_ce = zend_register_internal_class(&tmp_ce);
-  google_protobuf_FieldMask_ce->ce_flags |= ZEND_ACC_FINAL;
-  google_protobuf_FieldMask_ce->create_object = Message_create;
-  zend_do_inheritance(google_protobuf_FieldMask_ce, message_ce);
-}
-
-/* google/protobuf/source_context.proto */
-
-zend_class_entry* GPBMetadata_Google_Protobuf_SourceContext_ce;
-
-const char google_protobuf_source_context_proto_descriptor [240] = {
-'\n', '$', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 's', 'o', 'u', 'r', 'c', 'e', '_', 
-'c', 'o', 'n', 't', 'e', 'x', 't', '.', 'p', 'r', 'o', 't', 'o', '\022', '\017', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 
-'t', 'o', 'b', 'u', 'f', '\"', '\"', '\n', '\r', 'S', 'o', 'u', 'r', 'c', 'e', 'C', 'o', 'n', 't', 'e', 'x', 't', '\022', '\021', '\n', 
-'\t', 'f', 'i', 'l', 'e', '_', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', 'B', '\212', '\001', '\n', '\023', 'c', 'o', 'm', '.', 
-'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', 'B', '\022', 'S', 'o', 'u', 'r', 'c', 'e', 'C', 'o', 
-'n', 't', 'e', 'x', 't', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', '6', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'g', 'o', 'l', 'a', 
-'n', 'g', '.', 'o', 'r', 'g', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 't', 'y', 'p', 'e', 's', '/', 'k', 'n', 'o', 
-'w', 'n', '/', 's', 'o', 'u', 'r', 'c', 'e', 'c', 'o', 'n', 't', 'e', 'x', 't', 'p', 'b', '\242', '\002', '\003', 'G', 'P', 'B', '\252', 
-'\002', '\036', 'G', 'o', 'o', 'g', 'l', 'e', '.', 'P', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'W', 'e', 'l', 'l', 'K', 'n', 'o', 
-'w', 'n', 'T', 'y', 'p', 'e', 's', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', 
-};
-
-static void google_protobuf_source_context_proto_AddDescriptor() {
-  if (DescriptorPool_HasFile("google/protobuf/source_context.proto")) return;
-  DescriptorPool_AddDescriptor("google/protobuf/source_context.proto", google_protobuf_source_context_proto_descriptor,
-                               sizeof(google_protobuf_source_context_proto_descriptor));
-}
-
-static PHP_METHOD(GPBMetadata_Google_Protobuf_SourceContext, initOnce) {
-  google_protobuf_source_context_proto_AddDescriptor();
-}
-
-static zend_function_entry GPBMetadata_Google_Protobuf_SourceContext_methods[] = {
-  PHP_ME(GPBMetadata_Google_Protobuf_SourceContext, initOnce, arginfo_void, ZEND_ACC_PUBLIC | ZEND_ACC_STATIC)
-  ZEND_FE_END
-};
-
-static void GPBMetadata_Google_Protobuf_SourceContext_ModuleInit() {
-  zend_class_entry tmp_ce;
-
-  INIT_CLASS_ENTRY(tmp_ce, "GPBMetadata\\Google\\Protobuf\\SourceContext",
-                   GPBMetadata_Google_Protobuf_SourceContext_methods);
-
-  GPBMetadata_Google_Protobuf_SourceContext_ce = zend_register_internal_class(&tmp_ce);
-}
-
-/* google_protobuf_SourceContext */
-
-zend_class_entry* google_protobuf_SourceContext_ce;
-
-static PHP_METHOD(google_protobuf_SourceContext, __construct) {
-  google_protobuf_source_context_proto_AddDescriptor();
-  zim_Message___construct(INTERNAL_FUNCTION_PARAM_PASSTHRU);
-}
-
-static PHP_METHOD(google_protobuf_SourceContext, getFileName) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "file_name");
-  zval ret;
-  Message_get(intern, f, &ret);
-  RETURN_COPY_VALUE(&ret);
-}
-
-static PHP_METHOD(google_protobuf_SourceContext, setFileName) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "file_name");
-  zval *val;
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &val)
-      == FAILURE) {
-    return;
-  }
-  Message_set(intern, f, val);
-  RETURN_COPY(getThis());
-}
-
-static zend_function_entry google_protobuf_SourceContext_phpmethods[] = {
-  PHP_ME(google_protobuf_SourceContext, __construct, arginfo_construct, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_SourceContext, getFileName, arginfo_void, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_SourceContext, setFileName, arginfo_setter, ZEND_ACC_PUBLIC)
-  ZEND_FE_END
-};
-
-static void google_protobuf_SourceContext_ModuleInit() {
-  zend_class_entry tmp_ce;
-
-  INIT_CLASS_ENTRY(tmp_ce, "Google\\Protobuf\\SourceContext",
-                   google_protobuf_SourceContext_phpmethods);
-
-  google_protobuf_SourceContext_ce = zend_register_internal_class(&tmp_ce);
-  google_protobuf_SourceContext_ce->ce_flags |= ZEND_ACC_FINAL;
-  google_protobuf_SourceContext_ce->create_object = Message_create;
-  zend_do_inheritance(google_protobuf_SourceContext_ce, message_ce);
-}
-
-/* google/protobuf/struct.proto */
-
-zend_class_entry* GPBMetadata_Google_Protobuf_Struct_ce;
-
-const char google_protobuf_struct_proto_descriptor [638] = {
-'\n', '\034', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 's', 't', 'r', 'u', 'c', 't', '.', 
-'p', 'r', 'o', 't', 'o', '\022', '\017', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '\"', '\204', '\001', 
-'\n', '\006', 'S', 't', 'r', 'u', 'c', 't', '\022', '3', '\n', '\006', 'f', 'i', 'e', 'l', 'd', 's', '\030', '\001', ' ', '\003', '(', '\013', '2', 
-'#', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'S', 't', 'r', 'u', 'c', 't', '.', 
-'F', 'i', 'e', 'l', 'd', 's', 'E', 'n', 't', 'r', 'y', '\032', 'E', '\n', '\013', 'F', 'i', 'e', 'l', 'd', 's', 'E', 'n', 't', 'r', 
-'y', '\022', '\013', '\n', '\003', 'k', 'e', 'y', '\030', '\001', ' ', '\001', '(', '\t', '\022', '%', '\n', '\005', 'v', 'a', 'l', 'u', 'e', '\030', '\002', 
-' ', '\001', '(', '\013', '2', '\026', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'V', 'a', 
-'l', 'u', 'e', ':', '\002', '8', '\001', '\"', '\352', '\001', '\n', '\005', 'V', 'a', 'l', 'u', 'e', '\022', '0', '\n', '\n', 'n', 'u', 'l', 'l', 
-'_', 'v', 'a', 'l', 'u', 'e', '\030', '\001', ' ', '\001', '(', '\016', '2', '\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 
-'t', 'o', 'b', 'u', 'f', '.', 'N', 'u', 'l', 'l', 'V', 'a', 'l', 'u', 'e', 'H', '\000', '\022', '\026', '\n', '\014', 'n', 'u', 'm', 'b', 
-'e', 'r', '_', 'v', 'a', 'l', 'u', 'e', '\030', '\002', ' ', '\001', '(', '\001', 'H', '\000', '\022', '\026', '\n', '\014', 's', 't', 'r', 'i', 'n', 
-'g', '_', 'v', 'a', 'l', 'u', 'e', '\030', '\003', ' ', '\001', '(', '\t', 'H', '\000', '\022', '\024', '\n', '\n', 'b', 'o', 'o', 'l', '_', 'v', 
-'a', 'l', 'u', 'e', '\030', '\004', ' ', '\001', '(', '\010', 'H', '\000', '\022', '/', '\n', '\014', 's', 't', 'r', 'u', 'c', 't', '_', 'v', 'a', 
-'l', 'u', 'e', '\030', '\005', ' ', '\001', '(', '\013', '2', '\027', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 
-'u', 'f', '.', 'S', 't', 'r', 'u', 'c', 't', 'H', '\000', '\022', '0', '\n', '\n', 'l', 'i', 's', 't', '_', 'v', 'a', 'l', 'u', 'e', 
-'\030', '\006', ' ', '\001', '(', '\013', '2', '\032', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 
-'L', 'i', 's', 't', 'V', 'a', 'l', 'u', 'e', 'H', '\000', 'B', '\006', '\n', '\004', 'k', 'i', 'n', 'd', '\"', '3', '\n', '\t', 'L', 'i', 
-'s', 't', 'V', 'a', 'l', 'u', 'e', '\022', '&', '\n', '\006', 'v', 'a', 'l', 'u', 'e', 's', '\030', '\001', ' ', '\003', '(', '\013', '2', '\026', 
-'.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'V', 'a', 'l', 'u', 'e', '*', '\033', '\n', 
-'\t', 'N', 'u', 'l', 'l', 'V', 'a', 'l', 'u', 'e', '\022', '\016', '\n', '\n', 'N', 'U', 'L', 'L', '_', 'V', 'A', 'L', 'U', 'E', '\020', 
-'\000', 'B', '\177', '\n', '\023', 'c', 'o', 'm', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', 'B', 
-'\013', 'S', 't', 'r', 'u', 'c', 't', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', '/', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'g', 'o', 
-'l', 'a', 'n', 'g', '.', 'o', 'r', 'g', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 't', 'y', 'p', 'e', 's', '/', 'k', 
-'n', 'o', 'w', 'n', '/', 's', 't', 'r', 'u', 'c', 't', 'p', 'b', '\370', '\001', '\001', '\242', '\002', '\003', 'G', 'P', 'B', '\252', '\002', '\036', 
-'G', 'o', 'o', 'g', 'l', 'e', '.', 'P', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'W', 'e', 'l', 'l', 'K', 'n', 'o', 'w', 'n', 
-'T', 'y', 'p', 'e', 's', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', 
-};
-
-static void google_protobuf_struct_proto_AddDescriptor() {
-  if (DescriptorPool_HasFile("google/protobuf/struct.proto")) return;
-  DescriptorPool_AddDescriptor("google/protobuf/struct.proto", google_protobuf_struct_proto_descriptor,
-                               sizeof(google_protobuf_struct_proto_descriptor));
-}
-
-static PHP_METHOD(GPBMetadata_Google_Protobuf_Struct, initOnce) {
-  google_protobuf_struct_proto_AddDescriptor();
-}
-
-static zend_function_entry GPBMetadata_Google_Protobuf_Struct_methods[] = {
-  PHP_ME(GPBMetadata_Google_Protobuf_Struct, initOnce, arginfo_void, ZEND_ACC_PUBLIC | ZEND_ACC_STATIC)
-  ZEND_FE_END
-};
-
-static void GPBMetadata_Google_Protobuf_Struct_ModuleInit() {
-  zend_class_entry tmp_ce;
-
-  INIT_CLASS_ENTRY(tmp_ce, "GPBMetadata\\Google\\Protobuf\\Struct",
-                   GPBMetadata_Google_Protobuf_Struct_methods);
-
-  GPBMetadata_Google_Protobuf_Struct_ce = zend_register_internal_class(&tmp_ce);
-}
-
-/* google_protobuf_Struct */
-
-zend_class_entry* google_protobuf_Struct_ce;
-
-static PHP_METHOD(google_protobuf_Struct, __construct) {
-  google_protobuf_struct_proto_AddDescriptor();
-  zim_Message___construct(INTERNAL_FUNCTION_PARAM_PASSTHRU);
-}
-
-static PHP_METHOD(google_protobuf_Struct, getFields) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "fields");
-  zval ret;
-  Message_get(intern, f, &ret);
-  RETURN_COPY_VALUE(&ret);
-}
-
-static PHP_METHOD(google_protobuf_Struct, setFields) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "fields");
-  zval *val;
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &val)
-      == FAILURE) {
-    return;
-  }
-  Message_set(intern, f, val);
-  RETURN_COPY(getThis());
-}
-
-static zend_function_entry google_protobuf_Struct_phpmethods[] = {
-  PHP_ME(google_protobuf_Struct, __construct, arginfo_construct, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Struct, getFields, arginfo_void, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Struct, setFields, arginfo_setter, ZEND_ACC_PUBLIC)
-  ZEND_FE_END
-};
-
-static void google_protobuf_Struct_ModuleInit() {
-  zend_class_entry tmp_ce;
-
-  INIT_CLASS_ENTRY(tmp_ce, "Google\\Protobuf\\Struct",
-                   google_protobuf_Struct_phpmethods);
-
-  google_protobuf_Struct_ce = zend_register_internal_class(&tmp_ce);
-  google_protobuf_Struct_ce->ce_flags |= ZEND_ACC_FINAL;
-  google_protobuf_Struct_ce->create_object = Message_create;
-  zend_do_inheritance(google_protobuf_Struct_ce, message_ce);
-}
-
-/* google_protobuf_Struct_FieldsEntry */
-
-zend_class_entry* google_protobuf_Struct_FieldsEntry_ce;
-
-static PHP_METHOD(google_protobuf_Struct_FieldsEntry, __construct) {
-  google_protobuf_struct_proto_AddDescriptor();
-  zim_Message___construct(INTERNAL_FUNCTION_PARAM_PASSTHRU);
-}
-
-static PHP_METHOD(google_protobuf_Struct_FieldsEntry, getKey) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "key");
-  zval ret;
-  Message_get(intern, f, &ret);
-  RETURN_COPY_VALUE(&ret);
-}
-
-static PHP_METHOD(google_protobuf_Struct_FieldsEntry, setKey) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "key");
-  zval *val;
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &val)
-      == FAILURE) {
-    return;
-  }
-  Message_set(intern, f, val);
-  RETURN_COPY(getThis());
-}
-
-static PHP_METHOD(google_protobuf_Struct_FieldsEntry, getValue) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "value");
-  zval ret;
-  Message_get(intern, f, &ret);
-  RETURN_COPY_VALUE(&ret);
-}
-
-static PHP_METHOD(google_protobuf_Struct_FieldsEntry, setValue) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "value");
-  zval *val;
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &val)
-      == FAILURE) {
-    return;
-  }
-  Message_set(intern, f, val);
-  RETURN_COPY(getThis());
-}
-
-static zend_function_entry google_protobuf_Struct_FieldsEntry_phpmethods[] = {
-  PHP_ME(google_protobuf_Struct_FieldsEntry, __construct, arginfo_construct, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Struct_FieldsEntry, getKey, arginfo_void, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Struct_FieldsEntry, setKey, arginfo_setter, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Struct_FieldsEntry, getValue, arginfo_void, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Struct_FieldsEntry, setValue, arginfo_setter, ZEND_ACC_PUBLIC)
-  ZEND_FE_END
-};
-
-static void google_protobuf_Struct_FieldsEntry_ModuleInit() {
-  zend_class_entry tmp_ce;
-
-  INIT_CLASS_ENTRY(tmp_ce, "Google\\Protobuf\\Struct\\FieldsEntry",
-                   google_protobuf_Struct_FieldsEntry_phpmethods);
-
-  google_protobuf_Struct_FieldsEntry_ce = zend_register_internal_class(&tmp_ce);
-  google_protobuf_Struct_FieldsEntry_ce->ce_flags |= ZEND_ACC_FINAL;
-  google_protobuf_Struct_FieldsEntry_ce->create_object = Message_create;
-  zend_do_inheritance(google_protobuf_Struct_FieldsEntry_ce, message_ce);
-}
-
-/* google_protobuf_Value */
-
-zend_class_entry* google_protobuf_Value_ce;
-
-static PHP_METHOD(google_protobuf_Value, __construct) {
-  google_protobuf_struct_proto_AddDescriptor();
-  zim_Message___construct(INTERNAL_FUNCTION_PARAM_PASSTHRU);
-}
-
-static PHP_METHOD(google_protobuf_Value, getNullValue) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "null_value");
-  zval ret;
-  Message_get(intern, f, &ret);
-  RETURN_COPY_VALUE(&ret);
-}
-
-static PHP_METHOD(google_protobuf_Value, setNullValue) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "null_value");
-  zval *val;
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &val)
-      == FAILURE) {
-    return;
-  }
-  Message_set(intern, f, val);
-  RETURN_COPY(getThis());
-}
-
-static PHP_METHOD(google_protobuf_Value, getNumberValue) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "number_value");
-  zval ret;
-  Message_get(intern, f, &ret);
-  RETURN_COPY_VALUE(&ret);
-}
-
-static PHP_METHOD(google_protobuf_Value, setNumberValue) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "number_value");
-  zval *val;
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &val)
-      == FAILURE) {
-    return;
-  }
-  Message_set(intern, f, val);
-  RETURN_COPY(getThis());
-}
-
-static PHP_METHOD(google_protobuf_Value, getStringValue) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "string_value");
-  zval ret;
-  Message_get(intern, f, &ret);
-  RETURN_COPY_VALUE(&ret);
-}
-
-static PHP_METHOD(google_protobuf_Value, setStringValue) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "string_value");
-  zval *val;
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &val)
-      == FAILURE) {
-    return;
-  }
-  Message_set(intern, f, val);
-  RETURN_COPY(getThis());
-}
-
-static PHP_METHOD(google_protobuf_Value, getBoolValue) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "bool_value");
-  zval ret;
-  Message_get(intern, f, &ret);
-  RETURN_COPY_VALUE(&ret);
-}
-
-static PHP_METHOD(google_protobuf_Value, setBoolValue) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "bool_value");
-  zval *val;
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &val)
-      == FAILURE) {
-    return;
-  }
-  Message_set(intern, f, val);
-  RETURN_COPY(getThis());
-}
-
-static PHP_METHOD(google_protobuf_Value, getStructValue) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "struct_value");
-  zval ret;
-  Message_get(intern, f, &ret);
-  RETURN_COPY_VALUE(&ret);
-}
-
-static PHP_METHOD(google_protobuf_Value, setStructValue) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "struct_value");
-  zval *val;
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &val)
-      == FAILURE) {
-    return;
-  }
-  Message_set(intern, f, val);
-  RETURN_COPY(getThis());
-}
-
-static PHP_METHOD(google_protobuf_Value, getListValue) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "list_value");
-  zval ret;
-  Message_get(intern, f, &ret);
-  RETURN_COPY_VALUE(&ret);
-}
-
-static PHP_METHOD(google_protobuf_Value, setListValue) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "list_value");
-  zval *val;
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &val)
-      == FAILURE) {
-    return;
-  }
-  Message_set(intern, f, val);
-  RETURN_COPY(getThis());
-}
-
-static PHP_METHOD(google_protobuf_Value, getKind) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_OneofDef *oneof = upb_MessageDef_FindOneofByName(
-      intern->desc->msgdef, "kind");
-  const upb_FieldDef *field = 
-      upb_Message_WhichOneof(intern->msg, oneof);
-  RETURN_STRING(field ? upb_FieldDef_Name(field) : "");
-}
-static zend_function_entry google_protobuf_Value_phpmethods[] = {
-  PHP_ME(google_protobuf_Value, __construct, arginfo_construct, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Value, getNullValue, arginfo_void, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Value, setNullValue, arginfo_setter, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Value, getNumberValue, arginfo_void, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Value, setNumberValue, arginfo_setter, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Value, getStringValue, arginfo_void, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Value, setStringValue, arginfo_setter, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Value, getBoolValue, arginfo_void, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Value, setBoolValue, arginfo_setter, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Value, getStructValue, arginfo_void, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Value, setStructValue, arginfo_setter, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Value, getListValue, arginfo_void, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Value, setListValue, arginfo_setter, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Value, getKind, arginfo_void, ZEND_ACC_PUBLIC)
-  ZEND_FE_END
-};
-
-static void google_protobuf_Value_ModuleInit() {
-  zend_class_entry tmp_ce;
-
-  INIT_CLASS_ENTRY(tmp_ce, "Google\\Protobuf\\Value",
-                   google_protobuf_Value_phpmethods);
-
-  google_protobuf_Value_ce = zend_register_internal_class(&tmp_ce);
-  google_protobuf_Value_ce->ce_flags |= ZEND_ACC_FINAL;
-  google_protobuf_Value_ce->create_object = Message_create;
-  zend_do_inheritance(google_protobuf_Value_ce, message_ce);
-}
-
-/* google_protobuf_ListValue */
-
-zend_class_entry* google_protobuf_ListValue_ce;
-
-static PHP_METHOD(google_protobuf_ListValue, __construct) {
-  google_protobuf_struct_proto_AddDescriptor();
-  zim_Message___construct(INTERNAL_FUNCTION_PARAM_PASSTHRU);
-}
-
-static PHP_METHOD(google_protobuf_ListValue, getValues) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "values");
-  zval ret;
-  Message_get(intern, f, &ret);
-  RETURN_COPY_VALUE(&ret);
-}
-
-static PHP_METHOD(google_protobuf_ListValue, setValues) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "values");
-  zval *val;
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &val)
-      == FAILURE) {
-    return;
-  }
-  Message_set(intern, f, val);
-  RETURN_COPY(getThis());
-}
-
-static zend_function_entry google_protobuf_ListValue_phpmethods[] = {
-  PHP_ME(google_protobuf_ListValue, __construct, arginfo_construct, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_ListValue, getValues, arginfo_void, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_ListValue, setValues, arginfo_setter, ZEND_ACC_PUBLIC)
-  ZEND_FE_END
-};
-
-static void google_protobuf_ListValue_ModuleInit() {
-  zend_class_entry tmp_ce;
-
-  INIT_CLASS_ENTRY(tmp_ce, "Google\\Protobuf\\ListValue",
-                   google_protobuf_ListValue_phpmethods);
-
-  google_protobuf_ListValue_ce = zend_register_internal_class(&tmp_ce);
-  google_protobuf_ListValue_ce->ce_flags |= ZEND_ACC_FINAL;
-  google_protobuf_ListValue_ce->create_object = Message_create;
-  zend_do_inheritance(google_protobuf_ListValue_ce, message_ce);
-}
-
-/* google_protobuf_NullValue */
-
-zend_class_entry* google_protobuf_NullValue_ce;
-
-PHP_METHOD(google_protobuf_NullValue, name) {
-  google_protobuf_struct_proto_AddDescriptor();
-  const upb_DefPool *symtab = DescriptorPool_GetSymbolTable();
-  const upb_EnumDef *e = upb_DefPool_FindEnumByName(symtab, "google.protobuf.NullValue");
-  zend_long value;
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "l", &value) ==
-      FAILURE) {
-    return;
-  }
-  const upb_EnumValueDef* ev =
-      upb_EnumDef_FindValueByNumber(e, value);
-  if (!ev) {
-    zend_throw_exception_ex(NULL, 0,
-                            "Google\\Protobuf\\NullValue has no name "
-                            "defined for value " ZEND_LONG_FMT ".",
-                            value);
-    return;
-  }
-  RETURN_STRING(upb_EnumValueDef_Name(ev));
-}
-
-PHP_METHOD(google_protobuf_NullValue, value) {
-  google_protobuf_struct_proto_AddDescriptor();
-  const upb_DefPool *symtab = DescriptorPool_GetSymbolTable();
-  const upb_EnumDef *e = upb_DefPool_FindEnumByName(symtab, "google.protobuf.NullValue");
-  char *name = NULL;
-  size_t name_len;
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &name,
-                            &name_len) == FAILURE) {
-    return;
-  }
-  const upb_EnumValueDef* ev = upb_EnumDef_FindValueByNameWithSize(
-      e, name, name_len);
-  if (!ev) {
-    zend_throw_exception_ex(NULL, 0,
-                            "Google\\Protobuf\\NullValue has no value "
-                            "defined for name %s.",
-                            name);
-    return;
-  }
-  RETURN_LONG(upb_EnumValueDef_Number(ev));
-}
-
-static zend_function_entry google_protobuf_NullValue_phpmethods[] = {
-  PHP_ME(google_protobuf_NullValue, name, arginfo_lookup, ZEND_ACC_PUBLIC | ZEND_ACC_STATIC)
-  PHP_ME(google_protobuf_NullValue, value, arginfo_lookup, ZEND_ACC_PUBLIC | ZEND_ACC_STATIC)
-  ZEND_FE_END
-};
-
-static void google_protobuf_NullValue_ModuleInit() {
-  zend_class_entry tmp_ce;
-
-  INIT_CLASS_ENTRY(tmp_ce, "Google\\Protobuf\\NullValue",
-                   google_protobuf_NullValue_phpmethods);
-
-  google_protobuf_NullValue_ce = zend_register_internal_class(&tmp_ce);
-  zend_declare_class_constant_long(google_protobuf_NullValue_ce, "NULL_VALUE",
-                                   strlen("NULL_VALUE"), 0);
-}
-
-/* google/protobuf/type.proto */
-
-zend_class_entry* GPBMetadata_Google_Protobuf_Type_ce;
-
-const char google_protobuf_type_proto_descriptor [1592] = {
-'\n', '\032', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 't', 'y', 'p', 'e', '.', 'p', 'r', 
-'o', 't', 'o', '\022', '\017', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '\032', '\031', 'g', 'o', 'o', 
-'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'a', 'n', 'y', '.', 'p', 'r', 'o', 't', 'o', '\032', '$', 'g', 
-'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 's', 'o', 'u', 'r', 'c', 'e', '_', 'c', 'o', 'n', 
-'t', 'e', 'x', 't', '.', 'p', 'r', 'o', 't', 'o', '\"', '\327', '\001', '\n', '\004', 'T', 'y', 'p', 'e', '\022', '\014', '\n', '\004', 'n', 'a', 
-'m', 'e', '\030', '\001', ' ', '\001', '(', '\t', '\022', '&', '\n', '\006', 'f', 'i', 'e', 'l', 'd', 's', '\030', '\002', ' ', '\003', '(', '\013', '2', 
-'\026', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'i', 'e', 'l', 'd', '\022', '\016', 
-'\n', '\006', 'o', 'n', 'e', 'o', 'f', 's', '\030', '\003', ' ', '\003', '(', '\t', '\022', '(', '\n', '\007', 'o', 'p', 't', 'i', 'o', 'n', 's', 
-'\030', '\004', ' ', '\003', '(', '\013', '2', '\027', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 
-'O', 'p', 't', 'i', 'o', 'n', '\022', '6', '\n', '\016', 's', 'o', 'u', 'r', 'c', 'e', '_', 'c', 'o', 'n', 't', 'e', 'x', 't', '\030', 
-'\005', ' ', '\001', '(', '\013', '2', '\036', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'S', 
-'o', 'u', 'r', 'c', 'e', 'C', 'o', 'n', 't', 'e', 'x', 't', '\022', '\'', '\n', '\006', 's', 'y', 'n', 't', 'a', 'x', '\030', '\006', ' ', 
-'\001', '(', '\016', '2', '\027', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'S', 'y', 'n', 
-'t', 'a', 'x', '\"', '\325', '\005', '\n', '\005', 'F', 'i', 'e', 'l', 'd', '\022', ')', '\n', '\004', 'k', 'i', 'n', 'd', '\030', '\001', ' ', '\001', 
-'(', '\016', '2', '\033', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'i', 'e', 'l', 
-'d', '.', 'K', 'i', 'n', 'd', '\022', '7', '\n', '\013', 'c', 'a', 'r', 'd', 'i', 'n', 'a', 'l', 'i', 't', 'y', '\030', '\002', ' ', '\001', 
-'(', '\016', '2', '\"', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'F', 'i', 'e', 'l', 
-'d', '.', 'C', 'a', 'r', 'd', 'i', 'n', 'a', 'l', 'i', 't', 'y', '\022', '\016', '\n', '\006', 'n', 'u', 'm', 'b', 'e', 'r', '\030', '\003', 
-' ', '\001', '(', '\005', '\022', '\014', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\004', ' ', '\001', '(', '\t', '\022', '\020', '\n', '\010', 't', 'y', 'p', 
-'e', '_', 'u', 'r', 'l', '\030', '\006', ' ', '\001', '(', '\t', '\022', '\023', '\n', '\013', 'o', 'n', 'e', 'o', 'f', '_', 'i', 'n', 'd', 'e', 
-'x', '\030', '\007', ' ', '\001', '(', '\005', '\022', '\016', '\n', '\006', 'p', 'a', 'c', 'k', 'e', 'd', '\030', '\010', ' ', '\001', '(', '\010', '\022', '(', 
-'\n', '\007', 'o', 'p', 't', 'i', 'o', 'n', 's', '\030', '\t', ' ', '\003', '(', '\013', '2', '\027', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 
-'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'O', 'p', 't', 'i', 'o', 'n', '\022', '\021', '\n', '\t', 'j', 's', 'o', 'n', '_', 'n', 
-'a', 'm', 'e', '\030', '\n', ' ', '\001', '(', '\t', '\022', '\025', '\n', '\r', 'd', 'e', 'f', 'a', 'u', 'l', 't', '_', 'v', 'a', 'l', 'u', 
-'e', '\030', '\013', ' ', '\001', '(', '\t', '\"', '\310', '\002', '\n', '\004', 'K', 'i', 'n', 'd', '\022', '\020', '\n', '\014', 'T', 'Y', 'P', 'E', '_', 
-'U', 'N', 'K', 'N', 'O', 'W', 'N', '\020', '\000', '\022', '\017', '\n', '\013', 'T', 'Y', 'P', 'E', '_', 'D', 'O', 'U', 'B', 'L', 'E', '\020', 
-'\001', '\022', '\016', '\n', '\n', 'T', 'Y', 'P', 'E', '_', 'F', 'L', 'O', 'A', 'T', '\020', '\002', '\022', '\016', '\n', '\n', 'T', 'Y', 'P', 'E', 
-'_', 'I', 'N', 'T', '6', '4', '\020', '\003', '\022', '\017', '\n', '\013', 'T', 'Y', 'P', 'E', '_', 'U', 'I', 'N', 'T', '6', '4', '\020', '\004', 
-'\022', '\016', '\n', '\n', 'T', 'Y', 'P', 'E', '_', 'I', 'N', 'T', '3', '2', '\020', '\005', '\022', '\020', '\n', '\014', 'T', 'Y', 'P', 'E', '_', 
-'F', 'I', 'X', 'E', 'D', '6', '4', '\020', '\006', '\022', '\020', '\n', '\014', 'T', 'Y', 'P', 'E', '_', 'F', 'I', 'X', 'E', 'D', '3', '2', 
-'\020', '\007', '\022', '\r', '\n', '\t', 'T', 'Y', 'P', 'E', '_', 'B', 'O', 'O', 'L', '\020', '\010', '\022', '\017', '\n', '\013', 'T', 'Y', 'P', 'E', 
-'_', 'S', 'T', 'R', 'I', 'N', 'G', '\020', '\t', '\022', '\016', '\n', '\n', 'T', 'Y', 'P', 'E', '_', 'G', 'R', 'O', 'U', 'P', '\020', '\n', 
-'\022', '\020', '\n', '\014', 'T', 'Y', 'P', 'E', '_', 'M', 'E', 'S', 'S', 'A', 'G', 'E', '\020', '\013', '\022', '\016', '\n', '\n', 'T', 'Y', 'P', 
-'E', '_', 'B', 'Y', 'T', 'E', 'S', '\020', '\014', '\022', '\017', '\n', '\013', 'T', 'Y', 'P', 'E', '_', 'U', 'I', 'N', 'T', '3', '2', '\020', 
-'\r', '\022', '\r', '\n', '\t', 'T', 'Y', 'P', 'E', '_', 'E', 'N', 'U', 'M', '\020', '\016', '\022', '\021', '\n', '\r', 'T', 'Y', 'P', 'E', '_', 
-'S', 'F', 'I', 'X', 'E', 'D', '3', '2', '\020', '\017', '\022', '\021', '\n', '\r', 'T', 'Y', 'P', 'E', '_', 'S', 'F', 'I', 'X', 'E', 'D', 
-'6', '4', '\020', '\020', '\022', '\017', '\n', '\013', 'T', 'Y', 'P', 'E', '_', 'S', 'I', 'N', 'T', '3', '2', '\020', '\021', '\022', '\017', '\n', '\013', 
-'T', 'Y', 'P', 'E', '_', 'S', 'I', 'N', 'T', '6', '4', '\020', '\022', '\"', 't', '\n', '\013', 'C', 'a', 'r', 'd', 'i', 'n', 'a', 'l', 
-'i', 't', 'y', '\022', '\027', '\n', '\023', 'C', 'A', 'R', 'D', 'I', 'N', 'A', 'L', 'I', 'T', 'Y', '_', 'U', 'N', 'K', 'N', 'O', 'W', 
-'N', '\020', '\000', '\022', '\030', '\n', '\024', 'C', 'A', 'R', 'D', 'I', 'N', 'A', 'L', 'I', 'T', 'Y', '_', 'O', 'P', 'T', 'I', 'O', 'N', 
-'A', 'L', '\020', '\001', '\022', '\030', '\n', '\024', 'C', 'A', 'R', 'D', 'I', 'N', 'A', 'L', 'I', 'T', 'Y', '_', 'R', 'E', 'Q', 'U', 'I', 
-'R', 'E', 'D', '\020', '\002', '\022', '\030', '\n', '\024', 'C', 'A', 'R', 'D', 'I', 'N', 'A', 'L', 'I', 'T', 'Y', '_', 'R', 'E', 'P', 'E', 
-'A', 'T', 'E', 'D', '\020', '\003', '\"', '\316', '\001', '\n', '\004', 'E', 'n', 'u', 'm', '\022', '\014', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', 
-' ', '\001', '(', '\t', '\022', '-', '\n', '\t', 'e', 'n', 'u', 'm', 'v', 'a', 'l', 'u', 'e', '\030', '\002', ' ', '\003', '(', '\013', '2', '\032', 
-'.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'E', 'n', 'u', 'm', 'V', 'a', 'l', 'u', 
-'e', '\022', '(', '\n', '\007', 'o', 'p', 't', 'i', 'o', 'n', 's', '\030', '\003', ' ', '\003', '(', '\013', '2', '\027', '.', 'g', 'o', 'o', 'g', 
-'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'O', 'p', 't', 'i', 'o', 'n', '\022', '6', '\n', '\016', 's', 'o', 'u', 
-'r', 'c', 'e', '_', 'c', 'o', 'n', 't', 'e', 'x', 't', '\030', '\004', ' ', '\001', '(', '\013', '2', '\036', '.', 'g', 'o', 'o', 'g', 'l', 
-'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'S', 'o', 'u', 'r', 'c', 'e', 'C', 'o', 'n', 't', 'e', 'x', 't', '\022', 
-'\'', '\n', '\006', 's', 'y', 'n', 't', 'a', 'x', '\030', '\005', ' ', '\001', '(', '\016', '2', '\027', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 
-'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'S', 'y', 'n', 't', 'a', 'x', '\"', 'S', '\n', '\t', 'E', 'n', 'u', 'm', 'V', 'a', 
-'l', 'u', 'e', '\022', '\014', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', '\022', '\016', '\n', '\006', 'n', 'u', 'm', 'b', 
-'e', 'r', '\030', '\002', ' ', '\001', '(', '\005', '\022', '(', '\n', '\007', 'o', 'p', 't', 'i', 'o', 'n', 's', '\030', '\003', ' ', '\003', '(', '\013', 
-'2', '\027', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'O', 'p', 't', 'i', 'o', 'n', 
-'\"', ';', '\n', '\006', 'O', 'p', 't', 'i', 'o', 'n', '\022', '\014', '\n', '\004', 'n', 'a', 'm', 'e', '\030', '\001', ' ', '\001', '(', '\t', '\022', 
-'#', '\n', '\005', 'v', 'a', 'l', 'u', 'e', '\030', '\002', ' ', '\001', '(', '\013', '2', '\024', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 
-'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'A', 'n', 'y', '*', '.', '\n', '\006', 'S', 'y', 'n', 't', 'a', 'x', '\022', '\021', '\n', '\r', 
-'S', 'Y', 'N', 'T', 'A', 'X', '_', 'P', 'R', 'O', 'T', 'O', '2', '\020', '\000', '\022', '\021', '\n', '\r', 'S', 'Y', 'N', 'T', 'A', 'X', 
-'_', 'P', 'R', 'O', 'T', 'O', '3', '\020', '\001', 'B', '{', '\n', '\023', 'c', 'o', 'm', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 
-'r', 'o', 't', 'o', 'b', 'u', 'f', 'B', '\t', 'T', 'y', 'p', 'e', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', '-', 'g', 'o', 'o', 
-'g', 'l', 'e', '.', 'g', 'o', 'l', 'a', 'n', 'g', '.', 'o', 'r', 'g', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 't', 
-'y', 'p', 'e', 's', '/', 'k', 'n', 'o', 'w', 'n', '/', 't', 'y', 'p', 'e', 'p', 'b', '\370', '\001', '\001', '\242', '\002', '\003', 'G', 'P', 
-'B', '\252', '\002', '\036', 'G', 'o', 'o', 'g', 'l', 'e', '.', 'P', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'W', 'e', 'l', 'l', 'K', 
-'n', 'o', 'w', 'n', 'T', 'y', 'p', 'e', 's', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', 
-};
-
-static void google_protobuf_type_proto_AddDescriptor() {
-  if (DescriptorPool_HasFile("google/protobuf/type.proto")) return;
-  google_protobuf_any_proto_AddDescriptor();
-  google_protobuf_source_context_proto_AddDescriptor();
-  DescriptorPool_AddDescriptor("google/protobuf/type.proto", google_protobuf_type_proto_descriptor,
-                               sizeof(google_protobuf_type_proto_descriptor));
-}
-
-static PHP_METHOD(GPBMetadata_Google_Protobuf_Type, initOnce) {
-  google_protobuf_type_proto_AddDescriptor();
-}
-
-static zend_function_entry GPBMetadata_Google_Protobuf_Type_methods[] = {
-  PHP_ME(GPBMetadata_Google_Protobuf_Type, initOnce, arginfo_void, ZEND_ACC_PUBLIC | ZEND_ACC_STATIC)
-  ZEND_FE_END
-};
-
-static void GPBMetadata_Google_Protobuf_Type_ModuleInit() {
-  zend_class_entry tmp_ce;
-
-  INIT_CLASS_ENTRY(tmp_ce, "GPBMetadata\\Google\\Protobuf\\Type",
-                   GPBMetadata_Google_Protobuf_Type_methods);
-
-  GPBMetadata_Google_Protobuf_Type_ce = zend_register_internal_class(&tmp_ce);
-}
-
-/* google_protobuf_Type */
-
-zend_class_entry* google_protobuf_Type_ce;
-
-static PHP_METHOD(google_protobuf_Type, __construct) {
-  google_protobuf_type_proto_AddDescriptor();
-  zim_Message___construct(INTERNAL_FUNCTION_PARAM_PASSTHRU);
-}
-
-static PHP_METHOD(google_protobuf_Type, getName) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "name");
-  zval ret;
-  Message_get(intern, f, &ret);
-  RETURN_COPY_VALUE(&ret);
-}
-
-static PHP_METHOD(google_protobuf_Type, setName) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "name");
-  zval *val;
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &val)
-      == FAILURE) {
-    return;
-  }
-  Message_set(intern, f, val);
-  RETURN_COPY(getThis());
-}
-
-static PHP_METHOD(google_protobuf_Type, getFields) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "fields");
-  zval ret;
-  Message_get(intern, f, &ret);
-  RETURN_COPY_VALUE(&ret);
-}
-
-static PHP_METHOD(google_protobuf_Type, setFields) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "fields");
-  zval *val;
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &val)
-      == FAILURE) {
-    return;
-  }
-  Message_set(intern, f, val);
-  RETURN_COPY(getThis());
-}
-
-static PHP_METHOD(google_protobuf_Type, getOneofs) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "oneofs");
-  zval ret;
-  Message_get(intern, f, &ret);
-  RETURN_COPY_VALUE(&ret);
-}
-
-static PHP_METHOD(google_protobuf_Type, setOneofs) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "oneofs");
-  zval *val;
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &val)
-      == FAILURE) {
-    return;
-  }
-  Message_set(intern, f, val);
-  RETURN_COPY(getThis());
-}
-
-static PHP_METHOD(google_protobuf_Type, getOptions) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "options");
-  zval ret;
-  Message_get(intern, f, &ret);
-  RETURN_COPY_VALUE(&ret);
-}
-
-static PHP_METHOD(google_protobuf_Type, setOptions) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "options");
-  zval *val;
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &val)
-      == FAILURE) {
-    return;
-  }
-  Message_set(intern, f, val);
-  RETURN_COPY(getThis());
-}
-
-static PHP_METHOD(google_protobuf_Type, getSourceContext) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "source_context");
-  zval ret;
-  Message_get(intern, f, &ret);
-  RETURN_COPY_VALUE(&ret);
-}
-
-static PHP_METHOD(google_protobuf_Type, setSourceContext) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "source_context");
-  zval *val;
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &val)
-      == FAILURE) {
-    return;
-  }
-  Message_set(intern, f, val);
-  RETURN_COPY(getThis());
-}
-
-static PHP_METHOD(google_protobuf_Type, getSyntax) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "syntax");
-  zval ret;
-  Message_get(intern, f, &ret);
-  RETURN_COPY_VALUE(&ret);
-}
-
-static PHP_METHOD(google_protobuf_Type, setSyntax) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "syntax");
-  zval *val;
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &val)
-      == FAILURE) {
-    return;
-  }
-  Message_set(intern, f, val);
-  RETURN_COPY(getThis());
-}
-
-static zend_function_entry google_protobuf_Type_phpmethods[] = {
-  PHP_ME(google_protobuf_Type, __construct, arginfo_construct, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Type, getName, arginfo_void, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Type, setName, arginfo_setter, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Type, getFields, arginfo_void, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Type, setFields, arginfo_setter, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Type, getOneofs, arginfo_void, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Type, setOneofs, arginfo_setter, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Type, getOptions, arginfo_void, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Type, setOptions, arginfo_setter, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Type, getSourceContext, arginfo_void, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Type, setSourceContext, arginfo_setter, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Type, getSyntax, arginfo_void, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Type, setSyntax, arginfo_setter, ZEND_ACC_PUBLIC)
-  ZEND_FE_END
-};
-
-static void google_protobuf_Type_ModuleInit() {
-  zend_class_entry tmp_ce;
-
-  INIT_CLASS_ENTRY(tmp_ce, "Google\\Protobuf\\Type",
-                   google_protobuf_Type_phpmethods);
-
-  google_protobuf_Type_ce = zend_register_internal_class(&tmp_ce);
-  google_protobuf_Type_ce->ce_flags |= ZEND_ACC_FINAL;
-  google_protobuf_Type_ce->create_object = Message_create;
-  zend_do_inheritance(google_protobuf_Type_ce, message_ce);
-}
-
-/* google_protobuf_Field */
-
-zend_class_entry* google_protobuf_Field_ce;
-
-static PHP_METHOD(google_protobuf_Field, __construct) {
-  google_protobuf_type_proto_AddDescriptor();
-  zim_Message___construct(INTERNAL_FUNCTION_PARAM_PASSTHRU);
-}
-
-static PHP_METHOD(google_protobuf_Field, getKind) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "kind");
-  zval ret;
-  Message_get(intern, f, &ret);
-  RETURN_COPY_VALUE(&ret);
-}
-
-static PHP_METHOD(google_protobuf_Field, setKind) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "kind");
-  zval *val;
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &val)
-      == FAILURE) {
-    return;
-  }
-  Message_set(intern, f, val);
-  RETURN_COPY(getThis());
-}
-
-static PHP_METHOD(google_protobuf_Field, getCardinality) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "cardinality");
-  zval ret;
-  Message_get(intern, f, &ret);
-  RETURN_COPY_VALUE(&ret);
-}
-
-static PHP_METHOD(google_protobuf_Field, setCardinality) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "cardinality");
-  zval *val;
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &val)
-      == FAILURE) {
-    return;
-  }
-  Message_set(intern, f, val);
-  RETURN_COPY(getThis());
-}
-
-static PHP_METHOD(google_protobuf_Field, getNumber) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "number");
-  zval ret;
-  Message_get(intern, f, &ret);
-  RETURN_COPY_VALUE(&ret);
-}
-
-static PHP_METHOD(google_protobuf_Field, setNumber) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "number");
-  zval *val;
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &val)
-      == FAILURE) {
-    return;
-  }
-  Message_set(intern, f, val);
-  RETURN_COPY(getThis());
-}
-
-static PHP_METHOD(google_protobuf_Field, getName) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "name");
-  zval ret;
-  Message_get(intern, f, &ret);
-  RETURN_COPY_VALUE(&ret);
-}
-
-static PHP_METHOD(google_protobuf_Field, setName) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "name");
-  zval *val;
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &val)
-      == FAILURE) {
-    return;
-  }
-  Message_set(intern, f, val);
-  RETURN_COPY(getThis());
-}
-
-static PHP_METHOD(google_protobuf_Field, getTypeUrl) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "type_url");
-  zval ret;
-  Message_get(intern, f, &ret);
-  RETURN_COPY_VALUE(&ret);
-}
-
-static PHP_METHOD(google_protobuf_Field, setTypeUrl) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "type_url");
-  zval *val;
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &val)
-      == FAILURE) {
-    return;
-  }
-  Message_set(intern, f, val);
-  RETURN_COPY(getThis());
-}
-
-static PHP_METHOD(google_protobuf_Field, getOneofIndex) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "oneof_index");
-  zval ret;
-  Message_get(intern, f, &ret);
-  RETURN_COPY_VALUE(&ret);
-}
-
-static PHP_METHOD(google_protobuf_Field, setOneofIndex) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "oneof_index");
-  zval *val;
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &val)
-      == FAILURE) {
-    return;
-  }
-  Message_set(intern, f, val);
-  RETURN_COPY(getThis());
-}
-
-static PHP_METHOD(google_protobuf_Field, getPacked) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "packed");
-  zval ret;
-  Message_get(intern, f, &ret);
-  RETURN_COPY_VALUE(&ret);
-}
-
-static PHP_METHOD(google_protobuf_Field, setPacked) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "packed");
-  zval *val;
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &val)
-      == FAILURE) {
-    return;
-  }
-  Message_set(intern, f, val);
-  RETURN_COPY(getThis());
-}
-
-static PHP_METHOD(google_protobuf_Field, getOptions) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "options");
-  zval ret;
-  Message_get(intern, f, &ret);
-  RETURN_COPY_VALUE(&ret);
-}
-
-static PHP_METHOD(google_protobuf_Field, setOptions) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "options");
-  zval *val;
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &val)
-      == FAILURE) {
-    return;
-  }
-  Message_set(intern, f, val);
-  RETURN_COPY(getThis());
-}
-
-static PHP_METHOD(google_protobuf_Field, getJsonName) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "json_name");
-  zval ret;
-  Message_get(intern, f, &ret);
-  RETURN_COPY_VALUE(&ret);
-}
-
-static PHP_METHOD(google_protobuf_Field, setJsonName) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "json_name");
-  zval *val;
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &val)
-      == FAILURE) {
-    return;
-  }
-  Message_set(intern, f, val);
-  RETURN_COPY(getThis());
-}
-
-static PHP_METHOD(google_protobuf_Field, getDefaultValue) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "default_value");
-  zval ret;
-  Message_get(intern, f, &ret);
-  RETURN_COPY_VALUE(&ret);
-}
-
-static PHP_METHOD(google_protobuf_Field, setDefaultValue) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "default_value");
-  zval *val;
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &val)
-      == FAILURE) {
-    return;
-  }
-  Message_set(intern, f, val);
-  RETURN_COPY(getThis());
-}
-
-static zend_function_entry google_protobuf_Field_phpmethods[] = {
-  PHP_ME(google_protobuf_Field, __construct, arginfo_construct, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Field, getKind, arginfo_void, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Field, setKind, arginfo_setter, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Field, getCardinality, arginfo_void, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Field, setCardinality, arginfo_setter, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Field, getNumber, arginfo_void, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Field, setNumber, arginfo_setter, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Field, getName, arginfo_void, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Field, setName, arginfo_setter, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Field, getTypeUrl, arginfo_void, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Field, setTypeUrl, arginfo_setter, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Field, getOneofIndex, arginfo_void, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Field, setOneofIndex, arginfo_setter, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Field, getPacked, arginfo_void, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Field, setPacked, arginfo_setter, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Field, getOptions, arginfo_void, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Field, setOptions, arginfo_setter, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Field, getJsonName, arginfo_void, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Field, setJsonName, arginfo_setter, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Field, getDefaultValue, arginfo_void, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Field, setDefaultValue, arginfo_setter, ZEND_ACC_PUBLIC)
-  ZEND_FE_END
-};
-
-static void google_protobuf_Field_ModuleInit() {
-  zend_class_entry tmp_ce;
-
-  INIT_CLASS_ENTRY(tmp_ce, "Google\\Protobuf\\Field",
-                   google_protobuf_Field_phpmethods);
-
-  google_protobuf_Field_ce = zend_register_internal_class(&tmp_ce);
-  google_protobuf_Field_ce->ce_flags |= ZEND_ACC_FINAL;
-  google_protobuf_Field_ce->create_object = Message_create;
-  zend_do_inheritance(google_protobuf_Field_ce, message_ce);
-}
-
-/* google_protobuf_Field_Kind */
-
-zend_class_entry* google_protobuf_Field_Kind_ce;
-
-PHP_METHOD(google_protobuf_Field_Kind, name) {
-  google_protobuf_type_proto_AddDescriptor();
-  const upb_DefPool *symtab = DescriptorPool_GetSymbolTable();
-  const upb_EnumDef *e = upb_DefPool_FindEnumByName(symtab, "google.protobuf.Field.Kind");
-  zend_long value;
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "l", &value) ==
-      FAILURE) {
-    return;
-  }
-  const upb_EnumValueDef* ev =
-      upb_EnumDef_FindValueByNumber(e, value);
-  if (!ev) {
-    zend_throw_exception_ex(NULL, 0,
-                            "Google\\Protobuf\\Field\\Kind has no name "
-                            "defined for value " ZEND_LONG_FMT ".",
-                            value);
-    return;
-  }
-  RETURN_STRING(upb_EnumValueDef_Name(ev));
-}
-
-PHP_METHOD(google_protobuf_Field_Kind, value) {
-  google_protobuf_type_proto_AddDescriptor();
-  const upb_DefPool *symtab = DescriptorPool_GetSymbolTable();
-  const upb_EnumDef *e = upb_DefPool_FindEnumByName(symtab, "google.protobuf.Field.Kind");
-  char *name = NULL;
-  size_t name_len;
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &name,
-                            &name_len) == FAILURE) {
-    return;
-  }
-  const upb_EnumValueDef* ev = upb_EnumDef_FindValueByNameWithSize(
-      e, name, name_len);
-  if (!ev) {
-    zend_throw_exception_ex(NULL, 0,
-                            "Google\\Protobuf\\Field\\Kind has no value "
-                            "defined for name %s.",
-                            name);
-    return;
-  }
-  RETURN_LONG(upb_EnumValueDef_Number(ev));
-}
-
-static zend_function_entry google_protobuf_Field_Kind_phpmethods[] = {
-  PHP_ME(google_protobuf_Field_Kind, name, arginfo_lookup, ZEND_ACC_PUBLIC | ZEND_ACC_STATIC)
-  PHP_ME(google_protobuf_Field_Kind, value, arginfo_lookup, ZEND_ACC_PUBLIC | ZEND_ACC_STATIC)
-  ZEND_FE_END
-};
-
-static void google_protobuf_Field_Kind_ModuleInit() {
-  zend_class_entry tmp_ce;
-
-  INIT_CLASS_ENTRY(tmp_ce, "Google\\Protobuf\\Field\\Kind",
-                   google_protobuf_Field_Kind_phpmethods);
-
-  google_protobuf_Field_Kind_ce = zend_register_internal_class(&tmp_ce);
-  zend_declare_class_constant_long(google_protobuf_Field_Kind_ce, "TYPE_UNKNOWN",
-                                   strlen("TYPE_UNKNOWN"), 0);
-  zend_declare_class_constant_long(google_protobuf_Field_Kind_ce, "TYPE_DOUBLE",
-                                   strlen("TYPE_DOUBLE"), 1);
-  zend_declare_class_constant_long(google_protobuf_Field_Kind_ce, "TYPE_FLOAT",
-                                   strlen("TYPE_FLOAT"), 2);
-  zend_declare_class_constant_long(google_protobuf_Field_Kind_ce, "TYPE_INT64",
-                                   strlen("TYPE_INT64"), 3);
-  zend_declare_class_constant_long(google_protobuf_Field_Kind_ce, "TYPE_UINT64",
-                                   strlen("TYPE_UINT64"), 4);
-  zend_declare_class_constant_long(google_protobuf_Field_Kind_ce, "TYPE_INT32",
-                                   strlen("TYPE_INT32"), 5);
-  zend_declare_class_constant_long(google_protobuf_Field_Kind_ce, "TYPE_FIXED64",
-                                   strlen("TYPE_FIXED64"), 6);
-  zend_declare_class_constant_long(google_protobuf_Field_Kind_ce, "TYPE_FIXED32",
-                                   strlen("TYPE_FIXED32"), 7);
-  zend_declare_class_constant_long(google_protobuf_Field_Kind_ce, "TYPE_BOOL",
-                                   strlen("TYPE_BOOL"), 8);
-  zend_declare_class_constant_long(google_protobuf_Field_Kind_ce, "TYPE_STRING",
-                                   strlen("TYPE_STRING"), 9);
-  zend_declare_class_constant_long(google_protobuf_Field_Kind_ce, "TYPE_GROUP",
-                                   strlen("TYPE_GROUP"), 10);
-  zend_declare_class_constant_long(google_protobuf_Field_Kind_ce, "TYPE_MESSAGE",
-                                   strlen("TYPE_MESSAGE"), 11);
-  zend_declare_class_constant_long(google_protobuf_Field_Kind_ce, "TYPE_BYTES",
-                                   strlen("TYPE_BYTES"), 12);
-  zend_declare_class_constant_long(google_protobuf_Field_Kind_ce, "TYPE_UINT32",
-                                   strlen("TYPE_UINT32"), 13);
-  zend_declare_class_constant_long(google_protobuf_Field_Kind_ce, "TYPE_ENUM",
-                                   strlen("TYPE_ENUM"), 14);
-  zend_declare_class_constant_long(google_protobuf_Field_Kind_ce, "TYPE_SFIXED32",
-                                   strlen("TYPE_SFIXED32"), 15);
-  zend_declare_class_constant_long(google_protobuf_Field_Kind_ce, "TYPE_SFIXED64",
-                                   strlen("TYPE_SFIXED64"), 16);
-  zend_declare_class_constant_long(google_protobuf_Field_Kind_ce, "TYPE_SINT32",
-                                   strlen("TYPE_SINT32"), 17);
-  zend_declare_class_constant_long(google_protobuf_Field_Kind_ce, "TYPE_SINT64",
-                                   strlen("TYPE_SINT64"), 18);
-}
-
-/* google_protobuf_Field_Cardinality */
-
-zend_class_entry* google_protobuf_Field_Cardinality_ce;
-
-PHP_METHOD(google_protobuf_Field_Cardinality, name) {
-  google_protobuf_type_proto_AddDescriptor();
-  const upb_DefPool *symtab = DescriptorPool_GetSymbolTable();
-  const upb_EnumDef *e = upb_DefPool_FindEnumByName(symtab, "google.protobuf.Field.Cardinality");
-  zend_long value;
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "l", &value) ==
-      FAILURE) {
-    return;
-  }
-  const upb_EnumValueDef* ev =
-      upb_EnumDef_FindValueByNumber(e, value);
-  if (!ev) {
-    zend_throw_exception_ex(NULL, 0,
-                            "Google\\Protobuf\\Field\\Cardinality has no name "
-                            "defined for value " ZEND_LONG_FMT ".",
-                            value);
-    return;
-  }
-  RETURN_STRING(upb_EnumValueDef_Name(ev));
-}
-
-PHP_METHOD(google_protobuf_Field_Cardinality, value) {
-  google_protobuf_type_proto_AddDescriptor();
-  const upb_DefPool *symtab = DescriptorPool_GetSymbolTable();
-  const upb_EnumDef *e = upb_DefPool_FindEnumByName(symtab, "google.protobuf.Field.Cardinality");
-  char *name = NULL;
-  size_t name_len;
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &name,
-                            &name_len) == FAILURE) {
-    return;
-  }
-  const upb_EnumValueDef* ev = upb_EnumDef_FindValueByNameWithSize(
-      e, name, name_len);
-  if (!ev) {
-    zend_throw_exception_ex(NULL, 0,
-                            "Google\\Protobuf\\Field\\Cardinality has no value "
-                            "defined for name %s.",
-                            name);
-    return;
-  }
-  RETURN_LONG(upb_EnumValueDef_Number(ev));
-}
-
-static zend_function_entry google_protobuf_Field_Cardinality_phpmethods[] = {
-  PHP_ME(google_protobuf_Field_Cardinality, name, arginfo_lookup, ZEND_ACC_PUBLIC | ZEND_ACC_STATIC)
-  PHP_ME(google_protobuf_Field_Cardinality, value, arginfo_lookup, ZEND_ACC_PUBLIC | ZEND_ACC_STATIC)
-  ZEND_FE_END
-};
-
-static void google_protobuf_Field_Cardinality_ModuleInit() {
-  zend_class_entry tmp_ce;
-
-  INIT_CLASS_ENTRY(tmp_ce, "Google\\Protobuf\\Field\\Cardinality",
-                   google_protobuf_Field_Cardinality_phpmethods);
-
-  google_protobuf_Field_Cardinality_ce = zend_register_internal_class(&tmp_ce);
-  zend_declare_class_constant_long(google_protobuf_Field_Cardinality_ce, "CARDINALITY_UNKNOWN",
-                                   strlen("CARDINALITY_UNKNOWN"), 0);
-  zend_declare_class_constant_long(google_protobuf_Field_Cardinality_ce, "CARDINALITY_OPTIONAL",
-                                   strlen("CARDINALITY_OPTIONAL"), 1);
-  zend_declare_class_constant_long(google_protobuf_Field_Cardinality_ce, "CARDINALITY_REQUIRED",
-                                   strlen("CARDINALITY_REQUIRED"), 2);
-  zend_declare_class_constant_long(google_protobuf_Field_Cardinality_ce, "CARDINALITY_REPEATED",
-                                   strlen("CARDINALITY_REPEATED"), 3);
-}
-
-/* google_protobuf_Enum */
-
-zend_class_entry* google_protobuf_Enum_ce;
-
-static PHP_METHOD(google_protobuf_Enum, __construct) {
-  google_protobuf_type_proto_AddDescriptor();
-  zim_Message___construct(INTERNAL_FUNCTION_PARAM_PASSTHRU);
-}
-
-static PHP_METHOD(google_protobuf_Enum, getName) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "name");
-  zval ret;
-  Message_get(intern, f, &ret);
-  RETURN_COPY_VALUE(&ret);
-}
-
-static PHP_METHOD(google_protobuf_Enum, setName) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "name");
-  zval *val;
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &val)
-      == FAILURE) {
-    return;
-  }
-  Message_set(intern, f, val);
-  RETURN_COPY(getThis());
-}
-
-static PHP_METHOD(google_protobuf_Enum, getEnumvalue) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "enumvalue");
-  zval ret;
-  Message_get(intern, f, &ret);
-  RETURN_COPY_VALUE(&ret);
-}
-
-static PHP_METHOD(google_protobuf_Enum, setEnumvalue) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "enumvalue");
-  zval *val;
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &val)
-      == FAILURE) {
-    return;
-  }
-  Message_set(intern, f, val);
-  RETURN_COPY(getThis());
-}
-
-static PHP_METHOD(google_protobuf_Enum, getOptions) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "options");
-  zval ret;
-  Message_get(intern, f, &ret);
-  RETURN_COPY_VALUE(&ret);
-}
-
-static PHP_METHOD(google_protobuf_Enum, setOptions) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "options");
-  zval *val;
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &val)
-      == FAILURE) {
-    return;
-  }
-  Message_set(intern, f, val);
-  RETURN_COPY(getThis());
-}
-
-static PHP_METHOD(google_protobuf_Enum, getSourceContext) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "source_context");
-  zval ret;
-  Message_get(intern, f, &ret);
-  RETURN_COPY_VALUE(&ret);
-}
-
-static PHP_METHOD(google_protobuf_Enum, setSourceContext) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "source_context");
-  zval *val;
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &val)
-      == FAILURE) {
-    return;
-  }
-  Message_set(intern, f, val);
-  RETURN_COPY(getThis());
-}
-
-static PHP_METHOD(google_protobuf_Enum, getSyntax) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "syntax");
-  zval ret;
-  Message_get(intern, f, &ret);
-  RETURN_COPY_VALUE(&ret);
-}
-
-static PHP_METHOD(google_protobuf_Enum, setSyntax) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "syntax");
-  zval *val;
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &val)
-      == FAILURE) {
-    return;
-  }
-  Message_set(intern, f, val);
-  RETURN_COPY(getThis());
-}
-
-static zend_function_entry google_protobuf_Enum_phpmethods[] = {
-  PHP_ME(google_protobuf_Enum, __construct, arginfo_construct, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Enum, getName, arginfo_void, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Enum, setName, arginfo_setter, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Enum, getEnumvalue, arginfo_void, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Enum, setEnumvalue, arginfo_setter, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Enum, getOptions, arginfo_void, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Enum, setOptions, arginfo_setter, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Enum, getSourceContext, arginfo_void, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Enum, setSourceContext, arginfo_setter, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Enum, getSyntax, arginfo_void, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Enum, setSyntax, arginfo_setter, ZEND_ACC_PUBLIC)
-  ZEND_FE_END
-};
-
-static void google_protobuf_Enum_ModuleInit() {
-  zend_class_entry tmp_ce;
-
-  INIT_CLASS_ENTRY(tmp_ce, "Google\\Protobuf\\Enum",
-                   google_protobuf_Enum_phpmethods);
-
-  google_protobuf_Enum_ce = zend_register_internal_class(&tmp_ce);
-  google_protobuf_Enum_ce->ce_flags |= ZEND_ACC_FINAL;
-  google_protobuf_Enum_ce->create_object = Message_create;
-  zend_do_inheritance(google_protobuf_Enum_ce, message_ce);
-}
-
-/* google_protobuf_EnumValue */
-
-zend_class_entry* google_protobuf_EnumValue_ce;
-
-static PHP_METHOD(google_protobuf_EnumValue, __construct) {
-  google_protobuf_type_proto_AddDescriptor();
-  zim_Message___construct(INTERNAL_FUNCTION_PARAM_PASSTHRU);
-}
-
-static PHP_METHOD(google_protobuf_EnumValue, getName) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "name");
-  zval ret;
-  Message_get(intern, f, &ret);
-  RETURN_COPY_VALUE(&ret);
-}
-
-static PHP_METHOD(google_protobuf_EnumValue, setName) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "name");
-  zval *val;
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &val)
-      == FAILURE) {
-    return;
-  }
-  Message_set(intern, f, val);
-  RETURN_COPY(getThis());
-}
-
-static PHP_METHOD(google_protobuf_EnumValue, getNumber) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "number");
-  zval ret;
-  Message_get(intern, f, &ret);
-  RETURN_COPY_VALUE(&ret);
-}
-
-static PHP_METHOD(google_protobuf_EnumValue, setNumber) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "number");
-  zval *val;
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &val)
-      == FAILURE) {
-    return;
-  }
-  Message_set(intern, f, val);
-  RETURN_COPY(getThis());
-}
-
-static PHP_METHOD(google_protobuf_EnumValue, getOptions) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "options");
-  zval ret;
-  Message_get(intern, f, &ret);
-  RETURN_COPY_VALUE(&ret);
-}
-
-static PHP_METHOD(google_protobuf_EnumValue, setOptions) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "options");
-  zval *val;
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &val)
-      == FAILURE) {
-    return;
-  }
-  Message_set(intern, f, val);
-  RETURN_COPY(getThis());
-}
-
-static zend_function_entry google_protobuf_EnumValue_phpmethods[] = {
-  PHP_ME(google_protobuf_EnumValue, __construct, arginfo_construct, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_EnumValue, getName, arginfo_void, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_EnumValue, setName, arginfo_setter, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_EnumValue, getNumber, arginfo_void, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_EnumValue, setNumber, arginfo_setter, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_EnumValue, getOptions, arginfo_void, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_EnumValue, setOptions, arginfo_setter, ZEND_ACC_PUBLIC)
-  ZEND_FE_END
-};
-
-static void google_protobuf_EnumValue_ModuleInit() {
-  zend_class_entry tmp_ce;
-
-  INIT_CLASS_ENTRY(tmp_ce, "Google\\Protobuf\\EnumValue",
-                   google_protobuf_EnumValue_phpmethods);
-
-  google_protobuf_EnumValue_ce = zend_register_internal_class(&tmp_ce);
-  google_protobuf_EnumValue_ce->ce_flags |= ZEND_ACC_FINAL;
-  google_protobuf_EnumValue_ce->create_object = Message_create;
-  zend_do_inheritance(google_protobuf_EnumValue_ce, message_ce);
-}
-
-/* google_protobuf_Option */
-
-zend_class_entry* google_protobuf_Option_ce;
-
-static PHP_METHOD(google_protobuf_Option, __construct) {
-  google_protobuf_type_proto_AddDescriptor();
-  zim_Message___construct(INTERNAL_FUNCTION_PARAM_PASSTHRU);
-}
-
-static PHP_METHOD(google_protobuf_Option, getName) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "name");
-  zval ret;
-  Message_get(intern, f, &ret);
-  RETURN_COPY_VALUE(&ret);
-}
-
-static PHP_METHOD(google_protobuf_Option, setName) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "name");
-  zval *val;
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &val)
-      == FAILURE) {
-    return;
-  }
-  Message_set(intern, f, val);
-  RETURN_COPY(getThis());
-}
-
-static PHP_METHOD(google_protobuf_Option, getValue) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "value");
-  zval ret;
-  Message_get(intern, f, &ret);
-  RETURN_COPY_VALUE(&ret);
-}
-
-static PHP_METHOD(google_protobuf_Option, setValue) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "value");
-  zval *val;
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &val)
-      == FAILURE) {
-    return;
-  }
-  Message_set(intern, f, val);
-  RETURN_COPY(getThis());
-}
-
-static zend_function_entry google_protobuf_Option_phpmethods[] = {
-  PHP_ME(google_protobuf_Option, __construct, arginfo_construct, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Option, getName, arginfo_void, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Option, setName, arginfo_setter, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Option, getValue, arginfo_void, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Option, setValue, arginfo_setter, ZEND_ACC_PUBLIC)
-  ZEND_FE_END
-};
-
-static void google_protobuf_Option_ModuleInit() {
-  zend_class_entry tmp_ce;
-
-  INIT_CLASS_ENTRY(tmp_ce, "Google\\Protobuf\\Option",
-                   google_protobuf_Option_phpmethods);
-
-  google_protobuf_Option_ce = zend_register_internal_class(&tmp_ce);
-  google_protobuf_Option_ce->ce_flags |= ZEND_ACC_FINAL;
-  google_protobuf_Option_ce->create_object = Message_create;
-  zend_do_inheritance(google_protobuf_Option_ce, message_ce);
-}
-
-/* google_protobuf_Syntax */
-
-zend_class_entry* google_protobuf_Syntax_ce;
-
-PHP_METHOD(google_protobuf_Syntax, name) {
-  google_protobuf_type_proto_AddDescriptor();
-  const upb_DefPool *symtab = DescriptorPool_GetSymbolTable();
-  const upb_EnumDef *e = upb_DefPool_FindEnumByName(symtab, "google.protobuf.Syntax");
-  zend_long value;
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "l", &value) ==
-      FAILURE) {
-    return;
-  }
-  const upb_EnumValueDef* ev =
-      upb_EnumDef_FindValueByNumber(e, value);
-  if (!ev) {
-    zend_throw_exception_ex(NULL, 0,
-                            "Google\\Protobuf\\Syntax has no name "
-                            "defined for value " ZEND_LONG_FMT ".",
-                            value);
-    return;
-  }
-  RETURN_STRING(upb_EnumValueDef_Name(ev));
-}
-
-PHP_METHOD(google_protobuf_Syntax, value) {
-  google_protobuf_type_proto_AddDescriptor();
-  const upb_DefPool *symtab = DescriptorPool_GetSymbolTable();
-  const upb_EnumDef *e = upb_DefPool_FindEnumByName(symtab, "google.protobuf.Syntax");
-  char *name = NULL;
-  size_t name_len;
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "s", &name,
-                            &name_len) == FAILURE) {
-    return;
-  }
-  const upb_EnumValueDef* ev = upb_EnumDef_FindValueByNameWithSize(
-      e, name, name_len);
-  if (!ev) {
-    zend_throw_exception_ex(NULL, 0,
-                            "Google\\Protobuf\\Syntax has no value "
-                            "defined for name %s.",
-                            name);
-    return;
-  }
-  RETURN_LONG(upb_EnumValueDef_Number(ev));
-}
-
-static zend_function_entry google_protobuf_Syntax_phpmethods[] = {
-  PHP_ME(google_protobuf_Syntax, name, arginfo_lookup, ZEND_ACC_PUBLIC | ZEND_ACC_STATIC)
-  PHP_ME(google_protobuf_Syntax, value, arginfo_lookup, ZEND_ACC_PUBLIC | ZEND_ACC_STATIC)
-  ZEND_FE_END
-};
-
-static void google_protobuf_Syntax_ModuleInit() {
-  zend_class_entry tmp_ce;
-
-  INIT_CLASS_ENTRY(tmp_ce, "Google\\Protobuf\\Syntax",
-                   google_protobuf_Syntax_phpmethods);
-
-  google_protobuf_Syntax_ce = zend_register_internal_class(&tmp_ce);
-  zend_declare_class_constant_long(google_protobuf_Syntax_ce, "SYNTAX_PROTO2",
-                                   strlen("SYNTAX_PROTO2"), 0);
-  zend_declare_class_constant_long(google_protobuf_Syntax_ce, "SYNTAX_PROTO3",
-                                   strlen("SYNTAX_PROTO3"), 1);
-}
-
-/* google/protobuf/timestamp.proto */
-
-zend_class_entry* GPBMetadata_Google_Protobuf_Timestamp_ce;
-
-const char google_protobuf_timestamp_proto_descriptor [239] = {
-'\n', '\037', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 't', 'i', 'm', 'e', 's', 't', 'a', 
-'m', 'p', '.', 'p', 'r', 'o', 't', 'o', '\022', '\017', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', 
-'\"', '+', '\n', '\t', 'T', 'i', 'm', 'e', 's', 't', 'a', 'm', 'p', '\022', '\017', '\n', '\007', 's', 'e', 'c', 'o', 'n', 'd', 's', '\030', 
-'\001', ' ', '\001', '(', '\003', '\022', '\r', '\n', '\005', 'n', 'a', 'n', 'o', 's', '\030', '\002', ' ', '\001', '(', '\005', 'B', '\205', '\001', '\n', '\023', 
-'c', 'o', 'm', '.', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', 'B', '\016', 'T', 'i', 'm', 'e', 
-'s', 't', 'a', 'm', 'p', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', '2', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'g', 'o', 'l', 'a', 
-'n', 'g', '.', 'o', 'r', 'g', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 't', 'y', 'p', 'e', 's', '/', 'k', 'n', 'o', 
-'w', 'n', '/', 't', 'i', 'm', 'e', 's', 't', 'a', 'm', 'p', 'p', 'b', '\370', '\001', '\001', '\242', '\002', '\003', 'G', 'P', 'B', '\252', '\002', 
-'\036', 'G', 'o', 'o', 'g', 'l', 'e', '.', 'P', 'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'W', 'e', 'l', 'l', 'K', 'n', 'o', 'w', 
-'n', 'T', 'y', 'p', 'e', 's', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', 
-};
-
-static void google_protobuf_timestamp_proto_AddDescriptor() {
-  if (DescriptorPool_HasFile("google/protobuf/timestamp.proto")) return;
-  DescriptorPool_AddDescriptor("google/protobuf/timestamp.proto", google_protobuf_timestamp_proto_descriptor,
-                               sizeof(google_protobuf_timestamp_proto_descriptor));
-}
-
-static PHP_METHOD(GPBMetadata_Google_Protobuf_Timestamp, initOnce) {
-  google_protobuf_timestamp_proto_AddDescriptor();
-}
-
-static zend_function_entry GPBMetadata_Google_Protobuf_Timestamp_methods[] = {
-  PHP_ME(GPBMetadata_Google_Protobuf_Timestamp, initOnce, arginfo_void, ZEND_ACC_PUBLIC | ZEND_ACC_STATIC)
-  ZEND_FE_END
-};
-
-static void GPBMetadata_Google_Protobuf_Timestamp_ModuleInit() {
-  zend_class_entry tmp_ce;
-
-  INIT_CLASS_ENTRY(tmp_ce, "GPBMetadata\\Google\\Protobuf\\Timestamp",
-                   GPBMetadata_Google_Protobuf_Timestamp_methods);
-
-  GPBMetadata_Google_Protobuf_Timestamp_ce = zend_register_internal_class(&tmp_ce);
-}
-
-/* google_protobuf_Timestamp */
-
-zend_class_entry* google_protobuf_Timestamp_ce;
-
-static PHP_METHOD(google_protobuf_Timestamp, __construct) {
-  google_protobuf_timestamp_proto_AddDescriptor();
-  zim_Message___construct(INTERNAL_FUNCTION_PARAM_PASSTHRU);
-}
-
-static PHP_METHOD(google_protobuf_Timestamp, getSeconds) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "seconds");
-  zval ret;
-  Message_get(intern, f, &ret);
-  RETURN_COPY_VALUE(&ret);
-}
-
-static PHP_METHOD(google_protobuf_Timestamp, setSeconds) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "seconds");
-  zval *val;
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &val)
-      == FAILURE) {
-    return;
-  }
-  Message_set(intern, f, val);
-  RETURN_COPY(getThis());
-}
-
-static PHP_METHOD(google_protobuf_Timestamp, getNanos) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "nanos");
-  zval ret;
-  Message_get(intern, f, &ret);
-  RETURN_COPY_VALUE(&ret);
-}
-
-static PHP_METHOD(google_protobuf_Timestamp, setNanos) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "nanos");
-  zval *val;
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &val)
-      == FAILURE) {
-    return;
-  }
-  Message_set(intern, f, val);
-  RETURN_COPY(getThis());
-}
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_timestamp_fromdatetime, 0, 0, 1)
-  ZEND_ARG_INFO(0, datetime)
-ZEND_END_ARG_INFO()
-
-static zend_function_entry google_protobuf_Timestamp_phpmethods[] = {
-  PHP_ME(google_protobuf_Timestamp, __construct, arginfo_construct, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Timestamp, getSeconds, arginfo_void, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Timestamp, setSeconds, arginfo_setter, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Timestamp, getNanos, arginfo_void, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Timestamp, setNanos, arginfo_setter, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Timestamp, fromDateTime, arginfo_timestamp_fromdatetime, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Timestamp, toDateTime, arginfo_void, ZEND_ACC_PUBLIC)
-  ZEND_FE_END
-};
-
-static void google_protobuf_Timestamp_ModuleInit() {
-  zend_class_entry tmp_ce;
-
-  INIT_CLASS_ENTRY(tmp_ce, "Google\\Protobuf\\Timestamp",
-                   google_protobuf_Timestamp_phpmethods);
-
-  google_protobuf_Timestamp_ce = zend_register_internal_class(&tmp_ce);
-  google_protobuf_Timestamp_ce->ce_flags |= ZEND_ACC_FINAL;
-  google_protobuf_Timestamp_ce->create_object = Message_create;
-  zend_do_inheritance(google_protobuf_Timestamp_ce, message_ce);
-}
-
-/* google/protobuf/wrappers.proto */
-
-zend_class_entry* GPBMetadata_Google_Protobuf_Wrappers_ce;
-
-const char google_protobuf_wrappers_proto_descriptor [455] = {
-'\n', '\036', 'g', 'o', 'o', 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 'w', 'r', 'a', 'p', 'p', 'e', 'r', 
-'s', '.', 'p', 'r', 'o', 't', 'o', '\022', '\017', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '\"', 
-'\034', '\n', '\013', 'D', 'o', 'u', 'b', 'l', 'e', 'V', 'a', 'l', 'u', 'e', '\022', '\r', '\n', '\005', 'v', 'a', 'l', 'u', 'e', '\030', '\001', 
-' ', '\001', '(', '\001', '\"', '\033', '\n', '\n', 'F', 'l', 'o', 'a', 't', 'V', 'a', 'l', 'u', 'e', '\022', '\r', '\n', '\005', 'v', 'a', 'l', 
-'u', 'e', '\030', '\001', ' ', '\001', '(', '\002', '\"', '\033', '\n', '\n', 'I', 'n', 't', '6', '4', 'V', 'a', 'l', 'u', 'e', '\022', '\r', '\n', 
-'\005', 'v', 'a', 'l', 'u', 'e', '\030', '\001', ' ', '\001', '(', '\003', '\"', '\034', '\n', '\013', 'U', 'I', 'n', 't', '6', '4', 'V', 'a', 'l', 
-'u', 'e', '\022', '\r', '\n', '\005', 'v', 'a', 'l', 'u', 'e', '\030', '\001', ' ', '\001', '(', '\004', '\"', '\033', '\n', '\n', 'I', 'n', 't', '3', 
-'2', 'V', 'a', 'l', 'u', 'e', '\022', '\r', '\n', '\005', 'v', 'a', 'l', 'u', 'e', '\030', '\001', ' ', '\001', '(', '\005', '\"', '\034', '\n', '\013', 
-'U', 'I', 'n', 't', '3', '2', 'V', 'a', 'l', 'u', 'e', '\022', '\r', '\n', '\005', 'v', 'a', 'l', 'u', 'e', '\030', '\001', ' ', '\001', '(', 
-'\r', '\"', '\032', '\n', '\t', 'B', 'o', 'o', 'l', 'V', 'a', 'l', 'u', 'e', '\022', '\r', '\n', '\005', 'v', 'a', 'l', 'u', 'e', '\030', '\001', 
-' ', '\001', '(', '\010', '\"', '\034', '\n', '\013', 'S', 't', 'r', 'i', 'n', 'g', 'V', 'a', 'l', 'u', 'e', '\022', '\r', '\n', '\005', 'v', 'a', 
-'l', 'u', 'e', '\030', '\001', ' ', '\001', '(', '\t', '\"', '\033', '\n', '\n', 'B', 'y', 't', 'e', 's', 'V', 'a', 'l', 'u', 'e', '\022', '\r', 
-'\n', '\005', 'v', 'a', 'l', 'u', 'e', '\030', '\001', ' ', '\001', '(', '\014', 'B', '\203', '\001', '\n', '\023', 'c', 'o', 'm', '.', 'g', 'o', 'o', 
-'g', 'l', 'e', '.', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', 'B', '\r', 'W', 'r', 'a', 'p', 'p', 'e', 'r', 's', 'P', 'r', 'o', 
-'t', 'o', 'P', '\001', 'Z', '1', 'g', 'o', 'o', 'g', 'l', 'e', '.', 'g', 'o', 'l', 'a', 'n', 'g', '.', 'o', 'r', 'g', '/', 'p', 
-'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 't', 'y', 'p', 'e', 's', '/', 'k', 'n', 'o', 'w', 'n', '/', 'w', 'r', 'a', 'p', 'p', 
-'e', 'r', 's', 'p', 'b', '\370', '\001', '\001', '\242', '\002', '\003', 'G', 'P', 'B', '\252', '\002', '\036', 'G', 'o', 'o', 'g', 'l', 'e', '.', 'P', 
-'r', 'o', 't', 'o', 'b', 'u', 'f', '.', 'W', 'e', 'l', 'l', 'K', 'n', 'o', 'w', 'n', 'T', 'y', 'p', 'e', 's', 'b', '\006', 'p', 
-'r', 'o', 't', 'o', '3', 
-};
-
-static void google_protobuf_wrappers_proto_AddDescriptor() {
-  if (DescriptorPool_HasFile("google/protobuf/wrappers.proto")) return;
-  DescriptorPool_AddDescriptor("google/protobuf/wrappers.proto", google_protobuf_wrappers_proto_descriptor,
-                               sizeof(google_protobuf_wrappers_proto_descriptor));
-}
-
-static PHP_METHOD(GPBMetadata_Google_Protobuf_Wrappers, initOnce) {
-  google_protobuf_wrappers_proto_AddDescriptor();
-}
-
-static zend_function_entry GPBMetadata_Google_Protobuf_Wrappers_methods[] = {
-  PHP_ME(GPBMetadata_Google_Protobuf_Wrappers, initOnce, arginfo_void, ZEND_ACC_PUBLIC | ZEND_ACC_STATIC)
-  ZEND_FE_END
-};
-
-static void GPBMetadata_Google_Protobuf_Wrappers_ModuleInit() {
-  zend_class_entry tmp_ce;
-
-  INIT_CLASS_ENTRY(tmp_ce, "GPBMetadata\\Google\\Protobuf\\Wrappers",
-                   GPBMetadata_Google_Protobuf_Wrappers_methods);
-
-  GPBMetadata_Google_Protobuf_Wrappers_ce = zend_register_internal_class(&tmp_ce);
-}
-
-/* google_protobuf_DoubleValue */
-
-zend_class_entry* google_protobuf_DoubleValue_ce;
-
-static PHP_METHOD(google_protobuf_DoubleValue, __construct) {
-  google_protobuf_wrappers_proto_AddDescriptor();
-  zim_Message___construct(INTERNAL_FUNCTION_PARAM_PASSTHRU);
-}
-
-static PHP_METHOD(google_protobuf_DoubleValue, getValue) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "value");
-  zval ret;
-  Message_get(intern, f, &ret);
-  RETURN_COPY_VALUE(&ret);
-}
-
-static PHP_METHOD(google_protobuf_DoubleValue, setValue) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "value");
-  zval *val;
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &val)
-      == FAILURE) {
-    return;
-  }
-  Message_set(intern, f, val);
-  RETURN_COPY(getThis());
-}
-
-static zend_function_entry google_protobuf_DoubleValue_phpmethods[] = {
-  PHP_ME(google_protobuf_DoubleValue, __construct, arginfo_construct, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_DoubleValue, getValue, arginfo_void, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_DoubleValue, setValue, arginfo_setter, ZEND_ACC_PUBLIC)
-  ZEND_FE_END
-};
-
-static void google_protobuf_DoubleValue_ModuleInit() {
-  zend_class_entry tmp_ce;
-
-  INIT_CLASS_ENTRY(tmp_ce, "Google\\Protobuf\\DoubleValue",
-                   google_protobuf_DoubleValue_phpmethods);
-
-  google_protobuf_DoubleValue_ce = zend_register_internal_class(&tmp_ce);
-  google_protobuf_DoubleValue_ce->ce_flags |= ZEND_ACC_FINAL;
-  google_protobuf_DoubleValue_ce->create_object = Message_create;
-  zend_do_inheritance(google_protobuf_DoubleValue_ce, message_ce);
-}
-
-/* google_protobuf_FloatValue */
-
-zend_class_entry* google_protobuf_FloatValue_ce;
-
-static PHP_METHOD(google_protobuf_FloatValue, __construct) {
-  google_protobuf_wrappers_proto_AddDescriptor();
-  zim_Message___construct(INTERNAL_FUNCTION_PARAM_PASSTHRU);
-}
-
-static PHP_METHOD(google_protobuf_FloatValue, getValue) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "value");
-  zval ret;
-  Message_get(intern, f, &ret);
-  RETURN_COPY_VALUE(&ret);
-}
-
-static PHP_METHOD(google_protobuf_FloatValue, setValue) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "value");
-  zval *val;
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &val)
-      == FAILURE) {
-    return;
-  }
-  Message_set(intern, f, val);
-  RETURN_COPY(getThis());
-}
-
-static zend_function_entry google_protobuf_FloatValue_phpmethods[] = {
-  PHP_ME(google_protobuf_FloatValue, __construct, arginfo_construct, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_FloatValue, getValue, arginfo_void, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_FloatValue, setValue, arginfo_setter, ZEND_ACC_PUBLIC)
-  ZEND_FE_END
-};
-
-static void google_protobuf_FloatValue_ModuleInit() {
-  zend_class_entry tmp_ce;
-
-  INIT_CLASS_ENTRY(tmp_ce, "Google\\Protobuf\\FloatValue",
-                   google_protobuf_FloatValue_phpmethods);
-
-  google_protobuf_FloatValue_ce = zend_register_internal_class(&tmp_ce);
-  google_protobuf_FloatValue_ce->ce_flags |= ZEND_ACC_FINAL;
-  google_protobuf_FloatValue_ce->create_object = Message_create;
-  zend_do_inheritance(google_protobuf_FloatValue_ce, message_ce);
-}
-
-/* google_protobuf_Int64Value */
-
-zend_class_entry* google_protobuf_Int64Value_ce;
-
-static PHP_METHOD(google_protobuf_Int64Value, __construct) {
-  google_protobuf_wrappers_proto_AddDescriptor();
-  zim_Message___construct(INTERNAL_FUNCTION_PARAM_PASSTHRU);
-}
-
-static PHP_METHOD(google_protobuf_Int64Value, getValue) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "value");
-  zval ret;
-  Message_get(intern, f, &ret);
-  RETURN_COPY_VALUE(&ret);
-}
-
-static PHP_METHOD(google_protobuf_Int64Value, setValue) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "value");
-  zval *val;
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &val)
-      == FAILURE) {
-    return;
-  }
-  Message_set(intern, f, val);
-  RETURN_COPY(getThis());
-}
-
-static zend_function_entry google_protobuf_Int64Value_phpmethods[] = {
-  PHP_ME(google_protobuf_Int64Value, __construct, arginfo_construct, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Int64Value, getValue, arginfo_void, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Int64Value, setValue, arginfo_setter, ZEND_ACC_PUBLIC)
-  ZEND_FE_END
-};
-
-static void google_protobuf_Int64Value_ModuleInit() {
-  zend_class_entry tmp_ce;
-
-  INIT_CLASS_ENTRY(tmp_ce, "Google\\Protobuf\\Int64Value",
-                   google_protobuf_Int64Value_phpmethods);
-
-  google_protobuf_Int64Value_ce = zend_register_internal_class(&tmp_ce);
-  google_protobuf_Int64Value_ce->ce_flags |= ZEND_ACC_FINAL;
-  google_protobuf_Int64Value_ce->create_object = Message_create;
-  zend_do_inheritance(google_protobuf_Int64Value_ce, message_ce);
-}
-
-/* google_protobuf_UInt64Value */
-
-zend_class_entry* google_protobuf_UInt64Value_ce;
-
-static PHP_METHOD(google_protobuf_UInt64Value, __construct) {
-  google_protobuf_wrappers_proto_AddDescriptor();
-  zim_Message___construct(INTERNAL_FUNCTION_PARAM_PASSTHRU);
-}
-
-static PHP_METHOD(google_protobuf_UInt64Value, getValue) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "value");
-  zval ret;
-  Message_get(intern, f, &ret);
-  RETURN_COPY_VALUE(&ret);
-}
-
-static PHP_METHOD(google_protobuf_UInt64Value, setValue) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "value");
-  zval *val;
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &val)
-      == FAILURE) {
-    return;
-  }
-  Message_set(intern, f, val);
-  RETURN_COPY(getThis());
-}
-
-static zend_function_entry google_protobuf_UInt64Value_phpmethods[] = {
-  PHP_ME(google_protobuf_UInt64Value, __construct, arginfo_construct, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_UInt64Value, getValue, arginfo_void, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_UInt64Value, setValue, arginfo_setter, ZEND_ACC_PUBLIC)
-  ZEND_FE_END
-};
-
-static void google_protobuf_UInt64Value_ModuleInit() {
-  zend_class_entry tmp_ce;
-
-  INIT_CLASS_ENTRY(tmp_ce, "Google\\Protobuf\\UInt64Value",
-                   google_protobuf_UInt64Value_phpmethods);
-
-  google_protobuf_UInt64Value_ce = zend_register_internal_class(&tmp_ce);
-  google_protobuf_UInt64Value_ce->ce_flags |= ZEND_ACC_FINAL;
-  google_protobuf_UInt64Value_ce->create_object = Message_create;
-  zend_do_inheritance(google_protobuf_UInt64Value_ce, message_ce);
-}
-
-/* google_protobuf_Int32Value */
-
-zend_class_entry* google_protobuf_Int32Value_ce;
-
-static PHP_METHOD(google_protobuf_Int32Value, __construct) {
-  google_protobuf_wrappers_proto_AddDescriptor();
-  zim_Message___construct(INTERNAL_FUNCTION_PARAM_PASSTHRU);
-}
-
-static PHP_METHOD(google_protobuf_Int32Value, getValue) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "value");
-  zval ret;
-  Message_get(intern, f, &ret);
-  RETURN_COPY_VALUE(&ret);
-}
-
-static PHP_METHOD(google_protobuf_Int32Value, setValue) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "value");
-  zval *val;
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &val)
-      == FAILURE) {
-    return;
-  }
-  Message_set(intern, f, val);
-  RETURN_COPY(getThis());
-}
-
-static zend_function_entry google_protobuf_Int32Value_phpmethods[] = {
-  PHP_ME(google_protobuf_Int32Value, __construct, arginfo_construct, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Int32Value, getValue, arginfo_void, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_Int32Value, setValue, arginfo_setter, ZEND_ACC_PUBLIC)
-  ZEND_FE_END
-};
-
-static void google_protobuf_Int32Value_ModuleInit() {
-  zend_class_entry tmp_ce;
-
-  INIT_CLASS_ENTRY(tmp_ce, "Google\\Protobuf\\Int32Value",
-                   google_protobuf_Int32Value_phpmethods);
-
-  google_protobuf_Int32Value_ce = zend_register_internal_class(&tmp_ce);
-  google_protobuf_Int32Value_ce->ce_flags |= ZEND_ACC_FINAL;
-  google_protobuf_Int32Value_ce->create_object = Message_create;
-  zend_do_inheritance(google_protobuf_Int32Value_ce, message_ce);
-}
-
-/* google_protobuf_UInt32Value */
-
-zend_class_entry* google_protobuf_UInt32Value_ce;
-
-static PHP_METHOD(google_protobuf_UInt32Value, __construct) {
-  google_protobuf_wrappers_proto_AddDescriptor();
-  zim_Message___construct(INTERNAL_FUNCTION_PARAM_PASSTHRU);
-}
-
-static PHP_METHOD(google_protobuf_UInt32Value, getValue) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "value");
-  zval ret;
-  Message_get(intern, f, &ret);
-  RETURN_COPY_VALUE(&ret);
-}
-
-static PHP_METHOD(google_protobuf_UInt32Value, setValue) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "value");
-  zval *val;
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &val)
-      == FAILURE) {
-    return;
-  }
-  Message_set(intern, f, val);
-  RETURN_COPY(getThis());
-}
-
-static zend_function_entry google_protobuf_UInt32Value_phpmethods[] = {
-  PHP_ME(google_protobuf_UInt32Value, __construct, arginfo_construct, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_UInt32Value, getValue, arginfo_void, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_UInt32Value, setValue, arginfo_setter, ZEND_ACC_PUBLIC)
-  ZEND_FE_END
-};
-
-static void google_protobuf_UInt32Value_ModuleInit() {
-  zend_class_entry tmp_ce;
-
-  INIT_CLASS_ENTRY(tmp_ce, "Google\\Protobuf\\UInt32Value",
-                   google_protobuf_UInt32Value_phpmethods);
-
-  google_protobuf_UInt32Value_ce = zend_register_internal_class(&tmp_ce);
-  google_protobuf_UInt32Value_ce->ce_flags |= ZEND_ACC_FINAL;
-  google_protobuf_UInt32Value_ce->create_object = Message_create;
-  zend_do_inheritance(google_protobuf_UInt32Value_ce, message_ce);
-}
-
-/* google_protobuf_BoolValue */
-
-zend_class_entry* google_protobuf_BoolValue_ce;
-
-static PHP_METHOD(google_protobuf_BoolValue, __construct) {
-  google_protobuf_wrappers_proto_AddDescriptor();
-  zim_Message___construct(INTERNAL_FUNCTION_PARAM_PASSTHRU);
-}
-
-static PHP_METHOD(google_protobuf_BoolValue, getValue) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "value");
-  zval ret;
-  Message_get(intern, f, &ret);
-  RETURN_COPY_VALUE(&ret);
-}
-
-static PHP_METHOD(google_protobuf_BoolValue, setValue) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "value");
-  zval *val;
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &val)
-      == FAILURE) {
-    return;
-  }
-  Message_set(intern, f, val);
-  RETURN_COPY(getThis());
-}
-
-static zend_function_entry google_protobuf_BoolValue_phpmethods[] = {
-  PHP_ME(google_protobuf_BoolValue, __construct, arginfo_construct, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_BoolValue, getValue, arginfo_void, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_BoolValue, setValue, arginfo_setter, ZEND_ACC_PUBLIC)
-  ZEND_FE_END
-};
-
-static void google_protobuf_BoolValue_ModuleInit() {
-  zend_class_entry tmp_ce;
-
-  INIT_CLASS_ENTRY(tmp_ce, "Google\\Protobuf\\BoolValue",
-                   google_protobuf_BoolValue_phpmethods);
-
-  google_protobuf_BoolValue_ce = zend_register_internal_class(&tmp_ce);
-  google_protobuf_BoolValue_ce->ce_flags |= ZEND_ACC_FINAL;
-  google_protobuf_BoolValue_ce->create_object = Message_create;
-  zend_do_inheritance(google_protobuf_BoolValue_ce, message_ce);
-}
-
-/* google_protobuf_StringValue */
-
-zend_class_entry* google_protobuf_StringValue_ce;
-
-static PHP_METHOD(google_protobuf_StringValue, __construct) {
-  google_protobuf_wrappers_proto_AddDescriptor();
-  zim_Message___construct(INTERNAL_FUNCTION_PARAM_PASSTHRU);
-}
-
-static PHP_METHOD(google_protobuf_StringValue, getValue) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "value");
-  zval ret;
-  Message_get(intern, f, &ret);
-  RETURN_COPY_VALUE(&ret);
-}
-
-static PHP_METHOD(google_protobuf_StringValue, setValue) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "value");
-  zval *val;
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &val)
-      == FAILURE) {
-    return;
-  }
-  Message_set(intern, f, val);
-  RETURN_COPY(getThis());
-}
-
-static zend_function_entry google_protobuf_StringValue_phpmethods[] = {
-  PHP_ME(google_protobuf_StringValue, __construct, arginfo_construct, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_StringValue, getValue, arginfo_void, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_StringValue, setValue, arginfo_setter, ZEND_ACC_PUBLIC)
-  ZEND_FE_END
-};
-
-static void google_protobuf_StringValue_ModuleInit() {
-  zend_class_entry tmp_ce;
-
-  INIT_CLASS_ENTRY(tmp_ce, "Google\\Protobuf\\StringValue",
-                   google_protobuf_StringValue_phpmethods);
-
-  google_protobuf_StringValue_ce = zend_register_internal_class(&tmp_ce);
-  google_protobuf_StringValue_ce->ce_flags |= ZEND_ACC_FINAL;
-  google_protobuf_StringValue_ce->create_object = Message_create;
-  zend_do_inheritance(google_protobuf_StringValue_ce, message_ce);
-}
-
-/* google_protobuf_BytesValue */
-
-zend_class_entry* google_protobuf_BytesValue_ce;
-
-static PHP_METHOD(google_protobuf_BytesValue, __construct) {
-  google_protobuf_wrappers_proto_AddDescriptor();
-  zim_Message___construct(INTERNAL_FUNCTION_PARAM_PASSTHRU);
-}
-
-static PHP_METHOD(google_protobuf_BytesValue, getValue) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "value");
-  zval ret;
-  Message_get(intern, f, &ret);
-  RETURN_COPY_VALUE(&ret);
-}
-
-static PHP_METHOD(google_protobuf_BytesValue, setValue) {
-  Message* intern = (Message*)Z_OBJ_P(getThis());
-  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(
-      intern->desc->msgdef, "value");
-  zval *val;
-  if (zend_parse_parameters(ZEND_NUM_ARGS(), "z", &val)
-      == FAILURE) {
-    return;
-  }
-  Message_set(intern, f, val);
-  RETURN_COPY(getThis());
-}
-
-static zend_function_entry google_protobuf_BytesValue_phpmethods[] = {
-  PHP_ME(google_protobuf_BytesValue, __construct, arginfo_construct, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_BytesValue, getValue, arginfo_void, ZEND_ACC_PUBLIC)
-  PHP_ME(google_protobuf_BytesValue, setValue, arginfo_setter, ZEND_ACC_PUBLIC)
-  ZEND_FE_END
-};
-
-static void google_protobuf_BytesValue_ModuleInit() {
-  zend_class_entry tmp_ce;
-
-  INIT_CLASS_ENTRY(tmp_ce, "Google\\Protobuf\\BytesValue",
-                   google_protobuf_BytesValue_phpmethods);
-
-  google_protobuf_BytesValue_ce = zend_register_internal_class(&tmp_ce);
-  google_protobuf_BytesValue_ce->ce_flags |= ZEND_ACC_FINAL;
-  google_protobuf_BytesValue_ce->create_object = Message_create;
-  zend_do_inheritance(google_protobuf_BytesValue_ce, message_ce);
-}
-
-static void WellKnownTypes_ModuleInit() {
-  GPBMetadata_Google_Protobuf_Any_ModuleInit();
-  google_protobuf_Any_ModuleInit();
-  GPBMetadata_Google_Protobuf_Api_ModuleInit();
-  google_protobuf_Api_ModuleInit();
-  google_protobuf_Method_ModuleInit();
-  google_protobuf_Mixin_ModuleInit();
-  GPBMetadata_Google_Protobuf_Duration_ModuleInit();
-  google_protobuf_Duration_ModuleInit();
-  GPBMetadata_Google_Protobuf_GPBEmpty_ModuleInit();
-  google_protobuf_Empty_ModuleInit();
-  GPBMetadata_Google_Protobuf_FieldMask_ModuleInit();
-  google_protobuf_FieldMask_ModuleInit();
-  GPBMetadata_Google_Protobuf_SourceContext_ModuleInit();
-  google_protobuf_SourceContext_ModuleInit();
-  GPBMetadata_Google_Protobuf_Struct_ModuleInit();
-  google_protobuf_Struct_ModuleInit();
-  google_protobuf_Struct_FieldsEntry_ModuleInit();
-  google_protobuf_Value_ModuleInit();
-  google_protobuf_ListValue_ModuleInit();
-  google_protobuf_NullValue_ModuleInit();
-  GPBMetadata_Google_Protobuf_Type_ModuleInit();
-  google_protobuf_Type_ModuleInit();
-  google_protobuf_Field_ModuleInit();
-  google_protobuf_Field_Kind_ModuleInit();
-  google_protobuf_Field_Cardinality_ModuleInit();
-  google_protobuf_Enum_ModuleInit();
-  google_protobuf_EnumValue_ModuleInit();
-  google_protobuf_Option_ModuleInit();
-  google_protobuf_Syntax_ModuleInit();
-  GPBMetadata_Google_Protobuf_Timestamp_ModuleInit();
-  google_protobuf_Timestamp_ModuleInit();
-  GPBMetadata_Google_Protobuf_Wrappers_ModuleInit();
-  google_protobuf_DoubleValue_ModuleInit();
-  google_protobuf_FloatValue_ModuleInit();
-  google_protobuf_Int64Value_ModuleInit();
-  google_protobuf_UInt64Value_ModuleInit();
-  google_protobuf_Int32Value_ModuleInit();
-  google_protobuf_UInt32Value_ModuleInit();
-  google_protobuf_BoolValue_ModuleInit();
-  google_protobuf_StringValue_ModuleInit();
-  google_protobuf_BytesValue_ModuleInit();
-}
diff --git a/libs/protobuf/php/generate_descriptor_protos.sh b/libs/protobuf/php/generate_descriptor_protos.sh
deleted file mode 100755
index 9feaa96..0000000
--- a/libs/protobuf/php/generate_descriptor_protos.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/usr/bin/env bash
-
-# Run this script to regenerate descriptor protos after the protocol compiler
-# changes.
-
-set -e
-
-if test ! -e src/google/protobuf/stubs/common.h; then
-  cat >&2 << __EOF__
-Could not find source code.  Make sure you are running this script from the
-root of the distribution tree.
-__EOF__
-  exit 1
-fi
-
-pushd src
-./protoc --php_out=internal:../php/src google/protobuf/descriptor.proto
-./protoc --php_out=internal_generate_c_wkt:../php/src \
-  google/protobuf/any.proto \
-  google/protobuf/api.proto \
-  google/protobuf/duration.proto \
-  google/protobuf/empty.proto \
-  google/protobuf/field_mask.proto \
-  google/protobuf/source_context.proto \
-  google/protobuf/struct.proto \
-  google/protobuf/type.proto \
-  google/protobuf/timestamp.proto \
-  google/protobuf/wrappers.proto
-popd
diff --git a/libs/protobuf/php/generate_test_protos.sh b/libs/protobuf/php/generate_test_protos.sh
deleted file mode 100755
index 8607499..0000000
--- a/libs/protobuf/php/generate_test_protos.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-cd `dirname $0`
-
-if ../src/protoc --help > /dev/null; then
-  PROTOC=src/protoc
-else
-  # Bazel seems to be creating a problematic symlink in
-  # _build/out/external/com_google_protobuf, so we remove the _build directory
-  # before building protoc.
-  (cd .. && bazel build -c opt :protoc)
-  PROTOC=bazel-bin/protoc
-fi
-
-if [[ -d tmp && -z $(find tests/proto ../$PROTOC -newer tmp) ]]; then
-  # Generated protos are already present and up to date, so we can skip protoc.
-  #
-  # Protoc is very fast, but sometimes it is not available (like if we haven't
-  # built it in Docker). Skipping it helps us proceed in this case.
-  echo "Test protos are up-to-date, skipping protoc."
-  exit 0
-fi
-
-rm -rf tmp
-mkdir -p tmp
-
-cd ..
-find php/tests/proto -type f -name "*.proto"| xargs $PROTOC --php_out=php/tmp -Isrc -Iphp/tests
-
-if [ "$1" = "--aggregate_metadata" ]; then
-  # Overwrite some of the files to use aggregation.
-  AGGREGATED_FILES="tests/proto/test.proto tests/proto/test_include.proto tests/proto/test_import_descriptor_proto.proto"
-  $PROTOC --php_out=aggregate_metadata=foo#bar:php/tmp -Isrc -Iphp/tests $AGGREGATED_FILES
-fi
-
-echo "Generated test protos from tests/proto -> tmp"
diff --git a/libs/protobuf/php/release.sh b/libs/protobuf/php/release.sh
deleted file mode 100755
index f75906a..0000000
--- a/libs/protobuf/php/release.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-# Make sure we are in a protobuf source tree.
-[ -f "php/release.sh" ] || {
-  echo "This script must be ran under root of protobuf source tree."
-  exit 1
-}
-
-VERSION=$1
-
-rm -rf protobuf-php
-git clone https://github.com/protocolbuffers/protobuf-php.git
-
-# Clean old files
-rm -rf protobuf-php/src
-
-# Copy files
-cp -r php/src protobuf-php
-cp php/composer.json.dist protobuf-php/composer.json
-
-cd protobuf-php
-git add .
-git commit -m "$VERSION"
-if [ $(git tag -l "$VERSION") ]; then
-  echo "tag $VERSION already exists"
-else
-  git tag "$VERSION"
-fi
diff --git a/libs/protobuf/php/src/GPBMetadata/Google/Protobuf/Any.php b/libs/protobuf/php/src/GPBMetadata/Google/Protobuf/Any.php
deleted file mode 100644
index fbce4bf..0000000
--- a/libs/protobuf/php/src/GPBMetadata/Google/Protobuf/Any.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: google/protobuf/any.proto
-
-namespace GPBMetadata\Google\Protobuf;
-
-class Any
-{
-    public static $is_initialized = false;
-
-    public static function initOnce() {
-        $pool = \Google\Protobuf\Internal\DescriptorPool::getGeneratedPool();
-
-        if (static::$is_initialized == true) {
-          return;
-        }
-        $pool->internalAddGeneratedFile(
-            '
-Ô

-google/protobuf/any.protogoogle.protobuf"&
-Any
-type_url
 
(	
-value 
(Bv
-com.google.protobufBAnyProtoP
Z,google.golang.org/protobuf/types/known/anypb¢GPBªGoogle.Protobuf.WellKnownTypesbproto3'
-        , true);
-
-        static::$is_initialized = true;
-    }
-}
-
diff --git a/libs/protobuf/php/src/GPBMetadata/Google/Protobuf/Api.php b/libs/protobuf/php/src/GPBMetadata/Google/Protobuf/Api.php
deleted file mode 100644
index 75e0ec6..0000000
--- a/libs/protobuf/php/src/GPBMetadata/Google/Protobuf/Api.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: google/protobuf/api.proto
-
-namespace GPBMetadata\Google\Protobuf;
-
-class Api
-{
-    public static $is_initialized = false;
-
-    public static function initOnce() {
-        $pool = \Google\Protobuf\Internal\DescriptorPool::getGeneratedPool();
-
-        if (static::$is_initialized == true) {
-          return;
-        }
-        \GPBMetadata\Google\Protobuf\SourceContext::initOnce();
-        \GPBMetadata\Google\Protobuf\Type::initOnce();
-        $pool->internalAddGeneratedFile(
-            '
-É
-google/protobuf/api.protogoogle.protobufgoogle/protobuf/type.proto"�
-Api
-name
 
(	(
-methods (2.google.protobuf.Method(
-options (2.google.protobuf.Option
-version 
(	6
-source_context 
(2.google.protobuf.SourceContext&
-mixins (2.google.protobuf.Mixin\'
-syntax 
(2.google.protobuf.Syntax"Õ

-Method
-name
 
(	
-request_type_url 
(	
-request_streaming 
(
-response_type_url 
(	
-response_streaming 
((
-options (2.google.protobuf.Option\'
-syntax 
(2.google.protobuf.Syntax"#
-Mixin
-name
 
(	
-root 
(	Bv
-com.google.protobufBApiProtoP
Z,google.golang.org/protobuf/types/known/apipb¢GPBªGoogle.Protobuf.WellKnownTypesbproto3'
-        , true);
-
-        static::$is_initialized = true;
-    }
-}
-
diff --git a/libs/protobuf/php/src/GPBMetadata/Google/Protobuf/Duration.php b/libs/protobuf/php/src/GPBMetadata/Google/Protobuf/Duration.php
deleted file mode 100644
index 5d8023e..0000000
--- a/libs/protobuf/php/src/GPBMetadata/Google/Protobuf/Duration.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: google/protobuf/duration.proto
-
-namespace GPBMetadata\Google\Protobuf;
-
-class Duration
-{
-    public static $is_initialized = false;
-
-    public static function initOnce() {
-        $pool = \Google\Protobuf\Internal\DescriptorPool::getGeneratedPool();
-
-        if (static::$is_initialized == true) {
-          return;
-        }
-        $pool->internalAddGeneratedFile(
-            '
-ë

-google/protobuf/duration.protogoogle.protobuf"*
-Duration
-seconds
 
(
-nanos 
(Bƒ

-com.google.protobufB
DurationProtoP
Z1google.golang.org/protobuf/types/known/durationpbø

¢GPBªGoogle.Protobuf.WellKnownTypesbproto3'
-        , true);
-
-        static::$is_initialized = true;
-    }
-}
-
diff --git a/libs/protobuf/php/src/GPBMetadata/Google/Protobuf/FieldMask.php b/libs/protobuf/php/src/GPBMetadata/Google/Protobuf/FieldMask.php
deleted file mode 100644
index f31bcc0..0000000
--- a/libs/protobuf/php/src/GPBMetadata/Google/Protobuf/FieldMask.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: google/protobuf/field_mask.proto
-
-namespace GPBMetadata\Google\Protobuf;
-
-class FieldMask
-{
-    public static $is_initialized = false;
-
-    public static function initOnce() {
-        $pool = \Google\Protobuf\Internal\DescriptorPool::getGeneratedPool();
-
-        if (static::$is_initialized == true) {
-          return;
-        }
-        $pool->internalAddGeneratedFile(
-            '
-ß

- google/protobuf/field_mask.protogoogle.protobuf"
-	FieldMask
-paths
 (	B…

-com.google.protobufBFieldMaskProtoP
Z2google.golang.org/protobuf/types/known/fieldmaskpbø

¢GPBªGoogle.Protobuf.WellKnownTypesbproto3'
-        , true);
-
-        static::$is_initialized = true;
-    }
-}
-
diff --git a/libs/protobuf/php/src/GPBMetadata/Google/Protobuf/GPBEmpty.php b/libs/protobuf/php/src/GPBMetadata/Google/Protobuf/GPBEmpty.php
deleted file mode 100644
index 5e42536..0000000
--- a/libs/protobuf/php/src/GPBMetadata/Google/Protobuf/GPBEmpty.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: google/protobuf/empty.proto
-
-namespace GPBMetadata\Google\Protobuf;
-
-class GPBEmpty
-{
-    public static $is_initialized = false;
-
-    public static function initOnce() {
-        $pool = \Google\Protobuf\Internal\DescriptorPool::getGeneratedPool();
-
-        if (static::$is_initialized == true) {
-          return;
-        }
-        $pool->internalAddGeneratedFile(
-            '
-¾

-google/protobuf/empty.protogoogle.protobuf"
-EmptyB}
-com.google.protobufB
-EmptyProtoP
Z.google.golang.org/protobuf/types/known/emptypbø

¢GPBªGoogle.Protobuf.WellKnownTypesbproto3'
-        , true);
-
-        static::$is_initialized = true;
-    }
-}
-
diff --git a/libs/protobuf/php/src/GPBMetadata/Google/Protobuf/Internal/Descriptor.php b/libs/protobuf/php/src/GPBMetadata/Google/Protobuf/Internal/Descriptor.php
deleted file mode 100644
index d71def9..0000000
--- a/libs/protobuf/php/src/GPBMetadata/Google/Protobuf/Internal/Descriptor.php
+++ /dev/null
@@ -1,279 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: google/protobuf/descriptor.proto
-
-namespace GPBMetadata\Google\Protobuf\Internal;
-
-class Descriptor
-{
-    public static $is_initialized = false;
-
-    public static function initOnce() {
-        $pool = \Google\Protobuf\Internal\DescriptorPool::getGeneratedPool();
-
-        if (static::$is_initialized == true) {
-          return;
-        }
-        $pool->addMessage('google.protobuf.internal.FileDescriptorSet', \Google\Protobuf\Internal\FileDescriptorSet::class)
-            ->repeated('file', \Google\Protobuf\Internal\GPBType::MESSAGE, 1, 'google.protobuf.internal.FileDescriptorProto')
-            ->finalizeToPool();
-
-        $pool->addMessage('google.protobuf.internal.FileDescriptorProto', \Google\Protobuf\Internal\FileDescriptorProto::class)
-            ->optional('name', \Google\Protobuf\Internal\GPBType::STRING, 1)
-            ->optional('package', \Google\Protobuf\Internal\GPBType::STRING, 2)
-            ->repeated('dependency', \Google\Protobuf\Internal\GPBType::STRING, 3)
-            ->repeated('public_dependency', \Google\Protobuf\Internal\GPBType::INT32, 10)
-            ->repeated('weak_dependency', \Google\Protobuf\Internal\GPBType::INT32, 11)
-            ->repeated('message_type', \Google\Protobuf\Internal\GPBType::MESSAGE, 4, 'google.protobuf.internal.DescriptorProto')
-            ->repeated('enum_type', \Google\Protobuf\Internal\GPBType::MESSAGE, 5, 'google.protobuf.internal.EnumDescriptorProto')
-            ->repeated('service', \Google\Protobuf\Internal\GPBType::MESSAGE, 6, 'google.protobuf.internal.ServiceDescriptorProto')
-            ->repeated('extension', \Google\Protobuf\Internal\GPBType::MESSAGE, 7, 'google.protobuf.internal.FieldDescriptorProto')
-            ->optional('options', \Google\Protobuf\Internal\GPBType::MESSAGE, 8, 'google.protobuf.internal.FileOptions')
-            ->optional('source_code_info', \Google\Protobuf\Internal\GPBType::MESSAGE, 9, 'google.protobuf.internal.SourceCodeInfo')
-            ->optional('syntax', \Google\Protobuf\Internal\GPBType::STRING, 12)
-            ->finalizeToPool();
-
-        $pool->addMessage('google.protobuf.internal.DescriptorProto', \Google\Protobuf\Internal\DescriptorProto::class)
-            ->optional('name', \Google\Protobuf\Internal\GPBType::STRING, 1)
-            ->repeated('field', \Google\Protobuf\Internal\GPBType::MESSAGE, 2, 'google.protobuf.internal.FieldDescriptorProto')
-            ->repeated('extension', \Google\Protobuf\Internal\GPBType::MESSAGE, 6, 'google.protobuf.internal.FieldDescriptorProto')
-            ->repeated('nested_type', \Google\Protobuf\Internal\GPBType::MESSAGE, 3, 'google.protobuf.internal.DescriptorProto')
-            ->repeated('enum_type', \Google\Protobuf\Internal\GPBType::MESSAGE, 4, 'google.protobuf.internal.EnumDescriptorProto')
-            ->repeated('extension_range', \Google\Protobuf\Internal\GPBType::MESSAGE, 5, 'google.protobuf.internal.DescriptorProto.ExtensionRange')
-            ->repeated('oneof_decl', \Google\Protobuf\Internal\GPBType::MESSAGE, 8, 'google.protobuf.internal.OneofDescriptorProto')
-            ->optional('options', \Google\Protobuf\Internal\GPBType::MESSAGE, 7, 'google.protobuf.internal.MessageOptions')
-            ->repeated('reserved_range', \Google\Protobuf\Internal\GPBType::MESSAGE, 9, 'google.protobuf.internal.DescriptorProto.ReservedRange')
-            ->repeated('reserved_name', \Google\Protobuf\Internal\GPBType::STRING, 10)
-            ->finalizeToPool();
-
-        $pool->addMessage('google.protobuf.internal.DescriptorProto.ExtensionRange', \Google\Protobuf\Internal\DescriptorProto\ExtensionRange::class)
-            ->optional('start', \Google\Protobuf\Internal\GPBType::INT32, 1)
-            ->optional('end', \Google\Protobuf\Internal\GPBType::INT32, 2)
-            ->optional('options', \Google\Protobuf\Internal\GPBType::MESSAGE, 3, 'google.protobuf.internal.ExtensionRangeOptions')
-            ->finalizeToPool();
-
-        $pool->addMessage('google.protobuf.internal.DescriptorProto.ReservedRange', \Google\Protobuf\Internal\DescriptorProto\ReservedRange::class)
-            ->optional('start', \Google\Protobuf\Internal\GPBType::INT32, 1)
-            ->optional('end', \Google\Protobuf\Internal\GPBType::INT32, 2)
-            ->finalizeToPool();
-
-        $pool->addMessage('google.protobuf.internal.ExtensionRangeOptions', \Google\Protobuf\Internal\ExtensionRangeOptions::class)
-            ->repeated('uninterpreted_option', \Google\Protobuf\Internal\GPBType::MESSAGE, 999, 'google.protobuf.internal.UninterpretedOption')
-            ->finalizeToPool();
-
-        $pool->addMessage('google.protobuf.internal.FieldDescriptorProto', \Google\Protobuf\Internal\FieldDescriptorProto::class)
-            ->optional('name', \Google\Protobuf\Internal\GPBType::STRING, 1)
-            ->optional('number', \Google\Protobuf\Internal\GPBType::INT32, 3)
-            ->optional('label', \Google\Protobuf\Internal\GPBType::ENUM, 4, 'google.protobuf.internal.FieldDescriptorProto.Label')
-            ->optional('type', \Google\Protobuf\Internal\GPBType::ENUM, 5, 'google.protobuf.internal.FieldDescriptorProto.Type')
-            ->optional('type_name', \Google\Protobuf\Internal\GPBType::STRING, 6)
-            ->optional('extendee', \Google\Protobuf\Internal\GPBType::STRING, 2)
-            ->optional('default_value', \Google\Protobuf\Internal\GPBType::STRING, 7)
-            ->optional('oneof_index', \Google\Protobuf\Internal\GPBType::INT32, 9)
-            ->optional('json_name', \Google\Protobuf\Internal\GPBType::STRING, 10)
-            ->optional('options', \Google\Protobuf\Internal\GPBType::MESSAGE, 8, 'google.protobuf.internal.FieldOptions')
-            ->optional('proto3_optional', \Google\Protobuf\Internal\GPBType::BOOL, 17)
-            ->finalizeToPool();
-
-        $pool->addEnum('google.protobuf.internal.FieldDescriptorProto.Type', \Google\Protobuf\Internal\Type::class)
-            ->value("TYPE_DOUBLE", 1)
-            ->value("TYPE_FLOAT", 2)
-            ->value("TYPE_INT64", 3)
-            ->value("TYPE_UINT64", 4)
-            ->value("TYPE_INT32", 5)
-            ->value("TYPE_FIXED64", 6)
-            ->value("TYPE_FIXED32", 7)
-            ->value("TYPE_BOOL", 8)
-            ->value("TYPE_STRING", 9)
-            ->value("TYPE_GROUP", 10)
-            ->value("TYPE_MESSAGE", 11)
-            ->value("TYPE_BYTES", 12)
-            ->value("TYPE_UINT32", 13)
-            ->value("TYPE_ENUM", 14)
-            ->value("TYPE_SFIXED32", 15)
-            ->value("TYPE_SFIXED64", 16)
-            ->value("TYPE_SINT32", 17)
-            ->value("TYPE_SINT64", 18)
-            ->finalizeToPool();
-
-        $pool->addEnum('google.protobuf.internal.FieldDescriptorProto.Label', \Google\Protobuf\Internal\Label::class)
-            ->value("LABEL_OPTIONAL", 1)
-            ->value("LABEL_REQUIRED", 2)
-            ->value("LABEL_REPEATED", 3)
-            ->finalizeToPool();
-
-        $pool->addMessage('google.protobuf.internal.OneofDescriptorProto', \Google\Protobuf\Internal\OneofDescriptorProto::class)
-            ->optional('name', \Google\Protobuf\Internal\GPBType::STRING, 1)
-            ->optional('options', \Google\Protobuf\Internal\GPBType::MESSAGE, 2, 'google.protobuf.internal.OneofOptions')
-            ->finalizeToPool();
-
-        $pool->addMessage('google.protobuf.internal.EnumDescriptorProto', \Google\Protobuf\Internal\EnumDescriptorProto::class)
-            ->optional('name', \Google\Protobuf\Internal\GPBType::STRING, 1)
-            ->repeated('value', \Google\Protobuf\Internal\GPBType::MESSAGE, 2, 'google.protobuf.internal.EnumValueDescriptorProto')
-            ->optional('options', \Google\Protobuf\Internal\GPBType::MESSAGE, 3, 'google.protobuf.internal.EnumOptions')
-            ->repeated('reserved_range', \Google\Protobuf\Internal\GPBType::MESSAGE, 4, 'google.protobuf.internal.EnumDescriptorProto.EnumReservedRange')
-            ->repeated('reserved_name', \Google\Protobuf\Internal\GPBType::STRING, 5)
-            ->finalizeToPool();
-
-        $pool->addMessage('google.protobuf.internal.EnumDescriptorProto.EnumReservedRange', \Google\Protobuf\Internal\EnumDescriptorProto\EnumReservedRange::class)
-            ->optional('start', \Google\Protobuf\Internal\GPBType::INT32, 1)
-            ->optional('end', \Google\Protobuf\Internal\GPBType::INT32, 2)
-            ->finalizeToPool();
-
-        $pool->addMessage('google.protobuf.internal.EnumValueDescriptorProto', \Google\Protobuf\Internal\EnumValueDescriptorProto::class)
-            ->optional('name', \Google\Protobuf\Internal\GPBType::STRING, 1)
-            ->optional('number', \Google\Protobuf\Internal\GPBType::INT32, 2)
-            ->optional('options', \Google\Protobuf\Internal\GPBType::MESSAGE, 3, 'google.protobuf.internal.EnumValueOptions')
-            ->finalizeToPool();
-
-        $pool->addMessage('google.protobuf.internal.ServiceDescriptorProto', \Google\Protobuf\Internal\ServiceDescriptorProto::class)
-            ->optional('name', \Google\Protobuf\Internal\GPBType::STRING, 1)
-            ->repeated('method', \Google\Protobuf\Internal\GPBType::MESSAGE, 2, 'google.protobuf.internal.MethodDescriptorProto')
-            ->optional('options', \Google\Protobuf\Internal\GPBType::MESSAGE, 3, 'google.protobuf.internal.ServiceOptions')
-            ->finalizeToPool();
-
-        $pool->addMessage('google.protobuf.internal.MethodDescriptorProto', \Google\Protobuf\Internal\MethodDescriptorProto::class)
-            ->optional('name', \Google\Protobuf\Internal\GPBType::STRING, 1)
-            ->optional('input_type', \Google\Protobuf\Internal\GPBType::STRING, 2)
-            ->optional('output_type', \Google\Protobuf\Internal\GPBType::STRING, 3)
-            ->optional('options', \Google\Protobuf\Internal\GPBType::MESSAGE, 4, 'google.protobuf.internal.MethodOptions')
-            ->optional('client_streaming', \Google\Protobuf\Internal\GPBType::BOOL, 5)
-            ->optional('server_streaming', \Google\Protobuf\Internal\GPBType::BOOL, 6)
-            ->finalizeToPool();
-
-        $pool->addMessage('google.protobuf.internal.FileOptions', \Google\Protobuf\Internal\FileOptions::class)
-            ->optional('java_package', \Google\Protobuf\Internal\GPBType::STRING, 1)
-            ->optional('java_outer_classname', \Google\Protobuf\Internal\GPBType::STRING, 8)
-            ->optional('java_multiple_files', \Google\Protobuf\Internal\GPBType::BOOL, 10)
-            ->optional('java_generate_equals_and_hash', \Google\Protobuf\Internal\GPBType::BOOL, 20)
-            ->optional('java_string_check_utf8', \Google\Protobuf\Internal\GPBType::BOOL, 27)
-            ->optional('optimize_for', \Google\Protobuf\Internal\GPBType::ENUM, 9, 'google.protobuf.internal.FileOptions.OptimizeMode')
-            ->optional('go_package', \Google\Protobuf\Internal\GPBType::STRING, 11)
-            ->optional('cc_generic_services', \Google\Protobuf\Internal\GPBType::BOOL, 16)
-            ->optional('java_generic_services', \Google\Protobuf\Internal\GPBType::BOOL, 17)
-            ->optional('py_generic_services', \Google\Protobuf\Internal\GPBType::BOOL, 18)
-            ->optional('php_generic_services', \Google\Protobuf\Internal\GPBType::BOOL, 42)
-            ->optional('deprecated', \Google\Protobuf\Internal\GPBType::BOOL, 23)
-            ->optional('cc_enable_arenas', \Google\Protobuf\Internal\GPBType::BOOL, 31)
-            ->optional('objc_class_prefix', \Google\Protobuf\Internal\GPBType::STRING, 36)
-            ->optional('csharp_namespace', \Google\Protobuf\Internal\GPBType::STRING, 37)
-            ->optional('swift_prefix', \Google\Protobuf\Internal\GPBType::STRING, 39)
-            ->optional('php_class_prefix', \Google\Protobuf\Internal\GPBType::STRING, 40)
-            ->optional('php_namespace', \Google\Protobuf\Internal\GPBType::STRING, 41)
-            ->optional('php_metadata_namespace', \Google\Protobuf\Internal\GPBType::STRING, 44)
-            ->optional('ruby_package', \Google\Protobuf\Internal\GPBType::STRING, 45)
-            ->repeated('uninterpreted_option', \Google\Protobuf\Internal\GPBType::MESSAGE, 999, 'google.protobuf.internal.UninterpretedOption')
-            ->finalizeToPool();
-
-        $pool->addEnum('google.protobuf.internal.FileOptions.OptimizeMode', \Google\Protobuf\Internal\OptimizeMode::class)
-            ->value("SPEED", 1)
-            ->value("CODE_SIZE", 2)
-            ->value("LITE_RUNTIME", 3)
-            ->finalizeToPool();
-
-        $pool->addMessage('google.protobuf.internal.MessageOptions', \Google\Protobuf\Internal\MessageOptions::class)
-            ->optional('message_set_wire_format', \Google\Protobuf\Internal\GPBType::BOOL, 1)
-            ->optional('no_standard_descriptor_accessor', \Google\Protobuf\Internal\GPBType::BOOL, 2)
-            ->optional('deprecated', \Google\Protobuf\Internal\GPBType::BOOL, 3)
-            ->optional('map_entry', \Google\Protobuf\Internal\GPBType::BOOL, 7)
-            ->repeated('uninterpreted_option', \Google\Protobuf\Internal\GPBType::MESSAGE, 999, 'google.protobuf.internal.UninterpretedOption')
-            ->finalizeToPool();
-
-        $pool->addMessage('google.protobuf.internal.FieldOptions', \Google\Protobuf\Internal\FieldOptions::class)
-            ->optional('ctype', \Google\Protobuf\Internal\GPBType::ENUM, 1, 'google.protobuf.internal.FieldOptions.CType')
-            ->optional('packed', \Google\Protobuf\Internal\GPBType::BOOL, 2)
-            ->optional('jstype', \Google\Protobuf\Internal\GPBType::ENUM, 6, 'google.protobuf.internal.FieldOptions.JSType')
-            ->optional('lazy', \Google\Protobuf\Internal\GPBType::BOOL, 5)
-            ->optional('unverified_lazy', \Google\Protobuf\Internal\GPBType::BOOL, 15)
-            ->optional('deprecated', \Google\Protobuf\Internal\GPBType::BOOL, 3)
-            ->optional('weak', \Google\Protobuf\Internal\GPBType::BOOL, 10)
-            ->repeated('uninterpreted_option', \Google\Protobuf\Internal\GPBType::MESSAGE, 999, 'google.protobuf.internal.UninterpretedOption')
-            ->finalizeToPool();
-
-        $pool->addEnum('google.protobuf.internal.FieldOptions.CType', \Google\Protobuf\Internal\CType::class)
-            ->value("STRING", 0)
-            ->value("CORD", 1)
-            ->value("STRING_PIECE", 2)
-            ->finalizeToPool();
-
-        $pool->addEnum('google.protobuf.internal.FieldOptions.JSType', \Google\Protobuf\Internal\JSType::class)
-            ->value("JS_NORMAL", 0)
-            ->value("JS_STRING", 1)
-            ->value("JS_NUMBER", 2)
-            ->finalizeToPool();
-
-        $pool->addMessage('google.protobuf.internal.OneofOptions', \Google\Protobuf\Internal\OneofOptions::class)
-            ->repeated('uninterpreted_option', \Google\Protobuf\Internal\GPBType::MESSAGE, 999, 'google.protobuf.internal.UninterpretedOption')
-            ->finalizeToPool();
-
-        $pool->addMessage('google.protobuf.internal.EnumOptions', \Google\Protobuf\Internal\EnumOptions::class)
-            ->optional('allow_alias', \Google\Protobuf\Internal\GPBType::BOOL, 2)
-            ->optional('deprecated', \Google\Protobuf\Internal\GPBType::BOOL, 3)
-            ->repeated('uninterpreted_option', \Google\Protobuf\Internal\GPBType::MESSAGE, 999, 'google.protobuf.internal.UninterpretedOption')
-            ->finalizeToPool();
-
-        $pool->addMessage('google.protobuf.internal.EnumValueOptions', \Google\Protobuf\Internal\EnumValueOptions::class)
-            ->optional('deprecated', \Google\Protobuf\Internal\GPBType::BOOL, 1)
-            ->repeated('uninterpreted_option', \Google\Protobuf\Internal\GPBType::MESSAGE, 999, 'google.protobuf.internal.UninterpretedOption')
-            ->finalizeToPool();
-
-        $pool->addMessage('google.protobuf.internal.ServiceOptions', \Google\Protobuf\Internal\ServiceOptions::class)
-            ->optional('deprecated', \Google\Protobuf\Internal\GPBType::BOOL, 33)
-            ->repeated('uninterpreted_option', \Google\Protobuf\Internal\GPBType::MESSAGE, 999, 'google.protobuf.internal.UninterpretedOption')
-            ->finalizeToPool();
-
-        $pool->addMessage('google.protobuf.internal.MethodOptions', \Google\Protobuf\Internal\MethodOptions::class)
-            ->optional('deprecated', \Google\Protobuf\Internal\GPBType::BOOL, 33)
-            ->optional('idempotency_level', \Google\Protobuf\Internal\GPBType::ENUM, 34, 'google.protobuf.internal.MethodOptions.IdempotencyLevel')
-            ->repeated('uninterpreted_option', \Google\Protobuf\Internal\GPBType::MESSAGE, 999, 'google.protobuf.internal.UninterpretedOption')
-            ->finalizeToPool();
-
-        $pool->addEnum('google.protobuf.internal.MethodOptions.IdempotencyLevel', \Google\Protobuf\Internal\IdempotencyLevel::class)
-            ->value("IDEMPOTENCY_UNKNOWN", 0)
-            ->value("NO_SIDE_EFFECTS", 1)
-            ->value("IDEMPOTENT", 2)
-            ->finalizeToPool();
-
-        $pool->addMessage('google.protobuf.internal.UninterpretedOption', \Google\Protobuf\Internal\UninterpretedOption::class)
-            ->repeated('name', \Google\Protobuf\Internal\GPBType::MESSAGE, 2, 'google.protobuf.internal.UninterpretedOption.NamePart')
-            ->optional('identifier_value', \Google\Protobuf\Internal\GPBType::STRING, 3)
-            ->optional('positive_int_value', \Google\Protobuf\Internal\GPBType::UINT64, 4)
-            ->optional('negative_int_value', \Google\Protobuf\Internal\GPBType::INT64, 5)
-            ->optional('double_value', \Google\Protobuf\Internal\GPBType::DOUBLE, 6)
-            ->optional('string_value', \Google\Protobuf\Internal\GPBType::BYTES, 7)
-            ->optional('aggregate_value', \Google\Protobuf\Internal\GPBType::STRING, 8)
-            ->finalizeToPool();
-
-        $pool->addMessage('google.protobuf.internal.UninterpretedOption.NamePart', \Google\Protobuf\Internal\UninterpretedOption\NamePart::class)
-            ->required('name_part', \Google\Protobuf\Internal\GPBType::STRING, 1)
-            ->required('is_extension', \Google\Protobuf\Internal\GPBType::BOOL, 2)
-            ->finalizeToPool();
-
-        $pool->addMessage('google.protobuf.internal.SourceCodeInfo', \Google\Protobuf\Internal\SourceCodeInfo::class)
-            ->repeated('location', \Google\Protobuf\Internal\GPBType::MESSAGE, 1, 'google.protobuf.internal.SourceCodeInfo.Location')
-            ->finalizeToPool();
-
-        $pool->addMessage('google.protobuf.internal.SourceCodeInfo.Location', \Google\Protobuf\Internal\SourceCodeInfo\Location::class)
-            ->repeated('path', \Google\Protobuf\Internal\GPBType::INT32, 1)
-            ->repeated('span', \Google\Protobuf\Internal\GPBType::INT32, 2)
-            ->optional('leading_comments', \Google\Protobuf\Internal\GPBType::STRING, 3)
-            ->optional('trailing_comments', \Google\Protobuf\Internal\GPBType::STRING, 4)
-            ->repeated('leading_detached_comments', \Google\Protobuf\Internal\GPBType::STRING, 6)
-            ->finalizeToPool();
-
-        $pool->addMessage('google.protobuf.internal.GeneratedCodeInfo', \Google\Protobuf\Internal\GeneratedCodeInfo::class)
-            ->repeated('annotation', \Google\Protobuf\Internal\GPBType::MESSAGE, 1, 'google.protobuf.internal.GeneratedCodeInfo.Annotation')
-            ->finalizeToPool();
-
-        $pool->addMessage('google.protobuf.internal.GeneratedCodeInfo.Annotation', \Google\Protobuf\Internal\GeneratedCodeInfo\Annotation::class)
-            ->repeated('path', \Google\Protobuf\Internal\GPBType::INT32, 1)
-            ->optional('source_file', \Google\Protobuf\Internal\GPBType::STRING, 2)
-            ->optional('begin', \Google\Protobuf\Internal\GPBType::INT32, 3)
-            ->optional('end', \Google\Protobuf\Internal\GPBType::INT32, 4)
-            ->finalizeToPool();
-
-        $pool->finish();
-        static::$is_initialized = true;
-    }
-}
-
diff --git a/libs/protobuf/php/src/GPBMetadata/Google/Protobuf/SourceContext.php b/libs/protobuf/php/src/GPBMetadata/Google/Protobuf/SourceContext.php
deleted file mode 100644
index 797732d..0000000
--- a/libs/protobuf/php/src/GPBMetadata/Google/Protobuf/SourceContext.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: google/protobuf/source_context.proto
-
-namespace GPBMetadata\Google\Protobuf;
-
-class SourceContext
-{
-    public static $is_initialized = false;
-
-    public static function initOnce() {
-        $pool = \Google\Protobuf\Internal\DescriptorPool::getGeneratedPool();
-
-        if (static::$is_initialized == true) {
-          return;
-        }
-        $pool->internalAddGeneratedFile(
-            '
-ð

-$google/protobuf/source_context.protogoogle.protobuf""
-
SourceContext
-	file_name
 
(	BŠ

-com.google.protobufBSourceContextProtoP
Z6google.golang.org/protobuf/types/known/sourcecontextpb¢GPBªGoogle.Protobuf.WellKnownTypesbproto3'
-        , true);
-
-        static::$is_initialized = true;
-    }
-}
-
diff --git a/libs/protobuf/php/src/GPBMetadata/Google/Protobuf/Struct.php b/libs/protobuf/php/src/GPBMetadata/Google/Protobuf/Struct.php
deleted file mode 100644
index 888a81a..0000000
Binary files a/libs/protobuf/php/src/GPBMetadata/Google/Protobuf/Struct.php and /dev/null differ
diff --git a/libs/protobuf/php/src/GPBMetadata/Google/Protobuf/Timestamp.php b/libs/protobuf/php/src/GPBMetadata/Google/Protobuf/Timestamp.php
deleted file mode 100644
index 0943727..0000000
--- a/libs/protobuf/php/src/GPBMetadata/Google/Protobuf/Timestamp.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: google/protobuf/timestamp.proto
-
-namespace GPBMetadata\Google\Protobuf;
-
-class Timestamp
-{
-    public static $is_initialized = false;
-
-    public static function initOnce() {
-        $pool = \Google\Protobuf\Internal\DescriptorPool::getGeneratedPool();
-
-        if (static::$is_initialized == true) {
-          return;
-        }
-        $pool->internalAddGeneratedFile(
-            '
-ï

-google/protobuf/timestamp.protogoogle.protobuf"+
-	Timestamp
-seconds
 
(
-nanos 
(B…

-com.google.protobufBTimestampProtoP
Z2google.golang.org/protobuf/types/known/timestamppbø

¢GPBªGoogle.Protobuf.WellKnownTypesbproto3'
-        , true);
-
-        static::$is_initialized = true;
-    }
-}
-
diff --git a/libs/protobuf/php/src/GPBMetadata/Google/Protobuf/Type.php b/libs/protobuf/php/src/GPBMetadata/Google/Protobuf/Type.php
deleted file mode 100644
index 7d0bfbb..0000000
Binary files a/libs/protobuf/php/src/GPBMetadata/Google/Protobuf/Type.php and /dev/null differ
diff --git a/libs/protobuf/php/src/GPBMetadata/Google/Protobuf/Wrappers.php b/libs/protobuf/php/src/GPBMetadata/Google/Protobuf/Wrappers.php
deleted file mode 100644
index e7ea1a3..0000000
--- a/libs/protobuf/php/src/GPBMetadata/Google/Protobuf/Wrappers.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: google/protobuf/wrappers.proto
-
-namespace GPBMetadata\Google\Protobuf;
-
-class Wrappers
-{
-    public static $is_initialized = false;
-
-    public static function initOnce() {
-        $pool = \Google\Protobuf\Internal\DescriptorPool::getGeneratedPool();
-
-        if (static::$is_initialized == true) {
-          return;
-        }
-        $pool->internalAddGeneratedFile(
-            '
-Ç
-google/protobuf/wrappers.protogoogle.protobuf"
-DoubleValue
-value
 
(
"
-
-FloatValue
-value
 
("
-
-Int64Value
-value
 
("
-UInt64Value
-value
 
("
-
-Int32Value
-value
 
("
-UInt32Value
-value
 
(
"
-	BoolValue
-value
 
("
-StringValue
-value
 
(	"
-
-BytesValue
-value
 
(Bƒ

-com.google.protobufB
WrappersProtoP
Z1google.golang.org/protobuf/types/known/wrapperspbø

¢GPBªGoogle.Protobuf.WellKnownTypesbproto3'
-        , true);
-
-        static::$is_initialized = true;
-    }
-}
-
diff --git a/libs/protobuf/php/src/Google/Protobuf/Any.php b/libs/protobuf/php/src/Google/Protobuf/Any.php
deleted file mode 100644
index cc64bad..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/Any.php
+++ /dev/null
@@ -1,253 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: google/protobuf/any.proto
-
-namespace Google\Protobuf;
-
-use Google\Protobuf\Internal\GPBType;
-use Google\Protobuf\Internal\RepeatedField;
-use Google\Protobuf\Internal\GPBUtil;
-
-/**
- * `Any` contains an arbitrary serialized protocol buffer message along with a
- * URL that describes the type of the serialized message.
- * Protobuf library provides support to pack/unpack Any values in the form
- * of utility functions or additional generated methods of the Any type.
- * Example 1: Pack and unpack a message in C++.
- *     Foo foo = ...;
- *     Any any;
- *     any.PackFrom(foo);
- *     ...
- *     if (any.UnpackTo(&foo)) {
- *       ...
- *     }
- * Example 2: Pack and unpack a message in Java.
- *     Foo foo = ...;
- *     Any any = Any.pack(foo);
- *     ...
- *     if (any.is(Foo.class)) {
- *       foo = any.unpack(Foo.class);
- *     }
- * Example 3: Pack and unpack a message in Python.
- *     foo = Foo(...)
- *     any = Any()
- *     any.Pack(foo)
- *     ...
- *     if any.Is(Foo.DESCRIPTOR):
- *       any.Unpack(foo)
- *       ...
- * Example 4: Pack and unpack a message in Go
- *      foo := &pb.Foo{...}
- *      any, err := anypb.New(foo)
- *      if err != nil {
- *        ...
- *      }
- *      ...
- *      foo := &pb.Foo{}
- *      if err := any.UnmarshalTo(foo); err != nil {
- *        ...
- *      }
- * The pack methods provided by protobuf library will by default use
- * 'type.googleapis.com/full.type.name' as the type URL and the unpack
- * methods only use the fully qualified type name after the last '/'
- * in the type URL, for example "foo.bar.com/x/y.z" will yield type
- * name "y.z".
- * JSON
- * The JSON representation of an `Any` value uses the regular
- * representation of the deserialized, embedded message, with an
- * additional field `&#64;type` which contains the type URL. Example:
- *     package google.profile;
- *     message Person {
- *       string first_name = 1;
- *       string last_name = 2;
- *     }
- *     {
- *       "&#64;type": "type.googleapis.com/google.profile.Person",
- *       "firstName": <string>,
- *       "lastName": <string>
- *     }
- * If the embedded message type is well-known and has a custom JSON
- * representation, that representation will be embedded adding a field
- * `value` which holds the custom JSON in addition to the `&#64;type`
- * field. Example (for message [google.protobuf.Duration][]):
- *     {
- *       "&#64;type": "type.googleapis.com/google.protobuf.Duration",
- *       "value": "1.212s"
- *     }
- *
- * Generated from protobuf message <code>google.protobuf.Any</code>
- */
-class Any extends \Google\Protobuf\Internal\AnyBase
-{
-    /**
-     * A URL/resource name that uniquely identifies the type of the serialized
-     * protocol buffer message. This string must contain at least
-     * one "/" character. The last segment of the URL's path must represent
-     * the fully qualified name of the type (as in
-     * `path/google.protobuf.Duration`). The name should be in a canonical form
-     * (e.g., leading "." is not accepted).
-     * In practice, teams usually precompile into the binary all types that they
-     * expect it to use in the context of Any. However, for URLs which use the
-     * scheme `http`, `https`, or no scheme, one can optionally set up a type
-     * server that maps type URLs to message definitions as follows:
-     * * If no scheme is provided, `https` is assumed.
-     * * An HTTP GET on the URL must yield a [google.protobuf.Type][]
-     *   value in binary format, or produce an error.
-     * * Applications are allowed to cache lookup results based on the
-     *   URL, or have them precompiled into a binary to avoid any
-     *   lookup. Therefore, binary compatibility needs to be preserved
-     *   on changes to types. (Use versioned type names to manage
-     *   breaking changes.)
-     * Note: this functionality is not currently available in the official
-     * protobuf release, and it is not used for type URLs beginning with
-     * type.googleapis.com.
-     * Schemes other than `http`, `https` (or the empty scheme) might be
-     * used with implementation specific semantics.
-     *
-     * Generated from protobuf field <code>string type_url = 1;</code>
-     */
-    protected $type_url = '';
-    /**
-     * Must be a valid serialized protocol buffer of the above specified type.
-     *
-     * Generated from protobuf field <code>bytes value = 2;</code>
-     */
-    protected $value = '';
-
-    /**
-     * Constructor.
-     *
-     * @param array $data {
-     *     Optional. Data for populating the Message object.
-     *
-     *     @type string $type_url
-     *           A URL/resource name that uniquely identifies the type of the serialized
-     *           protocol buffer message. This string must contain at least
-     *           one "/" character. The last segment of the URL's path must represent
-     *           the fully qualified name of the type (as in
-     *           `path/google.protobuf.Duration`). The name should be in a canonical form
-     *           (e.g., leading "." is not accepted).
-     *           In practice, teams usually precompile into the binary all types that they
-     *           expect it to use in the context of Any. However, for URLs which use the
-     *           scheme `http`, `https`, or no scheme, one can optionally set up a type
-     *           server that maps type URLs to message definitions as follows:
-     *           * If no scheme is provided, `https` is assumed.
-     *           * An HTTP GET on the URL must yield a [google.protobuf.Type][]
-     *             value in binary format, or produce an error.
-     *           * Applications are allowed to cache lookup results based on the
-     *             URL, or have them precompiled into a binary to avoid any
-     *             lookup. Therefore, binary compatibility needs to be preserved
-     *             on changes to types. (Use versioned type names to manage
-     *             breaking changes.)
-     *           Note: this functionality is not currently available in the official
-     *           protobuf release, and it is not used for type URLs beginning with
-     *           type.googleapis.com.
-     *           Schemes other than `http`, `https` (or the empty scheme) might be
-     *           used with implementation specific semantics.
-     *     @type string $value
-     *           Must be a valid serialized protocol buffer of the above specified type.
-     * }
-     */
-    public function __construct($data = NULL) {
-        \GPBMetadata\Google\Protobuf\Any::initOnce();
-        parent::__construct($data);
-    }
-
-    /**
-     * A URL/resource name that uniquely identifies the type of the serialized
-     * protocol buffer message. This string must contain at least
-     * one "/" character. The last segment of the URL's path must represent
-     * the fully qualified name of the type (as in
-     * `path/google.protobuf.Duration`). The name should be in a canonical form
-     * (e.g., leading "." is not accepted).
-     * In practice, teams usually precompile into the binary all types that they
-     * expect it to use in the context of Any. However, for URLs which use the
-     * scheme `http`, `https`, or no scheme, one can optionally set up a type
-     * server that maps type URLs to message definitions as follows:
-     * * If no scheme is provided, `https` is assumed.
-     * * An HTTP GET on the URL must yield a [google.protobuf.Type][]
-     *   value in binary format, or produce an error.
-     * * Applications are allowed to cache lookup results based on the
-     *   URL, or have them precompiled into a binary to avoid any
-     *   lookup. Therefore, binary compatibility needs to be preserved
-     *   on changes to types. (Use versioned type names to manage
-     *   breaking changes.)
-     * Note: this functionality is not currently available in the official
-     * protobuf release, and it is not used for type URLs beginning with
-     * type.googleapis.com.
-     * Schemes other than `http`, `https` (or the empty scheme) might be
-     * used with implementation specific semantics.
-     *
-     * Generated from protobuf field <code>string type_url = 1;</code>
-     * @return string
-     */
-    public function getTypeUrl()
-    {
-        return $this->type_url;
-    }
-
-    /**
-     * A URL/resource name that uniquely identifies the type of the serialized
-     * protocol buffer message. This string must contain at least
-     * one "/" character. The last segment of the URL's path must represent
-     * the fully qualified name of the type (as in
-     * `path/google.protobuf.Duration`). The name should be in a canonical form
-     * (e.g., leading "." is not accepted).
-     * In practice, teams usually precompile into the binary all types that they
-     * expect it to use in the context of Any. However, for URLs which use the
-     * scheme `http`, `https`, or no scheme, one can optionally set up a type
-     * server that maps type URLs to message definitions as follows:
-     * * If no scheme is provided, `https` is assumed.
-     * * An HTTP GET on the URL must yield a [google.protobuf.Type][]
-     *   value in binary format, or produce an error.
-     * * Applications are allowed to cache lookup results based on the
-     *   URL, or have them precompiled into a binary to avoid any
-     *   lookup. Therefore, binary compatibility needs to be preserved
-     *   on changes to types. (Use versioned type names to manage
-     *   breaking changes.)
-     * Note: this functionality is not currently available in the official
-     * protobuf release, and it is not used for type URLs beginning with
-     * type.googleapis.com.
-     * Schemes other than `http`, `https` (or the empty scheme) might be
-     * used with implementation specific semantics.
-     *
-     * Generated from protobuf field <code>string type_url = 1;</code>
-     * @param string $var
-     * @return $this
-     */
-    public function setTypeUrl($var)
-    {
-        GPBUtil::checkString($var, True);
-        $this->type_url = $var;
-
-        return $this;
-    }
-
-    /**
-     * Must be a valid serialized protocol buffer of the above specified type.
-     *
-     * Generated from protobuf field <code>bytes value = 2;</code>
-     * @return string
-     */
-    public function getValue()
-    {
-        return $this->value;
-    }
-
-    /**
-     * Must be a valid serialized protocol buffer of the above specified type.
-     *
-     * Generated from protobuf field <code>bytes value = 2;</code>
-     * @param string $var
-     * @return $this
-     */
-    public function setValue($var)
-    {
-        GPBUtil::checkString($var, False);
-        $this->value = $var;
-
-        return $this;
-    }
-
-}
-
diff --git a/libs/protobuf/php/src/Google/Protobuf/Api.php b/libs/protobuf/php/src/Google/Protobuf/Api.php
deleted file mode 100644
index 3784263..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/Api.php
+++ /dev/null
@@ -1,360 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: google/protobuf/api.proto
-
-namespace Google\Protobuf;
-
-use Google\Protobuf\Internal\GPBType;
-use Google\Protobuf\Internal\RepeatedField;
-use Google\Protobuf\Internal\GPBUtil;
-
-/**
- * Api is a light-weight descriptor for an API Interface.
- * Interfaces are also described as "protocol buffer services" in some contexts,
- * such as by the "service" keyword in a .proto file, but they are different
- * from API Services, which represent a concrete implementation of an interface
- * as opposed to simply a description of methods and bindings. They are also
- * sometimes simply referred to as "APIs" in other contexts, such as the name of
- * this message itself. See https://cloud.google.com/apis/design/glossary for
- * detailed terminology.
- *
- * Generated from protobuf message <code>google.protobuf.Api</code>
- */
-class Api extends \Google\Protobuf\Internal\Message
-{
-    /**
-     * The fully qualified name of this interface, including package name
-     * followed by the interface's simple name.
-     *
-     * Generated from protobuf field <code>string name = 1;</code>
-     */
-    protected $name = '';
-    /**
-     * The methods of this interface, in unspecified order.
-     *
-     * Generated from protobuf field <code>repeated .google.protobuf.Method methods = 2;</code>
-     */
-    private $methods;
-    /**
-     * Any metadata attached to the interface.
-     *
-     * Generated from protobuf field <code>repeated .google.protobuf.Option options = 3;</code>
-     */
-    private $options;
-    /**
-     * A version string for this interface. If specified, must have the form
-     * `major-version.minor-version`, as in `1.10`. If the minor version is
-     * omitted, it defaults to zero. If the entire version field is empty, the
-     * major version is derived from the package name, as outlined below. If the
-     * field is not empty, the version in the package name will be verified to be
-     * consistent with what is provided here.
-     * The versioning schema uses [semantic
-     * versioning](http://semver.org) where the major version number
-     * indicates a breaking change and the minor version an additive,
-     * non-breaking change. Both version numbers are signals to users
-     * what to expect from different versions, and should be carefully
-     * chosen based on the product plan.
-     * The major version is also reflected in the package name of the
-     * interface, which must end in `v<major-version>`, as in
-     * `google.feature.v1`. For major versions 0 and 1, the suffix can
-     * be omitted. Zero major versions must only be used for
-     * experimental, non-GA interfaces.
-     *
-     * Generated from protobuf field <code>string version = 4;</code>
-     */
-    protected $version = '';
-    /**
-     * Source context for the protocol buffer service represented by this
-     * message.
-     *
-     * Generated from protobuf field <code>.google.protobuf.SourceContext source_context = 5;</code>
-     */
-    protected $source_context = null;
-    /**
-     * Included interfaces. See [Mixin][].
-     *
-     * Generated from protobuf field <code>repeated .google.protobuf.Mixin mixins = 6;</code>
-     */
-    private $mixins;
-    /**
-     * The source syntax of the service.
-     *
-     * Generated from protobuf field <code>.google.protobuf.Syntax syntax = 7;</code>
-     */
-    protected $syntax = 0;
-
-    /**
-     * Constructor.
-     *
-     * @param array $data {
-     *     Optional. Data for populating the Message object.
-     *
-     *     @type string $name
-     *           The fully qualified name of this interface, including package name
-     *           followed by the interface's simple name.
-     *     @type array<\Google\Protobuf\Method>|\Google\Protobuf\Internal\RepeatedField $methods
-     *           The methods of this interface, in unspecified order.
-     *     @type array<\Google\Protobuf\Option>|\Google\Protobuf\Internal\RepeatedField $options
-     *           Any metadata attached to the interface.
-     *     @type string $version
-     *           A version string for this interface. If specified, must have the form
-     *           `major-version.minor-version`, as in `1.10`. If the minor version is
-     *           omitted, it defaults to zero. If the entire version field is empty, the
-     *           major version is derived from the package name, as outlined below. If the
-     *           field is not empty, the version in the package name will be verified to be
-     *           consistent with what is provided here.
-     *           The versioning schema uses [semantic
-     *           versioning](http://semver.org) where the major version number
-     *           indicates a breaking change and the minor version an additive,
-     *           non-breaking change. Both version numbers are signals to users
-     *           what to expect from different versions, and should be carefully
-     *           chosen based on the product plan.
-     *           The major version is also reflected in the package name of the
-     *           interface, which must end in `v<major-version>`, as in
-     *           `google.feature.v1`. For major versions 0 and 1, the suffix can
-     *           be omitted. Zero major versions must only be used for
-     *           experimental, non-GA interfaces.
-     *     @type \Google\Protobuf\SourceContext $source_context
-     *           Source context for the protocol buffer service represented by this
-     *           message.
-     *     @type array<\Google\Protobuf\Mixin>|\Google\Protobuf\Internal\RepeatedField $mixins
-     *           Included interfaces. See [Mixin][].
-     *     @type int $syntax
-     *           The source syntax of the service.
-     * }
-     */
-    public function __construct($data = NULL) {
-        \GPBMetadata\Google\Protobuf\Api::initOnce();
-        parent::__construct($data);
-    }
-
-    /**
-     * The fully qualified name of this interface, including package name
-     * followed by the interface's simple name.
-     *
-     * Generated from protobuf field <code>string name = 1;</code>
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    /**
-     * The fully qualified name of this interface, including package name
-     * followed by the interface's simple name.
-     *
-     * Generated from protobuf field <code>string name = 1;</code>
-     * @param string $var
-     * @return $this
-     */
-    public function setName($var)
-    {
-        GPBUtil::checkString($var, True);
-        $this->name = $var;
-
-        return $this;
-    }
-
-    /**
-     * The methods of this interface, in unspecified order.
-     *
-     * Generated from protobuf field <code>repeated .google.protobuf.Method methods = 2;</code>
-     * @return \Google\Protobuf\Internal\RepeatedField
-     */
-    public function getMethods()
-    {
-        return $this->methods;
-    }
-
-    /**
-     * The methods of this interface, in unspecified order.
-     *
-     * Generated from protobuf field <code>repeated .google.protobuf.Method methods = 2;</code>
-     * @param array<\Google\Protobuf\Method>|\Google\Protobuf\Internal\RepeatedField $var
-     * @return $this
-     */
-    public function setMethods($var)
-    {
-        $arr = GPBUtil::checkRepeatedField($var, \Google\Protobuf\Internal\GPBType::MESSAGE, \Google\Protobuf\Method::class);
-        $this->methods = $arr;
-
-        return $this;
-    }
-
-    /**
-     * Any metadata attached to the interface.
-     *
-     * Generated from protobuf field <code>repeated .google.protobuf.Option options = 3;</code>
-     * @return \Google\Protobuf\Internal\RepeatedField
-     */
-    public function getOptions()
-    {
-        return $this->options;
-    }
-
-    /**
-     * Any metadata attached to the interface.
-     *
-     * Generated from protobuf field <code>repeated .google.protobuf.Option options = 3;</code>
-     * @param array<\Google\Protobuf\Option>|\Google\Protobuf\Internal\RepeatedField $var
-     * @return $this
-     */
-    public function setOptions($var)
-    {
-        $arr = GPBUtil::checkRepeatedField($var, \Google\Protobuf\Internal\GPBType::MESSAGE, \Google\Protobuf\Option::class);
-        $this->options = $arr;
-
-        return $this;
-    }
-
-    /**
-     * A version string for this interface. If specified, must have the form
-     * `major-version.minor-version`, as in `1.10`. If the minor version is
-     * omitted, it defaults to zero. If the entire version field is empty, the
-     * major version is derived from the package name, as outlined below. If the
-     * field is not empty, the version in the package name will be verified to be
-     * consistent with what is provided here.
-     * The versioning schema uses [semantic
-     * versioning](http://semver.org) where the major version number
-     * indicates a breaking change and the minor version an additive,
-     * non-breaking change. Both version numbers are signals to users
-     * what to expect from different versions, and should be carefully
-     * chosen based on the product plan.
-     * The major version is also reflected in the package name of the
-     * interface, which must end in `v<major-version>`, as in
-     * `google.feature.v1`. For major versions 0 and 1, the suffix can
-     * be omitted. Zero major versions must only be used for
-     * experimental, non-GA interfaces.
-     *
-     * Generated from protobuf field <code>string version = 4;</code>
-     * @return string
-     */
-    public function getVersion()
-    {
-        return $this->version;
-    }
-
-    /**
-     * A version string for this interface. If specified, must have the form
-     * `major-version.minor-version`, as in `1.10`. If the minor version is
-     * omitted, it defaults to zero. If the entire version field is empty, the
-     * major version is derived from the package name, as outlined below. If the
-     * field is not empty, the version in the package name will be verified to be
-     * consistent with what is provided here.
-     * The versioning schema uses [semantic
-     * versioning](http://semver.org) where the major version number
-     * indicates a breaking change and the minor version an additive,
-     * non-breaking change. Both version numbers are signals to users
-     * what to expect from different versions, and should be carefully
-     * chosen based on the product plan.
-     * The major version is also reflected in the package name of the
-     * interface, which must end in `v<major-version>`, as in
-     * `google.feature.v1`. For major versions 0 and 1, the suffix can
-     * be omitted. Zero major versions must only be used for
-     * experimental, non-GA interfaces.
-     *
-     * Generated from protobuf field <code>string version = 4;</code>
-     * @param string $var
-     * @return $this
-     */
-    public function setVersion($var)
-    {
-        GPBUtil::checkString($var, True);
-        $this->version = $var;
-
-        return $this;
-    }
-
-    /**
-     * Source context for the protocol buffer service represented by this
-     * message.
-     *
-     * Generated from protobuf field <code>.google.protobuf.SourceContext source_context = 5;</code>
-     * @return \Google\Protobuf\SourceContext|null
-     */
-    public function getSourceContext()
-    {
-        return $this->source_context;
-    }
-
-    public function hasSourceContext()
-    {
-        return isset($this->source_context);
-    }
-
-    public function clearSourceContext()
-    {
-        unset($this->source_context);
-    }
-
-    /**
-     * Source context for the protocol buffer service represented by this
-     * message.
-     *
-     * Generated from protobuf field <code>.google.protobuf.SourceContext source_context = 5;</code>
-     * @param \Google\Protobuf\SourceContext $var
-     * @return $this
-     */
-    public function setSourceContext($var)
-    {
-        GPBUtil::checkMessage($var, \Google\Protobuf\SourceContext::class);
-        $this->source_context = $var;
-
-        return $this;
-    }
-
-    /**
-     * Included interfaces. See [Mixin][].
-     *
-     * Generated from protobuf field <code>repeated .google.protobuf.Mixin mixins = 6;</code>
-     * @return \Google\Protobuf\Internal\RepeatedField
-     */
-    public function getMixins()
-    {
-        return $this->mixins;
-    }
-
-    /**
-     * Included interfaces. See [Mixin][].
-     *
-     * Generated from protobuf field <code>repeated .google.protobuf.Mixin mixins = 6;</code>
-     * @param array<\Google\Protobuf\Mixin>|\Google\Protobuf\Internal\RepeatedField $var
-     * @return $this
-     */
-    public function setMixins($var)
-    {
-        $arr = GPBUtil::checkRepeatedField($var, \Google\Protobuf\Internal\GPBType::MESSAGE, \Google\Protobuf\Mixin::class);
-        $this->mixins = $arr;
-
-        return $this;
-    }
-
-    /**
-     * The source syntax of the service.
-     *
-     * Generated from protobuf field <code>.google.protobuf.Syntax syntax = 7;</code>
-     * @return int
-     */
-    public function getSyntax()
-    {
-        return $this->syntax;
-    }
-
-    /**
-     * The source syntax of the service.
-     *
-     * Generated from protobuf field <code>.google.protobuf.Syntax syntax = 7;</code>
-     * @param int $var
-     * @return $this
-     */
-    public function setSyntax($var)
-    {
-        GPBUtil::checkEnum($var, \Google\Protobuf\Syntax::class);
-        $this->syntax = $var;
-
-        return $this;
-    }
-
-}
-
diff --git a/libs/protobuf/php/src/Google/Protobuf/BoolValue.php b/libs/protobuf/php/src/Google/Protobuf/BoolValue.php
deleted file mode 100644
index ecdbf4d..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/BoolValue.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: google/protobuf/wrappers.proto
-
-namespace Google\Protobuf;
-
-use Google\Protobuf\Internal\GPBType;
-use Google\Protobuf\Internal\RepeatedField;
-use Google\Protobuf\Internal\GPBUtil;
-
-/**
- * Wrapper message for `bool`.
- * The JSON representation for `BoolValue` is JSON `true` and `false`.
- *
- * Generated from protobuf message <code>google.protobuf.BoolValue</code>
- */
-class BoolValue extends \Google\Protobuf\Internal\Message
-{
-    /**
-     * The bool value.
-     *
-     * Generated from protobuf field <code>bool value = 1;</code>
-     */
-    protected $value = false;
-
-    /**
-     * Constructor.
-     *
-     * @param array $data {
-     *     Optional. Data for populating the Message object.
-     *
-     *     @type bool $value
-     *           The bool value.
-     * }
-     */
-    public function __construct($data = NULL) {
-        \GPBMetadata\Google\Protobuf\Wrappers::initOnce();
-        parent::__construct($data);
-    }
-
-    /**
-     * The bool value.
-     *
-     * Generated from protobuf field <code>bool value = 1;</code>
-     * @return bool
-     */
-    public function getValue()
-    {
-        return $this->value;
-    }
-
-    /**
-     * The bool value.
-     *
-     * Generated from protobuf field <code>bool value = 1;</code>
-     * @param bool $var
-     * @return $this
-     */
-    public function setValue($var)
-    {
-        GPBUtil::checkBool($var);
-        $this->value = $var;
-
-        return $this;
-    }
-
-}
-
diff --git a/libs/protobuf/php/src/Google/Protobuf/BytesValue.php b/libs/protobuf/php/src/Google/Protobuf/BytesValue.php
deleted file mode 100644
index 1582e14..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/BytesValue.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: google/protobuf/wrappers.proto
-
-namespace Google\Protobuf;
-
-use Google\Protobuf\Internal\GPBType;
-use Google\Protobuf\Internal\RepeatedField;
-use Google\Protobuf\Internal\GPBUtil;
-
-/**
- * Wrapper message for `bytes`.
- * The JSON representation for `BytesValue` is JSON string.
- *
- * Generated from protobuf message <code>google.protobuf.BytesValue</code>
- */
-class BytesValue extends \Google\Protobuf\Internal\Message
-{
-    /**
-     * The bytes value.
-     *
-     * Generated from protobuf field <code>bytes value = 1;</code>
-     */
-    protected $value = '';
-
-    /**
-     * Constructor.
-     *
-     * @param array $data {
-     *     Optional. Data for populating the Message object.
-     *
-     *     @type string $value
-     *           The bytes value.
-     * }
-     */
-    public function __construct($data = NULL) {
-        \GPBMetadata\Google\Protobuf\Wrappers::initOnce();
-        parent::__construct($data);
-    }
-
-    /**
-     * The bytes value.
-     *
-     * Generated from protobuf field <code>bytes value = 1;</code>
-     * @return string
-     */
-    public function getValue()
-    {
-        return $this->value;
-    }
-
-    /**
-     * The bytes value.
-     *
-     * Generated from protobuf field <code>bytes value = 1;</code>
-     * @param string $var
-     * @return $this
-     */
-    public function setValue($var)
-    {
-        GPBUtil::checkString($var, False);
-        $this->value = $var;
-
-        return $this;
-    }
-
-}
-
diff --git a/libs/protobuf/php/src/Google/Protobuf/Descriptor.php b/libs/protobuf/php/src/Google/Protobuf/Descriptor.php
deleted file mode 100644
index 36436e2..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/Descriptor.php
+++ /dev/null
@@ -1,108 +0,0 @@
-<?php
-
-// Protocol Buffers - Google's data interchange format
-// Copyright 2017 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-namespace Google\Protobuf;
-
-use Google\Protobuf\Internal\GetPublicDescriptorTrait;
-
-class Descriptor
-{
-    use GetPublicDescriptorTrait;
-
-    private $internal_desc;
-
-    /**
-     * @internal
-     */
-    public function __construct($internal_desc)
-    {
-        $this->internal_desc = $internal_desc;
-    }
-
-    /**
-     * @return string Full protobuf message name
-     */
-    public function getFullName()
-    {
-        return trim($this->internal_desc->getFullName(), ".");
-    }
-
-    /**
-     * @return string PHP class name
-     */
-    public function getClass()
-    {
-        return $this->internal_desc->getClass();
-    }
-
-    /**
-     * @param int $index Must be >= 0 and < getFieldCount()
-     * @return FieldDescriptor
-     */
-    public function getField($index)
-    {
-        return $this->getPublicDescriptor($this->internal_desc->getFieldByIndex($index));
-    }
-
-    /**
-     * @return int Number of fields in message
-     */
-    public function getFieldCount()
-    {
-        return count($this->internal_desc->getField());
-    }
-
-    /**
-     * @param int $index Must be >= 0 and < getOneofDeclCount()
-     * @return OneofDescriptor
-     */
-    public function getOneofDecl($index)
-    {
-        return $this->getPublicDescriptor($this->internal_desc->getOneofDecl()[$index]);
-    }
-
-    /**
-     * @return int Number of oneofs in message
-     */
-    public function getOneofDeclCount()
-    {
-        return count($this->internal_desc->getOneofDecl());
-    }
-
-    /**
-     * @return int Number of real oneofs in message
-     */
-    public function getRealOneofDeclCount()
-    {
-        return $this->internal_desc->getRealOneofDeclCount();
-    }
-}
diff --git a/libs/protobuf/php/src/Google/Protobuf/DescriptorPool.php b/libs/protobuf/php/src/Google/Protobuf/DescriptorPool.php
deleted file mode 100644
index 119f0e2..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/DescriptorPool.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-
-// Protocol Buffers - Google's data interchange format
-// Copyright 2017 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-namespace Google\Protobuf;
-
-class DescriptorPool
-{
-    private static $pool;
-
-    private $internal_pool;
-
-    /**
-     * @return DescriptorPool
-     */
-    public static function getGeneratedPool()
-    {
-        if (!isset(self::$pool)) {
-            self::$pool = new DescriptorPool(\Google\Protobuf\Internal\DescriptorPool::getGeneratedPool());
-        }
-        return self::$pool;
-    }
-
-    private function __construct($internal_pool)
-    {
-        $this->internal_pool = $internal_pool;
-    }
-
-    /**
-     * @param string $className A fully qualified protobuf class name
-     * @return Descriptor
-     */
-    public function getDescriptorByClassName($className)
-    {
-        $desc = $this->internal_pool->getDescriptorByClassName($className);
-        return is_null($desc) ? null : $desc->getPublicDescriptor();
-    }
-
-    /**
-     * @param string $className A fully qualified protobuf class name
-     * @return EnumDescriptor
-     */
-    public function getEnumDescriptorByClassName($className)
-    {
-        $desc = $this->internal_pool->getEnumDescriptorByClassName($className);
-        return is_null($desc) ? null : $desc->getPublicDescriptor();
-    }
-}
diff --git a/libs/protobuf/php/src/Google/Protobuf/DoubleValue.php b/libs/protobuf/php/src/Google/Protobuf/DoubleValue.php
deleted file mode 100644
index b72399f..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/DoubleValue.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: google/protobuf/wrappers.proto
-
-namespace Google\Protobuf;
-
-use Google\Protobuf\Internal\GPBType;
-use Google\Protobuf\Internal\RepeatedField;
-use Google\Protobuf\Internal\GPBUtil;
-
-/**
- * Wrapper message for `double`.
- * The JSON representation for `DoubleValue` is JSON number.
- *
- * Generated from protobuf message <code>google.protobuf.DoubleValue</code>
- */
-class DoubleValue extends \Google\Protobuf\Internal\Message
-{
-    /**
-     * The double value.
-     *
-     * Generated from protobuf field <code>double value = 1;</code>
-     */
-    protected $value = 0.0;
-
-    /**
-     * Constructor.
-     *
-     * @param array $data {
-     *     Optional. Data for populating the Message object.
-     *
-     *     @type float $value
-     *           The double value.
-     * }
-     */
-    public function __construct($data = NULL) {
-        \GPBMetadata\Google\Protobuf\Wrappers::initOnce();
-        parent::__construct($data);
-    }
-
-    /**
-     * The double value.
-     *
-     * Generated from protobuf field <code>double value = 1;</code>
-     * @return float
-     */
-    public function getValue()
-    {
-        return $this->value;
-    }
-
-    /**
-     * The double value.
-     *
-     * Generated from protobuf field <code>double value = 1;</code>
-     * @param float $var
-     * @return $this
-     */
-    public function setValue($var)
-    {
-        GPBUtil::checkDouble($var);
-        $this->value = $var;
-
-        return $this;
-    }
-
-}
-
diff --git a/libs/protobuf/php/src/Google/Protobuf/Duration.php b/libs/protobuf/php/src/Google/Protobuf/Duration.php
deleted file mode 100644
index 531cd50..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/Duration.php
+++ /dev/null
@@ -1,173 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: google/protobuf/duration.proto
-
-namespace Google\Protobuf;
-
-use Google\Protobuf\Internal\GPBType;
-use Google\Protobuf\Internal\RepeatedField;
-use Google\Protobuf\Internal\GPBUtil;
-
-/**
- * A Duration represents a signed, fixed-length span of time represented
- * as a count of seconds and fractions of seconds at nanosecond
- * resolution. It is independent of any calendar and concepts like "day"
- * or "month". It is related to Timestamp in that the difference between
- * two Timestamp values is a Duration and it can be added or subtracted
- * from a Timestamp. Range is approximately +-10,000 years.
- * # Examples
- * Example 1: Compute Duration from two Timestamps in pseudo code.
- *     Timestamp start = ...;
- *     Timestamp end = ...;
- *     Duration duration = ...;
- *     duration.seconds = end.seconds - start.seconds;
- *     duration.nanos = end.nanos - start.nanos;
- *     if (duration.seconds < 0 && duration.nanos > 0) {
- *       duration.seconds += 1;
- *       duration.nanos -= 1000000000;
- *     } else if (duration.seconds > 0 && duration.nanos < 0) {
- *       duration.seconds -= 1;
- *       duration.nanos += 1000000000;
- *     }
- * Example 2: Compute Timestamp from Timestamp + Duration in pseudo code.
- *     Timestamp start = ...;
- *     Duration duration = ...;
- *     Timestamp end = ...;
- *     end.seconds = start.seconds + duration.seconds;
- *     end.nanos = start.nanos + duration.nanos;
- *     if (end.nanos < 0) {
- *       end.seconds -= 1;
- *       end.nanos += 1000000000;
- *     } else if (end.nanos >= 1000000000) {
- *       end.seconds += 1;
- *       end.nanos -= 1000000000;
- *     }
- * Example 3: Compute Duration from datetime.timedelta in Python.
- *     td = datetime.timedelta(days=3, minutes=10)
- *     duration = Duration()
- *     duration.FromTimedelta(td)
- * # JSON Mapping
- * In JSON format, the Duration type is encoded as a string rather than an
- * object, where the string ends in the suffix "s" (indicating seconds) and
- * is preceded by the number of seconds, with nanoseconds expressed as
- * fractional seconds. For example, 3 seconds with 0 nanoseconds should be
- * encoded in JSON format as "3s", while 3 seconds and 1 nanosecond should
- * be expressed in JSON format as "3.000000001s", and 3 seconds and 1
- * microsecond should be expressed in JSON format as "3.000001s".
- *
- * Generated from protobuf message <code>google.protobuf.Duration</code>
- */
-class Duration extends \Google\Protobuf\Internal\Message
-{
-    /**
-     * Signed seconds of the span of time. Must be from -315,576,000,000
-     * to +315,576,000,000 inclusive. Note: these bounds are computed from:
-     * 60 sec/min * 60 min/hr * 24 hr/day * 365.25 days/year * 10000 years
-     *
-     * Generated from protobuf field <code>int64 seconds = 1;</code>
-     */
-    protected $seconds = 0;
-    /**
-     * Signed fractions of a second at nanosecond resolution of the span
-     * of time. Durations less than one second are represented with a 0
-     * `seconds` field and a positive or negative `nanos` field. For durations
-     * of one second or more, a non-zero value for the `nanos` field must be
-     * of the same sign as the `seconds` field. Must be from -999,999,999
-     * to +999,999,999 inclusive.
-     *
-     * Generated from protobuf field <code>int32 nanos = 2;</code>
-     */
-    protected $nanos = 0;
-
-    /**
-     * Constructor.
-     *
-     * @param array $data {
-     *     Optional. Data for populating the Message object.
-     *
-     *     @type int|string $seconds
-     *           Signed seconds of the span of time. Must be from -315,576,000,000
-     *           to +315,576,000,000 inclusive. Note: these bounds are computed from:
-     *           60 sec/min * 60 min/hr * 24 hr/day * 365.25 days/year * 10000 years
-     *     @type int $nanos
-     *           Signed fractions of a second at nanosecond resolution of the span
-     *           of time. Durations less than one second are represented with a 0
-     *           `seconds` field and a positive or negative `nanos` field. For durations
-     *           of one second or more, a non-zero value for the `nanos` field must be
-     *           of the same sign as the `seconds` field. Must be from -999,999,999
-     *           to +999,999,999 inclusive.
-     * }
-     */
-    public function __construct($data = NULL) {
-        \GPBMetadata\Google\Protobuf\Duration::initOnce();
-        parent::__construct($data);
-    }
-
-    /**
-     * Signed seconds of the span of time. Must be from -315,576,000,000
-     * to +315,576,000,000 inclusive. Note: these bounds are computed from:
-     * 60 sec/min * 60 min/hr * 24 hr/day * 365.25 days/year * 10000 years
-     *
-     * Generated from protobuf field <code>int64 seconds = 1;</code>
-     * @return int|string
-     */
-    public function getSeconds()
-    {
-        return $this->seconds;
-    }
-
-    /**
-     * Signed seconds of the span of time. Must be from -315,576,000,000
-     * to +315,576,000,000 inclusive. Note: these bounds are computed from:
-     * 60 sec/min * 60 min/hr * 24 hr/day * 365.25 days/year * 10000 years
-     *
-     * Generated from protobuf field <code>int64 seconds = 1;</code>
-     * @param int|string $var
-     * @return $this
-     */
-    public function setSeconds($var)
-    {
-        GPBUtil::checkInt64($var);
-        $this->seconds = $var;
-
-        return $this;
-    }
-
-    /**
-     * Signed fractions of a second at nanosecond resolution of the span
-     * of time. Durations less than one second are represented with a 0
-     * `seconds` field and a positive or negative `nanos` field. For durations
-     * of one second or more, a non-zero value for the `nanos` field must be
-     * of the same sign as the `seconds` field. Must be from -999,999,999
-     * to +999,999,999 inclusive.
-     *
-     * Generated from protobuf field <code>int32 nanos = 2;</code>
-     * @return int
-     */
-    public function getNanos()
-    {
-        return $this->nanos;
-    }
-
-    /**
-     * Signed fractions of a second at nanosecond resolution of the span
-     * of time. Durations less than one second are represented with a 0
-     * `seconds` field and a positive or negative `nanos` field. For durations
-     * of one second or more, a non-zero value for the `nanos` field must be
-     * of the same sign as the `seconds` field. Must be from -999,999,999
-     * to +999,999,999 inclusive.
-     *
-     * Generated from protobuf field <code>int32 nanos = 2;</code>
-     * @param int $var
-     * @return $this
-     */
-    public function setNanos($var)
-    {
-        GPBUtil::checkInt32($var);
-        $this->nanos = $var;
-
-        return $this;
-    }
-
-}
-
diff --git a/libs/protobuf/php/src/Google/Protobuf/Enum.php b/libs/protobuf/php/src/Google/Protobuf/Enum.php
deleted file mode 100644
index 185e54e..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/Enum.php
+++ /dev/null
@@ -1,213 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: google/protobuf/type.proto
-
-namespace Google\Protobuf;
-
-use Google\Protobuf\Internal\GPBType;
-use Google\Protobuf\Internal\RepeatedField;
-use Google\Protobuf\Internal\GPBUtil;
-
-/**
- * Enum type definition.
- *
- * Generated from protobuf message <code>google.protobuf.Enum</code>
- */
-class Enum extends \Google\Protobuf\Internal\Message
-{
-    /**
-     * Enum type name.
-     *
-     * Generated from protobuf field <code>string name = 1;</code>
-     */
-    protected $name = '';
-    /**
-     * Enum value definitions.
-     *
-     * Generated from protobuf field <code>repeated .google.protobuf.EnumValue enumvalue = 2;</code>
-     */
-    private $enumvalue;
-    /**
-     * Protocol buffer options.
-     *
-     * Generated from protobuf field <code>repeated .google.protobuf.Option options = 3;</code>
-     */
-    private $options;
-    /**
-     * The source context.
-     *
-     * Generated from protobuf field <code>.google.protobuf.SourceContext source_context = 4;</code>
-     */
-    protected $source_context = null;
-    /**
-     * The source syntax.
-     *
-     * Generated from protobuf field <code>.google.protobuf.Syntax syntax = 5;</code>
-     */
-    protected $syntax = 0;
-
-    /**
-     * Constructor.
-     *
-     * @param array $data {
-     *     Optional. Data for populating the Message object.
-     *
-     *     @type string $name
-     *           Enum type name.
-     *     @type array<\Google\Protobuf\EnumValue>|\Google\Protobuf\Internal\RepeatedField $enumvalue
-     *           Enum value definitions.
-     *     @type array<\Google\Protobuf\Option>|\Google\Protobuf\Internal\RepeatedField $options
-     *           Protocol buffer options.
-     *     @type \Google\Protobuf\SourceContext $source_context
-     *           The source context.
-     *     @type int $syntax
-     *           The source syntax.
-     * }
-     */
-    public function __construct($data = NULL) {
-        \GPBMetadata\Google\Protobuf\Type::initOnce();
-        parent::__construct($data);
-    }
-
-    /**
-     * Enum type name.
-     *
-     * Generated from protobuf field <code>string name = 1;</code>
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    /**
-     * Enum type name.
-     *
-     * Generated from protobuf field <code>string name = 1;</code>
-     * @param string $var
-     * @return $this
-     */
-    public function setName($var)
-    {
-        GPBUtil::checkString($var, True);
-        $this->name = $var;
-
-        return $this;
-    }
-
-    /**
-     * Enum value definitions.
-     *
-     * Generated from protobuf field <code>repeated .google.protobuf.EnumValue enumvalue = 2;</code>
-     * @return \Google\Protobuf\Internal\RepeatedField
-     */
-    public function getEnumvalue()
-    {
-        return $this->enumvalue;
-    }
-
-    /**
-     * Enum value definitions.
-     *
-     * Generated from protobuf field <code>repeated .google.protobuf.EnumValue enumvalue = 2;</code>
-     * @param array<\Google\Protobuf\EnumValue>|\Google\Protobuf\Internal\RepeatedField $var
-     * @return $this
-     */
-    public function setEnumvalue($var)
-    {
-        $arr = GPBUtil::checkRepeatedField($var, \Google\Protobuf\Internal\GPBType::MESSAGE, \Google\Protobuf\EnumValue::class);
-        $this->enumvalue = $arr;
-
-        return $this;
-    }
-
-    /**
-     * Protocol buffer options.
-     *
-     * Generated from protobuf field <code>repeated .google.protobuf.Option options = 3;</code>
-     * @return \Google\Protobuf\Internal\RepeatedField
-     */
-    public function getOptions()
-    {
-        return $this->options;
-    }
-
-    /**
-     * Protocol buffer options.
-     *
-     * Generated from protobuf field <code>repeated .google.protobuf.Option options = 3;</code>
-     * @param array<\Google\Protobuf\Option>|\Google\Protobuf\Internal\RepeatedField $var
-     * @return $this
-     */
-    public function setOptions($var)
-    {
-        $arr = GPBUtil::checkRepeatedField($var, \Google\Protobuf\Internal\GPBType::MESSAGE, \Google\Protobuf\Option::class);
-        $this->options = $arr;
-
-        return $this;
-    }
-
-    /**
-     * The source context.
-     *
-     * Generated from protobuf field <code>.google.protobuf.SourceContext source_context = 4;</code>
-     * @return \Google\Protobuf\SourceContext|null
-     */
-    public function getSourceContext()
-    {
-        return $this->source_context;
-    }
-
-    public function hasSourceContext()
-    {
-        return isset($this->source_context);
-    }
-
-    public function clearSourceContext()
-    {
-        unset($this->source_context);
-    }
-
-    /**
-     * The source context.
-     *
-     * Generated from protobuf field <code>.google.protobuf.SourceContext source_context = 4;</code>
-     * @param \Google\Protobuf\SourceContext $var
-     * @return $this
-     */
-    public function setSourceContext($var)
-    {
-        GPBUtil::checkMessage($var, \Google\Protobuf\SourceContext::class);
-        $this->source_context = $var;
-
-        return $this;
-    }
-
-    /**
-     * The source syntax.
-     *
-     * Generated from protobuf field <code>.google.protobuf.Syntax syntax = 5;</code>
-     * @return int
-     */
-    public function getSyntax()
-    {
-        return $this->syntax;
-    }
-
-    /**
-     * The source syntax.
-     *
-     * Generated from protobuf field <code>.google.protobuf.Syntax syntax = 5;</code>
-     * @param int $var
-     * @return $this
-     */
-    public function setSyntax($var)
-    {
-        GPBUtil::checkEnum($var, \Google\Protobuf\Syntax::class);
-        $this->syntax = $var;
-
-        return $this;
-    }
-
-}
-
diff --git a/libs/protobuf/php/src/Google/Protobuf/EnumDescriptor.php b/libs/protobuf/php/src/Google/Protobuf/EnumDescriptor.php
deleted file mode 100644
index a8b56c0..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/EnumDescriptor.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-
-// Protocol Buffers - Google's data interchange format
-// Copyright 2017 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-namespace Google\Protobuf;
-
-class EnumDescriptor
-{
-    private $internal_desc;
-
-    /**
-     * @internal
-     */
-    public function __construct($internal_desc)
-    {
-        $this->internal_desc = $internal_desc;
-    }
-
-    /**
-     * @return string Full protobuf message name
-     */
-    public function getFullName()
-    {
-        return $this->internal_desc->getFullName();
-    }
-
-    /**
-     * @return string PHP class name
-     */
-    public function getClass()
-    {
-        return $this->internal_desc->getClass();
-    }
-
-    /**
-     * @param int $index Must be >= 0 and < getValueCount()
-     * @return EnumValueDescriptor
-     */
-    public function getValue($index)
-    {
-        return $this->internal_desc->getValueDescriptorByIndex($index);
-    }
-
-    /**
-     * @return int Number of values in enum
-     */
-    public function getValueCount()
-    {
-        return $this->internal_desc->getValueCount();
-    }
-}
diff --git a/libs/protobuf/php/src/Google/Protobuf/EnumValue.php b/libs/protobuf/php/src/Google/Protobuf/EnumValue.php
deleted file mode 100644
index 93c20f9..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/EnumValue.php
+++ /dev/null
@@ -1,135 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: google/protobuf/type.proto
-
-namespace Google\Protobuf;
-
-use Google\Protobuf\Internal\GPBType;
-use Google\Protobuf\Internal\RepeatedField;
-use Google\Protobuf\Internal\GPBUtil;
-
-/**
- * Enum value definition.
- *
- * Generated from protobuf message <code>google.protobuf.EnumValue</code>
- */
-class EnumValue extends \Google\Protobuf\Internal\Message
-{
-    /**
-     * Enum value name.
-     *
-     * Generated from protobuf field <code>string name = 1;</code>
-     */
-    protected $name = '';
-    /**
-     * Enum value number.
-     *
-     * Generated from protobuf field <code>int32 number = 2;</code>
-     */
-    protected $number = 0;
-    /**
-     * Protocol buffer options.
-     *
-     * Generated from protobuf field <code>repeated .google.protobuf.Option options = 3;</code>
-     */
-    private $options;
-
-    /**
-     * Constructor.
-     *
-     * @param array $data {
-     *     Optional. Data for populating the Message object.
-     *
-     *     @type string $name
-     *           Enum value name.
-     *     @type int $number
-     *           Enum value number.
-     *     @type array<\Google\Protobuf\Option>|\Google\Protobuf\Internal\RepeatedField $options
-     *           Protocol buffer options.
-     * }
-     */
-    public function __construct($data = NULL) {
-        \GPBMetadata\Google\Protobuf\Type::initOnce();
-        parent::__construct($data);
-    }
-
-    /**
-     * Enum value name.
-     *
-     * Generated from protobuf field <code>string name = 1;</code>
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    /**
-     * Enum value name.
-     *
-     * Generated from protobuf field <code>string name = 1;</code>
-     * @param string $var
-     * @return $this
-     */
-    public function setName($var)
-    {
-        GPBUtil::checkString($var, True);
-        $this->name = $var;
-
-        return $this;
-    }
-
-    /**
-     * Enum value number.
-     *
-     * Generated from protobuf field <code>int32 number = 2;</code>
-     * @return int
-     */
-    public function getNumber()
-    {
-        return $this->number;
-    }
-
-    /**
-     * Enum value number.
-     *
-     * Generated from protobuf field <code>int32 number = 2;</code>
-     * @param int $var
-     * @return $this
-     */
-    public function setNumber($var)
-    {
-        GPBUtil::checkInt32($var);
-        $this->number = $var;
-
-        return $this;
-    }
-
-    /**
-     * Protocol buffer options.
-     *
-     * Generated from protobuf field <code>repeated .google.protobuf.Option options = 3;</code>
-     * @return \Google\Protobuf\Internal\RepeatedField
-     */
-    public function getOptions()
-    {
-        return $this->options;
-    }
-
-    /**
-     * Protocol buffer options.
-     *
-     * Generated from protobuf field <code>repeated .google.protobuf.Option options = 3;</code>
-     * @param array<\Google\Protobuf\Option>|\Google\Protobuf\Internal\RepeatedField $var
-     * @return $this
-     */
-    public function setOptions($var)
-    {
-        $arr = GPBUtil::checkRepeatedField($var, \Google\Protobuf\Internal\GPBType::MESSAGE, \Google\Protobuf\Option::class);
-        $this->options = $arr;
-
-        return $this;
-    }
-
-}
-
diff --git a/libs/protobuf/php/src/Google/Protobuf/EnumValueDescriptor.php b/libs/protobuf/php/src/Google/Protobuf/EnumValueDescriptor.php
deleted file mode 100644
index e76e199..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/EnumValueDescriptor.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-namespace Google\Protobuf;
-
-class EnumValueDescriptor
-{
-    private $name;
-    private $number;
-
-    /**
-     * @internal
-     */
-    public function __construct($name, $number)
-    {
-        $this->name = $name;
-        $this->number = $number;
-    }
-
-    /**
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    /**
-     * @return int
-     */
-    public function getNumber()
-    {
-        return $this->number;
-    }
-}
diff --git a/libs/protobuf/php/src/Google/Protobuf/Field.php b/libs/protobuf/php/src/Google/Protobuf/Field.php
deleted file mode 100644
index ddae570..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/Field.php
+++ /dev/null
@@ -1,381 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: google/protobuf/type.proto
-
-namespace Google\Protobuf;
-
-use Google\Protobuf\Internal\GPBType;
-use Google\Protobuf\Internal\RepeatedField;
-use Google\Protobuf\Internal\GPBUtil;
-
-/**
- * A single field of a message type.
- *
- * Generated from protobuf message <code>google.protobuf.Field</code>
- */
-class Field extends \Google\Protobuf\Internal\Message
-{
-    /**
-     * The field type.
-     *
-     * Generated from protobuf field <code>.google.protobuf.Field.Kind kind = 1;</code>
-     */
-    protected $kind = 0;
-    /**
-     * The field cardinality.
-     *
-     * Generated from protobuf field <code>.google.protobuf.Field.Cardinality cardinality = 2;</code>
-     */
-    protected $cardinality = 0;
-    /**
-     * The field number.
-     *
-     * Generated from protobuf field <code>int32 number = 3;</code>
-     */
-    protected $number = 0;
-    /**
-     * The field name.
-     *
-     * Generated from protobuf field <code>string name = 4;</code>
-     */
-    protected $name = '';
-    /**
-     * The field type URL, without the scheme, for message or enumeration
-     * types. Example: `"type.googleapis.com/google.protobuf.Timestamp"`.
-     *
-     * Generated from protobuf field <code>string type_url = 6;</code>
-     */
-    protected $type_url = '';
-    /**
-     * The index of the field type in `Type.oneofs`, for message or enumeration
-     * types. The first type has index 1; zero means the type is not in the list.
-     *
-     * Generated from protobuf field <code>int32 oneof_index = 7;</code>
-     */
-    protected $oneof_index = 0;
-    /**
-     * Whether to use alternative packed wire representation.
-     *
-     * Generated from protobuf field <code>bool packed = 8;</code>
-     */
-    protected $packed = false;
-    /**
-     * The protocol buffer options.
-     *
-     * Generated from protobuf field <code>repeated .google.protobuf.Option options = 9;</code>
-     */
-    private $options;
-    /**
-     * The field JSON name.
-     *
-     * Generated from protobuf field <code>string json_name = 10;</code>
-     */
-    protected $json_name = '';
-    /**
-     * The string value of the default value of this field. Proto2 syntax only.
-     *
-     * Generated from protobuf field <code>string default_value = 11;</code>
-     */
-    protected $default_value = '';
-
-    /**
-     * Constructor.
-     *
-     * @param array $data {
-     *     Optional. Data for populating the Message object.
-     *
-     *     @type int $kind
-     *           The field type.
-     *     @type int $cardinality
-     *           The field cardinality.
-     *     @type int $number
-     *           The field number.
-     *     @type string $name
-     *           The field name.
-     *     @type string $type_url
-     *           The field type URL, without the scheme, for message or enumeration
-     *           types. Example: `"type.googleapis.com/google.protobuf.Timestamp"`.
-     *     @type int $oneof_index
-     *           The index of the field type in `Type.oneofs`, for message or enumeration
-     *           types. The first type has index 1; zero means the type is not in the list.
-     *     @type bool $packed
-     *           Whether to use alternative packed wire representation.
-     *     @type array<\Google\Protobuf\Option>|\Google\Protobuf\Internal\RepeatedField $options
-     *           The protocol buffer options.
-     *     @type string $json_name
-     *           The field JSON name.
-     *     @type string $default_value
-     *           The string value of the default value of this field. Proto2 syntax only.
-     * }
-     */
-    public function __construct($data = NULL) {
-        \GPBMetadata\Google\Protobuf\Type::initOnce();
-        parent::__construct($data);
-    }
-
-    /**
-     * The field type.
-     *
-     * Generated from protobuf field <code>.google.protobuf.Field.Kind kind = 1;</code>
-     * @return int
-     */
-    public function getKind()
-    {
-        return $this->kind;
-    }
-
-    /**
-     * The field type.
-     *
-     * Generated from protobuf field <code>.google.protobuf.Field.Kind kind = 1;</code>
-     * @param int $var
-     * @return $this
-     */
-    public function setKind($var)
-    {
-        GPBUtil::checkEnum($var, \Google\Protobuf\Field\Kind::class);
-        $this->kind = $var;
-
-        return $this;
-    }
-
-    /**
-     * The field cardinality.
-     *
-     * Generated from protobuf field <code>.google.protobuf.Field.Cardinality cardinality = 2;</code>
-     * @return int
-     */
-    public function getCardinality()
-    {
-        return $this->cardinality;
-    }
-
-    /**
-     * The field cardinality.
-     *
-     * Generated from protobuf field <code>.google.protobuf.Field.Cardinality cardinality = 2;</code>
-     * @param int $var
-     * @return $this
-     */
-    public function setCardinality($var)
-    {
-        GPBUtil::checkEnum($var, \Google\Protobuf\Field\Cardinality::class);
-        $this->cardinality = $var;
-
-        return $this;
-    }
-
-    /**
-     * The field number.
-     *
-     * Generated from protobuf field <code>int32 number = 3;</code>
-     * @return int
-     */
-    public function getNumber()
-    {
-        return $this->number;
-    }
-
-    /**
-     * The field number.
-     *
-     * Generated from protobuf field <code>int32 number = 3;</code>
-     * @param int $var
-     * @return $this
-     */
-    public function setNumber($var)
-    {
-        GPBUtil::checkInt32($var);
-        $this->number = $var;
-
-        return $this;
-    }
-
-    /**
-     * The field name.
-     *
-     * Generated from protobuf field <code>string name = 4;</code>
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    /**
-     * The field name.
-     *
-     * Generated from protobuf field <code>string name = 4;</code>
-     * @param string $var
-     * @return $this
-     */
-    public function setName($var)
-    {
-        GPBUtil::checkString($var, True);
-        $this->name = $var;
-
-        return $this;
-    }
-
-    /**
-     * The field type URL, without the scheme, for message or enumeration
-     * types. Example: `"type.googleapis.com/google.protobuf.Timestamp"`.
-     *
-     * Generated from protobuf field <code>string type_url = 6;</code>
-     * @return string
-     */
-    public function getTypeUrl()
-    {
-        return $this->type_url;
-    }
-
-    /**
-     * The field type URL, without the scheme, for message or enumeration
-     * types. Example: `"type.googleapis.com/google.protobuf.Timestamp"`.
-     *
-     * Generated from protobuf field <code>string type_url = 6;</code>
-     * @param string $var
-     * @return $this
-     */
-    public function setTypeUrl($var)
-    {
-        GPBUtil::checkString($var, True);
-        $this->type_url = $var;
-
-        return $this;
-    }
-
-    /**
-     * The index of the field type in `Type.oneofs`, for message or enumeration
-     * types. The first type has index 1; zero means the type is not in the list.
-     *
-     * Generated from protobuf field <code>int32 oneof_index = 7;</code>
-     * @return int
-     */
-    public function getOneofIndex()
-    {
-        return $this->oneof_index;
-    }
-
-    /**
-     * The index of the field type in `Type.oneofs`, for message or enumeration
-     * types. The first type has index 1; zero means the type is not in the list.
-     *
-     * Generated from protobuf field <code>int32 oneof_index = 7;</code>
-     * @param int $var
-     * @return $this
-     */
-    public function setOneofIndex($var)
-    {
-        GPBUtil::checkInt32($var);
-        $this->oneof_index = $var;
-
-        return $this;
-    }
-
-    /**
-     * Whether to use alternative packed wire representation.
-     *
-     * Generated from protobuf field <code>bool packed = 8;</code>
-     * @return bool
-     */
-    public function getPacked()
-    {
-        return $this->packed;
-    }
-
-    /**
-     * Whether to use alternative packed wire representation.
-     *
-     * Generated from protobuf field <code>bool packed = 8;</code>
-     * @param bool $var
-     * @return $this
-     */
-    public function setPacked($var)
-    {
-        GPBUtil::checkBool($var);
-        $this->packed = $var;
-
-        return $this;
-    }
-
-    /**
-     * The protocol buffer options.
-     *
-     * Generated from protobuf field <code>repeated .google.protobuf.Option options = 9;</code>
-     * @return \Google\Protobuf\Internal\RepeatedField
-     */
-    public function getOptions()
-    {
-        return $this->options;
-    }
-
-    /**
-     * The protocol buffer options.
-     *
-     * Generated from protobuf field <code>repeated .google.protobuf.Option options = 9;</code>
-     * @param array<\Google\Protobuf\Option>|\Google\Protobuf\Internal\RepeatedField $var
-     * @return $this
-     */
-    public function setOptions($var)
-    {
-        $arr = GPBUtil::checkRepeatedField($var, \Google\Protobuf\Internal\GPBType::MESSAGE, \Google\Protobuf\Option::class);
-        $this->options = $arr;
-
-        return $this;
-    }
-
-    /**
-     * The field JSON name.
-     *
-     * Generated from protobuf field <code>string json_name = 10;</code>
-     * @return string
-     */
-    public function getJsonName()
-    {
-        return $this->json_name;
-    }
-
-    /**
-     * The field JSON name.
-     *
-     * Generated from protobuf field <code>string json_name = 10;</code>
-     * @param string $var
-     * @return $this
-     */
-    public function setJsonName($var)
-    {
-        GPBUtil::checkString($var, True);
-        $this->json_name = $var;
-
-        return $this;
-    }
-
-    /**
-     * The string value of the default value of this field. Proto2 syntax only.
-     *
-     * Generated from protobuf field <code>string default_value = 11;</code>
-     * @return string
-     */
-    public function getDefaultValue()
-    {
-        return $this->default_value;
-    }
-
-    /**
-     * The string value of the default value of this field. Proto2 syntax only.
-     *
-     * Generated from protobuf field <code>string default_value = 11;</code>
-     * @param string $var
-     * @return $this
-     */
-    public function setDefaultValue($var)
-    {
-        GPBUtil::checkString($var, True);
-        $this->default_value = $var;
-
-        return $this;
-    }
-
-}
-
diff --git a/libs/protobuf/php/src/Google/Protobuf/Field/Cardinality.php b/libs/protobuf/php/src/Google/Protobuf/Field/Cardinality.php
deleted file mode 100644
index a422199..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/Field/Cardinality.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: google/protobuf/type.proto
-
-namespace Google\Protobuf\Field;
-
-use UnexpectedValueException;
-
-/**
- * Whether a field is optional, required, or repeated.
- *
- * Protobuf type <code>google.protobuf.Field.Cardinality</code>
- */
-class Cardinality
-{
-    /**
-     * For fields with unknown cardinality.
-     *
-     * Generated from protobuf enum <code>CARDINALITY_UNKNOWN = 0;</code>
-     */
-    const CARDINALITY_UNKNOWN = 0;
-    /**
-     * For optional fields.
-     *
-     * Generated from protobuf enum <code>CARDINALITY_OPTIONAL = 1;</code>
-     */
-    const CARDINALITY_OPTIONAL = 1;
-    /**
-     * For required fields. Proto2 syntax only.
-     *
-     * Generated from protobuf enum <code>CARDINALITY_REQUIRED = 2;</code>
-     */
-    const CARDINALITY_REQUIRED = 2;
-    /**
-     * For repeated fields.
-     *
-     * Generated from protobuf enum <code>CARDINALITY_REPEATED = 3;</code>
-     */
-    const CARDINALITY_REPEATED = 3;
-
-    private static $valueToName = [
-        self::CARDINALITY_UNKNOWN => 'CARDINALITY_UNKNOWN',
-        self::CARDINALITY_OPTIONAL => 'CARDINALITY_OPTIONAL',
-        self::CARDINALITY_REQUIRED => 'CARDINALITY_REQUIRED',
-        self::CARDINALITY_REPEATED => 'CARDINALITY_REPEATED',
-    ];
-
-    public static function name($value)
-    {
-        if (!isset(self::$valueToName[$value])) {
-            throw new UnexpectedValueException(sprintf(
-                    'Enum %s has no name defined for value %s', __CLASS__, $value));
-        }
-        return self::$valueToName[$value];
-    }
-
-
-    public static function value($name)
-    {
-        $const = __CLASS__ . '::' . strtoupper($name);
-        if (!defined($const)) {
-            throw new UnexpectedValueException(sprintf(
-                    'Enum %s has no value defined for name %s', __CLASS__, $name));
-        }
-        return constant($const);
-    }
-}
-
-// Adding a class alias for backwards compatibility with the previous class name.
-class_alias(Cardinality::class, \Google\Protobuf\Field_Cardinality::class);
-
diff --git a/libs/protobuf/php/src/Google/Protobuf/Field/Kind.php b/libs/protobuf/php/src/Google/Protobuf/Field/Kind.php
deleted file mode 100644
index 2d8dd77..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/Field/Kind.php
+++ /dev/null
@@ -1,176 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: google/protobuf/type.proto
-
-namespace Google\Protobuf\Field;
-
-use UnexpectedValueException;
-
-/**
- * Basic field types.
- *
- * Protobuf type <code>google.protobuf.Field.Kind</code>
- */
-class Kind
-{
-    /**
-     * Field type unknown.
-     *
-     * Generated from protobuf enum <code>TYPE_UNKNOWN = 0;</code>
-     */
-    const TYPE_UNKNOWN = 0;
-    /**
-     * Field type double.
-     *
-     * Generated from protobuf enum <code>TYPE_DOUBLE = 1;</code>
-     */
-    const TYPE_DOUBLE = 1;
-    /**
-     * Field type float.
-     *
-     * Generated from protobuf enum <code>TYPE_FLOAT = 2;</code>
-     */
-    const TYPE_FLOAT = 2;
-    /**
-     * Field type int64.
-     *
-     * Generated from protobuf enum <code>TYPE_INT64 = 3;</code>
-     */
-    const TYPE_INT64 = 3;
-    /**
-     * Field type uint64.
-     *
-     * Generated from protobuf enum <code>TYPE_UINT64 = 4;</code>
-     */
-    const TYPE_UINT64 = 4;
-    /**
-     * Field type int32.
-     *
-     * Generated from protobuf enum <code>TYPE_INT32 = 5;</code>
-     */
-    const TYPE_INT32 = 5;
-    /**
-     * Field type fixed64.
-     *
-     * Generated from protobuf enum <code>TYPE_FIXED64 = 6;</code>
-     */
-    const TYPE_FIXED64 = 6;
-    /**
-     * Field type fixed32.
-     *
-     * Generated from protobuf enum <code>TYPE_FIXED32 = 7;</code>
-     */
-    const TYPE_FIXED32 = 7;
-    /**
-     * Field type bool.
-     *
-     * Generated from protobuf enum <code>TYPE_BOOL = 8;</code>
-     */
-    const TYPE_BOOL = 8;
-    /**
-     * Field type string.
-     *
-     * Generated from protobuf enum <code>TYPE_STRING = 9;</code>
-     */
-    const TYPE_STRING = 9;
-    /**
-     * Field type group. Proto2 syntax only, and deprecated.
-     *
-     * Generated from protobuf enum <code>TYPE_GROUP = 10;</code>
-     */
-    const TYPE_GROUP = 10;
-    /**
-     * Field type message.
-     *
-     * Generated from protobuf enum <code>TYPE_MESSAGE = 11;</code>
-     */
-    const TYPE_MESSAGE = 11;
-    /**
-     * Field type bytes.
-     *
-     * Generated from protobuf enum <code>TYPE_BYTES = 12;</code>
-     */
-    const TYPE_BYTES = 12;
-    /**
-     * Field type uint32.
-     *
-     * Generated from protobuf enum <code>TYPE_UINT32 = 13;</code>
-     */
-    const TYPE_UINT32 = 13;
-    /**
-     * Field type enum.
-     *
-     * Generated from protobuf enum <code>TYPE_ENUM = 14;</code>
-     */
-    const TYPE_ENUM = 14;
-    /**
-     * Field type sfixed32.
-     *
-     * Generated from protobuf enum <code>TYPE_SFIXED32 = 15;</code>
-     */
-    const TYPE_SFIXED32 = 15;
-    /**
-     * Field type sfixed64.
-     *
-     * Generated from protobuf enum <code>TYPE_SFIXED64 = 16;</code>
-     */
-    const TYPE_SFIXED64 = 16;
-    /**
-     * Field type sint32.
-     *
-     * Generated from protobuf enum <code>TYPE_SINT32 = 17;</code>
-     */
-    const TYPE_SINT32 = 17;
-    /**
-     * Field type sint64.
-     *
-     * Generated from protobuf enum <code>TYPE_SINT64 = 18;</code>
-     */
-    const TYPE_SINT64 = 18;
-
-    private static $valueToName = [
-        self::TYPE_UNKNOWN => 'TYPE_UNKNOWN',
-        self::TYPE_DOUBLE => 'TYPE_DOUBLE',
-        self::TYPE_FLOAT => 'TYPE_FLOAT',
-        self::TYPE_INT64 => 'TYPE_INT64',
-        self::TYPE_UINT64 => 'TYPE_UINT64',
-        self::TYPE_INT32 => 'TYPE_INT32',
-        self::TYPE_FIXED64 => 'TYPE_FIXED64',
-        self::TYPE_FIXED32 => 'TYPE_FIXED32',
-        self::TYPE_BOOL => 'TYPE_BOOL',
-        self::TYPE_STRING => 'TYPE_STRING',
-        self::TYPE_GROUP => 'TYPE_GROUP',
-        self::TYPE_MESSAGE => 'TYPE_MESSAGE',
-        self::TYPE_BYTES => 'TYPE_BYTES',
-        self::TYPE_UINT32 => 'TYPE_UINT32',
-        self::TYPE_ENUM => 'TYPE_ENUM',
-        self::TYPE_SFIXED32 => 'TYPE_SFIXED32',
-        self::TYPE_SFIXED64 => 'TYPE_SFIXED64',
-        self::TYPE_SINT32 => 'TYPE_SINT32',
-        self::TYPE_SINT64 => 'TYPE_SINT64',
-    ];
-
-    public static function name($value)
-    {
-        if (!isset(self::$valueToName[$value])) {
-            throw new UnexpectedValueException(sprintf(
-                    'Enum %s has no name defined for value %s', __CLASS__, $value));
-        }
-        return self::$valueToName[$value];
-    }
-
-
-    public static function value($name)
-    {
-        $const = __CLASS__ . '::' . strtoupper($name);
-        if (!defined($const)) {
-            throw new UnexpectedValueException(sprintf(
-                    'Enum %s has no value defined for name %s', __CLASS__, $name));
-        }
-        return constant($const);
-    }
-}
-
-// Adding a class alias for backwards compatibility with the previous class name.
-class_alias(Kind::class, \Google\Protobuf\Field_Kind::class);
-
diff --git a/libs/protobuf/php/src/Google/Protobuf/FieldDescriptor.php b/libs/protobuf/php/src/Google/Protobuf/FieldDescriptor.php
deleted file mode 100644
index ac919a2..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/FieldDescriptor.php
+++ /dev/null
@@ -1,144 +0,0 @@
-<?php
-
-// Protocol Buffers - Google's data interchange format
-// Copyright 2017 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-namespace Google\Protobuf;
-
-use Google\Protobuf\Internal\GetPublicDescriptorTrait;
-use Google\Protobuf\Internal\GPBType;
-
-class FieldDescriptor
-{
-    use GetPublicDescriptorTrait;
-
-    /** @var  \Google\Protobuf\Internal\FieldDescriptor $internal_desc */
-    private $internal_desc;
-
-    /**
-     * @internal
-     */
-    public function __construct($internal_desc)
-    {
-        $this->internal_desc = $internal_desc;
-    }
-
-    /**
-     * @return string Field name
-     */
-    public function getName()
-    {
-        return $this->internal_desc->getName();
-    }
-
-    /**
-     * @return int Protobuf field number
-     */
-    public function getNumber()
-    {
-        return $this->internal_desc->getNumber();
-    }
-
-    /**
-     * @return int
-     */
-    public function getLabel()
-    {
-        return $this->internal_desc->getLabel();
-    }
-
-    /**
-     * @return int
-     */
-    public function getType()
-    {
-        return $this->internal_desc->getType();
-    }
-
-    /**
-     * @return OneofDescriptor
-     */
-    public function getContainingOneof()
-    {
-        return $this->getPublicDescriptor($this->internal_desc->getContainingOneof());
-    }
-
-    /**
-     * Gets the field's containing oneof, only if non-synthetic.
-     *
-     * @return null|OneofDescriptor
-     */
-    public function getRealContainingOneof()
-    {
-        return $this->getPublicDescriptor($this->internal_desc->getRealContainingOneof());
-    }
-
-    /**
-     * @return boolean
-     */
-    public function hasOptionalKeyword()
-    {
-        return $this->internal_desc->hasOptionalKeyword();
-    }
-
-    /**
-     * @return Descriptor Returns a descriptor for the field type if the field type is a message, otherwise throws \Exception
-     * @throws \Exception
-     */
-    public function getMessageType()
-    {
-        if ($this->getType() == GPBType::MESSAGE) {
-            return $this->getPublicDescriptor($this->internal_desc->getMessageType());
-        } else {
-            throw new \Exception("Cannot get message type for non-message field '" . $this->getName() . "'");
-        }
-    }
-
-    /**
-     * @return EnumDescriptor Returns an enum descriptor if the field type is an enum, otherwise throws \Exception
-     * @throws \Exception
-     */
-    public function getEnumType()
-    {
-        if ($this->getType() == GPBType::ENUM) {
-            return $this->getPublicDescriptor($this->internal_desc->getEnumType());
-        } else {
-            throw new \Exception("Cannot get enum type for non-enum field '" . $this->getName() . "'");
-        }
-    }
-
-    /**
-     * @return boolean
-     */
-    public function isMap()
-    {
-        return $this->internal_desc->isMap();
-    }
-}
diff --git a/libs/protobuf/php/src/Google/Protobuf/FieldMask.php b/libs/protobuf/php/src/Google/Protobuf/FieldMask.php
deleted file mode 100644
index a8e5243..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/FieldMask.php
+++ /dev/null
@@ -1,217 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: google/protobuf/field_mask.proto
-
-namespace Google\Protobuf;
-
-use Google\Protobuf\Internal\GPBType;
-use Google\Protobuf\Internal\RepeatedField;
-use Google\Protobuf\Internal\GPBUtil;
-
-/**
- * `FieldMask` represents a set of symbolic field paths, for example:
- *     paths: "f.a"
- *     paths: "f.b.d"
- * Here `f` represents a field in some root message, `a` and `b`
- * fields in the message found in `f`, and `d` a field found in the
- * message in `f.b`.
- * Field masks are used to specify a subset of fields that should be
- * returned by a get operation or modified by an update operation.
- * Field masks also have a custom JSON encoding (see below).
- * # Field Masks in Projections
- * When used in the context of a projection, a response message or
- * sub-message is filtered by the API to only contain those fields as
- * specified in the mask. For example, if the mask in the previous
- * example is applied to a response message as follows:
- *     f {
- *       a : 22
- *       b {
- *         d : 1
- *         x : 2
- *       }
- *       y : 13
- *     }
- *     z: 8
- * The result will not contain specific values for fields x,y and z
- * (their value will be set to the default, and omitted in proto text
- * output):
- *     f {
- *       a : 22
- *       b {
- *         d : 1
- *       }
- *     }
- * A repeated field is not allowed except at the last position of a
- * paths string.
- * If a FieldMask object is not present in a get operation, the
- * operation applies to all fields (as if a FieldMask of all fields
- * had been specified).
- * Note that a field mask does not necessarily apply to the
- * top-level response message. In case of a REST get operation, the
- * field mask applies directly to the response, but in case of a REST
- * list operation, the mask instead applies to each individual message
- * in the returned resource list. In case of a REST custom method,
- * other definitions may be used. Where the mask applies will be
- * clearly documented together with its declaration in the API.  In
- * any case, the effect on the returned resource/resources is required
- * behavior for APIs.
- * # Field Masks in Update Operations
- * A field mask in update operations specifies which fields of the
- * targeted resource are going to be updated. The API is required
- * to only change the values of the fields as specified in the mask
- * and leave the others untouched. If a resource is passed in to
- * describe the updated values, the API ignores the values of all
- * fields not covered by the mask.
- * If a repeated field is specified for an update operation, new values will
- * be appended to the existing repeated field in the target resource. Note that
- * a repeated field is only allowed in the last position of a `paths` string.
- * If a sub-message is specified in the last position of the field mask for an
- * update operation, then new value will be merged into the existing sub-message
- * in the target resource.
- * For example, given the target message:
- *     f {
- *       b {
- *         d: 1
- *         x: 2
- *       }
- *       c: [1]
- *     }
- * And an update message:
- *     f {
- *       b {
- *         d: 10
- *       }
- *       c: [2]
- *     }
- * then if the field mask is:
- *  paths: ["f.b", "f.c"]
- * then the result will be:
- *     f {
- *       b {
- *         d: 10
- *         x: 2
- *       }
- *       c: [1, 2]
- *     }
- * An implementation may provide options to override this default behavior for
- * repeated and message fields.
- * In order to reset a field's value to the default, the field must
- * be in the mask and set to the default value in the provided resource.
- * Hence, in order to reset all fields of a resource, provide a default
- * instance of the resource and set all fields in the mask, or do
- * not provide a mask as described below.
- * If a field mask is not present on update, the operation applies to
- * all fields (as if a field mask of all fields has been specified).
- * Note that in the presence of schema evolution, this may mean that
- * fields the client does not know and has therefore not filled into
- * the request will be reset to their default. If this is unwanted
- * behavior, a specific service may require a client to always specify
- * a field mask, producing an error if not.
- * As with get operations, the location of the resource which
- * describes the updated values in the request message depends on the
- * operation kind. In any case, the effect of the field mask is
- * required to be honored by the API.
- * ## Considerations for HTTP REST
- * The HTTP kind of an update operation which uses a field mask must
- * be set to PATCH instead of PUT in order to satisfy HTTP semantics
- * (PUT must only be used for full updates).
- * # JSON Encoding of Field Masks
- * In JSON, a field mask is encoded as a single string where paths are
- * separated by a comma. Fields name in each path are converted
- * to/from lower-camel naming conventions.
- * As an example, consider the following message declarations:
- *     message Profile {
- *       User user = 1;
- *       Photo photo = 2;
- *     }
- *     message User {
- *       string display_name = 1;
- *       string address = 2;
- *     }
- * In proto a field mask for `Profile` may look as such:
- *     mask {
- *       paths: "user.display_name"
- *       paths: "photo"
- *     }
- * In JSON, the same mask is represented as below:
- *     {
- *       mask: "user.displayName,photo"
- *     }
- * # Field Masks and Oneof Fields
- * Field masks treat fields in oneofs just as regular fields. Consider the
- * following message:
- *     message SampleMessage {
- *       oneof test_oneof {
- *         string name = 4;
- *         SubMessage sub_message = 9;
- *       }
- *     }
- * The field mask can be:
- *     mask {
- *       paths: "name"
- *     }
- * Or:
- *     mask {
- *       paths: "sub_message"
- *     }
- * Note that oneof type names ("test_oneof" in this case) cannot be used in
- * paths.
- * ## Field Mask Verification
- * The implementation of any API method which has a FieldMask type field in the
- * request should verify the included field paths, and return an
- * `INVALID_ARGUMENT` error if any path is unmappable.
- *
- * Generated from protobuf message <code>google.protobuf.FieldMask</code>
- */
-class FieldMask extends \Google\Protobuf\Internal\Message
-{
-    /**
-     * The set of field mask paths.
-     *
-     * Generated from protobuf field <code>repeated string paths = 1;</code>
-     */
-    private $paths;
-
-    /**
-     * Constructor.
-     *
-     * @param array $data {
-     *     Optional. Data for populating the Message object.
-     *
-     *     @type array<string>|\Google\Protobuf\Internal\RepeatedField $paths
-     *           The set of field mask paths.
-     * }
-     */
-    public function __construct($data = NULL) {
-        \GPBMetadata\Google\Protobuf\FieldMask::initOnce();
-        parent::__construct($data);
-    }
-
-    /**
-     * The set of field mask paths.
-     *
-     * Generated from protobuf field <code>repeated string paths = 1;</code>
-     * @return \Google\Protobuf\Internal\RepeatedField
-     */
-    public function getPaths()
-    {
-        return $this->paths;
-    }
-
-    /**
-     * The set of field mask paths.
-     *
-     * Generated from protobuf field <code>repeated string paths = 1;</code>
-     * @param array<string>|\Google\Protobuf\Internal\RepeatedField $var
-     * @return $this
-     */
-    public function setPaths($var)
-    {
-        $arr = GPBUtil::checkRepeatedField($var, \Google\Protobuf\Internal\GPBType::STRING);
-        $this->paths = $arr;
-
-        return $this;
-    }
-
-}
-
diff --git a/libs/protobuf/php/src/Google/Protobuf/Field_Cardinality.php b/libs/protobuf/php/src/Google/Protobuf/Field_Cardinality.php
deleted file mode 100644
index dff8f89..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/Field_Cardinality.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: google/protobuf/type.proto
-
-namespace Google\Protobuf;
-
-if (false) {
-    /**
-     * This class is deprecated. Use Google\Protobuf\Field\Cardinality instead.
-     * @deprecated
-     */
-    class Field_Cardinality {}
-}
-class_exists(Field\Cardinality::class);
-@trigger_error('Google\Protobuf\Field_Cardinality is deprecated and will be removed in the next major release. Use Google\Protobuf\Field\Cardinality instead', E_USER_DEPRECATED);
-
diff --git a/libs/protobuf/php/src/Google/Protobuf/Field_Kind.php b/libs/protobuf/php/src/Google/Protobuf/Field_Kind.php
deleted file mode 100644
index aa20237..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/Field_Kind.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: google/protobuf/type.proto
-
-namespace Google\Protobuf;
-
-if (false) {
-    /**
-     * This class is deprecated. Use Google\Protobuf\Field\Kind instead.
-     * @deprecated
-     */
-    class Field_Kind {}
-}
-class_exists(Field\Kind::class);
-@trigger_error('Google\Protobuf\Field_Kind is deprecated and will be removed in the next major release. Use Google\Protobuf\Field\Kind instead', E_USER_DEPRECATED);
-
diff --git a/libs/protobuf/php/src/Google/Protobuf/FloatValue.php b/libs/protobuf/php/src/Google/Protobuf/FloatValue.php
deleted file mode 100644
index 4285358..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/FloatValue.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: google/protobuf/wrappers.proto
-
-namespace Google\Protobuf;
-
-use Google\Protobuf\Internal\GPBType;
-use Google\Protobuf\Internal\RepeatedField;
-use Google\Protobuf\Internal\GPBUtil;
-
-/**
- * Wrapper message for `float`.
- * The JSON representation for `FloatValue` is JSON number.
- *
- * Generated from protobuf message <code>google.protobuf.FloatValue</code>
- */
-class FloatValue extends \Google\Protobuf\Internal\Message
-{
-    /**
-     * The float value.
-     *
-     * Generated from protobuf field <code>float value = 1;</code>
-     */
-    protected $value = 0.0;
-
-    /**
-     * Constructor.
-     *
-     * @param array $data {
-     *     Optional. Data for populating the Message object.
-     *
-     *     @type float $value
-     *           The float value.
-     * }
-     */
-    public function __construct($data = NULL) {
-        \GPBMetadata\Google\Protobuf\Wrappers::initOnce();
-        parent::__construct($data);
-    }
-
-    /**
-     * The float value.
-     *
-     * Generated from protobuf field <code>float value = 1;</code>
-     * @return float
-     */
-    public function getValue()
-    {
-        return $this->value;
-    }
-
-    /**
-     * The float value.
-     *
-     * Generated from protobuf field <code>float value = 1;</code>
-     * @param float $var
-     * @return $this
-     */
-    public function setValue($var)
-    {
-        GPBUtil::checkFloat($var);
-        $this->value = $var;
-
-        return $this;
-    }
-
-}
-
diff --git a/libs/protobuf/php/src/Google/Protobuf/GPBEmpty.php b/libs/protobuf/php/src/Google/Protobuf/GPBEmpty.php
deleted file mode 100644
index 4db6923..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/GPBEmpty.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: google/protobuf/empty.proto
-
-namespace Google\Protobuf;
-
-use Google\Protobuf\Internal\GPBType;
-use Google\Protobuf\Internal\RepeatedField;
-use Google\Protobuf\Internal\GPBUtil;
-
-/**
- * A generic empty message that you can re-use to avoid defining duplicated
- * empty messages in your APIs. A typical example is to use it as the request
- * or the response type of an API method. For instance:
- *     service Foo {
- *       rpc Bar(google.protobuf.Empty) returns (google.protobuf.Empty);
- *     }
- *
- * Generated from protobuf message <code>google.protobuf.Empty</code>
- */
-class GPBEmpty extends \Google\Protobuf\Internal\Message
-{
-
-    /**
-     * Constructor.
-     *
-     * @param array $data {
-     *     Optional. Data for populating the Message object.
-     *
-     * }
-     */
-    public function __construct($data = NULL) {
-        \GPBMetadata\Google\Protobuf\GPBEmpty::initOnce();
-        parent::__construct($data);
-    }
-
-}
-
diff --git a/libs/protobuf/php/src/Google/Protobuf/Int32Value.php b/libs/protobuf/php/src/Google/Protobuf/Int32Value.php
deleted file mode 100644
index cfd73cd..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/Int32Value.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: google/protobuf/wrappers.proto
-
-namespace Google\Protobuf;
-
-use Google\Protobuf\Internal\GPBType;
-use Google\Protobuf\Internal\RepeatedField;
-use Google\Protobuf\Internal\GPBUtil;
-
-/**
- * Wrapper message for `int32`.
- * The JSON representation for `Int32Value` is JSON number.
- *
- * Generated from protobuf message <code>google.protobuf.Int32Value</code>
- */
-class Int32Value extends \Google\Protobuf\Internal\Message
-{
-    /**
-     * The int32 value.
-     *
-     * Generated from protobuf field <code>int32 value = 1;</code>
-     */
-    protected $value = 0;
-
-    /**
-     * Constructor.
-     *
-     * @param array $data {
-     *     Optional. Data for populating the Message object.
-     *
-     *     @type int $value
-     *           The int32 value.
-     * }
-     */
-    public function __construct($data = NULL) {
-        \GPBMetadata\Google\Protobuf\Wrappers::initOnce();
-        parent::__construct($data);
-    }
-
-    /**
-     * The int32 value.
-     *
-     * Generated from protobuf field <code>int32 value = 1;</code>
-     * @return int
-     */
-    public function getValue()
-    {
-        return $this->value;
-    }
-
-    /**
-     * The int32 value.
-     *
-     * Generated from protobuf field <code>int32 value = 1;</code>
-     * @param int $var
-     * @return $this
-     */
-    public function setValue($var)
-    {
-        GPBUtil::checkInt32($var);
-        $this->value = $var;
-
-        return $this;
-    }
-
-}
-
diff --git a/libs/protobuf/php/src/Google/Protobuf/Int64Value.php b/libs/protobuf/php/src/Google/Protobuf/Int64Value.php
deleted file mode 100644
index 143474f..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/Int64Value.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: google/protobuf/wrappers.proto
-
-namespace Google\Protobuf;
-
-use Google\Protobuf\Internal\GPBType;
-use Google\Protobuf\Internal\RepeatedField;
-use Google\Protobuf\Internal\GPBUtil;
-
-/**
- * Wrapper message for `int64`.
- * The JSON representation for `Int64Value` is JSON string.
- *
- * Generated from protobuf message <code>google.protobuf.Int64Value</code>
- */
-class Int64Value extends \Google\Protobuf\Internal\Message
-{
-    /**
-     * The int64 value.
-     *
-     * Generated from protobuf field <code>int64 value = 1;</code>
-     */
-    protected $value = 0;
-
-    /**
-     * Constructor.
-     *
-     * @param array $data {
-     *     Optional. Data for populating the Message object.
-     *
-     *     @type int|string $value
-     *           The int64 value.
-     * }
-     */
-    public function __construct($data = NULL) {
-        \GPBMetadata\Google\Protobuf\Wrappers::initOnce();
-        parent::__construct($data);
-    }
-
-    /**
-     * The int64 value.
-     *
-     * Generated from protobuf field <code>int64 value = 1;</code>
-     * @return int|string
-     */
-    public function getValue()
-    {
-        return $this->value;
-    }
-
-    /**
-     * The int64 value.
-     *
-     * Generated from protobuf field <code>int64 value = 1;</code>
-     * @param int|string $var
-     * @return $this
-     */
-    public function setValue($var)
-    {
-        GPBUtil::checkInt64($var);
-        $this->value = $var;
-
-        return $this;
-    }
-
-}
-
diff --git a/libs/protobuf/php/src/Google/Protobuf/Internal/AnyBase.php b/libs/protobuf/php/src/Google/Protobuf/Internal/AnyBase.php
deleted file mode 100644
index cba922d..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/Internal/AnyBase.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<?php
-
-namespace Google\Protobuf\Internal;
-
-/**
- * Base class for Google\Protobuf\Any, this contains hand-written convenience
- * methods like pack() and unpack().
- */
-class AnyBase extends \Google\Protobuf\Internal\Message
-{
-    const TYPE_URL_PREFIX = 'type.googleapis.com/';
-
-    /**
-     * This method will try to resolve the type_url in Any message to get the
-     * targeted message type. If failed, an error will be thrown. Otherwise,
-     * the method will create a message of the targeted type and fill it with
-     * the decoded value in Any.
-     * @return Message unpacked message
-     * @throws \Exception Type url needs to be type.googleapis.com/fully-qualified.
-     * @throws \Exception Class hasn't been added to descriptor pool.
-     * @throws \Exception cannot decode data in value field.
-     */
-    public function unpack()
-    {
-        // Get fully qualified name from type url.
-        $url_prifix_len = strlen(GPBUtil::TYPE_URL_PREFIX);
-        if (substr($this->type_url, 0, $url_prifix_len) !=
-                GPBUtil::TYPE_URL_PREFIX) {
-            throw new \Exception(
-                "Type url needs to be type.googleapis.com/fully-qulified");
-        }
-        $fully_qualifed_name =
-            substr($this->type_url, $url_prifix_len);
-
-        // Create message according to fully qualified name.
-        $pool = \Google\Protobuf\Internal\DescriptorPool::getGeneratedPool();
-        $desc = $pool->getDescriptorByProtoName($fully_qualifed_name);
-        if (is_null($desc)) {
-            throw new \Exception("Class ".$fully_qualifed_name
-                                     ." hasn't been added to descriptor pool");
-        }
-        $klass = $desc->getClass();
-        $msg = new $klass();
-
-        // Merge data into message.
-        $msg->mergeFromString($this->value);
-        return $msg;
-    }
-
-    /**
-     * The type_url will be created according to the given message’s type and
-     * the value is encoded data from the given message..
-     * @param message: A proto message.
-     */
-    public function pack($msg)
-    {
-        if (!$msg instanceof Message) {
-            trigger_error("Given parameter is not a message instance.",
-                          E_USER_ERROR);
-            return;
-        }
-
-        // Set value using serialized message.
-        $this->value = $msg->serializeToString();
-
-        // Set type url.
-        $pool = \Google\Protobuf\Internal\DescriptorPool::getGeneratedPool();
-        $desc = $pool->getDescriptorByClassName(get_class($msg));
-        $fully_qualifed_name = $desc->getFullName();
-        $this->type_url = GPBUtil::TYPE_URL_PREFIX . $fully_qualifed_name;
-    }
-
-    /**
-     * This method returns whether the type_url in any_message is corresponded
-     * to the given class.
-     * @param klass: The fully qualified PHP class name of a proto message type.
-     */
-    public function is($klass)
-    {
-        $pool = \Google\Protobuf\Internal\DescriptorPool::getGeneratedPool();
-        $desc = $pool->getDescriptorByClassName($klass);
-        $fully_qualifed_name = $desc->getFullName();
-        $type_url = GPBUtil::TYPE_URL_PREFIX . $fully_qualifed_name;
-        return $this->type_url === $type_url;
-    }
-}
diff --git a/libs/protobuf/php/src/Google/Protobuf/Internal/CodedInputStream.php b/libs/protobuf/php/src/Google/Protobuf/Internal/CodedInputStream.php
deleted file mode 100644
index 2ed2dfd..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/Internal/CodedInputStream.php
+++ /dev/null
@@ -1,382 +0,0 @@
-<?php
-
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-namespace Google\Protobuf\Internal;
-
-use Google\Protobuf\Internal\Uint64;
-
-class CodedInputStream
-{
-
-    private $buffer;
-    private $buffer_size_after_limit;
-    private $buffer_end;
-    private $current;
-    private $current_limit;
-    private $legitimate_message_end;
-    private $recursion_budget;
-    private $recursion_limit;
-    private $total_bytes_limit;
-    private $total_bytes_read;
-
-    const MAX_VARINT_BYTES = 10;
-    const DEFAULT_RECURSION_LIMIT = 100;
-    const DEFAULT_TOTAL_BYTES_LIMIT = 33554432; // 32 << 20, 32MB
-
-    public function __construct($buffer)
-    {
-        $start = 0;
-        $end = strlen($buffer);
-        $this->buffer = $buffer;
-        $this->buffer_size_after_limit = 0;
-        $this->buffer_end = $end;
-        $this->current = $start;
-        $this->current_limit = $end;
-        $this->legitimate_message_end = false;
-        $this->recursion_budget = self::DEFAULT_RECURSION_LIMIT;
-        $this->recursion_limit = self::DEFAULT_RECURSION_LIMIT;
-        $this->total_bytes_limit = self::DEFAULT_TOTAL_BYTES_LIMIT;
-        $this->total_bytes_read = $end - $start;
-    }
-
-    private function advance($amount)
-    {
-        $this->current += $amount;
-    }
-
-    public function bufferSize()
-    {
-        return $this->buffer_end - $this->current;
-    }
-
-    public function current()
-    {
-        return $this->total_bytes_read -
-            ($this->buffer_end - $this->current +
-            $this->buffer_size_after_limit);
-    }
-
-    public function substr($start, $end)
-    {
-        return substr($this->buffer, $start, $end - $start);
-    }
-
-    private function recomputeBufferLimits()
-    {
-        $this->buffer_end += $this->buffer_size_after_limit;
-        $closest_limit = min($this->current_limit, $this->total_bytes_limit);
-        if ($closest_limit < $this->total_bytes_read) {
-            // The limit position is in the current buffer.  We must adjust the
-            // buffer size accordingly.
-            $this->buffer_size_after_limit = $this->total_bytes_read -
-                $closest_limit;
-            $this->buffer_end -= $this->buffer_size_after_limit;
-        } else {
-            $this->buffer_size_after_limit = 0;
-        }
-    }
-
-    private function consumedEntireMessage()
-    {
-        return $this->legitimate_message_end;
-    }
-
-    /**
-     * Read uint32 into $var. Advance buffer with consumed bytes. If the
-     * contained varint is larger than 32 bits, discard the high order bits.
-     * @param $var.
-     */
-    public function readVarint32(&$var)
-    {
-        if (!$this->readVarint64($var)) {
-            return false;
-        }
-
-        if (PHP_INT_SIZE == 4) {
-            $var = bcmod($var, 4294967296);
-        } else {
-            $var &= 0xFFFFFFFF;
-        }
-
-        // Convert large uint32 to int32.
-        if ($var > 0x7FFFFFFF) {
-            if (PHP_INT_SIZE === 8) {
-                $var = $var | (0xFFFFFFFF << 32);
-            } else {
-                $var = bcsub($var, 4294967296);
-            }
-        }
-
-        $var = intval($var);
-        return true;
-    }
-
-    /**
-     * Read Uint64 into $var. Advance buffer with consumed bytes.
-     * @param $var.
-     */
-    public function readVarint64(&$var)
-    {
-        $count = 0;
-
-        if (PHP_INT_SIZE == 4) {
-            $high = 0;
-            $low = 0;
-            $b = 0;
-
-            do {
-                if ($this->current === $this->buffer_end) {
-                    return false;
-                }
-                if ($count === self::MAX_VARINT_BYTES) {
-                    return false;
-                }
-                $b = ord($this->buffer[$this->current]);
-                $bits = 7 * $count;
-                if ($bits >= 32) {
-                    $high |= (($b & 0x7F) << ($bits - 32));
-                } else if ($bits > 25){
-                    // $bits is 28 in this case.
-                    $low |= (($b & 0x7F) << 28);
-                    $high = ($b & 0x7F) >> 4;
-                } else {
-                    $low |= (($b & 0x7F) << $bits);
-                }
-
-                $this->advance(1);
-                $count += 1;
-            } while ($b & 0x80);
-
-            $var = GPBUtil::combineInt32ToInt64($high, $low);
-            if (bccomp($var, 0) < 0) {
-                $var = bcadd($var, "18446744073709551616");
-            }
-        } else {
-            $result = 0;
-            $shift = 0;
-
-            do {
-                if ($this->current === $this->buffer_end) {
-                    return false;
-                }
-                if ($count === self::MAX_VARINT_BYTES) {
-                    return false;
-                }
-
-                $byte = ord($this->buffer[$this->current]);
-                $result |= ($byte & 0x7f) << $shift;
-                $shift += 7;
-                $this->advance(1);
-                $count += 1;
-            } while ($byte > 0x7f);
-
-            $var = $result;
-        }
-
-        return true;
-    }
-
-    /**
-     * Read int into $var. If the result is larger than the largest integer, $var
-     * will be -1. Advance buffer with consumed bytes.
-     * @param $var.
-     */
-    public function readVarintSizeAsInt(&$var)
-    {
-        if (!$this->readVarint64($var)) {
-            return false;
-        }
-        $var = (int)$var;
-        return true;
-    }
-
-    /**
-     * Read 32-bit unsigned integer to $var. If the buffer has less than 4 bytes,
-     * return false. Advance buffer with consumed bytes.
-     * @param $var.
-     */
-    public function readLittleEndian32(&$var)
-    {
-        $data = null;
-        if (!$this->readRaw(4, $data)) {
-            return false;
-        }
-        $var = unpack('V', $data);
-        $var = $var[1];
-        return true;
-    }
-
-    /**
-     * Read 64-bit unsigned integer to $var. If the buffer has less than 8 bytes,
-     * return false. Advance buffer with consumed bytes.
-     * @param $var.
-     */
-    public function readLittleEndian64(&$var)
-    {
-        $data = null;
-        if (!$this->readRaw(4, $data)) {
-            return false;
-        }
-        $low = unpack('V', $data)[1];
-        if (!$this->readRaw(4, $data)) {
-            return false;
-        }
-        $high = unpack('V', $data)[1];
-        if (PHP_INT_SIZE == 4) {
-            $var = GPBUtil::combineInt32ToInt64($high, $low);
-        } else {
-            $var = ($high << 32) | $low;
-        }
-        return true;
-    }
-
-    /**
-     * Read tag into $var. Advance buffer with consumed bytes.
-     * @param $var.
-     */
-    public function readTag()
-    {
-        if ($this->current === $this->buffer_end) {
-            // Make sure that it failed due to EOF, not because we hit
-            // total_bytes_limit, which, unlike normal limits, is not a valid
-            // place to end a message.
-            $current_position = $this->total_bytes_read -
-                $this->buffer_size_after_limit;
-            if ($current_position >= $this->total_bytes_limit) {
-                // Hit total_bytes_limit_.  But if we also hit the normal limit,
-                // we're still OK.
-                $this->legitimate_message_end =
-                    ($this->current_limit === $this->total_bytes_limit);
-            } else {
-                $this->legitimate_message_end = true;
-            }
-            return 0;
-        }
-
-        $result = 0;
-        // The largest tag is 2^29 - 1, which can be represented by int32.
-        $success = $this->readVarint32($result);
-        if ($success) {
-            return $result;
-        } else {
-            return 0;
-        }
-    }
-
-    public function readRaw($size, &$buffer)
-    {
-        $current_buffer_size = 0;
-        if ($this->bufferSize() < $size) {
-            return false;
-        }
-
-        if ($size === 0) {
-          $buffer = "";
-        } else {
-          $buffer = substr($this->buffer, $this->current, $size);
-          $this->advance($size);
-        }
-
-        return true;
-    }
-
-    /* Places a limit on the number of bytes that the stream may read, starting
-     * from the current position.  Once the stream hits this limit, it will act
-     * like the end of the input has been reached until popLimit() is called.
-     *
-     * As the names imply, the stream conceptually has a stack of limits.  The
-     * shortest limit on the stack is always enforced, even if it is not the top
-     * limit.
-     *
-     * The value returned by pushLimit() is opaque to the caller, and must be
-     * passed unchanged to the corresponding call to popLimit().
-     *
-     * @param integer $byte_limit
-     * @throws \Exception Fail to push limit.
-     */
-    public function pushLimit($byte_limit)
-    {
-        // Current position relative to the beginning of the stream.
-        $current_position = $this->current();
-        $old_limit = $this->current_limit;
-
-        // security: byte_limit is possibly evil, so check for negative values
-        // and overflow.
-        if ($byte_limit >= 0 &&
-            $byte_limit <= PHP_INT_MAX - $current_position &&
-            $byte_limit <= $this->current_limit - $current_position) {
-            $this->current_limit = $current_position + $byte_limit;
-            $this->recomputeBufferLimits();
-        } else {
-            throw new GPBDecodeException("Fail to push limit.");
-        }
-
-        return $old_limit;
-    }
-
-    /* The limit passed in is actually the *old* limit, which we returned from
-     * PushLimit().
-     *
-     * @param integer $byte_limit
-     */
-    public function popLimit($byte_limit)
-    {
-        $this->current_limit = $byte_limit;
-        $this->recomputeBufferLimits();
-        // We may no longer be at a legitimate message end.  ReadTag() needs to
-        // be called again to find out.
-        $this->legitimate_message_end = false;
-    }
-
-    public function incrementRecursionDepthAndPushLimit(
-        $byte_limit, &$old_limit, &$recursion_budget)
-    {
-        $old_limit = $this->pushLimit($byte_limit);
-        $recursion_limit = --$this->recursion_limit;
-    }
-
-    public function decrementRecursionDepthAndPopLimit($byte_limit)
-    {
-        $result = $this->consumedEntireMessage();
-        $this->popLimit($byte_limit);
-        ++$this->recursion_budget;
-        return $result;
-    }
-
-    public function bytesUntilLimit()
-    {
-        if ($this->current_limit === PHP_INT_MAX) {
-            return -1;
-        }
-        return $this->current_limit - $this->current;
-    }
-}
diff --git a/libs/protobuf/php/src/Google/Protobuf/Internal/CodedOutputStream.php b/libs/protobuf/php/src/Google/Protobuf/Internal/CodedOutputStream.php
deleted file mode 100644
index f75e9c6..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/Internal/CodedOutputStream.php
+++ /dev/null
@@ -1,159 +0,0 @@
-<?php
-
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-namespace Google\Protobuf\Internal;
-
-class CodedOutputStream
-{
-
-    private $buffer;
-    private $buffer_size;
-    private $current;
-
-    const MAX_VARINT64_BYTES = 10;
-
-    public function __construct($size)
-    {
-        $this->current = 0;
-        $this->buffer_size = $size;
-        $this->buffer = str_repeat(chr(0), $this->buffer_size);
-    }
-
-    public function getData()
-    {
-        return $this->buffer;
-    }
-
-    public function writeVarint32($value, $trim)
-    {
-        $bytes = str_repeat(chr(0), self::MAX_VARINT64_BYTES);
-        $size = self::writeVarintToArray($value, $bytes, $trim);
-        return $this->writeRaw($bytes, $size);
-    }
-
-    public function writeVarint64($value)
-    {
-        $bytes = str_repeat(chr(0), self::MAX_VARINT64_BYTES);
-        $size = self::writeVarintToArray($value, $bytes);
-        return $this->writeRaw($bytes, $size);
-    }
-
-    public function writeLittleEndian32($value)
-    {
-        $bytes = str_repeat(chr(0), 4);
-        $size = self::writeLittleEndian32ToArray($value, $bytes);
-        return $this->writeRaw($bytes, $size);
-    }
-
-    public function writeLittleEndian64($value)
-    {
-        $bytes = str_repeat(chr(0), 8);
-        $size = self::writeLittleEndian64ToArray($value, $bytes);
-        return $this->writeRaw($bytes, $size);
-    }
-
-    public function writeTag($tag)
-    {
-        return $this->writeVarint32($tag, true);
-    }
-
-    public function writeRaw($data, $size)
-    {
-        if ($this->buffer_size < $size) {
-            trigger_error("Output stream doesn't have enough buffer.");
-            return false;
-        }
-
-        for ($i = 0; $i < $size; $i++) {
-            $this->buffer[$this->current] = $data[$i];
-            $this->current++;
-            $this->buffer_size--;
-        }
-        return true;
-    }
-
-    public static function writeVarintToArray($value, &$buffer, $trim = false)
-    {
-        $current = 0;
-
-        $high = 0;
-        $low = 0;
-        if (PHP_INT_SIZE == 4) {
-            GPBUtil::divideInt64ToInt32($value, $high, $low, $trim);
-        } else {
-            $low = $value;
-        }
-
-        while (($low >= 0x80 || $low < 0) || $high != 0) {
-            $buffer[$current] = chr($low | 0x80);
-            $value = ($value >> 7) & ~(0x7F << ((PHP_INT_SIZE << 3) - 7));
-            $carry = ($high & 0x7F) << ((PHP_INT_SIZE << 3) - 7);
-            $high = ($high >> 7) & ~(0x7F << ((PHP_INT_SIZE << 3) - 7));
-            $low = (($low >> 7) & ~(0x7F << ((PHP_INT_SIZE << 3) - 7)) | $carry);
-            $current++;
-        }
-        $buffer[$current] = chr($low);
-        return $current + 1;
-    }
-
-    private static function writeLittleEndian32ToArray($value, &$buffer)
-    {
-        $buffer[0] = chr($value & 0x000000FF);
-        $buffer[1] = chr(($value >> 8) & 0x000000FF);
-        $buffer[2] = chr(($value >> 16) & 0x000000FF);
-        $buffer[3] = chr(($value >> 24) & 0x000000FF);
-        return 4;
-    }
-
-    private static function writeLittleEndian64ToArray($value, &$buffer)
-    {
-        $high = 0;
-        $low = 0;
-        if (PHP_INT_SIZE == 4) {
-            GPBUtil::divideInt64ToInt32($value, $high, $low);
-        } else {
-            $low = $value & 0xFFFFFFFF;
-            $high = ($value >> 32) & 0xFFFFFFFF;
-        }
-
-        $buffer[0] = chr($low & 0x000000FF);
-        $buffer[1] = chr(($low >> 8) & 0x000000FF);
-        $buffer[2] = chr(($low >> 16) & 0x000000FF);
-        $buffer[3] = chr(($low >> 24) & 0x000000FF);
-        $buffer[4] = chr($high & 0x000000FF);
-        $buffer[5] = chr(($high >> 8) & 0x000000FF);
-        $buffer[6] = chr(($high >> 16) & 0x000000FF);
-        $buffer[7] = chr(($high >> 24) & 0x000000FF);
-        return 8;
-    }
-
-}
diff --git a/libs/protobuf/php/src/Google/Protobuf/Internal/Descriptor.php b/libs/protobuf/php/src/Google/Protobuf/Internal/Descriptor.php
deleted file mode 100644
index 51a34d6..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/Internal/Descriptor.php
+++ /dev/null
@@ -1,236 +0,0 @@
-<?php
-
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-namespace Google\Protobuf\Internal;
-
-class Descriptor
-{
-    use HasPublicDescriptorTrait;
-
-    private $full_name;
-    private $field = [];
-    private $json_to_field = [];
-    private $name_to_field = [];
-    private $index_to_field = [];
-    private $nested_type = [];
-    private $enum_type = [];
-    private $klass;
-    private $legacy_klass;
-    private $previous_klass;
-    private $options;
-    private $oneof_decl = [];
-
-    public function __construct()
-    {
-        $this->public_desc = new \Google\Protobuf\Descriptor($this);
-    }
-
-    public function addOneofDecl($oneof)
-    {
-        $this->oneof_decl[] = $oneof;
-    }
-
-    public function getOneofDecl()
-    {
-        return $this->oneof_decl;
-    }
-
-    public function setFullName($full_name)
-    {
-        $this->full_name = $full_name;
-    }
-
-    public function getFullName()
-    {
-        return $this->full_name;
-    }
-
-    public function addField($field)
-    {
-        $this->field[$field->getNumber()] = $field;
-        $this->json_to_field[$field->getJsonName()] = $field;
-        $this->name_to_field[$field->getName()] = $field;
-        $this->index_to_field[] = $field;
-    }
-
-    public function getField()
-    {
-        return $this->field;
-    }
-
-    public function addNestedType($desc)
-    {
-        $this->nested_type[] = $desc;
-    }
-
-    public function getNestedType()
-    {
-        return $this->nested_type;
-    }
-
-    public function addEnumType($desc)
-    {
-        $this->enum_type[] = $desc;
-    }
-
-    public function getEnumType()
-    {
-        return $this->enum_type;
-    }
-
-    public function getFieldByNumber($number)
-    {
-        if (!isset($this->field[$number])) {
-          return NULL;
-        } else {
-          return $this->field[$number];
-        }
-    }
-
-    public function getFieldByJsonName($json_name)
-    {
-        if (!isset($this->json_to_field[$json_name])) {
-          return NULL;
-        } else {
-          return $this->json_to_field[$json_name];
-        }
-    }
-
-    public function getFieldByName($name)
-    {
-        if (!isset($this->name_to_field[$name])) {
-          return NULL;
-        } else {
-          return $this->name_to_field[$name];
-        }
-    }
-
-    public function getFieldByIndex($index)
-    {
-        if (count($this->index_to_field) <= $index) {
-            return NULL;
-        } else {
-            return $this->index_to_field[$index];
-        }
-    }
-
-    public function setClass($klass)
-    {
-        $this->klass = $klass;
-    }
-
-    public function getClass()
-    {
-        return $this->klass;
-    }
-
-    public function setLegacyClass($klass)
-    {
-        $this->legacy_klass = $klass;
-    }
-
-    public function getLegacyClass()
-    {
-        return $this->legacy_klass;
-    }
-
-    public function setPreviouslyUnreservedClass($klass)
-    {
-        $this->previous_klass = $klass;
-    }
-
-    public function getPreviouslyUnreservedClass()
-    {
-        return $this->previous_klass;
-    }
-
-    public function setOptions($options)
-    {
-        $this->options = $options;
-    }
-
-    public function getOptions()
-    {
-        return $this->options;
-    }
-
-    public static function buildFromProto($proto, $file_proto, $containing)
-    {
-        $desc = new Descriptor();
-
-        $message_name_without_package  = "";
-        $classname = "";
-        $legacy_classname = "";
-        $previous_classname = "";
-        $fullname = "";
-        GPBUtil::getFullClassName(
-            $proto,
-            $containing,
-            $file_proto,
-            $message_name_without_package,
-            $classname,
-            $legacy_classname,
-            $fullname,
-            $previous_classname);
-        $desc->setFullName($fullname);
-        $desc->setClass($classname);
-        $desc->setLegacyClass($legacy_classname);
-        $desc->setPreviouslyUnreservedClass($previous_classname);
-        $desc->setOptions($proto->getOptions());
-
-        foreach ($proto->getField() as $field_proto) {
-            $desc->addField(FieldDescriptor::buildFromProto($field_proto));
-        }
-
-        // Handle nested types.
-        foreach ($proto->getNestedType() as $nested_proto) {
-            $desc->addNestedType(Descriptor::buildFromProto(
-              $nested_proto, $file_proto, $message_name_without_package));
-        }
-
-        // Handle nested enum.
-        foreach ($proto->getEnumType() as $enum_proto) {
-            $desc->addEnumType(EnumDescriptor::buildFromProto(
-              $enum_proto, $file_proto, $message_name_without_package));
-        }
-
-        // Handle oneof fields.
-        $index = 0;
-        foreach ($proto->getOneofDecl() as $oneof_proto) {
-            $desc->addOneofDecl(
-                OneofDescriptor::buildFromProto($oneof_proto, $desc, $index));
-            $index++;
-        }
-
-        return $desc;
-    }
-}
diff --git a/libs/protobuf/php/src/Google/Protobuf/Internal/DescriptorPool.php b/libs/protobuf/php/src/Google/Protobuf/Internal/DescriptorPool.php
deleted file mode 100644
index 1be00e2..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/Internal/DescriptorPool.php
+++ /dev/null
@@ -1,194 +0,0 @@
-<?php
-
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-namespace Google\Protobuf\Internal;
-
-use Google\Protobuf\Internal\Descriptor;
-use Google\Protobuf\Internal\FileDescriptor;
-use Google\Protobuf\Internal\FileDescriptorSet;
-use Google\Protobuf\Internal\MessageBuilderContext;
-use Google\Protobuf\Internal\EnumBuilderContext;
-
-class DescriptorPool
-{
-    private static $pool;
-    // Map from message names to sub-maps, which are maps from field numbers to
-    // field descriptors.
-    private $class_to_desc = [];
-    private $class_to_enum_desc = [];
-    private $proto_to_class = [];
-
-    public static function getGeneratedPool()
-    {
-        if (!isset(self::$pool)) {
-            self::$pool = new DescriptorPool();
-        }
-        return self::$pool;
-    }
-
-    public function internalAddGeneratedFile($data, $use_nested = false)
-    {
-        $files = new FileDescriptorSet();
-        $files->mergeFromString($data);
-
-        foreach($files->getFile() as $file_proto) {
-            $file = FileDescriptor::buildFromProto($file_proto);
-
-            foreach ($file->getMessageType() as $desc) {
-                $this->addDescriptor($desc);
-            }
-            unset($desc);
-
-            foreach ($file->getEnumType() as $desc) {
-                $this->addEnumDescriptor($desc);
-            }
-            unset($desc);
-
-            foreach ($file->getMessageType() as $desc) {
-                $this->crossLink($desc);
-            }
-            unset($desc);
-        }
-    }
-
-    public function addMessage($name, $klass)
-    {
-        return new MessageBuilderContext($name, $klass, $this);
-    }
-
-    public function addEnum($name, $klass)
-    {
-        return new EnumBuilderContext($name, $klass, $this);
-    }
-
-    public function addDescriptor($descriptor)
-    {
-        $this->proto_to_class[$descriptor->getFullName()] =
-            $descriptor->getClass();
-        $this->class_to_desc[$descriptor->getClass()] = $descriptor;
-        $this->class_to_desc[$descriptor->getLegacyClass()] = $descriptor;
-        $this->class_to_desc[$descriptor->getPreviouslyUnreservedClass()] = $descriptor;
-        foreach ($descriptor->getNestedType() as $nested_type) {
-            $this->addDescriptor($nested_type);
-        }
-        foreach ($descriptor->getEnumType() as $enum_type) {
-            $this->addEnumDescriptor($enum_type);
-        }
-    }
-
-    public function addEnumDescriptor($descriptor)
-    {
-        $this->proto_to_class[$descriptor->getFullName()] =
-            $descriptor->getClass();
-        $this->class_to_enum_desc[$descriptor->getClass()] = $descriptor;
-        $this->class_to_enum_desc[$descriptor->getLegacyClass()] = $descriptor;
-    }
-
-    public function getDescriptorByClassName($klass)
-    {
-        if (isset($this->class_to_desc[$klass])) {
-            return $this->class_to_desc[$klass];
-        } else {
-            return null;
-        }
-    }
-
-    public function getEnumDescriptorByClassName($klass)
-    {
-        if (isset($this->class_to_enum_desc[$klass])) {
-            return $this->class_to_enum_desc[$klass];
-        } else {
-            return null;
-        }
-    }
-
-    public function getDescriptorByProtoName($proto)
-    {
-        if (isset($this->proto_to_class[$proto])) {
-            $klass = $this->proto_to_class[$proto];
-            return $this->class_to_desc[$klass];
-        } else {
-          return null;
-        }
-    }
-
-    public function getEnumDescriptorByProtoName($proto)
-    {
-        $klass = $this->proto_to_class[$proto];
-        return $this->class_to_enum_desc[$klass];
-    }
-
-    private function crossLink(Descriptor $desc)
-    {
-        foreach ($desc->getField() as $field) {
-            switch ($field->getType()) {
-                case GPBType::MESSAGE:
-                    $proto = $field->getMessageType();
-                    if ($proto[0] == '.') {
-                      $proto = substr($proto, 1);
-                    }
-                    $subdesc = $this->getDescriptorByProtoName($proto);
-                    if (is_null($subdesc)) {
-                        trigger_error(
-                            'proto not added: ' . $proto
-                            . " for " . $desc->getFullName(), E_USER_ERROR);
-                    }
-                    $field->setMessageType($subdesc);
-                    break;
-                case GPBType::ENUM:
-                    $proto = $field->getEnumType();
-                    if ($proto[0] == '.') {
-                      $proto = substr($proto, 1);
-                    }
-                    $field->setEnumType(
-                        $this->getEnumDescriptorByProtoName($proto));
-                    break;
-                default:
-                    break;
-            }
-        }
-        unset($field);
-
-        foreach ($desc->getNestedType() as $nested_type) {
-            $this->crossLink($nested_type);
-        }
-        unset($nested_type);
-    }
-
-    public function finish()
-    {
-        foreach ($this->class_to_desc as $klass => $desc) {
-            $this->crossLink($desc);
-        }
-        unset($desc);
-    }
-}
diff --git a/libs/protobuf/php/src/Google/Protobuf/Internal/DescriptorProto.php b/libs/protobuf/php/src/Google/Protobuf/Internal/DescriptorProto.php
deleted file mode 100644
index 2937c5a..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/Internal/DescriptorProto.php
+++ /dev/null
@@ -1,336 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: google/protobuf/descriptor.proto
-
-namespace Google\Protobuf\Internal;
-
-use Google\Protobuf\Internal\GPBType;
-use Google\Protobuf\Internal\GPBWire;
-use Google\Protobuf\Internal\RepeatedField;
-use Google\Protobuf\Internal\InputStream;
-use Google\Protobuf\Internal\GPBUtil;
-
-/**
- * Describes a message type.
- *
- * Generated from protobuf message <code>google.protobuf.DescriptorProto</code>
- */
-class DescriptorProto extends \Google\Protobuf\Internal\Message
-{
-    /**
-     * Generated from protobuf field <code>optional string name = 1;</code>
-     */
-    protected $name = null;
-    /**
-     * Generated from protobuf field <code>repeated .google.protobuf.FieldDescriptorProto field = 2;</code>
-     */
-    private $field;
-    /**
-     * Generated from protobuf field <code>repeated .google.protobuf.FieldDescriptorProto extension = 6;</code>
-     */
-    private $extension;
-    /**
-     * Generated from protobuf field <code>repeated .google.protobuf.DescriptorProto nested_type = 3;</code>
-     */
-    private $nested_type;
-    /**
-     * Generated from protobuf field <code>repeated .google.protobuf.EnumDescriptorProto enum_type = 4;</code>
-     */
-    private $enum_type;
-    /**
-     * Generated from protobuf field <code>repeated .google.protobuf.DescriptorProto.ExtensionRange extension_range = 5;</code>
-     */
-    private $extension_range;
-    /**
-     * Generated from protobuf field <code>repeated .google.protobuf.OneofDescriptorProto oneof_decl = 8;</code>
-     */
-    private $oneof_decl;
-    /**
-     * Generated from protobuf field <code>optional .google.protobuf.MessageOptions options = 7;</code>
-     */
-    protected $options = null;
-    /**
-     * Generated from protobuf field <code>repeated .google.protobuf.DescriptorProto.ReservedRange reserved_range = 9;</code>
-     */
-    private $reserved_range;
-    /**
-     * Reserved field names, which may not be used by fields in the same message.
-     * A given name may only be reserved once.
-     *
-     * Generated from protobuf field <code>repeated string reserved_name = 10;</code>
-     */
-    private $reserved_name;
-
-    /**
-     * Constructor.
-     *
-     * @param array $data {
-     *     Optional. Data for populating the Message object.
-     *
-     *     @type string $name
-     *     @type array<\Google\Protobuf\Internal\FieldDescriptorProto>|\Google\Protobuf\Internal\RepeatedField $field
-     *     @type array<\Google\Protobuf\Internal\FieldDescriptorProto>|\Google\Protobuf\Internal\RepeatedField $extension
-     *     @type array<\Google\Protobuf\Internal\DescriptorProto>|\Google\Protobuf\Internal\RepeatedField $nested_type
-     *     @type array<\Google\Protobuf\Internal\EnumDescriptorProto>|\Google\Protobuf\Internal\RepeatedField $enum_type
-     *     @type array<\Google\Protobuf\Internal\DescriptorProto\ExtensionRange>|\Google\Protobuf\Internal\RepeatedField $extension_range
-     *     @type array<\Google\Protobuf\Internal\OneofDescriptorProto>|\Google\Protobuf\Internal\RepeatedField $oneof_decl
-     *     @type \Google\Protobuf\Internal\MessageOptions $options
-     *     @type array<\Google\Protobuf\Internal\DescriptorProto\ReservedRange>|\Google\Protobuf\Internal\RepeatedField $reserved_range
-     *     @type array<string>|\Google\Protobuf\Internal\RepeatedField $reserved_name
-     *           Reserved field names, which may not be used by fields in the same message.
-     *           A given name may only be reserved once.
-     * }
-     */
-    public function __construct($data = NULL) {
-        \GPBMetadata\Google\Protobuf\Internal\Descriptor::initOnce();
-        parent::__construct($data);
-    }
-
-    /**
-     * Generated from protobuf field <code>optional string name = 1;</code>
-     * @return string
-     */
-    public function getName()
-    {
-        return isset($this->name) ? $this->name : '';
-    }
-
-    public function hasName()
-    {
-        return isset($this->name);
-    }
-
-    public function clearName()
-    {
-        unset($this->name);
-    }
-
-    /**
-     * Generated from protobuf field <code>optional string name = 1;</code>
-     * @param string $var
-     * @return $this
-     */
-    public function setName($var)
-    {
-        GPBUtil::checkString($var, True);
-        $this->name = $var;
-
-        return $this;
-    }
-
-    /**
-     * Generated from protobuf field <code>repeated .google.protobuf.FieldDescriptorProto field = 2;</code>
-     * @return \Google\Protobuf\Internal\RepeatedField
-     */
-    public function getField()
-    {
-        return $this->field;
-    }
-
-    /**
-     * Generated from protobuf field <code>repeated .google.protobuf.FieldDescriptorProto field = 2;</code>
-     * @param array<\Google\Protobuf\Internal\FieldDescriptorProto>|\Google\Protobuf\Internal\RepeatedField $var
-     * @return $this
-     */
-    public function setField($var)
-    {
-        $arr = GPBUtil::checkRepeatedField($var, \Google\Protobuf\Internal\GPBType::MESSAGE, \Google\Protobuf\Internal\FieldDescriptorProto::class);
-        $this->field = $arr;
-
-        return $this;
-    }
-
-    /**
-     * Generated from protobuf field <code>repeated .google.protobuf.FieldDescriptorProto extension = 6;</code>
-     * @return \Google\Protobuf\Internal\RepeatedField
-     */
-    public function getExtension()
-    {
-        return $this->extension;
-    }
-
-    /**
-     * Generated from protobuf field <code>repeated .google.protobuf.FieldDescriptorProto extension = 6;</code>
-     * @param array<\Google\Protobuf\Internal\FieldDescriptorProto>|\Google\Protobuf\Internal\RepeatedField $var
-     * @return $this
-     */
-    public function setExtension($var)
-    {
-        $arr = GPBUtil::checkRepeatedField($var, \Google\Protobuf\Internal\GPBType::MESSAGE, \Google\Protobuf\Internal\FieldDescriptorProto::class);
-        $this->extension = $arr;
-
-        return $this;
-    }
-
-    /**
-     * Generated from protobuf field <code>repeated .google.protobuf.DescriptorProto nested_type = 3;</code>
-     * @return \Google\Protobuf\Internal\RepeatedField
-     */
-    public function getNestedType()
-    {
-        return $this->nested_type;
-    }
-
-    /**
-     * Generated from protobuf field <code>repeated .google.protobuf.DescriptorProto nested_type = 3;</code>
-     * @param array<\Google\Protobuf\Internal\DescriptorProto>|\Google\Protobuf\Internal\RepeatedField $var
-     * @return $this
-     */
-    public function setNestedType($var)
-    {
-        $arr = GPBUtil::checkRepeatedField($var, \Google\Protobuf\Internal\GPBType::MESSAGE, \Google\Protobuf\Internal\DescriptorProto::class);
-        $this->nested_type = $arr;
-
-        return $this;
-    }
-
-    /**
-     * Generated from protobuf field <code>repeated .google.protobuf.EnumDescriptorProto enum_type = 4;</code>
-     * @return \Google\Protobuf\Internal\RepeatedField
-     */
-    public function getEnumType()
-    {
-        return $this->enum_type;
-    }
-
-    /**
-     * Generated from protobuf field <code>repeated .google.protobuf.EnumDescriptorProto enum_type = 4;</code>
-     * @param array<\Google\Protobuf\Internal\EnumDescriptorProto>|\Google\Protobuf\Internal\RepeatedField $var
-     * @return $this
-     */
-    public function setEnumType($var)
-    {
-        $arr = GPBUtil::checkRepeatedField($var, \Google\Protobuf\Internal\GPBType::MESSAGE, \Google\Protobuf\Internal\EnumDescriptorProto::class);
-        $this->enum_type = $arr;
-
-        return $this;
-    }
-
-    /**
-     * Generated from protobuf field <code>repeated .google.protobuf.DescriptorProto.ExtensionRange extension_range = 5;</code>
-     * @return \Google\Protobuf\Internal\RepeatedField
-     */
-    public function getExtensionRange()
-    {
-        return $this->extension_range;
-    }
-
-    /**
-     * Generated from protobuf field <code>repeated .google.protobuf.DescriptorProto.ExtensionRange extension_range = 5;</code>
-     * @param array<\Google\Protobuf\Internal\DescriptorProto\ExtensionRange>|\Google\Protobuf\Internal\RepeatedField $var
-     * @return $this
-     */
-    public function setExtensionRange($var)
-    {
-        $arr = GPBUtil::checkRepeatedField($var, \Google\Protobuf\Internal\GPBType::MESSAGE, \Google\Protobuf\Internal\DescriptorProto\ExtensionRange::class);
-        $this->extension_range = $arr;
-
-        return $this;
-    }
-
-    /**
-     * Generated from protobuf field <code>repeated .google.protobuf.OneofDescriptorProto oneof_decl = 8;</code>
-     * @return \Google\Protobuf\Internal\RepeatedField
-     */
-    public function getOneofDecl()
-    {
-        return $this->oneof_decl;
-    }
-
-    /**
-     * Generated from protobuf field <code>repeated .google.protobuf.OneofDescriptorProto oneof_decl = 8;</code>
-     * @param array<\Google\Protobuf\Internal\OneofDescriptorProto>|\Google\Protobuf\Internal\RepeatedField $var
-     * @return $this
-     */
-    public function setOneofDecl($var)
-    {
-        $arr = GPBUtil::checkRepeatedField($var, \Google\Protobuf\Internal\GPBType::MESSAGE, \Google\Protobuf\Internal\OneofDescriptorProto::class);
-        $this->oneof_decl = $arr;
-
-        return $this;
-    }
-
-    /**
-     * Generated from protobuf field <code>optional .google.protobuf.MessageOptions options = 7;</code>
-     * @return \Google\Protobuf\Internal\MessageOptions|null
-     */
-    public function getOptions()
-    {
-        return $this->options;
-    }
-
-    public function hasOptions()
-    {
-        return isset($this->options);
-    }
-
-    public function clearOptions()
-    {
-        unset($this->options);
-    }
-
-    /**
-     * Generated from protobuf field <code>optional .google.protobuf.MessageOptions options = 7;</code>
-     * @param \Google\Protobuf\Internal\MessageOptions $var
-     * @return $this
-     */
-    public function setOptions($var)
-    {
-        GPBUtil::checkMessage($var, \Google\Protobuf\Internal\MessageOptions::class);
-        $this->options = $var;
-
-        return $this;
-    }
-
-    /**
-     * Generated from protobuf field <code>repeated .google.protobuf.DescriptorProto.ReservedRange reserved_range = 9;</code>
-     * @return \Google\Protobuf\Internal\RepeatedField
-     */
-    public function getReservedRange()
-    {
-        return $this->reserved_range;
-    }
-
-    /**
-     * Generated from protobuf field <code>repeated .google.protobuf.DescriptorProto.ReservedRange reserved_range = 9;</code>
-     * @param array<\Google\Protobuf\Internal\DescriptorProto\ReservedRange>|\Google\Protobuf\Internal\RepeatedField $var
-     * @return $this
-     */
-    public function setReservedRange($var)
-    {
-        $arr = GPBUtil::checkRepeatedField($var, \Google\Protobuf\Internal\GPBType::MESSAGE, \Google\Protobuf\Internal\DescriptorProto\ReservedRange::class);
-        $this->reserved_range = $arr;
-
-        return $this;
-    }
-
-    /**
-     * Reserved field names, which may not be used by fields in the same message.
-     * A given name may only be reserved once.
-     *
-     * Generated from protobuf field <code>repeated string reserved_name = 10;</code>
-     * @return \Google\Protobuf\Internal\RepeatedField
-     */
-    public function getReservedName()
-    {
-        return $this->reserved_name;
-    }
-
-    /**
-     * Reserved field names, which may not be used by fields in the same message.
-     * A given name may only be reserved once.
-     *
-     * Generated from protobuf field <code>repeated string reserved_name = 10;</code>
-     * @param array<string>|\Google\Protobuf\Internal\RepeatedField $var
-     * @return $this
-     */
-    public function setReservedName($var)
-    {
-        $arr = GPBUtil::checkRepeatedField($var, \Google\Protobuf\Internal\GPBType::STRING);
-        $this->reserved_name = $arr;
-
-        return $this;
-    }
-
-}
-
diff --git a/libs/protobuf/php/src/Google/Protobuf/Internal/DescriptorProto/ExtensionRange.php b/libs/protobuf/php/src/Google/Protobuf/Internal/DescriptorProto/ExtensionRange.php
deleted file mode 100644
index 43c33c4..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/Internal/DescriptorProto/ExtensionRange.php
+++ /dev/null
@@ -1,161 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: google/protobuf/descriptor.proto
-
-namespace Google\Protobuf\Internal\DescriptorProto;
-
-use Google\Protobuf\Internal\GPBType;
-use Google\Protobuf\Internal\GPBWire;
-use Google\Protobuf\Internal\RepeatedField;
-use Google\Protobuf\Internal\InputStream;
-use Google\Protobuf\Internal\GPBUtil;
-
-/**
- * Generated from protobuf message <code>google.protobuf.DescriptorProto.ExtensionRange</code>
- */
-class ExtensionRange extends \Google\Protobuf\Internal\Message
-{
-    /**
-     * Inclusive.
-     *
-     * Generated from protobuf field <code>optional int32 start = 1;</code>
-     */
-    protected $start = null;
-    /**
-     * Exclusive.
-     *
-     * Generated from protobuf field <code>optional int32 end = 2;</code>
-     */
-    protected $end = null;
-    /**
-     * Generated from protobuf field <code>optional .google.protobuf.ExtensionRangeOptions options = 3;</code>
-     */
-    protected $options = null;
-
-    /**
-     * Constructor.
-     *
-     * @param array $data {
-     *     Optional. Data for populating the Message object.
-     *
-     *     @type int $start
-     *           Inclusive.
-     *     @type int $end
-     *           Exclusive.
-     *     @type \Google\Protobuf\Internal\ExtensionRangeOptions $options
-     * }
-     */
-    public function __construct($data = NULL) {
-        \GPBMetadata\Google\Protobuf\Internal\Descriptor::initOnce();
-        parent::__construct($data);
-    }
-
-    /**
-     * Inclusive.
-     *
-     * Generated from protobuf field <code>optional int32 start = 1;</code>
-     * @return int
-     */
-    public function getStart()
-    {
-        return isset($this->start) ? $this->start : 0;
-    }
-
-    public function hasStart()
-    {
-        return isset($this->start);
-    }
-
-    public function clearStart()
-    {
-        unset($this->start);
-    }
-
-    /**
-     * Inclusive.
-     *
-     * Generated from protobuf field <code>optional int32 start = 1;</code>
-     * @param int $var
-     * @return $this
-     */
-    public function setStart($var)
-    {
-        GPBUtil::checkInt32($var);
-        $this->start = $var;
-
-        return $this;
-    }
-
-    /**
-     * Exclusive.
-     *
-     * Generated from protobuf field <code>optional int32 end = 2;</code>
-     * @return int
-     */
-    public function getEnd()
-    {
-        return isset($this->end) ? $this->end : 0;
-    }
-
-    public function hasEnd()
-    {
-        return isset($this->end);
-    }
-
-    public function clearEnd()
-    {
-        unset($this->end);
-    }
-
-    /**
-     * Exclusive.
-     *
-     * Generated from protobuf field <code>optional int32 end = 2;</code>
-     * @param int $var
-     * @return $this
-     */
-    public function setEnd($var)
-    {
-        GPBUtil::checkInt32($var);
-        $this->end = $var;
-
-        return $this;
-    }
-
-    /**
-     * Generated from protobuf field <code>optional .google.protobuf.ExtensionRangeOptions options = 3;</code>
-     * @return \Google\Protobuf\Internal\ExtensionRangeOptions|null
-     */
-    public function getOptions()
-    {
-        return $this->options;
-    }
-
-    public function hasOptions()
-    {
-        return isset($this->options);
-    }
-
-    public function clearOptions()
-    {
-        unset($this->options);
-    }
-
-    /**
-     * Generated from protobuf field <code>optional .google.protobuf.ExtensionRangeOptions options = 3;</code>
-     * @param \Google\Protobuf\Internal\ExtensionRangeOptions $var
-     * @return $this
-     */
-    public function setOptions($var)
-    {
-        GPBUtil::checkMessage($var, \Google\Protobuf\Internal\ExtensionRangeOptions::class);
-        $this->options = $var;
-
-        return $this;
-    }
-
-}
-
-// Adding a class alias for backwards compatibility with the previous class name.
-class_alias(ExtensionRange::class, \Google\Protobuf\Internal\DescriptorProto_ExtensionRange::class);
-
diff --git a/libs/protobuf/php/src/Google/Protobuf/Internal/DescriptorProto/ReservedRange.php b/libs/protobuf/php/src/Google/Protobuf/Internal/DescriptorProto/ReservedRange.php
deleted file mode 100644
index f099cc3..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/Internal/DescriptorProto/ReservedRange.php
+++ /dev/null
@@ -1,128 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: google/protobuf/descriptor.proto
-
-namespace Google\Protobuf\Internal\DescriptorProto;
-
-use Google\Protobuf\Internal\GPBType;
-use Google\Protobuf\Internal\GPBWire;
-use Google\Protobuf\Internal\RepeatedField;
-use Google\Protobuf\Internal\InputStream;
-use Google\Protobuf\Internal\GPBUtil;
-
-/**
- * Range of reserved tag numbers. Reserved tag numbers may not be used by
- * fields or extension ranges in the same message. Reserved ranges may
- * not overlap.
- *
- * Generated from protobuf message <code>google.protobuf.DescriptorProto.ReservedRange</code>
- */
-class ReservedRange extends \Google\Protobuf\Internal\Message
-{
-    /**
-     * Inclusive.
-     *
-     * Generated from protobuf field <code>optional int32 start = 1;</code>
-     */
-    protected $start = null;
-    /**
-     * Exclusive.
-     *
-     * Generated from protobuf field <code>optional int32 end = 2;</code>
-     */
-    protected $end = null;
-
-    /**
-     * Constructor.
-     *
-     * @param array $data {
-     *     Optional. Data for populating the Message object.
-     *
-     *     @type int $start
-     *           Inclusive.
-     *     @type int $end
-     *           Exclusive.
-     * }
-     */
-    public function __construct($data = NULL) {
-        \GPBMetadata\Google\Protobuf\Internal\Descriptor::initOnce();
-        parent::__construct($data);
-    }
-
-    /**
-     * Inclusive.
-     *
-     * Generated from protobuf field <code>optional int32 start = 1;</code>
-     * @return int
-     */
-    public function getStart()
-    {
-        return isset($this->start) ? $this->start : 0;
-    }
-
-    public function hasStart()
-    {
-        return isset($this->start);
-    }
-
-    public function clearStart()
-    {
-        unset($this->start);
-    }
-
-    /**
-     * Inclusive.
-     *
-     * Generated from protobuf field <code>optional int32 start = 1;</code>
-     * @param int $var
-     * @return $this
-     */
-    public function setStart($var)
-    {
-        GPBUtil::checkInt32($var);
-        $this->start = $var;
-
-        return $this;
-    }
-
-    /**
-     * Exclusive.
-     *
-     * Generated from protobuf field <code>optional int32 end = 2;</code>
-     * @return int
-     */
-    public function getEnd()
-    {
-        return isset($this->end) ? $this->end : 0;
-    }
-
-    public function hasEnd()
-    {
-        return isset($this->end);
-    }
-
-    public function clearEnd()
-    {
-        unset($this->end);
-    }
-
-    /**
-     * Exclusive.
-     *
-     * Generated from protobuf field <code>optional int32 end = 2;</code>
-     * @param int $var
-     * @return $this
-     */
-    public function setEnd($var)
-    {
-        GPBUtil::checkInt32($var);
-        $this->end = $var;
-
-        return $this;
-    }
-
-}
-
-// Adding a class alias for backwards compatibility with the previous class name.
-class_alias(ReservedRange::class, \Google\Protobuf\Internal\DescriptorProto_ReservedRange::class);
-
diff --git a/libs/protobuf/php/src/Google/Protobuf/Internal/DescriptorProto_ExtensionRange.php b/libs/protobuf/php/src/Google/Protobuf/Internal/DescriptorProto_ExtensionRange.php
deleted file mode 100644
index c928fbe..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/Internal/DescriptorProto_ExtensionRange.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: google/protobuf/descriptor.proto
-
-namespace Google\Protobuf\Internal;
-
-if (false) {
-    /**
-     * This class is deprecated. Use Google\Protobuf\Internal\DescriptorProto\ExtensionRange instead.
-     * @deprecated
-     */
-    class DescriptorProto_ExtensionRange {}
-}
-class_exists(DescriptorProto\ExtensionRange::class);
-@trigger_error('Google\Protobuf\Internal\DescriptorProto_ExtensionRange is deprecated and will be removed in the next major release. Use Google\Protobuf\Internal\DescriptorProto\ExtensionRange instead', E_USER_DEPRECATED);
-
diff --git a/libs/protobuf/php/src/Google/Protobuf/Internal/DescriptorProto_ReservedRange.php b/libs/protobuf/php/src/Google/Protobuf/Internal/DescriptorProto_ReservedRange.php
deleted file mode 100644
index e49e945..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/Internal/DescriptorProto_ReservedRange.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: google/protobuf/descriptor.proto
-
-namespace Google\Protobuf\Internal;
-
-if (false) {
-    /**
-     * This class is deprecated. Use Google\Protobuf\Internal\DescriptorProto\ReservedRange instead.
-     * @deprecated
-     */
-    class DescriptorProto_ReservedRange {}
-}
-class_exists(DescriptorProto\ReservedRange::class);
-@trigger_error('Google\Protobuf\Internal\DescriptorProto_ReservedRange is deprecated and will be removed in the next major release. Use Google\Protobuf\Internal\DescriptorProto\ReservedRange instead', E_USER_DEPRECATED);
-
diff --git a/libs/protobuf/php/src/Google/Protobuf/Internal/EnumBuilderContext.php b/libs/protobuf/php/src/Google/Protobuf/Internal/EnumBuilderContext.php
deleted file mode 100644
index 0839728..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/Internal/EnumBuilderContext.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-namespace Google\Protobuf\Internal;
-
-use Google\Protobuf\Internal\EnumDescriptor;
-use Google\Protobuf\EnumValueDescriptor;
-
-class EnumBuilderContext
-{
-
-    private $descriptor;
-    private $pool;
-
-    public function __construct($full_name, $klass, $pool)
-    {
-        $this->descriptor = new EnumDescriptor();
-        $this->descriptor->setFullName($full_name);
-        $this->descriptor->setClass($klass);
-        $this->pool = $pool;
-    }
-
-    public function value($name, $number)
-    {
-        $value = new EnumValueDescriptor($name, $number);
-        $this->descriptor->addValue($number, $value);
-        return $this;
-    }
-
-    public function finalizeToPool()
-    {
-        $this->pool->addEnumDescriptor($this->descriptor);
-    }
-}
diff --git a/libs/protobuf/php/src/Google/Protobuf/Internal/EnumDescriptor.php b/libs/protobuf/php/src/Google/Protobuf/Internal/EnumDescriptor.php
deleted file mode 100644
index 383f53b..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/Internal/EnumDescriptor.php
+++ /dev/null
@@ -1,116 +0,0 @@
-<?php
-
-namespace Google\Protobuf\Internal;
-
-use Google\Protobuf\EnumValueDescriptor;
-
-class EnumDescriptor
-{
-    use HasPublicDescriptorTrait;
-
-    private $klass;
-    private $legacy_klass;
-    private $full_name;
-    private $value;
-    private $name_to_value;
-    private $value_descriptor = [];
-
-    public function __construct()
-    {
-        $this->public_desc = new \Google\Protobuf\EnumDescriptor($this);
-    }
-
-    public function setFullName($full_name)
-    {
-        $this->full_name = $full_name;
-    }
-
-    public function getFullName()
-    {
-        return $this->full_name;
-    }
-
-    public function addValue($number, $value)
-    {
-        $this->value[$number] = $value;
-        $this->name_to_value[$value->getName()] = $value;
-        $this->value_descriptor[] = new EnumValueDescriptor($value->getName(), $number);
-    }
-
-    public function getValueByNumber($number)
-    {
-        if (isset($this->value[$number])) {
-            return $this->value[$number];
-        }
-        return null;
-    }
-
-    public function getValueByName($name)
-    {
-        if (isset($this->name_to_value[$name])) {
-            return $this->name_to_value[$name];
-        }
-        return null;
-    }
-
-    public function getValueDescriptorByIndex($index)
-    {
-        if (isset($this->value_descriptor[$index])) {
-            return $this->value_descriptor[$index];
-        }
-        return null;
-    }
-
-    public function getValueCount()
-    {
-        return count($this->value);
-    }
-
-    public function setClass($klass)
-    {
-        $this->klass = $klass;
-    }
-
-    public function getClass()
-    {
-        return $this->klass;
-    }
-
-    public function setLegacyClass($klass)
-    {
-        $this->legacy_klass = $klass;
-    }
-
-    public function getLegacyClass()
-    {
-        return $this->legacy_klass;
-    }
-
-    public static function buildFromProto($proto, $file_proto, $containing)
-    {
-        $desc = new EnumDescriptor();
-
-        $enum_name_without_package  = "";
-        $classname = "";
-        $legacy_classname = "";
-        $fullname = "";
-        GPBUtil::getFullClassName(
-            $proto,
-            $containing,
-            $file_proto,
-            $enum_name_without_package,
-            $classname,
-            $legacy_classname,
-            $fullname,
-            $unused_previous_classname);
-        $desc->setFullName($fullname);
-        $desc->setClass($classname);
-        $desc->setLegacyClass($legacy_classname);
-        $values = $proto->getValue();
-        foreach ($values as $value) {
-            $desc->addValue($value->getNumber(), $value);
-        }
-
-        return $desc;
-    }
-}
diff --git a/libs/protobuf/php/src/Google/Protobuf/Internal/EnumDescriptorProto.php b/libs/protobuf/php/src/Google/Protobuf/Internal/EnumDescriptorProto.php
deleted file mode 100644
index cb2a42a..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/Internal/EnumDescriptorProto.php
+++ /dev/null
@@ -1,216 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: google/protobuf/descriptor.proto
-
-namespace Google\Protobuf\Internal;
-
-use Google\Protobuf\Internal\GPBType;
-use Google\Protobuf\Internal\GPBWire;
-use Google\Protobuf\Internal\RepeatedField;
-use Google\Protobuf\Internal\InputStream;
-use Google\Protobuf\Internal\GPBUtil;
-
-/**
- * Describes an enum type.
- *
- * Generated from protobuf message <code>google.protobuf.EnumDescriptorProto</code>
- */
-class EnumDescriptorProto extends \Google\Protobuf\Internal\Message
-{
-    /**
-     * Generated from protobuf field <code>optional string name = 1;</code>
-     */
-    protected $name = null;
-    /**
-     * Generated from protobuf field <code>repeated .google.protobuf.EnumValueDescriptorProto value = 2;</code>
-     */
-    private $value;
-    /**
-     * Generated from protobuf field <code>optional .google.protobuf.EnumOptions options = 3;</code>
-     */
-    protected $options = null;
-    /**
-     * Range of reserved numeric values. Reserved numeric values may not be used
-     * by enum values in the same enum declaration. Reserved ranges may not
-     * overlap.
-     *
-     * Generated from protobuf field <code>repeated .google.protobuf.EnumDescriptorProto.EnumReservedRange reserved_range = 4;</code>
-     */
-    private $reserved_range;
-    /**
-     * Reserved enum value names, which may not be reused. A given name may only
-     * be reserved once.
-     *
-     * Generated from protobuf field <code>repeated string reserved_name = 5;</code>
-     */
-    private $reserved_name;
-
-    /**
-     * Constructor.
-     *
-     * @param array $data {
-     *     Optional. Data for populating the Message object.
-     *
-     *     @type string $name
-     *     @type array<\Google\Protobuf\Internal\EnumValueDescriptorProto>|\Google\Protobuf\Internal\RepeatedField $value
-     *     @type \Google\Protobuf\Internal\EnumOptions $options
-     *     @type array<\Google\Protobuf\Internal\EnumDescriptorProto\EnumReservedRange>|\Google\Protobuf\Internal\RepeatedField $reserved_range
-     *           Range of reserved numeric values. Reserved numeric values may not be used
-     *           by enum values in the same enum declaration. Reserved ranges may not
-     *           overlap.
-     *     @type array<string>|\Google\Protobuf\Internal\RepeatedField $reserved_name
-     *           Reserved enum value names, which may not be reused. A given name may only
-     *           be reserved once.
-     * }
-     */
-    public function __construct($data = NULL) {
-        \GPBMetadata\Google\Protobuf\Internal\Descriptor::initOnce();
-        parent::__construct($data);
-    }
-
-    /**
-     * Generated from protobuf field <code>optional string name = 1;</code>
-     * @return string
-     */
-    public function getName()
-    {
-        return isset($this->name) ? $this->name : '';
-    }
-
-    public function hasName()
-    {
-        return isset($this->name);
-    }
-
-    public function clearName()
-    {
-        unset($this->name);
-    }
-
-    /**
-     * Generated from protobuf field <code>optional string name = 1;</code>
-     * @param string $var
-     * @return $this
-     */
-    public function setName($var)
-    {
-        GPBUtil::checkString($var, True);
-        $this->name = $var;
-
-        return $this;
-    }
-
-    /**
-     * Generated from protobuf field <code>repeated .google.protobuf.EnumValueDescriptorProto value = 2;</code>
-     * @return \Google\Protobuf\Internal\RepeatedField
-     */
-    public function getValue()
-    {
-        return $this->value;
-    }
-
-    /**
-     * Generated from protobuf field <code>repeated .google.protobuf.EnumValueDescriptorProto value = 2;</code>
-     * @param array<\Google\Protobuf\Internal\EnumValueDescriptorProto>|\Google\Protobuf\Internal\RepeatedField $var
-     * @return $this
-     */
-    public function setValue($var)
-    {
-        $arr = GPBUtil::checkRepeatedField($var, \Google\Protobuf\Internal\GPBType::MESSAGE, \Google\Protobuf\Internal\EnumValueDescriptorProto::class);
-        $this->value = $arr;
-
-        return $this;
-    }
-
-    /**
-     * Generated from protobuf field <code>optional .google.protobuf.EnumOptions options = 3;</code>
-     * @return \Google\Protobuf\Internal\EnumOptions|null
-     */
-    public function getOptions()
-    {
-        return $this->options;
-    }
-
-    public function hasOptions()
-    {
-        return isset($this->options);
-    }
-
-    public function clearOptions()
-    {
-        unset($this->options);
-    }
-
-    /**
-     * Generated from protobuf field <code>optional .google.protobuf.EnumOptions options = 3;</code>
-     * @param \Google\Protobuf\Internal\EnumOptions $var
-     * @return $this
-     */
-    public function setOptions($var)
-    {
-        GPBUtil::checkMessage($var, \Google\Protobuf\Internal\EnumOptions::class);
-        $this->options = $var;
-
-        return $this;
-    }
-
-    /**
-     * Range of reserved numeric values. Reserved numeric values may not be used
-     * by enum values in the same enum declaration. Reserved ranges may not
-     * overlap.
-     *
-     * Generated from protobuf field <code>repeated .google.protobuf.EnumDescriptorProto.EnumReservedRange reserved_range = 4;</code>
-     * @return \Google\Protobuf\Internal\RepeatedField
-     */
-    public function getReservedRange()
-    {
-        return $this->reserved_range;
-    }
-
-    /**
-     * Range of reserved numeric values. Reserved numeric values may not be used
-     * by enum values in the same enum declaration. Reserved ranges may not
-     * overlap.
-     *
-     * Generated from protobuf field <code>repeated .google.protobuf.EnumDescriptorProto.EnumReservedRange reserved_range = 4;</code>
-     * @param array<\Google\Protobuf\Internal\EnumDescriptorProto\EnumReservedRange>|\Google\Protobuf\Internal\RepeatedField $var
-     * @return $this
-     */
-    public function setReservedRange($var)
-    {
-        $arr = GPBUtil::checkRepeatedField($var, \Google\Protobuf\Internal\GPBType::MESSAGE, \Google\Protobuf\Internal\EnumDescriptorProto\EnumReservedRange::class);
-        $this->reserved_range = $arr;
-
-        return $this;
-    }
-
-    /**
-     * Reserved enum value names, which may not be reused. A given name may only
-     * be reserved once.
-     *
-     * Generated from protobuf field <code>repeated string reserved_name = 5;</code>
-     * @return \Google\Protobuf\Internal\RepeatedField
-     */
-    public function getReservedName()
-    {
-        return $this->reserved_name;
-    }
-
-    /**
-     * Reserved enum value names, which may not be reused. A given name may only
-     * be reserved once.
-     *
-     * Generated from protobuf field <code>repeated string reserved_name = 5;</code>
-     * @param array<string>|\Google\Protobuf\Internal\RepeatedField $var
-     * @return $this
-     */
-    public function setReservedName($var)
-    {
-        $arr = GPBUtil::checkRepeatedField($var, \Google\Protobuf\Internal\GPBType::STRING);
-        $this->reserved_name = $arr;
-
-        return $this;
-    }
-
-}
-
diff --git a/libs/protobuf/php/src/Google/Protobuf/Internal/EnumDescriptorProto/EnumReservedRange.php b/libs/protobuf/php/src/Google/Protobuf/Internal/EnumDescriptorProto/EnumReservedRange.php
deleted file mode 100644
index 7282fcc..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/Internal/EnumDescriptorProto/EnumReservedRange.php
+++ /dev/null
@@ -1,130 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: google/protobuf/descriptor.proto
-
-namespace Google\Protobuf\Internal\EnumDescriptorProto;
-
-use Google\Protobuf\Internal\GPBType;
-use Google\Protobuf\Internal\GPBWire;
-use Google\Protobuf\Internal\RepeatedField;
-use Google\Protobuf\Internal\InputStream;
-use Google\Protobuf\Internal\GPBUtil;
-
-/**
- * Range of reserved numeric values. Reserved values may not be used by
- * entries in the same enum. Reserved ranges may not overlap.
- * Note that this is distinct from DescriptorProto.ReservedRange in that it
- * is inclusive such that it can appropriately represent the entire int32
- * domain.
- *
- * Generated from protobuf message <code>google.protobuf.EnumDescriptorProto.EnumReservedRange</code>
- */
-class EnumReservedRange extends \Google\Protobuf\Internal\Message
-{
-    /**
-     * Inclusive.
-     *
-     * Generated from protobuf field <code>optional int32 start = 1;</code>
-     */
-    protected $start = null;
-    /**
-     * Inclusive.
-     *
-     * Generated from protobuf field <code>optional int32 end = 2;</code>
-     */
-    protected $end = null;
-
-    /**
-     * Constructor.
-     *
-     * @param array $data {
-     *     Optional. Data for populating the Message object.
-     *
-     *     @type int $start
-     *           Inclusive.
-     *     @type int $end
-     *           Inclusive.
-     * }
-     */
-    public function __construct($data = NULL) {
-        \GPBMetadata\Google\Protobuf\Internal\Descriptor::initOnce();
-        parent::__construct($data);
-    }
-
-    /**
-     * Inclusive.
-     *
-     * Generated from protobuf field <code>optional int32 start = 1;</code>
-     * @return int
-     */
-    public function getStart()
-    {
-        return isset($this->start) ? $this->start : 0;
-    }
-
-    public function hasStart()
-    {
-        return isset($this->start);
-    }
-
-    public function clearStart()
-    {
-        unset($this->start);
-    }
-
-    /**
-     * Inclusive.
-     *
-     * Generated from protobuf field <code>optional int32 start = 1;</code>
-     * @param int $var
-     * @return $this
-     */
-    public function setStart($var)
-    {
-        GPBUtil::checkInt32($var);
-        $this->start = $var;
-
-        return $this;
-    }
-
-    /**
-     * Inclusive.
-     *
-     * Generated from protobuf field <code>optional int32 end = 2;</code>
-     * @return int
-     */
-    public function getEnd()
-    {
-        return isset($this->end) ? $this->end : 0;
-    }
-
-    public function hasEnd()
-    {
-        return isset($this->end);
-    }
-
-    public function clearEnd()
-    {
-        unset($this->end);
-    }
-
-    /**
-     * Inclusive.
-     *
-     * Generated from protobuf field <code>optional int32 end = 2;</code>
-     * @param int $var
-     * @return $this
-     */
-    public function setEnd($var)
-    {
-        GPBUtil::checkInt32($var);
-        $this->end = $var;
-
-        return $this;
-    }
-
-}
-
-// Adding a class alias for backwards compatibility with the previous class name.
-class_alias(EnumReservedRange::class, \Google\Protobuf\Internal\EnumDescriptorProto_EnumReservedRange::class);
-
diff --git a/libs/protobuf/php/src/Google/Protobuf/Internal/EnumDescriptorProto_EnumReservedRange.php b/libs/protobuf/php/src/Google/Protobuf/Internal/EnumDescriptorProto_EnumReservedRange.php
deleted file mode 100644
index b1b59ed..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/Internal/EnumDescriptorProto_EnumReservedRange.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: google/protobuf/descriptor.proto
-
-namespace Google\Protobuf\Internal;
-
-if (false) {
-    /**
-     * This class is deprecated. Use Google\Protobuf\Internal\EnumDescriptorProto\EnumReservedRange instead.
-     * @deprecated
-     */
-    class EnumDescriptorProto_EnumReservedRange {}
-}
-class_exists(EnumDescriptorProto\EnumReservedRange::class);
-@trigger_error('Google\Protobuf\Internal\EnumDescriptorProto_EnumReservedRange is deprecated and will be removed in the next major release. Use Google\Protobuf\Internal\EnumDescriptorProto\EnumReservedRange instead', E_USER_DEPRECATED);
-
diff --git a/libs/protobuf/php/src/Google/Protobuf/Internal/EnumOptions.php b/libs/protobuf/php/src/Google/Protobuf/Internal/EnumOptions.php
deleted file mode 100644
index 838bc84..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/Internal/EnumOptions.php
+++ /dev/null
@@ -1,171 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: google/protobuf/descriptor.proto
-
-namespace Google\Protobuf\Internal;
-
-use Google\Protobuf\Internal\GPBType;
-use Google\Protobuf\Internal\GPBWire;
-use Google\Protobuf\Internal\RepeatedField;
-use Google\Protobuf\Internal\InputStream;
-use Google\Protobuf\Internal\GPBUtil;
-
-/**
- * Generated from protobuf message <code>google.protobuf.EnumOptions</code>
- */
-class EnumOptions extends \Google\Protobuf\Internal\Message
-{
-    /**
-     * Set this option to true to allow mapping different tag names to the same
-     * value.
-     *
-     * Generated from protobuf field <code>optional bool allow_alias = 2;</code>
-     */
-    protected $allow_alias = null;
-    /**
-     * Is this enum deprecated?
-     * Depending on the target platform, this can emit Deprecated annotations
-     * for the enum, or it will be completely ignored; in the very least, this
-     * is a formalization for deprecating enums.
-     *
-     * Generated from protobuf field <code>optional bool deprecated = 3 [default = false];</code>
-     */
-    protected $deprecated = null;
-    /**
-     * The parser stores options it doesn't recognize here. See above.
-     *
-     * Generated from protobuf field <code>repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;</code>
-     */
-    private $uninterpreted_option;
-
-    /**
-     * Constructor.
-     *
-     * @param array $data {
-     *     Optional. Data for populating the Message object.
-     *
-     *     @type bool $allow_alias
-     *           Set this option to true to allow mapping different tag names to the same
-     *           value.
-     *     @type bool $deprecated
-     *           Is this enum deprecated?
-     *           Depending on the target platform, this can emit Deprecated annotations
-     *           for the enum, or it will be completely ignored; in the very least, this
-     *           is a formalization for deprecating enums.
-     *     @type array<\Google\Protobuf\Internal\UninterpretedOption>|\Google\Protobuf\Internal\RepeatedField $uninterpreted_option
-     *           The parser stores options it doesn't recognize here. See above.
-     * }
-     */
-    public function __construct($data = NULL) {
-        \GPBMetadata\Google\Protobuf\Internal\Descriptor::initOnce();
-        parent::__construct($data);
-    }
-
-    /**
-     * Set this option to true to allow mapping different tag names to the same
-     * value.
-     *
-     * Generated from protobuf field <code>optional bool allow_alias = 2;</code>
-     * @return bool
-     */
-    public function getAllowAlias()
-    {
-        return isset($this->allow_alias) ? $this->allow_alias : false;
-    }
-
-    public function hasAllowAlias()
-    {
-        return isset($this->allow_alias);
-    }
-
-    public function clearAllowAlias()
-    {
-        unset($this->allow_alias);
-    }
-
-    /**
-     * Set this option to true to allow mapping different tag names to the same
-     * value.
-     *
-     * Generated from protobuf field <code>optional bool allow_alias = 2;</code>
-     * @param bool $var
-     * @return $this
-     */
-    public function setAllowAlias($var)
-    {
-        GPBUtil::checkBool($var);
-        $this->allow_alias = $var;
-
-        return $this;
-    }
-
-    /**
-     * Is this enum deprecated?
-     * Depending on the target platform, this can emit Deprecated annotations
-     * for the enum, or it will be completely ignored; in the very least, this
-     * is a formalization for deprecating enums.
-     *
-     * Generated from protobuf field <code>optional bool deprecated = 3 [default = false];</code>
-     * @return bool
-     */
-    public function getDeprecated()
-    {
-        return isset($this->deprecated) ? $this->deprecated : false;
-    }
-
-    public function hasDeprecated()
-    {
-        return isset($this->deprecated);
-    }
-
-    public function clearDeprecated()
-    {
-        unset($this->deprecated);
-    }
-
-    /**
-     * Is this enum deprecated?
-     * Depending on the target platform, this can emit Deprecated annotations
-     * for the enum, or it will be completely ignored; in the very least, this
-     * is a formalization for deprecating enums.
-     *
-     * Generated from protobuf field <code>optional bool deprecated = 3 [default = false];</code>
-     * @param bool $var
-     * @return $this
-     */
-    public function setDeprecated($var)
-    {
-        GPBUtil::checkBool($var);
-        $this->deprecated = $var;
-
-        return $this;
-    }
-
-    /**
-     * The parser stores options it doesn't recognize here. See above.
-     *
-     * Generated from protobuf field <code>repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;</code>
-     * @return \Google\Protobuf\Internal\RepeatedField
-     */
-    public function getUninterpretedOption()
-    {
-        return $this->uninterpreted_option;
-    }
-
-    /**
-     * The parser stores options it doesn't recognize here. See above.
-     *
-     * Generated from protobuf field <code>repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;</code>
-     * @param array<\Google\Protobuf\Internal\UninterpretedOption>|\Google\Protobuf\Internal\RepeatedField $var
-     * @return $this
-     */
-    public function setUninterpretedOption($var)
-    {
-        $arr = GPBUtil::checkRepeatedField($var, \Google\Protobuf\Internal\GPBType::MESSAGE, \Google\Protobuf\Internal\UninterpretedOption::class);
-        $this->uninterpreted_option = $arr;
-
-        return $this;
-    }
-
-}
-
diff --git a/libs/protobuf/php/src/Google/Protobuf/Internal/EnumValueDescriptorProto.php b/libs/protobuf/php/src/Google/Protobuf/Internal/EnumValueDescriptorProto.php
deleted file mode 100644
index 0feaea6..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/Internal/EnumValueDescriptorProto.php
+++ /dev/null
@@ -1,146 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: google/protobuf/descriptor.proto
-
-namespace Google\Protobuf\Internal;
-
-use Google\Protobuf\Internal\GPBType;
-use Google\Protobuf\Internal\GPBWire;
-use Google\Protobuf\Internal\RepeatedField;
-use Google\Protobuf\Internal\InputStream;
-use Google\Protobuf\Internal\GPBUtil;
-
-/**
- * Describes a value within an enum.
- *
- * Generated from protobuf message <code>google.protobuf.EnumValueDescriptorProto</code>
- */
-class EnumValueDescriptorProto extends \Google\Protobuf\Internal\Message
-{
-    /**
-     * Generated from protobuf field <code>optional string name = 1;</code>
-     */
-    protected $name = null;
-    /**
-     * Generated from protobuf field <code>optional int32 number = 2;</code>
-     */
-    protected $number = null;
-    /**
-     * Generated from protobuf field <code>optional .google.protobuf.EnumValueOptions options = 3;</code>
-     */
-    protected $options = null;
-
-    /**
-     * Constructor.
-     *
-     * @param array $data {
-     *     Optional. Data for populating the Message object.
-     *
-     *     @type string $name
-     *     @type int $number
-     *     @type \Google\Protobuf\Internal\EnumValueOptions $options
-     * }
-     */
-    public function __construct($data = NULL) {
-        \GPBMetadata\Google\Protobuf\Internal\Descriptor::initOnce();
-        parent::__construct($data);
-    }
-
-    /**
-     * Generated from protobuf field <code>optional string name = 1;</code>
-     * @return string
-     */
-    public function getName()
-    {
-        return isset($this->name) ? $this->name : '';
-    }
-
-    public function hasName()
-    {
-        return isset($this->name);
-    }
-
-    public function clearName()
-    {
-        unset($this->name);
-    }
-
-    /**
-     * Generated from protobuf field <code>optional string name = 1;</code>
-     * @param string $var
-     * @return $this
-     */
-    public function setName($var)
-    {
-        GPBUtil::checkString($var, True);
-        $this->name = $var;
-
-        return $this;
-    }
-
-    /**
-     * Generated from protobuf field <code>optional int32 number = 2;</code>
-     * @return int
-     */
-    public function getNumber()
-    {
-        return isset($this->number) ? $this->number : 0;
-    }
-
-    public function hasNumber()
-    {
-        return isset($this->number);
-    }
-
-    public function clearNumber()
-    {
-        unset($this->number);
-    }
-
-    /**
-     * Generated from protobuf field <code>optional int32 number = 2;</code>
-     * @param int $var
-     * @return $this
-     */
-    public function setNumber($var)
-    {
-        GPBUtil::checkInt32($var);
-        $this->number = $var;
-
-        return $this;
-    }
-
-    /**
-     * Generated from protobuf field <code>optional .google.protobuf.EnumValueOptions options = 3;</code>
-     * @return \Google\Protobuf\Internal\EnumValueOptions|null
-     */
-    public function getOptions()
-    {
-        return $this->options;
-    }
-
-    public function hasOptions()
-    {
-        return isset($this->options);
-    }
-
-    public function clearOptions()
-    {
-        unset($this->options);
-    }
-
-    /**
-     * Generated from protobuf field <code>optional .google.protobuf.EnumValueOptions options = 3;</code>
-     * @param \Google\Protobuf\Internal\EnumValueOptions $var
-     * @return $this
-     */
-    public function setOptions($var)
-    {
-        GPBUtil::checkMessage($var, \Google\Protobuf\Internal\EnumValueOptions::class);
-        $this->options = $var;
-
-        return $this;
-    }
-
-}
-
diff --git a/libs/protobuf/php/src/Google/Protobuf/Internal/EnumValueOptions.php b/libs/protobuf/php/src/Google/Protobuf/Internal/EnumValueOptions.php
deleted file mode 100644
index 2db7fce..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/Internal/EnumValueOptions.php
+++ /dev/null
@@ -1,123 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: google/protobuf/descriptor.proto
-
-namespace Google\Protobuf\Internal;
-
-use Google\Protobuf\Internal\GPBType;
-use Google\Protobuf\Internal\GPBWire;
-use Google\Protobuf\Internal\RepeatedField;
-use Google\Protobuf\Internal\InputStream;
-use Google\Protobuf\Internal\GPBUtil;
-
-/**
- * Generated from protobuf message <code>google.protobuf.EnumValueOptions</code>
- */
-class EnumValueOptions extends \Google\Protobuf\Internal\Message
-{
-    /**
-     * Is this enum value deprecated?
-     * Depending on the target platform, this can emit Deprecated annotations
-     * for the enum value, or it will be completely ignored; in the very least,
-     * this is a formalization for deprecating enum values.
-     *
-     * Generated from protobuf field <code>optional bool deprecated = 1 [default = false];</code>
-     */
-    protected $deprecated = null;
-    /**
-     * The parser stores options it doesn't recognize here. See above.
-     *
-     * Generated from protobuf field <code>repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;</code>
-     */
-    private $uninterpreted_option;
-
-    /**
-     * Constructor.
-     *
-     * @param array $data {
-     *     Optional. Data for populating the Message object.
-     *
-     *     @type bool $deprecated
-     *           Is this enum value deprecated?
-     *           Depending on the target platform, this can emit Deprecated annotations
-     *           for the enum value, or it will be completely ignored; in the very least,
-     *           this is a formalization for deprecating enum values.
-     *     @type array<\Google\Protobuf\Internal\UninterpretedOption>|\Google\Protobuf\Internal\RepeatedField $uninterpreted_option
-     *           The parser stores options it doesn't recognize here. See above.
-     * }
-     */
-    public function __construct($data = NULL) {
-        \GPBMetadata\Google\Protobuf\Internal\Descriptor::initOnce();
-        parent::__construct($data);
-    }
-
-    /**
-     * Is this enum value deprecated?
-     * Depending on the target platform, this can emit Deprecated annotations
-     * for the enum value, or it will be completely ignored; in the very least,
-     * this is a formalization for deprecating enum values.
-     *
-     * Generated from protobuf field <code>optional bool deprecated = 1 [default = false];</code>
-     * @return bool
-     */
-    public function getDeprecated()
-    {
-        return isset($this->deprecated) ? $this->deprecated : false;
-    }
-
-    public function hasDeprecated()
-    {
-        return isset($this->deprecated);
-    }
-
-    public function clearDeprecated()
-    {
-        unset($this->deprecated);
-    }
-
-    /**
-     * Is this enum value deprecated?
-     * Depending on the target platform, this can emit Deprecated annotations
-     * for the enum value, or it will be completely ignored; in the very least,
-     * this is a formalization for deprecating enum values.
-     *
-     * Generated from protobuf field <code>optional bool deprecated = 1 [default = false];</code>
-     * @param bool $var
-     * @return $this
-     */
-    public function setDeprecated($var)
-    {
-        GPBUtil::checkBool($var);
-        $this->deprecated = $var;
-
-        return $this;
-    }
-
-    /**
-     * The parser stores options it doesn't recognize here. See above.
-     *
-     * Generated from protobuf field <code>repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;</code>
-     * @return \Google\Protobuf\Internal\RepeatedField
-     */
-    public function getUninterpretedOption()
-    {
-        return $this->uninterpreted_option;
-    }
-
-    /**
-     * The parser stores options it doesn't recognize here. See above.
-     *
-     * Generated from protobuf field <code>repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;</code>
-     * @param array<\Google\Protobuf\Internal\UninterpretedOption>|\Google\Protobuf\Internal\RepeatedField $var
-     * @return $this
-     */
-    public function setUninterpretedOption($var)
-    {
-        $arr = GPBUtil::checkRepeatedField($var, \Google\Protobuf\Internal\GPBType::MESSAGE, \Google\Protobuf\Internal\UninterpretedOption::class);
-        $this->uninterpreted_option = $arr;
-
-        return $this;
-    }
-
-}
-
diff --git a/libs/protobuf/php/src/Google/Protobuf/Internal/ExtensionRangeOptions.php b/libs/protobuf/php/src/Google/Protobuf/Internal/ExtensionRangeOptions.php
deleted file mode 100644
index 245173c..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/Internal/ExtensionRangeOptions.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: google/protobuf/descriptor.proto
-
-namespace Google\Protobuf\Internal;
-
-use Google\Protobuf\Internal\GPBType;
-use Google\Protobuf\Internal\GPBWire;
-use Google\Protobuf\Internal\RepeatedField;
-use Google\Protobuf\Internal\InputStream;
-use Google\Protobuf\Internal\GPBUtil;
-
-/**
- * Generated from protobuf message <code>google.protobuf.ExtensionRangeOptions</code>
- */
-class ExtensionRangeOptions extends \Google\Protobuf\Internal\Message
-{
-    /**
-     * The parser stores options it doesn't recognize here. See above.
-     *
-     * Generated from protobuf field <code>repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;</code>
-     */
-    private $uninterpreted_option;
-
-    /**
-     * Constructor.
-     *
-     * @param array $data {
-     *     Optional. Data for populating the Message object.
-     *
-     *     @type array<\Google\Protobuf\Internal\UninterpretedOption>|\Google\Protobuf\Internal\RepeatedField $uninterpreted_option
-     *           The parser stores options it doesn't recognize here. See above.
-     * }
-     */
-    public function __construct($data = NULL) {
-        \GPBMetadata\Google\Protobuf\Internal\Descriptor::initOnce();
-        parent::__construct($data);
-    }
-
-    /**
-     * The parser stores options it doesn't recognize here. See above.
-     *
-     * Generated from protobuf field <code>repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;</code>
-     * @return \Google\Protobuf\Internal\RepeatedField
-     */
-    public function getUninterpretedOption()
-    {
-        return $this->uninterpreted_option;
-    }
-
-    /**
-     * The parser stores options it doesn't recognize here. See above.
-     *
-     * Generated from protobuf field <code>repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;</code>
-     * @param array<\Google\Protobuf\Internal\UninterpretedOption>|\Google\Protobuf\Internal\RepeatedField $var
-     * @return $this
-     */
-    public function setUninterpretedOption($var)
-    {
-        $arr = GPBUtil::checkRepeatedField($var, \Google\Protobuf\Internal\GPBType::MESSAGE, \Google\Protobuf\Internal\UninterpretedOption::class);
-        $this->uninterpreted_option = $arr;
-
-        return $this;
-    }
-
-}
-
diff --git a/libs/protobuf/php/src/Google/Protobuf/Internal/FieldDescriptor.php b/libs/protobuf/php/src/Google/Protobuf/Internal/FieldDescriptor.php
deleted file mode 100644
index 3a9a73b..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/Internal/FieldDescriptor.php
+++ /dev/null
@@ -1,326 +0,0 @@
-<?php
-
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-namespace Google\Protobuf\Internal;
-
-class FieldDescriptor
-{
-    use HasPublicDescriptorTrait;
-
-    private $name;
-    private $json_name;
-    private $setter;
-    private $getter;
-    private $number;
-    private $label;
-    private $type;
-    private $message_type;
-    private $enum_type;
-    private $packed;
-    private $oneof_index = -1;
-    private $proto3_optional;
-
-    /** @var OneofDescriptor $containing_oneof */
-    private $containing_oneof;
-
-    public function __construct()
-    {
-        $this->public_desc = new \Google\Protobuf\FieldDescriptor($this);
-    }
-
-    public function setOneofIndex($index)
-    {
-        $this->oneof_index = $index;
-    }
-
-    public function getOneofIndex()
-    {
-        return $this->oneof_index;
-    }
-
-    public function setName($name)
-    {
-        $this->name = $name;
-    }
-
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    public function setJsonName($json_name)
-    {
-        $this->json_name = $json_name;
-    }
-
-    public function getJsonName()
-    {
-        return $this->json_name;
-    }
-
-    public function setSetter($setter)
-    {
-        $this->setter = $setter;
-    }
-
-    public function getSetter()
-    {
-        return $this->setter;
-    }
-
-    public function setGetter($getter)
-    {
-        $this->getter = $getter;
-    }
-
-    public function getGetter()
-    {
-        return $this->getter;
-    }
-
-    public function setNumber($number)
-    {
-        $this->number = $number;
-    }
-
-    public function getNumber()
-    {
-        return $this->number;
-    }
-
-    public function setLabel($label)
-    {
-        $this->label = $label;
-    }
-
-    public function getLabel()
-    {
-        return $this->label;
-    }
-
-    public function isRepeated()
-    {
-        return $this->label === GPBLabel::REPEATED;
-    }
-
-    public function setType($type)
-    {
-        $this->type = $type;
-    }
-
-    public function getType()
-    {
-        return $this->type;
-    }
-
-    public function setMessageType($message_type)
-    {
-        $this->message_type = $message_type;
-    }
-
-    public function getMessageType()
-    {
-        return $this->message_type;
-    }
-
-    public function setEnumType($enum_type)
-    {
-        $this->enum_type = $enum_type;
-    }
-
-    public function getEnumType()
-    {
-        return $this->enum_type;
-    }
-
-    public function setPacked($packed)
-    {
-        $this->packed = $packed;
-    }
-
-    public function getPacked()
-    {
-        return $this->packed;
-    }
-
-    public function getProto3Optional()
-    {
-        return $this->proto3_optional;
-    }
-
-    public function setProto3Optional($proto3_optional)
-    {
-        $this->proto3_optional = $proto3_optional;
-    }
-
-    public function getContainingOneof()
-    {
-        return $this->containing_oneof;
-    }
-
-    public function setContainingOneof($containing_oneof)
-    {
-        $this->containing_oneof = $containing_oneof;
-    }
-
-    public function getRealContainingOneof()
-    {
-        return !is_null($this->containing_oneof) && !$this->containing_oneof->isSynthetic()
-            ? $this->containing_oneof : null;
-    }
-
-    public function isPackable()
-    {
-        return $this->isRepeated() && self::isTypePackable($this->type);
-    }
-
-    public function isMap()
-    {
-        return $this->getType() == GPBType::MESSAGE &&
-               !is_null($this->getMessageType()->getOptions()) &&
-               $this->getMessageType()->getOptions()->getMapEntry();
-    }
-
-    public function isTimestamp()
-    {
-        return $this->getType() == GPBType::MESSAGE &&
-            $this->getMessageType()->getClass() === "Google\Protobuf\Timestamp";
-    }
-
-    public function isWrapperType()
-    {
-        if ($this->getType() == GPBType::MESSAGE) {
-            $class = $this->getMessageType()->getClass();
-            return in_array($class, [
-                "Google\Protobuf\DoubleValue",
-                "Google\Protobuf\FloatValue",
-                "Google\Protobuf\Int64Value",
-                "Google\Protobuf\UInt64Value",
-                "Google\Protobuf\Int32Value",
-                "Google\Protobuf\UInt32Value",
-                "Google\Protobuf\BoolValue",
-                "Google\Protobuf\StringValue",
-                "Google\Protobuf\BytesValue",
-            ]);
-        }
-        return false;
-    }
-
-    private static function isTypePackable($field_type)
-    {
-        return ($field_type !== GPBType::STRING  &&
-            $field_type !== GPBType::GROUP   &&
-            $field_type !== GPBType::MESSAGE &&
-            $field_type !== GPBType::BYTES);
-    }
-
-    /**
-     * @param FieldDescriptorProto $proto
-     * @return FieldDescriptor
-     */
-    public static function getFieldDescriptor($proto)
-    {
-        $type_name = null;
-        $type = $proto->getType();
-        switch ($type) {
-            case GPBType::MESSAGE:
-            case GPBType::GROUP:
-            case GPBType::ENUM:
-                $type_name = $proto->getTypeName();
-                break;
-            default:
-                break;
-        }
-
-        $oneof_index = $proto->hasOneofIndex() ? $proto->getOneofIndex() : -1;
-        // TODO: once proto2 is supported, this default should be false
-        // for proto2.
-        if ($proto->getLabel() === GPBLabel::REPEATED &&
-            $proto->getType() !== GPBType::MESSAGE &&
-            $proto->getType() !== GPBType::GROUP &&
-            $proto->getType() !== GPBType::STRING &&
-            $proto->getType() !== GPBType::BYTES) {
-          $packed = true;
-        } else {
-          $packed = false;
-        }
-        $options = $proto->getOptions();
-        if ($options !== null) {
-            $packed = $options->getPacked();
-        }
-
-        $field = new FieldDescriptor();
-        $field->setName($proto->getName());
-
-        if ($proto->hasJsonName()) {
-            $json_name = $proto->getJsonName();
-        } else {
-            $proto_name = $proto->getName();
-            $json_name = implode('', array_map('ucwords', explode('_', $proto_name)));
-            if ($proto_name[0] !== "_" && !ctype_upper($proto_name[0])) {
-                $json_name = lcfirst($json_name);
-            }
-        }
-        $field->setJsonName($json_name);
-
-        $camel_name = implode('', array_map('ucwords', explode('_', $proto->getName())));
-        $field->setGetter('get' . $camel_name);
-        $field->setSetter('set' . $camel_name);
-        $field->setType($proto->getType());
-        $field->setNumber($proto->getNumber());
-        $field->setLabel($proto->getLabel());
-        $field->setPacked($packed);
-        $field->setOneofIndex($oneof_index);
-        $field->setProto3Optional($proto->getProto3Optional());
-
-        // At this time, the message/enum type may have not been added to pool.
-        // So we use the type name as place holder and will replace it with the
-        // actual descriptor in cross building.
-        switch ($type) {
-            case GPBType::MESSAGE:
-                $field->setMessageType($type_name);
-                break;
-            case GPBType::ENUM:
-                $field->setEnumType($type_name);
-                break;
-            default:
-                break;
-        }
-
-        return $field;
-    }
-
-    public static function buildFromProto($proto)
-    {
-        return FieldDescriptor::getFieldDescriptor($proto);
-    }
-}
diff --git a/libs/protobuf/php/src/Google/Protobuf/Internal/FieldDescriptorProto.php b/libs/protobuf/php/src/Google/Protobuf/Internal/FieldDescriptorProto.php
deleted file mode 100644
index 5e99bff..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/Internal/FieldDescriptorProto.php
+++ /dev/null
@@ -1,611 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: google/protobuf/descriptor.proto
-
-namespace Google\Protobuf\Internal;
-
-use Google\Protobuf\Internal\GPBType;
-use Google\Protobuf\Internal\GPBWire;
-use Google\Protobuf\Internal\RepeatedField;
-use Google\Protobuf\Internal\InputStream;
-use Google\Protobuf\Internal\GPBUtil;
-
-/**
- * Describes a field within a message.
- *
- * Generated from protobuf message <code>google.protobuf.FieldDescriptorProto</code>
- */
-class FieldDescriptorProto extends \Google\Protobuf\Internal\Message
-{
-    /**
-     * Generated from protobuf field <code>optional string name = 1;</code>
-     */
-    protected $name = null;
-    /**
-     * Generated from protobuf field <code>optional int32 number = 3;</code>
-     */
-    protected $number = null;
-    /**
-     * Generated from protobuf field <code>optional .google.protobuf.FieldDescriptorProto.Label label = 4;</code>
-     */
-    protected $label = null;
-    /**
-     * If type_name is set, this need not be set.  If both this and type_name
-     * are set, this must be one of TYPE_ENUM, TYPE_MESSAGE or TYPE_GROUP.
-     *
-     * Generated from protobuf field <code>optional .google.protobuf.FieldDescriptorProto.Type type = 5;</code>
-     */
-    protected $type = null;
-    /**
-     * For message and enum types, this is the name of the type.  If the name
-     * starts with a '.', it is fully-qualified.  Otherwise, C++-like scoping
-     * rules are used to find the type (i.e. first the nested types within this
-     * message are searched, then within the parent, on up to the root
-     * namespace).
-     *
-     * Generated from protobuf field <code>optional string type_name = 6;</code>
-     */
-    protected $type_name = null;
-    /**
-     * For extensions, this is the name of the type being extended.  It is
-     * resolved in the same manner as type_name.
-     *
-     * Generated from protobuf field <code>optional string extendee = 2;</code>
-     */
-    protected $extendee = null;
-    /**
-     * For numeric types, contains the original text representation of the value.
-     * For booleans, "true" or "false".
-     * For strings, contains the default text contents (not escaped in any way).
-     * For bytes, contains the C escaped value.  All bytes >= 128 are escaped.
-     *
-     * Generated from protobuf field <code>optional string default_value = 7;</code>
-     */
-    protected $default_value = null;
-    /**
-     * If set, gives the index of a oneof in the containing type's oneof_decl
-     * list.  This field is a member of that oneof.
-     *
-     * Generated from protobuf field <code>optional int32 oneof_index = 9;</code>
-     */
-    protected $oneof_index = null;
-    /**
-     * JSON name of this field. The value is set by protocol compiler. If the
-     * user has set a "json_name" option on this field, that option's value
-     * will be used. Otherwise, it's deduced from the field's name by converting
-     * it to camelCase.
-     *
-     * Generated from protobuf field <code>optional string json_name = 10;</code>
-     */
-    protected $json_name = null;
-    /**
-     * Generated from protobuf field <code>optional .google.protobuf.FieldOptions options = 8;</code>
-     */
-    protected $options = null;
-    /**
-     * If true, this is a proto3 "optional". When a proto3 field is optional, it
-     * tracks presence regardless of field type.
-     * When proto3_optional is true, this field must be belong to a oneof to
-     * signal to old proto3 clients that presence is tracked for this field. This
-     * oneof is known as a "synthetic" oneof, and this field must be its sole
-     * member (each proto3 optional field gets its own synthetic oneof). Synthetic
-     * oneofs exist in the descriptor only, and do not generate any API. Synthetic
-     * oneofs must be ordered after all "real" oneofs.
-     * For message fields, proto3_optional doesn't create any semantic change,
-     * since non-repeated message fields always track presence. However it still
-     * indicates the semantic detail of whether the user wrote "optional" or not.
-     * This can be useful for round-tripping the .proto file. For consistency we
-     * give message fields a synthetic oneof also, even though it is not required
-     * to track presence. This is especially important because the parser can't
-     * tell if a field is a message or an enum, so it must always create a
-     * synthetic oneof.
-     * Proto2 optional fields do not set this flag, because they already indicate
-     * optional with `LABEL_OPTIONAL`.
-     *
-     * Generated from protobuf field <code>optional bool proto3_optional = 17;</code>
-     */
-    protected $proto3_optional = null;
-
-    /**
-     * Constructor.
-     *
-     * @param array $data {
-     *     Optional. Data for populating the Message object.
-     *
-     *     @type string $name
-     *     @type int $number
-     *     @type int $label
-     *     @type int $type
-     *           If type_name is set, this need not be set.  If both this and type_name
-     *           are set, this must be one of TYPE_ENUM, TYPE_MESSAGE or TYPE_GROUP.
-     *     @type string $type_name
-     *           For message and enum types, this is the name of the type.  If the name
-     *           starts with a '.', it is fully-qualified.  Otherwise, C++-like scoping
-     *           rules are used to find the type (i.e. first the nested types within this
-     *           message are searched, then within the parent, on up to the root
-     *           namespace).
-     *     @type string $extendee
-     *           For extensions, this is the name of the type being extended.  It is
-     *           resolved in the same manner as type_name.
-     *     @type string $default_value
-     *           For numeric types, contains the original text representation of the value.
-     *           For booleans, "true" or "false".
-     *           For strings, contains the default text contents (not escaped in any way).
-     *           For bytes, contains the C escaped value.  All bytes >= 128 are escaped.
-     *     @type int $oneof_index
-     *           If set, gives the index of a oneof in the containing type's oneof_decl
-     *           list.  This field is a member of that oneof.
-     *     @type string $json_name
-     *           JSON name of this field. The value is set by protocol compiler. If the
-     *           user has set a "json_name" option on this field, that option's value
-     *           will be used. Otherwise, it's deduced from the field's name by converting
-     *           it to camelCase.
-     *     @type \Google\Protobuf\Internal\FieldOptions $options
-     *     @type bool $proto3_optional
-     *           If true, this is a proto3 "optional". When a proto3 field is optional, it
-     *           tracks presence regardless of field type.
-     *           When proto3_optional is true, this field must be belong to a oneof to
-     *           signal to old proto3 clients that presence is tracked for this field. This
-     *           oneof is known as a "synthetic" oneof, and this field must be its sole
-     *           member (each proto3 optional field gets its own synthetic oneof). Synthetic
-     *           oneofs exist in the descriptor only, and do not generate any API. Synthetic
-     *           oneofs must be ordered after all "real" oneofs.
-     *           For message fields, proto3_optional doesn't create any semantic change,
-     *           since non-repeated message fields always track presence. However it still
-     *           indicates the semantic detail of whether the user wrote "optional" or not.
-     *           This can be useful for round-tripping the .proto file. For consistency we
-     *           give message fields a synthetic oneof also, even though it is not required
-     *           to track presence. This is especially important because the parser can't
-     *           tell if a field is a message or an enum, so it must always create a
-     *           synthetic oneof.
-     *           Proto2 optional fields do not set this flag, because they already indicate
-     *           optional with `LABEL_OPTIONAL`.
-     * }
-     */
-    public function __construct($data = NULL) {
-        \GPBMetadata\Google\Protobuf\Internal\Descriptor::initOnce();
-        parent::__construct($data);
-    }
-
-    /**
-     * Generated from protobuf field <code>optional string name = 1;</code>
-     * @return string
-     */
-    public function getName()
-    {
-        return isset($this->name) ? $this->name : '';
-    }
-
-    public function hasName()
-    {
-        return isset($this->name);
-    }
-
-    public function clearName()
-    {
-        unset($this->name);
-    }
-
-    /**
-     * Generated from protobuf field <code>optional string name = 1;</code>
-     * @param string $var
-     * @return $this
-     */
-    public function setName($var)
-    {
-        GPBUtil::checkString($var, True);
-        $this->name = $var;
-
-        return $this;
-    }
-
-    /**
-     * Generated from protobuf field <code>optional int32 number = 3;</code>
-     * @return int
-     */
-    public function getNumber()
-    {
-        return isset($this->number) ? $this->number : 0;
-    }
-
-    public function hasNumber()
-    {
-        return isset($this->number);
-    }
-
-    public function clearNumber()
-    {
-        unset($this->number);
-    }
-
-    /**
-     * Generated from protobuf field <code>optional int32 number = 3;</code>
-     * @param int $var
-     * @return $this
-     */
-    public function setNumber($var)
-    {
-        GPBUtil::checkInt32($var);
-        $this->number = $var;
-
-        return $this;
-    }
-
-    /**
-     * Generated from protobuf field <code>optional .google.protobuf.FieldDescriptorProto.Label label = 4;</code>
-     * @return int
-     */
-    public function getLabel()
-    {
-        return isset($this->label) ? $this->label : 0;
-    }
-
-    public function hasLabel()
-    {
-        return isset($this->label);
-    }
-
-    public function clearLabel()
-    {
-        unset($this->label);
-    }
-
-    /**
-     * Generated from protobuf field <code>optional .google.protobuf.FieldDescriptorProto.Label label = 4;</code>
-     * @param int $var
-     * @return $this
-     */
-    public function setLabel($var)
-    {
-        GPBUtil::checkEnum($var, \Google\Protobuf\Internal\FieldDescriptorProto\Label::class);
-        $this->label = $var;
-
-        return $this;
-    }
-
-    /**
-     * If type_name is set, this need not be set.  If both this and type_name
-     * are set, this must be one of TYPE_ENUM, TYPE_MESSAGE or TYPE_GROUP.
-     *
-     * Generated from protobuf field <code>optional .google.protobuf.FieldDescriptorProto.Type type = 5;</code>
-     * @return int
-     */
-    public function getType()
-    {
-        return isset($this->type) ? $this->type : 0;
-    }
-
-    public function hasType()
-    {
-        return isset($this->type);
-    }
-
-    public function clearType()
-    {
-        unset($this->type);
-    }
-
-    /**
-     * If type_name is set, this need not be set.  If both this and type_name
-     * are set, this must be one of TYPE_ENUM, TYPE_MESSAGE or TYPE_GROUP.
-     *
-     * Generated from protobuf field <code>optional .google.protobuf.FieldDescriptorProto.Type type = 5;</code>
-     * @param int $var
-     * @return $this
-     */
-    public function setType($var)
-    {
-        GPBUtil::checkEnum($var, \Google\Protobuf\Internal\FieldDescriptorProto\Type::class);
-        $this->type = $var;
-
-        return $this;
-    }
-
-    /**
-     * For message and enum types, this is the name of the type.  If the name
-     * starts with a '.', it is fully-qualified.  Otherwise, C++-like scoping
-     * rules are used to find the type (i.e. first the nested types within this
-     * message are searched, then within the parent, on up to the root
-     * namespace).
-     *
-     * Generated from protobuf field <code>optional string type_name = 6;</code>
-     * @return string
-     */
-    public function getTypeName()
-    {
-        return isset($this->type_name) ? $this->type_name : '';
-    }
-
-    public function hasTypeName()
-    {
-        return isset($this->type_name);
-    }
-
-    public function clearTypeName()
-    {
-        unset($this->type_name);
-    }
-
-    /**
-     * For message and enum types, this is the name of the type.  If the name
-     * starts with a '.', it is fully-qualified.  Otherwise, C++-like scoping
-     * rules are used to find the type (i.e. first the nested types within this
-     * message are searched, then within the parent, on up to the root
-     * namespace).
-     *
-     * Generated from protobuf field <code>optional string type_name = 6;</code>
-     * @param string $var
-     * @return $this
-     */
-    public function setTypeName($var)
-    {
-        GPBUtil::checkString($var, True);
-        $this->type_name = $var;
-
-        return $this;
-    }
-
-    /**
-     * For extensions, this is the name of the type being extended.  It is
-     * resolved in the same manner as type_name.
-     *
-     * Generated from protobuf field <code>optional string extendee = 2;</code>
-     * @return string
-     */
-    public function getExtendee()
-    {
-        return isset($this->extendee) ? $this->extendee : '';
-    }
-
-    public function hasExtendee()
-    {
-        return isset($this->extendee);
-    }
-
-    public function clearExtendee()
-    {
-        unset($this->extendee);
-    }
-
-    /**
-     * For extensions, this is the name of the type being extended.  It is
-     * resolved in the same manner as type_name.
-     *
-     * Generated from protobuf field <code>optional string extendee = 2;</code>
-     * @param string $var
-     * @return $this
-     */
-    public function setExtendee($var)
-    {
-        GPBUtil::checkString($var, True);
-        $this->extendee = $var;
-
-        return $this;
-    }
-
-    /**
-     * For numeric types, contains the original text representation of the value.
-     * For booleans, "true" or "false".
-     * For strings, contains the default text contents (not escaped in any way).
-     * For bytes, contains the C escaped value.  All bytes >= 128 are escaped.
-     *
-     * Generated from protobuf field <code>optional string default_value = 7;</code>
-     * @return string
-     */
-    public function getDefaultValue()
-    {
-        return isset($this->default_value) ? $this->default_value : '';
-    }
-
-    public function hasDefaultValue()
-    {
-        return isset($this->default_value);
-    }
-
-    public function clearDefaultValue()
-    {
-        unset($this->default_value);
-    }
-
-    /**
-     * For numeric types, contains the original text representation of the value.
-     * For booleans, "true" or "false".
-     * For strings, contains the default text contents (not escaped in any way).
-     * For bytes, contains the C escaped value.  All bytes >= 128 are escaped.
-     *
-     * Generated from protobuf field <code>optional string default_value = 7;</code>
-     * @param string $var
-     * @return $this
-     */
-    public function setDefaultValue($var)
-    {
-        GPBUtil::checkString($var, True);
-        $this->default_value = $var;
-
-        return $this;
-    }
-
-    /**
-     * If set, gives the index of a oneof in the containing type's oneof_decl
-     * list.  This field is a member of that oneof.
-     *
-     * Generated from protobuf field <code>optional int32 oneof_index = 9;</code>
-     * @return int
-     */
-    public function getOneofIndex()
-    {
-        return isset($this->oneof_index) ? $this->oneof_index : 0;
-    }
-
-    public function hasOneofIndex()
-    {
-        return isset($this->oneof_index);
-    }
-
-    public function clearOneofIndex()
-    {
-        unset($this->oneof_index);
-    }
-
-    /**
-     * If set, gives the index of a oneof in the containing type's oneof_decl
-     * list.  This field is a member of that oneof.
-     *
-     * Generated from protobuf field <code>optional int32 oneof_index = 9;</code>
-     * @param int $var
-     * @return $this
-     */
-    public function setOneofIndex($var)
-    {
-        GPBUtil::checkInt32($var);
-        $this->oneof_index = $var;
-
-        return $this;
-    }
-
-    /**
-     * JSON name of this field. The value is set by protocol compiler. If the
-     * user has set a "json_name" option on this field, that option's value
-     * will be used. Otherwise, it's deduced from the field's name by converting
-     * it to camelCase.
-     *
-     * Generated from protobuf field <code>optional string json_name = 10;</code>
-     * @return string
-     */
-    public function getJsonName()
-    {
-        return isset($this->json_name) ? $this->json_name : '';
-    }
-
-    public function hasJsonName()
-    {
-        return isset($this->json_name);
-    }
-
-    public function clearJsonName()
-    {
-        unset($this->json_name);
-    }
-
-    /**
-     * JSON name of this field. The value is set by protocol compiler. If the
-     * user has set a "json_name" option on this field, that option's value
-     * will be used. Otherwise, it's deduced from the field's name by converting
-     * it to camelCase.
-     *
-     * Generated from protobuf field <code>optional string json_name = 10;</code>
-     * @param string $var
-     * @return $this
-     */
-    public function setJsonName($var)
-    {
-        GPBUtil::checkString($var, True);
-        $this->json_name = $var;
-
-        return $this;
-    }
-
-    /**
-     * Generated from protobuf field <code>optional .google.protobuf.FieldOptions options = 8;</code>
-     * @return \Google\Protobuf\Internal\FieldOptions|null
-     */
-    public function getOptions()
-    {
-        return $this->options;
-    }
-
-    public function hasOptions()
-    {
-        return isset($this->options);
-    }
-
-    public function clearOptions()
-    {
-        unset($this->options);
-    }
-
-    /**
-     * Generated from protobuf field <code>optional .google.protobuf.FieldOptions options = 8;</code>
-     * @param \Google\Protobuf\Internal\FieldOptions $var
-     * @return $this
-     */
-    public function setOptions($var)
-    {
-        GPBUtil::checkMessage($var, \Google\Protobuf\Internal\FieldOptions::class);
-        $this->options = $var;
-
-        return $this;
-    }
-
-    /**
-     * If true, this is a proto3 "optional". When a proto3 field is optional, it
-     * tracks presence regardless of field type.
-     * When proto3_optional is true, this field must be belong to a oneof to
-     * signal to old proto3 clients that presence is tracked for this field. This
-     * oneof is known as a "synthetic" oneof, and this field must be its sole
-     * member (each proto3 optional field gets its own synthetic oneof). Synthetic
-     * oneofs exist in the descriptor only, and do not generate any API. Synthetic
-     * oneofs must be ordered after all "real" oneofs.
-     * For message fields, proto3_optional doesn't create any semantic change,
-     * since non-repeated message fields always track presence. However it still
-     * indicates the semantic detail of whether the user wrote "optional" or not.
-     * This can be useful for round-tripping the .proto file. For consistency we
-     * give message fields a synthetic oneof also, even though it is not required
-     * to track presence. This is especially important because the parser can't
-     * tell if a field is a message or an enum, so it must always create a
-     * synthetic oneof.
-     * Proto2 optional fields do not set this flag, because they already indicate
-     * optional with `LABEL_OPTIONAL`.
-     *
-     * Generated from protobuf field <code>optional bool proto3_optional = 17;</code>
-     * @return bool
-     */
-    public function getProto3Optional()
-    {
-        return isset($this->proto3_optional) ? $this->proto3_optional : false;
-    }
-
-    public function hasProto3Optional()
-    {
-        return isset($this->proto3_optional);
-    }
-
-    public function clearProto3Optional()
-    {
-        unset($this->proto3_optional);
-    }
-
-    /**
-     * If true, this is a proto3 "optional". When a proto3 field is optional, it
-     * tracks presence regardless of field type.
-     * When proto3_optional is true, this field must be belong to a oneof to
-     * signal to old proto3 clients that presence is tracked for this field. This
-     * oneof is known as a "synthetic" oneof, and this field must be its sole
-     * member (each proto3 optional field gets its own synthetic oneof). Synthetic
-     * oneofs exist in the descriptor only, and do not generate any API. Synthetic
-     * oneofs must be ordered after all "real" oneofs.
-     * For message fields, proto3_optional doesn't create any semantic change,
-     * since non-repeated message fields always track presence. However it still
-     * indicates the semantic detail of whether the user wrote "optional" or not.
-     * This can be useful for round-tripping the .proto file. For consistency we
-     * give message fields a synthetic oneof also, even though it is not required
-     * to track presence. This is especially important because the parser can't
-     * tell if a field is a message or an enum, so it must always create a
-     * synthetic oneof.
-     * Proto2 optional fields do not set this flag, because they already indicate
-     * optional with `LABEL_OPTIONAL`.
-     *
-     * Generated from protobuf field <code>optional bool proto3_optional = 17;</code>
-     * @param bool $var
-     * @return $this
-     */
-    public function setProto3Optional($var)
-    {
-        GPBUtil::checkBool($var);
-        $this->proto3_optional = $var;
-
-        return $this;
-    }
-
-}
-
diff --git a/libs/protobuf/php/src/Google/Protobuf/Internal/FieldDescriptorProto/Label.php b/libs/protobuf/php/src/Google/Protobuf/Internal/FieldDescriptorProto/Label.php
deleted file mode 100644
index a54b228..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/Internal/FieldDescriptorProto/Label.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: google/protobuf/descriptor.proto
-
-namespace Google\Protobuf\Internal\FieldDescriptorProto;
-
-use UnexpectedValueException;
-
-/**
- * Protobuf type <code>google.protobuf.FieldDescriptorProto.Label</code>
- */
-class Label
-{
-    /**
-     * 0 is reserved for errors
-     *
-     * Generated from protobuf enum <code>LABEL_OPTIONAL = 1;</code>
-     */
-    const LABEL_OPTIONAL = 1;
-    /**
-     * Generated from protobuf enum <code>LABEL_REQUIRED = 2;</code>
-     */
-    const LABEL_REQUIRED = 2;
-    /**
-     * Generated from protobuf enum <code>LABEL_REPEATED = 3;</code>
-     */
-    const LABEL_REPEATED = 3;
-
-    private static $valueToName = [
-        self::LABEL_OPTIONAL => 'LABEL_OPTIONAL',
-        self::LABEL_REQUIRED => 'LABEL_REQUIRED',
-        self::LABEL_REPEATED => 'LABEL_REPEATED',
-    ];
-
-    public static function name($value)
-    {
-        if (!isset(self::$valueToName[$value])) {
-            throw new UnexpectedValueException(sprintf(
-                    'Enum %s has no name defined for value %s', __CLASS__, $value));
-        }
-        return self::$valueToName[$value];
-    }
-
-
-    public static function value($name)
-    {
-        $const = __CLASS__ . '::' . strtoupper($name);
-        if (!defined($const)) {
-            throw new UnexpectedValueException(sprintf(
-                    'Enum %s has no value defined for name %s', __CLASS__, $name));
-        }
-        return constant($const);
-    }
-}
-
-// Adding a class alias for backwards compatibility with the previous class name.
-class_alias(Label::class, \Google\Protobuf\Internal\FieldDescriptorProto_Label::class);
-
diff --git a/libs/protobuf/php/src/Google/Protobuf/Internal/FieldDescriptorProto/Type.php b/libs/protobuf/php/src/Google/Protobuf/Internal/FieldDescriptorProto/Type.php
deleted file mode 100644
index 6072e99..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/Internal/FieldDescriptorProto/Type.php
+++ /dev/null
@@ -1,153 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: google/protobuf/descriptor.proto
-
-namespace Google\Protobuf\Internal\FieldDescriptorProto;
-
-use UnexpectedValueException;
-
-/**
- * Protobuf type <code>google.protobuf.FieldDescriptorProto.Type</code>
- */
-class Type
-{
-    /**
-     * 0 is reserved for errors.
-     * Order is weird for historical reasons.
-     *
-     * Generated from protobuf enum <code>TYPE_DOUBLE = 1;</code>
-     */
-    const TYPE_DOUBLE = 1;
-    /**
-     * Generated from protobuf enum <code>TYPE_FLOAT = 2;</code>
-     */
-    const TYPE_FLOAT = 2;
-    /**
-     * Not ZigZag encoded.  Negative numbers take 10 bytes.  Use TYPE_SINT64 if
-     * negative values are likely.
-     *
-     * Generated from protobuf enum <code>TYPE_INT64 = 3;</code>
-     */
-    const TYPE_INT64 = 3;
-    /**
-     * Generated from protobuf enum <code>TYPE_UINT64 = 4;</code>
-     */
-    const TYPE_UINT64 = 4;
-    /**
-     * Not ZigZag encoded.  Negative numbers take 10 bytes.  Use TYPE_SINT32 if
-     * negative values are likely.
-     *
-     * Generated from protobuf enum <code>TYPE_INT32 = 5;</code>
-     */
-    const TYPE_INT32 = 5;
-    /**
-     * Generated from protobuf enum <code>TYPE_FIXED64 = 6;</code>
-     */
-    const TYPE_FIXED64 = 6;
-    /**
-     * Generated from protobuf enum <code>TYPE_FIXED32 = 7;</code>
-     */
-    const TYPE_FIXED32 = 7;
-    /**
-     * Generated from protobuf enum <code>TYPE_BOOL = 8;</code>
-     */
-    const TYPE_BOOL = 8;
-    /**
-     * Generated from protobuf enum <code>TYPE_STRING = 9;</code>
-     */
-    const TYPE_STRING = 9;
-    /**
-     * Tag-delimited aggregate.
-     * Group type is deprecated and not supported in proto3. However, Proto3
-     * implementations should still be able to parse the group wire format and
-     * treat group fields as unknown fields.
-     *
-     * Generated from protobuf enum <code>TYPE_GROUP = 10;</code>
-     */
-    const TYPE_GROUP = 10;
-    /**
-     * Length-delimited aggregate.
-     *
-     * Generated from protobuf enum <code>TYPE_MESSAGE = 11;</code>
-     */
-    const TYPE_MESSAGE = 11;
-    /**
-     * New in version 2.
-     *
-     * Generated from protobuf enum <code>TYPE_BYTES = 12;</code>
-     */
-    const TYPE_BYTES = 12;
-    /**
-     * Generated from protobuf enum <code>TYPE_UINT32 = 13;</code>
-     */
-    const TYPE_UINT32 = 13;
-    /**
-     * Generated from protobuf enum <code>TYPE_ENUM = 14;</code>
-     */
-    const TYPE_ENUM = 14;
-    /**
-     * Generated from protobuf enum <code>TYPE_SFIXED32 = 15;</code>
-     */
-    const TYPE_SFIXED32 = 15;
-    /**
-     * Generated from protobuf enum <code>TYPE_SFIXED64 = 16;</code>
-     */
-    const TYPE_SFIXED64 = 16;
-    /**
-     * Uses ZigZag encoding.
-     *
-     * Generated from protobuf enum <code>TYPE_SINT32 = 17;</code>
-     */
-    const TYPE_SINT32 = 17;
-    /**
-     * Uses ZigZag encoding.
-     *
-     * Generated from protobuf enum <code>TYPE_SINT64 = 18;</code>
-     */
-    const TYPE_SINT64 = 18;
-
-    private static $valueToName = [
-        self::TYPE_DOUBLE => 'TYPE_DOUBLE',
-        self::TYPE_FLOAT => 'TYPE_FLOAT',
-        self::TYPE_INT64 => 'TYPE_INT64',
-        self::TYPE_UINT64 => 'TYPE_UINT64',
-        self::TYPE_INT32 => 'TYPE_INT32',
-        self::TYPE_FIXED64 => 'TYPE_FIXED64',
-        self::TYPE_FIXED32 => 'TYPE_FIXED32',
-        self::TYPE_BOOL => 'TYPE_BOOL',
-        self::TYPE_STRING => 'TYPE_STRING',
-        self::TYPE_GROUP => 'TYPE_GROUP',
-        self::TYPE_MESSAGE => 'TYPE_MESSAGE',
-        self::TYPE_BYTES => 'TYPE_BYTES',
-        self::TYPE_UINT32 => 'TYPE_UINT32',
-        self::TYPE_ENUM => 'TYPE_ENUM',
-        self::TYPE_SFIXED32 => 'TYPE_SFIXED32',
-        self::TYPE_SFIXED64 => 'TYPE_SFIXED64',
-        self::TYPE_SINT32 => 'TYPE_SINT32',
-        self::TYPE_SINT64 => 'TYPE_SINT64',
-    ];
-
-    public static function name($value)
-    {
-        if (!isset(self::$valueToName[$value])) {
-            throw new UnexpectedValueException(sprintf(
-                    'Enum %s has no name defined for value %s', __CLASS__, $value));
-        }
-        return self::$valueToName[$value];
-    }
-
-
-    public static function value($name)
-    {
-        $const = __CLASS__ . '::' . strtoupper($name);
-        if (!defined($const)) {
-            throw new UnexpectedValueException(sprintf(
-                    'Enum %s has no value defined for name %s', __CLASS__, $name));
-        }
-        return constant($const);
-    }
-}
-
-// Adding a class alias for backwards compatibility with the previous class name.
-class_alias(Type::class, \Google\Protobuf\Internal\FieldDescriptorProto_Type::class);
-
diff --git a/libs/protobuf/php/src/Google/Protobuf/Internal/FieldDescriptorProto_Label.php b/libs/protobuf/php/src/Google/Protobuf/Internal/FieldDescriptorProto_Label.php
deleted file mode 100644
index 218a846..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/Internal/FieldDescriptorProto_Label.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: google/protobuf/descriptor.proto
-
-namespace Google\Protobuf\Internal;
-
-if (false) {
-    /**
-     * This class is deprecated. Use Google\Protobuf\Internal\FieldDescriptorProto\Label instead.
-     * @deprecated
-     */
-    class FieldDescriptorProto_Label {}
-}
-class_exists(FieldDescriptorProto\Label::class);
-@trigger_error('Google\Protobuf\Internal\FieldDescriptorProto_Label is deprecated and will be removed in the next major release. Use Google\Protobuf\Internal\FieldDescriptorProto\Label instead', E_USER_DEPRECATED);
-
diff --git a/libs/protobuf/php/src/Google/Protobuf/Internal/FieldDescriptorProto_Type.php b/libs/protobuf/php/src/Google/Protobuf/Internal/FieldDescriptorProto_Type.php
deleted file mode 100644
index fd8d449..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/Internal/FieldDescriptorProto_Type.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: google/protobuf/descriptor.proto
-
-namespace Google\Protobuf\Internal;
-
-if (false) {
-    /**
-     * This class is deprecated. Use Google\Protobuf\Internal\FieldDescriptorProto\Type instead.
-     * @deprecated
-     */
-    class FieldDescriptorProto_Type {}
-}
-class_exists(FieldDescriptorProto\Type::class);
-@trigger_error('Google\Protobuf\Internal\FieldDescriptorProto_Type is deprecated and will be removed in the next major release. Use Google\Protobuf\Internal\FieldDescriptorProto\Type instead', E_USER_DEPRECATED);
-
diff --git a/libs/protobuf/php/src/Google/Protobuf/Internal/FieldOptions.php b/libs/protobuf/php/src/Google/Protobuf/Internal/FieldOptions.php
deleted file mode 100644
index 665cb06..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/Internal/FieldOptions.php
+++ /dev/null
@@ -1,567 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: google/protobuf/descriptor.proto
-
-namespace Google\Protobuf\Internal;
-
-use Google\Protobuf\Internal\GPBType;
-use Google\Protobuf\Internal\GPBWire;
-use Google\Protobuf\Internal\RepeatedField;
-use Google\Protobuf\Internal\InputStream;
-use Google\Protobuf\Internal\GPBUtil;
-
-/**
- * Generated from protobuf message <code>google.protobuf.FieldOptions</code>
- */
-class FieldOptions extends \Google\Protobuf\Internal\Message
-{
-    /**
-     * The ctype option instructs the C++ code generator to use a different
-     * representation of the field than it normally would.  See the specific
-     * options below.  This option is not yet implemented in the open source
-     * release -- sorry, we'll try to include it in a future version!
-     *
-     * Generated from protobuf field <code>optional .google.protobuf.FieldOptions.CType ctype = 1 [default = STRING];</code>
-     */
-    protected $ctype = null;
-    /**
-     * The packed option can be enabled for repeated primitive fields to enable
-     * a more efficient representation on the wire. Rather than repeatedly
-     * writing the tag and type for each element, the entire array is encoded as
-     * a single length-delimited blob. In proto3, only explicit setting it to
-     * false will avoid using packed encoding.
-     *
-     * Generated from protobuf field <code>optional bool packed = 2;</code>
-     */
-    protected $packed = null;
-    /**
-     * The jstype option determines the JavaScript type used for values of the
-     * field.  The option is permitted only for 64 bit integral and fixed types
-     * (int64, uint64, sint64, fixed64, sfixed64).  A field with jstype JS_STRING
-     * is represented as JavaScript string, which avoids loss of precision that
-     * can happen when a large value is converted to a floating point JavaScript.
-     * Specifying JS_NUMBER for the jstype causes the generated JavaScript code to
-     * use the JavaScript "number" type.  The behavior of the default option
-     * JS_NORMAL is implementation dependent.
-     * This option is an enum to permit additional types to be added, e.g.
-     * goog.math.Integer.
-     *
-     * Generated from protobuf field <code>optional .google.protobuf.FieldOptions.JSType jstype = 6 [default = JS_NORMAL];</code>
-     */
-    protected $jstype = null;
-    /**
-     * Should this field be parsed lazily?  Lazy applies only to message-type
-     * fields.  It means that when the outer message is initially parsed, the
-     * inner message's contents will not be parsed but instead stored in encoded
-     * form.  The inner message will actually be parsed when it is first accessed.
-     * This is only a hint.  Implementations are free to choose whether to use
-     * eager or lazy parsing regardless of the value of this option.  However,
-     * setting this option true suggests that the protocol author believes that
-     * using lazy parsing on this field is worth the additional bookkeeping
-     * overhead typically needed to implement it.
-     * This option does not affect the public interface of any generated code;
-     * all method signatures remain the same.  Furthermore, thread-safety of the
-     * interface is not affected by this option; const methods remain safe to
-     * call from multiple threads concurrently, while non-const methods continue
-     * to require exclusive access.
-     * Note that implementations may choose not to check required fields within
-     * a lazy sub-message.  That is, calling IsInitialized() on the outer message
-     * may return true even if the inner message has missing required fields.
-     * This is necessary because otherwise the inner message would have to be
-     * parsed in order to perform the check, defeating the purpose of lazy
-     * parsing.  An implementation which chooses not to check required fields
-     * must be consistent about it.  That is, for any particular sub-message, the
-     * implementation must either *always* check its required fields, or *never*
-     * check its required fields, regardless of whether or not the message has
-     * been parsed.
-     * As of 2021, lazy does no correctness checks on the byte stream during
-     * parsing.  This may lead to crashes if and when an invalid byte stream is
-     * finally parsed upon access.
-     * TODO(b/211906113):  Enable validation on lazy fields.
-     *
-     * Generated from protobuf field <code>optional bool lazy = 5 [default = false];</code>
-     */
-    protected $lazy = null;
-    /**
-     * unverified_lazy does no correctness checks on the byte stream. This should
-     * only be used where lazy with verification is prohibitive for performance
-     * reasons.
-     *
-     * Generated from protobuf field <code>optional bool unverified_lazy = 15 [default = false];</code>
-     */
-    protected $unverified_lazy = null;
-    /**
-     * Is this field deprecated?
-     * Depending on the target platform, this can emit Deprecated annotations
-     * for accessors, or it will be completely ignored; in the very least, this
-     * is a formalization for deprecating fields.
-     *
-     * Generated from protobuf field <code>optional bool deprecated = 3 [default = false];</code>
-     */
-    protected $deprecated = null;
-    /**
-     * For Google-internal migration only. Do not use.
-     *
-     * Generated from protobuf field <code>optional bool weak = 10 [default = false];</code>
-     */
-    protected $weak = null;
-    /**
-     * The parser stores options it doesn't recognize here. See above.
-     *
-     * Generated from protobuf field <code>repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;</code>
-     */
-    private $uninterpreted_option;
-
-    /**
-     * Constructor.
-     *
-     * @param array $data {
-     *     Optional. Data for populating the Message object.
-     *
-     *     @type int $ctype
-     *           The ctype option instructs the C++ code generator to use a different
-     *           representation of the field than it normally would.  See the specific
-     *           options below.  This option is not yet implemented in the open source
-     *           release -- sorry, we'll try to include it in a future version!
-     *     @type bool $packed
-     *           The packed option can be enabled for repeated primitive fields to enable
-     *           a more efficient representation on the wire. Rather than repeatedly
-     *           writing the tag and type for each element, the entire array is encoded as
-     *           a single length-delimited blob. In proto3, only explicit setting it to
-     *           false will avoid using packed encoding.
-     *     @type int $jstype
-     *           The jstype option determines the JavaScript type used for values of the
-     *           field.  The option is permitted only for 64 bit integral and fixed types
-     *           (int64, uint64, sint64, fixed64, sfixed64).  A field with jstype JS_STRING
-     *           is represented as JavaScript string, which avoids loss of precision that
-     *           can happen when a large value is converted to a floating point JavaScript.
-     *           Specifying JS_NUMBER for the jstype causes the generated JavaScript code to
-     *           use the JavaScript "number" type.  The behavior of the default option
-     *           JS_NORMAL is implementation dependent.
-     *           This option is an enum to permit additional types to be added, e.g.
-     *           goog.math.Integer.
-     *     @type bool $lazy
-     *           Should this field be parsed lazily?  Lazy applies only to message-type
-     *           fields.  It means that when the outer message is initially parsed, the
-     *           inner message's contents will not be parsed but instead stored in encoded
-     *           form.  The inner message will actually be parsed when it is first accessed.
-     *           This is only a hint.  Implementations are free to choose whether to use
-     *           eager or lazy parsing regardless of the value of this option.  However,
-     *           setting this option true suggests that the protocol author believes that
-     *           using lazy parsing on this field is worth the additional bookkeeping
-     *           overhead typically needed to implement it.
-     *           This option does not affect the public interface of any generated code;
-     *           all method signatures remain the same.  Furthermore, thread-safety of the
-     *           interface is not affected by this option; const methods remain safe to
-     *           call from multiple threads concurrently, while non-const methods continue
-     *           to require exclusive access.
-     *           Note that implementations may choose not to check required fields within
-     *           a lazy sub-message.  That is, calling IsInitialized() on the outer message
-     *           may return true even if the inner message has missing required fields.
-     *           This is necessary because otherwise the inner message would have to be
-     *           parsed in order to perform the check, defeating the purpose of lazy
-     *           parsing.  An implementation which chooses not to check required fields
-     *           must be consistent about it.  That is, for any particular sub-message, the
-     *           implementation must either *always* check its required fields, or *never*
-     *           check its required fields, regardless of whether or not the message has
-     *           been parsed.
-     *           As of 2021, lazy does no correctness checks on the byte stream during
-     *           parsing.  This may lead to crashes if and when an invalid byte stream is
-     *           finally parsed upon access.
-     *           TODO(b/211906113):  Enable validation on lazy fields.
-     *     @type bool $unverified_lazy
-     *           unverified_lazy does no correctness checks on the byte stream. This should
-     *           only be used where lazy with verification is prohibitive for performance
-     *           reasons.
-     *     @type bool $deprecated
-     *           Is this field deprecated?
-     *           Depending on the target platform, this can emit Deprecated annotations
-     *           for accessors, or it will be completely ignored; in the very least, this
-     *           is a formalization for deprecating fields.
-     *     @type bool $weak
-     *           For Google-internal migration only. Do not use.
-     *     @type array<\Google\Protobuf\Internal\UninterpretedOption>|\Google\Protobuf\Internal\RepeatedField $uninterpreted_option
-     *           The parser stores options it doesn't recognize here. See above.
-     * }
-     */
-    public function __construct($data = NULL) {
-        \GPBMetadata\Google\Protobuf\Internal\Descriptor::initOnce();
-        parent::__construct($data);
-    }
-
-    /**
-     * The ctype option instructs the C++ code generator to use a different
-     * representation of the field than it normally would.  See the specific
-     * options below.  This option is not yet implemented in the open source
-     * release -- sorry, we'll try to include it in a future version!
-     *
-     * Generated from protobuf field <code>optional .google.protobuf.FieldOptions.CType ctype = 1 [default = STRING];</code>
-     * @return int
-     */
-    public function getCtype()
-    {
-        return isset($this->ctype) ? $this->ctype : 0;
-    }
-
-    public function hasCtype()
-    {
-        return isset($this->ctype);
-    }
-
-    public function clearCtype()
-    {
-        unset($this->ctype);
-    }
-
-    /**
-     * The ctype option instructs the C++ code generator to use a different
-     * representation of the field than it normally would.  See the specific
-     * options below.  This option is not yet implemented in the open source
-     * release -- sorry, we'll try to include it in a future version!
-     *
-     * Generated from protobuf field <code>optional .google.protobuf.FieldOptions.CType ctype = 1 [default = STRING];</code>
-     * @param int $var
-     * @return $this
-     */
-    public function setCtype($var)
-    {
-        GPBUtil::checkEnum($var, \Google\Protobuf\Internal\FieldOptions\CType::class);
-        $this->ctype = $var;
-
-        return $this;
-    }
-
-    /**
-     * The packed option can be enabled for repeated primitive fields to enable
-     * a more efficient representation on the wire. Rather than repeatedly
-     * writing the tag and type for each element, the entire array is encoded as
-     * a single length-delimited blob. In proto3, only explicit setting it to
-     * false will avoid using packed encoding.
-     *
-     * Generated from protobuf field <code>optional bool packed = 2;</code>
-     * @return bool
-     */
-    public function getPacked()
-    {
-        return isset($this->packed) ? $this->packed : false;
-    }
-
-    public function hasPacked()
-    {
-        return isset($this->packed);
-    }
-
-    public function clearPacked()
-    {
-        unset($this->packed);
-    }
-
-    /**
-     * The packed option can be enabled for repeated primitive fields to enable
-     * a more efficient representation on the wire. Rather than repeatedly
-     * writing the tag and type for each element, the entire array is encoded as
-     * a single length-delimited blob. In proto3, only explicit setting it to
-     * false will avoid using packed encoding.
-     *
-     * Generated from protobuf field <code>optional bool packed = 2;</code>
-     * @param bool $var
-     * @return $this
-     */
-    public function setPacked($var)
-    {
-        GPBUtil::checkBool($var);
-        $this->packed = $var;
-
-        return $this;
-    }
-
-    /**
-     * The jstype option determines the JavaScript type used for values of the
-     * field.  The option is permitted only for 64 bit integral and fixed types
-     * (int64, uint64, sint64, fixed64, sfixed64).  A field with jstype JS_STRING
-     * is represented as JavaScript string, which avoids loss of precision that
-     * can happen when a large value is converted to a floating point JavaScript.
-     * Specifying JS_NUMBER for the jstype causes the generated JavaScript code to
-     * use the JavaScript "number" type.  The behavior of the default option
-     * JS_NORMAL is implementation dependent.
-     * This option is an enum to permit additional types to be added, e.g.
-     * goog.math.Integer.
-     *
-     * Generated from protobuf field <code>optional .google.protobuf.FieldOptions.JSType jstype = 6 [default = JS_NORMAL];</code>
-     * @return int
-     */
-    public function getJstype()
-    {
-        return isset($this->jstype) ? $this->jstype : 0;
-    }
-
-    public function hasJstype()
-    {
-        return isset($this->jstype);
-    }
-
-    public function clearJstype()
-    {
-        unset($this->jstype);
-    }
-
-    /**
-     * The jstype option determines the JavaScript type used for values of the
-     * field.  The option is permitted only for 64 bit integral and fixed types
-     * (int64, uint64, sint64, fixed64, sfixed64).  A field with jstype JS_STRING
-     * is represented as JavaScript string, which avoids loss of precision that
-     * can happen when a large value is converted to a floating point JavaScript.
-     * Specifying JS_NUMBER for the jstype causes the generated JavaScript code to
-     * use the JavaScript "number" type.  The behavior of the default option
-     * JS_NORMAL is implementation dependent.
-     * This option is an enum to permit additional types to be added, e.g.
-     * goog.math.Integer.
-     *
-     * Generated from protobuf field <code>optional .google.protobuf.FieldOptions.JSType jstype = 6 [default = JS_NORMAL];</code>
-     * @param int $var
-     * @return $this
-     */
-    public function setJstype($var)
-    {
-        GPBUtil::checkEnum($var, \Google\Protobuf\Internal\FieldOptions\JSType::class);
-        $this->jstype = $var;
-
-        return $this;
-    }
-
-    /**
-     * Should this field be parsed lazily?  Lazy applies only to message-type
-     * fields.  It means that when the outer message is initially parsed, the
-     * inner message's contents will not be parsed but instead stored in encoded
-     * form.  The inner message will actually be parsed when it is first accessed.
-     * This is only a hint.  Implementations are free to choose whether to use
-     * eager or lazy parsing regardless of the value of this option.  However,
-     * setting this option true suggests that the protocol author believes that
-     * using lazy parsing on this field is worth the additional bookkeeping
-     * overhead typically needed to implement it.
-     * This option does not affect the public interface of any generated code;
-     * all method signatures remain the same.  Furthermore, thread-safety of the
-     * interface is not affected by this option; const methods remain safe to
-     * call from multiple threads concurrently, while non-const methods continue
-     * to require exclusive access.
-     * Note that implementations may choose not to check required fields within
-     * a lazy sub-message.  That is, calling IsInitialized() on the outer message
-     * may return true even if the inner message has missing required fields.
-     * This is necessary because otherwise the inner message would have to be
-     * parsed in order to perform the check, defeating the purpose of lazy
-     * parsing.  An implementation which chooses not to check required fields
-     * must be consistent about it.  That is, for any particular sub-message, the
-     * implementation must either *always* check its required fields, or *never*
-     * check its required fields, regardless of whether or not the message has
-     * been parsed.
-     * As of 2021, lazy does no correctness checks on the byte stream during
-     * parsing.  This may lead to crashes if and when an invalid byte stream is
-     * finally parsed upon access.
-     * TODO(b/211906113):  Enable validation on lazy fields.
-     *
-     * Generated from protobuf field <code>optional bool lazy = 5 [default = false];</code>
-     * @return bool
-     */
-    public function getLazy()
-    {
-        return isset($this->lazy) ? $this->lazy : false;
-    }
-
-    public function hasLazy()
-    {
-        return isset($this->lazy);
-    }
-
-    public function clearLazy()
-    {
-        unset($this->lazy);
-    }
-
-    /**
-     * Should this field be parsed lazily?  Lazy applies only to message-type
-     * fields.  It means that when the outer message is initially parsed, the
-     * inner message's contents will not be parsed but instead stored in encoded
-     * form.  The inner message will actually be parsed when it is first accessed.
-     * This is only a hint.  Implementations are free to choose whether to use
-     * eager or lazy parsing regardless of the value of this option.  However,
-     * setting this option true suggests that the protocol author believes that
-     * using lazy parsing on this field is worth the additional bookkeeping
-     * overhead typically needed to implement it.
-     * This option does not affect the public interface of any generated code;
-     * all method signatures remain the same.  Furthermore, thread-safety of the
-     * interface is not affected by this option; const methods remain safe to
-     * call from multiple threads concurrently, while non-const methods continue
-     * to require exclusive access.
-     * Note that implementations may choose not to check required fields within
-     * a lazy sub-message.  That is, calling IsInitialized() on the outer message
-     * may return true even if the inner message has missing required fields.
-     * This is necessary because otherwise the inner message would have to be
-     * parsed in order to perform the check, defeating the purpose of lazy
-     * parsing.  An implementation which chooses not to check required fields
-     * must be consistent about it.  That is, for any particular sub-message, the
-     * implementation must either *always* check its required fields, or *never*
-     * check its required fields, regardless of whether or not the message has
-     * been parsed.
-     * As of 2021, lazy does no correctness checks on the byte stream during
-     * parsing.  This may lead to crashes if and when an invalid byte stream is
-     * finally parsed upon access.
-     * TODO(b/211906113):  Enable validation on lazy fields.
-     *
-     * Generated from protobuf field <code>optional bool lazy = 5 [default = false];</code>
-     * @param bool $var
-     * @return $this
-     */
-    public function setLazy($var)
-    {
-        GPBUtil::checkBool($var);
-        $this->lazy = $var;
-
-        return $this;
-    }
-
-    /**
-     * unverified_lazy does no correctness checks on the byte stream. This should
-     * only be used where lazy with verification is prohibitive for performance
-     * reasons.
-     *
-     * Generated from protobuf field <code>optional bool unverified_lazy = 15 [default = false];</code>
-     * @return bool
-     */
-    public function getUnverifiedLazy()
-    {
-        return isset($this->unverified_lazy) ? $this->unverified_lazy : false;
-    }
-
-    public function hasUnverifiedLazy()
-    {
-        return isset($this->unverified_lazy);
-    }
-
-    public function clearUnverifiedLazy()
-    {
-        unset($this->unverified_lazy);
-    }
-
-    /**
-     * unverified_lazy does no correctness checks on the byte stream. This should
-     * only be used where lazy with verification is prohibitive for performance
-     * reasons.
-     *
-     * Generated from protobuf field <code>optional bool unverified_lazy = 15 [default = false];</code>
-     * @param bool $var
-     * @return $this
-     */
-    public function setUnverifiedLazy($var)
-    {
-        GPBUtil::checkBool($var);
-        $this->unverified_lazy = $var;
-
-        return $this;
-    }
-
-    /**
-     * Is this field deprecated?
-     * Depending on the target platform, this can emit Deprecated annotations
-     * for accessors, or it will be completely ignored; in the very least, this
-     * is a formalization for deprecating fields.
-     *
-     * Generated from protobuf field <code>optional bool deprecated = 3 [default = false];</code>
-     * @return bool
-     */
-    public function getDeprecated()
-    {
-        return isset($this->deprecated) ? $this->deprecated : false;
-    }
-
-    public function hasDeprecated()
-    {
-        return isset($this->deprecated);
-    }
-
-    public function clearDeprecated()
-    {
-        unset($this->deprecated);
-    }
-
-    /**
-     * Is this field deprecated?
-     * Depending on the target platform, this can emit Deprecated annotations
-     * for accessors, or it will be completely ignored; in the very least, this
-     * is a formalization for deprecating fields.
-     *
-     * Generated from protobuf field <code>optional bool deprecated = 3 [default = false];</code>
-     * @param bool $var
-     * @return $this
-     */
-    public function setDeprecated($var)
-    {
-        GPBUtil::checkBool($var);
-        $this->deprecated = $var;
-
-        return $this;
-    }
-
-    /**
-     * For Google-internal migration only. Do not use.
-     *
-     * Generated from protobuf field <code>optional bool weak = 10 [default = false];</code>
-     * @return bool
-     */
-    public function getWeak()
-    {
-        return isset($this->weak) ? $this->weak : false;
-    }
-
-    public function hasWeak()
-    {
-        return isset($this->weak);
-    }
-
-    public function clearWeak()
-    {
-        unset($this->weak);
-    }
-
-    /**
-     * For Google-internal migration only. Do not use.
-     *
-     * Generated from protobuf field <code>optional bool weak = 10 [default = false];</code>
-     * @param bool $var
-     * @return $this
-     */
-    public function setWeak($var)
-    {
-        GPBUtil::checkBool($var);
-        $this->weak = $var;
-
-        return $this;
-    }
-
-    /**
-     * The parser stores options it doesn't recognize here. See above.
-     *
-     * Generated from protobuf field <code>repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;</code>
-     * @return \Google\Protobuf\Internal\RepeatedField
-     */
-    public function getUninterpretedOption()
-    {
-        return $this->uninterpreted_option;
-    }
-
-    /**
-     * The parser stores options it doesn't recognize here. See above.
-     *
-     * Generated from protobuf field <code>repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;</code>
-     * @param array<\Google\Protobuf\Internal\UninterpretedOption>|\Google\Protobuf\Internal\RepeatedField $var
-     * @return $this
-     */
-    public function setUninterpretedOption($var)
-    {
-        $arr = GPBUtil::checkRepeatedField($var, \Google\Protobuf\Internal\GPBType::MESSAGE, \Google\Protobuf\Internal\UninterpretedOption::class);
-        $this->uninterpreted_option = $arr;
-
-        return $this;
-    }
-
-}
-
diff --git a/libs/protobuf/php/src/Google/Protobuf/Internal/FieldOptions/CType.php b/libs/protobuf/php/src/Google/Protobuf/Internal/FieldOptions/CType.php
deleted file mode 100644
index ba9eb4a..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/Internal/FieldOptions/CType.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: google/protobuf/descriptor.proto
-
-namespace Google\Protobuf\Internal\FieldOptions;
-
-use UnexpectedValueException;
-
-/**
- * Protobuf type <code>google.protobuf.FieldOptions.CType</code>
- */
-class CType
-{
-    /**
-     * Default mode.
-     *
-     * Generated from protobuf enum <code>STRING = 0;</code>
-     */
-    const STRING = 0;
-    /**
-     * Generated from protobuf enum <code>CORD = 1;</code>
-     */
-    const CORD = 1;
-    /**
-     * Generated from protobuf enum <code>STRING_PIECE = 2;</code>
-     */
-    const STRING_PIECE = 2;
-
-    private static $valueToName = [
-        self::STRING => 'STRING',
-        self::CORD => 'CORD',
-        self::STRING_PIECE => 'STRING_PIECE',
-    ];
-
-    public static function name($value)
-    {
-        if (!isset(self::$valueToName[$value])) {
-            throw new UnexpectedValueException(sprintf(
-                    'Enum %s has no name defined for value %s', __CLASS__, $value));
-        }
-        return self::$valueToName[$value];
-    }
-
-
-    public static function value($name)
-    {
-        $const = __CLASS__ . '::' . strtoupper($name);
-        if (!defined($const)) {
-            throw new UnexpectedValueException(sprintf(
-                    'Enum %s has no value defined for name %s', __CLASS__, $name));
-        }
-        return constant($const);
-    }
-}
-
-// Adding a class alias for backwards compatibility with the previous class name.
-class_alias(CType::class, \Google\Protobuf\Internal\FieldOptions_CType::class);
-
diff --git a/libs/protobuf/php/src/Google/Protobuf/Internal/FieldOptions/JSType.php b/libs/protobuf/php/src/Google/Protobuf/Internal/FieldOptions/JSType.php
deleted file mode 100644
index 175a433..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/Internal/FieldOptions/JSType.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: google/protobuf/descriptor.proto
-
-namespace Google\Protobuf\Internal\FieldOptions;
-
-use UnexpectedValueException;
-
-/**
- * Protobuf type <code>google.protobuf.FieldOptions.JSType</code>
- */
-class JSType
-{
-    /**
-     * Use the default type.
-     *
-     * Generated from protobuf enum <code>JS_NORMAL = 0;</code>
-     */
-    const JS_NORMAL = 0;
-    /**
-     * Use JavaScript strings.
-     *
-     * Generated from protobuf enum <code>JS_STRING = 1;</code>
-     */
-    const JS_STRING = 1;
-    /**
-     * Use JavaScript numbers.
-     *
-     * Generated from protobuf enum <code>JS_NUMBER = 2;</code>
-     */
-    const JS_NUMBER = 2;
-
-    private static $valueToName = [
-        self::JS_NORMAL => 'JS_NORMAL',
-        self::JS_STRING => 'JS_STRING',
-        self::JS_NUMBER => 'JS_NUMBER',
-    ];
-
-    public static function name($value)
-    {
-        if (!isset(self::$valueToName[$value])) {
-            throw new UnexpectedValueException(sprintf(
-                    'Enum %s has no name defined for value %s', __CLASS__, $value));
-        }
-        return self::$valueToName[$value];
-    }
-
-
-    public static function value($name)
-    {
-        $const = __CLASS__ . '::' . strtoupper($name);
-        if (!defined($const)) {
-            throw new UnexpectedValueException(sprintf(
-                    'Enum %s has no value defined for name %s', __CLASS__, $name));
-        }
-        return constant($const);
-    }
-}
-
-// Adding a class alias for backwards compatibility with the previous class name.
-class_alias(JSType::class, \Google\Protobuf\Internal\FieldOptions_JSType::class);
-
diff --git a/libs/protobuf/php/src/Google/Protobuf/Internal/FieldOptions_CType.php b/libs/protobuf/php/src/Google/Protobuf/Internal/FieldOptions_CType.php
deleted file mode 100644
index 4d18783..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/Internal/FieldOptions_CType.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: google/protobuf/descriptor.proto
-
-namespace Google\Protobuf\Internal;
-
-if (false) {
-    /**
-     * This class is deprecated. Use Google\Protobuf\Internal\FieldOptions\CType instead.
-     * @deprecated
-     */
-    class FieldOptions_CType {}
-}
-class_exists(FieldOptions\CType::class);
-@trigger_error('Google\Protobuf\Internal\FieldOptions_CType is deprecated and will be removed in the next major release. Use Google\Protobuf\Internal\FieldOptions\CType instead', E_USER_DEPRECATED);
-
diff --git a/libs/protobuf/php/src/Google/Protobuf/Internal/FieldOptions_JSType.php b/libs/protobuf/php/src/Google/Protobuf/Internal/FieldOptions_JSType.php
deleted file mode 100644
index 9db0782..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/Internal/FieldOptions_JSType.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: google/protobuf/descriptor.proto
-
-namespace Google\Protobuf\Internal;
-
-if (false) {
-    /**
-     * This class is deprecated. Use Google\Protobuf\Internal\FieldOptions\JSType instead.
-     * @deprecated
-     */
-    class FieldOptions_JSType {}
-}
-class_exists(FieldOptions\JSType::class);
-@trigger_error('Google\Protobuf\Internal\FieldOptions_JSType is deprecated and will be removed in the next major release. Use Google\Protobuf\Internal\FieldOptions\JSType instead', E_USER_DEPRECATED);
-
diff --git a/libs/protobuf/php/src/Google/Protobuf/Internal/FileDescriptor.php b/libs/protobuf/php/src/Google/Protobuf/Internal/FileDescriptor.php
deleted file mode 100644
index 038da38..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/Internal/FileDescriptor.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-namespace Google\Protobuf\Internal;
-
-class FileDescriptor
-{
-
-    private $package;
-    private $message_type = [];
-    private $enum_type = [];
-
-    public function setPackage($package)
-    {
-        $this->package = $package;
-    }
-
-    public function getPackage()
-    {
-        return $this->package;
-    }
-
-    public function getMessageType()
-    {
-        return $this->message_type;
-    }
-
-    public function addMessageType($desc)
-    {
-        $this->message_type[] = $desc;
-    }
-
-    public function getEnumType()
-    {
-        return $this->enum_type;
-    }
-
-    public function addEnumType($desc)
-    {
-        $this->enum_type[]= $desc;
-    }
-
-    public static function buildFromProto($proto)
-    {
-        $file = new FileDescriptor();
-        $file->setPackage($proto->getPackage());
-        foreach ($proto->getMessageType() as $message_proto) {
-            $file->addMessageType(Descriptor::buildFromProto(
-                $message_proto, $proto, ""));
-        }
-        foreach ($proto->getEnumType() as $enum_proto) {
-            $file->addEnumType(
-                EnumDescriptor::buildFromProto(
-                    $enum_proto,
-                    $proto,
-                    ""));
-        }
-        return $file;
-    }
-}
diff --git a/libs/protobuf/php/src/Google/Protobuf/Internal/FileDescriptorProto.php b/libs/protobuf/php/src/Google/Protobuf/Internal/FileDescriptorProto.php
deleted file mode 100644
index 5ba7db6..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/Internal/FileDescriptorProto.php
+++ /dev/null
@@ -1,485 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: google/protobuf/descriptor.proto
-
-namespace Google\Protobuf\Internal;
-
-use Google\Protobuf\Internal\GPBType;
-use Google\Protobuf\Internal\GPBWire;
-use Google\Protobuf\Internal\RepeatedField;
-use Google\Protobuf\Internal\InputStream;
-use Google\Protobuf\Internal\GPBUtil;
-
-/**
- * Describes a complete .proto file.
- *
- * Generated from protobuf message <code>google.protobuf.FileDescriptorProto</code>
- */
-class FileDescriptorProto extends \Google\Protobuf\Internal\Message
-{
-    /**
-     * file name, relative to root of source tree
-     *
-     * Generated from protobuf field <code>optional string name = 1;</code>
-     */
-    protected $name = null;
-    /**
-     * e.g. "foo", "foo.bar", etc.
-     *
-     * Generated from protobuf field <code>optional string package = 2;</code>
-     */
-    protected $package = null;
-    /**
-     * Names of files imported by this file.
-     *
-     * Generated from protobuf field <code>repeated string dependency = 3;</code>
-     */
-    private $dependency;
-    /**
-     * Indexes of the public imported files in the dependency list above.
-     *
-     * Generated from protobuf field <code>repeated int32 public_dependency = 10;</code>
-     */
-    private $public_dependency;
-    /**
-     * Indexes of the weak imported files in the dependency list.
-     * For Google-internal migration only. Do not use.
-     *
-     * Generated from protobuf field <code>repeated int32 weak_dependency = 11;</code>
-     */
-    private $weak_dependency;
-    /**
-     * All top-level definitions in this file.
-     *
-     * Generated from protobuf field <code>repeated .google.protobuf.DescriptorProto message_type = 4;</code>
-     */
-    private $message_type;
-    /**
-     * Generated from protobuf field <code>repeated .google.protobuf.EnumDescriptorProto enum_type = 5;</code>
-     */
-    private $enum_type;
-    /**
-     * Generated from protobuf field <code>repeated .google.protobuf.ServiceDescriptorProto service = 6;</code>
-     */
-    private $service;
-    /**
-     * Generated from protobuf field <code>repeated .google.protobuf.FieldDescriptorProto extension = 7;</code>
-     */
-    private $extension;
-    /**
-     * Generated from protobuf field <code>optional .google.protobuf.FileOptions options = 8;</code>
-     */
-    protected $options = null;
-    /**
-     * This field contains optional information about the original source code.
-     * You may safely remove this entire field without harming runtime
-     * functionality of the descriptors -- the information is needed only by
-     * development tools.
-     *
-     * Generated from protobuf field <code>optional .google.protobuf.SourceCodeInfo source_code_info = 9;</code>
-     */
-    protected $source_code_info = null;
-    /**
-     * The syntax of the proto file.
-     * The supported values are "proto2" and "proto3".
-     *
-     * Generated from protobuf field <code>optional string syntax = 12;</code>
-     */
-    protected $syntax = null;
-
-    /**
-     * Constructor.
-     *
-     * @param array $data {
-     *     Optional. Data for populating the Message object.
-     *
-     *     @type string $name
-     *           file name, relative to root of source tree
-     *     @type string $package
-     *           e.g. "foo", "foo.bar", etc.
-     *     @type array<string>|\Google\Protobuf\Internal\RepeatedField $dependency
-     *           Names of files imported by this file.
-     *     @type array<int>|\Google\Protobuf\Internal\RepeatedField $public_dependency
-     *           Indexes of the public imported files in the dependency list above.
-     *     @type array<int>|\Google\Protobuf\Internal\RepeatedField $weak_dependency
-     *           Indexes of the weak imported files in the dependency list.
-     *           For Google-internal migration only. Do not use.
-     *     @type array<\Google\Protobuf\Internal\DescriptorProto>|\Google\Protobuf\Internal\RepeatedField $message_type
-     *           All top-level definitions in this file.
-     *     @type array<\Google\Protobuf\Internal\EnumDescriptorProto>|\Google\Protobuf\Internal\RepeatedField $enum_type
-     *     @type array<\Google\Protobuf\Internal\ServiceDescriptorProto>|\Google\Protobuf\Internal\RepeatedField $service
-     *     @type array<\Google\Protobuf\Internal\FieldDescriptorProto>|\Google\Protobuf\Internal\RepeatedField $extension
-     *     @type \Google\Protobuf\Internal\FileOptions $options
-     *     @type \Google\Protobuf\Internal\SourceCodeInfo $source_code_info
-     *           This field contains optional information about the original source code.
-     *           You may safely remove this entire field without harming runtime
-     *           functionality of the descriptors -- the information is needed only by
-     *           development tools.
-     *     @type string $syntax
-     *           The syntax of the proto file.
-     *           The supported values are "proto2" and "proto3".
-     * }
-     */
-    public function __construct($data = NULL) {
-        \GPBMetadata\Google\Protobuf\Internal\Descriptor::initOnce();
-        parent::__construct($data);
-    }
-
-    /**
-     * file name, relative to root of source tree
-     *
-     * Generated from protobuf field <code>optional string name = 1;</code>
-     * @return string
-     */
-    public function getName()
-    {
-        return isset($this->name) ? $this->name : '';
-    }
-
-    public function hasName()
-    {
-        return isset($this->name);
-    }
-
-    public function clearName()
-    {
-        unset($this->name);
-    }
-
-    /**
-     * file name, relative to root of source tree
-     *
-     * Generated from protobuf field <code>optional string name = 1;</code>
-     * @param string $var
-     * @return $this
-     */
-    public function setName($var)
-    {
-        GPBUtil::checkString($var, True);
-        $this->name = $var;
-
-        return $this;
-    }
-
-    /**
-     * e.g. "foo", "foo.bar", etc.
-     *
-     * Generated from protobuf field <code>optional string package = 2;</code>
-     * @return string
-     */
-    public function getPackage()
-    {
-        return isset($this->package) ? $this->package : '';
-    }
-
-    public function hasPackage()
-    {
-        return isset($this->package);
-    }
-
-    public function clearPackage()
-    {
-        unset($this->package);
-    }
-
-    /**
-     * e.g. "foo", "foo.bar", etc.
-     *
-     * Generated from protobuf field <code>optional string package = 2;</code>
-     * @param string $var
-     * @return $this
-     */
-    public function setPackage($var)
-    {
-        GPBUtil::checkString($var, True);
-        $this->package = $var;
-
-        return $this;
-    }
-
-    /**
-     * Names of files imported by this file.
-     *
-     * Generated from protobuf field <code>repeated string dependency = 3;</code>
-     * @return \Google\Protobuf\Internal\RepeatedField
-     */
-    public function getDependency()
-    {
-        return $this->dependency;
-    }
-
-    /**
-     * Names of files imported by this file.
-     *
-     * Generated from protobuf field <code>repeated string dependency = 3;</code>
-     * @param array<string>|\Google\Protobuf\Internal\RepeatedField $var
-     * @return $this
-     */
-    public function setDependency($var)
-    {
-        $arr = GPBUtil::checkRepeatedField($var, \Google\Protobuf\Internal\GPBType::STRING);
-        $this->dependency = $arr;
-
-        return $this;
-    }
-
-    /**
-     * Indexes of the public imported files in the dependency list above.
-     *
-     * Generated from protobuf field <code>repeated int32 public_dependency = 10;</code>
-     * @return \Google\Protobuf\Internal\RepeatedField
-     */
-    public function getPublicDependency()
-    {
-        return $this->public_dependency;
-    }
-
-    /**
-     * Indexes of the public imported files in the dependency list above.
-     *
-     * Generated from protobuf field <code>repeated int32 public_dependency = 10;</code>
-     * @param array<int>|\Google\Protobuf\Internal\RepeatedField $var
-     * @return $this
-     */
-    public function setPublicDependency($var)
-    {
-        $arr = GPBUtil::checkRepeatedField($var, \Google\Protobuf\Internal\GPBType::INT32);
-        $this->public_dependency = $arr;
-
-        return $this;
-    }
-
-    /**
-     * Indexes of the weak imported files in the dependency list.
-     * For Google-internal migration only. Do not use.
-     *
-     * Generated from protobuf field <code>repeated int32 weak_dependency = 11;</code>
-     * @return \Google\Protobuf\Internal\RepeatedField
-     */
-    public function getWeakDependency()
-    {
-        return $this->weak_dependency;
-    }
-
-    /**
-     * Indexes of the weak imported files in the dependency list.
-     * For Google-internal migration only. Do not use.
-     *
-     * Generated from protobuf field <code>repeated int32 weak_dependency = 11;</code>
-     * @param array<int>|\Google\Protobuf\Internal\RepeatedField $var
-     * @return $this
-     */
-    public function setWeakDependency($var)
-    {
-        $arr = GPBUtil::checkRepeatedField($var, \Google\Protobuf\Internal\GPBType::INT32);
-        $this->weak_dependency = $arr;
-
-        return $this;
-    }
-
-    /**
-     * All top-level definitions in this file.
-     *
-     * Generated from protobuf field <code>repeated .google.protobuf.DescriptorProto message_type = 4;</code>
-     * @return \Google\Protobuf\Internal\RepeatedField
-     */
-    public function getMessageType()
-    {
-        return $this->message_type;
-    }
-
-    /**
-     * All top-level definitions in this file.
-     *
-     * Generated from protobuf field <code>repeated .google.protobuf.DescriptorProto message_type = 4;</code>
-     * @param array<\Google\Protobuf\Internal\DescriptorProto>|\Google\Protobuf\Internal\RepeatedField $var
-     * @return $this
-     */
-    public function setMessageType($var)
-    {
-        $arr = GPBUtil::checkRepeatedField($var, \Google\Protobuf\Internal\GPBType::MESSAGE, \Google\Protobuf\Internal\DescriptorProto::class);
-        $this->message_type = $arr;
-
-        return $this;
-    }
-
-    /**
-     * Generated from protobuf field <code>repeated .google.protobuf.EnumDescriptorProto enum_type = 5;</code>
-     * @return \Google\Protobuf\Internal\RepeatedField
-     */
-    public function getEnumType()
-    {
-        return $this->enum_type;
-    }
-
-    /**
-     * Generated from protobuf field <code>repeated .google.protobuf.EnumDescriptorProto enum_type = 5;</code>
-     * @param array<\Google\Protobuf\Internal\EnumDescriptorProto>|\Google\Protobuf\Internal\RepeatedField $var
-     * @return $this
-     */
-    public function setEnumType($var)
-    {
-        $arr = GPBUtil::checkRepeatedField($var, \Google\Protobuf\Internal\GPBType::MESSAGE, \Google\Protobuf\Internal\EnumDescriptorProto::class);
-        $this->enum_type = $arr;
-
-        return $this;
-    }
-
-    /**
-     * Generated from protobuf field <code>repeated .google.protobuf.ServiceDescriptorProto service = 6;</code>
-     * @return \Google\Protobuf\Internal\RepeatedField
-     */
-    public function getService()
-    {
-        return $this->service;
-    }
-
-    /**
-     * Generated from protobuf field <code>repeated .google.protobuf.ServiceDescriptorProto service = 6;</code>
-     * @param array<\Google\Protobuf\Internal\ServiceDescriptorProto>|\Google\Protobuf\Internal\RepeatedField $var
-     * @return $this
-     */
-    public function setService($var)
-    {
-        $arr = GPBUtil::checkRepeatedField($var, \Google\Protobuf\Internal\GPBType::MESSAGE, \Google\Protobuf\Internal\ServiceDescriptorProto::class);
-        $this->service = $arr;
-
-        return $this;
-    }
-
-    /**
-     * Generated from protobuf field <code>repeated .google.protobuf.FieldDescriptorProto extension = 7;</code>
-     * @return \Google\Protobuf\Internal\RepeatedField
-     */
-    public function getExtension()
-    {
-        return $this->extension;
-    }
-
-    /**
-     * Generated from protobuf field <code>repeated .google.protobuf.FieldDescriptorProto extension = 7;</code>
-     * @param array<\Google\Protobuf\Internal\FieldDescriptorProto>|\Google\Protobuf\Internal\RepeatedField $var
-     * @return $this
-     */
-    public function setExtension($var)
-    {
-        $arr = GPBUtil::checkRepeatedField($var, \Google\Protobuf\Internal\GPBType::MESSAGE, \Google\Protobuf\Internal\FieldDescriptorProto::class);
-        $this->extension = $arr;
-
-        return $this;
-    }
-
-    /**
-     * Generated from protobuf field <code>optional .google.protobuf.FileOptions options = 8;</code>
-     * @return \Google\Protobuf\Internal\FileOptions|null
-     */
-    public function getOptions()
-    {
-        return $this->options;
-    }
-
-    public function hasOptions()
-    {
-        return isset($this->options);
-    }
-
-    public function clearOptions()
-    {
-        unset($this->options);
-    }
-
-    /**
-     * Generated from protobuf field <code>optional .google.protobuf.FileOptions options = 8;</code>
-     * @param \Google\Protobuf\Internal\FileOptions $var
-     * @return $this
-     */
-    public function setOptions($var)
-    {
-        GPBUtil::checkMessage($var, \Google\Protobuf\Internal\FileOptions::class);
-        $this->options = $var;
-
-        return $this;
-    }
-
-    /**
-     * This field contains optional information about the original source code.
-     * You may safely remove this entire field without harming runtime
-     * functionality of the descriptors -- the information is needed only by
-     * development tools.
-     *
-     * Generated from protobuf field <code>optional .google.protobuf.SourceCodeInfo source_code_info = 9;</code>
-     * @return \Google\Protobuf\Internal\SourceCodeInfo|null
-     */
-    public function getSourceCodeInfo()
-    {
-        return $this->source_code_info;
-    }
-
-    public function hasSourceCodeInfo()
-    {
-        return isset($this->source_code_info);
-    }
-
-    public function clearSourceCodeInfo()
-    {
-        unset($this->source_code_info);
-    }
-
-    /**
-     * This field contains optional information about the original source code.
-     * You may safely remove this entire field without harming runtime
-     * functionality of the descriptors -- the information is needed only by
-     * development tools.
-     *
-     * Generated from protobuf field <code>optional .google.protobuf.SourceCodeInfo source_code_info = 9;</code>
-     * @param \Google\Protobuf\Internal\SourceCodeInfo $var
-     * @return $this
-     */
-    public function setSourceCodeInfo($var)
-    {
-        GPBUtil::checkMessage($var, \Google\Protobuf\Internal\SourceCodeInfo::class);
-        $this->source_code_info = $var;
-
-        return $this;
-    }
-
-    /**
-     * The syntax of the proto file.
-     * The supported values are "proto2" and "proto3".
-     *
-     * Generated from protobuf field <code>optional string syntax = 12;</code>
-     * @return string
-     */
-    public function getSyntax()
-    {
-        return isset($this->syntax) ? $this->syntax : '';
-    }
-
-    public function hasSyntax()
-    {
-        return isset($this->syntax);
-    }
-
-    public function clearSyntax()
-    {
-        unset($this->syntax);
-    }
-
-    /**
-     * The syntax of the proto file.
-     * The supported values are "proto2" and "proto3".
-     *
-     * Generated from protobuf field <code>optional string syntax = 12;</code>
-     * @param string $var
-     * @return $this
-     */
-    public function setSyntax($var)
-    {
-        GPBUtil::checkString($var, True);
-        $this->syntax = $var;
-
-        return $this;
-    }
-
-}
-
diff --git a/libs/protobuf/php/src/Google/Protobuf/Internal/FileDescriptorSet.php b/libs/protobuf/php/src/Google/Protobuf/Internal/FileDescriptorSet.php
deleted file mode 100644
index 1dae6fb..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/Internal/FileDescriptorSet.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: google/protobuf/descriptor.proto
-
-namespace Google\Protobuf\Internal;
-
-use Google\Protobuf\Internal\GPBType;
-use Google\Protobuf\Internal\GPBWire;
-use Google\Protobuf\Internal\RepeatedField;
-use Google\Protobuf\Internal\InputStream;
-use Google\Protobuf\Internal\GPBUtil;
-
-/**
- * The protocol compiler can output a FileDescriptorSet containing the .proto
- * files it parses.
- *
- * Generated from protobuf message <code>google.protobuf.FileDescriptorSet</code>
- */
-class FileDescriptorSet extends \Google\Protobuf\Internal\Message
-{
-    /**
-     * Generated from protobuf field <code>repeated .google.protobuf.FileDescriptorProto file = 1;</code>
-     */
-    private $file;
-
-    /**
-     * Constructor.
-     *
-     * @param array $data {
-     *     Optional. Data for populating the Message object.
-     *
-     *     @type array<\Google\Protobuf\Internal\FileDescriptorProto>|\Google\Protobuf\Internal\RepeatedField $file
-     * }
-     */
-    public function __construct($data = NULL) {
-        \GPBMetadata\Google\Protobuf\Internal\Descriptor::initOnce();
-        parent::__construct($data);
-    }
-
-    /**
-     * Generated from protobuf field <code>repeated .google.protobuf.FileDescriptorProto file = 1;</code>
-     * @return \Google\Protobuf\Internal\RepeatedField
-     */
-    public function getFile()
-    {
-        return $this->file;
-    }
-
-    /**
-     * Generated from protobuf field <code>repeated .google.protobuf.FileDescriptorProto file = 1;</code>
-     * @param array<\Google\Protobuf\Internal\FileDescriptorProto>|\Google\Protobuf\Internal\RepeatedField $var
-     * @return $this
-     */
-    public function setFile($var)
-    {
-        $arr = GPBUtil::checkRepeatedField($var, \Google\Protobuf\Internal\GPBType::MESSAGE, \Google\Protobuf\Internal\FileDescriptorProto::class);
-        $this->file = $arr;
-
-        return $this;
-    }
-
-}
-
diff --git a/libs/protobuf/php/src/Google/Protobuf/Internal/FileOptions.php b/libs/protobuf/php/src/Google/Protobuf/Internal/FileOptions.php
deleted file mode 100644
index 43931be..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/Internal/FileOptions.php
+++ /dev/null
@@ -1,1106 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: google/protobuf/descriptor.proto
-
-namespace Google\Protobuf\Internal;
-
-use Google\Protobuf\Internal\GPBType;
-use Google\Protobuf\Internal\GPBWire;
-use Google\Protobuf\Internal\RepeatedField;
-use Google\Protobuf\Internal\InputStream;
-use Google\Protobuf\Internal\GPBUtil;
-
-/**
- * Generated from protobuf message <code>google.protobuf.FileOptions</code>
- */
-class FileOptions extends \Google\Protobuf\Internal\Message
-{
-    /**
-     * Sets the Java package where classes generated from this .proto will be
-     * placed.  By default, the proto package is used, but this is often
-     * inappropriate because proto packages do not normally start with backwards
-     * domain names.
-     *
-     * Generated from protobuf field <code>optional string java_package = 1;</code>
-     */
-    protected $java_package = null;
-    /**
-     * Controls the name of the wrapper Java class generated for the .proto file.
-     * That class will always contain the .proto file's getDescriptor() method as
-     * well as any top-level extensions defined in the .proto file.
-     * If java_multiple_files is disabled, then all the other classes from the
-     * .proto file will be nested inside the single wrapper outer class.
-     *
-     * Generated from protobuf field <code>optional string java_outer_classname = 8;</code>
-     */
-    protected $java_outer_classname = null;
-    /**
-     * If enabled, then the Java code generator will generate a separate .java
-     * file for each top-level message, enum, and service defined in the .proto
-     * file.  Thus, these types will *not* be nested inside the wrapper class
-     * named by java_outer_classname.  However, the wrapper class will still be
-     * generated to contain the file's getDescriptor() method as well as any
-     * top-level extensions defined in the file.
-     *
-     * Generated from protobuf field <code>optional bool java_multiple_files = 10 [default = false];</code>
-     */
-    protected $java_multiple_files = null;
-    /**
-     * This option does nothing.
-     *
-     * Generated from protobuf field <code>optional bool java_generate_equals_and_hash = 20 [deprecated = true];</code>
-     * @deprecated
-     */
-    protected $java_generate_equals_and_hash = null;
-    /**
-     * If set true, then the Java2 code generator will generate code that
-     * throws an exception whenever an attempt is made to assign a non-UTF-8
-     * byte sequence to a string field.
-     * Message reflection will do the same.
-     * However, an extension field still accepts non-UTF-8 byte sequences.
-     * This option has no effect on when used with the lite runtime.
-     *
-     * Generated from protobuf field <code>optional bool java_string_check_utf8 = 27 [default = false];</code>
-     */
-    protected $java_string_check_utf8 = null;
-    /**
-     * Generated from protobuf field <code>optional .google.protobuf.FileOptions.OptimizeMode optimize_for = 9 [default = SPEED];</code>
-     */
-    protected $optimize_for = null;
-    /**
-     * Sets the Go package where structs generated from this .proto will be
-     * placed. If omitted, the Go package will be derived from the following:
-     *   - The basename of the package import path, if provided.
-     *   - Otherwise, the package statement in the .proto file, if present.
-     *   - Otherwise, the basename of the .proto file, without extension.
-     *
-     * Generated from protobuf field <code>optional string go_package = 11;</code>
-     */
-    protected $go_package = null;
-    /**
-     * Should generic services be generated in each language?  "Generic" services
-     * are not specific to any particular RPC system.  They are generated by the
-     * main code generators in each language (without additional plugins).
-     * Generic services were the only kind of service generation supported by
-     * early versions of google.protobuf.
-     * Generic services are now considered deprecated in favor of using plugins
-     * that generate code specific to your particular RPC system.  Therefore,
-     * these default to false.  Old code which depends on generic services should
-     * explicitly set them to true.
-     *
-     * Generated from protobuf field <code>optional bool cc_generic_services = 16 [default = false];</code>
-     */
-    protected $cc_generic_services = null;
-    /**
-     * Generated from protobuf field <code>optional bool java_generic_services = 17 [default = false];</code>
-     */
-    protected $java_generic_services = null;
-    /**
-     * Generated from protobuf field <code>optional bool py_generic_services = 18 [default = false];</code>
-     */
-    protected $py_generic_services = null;
-    /**
-     * Generated from protobuf field <code>optional bool php_generic_services = 42 [default = false];</code>
-     */
-    protected $php_generic_services = null;
-    /**
-     * Is this file deprecated?
-     * Depending on the target platform, this can emit Deprecated annotations
-     * for everything in the file, or it will be completely ignored; in the very
-     * least, this is a formalization for deprecating files.
-     *
-     * Generated from protobuf field <code>optional bool deprecated = 23 [default = false];</code>
-     */
-    protected $deprecated = null;
-    /**
-     * Enables the use of arenas for the proto messages in this file. This applies
-     * only to generated classes for C++.
-     *
-     * Generated from protobuf field <code>optional bool cc_enable_arenas = 31 [default = true];</code>
-     */
-    protected $cc_enable_arenas = null;
-    /**
-     * Sets the objective c class prefix which is prepended to all objective c
-     * generated classes from this .proto. There is no default.
-     *
-     * Generated from protobuf field <code>optional string objc_class_prefix = 36;</code>
-     */
-    protected $objc_class_prefix = null;
-    /**
-     * Namespace for generated classes; defaults to the package.
-     *
-     * Generated from protobuf field <code>optional string csharp_namespace = 37;</code>
-     */
-    protected $csharp_namespace = null;
-    /**
-     * By default Swift generators will take the proto package and CamelCase it
-     * replacing '.' with underscore and use that to prefix the types/symbols
-     * defined. When this options is provided, they will use this value instead
-     * to prefix the types/symbols defined.
-     *
-     * Generated from protobuf field <code>optional string swift_prefix = 39;</code>
-     */
-    protected $swift_prefix = null;
-    /**
-     * Sets the php class prefix which is prepended to all php generated classes
-     * from this .proto. Default is empty.
-     *
-     * Generated from protobuf field <code>optional string php_class_prefix = 40;</code>
-     */
-    protected $php_class_prefix = null;
-    /**
-     * Use this option to change the namespace of php generated classes. Default
-     * is empty. When this option is empty, the package name will be used for
-     * determining the namespace.
-     *
-     * Generated from protobuf field <code>optional string php_namespace = 41;</code>
-     */
-    protected $php_namespace = null;
-    /**
-     * Use this option to change the namespace of php generated metadata classes.
-     * Default is empty. When this option is empty, the proto file name will be
-     * used for determining the namespace.
-     *
-     * Generated from protobuf field <code>optional string php_metadata_namespace = 44;</code>
-     */
-    protected $php_metadata_namespace = null;
-    /**
-     * Use this option to change the package of ruby generated classes. Default
-     * is empty. When this option is not set, the package name will be used for
-     * determining the ruby package.
-     *
-     * Generated from protobuf field <code>optional string ruby_package = 45;</code>
-     */
-    protected $ruby_package = null;
-    /**
-     * The parser stores options it doesn't recognize here.
-     * See the documentation for the "Options" section above.
-     *
-     * Generated from protobuf field <code>repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;</code>
-     */
-    private $uninterpreted_option;
-
-    /**
-     * Constructor.
-     *
-     * @param array $data {
-     *     Optional. Data for populating the Message object.
-     *
-     *     @type string $java_package
-     *           Sets the Java package where classes generated from this .proto will be
-     *           placed.  By default, the proto package is used, but this is often
-     *           inappropriate because proto packages do not normally start with backwards
-     *           domain names.
-     *     @type string $java_outer_classname
-     *           Controls the name of the wrapper Java class generated for the .proto file.
-     *           That class will always contain the .proto file's getDescriptor() method as
-     *           well as any top-level extensions defined in the .proto file.
-     *           If java_multiple_files is disabled, then all the other classes from the
-     *           .proto file will be nested inside the single wrapper outer class.
-     *     @type bool $java_multiple_files
-     *           If enabled, then the Java code generator will generate a separate .java
-     *           file for each top-level message, enum, and service defined in the .proto
-     *           file.  Thus, these types will *not* be nested inside the wrapper class
-     *           named by java_outer_classname.  However, the wrapper class will still be
-     *           generated to contain the file's getDescriptor() method as well as any
-     *           top-level extensions defined in the file.
-     *     @type bool $java_generate_equals_and_hash
-     *           This option does nothing.
-     *     @type bool $java_string_check_utf8
-     *           If set true, then the Java2 code generator will generate code that
-     *           throws an exception whenever an attempt is made to assign a non-UTF-8
-     *           byte sequence to a string field.
-     *           Message reflection will do the same.
-     *           However, an extension field still accepts non-UTF-8 byte sequences.
-     *           This option has no effect on when used with the lite runtime.
-     *     @type int $optimize_for
-     *     @type string $go_package
-     *           Sets the Go package where structs generated from this .proto will be
-     *           placed. If omitted, the Go package will be derived from the following:
-     *             - The basename of the package import path, if provided.
-     *             - Otherwise, the package statement in the .proto file, if present.
-     *             - Otherwise, the basename of the .proto file, without extension.
-     *     @type bool $cc_generic_services
-     *           Should generic services be generated in each language?  "Generic" services
-     *           are not specific to any particular RPC system.  They are generated by the
-     *           main code generators in each language (without additional plugins).
-     *           Generic services were the only kind of service generation supported by
-     *           early versions of google.protobuf.
-     *           Generic services are now considered deprecated in favor of using plugins
-     *           that generate code specific to your particular RPC system.  Therefore,
-     *           these default to false.  Old code which depends on generic services should
-     *           explicitly set them to true.
-     *     @type bool $java_generic_services
-     *     @type bool $py_generic_services
-     *     @type bool $php_generic_services
-     *     @type bool $deprecated
-     *           Is this file deprecated?
-     *           Depending on the target platform, this can emit Deprecated annotations
-     *           for everything in the file, or it will be completely ignored; in the very
-     *           least, this is a formalization for deprecating files.
-     *     @type bool $cc_enable_arenas
-     *           Enables the use of arenas for the proto messages in this file. This applies
-     *           only to generated classes for C++.
-     *     @type string $objc_class_prefix
-     *           Sets the objective c class prefix which is prepended to all objective c
-     *           generated classes from this .proto. There is no default.
-     *     @type string $csharp_namespace
-     *           Namespace for generated classes; defaults to the package.
-     *     @type string $swift_prefix
-     *           By default Swift generators will take the proto package and CamelCase it
-     *           replacing '.' with underscore and use that to prefix the types/symbols
-     *           defined. When this options is provided, they will use this value instead
-     *           to prefix the types/symbols defined.
-     *     @type string $php_class_prefix
-     *           Sets the php class prefix which is prepended to all php generated classes
-     *           from this .proto. Default is empty.
-     *     @type string $php_namespace
-     *           Use this option to change the namespace of php generated classes. Default
-     *           is empty. When this option is empty, the package name will be used for
-     *           determining the namespace.
-     *     @type string $php_metadata_namespace
-     *           Use this option to change the namespace of php generated metadata classes.
-     *           Default is empty. When this option is empty, the proto file name will be
-     *           used for determining the namespace.
-     *     @type string $ruby_package
-     *           Use this option to change the package of ruby generated classes. Default
-     *           is empty. When this option is not set, the package name will be used for
-     *           determining the ruby package.
-     *     @type array<\Google\Protobuf\Internal\UninterpretedOption>|\Google\Protobuf\Internal\RepeatedField $uninterpreted_option
-     *           The parser stores options it doesn't recognize here.
-     *           See the documentation for the "Options" section above.
-     * }
-     */
-    public function __construct($data = NULL) {
-        \GPBMetadata\Google\Protobuf\Internal\Descriptor::initOnce();
-        parent::__construct($data);
-    }
-
-    /**
-     * Sets the Java package where classes generated from this .proto will be
-     * placed.  By default, the proto package is used, but this is often
-     * inappropriate because proto packages do not normally start with backwards
-     * domain names.
-     *
-     * Generated from protobuf field <code>optional string java_package = 1;</code>
-     * @return string
-     */
-    public function getJavaPackage()
-    {
-        return isset($this->java_package) ? $this->java_package : '';
-    }
-
-    public function hasJavaPackage()
-    {
-        return isset($this->java_package);
-    }
-
-    public function clearJavaPackage()
-    {
-        unset($this->java_package);
-    }
-
-    /**
-     * Sets the Java package where classes generated from this .proto will be
-     * placed.  By default, the proto package is used, but this is often
-     * inappropriate because proto packages do not normally start with backwards
-     * domain names.
-     *
-     * Generated from protobuf field <code>optional string java_package = 1;</code>
-     * @param string $var
-     * @return $this
-     */
-    public function setJavaPackage($var)
-    {
-        GPBUtil::checkString($var, True);
-        $this->java_package = $var;
-
-        return $this;
-    }
-
-    /**
-     * Controls the name of the wrapper Java class generated for the .proto file.
-     * That class will always contain the .proto file's getDescriptor() method as
-     * well as any top-level extensions defined in the .proto file.
-     * If java_multiple_files is disabled, then all the other classes from the
-     * .proto file will be nested inside the single wrapper outer class.
-     *
-     * Generated from protobuf field <code>optional string java_outer_classname = 8;</code>
-     * @return string
-     */
-    public function getJavaOuterClassname()
-    {
-        return isset($this->java_outer_classname) ? $this->java_outer_classname : '';
-    }
-
-    public function hasJavaOuterClassname()
-    {
-        return isset($this->java_outer_classname);
-    }
-
-    public function clearJavaOuterClassname()
-    {
-        unset($this->java_outer_classname);
-    }
-
-    /**
-     * Controls the name of the wrapper Java class generated for the .proto file.
-     * That class will always contain the .proto file's getDescriptor() method as
-     * well as any top-level extensions defined in the .proto file.
-     * If java_multiple_files is disabled, then all the other classes from the
-     * .proto file will be nested inside the single wrapper outer class.
-     *
-     * Generated from protobuf field <code>optional string java_outer_classname = 8;</code>
-     * @param string $var
-     * @return $this
-     */
-    public function setJavaOuterClassname($var)
-    {
-        GPBUtil::checkString($var, True);
-        $this->java_outer_classname = $var;
-
-        return $this;
-    }
-
-    /**
-     * If enabled, then the Java code generator will generate a separate .java
-     * file for each top-level message, enum, and service defined in the .proto
-     * file.  Thus, these types will *not* be nested inside the wrapper class
-     * named by java_outer_classname.  However, the wrapper class will still be
-     * generated to contain the file's getDescriptor() method as well as any
-     * top-level extensions defined in the file.
-     *
-     * Generated from protobuf field <code>optional bool java_multiple_files = 10 [default = false];</code>
-     * @return bool
-     */
-    public function getJavaMultipleFiles()
-    {
-        return isset($this->java_multiple_files) ? $this->java_multiple_files : false;
-    }
-
-    public function hasJavaMultipleFiles()
-    {
-        return isset($this->java_multiple_files);
-    }
-
-    public function clearJavaMultipleFiles()
-    {
-        unset($this->java_multiple_files);
-    }
-
-    /**
-     * If enabled, then the Java code generator will generate a separate .java
-     * file for each top-level message, enum, and service defined in the .proto
-     * file.  Thus, these types will *not* be nested inside the wrapper class
-     * named by java_outer_classname.  However, the wrapper class will still be
-     * generated to contain the file's getDescriptor() method as well as any
-     * top-level extensions defined in the file.
-     *
-     * Generated from protobuf field <code>optional bool java_multiple_files = 10 [default = false];</code>
-     * @param bool $var
-     * @return $this
-     */
-    public function setJavaMultipleFiles($var)
-    {
-        GPBUtil::checkBool($var);
-        $this->java_multiple_files = $var;
-
-        return $this;
-    }
-
-    /**
-     * This option does nothing.
-     *
-     * Generated from protobuf field <code>optional bool java_generate_equals_and_hash = 20 [deprecated = true];</code>
-     * @return bool
-     * @deprecated
-     */
-    public function getJavaGenerateEqualsAndHash()
-    {
-        @trigger_error('java_generate_equals_and_hash is deprecated.', E_USER_DEPRECATED);
-        return isset($this->java_generate_equals_and_hash) ? $this->java_generate_equals_and_hash : false;
-    }
-
-    public function hasJavaGenerateEqualsAndHash()
-    {
-        @trigger_error('java_generate_equals_and_hash is deprecated.', E_USER_DEPRECATED);
-        return isset($this->java_generate_equals_and_hash);
-    }
-
-    public function clearJavaGenerateEqualsAndHash()
-    {
-        @trigger_error('java_generate_equals_and_hash is deprecated.', E_USER_DEPRECATED);
-        unset($this->java_generate_equals_and_hash);
-    }
-
-    /**
-     * This option does nothing.
-     *
-     * Generated from protobuf field <code>optional bool java_generate_equals_and_hash = 20 [deprecated = true];</code>
-     * @param bool $var
-     * @return $this
-     * @deprecated
-     */
-    public function setJavaGenerateEqualsAndHash($var)
-    {
-        @trigger_error('java_generate_equals_and_hash is deprecated.', E_USER_DEPRECATED);
-        GPBUtil::checkBool($var);
-        $this->java_generate_equals_and_hash = $var;
-
-        return $this;
-    }
-
-    /**
-     * If set true, then the Java2 code generator will generate code that
-     * throws an exception whenever an attempt is made to assign a non-UTF-8
-     * byte sequence to a string field.
-     * Message reflection will do the same.
-     * However, an extension field still accepts non-UTF-8 byte sequences.
-     * This option has no effect on when used with the lite runtime.
-     *
-     * Generated from protobuf field <code>optional bool java_string_check_utf8 = 27 [default = false];</code>
-     * @return bool
-     */
-    public function getJavaStringCheckUtf8()
-    {
-        return isset($this->java_string_check_utf8) ? $this->java_string_check_utf8 : false;
-    }
-
-    public function hasJavaStringCheckUtf8()
-    {
-        return isset($this->java_string_check_utf8);
-    }
-
-    public function clearJavaStringCheckUtf8()
-    {
-        unset($this->java_string_check_utf8);
-    }
-
-    /**
-     * If set true, then the Java2 code generator will generate code that
-     * throws an exception whenever an attempt is made to assign a non-UTF-8
-     * byte sequence to a string field.
-     * Message reflection will do the same.
-     * However, an extension field still accepts non-UTF-8 byte sequences.
-     * This option has no effect on when used with the lite runtime.
-     *
-     * Generated from protobuf field <code>optional bool java_string_check_utf8 = 27 [default = false];</code>
-     * @param bool $var
-     * @return $this
-     */
-    public function setJavaStringCheckUtf8($var)
-    {
-        GPBUtil::checkBool($var);
-        $this->java_string_check_utf8 = $var;
-
-        return $this;
-    }
-
-    /**
-     * Generated from protobuf field <code>optional .google.protobuf.FileOptions.OptimizeMode optimize_for = 9 [default = SPEED];</code>
-     * @return int
-     */
-    public function getOptimizeFor()
-    {
-        return isset($this->optimize_for) ? $this->optimize_for : 0;
-    }
-
-    public function hasOptimizeFor()
-    {
-        return isset($this->optimize_for);
-    }
-
-    public function clearOptimizeFor()
-    {
-        unset($this->optimize_for);
-    }
-
-    /**
-     * Generated from protobuf field <code>optional .google.protobuf.FileOptions.OptimizeMode optimize_for = 9 [default = SPEED];</code>
-     * @param int $var
-     * @return $this
-     */
-    public function setOptimizeFor($var)
-    {
-        GPBUtil::checkEnum($var, \Google\Protobuf\Internal\FileOptions\OptimizeMode::class);
-        $this->optimize_for = $var;
-
-        return $this;
-    }
-
-    /**
-     * Sets the Go package where structs generated from this .proto will be
-     * placed. If omitted, the Go package will be derived from the following:
-     *   - The basename of the package import path, if provided.
-     *   - Otherwise, the package statement in the .proto file, if present.
-     *   - Otherwise, the basename of the .proto file, without extension.
-     *
-     * Generated from protobuf field <code>optional string go_package = 11;</code>
-     * @return string
-     */
-    public function getGoPackage()
-    {
-        return isset($this->go_package) ? $this->go_package : '';
-    }
-
-    public function hasGoPackage()
-    {
-        return isset($this->go_package);
-    }
-
-    public function clearGoPackage()
-    {
-        unset($this->go_package);
-    }
-
-    /**
-     * Sets the Go package where structs generated from this .proto will be
-     * placed. If omitted, the Go package will be derived from the following:
-     *   - The basename of the package import path, if provided.
-     *   - Otherwise, the package statement in the .proto file, if present.
-     *   - Otherwise, the basename of the .proto file, without extension.
-     *
-     * Generated from protobuf field <code>optional string go_package = 11;</code>
-     * @param string $var
-     * @return $this
-     */
-    public function setGoPackage($var)
-    {
-        GPBUtil::checkString($var, True);
-        $this->go_package = $var;
-
-        return $this;
-    }
-
-    /**
-     * Should generic services be generated in each language?  "Generic" services
-     * are not specific to any particular RPC system.  They are generated by the
-     * main code generators in each language (without additional plugins).
-     * Generic services were the only kind of service generation supported by
-     * early versions of google.protobuf.
-     * Generic services are now considered deprecated in favor of using plugins
-     * that generate code specific to your particular RPC system.  Therefore,
-     * these default to false.  Old code which depends on generic services should
-     * explicitly set them to true.
-     *
-     * Generated from protobuf field <code>optional bool cc_generic_services = 16 [default = false];</code>
-     * @return bool
-     */
-    public function getCcGenericServices()
-    {
-        return isset($this->cc_generic_services) ? $this->cc_generic_services : false;
-    }
-
-    public function hasCcGenericServices()
-    {
-        return isset($this->cc_generic_services);
-    }
-
-    public function clearCcGenericServices()
-    {
-        unset($this->cc_generic_services);
-    }
-
-    /**
-     * Should generic services be generated in each language?  "Generic" services
-     * are not specific to any particular RPC system.  They are generated by the
-     * main code generators in each language (without additional plugins).
-     * Generic services were the only kind of service generation supported by
-     * early versions of google.protobuf.
-     * Generic services are now considered deprecated in favor of using plugins
-     * that generate code specific to your particular RPC system.  Therefore,
-     * these default to false.  Old code which depends on generic services should
-     * explicitly set them to true.
-     *
-     * Generated from protobuf field <code>optional bool cc_generic_services = 16 [default = false];</code>
-     * @param bool $var
-     * @return $this
-     */
-    public function setCcGenericServices($var)
-    {
-        GPBUtil::checkBool($var);
-        $this->cc_generic_services = $var;
-
-        return $this;
-    }
-
-    /**
-     * Generated from protobuf field <code>optional bool java_generic_services = 17 [default = false];</code>
-     * @return bool
-     */
-    public function getJavaGenericServices()
-    {
-        return isset($this->java_generic_services) ? $this->java_generic_services : false;
-    }
-
-    public function hasJavaGenericServices()
-    {
-        return isset($this->java_generic_services);
-    }
-
-    public function clearJavaGenericServices()
-    {
-        unset($this->java_generic_services);
-    }
-
-    /**
-     * Generated from protobuf field <code>optional bool java_generic_services = 17 [default = false];</code>
-     * @param bool $var
-     * @return $this
-     */
-    public function setJavaGenericServices($var)
-    {
-        GPBUtil::checkBool($var);
-        $this->java_generic_services = $var;
-
-        return $this;
-    }
-
-    /**
-     * Generated from protobuf field <code>optional bool py_generic_services = 18 [default = false];</code>
-     * @return bool
-     */
-    public function getPyGenericServices()
-    {
-        return isset($this->py_generic_services) ? $this->py_generic_services : false;
-    }
-
-    public function hasPyGenericServices()
-    {
-        return isset($this->py_generic_services);
-    }
-
-    public function clearPyGenericServices()
-    {
-        unset($this->py_generic_services);
-    }
-
-    /**
-     * Generated from protobuf field <code>optional bool py_generic_services = 18 [default = false];</code>
-     * @param bool $var
-     * @return $this
-     */
-    public function setPyGenericServices($var)
-    {
-        GPBUtil::checkBool($var);
-        $this->py_generic_services = $var;
-
-        return $this;
-    }
-
-    /**
-     * Generated from protobuf field <code>optional bool php_generic_services = 42 [default = false];</code>
-     * @return bool
-     */
-    public function getPhpGenericServices()
-    {
-        return isset($this->php_generic_services) ? $this->php_generic_services : false;
-    }
-
-    public function hasPhpGenericServices()
-    {
-        return isset($this->php_generic_services);
-    }
-
-    public function clearPhpGenericServices()
-    {
-        unset($this->php_generic_services);
-    }
-
-    /**
-     * Generated from protobuf field <code>optional bool php_generic_services = 42 [default = false];</code>
-     * @param bool $var
-     * @return $this
-     */
-    public function setPhpGenericServices($var)
-    {
-        GPBUtil::checkBool($var);
-        $this->php_generic_services = $var;
-
-        return $this;
-    }
-
-    /**
-     * Is this file deprecated?
-     * Depending on the target platform, this can emit Deprecated annotations
-     * for everything in the file, or it will be completely ignored; in the very
-     * least, this is a formalization for deprecating files.
-     *
-     * Generated from protobuf field <code>optional bool deprecated = 23 [default = false];</code>
-     * @return bool
-     */
-    public function getDeprecated()
-    {
-        return isset($this->deprecated) ? $this->deprecated : false;
-    }
-
-    public function hasDeprecated()
-    {
-        return isset($this->deprecated);
-    }
-
-    public function clearDeprecated()
-    {
-        unset($this->deprecated);
-    }
-
-    /**
-     * Is this file deprecated?
-     * Depending on the target platform, this can emit Deprecated annotations
-     * for everything in the file, or it will be completely ignored; in the very
-     * least, this is a formalization for deprecating files.
-     *
-     * Generated from protobuf field <code>optional bool deprecated = 23 [default = false];</code>
-     * @param bool $var
-     * @return $this
-     */
-    public function setDeprecated($var)
-    {
-        GPBUtil::checkBool($var);
-        $this->deprecated = $var;
-
-        return $this;
-    }
-
-    /**
-     * Enables the use of arenas for the proto messages in this file. This applies
-     * only to generated classes for C++.
-     *
-     * Generated from protobuf field <code>optional bool cc_enable_arenas = 31 [default = true];</code>
-     * @return bool
-     */
-    public function getCcEnableArenas()
-    {
-        return isset($this->cc_enable_arenas) ? $this->cc_enable_arenas : false;
-    }
-
-    public function hasCcEnableArenas()
-    {
-        return isset($this->cc_enable_arenas);
-    }
-
-    public function clearCcEnableArenas()
-    {
-        unset($this->cc_enable_arenas);
-    }
-
-    /**
-     * Enables the use of arenas for the proto messages in this file. This applies
-     * only to generated classes for C++.
-     *
-     * Generated from protobuf field <code>optional bool cc_enable_arenas = 31 [default = true];</code>
-     * @param bool $var
-     * @return $this
-     */
-    public function setCcEnableArenas($var)
-    {
-        GPBUtil::checkBool($var);
-        $this->cc_enable_arenas = $var;
-
-        return $this;
-    }
-
-    /**
-     * Sets the objective c class prefix which is prepended to all objective c
-     * generated classes from this .proto. There is no default.
-     *
-     * Generated from protobuf field <code>optional string objc_class_prefix = 36;</code>
-     * @return string
-     */
-    public function getObjcClassPrefix()
-    {
-        return isset($this->objc_class_prefix) ? $this->objc_class_prefix : '';
-    }
-
-    public function hasObjcClassPrefix()
-    {
-        return isset($this->objc_class_prefix);
-    }
-
-    public function clearObjcClassPrefix()
-    {
-        unset($this->objc_class_prefix);
-    }
-
-    /**
-     * Sets the objective c class prefix which is prepended to all objective c
-     * generated classes from this .proto. There is no default.
-     *
-     * Generated from protobuf field <code>optional string objc_class_prefix = 36;</code>
-     * @param string $var
-     * @return $this
-     */
-    public function setObjcClassPrefix($var)
-    {
-        GPBUtil::checkString($var, True);
-        $this->objc_class_prefix = $var;
-
-        return $this;
-    }
-
-    /**
-     * Namespace for generated classes; defaults to the package.
-     *
-     * Generated from protobuf field <code>optional string csharp_namespace = 37;</code>
-     * @return string
-     */
-    public function getCsharpNamespace()
-    {
-        return isset($this->csharp_namespace) ? $this->csharp_namespace : '';
-    }
-
-    public function hasCsharpNamespace()
-    {
-        return isset($this->csharp_namespace);
-    }
-
-    public function clearCsharpNamespace()
-    {
-        unset($this->csharp_namespace);
-    }
-
-    /**
-     * Namespace for generated classes; defaults to the package.
-     *
-     * Generated from protobuf field <code>optional string csharp_namespace = 37;</code>
-     * @param string $var
-     * @return $this
-     */
-    public function setCsharpNamespace($var)
-    {
-        GPBUtil::checkString($var, True);
-        $this->csharp_namespace = $var;
-
-        return $this;
-    }
-
-    /**
-     * By default Swift generators will take the proto package and CamelCase it
-     * replacing '.' with underscore and use that to prefix the types/symbols
-     * defined. When this options is provided, they will use this value instead
-     * to prefix the types/symbols defined.
-     *
-     * Generated from protobuf field <code>optional string swift_prefix = 39;</code>
-     * @return string
-     */
-    public function getSwiftPrefix()
-    {
-        return isset($this->swift_prefix) ? $this->swift_prefix : '';
-    }
-
-    public function hasSwiftPrefix()
-    {
-        return isset($this->swift_prefix);
-    }
-
-    public function clearSwiftPrefix()
-    {
-        unset($this->swift_prefix);
-    }
-
-    /**
-     * By default Swift generators will take the proto package and CamelCase it
-     * replacing '.' with underscore and use that to prefix the types/symbols
-     * defined. When this options is provided, they will use this value instead
-     * to prefix the types/symbols defined.
-     *
-     * Generated from protobuf field <code>optional string swift_prefix = 39;</code>
-     * @param string $var
-     * @return $this
-     */
-    public function setSwiftPrefix($var)
-    {
-        GPBUtil::checkString($var, True);
-        $this->swift_prefix = $var;
-
-        return $this;
-    }
-
-    /**
-     * Sets the php class prefix which is prepended to all php generated classes
-     * from this .proto. Default is empty.
-     *
-     * Generated from protobuf field <code>optional string php_class_prefix = 40;</code>
-     * @return string
-     */
-    public function getPhpClassPrefix()
-    {
-        return isset($this->php_class_prefix) ? $this->php_class_prefix : '';
-    }
-
-    public function hasPhpClassPrefix()
-    {
-        return isset($this->php_class_prefix);
-    }
-
-    public function clearPhpClassPrefix()
-    {
-        unset($this->php_class_prefix);
-    }
-
-    /**
-     * Sets the php class prefix which is prepended to all php generated classes
-     * from this .proto. Default is empty.
-     *
-     * Generated from protobuf field <code>optional string php_class_prefix = 40;</code>
-     * @param string $var
-     * @return $this
-     */
-    public function setPhpClassPrefix($var)
-    {
-        GPBUtil::checkString($var, True);
-        $this->php_class_prefix = $var;
-
-        return $this;
-    }
-
-    /**
-     * Use this option to change the namespace of php generated classes. Default
-     * is empty. When this option is empty, the package name will be used for
-     * determining the namespace.
-     *
-     * Generated from protobuf field <code>optional string php_namespace = 41;</code>
-     * @return string
-     */
-    public function getPhpNamespace()
-    {
-        return isset($this->php_namespace) ? $this->php_namespace : '';
-    }
-
-    public function hasPhpNamespace()
-    {
-        return isset($this->php_namespace);
-    }
-
-    public function clearPhpNamespace()
-    {
-        unset($this->php_namespace);
-    }
-
-    /**
-     * Use this option to change the namespace of php generated classes. Default
-     * is empty. When this option is empty, the package name will be used for
-     * determining the namespace.
-     *
-     * Generated from protobuf field <code>optional string php_namespace = 41;</code>
-     * @param string $var
-     * @return $this
-     */
-    public function setPhpNamespace($var)
-    {
-        GPBUtil::checkString($var, True);
-        $this->php_namespace = $var;
-
-        return $this;
-    }
-
-    /**
-     * Use this option to change the namespace of php generated metadata classes.
-     * Default is empty. When this option is empty, the proto file name will be
-     * used for determining the namespace.
-     *
-     * Generated from protobuf field <code>optional string php_metadata_namespace = 44;</code>
-     * @return string
-     */
-    public function getPhpMetadataNamespace()
-    {
-        return isset($this->php_metadata_namespace) ? $this->php_metadata_namespace : '';
-    }
-
-    public function hasPhpMetadataNamespace()
-    {
-        return isset($this->php_metadata_namespace);
-    }
-
-    public function clearPhpMetadataNamespace()
-    {
-        unset($this->php_metadata_namespace);
-    }
-
-    /**
-     * Use this option to change the namespace of php generated metadata classes.
-     * Default is empty. When this option is empty, the proto file name will be
-     * used for determining the namespace.
-     *
-     * Generated from protobuf field <code>optional string php_metadata_namespace = 44;</code>
-     * @param string $var
-     * @return $this
-     */
-    public function setPhpMetadataNamespace($var)
-    {
-        GPBUtil::checkString($var, True);
-        $this->php_metadata_namespace = $var;
-
-        return $this;
-    }
-
-    /**
-     * Use this option to change the package of ruby generated classes. Default
-     * is empty. When this option is not set, the package name will be used for
-     * determining the ruby package.
-     *
-     * Generated from protobuf field <code>optional string ruby_package = 45;</code>
-     * @return string
-     */
-    public function getRubyPackage()
-    {
-        return isset($this->ruby_package) ? $this->ruby_package : '';
-    }
-
-    public function hasRubyPackage()
-    {
-        return isset($this->ruby_package);
-    }
-
-    public function clearRubyPackage()
-    {
-        unset($this->ruby_package);
-    }
-
-    /**
-     * Use this option to change the package of ruby generated classes. Default
-     * is empty. When this option is not set, the package name will be used for
-     * determining the ruby package.
-     *
-     * Generated from protobuf field <code>optional string ruby_package = 45;</code>
-     * @param string $var
-     * @return $this
-     */
-    public function setRubyPackage($var)
-    {
-        GPBUtil::checkString($var, True);
-        $this->ruby_package = $var;
-
-        return $this;
-    }
-
-    /**
-     * The parser stores options it doesn't recognize here.
-     * See the documentation for the "Options" section above.
-     *
-     * Generated from protobuf field <code>repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;</code>
-     * @return \Google\Protobuf\Internal\RepeatedField
-     */
-    public function getUninterpretedOption()
-    {
-        return $this->uninterpreted_option;
-    }
-
-    /**
-     * The parser stores options it doesn't recognize here.
-     * See the documentation for the "Options" section above.
-     *
-     * Generated from protobuf field <code>repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;</code>
-     * @param array<\Google\Protobuf\Internal\UninterpretedOption>|\Google\Protobuf\Internal\RepeatedField $var
-     * @return $this
-     */
-    public function setUninterpretedOption($var)
-    {
-        $arr = GPBUtil::checkRepeatedField($var, \Google\Protobuf\Internal\GPBType::MESSAGE, \Google\Protobuf\Internal\UninterpretedOption::class);
-        $this->uninterpreted_option = $arr;
-
-        return $this;
-    }
-
-}
-
diff --git a/libs/protobuf/php/src/Google/Protobuf/Internal/FileOptions/OptimizeMode.php b/libs/protobuf/php/src/Google/Protobuf/Internal/FileOptions/OptimizeMode.php
deleted file mode 100644
index 0df27b5..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/Internal/FileOptions/OptimizeMode.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: google/protobuf/descriptor.proto
-
-namespace Google\Protobuf\Internal\FileOptions;
-
-use UnexpectedValueException;
-
-/**
- * Generated classes can be optimized for speed or code size.
- *
- * Protobuf type <code>google.protobuf.FileOptions.OptimizeMode</code>
- */
-class OptimizeMode
-{
-    /**
-     * Generate complete code for parsing, serialization,
-     *
-     * Generated from protobuf enum <code>SPEED = 1;</code>
-     */
-    const SPEED = 1;
-    /**
-     * etc.
-     *
-     * Generated from protobuf enum <code>CODE_SIZE = 2;</code>
-     */
-    const CODE_SIZE = 2;
-    /**
-     * Generate code using MessageLite and the lite runtime.
-     *
-     * Generated from protobuf enum <code>LITE_RUNTIME = 3;</code>
-     */
-    const LITE_RUNTIME = 3;
-
-    private static $valueToName = [
-        self::SPEED => 'SPEED',
-        self::CODE_SIZE => 'CODE_SIZE',
-        self::LITE_RUNTIME => 'LITE_RUNTIME',
-    ];
-
-    public static function name($value)
-    {
-        if (!isset(self::$valueToName[$value])) {
-            throw new UnexpectedValueException(sprintf(
-                    'Enum %s has no name defined for value %s', __CLASS__, $value));
-        }
-        return self::$valueToName[$value];
-    }
-
-
-    public static function value($name)
-    {
-        $const = __CLASS__ . '::' . strtoupper($name);
-        if (!defined($const)) {
-            throw new UnexpectedValueException(sprintf(
-                    'Enum %s has no value defined for name %s', __CLASS__, $name));
-        }
-        return constant($const);
-    }
-}
-
-// Adding a class alias for backwards compatibility with the previous class name.
-class_alias(OptimizeMode::class, \Google\Protobuf\Internal\FileOptions_OptimizeMode::class);
-
diff --git a/libs/protobuf/php/src/Google/Protobuf/Internal/FileOptions_OptimizeMode.php b/libs/protobuf/php/src/Google/Protobuf/Internal/FileOptions_OptimizeMode.php
deleted file mode 100644
index 8926e63..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/Internal/FileOptions_OptimizeMode.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: google/protobuf/descriptor.proto
-
-namespace Google\Protobuf\Internal;
-
-if (false) {
-    /**
-     * This class is deprecated. Use Google\Protobuf\Internal\FileOptions\OptimizeMode instead.
-     * @deprecated
-     */
-    class FileOptions_OptimizeMode {}
-}
-class_exists(FileOptions\OptimizeMode::class);
-@trigger_error('Google\Protobuf\Internal\FileOptions_OptimizeMode is deprecated and will be removed in the next major release. Use Google\Protobuf\Internal\FileOptions\OptimizeMode instead', E_USER_DEPRECATED);
-
diff --git a/libs/protobuf/php/src/Google/Protobuf/Internal/GPBDecodeException.php b/libs/protobuf/php/src/Google/Protobuf/Internal/GPBDecodeException.php
deleted file mode 100644
index 402d542..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/Internal/GPBDecodeException.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-namespace Google\Protobuf\Internal;
-
-class GPBDecodeException extends \Exception
-{
-    public function __construct(
-        $message,
-        $code = 0,
-        \Exception $previous = null)
-    {
-        parent::__construct(
-            "Error occurred during parsing: " . $message,
-            $code,
-            $previous);
-    }
-}
diff --git a/libs/protobuf/php/src/Google/Protobuf/Internal/GPBJsonWire.php b/libs/protobuf/php/src/Google/Protobuf/Internal/GPBJsonWire.php
deleted file mode 100644
index 43f4745..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/Internal/GPBJsonWire.php
+++ /dev/null
@@ -1,304 +0,0 @@
-<?php
-
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-namespace Google\Protobuf\Internal;
-
-class GPBJsonWire
-{
-
-    public static function serializeFieldToStream(
-        $value,
-        $field,
-        &$output, $has_field_name = true)
-    {
-        if ($has_field_name) {
-            $output->writeRaw("\"", 1);
-            $field_name = GPBJsonWire::formatFieldName($field);
-            $output->writeRaw($field_name, strlen($field_name));
-            $output->writeRaw("\":", 2);
-        }
-        return static::serializeFieldValueToStream(
-            $value,
-            $field,
-            $output,
-            !$has_field_name);
-    }
-
-    public static function serializeFieldValueToStream(
-        $values,
-        $field,
-        &$output,
-        $is_well_known = false)
-    {
-        if ($field->isMap()) {
-            $output->writeRaw("{", 1);
-            $first = true;
-            $map_entry = $field->getMessageType();
-            $key_field = $map_entry->getFieldByNumber(1);
-            $value_field = $map_entry->getFieldByNumber(2);
-
-            switch ($key_field->getType()) {
-            case GPBType::STRING:
-            case GPBType::SFIXED64:
-            case GPBType::INT64:
-            case GPBType::SINT64:
-            case GPBType::FIXED64:
-            case GPBType::UINT64:
-                $additional_quote = false;
-                break;
-            default:
-                $additional_quote = true;
-            }
-
-            foreach ($values as $key => $value) {
-                if ($first) {
-                    $first = false;
-                } else {
-                    $output->writeRaw(",", 1);
-                }
-                if ($additional_quote) {
-                    $output->writeRaw("\"", 1);
-                }
-                if (!static::serializeSingularFieldValueToStream(
-                    $key,
-                    $key_field,
-                    $output,
-                    $is_well_known)) {
-                    return false;
-                }
-                if ($additional_quote) {
-                    $output->writeRaw("\"", 1);
-                }
-                $output->writeRaw(":", 1);
-                if (!static::serializeSingularFieldValueToStream(
-                    $value,
-                    $value_field,
-                    $output,
-                    $is_well_known)) {
-                    return false;
-                }
-            }
-            $output->writeRaw("}", 1);
-            return true;
-        } elseif ($field->isRepeated()) {
-            $output->writeRaw("[", 1);
-            $first = true;
-            foreach ($values as $value) {
-                if ($first) {
-                    $first = false;
-                } else {
-                    $output->writeRaw(",", 1);
-                }
-                if (!static::serializeSingularFieldValueToStream(
-                    $value,
-                    $field,
-                    $output,
-                    $is_well_known)) {
-                    return false;
-                }
-            }
-            $output->writeRaw("]", 1);
-            return true;
-        } else {
-            return static::serializeSingularFieldValueToStream(
-                $values,
-                $field,
-                $output,
-                $is_well_known);
-        }
-    }
-
-    private static function serializeSingularFieldValueToStream(
-        $value,
-        $field,
-        &$output, $is_well_known = false)
-    {
-        switch ($field->getType()) {
-            case GPBType::SFIXED32:
-            case GPBType::SINT32:
-            case GPBType::INT32:
-                $str_value = strval($value);
-                $output->writeRaw($str_value, strlen($str_value));
-                break;
-            case GPBType::FIXED32:
-            case GPBType::UINT32:
-                if ($value < 0) {
-                    $value = bcadd($value, "4294967296");
-                }
-                $str_value = strval($value);
-                $output->writeRaw($str_value, strlen($str_value));
-                break;
-            case GPBType::FIXED64:
-            case GPBType::UINT64:
-                if ($value < 0) {
-                    $value = bcadd($value, "18446744073709551616");
-                }
-                // Intentional fall through.
-            case GPBType::SFIXED64:
-            case GPBType::INT64:
-            case GPBType::SINT64:
-                $output->writeRaw("\"", 1);
-                $str_value = strval($value);
-                $output->writeRaw($str_value, strlen($str_value));
-                $output->writeRaw("\"", 1);
-                break;
-            case GPBType::FLOAT:
-                if (is_nan($value)) {
-                    $str_value = "\"NaN\"";
-                } elseif ($value === INF) {
-                    $str_value = "\"Infinity\"";
-                } elseif ($value === -INF) {
-                    $str_value = "\"-Infinity\"";
-                } else {
-                    $str_value = sprintf("%.8g", $value);
-                }
-                $output->writeRaw($str_value, strlen($str_value));
-                break;
-            case GPBType::DOUBLE:
-                if (is_nan($value)) {
-                    $str_value = "\"NaN\"";
-                } elseif ($value === INF) {
-                    $str_value = "\"Infinity\"";
-                } elseif ($value === -INF) {
-                    $str_value = "\"-Infinity\"";
-                } else {
-                    $str_value = sprintf("%.17g", $value);
-                }
-                $output->writeRaw($str_value, strlen($str_value));
-                break;
-            case GPBType::ENUM:
-                $enum_desc = $field->getEnumType();
-                if ($enum_desc->getClass() === "Google\Protobuf\NullValue") {
-                    $output->writeRaw("null", 4);
-                    break;
-                }
-                $enum_value_desc = $enum_desc->getValueByNumber($value);
-                if (!is_null($enum_value_desc)) {
-                    $str_value = $enum_value_desc->getName();
-                    $output->writeRaw("\"", 1);
-                    $output->writeRaw($str_value, strlen($str_value));
-                    $output->writeRaw("\"", 1);
-                } else {
-                    $str_value = strval($value);
-                    $output->writeRaw($str_value, strlen($str_value));
-                }
-                break;
-            case GPBType::BOOL:
-                if ($value) {
-                    $output->writeRaw("true", 4);
-                } else {
-                    $output->writeRaw("false", 5);
-                }
-                break;
-            case GPBType::BYTES:
-                $bytes_value = base64_encode($value);
-                $output->writeRaw("\"", 1);
-                $output->writeRaw($bytes_value, strlen($bytes_value));
-                $output->writeRaw("\"", 1);
-                break;
-            case GPBType::STRING:
-                $value = json_encode($value, JSON_UNESCAPED_UNICODE);
-                $output->writeRaw($value, strlen($value));
-                break;
-            //    case GPBType::GROUP:
-            //      echo "GROUP\xA";
-            //      trigger_error("Not implemented.", E_ERROR);
-            //      break;
-            case GPBType::MESSAGE:
-                $value->serializeToJsonStream($output);
-                break;
-            default:
-                user_error("Unsupported type.");
-                return false;
-        }
-        return true;
-    }
-
-    private static function formatFieldName($field)
-    {
-        return $field->getJsonName();
-    }
-
-    // Used for escaping control chars in strings.
-    private static $k_control_char_limit = 0x20;
-
-    private static function jsonNiceEscape($c)
-    {
-      switch ($c) {
-          case '"':  return "\\\"";
-          case '\\': return "\\\\";
-          case '/': return "\\/";
-          case '\b': return "\\b";
-          case '\f': return "\\f";
-          case '\n': return "\\n";
-          case '\r': return "\\r";
-          case '\t': return "\\t";
-          default:   return NULL;
-      }
-    }
-
-    private static function isJsonEscaped($c)
-    {
-        // See RFC 4627.
-        return $c < chr($k_control_char_limit) || $c === "\"" || $c === "\\";
-    }
-
-    public static function escapedJson($value)
-    {
-        $escaped_value = "";
-        $unescaped_run = "";
-        for ($i = 0; $i < strlen($value); $i++) {
-            $c = $value[$i];
-            // Handle escaping.
-            if (static::isJsonEscaped($c)) {
-                // Use a "nice" escape, like \n, if one exists for this
-                // character.
-                $escape = static::jsonNiceEscape($c);
-                if (is_null($escape)) {
-                    $escape = "\\u00" . bin2hex($c);
-                }
-                if ($unescaped_run !== "") {
-                    $escaped_value .= $unescaped_run;
-                    $unescaped_run = "";
-                }
-                $escaped_value .= $escape;
-            } else {
-              if ($unescaped_run === "") {
-                $unescaped_run .= $c;
-              }
-            }
-        }
-        $escaped_value .= $unescaped_run;
-        return $escaped_value;
-    }
-
-}
diff --git a/libs/protobuf/php/src/Google/Protobuf/Internal/GPBLabel.php b/libs/protobuf/php/src/Google/Protobuf/Internal/GPBLabel.php
deleted file mode 100644
index 0fb2384..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/Internal/GPBLabel.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-namespace Google\Protobuf\Internal;
-
-class GPBLabel
-{
-    const OPTIONAL = 1;
-    const REQUIRED = 2;
-    const REPEATED = 3;
-}
diff --git a/libs/protobuf/php/src/Google/Protobuf/Internal/GPBType.php b/libs/protobuf/php/src/Google/Protobuf/Internal/GPBType.php
deleted file mode 100644
index fa849ce..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/Internal/GPBType.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-namespace Google\Protobuf\Internal;
-
-class GPBType
-{
-    const DOUBLE   =  1;
-    const FLOAT    =  2;
-    const INT64    =  3;
-    const UINT64   =  4;
-    const INT32    =  5;
-    const FIXED64  =  6;
-    const FIXED32  =  7;
-    const BOOL     =  8;
-    const STRING   =  9;
-    const GROUP    = 10;
-    const MESSAGE  = 11;
-    const BYTES    = 12;
-    const UINT32   = 13;
-    const ENUM     = 14;
-    const SFIXED32 = 15;
-    const SFIXED64 = 16;
-    const SINT32   = 17;
-    const SINT64   = 18;
-}
diff --git a/libs/protobuf/php/src/Google/Protobuf/Internal/GPBUtil.php b/libs/protobuf/php/src/Google/Protobuf/Internal/GPBUtil.php
deleted file mode 100644
index ffea900..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/Internal/GPBUtil.php
+++ /dev/null
@@ -1,663 +0,0 @@
-<?php
-
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-namespace Google\Protobuf\Internal;
-
-use Google\Protobuf\Duration;
-use Google\Protobuf\FieldMask;
-use Google\Protobuf\Internal\GPBType;
-use Google\Protobuf\Internal\RepeatedField;
-use Google\Protobuf\Internal\MapField;
-use function bccomp;
-
-function camel2underscore($input) {
-    preg_match_all(
-        '!([A-Z][A-Z0-9]*(?=$|[A-Z][a-z0-9])|[A-Za-z][a-z0-9]+)!',
-        $input,
-        $matches);
-    $ret = $matches[0];
-    foreach ($ret as &$match) {
-        $match = $match == strtoupper($match) ? strtolower($match) : lcfirst($match);
-    }
-    return implode('_', $ret);
-}
-
-class GPBUtil
-{
-    const NANOS_PER_MILLISECOND = 1000000;
-    const NANOS_PER_MICROSECOND = 1000;
-    const TYPE_URL_PREFIX = 'type.googleapis.com/';
-
-    public static function divideInt64ToInt32($value, &$high, &$low, $trim = false)
-    {
-        $isNeg = (bccomp($value, 0) < 0);
-        if ($isNeg) {
-            $value = bcsub(0, $value);
-        }
-
-        $high = bcdiv($value, 4294967296);
-        $low = bcmod($value, 4294967296);
-        if (bccomp($high, 2147483647) > 0) {
-            $high = (int) bcsub($high, 4294967296);
-        } else {
-            $high = (int) $high;
-        }
-        if (bccomp($low, 2147483647) > 0) {
-            $low = (int) bcsub($low, 4294967296);
-        } else {
-            $low = (int) $low;
-        }
-
-        if ($isNeg) {
-            $high = ~$high;
-            $low = ~$low;
-            $low++;
-            if (!$low) {
-                $high = (int)($high + 1);
-            }
-        }
-
-        if ($trim) {
-            $high = 0;
-        }
-    }
-
-    public static function checkString(&$var, $check_utf8)
-    {
-        if (is_array($var) || is_object($var)) {
-            throw new \InvalidArgumentException("Expect string.");
-        }
-        if (!is_string($var)) {
-            $var = strval($var);
-        }
-        if ($check_utf8 && !preg_match('//u', $var)) {
-            throw new \Exception("Expect utf-8 encoding.");
-        }
-    }
-
-    public static function checkEnum(&$var)
-    {
-      static::checkInt32($var);
-    }
-
-    public static function checkInt32(&$var)
-    {
-        if (is_numeric($var)) {
-            $var = intval($var);
-        } else {
-            throw new \Exception("Expect integer.");
-        }
-    }
-
-    public static function checkUint32(&$var)
-    {
-        if (is_numeric($var)) {
-            if (PHP_INT_SIZE === 8) {
-                $var = intval($var);
-                $var |= ((-(($var >> 31) & 0x1)) & ~0xFFFFFFFF);
-            } else {
-                if (bccomp($var, 0x7FFFFFFF) > 0) {
-                    $var = bcsub($var, "4294967296");
-                }
-                $var = (int) $var;
-            }
-        } else {
-            throw new \Exception("Expect integer.");
-        }
-    }
-
-    public static function checkInt64(&$var)
-    {
-        if (is_numeric($var)) {
-            if (PHP_INT_SIZE == 8) {
-                $var = intval($var);
-            } else {
-                if (is_float($var) ||
-                    is_integer($var) ||
-                    (is_string($var) &&
-                         bccomp($var, "9223372036854774784") < 0)) {
-                    $var = number_format($var, 0, ".", "");
-                }
-            }
-        } else {
-            throw new \Exception("Expect integer.");
-        }
-    }
-
-    public static function checkUint64(&$var)
-    {
-        if (is_numeric($var)) {
-            if (PHP_INT_SIZE == 8) {
-                $var = intval($var);
-            } else {
-                $var = number_format($var, 0, ".", "");
-            }
-        } else {
-            throw new \Exception("Expect integer.");
-        }
-    }
-
-    public static function checkFloat(&$var)
-    {
-        if (is_float($var) || is_numeric($var)) {
-            $var = unpack("f", pack("f", $var))[1];
-        } else {
-            throw new \Exception("Expect float.");
-        }
-    }
-
-    public static function checkDouble(&$var)
-    {
-        if (is_float($var) || is_numeric($var)) {
-            $var = floatval($var);
-        } else {
-            throw new \Exception("Expect float.");
-        }
-    }
-
-    public static function checkBool(&$var)
-    {
-        if (is_array($var) || is_object($var)) {
-            throw new \Exception("Expect boolean.");
-        }
-        $var = boolval($var);
-    }
-
-    public static function checkMessage(&$var, $klass, $newClass = null)
-    {
-        if (!$var instanceof $klass && !is_null($var)) {
-            throw new \Exception("Expect $klass.");
-        }
-    }
-
-    public static function checkRepeatedField(&$var, $type, $klass = null)
-    {
-        if (!$var instanceof RepeatedField && !is_array($var)) {
-            throw new \Exception("Expect array.");
-        }
-        if (is_array($var)) {
-            $tmp = new RepeatedField($type, $klass);
-            foreach ($var as $value) {
-                $tmp[] = $value;
-            }
-            return $tmp;
-        } else {
-            if ($var->getType() != $type) {
-                throw new \Exception(
-                    "Expect repeated field of different type.");
-            }
-            if ($var->getType() === GPBType::MESSAGE &&
-                $var->getClass() !== $klass &&
-                $var->getLegacyClass() !== $klass) {
-                throw new \Exception(
-                    "Expect repeated field of " . $klass . ".");
-            }
-            return $var;
-        }
-    }
-
-    public static function checkMapField(&$var, $key_type, $value_type, $klass = null)
-    {
-        if (!$var instanceof MapField && !is_array($var)) {
-            throw new \Exception("Expect dict.");
-        }
-        if (is_array($var)) {
-            $tmp = new MapField($key_type, $value_type, $klass);
-            foreach ($var as $key => $value) {
-                $tmp[$key] = $value;
-            }
-            return $tmp;
-        } else {
-            if ($var->getKeyType() != $key_type) {
-                throw new \Exception("Expect map field of key type.");
-            }
-            if ($var->getValueType() != $value_type) {
-                throw new \Exception("Expect map field of value type.");
-            }
-            if ($var->getValueType() === GPBType::MESSAGE &&
-                $var->getValueClass() !== $klass &&
-                $var->getLegacyValueClass() !== $klass) {
-                throw new \Exception(
-                    "Expect map field of " . $klass . ".");
-            }
-            return $var;
-        }
-    }
-
-    public static function Int64($value)
-    {
-        return new Int64($value);
-    }
-
-    public static function Uint64($value)
-    {
-        return new Uint64($value);
-    }
-
-    public static function getClassNamePrefix(
-        $classname,
-        $file_proto)
-    {
-        $option = $file_proto->getOptions();
-        $prefix = is_null($option) ? "" : $option->getPhpClassPrefix();
-        if ($prefix !== "") {
-            return $prefix;
-        }
-
-        $reserved_words = array(
-            "abstract"=>0, "and"=>0, "array"=>0, "as"=>0, "break"=>0,
-            "callable"=>0, "case"=>0, "catch"=>0, "class"=>0, "clone"=>0,
-            "const"=>0, "continue"=>0, "declare"=>0, "default"=>0, "die"=>0,
-            "do"=>0, "echo"=>0, "else"=>0, "elseif"=>0, "empty"=>0,
-            "enddeclare"=>0, "endfor"=>0, "endforeach"=>0, "endif"=>0,
-            "endswitch"=>0, "endwhile"=>0, "eval"=>0, "exit"=>0, "extends"=>0,
-            "final"=>0, "finally"=>0, "fn"=>0, "for"=>0, "foreach"=>0,
-            "function"=>0, "global"=>0, "goto"=>0, "if"=>0, "implements"=>0,
-            "include"=>0, "include_once"=>0, "instanceof"=>0, "insteadof"=>0,
-            "interface"=>0, "isset"=>0, "list"=>0, "match"=>0, "namespace"=>0,
-            "new"=>0, "or"=>0, "parent"=>0, "print"=>0, "private"=>0,
-            "protected"=>0,"public"=>0, "readonly" => 0,"require"=>0,
-            "require_once"=>0,"return"=>0, "self"=>0, "static"=>0, "switch"=>0,
-            "throw"=>0,"trait"=>0, "try"=>0,"unset"=>0, "use"=>0, "var"=>0,
-            "while"=>0,"xor"=>0, "yield"=>0, "int"=>0, "float"=>0, "bool"=>0,
-            "string"=>0,"true"=>0, "false"=>0, "null"=>0, "void"=>0,
-            "iterable"=>0
-        );
-
-        if (array_key_exists(strtolower($classname), $reserved_words)) {
-            if ($file_proto->getPackage() === "google.protobuf") {
-                return "GPB";
-            } else {
-                return "PB";
-            }
-        }
-
-        return "";
-    }
-
-    private static function getPreviouslyUnreservedClassNamePrefix(
-        $classname,
-        $file_proto)
-    {
-        $previously_unreserved_words = array(
-            "readonly"=>0
-        );
-
-        if (array_key_exists(strtolower($classname), $previously_unreserved_words)) {
-            $option = $file_proto->getOptions();
-            $prefix = is_null($option) ? "" : $option->getPhpClassPrefix();
-            if ($prefix !== "") {
-                return $prefix;
-            }
-
-            return "";
-        }
-
-        return self::getClassNamePrefix($classname, $file_proto);
-    }
-
-    public static function getLegacyClassNameWithoutPackage(
-        $name,
-        $file_proto)
-    {
-        $classname = implode('_', explode('.', $name));
-        return static::getClassNamePrefix($classname, $file_proto) . $classname;
-    }
-
-    public static function getClassNameWithoutPackage(
-        $name,
-        $file_proto)
-    {
-        $parts = explode('.', $name);
-        foreach ($parts as $i => $part) {
-            $parts[$i] = static::getClassNamePrefix($parts[$i], $file_proto) . $parts[$i];
-        }
-        return implode('\\', $parts);
-    }
-
-    private static function getPreviouslyUnreservedClassNameWithoutPackage(
-        $name,
-        $file_proto)
-    {
-        $parts = explode('.', $name);
-        foreach ($parts as $i => $part) {
-            $parts[$i] = static::getPreviouslyUnreservedClassNamePrefix($parts[$i], $file_proto) . $parts[$i];
-        }
-        return implode('\\', $parts);
-    }
-
-    public static function getFullClassName(
-        $proto,
-        $containing,
-        $file_proto,
-        &$message_name_without_package,
-        &$classname,
-        &$legacy_classname,
-        &$fullname,
-        &$previous_classname)
-    {
-        // Full name needs to start with '.'.
-        $message_name_without_package = $proto->getName();
-        if ($containing !== "") {
-            $message_name_without_package =
-                $containing . "." . $message_name_without_package;
-        }
-
-        $package = $file_proto->getPackage();
-        if ($package === "") {
-            $fullname = $message_name_without_package;
-        } else {
-            $fullname = $package . "." . $message_name_without_package;
-        }
-
-        $class_name_without_package =
-            static::getClassNameWithoutPackage($message_name_without_package, $file_proto);
-        $legacy_class_name_without_package =
-            static::getLegacyClassNameWithoutPackage(
-                $message_name_without_package, $file_proto);
-        $previous_class_name_without_package =
-            static::getPreviouslyUnreservedClassNameWithoutPackage(
-                $message_name_without_package, $file_proto);
-
-        $option = $file_proto->getOptions();
-        if (!is_null($option) && $option->hasPhpNamespace()) {
-            $namespace = $option->getPhpNamespace();
-            if ($namespace !== "") {
-                $classname = $namespace . "\\" . $class_name_without_package;
-                $legacy_classname =
-                    $namespace . "\\" . $legacy_class_name_without_package;
-                $previous_classname =
-                    $namespace . "\\" . $previous_class_name_without_package;
-                return;
-            } else {
-                $classname = $class_name_without_package;
-                $legacy_classname = $legacy_class_name_without_package;
-                $previous_classname = $previous_class_name_without_package;
-                return;
-            }
-        }
-
-        if ($package === "") {
-            $classname = $class_name_without_package;
-            $legacy_classname = $legacy_class_name_without_package;
-            $previous_classname = $previous_class_name_without_package;
-        } else {
-            $parts = array_map('ucwords', explode('.', $package));
-            foreach ($parts as $i => $part) {
-                $parts[$i] = self::getClassNamePrefix($part, $file_proto).$part;
-            }
-            $classname =
-                implode('\\', $parts) .
-                "\\".self::getClassNamePrefix($class_name_without_package,$file_proto).
-                $class_name_without_package;
-            $legacy_classname =
-                implode('\\', array_map('ucwords', explode('.', $package))).
-                "\\".$legacy_class_name_without_package;
-            $previous_classname =
-                implode('\\', array_map('ucwords', explode('.', $package))).
-                "\\".self::getPreviouslyUnreservedClassNamePrefix(
-                    $previous_class_name_without_package, $file_proto).
-                    $previous_class_name_without_package;
-        }
-    }
-
-    public static function combineInt32ToInt64($high, $low)
-    {
-        $isNeg = $high < 0;
-        if ($isNeg) {
-            $high = ~$high;
-            $low = ~$low;
-            $low++;
-            if (!$low) {
-                $high = (int) ($high + 1);
-            }
-        }
-        $result = bcadd(bcmul($high, 4294967296), $low);
-        if ($low < 0) {
-            $result = bcadd($result, 4294967296);
-        }
-        if ($isNeg) {
-          $result = bcsub(0, $result);
-        }
-        return $result;
-    }
-
-    public static function parseTimestamp($timestamp)
-    {
-        // prevent parsing timestamps containing with the non-existent year "0000"
-        // DateTime::createFromFormat parses without failing but as a nonsensical date
-        if (substr($timestamp, 0, 4) === "0000") {
-            throw new \Exception("Year cannot be zero.");
-        }
-        // prevent parsing timestamps ending with a lowercase z
-        if (substr($timestamp, -1, 1) === "z") {
-            throw new \Exception("Timezone cannot be a lowercase z.");
-        }
-
-        $nanoseconds = 0;
-        $periodIndex = strpos($timestamp, ".");
-        if ($periodIndex !== false) {
-            $nanosecondsLength = 0;
-            // find the next non-numeric character in the timestamp to calculate
-            // the length of the nanoseconds text
-            for ($i = $periodIndex + 1, $length = strlen($timestamp); $i < $length; $i++) {
-                if (!is_numeric($timestamp[$i])) {
-                    $nanosecondsLength = $i - ($periodIndex + 1);
-                    break;
-                }
-            }
-            if ($nanosecondsLength % 3 !== 0) {
-                throw new \Exception("Nanoseconds must be disible by 3.");
-            }
-            if ($nanosecondsLength > 9) {
-                throw new \Exception("Nanoseconds must be in the range of 0 to 999,999,999 nanoseconds.");
-            }
-            if ($nanosecondsLength > 0) {
-                $nanoseconds = substr($timestamp, $periodIndex + 1, $nanosecondsLength);
-                $nanoseconds = intval($nanoseconds);
-
-                // remove the nanoseconds and preceding period from the timestamp
-                $date = substr($timestamp, 0, $periodIndex);
-                $timezone = substr($timestamp, $periodIndex + $nanosecondsLength + 1);
-                $timestamp = $date.$timezone;
-            }
-        }
-
-        $date = \DateTime::createFromFormat(\DateTime::RFC3339, $timestamp, new \DateTimeZone("UTC"));
-        if ($date === false) {
-            throw new \Exception("Invalid RFC 3339 timestamp.");
-        }
-
-        $value = new \Google\Protobuf\Timestamp();
-        $seconds = $date->format("U");
-        $value->setSeconds($seconds);
-        $value->setNanos($nanoseconds);
-        return $value;
-    }
-
-    public static function formatTimestamp($value)
-    {
-        if (bccomp($value->getSeconds(), "253402300800") != -1) {
-          throw new GPBDecodeException("Duration number too large.");
-        }
-        if (bccomp($value->getSeconds(), "-62135596801") != 1) {
-          throw new GPBDecodeException("Duration number too small.");
-        }
-        $nanoseconds = static::getNanosecondsForTimestamp($value->getNanos());
-        if (!empty($nanoseconds)) {
-            $nanoseconds = ".".$nanoseconds;
-        }
-        $date = new \DateTime('@'.$value->getSeconds(), new \DateTimeZone("UTC"));
-        return $date->format("Y-m-d\TH:i:s".$nanoseconds."\Z");
-    }
-
-    public static function parseDuration($value)
-    {
-        if (strlen($value) < 2 || substr($value, -1) !== "s") {
-          throw new GPBDecodeException("Missing s after duration string");
-        }
-        $number = substr($value, 0, -1);
-        if (bccomp($number, "315576000001") != -1) {
-          throw new GPBDecodeException("Duration number too large.");
-        }
-        if (bccomp($number, "-315576000001") != 1) {
-          throw new GPBDecodeException("Duration number too small.");
-        }
-        $pos = strrpos($number, ".");
-        if ($pos !== false) {
-            $seconds = substr($number, 0, $pos);
-            if (bccomp($seconds, 0) < 0) {
-                $nanos = bcmul("0" . substr($number, $pos), -1000000000);
-            } else {
-                $nanos = bcmul("0" . substr($number, $pos), 1000000000);
-            }
-        } else {
-            $seconds = $number;
-            $nanos = 0;
-        }
-        $duration = new Duration();
-        $duration->setSeconds($seconds);
-        $duration->setNanos($nanos);
-        return $duration;
-    }
-
-    public static function formatDuration($value)
-    {
-        if (bccomp($value->getSeconds(), '315576000001') != -1) {
-            throw new GPBDecodeException('Duration number too large.');
-        }
-        if (bccomp($value->getSeconds(), '-315576000001') != 1) {
-            throw new GPBDecodeException('Duration number too small.');
-        }
-
-        $nanos = $value->getNanos();
-        if ($nanos === 0) {
-            return (string) $value->getSeconds();
-        }
-
-        if ($nanos % 1000000 === 0) {
-            $digits = 3;
-        } elseif ($nanos % 1000 === 0) {
-            $digits = 6;
-        } else {
-            $digits = 9;
-        }
-
-        $nanos = bcdiv($nanos, '1000000000', $digits);
-        return bcadd($value->getSeconds(), $nanos, $digits);
-    }
-
-    public static function parseFieldMask($paths_string)
-    {
-        $field_mask = new FieldMask();
-        if (strlen($paths_string) === 0) {
-            return $field_mask;
-        }
-        $path_strings = explode(",", $paths_string);
-        $paths = $field_mask->getPaths();
-        foreach($path_strings as &$path_string) {
-            $field_strings = explode(".", $path_string);
-            foreach($field_strings as &$field_string) {
-                $field_string = camel2underscore($field_string);
-            }
-            $path_string = implode(".", $field_strings);
-            $paths[] = $path_string;
-        }
-        return $field_mask;
-    }
-
-    public static function formatFieldMask($field_mask)
-    {
-        $converted_paths = [];
-        foreach($field_mask->getPaths() as $path) {
-            $fields = explode('.', $path);
-            $converted_path = [];
-            foreach ($fields as $field) {
-                $segments = explode('_', $field);
-                $start = true;
-                $converted_segments = "";
-                foreach($segments as $segment) {
-                  if (!$start) {
-                    $converted = ucfirst($segment);
-                  } else {
-                    $converted = $segment;
-                    $start = false;
-                  }
-                  $converted_segments .= $converted;
-                }
-                $converted_path []= $converted_segments;
-            }
-            $converted_path = implode(".", $converted_path);
-            $converted_paths []= $converted_path;
-        }
-        return implode(",", $converted_paths);
-    }
-
-    public static function getNanosecondsForTimestamp($nanoseconds)
-    {
-        if ($nanoseconds == 0) {
-            return '';
-        }
-        if ($nanoseconds % static::NANOS_PER_MILLISECOND == 0) {
-            return sprintf('%03d', $nanoseconds / static::NANOS_PER_MILLISECOND);
-        }
-        if ($nanoseconds % static::NANOS_PER_MICROSECOND == 0) {
-            return sprintf('%06d', $nanoseconds / static::NANOS_PER_MICROSECOND);
-        }
-        return sprintf('%09d', $nanoseconds);
-    }
-
-    public static function hasSpecialJsonMapping($msg)
-    {
-        return is_a($msg, 'Google\Protobuf\Any')         ||
-               is_a($msg, "Google\Protobuf\ListValue")   ||
-               is_a($msg, "Google\Protobuf\Struct")      ||
-               is_a($msg, "Google\Protobuf\Value")       ||
-               is_a($msg, "Google\Protobuf\Duration")    ||
-               is_a($msg, "Google\Protobuf\Timestamp")   ||
-               is_a($msg, "Google\Protobuf\FieldMask")   ||
-               static::hasJsonValue($msg);
-    }
-
-    public static function hasJsonValue($msg)
-    {
-        return is_a($msg, "Google\Protobuf\DoubleValue") ||
-               is_a($msg, "Google\Protobuf\FloatValue")  ||
-               is_a($msg, "Google\Protobuf\Int64Value")  ||
-               is_a($msg, "Google\Protobuf\UInt64Value") ||
-               is_a($msg, "Google\Protobuf\Int32Value")  ||
-               is_a($msg, "Google\Protobuf\UInt32Value") ||
-               is_a($msg, "Google\Protobuf\BoolValue")   ||
-               is_a($msg, "Google\Protobuf\StringValue") ||
-               is_a($msg, "Google\Protobuf\BytesValue");
-    }
-}
diff --git a/libs/protobuf/php/src/Google/Protobuf/Internal/GPBWire.php b/libs/protobuf/php/src/Google/Protobuf/Internal/GPBWire.php
deleted file mode 100644
index 034f5df..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/Internal/GPBWire.php
+++ /dev/null
@@ -1,622 +0,0 @@
-<?php
-
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-namespace Google\Protobuf\Internal;
-
-class GPBWire
-{
-
-    const TAG_TYPE_BITS = 3;
-
-    const WIRETYPE_VARINT  = 0;
-    const WIRETYPE_FIXED64 = 1;
-    const WIRETYPE_LENGTH_DELIMITED = 2;
-    const WIRETYPE_START_GROUP = 3;
-    const WIRETYPE_END_GROUP = 4;
-    const WIRETYPE_FIXED32 = 5;
-
-    const UNKNOWN = 0;
-    const NORMAL_FORMAT = 1;
-    const PACKED_FORMAT = 2;
-
-    public static function getTagFieldNumber($tag)
-    {
-        // We have to mask because PHP has no arithmetic shift.
-        return ($tag >> self::TAG_TYPE_BITS) & 0x1fffffff;
-    }
-
-    public static function getTagWireType($tag)
-    {
-        return $tag & 0x7;
-    }
-
-    public static function getWireType($type)
-    {
-        switch ($type) {
-            case GPBType::FLOAT:
-            case GPBType::FIXED32:
-            case GPBType::SFIXED32:
-                return self::WIRETYPE_FIXED32;
-            case GPBType::DOUBLE:
-            case GPBType::FIXED64:
-            case GPBType::SFIXED64:
-                return self::WIRETYPE_FIXED64;
-            case GPBType::UINT32:
-            case GPBType::UINT64:
-            case GPBType::INT32:
-            case GPBType::INT64:
-            case GPBType::SINT32:
-            case GPBType::SINT64:
-            case GPBType::ENUM:
-            case GPBType::BOOL:
-                return self::WIRETYPE_VARINT;
-            case GPBType::STRING:
-            case GPBType::BYTES:
-            case GPBType::MESSAGE:
-                return self::WIRETYPE_LENGTH_DELIMITED;
-            case GPBType::GROUP:
-                user_error("Unsupported type.");
-                return 0;
-            default:
-                user_error("Unsupported type.");
-                return 0;
-        }
-    }
-
-  // ZigZag Transform:  Encodes signed integers so that they can be effectively
-  // used with varint encoding.
-  //
-  // varint operates on unsigned integers, encoding smaller numbers into fewer
-  // bytes.  If you try to use it on a signed integer, it will treat this
-  // number as a very large unsigned integer, which means that even small
-  // signed numbers like -1 will take the maximum number of bytes (10) to
-  // encode.  zigZagEncode() maps signed integers to unsigned in such a way
-  // that those with a small absolute value will have smaller encoded values,
-  // making them appropriate for encoding using varint.
-  //
-  // int32 ->     uint32
-  // -------------------------
-  //           0 ->          0
-  //          -1 ->          1
-  //           1 ->          2
-  //          -2 ->          3
-  //         ... ->        ...
-  //  2147483647 -> 4294967294
-  // -2147483648 -> 4294967295
-  //
-  //        >> encode >>
-  //        << decode <<
-  public static function zigZagEncode32($int32)
-  {
-      if (PHP_INT_SIZE == 8) {
-          $trim_int32 = $int32 & 0xFFFFFFFF;
-          return (($trim_int32 << 1) ^ ($int32 << 32 >> 63)) & 0xFFFFFFFF;
-      } else {
-          return ($int32 << 1) ^ ($int32 >> 31);
-      }
-  }
-
-    public static function zigZagDecode32($uint32)
-    {
-        // Fill high 32 bits.
-        if (PHP_INT_SIZE === 8) {
-            $uint32 |= ($uint32 & 0xFFFFFFFF);
-        }
-
-        $int32 = (($uint32 >> 1) & 0x7FFFFFFF) ^ (-($uint32 & 1));
-
-        return $int32;
-    }
-
-    public static function zigZagEncode64($int64)
-    {
-        if (PHP_INT_SIZE == 4) {
-            if (bccomp($int64, 0) >= 0) {
-                return bcmul($int64, 2);
-            } else {
-                return bcsub(bcmul(bcsub(0, $int64), 2), 1);
-            }
-        } else {
-            return ((int)$int64 << 1) ^ ((int)$int64 >> 63);
-        }
-    }
-
-    public static function zigZagDecode64($uint64)
-    {
-        if (PHP_INT_SIZE == 4) {
-            if (bcmod($uint64, 2) == 0) {
-                return bcdiv($uint64, 2, 0);
-            } else {
-                return bcsub(0, bcdiv(bcadd($uint64, 1), 2, 0));
-            }
-        } else {
-            return (($uint64 >> 1) & 0x7FFFFFFFFFFFFFFF) ^ (-($uint64 & 1));
-        }
-    }
-
-    public static function readInt32(&$input, &$value)
-    {
-        return $input->readVarint32($value);
-    }
-
-    public static function readInt64(&$input, &$value)
-    {
-        $success = $input->readVarint64($value);
-        if (PHP_INT_SIZE == 4 && bccomp($value, "9223372036854775807") > 0) {
-            $value = bcsub($value, "18446744073709551616");
-        }
-        return $success;
-    }
-
-    public static function readUint32(&$input, &$value)
-    {
-        return self::readInt32($input, $value);
-    }
-
-    public static function readUint64(&$input, &$value)
-    {
-        return self::readInt64($input, $value);
-    }
-
-    public static function readSint32(&$input, &$value)
-    {
-        if (!$input->readVarint32($value)) {
-            return false;
-        }
-        $value = GPBWire::zigZagDecode32($value);
-        return true;
-    }
-
-    public static function readSint64(&$input, &$value)
-    {
-        if (!$input->readVarint64($value)) {
-            return false;
-        }
-        $value = GPBWire::zigZagDecode64($value);
-        return true;
-    }
-
-    public static function readFixed32(&$input, &$value)
-    {
-        return $input->readLittleEndian32($value);
-    }
-
-    public static function readFixed64(&$input, &$value)
-    {
-        return $input->readLittleEndian64($value);
-    }
-
-    public static function readSfixed32(&$input, &$value)
-    {
-        if (!self::readFixed32($input, $value)) {
-            return false;
-        }
-        if (PHP_INT_SIZE === 8) {
-            $value |= (-($value >> 31) << 32);
-        }
-        return true;
-    }
-
-    public static function readSfixed64(&$input, &$value)
-    {
-        $success = $input->readLittleEndian64($value);
-        if (PHP_INT_SIZE == 4 && bccomp($value, "9223372036854775807") > 0) {
-            $value = bcsub($value, "18446744073709551616");
-        }
-        return $success;
-    }
-
-    public static function readFloat(&$input, &$value)
-    {
-        $data = null;
-        if (!$input->readRaw(4, $data)) {
-            return false;
-        }
-        $value = unpack('f', $data)[1];
-        return true;
-    }
-
-    public static function readDouble(&$input, &$value)
-    {
-        $data = null;
-        if (!$input->readRaw(8, $data)) {
-            return false;
-        }
-        $value = unpack('d', $data)[1];
-        return true;
-    }
-
-    public static function readBool(&$input, &$value)
-    {
-        if (!$input->readVarint64($value)) {
-            return false;
-        }
-        if ($value == 0) {
-            $value = false;
-        } else {
-            $value = true;
-        }
-        return true;
-    }
-
-    public static function readString(&$input, &$value)
-    {
-        $length = 0;
-        return $input->readVarintSizeAsInt($length) && $input->readRaw($length, $value);
-    }
-
-    public static function readMessage(&$input, &$message)
-    {
-        $length = 0;
-        if (!$input->readVarintSizeAsInt($length)) {
-            return false;
-        }
-        $old_limit = 0;
-        $recursion_limit = 0;
-        $input->incrementRecursionDepthAndPushLimit(
-            $length,
-            $old_limit,
-            $recursion_limit);
-        if ($recursion_limit < 0 || !$message->parseFromStream($input)) {
-            return false;
-        }
-        return $input->decrementRecursionDepthAndPopLimit($old_limit);
-    }
-
-    public static function writeTag(&$output, $tag)
-    {
-        return $output->writeTag($tag);
-    }
-
-    public static function writeInt32(&$output, $value)
-    {
-        return $output->writeVarint32($value, false);
-    }
-
-    public static function writeInt64(&$output, $value)
-    {
-        return $output->writeVarint64($value);
-    }
-
-    public static function writeUint32(&$output, $value)
-    {
-        return $output->writeVarint32($value, true);
-    }
-
-    public static function writeUint64(&$output, $value)
-    {
-        return $output->writeVarint64($value);
-    }
-
-    public static function writeSint32(&$output, $value)
-    {
-        $value = GPBWire::zigZagEncode32($value);
-        return $output->writeVarint32($value, true);
-    }
-
-    public static function writeSint64(&$output, $value)
-    {
-        $value = GPBWire::zigZagEncode64($value);
-        return $output->writeVarint64($value);
-    }
-
-    public static function writeFixed32(&$output, $value)
-    {
-        return $output->writeLittleEndian32($value);
-    }
-
-    public static function writeFixed64(&$output, $value)
-    {
-        return $output->writeLittleEndian64($value);
-    }
-
-    public static function writeSfixed32(&$output, $value)
-    {
-        return $output->writeLittleEndian32($value);
-    }
-
-    public static function writeSfixed64(&$output, $value)
-    {
-        return $output->writeLittleEndian64($value);
-    }
-
-    public static function writeBool(&$output, $value)
-    {
-        if ($value) {
-            return $output->writeVarint32(1, true);
-        } else {
-            return $output->writeVarint32(0, true);
-        }
-    }
-
-    public static function writeFloat(&$output, $value)
-    {
-        $data = pack("f", $value);
-        return $output->writeRaw($data, 4);
-    }
-
-    public static function writeDouble(&$output, $value)
-    {
-        $data = pack("d", $value);
-        return $output->writeRaw($data, 8);
-    }
-
-    public static function writeString(&$output, $value)
-    {
-        return self::writeBytes($output, $value);
-    }
-
-    public static function writeBytes(&$output, $value)
-    {
-        $size = strlen($value);
-        if (!$output->writeVarint32($size, true)) {
-            return false;
-        }
-        return $output->writeRaw($value, $size);
-    }
-
-    public static function writeMessage(&$output, $value)
-    {
-        $size = $value->byteSize();
-        if (!$output->writeVarint32($size, true)) {
-            return false;
-        }
-        return $value->serializeToStream($output);
-    }
-
-    public static function makeTag($number, $type)
-    {
-        return ($number << 3) | self::getWireType($type);
-    }
-
-    public static function tagSize($field)
-    {
-        $tag = self::makeTag($field->getNumber(), $field->getType());
-        return self::varint32Size($tag);
-    }
-
-    public static function varint32Size($value, $sign_extended = false)
-    {
-        if ($value < 0) {
-            if ($sign_extended) {
-                return 10;
-            } else {
-                return 5;
-            }
-        }
-        if ($value < (1 <<  7)) {
-            return 1;
-        }
-        if ($value < (1 << 14)) {
-            return 2;
-        }
-        if ($value < (1 << 21)) {
-            return 3;
-        }
-        if ($value < (1 << 28)) {
-            return 4;
-        }
-        return 5;
-    }
-
-    public static function sint32Size($value)
-    {
-        $value = self::zigZagEncode32($value);
-        return self::varint32Size($value);
-    }
-
-    public static function sint64Size($value)
-    {
-        $value = self::zigZagEncode64($value);
-        return self::varint64Size($value);
-    }
-
-    public static function varint64Size($value)
-    {
-        if (PHP_INT_SIZE == 4) {
-            if (bccomp($value, 0) < 0 ||
-                bccomp($value, "9223372036854775807") > 0) {
-                return 10;
-            }
-            if (bccomp($value, 1 << 7) < 0) {
-                return 1;
-            }
-            if (bccomp($value, 1 << 14) < 0) {
-                return 2;
-            }
-            if (bccomp($value, 1 << 21) < 0) {
-                return 3;
-            }
-            if (bccomp($value, 1 << 28) < 0) {
-                return 4;
-            }
-            if (bccomp($value, '34359738368') < 0) {
-                return 5;
-            }
-            if (bccomp($value, '4398046511104') < 0) {
-                return 6;
-            }
-            if (bccomp($value, '562949953421312') < 0) {
-                return 7;
-            }
-            if (bccomp($value, '72057594037927936') < 0) {
-                return 8;
-            }
-            return 9;
-        } else {
-            if ($value < 0) {
-                return 10;
-            }
-            if ($value < (1 <<  7)) {
-                return 1;
-            }
-            if ($value < (1 << 14)) {
-                return 2;
-            }
-            if ($value < (1 << 21)) {
-                return 3;
-            }
-            if ($value < (1 << 28)) {
-                return 4;
-            }
-            if ($value < (1 << 35)) {
-                return 5;
-            }
-            if ($value < (1 << 42)) {
-                return 6;
-            }
-            if ($value < (1 << 49)) {
-                return 7;
-            }
-            if ($value < (1 << 56)) {
-                return 8;
-            }
-            return 9;
-        }
-    }
-
-    public static function serializeFieldToStream(
-        $value,
-        $field,
-        $need_tag,
-        &$output)
-    {
-        if ($need_tag) {
-            if (!GPBWire::writeTag(
-                $output,
-                self::makeTag(
-                    $field->getNumber(),
-                    $field->getType()))) {
-                return false;
-            }
-        }
-        switch ($field->getType()) {
-            case GPBType::DOUBLE:
-                if (!GPBWire::writeDouble($output, $value)) {
-                    return false;
-                }
-                break;
-            case GPBType::FLOAT:
-                if (!GPBWire::writeFloat($output, $value)) {
-                    return false;
-                }
-                break;
-            case GPBType::INT64:
-                if (!GPBWire::writeInt64($output, $value)) {
-                    return false;
-                }
-                break;
-            case GPBType::UINT64:
-                if (!GPBWire::writeUint64($output, $value)) {
-                    return false;
-                }
-                break;
-            case GPBType::INT32:
-                if (!GPBWire::writeInt32($output, $value)) {
-                    return false;
-                }
-                break;
-            case GPBType::FIXED32:
-                if (!GPBWire::writeFixed32($output, $value)) {
-                    return false;
-                }
-                break;
-            case GPBType::FIXED64:
-                if (!GPBWire::writeFixed64($output, $value)) {
-                    return false;
-                }
-                break;
-            case GPBType::BOOL:
-                if (!GPBWire::writeBool($output, $value)) {
-                    return false;
-                }
-                break;
-            case GPBType::STRING:
-                if (!GPBWire::writeString($output, $value)) {
-                    return false;
-                }
-                break;
-            //    case GPBType::GROUP:
-            //      echo "GROUP\xA";
-            //      trigger_error("Not implemented.", E_ERROR);
-            //      break;
-            case GPBType::MESSAGE:
-                if (!GPBWire::writeMessage($output, $value)) {
-                    return false;
-                }
-                break;
-            case GPBType::BYTES:
-                if (!GPBWire::writeBytes($output, $value)) {
-                    return false;
-                }
-                break;
-            case GPBType::UINT32:
-                if (PHP_INT_SIZE === 8 && $value < 0) {
-                    $value += 4294967296;
-                }
-                if (!GPBWire::writeUint32($output, $value)) {
-                    return false;
-                }
-                break;
-            case GPBType::ENUM:
-                if (!GPBWire::writeInt32($output, $value)) {
-                    return false;
-                }
-                break;
-            case GPBType::SFIXED32:
-                if (!GPBWire::writeSfixed32($output, $value)) {
-                    return false;
-                }
-                break;
-            case GPBType::SFIXED64:
-                if (!GPBWire::writeSfixed64($output, $value)) {
-                    return false;
-                }
-                break;
-            case GPBType::SINT32:
-                if (!GPBWire::writeSint32($output, $value)) {
-                    return false;
-                }
-                break;
-            case GPBType::SINT64:
-                if (!GPBWire::writeSint64($output, $value)) {
-                    return false;
-                }
-                break;
-            default:
-                user_error("Unsupported type.");
-                return false;
-        }
-
-        return true;
-    }
-}
diff --git a/libs/protobuf/php/src/Google/Protobuf/Internal/GPBWireType.php b/libs/protobuf/php/src/Google/Protobuf/Internal/GPBWireType.php
deleted file mode 100644
index c1ad370..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/Internal/GPBWireType.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-namespace Google\Protobuf\Internal;
-
-class GPBWireType
-{
-    const VARINT           = 0;
-    const FIXED64          = 1;
-    const LENGTH_DELIMITED = 2;
-    const START_GROUP      = 3;
-    const END_GROUP        = 4;
-    const FIXED32          = 5;
-}
diff --git a/libs/protobuf/php/src/Google/Protobuf/Internal/GeneratedCodeInfo.php b/libs/protobuf/php/src/Google/Protobuf/Internal/GeneratedCodeInfo.php
deleted file mode 100644
index a1db269..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/Internal/GeneratedCodeInfo.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: google/protobuf/descriptor.proto
-
-namespace Google\Protobuf\Internal;
-
-use Google\Protobuf\Internal\GPBType;
-use Google\Protobuf\Internal\GPBWire;
-use Google\Protobuf\Internal\RepeatedField;
-use Google\Protobuf\Internal\InputStream;
-use Google\Protobuf\Internal\GPBUtil;
-
-/**
- * Describes the relationship between generated code and its original source
- * file. A GeneratedCodeInfo message is associated with only one generated
- * source file, but may contain references to different source .proto files.
- *
- * Generated from protobuf message <code>google.protobuf.GeneratedCodeInfo</code>
- */
-class GeneratedCodeInfo extends \Google\Protobuf\Internal\Message
-{
-    /**
-     * An Annotation connects some span of text in generated code to an element
-     * of its generating .proto file.
-     *
-     * Generated from protobuf field <code>repeated .google.protobuf.GeneratedCodeInfo.Annotation annotation = 1;</code>
-     */
-    private $annotation;
-
-    /**
-     * Constructor.
-     *
-     * @param array $data {
-     *     Optional. Data for populating the Message object.
-     *
-     *     @type array<\Google\Protobuf\Internal\GeneratedCodeInfo\Annotation>|\Google\Protobuf\Internal\RepeatedField $annotation
-     *           An Annotation connects some span of text in generated code to an element
-     *           of its generating .proto file.
-     * }
-     */
-    public function __construct($data = NULL) {
-        \GPBMetadata\Google\Protobuf\Internal\Descriptor::initOnce();
-        parent::__construct($data);
-    }
-
-    /**
-     * An Annotation connects some span of text in generated code to an element
-     * of its generating .proto file.
-     *
-     * Generated from protobuf field <code>repeated .google.protobuf.GeneratedCodeInfo.Annotation annotation = 1;</code>
-     * @return \Google\Protobuf\Internal\RepeatedField
-     */
-    public function getAnnotation()
-    {
-        return $this->annotation;
-    }
-
-    /**
-     * An Annotation connects some span of text in generated code to an element
-     * of its generating .proto file.
-     *
-     * Generated from protobuf field <code>repeated .google.protobuf.GeneratedCodeInfo.Annotation annotation = 1;</code>
-     * @param array<\Google\Protobuf\Internal\GeneratedCodeInfo\Annotation>|\Google\Protobuf\Internal\RepeatedField $var
-     * @return $this
-     */
-    public function setAnnotation($var)
-    {
-        $arr = GPBUtil::checkRepeatedField($var, \Google\Protobuf\Internal\GPBType::MESSAGE, \Google\Protobuf\Internal\GeneratedCodeInfo\Annotation::class);
-        $this->annotation = $arr;
-
-        return $this;
-    }
-
-}
-
diff --git a/libs/protobuf/php/src/Google/Protobuf/Internal/GeneratedCodeInfo/Annotation.php b/libs/protobuf/php/src/Google/Protobuf/Internal/GeneratedCodeInfo/Annotation.php
deleted file mode 100644
index 617fdac..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/Internal/GeneratedCodeInfo/Annotation.php
+++ /dev/null
@@ -1,218 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: google/protobuf/descriptor.proto
-
-namespace Google\Protobuf\Internal\GeneratedCodeInfo;
-
-use Google\Protobuf\Internal\GPBType;
-use Google\Protobuf\Internal\GPBWire;
-use Google\Protobuf\Internal\RepeatedField;
-use Google\Protobuf\Internal\InputStream;
-use Google\Protobuf\Internal\GPBUtil;
-
-/**
- * Generated from protobuf message <code>google.protobuf.GeneratedCodeInfo.Annotation</code>
- */
-class Annotation extends \Google\Protobuf\Internal\Message
-{
-    /**
-     * Identifies the element in the original source .proto file. This field
-     * is formatted the same as SourceCodeInfo.Location.path.
-     *
-     * Generated from protobuf field <code>repeated int32 path = 1 [packed = true];</code>
-     */
-    private $path;
-    /**
-     * Identifies the filesystem path to the original source .proto.
-     *
-     * Generated from protobuf field <code>optional string source_file = 2;</code>
-     */
-    protected $source_file = null;
-    /**
-     * Identifies the starting offset in bytes in the generated code
-     * that relates to the identified object.
-     *
-     * Generated from protobuf field <code>optional int32 begin = 3;</code>
-     */
-    protected $begin = null;
-    /**
-     * Identifies the ending offset in bytes in the generated code that
-     * relates to the identified offset. The end offset should be one past
-     * the last relevant byte (so the length of the text = end - begin).
-     *
-     * Generated from protobuf field <code>optional int32 end = 4;</code>
-     */
-    protected $end = null;
-
-    /**
-     * Constructor.
-     *
-     * @param array $data {
-     *     Optional. Data for populating the Message object.
-     *
-     *     @type array<int>|\Google\Protobuf\Internal\RepeatedField $path
-     *           Identifies the element in the original source .proto file. This field
-     *           is formatted the same as SourceCodeInfo.Location.path.
-     *     @type string $source_file
-     *           Identifies the filesystem path to the original source .proto.
-     *     @type int $begin
-     *           Identifies the starting offset in bytes in the generated code
-     *           that relates to the identified object.
-     *     @type int $end
-     *           Identifies the ending offset in bytes in the generated code that
-     *           relates to the identified offset. The end offset should be one past
-     *           the last relevant byte (so the length of the text = end - begin).
-     * }
-     */
-    public function __construct($data = NULL) {
-        \GPBMetadata\Google\Protobuf\Internal\Descriptor::initOnce();
-        parent::__construct($data);
-    }
-
-    /**
-     * Identifies the element in the original source .proto file. This field
-     * is formatted the same as SourceCodeInfo.Location.path.
-     *
-     * Generated from protobuf field <code>repeated int32 path = 1 [packed = true];</code>
-     * @return \Google\Protobuf\Internal\RepeatedField
-     */
-    public function getPath()
-    {
-        return $this->path;
-    }
-
-    /**
-     * Identifies the element in the original source .proto file. This field
-     * is formatted the same as SourceCodeInfo.Location.path.
-     *
-     * Generated from protobuf field <code>repeated int32 path = 1 [packed = true];</code>
-     * @param array<int>|\Google\Protobuf\Internal\RepeatedField $var
-     * @return $this
-     */
-    public function setPath($var)
-    {
-        $arr = GPBUtil::checkRepeatedField($var, \Google\Protobuf\Internal\GPBType::INT32);
-        $this->path = $arr;
-
-        return $this;
-    }
-
-    /**
-     * Identifies the filesystem path to the original source .proto.
-     *
-     * Generated from protobuf field <code>optional string source_file = 2;</code>
-     * @return string
-     */
-    public function getSourceFile()
-    {
-        return isset($this->source_file) ? $this->source_file : '';
-    }
-
-    public function hasSourceFile()
-    {
-        return isset($this->source_file);
-    }
-
-    public function clearSourceFile()
-    {
-        unset($this->source_file);
-    }
-
-    /**
-     * Identifies the filesystem path to the original source .proto.
-     *
-     * Generated from protobuf field <code>optional string source_file = 2;</code>
-     * @param string $var
-     * @return $this
-     */
-    public function setSourceFile($var)
-    {
-        GPBUtil::checkString($var, True);
-        $this->source_file = $var;
-
-        return $this;
-    }
-
-    /**
-     * Identifies the starting offset in bytes in the generated code
-     * that relates to the identified object.
-     *
-     * Generated from protobuf field <code>optional int32 begin = 3;</code>
-     * @return int
-     */
-    public function getBegin()
-    {
-        return isset($this->begin) ? $this->begin : 0;
-    }
-
-    public function hasBegin()
-    {
-        return isset($this->begin);
-    }
-
-    public function clearBegin()
-    {
-        unset($this->begin);
-    }
-
-    /**
-     * Identifies the starting offset in bytes in the generated code
-     * that relates to the identified object.
-     *
-     * Generated from protobuf field <code>optional int32 begin = 3;</code>
-     * @param int $var
-     * @return $this
-     */
-    public function setBegin($var)
-    {
-        GPBUtil::checkInt32($var);
-        $this->begin = $var;
-
-        return $this;
-    }
-
-    /**
-     * Identifies the ending offset in bytes in the generated code that
-     * relates to the identified offset. The end offset should be one past
-     * the last relevant byte (so the length of the text = end - begin).
-     *
-     * Generated from protobuf field <code>optional int32 end = 4;</code>
-     * @return int
-     */
-    public function getEnd()
-    {
-        return isset($this->end) ? $this->end : 0;
-    }
-
-    public function hasEnd()
-    {
-        return isset($this->end);
-    }
-
-    public function clearEnd()
-    {
-        unset($this->end);
-    }
-
-    /**
-     * Identifies the ending offset in bytes in the generated code that
-     * relates to the identified offset. The end offset should be one past
-     * the last relevant byte (so the length of the text = end - begin).
-     *
-     * Generated from protobuf field <code>optional int32 end = 4;</code>
-     * @param int $var
-     * @return $this
-     */
-    public function setEnd($var)
-    {
-        GPBUtil::checkInt32($var);
-        $this->end = $var;
-
-        return $this;
-    }
-
-}
-
-// Adding a class alias for backwards compatibility with the previous class name.
-class_alias(Annotation::class, \Google\Protobuf\Internal\GeneratedCodeInfo_Annotation::class);
-
diff --git a/libs/protobuf/php/src/Google/Protobuf/Internal/GeneratedCodeInfo_Annotation.php b/libs/protobuf/php/src/Google/Protobuf/Internal/GeneratedCodeInfo_Annotation.php
deleted file mode 100644
index e36f1e5..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/Internal/GeneratedCodeInfo_Annotation.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: google/protobuf/descriptor.proto
-
-namespace Google\Protobuf\Internal;
-
-if (false) {
-    /**
-     * This class is deprecated. Use Google\Protobuf\Internal\GeneratedCodeInfo\Annotation instead.
-     * @deprecated
-     */
-    class GeneratedCodeInfo_Annotation {}
-}
-class_exists(GeneratedCodeInfo\Annotation::class);
-@trigger_error('Google\Protobuf\Internal\GeneratedCodeInfo_Annotation is deprecated and will be removed in the next major release. Use Google\Protobuf\Internal\GeneratedCodeInfo\Annotation instead', E_USER_DEPRECATED);
-
diff --git a/libs/protobuf/php/src/Google/Protobuf/Internal/GetPublicDescriptorTrait.php b/libs/protobuf/php/src/Google/Protobuf/Internal/GetPublicDescriptorTrait.php
deleted file mode 100644
index d22bc30..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/Internal/GetPublicDescriptorTrait.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-// Protocol Buffers - Google's data interchange format
-// Copyright 2017 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-namespace Google\Protobuf\Internal;
-
-trait GetPublicDescriptorTrait
-{
-    private function getPublicDescriptor($desc)
-    {
-        return is_null($desc) ? null : $desc->getPublicDescriptor();
-    }
-}
diff --git a/libs/protobuf/php/src/Google/Protobuf/Internal/HasPublicDescriptorTrait.php b/libs/protobuf/php/src/Google/Protobuf/Internal/HasPublicDescriptorTrait.php
deleted file mode 100644
index ed5d166..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/Internal/HasPublicDescriptorTrait.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-namespace Google\Protobuf\Internal;
-
-trait HasPublicDescriptorTrait
-{
-    private $public_desc;
-
-    public function getPublicDescriptor()
-    {
-        return $this->public_desc;
-    }
-}
diff --git a/libs/protobuf/php/src/Google/Protobuf/Internal/MapEntry.php b/libs/protobuf/php/src/Google/Protobuf/Internal/MapEntry.php
deleted file mode 100644
index e89481f..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/Internal/MapEntry.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-namespace Google\Protobuf\Internal;
-
-use Google\Protobuf\Internal\GPBType;
-use Google\Protobuf\Internal\Message;
-
-class MapEntry extends Message
-{
-    public $key;
-    public $value;
-
-    public function __construct($desc) {
-        parent::__construct($desc);
-        // For MapEntry, getValue should always return a valid value. Thus, we
-        // need to create a default instance value if the value type is
-        // message, in case no value is provided in data.
-        $value_field = $desc->getFieldByNumber(2);
-        if ($value_field->getType() == GPBType::MESSAGE) {
-            $klass = $value_field->getMessageType()->getClass();
-            $value = new $klass;
-            $this->setValue($value);
-        }
-    }
-
-    public function setKey($key) {
-      $this->key = $key;
-    }
-
-    public function getKey() {
-      return $this->key;
-    }
-
-    public function setValue($value) {
-      $this->value = $value;
-    }
-
-    public function getValue() {
-      return $this->value;
-    }
-}
diff --git a/libs/protobuf/php/src/Google/Protobuf/Internal/MapField.php b/libs/protobuf/php/src/Google/Protobuf/Internal/MapField.php
deleted file mode 100644
index d413c6d..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/Internal/MapField.php
+++ /dev/null
@@ -1,298 +0,0 @@
-<?php
-
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-/**
- * MapField and MapFieldIter are used by generated protocol message classes to
- * manipulate map fields.
- */
-
-namespace Google\Protobuf\Internal;
-
-use Traversable;
-
-/**
- * MapField is used by generated protocol message classes to manipulate map
- * fields. It can be used like native PHP array.
- */
-class MapField implements \ArrayAccess, \IteratorAggregate, \Countable
-{
-    /**
-     * @ignore
-     */
-    private $container;
-    /**
-     * @ignore
-     */
-    private $key_type;
-    /**
-     * @ignore
-     */
-    private $value_type;
-    /**
-     * @ignore
-     */
-    private $klass;
-    /**
-     * @ignore
-     */
-    private $legacy_klass;
-
-    /**
-     * Constructs an instance of MapField.
-     *
-     * @param long $key_type Type of the stored key element.
-     * @param long $value_type Type of the stored value element.
-     * @param string $klass Message/Enum class name of value instance
-     * (message/enum fields only).
-     * @ignore
-     */
-    public function __construct($key_type, $value_type, $klass = null)
-    {
-        $this->container = [];
-        $this->key_type = $key_type;
-        $this->value_type = $value_type;
-        $this->klass = $klass;
-
-        if ($this->value_type == GPBType::MESSAGE) {
-            $pool = DescriptorPool::getGeneratedPool();
-            $desc = $pool->getDescriptorByClassName($klass);
-            if ($desc == NULL) {
-                new $klass;  // No msg class instance has been created before.
-                $desc = $pool->getDescriptorByClassName($klass);
-            }
-            $this->klass = $desc->getClass();
-            $this->legacy_klass = $desc->getLegacyClass();
-        }
-    }
-
-    /**
-     * @ignore
-     */
-    public function getKeyType()
-    {
-        return $this->key_type;
-    }
-
-    /**
-     * @ignore
-     */
-    public function getValueType()
-    {
-        return $this->value_type;
-    }
-
-    /**
-     * @ignore
-     */
-    public function getValueClass()
-    {
-        return $this->klass;
-    }
-
-    /**
-     * @ignore
-     */
-    public function getLegacyValueClass()
-    {
-        return $this->legacy_klass;
-    }
-
-    /**
-     * Return the element at the given key.
-     *
-     * This will also be called for: $ele = $arr[$key]
-     *
-     * @param int|string $key The key of the element to be fetched.
-     * @return object The stored element at given key.
-     * @throws \ErrorException Invalid type for index.
-     * @throws \ErrorException Non-existing index.
-     * @todo need to add return type mixed (require update php version to 8.0)
-     */
-    #[\ReturnTypeWillChange]
-    public function offsetGet($key)
-    {
-        return $this->container[$key];
-    }
-
-    /**
-     * Assign the element at the given key.
-     *
-     * This will also be called for: $arr[$key] = $value
-     *
-     * @param int|string $key The key of the element to be fetched.
-     * @param object $value The element to be assigned.
-     * @return void
-     * @throws \ErrorException Invalid type for key.
-     * @throws \ErrorException Invalid type for value.
-     * @throws \ErrorException Non-existing key.
-     * @todo need to add return type void (require update php version to 7.1)
-     */
-    #[\ReturnTypeWillChange]
-    public function offsetSet($key, $value)
-    {
-        $this->checkKey($this->key_type, $key);
-
-        switch ($this->value_type) {
-            case GPBType::SFIXED32:
-            case GPBType::SINT32:
-            case GPBType::INT32:
-            case GPBType::ENUM:
-                GPBUtil::checkInt32($value);
-                break;
-            case GPBType::FIXED32:
-            case GPBType::UINT32:
-                GPBUtil::checkUint32($value);
-                break;
-            case GPBType::SFIXED64:
-            case GPBType::SINT64:
-            case GPBType::INT64:
-                GPBUtil::checkInt64($value);
-                break;
-            case GPBType::FIXED64:
-            case GPBType::UINT64:
-                GPBUtil::checkUint64($value);
-                break;
-            case GPBType::FLOAT:
-                GPBUtil::checkFloat($value);
-                break;
-            case GPBType::DOUBLE:
-                GPBUtil::checkDouble($value);
-                break;
-            case GPBType::BOOL:
-                GPBUtil::checkBool($value);
-                break;
-            case GPBType::STRING:
-                GPBUtil::checkString($value, true);
-                break;
-            case GPBType::MESSAGE:
-                if (is_null($value)) {
-                  trigger_error("Map element cannot be null.", E_USER_ERROR);
-                }
-                GPBUtil::checkMessage($value, $this->klass);
-                break;
-            default:
-                break;
-        }
-
-        $this->container[$key] = $value;
-    }
-
-    /**
-     * Remove the element at the given key.
-     *
-     * This will also be called for: unset($arr)
-     *
-     * @param int|string $key The key of the element to be removed.
-     * @return void
-     * @throws \ErrorException Invalid type for key.
-     * @todo need to add return type void (require update php version to 7.1)
-     */
-    #[\ReturnTypeWillChange]
-    public function offsetUnset($key)
-    {
-        $this->checkKey($this->key_type, $key);
-        unset($this->container[$key]);
-    }
-
-    /**
-     * Check the existence of the element at the given key.
-     *
-     * This will also be called for: isset($arr)
-     *
-     * @param int|string $key The key of the element to be removed.
-     * @return bool True if the element at the given key exists.
-     * @throws \ErrorException Invalid type for key.
-     */
-    public function offsetExists($key): bool
-    {
-        $this->checkKey($this->key_type, $key);
-        return isset($this->container[$key]);
-    }
-
-    /**
-     * @ignore
-     */
-    public function getIterator(): Traversable
-    {
-        return new MapFieldIter($this->container, $this->key_type);
-    }
-
-    /**
-     * Return the number of stored elements.
-     *
-     * This will also be called for: count($arr)
-     *
-     * @return integer The number of stored elements.
-     */
-    public function count(): int
-    {
-        return count($this->container);
-    }
-
-    /**
-     * @ignore
-     */
-    private function checkKey($key_type, &$key)
-    {
-        switch ($key_type) {
-            case GPBType::SFIXED32:
-            case GPBType::SINT32:
-            case GPBType::INT32:
-                GPBUtil::checkInt32($key);
-                break;
-            case GPBType::FIXED32:
-            case GPBType::UINT32:
-                GPBUtil::checkUint32($key);
-                break;
-            case GPBType::SFIXED64:
-            case GPBType::SINT64:
-            case GPBType::INT64:
-                GPBUtil::checkInt64($key);
-                break;
-            case GPBType::FIXED64:
-            case GPBType::UINT64:
-                GPBUtil::checkUint64($key);
-                break;
-            case GPBType::BOOL:
-                GPBUtil::checkBool($key);
-                break;
-            case GPBType::STRING:
-                GPBUtil::checkString($key, true);
-                break;
-            default:
-                trigger_error(
-                    "Given type cannot be map key.",
-                    E_USER_ERROR);
-                break;
-        }
-    }
-}
diff --git a/libs/protobuf/php/src/Google/Protobuf/Internal/MapFieldIter.php b/libs/protobuf/php/src/Google/Protobuf/Internal/MapFieldIter.php
deleted file mode 100644
index 2ff6b44..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/Internal/MapFieldIter.php
+++ /dev/null
@@ -1,142 +0,0 @@
-<?php
-
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-/**
- * MapField and MapFieldIter are used by generated protocol message classes to
- * manipulate map fields.
- */
-
-namespace Google\Protobuf\Internal;
-
-/**
- * MapFieldIter is used to iterate MapField. It is also need for the foreach
- * syntax.
- */
-class MapFieldIter implements \Iterator
-{
-
-    /**
-     * @ignore
-     */
-    private $container;
-
-    /**
-     * Create iterator instance for MapField.
-     *
-     * @param MapField The MapField instance for which this iterator is
-     * created.
-     * @param GPBType Map key type.
-     * @ignore
-     */
-    public function __construct($container, $key_type)
-    {
-        $this->container = $container;
-        $this->key_type = $key_type;
-    }
-
-    /**
-     * Reset the status of the iterator
-     *
-     * @return void
-     * @todo need to add return type void (require update php version to 7.1)
-     */
-    #[\ReturnTypeWillChange]
-    public function rewind()
-    {
-        reset($this->container);
-    }
-
-    /**
-     * Return the element at the current position.
-     *
-     * @return object The element at the current position.
-     * @todo need to add return type mixed (require update php version to 8.0)
-     */
-    #[\ReturnTypeWillChange]
-    public function current()
-    {
-        return current($this->container);
-    }
-
-    /**
-     * Return the current key.
-     *
-     * @return object The current key.
-     * @todo need to add return type mixed (require update php version to 8.0)
-     */
-    #[\ReturnTypeWillChange]
-    public function key()
-    {
-        $key = key($this->container);
-        switch ($this->key_type) {
-            case GPBType::INT64:
-            case GPBType::UINT64:
-            case GPBType::FIXED64:
-            case GPBType::SFIXED64:
-            case GPBType::SINT64:
-                if (PHP_INT_SIZE === 8) {
-                    return $key;
-                }
-                // Intentionally fall through
-            case GPBType::STRING:
-                // PHP associative array stores int string as int for key.
-                return strval($key);
-            case GPBType::BOOL:
-                // PHP associative array stores bool as integer for key.
-                return boolval($key);
-            default:
-                return $key;
-        }
-    }
-
-    /**
-     * Move to the next position.
-     *
-     * @return void
-     * @todo need to add return type void (require update php version to 7.1)
-     */
-    #[\ReturnTypeWillChange]
-    public function next()
-    {
-        next($this->container);
-    }
-
-    /**
-     * Check whether there are more elements to iterate.
-     *
-     * @return bool True if there are more elements to iterate.
-     */
-    public function valid(): bool
-    {
-        return key($this->container) !== null;
-    }
-}
diff --git a/libs/protobuf/php/src/Google/Protobuf/Internal/Message.php b/libs/protobuf/php/src/Google/Protobuf/Internal/Message.php
deleted file mode 100644
index 1d1fbf2..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/Internal/Message.php
+++ /dev/null
@@ -1,2034 +0,0 @@
-<?php
-
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-/**
- * Defines Message, the parent class extended by all protocol message classes.
- */
-
-namespace Google\Protobuf\Internal;
-
-use Google\Protobuf\Internal\CodedInputStream;
-use Google\Protobuf\Internal\CodedOutputStream;
-use Google\Protobuf\Internal\DescriptorPool;
-use Google\Protobuf\Internal\GPBLabel;
-use Google\Protobuf\Internal\GPBType;
-use Google\Protobuf\Internal\GPBWire;
-use Google\Protobuf\Internal\MapEntry;
-use Google\Protobuf\Internal\RepeatedField;
-use Google\Protobuf\ListValue;
-use Google\Protobuf\Value;
-use Google\Protobuf\Struct;
-use Google\Protobuf\NullValue;
-
-/**
- * Parent class of all proto messages. Users should not instantiate this class
- * or extend this class or its child classes by their own.  See the comment of
- * specific functions for more details.
- */
-class Message
-{
-
-    /**
-     * @ignore
-     */
-    private $desc;
-    private $unknown = "";
-
-    /**
-     * @ignore
-     */
-    public function __construct($data = NULL)
-    {
-        // MapEntry message is shared by all types of map fields, whose
-        // descriptors are different from each other. Thus, we cannot find a
-        // specific descriptor from the descriptor pool.
-        if ($this instanceof MapEntry) {
-            $this->initWithDescriptor($data);
-        } else {
-            $this->initWithGeneratedPool();
-            if (is_array($data)) {
-                $this->mergeFromArray($data);
-            } else if (!empty($data)) {
-                throw new \InvalidArgumentException(
-                    'Message constructor must be an array or null.'
-                );
-            }
-        }
-    }
-
-    /**
-     * @ignore
-     */
-    private function initWithGeneratedPool()
-    {
-        $pool = DescriptorPool::getGeneratedPool();
-        $this->desc = $pool->getDescriptorByClassName(get_class($this));
-        if (is_null($this->desc)) {
-          throw new \InvalidArgumentException(
-            get_class($this) ." is not found in descriptor pool. " .
-            'Only generated classes may derive from Message.');
-        }
-        foreach ($this->desc->getField() as $field) {
-            $setter = $field->getSetter();
-            if ($field->isMap()) {
-                $message_type = $field->getMessageType();
-                $key_field = $message_type->getFieldByNumber(1);
-                $value_field = $message_type->getFieldByNumber(2);
-                switch ($value_field->getType()) {
-                    case GPBType::MESSAGE:
-                    case GPBType::GROUP:
-                        $map_field = new MapField(
-                            $key_field->getType(),
-                            $value_field->getType(),
-                            $value_field->getMessageType()->getClass());
-                        $this->$setter($map_field);
-                        break;
-                    case GPBType::ENUM:
-                        $map_field = new MapField(
-                            $key_field->getType(),
-                            $value_field->getType(),
-                            $value_field->getEnumType()->getClass());
-                        $this->$setter($map_field);
-                        break;
-                    default:
-                        $map_field = new MapField(
-                            $key_field->getType(),
-                            $value_field->getType());
-                        $this->$setter($map_field);
-                        break;
-                }
-            } else if ($field->getLabel() === GPBLabel::REPEATED) {
-                switch ($field->getType()) {
-                    case GPBType::MESSAGE:
-                    case GPBType::GROUP:
-                        $repeated_field = new RepeatedField(
-                            $field->getType(),
-                            $field->getMessageType()->getClass());
-                        $this->$setter($repeated_field);
-                        break;
-                    case GPBType::ENUM:
-                        $repeated_field = new RepeatedField(
-                            $field->getType(),
-                            $field->getEnumType()->getClass());
-                        $this->$setter($repeated_field);
-                        break;
-                    default:
-                        $repeated_field = new RepeatedField($field->getType());
-                        $this->$setter($repeated_field);
-                        break;
-                }
-            } else if ($field->getOneofIndex() !== -1) {
-                $oneof = $this->desc->getOneofDecl()[$field->getOneofIndex()];
-                $oneof_name = $oneof->getName();
-                $this->$oneof_name = new OneofField($oneof);
-            } else if ($field->getLabel() === GPBLabel::OPTIONAL &&
-                       PHP_INT_SIZE == 4) {
-                switch ($field->getType()) {
-                    case GPBType::INT64:
-                    case GPBType::UINT64:
-                    case GPBType::FIXED64:
-                    case GPBType::SFIXED64:
-                    case GPBType::SINT64:
-                        $this->$setter("0");
-                }
-            }
-        }
-    }
-
-    /**
-     * @ignore
-     */
-    private function initWithDescriptor(Descriptor $desc)
-    {
-        $this->desc = $desc;
-        foreach ($desc->getField() as $field) {
-            $setter = $field->getSetter();
-            $defaultValue = $this->defaultValue($field);
-            $this->$setter($defaultValue);
-        }
-    }
-
-    protected function readWrapperValue($member)
-    {
-        $field = $this->desc->getFieldByName($member);
-        $oneof_index = $field->getOneofIndex();
-        if ($oneof_index === -1) {
-            $wrapper = $this->$member;
-        } else {
-            $wrapper = $this->readOneof($field->getNumber());
-        }
-
-        if (is_null($wrapper)) {
-            return NULL;
-        } else {
-            return $wrapper->getValue();
-        }
-    }
-
-    protected function writeWrapperValue($member, $value)
-    {
-        $field = $this->desc->getFieldByName($member);
-        $wrapped_value = $value;
-        if (!is_null($value)) {
-            $desc = $field->getMessageType();
-            $klass = $desc->getClass();
-            $wrapped_value = new $klass;
-            $wrapped_value->setValue($value);
-        }
-
-        $oneof_index = $field->getOneofIndex();
-        if ($oneof_index === -1) {
-            $this->$member = $wrapped_value;
-        } else {
-            $this->writeOneof($field->getNumber(), $wrapped_value);
-        }
-    }
-
-    protected function readOneof($number)
-    {
-        $field = $this->desc->getFieldByNumber($number);
-        $oneof = $this->desc->getOneofDecl()[$field->getOneofIndex()];
-        $oneof_name = $oneof->getName();
-        $oneof_field = $this->$oneof_name;
-        if ($number === $oneof_field->getNumber()) {
-            return $oneof_field->getValue();
-        } else {
-            return $this->defaultValue($field);
-        }
-    }
-
-    protected function hasOneof($number)
-    {
-        $field = $this->desc->getFieldByNumber($number);
-        $oneof = $this->desc->getOneofDecl()[$field->getOneofIndex()];
-        $oneof_name = $oneof->getName();
-        $oneof_field = $this->$oneof_name;
-        return $number === $oneof_field->getNumber();
-    }
-
-    protected function writeOneof($number, $value)
-    {
-        $field = $this->desc->getFieldByNumber($number);
-        $oneof = $this->desc->getOneofDecl()[$field->getOneofIndex()];
-        $oneof_name = $oneof->getName();
-        if ($value === null) {
-            $this->$oneof_name = new OneofField($oneof);
-        } else {
-            $oneof_field = $this->$oneof_name;
-            $oneof_field->setValue($value);
-            $oneof_field->setFieldName($field->getName());
-            $oneof_field->setNumber($number);
-        }
-    }
-
-    protected function whichOneof($oneof_name)
-    {
-        $oneof_field = $this->$oneof_name;
-        $number = $oneof_field->getNumber();
-        if ($number == 0) {
-          return "";
-        }
-        $field = $this->desc->getFieldByNumber($number);
-        return $field->getName();
-    }
-
-    /**
-     * @ignore
-     */
-    private function defaultValue($field)
-    {
-        $value = null;
-
-        switch ($field->getType()) {
-            case GPBType::DOUBLE:
-            case GPBType::FLOAT:
-                return 0.0;
-            case GPBType::UINT32:
-            case GPBType::INT32:
-            case GPBType::FIXED32:
-            case GPBType::SFIXED32:
-            case GPBType::SINT32:
-            case GPBType::ENUM:
-                return 0;
-            case GPBType::INT64:
-            case GPBType::UINT64:
-            case GPBType::FIXED64:
-            case GPBType::SFIXED64:
-            case GPBType::SINT64:
-                if (PHP_INT_SIZE === 4) {
-                    return '0';
-                } else {
-                    return 0;
-                }
-            case GPBType::BOOL:
-                return false;
-            case GPBType::STRING:
-            case GPBType::BYTES:
-                return "";
-            case GPBType::GROUP:
-            case GPBType::MESSAGE:
-                return null;
-            default:
-                user_error("Unsupported type.");
-                return false;
-        }
-    }
-
-    /**
-     * @ignore
-     */
-    private function skipField($input, $tag)
-    {
-        $number = GPBWire::getTagFieldNumber($tag);
-        if ($number === 0) {
-            throw new GPBDecodeException("Illegal field number zero.");
-        }
-
-        $start = $input->current();
-        switch (GPBWire::getTagWireType($tag)) {
-            case GPBWireType::VARINT:
-                $uint64 = 0;
-                if (!$input->readVarint64($uint64)) {
-                    throw new GPBDecodeException(
-                        "Unexpected EOF inside varint.");
-                }
-                break;
-            case GPBWireType::FIXED64:
-                $uint64 = 0;
-                if (!$input->readLittleEndian64($uint64)) {
-                    throw new GPBDecodeException(
-                        "Unexpected EOF inside fixed64.");
-                }
-                break;
-            case GPBWireType::FIXED32:
-                $uint32 = 0;
-                if (!$input->readLittleEndian32($uint32)) {
-                    throw new GPBDecodeException(
-                        "Unexpected EOF inside fixed32.");
-                }
-                break;
-            case GPBWireType::LENGTH_DELIMITED:
-                $length = 0;
-                if (!$input->readVarint32($length)) {
-                    throw new GPBDecodeException(
-                        "Unexpected EOF inside length.");
-                }
-                $data = NULL;
-                if (!$input->readRaw($length, $data)) {
-                    throw new GPBDecodeException(
-                        "Unexpected EOF inside length delimited data.");
-                }
-                break;
-            case GPBWireType::START_GROUP:
-            case GPBWireType::END_GROUP:
-                throw new GPBDecodeException("Unexpected wire type.");
-            default:
-                throw new GPBDecodeException("Unexpected wire type.");
-        }
-        $end = $input->current();
-
-        $bytes = str_repeat(chr(0), CodedOutputStream::MAX_VARINT64_BYTES);
-        $size = CodedOutputStream::writeVarintToArray($tag, $bytes, true);
-        $this->unknown .= substr($bytes, 0, $size) . $input->substr($start, $end);
-    }
-
-    /**
-     * @ignore
-     */
-    private static function parseFieldFromStreamNoTag($input, $field, &$value)
-    {
-        switch ($field->getType()) {
-            case GPBType::DOUBLE:
-                if (!GPBWire::readDouble($input, $value)) {
-                    throw new GPBDecodeException(
-                        "Unexpected EOF inside double field.");
-                }
-                break;
-            case GPBType::FLOAT:
-                if (!GPBWire::readFloat($input, $value)) {
-                    throw new GPBDecodeException(
-                        "Unexpected EOF inside float field.");
-                }
-                break;
-            case GPBType::INT64:
-                if (!GPBWire::readInt64($input, $value)) {
-                    throw new GPBDecodeException(
-                        "Unexpected EOF inside int64 field.");
-                }
-                break;
-            case GPBType::UINT64:
-                if (!GPBWire::readUint64($input, $value)) {
-                    throw new GPBDecodeException(
-                        "Unexpected EOF inside uint64 field.");
-                }
-                break;
-            case GPBType::INT32:
-                if (!GPBWire::readInt32($input, $value)) {
-                    throw new GPBDecodeException(
-                        "Unexpected EOF inside int32 field.");
-                }
-                break;
-            case GPBType::FIXED64:
-                if (!GPBWire::readFixed64($input, $value)) {
-                    throw new GPBDecodeException(
-                        "Unexpected EOF inside fixed64 field.");
-                }
-                break;
-            case GPBType::FIXED32:
-                if (!GPBWire::readFixed32($input, $value)) {
-                    throw new GPBDecodeException(
-                        "Unexpected EOF inside fixed32 field.");
-                }
-                break;
-            case GPBType::BOOL:
-                if (!GPBWire::readBool($input, $value)) {
-                    throw new GPBDecodeException(
-                        "Unexpected EOF inside bool field.");
-                }
-                break;
-            case GPBType::STRING:
-                // TODO(teboring): Add utf-8 check.
-                if (!GPBWire::readString($input, $value)) {
-                    throw new GPBDecodeException(
-                        "Unexpected EOF inside string field.");
-                }
-                break;
-            case GPBType::GROUP:
-                trigger_error("Not implemented.", E_USER_ERROR);
-                break;
-            case GPBType::MESSAGE:
-                if ($field->isMap()) {
-                    $value = new MapEntry($field->getMessageType());
-                } else {
-                    $klass = $field->getMessageType()->getClass();
-                    $value = new $klass;
-                }
-                if (!GPBWire::readMessage($input, $value)) {
-                    throw new GPBDecodeException(
-                        "Unexpected EOF inside message.");
-                }
-                break;
-            case GPBType::BYTES:
-                if (!GPBWire::readString($input, $value)) {
-                    throw new GPBDecodeException(
-                        "Unexpected EOF inside bytes field.");
-                }
-                break;
-            case GPBType::UINT32:
-                if (!GPBWire::readUint32($input, $value)) {
-                    throw new GPBDecodeException(
-                        "Unexpected EOF inside uint32 field.");
-                }
-                break;
-            case GPBType::ENUM:
-                // TODO(teboring): Check unknown enum value.
-                if (!GPBWire::readInt32($input, $value)) {
-                    throw new GPBDecodeException(
-                        "Unexpected EOF inside enum field.");
-                }
-                break;
-            case GPBType::SFIXED32:
-                if (!GPBWire::readSfixed32($input, $value)) {
-                    throw new GPBDecodeException(
-                        "Unexpected EOF inside sfixed32 field.");
-                }
-                break;
-            case GPBType::SFIXED64:
-                if (!GPBWire::readSfixed64($input, $value)) {
-                    throw new GPBDecodeException(
-                        "Unexpected EOF inside sfixed64 field.");
-                }
-                break;
-            case GPBType::SINT32:
-                if (!GPBWire::readSint32($input, $value)) {
-                    throw new GPBDecodeException(
-                        "Unexpected EOF inside sint32 field.");
-                }
-                break;
-            case GPBType::SINT64:
-                if (!GPBWire::readSint64($input, $value)) {
-                    throw new GPBDecodeException(
-                        "Unexpected EOF inside sint64 field.");
-                }
-                break;
-            default:
-                user_error("Unsupported type.");
-                return false;
-        }
-        return true;
-    }
-
-    /**
-     * @ignore
-     */
-    private function parseFieldFromStream($tag, $input, $field)
-    {
-        $value = null;
-
-        if (is_null($field)) {
-            $value_format = GPBWire::UNKNOWN;
-        } elseif (GPBWire::getTagWireType($tag) ===
-            GPBWire::getWireType($field->getType())) {
-            $value_format = GPBWire::NORMAL_FORMAT;
-        } elseif ($field->isPackable() &&
-            GPBWire::getTagWireType($tag) ===
-            GPBWire::WIRETYPE_LENGTH_DELIMITED) {
-            $value_format = GPBWire::PACKED_FORMAT;
-        } else {
-            // the wire type doesn't match. Put it in our unknown field set.
-            $value_format = GPBWire::UNKNOWN;
-        }
-
-        if ($value_format === GPBWire::UNKNOWN) {
-            $this->skipField($input, $tag);
-            return;
-        } elseif ($value_format === GPBWire::NORMAL_FORMAT) {
-            self::parseFieldFromStreamNoTag($input, $field, $value);
-        } elseif ($value_format === GPBWire::PACKED_FORMAT) {
-            $length = 0;
-            if (!GPBWire::readInt32($input, $length)) {
-                throw new GPBDecodeException(
-                    "Unexpected EOF inside packed length.");
-            }
-            $limit = $input->pushLimit($length);
-            $getter = $field->getGetter();
-            while ($input->bytesUntilLimit() > 0) {
-                self::parseFieldFromStreamNoTag($input, $field, $value);
-                $this->appendHelper($field, $value);
-            }
-            $input->popLimit($limit);
-            return;
-        } else {
-            return;
-        }
-
-        if ($field->isMap()) {
-            $this->kvUpdateHelper($field, $value->getKey(), $value->getValue());
-        } else if ($field->isRepeated()) {
-            $this->appendHelper($field, $value);
-        } else {
-            $setter = $field->getSetter();
-            $this->$setter($value);
-        }
-    }
-
-    /**
-     * Clear all containing fields.
-     * @return null.
-     */
-    public function clear()
-    {
-        $this->unknown = "";
-        foreach ($this->desc->getField() as $field) {
-            $setter = $field->getSetter();
-            if ($field->isMap()) {
-                $message_type = $field->getMessageType();
-                $key_field = $message_type->getFieldByNumber(1);
-                $value_field = $message_type->getFieldByNumber(2);
-                switch ($value_field->getType()) {
-                    case GPBType::MESSAGE:
-                    case GPBType::GROUP:
-                        $map_field = new MapField(
-                            $key_field->getType(),
-                            $value_field->getType(),
-                            $value_field->getMessageType()->getClass());
-                        $this->$setter($map_field);
-                        break;
-                    case GPBType::ENUM:
-                        $map_field = new MapField(
-                            $key_field->getType(),
-                            $value_field->getType(),
-                            $value_field->getEnumType()->getClass());
-                        $this->$setter($map_field);
-                        break;
-                    default:
-                        $map_field = new MapField(
-                            $key_field->getType(),
-                            $value_field->getType());
-                        $this->$setter($map_field);
-                        break;
-                }
-            } else if ($field->getLabel() === GPBLabel::REPEATED) {
-                switch ($field->getType()) {
-                    case GPBType::MESSAGE:
-                    case GPBType::GROUP:
-                        $repeated_field = new RepeatedField(
-                            $field->getType(),
-                            $field->getMessageType()->getClass());
-                        $this->$setter($repeated_field);
-                        break;
-                    case GPBType::ENUM:
-                        $repeated_field = new RepeatedField(
-                            $field->getType(),
-                            $field->getEnumType()->getClass());
-                        $this->$setter($repeated_field);
-                        break;
-                    default:
-                        $repeated_field = new RepeatedField($field->getType());
-                        $this->$setter($repeated_field);
-                        break;
-                }
-            } else if ($field->getOneofIndex() !== -1) {
-                $oneof = $this->desc->getOneofDecl()[$field->getOneofIndex()];
-                $oneof_name = $oneof->getName();
-                $this->$oneof_name = new OneofField($oneof);
-            } else if ($field->getLabel() === GPBLabel::OPTIONAL) {
-                switch ($field->getType()) {
-                    case GPBType::DOUBLE   :
-                    case GPBType::FLOAT    :
-                        $this->$setter(0.0);
-                        break;
-                    case GPBType::INT32    :
-                    case GPBType::FIXED32  :
-                    case GPBType::UINT32   :
-                    case GPBType::SFIXED32 :
-                    case GPBType::SINT32   :
-                    case GPBType::ENUM     :
-                        $this->$setter(0);
-                        break;
-                    case GPBType::BOOL     :
-                        $this->$setter(false);
-                        break;
-                    case GPBType::STRING   :
-                    case GPBType::BYTES    :
-                        $this->$setter("");
-                        break;
-                    case GPBType::GROUP    :
-                    case GPBType::MESSAGE  :
-                        $null = null;
-                        $this->$setter($null);
-                        break;
-                }
-                if (PHP_INT_SIZE == 4) {
-                    switch ($field->getType()) {
-                        case GPBType::INT64:
-                        case GPBType::UINT64:
-                        case GPBType::FIXED64:
-                        case GPBType::SFIXED64:
-                        case GPBType::SINT64:
-                            $this->$setter("0");
-                    }
-                } else {
-                    switch ($field->getType()) {
-                        case GPBType::INT64:
-                        case GPBType::UINT64:
-                        case GPBType::FIXED64:
-                        case GPBType::SFIXED64:
-                        case GPBType::SINT64:
-                            $this->$setter(0);
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * Clear all unknown fields previously parsed.
-     * @return null.
-     */
-    public function discardUnknownFields()
-    {
-        $this->unknown = "";
-        foreach ($this->desc->getField() as $field) {
-            if ($field->getType() != GPBType::MESSAGE) {
-                continue;
-            }
-            if ($field->isMap()) {
-                $value_field = $field->getMessageType()->getFieldByNumber(2);
-                if ($value_field->getType() != GPBType::MESSAGE) {
-                    continue;
-                }
-                $getter = $field->getGetter();
-                $map = $this->$getter();
-                foreach ($map as $key => $value) {
-                    $value->discardUnknownFields();
-                }
-            } else if ($field->getLabel() === GPBLabel::REPEATED) {
-                $getter = $field->getGetter();
-                $arr = $this->$getter();
-                foreach ($arr as $sub) {
-                    $sub->discardUnknownFields();
-                }
-            } else if ($field->getLabel() === GPBLabel::OPTIONAL) {
-                $getter = $field->getGetter();
-                $sub = $this->$getter();
-                if (!is_null($sub)) {
-                    $sub->discardUnknownFields();
-                }
-            }
-        }
-    }
-
-    /**
-     * Merges the contents of the specified message into current message.
-     *
-     * This method merges the contents of the specified message into the
-     * current message. Singular fields that are set in the specified message
-     * overwrite the corresponding fields in the current message.  Repeated
-     * fields are appended. Map fields key-value pairs are overwritten.
-     * Singular/Oneof sub-messages are recursively merged. All overwritten
-     * sub-messages are deep-copied.
-     *
-     * @param object $msg Protobuf message to be merged from.
-     * @return null.
-     */
-    public function mergeFrom($msg)
-    {
-        if (get_class($this) !== get_class($msg)) {
-            user_error("Cannot merge messages with different class.");
-            return;
-        }
-
-        foreach ($this->desc->getField() as $field) {
-            $setter = $field->getSetter();
-            $getter = $field->getGetter();
-            if ($field->isMap()) {
-                if (count($msg->$getter()) != 0) {
-                    $value_field = $field->getMessageType()->getFieldByNumber(2);
-                    foreach ($msg->$getter() as $key => $value) {
-                        if ($value_field->getType() == GPBType::MESSAGE) {
-                            $klass = $value_field->getMessageType()->getClass();
-                            $copy = new $klass;
-                            $copy->mergeFrom($value);
-
-                            $this->kvUpdateHelper($field, $key, $copy);
-                        } else {
-                            $this->kvUpdateHelper($field, $key, $value);
-                        }
-                    }
-                }
-            } else if ($field->getLabel() === GPBLabel::REPEATED) {
-                if (count($msg->$getter()) != 0) {
-                    foreach ($msg->$getter() as $tmp) {
-                        if ($field->getType() == GPBType::MESSAGE) {
-                            $klass = $field->getMessageType()->getClass();
-                            $copy = new $klass;
-                            $copy->mergeFrom($tmp);
-                            $this->appendHelper($field, $copy);
-                        } else {
-                            $this->appendHelper($field, $tmp);
-                        }
-                    }
-                }
-            } else if ($field->getLabel() === GPBLabel::OPTIONAL) {
-                if($msg->$getter() !== $this->defaultValue($field)) {
-                    $tmp = $msg->$getter();
-                    if ($field->getType() == GPBType::MESSAGE) {
-                        if (is_null($this->$getter())) {
-                            $klass = $field->getMessageType()->getClass();
-                            $new_msg = new $klass;
-                            $this->$setter($new_msg);
-                        }
-                        $this->$getter()->mergeFrom($tmp);
-                    } else {
-                        $this->$setter($tmp);
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * Parses a protocol buffer contained in a string.
-     *
-     * This function takes a string in the (non-human-readable) binary wire
-     * format, matching the encoding output by serializeToString().
-     * See mergeFrom() for merging behavior, if the field is already set in the
-     * specified message.
-     *
-     * @param string $data Binary protobuf data.
-     * @return null.
-     * @throws \Exception Invalid data.
-     */
-    public function mergeFromString($data)
-    {
-        $input = new CodedInputStream($data);
-        $this->parseFromStream($input);
-    }
-
-    /**
-     * Parses a json string to protobuf message.
-     *
-     * This function takes a string in the json wire format, matching the
-     * encoding output by serializeToJsonString().
-     * See mergeFrom() for merging behavior, if the field is already set in the
-     * specified message.
-     *
-     * @param string $data Json protobuf data.
-     * @return null.
-     * @throws \Exception Invalid data.
-     */
-    public function mergeFromJsonString($data, $ignore_unknown = false)
-    {
-        $input = new RawInputStream($data);
-        $this->parseFromJsonStream($input, $ignore_unknown);
-    }
-
-    /**
-     * @ignore
-     */
-    public function parseFromStream($input)
-    {
-        while (true) {
-            $tag = $input->readTag();
-            // End of input.  This is a valid place to end, so return true.
-            if ($tag === 0) {
-                return true;
-            }
-
-            $number = GPBWire::getTagFieldNumber($tag);
-            $field = $this->desc->getFieldByNumber($number);
-
-            $this->parseFieldFromStream($tag, $input, $field);
-        }
-    }
-
-    private function convertJsonValueToProtoValue(
-        $value,
-        $field,
-        $ignore_unknown,
-        $is_map_key = false)
-    {
-        switch ($field->getType()) {
-            case GPBType::MESSAGE:
-                $klass = $field->getMessageType()->getClass();
-                $submsg = new $klass;
-
-                if (is_a($submsg, "Google\Protobuf\Duration")) {
-                    if (is_null($value)) {
-                        return $this->defaultValue($field);
-                    } else if (!is_string($value)) {
-                        throw new GPBDecodeException("Expect string.");
-                    }
-                    return GPBUtil::parseDuration($value);
-                } else if ($field->isTimestamp()) {
-                    if (is_null($value)) {
-                        return $this->defaultValue($field);
-                    } else if (!is_string($value)) {
-                        throw new GPBDecodeException("Expect string.");
-                    }
-                    try {
-                        $timestamp = GPBUtil::parseTimestamp($value);
-                    } catch (\Exception $e) {
-                        throw new GPBDecodeException(
-                            "Invalid RFC 3339 timestamp: ".$e->getMessage());
-                    }
-
-                    $submsg->setSeconds($timestamp->getSeconds());
-                    $submsg->setNanos($timestamp->getNanos());
-                } else if (is_a($submsg, "Google\Protobuf\FieldMask")) {
-                    if (is_null($value)) {
-                        return $this->defaultValue($field);
-                    }
-                    try {
-                        return GPBUtil::parseFieldMask($value);
-                    } catch (\Exception $e) {
-                        throw new GPBDecodeException(
-                            "Invalid FieldMask: ".$e->getMessage());
-                    }
-                } else {
-                    if (is_null($value) &&
-                        !is_a($submsg, "Google\Protobuf\Value")) {
-                        return $this->defaultValue($field);
-                    }
-                    if (GPBUtil::hasSpecialJsonMapping($submsg)) {
-                    } elseif (!is_object($value) && !is_array($value)) {
-                        throw new GPBDecodeException("Expect message.");
-                    }
-                    $submsg->mergeFromJsonArray($value, $ignore_unknown);
-                }
-                return $submsg;
-            case GPBType::ENUM:
-                if (is_null($value)) {
-                    return $this->defaultValue($field);
-                }
-                if (is_integer($value)) {
-                    return $value;
-                }
-                $enum_value = $field->getEnumType()->getValueByName($value);
-                if (!is_null($enum_value)) {
-                    return $enum_value->getNumber();
-                } else if ($ignore_unknown) {
-                    return $this->defaultValue($field);
-                } else {
-                  throw new GPBDecodeException(
-                          "Enum field only accepts integer or enum value name");
-                }
-            case GPBType::STRING:
-                if (is_null($value)) {
-                    return $this->defaultValue($field);
-                }
-                if (is_numeric($value)) {
-                    return strval($value);
-                }
-                if (!is_string($value)) {
-                    throw new GPBDecodeException(
-                        "String field only accepts string value");
-                }
-                return $value;
-            case GPBType::BYTES:
-                if (is_null($value)) {
-                    return $this->defaultValue($field);
-                }
-                if (!is_string($value)) {
-                    throw new GPBDecodeException(
-                        "Byte field only accepts string value");
-                }
-                $proto_value = base64_decode($value, true);
-                if ($proto_value === false) {
-                    throw new GPBDecodeException("Invalid base64 characters");
-                }
-                return $proto_value;
-            case GPBType::BOOL:
-                if (is_null($value)) {
-                    return $this->defaultValue($field);
-                }
-                if ($is_map_key) {
-                    if ($value === "true") {
-                        return true;
-                    }
-                    if ($value === "false") {
-                        return false;
-                    }
-                    throw new GPBDecodeException(
-                        "Bool field only accepts bool value");
-                }
-                if (!is_bool($value)) {
-                    throw new GPBDecodeException(
-                        "Bool field only accepts bool value");
-                }
-                return $value;
-            case GPBType::FLOAT:
-            case GPBType::DOUBLE:
-                if (is_null($value)) {
-                    return $this->defaultValue($field);
-                }
-                if ($value === "Infinity") {
-                    return INF;
-                }
-                if ($value === "-Infinity") {
-                    return -INF;
-                }
-                if ($value === "NaN") {
-                    return NAN;
-                }
-                return $value;
-            case GPBType::INT32:
-            case GPBType::SINT32:
-            case GPBType::SFIXED32:
-                if (is_null($value)) {
-                    return $this->defaultValue($field);
-                }
-                if (!is_numeric($value)) {
-                   throw new GPBDecodeException(
-                       "Invalid data type for int32 field");
-                }
-                if (is_string($value) && trim($value) !== $value) {
-                   throw new GPBDecodeException(
-                       "Invalid data type for int32 field");
-                }
-                if (bccomp($value, "2147483647") > 0) {
-                   throw new GPBDecodeException(
-                       "Int32 too large");
-                }
-                if (bccomp($value, "-2147483648") < 0) {
-                   throw new GPBDecodeException(
-                       "Int32 too small");
-                }
-                return $value;
-            case GPBType::UINT32:
-            case GPBType::FIXED32:
-                if (is_null($value)) {
-                    return $this->defaultValue($field);
-                }
-                if (!is_numeric($value)) {
-                   throw new GPBDecodeException(
-                       "Invalid data type for uint32 field");
-                }
-                if (is_string($value) && trim($value) !== $value) {
-                   throw new GPBDecodeException(
-                       "Invalid data type for int32 field");
-                }
-                if (bccomp($value, 4294967295) > 0) {
-                    throw new GPBDecodeException(
-                        "Uint32 too large");
-                }
-                return $value;
-            case GPBType::INT64:
-            case GPBType::SINT64:
-            case GPBType::SFIXED64:
-                if (is_null($value)) {
-                    return $this->defaultValue($field);
-                }
-                if (!is_numeric($value)) {
-                   throw new GPBDecodeException(
-                       "Invalid data type for int64 field");
-                }
-                if (is_string($value) && trim($value) !== $value) {
-                   throw new GPBDecodeException(
-                       "Invalid data type for int64 field");
-                }
-                if (bccomp($value, "9223372036854775807") > 0) {
-                    throw new GPBDecodeException(
-                        "Int64 too large");
-                }
-                if (bccomp($value, "-9223372036854775808") < 0) {
-                    throw new GPBDecodeException(
-                        "Int64 too small");
-                }
-                return $value;
-            case GPBType::UINT64:
-            case GPBType::FIXED64:
-                if (is_null($value)) {
-                    return $this->defaultValue($field);
-                }
-                if (!is_numeric($value)) {
-                   throw new GPBDecodeException(
-                       "Invalid data type for int64 field");
-                }
-                if (is_string($value) && trim($value) !== $value) {
-                   throw new GPBDecodeException(
-                       "Invalid data type for int64 field");
-                }
-                if (bccomp($value, "18446744073709551615") > 0) {
-                    throw new GPBDecodeException(
-                        "Uint64 too large");
-                }
-                if (bccomp($value, "9223372036854775807") > 0) {
-                    $value = bcsub($value, "18446744073709551616");
-                }
-                return $value;
-            default:
-                return $value;
-        }
-    }
-
-    /**
-     * Populates the message from a user-supplied PHP array. Array keys
-     * correspond to Message properties and nested message properties.
-     *
-     * Example:
-     * ```
-     * $message->mergeFromArray([
-     *     'name' => 'This is a message name',
-     *     'interval' => [
-     *          'startTime' => time() - 60,
-     *          'endTime' => time(),
-     *     ]
-     * ]);
-     * ```
-     *
-     * This method will trigger an error if it is passed data that cannot
-     * be converted to the correct type. For example, a StringValue field
-     * must receive data that is either a string or a StringValue object.
-     *
-     * @param array $array An array containing message properties and values.
-     * @return null.
-     */
-    protected function mergeFromArray(array $array)
-    {
-        // Just call the setters for the field names
-        foreach ($array as $key => $value) {
-            $field = $this->desc->getFieldByName($key);
-            if (is_null($field)) {
-                throw new \UnexpectedValueException(
-                    'Invalid message property: ' . $key);
-            }
-            $setter = $field->getSetter();
-            if ($field->isMap()) {
-                $valueField = $field->getMessageType()->getFieldByName('value');
-                if (!is_null($valueField) && $valueField->isWrapperType()) {
-                    self::normalizeArrayElementsToMessageType($value, $valueField->getMessageType()->getClass());
-                }
-            } elseif ($field->isWrapperType()) {
-                $class = $field->getMessageType()->getClass();
-                if ($field->isRepeated()) {
-                    self::normalizeArrayElementsToMessageType($value, $class);
-                } else {
-                    self::normalizeToMessageType($value, $class);
-                }
-            }
-            $this->$setter($value);
-        }
-    }
-
-    /**
-     * Tries to normalize the elements in $value into a provided protobuf
-     * wrapper type $class. If $value is any type other than array, we do
-     * not do any conversion, and instead rely on the existing protobuf
-     * type checking. If $value is an array, we process each element and
-     * try to convert it to an instance of $class.
-     *
-     * @param mixed $value The array of values to normalize.
-     * @param string $class The expected wrapper class name
-     */
-    private static function normalizeArrayElementsToMessageType(&$value, $class)
-    {
-        if (!is_array($value)) {
-            // In the case that $value is not an array, we do not want to
-            // attempt any conversion. Note that this includes the cases
-            // when $value is a RepeatedField of MapField. In those cases,
-            // we do not need to convert the elements, as they should
-            // already be the correct types.
-            return;
-        } else {
-            // Normalize each element in the array.
-            foreach ($value as $key => &$elementValue) {
-              self::normalizeToMessageType($elementValue, $class);
-            }
-        }
-    }
-
-    /**
-     * Tries to normalize $value into a provided protobuf wrapper type $class.
-     * If $value is any type other than an object, we attempt to construct an
-     * instance of $class and assign $value to it using the setValue method
-     * shared by all wrapper types.
-     *
-     * This method will raise an error if it receives a type that cannot be
-     * assigned to the wrapper type via setValue.
-     *
-     * @param mixed $value The value to normalize.
-     * @param string $class The expected wrapper class name
-     */
-    private static function normalizeToMessageType(&$value, $class)
-    {
-        if (is_null($value) || is_object($value)) {
-            // This handles the case that $value is an instance of $class. We
-            // choose not to do any more strict checking here, relying on the
-            // existing type checking done by GPBUtil.
-            return;
-        } else {
-            // Try to instantiate $class and set the value
-            try {
-                $msg = new $class;
-                $msg->setValue($value);
-                $value = $msg;
-                return;
-            } catch (\Exception $exception) {
-                trigger_error(
-                    "Error normalizing value to type '$class': " . $exception->getMessage(),
-                    E_USER_ERROR
-                );
-            }
-        }
-    }
-
-    protected function mergeFromJsonArray($array, $ignore_unknown)
-    {
-        if (is_a($this, "Google\Protobuf\Any")) {
-            $this->clear();
-            $this->setTypeUrl($array["@type"]);
-            $msg = $this->unpack();
-            if (GPBUtil::hasSpecialJsonMapping($msg)) {
-                $msg->mergeFromJsonArray($array["value"], $ignore_unknown);
-            } else {
-                unset($array["@type"]);
-                $msg->mergeFromJsonArray($array, $ignore_unknown);
-            }
-            $this->setValue($msg->serializeToString());
-            return;
-        }
-        if (is_a($this, "Google\Protobuf\DoubleValue") ||
-            is_a($this, "Google\Protobuf\FloatValue")  ||
-            is_a($this, "Google\Protobuf\Int64Value")  ||
-            is_a($this, "Google\Protobuf\UInt64Value") ||
-            is_a($this, "Google\Protobuf\Int32Value")  ||
-            is_a($this, "Google\Protobuf\UInt32Value") ||
-            is_a($this, "Google\Protobuf\BoolValue")   ||
-            is_a($this, "Google\Protobuf\StringValue")) {
-            $this->setValue($array);
-            return;
-        }
-        if (is_a($this, "Google\Protobuf\BytesValue")) {
-            $this->setValue(base64_decode($array));
-            return;
-        }
-        if (is_a($this, "Google\Protobuf\Duration")) {
-            $this->mergeFrom(GPBUtil::parseDuration($array));
-            return;
-        }
-        if (is_a($this, "Google\Protobuf\FieldMask")) {
-            $this->mergeFrom(GPBUtil::parseFieldMask($array));
-            return;
-        }
-        if (is_a($this, "Google\Protobuf\Timestamp")) {
-            $this->mergeFrom(GPBUtil::parseTimestamp($array));
-            return;
-        }
-        if (is_a($this, "Google\Protobuf\Struct")) {
-            $fields = $this->getFields();
-            foreach($array as $key => $value) {
-                $v = new Value();
-                $v->mergeFromJsonArray($value, $ignore_unknown);
-                $fields[$key] = $v;
-            }
-            return;
-        }
-        if (is_a($this, "Google\Protobuf\Value")) {
-            if (is_bool($array)) {
-                $this->setBoolValue($array);
-            } elseif (is_string($array)) {
-                $this->setStringValue($array);
-            } elseif (is_null($array)) {
-                $this->setNullValue(0);
-            } elseif (is_double($array) || is_integer($array)) {
-                $this->setNumberValue($array);
-            } elseif (is_array($array)) {
-                if (array_values($array) !== $array) {
-                    // Associative array
-                    $struct_value = $this->getStructValue();
-                    if (is_null($struct_value)) {
-                        $struct_value = new Struct();
-                        $this->setStructValue($struct_value);
-                    }
-                    foreach ($array as $key => $v) {
-                        $value = new Value();
-                        $value->mergeFromJsonArray($v, $ignore_unknown);
-                        $values = $struct_value->getFields();
-                        $values[$key]= $value;
-                    }
-                } else {
-                    // Array
-                    $list_value = $this->getListValue();
-                    if (is_null($list_value)) {
-                        $list_value = new ListValue();
-                        $this->setListValue($list_value);
-                    }
-                    foreach ($array as $v) {
-                        $value = new Value();
-                        $value->mergeFromJsonArray($v, $ignore_unknown);
-                        $values = $list_value->getValues();
-                        $values[]= $value;
-                    }
-                }
-            } else {
-                throw new GPBDecodeException("Invalid type for Value.");
-            }
-            return;
-        }
-        $this->mergeFromArrayJsonImpl($array, $ignore_unknown);
-    }
-
-    private function mergeFromArrayJsonImpl($array, $ignore_unknown)
-    {
-        foreach ($array as $key => $value) {
-            $field = $this->desc->getFieldByJsonName($key);
-            if (is_null($field)) {
-                $field = $this->desc->getFieldByName($key);
-                if (is_null($field)) {
-                    if ($ignore_unknown) {
-                        continue;
-                    } else {
-                        throw new GPBDecodeException(
-                            $key . ' is unknown.'
-                        );
-                    }
-                }
-            }
-            if ($field->isMap()) {
-                if (is_null($value)) {
-                    continue;
-                }
-                $key_field = $field->getMessageType()->getFieldByNumber(1);
-                $value_field = $field->getMessageType()->getFieldByNumber(2);
-                foreach ($value as $tmp_key => $tmp_value) {
-                    if (is_null($tmp_value)) {
-                        throw new \Exception(
-                            "Map value field element cannot be null.");
-                    }
-                    $proto_key = $this->convertJsonValueToProtoValue(
-                        $tmp_key,
-                        $key_field,
-                        $ignore_unknown,
-                        true);
-                    $proto_value = $this->convertJsonValueToProtoValue(
-                        $tmp_value,
-                        $value_field,
-                        $ignore_unknown);
-                    self::kvUpdateHelper($field, $proto_key, $proto_value);
-                }
-            } else if ($field->isRepeated()) {
-                if (is_null($value)) {
-                    continue;
-                }
-                foreach ($value as $tmp) {
-                    if (is_null($tmp)) {
-                        throw new \Exception(
-                            "Repeated field elements cannot be null.");
-                    }
-                    $proto_value = $this->convertJsonValueToProtoValue(
-                        $tmp,
-                        $field,
-                        $ignore_unknown);
-                    self::appendHelper($field, $proto_value);
-                }
-            } else {
-                $setter = $field->getSetter();
-                $proto_value = $this->convertJsonValueToProtoValue(
-                    $value,
-                    $field,
-                    $ignore_unknown);
-                if ($field->getType() === GPBType::MESSAGE) {
-                    if (is_null($proto_value)) {
-                        continue;
-                    }
-                    $getter = $field->getGetter();
-                    $submsg = $this->$getter();
-                    if (!is_null($submsg)) {
-                        $submsg->mergeFrom($proto_value);
-                        continue;
-                    }
-                }
-                $this->$setter($proto_value);
-            }
-        }
-    }
-
-    /**
-     * @ignore
-     */
-    public function parseFromJsonStream($input, $ignore_unknown)
-    {
-        $array = json_decode($input->getData(), true, 512, JSON_BIGINT_AS_STRING);
-        if ($this instanceof \Google\Protobuf\ListValue) {
-            $array = ["values"=>$array];
-        }
-        if (is_null($array)) {
-            if ($this instanceof \Google\Protobuf\Value) {
-              $this->setNullValue(\Google\Protobuf\NullValue::NULL_VALUE);
-              return;
-            } else {
-              throw new GPBDecodeException(
-                  "Cannot decode json string: " . $input->getData());
-            }
-        }
-        try {
-            $this->mergeFromJsonArray($array, $ignore_unknown);
-        } catch (\Exception $e) {
-            throw new GPBDecodeException($e->getMessage());
-        }
-    }
-
-    /**
-     * @ignore
-     */
-    private function serializeSingularFieldToStream($field, &$output)
-    {
-        if (!$this->existField($field)) {
-            return true;
-        }
-        $getter = $field->getGetter();
-        $value = $this->$getter();
-        if (!GPBWire::serializeFieldToStream($value, $field, true, $output)) {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * @ignore
-     */
-    private function serializeRepeatedFieldToStream($field, &$output)
-    {
-        $getter = $field->getGetter();
-        $values = $this->$getter();
-        $count = count($values);
-        if ($count === 0) {
-            return true;
-        }
-
-        $packed = $field->getPacked();
-        if ($packed) {
-            if (!GPBWire::writeTag(
-                $output,
-                GPBWire::makeTag($field->getNumber(), GPBType::STRING))) {
-                return false;
-            }
-            $size = 0;
-            foreach ($values as $value) {
-                $size += $this->fieldDataOnlyByteSize($field, $value);
-            }
-            if (!$output->writeVarint32($size, true)) {
-                return false;
-            }
-        }
-
-        foreach ($values as $value) {
-            if (!GPBWire::serializeFieldToStream(
-                $value,
-                $field,
-                !$packed,
-                $output)) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    /**
-     * @ignore
-     */
-    private function serializeMapFieldToStream($field, $output)
-    {
-        $getter = $field->getGetter();
-        $values = $this->$getter();
-        $count = count($values);
-        if ($count === 0) {
-            return true;
-        }
-
-        foreach ($values as $key => $value) {
-            $map_entry = new MapEntry($field->getMessageType());
-            $map_entry->setKey($key);
-            $map_entry->setValue($value);
-            if (!GPBWire::serializeFieldToStream(
-                $map_entry,
-                $field,
-                true,
-                $output)) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    /**
-     * @ignore
-     */
-    private function serializeFieldToStream(&$output, $field)
-    {
-        if ($field->isMap()) {
-            return $this->serializeMapFieldToStream($field, $output);
-        } elseif ($field->isRepeated()) {
-            return $this->serializeRepeatedFieldToStream($field, $output);
-        } else {
-            return $this->serializeSingularFieldToStream($field, $output);
-        }
-    }
-
-    /**
-     * @ignore
-     */
-    private function serializeFieldToJsonStream(&$output, $field)
-    {
-        $getter = $field->getGetter();
-        $values = $this->$getter();
-        return GPBJsonWire::serializeFieldToStream(
-            $values, $field, $output, !GPBUtil::hasSpecialJsonMapping($this));
-    }
-
-    /**
-     * @ignore
-     */
-    public function serializeToStream(&$output)
-    {
-        $fields = $this->desc->getField();
-        foreach ($fields as $field) {
-            if (!$this->serializeFieldToStream($output, $field)) {
-                return false;
-            }
-        }
-        $output->writeRaw($this->unknown, strlen($this->unknown));
-        return true;
-    }
-
-    /**
-     * @ignore
-     */
-    public function serializeToJsonStream(&$output)
-    {
-        if (is_a($this, 'Google\Protobuf\Any')) {
-            $output->writeRaw("{", 1);
-            $type_field = $this->desc->getFieldByNumber(1);
-            $value_msg = $this->unpack();
-
-            // Serialize type url.
-            $output->writeRaw("\"@type\":", 8);
-            $output->writeRaw("\"", 1);
-            $output->writeRaw($this->getTypeUrl(), strlen($this->getTypeUrl()));
-            $output->writeRaw("\"", 1);
-
-            // Serialize value
-            if (GPBUtil::hasSpecialJsonMapping($value_msg)) {
-                $output->writeRaw(",\"value\":", 9);
-                $value_msg->serializeToJsonStream($output);
-            } else {
-                $value_fields = $value_msg->desc->getField();
-                foreach ($value_fields as $field) {
-                    if ($value_msg->existField($field)) {
-                        $output->writeRaw(",", 1);
-                        if (!$value_msg->serializeFieldToJsonStream($output, $field)) {
-                            return false;
-                        }
-                    }
-                }
-            }
-
-            $output->writeRaw("}", 1);
-        } elseif (is_a($this, 'Google\Protobuf\FieldMask')) {
-            $field_mask = GPBUtil::formatFieldMask($this);
-            $output->writeRaw("\"", 1);
-            $output->writeRaw($field_mask, strlen($field_mask));
-            $output->writeRaw("\"", 1);
-        } elseif (is_a($this, 'Google\Protobuf\Duration')) {
-            $duration = GPBUtil::formatDuration($this) . "s";
-            $output->writeRaw("\"", 1);
-            $output->writeRaw($duration, strlen($duration));
-            $output->writeRaw("\"", 1);
-        } elseif (get_class($this) === 'Google\Protobuf\Timestamp') {
-            $timestamp = GPBUtil::formatTimestamp($this);
-            $timestamp = json_encode($timestamp);
-            $output->writeRaw($timestamp, strlen($timestamp));
-        } elseif (get_class($this) === 'Google\Protobuf\ListValue') {
-            $field = $this->desc->getField()[1];
-            if (!$this->existField($field)) {
-                $output->writeRaw("[]", 2);
-            } else {
-                if (!$this->serializeFieldToJsonStream($output, $field)) {
-                    return false;
-                }
-            }
-        } elseif (get_class($this) === 'Google\Protobuf\Struct') {
-            $field = $this->desc->getField()[1];
-            if (!$this->existField($field)) {
-                $output->writeRaw("{}", 2);
-            } else {
-                if (!$this->serializeFieldToJsonStream($output, $field)) {
-                    return false;
-                }
-            }
-        } else {
-            if (!GPBUtil::hasSpecialJsonMapping($this)) {
-                $output->writeRaw("{", 1);
-            }
-            $fields = $this->desc->getField();
-            $first = true;
-            foreach ($fields as $field) {
-                if ($this->existField($field) ||
-                    GPBUtil::hasJsonValue($this)) {
-                    if ($first) {
-                        $first = false;
-                    } else {
-                        $output->writeRaw(",", 1);
-                    }
-                    if (!$this->serializeFieldToJsonStream($output, $field)) {
-                        return false;
-                    }
-                }
-            }
-            if (!GPBUtil::hasSpecialJsonMapping($this)) {
-                $output->writeRaw("}", 1);
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Serialize the message to string.
-     * @return string Serialized binary protobuf data.
-     */
-    public function serializeToString()
-    {
-        $output = new CodedOutputStream($this->byteSize());
-        $this->serializeToStream($output);
-        return $output->getData();
-    }
-
-    /**
-     * Serialize the message to json string.
-     * @return string Serialized json protobuf data.
-     */
-    public function serializeToJsonString()
-    {
-        $output = new CodedOutputStream($this->jsonByteSize());
-        $this->serializeToJsonStream($output);
-        return $output->getData();
-    }
-
-    /**
-     * @ignore
-     */
-    private function existField($field)
-    {
-        $getter = $field->getGetter();
-        $hazzer = "has" . substr($getter, 3);
-
-        if (method_exists($this, $hazzer)) {
-          return $this->$hazzer();
-        } else if ($field->getOneofIndex() !== -1) {
-          // For old generated code, which does not have hazzers for oneof
-          // fields.
-          $oneof = $this->desc->getOneofDecl()[$field->getOneofIndex()];
-          $oneof_name = $oneof->getName();
-          return $this->$oneof_name->getNumber() === $field->getNumber();
-        }
-
-        $values = $this->$getter();
-        if ($field->isMap()) {
-            return count($values) !== 0;
-        } elseif ($field->isRepeated()) {
-            return count($values) !== 0;
-        } else {
-            return $values !== $this->defaultValue($field);
-        }
-    }
-
-    /**
-     * @ignore
-     */
-    private function repeatedFieldDataOnlyByteSize($field)
-    {
-        $size = 0;
-
-        $getter = $field->getGetter();
-        $values = $this->$getter();
-        $count = count($values);
-        if ($count !== 0) {
-            $size += $count * GPBWire::tagSize($field);
-            foreach ($values as $value) {
-                $size += $this->singularFieldDataOnlyByteSize($field);
-            }
-        }
-    }
-
-    /**
-     * @ignore
-     */
-    private function fieldDataOnlyByteSize($field, $value)
-    {
-        $size = 0;
-
-        switch ($field->getType()) {
-            case GPBType::BOOL:
-                $size += 1;
-                break;
-            case GPBType::FLOAT:
-            case GPBType::FIXED32:
-            case GPBType::SFIXED32:
-                $size += 4;
-                break;
-            case GPBType::DOUBLE:
-            case GPBType::FIXED64:
-            case GPBType::SFIXED64:
-                $size += 8;
-                break;
-            case GPBType::INT32:
-            case GPBType::ENUM:
-                $size += GPBWire::varint32Size($value, true);
-                break;
-            case GPBType::UINT32:
-                $size += GPBWire::varint32Size($value);
-                break;
-            case GPBType::UINT64:
-            case GPBType::INT64:
-                $size += GPBWire::varint64Size($value);
-                break;
-            case GPBType::SINT32:
-                $size += GPBWire::sint32Size($value);
-                break;
-            case GPBType::SINT64:
-                $size += GPBWire::sint64Size($value);
-                break;
-            case GPBType::STRING:
-            case GPBType::BYTES:
-                $size += strlen($value);
-                $size += GPBWire::varint32Size($size);
-                break;
-            case GPBType::MESSAGE:
-                $size += $value->byteSize();
-                $size += GPBWire::varint32Size($size);
-                break;
-            case GPBType::GROUP:
-                // TODO(teboring): Add support.
-                user_error("Unsupported type.");
-                break;
-            default:
-                user_error("Unsupported type.");
-                return 0;
-        }
-
-        return $size;
-    }
-
-    /**
-     * @ignore
-     */
-    private function fieldDataOnlyJsonByteSize($field, $value)
-    {
-        $size = 0;
-
-        switch ($field->getType()) {
-            case GPBType::SFIXED32:
-            case GPBType::SINT32:
-            case GPBType::INT32:
-                $size += strlen(strval($value));
-                break;
-            case GPBType::FIXED32:
-            case GPBType::UINT32:
-                if ($value < 0) {
-                    $value = bcadd($value, "4294967296");
-                }
-                $size += strlen(strval($value));
-                break;
-            case GPBType::FIXED64:
-            case GPBType::UINT64:
-                if ($value < 0) {
-                    $value = bcadd($value, "18446744073709551616");
-                }
-                // Intentional fall through.
-            case GPBType::SFIXED64:
-            case GPBType::INT64:
-            case GPBType::SINT64:
-                $size += 2;  // size for ""
-                $size += strlen(strval($value));
-                break;
-            case GPBType::FLOAT:
-                if (is_nan($value)) {
-                    $size += strlen("NaN") + 2;
-                } elseif ($value === INF) {
-                    $size += strlen("Infinity") + 2;
-                } elseif ($value === -INF) {
-                    $size += strlen("-Infinity") + 2;
-                } else {
-                    $size += strlen(sprintf("%.8g", $value));
-                }
-                break;
-            case GPBType::DOUBLE:
-                if (is_nan($value)) {
-                    $size += strlen("NaN") + 2;
-                } elseif ($value === INF) {
-                    $size += strlen("Infinity") + 2;
-                } elseif ($value === -INF) {
-                    $size += strlen("-Infinity") + 2;
-                } else {
-                    $size += strlen(sprintf("%.17g", $value));
-                }
-                break;
-            case GPBType::ENUM:
-                $enum_desc = $field->getEnumType();
-                if ($enum_desc->getClass() === "Google\Protobuf\NullValue") {
-                    $size += 4;
-                    break;
-                }
-                $enum_value_desc = $enum_desc->getValueByNumber($value);
-                if (!is_null($enum_value_desc)) {
-                    $size += 2;  // size for ""
-                    $size += strlen($enum_value_desc->getName());
-                } else {
-                    $str_value = strval($value);
-                    $size += strlen($str_value);
-                }
-                break;
-            case GPBType::BOOL:
-                if ($value) {
-                    $size += 4;
-                } else {
-                    $size += 5;
-                }
-                break;
-            case GPBType::STRING:
-                $value = json_encode($value, JSON_UNESCAPED_UNICODE);
-                $size += strlen($value);
-                break;
-            case GPBType::BYTES:
-                # if (is_a($this, "Google\Protobuf\BytesValue")) {
-                #     $size += strlen(json_encode($value));
-                # } else {
-                #     $size += strlen(base64_encode($value));
-                #     $size += 2;  // size for \"\"
-                # }
-                $size += strlen(base64_encode($value));
-                $size += 2;  // size for \"\"
-                break;
-            case GPBType::MESSAGE:
-                $size += $value->jsonByteSize();
-                break;
-#             case GPBType::GROUP:
-#                 // TODO(teboring): Add support.
-#                 user_error("Unsupported type.");
-#                 break;
-            default:
-                user_error("Unsupported type " . $field->getType());
-                return 0;
-        }
-
-        return $size;
-    }
-
-    /**
-     * @ignore
-     */
-    private function fieldByteSize($field)
-    {
-        $size = 0;
-        if ($field->isMap()) {
-            $getter = $field->getGetter();
-            $values = $this->$getter();
-            $count = count($values);
-            if ($count !== 0) {
-                $size += $count * GPBWire::tagSize($field);
-                $message_type = $field->getMessageType();
-                $key_field = $message_type->getFieldByNumber(1);
-                $value_field = $message_type->getFieldByNumber(2);
-                foreach ($values as $key => $value) {
-                    $data_size = 0;
-                    if ($key != $this->defaultValue($key_field)) {
-                        $data_size += $this->fieldDataOnlyByteSize(
-                            $key_field,
-                            $key);
-                        $data_size += GPBWire::tagSize($key_field);
-                    }
-                    if ($value != $this->defaultValue($value_field)) {
-                        $data_size += $this->fieldDataOnlyByteSize(
-                            $value_field,
-                            $value);
-                        $data_size += GPBWire::tagSize($value_field);
-                    }
-                    $size += GPBWire::varint32Size($data_size) + $data_size;
-                }
-            }
-        } elseif ($field->isRepeated()) {
-            $getter = $field->getGetter();
-            $values = $this->$getter();
-            $count = count($values);
-            if ($count !== 0) {
-                if ($field->getPacked()) {
-                    $data_size = 0;
-                    foreach ($values as $value) {
-                        $data_size += $this->fieldDataOnlyByteSize($field, $value);
-                    }
-                    $size += GPBWire::tagSize($field);
-                    $size += GPBWire::varint32Size($data_size);
-                    $size += $data_size;
-                } else {
-                    $size += $count * GPBWire::tagSize($field);
-                    foreach ($values as $value) {
-                        $size += $this->fieldDataOnlyByteSize($field, $value);
-                    }
-                }
-            }
-        } elseif ($this->existField($field)) {
-            $size += GPBWire::tagSize($field);
-            $getter = $field->getGetter();
-            $value = $this->$getter();
-            $size += $this->fieldDataOnlyByteSize($field, $value);
-        }
-        return $size;
-    }
-
-    /**
-     * @ignore
-     */
-    private function fieldJsonByteSize($field)
-    {
-        $size = 0;
-
-        if ($field->isMap()) {
-            $getter = $field->getGetter();
-            $values = $this->$getter();
-            $count = count($values);
-            if ($count !== 0) {
-                if (!GPBUtil::hasSpecialJsonMapping($this)) {
-                    $size += 3;                              // size for "\"\":".
-                    $size += strlen($field->getJsonName());  // size for field name
-                }
-                $size += 2;  // size for "{}".
-                $size += $count - 1;                     // size for commas
-                $getter = $field->getGetter();
-                $map_entry = $field->getMessageType();
-                $key_field = $map_entry->getFieldByNumber(1);
-                $value_field = $map_entry->getFieldByNumber(2);
-                switch ($key_field->getType()) {
-                case GPBType::STRING:
-                case GPBType::SFIXED64:
-                case GPBType::INT64:
-                case GPBType::SINT64:
-                case GPBType::FIXED64:
-                case GPBType::UINT64:
-                    $additional_quote = false;
-                    break;
-                default:
-                    $additional_quote = true;
-                }
-                foreach ($values as $key => $value) {
-                    if ($additional_quote) {
-                        $size += 2;  // size for ""
-                    }
-                    $size += $this->fieldDataOnlyJsonByteSize($key_field, $key);
-                    $size += $this->fieldDataOnlyJsonByteSize($value_field, $value);
-                    $size += 1;  // size for :
-                }
-            }
-        } elseif ($field->isRepeated()) {
-            $getter = $field->getGetter();
-            $values = $this->$getter();
-            $count = count($values);
-            if ($count !== 0) {
-                if (!GPBUtil::hasSpecialJsonMapping($this)) {
-                    $size += 3;                              // size for "\"\":".
-                    $size += strlen($field->getJsonName());  // size for field name
-                }
-                $size += 2;  // size for "[]".
-                $size += $count - 1;                     // size for commas
-                $getter = $field->getGetter();
-                foreach ($values as $value) {
-                    $size += $this->fieldDataOnlyJsonByteSize($field, $value);
-                }
-            }
-        } elseif ($this->existField($field) || GPBUtil::hasJsonValue($this)) {
-            if (!GPBUtil::hasSpecialJsonMapping($this)) {
-                $size += 3;                              // size for "\"\":".
-                $size += strlen($field->getJsonName());  // size for field name
-            }
-            $getter = $field->getGetter();
-            $value = $this->$getter();
-            $size += $this->fieldDataOnlyJsonByteSize($field, $value);
-        }
-        return $size;
-    }
-
-    /**
-     * @ignore
-     */
-    public function byteSize()
-    {
-        $size = 0;
-
-        $fields = $this->desc->getField();
-        foreach ($fields as $field) {
-            $size += $this->fieldByteSize($field);
-        }
-        $size += strlen($this->unknown);
-        return $size;
-    }
-
-    private function appendHelper($field, $append_value)
-    {
-        $getter = $field->getGetter();
-        $setter = $field->getSetter();
-
-        $field_arr_value = $this->$getter();
-        $field_arr_value[] = $append_value;
-
-        if (!is_object($field_arr_value)) {
-            $this->$setter($field_arr_value);
-        }
-    }
-
-    private function kvUpdateHelper($field, $update_key, $update_value)
-    {
-        $getter = $field->getGetter();
-        $setter = $field->getSetter();
-
-        $field_arr_value = $this->$getter();
-        $field_arr_value[$update_key] = $update_value;
-
-        if (!is_object($field_arr_value)) {
-            $this->$setter($field_arr_value);
-        }
-    }
-
-    /**
-     * @ignore
-     */
-    public function jsonByteSize()
-    {
-        $size = 0;
-        if (is_a($this, 'Google\Protobuf\Any')) {
-            // Size for "{}".
-            $size += 2;
-
-            // Size for "\"@type\":".
-            $size += 8;
-
-            // Size for url. +2 for "" /.
-            $size += strlen($this->getTypeUrl()) + 2;
-
-            $value_msg = $this->unpack();
-            if (GPBUtil::hasSpecialJsonMapping($value_msg)) {
-                // Size for "\",value\":".
-                $size += 9;
-                $size += $value_msg->jsonByteSize();
-            } else {
-                // Size for value. +1 for comma, -2 for "{}".
-                $size += $value_msg->jsonByteSize() -1;
-            }
-        } elseif (get_class($this) === 'Google\Protobuf\FieldMask') {
-            $field_mask = GPBUtil::formatFieldMask($this);
-            $size += strlen($field_mask) + 2;  // 2 for ""
-        } elseif (get_class($this) === 'Google\Protobuf\Duration') {
-            $duration = GPBUtil::formatDuration($this) . "s";
-            $size += strlen($duration) + 2;  // 2 for ""
-        } elseif (get_class($this) === 'Google\Protobuf\Timestamp') {
-            $timestamp = GPBUtil::formatTimestamp($this);
-            $timestamp = json_encode($timestamp);
-            $size += strlen($timestamp);
-        } elseif (get_class($this) === 'Google\Protobuf\ListValue') {
-            $field = $this->desc->getField()[1];
-            if ($this->existField($field)) {
-                $field_size = $this->fieldJsonByteSize($field);
-                $size += $field_size;
-            } else {
-                // Size for "[]".
-                $size += 2;
-            }
-        } elseif (get_class($this) === 'Google\Protobuf\Struct') {
-            $field = $this->desc->getField()[1];
-            if ($this->existField($field)) {
-                $field_size = $this->fieldJsonByteSize($field);
-                $size += $field_size;
-            } else {
-                // Size for "{}".
-                $size += 2;
-            }
-        } else {
-            if (!GPBUtil::hasSpecialJsonMapping($this)) {
-                // Size for "{}".
-                $size += 2;
-            }
-
-            $fields = $this->desc->getField();
-            $count = 0;
-            foreach ($fields as $field) {
-                $field_size = $this->fieldJsonByteSize($field);
-                $size += $field_size;
-                if ($field_size != 0) {
-                  $count++;
-                }
-            }
-            // size for comma
-            $size += $count > 0 ? ($count - 1) : 0;
-        }
-        return $size;
-    }
-}
diff --git a/libs/protobuf/php/src/Google/Protobuf/Internal/MessageBuilderContext.php b/libs/protobuf/php/src/Google/Protobuf/Internal/MessageBuilderContext.php
deleted file mode 100644
index 2724d26..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/Internal/MessageBuilderContext.php
+++ /dev/null
@@ -1,120 +0,0 @@
-<?php
-
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-namespace Google\Protobuf\Internal;
-
-use Google\Protobuf\Internal\GPBLabel;
-use Google\Protobuf\Internal\GPBType;
-use Google\Protobuf\Internal\Descriptor;
-use Google\Protobuf\Internal\FieldDescriptor;
-
-class MessageBuilderContext
-{
-
-    private $descriptor;
-    private $pool;
-
-    public function __construct($full_name, $klass, $pool)
-    {
-        $this->descriptor = new Descriptor();
-        $this->descriptor->setFullName($full_name);
-        $this->descriptor->setClass($klass);
-        $this->pool = $pool;
-    }
-
-    private function getFieldDescriptor($name, $label, $type,
-                                      $number, $type_name = null)
-    {
-        $field = new FieldDescriptor();
-        $field->setName($name);
-        $camel_name = implode('', array_map('ucwords', explode('_', $name)));
-        $field->setGetter('get' . $camel_name);
-        $field->setSetter('set' . $camel_name);
-        $field->setType($type);
-        $field->setNumber($number);
-        $field->setLabel($label);
-
-        // At this time, the message/enum type may have not been added to pool.
-        // So we use the type name as place holder and will replace it with the
-        // actual descriptor in cross building.
-        switch ($type) {
-        case GPBType::MESSAGE:
-          $field->setMessageType($type_name);
-          break;
-        case GPBType::ENUM:
-          $field->setEnumType($type_name);
-          break;
-        default:
-          break;
-        }
-
-        return $field;
-    }
-
-    public function optional($name, $type, $number, $type_name = null)
-    {
-        $this->descriptor->addField($this->getFieldDescriptor(
-            $name,
-            GPBLabel::OPTIONAL,
-            $type,
-            $number,
-            $type_name));
-        return $this;
-    }
-
-    public function repeated($name, $type, $number, $type_name = null)
-    {
-        $this->descriptor->addField($this->getFieldDescriptor(
-            $name,
-            GPBLabel::REPEATED,
-            $type,
-            $number,
-            $type_name));
-        return $this;
-    }
-
-    public function required($name, $type, $number, $type_name = null)
-    {
-        $this->descriptor->addField($this->getFieldDescriptor(
-            $name,
-            GPBLabel::REQUIRED,
-            $type,
-            $number,
-            $type_name));
-        return $this;
-    }
-
-    public function finalizeToPool()
-    {
-        $this->pool->addDescriptor($this->descriptor);
-    }
-}
diff --git a/libs/protobuf/php/src/Google/Protobuf/Internal/MessageOptions.php b/libs/protobuf/php/src/Google/Protobuf/Internal/MessageOptions.php
deleted file mode 100644
index 5c61580..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/Internal/MessageOptions.php
+++ /dev/null
@@ -1,387 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: google/protobuf/descriptor.proto
-
-namespace Google\Protobuf\Internal;
-
-use Google\Protobuf\Internal\GPBType;
-use Google\Protobuf\Internal\GPBWire;
-use Google\Protobuf\Internal\RepeatedField;
-use Google\Protobuf\Internal\InputStream;
-use Google\Protobuf\Internal\GPBUtil;
-
-/**
- * Generated from protobuf message <code>google.protobuf.MessageOptions</code>
- */
-class MessageOptions extends \Google\Protobuf\Internal\Message
-{
-    /**
-     * Set true to use the old proto1 MessageSet wire format for extensions.
-     * This is provided for backwards-compatibility with the MessageSet wire
-     * format.  You should not use this for any other reason:  It's less
-     * efficient, has fewer features, and is more complicated.
-     * The message must be defined exactly as follows:
-     *   message Foo {
-     *     option message_set_wire_format = true;
-     *     extensions 4 to max;
-     *   }
-     * Note that the message cannot have any defined fields; MessageSets only
-     * have extensions.
-     * All extensions of your type must be singular messages; e.g. they cannot
-     * be int32s, enums, or repeated messages.
-     * Because this is an option, the above two restrictions are not enforced by
-     * the protocol compiler.
-     *
-     * Generated from protobuf field <code>optional bool message_set_wire_format = 1 [default = false];</code>
-     */
-    protected $message_set_wire_format = null;
-    /**
-     * Disables the generation of the standard "descriptor()" accessor, which can
-     * conflict with a field of the same name.  This is meant to make migration
-     * from proto1 easier; new code should avoid fields named "descriptor".
-     *
-     * Generated from protobuf field <code>optional bool no_standard_descriptor_accessor = 2 [default = false];</code>
-     */
-    protected $no_standard_descriptor_accessor = null;
-    /**
-     * Is this message deprecated?
-     * Depending on the target platform, this can emit Deprecated annotations
-     * for the message, or it will be completely ignored; in the very least,
-     * this is a formalization for deprecating messages.
-     *
-     * Generated from protobuf field <code>optional bool deprecated = 3 [default = false];</code>
-     */
-    protected $deprecated = null;
-    /**
-     * Whether the message is an automatically generated map entry type for the
-     * maps field.
-     * For maps fields:
-     *     map<KeyType, ValueType> map_field = 1;
-     * The parsed descriptor looks like:
-     *     message MapFieldEntry {
-     *         option map_entry = true;
-     *         optional KeyType key = 1;
-     *         optional ValueType value = 2;
-     *     }
-     *     repeated MapFieldEntry map_field = 1;
-     * Implementations may choose not to generate the map_entry=true message, but
-     * use a native map in the target language to hold the keys and values.
-     * The reflection APIs in such implementations still need to work as
-     * if the field is a repeated message field.
-     * NOTE: Do not set the option in .proto files. Always use the maps syntax
-     * instead. The option should only be implicitly set by the proto compiler
-     * parser.
-     *
-     * Generated from protobuf field <code>optional bool map_entry = 7;</code>
-     */
-    protected $map_entry = null;
-    /**
-     * The parser stores options it doesn't recognize here. See above.
-     *
-     * Generated from protobuf field <code>repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;</code>
-     */
-    private $uninterpreted_option;
-
-    /**
-     * Constructor.
-     *
-     * @param array $data {
-     *     Optional. Data for populating the Message object.
-     *
-     *     @type bool $message_set_wire_format
-     *           Set true to use the old proto1 MessageSet wire format for extensions.
-     *           This is provided for backwards-compatibility with the MessageSet wire
-     *           format.  You should not use this for any other reason:  It's less
-     *           efficient, has fewer features, and is more complicated.
-     *           The message must be defined exactly as follows:
-     *             message Foo {
-     *               option message_set_wire_format = true;
-     *               extensions 4 to max;
-     *             }
-     *           Note that the message cannot have any defined fields; MessageSets only
-     *           have extensions.
-     *           All extensions of your type must be singular messages; e.g. they cannot
-     *           be int32s, enums, or repeated messages.
-     *           Because this is an option, the above two restrictions are not enforced by
-     *           the protocol compiler.
-     *     @type bool $no_standard_descriptor_accessor
-     *           Disables the generation of the standard "descriptor()" accessor, which can
-     *           conflict with a field of the same name.  This is meant to make migration
-     *           from proto1 easier; new code should avoid fields named "descriptor".
-     *     @type bool $deprecated
-     *           Is this message deprecated?
-     *           Depending on the target platform, this can emit Deprecated annotations
-     *           for the message, or it will be completely ignored; in the very least,
-     *           this is a formalization for deprecating messages.
-     *     @type bool $map_entry
-     *           Whether the message is an automatically generated map entry type for the
-     *           maps field.
-     *           For maps fields:
-     *               map<KeyType, ValueType> map_field = 1;
-     *           The parsed descriptor looks like:
-     *               message MapFieldEntry {
-     *                   option map_entry = true;
-     *                   optional KeyType key = 1;
-     *                   optional ValueType value = 2;
-     *               }
-     *               repeated MapFieldEntry map_field = 1;
-     *           Implementations may choose not to generate the map_entry=true message, but
-     *           use a native map in the target language to hold the keys and values.
-     *           The reflection APIs in such implementations still need to work as
-     *           if the field is a repeated message field.
-     *           NOTE: Do not set the option in .proto files. Always use the maps syntax
-     *           instead. The option should only be implicitly set by the proto compiler
-     *           parser.
-     *     @type array<\Google\Protobuf\Internal\UninterpretedOption>|\Google\Protobuf\Internal\RepeatedField $uninterpreted_option
-     *           The parser stores options it doesn't recognize here. See above.
-     * }
-     */
-    public function __construct($data = NULL) {
-        \GPBMetadata\Google\Protobuf\Internal\Descriptor::initOnce();
-        parent::__construct($data);
-    }
-
-    /**
-     * Set true to use the old proto1 MessageSet wire format for extensions.
-     * This is provided for backwards-compatibility with the MessageSet wire
-     * format.  You should not use this for any other reason:  It's less
-     * efficient, has fewer features, and is more complicated.
-     * The message must be defined exactly as follows:
-     *   message Foo {
-     *     option message_set_wire_format = true;
-     *     extensions 4 to max;
-     *   }
-     * Note that the message cannot have any defined fields; MessageSets only
-     * have extensions.
-     * All extensions of your type must be singular messages; e.g. they cannot
-     * be int32s, enums, or repeated messages.
-     * Because this is an option, the above two restrictions are not enforced by
-     * the protocol compiler.
-     *
-     * Generated from protobuf field <code>optional bool message_set_wire_format = 1 [default = false];</code>
-     * @return bool
-     */
-    public function getMessageSetWireFormat()
-    {
-        return isset($this->message_set_wire_format) ? $this->message_set_wire_format : false;
-    }
-
-    public function hasMessageSetWireFormat()
-    {
-        return isset($this->message_set_wire_format);
-    }
-
-    public function clearMessageSetWireFormat()
-    {
-        unset($this->message_set_wire_format);
-    }
-
-    /**
-     * Set true to use the old proto1 MessageSet wire format for extensions.
-     * This is provided for backwards-compatibility with the MessageSet wire
-     * format.  You should not use this for any other reason:  It's less
-     * efficient, has fewer features, and is more complicated.
-     * The message must be defined exactly as follows:
-     *   message Foo {
-     *     option message_set_wire_format = true;
-     *     extensions 4 to max;
-     *   }
-     * Note that the message cannot have any defined fields; MessageSets only
-     * have extensions.
-     * All extensions of your type must be singular messages; e.g. they cannot
-     * be int32s, enums, or repeated messages.
-     * Because this is an option, the above two restrictions are not enforced by
-     * the protocol compiler.
-     *
-     * Generated from protobuf field <code>optional bool message_set_wire_format = 1 [default = false];</code>
-     * @param bool $var
-     * @return $this
-     */
-    public function setMessageSetWireFormat($var)
-    {
-        GPBUtil::checkBool($var);
-        $this->message_set_wire_format = $var;
-
-        return $this;
-    }
-
-    /**
-     * Disables the generation of the standard "descriptor()" accessor, which can
-     * conflict with a field of the same name.  This is meant to make migration
-     * from proto1 easier; new code should avoid fields named "descriptor".
-     *
-     * Generated from protobuf field <code>optional bool no_standard_descriptor_accessor = 2 [default = false];</code>
-     * @return bool
-     */
-    public function getNoStandardDescriptorAccessor()
-    {
-        return isset($this->no_standard_descriptor_accessor) ? $this->no_standard_descriptor_accessor : false;
-    }
-
-    public function hasNoStandardDescriptorAccessor()
-    {
-        return isset($this->no_standard_descriptor_accessor);
-    }
-
-    public function clearNoStandardDescriptorAccessor()
-    {
-        unset($this->no_standard_descriptor_accessor);
-    }
-
-    /**
-     * Disables the generation of the standard "descriptor()" accessor, which can
-     * conflict with a field of the same name.  This is meant to make migration
-     * from proto1 easier; new code should avoid fields named "descriptor".
-     *
-     * Generated from protobuf field <code>optional bool no_standard_descriptor_accessor = 2 [default = false];</code>
-     * @param bool $var
-     * @return $this
-     */
-    public function setNoStandardDescriptorAccessor($var)
-    {
-        GPBUtil::checkBool($var);
-        $this->no_standard_descriptor_accessor = $var;
-
-        return $this;
-    }
-
-    /**
-     * Is this message deprecated?
-     * Depending on the target platform, this can emit Deprecated annotations
-     * for the message, or it will be completely ignored; in the very least,
-     * this is a formalization for deprecating messages.
-     *
-     * Generated from protobuf field <code>optional bool deprecated = 3 [default = false];</code>
-     * @return bool
-     */
-    public function getDeprecated()
-    {
-        return isset($this->deprecated) ? $this->deprecated : false;
-    }
-
-    public function hasDeprecated()
-    {
-        return isset($this->deprecated);
-    }
-
-    public function clearDeprecated()
-    {
-        unset($this->deprecated);
-    }
-
-    /**
-     * Is this message deprecated?
-     * Depending on the target platform, this can emit Deprecated annotations
-     * for the message, or it will be completely ignored; in the very least,
-     * this is a formalization for deprecating messages.
-     *
-     * Generated from protobuf field <code>optional bool deprecated = 3 [default = false];</code>
-     * @param bool $var
-     * @return $this
-     */
-    public function setDeprecated($var)
-    {
-        GPBUtil::checkBool($var);
-        $this->deprecated = $var;
-
-        return $this;
-    }
-
-    /**
-     * Whether the message is an automatically generated map entry type for the
-     * maps field.
-     * For maps fields:
-     *     map<KeyType, ValueType> map_field = 1;
-     * The parsed descriptor looks like:
-     *     message MapFieldEntry {
-     *         option map_entry = true;
-     *         optional KeyType key = 1;
-     *         optional ValueType value = 2;
-     *     }
-     *     repeated MapFieldEntry map_field = 1;
-     * Implementations may choose not to generate the map_entry=true message, but
-     * use a native map in the target language to hold the keys and values.
-     * The reflection APIs in such implementations still need to work as
-     * if the field is a repeated message field.
-     * NOTE: Do not set the option in .proto files. Always use the maps syntax
-     * instead. The option should only be implicitly set by the proto compiler
-     * parser.
-     *
-     * Generated from protobuf field <code>optional bool map_entry = 7;</code>
-     * @return bool
-     */
-    public function getMapEntry()
-    {
-        return isset($this->map_entry) ? $this->map_entry : false;
-    }
-
-    public function hasMapEntry()
-    {
-        return isset($this->map_entry);
-    }
-
-    public function clearMapEntry()
-    {
-        unset($this->map_entry);
-    }
-
-    /**
-     * Whether the message is an automatically generated map entry type for the
-     * maps field.
-     * For maps fields:
-     *     map<KeyType, ValueType> map_field = 1;
-     * The parsed descriptor looks like:
-     *     message MapFieldEntry {
-     *         option map_entry = true;
-     *         optional KeyType key = 1;
-     *         optional ValueType value = 2;
-     *     }
-     *     repeated MapFieldEntry map_field = 1;
-     * Implementations may choose not to generate the map_entry=true message, but
-     * use a native map in the target language to hold the keys and values.
-     * The reflection APIs in such implementations still need to work as
-     * if the field is a repeated message field.
-     * NOTE: Do not set the option in .proto files. Always use the maps syntax
-     * instead. The option should only be implicitly set by the proto compiler
-     * parser.
-     *
-     * Generated from protobuf field <code>optional bool map_entry = 7;</code>
-     * @param bool $var
-     * @return $this
-     */
-    public function setMapEntry($var)
-    {
-        GPBUtil::checkBool($var);
-        $this->map_entry = $var;
-
-        return $this;
-    }
-
-    /**
-     * The parser stores options it doesn't recognize here. See above.
-     *
-     * Generated from protobuf field <code>repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;</code>
-     * @return \Google\Protobuf\Internal\RepeatedField
-     */
-    public function getUninterpretedOption()
-    {
-        return $this->uninterpreted_option;
-    }
-
-    /**
-     * The parser stores options it doesn't recognize here. See above.
-     *
-     * Generated from protobuf field <code>repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;</code>
-     * @param array<\Google\Protobuf\Internal\UninterpretedOption>|\Google\Protobuf\Internal\RepeatedField $var
-     * @return $this
-     */
-    public function setUninterpretedOption($var)
-    {
-        $arr = GPBUtil::checkRepeatedField($var, \Google\Protobuf\Internal\GPBType::MESSAGE, \Google\Protobuf\Internal\UninterpretedOption::class);
-        $this->uninterpreted_option = $arr;
-
-        return $this;
-    }
-
-}
-
diff --git a/libs/protobuf/php/src/Google/Protobuf/Internal/MethodDescriptorProto.php b/libs/protobuf/php/src/Google/Protobuf/Internal/MethodDescriptorProto.php
deleted file mode 100644
index 96efb02..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/Internal/MethodDescriptorProto.php
+++ /dev/null
@@ -1,282 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: google/protobuf/descriptor.proto
-
-namespace Google\Protobuf\Internal;
-
-use Google\Protobuf\Internal\GPBType;
-use Google\Protobuf\Internal\GPBWire;
-use Google\Protobuf\Internal\RepeatedField;
-use Google\Protobuf\Internal\InputStream;
-use Google\Protobuf\Internal\GPBUtil;
-
-/**
- * Describes a method of a service.
- *
- * Generated from protobuf message <code>google.protobuf.MethodDescriptorProto</code>
- */
-class MethodDescriptorProto extends \Google\Protobuf\Internal\Message
-{
-    /**
-     * Generated from protobuf field <code>optional string name = 1;</code>
-     */
-    protected $name = null;
-    /**
-     * Input and output type names.  These are resolved in the same way as
-     * FieldDescriptorProto.type_name, but must refer to a message type.
-     *
-     * Generated from protobuf field <code>optional string input_type = 2;</code>
-     */
-    protected $input_type = null;
-    /**
-     * Generated from protobuf field <code>optional string output_type = 3;</code>
-     */
-    protected $output_type = null;
-    /**
-     * Generated from protobuf field <code>optional .google.protobuf.MethodOptions options = 4;</code>
-     */
-    protected $options = null;
-    /**
-     * Identifies if client streams multiple client messages
-     *
-     * Generated from protobuf field <code>optional bool client_streaming = 5 [default = false];</code>
-     */
-    protected $client_streaming = null;
-    /**
-     * Identifies if server streams multiple server messages
-     *
-     * Generated from protobuf field <code>optional bool server_streaming = 6 [default = false];</code>
-     */
-    protected $server_streaming = null;
-
-    /**
-     * Constructor.
-     *
-     * @param array $data {
-     *     Optional. Data for populating the Message object.
-     *
-     *     @type string $name
-     *     @type string $input_type
-     *           Input and output type names.  These are resolved in the same way as
-     *           FieldDescriptorProto.type_name, but must refer to a message type.
-     *     @type string $output_type
-     *     @type \Google\Protobuf\Internal\MethodOptions $options
-     *     @type bool $client_streaming
-     *           Identifies if client streams multiple client messages
-     *     @type bool $server_streaming
-     *           Identifies if server streams multiple server messages
-     * }
-     */
-    public function __construct($data = NULL) {
-        \GPBMetadata\Google\Protobuf\Internal\Descriptor::initOnce();
-        parent::__construct($data);
-    }
-
-    /**
-     * Generated from protobuf field <code>optional string name = 1;</code>
-     * @return string
-     */
-    public function getName()
-    {
-        return isset($this->name) ? $this->name : '';
-    }
-
-    public function hasName()
-    {
-        return isset($this->name);
-    }
-
-    public function clearName()
-    {
-        unset($this->name);
-    }
-
-    /**
-     * Generated from protobuf field <code>optional string name = 1;</code>
-     * @param string $var
-     * @return $this
-     */
-    public function setName($var)
-    {
-        GPBUtil::checkString($var, True);
-        $this->name = $var;
-
-        return $this;
-    }
-
-    /**
-     * Input and output type names.  These are resolved in the same way as
-     * FieldDescriptorProto.type_name, but must refer to a message type.
-     *
-     * Generated from protobuf field <code>optional string input_type = 2;</code>
-     * @return string
-     */
-    public function getInputType()
-    {
-        return isset($this->input_type) ? $this->input_type : '';
-    }
-
-    public function hasInputType()
-    {
-        return isset($this->input_type);
-    }
-
-    public function clearInputType()
-    {
-        unset($this->input_type);
-    }
-
-    /**
-     * Input and output type names.  These are resolved in the same way as
-     * FieldDescriptorProto.type_name, but must refer to a message type.
-     *
-     * Generated from protobuf field <code>optional string input_type = 2;</code>
-     * @param string $var
-     * @return $this
-     */
-    public function setInputType($var)
-    {
-        GPBUtil::checkString($var, True);
-        $this->input_type = $var;
-
-        return $this;
-    }
-
-    /**
-     * Generated from protobuf field <code>optional string output_type = 3;</code>
-     * @return string
-     */
-    public function getOutputType()
-    {
-        return isset($this->output_type) ? $this->output_type : '';
-    }
-
-    public function hasOutputType()
-    {
-        return isset($this->output_type);
-    }
-
-    public function clearOutputType()
-    {
-        unset($this->output_type);
-    }
-
-    /**
-     * Generated from protobuf field <code>optional string output_type = 3;</code>
-     * @param string $var
-     * @return $this
-     */
-    public function setOutputType($var)
-    {
-        GPBUtil::checkString($var, True);
-        $this->output_type = $var;
-
-        return $this;
-    }
-
-    /**
-     * Generated from protobuf field <code>optional .google.protobuf.MethodOptions options = 4;</code>
-     * @return \Google\Protobuf\Internal\MethodOptions|null
-     */
-    public function getOptions()
-    {
-        return $this->options;
-    }
-
-    public function hasOptions()
-    {
-        return isset($this->options);
-    }
-
-    public function clearOptions()
-    {
-        unset($this->options);
-    }
-
-    /**
-     * Generated from protobuf field <code>optional .google.protobuf.MethodOptions options = 4;</code>
-     * @param \Google\Protobuf\Internal\MethodOptions $var
-     * @return $this
-     */
-    public function setOptions($var)
-    {
-        GPBUtil::checkMessage($var, \Google\Protobuf\Internal\MethodOptions::class);
-        $this->options = $var;
-
-        return $this;
-    }
-
-    /**
-     * Identifies if client streams multiple client messages
-     *
-     * Generated from protobuf field <code>optional bool client_streaming = 5 [default = false];</code>
-     * @return bool
-     */
-    public function getClientStreaming()
-    {
-        return isset($this->client_streaming) ? $this->client_streaming : false;
-    }
-
-    public function hasClientStreaming()
-    {
-        return isset($this->client_streaming);
-    }
-
-    public function clearClientStreaming()
-    {
-        unset($this->client_streaming);
-    }
-
-    /**
-     * Identifies if client streams multiple client messages
-     *
-     * Generated from protobuf field <code>optional bool client_streaming = 5 [default = false];</code>
-     * @param bool $var
-     * @return $this
-     */
-    public function setClientStreaming($var)
-    {
-        GPBUtil::checkBool($var);
-        $this->client_streaming = $var;
-
-        return $this;
-    }
-
-    /**
-     * Identifies if server streams multiple server messages
-     *
-     * Generated from protobuf field <code>optional bool server_streaming = 6 [default = false];</code>
-     * @return bool
-     */
-    public function getServerStreaming()
-    {
-        return isset($this->server_streaming) ? $this->server_streaming : false;
-    }
-
-    public function hasServerStreaming()
-    {
-        return isset($this->server_streaming);
-    }
-
-    public function clearServerStreaming()
-    {
-        unset($this->server_streaming);
-    }
-
-    /**
-     * Identifies if server streams multiple server messages
-     *
-     * Generated from protobuf field <code>optional bool server_streaming = 6 [default = false];</code>
-     * @param bool $var
-     * @return $this
-     */
-    public function setServerStreaming($var)
-    {
-        GPBUtil::checkBool($var);
-        $this->server_streaming = $var;
-
-        return $this;
-    }
-
-}
-
diff --git a/libs/protobuf/php/src/Google/Protobuf/Internal/MethodOptions.php b/libs/protobuf/php/src/Google/Protobuf/Internal/MethodOptions.php
deleted file mode 100644
index 87af451..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/Internal/MethodOptions.php
+++ /dev/null
@@ -1,160 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: google/protobuf/descriptor.proto
-
-namespace Google\Protobuf\Internal;
-
-use Google\Protobuf\Internal\GPBType;
-use Google\Protobuf\Internal\GPBWire;
-use Google\Protobuf\Internal\RepeatedField;
-use Google\Protobuf\Internal\InputStream;
-use Google\Protobuf\Internal\GPBUtil;
-
-/**
- * Generated from protobuf message <code>google.protobuf.MethodOptions</code>
- */
-class MethodOptions extends \Google\Protobuf\Internal\Message
-{
-    /**
-     * Is this method deprecated?
-     * Depending on the target platform, this can emit Deprecated annotations
-     * for the method, or it will be completely ignored; in the very least,
-     * this is a formalization for deprecating methods.
-     *
-     * Generated from protobuf field <code>optional bool deprecated = 33 [default = false];</code>
-     */
-    protected $deprecated = null;
-    /**
-     * Generated from protobuf field <code>optional .google.protobuf.MethodOptions.IdempotencyLevel idempotency_level = 34 [default = IDEMPOTENCY_UNKNOWN];</code>
-     */
-    protected $idempotency_level = null;
-    /**
-     * The parser stores options it doesn't recognize here. See above.
-     *
-     * Generated from protobuf field <code>repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;</code>
-     */
-    private $uninterpreted_option;
-
-    /**
-     * Constructor.
-     *
-     * @param array $data {
-     *     Optional. Data for populating the Message object.
-     *
-     *     @type bool $deprecated
-     *           Is this method deprecated?
-     *           Depending on the target platform, this can emit Deprecated annotations
-     *           for the method, or it will be completely ignored; in the very least,
-     *           this is a formalization for deprecating methods.
-     *     @type int $idempotency_level
-     *     @type array<\Google\Protobuf\Internal\UninterpretedOption>|\Google\Protobuf\Internal\RepeatedField $uninterpreted_option
-     *           The parser stores options it doesn't recognize here. See above.
-     * }
-     */
-    public function __construct($data = NULL) {
-        \GPBMetadata\Google\Protobuf\Internal\Descriptor::initOnce();
-        parent::__construct($data);
-    }
-
-    /**
-     * Is this method deprecated?
-     * Depending on the target platform, this can emit Deprecated annotations
-     * for the method, or it will be completely ignored; in the very least,
-     * this is a formalization for deprecating methods.
-     *
-     * Generated from protobuf field <code>optional bool deprecated = 33 [default = false];</code>
-     * @return bool
-     */
-    public function getDeprecated()
-    {
-        return isset($this->deprecated) ? $this->deprecated : false;
-    }
-
-    public function hasDeprecated()
-    {
-        return isset($this->deprecated);
-    }
-
-    public function clearDeprecated()
-    {
-        unset($this->deprecated);
-    }
-
-    /**
-     * Is this method deprecated?
-     * Depending on the target platform, this can emit Deprecated annotations
-     * for the method, or it will be completely ignored; in the very least,
-     * this is a formalization for deprecating methods.
-     *
-     * Generated from protobuf field <code>optional bool deprecated = 33 [default = false];</code>
-     * @param bool $var
-     * @return $this
-     */
-    public function setDeprecated($var)
-    {
-        GPBUtil::checkBool($var);
-        $this->deprecated = $var;
-
-        return $this;
-    }
-
-    /**
-     * Generated from protobuf field <code>optional .google.protobuf.MethodOptions.IdempotencyLevel idempotency_level = 34 [default = IDEMPOTENCY_UNKNOWN];</code>
-     * @return int
-     */
-    public function getIdempotencyLevel()
-    {
-        return isset($this->idempotency_level) ? $this->idempotency_level : 0;
-    }
-
-    public function hasIdempotencyLevel()
-    {
-        return isset($this->idempotency_level);
-    }
-
-    public function clearIdempotencyLevel()
-    {
-        unset($this->idempotency_level);
-    }
-
-    /**
-     * Generated from protobuf field <code>optional .google.protobuf.MethodOptions.IdempotencyLevel idempotency_level = 34 [default = IDEMPOTENCY_UNKNOWN];</code>
-     * @param int $var
-     * @return $this
-     */
-    public function setIdempotencyLevel($var)
-    {
-        GPBUtil::checkEnum($var, \Google\Protobuf\Internal\MethodOptions\IdempotencyLevel::class);
-        $this->idempotency_level = $var;
-
-        return $this;
-    }
-
-    /**
-     * The parser stores options it doesn't recognize here. See above.
-     *
-     * Generated from protobuf field <code>repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;</code>
-     * @return \Google\Protobuf\Internal\RepeatedField
-     */
-    public function getUninterpretedOption()
-    {
-        return $this->uninterpreted_option;
-    }
-
-    /**
-     * The parser stores options it doesn't recognize here. See above.
-     *
-     * Generated from protobuf field <code>repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;</code>
-     * @param array<\Google\Protobuf\Internal\UninterpretedOption>|\Google\Protobuf\Internal\RepeatedField $var
-     * @return $this
-     */
-    public function setUninterpretedOption($var)
-    {
-        $arr = GPBUtil::checkRepeatedField($var, \Google\Protobuf\Internal\GPBType::MESSAGE, \Google\Protobuf\Internal\UninterpretedOption::class);
-        $this->uninterpreted_option = $arr;
-
-        return $this;
-    }
-
-}
-
diff --git a/libs/protobuf/php/src/Google/Protobuf/Internal/MethodOptions/IdempotencyLevel.php b/libs/protobuf/php/src/Google/Protobuf/Internal/MethodOptions/IdempotencyLevel.php
deleted file mode 100644
index ce3c062..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/Internal/MethodOptions/IdempotencyLevel.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: google/protobuf/descriptor.proto
-
-namespace Google\Protobuf\Internal\MethodOptions;
-
-use UnexpectedValueException;
-
-/**
- * Is this method side-effect-free (or safe in HTTP parlance), or idempotent,
- * or neither? HTTP based RPC implementation may choose GET verb for safe
- * methods, and PUT verb for idempotent methods instead of the default POST.
- *
- * Protobuf type <code>google.protobuf.MethodOptions.IdempotencyLevel</code>
- */
-class IdempotencyLevel
-{
-    /**
-     * Generated from protobuf enum <code>IDEMPOTENCY_UNKNOWN = 0;</code>
-     */
-    const IDEMPOTENCY_UNKNOWN = 0;
-    /**
-     * implies idempotent
-     *
-     * Generated from protobuf enum <code>NO_SIDE_EFFECTS = 1;</code>
-     */
-    const NO_SIDE_EFFECTS = 1;
-    /**
-     * idempotent, but may have side effects
-     *
-     * Generated from protobuf enum <code>IDEMPOTENT = 2;</code>
-     */
-    const IDEMPOTENT = 2;
-
-    private static $valueToName = [
-        self::IDEMPOTENCY_UNKNOWN => 'IDEMPOTENCY_UNKNOWN',
-        self::NO_SIDE_EFFECTS => 'NO_SIDE_EFFECTS',
-        self::IDEMPOTENT => 'IDEMPOTENT',
-    ];
-
-    public static function name($value)
-    {
-        if (!isset(self::$valueToName[$value])) {
-            throw new UnexpectedValueException(sprintf(
-                    'Enum %s has no name defined for value %s', __CLASS__, $value));
-        }
-        return self::$valueToName[$value];
-    }
-
-
-    public static function value($name)
-    {
-        $const = __CLASS__ . '::' . strtoupper($name);
-        if (!defined($const)) {
-            throw new UnexpectedValueException(sprintf(
-                    'Enum %s has no value defined for name %s', __CLASS__, $name));
-        }
-        return constant($const);
-    }
-}
-
-// Adding a class alias for backwards compatibility with the previous class name.
-class_alias(IdempotencyLevel::class, \Google\Protobuf\Internal\MethodOptions_IdempotencyLevel::class);
-
diff --git a/libs/protobuf/php/src/Google/Protobuf/Internal/MethodOptions_IdempotencyLevel.php b/libs/protobuf/php/src/Google/Protobuf/Internal/MethodOptions_IdempotencyLevel.php
deleted file mode 100644
index a291311..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/Internal/MethodOptions_IdempotencyLevel.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: google/protobuf/descriptor.proto
-
-namespace Google\Protobuf\Internal;
-
-if (false) {
-    /**
-     * This class is deprecated. Use Google\Protobuf\Internal\MethodOptions\IdempotencyLevel instead.
-     * @deprecated
-     */
-    class MethodOptions_IdempotencyLevel {}
-}
-class_exists(MethodOptions\IdempotencyLevel::class);
-@trigger_error('Google\Protobuf\Internal\MethodOptions_IdempotencyLevel is deprecated and will be removed in the next major release. Use Google\Protobuf\Internal\MethodOptions\IdempotencyLevel instead', E_USER_DEPRECATED);
-
diff --git a/libs/protobuf/php/src/Google/Protobuf/Internal/OneofDescriptor.php b/libs/protobuf/php/src/Google/Protobuf/Internal/OneofDescriptor.php
deleted file mode 100644
index 4323685..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/Internal/OneofDescriptor.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-namespace Google\Protobuf\Internal;
-
-class OneofDescriptor
-{
-    use HasPublicDescriptorTrait;
-
-    private $name;
-    /** @var \Google\Protobuf\FieldDescriptor[] $fields */
-    private $fields;
-
-    public function __construct()
-    {
-        $this->public_desc = new \Google\Protobuf\OneofDescriptor($this);
-    }
-
-    public function setName($name)
-    {
-        $this->name = $name;
-    }
-
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    public function addField(FieldDescriptor $field)
-    {
-        $this->fields[] = $field;
-    }
-
-    public function getFields()
-    {
-        return $this->fields;
-    }
-
-    public function isSynthetic()
-    {
-        return !is_null($this->fields) && count($this->fields) === 1
-            && $this->fields[0]->getProto3Optional();
-    }
-
-    public static function buildFromProto($oneof_proto, $desc, $index)
-    {
-        $oneof = new OneofDescriptor();
-        $oneof->setName($oneof_proto->getName());
-        foreach ($desc->getField() as $field) {
-            /** @var FieldDescriptor $field */
-            if ($field->getOneofIndex() == $index) {
-                $oneof->addField($field);
-                $field->setContainingOneof($oneof);
-            }
-        }
-        return $oneof;
-    }
-}
diff --git a/libs/protobuf/php/src/Google/Protobuf/Internal/OneofDescriptorProto.php b/libs/protobuf/php/src/Google/Protobuf/Internal/OneofDescriptorProto.php
deleted file mode 100644
index 3cb9f25..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/Internal/OneofDescriptorProto.php
+++ /dev/null
@@ -1,109 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: google/protobuf/descriptor.proto
-
-namespace Google\Protobuf\Internal;
-
-use Google\Protobuf\Internal\GPBType;
-use Google\Protobuf\Internal\GPBWire;
-use Google\Protobuf\Internal\RepeatedField;
-use Google\Protobuf\Internal\InputStream;
-use Google\Protobuf\Internal\GPBUtil;
-
-/**
- * Describes a oneof.
- *
- * Generated from protobuf message <code>google.protobuf.OneofDescriptorProto</code>
- */
-class OneofDescriptorProto extends \Google\Protobuf\Internal\Message
-{
-    /**
-     * Generated from protobuf field <code>optional string name = 1;</code>
-     */
-    protected $name = null;
-    /**
-     * Generated from protobuf field <code>optional .google.protobuf.OneofOptions options = 2;</code>
-     */
-    protected $options = null;
-
-    /**
-     * Constructor.
-     *
-     * @param array $data {
-     *     Optional. Data for populating the Message object.
-     *
-     *     @type string $name
-     *     @type \Google\Protobuf\Internal\OneofOptions $options
-     * }
-     */
-    public function __construct($data = NULL) {
-        \GPBMetadata\Google\Protobuf\Internal\Descriptor::initOnce();
-        parent::__construct($data);
-    }
-
-    /**
-     * Generated from protobuf field <code>optional string name = 1;</code>
-     * @return string
-     */
-    public function getName()
-    {
-        return isset($this->name) ? $this->name : '';
-    }
-
-    public function hasName()
-    {
-        return isset($this->name);
-    }
-
-    public function clearName()
-    {
-        unset($this->name);
-    }
-
-    /**
-     * Generated from protobuf field <code>optional string name = 1;</code>
-     * @param string $var
-     * @return $this
-     */
-    public function setName($var)
-    {
-        GPBUtil::checkString($var, True);
-        $this->name = $var;
-
-        return $this;
-    }
-
-    /**
-     * Generated from protobuf field <code>optional .google.protobuf.OneofOptions options = 2;</code>
-     * @return \Google\Protobuf\Internal\OneofOptions|null
-     */
-    public function getOptions()
-    {
-        return $this->options;
-    }
-
-    public function hasOptions()
-    {
-        return isset($this->options);
-    }
-
-    public function clearOptions()
-    {
-        unset($this->options);
-    }
-
-    /**
-     * Generated from protobuf field <code>optional .google.protobuf.OneofOptions options = 2;</code>
-     * @param \Google\Protobuf\Internal\OneofOptions $var
-     * @return $this
-     */
-    public function setOptions($var)
-    {
-        GPBUtil::checkMessage($var, \Google\Protobuf\Internal\OneofOptions::class);
-        $this->options = $var;
-
-        return $this;
-    }
-
-}
-
diff --git a/libs/protobuf/php/src/Google/Protobuf/Internal/OneofField.php b/libs/protobuf/php/src/Google/Protobuf/Internal/OneofField.php
deleted file mode 100644
index 2c689e8..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/Internal/OneofField.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-namespace Google\Protobuf\Internal;
-
-class OneofField
-{
-
-    private $desc;
-    private $field_name;
-    private $number = 0;
-    private $value;
-
-    public function __construct($desc)
-    {
-        $this->desc = $desc;
-    }
-
-    public function setValue($value)
-    {
-        $this->value = $value;
-    }
-
-    public function getValue()
-    {
-        return $this->value;
-    }
-
-    public function setFieldName($field_name)
-    {
-        $this->field_name = $field_name;
-    }
-
-    public function getFieldName()
-    {
-        return $this->field_name;
-    }
-
-    public function setNumber($number)
-    {
-        $this->number = $number;
-    }
-
-    public function getNumber()
-    {
-        return $this->number;
-    }
-}
diff --git a/libs/protobuf/php/src/Google/Protobuf/Internal/OneofOptions.php b/libs/protobuf/php/src/Google/Protobuf/Internal/OneofOptions.php
deleted file mode 100644
index b44d194..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/Internal/OneofOptions.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: google/protobuf/descriptor.proto
-
-namespace Google\Protobuf\Internal;
-
-use Google\Protobuf\Internal\GPBType;
-use Google\Protobuf\Internal\GPBWire;
-use Google\Protobuf\Internal\RepeatedField;
-use Google\Protobuf\Internal\InputStream;
-use Google\Protobuf\Internal\GPBUtil;
-
-/**
- * Generated from protobuf message <code>google.protobuf.OneofOptions</code>
- */
-class OneofOptions extends \Google\Protobuf\Internal\Message
-{
-    /**
-     * The parser stores options it doesn't recognize here. See above.
-     *
-     * Generated from protobuf field <code>repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;</code>
-     */
-    private $uninterpreted_option;
-
-    /**
-     * Constructor.
-     *
-     * @param array $data {
-     *     Optional. Data for populating the Message object.
-     *
-     *     @type array<\Google\Protobuf\Internal\UninterpretedOption>|\Google\Protobuf\Internal\RepeatedField $uninterpreted_option
-     *           The parser stores options it doesn't recognize here. See above.
-     * }
-     */
-    public function __construct($data = NULL) {
-        \GPBMetadata\Google\Protobuf\Internal\Descriptor::initOnce();
-        parent::__construct($data);
-    }
-
-    /**
-     * The parser stores options it doesn't recognize here. See above.
-     *
-     * Generated from protobuf field <code>repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;</code>
-     * @return \Google\Protobuf\Internal\RepeatedField
-     */
-    public function getUninterpretedOption()
-    {
-        return $this->uninterpreted_option;
-    }
-
-    /**
-     * The parser stores options it doesn't recognize here. See above.
-     *
-     * Generated from protobuf field <code>repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;</code>
-     * @param array<\Google\Protobuf\Internal\UninterpretedOption>|\Google\Protobuf\Internal\RepeatedField $var
-     * @return $this
-     */
-    public function setUninterpretedOption($var)
-    {
-        $arr = GPBUtil::checkRepeatedField($var, \Google\Protobuf\Internal\GPBType::MESSAGE, \Google\Protobuf\Internal\UninterpretedOption::class);
-        $this->uninterpreted_option = $arr;
-
-        return $this;
-    }
-
-}
-
diff --git a/libs/protobuf/php/src/Google/Protobuf/Internal/RawInputStream.php b/libs/protobuf/php/src/Google/Protobuf/Internal/RawInputStream.php
deleted file mode 100644
index 4e7ed5c..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/Internal/RawInputStream.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-namespace Google\Protobuf\Internal;
-
-class RawInputStream
-{
-
-    private $buffer;
-
-    public function __construct($buffer)
-    {
-        $this->buffer = $buffer;
-    }
-
-    public function getData()
-    {
-        return $this->buffer;
-    }
-
-}
diff --git a/libs/protobuf/php/src/Google/Protobuf/Internal/RepeatedField.php b/libs/protobuf/php/src/Google/Protobuf/Internal/RepeatedField.php
deleted file mode 100644
index ea7971f..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/Internal/RepeatedField.php
+++ /dev/null
@@ -1,264 +0,0 @@
-<?php
-
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-/**
- * RepeatedField and RepeatedFieldIter are used by generated protocol message
- * classes to manipulate repeated fields.
- */
-
-namespace Google\Protobuf\Internal;
-
-use Google\Protobuf\Internal\GPBType;
-use Google\Protobuf\Internal\GPBUtil;
-use Traversable;
-
-/**
- * RepeatedField is used by generated protocol message classes to manipulate
- * repeated fields. It can be used like native PHP array.
- */
-class RepeatedField implements \ArrayAccess, \IteratorAggregate, \Countable
-{
-
-    /**
-     * @ignore
-     */
-    private $container;
-    /**
-     * @ignore
-     */
-    private $type;
-    /**
-     * @ignore
-     */
-    private $klass;
-    /**
-     * @ignore
-     */
-    private $legacy_klass;
-
-    /**
-     * Constructs an instance of RepeatedField.
-     *
-     * @param integer $type Type of the stored element.
-     * @param string $klass Message/Enum class name (message/enum fields only).
-     * @ignore
-     */
-    public function __construct($type, $klass = null)
-    {
-        $this->container = [];
-        $this->type = $type;
-        if ($this->type == GPBType::MESSAGE) {
-            $pool = DescriptorPool::getGeneratedPool();
-            $desc = $pool->getDescriptorByClassName($klass);
-            if ($desc == NULL) {
-                new $klass;  // No msg class instance has been created before.
-                $desc = $pool->getDescriptorByClassName($klass);
-            }
-            $this->klass = $desc->getClass();
-            $this->legacy_klass = $desc->getLegacyClass();
-        }
-    }
-
-    /**
-     * @ignore
-     */
-    public function getType()
-    {
-        return $this->type;
-    }
-
-    /**
-     * @ignore
-     */
-    public function getClass()
-    {
-        return $this->klass;
-    }
-
-    /**
-     * @ignore
-     */
-    public function getLegacyClass()
-    {
-        return $this->legacy_klass;
-    }
-
-    /**
-     * Return the element at the given index.
-     *
-     * This will also be called for: $ele = $arr[0]
-     *
-     * @param integer $offset The index of the element to be fetched.
-     * @return mixed The stored element at given index.
-     * @throws \ErrorException Invalid type for index.
-     * @throws \ErrorException Non-existing index.
-     * @todo need to add return type mixed (require update php version to 8.0)
-     */
-    #[\ReturnTypeWillChange]
-    public function offsetGet($offset)
-    {
-        return $this->container[$offset];
-    }
-
-    /**
-     * Assign the element at the given index.
-     *
-     * This will also be called for: $arr []= $ele and $arr[0] = ele
-     *
-     * @param int|null $offset The index of the element to be assigned.
-     * @param mixed $value The element to be assigned.
-     * @return void
-     * @throws \ErrorException Invalid type for index.
-     * @throws \ErrorException Non-existing index.
-     * @throws \ErrorException Incorrect type of the element.
-     * @todo need to add return type void (require update php version to 7.1)
-     */
-    #[\ReturnTypeWillChange]
-    public function offsetSet($offset, $value)
-    {
-        switch ($this->type) {
-            case GPBType::SFIXED32:
-            case GPBType::SINT32:
-            case GPBType::INT32:
-            case GPBType::ENUM:
-                GPBUtil::checkInt32($value);
-                break;
-            case GPBType::FIXED32:
-            case GPBType::UINT32:
-                GPBUtil::checkUint32($value);
-                break;
-            case GPBType::SFIXED64:
-            case GPBType::SINT64:
-            case GPBType::INT64:
-                GPBUtil::checkInt64($value);
-                break;
-            case GPBType::FIXED64:
-            case GPBType::UINT64:
-                GPBUtil::checkUint64($value);
-                break;
-            case GPBType::FLOAT:
-                GPBUtil::checkFloat($value);
-                break;
-            case GPBType::DOUBLE:
-                GPBUtil::checkDouble($value);
-                break;
-            case GPBType::BOOL:
-                GPBUtil::checkBool($value);
-                break;
-            case GPBType::BYTES:
-                GPBUtil::checkString($value, false);
-                break;
-            case GPBType::STRING:
-                GPBUtil::checkString($value, true);
-                break;
-            case GPBType::MESSAGE:
-                if (is_null($value)) {
-                    throw new \TypeError("RepeatedField element cannot be null.");
-                }
-                GPBUtil::checkMessage($value, $this->klass);
-                break;
-            default:
-                break;
-        }
-        if (is_null($offset)) {
-            $this->container[] = $value;
-        } else {
-            $count = count($this->container);
-            if (!is_numeric($offset) || $offset < 0 || $offset >= $count) {
-                trigger_error(
-                    "Cannot modify element at the given index",
-                    E_USER_ERROR);
-                return;
-            }
-            $this->container[$offset] = $value;
-        }
-    }
-
-    /**
-     * Remove the element at the given index.
-     *
-     * This will also be called for: unset($arr)
-     *
-     * @param integer $offset The index of the element to be removed.
-     * @return void
-     * @throws \ErrorException Invalid type for index.
-     * @throws \ErrorException The element to be removed is not at the end of the
-     * RepeatedField.
-     * @todo need to add return type void (require update php version to 7.1)
-     */
-    #[\ReturnTypeWillChange]
-    public function offsetUnset($offset)
-    {
-        $count = count($this->container);
-        if (!is_numeric($offset) || $count === 0 || $offset !== $count - 1) {
-            trigger_error(
-                "Cannot remove element at the given index",
-                E_USER_ERROR);
-            return;
-        }
-        array_pop($this->container);
-    }
-
-    /**
-     * Check the existence of the element at the given index.
-     *
-     * This will also be called for: isset($arr)
-     *
-     * @param integer $offset The index of the element to be removed.
-     * @return bool True if the element at the given offset exists.
-     * @throws \ErrorException Invalid type for index.
-     */
-    public function offsetExists($offset): bool
-    {
-        return isset($this->container[$offset]);
-    }
-
-    /**
-     * @ignore
-     */
-    public function getIterator(): Traversable
-    {
-        return new RepeatedFieldIter($this->container);
-    }
-
-    /**
-     * Return the number of stored elements.
-     *
-     * This will also be called for: count($arr)
-     *
-     * @return integer The number of stored elements.
-     */
-    public function count(): int
-    {
-        return count($this->container);
-    }
-}
diff --git a/libs/protobuf/php/src/Google/Protobuf/Internal/RepeatedFieldIter.php b/libs/protobuf/php/src/Google/Protobuf/Internal/RepeatedFieldIter.php
deleted file mode 100644
index ec99b64..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/Internal/RepeatedFieldIter.php
+++ /dev/null
@@ -1,126 +0,0 @@
-<?php
-
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-/**
- * RepeatedField and RepeatedFieldIter are used by generated protocol message
- * classes to manipulate repeated fields.
- */
-
-namespace Google\Protobuf\Internal;
-
-/**
- * RepeatedFieldIter is used to iterate RepeatedField. It is also need for the
- * foreach syntax.
- */
-class RepeatedFieldIter implements \Iterator
-{
-
-    /**
-     * @ignore
-     */
-    private $position;
-    /**
-     * @ignore
-     */
-    private $container;
-
-    /**
-     * Create iterator instance for RepeatedField.
-     *
-     * @param RepeatedField The RepeatedField instance for which this iterator
-     * is created.
-     * @ignore
-     */
-    public function __construct($container)
-    {
-        $this->position = 0;
-        $this->container = $container;
-    }
-
-    /**
-     * Reset the status of the iterator
-     *
-     * @return void
-     * @todo need to add return type void (require update php version to 7.1)
-     */
-    #[\ReturnTypeWillChange]
-    public function rewind()
-    {
-        $this->position = 0;
-    }
-
-    /**
-     * Return the element at the current position.
-     *
-     * @return object The element at the current position.
-     * @todo need to add return type mixed (require update php version to 8.0)
-     */
-    #[\ReturnTypeWillChange]
-    public function current()
-    {
-        return $this->container[$this->position];
-    }
-
-    /**
-     * Return the current position.
-     *
-     * @return integer The current position.
-     * @todo need to add return type mixed (require update php version to 8.0)
-     */
-    #[\ReturnTypeWillChange]
-    public function key()
-    {
-        return $this->position;
-    }
-
-    /**
-     * Move to the next position.
-     *
-     * @return void
-     * @todo need to add return type void (require update php version to 7.1)
-     */
-    #[\ReturnTypeWillChange]
-    public function next()
-    {
-        ++$this->position;
-    }
-
-    /**
-     * Check whether there are more elements to iterate.
-     *
-     * @return bool True if there are more elements to iterate.
-     */
-    public function valid(): bool
-    {
-        return isset($this->container[$this->position]);
-    }
-}
diff --git a/libs/protobuf/php/src/Google/Protobuf/Internal/ServiceDescriptorProto.php b/libs/protobuf/php/src/Google/Protobuf/Internal/ServiceDescriptorProto.php
deleted file mode 100644
index e322e2a..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/Internal/ServiceDescriptorProto.php
+++ /dev/null
@@ -1,136 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: google/protobuf/descriptor.proto
-
-namespace Google\Protobuf\Internal;
-
-use Google\Protobuf\Internal\GPBType;
-use Google\Protobuf\Internal\GPBWire;
-use Google\Protobuf\Internal\RepeatedField;
-use Google\Protobuf\Internal\InputStream;
-use Google\Protobuf\Internal\GPBUtil;
-
-/**
- * Describes a service.
- *
- * Generated from protobuf message <code>google.protobuf.ServiceDescriptorProto</code>
- */
-class ServiceDescriptorProto extends \Google\Protobuf\Internal\Message
-{
-    /**
-     * Generated from protobuf field <code>optional string name = 1;</code>
-     */
-    protected $name = null;
-    /**
-     * Generated from protobuf field <code>repeated .google.protobuf.MethodDescriptorProto method = 2;</code>
-     */
-    private $method;
-    /**
-     * Generated from protobuf field <code>optional .google.protobuf.ServiceOptions options = 3;</code>
-     */
-    protected $options = null;
-
-    /**
-     * Constructor.
-     *
-     * @param array $data {
-     *     Optional. Data for populating the Message object.
-     *
-     *     @type string $name
-     *     @type array<\Google\Protobuf\Internal\MethodDescriptorProto>|\Google\Protobuf\Internal\RepeatedField $method
-     *     @type \Google\Protobuf\Internal\ServiceOptions $options
-     * }
-     */
-    public function __construct($data = NULL) {
-        \GPBMetadata\Google\Protobuf\Internal\Descriptor::initOnce();
-        parent::__construct($data);
-    }
-
-    /**
-     * Generated from protobuf field <code>optional string name = 1;</code>
-     * @return string
-     */
-    public function getName()
-    {
-        return isset($this->name) ? $this->name : '';
-    }
-
-    public function hasName()
-    {
-        return isset($this->name);
-    }
-
-    public function clearName()
-    {
-        unset($this->name);
-    }
-
-    /**
-     * Generated from protobuf field <code>optional string name = 1;</code>
-     * @param string $var
-     * @return $this
-     */
-    public function setName($var)
-    {
-        GPBUtil::checkString($var, True);
-        $this->name = $var;
-
-        return $this;
-    }
-
-    /**
-     * Generated from protobuf field <code>repeated .google.protobuf.MethodDescriptorProto method = 2;</code>
-     * @return \Google\Protobuf\Internal\RepeatedField
-     */
-    public function getMethod()
-    {
-        return $this->method;
-    }
-
-    /**
-     * Generated from protobuf field <code>repeated .google.protobuf.MethodDescriptorProto method = 2;</code>
-     * @param array<\Google\Protobuf\Internal\MethodDescriptorProto>|\Google\Protobuf\Internal\RepeatedField $var
-     * @return $this
-     */
-    public function setMethod($var)
-    {
-        $arr = GPBUtil::checkRepeatedField($var, \Google\Protobuf\Internal\GPBType::MESSAGE, \Google\Protobuf\Internal\MethodDescriptorProto::class);
-        $this->method = $arr;
-
-        return $this;
-    }
-
-    /**
-     * Generated from protobuf field <code>optional .google.protobuf.ServiceOptions options = 3;</code>
-     * @return \Google\Protobuf\Internal\ServiceOptions|null
-     */
-    public function getOptions()
-    {
-        return $this->options;
-    }
-
-    public function hasOptions()
-    {
-        return isset($this->options);
-    }
-
-    public function clearOptions()
-    {
-        unset($this->options);
-    }
-
-    /**
-     * Generated from protobuf field <code>optional .google.protobuf.ServiceOptions options = 3;</code>
-     * @param \Google\Protobuf\Internal\ServiceOptions $var
-     * @return $this
-     */
-    public function setOptions($var)
-    {
-        GPBUtil::checkMessage($var, \Google\Protobuf\Internal\ServiceOptions::class);
-        $this->options = $var;
-
-        return $this;
-    }
-
-}
-
diff --git a/libs/protobuf/php/src/Google/Protobuf/Internal/ServiceOptions.php b/libs/protobuf/php/src/Google/Protobuf/Internal/ServiceOptions.php
deleted file mode 100644
index 8ac27ee..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/Internal/ServiceOptions.php
+++ /dev/null
@@ -1,123 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: google/protobuf/descriptor.proto
-
-namespace Google\Protobuf\Internal;
-
-use Google\Protobuf\Internal\GPBType;
-use Google\Protobuf\Internal\GPBWire;
-use Google\Protobuf\Internal\RepeatedField;
-use Google\Protobuf\Internal\InputStream;
-use Google\Protobuf\Internal\GPBUtil;
-
-/**
- * Generated from protobuf message <code>google.protobuf.ServiceOptions</code>
- */
-class ServiceOptions extends \Google\Protobuf\Internal\Message
-{
-    /**
-     * Is this service deprecated?
-     * Depending on the target platform, this can emit Deprecated annotations
-     * for the service, or it will be completely ignored; in the very least,
-     * this is a formalization for deprecating services.
-     *
-     * Generated from protobuf field <code>optional bool deprecated = 33 [default = false];</code>
-     */
-    protected $deprecated = null;
-    /**
-     * The parser stores options it doesn't recognize here. See above.
-     *
-     * Generated from protobuf field <code>repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;</code>
-     */
-    private $uninterpreted_option;
-
-    /**
-     * Constructor.
-     *
-     * @param array $data {
-     *     Optional. Data for populating the Message object.
-     *
-     *     @type bool $deprecated
-     *           Is this service deprecated?
-     *           Depending on the target platform, this can emit Deprecated annotations
-     *           for the service, or it will be completely ignored; in the very least,
-     *           this is a formalization for deprecating services.
-     *     @type array<\Google\Protobuf\Internal\UninterpretedOption>|\Google\Protobuf\Internal\RepeatedField $uninterpreted_option
-     *           The parser stores options it doesn't recognize here. See above.
-     * }
-     */
-    public function __construct($data = NULL) {
-        \GPBMetadata\Google\Protobuf\Internal\Descriptor::initOnce();
-        parent::__construct($data);
-    }
-
-    /**
-     * Is this service deprecated?
-     * Depending on the target platform, this can emit Deprecated annotations
-     * for the service, or it will be completely ignored; in the very least,
-     * this is a formalization for deprecating services.
-     *
-     * Generated from protobuf field <code>optional bool deprecated = 33 [default = false];</code>
-     * @return bool
-     */
-    public function getDeprecated()
-    {
-        return isset($this->deprecated) ? $this->deprecated : false;
-    }
-
-    public function hasDeprecated()
-    {
-        return isset($this->deprecated);
-    }
-
-    public function clearDeprecated()
-    {
-        unset($this->deprecated);
-    }
-
-    /**
-     * Is this service deprecated?
-     * Depending on the target platform, this can emit Deprecated annotations
-     * for the service, or it will be completely ignored; in the very least,
-     * this is a formalization for deprecating services.
-     *
-     * Generated from protobuf field <code>optional bool deprecated = 33 [default = false];</code>
-     * @param bool $var
-     * @return $this
-     */
-    public function setDeprecated($var)
-    {
-        GPBUtil::checkBool($var);
-        $this->deprecated = $var;
-
-        return $this;
-    }
-
-    /**
-     * The parser stores options it doesn't recognize here. See above.
-     *
-     * Generated from protobuf field <code>repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;</code>
-     * @return \Google\Protobuf\Internal\RepeatedField
-     */
-    public function getUninterpretedOption()
-    {
-        return $this->uninterpreted_option;
-    }
-
-    /**
-     * The parser stores options it doesn't recognize here. See above.
-     *
-     * Generated from protobuf field <code>repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;</code>
-     * @param array<\Google\Protobuf\Internal\UninterpretedOption>|\Google\Protobuf\Internal\RepeatedField $var
-     * @return $this
-     */
-    public function setUninterpretedOption($var)
-    {
-        $arr = GPBUtil::checkRepeatedField($var, \Google\Protobuf\Internal\GPBType::MESSAGE, \Google\Protobuf\Internal\UninterpretedOption::class);
-        $this->uninterpreted_option = $arr;
-
-        return $this;
-    }
-
-}
-
diff --git a/libs/protobuf/php/src/Google/Protobuf/Internal/SourceCodeInfo.php b/libs/protobuf/php/src/Google/Protobuf/Internal/SourceCodeInfo.php
deleted file mode 100644
index 0005bc6..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/Internal/SourceCodeInfo.php
+++ /dev/null
@@ -1,230 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: google/protobuf/descriptor.proto
-
-namespace Google\Protobuf\Internal;
-
-use Google\Protobuf\Internal\GPBType;
-use Google\Protobuf\Internal\GPBWire;
-use Google\Protobuf\Internal\RepeatedField;
-use Google\Protobuf\Internal\InputStream;
-use Google\Protobuf\Internal\GPBUtil;
-
-/**
- * Encapsulates information about the original source file from which a
- * FileDescriptorProto was generated.
- *
- * Generated from protobuf message <code>google.protobuf.SourceCodeInfo</code>
- */
-class SourceCodeInfo extends \Google\Protobuf\Internal\Message
-{
-    /**
-     * A Location identifies a piece of source code in a .proto file which
-     * corresponds to a particular definition.  This information is intended
-     * to be useful to IDEs, code indexers, documentation generators, and similar
-     * tools.
-     * For example, say we have a file like:
-     *   message Foo {
-     *     optional string foo = 1;
-     *   }
-     * Let's look at just the field definition:
-     *   optional string foo = 1;
-     *   ^       ^^     ^^  ^  ^^^
-     *   a       bc     de  f  ghi
-     * We have the following locations:
-     *   span   path               represents
-     *   [a,i)  [ 4, 0, 2, 0 ]     The whole field definition.
-     *   [a,b)  [ 4, 0, 2, 0, 4 ]  The label (optional).
-     *   [c,d)  [ 4, 0, 2, 0, 5 ]  The type (string).
-     *   [e,f)  [ 4, 0, 2, 0, 1 ]  The name (foo).
-     *   [g,h)  [ 4, 0, 2, 0, 3 ]  The number (1).
-     * Notes:
-     * - A location may refer to a repeated field itself (i.e. not to any
-     *   particular index within it).  This is used whenever a set of elements are
-     *   logically enclosed in a single code segment.  For example, an entire
-     *   extend block (possibly containing multiple extension definitions) will
-     *   have an outer location whose path refers to the "extensions" repeated
-     *   field without an index.
-     * - Multiple locations may have the same path.  This happens when a single
-     *   logical declaration is spread out across multiple places.  The most
-     *   obvious example is the "extend" block again -- there may be multiple
-     *   extend blocks in the same scope, each of which will have the same path.
-     * - A location's span is not always a subset of its parent's span.  For
-     *   example, the "extendee" of an extension declaration appears at the
-     *   beginning of the "extend" block and is shared by all extensions within
-     *   the block.
-     * - Just because a location's span is a subset of some other location's span
-     *   does not mean that it is a descendant.  For example, a "group" defines
-     *   both a type and a field in a single declaration.  Thus, the locations
-     *   corresponding to the type and field and their components will overlap.
-     * - Code which tries to interpret locations should probably be designed to
-     *   ignore those that it doesn't understand, as more types of locations could
-     *   be recorded in the future.
-     *
-     * Generated from protobuf field <code>repeated .google.protobuf.SourceCodeInfo.Location location = 1;</code>
-     */
-    private $location;
-
-    /**
-     * Constructor.
-     *
-     * @param array $data {
-     *     Optional. Data for populating the Message object.
-     *
-     *     @type array<\Google\Protobuf\Internal\SourceCodeInfo\Location>|\Google\Protobuf\Internal\RepeatedField $location
-     *           A Location identifies a piece of source code in a .proto file which
-     *           corresponds to a particular definition.  This information is intended
-     *           to be useful to IDEs, code indexers, documentation generators, and similar
-     *           tools.
-     *           For example, say we have a file like:
-     *             message Foo {
-     *               optional string foo = 1;
-     *             }
-     *           Let's look at just the field definition:
-     *             optional string foo = 1;
-     *             ^       ^^     ^^  ^  ^^^
-     *             a       bc     de  f  ghi
-     *           We have the following locations:
-     *             span   path               represents
-     *             [a,i)  [ 4, 0, 2, 0 ]     The whole field definition.
-     *             [a,b)  [ 4, 0, 2, 0, 4 ]  The label (optional).
-     *             [c,d)  [ 4, 0, 2, 0, 5 ]  The type (string).
-     *             [e,f)  [ 4, 0, 2, 0, 1 ]  The name (foo).
-     *             [g,h)  [ 4, 0, 2, 0, 3 ]  The number (1).
-     *           Notes:
-     *           - A location may refer to a repeated field itself (i.e. not to any
-     *             particular index within it).  This is used whenever a set of elements are
-     *             logically enclosed in a single code segment.  For example, an entire
-     *             extend block (possibly containing multiple extension definitions) will
-     *             have an outer location whose path refers to the "extensions" repeated
-     *             field without an index.
-     *           - Multiple locations may have the same path.  This happens when a single
-     *             logical declaration is spread out across multiple places.  The most
-     *             obvious example is the "extend" block again -- there may be multiple
-     *             extend blocks in the same scope, each of which will have the same path.
-     *           - A location's span is not always a subset of its parent's span.  For
-     *             example, the "extendee" of an extension declaration appears at the
-     *             beginning of the "extend" block and is shared by all extensions within
-     *             the block.
-     *           - Just because a location's span is a subset of some other location's span
-     *             does not mean that it is a descendant.  For example, a "group" defines
-     *             both a type and a field in a single declaration.  Thus, the locations
-     *             corresponding to the type and field and their components will overlap.
-     *           - Code which tries to interpret locations should probably be designed to
-     *             ignore those that it doesn't understand, as more types of locations could
-     *             be recorded in the future.
-     * }
-     */
-    public function __construct($data = NULL) {
-        \GPBMetadata\Google\Protobuf\Internal\Descriptor::initOnce();
-        parent::__construct($data);
-    }
-
-    /**
-     * A Location identifies a piece of source code in a .proto file which
-     * corresponds to a particular definition.  This information is intended
-     * to be useful to IDEs, code indexers, documentation generators, and similar
-     * tools.
-     * For example, say we have a file like:
-     *   message Foo {
-     *     optional string foo = 1;
-     *   }
-     * Let's look at just the field definition:
-     *   optional string foo = 1;
-     *   ^       ^^     ^^  ^  ^^^
-     *   a       bc     de  f  ghi
-     * We have the following locations:
-     *   span   path               represents
-     *   [a,i)  [ 4, 0, 2, 0 ]     The whole field definition.
-     *   [a,b)  [ 4, 0, 2, 0, 4 ]  The label (optional).
-     *   [c,d)  [ 4, 0, 2, 0, 5 ]  The type (string).
-     *   [e,f)  [ 4, 0, 2, 0, 1 ]  The name (foo).
-     *   [g,h)  [ 4, 0, 2, 0, 3 ]  The number (1).
-     * Notes:
-     * - A location may refer to a repeated field itself (i.e. not to any
-     *   particular index within it).  This is used whenever a set of elements are
-     *   logically enclosed in a single code segment.  For example, an entire
-     *   extend block (possibly containing multiple extension definitions) will
-     *   have an outer location whose path refers to the "extensions" repeated
-     *   field without an index.
-     * - Multiple locations may have the same path.  This happens when a single
-     *   logical declaration is spread out across multiple places.  The most
-     *   obvious example is the "extend" block again -- there may be multiple
-     *   extend blocks in the same scope, each of which will have the same path.
-     * - A location's span is not always a subset of its parent's span.  For
-     *   example, the "extendee" of an extension declaration appears at the
-     *   beginning of the "extend" block and is shared by all extensions within
-     *   the block.
-     * - Just because a location's span is a subset of some other location's span
-     *   does not mean that it is a descendant.  For example, a "group" defines
-     *   both a type and a field in a single declaration.  Thus, the locations
-     *   corresponding to the type and field and their components will overlap.
-     * - Code which tries to interpret locations should probably be designed to
-     *   ignore those that it doesn't understand, as more types of locations could
-     *   be recorded in the future.
-     *
-     * Generated from protobuf field <code>repeated .google.protobuf.SourceCodeInfo.Location location = 1;</code>
-     * @return \Google\Protobuf\Internal\RepeatedField
-     */
-    public function getLocation()
-    {
-        return $this->location;
-    }
-
-    /**
-     * A Location identifies a piece of source code in a .proto file which
-     * corresponds to a particular definition.  This information is intended
-     * to be useful to IDEs, code indexers, documentation generators, and similar
-     * tools.
-     * For example, say we have a file like:
-     *   message Foo {
-     *     optional string foo = 1;
-     *   }
-     * Let's look at just the field definition:
-     *   optional string foo = 1;
-     *   ^       ^^     ^^  ^  ^^^
-     *   a       bc     de  f  ghi
-     * We have the following locations:
-     *   span   path               represents
-     *   [a,i)  [ 4, 0, 2, 0 ]     The whole field definition.
-     *   [a,b)  [ 4, 0, 2, 0, 4 ]  The label (optional).
-     *   [c,d)  [ 4, 0, 2, 0, 5 ]  The type (string).
-     *   [e,f)  [ 4, 0, 2, 0, 1 ]  The name (foo).
-     *   [g,h)  [ 4, 0, 2, 0, 3 ]  The number (1).
-     * Notes:
-     * - A location may refer to a repeated field itself (i.e. not to any
-     *   particular index within it).  This is used whenever a set of elements are
-     *   logically enclosed in a single code segment.  For example, an entire
-     *   extend block (possibly containing multiple extension definitions) will
-     *   have an outer location whose path refers to the "extensions" repeated
-     *   field without an index.
-     * - Multiple locations may have the same path.  This happens when a single
-     *   logical declaration is spread out across multiple places.  The most
-     *   obvious example is the "extend" block again -- there may be multiple
-     *   extend blocks in the same scope, each of which will have the same path.
-     * - A location's span is not always a subset of its parent's span.  For
-     *   example, the "extendee" of an extension declaration appears at the
-     *   beginning of the "extend" block and is shared by all extensions within
-     *   the block.
-     * - Just because a location's span is a subset of some other location's span
-     *   does not mean that it is a descendant.  For example, a "group" defines
-     *   both a type and a field in a single declaration.  Thus, the locations
-     *   corresponding to the type and field and their components will overlap.
-     * - Code which tries to interpret locations should probably be designed to
-     *   ignore those that it doesn't understand, as more types of locations could
-     *   be recorded in the future.
-     *
-     * Generated from protobuf field <code>repeated .google.protobuf.SourceCodeInfo.Location location = 1;</code>
-     * @param array<\Google\Protobuf\Internal\SourceCodeInfo\Location>|\Google\Protobuf\Internal\RepeatedField $var
-     * @return $this
-     */
-    public function setLocation($var)
-    {
-        $arr = GPBUtil::checkRepeatedField($var, \Google\Protobuf\Internal\GPBType::MESSAGE, \Google\Protobuf\Internal\SourceCodeInfo\Location::class);
-        $this->location = $arr;
-
-        return $this;
-    }
-
-}
-
diff --git a/libs/protobuf/php/src/Google/Protobuf/Internal/SourceCodeInfo/Location.php b/libs/protobuf/php/src/Google/Protobuf/Internal/SourceCodeInfo/Location.php
deleted file mode 100644
index 032be39..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/Internal/SourceCodeInfo/Location.php
+++ /dev/null
@@ -1,448 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: google/protobuf/descriptor.proto
-
-namespace Google\Protobuf\Internal\SourceCodeInfo;
-
-use Google\Protobuf\Internal\GPBType;
-use Google\Protobuf\Internal\GPBWire;
-use Google\Protobuf\Internal\RepeatedField;
-use Google\Protobuf\Internal\InputStream;
-use Google\Protobuf\Internal\GPBUtil;
-
-/**
- * Generated from protobuf message <code>google.protobuf.SourceCodeInfo.Location</code>
- */
-class Location extends \Google\Protobuf\Internal\Message
-{
-    /**
-     * Identifies which part of the FileDescriptorProto was defined at this
-     * location.
-     * Each element is a field number or an index.  They form a path from
-     * the root FileDescriptorProto to the place where the definition occurs.
-     * For example, this path:
-     *   [ 4, 3, 2, 7, 1 ]
-     * refers to:
-     *   file.message_type(3)  // 4, 3
-     *       .field(7)         // 2, 7
-     *       .name()           // 1
-     * This is because FileDescriptorProto.message_type has field number 4:
-     *   repeated DescriptorProto message_type = 4;
-     * and DescriptorProto.field has field number 2:
-     *   repeated FieldDescriptorProto field = 2;
-     * and FieldDescriptorProto.name has field number 1:
-     *   optional string name = 1;
-     * Thus, the above path gives the location of a field name.  If we removed
-     * the last element:
-     *   [ 4, 3, 2, 7 ]
-     * this path refers to the whole field declaration (from the beginning
-     * of the label to the terminating semicolon).
-     *
-     * Generated from protobuf field <code>repeated int32 path = 1 [packed = true];</code>
-     */
-    private $path;
-    /**
-     * Always has exactly three or four elements: start line, start column,
-     * end line (optional, otherwise assumed same as start line), end column.
-     * These are packed into a single field for efficiency.  Note that line
-     * and column numbers are zero-based -- typically you will want to add
-     * 1 to each before displaying to a user.
-     *
-     * Generated from protobuf field <code>repeated int32 span = 2 [packed = true];</code>
-     */
-    private $span;
-    /**
-     * If this SourceCodeInfo represents a complete declaration, these are any
-     * comments appearing before and after the declaration which appear to be
-     * attached to the declaration.
-     * A series of line comments appearing on consecutive lines, with no other
-     * tokens appearing on those lines, will be treated as a single comment.
-     * leading_detached_comments will keep paragraphs of comments that appear
-     * before (but not connected to) the current element. Each paragraph,
-     * separated by empty lines, will be one comment element in the repeated
-     * field.
-     * Only the comment content is provided; comment markers (e.g. //) are
-     * stripped out.  For block comments, leading whitespace and an asterisk
-     * will be stripped from the beginning of each line other than the first.
-     * Newlines are included in the output.
-     * Examples:
-     *   optional int32 foo = 1;  // Comment attached to foo.
-     *   // Comment attached to bar.
-     *   optional int32 bar = 2;
-     *   optional string baz = 3;
-     *   // Comment attached to baz.
-     *   // Another line attached to baz.
-     *   // Comment attached to moo.
-     *   //
-     *   // Another line attached to moo.
-     *   optional double moo = 4;
-     *   // Detached comment for corge. This is not leading or trailing comments
-     *   // to moo or corge because there are blank lines separating it from
-     *   // both.
-     *   // Detached comment for corge paragraph 2.
-     *   optional string corge = 5;
-     *   /&#42; Block comment attached
-     *    * to corge.  Leading asterisks
-     *    * will be removed. *&#47;
-     *   /&#42; Block comment attached to
-     *    * grault. *&#47;
-     *   optional int32 grault = 6;
-     *   // ignored detached comments.
-     *
-     * Generated from protobuf field <code>optional string leading_comments = 3;</code>
-     */
-    protected $leading_comments = null;
-    /**
-     * Generated from protobuf field <code>optional string trailing_comments = 4;</code>
-     */
-    protected $trailing_comments = null;
-    /**
-     * Generated from protobuf field <code>repeated string leading_detached_comments = 6;</code>
-     */
-    private $leading_detached_comments;
-
-    /**
-     * Constructor.
-     *
-     * @param array $data {
-     *     Optional. Data for populating the Message object.
-     *
-     *     @type array<int>|\Google\Protobuf\Internal\RepeatedField $path
-     *           Identifies which part of the FileDescriptorProto was defined at this
-     *           location.
-     *           Each element is a field number or an index.  They form a path from
-     *           the root FileDescriptorProto to the place where the definition occurs.
-     *           For example, this path:
-     *             [ 4, 3, 2, 7, 1 ]
-     *           refers to:
-     *             file.message_type(3)  // 4, 3
-     *                 .field(7)         // 2, 7
-     *                 .name()           // 1
-     *           This is because FileDescriptorProto.message_type has field number 4:
-     *             repeated DescriptorProto message_type = 4;
-     *           and DescriptorProto.field has field number 2:
-     *             repeated FieldDescriptorProto field = 2;
-     *           and FieldDescriptorProto.name has field number 1:
-     *             optional string name = 1;
-     *           Thus, the above path gives the location of a field name.  If we removed
-     *           the last element:
-     *             [ 4, 3, 2, 7 ]
-     *           this path refers to the whole field declaration (from the beginning
-     *           of the label to the terminating semicolon).
-     *     @type array<int>|\Google\Protobuf\Internal\RepeatedField $span
-     *           Always has exactly three or four elements: start line, start column,
-     *           end line (optional, otherwise assumed same as start line), end column.
-     *           These are packed into a single field for efficiency.  Note that line
-     *           and column numbers are zero-based -- typically you will want to add
-     *           1 to each before displaying to a user.
-     *     @type string $leading_comments
-     *           If this SourceCodeInfo represents a complete declaration, these are any
-     *           comments appearing before and after the declaration which appear to be
-     *           attached to the declaration.
-     *           A series of line comments appearing on consecutive lines, with no other
-     *           tokens appearing on those lines, will be treated as a single comment.
-     *           leading_detached_comments will keep paragraphs of comments that appear
-     *           before (but not connected to) the current element. Each paragraph,
-     *           separated by empty lines, will be one comment element in the repeated
-     *           field.
-     *           Only the comment content is provided; comment markers (e.g. //) are
-     *           stripped out.  For block comments, leading whitespace and an asterisk
-     *           will be stripped from the beginning of each line other than the first.
-     *           Newlines are included in the output.
-     *           Examples:
-     *             optional int32 foo = 1;  // Comment attached to foo.
-     *             // Comment attached to bar.
-     *             optional int32 bar = 2;
-     *             optional string baz = 3;
-     *             // Comment attached to baz.
-     *             // Another line attached to baz.
-     *             // Comment attached to moo.
-     *             //
-     *             // Another line attached to moo.
-     *             optional double moo = 4;
-     *             // Detached comment for corge. This is not leading or trailing comments
-     *             // to moo or corge because there are blank lines separating it from
-     *             // both.
-     *             // Detached comment for corge paragraph 2.
-     *             optional string corge = 5;
-     *             /&#42; Block comment attached
-     *              * to corge.  Leading asterisks
-     *              * will be removed. *&#47;
-     *             /&#42; Block comment attached to
-     *              * grault. *&#47;
-     *             optional int32 grault = 6;
-     *             // ignored detached comments.
-     *     @type string $trailing_comments
-     *     @type array<string>|\Google\Protobuf\Internal\RepeatedField $leading_detached_comments
-     * }
-     */
-    public function __construct($data = NULL) {
-        \GPBMetadata\Google\Protobuf\Internal\Descriptor::initOnce();
-        parent::__construct($data);
-    }
-
-    /**
-     * Identifies which part of the FileDescriptorProto was defined at this
-     * location.
-     * Each element is a field number or an index.  They form a path from
-     * the root FileDescriptorProto to the place where the definition occurs.
-     * For example, this path:
-     *   [ 4, 3, 2, 7, 1 ]
-     * refers to:
-     *   file.message_type(3)  // 4, 3
-     *       .field(7)         // 2, 7
-     *       .name()           // 1
-     * This is because FileDescriptorProto.message_type has field number 4:
-     *   repeated DescriptorProto message_type = 4;
-     * and DescriptorProto.field has field number 2:
-     *   repeated FieldDescriptorProto field = 2;
-     * and FieldDescriptorProto.name has field number 1:
-     *   optional string name = 1;
-     * Thus, the above path gives the location of a field name.  If we removed
-     * the last element:
-     *   [ 4, 3, 2, 7 ]
-     * this path refers to the whole field declaration (from the beginning
-     * of the label to the terminating semicolon).
-     *
-     * Generated from protobuf field <code>repeated int32 path = 1 [packed = true];</code>
-     * @return \Google\Protobuf\Internal\RepeatedField
-     */
-    public function getPath()
-    {
-        return $this->path;
-    }
-
-    /**
-     * Identifies which part of the FileDescriptorProto was defined at this
-     * location.
-     * Each element is a field number or an index.  They form a path from
-     * the root FileDescriptorProto to the place where the definition occurs.
-     * For example, this path:
-     *   [ 4, 3, 2, 7, 1 ]
-     * refers to:
-     *   file.message_type(3)  // 4, 3
-     *       .field(7)         // 2, 7
-     *       .name()           // 1
-     * This is because FileDescriptorProto.message_type has field number 4:
-     *   repeated DescriptorProto message_type = 4;
-     * and DescriptorProto.field has field number 2:
-     *   repeated FieldDescriptorProto field = 2;
-     * and FieldDescriptorProto.name has field number 1:
-     *   optional string name = 1;
-     * Thus, the above path gives the location of a field name.  If we removed
-     * the last element:
-     *   [ 4, 3, 2, 7 ]
-     * this path refers to the whole field declaration (from the beginning
-     * of the label to the terminating semicolon).
-     *
-     * Generated from protobuf field <code>repeated int32 path = 1 [packed = true];</code>
-     * @param array<int>|\Google\Protobuf\Internal\RepeatedField $var
-     * @return $this
-     */
-    public function setPath($var)
-    {
-        $arr = GPBUtil::checkRepeatedField($var, \Google\Protobuf\Internal\GPBType::INT32);
-        $this->path = $arr;
-
-        return $this;
-    }
-
-    /**
-     * Always has exactly three or four elements: start line, start column,
-     * end line (optional, otherwise assumed same as start line), end column.
-     * These are packed into a single field for efficiency.  Note that line
-     * and column numbers are zero-based -- typically you will want to add
-     * 1 to each before displaying to a user.
-     *
-     * Generated from protobuf field <code>repeated int32 span = 2 [packed = true];</code>
-     * @return \Google\Protobuf\Internal\RepeatedField
-     */
-    public function getSpan()
-    {
-        return $this->span;
-    }
-
-    /**
-     * Always has exactly three or four elements: start line, start column,
-     * end line (optional, otherwise assumed same as start line), end column.
-     * These are packed into a single field for efficiency.  Note that line
-     * and column numbers are zero-based -- typically you will want to add
-     * 1 to each before displaying to a user.
-     *
-     * Generated from protobuf field <code>repeated int32 span = 2 [packed = true];</code>
-     * @param array<int>|\Google\Protobuf\Internal\RepeatedField $var
-     * @return $this
-     */
-    public function setSpan($var)
-    {
-        $arr = GPBUtil::checkRepeatedField($var, \Google\Protobuf\Internal\GPBType::INT32);
-        $this->span = $arr;
-
-        return $this;
-    }
-
-    /**
-     * If this SourceCodeInfo represents a complete declaration, these are any
-     * comments appearing before and after the declaration which appear to be
-     * attached to the declaration.
-     * A series of line comments appearing on consecutive lines, with no other
-     * tokens appearing on those lines, will be treated as a single comment.
-     * leading_detached_comments will keep paragraphs of comments that appear
-     * before (but not connected to) the current element. Each paragraph,
-     * separated by empty lines, will be one comment element in the repeated
-     * field.
-     * Only the comment content is provided; comment markers (e.g. //) are
-     * stripped out.  For block comments, leading whitespace and an asterisk
-     * will be stripped from the beginning of each line other than the first.
-     * Newlines are included in the output.
-     * Examples:
-     *   optional int32 foo = 1;  // Comment attached to foo.
-     *   // Comment attached to bar.
-     *   optional int32 bar = 2;
-     *   optional string baz = 3;
-     *   // Comment attached to baz.
-     *   // Another line attached to baz.
-     *   // Comment attached to moo.
-     *   //
-     *   // Another line attached to moo.
-     *   optional double moo = 4;
-     *   // Detached comment for corge. This is not leading or trailing comments
-     *   // to moo or corge because there are blank lines separating it from
-     *   // both.
-     *   // Detached comment for corge paragraph 2.
-     *   optional string corge = 5;
-     *   /&#42; Block comment attached
-     *    * to corge.  Leading asterisks
-     *    * will be removed. *&#47;
-     *   /&#42; Block comment attached to
-     *    * grault. *&#47;
-     *   optional int32 grault = 6;
-     *   // ignored detached comments.
-     *
-     * Generated from protobuf field <code>optional string leading_comments = 3;</code>
-     * @return string
-     */
-    public function getLeadingComments()
-    {
-        return isset($this->leading_comments) ? $this->leading_comments : '';
-    }
-
-    public function hasLeadingComments()
-    {
-        return isset($this->leading_comments);
-    }
-
-    public function clearLeadingComments()
-    {
-        unset($this->leading_comments);
-    }
-
-    /**
-     * If this SourceCodeInfo represents a complete declaration, these are any
-     * comments appearing before and after the declaration which appear to be
-     * attached to the declaration.
-     * A series of line comments appearing on consecutive lines, with no other
-     * tokens appearing on those lines, will be treated as a single comment.
-     * leading_detached_comments will keep paragraphs of comments that appear
-     * before (but not connected to) the current element. Each paragraph,
-     * separated by empty lines, will be one comment element in the repeated
-     * field.
-     * Only the comment content is provided; comment markers (e.g. //) are
-     * stripped out.  For block comments, leading whitespace and an asterisk
-     * will be stripped from the beginning of each line other than the first.
-     * Newlines are included in the output.
-     * Examples:
-     *   optional int32 foo = 1;  // Comment attached to foo.
-     *   // Comment attached to bar.
-     *   optional int32 bar = 2;
-     *   optional string baz = 3;
-     *   // Comment attached to baz.
-     *   // Another line attached to baz.
-     *   // Comment attached to moo.
-     *   //
-     *   // Another line attached to moo.
-     *   optional double moo = 4;
-     *   // Detached comment for corge. This is not leading or trailing comments
-     *   // to moo or corge because there are blank lines separating it from
-     *   // both.
-     *   // Detached comment for corge paragraph 2.
-     *   optional string corge = 5;
-     *   /&#42; Block comment attached
-     *    * to corge.  Leading asterisks
-     *    * will be removed. *&#47;
-     *   /&#42; Block comment attached to
-     *    * grault. *&#47;
-     *   optional int32 grault = 6;
-     *   // ignored detached comments.
-     *
-     * Generated from protobuf field <code>optional string leading_comments = 3;</code>
-     * @param string $var
-     * @return $this
-     */
-    public function setLeadingComments($var)
-    {
-        GPBUtil::checkString($var, True);
-        $this->leading_comments = $var;
-
-        return $this;
-    }
-
-    /**
-     * Generated from protobuf field <code>optional string trailing_comments = 4;</code>
-     * @return string
-     */
-    public function getTrailingComments()
-    {
-        return isset($this->trailing_comments) ? $this->trailing_comments : '';
-    }
-
-    public function hasTrailingComments()
-    {
-        return isset($this->trailing_comments);
-    }
-
-    public function clearTrailingComments()
-    {
-        unset($this->trailing_comments);
-    }
-
-    /**
-     * Generated from protobuf field <code>optional string trailing_comments = 4;</code>
-     * @param string $var
-     * @return $this
-     */
-    public function setTrailingComments($var)
-    {
-        GPBUtil::checkString($var, True);
-        $this->trailing_comments = $var;
-
-        return $this;
-    }
-
-    /**
-     * Generated from protobuf field <code>repeated string leading_detached_comments = 6;</code>
-     * @return \Google\Protobuf\Internal\RepeatedField
-     */
-    public function getLeadingDetachedComments()
-    {
-        return $this->leading_detached_comments;
-    }
-
-    /**
-     * Generated from protobuf field <code>repeated string leading_detached_comments = 6;</code>
-     * @param array<string>|\Google\Protobuf\Internal\RepeatedField $var
-     * @return $this
-     */
-    public function setLeadingDetachedComments($var)
-    {
-        $arr = GPBUtil::checkRepeatedField($var, \Google\Protobuf\Internal\GPBType::STRING);
-        $this->leading_detached_comments = $arr;
-
-        return $this;
-    }
-
-}
-
-// Adding a class alias for backwards compatibility with the previous class name.
-class_alias(Location::class, \Google\Protobuf\Internal\SourceCodeInfo_Location::class);
-
diff --git a/libs/protobuf/php/src/Google/Protobuf/Internal/SourceCodeInfo_Location.php b/libs/protobuf/php/src/Google/Protobuf/Internal/SourceCodeInfo_Location.php
deleted file mode 100644
index 1346492..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/Internal/SourceCodeInfo_Location.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: google/protobuf/descriptor.proto
-
-namespace Google\Protobuf\Internal;
-
-if (false) {
-    /**
-     * This class is deprecated. Use Google\Protobuf\Internal\SourceCodeInfo\Location instead.
-     * @deprecated
-     */
-    class SourceCodeInfo_Location {}
-}
-class_exists(SourceCodeInfo\Location::class);
-@trigger_error('Google\Protobuf\Internal\SourceCodeInfo_Location is deprecated and will be removed in the next major release. Use Google\Protobuf\Internal\SourceCodeInfo\Location instead', E_USER_DEPRECATED);
-
diff --git a/libs/protobuf/php/src/Google/Protobuf/Internal/TimestampBase.php b/libs/protobuf/php/src/Google/Protobuf/Internal/TimestampBase.php
deleted file mode 100644
index 653d1e9..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/Internal/TimestampBase.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-namespace Google\Protobuf\Internal;
-
-/**
- * Base class for Google\Protobuf\Timestamp, this contains hand-written
- * convenience methods.
- */
-class TimestampBase extends \Google\Protobuf\Internal\Message
-{
-    /*
-     * Converts PHP DateTime to Timestamp.
-     *
-     * @param \DateTime $datetime
-     */
-    public function fromDateTime(\DateTime $datetime)
-    {
-        $this->seconds = $datetime->getTimestamp();
-        $this->nanos = 1000 * $datetime->format('u');
-    }
-
-    /**
-     * Converts Timestamp to PHP DateTime.
-     *
-     * @return \DateTime $datetime
-     */
-    public function toDateTime()
-    {
-        $time = sprintf('%s.%06d', $this->seconds, $this->nanos / 1000);
-        return \DateTime::createFromFormat('U.u', $time);
-    }
-}
diff --git a/libs/protobuf/php/src/Google/Protobuf/Internal/UninterpretedOption.php b/libs/protobuf/php/src/Google/Protobuf/Internal/UninterpretedOption.php
deleted file mode 100644
index a1cdca5..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/Internal/UninterpretedOption.php
+++ /dev/null
@@ -1,300 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: google/protobuf/descriptor.proto
-
-namespace Google\Protobuf\Internal;
-
-use Google\Protobuf\Internal\GPBType;
-use Google\Protobuf\Internal\GPBWire;
-use Google\Protobuf\Internal\RepeatedField;
-use Google\Protobuf\Internal\InputStream;
-use Google\Protobuf\Internal\GPBUtil;
-
-/**
- * A message representing a option the parser does not recognize. This only
- * appears in options protos created by the compiler::Parser class.
- * DescriptorPool resolves these when building Descriptor objects. Therefore,
- * options protos in descriptor objects (e.g. returned by Descriptor::options(),
- * or produced by Descriptor::CopyTo()) will never have UninterpretedOptions
- * in them.
- *
- * Generated from protobuf message <code>google.protobuf.UninterpretedOption</code>
- */
-class UninterpretedOption extends \Google\Protobuf\Internal\Message
-{
-    /**
-     * Generated from protobuf field <code>repeated .google.protobuf.UninterpretedOption.NamePart name = 2;</code>
-     */
-    private $name;
-    /**
-     * The value of the uninterpreted option, in whatever type the tokenizer
-     * identified it as during parsing. Exactly one of these should be set.
-     *
-     * Generated from protobuf field <code>optional string identifier_value = 3;</code>
-     */
-    protected $identifier_value = null;
-    /**
-     * Generated from protobuf field <code>optional uint64 positive_int_value = 4;</code>
-     */
-    protected $positive_int_value = null;
-    /**
-     * Generated from protobuf field <code>optional int64 negative_int_value = 5;</code>
-     */
-    protected $negative_int_value = null;
-    /**
-     * Generated from protobuf field <code>optional double double_value = 6;</code>
-     */
-    protected $double_value = null;
-    /**
-     * Generated from protobuf field <code>optional bytes string_value = 7;</code>
-     */
-    protected $string_value = null;
-    /**
-     * Generated from protobuf field <code>optional string aggregate_value = 8;</code>
-     */
-    protected $aggregate_value = null;
-
-    /**
-     * Constructor.
-     *
-     * @param array $data {
-     *     Optional. Data for populating the Message object.
-     *
-     *     @type array<\Google\Protobuf\Internal\UninterpretedOption\NamePart>|\Google\Protobuf\Internal\RepeatedField $name
-     *     @type string $identifier_value
-     *           The value of the uninterpreted option, in whatever type the tokenizer
-     *           identified it as during parsing. Exactly one of these should be set.
-     *     @type int|string $positive_int_value
-     *     @type int|string $negative_int_value
-     *     @type float $double_value
-     *     @type string $string_value
-     *     @type string $aggregate_value
-     * }
-     */
-    public function __construct($data = NULL) {
-        \GPBMetadata\Google\Protobuf\Internal\Descriptor::initOnce();
-        parent::__construct($data);
-    }
-
-    /**
-     * Generated from protobuf field <code>repeated .google.protobuf.UninterpretedOption.NamePart name = 2;</code>
-     * @return \Google\Protobuf\Internal\RepeatedField
-     */
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    /**
-     * Generated from protobuf field <code>repeated .google.protobuf.UninterpretedOption.NamePart name = 2;</code>
-     * @param array<\Google\Protobuf\Internal\UninterpretedOption\NamePart>|\Google\Protobuf\Internal\RepeatedField $var
-     * @return $this
-     */
-    public function setName($var)
-    {
-        $arr = GPBUtil::checkRepeatedField($var, \Google\Protobuf\Internal\GPBType::MESSAGE, \Google\Protobuf\Internal\UninterpretedOption\NamePart::class);
-        $this->name = $arr;
-
-        return $this;
-    }
-
-    /**
-     * The value of the uninterpreted option, in whatever type the tokenizer
-     * identified it as during parsing. Exactly one of these should be set.
-     *
-     * Generated from protobuf field <code>optional string identifier_value = 3;</code>
-     * @return string
-     */
-    public function getIdentifierValue()
-    {
-        return isset($this->identifier_value) ? $this->identifier_value : '';
-    }
-
-    public function hasIdentifierValue()
-    {
-        return isset($this->identifier_value);
-    }
-
-    public function clearIdentifierValue()
-    {
-        unset($this->identifier_value);
-    }
-
-    /**
-     * The value of the uninterpreted option, in whatever type the tokenizer
-     * identified it as during parsing. Exactly one of these should be set.
-     *
-     * Generated from protobuf field <code>optional string identifier_value = 3;</code>
-     * @param string $var
-     * @return $this
-     */
-    public function setIdentifierValue($var)
-    {
-        GPBUtil::checkString($var, True);
-        $this->identifier_value = $var;
-
-        return $this;
-    }
-
-    /**
-     * Generated from protobuf field <code>optional uint64 positive_int_value = 4;</code>
-     * @return int|string
-     */
-    public function getPositiveIntValue()
-    {
-        return isset($this->positive_int_value) ? $this->positive_int_value : 0;
-    }
-
-    public function hasPositiveIntValue()
-    {
-        return isset($this->positive_int_value);
-    }
-
-    public function clearPositiveIntValue()
-    {
-        unset($this->positive_int_value);
-    }
-
-    /**
-     * Generated from protobuf field <code>optional uint64 positive_int_value = 4;</code>
-     * @param int|string $var
-     * @return $this
-     */
-    public function setPositiveIntValue($var)
-    {
-        GPBUtil::checkUint64($var);
-        $this->positive_int_value = $var;
-
-        return $this;
-    }
-
-    /**
-     * Generated from protobuf field <code>optional int64 negative_int_value = 5;</code>
-     * @return int|string
-     */
-    public function getNegativeIntValue()
-    {
-        return isset($this->negative_int_value) ? $this->negative_int_value : 0;
-    }
-
-    public function hasNegativeIntValue()
-    {
-        return isset($this->negative_int_value);
-    }
-
-    public function clearNegativeIntValue()
-    {
-        unset($this->negative_int_value);
-    }
-
-    /**
-     * Generated from protobuf field <code>optional int64 negative_int_value = 5;</code>
-     * @param int|string $var
-     * @return $this
-     */
-    public function setNegativeIntValue($var)
-    {
-        GPBUtil::checkInt64($var);
-        $this->negative_int_value = $var;
-
-        return $this;
-    }
-
-    /**
-     * Generated from protobuf field <code>optional double double_value = 6;</code>
-     * @return float
-     */
-    public function getDoubleValue()
-    {
-        return isset($this->double_value) ? $this->double_value : 0.0;
-    }
-
-    public function hasDoubleValue()
-    {
-        return isset($this->double_value);
-    }
-
-    public function clearDoubleValue()
-    {
-        unset($this->double_value);
-    }
-
-    /**
-     * Generated from protobuf field <code>optional double double_value = 6;</code>
-     * @param float $var
-     * @return $this
-     */
-    public function setDoubleValue($var)
-    {
-        GPBUtil::checkDouble($var);
-        $this->double_value = $var;
-
-        return $this;
-    }
-
-    /**
-     * Generated from protobuf field <code>optional bytes string_value = 7;</code>
-     * @return string
-     */
-    public function getStringValue()
-    {
-        return isset($this->string_value) ? $this->string_value : '';
-    }
-
-    public function hasStringValue()
-    {
-        return isset($this->string_value);
-    }
-
-    public function clearStringValue()
-    {
-        unset($this->string_value);
-    }
-
-    /**
-     * Generated from protobuf field <code>optional bytes string_value = 7;</code>
-     * @param string $var
-     * @return $this
-     */
-    public function setStringValue($var)
-    {
-        GPBUtil::checkString($var, False);
-        $this->string_value = $var;
-
-        return $this;
-    }
-
-    /**
-     * Generated from protobuf field <code>optional string aggregate_value = 8;</code>
-     * @return string
-     */
-    public function getAggregateValue()
-    {
-        return isset($this->aggregate_value) ? $this->aggregate_value : '';
-    }
-
-    public function hasAggregateValue()
-    {
-        return isset($this->aggregate_value);
-    }
-
-    public function clearAggregateValue()
-    {
-        unset($this->aggregate_value);
-    }
-
-    /**
-     * Generated from protobuf field <code>optional string aggregate_value = 8;</code>
-     * @param string $var
-     * @return $this
-     */
-    public function setAggregateValue($var)
-    {
-        GPBUtil::checkString($var, True);
-        $this->aggregate_value = $var;
-
-        return $this;
-    }
-
-}
-
diff --git a/libs/protobuf/php/src/Google/Protobuf/Internal/UninterpretedOption/NamePart.php b/libs/protobuf/php/src/Google/Protobuf/Internal/UninterpretedOption/NamePart.php
deleted file mode 100644
index 2debf83..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/Internal/UninterpretedOption/NamePart.php
+++ /dev/null
@@ -1,116 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: google/protobuf/descriptor.proto
-
-namespace Google\Protobuf\Internal\UninterpretedOption;
-
-use Google\Protobuf\Internal\GPBType;
-use Google\Protobuf\Internal\GPBWire;
-use Google\Protobuf\Internal\RepeatedField;
-use Google\Protobuf\Internal\InputStream;
-use Google\Protobuf\Internal\GPBUtil;
-
-/**
- * The name of the uninterpreted option.  Each string represents a segment in
- * a dot-separated name.  is_extension is true iff a segment represents an
- * extension (denoted with parentheses in options specs in .proto files).
- * E.g.,{ ["foo", false], ["bar.baz", true], ["moo", false] } represents
- * "foo.(bar.baz).moo".
- *
- * Generated from protobuf message <code>google.protobuf.UninterpretedOption.NamePart</code>
- */
-class NamePart extends \Google\Protobuf\Internal\Message
-{
-    /**
-     * Generated from protobuf field <code>required string name_part = 1;</code>
-     */
-    protected $name_part = null;
-    /**
-     * Generated from protobuf field <code>required bool is_extension = 2;</code>
-     */
-    protected $is_extension = null;
-
-    /**
-     * Constructor.
-     *
-     * @param array $data {
-     *     Optional. Data for populating the Message object.
-     *
-     *     @type string $name_part
-     *     @type bool $is_extension
-     * }
-     */
-    public function __construct($data = NULL) {
-        \GPBMetadata\Google\Protobuf\Internal\Descriptor::initOnce();
-        parent::__construct($data);
-    }
-
-    /**
-     * Generated from protobuf field <code>required string name_part = 1;</code>
-     * @return string
-     */
-    public function getNamePart()
-    {
-        return isset($this->name_part) ? $this->name_part : '';
-    }
-
-    public function hasNamePart()
-    {
-        return isset($this->name_part);
-    }
-
-    public function clearNamePart()
-    {
-        unset($this->name_part);
-    }
-
-    /**
-     * Generated from protobuf field <code>required string name_part = 1;</code>
-     * @param string $var
-     * @return $this
-     */
-    public function setNamePart($var)
-    {
-        GPBUtil::checkString($var, True);
-        $this->name_part = $var;
-
-        return $this;
-    }
-
-    /**
-     * Generated from protobuf field <code>required bool is_extension = 2;</code>
-     * @return bool
-     */
-    public function getIsExtension()
-    {
-        return isset($this->is_extension) ? $this->is_extension : false;
-    }
-
-    public function hasIsExtension()
-    {
-        return isset($this->is_extension);
-    }
-
-    public function clearIsExtension()
-    {
-        unset($this->is_extension);
-    }
-
-    /**
-     * Generated from protobuf field <code>required bool is_extension = 2;</code>
-     * @param bool $var
-     * @return $this
-     */
-    public function setIsExtension($var)
-    {
-        GPBUtil::checkBool($var);
-        $this->is_extension = $var;
-
-        return $this;
-    }
-
-}
-
-// Adding a class alias for backwards compatibility with the previous class name.
-class_alias(NamePart::class, \Google\Protobuf\Internal\UninterpretedOption_NamePart::class);
-
diff --git a/libs/protobuf/php/src/Google/Protobuf/Internal/UninterpretedOption_NamePart.php b/libs/protobuf/php/src/Google/Protobuf/Internal/UninterpretedOption_NamePart.php
deleted file mode 100644
index 9750eb0..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/Internal/UninterpretedOption_NamePart.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: google/protobuf/descriptor.proto
-
-namespace Google\Protobuf\Internal;
-
-if (false) {
-    /**
-     * This class is deprecated. Use Google\Protobuf\Internal\UninterpretedOption\NamePart instead.
-     * @deprecated
-     */
-    class UninterpretedOption_NamePart {}
-}
-class_exists(UninterpretedOption\NamePart::class);
-@trigger_error('Google\Protobuf\Internal\UninterpretedOption_NamePart is deprecated and will be removed in the next major release. Use Google\Protobuf\Internal\UninterpretedOption\NamePart instead', E_USER_DEPRECATED);
-
diff --git a/libs/protobuf/php/src/Google/Protobuf/ListValue.php b/libs/protobuf/php/src/Google/Protobuf/ListValue.php
deleted file mode 100644
index 891283c..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/ListValue.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: google/protobuf/struct.proto
-
-namespace Google\Protobuf;
-
-use Google\Protobuf\Internal\GPBType;
-use Google\Protobuf\Internal\RepeatedField;
-use Google\Protobuf\Internal\GPBUtil;
-
-/**
- * `ListValue` is a wrapper around a repeated field of values.
- * The JSON representation for `ListValue` is JSON array.
- *
- * Generated from protobuf message <code>google.protobuf.ListValue</code>
- */
-class ListValue extends \Google\Protobuf\Internal\Message
-{
-    /**
-     * Repeated field of dynamically typed values.
-     *
-     * Generated from protobuf field <code>repeated .google.protobuf.Value values = 1;</code>
-     */
-    private $values;
-
-    /**
-     * Constructor.
-     *
-     * @param array $data {
-     *     Optional. Data for populating the Message object.
-     *
-     *     @type array<\Google\Protobuf\Value>|\Google\Protobuf\Internal\RepeatedField $values
-     *           Repeated field of dynamically typed values.
-     * }
-     */
-    public function __construct($data = NULL) {
-        \GPBMetadata\Google\Protobuf\Struct::initOnce();
-        parent::__construct($data);
-    }
-
-    /**
-     * Repeated field of dynamically typed values.
-     *
-     * Generated from protobuf field <code>repeated .google.protobuf.Value values = 1;</code>
-     * @return \Google\Protobuf\Internal\RepeatedField
-     */
-    public function getValues()
-    {
-        return $this->values;
-    }
-
-    /**
-     * Repeated field of dynamically typed values.
-     *
-     * Generated from protobuf field <code>repeated .google.protobuf.Value values = 1;</code>
-     * @param array<\Google\Protobuf\Value>|\Google\Protobuf\Internal\RepeatedField $var
-     * @return $this
-     */
-    public function setValues($var)
-    {
-        $arr = GPBUtil::checkRepeatedField($var, \Google\Protobuf\Internal\GPBType::MESSAGE, \Google\Protobuf\Value::class);
-        $this->values = $arr;
-
-        return $this;
-    }
-
-}
-
diff --git a/libs/protobuf/php/src/Google/Protobuf/Method.php b/libs/protobuf/php/src/Google/Protobuf/Method.php
deleted file mode 100644
index eda00bf..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/Method.php
+++ /dev/null
@@ -1,271 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: google/protobuf/api.proto
-
-namespace Google\Protobuf;
-
-use Google\Protobuf\Internal\GPBType;
-use Google\Protobuf\Internal\RepeatedField;
-use Google\Protobuf\Internal\GPBUtil;
-
-/**
- * Method represents a method of an API interface.
- *
- * Generated from protobuf message <code>google.protobuf.Method</code>
- */
-class Method extends \Google\Protobuf\Internal\Message
-{
-    /**
-     * The simple name of this method.
-     *
-     * Generated from protobuf field <code>string name = 1;</code>
-     */
-    protected $name = '';
-    /**
-     * A URL of the input message type.
-     *
-     * Generated from protobuf field <code>string request_type_url = 2;</code>
-     */
-    protected $request_type_url = '';
-    /**
-     * If true, the request is streamed.
-     *
-     * Generated from protobuf field <code>bool request_streaming = 3;</code>
-     */
-    protected $request_streaming = false;
-    /**
-     * The URL of the output message type.
-     *
-     * Generated from protobuf field <code>string response_type_url = 4;</code>
-     */
-    protected $response_type_url = '';
-    /**
-     * If true, the response is streamed.
-     *
-     * Generated from protobuf field <code>bool response_streaming = 5;</code>
-     */
-    protected $response_streaming = false;
-    /**
-     * Any metadata attached to the method.
-     *
-     * Generated from protobuf field <code>repeated .google.protobuf.Option options = 6;</code>
-     */
-    private $options;
-    /**
-     * The source syntax of this method.
-     *
-     * Generated from protobuf field <code>.google.protobuf.Syntax syntax = 7;</code>
-     */
-    protected $syntax = 0;
-
-    /**
-     * Constructor.
-     *
-     * @param array $data {
-     *     Optional. Data for populating the Message object.
-     *
-     *     @type string $name
-     *           The simple name of this method.
-     *     @type string $request_type_url
-     *           A URL of the input message type.
-     *     @type bool $request_streaming
-     *           If true, the request is streamed.
-     *     @type string $response_type_url
-     *           The URL of the output message type.
-     *     @type bool $response_streaming
-     *           If true, the response is streamed.
-     *     @type array<\Google\Protobuf\Option>|\Google\Protobuf\Internal\RepeatedField $options
-     *           Any metadata attached to the method.
-     *     @type int $syntax
-     *           The source syntax of this method.
-     * }
-     */
-    public function __construct($data = NULL) {
-        \GPBMetadata\Google\Protobuf\Api::initOnce();
-        parent::__construct($data);
-    }
-
-    /**
-     * The simple name of this method.
-     *
-     * Generated from protobuf field <code>string name = 1;</code>
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    /**
-     * The simple name of this method.
-     *
-     * Generated from protobuf field <code>string name = 1;</code>
-     * @param string $var
-     * @return $this
-     */
-    public function setName($var)
-    {
-        GPBUtil::checkString($var, True);
-        $this->name = $var;
-
-        return $this;
-    }
-
-    /**
-     * A URL of the input message type.
-     *
-     * Generated from protobuf field <code>string request_type_url = 2;</code>
-     * @return string
-     */
-    public function getRequestTypeUrl()
-    {
-        return $this->request_type_url;
-    }
-
-    /**
-     * A URL of the input message type.
-     *
-     * Generated from protobuf field <code>string request_type_url = 2;</code>
-     * @param string $var
-     * @return $this
-     */
-    public function setRequestTypeUrl($var)
-    {
-        GPBUtil::checkString($var, True);
-        $this->request_type_url = $var;
-
-        return $this;
-    }
-
-    /**
-     * If true, the request is streamed.
-     *
-     * Generated from protobuf field <code>bool request_streaming = 3;</code>
-     * @return bool
-     */
-    public function getRequestStreaming()
-    {
-        return $this->request_streaming;
-    }
-
-    /**
-     * If true, the request is streamed.
-     *
-     * Generated from protobuf field <code>bool request_streaming = 3;</code>
-     * @param bool $var
-     * @return $this
-     */
-    public function setRequestStreaming($var)
-    {
-        GPBUtil::checkBool($var);
-        $this->request_streaming = $var;
-
-        return $this;
-    }
-
-    /**
-     * The URL of the output message type.
-     *
-     * Generated from protobuf field <code>string response_type_url = 4;</code>
-     * @return string
-     */
-    public function getResponseTypeUrl()
-    {
-        return $this->response_type_url;
-    }
-
-    /**
-     * The URL of the output message type.
-     *
-     * Generated from protobuf field <code>string response_type_url = 4;</code>
-     * @param string $var
-     * @return $this
-     */
-    public function setResponseTypeUrl($var)
-    {
-        GPBUtil::checkString($var, True);
-        $this->response_type_url = $var;
-
-        return $this;
-    }
-
-    /**
-     * If true, the response is streamed.
-     *
-     * Generated from protobuf field <code>bool response_streaming = 5;</code>
-     * @return bool
-     */
-    public function getResponseStreaming()
-    {
-        return $this->response_streaming;
-    }
-
-    /**
-     * If true, the response is streamed.
-     *
-     * Generated from protobuf field <code>bool response_streaming = 5;</code>
-     * @param bool $var
-     * @return $this
-     */
-    public function setResponseStreaming($var)
-    {
-        GPBUtil::checkBool($var);
-        $this->response_streaming = $var;
-
-        return $this;
-    }
-
-    /**
-     * Any metadata attached to the method.
-     *
-     * Generated from protobuf field <code>repeated .google.protobuf.Option options = 6;</code>
-     * @return \Google\Protobuf\Internal\RepeatedField
-     */
-    public function getOptions()
-    {
-        return $this->options;
-    }
-
-    /**
-     * Any metadata attached to the method.
-     *
-     * Generated from protobuf field <code>repeated .google.protobuf.Option options = 6;</code>
-     * @param array<\Google\Protobuf\Option>|\Google\Protobuf\Internal\RepeatedField $var
-     * @return $this
-     */
-    public function setOptions($var)
-    {
-        $arr = GPBUtil::checkRepeatedField($var, \Google\Protobuf\Internal\GPBType::MESSAGE, \Google\Protobuf\Option::class);
-        $this->options = $arr;
-
-        return $this;
-    }
-
-    /**
-     * The source syntax of this method.
-     *
-     * Generated from protobuf field <code>.google.protobuf.Syntax syntax = 7;</code>
-     * @return int
-     */
-    public function getSyntax()
-    {
-        return $this->syntax;
-    }
-
-    /**
-     * The source syntax of this method.
-     *
-     * Generated from protobuf field <code>.google.protobuf.Syntax syntax = 7;</code>
-     * @param int $var
-     * @return $this
-     */
-    public function setSyntax($var)
-    {
-        GPBUtil::checkEnum($var, \Google\Protobuf\Syntax::class);
-        $this->syntax = $var;
-
-        return $this;
-    }
-
-}
-
diff --git a/libs/protobuf/php/src/Google/Protobuf/Mixin.php b/libs/protobuf/php/src/Google/Protobuf/Mixin.php
deleted file mode 100644
index 4f7bf84..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/Mixin.php
+++ /dev/null
@@ -1,166 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: google/protobuf/api.proto
-
-namespace Google\Protobuf;
-
-use Google\Protobuf\Internal\GPBType;
-use Google\Protobuf\Internal\RepeatedField;
-use Google\Protobuf\Internal\GPBUtil;
-
-/**
- * Declares an API Interface to be included in this interface. The including
- * interface must redeclare all the methods from the included interface, but
- * documentation and options are inherited as follows:
- * - If after comment and whitespace stripping, the documentation
- *   string of the redeclared method is empty, it will be inherited
- *   from the original method.
- * - Each annotation belonging to the service config (http,
- *   visibility) which is not set in the redeclared method will be
- *   inherited.
- * - If an http annotation is inherited, the path pattern will be
- *   modified as follows. Any version prefix will be replaced by the
- *   version of the including interface plus the [root][] path if
- *   specified.
- * Example of a simple mixin:
- *     package google.acl.v1;
- *     service AccessControl {
- *       // Get the underlying ACL object.
- *       rpc GetAcl(GetAclRequest) returns (Acl) {
- *         option (google.api.http).get = "/v1/{resource=**}:getAcl";
- *       }
- *     }
- *     package google.storage.v2;
- *     service Storage {
- *       rpc GetAcl(GetAclRequest) returns (Acl);
- *       // Get a data record.
- *       rpc GetData(GetDataRequest) returns (Data) {
- *         option (google.api.http).get = "/v2/{resource=**}";
- *       }
- *     }
- * Example of a mixin configuration:
- *     apis:
- *     - name: google.storage.v2.Storage
- *       mixins:
- *       - name: google.acl.v1.AccessControl
- * The mixin construct implies that all methods in `AccessControl` are
- * also declared with same name and request/response types in
- * `Storage`. A documentation generator or annotation processor will
- * see the effective `Storage.GetAcl` method after inheriting
- * documentation and annotations as follows:
- *     service Storage {
- *       // Get the underlying ACL object.
- *       rpc GetAcl(GetAclRequest) returns (Acl) {
- *         option (google.api.http).get = "/v2/{resource=**}:getAcl";
- *       }
- *       ...
- *     }
- * Note how the version in the path pattern changed from `v1` to `v2`.
- * If the `root` field in the mixin is specified, it should be a
- * relative path under which inherited HTTP paths are placed. Example:
- *     apis:
- *     - name: google.storage.v2.Storage
- *       mixins:
- *       - name: google.acl.v1.AccessControl
- *         root: acls
- * This implies the following inherited HTTP annotation:
- *     service Storage {
- *       // Get the underlying ACL object.
- *       rpc GetAcl(GetAclRequest) returns (Acl) {
- *         option (google.api.http).get = "/v2/acls/{resource=**}:getAcl";
- *       }
- *       ...
- *     }
- *
- * Generated from protobuf message <code>google.protobuf.Mixin</code>
- */
-class Mixin extends \Google\Protobuf\Internal\Message
-{
-    /**
-     * The fully qualified name of the interface which is included.
-     *
-     * Generated from protobuf field <code>string name = 1;</code>
-     */
-    protected $name = '';
-    /**
-     * If non-empty specifies a path under which inherited HTTP paths
-     * are rooted.
-     *
-     * Generated from protobuf field <code>string root = 2;</code>
-     */
-    protected $root = '';
-
-    /**
-     * Constructor.
-     *
-     * @param array $data {
-     *     Optional. Data for populating the Message object.
-     *
-     *     @type string $name
-     *           The fully qualified name of the interface which is included.
-     *     @type string $root
-     *           If non-empty specifies a path under which inherited HTTP paths
-     *           are rooted.
-     * }
-     */
-    public function __construct($data = NULL) {
-        \GPBMetadata\Google\Protobuf\Api::initOnce();
-        parent::__construct($data);
-    }
-
-    /**
-     * The fully qualified name of the interface which is included.
-     *
-     * Generated from protobuf field <code>string name = 1;</code>
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    /**
-     * The fully qualified name of the interface which is included.
-     *
-     * Generated from protobuf field <code>string name = 1;</code>
-     * @param string $var
-     * @return $this
-     */
-    public function setName($var)
-    {
-        GPBUtil::checkString($var, True);
-        $this->name = $var;
-
-        return $this;
-    }
-
-    /**
-     * If non-empty specifies a path under which inherited HTTP paths
-     * are rooted.
-     *
-     * Generated from protobuf field <code>string root = 2;</code>
-     * @return string
-     */
-    public function getRoot()
-    {
-        return $this->root;
-    }
-
-    /**
-     * If non-empty specifies a path under which inherited HTTP paths
-     * are rooted.
-     *
-     * Generated from protobuf field <code>string root = 2;</code>
-     * @param string $var
-     * @return $this
-     */
-    public function setRoot($var)
-    {
-        GPBUtil::checkString($var, True);
-        $this->root = $var;
-
-        return $this;
-    }
-
-}
-
diff --git a/libs/protobuf/php/src/Google/Protobuf/NullValue.php b/libs/protobuf/php/src/Google/Protobuf/NullValue.php
deleted file mode 100644
index 61569f8..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/NullValue.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: google/protobuf/struct.proto
-
-namespace Google\Protobuf;
-
-use UnexpectedValueException;
-
-/**
- * `NullValue` is a singleton enumeration to represent the null value for the
- * `Value` type union.
- *  The JSON representation for `NullValue` is JSON `null`.
- *
- * Protobuf type <code>google.protobuf.NullValue</code>
- */
-class NullValue
-{
-    /**
-     * Null value.
-     *
-     * Generated from protobuf enum <code>NULL_VALUE = 0;</code>
-     */
-    const NULL_VALUE = 0;
-
-    private static $valueToName = [
-        self::NULL_VALUE => 'NULL_VALUE',
-    ];
-
-    public static function name($value)
-    {
-        if (!isset(self::$valueToName[$value])) {
-            throw new UnexpectedValueException(sprintf(
-                    'Enum %s has no name defined for value %s', __CLASS__, $value));
-        }
-        return self::$valueToName[$value];
-    }
-
-
-    public static function value($name)
-    {
-        $const = __CLASS__ . '::' . strtoupper($name);
-        if (!defined($const)) {
-            throw new UnexpectedValueException(sprintf(
-                    'Enum %s has no value defined for name %s', __CLASS__, $name));
-        }
-        return constant($const);
-    }
-}
-
diff --git a/libs/protobuf/php/src/Google/Protobuf/OneofDescriptor.php b/libs/protobuf/php/src/Google/Protobuf/OneofDescriptor.php
deleted file mode 100644
index 66ffbd5..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/OneofDescriptor.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-
-// Protocol Buffers - Google's data interchange format
-// Copyright 2017 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-namespace Google\Protobuf;
-
-use Google\Protobuf\Internal\GetPublicDescriptorTrait;
-
-class OneofDescriptor
-{
-    use GetPublicDescriptorTrait;
-
-    /** @var  \Google\Protobuf\Internal\OneofDescriptor $internal_desc */
-    private $internal_desc;
-
-    /**
-     * @internal
-     */
-    public function __construct($internal_desc)
-    {
-        $this->internal_desc = $internal_desc;
-    }
-
-    /**
-     * @return string The name of the oneof
-     */
-    public function getName()
-    {
-        return $this->internal_desc->getName();
-    }
-
-    /**
-     * @param int $index Must be >= 0 and < getFieldCount()
-     * @return FieldDescriptor
-     */
-    public function getField($index)
-    {
-        if (
-            is_null($this->internal_desc->getFields())
-            || !isset($this->internal_desc->getFields()[$index])
-        ) {
-            return null;
-        }
-        return $this->getPublicDescriptor($this->internal_desc->getFields()[$index]);
-    }
-
-    /**
-     * @return int Number of fields in the oneof
-     */
-    public function getFieldCount()
-    {
-        return count($this->internal_desc->getFields());
-    }
-
-    public function isSynthetic()
-    {
-        return $this->internal_desc->isSynthetic();
-    }
-}
diff --git a/libs/protobuf/php/src/Google/Protobuf/Option.php b/libs/protobuf/php/src/Google/Protobuf/Option.php
deleted file mode 100644
index 31249e5..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/Option.php
+++ /dev/null
@@ -1,136 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: google/protobuf/type.proto
-
-namespace Google\Protobuf;
-
-use Google\Protobuf\Internal\GPBType;
-use Google\Protobuf\Internal\RepeatedField;
-use Google\Protobuf\Internal\GPBUtil;
-
-/**
- * A protocol buffer option, which can be attached to a message, field,
- * enumeration, etc.
- *
- * Generated from protobuf message <code>google.protobuf.Option</code>
- */
-class Option extends \Google\Protobuf\Internal\Message
-{
-    /**
-     * The option's name. For protobuf built-in options (options defined in
-     * descriptor.proto), this is the short name. For example, `"map_entry"`.
-     * For custom options, it should be the fully-qualified name. For example,
-     * `"google.api.http"`.
-     *
-     * Generated from protobuf field <code>string name = 1;</code>
-     */
-    protected $name = '';
-    /**
-     * The option's value packed in an Any message. If the value is a primitive,
-     * the corresponding wrapper type defined in google/protobuf/wrappers.proto
-     * should be used. If the value is an enum, it should be stored as an int32
-     * value using the google.protobuf.Int32Value type.
-     *
-     * Generated from protobuf field <code>.google.protobuf.Any value = 2;</code>
-     */
-    protected $value = null;
-
-    /**
-     * Constructor.
-     *
-     * @param array $data {
-     *     Optional. Data for populating the Message object.
-     *
-     *     @type string $name
-     *           The option's name. For protobuf built-in options (options defined in
-     *           descriptor.proto), this is the short name. For example, `"map_entry"`.
-     *           For custom options, it should be the fully-qualified name. For example,
-     *           `"google.api.http"`.
-     *     @type \Google\Protobuf\Any $value
-     *           The option's value packed in an Any message. If the value is a primitive,
-     *           the corresponding wrapper type defined in google/protobuf/wrappers.proto
-     *           should be used. If the value is an enum, it should be stored as an int32
-     *           value using the google.protobuf.Int32Value type.
-     * }
-     */
-    public function __construct($data = NULL) {
-        \GPBMetadata\Google\Protobuf\Type::initOnce();
-        parent::__construct($data);
-    }
-
-    /**
-     * The option's name. For protobuf built-in options (options defined in
-     * descriptor.proto), this is the short name. For example, `"map_entry"`.
-     * For custom options, it should be the fully-qualified name. For example,
-     * `"google.api.http"`.
-     *
-     * Generated from protobuf field <code>string name = 1;</code>
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    /**
-     * The option's name. For protobuf built-in options (options defined in
-     * descriptor.proto), this is the short name. For example, `"map_entry"`.
-     * For custom options, it should be the fully-qualified name. For example,
-     * `"google.api.http"`.
-     *
-     * Generated from protobuf field <code>string name = 1;</code>
-     * @param string $var
-     * @return $this
-     */
-    public function setName($var)
-    {
-        GPBUtil::checkString($var, True);
-        $this->name = $var;
-
-        return $this;
-    }
-
-    /**
-     * The option's value packed in an Any message. If the value is a primitive,
-     * the corresponding wrapper type defined in google/protobuf/wrappers.proto
-     * should be used. If the value is an enum, it should be stored as an int32
-     * value using the google.protobuf.Int32Value type.
-     *
-     * Generated from protobuf field <code>.google.protobuf.Any value = 2;</code>
-     * @return \Google\Protobuf\Any|null
-     */
-    public function getValue()
-    {
-        return $this->value;
-    }
-
-    public function hasValue()
-    {
-        return isset($this->value);
-    }
-
-    public function clearValue()
-    {
-        unset($this->value);
-    }
-
-    /**
-     * The option's value packed in an Any message. If the value is a primitive,
-     * the corresponding wrapper type defined in google/protobuf/wrappers.proto
-     * should be used. If the value is an enum, it should be stored as an int32
-     * value using the google.protobuf.Int32Value type.
-     *
-     * Generated from protobuf field <code>.google.protobuf.Any value = 2;</code>
-     * @param \Google\Protobuf\Any $var
-     * @return $this
-     */
-    public function setValue($var)
-    {
-        GPBUtil::checkMessage($var, \Google\Protobuf\Any::class);
-        $this->value = $var;
-
-        return $this;
-    }
-
-}
-
diff --git a/libs/protobuf/php/src/Google/Protobuf/SourceContext.php b/libs/protobuf/php/src/Google/Protobuf/SourceContext.php
deleted file mode 100644
index 8b3ea11..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/SourceContext.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: google/protobuf/source_context.proto
-
-namespace Google\Protobuf;
-
-use Google\Protobuf\Internal\GPBType;
-use Google\Protobuf\Internal\RepeatedField;
-use Google\Protobuf\Internal\GPBUtil;
-
-/**
- * `SourceContext` represents information about the source of a
- * protobuf element, like the file in which it is defined.
- *
- * Generated from protobuf message <code>google.protobuf.SourceContext</code>
- */
-class SourceContext extends \Google\Protobuf\Internal\Message
-{
-    /**
-     * The path-qualified name of the .proto file that contained the associated
-     * protobuf element.  For example: `"google/protobuf/source_context.proto"`.
-     *
-     * Generated from protobuf field <code>string file_name = 1;</code>
-     */
-    protected $file_name = '';
-
-    /**
-     * Constructor.
-     *
-     * @param array $data {
-     *     Optional. Data for populating the Message object.
-     *
-     *     @type string $file_name
-     *           The path-qualified name of the .proto file that contained the associated
-     *           protobuf element.  For example: `"google/protobuf/source_context.proto"`.
-     * }
-     */
-    public function __construct($data = NULL) {
-        \GPBMetadata\Google\Protobuf\SourceContext::initOnce();
-        parent::__construct($data);
-    }
-
-    /**
-     * The path-qualified name of the .proto file that contained the associated
-     * protobuf element.  For example: `"google/protobuf/source_context.proto"`.
-     *
-     * Generated from protobuf field <code>string file_name = 1;</code>
-     * @return string
-     */
-    public function getFileName()
-    {
-        return $this->file_name;
-    }
-
-    /**
-     * The path-qualified name of the .proto file that contained the associated
-     * protobuf element.  For example: `"google/protobuf/source_context.proto"`.
-     *
-     * Generated from protobuf field <code>string file_name = 1;</code>
-     * @param string $var
-     * @return $this
-     */
-    public function setFileName($var)
-    {
-        GPBUtil::checkString($var, True);
-        $this->file_name = $var;
-
-        return $this;
-    }
-
-}
-
diff --git a/libs/protobuf/php/src/Google/Protobuf/StringValue.php b/libs/protobuf/php/src/Google/Protobuf/StringValue.php
deleted file mode 100644
index ad98316..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/StringValue.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: google/protobuf/wrappers.proto
-
-namespace Google\Protobuf;
-
-use Google\Protobuf\Internal\GPBType;
-use Google\Protobuf\Internal\RepeatedField;
-use Google\Protobuf\Internal\GPBUtil;
-
-/**
- * Wrapper message for `string`.
- * The JSON representation for `StringValue` is JSON string.
- *
- * Generated from protobuf message <code>google.protobuf.StringValue</code>
- */
-class StringValue extends \Google\Protobuf\Internal\Message
-{
-    /**
-     * The string value.
-     *
-     * Generated from protobuf field <code>string value = 1;</code>
-     */
-    protected $value = '';
-
-    /**
-     * Constructor.
-     *
-     * @param array $data {
-     *     Optional. Data for populating the Message object.
-     *
-     *     @type string $value
-     *           The string value.
-     * }
-     */
-    public function __construct($data = NULL) {
-        \GPBMetadata\Google\Protobuf\Wrappers::initOnce();
-        parent::__construct($data);
-    }
-
-    /**
-     * The string value.
-     *
-     * Generated from protobuf field <code>string value = 1;</code>
-     * @return string
-     */
-    public function getValue()
-    {
-        return $this->value;
-    }
-
-    /**
-     * The string value.
-     *
-     * Generated from protobuf field <code>string value = 1;</code>
-     * @param string $var
-     * @return $this
-     */
-    public function setValue($var)
-    {
-        GPBUtil::checkString($var, True);
-        $this->value = $var;
-
-        return $this;
-    }
-
-}
-
diff --git a/libs/protobuf/php/src/Google/Protobuf/Struct.php b/libs/protobuf/php/src/Google/Protobuf/Struct.php
deleted file mode 100644
index 0456541..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/Struct.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: google/protobuf/struct.proto
-
-namespace Google\Protobuf;
-
-use Google\Protobuf\Internal\GPBType;
-use Google\Protobuf\Internal\RepeatedField;
-use Google\Protobuf\Internal\GPBUtil;
-
-/**
- * `Struct` represents a structured data value, consisting of fields
- * which map to dynamically typed values. In some languages, `Struct`
- * might be supported by a native representation. For example, in
- * scripting languages like JS a struct is represented as an
- * object. The details of that representation are described together
- * with the proto support for the language.
- * The JSON representation for `Struct` is JSON object.
- *
- * Generated from protobuf message <code>google.protobuf.Struct</code>
- */
-class Struct extends \Google\Protobuf\Internal\Message
-{
-    /**
-     * Unordered map of dynamically typed values.
-     *
-     * Generated from protobuf field <code>map<string, .google.protobuf.Value> fields = 1;</code>
-     */
-    private $fields;
-
-    /**
-     * Constructor.
-     *
-     * @param array $data {
-     *     Optional. Data for populating the Message object.
-     *
-     *     @type array|\Google\Protobuf\Internal\MapField $fields
-     *           Unordered map of dynamically typed values.
-     * }
-     */
-    public function __construct($data = NULL) {
-        \GPBMetadata\Google\Protobuf\Struct::initOnce();
-        parent::__construct($data);
-    }
-
-    /**
-     * Unordered map of dynamically typed values.
-     *
-     * Generated from protobuf field <code>map<string, .google.protobuf.Value> fields = 1;</code>
-     * @return \Google\Protobuf\Internal\MapField
-     */
-    public function getFields()
-    {
-        return $this->fields;
-    }
-
-    /**
-     * Unordered map of dynamically typed values.
-     *
-     * Generated from protobuf field <code>map<string, .google.protobuf.Value> fields = 1;</code>
-     * @param array|\Google\Protobuf\Internal\MapField $var
-     * @return $this
-     */
-    public function setFields($var)
-    {
-        $arr = GPBUtil::checkMapField($var, \Google\Protobuf\Internal\GPBType::STRING, \Google\Protobuf\Internal\GPBType::MESSAGE, \Google\Protobuf\Value::class);
-        $this->fields = $arr;
-
-        return $this;
-    }
-
-}
-
diff --git a/libs/protobuf/php/src/Google/Protobuf/Syntax.php b/libs/protobuf/php/src/Google/Protobuf/Syntax.php
deleted file mode 100644
index 10952bf..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/Syntax.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: google/protobuf/type.proto
-
-namespace Google\Protobuf;
-
-use UnexpectedValueException;
-
-/**
- * The syntax in which a protocol buffer element is defined.
- *
- * Protobuf type <code>google.protobuf.Syntax</code>
- */
-class Syntax
-{
-    /**
-     * Syntax `proto2`.
-     *
-     * Generated from protobuf enum <code>SYNTAX_PROTO2 = 0;</code>
-     */
-    const SYNTAX_PROTO2 = 0;
-    /**
-     * Syntax `proto3`.
-     *
-     * Generated from protobuf enum <code>SYNTAX_PROTO3 = 1;</code>
-     */
-    const SYNTAX_PROTO3 = 1;
-
-    private static $valueToName = [
-        self::SYNTAX_PROTO2 => 'SYNTAX_PROTO2',
-        self::SYNTAX_PROTO3 => 'SYNTAX_PROTO3',
-    ];
-
-    public static function name($value)
-    {
-        if (!isset(self::$valueToName[$value])) {
-            throw new UnexpectedValueException(sprintf(
-                    'Enum %s has no name defined for value %s', __CLASS__, $value));
-        }
-        return self::$valueToName[$value];
-    }
-
-
-    public static function value($name)
-    {
-        $const = __CLASS__ . '::' . strtoupper($name);
-        if (!defined($const)) {
-            throw new UnexpectedValueException(sprintf(
-                    'Enum %s has no value defined for name %s', __CLASS__, $name));
-        }
-        return constant($const);
-    }
-}
-
diff --git a/libs/protobuf/php/src/Google/Protobuf/Timestamp.php b/libs/protobuf/php/src/Google/Protobuf/Timestamp.php
deleted file mode 100644
index a12f485..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/Timestamp.php
+++ /dev/null
@@ -1,186 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: google/protobuf/timestamp.proto
-
-namespace Google\Protobuf;
-
-use Google\Protobuf\Internal\GPBType;
-use Google\Protobuf\Internal\RepeatedField;
-use Google\Protobuf\Internal\GPBUtil;
-
-/**
- * A Timestamp represents a point in time independent of any time zone or local
- * calendar, encoded as a count of seconds and fractions of seconds at
- * nanosecond resolution. The count is relative to an epoch at UTC midnight on
- * January 1, 1970, in the proleptic Gregorian calendar which extends the
- * Gregorian calendar backwards to year one.
- * All minutes are 60 seconds long. Leap seconds are "smeared" so that no leap
- * second table is needed for interpretation, using a [24-hour linear
- * smear](https://developers.google.com/time/smear).
- * The range is from 0001-01-01T00:00:00Z to 9999-12-31T23:59:59.999999999Z. By
- * restricting to that range, we ensure that we can convert to and from [RFC
- * 3339](https://www.ietf.org/rfc/rfc3339.txt) date strings.
- * # Examples
- * Example 1: Compute Timestamp from POSIX `time()`.
- *     Timestamp timestamp;
- *     timestamp.set_seconds(time(NULL));
- *     timestamp.set_nanos(0);
- * Example 2: Compute Timestamp from POSIX `gettimeofday()`.
- *     struct timeval tv;
- *     gettimeofday(&tv, NULL);
- *     Timestamp timestamp;
- *     timestamp.set_seconds(tv.tv_sec);
- *     timestamp.set_nanos(tv.tv_usec * 1000);
- * Example 3: Compute Timestamp from Win32 `GetSystemTimeAsFileTime()`.
- *     FILETIME ft;
- *     GetSystemTimeAsFileTime(&ft);
- *     UINT64 ticks = (((UINT64)ft.dwHighDateTime) << 32) | ft.dwLowDateTime;
- *     // A Windows tick is 100 nanoseconds. Windows epoch 1601-01-01T00:00:00Z
- *     // is 11644473600 seconds before Unix epoch 1970-01-01T00:00:00Z.
- *     Timestamp timestamp;
- *     timestamp.set_seconds((INT64) ((ticks / 10000000) - 11644473600LL));
- *     timestamp.set_nanos((INT32) ((ticks % 10000000) * 100));
- * Example 4: Compute Timestamp from Java `System.currentTimeMillis()`.
- *     long millis = System.currentTimeMillis();
- *     Timestamp timestamp = Timestamp.newBuilder().setSeconds(millis / 1000)
- *         .setNanos((int) ((millis % 1000) * 1000000)).build();
- * Example 5: Compute Timestamp from Java `Instant.now()`.
- *     Instant now = Instant.now();
- *     Timestamp timestamp =
- *         Timestamp.newBuilder().setSeconds(now.getEpochSecond())
- *             .setNanos(now.getNano()).build();
- * Example 6: Compute Timestamp from current time in Python.
- *     timestamp = Timestamp()
- *     timestamp.GetCurrentTime()
- * # JSON Mapping
- * In JSON format, the Timestamp type is encoded as a string in the
- * [RFC 3339](https://www.ietf.org/rfc/rfc3339.txt) format. That is, the
- * format is "{year}-{month}-{day}T{hour}:{min}:{sec}[.{frac_sec}]Z"
- * where {year} is always expressed using four digits while {month}, {day},
- * {hour}, {min}, and {sec} are zero-padded to two digits each. The fractional
- * seconds, which can go up to 9 digits (i.e. up to 1 nanosecond resolution),
- * are optional. The "Z" suffix indicates the timezone ("UTC"); the timezone
- * is required. A proto3 JSON serializer should always use UTC (as indicated by
- * "Z") when printing the Timestamp type and a proto3 JSON parser should be
- * able to accept both UTC and other timezones (as indicated by an offset).
- * For example, "2017-01-15T01:30:15.01Z" encodes 15.01 seconds past
- * 01:30 UTC on January 15, 2017.
- * In JavaScript, one can convert a Date object to this format using the
- * standard
- * [toISOString()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/toISOString)
- * method. In Python, a standard `datetime.datetime` object can be converted
- * to this format using
- * [`strftime`](https://docs.python.org/2/library/time.html#time.strftime) with
- * the time format spec '%Y-%m-%dT%H:%M:%S.%fZ'. Likewise, in Java, one can use
- * the Joda Time's [`ISODateTimeFormat.dateTime()`](
- * http://www.joda.org/joda-time/apidocs/org/joda/time/format/ISODateTimeFormat.html#dateTime%2D%2D
- * ) to obtain a formatter capable of generating timestamps in this format.
- *
- * Generated from protobuf message <code>google.protobuf.Timestamp</code>
- */
-class Timestamp extends \Google\Protobuf\Internal\TimestampBase
-{
-    /**
-     * Represents seconds of UTC time since Unix epoch
-     * 1970-01-01T00:00:00Z. Must be from 0001-01-01T00:00:00Z to
-     * 9999-12-31T23:59:59Z inclusive.
-     *
-     * Generated from protobuf field <code>int64 seconds = 1;</code>
-     */
-    protected $seconds = 0;
-    /**
-     * Non-negative fractions of a second at nanosecond resolution. Negative
-     * second values with fractions must still have non-negative nanos values
-     * that count forward in time. Must be from 0 to 999,999,999
-     * inclusive.
-     *
-     * Generated from protobuf field <code>int32 nanos = 2;</code>
-     */
-    protected $nanos = 0;
-
-    /**
-     * Constructor.
-     *
-     * @param array $data {
-     *     Optional. Data for populating the Message object.
-     *
-     *     @type int|string $seconds
-     *           Represents seconds of UTC time since Unix epoch
-     *           1970-01-01T00:00:00Z. Must be from 0001-01-01T00:00:00Z to
-     *           9999-12-31T23:59:59Z inclusive.
-     *     @type int $nanos
-     *           Non-negative fractions of a second at nanosecond resolution. Negative
-     *           second values with fractions must still have non-negative nanos values
-     *           that count forward in time. Must be from 0 to 999,999,999
-     *           inclusive.
-     * }
-     */
-    public function __construct($data = NULL) {
-        \GPBMetadata\Google\Protobuf\Timestamp::initOnce();
-        parent::__construct($data);
-    }
-
-    /**
-     * Represents seconds of UTC time since Unix epoch
-     * 1970-01-01T00:00:00Z. Must be from 0001-01-01T00:00:00Z to
-     * 9999-12-31T23:59:59Z inclusive.
-     *
-     * Generated from protobuf field <code>int64 seconds = 1;</code>
-     * @return int|string
-     */
-    public function getSeconds()
-    {
-        return $this->seconds;
-    }
-
-    /**
-     * Represents seconds of UTC time since Unix epoch
-     * 1970-01-01T00:00:00Z. Must be from 0001-01-01T00:00:00Z to
-     * 9999-12-31T23:59:59Z inclusive.
-     *
-     * Generated from protobuf field <code>int64 seconds = 1;</code>
-     * @param int|string $var
-     * @return $this
-     */
-    public function setSeconds($var)
-    {
-        GPBUtil::checkInt64($var);
-        $this->seconds = $var;
-
-        return $this;
-    }
-
-    /**
-     * Non-negative fractions of a second at nanosecond resolution. Negative
-     * second values with fractions must still have non-negative nanos values
-     * that count forward in time. Must be from 0 to 999,999,999
-     * inclusive.
-     *
-     * Generated from protobuf field <code>int32 nanos = 2;</code>
-     * @return int
-     */
-    public function getNanos()
-    {
-        return $this->nanos;
-    }
-
-    /**
-     * Non-negative fractions of a second at nanosecond resolution. Negative
-     * second values with fractions must still have non-negative nanos values
-     * that count forward in time. Must be from 0 to 999,999,999
-     * inclusive.
-     *
-     * Generated from protobuf field <code>int32 nanos = 2;</code>
-     * @param int $var
-     * @return $this
-     */
-    public function setNanos($var)
-    {
-        GPBUtil::checkInt32($var);
-        $this->nanos = $var;
-
-        return $this;
-    }
-
-}
-
diff --git a/libs/protobuf/php/src/Google/Protobuf/Type.php b/libs/protobuf/php/src/Google/Protobuf/Type.php
deleted file mode 100644
index d4af7df..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/Type.php
+++ /dev/null
@@ -1,247 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: google/protobuf/type.proto
-
-namespace Google\Protobuf;
-
-use Google\Protobuf\Internal\GPBType;
-use Google\Protobuf\Internal\RepeatedField;
-use Google\Protobuf\Internal\GPBUtil;
-
-/**
- * A protocol buffer message type.
- *
- * Generated from protobuf message <code>google.protobuf.Type</code>
- */
-class Type extends \Google\Protobuf\Internal\Message
-{
-    /**
-     * The fully qualified message name.
-     *
-     * Generated from protobuf field <code>string name = 1;</code>
-     */
-    protected $name = '';
-    /**
-     * The list of fields.
-     *
-     * Generated from protobuf field <code>repeated .google.protobuf.Field fields = 2;</code>
-     */
-    private $fields;
-    /**
-     * The list of types appearing in `oneof` definitions in this type.
-     *
-     * Generated from protobuf field <code>repeated string oneofs = 3;</code>
-     */
-    private $oneofs;
-    /**
-     * The protocol buffer options.
-     *
-     * Generated from protobuf field <code>repeated .google.protobuf.Option options = 4;</code>
-     */
-    private $options;
-    /**
-     * The source context.
-     *
-     * Generated from protobuf field <code>.google.protobuf.SourceContext source_context = 5;</code>
-     */
-    protected $source_context = null;
-    /**
-     * The source syntax.
-     *
-     * Generated from protobuf field <code>.google.protobuf.Syntax syntax = 6;</code>
-     */
-    protected $syntax = 0;
-
-    /**
-     * Constructor.
-     *
-     * @param array $data {
-     *     Optional. Data for populating the Message object.
-     *
-     *     @type string $name
-     *           The fully qualified message name.
-     *     @type array<\Google\Protobuf\Field>|\Google\Protobuf\Internal\RepeatedField $fields
-     *           The list of fields.
-     *     @type array<string>|\Google\Protobuf\Internal\RepeatedField $oneofs
-     *           The list of types appearing in `oneof` definitions in this type.
-     *     @type array<\Google\Protobuf\Option>|\Google\Protobuf\Internal\RepeatedField $options
-     *           The protocol buffer options.
-     *     @type \Google\Protobuf\SourceContext $source_context
-     *           The source context.
-     *     @type int $syntax
-     *           The source syntax.
-     * }
-     */
-    public function __construct($data = NULL) {
-        \GPBMetadata\Google\Protobuf\Type::initOnce();
-        parent::__construct($data);
-    }
-
-    /**
-     * The fully qualified message name.
-     *
-     * Generated from protobuf field <code>string name = 1;</code>
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    /**
-     * The fully qualified message name.
-     *
-     * Generated from protobuf field <code>string name = 1;</code>
-     * @param string $var
-     * @return $this
-     */
-    public function setName($var)
-    {
-        GPBUtil::checkString($var, True);
-        $this->name = $var;
-
-        return $this;
-    }
-
-    /**
-     * The list of fields.
-     *
-     * Generated from protobuf field <code>repeated .google.protobuf.Field fields = 2;</code>
-     * @return \Google\Protobuf\Internal\RepeatedField
-     */
-    public function getFields()
-    {
-        return $this->fields;
-    }
-
-    /**
-     * The list of fields.
-     *
-     * Generated from protobuf field <code>repeated .google.protobuf.Field fields = 2;</code>
-     * @param array<\Google\Protobuf\Field>|\Google\Protobuf\Internal\RepeatedField $var
-     * @return $this
-     */
-    public function setFields($var)
-    {
-        $arr = GPBUtil::checkRepeatedField($var, \Google\Protobuf\Internal\GPBType::MESSAGE, \Google\Protobuf\Field::class);
-        $this->fields = $arr;
-
-        return $this;
-    }
-
-    /**
-     * The list of types appearing in `oneof` definitions in this type.
-     *
-     * Generated from protobuf field <code>repeated string oneofs = 3;</code>
-     * @return \Google\Protobuf\Internal\RepeatedField
-     */
-    public function getOneofs()
-    {
-        return $this->oneofs;
-    }
-
-    /**
-     * The list of types appearing in `oneof` definitions in this type.
-     *
-     * Generated from protobuf field <code>repeated string oneofs = 3;</code>
-     * @param array<string>|\Google\Protobuf\Internal\RepeatedField $var
-     * @return $this
-     */
-    public function setOneofs($var)
-    {
-        $arr = GPBUtil::checkRepeatedField($var, \Google\Protobuf\Internal\GPBType::STRING);
-        $this->oneofs = $arr;
-
-        return $this;
-    }
-
-    /**
-     * The protocol buffer options.
-     *
-     * Generated from protobuf field <code>repeated .google.protobuf.Option options = 4;</code>
-     * @return \Google\Protobuf\Internal\RepeatedField
-     */
-    public function getOptions()
-    {
-        return $this->options;
-    }
-
-    /**
-     * The protocol buffer options.
-     *
-     * Generated from protobuf field <code>repeated .google.protobuf.Option options = 4;</code>
-     * @param array<\Google\Protobuf\Option>|\Google\Protobuf\Internal\RepeatedField $var
-     * @return $this
-     */
-    public function setOptions($var)
-    {
-        $arr = GPBUtil::checkRepeatedField($var, \Google\Protobuf\Internal\GPBType::MESSAGE, \Google\Protobuf\Option::class);
-        $this->options = $arr;
-
-        return $this;
-    }
-
-    /**
-     * The source context.
-     *
-     * Generated from protobuf field <code>.google.protobuf.SourceContext source_context = 5;</code>
-     * @return \Google\Protobuf\SourceContext|null
-     */
-    public function getSourceContext()
-    {
-        return $this->source_context;
-    }
-
-    public function hasSourceContext()
-    {
-        return isset($this->source_context);
-    }
-
-    public function clearSourceContext()
-    {
-        unset($this->source_context);
-    }
-
-    /**
-     * The source context.
-     *
-     * Generated from protobuf field <code>.google.protobuf.SourceContext source_context = 5;</code>
-     * @param \Google\Protobuf\SourceContext $var
-     * @return $this
-     */
-    public function setSourceContext($var)
-    {
-        GPBUtil::checkMessage($var, \Google\Protobuf\SourceContext::class);
-        $this->source_context = $var;
-
-        return $this;
-    }
-
-    /**
-     * The source syntax.
-     *
-     * Generated from protobuf field <code>.google.protobuf.Syntax syntax = 6;</code>
-     * @return int
-     */
-    public function getSyntax()
-    {
-        return $this->syntax;
-    }
-
-    /**
-     * The source syntax.
-     *
-     * Generated from protobuf field <code>.google.protobuf.Syntax syntax = 6;</code>
-     * @param int $var
-     * @return $this
-     */
-    public function setSyntax($var)
-    {
-        GPBUtil::checkEnum($var, \Google\Protobuf\Syntax::class);
-        $this->syntax = $var;
-
-        return $this;
-    }
-
-}
-
diff --git a/libs/protobuf/php/src/Google/Protobuf/UInt32Value.php b/libs/protobuf/php/src/Google/Protobuf/UInt32Value.php
deleted file mode 100644
index ae5fc5b..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/UInt32Value.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: google/protobuf/wrappers.proto
-
-namespace Google\Protobuf;
-
-use Google\Protobuf\Internal\GPBType;
-use Google\Protobuf\Internal\RepeatedField;
-use Google\Protobuf\Internal\GPBUtil;
-
-/**
- * Wrapper message for `uint32`.
- * The JSON representation for `UInt32Value` is JSON number.
- *
- * Generated from protobuf message <code>google.protobuf.UInt32Value</code>
- */
-class UInt32Value extends \Google\Protobuf\Internal\Message
-{
-    /**
-     * The uint32 value.
-     *
-     * Generated from protobuf field <code>uint32 value = 1;</code>
-     */
-    protected $value = 0;
-
-    /**
-     * Constructor.
-     *
-     * @param array $data {
-     *     Optional. Data for populating the Message object.
-     *
-     *     @type int $value
-     *           The uint32 value.
-     * }
-     */
-    public function __construct($data = NULL) {
-        \GPBMetadata\Google\Protobuf\Wrappers::initOnce();
-        parent::__construct($data);
-    }
-
-    /**
-     * The uint32 value.
-     *
-     * Generated from protobuf field <code>uint32 value = 1;</code>
-     * @return int
-     */
-    public function getValue()
-    {
-        return $this->value;
-    }
-
-    /**
-     * The uint32 value.
-     *
-     * Generated from protobuf field <code>uint32 value = 1;</code>
-     * @param int $var
-     * @return $this
-     */
-    public function setValue($var)
-    {
-        GPBUtil::checkUint32($var);
-        $this->value = $var;
-
-        return $this;
-    }
-
-}
-
diff --git a/libs/protobuf/php/src/Google/Protobuf/UInt64Value.php b/libs/protobuf/php/src/Google/Protobuf/UInt64Value.php
deleted file mode 100644
index aa96867..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/UInt64Value.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: google/protobuf/wrappers.proto
-
-namespace Google\Protobuf;
-
-use Google\Protobuf\Internal\GPBType;
-use Google\Protobuf\Internal\RepeatedField;
-use Google\Protobuf\Internal\GPBUtil;
-
-/**
- * Wrapper message for `uint64`.
- * The JSON representation for `UInt64Value` is JSON string.
- *
- * Generated from protobuf message <code>google.protobuf.UInt64Value</code>
- */
-class UInt64Value extends \Google\Protobuf\Internal\Message
-{
-    /**
-     * The uint64 value.
-     *
-     * Generated from protobuf field <code>uint64 value = 1;</code>
-     */
-    protected $value = 0;
-
-    /**
-     * Constructor.
-     *
-     * @param array $data {
-     *     Optional. Data for populating the Message object.
-     *
-     *     @type int|string $value
-     *           The uint64 value.
-     * }
-     */
-    public function __construct($data = NULL) {
-        \GPBMetadata\Google\Protobuf\Wrappers::initOnce();
-        parent::__construct($data);
-    }
-
-    /**
-     * The uint64 value.
-     *
-     * Generated from protobuf field <code>uint64 value = 1;</code>
-     * @return int|string
-     */
-    public function getValue()
-    {
-        return $this->value;
-    }
-
-    /**
-     * The uint64 value.
-     *
-     * Generated from protobuf field <code>uint64 value = 1;</code>
-     * @param int|string $var
-     * @return $this
-     */
-    public function setValue($var)
-    {
-        GPBUtil::checkUint64($var);
-        $this->value = $var;
-
-        return $this;
-    }
-
-}
-
diff --git a/libs/protobuf/php/src/Google/Protobuf/Value.php b/libs/protobuf/php/src/Google/Protobuf/Value.php
deleted file mode 100644
index dcc0bdf..0000000
--- a/libs/protobuf/php/src/Google/Protobuf/Value.php
+++ /dev/null
@@ -1,244 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: google/protobuf/struct.proto
-
-namespace Google\Protobuf;
-
-use Google\Protobuf\Internal\GPBType;
-use Google\Protobuf\Internal\RepeatedField;
-use Google\Protobuf\Internal\GPBUtil;
-
-/**
- * `Value` represents a dynamically typed value which can be either
- * null, a number, a string, a boolean, a recursive struct value, or a
- * list of values. A producer of value is expected to set one of these
- * variants. Absence of any variant indicates an error.
- * The JSON representation for `Value` is JSON value.
- *
- * Generated from protobuf message <code>google.protobuf.Value</code>
- */
-class Value extends \Google\Protobuf\Internal\Message
-{
-    protected $kind;
-
-    /**
-     * Constructor.
-     *
-     * @param array $data {
-     *     Optional. Data for populating the Message object.
-     *
-     *     @type int $null_value
-     *           Represents a null value.
-     *     @type float $number_value
-     *           Represents a double value.
-     *     @type string $string_value
-     *           Represents a string value.
-     *     @type bool $bool_value
-     *           Represents a boolean value.
-     *     @type \Google\Protobuf\Struct $struct_value
-     *           Represents a structured value.
-     *     @type \Google\Protobuf\ListValue $list_value
-     *           Represents a repeated `Value`.
-     * }
-     */
-    public function __construct($data = NULL) {
-        \GPBMetadata\Google\Protobuf\Struct::initOnce();
-        parent::__construct($data);
-    }
-
-    /**
-     * Represents a null value.
-     *
-     * Generated from protobuf field <code>.google.protobuf.NullValue null_value = 1;</code>
-     * @return int
-     */
-    public function getNullValue()
-    {
-        return $this->readOneof(1);
-    }
-
-    public function hasNullValue()
-    {
-        return $this->hasOneof(1);
-    }
-
-    /**
-     * Represents a null value.
-     *
-     * Generated from protobuf field <code>.google.protobuf.NullValue null_value = 1;</code>
-     * @param int $var
-     * @return $this
-     */
-    public function setNullValue($var)
-    {
-        GPBUtil::checkEnum($var, \Google\Protobuf\NullValue::class);
-        $this->writeOneof(1, $var);
-
-        return $this;
-    }
-
-    /**
-     * Represents a double value.
-     *
-     * Generated from protobuf field <code>double number_value = 2;</code>
-     * @return float
-     */
-    public function getNumberValue()
-    {
-        return $this->readOneof(2);
-    }
-
-    public function hasNumberValue()
-    {
-        return $this->hasOneof(2);
-    }
-
-    /**
-     * Represents a double value.
-     *
-     * Generated from protobuf field <code>double number_value = 2;</code>
-     * @param float $var
-     * @return $this
-     */
-    public function setNumberValue($var)
-    {
-        GPBUtil::checkDouble($var);
-        $this->writeOneof(2, $var);
-
-        return $this;
-    }
-
-    /**
-     * Represents a string value.
-     *
-     * Generated from protobuf field <code>string string_value = 3;</code>
-     * @return string
-     */
-    public function getStringValue()
-    {
-        return $this->readOneof(3);
-    }
-
-    public function hasStringValue()
-    {
-        return $this->hasOneof(3);
-    }
-
-    /**
-     * Represents a string value.
-     *
-     * Generated from protobuf field <code>string string_value = 3;</code>
-     * @param string $var
-     * @return $this
-     */
-    public function setStringValue($var)
-    {
-        GPBUtil::checkString($var, True);
-        $this->writeOneof(3, $var);
-
-        return $this;
-    }
-
-    /**
-     * Represents a boolean value.
-     *
-     * Generated from protobuf field <code>bool bool_value = 4;</code>
-     * @return bool
-     */
-    public function getBoolValue()
-    {
-        return $this->readOneof(4);
-    }
-
-    public function hasBoolValue()
-    {
-        return $this->hasOneof(4);
-    }
-
-    /**
-     * Represents a boolean value.
-     *
-     * Generated from protobuf field <code>bool bool_value = 4;</code>
-     * @param bool $var
-     * @return $this
-     */
-    public function setBoolValue($var)
-    {
-        GPBUtil::checkBool($var);
-        $this->writeOneof(4, $var);
-
-        return $this;
-    }
-
-    /**
-     * Represents a structured value.
-     *
-     * Generated from protobuf field <code>.google.protobuf.Struct struct_value = 5;</code>
-     * @return \Google\Protobuf\Struct|null
-     */
-    public function getStructValue()
-    {
-        return $this->readOneof(5);
-    }
-
-    public function hasStructValue()
-    {
-        return $this->hasOneof(5);
-    }
-
-    /**
-     * Represents a structured value.
-     *
-     * Generated from protobuf field <code>.google.protobuf.Struct struct_value = 5;</code>
-     * @param \Google\Protobuf\Struct $var
-     * @return $this
-     */
-    public function setStructValue($var)
-    {
-        GPBUtil::checkMessage($var, \Google\Protobuf\Struct::class);
-        $this->writeOneof(5, $var);
-
-        return $this;
-    }
-
-    /**
-     * Represents a repeated `Value`.
-     *
-     * Generated from protobuf field <code>.google.protobuf.ListValue list_value = 6;</code>
-     * @return \Google\Protobuf\ListValue|null
-     */
-    public function getListValue()
-    {
-        return $this->readOneof(6);
-    }
-
-    public function hasListValue()
-    {
-        return $this->hasOneof(6);
-    }
-
-    /**
-     * Represents a repeated `Value`.
-     *
-     * Generated from protobuf field <code>.google.protobuf.ListValue list_value = 6;</code>
-     * @param \Google\Protobuf\ListValue $var
-     * @return $this
-     */
-    public function setListValue($var)
-    {
-        GPBUtil::checkMessage($var, \Google\Protobuf\ListValue::class);
-        $this->writeOneof(6, $var);
-
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getKind()
-    {
-        return $this->whichOneof("kind");
-    }
-
-}
-
diff --git a/libs/protobuf/php/src/phpdoc.dist.xml b/libs/protobuf/php/src/phpdoc.dist.xml
deleted file mode 100644
index dd31302..0000000
--- a/libs/protobuf/php/src/phpdoc.dist.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!-- Install phpDocumentor to generate docs. -->
-<phpdoc>
-  <parser>
-    <target>doc</target>
-  </parser>
-  <transformer>
-    <target>doc</target>
-  </transformer>
-  <files>
-    <file>Google/Protobuf/Internal/MapField.php</file>
-    <file>Google/Protobuf/Internal/Message.php</file>
-    <file>Google/Protobuf/Internal/RepeatedField.php</file>
-  </files>
-</phpdoc>
diff --git a/libs/protobuf/php/tests/ArrayTest.php b/libs/protobuf/php/tests/ArrayTest.php
deleted file mode 100644
index 9e8fcb8..0000000
--- a/libs/protobuf/php/tests/ArrayTest.php
+++ /dev/null
@@ -1,658 +0,0 @@
-<?php
-
-require_once('test_base.php');
-require_once('test_util.php');
-
-use Google\Protobuf\Internal\RepeatedField;
-use Google\Protobuf\Internal\GPBType;
-use Foo\TestMessage;
-use Foo\TestMessage\Sub;
-
-class ArrayTest extends TestBase
-{
-
-    #########################################################
-    # Test int32 field.
-    #########################################################
-
-    public function testInt32()
-    {
-        $arr = new RepeatedField(GPBType::INT32);
-
-        // Test append.
-        $arr[] = MAX_INT32;
-        $this->assertSame(MAX_INT32, $arr[0]);
-        $arr[] = MIN_INT32;
-        $this->assertSame(MIN_INT32, $arr[1]);
-
-        $arr[] = 1.1;
-        $this->assertSame(1, $arr[2]);
-        $arr[] = MAX_INT32_FLOAT;
-        $this->assertSame(MAX_INT32, $arr[3]);
-        $arr[] = MAX_INT32_FLOAT;
-        $this->assertSame(MAX_INT32, $arr[4]);
-
-        $arr[] = '2';
-        $this->assertSame(2, $arr[5]);
-        $arr[] = '3.1';
-        $this->assertSame(3, $arr[6]);
-        $arr[] = MAX_INT32_STRING;
-        $this->assertSame(MAX_INT32, $arr[7]);
-
-        $this->assertEquals(8, count($arr));
-
-        for ($i = 0; $i < count($arr); $i++) {
-            $arr[$i] = 0;
-            $this->assertSame(0, $arr[$i]);
-        }
-
-        // Test set.
-        $arr[0] = MAX_INT32;
-        $this->assertSame(MAX_INT32, $arr[0]);
-        $arr[1] = MIN_INT32;
-        $this->assertSame(MIN_INT32, $arr[1]);
-
-        $arr[2] = 1.1;
-        $this->assertSame(1, $arr[2]);
-        $arr[3] = MAX_INT32_FLOAT;
-        $this->assertSame(MAX_INT32, $arr[3]);
-        $arr[4] = MAX_INT32_FLOAT;
-        $this->assertSame(MAX_INT32, $arr[4]);
-
-        $arr[5] = '2';
-        $this->assertSame(2, $arr[5]);
-        $arr[6] = '3.1';
-        $this->assertSame(3, $arr[6]);
-        $arr[7] = MAX_INT32_STRING;
-        $this->assertSame(MAX_INT32, $arr[7]);
-
-        // Test foreach.
-        $arr = new RepeatedField(GPBType::INT32);
-        for ($i = 0; $i < 3; $i++) {
-          $arr[] = $i;
-        }
-        $i = 0;
-        foreach ($arr as $val) {
-          $this->assertSame($i++, $val);
-        }
-        $this->assertSame(3, $i);
-    }
-
-    #########################################################
-    # Test uint32 field.
-    #########################################################
-
-    public function testUint32()
-    {
-        $arr = new RepeatedField(GPBType::UINT32);
-
-        // Test append.
-        $arr[] = MAX_UINT32;
-        $this->assertSame(-1, $arr[0]);
-        $arr[] = -1;
-        $this->assertSame(-1, $arr[1]);
-        $arr[] = MIN_UINT32;
-        $this->assertSame(MIN_UINT32, $arr[2]);
-
-        $arr[] = 1.1;
-        $this->assertSame(1, $arr[3]);
-        $arr[] = MAX_UINT32_FLOAT;
-        $this->assertSame(-1, $arr[4]);
-        $arr[] = -1.0;
-        $this->assertSame(-1, $arr[5]);
-        $arr[] = MIN_UINT32_FLOAT;
-        $this->assertSame(MIN_UINT32, $arr[6]);
-
-        $arr[] = '2';
-        $this->assertSame(2, $arr[7]);
-        $arr[] = '3.1';
-        $this->assertSame(3, $arr[8]);
-        $arr[] = MAX_UINT32_STRING;
-        $this->assertSame(-1, $arr[9]);
-        $arr[] = '-1.0';
-        $this->assertSame(-1, $arr[10]);
-        $arr[] = MIN_UINT32_STRING;
-        $this->assertSame(MIN_UINT32, $arr[11]);
-
-        $this->assertEquals(12, count($arr));
-
-        for ($i = 0; $i < count($arr); $i++) {
-            $arr[$i] = 0;
-            $this->assertSame(0, $arr[$i]);
-        }
-
-        // Test set.
-        $arr[0] = MAX_UINT32;
-        $this->assertSame(-1, $arr[0]);
-        $arr[1] = -1;
-        $this->assertSame(-1, $arr[1]);
-        $arr[2] = MIN_UINT32;
-        $this->assertSame(MIN_UINT32, $arr[2]);
-
-        $arr[3] = 1.1;
-        $this->assertSame(1, $arr[3]);
-        $arr[4] = MAX_UINT32_FLOAT;
-        $this->assertSame(-1, $arr[4]);
-        $arr[5] = -1.0;
-        $this->assertSame(-1, $arr[5]);
-        $arr[6] = MIN_UINT32_FLOAT;
-        $this->assertSame(MIN_UINT32, $arr[6]);
-
-        $arr[7] = '2';
-        $this->assertSame(2, $arr[7]);
-        $arr[8] = '3.1';
-        $this->assertSame(3, $arr[8]);
-        $arr[9] = MAX_UINT32_STRING;
-        $this->assertSame(-1, $arr[9]);
-        $arr[10] = '-1.0';
-        $this->assertSame(-1, $arr[10]);
-        $arr[11] = MIN_UINT32_STRING;
-        $this->assertSame(MIN_UINT32, $arr[11]);
-    }
-
-    #########################################################
-    # Test int64 field.
-    #########################################################
-
-    public function testInt64()
-    {
-        $arr = new RepeatedField(GPBType::INT64);
-
-        // Test append.
-        $arr[] = MAX_INT64;
-        $arr[] = MIN_INT64;
-        $arr[] = 1.1;
-        $arr[] = '2';
-        $arr[] = '3.1';
-        $arr[] = MAX_INT64_STRING;
-        $arr[] = MIN_INT64_STRING;
-        if (PHP_INT_SIZE == 4) {
-            $this->assertSame(MAX_INT64, $arr[0]);
-            $this->assertSame(MIN_INT64, $arr[1]);
-            $this->assertSame('1', $arr[2]);
-            $this->assertSame('2', $arr[3]);
-            $this->assertSame('3', $arr[4]);
-            $this->assertSame(MAX_INT64_STRING, $arr[5]);
-            $this->assertSame(MIN_INT64_STRING, $arr[6]);
-        } else {
-            $this->assertSame(MAX_INT64, $arr[0]);
-            $this->assertSame(MIN_INT64, $arr[1]);
-            $this->assertSame(1, $arr[2]);
-            $this->assertSame(2, $arr[3]);
-            $this->assertSame(3, $arr[4]);
-            $this->assertSame(MAX_INT64, $arr[5]);
-            $this->assertSame(MIN_INT64, $arr[6]);
-        }
-
-
-        $this->assertEquals(7, count($arr));
-
-        for ($i = 0; $i < count($arr); $i++) {
-            $arr[$i] = 0;
-            if (PHP_INT_SIZE == 4) {
-                $this->assertSame('0', $arr[$i]);
-            } else {
-                $this->assertSame(0, $arr[$i]);
-            }
-        }
-
-        // Test set.
-        $arr[0] = MAX_INT64;
-        $arr[1] = MIN_INT64;
-        $arr[2] = 1.1;
-        $arr[3] = '2';
-        $arr[4] = '3.1';
-        $arr[5] = MAX_INT64_STRING;
-        $arr[6] = MIN_INT64_STRING;
-
-        if (PHP_INT_SIZE == 4) {
-            $this->assertSame(MAX_INT64_STRING, $arr[0]);
-            $this->assertSame(MIN_INT64_STRING, $arr[1]);
-            $this->assertSame('1', $arr[2]);
-            $this->assertSame('2', $arr[3]);
-            $this->assertSame('3', $arr[4]);
-            $this->assertSame(MAX_INT64_STRING, $arr[5]);
-            $this->assertEquals(MIN_INT64_STRING, $arr[6]);
-        } else {
-            $this->assertSame(MAX_INT64, $arr[0]);
-            $this->assertSame(MIN_INT64, $arr[1]);
-            $this->assertSame(1, $arr[2]);
-            $this->assertSame(2, $arr[3]);
-            $this->assertSame(3, $arr[4]);
-            $this->assertSame(MAX_INT64, $arr[5]);
-            $this->assertEquals(MIN_INT64, $arr[6]);
-        }
-    }
-
-    #########################################################
-    # Test uint64 field.
-    #########################################################
-
-    public function testUint64()
-    {
-        $arr = new RepeatedField(GPBType::UINT64);
-
-        // Test append.
-        $arr[] = MAX_UINT64;
-        $arr[] = 1.1;
-        $arr[] = '2';
-        $arr[] = '3.1';
-        $arr[] = MAX_UINT64_STRING;
-
-        if (PHP_INT_SIZE == 4) {
-            $this->assertSame(MAX_UINT64_STRING, $arr[0]);
-            $this->assertSame('1', $arr[1]);
-            $this->assertSame('2', $arr[2]);
-            $this->assertSame('3', $arr[3]);
-            $this->assertSame(MAX_UINT64_STRING, $arr[4]);
-        } else {
-            $this->assertSame(MAX_UINT64, $arr[0]);
-            $this->assertSame(1, $arr[1]);
-            $this->assertSame(2, $arr[2]);
-            $this->assertSame(3, $arr[3]);
-            $this->assertSame(MAX_UINT64, $arr[4]);
-            $this->assertSame(5, count($arr));
-        }
-
-        $this->assertSame(5, count($arr));
-
-        for ($i = 0; $i < count($arr); $i++) {
-            $arr[$i] = 0;
-            if (PHP_INT_SIZE == 4) {
-                $this->assertSame('0', $arr[$i]);
-            } else {
-                $this->assertSame(0, $arr[$i]);
-            }
-        }
-
-        // Test set.
-        $arr[0] = MAX_UINT64;
-        $arr[1] = 1.1;
-        $arr[2] = '2';
-        $arr[3] = '3.1';
-        $arr[4] = MAX_UINT64_STRING;
-
-        if (PHP_INT_SIZE == 4) {
-            $this->assertSame(MAX_UINT64_STRING, $arr[0]);
-            $this->assertSame('1', $arr[1]);
-            $this->assertSame('2', $arr[2]);
-            $this->assertSame('3', $arr[3]);
-            $this->assertSame(MAX_UINT64_STRING, $arr[4]);
-        } else {
-            $this->assertSame(MAX_UINT64, $arr[0]);
-            $this->assertSame(1, $arr[1]);
-            $this->assertSame(2, $arr[2]);
-            $this->assertSame(3, $arr[3]);
-            $this->assertSame(MAX_UINT64, $arr[4]);
-        }
-    }
-
-    #########################################################
-    # Test float field.
-    #########################################################
-
-    public function testFloat()
-    {
-        $arr = new RepeatedField(GPBType::FLOAT);
-
-        // Test append.
-        $arr[] = 1;
-        $this->assertFloatEquals(1.0, $arr[0], MAX_FLOAT_DIFF);
-
-        $arr[] = 1.1;
-        $this->assertFloatEquals(1.1, $arr[1], MAX_FLOAT_DIFF);
-
-        $arr[] = '2';
-        $this->assertFloatEquals(2.0, $arr[2], MAX_FLOAT_DIFF);
-        $arr[] = '3.1';
-        $this->assertFloatEquals(3.1, $arr[3], MAX_FLOAT_DIFF);
-
-        $this->assertEquals(4, count($arr));
-
-        for ($i = 0; $i < count($arr); $i++) {
-            $arr[$i] = 0;
-            $this->assertSame(0.0, $arr[$i]);
-        }
-
-        // Test set.
-        $arr[0] = 1;
-        $this->assertFloatEquals(1.0, $arr[0], MAX_FLOAT_DIFF);
-
-        $arr[1] = 1.1;
-        $this->assertFloatEquals(1.1, $arr[1], MAX_FLOAT_DIFF);
-
-        $arr[2] = '2';
-        $this->assertFloatEquals(2.0, $arr[2], MAX_FLOAT_DIFF);
-        $arr[3] = '3.1';
-        $this->assertFloatEquals(3.1, $arr[3], MAX_FLOAT_DIFF);
-    }
-
-    #########################################################
-    # Test double field.
-    #########################################################
-
-    public function testDouble()
-    {
-        $arr = new RepeatedField(GPBType::DOUBLE);
-
-        // Test append.
-        $arr[] = 1;
-        $this->assertFloatEquals(1.0, $arr[0], MAX_FLOAT_DIFF);
-
-        $arr[] = 1.1;
-        $this->assertFloatEquals(1.1, $arr[1], MAX_FLOAT_DIFF);
-
-        $arr[] = '2';
-        $this->assertFloatEquals(2.0, $arr[2], MAX_FLOAT_DIFF);
-        $arr[] = '3.1';
-        $this->assertFloatEquals(3.1, $arr[3], MAX_FLOAT_DIFF);
-
-        $this->assertEquals(4, count($arr));
-
-        for ($i = 0; $i < count($arr); $i++) {
-            $arr[$i] = 0;
-            $this->assertSame(0.0, $arr[$i]);
-        }
-
-        // Test set.
-        $arr[0] = 1;
-        $this->assertFloatEquals(1.0, $arr[0], MAX_FLOAT_DIFF);
-
-        $arr[1] = 1.1;
-        $this->assertFloatEquals(1.1, $arr[1], MAX_FLOAT_DIFF);
-
-        $arr[2] = '2';
-        $this->assertFloatEquals(2.0, $arr[2], MAX_FLOAT_DIFF);
-        $arr[3] = '3.1';
-        $this->assertFloatEquals(3.1, $arr[3], MAX_FLOAT_DIFF);
-    }
-
-    #########################################################
-    # Test bool field.
-    #########################################################
-
-    public function testBool()
-    {
-        $arr = new RepeatedField(GPBType::BOOL);
-
-        // Test append.
-        $arr[] = true;
-        $this->assertSame(true, $arr[0]);
-
-        $arr[] = -1;
-        $this->assertSame(true, $arr[1]);
-
-        $arr[] = 1.1;
-        $this->assertSame(true, $arr[2]);
-
-        $arr[] = '';
-        $this->assertSame(false, $arr[3]);
-
-        $this->assertEquals(4, count($arr));
-
-        for ($i = 0; $i < count($arr); $i++) {
-            $arr[$i] = 0;
-            $this->assertSame(false, $arr[$i]);
-        }
-
-        // Test set.
-        $arr[0] = true;
-        $this->assertSame(true, $arr[0]);
-
-        $arr[1] = -1;
-        $this->assertSame(true, $arr[1]);
-
-        $arr[2] = 1.1;
-        $this->assertSame(true, $arr[2]);
-
-        $arr[3] = '';
-        $this->assertSame(false, $arr[3]);
-    }
-
-    #########################################################
-    # Test string field.
-    #########################################################
-
-    public function testString()
-    {
-        $arr = new RepeatedField(GPBType::STRING);
-
-        // Test append.
-        $arr[] = 'abc';
-        $this->assertSame('abc', $arr[0]);
-
-        $arr[] = 1;
-        $this->assertSame('1', $arr[1]);
-
-        $arr[] = 1.1;
-        $this->assertSame('1.1', $arr[2]);
-
-        $arr[] = true;
-        $this->assertSame('1', $arr[3]);
-
-        $this->assertEquals(4, count($arr));
-
-        for ($i = 0; $i < count($arr); $i++) {
-            $arr[$i] = '';
-            $this->assertSame('', $arr[$i]);
-        }
-
-        // Test set.
-        $arr[0] = 'abc';
-        $this->assertSame('abc', $arr[0]);
-
-        $arr[1] = 1;
-        $this->assertSame('1', $arr[1]);
-
-        $arr[2] = 1.1;
-        $this->assertSame('1.1', $arr[2]);
-
-        $arr[3] = true;
-        $this->assertSame('1', $arr[3]);
-    }
-
-    #########################################################
-    # Test message field.
-    #########################################################
-
-    public function testMessage()
-    {
-        $arr = new RepeatedField(GPBType::MESSAGE, Sub::class);
-
-        // Test append.
-        $sub_m = new Sub();
-        $sub_m->setA(1);
-        $arr[] = $sub_m;
-        $this->assertSame(1, $arr[0]->getA());
-
-        $this->assertEquals(1, count($arr));
-
-        // Test set.
-        $sub_m = new Sub();
-        $sub_m->setA(2);
-        $arr[0] = $sub_m;
-        $this->assertSame(2, $arr[0]->getA());
-
-        // Test foreach.
-        $arr = new RepeatedField(GPBType::MESSAGE, Sub::class);
-        for ($i = 0; $i < 3; $i++) {
-          $arr[] = new Sub();
-          $arr[$i]->setA($i);
-        }
-        $i = 0;
-        foreach ($arr as $val) {
-          $this->assertSame($i++, $val->getA());
-        }
-        $this->assertSame(3, $i);
-    }
-
-    #########################################################
-    # Test offset type
-    #########################################################
-
-    public function testOffset()
-    {
-        $arr = new RepeatedField(GPBType::INT32);
-        $arr[] = 0;
-
-        $arr[0] = 1;
-        $this->assertSame(1, $arr[0]);
-        $this->assertSame(1, count($arr));
-
-        $arr['0'] = 2;
-        $this->assertSame(2, $arr['0']);
-        $this->assertSame(2, $arr[0]);
-        $this->assertSame(1, count($arr));
-
-        $arr[0.0] = 3;
-        $this->assertSame(3, $arr[0.0]);
-        $this->assertSame(1, count($arr));
-    }
-
-    public function testInsertRemoval()
-    {
-        $arr = new RepeatedField(GPBType::INT32);
-
-        $arr[] = 0;
-        $arr[] = 1;
-        $arr[] = 2;
-        $this->assertSame(3, count($arr));
-
-        unset($arr[2]);
-        $this->assertSame(2, count($arr));
-        $this->assertSame(0, $arr[0]);
-        $this->assertSame(1, $arr[1]);
-
-        $arr[] = 3;
-        $this->assertSame(3, count($arr));
-        $this->assertSame(0, $arr[0]);
-        $this->assertSame(1, $arr[1]);
-        $this->assertSame(3, $arr[2]);
-    }
-
-    #########################################################
-    # Test reference in array
-    #########################################################
-
-    public function testArrayElementIsReferenceInSetters()
-    {
-        // Bool elements
-        $values = [true];
-        array_walk($values, function (&$value) {});
-        $m = new TestMessage();
-        $m->setRepeatedBool($values);
-
-        // Int32 elements
-        $values = [1];
-        array_walk($values, function (&$value) {});
-        $m = new TestMessage();
-        $m->setRepeatedInt32($values);
-
-        // Double elements
-        $values = [1.0];
-        array_walk($values, function (&$value) {});
-        $m = new TestMessage();
-        $m->setRepeatedDouble($values);
-
-        // String elements
-        $values = ['a'];
-        array_walk($values, function (&$value) {});
-        $m = new TestMessage();
-        $m->setRepeatedString($values);
-
-        // Message elements
-        $m = new TestMessage();
-        $subs = [1, 2];
-        foreach ($subs as &$sub) {
-            $sub = new Sub(['a' => $sub]);
-        }
-        $m->setRepeatedMessage($subs);
-
-        $this->assertTrue(true);
-    }
-
-    #########################################################
-    # Test memory leak
-    #########################################################
-
-    public function testCycleLeak()
-    {
-        if (getenv("USE_ZEND_ALLOC") === "0") {
-            // If we are disabling Zend's internal allocator (as we do for
-            // Valgrind tests, for example) then memory_get_usage() will not
-            // return a useful value.
-            $this->markTestSkipped();
-            return;
-        }
-
-        gc_collect_cycles();
-        $arr = new RepeatedField(GPBType::MESSAGE, TestMessage::class);
-        $arr[] = new TestMessage;
-        $arr[0]->SetRepeatedRecursive($arr);
-
-        // Clean up memory before test.
-        gc_collect_cycles();
-        $start = memory_get_usage();
-        unset($arr);
-
-        // Explicitly trigger garbage collection.
-        gc_collect_cycles();
-
-        $end = memory_get_usage();
-        $this->assertLessThan($start, $end);
-    }
-
-    #########################################################
-    # Test incorrect types
-    #########################################################
-
-    public function testAppendNull()
-    {
-        $this->expectException(TypeError::class);
-        $arr = new RepeatedField(GPBType::MESSAGE, TestMessage::class);
-        $arr[] = null;
-    }
-
-    #########################################################
-    # Test equality
-    #########################################################
-
-    public function testEquality()
-    {
-        $arr = new RepeatedField(GPBType::INT32);
-        $arr2 = new RepeatedField(GPBType::INT32);
-
-        $this->assertTrue($arr == $arr2);
-
-        $arr[] = 0;
-        $arr[] = 1;
-        $arr[] = 2;
-
-        $this->assertFalse($arr == $arr2);
-
-        $arr2[] = 0;
-        $arr2[] = 1;
-        $arr2[] = 2;
-
-        $this->assertTrue($arr == $arr2);
-
-        // Arrays of different types always compare false.
-        $this->assertFalse(new RepeatedField(GPBType::INT32) ==
-                           new RepeatedField(GPBType::INT64));
-        $this->assertFalse(
-            new RepeatedField(GPBType::MESSAGE, TestMessage::class) ==
-            new RepeatedField(GPBType::MESSAGE, Sub::class));
-    }
-
-    #########################################################
-    # Test clone
-    #########################################################
-
-    public function testClone()
-    {
-        $arr = new RepeatedField(GPBType::MESSAGE, TestMessage::class);
-        $arr[] = new TestMessage;
-        $arr2 = clone $arr;
-        $this->assertSame($arr[0], $arr2[0]);
-    }
-}
diff --git a/libs/protobuf/php/tests/DescriptorsTest.php b/libs/protobuf/php/tests/DescriptorsTest.php
deleted file mode 100644
index 336d979..0000000
--- a/libs/protobuf/php/tests/DescriptorsTest.php
+++ /dev/null
@@ -1,271 +0,0 @@
-<?php
-
-require_once('test_base.php');
-require_once('test_util.php');
-
-use Google\Protobuf\DescriptorPool;
-use Google\Protobuf\Internal\RepeatedField;
-use Google\Protobuf\Internal\MapField;
-use Descriptors\TestDescriptorsEnum;
-use Descriptors\TestDescriptorsMessage;
-use Descriptors\TestDescriptorsMessage\Sub;
-use Foo\TestMessage;
-use Bar\TestInclude;
-
-class DescriptorsTest extends TestBase
-{
-
-    // Redefine these here for compatibility with c extension
-    const GPBLABEL_OPTIONAL = 1;
-    const GPBLABEL_REQUIRED = 2;
-    const GPBLABEL_REPEATED = 3;
-
-    const GPBTYPE_DOUBLE   =  1;
-    const GPBTYPE_FLOAT    =  2;
-    const GPBTYPE_INT64    =  3;
-    const GPBTYPE_UINT64   =  4;
-    const GPBTYPE_INT32    =  5;
-    const GPBTYPE_FIXED64  =  6;
-    const GPBTYPE_FIXED32  =  7;
-    const GPBTYPE_BOOL     =  8;
-    const GPBTYPE_STRING   =  9;
-    const GPBTYPE_GROUP    = 10;
-    const GPBTYPE_MESSAGE  = 11;
-    const GPBTYPE_BYTES    = 12;
-    const GPBTYPE_UINT32   = 13;
-    const GPBTYPE_ENUM     = 14;
-    const GPBTYPE_SFIXED32 = 15;
-    const GPBTYPE_SFIXED64 = 16;
-    const GPBTYPE_SINT32   = 17;
-    const GPBTYPE_SINT64   = 18;
-
-    #########################################################
-    # Test descriptor pool.
-    #########################################################
-
-    public function testDescriptorPool()
-    {
-        $pool = DescriptorPool::getGeneratedPool();
-
-        $desc = $pool->getDescriptorByClassName(get_class(new TestDescriptorsMessage()));
-        $this->assertInstanceOf('\Google\Protobuf\Descriptor', $desc);
-
-        $enumDesc = $pool->getEnumDescriptorByClassName(get_class(new TestDescriptorsEnum()));
-        $this->assertInstanceOf('\Google\Protobuf\EnumDescriptor', $enumDesc);
-    }
-
-    public function testDescriptorPoolIncorrectArgs()
-    {
-        $pool = DescriptorPool::getGeneratedPool();
-
-        $desc = $pool->getDescriptorByClassName('NotAClass');
-        $this->assertNull($desc);
-
-        $desc = $pool->getDescriptorByClassName(get_class(new TestDescriptorsEnum()));
-        $this->assertNull($desc);
-
-        $enumDesc = $pool->getEnumDescriptorByClassName(get_class(new TestDescriptorsMessage()));
-        $this->assertNull($enumDesc);
-    }
-
-    #########################################################
-    # Test descriptor.
-    #########################################################
-
-    public function testDescriptor()
-    {
-        $pool = DescriptorPool::getGeneratedPool();
-        $class = get_class(new TestDescriptorsMessage());
-        $this->assertSame('Descriptors\TestDescriptorsMessage', $class);
-        $desc = $pool->getDescriptorByClassName($class);
-
-        $this->assertSame('descriptors.TestDescriptorsMessage', $desc->getFullName());
-        $this->assertSame($class, $desc->getClass());
-
-        $this->assertInstanceOf('\Google\Protobuf\FieldDescriptor', $desc->getField(0));
-        $this->assertSame(8, $desc->getFieldCount());
-
-        $this->assertInstanceOf('\Google\Protobuf\OneofDescriptor', $desc->getOneofDecl(0));
-        $this->assertSame(2, $desc->getOneofDeclCount());
-    }
-
-    public function testDescriptorForIncludedMessage()
-    {
-        $pool = DescriptorPool::getGeneratedPool();
-        $class = get_class(new TestMessage());
-        $this->assertSame('Foo\TestMessage', $class);
-        $desc = $pool->getDescriptorByClassName($class);
-        $fielddesc = $desc->getField(17);
-        $subdesc = $fielddesc->getMessageType();
-        $this->assertSame('Bar\TestInclude', $subdesc->getClass());
-    }
-
-    #########################################################
-    # Test enum descriptor.
-    #########################################################
-
-    public function testEnumDescriptor()
-    {
-        // WARNING - we need to do this so that TestDescriptorsEnum is registered!!?
-        new TestDescriptorsMessage();
-
-        $pool = DescriptorPool::getGeneratedPool();
-
-        $enumDesc = $pool->getEnumDescriptorByClassName(get_class(new TestDescriptorsEnum()));
-
-        // Build map of enum values
-        $enumDescMap = [];
-        for ($i = 0; $i < $enumDesc->getValueCount(); $i++) {
-            $enumValueDesc = $enumDesc->getValue($i);
-            $this->assertInstanceOf('\Google\Protobuf\EnumValueDescriptor', $enumValueDesc);
-            $enumDescMap[$enumValueDesc->getNumber()] = $enumValueDesc->getName();
-        }
-
-        $this->assertSame('ZERO', $enumDescMap[0]);
-        $this->assertSame('ONE', $enumDescMap[1]);
-
-        $this->assertSame(2, $enumDesc->getValueCount());
-    }
-
-    #########################################################
-    # Test field descriptor.
-    #########################################################
-
-    public function testFieldDescriptor()
-    {
-        $pool = DescriptorPool::getGeneratedPool();
-        $desc = $pool->getDescriptorByClassName(get_class(new TestDescriptorsMessage()));
-
-        $fieldDescMap = $this->buildFieldMap($desc);
-
-        // Optional int field
-        $fieldDesc = $fieldDescMap[1];
-        $this->assertSame('optional_int32', $fieldDesc->getName());
-        $this->assertSame(1, $fieldDesc->getNumber());
-        $this->assertSame(self::GPBLABEL_OPTIONAL, $fieldDesc->getLabel());
-        $this->assertSame(self::GPBTYPE_INT32, $fieldDesc->getType());
-        $this->assertFalse($fieldDesc->isMap());
-
-        // Optional enum field
-        $fieldDesc = $fieldDescMap[16];
-        $this->assertSame('optional_enum', $fieldDesc->getName());
-        $this->assertSame(16, $fieldDesc->getNumber());
-        $this->assertSame(self::GPBLABEL_OPTIONAL, $fieldDesc->getLabel());
-        $this->assertSame(self::GPBTYPE_ENUM, $fieldDesc->getType());
-        $this->assertInstanceOf('\Google\Protobuf\EnumDescriptor', $fieldDesc->getEnumType());
-        $this->assertFalse($fieldDesc->isMap());
-
-        // Optional message field
-        $fieldDesc = $fieldDescMap[17];
-        $this->assertSame('optional_message', $fieldDesc->getName());
-        $this->assertSame(17, $fieldDesc->getNumber());
-        $this->assertSame(self::GPBLABEL_OPTIONAL, $fieldDesc->getLabel());
-        $this->assertSame(self::GPBTYPE_MESSAGE, $fieldDesc->getType());
-        $this->assertInstanceOf('\Google\Protobuf\Descriptor', $fieldDesc->getMessageType());
-        $this->assertFalse($fieldDesc->isMap());
-
-        // Repeated int field
-        $fieldDesc = $fieldDescMap[31];
-        $this->assertSame('repeated_int32', $fieldDesc->getName());
-        $this->assertSame(31, $fieldDesc->getNumber());
-        $this->assertSame(self::GPBLABEL_REPEATED, $fieldDesc->getLabel());
-        $this->assertSame(self::GPBTYPE_INT32, $fieldDesc->getType());
-        $this->assertFalse($fieldDesc->isMap());
-
-        // Repeated message field
-        $fieldDesc = $fieldDescMap[47];
-        $this->assertSame('repeated_message', $fieldDesc->getName());
-        $this->assertSame(47, $fieldDesc->getNumber());
-        $this->assertSame(self::GPBLABEL_REPEATED, $fieldDesc->getLabel());
-        $this->assertSame(self::GPBTYPE_MESSAGE, $fieldDesc->getType());
-        $this->assertInstanceOf('\Google\Protobuf\Descriptor', $fieldDesc->getMessageType());
-        $this->assertFalse($fieldDesc->isMap());
-        $this->assertNull($fieldDesc->getContainingOneof());
-
-        // Oneof int field
-        // Tested further in testOneofDescriptor()
-        $fieldDesc = $fieldDescMap[51];
-        $this->assertSame('oneof_int32', $fieldDesc->getName());
-        $this->assertSame(51, $fieldDesc->getNumber());
-        $this->assertSame(self::GPBLABEL_OPTIONAL, $fieldDesc->getLabel());
-        $this->assertSame(self::GPBTYPE_INT32, $fieldDesc->getType());
-        $this->assertFalse($fieldDesc->isMap());
-        $this->assertSame($fieldDesc->getContainingOneof(), $fieldDesc->getRealContainingOneof());
-
-        $oneofDesc = $fieldDesc->getContainingOneof();
-        $this->assertSame('my_oneof', $oneofDesc->getName());
-
-        // Proto3 optional it field.
-        // Tested further in testOneofDescriptor()
-        $fieldDesc = $fieldDescMap[52];
-        $this->assertSame('proto3_optional_int32', $fieldDesc->getName());
-        $this->assertSame(52, $fieldDesc->getNumber());
-        $this->assertSame(self::GPBLABEL_OPTIONAL, $fieldDesc->getLabel());
-        $this->assertSame(self::GPBTYPE_INT32, $fieldDesc->getType());
-        $this->assertFalse($fieldDesc->isMap());
-        $this->assertNull($fieldDesc->getRealContainingOneof());
-        $this->assertNotNull($fieldDesc->getContainingOneof());
-
-        // Map int-enum field
-        $fieldDesc = $fieldDescMap[71];
-        $this->assertSame('map_int32_enum', $fieldDesc->getName());
-        $this->assertSame(71, $fieldDesc->getNumber());
-        $this->assertSame(self::GPBLABEL_REPEATED, $fieldDesc->getLabel());
-        $this->assertSame(self::GPBTYPE_MESSAGE, $fieldDesc->getType());
-        $this->assertTrue($fieldDesc->isMap());
-        $mapDesc = $fieldDesc->getMessageType();
-        $this->assertSame('descriptors.TestDescriptorsMessage.MapInt32EnumEntry', $mapDesc->getFullName());
-        $this->assertSame(self::GPBTYPE_INT32, $mapDesc->getField(0)->getType());
-        $this->assertSame(self::GPBTYPE_ENUM, $mapDesc->getField(1)->getType());
-    }
-
-    public function testFieldDescriptorEnumException()
-    {
-        $this->expectException(Exception::class);
-
-        $pool = DescriptorPool::getGeneratedPool();
-        $desc = $pool->getDescriptorByClassName(get_class(new TestDescriptorsMessage()));
-        $fieldDesc = $desc->getField(0);
-        $fieldDesc->getEnumType();
-    }
-
-    public function testFieldDescriptorMessageException()
-    {
-        $this->expectException(Exception::class);
-
-        $pool = DescriptorPool::getGeneratedPool();
-        $desc = $pool->getDescriptorByClassName(get_class(new TestDescriptorsMessage()));
-        $fieldDesc = $desc->getField(0);
-        $fieldDesc->getMessageType();
-    }
-
-    #########################################################
-    # Test oneof descriptor.
-    #########################################################
-
-    public function testOneofDescriptor()
-    {
-        $pool = DescriptorPool::getGeneratedPool();
-        $desc = $pool->getDescriptorByClassName(get_class(new TestDescriptorsMessage()));
-
-        $fieldDescMap = $this->buildFieldMap($desc);
-        $fieldDesc = $fieldDescMap[51];
-
-        $oneofDesc = $desc->getOneofDecl(0);
-
-        $this->assertSame('my_oneof', $oneofDesc->getName());
-        $fieldDescFromOneof = $oneofDesc->getField(0);
-        $this->assertSame($fieldDesc, $fieldDescFromOneof);
-        $this->assertSame(1, $oneofDesc->getFieldCount());
-    }
-
-    private function buildFieldMap($desc)
-    {
-        $fieldDescMap = [];
-        for ($i = 0; $i < $desc->getFieldCount(); $i++) {
-            $fieldDesc = $desc->getField($i);
-            $fieldDescMap[$fieldDesc->getNumber()] = $fieldDesc;
-        }
-        return $fieldDescMap;
-    }
-}
diff --git a/libs/protobuf/php/tests/EncodeDecodeTest.php b/libs/protobuf/php/tests/EncodeDecodeTest.php
deleted file mode 100644
index 33d8da1..0000000
--- a/libs/protobuf/php/tests/EncodeDecodeTest.php
+++ /dev/null
@@ -1,1516 +0,0 @@
-<?php
-
-require_once('test_base.php');
-require_once('test_util.php');
-
-use Google\Protobuf\RepeatedField;
-use Google\Protobuf\GPBType;
-use Foo\TestInt32Value;
-use Foo\TestInt64Value;
-use Foo\TestUInt32Value;
-use Foo\TestUInt64Value;
-use Foo\TestBoolValue;
-use Foo\TestStringValue;
-use Foo\TestBytesValue;
-use Foo\TestAny;
-use Foo\TestEnum;
-use Foo\TestLargeFieldNumber;
-use Foo\TestMessage;
-use Foo\TestMessage\Sub;
-use Foo\TestPackedMessage;
-use Foo\TestRandomFieldOrder;
-use Foo\TestUnpackedMessage;
-use Google\Protobuf\Any;
-use Google\Protobuf\DoubleValue;
-use Google\Protobuf\FieldMask;
-use Google\Protobuf\FloatValue;
-use Google\Protobuf\Int32Value;
-use Google\Protobuf\UInt32Value;
-use Google\Protobuf\Int64Value;
-use Google\Protobuf\UInt64Value;
-use Google\Protobuf\BoolValue;
-use Google\Protobuf\StringValue;
-use Google\Protobuf\BytesValue;
-use Google\Protobuf\Value;
-use Google\Protobuf\ListValue;
-use Google\Protobuf\Struct;
-use Google\Protobuf\GPBEmpty;
-
-class EncodeDecodeTest extends TestBase
-{
-    public function testDecodeJsonSimple()
-    {
-        $m = new TestMessage();
-        $m->mergeFromJsonString("{\"optionalInt32\":1}");
-        $this->assertEquals(1, $m->getOptionalInt32());
-    }
-
-    public function testDecodeJsonUnknown()
-    {
-        $this->expectException(Exception::class);
-
-        $m = new TestMessage();
-        $m->mergeFromJsonString("{\"unknown\":1}");
-    }
-
-    public function testDecodeJsonIgnoreUnknown()
-    {
-        $m = new TestMessage();
-        $m->mergeFromJsonString("{\"unknown\":1}", true);
-        $this->assertEquals("{}", $m->serializeToJsonString());
-    }
-
-    public function testDecodeTopLevelBoolValue()
-    {
-        $m = new BoolValue();
-
-        $m->mergeFromJsonString("true");
-        $this->assertEquals(true, $m->getValue());
-
-        $m->mergeFromJsonString("false");
-        $this->assertEquals(false, $m->getValue());
-    }
-
-    public function testEncodeTopLevelBoolValue()
-    {
-        $m = new BoolValue();
-        $m->setValue(true);
-        $this->assertSame("true", $m->serializeToJsonString());
-    }
-
-    public function testDecodeTopLevelDoubleValue()
-    {
-        $m = new DoubleValue();
-        $m->mergeFromJsonString("1.5");
-        $this->assertEquals(1.5, $m->getValue());
-    }
-
-    public function testEncodeTopLevelDoubleValue()
-    {
-        $m = new DoubleValue();
-        $m->setValue(1.5);
-        $this->assertSame("1.5", $m->serializeToJsonString());
-    }
-
-    public function testDecodeTopLevelFloatValue()
-    {
-        $m = new FloatValue();
-        $m->mergeFromJsonString("1.5");
-        $this->assertEquals(1.5, $m->getValue());
-    }
-
-    public function testEncodeTopLevelFloatValue()
-    {
-        $m = new FloatValue();
-        $m->setValue(1.5);
-        $this->assertSame("1.5", $m->serializeToJsonString());
-    }
-
-    public function testDecodeTopLevelInt32Value()
-    {
-        $m = new Int32Value();
-        $m->mergeFromJsonString("1");
-        $this->assertEquals(1, $m->getValue());
-    }
-
-    public function testEncodeTopLevelInt32Value()
-    {
-        $m = new Int32Value();
-        $m->setValue(1);
-        $this->assertSame("1", $m->serializeToJsonString());
-    }
-
-    public function testDecodeRepeatedInt32Value()
-    {
-        $m = new TestInt32Value();
-        $m->mergeFromJsonString("{\"repeated_field\":[12345]}");
-        $this->assertSame(12345, $m->getRepeatedField()[0]->getValue());
-    }
-
-    public function testDecodeTopLevelUInt32Value()
-    {
-        $m = new UInt32Value();
-        $m->mergeFromJsonString("1");
-        $this->assertEquals(1, $m->getValue());
-    }
-
-    public function testEncodeTopLevelUInt32Value()
-    {
-        $m = new UInt32Value();
-        $m->setValue(1);
-        $this->assertSame("1", $m->serializeToJsonString());
-    }
-
-    public function testDecodeTopLevelInt64Value()
-    {
-        $m = new Int64Value();
-        $m->mergeFromJsonString("1");
-        $this->assertEquals(1, $m->getValue());
-    }
-
-    public function testDecodeTopLevelInt64ValueAsString()
-    {
-        $m = new Int64Value();
-        $m->mergeFromJsonString("\"1\"");
-        $this->assertEquals(1, $m->getValue());
-    }
-
-    public function testEncodeTopLevelInt64Value()
-    {
-        $m = new Int64Value();
-        $m->setValue(1);
-        $this->assertSame("\"1\"", $m->serializeToJsonString());
-    }
-
-    public function testDecodeTopLevelUInt64Value()
-    {
-        $m = new UInt64Value();
-        $m->mergeFromJsonString("1");
-        $this->assertEquals(1, $m->getValue());
-    }
-
-    public function testDecodeTopLevelUInt64ValueAsString()
-    {
-        $m = new UInt64Value();
-        $m->mergeFromJsonString("\"1\"");
-        $this->assertEquals(1, $m->getValue());
-    }
-
-    public function testEncodeTopLevelUInt64Value()
-    {
-        $m = new UInt64Value();
-        $m->setValue(1);
-        $this->assertSame("\"1\"", $m->serializeToJsonString());
-    }
-
-    public function testDecodeTopLevelStringValue()
-    {
-        $m = new StringValue();
-        $m->mergeFromJsonString("\"a\"");
-        $this->assertSame("a", $m->getValue());
-    }
-
-    public function testEncodeTopLevelStringValue()
-    {
-        $m = new StringValue();
-        $m->setValue("a");
-        $this->assertSame("\"a\"", $m->serializeToJsonString());
-    }
-
-    public function testDecodeRepeatedStringValue()
-    {
-        $m = new TestStringValue();
-        $m->mergeFromJsonString("{\"repeated_field\":[\"a\"]}");
-        $this->assertSame("a", $m->getRepeatedField()[0]->getValue());
-    }
-
-    public function testDecodeMapStringValue()
-    {
-        $m = new TestStringValue();
-        $m->mergeFromJsonString("{\"map_field\":{\"1\": \"a\"}}");
-        $this->assertSame("a", $m->getMapField()[1]->getValue());
-    }
-
-    public function testDecodeTopLevelBytesValue()
-    {
-        $m = new BytesValue();
-        $m->mergeFromJsonString("\"YQ==\"");
-        $this->assertSame("a", $m->getValue());
-    }
-
-    public function testEncodeTopLevelBytesValue()
-    {
-        $m = new BytesValue();
-        $m->setValue("a");
-        $this->assertSame("\"YQ==\"", $m->serializeToJsonString());
-    }
-
-    public function generateRandomString($length = 10) {
-        $randomString = str_repeat("+", $length);
-        for ($i = 0; $i < $length; $i++) {
-            $randomString[$i] = chr(rand(0, 255));
-        }
-        return $randomString;
-    }
-
-    public function testEncodeTopLevelLongBytesValue()
-    {
-        $m = new BytesValue();
-        $data = $this->generateRandomString(12007);
-        $m->setValue($data);
-        $expected = "\"" . base64_encode($data) . "\"";
-        $this->assertSame(strlen($expected), strlen($m->serializeToJsonString()));
-    }
-
-    public function testEncode()
-    {
-        $from = new TestMessage();
-        $this->expectEmptyFields($from);
-        $this->setFields($from);
-        $this->expectFields($from);
-
-        $data = $from->serializeToString();
-        $this->assertSame(bin2hex(TestUtil::getGoldenTestMessage()),
-                          bin2hex($data));
-    }
-
-    public function testDecode()
-    {
-        $to = new TestMessage();
-        $to->mergeFromString(TestUtil::getGoldenTestMessage());
-        $this->expectFields($to);
-    }
-
-    public function testEncodeDecode()
-    {
-        $from = new TestMessage();
-        $this->expectEmptyFields($from);
-        $this->setFields($from);
-        $this->expectFields($from);
-
-        $data = $from->serializeToString();
-
-        $to = new TestMessage();
-        $to->mergeFromString($data);
-        $this->expectFields($to);
-    }
-
-    public function testEncodeDecodeEmpty()
-    {
-        $from = new TestMessage();
-        $this->expectEmptyFields($from);
-
-        $data = $from->serializeToString();
-
-        $to = new TestMessage();
-        $to->mergeFromString($data);
-        $this->expectEmptyFields($to);
-    }
-
-    public function testEncodeDecodeOneof()
-    {
-        $m = new TestMessage();
-
-        $m->setOneofInt32(1);
-        $data = $m->serializeToString();
-        $n = new TestMessage();
-        $n->mergeFromString($data);
-        $this->assertSame(1, $n->getOneofInt32());
-
-        $m->setOneofFloat(2.0);
-        $data = $m->serializeToString();
-        $n = new TestMessage();
-        $n->mergeFromString($data);
-        $this->assertSame(2.0, $n->getOneofFloat());
-
-        $m->setOneofString('abc');
-        $data = $m->serializeToString();
-        $n = new TestMessage();
-        $n->mergeFromString($data);
-        $this->assertSame('abc', $n->getOneofString());
-
-        $sub_m = new Sub();
-        $sub_m->setA(1);
-        $m->setOneofMessage($sub_m);
-        $data = $m->serializeToString();
-        $n = new TestMessage();
-        $n->mergeFromString($data);
-        $this->assertSame(1, $n->getOneofMessage()->getA());
-
-        // Encode default value
-        $m->setOneofEnum(TestEnum::ZERO);
-        $data = $m->serializeToString();
-        $n = new TestMessage();
-        $n->mergeFromString($data);
-        $this->assertSame("oneof_enum", $n->getMyOneof());
-        $this->assertSame(TestEnum::ZERO, $n->getOneofEnum());
-
-        $m->setOneofString("");
-        $data = $m->serializeToString();
-        $n = new TestMessage();
-        $n->mergeFromString($data);
-        $this->assertSame("oneof_string", $n->getMyOneof());
-        $this->assertSame("", $n->getOneofString());
-
-        $sub_m = new Sub();
-        $m->setOneofMessage($sub_m);
-        $data = $m->serializeToString();
-        $n = new TestMessage();
-        $n->mergeFromString($data);
-        $this->assertSame("oneof_message", $n->getMyOneof());
-        $this->assertFalse(is_null($n->getOneofMessage()));
-
-    }
-
-    public function testEncodeDecodeOptional()
-    {
-      $m = new TestMessage();
-      $this->assertFalse($m->hasTrueOptionalInt32());
-      $data = $m->serializeToString();
-      $this->assertSame("", $data);
-
-      $m->setTrueOptionalInt32(0);
-      $this->assertTrue($m->hasTrueOptionalInt32());
-      $data = $m->serializeToString();
-      $this->assertNotSame("", $data);
-
-      $m2 = new TestMessage();
-      $m2->mergeFromString($data);
-      $this->assertTrue($m2->hasTrueOptionalInt32());
-      $this->assertSame(0, $m2->getTrueOptionalInt32());
-    }
-
-    public function testJsonEncodeDecodeOptional()
-    {
-      $m = new TestMessage();
-      $this->assertFalse($m->hasTrueOptionalInt32());
-      $data = $m->serializeToJsonString();
-      $this->assertSame("{}", $data);
-
-      $m->setTrueOptionalInt32(0);
-      $this->assertTrue($m->hasTrueOptionalInt32());
-      $data = $m->serializeToJsonString();
-      $this->assertNotSame("{}", $data);
-
-      $m2 = new TestMessage();
-      $m2->mergeFromJsonString($data);
-      $this->assertTrue($m2->hasTrueOptionalInt32());
-      $this->assertSame(0, $m2->getTrueOptionalInt32());
-    }
-
-    public function testJsonEncodeDecodeOneof()
-    {
-        $m = new TestMessage();
-
-        $m->setOneofEnum(TestEnum::ONE);
-        $data = $m->serializeToJsonString();
-        $n = new TestMessage();
-        $n->mergeFromJsonString($data);
-        $this->assertSame("oneof_enum", $n->getMyOneof());
-        $this->assertSame(TestEnum::ONE, $n->getOneofEnum());
-
-        $m->setOneofString("a");
-        $data = $m->serializeToJsonString();
-        $n = new TestMessage();
-        $n->mergeFromJsonString($data);
-        $this->assertSame("oneof_string", $n->getMyOneof());
-        $this->assertSame("a", $n->getOneofString());
-
-        $m->setOneofBytes("bbbb");
-        $data = $m->serializeToJsonString();
-        $n = new TestMessage();
-        $n->mergeFromJsonString($data);
-        $this->assertSame("oneof_bytes", $n->getMyOneof());
-        $this->assertSame("bbbb", $n->getOneofBytes());
-
-        $sub_m = new Sub();
-        $m->setOneofMessage($sub_m);
-        $data = $m->serializeToJsonString();
-        $n = new TestMessage();
-        $n->mergeFromJsonString($data);
-        $this->assertSame("oneof_message", $n->getMyOneof());
-        $this->assertFalse(is_null($n->getOneofMessage()));
-    }
-
-    public function testPackedEncode()
-    {
-        $from = new TestPackedMessage();
-        TestUtil::setTestPackedMessage($from);
-        $this->assertSame(TestUtil::getGoldenTestPackedMessage(),
-                          $from->serializeToString());
-    }
-
-    public function testPackedDecodePacked()
-    {
-        $to = new TestPackedMessage();
-        $to->mergeFromString(TestUtil::getGoldenTestPackedMessage());
-        TestUtil::assertTestPackedMessage($to);
-        $this->assertTrue(true);
-    }
-
-    public function testPackedDecodeUnpacked()
-    {
-        $to = new TestPackedMessage();
-        $to->mergeFromString(TestUtil::getGoldenTestUnpackedMessage());
-        TestUtil::assertTestPackedMessage($to);
-        $this->assertTrue(true);
-    }
-
-    public function testUnpackedEncode()
-    {
-        $from = new TestUnpackedMessage();
-        TestUtil::setTestPackedMessage($from);
-        $this->assertSame(TestUtil::getGoldenTestUnpackedMessage(),
-                          $from->serializeToString());
-    }
-
-    public function testUnpackedDecodePacked()
-    {
-        $to = new TestUnpackedMessage();
-        $to->mergeFromString(TestUtil::getGoldenTestPackedMessage());
-        TestUtil::assertTestPackedMessage($to);
-        $this->assertTrue(true);
-    }
-
-    public function testUnpackedDecodeUnpacked()
-    {
-        $to = new TestUnpackedMessage();
-        $to->mergeFromString(TestUtil::getGoldenTestUnpackedMessage());
-        TestUtil::assertTestPackedMessage($to);
-        $this->assertTrue(true);
-    }
-
-    public function testDecodeInt64()
-    {
-        // Read 64 testing
-        $testVals = array(
-            '10'                 => '100a',
-            '100'                => '1064',
-            '800'                => '10a006',
-            '6400'               => '108032',
-            '70400'              => '1080a604',
-            '774400'             => '1080a22f',
-            '9292800'            => '108098b704',
-            '74342400'           => '1080c0b923',
-            '743424000'          => '108080bfe202',
-            '8177664000'         => '108080b5bb1e',
-            '65421312000'        => '108080a8dbf301',
-            '785055744000'       => '108080e0c7ec16',
-            '9420668928000'      => '10808080dd969202',
-            '103627358208000'    => '10808080fff9c717',
-            '1139900940288000'   => '10808080f5bd978302',
-            '13678811283456000'  => '10808080fce699a618',
-            '109430490267648000' => '10808080e0b7ceb1c201',
-            '984874412408832000' => '10808080e0f5c1bed50d',
-        );
-
-        $msg = new TestMessage();
-        foreach ($testVals as $original => $encoded) {
-            $msg->setOptionalInt64($original);
-            $data = $msg->serializeToString();
-            $this->assertSame($encoded, bin2hex($data));
-            $msg->setOptionalInt64(0);
-            $msg->mergeFromString($data);
-            $this->assertEquals($original, $msg->getOptionalInt64());
-        }
-    }
-
-    public function testDecodeToExistingMessage()
-    {
-        $m1 = new TestMessage();
-        $this->setFields($m1);
-        $this->expectFields($m1);
-
-        $m2 = new TestMessage();
-        $this->setFields2($m2);
-        $data = $m2->serializeToString();
-
-        $m1->mergeFromString($data);
-        $this->expectFieldsMerged($m1);
-    }
-
-    public function testDecodeFieldNonExist()
-    {
-        $data = hex2bin('c80501');
-        $m = new TestMessage();
-        $m->mergeFromString($data);
-        $this->assertTrue(true);
-    }
-
-    public function testEncodeNegativeInt32()
-    {
-        $m = new TestMessage();
-        $m->setOptionalInt32(-1);
-        $data = $m->serializeToString();
-        $this->assertSame("08ffffffffffffffffff01", bin2hex($data));
-    }
-
-    public function testDecodeNegativeInt32()
-    {
-        $m = new TestMessage();
-        $this->assertEquals(0, $m->getOptionalInt32());
-        $m->mergeFromString(hex2bin("08ffffffffffffffffff01"));
-        $this->assertEquals(-1, $m->getOptionalInt32());
-
-        $m = new TestMessage();
-        $this->assertEquals(0, $m->getOptionalInt32());
-        $m->mergeFromString(hex2bin("08ffffffff0f"));
-        $this->assertEquals(-1, $m->getOptionalInt32());
-    }
-
-    public function testRandomFieldOrder()
-    {
-        $m = new TestRandomFieldOrder();
-        $data = $m->serializeToString();
-        $this->assertSame("", $data);
-    }
-
-    public function testLargeFieldNumber()
-    {
-        $m = new TestLargeFieldNumber(['large_field_number' => 5]);
-        $data = $m->serializeToString();
-        $m2 = new TestLargeFieldNumber();
-        $m2->mergeFromString($data);
-        $this->assertSame(5, $m2->getLargeFieldNumber());
-    }
-
-    public function testDecodeInvalidInt32()
-    {
-        $this->expectException(Exception::class);
-
-        $m = new TestMessage();
-        $m->mergeFromString(hex2bin('08'));
-    }
-
-    public function testDecodeInvalidSubMessage()
-    {
-        $this->expectException(Exception::class);
-
-        $m = new TestMessage();
-        $m->mergeFromString(hex2bin('9A010108'));
-    }
-
-    public function testDecodeInvalidInt64()
-    {
-        $this->expectException(Exception::class);
-
-        $m = new TestMessage();
-        $m->mergeFromString(hex2bin('10'));
-    }
-
-    public function testDecodeInvalidUInt32()
-    {
-        $this->expectException(Exception::class);
-
-        $m = new TestMessage();
-        $m->mergeFromString(hex2bin('18'));
-    }
-
-    public function testDecodeInvalidUInt64()
-    {
-        $this->expectException(Exception::class);
-
-        $m = new TestMessage();
-        $m->mergeFromString(hex2bin('20'));
-    }
-
-    public function testDecodeInvalidSInt32()
-    {
-        $this->expectException(Exception::class);
-
-        $m = new TestMessage();
-        $m->mergeFromString(hex2bin('28'));
-    }
-
-    public function testDecodeInvalidSInt64()
-    {
-        $this->expectException(Exception::class);
-
-        $m = new TestMessage();
-        $m->mergeFromString(hex2bin('30'));
-    }
-
-    public function testDecodeInvalidFixed32()
-    {
-        $this->expectException(Exception::class);
-
-        $m = new TestMessage();
-        $m->mergeFromString(hex2bin('3D'));
-    }
-
-    public function testDecodeInvalidFixed64()
-    {
-        $this->expectException(Exception::class);
-
-        $m = new TestMessage();
-        $m->mergeFromString(hex2bin('41'));
-    }
-
-    public function testDecodeInvalidSFixed32()
-    {
-        $this->expectException(Exception::class);
-
-        $m = new TestMessage();
-        $m->mergeFromString(hex2bin('4D'));
-    }
-
-    public function testDecodeInvalidSFixed64()
-    {
-        $this->expectException(Exception::class);
-
-        $m = new TestMessage();
-        $m->mergeFromString(hex2bin('51'));
-    }
-
-    public function testDecodeInvalidFloat()
-    {
-        $this->expectException(Exception::class);
-
-        $m = new TestMessage();
-        $m->mergeFromString(hex2bin('5D'));
-    }
-
-    public function testDecodeInvalidDouble()
-    {
-        $this->expectException(Exception::class);
-
-        $m = new TestMessage();
-        $m->mergeFromString(hex2bin('61'));
-    }
-
-    public function testDecodeInvalidBool()
-    {
-        $this->expectException(Exception::class);
-
-        $m = new TestMessage();
-        $m->mergeFromString(hex2bin('68'));
-    }
-
-    public function testDecodeInvalidStringLengthMiss()
-    {
-        $this->expectException(Exception::class);
-
-        $m = new TestMessage();
-        $m->mergeFromString(hex2bin('72'));
-    }
-
-    public function testDecodeInvalidStringDataMiss()
-    {
-        $this->expectException(Exception::class);
-
-        $m = new TestMessage();
-        $m->mergeFromString(hex2bin('7201'));
-    }
-
-    public function testDecodeInvalidBytesLengthMiss()
-    {
-        $this->expectException(Exception::class);
-
-        $m = new TestMessage();
-        $m->mergeFromString(hex2bin('7A'));
-    }
-
-    public function testDecodeInvalidBytesDataMiss()
-    {
-        $this->expectException(Exception::class);
-
-        $m = new TestMessage();
-        $m->mergeFromString(hex2bin('7A01'));
-    }
-
-    public function testEncodeDecodeValidUtf8()
-    {
-        $m = new TestMessage();
-        $m->mergeFromJsonString("{\"optionalString\":\"\\u1000\"}");
-        $serialized = $m->serializeToString();
-        $m2 = new TestMessage();
-        $m2->mergeFromString($serialized);
-        $this->assertSame($m->getOptionalString(), $m2->getOptionalString());
-    }
-
-    public function testDecodeInvalidEnum()
-    {
-        $this->expectException(Exception::class);
-
-        $m = new TestMessage();
-        $m->mergeFromString(hex2bin('8001'));
-    }
-
-    public function testDecodeInvalidMessageLengthMiss()
-    {
-        $this->expectException(Exception::class);
-
-        $m = new TestMessage();
-        $m->mergeFromString(hex2bin('8A01'));
-    }
-
-    public function testDecodeInvalidMessageDataMiss()
-    {
-        $this->expectException(Exception::class);
-
-        $m = new TestMessage();
-        $m->mergeFromString(hex2bin('8A0101'));
-    }
-
-    public function testDecodeInvalidPackedMessageLength()
-    {
-        $this->expectException(Exception::class);
-
-        $m = new TestPackedMessage();
-        $m->mergeFromString(hex2bin('D205'));
-    }
-
-    public function testUnknown()
-    {
-        // Test preserve unknown for varint.
-        $m = new TestMessage();
-        $from = hex2bin('F80601');  // TODO(teboring): Add a util to encode
-                                    // varint for better readability
-        $m->mergeFromString($from);
-        $to = $m->serializeToString();
-        $this->assertSame(bin2hex($from), bin2hex($to));
-
-        // Test preserve unknown for 64-bit.
-        $m = new TestMessage();
-        $from = hex2bin('F9060000000000000000');
-        $m->mergeFromString($from);
-        $to = $m->serializeToString();
-        $this->assertSame(bin2hex($from), bin2hex($to));
-
-        // Test preserve unknown for length delimited.
-        $m = new TestMessage();
-        $from = hex2bin('FA0600');
-        $m->mergeFromString($from);
-        $to = $m->serializeToString();
-        $this->assertSame(bin2hex($from), bin2hex($to));
-
-        // Test preserve unknown for 32-bit.
-        $m = new TestMessage();
-        $from = hex2bin('FD0600000000');
-        $m->mergeFromString($from);
-        $to = $m->serializeToString();
-        $this->assertSame(bin2hex($from), bin2hex($to));
-
-        // Test discard unknown in message.
-        $m = new TestMessage();
-        $from = hex2bin('F80601');
-        $m->mergeFromString($from);
-        $m->discardUnknownFields();
-        $to = $m->serializeToString();
-        $this->assertSame("", bin2hex($to));
-
-        // Test discard unknown for singular message field.
-        $m = new TestMessage();
-        $from = hex2bin('8A0103F80601');
-        $m->mergeFromString($from);
-        $m->discardUnknownFields();
-        $to = $m->serializeToString();
-        $this->assertSame("8a0100", bin2hex($to));
-
-        // Test discard unknown for repeated message field.
-        $m = new TestMessage();
-        $from = hex2bin('FA0203F80601');
-        $m->mergeFromString($from);
-        $m->discardUnknownFields();
-        $to = $m->serializeToString();
-        $this->assertSame("fa0200", bin2hex($to));
-
-        // Test discard unknown for map message value field.
-        $m = new TestMessage();
-        $from = hex2bin("BA050708011203F80601");
-        $m->mergeFromString($from);
-        $m->discardUnknownFields();
-        $to = $m->serializeToString();
-        $this->assertSame("ba050408011200", bin2hex($to));
-
-        // Test discard unknown for singular message field.
-        $m = new TestMessage();
-        $from = hex2bin('9A0403F80601');
-        $m->mergeFromString($from);
-        $m->discardUnknownFields();
-        $to = $m->serializeToString();
-        $this->assertSame("9a0400", bin2hex($to));
-    }
-
-    public function testJsonUnknown()
-    {
-        // Test unknown number
-        $m = new TestMessage();
-        $m->mergeFromJsonString("{\"unknown\":1,
-                                \"optionalInt32\":1}", true);
-        $this->assertSame(1, $m->getOptionalInt32());
-
-        // Test unknown bool
-        $m = new TestMessage();
-        $m->mergeFromJsonString("{\"unknown\":true,
-                                \"optionalInt32\":1}", true);
-        $this->assertSame(1, $m->getOptionalInt32());
-
-        // Test unknown string
-        $m = new TestMessage();
-        $m->mergeFromJsonString("{\"unknown\":\"abc\",
-                                \"optionalInt32\":1}", true);
-        $this->assertSame(1, $m->getOptionalInt32());
-
-        // Test unknown null
-        $m = new TestMessage();
-        $m->mergeFromJsonString("{\"unknown\":null,
-                                \"optionalInt32\":1}", true);
-        $this->assertSame(1, $m->getOptionalInt32());
-
-        // Test unknown array
-        $m = new TestMessage();
-        $m->mergeFromJsonString("{\"unknown\":[],
-                                \"optionalInt32\":1}", true);
-        $this->assertSame(1, $m->getOptionalInt32());
-
-        // Test unknown number array
-        $m = new TestMessage();
-        $m->mergeFromJsonString("{\"unknown\":[1],
-                                \"optionalInt32\":1}", true);
-        $this->assertSame(1, $m->getOptionalInt32());
-
-        // Test unknown bool array
-        $m = new TestMessage();
-        $m->mergeFromJsonString("{\"unknown\":[true],
-                                \"optionalInt32\":1}", true);
-        $this->assertSame(1, $m->getOptionalInt32());
-
-        // Test unknown string array
-        $m = new TestMessage();
-        $m->mergeFromJsonString("{\"unknown\":[\"a\"],
-                                \"optionalInt32\":1}", true);
-        $this->assertSame(1, $m->getOptionalInt32());
-
-        // Test unknown null array
-        $m = new TestMessage();
-        $m->mergeFromJsonString("{\"unknown\":[null],
-                                \"optionalInt32\":1}", true);
-        $this->assertSame(1, $m->getOptionalInt32());
-
-        // Test unknown array array
-        $m = new TestMessage();
-        $m->mergeFromJsonString("{\"unknown\":[[]],
-                                \"optionalInt32\":1}", true);
-        $this->assertSame(1, $m->getOptionalInt32());
-
-        // Test unknown object array
-        $m = new TestMessage();
-        $m->mergeFromJsonString("{\"unknown\":[{}],
-                                \"optionalInt32\":1}", true);
-        $this->assertSame(1, $m->getOptionalInt32());
-
-        // Test unknown double value array
-        $m = new TestMessage();
-        $m->mergeFromJsonString("{\"unknown\":[1, 2],
-                                \"optionalInt32\":1}", true);
-        $this->assertSame(1, $m->getOptionalInt32());
-
-        // Test unknown object
-        $m = new TestMessage();
-        $m->mergeFromJsonString("{\"unknown\":{},
-                                \"optionalInt32\":1}", true);
-        $this->assertSame(1, $m->getOptionalInt32());
-
-        // Test unknown number object
-        $m = new TestMessage();
-        $m->mergeFromJsonString("{\"unknown\":{\"a\":1},
-                                \"optionalInt32\":1}", true);
-        $this->assertSame(1, $m->getOptionalInt32());
-
-        // Test unknown bool object
-        $m = new TestMessage();
-        $m->mergeFromJsonString("{\"unknown\":{\"a\":true},
-                                \"optionalInt32\":1}", true);
-        $this->assertSame(1, $m->getOptionalInt32());
-
-        // Test unknown string object
-        $m = new TestMessage();
-        $m->mergeFromJsonString("{\"unknown\":{\"a\":\"a\"},
-                                \"optionalInt32\":1}", true);
-        $this->assertSame(1, $m->getOptionalInt32());
-
-        // Test unknown null object
-        $m = new TestMessage();
-        $m->mergeFromJsonString("{\"unknown\":{\"a\":null},
-                                \"optionalInt32\":1}", true);
-        $this->assertSame(1, $m->getOptionalInt32());
-
-        // Test unknown array object
-        $m = new TestMessage();
-        $m->mergeFromJsonString("{\"unknown\":{\"a\":[]},
-                                \"optionalInt32\":1}", true);
-        $this->assertSame(1, $m->getOptionalInt32());
-
-        // Test unknown object object
-        $m = new TestMessage();
-        $m->mergeFromJsonString("{\"unknown\":{\"a\":{}},
-                                \"optionalInt32\":1}", true);
-        $this->assertSame(1, $m->getOptionalInt32());
-
-        // Test unknown double value object
-        $m = new TestMessage();
-        $m->mergeFromJsonString("{\"unknown\":{\"a\":1, \"b\":1},
-                                \"optionalInt32\":1}", true);
-        $this->assertSame(1, $m->getOptionalInt32());
-
-        // Test unknown enum value
-        $m = new TestMessage();
-        $m->mergeFromJsonString("{\"optionalEnum\":\"UNKNOWN\"}", true);
-        $this->assertSame(0, $m->getOptionalEnum());
-    }
-
-    public function testJsonEncode()
-    {
-        $from = new TestMessage();
-        $this->setFields($from);
-        $data = $from->serializeToJsonString();
-        $to = new TestMessage();
-        $to->mergeFromJsonString($data);
-        $this->expectFields($to);
-    }
-
-    public function testJsonEncodeNullSubMessage()
-    {
-        $from = new TestMessage();
-        $from->setOptionalMessage(null);
-        $data = $from->serializeToJsonString();
-        $this->assertEquals("{}", $data);
-    }
-
-    public function testDecodeDuration()
-    {
-        $m = new Google\Protobuf\Duration();
-        $m->mergeFromJsonString("\"1234.5678s\"");
-        $this->assertEquals(1234, $m->getSeconds());
-        $this->assertEquals(567800000, $m->getNanos());
-    }
-
-    public function testEncodeDuration()
-    {
-        $m = new Google\Protobuf\Duration();
-        $m->setSeconds(1234);
-        $m->setNanos(999999999);
-        $this->assertEquals("\"1234.999999999s\"", $m->serializeToJsonString());
-    }
-
-    public function testDecodeTimestamp()
-    {
-        $m = new Google\Protobuf\Timestamp();
-        $m->mergeFromJsonString("\"2000-01-01T00:00:00.123456789Z\"");
-        $this->assertEquals(946684800, $m->getSeconds());
-        $this->assertEquals(123456789, $m->getNanos());
-    }
-
-    public function testEncodeTimestamp()
-    {
-        $m = new Google\Protobuf\Timestamp();
-        $m->setSeconds(946684800);
-        $m->setNanos(123456789);
-        $this->assertEquals("\"2000-01-01T00:00:00.123456789Z\"",
-                            $m->serializeToJsonString());
-    }
-
-    public function testDecodeTopLevelValue()
-    {
-        $m = new Value();
-        $m->mergeFromJsonString("\"a\"");
-        $this->assertSame("a", $m->getStringValue());
-
-        $m = new Value();
-        $m->mergeFromJsonString("1.5");
-        $this->assertSame(1.5, $m->getNumberValue());
-
-        $m = new Value();
-        $m->mergeFromJsonString("true");
-        $this->assertSame(true, $m->getBoolValue());
-
-        $m = new Value();
-        $m->mergeFromJsonString("null");
-        $this->assertSame("null_value", $m->getKind());
-
-        $m = new Value();
-        $m->mergeFromJsonString("[1]");
-        $this->assertSame("list_value", $m->getKind());
-
-        $m = new Value();
-        $m->mergeFromJsonString("{\"a\":1}");
-        $this->assertSame("struct_value", $m->getKind());
-    }
-
-    public function testEncodeTopLevelValue()
-    {
-        $m = new Value();
-        $m->setStringValue("a");
-        $this->assertSame("\"a\"", $m->serializeToJsonString());
-
-        $m = new Value();
-        $m->setNumberValue(1.5);
-        $this->assertSame("1.5", $m->serializeToJsonString());
-
-        $m = new Value();
-        $m->setBoolValue(true);
-        $this->assertSame("true", $m->serializeToJsonString());
-
-        $m = new Value();
-        $m->setNullValue(0);
-        $this->assertSame("null", $m->serializeToJsonString());
-    }
-
-    public function testDecodeTopLevelListValue()
-    {
-        $m = new ListValue();
-        $m->mergeFromJsonString("[1]");
-        $this->assertSame(1.0, $m->getValues()[0]->getNumberValue());
-    }
-
-    public function testEncodeTopLevelListValue()
-    {
-        $m = new ListValue();
-        $arr = $m->getValues();
-        $sub = new Value();
-        $sub->setNumberValue(1.5);
-        $arr[] = $sub;
-        $this->assertSame("[1.5]", $m->serializeToJsonString());
-    }
-
-    public function testEncodeEmptyListValue()
-    {
-        $m = new Struct();
-        $m->setFields(['test' => (new Value())->setListValue(new ListValue())]);
-        $this->assertSame('{"test":[]}', $m->serializeToJsonString());
-    }
-
-    public function testDecodeTopLevelStruct()
-    {
-        $m = new Struct();
-        $m->mergeFromJsonString("{\"a\":{\"b\":1}}");
-        $this->assertSame(1.0, $m->getFields()["a"]
-                                 ->getStructValue()
-                                 ->getFields()["b"]->getNumberValue());
-    }
-
-    public function testEncodeTopLevelStruct()
-    {
-        $m = new Struct();
-        $map = $m->getFields();
-        $sub = new Value();
-        $sub->setNumberValue(1.5);
-        $map["a"] = $sub;
-        $this->assertSame("{\"a\":1.5}", $m->serializeToJsonString());
-    }
-
-    public function testEncodeEmptyStruct()
-    {
-        $m = new Struct();
-        $m->setFields(['test' => (new Value())->setStructValue(new Struct())]);
-        $this->assertSame('{"test":{}}', $m->serializeToJsonString());
-    }
-
-    public function testDecodeTopLevelAny()
-    {
-        // Make sure packed message has been created at least once.
-        $packed = new TestMessage();
-
-        $m1 = new Any();
-        $m1->mergeFromJsonString(
-            "{\"optionalInt32\": 1, " .
-            "\"@type\":\"type.googleapis.com/foo.TestMessage\"}");
-        $this->assertSame("type.googleapis.com/foo.TestMessage",
-                          $m1->getTypeUrl());
-        $this->assertSame("0801", bin2hex($m1->getValue()));
-
-        $m2 = new Any();
-        $m2->mergeFromJsonString(
-            "{\"@type\":\"type.googleapis.com/foo.TestMessage\", " .
-            "\"optionalInt32\": 1}");
-        $this->assertSame("type.googleapis.com/foo.TestMessage",
-                          $m2->getTypeUrl());
-        $this->assertSame("0801", bin2hex($m2->getValue()));
-
-        $m3 = new Any();
-        $m3->mergeFromJsonString(
-            "{\"optionalInt32\": 1, " .
-            "\"@type\":\"type.googleapis.com/foo.TestMessage\", " .
-            "\"optionalInt64\": 2}");
-        $this->assertSame("type.googleapis.com/foo.TestMessage",
-                          $m3->getTypeUrl());
-        $this->assertSame("08011002", bin2hex($m3->getValue()));
-    }
-
-    public function testDecodeAny()
-    {
-        // Make sure packed message has been created at least once.
-        $packed = new TestMessage();
-
-        $m1 = new TestAny();
-        $m1->mergeFromJsonString(
-            "{\"any\": {\"optionalInt32\": 1, " .
-            "\"@type\":\"type.googleapis.com/foo.TestMessage\"}}");
-        $this->assertSame("type.googleapis.com/foo.TestMessage",
-                          $m1->getAny()->getTypeUrl());
-        $this->assertSame("0801", bin2hex($m1->getAny()->getValue()));
-
-        $m2 = new TestAny();
-        $m2->mergeFromJsonString(
-            "{\"any\":{\"@type\":\"type.googleapis.com/foo.TestMessage\", " .
-            "\"optionalInt32\": 1}}");
-        $this->assertSame("type.googleapis.com/foo.TestMessage",
-                          $m2->getAny()->getTypeUrl());
-        $this->assertSame("0801", bin2hex($m2->getAny()->getValue()));
-
-        $m3 = new TestAny();
-        $m3->mergeFromJsonString(
-            "{\"any\":{\"optionalInt32\": 1, " .
-            "\"@type\":\"type.googleapis.com/foo.TestMessage\", " .
-            "\"optionalInt64\": 2}}");
-        $this->assertSame("type.googleapis.com/foo.TestMessage",
-                          $m3->getAny()->getTypeUrl());
-        $this->assertSame("08011002", bin2hex($m3->getAny()->getValue()));
-    }
-
-    public function testDecodeAnyWithWellKnownPacked()
-    {
-        // Make sure packed message has been created at least once.
-        $packed = new Int32Value();
-
-        $m1 = new TestAny();
-        $m1->mergeFromJsonString(
-            "{\"any\":" .
-            "  {\"@type\":\"type.googleapis.com/google.protobuf.Int32Value\"," .
-            "   \"value\":1}}");
-        $this->assertSame("type.googleapis.com/google.protobuf.Int32Value",
-                          $m1->getAny()->getTypeUrl());
-        $this->assertSame("0801", bin2hex($m1->getAny()->getValue()));
-    }
-
-    public function testDecodeAnyWithUnknownPacked()
-    {
-        $this->expectException(Exception::class);
-
-        $m = new TestAny();
-        $m->mergeFromJsonString(
-            "{\"any\":" .
-            "  {\"@type\":\"type.googleapis.com/unknown\"," .
-            "   \"value\":1}}");
-    }
-
-    public function testEncodeTopLevelAny()
-    {
-        // Test a normal message.
-        $packed = new TestMessage();
-        $packed->setOptionalInt32(123);
-        $packed->setOptionalString("abc");
-
-        $m = new Any();
-        $m->pack($packed);
-        $expected1 =
-            "{\"@type\":\"type.googleapis.com/foo.TestMessage\"," .
-            "\"optional_int32\":123,\"optional_string\":\"abc\"}";
-        $expected2 =
-            "{\"@type\":\"type.googleapis.com/foo.TestMessage\"," .
-            "\"optionalInt32\":123,\"optionalString\":\"abc\"}";
-        $result = $m->serializeToJsonString();
-        $this->assertTrue($expected1 === $result || $expected2 === $result);
-
-        // Test a well known message.
-        $packed = new Int32Value();
-        $packed->setValue(123);
-
-        $m = new Any();
-        $m->pack($packed);
-        $this->assertSame(
-            "{\"@type\":\"type.googleapis.com/google.protobuf.Int32Value\"," .
-            "\"value\":123}",
-            $m->serializeToJsonString());
-
-        // Test an Any message.
-        $outer = new Any();
-        $outer->pack($m);
-        $this->assertSame(
-            "{\"@type\":\"type.googleapis.com/google.protobuf.Any\"," .
-            "\"value\":{\"@type\":\"type.googleapis.com/google.protobuf.Int32Value\"," .
-            "\"value\":123}}",
-            $outer->serializeToJsonString());
-
-        // Test a Timestamp message.
-        $packed = new Google\Protobuf\Timestamp();
-        $packed->setSeconds(946684800);
-        $packed->setNanos(123456789);
-        $m = new Any();
-        $m->pack($packed);
-        $this->assertSame(
-            "{\"@type\":\"type.googleapis.com/google.protobuf.Timestamp\"," .
-            "\"value\":\"2000-01-01T00:00:00.123456789Z\"}",
-            $m->serializeToJsonString());
-    }
-
-    public function testEncodeAnyWithDefaultWrapperMessagePacked()
-    {
-        $any = new Any();
-        $any->pack(new TestInt32Value([
-            'field' => new Int32Value(['value' => 0]),
-        ]));
-        $this->assertSame(
-            "{\"@type\":\"type.googleapis.com/foo.TestInt32Value\"," .
-            "\"field\":0}",
-            $any->serializeToJsonString());
-    }
-
-    public function testDecodeTopLevelFieldMask()
-    {
-        $m = new TestMessage();
-        $m->setMapStringString(['a'=>'abcdefg']);
-        $data1 = $m->serializeToJsonString();
-        $n = new TestMessage();
-        $n->mergeFromJsonString($data1);
-        $data2 = $n->serializeToJsonString();
-        $this->assertSame($data1, $data2);
-
-        $m = new FieldMask();
-        $m->mergeFromJsonString("\"foo.barBaz,qux\"");
-        $this->assertSame("foo.bar_baz", $m->getPaths()[0]);
-        $this->assertSame("qux", $m->getPaths()[1]);
-    }
-
-    public function testEncodeTopLevelFieldMask()
-    {
-        $m = new FieldMask();
-        $m->setPaths(["foo.bar_baz", "qux"]);
-        $this->assertSame("\"foo.barBaz,qux\"", $m->serializeToJsonString());
-    }
-
-    public function testDecodeEmptyFieldMask()
-    {
-        $m = new FieldMask();
-        $m->mergeFromJsonString("\"\"");
-        $this->assertEquals("", $m->serializeToString());
-    }
-
-    public function testJsonDecodeMapWithDefaultValueKey()
-    {
-        $m = new TestMessage();
-        $m->getMapInt32Int32()[0] = 0;
-        $this->assertSame("{\"mapInt32Int32\":{\"0\":0}}",
-                          $m->serializeToJsonString());
-
-        $m = new TestMessage();
-        $m->getMapStringString()[""] = "";
-        $this->assertSame("{\"mapStringString\":{\"\":\"\"}}",
-                          $m->serializeToJsonString());
-    }
-
-    public function testJsonDecodeNumericStringMapKey()
-    {
-        $m = new TestMessage();
-        $m->getMapStringString()["1"] = "1";
-        $data = $m->serializeToJsonString();
-        $this->assertSame("{\"mapStringString\":{\"1\":\"1\"}}", $data);
-        $n = new TestMessage();
-        $n->mergeFromJsonString($data);
-    }
-
-    public function testMessageMapNoValue()
-    {
-        $m = new TestMessage();
-        $m->mergeFromString(hex2bin("CA0700"));
-        $m->serializeToString();
-        $this->assertTrue(true);
-    }
-
-    public function testAnyMapNoValue()
-    {
-        $m = new TestMessage();
-        $m->mergeFromString(hex2bin("D20700"));
-        $m->serializeToString();
-        $this->assertTrue(true);
-    }
-
-    public function testListValueMapNoValue()
-    {
-        $m = new TestMessage();
-        $m->mergeFromString(hex2bin("DA0700"));
-        $m->serializeToString();
-        $this->assertTrue(true);
-    }
-
-    public function testStructMapNoValue()
-    {
-        $m = new TestMessage();
-        $m->mergeFromString(hex2bin("E20700"));
-        $m->serializeToString();
-        $this->assertTrue(true);
-    }
-
-    /**
-     * @dataProvider wrappersDataProvider
-     */
-    public function testWrapperJsonDecodeAndGet(
-        $class,
-        $nonDefaultValue,
-        $nonDefaultValueData,
-        $defaultValue,
-        $defaultValueData
-    )
-    {
-        // Singular with non-default
-        $m = new $class();
-        $m->mergeFromJsonString("{\"field\":" . $nonDefaultValueData . "}");
-        $wrapper = $m->getField();
-        $this->assertEquals($nonDefaultValue, $wrapper->getValue());
-
-        // Singular with default
-        $m = new $class();
-        $m->mergeFromJsonString("{\"field\":" . $defaultValueData . "}");
-        $wrapper = $m->getField();
-        $this->assertEquals($defaultValue, $wrapper->getValue());
-
-        // Repeated with empty
-        $m = new $class();
-        $m->mergeFromJsonString("{\"repeated_field\":[]}");
-        $repeatedWrapper = $m->getRepeatedField();
-        $this->assertSame(0, count($repeatedWrapper));
-
-        // Repeated with non-default
-        $m = new $class();
-        $m->mergeFromJsonString("{\"repeated_field\":[" . $defaultValueData . "]}");
-        $repeatedWrapper = $m->getRepeatedField();
-        $this->assertSame(1, count($repeatedWrapper));
-        $this->assertEquals($defaultValue, $repeatedWrapper[0]->getValue());
-
-        // Repeated with default
-        $m = new $class();
-        $m->mergeFromJsonString("{\"repeated_field\":[" . $defaultValueData . "]}");
-        $repeatedWrapper = $m->getRepeatedField();
-        $this->assertSame(1, count($repeatedWrapper));
-        $this->assertEquals($defaultValue, $repeatedWrapper[0]->getValue());
-
-        // Oneof with non-default
-        $m = new $class();
-        $m->mergeFromJsonString("{\"oneof_field\":" . $nonDefaultValueData . "}");
-        $wrapper = $m->getOneofField();
-        $this->assertEquals($nonDefaultValue, $wrapper->getValue());
-        $this->assertEquals("oneof_field", $m->getOneofFields());
-        $this->assertEquals(0, $m->getInt32Field());
-
-        // Oneof with default
-        $m = new $class();
-        $m->mergeFromJsonString("{\"oneof_field\":" . $defaultValueData . "}");
-        $wrapper = $m->getOneofField();
-        $this->assertEquals($defaultValue, $wrapper->getValue());
-        $this->assertEquals("oneof_field", $m->getOneofFields());
-        $this->assertEquals(0, $m->getInt32Field());
-    }
-
-    /**
-     * @dataProvider wrappersDataProvider
-     */
-    public function testWrapperJsonDecodeAndGetUnwrapped(
-        $class,
-        $nonDefaultValue,
-        $nonDefaultValueData,
-        $defaultValue,
-        $defaultValueData
-    )
-    {
-        // Singular with non-default
-        $m = new $class();
-        $m->mergeFromJsonString("{\"field\":" . $nonDefaultValueData . "}");
-        $this->assertEquals($nonDefaultValue, $m->getFieldUnwrapped());
-
-        // Singular with default
-        $m = new $class();
-        $m->mergeFromJsonString("{\"field\":" . $defaultValueData . "}");
-        $this->assertEquals($defaultValue, $m->getFieldUnwrapped());
-
-        // Oneof with non-default
-        $m = new $class();
-        $m->mergeFromJsonString("{\"oneof_field\":" . $nonDefaultValueData . "}");
-        $this->assertEquals($nonDefaultValue, $m->getOneofFieldUnwrapped());
-        $this->assertEquals("oneof_field", $m->getOneofFields());
-        $this->assertEquals(0, $m->getInt32Field());
-
-        // Oneof with default
-        $m = new $class();
-        $m->mergeFromJsonString("{\"oneof_field\":" . $defaultValueData . "}");
-        $this->assertEquals($defaultValue, $m->getOneofFieldUnwrapped());
-        $this->assertEquals("oneof_field", $m->getOneofFields());
-        $this->assertEquals(0, $m->getInt32Field());
-    }
-
-    /**
-     * @dataProvider wrappersDataProvider
-     */
-    public function testWrapperJsonDecodeEncode(
-        $class,
-        $nonDefaultValue,
-        $nonDefaultValueData,
-        $defaultValue,
-        $defaultValueData
-    )
-    {
-        // Singular with non-default
-        $from = new $class();
-        $to = new $class();
-        $from->mergeFromJsonString("{\"field\":" . $nonDefaultValueData . "}");
-        $data = $from->serializeToJsonString();
-        $to->mergeFromJsonString($data);
-        $this->assertEquals($nonDefaultValue, $to->getFieldUnwrapped());
-
-        // Singular with default
-        $from = new $class();
-        $to = new $class();
-        $from->mergeFromJsonString("{\"field\":" . $defaultValueData . "}");
-        $data = $from->serializeToJsonString();
-        $to->mergeFromJsonString($data);
-        $this->assertEquals($defaultValue, $to->getFieldUnwrapped());
-
-        // Oneof with non-default
-        $from = new $class();
-        $to = new $class();
-        $from->mergeFromJsonString("{\"oneof_field\":" . $nonDefaultValueData . "}");
-        $data = $from->serializeToJsonString();
-        $to->mergeFromJsonString($data);
-        $this->assertEquals($nonDefaultValue, $to->getOneofFieldUnwrapped());
-
-        // Oneof with default
-        $from = new $class();
-        $to = new $class();
-        $from->mergeFromJsonString("{\"oneof_field\":" . $defaultValueData . "}");
-        $data = $from->serializeToJsonString();
-        $to->mergeFromJsonString($data);
-        $this->assertEquals($defaultValue, $to->getOneofFieldUnwrapped());
-    }
-
-    /**
-     * @dataProvider wrappersDataProvider
-     */
-    public function testWrapperSetUnwrappedJsonEncode(
-        $class,
-        $nonDefaultValue,
-        $nonDefaultValueData,
-        $defaultValue,
-        $defaultValueData
-    )
-    {
-        // Singular with non-default
-        $from = new $class();
-        $to = new $class();
-        $from->setFieldUnwrapped($nonDefaultValue);
-        $data = $from->serializeToJsonString();
-        $to->mergeFromJsonString($data);
-        $this->assertEquals($nonDefaultValue, $to->getFieldUnwrapped());
-
-        // Singular with default
-        $from = new $class();
-        $to = new $class();
-        $from->setFieldUnwrapped($defaultValue);
-        $data = $from->serializeToJsonString();
-        $to->mergeFromJsonString($data);
-        $this->assertEquals($defaultValue, $to->getFieldUnwrapped());
-
-        // Oneof with non-default
-        $from = new $class();
-        $to = new $class();
-        $from->setOneofFieldUnwrapped($nonDefaultValue);
-        $data = $from->serializeToJsonString();
-        $to->mergeFromJsonString($data);
-        $this->assertEquals($nonDefaultValue, $to->getOneofFieldUnwrapped());
-
-        // Oneof with default
-        $from = new $class();
-        $to = new $class();
-        $from->setOneofFieldUnwrapped($defaultValue);
-        $data = $from->serializeToJsonString();
-        $to->mergeFromJsonString($data);
-        $this->assertEquals($defaultValue, $to->getOneofFieldUnwrapped());
-    }
-
-    public function wrappersDataProvider()
-    {
-        return [
-            [TestInt32Value::class, 1, "1", 0, "0"],
-            [TestStringValue::class, "a", "\"a\"", "", "\"\""],
-        ];
-    }
-}
diff --git a/libs/protobuf/php/tests/GeneratedClassTest.php b/libs/protobuf/php/tests/GeneratedClassTest.php
deleted file mode 100644
index b42649d..0000000
--- a/libs/protobuf/php/tests/GeneratedClassTest.php
+++ /dev/null
@@ -1,1897 +0,0 @@
-<?php
-
-require_once('test_base.php');
-require_once('test_util.php');
-
-use Google\Protobuf\Internal\RepeatedField;
-use Google\Protobuf\Internal\MapField;
-use Google\Protobuf\Internal\GPBType;
-use Bar\TestLegacyMessage;
-use Bar\TestLegacyMessage_NestedEnum;
-use Bar\TestLegacyMessage_NestedMessage;
-use Foo\Test32Fields;
-use Foo\TestEnum;
-use Foo\TestIncludeNamespaceMessage;
-use Foo\TestIncludePrefixMessage;
-use Foo\TestMessage;
-use Foo\TestMessage\Sub;
-use Foo\TestMessage_Sub;
-use Foo\TestMessage\NestedEnum;
-use Foo\TestReverseFieldOrder;
-use Foo\testLowerCaseMessage;
-use Foo\testLowerCaseEnum;
-use PBEmpty\PBEcho\TestEmptyPackage;
-use Php\Test\TestNamespace;
-
-# This is not allowed, but we at least shouldn't crash.
-class C extends \Google\Protobuf\Internal\Message {
-    public function __construct($data = null) {
-        parent::__construct($data);
-    }
-}
-
-class GeneratedClassTest extends TestBase
-{
-
-    #########################################################
-    # Test field accessors.
-    #########################################################
-
-    public function testSetterGetter()
-    {
-        $m = new TestMessage();
-        $m->setOptionalInt32(1);
-        $this->assertSame(1, $m->getOptionalInt32());
-    }
-
-    #########################################################
-    # Test int32 field.
-    #########################################################
-
-    public function testInt32Field()
-    {
-        $m = new TestMessage();
-
-        // Set integer.
-        $m->setOptionalInt32(MAX_INT32);
-        $this->assertSame(MAX_INT32, $m->getOptionalInt32());
-        $m->setOptionalInt32(MIN_INT32);
-        $this->assertSame(MIN_INT32, $m->getOptionalInt32());
-
-        // Set float.
-        $m->setOptionalInt32(1.1);
-        $this->assertSame(1, $m->getOptionalInt32());
-        $m->setOptionalInt32(MAX_INT32_FLOAT);
-        $this->assertSame(MAX_INT32, $m->getOptionalInt32());
-        $m->setOptionalInt32(MIN_INT32_FLOAT);
-        $this->assertSame(MIN_INT32, $m->getOptionalInt32());
-
-        // Set string.
-        $m->setOptionalInt32('2');
-        $this->assertSame(2, $m->getOptionalInt32());
-        $m->setOptionalInt32('3.1');
-        $this->assertSame(3, $m->getOptionalInt32());
-        $m->setOptionalInt32(MAX_INT32_STRING);
-        $this->assertSame(MAX_INT32, $m->getOptionalInt32());
-        $m->setOptionalInt32(MIN_INT32_STRING);
-        $this->assertSame(MIN_INT32, $m->getOptionalInt32());
-    }
-
-    #########################################################
-    # Test deprecated int32 field.
-    #########################################################
-
-    public function testDeprecatedInt32Field()
-    {
-        $m = new TestMessage();
-
-        // temporarily change error handler to capture the deprecated errors
-        $deprecationCount = 0;
-        set_error_handler(function ($errno, $errstr) use (&$deprecationCount) {
-            if ($errstr === 'deprecated_optional_int32 is deprecated.') {
-                $deprecationCount++;
-            }
-        }, E_USER_DEPRECATED);
-
-        // default test set
-        $m->setDeprecatedOptionalInt32(MAX_INT32);
-        $this->assertSame(MAX_INT32, $m->getDeprecatedOptionalInt32());
-        $m->setDeprecatedOptionalInt32(MIN_INT32);
-        $this->assertSame(MIN_INT32, $m->getDeprecatedOptionalInt32());
-
-        restore_error_handler();
-
-        $this->assertSame(4, $deprecationCount);
-    }
-
-    #########################################################
-    # Test optional int32 field.
-    #########################################################
-
-    public function testOptionalInt32Field()
-    {
-        $m = new TestMessage();
-
-        $this->assertFalse($m->hasTrueOptionalInt32());
-        $this->assertSame(0, $m->getTrueOptionalInt32());
-
-        // Set integer.
-        $m->setTrueOptionalInt32(MAX_INT32);
-        $this->assertTrue($m->hasTrueOptionalInt32());
-        $this->assertSame(MAX_INT32, $m->getTrueOptionalInt32());
-
-        // Clear integer.
-        $m->clearTrueOptionalInt32();
-        $this->assertFalse($m->hasTrueOptionalInt32());
-        $this->assertSame(0, $m->getTrueOptionalInt32());
-    }
-
-    #########################################################
-    # Test uint32 field.
-    #########################################################
-
-    public function testUint32Field()
-    {
-        $m = new TestMessage();
-
-        // Set integer.
-        $m->setOptionalUint32(MAX_UINT32);
-        $this->assertSame(-1, $m->getOptionalUint32());
-        $m->setOptionalUint32(-1);
-        $this->assertSame(-1, $m->getOptionalUint32());
-        $m->setOptionalUint32(MIN_UINT32);
-        $this->assertSame(MIN_INT32, $m->getOptionalUint32());
-
-        // Set float.
-        $m->setOptionalUint32(1.1);
-        $this->assertSame(1, $m->getOptionalUint32());
-        $m->setOptionalUint32(MAX_UINT32_FLOAT);
-        $this->assertSame(-1, $m->getOptionalUint32());
-        $m->setOptionalUint32(-1.0);
-        $this->assertSame(-1, $m->getOptionalUint32());
-        $m->setOptionalUint32(MIN_UINT32_FLOAT);
-        $this->assertSame(MIN_INT32, $m->getOptionalUint32());
-
-        // Set string.
-        $m->setOptionalUint32('2');
-        $this->assertSame(2, $m->getOptionalUint32());
-        $m->setOptionalUint32('3.1');
-        $this->assertSame(3, $m->getOptionalUint32());
-        $m->setOptionalUint32(MAX_UINT32_STRING);
-        $this->assertSame(-1, $m->getOptionalUint32());
-        $m->setOptionalUint32('-1.0');
-        $this->assertSame(-1, $m->getOptionalUint32());
-        $m->setOptionalUint32(MIN_UINT32_STRING);
-        $this->assertSame(MIN_INT32, $m->getOptionalUint32());
-    }
-
-    #########################################################
-    # Test int64 field.
-    #########################################################
-
-    public function testInt64Field()
-    {
-        $m = new TestMessage();
-
-        // Set integer.
-        $m->setOptionalInt64(MAX_INT64);
-        $this->assertSame(MAX_INT64, $m->getOptionalInt64());
-        $m->setOptionalInt64(MIN_INT64);
-        $this->assertEquals(MIN_INT64, $m->getOptionalInt64());
-
-        // Set float.
-        $m->setOptionalInt64(1.1);
-        if (PHP_INT_SIZE == 4) {
-            $this->assertSame('1', $m->getOptionalInt64());
-        } else {
-            $this->assertSame(1, $m->getOptionalInt64());
-        }
-
-        // Set string.
-        $m->setOptionalInt64('2');
-        if (PHP_INT_SIZE == 4) {
-            $this->assertSame('2', $m->getOptionalInt64());
-        } else {
-            $this->assertSame(2, $m->getOptionalInt64());
-        }
-
-        $m->setOptionalInt64('3.1');
-        if (PHP_INT_SIZE == 4) {
-            $this->assertSame('3', $m->getOptionalInt64());
-        } else {
-            $this->assertSame(3, $m->getOptionalInt64());
-        }
-
-        $m->setOptionalInt64(MAX_INT64_STRING);
-        if (PHP_INT_SIZE == 4) {
-            $this->assertSame(MAX_INT64_STRING, $m->getOptionalInt64());
-        } else {
-            $this->assertSame(MAX_INT64, $m->getOptionalInt64());
-        }
-
-        $m->setOptionalInt64(MIN_INT64_STRING);
-        if (PHP_INT_SIZE == 4) {
-            $this->assertSame(MIN_INT64_STRING, $m->getOptionalInt64());
-        } else {
-            $this->assertSame(MIN_INT64, $m->getOptionalInt64());
-        }
-    }
-
-    #########################################################
-    # Test uint64 field.
-    #########################################################
-
-    public function testUint64Field()
-    {
-        $m = new TestMessage();
-
-        // Set integer.
-        $m->setOptionalUint64(MAX_UINT64);
-        if (PHP_INT_SIZE == 4) {
-            $this->assertSame(MAX_UINT64_STRING, $m->getOptionalUint64());
-        } else {
-            $this->assertSame(MAX_UINT64, $m->getOptionalUint64());
-        }
-
-        // Set float.
-        $m->setOptionalUint64(1.1);
-        if (PHP_INT_SIZE == 4) {
-            $this->assertSame('1', $m->getOptionalUint64());
-        } else {
-            $this->assertSame(1, $m->getOptionalUint64());
-        }
-
-        // Set string.
-        $m->setOptionalUint64('2');
-        if (PHP_INT_SIZE == 4) {
-            $this->assertSame('2', $m->getOptionalUint64());
-        } else {
-            $this->assertSame(2, $m->getOptionalUint64());
-        }
-
-        $m->setOptionalUint64('3.1');
-        if (PHP_INT_SIZE == 4) {
-            $this->assertSame('3', $m->getOptionalUint64());
-        } else {
-            $this->assertSame(3, $m->getOptionalUint64());
-        }
-
-        $m->setOptionalUint64(MAX_UINT64_STRING);
-        if (PHP_INT_SIZE == 4) {
-            $this->assertSame(MAX_UINT64_STRING, $m->getOptionalUint64());
-        } else {
-            $this->assertSame(MAX_UINT64, $m->getOptionalUint64());
-        }
-    }
-
-    #########################################################
-    # Test enum field.
-    #########################################################
-
-    public function testEnumField()
-    {
-        $m = new TestMessage();
-
-        // Set enum.
-        $m->setOptionalEnum(TestEnum::ONE);
-        $this->assertEquals(TestEnum::ONE, $m->getOptionalEnum());
-
-        // Set integer.
-        $m->setOptionalEnum(1);
-        $this->assertEquals(TestEnum::ONE, $m->getOptionalEnum());
-
-        // Set float.
-        $m->setOptionalEnum(1.1);
-        $this->assertEquals(TestEnum::ONE, $m->getOptionalEnum());
-
-        // Set string.
-        $m->setOptionalEnum("1");
-        $this->assertEquals(TestEnum::ONE, $m->getOptionalEnum());
-
-        // Test Enum methods
-        $this->assertEquals('ONE', TestEnum::name(1));
-        $this->assertEquals(1, TestEnum::value('ONE'));
-        $this->assertEquals('ECHO', TestEnum::name(3));
-        $this->assertEquals(3, TestEnum::value('ECHO'));
-        // Backwards compat value lookup by prefixed-name.
-        $this->assertEquals(3, TestEnum::value('PBECHO'));
-    }
-
-    public function testInvalidEnumValueThrowsException()
-    {
-        $this->expectException(UnexpectedValueException::class);
-        $this->expectExceptionMessage(
-            'Enum Foo\TestEnum has no name defined for value -1');
-
-        TestEnum::name(-1);
-    }
-
-    public function testInvalidEnumNameThrowsException()
-    {
-        $this->expectException(UnexpectedValueException::class);
-        $this->expectExceptionMessage(
-            'Enum Foo\TestEnum has no value defined for name DOES_NOT_EXIST');
-
-        TestEnum::value('DOES_NOT_EXIST');
-    }
-
-    public function testNestedEnum()
-    {
-        $m = new TestMessage();
-        $m->setOptionalNestedEnum(NestedEnum::ZERO);
-        $this->assertTrue(true);
-    }
-
-    public function testLegacyNestedEnum()
-    {
-        $m = new TestMessage();
-        $m->setOptionalNestedEnum(\Foo\TestMessage_NestedEnum::ZERO);
-        $this->assertTrue(true);
-    }
-
-    public function testLegacyTypehintWithNestedEnums()
-    {
-        $this->legacyEnum(new TestLegacyMessage\NestedEnum);
-    }
-
-    public function testLegacyReadOnlyMessage()
-    {
-        $this->assertTrue(class_exists('\Upper\READONLY'));
-        $this->assertTrue(class_exists('\Lower\readonly'));
-        $this->assertTrue(class_exists('\Php\Test\TestNamespace\PBEmpty\ReadOnly'));
-    }
-
-    public function testLegacyReadOnlyEnum()
-    {
-        $this->assertTrue(class_exists('\Upper_enum\READONLY'));
-        $this->assertTrue(class_exists('\Lower_enum\readonly'));
-    }
-
-    private function legacyEnum(TestLegacyMessage_NestedEnum $enum)
-    {
-        // If we made it here without a PHP Fatal error, the typehint worked
-        $this->assertTrue(true);
-    }
-
-    #########################################################
-    # Test float field.
-    #########################################################
-
-    public function testFloatField()
-    {
-        $m = new TestMessage();
-
-        // Set integer.
-        $m->setOptionalFloat(1);
-        $this->assertFloatEquals(1.0, $m->getOptionalFloat(), MAX_FLOAT_DIFF);
-
-        // Set float.
-        $m->setOptionalFloat(1.1);
-        $this->assertFloatEquals(1.1, $m->getOptionalFloat(), MAX_FLOAT_DIFF);
-
-        // Set string.
-        $m->setOptionalFloat('2');
-        $this->assertFloatEquals(2.0, $m->getOptionalFloat(), MAX_FLOAT_DIFF);
-        $m->setOptionalFloat('3.1');
-        $this->assertFloatEquals(3.1, $m->getOptionalFloat(), MAX_FLOAT_DIFF);
-    }
-
-    #########################################################
-    # Test double field.
-    #########################################################
-
-    public function testDoubleField()
-    {
-        $m = new TestMessage();
-
-        // Set integer.
-        $m->setOptionalDouble(1);
-        $this->assertFloatEquals(1.0, $m->getOptionalDouble(), MAX_FLOAT_DIFF);
-
-        // Set float.
-        $m->setOptionalDouble(1.1);
-        $this->assertFloatEquals(1.1, $m->getOptionalDouble(), MAX_FLOAT_DIFF);
-
-        // Set string.
-        $m->setOptionalDouble('2');
-        $this->assertFloatEquals(2.0, $m->getOptionalDouble(), MAX_FLOAT_DIFF);
-        $m->setOptionalDouble('3.1');
-        $this->assertFloatEquals(3.1, $m->getOptionalDouble(), MAX_FLOAT_DIFF);
-    }
-
-    #########################################################
-    # Test bool field.
-    #########################################################
-
-    public function testBoolField()
-    {
-        $m = new TestMessage();
-
-        // Set bool.
-        $m->setOptionalBool(true);
-        $this->assertSame(true, $m->getOptionalBool());
-
-        // Set integer.
-        $m->setOptionalBool(-1);
-        $this->assertSame(true, $m->getOptionalBool());
-
-        // Set float.
-        $m->setOptionalBool(1.1);
-        $this->assertSame(true, $m->getOptionalBool());
-
-        // Set string.
-        $m->setOptionalBool('');
-        $this->assertSame(false, $m->getOptionalBool());
-    }
-
-    #########################################################
-    # Test string field.
-    #########################################################
-
-    public function testStringField()
-    {
-        $m = new TestMessage();
-
-        // Set string.
-        $m->setOptionalString('abc');
-        $this->assertSame('abc', $m->getOptionalString());
-
-        // Set integer.
-        $m->setOptionalString(1);
-        $this->assertSame('1', $m->getOptionalString());
-
-        // Set double.
-        $m->setOptionalString(1.1);
-        $this->assertSame('1.1', $m->getOptionalString());
-
-        // Set bool.
-        $m->setOptionalString(true);
-        $this->assertSame('1', $m->getOptionalString());
-    }
-
-    #########################################################
-    # Test bytes field.
-    #########################################################
-
-    public function testBytesField()
-    {
-        $m = new TestMessage();
-
-        // Set string.
-        $m->setOptionalBytes('abc');
-        $this->assertSame('abc', $m->getOptionalBytes());
-
-        // Set integer.
-        $m->setOptionalBytes(1);
-        $this->assertSame('1', $m->getOptionalBytes());
-
-        // Set double.
-        $m->setOptionalBytes(1.1);
-        $this->assertSame('1.1', $m->getOptionalBytes());
-
-        // Set bool.
-        $m->setOptionalBytes(true);
-        $this->assertSame('1', $m->getOptionalBytes());
-    }
-
-      public function testBytesFieldInvalidUTF8Success()
-      {
-          $m = new TestMessage();
-          $hex = hex2bin("ff");
-          $m->setOptionalBytes($hex);
-          $this->assertTrue(true);
-      }
-
-    #########################################################
-    # Test message field.
-    #########################################################
-
-    public function testMessageField()
-    {
-        $m = new TestMessage();
-
-        $this->assertNull($m->getOptionalMessage());
-
-        $sub_m = new Sub();
-        $sub_m->setA(1);
-        $m->setOptionalMessage($sub_m);
-        $this->assertSame(1, $m->getOptionalMessage()->getA());
-        $this->assertTrue($m->hasOptionalMessage());
-
-        $null = null;
-        $m->setOptionalMessage($null);
-        $this->assertNull($m->getOptionalMessage());
-        $this->assertFalse($m->hasOptionalMessage());
-    }
-
-    public function testLegacyMessageField()
-    {
-        $m = new TestMessage();
-
-        $sub_m = new TestMessage_Sub();
-        $sub_m->setA(1);
-        $m->setOptionalMessage($sub_m);
-        $this->assertSame(1, $m->getOptionalMessage()->getA());
-
-        $null = null;
-        $m->setOptionalMessage($null);
-        $this->assertNull($m->getOptionalMessage());
-    }
-
-    public function testLegacyTypehintWithNestedMessages()
-    {
-        $this->legacyMessage(new TestLegacyMessage\NestedMessage);
-    }
-
-    private function legacyMessage(TestLegacyMessage_NestedMessage $sub)
-    {
-        // If we made it here without a PHP Fatal error, the typehint worked
-        $this->assertTrue(true);
-    }
-
-    #########################################################
-    # Test repeated field.
-    #########################################################
-
-    public function testRepeatedField()
-    {
-        $m = new TestMessage();
-
-        $repeated_int32 = new RepeatedField(GPBType::INT32);
-        $m->setRepeatedInt32($repeated_int32);
-        $this->assertSame($repeated_int32, $m->getRepeatedInt32());
-    }
-
-    public function testRepeatedFieldViaArray()
-    {
-        $m = new TestMessage();
-
-        $arr = array();
-        $m->setRepeatedInt32($arr);
-        $this->assertSame(0, count($m->getRepeatedInt32()));
-
-        $arr = array(1, 2.1, "3");
-        $m->setRepeatedInt32($arr);
-        $this->assertTrue($m->getRepeatedInt32() instanceof RepeatedField);
-        $this->assertSame("Google\Protobuf\Internal\RepeatedField",
-                          get_class($m->getRepeatedInt32()));
-        $this->assertSame(3, count($m->getRepeatedInt32()));
-        $this->assertSame(1, $m->getRepeatedInt32()[0]);
-        $this->assertSame(2, $m->getRepeatedInt32()[1]);
-        $this->assertSame(3, $m->getRepeatedInt32()[2]);
-        $this->assertFalse($arr instanceof RepeatedField);
-    }
-
-    #########################################################
-    # Test map field.
-    #########################################################
-
-    public function testMapField()
-    {
-        $m = new TestMessage();
-
-        $map_int32_int32 = new MapField(GPBType::INT32, GPBType::INT32);
-        $m->setMapInt32Int32($map_int32_int32);
-        $this->assertSame($map_int32_int32, $m->getMapInt32Int32());
-    }
-
-    public function testMapFieldViaArray()
-    {
-        $m = new TestMessage();
-
-        $dict = array();
-        $m->setMapInt32Int32($dict);
-        $this->assertSame(0, count($m->getMapInt32Int32()));
-
-        $dict = array(5 => 5, 6 => 6.1, "7" => "7");
-        $m->setMapInt32Int32($dict);
-        $this->assertTrue($m->getMapInt32Int32() instanceof MapField);
-        $this->assertSame(3, count($m->getMapInt32Int32()));
-        $this->assertSame(5, $m->getMapInt32Int32()[5]);
-        $this->assertSame(6, $m->getMapInt32Int32()[6]);
-        $this->assertSame(7, $m->getMapInt32Int32()[7]);
-        $this->assertFalse($dict instanceof MapField);
-    }
-
-    #########################################################
-    # Test oneof field.
-    #########################################################
-
-    public function testOneofField() {
-        $m = new TestMessage();
-
-        $this->assertSame("", $m->getMyOneof());
-
-        $m->setOneofInt32(1);
-        $this->assertSame(1, $m->getOneofInt32());
-        $this->assertSame(0.0, $m->getOneofFloat());
-        $this->assertSame('', $m->getOneofString());
-        $this->assertSame(NULL, $m->getOneofMessage());
-        $this->assertSame("oneof_int32", $m->getMyOneof());
-
-        $m->setOneofFloat(2.0);
-        $this->assertSame(0, $m->getOneofInt32());
-        $this->assertSame(2.0, $m->getOneofFloat());
-        $this->assertSame('', $m->getOneofString());
-        $this->assertSame(NULL, $m->getOneofMessage());
-        $this->assertSame("oneof_float", $m->getMyOneof());
-
-        $m->setOneofString('abc');
-        $this->assertSame(0, $m->getOneofInt32());
-        $this->assertSame(0.0, $m->getOneofFloat());
-        $this->assertSame('abc', $m->getOneofString());
-        $this->assertSame(NULL, $m->getOneofMessage());
-        $this->assertSame("oneof_string", $m->getMyOneof());
-
-        $sub_m = new Sub();
-        $sub_m->setA(1);
-        $m->setOneofMessage($sub_m);
-        $this->assertSame(0, $m->getOneofInt32());
-        $this->assertSame(0.0, $m->getOneofFloat());
-        $this->assertSame('', $m->getOneofString());
-        $this->assertSame(1, $m->getOneofMessage()->getA());
-        $this->assertSame("oneof_message", $m->getMyOneof());
-    }
-
-    #########################################################
-    # Test clear method.
-    #########################################################
-
-    public function testMessageClear()
-    {
-        $m = new TestMessage();
-        $this->setFields($m);
-        $this->expectFields($m);
-        $m->clear();
-        $this->expectEmptyFields($m);
-    }
-
-    #########################################################
-    # Test mergeFrom method.
-    #########################################################
-
-    public function testMessageMergeFrom()
-    {
-        $m = new TestMessage();
-        $this->setFields($m);
-        $this->expectFields($m);
-        $arr = $m->getOptionalMessage()->getB();
-        $arr[] = 1;
-
-        $n = new TestMessage();
-
-        // Singular
-        $n->setOptionalInt32(100);
-        $sub1 = new Sub();
-        $sub1->setA(101);
-
-        $b = $sub1->getB();
-        $b[] = 102;
-        $sub1->setB($b);
-
-        $n->setOptionalMessage($sub1);
-
-        // Repeated
-        $repeatedInt32 = $n->getRepeatedInt32();
-        $repeatedInt32[] = 200;
-        $n->setRepeatedInt32($repeatedInt32);
-
-        $repeatedString = $n->getRepeatedString();
-        $repeatedString[] = 'abc';
-        $n->setRepeatedString($repeatedString);
-
-        $sub2 = new Sub();
-        $sub2->setA(201);
-        $repeatedMessage = $n->getRepeatedMessage();
-        $repeatedMessage[] = $sub2;
-        $n->setRepeatedMessage($repeatedMessage);
-
-        // Map
-        $mapInt32Int32 = $n->getMapInt32Int32();
-        $mapInt32Int32[1] = 300;
-        $mapInt32Int32[-62] = 301;
-        $n->setMapInt32Int32($mapInt32Int32);
-
-        $mapStringString = $n->getMapStringString();
-        $mapStringString['def'] = 'def';
-        $n->setMapStringString($mapStringString);
-
-        $mapInt32Message = $n->getMapInt32Message();
-        $mapInt32Message[1] = new Sub();
-        $mapInt32Message[1]->setA(302);
-        $mapInt32Message[2] = new Sub();
-        $mapInt32Message[2]->setA(303);
-        $n->setMapInt32Message($mapInt32Message);
-
-        $m->mergeFrom($n);
-
-        $this->assertSame(100, $m->getOptionalInt32());
-        $this->assertSame(42, $m->getOptionalUint32());
-        $this->assertSame(101, $m->getOptionalMessage()->getA());
-        $this->assertSame(2, count($m->getOptionalMessage()->getB()));
-        $this->assertSame(1, $m->getOptionalMessage()->getB()[0]);
-        $this->assertSame(102, $m->getOptionalMessage()->getB()[1]);
-
-        $this->assertSame(3, count($m->getRepeatedInt32()));
-        $this->assertSame(200, $m->getRepeatedInt32()[2]);
-        $this->assertSame(2, count($m->getRepeatedUint32()));
-        $this->assertSame(3, count($m->getRepeatedString()));
-        $this->assertSame('abc', $m->getRepeatedString()[2]);
-        $this->assertSame(3, count($m->getRepeatedMessage()));
-        $this->assertSame(201, $m->getRepeatedMessage()[2]->getA());
-
-        $this->assertSame(2, count($m->getMapInt32Int32()));
-        $this->assertSame(300, $m->getMapInt32Int32()[1]);
-        $this->assertSame(301, $m->getMapInt32Int32()[-62]);
-        $this->assertSame(1, count($m->getMapUint32Uint32()));
-        $this->assertSame(2, count($m->getMapStringString()));
-        $this->assertSame('def', $m->getMapStringString()['def']);
-
-        $this->assertSame(2, count($m->getMapInt32Message()));
-        $this->assertSame(302, $m->getMapInt32Message()[1]->getA());
-        $this->assertSame(303, $m->getMapInt32Message()[2]->getA());
-
-        $this->assertSame("", $m->getMyOneof());
-
-        // Check sub-messages are copied by value.
-        $n->getOptionalMessage()->setA(-101);
-        $this->assertSame(101, $m->getOptionalMessage()->getA());
-
-        $repeatedMessage = $n->getRepeatedMessage();
-        $repeatedMessage[0]->setA(-201);
-        $n->setRepeatedMessage($repeatedMessage);
-        $this->assertSame(201, $m->getRepeatedMessage()[2]->getA());
-
-        $mapInt32Message = $n->getMapInt32Message();
-        $mapInt32Message[1]->setA(-302);
-        $n->setMapInt32Message($mapInt32Message);
-
-        $this->assertSame(302, $m->getMapInt32Message()[1]->getA());
-
-        // Test merge oneof.
-        $m = new TestMessage();
-
-        $n = new TestMessage();
-        $n->setOneofInt32(1);
-        $m->mergeFrom($n);
-        $this->assertSame(1, $m->getOneofInt32());
-
-        $sub = new Sub();
-        $n->setOneofMessage($sub);
-        $n->getOneofMessage()->setA(400);
-        $m->mergeFrom($n);
-        $this->assertSame(400, $m->getOneofMessage()->getA());
-        $n->getOneofMessage()->setA(-400);
-        $this->assertSame(400, $m->getOneofMessage()->getA());
-
-        // Test all fields
-        $m = new TestMessage();
-        $n = new TestMessage();
-        $this->setFields($m);
-        $n->mergeFrom($m);
-        $this->expectFields($n);
-    }
-
-    #########################################################
-    # Test message/enum without namespace.
-    #########################################################
-
-    public function testMessageWithoutNamespace()
-    {
-        $m = new TestMessage();
-        $n = new NoNamespaceMessage();
-        $m->setOptionalNoNamespaceMessage($n);
-        $repeatedNoNamespaceMessage = $m->getRepeatedNoNamespaceMessage();
-        $repeatedNoNamespaceMessage[] = new NoNamespaceMessage();
-        $m->setRepeatedNoNamespaceMessage($repeatedNoNamespaceMessage);
-
-        // test nested messages
-        $sub = new NoNamespaceMessage\NestedMessage();
-        $n->setNestedMessage($sub);
-
-        $this->assertTrue(true);
-    }
-
-    public function testEnumWithoutNamespace()
-    {
-        $m = new TestMessage();
-        $m->setOptionalNoNamespaceEnum(NoNamespaceEnum::VALUE_A);
-        $repeatedNoNamespaceEnum = $m->getRepeatedNoNamespaceEnum();
-        $repeatedNoNamespaceEnum[] = NoNamespaceEnum::VALUE_A;
-        $m->setRepeatedNoNamespaceEnum($repeatedNoNamespaceEnum);
-        $this->assertTrue(true);
-    }
-
-    #########################################################
-    # Test message with given namespace.
-    #########################################################
-
-    public function testNestedMessagesAndEnums()
-    {
-        $m = new TestMessage();
-        $n = new TestMessage\Sub();
-        $m->setOptionalMessage($n);
-        $m->setOptionalNestedEnum(TestMessage\NestedEnum::ZERO);
-        $this->assertSame($n, $m->getOptionalMessage());
-        $this->assertSame(TestMessage\NestedEnum::ZERO, $m->getOptionalNestedEnum());
-    }
-
-    public function testMessagesAndEnumsWithPrefix()
-    {
-        // Test message prefix
-        $m = new TestIncludePrefixMessage();
-        $n = new PrefixTestPrefix();
-        $n->setA(1);
-        $m->setPrefixMessage($n);
-        $this->assertSame(1, $m->getPrefixMessage()->getA());
-
-        // Test nested message prefix
-        $o = new PrefixTestPrefix();
-        $p = new PrefixTestPrefix\PrefixNestedMessage();
-        $o->setNestedMessage($p);
-        $o->setNestedEnum(PrefixTestPrefix\PrefixNestedEnum::ZERO);
-        $this->assertSame($p, $o->getNestedMessage());
-        $this->assertSame(PrefixTestPrefix\PrefixNestedEnum::ZERO, $o->getNestedEnum());
-    }
-
-    public function testMessagesAndEnumsWithPhpNamespace()
-    {
-        $m = new TestNamespace();
-        $n = new TestNamespace\NestedMessage();
-        $m->setNestedMessage($n);
-        $m->setNestedEnum(TestNamespace\NestedEnum::ZERO);
-        $this->assertSame($n, $m->getNestedMessage());
-        $this->assertSame(TestNamespace\NestedEnum::ZERO, $m->getNestedEnum());
-    }
-
-    public function testMesssagesAndEnumsWithEmptyPhpNamespace()
-    {
-        $m = new TestEmptyNamespace();
-        $n = new TestEmptyNamespace\NestedMessage();
-        $m->setNestedMessage($n);
-        $m->setNestedEnum(TestEmptyNamespace\NestedEnum::ZERO);
-        $this->assertSame($n, $m->getNestedMessage());
-        $this->assertSame(TestEmptyNamespace\NestedEnum::ZERO, $m->getNestedEnum());
-    }
-
-    public function testMessagesAndEnumsWithNoNamespace()
-    {
-        $m = new NoNamespaceMessage();
-        $n = new NoNamespaceMessage\NestedMessage();
-        $m->setNestedMessage($n);
-        $m->setNestedEnum(NoNamespaceMessage\NestedEnum::ZERO);
-        $this->assertSame($n, $m->getNestedMessage());
-        $this->assertSame(NoNamespaceMessage\NestedEnum::ZERO, $m->getNestedEnum());
-    }
-
-    public function testReservedWordsInPackageName()
-    {
-        $m = new TestEmptyPackage();
-        $n = new TestEmptyPackage\NestedMessage();
-        $m->setNestedMessage($n);
-        $m->setNestedEnum(TestEmptyPackage\NestedEnum::ZERO);
-        $this->assertSame($n, $m->getNestedMessage());
-        $this->assertSame(TestEmptyPackage\NestedEnum::ZERO, $m->getNestedEnum());
-    }
-
-    public function testReservedWordsInNamespace()
-    {
-        $m = new TestNamespace();
-        $n = new TestNamespace\PBEmpty();
-        $o = new TestNamespace\PBEmpty\NestedMessage();
-        $n->setNestedMessage($o);
-        $n->setNestedEnum(TestNamespace\PBEmpty\NestedEnum::ZERO);
-        $m->setReservedName($n);
-        $this->assertSame($n, $m->getReservedName());
-        $this->assertSame($o, $n->getNestedMessage());
-        $this->assertSame(
-            TestNamespace\PBEmpty\NestedEnum::ZERO,
-            $n->getNestedEnum()
-        );
-    }
-
-    #########################################################
-    # Test prefix for reserved words.
-    #########################################################
-
-    public function testPrefixForReservedWords()
-    {
-        $m = new \Foo\TestMessage\PBEmpty();
-        $m = new \Foo\PBEmpty();
-        $m = new \PrefixEmpty();
-        $m = new \Foo\PBARRAY();
-
-        $m = new \Lower\PBabstract();
-        $m = new \Lower\PBand();
-        $m = new \Lower\PBarray();
-        $m = new \Lower\PBas();
-        $m = new \Lower\PBbreak();
-        $m = new \Lower\PBcallable();
-        $m = new \Lower\PBcase();
-        $m = new \Lower\PBcatch();
-        $m = new \Lower\PBclass();
-        $m = new \Lower\PBclone();
-        $m = new \Lower\PBconst();
-        $m = new \Lower\PBcontinue();
-        $m = new \Lower\PBdeclare();
-        $m = new \Lower\PBdefault();
-        $m = new \Lower\PBdie();
-        $m = new \Lower\PBdo();
-        $m = new \Lower\PBecho();
-        $m = new \Lower\PBelse();
-        $m = new \Lower\PBelseif();
-        $m = new \Lower\PBempty();
-        $m = new \Lower\PBenddeclare();
-        $m = new \Lower\PBendfor();
-        $m = new \Lower\PBendforeach();
-        $m = new \Lower\PBendif();
-        $m = new \Lower\PBendswitch();
-        $m = new \Lower\PBendwhile();
-        $m = new \Lower\PBeval();
-        $m = new \Lower\PBexit();
-        $m = new \Lower\PBextends();
-        $m = new \Lower\PBfinal();
-        $m = new \Lower\PBfinally();
-        $m = new \Lower\PBfn();
-        $m = new \Lower\PBfor();
-        $m = new \Lower\PBforeach();
-        $m = new \Lower\PBfunction();
-        $m = new \Lower\PBglobal();
-        $m = new \Lower\PBgoto();
-        $m = new \Lower\PBif();
-        $m = new \Lower\PBimplements();
-        $m = new \Lower\PBinclude();
-        $m = new \Lower\PBinclude_once();
-        $m = new \Lower\PBinstanceof();
-        $m = new \Lower\PBinsteadof();
-        $m = new \Lower\PBinterface();
-        $m = new \Lower\PBisset();
-        $m = new \Lower\PBlist();
-        $m = new \Lower\PBmatch();
-        $m = new \Lower\PBnamespace();
-        $m = new \Lower\PBnew();
-        $m = new \Lower\PBor();
-        $m = new \Lower\PBparent();
-        $m = new \Lower\PBprint();
-        $m = new \Lower\PBprivate();
-        $m = new \Lower\PBprotected();
-        $m = new \Lower\PBpublic();
-        $m = new \Lower\PBreadonly();
-        $m = new \Lower\PBrequire();
-        $m = new \Lower\PBrequire_once();
-        $m = new \Lower\PBreturn();
-        $m = new \Lower\PBself();
-        $m = new \Lower\PBstatic();
-        $m = new \Lower\PBswitch();
-        $m = new \Lower\PBthrow();
-        $m = new \Lower\PBtrait();
-        $m = new \Lower\PBtry();
-        $m = new \Lower\PBunset();
-        $m = new \Lower\PBuse();
-        $m = new \Lower\PBvar();
-        $m = new \Lower\PBwhile();
-        $m = new \Lower\PBxor();
-        $m = new \Lower\PByield();
-        $m = new \Lower\PBint();
-        $m = new \Lower\PBfloat();
-        $m = new \Lower\PBbool();
-        $m = new \Lower\PBstring();
-        $m = new \Lower\PBtrue();
-        $m = new \Lower\PBfalse();
-        $m = new \Lower\PBnull();
-        $m = new \Lower\PBvoid();
-        $m = new \Lower\PBiterable();
-
-        $m = new \Upper\PBABSTRACT();
-        $m = new \Upper\PBAND();
-        $m = new \Upper\PBARRAY();
-        $m = new \Upper\PBAS();
-        $m = new \Upper\PBBREAK();
-        $m = new \Upper\PBCALLABLE();
-        $m = new \Upper\PBCASE();
-        $m = new \Upper\PBCATCH();
-        $m = new \Upper\PBCLASS();
-        $m = new \Upper\PBCLONE();
-        $m = new \Upper\PBCONST();
-        $m = new \Upper\PBCONTINUE();
-        $m = new \Upper\PBDECLARE();
-        $m = new \Upper\PBDEFAULT();
-        $m = new \Upper\PBDIE();
-        $m = new \Upper\PBDO();
-        $m = new \Upper\PBECHO();
-        $m = new \Upper\PBELSE();
-        $m = new \Upper\PBELSEIF();
-        $m = new \Upper\PBEMPTY();
-        $m = new \Upper\PBENDDECLARE();
-        $m = new \Upper\PBENDFOR();
-        $m = new \Upper\PBENDFOREACH();
-        $m = new \Upper\PBENDIF();
-        $m = new \Upper\PBENDSWITCH();
-        $m = new \Upper\PBENDWHILE();
-        $m = new \Upper\PBEVAL();
-        $m = new \Upper\PBEXIT();
-        $m = new \Upper\PBEXTENDS();
-        $m = new \Upper\PBFINAL();
-        $m = new \Upper\PBFINALLY();
-        $m = new \Upper\PBFN();
-        $m = new \Upper\PBFOR();
-        $m = new \Upper\PBFOREACH();
-        $m = new \Upper\PBFUNCTION();
-        $m = new \Upper\PBGLOBAL();
-        $m = new \Upper\PBGOTO();
-        $m = new \Upper\PBIF();
-        $m = new \Upper\PBIMPLEMENTS();
-        $m = new \Upper\PBINCLUDE();
-        $m = new \Upper\PBINCLUDE_ONCE();
-        $m = new \Upper\PBINSTANCEOF();
-        $m = new \Upper\PBINSTEADOF();
-        $m = new \Upper\PBINTERFACE();
-        $m = new \Upper\PBISSET();
-        $m = new \Upper\PBLIST();
-        $m = new \Upper\PBMATCH();
-        $m = new \Upper\PBNAMESPACE();
-        $m = new \Upper\PBNEW();
-        $m = new \Upper\PBOR();
-        $m = new \Upper\PBPARENT();
-        $m = new \Upper\PBPRINT();
-        $m = new \Upper\PBPRIVATE();
-        $m = new \Upper\PBPROTECTED();
-        $m = new \Upper\PBPUBLIC();
-        $m = new \Upper\PBREADONLY();
-        $m = new \Upper\PBREQUIRE();
-        $m = new \Upper\PBREQUIRE_ONCE();
-        $m = new \Upper\PBRETURN();
-        $m = new \Upper\PBSELF();
-        $m = new \Upper\PBSTATIC();
-        $m = new \Upper\PBSWITCH();
-        $m = new \Upper\PBTHROW();
-        $m = new \Upper\PBTRAIT();
-        $m = new \Upper\PBTRY();
-        $m = new \Upper\PBUNSET();
-        $m = new \Upper\PBUSE();
-        $m = new \Upper\PBVAR();
-        $m = new \Upper\PBWHILE();
-        $m = new \Upper\PBXOR();
-        $m = new \Upper\PBYIELD();
-        $m = new \Upper\PBINT();
-        $m = new \Upper\PBFLOAT();
-        $m = new \Upper\PBBOOL();
-        $m = new \Upper\PBSTRING();
-        $m = new \Upper\PBTRUE();
-        $m = new \Upper\PBFALSE();
-        $m = new \Upper\PBNULL();
-        $m = new \Upper\PBVOID();
-        $m = new \Upper\PBITERABLE();
-
-        $m = new \Lower_enum\PBabstract();
-        $m = new \Lower_enum\PBand();
-        $m = new \Lower_enum\PBarray();
-        $m = new \Lower_enum\PBas();
-        $m = new \Lower_enum\PBbreak();
-        $m = new \Lower_enum\PBcallable();
-        $m = new \Lower_enum\PBcase();
-        $m = new \Lower_enum\PBcatch();
-        $m = new \Lower_enum\PBclass();
-        $m = new \Lower_enum\PBclone();
-        $m = new \Lower_enum\PBconst();
-        $m = new \Lower_enum\PBcontinue();
-        $m = new \Lower_enum\PBdeclare();
-        $m = new \Lower_enum\PBdefault();
-        $m = new \Lower_enum\PBdie();
-        $m = new \Lower_enum\PBdo();
-        $m = new \Lower_enum\PBecho();
-        $m = new \Lower_enum\PBelse();
-        $m = new \Lower_enum\PBelseif();
-        $m = new \Lower_enum\PBempty();
-        $m = new \Lower_enum\PBenddeclare();
-        $m = new \Lower_enum\PBendfor();
-        $m = new \Lower_enum\PBendforeach();
-        $m = new \Lower_enum\PBendif();
-        $m = new \Lower_enum\PBendswitch();
-        $m = new \Lower_enum\PBendwhile();
-        $m = new \Lower_enum\PBeval();
-        $m = new \Lower_enum\PBexit();
-        $m = new \Lower_enum\PBextends();
-        $m = new \Lower_enum\PBfinal();
-        $m = new \Lower_enum\PBfinally();
-        $m = new \Lower_enum\PBfn();
-        $m = new \Lower_enum\PBfor();
-        $m = new \Lower_enum\PBforeach();
-        $m = new \Lower_enum\PBfunction();
-        $m = new \Lower_enum\PBglobal();
-        $m = new \Lower_enum\PBgoto();
-        $m = new \Lower_enum\PBif();
-        $m = new \Lower_enum\PBimplements();
-        $m = new \Lower_enum\PBinclude();
-        $m = new \Lower_enum\PBinclude_once();
-        $m = new \Lower_enum\PBinstanceof();
-        $m = new \Lower_enum\PBinsteadof();
-        $m = new \Lower_enum\PBinterface();
-        $m = new \Lower_enum\PBisset();
-        $m = new \Lower_enum\PBlist();
-        $m = new \Lower_enum\PBmatch();
-        $m = new \Lower_enum\PBnamespace();
-        $m = new \Lower_enum\PBnew();
-        $m = new \Lower_enum\PBor();
-        $m = new \Lower_enum\PBparent();
-        $m = new \Lower_enum\PBprint();
-        $m = new \Lower_enum\PBprivate();
-        $m = new \Lower_enum\PBprotected();
-        $m = new \Lower_enum\PBpublic();
-        $m = new \Lower_enum\PBrequire();
-        $m = new \Lower_enum\PBreadonly();
-        $m = new \Lower_enum\PBrequire_once();
-        $m = new \Lower_enum\PBreturn();
-        $m = new \Lower_enum\PBself();
-        $m = new \Lower_enum\PBstatic();
-        $m = new \Lower_enum\PBswitch();
-        $m = new \Lower_enum\PBthrow();
-        $m = new \Lower_enum\PBtrait();
-        $m = new \Lower_enum\PBtry();
-        $m = new \Lower_enum\PBunset();
-        $m = new \Lower_enum\PBuse();
-        $m = new \Lower_enum\PBvar();
-        $m = new \Lower_enum\PBwhile();
-        $m = new \Lower_enum\PBxor();
-        $m = new \Lower_enum\PByield();
-        $m = new \Lower_enum\PBint();
-        $m = new \Lower_enum\PBfloat();
-        $m = new \Lower_enum\PBbool();
-        $m = new \Lower_enum\PBstring();
-        $m = new \Lower_enum\PBtrue();
-        $m = new \Lower_enum\PBfalse();
-        $m = new \Lower_enum\PBnull();
-        $m = new \Lower_enum\PBvoid();
-        $m = new \Lower_enum\PBiterable();
-
-        $m = new \Upper_enum\PBABSTRACT();
-        $m = new \Upper_enum\PBAND();
-        $m = new \Upper_enum\PBARRAY();
-        $m = new \Upper_enum\PBAS();
-        $m = new \Upper_enum\PBBREAK();
-        $m = new \Upper_enum\PBCALLABLE();
-        $m = new \Upper_enum\PBCASE();
-        $m = new \Upper_enum\PBCATCH();
-        $m = new \Upper_enum\PBCLASS();
-        $m = new \Upper_enum\PBCLONE();
-        $m = new \Upper_enum\PBCONST();
-        $m = new \Upper_enum\PBCONTINUE();
-        $m = new \Upper_enum\PBDECLARE();
-        $m = new \Upper_enum\PBDEFAULT();
-        $m = new \Upper_enum\PBDIE();
-        $m = new \Upper_enum\PBDO();
-        $m = new \Upper_enum\PBECHO();
-        $m = new \Upper_enum\PBELSE();
-        $m = new \Upper_enum\PBELSEIF();
-        $m = new \Upper_enum\PBEMPTY();
-        $m = new \Upper_enum\PBENDDECLARE();
-        $m = new \Upper_enum\PBENDFOR();
-        $m = new \Upper_enum\PBENDFOREACH();
-        $m = new \Upper_enum\PBENDIF();
-        $m = new \Upper_enum\PBENDSWITCH();
-        $m = new \Upper_enum\PBENDWHILE();
-        $m = new \Upper_enum\PBEVAL();
-        $m = new \Upper_enum\PBEXIT();
-        $m = new \Upper_enum\PBEXTENDS();
-        $m = new \Upper_enum\PBFINAL();
-        $m = new \Upper_enum\PBFINALLY();
-        $m = new \Upper_enum\PBFN();
-        $m = new \Upper_enum\PBFOR();
-        $m = new \Upper_enum\PBFOREACH();
-        $m = new \Upper_enum\PBFUNCTION();
-        $m = new \Upper_enum\PBGLOBAL();
-        $m = new \Upper_enum\PBGOTO();
-        $m = new \Upper_enum\PBIF();
-        $m = new \Upper_enum\PBIMPLEMENTS();
-        $m = new \Upper_enum\PBINCLUDE();
-        $m = new \Upper_enum\PBINCLUDE_ONCE();
-        $m = new \Upper_enum\PBINSTANCEOF();
-        $m = new \Upper_enum\PBINSTEADOF();
-        $m = new \Upper_enum\PBINTERFACE();
-        $m = new \Upper_enum\PBISSET();
-        $m = new \Upper_enum\PBLIST();
-        $m = new \Upper_enum\PBMATCH();
-        $m = new \Upper_enum\PBNAMESPACE();
-        $m = new \Upper_enum\PBNEW();
-        $m = new \Upper_enum\PBOR();
-        $m = new \Upper_enum\PBPARENT();
-        $m = new \Upper_enum\PBPRINT();
-        $m = new \Upper_enum\PBPRIVATE();
-        $m = new \Upper_enum\PBPROTECTED();
-        $m = new \Upper_enum\PBPUBLIC();
-        $m = new \Upper_enum\PBREADONLY();
-        $m = new \Upper_enum\PBREQUIRE();
-        $m = new \Upper_enum\PBREQUIRE_ONCE();
-        $m = new \Upper_enum\PBRETURN();
-        $m = new \Upper_enum\PBSELF();
-        $m = new \Upper_enum\PBSTATIC();
-        $m = new \Upper_enum\PBSWITCH();
-        $m = new \Upper_enum\PBTHROW();
-        $m = new \Upper_enum\PBTRAIT();
-        $m = new \Upper_enum\PBTRY();
-        $m = new \Upper_enum\PBUNSET();
-        $m = new \Upper_enum\PBUSE();
-        $m = new \Upper_enum\PBVAR();
-        $m = new \Upper_enum\PBWHILE();
-        $m = new \Upper_enum\PBXOR();
-        $m = new \Upper_enum\PBYIELD();
-        $m = new \Upper_enum\PBINT();
-        $m = new \Upper_enum\PBFLOAT();
-        $m = new \Upper_enum\PBBOOL();
-        $m = new \Upper_enum\PBSTRING();
-        $m = new \Upper_enum\PBTRUE();
-        $m = new \Upper_enum\PBFALSE();
-        $m = new \Upper_enum\PBNULL();
-        $m = new \Upper_enum\PBVOID();
-        $m = new \Upper_enum\PBITERABLE();
-
-        $m = \Lower_enum_value\NotAllowed::PBabstract;
-        $m = \Lower_enum_value\NotAllowed::PBand;
-        $m = \Lower_enum_value\NotAllowed::PBarray;
-        $m = \Lower_enum_value\NotAllowed::PBas;
-        $m = \Lower_enum_value\NotAllowed::PBbreak;
-        $m = \Lower_enum_value\NotAllowed::PBcallable;
-        $m = \Lower_enum_value\NotAllowed::PBcase;
-        $m = \Lower_enum_value\NotAllowed::PBcatch;
-        $m = \Lower_enum_value\NotAllowed::PBclass;
-        $m = \Lower_enum_value\NotAllowed::PBclone;
-        $m = \Lower_enum_value\NotAllowed::PBconst;
-        $m = \Lower_enum_value\NotAllowed::PBcontinue;
-        $m = \Lower_enum_value\NotAllowed::PBdeclare;
-        $m = \Lower_enum_value\NotAllowed::PBdefault;
-        $m = \Lower_enum_value\NotAllowed::PBdie;
-        $m = \Lower_enum_value\NotAllowed::PBdo;
-        $m = \Lower_enum_value\NotAllowed::PBecho;
-        $m = \Lower_enum_value\NotAllowed::PBelse;
-        $m = \Lower_enum_value\NotAllowed::PBelseif;
-        $m = \Lower_enum_value\NotAllowed::PBempty;
-        $m = \Lower_enum_value\NotAllowed::PBenddeclare;
-        $m = \Lower_enum_value\NotAllowed::PBendfor;
-        $m = \Lower_enum_value\NotAllowed::PBendforeach;
-        $m = \Lower_enum_value\NotAllowed::PBendif;
-        $m = \Lower_enum_value\NotAllowed::PBendswitch;
-        $m = \Lower_enum_value\NotAllowed::PBendwhile;
-        $m = \Lower_enum_value\NotAllowed::PBeval;
-        $m = \Lower_enum_value\NotAllowed::PBexit;
-        $m = \Lower_enum_value\NotAllowed::PBextends;
-        $m = \Lower_enum_value\NotAllowed::PBfinal;
-        $m = \Lower_enum_value\NotAllowed::PBfinally;
-        $m = \Lower_enum_value\NotAllowed::PBfn;
-        $m = \Lower_enum_value\NotAllowed::PBfor;
-        $m = \Lower_enum_value\NotAllowed::PBforeach;
-        $m = \Lower_enum_value\NotAllowed::PBfunction;
-        $m = \Lower_enum_value\NotAllowed::PBglobal;
-        $m = \Lower_enum_value\NotAllowed::PBgoto;
-        $m = \Lower_enum_value\NotAllowed::PBif;
-        $m = \Lower_enum_value\NotAllowed::PBimplements;
-        $m = \Lower_enum_value\NotAllowed::PBinclude;
-        $m = \Lower_enum_value\NotAllowed::PBinclude_once;
-        $m = \Lower_enum_value\NotAllowed::PBinstanceof;
-        $m = \Lower_enum_value\NotAllowed::PBinsteadof;
-        $m = \Lower_enum_value\NotAllowed::PBinterface;
-        $m = \Lower_enum_value\NotAllowed::PBisset;
-        $m = \Lower_enum_value\NotAllowed::PBlist;
-        $m = \Lower_enum_value\NotAllowed::PBmatch;
-        $m = \Lower_enum_value\NotAllowed::PBnamespace;
-        $m = \Lower_enum_value\NotAllowed::PBnew;
-        $m = \Lower_enum_value\NotAllowed::PBor;
-        $m = \Lower_enum_value\NotAllowed::PBprint;
-        $m = \Lower_enum_value\NotAllowed::PBprivate;
-        $m = \Lower_enum_value\NotAllowed::PBprotected;
-        $m = \Lower_enum_value\NotAllowed::PBpublic;
-        $m = \Lower_enum_value\NotAllowed::PBrequire;
-        $m = \Lower_enum_value\NotAllowed::PBrequire_once;
-        $m = \Lower_enum_value\NotAllowed::PBreturn;
-        $m = \Lower_enum_value\NotAllowed::PBstatic;
-        $m = \Lower_enum_value\NotAllowed::PBswitch;
-        $m = \Lower_enum_value\NotAllowed::PBthrow;
-        $m = \Lower_enum_value\NotAllowed::PBtrait;
-        $m = \Lower_enum_value\NotAllowed::PBtry;
-        $m = \Lower_enum_value\NotAllowed::PBunset;
-        $m = \Lower_enum_value\NotAllowed::PBuse;
-        $m = \Lower_enum_value\NotAllowed::PBvar;
-        $m = \Lower_enum_value\NotAllowed::PBwhile;
-        $m = \Lower_enum_value\NotAllowed::PBxor;
-        $m = \Lower_enum_value\NotAllowed::PByield;
-        $m = \Lower_enum_value\NotAllowed::int;
-        $m = \Lower_enum_value\NotAllowed::float;
-        $m = \Lower_enum_value\NotAllowed::bool;
-        $m = \Lower_enum_value\NotAllowed::string;
-        $m = \Lower_enum_value\NotAllowed::true;
-        $m = \Lower_enum_value\NotAllowed::false;
-        $m = \Lower_enum_value\NotAllowed::null;
-        $m = \Lower_enum_value\NotAllowed::void;
-        $m = \Lower_enum_value\NotAllowed::iterable;
-        $m = \Lower_enum_value\NotAllowed::parent;
-        $m = \Lower_enum_value\NotAllowed::self;
-        $m = \Lower_enum_value\NotAllowed::readonly;
-
-        $m = \Upper_enum_value\NotAllowed::PBABSTRACT;
-        $m = \Upper_enum_value\NotAllowed::PBAND;
-        $m = \Upper_enum_value\NotAllowed::PBARRAY;
-        $m = \Upper_enum_value\NotAllowed::PBAS;
-        $m = \Upper_enum_value\NotAllowed::PBBREAK;
-        $m = \Upper_enum_value\NotAllowed::PBCALLABLE;
-        $m = \Upper_enum_value\NotAllowed::PBCASE;
-        $m = \Upper_enum_value\NotAllowed::PBCATCH;
-        $m = \Upper_enum_value\NotAllowed::PBCLASS;
-        $m = \Upper_enum_value\NotAllowed::PBCLONE;
-        $m = \Upper_enum_value\NotAllowed::PBCONST;
-        $m = \Upper_enum_value\NotAllowed::PBCONTINUE;
-        $m = \Upper_enum_value\NotAllowed::PBDECLARE;
-        $m = \Upper_enum_value\NotAllowed::PBDEFAULT;
-        $m = \Upper_enum_value\NotAllowed::PBDIE;
-        $m = \Upper_enum_value\NotAllowed::PBDO;
-        $m = \Upper_enum_value\NotAllowed::PBECHO;
-        $m = \Upper_enum_value\NotAllowed::PBELSE;
-        $m = \Upper_enum_value\NotAllowed::PBELSEIF;
-        $m = \Upper_enum_value\NotAllowed::PBEMPTY;
-        $m = \Upper_enum_value\NotAllowed::PBENDDECLARE;
-        $m = \Upper_enum_value\NotAllowed::PBENDFOR;
-        $m = \Upper_enum_value\NotAllowed::PBENDFOREACH;
-        $m = \Upper_enum_value\NotAllowed::PBENDIF;
-        $m = \Upper_enum_value\NotAllowed::PBENDSWITCH;
-        $m = \Upper_enum_value\NotAllowed::PBENDWHILE;
-        $m = \Upper_enum_value\NotAllowed::PBEVAL;
-        $m = \Upper_enum_value\NotAllowed::PBEXIT;
-        $m = \Upper_enum_value\NotAllowed::PBEXTENDS;
-        $m = \Upper_enum_value\NotAllowed::PBFINAL;
-        $m = \Upper_enum_value\NotAllowed::PBFINALLY;
-        $m = \Upper_enum_value\NotAllowed::PBFN;
-        $m = \Upper_enum_value\NotAllowed::PBFOR;
-        $m = \Upper_enum_value\NotAllowed::PBFOREACH;
-        $m = \Upper_enum_value\NotAllowed::PBFUNCTION;
-        $m = \Upper_enum_value\NotAllowed::PBGLOBAL;
-        $m = \Upper_enum_value\NotAllowed::PBGOTO;
-        $m = \Upper_enum_value\NotAllowed::PBIF;
-        $m = \Upper_enum_value\NotAllowed::PBIMPLEMENTS;
-        $m = \Upper_enum_value\NotAllowed::PBINCLUDE;
-        $m = \Upper_enum_value\NotAllowed::PBINCLUDE_ONCE;
-        $m = \Upper_enum_value\NotAllowed::PBINSTANCEOF;
-        $m = \Upper_enum_value\NotAllowed::PBINSTEADOF;
-        $m = \Upper_enum_value\NotAllowed::PBINTERFACE;
-        $m = \Upper_enum_value\NotAllowed::PBISSET;
-        $m = \Upper_enum_value\NotAllowed::PBLIST;
-        $m = \Upper_enum_value\NotAllowed::PBMATCH;
-        $m = \Upper_enum_value\NotAllowed::PBNAMESPACE;
-        $m = \Upper_enum_value\NotAllowed::PBNEW;
-        $m = \Upper_enum_value\NotAllowed::PBOR;
-        $m = \Upper_enum_value\NotAllowed::PBPRINT;
-        $m = \Upper_enum_value\NotAllowed::PBPRIVATE;
-        $m = \Upper_enum_value\NotAllowed::PBPROTECTED;
-        $m = \Upper_enum_value\NotAllowed::PBPUBLIC;
-        $m = \Upper_enum_value\NotAllowed::PBREQUIRE;
-        $m = \Upper_enum_value\NotAllowed::PBREQUIRE_ONCE;
-        $m = \Upper_enum_value\NotAllowed::PBRETURN;
-        $m = \Upper_enum_value\NotAllowed::PBSTATIC;
-        $m = \Upper_enum_value\NotAllowed::PBSWITCH;
-        $m = \Upper_enum_value\NotAllowed::PBTHROW;
-        $m = \Upper_enum_value\NotAllowed::PBTRAIT;
-        $m = \Upper_enum_value\NotAllowed::PBTRY;
-        $m = \Upper_enum_value\NotAllowed::PBUNSET;
-        $m = \Upper_enum_value\NotAllowed::PBUSE;
-        $m = \Upper_enum_value\NotAllowed::PBVAR;
-        $m = \Upper_enum_value\NotAllowed::PBWHILE;
-        $m = \Upper_enum_value\NotAllowed::PBXOR;
-        $m = \Upper_enum_value\NotAllowed::PBYIELD;
-        $m = \Upper_enum_value\NotAllowed::INT;
-        $m = \Upper_enum_value\NotAllowed::FLOAT;
-        $m = \Upper_enum_value\NotAllowed::BOOL;
-        $m = \Upper_enum_value\NotAllowed::STRING;
-        $m = \Upper_enum_value\NotAllowed::TRUE;
-        $m = \Upper_enum_value\NotAllowed::FALSE;
-        $m = \Upper_enum_value\NotAllowed::NULL;
-        $m = \Upper_enum_value\NotAllowed::VOID;
-        $m = \Upper_enum_value\NotAllowed::ITERABLE;
-        $m = \Upper_enum_value\NotAllowed::PARENT;
-        $m = \Upper_enum_value\NotAllowed::SELF;
-        $m = \Upper_enum_value\NotAllowed::READONLY;
-
-        $this->assertTrue(true);
-    }
-
-    #########################################################
-    # Test fluent setters.
-    #########################################################
-
-    public function testFluentSetters()
-    {
-        $m = (new TestMessage())
-            ->setOptionalInt32(1)
-            ->setOptionalUInt32(2);
-        $this->assertSame(1, $m->getOptionalInt32());
-        $this->assertSame(2, $m->getOptionalUInt32());
-    }
-
-    #########################################################
-    # Test Reverse Field Order.
-    #########################################################
-
-    public function testReverseFieldOrder()
-    {
-        $m = new TestReverseFieldOrder();
-        $m->setB("abc");
-        $this->assertSame("abc", $m->getB());
-        $this->assertNotSame("abc", $m->getA());
-    }
-
-    #########################################################
-    # Test Reverse Field Order.
-    #########################################################
-
-    public function testLowerCase()
-    {
-        $m = new testLowerCaseMessage();
-        $n = testLowerCaseEnum::VALUE;
-        $this->assertTrue(true);
-    }
-
-    #########################################################
-    # Test Array Constructor.
-    #########################################################
-
-    public function testArrayConstructor()
-    {
-        $m = new TestMessage([
-            'optional_int32' => -42,
-            'optional_int64' => -43,
-            'optional_uint32' => 42,
-            'optional_uint64' => 43,
-            'optional_sint32' => -44,
-            'optional_sint64' => -45,
-            'optional_fixed32' => 46,
-            'optional_fixed64' => 47,
-            'optional_sfixed32' => -46,
-            'optional_sfixed64' => -47,
-            'optional_float' => 1.5,
-            'optional_double' => 1.6,
-            'optional_bool' => true,
-            'optional_string' => 'a',
-            'optional_bytes' => 'bbbb',
-            'optional_enum' => TestEnum::ONE,
-            'optional_message' => new Sub([
-                'a' => 33
-            ]),
-            'repeated_int32' => [-42, -52],
-            'repeated_int64' => [-43, -53],
-            'repeated_uint32' => [42, 52],
-            'repeated_uint64' => [43, 53],
-            'repeated_sint32' => [-44, -54],
-            'repeated_sint64' => [-45, -55],
-            'repeated_fixed32' => [46, 56],
-            'repeated_fixed64' => [47, 57],
-            'repeated_sfixed32' => [-46, -56],
-            'repeated_sfixed64' => [-47, -57],
-            'repeated_float' => [1.5, 2.5],
-            'repeated_double' => [1.6, 2.6],
-            'repeated_bool' => [true, false],
-            'repeated_string' => ['a', 'c'],
-            'repeated_bytes' => ['bbbb', 'dddd'],
-            'repeated_enum' => [TestEnum::ZERO, TestEnum::ONE],
-            'repeated_message' => [new Sub(['a' => 34]),
-                                   new Sub(['a' => 35])],
-            'map_int32_int32' => [-62 => -62],
-            'map_int64_int64' => [-63 => -63],
-            'map_uint32_uint32' => [62 => 62],
-            'map_uint64_uint64' => [63 => 63],
-            'map_sint32_sint32' => [-64 => -64],
-            'map_sint64_sint64' => [-65 => -65],
-            'map_fixed32_fixed32' => [66 => 66],
-            'map_fixed64_fixed64' => [67 => 67],
-            'map_sfixed32_sfixed32' => [-68 => -68],
-            'map_sfixed64_sfixed64' => [-69 => -69],
-            'map_int32_float' => [1 => 3.5],
-            'map_int32_double' => [1 => 3.6],
-            'map_bool_bool' => [true => true],
-            'map_string_string' => ['e' => 'e'],
-            'map_int32_bytes' => [1 => 'ffff'],
-            'map_int32_enum' => [1 => TestEnum::ONE],
-            'map_int32_message' => [1 => new Sub(['a' => 36])],
-        ]);
-
-        TestUtil::assertTestMessage($m);
-        $this->assertTrue(true);
-    }
-
-    public function testReferenceInArrayConstructor()
-    {
-        $keys = [[
-                    'optional_bool' => true,
-                    'repeated_bool' => [true],
-                    'map_bool_bool' => [true => true],
-                    'optional_double' => 1.0,
-                    'repeated_double' => [1.0],
-                    'map_int32_double' => [1 => 1.0],
-                    'optional_int32' => 1,
-                    'repeated_int32' => [1],
-                    'map_int32_int32' => [1 => 1],
-                    'optional_string' => 'a',
-                    'repeated_string' => ['a'],
-                    'map_string_string' => ['a' => 'a'],
-                    'optional_message' => ['a' => 1],
-                    'repeated_message' => [['a' => 1]],
-                    'map_int32_message' => [1 => ['a' => 1]],
-                ]];
-
-        foreach ($keys as &$key) {
-            foreach ($key as $id => &$value) {
-                if ($id === 'repeated_bool') {
-                    foreach ($value as &$element) {
-                    }
-                }
-                if ($id === 'map_bool_bool') {
-                    foreach ($value as $mapKey => &$element) {
-                    }
-                }
-                if ($id === 'repeated_double') {
-                    foreach ($value as &$element) {
-                    }
-                }
-                if ($id === 'map_int32_double') {
-                    foreach ($value as $mapKey => &$element) {
-                    }
-                }
-                if ($id === 'repeated_int32') {
-                    foreach ($value as &$element) {
-                    }
-                }
-                if ($id === 'map_int32_int32') {
-                    foreach ($value as $mapKey => &$element) {
-                    }
-                }
-                if ($id === 'repeated_string') {
-                    foreach ($value as &$element) {
-                    }
-                }
-                if ($id === 'map_string_string') {
-                    foreach ($value as $mapKey => &$element) {
-                    }
-                }
-                if ($id === 'optional_message') {
-                    $value = new Sub($value);
-                }
-                if ($id === 'repeated_message') {
-                    foreach ($value as &$element) {
-                        $element = new Sub($element);
-                    }
-                }
-                if ($id === 'map_int32_message') {
-                    foreach ($value as $mapKey => &$element) {
-                        $element = new Sub($element);
-                    }
-                }
-            }
-            $key = new TestMessage($key);
-        }
-
-        $this->assertTrue(true);
-    }
-
-    public function testOneofMessageInArrayConstructor()
-    {
-        $m = new TestMessage([
-            'oneof_message' => new Sub(),
-        ]);
-        $this->assertSame('oneof_message', $m->getMyOneof());
-        $this->assertNotNull($m->getOneofMessage());
-
-        $this->assertTrue(true);
-    }
-
-    public function testOneofStringInArrayConstructor()
-    {
-        $m = new TestMessage([
-            'oneof_string' => 'abc',
-        ]);
-
-        $this->assertTrue(true);
-    }
-
-    #########################################################
-    # Test clone.
-    #########################################################
-
-    public function testClone()
-    {
-        $m = new TestMessage([
-            'optional_int32' => -42,
-            'optional_int64' => -43,
-            'optional_message' => new Sub([
-                'a' => 33
-            ]),
-            'map_int32_message' => [1 => new Sub(['a' => 36])],
-        ]);
-        $m2 = clone $m;
-        $this->assertEquals($m->getOptionalInt32(), $m2->getOptionalInt32());
-        $this->assertEquals($m->getOptionalInt64(), $m2->getOptionalInt64());
-        $this->assertSame($m->getOptionalMessage(), $m2->getOptionalMessage());
-        $this->assertSame($m->getMapInt32Message()[1], $m2->getMapInt32Message()[1]);
-        $this->assertEquals($m->serializeToJsonString(), $m2->serializeToJsonString());
-    }
-
-    #########################################################
-    # Test message equals.
-    #########################################################
-
-    public function testMessageEquals()
-    {
-        $m = new TestMessage();
-        TestUtil::setTestMessage($m);
-        $n = new TestMessage();
-        TestUtil::setTestMessage($n);
-        $this->assertEquals($m, $n);
-    }
-
-    #########################################################
-    # Test reference of value
-    #########################################################
-
-    public function testValueIsReference()
-    {
-        // Bool element
-        $values = [true];
-        array_walk($values, function (&$value) {});
-        $m = new TestMessage();
-        $m->setOptionalBool($values[0]);
-
-        // Int32 element
-        $values = [1];
-        array_walk($values, function (&$value) {});
-        $m = new TestMessage();
-        $m->setOptionalInt32($values[0]);
-
-        // Double element
-        $values = [1.0];
-        array_walk($values, function (&$value) {});
-        $m = new TestMessage();
-        $m->setOptionalDouble($values[0]);
-
-        // String element
-        $values = ['a'];
-        array_walk($values, function (&$value) {});
-        $m = new TestMessage();
-        $m->setOptionalString($values[0]);
-
-        $this->assertTrue(true);
-    }
-
-    #########################################################
-    # Test equality
-    #########################################################
-
-    public function testShallowEquality()
-    {
-        $m1 = new TestMessage([
-            'optional_int32' => -42,
-            'optional_int64' => -43,
-            'optional_uint32' => 42,
-            'optional_uint64' => 43,
-            'optional_sint32' => -44,
-            'optional_sint64' => -45,
-            'optional_fixed32' => 46,
-            'optional_fixed64' => 47,
-            'optional_sfixed32' => -46,
-            'optional_sfixed64' => -47,
-            'optional_float' => 1.5,
-            'optional_double' => 1.6,
-            'optional_bool' => true,
-            'optional_string' => 'a',
-            'optional_bytes' => 'bbbb',
-            'optional_enum' => TestEnum::ONE,
-            ]);
-        $data = $m1->serializeToString();
-        $m2 = new TestMessage();
-        $m2->mergeFromString($data);
-        $this->assertTrue($m1 == $m2);
-
-        $m1->setOptionalInt32(1234);
-        $this->assertTrue($m1 != $m2);
-    }
-
-    public function testDeepEquality()
-    {
-        $m1 = new TestMessage([
-            'optional_int32' => -42,
-            'optional_int64' => -43,
-            'optional_uint32' => 42,
-            'optional_uint64' => 43,
-            'optional_sint32' => -44,
-            'optional_sint64' => -45,
-            'optional_fixed32' => 46,
-            'optional_fixed64' => 47,
-            'optional_sfixed32' => -46,
-            'optional_sfixed64' => -47,
-            'optional_float' => 1.5,
-            'optional_double' => 1.6,
-            'optional_bool' => true,
-            'optional_string' => 'a',
-            'optional_bytes' => 'bbbb',
-            'optional_enum' => TestEnum::ONE,
-            'optional_message' => new Sub([
-                'a' => 33
-            ]),
-            'repeated_int32' => [-42, -52],
-            'repeated_int64' => [-43, -53],
-            'repeated_uint32' => [42, 52],
-            'repeated_uint64' => [43, 53],
-            'repeated_sint32' => [-44, -54],
-            'repeated_sint64' => [-45, -55],
-            'repeated_fixed32' => [46, 56],
-            'repeated_fixed64' => [47, 57],
-            'repeated_sfixed32' => [-46, -56],
-            'repeated_sfixed64' => [-47, -57],
-            'repeated_float' => [1.5, 2.5],
-            'repeated_double' => [1.6, 2.6],
-            'repeated_bool' => [true, false],
-            'repeated_string' => ['a', 'c'],
-            'repeated_bytes' => ['bbbb', 'dddd'],
-            'repeated_enum' => [TestEnum::ZERO, TestEnum::ONE],
-            'repeated_message' => [new Sub(['a' => 34]),
-                                   new Sub(['a' => 35])],
-            'map_int32_int32' => [-62 => -62],
-            'map_int64_int64' => [-63 => -63],
-            'map_uint32_uint32' => [62 => 62],
-            'map_uint64_uint64' => [63 => 63],
-            'map_sint32_sint32' => [-64 => -64],
-            'map_sint64_sint64' => [-65 => -65],
-            'map_fixed32_fixed32' => [66 => 66],
-            'map_fixed64_fixed64' => [67 => 67],
-            'map_sfixed32_sfixed32' => [-68 => -68],
-            'map_sfixed64_sfixed64' => [-69 => -69],
-            'map_int32_float' => [1 => 3.5],
-            'map_int32_double' => [1 => 3.6],
-            'map_bool_bool' => [true => true],
-            'map_string_string' => ['e' => 'e'],
-            'map_int32_bytes' => [1 => 'ffff'],
-            'map_int32_enum' => [1 => TestEnum::ONE],
-            'map_int32_message' => [1 => new Sub(['a' => 36])],
-        ]);
-        $data = $m1->serializeToString();
-
-        $m2 = new TestMessage();
-        $m2->mergeFromString($data);
-        $this->assertTrue($m1 == $m2);
-
-        # Nested sub-message is checked.
-        $m2 = new TestMessage();
-        $m2->mergeFromString($data);
-        $m2->getOptionalMessage()->setA(1234);
-        $this->assertTrue($m1 != $m2);
-
-        # Repeated field element is checked.
-        $m2 = new TestMessage();
-        $m2->mergeFromString($data);
-        $m2->getRepeatedInt32()[0] = 1234;
-        $this->assertTrue($m1 != $m2);
-
-        # Repeated field length is checked.
-        $m2 = new TestMessage();
-        $m2->mergeFromString($data);
-        $m2->getRepeatedInt32()[] = 1234;
-        $this->assertTrue($m1 != $m2);
-
-        # SubMessage inside repeated field is checked.
-        $m2 = new TestMessage();
-        $m2->mergeFromString($data);
-        $m2->getRepeatedMessage()[0]->setA(1234);
-        $this->assertTrue($m1 != $m2);
-
-        # Map value is checked.
-        $m2 = new TestMessage();
-        $m2->mergeFromString($data);
-        $m2->getMapInt32Int32()[-62] = 1234;
-        $this->assertTrue($m1 != $m2);
-
-        # Map size is checked.
-        $m2 = new TestMessage();
-        $m2->mergeFromString($data);
-        $m2->getMapInt32Int32()[1234] = 1234;
-        $this->assertTrue($m1 != $m2);
-
-        # SubMessage inside map field is checked.
-        $m2 = new TestMessage();
-        $m2->mergeFromString($data);
-        $m2->getMapInt32Message()[1]->setA(1234);
-        $this->assertTrue($m1 != $m2);
-
-        # TODO: what about unknown fields?
-    }
-
-    #########################################################
-    # Test hasOneof<Field> methods exists and working
-    #########################################################
-
-    public function testHasOneof() {
-        $m = new TestMessage();
-        $this->assertFalse($m->hasOneofInt32());
-        $m->setOneofInt32(42);
-        $this->assertTrue($m->hasOneofInt32());
-        $m->setOneofString("bar");
-        $this->assertFalse($m->hasOneofInt32());
-        $this->assertTrue($m->hasOneofString());
-        $m->clear();
-        $this->assertFalse($m->hasOneofInt32());
-        $this->assertFalse($m->hasOneofString());
-
-        $sub_m = new Sub();
-        $sub_m->setA(1);
-        $m->setOneofMessage($sub_m);
-        $this->assertTrue($m->hasOneofMessage());
-        $m->setOneofMessage(null);
-        $this->assertFalse($m->hasOneofMessage());
-    }
-
-    #########################################################
-    # Test that we don't crash if users create their own messages.
-    #########################################################
-
-    public function testUserDefinedClass() {
-        if (getenv("USE_ZEND_ALLOC") === "0") {
-            // We're running a memory test. This test appears to leak in a way
-            // we cannot control, PHP bug?
-            //
-            // TODO: investigate further.
-            $this->markTestSkipped();
-            return;
-        }
-
-        # This is not allowed, but at least we shouldn't crash.
-        $this->expectException(Exception::class);
-        new C();
-    }
-
-    #########################################################
-    # Test no segfault when error happens
-    #########################################################
-
-    function throwIntendedException()
-    {
-        throw new Exception('Intended');
-    }
-    public function testNoSegfaultWithError()
-    {
-        if (getenv("USE_ZEND_ALLOC") === "0") {
-            // We're running a memory test. This test appears to leak in a way
-            // we cannot control, PHP bug?
-            //
-            // TODO: investigate further.
-            $this->markTestSkipped();
-            return;
-        }
-        $this->expectException(Exception::class);
-
-        new TestMessage(['optional_int32' => $this->throwIntendedException()]);
-    }
-
-    public function testNoExceptionWithVarDump()
-    {
-        $m = new Sub(['a' => 1]);
-        /*
-         * This line currently segfaults on macOS with:
-         *
-         *    frame #0: 0x00000001029936cc xdebug.so`xdebug_zend_hash_is_recursive + 4
-         *    frame #1: 0x00000001029a6736 xdebug.so`xdebug_var_export_text_ansi + 1006
-         *    frame #2: 0x00000001029a715d xdebug.so`xdebug_get_zval_value_text_ansi + 273
-         *    frame #3: 0x000000010298a441 xdebug.so`zif_xdebug_var_dump + 297
-         *    frame #4: 0x000000010298d558 xdebug.so`xdebug_execute_internal + 640
-         *    frame #5: 0x000000010046d47f php`ZEND_DO_FCALL_SPEC_RETVAL_UNUSED_HANDLER + 364
-         *    frame #6: 0x000000010043cabc php`execute_ex + 44
-         *    frame #7: 0x000000010298d151 xdebug.so`xdebug_execute_ex + 1662
-         *    frame #8: 0x000000010046d865 php`ZEND_DO_FCALL_SPEC_RETVAL_USED_HANDLER + 426
-         *
-         * The value we are passing to var_dump() appears to be corrupt somehow.
-         */
-        /* var_dump($m); */
-
-        $this->assertTrue(true);
-    }
-
-    public function testIssue9440()
-    {
-        $m = new Test32Fields();
-        $m->setId(8);
-        $this->assertEquals(8, $m->getId());
-        $m->setVersion('1');
-        $this->assertEquals(8, $m->getId());
-    }
-}
diff --git a/libs/protobuf/php/tests/GeneratedPhpdocTest.php b/libs/protobuf/php/tests/GeneratedPhpdocTest.php
deleted file mode 100644
index 78ac623..0000000
--- a/libs/protobuf/php/tests/GeneratedPhpdocTest.php
+++ /dev/null
@@ -1,350 +0,0 @@
-<?php
-
-require_once('test_base.php');
-require_once('test_util.php');
-
-use Foo\TestMessage;
-
-class GeneratedPhpdocTest extends TestBase
-{
-    public function testPhpDocForClass()
-    {
-        $class = new ReflectionClass('Foo\TestMessage');
-        $doc = $class->getDocComment();
-        $this->assertStringContains('foo.TestMessage', $doc);
-    }
-
-    public function testPhpDocForConstructor()
-    {
-        $class = new ReflectionClass('Foo\TestMessage');
-        $doc = $class->getMethod('__construct')->getDocComment();
-        $this->assertStringContains('@param array $data', $doc);
-        $this->assertStringContains('@type int $optional_int32', $doc);
-    }
-
-    /**
-     * @dataProvider providePhpDocForGettersAndSetters
-     */
-    public function testPhpDocForIntGetters($methods, $expectedDoc)
-    {
-        $class = new ReflectionClass('Foo\TestMessage');
-        foreach ($methods as $method) {
-            $doc = $class->getMethod($method)->getDocComment();
-            $this->assertStringContains($expectedDoc, $doc);
-        }
-    }
-
-    public function providePhpDocForGettersAndSetters()
-    {
-        return [
-            [
-                [
-                    'setOptionalInt32',
-                    'setOptionalUint32',
-                    'setOptionalSint32',
-                    'setOptionalFixed32',
-                    'setOptionalSfixed32',
-                    'setOneofInt32',
-                    'setOneofUint32',
-                    'setOneofSint32',
-                    'setOneofFixed32',
-                    'setOneofSfixed32',
-                    'setOptionalEnum',
-                    'setOptionalNoNamespaceEnum',
-                    'setOptionalNestedEnum',
-                    'setOneofEnum'
-                ],
-                '@param int $var'
-            ],
-            [
-                [
-                    'setOptionalInt64',
-                    'setOptionalUint64',
-                    'setOptionalSint64',
-                    'setOptionalFixed64',
-                    'setOptionalSfixed64',
-                    'setOneofInt64',
-                    'setOneofUint64',
-                    'setOneofSint64',
-                    'setOneofFixed64',
-                    'setOneofSfixed64',
-                ],
-                '@param int|string $var'
-            ],
-            [
-                [
-                    'getOptionalInt32',
-                    'getOptionalUint32',
-                    'getOptionalSint32',
-                    'getOptionalFixed32',
-                    'getOptionalSfixed32',
-                    'getOneofInt32',
-                    'getOneofUint32',
-                    'getOneofSint32',
-                    'getOneofFixed32',
-                    'getOneofSfixed32',
-                    'getOptionalEnum',
-                    'getOptionalNoNamespaceEnum',
-                    'getOptionalNestedEnum',
-                    'getOneofEnum',
-                ],
-                '@return int'
-            ],
-            [
-                [
-                    'setOptionalInt64',
-                    'setOptionalUint64',
-                    'setOptionalSint64',
-                    'setOptionalFixed64',
-                    'setOptionalSfixed64',
-                    'setOneofInt64',
-                    'setOneofUint64',
-                    'setOneofSint64',
-                    'setOneofFixed64',
-                    'setOneofSfixed64',
-                ],
-                '@param int|string $var'
-            ],
-            [
-                [
-                    'getRepeatedInt32',
-                    'getRepeatedInt64',
-                    'getRepeatedUint32',
-                    'getRepeatedUint64',
-                    'getRepeatedSint32',
-                    'getRepeatedSint64',
-                    'getRepeatedFixed32',
-                    'getRepeatedFixed64',
-                    'getRepeatedSfixed32',
-                    'getRepeatedSfixed64',
-                    'getRepeatedFloat',
-                    'getRepeatedDouble',
-                    'getRepeatedBool',
-                    'getRepeatedString',
-                    'getRepeatedBytes',
-                    'getRepeatedEnum',
-                    'getRepeatedMessage',
-                    'getRepeatedRecursive',
-                    'getRepeatedNoNamespaceMessage',
-                    'getRepeatedNoNamespaceEnum',
-                ],
-                '@return \Google\Protobuf\Internal\RepeatedField'
-            ],
-            [
-                [
-                    'getMapInt32Int32',
-                    'getMapInt64Int64',
-                    'getMapUint32Uint32',
-                    'getMapUint64Uint64',
-                    'getMapSint32Sint32',
-                    'getMapSint64Sint64',
-                    'getMapFixed32Fixed32',
-                    'getMapFixed64Fixed64',
-                    'getMapSfixed32Sfixed32',
-                    'getMapSfixed64Sfixed64',
-                    'getMapInt32Float',
-                    'getMapInt32Double',
-                    'getMapBoolBool',
-                    'getMapStringString',
-                    'getMapInt32Bytes',
-                    'getMapInt32Enum',
-                    'getMapInt32Message',
-                    'getMapRecursive',
-                ],
-                '@return \Google\Protobuf\Internal\MapField'
-            ],
-            [
-                [
-                    'setRepeatedInt32',
-                    'setRepeatedUint32',
-                    'setRepeatedSint32',
-                    'setRepeatedFixed32',
-                    'setRepeatedSfixed32',
-                    'setRepeatedEnum',
-                    'setRepeatedNoNamespaceEnum',
-                ],
-                '@param array<int>|\Google\Protobuf\Internal\RepeatedField $var'
-            ],
-            [
-                [
-                    'setRepeatedInt64',
-                    'setRepeatedUint64',
-                    'setRepeatedSint64',
-                    'setRepeatedFixed64',
-                    'setRepeatedSfixed64',
-                ],
-                '@param array<int>|array<string>|\Google\Protobuf\Internal\RepeatedField $var'
-            ],
-            [
-                [
-                    'setRepeatedFloat',
-                    'setRepeatedDouble',
-                ],
-                '@param array<float>|\Google\Protobuf\Internal\RepeatedField $var'
-            ],
-            [
-                [
-                    'setRepeatedBool',
-                ],
-                '@param array<bool>|\Google\Protobuf\Internal\RepeatedField $var'
-            ],
-            [
-                [
-                    'setRepeatedString',
-                    'setRepeatedBytes',
-                ],
-                '@param array<string>|\Google\Protobuf\Internal\RepeatedField $var'
-            ],
-            [
-                [
-                    'setRepeatedMessage',
-                ],
-                '@param array<\Foo\TestMessage\Sub>|\Google\Protobuf\Internal\RepeatedField $var'
-            ],
-            [
-                [
-                    'setRepeatedRecursive',
-                ],
-                '@param array<\Foo\TestMessage>|\Google\Protobuf\Internal\RepeatedField $var'
-            ],
-            [
-                [
-                    'setRepeatedNoNamespaceMessage',
-                ],
-                '@param array<\NoNamespaceMessage>|\Google\Protobuf\Internal\RepeatedField $var'
-            ],
-            [
-                [
-                    'setMapInt32Int32',
-                    'setMapInt64Int64',
-                    'setMapUint32Uint32',
-                    'setMapUint64Uint64',
-                    'setMapSint32Sint32',
-                    'setMapSint64Sint64',
-                    'setMapFixed32Fixed32',
-                    'setMapFixed64Fixed64',
-                    'setMapSfixed32Sfixed32',
-                    'setMapSfixed64Sfixed64',
-                    'setMapInt32Float',
-                    'setMapInt32Double',
-                    'setMapBoolBool',
-                    'setMapStringString',
-                    'setMapInt32Bytes',
-                    'setMapInt32Enum',
-                    'setMapInt32Message',
-                    'setMapRecursive',
-                ],
-                '@param array|\Google\Protobuf\Internal\MapField $var'
-            ],
-            [
-                [
-                    'getOptionalFloat',
-                    'getOptionalDouble',
-                    'getOneofDouble',
-                    'getOneofFloat',
-                ],
-                '@return float'
-            ],
-            [
-                [
-                    'setOptionalFloat',
-                    'setOptionalDouble',
-                    'setOneofDouble',
-                    'setOneofFloat',
-                ],
-                '@param float $var'
-            ],
-            [
-                [
-                    'getOptionalBool',
-                    'getOneofBool',
-                ],
-                '@return bool'],
-            [
-                [
-                    'setOptionalBool',
-                    'setOneofBool',
-                ],
-                '@param bool $var'
-            ],
-            [
-                [
-                    'getOptionalString',
-                    'getOptionalBytes',
-                    'getOneofString',
-                    'getOneofBytes',
-                    'getMyOneof',
-                ],
-                '@return string'
-            ],
-            [
-                [
-                    'setOptionalString',
-                    'setOptionalBytes',
-                    'setOneofString',
-                    'setOneofBytes',
-                ],
-                '@param string $var'
-            ],
-
-            [
-                [
-                    'getOptionalMessage',
-                    'getOneofMessage'
-                ],
-                '@return \Foo\TestMessage\Sub'
-            ],
-            [
-                [
-                    'setOptionalMessage',
-                    'setOneofMessage'
-                ],
-                '@param \Foo\TestMessage\Sub $var'
-            ],
-            [
-                [
-                    'getOptionalIncludedMessage'
-                ],
-                '@return \Bar\TestInclude'
-            ],
-            [
-                [
-                    'setOptionalIncludedMessage'
-                ],
-                '@param \Bar\TestInclude $var'
-            ],
-            [
-                [
-                    'getRecursive'
-                ],
-                '@return \Foo\TestMessage'
-            ],
-            [
-                [
-                    'setRecursive'
-                ],
-                '@param \Foo\TestMessage $var'
-            ],
-
-            [
-                [
-                    'getOptionalNoNamespaceMessage'
-                ],
-                '@return \NoNamespaceMessage'
-            ],
-            [
-                [
-                    'setOptionalNoNamespaceMessage'
-                ],
-                '@param \NoNamespaceMessage $var'
-            ],
-            [
-                [
-                    'setDeprecatedOptionalInt32',
-                    'getDeprecatedOptionalInt32',
-                ],
-                '@deprecated'
-            ],
-        ];
-    }
-}
diff --git a/libs/protobuf/php/tests/GeneratedServiceTest.php b/libs/protobuf/php/tests/GeneratedServiceTest.php
deleted file mode 100644
index be9234c..0000000
--- a/libs/protobuf/php/tests/GeneratedServiceTest.php
+++ /dev/null
@@ -1,127 +0,0 @@
-<?php
-
-require_once('test_base.php');
-require_once('test_util.php');
-
-use Google\Protobuf\Internal\RepeatedField;
-use Google\Protobuf\Internal\MapField;
-use Google\Protobuf\Internal\GPBType;
-use Foo\Greeter;
-use Foo\HelloRequest;
-use Foo\HelloReply;
-
-class GeneratedServiceTest extends TestBase
-{
-    /**
-     * @var \ReflectionClass
-     */
-    private $serviceClass;
-
-    /**
-     * @var \ReflectionClass
-     */
-    private $namespacedServiceClass;
-
-    /**
-     * @var array
-     */
-    private $methodNames = [
-        'sayHello',
-        'sayHelloAgain'
-    ];
-
-    /**
-     * Avoid calling setUp, which has void return type (not avalialbe in php7.0).
-     *
-     * @before
-     */
-    public function setUpTest()
-    {
-        $this->serviceClass = new ReflectionClass('Foo\GreeterInterface');
-
-        $this->namespacedServiceClass = new ReflectionClass('Bar\OtherGreeterInterface');
-    }
-
-    public function testIsInterface()
-    {
-        $this->assertTrue($this->serviceClass->isInterface());
-    }
-
-    public function testPhpDocForClass()
-    {
-        $this->assertStringContains(
-            'foo.Greeter', $this->serviceClass->getDocComment());
-    }
-
-    public function testPhpDocForNamespacedClass()
-    {
-        $this->assertStringContains(
-            'foo.OtherGreeter', $this->namespacedServiceClass->getDocComment());
-    }
-
-    public function testServiceMethodsAreGenerated()
-    {
-        $this->assertCount(
-            count($this->methodNames), $this->serviceClass->getMethods());
-        foreach ($this->methodNames as $methodName) {
-            $this->assertTrue($this->serviceClass->hasMethod($methodName));
-        }
-    }
-
-    public function testPhpDocForServiceMethod()
-    {
-        foreach ($this->methodNames as $methodName) {
-            $docComment =
-                $this->serviceClass->getMethod($methodName)->getDocComment();
-            $this->assertStringContains($methodName, $docComment);
-            $this->assertStringContains(
-                '@param \Foo\HelloRequest $request', $docComment);
-            $this->assertStringContains(
-                '@return \Foo\HelloReply', $docComment);
-        }
-    }
-
-    public function testPhpDocForServiceMethodInNamespacedClass()
-    {
-        foreach ($this->methodNames as $methodName) {
-            $docComment =
-                $this->namespacedServiceClass->getMethod(
-                    $methodName)->getDocComment();
-            $this->assertStringContains($methodName, $docComment);
-            $this->assertStringContains(
-                '@param \Foo\HelloRequest $request', $docComment);
-            $this->assertStringContains(
-                '@return \Foo\HelloReply', $docComment);
-        }
-    }
-
-    public function testParamForServiceMethod()
-    {
-        foreach ($this->methodNames as $methodName) {
-            $method = $this->serviceClass->getMethod($methodName);
-            $this->assertCount(1, $method->getParameters());
-            $param = $method->getParameters()[0];
-            $this->assertFalse($param->isOptional());
-            $this->assertSame('request', $param->getName());
-	    // ReflectionParameter::getType only exists in PHP 7+, so get the
-	    // type from __toString
-            $this->assertStringContains(
-                'Foo\HelloRequest $request', (string) $param);
-        }
-    }
-
-    public function testParamForServiceMethodInNamespacedClass()
-    {
-        foreach ($this->methodNames as $methodName) {
-            $method = $this->serviceClass->getMethod($methodName);
-            $this->assertCount(1, $method->getParameters());
-            $param = $method->getParameters()[0];
-            $this->assertFalse($param->isOptional());
-            $this->assertSame('request', $param->getName());
-	    // ReflectionParameter::getType only exists in PHP 7+, so get the
-	    // type from __toString
-            $this->assertStringContains(
-                'Foo\HelloRequest $request', (string) $param);
-        }
-    }
-}
diff --git a/libs/protobuf/php/tests/MapFieldTest.php b/libs/protobuf/php/tests/MapFieldTest.php
deleted file mode 100644
index 2d8ae61..0000000
--- a/libs/protobuf/php/tests/MapFieldTest.php
+++ /dev/null
@@ -1,555 +0,0 @@
-<?php
-
-require_once('test_base.php');
-require_once('test_util.php');
-
-use Google\Protobuf\Internal\GPBType;
-use Google\Protobuf\Internal\MapField;
-use Foo\TestMessage;
-use Foo\TestMessage\Sub;
-
-class MapFieldTest extends TestBase {
-
-    #########################################################
-    # Test int32 field.
-    #########################################################
-
-    public function testInt32() {
-        $arr = new MapField(GPBType::INT32, GPBType::INT32);
-
-        // Test integer argument.
-        $arr[MAX_INT32] = MAX_INT32;
-        $this->assertSame(MAX_INT32, $arr[MAX_INT32]);
-        $arr[MIN_INT32] = MIN_INT32;
-        $this->assertSame(MIN_INT32, $arr[MIN_INT32]);
-        $this->assertEquals(2, count($arr));
-        $this->assertTrue(isset($arr[MAX_INT32]));
-        $this->assertTrue(isset($arr[MIN_INT32]));
-        unset($arr[MAX_INT32]);
-        unset($arr[MIN_INT32]);
-        $this->assertEquals(0, count($arr));
-
-        // Test float argument.
-        $arr[1.9] = 1.9;
-        $arr[2.1] = 2.1;
-        $this->assertSame(1, $arr[1]);
-        $this->assertSame(2, $arr[2]);
-        $arr[MAX_INT32_FLOAT] = MAX_INT32_FLOAT;
-        $this->assertSame(MAX_INT32, $arr[MAX_INT32]);
-        $arr[MIN_INT32_FLOAT] = MIN_INT32_FLOAT;
-        $this->assertSame(MIN_INT32, $arr[MIN_INT32]);
-        $this->assertEquals(4, count($arr));
-        unset($arr[1.9]);
-        unset($arr[2.9]);
-        unset($arr[MAX_INT32_FLOAT]);
-        unset($arr[MIN_INT32_FLOAT]);
-        $this->assertEquals(0, count($arr));
-
-        // Test string argument.
-        $arr['2'] = '2';
-        $this->assertSame(2, $arr[2]);
-        $arr['3.1'] = '3.1';
-        $this->assertSame(3, $arr[3]);
-        $arr[MAX_INT32_STRING] = MAX_INT32_STRING;
-        $this->assertSame(MAX_INT32, $arr[MAX_INT32]);
-        $this->assertEquals(3, count($arr));
-        unset($arr['2']);
-        unset($arr['3.1']);
-        unset($arr[MAX_INT32_STRING]);
-        $this->assertEquals(0, count($arr));
-
-        // Test foreach.
-        $arr = new MapField(GPBType::INT32, GPBType::INT32);
-        for ($i = 0; $i < 3; $i++) {
-          $arr[$i] = $i;
-        }
-        $i = 0;
-        $arr_test = [];
-        foreach ($arr as $key => $val) {
-          $this->assertSame($key, $val);
-          $arr_test[] = $key;
-          $i++;
-        }
-        $this->assertTrue(isset($arr_test[0]));
-        $this->assertTrue(isset($arr_test[1]));
-        $this->assertTrue(isset($arr_test[2]));
-        $this->assertSame(3, $i);
-    }
-
-    #########################################################
-    # Test uint32 field.
-    #########################################################
-
-    public function testUint32() {
-        $arr = new MapField(GPBType::UINT32, GPBType::UINT32);
-
-        // Test integer argument.
-        $arr[MAX_UINT32] = MAX_UINT32;
-        $this->assertSame(-1, $arr[-1]);
-        $this->assertEquals(1, count($arr));
-        unset($arr[MAX_UINT32]);
-        $this->assertEquals(0, count($arr));
-
-        $arr[-1] = -1;
-        $this->assertSame(-1, $arr[-1]);
-        $arr[MIN_UINT32] = MIN_UINT32;
-        $this->assertSame(MIN_UINT32, $arr[MIN_UINT32]);
-        $this->assertEquals(2, count($arr));
-        unset($arr[-1]);
-        unset($arr[MIN_UINT32]);
-        $this->assertEquals(0, count($arr));
-
-        // Test float argument.
-        $arr[MAX_UINT32_FLOAT] = MAX_UINT32_FLOAT;
-        $this->assertSame(-1, $arr[-1]);
-        $this->assertEquals(1, count($arr));
-        unset($arr[MAX_UINT32_FLOAT]);
-        $this->assertEquals(0, count($arr));
-
-        $arr[3.1] = 3.1;
-        $this->assertSame(3, $arr[3]);
-        $arr[-1.0] = -1.0;
-        $this->assertSame(-1, $arr[-1]);
-        $arr[MIN_UINT32_FLOAT] = MIN_UINT32_FLOAT;
-        $this->assertSame(MIN_UINT32, $arr[MIN_UINT32]);
-        $this->assertEquals(3, count($arr));
-        unset($arr[3.1]);
-        unset($arr[-1.0]);
-        unset($arr[MIN_UINT32_FLOAT]);
-        $this->assertEquals(0, count($arr));
-
-        // Test string argument.
-        $arr[MAX_UINT32_STRING] = MAX_UINT32_STRING;
-        $this->assertSame(-1, $arr[-1]);
-        $this->assertEquals(1, count($arr));
-        unset($arr[MAX_UINT32_STRING]);
-        $this->assertEquals(0, count($arr));
-
-        $arr['7'] = '7';
-        $this->assertSame(7, $arr[7]);
-        $arr['3.1'] = '3.1';
-        $this->assertSame(3, $arr[3]);
-        $arr['-1.0'] = '-1.0';
-        $this->assertSame(-1, $arr[-1]);
-        $arr[MIN_UINT32_STRING] = MIN_UINT32_STRING;
-        $this->assertSame(MIN_UINT32, $arr[MIN_UINT32]);
-        $this->assertEquals(4, count($arr));
-        unset($arr['7']);
-        unset($arr['3.1']);
-        unset($arr['-1.0']);
-        unset($arr[MIN_UINT32_STRING]);
-        $this->assertEquals(0, count($arr));
-    }
-
-    #########################################################
-    # Test int64 field.
-    #########################################################
-
-    public function testInt64() {
-        $arr = new MapField(GPBType::INT64, GPBType::INT64);
-
-        // Test integer argument.
-        $arr[MAX_INT64] = MAX_INT64;
-        $arr[MIN_INT64] = MIN_INT64;
-        if (PHP_INT_SIZE == 4) {
-            $this->assertSame(MAX_INT64_STRING, $arr[MAX_INT64_STRING]);
-            $this->assertSame(MIN_INT64_STRING, $arr[MIN_INT64_STRING]);
-        } else {
-            $this->assertSame(MAX_INT64, $arr[MAX_INT64]);
-            $this->assertSame(MIN_INT64, $arr[MIN_INT64]);
-        }
-        $this->assertEquals(2, count($arr));
-        unset($arr[MAX_INT64]);
-        unset($arr[MIN_INT64]);
-        $this->assertEquals(0, count($arr));
-
-        // Test float argument.
-        $arr[1.1] = 1.1;
-        if (PHP_INT_SIZE == 4) {
-            $this->assertSame('1', $arr['1']);
-        } else {
-            $this->assertSame(1, $arr[1]);
-        }
-        $this->assertEquals(1, count($arr));
-        unset($arr[1.1]);
-        $this->assertEquals(0, count($arr));
-
-        // Test string argument.
-        $arr['2'] = '2';
-        $arr['3.1'] = '3.1';
-        $arr[MAX_INT64_STRING] = MAX_INT64_STRING;
-        $arr[MIN_INT64_STRING] = MIN_INT64_STRING;
-        if (PHP_INT_SIZE == 4) {
-            $this->assertSame('2', $arr['2']);
-            $this->assertSame('3', $arr['3']);
-            $this->assertSame(MAX_INT64_STRING, $arr[MAX_INT64_STRING]);
-            $this->assertSame(MIN_INT64_STRING, $arr[MIN_INT64_STRING]);
-        } else {
-            $this->assertSame(2, $arr[2]);
-            $this->assertSame(3, $arr[3]);
-            $this->assertSame(MAX_INT64, $arr[MAX_INT64]);
-            $this->assertSame(MIN_INT64, $arr[MIN_INT64]);
-        }
-        $this->assertEquals(4, count($arr));
-        unset($arr['2']);
-        unset($arr['3.1']);
-        unset($arr[MAX_INT64_STRING]);
-        unset($arr[MIN_INT64_STRING]);
-        $this->assertEquals(0, count($arr));
-    }
-
-    #########################################################
-    # Test uint64 field.
-    #########################################################
-
-    public function testUint64() {
-        $arr = new MapField(GPBType::UINT64, GPBType::UINT64);
-
-        // Test integer argument.
-        $arr[MAX_UINT64] = MAX_UINT64;
-        if (PHP_INT_SIZE == 4) {
-            $this->assertSame(MAX_UINT64_STRING, $arr[MAX_UINT64_STRING]);
-        } else {
-            $this->assertSame(MAX_UINT64, $arr[MAX_UINT64]);
-        }
-        $this->assertEquals(1, count($arr));
-        unset($arr[MAX_UINT64]);
-        $this->assertEquals(0, count($arr));
-
-        // Test float argument.
-        $arr[1.1] = 1.1;
-        if (PHP_INT_SIZE == 4) {
-            $this->assertSame('1', $arr['1']);
-        } else {
-            $this->assertSame(1, $arr[1]);
-        }
-        $this->assertEquals(1, count($arr));
-        unset($arr[1.1]);
-        $this->assertEquals(0, count($arr));
-
-        // Test string argument.
-        $arr['2'] = '2';
-        $arr['3.1'] = '3.1';
-        $arr[MAX_UINT64_STRING] = MAX_UINT64_STRING;
-
-        if (PHP_INT_SIZE == 4) {
-            $this->assertSame('2', $arr['2']);
-            $this->assertSame('3', $arr['3']);
-            $this->assertSame(MAX_UINT64_STRING, $arr[MAX_UINT64_STRING]);
-        } else {
-            $this->assertSame(2, $arr[2]);
-            $this->assertSame(3, $arr[3]);
-            $this->assertSame(MAX_UINT64, $arr[MAX_UINT64]);
-        }
-
-        $this->assertEquals(3, count($arr));
-        unset($arr['2']);
-        unset($arr['3.1']);
-        unset($arr[MAX_UINT64_STRING]);
-        $this->assertEquals(0, count($arr));
-    }
-
-    #########################################################
-    # Test float field.
-    #########################################################
-
-    public function testFloat() {
-        $arr = new MapField(GPBType::INT32, GPBType::FLOAT);
-
-        // Test set.
-        $arr[0] = 1;
-        $this->assertFloatEquals(1.0, $arr[0], MAX_FLOAT_DIFF);
-
-        $arr[1] = 1.1;
-        $this->assertFloatEquals(1.1, $arr[1], MAX_FLOAT_DIFF);
-
-        $arr[2] = '2';
-        $this->assertFloatEquals(2.0, $arr[2], MAX_FLOAT_DIFF);
-        $arr[3] = '3.1';
-        $this->assertFloatEquals(3.1, $arr[3], MAX_FLOAT_DIFF);
-
-        $this->assertEquals(4, count($arr));
-    }
-
-    #########################################################
-    # Test double field.
-    #########################################################
-
-    public function testDouble() {
-        $arr = new MapField(GPBType::INT32, GPBType::DOUBLE);
-
-        // Test set.
-        $arr[0] = 1;
-        $this->assertFloatEquals(1.0, $arr[0], MAX_FLOAT_DIFF);
-
-        $arr[1] = 1.1;
-        $this->assertFloatEquals(1.1, $arr[1], MAX_FLOAT_DIFF);
-
-        $arr[2] = '2';
-        $this->assertFloatEquals(2.0, $arr[2], MAX_FLOAT_DIFF);
-        $arr[3] = '3.1';
-        $this->assertFloatEquals(3.1, $arr[3], MAX_FLOAT_DIFF);
-
-        $this->assertEquals(4, count($arr));
-    }
-
-    #########################################################
-    # Test bool field.
-    #########################################################
-
-    public function testBool() {
-        $arr = new MapField(GPBType::BOOL, GPBType::BOOL);
-
-        // Test boolean.
-        $arr[True] = True;
-        $this->assertSame(True, $arr[True]);
-        $this->assertEquals(1, count($arr));
-        unset($arr[True]);
-        $this->assertEquals(0, count($arr));
-
-        $arr[False] = False;
-        $this->assertSame(False, $arr[False]);
-        $this->assertEquals(1, count($arr));
-        unset($arr[False]);
-        $this->assertEquals(0, count($arr));
-
-        // Test integer.
-        $arr[-1] = -1;
-        $this->assertSame(True, $arr[True]);
-        $this->assertEquals(1, count($arr));
-        unset($arr[-1]);
-        $this->assertEquals(0, count($arr));
-
-        $arr[0] = 0;
-        $this->assertSame(False, $arr[False]);
-        $this->assertEquals(1, count($arr));
-        unset($arr[0]);
-        $this->assertEquals(0, count($arr));
-
-        // Test float.
-        $arr[1.1] = 1.1;
-        $this->assertSame(True, $arr[True]);
-        $this->assertEquals(1, count($arr));
-        unset($arr[1.1]);
-        $this->assertEquals(0, count($arr));
-
-        $arr[0.0] = 0.0;
-        $this->assertSame(False, $arr[False]);
-        $this->assertEquals(1, count($arr));
-        unset($arr[0.0]);
-        $this->assertEquals(0, count($arr));
-
-        // Test string.
-        $arr['a'] = 'a';
-        $this->assertSame(True, $arr[True]);
-        $this->assertEquals(1, count($arr));
-        unset($arr['a']);
-        $this->assertEquals(0, count($arr));
-
-        $arr[''] = '';
-        $this->assertSame(False, $arr[False]);
-        $this->assertEquals(1, count($arr));
-        unset($arr['']);
-        $this->assertEquals(0, count($arr));
-    }
-
-    #########################################################
-    # Test string field.
-    #########################################################
-
-    public function testString() {
-        $arr = new MapField(GPBType::STRING, GPBType::STRING);
-
-        // Test set.
-        $arr['abc'] = 'abc';
-        $this->assertSame('abc', $arr['abc']);
-        $this->assertEquals(1, count($arr));
-        unset($arr['abc']);
-        $this->assertEquals(0, count($arr));
-
-        $arr[1] = 1;
-        $this->assertSame('1', $arr['1']);
-        $this->assertEquals(1, count($arr));
-        unset($arr[1]);
-        $this->assertEquals(0, count($arr));
-
-        $arr[1.1] = 1.1;
-        $this->assertSame('1.1', $arr['1.1']);
-        $this->assertEquals(1, count($arr));
-        unset($arr[1.1]);
-        $this->assertEquals(0, count($arr));
-
-        $arr[True] = True;
-        $this->assertSame('1', $arr['1']);
-        $this->assertEquals(1, count($arr));
-        unset($arr[True]);
-        $this->assertEquals(0, count($arr));
-
-        // Test foreach.
-        $arr = new MapField(GPBType::STRING, GPBType::STRING);
-        for ($i = 0; $i < 3; $i++) {
-          $arr[$i] = $i;
-        }
-        $i = 0;
-        $arr_test = [];
-        foreach ($arr as $key => $val) {
-          $this->assertSame($key, $val);
-          $arr_test[] = $key;
-          $i++;
-        }
-        $this->assertTrue(isset($arr_test['0']));
-        $this->assertTrue(isset($arr_test['1']));
-        $this->assertTrue(isset($arr_test['2']));
-        $this->assertSame(3, $i);
-    }
-
-    #########################################################
-    # Test message field.
-    #########################################################
-
-    public function testMessage() {
-        $arr = new MapField(GPBType::INT32,
-            GPBType::MESSAGE, Sub::class);
-
-        // Test append.
-        $sub_m = new Sub();
-        $sub_m->setA(1);
-        $arr[0] = $sub_m;
-        $this->assertSame(1, $arr[0]->getA());
-
-        $this->assertEquals(1, count($arr));
-
-        // Test foreach.
-        $arr = new MapField(GPBType::INT32,
-            GPBType::MESSAGE, Sub::class);
-        for ($i = 0; $i < 3; $i++) {
-          $arr[$i] = new Sub();;
-          $arr[$i]->setA($i);
-        }
-        $i = 0;
-        $key_test = [];
-        $value_test = [];
-        foreach ($arr as $key => $val) {
-          $key_test[] = $key;
-          $value_test[] = $val->getA();
-          $i++;
-        }
-        $this->assertTrue(isset($key_test['0']));
-        $this->assertTrue(isset($key_test['1']));
-        $this->assertTrue(isset($key_test['2']));
-        $this->assertTrue(isset($value_test['0']));
-        $this->assertTrue(isset($value_test['1']));
-        $this->assertTrue(isset($value_test['2']));
-        $this->assertSame(3, $i);
-    }
-
-    #########################################################
-    # Test reference in map
-    #########################################################
-
-    public function testMapElementIsReference()
-    {
-        // Bool elements
-        $values = [true => true];
-        array_walk($values, function (&$value) {});
-        $m = new TestMessage();
-        $m->setMapBoolBool($values);
-
-        // Int32 elements
-        $values = [1 => 1];
-        array_walk($values, function (&$value) {});
-        $m = new TestMessage();
-        $m->setMapInt32Int32($values);
-
-        // Double elements
-        $values = [1 => 1.0];
-        array_walk($values, function (&$value) {});
-        $m = new TestMessage();
-        $m->setMapInt32Double($values);
-
-        // String elements
-        $values = ['a' => 'a'];
-        array_walk($values, function (&$value) {});
-        $m = new TestMessage();
-        $m->setMapStringString($values);
-
-        // Message elements
-        $values = [1 => new Sub()];
-        array_walk($values, function (&$value) {});
-        $m = new TestMessage();
-        $m->setMapInt32Message($values);
-
-        $this->assertTrue(true);
-    }
-
-    #########################################################
-    # Test equality
-    #########################################################
-
-    public function testEquality()
-    {
-        $map = new MapField(GPBType::INT32, GPBType::INT32);
-        $map2 = new MapField(GPBType::INT32, GPBType::INT32);
-
-        $this->assertTrue($map == $map2);
-
-        $map[1] = 2;
-
-        $this->assertFalse($map == $map2);
-
-        $map2[1] = 2;
-
-        $this->assertTrue($map == $map2);
-
-        // Arrays of different types always compare false.
-        $this->assertFalse(new MapField(GPBType::INT32, GPBType::INT32) ==
-                           new MapField(GPBType::INT32, GPBType::INT64));
-        $this->assertFalse(new MapField(GPBType::INT32, GPBType::INT32) ==
-                           new MapField(GPBType::INT64, GPBType::INT32));
-        $this->assertFalse(
-            new MapField(GPBType::INT32, GPBType::MESSAGE, TestMessage::class) ==
-            new MapField(GPBType::INT32, GPBType::MESSAGE, Sub::class));
-    }
-
-    #########################################################
-    # Test clone
-    #########################################################
-
-    public function testClone()
-    {
-        $map = new MapField(GPBType::INT32,
-            GPBType::MESSAGE, Sub::class);
-
-        // Test append.
-        $sub_m = new Sub();
-        $sub_m->setA(1);
-        $map[0] = $sub_m;
-
-        $map2 = clone $map;
-        $this->assertSame($map[0], $map2[0]);
-    }
-
-    #########################################################
-    # Test memory leak
-    #########################################################
-
-    // TODO(teboring): Add it back.
-    // public function testCycleLeak()
-    // {
-    //     $arr = new MapField(GPBType::INT32,
-    //         GPBType::MESSAGE, TestMessage::class);
-    //     $arr[0] = new TestMessage;
-    //     $arr[0]->SetMapRecursive($arr);
-
-    //     // Clean up memory before test.
-    //     gc_collect_cycles();
-    //     $start = memory_get_usage();
-    //     unset($arr);
-
-    //     // Explicitly trigger garbage collection.
-    //     gc_collect_cycles();
-
-    //     $end = memory_get_usage();
-    //     $this->assertLessThan($start, $end);
-    // }
-}
diff --git a/libs/protobuf/php/tests/PhpImplementationTest.php b/libs/protobuf/php/tests/PhpImplementationTest.php
deleted file mode 100644
index 7187315..0000000
--- a/libs/protobuf/php/tests/PhpImplementationTest.php
+++ /dev/null
@@ -1,605 +0,0 @@
-<?php
-
-require_once('test_base.php');
-require_once('test_util.php');
-
-use Foo\TestEnum;
-use Foo\TestMessage;
-use Foo\TestMessage\Sub;
-use Foo\TestPackedMessage;
-use Google\Protobuf\Internal\CodedInputStream;
-use Google\Protobuf\Internal\FileDescriptorSet;
-use Google\Protobuf\Internal\GPBLabel;
-use Google\Protobuf\Internal\GPBType;
-use Google\Protobuf\Internal\GPBWire;
-use Google\Protobuf\Internal\CodedOutputStream;
-
-/**
- * Please note, this test is only intended to be run without the protobuf C
- * extension.
- */
-class PhpImplementationTest extends TestBase
-{
-    /**
-     * Avoid calling setUp, which has void return type (not avalialbe in php7.0).
-     * @before
-     */
-    public function skipTestsForExtension()
-    {
-        if (extension_loaded('protobuf')) {
-            $this->markTestSkipped();
-        }
-    }
-
-    public function testReadInt32()
-    {
-        $value = null;
-
-        // Positive number.
-        $input = new CodedInputStream(hex2bin("01"));
-        GPBWire::readInt32($input, $value);
-        $this->assertSame(1, $value);
-
-        // Negative number.
-        $input = new CodedInputStream(hex2bin("ffffffff0f"));
-        GPBWire::readInt32($input, $value);
-        $this->assertSame(-1, $value);
-
-        // Discard overflow bits.
-        $input = new CodedInputStream(hex2bin("ffffffff7f"));
-        GPBWire::readInt32($input, $value);
-        $this->assertSame(-1, $value);
-    }
-
-    public function testReadUint32()
-    {
-        $value = null;
-
-        // Positive number.
-        $input = new CodedInputStream(hex2bin("01"));
-        GPBWire::readUint32($input, $value);
-        $this->assertSame(1, $value);
-
-        // Max uint32.
-        $input = new CodedInputStream(hex2bin("ffffffff0f"));
-        GPBWire::readUint32($input, $value);
-        $this->assertSame(-1, $value);
-
-        // Discard overflow bits.
-        $input = new CodedInputStream(hex2bin("ffffffff7f"));
-        GPBWire::readUint32($input, $value);
-        $this->assertSame(-1, $value);
-    }
-
-    public function testReadInt64()
-    {
-        $value = null;
-
-        // Positive number.
-        $input = new CodedInputStream(hex2bin("01"));
-        GPBWire::readInt64($input, $value);
-        $this->assertEquals(1, $value);
-
-        // Negative number.
-        $input = new CodedInputStream(hex2bin("ffffffffffffffffff01"));
-        GPBWire::readInt64($input, $value);
-        $this->assertEquals(-1, $value);
-
-        // Discard overflow bits.
-        $input = new CodedInputStream(hex2bin("ffffffffffffffffff0f"));
-        GPBWire::readInt64($input, $value);
-        $this->assertEquals(-1, $value);
-    }
-
-    public function testReadUint64()
-    {
-        $value = null;
-
-        // Positive number.
-        $input = new CodedInputStream(hex2bin("01"));
-        GPBWire::readUint64($input, $value);
-        $this->assertEquals(1, $value);
-
-        // Negative number.
-        $input = new CodedInputStream(hex2bin("FFFFFFFFFFFFFFFFFF01"));
-        GPBWire::readUint64($input, $value);
-        $this->assertEquals(-1, $value);
-
-        // Discard overflow bits.
-        $input = new CodedInputStream(hex2bin("FFFFFFFFFFFFFFFFFF0F"));
-        GPBWire::readUint64($input, $value);
-        $this->assertEquals(-1, $value);
-    }
-
-    public function testReadSint32()
-    {
-        $value = null;
-
-        $input = new CodedInputStream(hex2bin("00"));
-        GPBWire::readSint32($input, $value);
-        $this->assertSame(0, $value);
-
-        $input = new CodedInputStream(hex2bin("01"));
-        GPBWire::readSint32($input, $value);
-        $this->assertSame(-1, $value);
-
-        $input = new CodedInputStream(hex2bin("02"));
-        GPBWire::readSint32($input, $value);
-        $this->assertSame(1, $value);
-    }
-
-    public function testReadSint64()
-    {
-        $value = null;
-
-        $input = new CodedInputStream(hex2bin("00"));
-        GPBWire::readSint64($input, $value);
-        $this->assertEquals(0, $value);
-
-        $input = new CodedInputStream(hex2bin("01"));
-        GPBWire::readSint64($input, $value);
-        $this->assertEquals(-1, $value);
-
-        $input = new CodedInputStream(hex2bin("02"));
-        GPBWire::readSint64($input, $value);
-        $this->assertEquals(1, $value);
-    }
-
-    public function testReadFixed32()
-    {
-        $value = null;
-        $input = new CodedInputStream(hex2bin("12345678"));
-        GPBWire::readFixed32($input, $value);
-        $this->assertSame(0x78563412, $value);
-    }
-
-    public function testReadFixed64()
-    {
-        $value = null;
-        $input = new CodedInputStream(hex2bin("1234567812345678"));
-        GPBWire::readFixed64($input, $value);
-        if (PHP_INT_SIZE == 4) {
-            $this->assertSame("8671175386481439762", $value);
-        } else {
-            $this->assertSame(0x7856341278563412, $value);
-        }
-    }
-
-    public function testReadSfixed32()
-    {
-        $value = null;
-        $input = new CodedInputStream(hex2bin("12345678"));
-        GPBWire::readSfixed32($input, $value);
-        $this->assertSame(0x78563412, $value);
-    }
-
-    public function testReadFloat()
-    {
-        $value = null;
-        $input = new CodedInputStream(hex2bin("0000803F"));
-        GPBWire::readFloat($input, $value);
-        $this->assertSame(1.0, $value);
-    }
-
-    public function testReadBool()
-    {
-        $value = null;
-
-        $input = new CodedInputStream(hex2bin("00"));
-        GPBWire::readBool($input, $value);
-        $this->assertSame(false, $value);
-
-        $input = new CodedInputStream(hex2bin("01"));
-        GPBWire::readBool($input, $value);
-        $this->assertSame(true, $value);
-    }
-
-    public function testReadDouble()
-    {
-        $value = null;
-        $input = new CodedInputStream(hex2bin("000000000000F03F"));
-        GPBWire::readDouble($input, $value);
-        $this->assertSame(1.0, $value);
-    }
-
-    public function testReadSfixed64()
-    {
-        $value = null;
-        $input = new CodedInputStream(hex2bin("1234567812345678"));
-        GPBWire::readSfixed64($input, $value);
-        if (PHP_INT_SIZE == 4) {
-            $this->assertSame("8671175386481439762", $value);
-        } else {
-            $this->assertSame(0x7856341278563412, $value);
-        }
-    }
-
-    public function testZigZagEncodeDecode()
-    {
-        $this->assertSame(0, GPBWire::zigZagEncode32(0));
-        $this->assertSame(1, GPBWire::zigZagEncode32(-1));
-        $this->assertSame(2, GPBWire::zigZagEncode32(1));
-        $this->assertSame(3, GPBWire::zigZagEncode32(-2));
-        $this->assertSame(0x7FFFFFFE, GPBWire::zigZagEncode32(0x3FFFFFFF));
-        $this->assertSame(0x7FFFFFFF, GPBWire::zigZagEncode32(0xC0000000));
-        $this->assertSame(0x7FFFFFFF, GPBWire::zigZagEncode32(-1073741824));
-
-        $this->assertSame(0,  GPBWire::zigZagDecode32(0));
-        $this->assertSame(-1, GPBWire::zigZagDecode32(1));
-        $this->assertSame(1,  GPBWire::zigZagDecode32(2));
-        $this->assertSame(-2, GPBWire::zigZagDecode32(3));
-        $this->assertSame(0x3FFFFFFF,  GPBWire::zigZagDecode32(0x7FFFFFFE));
-        $this->assertSame(-1073741824, GPBWire::zigZagDecode32(0x7FFFFFFF));
-        $this->assertSame(0x7FFFFFFF,  GPBWire::zigZagDecode32(0xFFFFFFFE));
-        $this->assertSame((int)-2147483648,GPBWire::zigZagDecode32(0xFFFFFFFF));
-
-        if (PHP_INT_SIZE == 4) {
-            $this->assertSame(-2, GPBWire::zigZagEncode32(0x7FFFFFFF));
-            $this->assertSame(-1, GPBWire::zigZagEncode32(0x80000000));
-            $this->assertSame('0', GPBWire::zigZagEncode64(0));
-            $this->assertSame('1', GPBWire::zigZagEncode64(-1));
-            $this->assertSame('2', GPBWire::zigZagEncode64(1));
-            $this->assertSame('3', GPBWire::zigZagEncode64(-2));
-            $this->assertSame(
-                '2147483646',  // 0x7FFFFFE
-                GPBWire::zigZagEncode64(0x3FFFFFFF));
-            $this->assertSame(
-                '2147483647',  // 0x7FFFFFF
-                GPBWire::zigZagEncode64(-1073741824));  // 0xFFFFFFFFC0000000
-            $this->assertSame(
-                '4294967294',                           // 0xFFFFFFFE
-                GPBWire::zigZagEncode64(2147483647));   // 0x7FFFFFFF
-            $this->assertSame(
-                '4294967295',                           // 0xFFFFFFFF
-                GPBWire::zigZagEncode64(-2147483648));  // 0xFFFFFFFF80000000
-            $this->assertSame(
-                '18446744073709551614',  // 0xFFFFFFFFFFFFFFFE
-                                         // 0x7FFFFFFFFFFFFFFF
-                GPBWire::zigZagEncode64("9223372036854775807"));
-            $this->assertSame(
-                '18446744073709551615',  // 0xFFFFFFFFFFFFFFFF
-                                         // 0x8000000000000000
-                GPBWire::zigZagEncode64("-9223372036854775808"));
-
-            $this->assertSame('0', GPBWire::zigZagDecode64(0));
-            $this->assertSame('-1', GPBWire::zigZagDecode64(1));
-            $this->assertSame('1', GPBWire::zigZagDecode64(2));
-            $this->assertSame('-2', GPBWire::zigZagDecode64(3));
-        } else {
-            $this->assertSame(4294967294, GPBWire::zigZagEncode32(0x7FFFFFFF));
-            $this->assertSame(4294967295, GPBWire::zigZagEncode32(0x80000000));
-            $this->assertSame(0, GPBWire::zigZagEncode64(0));
-            $this->assertSame(1, GPBWire::zigZagEncode64(-1));
-            $this->assertSame(2, GPBWire::zigZagEncode64(1));
-            $this->assertSame(3, GPBWire::zigZagEncode64(-2));
-            $this->assertSame(0x7FFFFFFE, GPBWire::zigZagEncode64(0x3FFFFFFF));
-            $this->assertSame(
-                0x7FFFFFFF,
-                GPBWire::zigZagEncode64(0xFFFFFFFFC0000000));
-            $this->assertSame(
-                0xFFFFFFFE,
-                GPBWire::zigZagEncode64(0x7FFFFFFF));
-            $this->assertSame(
-                0xFFFFFFFF,
-                GPBWire::zigZagEncode64(0xFFFFFFFF80000000));
-            $this->assertSame(
-                -2,  // 0xFFFFFFFFFFFFFFFE
-                GPBWire::zigZagEncode64(0x7FFFFFFFFFFFFFFF));
-            $this->assertSame(
-                -1,  // 0xFFFFFFFFFFFFFFFF
-                GPBWire::zigZagEncode64(0x8000000000000000));
-
-            $this->assertSame(0, GPBWire::zigZagDecode64(0));
-            $this->assertSame(-1, GPBWire::zigZagDecode64(1));
-            $this->assertSame(1, GPBWire::zigZagDecode64(2));
-            $this->assertSame(-2, GPBWire::zigZagDecode64(3));
-        }
-
-        // Round trip
-        $this->assertSame(0, GPBWire::zigZagDecode32(GPBWire::zigZagEncode32(0)));
-        $this->assertSame(1, GPBWire::zigZagDecode32(GPBWire::zigZagEncode32(1)));
-        $this->assertSame(-1, GPBWire::zigZagDecode32(GPBWire::zigZagEncode32(-1)));
-        $this->assertSame(14927,
-                      GPBWire::zigZagDecode32(GPBWire::zigZagEncode32(14927)));
-        $this->assertSame(-3612,
-                      GPBWire::zigZagDecode32(GPBWire::zigZagEncode32(-3612)));
-    }
-
-    public function testDecode()
-    {
-        $m = new TestMessage();
-        $m->mergeFromString(TestUtil::getGoldenTestMessage());
-        TestUtil::assertTestMessage($m);
-
-        $this->assertTrue(true);
-    }
-
-    public function testDescriptorDecode()
-    {
-        $file_desc_set = new FileDescriptorSet();
-        $file_desc_set->mergeFromString(hex2bin(
-            "0a3b0a12746573745f696e636c7564652e70726f746f120362617222180a" .
-            "0b54657374496e636c75646512090a0161180120012805620670726f746f33"));
-
-        $this->assertSame(1, sizeof($file_desc_set->getFile()));
-
-        $file_desc = $file_desc_set->getFile()[0];
-        $this->assertSame("test_include.proto", $file_desc->getName());
-        $this->assertSame("bar", $file_desc->getPackage());
-        $this->assertSame(0, sizeof($file_desc->getDependency()));
-        $this->assertSame(1, sizeof($file_desc->getMessageType()));
-        $this->assertSame(0, sizeof($file_desc->getEnumType()));
-        $this->assertSame("proto3", $file_desc->getSyntax());
-
-        $desc = $file_desc->getMessageType()[0];
-        $this->assertSame("TestInclude", $desc->getName());
-        $this->assertSame(1, sizeof($desc->getField()));
-        $this->assertSame(0, sizeof($desc->getNestedType()));
-        $this->assertSame(0, sizeof($desc->getEnumType()));
-        $this->assertSame(0, sizeof($desc->getOneofDecl()));
-
-        $field = $desc->getField()[0];
-        $this->assertSame("a", $field->getName());
-        $this->assertSame(1, $field->getNumber());
-        $this->assertSame(GPBLabel::OPTIONAL, $field->getLabel());
-        $this->assertSame(GPBType::INT32, $field->getType());
-    }
-
-    public function testReadVarint64()
-    {
-        $var = 0;
-
-        // Empty buffer.
-        $input = new CodedInputStream(hex2bin(''));
-        $this->assertFalse($input->readVarint64($var));
-
-        // The largest varint is 10 bytes long.
-        $input = new CodedInputStream(hex2bin('8080808080808080808001'));
-        $this->assertFalse($input->readVarint64($var));
-
-        // Corrupted varint.
-        $input = new CodedInputStream(hex2bin('808080'));
-        $this->assertFalse($input->readVarint64($var));
-
-        // Normal case.
-        $input = new CodedInputStream(hex2bin('808001'));
-        $this->assertTrue($input->readVarint64($var));
-        if (PHP_INT_SIZE == 4) {
-            $this->assertSame('16384', $var);
-        } else {
-            $this->assertSame(16384, $var);
-        }
-        $this->assertFalse($input->readVarint64($var));
-
-        // Read two varint.
-        $input = new CodedInputStream(hex2bin('808001808002'));
-        $this->assertTrue($input->readVarint64($var));
-        if (PHP_INT_SIZE == 4) {
-            $this->assertSame('16384', $var);
-        } else {
-            $this->assertSame(16384, $var);
-        }
-        $this->assertTrue($input->readVarint64($var));
-        if (PHP_INT_SIZE == 4) {
-            $this->assertSame('32768', $var);
-        } else {
-            $this->assertSame(32768, $var);
-        }
-        $this->assertFalse($input->readVarint64($var));
-
-        // Read 64 testing
-        $testVals = array(
-            '10'                 => '0a000000000000000000',
-            '100'                => '64000000000000000000',
-            '800'                => 'a0060000000000000000',
-            '6400'               => '80320000000000000000',
-            '70400'              => '80a60400000000000000',
-            '774400'             => '80a22f00000000000000',
-            '9292800'            => '8098b704000000000000',
-            '74342400'           => '80c0b923000000000000',
-            '743424000'          => '8080bfe2020000000000',
-            '8177664000'         => '8080b5bb1e0000000000',
-            '65421312000'        => '8080a8dbf30100000000',
-            '785055744000'       => '8080e0c7ec1600000000',
-            '9420668928000'      => '808080dd969202000000',
-            '103627358208000'    => '808080fff9c717000000',
-            '1139900940288000'   => '808080f5bd9783020000',
-            '13678811283456000'  => '808080fce699a6180000',
-            '109430490267648000' => '808080e0b7ceb1c20100',
-            '984874412408832000' => '808080e0f5c1bed50d00',
-        );
-
-        foreach ($testVals as $original => $encoded) {
-            $input = new CodedInputStream(hex2bin($encoded));
-            $this->assertTrue($input->readVarint64($var));
-            $this->assertEquals($original, $var);
-        }
-    }
-
-    public function testReadVarint32()
-    {
-        $var = 0;
-
-        // Empty buffer.
-        $input = new CodedInputStream(hex2bin(''));
-        $this->assertFalse($input->readVarint32($var));
-
-        // The largest varint is 10 bytes long.
-        $input = new CodedInputStream(hex2bin('8080808080808080808001'));
-        $this->assertFalse($input->readVarint32($var));
-
-        // Corrupted varint.
-        $input = new CodedInputStream(hex2bin('808080'));
-        $this->assertFalse($input->readVarint32($var));
-
-        // Normal case.
-        $input = new CodedInputStream(hex2bin('808001'));
-        $this->assertTrue($input->readVarint32($var));
-        $this->assertSame(16384, $var);
-        $this->assertFalse($input->readVarint32($var));
-
-        // Read two varint.
-        $input = new CodedInputStream(hex2bin('808001808002'));
-        $this->assertTrue($input->readVarint32($var));
-        $this->assertSame(16384, $var);
-        $this->assertTrue($input->readVarint32($var));
-        $this->assertSame(32768, $var);
-        $this->assertFalse($input->readVarint32($var));
-
-        // Read a 64-bit integer. High-order bits should be discarded.
-        $input = new CodedInputStream(hex2bin('808081808001'));
-        $this->assertTrue($input->readVarint32($var));
-        $this->assertSame(16384, $var);
-        $this->assertFalse($input->readVarint32($var));
-    }
-
-    public function testReadTag()
-    {
-        $input = new CodedInputStream(hex2bin('808001'));
-        $tag = $input->readTag();
-        $this->assertSame(16384, $tag);
-        $tag = $input->readTag();
-        $this->assertSame(0, $tag);
-    }
-
-    public function testPushPopLimit()
-    {
-        $input = new CodedInputStream(hex2bin('808001'));
-        $old_limit = $input->pushLimit(0);
-        $tag = $input->readTag();
-        $this->assertSame(0, $tag);
-        $input->popLimit($old_limit);
-        $tag = $input->readTag();
-        $this->assertSame(16384, $tag);
-    }
-
-    public function testReadRaw()
-    {
-        $input = new CodedInputStream(hex2bin('808001'));
-        $buffer = null;
-
-        $this->assertTrue($input->readRaw(3, $buffer));
-        $this->assertSame(hex2bin('808001'), $buffer);
-
-        $this->assertFalse($input->readRaw(1, $buffer));
-    }
-
-    public function testWriteVarint32()
-    {
-        $output = new CodedOutputStream(3);
-        $output->writeVarint32(16384, true);
-        $this->assertSame(hex2bin('808001'), $output->getData());
-
-        // Negative numbers are padded to be compatible with int64.
-        $output = new CodedOutputStream(10);
-        $output->writeVarint32(-43, false);
-        $this->assertSame(hex2bin('D5FFFFFFFFFFFFFFFF01'), $output->getData());
-    }
-
-    public function testWriteVarint64()
-    {
-        $output = new CodedOutputStream(10);
-        $output->writeVarint64(-43);
-        $this->assertSame(hex2bin('D5FFFFFFFFFFFFFFFF01'), $output->getData());
-    }
-
-    public function testWriteLittleEndian32()
-    {
-        $output = new CodedOutputStream(4);
-        $output->writeLittleEndian32(46);
-        $this->assertSame(hex2bin('2E000000'), $output->getData());
-    }
-
-    public function testWriteLittleEndian64()
-    {
-        $output = new CodedOutputStream(8);
-        $output->writeLittleEndian64(47);
-        $this->assertSame(hex2bin('2F00000000000000'), $output->getData());
-    }
-
-    public function testByteSize()
-    {
-        $m = new TestMessage();
-        TestUtil::setTestMessage($m);
-        $this->assertSame(504, $m->byteSize());
-    }
-
-    public function testPackedByteSize()
-    {
-        $m = new TestPackedMessage();
-        TestUtil::setTestPackedMessage($m);
-        $this->assertSame(166, $m->byteSize());
-    }
-
-    public function testArrayConstructorJsonCaseThrowsException()
-    {
-        $this->expectException(UnexpectedValueException::class);
-        $this->expectExceptionMessage(
-            'Invalid message property: optionalInt32');
-
-        $m = new TestMessage([
-            'optionalInt32' => -42,
-        ]);
-    }
-
-    public function testArraysForMessagesThrowsException()
-    {
-        $this->expectException(Exception::class);
-        $this->expectExceptionMessage(
-            'Expect Foo\TestMessage\Sub.');
-
-        $m = new TestMessage([
-            'optional_message' => [
-                'a' => 33
-            ]
-        ]);
-    }
-
-    public function testArrayConstructorWithNullValues()
-    {
-        $requestData = [
-            'optional_bool' => null,
-            'optional_string' => null,
-            'optional_bytes' => null,
-            'optional_message' => null,
-        ];
-
-        $m = new TestMessage($requestData);
-
-        $this->assertSame(false, $m->getOptionalBool());
-        $this->assertSame('', $m->getOptionalString());
-        $this->assertSame('', $m->getOptionalBytes());
-        $this->assertSame(null, $m->getOptionalMessage());
-    }
-
-    /**
-     * @dataProvider provideArrayConstructorWithNullValuesThrowsException
-     */
-    public function testArrayConstructorWithNullValuesThrowsException($requestData)
-    {
-        $this->expectException(Exception::class);
-
-        $m = new TestMessage($requestData);
-    }
-
-    public function provideArrayConstructorWithNullValuesThrowsException()
-    {
-        return [
-            [['optional_int32' => null]],
-            [['optional_int64' => null]],
-            [['optional_uint32' => null]],
-            [['optional_uint64' => null]],
-            [['optional_sint32' => null]],
-            [['optional_sint64' => null]],
-            [['optional_fixed32' => null]],
-            [['optional_fixed64' => null]],
-            [['optional_sfixed32' => null]],
-            [['optional_sfixed64' => null]],
-            [['optional_float' => null]],
-            [['optional_double' => null]],
-            [['optional_enum' => null]],
-            [['repeated_int32' => null]],
-            [['map_int32_int32' => null]],
-        ];
-    }
-}
diff --git a/libs/protobuf/php/tests/PreviouslyGeneratedClassTest.php b/libs/protobuf/php/tests/PreviouslyGeneratedClassTest.php
deleted file mode 100644
index 077c84f..0000000
--- a/libs/protobuf/php/tests/PreviouslyGeneratedClassTest.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-require_once('test_base.php');
-require_once('test_util.php');
-
-class PreviouslyGeneratedClassTest extends TestBase
-{
-    #########################################################
-    # Test compatibility for previously unreserved words.
-    #########################################################
-
-    public function testPrefixForReservedWords()
-    {
-        $m = new \Previous\readonly();
-
-        $this->assertTrue(true);
-    }
-}
diff --git a/libs/protobuf/php/tests/WellKnownTest.php b/libs/protobuf/php/tests/WellKnownTest.php
deleted file mode 100644
index 486c65f..0000000
--- a/libs/protobuf/php/tests/WellKnownTest.php
+++ /dev/null
@@ -1,419 +0,0 @@
-<?php
-
-require_once('test_base.php');
-require_once('test_util.php');
-
-use Foo\TestMessage;
-use Foo\TestImportDescriptorProto;
-use Google\Protobuf\Any;
-use Google\Protobuf\Api;
-use Google\Protobuf\BoolValue;
-use Google\Protobuf\BytesValue;
-use Google\Protobuf\DoubleValue;
-use Google\Protobuf\Duration;
-use Google\Protobuf\Enum;
-use Google\Protobuf\EnumValue;
-use Google\Protobuf\Field;
-use Google\Protobuf\FieldMask;
-use Google\Protobuf\Field\Cardinality;
-use Google\Protobuf\Field\Kind;
-use Google\Protobuf\FloatValue;
-use Google\Protobuf\GPBEmpty;
-use Google\Protobuf\Int32Value;
-use Google\Protobuf\Int64Value;
-use Google\Protobuf\ListValue;
-use Google\Protobuf\Method;
-use Google\Protobuf\Mixin;
-use Google\Protobuf\NullValue;
-use Google\Protobuf\Option;
-use Google\Protobuf\SourceContext;
-use Google\Protobuf\StringValue;
-use Google\Protobuf\Struct;
-use Google\Protobuf\Syntax;
-use Google\Protobuf\Timestamp;
-use Google\Protobuf\Type;
-use Google\Protobuf\UInt32Value;
-use Google\Protobuf\UInt64Value;
-use Google\Protobuf\Value;
-
-class NotMessage {}
-
-class WellKnownTest extends TestBase {
-
-    public function testEmpty()
-    {
-        $msg = new GPBEmpty();
-        $this->assertTrue($msg instanceof \Google\Protobuf\Internal\Message);
-    }
-
-    public function testImportDescriptorProto()
-    {
-        $msg = new TestImportDescriptorProto();
-        $this->assertTrue(true);
-    }
-
-    public function testAny()
-    {
-        // Create embed message
-        $embed = new TestMessage();
-        $this->setFields($embed);
-        $data = $embed->serializeToString();
-
-        // Set any via normal setter.
-        $any = new Any();
-
-        $this->assertSame(
-            $any, $any->setTypeUrl("type.googleapis.com/foo.TestMessage"));
-        $this->assertSame("type.googleapis.com/foo.TestMessage",
-                          $any->getTypeUrl());
-
-        $this->assertSame($any, $any->setValue($data));
-        $this->assertSame($data, $any->getValue());
-
-        // Test unpack.
-        $msg = $any->unpack();
-        $this->assertTrue($msg instanceof TestMessage);
-        $this->expectFields($msg);
-
-        // Test pack.
-        $any = new Any();
-        $any->pack($embed);
-        $this->assertSame($data, $any->getValue());
-        $this->assertSame("type.googleapis.com/foo.TestMessage", $any->getTypeUrl());
-
-        // Test is.
-        $this->assertTrue($any->is(TestMessage::class));
-        $this->assertFalse($any->is(Any::class));
-    }
-
-    public function testAnyUnpackInvalidTypeUrl()
-    {
-        $this->expectException(Exception::class);
-
-        $any = new Any();
-        $any->setTypeUrl("invalid");
-        $any->unpack();
-    }
-
-    public function testAnyUnpackMessageNotAdded()
-    {
-        $this->expectException(Exception::class);
-
-        $any = new Any();
-        $any->setTypeUrl("type.googleapis.com/MessageNotAdded");
-        $any->unpack();
-    }
-
-    public function testAnyUnpackDecodeError()
-    {
-        $this->expectException(Exception::class);
-
-        $any = new Any();
-        $any->setTypeUrl("type.googleapis.com/foo.TestMessage");
-        $any->setValue("abc");
-        $any->unpack();
-    }
-
-    public function testApi()
-    {
-        $m = new Api();
-
-        $m->setName("a");
-        $this->assertSame("a", $m->getName());
-
-        $m->setMethods([new Method()]);
-        $this->assertSame(1, count($m->getMethods()));
-
-        $m->setOptions([new Option()]);
-        $this->assertSame(1, count($m->getOptions()));
-
-        $m->setVersion("a");
-        $this->assertSame("a", $m->getVersion());
-
-        $m->setSourceContext(new SourceContext());
-        $this->assertFalse(is_null($m->getSourceContext()));
-
-        $m->setMixins([new Mixin()]);
-        $this->assertSame(1, count($m->getMixins()));
-
-        $m->setSyntax(Syntax::SYNTAX_PROTO2);
-        $this->assertSame(Syntax::SYNTAX_PROTO2, $m->getSyntax());
-
-        $m = new Method();
-
-        $m->setName("a");
-        $this->assertSame("a", $m->getName());
-
-        $m->setRequestTypeUrl("a");
-        $this->assertSame("a", $m->getRequestTypeUrl());
-
-        $m->setRequestStreaming(true);
-        $this->assertSame(true, $m->getRequestStreaming());
-
-        $m->setResponseTypeUrl("a");
-        $this->assertSame("a", $m->getResponseTypeUrl());
-
-        $m->setResponseStreaming(true);
-        $this->assertSame(true, $m->getResponseStreaming());
-
-        $m->setOptions([new Option()]);
-        $this->assertSame(1, count($m->getOptions()));
-
-        $m = new Mixin();
-
-        $m->setName("a");
-        $this->assertSame("a", $m->getName());
-
-        $m->setRoot("a");
-        $this->assertSame("a", $m->getRoot());
-    }
-
-    public function testEnum()
-    {
-        $m = new Enum();
-
-        $m->setName("a");
-        $this->assertSame("a", $m->getName());
-
-        $m->setEnumvalue([new EnumValue()]);
-        $this->assertSame(1, count($m->getEnumvalue()));
-
-        $m->setOptions([new Option()]);
-        $this->assertSame(1, count($m->getOptions()));
-
-        $m->setSourceContext(new SourceContext());
-        $this->assertFalse(is_null($m->getSourceContext()));
-
-        $m->setSyntax(Syntax::SYNTAX_PROTO2);
-        $this->assertSame(Syntax::SYNTAX_PROTO2, $m->getSyntax());
-    }
-
-    public function testEnumValue()
-    {
-        $m = new EnumValue();
-
-        $m->setName("a");
-        $this->assertSame("a", $m->getName());
-
-        $m->setNumber(1);
-        $this->assertSame(1, $m->getNumber());
-
-        $m->setOptions([new Option()]);
-        $this->assertSame(1, count($m->getOptions()));
-    }
-
-    public function testField()
-    {
-        $m = new Field();
-
-        $m->setKind(Kind::TYPE_DOUBLE);
-        $this->assertSame(Kind::TYPE_DOUBLE, $m->getKind());
-
-        $m->setCardinality(Cardinality::CARDINALITY_OPTIONAL);
-        $this->assertSame(Cardinality::CARDINALITY_OPTIONAL, $m->getCardinality());
-
-        $m->setNumber(1);
-        $this->assertSame(1, $m->getNumber());
-
-        $m->setName("a");
-        $this->assertSame("a", $m->getName());
-
-        $m->setTypeUrl("a");
-        $this->assertSame("a", $m->getTypeUrl());
-
-        $m->setOneofIndex(1);
-        $this->assertSame(1, $m->getOneofIndex());
-
-        $m->setPacked(true);
-        $this->assertSame(true, $m->getPacked());
-
-        $m->setOptions([new Option()]);
-        $this->assertSame(1, count($m->getOptions()));
-
-        $m->setJsonName("a");
-        $this->assertSame("a", $m->getJsonName());
-
-        $m->setDefaultValue("a");
-        $this->assertSame("a", $m->getDefaultValue());
-    }
-
-    public function testFieldMask()
-    {
-        $m = new FieldMask();
-        $m->setPaths(["a"]);
-        $this->assertSame(1, count($m->getPaths()));
-    }
-
-    public function testOption()
-    {
-        $m = new Option();
-
-        $m->setName("a");
-        $this->assertSame("a", $m->getName());
-
-        $m->setValue(new Any());
-        $this->assertFalse(is_null($m->getValue()));
-    }
-
-    public function testSourceContext()
-    {
-        $m = new SourceContext();
-        $m->setFileName("a");
-        $this->assertSame("a", $m->getFileName());
-    }
-
-    public function testStruct()
-    {
-        $m = new ListValue();
-        $m->setValues([new Value()]);
-        $this->assertSame(1, count($m->getValues()));
-
-        $m = new Value();
-
-        $this->assertNull($m->getStructValue());
-
-        $m->setNullValue(NullValue::NULL_VALUE);
-        $this->assertSame(NullValue::NULL_VALUE, $m->getNullValue());
-        $this->assertSame("null_value", $m->getKind());
-
-        $m->setNumberValue(1.0);
-        $this->assertSame(1.0, $m->getNumberValue());
-        $this->assertSame("number_value", $m->getKind());
-
-        $m->setStringValue("a");
-        $this->assertSame("a", $m->getStringValue());
-        $this->assertSame("string_value", $m->getKind());
-
-        $m->setBoolValue(true);
-        $this->assertSame(true, $m->getBoolValue());
-        $this->assertSame("bool_value", $m->getKind());
-
-        $m->setStructValue(new Struct());
-        $this->assertFalse(is_null($m->getStructValue()));
-        $this->assertSame("struct_value", $m->getKind());
-
-        $m->setListValue(new ListValue());
-        $this->assertFalse(is_null($m->getListValue()));
-        $this->assertSame("list_value", $m->getKind());
-
-        $m = new Struct();
-        $m->setFields(array("a"=>new Value()));
-        $this->assertSame(1, count($m->getFields()));
-    }
-
-    public function testTimestamp()
-    {
-        $timestamp = new Timestamp();
-
-        $timestamp->setSeconds(1);
-        $timestamp->setNanos(2);
-        $this->assertEquals(1, $timestamp->getSeconds());
-        $this->assertSame(2, $timestamp->getNanos());
-
-        date_default_timezone_set('UTC');
-        $from = new DateTime('2011-01-01T15:03:01.012345UTC');
-        $timestamp->fromDateTime($from);
-        $this->assertEquals($from->format('U'), $timestamp->getSeconds());
-        $this->assertEquals(1000 * $from->format('u'), $timestamp->getNanos());
-
-        $to = $timestamp->toDateTime();
-        $this->assertSame(\DateTime::class, get_class($to));
-        $this->assertSame($from->format('U'), $to->format('U'));
-        $this->assertSame($from->format('u'), $to->format('u'));
-    }
-
-    public function testType()
-    {
-        $m = new Type();
-
-        $m->setName("a");
-        $this->assertSame("a", $m->getName());
-
-        $m->setFields([new Field()]);
-        $this->assertSame(1, count($m->getFields()));
-
-        $m->setOneofs(["a"]);
-        $this->assertSame(1, count($m->getOneofs()));
-
-        $m->setOptions([new Option()]);
-        $this->assertSame(1, count($m->getOptions()));
-
-        $m->setSourceContext(new SourceContext());
-        $this->assertFalse(is_null($m->getSourceContext()));
-
-        $m->setSyntax(Syntax::SYNTAX_PROTO2);
-        $this->assertSame(Syntax::SYNTAX_PROTO2, $m->getSyntax());
-    }
-
-    public function testDuration()
-    {
-        $duration = new Duration();
-
-        $duration->setSeconds(1);
-        $duration->setNanos(2);
-        $this->assertEquals(1, $duration->getSeconds());
-        $this->assertSame(2, $duration->getNanos());
-    }
-
-    public function testWrappers()
-    {
-        $m = new DoubleValue();
-        $m->setValue(1.0);
-        $this->assertSame(1.0, $m->getValue());
-
-        $m = new FloatValue();
-        $m->setValue(1.0);
-        $this->assertSame(1.0, $m->getValue());
-
-        $m = new Int64Value();
-        $m->setValue(1);
-        $this->assertEquals(1, $m->getValue());
-
-        $m = new UInt64Value();
-        $m->setValue(1);
-        $this->assertEquals(1, $m->getValue());
-
-        $m = new Int32Value();
-        $m->setValue(1);
-        $this->assertSame(1, $m->getValue());
-
-        $m = new UInt32Value();
-        $m->setValue(1);
-        $this->assertSame(1, $m->getValue());
-
-        $m = new BoolValue();
-        $m->setValue(true);
-        $this->assertSame(true, $m->getValue());
-
-        $m = new StringValue();
-        $m->setValue("a");
-        $this->assertSame("a", $m->getValue());
-
-        $m = new BytesValue();
-        $m->setValue("a");
-        $this->assertSame("a", $m->getValue());
-    }
-
-    /**
-     * @dataProvider enumNameValueConversionDataProvider
-     */
-    public function testEnumNameValueConversion($class)
-    {
-        $reflectionClass = new ReflectionClass($class);
-        $constants = $reflectionClass->getConstants();
-        foreach ($constants as $k => $v) {
-            $this->assertSame($k, $class::name($v));
-            $this->assertSame($v, $class::value($k));
-        }
-    }
-
-    public function enumNameValueConversionDataProvider()
-    {
-        return [
-            ['\Google\Protobuf\Field\Cardinality'],
-            ['\Google\Protobuf\Field\Kind'],
-            ['\Google\Protobuf\NullValue'],
-            ['\Google\Protobuf\Syntax'],
-        ];
-    }
-}
diff --git a/libs/protobuf/php/tests/WrapperTypeSettersTest.php b/libs/protobuf/php/tests/WrapperTypeSettersTest.php
deleted file mode 100644
index 045fa66..0000000
--- a/libs/protobuf/php/tests/WrapperTypeSettersTest.php
+++ /dev/null
@@ -1,317 +0,0 @@
-<?php
-
-require_once('test_base.php');
-require_once('test_util.php');
-
-use Foo\TestWrapperSetters;
-use Google\Protobuf\BoolValue;
-use Google\Protobuf\BytesValue;
-use Google\Protobuf\DoubleValue;
-use Google\Protobuf\FloatValue;
-use Google\Protobuf\Int32Value;
-use Google\Protobuf\Int64Value;
-use Google\Protobuf\StringValue;
-use Google\Protobuf\UInt32Value;
-use Google\Protobuf\UInt64Value;
-
-class WrapperTypeSettersTest extends TestBase
-{
-    /**
-     * @dataProvider gettersAndSettersDataProvider
-     */
-    public function testGettersAndSetters(
-        $class,
-        $wrapperClass,
-        $setter,
-        $valueSetter,
-        $getter,
-        $valueGetter,
-        $sequence
-    ) {
-        $oldSetterMsg = new $class();
-        $newSetterMsg = new $class();
-        foreach ($sequence as list($value, $expectedValue)) {
-            // Manually wrap the value to pass to the old setter
-            $wrappedValue = is_null($value) ? $value : new $wrapperClass(['value' => $value]);
-
-            // Set values using new and old setters
-            $oldSetterMsg->$setter($wrappedValue);
-            $newSetterMsg->$valueSetter($value);
-
-            // Get expected values old getter
-            $expectedValue = $oldSetterMsg->$getter();
-
-            // Check that old getter returns the same value after using the
-            // new setter
-            $actualValue = $newSetterMsg->$getter();
-            $this->assertEquals($expectedValue, $actualValue);
-
-            // Check that new getter returns the unwrapped value from
-            // $expectedValue
-            $actualValueNewGetter = $newSetterMsg->$valueGetter();
-            if (is_null($expectedValue)) {
-                $this->assertNull($actualValueNewGetter);
-            } else {
-                $this->assertEquals($expectedValue->getValue(), $actualValueNewGetter);
-            }
-        }
-    }
-
-    public function gettersAndSettersDataProvider()
-    {
-        return [
-            [TestWrapperSetters::class, DoubleValue::class, "setDoubleValue", "setDoubleValueUnwrapped", "getDoubleValue", "getDoubleValueUnwrapped", [
-                [1.1, new DoubleValue(["value" => 1.1])],
-                [2.2, new DoubleValue(["value" => 2.2])],
-                [null, null],
-                [0, new DoubleValue()],
-            ]],
-            [TestWrapperSetters::class, FloatValue::class, "setFloatValue", "setFloatValueUnwrapped", "getFloatValue", "getFloatValueUnwrapped", [
-                [1.1, new FloatValue(["value" => 1.1])],
-                [2.2, new FloatValue(["value" => 2.2])],
-                [null, null],
-                [0, new FloatValue()],
-            ]],
-            [TestWrapperSetters::class, Int64Value::class, "setInt64Value", "setInt64ValueUnwrapped", "getInt64Value", "getInt64ValueUnwrapped", [
-                [123, new Int64Value(["value" => 123])],
-                [-789, new Int64Value(["value" => -789])],
-                [null, null],
-                [0, new Int64Value()],
-                [5.5, new Int64Value(["value" => 5])], // Test conversion from float to int
-            ]],
-            [TestWrapperSetters::class, UInt64Value::class, "setUInt64Value", "setUInt64ValueUnwrapped", "getUInt64Value", "getUInt64ValueUnwrapped", [
-                [123, new UInt64Value(["value" => 123])],
-                [789, new UInt64Value(["value" => 789])],
-                [null, null],
-                [0, new UInt64Value()],
-                [5.5, new UInt64Value(["value" => 5])], // Test conversion from float to int
-                [-7, new UInt64Value(["value" => -7])], // Test conversion from -ve to +ve
-            ]],
-            [TestWrapperSetters::class, Int32Value::class, "setInt32Value", "setInt32ValueUnwrapped", "getInt32Value", "getInt32ValueUnwrapped", [
-                [123, new Int32Value(["value" => 123])],
-                [-789, new Int32Value(["value" => -789])],
-                [null, null],
-                [0, new Int32Value()],
-                [5.5, new Int32Value(["value" => 5])], // Test conversion from float to int
-            ]],
-            [TestWrapperSetters::class, UInt32Value::class, "setUInt32Value", "setUInt32ValueUnwrapped", "getUInt32Value", "getUInt32ValueUnwrapped", [
-                [123, new UInt32Value(["value" => 123])],
-                [789, new UInt32Value(["value" => 789])],
-                [null, null],
-                [0, new UInt32Value()],
-                [5.5, new UInt32Value(["value" => 5])], // Test conversion from float to int
-                [-7, new UInt32Value(["value" => -7])], // Test conversion from -ve to +ve
-            ]],
-            [TestWrapperSetters::class, BoolValue::class, "setBoolValue", "setBoolValueUnwrapped", "getBoolValue", "getBoolValueUnwrapped", [
-                [true, new BoolValue(["value" => true])],
-                [false, new BoolValue(["value" => false])],
-                [null, null],
-            ]],
-            [TestWrapperSetters::class, StringValue::class, "setStringValue", "setStringValueUnwrapped", "getStringValue", "getStringValueUnwrapped", [
-                ["asdf", new StringValue(["value" => "asdf"])],
-                ["", new StringValue(["value" => ""])],
-                [null, null],
-                ["", new StringValue()],
-                [5, new StringValue(["value" => "5"])], // Test conversion from number to string
-                [5.5, new StringValue(["value" => "5.5"])], // Test conversion from number to string
-                [-7, new StringValue(["value" => "-7"])], // Test conversion from number to string
-                [-7.5, new StringValue(["value" => "-7.5"])], // Test conversion from number to string
-            ]],
-            [TestWrapperSetters::class, BytesValue::class, "setBytesValue", "setBytesValueUnwrapped", "getBytesValue", "getBytesValueUnwrapped", [
-                ["asdf", new BytesValue(["value" => "asdf"])],
-                ["", new BytesValue(["value" => ""])],
-                [null, null],
-                ["", new BytesValue()],
-                [5, new BytesValue(["value" => "5"])], // Test conversion from number to bytes
-                [5.5, new BytesValue(["value" => "5.5"])], // Test conversion from number to bytes
-                [-7, new BytesValue(["value" => "-7"])], // Test conversion from number to bytes
-                [-7.5, new BytesValue(["value" => "-7.5"])], // Test conversion from number to bytes
-            ]],
-            [TestWrapperSetters::class, DoubleValue::class, "setDoubleValueOneof", "setDoubleValueOneofUnwrapped", "getDoubleValueOneof", "getDoubleValueOneofUnwrapped", [
-                [1.1, new DoubleValue(["value" => 1.1])],
-                [2.2, new DoubleValue(["value" => 2.2])],
-                [null, null],
-                [0, new DoubleValue()],
-            ]],
-            [TestWrapperSetters::class, StringValue::class, "setStringValueOneof", "setStringValueOneofUnwrapped", "getStringValueOneof", "getStringValueOneofUnwrapped", [
-                ["asdf", new StringValue(["value" => "asdf"])],
-                ["", new StringValue(["value" => ""])],
-                [null, null],
-                ["", new StringValue()],
-                [5, new StringValue(["value" => "5"])], // Test conversion from number to string
-                [5.5, new StringValue(["value" => "5.5"])], // Test conversion from number to string
-                [-7, new StringValue(["value" => "-7"])], // Test conversion from number to string
-                [-7.5, new StringValue(["value" => "-7.5"])], // Test conversion from number to string
-            ]],
-        ];
-    }
-
-    /**
-     * @dataProvider invalidSettersDataProvider
-     */
-    public function testInvalidSetters($class, $setter, $value)
-    {
-        $this->expectException(Exception::class);
-        (new $class())->$setter($value);
-    }
-
-    public function invalidSettersDataProvider()
-    {
-        return [
-            [TestWrapperSetters::class, "setDoubleValueUnwrapped", "abc"],
-            [TestWrapperSetters::class, "setDoubleValueUnwrapped", []],
-            [TestWrapperSetters::class, "setDoubleValueUnwrapped", new stdClass()],
-            [TestWrapperSetters::class, "setDoubleValueUnwrapped", new DoubleValue()],
-
-            [TestWrapperSetters::class, "setFloatValueUnwrapped", "abc"],
-            [TestWrapperSetters::class, "setFloatValueUnwrapped", []],
-            [TestWrapperSetters::class, "setFloatValueUnwrapped", new stdClass()],
-            [TestWrapperSetters::class, "setFloatValueUnwrapped", new FloatValue()],
-
-            [TestWrapperSetters::class, "setInt64ValueUnwrapped", "abc"],
-            [TestWrapperSetters::class, "setInt64ValueUnwrapped", []],
-            [TestWrapperSetters::class, "setInt64ValueUnwrapped", new stdClass()],
-            [TestWrapperSetters::class, "setInt64ValueUnwrapped", new Int64Value()],
-
-            [TestWrapperSetters::class, "setUInt64ValueUnwrapped", "abc"],
-            [TestWrapperSetters::class, "setUInt64ValueUnwrapped", []],
-            [TestWrapperSetters::class, "setUInt64ValueUnwrapped", new stdClass()],
-            [TestWrapperSetters::class, "setUInt64ValueUnwrapped", new UInt64Value()],
-
-            [TestWrapperSetters::class, "setInt32ValueUnwrapped", "abc"],
-            [TestWrapperSetters::class, "setInt32ValueUnwrapped", []],
-            [TestWrapperSetters::class, "setInt32ValueUnwrapped", new stdClass()],
-            [TestWrapperSetters::class, "setInt32ValueUnwrapped", new Int32Value()],
-
-            [TestWrapperSetters::class, "setUInt32ValueUnwrapped", "abc"],
-            [TestWrapperSetters::class, "setUInt32ValueUnwrapped", []],
-            [TestWrapperSetters::class, "setUInt32ValueUnwrapped", new stdClass()],
-            [TestWrapperSetters::class, "setUInt32ValueUnwrapped", new UInt32Value()],
-
-            [TestWrapperSetters::class, "setBoolValueUnwrapped", []],
-            [TestWrapperSetters::class, "setBoolValueUnwrapped", new stdClass()],
-            [TestWrapperSetters::class, "setBoolValueUnwrapped", new BoolValue()],
-
-            [TestWrapperSetters::class, "setStringValueUnwrapped", []],
-            [TestWrapperSetters::class, "setStringValueUnwrapped", new stdClass()],
-            [TestWrapperSetters::class, "setStringValueUnwrapped", new StringValue()],
-
-            [TestWrapperSetters::class, "setBytesValueUnwrapped", []],
-            [TestWrapperSetters::class, "setBytesValueUnwrapped", new stdClass()],
-            [TestWrapperSetters::class, "setBytesValueUnwrapped", new BytesValue()],
-        ];
-    }
-
-    /**
-     * @dataProvider constructorWithWrapperTypeDataProvider
-     */
-    public function testConstructorWithWrapperType($class, $wrapperClass, $wrapperField, $getter, $value)
-    {
-        $actualInstance = new $class([$wrapperField => $value]);
-        $expectedInstance = new $class([$wrapperField => new $wrapperClass(['value' => $value])]);
-        $this->assertEquals($expectedInstance->$getter()->getValue(), $actualInstance->$getter()->getValue());
-    }
-
-    public function constructorWithWrapperTypeDataProvider()
-    {
-        return [
-            [TestWrapperSetters::class, DoubleValue::class, 'double_value', 'getDoubleValue', 1.1],
-            [TestWrapperSetters::class, FloatValue::class, 'float_value', 'getFloatValue', 2.2],
-            [TestWrapperSetters::class, Int64Value::class, 'int64_value', 'getInt64Value', 3],
-            [TestWrapperSetters::class, UInt64Value::class, 'uint64_value', 'getUInt64Value', 4],
-            [TestWrapperSetters::class, Int32Value::class, 'int32_value', 'getInt32Value', 5],
-            [TestWrapperSetters::class, UInt32Value::class, 'uint32_value', 'getUInt32Value', 6],
-            [TestWrapperSetters::class, BoolValue::class, 'bool_value', 'getBoolValue', true],
-            [TestWrapperSetters::class, StringValue::class, 'string_value', 'getStringValue', "eight"],
-            [TestWrapperSetters::class, BytesValue::class, 'bytes_value', 'getBytesValue', "nine"],
-        ];
-    }
-
-    /**
-     * @dataProvider constructorWithRepeatedWrapperTypeDataProvider
-     */
-    public function testConstructorWithRepeatedWrapperType($wrapperField, $getter, $value)
-    {
-        $actualInstance = new TestWrapperSetters([$wrapperField => $value]);
-        foreach ($actualInstance->$getter() as $key => $actualWrapperValue) {
-            $actualInnerValue = $actualWrapperValue->getValue();
-            $expectedElement = $value[$key];
-            if (is_object($expectedElement) && is_a($expectedElement, '\Google\Protobuf\StringValue')) {
-                $expectedInnerValue = $expectedElement->getValue();
-            } else {
-                $expectedInnerValue = $expectedElement;
-            }
-            $this->assertEquals($expectedInnerValue, $actualInnerValue);
-        }
-
-        $this->assertTrue(true);
-    }
-
-    public function constructorWithRepeatedWrapperTypeDataProvider()
-    {
-        $sv7 = new StringValue(['value' => 'seven']);
-        $sv8 = new StringValue(['value' => 'eight']);
-
-        $testWrapperSetters = new TestWrapperSetters();
-        $testWrapperSetters->setRepeatedStringValue([$sv7, $sv8]);
-        $repeatedField = $testWrapperSetters->getRepeatedStringValue();
-
-        return [
-            ['repeated_string_value', 'getRepeatedStringValue', []],
-            ['repeated_string_value', 'getRepeatedStringValue', [$sv7]],
-            ['repeated_string_value', 'getRepeatedStringValue', [$sv7, $sv8]],
-            ['repeated_string_value', 'getRepeatedStringValue', ['seven']],
-            ['repeated_string_value', 'getRepeatedStringValue', [7]],
-            ['repeated_string_value', 'getRepeatedStringValue', [7.7]],
-            ['repeated_string_value', 'getRepeatedStringValue', ['seven', 'eight']],
-            ['repeated_string_value', 'getRepeatedStringValue', [$sv7, 'eight']],
-            ['repeated_string_value', 'getRepeatedStringValue', ['seven', $sv8]],
-            ['repeated_string_value', 'getRepeatedStringValue', $repeatedField],
-        ];
-    }
-
-    /**
-     * @dataProvider constructorWithMapWrapperTypeDataProvider
-     */
-    public function testConstructorWithMapWrapperType($wrapperField, $getter, $value)
-    {
-        $actualInstance = new TestWrapperSetters([$wrapperField => $value]);
-        foreach ($actualInstance->$getter() as $key => $actualWrapperValue) {
-            $actualInnerValue = $actualWrapperValue->getValue();
-            $expectedElement = $value[$key];
-            if (is_object($expectedElement) && is_a($expectedElement, '\Google\Protobuf\StringValue')) {
-                $expectedInnerValue = $expectedElement->getValue();
-            } elseif (is_object($expectedElement) && is_a($expectedElement, '\Google\Protobuf\Internal\MapEntry')) {
-                $expectedInnerValue = $expectedElement->getValue()->getValue();
-            } else {
-                $expectedInnerValue = $expectedElement;
-            }
-            $this->assertEquals($expectedInnerValue, $actualInnerValue);
-        }
-
-        $this->assertTrue(true);
-    }
-
-    public function constructorWithMapWrapperTypeDataProvider()
-    {
-        $sv7 = new StringValue(['value' => 'seven']);
-        $sv8 = new StringValue(['value' => 'eight']);
-
-        $testWrapperSetters = new TestWrapperSetters();
-        $testWrapperSetters->setMapStringValue(['key' => $sv7, 'key2' => $sv8]);
-        $mapField = $testWrapperSetters->getMapStringValue();
-
-        return [
-            ['map_string_value', 'getMapStringValue', []],
-            ['map_string_value', 'getMapStringValue', ['key' => $sv7]],
-            ['map_string_value', 'getMapStringValue', ['key' => $sv7, 'key2' => $sv8]],
-            ['map_string_value', 'getMapStringValue', ['key' => 'seven']],
-            ['map_string_value', 'getMapStringValue', ['key' => 7]],
-            ['map_string_value', 'getMapStringValue', ['key' => 7.7]],
-            ['map_string_value', 'getMapStringValue', ['key' => 'seven', 'key2' => 'eight']],
-            ['map_string_value', 'getMapStringValue', ['key' => $sv7, 'key2' => 'eight']],
-            ['map_string_value', 'getMapStringValue', ['key' => 'seven', 'key2' => $sv8]],
-            ['map_string_value', 'getMapStringValue', $mapField],
-        ];
-    }
-}
diff --git a/libs/protobuf/php/tests/compatibility_test.sh b/libs/protobuf/php/tests/compatibility_test.sh
deleted file mode 100755
index 7e44cce..0000000
--- a/libs/protobuf/php/tests/compatibility_test.sh
+++ /dev/null
@@ -1,152 +0,0 @@
-#!/bin/bash
-
-function generate_proto() {
-  PROTOC1=$1
-  PROTOC2=$2
-
-  rm -rf generated
-  mkdir generated
-
-  $PROTOC1 --php_out=generated proto/test_include.proto
-  $PROTOC2 --php_out=generated                 \
-    -I../../src -I.                            \
-    proto/empty/echo.proto                     \
-    proto/test.proto                           \
-    proto/test_no_namespace.proto              \
-    proto/test_prefix.proto                    \
-    proto/test_php_namespace.proto             \
-    proto/test_empty_php_namespace.proto       \
-    proto/test_reserved_enum_lower.proto       \
-    proto/test_reserved_enum_upper.proto       \
-    proto/test_reserved_enum_value_lower.proto \
-    proto/test_reserved_enum_value_upper.proto \
-    proto/test_reserved_message_lower.proto    \
-    proto/test_reserved_message_upper.proto    \
-    proto/test_service.proto                   \
-    proto/test_service_namespace.proto         \
-    proto/test_wrapper_type_setters.proto      \
-    proto/test_descriptors.proto
-
-  pushd ../../src
-  $PROTOC2 --php_out=../php/tests/generated -I../php/tests -I. ../php/tests/proto/test_import_descriptor_proto.proto
-  popd
-}
-
-# Remove tests to expect error. These were added to API tests by mistake.
-function remove_error_test() {
-  local TEMPFILE=`tempfile`
-  cat $1 | \
-  awk -v file=`basename $1` -v dir=`basename $(dirname $1)` '
-    BEGIN {
-      show = 1
-    }
-    /@expectedException PHPUnit_Framework_Error/ { show = 0; next; }
-    / *\*\//                                     { print; next; }
-    / *}/ {
-      if (!show) {
-        show = 1;
-        next;
-      }
-    }
-    show { print }
-  ' > $TEMPFILE
-  cp $TEMPFILE $1
-}
-
-set -ex
-
-# Change to the script's directory.
-cd $(dirname $0)
-
-OLD_VERSION=$1
-OLD_VERSION_PROTOC=https://repo1.maven.org/maven2/com/google/protobuf/protoc/$OLD_VERSION/protoc-$OLD_VERSION-linux-x86_64.exe
-
-# Extract the latest protobuf version number.
-VERSION_NUMBER=`grep "PHP_PROTOBUF_VERSION" ../ext/google/protobuf/protobuf.h | sed "s|#define PHP_PROTOBUF_VERSION \"\(.*\)\"|\1|"`
-
-echo "Running compatibility tests between current $VERSION_NUMBER and released $OLD_VERSION"
-
-# Check protoc
-[ -f ../../src/protoc ] || {
-  echo "[ERROR]: Please build protoc first."
-  exit 1
-}
-
-# Download old test.
-rm -rf protobuf
-git clone https://github.com/protocolbuffers/protobuf.git
-pushd protobuf
-git checkout v$OLD_VERSION
-popd
-
-# Build and copy the new runtime
-pushd ../ext/google/protobuf
-make clean || true
-phpize && ./configure && make
-popd
-
-rm -rf protobuf/php/ext
-rm -rf protobuf/php/src
-cp -r ../ext protobuf/php/ext/
-cp -r ../src protobuf/php/src/
-
-# Download old version protoc compiler (for linux)
-wget $OLD_VERSION_PROTOC -O old_protoc
-chmod +x old_protoc
-
-NEW_PROTOC=`pwd`/../../src/protoc
-OLD_PROTOC=`pwd`/old_protoc
-cd protobuf/php
-composer install
-
-# Remove implementation detail tests.
-# TODO(teboring): Temporarily disable encode_decode_test.php. In 3.13.0-rc1,
-# repeated primitive field encoding is changed to packed, which is a bug fix.
-# However, this fails the compatibility test which hard coded old encoding.
-# Will re-enable the test after making a release. After the version bump, the
-# compatibility test will use the updated test code.
-tests=( array_test.php generated_class_test.php map_field_test.php well_known_test.php )
-sed -i.bak '/php_implementation_test.php/d' phpunit.xml
-sed -i.bak '/generated_phpdoc_test.php/d' phpunit.xml
-sed -i.bak '/encode_decode_test.php/d' phpunit.xml
-sed -i.bak 's/generated_phpdoc_test.php//g' tests/test.sh
-sed -i.bak 's/generated_service_test.php//g' tests/test.sh
-sed -i.bak 's/encode_decode_test.php//g' tests/test.sh
-sed -i.bak '/memory_leak_test.php/d' tests/test.sh
-sed -i.bak '/^    public function testTimestamp()$/,/^    }$/d' tests/well_known_test.php
-sed -i.bak 's/PHPUnit_Framework_TestCase/\\PHPUnit\\Framework\\TestCase/g' tests/array_test.php
-sed -i.bak 's/PHPUnit_Framework_TestCase/\\PHPUnit\\Framework\\TestCase/g' tests/map_field_test.php
-sed -i.bak 's/PHPUnit_Framework_TestCase/\\PHPUnit\\Framework\\TestCase/g' tests/test_base.php
-for t in "${tests[@]}"
-do
-  remove_error_test tests/$t
-done
-
-cd tests
-
-# Test A.1:
-#   proto set 1: use old version
-#   proto set 2 which may import protos in set 1: use old version
-generate_proto $OLD_PROTOC $OLD_PROTOC
-./test.sh
-pushd ..
-./vendor/bin/phpunit
-popd
-
-# Test A.2:
-#   proto set 1: use new version
-#   proto set 2 which may import protos in set 1: use old version
-generate_proto $NEW_PROTOC $OLD_PROTOC
-./test.sh
-pushd ..
-./vendor/bin/phpunit
-popd
-
-# Test A.3:
-#   proto set 1: use old version
-#   proto set 2 which may import protos in set 1: use new version
-generate_proto $OLD_PROTOC $NEW_PROTOC
-./test.sh
-pushd ..
-./vendor/bin/phpunit
-popd
diff --git a/libs/protobuf/php/tests/compile_extension.sh b/libs/protobuf/php/tests/compile_extension.sh
deleted file mode 100755
index 3261917..0000000
--- a/libs/protobuf/php/tests/compile_extension.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-set -e
-
-cd $(dirname $0)/..
-
-# utf8_range has to live in the base third_party directory.
-# We copy it into the ext/google/protobuf directory for the build
-# (and for the release to PECL).
-rm -rf ext/google/protobuf/third_party
-mkdir -p ext/google/protobuf/third_party/utf8_range
-cp ../third_party/utf8_range/* ext/google/protobuf/third_party/utf8_range
-
-echo "Copied utf8_range from ../third_party -> ext/google/protobuf/third_party"
-
-pushd  ext/google/protobuf > /dev/null
-
-CONFIGURE_OPTIONS=("./configure" "--with-php-config=$(which php-config)")
-
-if [ "$1" != "--release" ]; then
-  CONFIGURE_OPTIONS+=("CFLAGS=-g -O0 -Wall -DPBPHP_ENABLE_ASSERTS")
-fi
-
-FINGERPRINT="$(sha256sum $(which php)) ${CONFIGURE_OPTIONS[@]}"
-
-# If the PHP interpreter we are building against or the arguments
-# have changed, we must regenerated the Makefile.
-if [[ ! -f BUILD_STAMP ]] || [[ "$(cat BUILD_STAMP)" != "$FINGERPRINT" ]]; then
-  phpize --clean
-  rm -f configure.in configure.ac
-  phpize
-  "${CONFIGURE_OPTIONS[@]}"
-  echo "$FINGERPRINT" > BUILD_STAMP
-fi
-
-make
-TEST_PHP_ARGS="-q" make test
-popd > /dev/null
diff --git a/libs/protobuf/php/tests/force_c_ext.php b/libs/protobuf/php/tests/force_c_ext.php
deleted file mode 100644
index afc63c5..0000000
--- a/libs/protobuf/php/tests/force_c_ext.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-// We have to test this because the command-line argument will fail silently
-// if the extension could not be loaded:
-//    php -dextension=ext/google/protobuf/modules/protouf.so
-if (!extension_loaded("protobuf")) {
-    throw new Exception("Protobuf extension not loaded");
-}
-
-spl_autoload_register(function($class) {
-    if (strpos($class, "Google\\Protobuf") === 0) {
-        throw new Exception("When using the C extension, we should not load runtime class: " . $class);
-    }
-}, true, true);
diff --git a/libs/protobuf/php/tests/gdb_test.sh b/libs/protobuf/php/tests/gdb_test.sh
deleted file mode 100755
index 76a0fc3..0000000
--- a/libs/protobuf/php/tests/gdb_test.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-php -i | grep "Configuration"
-
-# gdb --args php -dextension=../ext/google/protobuf/modules/protobuf.so `which
-# phpunit` --bootstrap autoload.php tmp_test.php
-#
-# gdb --args php -dextension=../ext/google/protobuf/modules/protobuf.so `which phpunit` --bootstrap autoload.php generated_class_test.php
-gdb --args php -dextension=../ext/google/protobuf/modules/protobuf.so `which phpunit` --bootstrap autoload.php encode_decode_test.php
-#
-# gdb --args php -dextension=../ext/google/protobuf/modules/protobuf.so memory_leak_test.php
-#
-# USE_ZEND_ALLOC=0 valgrind --leak-check=yes php -dextension=../ext/google/protobuf/modules/protobuf.so memory_leak_test.php
diff --git a/libs/protobuf/php/tests/generated_previous/GPBMetadata/ProtoPrevious/TestPreviouslyUnreservedMessage.php b/libs/protobuf/php/tests/generated_previous/GPBMetadata/ProtoPrevious/TestPreviouslyUnreservedMessage.php
deleted file mode 100644
index d2120f9..0000000
--- a/libs/protobuf/php/tests/generated_previous/GPBMetadata/ProtoPrevious/TestPreviouslyUnreservedMessage.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: proto_previous/test_previously_unreserved_message.proto
-
-namespace GPBMetadata\ProtoPrevious;
-
-class TestPreviouslyUnreservedMessage
-{
-    public static $is_initialized = false;
-
-    public static function initOnce() {
-        $pool = \Google\Protobuf\Internal\DescriptorPool::getGeneratedPool();
-
-        if (static::$is_initialized == true) {
-          return;
-        }
-        $pool->internalAddGeneratedFile(
-            '
-W
-7proto_previous/test_previously_unreserved_message.protoprevious"
-
-readonlybproto3'
-        , true);
-
-        static::$is_initialized = true;
-    }
-}
-
diff --git a/libs/protobuf/php/tests/generated_previous/Previous/readonly.php b/libs/protobuf/php/tests/generated_previous/Previous/readonly.php
deleted file mode 100644
index 013f293..0000000
--- a/libs/protobuf/php/tests/generated_previous/Previous/readonly.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: proto_previous/test_previously_unreserved_message.proto
-
-namespace Previous;
-
-use Google\Protobuf\Internal\GPBType;
-use Google\Protobuf\Internal\RepeatedField;
-use Google\Protobuf\Internal\GPBUtil;
-
-/**
- * Generated from protobuf message <code>previous.readonly</code>
- */
-class readonly extends \Google\Protobuf\Internal\Message
-{
-
-    /**
-     * Constructor.
-     *
-     * @param array $data {
-     *     Optional. Data for populating the Message object.
-     *
-     * }
-     */
-    public function __construct($data = NULL) {
-        \GPBMetadata\ProtoPrevious\TestPreviouslyUnreservedMessage::initOnce();
-        parent::__construct($data);
-    }
-
-}
-
diff --git a/libs/protobuf/php/tests/memory_leak_test.php b/libs/protobuf/php/tests/memory_leak_test.php
deleted file mode 100644
index ddb8491..0000000
--- a/libs/protobuf/php/tests/memory_leak_test.php
+++ /dev/null
@@ -1,178 +0,0 @@
-<?php
-
-# phpunit has memory leak by itself. Thus, it cannot be used to test memory leak.
-
-class HasDestructor
-{
-  function __construct() {
-    $this->foo = $this;
-  }
-
-  function __destruct() {
-    new Foo\TestMessage();
-  }
-}
-
-require_once('../vendor/autoload.php');
-require_once('test_util.php');
-
-$has_destructor = new HasDestructor();
-
-use Google\Protobuf\Internal\RepeatedField;
-use Google\Protobuf\Internal\GPBType;
-use Foo\TestAny;
-use Foo\TestMessage;
-use Foo\TestMessage\Sub;
-
-$from = new TestMessage();
-TestUtil::setTestMessage($from);
-TestUtil::assertTestMessage($from);
-
-$data = $from->serializeToString();
-
-$to = new TestMessage();
-$to->mergeFromString($data);
-
-TestUtil::assertTestMessage($to);
-
-$from = new TestMessage();
-TestUtil::setTestMessage2($from);
-
-$data = $from->serializeToString();
-
-$to->mergeFromString($data);
-
-// TODO(teboring): This causes following tests fail in php7.
-# $from->setRecursive($from);
-
-$arr = new RepeatedField(GPBType::MESSAGE, TestMessage::class);
-$arr[] = new TestMessage;
-$arr[0]->SetRepeatedRecursive($arr);
-
-// Test oneof fields.
-$m = new TestMessage();
-
-$m->setOneofInt32(1);
-assert(1 === $m->getOneofInt32());
-assert(0.0 === $m->getOneofFloat());
-assert('' === $m->getOneofString());
-assert(NULL === $m->getOneofMessage());
-$data = $m->serializeToString();
-$n = new TestMessage();
-$n->mergeFromString($data);
-assert(1 === $n->getOneofInt32());
-
-$m->setOneofFloat(2.0);
-assert(0 === $m->getOneofInt32());
-assert(2.0 === $m->getOneofFloat());
-assert('' === $m->getOneofString());
-assert(NULL === $m->getOneofMessage());
-$data = $m->serializeToString();
-$n = new TestMessage();
-$n->mergeFromString($data);
-assert(2.0 === $n->getOneofFloat());
-
-$m->setOneofString('abc');
-assert(0 === $m->getOneofInt32());
-assert(0.0 === $m->getOneofFloat());
-assert('abc' === $m->getOneofString());
-assert(NULL === $m->getOneofMessage());
-$data = $m->serializeToString();
-$n = new TestMessage();
-$n->mergeFromString($data);
-assert('abc' === $n->getOneofString());
-
-$sub_m = new Sub();
-$sub_m->setA(1);
-$m->setOneofMessage($sub_m);
-assert(0 === $m->getOneofInt32());
-assert(0.0 === $m->getOneofFloat());
-assert('' === $m->getOneofString());
-assert(1 === $m->getOneofMessage()->getA());
-$data = $m->serializeToString();
-$n = new TestMessage();
-$n->mergeFromString($data);
-assert(1 === $n->getOneofMessage()->getA());
-
-$m = new TestMessage();
-$m->mergeFromString(hex2bin('F80601'));
-assert('f80601' === bin2hex($m->serializeToString()));
-
-// Test create repeated field via array.
-$str_arr = array("abc");
-$m = new TestMessage();
-$m->setRepeatedString($str_arr);
-
-// Test create map field via array.
-$str_arr = array("abc"=>"abc");
-$m = new TestMessage();
-$m->setMapStringString($str_arr);
-
-// Test unset
-$from = new TestMessage();
-TestUtil::setTestMessage($from);
-unset($from);
-
-// Test wellknown
-$from = new \Google\Protobuf\Timestamp();
-$from->setSeconds(1);
-assert(1, $from->getSeconds());
-
-$timestamp = new \Google\Protobuf\Timestamp();
-
-date_default_timezone_set('UTC');
-$from = new DateTime('2011-01-01T15:03:01.012345UTC');
-$timestamp->fromDateTime($from);
-assert($from->format('U') == $timestamp->getSeconds());
-assert(1000 * $from->format('u') == $timestamp->getNanos());
-
-$to = $timestamp->toDateTime();
-assert(\DateTime::class == get_class($to));
-assert($from->format('U') == $to->format('U'));
-
-$from = new \Google\Protobuf\Value();
-$from->setNumberValue(1);
-assert(1, $from->getNumberValue());
-
-// Test discard unknown in message.
-$m = new TestMessage();
-$from = hex2bin('F80601');
-$m->mergeFromString($from);
-$m->discardUnknownFields();
-$to = $m->serializeToString();
-assert("" === bin2hex($to));
-
-// Test clear
-$m = new TestMessage();
-TestUtil::setTestMessage($m);
-$m->clear();
-
-// Test unset map element
-$m = new TestMessage();
-$map = $m->getMapStringString();
-$map[1] = 1;
-unset($map[1]);
-
-// Test descriptor
-$pool = \Google\Protobuf\DescriptorPool::getGeneratedPool();
-$desc = $pool->getDescriptorByClassName("\Foo\TestMessage");
-$field = $desc->getField(1);
-
-$from = new TestMessage();
-$to = new TestMessage();
-TestUtil::setTestMessage($from);
-$to->mergeFrom($from);
-TestUtil::assertTestMessage($to);
-
-// Test decode Any
-// Make sure packed message has been created at least once.
-$packed = new TestMessage();
-
-$m = new TestAny();
-$m->mergeFromJsonString(
-    "{\"any\":" .
-    "  {\"@type\":\"type.googleapis.com/foo.TestMessage\"," .
-    "   \"optionalInt32\":1}}");
-assert("type.googleapis.com/foo.TestMessage" ===
-       $m->getAny()->getTypeUrl());
-assert("0801" === bin2hex($m->getAny()->getValue()));
diff --git a/libs/protobuf/php/tests/memory_leak_test.sh b/libs/protobuf/php/tests/memory_leak_test.sh
deleted file mode 100755
index 0b66957..0000000
--- a/libs/protobuf/php/tests/memory_leak_test.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-cd $(dirname $0)
-
-set -ex
-
-PORT=12345
-TIMEOUT=10
-
-./compile_extension.sh
-
-run_test() {
-  echo
-  echo "Running memory leak test, args: $@"
-
-  EXTRA_ARGS=""
-  ARGS="-d xdebug.profiler_enable=0 -d display_errors=on -dextension=../ext/google/protobuf/modules/protobuf.so"
-
-  for i in "$@"; do
-    case $i in
-      --keep_descriptors)
-        EXTRA_ARGS=-dprotobuf.keep_descriptor_pool_after_request=1
-        shift
-        ;;
-    esac
-  done
-
-  export ZEND_DONT_UNLOAD_MODULES=1
-  export USE_ZEND_ALLOC=0
-
-  if valgrind --error-exitcode=1 --leak-check=full --show-leak-kinds=all --errors-for-leak-kinds=all --suppressions=valgrind.supp --num-callers=100 php $ARGS $EXTRA_ARGS memory_leak_test.php; then
-    echo "Memory leak test SUCCEEDED"
-  else
-    echo "Memory leak test FAILED"
-    exit 1
-  fi
-}
-
-run_test
-run_test --keep_descriptors
diff --git a/libs/protobuf/php/tests/multirequest.php b/libs/protobuf/php/tests/multirequest.php
deleted file mode 100644
index bbe8d77..0000000
--- a/libs/protobuf/php/tests/multirequest.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-if (extension_loaded("protobuf")) {
-    require_once('memory_leak_test.php');
-    echo "<p>protobuf loaded</p>";
-} else {
-    echo "<p>protobuf not loaded</p>";
-}
diff --git a/libs/protobuf/php/tests/multirequest.sh b/libs/protobuf/php/tests/multirequest.sh
deleted file mode 100755
index 65bfcfd..0000000
--- a/libs/protobuf/php/tests/multirequest.sh
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/bash
-
-cd $(dirname $0)
-
-set -e
-
-PORT=12345
-TIMEOUT=10
-
-./compile_extension.sh
-
-run_test() {
-  echo
-  echo "Running multirequest test, args: $@"
-
-  RUN_UNDER=""
-  EXTRA_ARGS=""
-  ARGS="-d xdebug.profiler_enable=0 -d display_errors=on -dextension=../ext/google/protobuf/modules/protobuf.so"
-
-  for i in "$@"; do
-    case $i in
-      --valgrind)
-        RUN_UNDER="valgrind --error-exitcode=1"
-        shift
-        ;;
-      --keep_descriptors)
-        EXTRA_ARGS=-dprotobuf.keep_descriptor_pool_after_request=1
-        shift
-        ;;
-    esac
-  done
-
-  export ZEND_DONT_UNLOAD_MODULES=1
-  export USE_ZEND_ALLOC=0
-  rm -f nohup.out
-  nohup $RUN_UNDER php $ARGS $EXTRA_ARGS -S localhost:$PORT multirequest.php >nohup.out 2>&1 &
-  PID=$!
-
-  if ! timeout $TIMEOUT bash -c "until echo > /dev/tcp/localhost/$PORT; do sleep 0.1; done" > /dev/null 2>&1; then
-    echo "Server failed to come up after $TIMEOUT seconds"
-    cat nohup.out
-    exit 1
-  fi
-
-  seq 2 | xargs -I{} wget -nv http://localhost:$PORT/multirequest.result -O multirequest{}.result
-  REQUESTS_SUCCEEDED=$?
-
-
-  if kill $PID > /dev/null 2>&1 && [[ $REQUESTS_SUCCEEDED == "0" ]]; then
-    wait
-    echo "Multirequest test SUCCEEDED"
-  else
-    echo "Multirequest test FAILED"
-    cat nohup.out
-    exit 1
-  fi
-}
-
-run_test
-run_test --keep_descriptors
-run_test --valgrind
-run_test --valgrind --keep_descriptors
diff --git a/libs/protobuf/php/tests/proto/empty/echo.proto b/libs/protobuf/php/tests/proto/empty/echo.proto
deleted file mode 100644
index 1817018..0000000
--- a/libs/protobuf/php/tests/proto/empty/echo.proto
+++ /dev/null
@@ -1,17 +0,0 @@
-syntax = "proto3";
-
-package empty.echo;
-
-message TestEmptyPackage {
-  int32 a = 1;
-
-  // Test nested messages, enums, and reserved names
-  NestedMessage nested_message = 2;
-  NestedEnum nested_enum = 3;
-  message NestedMessage {
-    int32 a = 1;
-  }
-  enum NestedEnum {
-      ZERO = 0;
-  };
-}
diff --git a/libs/protobuf/php/tests/proto/test.proto b/libs/protobuf/php/tests/proto/test.proto
deleted file mode 100644
index 421292a..0000000
--- a/libs/protobuf/php/tests/proto/test.proto
+++ /dev/null
@@ -1,343 +0,0 @@
-syntax = "proto3";
-
-import 'google/protobuf/any.proto';
-import 'google/protobuf/wrappers.proto';
-import 'google/protobuf/struct.proto';
-import 'proto/test_include.proto';
-import 'proto/test_no_namespace.proto';
-import 'proto/test_php_namespace.proto';
-import 'proto/test_empty_php_namespace.proto';
-import 'proto/test_prefix.proto';
-
-package foo;
-
-message TestMessage {
-  // Singular
-  int32 optional_int32 = 1;
-  int64 optional_int64 = 2;
-  uint32 optional_uint32 = 3;
-  uint64 optional_uint64 = 4;
-  sint32 optional_sint32 = 5;
-  sint64 optional_sint64 = 6;
-  fixed32 optional_fixed32 = 7;
-  fixed64 optional_fixed64 = 8;
-  sfixed32 optional_sfixed32 = 9;
-  sfixed64 optional_sfixed64 = 10;
-  float optional_float = 11;
-  double optional_double = 12;
-  bool optional_bool = 13;
-  string optional_string = 14;
-  bytes optional_bytes = 15;
-
-  TestEnum optional_enum = 16;
-  Sub optional_message = 17;
-  bar.TestInclude optional_included_message = 18;
-  TestMessage recursive = 19;
-
-  // True optional
-  optional int32 true_optional_int32 = 201;
-  optional int64 true_optional_int64 = 202;
-  optional uint32 true_optional_uint32 = 203;
-  optional uint64 true_optional_uint64 = 204;
-  optional sint32 true_optional_sint32 = 205;
-  optional sint64 true_optional_sint64 = 206;
-  optional fixed32 true_optional_fixed32 = 207;
-  optional fixed64 true_optional_fixed64 = 208;
-  optional sfixed32 true_optional_sfixed32 = 209;
-  optional sfixed64 true_optional_sfixed64 = 210;
-  optional float true_optional_float = 211;
-  optional double true_optional_double = 212;
-  optional bool true_optional_bool = 213;
-  optional string true_optional_string = 214;
-  optional bytes true_optional_bytes = 215;
-
-  optional TestEnum true_optional_enum = 216;
-  optional Sub true_optional_message = 217;
-  optional bar.TestInclude true_optional_included_message = 218;
-
-  // Repeated
-  repeated    int32 repeated_int32    = 31;
-  repeated    int64 repeated_int64    = 32;
-  repeated   uint32 repeated_uint32   = 33;
-  repeated   uint64 repeated_uint64   = 34;
-  repeated   sint32 repeated_sint32   = 35;
-  repeated   sint64 repeated_sint64   = 36;
-  repeated  fixed32 repeated_fixed32  = 37;
-  repeated  fixed64 repeated_fixed64  = 38;
-  repeated sfixed32 repeated_sfixed32 = 39;
-  repeated sfixed64 repeated_sfixed64 = 40;
-  repeated    float repeated_float    = 41;
-  repeated   double repeated_double   = 42;
-  repeated     bool repeated_bool     = 43;
-  repeated   string repeated_string   = 44;
-  repeated    bytes repeated_bytes    = 45;
-
-  repeated TestEnum repeated_enum = 46;
-  repeated Sub repeated_message = 47;
-  repeated TestMessage repeated_recursive = 48;
-
-  oneof my_oneof {
-    int32  oneof_int32    = 51;
-    int64  oneof_int64    = 52;
-    uint32 oneof_uint32   = 53;
-    uint64 oneof_uint64   = 54;
-    uint32 oneof_sint32   = 55;
-    uint64 oneof_sint64   = 56;
-    uint32 oneof_fixed32  = 57;
-    uint64 oneof_fixed64  = 58;
-    uint32 oneof_sfixed32 = 59;
-    uint64 oneof_sfixed64 = 60;
-    double oneof_double   = 61;
-    float  oneof_float    = 62;
-    bool   oneof_bool     = 63;
-    string oneof_string   = 64;
-    bytes  oneof_bytes    = 65;
-    TestEnum oneof_enum   = 66;
-    Sub    oneof_message  = 67;
-  }
-
-  map<int32,       int32> map_int32_int32       = 71;
-  map<int64,       int64> map_int64_int64       = 72;
-  map<uint32,     uint32> map_uint32_uint32     = 73;
-  map<uint64,     uint64> map_uint64_uint64     = 74;
-  map<sint32,     sint32> map_sint32_sint32     = 75;
-  map<sint64,     sint64> map_sint64_sint64     = 76;
-  map<fixed32,   fixed32> map_fixed32_fixed32   = 77;
-  map<fixed64,   fixed64> map_fixed64_fixed64   = 78;
-  map<sfixed32, sfixed32> map_sfixed32_sfixed32 = 79;
-  map<sfixed64, sfixed64> map_sfixed64_sfixed64 = 80;
-  map<int32,       float> map_int32_float       = 81;
-  map<int32,      double> map_int32_double      = 82;
-  map<bool,         bool> map_bool_bool         = 83;
-  map<string,     string> map_string_string     = 84;
-  map<int32,       bytes> map_int32_bytes       = 85;
-  map<int32,    TestEnum> map_int32_enum        = 86;
-  map<int32,         Sub> map_int32_message     = 87;
-
-  map<int32, TestMessage> map_recursive = 88;
-
-  message Sub {
-    int32 a = 1;
-    repeated int32 b = 2;
-  }
-
-  // Reserved for non-existing field test.
-  // int32 non_exist = 89;
-
-  NoNamespaceMessage optional_no_namespace_message = 91;
-  NoNamespaceEnum optional_no_namespace_enum = 92;
-  repeated NoNamespaceMessage repeated_no_namespace_message = 93;
-  repeated NoNamespaceEnum repeated_no_namespace_enum = 94;
-
-  enum NestedEnum {
-    ZERO = 0;
-  }
-
-  NestedEnum optional_nested_enum = 101;
-
-  // Test prefix for reserved words.
-  message Empty {
-    int32 a = 1;
-  }
-
-  reserved 111;
-
-  // Test map with missing message value
-  map<string, TestMessage> map_string_message = 121;
-  map<string, google.protobuf.Any> map_string_any = 122;
-  map<string, google.protobuf.ListValue> map_string_list = 123;
-  map<string, google.protobuf.Struct> map_string_struct = 124;
-
-  // deprecated field
-  int32 deprecated_optional_int32 = 125 [deprecated=true];
-}
-
-enum TestEnum {
-  ZERO = 0;
-  ONE  = 1;
-  TWO  = 2;
-  ECHO = 3;  // Test reserved name.
-}
-
-// Test prefix for reserved words.
-message Empty {
-  int32 a = 1;
-}
-
-message ARRAY {
-  int32 a = 1;
-}
-
-message TestPackedMessage {
-  repeated int32    repeated_int32    = 90  [packed = true];
-  repeated int64    repeated_int64    = 91  [packed = true];
-  repeated uint32   repeated_uint32   = 92  [packed = true];
-  repeated uint64   repeated_uint64   = 93  [packed = true];
-  repeated sint32   repeated_sint32   = 94  [packed = true];
-  repeated sint64   repeated_sint64   = 95  [packed = true];
-  repeated fixed32  repeated_fixed32  = 96  [packed = true];
-  repeated fixed64  repeated_fixed64  = 97  [packed = true];
-  repeated sfixed32 repeated_sfixed32 = 98  [packed = true];
-  repeated sfixed64 repeated_sfixed64 = 99  [packed = true];
-  repeated float    repeated_float    = 100 [packed = true];
-  repeated double   repeated_double   = 101 [packed = true];
-  repeated bool     repeated_bool     = 102 [packed = true];
-  repeated TestEnum repeated_enum     = 103 [packed = true];
-}
-
-// Need to be in sync with TestPackedMessage.
-message TestUnpackedMessage {
-  repeated int32    repeated_int32    = 90  [packed = false];
-  repeated int64    repeated_int64    = 91  [packed = false];
-  repeated uint32   repeated_uint32   = 92  [packed = false];
-  repeated uint64   repeated_uint64   = 93  [packed = false];
-  repeated sint32   repeated_sint32   = 94  [packed = false];
-  repeated sint64   repeated_sint64   = 95  [packed = false];
-  repeated fixed32  repeated_fixed32  = 96  [packed = false];
-  repeated fixed64  repeated_fixed64  = 97  [packed = false];
-  repeated sfixed32 repeated_sfixed32 = 98  [packed = false];
-  repeated sfixed64 repeated_sfixed64 = 99  [packed = false];
-  repeated float    repeated_float    = 100 [packed = false];
-  repeated double   repeated_double   = 101 [packed = false];
-  repeated bool     repeated_bool     = 102 [packed = false];
-  repeated TestEnum repeated_enum     = 103 [packed = false];
-}
-
-// /**/@<>&\{
-message TestPhpDoc {
-  int32 a = 1;
-}
-
-message TestIncludePrefixMessage {
-  TestPrefix prefix_message = 1;
-}
-
-message TestIncludeNamespaceMessage {
-  TestNamespace namespace_message = 1;
-  TestEmptyNamespace empty_namespace_message = 2;
-}
-
-// This will cause upb fields not ordered by the order in the generated code.
-message TestRandomFieldOrder {
-  int64 tag13 = 150;
-  string tag14 = 160;
-}
-
-message TestLargeFieldNumber {
-  int32 large_field_number = 536870911;
-}
-
-message TestReverseFieldOrder {
-  repeated int32 a = 2;
-  string b = 1;
-}
-
-message testLowerCaseMessage {
-}
-
-enum testLowerCaseEnum {
-  VALUE = 0;
-}
-
-message TestAny {
-  google.protobuf.Any any = 1;
-}
-
-message TestInt32Value {
-  google.protobuf.Int32Value field = 1;
-  repeated google.protobuf.Int32Value repeated_field = 2;
-  oneof oneof_fields {
-    google.protobuf.Int32Value oneof_field = 3;
-    int32 int32_field = 4;
-  }
-}
-
-message TestInt64Value {
-  google.protobuf.Int64Value field = 1;
-  repeated google.protobuf.Int64Value repeated_field = 2;
-  oneof oneof_fields {
-    google.protobuf.Int64Value oneof_field = 3;
-    int32 int32_field = 4;
-  }
-}
-
-message TestUInt32Value {
-  google.protobuf.UInt32Value field = 1;
-  repeated google.protobuf.UInt32Value repeated_field = 2;
-  oneof oneof_fields {
-    google.protobuf.UInt32Value oneof_field = 3;
-    int32 int32_field = 4;
-  }
-}
-
-message TestUInt64Value {
-  google.protobuf.UInt64Value field = 1;
-  repeated google.protobuf.UInt64Value repeated_field = 2;
-  oneof oneof_fields {
-    google.protobuf.UInt64Value oneof_field = 3;
-    int32 int32_field = 4;
-  }
-}
-
-message TestBoolValue {
-  google.protobuf.BoolValue field = 1;
-  repeated google.protobuf.BoolValue repeated_field = 2;
-  oneof oneof_fields {
-    google.protobuf.BoolValue oneof_field = 3;
-    int32 int32_field = 4;
-  }
-}
-
-message TestStringValue {
-  google.protobuf.StringValue field = 1;
-  repeated google.protobuf.StringValue repeated_field = 2;
-  oneof oneof_fields {
-    google.protobuf.StringValue oneof_field = 3;
-    int32 int32_field = 4;
-  }
-  map<int32, google.protobuf.StringValue> map_field = 5;
-}
-
-message TestBytesValue {
-  google.protobuf.BytesValue field = 1;
-  repeated google.protobuf.BytesValue repeated_field = 2;
-  oneof oneof_fields {
-    google.protobuf.BytesValue oneof_field = 3;
-    int32 int32_field = 4;
-  }
-}
-
-message Test32Fields {
-  optional uint32 id = 1;
-  optional uint32 random_name_a0 = 2;
-  optional uint32 random_name_a1 = 3;
-  optional uint32 random_name_a2 = 4;
-  optional uint32 random_name_a3 = 5;
-  optional uint32 random_name_a4 = 6;
-  optional uint32 random_name_a5 = 7;
-  optional uint32 random_name_a6 = 8;
-  optional uint32 random_name_a7 = 9;
-  optional uint32 random_name_a8 = 10;
-  optional uint32 random_name_a9 = 11;
-  optional uint32 random_name_b0 = 12;
-  optional uint32 random_name_b1 = 13;
-  optional uint32 random_name_b2 = 14;
-  optional uint32 random_name_b3 = 15;
-  optional uint32 random_name_b4 = 16;
-  optional uint32 random_name_b5 = 17;
-  optional uint32 random_name_b6 = 18;
-  optional uint32 random_name_b7 = 19;
-  optional uint32 random_name_b8 = 20;
-  optional uint32 random_name_b9 = 21;
-  optional uint32 random_name_c0 = 22;
-  optional uint32 random_name_c1 = 23;
-  optional uint32 random_name_c2 = 24;
-  optional uint32 random_name_c3 = 25;
-  optional uint32 random_name_c4 = 26;
-  optional uint32 random_name_c5 = 27;
-  optional uint32 random_name_c6 = 28;
-  optional uint32 random_name_c7 = 29;
-  optional uint32 random_name_c8 = 30;
-  optional uint32 random_name_c9 = 31;
-  optional string version = 32;
-}
diff --git a/libs/protobuf/php/tests/proto/test_descriptors.proto b/libs/protobuf/php/tests/proto/test_descriptors.proto
deleted file mode 100644
index b0956c6..0000000
--- a/libs/protobuf/php/tests/proto/test_descriptors.proto
+++ /dev/null
@@ -1,36 +0,0 @@
-syntax = "proto3";
-
-package descriptors;
-
-message TestDescriptorsMessage {
-  int32 optional_int32 = 1;
-  TestDescriptorsEnum optional_enum = 16;
-  Sub optional_message = 17;
-
-  // Repeated
-  repeated int32 repeated_int32 = 31;
-  repeated Sub repeated_message = 47;
-
-  oneof my_oneof {
-    int32 oneof_int32    = 51;
-  }
-  optional int32 proto3_optional_int32 = 52;
-
-  map<int32, EnumSub> map_int32_enum = 71;
-
-  message Sub {
-    int32 a = 1;
-    repeated int32 b = 2;
-  }
-
-  enum EnumSub {
-    ZERO = 0;
-    ONE = 1;
-  }
-}
-
-enum TestDescriptorsEnum {
-  ZERO = 0;
-  ONE  = 1;
-}
-
diff --git a/libs/protobuf/php/tests/proto/test_empty_php_namespace.proto b/libs/protobuf/php/tests/proto/test_empty_php_namespace.proto
deleted file mode 100644
index c7ed165..0000000
--- a/libs/protobuf/php/tests/proto/test_empty_php_namespace.proto
+++ /dev/null
@@ -1,19 +0,0 @@
-syntax = "proto3";
-
-package foo;
-option php_namespace = "";
-option php_metadata_namespace = "";
-
-message TestEmptyNamespace {
-  int32 a = 1;
-
-  // Test nested messages, enums, and reserved names
-  NestedMessage nested_message = 2;
-  NestedEnum nested_enum = 3;
-  message NestedMessage {
-    int32 a = 1;
-  }
-  enum NestedEnum {
-      ZERO = 0;
-  };
-}
diff --git a/libs/protobuf/php/tests/proto/test_import_descriptor_proto.proto b/libs/protobuf/php/tests/proto/test_import_descriptor_proto.proto
deleted file mode 100644
index b061601..0000000
--- a/libs/protobuf/php/tests/proto/test_import_descriptor_proto.proto
+++ /dev/null
@@ -1,16 +0,0 @@
-syntax = "proto3";
-
-package foo;
-
-import "google/protobuf/descriptor.proto";
-
-message TestImportDescriptorProto {
-  extend google.protobuf.MethodOptions {
-    int32 a = 72295727;
-  }
-}
-
-extend google.protobuf.MethodOptions {
-  int32 a = 72295728;
-}
-
diff --git a/libs/protobuf/php/tests/proto/test_include.proto b/libs/protobuf/php/tests/proto/test_include.proto
deleted file mode 100644
index a9072fe..0000000
--- a/libs/protobuf/php/tests/proto/test_include.proto
+++ /dev/null
@@ -1,18 +0,0 @@
-syntax = "proto3";
-
-package bar;
-
-message TestInclude {
-  int32 a = 1;
-}
-
-message TestLegacyMessage {
-  NestedMessage message = 1;
-  NestedEnum enum = 2;
-  message NestedMessage {
-    int32 a = 1;
-  }
-  enum NestedEnum {
-    ZERO = 0;
-  }
-}
diff --git a/libs/protobuf/php/tests/proto/test_no_namespace.proto b/libs/protobuf/php/tests/proto/test_no_namespace.proto
deleted file mode 100644
index cce42ea..0000000
--- a/libs/protobuf/php/tests/proto/test_no_namespace.proto
+++ /dev/null
@@ -1,22 +0,0 @@
-syntax = "proto3";
-
-option php_metadata_namespace = "\\";
-
-message NoNamespaceMessage {
-  int32 a = 1;
-
-  // Test nested messages, enums, and reserved names
-  NestedMessage nested_message = 2;
-  NestedEnum nested_enum = 3;
-  message NestedMessage {
-    int32 a = 1;
-  }
-  enum NestedEnum {
-      ZERO = 0;
-  };
-}
-
-enum NoNamespaceEnum {
-  VALUE_A = 0;
-  VALUE_B = 1;
-}
diff --git a/libs/protobuf/php/tests/proto/test_php_namespace.proto b/libs/protobuf/php/tests/proto/test_php_namespace.proto
deleted file mode 100644
index eb4a523..0000000
--- a/libs/protobuf/php/tests/proto/test_php_namespace.proto
+++ /dev/null
@@ -1,33 +0,0 @@
-syntax = "proto3";
-
-package foo;
-option php_namespace = "Php\\Test";
-option php_metadata_namespace = "Metadata\\Php\\Test";
-
-message TestNamespace {
-  int32 a = 1;
-
-  // Test nested messages, enums, and reserved names
-  NestedMessage nested_message = 2;
-  NestedEnum nested_enum = 3;
-  Empty reserved_name = 4;
-  message NestedMessage {
-    int32 a = 1;
-  }
-  enum NestedEnum {
-      ZERO = 0;
-  };
-  // Test reserved name
-  message Empty {
-    NestedMessage nested_message = 1;
-    NestedEnum nested_enum = 2;
-    message NestedMessage {
-      int32 a = 1;
-    }
-    enum NestedEnum {
-      ZERO = 0;
-    };
-    // Test previously unreserved name
-    message ReadOnly {}
-  }
-}
diff --git a/libs/protobuf/php/tests/proto/test_prefix.proto b/libs/protobuf/php/tests/proto/test_prefix.proto
deleted file mode 100644
index 3fa1138..0000000
--- a/libs/protobuf/php/tests/proto/test_prefix.proto
+++ /dev/null
@@ -1,20 +0,0 @@
-syntax = "proto3";
-
-option php_class_prefix = "Prefix";
-
-message TestPrefix {
-  int32 a = 1;
-  NestedMessage nested_message = 2;
-  NestedEnum nested_enum = 3;
-  message NestedMessage {
-    int32 a = 1;
-  }
-  enum NestedEnum {
-      ZERO = 0;
-  };
-}
-
-// Test prefix for reserved words.
-message Empty {
-  int32 a = 1;
-}
diff --git a/libs/protobuf/php/tests/proto/test_reserved_enum_lower.proto b/libs/protobuf/php/tests/proto/test_reserved_enum_lower.proto
deleted file mode 100644
index 1f96ac6..0000000
--- a/libs/protobuf/php/tests/proto/test_reserved_enum_lower.proto
+++ /dev/null
@@ -1,84 +0,0 @@
-syntax = "proto3";
-
-package lower_enum;
-
-enum abstract { ZERO1 = 0; }
-enum and { ZERO2 = 0; }
-enum array { ZERO3 = 0; }
-enum as { ZERO4 = 0; }
-enum break { ZERO5 = 0; }
-enum callable { ZERO6 = 0; }
-enum case { ZERO7 = 0; }
-enum catch { ZERO8 = 0; }
-enum class { ZERO9 = 0; }
-enum clone { ZERO10 = 0; }
-enum const { ZERO11 = 0; }
-enum continue { ZERO12 = 0; }
-enum declare { ZERO13 = 0; }
-enum default { ZERO14 = 0; }
-enum die { ZERO15 = 0; }
-enum do { ZERO16 = 0; }
-enum echo { ZERO17 = 0; }
-enum else { ZERO18 = 0; }
-enum elseif { ZERO19 = 0; }
-enum empty { ZERO20 = 0; }
-enum enddeclare { ZERO21 = 0; }
-enum endfor { ZERO22 = 0; }
-enum endforeach { ZERO23 = 0; }
-enum endif { ZERO24 = 0; }
-enum endswitch { ZERO25 = 0; }
-enum endwhile { ZERO26 = 0; }
-enum eval { ZERO27 = 0; }
-enum exit { ZERO28 = 0; }
-enum extends { ZERO29 = 0; }
-enum final { ZERO30 = 0; }
-enum finally { ZERO31 = 0; }
-enum fn { ZERO32 = 0; }
-enum for { ZERO33 = 0; }
-enum foreach { ZERO34 = 0; }
-enum function { ZERO35 = 0; }
-enum global { ZERO36 = 0; }
-enum goto { ZERO37 = 0; }
-enum if { ZERO38 = 0; }
-enum implements { ZERO39 = 0; }
-enum include { ZERO40 = 0; }
-enum include_once { ZERO41 = 0; }
-enum instanceof { ZERO42 = 0; }
-enum insteadof { ZERO43 = 0; }
-enum interface { ZERO44 = 0; }
-enum isset { ZERO45 = 0; }
-enum list { ZERO46 = 0; }
-enum match { ZERO47 = 0; }
-enum namespace { ZERO48 = 0; }
-enum new { ZERO49 = 0; }
-enum or { ZERO50 = 0; }
-enum parent { ZERO78 = 0; }
-enum print { ZERO51 = 0; }
-enum private { ZERO52 = 0; }
-enum protected { ZERO53 = 0; }
-enum public { ZERO54 = 0; }
-enum readonly { ZERO80 = 0; }
-enum require { ZERO55 = 0; }
-enum require_once { ZERO56 = 0; }
-enum return { ZERO57 = 0; }
-enum self { ZERO79 = 0; }
-enum static { ZERO58 = 0; }
-enum switch { ZERO59 = 0; }
-enum throw { ZERO60 = 0; }
-enum trait { ZERO61 = 0; }
-enum try { ZERO62 = 0; }
-enum unset { ZERO63 = 0; }
-enum use { ZERO64 = 0; }
-enum var { ZERO65 = 0; }
-enum while { ZERO66 = 0; }
-enum xor { ZERO67 = 0; }
-enum yield { ZERO68 = 0; }
-enum int { ZERO69 = 0; }
-enum float { ZERO70 = 0; }
-enum bool { ZERO71 = 0; }
-enum string { ZERO72 = 0; }
-enum true { ZERO73 = 0; }
-enum false { ZERO74 = 0; }
-enum null { ZERO75 = 0; }
-enum void { ZERO76 = 0; }
-enum iterable { ZERO77 = 0; }
diff --git a/libs/protobuf/php/tests/proto/test_reserved_enum_upper.proto b/libs/protobuf/php/tests/proto/test_reserved_enum_upper.proto
deleted file mode 100644
index c5e7e99..0000000
--- a/libs/protobuf/php/tests/proto/test_reserved_enum_upper.proto
+++ /dev/null
@@ -1,84 +0,0 @@
-syntax = "proto3";
-
-package upper_enum;
-
-enum ABSTRACT { ZERO1 = 0; }
-enum AND { ZERO2 = 0; }
-enum ARRAY { ZERO3 = 0; }
-enum AS { ZERO4 = 0; }
-enum BREAK { ZERO5 = 0; }
-enum CALLABLE { ZERO6 = 0; }
-enum CASE { ZERO7 = 0; }
-enum CATCH { ZERO8 = 0; }
-enum CLASS { ZERO9 = 0; }
-enum CLONE { ZERO10 = 0; }
-enum CONST { ZERO11 = 0; }
-enum CONTINUE { ZERO12 = 0; }
-enum DECLARE { ZERO13 = 0; }
-enum DEFAULT { ZERO14 = 0; }
-enum DIE { ZERO15 = 0; }
-enum DO { ZERO16 = 0; }
-enum ECHO { ZERO17 = 0; }
-enum ELSE { ZERO18 = 0; }
-enum ELSEIF { ZERO19 = 0; }
-enum EMPTY { ZERO20 = 0; }
-enum ENDDECLARE { ZERO21 = 0; }
-enum ENDFOR { ZERO22 = 0; }
-enum ENDFOREACH { ZERO23 = 0; }
-enum ENDIF { ZERO24 = 0; }
-enum ENDSWITCH { ZERO25 = 0; }
-enum ENDWHILE { ZERO26 = 0; }
-enum EVAL { ZERO27 = 0; }
-enum EXIT { ZERO28 = 0; }
-enum EXTENDS { ZERO29 = 0; }
-enum FINAL { ZERO30 = 0; }
-enum FINALLY { ZERO31 = 0; }
-enum FN { ZERO32 = 0; }
-enum FOR { ZERO33 = 0; }
-enum FOREACH { ZERO34 = 0; }
-enum FUNCTION { ZERO35 = 0; }
-enum GLOBAL { ZERO36 = 0; }
-enum GOTO { ZERO37 = 0; }
-enum IF { ZERO38 = 0; }
-enum IMPLEMENTS { ZERO39 = 0; }
-enum INCLUDE { ZERO40 = 0; }
-enum INCLUDE_ONCE { ZERO41 = 0; }
-enum INSTANCEOF { ZERO42 = 0; }
-enum INSTEADOF { ZERO43 = 0; }
-enum INTERFACE { ZERO44 = 0; }
-enum ISSET { ZERO45 = 0; }
-enum LIST { ZERO46 = 0; }
-enum MATCH { ZERO47 = 0; }
-enum NAMESPACE { ZERO48 = 0; }
-enum NEW { ZERO49 = 0; }
-enum OR { ZERO50 = 0; }
-enum PARENT { ZERO78 = 0; }
-enum PRINT { ZERO51 = 0; }
-enum PRIVATE { ZERO52 = 0; }
-enum PROTECTED { ZERO53 = 0; }
-enum PUBLIC { ZERO54 = 0; }
-enum READONLY { ZERO80 = 0; }
-enum REQUIRE { ZERO55 = 0; }
-enum REQUIRE_ONCE { ZERO56 = 0; }
-enum RETURN { ZERO57 = 0; }
-enum SELF { ZERO79 = 0; }
-enum STATIC { ZERO58 = 0; }
-enum SWITCH { ZERO59 = 0; }
-enum THROW { ZERO60 = 0; }
-enum TRAIT { ZERO61 = 0; }
-enum TRY { ZERO62 = 0; }
-enum UNSET { ZERO63 = 0; }
-enum USE { ZERO64 = 0; }
-enum VAR { ZERO65 = 0; }
-enum WHILE { ZERO66 = 0; }
-enum XOR { ZERO67 = 0; }
-enum YIELD { ZERO68 = 0; }
-enum INT { ZERO69 = 0; }
-enum FLOAT { ZERO70 = 0; }
-enum BOOL { ZERO71 = 0; }
-enum STRING { ZERO72 = 0; }
-enum TRUE { ZERO73 = 0; }
-enum FALSE { ZERO74 = 0; }
-enum NULL { ZERO75 = 0; }
-enum VOID { ZERO76 = 0; }
-enum ITERABLE { ZERO77 = 0; }
diff --git a/libs/protobuf/php/tests/proto/test_reserved_enum_value_lower.proto b/libs/protobuf/php/tests/proto/test_reserved_enum_value_lower.proto
deleted file mode 100644
index 86c6877..0000000
--- a/libs/protobuf/php/tests/proto/test_reserved_enum_value_lower.proto
+++ /dev/null
@@ -1,86 +0,0 @@
-syntax = "proto3";
-
-package lower_enum_value;
-
-enum NotAllowed {
-  abstract = 0;
-  and = 1;
-  array = 2;
-  as = 3;
-  break = 4;
-  callable = 5;
-  case     = 6;
-  catch    = 7;
-  class    = 8;
-  clone    = 9;
-  const    = 10;
-  continue = 11;
-  declare  = 12;
-  default  = 13;
-  die      = 14;
-  do       = 15;
-  echo     = 16;
-  else     = 17;
-  elseif   = 18;
-  empty    = 19;
-  enddeclare = 20;
-  endfor     = 21;
-  endforeach = 22;
-  endif      = 23;
-  endswitch = 24;
-  endwhile = 25;
-  eval = 26;
-  exit = 27;
-  extends = 28;
-  final = 29;
-  finally = 30;
-  fn = 31;
-  for = 32;
-  foreach = 33;
-  function = 34;
-  global = 35;
-  goto = 36;
-  if = 37;
-  implements = 38;
-  include = 39;
-  include_once = 40;
-  instanceof = 41;
-  insteadof = 42;
-  interface = 43;
-  isset = 44;
-  list = 45;
-  match = 46;
-  namespace = 47;
-  new = 48;
-  or = 49;
-  parent = 77;
-  print = 50;
-  private = 51;
-  protected = 52;
-  public = 53;
-  readonly = 79;
-  require = 54;
-  require_once = 55;
-  return = 56;
-  self = 78;
-  static = 57;
-  switch = 58;
-  throw = 59;
-  trait = 60;
-  try = 61;
-  unset = 62;
-  use = 63;
-  var = 64;
-  while = 65;
-  xor = 66;
-  yield = 67;
-  int = 68;
-  float = 69;
-  bool = 70;
-  string = 71;
-  true = 72;
-  false = 73;
-  null = 74;
-  void = 75;
-  iterable = 76;
-}
diff --git a/libs/protobuf/php/tests/proto/test_reserved_enum_value_upper.proto b/libs/protobuf/php/tests/proto/test_reserved_enum_value_upper.proto
deleted file mode 100644
index ac0beda..0000000
--- a/libs/protobuf/php/tests/proto/test_reserved_enum_value_upper.proto
+++ /dev/null
@@ -1,86 +0,0 @@
-syntax = "proto3";
-
-package upper_enum_value;
-
-enum NotAllowed {
-  ABSTRACT = 0;
-  AND = 1;
-  ARRAY = 2;
-  AS = 3;
-  BREAK = 4;
-  CALLABLE = 5;
-  CASE     = 6;
-  CATCH    = 7;
-  CLASS    = 8;
-  CLONE    = 9;
-  CONST    = 10;
-  CONTINUE = 11;
-  DECLARE  = 12;
-  DEFAULT  = 13;
-  DIE      = 14;
-  DO       = 15;
-  ECHO     = 16;
-  ELSE     = 17;
-  ELSEIF   = 18;
-  EMPTY    = 19;
-  ENDDECLARE = 20;
-  ENDFOR     = 21;
-  ENDFOREACH = 22;
-  ENDIF      = 23;
-  ENDSWITCH = 24;
-  ENDWHILE = 25;
-  EVAL = 26;
-  EXIT = 27;
-  EXTENDS = 28;
-  FINAL = 29;
-  FINALLY = 30;
-  FOR = 31;
-  FOREACH = 32;
-  FUNCTION = 33;
-  FN = 34;
-  GLOBAL = 35;
-  GOTO = 36;
-  IF = 37;
-  IMPLEMENTS = 38;
-  INCLUDE = 39;
-  INCLUDE_ONCE = 40;
-  INSTANCEOF = 41;
-  INSTEADOF = 42;
-  INTERFACE = 43;
-  ISSET = 44;
-  LIST = 45;
-  MATCH = 46;
-  NAMESPACE = 47;
-  NEW = 48;
-  OR = 49;
-  PARENT = 77;
-  PRINT = 50;
-  PRIVATE = 51;
-  PROTECTED = 52;
-  PUBLIC = 53;
-  READONLY = 79;
-  REQUIRE = 54;
-  REQUIRE_ONCE = 55;
-  RETURN = 56;
-  SELF = 78;
-  STATIC = 57;
-  SWITCH = 58;
-  THROW = 59;
-  TRAIT = 60;
-  TRY = 61;
-  UNSET = 62;
-  USE = 63;
-  VAR = 64;
-  WHILE = 65;
-  XOR = 66;
-  YIELD = 67;
-  INT = 68;
-  FLOAT = 69;
-  BOOL = 70;
-  STRING = 71;
-  TRUE = 72;
-  FALSE = 73;
-  NULL = 74;
-  VOID = 75;
-  ITERABLE = 76;
-}
diff --git a/libs/protobuf/php/tests/proto/test_reserved_message_lower.proto b/libs/protobuf/php/tests/proto/test_reserved_message_lower.proto
deleted file mode 100644
index 551ed7a..0000000
--- a/libs/protobuf/php/tests/proto/test_reserved_message_lower.proto
+++ /dev/null
@@ -1,84 +0,0 @@
-syntax = "proto3";
-
-package lower;
-
-message abstract {}
-message and {}
-message array {}
-message as {}
-message break {}
-message callable {}
-message case {}
-message catch {}
-message class {}
-message clone {}
-message const {}
-message continue {}
-message declare {}
-message default {}
-message die {}
-message do {}
-message echo {}
-message else {}
-message elseif {}
-message empty {}
-message enddeclare {}
-message endfor {}
-message endforeach {}
-message endif {}
-message endswitch {}
-message endwhile {}
-message eval {}
-message exit {}
-message extends {}
-message final {}
-message finally {}
-message fn {}
-message for {}
-message foreach {}
-message function {}
-message global {}
-message goto {}
-message if {}
-message implements {}
-message include {}
-message include_once {}
-message instanceof {}
-message insteadof {}
-message interface {}
-message isset {}
-message list {}
-message match {}
-message namespace {}
-message new {}
-message or {}
-message parent {}
-message print {}
-message private {}
-message protected {}
-message public {}
-message readonly {}
-message require {}
-message require_once {}
-message return {}
-message self {}
-message static {}
-message switch {}
-message throw {}
-message trait {}
-message try {}
-message unset {}
-message use {}
-message var {}
-message while {}
-message xor {}
-message yield {}
-message int {}
-message float {}
-message bool {}
-message string {}
-message true {}
-message false {}
-message null {}
-message void {}
-message iterable {}
diff --git a/libs/protobuf/php/tests/proto/test_reserved_message_upper.proto b/libs/protobuf/php/tests/proto/test_reserved_message_upper.proto
deleted file mode 100644
index 96995c9..0000000
--- a/libs/protobuf/php/tests/proto/test_reserved_message_upper.proto
+++ /dev/null
@@ -1,84 +0,0 @@
-syntax = "proto3";
-
-package upper;
-
-message ABSTRACT {}
-message AND {}
-message ARRAY {}
-message AS {}
-message BREAK {}
-message CALLABLE {}
-message CASE {}
-message CATCH {}
-message CLASS {}
-message CLONE {}
-message CONST {}
-message CONTINUE {}
-message DECLARE {}
-message DEFAULT {}
-message DIE {}
-message DO {}
-message ECHO {}
-message ELSE {}
-message ELSEIF {}
-message EMPTY {}
-message ENDDECLARE {}
-message ENDFOR {}
-message ENDFOREACH {}
-message ENDIF {}
-message ENDSWITCH {}
-message ENDWHILE {}
-message EVAL {}
-message EXIT {}
-message EXTENDS {}
-message FINAL {}
-message FINALLY {}
-message FN {}
-message FOR {}
-message FOREACH {}
-message FUNCTION {}
-message GLOBAL {}
-message GOTO {}
-message IF {}
-message IMPLEMENTS {}
-message INCLUDE {}
-message INCLUDE_ONCE {}
-message INSTANCEOF {}
-message INSTEADOF {}
-message INTERFACE {}
-message ISSET {}
-message LIST {}
-message MATCH {}
-message NAMESPACE {}
-message NEW {}
-message OR {}
-message PARENT {}
-message PRINT {}
-message PRIVATE {}
-message PROTECTED {}
-message PUBLIC {}
-message READONLY {}
-message REQUIRE {}
-message REQUIRE_ONCE {}
-message RETURN {}
-message SELF {}
-message STATIC {}
-message SWITCH {}
-message THROW {}
-message TRAIT {}
-message TRY {}
-message UNSET {}
-message USE {}
-message VAR {}
-message WHILE {}
-message XOR {}
-message YIELD {}
-message INT {}
-message FLOAT {}
-message BOOL {}
-message STRING {}
-message TRUE {}
-message FALSE {}
-message NULL {}
-message VOID {}
-message ITERABLE {}
diff --git a/libs/protobuf/php/tests/proto/test_service.proto b/libs/protobuf/php/tests/proto/test_service.proto
deleted file mode 100644
index a03dbc4..0000000
--- a/libs/protobuf/php/tests/proto/test_service.proto
+++ /dev/null
@@ -1,18 +0,0 @@
-syntax = "proto3";
-
-package foo;
-
-option php_generic_services = true;
-
-service Greeter {
-  rpc SayHello (HelloRequest) returns (HelloReply) {}
-  rpc SayHelloAgain (HelloRequest) returns (HelloReply) {}
-}
-
-message HelloRequest {
-  string name = 1;
-}
-
-message HelloReply {
-  string message = 1;
-}
diff --git a/libs/protobuf/php/tests/proto/test_service_namespace.proto b/libs/protobuf/php/tests/proto/test_service_namespace.proto
deleted file mode 100644
index 719aa48..0000000
--- a/libs/protobuf/php/tests/proto/test_service_namespace.proto
+++ /dev/null
@@ -1,13 +0,0 @@
-syntax = "proto3";
-
-import "proto/test_service.proto";
-
-package foo;
-
-option php_generic_services = true;
-option php_namespace = "Bar";
-
-service OtherGreeter {
-  rpc SayHello (HelloRequest) returns (HelloReply) {}
-  rpc SayHelloAgain (HelloRequest) returns (HelloReply) {}
-}
diff --git a/libs/protobuf/php/tests/proto/test_wrapper_type_setters.proto b/libs/protobuf/php/tests/proto/test_wrapper_type_setters.proto
deleted file mode 100644
index 41ca7f3..0000000
--- a/libs/protobuf/php/tests/proto/test_wrapper_type_setters.proto
+++ /dev/null
@@ -1,26 +0,0 @@
-syntax = "proto3";
-
-import "google/protobuf/wrappers.proto";
-
-package foo;
-
-message TestWrapperSetters {
-  google.protobuf.DoubleValue double_value = 1;
-  google.protobuf.FloatValue float_value = 2;
-  google.protobuf.Int64Value int64_value = 3;
-  google.protobuf.UInt64Value uint64_value = 4;
-  google.protobuf.Int32Value int32_value = 5;
-  google.protobuf.UInt32Value uint32_value = 6;
-  google.protobuf.BoolValue bool_value = 7;
-  google.protobuf.StringValue string_value = 8;
-  google.protobuf.BytesValue bytes_value = 9;
-
-  oneof wrapped_oneofs {
-    google.protobuf.DoubleValue double_value_oneof = 10;
-    google.protobuf.StringValue string_value_oneof = 11;
-  }
-
-  repeated google.protobuf.StringValue repeated_string_value = 12;
-
-  map<string, google.protobuf.StringValue> map_string_value = 13;
-}
diff --git a/libs/protobuf/php/tests/proto_previous/test_previously_unreserved_message.proto b/libs/protobuf/php/tests/proto_previous/test_previously_unreserved_message.proto
deleted file mode 100644
index 1b4b0b7..0000000
--- a/libs/protobuf/php/tests/proto_previous/test_previously_unreserved_message.proto
+++ /dev/null
@@ -1,5 +0,0 @@
-syntax = "proto3";
-
-package previous;
-
-message readonly {}
\ No newline at end of file
diff --git a/libs/protobuf/php/tests/test_base.php b/libs/protobuf/php/tests/test_base.php
deleted file mode 100644
index db884a8..0000000
--- a/libs/protobuf/php/tests/test_base.php
+++ /dev/null
@@ -1,367 +0,0 @@
-<?php
-
-use Foo\TestMessage;
-use Foo\TestEnum;
-use Foo\TestMessage\Sub;
-
-class TestBase extends \PHPUnit\Framework\TestCase
-{
-
-    public function setFields(TestMessage $m)
-    {
-        TestUtil::setTestMessage($m);
-    }
-
-    /**
-     * Polyfill for phpunit6.
-     */
-    static public function assertStringContains($needle, $haystack)
-    {
-        if (function_exists('PHPUnit\Framework\assertStringContainsString')) {
-            parent::assertStringContainsString($needle, $haystack);
-        } else {
-            parent::assertContains($needle, $haystack);
-        }
-    }
-
-    /**
-     * Polyfill for phpunit6.
-     */
-    static public function assertFloatEquals($expected, $actual, $delta)
-    {
-        if (function_exists('PHPUnit\Framework\assertEqualsWithDelta')) {
-            parent::assertEqualsWithDelta($expected, $actual, $delta);
-        } else {
-            parent::assertEquals($expected, $actual, '', $delta);
-        }
-    }
-
-    public function setFields2(TestMessage $m)
-    {
-        TestUtil::setTestMessage2($m);
-    }
-
-    public function expectFields(TestMessage $m)
-    {
-        $this->assertSame(-42,  $m->getOptionalInt32());
-        $this->assertSame(42,  $m->getOptionalUint32());
-        $this->assertSame(-44,  $m->getOptionalSint32());
-        $this->assertSame(46,   $m->getOptionalFixed32());
-        $this->assertSame(-46,  $m->getOptionalSfixed32());
-        $this->assertSame(1.5,  $m->getOptionalFloat());
-        $this->assertSame(1.6,  $m->getOptionalDouble());
-        $this->assertSame(true, $m->getOptionalBool());
-        $this->assertSame('a',  $m->getOptionalString());
-        $this->assertSame('bbbb',  $m->getOptionalBytes());
-        $this->assertSame(TestEnum::ONE, $m->getOptionalEnum());
-        $this->assertSame(33,   $m->getOptionalMessage()->getA());
-        if (PHP_INT_SIZE == 4) {
-            $this->assertSame('-43',  $m->getOptionalInt64());
-            $this->assertSame('43',   $m->getOptionalUint64());
-            $this->assertSame('-45',  $m->getOptionalSint64());
-            $this->assertSame('47',   $m->getOptionalFixed64());
-            $this->assertSame('-47',  $m->getOptionalSfixed64());
-        } else {
-            $this->assertSame(-43,  $m->getOptionalInt64());
-            $this->assertSame(43,   $m->getOptionalUint64());
-            $this->assertSame(-45,  $m->getOptionalSint64());
-            $this->assertSame(47,   $m->getOptionalFixed64());
-            $this->assertSame(-47,  $m->getOptionalSfixed64());
-        }
-
-        $this->assertEquals(-42,  $m->getRepeatedInt32()[0]);
-        $this->assertEquals(42,   $m->getRepeatedUint32()[0]);
-        $this->assertEquals(-43,  $m->getRepeatedInt64()[0]);
-        $this->assertEquals(43,   $m->getRepeatedUint64()[0]);
-        $this->assertEquals(-44,  $m->getRepeatedSint32()[0]);
-        $this->assertEquals(-45,  $m->getRepeatedSint64()[0]);
-        $this->assertEquals(46,   $m->getRepeatedFixed32()[0]);
-        $this->assertEquals(47,   $m->getRepeatedFixed64()[0]);
-        $this->assertEquals(-46,  $m->getRepeatedSfixed32()[0]);
-        $this->assertEquals(-47,  $m->getRepeatedSfixed64()[0]);
-        $this->assertEquals(1.5,  $m->getRepeatedFloat()[0]);
-        $this->assertEquals(1.6,  $m->getRepeatedDouble()[0]);
-        $this->assertEquals(true, $m->getRepeatedBool()[0]);
-        $this->assertEquals('a',  $m->getRepeatedString()[0]);
-        $this->assertEquals('bbbb',  $m->getRepeatedBytes()[0]);
-        $this->assertEquals(34,   $m->getRepeatedMessage()[0]->GetA());
-
-        $this->assertEquals(-52,   $m->getRepeatedInt32()[1]);
-        $this->assertEquals(52,    $m->getRepeatedUint32()[1]);
-        $this->assertEquals(-53,   $m->getRepeatedInt64()[1]);
-        $this->assertEquals(53,    $m->getRepeatedUint64()[1]);
-        $this->assertEquals(-54,   $m->getRepeatedSint32()[1]);
-        $this->assertEquals(-55,   $m->getRepeatedSint64()[1]);
-        $this->assertEquals(56,    $m->getRepeatedFixed32()[1]);
-        $this->assertEquals(57,    $m->getRepeatedFixed64()[1]);
-        $this->assertEquals(-56,   $m->getRepeatedSfixed32()[1]);
-        $this->assertEquals(-57,   $m->getRepeatedSfixed64()[1]);
-        $this->assertEquals(2.5,   $m->getRepeatedFloat()[1]);
-        $this->assertEquals(2.6,   $m->getRepeatedDouble()[1]);
-        $this->assertEquals(false, $m->getRepeatedBool()[1]);
-        $this->assertEquals('c',   $m->getRepeatedString()[1]);
-        $this->assertEquals('dddd',   $m->getRepeatedBytes()[1]);
-        $this->assertEquals(35,    $m->getRepeatedMessage()[1]->GetA());
-
-        if (PHP_INT_SIZE == 4) {
-            $this->assertEquals('-63', $m->getMapInt64Int64()['-63']);
-            $this->assertEquals('63',  $m->getMapUint64Uint64()['63']);
-            $this->assertEquals('-65', $m->getMapSint64Sint64()['-65']);
-            $this->assertEquals('67',  $m->getMapFixed64Fixed64()['67']);
-            $this->assertEquals('-69',  $m->getMapSfixed64Sfixed64()['-69']);
-        } else {
-            $this->assertEquals(-63, $m->getMapInt64Int64()[-63]);
-            $this->assertEquals(63,  $m->getMapUint64Uint64()[63]);
-            $this->assertEquals(-65, $m->getMapSint64Sint64()[-65]);
-            $this->assertEquals(67,  $m->getMapFixed64Fixed64()[67]);
-            $this->assertEquals(-69,  $m->getMapSfixed64Sfixed64()[-69]);
-        }
-        $this->assertEquals(-62, $m->getMapInt32Int32()[-62]);
-        $this->assertEquals(62,  $m->getMapUint32Uint32()[62]);
-        $this->assertEquals(-64, $m->getMapSint32Sint32()[-64]);
-        $this->assertEquals(66,  $m->getMapFixed32Fixed32()[66]);
-        $this->assertEquals(-68,  $m->getMapSfixed32Sfixed32()[-68]);
-        $this->assertEquals(3.5, $m->getMapInt32Float()[1]);
-        $this->assertEquals(3.6, $m->getMapInt32Double()[1]);
-        $this->assertEquals(true , $m->getMapBoolBool()[true]);
-        $this->assertEquals('e', $m->getMapStringString()['e']);
-        $this->assertEquals('ffff', $m->getMapInt32Bytes()[1]);
-        $this->assertEquals(TestEnum::ONE, $m->getMapInt32Enum()[1]);
-        $this->assertEquals(36, $m->getMapInt32Message()[1]->GetA());
-    }
-
-    // Test message merged from setFields and setFields2.
-    public function expectFieldsMerged(TestMessage $m)
-    {
-        $this->assertSame(-144,  $m->getOptionalSint32());
-        $this->assertSame(146,   $m->getOptionalFixed32());
-        $this->assertSame(-146,  $m->getOptionalSfixed32());
-        $this->assertSame(11.5,  $m->getOptionalFloat());
-        $this->assertSame(11.6,  $m->getOptionalDouble());
-        $this->assertSame(true, $m->getOptionalBool());
-        $this->assertSame('aa',  $m->getOptionalString());
-        $this->assertSame('bb',  $m->getOptionalBytes());
-        $this->assertSame(133,   $m->getOptionalMessage()->getA());
-        if (PHP_INT_SIZE == 4) {
-            $this->assertSame('-143',  $m->getOptionalInt64());
-            $this->assertSame('143',   $m->getOptionalUint64());
-            $this->assertSame('-145',  $m->getOptionalSint64());
-            $this->assertSame('147',   $m->getOptionalFixed64());
-            $this->assertSame('-147',  $m->getOptionalSfixed64());
-        } else {
-            $this->assertSame(-143,  $m->getOptionalInt64());
-            $this->assertSame(143,   $m->getOptionalUint64());
-            $this->assertSame(-145,  $m->getOptionalSint64());
-            $this->assertSame(147,   $m->getOptionalFixed64());
-            $this->assertSame(-147,  $m->getOptionalSfixed64());
-        }
-
-        $this->assertEquals(-42,  $m->getRepeatedInt32()[0]);
-        $this->assertEquals(42,   $m->getRepeatedUint32()[0]);
-        $this->assertEquals(-43,  $m->getRepeatedInt64()[0]);
-        $this->assertEquals(43,   $m->getRepeatedUint64()[0]);
-        $this->assertEquals(-44,  $m->getRepeatedSint32()[0]);
-        $this->assertEquals(-45,  $m->getRepeatedSint64()[0]);
-        $this->assertEquals(46,   $m->getRepeatedFixed32()[0]);
-        $this->assertEquals(47,   $m->getRepeatedFixed64()[0]);
-        $this->assertEquals(-46,  $m->getRepeatedSfixed32()[0]);
-        $this->assertEquals(-47,  $m->getRepeatedSfixed64()[0]);
-        $this->assertEquals(1.5,  $m->getRepeatedFloat()[0]);
-        $this->assertEquals(1.6,  $m->getRepeatedDouble()[0]);
-        $this->assertEquals(true, $m->getRepeatedBool()[0]);
-        $this->assertEquals('a',  $m->getRepeatedString()[0]);
-        $this->assertEquals('bbbb',  $m->getRepeatedBytes()[0]);
-        $this->assertEquals(TestEnum::ZERO,  $m->getRepeatedEnum()[0]);
-        $this->assertEquals(34,   $m->getRepeatedMessage()[0]->GetA());
-
-        $this->assertEquals(-52,   $m->getRepeatedInt32()[1]);
-        $this->assertEquals(52,    $m->getRepeatedUint32()[1]);
-        $this->assertEquals(-53,   $m->getRepeatedInt64()[1]);
-        $this->assertEquals(53,    $m->getRepeatedUint64()[1]);
-        $this->assertEquals(-54,   $m->getRepeatedSint32()[1]);
-        $this->assertEquals(-55,   $m->getRepeatedSint64()[1]);
-        $this->assertEquals(56,    $m->getRepeatedFixed32()[1]);
-        $this->assertEquals(57,    $m->getRepeatedFixed64()[1]);
-        $this->assertEquals(-56,   $m->getRepeatedSfixed32()[1]);
-        $this->assertEquals(-57,   $m->getRepeatedSfixed64()[1]);
-        $this->assertEquals(2.5,   $m->getRepeatedFloat()[1]);
-        $this->assertEquals(2.6,   $m->getRepeatedDouble()[1]);
-        $this->assertEquals(false, $m->getRepeatedBool()[1]);
-        $this->assertEquals('c',   $m->getRepeatedString()[1]);
-        $this->assertEquals('dddd',   $m->getRepeatedBytes()[1]);
-        $this->assertEquals(TestEnum::ONE,  $m->getRepeatedEnum()[1]);
-        $this->assertEquals(35,    $m->getRepeatedMessage()[1]->GetA());
-
-        $this->assertEquals(-142,  $m->getRepeatedInt32()[2]);
-        $this->assertEquals(142,   $m->getRepeatedUint32()[2]);
-        $this->assertEquals(-143,  $m->getRepeatedInt64()[2]);
-        $this->assertEquals(143,   $m->getRepeatedUint64()[2]);
-        $this->assertEquals(-144,  $m->getRepeatedSint32()[2]);
-        $this->assertEquals(-145,  $m->getRepeatedSint64()[2]);
-        $this->assertEquals(146,   $m->getRepeatedFixed32()[2]);
-        $this->assertEquals(147,   $m->getRepeatedFixed64()[2]);
-        $this->assertEquals(-146,  $m->getRepeatedSfixed32()[2]);
-        $this->assertEquals(-147,  $m->getRepeatedSfixed64()[2]);
-        $this->assertEquals(11.5,  $m->getRepeatedFloat()[2]);
-        $this->assertEquals(11.6,  $m->getRepeatedDouble()[2]);
-        $this->assertEquals(false, $m->getRepeatedBool()[2]);
-        $this->assertEquals('aa',  $m->getRepeatedString()[2]);
-        $this->assertEquals('bb',  $m->getRepeatedBytes()[2]);
-        $this->assertEquals(TestEnum::TWO,  $m->getRepeatedEnum()[2]);
-        $this->assertEquals(134,   $m->getRepeatedMessage()[2]->GetA());
-
-        if (PHP_INT_SIZE == 4) {
-            $this->assertEquals('-163', $m->getMapInt64Int64()['-63']);
-            $this->assertEquals('163',  $m->getMapUint64Uint64()['63']);
-            $this->assertEquals('-165', $m->getMapSint64Sint64()['-65']);
-            $this->assertEquals('167',  $m->getMapFixed64Fixed64()['67']);
-            $this->assertEquals('-169',  $m->getMapSfixed64Sfixed64()['-69']);
-        } else {
-            $this->assertEquals(-163, $m->getMapInt64Int64()[-63]);
-            $this->assertEquals(163,  $m->getMapUint64Uint64()[63]);
-            $this->assertEquals(-165, $m->getMapSint64Sint64()[-65]);
-            $this->assertEquals(167,  $m->getMapFixed64Fixed64()[67]);
-            $this->assertEquals(-169,  $m->getMapSfixed64Sfixed64()[-69]);
-        }
-        $this->assertEquals(-162, $m->getMapInt32Int32()[-62]);
-        $this->assertEquals(162,  $m->getMapUint32Uint32()[62]);
-        $this->assertEquals(-164, $m->getMapSint32Sint32()[-64]);
-        $this->assertEquals(166,  $m->getMapFixed32Fixed32()[66]);
-        $this->assertEquals(-168,  $m->getMapSfixed32Sfixed32()[-68]);
-        $this->assertEquals(13.5, $m->getMapInt32Float()[1]);
-        $this->assertEquals(13.6, $m->getMapInt32Double()[1]);
-        $this->assertEquals(false , $m->getMapBoolBool()[true]);
-        $this->assertEquals('ee', $m->getMapStringString()['e']);
-        $this->assertEquals('ff', $m->getMapInt32Bytes()[1]);
-        $this->assertEquals(TestEnum::TWO, $m->getMapInt32Enum()[1]);
-        $this->assertEquals(136, $m->getMapInt32Message()[1]->GetA());
-
-        if (PHP_INT_SIZE == 4) {
-            $this->assertEquals('-163', $m->getMapInt64Int64()['-163']);
-            $this->assertEquals('163',  $m->getMapUint64Uint64()['163']);
-            $this->assertEquals('-165', $m->getMapSint64Sint64()['-165']);
-            $this->assertEquals('167',  $m->getMapFixed64Fixed64()['167']);
-            $this->assertEquals('-169',  $m->getMapSfixed64Sfixed64()['-169']);
-        } else {
-            $this->assertEquals(-163, $m->getMapInt64Int64()[-163]);
-            $this->assertEquals(163,  $m->getMapUint64Uint64()[163]);
-            $this->assertEquals(-165, $m->getMapSint64Sint64()[-165]);
-            $this->assertEquals(167,  $m->getMapFixed64Fixed64()[167]);
-            $this->assertEquals(-169,  $m->getMapSfixed64Sfixed64()[-169]);
-        }
-        $this->assertEquals(-162, $m->getMapInt32Int32()[-162]);
-        $this->assertEquals(162,  $m->getMapUint32Uint32()[162]);
-        $this->assertEquals(-164, $m->getMapSint32Sint32()[-164]);
-        $this->assertEquals(166,  $m->getMapFixed32Fixed32()[166]);
-        $this->assertEquals(-168,  $m->getMapSfixed32Sfixed32()[-168]);
-        $this->assertEquals(13.5, $m->getMapInt32Float()[2]);
-        $this->assertEquals(13.6, $m->getMapInt32Double()[2]);
-        $this->assertEquals(false , $m->getMapBoolBool()[false]);
-        $this->assertEquals('ee', $m->getMapStringString()['ee']);
-        $this->assertEquals('ff', $m->getMapInt32Bytes()[2]);
-        $this->assertEquals(TestEnum::TWO, $m->getMapInt32Enum()[2]);
-        $this->assertEquals(136, $m->getMapInt32Message()[2]->GetA());
-    }
-
-    public function expectEmptyFields(TestMessage $m)
-    {
-        $this->assertSame(0,   $m->getOptionalInt32());
-        $this->assertSame(0,   $m->getOptionalUint32());
-        $this->assertSame(0,   $m->getOptionalSint32());
-        $this->assertSame(0,   $m->getOptionalFixed32());
-        $this->assertSame(0,   $m->getOptionalSfixed32());
-        $this->assertSame(0.0, $m->getOptionalFloat());
-        $this->assertSame(0.0, $m->getOptionalDouble());
-        $this->assertSame(false, $m->getOptionalBool());
-        $this->assertSame('',  $m->getOptionalString());
-        $this->assertSame('',  $m->getOptionalBytes());
-        $this->assertSame(0, $m->getOptionalEnum());
-        $this->assertNull($m->getOptionalMessage());
-        $this->assertNull($m->getOptionalIncludedMessage());
-        $this->assertNull($m->getRecursive());
-        if (PHP_INT_SIZE == 4) {
-            $this->assertSame("0", $m->getOptionalInt64());
-            $this->assertSame("0", $m->getOptionalUint64());
-            $this->assertSame("0", $m->getOptionalSint64());
-            $this->assertSame("0", $m->getOptionalFixed64());
-            $this->assertSame("0", $m->getOptionalSfixed64());
-        } else {
-            $this->assertSame(0, $m->getOptionalInt64());
-            $this->assertSame(0, $m->getOptionalUint64());
-            $this->assertSame(0, $m->getOptionalSint64());
-            $this->assertSame(0, $m->getOptionalFixed64());
-            $this->assertSame(0, $m->getOptionalSfixed64());
-        }
-
-        $this->assertEquals(0, count($m->getRepeatedInt32()));
-        $this->assertEquals(0, count($m->getRepeatedUint32()));
-        $this->assertEquals(0, count($m->getRepeatedInt64()));
-        $this->assertEquals(0, count($m->getRepeatedUint64()));
-        $this->assertEquals(0, count($m->getRepeatedSint32()));
-        $this->assertEquals(0, count($m->getRepeatedSint64()));
-        $this->assertEquals(0, count($m->getRepeatedFixed32()));
-        $this->assertEquals(0, count($m->getRepeatedFixed64()));
-        $this->assertEquals(0, count($m->getRepeatedSfixed32()));
-        $this->assertEquals(0, count($m->getRepeatedSfixed64()));
-        $this->assertEquals(0, count($m->getRepeatedFloat()));
-        $this->assertEquals(0, count($m->getRepeatedDouble()));
-        $this->assertEquals(0, count($m->getRepeatedBool()));
-        $this->assertEquals(0, count($m->getRepeatedString()));
-        $this->assertEquals(0, count($m->getRepeatedBytes()));
-        $this->assertEquals(0, count($m->getRepeatedEnum()));
-        $this->assertEquals(0, count($m->getRepeatedMessage()));
-        $this->assertEquals(0, count($m->getRepeatedRecursive()));
-
-        $this->assertSame("", $m->getMyOneof());
-        $this->assertSame(0,   $m->getOneofInt32());
-        $this->assertSame(0,   $m->getOneofUint32());
-        $this->assertSame(0,   $m->getOneofSint32());
-        $this->assertSame(0,   $m->getOneofFixed32());
-        $this->assertSame(0,   $m->getOneofSfixed32());
-        $this->assertSame(0.0, $m->getOneofFloat());
-        $this->assertSame(0.0, $m->getOneofDouble());
-        $this->assertSame(false, $m->getOneofBool());
-        $this->assertSame('',  $m->getOneofString());
-        $this->assertSame('',  $m->getOneofBytes());
-        $this->assertSame(0, $m->getOneofEnum());
-        $this->assertNull($m->getOptionalMessage());
-        if (PHP_INT_SIZE == 4) {
-            $this->assertSame("0", $m->getOneofInt64());
-            $this->assertSame("0", $m->getOneofUint64());
-            $this->assertSame("0", $m->getOneofSint64());
-            $this->assertSame("0", $m->getOneofFixed64());
-            $this->assertSame("0", $m->getOneofSfixed64());
-        } else {
-            $this->assertSame(0, $m->getOneofInt64());
-            $this->assertSame(0, $m->getOneofUint64());
-            $this->assertSame(0, $m->getOneofSint64());
-            $this->assertSame(0, $m->getOneofFixed64());
-            $this->assertSame(0, $m->getOneofSfixed64());
-        }
-
-        $this->assertEquals(0, count($m->getMapInt64Int64()));
-        $this->assertEquals(0, count($m->getMapUint64Uint64()));
-        $this->assertEquals(0, count($m->getMapSint64Sint64()));
-        $this->assertEquals(0, count($m->getMapFixed64Fixed64()));
-        $this->assertEquals(0, count($m->getMapInt32Int32()));
-        $this->assertEquals(0, count($m->getMapUint32Uint32()));
-        $this->assertEquals(0, count($m->getMapSint32Sint32()));
-        $this->assertEquals(0, count($m->getMapFixed32Fixed32()));
-        $this->assertEquals(0, count($m->getMapSfixed32Sfixed32()));
-        $this->assertEquals(0, count($m->getMapSfixed64Sfixed64()));
-        $this->assertEquals(0, count($m->getMapInt32Float()));
-        $this->assertEquals(0, count($m->getMapInt32Double()));
-        $this->assertEquals(0, count($m->getMapBoolBool()));
-        $this->assertEquals(0, count($m->getMapStringString()));
-        $this->assertEquals(0, count($m->getMapInt32Bytes()));
-        $this->assertEquals(0, count($m->getMapInt32Enum()));
-        $this->assertEquals(0, count($m->getMapInt32Message()));
-        $this->assertEquals(0, count($m->getMapRecursive()));
-    }
-
-  // This test is to avoid the warning of no test by php unit.
-  public function testNone()
-  {
-      $this->assertTrue(true);
-  }
-}
diff --git a/libs/protobuf/php/tests/test_util.php b/libs/protobuf/php/tests/test_util.php
deleted file mode 100644
index c47bf58..0000000
--- a/libs/protobuf/php/tests/test_util.php
+++ /dev/null
@@ -1,533 +0,0 @@
-<?php
-
-use Foo\TestEnum;
-use Foo\TestMessage;
-use Foo\TestMessage\Sub;
-use Foo\TestPackedMessage;
-use Foo\TestUnpackedMessage;
-
-define('MAX_FLOAT_DIFF', 0.000001);
-
-if (PHP_INT_SIZE == 8) {
-    define('MAX_INT_STRING', '9223372036854775807');
-    define('MAX_INT_UPPER_STRING', '9223372036854775808');
-} else {
-    define('MAX_INT_STRING', '2147483647');
-    define('MAX_INT_UPPER_STRING', '2147483648');
-}
-
-define('MAX_INT32', 2147483647);
-define('MAX_INT32_FLOAT', 2147483647.0);
-define('MAX_INT32_STRING', '2147483647');
-
-define('MIN_INT32', (int)-2147483648);
-define('MIN_INT32_FLOAT', -2147483648.0);
-define('MIN_INT32_STRING', '-2147483648');
-
-define('MAX_UINT32', 4294967295);
-define('MAX_UINT32_FLOAT', 4294967295.0);
-define('MAX_UINT32_STRING', '4294967295');
-
-define('MIN_UINT32', (int)-2147483648);
-define('MIN_UINT32_FLOAT', -2147483648.0);
-define('MIN_UINT32_STRING', '-2147483648');
-
-define('MAX_INT64_STRING',  '9223372036854775807');
-define('MIN_INT64_STRING',  '-9223372036854775808');
-define('MAX_UINT64_STRING', '-9223372036854775808');
-
-if (PHP_INT_SIZE === 8) {
-    define('MAX_INT64',  (int)9223372036854775807);
-    define('MIN_INT64',  (int)-9223372036854775808);
-    define('MAX_UINT64', (int)-9223372036854775808);
-} else {
-    define('MAX_INT64', MAX_INT64_STRING);
-    define('MIN_INT64', MIN_INT64_STRING);
-    define('MAX_UINT64', MAX_UINT64_STRING);
-}
-
-class TestUtil
-{
-
-    public static function setTestMessage(TestMessage $m)
-    {
-        $m->setOptionalInt32(-42);
-        $m->setOptionalInt64(-43);
-        $m->setOptionalUint32(42);
-        $m->setOptionalUint64(43);
-        $m->setOptionalSint32(-44);
-        $m->setOptionalSint64(-45);
-        $m->setOptionalFixed32(46);
-        $m->setOptionalFixed64(47);
-        $m->setOptionalSfixed32(-46);
-        $m->setOptionalSfixed64(-47);
-        $m->setOptionalFloat(1.5);
-        $m->setOptionalDouble(1.6);
-        $m->setOptionalBool(true);
-        $m->setOptionalString('a');
-        $m->setOptionalBytes('bbbb');
-        $m->setOptionalEnum(TestEnum::ONE);
-        $sub = new Sub();
-        $m->setOptionalMessage($sub);
-        $m->getOptionalMessage()->SetA(33);
-
-        self::appendHelper($m, 'RepeatedInt32',    -42);
-        self::appendHelper($m, 'RepeatedInt64',    -43);
-        self::appendHelper($m, 'RepeatedUint32',    42);
-        self::appendHelper($m, 'RepeatedUint64',    43);
-        self::appendHelper($m, 'RepeatedSint32',   -44);
-        self::appendHelper($m, 'RepeatedSint64',   -45);
-        self::appendHelper($m, 'RepeatedFixed32',   46);
-        self::appendHelper($m, 'RepeatedFixed64',   47);
-        self::appendHelper($m, 'RepeatedSfixed32', -46);
-        self::appendHelper($m, 'RepeatedSfixed64', -47);
-        self::appendHelper($m, 'RepeatedFloat',    1.5);
-        self::appendHelper($m, 'RepeatedDouble',   1.6);
-        self::appendHelper($m, 'RepeatedBool',     true);
-        self::appendHelper($m, 'RepeatedString',   'a');
-        self::appendHelper($m, 'RepeatedBytes',    'bbbb');
-        self::appendHelper($m, 'RepeatedEnum',     TestEnum::ZERO);
-        self::appendHelper($m, 'RepeatedMessage',  new Sub());
-        $m->getRepeatedMessage()[0]->setA(34);
-
-        self::appendHelper($m, 'RepeatedInt32',    -52);
-        self::appendHelper($m, 'RepeatedInt64',    -53);
-        self::appendHelper($m, 'RepeatedUint32',    52);
-        self::appendHelper($m, 'RepeatedUint64',    53);
-        self::appendHelper($m, 'RepeatedSint32',   -54);
-        self::appendHelper($m, 'RepeatedSint64',   -55);
-        self::appendHelper($m, 'RepeatedFixed32',   56);
-        self::appendHelper($m, 'RepeatedFixed64',   57);
-        self::appendHelper($m, 'RepeatedSfixed32', -56);
-        self::appendHelper($m, 'RepeatedSfixed64', -57);
-        self::appendHelper($m, 'RepeatedFloat',    2.5);
-        self::appendHelper($m, 'RepeatedDouble',   2.6);
-        self::appendHelper($m, 'RepeatedBool',     false);
-        self::appendHelper($m, 'RepeatedString',   'c');
-        self::appendHelper($m, 'RepeatedBytes',    'dddd');
-        self::appendHelper($m, 'RepeatedEnum',     TestEnum::ONE);
-        self::appendHelper($m, 'RepeatedMessage',  new Sub());
-        $m->getRepeatedMessage()[1]->SetA(35);
-
-        self::kvUpdateHelper($m, 'MapInt32Int32', -62, -62);
-        self::kvUpdateHelper($m, 'MapInt64Int64', -63, -63);
-        self::kvUpdateHelper($m, 'MapUint32Uint32', 62, 62);
-        self::kvUpdateHelper($m, 'MapUint64Uint64', 63, 63);
-        self::kvUpdateHelper($m, 'MapSint32Sint32', -64, -64);
-        self::kvUpdateHelper($m, 'MapSint64Sint64', -65, -65);
-        self::kvUpdateHelper($m, 'MapFixed32Fixed32', 66, 66);
-        self::kvUpdateHelper($m, 'MapFixed64Fixed64', 67, 67);
-        self::kvUpdateHelper($m, 'MapSfixed32Sfixed32', -68, -68);
-        self::kvUpdateHelper($m, 'MapSfixed64Sfixed64', -69, -69);
-        self::kvUpdateHelper($m, 'MapInt32Float', 1, 3.5);
-        self::kvUpdateHelper($m, 'MapInt32Double', 1, 3.6);
-        self::kvUpdateHelper($m, 'MapBoolBool', true, true);
-        self::kvUpdateHelper($m, 'MapStringString', 'e', 'e');
-        self::kvUpdateHelper($m, 'MapInt32Bytes', 1, 'ffff');
-        self::kvUpdateHelper($m, 'MapInt32Enum', 1, TestEnum::ONE);
-        self::kvUpdateHelper($m, 'MapInt32Message', 1, new Sub());
-        $m->getMapInt32Message()[1]->SetA(36);
-    }
-
-    public static function setTestMessage2(TestMessage $m)
-    {
-        $sub = new Sub();
-
-        $m->setOptionalInt32(-142);
-        $m->setOptionalInt64(-143);
-        $m->setOptionalUint32(142);
-        $m->setOptionalUint64(143);
-        $m->setOptionalSint32(-144);
-        $m->setOptionalSint64(-145);
-        $m->setOptionalFixed32(146);
-        $m->setOptionalFixed64(147);
-        $m->setOptionalSfixed32(-146);
-        $m->setOptionalSfixed64(-147);
-        $m->setOptionalFloat(11.5);
-        $m->setOptionalDouble(11.6);
-        $m->setOptionalBool(true);
-        $m->setOptionalString('aa');
-        $m->setOptionalBytes('bb');
-        $m->setOptionalEnum(TestEnum::TWO);
-        $m->setOptionalMessage($sub);
-        $m->getOptionalMessage()->SetA(133);
-
-        self::appendHelper($m, 'RepeatedInt32',    -142);
-        self::appendHelper($m, 'RepeatedInt64',    -143);
-        self::appendHelper($m, 'RepeatedUint32',    142);
-        self::appendHelper($m, 'RepeatedUint64',    143);
-        self::appendHelper($m, 'RepeatedSint32',   -144);
-        self::appendHelper($m, 'RepeatedSint64',   -145);
-        self::appendHelper($m, 'RepeatedFixed32',   146);
-        self::appendHelper($m, 'RepeatedFixed64',   147);
-        self::appendHelper($m, 'RepeatedSfixed32', -146);
-        self::appendHelper($m, 'RepeatedSfixed64', -147);
-        self::appendHelper($m, 'RepeatedFloat',    11.5);
-        self::appendHelper($m, 'RepeatedDouble',   11.6);
-        self::appendHelper($m, 'RepeatedBool',     false);
-        self::appendHelper($m, 'RepeatedString',   'aa');
-        self::appendHelper($m, 'RepeatedBytes',    'bb');
-        self::appendHelper($m, 'RepeatedEnum',     TestEnum::TWO);
-        self::appendHelper($m, 'RepeatedMessage',  new Sub());
-        $m->getRepeatedMessage()[0]->setA(134);
-
-        self::kvUpdateHelper($m, 'MapInt32Int32', -62, -162);
-        self::kvUpdateHelper($m, 'MapInt64Int64', -63, -163);
-        self::kvUpdateHelper($m, 'MapUint32Uint32', 62, 162);
-        self::kvUpdateHelper($m, 'MapUint64Uint64', 63, 163);
-        self::kvUpdateHelper($m, 'MapSint32Sint32', -64, -164);
-        self::kvUpdateHelper($m, 'MapSint64Sint64', -65, -165);
-        self::kvUpdateHelper($m, 'MapFixed32Fixed32', 66, 166);
-        self::kvUpdateHelper($m, 'MapFixed64Fixed64', 67, 167);
-        self::kvUpdateHelper($m, 'MapSfixed32Sfixed32', -68, -168);
-        self::kvUpdateHelper($m, 'MapSfixed64Sfixed64', -69, -169);
-        self::kvUpdateHelper($m, 'MapInt32Float', 1, 13.5);
-        self::kvUpdateHelper($m, 'MapInt32Double', 1, 13.6);
-        self::kvUpdateHelper($m, 'MapBoolBool', true, false);
-        self::kvUpdateHelper($m, 'MapStringString', 'e', 'ee');
-        self::kvUpdateHelper($m, 'MapInt32Bytes', 1, 'ff');
-        self::kvUpdateHelper($m, 'MapInt32Enum', 1, TestEnum::TWO);
-        self::kvUpdateHelper($m, 'MapInt32Message', 1, new Sub());
-        $m->getMapInt32Message()[1]->SetA(136);
-
-        self::kvUpdateHelper($m, 'MapInt32Int32', -162, -162);
-        self::kvUpdateHelper($m, 'MapInt64Int64', -163, -163);
-        self::kvUpdateHelper($m, 'MapUint32Uint32', 162, 162);
-        self::kvUpdateHelper($m, 'MapUint64Uint64', 163, 163);
-        self::kvUpdateHelper($m, 'MapSint32Sint32', -164, -164);
-        self::kvUpdateHelper($m, 'MapSint64Sint64', -165, -165);
-        self::kvUpdateHelper($m, 'MapFixed32Fixed32', 166, 166);
-        self::kvUpdateHelper($m, 'MapFixed64Fixed64', 167, 167);
-        self::kvUpdateHelper($m, 'MapSfixed32Sfixed32', -168, -168);
-        self::kvUpdateHelper($m, 'MapSfixed64Sfixed64', -169, -169);
-        self::kvUpdateHelper($m, 'MapInt32Float', 2, 13.5);
-        self::kvUpdateHelper($m, 'MapInt32Double', 2, 13.6);
-        self::kvUpdateHelper($m, 'MapBoolBool', false, false);
-        self::kvUpdateHelper($m, 'MapStringString', 'ee', 'ee');
-        self::kvUpdateHelper($m, 'MapInt32Bytes', 2, 'ff');
-        self::kvUpdateHelper($m, 'MapInt32Enum', 2, TestEnum::TWO);
-        self::kvUpdateHelper($m, 'MapInt32Message', 2, new Sub());
-        $m->getMapInt32Message()[2]->SetA(136);
-    }
-
-    public static function assertTestMessage(TestMessage $m)
-    {
-        if (PHP_INT_SIZE == 4) {
-            assert('-43' === $m->getOptionalInt64());
-            assert('43'  === $m->getOptionalUint64());
-            assert('-45' === $m->getOptionalSint64());
-            assert('47'  === $m->getOptionalFixed64());
-            assert('-47' === $m->getOptionalSfixed64());
-        } else {
-            assert(-43 === $m->getOptionalInt64());
-            assert(43  === $m->getOptionalUint64());
-            assert(-45 === $m->getOptionalSint64());
-            assert(47  === $m->getOptionalFixed64());
-            assert(-47 === $m->getOptionalSfixed64());
-        }
-        assert(-42 === $m->getOptionalInt32());
-        assert(42  === $m->getOptionalUint32());
-        assert(-44 === $m->getOptionalSint32());
-        assert(46  === $m->getOptionalFixed32());
-        assert(-46 === $m->getOptionalSfixed32());
-        assert(1.5 === $m->getOptionalFloat());
-        assert(1.6 === $m->getOptionalDouble());
-        assert(true=== $m->getOptionalBool());
-        assert('a' === $m->getOptionalString());
-        assert('bbbb' === $m->getOptionalBytes());
-        assert(TestEnum::ONE === $m->getOptionalEnum());
-        assert(33  === $m->getOptionalMessage()->getA());
-
-        if (PHP_INT_SIZE == 4) {
-            assert('-43' === $m->getRepeatedInt64()[0]);
-            assert('43'  === $m->getRepeatedUint64()[0]);
-            assert('-45' === $m->getRepeatedSint64()[0]);
-            assert('47'  === $m->getRepeatedFixed64()[0]);
-            assert('-47' === $m->getRepeatedSfixed64()[0]);
-        } else {
-            assert(-43 === $m->getRepeatedInt64()[0]);
-            assert(43  === $m->getRepeatedUint64()[0]);
-            assert(-45 === $m->getRepeatedSint64()[0]);
-            assert(47  === $m->getRepeatedFixed64()[0]);
-            assert(-47 === $m->getRepeatedSfixed64()[0]);
-        }
-        assert(-42 === $m->getRepeatedInt32()[0]);
-        assert(42  === $m->getRepeatedUint32()[0]);
-        assert(-44 === $m->getRepeatedSint32()[0]);
-        assert(46  === $m->getRepeatedFixed32()[0]);
-        assert(-46 === $m->getRepeatedSfixed32()[0]);
-        assert(1.5 === $m->getRepeatedFloat()[0]);
-        assert(1.6 === $m->getRepeatedDouble()[0]);
-        assert(true=== $m->getRepeatedBool()[0]);
-        assert('a' === $m->getRepeatedString()[0]);
-        assert('bbbb' === $m->getRepeatedBytes()[0]);
-        assert(TestEnum::ZERO === $m->getRepeatedEnum()[0]);
-        assert(34  === $m->getRepeatedMessage()[0]->getA());
-
-        if (PHP_INT_SIZE == 4) {
-            assert('-53' === $m->getRepeatedInt64()[1]);
-            assert('53'  === $m->getRepeatedUint64()[1]);
-            assert('-55' === $m->getRepeatedSint64()[1]);
-            assert('57'  === $m->getRepeatedFixed64()[1]);
-            assert('-57' === $m->getRepeatedSfixed64()[1]);
-        } else {
-            assert(-53 === $m->getRepeatedInt64()[1]);
-            assert(53  === $m->getRepeatedUint64()[1]);
-            assert(-55 === $m->getRepeatedSint64()[1]);
-            assert(57  === $m->getRepeatedFixed64()[1]);
-            assert(-57 === $m->getRepeatedSfixed64()[1]);
-        }
-        assert(-52 === $m->getRepeatedInt32()[1]);
-        assert(52  === $m->getRepeatedUint32()[1]);
-        assert(-54 === $m->getRepeatedSint32()[1]);
-        assert(56  === $m->getRepeatedFixed32()[1]);
-        assert(-56 === $m->getRepeatedSfixed32()[1]);
-        assert(2.5 === $m->getRepeatedFloat()[1]);
-        assert(2.6 === $m->getRepeatedDouble()[1]);
-        assert(false === $m->getRepeatedBool()[1]);
-        assert('c' === $m->getRepeatedString()[1]);
-        assert('dddd' === $m->getRepeatedBytes()[1]);
-        assert(TestEnum::ONE === $m->getRepeatedEnum()[1]);
-        assert(35  === $m->getRepeatedMessage()[1]->getA());
-
-        if (PHP_INT_SIZE == 4) {
-            assert('-63' === $m->getMapInt64Int64()['-63']);
-            assert('63'  === $m->getMapUint64Uint64()['63']);
-            assert('-65' === $m->getMapSint64Sint64()['-65']);
-            assert('67'  === $m->getMapFixed64Fixed64()['67']);
-            assert('-69'  === $m->getMapSfixed64Sfixed64()['-69']);
-        } else {
-            assert(-63 === $m->getMapInt64Int64()[-63]);
-            assert(63  === $m->getMapUint64Uint64()[63]);
-            assert(-65 === $m->getMapSint64Sint64()[-65]);
-            assert(67  === $m->getMapFixed64Fixed64()[67]);
-            assert(-69  === $m->getMapSfixed64Sfixed64()[-69]);
-        }
-        assert(-62 === $m->getMapInt32Int32()[-62]);
-        assert(62  === $m->getMapUint32Uint32()[62]);
-        assert(-64 === $m->getMapSint32Sint32()[-64]);
-        assert(66  === $m->getMapFixed32Fixed32()[66]);
-        assert(-68  === $m->getMapSfixed32Sfixed32()[-68]);
-        assert(3.5 === $m->getMapInt32Float()[1]);
-        assert(3.6 === $m->getMapInt32Double()[1]);
-        assert(true === $m->getMapBoolBool()[true]);
-        assert('e' === $m->getMapStringString()['e']);
-        assert('ffff' === $m->getMapInt32Bytes()[1]);
-        assert(TestEnum::ONE === $m->getMapInt32Enum()[1]);
-        assert(36  === $m->getMapInt32Message()[1]->GetA());
-    }
-
-    public static function getGoldenTestMessage()
-    {
-        return hex2bin(
-            "08D6FFFFFFFFFFFFFFFF01" .
-            "10D5FFFFFFFFFFFFFFFF01" .
-            "182A" .
-            "202B" .
-            "2857" .
-            "3059" .
-            "3D2E000000" .
-            "412F00000000000000" .
-            "4DD2FFFFFF" .
-            "51D1FFFFFFFFFFFFFF" .
-            "5D0000C03F" .
-            "619A9999999999F93F" .
-            "6801" .
-            "720161" .
-            "7A0462626262" .
-            "800101" .
-            "8A01020821" .
-
-            "FA0114D6FFFFFFFFFFFFFFFF01CCFFFFFFFFFFFFFFFF01" .
-            "820214D5FFFFFFFFFFFFFFFF01CBFFFFFFFFFFFFFFFF01" .
-            "8A02022A34" .
-            "9202022B35" .
-            "9A0202576B" .
-            "A20202596D" .
-            "AA02082E00000038000000" .
-            "B202102F000000000000003900000000000000" .
-            "BA0208D2FFFFFFC8FFFFFF" .
-            "C20210D1FFFFFFFFFFFFFFC7FFFFFFFFFFFFFF" .
-            "CA02080000C03F00002040" .
-            "D202109A9999999999F93FCDCCCCCCCCCC0440" .
-            "DA02020100" .
-            "E2020161" .
-            "E2020163" .
-            "EA020462626262" .
-            "EA020464646464" .
-            "F202020001" .
-            "FA02020822" .
-            "FA02020823" .
-
-            "BA041608C2FFFFFFFFFFFFFFFF0110C2FFFFFFFFFFFFFFFF01" .
-            "C2041608C1FFFFFFFFFFFFFFFF0110C1FFFFFFFFFFFFFFFF01" .
-            "CA0404083E103E" .
-            "D20404083F103F" .
-            "DA0404087f107F" .
-            "E20406088101108101" .
-            "EA040A0D420000001542000000" .
-            "F20412094300000000000000114300000000000000" .
-            "FA040A0DBCFFFFFF15BCFFFFFF" .
-            "82051209BBFFFFFFFFFFFFFF11BBFFFFFFFFFFFFFF" .
-            "8A050708011500006040" .
-            "92050B080111CDCCCCCCCCCC0C40" .
-            "9A050408011001" .
-            "A205060a0165120165" .
-            "AA05080801120466666666" .
-            "B2050408011001" .
-            "Ba0506080112020824"
-        );
-    }
-
-    public static function setTestPackedMessage($m)
-    {
-        self::appendHelper($m, 'RepeatedInt32', -42);
-        self::appendHelper($m, 'RepeatedInt32', -52);
-        self::appendHelper($m, 'RepeatedInt64', -43);
-        self::appendHelper($m, 'RepeatedInt64', -53);
-        self::appendHelper($m, 'RepeatedUint32', 42);
-        self::appendHelper($m, 'RepeatedUint32', 52);
-        self::appendHelper($m, 'RepeatedUint64', 43);
-        self::appendHelper($m, 'RepeatedUint64', 53);
-        self::appendHelper($m, 'RepeatedSint32', -44);
-        self::appendHelper($m, 'RepeatedSint32', -54);
-        self::appendHelper($m, 'RepeatedSint64', -45);
-        self::appendHelper($m, 'RepeatedSint64', -55);
-        self::appendHelper($m, 'RepeatedFixed32', 46);
-        self::appendHelper($m, 'RepeatedFixed32', 56);
-        self::appendHelper($m, 'RepeatedFixed64', 47);
-        self::appendHelper($m, 'RepeatedFixed64', 57);
-        self::appendHelper($m, 'RepeatedSfixed32', -46);
-        self::appendHelper($m, 'RepeatedSfixed32', -56);
-        self::appendHelper($m, 'RepeatedSfixed64', -47);
-        self::appendHelper($m, 'RepeatedSfixed64', -57);
-        self::appendHelper($m, 'RepeatedFloat', 1.5);
-        self::appendHelper($m, 'RepeatedFloat', 2.5);
-        self::appendHelper($m, 'RepeatedDouble', 1.6);
-        self::appendHelper($m, 'RepeatedDouble', 2.6);
-        self::appendHelper($m, 'RepeatedBool', true);
-        self::appendHelper($m, 'RepeatedBool', false);
-        self::appendHelper($m, 'RepeatedEnum', TestEnum::ONE);
-        self::appendHelper($m, 'RepeatedEnum', TestEnum::ZERO);
-    }
-
-    public static function assertTestPackedMessage($m)
-    {
-        assert(2 === count($m->getRepeatedInt32()));
-        assert(2 === count($m->getRepeatedInt64()));
-        assert(2 === count($m->getRepeatedUint32()));
-        assert(2 === count($m->getRepeatedUint64()));
-        assert(2 === count($m->getRepeatedSint32()));
-        assert(2 === count($m->getRepeatedSint64()));
-        assert(2 === count($m->getRepeatedFixed32()));
-        assert(2 === count($m->getRepeatedFixed64()));
-        assert(2 === count($m->getRepeatedSfixed32()));
-        assert(2 === count($m->getRepeatedSfixed64()));
-        assert(2 === count($m->getRepeatedFloat()));
-        assert(2 === count($m->getRepeatedDouble()));
-        assert(2 === count($m->getRepeatedBool()));
-        assert(2 === count($m->getRepeatedEnum()));
-
-        assert(-42 === $m->getRepeatedInt32()[0]);
-        assert(-52 === $m->getRepeatedInt32()[1]);
-        assert(42  === $m->getRepeatedUint32()[0]);
-        assert(52  === $m->getRepeatedUint32()[1]);
-        assert(-44 === $m->getRepeatedSint32()[0]);
-        assert(-54 === $m->getRepeatedSint32()[1]);
-        assert(46  === $m->getRepeatedFixed32()[0]);
-        assert(56  === $m->getRepeatedFixed32()[1]);
-        assert(-46 === $m->getRepeatedSfixed32()[0]);
-        assert(-56 === $m->getRepeatedSfixed32()[1]);
-        assert(1.5 === $m->getRepeatedFloat()[0]);
-        assert(2.5 === $m->getRepeatedFloat()[1]);
-        assert(1.6 === $m->getRepeatedDouble()[0]);
-        assert(2.6 === $m->getRepeatedDouble()[1]);
-        assert(true  === $m->getRepeatedBool()[0]);
-        assert(false === $m->getRepeatedBool()[1]);
-        assert(TestEnum::ONE  === $m->getRepeatedEnum()[0]);
-        assert(TestEnum::ZERO === $m->getRepeatedEnum()[1]);
-        if (PHP_INT_SIZE == 4) {
-            assert('-43' === $m->getRepeatedInt64()[0]);
-            assert('-53' === $m->getRepeatedInt64()[1]);
-            assert('43'  === $m->getRepeatedUint64()[0]);
-            assert('53'  === $m->getRepeatedUint64()[1]);
-            assert('-45' === $m->getRepeatedSint64()[0]);
-            assert('-55' === $m->getRepeatedSint64()[1]);
-            assert('47'  === $m->getRepeatedFixed64()[0]);
-            assert('57'  === $m->getRepeatedFixed64()[1]);
-            assert('-47' === $m->getRepeatedSfixed64()[0]);
-            assert('-57' === $m->getRepeatedSfixed64()[1]);
-        } else {
-            assert(-43 === $m->getRepeatedInt64()[0]);
-            assert(-53 === $m->getRepeatedInt64()[1]);
-            assert(43  === $m->getRepeatedUint64()[0]);
-            assert(53  === $m->getRepeatedUint64()[1]);
-            assert(-45 === $m->getRepeatedSint64()[0]);
-            assert(-55 === $m->getRepeatedSint64()[1]);
-            assert(47  === $m->getRepeatedFixed64()[0]);
-            assert(57  === $m->getRepeatedFixed64()[1]);
-            assert(-47 === $m->getRepeatedSfixed64()[0]);
-            assert(-57 === $m->getRepeatedSfixed64()[1]);
-        }
-    }
-
-    public static function getGoldenTestPackedMessage()
-    {
-        return hex2bin(
-            "D20514D6FFFFFFFFFFFFFFFF01CCFFFFFFFFFFFFFFFF01" .
-            "DA0514D5FFFFFFFFFFFFFFFF01CBFFFFFFFFFFFFFFFF01" .
-            "E205022A34" .
-            "EA05022B35" .
-            "F20502576B" .
-            "FA0502596D" .
-            "8206082E00000038000000" .
-            "8A06102F000000000000003900000000000000" .
-            "920608D2FFFFFFC8FFFFFF" .
-            "9A0610D1FFFFFFFFFFFFFFC7FFFFFFFFFFFFFF" .
-            "A206080000C03F00002040" .
-            "AA06109A9999999999F93FCDCCCCCCCCCC0440" .
-            "B206020100" .
-            "BA06020100"
-        );
-    }
-
-    public static function getGoldenTestUnpackedMessage()
-    {
-        return hex2bin(
-            "D005D6FFFFFFFFFFFFFFFF01D005CCFFFFFFFFFFFFFFFF01" .
-            "D805D5FFFFFFFFFFFFFFFF01D805CBFFFFFFFFFFFFFFFF01" .
-            "E0052AE00534" .
-            "E8052BE80535" .
-            "F00557F0056B" .
-            "F80559F8056D" .
-            "85062E000000850638000000" .
-            "89062F0000000000000089063900000000000000" .
-            "9506D2FFFFFF9506C8FFFFFF" .
-            "9906D1FFFFFFFFFFFFFF9906C7FFFFFFFFFFFFFF" .
-            "A5060000C03FA50600002040" .
-            "A9069A9999999999F93FA906CDCCCCCCCCCC0440" .
-            "B00601B00600" .
-            "B80601B80600"
-        );
-    }
-
-    private static function appendHelper($obj, $func_suffix, $value)
-    {
-        $getter_function = 'get'.$func_suffix;
-        $setter_function = 'set'.$func_suffix;
-
-        $arr = $obj->$getter_function();
-        $arr[] = $value;
-        $obj->$setter_function($arr);
-    }
-
-    private static function kvUpdateHelper($obj, $func_suffix, $key, $value)
-    {
-        $getter_function = 'get'.$func_suffix;
-        $setter_function = 'set'.$func_suffix;
-
-        $arr = $obj->$getter_function();
-        $arr[$key] = $value;
-        $obj->$setter_function($arr);
-    }
-}
diff --git a/libs/protobuf/php/tests/valgrind.supp b/libs/protobuf/php/tests/valgrind.supp
deleted file mode 100644
index 8d31466..0000000
--- a/libs/protobuf/php/tests/valgrind.supp
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-   PHP_Equal_Val
-   Memcheck:Cond
-   fun:zend_string_equal_val
-}
-
-{
-   PHP_ScanDir_Tail
-   Memcheck:Cond
-   obj:/usr/bin/php7.3
-   fun:__scandir64_tail
-}
-
-{
-   PHP_ModuleLoadingLeaks
-   Memcheck:Leak
-   ...
-   fun:php_module_startup
-}
-
-{
-   PHP_ModuleLoadingLeaks
-   Memcheck:Leak
-   ...
-   fun:php_module_startup
-}
-
-{
-   PHP_ModuleLoadingLeaks2
-   Memcheck:Leak
-   ...
-   fun:php_load_shlib
-}
diff --git a/libs/protobuf/pkg/BUILD.bazel b/libs/protobuf/pkg/BUILD.bazel
deleted file mode 100644
index ecce255..0000000
--- a/libs/protobuf/pkg/BUILD.bazel
+++ /dev/null
@@ -1,379 +0,0 @@
-load("@rules_pkg//:pkg.bzl", "pkg_tar", "pkg_zip")
-load(
-    "@rules_pkg//:mappings.bzl",
-    "pkg_attributes",
-    "pkg_filegroup",
-    "pkg_files",
-    "strip_prefix",
-)
-load("//:protobuf_release.bzl", "package_naming")
-load(":build_systems.bzl", "gen_automake_file_lists", "gen_file_lists")
-load(":cc_dist_library.bzl", "cc_dist_library")
-
-package_naming(
-    name = "protobuf_pkg_naming",
-)
-
-pkg_files(
-    name = "wkt_protos_files",
-    srcs = [
-        "//:src/google/protobuf/any.proto",
-        "//:src/google/protobuf/api.proto",
-        "//:src/google/protobuf/descriptor.proto",
-        "//:src/google/protobuf/duration.proto",
-        "//:src/google/protobuf/empty.proto",
-        "//:src/google/protobuf/field_mask.proto",
-        "//:src/google/protobuf/source_context.proto",
-        "//:src/google/protobuf/struct.proto",
-        "//:src/google/protobuf/timestamp.proto",
-        "//:src/google/protobuf/type.proto",
-        "//:src/google/protobuf/wrappers.proto",
-    ],
-    prefix = "include/google/protobuf",
-    visibility = ["//visibility:private"],
-)
-
-pkg_files(
-    name = "compiler_plugin_protos_files",
-    srcs = ["//:src/google/protobuf/compiler/plugin.proto"],
-    prefix = "include/google/protobuf/compiler",
-    visibility = ["//visibility:private"],
-)
-
-################################################################################
-# Generates protoc release artifacts.
-################################################################################
-
-genrule(
-    name = "protoc_readme",
-    outs = ["readme.txt"],
-    cmd = """
-echo "Protocol Buffers - Google's data interchange format
-Copyright 2008 Google Inc.
-https://developers.google.com/protocol-buffers/
-This package contains a precompiled binary version of the protocol buffer
-compiler (protoc). This binary is intended for users who want to use Protocol
-Buffers in languages other than C++ but do not want to compile protoc
-themselves. To install, simply place this binary somewhere in your PATH.
-If you intend to use the included well known types then don't forget to
-copy the contents of the 'include' directory somewhere as well, for example
-into '/usr/local/include/'.
-Please refer to our official github site for more installation instructions:
-  https://github.com/protocolbuffers/protobuf" > $@
-    """,
-    visibility = ["//visibility:private"],
-)
-
-pkg_files(
-    name = "protoc_files",
-    srcs = ["//:protoc"],
-    attributes = pkg_attributes(mode = "0555"),
-    prefix = "bin/",
-    visibility = ["//visibility:private"],
-)
-
-pkg_zip(
-    name = "protoc_release",
-    srcs = [
-        ":compiler_plugin_protos_files",
-        ":protoc_files",
-        ":protoc_readme",
-        ":wkt_protos_files",
-    ],
-    package_file_name = "protoc-{version}-{platform}.zip",
-    package_variables = ":protobuf_pkg_naming",
-)
-
-################################################################################
-# Source distribution packaging
-#
-# TODO: these will eventually replace autotools for release artifact packaging.
-################################################################################
-
-pkg_filegroup(
-    name = "dist_common",
-    srcs = [
-        ":dist_files",
-        "//:common_dist_files",
-        "//:cpp_dist_files",  # to build protoc
-        "//benchmarks:all_dist_files",
-        "//build_defs:dist_files",
-        "//conformance:all_dist_files",
-        "@com_google_protobuf_examples//:dist_files",
-    ],
-)
-
-pkg_filegroup(
-    name = "cpp_srcs",
-    srcs = [
-        ":dist_common",
-        "//:cpp_dist_files",
-    ],
-)
-
-pkg_tar(
-    name = "dist_cpp_tar",
-    srcs = [":cpp_srcs"],
-    extension = "tar.gz",
-    package_dir = "protobuf-{version}",
-    package_file_name = "protobuf-cpp-{version}.tar.gz",
-    package_variables = ":protobuf_pkg_naming",
-)
-
-pkg_zip(
-    name = "dist_cpp_zip",
-    srcs = [":cpp_srcs"],
-    package_file_name = "protobuf-cpp-{version}.zip",
-    package_variables = ":protobuf_pkg_naming",
-)
-
-pkg_filegroup(
-    name = "csharp_srcs",
-    srcs = [
-        ":dist_common",
-        "//:csharp_dist_files",
-        "//csharp:dist_files",
-    ],
-)
-
-pkg_tar(
-    name = "dist_csharp_tar",
-    srcs = [":csharp_srcs"],
-    extension = "tar.gz",
-    package_dir = "protobuf-{version}",
-    package_file_name = "protobuf-csharp-{version}.tar.gz",
-    package_variables = ":protobuf_pkg_naming",
-)
-
-pkg_zip(
-    name = "dist_csharp_zip",
-    srcs = [":csharp_srcs"],
-    package_file_name = "protobuf-csharp-{version}.zip",
-    package_variables = ":protobuf_pkg_naming",
-)
-
-pkg_filegroup(
-    name = "java_srcs",
-    srcs = [
-        ":dist_common",
-        "//java:all_dist_files",
-    ],
-)
-
-pkg_tar(
-    name = "dist_java_tar",
-    srcs = [":java_srcs"],
-    extension = "tar.gz",
-    package_dir = "protobuf-{version}",
-    package_file_name = "protobuf-java-{version}.tar.gz",
-    package_variables = ":protobuf_pkg_naming",
-)
-
-pkg_zip(
-    name = "dist_java_zip",
-    srcs = [":java_srcs"],
-    package_file_name = "protobuf-java-{version}.zip",
-    package_variables = ":protobuf_pkg_naming",
-)
-
-pkg_filegroup(
-    name = "objectivec_srcs",
-    srcs = [
-        ":dist_common",
-        "//:objectivec_dist_files",
-        "//objectivec:dist_files",
-    ],
-)
-
-pkg_tar(
-    name = "dist_objectivec_tar",
-    srcs = [":objectivec_srcs"],
-    extension = "tar.gz",
-    package_dir = "protobuf-{version}",
-    package_file_name = "protobuf-objectivec-{version}.tar.gz",
-    package_variables = ":protobuf_pkg_naming",
-)
-
-pkg_zip(
-    name = "dist_objectivec_zip",
-    srcs = [":objectivec_srcs"],
-    package_file_name = "protobuf-objectivec-{version}.zip",
-    package_variables = ":protobuf_pkg_naming",
-)
-
-pkg_filegroup(
-    name = "php_srcs",
-    srcs = [
-        ":dist_common",
-        "//php:dist_files",
-    ],
-)
-
-pkg_tar(
-    name = "dist_php_tar",
-    srcs = [":php_srcs"],
-    extension = "tar.gz",
-    package_dir = "protobuf-{version}",
-    package_file_name = "protobuf-php-{version}.tar.gz",
-    package_variables = ":protobuf_pkg_naming",
-)
-
-pkg_zip(
-    name = "dist_php_zip",
-    srcs = [":php_srcs"],
-    package_file_name = "protobuf-php-{version}.zip",
-    package_variables = ":protobuf_pkg_naming",
-)
-
-pkg_filegroup(
-    name = "python_srcs",
-    srcs = [
-        ":dist_common",
-        "//:python_dist_files",
-    ],
-)
-
-pkg_tar(
-    name = "dist_python_tar",
-    srcs = [":python_srcs"],
-    extension = "tar.gz",
-    package_dir = "protobuf-{version}",
-    package_file_name = "protobuf-python-{version}.tar.gz",
-    package_variables = ":protobuf_pkg_naming",
-)
-
-pkg_zip(
-    name = "dist_python_zip",
-    srcs = [":python_srcs"],
-    package_file_name = "protobuf-python-{version}.zip",
-    package_variables = ":protobuf_pkg_naming",
-)
-
-pkg_filegroup(
-    name = "ruby_srcs",
-    srcs = [
-        ":dist_common",
-        "//ruby:dist_files",
-    ],
-)
-
-pkg_tar(
-    name = "dist_ruby_tar",
-    srcs = [":ruby_srcs"],
-    extension = "tar.gz",
-    package_dir = "protobuf-{version}",
-    package_file_name = "protobuf-ruby-{version}.tar.gz",
-    package_variables = ":protobuf_pkg_naming",
-)
-
-pkg_zip(
-    name = "dist_ruby_zip",
-    srcs = [":ruby_srcs"],
-    package_file_name = "protobuf-ruby-{version}.zip",
-    package_variables = ":protobuf_pkg_naming",
-)
-
-pkg_filegroup(
-    name = "dist_all",
-    srcs = [
-        ":cpp_srcs",
-        ":csharp_srcs",
-        ":java_srcs",
-        ":objectivec_srcs",
-        ":php_srcs",
-        ":python_srcs",
-        ":ruby_srcs",
-    ],
-)
-
-pkg_tar(
-    name = "dist_all_tar",
-    srcs = [":dist_all"],
-    extension = "tar.gz",
-    package_dir = "protobuf-{version}",
-    package_file_name = "protobuf-all-{version}.tar.gz",
-    package_variables = ":protobuf_pkg_naming",
-)
-
-pkg_zip(
-    name = "dist_all_zip",
-    srcs = [":dist_all"],
-    package_file_name = "protobuf-all-{version}.zip",
-    package_variables = ":protobuf_pkg_naming",
-)
-
-################################################################################
-# Generated file lists for build systems
-################################################################################
-
-gen_file_lists(
-    name = "gen_src_file_lists",
-    testonly = 1,
-    out_stem = "src_file_lists",
-    src_libs = {
-        # source rule: name in generated file
-        "//:protobuf": "libprotobuf",
-        "//:protoc_lib": "libprotoc",
-        "//:protobuf_lite": "libprotobuf_lite",
-    },
-)
-
-gen_automake_file_lists(
-    name = "gen_automake_extra_dist_lists",
-    testonly = 1,
-    out = "extra_dist_file_lists.am",
-    src_libs = {
-        # source rule: name in generated file
-        "//:common_dist_files": "dist_common",
-        "//conformance:dist_files": "dist_conformance",
-        "//benchmarks:all_dist_files": "dist_benchmark",
-        "@com_google_protobuf_examples//:dist_files": "dist_example",
-        "//:csharp_dist_files": "dist_csharp",
-        "//csharp:dist_files": "dist_csharp2",
-        "//:objectivec_dist_files": "dist_objectivec",
-        "//objectivec:dist_files": "dist_objectivec2",
-        "//php:dist_files": "dist_php",
-        "//:python_dist_files": "dist_python",
-        "//ruby:dist_files": "dist_ruby",
-    },
-)
-
-################################################################################
-# Protobuf runtime libraries.
-################################################################################
-
-cc_dist_library(
-    name = "protobuf_lite",
-    linkopts = select({
-        "//build_defs:config_msvc": [],
-        "//conditions:default": ["-lpthread"],
-    }),
-    deps = [
-        "//:protobuf_lite",
-    ],
-)
-
-cc_dist_library(
-    name = "protobuf",
-    linkopts = select({
-        "//build_defs:config_msvc": [],
-        "//conditions:default": [
-            "-lz",
-            "-lpthread",
-        ],
-    }),
-    deps = [
-        "//:protobuf",
-        "//:protobuf_lite",
-    ],
-)
-
-################################################################################
-# Distribution sources
-################################################################################
-
-pkg_files(
-    name = "dist_files",
-    srcs = glob(["*"]),
-    strip_prefix = strip_prefix.from_root(""),
-)
diff --git a/libs/protobuf/pkg/README.md b/libs/protobuf/pkg/README.md
deleted file mode 100644
index 82a49e9..0000000
--- a/libs/protobuf/pkg/README.md
+++ /dev/null
@@ -1,31 +0,0 @@
-# Protobuf packaging
-
-This directory contains Bazel rules for building packaging and distribution
-artifacts.
-
-*Everything in this directory should be considered internal and subject to
-change.*
-
-## Protocol compiler binary packaging
-
-The protocol compiler is used in binary form in various places. There are rules
-which package it, along with commonly used `.proto` files, for distribution.
-
-## Source distribution packaging
-
-Protobuf releases include source distributions, sliced by target language (C++,
-Java, etc.). There are rules in this package to define those source archives.
-These depend upon `pkg_files` rules elsewhere in the repo to get the contents.
-
-The source distribution files should include the outputs from `autogen.sh`, but
-this isn't something we can reliably do from Bazel. To produce fully functioning
-source distributions, run `autogen.sh` before building the archives (this
-populates the necessary files directly into the source tree).
-
-## C++ runtime binary distribution
-
-The `cc_dist_library` rule creates composite libraries from several other
-`cc_library` targets. Bazel uses a "fine-grained" library model, where each
-`cc_library` produces its own library artifacts, without transitive
-dependencies. The `cc_dist_library` rule combines several other libraries
-together, creating a single library that may be suitable for distribution.
diff --git a/libs/protobuf/pkg/build_systems.bzl b/libs/protobuf/pkg/build_systems.bzl
deleted file mode 100644
index 753d285..0000000
--- a/libs/protobuf/pkg/build_systems.bzl
+++ /dev/null
@@ -1,452 +0,0 @@
-# Starlark utilities for working with other build systems
-
-load("@rules_pkg//:providers.bzl", "PackageFilegroupInfo", "PackageFilesInfo")
-
-################################################################################
-# Macro to create CMake and Automake source lists.
-################################################################################
-
-def gen_file_lists(name, out_stem, **kwargs):
-    gen_cmake_file_lists(
-        name = name + "_cmake",
-        out = out_stem + ".cmake",
-        source_prefix = "${protobuf_SOURCE_DIR}/",
-        **kwargs
-    )
-    gen_automake_file_lists(
-        name = name + "_automake",
-        out = out_stem + ".am",
-        source_prefix = "$(top_srcdir)/",
-        **kwargs
-    )
-    native.filegroup(
-        name = name,
-        srcs = [
-            out_stem + ".cmake",
-            out_stem + ".am",
-        ],
-    )
-
-################################################################################
-# Aspect that extracts srcs, hdrs, etc.
-################################################################################
-
-CcFileList = provider(
-    doc = "List of files to be built into a library.",
-    fields = {
-        # As a rule of thumb, `hdrs` and `textual_hdrs` are the files that
-        # would be installed along with a prebuilt library.
-        "hdrs": "public header files, including those used by generated code",
-        "textual_hdrs": "files which are included but are not self-contained",
-
-        # The `internal_hdrs` are header files which appear in `srcs`.
-        # These are only used when compiling the library.
-        "internal_hdrs": "internal header files (only used to build .cc files)",
-        "srcs": "source files",
-    },
-)
-
-ProtoFileList = provider(
-    doc = "List of proto files and generated code to be built into a library.",
-    fields = {
-        # Proto files:
-        "proto_srcs": "proto file sources",
-
-        # Generated sources:
-        "hdrs": "header files that are expected to be generated",
-        "srcs": "source files that are expected to be generated",
-    },
-)
-
-def _flatten_target_files(targets):
-    files = []
-    for target in targets:
-        for tfile in target.files.to_list():
-            files.append(tfile)
-    return files
-
-def _combine_cc_file_lists(file_lists):
-    hdrs = {}
-    textual_hdrs = {}
-    internal_hdrs = {}
-    srcs = {}
-    for file_list in file_lists:
-        hdrs.update({f: 1 for f in file_list.hdrs})
-        textual_hdrs.update({f: 1 for f in file_list.textual_hdrs})
-        internal_hdrs.update({f: 1 for f in file_list.internal_hdrs})
-        srcs.update({f: 1 for f in file_list.srcs})
-    return CcFileList(
-        hdrs = sorted(hdrs.keys()),
-        textual_hdrs = sorted(textual_hdrs.keys()),
-        internal_hdrs = sorted(internal_hdrs.keys()),
-        srcs = sorted(srcs.keys()),
-    )
-
-def _file_list_aspect_impl(target, ctx):
-    # We're going to reach directly into the attrs on the traversed rule.
-    rule_attr = ctx.rule.attr
-    providers = []
-
-    # Extract sources from a `cc_library` (or similar):
-    if CcInfo in target:
-        # CcInfo is a proxy for what we expect this rule to look like.
-        # However, some deps may expose `CcInfo` without having `srcs`,
-        # `hdrs`, etc., so we use `getattr` to handle that gracefully.
-
-        internal_hdrs = []
-        srcs = []
-
-        # Filter `srcs` so it only contains source files. Headers will go
-        # into `internal_headers`.
-        for src in _flatten_target_files(getattr(rule_attr, "srcs", [])):
-            if src.extension.lower() in ["c", "cc", "cpp", "cxx"]:
-                srcs.append(src)
-            else:
-                internal_hdrs.append(src)
-
-        providers.append(CcFileList(
-            hdrs = _flatten_target_files(getattr(rule_attr, "hdrs", [])),
-            textual_hdrs = _flatten_target_files(getattr(
-                rule_attr,
-                "textual_hdrs",
-                [],
-            )),
-            internal_hdrs = internal_hdrs,
-            srcs = srcs,
-        ))
-
-    # Extract sources from a `proto_library`:
-    if ProtoInfo in target:
-        proto_srcs = []
-        srcs = []
-        hdrs = []
-        for src in _flatten_target_files(rule_attr.srcs):
-            proto_srcs.append(src)
-            srcs.append("%s/%s.pb.cc" % (src.dirname, src.basename))
-            hdrs.append("%s/%s.pb.h" % (src.dirname, src.basename))
-
-        providers.append(ProtoFileList(
-            proto_srcs = proto_srcs,
-            srcs = srcs,
-            hdrs = hdrs,
-        ))
-
-    return providers
-
-file_list_aspect = aspect(
-    doc = """
-Aspect to provide the list of sources and headers from a rule.
-
-Output is CcFileList and/or ProtoFileList. Example:
-
-  cc_library(
-      name = "foo",
-      srcs = [
-          "foo.cc",
-          "foo_internal.h",
-      ],
-      hdrs = ["foo.h"],
-      textual_hdrs = ["foo_inl.inc"],
-  )
-  # produces:
-  # CcFileList(
-  #     hdrs = [File("foo.h")],
-  #     textual_hdrs = [File("foo_inl.inc")],
-  #     internal_hdrs = [File("foo_internal.h")],
-  #     srcs = [File("foo.cc")],
-  # )
-
-  proto_library(
-      name = "bar_proto",
-      srcs = ["bar.proto"],
-  )
-  # produces:
-  # ProtoFileList(
-  #     proto_srcs = ["bar.proto"],
-  #     # Generated filenames are synthesized:
-  #     hdrs = ["bar.pb.h"],
-  #     srcs = ["bar.pb.cc"],
-  # )
-""",
-    implementation = _file_list_aspect_impl,
-)
-
-################################################################################
-# Generic source lists generation
-#
-# This factory creates a rule implementation that is parameterized by a
-# fragment generator function.
-################################################################################
-
-def _create_file_list_impl(fragment_generator):
-    # `fragment_generator` is a function like:
-    #     def fn(originating_rule: Label,
-    #            varname: str,
-    #            source_prefix: str,
-    #            path_strings: [str]) -> str
-    #
-    # It returns a string that defines `varname` to `path_strings`, each
-    # prepended with `source_prefix`.
-    #
-    # When dealing with `File` objects, the `short_path` is used to strip
-    # the output prefix for generated files.
-
-    def _impl(ctx):
-        out = ctx.outputs.out
-
-        fragments = []
-        for srcrule, libname in ctx.attr.src_libs.items():
-            if CcFileList in srcrule:
-                cc_file_list = srcrule[CcFileList]
-                fragments.extend([
-                    fragment_generator(
-                        srcrule.label,
-                        libname + "_srcs",
-                        ctx.attr.source_prefix,
-                        [f.short_path for f in cc_file_list.srcs],
-                    ),
-                    fragment_generator(
-                        srcrule.label,
-                        libname + "_hdrs",
-                        ctx.attr.source_prefix,
-                        [f.short_path for f in (cc_file_list.hdrs +
-                                                cc_file_list.textual_hdrs)],
-                    ),
-                ])
-
-            if ProtoFileList in srcrule:
-                proto_file_list = srcrule[ProtoFileList]
-                fragments.extend([
-                    fragment_generator(
-                        srcrule.label,
-                        libname + "_proto_srcs",
-                        ctx.attr.source_prefix,
-                        [f.short_path for f in proto_file_list.proto_srcs],
-                    ),
-                    fragment_generator(
-                        srcrule.label,
-                        libname + "_srcs",
-                        ctx.attr.source_prefix,
-                        proto_file_list.srcs,
-                    ),
-                    fragment_generator(
-                        srcrule.label,
-                        libname + "_hdrs",
-                        ctx.attr.source_prefix,
-                        proto_file_list.hdrs,
-                    ),
-                ])
-
-            files = {}
-
-            if PackageFilegroupInfo in srcrule:
-                for pkg_files_info, origin in srcrule[PackageFilegroupInfo].pkg_files:
-                    # keys are the destination path:
-                    files.update(pkg_files_info.dest_src_map)
-
-            if PackageFilesInfo in srcrule:
-                # keys are the destination:
-                files.update(srcrule[PackageFilesInfo].dest_src_map)
-
-            if files == {} and DefaultInfo in srcrule and CcInfo not in srcrule:
-                # This could be an individual file or filegroup.
-                # We explicitly ignore rules with CcInfo, since their
-                # output artifacts are libraries or binaries.
-                files.update(
-                    {
-                        f.short_path: 1
-                        for f in srcrule[DefaultInfo].files.to_list()
-                    },
-                )
-
-            if files:
-                fragments.append(
-                    fragment_generator(
-                        srcrule.label,
-                        libname + "_files",
-                        ctx.attr.source_prefix,
-                        sorted(files.keys()),
-                    ),
-                )
-
-        ctx.actions.write(
-            output = out,
-            content = (ctx.attr._header % ctx.label) + "\n".join(fragments),
-        )
-
-        return [DefaultInfo(files = depset([out]))]
-
-    return _impl
-
-# Common rule attrs for rules that use `_create_file_list_impl`:
-# (note that `_header` is also required)
-_source_list_common_attrs = {
-    "out": attr.output(
-        doc = (
-            "The generated filename. This should usually have a build " +
-            "system-specific extension, like `out.am` or `out.cmake`."
-        ),
-        mandatory = True,
-    ),
-    "src_libs": attr.label_keyed_string_dict(
-        doc = (
-            "A dict, {target: libname} of libraries to include. " +
-            "Targets can be C++ rules (like `cc_library` or `cc_test`), " +
-            "`proto_library` rules, files, `filegroup` rules, `pkg_files` " +
-            "rules, or `pkg_filegroup` rules. " +
-            "The libname is a string, and used to construct the variable " +
-            "name in the `out` file holding the target's sources. " +
-            "For generated files, the output root (like `bazel-bin/`) is not " +
-            "included. " +
-            "For `pkg_files` and `pkg_filegroup` rules, the destination path " +
-            "is used."
-        ),
-        mandatory = True,
-        providers = [
-            [CcFileList],
-            [DefaultInfo],
-            [PackageFilegroupInfo],
-            [PackageFilesInfo],
-            [ProtoFileList],
-        ],
-        aspects = [file_list_aspect],
-    ),
-    "source_prefix": attr.string(
-        doc = "String to prepend to each source path.",
-    ),
-}
-
-################################################################################
-# CMake source lists generation
-################################################################################
-
-def _cmake_var_fragment(owner, varname, prefix, entries):
-    """Returns a single `set(varname ...)` fragment (CMake syntax).
-
-    Args:
-      owner: Label, the rule that owns these srcs.
-      varname: str, the var name to set.
-      prefix: str, prefix to prepend to each of `entries`.
-      entries: [str], the entries in the list.
-
-    Returns:
-      A string.
-    """
-    return (
-        "# {owner}\n" +
-        "set({varname}\n" +
-        "{entries}\n" +
-        ")\n"
-    ).format(
-        owner = owner,
-        varname = varname,
-        entries = "\n".join(["  %s%s" % (prefix, f) for f in entries]),
-    )
-
-gen_cmake_file_lists = rule(
-    doc = """
-Generates a CMake-syntax file with lists of files.
-
-The generated file defines variables with lists of files from `srcs`. The
-intent is for these files to be included from a non-generated CMake file
-which actually defines the libraries based on these lists.
-
-For C++ rules, the following are generated:
-    {libname}_srcs: contains srcs.
-    {libname}_hdrs: contains hdrs and textual_hdrs.
-
-For proto_library, the following are generated:
-    {libname}_proto_srcs: contains the srcs from the `proto_library` rule.
-    {libname}_srcs: contains syntesized paths for generated C++ sources.
-    {libname}_hdrs: contains syntesized paths for generated C++ headers.
-
-""",
-    implementation = _create_file_list_impl(_cmake_var_fragment),
-    attrs = dict(
-        _source_list_common_attrs,
-        _header = attr.string(
-            default = """\
-# Auto-generated by %s
-#
-# This file contains lists of sources based on Bazel rules. It should
-# be included from a hand-written CMake file that defines targets.
-#
-# Changes to this file will be overwritten based on Bazel definitions.
-
-if(${CMAKE_VERSION} VERSION_GREATER 3.10 OR ${CMAKE_VERSION} VERSION_EQUAL 3.10)
-  include_guard()
-endif()
-
-""",
-        ),
-    ),
-)
-
-################################################################################
-# Automake source lists generation
-################################################################################
-
-def _automake_var_fragment(owner, varname, prefix, entries):
-    """Returns a single variable assignment fragment (Automake syntax).
-
-    Args:
-      owner: Label, the rule that owns these srcs.
-      varname: str, the var name to set.
-      prefix: str, prefix to prepend to each of `entries`.
-      entries: [str], the entries in the list.
-
-    Returns:
-      A string.
-    """
-    if len(entries) == 0:
-        # A backslash followed by a blank line is illegal. We still want
-        # to emit the variable, though.
-        return "# {owner}\n{varname} =\n".format(
-            owner = owner,
-            varname = varname,
-        )
-    fragment = (
-        "# {owner}\n" +
-        "{varname} = \\\n" +
-        "{entries}"
-    ).format(
-        owner = owner,
-        varname = varname,
-        entries = " \\\n".join(["  %s%s" % (prefix, f) for f in entries]),
-    )
-    return fragment.rstrip("\\ ") + "\n"
-
-gen_automake_file_lists = rule(
-    doc = """
-Generates an Automake-syntax file with lists of files.
-
-The generated file defines variables with lists of files from `srcs`. The
-intent is for these files to be included from a non-generated Makefile.am
-file which actually defines the libraries based on these lists.
-
-For C++ rules, the following are generated:
-    {libname}_srcs: contains srcs.
-    {libname}_hdrs: contains hdrs and textual_hdrs.
-
-For proto_library, the following are generated:
-    {libname}_proto_srcs: contains the srcs from the `proto_library` rule.
-    {libname}_srcs: contains syntesized paths for generated C++ sources.
-    {libname}_hdrs: contains syntesized paths for generated C++ headers.
-
-""",
-    implementation = _create_file_list_impl(_automake_var_fragment),
-    attrs = dict(
-        _source_list_common_attrs.items(),
-        _header = attr.string(
-            default = """\
-# Auto-generated by %s
-#
-# This file contains lists of sources based on Bazel rules. It should
-# be included from a hand-written Makefile.am that defines targets.
-#
-# Changes to this file will be overwritten based on Bazel definitions.
-
-""",
-        ),
-    ),
-)
diff --git a/libs/protobuf/pkg/cc_dist_library.bzl b/libs/protobuf/pkg/cc_dist_library.bzl
deleted file mode 100644
index 654fb73..0000000
--- a/libs/protobuf/pkg/cc_dist_library.bzl
+++ /dev/null
@@ -1,232 +0,0 @@
-# Rules for distributable C++ libraries
-
-load("@rules_cc//cc:action_names.bzl", cc_action_names = "ACTION_NAMES")
-load("@rules_cc//cc:find_cc_toolchain.bzl", "find_cc_toolchain")
-
-# Creates an action to build the `output_file` static library (archive)
-# using `object_files`.
-def _create_archive_action(
-        ctx,
-        feature_configuration,
-        cc_toolchain,
-        output_file,
-        object_files):
-    # Based on Bazel's src/main/starlark/builtins_bzl/common/cc/cc_import.bzl:
-
-    # Build the command line and add args for all of the input files:
-    archiver_variables = cc_common.create_link_variables(
-        feature_configuration = feature_configuration,
-        cc_toolchain = cc_toolchain,
-        output_file = output_file.path,
-        is_using_linker = False,
-    )
-    command_line = cc_common.get_memory_inefficient_command_line(
-        feature_configuration = feature_configuration,
-        action_name = cc_action_names.cpp_link_static_library,
-        variables = archiver_variables,
-    )
-    args = ctx.actions.args()
-    args.add_all(command_line)
-    args.add_all(object_files)
-    args.use_param_file("@%s", use_always = True)
-
-    archiver_path = cc_common.get_tool_for_action(
-        feature_configuration = feature_configuration,
-        action_name = cc_action_names.cpp_link_static_library,
-    )
-
-    env = cc_common.get_environment_variables(
-        feature_configuration = feature_configuration,
-        action_name = cc_action_names.cpp_link_static_library,
-        variables = archiver_variables,
-    )
-
-    ctx.actions.run(
-        executable = archiver_path,
-        arguments = [args],
-        env = env,
-        inputs = depset(
-            direct = object_files,
-            transitive = [
-                cc_toolchain.all_files,
-            ],
-        ),
-        use_default_shell_env = True,
-        outputs = [output_file],
-        mnemonic = "CppArchiveDist",
-    )
-
-# Implementation for cc_dist_library rule.
-def _cc_dist_library_impl(ctx):
-    cc_toolchain_info = find_cc_toolchain(ctx)
-    if cc_toolchain_info.ar_executable == None:
-        return []
-
-    feature_configuration = cc_common.configure_features(
-        ctx = ctx,
-        cc_toolchain = cc_toolchain_info,
-    )
-
-    # Collect the set of object files from the immediate deps.
-
-    objs = []
-    pic_objs = []
-    for dep in ctx.attr.deps:
-        if CcInfo not in dep:
-            continue
-
-        link_ctx = dep[CcInfo].linking_context
-        if link_ctx == None:
-            continue
-
-        linker_inputs = link_ctx.linker_inputs.to_list()
-        for link_input in linker_inputs:
-            if link_input.owner != dep.label:
-                # This is a transitive dep: skip it.
-                continue
-
-            for lib in link_input.libraries:
-                objs.extend(lib.objects or [])
-                pic_objs.extend(lib.pic_objects or [])
-
-    # For static libraries, build separately with and without pic.
-
-    stemname = "lib" + ctx.label.name
-    outputs = []
-
-    if len(objs) > 0:
-        archive_out = ctx.actions.declare_file(stemname + ".a")
-        _create_archive_action(
-            ctx,
-            feature_configuration,
-            cc_toolchain_info,
-            archive_out,
-            objs,
-        )
-        outputs.append(archive_out)
-
-    if len(pic_objs) > 0:
-        pic_archive_out = ctx.actions.declare_file(stemname + ".pic.a")
-        _create_archive_action(
-            ctx,
-            feature_configuration,
-            cc_toolchain_info,
-            pic_archive_out,
-            pic_objs,
-        )
-        outputs.append(pic_archive_out)
-
-    # For dynamic libraries, use the `cc_common.link` command to ensure
-    # everything gets built correctly according to toolchain definitions.
-
-    compilation_outputs = cc_common.create_compilation_outputs(
-        objects = depset(objs),
-        pic_objects = depset(pic_objs),
-    )
-    link_output = cc_common.link(
-        actions = ctx.actions,
-        feature_configuration = feature_configuration,
-        cc_toolchain = cc_toolchain_info,
-        compilation_outputs = compilation_outputs,
-        name = ctx.label.name,
-        output_type = "dynamic_library",
-        user_link_flags = ctx.attr.linkopts,
-    )
-    library_to_link = link_output.library_to_link
-
-    # Note: library_to_link.dynamic_library and interface_library are often
-    # symlinks in the solib directory. For DefaultInfo, prefer reporting
-    # the resolved artifact paths.
-    if library_to_link.resolved_symlink_dynamic_library != None:
-        outputs.append(library_to_link.resolved_symlink_dynamic_library)
-    elif library_to_link.dynamic_library != None:
-        outputs.append(library_to_link.dynamic_library)
-
-    if library_to_link.resolved_symlink_interface_library != None:
-        outputs.append(library_to_link.resolved_symlink_interface_library)
-    elif library_to_link.interface_library != None:
-        outputs.append(library_to_link.interface_library)
-
-    # We could expose the libraries for use from cc rules:
-    #
-    # linking_context = cc_common.create_linking_context(
-    #     linker_inputs = depset([
-    #         cc_common.create_linker_input(
-    #             owner = ctx.label,
-    #             libraries = depset([library_to_link]),
-    #         ),
-    #     ]),
-    # )
-    # cc_info = CcInfo(linking_context = linking_context)  # and return this
-    #
-    # However, if the goal is to force a protobuf dependency to use the
-    # DSO, then `cc_import` is a better-supported way to do so.
-    #
-    # If we wanted to expose CcInfo from this rule (and make it usable as a
-    # C++ dependency), then we would probably want to include the static
-    # archive and headers as well. exposing headers would probably require
-    # an additional aspect to extract CcInfos with just the deps' headers.
-
-    return [
-        DefaultInfo(files = depset(outputs)),
-    ]
-
-cc_dist_library = rule(
-    implementation = _cc_dist_library_impl,
-    doc = """
-Create libraries suitable for distribution.
-
-This rule creates static and dynamic libraries from the libraries listed in
-'deps'. The resulting libraries are suitable for distributing all of 'deps'
-in a single logical library, for example, in an installable binary package.
-Only the targets listed in 'deps' are included in the result (i.e., the
-output does not include transitive dependencies), allowing precise control
-over the library boundary.
-
-The outputs of this rule are a dynamic library and a static library. (If
-the build produces both PIC and non-PIC object files, then there is also a
-second static library.) The example below illustrates additional details.
-
-This rule is different from Bazel's experimental `shared_cc_library` in
-several ways. First, this rule ignores transitive dependencies, which means
-that dynamic library dependencies generally need to be specified via
-'linkopts'. Second, this rule produces a static archive library in addition
-to the dynamic shared library. Third, this rule is not directly usable as a
-C++ dependency (although the outputs could be used, e.g., by `cc_import`).
-
-Example:
-
-    cc_library(name = "a", srcs = ["a.cc"], hdrs = ["a.h"])
-    cc_library(name = "b", srcs = ["b.cc"], hdrs = ["b.h"], deps = [":a"])
-    cc_library(name = "c", srcs = ["c.cc"], hdrs = ["c.h"], deps = [":b"])
-
-    # Creates libdist.so and (typically) libdist.pic.a:
-    # (This may also produce libdist.a if the build produces non-PIC objects.)
-    cc_dist_library(
-        name = "dist",
-        linkopts = ["-la"],   # libdist.so dynamically links against liba.so.
-        deps = [":b", ":c"],  # Output contains b.o and c.o, but not a.o.
-    )
-""",
-    attrs = {
-        "deps": attr.label_list(
-            doc = ("The list of libraries to be included in the outputs. " +
-                   "Only these targets' compilation outputs will be " +
-                   "included (i.e., the transitive dependencies are not " +
-                   "included in the output)."),
-        ),
-        "linkopts": attr.string_list(
-            doc = ("Add these flags to the C++ linker command when creating " +
-                   "the dynamic library."),
-        ),
-        # C++ toolchain before https://github.com/bazelbuild/bazel/issues/7260:
-        "_cc_toolchain": attr.label(
-            default = Label("@rules_cc//cc:current_cc_toolchain"),
-        ),
-    },
-    toolchains = [
-        # C++ toolchain after https://github.com/bazelbuild/bazel/issues/7260:
-        "@bazel_tools//tools/cpp:toolchain_type",
-    ],
-    fragments = ["cpp"],
-)
diff --git a/libs/protobuf/post_process_dist.sh b/libs/protobuf/post_process_dist.sh
deleted file mode 100755
index 2630f97..0000000
--- a/libs/protobuf/post_process_dist.sh
+++ /dev/null
@@ -1,64 +0,0 @@
-#! /bin/sh
-
-# This script takes the result of "make dist" and:
-# 1) Unpacks it.
-# 2) Ensures all contents are user-writable.  Some version control systems
-#    keep code read-only until you explicitly ask to edit it, and the normal
-#    "make dist" process does not correct for this, so the result is that
-#    the entire dist is still marked read-only when unpacked, which is
-#    annoying.  So, we fix it.
-# 3) Convert MSVC project files to MSVC 2005, so that anyone who has version
-#    2005 *or* 2008 can open them.  (In version control, we keep things in
-#    MSVC 2008 format since that's what we use in development.)
-# 4) Uses the result to create .tar.gz, .tar.bz2, and .zip versions and
-#    deposits them in the "dist" directory.  In the .zip version, all
-#    non-testdata .txt files are converted to Windows-style line endings.
-# 5) Cleans up after itself.
-
-if [ "$1" == "" ]; then
-  echo "USAGE:  $0 DISTFILE" >&2
-  exit 1
-fi
-
-if [ ! -e $1 ]; then
-  echo $1": File not found." >&2
-  exit 1
-fi
-
-set -ex
-
-LANGUAGES="cpp csharp java objectivec python ruby php all"
-BASENAME=`basename $1 .tar.gz`
-VERSION=${BASENAME:9}
-
-# Create a directory called "dist", copy the tarball there and unpack it.
-mkdir dist
-cp $1 dist
-cd dist
-tar zxvf $BASENAME.tar.gz
-rm $BASENAME.tar.gz
-
-# Set the entire contents to be user-writable.
-chmod -R u+w $BASENAME
-cd $BASENAME
-
-for LANG in $LANGUAGES; do
-  # Build the dist again in .tar.gz
-  ./configure DIST_LANG=$LANG
-  make dist-gzip
-  mv $BASENAME.tar.gz ../protobuf-$LANG-$VERSION.tar.gz
-done
-
-# Convert all text files to use DOS-style line endings, then build a .zip
-# distribution.
-todos *.txt */*.txt
-
-for LANG in $LANGUAGES; do
-  # Build the dist again in .zip
-  ./configure DIST_LANG=$LANG
-  make dist-zip
-  mv $BASENAME.zip ../protobuf-$LANG-$VERSION.zip
-done
-
-cd ..
-rm -rf $BASENAME
diff --git a/libs/protobuf/protobuf-lite.pc.in b/libs/protobuf/protobuf-lite.pc.in
deleted file mode 100644
index f92e4ad..0000000
--- a/libs/protobuf/protobuf-lite.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: Protocol Buffers
-Description: Google's Data Interchange Format
-Version: @VERSION@
-Libs: -L${libdir} -lprotobuf-lite
-Cflags: -I${includedir}
-Conflicts: protobuf
diff --git a/libs/protobuf/protobuf.bzl b/libs/protobuf/protobuf.bzl
deleted file mode 100644
index c5b8dab..0000000
--- a/libs/protobuf/protobuf.bzl
+++ /dev/null
@@ -1,592 +0,0 @@
-load("@bazel_skylib//lib:versions.bzl", "versions")
-load("@rules_cc//cc:defs.bzl", "cc_library")
-load("@rules_proto//proto:defs.bzl", "ProtoInfo")
-load("@rules_python//python:defs.bzl", "py_library", "py_test")
-
-def _GetPath(ctx, path):
-    if ctx.label.workspace_root:
-        return ctx.label.workspace_root + "/" + path
-    else:
-        return path
-
-def _IsNewExternal(ctx):
-    # Bazel 0.4.4 and older have genfiles paths that look like:
-    #   bazel-out/local-fastbuild/genfiles/external/repo/foo
-    # After the exec root rearrangement, they look like:
-    #   ../repo/bazel-out/local-fastbuild/genfiles/foo
-    return ctx.label.workspace_root.startswith("../")
-
-def _GenDir(ctx):
-    if _IsNewExternal(ctx):
-        # We are using the fact that Bazel 0.4.4+ provides repository-relative paths
-        # for ctx.genfiles_dir.
-        return ctx.genfiles_dir.path + (
-            "/" + ctx.attr.includes[0] if ctx.attr.includes and ctx.attr.includes[0] else ""
-        )
-
-    # This means that we're either in the old version OR the new version in the local repo.
-    # Either way, appending the source path to the genfiles dir works.
-    return ctx.var["GENDIR"] + "/" + _SourceDir(ctx)
-
-def _SourceDir(ctx):
-    if not ctx.attr.includes:
-        return ctx.label.workspace_root
-    if not ctx.attr.includes[0]:
-        return _GetPath(ctx, ctx.label.package)
-    if not ctx.label.package:
-        return _GetPath(ctx, ctx.attr.includes[0])
-    return _GetPath(ctx, ctx.label.package + "/" + ctx.attr.includes[0])
-
-def _CcHdrs(srcs, use_grpc_plugin = False):
-    ret = [s[:-len(".proto")] + ".pb.h" for s in srcs]
-    if use_grpc_plugin:
-        ret += [s[:-len(".proto")] + ".grpc.pb.h" for s in srcs]
-    return ret
-
-def _CcSrcs(srcs, use_grpc_plugin = False):
-    ret = [s[:-len(".proto")] + ".pb.cc" for s in srcs]
-    if use_grpc_plugin:
-        ret += [s[:-len(".proto")] + ".grpc.pb.cc" for s in srcs]
-    return ret
-
-def _CcOuts(srcs, use_grpc_plugin = False):
-    return _CcHdrs(srcs, use_grpc_plugin) + _CcSrcs(srcs, use_grpc_plugin)
-
-def _PyOuts(srcs, use_grpc_plugin = False):
-    ret = [s[:-len(".proto")] + "_pb2.py" for s in srcs]
-    if use_grpc_plugin:
-        ret += [s[:-len(".proto")] + "_pb2_grpc.py" for s in srcs]
-    return ret
-
-def _RelativeOutputPath(path, include, dest = ""):
-    if include == None:
-        return path
-
-    if not path.startswith(include):
-        fail("Include path %s isn't part of the path %s." % (include, path))
-
-    if include and include[-1] != "/":
-        include = include + "/"
-    if dest and dest[-1] != "/":
-        dest = dest + "/"
-
-    path = path[len(include):]
-    return dest + path
-
-def _proto_gen_impl(ctx):
-    """General implementation for generating protos"""
-    srcs = ctx.files.srcs
-    deps = depset(direct=ctx.files.srcs)
-    source_dir = _SourceDir(ctx)
-    gen_dir = _GenDir(ctx).rstrip("/")
-    import_flags = []
-        
-    if source_dir:
-        has_sources = any([src.is_source for src in srcs])
-        if has_sources:
-            import_flags += ["-I" + source_dir]
-    else:
-        import_flags += ["-I."]
-
-    has_generated = any([not src.is_source for src in srcs])
-    if has_generated:
-        import_flags += ["-I" + gen_dir]
-
-    import_flags = depset(direct=import_flags)
-
-    for dep in ctx.attr.deps:
-        if type(dep.proto.import_flags) == "list":
-            import_flags = depset(transitive=[import_flags], direct=dep.proto.import_flags)
-        else:
-            import_flags = depset(transitive=[import_flags, dep.proto.import_flags])
-        if type(dep.proto.deps) == "list":
-            deps = depset(transitive=[deps], direct=dep.proto.deps)
-        else:
-            deps = depset(transitive=[deps, dep.proto.deps])
-
-    if not ctx.attr.gen_cc and not ctx.attr.gen_py and not ctx.executable.plugin:
-        return struct(
-            proto = struct(
-                srcs = srcs,
-                import_flags = import_flags,
-                deps = deps,
-            ),
-        )
-
-    for src in srcs:
-        args = []
-
-        in_gen_dir = src.root.path == gen_dir
-        if in_gen_dir:
-            import_flags_real = []
-            for f in import_flags.to_list():
-                path = f.replace("-I", "")
-                import_flags_real.append("-I$(realpath -s %s)" % path)
-
-        outs = []
-        use_grpc_plugin = (ctx.attr.plugin_language == "grpc" and ctx.attr.plugin)
-        path_tpl = "$(realpath %s)" if in_gen_dir else "%s"
-        if ctx.attr.gen_cc:
-            args += [("--cpp_out=" + path_tpl) % gen_dir]
-            outs.extend(_CcOuts([src.basename], use_grpc_plugin = use_grpc_plugin))
-        if ctx.attr.gen_py:
-            args += [("--python_out=" + path_tpl) % gen_dir]
-            outs.extend(_PyOuts([src.basename], use_grpc_plugin = use_grpc_plugin))
-
-        outs = [ctx.actions.declare_file(out, sibling = src) for out in outs]
-        inputs = [src] + deps.to_list()
-        tools = [ctx.executable.protoc]
-        if ctx.executable.plugin:
-            plugin = ctx.executable.plugin
-            lang = ctx.attr.plugin_language
-            if not lang and plugin.basename.startswith("protoc-gen-"):
-                lang = plugin.basename[len("protoc-gen-"):]
-            if not lang:
-                fail("cannot infer the target language of plugin", "plugin_language")
-
-            outdir = "." if in_gen_dir else gen_dir
-
-            if ctx.attr.plugin_options:
-                outdir = ",".join(ctx.attr.plugin_options) + ":" + outdir
-            args += [("--plugin=protoc-gen-%s=" + path_tpl) % (lang, plugin.path)]
-            args += ["--%s_out=%s" % (lang, outdir)]
-            tools.append(plugin)
-
-        if not in_gen_dir:
-            ctx.actions.run(
-                inputs = inputs,
-                tools = tools,
-                outputs = outs,
-                arguments = args + import_flags.to_list() + [src.path],
-                executable = ctx.executable.protoc,
-                mnemonic = "ProtoCompile",
-                use_default_shell_env = True,
-            )
-        else:
-            for out in outs:
-                orig_command = " ".join(
-                    ["$(realpath %s)" % ctx.executable.protoc.path] + args +
-                    import_flags_real + [src.basename],
-                )
-                command = ";".join([
-                    'CMD="%s"' % orig_command,
-                    "cd %s" % src.dirname,
-                    "${CMD}",
-                    "cd -",
-                ])
-                generated_out = "/".join([gen_dir, out.basename])
-                if generated_out != out.path:
-                    command += ";mv %s %s" % (generated_out, out.path)
-                ctx.actions.run_shell(
-                    inputs = inputs,
-                    outputs = [out],
-                    command = command,
-                    mnemonic = "ProtoCompile",
-                    tools = tools,
-                    use_default_shell_env = True,
-                )
-
-    return struct(
-        proto = struct(
-            srcs = srcs,
-            import_flags = import_flags,
-            deps = deps,
-        ),
-    )
-
-proto_gen = rule(
-    attrs = {
-        "srcs": attr.label_list(allow_files = True),
-        "deps": attr.label_list(providers = ["proto"]),
-        "includes": attr.string_list(),
-        "protoc": attr.label(
-            cfg = "exec",
-            executable = True,
-            allow_single_file = True,
-            mandatory = True,
-        ),
-        "plugin": attr.label(
-            cfg = "exec",
-            allow_files = True,
-            executable = True,
-        ),
-        "plugin_language": attr.string(),
-        "plugin_options": attr.string_list(),
-        "gen_cc": attr.bool(),
-        "gen_py": attr.bool(),
-        "outs": attr.output_list(),
-    },
-    output_to_genfiles = True,
-    implementation = _proto_gen_impl,
-)
-"""Generates codes from Protocol Buffers definitions.
-
-This rule helps you to implement Skylark macros specific to the target
-language. You should prefer more specific `cc_proto_library `,
-`py_proto_library` and others unless you are adding such wrapper macros.
-
-Args:
-  srcs: Protocol Buffers definition files (.proto) to run the protocol compiler
-    against.
-  deps: a list of dependency labels; must be other proto libraries.
-  includes: a list of include paths to .proto files.
-  protoc: the label of the protocol compiler to generate the sources.
-  plugin: the label of the protocol compiler plugin to be passed to the protocol
-    compiler.
-  plugin_language: the language of the generated sources
-  plugin_options: a list of options to be passed to the plugin
-  gen_cc: generates C++ sources in addition to the ones from the plugin.
-  gen_py: generates Python sources in addition to the ones from the plugin.
-  outs: a list of labels of the expected outputs from the protocol compiler.
-"""
-
-def _adapt_proto_library_impl(ctx):
-    deps = [dep[ProtoInfo] for dep in ctx.attr.deps]
-
-    srcs = [src for dep in deps for src in dep.direct_sources]
-    return struct(
-        proto = struct(
-            srcs = srcs,
-            import_flags = ["-I{}".format(path) for dep in deps for path in dep.transitive_proto_path.to_list()],
-            deps = srcs,
-        ),
-    )
-
-adapt_proto_library = rule(
-    implementation = _adapt_proto_library_impl,
-    attrs = {
-        "deps": attr.label_list(
-            mandatory = True,
-            providers = [ProtoInfo],
-        ),
-    },
-    doc = "Adapts `proto_library` from `@rules_proto` to be used with `{cc,py}_proto_library` from this file.",
-)
-
-def cc_proto_library(
-        name,
-        srcs = [],
-        deps = [],
-        cc_libs = [],
-        include = None,
-        protoc = "@com_google_protobuf//:protoc",
-        use_grpc_plugin = False,
-        default_runtime = "@com_google_protobuf//:protobuf",
-        **kargs):
-    """Bazel rule to create a C++ protobuf library from proto source files
-
-    NOTE: the rule is only an internal workaround to generate protos. The
-    interface may change and the rule may be removed when bazel has introduced
-    the native rule.
-
-    Args:
-      name: the name of the cc_proto_library.
-      srcs: the .proto files of the cc_proto_library.
-      deps: a list of dependency labels; must be cc_proto_library.
-      cc_libs: a list of other cc_library targets depended by the generated
-          cc_library.
-      include: a string indicating the include path of the .proto files.
-      protoc: the label of the protocol compiler to generate the sources.
-      use_grpc_plugin: a flag to indicate whether to call the grpc C++ plugin
-          when processing the proto files.
-      default_runtime: the implicitly default runtime which will be depended on by
-          the generated cc_library target.
-      **kargs: other keyword arguments that are passed to cc_library.
-    """
-
-    includes = []
-    if include != None:
-        includes = [include]
-
-    grpc_cpp_plugin = None
-    if use_grpc_plugin:
-        grpc_cpp_plugin = "//external:grpc_cpp_plugin"
-
-    gen_srcs = _CcSrcs(srcs, use_grpc_plugin)
-    gen_hdrs = _CcHdrs(srcs, use_grpc_plugin)
-    outs = gen_srcs + gen_hdrs
-
-    proto_gen(
-        name = name + "_genproto",
-        srcs = srcs,
-        deps = [s + "_genproto" for s in deps],
-        includes = includes,
-        protoc = protoc,
-        plugin = grpc_cpp_plugin,
-        plugin_language = "grpc",
-        gen_cc = 1,
-        outs = outs,
-        visibility = ["//visibility:public"],
-    )
-
-    if default_runtime and not default_runtime in cc_libs:
-        cc_libs = cc_libs + [default_runtime]
-    if use_grpc_plugin:
-        cc_libs = cc_libs + ["//external:grpc_lib"]
-    cc_library(
-        name = name,
-        srcs = gen_srcs,
-        hdrs = gen_hdrs,
-        deps = cc_libs + deps,
-        includes = includes,
-        **kargs
-    )
-
-def _internal_gen_well_known_protos_java_impl(ctx):
-    args = ctx.actions.args()
-
-    deps = [d[ProtoInfo] for d in ctx.attr.deps]
-
-    srcjar = ctx.actions.declare_file("{}.srcjar".format(ctx.attr.name))
-    if ctx.attr.javalite:
-        java_out = "lite:%s" % srcjar.path
-    else:
-        java_out = srcjar
-
-    args.add("--java_out", java_out)
-
-    descriptors = depset(
-        transitive = [dep.transitive_descriptor_sets for dep in deps],
-    )
-    args.add_joined(
-        "--descriptor_set_in",
-        descriptors,
-        join_with = ctx.configuration.host_path_separator,
-    )
-
-    for dep in deps:
-        if "." == dep.proto_source_root:
-            args.add_all([src.path for src in dep.direct_sources])
-        else:
-            source_root = dep.proto_source_root
-            offset = len(source_root) + 1  # + '/'.
-            args.add_all([src.path[offset:] for src in dep.direct_sources])
-
-    ctx.actions.run(
-        executable = ctx.executable._protoc,
-        inputs = descriptors,
-        outputs = [srcjar],
-        arguments = [args],
-        use_default_shell_env = True,
-    )
-
-    return [
-        DefaultInfo(
-            files = depset([srcjar]),
-        ),
-    ]
-
-internal_gen_well_known_protos_java = rule(
-    implementation = _internal_gen_well_known_protos_java_impl,
-    attrs = {
-        "deps": attr.label_list(
-            mandatory = True,
-            providers = [ProtoInfo],
-        ),
-        "javalite": attr.bool(
-            default = False,
-        ),
-        "_protoc": attr.label(
-            executable = True,
-            cfg = "exec",
-            default = "@com_google_protobuf//:protoc",
-        ),
-    },
-)
-
-def _internal_gen_kt_protos(ctx):
-    args = ctx.actions.args()
-
-    deps = [d[ProtoInfo] for d in ctx.attr.deps]
-
-    srcjar = ctx.actions.declare_file("{}.srcjar".format(ctx.attr.name))
-    if ctx.attr.lite:
-        out = "lite:%s" % srcjar.path
-    else:
-        out = srcjar
-
-    args.add("--kotlin_out", out)
-
-    descriptors = depset(
-        transitive = [dep.transitive_descriptor_sets for dep in deps],
-    )
-    args.add_joined(
-        "--descriptor_set_in",
-        descriptors,
-        join_with = ctx.configuration.host_path_separator,
-    )
-
-    for dep in deps:
-        if "." == dep.proto_source_root:
-            args.add_all([src.path for src in dep.direct_sources])
-        else:
-            source_root = dep.proto_source_root
-            offset = len(source_root) + 1  # + '/'.
-            args.add_all([src.path[offset:] for src in dep.direct_sources])
-
-    ctx.actions.run(
-        executable = ctx.executable._protoc,
-        inputs = descriptors,
-        outputs = [srcjar],
-        arguments = [args],
-        use_default_shell_env = True,
-    )
-
-    return [
-        DefaultInfo(
-            files = depset([srcjar]),
-        ),
-    ]
-
-internal_gen_kt_protos = rule(
-    implementation = _internal_gen_kt_protos,
-    attrs = {
-        "deps": attr.label_list(
-            mandatory = True,
-            providers = [ProtoInfo],
-        ),
-        "lite": attr.bool(
-            default = False,
-        ),
-        "_protoc": attr.label(
-            executable = True,
-            cfg = "exec",
-            default = "//:protoc",
-        ),
-    },
-)
-
-
-
-def internal_copied_filegroup(name, srcs, strip_prefix, dest, **kwargs):
-    """Macro to copy files to a different directory and then create a filegroup.
-
-    This is used by the //:protobuf_python py_proto_library target to work around
-    an issue caused by Python source files that are part of the same Python
-    package being in separate directories.
-
-    Args:
-      srcs: The source files to copy and add to the filegroup.
-      strip_prefix: Path to the root of the files to copy.
-      dest: The directory to copy the source files into.
-      **kwargs: extra arguments that will be passesd to the filegroup.
-    """
-    outs = [_RelativeOutputPath(s, strip_prefix, dest) for s in srcs]
-
-    native.genrule(
-        name = name + "_genrule",
-        srcs = srcs,
-        outs = outs,
-        cmd_bash = " && ".join(
-            ["cp $(location %s) $(location %s)" %
-             (s, _RelativeOutputPath(s, strip_prefix, dest)) for s in srcs]),
-        cmd_bat = " && ".join(
-            ["@copy /Y $(location %s) $(location %s) >NUL" %
-             (s, _RelativeOutputPath(s, strip_prefix, dest)) for s in srcs]),
-    )
-
-    native.filegroup(
-        name = name,
-        srcs = outs,
-        **kwargs
-    )
-
-def py_proto_library(
-        name,
-        srcs = [],
-        deps = [],
-        py_libs = [],
-        py_extra_srcs = [],
-        include = None,
-        default_runtime = "@com_google_protobuf//:protobuf_python",
-        protoc = "@com_google_protobuf//:protoc",
-        use_grpc_plugin = False,
-        **kargs):
-    """Bazel rule to create a Python protobuf library from proto source files
-
-    NOTE: the rule is only an internal workaround to generate protos. The
-    interface may change and the rule may be removed when bazel has introduced
-    the native rule.
-
-    Args:
-      name: the name of the py_proto_library.
-      srcs: the .proto files of the py_proto_library.
-      deps: a list of dependency labels; must be py_proto_library.
-      py_libs: a list of other py_library targets depended by the generated
-          py_library.
-      py_extra_srcs: extra source files that will be added to the output
-          py_library. This attribute is used for internal bootstrapping.
-      include: a string indicating the include path of the .proto files.
-      default_runtime: the implicitly default runtime which will be depended on by
-          the generated py_library target.
-      protoc: the label of the protocol compiler to generate the sources.
-      use_grpc_plugin: a flag to indicate whether to call the Python C++ plugin
-          when processing the proto files.
-      **kargs: other keyword arguments that are passed to py_library.
-
-    """
-    outs = _PyOuts(srcs, use_grpc_plugin)
-
-    includes = []
-    if include != None:
-        includes = [include]
-
-    grpc_python_plugin = None
-    if use_grpc_plugin:
-        grpc_python_plugin = "//external:grpc_python_plugin"
-        # Note: Generated grpc code depends on Python grpc module. This dependency
-        # is not explicitly listed in py_libs. Instead, host system is assumed to
-        # have grpc installed.
-
-    proto_gen(
-        name = name + "_genproto",
-        srcs = srcs,
-        deps = [s + "_genproto" for s in deps],
-        includes = includes,
-        protoc = protoc,
-        gen_py = 1,
-        outs = outs,
-        visibility = ["//visibility:public"],
-        plugin = grpc_python_plugin,
-        plugin_language = "grpc",
-    )
-
-    if default_runtime and not default_runtime in py_libs + deps:
-        py_libs = py_libs + [default_runtime]
-    py_library(
-        name = name,
-        srcs = outs + py_extra_srcs,
-        deps = py_libs + deps,
-        imports = includes,
-        **kargs
-    )
-
-def internal_protobuf_py_tests(
-        name,
-        modules = [],
-        **kargs):
-    """Bazel rules to create batch tests for protobuf internal.
-
-    Args:
-      name: the name of the rule.
-      modules: a list of modules for tests. The macro will create a py_test for
-          each of the parameter with the source "google/protobuf/%s.py"
-      kargs: extra parameters that will be passed into the py_test.
-
-    """
-    for m in modules:
-        s = "python/google/protobuf/internal/%s.py" % m
-        py_test(
-            name = "py_%s" % m,
-            srcs = [s],
-            main = s,
-            **kargs
-        )
-
-def check_protobuf_required_bazel_version():
-    """For WORKSPACE files, to check the installed version of bazel.
-
-    This ensures bazel supports our approach to proto_library() depending on a
-    copied filegroup. (Fixed in bazel 0.5.4)
-    """
-    versions.check(minimum_bazel_version = "0.5.4")
diff --git a/libs/protobuf/protobuf.pc.in b/libs/protobuf/protobuf.pc.in
deleted file mode 100644
index e9bef5d..0000000
--- a/libs/protobuf/protobuf.pc.in
+++ /dev/null
@@ -1,13 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: Protocol Buffers
-Description: Google's Data Interchange Format
-Version: @VERSION@
-Libs: -L${libdir} -lprotobuf
-Libs.private: @LIBS@
-
-Cflags: -I${includedir}
-Conflicts: protobuf-lite
diff --git a/libs/protobuf/protobuf_deps.bzl b/libs/protobuf/protobuf_deps.bzl
deleted file mode 100644
index 0949ef3..0000000
--- a/libs/protobuf/protobuf_deps.bzl
+++ /dev/null
@@ -1,122 +0,0 @@
-"""Load dependencies needed to compile the protobuf library as a 3rd-party consumer."""
-
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
-
-PROTOBUF_MAVEN_ARTIFACTS = [
-    "com.google.code.findbugs:jsr305:3.0.2",
-    "com.google.code.gson:gson:2.8.9",
-    "com.google.errorprone:error_prone_annotations:2.3.2",
-    "com.google.j2objc:j2objc-annotations:1.3",
-    "com.google.guava:guava:31.1-jre",
-    "com.google.guava:guava-testlib:31.1-jre",
-    "com.google.truth:truth:1.1.2",
-    "junit:junit:4.13.2",
-    "org.mockito:mockito-core:4.3.1",
-]
-
-def _github_archive(repo, commit, **kwargs):
-    repo_name = repo.split("/")[-1]
-    http_archive(
-        urls = [repo + "/archive/" + commit + ".zip"],
-        strip_prefix = repo_name + "-" + commit,
-        **kwargs
-    )
-
-def protobuf_deps():
-    """Loads common dependencies needed to compile the protobuf library."""
-
-    if not native.existing_rule("bazel_skylib"):
-        http_archive(
-            name = "bazel_skylib",
-            sha256 = "97e70364e9249702246c0e9444bccdc4b847bed1eb03c5a3ece4f83dfe6abc44",
-            urls = [
-                "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.0.2/bazel-skylib-1.0.2.tar.gz",
-                "https://github.com/bazelbuild/bazel-skylib/releases/download/1.0.2/bazel-skylib-1.0.2.tar.gz",
-            ],
-        )
-
-    if not native.existing_rule("com_google_absl"):
-        # Abseil LTS from November 2021
-        _github_archive(
-            name = "com_google_absl",
-            repo = "https://github.com/abseil/abseil-cpp",
-            commit = "215105818dfde3174fe799600bb0f3cae233d0bf",
-            sha256 = "b4e20d9e752a75c10636675691b1e9c2698e0764cb404987d0ffa77223041c19",
-        )
-
-    if not native.existing_rule("zlib"):
-        http_archive(
-            name = "zlib",
-            build_file = "@com_google_protobuf//:third_party/zlib.BUILD",
-            sha256 = "d14c38e313afc35a9a8760dadf26042f51ea0f5d154b0630a31da0540107fb98",
-            strip_prefix = "zlib-1.2.13",
-            urls = [
-                "https://github.com/madler/zlib/releases/download/v1.2.13/zlib-1.2.13.tar.xz",
-                "https://zlib.net/zlib-1.2.13.tar.xz",
-            ],
-        )
-
-    if not native.existing_rule("rules_cc"):
-        _github_archive(
-            name = "rules_cc",
-            repo = "https://github.com/bazelbuild/rules_cc",
-            commit = "818289e5613731ae410efb54218a4077fb9dbb03",
-            sha256 = "0adbd6f567291ad526e82c765e15aed33cea5e256eeba129f1501142c2c56610",
-        )
-
-    if not native.existing_rule("rules_java"):
-        _github_archive(
-            name = "rules_java",
-            repo = "https://github.com/bazelbuild/rules_java",
-            commit = "981f06c3d2bd10225e85209904090eb7b5fb26bd",
-            sha256 = "7979ece89e82546b0dcd1dff7538c34b5a6ebc9148971106f0e3705444f00665",
-        )
-
-    if not native.existing_rule("rules_proto"):
-        _github_archive(
-            name = "rules_proto",
-            repo = "https://github.com/bazelbuild/rules_proto",
-            commit = "f7a30f6f80006b591fa7c437fe5a951eb10bcbcf",
-            sha256 = "a4382f78723af788f0bc19fd4c8411f44ffe0a72723670a34692ffad56ada3ac",
-        )
-
-    if not native.existing_rule("rules_python"):
-        http_archive(
-            name = "rules_python",
-            sha256 = "9fcf91dbcc31fde6d1edb15f117246d912c33c36f44cf681976bd886538deba6",
-            strip_prefix = "rules_python-0.8.0",
-            url = "https://github.com/bazelbuild/rules_python/archive/refs/tags/0.8.0.tar.gz",
-        )
-
-    if not native.existing_rule("rules_jvm_external"):
-        _github_archive(
-            name = "rules_jvm_external",
-            repo = "https://github.com/bazelbuild/rules_jvm_external",
-            commit = "906875b0d5eaaf61a8ca2c9c3835bde6f435d011",
-            sha256 = "744bd7436f63af7e9872948773b8b106016dc164acb3960b4963f86754532ee7",
-        )
-
-    if not native.existing_rule("rules_pkg"):
-        http_archive(
-            name = "rules_pkg",
-            urls = [
-                "https://mirror.bazel.build/github.com/bazelbuild/rules_pkg/releases/download/0.7.0/rules_pkg-0.7.0.tar.gz",
-                "https://github.com/bazelbuild/rules_pkg/releases/download/0.7.0/rules_pkg-0.7.0.tar.gz",
-            ],
-            sha256 = "8a298e832762eda1830597d64fe7db58178aa84cd5926d76d5b744d6558941c2",
-        )
-
-    if not native.existing_rule("io_bazel_rules_kotlin"):
-        http_archive(
-            name = "io_bazel_rules_kotlin",
-            urls = ["https://github.com/bazelbuild/rules_kotlin/releases/download/v1.5.0-beta-4/rules_kotlin_release.tgz"],
-            sha256 = "6cbd4e5768bdfae1598662e40272729ec9ece8b7bded8f0d2c81c8ff96dc139d",
-        )
-
-    if not native.existing_rule("upb"):
-        _github_archive(
-            name = "upb",
-            repo = "https://github.com/protocolbuffers/upb",
-            commit = "20b542a767139732548f7b8cf28c4c928cdcb07b",
-            sha256 = "c77158955326f9e9a0cf8481c118b8ad5c34df99e5db3af27f3d1662d8bedef7",
-        )
diff --git a/libs/protobuf/protobuf_release.bzl b/libs/protobuf/protobuf_release.bzl
deleted file mode 100644
index 327ae9a..0000000
--- a/libs/protobuf/protobuf_release.bzl
+++ /dev/null
@@ -1,50 +0,0 @@
-"""
-Generates package naming variables for use with rules_pkg.
-"""
-
-load("@rules_pkg//:providers.bzl", "PackageVariablesInfo")
-load("@bazel_tools//tools/cpp:toolchain_utils.bzl", "find_cpp_toolchain")
-load(":protobuf_version.bzl", "PROTOC_VERSION")
-
-def _package_naming_impl(ctx):
-  values = {}
-  values["version"] = PROTOC_VERSION
-
-  # infer from the current cpp toolchain.
-  toolchain = find_cpp_toolchain(ctx)
-  cpu = toolchain.cpu
-  system_name = toolchain.target_gnu_system_name
-
-  # rename cpus to match what we want artifacts to be
-  if cpu == "systemz":
-    cpu = "s390_64"
-  elif cpu == "aarch64":
-    cpu = "aarch_64"
-  elif cpu == "ppc64":
-    cpu = "ppcle_64"
-
-  # use the system name to determine the os and then create platform names
-  if "apple" in system_name:
-    values["platform"] = "osx-" + cpu
-  elif "linux" in system_name:
-    values["platform"] = "linux-" + cpu
-  elif "mingw" in system_name:
-    if cpu == "x86_64":
-      values["platform"] = "win64"
-    else:
-      values["platform"] = "win32"
-  else:
-    values["platform"] = "unknown"
-
-  return PackageVariablesInfo(values = values)
-
-
-package_naming = rule(
-  implementation = _package_naming_impl,
-    attrs = {
-      # Necessary data dependency for find_cpp_toolchain.
-      "_cc_toolchain": attr.label(default = Label("@bazel_tools//tools/cpp:current_cc_toolchain")),
-    },
-    toolchains = ["@bazel_tools//tools/cpp:toolchain_type"],
-    incompatible_use_toolchain_transition = True,
-)
diff --git a/libs/protobuf/protobuf_version.bzl b/libs/protobuf/protobuf_version.bzl
deleted file mode 100644
index 4ac031c..0000000
--- a/libs/protobuf/protobuf_version.bzl
+++ /dev/null
@@ -1,4 +0,0 @@
-PROTOC_VERSION = "21.12"
-PROTOBUF_JAVA_VERSION = "3.21.12"
-PROTOBUF_PYTHON_VERSION = "4.21.12"
-PROTOBUF_PHP_VERSION = "3.21.12"
diff --git a/libs/protobuf/protoc-artifacts/Dockerfile b/libs/protobuf/protoc-artifacts/Dockerfile
deleted file mode 100644
index 278bc74..0000000
--- a/libs/protobuf/protoc-artifacts/Dockerfile
+++ /dev/null
@@ -1,55 +0,0 @@
-FROM centos:6.9
-
-RUN yum install -y git \
-                   tar \
-                   wget \
-                   make \
-                   autoconf \
-                   curl-devel \
-                   unzip \
-                   automake \
-                   libtool \
-                   glibc-static.i686 \
-                   glibc-devel \
-                   glibc-devel.i686 \
-                   && \
-    yum clean all
-
-# Install Java 8
-RUN wget -q --no-cookies --no-check-certificate \
-    --header "Cookie: gpw_e24=http%3A%2F%2Fwww.oracle.com%2F; oraclelicense=accept-securebackup-cookie" \
-    "http://download.oracle.com/otn-pub/java/jdk/8u131-b11/d54c1d3a095b4ff2b6607d096fa80163/jdk-8u131-linux-x64.tar.gz" \
-    -O - | tar xz -C /var/local
-ENV JAVA_HOME /var/local/jdk1.8.0_131
-ENV PATH $JAVA_HOME/bin:$PATH
-
-# Install Maven
-RUN wget -q http://apache.cs.utah.edu/maven/maven-3/3.3.9/binaries/apache-maven-3.3.9-bin.tar.gz -O - | \
-    tar xz -C /var/local
-ENV PATH /var/local/apache-maven-3.3.9/bin:$PATH
-
-# Install GCC 4.8 to support -static-libstdc++
-RUN wget http://people.centos.org/tru/devtools-2/devtools-2.repo -P /etc/yum.repos.d && \
-    bash -c 'echo "enabled=1" >> /etc/yum.repos.d/devtools-2.repo' && \
-    bash -c "sed -e 's/\$basearch/i386/g' /etc/yum.repos.d/devtools-2.repo > /etc/yum.repos.d/devtools-i386-2.repo" && \
-    sed -e 's/testing-/testing-i386-/g' -i /etc/yum.repos.d/devtools-i386-2.repo && \
-    rpm --rebuilddb
-
-RUN yum install -y devtoolset-2-gcc \
-                   devtoolset-2-gcc-c++ \
-                   devtoolset-2-binutils \
-                   devtoolset-2-libstdc++-devel \
-                   devtoolset-2-libatomic-devel \
-                   libatomic \
-                   devtoolset-2-gcc.i686 \
-                   devtoolset-2-gcc-c++.i686 \
-                   devtoolset-2-binutils.i686 \
-                   devtoolset-2-libstdc++-devel.i686 \
-                   devtoolset-2-libatomic-devel.i686 \
-                   libatomic.i686 && \
-    yum clean all
-
-COPY scl-enable-devtoolset.sh /var/local/
-
-# Start in devtoolset environment that uses GCC 4.7
-ENTRYPOINT ["/var/local/scl-enable-devtoolset.sh"]
diff --git a/libs/protobuf/protoc-artifacts/README.md b/libs/protobuf/protoc-artifacts/README.md
deleted file mode 100644
index 8fc3669..0000000
--- a/libs/protobuf/protoc-artifacts/README.md
+++ /dev/null
@@ -1,161 +0,0 @@
-# Build scripts that publish pre-compiled protoc artifacts
-``protoc`` is the compiler for ``.proto`` files. It generates language bindings
-for the messages and/or RPC services from ``.proto`` files.
-
-Because ``protoc`` is a native executable, the scripts under this directory
-build and publish a ``protoc`` executable (a.k.a. artifact) to Maven
-repositories. The artifact can be used by build automation tools so that users
-would not need to compile and install ``protoc`` for their systems.
-
-If you would like us to publish protoc artifact for a new platform, please send
-us a pull request to add support for the new platform. You would need to change
-the following files:
-
-* [build-protoc.sh](build-protoc.sh): script to cross-build the protoc for your
-  platform.
-* [pom.xml](pom.xml): script to upload artifacts to maven.
-* [build-zip.sh](build-zip.sh): script to package published maven artifacts in
-  our release page.
-
-## Maven Location
-The published protoc artifacts are available on Maven here:
-
-    https://repo.maven.apache.org/maven2/com/google/protobuf/protoc/
-
-## Versioning
-The version of the ``protoc`` artifact must be the same as the version of the
-Protobuf project.
-
-## Artifact name
-The name of a published ``protoc`` artifact is in the following format:
-``protoc-<version>-<os>-<arch>.exe``, e.g., ``protoc-3.6.1-linux-x86_64.exe``.
-
-Note that artifacts for linux/macos also have the `.exe` suffix but they are
-not windows binaries.
-
-## System requirement
-Install [Apache Maven](http://maven.apache.org/) if you don't have it.
-
-The scripts only work under Unix-like environments, e.g., Linux, MacOSX, and
-Cygwin or MinGW for Windows. Please see ``README.md`` of the Protobuf project
-for how to set up the build environment.
-
-## Building from a freshly checked-out source
-
-If you just checked out the Protobuf source from github, you need to
-generate the configure script.
-
-Under the protobuf project directory:
-
-
-```
-$ ./autogen.sh
-```
-
-### Build the artifact for each platform
-
-Run the build-protoc.sh script under this protoc-artifacts directory to build the protoc
-artifact for each platform.  For example:
-
-```
-$ cd protoc-artifacts
-$ ./build-protoc.sh linux x86_64 protoc
-```
-
-The above command will produce a `target/linux/x86_64/protoc` binary under the
-protoc-artifacts directory.
-
-For a list of supported platforms, see the comments in the build-protoc.sh
-script. We only use this script to build artifacts on Ubuntu and MacOS (both
-with x86_64, and do cross-compilation for other platforms.
-
-### Tips for building for Linux
-We build on Centos 6.9 to provide a good compatibility for not very new
-systems. We have provided a ``Dockerfile`` under this directory to build the
-environment. It has been tested with Docker 1.6.1.
-
-To build a image:
-
-```
-$ docker build -t protoc-artifacts .
-```
-
-To run the image:
-
-```
-$ docker run -it --rm=true protoc-artifacts bash
-```
-
-To checkout protobuf (run within the container):
-
-```
-$ # Replace v3.5.1 with the version you want
-$ wget -O - https://github.com/protocolbuffers/protobuf/archive/v3.5.1.tar.gz | tar xvzp
-```
-
-### Windows build
-We no longer use scripts in this directory to build windows artifacts. Instead,
-we use Visual Studio 2015 to build our windows release artifacts. See our
-[kokoro windows build scripts here](../kokoro/release/protoc/windows/build.bat).
-
-To upload windows artifacts, copy the built binaries into this directory and
-put it into the target/windows/(x86_64|x86_32) directory the same way as the
-artifacts for other platforms. That will allow the maven script to find and
-upload the artifacts to maven.
-
-## To push artifacts to Maven Central
-Before you can upload artifacts to Maven Central repository, make sure you have
-read [this page](http://central.sonatype.org/pages/apache-maven.html) on how to
-configure GPG and Sonatype account.
-
-Before you do the deployment, make sure you have built the protoc artifacts for
-every supported platform and put them under the target directory. Example
-target directory layout:
-
-    + pom.xml
-    + target
-      + linux
-        + x86_64
-          protoc.exe
-        + x86_32
-          protoc.exe
-        + aarch_64
-          protoc.exe
-        + ppcle_64
-          protoc.exe
-        + s390_64
-          protoc.exe
-      + osx
-        + x86_64
-          protoc.exe
-        + x86_32
-          protoc.exe
-      + windows
-        + x86_64
-          protoc.exe
-        + x86_32
-          protoc.exe
-
-You will need to build the artifacts on multiple machines and gather them
-together into one place.
-
-Use the following command to deploy artifacts for the host platform to a
-staging repository.
-
-```
-$ mvn deploy -P release
-```
-
-It creates a new staging repository. Go to
-https://oss.sonatype.org/#stagingRepositories and find the repository, usually
-in the name like ``comgoogle-123``. Verify that the staging repository has all
-the binaries, close and release this repository.
-
-
-## Tested build environments
-We have successfully built artifacts on the following environments:
-- Linux x86_32 and x86_64:
-  - Centos 6.9 (within Docker 1.6.1)
-  - Ubuntu 14.04.5 64-bit
-- Linux aarch_64: Cross compiled with `g++-aarch64-linux-gnu` on Ubuntu 14.04.5 64-bit
-- Mac OS X x86_32 and x86_64: Mac OS X 10.9.5
diff --git a/libs/protobuf/protoc-artifacts/build-protoc.sh b/libs/protobuf/protoc-artifacts/build-protoc.sh
deleted file mode 100755
index 4602842..0000000
--- a/libs/protobuf/protoc-artifacts/build-protoc.sh
+++ /dev/null
@@ -1,294 +0,0 @@
-#!/bin/bash
-
-# Builds protoc executable into target/<OS>/<ARCH>/protoc.exe; optionally builds
-# protoc plugins into target/<OS>/<ARCH>/protoc-gen-*.exe
-#
-# Usage: ./build-protoc.sh <OS> <ARCH> <TARGET>
-#
-# <TARGET> can be "protoc" or "protoc-gen-javalite". Supported <OS> <ARCH>
-# combinations:
-#   HOST   <OS>    <ARCH>   <COMMENT>
-#   cygwin windows x86_32   Requires: i686-w64-mingw32-gcc
-#   cygwin windows x86_64   Requires: x86_64-w64-mingw32-gcc
-#   linux  linux   aarch_64 Requires: g++-aarch64-linux-gnu
-#   linux  linux   x86_32
-#   linux  linux   x86_64
-#   linux  windows x86_32   Requires: i686-w64-mingw32-gcc
-#   linux  windows x86_64   Requires: x86_64-w64-mingw32-gcc
-#   macos  osx     x86_32
-#   macos  osx     x86_64
-#   mingw  windows x86_32
-#   mingw  windows x86_64
-#
-# Before running this script, make sure you have generated the configure script
-# in the parent directory (i.e., run ./autogen.sh there).
-
-OS=$1
-ARCH=$2
-MAKE_TARGET=$3
-
-if [[ $# < 3 ]]; then
-  echo "Not enough arguments provided."
-  exit 1
-fi
-
-case $MAKE_TARGET in
-  protoc-gen-javalite)
-    ;;
-  protoc)
-    ;;
-  *)
-    echo "Target ""$MAKE_TARGET"" invalid."
-    exit 1
-esac
-
-# Under Cygwin, bash doesn't have these in PATH when called from Maven which
-# runs in Windows version of Java.
-export PATH="/bin:/usr/bin:$PATH"
-
-############################################################################
-# Helper functions
-############################################################################
-E_PARAM_ERR=98
-E_ASSERT_FAILED=99
-
-# Usage:
-fail()
-{
-  echo "ERROR: $1"
-  echo
-  exit $E_ASSERT_FAILED
-}
-
-# Usage: assertEq VAL1 VAL2 $LINENO
-assertEq ()
-{
-  lineno=$3
-  if [ -z "$lineno" ]; then
-    echo "lineno not given"
-    exit $E_PARAM_ERR
-  fi
-
-  if [[ "$1" != "$2" ]]; then
-    echo "Assertion failed:  \"$1\" == \"$2\""
-    echo "File \"$0\", line $lineno"    # Give name of file and line number.
-    exit $E_ASSERT_FAILED
-  fi
-}
-
-# Checks the artifact is for the expected architecture
-# Usage: checkArch <path-to-protoc>
-checkArch ()
-{
-  echo
-  echo "Checking file format ..."
-  if [[ "$OS" == windows || "$OS" == linux ]]; then
-    format="$(objdump -f "$1" | grep -o "file format .*$" | grep -o "[^ ]*$")"
-    echo Format=$format
-    if [[ "$OS" == linux ]]; then
-      host_machine="$(uname -m)";
-      if [[ "$ARCH" == x86_32 ]]; then
-        assertEq $format "elf32-i386" $LINENO
-      elif [[ "$ARCH" == x86_64 ]]; then
-        assertEq $format "elf64-x86-64" $LINENO
-      elif [[ "$ARCH" == aarch_64 ]]; then
-        assertEq $format "elf64-little" $LINENO
-      elif [[ "$ARCH" == s390_64 ]]; then
-	if [[ $host_machine == s390x ]];then
-	  assertEq $format "elf64-s390" $LINENO
-	else
-          assertEq $format "elf64-big" $LINENO
-	fi
-      elif [[ "$ARCH" == ppcle_64 ]]; then
-	if [[ $host_machine == ppc64le ]];then
-	  assertEq $format "elf64-powerpcle" $LINENO
-	else
-          assertEq $format "elf64-little" $LINENO
-	fi
-      else
-        fail "Unsupported arch: $ARCH"
-      fi
-    else
-      # $OS == windows
-      if [[ "$ARCH" == x86_32 ]]; then
-        assertEq $format "pei-i386" $LINENO
-      elif [[ "$ARCH" == x86_64 ]]; then
-        assertEq $format "pei-x86-64" $LINENO
-      else
-        fail "Unsupported arch: $ARCH"
-      fi
-    fi
-  elif [[ "$OS" == osx ]]; then
-    format="$(file -b "$1" | grep -o "[^ ]*$")"
-    echo Format=$format
-    if [[ "$ARCH" == x86_32 ]]; then
-      assertEq $format "i386" $LINENO
-    elif [[ "$ARCH" == x86_64 ]]; then
-      assertEq $format "x86_64" $LINENO
-    else
-      fail "Unsupported arch: $ARCH"
-    fi
-  else
-    fail "Unsupported system: $OS"
-  fi
-  echo
-}
-
-# Checks the dependencies of the artifact. Artifacts should only depend on
-# system libraries.
-# Usage: checkDependencies <path-to-protoc>
-checkDependencies ()
-{
-  if [[ "$OS" == windows ]]; then
-    dump_cmd='objdump -x '"$1"' | fgrep "DLL Name"'
-    white_list="KERNEL32\.dll\|msvcrt\.dll"
-  elif [[ "$OS" == linux ]]; then
-    host_machine="$(uname -m)";
-    dump_cmd='ldd '"$1"
-    if [[ "$ARCH" == x86_32 ]]; then
-      white_list="linux-gate\.so\.1\|libpthread\.so\.0\|libm\.so\.6\|libc\.so\.6\|ld-linux\.so\.2"
-    elif [[ "$ARCH" == x86_64 ]]; then
-      white_list="linux-vdso\.so\.1\|libpthread\.so\.0\|libm\.so\.6\|libc\.so\.6\|ld-linux-x86-64\.so\.2"
-    elif [[ "$ARCH" == s390_64 ]]; then
-      if [[ $host_machine != s390x ]];then
-        dump_cmd='objdump -p '"$1"' | grep NEEDED'
-      fi
-      white_list="linux-vdso64\.so\.1\|libpthread\.so\.0\|libm\.so\.6\|libc\.so\.6\|libz\.so\.1\|ld64\.so\.1"
-    elif [[ "$ARCH" == ppcle_64 ]]; then
-      if [[ $host_machine != ppc64le ]];then
-        dump_cmd='objdump -p '"$1"' | grep NEEDED'
-      fi
-      white_list="linux-vdso64\.so\.1\|libpthread\.so\.0\|libm\.so\.6\|libc\.so\.6\|libz\.so\.1\|ld64\.so\.2"
-    elif [[ "$ARCH" == aarch_64 ]]; then
-      dump_cmd='objdump -p '"$1"' | grep NEEDED'
-      white_list="libpthread\.so\.0\|libm\.so\.6\|libc\.so\.6\|ld-linux-aarch64\.so\.1"
-    fi
-  elif [[ "$OS" == osx ]]; then
-    dump_cmd='otool -L '"$1"' | fgrep dylib'
-    white_list="libz\.1\.dylib\|libstdc++\.6\.dylib\|libSystem\.B\.dylib"
-  fi
-  if [[ -z "$white_list" || -z "$dump_cmd" ]]; then
-    fail "Unsupported platform $OS-$ARCH."
-  fi
-  echo "Checking for expected dependencies ..."
-  eval $dump_cmd | grep -i "$white_list" || fail "doesn't show any expected dependencies"
-  echo "Checking for unexpected dependencies ..."
-  eval $dump_cmd | grep -i -v "$white_list"
-  ret=$?
-  if [[ $ret == 0 ]]; then
-    fail "found unexpected dependencies (listed above)."
-  elif [[ $ret != 1 ]]; then
-    fail "Error when checking dependencies."
-  fi  # grep returns 1 when "not found", which is what we expect
-  echo "Dependencies look good."
-  echo
-}
-############################################################################
-
-echo "Building protoc, OS=$OS ARCH=$ARCH TARGET=$MAKE_TARGET"
-
-CONFIGURE_ARGS="--disable-shared"
-
-if [[ "$OS" == windows ]]; then
-  MAKE_TARGET="${MAKE_TARGET}.exe"
-fi
-
-# Override the default value set in configure.ac that has '-g' which produces
-# huge binary.
-CXXFLAGS="-DNDEBUG"
-LDFLAGS=""
-
-if [[ "$(uname)" == CYGWIN* ]]; then
-  assertEq "$OS" windows $LINENO
-  # Use mingw32 compilers because executables produced by Cygwin compiler
-  # always have dependency on Cygwin DLL.
-  if [[ "$ARCH" == x86_64 ]]; then
-    CONFIGURE_ARGS="$CONFIGURE_ARGS --host=x86_64-w64-mingw32"
-  elif [[ "$ARCH" == x86_32 ]]; then
-    CONFIGURE_ARGS="$CONFIGURE_ARGS --host=i686-pc-mingw32"
-  else
-    fail "Unsupported arch by CYGWIN: $ARCH"
-  fi
-elif [[ "$(uname)" == MINGW32* ]]; then
-  assertEq "$OS" windows $LINENO
-  assertEq "$ARCH" x86_32 $LINENO
-elif [[ "$(uname)" == MINGW64* ]]; then
-  assertEq "$OS" windows $LINENO
-  assertEq "$ARCH" x86_64 $LINENO
-elif [[ "$(uname)" == Linux* ]]; then
-  if [[ "$OS" == linux ]]; then
-    if [[ "$ARCH" == x86_64 ]]; then
-      CXXFLAGS="$CXXFLAGS -m64"
-    elif [[ "$ARCH" == x86_32 ]]; then
-      CXXFLAGS="$CXXFLAGS -m32"
-    elif [[ "$ARCH" == aarch_64 ]]; then
-      CONFIGURE_ARGS="$CONFIGURE_ARGS --host=aarch64-linux-gnu"
-    elif [[ "$ARCH" == ppcle_64 ]]; then
-      CXXFLAGS="$CXXFLAGS -m64"
-      CONFIGURE_ARGS="$CONFIGURE_ARGS --host=powerpc64le-linux-gnu"
-    elif [[ "$ARCH" == s390_64 ]]; then
-      CXXFLAGS="$CXXFLAGS -m64"
-      CONFIGURE_ARGS="$CONFIGURE_ARGS --host=s390x-linux-gnu"
-    else
-      fail "Unsupported arch: $ARCH"
-    fi
-  elif [[ "$OS" == windows ]]; then
-    # Cross-compilation for Windows
-    CONFIGURE_ARGS="$CONFIGURE_ARGS"
-    if [[ "$ARCH" == x86_64 ]]; then
-      CONFIGURE_ARGS="$CONFIGURE_ARGS --host=x86_64-w64-mingw32"
-    elif [[ "$ARCH" == x86_32 ]]; then
-      CONFIGURE_ARGS="$CONFIGURE_ARGS --host=i686-w64-mingw32"
-    else
-      fail "Unsupported arch: $ARCH"
-    fi
-  else
-    fail "Cannot build $OS on $(uname)"
-  fi
-elif [[ "$(uname)" == Darwin* ]]; then
-  assertEq "$OS" osx $LINENO
-  # Make the binary compatible with OSX 10.7 and later
-  CXXFLAGS="$CXXFLAGS -mmacosx-version-min=10.7"
-  if [[ "$ARCH" == x86_64 ]]; then
-    CXXFLAGS="$CXXFLAGS -m64"
-  elif [[ "$ARCH" == x86_32 ]]; then
-    CXXFLAGS="$CXXFLAGS -m32"
-  else
-    fail "Unsupported arch: $ARCH"
-  fi
-else
-  fail "Unsupported system: $(uname)"
-fi
-
-# Statically link libgcc and libstdc++.
-# -s to produce stripped binary.
-if [[ "$OS" == windows ]]; then
-  # Also static link libpthread required by mingw64
-  LDFLAGS="$LDFLAGS -static-libgcc -static-libstdc++ -Wl,-Bstatic -lstdc++ -lpthread -s"
-elif [[ "$OS" != osx ]]; then
-  # And they don't work under Mac.
-  LDFLAGS="$LDFLAGS -static-libgcc -static-libstdc++ -s"
-fi
-
-export CXXFLAGS LDFLAGS
-
-# Nested double quotes are unintuitive, but it works.
-cd "$(dirname "$0")"
-
-WORKING_DIR="$(pwd)"
-BUILD_DIR="build/$OS/$ARCH"
-TARGET_FILE="target/$OS/$ARCH/$MAKE_TARGET.exe"
-
-mkdir -p "$BUILD_DIR" && cd "$BUILD_DIR" &&
-  ../../../../configure $CONFIGURE_ARGS &&
-  cd src && make $MAKE_TARGET -j8 &&
-  cd "$WORKING_DIR" && mkdir -p $(dirname $TARGET_FILE) &&
-  cp $BUILD_DIR/src/$MAKE_TARGET $TARGET_FILE ||
-  exit 1
-
-if [[ "$OS" == osx ]]; then
-  # Since Mac linker doesn't accept "-s", we need to run strip
-  strip $TARGET_FILE || exit 1
-fi
-
-checkArch $TARGET_FILE && checkDependencies $TARGET_FILE
diff --git a/libs/protobuf/protoc-artifacts/build-zip.sh b/libs/protobuf/protoc-artifacts/build-zip.sh
deleted file mode 100755
index 1d97725..0000000
--- a/libs/protobuf/protoc-artifacts/build-zip.sh
+++ /dev/null
@@ -1,120 +0,0 @@
-#!/bin/bash
-
-if [ $# -ne 2 ]; then
-  cat <<EOF
-Usage: $0 <TARGET> <VERSION_NUMBER>
-
-TARGET: protoc | protoc-gen-javalite
-
-Example:
-  $ $0 protoc 3.0.0
-  $ $0 protoc-gen-javalite 3.0.0
-
-This script will download pre-built protoc or protoc plugin binaries from maven
-repository and create .zip packages suitable to be included in the github
-release page. If the target is protoc, well-known type .proto files will also be
-included. Each invocation will create 8 zip packages:
-  dist/<TARGET>-<VERSION_NUMBER>-win32.zip
-  dist/<TARGET>-<VERSION_NUMBER>-win64.zip
-  dist/<TARGET>-<VERSION_NUMBER>-osx-aarch_64.zip
-  dist/<TARGET>-<VERSION_NUMBER>-osx-x86_64.zip
-  dist/<TARGET>-<VERSION_NUMBER>-linux-x86_32.zip
-  dist/<TARGET>-<VERSION_NUMBER>-linux-x86_64.zip
-  dist/<TARGET>-<VERSION_NUMBER>-linux-aarch_64.zip
-  dist/<TARGET>-<VERSION_NUMBER>-linux-ppcle_64.zip
-  dist/<TARGET>-<VERSION_NUMBER>-linux-s390_64.zip
-EOF
-  exit 1
-fi
-
-TARGET=$1
-VERSION_NUMBER=$2
-
-# <zip file name> <binary file name> pairs.
-declare -a FILE_NAMES=( \
-  win32.zip windows-x86_32.exe \
-  win64.zip windows-x86_64.exe \
-  osx-aarch_64.zip osx-aarch_64.exe \
-  osx-x86_64.zip osx-x86_64.exe \
-  linux-x86_32.zip linux-x86_32.exe \
-  linux-x86_64.zip linux-x86_64.exe \
-  linux-aarch_64.zip linux-aarch_64.exe \
-  linux-ppcle_64.zip linux-ppcle_64.exe \
-  linux-s390_64.zip linux-s390_64.exe \
-)
-
-# List of all well-known types to be included.
-declare -a WELL_KNOWN_TYPES=(           \
-  google/protobuf/descriptor.proto      \
-  google/protobuf/any.proto             \
-  google/protobuf/api.proto             \
-  google/protobuf/duration.proto        \
-  google/protobuf/empty.proto           \
-  google/protobuf/field_mask.proto      \
-  google/protobuf/source_context.proto  \
-  google/protobuf/struct.proto          \
-  google/protobuf/timestamp.proto       \
-  google/protobuf/type.proto            \
-  google/protobuf/wrappers.proto        \
-  google/protobuf/compiler/plugin.proto \
-)
-
-set -e
-
-# A temporary working directory to put all files.
-DIR=$(mktemp -d)
-
-# Copy over well-known types.
-mkdir -p ${DIR}/include/google/protobuf/compiler
-for PROTO in ${WELL_KNOWN_TYPES[@]}; do
-  cp -f ../src/${PROTO} ${DIR}/include/${PROTO}
-done
-
-# Create a readme file.
-cat <<EOF > ${DIR}/readme.txt
-Protocol Buffers - Google's data interchange format
-Copyright 2008 Google Inc.
-https://developers.google.com/protocol-buffers/
-
-This package contains a precompiled binary version of the protocol buffer
-compiler (protoc). This binary is intended for users who want to use Protocol
-Buffers in languages other than C++ but do not want to compile protoc
-themselves. To install, simply place this binary somewhere in your PATH.
-
-If you intend to use the included well known types then don't forget to
-copy the contents of the 'include' directory somewhere as well, for example
-into '/usr/local/include/'.
-
-Please refer to our official github site for more installation instructions:
-  https://github.com/protocolbuffers/protobuf
-EOF
-
-mkdir -p dist
-mkdir -p ${DIR}/bin
-# Create a zip file for each binary.
-for((i=0;i<${#FILE_NAMES[@]};i+=2));do
-  ZIP_NAME=${FILE_NAMES[$i]}
-  if [ ${ZIP_NAME:0:3} = "win" ]; then
-    BINARY="$TARGET.exe"
-  else
-    BINARY="$TARGET"
-  fi
-  BINARY_NAME=${FILE_NAMES[$(($i+1))]}
-  BINARY_URL=https://repo1.maven.org/maven2/com/google/protobuf/$TARGET/${VERSION_NUMBER}/$TARGET-${VERSION_NUMBER}-${BINARY_NAME}
-  if ! wget ${BINARY_URL} -O ${DIR}/bin/$BINARY &> /dev/null; then
-    echo "[ERROR] Failed to download ${BINARY_URL}" >&2
-    echo "[ERROR] Skipped $TARGET-${VERSION_NAME}-${ZIP_NAME}" >&2
-    continue
-  fi
-  TARGET_ZIP_FILE=`pwd`/dist/$TARGET-${VERSION_NUMBER}-${ZIP_NAME}
-  pushd $DIR &> /dev/null
-  chmod +x bin/$BINARY
-  if [ "$TARGET" = "protoc" ]; then
-    zip -r ${TARGET_ZIP_FILE} include bin readme.txt &> /dev/null
-  else
-    zip -r ${TARGET_ZIP_FILE} bin &> /dev/null
-  fi
-  rm  bin/$BINARY
-  popd &> /dev/null
-  echo "[INFO] Successfully created ${TARGET_ZIP_FILE}"
-done
diff --git a/libs/protobuf/protoc-artifacts/pom.xml b/libs/protobuf/protoc-artifacts/pom.xml
deleted file mode 100644
index 9d4c7f2..0000000
--- a/libs/protobuf/protoc-artifacts/pom.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>com.google</groupId>
-    <artifactId>google</artifactId>
-    <version>1</version>
-  </parent>
-  <groupId>com.google.protobuf</groupId>
-  <artifactId>protoc</artifactId>
-  <version>3.21.12</version>
-  <packaging>pom</packaging>
-  <name>Protobuf Compiler</name>
-  <description>
-    Protobuf Compiler (protoc) is a compiler for .proto files. It generates
-    language-specific code for Protobuf messages and RPC interfaces.
-  </description>
-  <inceptionYear>2008</inceptionYear>
-  <url>https://developers.google.com/protocol-buffers/</url>
-  <licenses>
-    <license>
-      <name>BSD-3-Clause</name>
-      <url>https://opensource.org/licenses/BSD-3-Clause</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-  <scm>
-    <url>https://github.com/protocolbuffers/protobuf</url>
-    <connection>
-      scm:git:https://github.com/protocolbuffers/protobuf.git
-    </connection>
-  </scm>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
-        <version>1.8</version>
-        <executions>
-          <execution>
-            <id>attach-artifacts</id>
-            <phase>package</phase>
-            <goals>
-              <goal>attach-artifact</goal>
-            </goals>
-            <configuration>
-              <artifacts>
-                <artifact>
-                  <file>${basedir}/target/linux/x86_64/protoc.exe</file>
-                  <classifier>linux-x86_64</classifier>
-                  <type>exe</type>
-                </artifact>
-                <artifact>
-                  <file>${basedir}/target/linux/x86_32/protoc.exe</file>
-                  <classifier>linux-x86_32</classifier>
-                  <type>exe</type>
-                </artifact>
-                <artifact>
-                  <file>${basedir}/target/windows/x86_64/protoc.exe</file>
-                  <classifier>windows-x86_64</classifier>
-                  <type>exe</type>
-                </artifact>
-                <artifact>
-                  <file>${basedir}/target/windows/x86_32/protoc.exe</file>
-                  <classifier>windows-x86_32</classifier>
-                  <type>exe</type>
-                </artifact>
-                <artifact>
-                  <file>${basedir}/target/osx/x86_64/protoc.exe</file>
-                  <classifier>osx-x86_64</classifier>
-                  <type>exe</type>
-                </artifact>
-                <artifact>
-                  <file>${basedir}/target/osx/aarch_64/protoc.exe</file>
-                  <classifier>osx-aarch_64</classifier>
-                  <type>exe</type>
-                </artifact>
-                <artifact>
-                  <file>${basedir}/target/linux/aarch_64/protoc.exe</file>
-                  <classifier>linux-aarch_64</classifier>
-                  <type>exe</type>
-                </artifact>
-                <artifact>
-                  <file>${basedir}/target/linux/ppcle_64/protoc.exe</file>
-                  <classifier>linux-ppcle_64</classifier>
-                  <type>exe</type>
-	  	</artifact>
-                <artifact>
-                  <file>${basedir}/target/linux/s390_64/protoc.exe</file>
-                  <classifier>linux-s390_64</classifier>
-                  <type>exe</type>
-                </artifact>
-              </artifacts>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-  <profiles>
-    <profile>
-      <id>release</id>
-      <properties>
-        <!-- Specify the staging repository to deploy to. This can be left
-             empty for the first deployment, and Sonatype will create one. For
-             subsequent deployments it should be set to what Sonatype has
-             created, so that all deployments will go to the same repository.
-             -->
-        <staging.repository/>
-      </properties>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-gpg-plugin</artifactId>
-            <version>1.5</version>
-            <executions>
-              <execution>
-                <id>sign-artifacts</id>
-                <phase>verify</phase>
-                <goals>
-                  <goal>sign</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <groupId>org.sonatype.plugins</groupId>
-            <artifactId>nexus-staging-maven-plugin</artifactId>
-            <version>1.6.3</version>
-            <extensions>true</extensions>
-            <configuration>
-               <serverId>sonatype-nexus-staging</serverId>
-               <nexusUrl>https://oss.sonatype.org/</nexusUrl>
-               <skipStagingRepositoryClose>true</skipStagingRepositoryClose>
-               <autoReleaseAfterClose>false</autoReleaseAfterClose>
-               <stagingRepositoryId>${staging.repository}</stagingRepositoryId>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
-</project>
diff --git a/libs/protobuf/protoc-artifacts/scl-enable-devtoolset.sh b/libs/protobuf/protoc-artifacts/scl-enable-devtoolset.sh
deleted file mode 100755
index 3089558..0000000
--- a/libs/protobuf/protoc-artifacts/scl-enable-devtoolset.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-set -eu -o pipefail
-
-quote() {
-  local arg
-  for arg in "$@"; do
-    printf "'"
-    printf "%s" "$arg" | sed -e "s/'/'\\\\''/g"
-    printf "' "
-  done
-}
-
-exec scl enable devtoolset-2 "$(quote "$@")"
diff --git a/libs/protobuf/python/MANIFEST.in b/libs/protobuf/python/MANIFEST.in
deleted file mode 100644
index a81760f..0000000
--- a/libs/protobuf/python/MANIFEST.in
+++ /dev/null
@@ -1,19 +0,0 @@
-prune google/protobuf/internal/import_test_package
-exclude google/protobuf/internal/*_pb2.py
-exclude google/protobuf/internal/*_test.py
-exclude google/protobuf/internal/*.proto
-exclude google/protobuf/internal/test_util.py
-
-recursive-include google *.cc
-recursive-include google *.h
-
-recursive-exclude google *_test.py
-recursive-exclude google *_test.proto
-recursive-exclude google unittest*_pb2.py
-
-global-exclude *.dll
-global-exclude *.pyc
-global-exclude *.pyo
-global-exclude *.so
-
-include LICENSE
diff --git a/libs/protobuf/python/README.md b/libs/protobuf/python/README.md
deleted file mode 100644
index 27f22c8..0000000
--- a/libs/protobuf/python/README.md
+++ /dev/null
@@ -1,130 +0,0 @@
-Protocol Buffers - Google's data interchange format
-===================================================
-
-Copyright 2008 Google Inc.
-
-This directory contains the Python Protocol Buffers runtime library.
-
-Normally, this directory comes as part of the protobuf package, available
-from:
-
-  https://developers.google.com/protocol-buffers/
-
-The complete package includes the C++ source code, which includes the
-Protocol Compiler (protoc).  If you downloaded this package from PyPI
-or some other Python-specific source, you may have received only the
-Python part of the code.  In this case, you will need to obtain the
-Protocol Compiler from some other source before you can use this
-package.
-
-Development Warning
-===================
-
-The pure python performance is slow. For better performance please
-use python c++ implementation.
-
-Installation
-============
-
-1) Make sure you have Python 3.7 or newer.  If in doubt, run:
-
-       $ python -V
-
-2) If you do not have setuptools installed, note that it will be
-   downloaded and installed automatically as soon as you run `setup.py`.
-   If you would rather install it manually, you may do so by following
-   the instructions on [this page](https://packaging.python.org/en/latest/installing.html#setup-for-installing-packages).
-
-3) Build the C++ code, or install a binary distribution of `protoc`.  If
-   you install a binary distribution, make sure that it is the same
-   version as this package.  If in doubt, run:
-
-       $ protoc --version
-
-4) Build and run the tests:
-
-       $ python setup.py build
-       $ python setup.py test
-
-   To build, test, and use the C++ implementation, you must first compile
-   `libprotobuf.so`:
-
-       $ (cd .. && make)
-
-   On OS X:
-
-   If you are running a Homebrew-provided Python, you must make sure another
-   version of protobuf is not already installed, as Homebrew's Python will
-   search `/usr/local/lib` for `libprotobuf.so` before it searches
-   `../src/.libs`.
-
-   You can either unlink Homebrew's protobuf or install the `libprotobuf` you
-   built earlier:
-
-       $ brew unlink protobuf
-
-   or
-
-       $ (cd .. && make install)
-
-    On other *nix:
-
-    You must make `libprotobuf.so` dynamically available. You can either
-    install libprotobuf you built earlier, or set `LD_LIBRARY_PATH`:
-
-       $ export LD_LIBRARY_PATH=../src/.libs
-
-    or
-
-       $ (cd .. && make install)
-
-   To build the C++ implementation run:
-
-       $ python setup.py build --cpp_implementation
-
-   Then run the tests like so:
-
-       $ python setup.py test --cpp_implementation
-
-   If some tests fail, this library may not work correctly on your
-   system.  Continue at your own risk.
-
-   Please note that there is a known problem with some versions of
-   Python on Cygwin which causes the tests to fail after printing the
-   error:  `sem_init: Resource temporarily unavailable`.  This appears
-   to be a [bug either in Cygwin or in
-   Python](http://www.cygwin.com/ml/cygwin/2005-07/msg01378.html).
-
-   We do not know if or when it might be fixed.  We also do not know
-   how likely it is that this bug will affect users in practice.
-
-5) Install:
-
-       $ python setup.py install
-
-   or:
-
-       $ (cd .. && make install)
-       $ python setup.py install --cpp_implementation
-
-   This step may require superuser privileges.
-   NOTE: To use C++ implementation, you need to export an environment
-   variable before running your program.  See the "C++ Implementation"
-   section below for more details.
-
-Usage
-=====
-
-The complete documentation for Protocol Buffers is available via the
-web at:
-
-  https://developers.google.com/protocol-buffers/
-
-C++ Implementation
-==================
-
-The C++ implementation for Python messages is built as a Python extension to
-improve the overall protobuf Python performance.
-
-To use the C++ implementation, you need to install the C++ protobuf runtime
-library, please see instructions in the parent directory.
diff --git a/libs/protobuf/python/docs/Makefile b/libs/protobuf/python/docs/Makefile
deleted file mode 100644
index 298ea9e..0000000
--- a/libs/protobuf/python/docs/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# Minimal makefile for Sphinx documentation
-#
-
-# You can set these variables from the command line.
-SPHINXOPTS    =
-SPHINXBUILD   = sphinx-build
-SOURCEDIR     = .
-BUILDDIR      = _build
-
-# Put it first so that "make" without argument is like "make help".
-help:
-	@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
-
-.PHONY: help Makefile
-
-# Catch-all target: route all unknown targets to Sphinx using the new
-# "make mode" option.  $(O) is meant as a shortcut for $(SPHINXOPTS).
-%: Makefile
-	@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
\ No newline at end of file
diff --git a/libs/protobuf/python/docs/conf.py b/libs/protobuf/python/docs/conf.py
deleted file mode 100644
index 913f012..0000000
--- a/libs/protobuf/python/docs/conf.py
+++ /dev/null
@@ -1,254 +0,0 @@
-# -*- coding: utf-8 -*-
-# Protocol Buffers - Google's data interchange format
-# Copyright 2019 Google LLC.  All rights reserved.
-# https://developers.google.com/protocol-buffers/
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#   * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#   * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#   * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# Configuration file for the Sphinx documentation builder.
-#
-# This file does only contain a selection of the most common options. For a
-# full list see the documentation:
-# http://www.sphinx-doc.org/en/master/config
-
-# -- Path setup --------------------------------------------------------------
-
-# If extensions (or modules to document with autodoc) are in another directory,
-# add these directories to sys.path here. If the directory is relative to the
-# documentation root, use os.path.abspath to make it absolute, like shown here.
-#
-import os
-# import sys
-# sys.path.insert(0, os.path.abspath('.'))
-import google.protobuf
-
-# -- Project information -----------------------------------------------------
-
-project = u"Protocol Buffers"
-copyright = u"2008, Google LLC"
-author = u"Google LLC"
-
-# The short X.Y version
-version = u""
-# The full version, including alpha/beta/rc tags
-release = google.protobuf.__version__
-
-
-# -- General configuration ---------------------------------------------------
-
-# If your documentation needs a minimal Sphinx version, state it here.
-#
-# needs_sphinx = '1.0'
-
-# Add any Sphinx extension module names here, as strings. They can be
-# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
-# ones.
-extensions = [
-  "sphinx.ext.autosummary",
-  "sphinx.ext.ifconfig",
-  "sphinx.ext.intersphinx",
-  "sphinx.ext.napoleon",
-]
-
-# Add any paths that contain templates here, relative to this directory.
-templates_path = ["_templates"]
-
-# The suffix(es) of source filenames.
-# You can specify multiple suffix as a list of string:
-#
-# source_suffix = ['.rst', '.md']
-source_suffix = ".rst"
-
-# The master toctree document.
-master_doc = "index"
-
-# The language for content autogenerated by Sphinx. Refer to documentation
-# for a list of supported languages.
-#
-# This is also used if you do content translation via gettext catalogs.
-# Usually you set "language" from the command line for these cases.
-language = None
-
-# List of patterns, relative to source directory, that match files and
-# directories to ignore when looking for source files.
-# This pattern also affects html_static_path and html_extra_path.
-exclude_patterns = [u"_build", "Thumbs.db", ".DS_Store"]
-
-# The name of the Pygments (syntax highlighting) style to use.
-pygments_style = None
-
-
-# -- Options for HTML output -------------------------------------------------
-
-# The theme to use for HTML and HTML Help pages.  See the documentation for
-# a list of builtin themes.
-#
-html_theme = "alabaster"
-
-# Remove JavaScript.
-html_js_files = []
-
-# Theme options are theme-specific and customize the look and feel of a theme
-# further.  For a list of options available for each theme, see the
-# documentation.
-#
-# html_theme_options = {}
-
-# Add any paths that contain custom static files (such as style sheets) here,
-# relative to this directory. They are copied after the builtin static files,
-# so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ["_static"]
-
-html_show_sourcelink = True
-
-# Custom sidebar templates, must be a dictionary that maps document names
-# to template names.
-#
-# The default sidebars (for documents that don't match any pattern) are
-# defined by theme itself.  Builtin themes are using these templates by
-# default: ``['localtoc.html', 'relations.html', 'sourcelink.html',
-# 'searchbox.html']``.
-
-# Remove searchbox.html to avoid embedded JavaScript.
-html_sidebars = {
-  "**": [
-    "globaltoc.html", "localtoc.html", "relations.html", "sourcelink.html",
-  ],
-}
-
-
-# -- Options for HTMLHelp output ---------------------------------------------
-
-# Output file base name for HTML help builder.
-htmlhelp_basename = "ProtocolBuffersdoc"
-
-
-# -- Options for LaTeX output ------------------------------------------------
-
-latex_elements = {
-  # The paper size ('letterpaper' or 'a4paper').
-  #
-  # 'papersize': 'letterpaper',
-  # The font size ('10pt', '11pt' or '12pt').
-  #
-  # 'pointsize': '10pt',
-  # Additional stuff for the LaTeX preamble.
-  #
-  # 'preamble': '',
-  # Latex figure (float) alignment
-  #
-  # 'figure_align': 'htbp',
-}
-
-# Grouping the document tree into LaTeX files. List of tuples
-# (source start file, target name, title,
-#  author, documentclass [howto, manual, or own class]).
-latex_documents = [
-  (
-    master_doc,
-    "ProtocolBuffers.tex",
-    "Protocol Buffers Documentation",
-    "Google LLC",
-    "manual",
-  )
-]
-
-
-# -- Options for manual page output ------------------------------------------
-
-# One entry per manual page. List of tuples
-# (source start file, name, description, authors, manual section).
-man_pages = [
-  (
-    master_doc,  # source start file
-    "protocolbuffers",  # name
-    "Protocol Buffers Documentation",  # description
-    [author],  # authors
-    1,  # manual section
-  )
-]
-
-
-# -- Options for Texinfo output ----------------------------------------------
-
-# Grouping the document tree into Texinfo files. List of tuples
-# (source start file, target name, title, author,
-#  dir menu entry, description, category)
-texinfo_documents = [
-  (
-    master_doc,
-    "ProtocolBuffers",
-    u"Protocol Buffers Documentation",
-    author,
-    "ProtocolBuffers",
-    "One line description of project.",
-    "Miscellaneous",
-  )
-]
-
-
-# -- Options for Epub output -------------------------------------------------
-
-# Bibliographic Dublin Core info.
-epub_title = project
-
-# The unique identifier of the text. This can be a ISBN number
-# or the project homepage.
-#
-# epub_identifier = ''
-
-# A unique identification for the text.
-#
-# epub_uid = ''
-
-# A list of files that should not be packed into the epub file.
-epub_exclude_files = ["search.html"]
-
-
-# -- Extension configuration -------------------------------------------------
-
-# -- Options for autosummary extension ---------------------------------------
-autosummary_generate = True
-
-# -- Options for intersphinx extension ---------------------------------------
-
-# Example configuration for intersphinx: refer to the Python standard library.
-intersphinx_mapping = {"https://docs.python.org/": None}
-
-# -- Config values -----------------------------------------------------------
-# The setup() function is needed to add configuration values to the Sphinx
-# builder. We use this to show a banner when built on Read the Docs.
-# https://www.sphinx-doc.org/en/master/usage/extensions/ifconfig.html
-
-def setup(app):
-  app.add_config_value(
-    "build_env",
-    # Read the Docs sets a READTHEDOCS environment during builds.
-    # https://docs.readthedocs.io/en/stable/builds.html#build-environment
-    "readthedocs" if os.getenv("READTHEDOCS") else "",
-    "env"
-  )
diff --git a/libs/protobuf/python/docs/environment.yml b/libs/protobuf/python/docs/environment.yml
deleted file mode 100644
index 0f6390e..0000000
--- a/libs/protobuf/python/docs/environment.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-name: protobuf
-channels:
-  - defaults
-dependencies:
-  - libprotobuf=3.11.4
-  - make=4.2.1
-  - pip=19.3.1
-  - python=3.7.6
-  - sphinx=2.4.0
-  - sphinx_rtd_theme=0.4.3
diff --git a/libs/protobuf/python/docs/generate_docs.py b/libs/protobuf/python/docs/generate_docs.py
deleted file mode 100755
index 6b38398..0000000
--- a/libs/protobuf/python/docs/generate_docs.py
+++ /dev/null
@@ -1,192 +0,0 @@
-#!/usr/bin/env python
-# Protocol Buffers - Google's data interchange format
-# Copyright 2008 Google Inc.  All rights reserved.
-# https://developers.google.com/protocol-buffers/
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#   * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#   * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#   * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-"""Script to generate a list of all modules to use in autosummary.
-
-This script creates a ReStructured Text file for each public module in the
-protobuf Python package. The script also updates the table of contents in
-``docs/index.rst`` to point to these module references.
-
-To build the docs with Sphinx:
-
-1. Install the needed packages (``sphinx``, ``sphinxcontrib-napoleon`` for
-   Google-style docstring support). I've created a conda environment file to
-   make this easier:
-
-.. code:: bash
-
-   conda env create -f python/docs/environment.yml
-
-2. (Optional) Generate reference docs files and regenerate index:
-
-.. code:: bash
-
-   cd python/docs
-   python generate_docs.py
-
-3. Run Sphinx.
-
-.. code:: bash
-
-   make html
-"""
-
-import pathlib
-import re
-
-
-DOCS_DIR = pathlib.Path(__file__).parent.resolve()
-PYTHON_DIR = DOCS_DIR.parent
-SOURCE_DIR = PYTHON_DIR / "google" / "protobuf"
-SOURCE_POSIX = SOURCE_DIR.as_posix()
-
-# Modules which are always included:
-INCLUDED_MODULES = (
-  "google.protobuf.internal.containers",
-)
-
-# Packages to ignore, including all modules (unless in INCLUDED_MODULES):
-IGNORED_PACKAGES = (
-  "compiler",
-  "docs",
-  "internal",
-  "pyext",
-  "util",
-)
-
-# Ignored module stems in all packages (unless in INCLUDED_MODULES):
-IGNORED_MODULES = (
-  "any_test_pb2",
-  "api_pb2",
-  "unittest",
-  "source_context_pb2",
-  "test_messages_proto3_pb2",
-  "test_messages_proto2",
-)
-
-TOC_REGEX = re.compile(
-  r"\.\. START REFTOC.*\.\. END REFTOC\.\n",
-  flags=re.DOTALL,
-)
-TOC_TEMPLATE = """.. START REFTOC, generated by generate_docs.py.
-.. toctree::
-
-   {toctree}
-
-.. END REFTOC.
-"""
-
-AUTOMODULE_TEMPLATE = """.. DO NOT EDIT, generated by generate_docs.py.
-
-.. ifconfig:: build_env == 'readthedocs'
-
-   .. warning::
-
-      You are reading the documentation for the `latest committed changes
-      <https://github.com/protocolbuffers/protobuf/tree/main/python>`_ of
-      the `Protocol Buffers package for Python
-      <https://developers.google.com/protocol-buffers/docs/pythontutorial>`_.
-      Some features may not yet be released. Read the documentation for the
-      latest released package at `googleapis.dev
-      <https://googleapis.dev/python/protobuf/latest/>`_.
-
-{module}
-{underline}
-
-.. automodule:: {module}
-   :members:
-   :inherited-members:
-   :undoc-members:
-"""
-
-
-def find_modules():
-  modules = []
-  for module_path in SOURCE_DIR.glob("**/*.py"):
-    # Determine the (dotted) relative package and module names.
-    package_path = module_path.parent.relative_to(PYTHON_DIR)
-    if package_path == SOURCE_DIR:
-      package_name = ""
-      module_name = module_path.stem
-    else:
-      package_name = package_path.as_posix().replace("/", ".")
-      module_name = package_name + "." + module_path.stem
-
-    # Filter: first, accept anything in the whitelist; then, reject anything
-    # at package level, then module name level.
-    if any(include == module_name for include in INCLUDED_MODULES):
-      pass
-    elif any(ignored in package_name for ignored in IGNORED_PACKAGES):
-      continue
-    elif any(ignored in module_path.stem for ignored in IGNORED_MODULES):
-      continue
-
-    if module_path.name == "__init__.py":
-      modules.append(package_name)
-    else:
-      modules.append(module_name)
-
-  return modules
-
-
-def write_automodule(module):
-  contents = AUTOMODULE_TEMPLATE.format(module=module, underline="=" * len(module),)
-  automodule_path = DOCS_DIR.joinpath(*module.split(".")).with_suffix(".rst")
-  try:
-    automodule_path.parent.mkdir(parents=True)
-  except FileExistsError:
-    pass
-  with open(automodule_path, "w") as automodule_file:
-    automodule_file.write(contents)
-
-
-def replace_toc(modules):
-  toctree = [module.replace(".", "/") for module in modules]
-  with open(DOCS_DIR / "index.rst", "r") as index_file:
-    index_contents = index_file.read()
-  toc = TOC_TEMPLATE.format(
-    toctree="\n   ".join(toctree)
-  )
-  index_contents = re.sub(TOC_REGEX, toc, index_contents)
-  with open(DOCS_DIR / "index.rst", "w") as index_file:
-    index_file.write(index_contents)
-
-
-def main():
-  modules = list(sorted(find_modules()))
-  for module in modules:
-    print("Generating reference for {}".format(module))
-    write_automodule(module)
-  print("Generating index.rst")
-  replace_toc(modules)
-
-if __name__ == "__main__":
-    main()
diff --git a/libs/protobuf/python/docs/google/protobuf.rst b/libs/protobuf/python/docs/google/protobuf.rst
deleted file mode 100644
index b26102e..0000000
--- a/libs/protobuf/python/docs/google/protobuf.rst
+++ /dev/null
@@ -1,21 +0,0 @@
-.. DO NOT EDIT, generated by generate_docs.py.
-
-.. ifconfig:: build_env == 'readthedocs'
-
-   .. warning::
-
-      You are reading the documentation for the `latest committed changes
-      <https://github.com/protocolbuffers/protobuf/tree/master/python>`_ of
-      the `Protocol Buffers package for Python
-      <https://developers.google.com/protocol-buffers/docs/pythontutorial>`_.
-      Some features may not yet be released. Read the documentation for the
-      latest released package at `googleapis.dev
-      <https://googleapis.dev/python/protobuf/latest/>`_.
-
-google.protobuf
-===============
-
-.. automodule:: google.protobuf
-   :members:
-   :inherited-members:
-   :undoc-members:
diff --git a/libs/protobuf/python/docs/google/protobuf/any_pb2.rst b/libs/protobuf/python/docs/google/protobuf/any_pb2.rst
deleted file mode 100644
index b6f47ef..0000000
--- a/libs/protobuf/python/docs/google/protobuf/any_pb2.rst
+++ /dev/null
@@ -1,21 +0,0 @@
-.. DO NOT EDIT, generated by generate_docs.py.
-
-.. ifconfig:: build_env == 'readthedocs'
-
-   .. warning::
-
-      You are reading the documentation for the `latest committed changes
-      <https://github.com/protocolbuffers/protobuf/tree/master/python>`_ of
-      the `Protocol Buffers package for Python
-      <https://developers.google.com/protocol-buffers/docs/pythontutorial>`_.
-      Some features may not yet be released. Read the documentation for the
-      latest released package at `googleapis.dev
-      <https://googleapis.dev/python/protobuf/latest/>`_.
-
-google.protobuf.any_pb2
-=======================
-
-.. automodule:: google.protobuf.any_pb2
-   :members:
-   :inherited-members:
-   :undoc-members:
diff --git a/libs/protobuf/python/docs/google/protobuf/descriptor.rst b/libs/protobuf/python/docs/google/protobuf/descriptor.rst
deleted file mode 100644
index 29b0774..0000000
--- a/libs/protobuf/python/docs/google/protobuf/descriptor.rst
+++ /dev/null
@@ -1,21 +0,0 @@
-.. DO NOT EDIT, generated by generate_docs.py.
-
-.. ifconfig:: build_env == 'readthedocs'
-
-   .. warning::
-
-      You are reading the documentation for the `latest committed changes
-      <https://github.com/protocolbuffers/protobuf/tree/master/python>`_ of
-      the `Protocol Buffers package for Python
-      <https://developers.google.com/protocol-buffers/docs/pythontutorial>`_.
-      Some features may not yet be released. Read the documentation for the
-      latest released package at `googleapis.dev
-      <https://googleapis.dev/python/protobuf/latest/>`_.
-
-google.protobuf.descriptor
-==========================
-
-.. automodule:: google.protobuf.descriptor
-   :members:
-   :inherited-members:
-   :undoc-members:
diff --git a/libs/protobuf/python/docs/google/protobuf/descriptor_database.rst b/libs/protobuf/python/docs/google/protobuf/descriptor_database.rst
deleted file mode 100644
index 1b8b390..0000000
--- a/libs/protobuf/python/docs/google/protobuf/descriptor_database.rst
+++ /dev/null
@@ -1,21 +0,0 @@
-.. DO NOT EDIT, generated by generate_docs.py.
-
-.. ifconfig:: build_env == 'readthedocs'
-
-   .. warning::
-
-      You are reading the documentation for the `latest committed changes
-      <https://github.com/protocolbuffers/protobuf/tree/master/python>`_ of
-      the `Protocol Buffers package for Python
-      <https://developers.google.com/protocol-buffers/docs/pythontutorial>`_.
-      Some features may not yet be released. Read the documentation for the
-      latest released package at `googleapis.dev
-      <https://googleapis.dev/python/protobuf/latest/>`_.
-
-google.protobuf.descriptor_database
-===================================
-
-.. automodule:: google.protobuf.descriptor_database
-   :members:
-   :inherited-members:
-   :undoc-members:
diff --git a/libs/protobuf/python/docs/google/protobuf/descriptor_pb2.rst b/libs/protobuf/python/docs/google/protobuf/descriptor_pb2.rst
deleted file mode 100644
index 94eec35..0000000
--- a/libs/protobuf/python/docs/google/protobuf/descriptor_pb2.rst
+++ /dev/null
@@ -1,21 +0,0 @@
-.. DO NOT EDIT, generated by generate_docs.py.
-
-.. ifconfig:: build_env == 'readthedocs'
-
-   .. warning::
-
-      You are reading the documentation for the `latest committed changes
-      <https://github.com/protocolbuffers/protobuf/tree/master/python>`_ of
-      the `Protocol Buffers package for Python
-      <https://developers.google.com/protocol-buffers/docs/pythontutorial>`_.
-      Some features may not yet be released. Read the documentation for the
-      latest released package at `googleapis.dev
-      <https://googleapis.dev/python/protobuf/latest/>`_.
-
-google.protobuf.descriptor_pb2
-==============================
-
-.. automodule:: google.protobuf.descriptor_pb2
-   :members:
-   :inherited-members:
-   :undoc-members:
diff --git a/libs/protobuf/python/docs/google/protobuf/descriptor_pool.rst b/libs/protobuf/python/docs/google/protobuf/descriptor_pool.rst
deleted file mode 100644
index c2ee33e..0000000
--- a/libs/protobuf/python/docs/google/protobuf/descriptor_pool.rst
+++ /dev/null
@@ -1,21 +0,0 @@
-.. DO NOT EDIT, generated by generate_docs.py.
-
-.. ifconfig:: build_env == 'readthedocs'
-
-   .. warning::
-
-      You are reading the documentation for the `latest committed changes
-      <https://github.com/protocolbuffers/protobuf/tree/master/python>`_ of
-      the `Protocol Buffers package for Python
-      <https://developers.google.com/protocol-buffers/docs/pythontutorial>`_.
-      Some features may not yet be released. Read the documentation for the
-      latest released package at `googleapis.dev
-      <https://googleapis.dev/python/protobuf/latest/>`_.
-
-google.protobuf.descriptor_pool
-===============================
-
-.. automodule:: google.protobuf.descriptor_pool
-   :members:
-   :inherited-members:
-   :undoc-members:
diff --git a/libs/protobuf/python/docs/google/protobuf/duration_pb2.rst b/libs/protobuf/python/docs/google/protobuf/duration_pb2.rst
deleted file mode 100644
index 4233e3c..0000000
--- a/libs/protobuf/python/docs/google/protobuf/duration_pb2.rst
+++ /dev/null
@@ -1,21 +0,0 @@
-.. DO NOT EDIT, generated by generate_docs.py.
-
-.. ifconfig:: build_env == 'readthedocs'
-
-   .. warning::
-
-      You are reading the documentation for the `latest committed changes
-      <https://github.com/protocolbuffers/protobuf/tree/master/python>`_ of
-      the `Protocol Buffers package for Python
-      <https://developers.google.com/protocol-buffers/docs/pythontutorial>`_.
-      Some features may not yet be released. Read the documentation for the
-      latest released package at `googleapis.dev
-      <https://googleapis.dev/python/protobuf/latest/>`_.
-
-google.protobuf.duration_pb2
-============================
-
-.. automodule:: google.protobuf.duration_pb2
-   :members:
-   :inherited-members:
-   :undoc-members:
diff --git a/libs/protobuf/python/docs/google/protobuf/empty_pb2.rst b/libs/protobuf/python/docs/google/protobuf/empty_pb2.rst
deleted file mode 100644
index c386a4c..0000000
--- a/libs/protobuf/python/docs/google/protobuf/empty_pb2.rst
+++ /dev/null
@@ -1,21 +0,0 @@
-.. DO NOT EDIT, generated by generate_docs.py.
-
-.. ifconfig:: build_env == 'readthedocs'
-
-   .. warning::
-
-      You are reading the documentation for the `latest committed changes
-      <https://github.com/protocolbuffers/protobuf/tree/master/python>`_ of
-      the `Protocol Buffers package for Python
-      <https://developers.google.com/protocol-buffers/docs/pythontutorial>`_.
-      Some features may not yet be released. Read the documentation for the
-      latest released package at `googleapis.dev
-      <https://googleapis.dev/python/protobuf/latest/>`_.
-
-google.protobuf.empty_pb2
-=========================
-
-.. automodule:: google.protobuf.empty_pb2
-   :members:
-   :inherited-members:
-   :undoc-members:
diff --git a/libs/protobuf/python/docs/google/protobuf/field_mask_pb2.rst b/libs/protobuf/python/docs/google/protobuf/field_mask_pb2.rst
deleted file mode 100644
index d9d8070..0000000
--- a/libs/protobuf/python/docs/google/protobuf/field_mask_pb2.rst
+++ /dev/null
@@ -1,21 +0,0 @@
-.. DO NOT EDIT, generated by generate_docs.py.
-
-.. ifconfig:: build_env == 'readthedocs'
-
-   .. warning::
-
-      You are reading the documentation for the `latest committed changes
-      <https://github.com/protocolbuffers/protobuf/tree/master/python>`_ of
-      the `Protocol Buffers package for Python
-      <https://developers.google.com/protocol-buffers/docs/pythontutorial>`_.
-      Some features may not yet be released. Read the documentation for the
-      latest released package at `googleapis.dev
-      <https://googleapis.dev/python/protobuf/latest/>`_.
-
-google.protobuf.field_mask_pb2
-==============================
-
-.. automodule:: google.protobuf.field_mask_pb2
-   :members:
-   :inherited-members:
-   :undoc-members:
diff --git a/libs/protobuf/python/docs/google/protobuf/internal/containers.rst b/libs/protobuf/python/docs/google/protobuf/internal/containers.rst
deleted file mode 100644
index c3b8e59..0000000
--- a/libs/protobuf/python/docs/google/protobuf/internal/containers.rst
+++ /dev/null
@@ -1,21 +0,0 @@
-.. DO NOT EDIT, generated by generate_docs.py.
-
-.. ifconfig:: build_env == 'readthedocs'
-
-   .. warning::
-
-      You are reading the documentation for the `latest committed changes
-      <https://github.com/protocolbuffers/protobuf/tree/master/python>`_ of
-      the `Protocol Buffers package for Python
-      <https://developers.google.com/protocol-buffers/docs/pythontutorial>`_.
-      Some features may not yet be released. Read the documentation for the
-      latest released package at `googleapis.dev
-      <https://googleapis.dev/python/protobuf/latest/>`_.
-
-google.protobuf.internal.containers
-===================================
-
-.. automodule:: google.protobuf.internal.containers
-   :members:
-   :inherited-members:
-   :undoc-members:
diff --git a/libs/protobuf/python/docs/google/protobuf/json_format.rst b/libs/protobuf/python/docs/google/protobuf/json_format.rst
deleted file mode 100644
index eb3b0c5..0000000
--- a/libs/protobuf/python/docs/google/protobuf/json_format.rst
+++ /dev/null
@@ -1,21 +0,0 @@
-.. DO NOT EDIT, generated by generate_docs.py.
-
-.. ifconfig:: build_env == 'readthedocs'
-
-   .. warning::
-
-      You are reading the documentation for the `latest committed changes
-      <https://github.com/protocolbuffers/protobuf/tree/master/python>`_ of
-      the `Protocol Buffers package for Python
-      <https://developers.google.com/protocol-buffers/docs/pythontutorial>`_.
-      Some features may not yet be released. Read the documentation for the
-      latest released package at `googleapis.dev
-      <https://googleapis.dev/python/protobuf/latest/>`_.
-
-google.protobuf.json_format
-===========================
-
-.. automodule:: google.protobuf.json_format
-   :members:
-   :inherited-members:
-   :undoc-members:
diff --git a/libs/protobuf/python/docs/google/protobuf/message.rst b/libs/protobuf/python/docs/google/protobuf/message.rst
deleted file mode 100644
index a204248..0000000
--- a/libs/protobuf/python/docs/google/protobuf/message.rst
+++ /dev/null
@@ -1,21 +0,0 @@
-.. DO NOT EDIT, generated by generate_docs.py.
-
-.. ifconfig:: build_env == 'readthedocs'
-
-   .. warning::
-
-      You are reading the documentation for the `latest committed changes
-      <https://github.com/protocolbuffers/protobuf/tree/master/python>`_ of
-      the `Protocol Buffers package for Python
-      <https://developers.google.com/protocol-buffers/docs/pythontutorial>`_.
-      Some features may not yet be released. Read the documentation for the
-      latest released package at `googleapis.dev
-      <https://googleapis.dev/python/protobuf/latest/>`_.
-
-google.protobuf.message
-=======================
-
-.. automodule:: google.protobuf.message
-   :members:
-   :inherited-members:
-   :undoc-members:
diff --git a/libs/protobuf/python/docs/google/protobuf/message_factory.rst b/libs/protobuf/python/docs/google/protobuf/message_factory.rst
deleted file mode 100644
index 93183cc..0000000
--- a/libs/protobuf/python/docs/google/protobuf/message_factory.rst
+++ /dev/null
@@ -1,21 +0,0 @@
-.. DO NOT EDIT, generated by generate_docs.py.
-
-.. ifconfig:: build_env == 'readthedocs'
-
-   .. warning::
-
-      You are reading the documentation for the `latest committed changes
-      <https://github.com/protocolbuffers/protobuf/tree/master/python>`_ of
-      the `Protocol Buffers package for Python
-      <https://developers.google.com/protocol-buffers/docs/pythontutorial>`_.
-      Some features may not yet be released. Read the documentation for the
-      latest released package at `googleapis.dev
-      <https://googleapis.dev/python/protobuf/latest/>`_.
-
-google.protobuf.message_factory
-===============================
-
-.. automodule:: google.protobuf.message_factory
-   :members:
-   :inherited-members:
-   :undoc-members:
diff --git a/libs/protobuf/python/docs/google/protobuf/proto_builder.rst b/libs/protobuf/python/docs/google/protobuf/proto_builder.rst
deleted file mode 100644
index 36243a2..0000000
--- a/libs/protobuf/python/docs/google/protobuf/proto_builder.rst
+++ /dev/null
@@ -1,21 +0,0 @@
-.. DO NOT EDIT, generated by generate_docs.py.
-
-.. ifconfig:: build_env == 'readthedocs'
-
-   .. warning::
-
-      You are reading the documentation for the `latest committed changes
-      <https://github.com/protocolbuffers/protobuf/tree/master/python>`_ of
-      the `Protocol Buffers package for Python
-      <https://developers.google.com/protocol-buffers/docs/pythontutorial>`_.
-      Some features may not yet be released. Read the documentation for the
-      latest released package at `googleapis.dev
-      <https://googleapis.dev/python/protobuf/latest/>`_.
-
-google.protobuf.proto_builder
-=============================
-
-.. automodule:: google.protobuf.proto_builder
-   :members:
-   :inherited-members:
-   :undoc-members:
diff --git a/libs/protobuf/python/docs/google/protobuf/reflection.rst b/libs/protobuf/python/docs/google/protobuf/reflection.rst
deleted file mode 100644
index d177fc0..0000000
--- a/libs/protobuf/python/docs/google/protobuf/reflection.rst
+++ /dev/null
@@ -1,21 +0,0 @@
-.. DO NOT EDIT, generated by generate_docs.py.
-
-.. ifconfig:: build_env == 'readthedocs'
-
-   .. warning::
-
-      You are reading the documentation for the `latest committed changes
-      <https://github.com/protocolbuffers/protobuf/tree/master/python>`_ of
-      the `Protocol Buffers package for Python
-      <https://developers.google.com/protocol-buffers/docs/pythontutorial>`_.
-      Some features may not yet be released. Read the documentation for the
-      latest released package at `googleapis.dev
-      <https://googleapis.dev/python/protobuf/latest/>`_.
-
-google.protobuf.reflection
-==========================
-
-.. automodule:: google.protobuf.reflection
-   :members:
-   :inherited-members:
-   :undoc-members:
diff --git a/libs/protobuf/python/docs/google/protobuf/service.rst b/libs/protobuf/python/docs/google/protobuf/service.rst
deleted file mode 100644
index 6d71f81..0000000
--- a/libs/protobuf/python/docs/google/protobuf/service.rst
+++ /dev/null
@@ -1,21 +0,0 @@
-.. DO NOT EDIT, generated by generate_docs.py.
-
-.. ifconfig:: build_env == 'readthedocs'
-
-   .. warning::
-
-      You are reading the documentation for the `latest committed changes
-      <https://github.com/protocolbuffers/protobuf/tree/master/python>`_ of
-      the `Protocol Buffers package for Python
-      <https://developers.google.com/protocol-buffers/docs/pythontutorial>`_.
-      Some features may not yet be released. Read the documentation for the
-      latest released package at `googleapis.dev
-      <https://googleapis.dev/python/protobuf/latest/>`_.
-
-google.protobuf.service
-=======================
-
-.. automodule:: google.protobuf.service
-   :members:
-   :inherited-members:
-   :undoc-members:
diff --git a/libs/protobuf/python/docs/google/protobuf/service_reflection.rst b/libs/protobuf/python/docs/google/protobuf/service_reflection.rst
deleted file mode 100644
index 30f30dd..0000000
--- a/libs/protobuf/python/docs/google/protobuf/service_reflection.rst
+++ /dev/null
@@ -1,21 +0,0 @@
-.. DO NOT EDIT, generated by generate_docs.py.
-
-.. ifconfig:: build_env == 'readthedocs'
-
-   .. warning::
-
-      You are reading the documentation for the `latest committed changes
-      <https://github.com/protocolbuffers/protobuf/tree/master/python>`_ of
-      the `Protocol Buffers package for Python
-      <https://developers.google.com/protocol-buffers/docs/pythontutorial>`_.
-      Some features may not yet be released. Read the documentation for the
-      latest released package at `googleapis.dev
-      <https://googleapis.dev/python/protobuf/latest/>`_.
-
-google.protobuf.service_reflection
-==================================
-
-.. automodule:: google.protobuf.service_reflection
-   :members:
-   :inherited-members:
-   :undoc-members:
diff --git a/libs/protobuf/python/docs/google/protobuf/struct_pb2.rst b/libs/protobuf/python/docs/google/protobuf/struct_pb2.rst
deleted file mode 100644
index 9179eed..0000000
--- a/libs/protobuf/python/docs/google/protobuf/struct_pb2.rst
+++ /dev/null
@@ -1,21 +0,0 @@
-.. DO NOT EDIT, generated by generate_docs.py.
-
-.. ifconfig:: build_env == 'readthedocs'
-
-   .. warning::
-
-      You are reading the documentation for the `latest committed changes
-      <https://github.com/protocolbuffers/protobuf/tree/master/python>`_ of
-      the `Protocol Buffers package for Python
-      <https://developers.google.com/protocol-buffers/docs/pythontutorial>`_.
-      Some features may not yet be released. Read the documentation for the
-      latest released package at `googleapis.dev
-      <https://googleapis.dev/python/protobuf/latest/>`_.
-
-google.protobuf.struct_pb2
-==========================
-
-.. automodule:: google.protobuf.struct_pb2
-   :members:
-   :inherited-members:
-   :undoc-members:
diff --git a/libs/protobuf/python/docs/google/protobuf/symbol_database.rst b/libs/protobuf/python/docs/google/protobuf/symbol_database.rst
deleted file mode 100644
index 6ea7352..0000000
--- a/libs/protobuf/python/docs/google/protobuf/symbol_database.rst
+++ /dev/null
@@ -1,21 +0,0 @@
-.. DO NOT EDIT, generated by generate_docs.py.
-
-.. ifconfig:: build_env == 'readthedocs'
-
-   .. warning::
-
-      You are reading the documentation for the `latest committed changes
-      <https://github.com/protocolbuffers/protobuf/tree/master/python>`_ of
-      the `Protocol Buffers package for Python
-      <https://developers.google.com/protocol-buffers/docs/pythontutorial>`_.
-      Some features may not yet be released. Read the documentation for the
-      latest released package at `googleapis.dev
-      <https://googleapis.dev/python/protobuf/latest/>`_.
-
-google.protobuf.symbol_database
-===============================
-
-.. automodule:: google.protobuf.symbol_database
-   :members:
-   :inherited-members:
-   :undoc-members:
diff --git a/libs/protobuf/python/docs/google/protobuf/text_encoding.rst b/libs/protobuf/python/docs/google/protobuf/text_encoding.rst
deleted file mode 100644
index a2eb959..0000000
--- a/libs/protobuf/python/docs/google/protobuf/text_encoding.rst
+++ /dev/null
@@ -1,21 +0,0 @@
-.. DO NOT EDIT, generated by generate_docs.py.
-
-.. ifconfig:: build_env == 'readthedocs'
-
-   .. warning::
-
-      You are reading the documentation for the `latest committed changes
-      <https://github.com/protocolbuffers/protobuf/tree/master/python>`_ of
-      the `Protocol Buffers package for Python
-      <https://developers.google.com/protocol-buffers/docs/pythontutorial>`_.
-      Some features may not yet be released. Read the documentation for the
-      latest released package at `googleapis.dev
-      <https://googleapis.dev/python/protobuf/latest/>`_.
-
-google.protobuf.text_encoding
-=============================
-
-.. automodule:: google.protobuf.text_encoding
-   :members:
-   :inherited-members:
-   :undoc-members:
diff --git a/libs/protobuf/python/docs/google/protobuf/text_format.rst b/libs/protobuf/python/docs/google/protobuf/text_format.rst
deleted file mode 100644
index 686b8fc..0000000
--- a/libs/protobuf/python/docs/google/protobuf/text_format.rst
+++ /dev/null
@@ -1,21 +0,0 @@
-.. DO NOT EDIT, generated by generate_docs.py.
-
-.. ifconfig:: build_env == 'readthedocs'
-
-   .. warning::
-
-      You are reading the documentation for the `latest committed changes
-      <https://github.com/protocolbuffers/protobuf/tree/master/python>`_ of
-      the `Protocol Buffers package for Python
-      <https://developers.google.com/protocol-buffers/docs/pythontutorial>`_.
-      Some features may not yet be released. Read the documentation for the
-      latest released package at `googleapis.dev
-      <https://googleapis.dev/python/protobuf/latest/>`_.
-
-google.protobuf.text_format
-===========================
-
-.. automodule:: google.protobuf.text_format
-   :members:
-   :inherited-members:
-   :undoc-members:
diff --git a/libs/protobuf/python/docs/google/protobuf/timestamp_pb2.rst b/libs/protobuf/python/docs/google/protobuf/timestamp_pb2.rst
deleted file mode 100644
index 540df83..0000000
--- a/libs/protobuf/python/docs/google/protobuf/timestamp_pb2.rst
+++ /dev/null
@@ -1,21 +0,0 @@
-.. DO NOT EDIT, generated by generate_docs.py.
-
-.. ifconfig:: build_env == 'readthedocs'
-
-   .. warning::
-
-      You are reading the documentation for the `latest committed changes
-      <https://github.com/protocolbuffers/protobuf/tree/master/python>`_ of
-      the `Protocol Buffers package for Python
-      <https://developers.google.com/protocol-buffers/docs/pythontutorial>`_.
-      Some features may not yet be released. Read the documentation for the
-      latest released package at `googleapis.dev
-      <https://googleapis.dev/python/protobuf/latest/>`_.
-
-google.protobuf.timestamp_pb2
-=============================
-
-.. automodule:: google.protobuf.timestamp_pb2
-   :members:
-   :inherited-members:
-   :undoc-members:
diff --git a/libs/protobuf/python/docs/google/protobuf/type_pb2.rst b/libs/protobuf/python/docs/google/protobuf/type_pb2.rst
deleted file mode 100644
index e9b19d7..0000000
--- a/libs/protobuf/python/docs/google/protobuf/type_pb2.rst
+++ /dev/null
@@ -1,21 +0,0 @@
-.. DO NOT EDIT, generated by generate_docs.py.
-
-.. ifconfig:: build_env == 'readthedocs'
-
-   .. warning::
-
-      You are reading the documentation for the `latest committed changes
-      <https://github.com/protocolbuffers/protobuf/tree/master/python>`_ of
-      the `Protocol Buffers package for Python
-      <https://developers.google.com/protocol-buffers/docs/pythontutorial>`_.
-      Some features may not yet be released. Read the documentation for the
-      latest released package at `googleapis.dev
-      <https://googleapis.dev/python/protobuf/latest/>`_.
-
-google.protobuf.type_pb2
-========================
-
-.. automodule:: google.protobuf.type_pb2
-   :members:
-   :inherited-members:
-   :undoc-members:
diff --git a/libs/protobuf/python/docs/google/protobuf/wrappers_pb2.rst b/libs/protobuf/python/docs/google/protobuf/wrappers_pb2.rst
deleted file mode 100644
index 8f29aa7..0000000
--- a/libs/protobuf/python/docs/google/protobuf/wrappers_pb2.rst
+++ /dev/null
@@ -1,21 +0,0 @@
-.. DO NOT EDIT, generated by generate_docs.py.
-
-.. ifconfig:: build_env == 'readthedocs'
-
-   .. warning::
-
-      You are reading the documentation for the `latest committed changes
-      <https://github.com/protocolbuffers/protobuf/tree/master/python>`_ of
-      the `Protocol Buffers package for Python
-      <https://developers.google.com/protocol-buffers/docs/pythontutorial>`_.
-      Some features may not yet be released. Read the documentation for the
-      latest released package at `googleapis.dev
-      <https://googleapis.dev/python/protobuf/latest/>`_.
-
-google.protobuf.wrappers_pb2
-============================
-
-.. automodule:: google.protobuf.wrappers_pb2
-   :members:
-   :inherited-members:
-   :undoc-members:
diff --git a/libs/protobuf/python/docs/index.rst b/libs/protobuf/python/docs/index.rst
deleted file mode 100644
index 5535b39..0000000
--- a/libs/protobuf/python/docs/index.rst
+++ /dev/null
@@ -1,63 +0,0 @@
-.. Protocol Buffers documentation master file, created by
-   sphinx-quickstart on Thu Aug 15 13:56:43 2019.
-   You can adapt this file completely to your liking, but it should at least
-   contain the root `toctree` directive.
-
-.. ifconfig:: build_env == 'readthedocs'
-
-   .. warning::
-
-      You are reading the documentation for the `latest committed changes
-      <https://github.com/protocolbuffers/protobuf/tree/master/python>`_ of
-      the `Protocol Buffers package for Python
-      <https://developers.google.com/protocol-buffers/docs/pythontutorial>`_.
-      Some features may not yet be released. Read the documentation for the
-      latest released package at `googleapis.dev
-      <https://googleapis.dev/python/protobuf/latest/>`_.
-
-Protocol Buffers Python API Reference
-=====================================
-
-The complete documentation for Protocol Buffers is available via the web at:
-
-  https://developers.google.com/protocol-buffers/
-
-
-Modules and Packages
---------------------
-
-.. START REFTOC, generated by generate_docs.py.
-.. toctree::
-
-   google/protobuf
-   google/protobuf/any_pb2
-   google/protobuf/descriptor
-   google/protobuf/descriptor_database
-   google/protobuf/descriptor_pb2
-   google/protobuf/descriptor_pool
-   google/protobuf/duration_pb2
-   google/protobuf/empty_pb2
-   google/protobuf/field_mask_pb2
-   google/protobuf/internal/containers
-   google/protobuf/json_format
-   google/protobuf/message
-   google/protobuf/message_factory
-   google/protobuf/proto_builder
-   google/protobuf/reflection
-   google/protobuf/service
-   google/protobuf/service_reflection
-   google/protobuf/struct_pb2
-   google/protobuf/symbol_database
-   google/protobuf/text_encoding
-   google/protobuf/text_format
-   google/protobuf/timestamp_pb2
-   google/protobuf/type_pb2
-   google/protobuf/wrappers_pb2
-
-.. END REFTOC.
-
-Indices and tables
-------------------
-
-* :ref:`genindex`
-* :ref:`modindex`
diff --git a/libs/protobuf/python/docs/make.bat b/libs/protobuf/python/docs/make.bat
deleted file mode 100644
index 27f573b..0000000
--- a/libs/protobuf/python/docs/make.bat
+++ /dev/null
@@ -1,35 +0,0 @@
-@ECHO OFF
-
-pushd %~dp0
-
-REM Command file for Sphinx documentation
-
-if "%SPHINXBUILD%" == "" (
-	set SPHINXBUILD=sphinx-build
-)
-set SOURCEDIR=.
-set BUILDDIR=_build
-
-if "%1" == "" goto help
-
-%SPHINXBUILD% >NUL 2>NUL
-if errorlevel 9009 (
-	echo.
-	echo.The 'sphinx-build' command was not found. Make sure you have Sphinx
-	echo.installed, then set the SPHINXBUILD environment variable to point
-	echo.to the full path of the 'sphinx-build' executable. Alternatively you
-	echo.may add the Sphinx directory to PATH.
-	echo.
-	echo.If you don't have Sphinx installed, grab it from
-	echo.http://sphinx-doc.org/
-	exit /b 1
-)
-
-%SPHINXBUILD% -M %1 %SOURCEDIR% %BUILDDIR% %SPHINXOPTS%
-goto end
-
-:help
-%SPHINXBUILD% -M help %SOURCEDIR% %BUILDDIR% %SPHINXOPTS%
-
-:end
-popd
diff --git a/libs/protobuf/python/docs/requirements.txt b/libs/protobuf/python/docs/requirements.txt
deleted file mode 100644
index 0049dfb..0000000
--- a/libs/protobuf/python/docs/requirements.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-googleapis-common-protos==1.56.1
-jinja2==3.0.0
-sphinx==2.3.1
-sphinx_rtd_theme==0.4.3
-sphinxcontrib-napoleon==0.7
diff --git a/libs/protobuf/python/google/__init__.py b/libs/protobuf/python/google/__init__.py
deleted file mode 100644
index 5585614..0000000
--- a/libs/protobuf/python/google/__init__.py
+++ /dev/null
@@ -1,4 +0,0 @@
-try:
-  __import__('pkg_resources').declare_namespace(__name__)
-except ImportError:
-  __path__ = __import__('pkgutil').extend_path(__path__, __name__)
diff --git a/libs/protobuf/python/google/protobuf/__init__.py b/libs/protobuf/python/google/protobuf/__init__.py
deleted file mode 100644
index e7555ee..0000000
--- a/libs/protobuf/python/google/protobuf/__init__.py
+++ /dev/null
@@ -1,33 +0,0 @@
-# Protocol Buffers - Google's data interchange format
-# Copyright 2008 Google Inc.  All rights reserved.
-# https://developers.google.com/protocol-buffers/
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# Copyright 2007 Google Inc. All Rights Reserved.
-
-__version__ = '4.21.12'
diff --git a/libs/protobuf/python/google/protobuf/compiler/__init__.py b/libs/protobuf/python/google/protobuf/compiler/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/libs/protobuf/python/google/protobuf/descriptor.py b/libs/protobuf/python/google/protobuf/descriptor.py
deleted file mode 100644
index f5a0caa..0000000
--- a/libs/protobuf/python/google/protobuf/descriptor.py
+++ /dev/null
@@ -1,1228 +0,0 @@
-# Protocol Buffers - Google's data interchange format
-# Copyright 2008 Google Inc.  All rights reserved.
-# https://developers.google.com/protocol-buffers/
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-"""Descriptors essentially contain exactly the information found in a .proto
-file, in types that make this information accessible in Python.
-"""
-
-__author__ = 'robinson@google.com (Will Robinson)'
-
-import threading
-import warnings
-
-from google.protobuf.internal import api_implementation
-
-_USE_C_DESCRIPTORS = False
-if api_implementation.Type() != 'python':
-  # Used by MakeDescriptor in cpp mode
-  import binascii
-  import os
-  # pylint: disable=protected-access
-  _message = api_implementation._c_module
-  # TODO(jieluo): Remove this import after fix api_implementation
-  if _message is None:
-    from google.protobuf.pyext import _message
-  _USE_C_DESCRIPTORS = True
-
-
-class Error(Exception):
-  """Base error for this module."""
-
-
-class TypeTransformationError(Error):
-  """Error transforming between python proto type and corresponding C++ type."""
-
-
-if _USE_C_DESCRIPTORS:
-  # This metaclass allows to override the behavior of code like
-  #     isinstance(my_descriptor, FieldDescriptor)
-  # and make it return True when the descriptor is an instance of the extension
-  # type written in C++.
-  class DescriptorMetaclass(type):
-    def __instancecheck__(cls, obj):
-      if super(DescriptorMetaclass, cls).__instancecheck__(obj):
-        return True
-      if isinstance(obj, cls._C_DESCRIPTOR_CLASS):
-        return True
-      return False
-else:
-  # The standard metaclass; nothing changes.
-  DescriptorMetaclass = type
-
-
-class _Lock(object):
-  """Wrapper class of threading.Lock(), which is allowed by 'with'."""
-
-  def __new__(cls):
-    self = object.__new__(cls)
-    self._lock = threading.Lock()  # pylint: disable=protected-access
-    return self
-
-  def __enter__(self):
-    self._lock.acquire()
-
-  def __exit__(self, exc_type, exc_value, exc_tb):
-    self._lock.release()
-
-
-_lock = threading.Lock()
-
-
-def _Deprecated(name):
-  if _Deprecated.count > 0:
-    _Deprecated.count -= 1
-    warnings.warn(
-        'Call to deprecated create function %s(). Note: Create unlinked '
-        'descriptors is going to go away. Please use get/find descriptors from '
-        'generated code or query the descriptor_pool.'
-        % name,
-        category=DeprecationWarning, stacklevel=3)
-
-
-# Deprecated warnings will print 100 times at most which should be enough for
-# users to notice and do not cause timeout.
-_Deprecated.count = 100
-
-
-_internal_create_key = object()
-
-
-class DescriptorBase(metaclass=DescriptorMetaclass):
-
-  """Descriptors base class.
-
-  This class is the base of all descriptor classes. It provides common options
-  related functionality.
-
-  Attributes:
-    has_options:  True if the descriptor has non-default options.  Usually it
-        is not necessary to read this -- just call GetOptions() which will
-        happily return the default instance.  However, it's sometimes useful
-        for efficiency, and also useful inside the protobuf implementation to
-        avoid some bootstrapping issues.
-  """
-
-  if _USE_C_DESCRIPTORS:
-    # The class, or tuple of classes, that are considered as "virtual
-    # subclasses" of this descriptor class.
-    _C_DESCRIPTOR_CLASS = ()
-
-  def __init__(self, options, serialized_options, options_class_name):
-    """Initialize the descriptor given its options message and the name of the
-    class of the options message. The name of the class is required in case
-    the options message is None and has to be created.
-    """
-    self._options = options
-    self._options_class_name = options_class_name
-    self._serialized_options = serialized_options
-
-    # Does this descriptor have non-default options?
-    self.has_options = (options is not None) or (serialized_options is not None)
-
-  def _SetOptions(self, options, options_class_name):
-    """Sets the descriptor's options
-
-    This function is used in generated proto2 files to update descriptor
-    options. It must not be used outside proto2.
-    """
-    self._options = options
-    self._options_class_name = options_class_name
-
-    # Does this descriptor have non-default options?
-    self.has_options = options is not None
-
-  def GetOptions(self):
-    """Retrieves descriptor options.
-
-    This method returns the options set or creates the default options for the
-    descriptor.
-    """
-    if self._options:
-      return self._options
-
-    from google.protobuf import descriptor_pb2
-    try:
-      options_class = getattr(descriptor_pb2,
-                              self._options_class_name)
-    except AttributeError:
-      raise RuntimeError('Unknown options class name %s!' %
-                         (self._options_class_name))
-
-    with _lock:
-      if self._serialized_options is None:
-        self._options = options_class()
-      else:
-        self._options = _ParseOptions(options_class(),
-                                      self._serialized_options)
-
-      return self._options
-
-
-class _NestedDescriptorBase(DescriptorBase):
-  """Common class for descriptors that can be nested."""
-
-  def __init__(self, options, options_class_name, name, full_name,
-               file, containing_type, serialized_start=None,
-               serialized_end=None, serialized_options=None):
-    """Constructor.
-
-    Args:
-      options: Protocol message options or None
-        to use default message options.
-      options_class_name (str): The class name of the above options.
-      name (str): Name of this protocol message type.
-      full_name (str): Fully-qualified name of this protocol message type,
-        which will include protocol "package" name and the name of any
-        enclosing types.
-      file (FileDescriptor): Reference to file info.
-      containing_type: if provided, this is a nested descriptor, with this
-        descriptor as parent, otherwise None.
-      serialized_start: The start index (inclusive) in block in the
-        file.serialized_pb that describes this descriptor.
-      serialized_end: The end index (exclusive) in block in the
-        file.serialized_pb that describes this descriptor.
-      serialized_options: Protocol message serialized options or None.
-    """
-    super(_NestedDescriptorBase, self).__init__(
-        options, serialized_options, options_class_name)
-
-    self.name = name
-    # TODO(falk): Add function to calculate full_name instead of having it in
-    #             memory?
-    self.full_name = full_name
-    self.file = file
-    self.containing_type = containing_type
-
-    self._serialized_start = serialized_start
-    self._serialized_end = serialized_end
-
-  def CopyToProto(self, proto):
-    """Copies this to the matching proto in descriptor_pb2.
-
-    Args:
-      proto: An empty proto instance from descriptor_pb2.
-
-    Raises:
-      Error: If self couldn't be serialized, due to to few constructor
-        arguments.
-    """
-    if (self.file is not None and
-        self._serialized_start is not None and
-        self._serialized_end is not None):
-      proto.ParseFromString(self.file.serialized_pb[
-          self._serialized_start:self._serialized_end])
-    else:
-      raise Error('Descriptor does not contain serialization.')
-
-
-class Descriptor(_NestedDescriptorBase):
-
-  """Descriptor for a protocol message type.
-
-  Attributes:
-      name (str): Name of this protocol message type.
-      full_name (str): Fully-qualified name of this protocol message type,
-          which will include protocol "package" name and the name of any
-          enclosing types.
-      containing_type (Descriptor): Reference to the descriptor of the type
-          containing us, or None if this is top-level.
-      fields (list[FieldDescriptor]): Field descriptors for all fields in
-          this type.
-      fields_by_number (dict(int, FieldDescriptor)): Same
-          :class:`FieldDescriptor` objects as in :attr:`fields`, but indexed
-          by "number" attribute in each FieldDescriptor.
-      fields_by_name (dict(str, FieldDescriptor)): Same
-          :class:`FieldDescriptor` objects as in :attr:`fields`, but indexed by
-          "name" attribute in each :class:`FieldDescriptor`.
-      nested_types (list[Descriptor]): Descriptor references
-          for all protocol message types nested within this one.
-      nested_types_by_name (dict(str, Descriptor)): Same Descriptor
-          objects as in :attr:`nested_types`, but indexed by "name" attribute
-          in each Descriptor.
-      enum_types (list[EnumDescriptor]): :class:`EnumDescriptor` references
-          for all enums contained within this type.
-      enum_types_by_name (dict(str, EnumDescriptor)): Same
-          :class:`EnumDescriptor` objects as in :attr:`enum_types`, but
-          indexed by "name" attribute in each EnumDescriptor.
-      enum_values_by_name (dict(str, EnumValueDescriptor)): Dict mapping
-          from enum value name to :class:`EnumValueDescriptor` for that value.
-      extensions (list[FieldDescriptor]): All extensions defined directly
-          within this message type (NOT within a nested type).
-      extensions_by_name (dict(str, FieldDescriptor)): Same FieldDescriptor
-          objects as :attr:`extensions`, but indexed by "name" attribute of each
-          FieldDescriptor.
-      is_extendable (bool):  Does this type define any extension ranges?
-      oneofs (list[OneofDescriptor]): The list of descriptors for oneof fields
-          in this message.
-      oneofs_by_name (dict(str, OneofDescriptor)): Same objects as in
-          :attr:`oneofs`, but indexed by "name" attribute.
-      file (FileDescriptor): Reference to file descriptor.
-
-  """
-
-  if _USE_C_DESCRIPTORS:
-    _C_DESCRIPTOR_CLASS = _message.Descriptor
-
-    def __new__(
-        cls,
-        name=None,
-        full_name=None,
-        filename=None,
-        containing_type=None,
-        fields=None,
-        nested_types=None,
-        enum_types=None,
-        extensions=None,
-        options=None,
-        serialized_options=None,
-        is_extendable=True,
-        extension_ranges=None,
-        oneofs=None,
-        file=None,  # pylint: disable=redefined-builtin
-        serialized_start=None,
-        serialized_end=None,
-        syntax=None,
-        create_key=None):
-      _message.Message._CheckCalledFromGeneratedFile()
-      return _message.default_pool.FindMessageTypeByName(full_name)
-
-  # NOTE(tmarek): The file argument redefining a builtin is nothing we can
-  # fix right now since we don't know how many clients already rely on the
-  # name of the argument.
-  def __init__(self, name, full_name, filename, containing_type, fields,
-               nested_types, enum_types, extensions, options=None,
-               serialized_options=None,
-               is_extendable=True, extension_ranges=None, oneofs=None,
-               file=None, serialized_start=None, serialized_end=None,  # pylint: disable=redefined-builtin
-               syntax=None, create_key=None):
-    """Arguments to __init__() are as described in the description
-    of Descriptor fields above.
-
-    Note that filename is an obsolete argument, that is not used anymore.
-    Please use file.name to access this as an attribute.
-    """
-    if create_key is not _internal_create_key:
-      _Deprecated('Descriptor')
-
-    super(Descriptor, self).__init__(
-        options, 'MessageOptions', name, full_name, file,
-        containing_type, serialized_start=serialized_start,
-        serialized_end=serialized_end, serialized_options=serialized_options)
-
-    # We have fields in addition to fields_by_name and fields_by_number,
-    # so that:
-    #   1. Clients can index fields by "order in which they're listed."
-    #   2. Clients can easily iterate over all fields with the terse
-    #      syntax: for f in descriptor.fields: ...
-    self.fields = fields
-    for field in self.fields:
-      field.containing_type = self
-    self.fields_by_number = dict((f.number, f) for f in fields)
-    self.fields_by_name = dict((f.name, f) for f in fields)
-    self._fields_by_camelcase_name = None
-
-    self.nested_types = nested_types
-    for nested_type in nested_types:
-      nested_type.containing_type = self
-    self.nested_types_by_name = dict((t.name, t) for t in nested_types)
-
-    self.enum_types = enum_types
-    for enum_type in self.enum_types:
-      enum_type.containing_type = self
-    self.enum_types_by_name = dict((t.name, t) for t in enum_types)
-    self.enum_values_by_name = dict(
-        (v.name, v) for t in enum_types for v in t.values)
-
-    self.extensions = extensions
-    for extension in self.extensions:
-      extension.extension_scope = self
-    self.extensions_by_name = dict((f.name, f) for f in extensions)
-    self.is_extendable = is_extendable
-    self.extension_ranges = extension_ranges
-    self.oneofs = oneofs if oneofs is not None else []
-    self.oneofs_by_name = dict((o.name, o) for o in self.oneofs)
-    for oneof in self.oneofs:
-      oneof.containing_type = self
-    self.syntax = syntax or "proto2"
-
-  @property
-  def fields_by_camelcase_name(self):
-    """Same FieldDescriptor objects as in :attr:`fields`, but indexed by
-    :attr:`FieldDescriptor.camelcase_name`.
-    """
-    if self._fields_by_camelcase_name is None:
-      self._fields_by_camelcase_name = dict(
-          (f.camelcase_name, f) for f in self.fields)
-    return self._fields_by_camelcase_name
-
-  def EnumValueName(self, enum, value):
-    """Returns the string name of an enum value.
-
-    This is just a small helper method to simplify a common operation.
-
-    Args:
-      enum: string name of the Enum.
-      value: int, value of the enum.
-
-    Returns:
-      string name of the enum value.
-
-    Raises:
-      KeyError if either the Enum doesn't exist or the value is not a valid
-        value for the enum.
-    """
-    return self.enum_types_by_name[enum].values_by_number[value].name
-
-  def CopyToProto(self, proto):
-    """Copies this to a descriptor_pb2.DescriptorProto.
-
-    Args:
-      proto: An empty descriptor_pb2.DescriptorProto.
-    """
-    # This function is overridden to give a better doc comment.
-    super(Descriptor, self).CopyToProto(proto)
-
-
-# TODO(robinson): We should have aggressive checking here,
-# for example:
-#   * If you specify a repeated field, you should not be allowed
-#     to specify a default value.
-#   * [Other examples here as needed].
-#
-# TODO(robinson): for this and other *Descriptor classes, we
-# might also want to lock things down aggressively (e.g.,
-# prevent clients from setting the attributes).  Having
-# stronger invariants here in general will reduce the number
-# of runtime checks we must do in reflection.py...
-class FieldDescriptor(DescriptorBase):
-
-  """Descriptor for a single field in a .proto file.
-
-  Attributes:
-    name (str): Name of this field, exactly as it appears in .proto.
-    full_name (str): Name of this field, including containing scope.  This is
-      particularly relevant for extensions.
-    index (int): Dense, 0-indexed index giving the order that this
-      field textually appears within its message in the .proto file.
-    number (int): Tag number declared for this field in the .proto file.
-
-    type (int): (One of the TYPE_* constants below) Declared type.
-    cpp_type (int): (One of the CPPTYPE_* constants below) C++ type used to
-      represent this field.
-
-    label (int): (One of the LABEL_* constants below) Tells whether this
-      field is optional, required, or repeated.
-    has_default_value (bool): True if this field has a default value defined,
-      otherwise false.
-    default_value (Varies): Default value of this field.  Only
-      meaningful for non-repeated scalar fields.  Repeated fields
-      should always set this to [], and non-repeated composite
-      fields should always set this to None.
-
-    containing_type (Descriptor): Descriptor of the protocol message
-      type that contains this field.  Set by the Descriptor constructor
-      if we're passed into one.
-      Somewhat confusingly, for extension fields, this is the
-      descriptor of the EXTENDED message, not the descriptor
-      of the message containing this field.  (See is_extension and
-      extension_scope below).
-    message_type (Descriptor): If a composite field, a descriptor
-      of the message type contained in this field.  Otherwise, this is None.
-    enum_type (EnumDescriptor): If this field contains an enum, a
-      descriptor of that enum.  Otherwise, this is None.
-
-    is_extension: True iff this describes an extension field.
-    extension_scope (Descriptor): Only meaningful if is_extension is True.
-      Gives the message that immediately contains this extension field.
-      Will be None iff we're a top-level (file-level) extension field.
-
-    options (descriptor_pb2.FieldOptions): Protocol message field options or
-      None to use default field options.
-
-    containing_oneof (OneofDescriptor): If the field is a member of a oneof
-      union, contains its descriptor. Otherwise, None.
-
-    file (FileDescriptor): Reference to file descriptor.
-  """
-
-  # Must be consistent with C++ FieldDescriptor::Type enum in
-  # descriptor.h.
-  #
-  # TODO(robinson): Find a way to eliminate this repetition.
-  TYPE_DOUBLE         = 1
-  TYPE_FLOAT          = 2
-  TYPE_INT64          = 3
-  TYPE_UINT64         = 4
-  TYPE_INT32          = 5
-  TYPE_FIXED64        = 6
-  TYPE_FIXED32        = 7
-  TYPE_BOOL           = 8
-  TYPE_STRING         = 9
-  TYPE_GROUP          = 10
-  TYPE_MESSAGE        = 11
-  TYPE_BYTES          = 12
-  TYPE_UINT32         = 13
-  TYPE_ENUM           = 14
-  TYPE_SFIXED32       = 15
-  TYPE_SFIXED64       = 16
-  TYPE_SINT32         = 17
-  TYPE_SINT64         = 18
-  MAX_TYPE            = 18
-
-  # Must be consistent with C++ FieldDescriptor::CppType enum in
-  # descriptor.h.
-  #
-  # TODO(robinson): Find a way to eliminate this repetition.
-  CPPTYPE_INT32       = 1
-  CPPTYPE_INT64       = 2
-  CPPTYPE_UINT32      = 3
-  CPPTYPE_UINT64      = 4
-  CPPTYPE_DOUBLE      = 5
-  CPPTYPE_FLOAT       = 6
-  CPPTYPE_BOOL        = 7
-  CPPTYPE_ENUM        = 8
-  CPPTYPE_STRING      = 9
-  CPPTYPE_MESSAGE     = 10
-  MAX_CPPTYPE         = 10
-
-  _PYTHON_TO_CPP_PROTO_TYPE_MAP = {
-      TYPE_DOUBLE: CPPTYPE_DOUBLE,
-      TYPE_FLOAT: CPPTYPE_FLOAT,
-      TYPE_ENUM: CPPTYPE_ENUM,
-      TYPE_INT64: CPPTYPE_INT64,
-      TYPE_SINT64: CPPTYPE_INT64,
-      TYPE_SFIXED64: CPPTYPE_INT64,
-      TYPE_UINT64: CPPTYPE_UINT64,
-      TYPE_FIXED64: CPPTYPE_UINT64,
-      TYPE_INT32: CPPTYPE_INT32,
-      TYPE_SFIXED32: CPPTYPE_INT32,
-      TYPE_SINT32: CPPTYPE_INT32,
-      TYPE_UINT32: CPPTYPE_UINT32,
-      TYPE_FIXED32: CPPTYPE_UINT32,
-      TYPE_BYTES: CPPTYPE_STRING,
-      TYPE_STRING: CPPTYPE_STRING,
-      TYPE_BOOL: CPPTYPE_BOOL,
-      TYPE_MESSAGE: CPPTYPE_MESSAGE,
-      TYPE_GROUP: CPPTYPE_MESSAGE
-      }
-
-  # Must be consistent with C++ FieldDescriptor::Label enum in
-  # descriptor.h.
-  #
-  # TODO(robinson): Find a way to eliminate this repetition.
-  LABEL_OPTIONAL      = 1
-  LABEL_REQUIRED      = 2
-  LABEL_REPEATED      = 3
-  MAX_LABEL           = 3
-
-  # Must be consistent with C++ constants kMaxNumber, kFirstReservedNumber,
-  # and kLastReservedNumber in descriptor.h
-  MAX_FIELD_NUMBER = (1 << 29) - 1
-  FIRST_RESERVED_FIELD_NUMBER = 19000
-  LAST_RESERVED_FIELD_NUMBER = 19999
-
-  if _USE_C_DESCRIPTORS:
-    _C_DESCRIPTOR_CLASS = _message.FieldDescriptor
-
-    def __new__(cls, name, full_name, index, number, type, cpp_type, label,
-                default_value, message_type, enum_type, containing_type,
-                is_extension, extension_scope, options=None,
-                serialized_options=None,
-                has_default_value=True, containing_oneof=None, json_name=None,
-                file=None, create_key=None):  # pylint: disable=redefined-builtin
-      _message.Message._CheckCalledFromGeneratedFile()
-      if is_extension:
-        return _message.default_pool.FindExtensionByName(full_name)
-      else:
-        return _message.default_pool.FindFieldByName(full_name)
-
-  def __init__(self, name, full_name, index, number, type, cpp_type, label,
-               default_value, message_type, enum_type, containing_type,
-               is_extension, extension_scope, options=None,
-               serialized_options=None,
-               has_default_value=True, containing_oneof=None, json_name=None,
-               file=None, create_key=None):  # pylint: disable=redefined-builtin
-    """The arguments are as described in the description of FieldDescriptor
-    attributes above.
-
-    Note that containing_type may be None, and may be set later if necessary
-    (to deal with circular references between message types, for example).
-    Likewise for extension_scope.
-    """
-    if create_key is not _internal_create_key:
-      _Deprecated('FieldDescriptor')
-
-    super(FieldDescriptor, self).__init__(
-        options, serialized_options, 'FieldOptions')
-    self.name = name
-    self.full_name = full_name
-    self.file = file
-    self._camelcase_name = None
-    if json_name is None:
-      self.json_name = _ToJsonName(name)
-    else:
-      self.json_name = json_name
-    self.index = index
-    self.number = number
-    self.type = type
-    self.cpp_type = cpp_type
-    self.label = label
-    self.has_default_value = has_default_value
-    self.default_value = default_value
-    self.containing_type = containing_type
-    self.message_type = message_type
-    self.enum_type = enum_type
-    self.is_extension = is_extension
-    self.extension_scope = extension_scope
-    self.containing_oneof = containing_oneof
-    if api_implementation.Type() == 'python':
-      self._cdescriptor = None
-    else:
-      if is_extension:
-        self._cdescriptor = _message.default_pool.FindExtensionByName(full_name)
-      else:
-        self._cdescriptor = _message.default_pool.FindFieldByName(full_name)
-
-  @property
-  def camelcase_name(self):
-    """Camelcase name of this field.
-
-    Returns:
-      str: the name in CamelCase.
-    """
-    if self._camelcase_name is None:
-      self._camelcase_name = _ToCamelCase(self.name)
-    return self._camelcase_name
-
-  @property
-  def has_presence(self):
-    """Whether the field distinguishes between unpopulated and default values.
-
-    Raises:
-      RuntimeError: singular field that is not linked with message nor file.
-    """
-    if self.label == FieldDescriptor.LABEL_REPEATED:
-      return False
-    if (self.cpp_type == FieldDescriptor.CPPTYPE_MESSAGE or
-        self.containing_oneof):
-      return True
-    if hasattr(self.file, 'syntax'):
-      return self.file.syntax == 'proto2'
-    if hasattr(self.message_type, 'syntax'):
-      return self.message_type.syntax == 'proto2'
-    raise RuntimeError(
-        'has_presence is not ready to use because field %s is not'
-        ' linked with message type nor file' % self.full_name)
-
-  @staticmethod
-  def ProtoTypeToCppProtoType(proto_type):
-    """Converts from a Python proto type to a C++ Proto Type.
-
-    The Python ProtocolBuffer classes specify both the 'Python' datatype and the
-    'C++' datatype - and they're not the same. This helper method should
-    translate from one to another.
-
-    Args:
-      proto_type: the Python proto type (descriptor.FieldDescriptor.TYPE_*)
-    Returns:
-      int: descriptor.FieldDescriptor.CPPTYPE_*, the C++ type.
-    Raises:
-      TypeTransformationError: when the Python proto type isn't known.
-    """
-    try:
-      return FieldDescriptor._PYTHON_TO_CPP_PROTO_TYPE_MAP[proto_type]
-    except KeyError:
-      raise TypeTransformationError('Unknown proto_type: %s' % proto_type)
-
-
-class EnumDescriptor(_NestedDescriptorBase):
-
-  """Descriptor for an enum defined in a .proto file.
-
-  Attributes:
-    name (str): Name of the enum type.
-    full_name (str): Full name of the type, including package name
-      and any enclosing type(s).
-
-    values (list[EnumValueDescriptor]): List of the values
-      in this enum.
-    values_by_name (dict(str, EnumValueDescriptor)): Same as :attr:`values`,
-      but indexed by the "name" field of each EnumValueDescriptor.
-    values_by_number (dict(int, EnumValueDescriptor)): Same as :attr:`values`,
-      but indexed by the "number" field of each EnumValueDescriptor.
-    containing_type (Descriptor): Descriptor of the immediate containing
-      type of this enum, or None if this is an enum defined at the
-      top level in a .proto file.  Set by Descriptor's constructor
-      if we're passed into one.
-    file (FileDescriptor): Reference to file descriptor.
-    options (descriptor_pb2.EnumOptions): Enum options message or
-      None to use default enum options.
-  """
-
-  if _USE_C_DESCRIPTORS:
-    _C_DESCRIPTOR_CLASS = _message.EnumDescriptor
-
-    def __new__(cls, name, full_name, filename, values,
-                containing_type=None, options=None,
-                serialized_options=None, file=None,  # pylint: disable=redefined-builtin
-                serialized_start=None, serialized_end=None, create_key=None):
-      _message.Message._CheckCalledFromGeneratedFile()
-      return _message.default_pool.FindEnumTypeByName(full_name)
-
-  def __init__(self, name, full_name, filename, values,
-               containing_type=None, options=None,
-               serialized_options=None, file=None,  # pylint: disable=redefined-builtin
-               serialized_start=None, serialized_end=None, create_key=None):
-    """Arguments are as described in the attribute description above.
-
-    Note that filename is an obsolete argument, that is not used anymore.
-    Please use file.name to access this as an attribute.
-    """
-    if create_key is not _internal_create_key:
-      _Deprecated('EnumDescriptor')
-
-    super(EnumDescriptor, self).__init__(
-        options, 'EnumOptions', name, full_name, file,
-        containing_type, serialized_start=serialized_start,
-        serialized_end=serialized_end, serialized_options=serialized_options)
-
-    self.values = values
-    for value in self.values:
-      value.type = self
-    self.values_by_name = dict((v.name, v) for v in values)
-    # Values are reversed to ensure that the first alias is retained.
-    self.values_by_number = dict((v.number, v) for v in reversed(values))
-
-  def CopyToProto(self, proto):
-    """Copies this to a descriptor_pb2.EnumDescriptorProto.
-
-    Args:
-      proto (descriptor_pb2.EnumDescriptorProto): An empty descriptor proto.
-    """
-    # This function is overridden to give a better doc comment.
-    super(EnumDescriptor, self).CopyToProto(proto)
-
-
-class EnumValueDescriptor(DescriptorBase):
-
-  """Descriptor for a single value within an enum.
-
-  Attributes:
-    name (str): Name of this value.
-    index (int): Dense, 0-indexed index giving the order that this
-      value appears textually within its enum in the .proto file.
-    number (int): Actual number assigned to this enum value.
-    type (EnumDescriptor): :class:`EnumDescriptor` to which this value
-      belongs.  Set by :class:`EnumDescriptor`'s constructor if we're
-      passed into one.
-    options (descriptor_pb2.EnumValueOptions): Enum value options message or
-      None to use default enum value options options.
-  """
-
-  if _USE_C_DESCRIPTORS:
-    _C_DESCRIPTOR_CLASS = _message.EnumValueDescriptor
-
-    def __new__(cls, name, index, number,
-                type=None,  # pylint: disable=redefined-builtin
-                options=None, serialized_options=None, create_key=None):
-      _message.Message._CheckCalledFromGeneratedFile()
-      # There is no way we can build a complete EnumValueDescriptor with the
-      # given parameters (the name of the Enum is not known, for example).
-      # Fortunately generated files just pass it to the EnumDescriptor()
-      # constructor, which will ignore it, so returning None is good enough.
-      return None
-
-  def __init__(self, name, index, number,
-               type=None,  # pylint: disable=redefined-builtin
-               options=None, serialized_options=None, create_key=None):
-    """Arguments are as described in the attribute description above."""
-    if create_key is not _internal_create_key:
-      _Deprecated('EnumValueDescriptor')
-
-    super(EnumValueDescriptor, self).__init__(
-        options, serialized_options, 'EnumValueOptions')
-    self.name = name
-    self.index = index
-    self.number = number
-    self.type = type
-
-
-class OneofDescriptor(DescriptorBase):
-  """Descriptor for a oneof field.
-
-  Attributes:
-    name (str): Name of the oneof field.
-    full_name (str): Full name of the oneof field, including package name.
-    index (int): 0-based index giving the order of the oneof field inside
-      its containing type.
-    containing_type (Descriptor): :class:`Descriptor` of the protocol message
-      type that contains this field.  Set by the :class:`Descriptor` constructor
-      if we're passed into one.
-    fields (list[FieldDescriptor]): The list of field descriptors this
-      oneof can contain.
-  """
-
-  if _USE_C_DESCRIPTORS:
-    _C_DESCRIPTOR_CLASS = _message.OneofDescriptor
-
-    def __new__(
-        cls, name, full_name, index, containing_type, fields, options=None,
-        serialized_options=None, create_key=None):
-      _message.Message._CheckCalledFromGeneratedFile()
-      return _message.default_pool.FindOneofByName(full_name)
-
-  def __init__(
-      self, name, full_name, index, containing_type, fields, options=None,
-      serialized_options=None, create_key=None):
-    """Arguments are as described in the attribute description above."""
-    if create_key is not _internal_create_key:
-      _Deprecated('OneofDescriptor')
-
-    super(OneofDescriptor, self).__init__(
-        options, serialized_options, 'OneofOptions')
-    self.name = name
-    self.full_name = full_name
-    self.index = index
-    self.containing_type = containing_type
-    self.fields = fields
-
-
-class ServiceDescriptor(_NestedDescriptorBase):
-
-  """Descriptor for a service.
-
-  Attributes:
-    name (str): Name of the service.
-    full_name (str): Full name of the service, including package name.
-    index (int): 0-indexed index giving the order that this services
-      definition appears within the .proto file.
-    methods (list[MethodDescriptor]): List of methods provided by this
-      service.
-    methods_by_name (dict(str, MethodDescriptor)): Same
-      :class:`MethodDescriptor` objects as in :attr:`methods_by_name`, but
-      indexed by "name" attribute in each :class:`MethodDescriptor`.
-    options (descriptor_pb2.ServiceOptions): Service options message or
-      None to use default service options.
-    file (FileDescriptor): Reference to file info.
-  """
-
-  if _USE_C_DESCRIPTORS:
-    _C_DESCRIPTOR_CLASS = _message.ServiceDescriptor
-
-    def __new__(
-        cls,
-        name=None,
-        full_name=None,
-        index=None,
-        methods=None,
-        options=None,
-        serialized_options=None,
-        file=None,  # pylint: disable=redefined-builtin
-        serialized_start=None,
-        serialized_end=None,
-        create_key=None):
-      _message.Message._CheckCalledFromGeneratedFile()  # pylint: disable=protected-access
-      return _message.default_pool.FindServiceByName(full_name)
-
-  def __init__(self, name, full_name, index, methods, options=None,
-               serialized_options=None, file=None,  # pylint: disable=redefined-builtin
-               serialized_start=None, serialized_end=None, create_key=None):
-    if create_key is not _internal_create_key:
-      _Deprecated('ServiceDescriptor')
-
-    super(ServiceDescriptor, self).__init__(
-        options, 'ServiceOptions', name, full_name, file,
-        None, serialized_start=serialized_start,
-        serialized_end=serialized_end, serialized_options=serialized_options)
-    self.index = index
-    self.methods = methods
-    self.methods_by_name = dict((m.name, m) for m in methods)
-    # Set the containing service for each method in this service.
-    for method in self.methods:
-      method.containing_service = self
-
-  def FindMethodByName(self, name):
-    """Searches for the specified method, and returns its descriptor.
-
-    Args:
-      name (str): Name of the method.
-    Returns:
-      MethodDescriptor or None: the descriptor for the requested method, if
-      found.
-    """
-    return self.methods_by_name.get(name, None)
-
-  def CopyToProto(self, proto):
-    """Copies this to a descriptor_pb2.ServiceDescriptorProto.
-
-    Args:
-      proto (descriptor_pb2.ServiceDescriptorProto): An empty descriptor proto.
-    """
-    # This function is overridden to give a better doc comment.
-    super(ServiceDescriptor, self).CopyToProto(proto)
-
-
-class MethodDescriptor(DescriptorBase):
-
-  """Descriptor for a method in a service.
-
-  Attributes:
-    name (str): Name of the method within the service.
-    full_name (str): Full name of method.
-    index (int): 0-indexed index of the method inside the service.
-    containing_service (ServiceDescriptor): The service that contains this
-      method.
-    input_type (Descriptor): The descriptor of the message that this method
-      accepts.
-    output_type (Descriptor): The descriptor of the message that this method
-      returns.
-    client_streaming (bool): Whether this method uses client streaming.
-    server_streaming (bool): Whether this method uses server streaming.
-    options (descriptor_pb2.MethodOptions or None): Method options message, or
-      None to use default method options.
-  """
-
-  if _USE_C_DESCRIPTORS:
-    _C_DESCRIPTOR_CLASS = _message.MethodDescriptor
-
-    def __new__(cls,
-                name,
-                full_name,
-                index,
-                containing_service,
-                input_type,
-                output_type,
-                client_streaming=False,
-                server_streaming=False,
-                options=None,
-                serialized_options=None,
-                create_key=None):
-      _message.Message._CheckCalledFromGeneratedFile()  # pylint: disable=protected-access
-      return _message.default_pool.FindMethodByName(full_name)
-
-  def __init__(self,
-               name,
-               full_name,
-               index,
-               containing_service,
-               input_type,
-               output_type,
-               client_streaming=False,
-               server_streaming=False,
-               options=None,
-               serialized_options=None,
-               create_key=None):
-    """The arguments are as described in the description of MethodDescriptor
-    attributes above.
-
-    Note that containing_service may be None, and may be set later if necessary.
-    """
-    if create_key is not _internal_create_key:
-      _Deprecated('MethodDescriptor')
-
-    super(MethodDescriptor, self).__init__(
-        options, serialized_options, 'MethodOptions')
-    self.name = name
-    self.full_name = full_name
-    self.index = index
-    self.containing_service = containing_service
-    self.input_type = input_type
-    self.output_type = output_type
-    self.client_streaming = client_streaming
-    self.server_streaming = server_streaming
-
-  def CopyToProto(self, proto):
-    """Copies this to a descriptor_pb2.MethodDescriptorProto.
-
-    Args:
-      proto (descriptor_pb2.MethodDescriptorProto): An empty descriptor proto.
-
-    Raises:
-      Error: If self couldn't be serialized, due to too few constructor
-        arguments.
-    """
-    if self.containing_service is not None:
-      from google.protobuf import descriptor_pb2
-      service_proto = descriptor_pb2.ServiceDescriptorProto()
-      self.containing_service.CopyToProto(service_proto)
-      proto.CopyFrom(service_proto.method[self.index])
-    else:
-      raise Error('Descriptor does not contain a service.')
-
-
-class FileDescriptor(DescriptorBase):
-  """Descriptor for a file. Mimics the descriptor_pb2.FileDescriptorProto.
-
-  Note that :attr:`enum_types_by_name`, :attr:`extensions_by_name`, and
-  :attr:`dependencies` fields are only set by the
-  :py:mod:`google.protobuf.message_factory` module, and not by the generated
-  proto code.
-
-  Attributes:
-    name (str): Name of file, relative to root of source tree.
-    package (str): Name of the package
-    syntax (str): string indicating syntax of the file (can be "proto2" or
-      "proto3")
-    serialized_pb (bytes): Byte string of serialized
-      :class:`descriptor_pb2.FileDescriptorProto`.
-    dependencies (list[FileDescriptor]): List of other :class:`FileDescriptor`
-      objects this :class:`FileDescriptor` depends on.
-    public_dependencies (list[FileDescriptor]): A subset of
-      :attr:`dependencies`, which were declared as "public".
-    message_types_by_name (dict(str, Descriptor)): Mapping from message names
-      to their :class:`Descriptor`.
-    enum_types_by_name (dict(str, EnumDescriptor)): Mapping from enum names to
-      their :class:`EnumDescriptor`.
-    extensions_by_name (dict(str, FieldDescriptor)): Mapping from extension
-      names declared at file scope to their :class:`FieldDescriptor`.
-    services_by_name (dict(str, ServiceDescriptor)): Mapping from services'
-      names to their :class:`ServiceDescriptor`.
-    pool (DescriptorPool): The pool this descriptor belongs to.  When not
-      passed to the constructor, the global default pool is used.
-  """
-
-  if _USE_C_DESCRIPTORS:
-    _C_DESCRIPTOR_CLASS = _message.FileDescriptor
-
-    def __new__(cls, name, package, options=None,
-                serialized_options=None, serialized_pb=None,
-                dependencies=None, public_dependencies=None,
-                syntax=None, pool=None, create_key=None):
-      # FileDescriptor() is called from various places, not only from generated
-      # files, to register dynamic proto files and messages.
-      # pylint: disable=g-explicit-bool-comparison
-      if serialized_pb == b'':
-        # Cpp generated code must be linked in if serialized_pb is ''
-        try:
-          return _message.default_pool.FindFileByName(name)
-        except KeyError:
-          raise RuntimeError('Please link in cpp generated lib for %s' % (name))
-      elif serialized_pb:
-        return _message.default_pool.AddSerializedFile(serialized_pb)
-      else:
-        return super(FileDescriptor, cls).__new__(cls)
-
-  def __init__(self, name, package, options=None,
-               serialized_options=None, serialized_pb=None,
-               dependencies=None, public_dependencies=None,
-               syntax=None, pool=None, create_key=None):
-    """Constructor."""
-    if create_key is not _internal_create_key:
-      _Deprecated('FileDescriptor')
-
-    super(FileDescriptor, self).__init__(
-        options, serialized_options, 'FileOptions')
-
-    if pool is None:
-      from google.protobuf import descriptor_pool
-      pool = descriptor_pool.Default()
-    self.pool = pool
-    self.message_types_by_name = {}
-    self.name = name
-    self.package = package
-    self.syntax = syntax or "proto2"
-    self.serialized_pb = serialized_pb
-
-    self.enum_types_by_name = {}
-    self.extensions_by_name = {}
-    self.services_by_name = {}
-    self.dependencies = (dependencies or [])
-    self.public_dependencies = (public_dependencies or [])
-
-  def CopyToProto(self, proto):
-    """Copies this to a descriptor_pb2.FileDescriptorProto.
-
-    Args:
-      proto: An empty descriptor_pb2.FileDescriptorProto.
-    """
-    proto.ParseFromString(self.serialized_pb)
-
-
-def _ParseOptions(message, string):
-  """Parses serialized options.
-
-  This helper function is used to parse serialized options in generated
-  proto2 files. It must not be used outside proto2.
-  """
-  message.ParseFromString(string)
-  return message
-
-
-def _ToCamelCase(name):
-  """Converts name to camel-case and returns it."""
-  capitalize_next = False
-  result = []
-
-  for c in name:
-    if c == '_':
-      if result:
-        capitalize_next = True
-    elif capitalize_next:
-      result.append(c.upper())
-      capitalize_next = False
-    else:
-      result += c
-
-  # Lower-case the first letter.
-  if result and result[0].isupper():
-    result[0] = result[0].lower()
-  return ''.join(result)
-
-
-def _OptionsOrNone(descriptor_proto):
-  """Returns the value of the field `options`, or None if it is not set."""
-  if descriptor_proto.HasField('options'):
-    return descriptor_proto.options
-  else:
-    return None
-
-
-def _ToJsonName(name):
-  """Converts name to Json name and returns it."""
-  capitalize_next = False
-  result = []
-
-  for c in name:
-    if c == '_':
-      capitalize_next = True
-    elif capitalize_next:
-      result.append(c.upper())
-      capitalize_next = False
-    else:
-      result += c
-
-  return ''.join(result)
-
-
-def MakeDescriptor(desc_proto, package='', build_file_if_cpp=True,
-                   syntax=None):
-  """Make a protobuf Descriptor given a DescriptorProto protobuf.
-
-  Handles nested descriptors. Note that this is limited to the scope of defining
-  a message inside of another message. Composite fields can currently only be
-  resolved if the message is defined in the same scope as the field.
-
-  Args:
-    desc_proto: The descriptor_pb2.DescriptorProto protobuf message.
-    package: Optional package name for the new message Descriptor (string).
-    build_file_if_cpp: Update the C++ descriptor pool if api matches.
-                       Set to False on recursion, so no duplicates are created.
-    syntax: The syntax/semantics that should be used.  Set to "proto3" to get
-            proto3 field presence semantics.
-  Returns:
-    A Descriptor for protobuf messages.
-  """
-  if api_implementation.Type() != 'python' and build_file_if_cpp:
-    # The C++ implementation requires all descriptors to be backed by the same
-    # definition in the C++ descriptor pool. To do this, we build a
-    # FileDescriptorProto with the same definition as this descriptor and build
-    # it into the pool.
-    from google.protobuf import descriptor_pb2
-    file_descriptor_proto = descriptor_pb2.FileDescriptorProto()
-    file_descriptor_proto.message_type.add().MergeFrom(desc_proto)
-
-    # Generate a random name for this proto file to prevent conflicts with any
-    # imported ones. We need to specify a file name so the descriptor pool
-    # accepts our FileDescriptorProto, but it is not important what that file
-    # name is actually set to.
-    proto_name = binascii.hexlify(os.urandom(16)).decode('ascii')
-
-    if package:
-      file_descriptor_proto.name = os.path.join(package.replace('.', '/'),
-                                                proto_name + '.proto')
-      file_descriptor_proto.package = package
-    else:
-      file_descriptor_proto.name = proto_name + '.proto'
-
-    _message.default_pool.Add(file_descriptor_proto)
-    result = _message.default_pool.FindFileByName(file_descriptor_proto.name)
-
-    if _USE_C_DESCRIPTORS:
-      return result.message_types_by_name[desc_proto.name]
-
-  full_message_name = [desc_proto.name]
-  if package: full_message_name.insert(0, package)
-
-  # Create Descriptors for enum types
-  enum_types = {}
-  for enum_proto in desc_proto.enum_type:
-    full_name = '.'.join(full_message_name + [enum_proto.name])
-    enum_desc = EnumDescriptor(
-        enum_proto.name, full_name, None, [
-            EnumValueDescriptor(enum_val.name, ii, enum_val.number,
-                                create_key=_internal_create_key)
-            for ii, enum_val in enumerate(enum_proto.value)],
-        create_key=_internal_create_key)
-    enum_types[full_name] = enum_desc
-
-  # Create Descriptors for nested types
-  nested_types = {}
-  for nested_proto in desc_proto.nested_type:
-    full_name = '.'.join(full_message_name + [nested_proto.name])
-    # Nested types are just those defined inside of the message, not all types
-    # used by fields in the message, so no loops are possible here.
-    nested_desc = MakeDescriptor(nested_proto,
-                                 package='.'.join(full_message_name),
-                                 build_file_if_cpp=False,
-                                 syntax=syntax)
-    nested_types[full_name] = nested_desc
-
-  fields = []
-  for field_proto in desc_proto.field:
-    full_name = '.'.join(full_message_name + [field_proto.name])
-    enum_desc = None
-    nested_desc = None
-    if field_proto.json_name:
-      json_name = field_proto.json_name
-    else:
-      json_name = None
-    if field_proto.HasField('type_name'):
-      type_name = field_proto.type_name
-      full_type_name = '.'.join(full_message_name +
-                                [type_name[type_name.rfind('.')+1:]])
-      if full_type_name in nested_types:
-        nested_desc = nested_types[full_type_name]
-      elif full_type_name in enum_types:
-        enum_desc = enum_types[full_type_name]
-      # Else type_name references a non-local type, which isn't implemented
-    field = FieldDescriptor(
-        field_proto.name, full_name, field_proto.number - 1,
-        field_proto.number, field_proto.type,
-        FieldDescriptor.ProtoTypeToCppProtoType(field_proto.type),
-        field_proto.label, None, nested_desc, enum_desc, None, False, None,
-        options=_OptionsOrNone(field_proto), has_default_value=False,
-        json_name=json_name, create_key=_internal_create_key)
-    fields.append(field)
-
-  desc_name = '.'.join(full_message_name)
-  return Descriptor(desc_proto.name, desc_name, None, None, fields,
-                    list(nested_types.values()), list(enum_types.values()), [],
-                    options=_OptionsOrNone(desc_proto),
-                    create_key=_internal_create_key)
diff --git a/libs/protobuf/python/google/protobuf/descriptor_database.py b/libs/protobuf/python/google/protobuf/descriptor_database.py
deleted file mode 100644
index 073eddc..0000000
--- a/libs/protobuf/python/google/protobuf/descriptor_database.py
+++ /dev/null
@@ -1,177 +0,0 @@
-# Protocol Buffers - Google's data interchange format
-# Copyright 2008 Google Inc.  All rights reserved.
-# https://developers.google.com/protocol-buffers/
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-"""Provides a container for DescriptorProtos."""
-
-__author__ = 'matthewtoia@google.com (Matt Toia)'
-
-import warnings
-
-
-class Error(Exception):
-  pass
-
-
-class DescriptorDatabaseConflictingDefinitionError(Error):
-  """Raised when a proto is added with the same name & different descriptor."""
-
-
-class DescriptorDatabase(object):
-  """A container accepting FileDescriptorProtos and maps DescriptorProtos."""
-
-  def __init__(self):
-    self._file_desc_protos_by_file = {}
-    self._file_desc_protos_by_symbol = {}
-
-  def Add(self, file_desc_proto):
-    """Adds the FileDescriptorProto and its types to this database.
-
-    Args:
-      file_desc_proto: The FileDescriptorProto to add.
-    Raises:
-      DescriptorDatabaseConflictingDefinitionError: if an attempt is made to
-        add a proto with the same name but different definition than an
-        existing proto in the database.
-    """
-    proto_name = file_desc_proto.name
-    if proto_name not in self._file_desc_protos_by_file:
-      self._file_desc_protos_by_file[proto_name] = file_desc_proto
-    elif self._file_desc_protos_by_file[proto_name] != file_desc_proto:
-      raise DescriptorDatabaseConflictingDefinitionError(
-          '%s already added, but with different descriptor.' % proto_name)
-    else:
-      return
-
-    # Add all the top-level descriptors to the index.
-    package = file_desc_proto.package
-    for message in file_desc_proto.message_type:
-      for name in _ExtractSymbols(message, package):
-        self._AddSymbol(name, file_desc_proto)
-    for enum in file_desc_proto.enum_type:
-      self._AddSymbol(('.'.join((package, enum.name))), file_desc_proto)
-      for enum_value in enum.value:
-        self._file_desc_protos_by_symbol[
-            '.'.join((package, enum_value.name))] = file_desc_proto
-    for extension in file_desc_proto.extension:
-      self._AddSymbol(('.'.join((package, extension.name))), file_desc_proto)
-    for service in file_desc_proto.service:
-      self._AddSymbol(('.'.join((package, service.name))), file_desc_proto)
-
-  def FindFileByName(self, name):
-    """Finds the file descriptor proto by file name.
-
-    Typically the file name is a relative path ending to a .proto file. The
-    proto with the given name will have to have been added to this database
-    using the Add method or else an error will be raised.
-
-    Args:
-      name: The file name to find.
-
-    Returns:
-      The file descriptor proto matching the name.
-
-    Raises:
-      KeyError if no file by the given name was added.
-    """
-
-    return self._file_desc_protos_by_file[name]
-
-  def FindFileContainingSymbol(self, symbol):
-    """Finds the file descriptor proto containing the specified symbol.
-
-    The symbol should be a fully qualified name including the file descriptor's
-    package and any containing messages. Some examples:
-
-    'some.package.name.Message'
-    'some.package.name.Message.NestedEnum'
-    'some.package.name.Message.some_field'
-
-    The file descriptor proto containing the specified symbol must be added to
-    this database using the Add method or else an error will be raised.
-
-    Args:
-      symbol: The fully qualified symbol name.
-
-    Returns:
-      The file descriptor proto containing the symbol.
-
-    Raises:
-      KeyError if no file contains the specified symbol.
-    """
-    try:
-      return self._file_desc_protos_by_symbol[symbol]
-    except KeyError:
-      # Fields, enum values, and nested extensions are not in
-      # _file_desc_protos_by_symbol. Try to find the top level
-      # descriptor. Non-existent nested symbol under a valid top level
-      # descriptor can also be found. The behavior is the same with
-      # protobuf C++.
-      top_level, _, _ = symbol.rpartition('.')
-      try:
-        return self._file_desc_protos_by_symbol[top_level]
-      except KeyError:
-        # Raise the original symbol as a KeyError for better diagnostics.
-        raise KeyError(symbol)
-
-  def FindFileContainingExtension(self, extendee_name, extension_number):
-    # TODO(jieluo): implement this API.
-    return None
-
-  def FindAllExtensionNumbers(self, extendee_name):
-    # TODO(jieluo): implement this API.
-    return []
-
-  def _AddSymbol(self, name, file_desc_proto):
-    if name in self._file_desc_protos_by_symbol:
-      warn_msg = ('Conflict register for file "' + file_desc_proto.name +
-                  '": ' + name +
-                  ' is already defined in file "' +
-                  self._file_desc_protos_by_symbol[name].name + '"')
-      warnings.warn(warn_msg, RuntimeWarning)
-    self._file_desc_protos_by_symbol[name] = file_desc_proto
-
-
-def _ExtractSymbols(desc_proto, package):
-  """Pulls out all the symbols from a descriptor proto.
-
-  Args:
-    desc_proto: The proto to extract symbols from.
-    package: The package containing the descriptor type.
-
-  Yields:
-    The fully qualified name found in the descriptor.
-  """
-  message_name = package + '.' + desc_proto.name if package else desc_proto.name
-  yield message_name
-  for nested_type in desc_proto.nested_type:
-    for symbol in _ExtractSymbols(nested_type, message_name):
-      yield symbol
-  for enum_type in desc_proto.enum_type:
-    yield '.'.join((message_name, enum_type.name))
diff --git a/libs/protobuf/python/google/protobuf/descriptor_pool.py b/libs/protobuf/python/google/protobuf/descriptor_pool.py
deleted file mode 100644
index 911372a..0000000
--- a/libs/protobuf/python/google/protobuf/descriptor_pool.py
+++ /dev/null
@@ -1,1295 +0,0 @@
-# Protocol Buffers - Google's data interchange format
-# Copyright 2008 Google Inc.  All rights reserved.
-# https://developers.google.com/protocol-buffers/
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-"""Provides DescriptorPool to use as a container for proto2 descriptors.
-
-The DescriptorPool is used in conjection with a DescriptorDatabase to maintain
-a collection of protocol buffer descriptors for use when dynamically creating
-message types at runtime.
-
-For most applications protocol buffers should be used via modules generated by
-the protocol buffer compiler tool. This should only be used when the type of
-protocol buffers used in an application or library cannot be predetermined.
-
-Below is a straightforward example on how to use this class::
-
-  pool = DescriptorPool()
-  file_descriptor_protos = [ ... ]
-  for file_descriptor_proto in file_descriptor_protos:
-    pool.Add(file_descriptor_proto)
-  my_message_descriptor = pool.FindMessageTypeByName('some.package.MessageType')
-
-The message descriptor can be used in conjunction with the message_factory
-module in order to create a protocol buffer class that can be encoded and
-decoded.
-
-If you want to get a Python class for the specified proto, use the
-helper functions inside google.protobuf.message_factory
-directly instead of this class.
-"""
-
-__author__ = 'matthewtoia@google.com (Matt Toia)'
-
-import collections
-import warnings
-
-from google.protobuf import descriptor
-from google.protobuf import descriptor_database
-from google.protobuf import text_encoding
-
-
-_USE_C_DESCRIPTORS = descriptor._USE_C_DESCRIPTORS  # pylint: disable=protected-access
-
-
-def _Deprecated(func):
-  """Mark functions as deprecated."""
-
-  def NewFunc(*args, **kwargs):
-    warnings.warn(
-        'Call to deprecated function %s(). Note: Do add unlinked descriptors '
-        'to descriptor_pool is wrong. Use Add() or AddSerializedFile() '
-        'instead.' % func.__name__,
-        category=DeprecationWarning)
-    return func(*args, **kwargs)
-  NewFunc.__name__ = func.__name__
-  NewFunc.__doc__ = func.__doc__
-  NewFunc.__dict__.update(func.__dict__)
-  return NewFunc
-
-
-def _NormalizeFullyQualifiedName(name):
-  """Remove leading period from fully-qualified type name.
-
-  Due to b/13860351 in descriptor_database.py, types in the root namespace are
-  generated with a leading period. This function removes that prefix.
-
-  Args:
-    name (str): The fully-qualified symbol name.
-
-  Returns:
-    str: The normalized fully-qualified symbol name.
-  """
-  return name.lstrip('.')
-
-
-def _OptionsOrNone(descriptor_proto):
-  """Returns the value of the field `options`, or None if it is not set."""
-  if descriptor_proto.HasField('options'):
-    return descriptor_proto.options
-  else:
-    return None
-
-
-def _IsMessageSetExtension(field):
-  return (field.is_extension and
-          field.containing_type.has_options and
-          field.containing_type.GetOptions().message_set_wire_format and
-          field.type == descriptor.FieldDescriptor.TYPE_MESSAGE and
-          field.label == descriptor.FieldDescriptor.LABEL_OPTIONAL)
-
-
-class DescriptorPool(object):
-  """A collection of protobufs dynamically constructed by descriptor protos."""
-
-  if _USE_C_DESCRIPTORS:
-
-    def __new__(cls, descriptor_db=None):
-      # pylint: disable=protected-access
-      return descriptor._message.DescriptorPool(descriptor_db)
-
-  def __init__(self, descriptor_db=None):
-    """Initializes a Pool of proto buffs.
-
-    The descriptor_db argument to the constructor is provided to allow
-    specialized file descriptor proto lookup code to be triggered on demand. An
-    example would be an implementation which will read and compile a file
-    specified in a call to FindFileByName() and not require the call to Add()
-    at all. Results from this database will be cached internally here as well.
-
-    Args:
-      descriptor_db: A secondary source of file descriptors.
-    """
-
-    self._internal_db = descriptor_database.DescriptorDatabase()
-    self._descriptor_db = descriptor_db
-    self._descriptors = {}
-    self._enum_descriptors = {}
-    self._service_descriptors = {}
-    self._file_descriptors = {}
-    self._toplevel_extensions = {}
-    # TODO(jieluo): Remove _file_desc_by_toplevel_extension after
-    # maybe year 2020 for compatibility issue (with 3.4.1 only).
-    self._file_desc_by_toplevel_extension = {}
-    self._top_enum_values = {}
-    # We store extensions in two two-level mappings: The first key is the
-    # descriptor of the message being extended, the second key is the extension
-    # full name or its tag number.
-    self._extensions_by_name = collections.defaultdict(dict)
-    self._extensions_by_number = collections.defaultdict(dict)
-
-  def _CheckConflictRegister(self, desc, desc_name, file_name):
-    """Check if the descriptor name conflicts with another of the same name.
-
-    Args:
-      desc: Descriptor of a message, enum, service, extension or enum value.
-      desc_name (str): the full name of desc.
-      file_name (str): The file name of descriptor.
-    """
-    for register, descriptor_type in [
-        (self._descriptors, descriptor.Descriptor),
-        (self._enum_descriptors, descriptor.EnumDescriptor),
-        (self._service_descriptors, descriptor.ServiceDescriptor),
-        (self._toplevel_extensions, descriptor.FieldDescriptor),
-        (self._top_enum_values, descriptor.EnumValueDescriptor)]:
-      if desc_name in register:
-        old_desc = register[desc_name]
-        if isinstance(old_desc, descriptor.EnumValueDescriptor):
-          old_file = old_desc.type.file.name
-        else:
-          old_file = old_desc.file.name
-
-        if not isinstance(desc, descriptor_type) or (
-            old_file != file_name):
-          error_msg = ('Conflict register for file "' + file_name +
-                       '": ' + desc_name +
-                       ' is already defined in file "' +
-                       old_file + '". Please fix the conflict by adding '
-                       'package name on the proto file, or use different '
-                       'name for the duplication.')
-          if isinstance(desc, descriptor.EnumValueDescriptor):
-            error_msg += ('\nNote: enum values appear as '
-                          'siblings of the enum type instead of '
-                          'children of it.')
-
-          raise TypeError(error_msg)
-
-        return
-
-  def Add(self, file_desc_proto):
-    """Adds the FileDescriptorProto and its types to this pool.
-
-    Args:
-      file_desc_proto (FileDescriptorProto): The file descriptor to add.
-    """
-
-    self._internal_db.Add(file_desc_proto)
-
-  def AddSerializedFile(self, serialized_file_desc_proto):
-    """Adds the FileDescriptorProto and its types to this pool.
-
-    Args:
-      serialized_file_desc_proto (bytes): A bytes string, serialization of the
-        :class:`FileDescriptorProto` to add.
-
-    Returns:
-      FileDescriptor: Descriptor for the added file.
-    """
-
-    # pylint: disable=g-import-not-at-top
-    from google.protobuf import descriptor_pb2
-    file_desc_proto = descriptor_pb2.FileDescriptorProto.FromString(
-        serialized_file_desc_proto)
-    file_desc = self._ConvertFileProtoToFileDescriptor(file_desc_proto)
-    file_desc.serialized_pb = serialized_file_desc_proto
-    return file_desc
-
-  # Add Descriptor to descriptor pool is dreprecated. Please use Add()
-  # or AddSerializedFile() to add a FileDescriptorProto instead.
-  @_Deprecated
-  def AddDescriptor(self, desc):
-    self._AddDescriptor(desc)
-
-  # Never call this method. It is for internal usage only.
-  def _AddDescriptor(self, desc):
-    """Adds a Descriptor to the pool, non-recursively.
-
-    If the Descriptor contains nested messages or enums, the caller must
-    explicitly register them. This method also registers the FileDescriptor
-    associated with the message.
-
-    Args:
-      desc: A Descriptor.
-    """
-    if not isinstance(desc, descriptor.Descriptor):
-      raise TypeError('Expected instance of descriptor.Descriptor.')
-
-    self._CheckConflictRegister(desc, desc.full_name, desc.file.name)
-
-    self._descriptors[desc.full_name] = desc
-    self._AddFileDescriptor(desc.file)
-
-  # Add EnumDescriptor to descriptor pool is dreprecated. Please use Add()
-  # or AddSerializedFile() to add a FileDescriptorProto instead.
-  @_Deprecated
-  def AddEnumDescriptor(self, enum_desc):
-    self._AddEnumDescriptor(enum_desc)
-
-  # Never call this method. It is for internal usage only.
-  def _AddEnumDescriptor(self, enum_desc):
-    """Adds an EnumDescriptor to the pool.
-
-    This method also registers the FileDescriptor associated with the enum.
-
-    Args:
-      enum_desc: An EnumDescriptor.
-    """
-
-    if not isinstance(enum_desc, descriptor.EnumDescriptor):
-      raise TypeError('Expected instance of descriptor.EnumDescriptor.')
-
-    file_name = enum_desc.file.name
-    self._CheckConflictRegister(enum_desc, enum_desc.full_name, file_name)
-    self._enum_descriptors[enum_desc.full_name] = enum_desc
-
-    # Top enum values need to be indexed.
-    # Count the number of dots to see whether the enum is toplevel or nested
-    # in a message. We cannot use enum_desc.containing_type at this stage.
-    if enum_desc.file.package:
-      top_level = (enum_desc.full_name.count('.')
-                   - enum_desc.file.package.count('.') == 1)
-    else:
-      top_level = enum_desc.full_name.count('.') == 0
-    if top_level:
-      file_name = enum_desc.file.name
-      package = enum_desc.file.package
-      for enum_value in enum_desc.values:
-        full_name = _NormalizeFullyQualifiedName(
-            '.'.join((package, enum_value.name)))
-        self._CheckConflictRegister(enum_value, full_name, file_name)
-        self._top_enum_values[full_name] = enum_value
-    self._AddFileDescriptor(enum_desc.file)
-
-  # Add ServiceDescriptor to descriptor pool is dreprecated. Please use Add()
-  # or AddSerializedFile() to add a FileDescriptorProto instead.
-  @_Deprecated
-  def AddServiceDescriptor(self, service_desc):
-    self._AddServiceDescriptor(service_desc)
-
-  # Never call this method. It is for internal usage only.
-  def _AddServiceDescriptor(self, service_desc):
-    """Adds a ServiceDescriptor to the pool.
-
-    Args:
-      service_desc: A ServiceDescriptor.
-    """
-
-    if not isinstance(service_desc, descriptor.ServiceDescriptor):
-      raise TypeError('Expected instance of descriptor.ServiceDescriptor.')
-
-    self._CheckConflictRegister(service_desc, service_desc.full_name,
-                                service_desc.file.name)
-    self._service_descriptors[service_desc.full_name] = service_desc
-
-  # Add ExtensionDescriptor to descriptor pool is dreprecated. Please use Add()
-  # or AddSerializedFile() to add a FileDescriptorProto instead.
-  @_Deprecated
-  def AddExtensionDescriptor(self, extension):
-    self._AddExtensionDescriptor(extension)
-
-  # Never call this method. It is for internal usage only.
-  def _AddExtensionDescriptor(self, extension):
-    """Adds a FieldDescriptor describing an extension to the pool.
-
-    Args:
-      extension: A FieldDescriptor.
-
-    Raises:
-      AssertionError: when another extension with the same number extends the
-        same message.
-      TypeError: when the specified extension is not a
-        descriptor.FieldDescriptor.
-    """
-    if not (isinstance(extension, descriptor.FieldDescriptor) and
-            extension.is_extension):
-      raise TypeError('Expected an extension descriptor.')
-
-    if extension.extension_scope is None:
-      self._toplevel_extensions[extension.full_name] = extension
-
-    try:
-      existing_desc = self._extensions_by_number[
-          extension.containing_type][extension.number]
-    except KeyError:
-      pass
-    else:
-      if extension is not existing_desc:
-        raise AssertionError(
-            'Extensions "%s" and "%s" both try to extend message type "%s" '
-            'with field number %d.' %
-            (extension.full_name, existing_desc.full_name,
-             extension.containing_type.full_name, extension.number))
-
-    self._extensions_by_number[extension.containing_type][
-        extension.number] = extension
-    self._extensions_by_name[extension.containing_type][
-        extension.full_name] = extension
-
-    # Also register MessageSet extensions with the type name.
-    if _IsMessageSetExtension(extension):
-      self._extensions_by_name[extension.containing_type][
-          extension.message_type.full_name] = extension
-
-  @_Deprecated
-  def AddFileDescriptor(self, file_desc):
-    self._InternalAddFileDescriptor(file_desc)
-
-  # Never call this method. It is for internal usage only.
-  def _InternalAddFileDescriptor(self, file_desc):
-    """Adds a FileDescriptor to the pool, non-recursively.
-
-    If the FileDescriptor contains messages or enums, the caller must explicitly
-    register them.
-
-    Args:
-      file_desc: A FileDescriptor.
-    """
-
-    self._AddFileDescriptor(file_desc)
-    # TODO(jieluo): This is a temporary solution for FieldDescriptor.file.
-    # FieldDescriptor.file is added in code gen. Remove this solution after
-    # maybe 2020 for compatibility reason (with 3.4.1 only).
-    for extension in file_desc.extensions_by_name.values():
-      self._file_desc_by_toplevel_extension[
-          extension.full_name] = file_desc
-
-  def _AddFileDescriptor(self, file_desc):
-    """Adds a FileDescriptor to the pool, non-recursively.
-
-    If the FileDescriptor contains messages or enums, the caller must explicitly
-    register them.
-
-    Args:
-      file_desc: A FileDescriptor.
-    """
-
-    if not isinstance(file_desc, descriptor.FileDescriptor):
-      raise TypeError('Expected instance of descriptor.FileDescriptor.')
-    self._file_descriptors[file_desc.name] = file_desc
-
-  def FindFileByName(self, file_name):
-    """Gets a FileDescriptor by file name.
-
-    Args:
-      file_name (str): The path to the file to get a descriptor for.
-
-    Returns:
-      FileDescriptor: The descriptor for the named file.
-
-    Raises:
-      KeyError: if the file cannot be found in the pool.
-    """
-
-    try:
-      return self._file_descriptors[file_name]
-    except KeyError:
-      pass
-
-    try:
-      file_proto = self._internal_db.FindFileByName(file_name)
-    except KeyError as error:
-      if self._descriptor_db:
-        file_proto = self._descriptor_db.FindFileByName(file_name)
-      else:
-        raise error
-    if not file_proto:
-      raise KeyError('Cannot find a file named %s' % file_name)
-    return self._ConvertFileProtoToFileDescriptor(file_proto)
-
-  def FindFileContainingSymbol(self, symbol):
-    """Gets the FileDescriptor for the file containing the specified symbol.
-
-    Args:
-      symbol (str): The name of the symbol to search for.
-
-    Returns:
-      FileDescriptor: Descriptor for the file that contains the specified
-      symbol.
-
-    Raises:
-      KeyError: if the file cannot be found in the pool.
-    """
-
-    symbol = _NormalizeFullyQualifiedName(symbol)
-    try:
-      return self._InternalFindFileContainingSymbol(symbol)
-    except KeyError:
-      pass
-
-    try:
-      # Try fallback database. Build and find again if possible.
-      self._FindFileContainingSymbolInDb(symbol)
-      return self._InternalFindFileContainingSymbol(symbol)
-    except KeyError:
-      raise KeyError('Cannot find a file containing %s' % symbol)
-
-  def _InternalFindFileContainingSymbol(self, symbol):
-    """Gets the already built FileDescriptor containing the specified symbol.
-
-    Args:
-      symbol (str): The name of the symbol to search for.
-
-    Returns:
-      FileDescriptor: Descriptor for the file that contains the specified
-      symbol.
-
-    Raises:
-      KeyError: if the file cannot be found in the pool.
-    """
-    try:
-      return self._descriptors[symbol].file
-    except KeyError:
-      pass
-
-    try:
-      return self._enum_descriptors[symbol].file
-    except KeyError:
-      pass
-
-    try:
-      return self._service_descriptors[symbol].file
-    except KeyError:
-      pass
-
-    try:
-      return self._top_enum_values[symbol].type.file
-    except KeyError:
-      pass
-
-    try:
-      return self._file_desc_by_toplevel_extension[symbol]
-    except KeyError:
-      pass
-
-    # Try fields, enum values and nested extensions inside a message.
-    top_name, _, sub_name = symbol.rpartition('.')
-    try:
-      message = self.FindMessageTypeByName(top_name)
-      assert (sub_name in message.extensions_by_name or
-              sub_name in message.fields_by_name or
-              sub_name in message.enum_values_by_name)
-      return message.file
-    except (KeyError, AssertionError):
-      raise KeyError('Cannot find a file containing %s' % symbol)
-
-  def FindMessageTypeByName(self, full_name):
-    """Loads the named descriptor from the pool.
-
-    Args:
-      full_name (str): The full name of the descriptor to load.
-
-    Returns:
-      Descriptor: The descriptor for the named type.
-
-    Raises:
-      KeyError: if the message cannot be found in the pool.
-    """
-
-    full_name = _NormalizeFullyQualifiedName(full_name)
-    if full_name not in self._descriptors:
-      self._FindFileContainingSymbolInDb(full_name)
-    return self._descriptors[full_name]
-
-  def FindEnumTypeByName(self, full_name):
-    """Loads the named enum descriptor from the pool.
-
-    Args:
-      full_name (str): The full name of the enum descriptor to load.
-
-    Returns:
-      EnumDescriptor: The enum descriptor for the named type.
-
-    Raises:
-      KeyError: if the enum cannot be found in the pool.
-    """
-
-    full_name = _NormalizeFullyQualifiedName(full_name)
-    if full_name not in self._enum_descriptors:
-      self._FindFileContainingSymbolInDb(full_name)
-    return self._enum_descriptors[full_name]
-
-  def FindFieldByName(self, full_name):
-    """Loads the named field descriptor from the pool.
-
-    Args:
-      full_name (str): The full name of the field descriptor to load.
-
-    Returns:
-      FieldDescriptor: The field descriptor for the named field.
-
-    Raises:
-      KeyError: if the field cannot be found in the pool.
-    """
-    full_name = _NormalizeFullyQualifiedName(full_name)
-    message_name, _, field_name = full_name.rpartition('.')
-    message_descriptor = self.FindMessageTypeByName(message_name)
-    return message_descriptor.fields_by_name[field_name]
-
-  def FindOneofByName(self, full_name):
-    """Loads the named oneof descriptor from the pool.
-
-    Args:
-      full_name (str): The full name of the oneof descriptor to load.
-
-    Returns:
-      OneofDescriptor: The oneof descriptor for the named oneof.
-
-    Raises:
-      KeyError: if the oneof cannot be found in the pool.
-    """
-    full_name = _NormalizeFullyQualifiedName(full_name)
-    message_name, _, oneof_name = full_name.rpartition('.')
-    message_descriptor = self.FindMessageTypeByName(message_name)
-    return message_descriptor.oneofs_by_name[oneof_name]
-
-  def FindExtensionByName(self, full_name):
-    """Loads the named extension descriptor from the pool.
-
-    Args:
-      full_name (str): The full name of the extension descriptor to load.
-
-    Returns:
-      FieldDescriptor: The field descriptor for the named extension.
-
-    Raises:
-      KeyError: if the extension cannot be found in the pool.
-    """
-    full_name = _NormalizeFullyQualifiedName(full_name)
-    try:
-      # The proto compiler does not give any link between the FileDescriptor
-      # and top-level extensions unless the FileDescriptorProto is added to
-      # the DescriptorDatabase, but this can impact memory usage.
-      # So we registered these extensions by name explicitly.
-      return self._toplevel_extensions[full_name]
-    except KeyError:
-      pass
-    message_name, _, extension_name = full_name.rpartition('.')
-    try:
-      # Most extensions are nested inside a message.
-      scope = self.FindMessageTypeByName(message_name)
-    except KeyError:
-      # Some extensions are defined at file scope.
-      scope = self._FindFileContainingSymbolInDb(full_name)
-    return scope.extensions_by_name[extension_name]
-
-  def FindExtensionByNumber(self, message_descriptor, number):
-    """Gets the extension of the specified message with the specified number.
-
-    Extensions have to be registered to this pool by calling :func:`Add` or
-    :func:`AddExtensionDescriptor`.
-
-    Args:
-      message_descriptor (Descriptor): descriptor of the extended message.
-      number (int): Number of the extension field.
-
-    Returns:
-      FieldDescriptor: The descriptor for the extension.
-
-    Raises:
-      KeyError: when no extension with the given number is known for the
-        specified message.
-    """
-    try:
-      return self._extensions_by_number[message_descriptor][number]
-    except KeyError:
-      self._TryLoadExtensionFromDB(message_descriptor, number)
-      return self._extensions_by_number[message_descriptor][number]
-
-  def FindAllExtensions(self, message_descriptor):
-    """Gets all the known extensions of a given message.
-
-    Extensions have to be registered to this pool by build related
-    :func:`Add` or :func:`AddExtensionDescriptor`.
-
-    Args:
-      message_descriptor (Descriptor): Descriptor of the extended message.
-
-    Returns:
-      list[FieldDescriptor]: Field descriptors describing the extensions.
-    """
-    # Fallback to descriptor db if FindAllExtensionNumbers is provided.
-    if self._descriptor_db and hasattr(
-        self._descriptor_db, 'FindAllExtensionNumbers'):
-      full_name = message_descriptor.full_name
-      all_numbers = self._descriptor_db.FindAllExtensionNumbers(full_name)
-      for number in all_numbers:
-        if number in self._extensions_by_number[message_descriptor]:
-          continue
-        self._TryLoadExtensionFromDB(message_descriptor, number)
-
-    return list(self._extensions_by_number[message_descriptor].values())
-
-  def _TryLoadExtensionFromDB(self, message_descriptor, number):
-    """Try to Load extensions from descriptor db.
-
-    Args:
-      message_descriptor: descriptor of the extended message.
-      number: the extension number that needs to be loaded.
-    """
-    if not self._descriptor_db:
-      return
-    # Only supported when FindFileContainingExtension is provided.
-    if not hasattr(
-        self._descriptor_db, 'FindFileContainingExtension'):
-      return
-
-    full_name = message_descriptor.full_name
-    file_proto = self._descriptor_db.FindFileContainingExtension(
-        full_name, number)
-
-    if file_proto is None:
-      return
-
-    try:
-      self._ConvertFileProtoToFileDescriptor(file_proto)
-    except:
-      warn_msg = ('Unable to load proto file %s for extension number %d.' %
-                  (file_proto.name, number))
-      warnings.warn(warn_msg, RuntimeWarning)
-
-  def FindServiceByName(self, full_name):
-    """Loads the named service descriptor from the pool.
-
-    Args:
-      full_name (str): The full name of the service descriptor to load.
-
-    Returns:
-      ServiceDescriptor: The service descriptor for the named service.
-
-    Raises:
-      KeyError: if the service cannot be found in the pool.
-    """
-    full_name = _NormalizeFullyQualifiedName(full_name)
-    if full_name not in self._service_descriptors:
-      self._FindFileContainingSymbolInDb(full_name)
-    return self._service_descriptors[full_name]
-
-  def FindMethodByName(self, full_name):
-    """Loads the named service method descriptor from the pool.
-
-    Args:
-      full_name (str): The full name of the method descriptor to load.
-
-    Returns:
-      MethodDescriptor: The method descriptor for the service method.
-
-    Raises:
-      KeyError: if the method cannot be found in the pool.
-    """
-    full_name = _NormalizeFullyQualifiedName(full_name)
-    service_name, _, method_name = full_name.rpartition('.')
-    service_descriptor = self.FindServiceByName(service_name)
-    return service_descriptor.methods_by_name[method_name]
-
-  def _FindFileContainingSymbolInDb(self, symbol):
-    """Finds the file in descriptor DB containing the specified symbol.
-
-    Args:
-      symbol (str): The name of the symbol to search for.
-
-    Returns:
-      FileDescriptor: The file that contains the specified symbol.
-
-    Raises:
-      KeyError: if the file cannot be found in the descriptor database.
-    """
-    try:
-      file_proto = self._internal_db.FindFileContainingSymbol(symbol)
-    except KeyError as error:
-      if self._descriptor_db:
-        file_proto = self._descriptor_db.FindFileContainingSymbol(symbol)
-      else:
-        raise error
-    if not file_proto:
-      raise KeyError('Cannot find a file containing %s' % symbol)
-    return self._ConvertFileProtoToFileDescriptor(file_proto)
-
-  def _ConvertFileProtoToFileDescriptor(self, file_proto):
-    """Creates a FileDescriptor from a proto or returns a cached copy.
-
-    This method also has the side effect of loading all the symbols found in
-    the file into the appropriate dictionaries in the pool.
-
-    Args:
-      file_proto: The proto to convert.
-
-    Returns:
-      A FileDescriptor matching the passed in proto.
-    """
-    if file_proto.name not in self._file_descriptors:
-      built_deps = list(self._GetDeps(file_proto.dependency))
-      direct_deps = [self.FindFileByName(n) for n in file_proto.dependency]
-      public_deps = [direct_deps[i] for i in file_proto.public_dependency]
-
-      file_descriptor = descriptor.FileDescriptor(
-          pool=self,
-          name=file_proto.name,
-          package=file_proto.package,
-          syntax=file_proto.syntax,
-          options=_OptionsOrNone(file_proto),
-          serialized_pb=file_proto.SerializeToString(),
-          dependencies=direct_deps,
-          public_dependencies=public_deps,
-          # pylint: disable=protected-access
-          create_key=descriptor._internal_create_key)
-      scope = {}
-
-      # This loop extracts all the message and enum types from all the
-      # dependencies of the file_proto. This is necessary to create the
-      # scope of available message types when defining the passed in
-      # file proto.
-      for dependency in built_deps:
-        scope.update(self._ExtractSymbols(
-            dependency.message_types_by_name.values()))
-        scope.update((_PrefixWithDot(enum.full_name), enum)
-                     for enum in dependency.enum_types_by_name.values())
-
-      for message_type in file_proto.message_type:
-        message_desc = self._ConvertMessageDescriptor(
-            message_type, file_proto.package, file_descriptor, scope,
-            file_proto.syntax)
-        file_descriptor.message_types_by_name[message_desc.name] = (
-            message_desc)
-
-      for enum_type in file_proto.enum_type:
-        file_descriptor.enum_types_by_name[enum_type.name] = (
-            self._ConvertEnumDescriptor(enum_type, file_proto.package,
-                                        file_descriptor, None, scope, True))
-
-      for index, extension_proto in enumerate(file_proto.extension):
-        extension_desc = self._MakeFieldDescriptor(
-            extension_proto, file_proto.package, index, file_descriptor,
-            is_extension=True)
-        extension_desc.containing_type = self._GetTypeFromScope(
-            file_descriptor.package, extension_proto.extendee, scope)
-        self._SetFieldType(extension_proto, extension_desc,
-                           file_descriptor.package, scope)
-        file_descriptor.extensions_by_name[extension_desc.name] = (
-            extension_desc)
-        self._file_desc_by_toplevel_extension[extension_desc.full_name] = (
-            file_descriptor)
-
-      for desc_proto in file_proto.message_type:
-        self._SetAllFieldTypes(file_proto.package, desc_proto, scope)
-
-      if file_proto.package:
-        desc_proto_prefix = _PrefixWithDot(file_proto.package)
-      else:
-        desc_proto_prefix = ''
-
-      for desc_proto in file_proto.message_type:
-        desc = self._GetTypeFromScope(
-            desc_proto_prefix, desc_proto.name, scope)
-        file_descriptor.message_types_by_name[desc_proto.name] = desc
-
-      for index, service_proto in enumerate(file_proto.service):
-        file_descriptor.services_by_name[service_proto.name] = (
-            self._MakeServiceDescriptor(service_proto, index, scope,
-                                        file_proto.package, file_descriptor))
-
-      self._file_descriptors[file_proto.name] = file_descriptor
-
-    # Add extensions to the pool
-    file_desc = self._file_descriptors[file_proto.name]
-    for extension in file_desc.extensions_by_name.values():
-      self._AddExtensionDescriptor(extension)
-    for message_type in file_desc.message_types_by_name.values():
-      for extension in message_type.extensions:
-        self._AddExtensionDescriptor(extension)
-
-    return file_desc
-
-  def _ConvertMessageDescriptor(self, desc_proto, package=None, file_desc=None,
-                                scope=None, syntax=None):
-    """Adds the proto to the pool in the specified package.
-
-    Args:
-      desc_proto: The descriptor_pb2.DescriptorProto protobuf message.
-      package: The package the proto should be located in.
-      file_desc: The file containing this message.
-      scope: Dict mapping short and full symbols to message and enum types.
-      syntax: string indicating syntax of the file ("proto2" or "proto3")
-
-    Returns:
-      The added descriptor.
-    """
-
-    if package:
-      desc_name = '.'.join((package, desc_proto.name))
-    else:
-      desc_name = desc_proto.name
-
-    if file_desc is None:
-      file_name = None
-    else:
-      file_name = file_desc.name
-
-    if scope is None:
-      scope = {}
-
-    nested = [
-        self._ConvertMessageDescriptor(
-            nested, desc_name, file_desc, scope, syntax)
-        for nested in desc_proto.nested_type]
-    enums = [
-        self._ConvertEnumDescriptor(enum, desc_name, file_desc, None,
-                                    scope, False)
-        for enum in desc_proto.enum_type]
-    fields = [self._MakeFieldDescriptor(field, desc_name, index, file_desc)
-              for index, field in enumerate(desc_proto.field)]
-    extensions = [
-        self._MakeFieldDescriptor(extension, desc_name, index, file_desc,
-                                  is_extension=True)
-        for index, extension in enumerate(desc_proto.extension)]
-    oneofs = [
-        # pylint: disable=g-complex-comprehension
-        descriptor.OneofDescriptor(
-            desc.name,
-            '.'.join((desc_name, desc.name)),
-            index,
-            None,
-            [],
-            _OptionsOrNone(desc),
-            # pylint: disable=protected-access
-            create_key=descriptor._internal_create_key)
-        for index, desc in enumerate(desc_proto.oneof_decl)
-    ]
-    extension_ranges = [(r.start, r.end) for r in desc_proto.extension_range]
-    if extension_ranges:
-      is_extendable = True
-    else:
-      is_extendable = False
-    desc = descriptor.Descriptor(
-        name=desc_proto.name,
-        full_name=desc_name,
-        filename=file_name,
-        containing_type=None,
-        fields=fields,
-        oneofs=oneofs,
-        nested_types=nested,
-        enum_types=enums,
-        extensions=extensions,
-        options=_OptionsOrNone(desc_proto),
-        is_extendable=is_extendable,
-        extension_ranges=extension_ranges,
-        file=file_desc,
-        serialized_start=None,
-        serialized_end=None,
-        syntax=syntax,
-        # pylint: disable=protected-access
-        create_key=descriptor._internal_create_key)
-    for nested in desc.nested_types:
-      nested.containing_type = desc
-    for enum in desc.enum_types:
-      enum.containing_type = desc
-    for field_index, field_desc in enumerate(desc_proto.field):
-      if field_desc.HasField('oneof_index'):
-        oneof_index = field_desc.oneof_index
-        oneofs[oneof_index].fields.append(fields[field_index])
-        fields[field_index].containing_oneof = oneofs[oneof_index]
-
-    scope[_PrefixWithDot(desc_name)] = desc
-    self._CheckConflictRegister(desc, desc.full_name, desc.file.name)
-    self._descriptors[desc_name] = desc
-    return desc
-
-  def _ConvertEnumDescriptor(self, enum_proto, package=None, file_desc=None,
-                             containing_type=None, scope=None, top_level=False):
-    """Make a protobuf EnumDescriptor given an EnumDescriptorProto protobuf.
-
-    Args:
-      enum_proto: The descriptor_pb2.EnumDescriptorProto protobuf message.
-      package: Optional package name for the new message EnumDescriptor.
-      file_desc: The file containing the enum descriptor.
-      containing_type: The type containing this enum.
-      scope: Scope containing available types.
-      top_level: If True, the enum is a top level symbol. If False, the enum
-          is defined inside a message.
-
-    Returns:
-      The added descriptor
-    """
-
-    if package:
-      enum_name = '.'.join((package, enum_proto.name))
-    else:
-      enum_name = enum_proto.name
-
-    if file_desc is None:
-      file_name = None
-    else:
-      file_name = file_desc.name
-
-    values = [self._MakeEnumValueDescriptor(value, index)
-              for index, value in enumerate(enum_proto.value)]
-    desc = descriptor.EnumDescriptor(name=enum_proto.name,
-                                     full_name=enum_name,
-                                     filename=file_name,
-                                     file=file_desc,
-                                     values=values,
-                                     containing_type=containing_type,
-                                     options=_OptionsOrNone(enum_proto),
-                                     # pylint: disable=protected-access
-                                     create_key=descriptor._internal_create_key)
-    scope['.%s' % enum_name] = desc
-    self._CheckConflictRegister(desc, desc.full_name, desc.file.name)
-    self._enum_descriptors[enum_name] = desc
-
-    # Add top level enum values.
-    if top_level:
-      for value in values:
-        full_name = _NormalizeFullyQualifiedName(
-            '.'.join((package, value.name)))
-        self._CheckConflictRegister(value, full_name, file_name)
-        self._top_enum_values[full_name] = value
-
-    return desc
-
-  def _MakeFieldDescriptor(self, field_proto, message_name, index,
-                           file_desc, is_extension=False):
-    """Creates a field descriptor from a FieldDescriptorProto.
-
-    For message and enum type fields, this method will do a look up
-    in the pool for the appropriate descriptor for that type. If it
-    is unavailable, it will fall back to the _source function to
-    create it. If this type is still unavailable, construction will
-    fail.
-
-    Args:
-      field_proto: The proto describing the field.
-      message_name: The name of the containing message.
-      index: Index of the field
-      file_desc: The file containing the field descriptor.
-      is_extension: Indication that this field is for an extension.
-
-    Returns:
-      An initialized FieldDescriptor object
-    """
-
-    if message_name:
-      full_name = '.'.join((message_name, field_proto.name))
-    else:
-      full_name = field_proto.name
-
-    if field_proto.json_name:
-      json_name = field_proto.json_name
-    else:
-      json_name = None
-
-    return descriptor.FieldDescriptor(
-        name=field_proto.name,
-        full_name=full_name,
-        index=index,
-        number=field_proto.number,
-        type=field_proto.type,
-        cpp_type=None,
-        message_type=None,
-        enum_type=None,
-        containing_type=None,
-        label=field_proto.label,
-        has_default_value=False,
-        default_value=None,
-        is_extension=is_extension,
-        extension_scope=None,
-        options=_OptionsOrNone(field_proto),
-        json_name=json_name,
-        file=file_desc,
-        # pylint: disable=protected-access
-        create_key=descriptor._internal_create_key)
-
-  def _SetAllFieldTypes(self, package, desc_proto, scope):
-    """Sets all the descriptor's fields's types.
-
-    This method also sets the containing types on any extensions.
-
-    Args:
-      package: The current package of desc_proto.
-      desc_proto: The message descriptor to update.
-      scope: Enclosing scope of available types.
-    """
-
-    package = _PrefixWithDot(package)
-
-    main_desc = self._GetTypeFromScope(package, desc_proto.name, scope)
-
-    if package == '.':
-      nested_package = _PrefixWithDot(desc_proto.name)
-    else:
-      nested_package = '.'.join([package, desc_proto.name])
-
-    for field_proto, field_desc in zip(desc_proto.field, main_desc.fields):
-      self._SetFieldType(field_proto, field_desc, nested_package, scope)
-
-    for extension_proto, extension_desc in (
-        zip(desc_proto.extension, main_desc.extensions)):
-      extension_desc.containing_type = self._GetTypeFromScope(
-          nested_package, extension_proto.extendee, scope)
-      self._SetFieldType(extension_proto, extension_desc, nested_package, scope)
-
-    for nested_type in desc_proto.nested_type:
-      self._SetAllFieldTypes(nested_package, nested_type, scope)
-
-  def _SetFieldType(self, field_proto, field_desc, package, scope):
-    """Sets the field's type, cpp_type, message_type and enum_type.
-
-    Args:
-      field_proto: Data about the field in proto format.
-      field_desc: The descriptor to modify.
-      package: The package the field's container is in.
-      scope: Enclosing scope of available types.
-    """
-    if field_proto.type_name:
-      desc = self._GetTypeFromScope(package, field_proto.type_name, scope)
-    else:
-      desc = None
-
-    if not field_proto.HasField('type'):
-      if isinstance(desc, descriptor.Descriptor):
-        field_proto.type = descriptor.FieldDescriptor.TYPE_MESSAGE
-      else:
-        field_proto.type = descriptor.FieldDescriptor.TYPE_ENUM
-
-    field_desc.cpp_type = descriptor.FieldDescriptor.ProtoTypeToCppProtoType(
-        field_proto.type)
-
-    if (field_proto.type == descriptor.FieldDescriptor.TYPE_MESSAGE
-        or field_proto.type == descriptor.FieldDescriptor.TYPE_GROUP):
-      field_desc.message_type = desc
-
-    if field_proto.type == descriptor.FieldDescriptor.TYPE_ENUM:
-      field_desc.enum_type = desc
-
-    if field_proto.label == descriptor.FieldDescriptor.LABEL_REPEATED:
-      field_desc.has_default_value = False
-      field_desc.default_value = []
-    elif field_proto.HasField('default_value'):
-      field_desc.has_default_value = True
-      if (field_proto.type == descriptor.FieldDescriptor.TYPE_DOUBLE or
-          field_proto.type == descriptor.FieldDescriptor.TYPE_FLOAT):
-        field_desc.default_value = float(field_proto.default_value)
-      elif field_proto.type == descriptor.FieldDescriptor.TYPE_STRING:
-        field_desc.default_value = field_proto.default_value
-      elif field_proto.type == descriptor.FieldDescriptor.TYPE_BOOL:
-        field_desc.default_value = field_proto.default_value.lower() == 'true'
-      elif field_proto.type == descriptor.FieldDescriptor.TYPE_ENUM:
-        field_desc.default_value = field_desc.enum_type.values_by_name[
-            field_proto.default_value].number
-      elif field_proto.type == descriptor.FieldDescriptor.TYPE_BYTES:
-        field_desc.default_value = text_encoding.CUnescape(
-            field_proto.default_value)
-      elif field_proto.type == descriptor.FieldDescriptor.TYPE_MESSAGE:
-        field_desc.default_value = None
-      else:
-        # All other types are of the "int" type.
-        field_desc.default_value = int(field_proto.default_value)
-    else:
-      field_desc.has_default_value = False
-      if (field_proto.type == descriptor.FieldDescriptor.TYPE_DOUBLE or
-          field_proto.type == descriptor.FieldDescriptor.TYPE_FLOAT):
-        field_desc.default_value = 0.0
-      elif field_proto.type == descriptor.FieldDescriptor.TYPE_STRING:
-        field_desc.default_value = u''
-      elif field_proto.type == descriptor.FieldDescriptor.TYPE_BOOL:
-        field_desc.default_value = False
-      elif field_proto.type == descriptor.FieldDescriptor.TYPE_ENUM:
-        field_desc.default_value = field_desc.enum_type.values[0].number
-      elif field_proto.type == descriptor.FieldDescriptor.TYPE_BYTES:
-        field_desc.default_value = b''
-      elif field_proto.type == descriptor.FieldDescriptor.TYPE_MESSAGE:
-        field_desc.default_value = None
-      elif field_proto.type == descriptor.FieldDescriptor.TYPE_GROUP:
-        field_desc.default_value = None
-      else:
-        # All other types are of the "int" type.
-        field_desc.default_value = 0
-
-    field_desc.type = field_proto.type
-
-  def _MakeEnumValueDescriptor(self, value_proto, index):
-    """Creates a enum value descriptor object from a enum value proto.
-
-    Args:
-      value_proto: The proto describing the enum value.
-      index: The index of the enum value.
-
-    Returns:
-      An initialized EnumValueDescriptor object.
-    """
-
-    return descriptor.EnumValueDescriptor(
-        name=value_proto.name,
-        index=index,
-        number=value_proto.number,
-        options=_OptionsOrNone(value_proto),
-        type=None,
-        # pylint: disable=protected-access
-        create_key=descriptor._internal_create_key)
-
-  def _MakeServiceDescriptor(self, service_proto, service_index, scope,
-                             package, file_desc):
-    """Make a protobuf ServiceDescriptor given a ServiceDescriptorProto.
-
-    Args:
-      service_proto: The descriptor_pb2.ServiceDescriptorProto protobuf message.
-      service_index: The index of the service in the File.
-      scope: Dict mapping short and full symbols to message and enum types.
-      package: Optional package name for the new message EnumDescriptor.
-      file_desc: The file containing the service descriptor.
-
-    Returns:
-      The added descriptor.
-    """
-
-    if package:
-      service_name = '.'.join((package, service_proto.name))
-    else:
-      service_name = service_proto.name
-
-    methods = [self._MakeMethodDescriptor(method_proto, service_name, package,
-                                          scope, index)
-               for index, method_proto in enumerate(service_proto.method)]
-    desc = descriptor.ServiceDescriptor(
-        name=service_proto.name,
-        full_name=service_name,
-        index=service_index,
-        methods=methods,
-        options=_OptionsOrNone(service_proto),
-        file=file_desc,
-        # pylint: disable=protected-access
-        create_key=descriptor._internal_create_key)
-    self._CheckConflictRegister(desc, desc.full_name, desc.file.name)
-    self._service_descriptors[service_name] = desc
-    return desc
-
-  def _MakeMethodDescriptor(self, method_proto, service_name, package, scope,
-                            index):
-    """Creates a method descriptor from a MethodDescriptorProto.
-
-    Args:
-      method_proto: The proto describing the method.
-      service_name: The name of the containing service.
-      package: Optional package name to look up for types.
-      scope: Scope containing available types.
-      index: Index of the method in the service.
-
-    Returns:
-      An initialized MethodDescriptor object.
-    """
-    full_name = '.'.join((service_name, method_proto.name))
-    input_type = self._GetTypeFromScope(
-        package, method_proto.input_type, scope)
-    output_type = self._GetTypeFromScope(
-        package, method_proto.output_type, scope)
-    return descriptor.MethodDescriptor(
-        name=method_proto.name,
-        full_name=full_name,
-        index=index,
-        containing_service=None,
-        input_type=input_type,
-        output_type=output_type,
-        client_streaming=method_proto.client_streaming,
-        server_streaming=method_proto.server_streaming,
-        options=_OptionsOrNone(method_proto),
-        # pylint: disable=protected-access
-        create_key=descriptor._internal_create_key)
-
-  def _ExtractSymbols(self, descriptors):
-    """Pulls out all the symbols from descriptor protos.
-
-    Args:
-      descriptors: The messages to extract descriptors from.
-    Yields:
-      A two element tuple of the type name and descriptor object.
-    """
-
-    for desc in descriptors:
-      yield (_PrefixWithDot(desc.full_name), desc)
-      for symbol in self._ExtractSymbols(desc.nested_types):
-        yield symbol
-      for enum in desc.enum_types:
-        yield (_PrefixWithDot(enum.full_name), enum)
-
-  def _GetDeps(self, dependencies, visited=None):
-    """Recursively finds dependencies for file protos.
-
-    Args:
-      dependencies: The names of the files being depended on.
-      visited: The names of files already found.
-
-    Yields:
-      Each direct and indirect dependency.
-    """
-
-    visited = visited or set()
-    for dependency in dependencies:
-      if dependency not in visited:
-        visited.add(dependency)
-        dep_desc = self.FindFileByName(dependency)
-        yield dep_desc
-        public_files = [d.name for d in dep_desc.public_dependencies]
-        yield from self._GetDeps(public_files, visited)
-
-  def _GetTypeFromScope(self, package, type_name, scope):
-    """Finds a given type name in the current scope.
-
-    Args:
-      package: The package the proto should be located in.
-      type_name: The name of the type to be found in the scope.
-      scope: Dict mapping short and full symbols to message and enum types.
-
-    Returns:
-      The descriptor for the requested type.
-    """
-    if type_name not in scope:
-      components = _PrefixWithDot(package).split('.')
-      while components:
-        possible_match = '.'.join(components + [type_name])
-        if possible_match in scope:
-          type_name = possible_match
-          break
-        else:
-          components.pop(-1)
-    return scope[type_name]
-
-
-def _PrefixWithDot(name):
-  return name if name.startswith('.') else '.%s' % name
-
-
-if _USE_C_DESCRIPTORS:
-  # TODO(amauryfa): This pool could be constructed from Python code, when we
-  # support a flag like 'use_cpp_generated_pool=True'.
-  # pylint: disable=protected-access
-  _DEFAULT = descriptor._message.default_pool
-else:
-  _DEFAULT = DescriptorPool()
-
-
-def Default():
-  return _DEFAULT
diff --git a/libs/protobuf/python/google/protobuf/internal/__init__.py b/libs/protobuf/python/google/protobuf/internal/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/libs/protobuf/python/google/protobuf/internal/_parameterized.py b/libs/protobuf/python/google/protobuf/internal/_parameterized.py
deleted file mode 100755
index afdbb78..0000000
--- a/libs/protobuf/python/google/protobuf/internal/_parameterized.py
+++ /dev/null
@@ -1,443 +0,0 @@
-#! /usr/bin/env python
-#
-# Protocol Buffers - Google's data interchange format
-# Copyright 2008 Google Inc.  All rights reserved.
-# https://developers.google.com/protocol-buffers/
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-"""Adds support for parameterized tests to Python's unittest TestCase class.
-
-A parameterized test is a method in a test case that is invoked with different
-argument tuples.
-
-A simple example:
-
-  class AdditionExample(parameterized.TestCase):
-    @parameterized.parameters(
-       (1, 2, 3),
-       (4, 5, 9),
-       (1, 1, 3))
-    def testAddition(self, op1, op2, result):
-      self.assertEqual(result, op1 + op2)
-
-
-Each invocation is a separate test case and properly isolated just
-like a normal test method, with its own setUp/tearDown cycle. In the
-example above, there are three separate testcases, one of which will
-fail due to an assertion error (1 + 1 != 3).
-
-Parameters for individual test cases can be tuples (with positional parameters)
-or dictionaries (with named parameters):
-
-  class AdditionExample(parameterized.TestCase):
-    @parameterized.parameters(
-       {'op1': 1, 'op2': 2, 'result': 3},
-       {'op1': 4, 'op2': 5, 'result': 9},
-    )
-    def testAddition(self, op1, op2, result):
-      self.assertEqual(result, op1 + op2)
-
-If a parameterized test fails, the error message will show the
-original test name (which is modified internally) and the arguments
-for the specific invocation, which are part of the string returned by
-the shortDescription() method on test cases.
-
-The id method of the test, used internally by the unittest framework,
-is also modified to show the arguments. To make sure that test names
-stay the same across several invocations, object representations like
-
-  >>> class Foo(object):
-  ...  pass
-  >>> repr(Foo())
-  '<__main__.Foo object at 0x23d8610>'
-
-are turned into '<__main__.Foo>'. For even more descriptive names,
-especially in test logs, you can use the named_parameters decorator. In
-this case, only tuples are supported, and the first parameters has to
-be a string (or an object that returns an apt name when converted via
-str()):
-
-  class NamedExample(parameterized.TestCase):
-    @parameterized.named_parameters(
-       ('Normal', 'aa', 'aaa', True),
-       ('EmptyPrefix', '', 'abc', True),
-       ('BothEmpty', '', '', True))
-    def testStartsWith(self, prefix, string, result):
-      self.assertEqual(result, strings.startswith(prefix))
-
-Named tests also have the benefit that they can be run individually
-from the command line:
-
-  $ testmodule.py NamedExample.testStartsWithNormal
-  .
-  --------------------------------------------------------------------
-  Ran 1 test in 0.000s
-
-  OK
-
-Parameterized Classes
-=====================
-If invocation arguments are shared across test methods in a single
-TestCase class, instead of decorating all test methods
-individually, the class itself can be decorated:
-
-  @parameterized.parameters(
-    (1, 2, 3)
-    (4, 5, 9))
-  class ArithmeticTest(parameterized.TestCase):
-    def testAdd(self, arg1, arg2, result):
-      self.assertEqual(arg1 + arg2, result)
-
-    def testSubtract(self, arg2, arg2, result):
-      self.assertEqual(result - arg1, arg2)
-
-Inputs from Iterables
-=====================
-If parameters should be shared across several test cases, or are dynamically
-created from other sources, a single non-tuple iterable can be passed into
-the decorator. This iterable will be used to obtain the test cases:
-
-  class AdditionExample(parameterized.TestCase):
-    @parameterized.parameters(
-      c.op1, c.op2, c.result for c in testcases
-    )
-    def testAddition(self, op1, op2, result):
-      self.assertEqual(result, op1 + op2)
-
-
-Single-Argument Test Methods
-============================
-If a test method takes only one argument, the single argument does not need to
-be wrapped into a tuple:
-
-  class NegativeNumberExample(parameterized.TestCase):
-    @parameterized.parameters(
-       -1, -3, -4, -5
-    )
-    def testIsNegative(self, arg):
-      self.assertTrue(IsNegative(arg))
-"""
-
-__author__ = 'tmarek@google.com (Torsten Marek)'
-
-import functools
-import re
-import types
-import unittest
-import uuid
-
-try:
-  # Since python 3
-  import collections.abc as collections_abc
-except ImportError:
-  # Won't work after python 3.8
-  import collections as collections_abc
-
-ADDR_RE = re.compile(r'\<([a-zA-Z0-9_\-\.]+) object at 0x[a-fA-F0-9]+\>')
-_SEPARATOR = uuid.uuid1().hex
-_FIRST_ARG = object()
-_ARGUMENT_REPR = object()
-
-
-def _CleanRepr(obj):
-  return ADDR_RE.sub(r'<\1>', repr(obj))
-
-
-# Helper function formerly from the unittest module, removed from it in
-# Python 2.7.
-def _StrClass(cls):
-  return '%s.%s' % (cls.__module__, cls.__name__)
-
-
-def _NonStringIterable(obj):
-  return (isinstance(obj, collections_abc.Iterable) and
-          not isinstance(obj, str))
-
-
-def _FormatParameterList(testcase_params):
-  if isinstance(testcase_params, collections_abc.Mapping):
-    return ', '.join('%s=%s' % (argname, _CleanRepr(value))
-                     for argname, value in testcase_params.items())
-  elif _NonStringIterable(testcase_params):
-    return ', '.join(map(_CleanRepr, testcase_params))
-  else:
-    return _FormatParameterList((testcase_params,))
-
-
-class _ParameterizedTestIter(object):
-  """Callable and iterable class for producing new test cases."""
-
-  def __init__(self, test_method, testcases, naming_type):
-    """Returns concrete test functions for a test and a list of parameters.
-
-    The naming_type is used to determine the name of the concrete
-    functions as reported by the unittest framework. If naming_type is
-    _FIRST_ARG, the testcases must be tuples, and the first element must
-    have a string representation that is a valid Python identifier.
-
-    Args:
-      test_method: The decorated test method.
-      testcases: (list of tuple/dict) A list of parameter
-                 tuples/dicts for individual test invocations.
-      naming_type: The test naming type, either _NAMED or _ARGUMENT_REPR.
-    """
-    self._test_method = test_method
-    self.testcases = testcases
-    self._naming_type = naming_type
-
-  def __call__(self, *args, **kwargs):
-    raise RuntimeError('You appear to be running a parameterized test case '
-                       'without having inherited from parameterized.'
-                       'TestCase. This is bad because none of '
-                       'your test cases are actually being run.')
-
-  def __iter__(self):
-    test_method = self._test_method
-    naming_type = self._naming_type
-
-    def MakeBoundParamTest(testcase_params):
-      @functools.wraps(test_method)
-      def BoundParamTest(self):
-        if isinstance(testcase_params, collections_abc.Mapping):
-          test_method(self, **testcase_params)
-        elif _NonStringIterable(testcase_params):
-          test_method(self, *testcase_params)
-        else:
-          test_method(self, testcase_params)
-
-      if naming_type is _FIRST_ARG:
-        # Signal the metaclass that the name of the test function is unique
-        # and descriptive.
-        BoundParamTest.__x_use_name__ = True
-        BoundParamTest.__name__ += str(testcase_params[0])
-        testcase_params = testcase_params[1:]
-      elif naming_type is _ARGUMENT_REPR:
-        # __x_extra_id__ is used to pass naming information to the __new__
-        # method of TestGeneratorMetaclass.
-        # The metaclass will make sure to create a unique, but nondescriptive
-        # name for this test.
-        BoundParamTest.__x_extra_id__ = '(%s)' % (
-            _FormatParameterList(testcase_params),)
-      else:
-        raise RuntimeError('%s is not a valid naming type.' % (naming_type,))
-
-      BoundParamTest.__doc__ = '%s(%s)' % (
-          BoundParamTest.__name__, _FormatParameterList(testcase_params))
-      if test_method.__doc__:
-        BoundParamTest.__doc__ += '\n%s' % (test_method.__doc__,)
-      return BoundParamTest
-    return (MakeBoundParamTest(c) for c in self.testcases)
-
-
-def _IsSingletonList(testcases):
-  """True iff testcases contains only a single non-tuple element."""
-  return len(testcases) == 1 and not isinstance(testcases[0], tuple)
-
-
-def _ModifyClass(class_object, testcases, naming_type):
-  assert not getattr(class_object, '_id_suffix', None), (
-      'Cannot add parameters to %s,'
-      ' which already has parameterized methods.' % (class_object,))
-  class_object._id_suffix = id_suffix = {}
-  # We change the size of __dict__ while we iterate over it,
-  # which Python 3.x will complain about, so use copy().
-  for name, obj in class_object.__dict__.copy().items():
-    if (name.startswith(unittest.TestLoader.testMethodPrefix)
-        and isinstance(obj, types.FunctionType)):
-      delattr(class_object, name)
-      methods = {}
-      _UpdateClassDictForParamTestCase(
-          methods, id_suffix, name,
-          _ParameterizedTestIter(obj, testcases, naming_type))
-      for name, meth in methods.items():
-        setattr(class_object, name, meth)
-
-
-def _ParameterDecorator(naming_type, testcases):
-  """Implementation of the parameterization decorators.
-
-  Args:
-    naming_type: The naming type.
-    testcases: Testcase parameters.
-
-  Returns:
-    A function for modifying the decorated object.
-  """
-  def _Apply(obj):
-    if isinstance(obj, type):
-      _ModifyClass(
-          obj,
-          list(testcases) if not isinstance(testcases, collections_abc.Sequence)
-          else testcases,
-          naming_type)
-      return obj
-    else:
-      return _ParameterizedTestIter(obj, testcases, naming_type)
-
-  if _IsSingletonList(testcases):
-    assert _NonStringIterable(testcases[0]), (
-        'Single parameter argument must be a non-string iterable')
-    testcases = testcases[0]
-
-  return _Apply
-
-
-def parameters(*testcases):  # pylint: disable=invalid-name
-  """A decorator for creating parameterized tests.
-
-  See the module docstring for a usage example.
-  Args:
-    *testcases: Parameters for the decorated method, either a single
-                iterable, or a list of tuples/dicts/objects (for tests
-                with only one argument).
-
-  Returns:
-     A test generator to be handled by TestGeneratorMetaclass.
-  """
-  return _ParameterDecorator(_ARGUMENT_REPR, testcases)
-
-
-def named_parameters(*testcases):  # pylint: disable=invalid-name
-  """A decorator for creating parameterized tests.
-
-  See the module docstring for a usage example. The first element of
-  each parameter tuple should be a string and will be appended to the
-  name of the test method.
-
-  Args:
-    *testcases: Parameters for the decorated method, either a single
-                iterable, or a list of tuples.
-
-  Returns:
-     A test generator to be handled by TestGeneratorMetaclass.
-  """
-  return _ParameterDecorator(_FIRST_ARG, testcases)
-
-
-class TestGeneratorMetaclass(type):
-  """Metaclass for test cases with test generators.
-
-  A test generator is an iterable in a testcase that produces callables. These
-  callables must be single-argument methods. These methods are injected into
-  the class namespace and the original iterable is removed. If the name of the
-  iterable conforms to the test pattern, the injected methods will be picked
-  up as tests by the unittest framework.
-
-  In general, it is supposed to be used in conjunction with the
-  parameters decorator.
-  """
-
-  def __new__(mcs, class_name, bases, dct):
-    dct['_id_suffix'] = id_suffix = {}
-    for name, obj in dct.copy().items():
-      if (name.startswith(unittest.TestLoader.testMethodPrefix) and
-          _NonStringIterable(obj)):
-        iterator = iter(obj)
-        dct.pop(name)
-        _UpdateClassDictForParamTestCase(dct, id_suffix, name, iterator)
-
-    return type.__new__(mcs, class_name, bases, dct)
-
-
-def _UpdateClassDictForParamTestCase(dct, id_suffix, name, iterator):
-  """Adds individual test cases to a dictionary.
-
-  Args:
-    dct: The target dictionary.
-    id_suffix: The dictionary for mapping names to test IDs.
-    name: The original name of the test case.
-    iterator: The iterator generating the individual test cases.
-  """
-  for idx, func in enumerate(iterator):
-    assert callable(func), 'Test generators must yield callables, got %r' % (
-        func,)
-    if getattr(func, '__x_use_name__', False):
-      new_name = func.__name__
-    else:
-      new_name = '%s%s%d' % (name, _SEPARATOR, idx)
-    assert new_name not in dct, (
-        'Name of parameterized test case "%s" not unique' % (new_name,))
-    dct[new_name] = func
-    id_suffix[new_name] = getattr(func, '__x_extra_id__', '')
-
-
-class TestCase(unittest.TestCase, metaclass=TestGeneratorMetaclass):
-  """Base class for test cases using the parameters decorator."""
-
-  def _OriginalName(self):
-    return self._testMethodName.split(_SEPARATOR)[0]
-
-  def __str__(self):
-    return '%s (%s)' % (self._OriginalName(), _StrClass(self.__class__))
-
-  def id(self):  # pylint: disable=invalid-name
-    """Returns the descriptive ID of the test.
-
-    This is used internally by the unittesting framework to get a name
-    for the test to be used in reports.
-
-    Returns:
-      The test id.
-    """
-    return '%s.%s%s' % (_StrClass(self.__class__),
-                        self._OriginalName(),
-                        self._id_suffix.get(self._testMethodName, ''))
-
-
-def CoopTestCase(other_base_class):
-  """Returns a new base class with a cooperative metaclass base.
-
-  This enables the TestCase to be used in combination
-  with other base classes that have custom metaclasses, such as
-  mox.MoxTestBase.
-
-  Only works with metaclasses that do not override type.__new__.
-
-  Example:
-
-    import google3
-    import mox
-
-    from google3.testing.pybase import parameterized
-
-    class ExampleTest(parameterized.CoopTestCase(mox.MoxTestBase)):
-      ...
-
-  Args:
-    other_base_class: (class) A test case base class.
-
-  Returns:
-    A new class object.
-  """
-  metaclass = type(
-      'CoopMetaclass',
-      (other_base_class.__metaclass__,
-       TestGeneratorMetaclass), {})
-  return metaclass(
-      'CoopTestCase',
-      (other_base_class, TestCase), {})
diff --git a/libs/protobuf/python/google/protobuf/internal/any_test.proto b/libs/protobuf/python/google/protobuf/internal/any_test.proto
deleted file mode 100644
index 1a563fd..0000000
--- a/libs/protobuf/python/google/protobuf/internal/any_test.proto
+++ /dev/null
@@ -1,51 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: jieluo@google.com (Jie Luo)
-
-syntax = "proto2";
-
-package google.protobuf.internal;
-
-import "google/protobuf/any.proto";
-
-message TestAny {
-  optional google.protobuf.Any value = 1;
-  optional int32 int_value = 2;
-  map<string,int32> map_value = 3;
-  extensions 10 to max;
-}
-
-message TestAnyExtension1 {
-  extend TestAny {
-    optional TestAnyExtension1 extension1 = 98418603;
-  }
-  optional int32 i = 15;
-}
diff --git a/libs/protobuf/python/google/protobuf/internal/api_implementation.cc b/libs/protobuf/python/google/protobuf/internal/api_implementation.cc
deleted file mode 100644
index 33f5b04..0000000
--- a/libs/protobuf/python/google/protobuf/internal/api_implementation.cc
+++ /dev/null
@@ -1,111 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#define PY_SSIZE_T_CLEAN
-#include <Python.h>
-
-namespace google {
-namespace protobuf {
-namespace python {
-
-// Version constant.
-// This is either 0 for python, 1 for CPP V1, 2 for CPP V2.
-//
-// 0 is default and is equivalent to
-//   PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=python
-//
-// 1 is set with -DPYTHON_PROTO2_CPP_IMPL_V1 and is equivalent to
-//   PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=cpp
-// and
-//   PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION_VERSION=1
-//
-// 2 is set with -DPYTHON_PROTO2_CPP_IMPL_V2 and is equivalent to
-//   PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=cpp
-// and
-//   PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION_VERSION=2
-#ifdef PYTHON_PROTO2_CPP_IMPL_V1
-#error "PYTHON_PROTO2_CPP_IMPL_V1 is no longer supported."
-#else
-#ifdef PYTHON_PROTO2_CPP_IMPL_V2
-static int kImplVersion = 2;
-#else
-#ifdef PYTHON_PROTO2_PYTHON_IMPL
-static int kImplVersion = 0;
-#else
-
-static int kImplVersion = -1;  // -1 means "Unspecified by compiler flags".
-
-#endif  // PYTHON_PROTO2_PYTHON_IMPL
-#endif  // PYTHON_PROTO2_CPP_IMPL_V2
-#endif  // PYTHON_PROTO2_CPP_IMPL_V1
-
-static const char* kImplVersionName = "api_version";
-
-static const char* kModuleName = "_api_implementation";
-static const char kModuleDocstring[] =
-    "_api_implementation is a module that exposes compile-time constants that\n"
-    "determine the default API implementation to use for Python proto2.\n"
-    "\n"
-    "It complements api_implementation.py by setting defaults using "
-    "compile-time\n"
-    "constants defined in C, such that one can set defaults at compilation\n"
-    "(e.g. with blaze flag --copt=-DPYTHON_PROTO2_CPP_IMPL_V2).";
-
-static struct PyModuleDef _module = {PyModuleDef_HEAD_INIT,
-                                     kModuleName,
-                                     kModuleDocstring,
-                                     -1,
-                                     nullptr,
-                                     nullptr,
-                                     nullptr,
-                                     nullptr,
-                                     nullptr};
-
-extern "C" {
-PyMODINIT_FUNC PyInit__api_implementation() {
-  PyObject* module = PyModule_Create(&_module);
-  if (module == nullptr) {
-    return nullptr;
-  }
-
-  // Adds the module variable "api_version".
-  if (PyModule_AddIntConstant(module, const_cast<char*>(kImplVersionName),
-                              kImplVersion)) {
-    Py_DECREF(module);
-    return nullptr;
-  }
-
-  return module;
-}
-}
-
-}  // namespace python
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/python/google/protobuf/internal/api_implementation.py b/libs/protobuf/python/google/protobuf/internal/api_implementation.py
deleted file mode 100644
index 7458648..0000000
--- a/libs/protobuf/python/google/protobuf/internal/api_implementation.py
+++ /dev/null
@@ -1,168 +0,0 @@
-# Protocol Buffers - Google's data interchange format
-# Copyright 2008 Google Inc.  All rights reserved.
-# https://developers.google.com/protocol-buffers/
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-"""Determine which implementation of the protobuf API is used in this process.
-"""
-
-import importlib
-import os
-import sys
-import warnings
-
-
-def _ApiVersionToImplementationType(api_version):
-  if api_version == 2:
-    return 'cpp'
-  if api_version == 1:
-    raise ValueError('api_version=1 is no longer supported.')
-  if api_version == 0:
-    return 'python'
-  return None
-
-
-_implementation_type = None
-try:
-  # pylint: disable=g-import-not-at-top
-  from google.protobuf.internal import _api_implementation
-  # The compile-time constants in the _api_implementation module can be used to
-  # switch to a certain implementation of the Python API at build time.
-  _implementation_type = _ApiVersionToImplementationType(
-      _api_implementation.api_version)
-except ImportError:
-  pass  # Unspecified by compiler flags.
-
-
-def _CanImport(mod_name):
-  try:
-    mod = importlib.import_module(mod_name)
-    # Work around a known issue in the classic bootstrap .par import hook.
-    if not mod:
-      raise ImportError(mod_name + ' import succeeded but was None')
-    return True
-  except ImportError:
-    return False
-
-
-if _implementation_type is None:
-  if _CanImport('google._upb._message'):
-    _implementation_type = 'upb'
-  elif _CanImport('google.protobuf.pyext._message'):
-    _implementation_type = 'cpp'
-  else:
-    _implementation_type = 'python'
-
-
-# This environment variable can be used to switch to a certain implementation
-# of the Python API, overriding the compile-time constants in the
-# _api_implementation module. Right now only 'python', 'cpp' and 'upb' are
-# valid values. Any other value will raise error.
-_implementation_type = os.getenv('PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION',
-                                 _implementation_type)
-
-if _implementation_type not in ('python', 'cpp', 'upb'):
-  raise ValueError('PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION {0} is not '
-                   'supported. Please set to \'python\', \'cpp\' or '
-                   '\'upb\'.'.format(_implementation_type))
-
-if 'PyPy' in sys.version and _implementation_type == 'cpp':
-  warnings.warn('PyPy does not work yet with cpp protocol buffers. '
-                'Falling back to the python implementation.')
-  _implementation_type = 'python'
-
-_c_module = None
-
-if _implementation_type == 'cpp':
-  try:
-    # pylint: disable=g-import-not-at-top
-    from google.protobuf.pyext import _message
-    _c_module = _message
-    del _message
-  except ImportError:
-    # TODO(jieluo): fail back to python
-    warnings.warn(
-        'Selected implementation cpp is not available.')
-    pass
-
-if _implementation_type == 'upb':
-  try:
-    # pylint: disable=g-import-not-at-top
-    from google._upb import _message
-    _c_module = _message
-    del _message
-  except ImportError:
-    warnings.warn('Selected implementation upb is not available. '
-                  'Falling back to the python implementation.')
-    _implementation_type = 'python'
-    pass
-
-# Detect if serialization should be deterministic by default
-try:
-  # The presence of this module in a build allows the proto implementation to
-  # be upgraded merely via build deps.
-  #
-  # NOTE: Merely importing this automatically enables deterministic proto
-  # serialization for C++ code, but we still need to export it as a boolean so
-  # that we can do the same for `_implementation_type == 'python'`.
-  #
-  # NOTE2: It is possible for C++ code to enable deterministic serialization by
-  # default _without_ affecting Python code, if the C++ implementation is not in
-  # use by this module.  That is intended behavior, so we don't actually expose
-  # this boolean outside of this module.
-  #
-  # pylint: disable=g-import-not-at-top,unused-import
-  from google.protobuf import enable_deterministic_proto_serialization
-  _python_deterministic_proto_serialization = True
-except ImportError:
-  _python_deterministic_proto_serialization = False
-
-
-# Usage of this function is discouraged. Clients shouldn't care which
-# implementation of the API is in use. Note that there is no guarantee
-# that differences between APIs will be maintained.
-# Please don't use this function if possible.
-def Type():
-  return _implementation_type
-
-
-def _SetType(implementation_type):
-  """Never use! Only for protobuf benchmark."""
-  global _implementation_type
-  _implementation_type = implementation_type
-
-
-# See comment on 'Type' above.
-# TODO(jieluo): Remove the API, it returns a constant. b/228102101
-def Version():
-  return 2
-
-
-# For internal use only
-def IsPythonDefaultSerializationDeterministic():
-  return _python_deterministic_proto_serialization
diff --git a/libs/protobuf/python/google/protobuf/internal/builder.py b/libs/protobuf/python/google/protobuf/internal/builder.py
deleted file mode 100644
index 64353ee..0000000
--- a/libs/protobuf/python/google/protobuf/internal/builder.py
+++ /dev/null
@@ -1,130 +0,0 @@
-# Protocol Buffers - Google's data interchange format
-# Copyright 2008 Google Inc.  All rights reserved.
-# https://developers.google.com/protocol-buffers/
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-"""Builds descriptors, message classes and services for generated _pb2.py.
-
-This file is only called in python generated _pb2.py files. It builds
-descriptors, message classes and services that users can directly use
-in generated code.
-"""
-
-__author__ = 'jieluo@google.com (Jie Luo)'
-
-from google.protobuf.internal import enum_type_wrapper
-from google.protobuf import message as _message
-from google.protobuf import reflection as _reflection
-from google.protobuf import symbol_database as _symbol_database
-
-_sym_db = _symbol_database.Default()
-
-
-def BuildMessageAndEnumDescriptors(file_des, module):
-  """Builds message and enum descriptors.
-
-  Args:
-    file_des: FileDescriptor of the .proto file
-    module: Generated _pb2 module
-  """
-
-  def BuildNestedDescriptors(msg_des, prefix):
-    for (name, nested_msg) in msg_des.nested_types_by_name.items():
-      module_name = prefix + name.upper()
-      module[module_name] = nested_msg
-      BuildNestedDescriptors(nested_msg, module_name + '_')
-    for enum_des in msg_des.enum_types:
-      module[prefix + enum_des.name.upper()] = enum_des
-
-  for (name, msg_des) in file_des.message_types_by_name.items():
-    module_name = '_' + name.upper()
-    module[module_name] = msg_des
-    BuildNestedDescriptors(msg_des, module_name + '_')
-
-
-def BuildTopDescriptorsAndMessages(file_des, module_name, module):
-  """Builds top level descriptors and message classes.
-
-  Args:
-    file_des: FileDescriptor of the .proto file
-    module_name: str, the name of generated _pb2 module
-    module: Generated _pb2 module
-  """
-
-  def BuildMessage(msg_des):
-    create_dict = {}
-    for (name, nested_msg) in msg_des.nested_types_by_name.items():
-      create_dict[name] = BuildMessage(nested_msg)
-    create_dict['DESCRIPTOR'] = msg_des
-    create_dict['__module__'] = module_name
-    message_class = _reflection.GeneratedProtocolMessageType(
-        msg_des.name, (_message.Message,), create_dict)
-    _sym_db.RegisterMessage(message_class)
-    return message_class
-
-  # top level enums
-  for (name, enum_des) in file_des.enum_types_by_name.items():
-    module['_' + name.upper()] = enum_des
-    module[name] = enum_type_wrapper.EnumTypeWrapper(enum_des)
-    for enum_value in enum_des.values:
-      module[enum_value.name] = enum_value.number
-
-  # top level extensions
-  for (name, extension_des) in file_des.extensions_by_name.items():
-    module[name.upper() + '_FIELD_NUMBER'] = extension_des.number
-    module[name] = extension_des
-
-  # services
-  for (name, service) in file_des.services_by_name.items():
-    module['_' + name.upper()] = service
-
-  # Build messages.
-  for (name, msg_des) in file_des.message_types_by_name.items():
-    module[name] = BuildMessage(msg_des)
-
-
-def BuildServices(file_des, module_name, module):
-  """Builds services classes and services stub class.
-
-  Args:
-    file_des: FileDescriptor of the .proto file
-    module_name: str, the name of generated _pb2 module
-    module: Generated _pb2 module
-  """
-  # pylint: disable=g-import-not-at-top
-  from google.protobuf import service as _service
-  from google.protobuf import service_reflection
-  # pylint: enable=g-import-not-at-top
-  for (name, service) in file_des.services_by_name.items():
-    module[name] = service_reflection.GeneratedServiceType(
-        name, (_service.Service,),
-        dict(DESCRIPTOR=service, __module__=module_name))
-    stub_name = name + '_Stub'
-    module[stub_name] = service_reflection.GeneratedServiceStubType(
-        stub_name, (module[name],),
-        dict(DESCRIPTOR=service, __module__=module_name))
diff --git a/libs/protobuf/python/google/protobuf/internal/containers.py b/libs/protobuf/python/google/protobuf/internal/containers.py
deleted file mode 100644
index 29fbb53..0000000
--- a/libs/protobuf/python/google/protobuf/internal/containers.py
+++ /dev/null
@@ -1,710 +0,0 @@
-# Protocol Buffers - Google's data interchange format
-# Copyright 2008 Google Inc.  All rights reserved.
-# https://developers.google.com/protocol-buffers/
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-"""Contains container classes to represent different protocol buffer types.
-
-This file defines container classes which represent categories of protocol
-buffer field types which need extra maintenance. Currently these categories
-are:
-
--   Repeated scalar fields - These are all repeated fields which aren't
-    composite (e.g. they are of simple types like int32, string, etc).
--   Repeated composite fields - Repeated fields which are composite. This
-    includes groups and nested messages.
-"""
-
-import collections.abc
-import copy
-import pickle
-from typing import (
-    Any,
-    Iterable,
-    Iterator,
-    List,
-    MutableMapping,
-    MutableSequence,
-    NoReturn,
-    Optional,
-    Sequence,
-    TypeVar,
-    Union,
-    overload,
-)
-
-
-_T = TypeVar('_T')
-_K = TypeVar('_K')
-_V = TypeVar('_V')
-
-
-class BaseContainer(Sequence[_T]):
-  """Base container class."""
-
-  # Minimizes memory usage and disallows assignment to other attributes.
-  __slots__ = ['_message_listener', '_values']
-
-  def __init__(self, message_listener: Any) -> None:
-    """
-    Args:
-      message_listener: A MessageListener implementation.
-        The RepeatedScalarFieldContainer will call this object's
-        Modified() method when it is modified.
-    """
-    self._message_listener = message_listener
-    self._values = []
-
-  @overload
-  def __getitem__(self, key: int) -> _T:
-    ...
-
-  @overload
-  def __getitem__(self, key: slice) -> List[_T]:
-    ...
-
-  def __getitem__(self, key):
-    """Retrieves item by the specified key."""
-    return self._values[key]
-
-  def __len__(self) -> int:
-    """Returns the number of elements in the container."""
-    return len(self._values)
-
-  def __ne__(self, other: Any) -> bool:
-    """Checks if another instance isn't equal to this one."""
-    # The concrete classes should define __eq__.
-    return not self == other
-
-  __hash__ = None
-
-  def __repr__(self) -> str:
-    return repr(self._values)
-
-  def sort(self, *args, **kwargs) -> None:
-    # Continue to support the old sort_function keyword argument.
-    # This is expected to be a rare occurrence, so use LBYL to avoid
-    # the overhead of actually catching KeyError.
-    if 'sort_function' in kwargs:
-      kwargs['cmp'] = kwargs.pop('sort_function')
-    self._values.sort(*args, **kwargs)
-
-  def reverse(self) -> None:
-    self._values.reverse()
-
-
-# TODO(slebedev): Remove this. BaseContainer does *not* conform to
-# MutableSequence, only its subclasses do.
-collections.abc.MutableSequence.register(BaseContainer)
-
-
-class RepeatedScalarFieldContainer(BaseContainer[_T], MutableSequence[_T]):
-  """Simple, type-checked, list-like container for holding repeated scalars."""
-
-  # Disallows assignment to other attributes.
-  __slots__ = ['_type_checker']
-
-  def __init__(
-      self,
-      message_listener: Any,
-      type_checker: Any,
-  ) -> None:
-    """Args:
-
-      message_listener: A MessageListener implementation. The
-      RepeatedScalarFieldContainer will call this object's Modified() method
-      when it is modified.
-      type_checker: A type_checkers.ValueChecker instance to run on elements
-      inserted into this container.
-    """
-    super().__init__(message_listener)
-    self._type_checker = type_checker
-
-  def append(self, value: _T) -> None:
-    """Appends an item to the list. Similar to list.append()."""
-    self._values.append(self._type_checker.CheckValue(value))
-    if not self._message_listener.dirty:
-      self._message_listener.Modified()
-
-  def insert(self, key: int, value: _T) -> None:
-    """Inserts the item at the specified position. Similar to list.insert()."""
-    self._values.insert(key, self._type_checker.CheckValue(value))
-    if not self._message_listener.dirty:
-      self._message_listener.Modified()
-
-  def extend(self, elem_seq: Iterable[_T]) -> None:
-    """Extends by appending the given iterable. Similar to list.extend()."""
-    if elem_seq is None:
-      return
-    try:
-      elem_seq_iter = iter(elem_seq)
-    except TypeError:
-      if not elem_seq:
-        # silently ignore falsy inputs :-/.
-        # TODO(ptucker): Deprecate this behavior. b/18413862
-        return
-      raise
-
-    new_values = [self._type_checker.CheckValue(elem) for elem in elem_seq_iter]
-    if new_values:
-      self._values.extend(new_values)
-    self._message_listener.Modified()
-
-  def MergeFrom(
-      self,
-      other: Union['RepeatedScalarFieldContainer[_T]', Iterable[_T]],
-  ) -> None:
-    """Appends the contents of another repeated field of the same type to this
-    one. We do not check the types of the individual fields.
-    """
-    self._values.extend(other)
-    self._message_listener.Modified()
-
-  def remove(self, elem: _T):
-    """Removes an item from the list. Similar to list.remove()."""
-    self._values.remove(elem)
-    self._message_listener.Modified()
-
-  def pop(self, key: Optional[int] = -1) -> _T:
-    """Removes and returns an item at a given index. Similar to list.pop()."""
-    value = self._values[key]
-    self.__delitem__(key)
-    return value
-
-  @overload
-  def __setitem__(self, key: int, value: _T) -> None:
-    ...
-
-  @overload
-  def __setitem__(self, key: slice, value: Iterable[_T]) -> None:
-    ...
-
-  def __setitem__(self, key, value) -> None:
-    """Sets the item on the specified position."""
-    if isinstance(key, slice):
-      if key.step is not None:
-        raise ValueError('Extended slices not supported')
-      self._values[key] = map(self._type_checker.CheckValue, value)
-      self._message_listener.Modified()
-    else:
-      self._values[key] = self._type_checker.CheckValue(value)
-      self._message_listener.Modified()
-
-  def __delitem__(self, key: Union[int, slice]) -> None:
-    """Deletes the item at the specified position."""
-    del self._values[key]
-    self._message_listener.Modified()
-
-  def __eq__(self, other: Any) -> bool:
-    """Compares the current instance with another one."""
-    if self is other:
-      return True
-    # Special case for the same type which should be common and fast.
-    if isinstance(other, self.__class__):
-      return other._values == self._values
-    # We are presumably comparing against some other sequence type.
-    return other == self._values
-
-  def __deepcopy__(
-      self,
-      unused_memo: Any = None,
-  ) -> 'RepeatedScalarFieldContainer[_T]':
-    clone = RepeatedScalarFieldContainer(
-        copy.deepcopy(self._message_listener), self._type_checker)
-    clone.MergeFrom(self)
-    return clone
-
-  def __reduce__(self, **kwargs) -> NoReturn:
-    raise pickle.PickleError(
-        "Can't pickle repeated scalar fields, convert to list first")
-
-
-# TODO(slebedev): Constrain T to be a subtype of Message.
-class RepeatedCompositeFieldContainer(BaseContainer[_T], MutableSequence[_T]):
-  """Simple, list-like container for holding repeated composite fields."""
-
-  # Disallows assignment to other attributes.
-  __slots__ = ['_message_descriptor']
-
-  def __init__(self, message_listener: Any, message_descriptor: Any) -> None:
-    """
-    Note that we pass in a descriptor instead of the generated directly,
-    since at the time we construct a _RepeatedCompositeFieldContainer we
-    haven't yet necessarily initialized the type that will be contained in the
-    container.
-
-    Args:
-      message_listener: A MessageListener implementation.
-        The RepeatedCompositeFieldContainer will call this object's
-        Modified() method when it is modified.
-      message_descriptor: A Descriptor instance describing the protocol type
-        that should be present in this container.  We'll use the
-        _concrete_class field of this descriptor when the client calls add().
-    """
-    super().__init__(message_listener)
-    self._message_descriptor = message_descriptor
-
-  def add(self, **kwargs: Any) -> _T:
-    """Adds a new element at the end of the list and returns it. Keyword
-    arguments may be used to initialize the element.
-    """
-    new_element = self._message_descriptor._concrete_class(**kwargs)
-    new_element._SetListener(self._message_listener)
-    self._values.append(new_element)
-    if not self._message_listener.dirty:
-      self._message_listener.Modified()
-    return new_element
-
-  def append(self, value: _T) -> None:
-    """Appends one element by copying the message."""
-    new_element = self._message_descriptor._concrete_class()
-    new_element._SetListener(self._message_listener)
-    new_element.CopyFrom(value)
-    self._values.append(new_element)
-    if not self._message_listener.dirty:
-      self._message_listener.Modified()
-
-  def insert(self, key: int, value: _T) -> None:
-    """Inserts the item at the specified position by copying."""
-    new_element = self._message_descriptor._concrete_class()
-    new_element._SetListener(self._message_listener)
-    new_element.CopyFrom(value)
-    self._values.insert(key, new_element)
-    if not self._message_listener.dirty:
-      self._message_listener.Modified()
-
-  def extend(self, elem_seq: Iterable[_T]) -> None:
-    """Extends by appending the given sequence of elements of the same type
-
-    as this one, copying each individual message.
-    """
-    message_class = self._message_descriptor._concrete_class
-    listener = self._message_listener
-    values = self._values
-    for message in elem_seq:
-      new_element = message_class()
-      new_element._SetListener(listener)
-      new_element.MergeFrom(message)
-      values.append(new_element)
-    listener.Modified()
-
-  def MergeFrom(
-      self,
-      other: Union['RepeatedCompositeFieldContainer[_T]', Iterable[_T]],
-  ) -> None:
-    """Appends the contents of another repeated field of the same type to this
-    one, copying each individual message.
-    """
-    self.extend(other)
-
-  def remove(self, elem: _T) -> None:
-    """Removes an item from the list. Similar to list.remove()."""
-    self._values.remove(elem)
-    self._message_listener.Modified()
-
-  def pop(self, key: Optional[int] = -1) -> _T:
-    """Removes and returns an item at a given index. Similar to list.pop()."""
-    value = self._values[key]
-    self.__delitem__(key)
-    return value
-
-  @overload
-  def __setitem__(self, key: int, value: _T) -> None:
-    ...
-
-  @overload
-  def __setitem__(self, key: slice, value: Iterable[_T]) -> None:
-    ...
-
-  def __setitem__(self, key, value):
-    # This method is implemented to make RepeatedCompositeFieldContainer
-    # structurally compatible with typing.MutableSequence. It is
-    # otherwise unsupported and will always raise an error.
-    raise TypeError(
-        f'{self.__class__.__name__} object does not support item assignment')
-
-  def __delitem__(self, key: Union[int, slice]) -> None:
-    """Deletes the item at the specified position."""
-    del self._values[key]
-    self._message_listener.Modified()
-
-  def __eq__(self, other: Any) -> bool:
-    """Compares the current instance with another one."""
-    if self is other:
-      return True
-    if not isinstance(other, self.__class__):
-      raise TypeError('Can only compare repeated composite fields against '
-                      'other repeated composite fields.')
-    return self._values == other._values
-
-
-class ScalarMap(MutableMapping[_K, _V]):
-  """Simple, type-checked, dict-like container for holding repeated scalars."""
-
-  # Disallows assignment to other attributes.
-  __slots__ = ['_key_checker', '_value_checker', '_values', '_message_listener',
-               '_entry_descriptor']
-
-  def __init__(
-      self,
-      message_listener: Any,
-      key_checker: Any,
-      value_checker: Any,
-      entry_descriptor: Any,
-  ) -> None:
-    """
-    Args:
-      message_listener: A MessageListener implementation.
-        The ScalarMap will call this object's Modified() method when it
-        is modified.
-      key_checker: A type_checkers.ValueChecker instance to run on keys
-        inserted into this container.
-      value_checker: A type_checkers.ValueChecker instance to run on values
-        inserted into this container.
-      entry_descriptor: The MessageDescriptor of a map entry: key and value.
-    """
-    self._message_listener = message_listener
-    self._key_checker = key_checker
-    self._value_checker = value_checker
-    self._entry_descriptor = entry_descriptor
-    self._values = {}
-
-  def __getitem__(self, key: _K) -> _V:
-    try:
-      return self._values[key]
-    except KeyError:
-      key = self._key_checker.CheckValue(key)
-      val = self._value_checker.DefaultValue()
-      self._values[key] = val
-      return val
-
-  def __contains__(self, item: _K) -> bool:
-    # We check the key's type to match the strong-typing flavor of the API.
-    # Also this makes it easier to match the behavior of the C++ implementation.
-    self._key_checker.CheckValue(item)
-    return item in self._values
-
-  @overload
-  def get(self, key: _K) -> Optional[_V]:
-    ...
-
-  @overload
-  def get(self, key: _K, default: _T) -> Union[_V, _T]:
-    ...
-
-  # We need to override this explicitly, because our defaultdict-like behavior
-  # will make the default implementation (from our base class) always insert
-  # the key.
-  def get(self, key, default=None):
-    if key in self:
-      return self[key]
-    else:
-      return default
-
-  def __setitem__(self, key: _K, value: _V) -> _T:
-    checked_key = self._key_checker.CheckValue(key)
-    checked_value = self._value_checker.CheckValue(value)
-    self._values[checked_key] = checked_value
-    self._message_listener.Modified()
-
-  def __delitem__(self, key: _K) -> None:
-    del self._values[key]
-    self._message_listener.Modified()
-
-  def __len__(self) -> int:
-    return len(self._values)
-
-  def __iter__(self) -> Iterator[_K]:
-    return iter(self._values)
-
-  def __repr__(self) -> str:
-    return repr(self._values)
-
-  def MergeFrom(self, other: 'ScalarMap[_K, _V]') -> None:
-    self._values.update(other._values)
-    self._message_listener.Modified()
-
-  def InvalidateIterators(self) -> None:
-    # It appears that the only way to reliably invalidate iterators to
-    # self._values is to ensure that its size changes.
-    original = self._values
-    self._values = original.copy()
-    original[None] = None
-
-  # This is defined in the abstract base, but we can do it much more cheaply.
-  def clear(self) -> None:
-    self._values.clear()
-    self._message_listener.Modified()
-
-  def GetEntryClass(self) -> Any:
-    return self._entry_descriptor._concrete_class
-
-
-class MessageMap(MutableMapping[_K, _V]):
-  """Simple, type-checked, dict-like container for with submessage values."""
-
-  # Disallows assignment to other attributes.
-  __slots__ = ['_key_checker', '_values', '_message_listener',
-               '_message_descriptor', '_entry_descriptor']
-
-  def __init__(
-      self,
-      message_listener: Any,
-      message_descriptor: Any,
-      key_checker: Any,
-      entry_descriptor: Any,
-  ) -> None:
-    """
-    Args:
-      message_listener: A MessageListener implementation.
-        The ScalarMap will call this object's Modified() method when it
-        is modified.
-      key_checker: A type_checkers.ValueChecker instance to run on keys
-        inserted into this container.
-      value_checker: A type_checkers.ValueChecker instance to run on values
-        inserted into this container.
-      entry_descriptor: The MessageDescriptor of a map entry: key and value.
-    """
-    self._message_listener = message_listener
-    self._message_descriptor = message_descriptor
-    self._key_checker = key_checker
-    self._entry_descriptor = entry_descriptor
-    self._values = {}
-
-  def __getitem__(self, key: _K) -> _V:
-    key = self._key_checker.CheckValue(key)
-    try:
-      return self._values[key]
-    except KeyError:
-      new_element = self._message_descriptor._concrete_class()
-      new_element._SetListener(self._message_listener)
-      self._values[key] = new_element
-      self._message_listener.Modified()
-      return new_element
-
-  def get_or_create(self, key: _K) -> _V:
-    """get_or_create() is an alias for getitem (ie. map[key]).
-
-    Args:
-      key: The key to get or create in the map.
-
-    This is useful in cases where you want to be explicit that the call is
-    mutating the map.  This can avoid lint errors for statements like this
-    that otherwise would appear to be pointless statements:
-
-      msg.my_map[key]
-    """
-    return self[key]
-
-  @overload
-  def get(self, key: _K) -> Optional[_V]:
-    ...
-
-  @overload
-  def get(self, key: _K, default: _T) -> Union[_V, _T]:
-    ...
-
-  # We need to override this explicitly, because our defaultdict-like behavior
-  # will make the default implementation (from our base class) always insert
-  # the key.
-  def get(self, key, default=None):
-    if key in self:
-      return self[key]
-    else:
-      return default
-
-  def __contains__(self, item: _K) -> bool:
-    item = self._key_checker.CheckValue(item)
-    return item in self._values
-
-  def __setitem__(self, key: _K, value: _V) -> NoReturn:
-    raise ValueError('May not set values directly, call my_map[key].foo = 5')
-
-  def __delitem__(self, key: _K) -> None:
-    key = self._key_checker.CheckValue(key)
-    del self._values[key]
-    self._message_listener.Modified()
-
-  def __len__(self) -> int:
-    return len(self._values)
-
-  def __iter__(self) -> Iterator[_K]:
-    return iter(self._values)
-
-  def __repr__(self) -> str:
-    return repr(self._values)
-
-  def MergeFrom(self, other: 'MessageMap[_K, _V]') -> None:
-    # pylint: disable=protected-access
-    for key in other._values:
-      # According to documentation: "When parsing from the wire or when merging,
-      # if there are duplicate map keys the last key seen is used".
-      if key in self:
-        del self[key]
-      self[key].CopyFrom(other[key])
-    # self._message_listener.Modified() not required here, because
-    # mutations to submessages already propagate.
-
-  def InvalidateIterators(self) -> None:
-    # It appears that the only way to reliably invalidate iterators to
-    # self._values is to ensure that its size changes.
-    original = self._values
-    self._values = original.copy()
-    original[None] = None
-
-  # This is defined in the abstract base, but we can do it much more cheaply.
-  def clear(self) -> None:
-    self._values.clear()
-    self._message_listener.Modified()
-
-  def GetEntryClass(self) -> Any:
-    return self._entry_descriptor._concrete_class
-
-
-class _UnknownField:
-  """A parsed unknown field."""
-
-  # Disallows assignment to other attributes.
-  __slots__ = ['_field_number', '_wire_type', '_data']
-
-  def __init__(self, field_number, wire_type, data):
-    self._field_number = field_number
-    self._wire_type = wire_type
-    self._data = data
-    return
-
-  def __lt__(self, other):
-    # pylint: disable=protected-access
-    return self._field_number < other._field_number
-
-  def __eq__(self, other):
-    if self is other:
-      return True
-    # pylint: disable=protected-access
-    return (self._field_number == other._field_number and
-            self._wire_type == other._wire_type and
-            self._data == other._data)
-
-
-class UnknownFieldRef:  # pylint: disable=missing-class-docstring
-
-  def __init__(self, parent, index):
-    self._parent = parent
-    self._index = index
-
-  def _check_valid(self):
-    if not self._parent:
-      raise ValueError('UnknownField does not exist. '
-                       'The parent message might be cleared.')
-    if self._index >= len(self._parent):
-      raise ValueError('UnknownField does not exist. '
-                       'The parent message might be cleared.')
-
-  @property
-  def field_number(self):
-    self._check_valid()
-    # pylint: disable=protected-access
-    return self._parent._internal_get(self._index)._field_number
-
-  @property
-  def wire_type(self):
-    self._check_valid()
-    # pylint: disable=protected-access
-    return self._parent._internal_get(self._index)._wire_type
-
-  @property
-  def data(self):
-    self._check_valid()
-    # pylint: disable=protected-access
-    return self._parent._internal_get(self._index)._data
-
-
-class UnknownFieldSet:
-  """UnknownField container"""
-
-  # Disallows assignment to other attributes.
-  __slots__ = ['_values']
-
-  def __init__(self):
-    self._values = []
-
-  def __getitem__(self, index):
-    if self._values is None:
-      raise ValueError('UnknownFields does not exist. '
-                       'The parent message might be cleared.')
-    size = len(self._values)
-    if index < 0:
-      index += size
-    if index < 0 or index >= size:
-      raise IndexError('index %d out of range'.index)
-
-    return UnknownFieldRef(self, index)
-
-  def _internal_get(self, index):
-    return self._values[index]
-
-  def __len__(self):
-    if self._values is None:
-      raise ValueError('UnknownFields does not exist. '
-                       'The parent message might be cleared.')
-    return len(self._values)
-
-  def _add(self, field_number, wire_type, data):
-    unknown_field = _UnknownField(field_number, wire_type, data)
-    self._values.append(unknown_field)
-    return unknown_field
-
-  def __iter__(self):
-    for i in range(len(self)):
-      yield UnknownFieldRef(self, i)
-
-  def _extend(self, other):
-    if other is None:
-      return
-    # pylint: disable=protected-access
-    self._values.extend(other._values)
-
-  def __eq__(self, other):
-    if self is other:
-      return True
-    # Sort unknown fields because their order shouldn't
-    # affect equality test.
-    values = list(self._values)
-    if other is None:
-      return not values
-    values.sort()
-    # pylint: disable=protected-access
-    other_values = sorted(other._values)
-    return values == other_values
-
-  def _clear(self):
-    for value in self._values:
-      # pylint: disable=protected-access
-      if isinstance(value._data, UnknownFieldSet):
-        value._data._clear()  # pylint: disable=protected-access
-    self._values = None
diff --git a/libs/protobuf/python/google/protobuf/internal/decoder.py b/libs/protobuf/python/google/protobuf/internal/decoder.py
deleted file mode 100644
index a916276..0000000
--- a/libs/protobuf/python/google/protobuf/internal/decoder.py
+++ /dev/null
@@ -1,1068 +0,0 @@
-# Protocol Buffers - Google's data interchange format
-# Copyright 2008 Google Inc.  All rights reserved.
-# https://developers.google.com/protocol-buffers/
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-"""Code for decoding protocol buffer primitives.
-
-This code is very similar to encoder.py -- read the docs for that module first.
-
-A "decoder" is a function with the signature:
-  Decode(buffer, pos, end, message, field_dict)
-The arguments are:
-  buffer:     The string containing the encoded message.
-  pos:        The current position in the string.
-  end:        The position in the string where the current message ends.  May be
-              less than len(buffer) if we're reading a sub-message.
-  message:    The message object into which we're parsing.
-  field_dict: message._fields (avoids a hashtable lookup).
-The decoder reads the field and stores it into field_dict, returning the new
-buffer position.  A decoder for a repeated field may proactively decode all of
-the elements of that field, if they appear consecutively.
-
-Note that decoders may throw any of the following:
-  IndexError:  Indicates a truncated message.
-  struct.error:  Unpacking of a fixed-width field failed.
-  message.DecodeError:  Other errors.
-
-Decoders are expected to raise an exception if they are called with pos > end.
-This allows callers to be lax about bounds checking:  it's fineto read past
-"end" as long as you are sure that someone else will notice and throw an
-exception later on.
-
-Something up the call stack is expected to catch IndexError and struct.error
-and convert them to message.DecodeError.
-
-Decoders are constructed using decoder constructors with the signature:
-  MakeDecoder(field_number, is_repeated, is_packed, key, new_default)
-The arguments are:
-  field_number:  The field number of the field we want to decode.
-  is_repeated:   Is the field a repeated field? (bool)
-  is_packed:     Is the field a packed field? (bool)
-  key:           The key to use when looking up the field within field_dict.
-                 (This is actually the FieldDescriptor but nothing in this
-                 file should depend on that.)
-  new_default:   A function which takes a message object as a parameter and
-                 returns a new instance of the default value for this field.
-                 (This is called for repeated fields and sub-messages, when an
-                 instance does not already exist.)
-
-As with encoders, we define a decoder constructor for every type of field.
-Then, for every field of every message class we construct an actual decoder.
-That decoder goes into a dict indexed by tag, so when we decode a message
-we repeatedly read a tag, look up the corresponding decoder, and invoke it.
-"""
-
-__author__ = 'kenton@google.com (Kenton Varda)'
-
-import math
-import struct
-
-from google.protobuf.internal import containers
-from google.protobuf.internal import encoder
-from google.protobuf.internal import wire_format
-from google.protobuf import message
-
-
-# This is not for optimization, but rather to avoid conflicts with local
-# variables named "message".
-_DecodeError = message.DecodeError
-
-
-def _VarintDecoder(mask, result_type):
-  """Return an encoder for a basic varint value (does not include tag).
-
-  Decoded values will be bitwise-anded with the given mask before being
-  returned, e.g. to limit them to 32 bits.  The returned decoder does not
-  take the usual "end" parameter -- the caller is expected to do bounds checking
-  after the fact (often the caller can defer such checking until later).  The
-  decoder returns a (value, new_pos) pair.
-  """
-
-  def DecodeVarint(buffer, pos):
-    result = 0
-    shift = 0
-    while 1:
-      b = buffer[pos]
-      result |= ((b & 0x7f) << shift)
-      pos += 1
-      if not (b & 0x80):
-        result &= mask
-        result = result_type(result)
-        return (result, pos)
-      shift += 7
-      if shift >= 64:
-        raise _DecodeError('Too many bytes when decoding varint.')
-  return DecodeVarint
-
-
-def _SignedVarintDecoder(bits, result_type):
-  """Like _VarintDecoder() but decodes signed values."""
-
-  signbit = 1 << (bits - 1)
-  mask = (1 << bits) - 1
-
-  def DecodeVarint(buffer, pos):
-    result = 0
-    shift = 0
-    while 1:
-      b = buffer[pos]
-      result |= ((b & 0x7f) << shift)
-      pos += 1
-      if not (b & 0x80):
-        result &= mask
-        result = (result ^ signbit) - signbit
-        result = result_type(result)
-        return (result, pos)
-      shift += 7
-      if shift >= 64:
-        raise _DecodeError('Too many bytes when decoding varint.')
-  return DecodeVarint
-
-# All 32-bit and 64-bit values are represented as int.
-_DecodeVarint = _VarintDecoder((1 << 64) - 1, int)
-_DecodeSignedVarint = _SignedVarintDecoder(64, int)
-
-# Use these versions for values which must be limited to 32 bits.
-_DecodeVarint32 = _VarintDecoder((1 << 32) - 1, int)
-_DecodeSignedVarint32 = _SignedVarintDecoder(32, int)
-
-
-def ReadTag(buffer, pos):
-  """Read a tag from the memoryview, and return a (tag_bytes, new_pos) tuple.
-
-  We return the raw bytes of the tag rather than decoding them.  The raw
-  bytes can then be used to look up the proper decoder.  This effectively allows
-  us to trade some work that would be done in pure-python (decoding a varint)
-  for work that is done in C (searching for a byte string in a hash table).
-  In a low-level language it would be much cheaper to decode the varint and
-  use that, but not in Python.
-
-  Args:
-    buffer: memoryview object of the encoded bytes
-    pos: int of the current position to start from
-
-  Returns:
-    Tuple[bytes, int] of the tag data and new position.
-  """
-  start = pos
-  while buffer[pos] & 0x80:
-    pos += 1
-  pos += 1
-
-  tag_bytes = buffer[start:pos].tobytes()
-  return tag_bytes, pos
-
-
-# --------------------------------------------------------------------
-
-
-def _SimpleDecoder(wire_type, decode_value):
-  """Return a constructor for a decoder for fields of a particular type.
-
-  Args:
-      wire_type:  The field's wire type.
-      decode_value:  A function which decodes an individual value, e.g.
-        _DecodeVarint()
-  """
-
-  def SpecificDecoder(field_number, is_repeated, is_packed, key, new_default,
-                      clear_if_default=False):
-    if is_packed:
-      local_DecodeVarint = _DecodeVarint
-      def DecodePackedField(buffer, pos, end, message, field_dict):
-        value = field_dict.get(key)
-        if value is None:
-          value = field_dict.setdefault(key, new_default(message))
-        (endpoint, pos) = local_DecodeVarint(buffer, pos)
-        endpoint += pos
-        if endpoint > end:
-          raise _DecodeError('Truncated message.')
-        while pos < endpoint:
-          (element, pos) = decode_value(buffer, pos)
-          value.append(element)
-        if pos > endpoint:
-          del value[-1]   # Discard corrupt value.
-          raise _DecodeError('Packed element was truncated.')
-        return pos
-      return DecodePackedField
-    elif is_repeated:
-      tag_bytes = encoder.TagBytes(field_number, wire_type)
-      tag_len = len(tag_bytes)
-      def DecodeRepeatedField(buffer, pos, end, message, field_dict):
-        value = field_dict.get(key)
-        if value is None:
-          value = field_dict.setdefault(key, new_default(message))
-        while 1:
-          (element, new_pos) = decode_value(buffer, pos)
-          value.append(element)
-          # Predict that the next tag is another copy of the same repeated
-          # field.
-          pos = new_pos + tag_len
-          if buffer[new_pos:pos] != tag_bytes or new_pos >= end:
-            # Prediction failed.  Return.
-            if new_pos > end:
-              raise _DecodeError('Truncated message.')
-            return new_pos
-      return DecodeRepeatedField
-    else:
-      def DecodeField(buffer, pos, end, message, field_dict):
-        (new_value, pos) = decode_value(buffer, pos)
-        if pos > end:
-          raise _DecodeError('Truncated message.')
-        if clear_if_default and not new_value:
-          field_dict.pop(key, None)
-        else:
-          field_dict[key] = new_value
-        return pos
-      return DecodeField
-
-  return SpecificDecoder
-
-
-def _ModifiedDecoder(wire_type, decode_value, modify_value):
-  """Like SimpleDecoder but additionally invokes modify_value on every value
-  before storing it.  Usually modify_value is ZigZagDecode.
-  """
-
-  # Reusing _SimpleDecoder is slightly slower than copying a bunch of code, but
-  # not enough to make a significant difference.
-
-  def InnerDecode(buffer, pos):
-    (result, new_pos) = decode_value(buffer, pos)
-    return (modify_value(result), new_pos)
-  return _SimpleDecoder(wire_type, InnerDecode)
-
-
-def _StructPackDecoder(wire_type, format):
-  """Return a constructor for a decoder for a fixed-width field.
-
-  Args:
-      wire_type:  The field's wire type.
-      format:  The format string to pass to struct.unpack().
-  """
-
-  value_size = struct.calcsize(format)
-  local_unpack = struct.unpack
-
-  # Reusing _SimpleDecoder is slightly slower than copying a bunch of code, but
-  # not enough to make a significant difference.
-
-  # Note that we expect someone up-stack to catch struct.error and convert
-  # it to _DecodeError -- this way we don't have to set up exception-
-  # handling blocks every time we parse one value.
-
-  def InnerDecode(buffer, pos):
-    new_pos = pos + value_size
-    result = local_unpack(format, buffer[pos:new_pos])[0]
-    return (result, new_pos)
-  return _SimpleDecoder(wire_type, InnerDecode)
-
-
-def _FloatDecoder():
-  """Returns a decoder for a float field.
-
-  This code works around a bug in struct.unpack for non-finite 32-bit
-  floating-point values.
-  """
-
-  local_unpack = struct.unpack
-
-  def InnerDecode(buffer, pos):
-    """Decode serialized float to a float and new position.
-
-    Args:
-      buffer: memoryview of the serialized bytes
-      pos: int, position in the memory view to start at.
-
-    Returns:
-      Tuple[float, int] of the deserialized float value and new position
-      in the serialized data.
-    """
-    # We expect a 32-bit value in little-endian byte order.  Bit 1 is the sign
-    # bit, bits 2-9 represent the exponent, and bits 10-32 are the significand.
-    new_pos = pos + 4
-    float_bytes = buffer[pos:new_pos].tobytes()
-
-    # If this value has all its exponent bits set, then it's non-finite.
-    # In Python 2.4, struct.unpack will convert it to a finite 64-bit value.
-    # To avoid that, we parse it specially.
-    if (float_bytes[3:4] in b'\x7F\xFF' and float_bytes[2:3] >= b'\x80'):
-      # If at least one significand bit is set...
-      if float_bytes[0:3] != b'\x00\x00\x80':
-        return (math.nan, new_pos)
-      # If sign bit is set...
-      if float_bytes[3:4] == b'\xFF':
-        return (-math.inf, new_pos)
-      return (math.inf, new_pos)
-
-    # Note that we expect someone up-stack to catch struct.error and convert
-    # it to _DecodeError -- this way we don't have to set up exception-
-    # handling blocks every time we parse one value.
-    result = local_unpack('<f', float_bytes)[0]
-    return (result, new_pos)
-  return _SimpleDecoder(wire_format.WIRETYPE_FIXED32, InnerDecode)
-
-
-def _DoubleDecoder():
-  """Returns a decoder for a double field.
-
-  This code works around a bug in struct.unpack for not-a-number.
-  """
-
-  local_unpack = struct.unpack
-
-  def InnerDecode(buffer, pos):
-    """Decode serialized double to a double and new position.
-
-    Args:
-      buffer: memoryview of the serialized bytes.
-      pos: int, position in the memory view to start at.
-
-    Returns:
-      Tuple[float, int] of the decoded double value and new position
-      in the serialized data.
-    """
-    # We expect a 64-bit value in little-endian byte order.  Bit 1 is the sign
-    # bit, bits 2-12 represent the exponent, and bits 13-64 are the significand.
-    new_pos = pos + 8
-    double_bytes = buffer[pos:new_pos].tobytes()
-
-    # If this value has all its exponent bits set and at least one significand
-    # bit set, it's not a number.  In Python 2.4, struct.unpack will treat it
-    # as inf or -inf.  To avoid that, we treat it specially.
-    if ((double_bytes[7:8] in b'\x7F\xFF')
-        and (double_bytes[6:7] >= b'\xF0')
-        and (double_bytes[0:7] != b'\x00\x00\x00\x00\x00\x00\xF0')):
-      return (math.nan, new_pos)
-
-    # Note that we expect someone up-stack to catch struct.error and convert
-    # it to _DecodeError -- this way we don't have to set up exception-
-    # handling blocks every time we parse one value.
-    result = local_unpack('<d', double_bytes)[0]
-    return (result, new_pos)
-  return _SimpleDecoder(wire_format.WIRETYPE_FIXED64, InnerDecode)
-
-
-def EnumDecoder(field_number, is_repeated, is_packed, key, new_default,
-                clear_if_default=False):
-  """Returns a decoder for enum field."""
-  enum_type = key.enum_type
-  if is_packed:
-    local_DecodeVarint = _DecodeVarint
-    def DecodePackedField(buffer, pos, end, message, field_dict):
-      """Decode serialized packed enum to its value and a new position.
-
-      Args:
-        buffer: memoryview of the serialized bytes.
-        pos: int, position in the memory view to start at.
-        end: int, end position of serialized data
-        message: Message object to store unknown fields in
-        field_dict: Map[Descriptor, Any] to store decoded values in.
-
-      Returns:
-        int, new position in serialized data.
-      """
-      value = field_dict.get(key)
-      if value is None:
-        value = field_dict.setdefault(key, new_default(message))
-      (endpoint, pos) = local_DecodeVarint(buffer, pos)
-      endpoint += pos
-      if endpoint > end:
-        raise _DecodeError('Truncated message.')
-      while pos < endpoint:
-        value_start_pos = pos
-        (element, pos) = _DecodeSignedVarint32(buffer, pos)
-        # pylint: disable=protected-access
-        if element in enum_type.values_by_number:
-          value.append(element)
-        else:
-          if not message._unknown_fields:
-            message._unknown_fields = []
-          tag_bytes = encoder.TagBytes(field_number,
-                                       wire_format.WIRETYPE_VARINT)
-
-          message._unknown_fields.append(
-              (tag_bytes, buffer[value_start_pos:pos].tobytes()))
-          if message._unknown_field_set is None:
-            message._unknown_field_set = containers.UnknownFieldSet()
-          message._unknown_field_set._add(
-              field_number, wire_format.WIRETYPE_VARINT, element)
-          # pylint: enable=protected-access
-      if pos > endpoint:
-        if element in enum_type.values_by_number:
-          del value[-1]   # Discard corrupt value.
-        else:
-          del message._unknown_fields[-1]
-          # pylint: disable=protected-access
-          del message._unknown_field_set._values[-1]
-          # pylint: enable=protected-access
-        raise _DecodeError('Packed element was truncated.')
-      return pos
-    return DecodePackedField
-  elif is_repeated:
-    tag_bytes = encoder.TagBytes(field_number, wire_format.WIRETYPE_VARINT)
-    tag_len = len(tag_bytes)
-    def DecodeRepeatedField(buffer, pos, end, message, field_dict):
-      """Decode serialized repeated enum to its value and a new position.
-
-      Args:
-        buffer: memoryview of the serialized bytes.
-        pos: int, position in the memory view to start at.
-        end: int, end position of serialized data
-        message: Message object to store unknown fields in
-        field_dict: Map[Descriptor, Any] to store decoded values in.
-
-      Returns:
-        int, new position in serialized data.
-      """
-      value = field_dict.get(key)
-      if value is None:
-        value = field_dict.setdefault(key, new_default(message))
-      while 1:
-        (element, new_pos) = _DecodeSignedVarint32(buffer, pos)
-        # pylint: disable=protected-access
-        if element in enum_type.values_by_number:
-          value.append(element)
-        else:
-          if not message._unknown_fields:
-            message._unknown_fields = []
-          message._unknown_fields.append(
-              (tag_bytes, buffer[pos:new_pos].tobytes()))
-          if message._unknown_field_set is None:
-            message._unknown_field_set = containers.UnknownFieldSet()
-          message._unknown_field_set._add(
-              field_number, wire_format.WIRETYPE_VARINT, element)
-        # pylint: enable=protected-access
-        # Predict that the next tag is another copy of the same repeated
-        # field.
-        pos = new_pos + tag_len
-        if buffer[new_pos:pos] != tag_bytes or new_pos >= end:
-          # Prediction failed.  Return.
-          if new_pos > end:
-            raise _DecodeError('Truncated message.')
-          return new_pos
-    return DecodeRepeatedField
-  else:
-    def DecodeField(buffer, pos, end, message, field_dict):
-      """Decode serialized repeated enum to its value and a new position.
-
-      Args:
-        buffer: memoryview of the serialized bytes.
-        pos: int, position in the memory view to start at.
-        end: int, end position of serialized data
-        message: Message object to store unknown fields in
-        field_dict: Map[Descriptor, Any] to store decoded values in.
-
-      Returns:
-        int, new position in serialized data.
-      """
-      value_start_pos = pos
-      (enum_value, pos) = _DecodeSignedVarint32(buffer, pos)
-      if pos > end:
-        raise _DecodeError('Truncated message.')
-      if clear_if_default and not enum_value:
-        field_dict.pop(key, None)
-        return pos
-      # pylint: disable=protected-access
-      if enum_value in enum_type.values_by_number:
-        field_dict[key] = enum_value
-      else:
-        if not message._unknown_fields:
-          message._unknown_fields = []
-        tag_bytes = encoder.TagBytes(field_number,
-                                     wire_format.WIRETYPE_VARINT)
-        message._unknown_fields.append(
-            (tag_bytes, buffer[value_start_pos:pos].tobytes()))
-        if message._unknown_field_set is None:
-          message._unknown_field_set = containers.UnknownFieldSet()
-        message._unknown_field_set._add(
-            field_number, wire_format.WIRETYPE_VARINT, enum_value)
-        # pylint: enable=protected-access
-      return pos
-    return DecodeField
-
-
-# --------------------------------------------------------------------
-
-
-Int32Decoder = _SimpleDecoder(
-    wire_format.WIRETYPE_VARINT, _DecodeSignedVarint32)
-
-Int64Decoder = _SimpleDecoder(
-    wire_format.WIRETYPE_VARINT, _DecodeSignedVarint)
-
-UInt32Decoder = _SimpleDecoder(wire_format.WIRETYPE_VARINT, _DecodeVarint32)
-UInt64Decoder = _SimpleDecoder(wire_format.WIRETYPE_VARINT, _DecodeVarint)
-
-SInt32Decoder = _ModifiedDecoder(
-    wire_format.WIRETYPE_VARINT, _DecodeVarint32, wire_format.ZigZagDecode)
-SInt64Decoder = _ModifiedDecoder(
-    wire_format.WIRETYPE_VARINT, _DecodeVarint, wire_format.ZigZagDecode)
-
-# Note that Python conveniently guarantees that when using the '<' prefix on
-# formats, they will also have the same size across all platforms (as opposed
-# to without the prefix, where their sizes depend on the C compiler's basic
-# type sizes).
-Fixed32Decoder  = _StructPackDecoder(wire_format.WIRETYPE_FIXED32, '<I')
-Fixed64Decoder  = _StructPackDecoder(wire_format.WIRETYPE_FIXED64, '<Q')
-SFixed32Decoder = _StructPackDecoder(wire_format.WIRETYPE_FIXED32, '<i')
-SFixed64Decoder = _StructPackDecoder(wire_format.WIRETYPE_FIXED64, '<q')
-FloatDecoder = _FloatDecoder()
-DoubleDecoder = _DoubleDecoder()
-
-BoolDecoder = _ModifiedDecoder(
-    wire_format.WIRETYPE_VARINT, _DecodeVarint, bool)
-
-
-def StringDecoder(field_number, is_repeated, is_packed, key, new_default,
-                  clear_if_default=False):
-  """Returns a decoder for a string field."""
-
-  local_DecodeVarint = _DecodeVarint
-
-  def _ConvertToUnicode(memview):
-    """Convert byte to unicode."""
-    byte_str = memview.tobytes()
-    try:
-      value = str(byte_str, 'utf-8')
-    except UnicodeDecodeError as e:
-      # add more information to the error message and re-raise it.
-      e.reason = '%s in field: %s' % (e, key.full_name)
-      raise
-
-    return value
-
-  assert not is_packed
-  if is_repeated:
-    tag_bytes = encoder.TagBytes(field_number,
-                                 wire_format.WIRETYPE_LENGTH_DELIMITED)
-    tag_len = len(tag_bytes)
-    def DecodeRepeatedField(buffer, pos, end, message, field_dict):
-      value = field_dict.get(key)
-      if value is None:
-        value = field_dict.setdefault(key, new_default(message))
-      while 1:
-        (size, pos) = local_DecodeVarint(buffer, pos)
-        new_pos = pos + size
-        if new_pos > end:
-          raise _DecodeError('Truncated string.')
-        value.append(_ConvertToUnicode(buffer[pos:new_pos]))
-        # Predict that the next tag is another copy of the same repeated field.
-        pos = new_pos + tag_len
-        if buffer[new_pos:pos] != tag_bytes or new_pos == end:
-          # Prediction failed.  Return.
-          return new_pos
-    return DecodeRepeatedField
-  else:
-    def DecodeField(buffer, pos, end, message, field_dict):
-      (size, pos) = local_DecodeVarint(buffer, pos)
-      new_pos = pos + size
-      if new_pos > end:
-        raise _DecodeError('Truncated string.')
-      if clear_if_default and not size:
-        field_dict.pop(key, None)
-      else:
-        field_dict[key] = _ConvertToUnicode(buffer[pos:new_pos])
-      return new_pos
-    return DecodeField
-
-
-def BytesDecoder(field_number, is_repeated, is_packed, key, new_default,
-                 clear_if_default=False):
-  """Returns a decoder for a bytes field."""
-
-  local_DecodeVarint = _DecodeVarint
-
-  assert not is_packed
-  if is_repeated:
-    tag_bytes = encoder.TagBytes(field_number,
-                                 wire_format.WIRETYPE_LENGTH_DELIMITED)
-    tag_len = len(tag_bytes)
-    def DecodeRepeatedField(buffer, pos, end, message, field_dict):
-      value = field_dict.get(key)
-      if value is None:
-        value = field_dict.setdefault(key, new_default(message))
-      while 1:
-        (size, pos) = local_DecodeVarint(buffer, pos)
-        new_pos = pos + size
-        if new_pos > end:
-          raise _DecodeError('Truncated string.')
-        value.append(buffer[pos:new_pos].tobytes())
-        # Predict that the next tag is another copy of the same repeated field.
-        pos = new_pos + tag_len
-        if buffer[new_pos:pos] != tag_bytes or new_pos == end:
-          # Prediction failed.  Return.
-          return new_pos
-    return DecodeRepeatedField
-  else:
-    def DecodeField(buffer, pos, end, message, field_dict):
-      (size, pos) = local_DecodeVarint(buffer, pos)
-      new_pos = pos + size
-      if new_pos > end:
-        raise _DecodeError('Truncated string.')
-      if clear_if_default and not size:
-        field_dict.pop(key, None)
-      else:
-        field_dict[key] = buffer[pos:new_pos].tobytes()
-      return new_pos
-    return DecodeField
-
-
-def GroupDecoder(field_number, is_repeated, is_packed, key, new_default):
-  """Returns a decoder for a group field."""
-
-  end_tag_bytes = encoder.TagBytes(field_number,
-                                   wire_format.WIRETYPE_END_GROUP)
-  end_tag_len = len(end_tag_bytes)
-
-  assert not is_packed
-  if is_repeated:
-    tag_bytes = encoder.TagBytes(field_number,
-                                 wire_format.WIRETYPE_START_GROUP)
-    tag_len = len(tag_bytes)
-    def DecodeRepeatedField(buffer, pos, end, message, field_dict):
-      value = field_dict.get(key)
-      if value is None:
-        value = field_dict.setdefault(key, new_default(message))
-      while 1:
-        value = field_dict.get(key)
-        if value is None:
-          value = field_dict.setdefault(key, new_default(message))
-        # Read sub-message.
-        pos = value.add()._InternalParse(buffer, pos, end)
-        # Read end tag.
-        new_pos = pos+end_tag_len
-        if buffer[pos:new_pos] != end_tag_bytes or new_pos > end:
-          raise _DecodeError('Missing group end tag.')
-        # Predict that the next tag is another copy of the same repeated field.
-        pos = new_pos + tag_len
-        if buffer[new_pos:pos] != tag_bytes or new_pos == end:
-          # Prediction failed.  Return.
-          return new_pos
-    return DecodeRepeatedField
-  else:
-    def DecodeField(buffer, pos, end, message, field_dict):
-      value = field_dict.get(key)
-      if value is None:
-        value = field_dict.setdefault(key, new_default(message))
-      # Read sub-message.
-      pos = value._InternalParse(buffer, pos, end)
-      # Read end tag.
-      new_pos = pos+end_tag_len
-      if buffer[pos:new_pos] != end_tag_bytes or new_pos > end:
-        raise _DecodeError('Missing group end tag.')
-      return new_pos
-    return DecodeField
-
-
-def MessageDecoder(field_number, is_repeated, is_packed, key, new_default):
-  """Returns a decoder for a message field."""
-
-  local_DecodeVarint = _DecodeVarint
-
-  assert not is_packed
-  if is_repeated:
-    tag_bytes = encoder.TagBytes(field_number,
-                                 wire_format.WIRETYPE_LENGTH_DELIMITED)
-    tag_len = len(tag_bytes)
-    def DecodeRepeatedField(buffer, pos, end, message, field_dict):
-      value = field_dict.get(key)
-      if value is None:
-        value = field_dict.setdefault(key, new_default(message))
-      while 1:
-        # Read length.
-        (size, pos) = local_DecodeVarint(buffer, pos)
-        new_pos = pos + size
-        if new_pos > end:
-          raise _DecodeError('Truncated message.')
-        # Read sub-message.
-        if value.add()._InternalParse(buffer, pos, new_pos) != new_pos:
-          # The only reason _InternalParse would return early is if it
-          # encountered an end-group tag.
-          raise _DecodeError('Unexpected end-group tag.')
-        # Predict that the next tag is another copy of the same repeated field.
-        pos = new_pos + tag_len
-        if buffer[new_pos:pos] != tag_bytes or new_pos == end:
-          # Prediction failed.  Return.
-          return new_pos
-    return DecodeRepeatedField
-  else:
-    def DecodeField(buffer, pos, end, message, field_dict):
-      value = field_dict.get(key)
-      if value is None:
-        value = field_dict.setdefault(key, new_default(message))
-      # Read length.
-      (size, pos) = local_DecodeVarint(buffer, pos)
-      new_pos = pos + size
-      if new_pos > end:
-        raise _DecodeError('Truncated message.')
-      # Read sub-message.
-      if value._InternalParse(buffer, pos, new_pos) != new_pos:
-        # The only reason _InternalParse would return early is if it encountered
-        # an end-group tag.
-        raise _DecodeError('Unexpected end-group tag.')
-      return new_pos
-    return DecodeField
-
-
-# --------------------------------------------------------------------
-
-MESSAGE_SET_ITEM_TAG = encoder.TagBytes(1, wire_format.WIRETYPE_START_GROUP)
-
-def MessageSetItemDecoder(descriptor):
-  """Returns a decoder for a MessageSet item.
-
-  The parameter is the message Descriptor.
-
-  The message set message looks like this:
-    message MessageSet {
-      repeated group Item = 1 {
-        required int32 type_id = 2;
-        required string message = 3;
-      }
-    }
-  """
-
-  type_id_tag_bytes = encoder.TagBytes(2, wire_format.WIRETYPE_VARINT)
-  message_tag_bytes = encoder.TagBytes(3, wire_format.WIRETYPE_LENGTH_DELIMITED)
-  item_end_tag_bytes = encoder.TagBytes(1, wire_format.WIRETYPE_END_GROUP)
-
-  local_ReadTag = ReadTag
-  local_DecodeVarint = _DecodeVarint
-  local_SkipField = SkipField
-
-  def DecodeItem(buffer, pos, end, message, field_dict):
-    """Decode serialized message set to its value and new position.
-
-    Args:
-      buffer: memoryview of the serialized bytes.
-      pos: int, position in the memory view to start at.
-      end: int, end position of serialized data
-      message: Message object to store unknown fields in
-      field_dict: Map[Descriptor, Any] to store decoded values in.
-
-    Returns:
-      int, new position in serialized data.
-    """
-    message_set_item_start = pos
-    type_id = -1
-    message_start = -1
-    message_end = -1
-
-    # Technically, type_id and message can appear in any order, so we need
-    # a little loop here.
-    while 1:
-      (tag_bytes, pos) = local_ReadTag(buffer, pos)
-      if tag_bytes == type_id_tag_bytes:
-        (type_id, pos) = local_DecodeVarint(buffer, pos)
-      elif tag_bytes == message_tag_bytes:
-        (size, message_start) = local_DecodeVarint(buffer, pos)
-        pos = message_end = message_start + size
-      elif tag_bytes == item_end_tag_bytes:
-        break
-      else:
-        pos = SkipField(buffer, pos, end, tag_bytes)
-        if pos == -1:
-          raise _DecodeError('Missing group end tag.')
-
-    if pos > end:
-      raise _DecodeError('Truncated message.')
-
-    if type_id == -1:
-      raise _DecodeError('MessageSet item missing type_id.')
-    if message_start == -1:
-      raise _DecodeError('MessageSet item missing message.')
-
-    extension = message.Extensions._FindExtensionByNumber(type_id)
-    # pylint: disable=protected-access
-    if extension is not None:
-      value = field_dict.get(extension)
-      if value is None:
-        message_type = extension.message_type
-        if not hasattr(message_type, '_concrete_class'):
-          # pylint: disable=protected-access
-          message._FACTORY.GetPrototype(message_type)
-        value = field_dict.setdefault(
-            extension, message_type._concrete_class())
-      if value._InternalParse(buffer, message_start,message_end) != message_end:
-        # The only reason _InternalParse would return early is if it encountered
-        # an end-group tag.
-        raise _DecodeError('Unexpected end-group tag.')
-    else:
-      if not message._unknown_fields:
-        message._unknown_fields = []
-      message._unknown_fields.append(
-          (MESSAGE_SET_ITEM_TAG, buffer[message_set_item_start:pos].tobytes()))
-      if message._unknown_field_set is None:
-        message._unknown_field_set = containers.UnknownFieldSet()
-      message._unknown_field_set._add(
-          type_id,
-          wire_format.WIRETYPE_LENGTH_DELIMITED,
-          buffer[message_start:message_end].tobytes())
-      # pylint: enable=protected-access
-
-    return pos
-
-  return DecodeItem
-
-
-def UnknownMessageSetItemDecoder():
-  """Returns a decoder for a Unknown MessageSet item."""
-
-  type_id_tag_bytes = encoder.TagBytes(2, wire_format.WIRETYPE_VARINT)
-  message_tag_bytes = encoder.TagBytes(3, wire_format.WIRETYPE_LENGTH_DELIMITED)
-  item_end_tag_bytes = encoder.TagBytes(1, wire_format.WIRETYPE_END_GROUP)
-
-  def DecodeUnknownItem(buffer):
-    pos = 0
-    end = len(buffer)
-    message_start = -1
-    message_end = -1
-    while 1:
-      (tag_bytes, pos) = ReadTag(buffer, pos)
-      if tag_bytes == type_id_tag_bytes:
-        (type_id, pos) = _DecodeVarint(buffer, pos)
-      elif tag_bytes == message_tag_bytes:
-        (size, message_start) = _DecodeVarint(buffer, pos)
-        pos = message_end = message_start + size
-      elif tag_bytes == item_end_tag_bytes:
-        break
-      else:
-        pos = SkipField(buffer, pos, end, tag_bytes)
-        if pos == -1:
-          raise _DecodeError('Missing group end tag.')
-
-    if pos > end:
-      raise _DecodeError('Truncated message.')
-
-    if type_id == -1:
-      raise _DecodeError('MessageSet item missing type_id.')
-    if message_start == -1:
-      raise _DecodeError('MessageSet item missing message.')
-
-    return (type_id, buffer[message_start:message_end].tobytes())
-
-  return DecodeUnknownItem
-
-# --------------------------------------------------------------------
-
-def MapDecoder(field_descriptor, new_default, is_message_map):
-  """Returns a decoder for a map field."""
-
-  key = field_descriptor
-  tag_bytes = encoder.TagBytes(field_descriptor.number,
-                               wire_format.WIRETYPE_LENGTH_DELIMITED)
-  tag_len = len(tag_bytes)
-  local_DecodeVarint = _DecodeVarint
-  # Can't read _concrete_class yet; might not be initialized.
-  message_type = field_descriptor.message_type
-
-  def DecodeMap(buffer, pos, end, message, field_dict):
-    submsg = message_type._concrete_class()
-    value = field_dict.get(key)
-    if value is None:
-      value = field_dict.setdefault(key, new_default(message))
-    while 1:
-      # Read length.
-      (size, pos) = local_DecodeVarint(buffer, pos)
-      new_pos = pos + size
-      if new_pos > end:
-        raise _DecodeError('Truncated message.')
-      # Read sub-message.
-      submsg.Clear()
-      if submsg._InternalParse(buffer, pos, new_pos) != new_pos:
-        # The only reason _InternalParse would return early is if it
-        # encountered an end-group tag.
-        raise _DecodeError('Unexpected end-group tag.')
-
-      if is_message_map:
-        value[submsg.key].CopyFrom(submsg.value)
-      else:
-        value[submsg.key] = submsg.value
-
-      # Predict that the next tag is another copy of the same repeated field.
-      pos = new_pos + tag_len
-      if buffer[new_pos:pos] != tag_bytes or new_pos == end:
-        # Prediction failed.  Return.
-        return new_pos
-
-  return DecodeMap
-
-# --------------------------------------------------------------------
-# Optimization is not as heavy here because calls to SkipField() are rare,
-# except for handling end-group tags.
-
-def _SkipVarint(buffer, pos, end):
-  """Skip a varint value.  Returns the new position."""
-  # Previously ord(buffer[pos]) raised IndexError when pos is out of range.
-  # With this code, ord(b'') raises TypeError.  Both are handled in
-  # python_message.py to generate a 'Truncated message' error.
-  while ord(buffer[pos:pos+1].tobytes()) & 0x80:
-    pos += 1
-  pos += 1
-  if pos > end:
-    raise _DecodeError('Truncated message.')
-  return pos
-
-def _SkipFixed64(buffer, pos, end):
-  """Skip a fixed64 value.  Returns the new position."""
-
-  pos += 8
-  if pos > end:
-    raise _DecodeError('Truncated message.')
-  return pos
-
-
-def _DecodeFixed64(buffer, pos):
-  """Decode a fixed64."""
-  new_pos = pos + 8
-  return (struct.unpack('<Q', buffer[pos:new_pos])[0], new_pos)
-
-
-def _SkipLengthDelimited(buffer, pos, end):
-  """Skip a length-delimited value.  Returns the new position."""
-
-  (size, pos) = _DecodeVarint(buffer, pos)
-  pos += size
-  if pos > end:
-    raise _DecodeError('Truncated message.')
-  return pos
-
-
-def _SkipGroup(buffer, pos, end):
-  """Skip sub-group.  Returns the new position."""
-
-  while 1:
-    (tag_bytes, pos) = ReadTag(buffer, pos)
-    new_pos = SkipField(buffer, pos, end, tag_bytes)
-    if new_pos == -1:
-      return pos
-    pos = new_pos
-
-
-def _DecodeUnknownFieldSet(buffer, pos, end_pos=None):
-  """Decode UnknownFieldSet.  Returns the UnknownFieldSet and new position."""
-
-  unknown_field_set = containers.UnknownFieldSet()
-  while end_pos is None or pos < end_pos:
-    (tag_bytes, pos) = ReadTag(buffer, pos)
-    (tag, _) = _DecodeVarint(tag_bytes, 0)
-    field_number, wire_type = wire_format.UnpackTag(tag)
-    if wire_type == wire_format.WIRETYPE_END_GROUP:
-      break
-    (data, pos) = _DecodeUnknownField(buffer, pos, wire_type)
-    # pylint: disable=protected-access
-    unknown_field_set._add(field_number, wire_type, data)
-
-  return (unknown_field_set, pos)
-
-
-def _DecodeUnknownField(buffer, pos, wire_type):
-  """Decode a unknown field.  Returns the UnknownField and new position."""
-
-  if wire_type == wire_format.WIRETYPE_VARINT:
-    (data, pos) = _DecodeVarint(buffer, pos)
-  elif wire_type == wire_format.WIRETYPE_FIXED64:
-    (data, pos) = _DecodeFixed64(buffer, pos)
-  elif wire_type == wire_format.WIRETYPE_FIXED32:
-    (data, pos) = _DecodeFixed32(buffer, pos)
-  elif wire_type == wire_format.WIRETYPE_LENGTH_DELIMITED:
-    (size, pos) = _DecodeVarint(buffer, pos)
-    data = buffer[pos:pos+size].tobytes()
-    pos += size
-  elif wire_type == wire_format.WIRETYPE_START_GROUP:
-    (data, pos) = _DecodeUnknownFieldSet(buffer, pos)
-  elif wire_type == wire_format.WIRETYPE_END_GROUP:
-    return (0, -1)
-  else:
-    raise _DecodeError('Wrong wire type in tag.')
-
-  return (data, pos)
-
-
-def _EndGroup(buffer, pos, end):
-  """Skipping an END_GROUP tag returns -1 to tell the parent loop to break."""
-
-  return -1
-
-
-def _SkipFixed32(buffer, pos, end):
-  """Skip a fixed32 value.  Returns the new position."""
-
-  pos += 4
-  if pos > end:
-    raise _DecodeError('Truncated message.')
-  return pos
-
-
-def _DecodeFixed32(buffer, pos):
-  """Decode a fixed32."""
-
-  new_pos = pos + 4
-  return (struct.unpack('<I', buffer[pos:new_pos])[0], new_pos)
-
-
-def _RaiseInvalidWireType(buffer, pos, end):
-  """Skip function for unknown wire types.  Raises an exception."""
-
-  raise _DecodeError('Tag had invalid wire type.')
-
-def _FieldSkipper():
-  """Constructs the SkipField function."""
-
-  WIRETYPE_TO_SKIPPER = [
-      _SkipVarint,
-      _SkipFixed64,
-      _SkipLengthDelimited,
-      _SkipGroup,
-      _EndGroup,
-      _SkipFixed32,
-      _RaiseInvalidWireType,
-      _RaiseInvalidWireType,
-      ]
-
-  wiretype_mask = wire_format.TAG_TYPE_MASK
-
-  def SkipField(buffer, pos, end, tag_bytes):
-    """Skips a field with the specified tag.
-
-    |pos| should point to the byte immediately after the tag.
-
-    Returns:
-        The new position (after the tag value), or -1 if the tag is an end-group
-        tag (in which case the calling loop should break).
-    """
-
-    # The wire type is always in the first byte since varints are little-endian.
-    wire_type = ord(tag_bytes[0:1]) & wiretype_mask
-    return WIRETYPE_TO_SKIPPER[wire_type](buffer, pos, end)
-
-  return SkipField
-
-SkipField = _FieldSkipper()
diff --git a/libs/protobuf/python/google/protobuf/internal/descriptor_database_test.py b/libs/protobuf/python/google/protobuf/internal/descriptor_database_test.py
deleted file mode 100644
index 3c086b9..0000000
--- a/libs/protobuf/python/google/protobuf/internal/descriptor_database_test.py
+++ /dev/null
@@ -1,127 +0,0 @@
-# Protocol Buffers - Google's data interchange format
-# Copyright 2008 Google Inc.  All rights reserved.
-# https://developers.google.com/protocol-buffers/
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-"""Tests for google.protobuf.descriptor_database."""
-
-__author__ = 'matthewtoia@google.com (Matt Toia)'
-
-import unittest
-import warnings
-
-from google.protobuf import unittest_pb2
-from google.protobuf import descriptor_pb2
-from google.protobuf.internal import factory_test2_pb2
-from google.protobuf.internal import no_package_pb2
-from google.protobuf.internal import testing_refleaks
-from google.protobuf import descriptor_database
-
-
-@testing_refleaks.TestCase
-class DescriptorDatabaseTest(unittest.TestCase):
-
-  def testAdd(self):
-    db = descriptor_database.DescriptorDatabase()
-    file_desc_proto = descriptor_pb2.FileDescriptorProto.FromString(
-        factory_test2_pb2.DESCRIPTOR.serialized_pb)
-    file_desc_proto2 = descriptor_pb2.FileDescriptorProto.FromString(
-        no_package_pb2.DESCRIPTOR.serialized_pb)
-    db.Add(file_desc_proto)
-    db.Add(file_desc_proto2)
-
-    self.assertEqual(file_desc_proto, db.FindFileByName(
-        'google/protobuf/internal/factory_test2.proto'))
-    # Can find message type.
-    self.assertEqual(file_desc_proto, db.FindFileContainingSymbol(
-        'google.protobuf.python.internal.Factory2Message'))
-    # Can find nested message type.
-    self.assertEqual(file_desc_proto, db.FindFileContainingSymbol(
-        'google.protobuf.python.internal.Factory2Message.NestedFactory2Message'))
-    # Can find enum type.
-    self.assertEqual(file_desc_proto, db.FindFileContainingSymbol(
-        'google.protobuf.python.internal.Factory2Enum'))
-    # Can find nested enum type.
-    self.assertEqual(file_desc_proto, db.FindFileContainingSymbol(
-        'google.protobuf.python.internal.Factory2Message.NestedFactory2Enum'))
-    self.assertEqual(file_desc_proto, db.FindFileContainingSymbol(
-        'google.protobuf.python.internal.MessageWithNestedEnumOnly.NestedEnum'))
-    # Can find field.
-    self.assertEqual(file_desc_proto, db.FindFileContainingSymbol(
-        'google.protobuf.python.internal.Factory2Message.list_field'))
-    # Can find enum value.
-    self.assertEqual(file_desc_proto, db.FindFileContainingSymbol(
-        'google.protobuf.python.internal.Factory2Enum.FACTORY_2_VALUE_0'))
-    self.assertEqual(file_desc_proto, db.FindFileContainingSymbol(
-        'google.protobuf.python.internal.FACTORY_2_VALUE_0'))
-    self.assertEqual(file_desc_proto2, db.FindFileContainingSymbol(
-        '.NO_PACKAGE_VALUE_0'))
-    # Can find top level extension.
-    self.assertEqual(file_desc_proto, db.FindFileContainingSymbol(
-        'google.protobuf.python.internal.another_field'))
-    # Can find nested extension inside a message.
-    self.assertEqual(file_desc_proto, db.FindFileContainingSymbol(
-        'google.protobuf.python.internal.Factory2Message.one_more_field'))
-
-    # Can find service.
-    file_desc_proto2 = descriptor_pb2.FileDescriptorProto.FromString(
-        unittest_pb2.DESCRIPTOR.serialized_pb)
-    db.Add(file_desc_proto2)
-    self.assertEqual(file_desc_proto2, db.FindFileContainingSymbol(
-        'protobuf_unittest.TestService'))
-
-    # Non-existent field under a valid top level symbol can also be
-    # found. The behavior is the same with protobuf C++.
-    self.assertEqual(file_desc_proto2, db.FindFileContainingSymbol(
-        'protobuf_unittest.TestAllTypes.none_field'))
-
-    with self.assertRaisesRegex(KeyError, r'\'protobuf_unittest\.NoneMessage\''):
-      db.FindFileContainingSymbol('protobuf_unittest.NoneMessage')
-
-  def testConflictRegister(self):
-    db = descriptor_database.DescriptorDatabase()
-    unittest_fd = descriptor_pb2.FileDescriptorProto.FromString(
-        unittest_pb2.DESCRIPTOR.serialized_pb)
-    db.Add(unittest_fd)
-    conflict_fd = descriptor_pb2.FileDescriptorProto.FromString(
-        unittest_pb2.DESCRIPTOR.serialized_pb)
-    conflict_fd.name = 'other_file2'
-    with warnings.catch_warnings(record=True) as w:
-      # Cause all warnings to always be triggered.
-      warnings.simplefilter('always')
-      db.Add(conflict_fd)
-      self.assertTrue(len(w))
-      self.assertIs(w[0].category, RuntimeWarning)
-      self.assertIn('Conflict register for file "other_file2": ',
-                    str(w[0].message))
-      self.assertIn('already defined in file '
-                    '"google/protobuf/unittest.proto"',
-                    str(w[0].message))
-
-if __name__ == '__main__':
-  unittest.main()
diff --git a/libs/protobuf/python/google/protobuf/internal/descriptor_pool_test.py b/libs/protobuf/python/google/protobuf/internal/descriptor_pool_test.py
deleted file mode 100644
index 9e451b4..0000000
--- a/libs/protobuf/python/google/protobuf/internal/descriptor_pool_test.py
+++ /dev/null
@@ -1,1149 +0,0 @@
-# Protocol Buffers - Google's data interchange format
-# Copyright 2008 Google Inc.  All rights reserved.
-# https://developers.google.com/protocol-buffers/
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-"""Tests for google.protobuf.descriptor_pool."""
-
-__author__ = 'matthewtoia@google.com (Matt Toia)'
-
-import copy
-import os
-import unittest
-import warnings
-
-from google.protobuf import unittest_import_pb2
-from google.protobuf import unittest_import_public_pb2
-from google.protobuf import unittest_pb2
-from google.protobuf import descriptor_pb2
-from google.protobuf.internal import api_implementation
-from google.protobuf.internal import descriptor_pool_test1_pb2
-from google.protobuf.internal import descriptor_pool_test2_pb2
-from google.protobuf.internal import factory_test1_pb2
-from google.protobuf.internal import factory_test2_pb2
-from google.protobuf.internal import file_options_test_pb2
-from google.protobuf.internal import more_messages_pb2
-from google.protobuf.internal import no_package_pb2
-from google.protobuf.internal import testing_refleaks
-from google.protobuf import descriptor
-from google.protobuf import descriptor_database
-from google.protobuf import descriptor_pool
-from google.protobuf import message_factory
-from google.protobuf import symbol_database
-
-
-
-warnings.simplefilter('error', DeprecationWarning)
-
-
-class DescriptorPoolTestBase(object):
-
-  def testFindFileByName(self):
-    name1 = 'google/protobuf/internal/factory_test1.proto'
-    file_desc1 = self.pool.FindFileByName(name1)
-    self.assertIsInstance(file_desc1, descriptor.FileDescriptor)
-    self.assertEqual(name1, file_desc1.name)
-    self.assertEqual('google.protobuf.python.internal', file_desc1.package)
-    self.assertIn('Factory1Message', file_desc1.message_types_by_name)
-
-    name2 = 'google/protobuf/internal/factory_test2.proto'
-    file_desc2 = self.pool.FindFileByName(name2)
-    self.assertIsInstance(file_desc2, descriptor.FileDescriptor)
-    self.assertEqual(name2, file_desc2.name)
-    self.assertEqual('google.protobuf.python.internal', file_desc2.package)
-    self.assertIn('Factory2Message', file_desc2.message_types_by_name)
-
-  def testFindFileByNameFailure(self):
-    with self.assertRaises(KeyError):
-      self.pool.FindFileByName('Does not exist')
-
-  def testFindFileContainingSymbol(self):
-    file_desc1 = self.pool.FindFileContainingSymbol(
-        'google.protobuf.python.internal.Factory1Message')
-    self.assertIsInstance(file_desc1, descriptor.FileDescriptor)
-    self.assertEqual('google/protobuf/internal/factory_test1.proto',
-                     file_desc1.name)
-    self.assertEqual('google.protobuf.python.internal', file_desc1.package)
-    self.assertIn('Factory1Message', file_desc1.message_types_by_name)
-
-    file_desc2 = self.pool.FindFileContainingSymbol(
-        'google.protobuf.python.internal.Factory2Message')
-    self.assertIsInstance(file_desc2, descriptor.FileDescriptor)
-    self.assertEqual('google/protobuf/internal/factory_test2.proto',
-                     file_desc2.name)
-    self.assertEqual('google.protobuf.python.internal', file_desc2.package)
-    self.assertIn('Factory2Message', file_desc2.message_types_by_name)
-
-    # Tests top level extension.
-    file_desc3 = self.pool.FindFileContainingSymbol(
-        'google.protobuf.python.internal.another_field')
-    self.assertIsInstance(file_desc3, descriptor.FileDescriptor)
-    self.assertEqual('google/protobuf/internal/factory_test2.proto',
-                     file_desc3.name)
-
-    # Tests nested extension inside a message.
-    file_desc4 = self.pool.FindFileContainingSymbol(
-        'google.protobuf.python.internal.Factory2Message.one_more_field')
-    self.assertIsInstance(file_desc4, descriptor.FileDescriptor)
-    self.assertEqual('google/protobuf/internal/factory_test2.proto',
-                     file_desc4.name)
-
-    file_desc5 = self.pool.FindFileContainingSymbol(
-        'protobuf_unittest.TestService')
-    self.assertIsInstance(file_desc5, descriptor.FileDescriptor)
-    self.assertEqual('google/protobuf/unittest.proto',
-                     file_desc5.name)
-    # Tests the generated pool.
-    assert descriptor_pool.Default().FindFileContainingSymbol(
-        'google.protobuf.python.internal.Factory2Message.one_more_field')
-    assert descriptor_pool.Default().FindFileContainingSymbol(
-        'google.protobuf.python.internal.another_field')
-    assert descriptor_pool.Default().FindFileContainingSymbol(
-        'protobuf_unittest.TestService')
-
-    # Can find field.
-    file_desc6 = self.pool.FindFileContainingSymbol(
-        'google.protobuf.python.internal.Factory1Message.list_value')
-    self.assertIsInstance(file_desc6, descriptor.FileDescriptor)
-    self.assertEqual('google/protobuf/internal/factory_test1.proto',
-                     file_desc6.name)
-
-    # Can find top level Enum value.
-    file_desc7 = self.pool.FindFileContainingSymbol(
-        'google.protobuf.python.internal.FACTORY_1_VALUE_0')
-    self.assertIsInstance(file_desc7, descriptor.FileDescriptor)
-    self.assertEqual('google/protobuf/internal/factory_test1.proto',
-                     file_desc7.name)
-
-    # Can find nested Enum value.
-    file_desc8 = self.pool.FindFileContainingSymbol(
-        'protobuf_unittest.TestAllTypes.FOO')
-    self.assertIsInstance(file_desc8, descriptor.FileDescriptor)
-    self.assertEqual('google/protobuf/unittest.proto',
-                     file_desc8.name)
-
-    # TODO(jieluo): Add tests for no package when b/13860351 is fixed.
-
-    self.assertRaises(KeyError, self.pool.FindFileContainingSymbol,
-                      'google.protobuf.python.internal.Factory1Message.none_field')
-
-  def testFindFileContainingSymbolFailure(self):
-    with self.assertRaises(KeyError):
-      self.pool.FindFileContainingSymbol('Does not exist')
-
-  def testFindMessageTypeByName(self):
-    msg1 = self.pool.FindMessageTypeByName(
-        'google.protobuf.python.internal.Factory1Message')
-    self.assertIsInstance(msg1, descriptor.Descriptor)
-    self.assertEqual('Factory1Message', msg1.name)
-    self.assertEqual('google.protobuf.python.internal.Factory1Message',
-                     msg1.full_name)
-    self.assertEqual(None, msg1.containing_type)
-    self.assertFalse(msg1.has_options)
-
-    nested_msg1 = msg1.nested_types[0]
-    self.assertEqual('NestedFactory1Message', nested_msg1.name)
-    self.assertEqual(msg1, nested_msg1.containing_type)
-
-    nested_enum1 = msg1.enum_types[0]
-    self.assertEqual('NestedFactory1Enum', nested_enum1.name)
-    self.assertEqual(msg1, nested_enum1.containing_type)
-
-    self.assertEqual(nested_msg1, msg1.fields_by_name[
-        'nested_factory_1_message'].message_type)
-    self.assertEqual(nested_enum1, msg1.fields_by_name[
-        'nested_factory_1_enum'].enum_type)
-
-    msg2 = self.pool.FindMessageTypeByName(
-        'google.protobuf.python.internal.Factory2Message')
-    self.assertIsInstance(msg2, descriptor.Descriptor)
-    self.assertEqual('Factory2Message', msg2.name)
-    self.assertEqual('google.protobuf.python.internal.Factory2Message',
-                     msg2.full_name)
-    self.assertIsNone(msg2.containing_type)
-
-    nested_msg2 = msg2.nested_types[0]
-    self.assertEqual('NestedFactory2Message', nested_msg2.name)
-    self.assertEqual(msg2, nested_msg2.containing_type)
-
-    nested_enum2 = msg2.enum_types[0]
-    self.assertEqual('NestedFactory2Enum', nested_enum2.name)
-    self.assertEqual(msg2, nested_enum2.containing_type)
-
-    self.assertEqual(nested_msg2, msg2.fields_by_name[
-        'nested_factory_2_message'].message_type)
-    self.assertEqual(nested_enum2, msg2.fields_by_name[
-        'nested_factory_2_enum'].enum_type)
-
-    self.assertTrue(msg2.fields_by_name['int_with_default'].has_default_value)
-    self.assertEqual(
-        1776, msg2.fields_by_name['int_with_default'].default_value)
-
-    self.assertTrue(
-        msg2.fields_by_name['double_with_default'].has_default_value)
-    self.assertEqual(
-        9.99, msg2.fields_by_name['double_with_default'].default_value)
-
-    self.assertTrue(
-        msg2.fields_by_name['string_with_default'].has_default_value)
-    self.assertEqual(
-        'hello world', msg2.fields_by_name['string_with_default'].default_value)
-
-    self.assertTrue(msg2.fields_by_name['bool_with_default'].has_default_value)
-    self.assertFalse(msg2.fields_by_name['bool_with_default'].default_value)
-
-    self.assertTrue(msg2.fields_by_name['enum_with_default'].has_default_value)
-    self.assertEqual(
-        1, msg2.fields_by_name['enum_with_default'].default_value)
-
-    msg3 = self.pool.FindMessageTypeByName(
-        'google.protobuf.python.internal.Factory2Message.NestedFactory2Message')
-    self.assertEqual(nested_msg2, msg3)
-
-    self.assertTrue(msg2.fields_by_name['bytes_with_default'].has_default_value)
-    self.assertEqual(
-        b'a\xfb\x00c',
-        msg2.fields_by_name['bytes_with_default'].default_value)
-
-    self.assertEqual(1, len(msg2.oneofs))
-    self.assertEqual(1, len(msg2.oneofs_by_name))
-    self.assertEqual(2, len(msg2.oneofs[0].fields))
-    for name in ['oneof_int', 'oneof_string']:
-      self.assertEqual(msg2.oneofs[0],
-                       msg2.fields_by_name[name].containing_oneof)
-      self.assertIn(msg2.fields_by_name[name], msg2.oneofs[0].fields)
-
-  def testFindTypeErrors(self):
-    self.assertRaises(TypeError, self.pool.FindExtensionByNumber, '')
-    self.assertRaises(KeyError, self.pool.FindMethodByName, '')
-
-    # TODO(jieluo): Fix python to raise correct errors.
-    if api_implementation.Type() == 'python':
-      error_type = AttributeError
-    else:
-      error_type = TypeError
-    self.assertRaises(error_type, self.pool.FindMessageTypeByName, 0)
-    self.assertRaises(error_type, self.pool.FindFieldByName, 0)
-    self.assertRaises(error_type, self.pool.FindExtensionByName, 0)
-    self.assertRaises(error_type, self.pool.FindEnumTypeByName, 0)
-    self.assertRaises(error_type, self.pool.FindOneofByName, 0)
-    self.assertRaises(error_type, self.pool.FindServiceByName, 0)
-    self.assertRaises(error_type, self.pool.FindMethodByName, 0)
-    self.assertRaises(error_type, self.pool.FindFileContainingSymbol, 0)
-    if api_implementation.Type() == 'python':
-      error_type = KeyError
-    self.assertRaises(error_type, self.pool.FindFileByName, 0)
-
-  def testFindMessageTypeByNameFailure(self):
-    with self.assertRaises(KeyError):
-      self.pool.FindMessageTypeByName('Does not exist')
-
-  def testFindEnumTypeByName(self):
-    enum1 = self.pool.FindEnumTypeByName(
-        'google.protobuf.python.internal.Factory1Enum')
-    self.assertIsInstance(enum1, descriptor.EnumDescriptor)
-    self.assertEqual(0, enum1.values_by_name['FACTORY_1_VALUE_0'].number)
-    self.assertEqual(1, enum1.values_by_name['FACTORY_1_VALUE_1'].number)
-    self.assertFalse(enum1.has_options)
-
-    nested_enum1 = self.pool.FindEnumTypeByName(
-        'google.protobuf.python.internal.Factory1Message.NestedFactory1Enum')
-    self.assertIsInstance(nested_enum1, descriptor.EnumDescriptor)
-    self.assertEqual(
-        0, nested_enum1.values_by_name['NESTED_FACTORY_1_VALUE_0'].number)
-    self.assertEqual(
-        1, nested_enum1.values_by_name['NESTED_FACTORY_1_VALUE_1'].number)
-
-    enum2 = self.pool.FindEnumTypeByName(
-        'google.protobuf.python.internal.Factory2Enum')
-    self.assertIsInstance(enum2, descriptor.EnumDescriptor)
-    self.assertEqual(0, enum2.values_by_name['FACTORY_2_VALUE_0'].number)
-    self.assertEqual(1, enum2.values_by_name['FACTORY_2_VALUE_1'].number)
-
-    nested_enum2 = self.pool.FindEnumTypeByName(
-        'google.protobuf.python.internal.Factory2Message.NestedFactory2Enum')
-    self.assertIsInstance(nested_enum2, descriptor.EnumDescriptor)
-    self.assertEqual(
-        0, nested_enum2.values_by_name['NESTED_FACTORY_2_VALUE_0'].number)
-    self.assertEqual(
-        1, nested_enum2.values_by_name['NESTED_FACTORY_2_VALUE_1'].number)
-
-  def testFindEnumTypeByNameFailure(self):
-    with self.assertRaises(KeyError):
-      self.pool.FindEnumTypeByName('Does not exist')
-
-  def testFindFieldByName(self):
-    field = self.pool.FindFieldByName(
-        'google.protobuf.python.internal.Factory1Message.list_value')
-    self.assertEqual(field.name, 'list_value')
-    self.assertEqual(field.label, field.LABEL_REPEATED)
-    self.assertFalse(field.has_options)
-
-    with self.assertRaises(KeyError):
-      self.pool.FindFieldByName('Does not exist')
-
-  def testFindOneofByName(self):
-    oneof = self.pool.FindOneofByName(
-        'google.protobuf.python.internal.Factory2Message.oneof_field')
-    self.assertEqual(oneof.name, 'oneof_field')
-    with self.assertRaises(KeyError):
-      self.pool.FindOneofByName('Does not exist')
-
-  def testFindExtensionByName(self):
-    # An extension defined in a message.
-    extension = self.pool.FindExtensionByName(
-        'google.protobuf.python.internal.Factory2Message.one_more_field')
-    self.assertEqual(extension.name, 'one_more_field')
-    # An extension defined at file scope.
-    extension = self.pool.FindExtensionByName(
-        'google.protobuf.python.internal.another_field')
-    self.assertEqual(extension.name, 'another_field')
-    self.assertEqual(extension.number, 1002)
-    with self.assertRaises(KeyError):
-      self.pool.FindFieldByName('Does not exist')
-
-  def testFindAllExtensions(self):
-    factory1_message = self.pool.FindMessageTypeByName(
-        'google.protobuf.python.internal.Factory1Message')
-    factory2_message = self.pool.FindMessageTypeByName(
-        'google.protobuf.python.internal.Factory2Message')
-    # An extension defined in a message.
-    one_more_field = factory2_message.extensions_by_name['one_more_field']
-    # An extension defined at file scope.
-    factory_test2 = self.pool.FindFileByName(
-        'google/protobuf/internal/factory_test2.proto')
-    another_field = factory_test2.extensions_by_name['another_field']
-
-    extensions = self.pool.FindAllExtensions(factory1_message)
-    expected_extension_numbers = set([one_more_field, another_field])
-    self.assertEqual(expected_extension_numbers, set(extensions))
-    # Verify that mutating the returned list does not affect the pool.
-    extensions.append('unexpected_element')
-    # Get the extensions again, the returned value does not contain the
-    # 'unexpected_element'.
-    extensions = self.pool.FindAllExtensions(factory1_message)
-    self.assertEqual(expected_extension_numbers, set(extensions))
-
-  def testFindExtensionByNumber(self):
-    factory1_message = self.pool.FindMessageTypeByName(
-        'google.protobuf.python.internal.Factory1Message')
-    # Build factory_test2.proto which will put extensions to the pool
-    self.pool.FindFileByName(
-        'google/protobuf/internal/factory_test2.proto')
-
-    # An extension defined in a message.
-    extension = self.pool.FindExtensionByNumber(factory1_message, 1001)
-    self.assertEqual(extension.name, 'one_more_field')
-    # An extension defined at file scope.
-    extension = self.pool.FindExtensionByNumber(factory1_message, 1002)
-    self.assertEqual(extension.name, 'another_field')
-    with self.assertRaises(KeyError):
-      extension = self.pool.FindExtensionByNumber(factory1_message, 1234567)
-
-  def testExtensionsAreNotFields(self):
-    with self.assertRaises(KeyError):
-      self.pool.FindFieldByName('google.protobuf.python.internal.another_field')
-    with self.assertRaises(KeyError):
-      self.pool.FindFieldByName(
-          'google.protobuf.python.internal.Factory2Message.one_more_field')
-    with self.assertRaises(KeyError):
-      self.pool.FindExtensionByName(
-          'google.protobuf.python.internal.Factory1Message.list_value')
-
-  def testFindService(self):
-    service = self.pool.FindServiceByName('protobuf_unittest.TestService')
-    self.assertEqual(service.full_name, 'protobuf_unittest.TestService')
-    with self.assertRaises(KeyError):
-      self.pool.FindServiceByName('Does not exist')
-
-    method = self.pool.FindMethodByName('protobuf_unittest.TestService.Foo')
-    self.assertIs(method.containing_service, service)
-    with self.assertRaises(KeyError):
-      self.pool.FindMethodByName('protobuf_unittest.TestService.Doesnotexist')
-
-  def testUserDefinedDB(self):
-    db = descriptor_database.DescriptorDatabase()
-    self.pool = descriptor_pool.DescriptorPool(db)
-    db.Add(self.factory_test1_fd)
-    db.Add(self.factory_test2_fd)
-    self.testFindMessageTypeByName()
-
-  def testAddSerializedFile(self):
-    if isinstance(self, SecondaryDescriptorFromDescriptorDB):
-      if api_implementation.Type() != 'python':
-        # Cpp extension cannot call Add on a DescriptorPool
-        # that uses a DescriptorDatabase.
-        # TODO(jieluo): Fix python and cpp extension diff.
-        return
-    self.pool = descriptor_pool.DescriptorPool()
-    file1 = self.pool.AddSerializedFile(
-        self.factory_test1_fd.SerializeToString())
-    file2 = self.pool.AddSerializedFile(
-        self.factory_test2_fd.SerializeToString())
-    self.assertEqual(file1.name,
-                     'google/protobuf/internal/factory_test1.proto')
-    self.assertEqual(file2.name,
-                     'google/protobuf/internal/factory_test2.proto')
-    self.testFindMessageTypeByName()
-    file_json = self.pool.AddSerializedFile(
-        more_messages_pb2.DESCRIPTOR.serialized_pb)
-    field = file_json.message_types_by_name['class'].fields_by_name['int_field']
-    self.assertEqual(field.json_name, 'json_int')
-
-
-  def testEnumDefaultValue(self):
-    """Test the default value of enums which don't start at zero."""
-    def _CheckDefaultValue(file_descriptor):
-      default_value = (file_descriptor
-                       .message_types_by_name['DescriptorPoolTest1']
-                       .fields_by_name['nested_enum']
-                       .default_value)
-      self.assertEqual(default_value,
-                       descriptor_pool_test1_pb2.DescriptorPoolTest1.BETA)
-    # First check what the generated descriptor contains.
-    _CheckDefaultValue(descriptor_pool_test1_pb2.DESCRIPTOR)
-    # Then check the generated pool. Normally this is the same descriptor.
-    file_descriptor = symbol_database.Default().pool.FindFileByName(
-        'google/protobuf/internal/descriptor_pool_test1.proto')
-    self.assertIs(file_descriptor, descriptor_pool_test1_pb2.DESCRIPTOR)
-    _CheckDefaultValue(file_descriptor)
-
-    if isinstance(self, SecondaryDescriptorFromDescriptorDB):
-      if api_implementation.Type() != 'python':
-        # Cpp extension cannot call Add on a DescriptorPool
-        # that uses a DescriptorDatabase.
-        # TODO(jieluo): Fix python and cpp extension diff.
-        return
-    # Then check the dynamic pool and its internal DescriptorDatabase.
-    descriptor_proto = descriptor_pb2.FileDescriptorProto.FromString(
-        descriptor_pool_test1_pb2.DESCRIPTOR.serialized_pb)
-    self.pool.Add(descriptor_proto)
-    # And do the same check as above
-    file_descriptor = self.pool.FindFileByName(
-        'google/protobuf/internal/descriptor_pool_test1.proto')
-    _CheckDefaultValue(file_descriptor)
-
-  def testDefaultValueForCustomMessages(self):
-    """Check the value returned by non-existent fields."""
-    def _CheckValueAndType(value, expected_value, expected_type):
-      self.assertEqual(value, expected_value)
-      self.assertIsInstance(value, expected_type)
-
-    def _CheckDefaultValues(msg):
-      try:
-        int64 = long
-      except NameError:  # Python3
-        int64 = int
-      try:
-        unicode_type = unicode
-      except NameError:  # Python3
-        unicode_type = str
-      _CheckValueAndType(msg.optional_int32, 0, int)
-      _CheckValueAndType(msg.optional_uint64, 0, (int64, int))
-      _CheckValueAndType(msg.optional_float, 0, (float, int))
-      _CheckValueAndType(msg.optional_double, 0, (float, int))
-      _CheckValueAndType(msg.optional_bool, False, bool)
-      _CheckValueAndType(msg.optional_string, u'', unicode_type)
-      _CheckValueAndType(msg.optional_bytes, b'', bytes)
-      _CheckValueAndType(msg.optional_nested_enum, msg.FOO, int)
-    # First for the generated message
-    _CheckDefaultValues(unittest_pb2.TestAllTypes())
-    # Then for a message built with from the DescriptorPool.
-    pool = descriptor_pool.DescriptorPool()
-    pool.Add(descriptor_pb2.FileDescriptorProto.FromString(
-        unittest_import_public_pb2.DESCRIPTOR.serialized_pb))
-    pool.Add(descriptor_pb2.FileDescriptorProto.FromString(
-        unittest_import_pb2.DESCRIPTOR.serialized_pb))
-    pool.Add(descriptor_pb2.FileDescriptorProto.FromString(
-        unittest_pb2.DESCRIPTOR.serialized_pb))
-    message_class = message_factory.MessageFactory(pool).GetPrototype(
-        pool.FindMessageTypeByName(
-            unittest_pb2.TestAllTypes.DESCRIPTOR.full_name))
-    _CheckDefaultValues(message_class())
-
-  def testAddFileDescriptor(self):
-    if isinstance(self, SecondaryDescriptorFromDescriptorDB):
-      if api_implementation.Type() != 'python':
-        # Cpp extension cannot call Add on a DescriptorPool
-        # that uses a DescriptorDatabase.
-        # TODO(jieluo): Fix python and cpp extension diff.
-        return
-    file_desc = descriptor_pb2.FileDescriptorProto(name='some/file.proto')
-    self.pool.Add(file_desc)
-    self.pool.AddSerializedFile(file_desc.SerializeToString())
-
-  def testComplexNesting(self):
-    if isinstance(self, SecondaryDescriptorFromDescriptorDB):
-      if api_implementation.Type() != 'python':
-        # Cpp extension cannot call Add on a DescriptorPool
-        # that uses a DescriptorDatabase.
-        # TODO(jieluo): Fix python and cpp extension diff.
-        return
-    more_messages_desc = descriptor_pb2.FileDescriptorProto.FromString(
-        more_messages_pb2.DESCRIPTOR.serialized_pb)
-    test1_desc = descriptor_pb2.FileDescriptorProto.FromString(
-        descriptor_pool_test1_pb2.DESCRIPTOR.serialized_pb)
-    test2_desc = descriptor_pb2.FileDescriptorProto.FromString(
-        descriptor_pool_test2_pb2.DESCRIPTOR.serialized_pb)
-    self.pool.Add(more_messages_desc)
-    self.pool.Add(test1_desc)
-    self.pool.Add(test2_desc)
-    TEST1_FILE.CheckFile(self, self.pool)
-    TEST2_FILE.CheckFile(self, self.pool)
-
-  def testConflictRegister(self):
-    if isinstance(self, SecondaryDescriptorFromDescriptorDB):
-      if api_implementation.Type() != 'python':
-        # Cpp extension cannot call Add on a DescriptorPool
-        # that uses a DescriptorDatabase.
-        # TODO(jieluo): Fix python and cpp extension diff.
-        return
-    unittest_fd = descriptor_pb2.FileDescriptorProto.FromString(
-        unittest_pb2.DESCRIPTOR.serialized_pb)
-    conflict_fd = copy.deepcopy(unittest_fd)
-    conflict_fd.name = 'other_file'
-    if api_implementation.Type() != 'python':
-        pass
-    else:
-      pool = copy.deepcopy(self.pool)
-      file_descriptor = unittest_pb2.DESCRIPTOR
-      pool._AddDescriptor(
-          file_descriptor.message_types_by_name['TestAllTypes'])
-      pool._AddEnumDescriptor(
-          file_descriptor.enum_types_by_name['ForeignEnum'])
-      pool._AddServiceDescriptor(
-          file_descriptor.services_by_name['TestService'])
-      pool._AddExtensionDescriptor(
-          file_descriptor.extensions_by_name['optional_int32_extension'])
-      pool.Add(unittest_fd)
-      with warnings.catch_warnings(record=True) as w:
-        warnings.simplefilter('always')
-        pool.Add(conflict_fd)
-        self.assertTrue(len(w))
-        self.assertIs(w[0].category, RuntimeWarning)
-        self.assertIn('Conflict register for file "other_file": ',
-                      str(w[0].message))
-      pool.FindFileByName(unittest_fd.name)
-      with self.assertRaises(TypeError):
-        pool.FindFileByName(conflict_fd.name)
-
-
-@testing_refleaks.TestCase
-class DefaultDescriptorPoolTest(DescriptorPoolTestBase, unittest.TestCase):
-
-  def setUp(self):
-    self.pool = descriptor_pool.Default()
-    self.factory_test1_fd = descriptor_pb2.FileDescriptorProto.FromString(
-        factory_test1_pb2.DESCRIPTOR.serialized_pb)
-    self.factory_test2_fd = descriptor_pb2.FileDescriptorProto.FromString(
-        factory_test2_pb2.DESCRIPTOR.serialized_pb)
-
-  def testFindMethods(self):
-    self.assertIs(
-        self.pool.FindFileByName('google/protobuf/unittest.proto'),
-        unittest_pb2.DESCRIPTOR)
-    self.assertIs(
-        self.pool.FindMessageTypeByName('protobuf_unittest.TestAllTypes'),
-        unittest_pb2.TestAllTypes.DESCRIPTOR)
-    self.assertIs(
-        self.pool.FindFieldByName(
-            'protobuf_unittest.TestAllTypes.optional_int32'),
-        unittest_pb2.TestAllTypes.DESCRIPTOR.fields_by_name['optional_int32'])
-    self.assertIs(
-        self.pool.FindEnumTypeByName('protobuf_unittest.ForeignEnum'),
-        unittest_pb2.ForeignEnum.DESCRIPTOR)
-    self.assertIs(
-        self.pool.FindExtensionByName(
-            'protobuf_unittest.optional_int32_extension'),
-        unittest_pb2.DESCRIPTOR.extensions_by_name['optional_int32_extension'])
-    self.assertIs(
-        self.pool.FindOneofByName('protobuf_unittest.TestAllTypes.oneof_field'),
-        unittest_pb2.TestAllTypes.DESCRIPTOR.oneofs_by_name['oneof_field'])
-    self.assertIs(
-        self.pool.FindServiceByName('protobuf_unittest.TestService'),
-        unittest_pb2.DESCRIPTOR.services_by_name['TestService'])
-
-
-@testing_refleaks.TestCase
-class CreateDescriptorPoolTest(DescriptorPoolTestBase, unittest.TestCase):
-
-  def setUp(self):
-    self.pool = descriptor_pool.DescriptorPool()
-    self.factory_test1_fd = descriptor_pb2.FileDescriptorProto.FromString(
-        factory_test1_pb2.DESCRIPTOR.serialized_pb)
-    self.factory_test2_fd = descriptor_pb2.FileDescriptorProto.FromString(
-        factory_test2_pb2.DESCRIPTOR.serialized_pb)
-    self.pool.Add(self.factory_test1_fd)
-    self.pool.Add(self.factory_test2_fd)
-
-    self.pool.Add(descriptor_pb2.FileDescriptorProto.FromString(
-        unittest_import_public_pb2.DESCRIPTOR.serialized_pb))
-    self.pool.Add(descriptor_pb2.FileDescriptorProto.FromString(
-        unittest_import_pb2.DESCRIPTOR.serialized_pb))
-    self.pool.Add(descriptor_pb2.FileDescriptorProto.FromString(
-        unittest_pb2.DESCRIPTOR.serialized_pb))
-    self.pool.Add(descriptor_pb2.FileDescriptorProto.FromString(
-        no_package_pb2.DESCRIPTOR.serialized_pb))
-
-
-@testing_refleaks.TestCase
-class SecondaryDescriptorFromDescriptorDB(DescriptorPoolTestBase,
-                                          unittest.TestCase):
-
-  def setUp(self):
-    self.factory_test1_fd = descriptor_pb2.FileDescriptorProto.FromString(
-        factory_test1_pb2.DESCRIPTOR.serialized_pb)
-    self.factory_test2_fd = descriptor_pb2.FileDescriptorProto.FromString(
-        factory_test2_pb2.DESCRIPTOR.serialized_pb)
-    self.db = descriptor_database.DescriptorDatabase()
-    self.db.Add(self.factory_test1_fd)
-    self.db.Add(self.factory_test2_fd)
-    self.db.Add(descriptor_pb2.FileDescriptorProto.FromString(
-        unittest_import_public_pb2.DESCRIPTOR.serialized_pb))
-    self.db.Add(descriptor_pb2.FileDescriptorProto.FromString(
-        unittest_import_pb2.DESCRIPTOR.serialized_pb))
-    self.db.Add(descriptor_pb2.FileDescriptorProto.FromString(
-        unittest_pb2.DESCRIPTOR.serialized_pb))
-    self.db.Add(descriptor_pb2.FileDescriptorProto.FromString(
-        no_package_pb2.DESCRIPTOR.serialized_pb))
-    self.pool = descriptor_pool.DescriptorPool(descriptor_db=self.db)
-
-  def testErrorCollector(self):
-    file_proto = descriptor_pb2.FileDescriptorProto()
-    file_proto.package = 'collector'
-    file_proto.name = 'error_file'
-    message_type = file_proto.message_type.add()
-    message_type.name = 'ErrorMessage'
-    field = message_type.field.add()
-    field.number = 1
-    field.name = 'nested_message_field'
-    field.label = descriptor.FieldDescriptor.LABEL_OPTIONAL
-    field.type = descriptor.FieldDescriptor.TYPE_MESSAGE
-    field.type_name = 'SubMessage'
-    oneof = message_type.oneof_decl.add()
-    oneof.name = 'MyOneof'
-    enum_type = file_proto.enum_type.add()
-    enum_type.name = 'MyEnum'
-    enum_value = enum_type.value.add()
-    enum_value.name = 'MyEnumValue'
-    enum_value.number = 0
-    self.db.Add(file_proto)
-
-    self.assertRaisesRegex(KeyError, 'SubMessage',
-                           self.pool.FindMessageTypeByName,
-                           'collector.ErrorMessage')
-    self.assertRaisesRegex(KeyError, 'SubMessage', self.pool.FindFileByName,
-                           'error_file')
-    with self.assertRaises(KeyError) as exc:
-      self.pool.FindFileByName('none_file')
-    self.assertIn(str(exc.exception), ('\'none_file\'',
-                                       '\"Couldn\'t find file none_file\"'))
-
-    # Pure python _ConvertFileProtoToFileDescriptor() method has side effect
-    # that all the symbols found in the file will load into the pool even the
-    # file can not build. So when FindMessageTypeByName('ErrorMessage') was
-    # called the first time, a KeyError will be raised but call the find
-    # method later will return a descriptor which is not build.
-    # TODO(jieluo): fix pure python to revert the load if file can not be build
-    if api_implementation.Type() != 'python':
-      error_msg = ('Invalid proto descriptor for file "error_file":\\n  '
-                   'collector.ErrorMessage.nested_message_field: "SubMessage" '
-                   'is not defined.\\n  collector.ErrorMessage.MyOneof: Oneof '
-                   'must have at least one field.\\n\'')
-      with self.assertRaises(KeyError) as exc:
-        self.pool.FindMessageTypeByName('collector.ErrorMessage')
-      self.assertEqual(str(exc.exception), '\'Couldn\\\'t build file for '
-                       'message collector.ErrorMessage\\n' + error_msg)
-
-      with self.assertRaises(KeyError) as exc:
-        self.pool.FindFieldByName('collector.ErrorMessage.nested_message_field')
-      self.assertEqual(str(exc.exception), '\'Couldn\\\'t build file for field'
-                       ' collector.ErrorMessage.nested_message_field\\n'
-                       + error_msg)
-
-      with self.assertRaises(KeyError) as exc:
-        self.pool.FindEnumTypeByName('collector.MyEnum')
-      self.assertEqual(str(exc.exception), '\'Couldn\\\'t build file for enum'
-                       ' collector.MyEnum\\n' + error_msg)
-
-      with self.assertRaises(KeyError) as exc:
-        self.pool.FindFileContainingSymbol('collector.MyEnumValue')
-      self.assertEqual(str(exc.exception), '\'Couldn\\\'t build file for symbol'
-                       ' collector.MyEnumValue\\n' + error_msg)
-
-      with self.assertRaises(KeyError) as exc:
-        self.pool.FindOneofByName('collector.ErrorMessage.MyOneof')
-      self.assertEqual(str(exc.exception), '\'Couldn\\\'t build file for oneof'
-                       ' collector.ErrorMessage.MyOneof\\n' + error_msg)
-
-
-class ProtoFile(object):
-
-  def __init__(self, name, package, messages, dependencies=None,
-               public_dependencies=None):
-    self.name = name
-    self.package = package
-    self.messages = messages
-    self.dependencies = dependencies or []
-    self.public_dependencies = public_dependencies or []
-
-  def CheckFile(self, test, pool):
-    file_desc = pool.FindFileByName(self.name)
-    test.assertEqual(self.name, file_desc.name)
-    test.assertEqual(self.package, file_desc.package)
-    dependencies_names = [f.name for f in file_desc.dependencies]
-    test.assertEqual(self.dependencies, dependencies_names)
-    public_dependencies_names = [f.name for f in file_desc.public_dependencies]
-    test.assertEqual(self.public_dependencies, public_dependencies_names)
-    for name, msg_type in self.messages.items():
-      msg_type.CheckType(test, None, name, file_desc)
-
-
-class EnumType(object):
-
-  def __init__(self, values):
-    self.values = values
-
-  def CheckType(self, test, msg_desc, name, file_desc):
-    enum_desc = msg_desc.enum_types_by_name[name]
-    test.assertEqual(name, enum_desc.name)
-    expected_enum_full_name = '.'.join([msg_desc.full_name, name])
-    test.assertEqual(expected_enum_full_name, enum_desc.full_name)
-    test.assertEqual(msg_desc, enum_desc.containing_type)
-    test.assertEqual(file_desc, enum_desc.file)
-    for index, (value, number) in enumerate(self.values):
-      value_desc = enum_desc.values_by_name[value]
-      test.assertEqual(value, value_desc.name)
-      test.assertEqual(index, value_desc.index)
-      test.assertEqual(number, value_desc.number)
-      test.assertEqual(enum_desc, value_desc.type)
-      test.assertIn(value, msg_desc.enum_values_by_name)
-
-
-class MessageType(object):
-
-  def __init__(self, type_dict, field_list, is_extendable=False,
-               extensions=None):
-    self.type_dict = type_dict
-    self.field_list = field_list
-    self.is_extendable = is_extendable
-    self.extensions = extensions or []
-
-  def CheckType(self, test, containing_type_desc, name, file_desc):
-    if containing_type_desc is None:
-      desc = file_desc.message_types_by_name[name]
-      expected_full_name = '.'.join([file_desc.package, name])
-    else:
-      desc = containing_type_desc.nested_types_by_name[name]
-      expected_full_name = '.'.join([containing_type_desc.full_name, name])
-
-    test.assertEqual(name, desc.name)
-    test.assertEqual(expected_full_name, desc.full_name)
-    test.assertEqual(containing_type_desc, desc.containing_type)
-    test.assertEqual(desc.file, file_desc)
-    test.assertEqual(self.is_extendable, desc.is_extendable)
-    for name, subtype in self.type_dict.items():
-      subtype.CheckType(test, desc, name, file_desc)
-
-    for index, (name, field) in enumerate(self.field_list):
-      field.CheckField(test, desc, name, index, file_desc)
-
-    for index, (name, field) in enumerate(self.extensions):
-      field.CheckField(test, desc, name, index, file_desc)
-
-
-class EnumField(object):
-
-  def __init__(self, number, type_name, default_value):
-    self.number = number
-    self.type_name = type_name
-    self.default_value = default_value
-
-  def CheckField(self, test, msg_desc, name, index, file_desc):
-    field_desc = msg_desc.fields_by_name[name]
-    enum_desc = msg_desc.enum_types_by_name[self.type_name]
-    test.assertEqual(name, field_desc.name)
-    expected_field_full_name = '.'.join([msg_desc.full_name, name])
-    test.assertEqual(expected_field_full_name, field_desc.full_name)
-    test.assertEqual(index, field_desc.index)
-    test.assertEqual(self.number, field_desc.number)
-    test.assertEqual(descriptor.FieldDescriptor.TYPE_ENUM, field_desc.type)
-    test.assertEqual(descriptor.FieldDescriptor.CPPTYPE_ENUM,
-                     field_desc.cpp_type)
-    test.assertTrue(field_desc.has_default_value)
-    test.assertEqual(enum_desc.values_by_name[self.default_value].number,
-                     field_desc.default_value)
-    test.assertFalse(enum_desc.values_by_name[self.default_value].has_options)
-    test.assertEqual(msg_desc, field_desc.containing_type)
-    test.assertEqual(enum_desc, field_desc.enum_type)
-    test.assertEqual(file_desc, enum_desc.file)
-
-
-class MessageField(object):
-
-  def __init__(self, number, type_name):
-    self.number = number
-    self.type_name = type_name
-
-  def CheckField(self, test, msg_desc, name, index, file_desc):
-    field_desc = msg_desc.fields_by_name[name]
-    field_type_desc = msg_desc.nested_types_by_name[self.type_name]
-    test.assertEqual(name, field_desc.name)
-    expected_field_full_name = '.'.join([msg_desc.full_name, name])
-    test.assertEqual(expected_field_full_name, field_desc.full_name)
-    test.assertEqual(index, field_desc.index)
-    test.assertEqual(self.number, field_desc.number)
-    test.assertEqual(descriptor.FieldDescriptor.TYPE_MESSAGE, field_desc.type)
-    test.assertEqual(descriptor.FieldDescriptor.CPPTYPE_MESSAGE,
-                     field_desc.cpp_type)
-    test.assertFalse(field_desc.has_default_value)
-    test.assertEqual(msg_desc, field_desc.containing_type)
-    test.assertEqual(field_type_desc, field_desc.message_type)
-    test.assertEqual(file_desc, field_desc.file)
-    test.assertEqual(field_desc.default_value, None)
-
-
-class StringField(object):
-
-  def __init__(self, number, default_value):
-    self.number = number
-    self.default_value = default_value
-
-  def CheckField(self, test, msg_desc, name, index, file_desc):
-    field_desc = msg_desc.fields_by_name[name]
-    test.assertEqual(name, field_desc.name)
-    expected_field_full_name = '.'.join([msg_desc.full_name, name])
-    test.assertEqual(expected_field_full_name, field_desc.full_name)
-    test.assertEqual(index, field_desc.index)
-    test.assertEqual(self.number, field_desc.number)
-    test.assertEqual(descriptor.FieldDescriptor.TYPE_STRING, field_desc.type)
-    test.assertEqual(descriptor.FieldDescriptor.CPPTYPE_STRING,
-                     field_desc.cpp_type)
-    test.assertTrue(field_desc.has_default_value)
-    test.assertEqual(self.default_value, field_desc.default_value)
-    test.assertEqual(file_desc, field_desc.file)
-
-
-class ExtensionField(object):
-
-  def __init__(self, number, extended_type):
-    self.number = number
-    self.extended_type = extended_type
-
-  def CheckField(self, test, msg_desc, name, index, file_desc):
-    field_desc = msg_desc.extensions_by_name[name]
-    test.assertEqual(name, field_desc.name)
-    expected_field_full_name = '.'.join([msg_desc.full_name, name])
-    test.assertEqual(expected_field_full_name, field_desc.full_name)
-    test.assertEqual(self.number, field_desc.number)
-    test.assertEqual(index, field_desc.index)
-    test.assertEqual(descriptor.FieldDescriptor.TYPE_MESSAGE, field_desc.type)
-    test.assertEqual(descriptor.FieldDescriptor.CPPTYPE_MESSAGE,
-                     field_desc.cpp_type)
-    test.assertFalse(field_desc.has_default_value)
-    test.assertTrue(field_desc.is_extension)
-    test.assertEqual(msg_desc, field_desc.extension_scope)
-    test.assertEqual(msg_desc, field_desc.message_type)
-    test.assertEqual(self.extended_type, field_desc.containing_type.name)
-    test.assertEqual(file_desc, field_desc.file)
-
-
-@testing_refleaks.TestCase
-class AddDescriptorTest(unittest.TestCase):
-
-  def _TestMessage(self, prefix):
-    pool = descriptor_pool.DescriptorPool()
-    pool._AddDescriptor(unittest_pb2.TestAllTypes.DESCRIPTOR)
-    self.assertEqual(
-        'protobuf_unittest.TestAllTypes',
-        pool.FindMessageTypeByName(
-            prefix + 'protobuf_unittest.TestAllTypes').full_name)
-
-    # AddDescriptor is not recursive.
-    with self.assertRaises(KeyError):
-      pool.FindMessageTypeByName(
-          prefix + 'protobuf_unittest.TestAllTypes.NestedMessage')
-
-    pool._AddDescriptor(unittest_pb2.TestAllTypes.NestedMessage.DESCRIPTOR)
-    self.assertEqual(
-        'protobuf_unittest.TestAllTypes.NestedMessage',
-        pool.FindMessageTypeByName(
-            prefix + 'protobuf_unittest.TestAllTypes.NestedMessage').full_name)
-
-    # Files are implicitly also indexed when messages are added.
-    self.assertEqual(
-        'google/protobuf/unittest.proto',
-        pool.FindFileByName(
-            'google/protobuf/unittest.proto').name)
-
-    self.assertEqual(
-        'google/protobuf/unittest.proto',
-        pool.FindFileContainingSymbol(
-            prefix + 'protobuf_unittest.TestAllTypes.NestedMessage').name)
-
-  @unittest.skipIf(api_implementation.Type() != 'python',
-                   'Only pure python allows _Add*()')
-  def testMessage(self):
-    self._TestMessage('')
-    self._TestMessage('.')
-
-  def _TestEnum(self, prefix):
-    pool = descriptor_pool.DescriptorPool()
-    if api_implementation.Type() == 'cpp':
-      pool.AddEnumDescriptor(unittest_pb2.ForeignEnum.DESCRIPTOR)
-    else:
-      pool._AddEnumDescriptor(unittest_pb2.ForeignEnum.DESCRIPTOR)
-    self.assertEqual(
-        'protobuf_unittest.ForeignEnum',
-        pool.FindEnumTypeByName(
-            prefix + 'protobuf_unittest.ForeignEnum').full_name)
-
-    # AddEnumDescriptor is not recursive.
-    with self.assertRaises(KeyError):
-      pool.FindEnumTypeByName(
-          prefix + 'protobuf_unittest.ForeignEnum.NestedEnum')
-
-    if api_implementation.Type() == 'cpp':
-      pool.AddEnumDescriptor(unittest_pb2.TestAllTypes.NestedEnum.DESCRIPTOR)
-    else:
-      pool._AddEnumDescriptor(unittest_pb2.TestAllTypes.NestedEnum.DESCRIPTOR)
-    self.assertEqual(
-        'protobuf_unittest.TestAllTypes.NestedEnum',
-        pool.FindEnumTypeByName(
-            prefix + 'protobuf_unittest.TestAllTypes.NestedEnum').full_name)
-
-    # Files are implicitly also indexed when enums are added.
-    self.assertEqual(
-        'google/protobuf/unittest.proto',
-        pool.FindFileByName(
-            'google/protobuf/unittest.proto').name)
-
-    self.assertEqual(
-        'google/protobuf/unittest.proto',
-        pool.FindFileContainingSymbol(
-            prefix + 'protobuf_unittest.TestAllTypes.NestedEnum').name)
-
-  @unittest.skipIf(api_implementation.Type() != 'python',
-                   'Only pure python allows _Add*()')
-  def testEnum(self):
-    self._TestEnum('')
-    self._TestEnum('.')
-
-  @unittest.skipIf(api_implementation.Type() != 'python',
-                   'Only pure python allows _Add*()')
-  def testService(self):
-    pool = descriptor_pool.DescriptorPool()
-    with self.assertRaises(KeyError):
-      pool.FindServiceByName('protobuf_unittest.TestService')
-    pool._AddServiceDescriptor(unittest_pb2._TESTSERVICE)
-    self.assertEqual(
-        'protobuf_unittest.TestService',
-        pool.FindServiceByName('protobuf_unittest.TestService').full_name)
-
-  @unittest.skipIf(api_implementation.Type() != 'python',
-                   'Only pure python allows _Add*()')
-  def testFile(self):
-    pool = descriptor_pool.DescriptorPool()
-    pool._AddFileDescriptor(unittest_pb2.DESCRIPTOR)
-    self.assertEqual(
-        'google/protobuf/unittest.proto',
-        pool.FindFileByName(
-            'google/protobuf/unittest.proto').name)
-
-    # AddFileDescriptor is not recursive; messages and enums within files must
-    # be explicitly registered.
-    with self.assertRaises(KeyError):
-      pool.FindFileContainingSymbol(
-          'protobuf_unittest.TestAllTypes')
-
-  def testEmptyDescriptorPool(self):
-    # Check that an empty DescriptorPool() contains no messages.
-    pool = descriptor_pool.DescriptorPool()
-    proto_file_name = descriptor_pb2.DESCRIPTOR.name
-    self.assertRaises(KeyError, pool.FindFileByName, proto_file_name)
-    # Add the above file to the pool
-    file_descriptor = descriptor_pb2.FileDescriptorProto()
-    descriptor_pb2.DESCRIPTOR.CopyToProto(file_descriptor)
-    pool.Add(file_descriptor)
-    # Now it exists.
-    self.assertTrue(pool.FindFileByName(proto_file_name))
-
-  def testCustomDescriptorPool(self):
-    # Create a new pool, and add a file descriptor.
-    pool = descriptor_pool.DescriptorPool()
-    file_desc = descriptor_pb2.FileDescriptorProto(
-        name='some/file.proto', package='package')
-    file_desc.message_type.add(name='Message')
-    pool.Add(file_desc)
-    self.assertEqual(pool.FindFileByName('some/file.proto').name,
-                     'some/file.proto')
-    self.assertEqual(pool.FindMessageTypeByName('package.Message').name,
-                     'Message')
-    # Test no package
-    file_proto = descriptor_pb2.FileDescriptorProto(
-        name='some/filename/container.proto')
-    message_proto = file_proto.message_type.add(
-        name='TopMessage')
-    message_proto.field.add(
-        name='bb',
-        number=1,
-        type=descriptor_pb2.FieldDescriptorProto.TYPE_INT32,
-        label=descriptor_pb2.FieldDescriptorProto.LABEL_OPTIONAL)
-    enum_proto = file_proto.enum_type.add(name='TopEnum')
-    enum_proto.value.add(name='FOREIGN_FOO', number=4)
-    file_proto.service.add(name='TopService')
-    pool = descriptor_pool.DescriptorPool()
-    pool.Add(file_proto)
-    self.assertEqual('TopMessage',
-                     pool.FindMessageTypeByName('TopMessage').name)
-    self.assertEqual('TopEnum', pool.FindEnumTypeByName('TopEnum').name)
-    self.assertEqual('TopService', pool.FindServiceByName('TopService').name)
-
-  def testFileDescriptorOptionsWithCustomDescriptorPool(self):
-    # Create a descriptor pool, and add a new FileDescriptorProto to it.
-    pool = descriptor_pool.DescriptorPool()
-    file_name = 'file_descriptor_options_with_custom_descriptor_pool.proto'
-    file_descriptor_proto = descriptor_pb2.FileDescriptorProto(name=file_name)
-    extension_id = file_options_test_pb2.foo_options
-    file_descriptor_proto.options.Extensions[extension_id].foo_name = 'foo'
-    pool.Add(file_descriptor_proto)
-    # The options set on the FileDescriptorProto should be available in the
-    # descriptor even if they contain extensions that cannot be deserialized
-    # using the pool.
-    file_descriptor = pool.FindFileByName(file_name)
-    options = file_descriptor.GetOptions()
-    self.assertEqual('foo', options.Extensions[extension_id].foo_name)
-    # The object returned by GetOptions() is cached.
-    self.assertIs(options, file_descriptor.GetOptions())
-
-  def testAddTypeError(self):
-    pool = descriptor_pool.DescriptorPool()
-    if api_implementation.Type() != 'python':
-      with self.assertRaises(TypeError):
-        pool.AddDescriptor(0)
-      with self.assertRaises(TypeError):
-        pool.AddEnumDescriptor(0)
-      with self.assertRaises(TypeError):
-        pool.AddServiceDescriptor(0)
-      with self.assertRaises(TypeError):
-        pool.AddExtensionDescriptor(0)
-      with self.assertRaises(TypeError):
-        pool.AddFileDescriptor(0)
-    else:
-      with self.assertRaises(TypeError):
-        pool._AddDescriptor(0)
-      with self.assertRaises(TypeError):
-        pool._AddEnumDescriptor(0)
-      with self.assertRaises(TypeError):
-        pool._AddServiceDescriptor(0)
-      with self.assertRaises(TypeError):
-        pool._AddExtensionDescriptor(0)
-      with self.assertRaises(TypeError):
-        pool._AddFileDescriptor(0)
-
-
-TEST1_FILE = ProtoFile(
-    'google/protobuf/internal/descriptor_pool_test1.proto',
-    'google.protobuf.python.internal',
-    {
-        'DescriptorPoolTest1': MessageType({
-            'NestedEnum': EnumType([('ALPHA', 1), ('BETA', 2)]),
-            'NestedMessage': MessageType({
-                'NestedEnum': EnumType([('EPSILON', 5), ('ZETA', 6)]),
-                'DeepNestedMessage': MessageType({
-                    'NestedEnum': EnumType([('ETA', 7), ('THETA', 8)]),
-                }, [
-                    ('nested_enum', EnumField(1, 'NestedEnum', 'ETA')),
-                    ('nested_field', StringField(2, 'theta')),
-                ]),
-            }, [
-                ('nested_enum', EnumField(1, 'NestedEnum', 'ZETA')),
-                ('nested_field', StringField(2, 'beta')),
-                ('deep_nested_message', MessageField(3, 'DeepNestedMessage')),
-            ])
-        }, [
-            ('nested_enum', EnumField(1, 'NestedEnum', 'BETA')),
-            ('nested_message', MessageField(2, 'NestedMessage')),
-        ], is_extendable=True),
-
-        'DescriptorPoolTest2': MessageType({
-            'NestedEnum': EnumType([('GAMMA', 3), ('DELTA', 4)]),
-            'NestedMessage': MessageType({
-                'NestedEnum': EnumType([('IOTA', 9), ('KAPPA', 10)]),
-                'DeepNestedMessage': MessageType({
-                    'NestedEnum': EnumType([('LAMBDA', 11), ('MU', 12)]),
-                }, [
-                    ('nested_enum', EnumField(1, 'NestedEnum', 'MU')),
-                    ('nested_field', StringField(2, 'lambda')),
-                ]),
-            }, [
-                ('nested_enum', EnumField(1, 'NestedEnum', 'IOTA')),
-                ('nested_field', StringField(2, 'delta')),
-                ('deep_nested_message', MessageField(3, 'DeepNestedMessage')),
-            ])
-        }, [
-            ('nested_enum', EnumField(1, 'NestedEnum', 'GAMMA')),
-            ('nested_message', MessageField(2, 'NestedMessage')),
-        ]),
-    })
-
-
-TEST2_FILE = ProtoFile(
-    'google/protobuf/internal/descriptor_pool_test2.proto',
-    'google.protobuf.python.internal',
-    {
-        'DescriptorPoolTest3': MessageType({
-            'NestedEnum': EnumType([('NU', 13), ('XI', 14)]),
-            'NestedMessage': MessageType({
-                'NestedEnum': EnumType([('OMICRON', 15), ('PI', 16)]),
-                'DeepNestedMessage': MessageType({
-                    'NestedEnum': EnumType([('RHO', 17), ('SIGMA', 18)]),
-                }, [
-                    ('nested_enum', EnumField(1, 'NestedEnum', 'RHO')),
-                    ('nested_field', StringField(2, 'sigma')),
-                ]),
-            }, [
-                ('nested_enum', EnumField(1, 'NestedEnum', 'PI')),
-                ('nested_field', StringField(2, 'nu')),
-                ('deep_nested_message', MessageField(3, 'DeepNestedMessage')),
-            ])
-        }, [
-            ('nested_enum', EnumField(1, 'NestedEnum', 'XI')),
-            ('nested_message', MessageField(2, 'NestedMessage')),
-        ], extensions=[
-            ('descriptor_pool_test',
-             ExtensionField(1001, 'DescriptorPoolTest1')),
-        ]),
-    },
-    dependencies=['google/protobuf/internal/descriptor_pool_test1.proto',
-                  'google/protobuf/internal/more_messages.proto'],
-    public_dependencies=['google/protobuf/internal/more_messages.proto'])
-
-
-if __name__ == '__main__':
-  unittest.main()
diff --git a/libs/protobuf/python/google/protobuf/internal/descriptor_pool_test1.proto b/libs/protobuf/python/google/protobuf/internal/descriptor_pool_test1.proto
deleted file mode 100644
index 00816b7..0000000
--- a/libs/protobuf/python/google/protobuf/internal/descriptor_pool_test1.proto
+++ /dev/null
@@ -1,96 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto2";
-
-package google.protobuf.python.internal;
-
-
-message DescriptorPoolTest1 {
-  extensions 1000 to max;
-
-  enum NestedEnum {
-    ALPHA = 1;
-    BETA = 2;
-  }
-
-  optional NestedEnum nested_enum = 1 [default = BETA];
-
-  message NestedMessage {
-    enum NestedEnum {
-      EPSILON = 5;
-      ZETA = 6;
-    }
-    optional NestedEnum nested_enum = 1 [default = ZETA];
-    optional string nested_field = 2 [default = "beta"];
-    optional DeepNestedMessage deep_nested_message = 3;
-
-    message DeepNestedMessage {
-      enum NestedEnum {
-        ETA = 7;
-        THETA = 8;
-      }
-      optional NestedEnum nested_enum = 1 [default = ETA];
-      optional string nested_field = 2 [default = "theta"];
-    }
-  }
-
-  optional NestedMessage nested_message = 2;
-}
-
-message DescriptorPoolTest2 {
-  enum NestedEnum {
-    GAMMA = 3;
-    DELTA = 4;
-  }
-
-  optional NestedEnum nested_enum = 1 [default = GAMMA];
-
-  message NestedMessage {
-    enum NestedEnum {
-      IOTA = 9;
-      KAPPA = 10;
-    }
-    optional NestedEnum nested_enum = 1 [default = IOTA];
-    optional string nested_field = 2 [default = "delta"];
-    optional DeepNestedMessage deep_nested_message = 3;
-
-    message DeepNestedMessage {
-      enum NestedEnum {
-        LAMBDA = 11;
-        MU = 12;
-      }
-      optional NestedEnum nested_enum = 1 [default = MU];
-      optional string nested_field = 2 [default = "lambda"];
-    }
-  }
-
-  optional NestedMessage nested_message = 2;
-}
diff --git a/libs/protobuf/python/google/protobuf/internal/descriptor_pool_test2.proto b/libs/protobuf/python/google/protobuf/internal/descriptor_pool_test2.proto
deleted file mode 100644
index a218ecc..0000000
--- a/libs/protobuf/python/google/protobuf/internal/descriptor_pool_test2.proto
+++ /dev/null
@@ -1,73 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto2";
-
-package google.protobuf.python.internal;
-
-import "google/protobuf/internal/descriptor_pool_test1.proto";
-import public "google/protobuf/internal/more_messages.proto";
-
-
-message DescriptorPoolTest3 {
-
-  extend DescriptorPoolTest1 {
-    optional DescriptorPoolTest3 descriptor_pool_test = 1001;
-  }
-
-  enum NestedEnum {
-    NU = 13;
-    XI = 14;
-  }
-
-  optional NestedEnum nested_enum = 1 [default = XI];
-
-  message NestedMessage {
-    enum NestedEnum {
-      OMICRON = 15;
-      PI = 16;
-    }
-    optional NestedEnum nested_enum = 1 [default = PI];
-    optional string nested_field = 2 [default = "nu"];
-    optional DeepNestedMessage deep_nested_message = 3;
-
-    message DeepNestedMessage {
-      enum NestedEnum {
-        RHO = 17;
-        SIGMA = 18;
-      }
-      optional NestedEnum nested_enum = 1 [default = RHO];
-      optional string nested_field = 2 [default = "sigma"];
-    }
-  }
-
-  optional NestedMessage nested_message = 2;
-}
-
diff --git a/libs/protobuf/python/google/protobuf/internal/descriptor_test.py b/libs/protobuf/python/google/protobuf/internal/descriptor_test.py
deleted file mode 100644
index 6a8532c..0000000
--- a/libs/protobuf/python/google/protobuf/internal/descriptor_test.py
+++ /dev/null
@@ -1,1076 +0,0 @@
-# Protocol Buffers - Google's data interchange format
-# Copyright 2008 Google Inc.  All rights reserved.
-# https://developers.google.com/protocol-buffers/
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-"""Unittest for google.protobuf.internal.descriptor."""
-
-__author__ = 'robinson@google.com (Will Robinson)'
-
-import unittest
-import warnings
-
-from google.protobuf import unittest_custom_options_pb2
-from google.protobuf import unittest_import_pb2
-from google.protobuf import unittest_pb2
-from google.protobuf import descriptor_pb2
-from google.protobuf.internal import api_implementation
-from google.protobuf.internal import test_util
-from google.protobuf import descriptor
-from google.protobuf import descriptor_pool
-from google.protobuf import symbol_database
-from google.protobuf import text_format
-
-
-TEST_EMPTY_MESSAGE_DESCRIPTOR_ASCII = """
-name: 'TestEmptyMessage'
-"""
-
-TEST_FILE_DESCRIPTOR_DEBUG = """syntax = "proto2";
-
-package protobuf_unittest;
-
-message NestedMessage {
-  enum ForeignEnum {
-    FOREIGN_FOO = 4;
-    FOREIGN_BAR = 5;
-    FOREIGN_BAZ = 6;
-  }
-  optional int32 bb = 1;
-}
-
-message ResponseMessage {
-}
-
-service Service {
-  rpc CallMethod(.protobuf_unittest.NestedMessage) returns (.protobuf_unittest.ResponseMessage);
-}
-
-"""
-
-
-warnings.simplefilter('error', DeprecationWarning)
-
-
-class DescriptorTest(unittest.TestCase):
-
-  def setUp(self):
-    file_proto = descriptor_pb2.FileDescriptorProto(
-        name='some/filename/some.proto',
-        package='protobuf_unittest')
-    message_proto = file_proto.message_type.add(
-        name='NestedMessage')
-    message_proto.field.add(
-        name='bb',
-        number=1,
-        type=descriptor_pb2.FieldDescriptorProto.TYPE_INT32,
-        label=descriptor_pb2.FieldDescriptorProto.LABEL_OPTIONAL)
-    enum_proto = message_proto.enum_type.add(
-        name='ForeignEnum')
-    enum_proto.value.add(name='FOREIGN_FOO', number=4)
-    enum_proto.value.add(name='FOREIGN_BAR', number=5)
-    enum_proto.value.add(name='FOREIGN_BAZ', number=6)
-
-    file_proto.message_type.add(name='ResponseMessage')
-    service_proto = file_proto.service.add(
-        name='Service')
-    method_proto = service_proto.method.add(
-        name='CallMethod',
-        input_type='.protobuf_unittest.NestedMessage',
-        output_type='.protobuf_unittest.ResponseMessage')
-
-    # Note: Calling DescriptorPool.Add() multiple times with the same file only
-    # works if the input is canonical; in particular, all type names must be
-    # fully qualified.
-    self.pool = self.GetDescriptorPool()
-    self.pool.Add(file_proto)
-    self.my_file = self.pool.FindFileByName(file_proto.name)
-    self.my_message = self.my_file.message_types_by_name[message_proto.name]
-    self.my_enum = self.my_message.enum_types_by_name[enum_proto.name]
-    self.my_service = self.my_file.services_by_name[service_proto.name]
-    self.my_method = self.my_service.methods_by_name[method_proto.name]
-
-  def GetDescriptorPool(self):
-    return symbol_database.Default().pool
-
-  def testEnumValueName(self):
-    self.assertEqual(self.my_message.EnumValueName('ForeignEnum', 4),
-                     'FOREIGN_FOO')
-
-    self.assertEqual(
-        self.my_message.enum_types_by_name[
-            'ForeignEnum'].values_by_number[4].name,
-        self.my_message.EnumValueName('ForeignEnum', 4))
-    with self.assertRaises(KeyError):
-      self.my_message.EnumValueName('ForeignEnum', 999)
-    with self.assertRaises(KeyError):
-      self.my_message.EnumValueName('NoneEnum', 999)
-    with self.assertRaises(TypeError):
-      self.my_message.EnumValueName()
-
-  def testEnumFixups(self):
-    self.assertEqual(self.my_enum, self.my_enum.values[0].type)
-
-  def testContainingTypeFixups(self):
-    self.assertEqual(self.my_message, self.my_message.fields[0].containing_type)
-    self.assertEqual(self.my_message, self.my_enum.containing_type)
-
-  def testContainingServiceFixups(self):
-    self.assertEqual(self.my_service, self.my_method.containing_service)
-
-  @unittest.skipIf(
-      api_implementation.Type() == 'python',
-      'GetDebugString is only available with the cpp implementation',
-  )
-  def testGetDebugString(self):
-    self.assertEqual(self.my_file.GetDebugString(), TEST_FILE_DESCRIPTOR_DEBUG)
-
-  def testGetOptions(self):
-    self.assertEqual(self.my_enum.GetOptions(),
-                     descriptor_pb2.EnumOptions())
-    self.assertEqual(self.my_enum.values[0].GetOptions(),
-                     descriptor_pb2.EnumValueOptions())
-    self.assertEqual(self.my_message.GetOptions(),
-                     descriptor_pb2.MessageOptions())
-    self.assertEqual(self.my_message.fields[0].GetOptions(),
-                     descriptor_pb2.FieldOptions())
-    self.assertEqual(self.my_method.GetOptions(),
-                     descriptor_pb2.MethodOptions())
-    self.assertEqual(self.my_service.GetOptions(),
-                     descriptor_pb2.ServiceOptions())
-
-  def testSimpleCustomOptions(self):
-    file_descriptor = unittest_custom_options_pb2.DESCRIPTOR
-    message_descriptor = (unittest_custom_options_pb2.
-                          TestMessageWithCustomOptions.DESCRIPTOR)
-    field_descriptor = message_descriptor.fields_by_name['field1']
-    oneof_descriptor = message_descriptor.oneofs_by_name['AnOneof']
-    enum_descriptor = message_descriptor.enum_types_by_name['AnEnum']
-    enum_value_descriptor = (message_descriptor.
-                             enum_values_by_name['ANENUM_VAL2'])
-    other_enum_value_descriptor = (message_descriptor.
-                                   enum_values_by_name['ANENUM_VAL1'])
-    service_descriptor = (unittest_custom_options_pb2.
-                          TestServiceWithCustomOptions.DESCRIPTOR)
-    method_descriptor = service_descriptor.FindMethodByName('Foo')
-
-    file_options = file_descriptor.GetOptions()
-    file_opt1 = unittest_custom_options_pb2.file_opt1
-    self.assertEqual(9876543210, file_options.Extensions[file_opt1])
-    message_options = message_descriptor.GetOptions()
-    message_opt1 = unittest_custom_options_pb2.message_opt1
-    self.assertEqual(-56, message_options.Extensions[message_opt1])
-    field_options = field_descriptor.GetOptions()
-    field_opt1 = unittest_custom_options_pb2.field_opt1
-    self.assertEqual(8765432109, field_options.Extensions[field_opt1])
-    field_opt2 = unittest_custom_options_pb2.field_opt2
-    self.assertEqual(42, field_options.Extensions[field_opt2])
-    oneof_options = oneof_descriptor.GetOptions()
-    oneof_opt1 = unittest_custom_options_pb2.oneof_opt1
-    self.assertEqual(-99, oneof_options.Extensions[oneof_opt1])
-    enum_options = enum_descriptor.GetOptions()
-    enum_opt1 = unittest_custom_options_pb2.enum_opt1
-    self.assertEqual(-789, enum_options.Extensions[enum_opt1])
-    enum_value_options = enum_value_descriptor.GetOptions()
-    enum_value_opt1 = unittest_custom_options_pb2.enum_value_opt1
-    self.assertEqual(123, enum_value_options.Extensions[enum_value_opt1])
-
-    service_options = service_descriptor.GetOptions()
-    service_opt1 = unittest_custom_options_pb2.service_opt1
-    self.assertEqual(-9876543210, service_options.Extensions[service_opt1])
-    method_options = method_descriptor.GetOptions()
-    method_opt1 = unittest_custom_options_pb2.method_opt1
-    self.assertEqual(unittest_custom_options_pb2.METHODOPT1_VAL2,
-                     method_options.Extensions[method_opt1])
-
-    message_descriptor = (
-        unittest_custom_options_pb2.DummyMessageContainingEnum.DESCRIPTOR)
-    self.assertTrue(file_descriptor.has_options)
-    self.assertFalse(message_descriptor.has_options)
-    self.assertTrue(field_descriptor.has_options)
-    self.assertTrue(oneof_descriptor.has_options)
-    self.assertTrue(enum_descriptor.has_options)
-    self.assertTrue(enum_value_descriptor.has_options)
-    self.assertFalse(other_enum_value_descriptor.has_options)
-
-  def testCustomOptionsCopyTo(self):
-    message_descriptor = (unittest_custom_options_pb2.
-                          TestMessageWithCustomOptions.DESCRIPTOR)
-    message_proto = descriptor_pb2.DescriptorProto()
-    message_descriptor.CopyToProto(message_proto)
-    self.assertEqual(len(message_proto.options.ListFields()),
-                     2)
-
-  def testDifferentCustomOptionTypes(self):
-    kint32min = -2**31
-    kint64min = -2**63
-    kint32max = 2**31 - 1
-    kint64max = 2**63 - 1
-    kuint32max = 2**32 - 1
-    kuint64max = 2**64 - 1
-
-    message_descriptor =\
-        unittest_custom_options_pb2.CustomOptionMinIntegerValues.DESCRIPTOR
-    message_options = message_descriptor.GetOptions()
-    self.assertEqual(False, message_options.Extensions[
-        unittest_custom_options_pb2.bool_opt])
-    self.assertEqual(kint32min, message_options.Extensions[
-        unittest_custom_options_pb2.int32_opt])
-    self.assertEqual(kint64min, message_options.Extensions[
-        unittest_custom_options_pb2.int64_opt])
-    self.assertEqual(0, message_options.Extensions[
-        unittest_custom_options_pb2.uint32_opt])
-    self.assertEqual(0, message_options.Extensions[
-        unittest_custom_options_pb2.uint64_opt])
-    self.assertEqual(kint32min, message_options.Extensions[
-        unittest_custom_options_pb2.sint32_opt])
-    self.assertEqual(kint64min, message_options.Extensions[
-        unittest_custom_options_pb2.sint64_opt])
-    self.assertEqual(0, message_options.Extensions[
-        unittest_custom_options_pb2.fixed32_opt])
-    self.assertEqual(0, message_options.Extensions[
-        unittest_custom_options_pb2.fixed64_opt])
-    self.assertEqual(kint32min, message_options.Extensions[
-        unittest_custom_options_pb2.sfixed32_opt])
-    self.assertEqual(kint64min, message_options.Extensions[
-        unittest_custom_options_pb2.sfixed64_opt])
-
-    message_descriptor =\
-        unittest_custom_options_pb2.CustomOptionMaxIntegerValues.DESCRIPTOR
-    message_options = message_descriptor.GetOptions()
-    self.assertEqual(True, message_options.Extensions[
-        unittest_custom_options_pb2.bool_opt])
-    self.assertEqual(kint32max, message_options.Extensions[
-        unittest_custom_options_pb2.int32_opt])
-    self.assertEqual(kint64max, message_options.Extensions[
-        unittest_custom_options_pb2.int64_opt])
-    self.assertEqual(kuint32max, message_options.Extensions[
-        unittest_custom_options_pb2.uint32_opt])
-    self.assertEqual(kuint64max, message_options.Extensions[
-        unittest_custom_options_pb2.uint64_opt])
-    self.assertEqual(kint32max, message_options.Extensions[
-        unittest_custom_options_pb2.sint32_opt])
-    self.assertEqual(kint64max, message_options.Extensions[
-        unittest_custom_options_pb2.sint64_opt])
-    self.assertEqual(kuint32max, message_options.Extensions[
-        unittest_custom_options_pb2.fixed32_opt])
-    self.assertEqual(kuint64max, message_options.Extensions[
-        unittest_custom_options_pb2.fixed64_opt])
-    self.assertEqual(kint32max, message_options.Extensions[
-        unittest_custom_options_pb2.sfixed32_opt])
-    self.assertEqual(kint64max, message_options.Extensions[
-        unittest_custom_options_pb2.sfixed64_opt])
-
-    message_descriptor =\
-        unittest_custom_options_pb2.CustomOptionOtherValues.DESCRIPTOR
-    message_options = message_descriptor.GetOptions()
-    self.assertEqual(-100, message_options.Extensions[
-        unittest_custom_options_pb2.int32_opt])
-    self.assertAlmostEqual(12.3456789, message_options.Extensions[
-        unittest_custom_options_pb2.float_opt], 6)
-    self.assertAlmostEqual(1.234567890123456789, message_options.Extensions[
-        unittest_custom_options_pb2.double_opt])
-    self.assertEqual("Hello, \"World\"", message_options.Extensions[
-        unittest_custom_options_pb2.string_opt])
-    self.assertEqual(b"Hello\0World", message_options.Extensions[
-        unittest_custom_options_pb2.bytes_opt])
-    dummy_enum = unittest_custom_options_pb2.DummyMessageContainingEnum
-    self.assertEqual(
-        dummy_enum.TEST_OPTION_ENUM_TYPE2,
-        message_options.Extensions[unittest_custom_options_pb2.enum_opt])
-
-    message_descriptor =\
-        unittest_custom_options_pb2.SettingRealsFromPositiveInts.DESCRIPTOR
-    message_options = message_descriptor.GetOptions()
-    self.assertAlmostEqual(12, message_options.Extensions[
-        unittest_custom_options_pb2.float_opt], 6)
-    self.assertAlmostEqual(154, message_options.Extensions[
-        unittest_custom_options_pb2.double_opt])
-
-    message_descriptor =\
-        unittest_custom_options_pb2.SettingRealsFromNegativeInts.DESCRIPTOR
-    message_options = message_descriptor.GetOptions()
-    self.assertAlmostEqual(-12, message_options.Extensions[
-        unittest_custom_options_pb2.float_opt], 6)
-    self.assertAlmostEqual(-154, message_options.Extensions[
-        unittest_custom_options_pb2.double_opt])
-
-  def testComplexExtensionOptions(self):
-    descriptor =\
-        unittest_custom_options_pb2.VariousComplexOptions.DESCRIPTOR
-    options = descriptor.GetOptions()
-    self.assertEqual(42, options.Extensions[
-        unittest_custom_options_pb2.complex_opt1].foo)
-    self.assertEqual(324, options.Extensions[
-        unittest_custom_options_pb2.complex_opt1].Extensions[
-            unittest_custom_options_pb2.mooo])
-    self.assertEqual(876, options.Extensions[
-        unittest_custom_options_pb2.complex_opt1].Extensions[
-            unittest_custom_options_pb2.corge].moo)
-    self.assertEqual(987, options.Extensions[
-        unittest_custom_options_pb2.complex_opt2].baz)
-    self.assertEqual(654, options.Extensions[
-        unittest_custom_options_pb2.complex_opt2].Extensions[
-            unittest_custom_options_pb2.grault])
-    self.assertEqual(743, options.Extensions[
-        unittest_custom_options_pb2.complex_opt2].bar.foo)
-    self.assertEqual(1999, options.Extensions[
-        unittest_custom_options_pb2.complex_opt2].bar.Extensions[
-            unittest_custom_options_pb2.mooo])
-    self.assertEqual(2008, options.Extensions[
-        unittest_custom_options_pb2.complex_opt2].bar.Extensions[
-            unittest_custom_options_pb2.corge].moo)
-    self.assertEqual(741, options.Extensions[
-        unittest_custom_options_pb2.complex_opt2].Extensions[
-            unittest_custom_options_pb2.garply].foo)
-    self.assertEqual(1998, options.Extensions[
-        unittest_custom_options_pb2.complex_opt2].Extensions[
-            unittest_custom_options_pb2.garply].Extensions[
-                unittest_custom_options_pb2.mooo])
-    self.assertEqual(2121, options.Extensions[
-        unittest_custom_options_pb2.complex_opt2].Extensions[
-            unittest_custom_options_pb2.garply].Extensions[
-                unittest_custom_options_pb2.corge].moo)
-    self.assertEqual(1971, options.Extensions[
-        unittest_custom_options_pb2.ComplexOptionType2
-        .ComplexOptionType4.complex_opt4].waldo)
-    self.assertEqual(321, options.Extensions[
-        unittest_custom_options_pb2.complex_opt2].fred.waldo)
-    self.assertEqual(9, options.Extensions[
-        unittest_custom_options_pb2.complex_opt3].moo)
-    self.assertEqual(22, options.Extensions[
-        unittest_custom_options_pb2.complex_opt3].complexoptiontype5.plugh)
-    self.assertEqual(24, options.Extensions[
-        unittest_custom_options_pb2.complexopt6].xyzzy)
-
-  # Check that aggregate options were parsed and saved correctly in
-  # the appropriate descriptors.
-  def testAggregateOptions(self):
-    file_descriptor = unittest_custom_options_pb2.DESCRIPTOR
-    message_descriptor =\
-        unittest_custom_options_pb2.AggregateMessage.DESCRIPTOR
-    field_descriptor = message_descriptor.fields_by_name["fieldname"]
-    enum_descriptor = unittest_custom_options_pb2.AggregateEnum.DESCRIPTOR
-    enum_value_descriptor = enum_descriptor.values_by_name["VALUE"]
-    service_descriptor =\
-        unittest_custom_options_pb2.AggregateService.DESCRIPTOR
-    method_descriptor = service_descriptor.FindMethodByName("Method")
-
-    # Tests for the different types of data embedded in fileopt
-    file_options = file_descriptor.GetOptions().Extensions[
-        unittest_custom_options_pb2.fileopt]
-    self.assertEqual(100, file_options.i)
-    self.assertEqual("FileAnnotation", file_options.s)
-    self.assertEqual("NestedFileAnnotation", file_options.sub.s)
-    self.assertEqual("FileExtensionAnnotation", file_options.file.Extensions[
-        unittest_custom_options_pb2.fileopt].s)
-    self.assertEqual("EmbeddedMessageSetElement", file_options.mset.Extensions[
-        unittest_custom_options_pb2.AggregateMessageSetElement
-        .message_set_extension].s)
-
-    # Simple tests for all the other types of annotations
-    self.assertEqual(
-        "MessageAnnotation",
-        message_descriptor.GetOptions().Extensions[
-            unittest_custom_options_pb2.msgopt].s)
-    self.assertEqual(
-        "FieldAnnotation",
-        field_descriptor.GetOptions().Extensions[
-            unittest_custom_options_pb2.fieldopt].s)
-    self.assertEqual(
-        "EnumAnnotation",
-        enum_descriptor.GetOptions().Extensions[
-            unittest_custom_options_pb2.enumopt].s)
-    self.assertEqual(
-        "EnumValueAnnotation",
-        enum_value_descriptor.GetOptions().Extensions[
-            unittest_custom_options_pb2.enumvalopt].s)
-    self.assertEqual(
-        "ServiceAnnotation",
-        service_descriptor.GetOptions().Extensions[
-            unittest_custom_options_pb2.serviceopt].s)
-    self.assertEqual(
-        "MethodAnnotation",
-        method_descriptor.GetOptions().Extensions[
-            unittest_custom_options_pb2.methodopt].s)
-
-  def testNestedOptions(self):
-    nested_message =\
-        unittest_custom_options_pb2.NestedOptionType.NestedMessage.DESCRIPTOR
-    self.assertEqual(1001, nested_message.GetOptions().Extensions[
-        unittest_custom_options_pb2.message_opt1])
-    nested_field = nested_message.fields_by_name["nested_field"]
-    self.assertEqual(1002, nested_field.GetOptions().Extensions[
-        unittest_custom_options_pb2.field_opt1])
-    outer_message =\
-        unittest_custom_options_pb2.NestedOptionType.DESCRIPTOR
-    nested_enum = outer_message.enum_types_by_name["NestedEnum"]
-    self.assertEqual(1003, nested_enum.GetOptions().Extensions[
-        unittest_custom_options_pb2.enum_opt1])
-    nested_enum_value = outer_message.enum_values_by_name["NESTED_ENUM_VALUE"]
-    self.assertEqual(1004, nested_enum_value.GetOptions().Extensions[
-        unittest_custom_options_pb2.enum_value_opt1])
-    nested_extension = outer_message.extensions_by_name["nested_extension"]
-    self.assertEqual(1005, nested_extension.GetOptions().Extensions[
-        unittest_custom_options_pb2.field_opt2])
-
-  def testFileDescriptorReferences(self):
-    self.assertEqual(self.my_enum.file, self.my_file)
-    self.assertEqual(self.my_message.file, self.my_file)
-
-  def testFileDescriptor(self):
-    self.assertEqual(self.my_file.name, 'some/filename/some.proto')
-    self.assertEqual(self.my_file.package, 'protobuf_unittest')
-    self.assertEqual(self.my_file.pool, self.pool)
-    self.assertFalse(self.my_file.has_options)
-    self.assertEqual('proto2', self.my_file.syntax)
-    file_proto = descriptor_pb2.FileDescriptorProto()
-    self.my_file.CopyToProto(file_proto)
-    self.assertEqual(self.my_file.serialized_pb,
-                     file_proto.SerializeToString())
-    # Generated modules also belong to the default pool.
-    self.assertEqual(unittest_pb2.DESCRIPTOR.pool, descriptor_pool.Default())
-
-  @unittest.skipIf(
-      api_implementation.Type() == 'python',
-      'Immutability of descriptors is only enforced in v2 implementation')
-  def testImmutableCppDescriptor(self):
-    file_descriptor = unittest_pb2.DESCRIPTOR
-    message_descriptor = unittest_pb2.TestAllTypes.DESCRIPTOR
-    field_descriptor = message_descriptor.fields_by_name['optional_int32']
-    enum_descriptor = message_descriptor.enum_types_by_name['NestedEnum']
-    oneof_descriptor = message_descriptor.oneofs_by_name['oneof_field']
-    with self.assertRaises(AttributeError):
-      message_descriptor.fields_by_name = None
-    with self.assertRaises(TypeError):
-      message_descriptor.fields_by_name['Another'] = None
-    with self.assertRaises(TypeError):
-      message_descriptor.fields.append(None)
-    with self.assertRaises(AttributeError):
-      field_descriptor.containing_type = message_descriptor
-    with self.assertRaises(AttributeError):
-      file_descriptor.has_options = False
-    with self.assertRaises(AttributeError):
-      field_descriptor.has_options = False
-    with self.assertRaises(AttributeError):
-      oneof_descriptor.has_options = False
-    with self.assertRaises(AttributeError):
-      enum_descriptor.has_options = False
-    with self.assertRaises(AttributeError) as e:
-      message_descriptor.has_options = True
-    self.assertEqual('attribute is not writable: has_options',
-                     str(e.exception))
-
-  def testDefault(self):
-    message_descriptor = unittest_pb2.TestAllTypes.DESCRIPTOR
-    field = message_descriptor.fields_by_name['repeated_int32']
-    self.assertEqual(field.default_value, [])
-    field = message_descriptor.fields_by_name['repeated_nested_message']
-    self.assertEqual(field.default_value, [])
-    field = message_descriptor.fields_by_name['optionalgroup']
-    self.assertEqual(field.default_value, None)
-    field = message_descriptor.fields_by_name['optional_nested_message']
-    self.assertEqual(field.default_value, None)
-
-
-class NewDescriptorTest(DescriptorTest):
-  """Redo the same tests as above, but with a separate DescriptorPool."""
-
-  def GetDescriptorPool(self):
-    return descriptor_pool.DescriptorPool()
-
-
-class GeneratedDescriptorTest(unittest.TestCase):
-  """Tests for the properties of descriptors in generated code."""
-
-  def CheckMessageDescriptor(self, message_descriptor):
-    # Basic properties
-    self.assertEqual(message_descriptor.name, 'TestAllTypes')
-    self.assertEqual(message_descriptor.full_name,
-                     'protobuf_unittest.TestAllTypes')
-    # Test equality and hashability
-    self.assertEqual(message_descriptor, message_descriptor)
-    self.assertEqual(message_descriptor.fields[0].containing_type,
-                     message_descriptor)
-    self.assertIn(message_descriptor, [message_descriptor])
-    self.assertIn(message_descriptor, {message_descriptor: None})
-    # Test field containers
-    self.CheckDescriptorSequence(message_descriptor.fields)
-    self.CheckDescriptorMapping(message_descriptor.fields_by_name)
-    self.CheckDescriptorMapping(message_descriptor.fields_by_number)
-    self.CheckDescriptorMapping(message_descriptor.fields_by_camelcase_name)
-    self.CheckDescriptorMapping(message_descriptor.enum_types_by_name)
-    self.CheckDescriptorMapping(message_descriptor.enum_values_by_name)
-    self.CheckDescriptorMapping(message_descriptor.oneofs_by_name)
-    self.CheckDescriptorMapping(message_descriptor.enum_types[0].values_by_name)
-    # Test extension range
-    self.assertEqual(message_descriptor.extension_ranges, [])
-
-  def CheckFieldDescriptor(self, field_descriptor):
-    # Basic properties
-    self.assertEqual(field_descriptor.name, 'optional_int32')
-    self.assertEqual(field_descriptor.camelcase_name, 'optionalInt32')
-    self.assertEqual(field_descriptor.full_name,
-                     'protobuf_unittest.TestAllTypes.optional_int32')
-    self.assertEqual(field_descriptor.containing_type.name, 'TestAllTypes')
-    self.assertEqual(field_descriptor.file, unittest_pb2.DESCRIPTOR)
-    # Test equality and hashability
-    self.assertEqual(field_descriptor, field_descriptor)
-    self.assertEqual(
-        field_descriptor.containing_type.fields_by_name['optional_int32'],
-        field_descriptor)
-    self.assertEqual(
-        field_descriptor.containing_type.fields_by_camelcase_name[
-            'optionalInt32'],
-        field_descriptor)
-    self.assertIn(field_descriptor, [field_descriptor])
-    self.assertIn(field_descriptor, {field_descriptor: None})
-    self.assertEqual(None, field_descriptor.extension_scope)
-    self.assertEqual(None, field_descriptor.enum_type)
-    self.assertTrue(field_descriptor.has_presence)
-    if api_implementation.Type() == 'cpp':
-      # For test coverage only
-      self.assertEqual(field_descriptor.id, field_descriptor.id)
-
-  def CheckDescriptorSequence(self, sequence):
-    # Verifies that a property like 'messageDescriptor.fields' has all the
-    # properties of an immutable abc.Sequence.
-    self.assertNotEqual(sequence,
-                        unittest_pb2.TestAllExtensions.DESCRIPTOR.fields)
-    self.assertNotEqual(sequence, [])
-    self.assertNotEqual(sequence, 1)
-    self.assertFalse(sequence == 1)  # Only for cpp test coverage
-    self.assertEqual(sequence, sequence)
-    expected_list = list(sequence)
-    self.assertEqual(expected_list, sequence)
-    self.assertGreater(len(sequence), 0)  # Sized
-    self.assertEqual(len(sequence), len(expected_list))  # Iterable
-    self.assertEqual(sequence[len(sequence) -1], sequence[-1])
-    item = sequence[0]
-    self.assertEqual(item, sequence[0])
-    self.assertIn(item, sequence)  # Container
-    self.assertEqual(sequence.index(item), 0)
-    self.assertEqual(sequence.count(item), 1)
-    other_item = unittest_pb2.NestedTestAllTypes.DESCRIPTOR.fields[0]
-    self.assertNotIn(other_item, sequence)
-    self.assertEqual(sequence.count(other_item), 0)
-    self.assertRaises(ValueError, sequence.index, other_item)
-    self.assertRaises(ValueError, sequence.index, [])
-    reversed_iterator = reversed(sequence)
-    self.assertEqual(list(reversed_iterator), list(sequence)[::-1])
-    self.assertRaises(StopIteration, next, reversed_iterator)
-    expected_list[0] = 'change value'
-    self.assertNotEqual(expected_list, sequence)
-    # TODO(jieluo): Change __repr__ support for DescriptorSequence.
-    if api_implementation.Type() == 'python':
-      self.assertEqual(str(list(sequence)), str(sequence))
-    else:
-      self.assertEqual(str(sequence)[0], '<')
-
-  def CheckDescriptorMapping(self, mapping):
-    # Verifies that a property like 'messageDescriptor.fields' has all the
-    # properties of an immutable abc.Mapping.
-    self.assertNotEqual(
-        mapping, unittest_pb2.TestAllExtensions.DESCRIPTOR.fields_by_name)
-    self.assertNotEqual(mapping, {})
-    self.assertNotEqual(mapping, 1)
-    self.assertFalse(mapping == 1)  # Only for cpp test coverage
-    excepted_dict = dict(mapping.items())
-    self.assertEqual(mapping, excepted_dict)
-    self.assertEqual(mapping, mapping)
-    self.assertGreater(len(mapping), 0)  # Sized
-    self.assertEqual(len(mapping), len(excepted_dict))  # Iterable
-    key, item = next(iter(mapping.items()))
-    self.assertIn(key, mapping)  # Container
-    self.assertEqual(mapping.get(key), item)
-    with self.assertRaises(TypeError):
-      mapping.get()
-    # TODO(jieluo): Fix python and cpp extension diff.
-    if api_implementation.Type() == 'python':
-      self.assertRaises(TypeError, mapping.get, [])
-    else:
-      self.assertEqual(None, mapping.get([]))
-    # keys(), iterkeys() &co
-    item = (next(iter(mapping.keys())), next(iter(mapping.values())))
-    self.assertEqual(item, next(iter(mapping.items())))
-    excepted_dict[key] = 'change value'
-    self.assertNotEqual(mapping, excepted_dict)
-    del excepted_dict[key]
-    excepted_dict['new_key'] = 'new'
-    self.assertNotEqual(mapping, excepted_dict)
-    self.assertRaises(KeyError, mapping.__getitem__, 'key_error')
-    self.assertRaises(KeyError, mapping.__getitem__, len(mapping) + 1)
-    # TODO(jieluo): Add __repr__ support for DescriptorMapping.
-    if api_implementation.Type() == 'python':
-      self.assertEqual(len(str(dict(mapping.items()))), len(str(mapping)))
-    else:
-      self.assertEqual(str(mapping)[0], '<')
-
-  def testDescriptor(self):
-    message_descriptor = unittest_pb2.TestAllTypes.DESCRIPTOR
-    self.CheckMessageDescriptor(message_descriptor)
-    field_descriptor = message_descriptor.fields_by_name['optional_int32']
-    self.CheckFieldDescriptor(field_descriptor)
-    field_descriptor = message_descriptor.fields_by_camelcase_name[
-        'optionalInt32']
-    self.CheckFieldDescriptor(field_descriptor)
-    enum_descriptor = unittest_pb2.DESCRIPTOR.enum_types_by_name[
-        'ForeignEnum']
-    self.assertEqual(None, enum_descriptor.containing_type)
-    # Test extension range
-    self.assertEqual(
-        unittest_pb2.TestAllExtensions.DESCRIPTOR.extension_ranges,
-        [(1, 536870912)])
-    self.assertEqual(
-        unittest_pb2.TestMultipleExtensionRanges.DESCRIPTOR.extension_ranges,
-        [(42, 43), (4143, 4244), (65536, 536870912)])
-
-  def testCppDescriptorContainer(self):
-    containing_file = unittest_pb2.DESCRIPTOR
-    self.CheckDescriptorSequence(containing_file.dependencies)
-    self.CheckDescriptorMapping(containing_file.message_types_by_name)
-    self.CheckDescriptorMapping(containing_file.enum_types_by_name)
-    self.CheckDescriptorMapping(containing_file.services_by_name)
-    self.CheckDescriptorMapping(containing_file.extensions_by_name)
-    self.CheckDescriptorMapping(
-        unittest_pb2.TestNestedExtension.DESCRIPTOR.extensions_by_name)
-
-  def testCppDescriptorContainer_Iterator(self):
-    # Same test with the iterator
-    enum = unittest_pb2.TestAllTypes.DESCRIPTOR.enum_types_by_name['NestedEnum']
-    values_iter = iter(enum.values)
-    del enum
-    self.assertEqual('FOO', next(values_iter).name)
-
-  def testDescriptorNestedTypesContainer(self):
-    message_descriptor = unittest_pb2.TestAllTypes.DESCRIPTOR
-    nested_message_descriptor = unittest_pb2.TestAllTypes.NestedMessage.DESCRIPTOR
-    self.assertEqual(len(message_descriptor.nested_types), 3)
-    self.assertFalse(None in message_descriptor.nested_types)
-    self.assertTrue(
-        nested_message_descriptor in message_descriptor.nested_types)
-
-  def testServiceDescriptor(self):
-    service_descriptor = unittest_pb2.DESCRIPTOR.services_by_name['TestService']
-    self.assertEqual(service_descriptor.name, 'TestService')
-    self.assertEqual(service_descriptor.methods[0].name, 'Foo')
-    self.assertIs(service_descriptor.file, unittest_pb2.DESCRIPTOR)
-    self.assertEqual(service_descriptor.index, 0)
-    self.CheckDescriptorMapping(service_descriptor.methods_by_name)
-
-  def testOneofDescriptor(self):
-    message_descriptor = unittest_pb2.TestAllTypes.DESCRIPTOR
-    oneof_descriptor = message_descriptor.oneofs_by_name['oneof_field']
-    self.assertFalse(oneof_descriptor.has_options)
-    self.assertEqual(message_descriptor, oneof_descriptor.containing_type)
-    self.assertEqual('oneof_field', oneof_descriptor.name)
-    self.assertEqual('protobuf_unittest.TestAllTypes.oneof_field',
-                     oneof_descriptor.full_name)
-    self.assertEqual(0, oneof_descriptor.index)
-
-
-class DescriptorCopyToProtoTest(unittest.TestCase):
-  """Tests for CopyTo functions of Descriptor."""
-
-  def _AssertProtoEqual(self, actual_proto, expected_class, expected_ascii):
-    expected_proto = expected_class()
-    text_format.Merge(expected_ascii, expected_proto)
-
-    self.assertEqual(
-        actual_proto, expected_proto,
-        'Not equal,\nActual:\n%s\nExpected:\n%s\n'
-        % (str(actual_proto), str(expected_proto)))
-
-  def _InternalTestCopyToProto(self, desc, expected_proto_class,
-                               expected_proto_ascii):
-    actual = expected_proto_class()
-    desc.CopyToProto(actual)
-    self._AssertProtoEqual(
-        actual, expected_proto_class, expected_proto_ascii)
-
-  def testCopyToProto_EmptyMessage(self):
-    self._InternalTestCopyToProto(
-        unittest_pb2.TestEmptyMessage.DESCRIPTOR,
-        descriptor_pb2.DescriptorProto,
-        TEST_EMPTY_MESSAGE_DESCRIPTOR_ASCII)
-
-  def testCopyToProto_NestedMessage(self):
-    TEST_NESTED_MESSAGE_ASCII = """
-      name: 'NestedMessage'
-      field: <
-        name: 'bb'
-        number: 1
-        label: 1  # Optional
-        type: 5  # TYPE_INT32
-      >
-      """
-
-    self._InternalTestCopyToProto(
-        unittest_pb2.TestAllTypes.NestedMessage.DESCRIPTOR,
-        descriptor_pb2.DescriptorProto,
-        TEST_NESTED_MESSAGE_ASCII)
-
-  def testCopyToProto_ForeignNestedMessage(self):
-    TEST_FOREIGN_NESTED_ASCII = """
-      name: 'TestForeignNested'
-      field: <
-        name: 'foreign_nested'
-        number: 1
-        label: 1  # Optional
-        type: 11  # TYPE_MESSAGE
-        type_name: '.protobuf_unittest.TestAllTypes.NestedMessage'
-      >
-      """
-
-    self._InternalTestCopyToProto(
-        unittest_pb2.TestForeignNested.DESCRIPTOR,
-        descriptor_pb2.DescriptorProto,
-        TEST_FOREIGN_NESTED_ASCII)
-
-  def testCopyToProto_ForeignEnum(self):
-    TEST_FOREIGN_ENUM_ASCII = """
-      name: 'ForeignEnum'
-      value: <
-        name: 'FOREIGN_FOO'
-        number: 4
-      >
-      value: <
-        name: 'FOREIGN_BAR'
-        number: 5
-      >
-      value: <
-        name: 'FOREIGN_BAZ'
-        number: 6
-      >
-      """
-
-    self._InternalTestCopyToProto(
-        unittest_pb2.ForeignEnum.DESCRIPTOR,
-        descriptor_pb2.EnumDescriptorProto,
-        TEST_FOREIGN_ENUM_ASCII)
-
-  def testCopyToProto_Options(self):
-    TEST_DEPRECATED_FIELDS_ASCII = """
-      name: 'TestDeprecatedFields'
-      field: <
-        name: 'deprecated_int32'
-        number: 1
-        label: 1  # Optional
-        type: 5  # TYPE_INT32
-        options: <
-          deprecated: true
-        >
-      >
-      field {
-        name: "deprecated_int32_in_oneof"
-        number: 2
-        label: LABEL_OPTIONAL
-        type: TYPE_INT32
-        options {
-          deprecated: true
-        }
-        oneof_index: 0
-      }
-      oneof_decl {
-        name: "oneof_fields"
-      }
-      """
-
-    self._InternalTestCopyToProto(
-        unittest_pb2.TestDeprecatedFields.DESCRIPTOR,
-        descriptor_pb2.DescriptorProto,
-        TEST_DEPRECATED_FIELDS_ASCII)
-
-  def testCopyToProto_AllExtensions(self):
-    TEST_EMPTY_MESSAGE_WITH_EXTENSIONS_ASCII = """
-      name: 'TestEmptyMessageWithExtensions'
-      extension_range: <
-        start: 1
-        end: 536870912
-      >
-      """
-
-    self._InternalTestCopyToProto(
-        unittest_pb2.TestEmptyMessageWithExtensions.DESCRIPTOR,
-        descriptor_pb2.DescriptorProto,
-        TEST_EMPTY_MESSAGE_WITH_EXTENSIONS_ASCII)
-
-  def testCopyToProto_SeveralExtensions(self):
-    TEST_MESSAGE_WITH_SEVERAL_EXTENSIONS_ASCII = """
-      name: 'TestMultipleExtensionRanges'
-      extension_range: <
-        start: 42
-        end: 43
-      >
-      extension_range: <
-        start: 4143
-        end: 4244
-      >
-      extension_range: <
-        start: 65536
-        end: 536870912
-      >
-      """
-
-    self._InternalTestCopyToProto(
-        unittest_pb2.TestMultipleExtensionRanges.DESCRIPTOR,
-        descriptor_pb2.DescriptorProto,
-        TEST_MESSAGE_WITH_SEVERAL_EXTENSIONS_ASCII)
-
-  def testCopyToProto_FileDescriptor(self):
-    UNITTEST_IMPORT_FILE_DESCRIPTOR_ASCII = ("""
-      name: 'google/protobuf/unittest_import.proto'
-      package: 'protobuf_unittest_import'
-      dependency: 'google/protobuf/unittest_import_public.proto'
-      message_type: <
-        name: 'ImportMessage'
-        field: <
-          name: 'd'
-          number: 1
-          label: 1  # Optional
-          type: 5  # TYPE_INT32
-        >
-      >
-      """ +
-      """enum_type: <
-        name: 'ImportEnum'
-        value: <
-          name: 'IMPORT_FOO'
-          number: 7
-        >
-        value: <
-          name: 'IMPORT_BAR'
-          number: 8
-        >
-        value: <
-          name: 'IMPORT_BAZ'
-          number: 9
-        >
-      >
-      enum_type: <
-        name: 'ImportEnumForMap'
-        value: <
-          name: 'UNKNOWN'
-          number: 0
-        >
-        value: <
-          name: 'FOO'
-          number: 1
-        >
-        value: <
-          name: 'BAR'
-          number: 2
-        >
-      >
-      options: <
-        java_package: 'com.google.protobuf.test'
-        optimize_for: 1  # SPEED
-      """ +
-      """
-        cc_enable_arenas: true
-      >
-      public_dependency: 0
-    """)
-    self._InternalTestCopyToProto(
-        unittest_import_pb2.DESCRIPTOR,
-        descriptor_pb2.FileDescriptorProto,
-        UNITTEST_IMPORT_FILE_DESCRIPTOR_ASCII)
-
-  def testCopyToProto_ServiceDescriptor(self):
-    TEST_SERVICE_ASCII = """
-      name: 'TestService'
-      method: <
-        name: 'Foo'
-        input_type: '.protobuf_unittest.FooRequest'
-        output_type: '.protobuf_unittest.FooResponse'
-      >
-      method: <
-        name: 'Bar'
-        input_type: '.protobuf_unittest.BarRequest'
-        output_type: '.protobuf_unittest.BarResponse'
-      >
-      """
-    self._InternalTestCopyToProto(
-        unittest_pb2.TestService.DESCRIPTOR,
-        descriptor_pb2.ServiceDescriptorProto,
-        TEST_SERVICE_ASCII)
-
-  def testCopyToProto_MethodDescriptor(self):
-    expected_ascii = """
-      name: 'Foo'
-      input_type: '.protobuf_unittest.FooRequest'
-      output_type: '.protobuf_unittest.FooResponse'
-    """
-    method_descriptor = unittest_pb2.TestService.DESCRIPTOR.FindMethodByName(
-        'Foo')
-    self._InternalTestCopyToProto(
-        method_descriptor,
-        descriptor_pb2.MethodDescriptorProto,
-        expected_ascii)
-
-  @unittest.skipIf(
-      api_implementation.Type() == 'python',
-      'Pure python does not raise error.')
-  # TODO(jieluo): Fix pure python to check with the proto type.
-  def testCopyToProto_TypeError(self):
-    file_proto = descriptor_pb2.FileDescriptorProto()
-    self.assertRaises(TypeError,
-                      unittest_pb2.TestEmptyMessage.DESCRIPTOR.CopyToProto,
-                      file_proto)
-    self.assertRaises(TypeError,
-                      unittest_pb2.ForeignEnum.DESCRIPTOR.CopyToProto,
-                      file_proto)
-    self.assertRaises(TypeError,
-                      unittest_pb2.TestService.DESCRIPTOR.CopyToProto,
-                      file_proto)
-    proto = descriptor_pb2.DescriptorProto()
-    self.assertRaises(TypeError,
-                      unittest_import_pb2.DESCRIPTOR.CopyToProto,
-                      proto)
-
-
-class MakeDescriptorTest(unittest.TestCase):
-
-  def testMakeDescriptorWithNestedFields(self):
-    file_descriptor_proto = descriptor_pb2.FileDescriptorProto()
-    file_descriptor_proto.name = 'Foo2'
-    message_type = file_descriptor_proto.message_type.add()
-    message_type.name = file_descriptor_proto.name
-    nested_type = message_type.nested_type.add()
-    nested_type.name = 'Sub'
-    enum_type = nested_type.enum_type.add()
-    enum_type.name = 'FOO'
-    enum_type_val = enum_type.value.add()
-    enum_type_val.name = 'BAR'
-    enum_type_val.number = 3
-    field = message_type.field.add()
-    field.number = 1
-    field.name = 'uint64_field'
-    field.label = descriptor.FieldDescriptor.LABEL_REQUIRED
-    field.type = descriptor.FieldDescriptor.TYPE_UINT64
-    field = message_type.field.add()
-    field.number = 2
-    field.name = 'nested_message_field'
-    field.label = descriptor.FieldDescriptor.LABEL_REQUIRED
-    field.type = descriptor.FieldDescriptor.TYPE_MESSAGE
-    field.type_name = 'Sub'
-    enum_field = nested_type.field.add()
-    enum_field.number = 2
-    enum_field.name = 'bar_field'
-    enum_field.label = descriptor.FieldDescriptor.LABEL_REQUIRED
-    enum_field.type = descriptor.FieldDescriptor.TYPE_ENUM
-    enum_field.type_name = 'Foo2.Sub.FOO'
-
-    result = descriptor.MakeDescriptor(message_type)
-    self.assertEqual(result.fields[0].cpp_type,
-                     descriptor.FieldDescriptor.CPPTYPE_UINT64)
-    self.assertEqual(result.fields[1].cpp_type,
-                     descriptor.FieldDescriptor.CPPTYPE_MESSAGE)
-    self.assertEqual(result.fields[1].message_type.containing_type,
-                     result)
-    self.assertEqual(result.nested_types[0].fields[0].full_name,
-                     'Foo2.Sub.bar_field')
-    self.assertEqual(result.nested_types[0].fields[0].enum_type,
-                     result.nested_types[0].enum_types[0])
-    self.assertFalse(result.has_options)
-    self.assertFalse(result.fields[0].has_options)
-    if api_implementation.Type() == 'cpp':
-      with self.assertRaises(AttributeError):
-        result.fields[0].has_options = False
-
-  def testMakeDescriptorWithUnsignedIntField(self):
-    file_descriptor_proto = descriptor_pb2.FileDescriptorProto()
-    file_descriptor_proto.name = 'Foo'
-    message_type = file_descriptor_proto.message_type.add()
-    message_type.name = file_descriptor_proto.name
-    enum_type = message_type.enum_type.add()
-    enum_type.name = 'FOO'
-    enum_type_val = enum_type.value.add()
-    enum_type_val.name = 'BAR'
-    enum_type_val.number = 3
-    field = message_type.field.add()
-    field.number = 1
-    field.name = 'uint64_field'
-    field.label = descriptor.FieldDescriptor.LABEL_REQUIRED
-    field.type = descriptor.FieldDescriptor.TYPE_UINT64
-    enum_field = message_type.field.add()
-    enum_field.number = 2
-    enum_field.name = 'bar_field'
-    enum_field.label = descriptor.FieldDescriptor.LABEL_REQUIRED
-    enum_field.type = descriptor.FieldDescriptor.TYPE_ENUM
-    enum_field.type_name = 'Foo.FOO'
-
-    result = descriptor.MakeDescriptor(message_type)
-    self.assertEqual(result.fields[0].cpp_type,
-                     descriptor.FieldDescriptor.CPPTYPE_UINT64)
-
-
-  def testMakeDescriptorWithOptions(self):
-    descriptor_proto = descriptor_pb2.DescriptorProto()
-    aggregate_message = unittest_custom_options_pb2.AggregateMessage
-    aggregate_message.DESCRIPTOR.CopyToProto(descriptor_proto)
-    reformed_descriptor = descriptor.MakeDescriptor(descriptor_proto)
-
-    options = reformed_descriptor.GetOptions()
-    self.assertEqual(101,
-                      options.Extensions[unittest_custom_options_pb2.msgopt].i)
-
-  def testCamelcaseName(self):
-    descriptor_proto = descriptor_pb2.DescriptorProto()
-    descriptor_proto.name = 'Bar'
-    names = ['foo_foo', 'FooBar', 'fooBaz', 'fooFoo', 'foobar']
-    camelcase_names = ['fooFoo', 'fooBar', 'fooBaz', 'fooFoo', 'foobar']
-    for index in range(len(names)):
-      field = descriptor_proto.field.add()
-      field.number = index + 1
-      field.name = names[index]
-    result = descriptor.MakeDescriptor(descriptor_proto)
-    for index in range(len(camelcase_names)):
-      self.assertEqual(result.fields[index].camelcase_name,
-                       camelcase_names[index])
-
-  def testJsonName(self):
-    descriptor_proto = descriptor_pb2.DescriptorProto()
-    descriptor_proto.name = 'TestJsonName'
-    names = ['field_name', 'fieldName', 'FieldName',
-             '_field_name', 'FIELD_NAME', 'json_name']
-    json_names = ['fieldName', 'fieldName', 'FieldName',
-                  'FieldName', 'FIELDNAME', '@type']
-    for index in range(len(names)):
-      field = descriptor_proto.field.add()
-      field.number = index + 1
-      field.name = names[index]
-    field.json_name = '@type'
-    result = descriptor.MakeDescriptor(descriptor_proto)
-    for index in range(len(json_names)):
-      self.assertEqual(result.fields[index].json_name,
-                       json_names[index])
-
-
-if __name__ == '__main__':
-  unittest.main()
diff --git a/libs/protobuf/python/google/protobuf/internal/encoder.py b/libs/protobuf/python/google/protobuf/internal/encoder.py
deleted file mode 100644
index 4b4f652..0000000
--- a/libs/protobuf/python/google/protobuf/internal/encoder.py
+++ /dev/null
@@ -1,829 +0,0 @@
-# Protocol Buffers - Google's data interchange format
-# Copyright 2008 Google Inc.  All rights reserved.
-# https://developers.google.com/protocol-buffers/
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-"""Code for encoding protocol message primitives.
-
-Contains the logic for encoding every logical protocol field type
-into one of the 5 physical wire types.
-
-This code is designed to push the Python interpreter's performance to the
-limits.
-
-The basic idea is that at startup time, for every field (i.e. every
-FieldDescriptor) we construct two functions:  a "sizer" and an "encoder".  The
-sizer takes a value of this field's type and computes its byte size.  The
-encoder takes a writer function and a value.  It encodes the value into byte
-strings and invokes the writer function to write those strings.  Typically the
-writer function is the write() method of a BytesIO.
-
-We try to do as much work as possible when constructing the writer and the
-sizer rather than when calling them.  In particular:
-* We copy any needed global functions to local variables, so that we do not need
-  to do costly global table lookups at runtime.
-* Similarly, we try to do any attribute lookups at startup time if possible.
-* Every field's tag is encoded to bytes at startup, since it can't change at
-  runtime.
-* Whatever component of the field size we can compute at startup, we do.
-* We *avoid* sharing code if doing so would make the code slower and not sharing
-  does not burden us too much.  For example, encoders for repeated fields do
-  not just call the encoders for singular fields in a loop because this would
-  add an extra function call overhead for every loop iteration; instead, we
-  manually inline the single-value encoder into the loop.
-* If a Python function lacks a return statement, Python actually generates
-  instructions to pop the result of the last statement off the stack, push
-  None onto the stack, and then return that.  If we really don't care what
-  value is returned, then we can save two instructions by returning the
-  result of the last statement.  It looks funny but it helps.
-* We assume that type and bounds checking has happened at a higher level.
-"""
-
-__author__ = 'kenton@google.com (Kenton Varda)'
-
-import struct
-
-from google.protobuf.internal import wire_format
-
-
-# This will overflow and thus become IEEE-754 "infinity".  We would use
-# "float('inf')" but it doesn't work on Windows pre-Python-2.6.
-_POS_INF = 1e10000
-_NEG_INF = -_POS_INF
-
-
-def _VarintSize(value):
-  """Compute the size of a varint value."""
-  if value <= 0x7f: return 1
-  if value <= 0x3fff: return 2
-  if value <= 0x1fffff: return 3
-  if value <= 0xfffffff: return 4
-  if value <= 0x7ffffffff: return 5
-  if value <= 0x3ffffffffff: return 6
-  if value <= 0x1ffffffffffff: return 7
-  if value <= 0xffffffffffffff: return 8
-  if value <= 0x7fffffffffffffff: return 9
-  return 10
-
-
-def _SignedVarintSize(value):
-  """Compute the size of a signed varint value."""
-  if value < 0: return 10
-  if value <= 0x7f: return 1
-  if value <= 0x3fff: return 2
-  if value <= 0x1fffff: return 3
-  if value <= 0xfffffff: return 4
-  if value <= 0x7ffffffff: return 5
-  if value <= 0x3ffffffffff: return 6
-  if value <= 0x1ffffffffffff: return 7
-  if value <= 0xffffffffffffff: return 8
-  if value <= 0x7fffffffffffffff: return 9
-  return 10
-
-
-def _TagSize(field_number):
-  """Returns the number of bytes required to serialize a tag with this field
-  number."""
-  # Just pass in type 0, since the type won't affect the tag+type size.
-  return _VarintSize(wire_format.PackTag(field_number, 0))
-
-
-# --------------------------------------------------------------------
-# In this section we define some generic sizers.  Each of these functions
-# takes parameters specific to a particular field type, e.g. int32 or fixed64.
-# It returns another function which in turn takes parameters specific to a
-# particular field, e.g. the field number and whether it is repeated or packed.
-# Look at the next section to see how these are used.
-
-
-def _SimpleSizer(compute_value_size):
-  """A sizer which uses the function compute_value_size to compute the size of
-  each value.  Typically compute_value_size is _VarintSize."""
-
-  def SpecificSizer(field_number, is_repeated, is_packed):
-    tag_size = _TagSize(field_number)
-    if is_packed:
-      local_VarintSize = _VarintSize
-      def PackedFieldSize(value):
-        result = 0
-        for element in value:
-          result += compute_value_size(element)
-        return result + local_VarintSize(result) + tag_size
-      return PackedFieldSize
-    elif is_repeated:
-      def RepeatedFieldSize(value):
-        result = tag_size * len(value)
-        for element in value:
-          result += compute_value_size(element)
-        return result
-      return RepeatedFieldSize
-    else:
-      def FieldSize(value):
-        return tag_size + compute_value_size(value)
-      return FieldSize
-
-  return SpecificSizer
-
-
-def _ModifiedSizer(compute_value_size, modify_value):
-  """Like SimpleSizer, but modify_value is invoked on each value before it is
-  passed to compute_value_size.  modify_value is typically ZigZagEncode."""
-
-  def SpecificSizer(field_number, is_repeated, is_packed):
-    tag_size = _TagSize(field_number)
-    if is_packed:
-      local_VarintSize = _VarintSize
-      def PackedFieldSize(value):
-        result = 0
-        for element in value:
-          result += compute_value_size(modify_value(element))
-        return result + local_VarintSize(result) + tag_size
-      return PackedFieldSize
-    elif is_repeated:
-      def RepeatedFieldSize(value):
-        result = tag_size * len(value)
-        for element in value:
-          result += compute_value_size(modify_value(element))
-        return result
-      return RepeatedFieldSize
-    else:
-      def FieldSize(value):
-        return tag_size + compute_value_size(modify_value(value))
-      return FieldSize
-
-  return SpecificSizer
-
-
-def _FixedSizer(value_size):
-  """Like _SimpleSizer except for a fixed-size field.  The input is the size
-  of one value."""
-
-  def SpecificSizer(field_number, is_repeated, is_packed):
-    tag_size = _TagSize(field_number)
-    if is_packed:
-      local_VarintSize = _VarintSize
-      def PackedFieldSize(value):
-        result = len(value) * value_size
-        return result + local_VarintSize(result) + tag_size
-      return PackedFieldSize
-    elif is_repeated:
-      element_size = value_size + tag_size
-      def RepeatedFieldSize(value):
-        return len(value) * element_size
-      return RepeatedFieldSize
-    else:
-      field_size = value_size + tag_size
-      def FieldSize(value):
-        return field_size
-      return FieldSize
-
-  return SpecificSizer
-
-
-# ====================================================================
-# Here we declare a sizer constructor for each field type.  Each "sizer
-# constructor" is a function that takes (field_number, is_repeated, is_packed)
-# as parameters and returns a sizer, which in turn takes a field value as
-# a parameter and returns its encoded size.
-
-
-Int32Sizer = Int64Sizer = EnumSizer = _SimpleSizer(_SignedVarintSize)
-
-UInt32Sizer = UInt64Sizer = _SimpleSizer(_VarintSize)
-
-SInt32Sizer = SInt64Sizer = _ModifiedSizer(
-    _SignedVarintSize, wire_format.ZigZagEncode)
-
-Fixed32Sizer = SFixed32Sizer = FloatSizer  = _FixedSizer(4)
-Fixed64Sizer = SFixed64Sizer = DoubleSizer = _FixedSizer(8)
-
-BoolSizer = _FixedSizer(1)
-
-
-def StringSizer(field_number, is_repeated, is_packed):
-  """Returns a sizer for a string field."""
-
-  tag_size = _TagSize(field_number)
-  local_VarintSize = _VarintSize
-  local_len = len
-  assert not is_packed
-  if is_repeated:
-    def RepeatedFieldSize(value):
-      result = tag_size * len(value)
-      for element in value:
-        l = local_len(element.encode('utf-8'))
-        result += local_VarintSize(l) + l
-      return result
-    return RepeatedFieldSize
-  else:
-    def FieldSize(value):
-      l = local_len(value.encode('utf-8'))
-      return tag_size + local_VarintSize(l) + l
-    return FieldSize
-
-
-def BytesSizer(field_number, is_repeated, is_packed):
-  """Returns a sizer for a bytes field."""
-
-  tag_size = _TagSize(field_number)
-  local_VarintSize = _VarintSize
-  local_len = len
-  assert not is_packed
-  if is_repeated:
-    def RepeatedFieldSize(value):
-      result = tag_size * len(value)
-      for element in value:
-        l = local_len(element)
-        result += local_VarintSize(l) + l
-      return result
-    return RepeatedFieldSize
-  else:
-    def FieldSize(value):
-      l = local_len(value)
-      return tag_size + local_VarintSize(l) + l
-    return FieldSize
-
-
-def GroupSizer(field_number, is_repeated, is_packed):
-  """Returns a sizer for a group field."""
-
-  tag_size = _TagSize(field_number) * 2
-  assert not is_packed
-  if is_repeated:
-    def RepeatedFieldSize(value):
-      result = tag_size * len(value)
-      for element in value:
-        result += element.ByteSize()
-      return result
-    return RepeatedFieldSize
-  else:
-    def FieldSize(value):
-      return tag_size + value.ByteSize()
-    return FieldSize
-
-
-def MessageSizer(field_number, is_repeated, is_packed):
-  """Returns a sizer for a message field."""
-
-  tag_size = _TagSize(field_number)
-  local_VarintSize = _VarintSize
-  assert not is_packed
-  if is_repeated:
-    def RepeatedFieldSize(value):
-      result = tag_size * len(value)
-      for element in value:
-        l = element.ByteSize()
-        result += local_VarintSize(l) + l
-      return result
-    return RepeatedFieldSize
-  else:
-    def FieldSize(value):
-      l = value.ByteSize()
-      return tag_size + local_VarintSize(l) + l
-    return FieldSize
-
-
-# --------------------------------------------------------------------
-# MessageSet is special: it needs custom logic to compute its size properly.
-
-
-def MessageSetItemSizer(field_number):
-  """Returns a sizer for extensions of MessageSet.
-
-  The message set message looks like this:
-    message MessageSet {
-      repeated group Item = 1 {
-        required int32 type_id = 2;
-        required string message = 3;
-      }
-    }
-  """
-  static_size = (_TagSize(1) * 2 + _TagSize(2) + _VarintSize(field_number) +
-                 _TagSize(3))
-  local_VarintSize = _VarintSize
-
-  def FieldSize(value):
-    l = value.ByteSize()
-    return static_size + local_VarintSize(l) + l
-
-  return FieldSize
-
-
-# --------------------------------------------------------------------
-# Map is special: it needs custom logic to compute its size properly.
-
-
-def MapSizer(field_descriptor, is_message_map):
-  """Returns a sizer for a map field."""
-
-  # Can't look at field_descriptor.message_type._concrete_class because it may
-  # not have been initialized yet.
-  message_type = field_descriptor.message_type
-  message_sizer = MessageSizer(field_descriptor.number, False, False)
-
-  def FieldSize(map_value):
-    total = 0
-    for key in map_value:
-      value = map_value[key]
-      # It's wasteful to create the messages and throw them away one second
-      # later since we'll do the same for the actual encode.  But there's not an
-      # obvious way to avoid this within the current design without tons of code
-      # duplication. For message map, value.ByteSize() should be called to
-      # update the status.
-      entry_msg = message_type._concrete_class(key=key, value=value)
-      total += message_sizer(entry_msg)
-      if is_message_map:
-        value.ByteSize()
-    return total
-
-  return FieldSize
-
-# ====================================================================
-# Encoders!
-
-
-def _VarintEncoder():
-  """Return an encoder for a basic varint value (does not include tag)."""
-
-  local_int2byte = struct.Struct('>B').pack
-
-  def EncodeVarint(write, value, unused_deterministic=None):
-    bits = value & 0x7f
-    value >>= 7
-    while value:
-      write(local_int2byte(0x80|bits))
-      bits = value & 0x7f
-      value >>= 7
-    return write(local_int2byte(bits))
-
-  return EncodeVarint
-
-
-def _SignedVarintEncoder():
-  """Return an encoder for a basic signed varint value (does not include
-  tag)."""
-
-  local_int2byte = struct.Struct('>B').pack
-
-  def EncodeSignedVarint(write, value, unused_deterministic=None):
-    if value < 0:
-      value += (1 << 64)
-    bits = value & 0x7f
-    value >>= 7
-    while value:
-      write(local_int2byte(0x80|bits))
-      bits = value & 0x7f
-      value >>= 7
-    return write(local_int2byte(bits))
-
-  return EncodeSignedVarint
-
-
-_EncodeVarint = _VarintEncoder()
-_EncodeSignedVarint = _SignedVarintEncoder()
-
-
-def _VarintBytes(value):
-  """Encode the given integer as a varint and return the bytes.  This is only
-  called at startup time so it doesn't need to be fast."""
-
-  pieces = []
-  _EncodeVarint(pieces.append, value, True)
-  return b"".join(pieces)
-
-
-def TagBytes(field_number, wire_type):
-  """Encode the given tag and return the bytes.  Only called at startup."""
-
-  return bytes(_VarintBytes(wire_format.PackTag(field_number, wire_type)))
-
-# --------------------------------------------------------------------
-# As with sizers (see above), we have a number of common encoder
-# implementations.
-
-
-def _SimpleEncoder(wire_type, encode_value, compute_value_size):
-  """Return a constructor for an encoder for fields of a particular type.
-
-  Args:
-      wire_type:  The field's wire type, for encoding tags.
-      encode_value:  A function which encodes an individual value, e.g.
-        _EncodeVarint().
-      compute_value_size:  A function which computes the size of an individual
-        value, e.g. _VarintSize().
-  """
-
-  def SpecificEncoder(field_number, is_repeated, is_packed):
-    if is_packed:
-      tag_bytes = TagBytes(field_number, wire_format.WIRETYPE_LENGTH_DELIMITED)
-      local_EncodeVarint = _EncodeVarint
-      def EncodePackedField(write, value, deterministic):
-        write(tag_bytes)
-        size = 0
-        for element in value:
-          size += compute_value_size(element)
-        local_EncodeVarint(write, size, deterministic)
-        for element in value:
-          encode_value(write, element, deterministic)
-      return EncodePackedField
-    elif is_repeated:
-      tag_bytes = TagBytes(field_number, wire_type)
-      def EncodeRepeatedField(write, value, deterministic):
-        for element in value:
-          write(tag_bytes)
-          encode_value(write, element, deterministic)
-      return EncodeRepeatedField
-    else:
-      tag_bytes = TagBytes(field_number, wire_type)
-      def EncodeField(write, value, deterministic):
-        write(tag_bytes)
-        return encode_value(write, value, deterministic)
-      return EncodeField
-
-  return SpecificEncoder
-
-
-def _ModifiedEncoder(wire_type, encode_value, compute_value_size, modify_value):
-  """Like SimpleEncoder but additionally invokes modify_value on every value
-  before passing it to encode_value.  Usually modify_value is ZigZagEncode."""
-
-  def SpecificEncoder(field_number, is_repeated, is_packed):
-    if is_packed:
-      tag_bytes = TagBytes(field_number, wire_format.WIRETYPE_LENGTH_DELIMITED)
-      local_EncodeVarint = _EncodeVarint
-      def EncodePackedField(write, value, deterministic):
-        write(tag_bytes)
-        size = 0
-        for element in value:
-          size += compute_value_size(modify_value(element))
-        local_EncodeVarint(write, size, deterministic)
-        for element in value:
-          encode_value(write, modify_value(element), deterministic)
-      return EncodePackedField
-    elif is_repeated:
-      tag_bytes = TagBytes(field_number, wire_type)
-      def EncodeRepeatedField(write, value, deterministic):
-        for element in value:
-          write(tag_bytes)
-          encode_value(write, modify_value(element), deterministic)
-      return EncodeRepeatedField
-    else:
-      tag_bytes = TagBytes(field_number, wire_type)
-      def EncodeField(write, value, deterministic):
-        write(tag_bytes)
-        return encode_value(write, modify_value(value), deterministic)
-      return EncodeField
-
-  return SpecificEncoder
-
-
-def _StructPackEncoder(wire_type, format):
-  """Return a constructor for an encoder for a fixed-width field.
-
-  Args:
-      wire_type:  The field's wire type, for encoding tags.
-      format:  The format string to pass to struct.pack().
-  """
-
-  value_size = struct.calcsize(format)
-
-  def SpecificEncoder(field_number, is_repeated, is_packed):
-    local_struct_pack = struct.pack
-    if is_packed:
-      tag_bytes = TagBytes(field_number, wire_format.WIRETYPE_LENGTH_DELIMITED)
-      local_EncodeVarint = _EncodeVarint
-      def EncodePackedField(write, value, deterministic):
-        write(tag_bytes)
-        local_EncodeVarint(write, len(value) * value_size, deterministic)
-        for element in value:
-          write(local_struct_pack(format, element))
-      return EncodePackedField
-    elif is_repeated:
-      tag_bytes = TagBytes(field_number, wire_type)
-      def EncodeRepeatedField(write, value, unused_deterministic=None):
-        for element in value:
-          write(tag_bytes)
-          write(local_struct_pack(format, element))
-      return EncodeRepeatedField
-    else:
-      tag_bytes = TagBytes(field_number, wire_type)
-      def EncodeField(write, value, unused_deterministic=None):
-        write(tag_bytes)
-        return write(local_struct_pack(format, value))
-      return EncodeField
-
-  return SpecificEncoder
-
-
-def _FloatingPointEncoder(wire_type, format):
-  """Return a constructor for an encoder for float fields.
-
-  This is like StructPackEncoder, but catches errors that may be due to
-  passing non-finite floating-point values to struct.pack, and makes a
-  second attempt to encode those values.
-
-  Args:
-      wire_type:  The field's wire type, for encoding tags.
-      format:  The format string to pass to struct.pack().
-  """
-
-  value_size = struct.calcsize(format)
-  if value_size == 4:
-    def EncodeNonFiniteOrRaise(write, value):
-      # Remember that the serialized form uses little-endian byte order.
-      if value == _POS_INF:
-        write(b'\x00\x00\x80\x7F')
-      elif value == _NEG_INF:
-        write(b'\x00\x00\x80\xFF')
-      elif value != value:           # NaN
-        write(b'\x00\x00\xC0\x7F')
-      else:
-        raise
-  elif value_size == 8:
-    def EncodeNonFiniteOrRaise(write, value):
-      if value == _POS_INF:
-        write(b'\x00\x00\x00\x00\x00\x00\xF0\x7F')
-      elif value == _NEG_INF:
-        write(b'\x00\x00\x00\x00\x00\x00\xF0\xFF')
-      elif value != value:                         # NaN
-        write(b'\x00\x00\x00\x00\x00\x00\xF8\x7F')
-      else:
-        raise
-  else:
-    raise ValueError('Can\'t encode floating-point values that are '
-                     '%d bytes long (only 4 or 8)' % value_size)
-
-  def SpecificEncoder(field_number, is_repeated, is_packed):
-    local_struct_pack = struct.pack
-    if is_packed:
-      tag_bytes = TagBytes(field_number, wire_format.WIRETYPE_LENGTH_DELIMITED)
-      local_EncodeVarint = _EncodeVarint
-      def EncodePackedField(write, value, deterministic):
-        write(tag_bytes)
-        local_EncodeVarint(write, len(value) * value_size, deterministic)
-        for element in value:
-          # This try/except block is going to be faster than any code that
-          # we could write to check whether element is finite.
-          try:
-            write(local_struct_pack(format, element))
-          except SystemError:
-            EncodeNonFiniteOrRaise(write, element)
-      return EncodePackedField
-    elif is_repeated:
-      tag_bytes = TagBytes(field_number, wire_type)
-      def EncodeRepeatedField(write, value, unused_deterministic=None):
-        for element in value:
-          write(tag_bytes)
-          try:
-            write(local_struct_pack(format, element))
-          except SystemError:
-            EncodeNonFiniteOrRaise(write, element)
-      return EncodeRepeatedField
-    else:
-      tag_bytes = TagBytes(field_number, wire_type)
-      def EncodeField(write, value, unused_deterministic=None):
-        write(tag_bytes)
-        try:
-          write(local_struct_pack(format, value))
-        except SystemError:
-          EncodeNonFiniteOrRaise(write, value)
-      return EncodeField
-
-  return SpecificEncoder
-
-
-# ====================================================================
-# Here we declare an encoder constructor for each field type.  These work
-# very similarly to sizer constructors, described earlier.
-
-
-Int32Encoder = Int64Encoder = EnumEncoder = _SimpleEncoder(
-    wire_format.WIRETYPE_VARINT, _EncodeSignedVarint, _SignedVarintSize)
-
-UInt32Encoder = UInt64Encoder = _SimpleEncoder(
-    wire_format.WIRETYPE_VARINT, _EncodeVarint, _VarintSize)
-
-SInt32Encoder = SInt64Encoder = _ModifiedEncoder(
-    wire_format.WIRETYPE_VARINT, _EncodeVarint, _VarintSize,
-    wire_format.ZigZagEncode)
-
-# Note that Python conveniently guarantees that when using the '<' prefix on
-# formats, they will also have the same size across all platforms (as opposed
-# to without the prefix, where their sizes depend on the C compiler's basic
-# type sizes).
-Fixed32Encoder  = _StructPackEncoder(wire_format.WIRETYPE_FIXED32, '<I')
-Fixed64Encoder  = _StructPackEncoder(wire_format.WIRETYPE_FIXED64, '<Q')
-SFixed32Encoder = _StructPackEncoder(wire_format.WIRETYPE_FIXED32, '<i')
-SFixed64Encoder = _StructPackEncoder(wire_format.WIRETYPE_FIXED64, '<q')
-FloatEncoder    = _FloatingPointEncoder(wire_format.WIRETYPE_FIXED32, '<f')
-DoubleEncoder   = _FloatingPointEncoder(wire_format.WIRETYPE_FIXED64, '<d')
-
-
-def BoolEncoder(field_number, is_repeated, is_packed):
-  """Returns an encoder for a boolean field."""
-
-  false_byte = b'\x00'
-  true_byte = b'\x01'
-  if is_packed:
-    tag_bytes = TagBytes(field_number, wire_format.WIRETYPE_LENGTH_DELIMITED)
-    local_EncodeVarint = _EncodeVarint
-    def EncodePackedField(write, value, deterministic):
-      write(tag_bytes)
-      local_EncodeVarint(write, len(value), deterministic)
-      for element in value:
-        if element:
-          write(true_byte)
-        else:
-          write(false_byte)
-    return EncodePackedField
-  elif is_repeated:
-    tag_bytes = TagBytes(field_number, wire_format.WIRETYPE_VARINT)
-    def EncodeRepeatedField(write, value, unused_deterministic=None):
-      for element in value:
-        write(tag_bytes)
-        if element:
-          write(true_byte)
-        else:
-          write(false_byte)
-    return EncodeRepeatedField
-  else:
-    tag_bytes = TagBytes(field_number, wire_format.WIRETYPE_VARINT)
-    def EncodeField(write, value, unused_deterministic=None):
-      write(tag_bytes)
-      if value:
-        return write(true_byte)
-      return write(false_byte)
-    return EncodeField
-
-
-def StringEncoder(field_number, is_repeated, is_packed):
-  """Returns an encoder for a string field."""
-
-  tag = TagBytes(field_number, wire_format.WIRETYPE_LENGTH_DELIMITED)
-  local_EncodeVarint = _EncodeVarint
-  local_len = len
-  assert not is_packed
-  if is_repeated:
-    def EncodeRepeatedField(write, value, deterministic):
-      for element in value:
-        encoded = element.encode('utf-8')
-        write(tag)
-        local_EncodeVarint(write, local_len(encoded), deterministic)
-        write(encoded)
-    return EncodeRepeatedField
-  else:
-    def EncodeField(write, value, deterministic):
-      encoded = value.encode('utf-8')
-      write(tag)
-      local_EncodeVarint(write, local_len(encoded), deterministic)
-      return write(encoded)
-    return EncodeField
-
-
-def BytesEncoder(field_number, is_repeated, is_packed):
-  """Returns an encoder for a bytes field."""
-
-  tag = TagBytes(field_number, wire_format.WIRETYPE_LENGTH_DELIMITED)
-  local_EncodeVarint = _EncodeVarint
-  local_len = len
-  assert not is_packed
-  if is_repeated:
-    def EncodeRepeatedField(write, value, deterministic):
-      for element in value:
-        write(tag)
-        local_EncodeVarint(write, local_len(element), deterministic)
-        write(element)
-    return EncodeRepeatedField
-  else:
-    def EncodeField(write, value, deterministic):
-      write(tag)
-      local_EncodeVarint(write, local_len(value), deterministic)
-      return write(value)
-    return EncodeField
-
-
-def GroupEncoder(field_number, is_repeated, is_packed):
-  """Returns an encoder for a group field."""
-
-  start_tag = TagBytes(field_number, wire_format.WIRETYPE_START_GROUP)
-  end_tag = TagBytes(field_number, wire_format.WIRETYPE_END_GROUP)
-  assert not is_packed
-  if is_repeated:
-    def EncodeRepeatedField(write, value, deterministic):
-      for element in value:
-        write(start_tag)
-        element._InternalSerialize(write, deterministic)
-        write(end_tag)
-    return EncodeRepeatedField
-  else:
-    def EncodeField(write, value, deterministic):
-      write(start_tag)
-      value._InternalSerialize(write, deterministic)
-      return write(end_tag)
-    return EncodeField
-
-
-def MessageEncoder(field_number, is_repeated, is_packed):
-  """Returns an encoder for a message field."""
-
-  tag = TagBytes(field_number, wire_format.WIRETYPE_LENGTH_DELIMITED)
-  local_EncodeVarint = _EncodeVarint
-  assert not is_packed
-  if is_repeated:
-    def EncodeRepeatedField(write, value, deterministic):
-      for element in value:
-        write(tag)
-        local_EncodeVarint(write, element.ByteSize(), deterministic)
-        element._InternalSerialize(write, deterministic)
-    return EncodeRepeatedField
-  else:
-    def EncodeField(write, value, deterministic):
-      write(tag)
-      local_EncodeVarint(write, value.ByteSize(), deterministic)
-      return value._InternalSerialize(write, deterministic)
-    return EncodeField
-
-
-# --------------------------------------------------------------------
-# As before, MessageSet is special.
-
-
-def MessageSetItemEncoder(field_number):
-  """Encoder for extensions of MessageSet.
-
-  The message set message looks like this:
-    message MessageSet {
-      repeated group Item = 1 {
-        required int32 type_id = 2;
-        required string message = 3;
-      }
-    }
-  """
-  start_bytes = b"".join([
-      TagBytes(1, wire_format.WIRETYPE_START_GROUP),
-      TagBytes(2, wire_format.WIRETYPE_VARINT),
-      _VarintBytes(field_number),
-      TagBytes(3, wire_format.WIRETYPE_LENGTH_DELIMITED)])
-  end_bytes = TagBytes(1, wire_format.WIRETYPE_END_GROUP)
-  local_EncodeVarint = _EncodeVarint
-
-  def EncodeField(write, value, deterministic):
-    write(start_bytes)
-    local_EncodeVarint(write, value.ByteSize(), deterministic)
-    value._InternalSerialize(write, deterministic)
-    return write(end_bytes)
-
-  return EncodeField
-
-
-# --------------------------------------------------------------------
-# As before, Map is special.
-
-
-def MapEncoder(field_descriptor):
-  """Encoder for extensions of MessageSet.
-
-  Maps always have a wire format like this:
-    message MapEntry {
-      key_type key = 1;
-      value_type value = 2;
-    }
-    repeated MapEntry map = N;
-  """
-  # Can't look at field_descriptor.message_type._concrete_class because it may
-  # not have been initialized yet.
-  message_type = field_descriptor.message_type
-  encode_message = MessageEncoder(field_descriptor.number, False, False)
-
-  def EncodeField(write, value, deterministic):
-    value_keys = sorted(value.keys()) if deterministic else value
-    for key in value_keys:
-      entry_msg = message_type._concrete_class(key=key, value=value[key])
-      encode_message(write, entry_msg, deterministic)
-
-  return EncodeField
diff --git a/libs/protobuf/python/google/protobuf/internal/enum_type_wrapper.py b/libs/protobuf/python/google/protobuf/internal/enum_type_wrapper.py
deleted file mode 100644
index 65d2c7a..0000000
--- a/libs/protobuf/python/google/protobuf/internal/enum_type_wrapper.py
+++ /dev/null
@@ -1,124 +0,0 @@
-# Protocol Buffers - Google's data interchange format
-# Copyright 2008 Google Inc.  All rights reserved.
-# https://developers.google.com/protocol-buffers/
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-"""A simple wrapper around enum types to expose utility functions.
-
-Instances are created as properties with the same name as the enum they wrap
-on proto classes.  For usage, see:
-  reflection_test.py
-"""
-
-__author__ = 'rabsatt@google.com (Kevin Rabsatt)'
-
-
-class EnumTypeWrapper(object):
-  """A utility for finding the names of enum values."""
-
-  DESCRIPTOR = None
-
-  # This is a type alias, which mypy typing stubs can type as
-  # a genericized parameter constrained to an int, allowing subclasses
-  # to be typed with more constraint in .pyi stubs
-  # Eg.
-  # def MyGeneratedEnum(Message):
-  #   ValueType = NewType('ValueType', int)
-  #   def Name(self, number: MyGeneratedEnum.ValueType) -> str
-  ValueType = int
-
-  def __init__(self, enum_type):
-    """Inits EnumTypeWrapper with an EnumDescriptor."""
-    self._enum_type = enum_type
-    self.DESCRIPTOR = enum_type  # pylint: disable=invalid-name
-
-  def Name(self, number):  # pylint: disable=invalid-name
-    """Returns a string containing the name of an enum value."""
-    try:
-      return self._enum_type.values_by_number[number].name
-    except KeyError:
-      pass  # fall out to break exception chaining
-
-    if not isinstance(number, int):
-      raise TypeError(
-          'Enum value for {} must be an int, but got {} {!r}.'.format(
-              self._enum_type.name, type(number), number))
-    else:
-      # repr here to handle the odd case when you pass in a boolean.
-      raise ValueError('Enum {} has no name defined for value {!r}'.format(
-          self._enum_type.name, number))
-
-  def Value(self, name):  # pylint: disable=invalid-name
-    """Returns the value corresponding to the given enum name."""
-    try:
-      return self._enum_type.values_by_name[name].number
-    except KeyError:
-      pass  # fall out to break exception chaining
-    raise ValueError('Enum {} has no value defined for name {!r}'.format(
-        self._enum_type.name, name))
-
-  def keys(self):
-    """Return a list of the string names in the enum.
-
-    Returns:
-      A list of strs, in the order they were defined in the .proto file.
-    """
-
-    return [value_descriptor.name
-            for value_descriptor in self._enum_type.values]
-
-  def values(self):
-    """Return a list of the integer values in the enum.
-
-    Returns:
-      A list of ints, in the order they were defined in the .proto file.
-    """
-
-    return [value_descriptor.number
-            for value_descriptor in self._enum_type.values]
-
-  def items(self):
-    """Return a list of the (name, value) pairs of the enum.
-
-    Returns:
-      A list of (str, int) pairs, in the order they were defined
-      in the .proto file.
-    """
-    return [(value_descriptor.name, value_descriptor.number)
-            for value_descriptor in self._enum_type.values]
-
-  def __getattr__(self, name):
-    """Returns the value corresponding to the given enum name."""
-    try:
-      return super(
-          EnumTypeWrapper,
-          self).__getattribute__('_enum_type').values_by_name[name].number
-    except KeyError:
-      pass  # fall out to break exception chaining
-    raise AttributeError('Enum {} has no value defined for name {!r}'.format(
-        self._enum_type.name, name))
diff --git a/libs/protobuf/python/google/protobuf/internal/extension_dict.py b/libs/protobuf/python/google/protobuf/internal/extension_dict.py
deleted file mode 100644
index b346cf2..0000000
--- a/libs/protobuf/python/google/protobuf/internal/extension_dict.py
+++ /dev/null
@@ -1,213 +0,0 @@
-# Protocol Buffers - Google's data interchange format
-# Copyright 2008 Google Inc.  All rights reserved.
-# https://developers.google.com/protocol-buffers/
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-"""Contains _ExtensionDict class to represent extensions.
-"""
-
-from google.protobuf.internal import type_checkers
-from google.protobuf.descriptor import FieldDescriptor
-
-
-def _VerifyExtensionHandle(message, extension_handle):
-  """Verify that the given extension handle is valid."""
-
-  if not isinstance(extension_handle, FieldDescriptor):
-    raise KeyError('HasExtension() expects an extension handle, got: %s' %
-                   extension_handle)
-
-  if not extension_handle.is_extension:
-    raise KeyError('"%s" is not an extension.' % extension_handle.full_name)
-
-  if not extension_handle.containing_type:
-    raise KeyError('"%s" is missing a containing_type.'
-                   % extension_handle.full_name)
-
-  if extension_handle.containing_type is not message.DESCRIPTOR:
-    raise KeyError('Extension "%s" extends message type "%s", but this '
-                   'message is of type "%s".' %
-                   (extension_handle.full_name,
-                    extension_handle.containing_type.full_name,
-                    message.DESCRIPTOR.full_name))
-
-
-# TODO(robinson): Unify error handling of "unknown extension" crap.
-# TODO(robinson): Support iteritems()-style iteration over all
-# extensions with the "has" bits turned on?
-class _ExtensionDict(object):
-
-  """Dict-like container for Extension fields on proto instances.
-
-  Note that in all cases we expect extension handles to be
-  FieldDescriptors.
-  """
-
-  def __init__(self, extended_message):
-    """
-    Args:
-      extended_message: Message instance for which we are the Extensions dict.
-    """
-    self._extended_message = extended_message
-
-  def __getitem__(self, extension_handle):
-    """Returns the current value of the given extension handle."""
-
-    _VerifyExtensionHandle(self._extended_message, extension_handle)
-
-    result = self._extended_message._fields.get(extension_handle)
-    if result is not None:
-      return result
-
-    if extension_handle.label == FieldDescriptor.LABEL_REPEATED:
-      result = extension_handle._default_constructor(self._extended_message)
-    elif extension_handle.cpp_type == FieldDescriptor.CPPTYPE_MESSAGE:
-      message_type = extension_handle.message_type
-      if not hasattr(message_type, '_concrete_class'):
-        # pylint: disable=protected-access
-        self._extended_message._FACTORY.GetPrototype(message_type)
-      assert getattr(extension_handle.message_type, '_concrete_class', None), (
-          'Uninitialized concrete class found for field %r (message type %r)'
-          % (extension_handle.full_name,
-             extension_handle.message_type.full_name))
-      result = extension_handle.message_type._concrete_class()
-      try:
-        result._SetListener(self._extended_message._listener_for_children)
-      except ReferenceError:
-        pass
-    else:
-      # Singular scalar -- just return the default without inserting into the
-      # dict.
-      return extension_handle.default_value
-
-    # Atomically check if another thread has preempted us and, if not, swap
-    # in the new object we just created.  If someone has preempted us, we
-    # take that object and discard ours.
-    # WARNING:  We are relying on setdefault() being atomic.  This is true
-    #   in CPython but we haven't investigated others.  This warning appears
-    #   in several other locations in this file.
-    result = self._extended_message._fields.setdefault(
-        extension_handle, result)
-
-    return result
-
-  def __eq__(self, other):
-    if not isinstance(other, self.__class__):
-      return False
-
-    my_fields = self._extended_message.ListFields()
-    other_fields = other._extended_message.ListFields()
-
-    # Get rid of non-extension fields.
-    my_fields = [field for field in my_fields if field.is_extension]
-    other_fields = [field for field in other_fields if field.is_extension]
-
-    return my_fields == other_fields
-
-  def __ne__(self, other):
-    return not self == other
-
-  def __len__(self):
-    fields = self._extended_message.ListFields()
-    # Get rid of non-extension fields.
-    extension_fields = [field for field in fields if field[0].is_extension]
-    return len(extension_fields)
-
-  def __hash__(self):
-    raise TypeError('unhashable object')
-
-  # Note that this is only meaningful for non-repeated, scalar extension
-  # fields.  Note also that we may have to call _Modified() when we do
-  # successfully set a field this way, to set any necessary "has" bits in the
-  # ancestors of the extended message.
-  def __setitem__(self, extension_handle, value):
-    """If extension_handle specifies a non-repeated, scalar extension
-    field, sets the value of that field.
-    """
-
-    _VerifyExtensionHandle(self._extended_message, extension_handle)
-
-    if (extension_handle.label == FieldDescriptor.LABEL_REPEATED or
-        extension_handle.cpp_type == FieldDescriptor.CPPTYPE_MESSAGE):
-      raise TypeError(
-          'Cannot assign to extension "%s" because it is a repeated or '
-          'composite type.' % extension_handle.full_name)
-
-    # It's slightly wasteful to lookup the type checker each time,
-    # but we expect this to be a vanishingly uncommon case anyway.
-    type_checker = type_checkers.GetTypeChecker(extension_handle)
-    # pylint: disable=protected-access
-    self._extended_message._fields[extension_handle] = (
-        type_checker.CheckValue(value))
-    self._extended_message._Modified()
-
-  def __delitem__(self, extension_handle):
-    self._extended_message.ClearExtension(extension_handle)
-
-  def _FindExtensionByName(self, name):
-    """Tries to find a known extension with the specified name.
-
-    Args:
-      name: Extension full name.
-
-    Returns:
-      Extension field descriptor.
-    """
-    return self._extended_message._extensions_by_name.get(name, None)
-
-  def _FindExtensionByNumber(self, number):
-    """Tries to find a known extension with the field number.
-
-    Args:
-      number: Extension field number.
-
-    Returns:
-      Extension field descriptor.
-    """
-    return self._extended_message._extensions_by_number.get(number, None)
-
-  def __iter__(self):
-    # Return a generator over the populated extension fields
-    return (f[0] for f in self._extended_message.ListFields()
-            if f[0].is_extension)
-
-  def __contains__(self, extension_handle):
-    _VerifyExtensionHandle(self._extended_message, extension_handle)
-
-    if extension_handle not in self._extended_message._fields:
-      return False
-
-    if extension_handle.label == FieldDescriptor.LABEL_REPEATED:
-      return bool(self._extended_message._fields.get(extension_handle))
-
-    if extension_handle.cpp_type == FieldDescriptor.CPPTYPE_MESSAGE:
-      value = self._extended_message._fields.get(extension_handle)
-      # pylint: disable=protected-access
-      return value is not None and value._is_present_in_parent
-
-    return True
diff --git a/libs/protobuf/python/google/protobuf/internal/factory_test1.proto b/libs/protobuf/python/google/protobuf/internal/factory_test1.proto
deleted file mode 100644
index 5e729f5..0000000
--- a/libs/protobuf/python/google/protobuf/internal/factory_test1.proto
+++ /dev/null
@@ -1,70 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: matthewtoia@google.com (Matt Toia)
-
-syntax = "proto2";
-
-package google.protobuf.python.internal;
-
-enum Factory1Enum {
-  FACTORY_1_VALUE_0 = 0;
-  FACTORY_1_VALUE_1 = 1;
-}
-
-message Factory1Message {
-  optional Factory1Enum factory_1_enum = 1;
-  enum NestedFactory1Enum {
-    NESTED_FACTORY_1_VALUE_0 = 0;
-    NESTED_FACTORY_1_VALUE_1 = 1;
-  }
-  optional NestedFactory1Enum nested_factory_1_enum = 2;
-  message NestedFactory1Message {
-    optional string value = 1;
-  }
-  optional NestedFactory1Message nested_factory_1_message = 3;
-  optional int32 scalar_value = 4;
-  repeated string list_value = 5;
-
-  extensions 1000 to max;
-}
-
-message Factory1MethodRequest {
-  optional string argument = 1;
-}
-
-message Factory1MethodResponse {
-  optional string result = 1;
-}
-
-service Factory1Service {
-  // Dummy method for this dummy service.
-  rpc Factory1Method(Factory1MethodRequest) returns (Factory1MethodResponse) {}
-}
diff --git a/libs/protobuf/python/google/protobuf/internal/factory_test2.proto b/libs/protobuf/python/google/protobuf/internal/factory_test2.proto
deleted file mode 100644
index 5fcbc5a..0000000
--- a/libs/protobuf/python/google/protobuf/internal/factory_test2.proto
+++ /dev/null
@@ -1,104 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: matthewtoia@google.com (Matt Toia)
-
-syntax = "proto2";
-
-package google.protobuf.python.internal;
-
-import "google/protobuf/internal/factory_test1.proto";
-
-
-enum Factory2Enum {
-  FACTORY_2_VALUE_0 = 0;
-  FACTORY_2_VALUE_1 = 1;
-}
-
-message Factory2Message {
-  required int32 mandatory = 1;
-  optional Factory2Enum factory_2_enum = 2;
-  enum NestedFactory2Enum {
-    NESTED_FACTORY_2_VALUE_0 = 0;
-    NESTED_FACTORY_2_VALUE_1 = 1;
-  }
-  optional NestedFactory2Enum nested_factory_2_enum = 3;
-  message NestedFactory2Message {
-    optional string value = 1;
-  }
-  optional NestedFactory2Message nested_factory_2_message = 4;
-  optional Factory1Message factory_1_message = 5;
-  optional Factory1Enum factory_1_enum = 6;
-  optional Factory1Message.NestedFactory1Enum nested_factory_1_enum = 7;
-  optional Factory1Message.NestedFactory1Message nested_factory_1_message = 8;
-  optional Factory2Message circular_message = 9;
-  optional string scalar_value = 10;
-  repeated string list_value = 11;
-  repeated group Grouped = 12 {
-    optional string part_1 = 13;
-    optional string part_2 = 14;
-  }
-  optional LoopMessage loop = 15;
-  optional int32 int_with_default = 16 [default = 1776];
-  optional double double_with_default = 17 [default = 9.99];
-  optional string string_with_default = 18 [default = "hello world"];
-  optional bool bool_with_default = 19 [default = false];
-  optional Factory2Enum enum_with_default = 20 [default = FACTORY_2_VALUE_1];
-  optional bytes bytes_with_default = 21 [default = "a\373\000c"];
-
-
-  extend Factory1Message {
-    optional string one_more_field = 1001;
-  }
-
-  oneof oneof_field {
-    int32 oneof_int = 22;
-    string oneof_string = 23;
-  }
-}
-
-message LoopMessage {
-  optional Factory2Message loop = 1;
-}
-
-message MessageWithNestedEnumOnly {
-  enum NestedEnum {
-    NESTED_MESSAGE_ENUM_0 = 0;
-  }
-}
-
-extend Factory1Message {
-  optional string another_field = 1002;
-}
-
-message MessageWithOption {
-  option no_standard_descriptor_accessor = true;
-  optional int32 field1 = 1;
-}
diff --git a/libs/protobuf/python/google/protobuf/internal/file_options_test.proto b/libs/protobuf/python/google/protobuf/internal/file_options_test.proto
deleted file mode 100644
index 4eceeb0..0000000
--- a/libs/protobuf/python/google/protobuf/internal/file_options_test.proto
+++ /dev/null
@@ -1,43 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto2";
-
-import "google/protobuf/descriptor.proto";
-
-package google.protobuf.python.internal;
-
-message FooOptions {
-  optional string foo_name = 1;
-}
-
-extend .google.protobuf.FileOptions {
-  optional FooOptions foo_options = 120436268;
-}
diff --git a/libs/protobuf/python/google/protobuf/internal/generator_test.py b/libs/protobuf/python/google/protobuf/internal/generator_test.py
deleted file mode 100644
index 9883fce..0000000
--- a/libs/protobuf/python/google/protobuf/internal/generator_test.py
+++ /dev/null
@@ -1,354 +0,0 @@
-# Protocol Buffers - Google's data interchange format
-# Copyright 2008 Google Inc.  All rights reserved.
-# https://developers.google.com/protocol-buffers/
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# TODO(robinson): Flesh this out considerably.  We focused on reflection_test.py
-# first, since it's testing the subtler code, and since it provides decent
-# indirect testing of the protocol compiler output.
-
-"""Unittest that directly tests the output of the pure-Python protocol
-compiler.  See //google/protobuf/internal/reflection_test.py for a test which
-further ensures that we can use Python protocol message objects as we expect.
-"""
-
-__author__ = 'robinson@google.com (Will Robinson)'
-
-import unittest
-
-from google.protobuf.internal import test_bad_identifiers_pb2
-from google.protobuf import unittest_custom_options_pb2
-from google.protobuf import unittest_import_pb2
-from google.protobuf import unittest_import_public_pb2
-from google.protobuf import unittest_mset_pb2
-from google.protobuf import unittest_mset_wire_format_pb2
-from google.protobuf import unittest_no_generic_services_pb2
-from google.protobuf import unittest_pb2
-from google.protobuf import service
-from google.protobuf import symbol_database
-
-MAX_EXTENSION = 536870912
-
-
-class GeneratorTest(unittest.TestCase):
-
-  def testNestedMessageDescriptor(self):
-    field_name = 'optional_nested_message'
-    proto_type = unittest_pb2.TestAllTypes
-    self.assertEqual(
-        proto_type.NestedMessage.DESCRIPTOR,
-        proto_type.DESCRIPTOR.fields_by_name[field_name].message_type)
-
-  def testEnums(self):
-    # We test only module-level enums here.
-    # TODO(robinson): Examine descriptors directly to check
-    # enum descriptor output.
-    self.assertEqual(4, unittest_pb2.FOREIGN_FOO)
-    self.assertEqual(5, unittest_pb2.FOREIGN_BAR)
-    self.assertEqual(6, unittest_pb2.FOREIGN_BAZ)
-
-    proto = unittest_pb2.TestAllTypes()
-    self.assertEqual(1, proto.FOO)
-    self.assertEqual(1, unittest_pb2.TestAllTypes.FOO)
-    self.assertEqual(2, proto.BAR)
-    self.assertEqual(2, unittest_pb2.TestAllTypes.BAR)
-    self.assertEqual(3, proto.BAZ)
-    self.assertEqual(3, unittest_pb2.TestAllTypes.BAZ)
-
-  def testExtremeDefaultValues(self):
-    message = unittest_pb2.TestExtremeDefaultValues()
-
-    # Python pre-2.6 does not have isinf() or isnan() functions, so we have
-    # to provide our own.
-    def isnan(val):
-      # NaN is never equal to itself.
-      return val != val
-    def isinf(val):
-      # Infinity times zero equals NaN.
-      return not isnan(val) and isnan(val * 0)
-
-    self.assertTrue(isinf(message.inf_double))
-    self.assertTrue(message.inf_double > 0)
-    self.assertTrue(isinf(message.neg_inf_double))
-    self.assertTrue(message.neg_inf_double < 0)
-    self.assertTrue(isnan(message.nan_double))
-
-    self.assertTrue(isinf(message.inf_float))
-    self.assertTrue(message.inf_float > 0)
-    self.assertTrue(isinf(message.neg_inf_float))
-    self.assertTrue(message.neg_inf_float < 0)
-    self.assertTrue(isnan(message.nan_float))
-    self.assertEqual("? ? ?? ?? ??? ??/ ??-", message.cpp_trigraph)
-
-  def testHasDefaultValues(self):
-    desc = unittest_pb2.TestAllTypes.DESCRIPTOR
-
-    expected_has_default_by_name = {
-        'optional_int32': False,
-        'repeated_int32': False,
-        'optional_nested_message': False,
-        'default_int32': True,
-    }
-
-    has_default_by_name = dict(
-        [(f.name, f.has_default_value)
-         for f in desc.fields
-         if f.name in expected_has_default_by_name])
-    self.assertEqual(expected_has_default_by_name, has_default_by_name)
-
-  def testContainingTypeBehaviorForExtensions(self):
-    self.assertEqual(unittest_pb2.optional_int32_extension.containing_type,
-                     unittest_pb2.TestAllExtensions.DESCRIPTOR)
-    self.assertEqual(unittest_pb2.TestRequired.single.containing_type,
-                     unittest_pb2.TestAllExtensions.DESCRIPTOR)
-
-  def testExtensionScope(self):
-    self.assertEqual(unittest_pb2.optional_int32_extension.extension_scope,
-                     None)
-    self.assertEqual(unittest_pb2.TestRequired.single.extension_scope,
-                     unittest_pb2.TestRequired.DESCRIPTOR)
-
-  def testIsExtension(self):
-    self.assertTrue(unittest_pb2.optional_int32_extension.is_extension)
-    self.assertTrue(unittest_pb2.TestRequired.single.is_extension)
-
-    message_descriptor = unittest_pb2.TestRequired.DESCRIPTOR
-    non_extension_descriptor = message_descriptor.fields_by_name['a']
-    self.assertTrue(not non_extension_descriptor.is_extension)
-
-  def testOptions(self):
-    proto = unittest_mset_wire_format_pb2.TestMessageSet()
-    self.assertTrue(proto.DESCRIPTOR.GetOptions().message_set_wire_format)
-
-  def testMessageWithCustomOptions(self):
-    proto = unittest_custom_options_pb2.TestMessageWithCustomOptions()
-    enum_options = proto.DESCRIPTOR.enum_types_by_name['AnEnum'].GetOptions()
-    self.assertTrue(enum_options is not None)
-    # TODO(gps): We really should test for the presence of the enum_opt1
-    # extension and for its value to be set to -789.
-
-  def testNestedTypes(self):
-    self.assertEqual(
-        set(unittest_pb2.TestAllTypes.DESCRIPTOR.nested_types),
-        set([
-            unittest_pb2.TestAllTypes.NestedMessage.DESCRIPTOR,
-            unittest_pb2.TestAllTypes.OptionalGroup.DESCRIPTOR,
-            unittest_pb2.TestAllTypes.RepeatedGroup.DESCRIPTOR,
-        ]))
-    self.assertEqual(unittest_pb2.TestEmptyMessage.DESCRIPTOR.nested_types, [])
-    self.assertEqual(
-        unittest_pb2.TestAllTypes.NestedMessage.DESCRIPTOR.nested_types, [])
-
-  def testContainingType(self):
-    self.assertTrue(
-        unittest_pb2.TestEmptyMessage.DESCRIPTOR.containing_type is None)
-    self.assertTrue(
-        unittest_pb2.TestAllTypes.DESCRIPTOR.containing_type is None)
-    self.assertEqual(
-        unittest_pb2.TestAllTypes.NestedMessage.DESCRIPTOR.containing_type,
-        unittest_pb2.TestAllTypes.DESCRIPTOR)
-    self.assertEqual(
-        unittest_pb2.TestAllTypes.NestedMessage.DESCRIPTOR.containing_type,
-        unittest_pb2.TestAllTypes.DESCRIPTOR)
-    self.assertEqual(
-        unittest_pb2.TestAllTypes.RepeatedGroup.DESCRIPTOR.containing_type,
-        unittest_pb2.TestAllTypes.DESCRIPTOR)
-
-  def testContainingTypeInEnumDescriptor(self):
-    self.assertTrue(unittest_pb2._FOREIGNENUM.containing_type is None)
-    self.assertEqual(unittest_pb2._TESTALLTYPES_NESTEDENUM.containing_type,
-                     unittest_pb2.TestAllTypes.DESCRIPTOR)
-
-  def testPackage(self):
-    self.assertEqual(
-        unittest_pb2.TestAllTypes.DESCRIPTOR.file.package,
-        'protobuf_unittest')
-    desc = unittest_pb2.TestAllTypes.NestedMessage.DESCRIPTOR
-    self.assertEqual(desc.file.package, 'protobuf_unittest')
-    self.assertEqual(
-        unittest_import_pb2.ImportMessage.DESCRIPTOR.file.package,
-        'protobuf_unittest_import')
-
-    self.assertEqual(
-        unittest_pb2._FOREIGNENUM.file.package, 'protobuf_unittest')
-    self.assertEqual(
-        unittest_pb2._TESTALLTYPES_NESTEDENUM.file.package,
-        'protobuf_unittest')
-    self.assertEqual(
-        unittest_import_pb2._IMPORTENUM.file.package,
-        'protobuf_unittest_import')
-
-  def testExtensionRange(self):
-    self.assertEqual(
-        unittest_pb2.TestAllTypes.DESCRIPTOR.extension_ranges, [])
-    self.assertEqual(
-        unittest_pb2.TestAllExtensions.DESCRIPTOR.extension_ranges,
-        [(1, MAX_EXTENSION)])
-    self.assertEqual(
-        unittest_pb2.TestMultipleExtensionRanges.DESCRIPTOR.extension_ranges,
-        [(42, 43), (4143, 4244), (65536, MAX_EXTENSION)])
-
-  def testFileDescriptor(self):
-    self.assertEqual(unittest_pb2.DESCRIPTOR.name,
-                     'google/protobuf/unittest.proto')
-    self.assertEqual(unittest_pb2.DESCRIPTOR.package, 'protobuf_unittest')
-    self.assertFalse(unittest_pb2.DESCRIPTOR.serialized_pb is None)
-    self.assertEqual(unittest_pb2.DESCRIPTOR.dependencies,
-                     [unittest_import_pb2.DESCRIPTOR])
-    self.assertEqual(unittest_import_pb2.DESCRIPTOR.dependencies,
-                     [unittest_import_public_pb2.DESCRIPTOR])
-    self.assertEqual(unittest_import_pb2.DESCRIPTOR.public_dependencies,
-                     [unittest_import_public_pb2.DESCRIPTOR])
-  def testNoGenericServices(self):
-    self.assertTrue(hasattr(unittest_no_generic_services_pb2, "TestMessage"))
-    self.assertTrue(hasattr(unittest_no_generic_services_pb2, "FOO"))
-    self.assertTrue(hasattr(unittest_no_generic_services_pb2, "test_extension"))
-
-    # Make sure unittest_no_generic_services_pb2 has no services subclassing
-    # Proto2 Service class.
-    if hasattr(unittest_no_generic_services_pb2, "TestService"):
-      self.assertFalse(issubclass(unittest_no_generic_services_pb2.TestService,
-                                  service.Service))
-
-  def testMessageTypesByName(self):
-    file_type = unittest_pb2.DESCRIPTOR
-    self.assertEqual(
-        unittest_pb2._TESTALLTYPES,
-        file_type.message_types_by_name[unittest_pb2._TESTALLTYPES.name])
-
-    # Nested messages shouldn't be included in the message_types_by_name
-    # dictionary (like in the C++ API).
-    self.assertFalse(
-        unittest_pb2._TESTALLTYPES_NESTEDMESSAGE.name in
-        file_type.message_types_by_name)
-
-  def testEnumTypesByName(self):
-    file_type = unittest_pb2.DESCRIPTOR
-    self.assertEqual(
-        unittest_pb2._FOREIGNENUM,
-        file_type.enum_types_by_name[unittest_pb2._FOREIGNENUM.name])
-
-  def testExtensionsByName(self):
-    file_type = unittest_pb2.DESCRIPTOR
-    self.assertEqual(
-        unittest_pb2.my_extension_string,
-        file_type.extensions_by_name[unittest_pb2.my_extension_string.name])
-
-  def testPublicImports(self):
-    # Test public imports as embedded message.
-    all_type_proto = unittest_pb2.TestAllTypes()
-    self.assertEqual(0, all_type_proto.optional_public_import_message.e)
-
-    # PublicImportMessage is actually defined in unittest_import_public_pb2
-    # module, and is public imported by unittest_import_pb2 module.
-    public_import_proto = unittest_import_pb2.PublicImportMessage()
-    self.assertEqual(0, public_import_proto.e)
-    self.assertTrue(unittest_import_public_pb2.PublicImportMessage is
-                    unittest_import_pb2.PublicImportMessage)
-
-  def testBadIdentifiers(self):
-    # We're just testing that the code was imported without problems.
-    message = test_bad_identifiers_pb2.TestBadIdentifiers()
-    self.assertEqual(message.Extensions[test_bad_identifiers_pb2.message],
-                     "foo")
-    self.assertEqual(message.Extensions[test_bad_identifiers_pb2.descriptor],
-                     "bar")
-    self.assertEqual(message.Extensions[test_bad_identifiers_pb2.reflection],
-                     "baz")
-    self.assertEqual(message.Extensions[test_bad_identifiers_pb2.service],
-                     "qux")
-
-  def testOneof(self):
-    desc = unittest_pb2.TestAllTypes.DESCRIPTOR
-    self.assertEqual(1, len(desc.oneofs))
-    self.assertEqual('oneof_field', desc.oneofs[0].name)
-    self.assertEqual(0, desc.oneofs[0].index)
-    self.assertIs(desc, desc.oneofs[0].containing_type)
-    self.assertIs(desc.oneofs[0], desc.oneofs_by_name['oneof_field'])
-    nested_names = set(['oneof_uint32', 'oneof_nested_message',
-                        'oneof_string', 'oneof_bytes'])
-    self.assertEqual(
-        nested_names,
-        set([field.name for field in desc.oneofs[0].fields]))
-    for field_name, field_desc in desc.fields_by_name.items():
-      if field_name in nested_names:
-        self.assertIs(desc.oneofs[0], field_desc.containing_oneof)
-      else:
-        self.assertIsNone(field_desc.containing_oneof)
-
-  def testEnumWithDupValue(self):
-    self.assertEqual('FOO1',
-                     unittest_pb2.TestEnumWithDupValue.Name(unittest_pb2.FOO1))
-    self.assertEqual('FOO1',
-                     unittest_pb2.TestEnumWithDupValue.Name(unittest_pb2.FOO2))
-    self.assertEqual('BAR1',
-                     unittest_pb2.TestEnumWithDupValue.Name(unittest_pb2.BAR1))
-    self.assertEqual('BAR1',
-                     unittest_pb2.TestEnumWithDupValue.Name(unittest_pb2.BAR2))
-
-
-class SymbolDatabaseRegistrationTest(unittest.TestCase):
-  """Checks that messages, enums and files are correctly registered."""
-
-  def testGetSymbol(self):
-    self.assertEqual(
-        unittest_pb2.TestAllTypes, symbol_database.Default().GetSymbol(
-            'protobuf_unittest.TestAllTypes'))
-    self.assertEqual(
-        unittest_pb2.TestAllTypes.NestedMessage,
-        symbol_database.Default().GetSymbol(
-            'protobuf_unittest.TestAllTypes.NestedMessage'))
-    with self.assertRaises(KeyError):
-      symbol_database.Default().GetSymbol('protobuf_unittest.NestedMessage')
-    self.assertEqual(
-        unittest_pb2.TestAllTypes.OptionalGroup,
-        symbol_database.Default().GetSymbol(
-            'protobuf_unittest.TestAllTypes.OptionalGroup'))
-    self.assertEqual(
-        unittest_pb2.TestAllTypes.RepeatedGroup,
-        symbol_database.Default().GetSymbol(
-            'protobuf_unittest.TestAllTypes.RepeatedGroup'))
-
-  def testEnums(self):
-    self.assertEqual(
-        'protobuf_unittest.ForeignEnum',
-        symbol_database.Default().pool.FindEnumTypeByName(
-            'protobuf_unittest.ForeignEnum').full_name)
-    self.assertEqual(
-        'protobuf_unittest.TestAllTypes.NestedEnum',
-        symbol_database.Default().pool.FindEnumTypeByName(
-            'protobuf_unittest.TestAllTypes.NestedEnum').full_name)
-
-  def testFindFileByName(self):
-    self.assertEqual(
-        'google/protobuf/unittest.proto',
-        symbol_database.Default().pool.FindFileByName(
-            'google/protobuf/unittest.proto').name)
-
-if __name__ == '__main__':
-  unittest.main()
diff --git a/libs/protobuf/python/google/protobuf/internal/import_test.py b/libs/protobuf/python/google/protobuf/internal/import_test.py
deleted file mode 100644
index b5c572c..0000000
--- a/libs/protobuf/python/google/protobuf/internal/import_test.py
+++ /dev/null
@@ -1,49 +0,0 @@
-# -*- coding: utf-8 -*-
-# Protocol Buffers - Google's data interchange format
-# Copyright 2008 Google Inc.  All rights reserved.
-# https://developers.google.com/protocol-buffers/
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-"""Unittest for nested public imports."""
-
-import unittest
-
-from google.protobuf.internal.import_test_package import outer_pb2
-
-
-class ImportTest(unittest.TestCase):
-
-  def testPackageInitializationImport(self):
-    """Test that we can import nested import public messages."""
-
-    msg = outer_pb2.Outer()
-    self.assertEqual(58, msg.import_public_nested.value)
-
-
-if __name__ == '__main__':
-  unittest.main()
diff --git a/libs/protobuf/python/google/protobuf/internal/import_test_package/__init__.py b/libs/protobuf/python/google/protobuf/internal/import_test_package/__init__.py
deleted file mode 100644
index 5121dd0..0000000
--- a/libs/protobuf/python/google/protobuf/internal/import_test_package/__init__.py
+++ /dev/null
@@ -1,33 +0,0 @@
-# Protocol Buffers - Google's data interchange format
-# Copyright 2008 Google Inc.  All rights reserved.
-# https://developers.google.com/protocol-buffers/
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-"""Sample module importing a nested proto from itself."""
-
-from google.protobuf.internal.import_test_package import outer_pb2 as myproto
diff --git a/libs/protobuf/python/google/protobuf/internal/import_test_package/import_public.proto b/libs/protobuf/python/google/protobuf/internal/import_test_package/import_public.proto
deleted file mode 100644
index 8774702..0000000
--- a/libs/protobuf/python/google/protobuf/internal/import_test_package/import_public.proto
+++ /dev/null
@@ -1,40 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// A proto file which is imported by inner.proto to test public importing.
-
-syntax = "proto2";
-
-package google.protobuf.python.internal.import_test_package;
-
-option optimize_for = SPEED;
-
-// Test nested public import
-import public "google/protobuf/internal/import_test_package/import_public_nested.proto";
diff --git a/libs/protobuf/python/google/protobuf/internal/import_test_package/import_public_nested.proto b/libs/protobuf/python/google/protobuf/internal/import_test_package/import_public_nested.proto
deleted file mode 100644
index fcf4d68..0000000
--- a/libs/protobuf/python/google/protobuf/internal/import_test_package/import_public_nested.proto
+++ /dev/null
@@ -1,40 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// A proto file which is imported by import_public.proto to test nested public
-// importing.
-
-syntax = "proto2";
-
-package google.protobuf.python.internal.import_test_package;
-
-message ImportPublicNestedMessage {
-  optional int32 value = 1 [default = 58];
-}
diff --git a/libs/protobuf/python/google/protobuf/internal/import_test_package/inner.proto b/libs/protobuf/python/google/protobuf/internal/import_test_package/inner.proto
deleted file mode 100644
index f20c22e..0000000
--- a/libs/protobuf/python/google/protobuf/internal/import_test_package/inner.proto
+++ /dev/null
@@ -1,40 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto2";
-
-package google.protobuf.python.internal.import_test_package;
-
-// Test public import
-import public "google/protobuf/internal/import_test_package/import_public.proto";
-
-message Inner {
-  optional int32 value = 1 [default = 57];
-}
diff --git a/libs/protobuf/python/google/protobuf/internal/import_test_package/outer.proto b/libs/protobuf/python/google/protobuf/internal/import_test_package/outer.proto
deleted file mode 100644
index 7810aec..0000000
--- a/libs/protobuf/python/google/protobuf/internal/import_test_package/outer.proto
+++ /dev/null
@@ -1,40 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto2";
-
-package google.protobuf.python.internal.import_test_package;
-
-import "google/protobuf/internal/import_test_package/inner.proto";
-
-message Outer {
-  optional Inner inner = 1;
-  optional ImportPublicNestedMessage import_public_nested = 2;
-}
diff --git a/libs/protobuf/python/google/protobuf/internal/json_format_test.py b/libs/protobuf/python/google/protobuf/internal/json_format_test.py
deleted file mode 100644
index d018c3f..0000000
--- a/libs/protobuf/python/google/protobuf/internal/json_format_test.py
+++ /dev/null
@@ -1,1285 +0,0 @@
-# Protocol Buffers - Google's data interchange format
-# Copyright 2008 Google Inc.  All rights reserved.
-# https://developers.google.com/protocol-buffers/
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-"""Test for google.protobuf.json_format."""
-
-__author__ = 'jieluo@google.com (Jie Luo)'
-
-import json
-import math
-import struct
-
-import unittest
-
-from google.protobuf import any_pb2
-from google.protobuf import duration_pb2
-from google.protobuf import field_mask_pb2
-from google.protobuf import struct_pb2
-from google.protobuf import timestamp_pb2
-from google.protobuf import wrappers_pb2
-from google.protobuf import any_test_pb2
-from google.protobuf import unittest_mset_pb2
-from google.protobuf import unittest_pb2
-from google.protobuf.internal import test_proto3_optional_pb2
-from google.protobuf import descriptor_pool
-from google.protobuf import json_format
-from google.protobuf.util import json_format_pb2
-from google.protobuf.util import json_format_proto3_pb2
-
-
-class JsonFormatBase(unittest.TestCase):
-
-  def FillAllFields(self, message):
-    message.int32_value = 20
-    message.int64_value = -20
-    message.uint32_value = 3120987654
-    message.uint64_value = 12345678900
-    message.float_value = float('-inf')
-    message.double_value = 3.1415
-    message.bool_value = True
-    message.string_value = 'foo'
-    message.bytes_value = b'bar'
-    message.message_value.value = 10
-    message.enum_value = json_format_proto3_pb2.BAR
-    # Repeated
-    message.repeated_int32_value.append(0x7FFFFFFF)
-    message.repeated_int32_value.append(-2147483648)
-    message.repeated_int64_value.append(9007199254740992)
-    message.repeated_int64_value.append(-9007199254740992)
-    message.repeated_uint32_value.append(0xFFFFFFF)
-    message.repeated_uint32_value.append(0x7FFFFFF)
-    message.repeated_uint64_value.append(9007199254740992)
-    message.repeated_uint64_value.append(9007199254740991)
-    message.repeated_float_value.append(0)
-
-    message.repeated_double_value.append(1E-15)
-    message.repeated_double_value.append(float('inf'))
-    message.repeated_bool_value.append(True)
-    message.repeated_bool_value.append(False)
-    message.repeated_string_value.append('Few symbols!#$,;')
-    message.repeated_string_value.append('bar')
-    message.repeated_bytes_value.append(b'foo')
-    message.repeated_bytes_value.append(b'bar')
-    message.repeated_message_value.add().value = 10
-    message.repeated_message_value.add().value = 11
-    message.repeated_enum_value.append(json_format_proto3_pb2.FOO)
-    message.repeated_enum_value.append(json_format_proto3_pb2.BAR)
-    self.message = message
-
-  def CheckParseBack(self, message, parsed_message):
-    json_format.Parse(json_format.MessageToJson(message),
-                      parsed_message)
-    self.assertEqual(message, parsed_message)
-
-  def CheckError(self, text, error_message):
-    message = json_format_proto3_pb2.TestMessage()
-    self.assertRaisesRegex(json_format.ParseError, error_message,
-                           json_format.Parse, text, message)
-
-
-class JsonFormatTest(JsonFormatBase):
-
-  def testEmptyMessageToJson(self):
-    message = json_format_proto3_pb2.TestMessage()
-    self.assertEqual(json_format.MessageToJson(message),
-                     '{}')
-    parsed_message = json_format_proto3_pb2.TestMessage()
-    self.CheckParseBack(message, parsed_message)
-
-  def testPartialMessageToJson(self):
-    message = json_format_proto3_pb2.TestMessage(
-        string_value='test',
-        repeated_int32_value=[89, 4])
-    self.assertEqual(json.loads(json_format.MessageToJson(message)),
-                     json.loads('{"stringValue": "test", '
-                                '"repeatedInt32Value": [89, 4]}'))
-    parsed_message = json_format_proto3_pb2.TestMessage()
-    self.CheckParseBack(message, parsed_message)
-
-  def testAllFieldsToJson(self):
-    message = json_format_proto3_pb2.TestMessage()
-    text = ('{"int32Value": 20, '
-            '"int64Value": "-20", '
-            '"uint32Value": 3120987654,'
-            '"uint64Value": "12345678900",'
-            '"floatValue": "-Infinity",'
-            '"doubleValue": 3.1415,'
-            '"boolValue": true,'
-            '"stringValue": "foo",'
-            '"bytesValue": "YmFy",'
-            '"messageValue": {"value": 10},'
-            '"enumValue": "BAR",'
-            '"repeatedInt32Value": [2147483647, -2147483648],'
-            '"repeatedInt64Value": ["9007199254740992", "-9007199254740992"],'
-            '"repeatedUint32Value": [268435455, 134217727],'
-            '"repeatedUint64Value": ["9007199254740992", "9007199254740991"],'
-            '"repeatedFloatValue": [0],'
-            '"repeatedDoubleValue": [1e-15, "Infinity"],'
-            '"repeatedBoolValue": [true, false],'
-            '"repeatedStringValue": ["Few symbols!#$,;", "bar"],'
-            '"repeatedBytesValue": ["Zm9v", "YmFy"],'
-            '"repeatedMessageValue": [{"value": 10}, {"value": 11}],'
-            '"repeatedEnumValue": ["FOO", "BAR"]'
-            '}')
-    self.FillAllFields(message)
-    self.assertEqual(
-        json.loads(json_format.MessageToJson(message)),
-        json.loads(text))
-    parsed_message = json_format_proto3_pb2.TestMessage()
-    json_format.Parse(text, parsed_message)
-    self.assertEqual(message, parsed_message)
-
-  def testUnknownEnumToJsonAndBack(self):
-    text = '{\n  "enumValue": 999\n}'
-    message = json_format_proto3_pb2.TestMessage()
-    message.enum_value = 999
-    self.assertEqual(json_format.MessageToJson(message),
-                     text)
-    parsed_message = json_format_proto3_pb2.TestMessage()
-    json_format.Parse(text, parsed_message)
-    self.assertEqual(message, parsed_message)
-
-  def testExtensionToJsonAndBack(self):
-    message = unittest_mset_pb2.TestMessageSetContainer()
-    ext1 = unittest_mset_pb2.TestMessageSetExtension1.message_set_extension
-    ext2 = unittest_mset_pb2.TestMessageSetExtension2.message_set_extension
-    message.message_set.Extensions[ext1].i = 23
-    message.message_set.Extensions[ext2].str = 'foo'
-    message_text = json_format.MessageToJson(
-        message
-    )
-    parsed_message = unittest_mset_pb2.TestMessageSetContainer()
-    json_format.Parse(message_text, parsed_message)
-    self.assertEqual(message, parsed_message)
-
-  def testExtensionErrors(self):
-    self.CheckError('{"[extensionField]": {}}',
-                    'Message type proto3.TestMessage does not have extensions')
-
-  def testExtensionToDictAndBack(self):
-    message = unittest_mset_pb2.TestMessageSetContainer()
-    ext1 = unittest_mset_pb2.TestMessageSetExtension1.message_set_extension
-    ext2 = unittest_mset_pb2.TestMessageSetExtension2.message_set_extension
-    message.message_set.Extensions[ext1].i = 23
-    message.message_set.Extensions[ext2].str = 'foo'
-    message_dict = json_format.MessageToDict(
-        message
-    )
-    parsed_message = unittest_mset_pb2.TestMessageSetContainer()
-    json_format.ParseDict(message_dict, parsed_message)
-    self.assertEqual(message, parsed_message)
-
-  def testExtensionToDictAndBackWithScalar(self):
-    message = unittest_pb2.TestAllExtensions()
-    ext1 = unittest_pb2.TestNestedExtension.test
-    message.Extensions[ext1] = 'data'
-    message_dict = json_format.MessageToDict(
-        message
-    )
-    parsed_message = unittest_pb2.TestAllExtensions()
-    json_format.ParseDict(message_dict, parsed_message)
-    self.assertEqual(message, parsed_message)
-
-  def testJsonParseDictToAnyDoesNotAlterInput(self):
-    orig_dict = {
-        'int32Value': 20,
-        '@type': 'type.googleapis.com/proto3.TestMessage'
-    }
-    copied_dict = json.loads(json.dumps(orig_dict))
-    parsed_message = any_pb2.Any()
-    json_format.ParseDict(copied_dict, parsed_message)
-    self.assertEqual(copied_dict, orig_dict)
-
-  def testExtensionSerializationDictMatchesProto3Spec(self):
-    """See go/proto3-json-spec for spec.
-    """
-    message = unittest_mset_pb2.TestMessageSetContainer()
-    ext1 = unittest_mset_pb2.TestMessageSetExtension1.message_set_extension
-    ext2 = unittest_mset_pb2.TestMessageSetExtension2.message_set_extension
-    message.message_set.Extensions[ext1].i = 23
-    message.message_set.Extensions[ext2].str = 'foo'
-    message_dict = json_format.MessageToDict(
-        message
-    )
-    golden_dict = {
-        'messageSet': {
-            '[protobuf_unittest.'
-            'TestMessageSetExtension1.message_set_extension]': {
-                'i': 23,
-            },
-            '[protobuf_unittest.'
-            'TestMessageSetExtension2.message_set_extension]': {
-                'str': u'foo',
-            },
-        },
-    }
-    self.assertEqual(golden_dict, message_dict)
-    parsed_msg = unittest_mset_pb2.TestMessageSetContainer()
-    json_format.ParseDict(golden_dict, parsed_msg)
-    self.assertEqual(message, parsed_msg)
-
-  def testExtensionSerializationDictMatchesProto3SpecMore(self):
-    """See go/proto3-json-spec for spec.
-    """
-    message = json_format_pb2.TestMessageWithExtension()
-    ext = json_format_pb2.TestExtension.ext
-    message.Extensions[ext].value = 'stuff'
-    message_dict = json_format.MessageToDict(
-        message
-    )
-    expected_dict = {
-        '[protobuf_unittest.TestExtension.ext]': {
-            'value': u'stuff',
-        },
-    }
-    self.assertEqual(expected_dict, message_dict)
-
-  def testExtensionSerializationJsonMatchesProto3Spec(self):
-    """See go/proto3-json-spec for spec.
-    """
-    message = unittest_mset_pb2.TestMessageSetContainer()
-    ext1 = unittest_mset_pb2.TestMessageSetExtension1.message_set_extension
-    ext2 = unittest_mset_pb2.TestMessageSetExtension2.message_set_extension
-    message.message_set.Extensions[ext1].i = 23
-    message.message_set.Extensions[ext2].str = 'foo'
-    message_text = json_format.MessageToJson(
-        message
-    )
-    ext1_text = ('protobuf_unittest.TestMessageSetExtension1.'
-                 'message_set_extension')
-    ext2_text = ('protobuf_unittest.TestMessageSetExtension2.'
-                 'message_set_extension')
-    golden_text = ('{"messageSet": {'
-                   '    "[%s]": {'
-                   '        "i": 23'
-                   '    },'
-                   '    "[%s]": {'
-                   '        "str": "foo"'
-                   '    }'
-                   '}}') % (ext1_text, ext2_text)
-    self.assertEqual(json.loads(golden_text), json.loads(message_text))
-
-  def testJsonEscapeString(self):
-    message = json_format_proto3_pb2.TestMessage()
-    message.string_value = '&\n<\"\r>\b\t\f\\\001/'
-    message.string_value += (b'\xe2\x80\xa8\xe2\x80\xa9').decode('utf-8')
-    self.assertEqual(
-        json_format.MessageToJson(message),
-        '{\n  "stringValue": '
-        '"&\\n<\\\"\\r>\\b\\t\\f\\\\\\u0001/\\u2028\\u2029"\n}')
-    parsed_message = json_format_proto3_pb2.TestMessage()
-    self.CheckParseBack(message, parsed_message)
-    text = u'{"int32Value": "\u0031"}'
-    json_format.Parse(text, message)
-    self.assertEqual(message.int32_value, 1)
-
-  def testAlwaysSeriliaze(self):
-    message = json_format_proto3_pb2.TestMessage(
-        string_value='foo')
-    self.assertEqual(
-        json.loads(json_format.MessageToJson(message, True)),
-        json.loads('{'
-                   '"repeatedStringValue": [],'
-                   '"stringValue": "foo",'
-                   '"repeatedBoolValue": [],'
-                   '"repeatedUint32Value": [],'
-                   '"repeatedInt32Value": [],'
-                   '"enumValue": "FOO",'
-                   '"int32Value": 0,'
-                   '"floatValue": 0,'
-                   '"int64Value": "0",'
-                   '"uint32Value": 0,'
-                   '"repeatedBytesValue": [],'
-                   '"repeatedUint64Value": [],'
-                   '"repeatedDoubleValue": [],'
-                   '"bytesValue": "",'
-                   '"boolValue": false,'
-                   '"repeatedEnumValue": [],'
-                   '"uint64Value": "0",'
-                   '"doubleValue": 0,'
-                   '"repeatedFloatValue": [],'
-                   '"repeatedInt64Value": [],'
-                   '"repeatedMessageValue": []}'))
-    parsed_message = json_format_proto3_pb2.TestMessage()
-    self.CheckParseBack(message, parsed_message)
-
-  def testProto3Optional(self):
-    message = test_proto3_optional_pb2.TestProto3Optional()
-    self.assertEqual(
-        json.loads(
-            json_format.MessageToJson(
-                message, including_default_value_fields=True)),
-        json.loads('{}'))
-    message.optional_int32 = 0
-    self.assertEqual(
-        json.loads(
-            json_format.MessageToJson(
-                message, including_default_value_fields=True)),
-        json.loads('{"optionalInt32": 0}'))
-
-  def testIntegersRepresentedAsFloat(self):
-    message = json_format_proto3_pb2.TestMessage()
-    json_format.Parse('{"int32Value": -2.147483648e9}', message)
-    self.assertEqual(message.int32_value, -2147483648)
-    json_format.Parse('{"int32Value": 1e5}', message)
-    self.assertEqual(message.int32_value, 100000)
-    json_format.Parse('{"int32Value": 1.0}', message)
-    self.assertEqual(message.int32_value, 1)
-
-  def testMapFields(self):
-    message = json_format_proto3_pb2.TestNestedMap()
-    self.assertEqual(
-        json.loads(json_format.MessageToJson(message, True)),
-        json.loads('{'
-                   '"boolMap": {},'
-                   '"int32Map": {},'
-                   '"int64Map": {},'
-                   '"uint32Map": {},'
-                   '"uint64Map": {},'
-                   '"stringMap": {},'
-                   '"mapMap": {}'
-                   '}'))
-    message.bool_map[True] = 1
-    message.bool_map[False] = 2
-    message.int32_map[1] = 2
-    message.int32_map[2] = 3
-    message.int64_map[1] = 2
-    message.int64_map[2] = 3
-    message.uint32_map[1] = 2
-    message.uint32_map[2] = 3
-    message.uint64_map[1] = 2
-    message.uint64_map[2] = 3
-    message.string_map['1'] = 2
-    message.string_map['null'] = 3
-    message.map_map['1'].bool_map[True] = 3
-    self.assertEqual(
-        json.loads(json_format.MessageToJson(message, False)),
-        json.loads('{'
-                   '"boolMap": {"false": 2, "true": 1},'
-                   '"int32Map": {"1": 2, "2": 3},'
-                   '"int64Map": {"1": 2, "2": 3},'
-                   '"uint32Map": {"1": 2, "2": 3},'
-                   '"uint64Map": {"1": 2, "2": 3},'
-                   '"stringMap": {"1": 2, "null": 3},'
-                   '"mapMap": {"1": {"boolMap": {"true": 3}}}'
-                   '}'))
-    parsed_message = json_format_proto3_pb2.TestNestedMap()
-    self.CheckParseBack(message, parsed_message)
-
-  def testOneofFields(self):
-    message = json_format_proto3_pb2.TestOneof()
-    # Always print does not affect oneof fields.
-    self.assertEqual(
-        json_format.MessageToJson(message, True),
-        '{}')
-    message.oneof_int32_value = 0
-    self.assertEqual(
-        json_format.MessageToJson(message, True),
-        '{\n'
-        '  "oneofInt32Value": 0\n'
-        '}')
-    parsed_message = json_format_proto3_pb2.TestOneof()
-    self.CheckParseBack(message, parsed_message)
-
-  def testSurrogates(self):
-    # Test correct surrogate handling.
-    message = json_format_proto3_pb2.TestMessage()
-    json_format.Parse('{"stringValue": "\\uD83D\\uDE01"}', message)
-    self.assertEqual(message.string_value,
-                     b'\xF0\x9F\x98\x81'.decode('utf-8', 'strict'))
-
-    # Error case: unpaired high surrogate.
-    self.CheckError(
-        '{"stringValue": "\\uD83D"}',
-        r'Invalid \\uXXXX escape|Unpaired.*surrogate')
-
-    # Unpaired low surrogate.
-    self.CheckError(
-        '{"stringValue": "\\uDE01"}',
-        r'Invalid \\uXXXX escape|Unpaired.*surrogate')
-
-  def testTimestampMessage(self):
-    message = json_format_proto3_pb2.TestTimestamp()
-    message.value.seconds = 0
-    message.value.nanos = 0
-    message.repeated_value.add().seconds = 20
-    message.repeated_value[0].nanos = 1
-    message.repeated_value.add().seconds = 0
-    message.repeated_value[1].nanos = 10000
-    message.repeated_value.add().seconds = 100000000
-    message.repeated_value[2].nanos = 0
-    # Maximum time
-    message.repeated_value.add().seconds = 253402300799
-    message.repeated_value[3].nanos = 999999999
-    # Minimum time
-    message.repeated_value.add().seconds = -62135596800
-    message.repeated_value[4].nanos = 0
-    self.assertEqual(
-        json.loads(json_format.MessageToJson(message, True)),
-        json.loads('{'
-                   '"value": "1970-01-01T00:00:00Z",'
-                   '"repeatedValue": ['
-                   '  "1970-01-01T00:00:20.000000001Z",'
-                   '  "1970-01-01T00:00:00.000010Z",'
-                   '  "1973-03-03T09:46:40Z",'
-                   '  "9999-12-31T23:59:59.999999999Z",'
-                   '  "0001-01-01T00:00:00Z"'
-                   ']'
-                   '}'))
-    parsed_message = json_format_proto3_pb2.TestTimestamp()
-    self.CheckParseBack(message, parsed_message)
-    text = (r'{"value": "1970-01-01T00:00:00.01+08:00",'
-            r'"repeatedValue":['
-            r'  "1970-01-01T00:00:00.01+08:30",'
-            r'  "1970-01-01T00:00:00.01-01:23"]}')
-    json_format.Parse(text, parsed_message)
-    self.assertEqual(parsed_message.value.seconds, -8 * 3600)
-    self.assertEqual(parsed_message.value.nanos, 10000000)
-    self.assertEqual(parsed_message.repeated_value[0].seconds, -8.5 * 3600)
-    self.assertEqual(parsed_message.repeated_value[1].seconds, 3600 + 23 * 60)
-
-  def testDurationMessage(self):
-    message = json_format_proto3_pb2.TestDuration()
-    message.value.seconds = 1
-    message.repeated_value.add().seconds = 0
-    message.repeated_value[0].nanos = 10
-    message.repeated_value.add().seconds = -1
-    message.repeated_value[1].nanos = -1000
-    message.repeated_value.add().seconds = 10
-    message.repeated_value[2].nanos = 11000000
-    message.repeated_value.add().seconds = -315576000000
-    message.repeated_value.add().seconds = 315576000000
-    self.assertEqual(
-        json.loads(json_format.MessageToJson(message, True)),
-        json.loads('{'
-                   '"value": "1s",'
-                   '"repeatedValue": ['
-                   '  "0.000000010s",'
-                   '  "-1.000001s",'
-                   '  "10.011s",'
-                   '  "-315576000000s",'
-                   '  "315576000000s"'
-                   ']'
-                   '}'))
-    parsed_message = json_format_proto3_pb2.TestDuration()
-    self.CheckParseBack(message, parsed_message)
-
-  def testFieldMaskMessage(self):
-    message = json_format_proto3_pb2.TestFieldMask()
-    message.value.paths.append('foo.bar')
-    message.value.paths.append('bar')
-    self.assertEqual(
-        json_format.MessageToJson(message, True),
-        '{\n'
-        '  "value": "foo.bar,bar"\n'
-        '}')
-    parsed_message = json_format_proto3_pb2.TestFieldMask()
-    self.CheckParseBack(message, parsed_message)
-
-    message.value.Clear()
-    self.assertEqual(
-        json_format.MessageToJson(message, True),
-        '{\n'
-        '  "value": ""\n'
-        '}')
-    self.CheckParseBack(message, parsed_message)
-
-  def testWrapperMessage(self):
-    message = json_format_proto3_pb2.TestWrapper()
-    message.bool_value.value = False
-    message.int32_value.value = 0
-    message.string_value.value = ''
-    message.bytes_value.value = b''
-    message.repeated_bool_value.add().value = True
-    message.repeated_bool_value.add().value = False
-    message.repeated_int32_value.add()
-    self.assertEqual(
-        json.loads(json_format.MessageToJson(message, True)),
-        json.loads('{\n'
-                   '  "int32Value": 0,'
-                   '  "boolValue": false,'
-                   '  "stringValue": "",'
-                   '  "bytesValue": "",'
-                   '  "repeatedBoolValue": [true, false],'
-                   '  "repeatedInt32Value": [0],'
-                   '  "repeatedUint32Value": [],'
-                   '  "repeatedFloatValue": [],'
-                   '  "repeatedDoubleValue": [],'
-                   '  "repeatedBytesValue": [],'
-                   '  "repeatedInt64Value": [],'
-                   '  "repeatedUint64Value": [],'
-                   '  "repeatedStringValue": []'
-                   '}'))
-    parsed_message = json_format_proto3_pb2.TestWrapper()
-    self.CheckParseBack(message, parsed_message)
-
-  def testStructMessage(self):
-    message = json_format_proto3_pb2.TestStruct()
-    message.value['name'] = 'Jim'
-    message.value['age'] = 10
-    message.value['attend'] = True
-    message.value['email'] = None
-    message.value.get_or_create_struct('address')['city'] = 'SFO'
-    message.value['address']['house_number'] = 1024
-    message.value.get_or_create_struct('empty_struct')
-    message.value.get_or_create_list('empty_list')
-    struct_list = message.value.get_or_create_list('list')
-    struct_list.extend([6, 'seven', True, False, None])
-    struct_list.add_struct()['subkey2'] = 9
-    message.repeated_value.add()['age'] = 11
-    message.repeated_value.add()
-    self.assertEqual(
-        json.loads(json_format.MessageToJson(message, False)),
-        json.loads(
-            '{'
-            '  "value": {'
-            '    "address": {'
-            '      "city": "SFO", '
-            '      "house_number": 1024'
-            '    }, '
-            '    "empty_struct": {}, '
-            '    "empty_list": [], '
-            '    "age": 10, '
-            '    "name": "Jim", '
-            '    "attend": true, '
-            '    "email": null, '
-            '    "list": [6, "seven", true, false, null, {"subkey2": 9}]'
-            '  },'
-            '  "repeatedValue": [{"age": 11}, {}]'
-            '}'))
-    parsed_message = json_format_proto3_pb2.TestStruct()
-    self.CheckParseBack(message, parsed_message)
-    # check for regression; this used to raise
-    parsed_message.value['empty_struct']
-    parsed_message.value['empty_list']
-
-  def testValueMessage(self):
-    message = json_format_proto3_pb2.TestValue()
-    message.value.string_value = 'hello'
-    message.repeated_value.add().number_value = 11.1
-    message.repeated_value.add().bool_value = False
-    message.repeated_value.add().null_value = 0
-    self.assertEqual(
-        json.loads(json_format.MessageToJson(message, False)),
-        json.loads(
-            '{'
-            '  "value": "hello",'
-            '  "repeatedValue": [11.1, false, null]'
-            '}'))
-    parsed_message = json_format_proto3_pb2.TestValue()
-    self.CheckParseBack(message, parsed_message)
-    # Can't parse back if the Value message is not set.
-    message.repeated_value.add()
-    self.assertEqual(
-        json.loads(json_format.MessageToJson(message, False)),
-        json.loads(
-            '{'
-            '  "value": "hello",'
-            '  "repeatedValue": [11.1, false, null, null]'
-            '}'))
-    message.Clear()
-    json_format.Parse('{"value": null}', message)
-    self.assertEqual(message.value.WhichOneof('kind'), 'null_value')
-
-  def testListValueMessage(self):
-    message = json_format_proto3_pb2.TestListValue()
-    message.value.values.add().number_value = 11.1
-    message.value.values.add().null_value = 0
-    message.value.values.add().bool_value = True
-    message.value.values.add().string_value = 'hello'
-    message.value.values.add().struct_value['name'] = 'Jim'
-    message.repeated_value.add().values.add().number_value = 1
-    message.repeated_value.add()
-    self.assertEqual(
-        json.loads(json_format.MessageToJson(message, False)),
-        json.loads(
-            '{"value": [11.1, null, true, "hello", {"name": "Jim"}]\n,'
-            '"repeatedValue": [[1], []]}'))
-    parsed_message = json_format_proto3_pb2.TestListValue()
-    self.CheckParseBack(message, parsed_message)
-
-  def testNullValue(self):
-    message = json_format_proto3_pb2.TestOneof()
-    message.oneof_null_value = 0
-    self.assertEqual(json_format.MessageToJson(message),
-                     '{\n  "oneofNullValue": null\n}')
-    parsed_message = json_format_proto3_pb2.TestOneof()
-    self.CheckParseBack(message, parsed_message)
-    # Check old format is also accepted
-    new_message = json_format_proto3_pb2.TestOneof()
-    json_format.Parse('{\n  "oneofNullValue": "NULL_VALUE"\n}',
-                      new_message)
-    self.assertEqual(json_format.MessageToJson(new_message),
-                     '{\n  "oneofNullValue": null\n}')
-
-  def testAnyMessage(self):
-    message = json_format_proto3_pb2.TestAny()
-    value1 = json_format_proto3_pb2.MessageType()
-    value2 = json_format_proto3_pb2.MessageType()
-    value1.value = 1234
-    value2.value = 5678
-    message.value.Pack(value1)
-    message.repeated_value.add().Pack(value1)
-    message.repeated_value.add().Pack(value2)
-    message.repeated_value.add()
-    self.assertEqual(
-        json.loads(json_format.MessageToJson(message, True)),
-        json.loads(
-            '{\n'
-            '  "repeatedValue": [ {\n'
-            '    "@type": "type.googleapis.com/proto3.MessageType",\n'
-            '    "value": 1234\n'
-            '  }, {\n'
-            '    "@type": "type.googleapis.com/proto3.MessageType",\n'
-            '    "value": 5678\n'
-            '  },\n'
-            '  {}],\n'
-            '  "value": {\n'
-            '    "@type": "type.googleapis.com/proto3.MessageType",\n'
-            '    "value": 1234\n'
-            '  }\n'
-            '}\n'))
-    parsed_message = json_format_proto3_pb2.TestAny()
-    self.CheckParseBack(message, parsed_message)
-    # Must print @type first
-    test_message = json_format_proto3_pb2.TestMessage(
-        bool_value=True,
-        int32_value=20,
-        int64_value=-20,
-        uint32_value=20,
-        uint64_value=20,
-        double_value=3.14,
-        string_value='foo')
-    message.Clear()
-    message.value.Pack(test_message)
-    self.assertEqual(
-        json_format.MessageToJson(message, False)[0:68],
-        '{\n'
-        '  "value": {\n'
-        '    "@type": "type.googleapis.com/proto3.TestMessage"')
-
-  def testAnyMessageDescriptorPoolMissingType(self):
-    packed_message = unittest_pb2.OneString()
-    packed_message.data = 'string'
-    message = any_test_pb2.TestAny()
-    message.any_value.Pack(packed_message)
-    empty_pool = descriptor_pool.DescriptorPool()
-    with self.assertRaises(TypeError) as cm:
-      json_format.MessageToJson(message, True, descriptor_pool=empty_pool)
-    self.assertEqual(
-        'Can not find message descriptor by type_url:'
-        ' type.googleapis.com/protobuf_unittest.OneString', str(cm.exception))
-
-  def testWellKnownInAnyMessage(self):
-    message = any_pb2.Any()
-    int32_value = wrappers_pb2.Int32Value()
-    int32_value.value = 1234
-    message.Pack(int32_value)
-    self.assertEqual(
-        json.loads(json_format.MessageToJson(message, True)),
-        json.loads(
-            '{\n'
-            '  "@type": \"type.googleapis.com/google.protobuf.Int32Value\",\n'
-            '  "value": 1234\n'
-            '}\n'))
-    parsed_message = any_pb2.Any()
-    self.CheckParseBack(message, parsed_message)
-
-    timestamp = timestamp_pb2.Timestamp()
-    message.Pack(timestamp)
-    self.assertEqual(
-        json.loads(json_format.MessageToJson(message, True)),
-        json.loads(
-            '{\n'
-            '  "@type": "type.googleapis.com/google.protobuf.Timestamp",\n'
-            '  "value": "1970-01-01T00:00:00Z"\n'
-            '}\n'))
-    self.CheckParseBack(message, parsed_message)
-
-    duration = duration_pb2.Duration()
-    duration.seconds = 1
-    message.Pack(duration)
-    self.assertEqual(
-        json.loads(json_format.MessageToJson(message, True)),
-        json.loads(
-            '{\n'
-            '  "@type": "type.googleapis.com/google.protobuf.Duration",\n'
-            '  "value": "1s"\n'
-            '}\n'))
-    self.CheckParseBack(message, parsed_message)
-
-    field_mask = field_mask_pb2.FieldMask()
-    field_mask.paths.append('foo.bar')
-    field_mask.paths.append('bar')
-    message.Pack(field_mask)
-    self.assertEqual(
-        json.loads(json_format.MessageToJson(message, True)),
-        json.loads(
-            '{\n'
-            '  "@type": "type.googleapis.com/google.protobuf.FieldMask",\n'
-            '  "value": "foo.bar,bar"\n'
-            '}\n'))
-    self.CheckParseBack(message, parsed_message)
-
-    struct_message = struct_pb2.Struct()
-    struct_message['name'] = 'Jim'
-    message.Pack(struct_message)
-    self.assertEqual(
-        json.loads(json_format.MessageToJson(message, True)),
-        json.loads(
-            '{\n'
-            '  "@type": "type.googleapis.com/google.protobuf.Struct",\n'
-            '  "value": {"name": "Jim"}\n'
-            '}\n'))
-    self.CheckParseBack(message, parsed_message)
-
-    nested_any = any_pb2.Any()
-    int32_value.value = 5678
-    nested_any.Pack(int32_value)
-    message.Pack(nested_any)
-    self.assertEqual(
-        json.loads(json_format.MessageToJson(message, True)),
-        json.loads(
-            '{\n'
-            '  "@type": "type.googleapis.com/google.protobuf.Any",\n'
-            '  "value": {\n'
-            '    "@type": "type.googleapis.com/google.protobuf.Int32Value",\n'
-            '    "value": 5678\n'
-            '  }\n'
-            '}\n'))
-    self.CheckParseBack(message, parsed_message)
-
-  def testParseNull(self):
-    message = json_format_proto3_pb2.TestMessage()
-    parsed_message = json_format_proto3_pb2.TestMessage()
-    self.FillAllFields(parsed_message)
-    json_format.Parse('{"int32Value": null, '
-                      '"int64Value": null, '
-                      '"uint32Value": null,'
-                      '"uint64Value": null,'
-                      '"floatValue": null,'
-                      '"doubleValue": null,'
-                      '"boolValue": null,'
-                      '"stringValue": null,'
-                      '"bytesValue": null,'
-                      '"messageValue": null,'
-                      '"enumValue": null,'
-                      '"repeatedInt32Value": null,'
-                      '"repeatedInt64Value": null,'
-                      '"repeatedUint32Value": null,'
-                      '"repeatedUint64Value": null,'
-                      '"repeatedFloatValue": null,'
-                      '"repeatedDoubleValue": null,'
-                      '"repeatedBoolValue": null,'
-                      '"repeatedStringValue": null,'
-                      '"repeatedBytesValue": null,'
-                      '"repeatedMessageValue": null,'
-                      '"repeatedEnumValue": null'
-                      '}',
-                      parsed_message)
-    self.assertEqual(message, parsed_message)
-    # Null and {} should have different behavior for sub message.
-    self.assertFalse(parsed_message.HasField('message_value'))
-    json_format.Parse('{"messageValue": {}}', parsed_message)
-    self.assertTrue(parsed_message.HasField('message_value'))
-    # Null is not allowed to be used as an element in repeated field.
-    self.assertRaisesRegex(
-        json_format.ParseError, r'Failed to parse repeatedInt32Value field: '
-        r'null is not allowed to be used as an element in a repeated field '
-        r'at TestMessage.repeatedInt32Value\[1\].', json_format.Parse,
-        '{"repeatedInt32Value":[1, null]}', parsed_message)
-    self.CheckError(
-        '{"repeatedMessageValue":[null]}',
-        r'Failed to parse repeatedMessageValue field: null is not'
-        r' allowed to be used as an element in a repeated field '
-        r'at TestMessage.repeatedMessageValue\[0\].')
-
-  def testNanFloat(self):
-    message = json_format_proto3_pb2.TestMessage()
-    message.float_value = float('nan')
-    text = '{\n  "floatValue": "NaN"\n}'
-    self.assertEqual(json_format.MessageToJson(message), text)
-    parsed_message = json_format_proto3_pb2.TestMessage()
-    json_format.Parse(text, parsed_message)
-    self.assertTrue(math.isnan(parsed_message.float_value))
-
-  def testParseDoubleToFloat(self):
-    message = json_format_proto3_pb2.TestMessage()
-    text = ('{"repeatedDoubleValue": [3.4028235e+39, 1.4028235e-39]\n}')
-    json_format.Parse(text, message)
-    self.assertEqual(message.repeated_double_value[0], 3.4028235e+39)
-    self.assertEqual(message.repeated_double_value[1], 1.4028235e-39)
-    text = ('{"repeatedFloatValue": [3.4028235e+39, 1.4028235e-39]\n}')
-    self.CheckError(
-        text, r'Failed to parse repeatedFloatValue field: '
-        r'Float value too large at TestMessage.repeatedFloatValue\[0\].')
-
-  def testFloatPrecision(self):
-    message = json_format_proto3_pb2.TestMessage()
-    message.float_value = 1.123456789
-    # Set to 8 valid digits.
-    text = '{\n  "floatValue": 1.1234568\n}'
-    self.assertEqual(
-        json_format.MessageToJson(message, float_precision=8), text)
-    # Set to 7 valid digits.
-    text = '{\n  "floatValue": 1.123457\n}'
-    self.assertEqual(
-        json_format.MessageToJson(message, float_precision=7), text)
-
-    # Default float_precision will automatic print shortest float.
-    message.float_value = 1.1000000011
-    text = '{\n  "floatValue": 1.1\n}'
-    self.assertEqual(
-        json_format.MessageToJson(message), text)
-    message.float_value = 1.00000075e-36
-    text = '{\n  "floatValue": 1.00000075e-36\n}'
-    self.assertEqual(
-        json_format.MessageToJson(message), text)
-    message.float_value = 12345678912345e+11
-    text = '{\n  "floatValue": 1.234568e+24\n}'
-    self.assertEqual(
-        json_format.MessageToJson(message), text)
-
-    # Test a bunch of data and check json encode/decode do not
-    # lose precision
-    value_list = [0x00, 0xD8, 0x6E, 0x00]
-    msg2 = json_format_proto3_pb2.TestMessage()
-    for a in range(0, 256):
-      value_list[3] = a
-      for b in range(0, 256):
-        value_list[0] = b
-        byte_array = bytearray(value_list)
-        message.float_value = struct.unpack('<f', byte_array)[0]
-        self.CheckParseBack(message, msg2)
-
-  def testParseEmptyText(self):
-    self.CheckError('',
-                    r'Failed to load JSON: (Expecting value)|(No JSON).')
-
-  def testParseEnumValue(self):
-    message = json_format_proto3_pb2.TestMessage()
-    text = '{"enumValue": 0}'
-    json_format.Parse(text, message)
-    text = '{"enumValue": 1}'
-    json_format.Parse(text, message)
-    self.CheckError(
-        '{"enumValue": "baz"}',
-        'Failed to parse enumValue field: Invalid enum value baz '
-        'for enum type proto3.EnumType at TestMessage.enumValue.')
-    # Proto3 accepts numeric unknown enums.
-    text = '{"enumValue": 12345}'
-    json_format.Parse(text, message)
-    # Proto2 does not accept unknown enums.
-    message = unittest_pb2.TestAllTypes()
-    self.assertRaisesRegex(
-        json_format.ParseError,
-        'Failed to parse optionalNestedEnum field: Invalid enum value 12345 '
-        'for enum type protobuf_unittest.TestAllTypes.NestedEnum at '
-        'TestAllTypes.optionalNestedEnum.', json_format.Parse,
-        '{"optionalNestedEnum": 12345}', message)
-
-  def testBytes(self):
-    message = json_format_proto3_pb2.TestMessage()
-    # Test url base64
-    text = '{"bytesValue": "-_"}'
-    json_format.Parse(text, message)
-    self.assertEqual(message.bytes_value, b'\xfb')
-    # Test padding
-    text = '{"bytesValue": "AQI="}'
-    json_format.Parse(text, message)
-    self.assertEqual(message.bytes_value, b'\x01\x02')
-    text = '{"bytesValue": "AQI"}'
-    json_format.Parse(text, message)
-    self.assertEqual(message.bytes_value, b'\x01\x02')
-    text = '{"bytesValue": "AQI*"}'
-    json_format.Parse(text, message)
-    self.assertEqual(message.bytes_value, b'\x01\x02')
-
-  def testParseBadIdentifer(self):
-    self.CheckError('{int32Value: 1}',
-                    (r'Failed to load JSON: Expecting property name'
-                     r'( enclosed in double quotes)?: line 1'))
-    self.CheckError(
-        '{"unknownName": 1}',
-        'Message type "proto3.TestMessage" has no field named '
-        '"unknownName" at "TestMessage".')
-
-  def testIgnoreUnknownField(self):
-    text = '{"unknownName": 1}'
-    parsed_message = json_format_proto3_pb2.TestMessage()
-    json_format.Parse(text, parsed_message, ignore_unknown_fields=True)
-    text = ('{\n'
-            '  "repeatedValue": [ {\n'
-            '    "@type": "type.googleapis.com/proto3.MessageType",\n'
-            '    "unknownName": 1\n'
-            '  }]\n'
-            '}\n')
-    parsed_message = json_format_proto3_pb2.TestAny()
-    json_format.Parse(text, parsed_message, ignore_unknown_fields=True)
-
-  def testDuplicateField(self):
-    self.CheckError('{"int32Value": 1,\n"int32Value":2}',
-                    'Failed to load JSON: duplicate key int32Value.')
-
-  def testInvalidBoolValue(self):
-    self.CheckError(
-        '{"boolValue": 1}', 'Failed to parse boolValue field: '
-        'Expected true or false without quotes at TestMessage.boolValue.')
-    self.CheckError(
-        '{"boolValue": "true"}', 'Failed to parse boolValue field: '
-        'Expected true or false without quotes at TestMessage.boolValue.')
-
-  def testInvalidIntegerValue(self):
-    message = json_format_proto3_pb2.TestMessage()
-    text = '{"int32Value": 0x12345}'
-    self.assertRaises(json_format.ParseError,
-                      json_format.Parse, text, message)
-    self.CheckError(
-        '{"int32Value": 1.5}', 'Failed to parse int32Value field: '
-        'Couldn\'t parse integer: 1.5 at TestMessage.int32Value.')
-    self.CheckError('{"int32Value": 012345}',
-                    (r'Failed to load JSON: Expecting \'?,\'? delimiter: '
-                     r'line 1.'))
-    self.CheckError(
-        '{"int32Value": " 1 "}', 'Failed to parse int32Value field: '
-        'Couldn\'t parse integer: " 1 " at TestMessage.int32Value.')
-    self.CheckError(
-        '{"int32Value": "1 "}', 'Failed to parse int32Value field: '
-        'Couldn\'t parse integer: "1 " at TestMessage.int32Value.')
-    self.CheckError(
-        '{"int32Value": false}',
-        'Failed to parse int32Value field: Bool value False '
-        'is not acceptable for integer field at TestMessage.int32Value.')
-    self.CheckError('{"int32Value": 12345678901234567890}',
-                    'Failed to parse int32Value field: Value out of range: '
-                    '12345678901234567890.')
-    self.CheckError('{"uint32Value": -1}',
-                    'Failed to parse uint32Value field: '
-                    'Value out of range: -1.')
-
-  def testInvalidFloatValue(self):
-    self.CheckError(
-        '{"floatValue": "nan"}', 'Failed to parse floatValue field: Couldn\'t '
-        'parse float "nan", use "NaN" instead at TestMessage.floatValue.')
-    self.CheckError('{"floatValue": NaN}',
-                    'Failed to parse floatValue field: Couldn\'t '
-                    'parse NaN, use quoted "NaN" instead.')
-    self.CheckError('{"floatValue": Infinity}',
-                    'Failed to parse floatValue field: Couldn\'t parse Infinity'
-                    ' or value too large, use quoted "Infinity" instead.')
-    self.CheckError('{"floatValue": -Infinity}',
-                    'Failed to parse floatValue field: Couldn\'t parse '
-                    '-Infinity or value too small, '
-                    'use quoted "-Infinity" instead.')
-    self.CheckError('{"doubleValue": -1.89769e+308}',
-                    'Failed to parse doubleValue field: Couldn\'t parse '
-                    '-Infinity or value too small, '
-                    'use quoted "-Infinity" instead.')
-    self.CheckError('{"floatValue": 3.4028235e+39}',
-                    'Failed to parse floatValue field: Float value too large.')
-    self.CheckError('{"floatValue": -3.502823e+38}',
-                    'Failed to parse floatValue field: Float value too small.')
-
-  def testInvalidRepeated(self):
-    self.CheckError(
-        '{"repeatedInt32Value": 12345}',
-        (r'Failed to parse repeatedInt32Value field: repeated field'
-         r' repeatedInt32Value must be in \[\] which is 12345 at TestMessage.'))
-
-  def testInvalidMap(self):
-    message = json_format_proto3_pb2.TestMap()
-    text = '{"int32Map": {"null": 2, "2": 3}}'
-    self.assertRaisesRegex(json_format.ParseError,
-                           'Failed to parse int32Map field: invalid literal',
-                           json_format.Parse, text, message)
-    text = '{"int32Map": {1: 2, "2": 3}}'
-    self.assertRaisesRegex(json_format.ParseError,
-                           (r'Failed to load JSON: Expecting property name'
-                            r'( enclosed in double quotes)?: line 1'),
-                           json_format.Parse, text, message)
-    text = '{"boolMap": {"null": 1}}'
-    self.assertRaisesRegex(
-        json_format.ParseError,
-        'Failed to parse boolMap field: Expected "true" or "false", not null at '
-        'TestMap.boolMap.key', json_format.Parse, text, message)
-    text = r'{"stringMap": {"a": 3, "\u0061": 2}}'
-    self.assertRaisesRegex(json_format.ParseError,
-                           'Failed to load JSON: duplicate key a',
-                           json_format.Parse, text, message)
-    text = r'{"stringMap": 0}'
-    self.assertRaisesRegex(
-        json_format.ParseError,
-        'Failed to parse stringMap field: Map field string_map must be '
-        'in a dict which is 0 at TestMap.stringMap.', json_format.Parse, text,
-        message)
-
-  def testInvalidTimestamp(self):
-    message = json_format_proto3_pb2.TestTimestamp()
-    text = '{"value": "10000-01-01T00:00:00.00Z"}'
-    self.assertRaisesRegexp(
-        json_format.ParseError, 'Failed to parse value field: '
-        'time data \'10000-01-01T00:00:00\' does not match'
-        ' format \'%Y-%m-%dT%H:%M:%S\' at TestTimestamp.value.',
-        json_format.Parse, text, message)
-    text = '{"value": "1970-01-01T00:00:00.0123456789012Z"}'
-    self.assertRaisesRegex(
-        json_format.ParseError,
-        'nanos 0123456789012 more than 9 fractional digits.', json_format.Parse,
-        text, message)
-    text = '{"value": "1972-01-01T01:00:00.01+08"}'
-    self.assertRaisesRegex(json_format.ParseError,
-                           (r'Invalid timezone offset value: \+08.'),
-                           json_format.Parse, text, message)
-    # Time smaller than minimum time.
-    text = '{"value": "0000-01-01T00:00:00Z"}'
-    self.assertRaisesRegex(
-        json_format.ParseError,
-        'Failed to parse value field: year (0 )?is out of range.',
-        json_format.Parse, text, message)
-    # Time bigger than maximum time.
-    message.value.seconds = 253402300800
-    self.assertRaisesRegex(OverflowError, 'date value out of range',
-                           json_format.MessageToJson, message)
-    # Lower case t does not accept.
-    text = '{"value": "0001-01-01t00:00:00Z"}'
-    with self.assertRaises(json_format.ParseError) as e:
-      json_format.Parse(text, message)
-    self.assertEqual(
-        'Failed to parse value field: '
-        'time data \'0001-01-01t00:00:00\' does not match format '
-        '\'%Y-%m-%dT%H:%M:%S\', lowercase \'t\' is not accepted '
-        'at TestTimestamp.value.', str(e.exception))
-
-  def testInvalidOneof(self):
-    message = json_format_proto3_pb2.TestOneof()
-    text = '{"oneofInt32Value": 1, "oneofStringValue": "2"}'
-    self.assertRaisesRegexp(
-        json_format.ParseError, 'Message type "proto3.TestOneof"'
-        ' should not have multiple "oneof_value" oneof fields at "TestOneof".',
-        json_format.Parse, text, message)
-
-  def testInvalidListValue(self):
-    message = json_format_proto3_pb2.TestListValue()
-    text = '{"value": 1234}'
-    self.assertRaisesRegex(
-        json_format.ParseError,
-        r'Failed to parse value field: ListValue must be in \[\] which is '
-        '1234 at TestListValue.value.', json_format.Parse, text, message)
-
-    class UnknownClass(object):
-
-      def __str__(self):
-        return 'v'
-    self.assertRaisesRegex(
-        json_format.ParseError,
-        r' at TestListValue.value\[1\].fake.',
-        json_format.ParseDict,
-        {'value': ['hello', {'fake': UnknownClass()}]}, message)
-
-  def testInvalidStruct(self):
-    message = json_format_proto3_pb2.TestStruct()
-    text = '{"value": 1234}'
-    self.assertRaisesRegex(
-        json_format.ParseError,
-        'Failed to parse value field: Struct must be in a dict which is '
-        '1234 at TestStruct.value', json_format.Parse, text, message)
-
-  def testTimestampInvalidStringValue(self):
-    message = json_format_proto3_pb2.TestTimestamp()
-    text = '{"value": {"foo": 123}}'
-    self.assertRaisesRegex(
-        json_format.ParseError,
-        r"Timestamp JSON value not a string: {u?'foo': 123}", json_format.Parse,
-        text, message)
-
-  def testDurationInvalidStringValue(self):
-    message = json_format_proto3_pb2.TestDuration()
-    text = '{"value": {"foo": 123}}'
-    self.assertRaisesRegex(json_format.ParseError,
-                           r"Duration JSON value not a string: {u?'foo': 123}",
-                           json_format.Parse, text, message)
-
-  def testFieldMaskInvalidStringValue(self):
-    message = json_format_proto3_pb2.TestFieldMask()
-    text = '{"value": {"foo": 123}}'
-    self.assertRaisesRegex(
-        json_format.ParseError,
-        r"FieldMask JSON value not a string: {u?'foo': 123}", json_format.Parse,
-        text, message)
-
-  def testInvalidAny(self):
-    message = any_pb2.Any()
-    text = '{"@type": "type.googleapis.com/google.protobuf.Int32Value"}'
-    self.assertRaisesRegex(KeyError, 'value', json_format.Parse, text, message)
-    text = '{"value": 1234}'
-    self.assertRaisesRegex(json_format.ParseError,
-                           '@type is missing when parsing any message at Any',
-                           json_format.Parse, text, message)
-    text = '{"@type": "type.googleapis.com/MessageNotExist", "value": 1234}'
-    self.assertRaisesRegex(
-        json_format.ParseError, 'Can not find message descriptor by type_url: '
-        'type.googleapis.com/MessageNotExist at Any', json_format.Parse, text,
-        message)
-    # Only last part is to be used: b/25630112
-    text = (r'{"@type": "incorrect.googleapis.com/google.protobuf.Int32Value",'
-            r'"value": 1234}')
-    json_format.Parse(text, message)
-
-  def testPreservingProtoFieldNames(self):
-    message = json_format_proto3_pb2.TestMessage()
-    message.int32_value = 12345
-    self.assertEqual('{\n  "int32Value": 12345\n}',
-                     json_format.MessageToJson(message))
-    self.assertEqual('{\n  "int32_value": 12345\n}',
-                     json_format.MessageToJson(message, False, True))
-    # When including_default_value_fields is True.
-    message = json_format_proto3_pb2.TestTimestamp()
-    self.assertEqual('{\n  "repeatedValue": []\n}',
-                     json_format.MessageToJson(message, True, False))
-    self.assertEqual('{\n  "repeated_value": []\n}',
-                     json_format.MessageToJson(message, True, True))
-
-    # Parsers accept both original proto field names and lowerCamelCase names.
-    message = json_format_proto3_pb2.TestMessage()
-    json_format.Parse('{"int32Value": 54321}', message)
-    self.assertEqual(54321, message.int32_value)
-    json_format.Parse('{"int32_value": 12345}', message)
-    self.assertEqual(12345, message.int32_value)
-
-  def testIndent(self):
-    message = json_format_proto3_pb2.TestMessage()
-    message.int32_value = 12345
-    self.assertEqual('{\n"int32Value": 12345\n}',
-                     json_format.MessageToJson(message, indent=0))
-
-  def testFormatEnumsAsInts(self):
-    message = json_format_proto3_pb2.TestMessage()
-    message.enum_value = json_format_proto3_pb2.BAR
-    message.repeated_enum_value.append(json_format_proto3_pb2.FOO)
-    message.repeated_enum_value.append(json_format_proto3_pb2.BAR)
-    self.assertEqual(json.loads('{\n'
-                                '  "enumValue": 1,\n'
-                                '  "repeatedEnumValue": [0, 1]\n'
-                                '}\n'),
-                     json.loads(json_format.MessageToJson(
-                         message, use_integers_for_enums=True)))
-
-  def testParseDict(self):
-    expected = 12345
-    js_dict = {'int32Value': expected}
-    message = json_format_proto3_pb2.TestMessage()
-    json_format.ParseDict(js_dict, message)
-    self.assertEqual(expected, message.int32_value)
-
-  def testParseDictAnyDescriptorPoolMissingType(self):
-    # Confirm that ParseDict does not raise ParseError with default pool
-    js_dict = {
-        'any_value': {
-            '@type': 'type.googleapis.com/proto3.MessageType',
-            'value': 1234
-        }
-    }
-    json_format.ParseDict(js_dict, any_test_pb2.TestAny())
-    # Check ParseDict raises ParseError with empty pool
-    js_dict = {
-        'any_value': {
-            '@type': 'type.googleapis.com/proto3.MessageType',
-            'value': 1234
-        }
-    }
-    with self.assertRaises(json_format.ParseError) as cm:
-      empty_pool = descriptor_pool.DescriptorPool()
-      json_format.ParseDict(js_dict,
-                            any_test_pb2.TestAny(),
-                            descriptor_pool=empty_pool)
-    self.assertEqual(
-        str(cm.exception),
-        'Failed to parse any_value field: Can not find message descriptor by'
-        ' type_url: type.googleapis.com/proto3.MessageType at '
-        'TestAny.any_value.'
-    )
-
-  def testParseDictUnknownValueType(self):
-    class UnknownClass(object):
-
-      def __repr__(self):
-        return 'v'
-    message = json_format_proto3_pb2.TestValue()
-    self.assertRaisesRegex(
-        json_format.ParseError,
-        r"Value v has unexpected type <class '.*\.UnknownClass'>.",
-        json_format.ParseDict, {'value': UnknownClass()}, message)
-
-  def testMessageToDict(self):
-    message = json_format_proto3_pb2.TestMessage()
-    message.int32_value = 12345
-    expected = {'int32Value': 12345}
-    self.assertEqual(expected,
-                     json_format.MessageToDict(message))
-
-  def testJsonName(self):
-    message = json_format_proto3_pb2.TestCustomJsonName()
-    message.value = 12345
-    self.assertEqual('{\n  "@value": 12345\n}',
-                     json_format.MessageToJson(message))
-    parsed_message = json_format_proto3_pb2.TestCustomJsonName()
-    self.CheckParseBack(message, parsed_message)
-
-  def testSortKeys(self):
-    # Testing sort_keys is not perfectly working, as by random luck we could
-    # get the output sorted. We just use a selection of names.
-    message = json_format_proto3_pb2.TestMessage(bool_value=True,
-                                                 int32_value=1,
-                                                 int64_value=3,
-                                                 uint32_value=4,
-                                                 string_value='bla')
-    self.assertEqual(
-        json_format.MessageToJson(message, sort_keys=True),
-        # We use json.dumps() instead of a hardcoded string due to differences
-        # between Python 2 and Python 3.
-        json.dumps({'boolValue': True, 'int32Value': 1, 'int64Value': '3',
-                    'uint32Value': 4, 'stringValue': 'bla'},
-                   indent=2, sort_keys=True))
-
-  def testNestedRecursiveLimit(self):
-    message = unittest_pb2.NestedTestAllTypes()
-    self.assertRaisesRegex(
-        json_format.ParseError,
-        'Message too deep. Max recursion depth is 3',
-        json_format.Parse,
-        '{"child": {"child": {"child" : {}}}}',
-        message,
-        max_recursion_depth=3)
-    # The following one can pass
-    json_format.Parse('{"payload": {}, "child": {"child":{}}}',
-                      message, max_recursion_depth=3)
-
-if __name__ == '__main__':
-  unittest.main()
diff --git a/libs/protobuf/python/google/protobuf/internal/keywords_test.py b/libs/protobuf/python/google/protobuf/internal/keywords_test.py
deleted file mode 100644
index 4182cf6..0000000
--- a/libs/protobuf/python/google/protobuf/internal/keywords_test.py
+++ /dev/null
@@ -1,103 +0,0 @@
-# Protocol Buffers - Google's data interchange format
-# Copyright 2008 Google Inc.  All rights reserved.
-# https://developers.google.com/protocol-buffers/
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-"""Tests for google.protobuf.internal.keywords."""
-
-import unittest
-
-
-from google.protobuf.internal import more_messages_pb2
-from google.protobuf import descriptor_pool
-
-
-class KeywordsConflictTest(unittest.TestCase):
-
-  def setUp(self):
-    super(KeywordsConflictTest, self).setUp()
-    self.pool = descriptor_pool.Default()
-
-  def testMessage(self):
-    message = getattr(more_messages_pb2, 'class')()
-    message.int_field = 123
-    self.assertEqual(message.int_field, 123)
-    des = self.pool.FindMessageTypeByName('google.protobuf.internal.class')
-    self.assertEqual(des.name, 'class')
-
-  def testNestedMessage(self):
-    message = getattr(more_messages_pb2, 'class')()
-    message.nested_message.field = 234
-    self.assertEqual(message.nested_message.field, 234)
-    des = self.pool.FindMessageTypeByName('google.protobuf.internal.class.try')
-    self.assertEqual(des.name, 'try')
-
-  def testField(self):
-    message = getattr(more_messages_pb2, 'class')()
-    setattr(message, 'if', 123)
-    setattr(message, 'as', 1)
-    self.assertEqual(getattr(message, 'if'), 123)
-    self.assertEqual(getattr(message, 'as'), 1)
-
-  def testEnum(self):
-    class_ = getattr(more_messages_pb2, 'class')
-    message = class_()
-    # Normal enum value.
-    message.enum_field = more_messages_pb2.default
-    self.assertEqual(message.enum_field, more_messages_pb2.default)
-    # Top level enum value.
-    message.enum_field = getattr(more_messages_pb2, 'else')
-    self.assertEqual(message.enum_field, 1)
-    # Nested enum value
-    message.nested_enum_field = getattr(class_, 'True')
-    self.assertEqual(message.nested_enum_field, 1)
-
-  def testExtension(self):
-    message = getattr(more_messages_pb2, 'class')()
-    # Top level extension
-    extension1 = getattr(more_messages_pb2, 'continue')
-    message.Extensions[extension1] = 456
-    self.assertEqual(message.Extensions[extension1], 456)
-    # None top level extension
-    extension2 = getattr(more_messages_pb2.ExtendClass, 'return')
-    message.Extensions[extension2] = 789
-    self.assertEqual(message.Extensions[extension2], 789)
-
-  def testExtensionForNestedMessage(self):
-    message = getattr(more_messages_pb2, 'class')()
-    extension = getattr(more_messages_pb2, 'with')
-    message.nested_message.Extensions[extension] = 999
-    self.assertEqual(message.nested_message.Extensions[extension], 999)
-
-  def TestFullKeywordUsed(self):
-    message = more_messages_pb2.TestFullKeyword()
-    message.field2.int_field = 123
-
-
-if __name__ == '__main__':
-  unittest.main()
diff --git a/libs/protobuf/python/google/protobuf/internal/message_factory_test.py b/libs/protobuf/python/google/protobuf/internal/message_factory_test.py
deleted file mode 100644
index efba619..0000000
--- a/libs/protobuf/python/google/protobuf/internal/message_factory_test.py
+++ /dev/null
@@ -1,299 +0,0 @@
-# Protocol Buffers - Google's data interchange format
-# Copyright 2008 Google Inc.  All rights reserved.
-# https://developers.google.com/protocol-buffers/
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-"""Tests for google.protobuf.message_factory."""
-
-__author__ = 'matthewtoia@google.com (Matt Toia)'
-
-import unittest
-
-from google.protobuf import descriptor_pb2
-from google.protobuf.internal import api_implementation
-from google.protobuf.internal import factory_test1_pb2
-from google.protobuf.internal import factory_test2_pb2
-from google.protobuf.internal import testing_refleaks
-from google.protobuf import descriptor_database
-from google.protobuf import descriptor_pool
-from google.protobuf import message_factory
-
-
-@testing_refleaks.TestCase
-class MessageFactoryTest(unittest.TestCase):
-
-  def setUp(self):
-    self.factory_test1_fd = descriptor_pb2.FileDescriptorProto.FromString(
-        factory_test1_pb2.DESCRIPTOR.serialized_pb)
-    self.factory_test2_fd = descriptor_pb2.FileDescriptorProto.FromString(
-        factory_test2_pb2.DESCRIPTOR.serialized_pb)
-
-  def _ExerciseDynamicClass(self, cls):
-    msg = cls()
-    msg.mandatory = 42
-    msg.nested_factory_2_enum = 0
-    msg.nested_factory_2_message.value = 'nested message value'
-    msg.factory_1_message.factory_1_enum = 1
-    msg.factory_1_message.nested_factory_1_enum = 0
-    msg.factory_1_message.nested_factory_1_message.value = (
-        'nested message value')
-    msg.factory_1_message.scalar_value = 22
-    msg.factory_1_message.list_value.extend([u'one', u'two', u'three'])
-    msg.factory_1_message.list_value.append(u'four')
-    msg.factory_1_enum = 1
-    msg.nested_factory_1_enum = 0
-    msg.nested_factory_1_message.value = 'nested message value'
-    msg.circular_message.mandatory = 1
-    msg.circular_message.circular_message.mandatory = 2
-    msg.circular_message.scalar_value = 'one deep'
-    msg.scalar_value = 'zero deep'
-    msg.list_value.extend([u'four', u'three', u'two'])
-    msg.list_value.append(u'one')
-    msg.grouped.add()
-    msg.grouped[0].part_1 = 'hello'
-    msg.grouped[0].part_2 = 'world'
-    msg.grouped.add(part_1='testing', part_2='123')
-    msg.loop.loop.mandatory = 2
-    msg.loop.loop.loop.loop.mandatory = 4
-    serialized = msg.SerializeToString()
-    converted = factory_test2_pb2.Factory2Message.FromString(serialized)
-    reserialized = converted.SerializeToString()
-    self.assertEqual(serialized, reserialized)
-    result = cls.FromString(reserialized)
-    self.assertEqual(msg, result)
-
-  def testGetPrototype(self):
-    db = descriptor_database.DescriptorDatabase()
-    pool = descriptor_pool.DescriptorPool(db)
-    db.Add(self.factory_test1_fd)
-    db.Add(self.factory_test2_fd)
-    factory = message_factory.MessageFactory()
-    cls = factory.GetPrototype(pool.FindMessageTypeByName(
-        'google.protobuf.python.internal.Factory2Message'))
-    self.assertFalse(cls is factory_test2_pb2.Factory2Message)
-    self._ExerciseDynamicClass(cls)
-    cls2 = factory.GetPrototype(pool.FindMessageTypeByName(
-        'google.protobuf.python.internal.Factory2Message'))
-    self.assertTrue(cls is cls2)
-
-  def testCreatePrototypeOverride(self):
-    class MyMessageFactory(message_factory.MessageFactory):
-
-      def CreatePrototype(self, descriptor):
-        cls = super(MyMessageFactory, self).CreatePrototype(descriptor)
-        cls.additional_field = 'Some value'
-        return cls
-
-    db = descriptor_database.DescriptorDatabase()
-    pool = descriptor_pool.DescriptorPool(db)
-    db.Add(self.factory_test1_fd)
-    db.Add(self.factory_test2_fd)
-    factory = MyMessageFactory()
-    cls = factory.GetPrototype(pool.FindMessageTypeByName(
-        'google.protobuf.python.internal.Factory2Message'))
-    self.assertTrue(hasattr(cls, 'additional_field'))
-
-  def testGetMessages(self):
-    # performed twice because multiple calls with the same input must be allowed
-    for _ in range(2):
-      # GetMessage should work regardless of the order the FileDescriptorProto
-      # are provided. In particular, the function should succeed when the files
-      # are not in the topological order of dependencies.
-
-      # Assuming factory_test2_fd depends on factory_test1_fd.
-      self.assertIn(self.factory_test1_fd.name,
-                    self.factory_test2_fd.dependency)
-      # Get messages should work when a file comes before its dependencies:
-      # factory_test2_fd comes before factory_test1_fd.
-      messages = message_factory.GetMessages([self.factory_test2_fd,
-                                              self.factory_test1_fd])
-      self.assertTrue(
-          set(['google.protobuf.python.internal.Factory2Message',
-               'google.protobuf.python.internal.Factory1Message'],
-             ).issubset(set(messages.keys())))
-      self._ExerciseDynamicClass(
-          messages['google.protobuf.python.internal.Factory2Message'])
-      factory_msg1 = messages['google.protobuf.python.internal.Factory1Message']
-      self.assertTrue(set(
-          ['google.protobuf.python.internal.Factory2Message.one_more_field',
-           'google.protobuf.python.internal.another_field'],).issubset(set(
-               ext.full_name
-               for ext in factory_msg1.DESCRIPTOR.file.pool.FindAllExtensions(
-                   factory_msg1.DESCRIPTOR))))
-      msg1 = messages['google.protobuf.python.internal.Factory1Message']()
-      ext1 = msg1.Extensions._FindExtensionByName(
-          'google.protobuf.python.internal.Factory2Message.one_more_field')
-      ext2 = msg1.Extensions._FindExtensionByName(
-          'google.protobuf.python.internal.another_field')
-      self.assertEqual(0, len(msg1.Extensions))
-      msg1.Extensions[ext1] = 'test1'
-      msg1.Extensions[ext2] = 'test2'
-      self.assertEqual('test1', msg1.Extensions[ext1])
-      self.assertEqual('test2', msg1.Extensions[ext2])
-      self.assertEqual(None,
-                       msg1.Extensions._FindExtensionByNumber(12321))
-      self.assertEqual(2, len(msg1.Extensions))
-      if api_implementation.Type() == 'cpp':
-        self.assertRaises(TypeError,
-                          msg1.Extensions._FindExtensionByName, 0)
-        self.assertRaises(TypeError,
-                          msg1.Extensions._FindExtensionByNumber, '')
-      else:
-        self.assertEqual(None,
-                         msg1.Extensions._FindExtensionByName(0))
-        self.assertEqual(None,
-                         msg1.Extensions._FindExtensionByNumber(''))
-
-  def testDuplicateExtensionNumber(self):
-    pool = descriptor_pool.DescriptorPool()
-    factory = message_factory.MessageFactory(pool=pool)
-
-    # Add Container message.
-    f = descriptor_pb2.FileDescriptorProto(
-        name='google/protobuf/internal/container.proto',
-        package='google.protobuf.python.internal')
-    f.message_type.add(name='Container').extension_range.add(start=1, end=10)
-    pool.Add(f)
-    msgs = factory.GetMessages([f.name])
-    self.assertIn('google.protobuf.python.internal.Container', msgs)
-
-    # Extend container.
-    f = descriptor_pb2.FileDescriptorProto(
-        name='google/protobuf/internal/extension.proto',
-        package='google.protobuf.python.internal',
-        dependency=['google/protobuf/internal/container.proto'])
-    msg = f.message_type.add(name='Extension')
-    msg.extension.add(
-        name='extension_field',
-        number=2,
-        label=descriptor_pb2.FieldDescriptorProto.LABEL_OPTIONAL,
-        type_name='Extension',
-        extendee='Container')
-    pool.Add(f)
-    msgs = factory.GetMessages([f.name])
-    self.assertIn('google.protobuf.python.internal.Extension', msgs)
-
-    # Add Duplicate extending the same field number.
-    f = descriptor_pb2.FileDescriptorProto(
-        name='google/protobuf/internal/duplicate.proto',
-        package='google.protobuf.python.internal',
-        dependency=['google/protobuf/internal/container.proto'])
-    msg = f.message_type.add(name='Duplicate')
-    msg.extension.add(
-        name='extension_field',
-        number=2,
-        label=descriptor_pb2.FieldDescriptorProto.LABEL_OPTIONAL,
-        type_name='Duplicate',
-        extendee='Container')
-    pool.Add(f)
-
-    with self.assertRaises(Exception) as cm:
-      factory.GetMessages([f.name])
-
-    self.assertIn(str(cm.exception),
-                  ['Extensions '
-                   '"google.protobuf.python.internal.Duplicate.extension_field" and'
-                   ' "google.protobuf.python.internal.Extension.extension_field"'
-                   ' both try to extend message type'
-                   ' "google.protobuf.python.internal.Container"'
-                   ' with field number 2.',
-                   'Double registration of Extensions'])
-
-  def testExtensionValueInDifferentFile(self):
-    # Add Container message.
-    f1 = descriptor_pb2.FileDescriptorProto(
-        name='google/protobuf/internal/container.proto',
-        package='google.protobuf.python.internal')
-    f1.message_type.add(name='Container').extension_range.add(start=1, end=10)
-
-    # Add ValueType message.
-    f2 = descriptor_pb2.FileDescriptorProto(
-        name='google/protobuf/internal/value_type.proto',
-        package='google.protobuf.python.internal')
-    f2.message_type.add(name='ValueType').field.add(
-        name='setting',
-        number=1,
-        label=descriptor_pb2.FieldDescriptorProto.LABEL_OPTIONAL,
-        type=descriptor_pb2.FieldDescriptorProto.TYPE_INT32,
-        default_value='123')
-
-    # Extend container with field of ValueType.
-    f3 = descriptor_pb2.FileDescriptorProto(
-        name='google/protobuf/internal/extension.proto',
-        package='google.protobuf.python.internal',
-        dependency=[f1.name, f2.name])
-    f3.extension.add(
-        name='top_level_extension_field',
-        number=2,
-        label=descriptor_pb2.FieldDescriptorProto.LABEL_OPTIONAL,
-        type_name='ValueType',
-        extendee='Container')
-    f3.message_type.add(name='Extension').extension.add(
-        name='nested_extension_field',
-        number=3,
-        label=descriptor_pb2.FieldDescriptorProto.LABEL_OPTIONAL,
-        type_name='ValueType',
-        extendee='Container')
-
-    class SimpleDescriptorDB:
-
-      def __init__(self, files):
-        self._files = files
-
-      def FindFileByName(self, name):
-        return self._files[name]
-
-    db = SimpleDescriptorDB({f1.name: f1, f2.name: f2, f3.name: f3})
-
-    pool = descriptor_pool.DescriptorPool(db)
-    factory = message_factory.MessageFactory(pool=pool)
-    msgs = factory.GetMessages([f1.name, f3.name])  # Deliberately not f2.
-    msg = msgs['google.protobuf.python.internal.Container']
-    desc = msgs['google.protobuf.python.internal.Extension'].DESCRIPTOR
-    ext1 = desc.file.extensions_by_name['top_level_extension_field']
-    ext2 = desc.extensions_by_name['nested_extension_field']
-    m = msg()
-    m.Extensions[ext1].setting = 234
-    m.Extensions[ext2].setting = 345
-    serialized = m.SerializeToString()
-
-    pool = descriptor_pool.DescriptorPool(db)
-    factory = message_factory.MessageFactory(pool=pool)
-    msgs = factory.GetMessages([f1.name, f3.name])  # Deliberately not f2.
-    msg = msgs['google.protobuf.python.internal.Container']
-    desc = msgs['google.protobuf.python.internal.Extension'].DESCRIPTOR
-    ext1 = desc.file.extensions_by_name['top_level_extension_field']
-    ext2 = desc.extensions_by_name['nested_extension_field']
-    m = msg.FromString(serialized)
-    self.assertEqual(2, len(m.ListFields()))
-    self.assertEqual(234, m.Extensions[ext1].setting)
-    self.assertEqual(345, m.Extensions[ext2].setting)
-
-
-if __name__ == '__main__':
-  unittest.main()
diff --git a/libs/protobuf/python/google/protobuf/internal/message_listener.py b/libs/protobuf/python/google/protobuf/internal/message_listener.py
deleted file mode 100644
index 0fc255a..0000000
--- a/libs/protobuf/python/google/protobuf/internal/message_listener.py
+++ /dev/null
@@ -1,78 +0,0 @@
-# Protocol Buffers - Google's data interchange format
-# Copyright 2008 Google Inc.  All rights reserved.
-# https://developers.google.com/protocol-buffers/
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-"""Defines a listener interface for observing certain
-state transitions on Message objects.
-
-Also defines a null implementation of this interface.
-"""
-
-__author__ = 'robinson@google.com (Will Robinson)'
-
-
-class MessageListener(object):
-
-  """Listens for modifications made to a message.  Meant to be registered via
-  Message._SetListener().
-
-  Attributes:
-    dirty:  If True, then calling Modified() would be a no-op.  This can be
-            used to avoid these calls entirely in the common case.
-  """
-
-  def Modified(self):
-    """Called every time the message is modified in such a way that the parent
-    message may need to be updated.  This currently means either:
-    (a) The message was modified for the first time, so the parent message
-        should henceforth mark the message as present.
-    (b) The message's cached byte size became dirty -- i.e. the message was
-        modified for the first time after a previous call to ByteSize().
-        Therefore the parent should also mark its byte size as dirty.
-    Note that (a) implies (b), since new objects start out with a client cached
-    size (zero).  However, we document (a) explicitly because it is important.
-
-    Modified() will *only* be called in response to one of these two events --
-    not every time the sub-message is modified.
-
-    Note that if the listener's |dirty| attribute is true, then calling
-    Modified at the moment would be a no-op, so it can be skipped.  Performance-
-    sensitive callers should check this attribute directly before calling since
-    it will be true most of the time.
-    """
-
-    raise NotImplementedError
-
-
-class NullMessageListener(object):
-
-  """No-op MessageListener implementation."""
-
-  def Modified(self):
-    pass
diff --git a/libs/protobuf/python/google/protobuf/internal/message_set_extensions.proto b/libs/protobuf/python/google/protobuf/internal/message_set_extensions.proto
deleted file mode 100644
index 14e5f19..0000000
--- a/libs/protobuf/python/google/protobuf/internal/message_set_extensions.proto
+++ /dev/null
@@ -1,74 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// This file contains messages that extend MessageSet.
-
-syntax = "proto2";
-package google.protobuf.internal;
-
-
-// A message with message_set_wire_format.
-message TestMessageSet {
-  option message_set_wire_format = true;
-  extensions 4 to max;
-}
-
-message TestMessageSetExtension1 {
-  extend TestMessageSet {
-    optional TestMessageSetExtension1 message_set_extension = 98418603;
-  }
-  optional int32 i = 15;
-}
-
-message TestMessageSetExtension2 {
-  extend TestMessageSet {
-    optional TestMessageSetExtension2 message_set_extension = 98418634;
-  }
-  optional string str = 25;
-}
-
-message TestMessageSetExtension3 {
-  optional string text = 35;
-}
-
-extend TestMessageSet {
-  optional TestMessageSetExtension3 message_set_extension3 = 98418655;
-}
-
-// This message was used to generate
-// //net/proto2/python/internal/testdata/message_set_message, but is commented
-// out since it must not actually exist in code, to simulate an "unknown"
-// extension.
-// message TestMessageSetUnknownExtension {
-//   extend TestMessageSet {
-//     optional TestMessageSetUnknownExtension message_set_extension = 56141421;
-//   }
-//   optional int64 a = 1;
-// }
diff --git a/libs/protobuf/python/google/protobuf/internal/message_test.py b/libs/protobuf/python/google/protobuf/internal/message_test.py
deleted file mode 100644
index 40abfe4..0000000
--- a/libs/protobuf/python/google/protobuf/internal/message_test.py
+++ /dev/null
@@ -1,2572 +0,0 @@
-# -*- coding: utf-8 -*-
-# Protocol Buffers - Google's data interchange format
-# Copyright 2008 Google Inc.  All rights reserved.
-# https://developers.google.com/protocol-buffers/
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-"""Tests python protocol buffers against the golden message.
-
-Note that the golden messages exercise every known field type, thus this
-test ends up exercising and verifying nearly all of the parsing and
-serialization code in the whole library.
-
-TODO(kenton):  Merge with wire_format_test?  It doesn't make a whole lot of
-sense to call this a test of the "message" module, which only declares an
-abstract interface.
-"""
-
-__author__ = 'gps@google.com (Gregory P. Smith)'
-
-import collections
-import copy
-import math
-import operator
-import pickle
-import pydoc
-import sys
-import unittest
-import warnings
-
-cmp = lambda x, y: (x > y) - (x < y)
-
-from google.protobuf import map_proto2_unittest_pb2
-from google.protobuf import map_unittest_pb2
-from google.protobuf import unittest_pb2
-from google.protobuf import unittest_proto3_arena_pb2
-from google.protobuf import descriptor
-from google.protobuf.internal import api_implementation
-from google.protobuf.internal import encoder
-from google.protobuf.internal import more_extensions_pb2
-from google.protobuf.internal import packed_field_test_pb2
-from google.protobuf.internal import test_util
-from google.protobuf.internal import test_proto3_optional_pb2
-from google.protobuf.internal import testing_refleaks
-from google.protobuf import message
-from google.protobuf.internal import _parameterized
-
-UCS2_MAXUNICODE = 65535
-
-warnings.simplefilter('error', DeprecationWarning)
-
-
-@_parameterized.named_parameters(('_proto2', unittest_pb2),
-                                ('_proto3', unittest_proto3_arena_pb2))
-@testing_refleaks.TestCase
-class MessageTest(unittest.TestCase):
-
-  def testBadUtf8String(self, message_module):
-    if api_implementation.Type() != 'python':
-      self.skipTest('Skipping testBadUtf8String, currently only the python '
-                    'api implementation raises UnicodeDecodeError when a '
-                    'string field contains bad utf-8.')
-    bad_utf8_data = test_util.GoldenFileData('bad_utf8_string')
-    with self.assertRaises(UnicodeDecodeError) as context:
-      message_module.TestAllTypes.FromString(bad_utf8_data)
-    self.assertIn('TestAllTypes.optional_string', str(context.exception))
-
-  def testGoldenMessage(self, message_module):
-    # Proto3 doesn't have the "default_foo" members or foreign enums,
-    # and doesn't preserve unknown fields, so for proto3 we use a golden
-    # message that doesn't have these fields set.
-    if message_module is unittest_pb2:
-      golden_data = test_util.GoldenFileData('golden_message_oneof_implemented')
-    else:
-      golden_data = test_util.GoldenFileData('golden_message_proto3')
-
-    golden_message = message_module.TestAllTypes()
-    golden_message.ParseFromString(golden_data)
-    if message_module is unittest_pb2:
-      test_util.ExpectAllFieldsSet(self, golden_message)
-    self.assertEqual(golden_data, golden_message.SerializeToString())
-    golden_copy = copy.deepcopy(golden_message)
-    self.assertEqual(golden_data, golden_copy.SerializeToString())
-
-  def testGoldenPackedMessage(self, message_module):
-    golden_data = test_util.GoldenFileData('golden_packed_fields_message')
-    golden_message = message_module.TestPackedTypes()
-    parsed_bytes = golden_message.ParseFromString(golden_data)
-    all_set = message_module.TestPackedTypes()
-    test_util.SetAllPackedFields(all_set)
-    self.assertEqual(parsed_bytes, len(golden_data))
-    self.assertEqual(all_set, golden_message)
-    self.assertEqual(golden_data, all_set.SerializeToString())
-    golden_copy = copy.deepcopy(golden_message)
-    self.assertEqual(golden_data, golden_copy.SerializeToString())
-
-  def testParseErrors(self, message_module):
-    msg = message_module.TestAllTypes()
-    self.assertRaises(TypeError, msg.FromString, 0)
-    self.assertRaises(Exception, msg.FromString, '0')
-    # TODO(jieluo): Fix cpp extension to raise error instead of warning.
-    # b/27494216
-    end_tag = encoder.TagBytes(1, 4)
-    if (api_implementation.Type() == 'python' or
-        api_implementation.Type() == 'upb'):
-      with self.assertRaises(message.DecodeError) as context:
-        msg.FromString(end_tag)
-      if api_implementation.Type() == 'python':
-        # Only pure-Python has an error message this specific.
-        self.assertEqual('Unexpected end-group tag.', str(context.exception))
-
-    # Field number 0 is illegal.
-    self.assertRaises(message.DecodeError, msg.FromString, b'\3\4')
-
-  def testDeterminismParameters(self, message_module):
-    # This message is always deterministically serialized, even if determinism
-    # is disabled, so we can use it to verify that all the determinism
-    # parameters work correctly.
-    golden_data = (b'\xe2\x02\nOne string'
-                   b'\xe2\x02\nTwo string'
-                   b'\xe2\x02\nRed string'
-                   b'\xe2\x02\x0bBlue string')
-    golden_message = message_module.TestAllTypes()
-    golden_message.repeated_string.extend([
-        'One string',
-        'Two string',
-        'Red string',
-        'Blue string',
-    ])
-    self.assertEqual(golden_data,
-                     golden_message.SerializeToString(deterministic=None))
-    self.assertEqual(golden_data,
-                     golden_message.SerializeToString(deterministic=False))
-    self.assertEqual(golden_data,
-                     golden_message.SerializeToString(deterministic=True))
-
-    class BadArgError(Exception):
-      pass
-
-    class BadArg(object):
-
-      def __nonzero__(self):
-        raise BadArgError()
-
-      def __bool__(self):
-        raise BadArgError()
-
-    with self.assertRaises(BadArgError):
-      golden_message.SerializeToString(deterministic=BadArg())
-
-  def testPickleSupport(self, message_module):
-    golden_data = test_util.GoldenFileData('golden_message')
-    golden_message = message_module.TestAllTypes()
-    golden_message.ParseFromString(golden_data)
-    pickled_message = pickle.dumps(golden_message)
-
-    unpickled_message = pickle.loads(pickled_message)
-    self.assertEqual(unpickled_message, golden_message)
-
-  def testPickleNestedMessage(self, message_module):
-    golden_message = message_module.TestPickleNestedMessage.NestedMessage(bb=1)
-    pickled_message = pickle.dumps(golden_message)
-    unpickled_message = pickle.loads(pickled_message)
-    self.assertEqual(unpickled_message, golden_message)
-
-  def testPickleNestedNestedMessage(self, message_module):
-    cls = message_module.TestPickleNestedMessage.NestedMessage
-    golden_message = cls.NestedNestedMessage(cc=1)
-    pickled_message = pickle.dumps(golden_message)
-    unpickled_message = pickle.loads(pickled_message)
-    self.assertEqual(unpickled_message, golden_message)
-
-  def testPositiveInfinity(self, message_module):
-    if message_module is unittest_pb2:
-      golden_data = (b'\x5D\x00\x00\x80\x7F'
-                     b'\x61\x00\x00\x00\x00\x00\x00\xF0\x7F'
-                     b'\xCD\x02\x00\x00\x80\x7F'
-                     b'\xD1\x02\x00\x00\x00\x00\x00\x00\xF0\x7F')
-    else:
-      golden_data = (b'\x5D\x00\x00\x80\x7F'
-                     b'\x61\x00\x00\x00\x00\x00\x00\xF0\x7F'
-                     b'\xCA\x02\x04\x00\x00\x80\x7F'
-                     b'\xD2\x02\x08\x00\x00\x00\x00\x00\x00\xF0\x7F')
-
-    golden_message = message_module.TestAllTypes()
-    golden_message.ParseFromString(golden_data)
-    self.assertEqual(golden_message.optional_float, math.inf)
-    self.assertEqual(golden_message.optional_double, math.inf)
-    self.assertEqual(golden_message.repeated_float[0], math.inf)
-    self.assertEqual(golden_message.repeated_double[0], math.inf)
-    self.assertEqual(golden_data, golden_message.SerializeToString())
-
-  def testNegativeInfinity(self, message_module):
-    if message_module is unittest_pb2:
-      golden_data = (b'\x5D\x00\x00\x80\xFF'
-                     b'\x61\x00\x00\x00\x00\x00\x00\xF0\xFF'
-                     b'\xCD\x02\x00\x00\x80\xFF'
-                     b'\xD1\x02\x00\x00\x00\x00\x00\x00\xF0\xFF')
-    else:
-      golden_data = (b'\x5D\x00\x00\x80\xFF'
-                     b'\x61\x00\x00\x00\x00\x00\x00\xF0\xFF'
-                     b'\xCA\x02\x04\x00\x00\x80\xFF'
-                     b'\xD2\x02\x08\x00\x00\x00\x00\x00\x00\xF0\xFF')
-
-    golden_message = message_module.TestAllTypes()
-    golden_message.ParseFromString(golden_data)
-    self.assertEqual(golden_message.optional_float, -math.inf)
-    self.assertEqual(golden_message.optional_double, -math.inf)
-    self.assertEqual(golden_message.repeated_float[0], -math.inf)
-    self.assertEqual(golden_message.repeated_double[0], -math.inf)
-    self.assertEqual(golden_data, golden_message.SerializeToString())
-
-  def testNotANumber(self, message_module):
-    golden_data = (b'\x5D\x00\x00\xC0\x7F'
-                   b'\x61\x00\x00\x00\x00\x00\x00\xF8\x7F'
-                   b'\xCD\x02\x00\x00\xC0\x7F'
-                   b'\xD1\x02\x00\x00\x00\x00\x00\x00\xF8\x7F')
-    golden_message = message_module.TestAllTypes()
-    golden_message.ParseFromString(golden_data)
-    self.assertTrue(math.isnan(golden_message.optional_float))
-    self.assertTrue(math.isnan(golden_message.optional_double))
-    self.assertTrue(math.isnan(golden_message.repeated_float[0]))
-    self.assertTrue(math.isnan(golden_message.repeated_double[0]))
-
-    # The protocol buffer may serialize to any one of multiple different
-    # representations of a NaN.  Rather than verify a specific representation,
-    # verify the serialized string can be converted into a correctly
-    # behaving protocol buffer.
-    serialized = golden_message.SerializeToString()
-    message = message_module.TestAllTypes()
-    message.ParseFromString(serialized)
-    self.assertTrue(math.isnan(message.optional_float))
-    self.assertTrue(math.isnan(message.optional_double))
-    self.assertTrue(math.isnan(message.repeated_float[0]))
-    self.assertTrue(math.isnan(message.repeated_double[0]))
-
-  def testPositiveInfinityPacked(self, message_module):
-    golden_data = (b'\xA2\x06\x04\x00\x00\x80\x7F'
-                   b'\xAA\x06\x08\x00\x00\x00\x00\x00\x00\xF0\x7F')
-    golden_message = message_module.TestPackedTypes()
-    golden_message.ParseFromString(golden_data)
-    self.assertEqual(golden_message.packed_float[0], math.inf)
-    self.assertEqual(golden_message.packed_double[0], math.inf)
-    self.assertEqual(golden_data, golden_message.SerializeToString())
-
-  def testNegativeInfinityPacked(self, message_module):
-    golden_data = (b'\xA2\x06\x04\x00\x00\x80\xFF'
-                   b'\xAA\x06\x08\x00\x00\x00\x00\x00\x00\xF0\xFF')
-    golden_message = message_module.TestPackedTypes()
-    golden_message.ParseFromString(golden_data)
-    self.assertEqual(golden_message.packed_float[0], -math.inf)
-    self.assertEqual(golden_message.packed_double[0], -math.inf)
-    self.assertEqual(golden_data, golden_message.SerializeToString())
-
-  def testNotANumberPacked(self, message_module):
-    golden_data = (b'\xA2\x06\x04\x00\x00\xC0\x7F'
-                   b'\xAA\x06\x08\x00\x00\x00\x00\x00\x00\xF8\x7F')
-    golden_message = message_module.TestPackedTypes()
-    golden_message.ParseFromString(golden_data)
-    self.assertTrue(math.isnan(golden_message.packed_float[0]))
-    self.assertTrue(math.isnan(golden_message.packed_double[0]))
-
-    serialized = golden_message.SerializeToString()
-    message = message_module.TestPackedTypes()
-    message.ParseFromString(serialized)
-    self.assertTrue(math.isnan(message.packed_float[0]))
-    self.assertTrue(math.isnan(message.packed_double[0]))
-
-  def testExtremeFloatValues(self, message_module):
-    message = message_module.TestAllTypes()
-
-    # Most positive exponent, no significand bits set.
-    kMostPosExponentNoSigBits = math.pow(2, 127)
-    message.optional_float = kMostPosExponentNoSigBits
-    message.ParseFromString(message.SerializeToString())
-    self.assertTrue(message.optional_float == kMostPosExponentNoSigBits)
-
-    # Most positive exponent, one significand bit set.
-    kMostPosExponentOneSigBit = 1.5 * math.pow(2, 127)
-    message.optional_float = kMostPosExponentOneSigBit
-    message.ParseFromString(message.SerializeToString())
-    self.assertTrue(message.optional_float == kMostPosExponentOneSigBit)
-
-    # Repeat last two cases with values of same magnitude, but negative.
-    message.optional_float = -kMostPosExponentNoSigBits
-    message.ParseFromString(message.SerializeToString())
-    self.assertTrue(message.optional_float == -kMostPosExponentNoSigBits)
-
-    message.optional_float = -kMostPosExponentOneSigBit
-    message.ParseFromString(message.SerializeToString())
-    self.assertTrue(message.optional_float == -kMostPosExponentOneSigBit)
-
-    # Most negative exponent, no significand bits set.
-    kMostNegExponentNoSigBits = math.pow(2, -127)
-    message.optional_float = kMostNegExponentNoSigBits
-    message.ParseFromString(message.SerializeToString())
-    self.assertTrue(message.optional_float == kMostNegExponentNoSigBits)
-
-    # Most negative exponent, one significand bit set.
-    kMostNegExponentOneSigBit = 1.5 * math.pow(2, -127)
-    message.optional_float = kMostNegExponentOneSigBit
-    message.ParseFromString(message.SerializeToString())
-    self.assertTrue(message.optional_float == kMostNegExponentOneSigBit)
-
-    # Repeat last two cases with values of the same magnitude, but negative.
-    message.optional_float = -kMostNegExponentNoSigBits
-    message.ParseFromString(message.SerializeToString())
-    self.assertTrue(message.optional_float == -kMostNegExponentNoSigBits)
-
-    message.optional_float = -kMostNegExponentOneSigBit
-    message.ParseFromString(message.SerializeToString())
-    self.assertTrue(message.optional_float == -kMostNegExponentOneSigBit)
-
-    # Max 4 bytes float value
-    max_float = float.fromhex('0x1.fffffep+127')
-    message.optional_float = max_float
-    self.assertAlmostEqual(message.optional_float, max_float)
-    serialized_data = message.SerializeToString()
-    message.ParseFromString(serialized_data)
-    self.assertAlmostEqual(message.optional_float, max_float)
-
-    # Test set double to float field.
-    message.optional_float = 3.4028235e+39
-    self.assertEqual(message.optional_float, float('inf'))
-    serialized_data = message.SerializeToString()
-    message.ParseFromString(serialized_data)
-    self.assertEqual(message.optional_float, float('inf'))
-
-    message.optional_float = -3.4028235e+39
-    self.assertEqual(message.optional_float, float('-inf'))
-
-    message.optional_float = 1.4028235e-39
-    self.assertAlmostEqual(message.optional_float, 1.4028235e-39)
-
-  def testExtremeDoubleValues(self, message_module):
-    message = message_module.TestAllTypes()
-
-    # Most positive exponent, no significand bits set.
-    kMostPosExponentNoSigBits = math.pow(2, 1023)
-    message.optional_double = kMostPosExponentNoSigBits
-    message.ParseFromString(message.SerializeToString())
-    self.assertTrue(message.optional_double == kMostPosExponentNoSigBits)
-
-    # Most positive exponent, one significand bit set.
-    kMostPosExponentOneSigBit = 1.5 * math.pow(2, 1023)
-    message.optional_double = kMostPosExponentOneSigBit
-    message.ParseFromString(message.SerializeToString())
-    self.assertTrue(message.optional_double == kMostPosExponentOneSigBit)
-
-    # Repeat last two cases with values of same magnitude, but negative.
-    message.optional_double = -kMostPosExponentNoSigBits
-    message.ParseFromString(message.SerializeToString())
-    self.assertTrue(message.optional_double == -kMostPosExponentNoSigBits)
-
-    message.optional_double = -kMostPosExponentOneSigBit
-    message.ParseFromString(message.SerializeToString())
-    self.assertTrue(message.optional_double == -kMostPosExponentOneSigBit)
-
-    # Most negative exponent, no significand bits set.
-    kMostNegExponentNoSigBits = math.pow(2, -1023)
-    message.optional_double = kMostNegExponentNoSigBits
-    message.ParseFromString(message.SerializeToString())
-    self.assertTrue(message.optional_double == kMostNegExponentNoSigBits)
-
-    # Most negative exponent, one significand bit set.
-    kMostNegExponentOneSigBit = 1.5 * math.pow(2, -1023)
-    message.optional_double = kMostNegExponentOneSigBit
-    message.ParseFromString(message.SerializeToString())
-    self.assertTrue(message.optional_double == kMostNegExponentOneSigBit)
-
-    # Repeat last two cases with values of the same magnitude, but negative.
-    message.optional_double = -kMostNegExponentNoSigBits
-    message.ParseFromString(message.SerializeToString())
-    self.assertTrue(message.optional_double == -kMostNegExponentNoSigBits)
-
-    message.optional_double = -kMostNegExponentOneSigBit
-    message.ParseFromString(message.SerializeToString())
-    self.assertTrue(message.optional_double == -kMostNegExponentOneSigBit)
-
-  def testFloatPrinting(self, message_module):
-    message = message_module.TestAllTypes()
-    message.optional_float = 2.0
-    self.assertEqual(str(message), 'optional_float: 2.0\n')
-
-  def testHighPrecisionFloatPrinting(self, message_module):
-    msg = message_module.TestAllTypes()
-    msg.optional_float = 0.12345678912345678
-    old_float = msg.optional_float
-    msg.ParseFromString(msg.SerializeToString())
-    self.assertEqual(old_float, msg.optional_float)
-
-  def testHighPrecisionDoublePrinting(self, message_module):
-    msg = message_module.TestAllTypes()
-    msg.optional_double = 0.12345678912345678
-    self.assertEqual(str(msg), 'optional_double: 0.12345678912345678\n')
-
-  def testUnknownFieldPrinting(self, message_module):
-    populated = message_module.TestAllTypes()
-    test_util.SetAllNonLazyFields(populated)
-    empty = message_module.TestEmptyMessage()
-    empty.ParseFromString(populated.SerializeToString())
-    self.assertEqual(str(empty), '')
-
-  def testAppendRepeatedCompositeField(self, message_module):
-    msg = message_module.TestAllTypes()
-    msg.repeated_nested_message.append(
-        message_module.TestAllTypes.NestedMessage(bb=1))
-    nested = message_module.TestAllTypes.NestedMessage(bb=2)
-    msg.repeated_nested_message.append(nested)
-    try:
-      msg.repeated_nested_message.append(1)
-    except TypeError:
-      pass
-    self.assertEqual(2, len(msg.repeated_nested_message))
-    self.assertEqual([1, 2], [m.bb for m in msg.repeated_nested_message])
-
-  def testInsertRepeatedCompositeField(self, message_module):
-    msg = message_module.TestAllTypes()
-    msg.repeated_nested_message.insert(
-        -1, message_module.TestAllTypes.NestedMessage(bb=1))
-    sub_msg = msg.repeated_nested_message[0]
-    msg.repeated_nested_message.insert(
-        0, message_module.TestAllTypes.NestedMessage(bb=2))
-    msg.repeated_nested_message.insert(
-        99, message_module.TestAllTypes.NestedMessage(bb=3))
-    msg.repeated_nested_message.insert(
-        -2, message_module.TestAllTypes.NestedMessage(bb=-1))
-    msg.repeated_nested_message.insert(
-        -1000, message_module.TestAllTypes.NestedMessage(bb=-1000))
-    try:
-      msg.repeated_nested_message.insert(1, 999)
-    except TypeError:
-      pass
-    self.assertEqual(5, len(msg.repeated_nested_message))
-    self.assertEqual([-1000, 2, -1, 1, 3],
-                     [m.bb for m in msg.repeated_nested_message])
-    self.assertEqual(
-        str(msg), 'repeated_nested_message {\n'
-        '  bb: -1000\n'
-        '}\n'
-        'repeated_nested_message {\n'
-        '  bb: 2\n'
-        '}\n'
-        'repeated_nested_message {\n'
-        '  bb: -1\n'
-        '}\n'
-        'repeated_nested_message {\n'
-        '  bb: 1\n'
-        '}\n'
-        'repeated_nested_message {\n'
-        '  bb: 3\n'
-        '}\n')
-    self.assertEqual(sub_msg.bb, 1)
-
-  def testMergeFromRepeatedField(self, message_module):
-    msg = message_module.TestAllTypes()
-    msg.repeated_int32.append(1)
-    msg.repeated_int32.append(3)
-    msg.repeated_nested_message.add(bb=1)
-    msg.repeated_nested_message.add(bb=2)
-    other_msg = message_module.TestAllTypes()
-    other_msg.repeated_nested_message.add(bb=3)
-    other_msg.repeated_nested_message.add(bb=4)
-    other_msg.repeated_int32.append(5)
-    other_msg.repeated_int32.append(7)
-
-    msg.repeated_int32.MergeFrom(other_msg.repeated_int32)
-    self.assertEqual(4, len(msg.repeated_int32))
-
-    msg.repeated_nested_message.MergeFrom(other_msg.repeated_nested_message)
-    self.assertEqual([1, 2, 3, 4], [m.bb for m in msg.repeated_nested_message])
-
-  def testAddWrongRepeatedNestedField(self, message_module):
-    msg = message_module.TestAllTypes()
-    try:
-      msg.repeated_nested_message.add('wrong')
-    except TypeError:
-      pass
-    try:
-      msg.repeated_nested_message.add(value_field='wrong')
-    except ValueError:
-      pass
-    self.assertEqual(len(msg.repeated_nested_message), 0)
-
-  def testRepeatedContains(self, message_module):
-    msg = message_module.TestAllTypes()
-    msg.repeated_int32.extend([1, 2, 3])
-    self.assertIn(2, msg.repeated_int32)
-    self.assertNotIn(0, msg.repeated_int32)
-
-    msg.repeated_nested_message.add(bb=1)
-    sub_msg1 = msg.repeated_nested_message[0]
-    sub_msg2 = message_module.TestAllTypes.NestedMessage(bb=2)
-    sub_msg3 = message_module.TestAllTypes.NestedMessage(bb=3)
-    msg.repeated_nested_message.append(sub_msg2)
-    msg.repeated_nested_message.insert(0, sub_msg3)
-    self.assertIn(sub_msg1, msg.repeated_nested_message)
-    self.assertIn(sub_msg2, msg.repeated_nested_message)
-    self.assertIn(sub_msg3, msg.repeated_nested_message)
-
-  def testRepeatedScalarIterable(self, message_module):
-    msg = message_module.TestAllTypes()
-    msg.repeated_int32.extend([1, 2, 3])
-    add = 0
-    for item in msg.repeated_int32:
-      add += item
-    self.assertEqual(add, 6)
-
-  def testRepeatedNestedFieldIteration(self, message_module):
-    msg = message_module.TestAllTypes()
-    msg.repeated_nested_message.add(bb=1)
-    msg.repeated_nested_message.add(bb=2)
-    msg.repeated_nested_message.add(bb=3)
-    msg.repeated_nested_message.add(bb=4)
-
-    self.assertEqual([1, 2, 3, 4], [m.bb for m in msg.repeated_nested_message])
-    self.assertEqual([4, 3, 2, 1],
-                     [m.bb for m in reversed(msg.repeated_nested_message)])
-    self.assertEqual([4, 3, 2, 1],
-                     [m.bb for m in msg.repeated_nested_message[::-1]])
-
-  def testSortingRepeatedScalarFieldsDefaultComparator(self, message_module):
-    """Check some different types with the default comparator."""
-    message = message_module.TestAllTypes()
-
-    # TODO(mattp): would testing more scalar types strengthen test?
-    message.repeated_int32.append(1)
-    message.repeated_int32.append(3)
-    message.repeated_int32.append(2)
-    message.repeated_int32.sort()
-    self.assertEqual(message.repeated_int32[0], 1)
-    self.assertEqual(message.repeated_int32[1], 2)
-    self.assertEqual(message.repeated_int32[2], 3)
-    self.assertEqual(str(message.repeated_int32), str([1, 2, 3]))
-
-    message.repeated_float.append(1.1)
-    message.repeated_float.append(1.3)
-    message.repeated_float.append(1.2)
-    message.repeated_float.sort()
-    self.assertAlmostEqual(message.repeated_float[0], 1.1)
-    self.assertAlmostEqual(message.repeated_float[1], 1.2)
-    self.assertAlmostEqual(message.repeated_float[2], 1.3)
-
-    message.repeated_string.append('a')
-    message.repeated_string.append('c')
-    message.repeated_string.append('b')
-    message.repeated_string.sort()
-    self.assertEqual(message.repeated_string[0], 'a')
-    self.assertEqual(message.repeated_string[1], 'b')
-    self.assertEqual(message.repeated_string[2], 'c')
-    self.assertEqual(str(message.repeated_string), str([u'a', u'b', u'c']))
-
-    message.repeated_bytes.append(b'a')
-    message.repeated_bytes.append(b'c')
-    message.repeated_bytes.append(b'b')
-    message.repeated_bytes.sort()
-    self.assertEqual(message.repeated_bytes[0], b'a')
-    self.assertEqual(message.repeated_bytes[1], b'b')
-    self.assertEqual(message.repeated_bytes[2], b'c')
-    self.assertEqual(str(message.repeated_bytes), str([b'a', b'b', b'c']))
-
-  def testSortingRepeatedScalarFieldsCustomComparator(self, message_module):
-    """Check some different types with custom comparator."""
-    message = message_module.TestAllTypes()
-
-    message.repeated_int32.append(-3)
-    message.repeated_int32.append(-2)
-    message.repeated_int32.append(-1)
-    message.repeated_int32.sort(key=abs)
-    self.assertEqual(message.repeated_int32[0], -1)
-    self.assertEqual(message.repeated_int32[1], -2)
-    self.assertEqual(message.repeated_int32[2], -3)
-
-    message.repeated_string.append('aaa')
-    message.repeated_string.append('bb')
-    message.repeated_string.append('c')
-    message.repeated_string.sort(key=len)
-    self.assertEqual(message.repeated_string[0], 'c')
-    self.assertEqual(message.repeated_string[1], 'bb')
-    self.assertEqual(message.repeated_string[2], 'aaa')
-
-  def testSortingRepeatedCompositeFieldsCustomComparator(self, message_module):
-    """Check passing a custom comparator to sort a repeated composite field."""
-    message = message_module.TestAllTypes()
-
-    message.repeated_nested_message.add().bb = 1
-    message.repeated_nested_message.add().bb = 3
-    message.repeated_nested_message.add().bb = 2
-    message.repeated_nested_message.add().bb = 6
-    message.repeated_nested_message.add().bb = 5
-    message.repeated_nested_message.add().bb = 4
-    message.repeated_nested_message.sort(key=operator.attrgetter('bb'))
-    self.assertEqual(message.repeated_nested_message[0].bb, 1)
-    self.assertEqual(message.repeated_nested_message[1].bb, 2)
-    self.assertEqual(message.repeated_nested_message[2].bb, 3)
-    self.assertEqual(message.repeated_nested_message[3].bb, 4)
-    self.assertEqual(message.repeated_nested_message[4].bb, 5)
-    self.assertEqual(message.repeated_nested_message[5].bb, 6)
-    self.assertEqual(
-        str(message.repeated_nested_message),
-        '[bb: 1\n, bb: 2\n, bb: 3\n, bb: 4\n, bb: 5\n, bb: 6\n]')
-
-  def testSortingRepeatedCompositeFieldsStable(self, message_module):
-    """Check passing a custom comparator to sort a repeated composite field."""
-    message = message_module.TestAllTypes()
-
-    message.repeated_nested_message.add().bb = 21
-    message.repeated_nested_message.add().bb = 20
-    message.repeated_nested_message.add().bb = 13
-    message.repeated_nested_message.add().bb = 33
-    message.repeated_nested_message.add().bb = 11
-    message.repeated_nested_message.add().bb = 24
-    message.repeated_nested_message.add().bb = 10
-    message.repeated_nested_message.sort(key=lambda z: z.bb // 10)
-    self.assertEqual([13, 11, 10, 21, 20, 24, 33],
-                     [n.bb for n in message.repeated_nested_message])
-
-    # Make sure that for the C++ implementation, the underlying fields
-    # are actually reordered.
-    pb = message.SerializeToString()
-    message.Clear()
-    message.MergeFromString(pb)
-    self.assertEqual([13, 11, 10, 21, 20, 24, 33],
-                     [n.bb for n in message.repeated_nested_message])
-
-  def testRepeatedCompositeFieldSortArguments(self, message_module):
-    """Check sorting a repeated composite field using list.sort() arguments."""
-    message = message_module.TestAllTypes()
-
-    get_bb = operator.attrgetter('bb')
-    message.repeated_nested_message.add().bb = 1
-    message.repeated_nested_message.add().bb = 3
-    message.repeated_nested_message.add().bb = 2
-    message.repeated_nested_message.add().bb = 6
-    message.repeated_nested_message.add().bb = 5
-    message.repeated_nested_message.add().bb = 4
-    message.repeated_nested_message.sort(key=get_bb)
-    self.assertEqual([k.bb for k in message.repeated_nested_message],
-                     [1, 2, 3, 4, 5, 6])
-    message.repeated_nested_message.sort(key=get_bb, reverse=True)
-    self.assertEqual([k.bb for k in message.repeated_nested_message],
-                     [6, 5, 4, 3, 2, 1])
-
-  def testRepeatedScalarFieldSortArguments(self, message_module):
-    """Check sorting a scalar field using list.sort() arguments."""
-    message = message_module.TestAllTypes()
-
-    message.repeated_int32.append(-3)
-    message.repeated_int32.append(-2)
-    message.repeated_int32.append(-1)
-    message.repeated_int32.sort(key=abs)
-    self.assertEqual(list(message.repeated_int32), [-1, -2, -3])
-    message.repeated_int32.sort(key=abs, reverse=True)
-    self.assertEqual(list(message.repeated_int32), [-3, -2, -1])
-
-    message.repeated_string.append('aaa')
-    message.repeated_string.append('bb')
-    message.repeated_string.append('c')
-    message.repeated_string.sort(key=len)
-    self.assertEqual(list(message.repeated_string), ['c', 'bb', 'aaa'])
-    message.repeated_string.sort(key=len, reverse=True)
-    self.assertEqual(list(message.repeated_string), ['aaa', 'bb', 'c'])
-
-  def testRepeatedFieldsComparable(self, message_module):
-    m1 = message_module.TestAllTypes()
-    m2 = message_module.TestAllTypes()
-    m1.repeated_int32.append(0)
-    m1.repeated_int32.append(1)
-    m1.repeated_int32.append(2)
-    m2.repeated_int32.append(0)
-    m2.repeated_int32.append(1)
-    m2.repeated_int32.append(2)
-    m1.repeated_nested_message.add().bb = 1
-    m1.repeated_nested_message.add().bb = 2
-    m1.repeated_nested_message.add().bb = 3
-    m2.repeated_nested_message.add().bb = 1
-    m2.repeated_nested_message.add().bb = 2
-    m2.repeated_nested_message.add().bb = 3
-
-  def testRepeatedFieldsAreSequences(self, message_module):
-    m = message_module.TestAllTypes()
-    self.assertIsInstance(m.repeated_int32, collections.abc.MutableSequence)
-    self.assertIsInstance(m.repeated_nested_message,
-                          collections.abc.MutableSequence)
-
-  def testRepeatedFieldsNotHashable(self, message_module):
-    m = message_module.TestAllTypes()
-    with self.assertRaises(TypeError):
-      hash(m.repeated_int32)
-    with self.assertRaises(TypeError):
-      hash(m.repeated_nested_message)
-
-  def testRepeatedFieldInsideNestedMessage(self, message_module):
-    m = message_module.NestedTestAllTypes()
-    m.payload.repeated_int32.extend([])
-    self.assertTrue(m.HasField('payload'))
-
-  def testMergeFrom(self, message_module):
-    m1 = message_module.TestAllTypes()
-    m2 = message_module.TestAllTypes()
-    # Cpp extension will lazily create a sub message which is immutable.
-    nested = m1.optional_nested_message
-    self.assertEqual(0, nested.bb)
-    m2.optional_nested_message.bb = 1
-    # Make sure cmessage pointing to a mutable message after merge instead of
-    # the lazily created message.
-    m1.MergeFrom(m2)
-    self.assertEqual(1, nested.bb)
-
-    # Test more nested sub message.
-    msg1 = message_module.NestedTestAllTypes()
-    msg2 = message_module.NestedTestAllTypes()
-    nested = msg1.child.payload.optional_nested_message
-    self.assertEqual(0, nested.bb)
-    msg2.child.payload.optional_nested_message.bb = 1
-    msg1.MergeFrom(msg2)
-    self.assertEqual(1, nested.bb)
-
-    # Test repeated field.
-    self.assertEqual(msg1.payload.repeated_nested_message,
-                     msg1.payload.repeated_nested_message)
-    nested = msg2.payload.repeated_nested_message.add()
-    nested.bb = 1
-    msg1.MergeFrom(msg2)
-    self.assertEqual(1, len(msg1.payload.repeated_nested_message))
-    self.assertEqual(1, nested.bb)
-
-  def testMergeFromString(self, message_module):
-    m1 = message_module.TestAllTypes()
-    m2 = message_module.TestAllTypes()
-    # Cpp extension will lazily create a sub message which is immutable.
-    self.assertEqual(0, m1.optional_nested_message.bb)
-    m2.optional_nested_message.bb = 1
-    # Make sure cmessage pointing to a mutable message after merge instead of
-    # the lazily created message.
-    m1.MergeFromString(m2.SerializeToString())
-    self.assertEqual(1, m1.optional_nested_message.bb)
-
-  def testMergeFromStringUsingMemoryView(self, message_module):
-    m2 = message_module.TestAllTypes()
-    m2.optional_string = 'scalar string'
-    m2.repeated_string.append('repeated string')
-    m2.optional_bytes = b'scalar bytes'
-    m2.repeated_bytes.append(b'repeated bytes')
-
-    serialized = m2.SerializeToString()
-    memview = memoryview(serialized)
-    m1 = message_module.TestAllTypes.FromString(memview)
-
-    self.assertEqual(m1.optional_bytes, b'scalar bytes')
-    self.assertEqual(m1.repeated_bytes, [b'repeated bytes'])
-    self.assertEqual(m1.optional_string, 'scalar string')
-    self.assertEqual(m1.repeated_string, ['repeated string'])
-    # Make sure that the memoryview was correctly converted to bytes, and
-    # that a sub-sliced memoryview is not being used.
-    self.assertIsInstance(m1.optional_bytes, bytes)
-    self.assertIsInstance(m1.repeated_bytes[0], bytes)
-    self.assertIsInstance(m1.optional_string, str)
-    self.assertIsInstance(m1.repeated_string[0], str)
-
-  def testMergeFromEmpty(self, message_module):
-    m1 = message_module.TestAllTypes()
-    # Cpp extension will lazily create a sub message which is immutable.
-    self.assertEqual(0, m1.optional_nested_message.bb)
-    self.assertFalse(m1.HasField('optional_nested_message'))
-    # Make sure the sub message is still immutable after merge from empty.
-    m1.MergeFromString(b'')  # field state should not change
-    self.assertFalse(m1.HasField('optional_nested_message'))
-
-  def ensureNestedMessageExists(self, msg, attribute):
-    """Make sure that a nested message object exists.
-
-    As soon as a nested message attribute is accessed, it will be present in the
-    _fields dict, without being marked as actually being set.
-    """
-    getattr(msg, attribute)
-    self.assertFalse(msg.HasField(attribute))
-
-  def testOneofGetCaseNonexistingField(self, message_module):
-    m = message_module.TestAllTypes()
-    self.assertRaises(ValueError, m.WhichOneof, 'no_such_oneof_field')
-    self.assertRaises(Exception, m.WhichOneof, 0)
-
-  def testOneofDefaultValues(self, message_module):
-    m = message_module.TestAllTypes()
-    self.assertIs(None, m.WhichOneof('oneof_field'))
-    self.assertFalse(m.HasField('oneof_field'))
-    self.assertFalse(m.HasField('oneof_uint32'))
-
-    # Oneof is set even when setting it to a default value.
-    m.oneof_uint32 = 0
-    self.assertEqual('oneof_uint32', m.WhichOneof('oneof_field'))
-    self.assertTrue(m.HasField('oneof_field'))
-    self.assertTrue(m.HasField('oneof_uint32'))
-    self.assertFalse(m.HasField('oneof_string'))
-
-    m.oneof_string = ''
-    self.assertEqual('oneof_string', m.WhichOneof('oneof_field'))
-    self.assertTrue(m.HasField('oneof_string'))
-    self.assertFalse(m.HasField('oneof_uint32'))
-
-  def testOneofSemantics(self, message_module):
-    m = message_module.TestAllTypes()
-    self.assertIs(None, m.WhichOneof('oneof_field'))
-
-    m.oneof_uint32 = 11
-    self.assertEqual('oneof_uint32', m.WhichOneof('oneof_field'))
-    self.assertTrue(m.HasField('oneof_uint32'))
-
-    m.oneof_string = u'foo'
-    self.assertEqual('oneof_string', m.WhichOneof('oneof_field'))
-    self.assertFalse(m.HasField('oneof_uint32'))
-    self.assertTrue(m.HasField('oneof_string'))
-
-    # Read nested message accessor without accessing submessage.
-    m.oneof_nested_message
-    self.assertEqual('oneof_string', m.WhichOneof('oneof_field'))
-    self.assertTrue(m.HasField('oneof_string'))
-    self.assertFalse(m.HasField('oneof_nested_message'))
-
-    # Read accessor of nested message without accessing submessage.
-    m.oneof_nested_message.bb
-    self.assertEqual('oneof_string', m.WhichOneof('oneof_field'))
-    self.assertTrue(m.HasField('oneof_string'))
-    self.assertFalse(m.HasField('oneof_nested_message'))
-
-    m.oneof_nested_message.bb = 11
-    self.assertEqual('oneof_nested_message', m.WhichOneof('oneof_field'))
-    self.assertFalse(m.HasField('oneof_string'))
-    self.assertTrue(m.HasField('oneof_nested_message'))
-
-    m.oneof_bytes = b'bb'
-    self.assertEqual('oneof_bytes', m.WhichOneof('oneof_field'))
-    self.assertFalse(m.HasField('oneof_nested_message'))
-    self.assertTrue(m.HasField('oneof_bytes'))
-
-  def testOneofCompositeFieldReadAccess(self, message_module):
-    m = message_module.TestAllTypes()
-    m.oneof_uint32 = 11
-
-    self.ensureNestedMessageExists(m, 'oneof_nested_message')
-    self.assertEqual('oneof_uint32', m.WhichOneof('oneof_field'))
-    self.assertEqual(11, m.oneof_uint32)
-
-  def testOneofWhichOneof(self, message_module):
-    m = message_module.TestAllTypes()
-    self.assertIs(None, m.WhichOneof('oneof_field'))
-    if message_module is unittest_pb2:
-      self.assertFalse(m.HasField('oneof_field'))
-
-    m.oneof_uint32 = 11
-    self.assertEqual('oneof_uint32', m.WhichOneof('oneof_field'))
-    if message_module is unittest_pb2:
-      self.assertTrue(m.HasField('oneof_field'))
-
-    m.oneof_bytes = b'bb'
-    self.assertEqual('oneof_bytes', m.WhichOneof('oneof_field'))
-
-    m.ClearField('oneof_bytes')
-    self.assertIs(None, m.WhichOneof('oneof_field'))
-    if message_module is unittest_pb2:
-      self.assertFalse(m.HasField('oneof_field'))
-
-  def testOneofClearField(self, message_module):
-    m = message_module.TestAllTypes()
-    m.oneof_uint32 = 11
-    m.ClearField('oneof_field')
-    if message_module is unittest_pb2:
-      self.assertFalse(m.HasField('oneof_field'))
-    self.assertFalse(m.HasField('oneof_uint32'))
-    self.assertIs(None, m.WhichOneof('oneof_field'))
-
-  def testOneofClearSetField(self, message_module):
-    m = message_module.TestAllTypes()
-    m.oneof_uint32 = 11
-    m.ClearField('oneof_uint32')
-    if message_module is unittest_pb2:
-      self.assertFalse(m.HasField('oneof_field'))
-    self.assertFalse(m.HasField('oneof_uint32'))
-    self.assertIs(None, m.WhichOneof('oneof_field'))
-
-  def testOneofClearUnsetField(self, message_module):
-    m = message_module.TestAllTypes()
-    m.oneof_uint32 = 11
-    self.ensureNestedMessageExists(m, 'oneof_nested_message')
-    m.ClearField('oneof_nested_message')
-    self.assertEqual(11, m.oneof_uint32)
-    if message_module is unittest_pb2:
-      self.assertTrue(m.HasField('oneof_field'))
-    self.assertTrue(m.HasField('oneof_uint32'))
-    self.assertEqual('oneof_uint32', m.WhichOneof('oneof_field'))
-
-  def testOneofDeserialize(self, message_module):
-    m = message_module.TestAllTypes()
-    m.oneof_uint32 = 11
-    m2 = message_module.TestAllTypes()
-    m2.ParseFromString(m.SerializeToString())
-    self.assertEqual('oneof_uint32', m2.WhichOneof('oneof_field'))
-
-  def testOneofCopyFrom(self, message_module):
-    m = message_module.TestAllTypes()
-    m.oneof_uint32 = 11
-    m2 = message_module.TestAllTypes()
-    m2.CopyFrom(m)
-    self.assertEqual('oneof_uint32', m2.WhichOneof('oneof_field'))
-
-  def testOneofNestedMergeFrom(self, message_module):
-    m = message_module.NestedTestAllTypes()
-    m.payload.oneof_uint32 = 11
-    m2 = message_module.NestedTestAllTypes()
-    m2.payload.oneof_bytes = b'bb'
-    m2.child.payload.oneof_bytes = b'bb'
-    m2.MergeFrom(m)
-    self.assertEqual('oneof_uint32', m2.payload.WhichOneof('oneof_field'))
-    self.assertEqual('oneof_bytes', m2.child.payload.WhichOneof('oneof_field'))
-
-  def testOneofMessageMergeFrom(self, message_module):
-    m = message_module.NestedTestAllTypes()
-    m.payload.oneof_nested_message.bb = 11
-    m.child.payload.oneof_nested_message.bb = 12
-    m2 = message_module.NestedTestAllTypes()
-    m2.payload.oneof_uint32 = 13
-    m2.MergeFrom(m)
-    self.assertEqual('oneof_nested_message',
-                     m2.payload.WhichOneof('oneof_field'))
-    self.assertEqual('oneof_nested_message',
-                     m2.child.payload.WhichOneof('oneof_field'))
-
-  def testOneofNestedMessageInit(self, message_module):
-    m = message_module.TestAllTypes(
-        oneof_nested_message=message_module.TestAllTypes.NestedMessage())
-    self.assertEqual('oneof_nested_message', m.WhichOneof('oneof_field'))
-
-  def testOneofClear(self, message_module):
-    m = message_module.TestAllTypes()
-    m.oneof_uint32 = 11
-    m.Clear()
-    self.assertIsNone(m.WhichOneof('oneof_field'))
-    m.oneof_bytes = b'bb'
-    self.assertEqual('oneof_bytes', m.WhichOneof('oneof_field'))
-
-  def testAssignByteStringToUnicodeField(self, message_module):
-    """Assigning a byte string to a string field should result
-
-    in the value being converted to a Unicode string.
-    """
-    m = message_module.TestAllTypes()
-    m.optional_string = str('')
-    self.assertIsInstance(m.optional_string, str)
-
-  def testLongValuedSlice(self, message_module):
-    """It should be possible to use int-valued indices in slices.
-
-    This didn't used to work in the v2 C++ implementation.
-    """
-    m = message_module.TestAllTypes()
-
-    # Repeated scalar
-    m.repeated_int32.append(1)
-    sl = m.repeated_int32[int(0):int(len(m.repeated_int32))]
-    self.assertEqual(len(m.repeated_int32), len(sl))
-
-    # Repeated composite
-    m.repeated_nested_message.add().bb = 3
-    sl = m.repeated_nested_message[int(0):int(len(m.repeated_nested_message))]
-    self.assertEqual(len(m.repeated_nested_message), len(sl))
-
-  def testExtendShouldNotSwallowExceptions(self, message_module):
-    """This didn't use to work in the v2 C++ implementation."""
-    m = message_module.TestAllTypes()
-    with self.assertRaises(NameError) as _:
-      m.repeated_int32.extend(a for i in range(10))  # pylint: disable=undefined-variable
-    with self.assertRaises(NameError) as _:
-      m.repeated_nested_enum.extend(a for i in range(10))  # pylint: disable=undefined-variable
-
-  FALSY_VALUES = [None, False, 0, 0.0, b'', u'', bytearray(), [], {}, set()]
-
-  def testExtendInt32WithNothing(self, message_module):
-    """Test no-ops extending repeated int32 fields."""
-    m = message_module.TestAllTypes()
-    self.assertSequenceEqual([], m.repeated_int32)
-
-    # TODO(ptucker): Deprecate this behavior. b/18413862
-    for falsy_value in MessageTest.FALSY_VALUES:
-      m.repeated_int32.extend(falsy_value)
-      self.assertSequenceEqual([], m.repeated_int32)
-
-    m.repeated_int32.extend([])
-    self.assertSequenceEqual([], m.repeated_int32)
-
-  def testExtendFloatWithNothing(self, message_module):
-    """Test no-ops extending repeated float fields."""
-    m = message_module.TestAllTypes()
-    self.assertSequenceEqual([], m.repeated_float)
-
-    # TODO(ptucker): Deprecate this behavior. b/18413862
-    for falsy_value in MessageTest.FALSY_VALUES:
-      m.repeated_float.extend(falsy_value)
-      self.assertSequenceEqual([], m.repeated_float)
-
-    m.repeated_float.extend([])
-    self.assertSequenceEqual([], m.repeated_float)
-
-  def testExtendStringWithNothing(self, message_module):
-    """Test no-ops extending repeated string fields."""
-    m = message_module.TestAllTypes()
-    self.assertSequenceEqual([], m.repeated_string)
-
-    # TODO(ptucker): Deprecate this behavior. b/18413862
-    for falsy_value in MessageTest.FALSY_VALUES:
-      m.repeated_string.extend(falsy_value)
-      self.assertSequenceEqual([], m.repeated_string)
-
-    m.repeated_string.extend([])
-    self.assertSequenceEqual([], m.repeated_string)
-
-  def testExtendInt32WithPythonList(self, message_module):
-    """Test extending repeated int32 fields with python lists."""
-    m = message_module.TestAllTypes()
-    self.assertSequenceEqual([], m.repeated_int32)
-    m.repeated_int32.extend([0])
-    self.assertSequenceEqual([0], m.repeated_int32)
-    m.repeated_int32.extend([1, 2])
-    self.assertSequenceEqual([0, 1, 2], m.repeated_int32)
-    m.repeated_int32.extend([3, 4])
-    self.assertSequenceEqual([0, 1, 2, 3, 4], m.repeated_int32)
-
-  def testExtendFloatWithPythonList(self, message_module):
-    """Test extending repeated float fields with python lists."""
-    m = message_module.TestAllTypes()
-    self.assertSequenceEqual([], m.repeated_float)
-    m.repeated_float.extend([0.0])
-    self.assertSequenceEqual([0.0], m.repeated_float)
-    m.repeated_float.extend([1.0, 2.0])
-    self.assertSequenceEqual([0.0, 1.0, 2.0], m.repeated_float)
-    m.repeated_float.extend([3.0, 4.0])
-    self.assertSequenceEqual([0.0, 1.0, 2.0, 3.0, 4.0], m.repeated_float)
-
-  def testExtendStringWithPythonList(self, message_module):
-    """Test extending repeated string fields with python lists."""
-    m = message_module.TestAllTypes()
-    self.assertSequenceEqual([], m.repeated_string)
-    m.repeated_string.extend([''])
-    self.assertSequenceEqual([''], m.repeated_string)
-    m.repeated_string.extend(['11', '22'])
-    self.assertSequenceEqual(['', '11', '22'], m.repeated_string)
-    m.repeated_string.extend(['33', '44'])
-    self.assertSequenceEqual(['', '11', '22', '33', '44'], m.repeated_string)
-
-  def testExtendStringWithString(self, message_module):
-    """Test extending repeated string fields with characters from a string."""
-    m = message_module.TestAllTypes()
-    self.assertSequenceEqual([], m.repeated_string)
-    m.repeated_string.extend('abc')
-    self.assertSequenceEqual(['a', 'b', 'c'], m.repeated_string)
-
-  class TestIterable(object):
-    """This iterable object mimics the behavior of numpy.array.
-
-    __nonzero__ fails for length > 1, and returns bool(item[0]) for length == 1.
-
-    """
-
-    def __init__(self, values=None):
-      self._list = values or []
-
-    def __nonzero__(self):
-      size = len(self._list)
-      if size == 0:
-        return False
-      if size == 1:
-        return bool(self._list[0])
-      raise ValueError('Truth value is ambiguous.')
-
-    def __len__(self):
-      return len(self._list)
-
-    def __iter__(self):
-      return self._list.__iter__()
-
-  def testExtendInt32WithIterable(self, message_module):
-    """Test extending repeated int32 fields with iterable."""
-    m = message_module.TestAllTypes()
-    self.assertSequenceEqual([], m.repeated_int32)
-    m.repeated_int32.extend(MessageTest.TestIterable([]))
-    self.assertSequenceEqual([], m.repeated_int32)
-    m.repeated_int32.extend(MessageTest.TestIterable([0]))
-    self.assertSequenceEqual([0], m.repeated_int32)
-    m.repeated_int32.extend(MessageTest.TestIterable([1, 2]))
-    self.assertSequenceEqual([0, 1, 2], m.repeated_int32)
-    m.repeated_int32.extend(MessageTest.TestIterable([3, 4]))
-    self.assertSequenceEqual([0, 1, 2, 3, 4], m.repeated_int32)
-
-  def testExtendFloatWithIterable(self, message_module):
-    """Test extending repeated float fields with iterable."""
-    m = message_module.TestAllTypes()
-    self.assertSequenceEqual([], m.repeated_float)
-    m.repeated_float.extend(MessageTest.TestIterable([]))
-    self.assertSequenceEqual([], m.repeated_float)
-    m.repeated_float.extend(MessageTest.TestIterable([0.0]))
-    self.assertSequenceEqual([0.0], m.repeated_float)
-    m.repeated_float.extend(MessageTest.TestIterable([1.0, 2.0]))
-    self.assertSequenceEqual([0.0, 1.0, 2.0], m.repeated_float)
-    m.repeated_float.extend(MessageTest.TestIterable([3.0, 4.0]))
-    self.assertSequenceEqual([0.0, 1.0, 2.0, 3.0, 4.0], m.repeated_float)
-
-  def testExtendStringWithIterable(self, message_module):
-    """Test extending repeated string fields with iterable."""
-    m = message_module.TestAllTypes()
-    self.assertSequenceEqual([], m.repeated_string)
-    m.repeated_string.extend(MessageTest.TestIterable([]))
-    self.assertSequenceEqual([], m.repeated_string)
-    m.repeated_string.extend(MessageTest.TestIterable(['']))
-    self.assertSequenceEqual([''], m.repeated_string)
-    m.repeated_string.extend(MessageTest.TestIterable(['1', '2']))
-    self.assertSequenceEqual(['', '1', '2'], m.repeated_string)
-    m.repeated_string.extend(MessageTest.TestIterable(['3', '4']))
-    self.assertSequenceEqual(['', '1', '2', '3', '4'], m.repeated_string)
-
-  class TestIndex(object):
-    """This index object mimics the behavior of numpy.int64 and other types."""
-
-    def __init__(self, value=None):
-      self.value = value
-
-    def __index__(self):
-      return self.value
-
-  def testRepeatedIndexingWithIntIndex(self, message_module):
-    msg = message_module.TestAllTypes()
-    msg.repeated_int32.extend([1, 2, 3])
-    self.assertEqual(1, msg.repeated_int32[MessageTest.TestIndex(0)])
-
-  def testRepeatedIndexingWithNegative1IntIndex(self, message_module):
-    msg = message_module.TestAllTypes()
-    msg.repeated_int32.extend([1, 2, 3])
-    self.assertEqual(3, msg.repeated_int32[MessageTest.TestIndex(-1)])
-
-  def testRepeatedIndexingWithNegative1Int(self, message_module):
-    msg = message_module.TestAllTypes()
-    msg.repeated_int32.extend([1, 2, 3])
-    self.assertEqual(3, msg.repeated_int32[-1])
-
-  def testPickleRepeatedScalarContainer(self, message_module):
-    # Pickle repeated scalar container is not supported.
-    m = message_module.TestAllTypes()
-    with self.assertRaises(pickle.PickleError) as _:
-      pickle.dumps(m.repeated_int32, pickle.HIGHEST_PROTOCOL)
-
-  def testSortEmptyRepeatedCompositeContainer(self, message_module):
-    """Exercise a scenario that has led to segfaults in the past."""
-    m = message_module.TestAllTypes()
-    m.repeated_nested_message.sort()
-
-  def testHasFieldOnRepeatedField(self, message_module):
-    """Using HasField on a repeated field should raise an exception."""
-    m = message_module.TestAllTypes()
-    with self.assertRaises(ValueError) as _:
-      m.HasField('repeated_int32')
-
-  def testRepeatedScalarFieldPop(self, message_module):
-    m = message_module.TestAllTypes()
-    with self.assertRaises(IndexError) as _:
-      m.repeated_int32.pop()
-    m.repeated_int32.extend(range(5))
-    self.assertEqual(4, m.repeated_int32.pop())
-    self.assertEqual(0, m.repeated_int32.pop(0))
-    self.assertEqual(2, m.repeated_int32.pop(1))
-    self.assertEqual([1, 3], m.repeated_int32)
-
-  def testRepeatedCompositeFieldPop(self, message_module):
-    m = message_module.TestAllTypes()
-    with self.assertRaises(IndexError) as _:
-      m.repeated_nested_message.pop()
-    with self.assertRaises(TypeError) as _:
-      m.repeated_nested_message.pop('0')
-    for i in range(5):
-      n = m.repeated_nested_message.add()
-      n.bb = i
-    self.assertEqual(4, m.repeated_nested_message.pop().bb)
-    self.assertEqual(0, m.repeated_nested_message.pop(0).bb)
-    self.assertEqual(2, m.repeated_nested_message.pop(1).bb)
-    self.assertEqual([1, 3], [n.bb for n in m.repeated_nested_message])
-
-  def testRepeatedCompareWithSelf(self, message_module):
-    m = message_module.TestAllTypes()
-    for i in range(5):
-      m.repeated_int32.insert(i, i)
-      n = m.repeated_nested_message.add()
-      n.bb = i
-    self.assertSequenceEqual(m.repeated_int32, m.repeated_int32)
-    self.assertEqual(m.repeated_nested_message, m.repeated_nested_message)
-
-  def testReleasedNestedMessages(self, message_module):
-    """A case that lead to a segfault when a message detached from its parent
-
-    container has itself a child container.
-    """
-    m = message_module.NestedTestAllTypes()
-    m = m.repeated_child.add()
-    m = m.child
-    m = m.repeated_child.add()
-    self.assertEqual(m.payload.optional_int32, 0)
-
-  def testSetRepeatedComposite(self, message_module):
-    m = message_module.TestAllTypes()
-    with self.assertRaises(AttributeError):
-      m.repeated_int32 = []
-    m.repeated_int32.append(1)
-    with self.assertRaises(AttributeError):
-      m.repeated_int32 = []
-
-  def testReturningType(self, message_module):
-    m = message_module.TestAllTypes()
-    self.assertEqual(float, type(m.optional_float))
-    self.assertEqual(float, type(m.optional_double))
-    self.assertEqual(bool, type(m.optional_bool))
-    m.optional_float = 1
-    m.optional_double = 1
-    m.optional_bool = 1
-    m.repeated_float.append(1)
-    m.repeated_double.append(1)
-    m.repeated_bool.append(1)
-    m.ParseFromString(m.SerializeToString())
-    self.assertEqual(float, type(m.optional_float))
-    self.assertEqual(float, type(m.optional_double))
-    self.assertEqual('1.0', str(m.optional_double))
-    self.assertEqual(bool, type(m.optional_bool))
-    self.assertEqual(float, type(m.repeated_float[0]))
-    self.assertEqual(float, type(m.repeated_double[0]))
-    self.assertEqual(bool, type(m.repeated_bool[0]))
-    self.assertEqual(True, m.repeated_bool[0])
-
-
-# Class to test proto2-only features (required, extensions, etc.)
-@testing_refleaks.TestCase
-class Proto2Test(unittest.TestCase):
-
-  def testFieldPresence(self):
-    message = unittest_pb2.TestAllTypes()
-
-    self.assertFalse(message.HasField('optional_int32'))
-    self.assertFalse(message.HasField('optional_bool'))
-    self.assertFalse(message.HasField('optional_nested_message'))
-
-    with self.assertRaises(ValueError):
-      message.HasField('field_doesnt_exist')
-
-    with self.assertRaises(ValueError):
-      message.HasField('repeated_int32')
-    with self.assertRaises(ValueError):
-      message.HasField('repeated_nested_message')
-
-    self.assertEqual(0, message.optional_int32)
-    self.assertEqual(False, message.optional_bool)
-    self.assertEqual(0, message.optional_nested_message.bb)
-
-    # Fields are set even when setting the values to default values.
-    message.optional_int32 = 0
-    message.optional_bool = False
-    message.optional_nested_message.bb = 0
-    self.assertTrue(message.HasField('optional_int32'))
-    self.assertTrue(message.HasField('optional_bool'))
-    self.assertTrue(message.HasField('optional_nested_message'))
-
-    # Set the fields to non-default values.
-    message.optional_int32 = 5
-    message.optional_bool = True
-    message.optional_nested_message.bb = 15
-
-    self.assertTrue(message.HasField(u'optional_int32'))
-    self.assertTrue(message.HasField('optional_bool'))
-    self.assertTrue(message.HasField('optional_nested_message'))
-
-    # Clearing the fields unsets them and resets their value to default.
-    message.ClearField('optional_int32')
-    message.ClearField(u'optional_bool')
-    message.ClearField('optional_nested_message')
-
-    self.assertFalse(message.HasField('optional_int32'))
-    self.assertFalse(message.HasField('optional_bool'))
-    self.assertFalse(message.HasField('optional_nested_message'))
-    self.assertEqual(0, message.optional_int32)
-    self.assertEqual(False, message.optional_bool)
-    self.assertEqual(0, message.optional_nested_message.bb)
-
-  def testAssignInvalidEnum(self):
-    """Assigning an invalid enum number is not allowed in proto2."""
-    m = unittest_pb2.TestAllTypes()
-
-    # Proto2 can not assign unknown enum.
-    with self.assertRaises(ValueError) as _:
-      m.optional_nested_enum = 1234567
-    self.assertRaises(ValueError, m.repeated_nested_enum.append, 1234567)
-    # Assignment is a different code path than append for the C++ impl.
-    m.repeated_nested_enum.append(2)
-    m.repeated_nested_enum[0] = 2
-    with self.assertRaises(ValueError):
-      m.repeated_nested_enum[0] = 123456
-
-    # Unknown enum value can be parsed but is ignored.
-    m2 = unittest_proto3_arena_pb2.TestAllTypes()
-    m2.optional_nested_enum = 1234567
-    m2.repeated_nested_enum.append(7654321)
-    serialized = m2.SerializeToString()
-
-    m3 = unittest_pb2.TestAllTypes()
-    m3.ParseFromString(serialized)
-    self.assertFalse(m3.HasField('optional_nested_enum'))
-    # 1 is the default value for optional_nested_enum.
-    self.assertEqual(1, m3.optional_nested_enum)
-    self.assertEqual(0, len(m3.repeated_nested_enum))
-    m2.Clear()
-    m2.ParseFromString(m3.SerializeToString())
-    self.assertEqual(1234567, m2.optional_nested_enum)
-    self.assertEqual(7654321, m2.repeated_nested_enum[0])
-
-  def testUnknownEnumMap(self):
-    m = map_proto2_unittest_pb2.TestEnumMap()
-    m.known_map_field[123] = 0
-    with self.assertRaises(ValueError):
-      m.unknown_map_field[1] = 123
-
-  def testExtensionsErrors(self):
-    msg = unittest_pb2.TestAllTypes()
-    self.assertRaises(AttributeError, getattr, msg, 'Extensions')
-
-  def testMergeFromExtensions(self):
-    msg1 = more_extensions_pb2.TopLevelMessage()
-    msg2 = more_extensions_pb2.TopLevelMessage()
-    # Cpp extension will lazily create a sub message which is immutable.
-    self.assertEqual(
-        0,
-        msg1.submessage.Extensions[more_extensions_pb2.optional_int_extension])
-    self.assertFalse(msg1.HasField('submessage'))
-    msg2.submessage.Extensions[more_extensions_pb2.optional_int_extension] = 123
-    # Make sure cmessage and extensions pointing to a mutable message
-    # after merge instead of the lazily created message.
-    msg1.MergeFrom(msg2)
-    self.assertEqual(
-        123,
-        msg1.submessage.Extensions[more_extensions_pb2.optional_int_extension])
-
-  def testGoldenExtensions(self):
-    golden_data = test_util.GoldenFileData('golden_message')
-    golden_message = unittest_pb2.TestAllExtensions()
-    golden_message.ParseFromString(golden_data)
-    all_set = unittest_pb2.TestAllExtensions()
-    test_util.SetAllExtensions(all_set)
-    self.assertEqual(all_set, golden_message)
-    self.assertEqual(golden_data, golden_message.SerializeToString())
-    golden_copy = copy.deepcopy(golden_message)
-    self.assertEqual(golden_data, golden_copy.SerializeToString())
-
-  def testGoldenPackedExtensions(self):
-    golden_data = test_util.GoldenFileData('golden_packed_fields_message')
-    golden_message = unittest_pb2.TestPackedExtensions()
-    golden_message.ParseFromString(golden_data)
-    all_set = unittest_pb2.TestPackedExtensions()
-    test_util.SetAllPackedExtensions(all_set)
-    self.assertEqual(all_set, golden_message)
-    self.assertEqual(golden_data, all_set.SerializeToString())
-    golden_copy = copy.deepcopy(golden_message)
-    self.assertEqual(golden_data, golden_copy.SerializeToString())
-
-  def testPickleIncompleteProto(self):
-    golden_message = unittest_pb2.TestRequired(a=1)
-    pickled_message = pickle.dumps(golden_message)
-
-    unpickled_message = pickle.loads(pickled_message)
-    self.assertEqual(unpickled_message, golden_message)
-    self.assertEqual(unpickled_message.a, 1)
-    # This is still an incomplete proto - so serializing should fail
-    self.assertRaises(message.EncodeError, unpickled_message.SerializeToString)
-
-  # TODO(haberman): this isn't really a proto2-specific test except that this
-  # message has a required field in it.  Should probably be factored out so
-  # that we can test the other parts with proto3.
-  def testParsingMerge(self):
-    """Check the merge behavior when a required or optional field appears
-
-    multiple times in the input.
-    """
-    messages = [
-        unittest_pb2.TestAllTypes(),
-        unittest_pb2.TestAllTypes(),
-        unittest_pb2.TestAllTypes()
-    ]
-    messages[0].optional_int32 = 1
-    messages[1].optional_int64 = 2
-    messages[2].optional_int32 = 3
-    messages[2].optional_string = 'hello'
-
-    merged_message = unittest_pb2.TestAllTypes()
-    merged_message.optional_int32 = 3
-    merged_message.optional_int64 = 2
-    merged_message.optional_string = 'hello'
-
-    generator = unittest_pb2.TestParsingMerge.RepeatedFieldsGenerator()
-    generator.field1.extend(messages)
-    generator.field2.extend(messages)
-    generator.field3.extend(messages)
-    generator.ext1.extend(messages)
-    generator.ext2.extend(messages)
-    generator.group1.add().field1.MergeFrom(messages[0])
-    generator.group1.add().field1.MergeFrom(messages[1])
-    generator.group1.add().field1.MergeFrom(messages[2])
-    generator.group2.add().field1.MergeFrom(messages[0])
-    generator.group2.add().field1.MergeFrom(messages[1])
-    generator.group2.add().field1.MergeFrom(messages[2])
-
-    data = generator.SerializeToString()
-    parsing_merge = unittest_pb2.TestParsingMerge()
-    parsing_merge.ParseFromString(data)
-
-    # Required and optional fields should be merged.
-    self.assertEqual(parsing_merge.required_all_types, merged_message)
-    self.assertEqual(parsing_merge.optional_all_types, merged_message)
-    self.assertEqual(parsing_merge.optionalgroup.optional_group_all_types,
-                     merged_message)
-    self.assertEqual(
-        parsing_merge.Extensions[unittest_pb2.TestParsingMerge.optional_ext],
-        merged_message)
-
-    # Repeated fields should not be merged.
-    self.assertEqual(len(parsing_merge.repeated_all_types), 3)
-    self.assertEqual(len(parsing_merge.repeatedgroup), 3)
-    self.assertEqual(
-        len(parsing_merge.Extensions[
-            unittest_pb2.TestParsingMerge.repeated_ext]), 3)
-
-  def testPythonicInit(self):
-    message = unittest_pb2.TestAllTypes(
-        optional_int32=100,
-        optional_fixed32=200,
-        optional_float=300.5,
-        optional_bytes=b'x',
-        optionalgroup={'a': 400},
-        optional_nested_message={'bb': 500},
-        optional_foreign_message={},
-        optional_nested_enum='BAZ',
-        repeatedgroup=[{
-            'a': 600
-        }, {
-            'a': 700
-        }],
-        repeated_nested_enum=['FOO', unittest_pb2.TestAllTypes.BAR],
-        default_int32=800,
-        oneof_string='y')
-    self.assertIsInstance(message, unittest_pb2.TestAllTypes)
-    self.assertEqual(100, message.optional_int32)
-    self.assertEqual(200, message.optional_fixed32)
-    self.assertEqual(300.5, message.optional_float)
-    self.assertEqual(b'x', message.optional_bytes)
-    self.assertEqual(400, message.optionalgroup.a)
-    self.assertIsInstance(message.optional_nested_message,
-                          unittest_pb2.TestAllTypes.NestedMessage)
-    self.assertEqual(500, message.optional_nested_message.bb)
-    self.assertTrue(message.HasField('optional_foreign_message'))
-    self.assertEqual(message.optional_foreign_message,
-                     unittest_pb2.ForeignMessage())
-    self.assertEqual(unittest_pb2.TestAllTypes.BAZ,
-                     message.optional_nested_enum)
-    self.assertEqual(2, len(message.repeatedgroup))
-    self.assertEqual(600, message.repeatedgroup[0].a)
-    self.assertEqual(700, message.repeatedgroup[1].a)
-    self.assertEqual(2, len(message.repeated_nested_enum))
-    self.assertEqual(unittest_pb2.TestAllTypes.FOO,
-                     message.repeated_nested_enum[0])
-    self.assertEqual(unittest_pb2.TestAllTypes.BAR,
-                     message.repeated_nested_enum[1])
-    self.assertEqual(800, message.default_int32)
-    self.assertEqual('y', message.oneof_string)
-    self.assertFalse(message.HasField('optional_int64'))
-    self.assertEqual(0, len(message.repeated_float))
-    self.assertEqual(42, message.default_int64)
-
-    message = unittest_pb2.TestAllTypes(optional_nested_enum=u'BAZ')
-    self.assertEqual(unittest_pb2.TestAllTypes.BAZ,
-                     message.optional_nested_enum)
-
-    with self.assertRaises(ValueError):
-      unittest_pb2.TestAllTypes(
-          optional_nested_message={'INVALID_NESTED_FIELD': 17})
-
-    with self.assertRaises(TypeError):
-      unittest_pb2.TestAllTypes(
-          optional_nested_message={'bb': 'INVALID_VALUE_TYPE'})
-
-    with self.assertRaises(ValueError):
-      unittest_pb2.TestAllTypes(optional_nested_enum='INVALID_LABEL')
-
-    with self.assertRaises(ValueError):
-      unittest_pb2.TestAllTypes(repeated_nested_enum='FOO')
-
-  def testPythonicInitWithDict(self):
-    # Both string/unicode field name keys should work.
-    kwargs = {
-        'optional_int32': 100,
-        u'optional_fixed32': 200,
-    }
-    msg = unittest_pb2.TestAllTypes(**kwargs)
-    self.assertEqual(100, msg.optional_int32)
-    self.assertEqual(200, msg.optional_fixed32)
-
-
-  def test_documentation(self):
-    # Also used by the interactive help() function.
-    doc = pydoc.html.document(unittest_pb2.TestAllTypes, 'message')
-    self.assertIn('class TestAllTypes', doc)
-    self.assertIn('SerializePartialToString', doc)
-    self.assertIn('repeated_float', doc)
-    base = unittest_pb2.TestAllTypes.__bases__[0]
-    self.assertRaises(AttributeError, getattr, base, '_extensions_by_name')
-
-
-# Class to test proto3-only features/behavior (updated field presence & enums)
-@testing_refleaks.TestCase
-class Proto3Test(unittest.TestCase):
-
-  # Utility method for comparing equality with a map.
-  def assertMapIterEquals(self, map_iter, dict_value):
-    # Avoid mutating caller's copy.
-    dict_value = dict(dict_value)
-
-    for k, v in map_iter:
-      self.assertEqual(v, dict_value[k])
-      del dict_value[k]
-
-    self.assertEqual({}, dict_value)
-
-  def testFieldPresence(self):
-    message = unittest_proto3_arena_pb2.TestAllTypes()
-
-    # We can't test presence of non-repeated, non-submessage fields.
-    with self.assertRaises(ValueError):
-      message.HasField('optional_int32')
-    with self.assertRaises(ValueError):
-      message.HasField('optional_float')
-    with self.assertRaises(ValueError):
-      message.HasField('optional_string')
-    with self.assertRaises(ValueError):
-      message.HasField('optional_bool')
-
-    # But we can still test presence of submessage fields.
-    self.assertFalse(message.HasField('optional_nested_message'))
-
-    # As with proto2, we can't test presence of fields that don't exist, or
-    # repeated fields.
-    with self.assertRaises(ValueError):
-      message.HasField('field_doesnt_exist')
-
-    with self.assertRaises(ValueError):
-      message.HasField('repeated_int32')
-    with self.assertRaises(ValueError):
-      message.HasField('repeated_nested_message')
-
-    # Fields should default to their type-specific default.
-    self.assertEqual(0, message.optional_int32)
-    self.assertEqual(0, message.optional_float)
-    self.assertEqual('', message.optional_string)
-    self.assertEqual(False, message.optional_bool)
-    self.assertEqual(0, message.optional_nested_message.bb)
-
-    # Setting a submessage should still return proper presence information.
-    message.optional_nested_message.bb = 0
-    self.assertTrue(message.HasField('optional_nested_message'))
-
-    # Set the fields to non-default values.
-    message.optional_int32 = 5
-    message.optional_float = 1.1
-    message.optional_string = 'abc'
-    message.optional_bool = True
-    message.optional_nested_message.bb = 15
-
-    # Clearing the fields unsets them and resets their value to default.
-    message.ClearField('optional_int32')
-    message.ClearField('optional_float')
-    message.ClearField('optional_string')
-    message.ClearField('optional_bool')
-    message.ClearField('optional_nested_message')
-
-    self.assertEqual(0, message.optional_int32)
-    self.assertEqual(0, message.optional_float)
-    self.assertEqual('', message.optional_string)
-    self.assertEqual(False, message.optional_bool)
-    self.assertEqual(0, message.optional_nested_message.bb)
-
-  def testProto3ParserDropDefaultScalar(self):
-    message_proto2 = unittest_pb2.TestAllTypes()
-    message_proto2.optional_int32 = 0
-    message_proto2.optional_string = ''
-    message_proto2.optional_bytes = b''
-    self.assertEqual(len(message_proto2.ListFields()), 3)
-
-    message_proto3 = unittest_proto3_arena_pb2.TestAllTypes()
-    message_proto3.ParseFromString(message_proto2.SerializeToString())
-    self.assertEqual(len(message_proto3.ListFields()), 0)
-
-  def testProto3Optional(self):
-    msg = test_proto3_optional_pb2.TestProto3Optional()
-    self.assertFalse(msg.HasField('optional_int32'))
-    self.assertFalse(msg.HasField('optional_float'))
-    self.assertFalse(msg.HasField('optional_string'))
-    self.assertFalse(msg.HasField('optional_nested_message'))
-    self.assertFalse(msg.optional_nested_message.HasField('bb'))
-
-    # Set fields.
-    msg.optional_int32 = 1
-    msg.optional_float = 1.0
-    msg.optional_string = '123'
-    msg.optional_nested_message.bb = 1
-    self.assertTrue(msg.HasField('optional_int32'))
-    self.assertTrue(msg.HasField('optional_float'))
-    self.assertTrue(msg.HasField('optional_string'))
-    self.assertTrue(msg.HasField('optional_nested_message'))
-    self.assertTrue(msg.optional_nested_message.HasField('bb'))
-    # Set to default value does not clear the fields
-    msg.optional_int32 = 0
-    msg.optional_float = 0.0
-    msg.optional_string = ''
-    msg.optional_nested_message.bb = 0
-    self.assertTrue(msg.HasField('optional_int32'))
-    self.assertTrue(msg.HasField('optional_float'))
-    self.assertTrue(msg.HasField('optional_string'))
-    self.assertTrue(msg.HasField('optional_nested_message'))
-    self.assertTrue(msg.optional_nested_message.HasField('bb'))
-
-    # Test serialize
-    msg2 = test_proto3_optional_pb2.TestProto3Optional()
-    msg2.ParseFromString(msg.SerializeToString())
-    self.assertTrue(msg2.HasField('optional_int32'))
-    self.assertTrue(msg2.HasField('optional_float'))
-    self.assertTrue(msg2.HasField('optional_string'))
-    self.assertTrue(msg2.HasField('optional_nested_message'))
-    self.assertTrue(msg2.optional_nested_message.HasField('bb'))
-
-    self.assertEqual(msg.WhichOneof('_optional_int32'), 'optional_int32')
-
-    # Clear these fields.
-    msg.ClearField('optional_int32')
-    msg.ClearField('optional_float')
-    msg.ClearField('optional_string')
-    msg.ClearField('optional_nested_message')
-    self.assertFalse(msg.HasField('optional_int32'))
-    self.assertFalse(msg.HasField('optional_float'))
-    self.assertFalse(msg.HasField('optional_string'))
-    self.assertFalse(msg.HasField('optional_nested_message'))
-    self.assertFalse(msg.optional_nested_message.HasField('bb'))
-
-    self.assertEqual(msg.WhichOneof('_optional_int32'), None)
-
-    # Test has presence:
-    for field in test_proto3_optional_pb2.TestProto3Optional.DESCRIPTOR.fields:
-      self.assertTrue(field.has_presence)
-    for field in unittest_pb2.TestAllTypes.DESCRIPTOR.fields:
-      if field.label == descriptor.FieldDescriptor.LABEL_REPEATED:
-        self.assertFalse(field.has_presence)
-      else:
-        self.assertTrue(field.has_presence)
-    proto3_descriptor = unittest_proto3_arena_pb2.TestAllTypes.DESCRIPTOR
-    repeated_field = proto3_descriptor.fields_by_name['repeated_int32']
-    self.assertFalse(repeated_field.has_presence)
-    singular_field = proto3_descriptor.fields_by_name['optional_int32']
-    self.assertFalse(singular_field.has_presence)
-    optional_field = proto3_descriptor.fields_by_name['proto3_optional_int32']
-    self.assertTrue(optional_field.has_presence)
-    message_field = proto3_descriptor.fields_by_name['optional_nested_message']
-    self.assertTrue(message_field.has_presence)
-    oneof_field = proto3_descriptor.fields_by_name['oneof_uint32']
-    self.assertTrue(oneof_field.has_presence)
-
-  def testAssignUnknownEnum(self):
-    """Assigning an unknown enum value is allowed and preserves the value."""
-    m = unittest_proto3_arena_pb2.TestAllTypes()
-
-    # Proto3 can assign unknown enums.
-    m.optional_nested_enum = 1234567
-    self.assertEqual(1234567, m.optional_nested_enum)
-    m.repeated_nested_enum.append(22334455)
-    self.assertEqual(22334455, m.repeated_nested_enum[0])
-    # Assignment is a different code path than append for the C++ impl.
-    m.repeated_nested_enum[0] = 7654321
-    self.assertEqual(7654321, m.repeated_nested_enum[0])
-    serialized = m.SerializeToString()
-
-    m2 = unittest_proto3_arena_pb2.TestAllTypes()
-    m2.ParseFromString(serialized)
-    self.assertEqual(1234567, m2.optional_nested_enum)
-    self.assertEqual(7654321, m2.repeated_nested_enum[0])
-
-  # Map isn't really a proto3-only feature. But there is no proto2 equivalent
-  # of google/protobuf/map_unittest.proto right now, so it's not easy to
-  # test both with the same test like we do for the other proto2/proto3 tests.
-  # (google/protobuf/map_proto2_unittest.proto is very different in the set
-  # of messages and fields it contains).
-  def testScalarMapDefaults(self):
-    msg = map_unittest_pb2.TestMap()
-
-    # Scalars start out unset.
-    self.assertFalse(-123 in msg.map_int32_int32)
-    self.assertFalse(-2**33 in msg.map_int64_int64)
-    self.assertFalse(123 in msg.map_uint32_uint32)
-    self.assertFalse(2**33 in msg.map_uint64_uint64)
-    self.assertFalse(123 in msg.map_int32_double)
-    self.assertFalse(False in msg.map_bool_bool)
-    self.assertFalse('abc' in msg.map_string_string)
-    self.assertFalse(111 in msg.map_int32_bytes)
-    self.assertFalse(888 in msg.map_int32_enum)
-
-    # Accessing an unset key returns the default.
-    self.assertEqual(0, msg.map_int32_int32[-123])
-    self.assertEqual(0, msg.map_int64_int64[-2**33])
-    self.assertEqual(0, msg.map_uint32_uint32[123])
-    self.assertEqual(0, msg.map_uint64_uint64[2**33])
-    self.assertEqual(0.0, msg.map_int32_double[123])
-    self.assertTrue(isinstance(msg.map_int32_double[123], float))
-    self.assertEqual(False, msg.map_bool_bool[False])
-    self.assertTrue(isinstance(msg.map_bool_bool[False], bool))
-    self.assertEqual('', msg.map_string_string['abc'])
-    self.assertEqual(b'', msg.map_int32_bytes[111])
-    self.assertEqual(0, msg.map_int32_enum[888])
-
-    # It also sets the value in the map
-    self.assertTrue(-123 in msg.map_int32_int32)
-    self.assertTrue(-2**33 in msg.map_int64_int64)
-    self.assertTrue(123 in msg.map_uint32_uint32)
-    self.assertTrue(2**33 in msg.map_uint64_uint64)
-    self.assertTrue(123 in msg.map_int32_double)
-    self.assertTrue(False in msg.map_bool_bool)
-    self.assertTrue('abc' in msg.map_string_string)
-    self.assertTrue(111 in msg.map_int32_bytes)
-    self.assertTrue(888 in msg.map_int32_enum)
-
-    self.assertIsInstance(msg.map_string_string['abc'], str)
-
-    # Accessing an unset key still throws TypeError if the type of the key
-    # is incorrect.
-    with self.assertRaises(TypeError):
-      msg.map_string_string[123]
-
-    with self.assertRaises(TypeError):
-      123 in msg.map_string_string
-
-  def testMapGet(self):
-    # Need to test that get() properly returns the default, even though the dict
-    # has defaultdict-like semantics.
-    msg = map_unittest_pb2.TestMap()
-
-    self.assertIsNone(msg.map_int32_int32.get(5))
-    self.assertEqual(10, msg.map_int32_int32.get(5, 10))
-    self.assertEqual(10, msg.map_int32_int32.get(key=5, default=10))
-    self.assertIsNone(msg.map_int32_int32.get(5))
-
-    msg.map_int32_int32[5] = 15
-    self.assertEqual(15, msg.map_int32_int32.get(5))
-    self.assertEqual(15, msg.map_int32_int32.get(5))
-    with self.assertRaises(TypeError):
-      msg.map_int32_int32.get('')
-
-    self.assertIsNone(msg.map_int32_foreign_message.get(5))
-    self.assertEqual(10, msg.map_int32_foreign_message.get(5, 10))
-    self.assertEqual(10, msg.map_int32_foreign_message.get(key=5, default=10))
-
-    submsg = msg.map_int32_foreign_message[5]
-    self.assertIs(submsg, msg.map_int32_foreign_message.get(5))
-    with self.assertRaises(TypeError):
-      msg.map_int32_foreign_message.get('')
-
-  def testScalarMap(self):
-    msg = map_unittest_pb2.TestMap()
-
-    self.assertEqual(0, len(msg.map_int32_int32))
-    self.assertFalse(5 in msg.map_int32_int32)
-
-    msg.map_int32_int32[-123] = -456
-    msg.map_int64_int64[-2**33] = -2**34
-    msg.map_uint32_uint32[123] = 456
-    msg.map_uint64_uint64[2**33] = 2**34
-    msg.map_int32_float[2] = 1.2
-    msg.map_int32_double[1] = 3.3
-    msg.map_string_string['abc'] = '123'
-    msg.map_bool_bool[True] = True
-    msg.map_int32_enum[888] = 2
-    # Unknown numeric enum is supported in proto3.
-    msg.map_int32_enum[123] = 456
-
-    self.assertEqual([], msg.FindInitializationErrors())
-
-    self.assertEqual(1, len(msg.map_string_string))
-
-    # Bad key.
-    with self.assertRaises(TypeError):
-      msg.map_string_string[123] = '123'
-
-    # Verify that trying to assign a bad key doesn't actually add a member to
-    # the map.
-    self.assertEqual(1, len(msg.map_string_string))
-
-    # Bad value.
-    with self.assertRaises(TypeError):
-      msg.map_string_string['123'] = 123
-
-    serialized = msg.SerializeToString()
-    msg2 = map_unittest_pb2.TestMap()
-    msg2.ParseFromString(serialized)
-
-    # Bad key.
-    with self.assertRaises(TypeError):
-      msg2.map_string_string[123] = '123'
-
-    # Bad value.
-    with self.assertRaises(TypeError):
-      msg2.map_string_string['123'] = 123
-
-    self.assertEqual(-456, msg2.map_int32_int32[-123])
-    self.assertEqual(-2**34, msg2.map_int64_int64[-2**33])
-    self.assertEqual(456, msg2.map_uint32_uint32[123])
-    self.assertEqual(2**34, msg2.map_uint64_uint64[2**33])
-    self.assertAlmostEqual(1.2, msg.map_int32_float[2])
-    self.assertEqual(3.3, msg.map_int32_double[1])
-    self.assertEqual('123', msg2.map_string_string['abc'])
-    self.assertEqual(True, msg2.map_bool_bool[True])
-    self.assertEqual(2, msg2.map_int32_enum[888])
-    self.assertEqual(456, msg2.map_int32_enum[123])
-    self.assertEqual('{-123: -456}', str(msg2.map_int32_int32))
-
-  def testMapEntryAlwaysSerialized(self):
-    msg = map_unittest_pb2.TestMap()
-    msg.map_int32_int32[0] = 0
-    msg.map_string_string[''] = ''
-    self.assertEqual(msg.ByteSize(), 12)
-    self.assertEqual(b'\n\x04\x08\x00\x10\x00r\x04\n\x00\x12\x00',
-                     msg.SerializeToString())
-
-  def testStringUnicodeConversionInMap(self):
-    msg = map_unittest_pb2.TestMap()
-
-    unicode_obj = u'\u1234'
-    bytes_obj = unicode_obj.encode('utf8')
-
-    msg.map_string_string[bytes_obj] = bytes_obj
-
-    (key, value) = list(msg.map_string_string.items())[0]
-
-    self.assertEqual(key, unicode_obj)
-    self.assertEqual(value, unicode_obj)
-
-    self.assertIsInstance(key, str)
-    self.assertIsInstance(value, str)
-
-  def testMessageMap(self):
-    msg = map_unittest_pb2.TestMap()
-
-    self.assertEqual(0, len(msg.map_int32_foreign_message))
-    self.assertFalse(5 in msg.map_int32_foreign_message)
-
-    msg.map_int32_foreign_message[123]
-    # get_or_create() is an alias for getitem.
-    msg.map_int32_foreign_message.get_or_create(-456)
-
-    self.assertEqual(2, len(msg.map_int32_foreign_message))
-    self.assertIn(123, msg.map_int32_foreign_message)
-    self.assertIn(-456, msg.map_int32_foreign_message)
-    self.assertEqual(2, len(msg.map_int32_foreign_message))
-
-    # Bad key.
-    with self.assertRaises(TypeError):
-      msg.map_int32_foreign_message['123']
-
-    # Can't assign directly to submessage.
-    with self.assertRaises(ValueError):
-      msg.map_int32_foreign_message[999] = msg.map_int32_foreign_message[123]
-
-    # Verify that trying to assign a bad key doesn't actually add a member to
-    # the map.
-    self.assertEqual(2, len(msg.map_int32_foreign_message))
-
-    serialized = msg.SerializeToString()
-    msg2 = map_unittest_pb2.TestMap()
-    msg2.ParseFromString(serialized)
-
-    self.assertEqual(2, len(msg2.map_int32_foreign_message))
-    self.assertIn(123, msg2.map_int32_foreign_message)
-    self.assertIn(-456, msg2.map_int32_foreign_message)
-    self.assertEqual(2, len(msg2.map_int32_foreign_message))
-    msg2.map_int32_foreign_message[123].c = 1
-    # TODO(jieluo): Fix text format for message map.
-    self.assertIn(
-        str(msg2.map_int32_foreign_message),
-        ('{-456: , 123: c: 1\n}', '{123: c: 1\n, -456: }'))
-
-  def testNestedMessageMapItemDelete(self):
-    msg = map_unittest_pb2.TestMap()
-    msg.map_int32_all_types[1].optional_nested_message.bb = 1
-    del msg.map_int32_all_types[1]
-    msg.map_int32_all_types[2].optional_nested_message.bb = 2
-    self.assertEqual(1, len(msg.map_int32_all_types))
-    msg.map_int32_all_types[1].optional_nested_message.bb = 1
-    self.assertEqual(2, len(msg.map_int32_all_types))
-
-    serialized = msg.SerializeToString()
-    msg2 = map_unittest_pb2.TestMap()
-    msg2.ParseFromString(serialized)
-    keys = [1, 2]
-    # The loop triggers PyErr_Occurred() in c extension.
-    for key in keys:
-      del msg2.map_int32_all_types[key]
-
-  def testMapByteSize(self):
-    msg = map_unittest_pb2.TestMap()
-    msg.map_int32_int32[1] = 1
-    size = msg.ByteSize()
-    msg.map_int32_int32[1] = 128
-    self.assertEqual(msg.ByteSize(), size + 1)
-
-    msg.map_int32_foreign_message[19].c = 1
-    size = msg.ByteSize()
-    msg.map_int32_foreign_message[19].c = 128
-    self.assertEqual(msg.ByteSize(), size + 1)
-
-  def testMergeFrom(self):
-    msg = map_unittest_pb2.TestMap()
-    msg.map_int32_int32[12] = 34
-    msg.map_int32_int32[56] = 78
-    msg.map_int64_int64[22] = 33
-    msg.map_int32_foreign_message[111].c = 5
-    msg.map_int32_foreign_message[222].c = 10
-
-    msg2 = map_unittest_pb2.TestMap()
-    msg2.map_int32_int32[12] = 55
-    msg2.map_int64_int64[88] = 99
-    msg2.map_int32_foreign_message[222].c = 15
-    msg2.map_int32_foreign_message[222].d = 20
-    old_map_value = msg2.map_int32_foreign_message[222]
-
-    msg2.MergeFrom(msg)
-    # Compare with expected message instead of call
-    # msg2.map_int32_foreign_message[222] to make sure MergeFrom does not
-    # sync with repeated field and there is no duplicated keys.
-    expected_msg = map_unittest_pb2.TestMap()
-    expected_msg.CopyFrom(msg)
-    expected_msg.map_int64_int64[88] = 99
-    self.assertEqual(msg2, expected_msg)
-
-    self.assertEqual(34, msg2.map_int32_int32[12])
-    self.assertEqual(78, msg2.map_int32_int32[56])
-    self.assertEqual(33, msg2.map_int64_int64[22])
-    self.assertEqual(99, msg2.map_int64_int64[88])
-    self.assertEqual(5, msg2.map_int32_foreign_message[111].c)
-    self.assertEqual(10, msg2.map_int32_foreign_message[222].c)
-    self.assertFalse(msg2.map_int32_foreign_message[222].HasField('d'))
-    if api_implementation.Type() != 'cpp':
-      # During the call to MergeFrom(), the C++ implementation will have
-      # deallocated the underlying message, but this is very difficult to detect
-      # properly. The line below is likely to cause a segmentation fault.
-      # With the Python implementation, old_map_value is just 'detached' from
-      # the main message. Using it will not crash of course, but since it still
-      # have a reference to the parent message I'm sure we can find interesting
-      # ways to cause inconsistencies.
-      self.assertEqual(15, old_map_value.c)
-
-    # Verify that there is only one entry per key, even though the MergeFrom
-    # may have internally created multiple entries for a single key in the
-    # list representation.
-    as_dict = {}
-    for key in msg2.map_int32_foreign_message:
-      self.assertFalse(key in as_dict)
-      as_dict[key] = msg2.map_int32_foreign_message[key].c
-
-    self.assertEqual({111: 5, 222: 10}, as_dict)
-
-    # Special case: test that delete of item really removes the item, even if
-    # there might have physically been duplicate keys due to the previous merge.
-    # This is only a special case for the C++ implementation which stores the
-    # map as an array.
-    del msg2.map_int32_int32[12]
-    self.assertFalse(12 in msg2.map_int32_int32)
-
-    del msg2.map_int32_foreign_message[222]
-    self.assertFalse(222 in msg2.map_int32_foreign_message)
-    with self.assertRaises(TypeError):
-      del msg2.map_int32_foreign_message['']
-
-  def testMapMergeFrom(self):
-    msg = map_unittest_pb2.TestMap()
-    msg.map_int32_int32[12] = 34
-    msg.map_int32_int32[56] = 78
-    msg.map_int64_int64[22] = 33
-    msg.map_int32_foreign_message[111].c = 5
-    msg.map_int32_foreign_message[222].c = 10
-
-    msg2 = map_unittest_pb2.TestMap()
-    msg2.map_int32_int32[12] = 55
-    msg2.map_int64_int64[88] = 99
-    msg2.map_int32_foreign_message[222].c = 15
-    msg2.map_int32_foreign_message[222].d = 20
-
-    msg2.map_int32_int32.MergeFrom(msg.map_int32_int32)
-    self.assertEqual(34, msg2.map_int32_int32[12])
-    self.assertEqual(78, msg2.map_int32_int32[56])
-
-    msg2.map_int64_int64.MergeFrom(msg.map_int64_int64)
-    self.assertEqual(33, msg2.map_int64_int64[22])
-    self.assertEqual(99, msg2.map_int64_int64[88])
-
-    msg2.map_int32_foreign_message.MergeFrom(msg.map_int32_foreign_message)
-    # Compare with expected message instead of call
-    # msg.map_int32_foreign_message[222] to make sure MergeFrom does not
-    # sync with repeated field and no duplicated keys.
-    expected_msg = map_unittest_pb2.TestMap()
-    expected_msg.CopyFrom(msg)
-    expected_msg.map_int64_int64[88] = 99
-    self.assertEqual(msg2, expected_msg)
-
-    # Test when cpp extension cache a map.
-    m1 = map_unittest_pb2.TestMap()
-    m2 = map_unittest_pb2.TestMap()
-    self.assertEqual(m1.map_int32_foreign_message, m1.map_int32_foreign_message)
-    m2.map_int32_foreign_message[123].c = 10
-    m1.MergeFrom(m2)
-    self.assertEqual(10, m2.map_int32_foreign_message[123].c)
-
-    # Test merge maps within different message types.
-    m1 = map_unittest_pb2.TestMap()
-    m2 = map_unittest_pb2.TestMessageMap()
-    m2.map_int32_message[123].optional_int32 = 10
-    m1.map_int32_all_types.MergeFrom(m2.map_int32_message)
-    self.assertEqual(10, m1.map_int32_all_types[123].optional_int32)
-
-    # Test overwrite message value map
-    msg = map_unittest_pb2.TestMap()
-    msg.map_int32_foreign_message[222].c = 123
-    msg2 = map_unittest_pb2.TestMap()
-    msg2.map_int32_foreign_message[222].d = 20
-    msg.MergeFromString(msg2.SerializeToString())
-    self.assertEqual(msg.map_int32_foreign_message[222].d, 20)
-    self.assertNotEqual(msg.map_int32_foreign_message[222].c, 123)
-
-    # Merge a dict to map field is not accepted
-    with self.assertRaises(AttributeError):
-      m1.map_int32_all_types.MergeFrom(
-          {1: unittest_proto3_arena_pb2.TestAllTypes()})
-
-  def testMergeFromBadType(self):
-    msg = map_unittest_pb2.TestMap()
-    with self.assertRaisesRegex(
-        TypeError,
-        r'Parameter to MergeFrom\(\) must be instance of same class: expected '
-        r'.+TestMap got int\.'):
-      msg.MergeFrom(1)
-
-  def testCopyFromBadType(self):
-    msg = map_unittest_pb2.TestMap()
-    with self.assertRaisesRegex(
-        TypeError,
-        r'Parameter to [A-Za-z]*From\(\) must be instance of same class: '
-        r'expected .+TestMap got int\.'):
-      msg.CopyFrom(1)
-
-  def testIntegerMapWithLongs(self):
-    msg = map_unittest_pb2.TestMap()
-    msg.map_int32_int32[int(-123)] = int(-456)
-    msg.map_int64_int64[int(-2**33)] = int(-2**34)
-    msg.map_uint32_uint32[int(123)] = int(456)
-    msg.map_uint64_uint64[int(2**33)] = int(2**34)
-
-    serialized = msg.SerializeToString()
-    msg2 = map_unittest_pb2.TestMap()
-    msg2.ParseFromString(serialized)
-
-    self.assertEqual(-456, msg2.map_int32_int32[-123])
-    self.assertEqual(-2**34, msg2.map_int64_int64[-2**33])
-    self.assertEqual(456, msg2.map_uint32_uint32[123])
-    self.assertEqual(2**34, msg2.map_uint64_uint64[2**33])
-
-  def testMapAssignmentCausesPresence(self):
-    msg = map_unittest_pb2.TestMapSubmessage()
-    msg.test_map.map_int32_int32[123] = 456
-
-    serialized = msg.SerializeToString()
-    msg2 = map_unittest_pb2.TestMapSubmessage()
-    msg2.ParseFromString(serialized)
-
-    self.assertEqual(msg, msg2)
-
-    # Now test that various mutations of the map properly invalidate the
-    # cached size of the submessage.
-    msg.test_map.map_int32_int32[888] = 999
-    serialized = msg.SerializeToString()
-    msg2.ParseFromString(serialized)
-    self.assertEqual(msg, msg2)
-
-    msg.test_map.map_int32_int32.clear()
-    serialized = msg.SerializeToString()
-    msg2.ParseFromString(serialized)
-    self.assertEqual(msg, msg2)
-
-  def testMapAssignmentCausesPresenceForSubmessages(self):
-    msg = map_unittest_pb2.TestMapSubmessage()
-    msg.test_map.map_int32_foreign_message[123].c = 5
-
-    serialized = msg.SerializeToString()
-    msg2 = map_unittest_pb2.TestMapSubmessage()
-    msg2.ParseFromString(serialized)
-
-    self.assertEqual(msg, msg2)
-
-    # Now test that various mutations of the map properly invalidate the
-    # cached size of the submessage.
-    msg.test_map.map_int32_foreign_message[888].c = 7
-    serialized = msg.SerializeToString()
-    msg2.ParseFromString(serialized)
-    self.assertEqual(msg, msg2)
-
-    msg.test_map.map_int32_foreign_message[888].MergeFrom(
-        msg.test_map.map_int32_foreign_message[123])
-    serialized = msg.SerializeToString()
-    msg2.ParseFromString(serialized)
-    self.assertEqual(msg, msg2)
-
-    msg.test_map.map_int32_foreign_message.clear()
-    serialized = msg.SerializeToString()
-    msg2.ParseFromString(serialized)
-    self.assertEqual(msg, msg2)
-
-  def testModifyMapWhileIterating(self):
-    msg = map_unittest_pb2.TestMap()
-
-    string_string_iter = iter(msg.map_string_string)
-    int32_foreign_iter = iter(msg.map_int32_foreign_message)
-
-    msg.map_string_string['abc'] = '123'
-    msg.map_int32_foreign_message[5].c = 5
-
-    with self.assertRaises(RuntimeError):
-      for key in string_string_iter:
-        pass
-
-    with self.assertRaises(RuntimeError):
-      for key in int32_foreign_iter:
-        pass
-
-  def testModifyMapEntryWhileIterating(self):
-    msg = map_unittest_pb2.TestMap()
-
-    msg.map_string_string['abc'] = '123'
-    msg.map_string_string['def'] = '456'
-    msg.map_string_string['ghi'] = '789'
-
-    msg.map_int32_foreign_message[5].c = 5
-    msg.map_int32_foreign_message[6].c = 6
-    msg.map_int32_foreign_message[7].c = 7
-
-    string_string_keys = list(msg.map_string_string.keys())
-    int32_foreign_keys = list(msg.map_int32_foreign_message.keys())
-
-    keys = []
-    for key in msg.map_string_string:
-      keys.append(key)
-      msg.map_string_string[key] = '000'
-    self.assertEqual(keys, string_string_keys)
-    self.assertEqual(keys, list(msg.map_string_string.keys()))
-
-    keys = []
-    for key in msg.map_int32_foreign_message:
-      keys.append(key)
-      msg.map_int32_foreign_message[key].c = 0
-    self.assertEqual(keys, int32_foreign_keys)
-    self.assertEqual(keys, list(msg.map_int32_foreign_message.keys()))
-
-  def testSubmessageMap(self):
-    msg = map_unittest_pb2.TestMap()
-
-    submsg = msg.map_int32_foreign_message[111]
-    self.assertIs(submsg, msg.map_int32_foreign_message[111])
-    self.assertIsInstance(submsg, unittest_pb2.ForeignMessage)
-
-    submsg.c = 5
-
-    serialized = msg.SerializeToString()
-    msg2 = map_unittest_pb2.TestMap()
-    msg2.ParseFromString(serialized)
-
-    self.assertEqual(5, msg2.map_int32_foreign_message[111].c)
-
-    # Doesn't allow direct submessage assignment.
-    with self.assertRaises(ValueError):
-      msg.map_int32_foreign_message[88] = unittest_pb2.ForeignMessage()
-
-  def testMapIteration(self):
-    msg = map_unittest_pb2.TestMap()
-
-    for k, v in msg.map_int32_int32.items():
-      # Should not be reached.
-      self.assertTrue(False)
-
-    msg.map_int32_int32[2] = 4
-    msg.map_int32_int32[3] = 6
-    msg.map_int32_int32[4] = 8
-    self.assertEqual(3, len(msg.map_int32_int32))
-
-    matching_dict = {2: 4, 3: 6, 4: 8}
-    self.assertMapIterEquals(msg.map_int32_int32.items(), matching_dict)
-
-  def testMapItems(self):
-    # Map items used to have strange behaviors when use c extension. Because
-    # [] may reorder the map and invalidate any existing iterators.
-    # TODO(jieluo): Check if [] reordering the map is a bug or intended
-    # behavior.
-    msg = map_unittest_pb2.TestMap()
-    msg.map_string_string['local_init_op'] = ''
-    msg.map_string_string['trainable_variables'] = ''
-    msg.map_string_string['variables'] = ''
-    msg.map_string_string['init_op'] = ''
-    msg.map_string_string['summaries'] = ''
-    items1 = msg.map_string_string.items()
-    items2 = msg.map_string_string.items()
-    self.assertEqual(items1, items2)
-
-  def testMapDeterministicSerialization(self):
-    golden_data = (b'r\x0c\n\x07init_op\x12\x01d'
-                   b'r\n\n\x05item1\x12\x01e'
-                   b'r\n\n\x05item2\x12\x01f'
-                   b'r\n\n\x05item3\x12\x01g'
-                   b'r\x0b\n\x05item4\x12\x02QQ'
-                   b'r\x12\n\rlocal_init_op\x12\x01a'
-                   b'r\x0e\n\tsummaries\x12\x01e'
-                   b'r\x18\n\x13trainable_variables\x12\x01b'
-                   b'r\x0e\n\tvariables\x12\x01c')
-    msg = map_unittest_pb2.TestMap()
-    msg.map_string_string['local_init_op'] = 'a'
-    msg.map_string_string['trainable_variables'] = 'b'
-    msg.map_string_string['variables'] = 'c'
-    msg.map_string_string['init_op'] = 'd'
-    msg.map_string_string['summaries'] = 'e'
-    msg.map_string_string['item1'] = 'e'
-    msg.map_string_string['item2'] = 'f'
-    msg.map_string_string['item3'] = 'g'
-    msg.map_string_string['item4'] = 'QQ'
-
-    # If deterministic serialization is not working correctly, this will be
-    # "flaky" depending on the exact python dict hash seed.
-    #
-    # Fortunately, there are enough items in this map that it is extremely
-    # unlikely to ever hit the "right" in-order combination, so the test
-    # itself should fail reliably.
-    self.assertEqual(golden_data, msg.SerializeToString(deterministic=True))
-
-  def testMapIterationClearMessage(self):
-    # Iterator needs to work even if message and map are deleted.
-    msg = map_unittest_pb2.TestMap()
-
-    msg.map_int32_int32[2] = 4
-    msg.map_int32_int32[3] = 6
-    msg.map_int32_int32[4] = 8
-
-    it = msg.map_int32_int32.items()
-    del msg
-
-    matching_dict = {2: 4, 3: 6, 4: 8}
-    self.assertMapIterEquals(it, matching_dict)
-
-  def testMapConstruction(self):
-    msg = map_unittest_pb2.TestMap(map_int32_int32={1: 2, 3: 4})
-    self.assertEqual(2, msg.map_int32_int32[1])
-    self.assertEqual(4, msg.map_int32_int32[3])
-
-    msg = map_unittest_pb2.TestMap(
-        map_int32_foreign_message={3: unittest_pb2.ForeignMessage(c=5)})
-    self.assertEqual(5, msg.map_int32_foreign_message[3].c)
-
-  def testMapScalarFieldConstruction(self):
-    msg1 = map_unittest_pb2.TestMap()
-    msg1.map_int32_int32[1] = 42
-    msg2 = map_unittest_pb2.TestMap(map_int32_int32=msg1.map_int32_int32)
-    self.assertEqual(42, msg2.map_int32_int32[1])
-
-  def testMapMessageFieldConstruction(self):
-    msg1 = map_unittest_pb2.TestMap()
-    msg1.map_string_foreign_message['test'].c = 42
-    msg2 = map_unittest_pb2.TestMap(
-        map_string_foreign_message=msg1.map_string_foreign_message)
-    self.assertEqual(42, msg2.map_string_foreign_message['test'].c)
-
-  def testMapFieldRaisesCorrectError(self):
-    # Should raise a TypeError when given a non-iterable.
-    with self.assertRaises(TypeError):
-      map_unittest_pb2.TestMap(map_string_foreign_message=1)
-
-  def testMapValidAfterFieldCleared(self):
-    # Map needs to work even if field is cleared.
-    # For the C++ implementation this tests the correctness of
-    # MapContainer::Release()
-    msg = map_unittest_pb2.TestMap()
-    int32_map = msg.map_int32_int32
-
-    int32_map[2] = 4
-    int32_map[3] = 6
-    int32_map[4] = 8
-
-    msg.ClearField('map_int32_int32')
-    self.assertEqual(b'', msg.SerializeToString())
-    matching_dict = {2: 4, 3: 6, 4: 8}
-    self.assertMapIterEquals(int32_map.items(), matching_dict)
-
-  def testMessageMapValidAfterFieldCleared(self):
-    # Map needs to work even if field is cleared.
-    # For the C++ implementation this tests the correctness of
-    # MapContainer::Release()
-    msg = map_unittest_pb2.TestMap()
-    int32_foreign_message = msg.map_int32_foreign_message
-
-    int32_foreign_message[2].c = 5
-
-    msg.ClearField('map_int32_foreign_message')
-    self.assertEqual(b'', msg.SerializeToString())
-    self.assertTrue(2 in int32_foreign_message.keys())
-
-  def testMessageMapItemValidAfterTopMessageCleared(self):
-    # Message map item needs to work even if it is cleared.
-    # For the C++ implementation this tests the correctness of
-    # MapContainer::Release()
-    msg = map_unittest_pb2.TestMap()
-    msg.map_int32_all_types[2].optional_string = 'bar'
-
-    if api_implementation.Type() == 'cpp':
-      # Need to keep the map reference because of b/27942626.
-      # TODO(jieluo): Remove it.
-      unused_map = msg.map_int32_all_types  # pylint: disable=unused-variable
-    msg_value = msg.map_int32_all_types[2]
-    msg.Clear()
-
-    # Reset to trigger sync between repeated field and map in c++.
-    msg.map_int32_all_types[3].optional_string = 'foo'
-    self.assertEqual(msg_value.optional_string, 'bar')
-
-  def testMapIterInvalidatedByClearField(self):
-    # Map iterator is invalidated when field is cleared.
-    # But this case does need to not crash the interpreter.
-    # For the C++ implementation this tests the correctness of
-    # ScalarMapContainer::Release()
-    msg = map_unittest_pb2.TestMap()
-
-    it = iter(msg.map_int32_int32)
-
-    msg.ClearField('map_int32_int32')
-    with self.assertRaises(RuntimeError):
-      for _ in it:
-        pass
-
-    it = iter(msg.map_int32_foreign_message)
-    msg.ClearField('map_int32_foreign_message')
-    with self.assertRaises(RuntimeError):
-      for _ in it:
-        pass
-
-  def testMapDelete(self):
-    msg = map_unittest_pb2.TestMap()
-
-    self.assertEqual(0, len(msg.map_int32_int32))
-
-    msg.map_int32_int32[4] = 6
-    self.assertEqual(1, len(msg.map_int32_int32))
-
-    with self.assertRaises(KeyError):
-      del msg.map_int32_int32[88]
-
-    del msg.map_int32_int32[4]
-    self.assertEqual(0, len(msg.map_int32_int32))
-
-    with self.assertRaises(KeyError):
-      del msg.map_int32_all_types[32]
-
-  def testMapsAreMapping(self):
-    msg = map_unittest_pb2.TestMap()
-    self.assertIsInstance(msg.map_int32_int32, collections.abc.Mapping)
-    self.assertIsInstance(msg.map_int32_int32, collections.abc.MutableMapping)
-    self.assertIsInstance(msg.map_int32_foreign_message,
-                          collections.abc.Mapping)
-    self.assertIsInstance(msg.map_int32_foreign_message,
-                          collections.abc.MutableMapping)
-
-  def testMapsCompare(self):
-    msg = map_unittest_pb2.TestMap()
-    msg.map_int32_int32[-123] = -456
-    self.assertEqual(msg.map_int32_int32, msg.map_int32_int32)
-    self.assertEqual(msg.map_int32_foreign_message,
-                     msg.map_int32_foreign_message)
-    self.assertNotEqual(msg.map_int32_int32, 0)
-
-  def testMapFindInitializationErrorsSmokeTest(self):
-    msg = map_unittest_pb2.TestMap()
-    msg.map_string_string['abc'] = '123'
-    msg.map_int32_int32[35] = 64
-    msg.map_string_foreign_message['foo'].c = 5
-    self.assertEqual(0, len(msg.FindInitializationErrors()))
-
-  @unittest.skipIf(sys.maxunicode == UCS2_MAXUNICODE, 'Skip for ucs2')
-  def testStrictUtf8Check(self):
-    # Test u'\ud801' is rejected at parser in both python2 and python3.
-    serialized = (b'r\x03\xed\xa0\x81')
-    msg = unittest_proto3_arena_pb2.TestAllTypes()
-    with self.assertRaises(Exception) as context:
-      msg.MergeFromString(serialized)
-    if api_implementation.Type() == 'python':
-      self.assertIn('optional_string', str(context.exception))
-    else:
-      self.assertIn('Error parsing message', str(context.exception))
-
-    # Test optional_string=u'�' is accepted.
-    serialized = unittest_proto3_arena_pb2.TestAllTypes(
-        optional_string=u'�').SerializeToString()
-    msg2 = unittest_proto3_arena_pb2.TestAllTypes()
-    msg2.MergeFromString(serialized)
-    self.assertEqual(msg2.optional_string, u'�')
-
-    msg = unittest_proto3_arena_pb2.TestAllTypes(optional_string=u'\ud001')
-    self.assertEqual(msg.optional_string, u'\ud001')
-
-  def testSurrogatesInPython3(self):
-    # Surrogates are rejected at setters in Python3.
-    with self.assertRaises(ValueError):
-      unittest_proto3_arena_pb2.TestAllTypes(optional_string=u'\ud801\udc01')
-    with self.assertRaises(ValueError):
-      unittest_proto3_arena_pb2.TestAllTypes(optional_string=b'\xed\xa0\x81')
-    with self.assertRaises(ValueError):
-      unittest_proto3_arena_pb2.TestAllTypes(optional_string=u'\ud801')
-    with self.assertRaises(ValueError):
-      unittest_proto3_arena_pb2.TestAllTypes(optional_string=u'\ud801\ud801')
-
-
-
-
-@testing_refleaks.TestCase
-class ValidTypeNamesTest(unittest.TestCase):
-
-  def assertImportFromName(self, msg, base_name):
-    # Parse <type 'module.class_name'> to extra 'some.name' as a string.
-    tp_name = str(type(msg)).split("'")[1]
-    valid_names = ('Repeated%sContainer' % base_name,
-                   'Repeated%sFieldContainer' % base_name)
-    self.assertTrue(
-        any(tp_name.endswith(v) for v in valid_names),
-        '%r does end with any of %r' % (tp_name, valid_names))
-
-    parts = tp_name.split('.')
-    class_name = parts[-1]
-    module_name = '.'.join(parts[:-1])
-    __import__(module_name, fromlist=[class_name])
-
-  def testTypeNamesCanBeImported(self):
-    # If import doesn't work, pickling won't work either.
-    pb = unittest_pb2.TestAllTypes()
-    self.assertImportFromName(pb.repeated_int32, 'Scalar')
-    self.assertImportFromName(pb.repeated_nested_message, 'Composite')
-
-
-@testing_refleaks.TestCase
-class PackedFieldTest(unittest.TestCase):
-
-  def setMessage(self, message):
-    message.repeated_int32.append(1)
-    message.repeated_int64.append(1)
-    message.repeated_uint32.append(1)
-    message.repeated_uint64.append(1)
-    message.repeated_sint32.append(1)
-    message.repeated_sint64.append(1)
-    message.repeated_fixed32.append(1)
-    message.repeated_fixed64.append(1)
-    message.repeated_sfixed32.append(1)
-    message.repeated_sfixed64.append(1)
-    message.repeated_float.append(1.0)
-    message.repeated_double.append(1.0)
-    message.repeated_bool.append(True)
-    message.repeated_nested_enum.append(1)
-
-  def testPackedFields(self):
-    message = packed_field_test_pb2.TestPackedTypes()
-    self.setMessage(message)
-    golden_data = (b'\x0A\x01\x01'
-                   b'\x12\x01\x01'
-                   b'\x1A\x01\x01'
-                   b'\x22\x01\x01'
-                   b'\x2A\x01\x02'
-                   b'\x32\x01\x02'
-                   b'\x3A\x04\x01\x00\x00\x00'
-                   b'\x42\x08\x01\x00\x00\x00\x00\x00\x00\x00'
-                   b'\x4A\x04\x01\x00\x00\x00'
-                   b'\x52\x08\x01\x00\x00\x00\x00\x00\x00\x00'
-                   b'\x5A\x04\x00\x00\x80\x3f'
-                   b'\x62\x08\x00\x00\x00\x00\x00\x00\xf0\x3f'
-                   b'\x6A\x01\x01'
-                   b'\x72\x01\x01')
-    self.assertEqual(golden_data, message.SerializeToString())
-
-  def testUnpackedFields(self):
-    message = packed_field_test_pb2.TestUnpackedTypes()
-    self.setMessage(message)
-    golden_data = (b'\x08\x01'
-                   b'\x10\x01'
-                   b'\x18\x01'
-                   b'\x20\x01'
-                   b'\x28\x02'
-                   b'\x30\x02'
-                   b'\x3D\x01\x00\x00\x00'
-                   b'\x41\x01\x00\x00\x00\x00\x00\x00\x00'
-                   b'\x4D\x01\x00\x00\x00'
-                   b'\x51\x01\x00\x00\x00\x00\x00\x00\x00'
-                   b'\x5D\x00\x00\x80\x3f'
-                   b'\x61\x00\x00\x00\x00\x00\x00\xf0\x3f'
-                   b'\x68\x01'
-                   b'\x70\x01')
-    self.assertEqual(golden_data, message.SerializeToString())
-
-
-@unittest.skipIf(api_implementation.Type() == 'python',
-                 'explicit tests of the C++ implementation')
-@testing_refleaks.TestCase
-class OversizeProtosTest(unittest.TestCase):
-
-  def GenerateNestedProto(self, n):
-    msg = unittest_pb2.TestRecursiveMessage()
-    sub = msg
-    for _ in range(n):
-      sub = sub.a
-    sub.i = 0
-    return msg.SerializeToString()
-
-  def testSucceedOkSizedProto(self):
-    msg = unittest_pb2.TestRecursiveMessage()
-    msg.ParseFromString(self.GenerateNestedProto(100))
-
-  def testAssertOversizeProto(self):
-    api_implementation._c_module.SetAllowOversizeProtos(False)
-    msg = unittest_pb2.TestRecursiveMessage()
-    with self.assertRaises(message.DecodeError) as context:
-      msg.ParseFromString(self.GenerateNestedProto(101))
-    self.assertIn('Error parsing message', str(context.exception))
-
-  def testSucceedOversizeProto(self):
-    api_implementation._c_module.SetAllowOversizeProtos(True)
-    msg = unittest_pb2.TestRecursiveMessage()
-    msg.ParseFromString(self.GenerateNestedProto(101))
-
-
-if __name__ == '__main__':
-  unittest.main()
diff --git a/libs/protobuf/python/google/protobuf/internal/missing_enum_values.proto b/libs/protobuf/python/google/protobuf/internal/missing_enum_values.proto
deleted file mode 100644
index 37baca7..0000000
--- a/libs/protobuf/python/google/protobuf/internal/missing_enum_values.proto
+++ /dev/null
@@ -1,56 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto2";
-
-
-package google.protobuf.python.internal;
-
-message TestEnumValues {
-  enum NestedEnum {
-    ZERO = 0;
-    ONE = 1;
-  }
-  optional NestedEnum optional_nested_enum = 1;
-  repeated NestedEnum repeated_nested_enum = 2;
-  repeated NestedEnum packed_nested_enum = 3 [packed = true];
-}
-
-message TestMissingEnumValues {
-  enum NestedEnum { TWO = 2; }
-  optional NestedEnum optional_nested_enum = 1;
-  repeated NestedEnum repeated_nested_enum = 2;
-  repeated NestedEnum packed_nested_enum = 3 [packed = true];
-}
-
-message JustString {
-  required string dummy = 1;
-}
-
diff --git a/libs/protobuf/python/google/protobuf/internal/more_extensions.proto b/libs/protobuf/python/google/protobuf/internal/more_extensions.proto
deleted file mode 100644
index 5340a70..0000000
--- a/libs/protobuf/python/google/protobuf/internal/more_extensions.proto
+++ /dev/null
@@ -1,62 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: robinson@google.com (Will Robinson)
-
-syntax = "proto2";
-
-package google.protobuf.internal;
-
-message TopLevelMessage {
-  optional ExtendedMessage submessage = 1 [lazy = true];
-  optional NestedMessage nested_message = 2 [lazy = true];
-}
-
-message NestedMessage {
-  optional ExtendedMessage submessage = 1 [lazy = true];
-}
-
-message ExtendedMessage {
-  optional int32 optional_int32 = 1001;
-  repeated string repeated_string = 1002;
-  extensions 1 to 999;
-}
-
-message ForeignMessage {
-  optional int32 foreign_message_int = 1;
-}
-
-extend ExtendedMessage {
-  optional int32 optional_int_extension = 1;
-  optional ForeignMessage optional_message_extension = 2;
-
-  repeated int32 repeated_int_extension = 3;
-  repeated ForeignMessage repeated_message_extension = 4;
-}
diff --git a/libs/protobuf/python/google/protobuf/internal/more_extensions_dynamic.proto b/libs/protobuf/python/google/protobuf/internal/more_extensions_dynamic.proto
deleted file mode 100644
index 98fcbcb..0000000
--- a/libs/protobuf/python/google/protobuf/internal/more_extensions_dynamic.proto
+++ /dev/null
@@ -1,51 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: jasonh@google.com (Jason Hsueh)
-//
-// This file is used to test a corner case in the CPP implementation where the
-// generated C++ type is available for the extendee, but the extension is
-// defined in a file whose C++ type is not in the binary.
-
-syntax = "proto2";
-
-import "google/protobuf/internal/more_extensions.proto";
-
-package google.protobuf.internal;
-
-message DynamicMessageType {
-  optional int32 a = 1;
-}
-
-extend ExtendedMessage {
-  optional int32 dynamic_int32_extension = 100;
-  optional DynamicMessageType dynamic_message_extension = 101;
-  repeated DynamicMessageType repeated_dynamic_message_extension = 102;
-}
diff --git a/libs/protobuf/python/google/protobuf/internal/more_messages.proto b/libs/protobuf/python/google/protobuf/internal/more_messages.proto
deleted file mode 100644
index 524dc70..0000000
--- a/libs/protobuf/python/google/protobuf/internal/more_messages.proto
+++ /dev/null
@@ -1,360 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: robinson@google.com (Will Robinson)
-
-// LINT: LEGACY_NAMES
-
-syntax = "proto2";
-
-package google.protobuf.internal;
-
-// A message where tag numbers are listed out of order, to allow us to test our
-// canonicalization of serialized output, which should always be in tag order.
-// We also mix in some extensions for extra fun.
-message OutOfOrderFields {
-  optional sint32 optional_sint32 = 5;
-  extensions 4 to 4;
-  optional uint32 optional_uint32 = 3;
-  extensions 2 to 2;
-  optional int32 optional_int32 = 1;
-}
-
-extend OutOfOrderFields {
-  optional uint64 optional_uint64 = 4;
-  optional int64 optional_int64 = 2;
-}
-
-enum is {  // top level enum keyword
-  default = 0;
-  else = 1;  // top level enum value keyword
-}
-
-message class {  // message keyword
-  optional int32 int_field = 1 [json_name = "json_int"];
-  optional int32 if = 2;  // field keyword
-  optional is as = 3;     // enum field keyword
-  optional is enum_field = 4;
-  enum for {                            // nested enum keyword
-    default = 0;
-    True = 1;  // nested enum value keyword
-  }
-  optional for nested_enum_field = 5;
-  message try {
-    optional int32 field = 1;
-    extensions 999 to 9999;
-  }
-  optional try
-    nested_message = 6;
-  extensions 999 to 9999;
-}
-
-extend class {
-  optional int32 continue = 1001;  // top level extension keyword
-}
-
-extend class.try {
-  optional int32 with = 1001;
-}
-
-message ExtendClass {
-  extend class {
-    optional int32 return = 1002;  // nested extension keyword
-  }
-}
-
-message TestFullKeyword {
-  optional google.protobuf.internal.OutOfOrderFields field1 = 1;
-  optional google.protobuf.internal.class field2 = 2;
-}
-
-// TODO(jieluo): Add keyword support for service.
-// service False {
-//   rpc Bar(class) returns (class);
-// }
-
-message LotsNestedMessage {
-  message B0 {}
-  message B1 {}
-  message B2 {}
-  message B3 {}
-  message B4 {}
-  message B5 {}
-  message B6 {}
-  message B7 {}
-  message B8 {}
-  message B9 {}
-  message B10 {}
-  message B11 {}
-  message B12 {}
-  message B13 {}
-  message B14 {}
-  message B15 {}
-  message B16 {}
-  message B17 {}
-  message B18 {}
-  message B19 {}
-  message B20 {}
-  message B21 {}
-  message B22 {}
-  message B23 {}
-  message B24 {}
-  message B25 {}
-  message B26 {}
-  message B27 {}
-  message B28 {}
-  message B29 {}
-  message B30 {}
-  message B31 {}
-  message B32 {}
-  message B33 {}
-  message B34 {}
-  message B35 {}
-  message B36 {}
-  message B37 {}
-  message B38 {}
-  message B39 {}
-  message B40 {}
-  message B41 {}
-  message B42 {}
-  message B43 {}
-  message B44 {}
-  message B45 {}
-  message B46 {}
-  message B47 {}
-  message B48 {}
-  message B49 {}
-  message B50 {}
-  message B51 {}
-  message B52 {}
-  message B53 {}
-  message B54 {}
-  message B55 {}
-  message B56 {}
-  message B57 {}
-  message B58 {}
-  message B59 {}
-  message B60 {}
-  message B61 {}
-  message B62 {}
-  message B63 {}
-  message B64 {}
-  message B65 {}
-  message B66 {}
-  message B67 {}
-  message B68 {}
-  message B69 {}
-  message B70 {}
-  message B71 {}
-  message B72 {}
-  message B73 {}
-  message B74 {}
-  message B75 {}
-  message B76 {}
-  message B77 {}
-  message B78 {}
-  message B79 {}
-  message B80 {}
-  message B81 {}
-  message B82 {}
-  message B83 {}
-  message B84 {}
-  message B85 {}
-  message B86 {}
-  message B87 {}
-  message B88 {}
-  message B89 {}
-  message B90 {}
-  message B91 {}
-  message B92 {}
-  message B93 {}
-  message B94 {}
-  message B95 {}
-  message B96 {}
-  message B97 {}
-  message B98 {}
-  message B99 {}
-  message B100 {}
-  message B101 {}
-  message B102 {}
-  message B103 {}
-  message B104 {}
-  message B105 {}
-  message B106 {}
-  message B107 {}
-  message B108 {}
-  message B109 {}
-  message B110 {}
-  message B111 {}
-  message B112 {}
-  message B113 {}
-  message B114 {}
-  message B115 {}
-  message B116 {}
-  message B117 {}
-  message B118 {}
-  message B119 {}
-  message B120 {}
-  message B121 {}
-  message B122 {}
-  message B123 {}
-  message B124 {}
-  message B125 {}
-  message B126 {}
-  message B127 {}
-  message B128 {}
-  message B129 {}
-  message B130 {}
-  message B131 {}
-  message B132 {}
-  message B133 {}
-  message B134 {}
-  message B135 {}
-  message B136 {}
-  message B137 {}
-  message B138 {}
-  message B139 {}
-  message B140 {}
-  message B141 {}
-  message B142 {}
-  message B143 {}
-  message B144 {}
-  message B145 {}
-  message B146 {}
-  message B147 {}
-  message B148 {}
-  message B149 {}
-  message B150 {}
-  message B151 {}
-  message B152 {}
-  message B153 {}
-  message B154 {}
-  message B155 {}
-  message B156 {}
-  message B157 {}
-  message B158 {}
-  message B159 {}
-  message B160 {}
-  message B161 {}
-  message B162 {}
-  message B163 {}
-  message B164 {}
-  message B165 {}
-  message B166 {}
-  message B167 {}
-  message B168 {}
-  message B169 {}
-  message B170 {}
-  message B171 {}
-  message B172 {}
-  message B173 {}
-  message B174 {}
-  message B175 {}
-  message B176 {}
-  message B177 {}
-  message B178 {}
-  message B179 {}
-  message B180 {}
-  message B181 {}
-  message B182 {}
-  message B183 {}
-  message B184 {}
-  message B185 {}
-  message B186 {}
-  message B187 {}
-  message B188 {}
-  message B189 {}
-  message B190 {}
-  message B191 {}
-  message B192 {}
-  message B193 {}
-  message B194 {}
-  message B195 {}
-  message B196 {}
-  message B197 {}
-  message B198 {}
-  message B199 {}
-  message B200 {}
-  message B201 {}
-  message B202 {}
-  message B203 {}
-  message B204 {}
-  message B205 {}
-  message B206 {}
-  message B207 {}
-  message B208 {}
-  message B209 {}
-  message B210 {}
-  message B211 {}
-  message B212 {}
-  message B213 {}
-  message B214 {}
-  message B215 {}
-  message B216 {}
-  message B217 {}
-  message B218 {}
-  message B219 {}
-  message B220 {}
-  message B221 {}
-  message B222 {}
-  message B223 {}
-  message B224 {}
-  message B225 {}
-  message B226 {}
-  message B227 {}
-  message B228 {}
-  message B229 {}
-  message B230 {}
-  message B231 {}
-  message B232 {}
-  message B233 {}
-  message B234 {}
-  message B235 {}
-  message B236 {}
-  message B237 {}
-  message B238 {}
-  message B239 {}
-  message B240 {}
-  message B241 {}
-  message B242 {}
-  message B243 {}
-  message B244 {}
-  message B245 {}
-  message B246 {}
-  message B247 {}
-  message B248 {}
-  message B249 {}
-  message B250 {}
-  message B251 {}
-  message B252 {}
-  message B253 {}
-  message B254 {}
-  message B255 {}
-}
diff --git a/libs/protobuf/python/google/protobuf/internal/no_package.proto b/libs/protobuf/python/google/protobuf/internal/no_package.proto
deleted file mode 100644
index 49eda95..0000000
--- a/libs/protobuf/python/google/protobuf/internal/no_package.proto
+++ /dev/null
@@ -1,40 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto2";
-
-enum NoPackageEnum {
-  NO_PACKAGE_VALUE_0 = 0;
-  NO_PACKAGE_VALUE_1 = 1;
-}
-
-message NoPackageMessage {
-  optional NoPackageEnum no_package_enum = 1;
-}
diff --git a/libs/protobuf/python/google/protobuf/internal/packed_field_test.proto b/libs/protobuf/python/google/protobuf/internal/packed_field_test.proto
deleted file mode 100644
index 0dfdc10..0000000
--- a/libs/protobuf/python/google/protobuf/internal/packed_field_test.proto
+++ /dev/null
@@ -1,73 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto3";
-
-package google.protobuf.python.internal;
-
-message TestPackedTypes {
-  enum NestedEnum {
-    FOO = 0;
-    BAR = 1;
-    BAZ = 2;
-  }
-
-  repeated    int32 repeated_int32    =  1;
-  repeated    int64 repeated_int64    =  2;
-  repeated   uint32 repeated_uint32   =  3;
-  repeated   uint64 repeated_uint64   =  4;
-  repeated   sint32 repeated_sint32   =  5;
-  repeated   sint64 repeated_sint64   =  6;
-  repeated  fixed32 repeated_fixed32  =  7;
-  repeated  fixed64 repeated_fixed64  =  8;
-  repeated sfixed32 repeated_sfixed32 =  9;
-  repeated sfixed64 repeated_sfixed64 = 10;
-  repeated    float repeated_float    = 11;
-  repeated   double repeated_double   = 12;
-  repeated     bool repeated_bool     = 13;
-  repeated NestedEnum repeated_nested_enum = 14;
-}
-
-message TestUnpackedTypes {
-  repeated    int32 repeated_int32    =  1 [packed = false];
-  repeated    int64 repeated_int64    =  2 [packed = false];
-  repeated   uint32 repeated_uint32   =  3 [packed = false];
-  repeated   uint64 repeated_uint64   =  4 [packed = false];
-  repeated   sint32 repeated_sint32   =  5 [packed = false];
-  repeated   sint64 repeated_sint64   =  6 [packed = false];
-  repeated  fixed32 repeated_fixed32  =  7 [packed = false];
-  repeated  fixed64 repeated_fixed64  =  8 [packed = false];
-  repeated sfixed32 repeated_sfixed32 =  9 [packed = false];
-  repeated sfixed64 repeated_sfixed64 = 10 [packed = false];
-  repeated    float repeated_float    = 11 [packed = false];
-  repeated   double repeated_double   = 12 [packed = false];
-  repeated     bool repeated_bool     = 13 [packed = false];
-  repeated TestPackedTypes.NestedEnum repeated_nested_enum = 14 [packed = false];
-}
diff --git a/libs/protobuf/python/google/protobuf/internal/proto_builder_test.py b/libs/protobuf/python/google/protobuf/internal/proto_builder_test.py
deleted file mode 100644
index 48077b0..0000000
--- a/libs/protobuf/python/google/protobuf/internal/proto_builder_test.py
+++ /dev/null
@@ -1,106 +0,0 @@
-# Protocol Buffers - Google's data interchange format
-# Copyright 2008 Google Inc.  All rights reserved.
-# https://developers.google.com/protocol-buffers/
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-"""Tests for google.protobuf.proto_builder."""
-
-import collections
-import unittest
-
-from google.protobuf import descriptor_pb2  # pylint: disable=g-import-not-at-top
-from google.protobuf import descriptor
-from google.protobuf import descriptor_pool
-from google.protobuf import proto_builder
-from google.protobuf import text_format
-
-
-class ProtoBuilderTest(unittest.TestCase):
-
-  def setUp(self):
-    self.ordered_fields = collections.OrderedDict([
-        ('foo', descriptor_pb2.FieldDescriptorProto.TYPE_INT64),
-        ('bar', descriptor_pb2.FieldDescriptorProto.TYPE_STRING),
-        ])
-    self._fields = dict(self.ordered_fields)
-
-  def testMakeSimpleProtoClass(self):
-    """Test that we can create a proto class."""
-    proto_cls = proto_builder.MakeSimpleProtoClass(
-        self._fields,
-        full_name='net.proto2.python.public.proto_builder_test.Test')
-    proto = proto_cls()
-    proto.foo = 12345
-    proto.bar = 'asdf'
-    self.assertMultiLineEqual(
-        'bar: "asdf"\nfoo: 12345\n', text_format.MessageToString(proto))
-
-  def testOrderedFields(self):
-    """Test that the field order is maintained when given an OrderedDict."""
-    proto_cls = proto_builder.MakeSimpleProtoClass(
-        self.ordered_fields,
-        full_name='net.proto2.python.public.proto_builder_test.OrderedTest')
-    proto = proto_cls()
-    proto.foo = 12345
-    proto.bar = 'asdf'
-    self.assertMultiLineEqual(
-        'foo: 12345\nbar: "asdf"\n', text_format.MessageToString(proto))
-
-  def testMakeSameProtoClassTwice(self):
-    """Test that the DescriptorPool is used."""
-    pool = descriptor_pool.DescriptorPool()
-    proto_cls1 = proto_builder.MakeSimpleProtoClass(
-        self._fields,
-        full_name='net.proto2.python.public.proto_builder_test.Test',
-        pool=pool)
-    proto_cls2 = proto_builder.MakeSimpleProtoClass(
-        self._fields,
-        full_name='net.proto2.python.public.proto_builder_test.Test',
-        pool=pool)
-    self.assertIs(proto_cls1.DESCRIPTOR, proto_cls2.DESCRIPTOR)
-
-  def testMakeLargeProtoClass(self):
-    """Test that large created protos don't use reserved field numbers."""
-    num_fields = 123456
-    fields = {
-        'foo%d' % i: descriptor_pb2.FieldDescriptorProto.TYPE_INT64
-        for i in range(num_fields)
-    }
-    proto_cls = proto_builder.MakeSimpleProtoClass(
-        fields,
-        full_name='net.proto2.python.public.proto_builder_test.LargeProtoTest')
-
-    reserved_field_numbers = set(
-        range(descriptor.FieldDescriptor.FIRST_RESERVED_FIELD_NUMBER,
-              descriptor.FieldDescriptor.LAST_RESERVED_FIELD_NUMBER + 1))
-    proto_field_numbers = set(proto_cls.DESCRIPTOR.fields_by_number)
-    self.assertFalse(reserved_field_numbers.intersection(proto_field_numbers))
-
-
-if __name__ == '__main__':
-  unittest.main()
diff --git a/libs/protobuf/python/google/protobuf/internal/python_message.py b/libs/protobuf/python/google/protobuf/internal/python_message.py
deleted file mode 100644
index 5550b42..0000000
--- a/libs/protobuf/python/google/protobuf/internal/python_message.py
+++ /dev/null
@@ -1,1539 +0,0 @@
-# Protocol Buffers - Google's data interchange format
-# Copyright 2008 Google Inc.  All rights reserved.
-# https://developers.google.com/protocol-buffers/
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# This code is meant to work on Python 2.4 and above only.
-#
-# TODO(robinson): Helpers for verbose, common checks like seeing if a
-# descriptor's cpp_type is CPPTYPE_MESSAGE.
-
-"""Contains a metaclass and helper functions used to create
-protocol message classes from Descriptor objects at runtime.
-
-Recall that a metaclass is the "type" of a class.
-(A class is to a metaclass what an instance is to a class.)
-
-In this case, we use the GeneratedProtocolMessageType metaclass
-to inject all the useful functionality into the classes
-output by the protocol compiler at compile-time.
-
-The upshot of all this is that the real implementation
-details for ALL pure-Python protocol buffers are *here in
-this file*.
-"""
-
-__author__ = 'robinson@google.com (Will Robinson)'
-
-from io import BytesIO
-import struct
-import sys
-import weakref
-
-# We use "as" to avoid name collisions with variables.
-from google.protobuf.internal import api_implementation
-from google.protobuf.internal import containers
-from google.protobuf.internal import decoder
-from google.protobuf.internal import encoder
-from google.protobuf.internal import enum_type_wrapper
-from google.protobuf.internal import extension_dict
-from google.protobuf.internal import message_listener as message_listener_mod
-from google.protobuf.internal import type_checkers
-from google.protobuf.internal import well_known_types
-from google.protobuf.internal import wire_format
-from google.protobuf import descriptor as descriptor_mod
-from google.protobuf import message as message_mod
-from google.protobuf import text_format
-
-_FieldDescriptor = descriptor_mod.FieldDescriptor
-_AnyFullTypeName = 'google.protobuf.Any'
-_ExtensionDict = extension_dict._ExtensionDict
-
-class GeneratedProtocolMessageType(type):
-
-  """Metaclass for protocol message classes created at runtime from Descriptors.
-
-  We add implementations for all methods described in the Message class.  We
-  also create properties to allow getting/setting all fields in the protocol
-  message.  Finally, we create slots to prevent users from accidentally
-  "setting" nonexistent fields in the protocol message, which then wouldn't get
-  serialized / deserialized properly.
-
-  The protocol compiler currently uses this metaclass to create protocol
-  message classes at runtime.  Clients can also manually create their own
-  classes at runtime, as in this example:
-
-  mydescriptor = Descriptor(.....)
-  factory = symbol_database.Default()
-  factory.pool.AddDescriptor(mydescriptor)
-  MyProtoClass = factory.GetPrototype(mydescriptor)
-  myproto_instance = MyProtoClass()
-  myproto.foo_field = 23
-  ...
-  """
-
-  # Must be consistent with the protocol-compiler code in
-  # proto2/compiler/internal/generator.*.
-  _DESCRIPTOR_KEY = 'DESCRIPTOR'
-
-  def __new__(cls, name, bases, dictionary):
-    """Custom allocation for runtime-generated class types.
-
-    We override __new__ because this is apparently the only place
-    where we can meaningfully set __slots__ on the class we're creating(?).
-    (The interplay between metaclasses and slots is not very well-documented).
-
-    Args:
-      name: Name of the class (ignored, but required by the
-        metaclass protocol).
-      bases: Base classes of the class we're constructing.
-        (Should be message.Message).  We ignore this field, but
-        it's required by the metaclass protocol
-      dictionary: The class dictionary of the class we're
-        constructing.  dictionary[_DESCRIPTOR_KEY] must contain
-        a Descriptor object describing this protocol message
-        type.
-
-    Returns:
-      Newly-allocated class.
-
-    Raises:
-      RuntimeError: Generated code only work with python cpp extension.
-    """
-    descriptor = dictionary[GeneratedProtocolMessageType._DESCRIPTOR_KEY]
-
-    if isinstance(descriptor, str):
-      raise RuntimeError('The generated code only work with python cpp '
-                         'extension, but it is using pure python runtime.')
-
-    # If a concrete class already exists for this descriptor, don't try to
-    # create another.  Doing so will break any messages that already exist with
-    # the existing class.
-    #
-    # The C++ implementation appears to have its own internal `PyMessageFactory`
-    # to achieve similar results.
-    #
-    # This most commonly happens in `text_format.py` when using descriptors from
-    # a custom pool; it calls symbol_database.Global().getPrototype() on a
-    # descriptor which already has an existing concrete class.
-    new_class = getattr(descriptor, '_concrete_class', None)
-    if new_class:
-      return new_class
-
-    if descriptor.full_name in well_known_types.WKTBASES:
-      bases += (well_known_types.WKTBASES[descriptor.full_name],)
-    _AddClassAttributesForNestedExtensions(descriptor, dictionary)
-    _AddSlots(descriptor, dictionary)
-
-    superclass = super(GeneratedProtocolMessageType, cls)
-    new_class = superclass.__new__(cls, name, bases, dictionary)
-    return new_class
-
-  def __init__(cls, name, bases, dictionary):
-    """Here we perform the majority of our work on the class.
-    We add enum getters, an __init__ method, implementations
-    of all Message methods, and properties for all fields
-    in the protocol type.
-
-    Args:
-      name: Name of the class (ignored, but required by the
-        metaclass protocol).
-      bases: Base classes of the class we're constructing.
-        (Should be message.Message).  We ignore this field, but
-        it's required by the metaclass protocol
-      dictionary: The class dictionary of the class we're
-        constructing.  dictionary[_DESCRIPTOR_KEY] must contain
-        a Descriptor object describing this protocol message
-        type.
-    """
-    descriptor = dictionary[GeneratedProtocolMessageType._DESCRIPTOR_KEY]
-
-    # If this is an _existing_ class looked up via `_concrete_class` in the
-    # __new__ method above, then we don't need to re-initialize anything.
-    existing_class = getattr(descriptor, '_concrete_class', None)
-    if existing_class:
-      assert existing_class is cls, (
-          'Duplicate `GeneratedProtocolMessageType` created for descriptor %r'
-          % (descriptor.full_name))
-      return
-
-    cls._decoders_by_tag = {}
-    if (descriptor.has_options and
-        descriptor.GetOptions().message_set_wire_format):
-      cls._decoders_by_tag[decoder.MESSAGE_SET_ITEM_TAG] = (
-          decoder.MessageSetItemDecoder(descriptor), None)
-
-    # Attach stuff to each FieldDescriptor for quick lookup later on.
-    for field in descriptor.fields:
-      _AttachFieldHelpers(cls, field)
-
-    descriptor._concrete_class = cls  # pylint: disable=protected-access
-    _AddEnumValues(descriptor, cls)
-    _AddInitMethod(descriptor, cls)
-    _AddPropertiesForFields(descriptor, cls)
-    _AddPropertiesForExtensions(descriptor, cls)
-    _AddStaticMethods(cls)
-    _AddMessageMethods(descriptor, cls)
-    _AddPrivateHelperMethods(descriptor, cls)
-
-    superclass = super(GeneratedProtocolMessageType, cls)
-    superclass.__init__(name, bases, dictionary)
-
-
-# Stateless helpers for GeneratedProtocolMessageType below.
-# Outside clients should not access these directly.
-#
-# I opted not to make any of these methods on the metaclass, to make it more
-# clear that I'm not really using any state there and to keep clients from
-# thinking that they have direct access to these construction helpers.
-
-
-def _PropertyName(proto_field_name):
-  """Returns the name of the public property attribute which
-  clients can use to get and (in some cases) set the value
-  of a protocol message field.
-
-  Args:
-    proto_field_name: The protocol message field name, exactly
-      as it appears (or would appear) in a .proto file.
-  """
-  # TODO(robinson): Escape Python keywords (e.g., yield), and test this support.
-  # nnorwitz makes my day by writing:
-  # """
-  # FYI.  See the keyword module in the stdlib. This could be as simple as:
-  #
-  # if keyword.iskeyword(proto_field_name):
-  #   return proto_field_name + "_"
-  # return proto_field_name
-  # """
-  # Kenton says:  The above is a BAD IDEA.  People rely on being able to use
-  #   getattr() and setattr() to reflectively manipulate field values.  If we
-  #   rename the properties, then every such user has to also make sure to apply
-  #   the same transformation.  Note that currently if you name a field "yield",
-  #   you can still access it just fine using getattr/setattr -- it's not even
-  #   that cumbersome to do so.
-  # TODO(kenton):  Remove this method entirely if/when everyone agrees with my
-  #   position.
-  return proto_field_name
-
-
-def _AddSlots(message_descriptor, dictionary):
-  """Adds a __slots__ entry to dictionary, containing the names of all valid
-  attributes for this message type.
-
-  Args:
-    message_descriptor: A Descriptor instance describing this message type.
-    dictionary: Class dictionary to which we'll add a '__slots__' entry.
-  """
-  dictionary['__slots__'] = ['_cached_byte_size',
-                             '_cached_byte_size_dirty',
-                             '_fields',
-                             '_unknown_fields',
-                             '_unknown_field_set',
-                             '_is_present_in_parent',
-                             '_listener',
-                             '_listener_for_children',
-                             '__weakref__',
-                             '_oneofs']
-
-
-def _IsMessageSetExtension(field):
-  return (field.is_extension and
-          field.containing_type.has_options and
-          field.containing_type.GetOptions().message_set_wire_format and
-          field.type == _FieldDescriptor.TYPE_MESSAGE and
-          field.label == _FieldDescriptor.LABEL_OPTIONAL)
-
-
-def _IsMapField(field):
-  return (field.type == _FieldDescriptor.TYPE_MESSAGE and
-          field.message_type.has_options and
-          field.message_type.GetOptions().map_entry)
-
-
-def _IsMessageMapField(field):
-  value_type = field.message_type.fields_by_name['value']
-  return value_type.cpp_type == _FieldDescriptor.CPPTYPE_MESSAGE
-
-
-def _AttachFieldHelpers(cls, field_descriptor):
-  is_repeated = (field_descriptor.label == _FieldDescriptor.LABEL_REPEATED)
-  is_packable = (is_repeated and
-                 wire_format.IsTypePackable(field_descriptor.type))
-  is_proto3 = field_descriptor.containing_type.syntax == 'proto3'
-  if not is_packable:
-    is_packed = False
-  elif field_descriptor.containing_type.syntax == 'proto2':
-    is_packed = (field_descriptor.has_options and
-                field_descriptor.GetOptions().packed)
-  else:
-    has_packed_false = (field_descriptor.has_options and
-                        field_descriptor.GetOptions().HasField('packed') and
-                        field_descriptor.GetOptions().packed == False)
-    is_packed = not has_packed_false
-  is_map_entry = _IsMapField(field_descriptor)
-
-  if is_map_entry:
-    field_encoder = encoder.MapEncoder(field_descriptor)
-    sizer = encoder.MapSizer(field_descriptor,
-                             _IsMessageMapField(field_descriptor))
-  elif _IsMessageSetExtension(field_descriptor):
-    field_encoder = encoder.MessageSetItemEncoder(field_descriptor.number)
-    sizer = encoder.MessageSetItemSizer(field_descriptor.number)
-  else:
-    field_encoder = type_checkers.TYPE_TO_ENCODER[field_descriptor.type](
-        field_descriptor.number, is_repeated, is_packed)
-    sizer = type_checkers.TYPE_TO_SIZER[field_descriptor.type](
-        field_descriptor.number, is_repeated, is_packed)
-
-  field_descriptor._encoder = field_encoder
-  field_descriptor._sizer = sizer
-  field_descriptor._default_constructor = _DefaultValueConstructorForField(
-      field_descriptor)
-
-  def AddDecoder(wiretype, is_packed):
-    tag_bytes = encoder.TagBytes(field_descriptor.number, wiretype)
-    decode_type = field_descriptor.type
-    if (decode_type == _FieldDescriptor.TYPE_ENUM and
-        type_checkers.SupportsOpenEnums(field_descriptor)):
-      decode_type = _FieldDescriptor.TYPE_INT32
-
-    oneof_descriptor = None
-    clear_if_default = False
-    if field_descriptor.containing_oneof is not None:
-      oneof_descriptor = field_descriptor
-    elif (is_proto3 and not is_repeated and
-          field_descriptor.cpp_type != _FieldDescriptor.CPPTYPE_MESSAGE):
-      clear_if_default = True
-
-    if is_map_entry:
-      is_message_map = _IsMessageMapField(field_descriptor)
-
-      field_decoder = decoder.MapDecoder(
-          field_descriptor, _GetInitializeDefaultForMap(field_descriptor),
-          is_message_map)
-    elif decode_type == _FieldDescriptor.TYPE_STRING:
-      field_decoder = decoder.StringDecoder(
-          field_descriptor.number, is_repeated, is_packed,
-          field_descriptor, field_descriptor._default_constructor,
-          clear_if_default)
-    elif field_descriptor.cpp_type == _FieldDescriptor.CPPTYPE_MESSAGE:
-      field_decoder = type_checkers.TYPE_TO_DECODER[decode_type](
-          field_descriptor.number, is_repeated, is_packed,
-          field_descriptor, field_descriptor._default_constructor)
-    else:
-      field_decoder = type_checkers.TYPE_TO_DECODER[decode_type](
-          field_descriptor.number, is_repeated, is_packed,
-          # pylint: disable=protected-access
-          field_descriptor, field_descriptor._default_constructor,
-          clear_if_default)
-
-    cls._decoders_by_tag[tag_bytes] = (field_decoder, oneof_descriptor)
-
-  AddDecoder(type_checkers.FIELD_TYPE_TO_WIRE_TYPE[field_descriptor.type],
-             False)
-
-  if is_repeated and wire_format.IsTypePackable(field_descriptor.type):
-    # To support wire compatibility of adding packed = true, add a decoder for
-    # packed values regardless of the field's options.
-    AddDecoder(wire_format.WIRETYPE_LENGTH_DELIMITED, True)
-
-
-def _AddClassAttributesForNestedExtensions(descriptor, dictionary):
-  extensions = descriptor.extensions_by_name
-  for extension_name, extension_field in extensions.items():
-    assert extension_name not in dictionary
-    dictionary[extension_name] = extension_field
-
-
-def _AddEnumValues(descriptor, cls):
-  """Sets class-level attributes for all enum fields defined in this message.
-
-  Also exporting a class-level object that can name enum values.
-
-  Args:
-    descriptor: Descriptor object for this message type.
-    cls: Class we're constructing for this message type.
-  """
-  for enum_type in descriptor.enum_types:
-    setattr(cls, enum_type.name, enum_type_wrapper.EnumTypeWrapper(enum_type))
-    for enum_value in enum_type.values:
-      setattr(cls, enum_value.name, enum_value.number)
-
-
-def _GetInitializeDefaultForMap(field):
-  if field.label != _FieldDescriptor.LABEL_REPEATED:
-    raise ValueError('map_entry set on non-repeated field %s' % (
-        field.name))
-  fields_by_name = field.message_type.fields_by_name
-  key_checker = type_checkers.GetTypeChecker(fields_by_name['key'])
-
-  value_field = fields_by_name['value']
-  if _IsMessageMapField(field):
-    def MakeMessageMapDefault(message):
-      return containers.MessageMap(
-          message._listener_for_children, value_field.message_type, key_checker,
-          field.message_type)
-    return MakeMessageMapDefault
-  else:
-    value_checker = type_checkers.GetTypeChecker(value_field)
-    def MakePrimitiveMapDefault(message):
-      return containers.ScalarMap(
-          message._listener_for_children, key_checker, value_checker,
-          field.message_type)
-    return MakePrimitiveMapDefault
-
-def _DefaultValueConstructorForField(field):
-  """Returns a function which returns a default value for a field.
-
-  Args:
-    field: FieldDescriptor object for this field.
-
-  The returned function has one argument:
-    message: Message instance containing this field, or a weakref proxy
-      of same.
-
-  That function in turn returns a default value for this field.  The default
-    value may refer back to |message| via a weak reference.
-  """
-
-  if _IsMapField(field):
-    return _GetInitializeDefaultForMap(field)
-
-  if field.label == _FieldDescriptor.LABEL_REPEATED:
-    if field.has_default_value and field.default_value != []:
-      raise ValueError('Repeated field default value not empty list: %s' % (
-          field.default_value))
-    if field.cpp_type == _FieldDescriptor.CPPTYPE_MESSAGE:
-      # We can't look at _concrete_class yet since it might not have
-      # been set.  (Depends on order in which we initialize the classes).
-      message_type = field.message_type
-      def MakeRepeatedMessageDefault(message):
-        return containers.RepeatedCompositeFieldContainer(
-            message._listener_for_children, field.message_type)
-      return MakeRepeatedMessageDefault
-    else:
-      type_checker = type_checkers.GetTypeChecker(field)
-      def MakeRepeatedScalarDefault(message):
-        return containers.RepeatedScalarFieldContainer(
-            message._listener_for_children, type_checker)
-      return MakeRepeatedScalarDefault
-
-  if field.cpp_type == _FieldDescriptor.CPPTYPE_MESSAGE:
-    # _concrete_class may not yet be initialized.
-    message_type = field.message_type
-    def MakeSubMessageDefault(message):
-      assert getattr(message_type, '_concrete_class', None), (
-          'Uninitialized concrete class found for field %r (message type %r)'
-          % (field.full_name, message_type.full_name))
-      result = message_type._concrete_class()
-      result._SetListener(
-          _OneofListener(message, field)
-          if field.containing_oneof is not None
-          else message._listener_for_children)
-      return result
-    return MakeSubMessageDefault
-
-  def MakeScalarDefault(message):
-    # TODO(protobuf-team): This may be broken since there may not be
-    # default_value.  Combine with has_default_value somehow.
-    return field.default_value
-  return MakeScalarDefault
-
-
-def _ReraiseTypeErrorWithFieldName(message_name, field_name):
-  """Re-raise the currently-handled TypeError with the field name added."""
-  exc = sys.exc_info()[1]
-  if len(exc.args) == 1 and type(exc) is TypeError:
-    # simple TypeError; add field name to exception message
-    exc = TypeError('%s for field %s.%s' % (str(exc), message_name, field_name))
-
-  # re-raise possibly-amended exception with original traceback:
-  raise exc.with_traceback(sys.exc_info()[2])
-
-
-def _AddInitMethod(message_descriptor, cls):
-  """Adds an __init__ method to cls."""
-
-  def _GetIntegerEnumValue(enum_type, value):
-    """Convert a string or integer enum value to an integer.
-
-    If the value is a string, it is converted to the enum value in
-    enum_type with the same name.  If the value is not a string, it's
-    returned as-is.  (No conversion or bounds-checking is done.)
-    """
-    if isinstance(value, str):
-      try:
-        return enum_type.values_by_name[value].number
-      except KeyError:
-        raise ValueError('Enum type %s: unknown label "%s"' % (
-            enum_type.full_name, value))
-    return value
-
-  def init(self, **kwargs):
-    self._cached_byte_size = 0
-    self._cached_byte_size_dirty = len(kwargs) > 0
-    self._fields = {}
-    # Contains a mapping from oneof field descriptors to the descriptor
-    # of the currently set field in that oneof field.
-    self._oneofs = {}
-
-    # _unknown_fields is () when empty for efficiency, and will be turned into
-    # a list if fields are added.
-    self._unknown_fields = ()
-    # _unknown_field_set is None when empty for efficiency, and will be
-    # turned into UnknownFieldSet struct if fields are added.
-    self._unknown_field_set = None      # pylint: disable=protected-access
-    self._is_present_in_parent = False
-    self._listener = message_listener_mod.NullMessageListener()
-    self._listener_for_children = _Listener(self)
-    for field_name, field_value in kwargs.items():
-      field = _GetFieldByName(message_descriptor, field_name)
-      if field is None:
-        raise TypeError('%s() got an unexpected keyword argument "%s"' %
-                        (message_descriptor.name, field_name))
-      if field_value is None:
-        # field=None is the same as no field at all.
-        continue
-      if field.label == _FieldDescriptor.LABEL_REPEATED:
-        copy = field._default_constructor(self)
-        if field.cpp_type == _FieldDescriptor.CPPTYPE_MESSAGE:  # Composite
-          if _IsMapField(field):
-            if _IsMessageMapField(field):
-              for key in field_value:
-                copy[key].MergeFrom(field_value[key])
-            else:
-              copy.update(field_value)
-          else:
-            for val in field_value:
-              if isinstance(val, dict):
-                copy.add(**val)
-              else:
-                copy.add().MergeFrom(val)
-        else:  # Scalar
-          if field.cpp_type == _FieldDescriptor.CPPTYPE_ENUM:
-            field_value = [_GetIntegerEnumValue(field.enum_type, val)
-                           for val in field_value]
-          copy.extend(field_value)
-        self._fields[field] = copy
-      elif field.cpp_type == _FieldDescriptor.CPPTYPE_MESSAGE:
-        copy = field._default_constructor(self)
-        new_val = field_value
-        if isinstance(field_value, dict):
-          new_val = field.message_type._concrete_class(**field_value)
-        try:
-          copy.MergeFrom(new_val)
-        except TypeError:
-          _ReraiseTypeErrorWithFieldName(message_descriptor.name, field_name)
-        self._fields[field] = copy
-      else:
-        if field.cpp_type == _FieldDescriptor.CPPTYPE_ENUM:
-          field_value = _GetIntegerEnumValue(field.enum_type, field_value)
-        try:
-          setattr(self, field_name, field_value)
-        except TypeError:
-          _ReraiseTypeErrorWithFieldName(message_descriptor.name, field_name)
-
-  init.__module__ = None
-  init.__doc__ = None
-  cls.__init__ = init
-
-
-def _GetFieldByName(message_descriptor, field_name):
-  """Returns a field descriptor by field name.
-
-  Args:
-    message_descriptor: A Descriptor describing all fields in message.
-    field_name: The name of the field to retrieve.
-  Returns:
-    The field descriptor associated with the field name.
-  """
-  try:
-    return message_descriptor.fields_by_name[field_name]
-  except KeyError:
-    raise ValueError('Protocol message %s has no "%s" field.' %
-                     (message_descriptor.name, field_name))
-
-
-def _AddPropertiesForFields(descriptor, cls):
-  """Adds properties for all fields in this protocol message type."""
-  for field in descriptor.fields:
-    _AddPropertiesForField(field, cls)
-
-  if descriptor.is_extendable:
-    # _ExtensionDict is just an adaptor with no state so we allocate a new one
-    # every time it is accessed.
-    cls.Extensions = property(lambda self: _ExtensionDict(self))
-
-
-def _AddPropertiesForField(field, cls):
-  """Adds a public property for a protocol message field.
-  Clients can use this property to get and (in the case
-  of non-repeated scalar fields) directly set the value
-  of a protocol message field.
-
-  Args:
-    field: A FieldDescriptor for this field.
-    cls: The class we're constructing.
-  """
-  # Catch it if we add other types that we should
-  # handle specially here.
-  assert _FieldDescriptor.MAX_CPPTYPE == 10
-
-  constant_name = field.name.upper() + '_FIELD_NUMBER'
-  setattr(cls, constant_name, field.number)
-
-  if field.label == _FieldDescriptor.LABEL_REPEATED:
-    _AddPropertiesForRepeatedField(field, cls)
-  elif field.cpp_type == _FieldDescriptor.CPPTYPE_MESSAGE:
-    _AddPropertiesForNonRepeatedCompositeField(field, cls)
-  else:
-    _AddPropertiesForNonRepeatedScalarField(field, cls)
-
-
-class _FieldProperty(property):
-  __slots__ = ('DESCRIPTOR',)
-
-  def __init__(self, descriptor, getter, setter, doc):
-    property.__init__(self, getter, setter, doc=doc)
-    self.DESCRIPTOR = descriptor
-
-
-def _AddPropertiesForRepeatedField(field, cls):
-  """Adds a public property for a "repeated" protocol message field.  Clients
-  can use this property to get the value of the field, which will be either a
-  RepeatedScalarFieldContainer or RepeatedCompositeFieldContainer (see
-  below).
-
-  Note that when clients add values to these containers, we perform
-  type-checking in the case of repeated scalar fields, and we also set any
-  necessary "has" bits as a side-effect.
-
-  Args:
-    field: A FieldDescriptor for this field.
-    cls: The class we're constructing.
-  """
-  proto_field_name = field.name
-  property_name = _PropertyName(proto_field_name)
-
-  def getter(self):
-    field_value = self._fields.get(field)
-    if field_value is None:
-      # Construct a new object to represent this field.
-      field_value = field._default_constructor(self)
-
-      # Atomically check if another thread has preempted us and, if not, swap
-      # in the new object we just created.  If someone has preempted us, we
-      # take that object and discard ours.
-      # WARNING:  We are relying on setdefault() being atomic.  This is true
-      #   in CPython but we haven't investigated others.  This warning appears
-      #   in several other locations in this file.
-      field_value = self._fields.setdefault(field, field_value)
-    return field_value
-  getter.__module__ = None
-  getter.__doc__ = 'Getter for %s.' % proto_field_name
-
-  # We define a setter just so we can throw an exception with a more
-  # helpful error message.
-  def setter(self, new_value):
-    raise AttributeError('Assignment not allowed to repeated field '
-                         '"%s" in protocol message object.' % proto_field_name)
-
-  doc = 'Magic attribute generated for "%s" proto field.' % proto_field_name
-  setattr(cls, property_name, _FieldProperty(field, getter, setter, doc=doc))
-
-
-def _AddPropertiesForNonRepeatedScalarField(field, cls):
-  """Adds a public property for a nonrepeated, scalar protocol message field.
-  Clients can use this property to get and directly set the value of the field.
-  Note that when the client sets the value of a field by using this property,
-  all necessary "has" bits are set as a side-effect, and we also perform
-  type-checking.
-
-  Args:
-    field: A FieldDescriptor for this field.
-    cls: The class we're constructing.
-  """
-  proto_field_name = field.name
-  property_name = _PropertyName(proto_field_name)
-  type_checker = type_checkers.GetTypeChecker(field)
-  default_value = field.default_value
-  is_proto3 = field.containing_type.syntax == 'proto3'
-
-  def getter(self):
-    # TODO(protobuf-team): This may be broken since there may not be
-    # default_value.  Combine with has_default_value somehow.
-    return self._fields.get(field, default_value)
-  getter.__module__ = None
-  getter.__doc__ = 'Getter for %s.' % proto_field_name
-
-  clear_when_set_to_default = is_proto3 and not field.containing_oneof
-
-  def field_setter(self, new_value):
-    # pylint: disable=protected-access
-    # Testing the value for truthiness captures all of the proto3 defaults
-    # (0, 0.0, enum 0, and False).
-    try:
-      new_value = type_checker.CheckValue(new_value)
-    except TypeError as e:
-      raise TypeError(
-          'Cannot set %s to %.1024r: %s' % (field.full_name, new_value, e))
-    if clear_when_set_to_default and not new_value:
-      self._fields.pop(field, None)
-    else:
-      self._fields[field] = new_value
-    # Check _cached_byte_size_dirty inline to improve performance, since scalar
-    # setters are called frequently.
-    if not self._cached_byte_size_dirty:
-      self._Modified()
-
-  if field.containing_oneof:
-    def setter(self, new_value):
-      field_setter(self, new_value)
-      self._UpdateOneofState(field)
-  else:
-    setter = field_setter
-
-  setter.__module__ = None
-  setter.__doc__ = 'Setter for %s.' % proto_field_name
-
-  # Add a property to encapsulate the getter/setter.
-  doc = 'Magic attribute generated for "%s" proto field.' % proto_field_name
-  setattr(cls, property_name, _FieldProperty(field, getter, setter, doc=doc))
-
-
-def _AddPropertiesForNonRepeatedCompositeField(field, cls):
-  """Adds a public property for a nonrepeated, composite protocol message field.
-  A composite field is a "group" or "message" field.
-
-  Clients can use this property to get the value of the field, but cannot
-  assign to the property directly.
-
-  Args:
-    field: A FieldDescriptor for this field.
-    cls: The class we're constructing.
-  """
-  # TODO(robinson): Remove duplication with similar method
-  # for non-repeated scalars.
-  proto_field_name = field.name
-  property_name = _PropertyName(proto_field_name)
-
-  def getter(self):
-    field_value = self._fields.get(field)
-    if field_value is None:
-      # Construct a new object to represent this field.
-      field_value = field._default_constructor(self)
-
-      # Atomically check if another thread has preempted us and, if not, swap
-      # in the new object we just created.  If someone has preempted us, we
-      # take that object and discard ours.
-      # WARNING:  We are relying on setdefault() being atomic.  This is true
-      #   in CPython but we haven't investigated others.  This warning appears
-      #   in several other locations in this file.
-      field_value = self._fields.setdefault(field, field_value)
-    return field_value
-  getter.__module__ = None
-  getter.__doc__ = 'Getter for %s.' % proto_field_name
-
-  # We define a setter just so we can throw an exception with a more
-  # helpful error message.
-  def setter(self, new_value):
-    raise AttributeError('Assignment not allowed to composite field '
-                         '"%s" in protocol message object.' % proto_field_name)
-
-  # Add a property to encapsulate the getter.
-  doc = 'Magic attribute generated for "%s" proto field.' % proto_field_name
-  setattr(cls, property_name, _FieldProperty(field, getter, setter, doc=doc))
-
-
-def _AddPropertiesForExtensions(descriptor, cls):
-  """Adds properties for all fields in this protocol message type."""
-  extensions = descriptor.extensions_by_name
-  for extension_name, extension_field in extensions.items():
-    constant_name = extension_name.upper() + '_FIELD_NUMBER'
-    setattr(cls, constant_name, extension_field.number)
-
-  # TODO(amauryfa): Migrate all users of these attributes to functions like
-  #   pool.FindExtensionByNumber(descriptor).
-  if descriptor.file is not None:
-    # TODO(amauryfa): Use cls.MESSAGE_FACTORY.pool when available.
-    pool = descriptor.file.pool
-    cls._extensions_by_number = pool._extensions_by_number[descriptor]
-    cls._extensions_by_name = pool._extensions_by_name[descriptor]
-
-def _AddStaticMethods(cls):
-  # TODO(robinson): This probably needs to be thread-safe(?)
-  def RegisterExtension(extension_handle):
-    extension_handle.containing_type = cls.DESCRIPTOR
-    # TODO(amauryfa): Use cls.MESSAGE_FACTORY.pool when available.
-    # pylint: disable=protected-access
-    cls.DESCRIPTOR.file.pool._AddExtensionDescriptor(extension_handle)
-    _AttachFieldHelpers(cls, extension_handle)
-  cls.RegisterExtension = staticmethod(RegisterExtension)
-
-  def FromString(s):
-    message = cls()
-    message.MergeFromString(s)
-    return message
-  cls.FromString = staticmethod(FromString)
-
-
-def _IsPresent(item):
-  """Given a (FieldDescriptor, value) tuple from _fields, return true if the
-  value should be included in the list returned by ListFields()."""
-
-  if item[0].label == _FieldDescriptor.LABEL_REPEATED:
-    return bool(item[1])
-  elif item[0].cpp_type == _FieldDescriptor.CPPTYPE_MESSAGE:
-    return item[1]._is_present_in_parent
-  else:
-    return True
-
-
-def _AddListFieldsMethod(message_descriptor, cls):
-  """Helper for _AddMessageMethods()."""
-
-  def ListFields(self):
-    all_fields = [item for item in self._fields.items() if _IsPresent(item)]
-    all_fields.sort(key = lambda item: item[0].number)
-    return all_fields
-
-  cls.ListFields = ListFields
-
-_PROTO3_ERROR_TEMPLATE = \
-  ('Protocol message %s has no non-repeated submessage field "%s" '
-   'nor marked as optional')
-_PROTO2_ERROR_TEMPLATE = 'Protocol message %s has no non-repeated field "%s"'
-
-def _AddHasFieldMethod(message_descriptor, cls):
-  """Helper for _AddMessageMethods()."""
-
-  is_proto3 = (message_descriptor.syntax == "proto3")
-  error_msg = _PROTO3_ERROR_TEMPLATE if is_proto3 else _PROTO2_ERROR_TEMPLATE
-
-  hassable_fields = {}
-  for field in message_descriptor.fields:
-    if field.label == _FieldDescriptor.LABEL_REPEATED:
-      continue
-    # For proto3, only submessages and fields inside a oneof have presence.
-    if (is_proto3 and field.cpp_type != _FieldDescriptor.CPPTYPE_MESSAGE and
-        not field.containing_oneof):
-      continue
-    hassable_fields[field.name] = field
-
-  # Has methods are supported for oneof descriptors.
-  for oneof in message_descriptor.oneofs:
-    hassable_fields[oneof.name] = oneof
-
-  def HasField(self, field_name):
-    try:
-      field = hassable_fields[field_name]
-    except KeyError:
-      raise ValueError(error_msg % (message_descriptor.full_name, field_name))
-
-    if isinstance(field, descriptor_mod.OneofDescriptor):
-      try:
-        return HasField(self, self._oneofs[field].name)
-      except KeyError:
-        return False
-    else:
-      if field.cpp_type == _FieldDescriptor.CPPTYPE_MESSAGE:
-        value = self._fields.get(field)
-        return value is not None and value._is_present_in_parent
-      else:
-        return field in self._fields
-
-  cls.HasField = HasField
-
-
-def _AddClearFieldMethod(message_descriptor, cls):
-  """Helper for _AddMessageMethods()."""
-  def ClearField(self, field_name):
-    try:
-      field = message_descriptor.fields_by_name[field_name]
-    except KeyError:
-      try:
-        field = message_descriptor.oneofs_by_name[field_name]
-        if field in self._oneofs:
-          field = self._oneofs[field]
-        else:
-          return
-      except KeyError:
-        raise ValueError('Protocol message %s has no "%s" field.' %
-                         (message_descriptor.name, field_name))
-
-    if field in self._fields:
-      # To match the C++ implementation, we need to invalidate iterators
-      # for map fields when ClearField() happens.
-      if hasattr(self._fields[field], 'InvalidateIterators'):
-        self._fields[field].InvalidateIterators()
-
-      # Note:  If the field is a sub-message, its listener will still point
-      #   at us.  That's fine, because the worst than can happen is that it
-      #   will call _Modified() and invalidate our byte size.  Big deal.
-      del self._fields[field]
-
-      if self._oneofs.get(field.containing_oneof, None) is field:
-        del self._oneofs[field.containing_oneof]
-
-    # Always call _Modified() -- even if nothing was changed, this is
-    # a mutating method, and thus calling it should cause the field to become
-    # present in the parent message.
-    self._Modified()
-
-  cls.ClearField = ClearField
-
-
-def _AddClearExtensionMethod(cls):
-  """Helper for _AddMessageMethods()."""
-  def ClearExtension(self, extension_handle):
-    extension_dict._VerifyExtensionHandle(self, extension_handle)
-
-    # Similar to ClearField(), above.
-    if extension_handle in self._fields:
-      del self._fields[extension_handle]
-    self._Modified()
-  cls.ClearExtension = ClearExtension
-
-
-def _AddHasExtensionMethod(cls):
-  """Helper for _AddMessageMethods()."""
-  def HasExtension(self, extension_handle):
-    extension_dict._VerifyExtensionHandle(self, extension_handle)
-    if extension_handle.label == _FieldDescriptor.LABEL_REPEATED:
-      raise KeyError('"%s" is repeated.' % extension_handle.full_name)
-
-    if extension_handle.cpp_type == _FieldDescriptor.CPPTYPE_MESSAGE:
-      value = self._fields.get(extension_handle)
-      return value is not None and value._is_present_in_parent
-    else:
-      return extension_handle in self._fields
-  cls.HasExtension = HasExtension
-
-def _InternalUnpackAny(msg):
-  """Unpacks Any message and returns the unpacked message.
-
-  This internal method is different from public Any Unpack method which takes
-  the target message as argument. _InternalUnpackAny method does not have
-  target message type and need to find the message type in descriptor pool.
-
-  Args:
-    msg: An Any message to be unpacked.
-
-  Returns:
-    The unpacked message.
-  """
-  # TODO(amauryfa): Don't use the factory of generated messages.
-  # To make Any work with custom factories, use the message factory of the
-  # parent message.
-  # pylint: disable=g-import-not-at-top
-  from google.protobuf import symbol_database
-  factory = symbol_database.Default()
-
-  type_url = msg.type_url
-
-  if not type_url:
-    return None
-
-  # TODO(haberman): For now we just strip the hostname.  Better logic will be
-  # required.
-  type_name = type_url.split('/')[-1]
-  descriptor = factory.pool.FindMessageTypeByName(type_name)
-
-  if descriptor is None:
-    return None
-
-  message_class = factory.GetPrototype(descriptor)
-  message = message_class()
-
-  message.ParseFromString(msg.value)
-  return message
-
-
-def _AddEqualsMethod(message_descriptor, cls):
-  """Helper for _AddMessageMethods()."""
-  def __eq__(self, other):
-    if (not isinstance(other, message_mod.Message) or
-        other.DESCRIPTOR != self.DESCRIPTOR):
-      return False
-
-    if self is other:
-      return True
-
-    if self.DESCRIPTOR.full_name == _AnyFullTypeName:
-      any_a = _InternalUnpackAny(self)
-      any_b = _InternalUnpackAny(other)
-      if any_a and any_b:
-        return any_a == any_b
-
-    if not self.ListFields() == other.ListFields():
-      return False
-
-    # TODO(jieluo): Fix UnknownFieldSet to consider MessageSet extensions,
-    # then use it for the comparison.
-    unknown_fields = list(self._unknown_fields)
-    unknown_fields.sort()
-    other_unknown_fields = list(other._unknown_fields)
-    other_unknown_fields.sort()
-    return unknown_fields == other_unknown_fields
-
-  cls.__eq__ = __eq__
-
-
-def _AddStrMethod(message_descriptor, cls):
-  """Helper for _AddMessageMethods()."""
-  def __str__(self):
-    return text_format.MessageToString(self)
-  cls.__str__ = __str__
-
-
-def _AddReprMethod(message_descriptor, cls):
-  """Helper for _AddMessageMethods()."""
-  def __repr__(self):
-    return text_format.MessageToString(self)
-  cls.__repr__ = __repr__
-
-
-def _AddUnicodeMethod(unused_message_descriptor, cls):
-  """Helper for _AddMessageMethods()."""
-
-  def __unicode__(self):
-    return text_format.MessageToString(self, as_utf8=True).decode('utf-8')
-  cls.__unicode__ = __unicode__
-
-
-def _BytesForNonRepeatedElement(value, field_number, field_type):
-  """Returns the number of bytes needed to serialize a non-repeated element.
-  The returned byte count includes space for tag information and any
-  other additional space associated with serializing value.
-
-  Args:
-    value: Value we're serializing.
-    field_number: Field number of this value.  (Since the field number
-      is stored as part of a varint-encoded tag, this has an impact
-      on the total bytes required to serialize the value).
-    field_type: The type of the field.  One of the TYPE_* constants
-      within FieldDescriptor.
-  """
-  try:
-    fn = type_checkers.TYPE_TO_BYTE_SIZE_FN[field_type]
-    return fn(field_number, value)
-  except KeyError:
-    raise message_mod.EncodeError('Unrecognized field type: %d' % field_type)
-
-
-def _AddByteSizeMethod(message_descriptor, cls):
-  """Helper for _AddMessageMethods()."""
-
-  def ByteSize(self):
-    if not self._cached_byte_size_dirty:
-      return self._cached_byte_size
-
-    size = 0
-    descriptor = self.DESCRIPTOR
-    if descriptor.GetOptions().map_entry:
-      # Fields of map entry should always be serialized.
-      size = descriptor.fields_by_name['key']._sizer(self.key)
-      size += descriptor.fields_by_name['value']._sizer(self.value)
-    else:
-      for field_descriptor, field_value in self.ListFields():
-        size += field_descriptor._sizer(field_value)
-      for tag_bytes, value_bytes in self._unknown_fields:
-        size += len(tag_bytes) + len(value_bytes)
-
-    self._cached_byte_size = size
-    self._cached_byte_size_dirty = False
-    self._listener_for_children.dirty = False
-    return size
-
-  cls.ByteSize = ByteSize
-
-
-def _AddSerializeToStringMethod(message_descriptor, cls):
-  """Helper for _AddMessageMethods()."""
-
-  def SerializeToString(self, **kwargs):
-    # Check if the message has all of its required fields set.
-    if not self.IsInitialized():
-      raise message_mod.EncodeError(
-          'Message %s is missing required fields: %s' % (
-          self.DESCRIPTOR.full_name, ','.join(self.FindInitializationErrors())))
-    return self.SerializePartialToString(**kwargs)
-  cls.SerializeToString = SerializeToString
-
-
-def _AddSerializePartialToStringMethod(message_descriptor, cls):
-  """Helper for _AddMessageMethods()."""
-
-  def SerializePartialToString(self, **kwargs):
-    out = BytesIO()
-    self._InternalSerialize(out.write, **kwargs)
-    return out.getvalue()
-  cls.SerializePartialToString = SerializePartialToString
-
-  def InternalSerialize(self, write_bytes, deterministic=None):
-    if deterministic is None:
-      deterministic = (
-          api_implementation.IsPythonDefaultSerializationDeterministic())
-    else:
-      deterministic = bool(deterministic)
-
-    descriptor = self.DESCRIPTOR
-    if descriptor.GetOptions().map_entry:
-      # Fields of map entry should always be serialized.
-      descriptor.fields_by_name['key']._encoder(
-          write_bytes, self.key, deterministic)
-      descriptor.fields_by_name['value']._encoder(
-          write_bytes, self.value, deterministic)
-    else:
-      for field_descriptor, field_value in self.ListFields():
-        field_descriptor._encoder(write_bytes, field_value, deterministic)
-      for tag_bytes, value_bytes in self._unknown_fields:
-        write_bytes(tag_bytes)
-        write_bytes(value_bytes)
-  cls._InternalSerialize = InternalSerialize
-
-
-def _AddMergeFromStringMethod(message_descriptor, cls):
-  """Helper for _AddMessageMethods()."""
-  def MergeFromString(self, serialized):
-    serialized = memoryview(serialized)
-    length = len(serialized)
-    try:
-      if self._InternalParse(serialized, 0, length) != length:
-        # The only reason _InternalParse would return early is if it
-        # encountered an end-group tag.
-        raise message_mod.DecodeError('Unexpected end-group tag.')
-    except (IndexError, TypeError):
-      # Now ord(buf[p:p+1]) == ord('') gets TypeError.
-      raise message_mod.DecodeError('Truncated message.')
-    except struct.error as e:
-      raise message_mod.DecodeError(e)
-    return length   # Return this for legacy reasons.
-  cls.MergeFromString = MergeFromString
-
-  local_ReadTag = decoder.ReadTag
-  local_SkipField = decoder.SkipField
-  decoders_by_tag = cls._decoders_by_tag
-
-  def InternalParse(self, buffer, pos, end):
-    """Create a message from serialized bytes.
-
-    Args:
-      self: Message, instance of the proto message object.
-      buffer: memoryview of the serialized data.
-      pos: int, position to start in the serialized data.
-      end: int, end position of the serialized data.
-
-    Returns:
-      Message object.
-    """
-    # Guard against internal misuse, since this function is called internally
-    # quite extensively, and its easy to accidentally pass bytes.
-    assert isinstance(buffer, memoryview)
-    self._Modified()
-    field_dict = self._fields
-    # pylint: disable=protected-access
-    unknown_field_set = self._unknown_field_set
-    while pos != end:
-      (tag_bytes, new_pos) = local_ReadTag(buffer, pos)
-      field_decoder, field_desc = decoders_by_tag.get(tag_bytes, (None, None))
-      if field_decoder is None:
-        if not self._unknown_fields:   # pylint: disable=protected-access
-          self._unknown_fields = []    # pylint: disable=protected-access
-        if unknown_field_set is None:
-          # pylint: disable=protected-access
-          self._unknown_field_set = containers.UnknownFieldSet()
-          # pylint: disable=protected-access
-          unknown_field_set = self._unknown_field_set
-        # pylint: disable=protected-access
-        (tag, _) = decoder._DecodeVarint(tag_bytes, 0)
-        field_number, wire_type = wire_format.UnpackTag(tag)
-        if field_number == 0:
-          raise message_mod.DecodeError('Field number 0 is illegal.')
-        # TODO(jieluo): remove old_pos.
-        old_pos = new_pos
-        (data, new_pos) = decoder._DecodeUnknownField(
-            buffer, new_pos, wire_type)  # pylint: disable=protected-access
-        if new_pos == -1:
-          return pos
-        # pylint: disable=protected-access
-        unknown_field_set._add(field_number, wire_type, data)
-        # TODO(jieluo): remove _unknown_fields.
-        new_pos = local_SkipField(buffer, old_pos, end, tag_bytes)
-        if new_pos == -1:
-          return pos
-        self._unknown_fields.append(
-            (tag_bytes, buffer[old_pos:new_pos].tobytes()))
-        pos = new_pos
-      else:
-        pos = field_decoder(buffer, new_pos, end, self, field_dict)
-        if field_desc:
-          self._UpdateOneofState(field_desc)
-    return pos
-  cls._InternalParse = InternalParse
-
-
-def _AddIsInitializedMethod(message_descriptor, cls):
-  """Adds the IsInitialized and FindInitializationError methods to the
-  protocol message class."""
-
-  required_fields = [field for field in message_descriptor.fields
-                           if field.label == _FieldDescriptor.LABEL_REQUIRED]
-
-  def IsInitialized(self, errors=None):
-    """Checks if all required fields of a message are set.
-
-    Args:
-      errors:  A list which, if provided, will be populated with the field
-               paths of all missing required fields.
-
-    Returns:
-      True iff the specified message has all required fields set.
-    """
-
-    # Performance is critical so we avoid HasField() and ListFields().
-
-    for field in required_fields:
-      if (field not in self._fields or
-          (field.cpp_type == _FieldDescriptor.CPPTYPE_MESSAGE and
-           not self._fields[field]._is_present_in_parent)):
-        if errors is not None:
-          errors.extend(self.FindInitializationErrors())
-        return False
-
-    for field, value in list(self._fields.items()):  # dict can change size!
-      if field.cpp_type == _FieldDescriptor.CPPTYPE_MESSAGE:
-        if field.label == _FieldDescriptor.LABEL_REPEATED:
-          if (field.message_type.has_options and
-              field.message_type.GetOptions().map_entry):
-            continue
-          for element in value:
-            if not element.IsInitialized():
-              if errors is not None:
-                errors.extend(self.FindInitializationErrors())
-              return False
-        elif value._is_present_in_parent and not value.IsInitialized():
-          if errors is not None:
-            errors.extend(self.FindInitializationErrors())
-          return False
-
-    return True
-
-  cls.IsInitialized = IsInitialized
-
-  def FindInitializationErrors(self):
-    """Finds required fields which are not initialized.
-
-    Returns:
-      A list of strings.  Each string is a path to an uninitialized field from
-      the top-level message, e.g. "foo.bar[5].baz".
-    """
-
-    errors = []  # simplify things
-
-    for field in required_fields:
-      if not self.HasField(field.name):
-        errors.append(field.name)
-
-    for field, value in self.ListFields():
-      if field.cpp_type == _FieldDescriptor.CPPTYPE_MESSAGE:
-        if field.is_extension:
-          name = '(%s)' % field.full_name
-        else:
-          name = field.name
-
-        if _IsMapField(field):
-          if _IsMessageMapField(field):
-            for key in value:
-              element = value[key]
-              prefix = '%s[%s].' % (name, key)
-              sub_errors = element.FindInitializationErrors()
-              errors += [prefix + error for error in sub_errors]
-          else:
-            # ScalarMaps can't have any initialization errors.
-            pass
-        elif field.label == _FieldDescriptor.LABEL_REPEATED:
-          for i in range(len(value)):
-            element = value[i]
-            prefix = '%s[%d].' % (name, i)
-            sub_errors = element.FindInitializationErrors()
-            errors += [prefix + error for error in sub_errors]
-        else:
-          prefix = name + '.'
-          sub_errors = value.FindInitializationErrors()
-          errors += [prefix + error for error in sub_errors]
-
-    return errors
-
-  cls.FindInitializationErrors = FindInitializationErrors
-
-
-def _FullyQualifiedClassName(klass):
-  module = klass.__module__
-  name = getattr(klass, '__qualname__', klass.__name__)
-  if module in (None, 'builtins', '__builtin__'):
-    return name
-  return module + '.' + name
-
-
-def _AddMergeFromMethod(cls):
-  LABEL_REPEATED = _FieldDescriptor.LABEL_REPEATED
-  CPPTYPE_MESSAGE = _FieldDescriptor.CPPTYPE_MESSAGE
-
-  def MergeFrom(self, msg):
-    if not isinstance(msg, cls):
-      raise TypeError(
-          'Parameter to MergeFrom() must be instance of same class: '
-          'expected %s got %s.' % (_FullyQualifiedClassName(cls),
-                                   _FullyQualifiedClassName(msg.__class__)))
-
-    assert msg is not self
-    self._Modified()
-
-    fields = self._fields
-
-    for field, value in msg._fields.items():
-      if field.label == LABEL_REPEATED:
-        field_value = fields.get(field)
-        if field_value is None:
-          # Construct a new object to represent this field.
-          field_value = field._default_constructor(self)
-          fields[field] = field_value
-        field_value.MergeFrom(value)
-      elif field.cpp_type == CPPTYPE_MESSAGE:
-        if value._is_present_in_parent:
-          field_value = fields.get(field)
-          if field_value is None:
-            # Construct a new object to represent this field.
-            field_value = field._default_constructor(self)
-            fields[field] = field_value
-          field_value.MergeFrom(value)
-      else:
-        self._fields[field] = value
-        if field.containing_oneof:
-          self._UpdateOneofState(field)
-
-    if msg._unknown_fields:
-      if not self._unknown_fields:
-        self._unknown_fields = []
-      self._unknown_fields.extend(msg._unknown_fields)
-      # pylint: disable=protected-access
-      if self._unknown_field_set is None:
-        self._unknown_field_set = containers.UnknownFieldSet()
-      self._unknown_field_set._extend(msg._unknown_field_set)
-
-  cls.MergeFrom = MergeFrom
-
-
-def _AddWhichOneofMethod(message_descriptor, cls):
-  def WhichOneof(self, oneof_name):
-    """Returns the name of the currently set field inside a oneof, or None."""
-    try:
-      field = message_descriptor.oneofs_by_name[oneof_name]
-    except KeyError:
-      raise ValueError(
-          'Protocol message has no oneof "%s" field.' % oneof_name)
-
-    nested_field = self._oneofs.get(field, None)
-    if nested_field is not None and self.HasField(nested_field.name):
-      return nested_field.name
-    else:
-      return None
-
-  cls.WhichOneof = WhichOneof
-
-
-def _Clear(self):
-  # Clear fields.
-  self._fields = {}
-  self._unknown_fields = ()
-  # pylint: disable=protected-access
-  if self._unknown_field_set is not None:
-    self._unknown_field_set._clear()
-    self._unknown_field_set = None
-
-  self._oneofs = {}
-  self._Modified()
-
-
-def _UnknownFields(self):
-  if self._unknown_field_set is None:  # pylint: disable=protected-access
-    # pylint: disable=protected-access
-    self._unknown_field_set = containers.UnknownFieldSet()
-  return self._unknown_field_set    # pylint: disable=protected-access
-
-
-def _DiscardUnknownFields(self):
-  self._unknown_fields = []
-  self._unknown_field_set = None      # pylint: disable=protected-access
-  for field, value in self.ListFields():
-    if field.cpp_type == _FieldDescriptor.CPPTYPE_MESSAGE:
-      if _IsMapField(field):
-        if _IsMessageMapField(field):
-          for key in value:
-            value[key].DiscardUnknownFields()
-      elif field.label == _FieldDescriptor.LABEL_REPEATED:
-        for sub_message in value:
-          sub_message.DiscardUnknownFields()
-      else:
-        value.DiscardUnknownFields()
-
-
-def _SetListener(self, listener):
-  if listener is None:
-    self._listener = message_listener_mod.NullMessageListener()
-  else:
-    self._listener = listener
-
-
-def _AddMessageMethods(message_descriptor, cls):
-  """Adds implementations of all Message methods to cls."""
-  _AddListFieldsMethod(message_descriptor, cls)
-  _AddHasFieldMethod(message_descriptor, cls)
-  _AddClearFieldMethod(message_descriptor, cls)
-  if message_descriptor.is_extendable:
-    _AddClearExtensionMethod(cls)
-    _AddHasExtensionMethod(cls)
-  _AddEqualsMethod(message_descriptor, cls)
-  _AddStrMethod(message_descriptor, cls)
-  _AddReprMethod(message_descriptor, cls)
-  _AddUnicodeMethod(message_descriptor, cls)
-  _AddByteSizeMethod(message_descriptor, cls)
-  _AddSerializeToStringMethod(message_descriptor, cls)
-  _AddSerializePartialToStringMethod(message_descriptor, cls)
-  _AddMergeFromStringMethod(message_descriptor, cls)
-  _AddIsInitializedMethod(message_descriptor, cls)
-  _AddMergeFromMethod(cls)
-  _AddWhichOneofMethod(message_descriptor, cls)
-  # Adds methods which do not depend on cls.
-  cls.Clear = _Clear
-  cls.UnknownFields = _UnknownFields
-  cls.DiscardUnknownFields = _DiscardUnknownFields
-  cls._SetListener = _SetListener
-
-
-def _AddPrivateHelperMethods(message_descriptor, cls):
-  """Adds implementation of private helper methods to cls."""
-
-  def Modified(self):
-    """Sets the _cached_byte_size_dirty bit to true,
-    and propagates this to our listener iff this was a state change.
-    """
-
-    # Note:  Some callers check _cached_byte_size_dirty before calling
-    #   _Modified() as an extra optimization.  So, if this method is ever
-    #   changed such that it does stuff even when _cached_byte_size_dirty is
-    #   already true, the callers need to be updated.
-    if not self._cached_byte_size_dirty:
-      self._cached_byte_size_dirty = True
-      self._listener_for_children.dirty = True
-      self._is_present_in_parent = True
-      self._listener.Modified()
-
-  def _UpdateOneofState(self, field):
-    """Sets field as the active field in its containing oneof.
-
-    Will also delete currently active field in the oneof, if it is different
-    from the argument. Does not mark the message as modified.
-    """
-    other_field = self._oneofs.setdefault(field.containing_oneof, field)
-    if other_field is not field:
-      del self._fields[other_field]
-      self._oneofs[field.containing_oneof] = field
-
-  cls._Modified = Modified
-  cls.SetInParent = Modified
-  cls._UpdateOneofState = _UpdateOneofState
-
-
-class _Listener(object):
-
-  """MessageListener implementation that a parent message registers with its
-  child message.
-
-  In order to support semantics like:
-
-    foo.bar.baz.moo = 23
-    assert foo.HasField('bar')
-
-  ...child objects must have back references to their parents.
-  This helper class is at the heart of this support.
-  """
-
-  def __init__(self, parent_message):
-    """Args:
-      parent_message: The message whose _Modified() method we should call when
-        we receive Modified() messages.
-    """
-    # This listener establishes a back reference from a child (contained) object
-    # to its parent (containing) object.  We make this a weak reference to avoid
-    # creating cyclic garbage when the client finishes with the 'parent' object
-    # in the tree.
-    if isinstance(parent_message, weakref.ProxyType):
-      self._parent_message_weakref = parent_message
-    else:
-      self._parent_message_weakref = weakref.proxy(parent_message)
-
-    # As an optimization, we also indicate directly on the listener whether
-    # or not the parent message is dirty.  This way we can avoid traversing
-    # up the tree in the common case.
-    self.dirty = False
-
-  def Modified(self):
-    if self.dirty:
-      return
-    try:
-      # Propagate the signal to our parents iff this is the first field set.
-      self._parent_message_weakref._Modified()
-    except ReferenceError:
-      # We can get here if a client has kept a reference to a child object,
-      # and is now setting a field on it, but the child's parent has been
-      # garbage-collected.  This is not an error.
-      pass
-
-
-class _OneofListener(_Listener):
-  """Special listener implementation for setting composite oneof fields."""
-
-  def __init__(self, parent_message, field):
-    """Args:
-      parent_message: The message whose _Modified() method we should call when
-        we receive Modified() messages.
-      field: The descriptor of the field being set in the parent message.
-    """
-    super(_OneofListener, self).__init__(parent_message)
-    self._field = field
-
-  def Modified(self):
-    """Also updates the state of the containing oneof in the parent message."""
-    try:
-      self._parent_message_weakref._UpdateOneofState(self._field)
-      super(_OneofListener, self).Modified()
-    except ReferenceError:
-      pass
diff --git a/libs/protobuf/python/google/protobuf/internal/python_protobuf.cc b/libs/protobuf/python/google/protobuf/internal/python_protobuf.cc
deleted file mode 100644
index 26e3a8b..0000000
--- a/libs/protobuf/python/google/protobuf/internal/python_protobuf.cc
+++ /dev/null
@@ -1,63 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: qrczak@google.com (Marcin Kowalczyk)
-
-#include <google/protobuf/python/python_protobuf.h>
-
-namespace google {
-namespace protobuf {
-namespace python {
-
-static const Message* GetCProtoInsidePyProtoStub(PyObject* msg) {
-  return nullptr;
-}
-static Message* MutableCProtoInsidePyProtoStub(PyObject* msg) {
-  return nullptr;
-}
-
-// This is initialized with a default, stub implementation.
-// If python-google.protobuf.cc is loaded, the function pointer is overridden
-// with a full implementation.
-const Message* (*GetCProtoInsidePyProtoPtr)(PyObject* msg) =
-    GetCProtoInsidePyProtoStub;
-Message* (*MutableCProtoInsidePyProtoPtr)(PyObject* msg) =
-    MutableCProtoInsidePyProtoStub;
-
-const Message* GetCProtoInsidePyProto(PyObject* msg) {
-  return GetCProtoInsidePyProtoPtr(msg);
-}
-Message* MutableCProtoInsidePyProto(PyObject* msg) {
-  return MutableCProtoInsidePyProtoPtr(msg);
-}
-
-}  // namespace python
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/python/google/protobuf/internal/reflection_test.py b/libs/protobuf/python/google/protobuf/internal/reflection_test.py
deleted file mode 100644
index 62957d3..0000000
--- a/libs/protobuf/python/google/protobuf/internal/reflection_test.py
+++ /dev/null
@@ -1,3381 +0,0 @@
-# -*- coding: utf-8 -*-
-# Protocol Buffers - Google's data interchange format
-# Copyright 2008 Google Inc.  All rights reserved.
-# https://developers.google.com/protocol-buffers/
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-"""Unittest for reflection.py, which also indirectly tests the output of the
-pure-Python protocol compiler.
-"""
-
-import copy
-import gc
-import operator
-import struct
-import sys
-import warnings
-import unittest
-
-from google.protobuf import unittest_import_pb2
-from google.protobuf import unittest_mset_pb2
-from google.protobuf import unittest_pb2
-from google.protobuf import unittest_proto3_arena_pb2
-from google.protobuf import descriptor_pb2
-from google.protobuf import descriptor
-from google.protobuf import message
-from google.protobuf import reflection
-from google.protobuf import text_format
-from google.protobuf.internal import api_implementation
-from google.protobuf.internal import more_extensions_pb2
-from google.protobuf.internal import more_messages_pb2
-from google.protobuf.internal import message_set_extensions_pb2
-from google.protobuf.internal import wire_format
-from google.protobuf.internal import test_util
-from google.protobuf.internal import testing_refleaks
-from google.protobuf.internal import decoder
-from google.protobuf.internal import _parameterized
-
-
-warnings.simplefilter('error', DeprecationWarning)
-
-
-class _MiniDecoder(object):
-  """Decodes a stream of values from a string.
-
-  Once upon a time we actually had a class called decoder.Decoder.  Then we
-  got rid of it during a redesign that made decoding much, much faster overall.
-  But a couple tests in this file used it to check that the serialized form of
-  a message was correct.  So, this class implements just the methods that were
-  used by said tests, so that we don't have to rewrite the tests.
-  """
-
-  def __init__(self, bytes):
-    self._bytes = bytes
-    self._pos = 0
-
-  def ReadVarint(self):
-    result, self._pos = decoder._DecodeVarint(self._bytes, self._pos)
-    return result
-
-  ReadInt32 = ReadVarint
-  ReadInt64 = ReadVarint
-  ReadUInt32 = ReadVarint
-  ReadUInt64 = ReadVarint
-
-  def ReadSInt64(self):
-    return wire_format.ZigZagDecode(self.ReadVarint())
-
-  ReadSInt32 = ReadSInt64
-
-  def ReadFieldNumberAndWireType(self):
-    return wire_format.UnpackTag(self.ReadVarint())
-
-  def ReadFloat(self):
-    result = struct.unpack('<f', self._bytes[self._pos:self._pos+4])[0]
-    self._pos += 4
-    return result
-
-  def ReadDouble(self):
-    result = struct.unpack('<d', self._bytes[self._pos:self._pos+8])[0]
-    self._pos += 8
-    return result
-
-  def EndOfStream(self):
-    return self._pos == len(self._bytes)
-
-
-@_parameterized.named_parameters(
-    ('_proto2', unittest_pb2),
-    ('_proto3', unittest_proto3_arena_pb2))
-@testing_refleaks.TestCase
-class ReflectionTest(unittest.TestCase):
-
-  def assertListsEqual(self, values, others):
-    self.assertEqual(len(values), len(others))
-    for i in range(len(values)):
-      self.assertEqual(values[i], others[i])
-
-  def testScalarConstructor(self, message_module):
-    # Constructor with only scalar types should succeed.
-    proto = message_module.TestAllTypes(
-        optional_int32=24,
-        optional_double=54.321,
-        optional_string='optional_string',
-        optional_float=None)
-
-    self.assertEqual(24, proto.optional_int32)
-    self.assertEqual(54.321, proto.optional_double)
-    self.assertEqual('optional_string', proto.optional_string)
-    if message_module is unittest_pb2:
-      self.assertFalse(proto.HasField("optional_float"))
-
-  def testRepeatedScalarConstructor(self, message_module):
-    # Constructor with only repeated scalar types should succeed.
-    proto = message_module.TestAllTypes(
-        repeated_int32=[1, 2, 3, 4],
-        repeated_double=[1.23, 54.321],
-        repeated_bool=[True, False, False],
-        repeated_string=["optional_string"],
-        repeated_float=None)
-
-    self.assertEqual([1, 2, 3, 4], list(proto.repeated_int32))
-    self.assertEqual([1.23, 54.321], list(proto.repeated_double))
-    self.assertEqual([True, False, False], list(proto.repeated_bool))
-    self.assertEqual(["optional_string"], list(proto.repeated_string))
-    self.assertEqual([], list(proto.repeated_float))
-
-  def testMixedConstructor(self, message_module):
-    # Constructor with only mixed types should succeed.
-    proto = message_module.TestAllTypes(
-        optional_int32=24,
-        optional_string='optional_string',
-        repeated_double=[1.23, 54.321],
-        repeated_bool=[True, False, False],
-        repeated_nested_message=[
-            message_module.TestAllTypes.NestedMessage(
-                bb=message_module.TestAllTypes.FOO),
-            message_module.TestAllTypes.NestedMessage(
-                bb=message_module.TestAllTypes.BAR)],
-        repeated_foreign_message=[
-            message_module.ForeignMessage(c=-43),
-            message_module.ForeignMessage(c=45324),
-            message_module.ForeignMessage(c=12)],
-        optional_nested_message=None)
-
-    self.assertEqual(24, proto.optional_int32)
-    self.assertEqual('optional_string', proto.optional_string)
-    self.assertEqual([1.23, 54.321], list(proto.repeated_double))
-    self.assertEqual([True, False, False], list(proto.repeated_bool))
-    self.assertEqual(
-        [message_module.TestAllTypes.NestedMessage(
-            bb=message_module.TestAllTypes.FOO),
-         message_module.TestAllTypes.NestedMessage(
-             bb=message_module.TestAllTypes.BAR)],
-        list(proto.repeated_nested_message))
-    self.assertEqual(
-        [message_module.ForeignMessage(c=-43),
-         message_module.ForeignMessage(c=45324),
-         message_module.ForeignMessage(c=12)],
-        list(proto.repeated_foreign_message))
-    self.assertFalse(proto.HasField("optional_nested_message"))
-
-  def testConstructorTypeError(self, message_module):
-    self.assertRaises(
-        TypeError, message_module.TestAllTypes, optional_int32='foo')
-    self.assertRaises(
-        TypeError, message_module.TestAllTypes, optional_string=1234)
-    self.assertRaises(
-        TypeError, message_module.TestAllTypes, optional_nested_message=1234)
-    self.assertRaises(
-        TypeError, message_module.TestAllTypes, repeated_int32=1234)
-    self.assertRaises(
-        TypeError, message_module.TestAllTypes, repeated_int32=['foo'])
-    self.assertRaises(
-        TypeError, message_module.TestAllTypes, repeated_string=1234)
-    self.assertRaises(
-        TypeError, message_module.TestAllTypes, repeated_string=[1234])
-    self.assertRaises(
-        TypeError, message_module.TestAllTypes, repeated_nested_message=1234)
-    self.assertRaises(
-        TypeError, message_module.TestAllTypes, repeated_nested_message=[1234])
-
-  def testConstructorInvalidatesCachedByteSize(self, message_module):
-    message = message_module.TestAllTypes(optional_int32=12)
-    self.assertEqual(2, message.ByteSize())
-
-    message = message_module.TestAllTypes(
-        optional_nested_message=message_module.TestAllTypes.NestedMessage())
-    self.assertEqual(3, message.ByteSize())
-
-    message = message_module.TestAllTypes(repeated_int32=[12])
-    # TODO(jieluo): Add this test back for proto3
-    if message_module is unittest_pb2:
-      self.assertEqual(3, message.ByteSize())
-
-    message = message_module.TestAllTypes(
-        repeated_nested_message=[message_module.TestAllTypes.NestedMessage()])
-    self.assertEqual(3, message.ByteSize())
-
-  def testReferencesToNestedMessage(self, message_module):
-    proto = message_module.TestAllTypes()
-    nested = proto.optional_nested_message
-    del proto
-    # A previous version had a bug where this would raise an exception when
-    # hitting a now-dead weak reference.
-    nested.bb = 23
-
-  def testOneOf(self, message_module):
-    proto = message_module.TestAllTypes()
-    proto.oneof_uint32 = 10
-    proto.oneof_nested_message.bb = 11
-    self.assertEqual(11, proto.oneof_nested_message.bb)
-    self.assertFalse(proto.HasField('oneof_uint32'))
-    nested = proto.oneof_nested_message
-    proto.oneof_string = 'abc'
-    self.assertEqual('abc', proto.oneof_string)
-    self.assertEqual(11, nested.bb)
-    self.assertFalse(proto.HasField('oneof_nested_message'))
-
-  def testGetDefaultMessageAfterDisconnectingDefaultMessage(
-      self, message_module):
-    proto = message_module.TestAllTypes()
-    nested = proto.optional_nested_message
-    proto.ClearField('optional_nested_message')
-    del proto
-    del nested
-    # Force a garbage collect so that the underlying CMessages are freed along
-    # with the Messages they point to. This is to make sure we're not deleting
-    # default message instances.
-    gc.collect()
-    proto = message_module.TestAllTypes()
-    nested = proto.optional_nested_message
-
-  def testDisconnectingNestedMessageAfterSettingField(self, message_module):
-    proto = message_module.TestAllTypes()
-    nested = proto.optional_nested_message
-    nested.bb = 5
-    self.assertTrue(proto.HasField('optional_nested_message'))
-    proto.ClearField('optional_nested_message')  # Should disconnect from parent
-    self.assertEqual(5, nested.bb)
-    self.assertEqual(0, proto.optional_nested_message.bb)
-    self.assertIsNot(nested, proto.optional_nested_message)
-    nested.bb = 23
-    self.assertFalse(proto.HasField('optional_nested_message'))
-    self.assertEqual(0, proto.optional_nested_message.bb)
-
-  def testDisconnectingNestedMessageBeforeGettingField(self, message_module):
-    proto = message_module.TestAllTypes()
-    self.assertFalse(proto.HasField('optional_nested_message'))
-    proto.ClearField('optional_nested_message')
-    self.assertFalse(proto.HasField('optional_nested_message'))
-
-  def testDisconnectingNestedMessageAfterMerge(self, message_module):
-    # This test exercises the code path that does not use ReleaseMessage().
-    # The underlying fear is that if we use ReleaseMessage() incorrectly,
-    # we will have memory leaks.  It's hard to check that that doesn't happen,
-    # but at least we can exercise that code path to make sure it works.
-    proto1 = message_module.TestAllTypes()
-    proto2 = message_module.TestAllTypes()
-    proto2.optional_nested_message.bb = 5
-    proto1.MergeFrom(proto2)
-    self.assertTrue(proto1.HasField('optional_nested_message'))
-    proto1.ClearField('optional_nested_message')
-    self.assertFalse(proto1.HasField('optional_nested_message'))
-
-  def testDisconnectingLazyNestedMessage(self, message_module):
-    # This test exercises releasing a nested message that is lazy. This test
-    # only exercises real code in the C++ implementation as Python does not
-    # support lazy parsing, but the current C++ implementation results in
-    # memory corruption and a crash.
-    if api_implementation.Type() != 'python':
-      return
-    proto = message_module.TestAllTypes()
-    proto.optional_lazy_message.bb = 5
-    proto.ClearField('optional_lazy_message')
-    del proto
-    gc.collect()
-
-  def testSingularListFields(self, message_module):
-    proto = message_module.TestAllTypes()
-    proto.optional_fixed32 = 1
-    proto.optional_int32 = 5
-    proto.optional_string = 'foo'
-    # Access sub-message but don't set it yet.
-    nested_message = proto.optional_nested_message
-    self.assertEqual(
-      [ (proto.DESCRIPTOR.fields_by_name['optional_int32'  ], 5),
-        (proto.DESCRIPTOR.fields_by_name['optional_fixed32'], 1),
-        (proto.DESCRIPTOR.fields_by_name['optional_string' ], 'foo') ],
-      proto.ListFields())
-
-    proto.optional_nested_message.bb = 123
-    self.assertEqual(
-      [ (proto.DESCRIPTOR.fields_by_name['optional_int32'  ], 5),
-        (proto.DESCRIPTOR.fields_by_name['optional_fixed32'], 1),
-        (proto.DESCRIPTOR.fields_by_name['optional_string' ], 'foo'),
-        (proto.DESCRIPTOR.fields_by_name['optional_nested_message' ],
-             nested_message) ],
-      proto.ListFields())
-
-  def testRepeatedListFields(self, message_module):
-    proto = message_module.TestAllTypes()
-    proto.repeated_fixed32.append(1)
-    proto.repeated_int32.append(5)
-    proto.repeated_int32.append(11)
-    proto.repeated_string.extend(['foo', 'bar'])
-    proto.repeated_string.extend([])
-    proto.repeated_string.append('baz')
-    proto.repeated_string.extend(str(x) for x in range(2))
-    proto.optional_int32 = 21
-    proto.repeated_bool  # Access but don't set anything; should not be listed.
-    self.assertEqual(
-      [ (proto.DESCRIPTOR.fields_by_name['optional_int32'  ], 21),
-        (proto.DESCRIPTOR.fields_by_name['repeated_int32'  ], [5, 11]),
-        (proto.DESCRIPTOR.fields_by_name['repeated_fixed32'], [1]),
-        (proto.DESCRIPTOR.fields_by_name['repeated_string' ],
-          ['foo', 'bar', 'baz', '0', '1']) ],
-      proto.ListFields())
-
-  def testClearFieldWithUnknownFieldName(self, message_module):
-    proto = message_module.TestAllTypes()
-    self.assertRaises(ValueError, proto.ClearField, 'nonexistent_field')
-    self.assertRaises(ValueError, proto.ClearField, b'nonexistent_field')
-
-  def testDisallowedAssignments(self, message_module):
-    # It's illegal to assign values directly to repeated fields
-    # or to nonrepeated composite fields.  Ensure that this fails.
-    proto = message_module.TestAllTypes()
-    # Repeated fields.
-    self.assertRaises(AttributeError, setattr, proto, 'repeated_int32', 10)
-    # Lists shouldn't work, either.
-    self.assertRaises(AttributeError, setattr, proto, 'repeated_int32', [10])
-    # Composite fields.
-    self.assertRaises(AttributeError, setattr, proto,
-                      'optional_nested_message', 23)
-    # Assignment to a repeated nested message field without specifying
-    # the index in the array of nested messages.
-    self.assertRaises(AttributeError, setattr, proto.repeated_nested_message,
-                      'bb', 34)
-    # Assignment to an attribute of a repeated field.
-    self.assertRaises(AttributeError, setattr, proto.repeated_float,
-                      'some_attribute', 34)
-    # proto.nonexistent_field = 23 should fail as well.
-    self.assertRaises(AttributeError, setattr, proto, 'nonexistent_field', 23)
-
-  def testSingleScalarTypeSafety(self, message_module):
-    proto = message_module.TestAllTypes()
-    self.assertRaises(TypeError, setattr, proto, 'optional_int32', 1.1)
-    self.assertRaises(TypeError, setattr, proto, 'optional_int32', 'foo')
-    self.assertRaises(TypeError, setattr, proto, 'optional_string', 10)
-    self.assertRaises(TypeError, setattr, proto, 'optional_bytes', 10)
-    self.assertRaises(TypeError, setattr, proto, 'optional_bool', 'foo')
-    self.assertRaises(TypeError, setattr, proto, 'optional_float', 'foo')
-    self.assertRaises(TypeError, setattr, proto, 'optional_double', 'foo')
-    # TODO(jieluo): Fix type checking difference for python and c extension
-    if (api_implementation.Type() == 'python' or
-        (sys.version_info.major, sys.version_info.minor) >= (3, 10)):
-      self.assertRaises(TypeError, setattr, proto, 'optional_bool', 1.1)
-    else:
-      proto.optional_bool = 1.1
-
-  def assertIntegerTypes(self, integer_fn, message_module):
-    """Verifies setting of scalar integers.
-
-    Args:
-      integer_fn: A function to wrap the integers that will be assigned.
-      message_module: unittest_pb2 or unittest_proto3_arena_pb2
-    """
-    def TestGetAndDeserialize(field_name, value, expected_type):
-      proto = message_module.TestAllTypes()
-      value = integer_fn(value)
-      setattr(proto, field_name, value)
-      self.assertIsInstance(getattr(proto, field_name), expected_type)
-      proto2 = message_module.TestAllTypes()
-      proto2.ParseFromString(proto.SerializeToString())
-      self.assertIsInstance(getattr(proto2, field_name), expected_type)
-
-    TestGetAndDeserialize('optional_int32', 1, int)
-    TestGetAndDeserialize('optional_int32', 1 << 30, int)
-    TestGetAndDeserialize('optional_uint32', 1 << 30, int)
-    integer_64 = int
-    if struct.calcsize('L') == 4:
-      # Python only has signed ints, so 32-bit python can't fit an uint32
-      # in an int.
-      TestGetAndDeserialize('optional_uint32', 1 << 31, integer_64)
-    else:
-      # 64-bit python can fit uint32 inside an int
-      TestGetAndDeserialize('optional_uint32', 1 << 31, int)
-    TestGetAndDeserialize('optional_int64', 1 << 30, integer_64)
-    TestGetAndDeserialize('optional_int64', 1 << 60, integer_64)
-    TestGetAndDeserialize('optional_uint64', 1 << 30, integer_64)
-    TestGetAndDeserialize('optional_uint64', 1 << 60, integer_64)
-
-  def testIntegerTypes(self, message_module):
-    self.assertIntegerTypes(lambda x: x, message_module)
-
-  def testNonStandardIntegerTypes(self, message_module):
-    self.assertIntegerTypes(test_util.NonStandardInteger, message_module)
-
-  def testIllegalValuesForIntegers(self, message_module):
-    pb = message_module.TestAllTypes()
-
-    # Strings are illegal, even when the represent an integer.
-    with self.assertRaises(TypeError):
-      pb.optional_uint64 = '2'
-
-    # The exact error should propagate with a poorly written custom integer.
-    with self.assertRaisesRegex(RuntimeError, 'my_error'):
-      pb.optional_uint64 = test_util.NonStandardInteger(5, 'my_error')
-
-  def assetIntegerBoundsChecking(self, integer_fn, message_module):
-    """Verifies bounds checking for scalar integer fields.
-
-    Args:
-      integer_fn: A function to wrap the integers that will be assigned.
-      message_module: unittest_pb2 or unittest_proto3_arena_pb2
-    """
-    def TestMinAndMaxIntegers(field_name, expected_min, expected_max):
-      pb = message_module.TestAllTypes()
-      expected_min = integer_fn(expected_min)
-      expected_max = integer_fn(expected_max)
-      setattr(pb, field_name, expected_min)
-      self.assertEqual(expected_min, getattr(pb, field_name))
-      setattr(pb, field_name, expected_max)
-      self.assertEqual(expected_max, getattr(pb, field_name))
-      self.assertRaises((ValueError, TypeError), setattr, pb, field_name,
-                        expected_min - 1)
-      self.assertRaises((ValueError, TypeError), setattr, pb, field_name,
-                        expected_max + 1)
-
-    TestMinAndMaxIntegers('optional_int32', -(1 << 31), (1 << 31) - 1)
-    TestMinAndMaxIntegers('optional_uint32', 0, 0xffffffff)
-    TestMinAndMaxIntegers('optional_int64', -(1 << 63), (1 << 63) - 1)
-    TestMinAndMaxIntegers('optional_uint64', 0, 0xffffffffffffffff)
-    # A bit of white-box testing since -1 is an int and not a long in C++ and
-    # so goes down a different path.
-    pb = message_module.TestAllTypes()
-    with self.assertRaises((ValueError, TypeError)):
-      pb.optional_uint64 = integer_fn(-(1 << 63))
-
-    pb = message_module.TestAllTypes()
-    pb.optional_nested_enum = integer_fn(1)
-    self.assertEqual(1, pb.optional_nested_enum)
-
-  def testSingleScalarBoundsChecking(self, message_module):
-    self.assetIntegerBoundsChecking(lambda x: x, message_module)
-
-  def testNonStandardSingleScalarBoundsChecking(self, message_module):
-    self.assetIntegerBoundsChecking(
-        test_util.NonStandardInteger, message_module)
-
-  def testRepeatedScalarTypeSafety(self, message_module):
-    proto = message_module.TestAllTypes()
-    self.assertRaises(TypeError, proto.repeated_int32.append, 1.1)
-    self.assertRaises(TypeError, proto.repeated_int32.append, 'foo')
-    self.assertRaises(TypeError, proto.repeated_string, 10)
-    self.assertRaises(TypeError, proto.repeated_bytes, 10)
-
-    proto.repeated_int32.append(10)
-    proto.repeated_int32[0] = 23
-    self.assertRaises(IndexError, proto.repeated_int32.__setitem__, 500, 23)
-    self.assertRaises(TypeError, proto.repeated_int32.__setitem__, 0, 'abc')
-    self.assertRaises(TypeError, proto.repeated_int32.__setitem__, 0, [])
-    self.assertRaises(TypeError, proto.repeated_int32.__setitem__,
-                      'index', 23)
-
-    proto.repeated_string.append('2')
-    self.assertRaises(TypeError, proto.repeated_string.__setitem__, 0, 10)
-
-    # Repeated enums tests.
-    #proto.repeated_nested_enum.append(0)
-
-  def testSingleScalarGettersAndSetters(self, message_module):
-    proto = message_module.TestAllTypes()
-    self.assertEqual(0, proto.optional_int32)
-    proto.optional_int32 = 1
-    self.assertEqual(1, proto.optional_int32)
-
-    proto.optional_uint64 = 0xffffffffffff
-    self.assertEqual(0xffffffffffff, proto.optional_uint64)
-    proto.optional_uint64 = 0xffffffffffffffff
-    self.assertEqual(0xffffffffffffffff, proto.optional_uint64)
-    # TODO(robinson): Test all other scalar field types.
-
-  def testEnums(self, message_module):
-    proto = message_module.TestAllTypes()
-    self.assertEqual(1, proto.FOO)
-    self.assertEqual(1, message_module.TestAllTypes.FOO)
-    self.assertEqual(2, proto.BAR)
-    self.assertEqual(2, message_module.TestAllTypes.BAR)
-    self.assertEqual(3, proto.BAZ)
-    self.assertEqual(3, message_module.TestAllTypes.BAZ)
-
-  def testEnum_Name(self, message_module):
-    self.assertEqual(
-        'FOREIGN_FOO',
-        message_module.ForeignEnum.Name(message_module.FOREIGN_FOO))
-    self.assertEqual(
-        'FOREIGN_BAR',
-        message_module.ForeignEnum.Name(message_module.FOREIGN_BAR))
-    self.assertEqual(
-        'FOREIGN_BAZ',
-        message_module.ForeignEnum.Name(message_module.FOREIGN_BAZ))
-    self.assertRaises(ValueError,
-                      message_module.ForeignEnum.Name, 11312)
-
-    proto = message_module.TestAllTypes()
-    self.assertEqual('FOO',
-                     proto.NestedEnum.Name(proto.FOO))
-    self.assertEqual('FOO',
-                     message_module.TestAllTypes.NestedEnum.Name(proto.FOO))
-    self.assertEqual('BAR',
-                     proto.NestedEnum.Name(proto.BAR))
-    self.assertEqual('BAR',
-                     message_module.TestAllTypes.NestedEnum.Name(proto.BAR))
-    self.assertEqual('BAZ',
-                     proto.NestedEnum.Name(proto.BAZ))
-    self.assertEqual('BAZ',
-                     message_module.TestAllTypes.NestedEnum.Name(proto.BAZ))
-    self.assertRaises(ValueError,
-                      proto.NestedEnum.Name, 11312)
-    self.assertRaises(ValueError,
-                      message_module.TestAllTypes.NestedEnum.Name, 11312)
-
-    # Check some coercion cases.
-    self.assertRaises(TypeError, message_module.TestAllTypes.NestedEnum.Name,
-                      11312.0)
-    self.assertRaises(TypeError, message_module.TestAllTypes.NestedEnum.Name,
-                      None)
-    self.assertEqual('FOO', message_module.TestAllTypes.NestedEnum.Name(True))
-
-  def testEnum_Value(self, message_module):
-    self.assertEqual(message_module.FOREIGN_FOO,
-                     message_module.ForeignEnum.Value('FOREIGN_FOO'))
-    self.assertEqual(message_module.FOREIGN_FOO,
-                     message_module.ForeignEnum.FOREIGN_FOO)
-
-    self.assertEqual(message_module.FOREIGN_BAR,
-                     message_module.ForeignEnum.Value('FOREIGN_BAR'))
-    self.assertEqual(message_module.FOREIGN_BAR,
-                     message_module.ForeignEnum.FOREIGN_BAR)
-
-    self.assertEqual(message_module.FOREIGN_BAZ,
-                     message_module.ForeignEnum.Value('FOREIGN_BAZ'))
-    self.assertEqual(message_module.FOREIGN_BAZ,
-                     message_module.ForeignEnum.FOREIGN_BAZ)
-
-    self.assertRaises(ValueError,
-                      message_module.ForeignEnum.Value, 'FO')
-    with self.assertRaises(AttributeError):
-      message_module.ForeignEnum.FO
-
-    proto = message_module.TestAllTypes()
-    self.assertEqual(proto.FOO,
-                     proto.NestedEnum.Value('FOO'))
-    self.assertEqual(proto.FOO,
-                     proto.NestedEnum.FOO)
-
-    self.assertEqual(proto.FOO,
-                     message_module.TestAllTypes.NestedEnum.Value('FOO'))
-    self.assertEqual(proto.FOO,
-                     message_module.TestAllTypes.NestedEnum.FOO)
-
-    self.assertEqual(proto.BAR,
-                     proto.NestedEnum.Value('BAR'))
-    self.assertEqual(proto.BAR,
-                     proto.NestedEnum.BAR)
-
-    self.assertEqual(proto.BAR,
-                     message_module.TestAllTypes.NestedEnum.Value('BAR'))
-    self.assertEqual(proto.BAR,
-                     message_module.TestAllTypes.NestedEnum.BAR)
-
-    self.assertEqual(proto.BAZ,
-                     proto.NestedEnum.Value('BAZ'))
-    self.assertEqual(proto.BAZ,
-                     proto.NestedEnum.BAZ)
-
-    self.assertEqual(proto.BAZ,
-                     message_module.TestAllTypes.NestedEnum.Value('BAZ'))
-    self.assertEqual(proto.BAZ,
-                     message_module.TestAllTypes.NestedEnum.BAZ)
-
-    self.assertRaises(ValueError,
-                      proto.NestedEnum.Value, 'Foo')
-    with self.assertRaises(AttributeError):
-      proto.NestedEnum.Value.Foo
-
-    self.assertRaises(ValueError,
-                      message_module.TestAllTypes.NestedEnum.Value, 'Foo')
-    with self.assertRaises(AttributeError):
-      message_module.TestAllTypes.NestedEnum.Value.Foo
-
-  def testEnum_KeysAndValues(self, message_module):
-    if message_module == unittest_pb2:
-      keys = ['FOREIGN_FOO', 'FOREIGN_BAR', 'FOREIGN_BAZ']
-      values = [4, 5, 6]
-      items = [('FOREIGN_FOO', 4), ('FOREIGN_BAR', 5), ('FOREIGN_BAZ', 6)]
-    else:
-      keys = ['FOREIGN_ZERO', 'FOREIGN_FOO', 'FOREIGN_BAR', 'FOREIGN_BAZ']
-      values = [0, 4, 5, 6]
-      items = [('FOREIGN_ZERO', 0), ('FOREIGN_FOO', 4),
-               ('FOREIGN_BAR', 5), ('FOREIGN_BAZ', 6)]
-    self.assertEqual(keys,
-                     list(message_module.ForeignEnum.keys()))
-    self.assertEqual(values,
-                     list(message_module.ForeignEnum.values()))
-    self.assertEqual(items,
-                     list(message_module.ForeignEnum.items()))
-
-    proto = message_module.TestAllTypes()
-    if message_module == unittest_pb2:
-      keys = ['FOO', 'BAR', 'BAZ', 'NEG']
-      values = [1, 2, 3, -1]
-      items = [('FOO', 1), ('BAR', 2), ('BAZ', 3), ('NEG', -1)]
-    else:
-      keys = ['ZERO', 'FOO', 'BAR', 'BAZ', 'NEG']
-      values = [0, 1, 2, 3, -1]
-      items = [('ZERO', 0), ('FOO', 1), ('BAR', 2), ('BAZ', 3), ('NEG', -1)]
-    self.assertEqual(keys, list(proto.NestedEnum.keys()))
-    self.assertEqual(values, list(proto.NestedEnum.values()))
-    self.assertEqual(items,
-                     list(proto.NestedEnum.items()))
-
-  def testStaticParseFrom(self, message_module):
-    proto1 = message_module.TestAllTypes()
-    test_util.SetAllFields(proto1)
-
-    string1 = proto1.SerializeToString()
-    proto2 = message_module.TestAllTypes.FromString(string1)
-
-    # Messages should be equal.
-    self.assertEqual(proto2, proto1)
-
-  def testMergeFromSingularField(self, message_module):
-    # Test merge with just a singular field.
-    proto1 = message_module.TestAllTypes()
-    proto1.optional_int32 = 1
-
-    proto2 = message_module.TestAllTypes()
-    # This shouldn't get overwritten.
-    proto2.optional_string = 'value'
-
-    proto2.MergeFrom(proto1)
-    self.assertEqual(1, proto2.optional_int32)
-    self.assertEqual('value', proto2.optional_string)
-
-  def testMergeFromRepeatedField(self, message_module):
-    # Test merge with just a repeated field.
-    proto1 = message_module.TestAllTypes()
-    proto1.repeated_int32.append(1)
-    proto1.repeated_int32.append(2)
-
-    proto2 = message_module.TestAllTypes()
-    proto2.repeated_int32.append(0)
-    proto2.MergeFrom(proto1)
-
-    self.assertEqual(0, proto2.repeated_int32[0])
-    self.assertEqual(1, proto2.repeated_int32[1])
-    self.assertEqual(2, proto2.repeated_int32[2])
-
-  def testMergeFromRepeatedNestedMessage(self, message_module):
-    # Test merge with a repeated nested message.
-    proto1 = message_module.TestAllTypes()
-    m = proto1.repeated_nested_message.add()
-    m.bb = 123
-    m = proto1.repeated_nested_message.add()
-    m.bb = 321
-
-    proto2 = message_module.TestAllTypes()
-    m = proto2.repeated_nested_message.add()
-    m.bb = 999
-    proto2.MergeFrom(proto1)
-    self.assertEqual(999, proto2.repeated_nested_message[0].bb)
-    self.assertEqual(123, proto2.repeated_nested_message[1].bb)
-    self.assertEqual(321, proto2.repeated_nested_message[2].bb)
-
-    proto3 = message_module.TestAllTypes()
-    proto3.repeated_nested_message.MergeFrom(proto2.repeated_nested_message)
-    self.assertEqual(999, proto3.repeated_nested_message[0].bb)
-    self.assertEqual(123, proto3.repeated_nested_message[1].bb)
-    self.assertEqual(321, proto3.repeated_nested_message[2].bb)
-
-  def testMergeFromAllFields(self, message_module):
-    # With all fields set.
-    proto1 = message_module.TestAllTypes()
-    test_util.SetAllFields(proto1)
-    proto2 = message_module.TestAllTypes()
-    proto2.MergeFrom(proto1)
-
-    # Messages should be equal.
-    self.assertEqual(proto2, proto1)
-
-    # Serialized string should be equal too.
-    string1 = proto1.SerializeToString()
-    string2 = proto2.SerializeToString()
-    self.assertEqual(string1, string2)
-
-  def testMergeFromBug(self, message_module):
-    message1 = message_module.TestAllTypes()
-    message2 = message_module.TestAllTypes()
-
-    # Cause optional_nested_message to be instantiated within message1, even
-    # though it is not considered to be "present".
-    message1.optional_nested_message
-    self.assertFalse(message1.HasField('optional_nested_message'))
-
-    # Merge into message2.  This should not instantiate the field is message2.
-    message2.MergeFrom(message1)
-    self.assertFalse(message2.HasField('optional_nested_message'))
-
-  def testCopyFromSingularField(self, message_module):
-    # Test copy with just a singular field.
-    proto1 = message_module.TestAllTypes()
-    proto1.optional_int32 = 1
-    proto1.optional_string = 'important-text'
-
-    proto2 = message_module.TestAllTypes()
-    proto2.optional_string = 'value'
-
-    proto2.CopyFrom(proto1)
-    self.assertEqual(1, proto2.optional_int32)
-    self.assertEqual('important-text', proto2.optional_string)
-
-  def testCopyFromRepeatedField(self, message_module):
-    # Test copy with a repeated field.
-    proto1 = message_module.TestAllTypes()
-    proto1.repeated_int32.append(1)
-    proto1.repeated_int32.append(2)
-
-    proto2 = message_module.TestAllTypes()
-    proto2.repeated_int32.append(0)
-    proto2.CopyFrom(proto1)
-
-    self.assertEqual(1, proto2.repeated_int32[0])
-    self.assertEqual(2, proto2.repeated_int32[1])
-
-  def testCopyFromAllFields(self, message_module):
-    # With all fields set.
-    proto1 = message_module.TestAllTypes()
-    test_util.SetAllFields(proto1)
-    proto2 = message_module.TestAllTypes()
-    proto2.CopyFrom(proto1)
-
-    # Messages should be equal.
-    self.assertEqual(proto2, proto1)
-
-    # Serialized string should be equal too.
-    string1 = proto1.SerializeToString()
-    string2 = proto2.SerializeToString()
-    self.assertEqual(string1, string2)
-
-  def testCopyFromSelf(self, message_module):
-    proto1 = message_module.TestAllTypes()
-    proto1.repeated_int32.append(1)
-    proto1.optional_int32 = 2
-    proto1.optional_string = 'important-text'
-
-    proto1.CopyFrom(proto1)
-    self.assertEqual(1, proto1.repeated_int32[0])
-    self.assertEqual(2, proto1.optional_int32)
-    self.assertEqual('important-text', proto1.optional_string)
-
-  def testDeepCopy(self, message_module):
-    proto1 = message_module.TestAllTypes()
-    proto1.optional_int32 = 1
-    proto2 = copy.deepcopy(proto1)
-    self.assertEqual(1, proto2.optional_int32)
-
-    proto1.repeated_int32.append(2)
-    proto1.repeated_int32.append(3)
-    container = copy.deepcopy(proto1.repeated_int32)
-    self.assertEqual([2, 3], container)
-    container.remove(container[0])
-    self.assertEqual([3], container)
-
-    message1 = proto1.repeated_nested_message.add()
-    message1.bb = 1
-    messages = copy.deepcopy(proto1.repeated_nested_message)
-    self.assertEqual(proto1.repeated_nested_message, messages)
-    message1.bb = 2
-    self.assertNotEqual(proto1.repeated_nested_message, messages)
-    messages.remove(messages[0])
-    self.assertEqual(len(messages), 0)
-
-    # TODO(anuraag): Implement deepcopy for extension dict
-
-  def testDisconnectingBeforeClear(self, message_module):
-    proto = message_module.TestAllTypes()
-    nested = proto.optional_nested_message
-    proto.Clear()
-    self.assertIsNot(nested, proto.optional_nested_message)
-    nested.bb = 23
-    self.assertFalse(proto.HasField('optional_nested_message'))
-    self.assertEqual(0, proto.optional_nested_message.bb)
-
-    proto = message_module.TestAllTypes()
-    nested = proto.optional_nested_message
-    nested.bb = 5
-    foreign = proto.optional_foreign_message
-    foreign.c = 6
-    proto.Clear()
-    self.assertIsNot(nested, proto.optional_nested_message)
-    self.assertIsNot(foreign, proto.optional_foreign_message)
-    self.assertEqual(5, nested.bb)
-    self.assertEqual(6, foreign.c)
-    nested.bb = 15
-    foreign.c = 16
-    self.assertFalse(proto.HasField('optional_nested_message'))
-    self.assertEqual(0, proto.optional_nested_message.bb)
-    self.assertFalse(proto.HasField('optional_foreign_message'))
-    self.assertEqual(0, proto.optional_foreign_message.c)
-
-  def testStringUTF8Encoding(self, message_module):
-    proto = message_module.TestAllTypes()
-
-    # Assignment of a unicode object to a field of type 'bytes' is not allowed.
-    self.assertRaises(TypeError,
-                      setattr, proto, 'optional_bytes', u'unicode object')
-
-    # Check that the default value is of python's 'unicode' type.
-    self.assertEqual(type(proto.optional_string), str)
-
-    proto.optional_string = str('Testing')
-    self.assertEqual(proto.optional_string, str('Testing'))
-
-    # Assign a value of type 'str' which can be encoded in UTF-8.
-    proto.optional_string = str('Testing')
-    self.assertEqual(proto.optional_string, str('Testing'))
-
-    # Try to assign a 'bytes' object which contains non-UTF-8.
-    self.assertRaises(ValueError,
-                      setattr, proto, 'optional_string', b'a\x80a')
-    # No exception: Assign already encoded UTF-8 bytes to a string field.
-    utf8_bytes = u'Те�т'.encode('utf-8')
-    proto.optional_string = utf8_bytes
-    # No exception: Assign the a non-ascii unicode object.
-    proto.optional_string = u'Те�т'
-    # No exception thrown (normal str assignment containing ASCII).
-    proto.optional_string = 'abc'
-
-  def testBytesInTextFormat(self, message_module):
-    proto = message_module.TestAllTypes(optional_bytes=b'\x00\x7f\x80\xff')
-    self.assertEqual(u'optional_bytes: "\\000\\177\\200\\377"\n', str(proto))
-
-  def testEmptyNestedMessage(self, message_module):
-    proto = message_module.TestAllTypes()
-    proto.optional_nested_message.MergeFrom(
-        message_module.TestAllTypes.NestedMessage())
-    self.assertTrue(proto.HasField('optional_nested_message'))
-
-    proto = message_module.TestAllTypes()
-    proto.optional_nested_message.CopyFrom(
-        message_module.TestAllTypes.NestedMessage())
-    self.assertTrue(proto.HasField('optional_nested_message'))
-
-    proto = message_module.TestAllTypes()
-    bytes_read = proto.optional_nested_message.MergeFromString(b'')
-    self.assertEqual(0, bytes_read)
-    self.assertTrue(proto.HasField('optional_nested_message'))
-
-    proto = message_module.TestAllTypes()
-    proto.optional_nested_message.ParseFromString(b'')
-    self.assertTrue(proto.HasField('optional_nested_message'))
-
-    serialized = proto.SerializeToString()
-    proto2 = message_module.TestAllTypes()
-    self.assertEqual(
-        len(serialized),
-        proto2.MergeFromString(serialized))
-    self.assertTrue(proto2.HasField('optional_nested_message'))
-
-
-# Class to test proto2-only features (required, extensions, etc.)
-@testing_refleaks.TestCase
-class Proto2ReflectionTest(unittest.TestCase):
-
-  def testRepeatedCompositeConstructor(self):
-    # Constructor with only repeated composite types should succeed.
-    proto = unittest_pb2.TestAllTypes(
-        repeated_nested_message=[
-            unittest_pb2.TestAllTypes.NestedMessage(
-                bb=unittest_pb2.TestAllTypes.FOO),
-            unittest_pb2.TestAllTypes.NestedMessage(
-                bb=unittest_pb2.TestAllTypes.BAR)],
-        repeated_foreign_message=[
-            unittest_pb2.ForeignMessage(c=-43),
-            unittest_pb2.ForeignMessage(c=45324),
-            unittest_pb2.ForeignMessage(c=12)],
-        repeatedgroup=[
-            unittest_pb2.TestAllTypes.RepeatedGroup(),
-            unittest_pb2.TestAllTypes.RepeatedGroup(a=1),
-            unittest_pb2.TestAllTypes.RepeatedGroup(a=2)])
-
-    self.assertEqual(
-        [unittest_pb2.TestAllTypes.NestedMessage(
-            bb=unittest_pb2.TestAllTypes.FOO),
-         unittest_pb2.TestAllTypes.NestedMessage(
-             bb=unittest_pb2.TestAllTypes.BAR)],
-        list(proto.repeated_nested_message))
-    self.assertEqual(
-        [unittest_pb2.ForeignMessage(c=-43),
-         unittest_pb2.ForeignMessage(c=45324),
-         unittest_pb2.ForeignMessage(c=12)],
-        list(proto.repeated_foreign_message))
-    self.assertEqual(
-        [unittest_pb2.TestAllTypes.RepeatedGroup(),
-         unittest_pb2.TestAllTypes.RepeatedGroup(a=1),
-         unittest_pb2.TestAllTypes.RepeatedGroup(a=2)],
-        list(proto.repeatedgroup))
-
-  def assertListsEqual(self, values, others):
-    self.assertEqual(len(values), len(others))
-    for i in range(len(values)):
-      self.assertEqual(values[i], others[i])
-
-  def testSimpleHasBits(self):
-    # Test a scalar.
-    proto = unittest_pb2.TestAllTypes()
-    self.assertFalse(proto.HasField('optional_int32'))
-    self.assertEqual(0, proto.optional_int32)
-    # HasField() shouldn't be true if all we've done is
-    # read the default value.
-    self.assertFalse(proto.HasField('optional_int32'))
-    proto.optional_int32 = 1
-    # Setting a value however *should* set the "has" bit.
-    self.assertTrue(proto.HasField('optional_int32'))
-    proto.ClearField('optional_int32')
-    # And clearing that value should unset the "has" bit.
-    self.assertFalse(proto.HasField('optional_int32'))
-
-  def testHasBitsWithSinglyNestedScalar(self):
-    # Helper used to test foreign messages and groups.
-    #
-    # composite_field_name should be the name of a non-repeated
-    # composite (i.e., foreign or group) field in TestAllTypes,
-    # and scalar_field_name should be the name of an integer-valued
-    # scalar field within that composite.
-    #
-    # I never thought I'd miss C++ macros and templates so much. :(
-    # This helper is semantically just:
-    #
-    #   assert proto.composite_field.scalar_field == 0
-    #   assert not proto.composite_field.HasField('scalar_field')
-    #   assert not proto.HasField('composite_field')
-    #
-    #   proto.composite_field.scalar_field = 10
-    #   old_composite_field = proto.composite_field
-    #
-    #   assert proto.composite_field.scalar_field == 10
-    #   assert proto.composite_field.HasField('scalar_field')
-    #   assert proto.HasField('composite_field')
-    #
-    #   proto.ClearField('composite_field')
-    #
-    #   assert not proto.composite_field.HasField('scalar_field')
-    #   assert not proto.HasField('composite_field')
-    #   assert proto.composite_field.scalar_field == 0
-    #
-    #   # Now ensure that ClearField('composite_field') disconnected
-    #   # the old field object from the object tree...
-    #   assert old_composite_field is not proto.composite_field
-    #   old_composite_field.scalar_field = 20
-    #   assert not proto.composite_field.HasField('scalar_field')
-    #   assert not proto.HasField('composite_field')
-    def TestCompositeHasBits(composite_field_name, scalar_field_name):
-      proto = unittest_pb2.TestAllTypes()
-      # First, check that we can get the scalar value, and see that it's the
-      # default (0), but that proto.HasField('omposite') and
-      # proto.composite.HasField('scalar') will still return False.
-      composite_field = getattr(proto, composite_field_name)
-      original_scalar_value = getattr(composite_field, scalar_field_name)
-      self.assertEqual(0, original_scalar_value)
-      # Assert that the composite object does not "have" the scalar.
-      self.assertFalse(composite_field.HasField(scalar_field_name))
-      # Assert that proto does not "have" the composite field.
-      self.assertFalse(proto.HasField(composite_field_name))
-
-      # Now set the scalar within the composite field.  Ensure that the setting
-      # is reflected, and that proto.HasField('composite') and
-      # proto.composite.HasField('scalar') now both return True.
-      new_val = 20
-      setattr(composite_field, scalar_field_name, new_val)
-      self.assertEqual(new_val, getattr(composite_field, scalar_field_name))
-      # Hold on to a reference to the current composite_field object.
-      old_composite_field = composite_field
-      # Assert that the has methods now return true.
-      self.assertTrue(composite_field.HasField(scalar_field_name))
-      self.assertTrue(proto.HasField(composite_field_name))
-
-      # Now call the clear method...
-      proto.ClearField(composite_field_name)
-
-      # ...and ensure that the "has" bits are all back to False...
-      composite_field = getattr(proto, composite_field_name)
-      self.assertFalse(composite_field.HasField(scalar_field_name))
-      self.assertFalse(proto.HasField(composite_field_name))
-      # ...and ensure that the scalar field has returned to its default.
-      self.assertEqual(0, getattr(composite_field, scalar_field_name))
-
-      self.assertIsNot(old_composite_field, composite_field)
-      setattr(old_composite_field, scalar_field_name, new_val)
-      self.assertFalse(composite_field.HasField(scalar_field_name))
-      self.assertFalse(proto.HasField(composite_field_name))
-      self.assertEqual(0, getattr(composite_field, scalar_field_name))
-
-    # Test simple, single-level nesting when we set a scalar.
-    TestCompositeHasBits('optionalgroup', 'a')
-    TestCompositeHasBits('optional_nested_message', 'bb')
-    TestCompositeHasBits('optional_foreign_message', 'c')
-    TestCompositeHasBits('optional_import_message', 'd')
-
-  def testHasBitsWhenModifyingRepeatedFields(self):
-    # Test nesting when we add an element to a repeated field in a submessage.
-    proto = unittest_pb2.TestNestedMessageHasBits()
-    proto.optional_nested_message.nestedmessage_repeated_int32.append(5)
-    self.assertEqual(
-        [5], proto.optional_nested_message.nestedmessage_repeated_int32)
-    self.assertTrue(proto.HasField('optional_nested_message'))
-
-    # Do the same test, but with a repeated composite field within the
-    # submessage.
-    proto.ClearField('optional_nested_message')
-    self.assertFalse(proto.HasField('optional_nested_message'))
-    proto.optional_nested_message.nestedmessage_repeated_foreignmessage.add()
-    self.assertTrue(proto.HasField('optional_nested_message'))
-
-  def testHasBitsForManyLevelsOfNesting(self):
-    # Test nesting many levels deep.
-    recursive_proto = unittest_pb2.TestMutualRecursionA()
-    self.assertFalse(recursive_proto.HasField('bb'))
-    self.assertEqual(0, recursive_proto.bb.a.bb.a.bb.optional_int32)
-    self.assertFalse(recursive_proto.HasField('bb'))
-    recursive_proto.bb.a.bb.a.bb.optional_int32 = 5
-    self.assertEqual(5, recursive_proto.bb.a.bb.a.bb.optional_int32)
-    self.assertTrue(recursive_proto.HasField('bb'))
-    self.assertTrue(recursive_proto.bb.HasField('a'))
-    self.assertTrue(recursive_proto.bb.a.HasField('bb'))
-    self.assertTrue(recursive_proto.bb.a.bb.HasField('a'))
-    self.assertTrue(recursive_proto.bb.a.bb.a.HasField('bb'))
-    self.assertFalse(recursive_proto.bb.a.bb.a.bb.HasField('a'))
-    self.assertTrue(recursive_proto.bb.a.bb.a.bb.HasField('optional_int32'))
-
-  def testSingularListExtensions(self):
-    proto = unittest_pb2.TestAllExtensions()
-    proto.Extensions[unittest_pb2.optional_fixed32_extension] = 1
-    proto.Extensions[unittest_pb2.optional_int32_extension  ] = 5
-    proto.Extensions[unittest_pb2.optional_string_extension ] = 'foo'
-    self.assertEqual(
-      [ (unittest_pb2.optional_int32_extension  , 5),
-        (unittest_pb2.optional_fixed32_extension, 1),
-        (unittest_pb2.optional_string_extension , 'foo') ],
-      proto.ListFields())
-    del proto.Extensions[unittest_pb2.optional_fixed32_extension]
-    self.assertEqual(
-        [(unittest_pb2.optional_int32_extension, 5),
-         (unittest_pb2.optional_string_extension, 'foo')],
-        proto.ListFields())
-
-  def testRepeatedListExtensions(self):
-    proto = unittest_pb2.TestAllExtensions()
-    proto.Extensions[unittest_pb2.repeated_fixed32_extension].append(1)
-    proto.Extensions[unittest_pb2.repeated_int32_extension  ].append(5)
-    proto.Extensions[unittest_pb2.repeated_int32_extension  ].append(11)
-    proto.Extensions[unittest_pb2.repeated_string_extension ].append('foo')
-    proto.Extensions[unittest_pb2.repeated_string_extension ].append('bar')
-    proto.Extensions[unittest_pb2.repeated_string_extension ].append('baz')
-    proto.Extensions[unittest_pb2.optional_int32_extension  ] = 21
-    self.assertEqual(
-      [ (unittest_pb2.optional_int32_extension  , 21),
-        (unittest_pb2.repeated_int32_extension  , [5, 11]),
-        (unittest_pb2.repeated_fixed32_extension, [1]),
-        (unittest_pb2.repeated_string_extension , ['foo', 'bar', 'baz']) ],
-      proto.ListFields())
-    del proto.Extensions[unittest_pb2.repeated_int32_extension]
-    del proto.Extensions[unittest_pb2.repeated_string_extension]
-    self.assertEqual(
-        [(unittest_pb2.optional_int32_extension, 21),
-         (unittest_pb2.repeated_fixed32_extension, [1])],
-        proto.ListFields())
-
-  def testListFieldsAndExtensions(self):
-    proto = unittest_pb2.TestFieldOrderings()
-    test_util.SetAllFieldsAndExtensions(proto)
-    unittest_pb2.my_extension_int
-    self.assertEqual(
-      [ (proto.DESCRIPTOR.fields_by_name['my_int'   ], 1),
-        (unittest_pb2.my_extension_int               , 23),
-        (proto.DESCRIPTOR.fields_by_name['my_string'], 'foo'),
-        (unittest_pb2.my_extension_string            , 'bar'),
-        (proto.DESCRIPTOR.fields_by_name['my_float' ], 1.0) ],
-      proto.ListFields())
-
-  def testDefaultValues(self):
-    proto = unittest_pb2.TestAllTypes()
-    self.assertEqual(0, proto.optional_int32)
-    self.assertEqual(0, proto.optional_int64)
-    self.assertEqual(0, proto.optional_uint32)
-    self.assertEqual(0, proto.optional_uint64)
-    self.assertEqual(0, proto.optional_sint32)
-    self.assertEqual(0, proto.optional_sint64)
-    self.assertEqual(0, proto.optional_fixed32)
-    self.assertEqual(0, proto.optional_fixed64)
-    self.assertEqual(0, proto.optional_sfixed32)
-    self.assertEqual(0, proto.optional_sfixed64)
-    self.assertEqual(0.0, proto.optional_float)
-    self.assertEqual(0.0, proto.optional_double)
-    self.assertEqual(False, proto.optional_bool)
-    self.assertEqual('', proto.optional_string)
-    self.assertEqual(b'', proto.optional_bytes)
-
-    self.assertEqual(41, proto.default_int32)
-    self.assertEqual(42, proto.default_int64)
-    self.assertEqual(43, proto.default_uint32)
-    self.assertEqual(44, proto.default_uint64)
-    self.assertEqual(-45, proto.default_sint32)
-    self.assertEqual(46, proto.default_sint64)
-    self.assertEqual(47, proto.default_fixed32)
-    self.assertEqual(48, proto.default_fixed64)
-    self.assertEqual(49, proto.default_sfixed32)
-    self.assertEqual(-50, proto.default_sfixed64)
-    self.assertEqual(51.5, proto.default_float)
-    self.assertEqual(52e3, proto.default_double)
-    self.assertEqual(True, proto.default_bool)
-    self.assertEqual('hello', proto.default_string)
-    self.assertEqual(b'world', proto.default_bytes)
-    self.assertEqual(unittest_pb2.TestAllTypes.BAR, proto.default_nested_enum)
-    self.assertEqual(unittest_pb2.FOREIGN_BAR, proto.default_foreign_enum)
-    self.assertEqual(unittest_import_pb2.IMPORT_BAR,
-                     proto.default_import_enum)
-
-    proto = unittest_pb2.TestExtremeDefaultValues()
-    self.assertEqual(u'\u1234', proto.utf8_string)
-
-  def testHasFieldWithUnknownFieldName(self):
-    proto = unittest_pb2.TestAllTypes()
-    self.assertRaises(ValueError, proto.HasField, 'nonexistent_field')
-
-  def testClearRemovesChildren(self):
-    # Make sure there aren't any implementation bugs that are only partially
-    # clearing the message (which can happen in the more complex C++
-    # implementation which has parallel message lists).
-    proto = unittest_pb2.TestRequiredForeign()
-    for i in range(10):
-      proto.repeated_message.add()
-    proto2 = unittest_pb2.TestRequiredForeign()
-    proto.CopyFrom(proto2)
-    self.assertRaises(IndexError, lambda: proto.repeated_message[5])
-
-  def testSingleScalarClearField(self):
-    proto = unittest_pb2.TestAllTypes()
-    # Should be allowed to clear something that's not there (a no-op).
-    proto.ClearField('optional_int32')
-    proto.optional_int32 = 1
-    self.assertTrue(proto.HasField('optional_int32'))
-    proto.ClearField('optional_int32')
-    self.assertEqual(0, proto.optional_int32)
-    self.assertFalse(proto.HasField('optional_int32'))
-    # TODO(robinson): Test all other scalar field types.
-
-  def testRepeatedScalars(self):
-    proto = unittest_pb2.TestAllTypes()
-
-    self.assertFalse(proto.repeated_int32)
-    self.assertEqual(0, len(proto.repeated_int32))
-    proto.repeated_int32.append(5)
-    proto.repeated_int32.append(10)
-    proto.repeated_int32.append(15)
-    self.assertTrue(proto.repeated_int32)
-    self.assertEqual(3, len(proto.repeated_int32))
-
-    self.assertEqual([5, 10, 15], proto.repeated_int32)
-
-    # Test single retrieval.
-    self.assertEqual(5, proto.repeated_int32[0])
-    self.assertEqual(15, proto.repeated_int32[-1])
-    # Test out-of-bounds indices.
-    self.assertRaises(IndexError, proto.repeated_int32.__getitem__, 1234)
-    self.assertRaises(IndexError, proto.repeated_int32.__getitem__, -1234)
-    # Test incorrect types passed to __getitem__.
-    self.assertRaises(TypeError, proto.repeated_int32.__getitem__, 'foo')
-    self.assertRaises(TypeError, proto.repeated_int32.__getitem__, None)
-
-    # Test single assignment.
-    proto.repeated_int32[1] = 20
-    self.assertEqual([5, 20, 15], proto.repeated_int32)
-
-    # Test insertion.
-    proto.repeated_int32.insert(1, 25)
-    self.assertEqual([5, 25, 20, 15], proto.repeated_int32)
-
-    # Test slice retrieval.
-    proto.repeated_int32.append(30)
-    self.assertEqual([25, 20, 15], proto.repeated_int32[1:4])
-    self.assertEqual([5, 25, 20, 15, 30], proto.repeated_int32[:])
-
-    # Test slice assignment with an iterator
-    proto.repeated_int32[1:4] = (i for i in range(3))
-    self.assertEqual([5, 0, 1, 2, 30], proto.repeated_int32)
-
-    # Test slice assignment.
-    proto.repeated_int32[1:4] = [35, 40, 45]
-    self.assertEqual([5, 35, 40, 45, 30], proto.repeated_int32)
-
-    # Test that we can use the field as an iterator.
-    result = []
-    for i in proto.repeated_int32:
-      result.append(i)
-    self.assertEqual([5, 35, 40, 45, 30], result)
-
-    # Test single deletion.
-    del proto.repeated_int32[2]
-    self.assertEqual([5, 35, 45, 30], proto.repeated_int32)
-
-    # Test slice deletion.
-    del proto.repeated_int32[2:]
-    self.assertEqual([5, 35], proto.repeated_int32)
-
-    # Test extending.
-    proto.repeated_int32.extend([3, 13])
-    self.assertEqual([5, 35, 3, 13], proto.repeated_int32)
-
-    # Test clearing.
-    proto.ClearField('repeated_int32')
-    self.assertFalse(proto.repeated_int32)
-    self.assertEqual(0, len(proto.repeated_int32))
-
-    proto.repeated_int32.append(1)
-    self.assertEqual(1, proto.repeated_int32[-1])
-    # Test assignment to a negative index.
-    proto.repeated_int32[-1] = 2
-    self.assertEqual(2, proto.repeated_int32[-1])
-
-    # Test deletion at negative indices.
-    proto.repeated_int32[:] = [0, 1, 2, 3]
-    del proto.repeated_int32[-1]
-    self.assertEqual([0, 1, 2], proto.repeated_int32)
-
-    del proto.repeated_int32[-2]
-    self.assertEqual([0, 2], proto.repeated_int32)
-
-    self.assertRaises(IndexError, proto.repeated_int32.__delitem__, -3)
-    self.assertRaises(IndexError, proto.repeated_int32.__delitem__, 300)
-
-    del proto.repeated_int32[-2:-1]
-    self.assertEqual([2], proto.repeated_int32)
-
-    del proto.repeated_int32[100:10000]
-    self.assertEqual([2], proto.repeated_int32)
-
-  def testRepeatedScalarsRemove(self):
-    proto = unittest_pb2.TestAllTypes()
-
-    self.assertFalse(proto.repeated_int32)
-    self.assertEqual(0, len(proto.repeated_int32))
-    proto.repeated_int32.append(5)
-    proto.repeated_int32.append(10)
-    proto.repeated_int32.append(5)
-    proto.repeated_int32.append(5)
-
-    self.assertEqual(4, len(proto.repeated_int32))
-    proto.repeated_int32.remove(5)
-    self.assertEqual(3, len(proto.repeated_int32))
-    self.assertEqual(10, proto.repeated_int32[0])
-    self.assertEqual(5, proto.repeated_int32[1])
-    self.assertEqual(5, proto.repeated_int32[2])
-
-    proto.repeated_int32.remove(5)
-    self.assertEqual(2, len(proto.repeated_int32))
-    self.assertEqual(10, proto.repeated_int32[0])
-    self.assertEqual(5, proto.repeated_int32[1])
-
-    proto.repeated_int32.remove(10)
-    self.assertEqual(1, len(proto.repeated_int32))
-    self.assertEqual(5, proto.repeated_int32[0])
-
-    # Remove a non-existent element.
-    self.assertRaises(ValueError, proto.repeated_int32.remove, 123)
-
-  def testRepeatedScalarsReverse_Empty(self):
-    proto = unittest_pb2.TestAllTypes()
-
-    self.assertFalse(proto.repeated_int32)
-    self.assertEqual(0, len(proto.repeated_int32))
-
-    self.assertIsNone(proto.repeated_int32.reverse())
-
-    self.assertFalse(proto.repeated_int32)
-    self.assertEqual(0, len(proto.repeated_int32))
-
-  def testRepeatedScalarsReverse_NonEmpty(self):
-    proto = unittest_pb2.TestAllTypes()
-
-    self.assertFalse(proto.repeated_int32)
-    self.assertEqual(0, len(proto.repeated_int32))
-
-    proto.repeated_int32.append(1)
-    proto.repeated_int32.append(2)
-    proto.repeated_int32.append(3)
-    proto.repeated_int32.append(4)
-
-    self.assertEqual(4, len(proto.repeated_int32))
-
-    self.assertIsNone(proto.repeated_int32.reverse())
-
-    self.assertEqual(4, len(proto.repeated_int32))
-    self.assertEqual(4, proto.repeated_int32[0])
-    self.assertEqual(3, proto.repeated_int32[1])
-    self.assertEqual(2, proto.repeated_int32[2])
-    self.assertEqual(1, proto.repeated_int32[3])
-
-  def testRepeatedComposites(self):
-    proto = unittest_pb2.TestAllTypes()
-    self.assertFalse(proto.repeated_nested_message)
-    self.assertEqual(0, len(proto.repeated_nested_message))
-    m0 = proto.repeated_nested_message.add()
-    m1 = proto.repeated_nested_message.add()
-    self.assertTrue(proto.repeated_nested_message)
-    self.assertEqual(2, len(proto.repeated_nested_message))
-    self.assertListsEqual([m0, m1], proto.repeated_nested_message)
-    self.assertIsInstance(m0, unittest_pb2.TestAllTypes.NestedMessage)
-
-    # Test out-of-bounds indices.
-    self.assertRaises(IndexError, proto.repeated_nested_message.__getitem__,
-                      1234)
-    self.assertRaises(IndexError, proto.repeated_nested_message.__getitem__,
-                      -1234)
-
-    # Test incorrect types passed to __getitem__.
-    self.assertRaises(TypeError, proto.repeated_nested_message.__getitem__,
-                      'foo')
-    self.assertRaises(TypeError, proto.repeated_nested_message.__getitem__,
-                      None)
-
-    # Test slice retrieval.
-    m2 = proto.repeated_nested_message.add()
-    m3 = proto.repeated_nested_message.add()
-    m4 = proto.repeated_nested_message.add()
-    self.assertListsEqual(
-        [m1, m2, m3], proto.repeated_nested_message[1:4])
-    self.assertListsEqual(
-        [m0, m1, m2, m3, m4], proto.repeated_nested_message[:])
-    self.assertListsEqual(
-        [m0, m1], proto.repeated_nested_message[:2])
-    self.assertListsEqual(
-        [m2, m3, m4], proto.repeated_nested_message[2:])
-    self.assertEqual(
-        m0, proto.repeated_nested_message[0])
-    self.assertListsEqual(
-        [m0], proto.repeated_nested_message[:1])
-
-    # Test that we can use the field as an iterator.
-    result = []
-    for i in proto.repeated_nested_message:
-      result.append(i)
-    self.assertListsEqual([m0, m1, m2, m3, m4], result)
-
-    # Test single deletion.
-    del proto.repeated_nested_message[2]
-    self.assertListsEqual([m0, m1, m3, m4], proto.repeated_nested_message)
-
-    # Test slice deletion.
-    del proto.repeated_nested_message[2:]
-    self.assertListsEqual([m0, m1], proto.repeated_nested_message)
-
-    # Test extending.
-    n1 = unittest_pb2.TestAllTypes.NestedMessage(bb=1)
-    n2 = unittest_pb2.TestAllTypes.NestedMessage(bb=2)
-    proto.repeated_nested_message.extend([n1,n2])
-    self.assertEqual(4, len(proto.repeated_nested_message))
-    self.assertEqual(n1, proto.repeated_nested_message[2])
-    self.assertEqual(n2, proto.repeated_nested_message[3])
-    self.assertRaises(TypeError,
-                      proto.repeated_nested_message.extend, n1)
-    self.assertRaises(TypeError,
-                      proto.repeated_nested_message.extend, [0])
-    wrong_message_type = unittest_pb2.TestAllTypes()
-    self.assertRaises(TypeError,
-                      proto.repeated_nested_message.extend,
-                      [wrong_message_type])
-
-    # Test clearing.
-    proto.ClearField('repeated_nested_message')
-    self.assertFalse(proto.repeated_nested_message)
-    self.assertEqual(0, len(proto.repeated_nested_message))
-
-    # Test constructing an element while adding it.
-    proto.repeated_nested_message.add(bb=23)
-    self.assertEqual(1, len(proto.repeated_nested_message))
-    self.assertEqual(23, proto.repeated_nested_message[0].bb)
-    self.assertRaises(TypeError, proto.repeated_nested_message.add, 23)
-    with self.assertRaises(Exception):
-      proto.repeated_nested_message[0] = 23
-
-  def testRepeatedCompositeRemove(self):
-    proto = unittest_pb2.TestAllTypes()
-
-    self.assertEqual(0, len(proto.repeated_nested_message))
-    m0 = proto.repeated_nested_message.add()
-    # Need to set some differentiating variable so m0 != m1 != m2:
-    m0.bb = len(proto.repeated_nested_message)
-    m1 = proto.repeated_nested_message.add()
-    m1.bb = len(proto.repeated_nested_message)
-    self.assertTrue(m0 != m1)
-    m2 = proto.repeated_nested_message.add()
-    m2.bb = len(proto.repeated_nested_message)
-    self.assertListsEqual([m0, m1, m2], proto.repeated_nested_message)
-
-    self.assertEqual(3, len(proto.repeated_nested_message))
-    proto.repeated_nested_message.remove(m0)
-    self.assertEqual(2, len(proto.repeated_nested_message))
-    self.assertEqual(m1, proto.repeated_nested_message[0])
-    self.assertEqual(m2, proto.repeated_nested_message[1])
-
-    # Removing m0 again or removing None should raise error
-    self.assertRaises(ValueError, proto.repeated_nested_message.remove, m0)
-    self.assertRaises(ValueError, proto.repeated_nested_message.remove, None)
-    self.assertEqual(2, len(proto.repeated_nested_message))
-
-    proto.repeated_nested_message.remove(m2)
-    self.assertEqual(1, len(proto.repeated_nested_message))
-    self.assertEqual(m1, proto.repeated_nested_message[0])
-
-  def testRepeatedCompositeReverse_Empty(self):
-    proto = unittest_pb2.TestAllTypes()
-
-    self.assertFalse(proto.repeated_nested_message)
-    self.assertEqual(0, len(proto.repeated_nested_message))
-
-    self.assertIsNone(proto.repeated_nested_message.reverse())
-
-    self.assertFalse(proto.repeated_nested_message)
-    self.assertEqual(0, len(proto.repeated_nested_message))
-
-  def testRepeatedCompositeReverse_NonEmpty(self):
-    proto = unittest_pb2.TestAllTypes()
-
-    self.assertFalse(proto.repeated_nested_message)
-    self.assertEqual(0, len(proto.repeated_nested_message))
-
-    m0 = proto.repeated_nested_message.add()
-    m0.bb = len(proto.repeated_nested_message)
-    m1 = proto.repeated_nested_message.add()
-    m1.bb = len(proto.repeated_nested_message)
-    m2 = proto.repeated_nested_message.add()
-    m2.bb = len(proto.repeated_nested_message)
-    self.assertListsEqual([m0, m1, m2], proto.repeated_nested_message)
-
-    self.assertIsNone(proto.repeated_nested_message.reverse())
-
-    self.assertListsEqual([m2, m1, m0], proto.repeated_nested_message)
-
-  def testHandWrittenReflection(self):
-    # Hand written extensions are only supported by the pure-Python
-    # implementation of the API.
-    if api_implementation.Type() != 'python':
-      return
-
-    FieldDescriptor = descriptor.FieldDescriptor
-    foo_field_descriptor = FieldDescriptor(
-        name='foo_field', full_name='MyProto.foo_field',
-        index=0, number=1, type=FieldDescriptor.TYPE_INT64,
-        cpp_type=FieldDescriptor.CPPTYPE_INT64,
-        label=FieldDescriptor.LABEL_OPTIONAL, default_value=0,
-        containing_type=None, message_type=None, enum_type=None,
-        is_extension=False, extension_scope=None,
-        options=descriptor_pb2.FieldOptions(),
-        # pylint: disable=protected-access
-        create_key=descriptor._internal_create_key)
-    mydescriptor = descriptor.Descriptor(
-        name='MyProto', full_name='MyProto', filename='ignored',
-        containing_type=None, nested_types=[], enum_types=[],
-        fields=[foo_field_descriptor], extensions=[],
-        options=descriptor_pb2.MessageOptions(),
-        # pylint: disable=protected-access
-        create_key=descriptor._internal_create_key)
-
-    class MyProtoClass(
-        message.Message, metaclass=reflection.GeneratedProtocolMessageType):
-      DESCRIPTOR = mydescriptor
-    myproto_instance = MyProtoClass()
-    self.assertEqual(0, myproto_instance.foo_field)
-    self.assertFalse(myproto_instance.HasField('foo_field'))
-    myproto_instance.foo_field = 23
-    self.assertEqual(23, myproto_instance.foo_field)
-    self.assertTrue(myproto_instance.HasField('foo_field'))
-
-  @testing_refleaks.SkipReferenceLeakChecker('MakeDescriptor is not repeatable')
-  def testDescriptorProtoSupport(self):
-    # Hand written descriptors/reflection are only supported by the pure-Python
-    # implementation of the API.
-    if api_implementation.Type() != 'python':
-      return
-
-    def AddDescriptorField(proto, field_name, field_type):
-      AddDescriptorField.field_index += 1
-      new_field = proto.field.add()
-      new_field.name = field_name
-      new_field.type = field_type
-      new_field.number = AddDescriptorField.field_index
-      new_field.label = descriptor_pb2.FieldDescriptorProto.LABEL_OPTIONAL
-
-    AddDescriptorField.field_index = 0
-
-    desc_proto = descriptor_pb2.DescriptorProto()
-    desc_proto.name = 'Car'
-    fdp = descriptor_pb2.FieldDescriptorProto
-    AddDescriptorField(desc_proto, 'name', fdp.TYPE_STRING)
-    AddDescriptorField(desc_proto, 'year', fdp.TYPE_INT64)
-    AddDescriptorField(desc_proto, 'automatic', fdp.TYPE_BOOL)
-    AddDescriptorField(desc_proto, 'price', fdp.TYPE_DOUBLE)
-    # Add a repeated field
-    AddDescriptorField.field_index += 1
-    new_field = desc_proto.field.add()
-    new_field.name = 'owners'
-    new_field.type = fdp.TYPE_STRING
-    new_field.number = AddDescriptorField.field_index
-    new_field.label = descriptor_pb2.FieldDescriptorProto.LABEL_REPEATED
-
-    desc = descriptor.MakeDescriptor(desc_proto)
-    self.assertTrue('name' in desc.fields_by_name)
-    self.assertTrue('year' in desc.fields_by_name)
-    self.assertTrue('automatic' in desc.fields_by_name)
-    self.assertTrue('price' in desc.fields_by_name)
-    self.assertTrue('owners' in desc.fields_by_name)
-
-    class CarMessage(
-        message.Message, metaclass=reflection.GeneratedProtocolMessageType):
-      DESCRIPTOR = desc
-
-    prius = CarMessage()
-    prius.name = 'prius'
-    prius.year = 2010
-    prius.automatic = True
-    prius.price = 25134.75
-    prius.owners.extend(['bob', 'susan'])
-
-    serialized_prius = prius.SerializeToString()
-    new_prius = reflection.ParseMessage(desc, serialized_prius)
-    self.assertIsNot(new_prius, prius)
-    self.assertEqual(prius, new_prius)
-
-    # these are unnecessary assuming message equality works as advertised but
-    # explicitly check to be safe since we're mucking about in metaclass foo
-    self.assertEqual(prius.name, new_prius.name)
-    self.assertEqual(prius.year, new_prius.year)
-    self.assertEqual(prius.automatic, new_prius.automatic)
-    self.assertEqual(prius.price, new_prius.price)
-    self.assertEqual(prius.owners, new_prius.owners)
-
-  def testExtensionDelete(self):
-    extendee_proto = more_extensions_pb2.ExtendedMessage()
-
-    extension_int32 = more_extensions_pb2.optional_int_extension
-    extendee_proto.Extensions[extension_int32] = 23
-
-    extension_repeated = more_extensions_pb2.repeated_int_extension
-    extendee_proto.Extensions[extension_repeated].append(11)
-
-    extension_msg = more_extensions_pb2.optional_message_extension
-    extendee_proto.Extensions[extension_msg].foreign_message_int = 56
-
-    self.assertEqual(len(extendee_proto.Extensions), 3)
-    del extendee_proto.Extensions[extension_msg]
-    self.assertEqual(len(extendee_proto.Extensions), 2)
-    del extendee_proto.Extensions[extension_repeated]
-    self.assertEqual(len(extendee_proto.Extensions), 1)
-    # Delete a none exist extension. It is OK to "del m.Extensions[ext]"
-    # even if the extension is not present in the message; we don't
-    # raise KeyError. This is consistent with "m.Extensions[ext]"
-    # returning a default value even if we did not set anything.
-    del extendee_proto.Extensions[extension_repeated]
-    self.assertEqual(len(extendee_proto.Extensions), 1)
-    del extendee_proto.Extensions[extension_int32]
-    self.assertEqual(len(extendee_proto.Extensions), 0)
-
-  def testExtensionIter(self):
-    extendee_proto = more_extensions_pb2.ExtendedMessage()
-
-    extension_int32 = more_extensions_pb2.optional_int_extension
-    extendee_proto.Extensions[extension_int32] = 23
-
-    extension_repeated = more_extensions_pb2.repeated_int_extension
-    extendee_proto.Extensions[extension_repeated].append(11)
-
-    extension_msg = more_extensions_pb2.optional_message_extension
-    extendee_proto.Extensions[extension_msg].foreign_message_int = 56
-
-    # Set some normal fields.
-    extendee_proto.optional_int32 = 1
-    extendee_proto.repeated_string.append('hi')
-
-    expected = (extension_int32, extension_msg, extension_repeated)
-    count = 0
-    for item in extendee_proto.Extensions:
-      self.assertEqual(item.name, expected[count].name)
-      self.assertIn(item, extendee_proto.Extensions)
-      count += 1
-    self.assertEqual(count, 3)
-
-  def testExtensionContainsError(self):
-    extendee_proto = more_extensions_pb2.ExtendedMessage()
-    self.assertRaises(KeyError, extendee_proto.Extensions.__contains__, 0)
-
-    field = more_extensions_pb2.ExtendedMessage.DESCRIPTOR.fields_by_name[
-        'optional_int32']
-    self.assertRaises(KeyError, extendee_proto.Extensions.__contains__, field)
-
-  def testTopLevelExtensionsForOptionalScalar(self):
-    extendee_proto = unittest_pb2.TestAllExtensions()
-    extension = unittest_pb2.optional_int32_extension
-    self.assertFalse(extendee_proto.HasExtension(extension))
-    self.assertNotIn(extension, extendee_proto.Extensions)
-    self.assertEqual(0, extendee_proto.Extensions[extension])
-    # As with normal scalar fields, just doing a read doesn't actually set the
-    # "has" bit.
-    self.assertFalse(extendee_proto.HasExtension(extension))
-    self.assertNotIn(extension, extendee_proto.Extensions)
-    # Actually set the thing.
-    extendee_proto.Extensions[extension] = 23
-    self.assertEqual(23, extendee_proto.Extensions[extension])
-    self.assertTrue(extendee_proto.HasExtension(extension))
-    self.assertIn(extension, extendee_proto.Extensions)
-    # Ensure that clearing works as well.
-    extendee_proto.ClearExtension(extension)
-    self.assertEqual(0, extendee_proto.Extensions[extension])
-    self.assertFalse(extendee_proto.HasExtension(extension))
-    self.assertNotIn(extension, extendee_proto.Extensions)
-
-  def testTopLevelExtensionsForRepeatedScalar(self):
-    extendee_proto = unittest_pb2.TestAllExtensions()
-    extension = unittest_pb2.repeated_string_extension
-    self.assertEqual(0, len(extendee_proto.Extensions[extension]))
-    self.assertNotIn(extension, extendee_proto.Extensions)
-    extendee_proto.Extensions[extension].append('foo')
-    self.assertEqual(['foo'], extendee_proto.Extensions[extension])
-    self.assertIn(extension, extendee_proto.Extensions)
-    string_list = extendee_proto.Extensions[extension]
-    extendee_proto.ClearExtension(extension)
-    self.assertEqual(0, len(extendee_proto.Extensions[extension]))
-    self.assertNotIn(extension, extendee_proto.Extensions)
-    self.assertIsNot(string_list, extendee_proto.Extensions[extension])
-    # Shouldn't be allowed to do Extensions[extension] = 'a'
-    self.assertRaises(TypeError, operator.setitem, extendee_proto.Extensions,
-                      extension, 'a')
-
-  def testTopLevelExtensionsForOptionalMessage(self):
-    extendee_proto = unittest_pb2.TestAllExtensions()
-    extension = unittest_pb2.optional_foreign_message_extension
-    self.assertFalse(extendee_proto.HasExtension(extension))
-    self.assertNotIn(extension, extendee_proto.Extensions)
-    self.assertEqual(0, extendee_proto.Extensions[extension].c)
-    # As with normal (non-extension) fields, merely reading from the
-    # thing shouldn't set the "has" bit.
-    self.assertFalse(extendee_proto.HasExtension(extension))
-    self.assertNotIn(extension, extendee_proto.Extensions)
-    extendee_proto.Extensions[extension].c = 23
-    self.assertEqual(23, extendee_proto.Extensions[extension].c)
-    self.assertTrue(extendee_proto.HasExtension(extension))
-    self.assertIn(extension, extendee_proto.Extensions)
-    # Save a reference here.
-    foreign_message = extendee_proto.Extensions[extension]
-    extendee_proto.ClearExtension(extension)
-    self.assertIsNot(foreign_message, extendee_proto.Extensions[extension])
-    # Setting a field on foreign_message now shouldn't set
-    # any "has" bits on extendee_proto.
-    foreign_message.c = 42
-    self.assertEqual(42, foreign_message.c)
-    self.assertTrue(foreign_message.HasField('c'))
-    self.assertFalse(extendee_proto.HasExtension(extension))
-    self.assertNotIn(extension, extendee_proto.Extensions)
-    # Shouldn't be allowed to do Extensions[extension] = 'a'
-    self.assertRaises(TypeError, operator.setitem, extendee_proto.Extensions,
-                      extension, 'a')
-
-  def testTopLevelExtensionsForRepeatedMessage(self):
-    extendee_proto = unittest_pb2.TestAllExtensions()
-    extension = unittest_pb2.repeatedgroup_extension
-    self.assertEqual(0, len(extendee_proto.Extensions[extension]))
-    group = extendee_proto.Extensions[extension].add()
-    group.a = 23
-    self.assertEqual(23, extendee_proto.Extensions[extension][0].a)
-    group.a = 42
-    self.assertEqual(42, extendee_proto.Extensions[extension][0].a)
-    group_list = extendee_proto.Extensions[extension]
-    extendee_proto.ClearExtension(extension)
-    self.assertEqual(0, len(extendee_proto.Extensions[extension]))
-    self.assertIsNot(group_list, extendee_proto.Extensions[extension])
-    # Shouldn't be allowed to do Extensions[extension] = 'a'
-    self.assertRaises(TypeError, operator.setitem, extendee_proto.Extensions,
-                      extension, 'a')
-
-  def testNestedExtensions(self):
-    extendee_proto = unittest_pb2.TestAllExtensions()
-    extension = unittest_pb2.TestRequired.single
-
-    # We just test the non-repeated case.
-    self.assertFalse(extendee_proto.HasExtension(extension))
-    self.assertNotIn(extension, extendee_proto.Extensions)
-    required = extendee_proto.Extensions[extension]
-    self.assertEqual(0, required.a)
-    self.assertFalse(extendee_proto.HasExtension(extension))
-    self.assertNotIn(extension, extendee_proto.Extensions)
-    required.a = 23
-    self.assertEqual(23, extendee_proto.Extensions[extension].a)
-    self.assertTrue(extendee_proto.HasExtension(extension))
-    self.assertIn(extension, extendee_proto.Extensions)
-    extendee_proto.ClearExtension(extension)
-    self.assertIsNot(required, extendee_proto.Extensions[extension])
-    self.assertFalse(extendee_proto.HasExtension(extension))
-    self.assertNotIn(extension, extendee_proto.Extensions)
-
-  def testRegisteredExtensions(self):
-    pool = unittest_pb2.DESCRIPTOR.pool
-    self.assertTrue(
-        pool.FindExtensionByNumber(
-            unittest_pb2.TestAllExtensions.DESCRIPTOR, 1))
-    self.assertIs(
-        pool.FindExtensionByName(
-            'protobuf_unittest.optional_int32_extension').containing_type,
-        unittest_pb2.TestAllExtensions.DESCRIPTOR)
-    # Make sure extensions haven't been registered into types that shouldn't
-    # have any.
-    self.assertEqual(0, len(
-        pool.FindAllExtensions(unittest_pb2.TestAllTypes.DESCRIPTOR)))
-
-  # If message A directly contains message B, and
-  # a.HasField('b') is currently False, then mutating any
-  # extension in B should change a.HasField('b') to True
-  # (and so on up the object tree).
-  def testHasBitsForAncestorsOfExtendedMessage(self):
-    # Optional scalar extension.
-    toplevel = more_extensions_pb2.TopLevelMessage()
-    self.assertFalse(toplevel.HasField('submessage'))
-    self.assertEqual(0, toplevel.submessage.Extensions[
-        more_extensions_pb2.optional_int_extension])
-    self.assertFalse(toplevel.HasField('submessage'))
-    toplevel.submessage.Extensions[
-        more_extensions_pb2.optional_int_extension] = 23
-    self.assertEqual(23, toplevel.submessage.Extensions[
-        more_extensions_pb2.optional_int_extension])
-    self.assertTrue(toplevel.HasField('submessage'))
-
-    # Repeated scalar extension.
-    toplevel = more_extensions_pb2.TopLevelMessage()
-    self.assertFalse(toplevel.HasField('submessage'))
-    self.assertEqual([], toplevel.submessage.Extensions[
-        more_extensions_pb2.repeated_int_extension])
-    self.assertFalse(toplevel.HasField('submessage'))
-    toplevel.submessage.Extensions[
-        more_extensions_pb2.repeated_int_extension].append(23)
-    self.assertEqual([23], toplevel.submessage.Extensions[
-        more_extensions_pb2.repeated_int_extension])
-    self.assertTrue(toplevel.HasField('submessage'))
-
-    # Optional message extension.
-    toplevel = more_extensions_pb2.TopLevelMessage()
-    self.assertFalse(toplevel.HasField('submessage'))
-    self.assertEqual(0, toplevel.submessage.Extensions[
-        more_extensions_pb2.optional_message_extension].foreign_message_int)
-    self.assertFalse(toplevel.HasField('submessage'))
-    toplevel.submessage.Extensions[
-        more_extensions_pb2.optional_message_extension].foreign_message_int = 23
-    self.assertEqual(23, toplevel.submessage.Extensions[
-        more_extensions_pb2.optional_message_extension].foreign_message_int)
-    self.assertTrue(toplevel.HasField('submessage'))
-
-    # Repeated message extension.
-    toplevel = more_extensions_pb2.TopLevelMessage()
-    self.assertFalse(toplevel.HasField('submessage'))
-    self.assertEqual(0, len(toplevel.submessage.Extensions[
-        more_extensions_pb2.repeated_message_extension]))
-    self.assertFalse(toplevel.HasField('submessage'))
-    foreign = toplevel.submessage.Extensions[
-        more_extensions_pb2.repeated_message_extension].add()
-    self.assertEqual(foreign, toplevel.submessage.Extensions[
-        more_extensions_pb2.repeated_message_extension][0])
-    self.assertTrue(toplevel.HasField('submessage'))
-
-  def testDisconnectionAfterClearingEmptyMessage(self):
-    toplevel = more_extensions_pb2.TopLevelMessage()
-    extendee_proto = toplevel.submessage
-    extension = more_extensions_pb2.optional_message_extension
-    extension_proto = extendee_proto.Extensions[extension]
-    extendee_proto.ClearExtension(extension)
-    extension_proto.foreign_message_int = 23
-
-    self.assertIsNot(extension_proto, extendee_proto.Extensions[extension])
-
-  def testExtensionFailureModes(self):
-    extendee_proto = unittest_pb2.TestAllExtensions()
-
-    # Try non-extension-handle arguments to HasExtension,
-    # ClearExtension(), and Extensions[]...
-    self.assertRaises(KeyError, extendee_proto.HasExtension, 1234)
-    self.assertRaises(KeyError, extendee_proto.ClearExtension, 1234)
-    self.assertRaises(KeyError, extendee_proto.Extensions.__getitem__, 1234)
-    self.assertRaises(KeyError, extendee_proto.Extensions.__setitem__, 1234, 5)
-
-    # Try something that *is* an extension handle, just not for
-    # this message...
-    for unknown_handle in (more_extensions_pb2.optional_int_extension,
-                           more_extensions_pb2.optional_message_extension,
-                           more_extensions_pb2.repeated_int_extension,
-                           more_extensions_pb2.repeated_message_extension):
-      self.assertRaises(KeyError, extendee_proto.HasExtension,
-                        unknown_handle)
-      self.assertRaises(KeyError, extendee_proto.ClearExtension,
-                        unknown_handle)
-      self.assertRaises(KeyError, extendee_proto.Extensions.__getitem__,
-                        unknown_handle)
-      self.assertRaises(KeyError, extendee_proto.Extensions.__setitem__,
-                        unknown_handle, 5)
-
-    # Try call HasExtension() with a valid handle, but for a
-    # *repeated* field.  (Just as with non-extension repeated
-    # fields, Has*() isn't supported for extension repeated fields).
-    self.assertRaises(KeyError, extendee_proto.HasExtension,
-                      unittest_pb2.repeated_string_extension)
-
-  def testMergeFromOptionalGroup(self):
-    # Test merge with an optional group.
-    proto1 = unittest_pb2.TestAllTypes()
-    proto1.optionalgroup.a = 12
-    proto2 = unittest_pb2.TestAllTypes()
-    proto2.MergeFrom(proto1)
-    self.assertEqual(12, proto2.optionalgroup.a)
-
-  def testMergeFromExtensionsSingular(self):
-    proto1 = unittest_pb2.TestAllExtensions()
-    proto1.Extensions[unittest_pb2.optional_int32_extension] = 1
-
-    proto2 = unittest_pb2.TestAllExtensions()
-    proto2.MergeFrom(proto1)
-    self.assertEqual(
-        1, proto2.Extensions[unittest_pb2.optional_int32_extension])
-
-  def testMergeFromExtensionsRepeated(self):
-    proto1 = unittest_pb2.TestAllExtensions()
-    proto1.Extensions[unittest_pb2.repeated_int32_extension].append(1)
-    proto1.Extensions[unittest_pb2.repeated_int32_extension].append(2)
-
-    proto2 = unittest_pb2.TestAllExtensions()
-    proto2.Extensions[unittest_pb2.repeated_int32_extension].append(0)
-    proto2.MergeFrom(proto1)
-    self.assertEqual(
-        3, len(proto2.Extensions[unittest_pb2.repeated_int32_extension]))
-    self.assertEqual(
-        0, proto2.Extensions[unittest_pb2.repeated_int32_extension][0])
-    self.assertEqual(
-        1, proto2.Extensions[unittest_pb2.repeated_int32_extension][1])
-    self.assertEqual(
-        2, proto2.Extensions[unittest_pb2.repeated_int32_extension][2])
-
-  def testMergeFromExtensionsNestedMessage(self):
-    proto1 = unittest_pb2.TestAllExtensions()
-    ext1 = proto1.Extensions[
-        unittest_pb2.repeated_nested_message_extension]
-    m = ext1.add()
-    m.bb = 222
-    m = ext1.add()
-    m.bb = 333
-
-    proto2 = unittest_pb2.TestAllExtensions()
-    ext2 = proto2.Extensions[
-        unittest_pb2.repeated_nested_message_extension]
-    m = ext2.add()
-    m.bb = 111
-
-    proto2.MergeFrom(proto1)
-    ext2 = proto2.Extensions[
-        unittest_pb2.repeated_nested_message_extension]
-    self.assertEqual(3, len(ext2))
-    self.assertEqual(111, ext2[0].bb)
-    self.assertEqual(222, ext2[1].bb)
-    self.assertEqual(333, ext2[2].bb)
-
-  def testCopyFromBadType(self):
-    # The python implementation doesn't raise an exception in this
-    # case. In theory it should.
-    if api_implementation.Type() == 'python':
-      return
-    proto1 = unittest_pb2.TestAllTypes()
-    proto2 = unittest_pb2.TestAllExtensions()
-    self.assertRaises(TypeError, proto1.CopyFrom, proto2)
-
-  def testClear(self):
-    proto = unittest_pb2.TestAllTypes()
-    # C++ implementation does not support lazy fields right now so leave it
-    # out for now.
-    if api_implementation.Type() == 'python':
-      test_util.SetAllFields(proto)
-    else:
-      test_util.SetAllNonLazyFields(proto)
-    # Clear the message.
-    proto.Clear()
-    self.assertEqual(proto.ByteSize(), 0)
-    empty_proto = unittest_pb2.TestAllTypes()
-    self.assertEqual(proto, empty_proto)
-
-    # Test if extensions which were set are cleared.
-    proto = unittest_pb2.TestAllExtensions()
-    test_util.SetAllExtensions(proto)
-    # Clear the message.
-    proto.Clear()
-    self.assertEqual(proto.ByteSize(), 0)
-    empty_proto = unittest_pb2.TestAllExtensions()
-    self.assertEqual(proto, empty_proto)
-
-  def testDisconnectingInOneof(self):
-    m = unittest_pb2.TestOneof2()  # This message has two messages in a oneof.
-    m.foo_message.moo_int = 5
-    sub_message = m.foo_message
-    # Accessing another message's field does not clear the first one
-    self.assertEqual(m.foo_lazy_message.moo_int, 0)
-    self.assertEqual(m.foo_message.moo_int, 5)
-    # But mutating another message in the oneof detaches the first one.
-    m.foo_lazy_message.moo_int = 6
-    self.assertEqual(m.foo_message.moo_int, 0)
-    # The reference we got above was detached and is still valid.
-    self.assertEqual(sub_message.moo_int, 5)
-    sub_message.moo_int = 7
-
-  def assertInitialized(self, proto):
-    self.assertTrue(proto.IsInitialized())
-    # Neither method should raise an exception.
-    proto.SerializeToString()
-    proto.SerializePartialToString()
-
-  def assertNotInitialized(self, proto, error_size=None):
-    errors = []
-    self.assertFalse(proto.IsInitialized())
-    self.assertFalse(proto.IsInitialized(errors))
-    self.assertEqual(error_size, len(errors))
-    self.assertRaises(message.EncodeError, proto.SerializeToString)
-    # "Partial" serialization doesn't care if message is uninitialized.
-    proto.SerializePartialToString()
-
-  def testIsInitialized(self):
-    # Trivial cases - all optional fields and extensions.
-    proto = unittest_pb2.TestAllTypes()
-    self.assertInitialized(proto)
-    proto = unittest_pb2.TestAllExtensions()
-    self.assertInitialized(proto)
-
-    # The case of uninitialized required fields.
-    proto = unittest_pb2.TestRequired()
-    self.assertNotInitialized(proto, 3)
-    proto.a = proto.b = proto.c = 2
-    self.assertInitialized(proto)
-
-    # The case of uninitialized submessage.
-    proto = unittest_pb2.TestRequiredForeign()
-    self.assertInitialized(proto)
-    proto.optional_message.a = 1
-    self.assertNotInitialized(proto, 2)
-    proto.optional_message.b = 0
-    proto.optional_message.c = 0
-    self.assertInitialized(proto)
-
-    # Uninitialized repeated submessage.
-    message1 = proto.repeated_message.add()
-    self.assertNotInitialized(proto, 3)
-    message1.a = message1.b = message1.c = 0
-    self.assertInitialized(proto)
-
-    # Uninitialized repeated group in an extension.
-    proto = unittest_pb2.TestAllExtensions()
-    extension = unittest_pb2.TestRequired.multi
-    message1 = proto.Extensions[extension].add()
-    message2 = proto.Extensions[extension].add()
-    self.assertNotInitialized(proto, 6)
-    message1.a = 1
-    message1.b = 1
-    message1.c = 1
-    self.assertNotInitialized(proto, 3)
-    message2.a = 2
-    message2.b = 2
-    message2.c = 2
-    self.assertInitialized(proto)
-
-    # Uninitialized nonrepeated message in an extension.
-    proto = unittest_pb2.TestAllExtensions()
-    extension = unittest_pb2.TestRequired.single
-    proto.Extensions[extension].a = 1
-    self.assertNotInitialized(proto, 2)
-    proto.Extensions[extension].b = 2
-    proto.Extensions[extension].c = 3
-    self.assertInitialized(proto)
-
-    # Try passing an errors list.
-    errors = []
-    proto = unittest_pb2.TestRequired()
-    self.assertFalse(proto.IsInitialized(errors))
-    self.assertEqual(errors, ['a', 'b', 'c'])
-    self.assertRaises(TypeError, proto.IsInitialized, 1, 2, 3)
-
-  @unittest.skipIf(
-      api_implementation.Type() == 'python',
-      'Errors are only available from the most recent C++ implementation.')
-  def testFileDescriptorErrors(self):
-    file_name = 'test_file_descriptor_errors.proto'
-    package_name = 'test_file_descriptor_errors.proto'
-    file_descriptor_proto = descriptor_pb2.FileDescriptorProto()
-    file_descriptor_proto.name = file_name
-    file_descriptor_proto.package = package_name
-    m1 = file_descriptor_proto.message_type.add()
-    m1.name = 'msg1'
-    # Compiles the proto into the C++ descriptor pool
-    descriptor.FileDescriptor(
-        file_name,
-        package_name,
-        serialized_pb=file_descriptor_proto.SerializeToString())
-    # Add a FileDescriptorProto that has duplicate symbols
-    another_file_name = 'another_test_file_descriptor_errors.proto'
-    file_descriptor_proto.name = another_file_name
-    m2 = file_descriptor_proto.message_type.add()
-    m2.name = 'msg2'
-    with self.assertRaises(TypeError) as cm:
-      descriptor.FileDescriptor(
-          another_file_name,
-          package_name,
-          serialized_pb=file_descriptor_proto.SerializeToString())
-      self.assertTrue(hasattr(cm, 'exception'), '%s not raised' %
-                      getattr(cm.expected, '__name__', cm.expected))
-      self.assertIn('test_file_descriptor_errors.proto', str(cm.exception))
-      # Error message will say something about this definition being a
-      # duplicate, though we don't check the message exactly to avoid a
-      # dependency on the C++ logging code.
-      self.assertIn('test_file_descriptor_errors.msg1', str(cm.exception))
-
-  def testStringUTF8Serialization(self):
-    proto = message_set_extensions_pb2.TestMessageSet()
-    extension_message = message_set_extensions_pb2.TestMessageSetExtension2
-    extension = extension_message.message_set_extension
-
-    test_utf8 = u'Те�т'
-    test_utf8_bytes = test_utf8.encode('utf-8')
-
-    # 'Test' in another language, using UTF-8 charset.
-    proto.Extensions[extension].str = test_utf8
-
-    # Serialize using the MessageSet wire format (this is specified in the
-    # .proto file).
-    serialized = proto.SerializeToString()
-
-    # Check byte size.
-    self.assertEqual(proto.ByteSize(), len(serialized))
-
-    raw = unittest_mset_pb2.RawMessageSet()
-    bytes_read = raw.MergeFromString(serialized)
-    self.assertEqual(len(serialized), bytes_read)
-
-    message2 = message_set_extensions_pb2.TestMessageSetExtension2()
-
-    self.assertEqual(1, len(raw.item))
-    # Check that the type_id is the same as the tag ID in the .proto file.
-    self.assertEqual(raw.item[0].type_id, 98418634)
-
-    # Check the actual bytes on the wire.
-    self.assertTrue(raw.item[0].message.endswith(test_utf8_bytes))
-    bytes_read = message2.MergeFromString(raw.item[0].message)
-    self.assertEqual(len(raw.item[0].message), bytes_read)
-
-    self.assertEqual(type(message2.str), str)
-    self.assertEqual(message2.str, test_utf8)
-
-    # The pure Python API throws an exception on MergeFromString(),
-    # if any of the string fields of the message can't be UTF-8 decoded.
-    # The C++ implementation of the API has no way to check that on
-    # MergeFromString and thus has no way to throw the exception.
-    #
-    # The pure Python API always returns objects of type 'unicode' (UTF-8
-    # encoded), or 'bytes' (in 7 bit ASCII).
-    badbytes = raw.item[0].message.replace(
-        test_utf8_bytes, len(test_utf8_bytes) * b'\xff')
-
-    unicode_decode_failed = False
-    try:
-      message2.MergeFromString(badbytes)
-    except UnicodeDecodeError:
-      unicode_decode_failed = True
-    string_field = message2.str
-    self.assertTrue(unicode_decode_failed or type(string_field) is bytes)
-
-  def testSetInParent(self):
-    proto = unittest_pb2.TestAllTypes()
-    self.assertFalse(proto.HasField('optionalgroup'))
-    proto.optionalgroup.SetInParent()
-    self.assertTrue(proto.HasField('optionalgroup'))
-
-  def testPackageInitializationImport(self):
-    """Test that we can import nested messages from their __init__.py.
-
-    Such setup is not trivial since at the time of processing of __init__.py one
-    can't refer to its submodules by name in code, so expressions like
-    google.protobuf.internal.import_test_package.inner_pb2
-    don't work. They do work in imports, so we have assign an alias at import
-    and then use that alias in generated code.
-    """
-    # We import here since it's the import that used to fail, and we want
-    # the failure to have the right context.
-    # pylint: disable=g-import-not-at-top
-    from google.protobuf.internal import import_test_package
-    # pylint: enable=g-import-not-at-top
-    msg = import_test_package.myproto.Outer()
-    # Just check the default value.
-    self.assertEqual(57, msg.inner.value)
-
-#  Since we had so many tests for protocol buffer equality, we broke these out
-#  into separate TestCase classes.
-
-
-@testing_refleaks.TestCase
-class TestAllTypesEqualityTest(unittest.TestCase):
-
-  def setUp(self):
-    self.first_proto = unittest_pb2.TestAllTypes()
-    self.second_proto = unittest_pb2.TestAllTypes()
-
-  def testNotHashable(self):
-    self.assertRaises(TypeError, hash, self.first_proto)
-
-  def testSelfEquality(self):
-    self.assertEqual(self.first_proto, self.first_proto)
-
-  def testEmptyProtosEqual(self):
-    self.assertEqual(self.first_proto, self.second_proto)
-
-
-@testing_refleaks.TestCase
-class FullProtosEqualityTest(unittest.TestCase):
-
-  """Equality tests using completely-full protos as a starting point."""
-
-  def setUp(self):
-    self.first_proto = unittest_pb2.TestAllTypes()
-    self.second_proto = unittest_pb2.TestAllTypes()
-    test_util.SetAllFields(self.first_proto)
-    test_util.SetAllFields(self.second_proto)
-
-  def testNotHashable(self):
-    self.assertRaises(TypeError, hash, self.first_proto)
-
-  def testNoneNotEqual(self):
-    self.assertNotEqual(self.first_proto, None)
-    self.assertNotEqual(None, self.second_proto)
-
-  def testNotEqualToOtherMessage(self):
-    third_proto = unittest_pb2.TestRequired()
-    self.assertNotEqual(self.first_proto, third_proto)
-    self.assertNotEqual(third_proto, self.second_proto)
-
-  def testAllFieldsFilledEquality(self):
-    self.assertEqual(self.first_proto, self.second_proto)
-
-  def testNonRepeatedScalar(self):
-    # Nonrepeated scalar field change should cause inequality.
-    self.first_proto.optional_int32 += 1
-    self.assertNotEqual(self.first_proto, self.second_proto)
-    # ...as should clearing a field.
-    self.first_proto.ClearField('optional_int32')
-    self.assertNotEqual(self.first_proto, self.second_proto)
-
-  def testNonRepeatedComposite(self):
-    # Change a nonrepeated composite field.
-    self.first_proto.optional_nested_message.bb += 1
-    self.assertNotEqual(self.first_proto, self.second_proto)
-    self.first_proto.optional_nested_message.bb -= 1
-    self.assertEqual(self.first_proto, self.second_proto)
-    # Clear a field in the nested message.
-    self.first_proto.optional_nested_message.ClearField('bb')
-    self.assertNotEqual(self.first_proto, self.second_proto)
-    self.first_proto.optional_nested_message.bb = (
-        self.second_proto.optional_nested_message.bb)
-    self.assertEqual(self.first_proto, self.second_proto)
-    # Remove the nested message entirely.
-    self.first_proto.ClearField('optional_nested_message')
-    self.assertNotEqual(self.first_proto, self.second_proto)
-
-  def testRepeatedScalar(self):
-    # Change a repeated scalar field.
-    self.first_proto.repeated_int32.append(5)
-    self.assertNotEqual(self.first_proto, self.second_proto)
-    self.first_proto.ClearField('repeated_int32')
-    self.assertNotEqual(self.first_proto, self.second_proto)
-
-  def testRepeatedComposite(self):
-    # Change value within a repeated composite field.
-    self.first_proto.repeated_nested_message[0].bb += 1
-    self.assertNotEqual(self.first_proto, self.second_proto)
-    self.first_proto.repeated_nested_message[0].bb -= 1
-    self.assertEqual(self.first_proto, self.second_proto)
-    # Add a value to a repeated composite field.
-    self.first_proto.repeated_nested_message.add()
-    self.assertNotEqual(self.first_proto, self.second_proto)
-    self.second_proto.repeated_nested_message.add()
-    self.assertEqual(self.first_proto, self.second_proto)
-
-  def testNonRepeatedScalarHasBits(self):
-    # Ensure that we test "has" bits as well as value for
-    # nonrepeated scalar field.
-    self.first_proto.ClearField('optional_int32')
-    self.second_proto.optional_int32 = 0
-    self.assertNotEqual(self.first_proto, self.second_proto)
-
-  def testNonRepeatedCompositeHasBits(self):
-    # Ensure that we test "has" bits as well as value for
-    # nonrepeated composite field.
-    self.first_proto.ClearField('optional_nested_message')
-    self.second_proto.optional_nested_message.ClearField('bb')
-    self.assertNotEqual(self.first_proto, self.second_proto)
-    self.first_proto.optional_nested_message.bb = 0
-    self.first_proto.optional_nested_message.ClearField('bb')
-    self.assertEqual(self.first_proto, self.second_proto)
-
-
-@testing_refleaks.TestCase
-class ExtensionEqualityTest(unittest.TestCase):
-
-  def testExtensionEquality(self):
-    first_proto = unittest_pb2.TestAllExtensions()
-    second_proto = unittest_pb2.TestAllExtensions()
-    self.assertEqual(first_proto, second_proto)
-    test_util.SetAllExtensions(first_proto)
-    self.assertNotEqual(first_proto, second_proto)
-    test_util.SetAllExtensions(second_proto)
-    self.assertEqual(first_proto, second_proto)
-
-    # Ensure that we check value equality.
-    first_proto.Extensions[unittest_pb2.optional_int32_extension] += 1
-    self.assertNotEqual(first_proto, second_proto)
-    first_proto.Extensions[unittest_pb2.optional_int32_extension] -= 1
-    self.assertEqual(first_proto, second_proto)
-
-    # Ensure that we also look at "has" bits.
-    first_proto.ClearExtension(unittest_pb2.optional_int32_extension)
-    second_proto.Extensions[unittest_pb2.optional_int32_extension] = 0
-    self.assertNotEqual(first_proto, second_proto)
-    first_proto.Extensions[unittest_pb2.optional_int32_extension] = 0
-    self.assertEqual(first_proto, second_proto)
-
-    # Ensure that differences in cached values
-    # don't matter if "has" bits are both false.
-    first_proto = unittest_pb2.TestAllExtensions()
-    second_proto = unittest_pb2.TestAllExtensions()
-    self.assertEqual(
-        0, first_proto.Extensions[unittest_pb2.optional_int32_extension])
-    self.assertEqual(first_proto, second_proto)
-
-
-@testing_refleaks.TestCase
-class MutualRecursionEqualityTest(unittest.TestCase):
-
-  def testEqualityWithMutualRecursion(self):
-    first_proto = unittest_pb2.TestMutualRecursionA()
-    second_proto = unittest_pb2.TestMutualRecursionA()
-    self.assertEqual(first_proto, second_proto)
-    first_proto.bb.a.bb.optional_int32 = 23
-    self.assertNotEqual(first_proto, second_proto)
-    second_proto.bb.a.bb.optional_int32 = 23
-    self.assertEqual(first_proto, second_proto)
-
-
-@testing_refleaks.TestCase
-class ByteSizeTest(unittest.TestCase):
-
-  def setUp(self):
-    self.proto = unittest_pb2.TestAllTypes()
-    self.extended_proto = more_extensions_pb2.ExtendedMessage()
-    self.packed_proto = unittest_pb2.TestPackedTypes()
-    self.packed_extended_proto = unittest_pb2.TestPackedExtensions()
-
-  def Size(self):
-    return self.proto.ByteSize()
-
-  def testEmptyMessage(self):
-    self.assertEqual(0, self.proto.ByteSize())
-
-  def testSizedOnKwargs(self):
-    # Use a separate message to ensure testing right after creation.
-    proto = unittest_pb2.TestAllTypes()
-    self.assertEqual(0, proto.ByteSize())
-    proto_kwargs = unittest_pb2.TestAllTypes(optional_int64 = 1)
-    # One byte for the tag, one to encode varint 1.
-    self.assertEqual(2, proto_kwargs.ByteSize())
-
-  def testVarints(self):
-    def Test(i, expected_varint_size):
-      self.proto.Clear()
-      self.proto.optional_int64 = i
-      # Add one to the varint size for the tag info
-      # for tag 1.
-      self.assertEqual(expected_varint_size + 1, self.Size())
-    Test(0, 1)
-    Test(1, 1)
-    for i, num_bytes in zip(range(7, 63, 7), range(1, 10000)):
-      Test((1 << i) - 1, num_bytes)
-    Test(-1, 10)
-    Test(-2, 10)
-    Test(-(1 << 63), 10)
-
-  def testStrings(self):
-    self.proto.optional_string = ''
-    # Need one byte for tag info (tag #14), and one byte for length.
-    self.assertEqual(2, self.Size())
-
-    self.proto.optional_string = 'abc'
-    # Need one byte for tag info (tag #14), and one byte for length.
-    self.assertEqual(2 + len(self.proto.optional_string), self.Size())
-
-    self.proto.optional_string = 'x' * 128
-    # Need one byte for tag info (tag #14), and TWO bytes for length.
-    self.assertEqual(3 + len(self.proto.optional_string), self.Size())
-
-  def testOtherNumerics(self):
-    self.proto.optional_fixed32 = 1234
-    # One byte for tag and 4 bytes for fixed32.
-    self.assertEqual(5, self.Size())
-    self.proto = unittest_pb2.TestAllTypes()
-
-    self.proto.optional_fixed64 = 1234
-    # One byte for tag and 8 bytes for fixed64.
-    self.assertEqual(9, self.Size())
-    self.proto = unittest_pb2.TestAllTypes()
-
-    self.proto.optional_float = 1.234
-    # One byte for tag and 4 bytes for float.
-    self.assertEqual(5, self.Size())
-    self.proto = unittest_pb2.TestAllTypes()
-
-    self.proto.optional_double = 1.234
-    # One byte for tag and 8 bytes for float.
-    self.assertEqual(9, self.Size())
-    self.proto = unittest_pb2.TestAllTypes()
-
-    self.proto.optional_sint32 = 64
-    # One byte for tag and 2 bytes for zig-zag-encoded 64.
-    self.assertEqual(3, self.Size())
-    self.proto = unittest_pb2.TestAllTypes()
-
-  def testComposites(self):
-    # 3 bytes.
-    self.proto.optional_nested_message.bb = (1 << 14)
-    # Plus one byte for bb tag.
-    # Plus 1 byte for optional_nested_message serialized size.
-    # Plus two bytes for optional_nested_message tag.
-    self.assertEqual(3 + 1 + 1 + 2, self.Size())
-
-  def testGroups(self):
-    # 4 bytes.
-    self.proto.optionalgroup.a = (1 << 21)
-    # Plus two bytes for |a| tag.
-    # Plus 2 * two bytes for START_GROUP and END_GROUP tags.
-    self.assertEqual(4 + 2 + 2*2, self.Size())
-
-  def testRepeatedScalars(self):
-    self.proto.repeated_int32.append(10)  # 1 byte.
-    self.proto.repeated_int32.append(128)  # 2 bytes.
-    # Also need 2 bytes for each entry for tag.
-    self.assertEqual(1 + 2 + 2*2, self.Size())
-
-  def testRepeatedScalarsExtend(self):
-    self.proto.repeated_int32.extend([10, 128])  # 3 bytes.
-    # Also need 2 bytes for each entry for tag.
-    self.assertEqual(1 + 2 + 2*2, self.Size())
-
-  def testRepeatedScalarsRemove(self):
-    self.proto.repeated_int32.append(10)  # 1 byte.
-    self.proto.repeated_int32.append(128)  # 2 bytes.
-    # Also need 2 bytes for each entry for tag.
-    self.assertEqual(1 + 2 + 2*2, self.Size())
-    self.proto.repeated_int32.remove(128)
-    self.assertEqual(1 + 2, self.Size())
-
-  def testRepeatedComposites(self):
-    # Empty message.  2 bytes tag plus 1 byte length.
-    foreign_message_0 = self.proto.repeated_nested_message.add()
-    # 2 bytes tag plus 1 byte length plus 1 byte bb tag 1 byte int.
-    foreign_message_1 = self.proto.repeated_nested_message.add()
-    foreign_message_1.bb = 7
-    self.assertEqual(2 + 1 + 2 + 1 + 1 + 1, self.Size())
-
-  def testRepeatedCompositesDelete(self):
-    # Empty message.  2 bytes tag plus 1 byte length.
-    foreign_message_0 = self.proto.repeated_nested_message.add()
-    # 2 bytes tag plus 1 byte length plus 1 byte bb tag 1 byte int.
-    foreign_message_1 = self.proto.repeated_nested_message.add()
-    foreign_message_1.bb = 9
-    self.assertEqual(2 + 1 + 2 + 1 + 1 + 1, self.Size())
-    repeated_nested_message = copy.deepcopy(
-        self.proto.repeated_nested_message)
-
-    # 2 bytes tag plus 1 byte length plus 1 byte bb tag 1 byte int.
-    del self.proto.repeated_nested_message[0]
-    self.assertEqual(2 + 1 + 1 + 1, self.Size())
-
-    # Now add a new message.
-    foreign_message_2 = self.proto.repeated_nested_message.add()
-    foreign_message_2.bb = 12
-
-    # 2 bytes tag plus 1 byte length plus 1 byte bb tag 1 byte int.
-    # 2 bytes tag plus 1 byte length plus 1 byte bb tag 1 byte int.
-    self.assertEqual(2 + 1 + 1 + 1 + 2 + 1 + 1 + 1, self.Size())
-
-    # 2 bytes tag plus 1 byte length plus 1 byte bb tag 1 byte int.
-    del self.proto.repeated_nested_message[1]
-    self.assertEqual(2 + 1 + 1 + 1, self.Size())
-
-    del self.proto.repeated_nested_message[0]
-    self.assertEqual(0, self.Size())
-
-    self.assertEqual(2, len(repeated_nested_message))
-    del repeated_nested_message[0:1]
-    # TODO(jieluo): Fix cpp extension bug when delete repeated message.
-    if api_implementation.Type() == 'python':
-      self.assertEqual(1, len(repeated_nested_message))
-    del repeated_nested_message[-1]
-    # TODO(jieluo): Fix cpp extension bug when delete repeated message.
-    if api_implementation.Type() == 'python':
-      self.assertEqual(0, len(repeated_nested_message))
-
-  def testRepeatedGroups(self):
-    # 2-byte START_GROUP plus 2-byte END_GROUP.
-    group_0 = self.proto.repeatedgroup.add()
-    # 2-byte START_GROUP plus 2-byte |a| tag + 1-byte |a|
-    # plus 2-byte END_GROUP.
-    group_1 = self.proto.repeatedgroup.add()
-    group_1.a =  7
-    self.assertEqual(2 + 2 + 2 + 2 + 1 + 2, self.Size())
-
-  def testExtensions(self):
-    proto = unittest_pb2.TestAllExtensions()
-    self.assertEqual(0, proto.ByteSize())
-    extension = unittest_pb2.optional_int32_extension  # Field #1, 1 byte.
-    proto.Extensions[extension] = 23
-    # 1 byte for tag, 1 byte for value.
-    self.assertEqual(2, proto.ByteSize())
-    field = unittest_pb2.TestAllTypes.DESCRIPTOR.fields_by_name[
-        'optional_int32']
-    with self.assertRaises(KeyError):
-      proto.Extensions[field] = 23
-
-  def testCacheInvalidationForNonrepeatedScalar(self):
-    # Test non-extension.
-    self.proto.optional_int32 = 1
-    self.assertEqual(2, self.proto.ByteSize())
-    self.proto.optional_int32 = 128
-    self.assertEqual(3, self.proto.ByteSize())
-    self.proto.ClearField('optional_int32')
-    self.assertEqual(0, self.proto.ByteSize())
-
-    # Test within extension.
-    extension = more_extensions_pb2.optional_int_extension
-    self.extended_proto.Extensions[extension] = 1
-    self.assertEqual(2, self.extended_proto.ByteSize())
-    self.extended_proto.Extensions[extension] = 128
-    self.assertEqual(3, self.extended_proto.ByteSize())
-    self.extended_proto.ClearExtension(extension)
-    self.assertEqual(0, self.extended_proto.ByteSize())
-
-  def testCacheInvalidationForRepeatedScalar(self):
-    # Test non-extension.
-    self.proto.repeated_int32.append(1)
-    self.assertEqual(3, self.proto.ByteSize())
-    self.proto.repeated_int32.append(1)
-    self.assertEqual(6, self.proto.ByteSize())
-    self.proto.repeated_int32[1] = 128
-    self.assertEqual(7, self.proto.ByteSize())
-    self.proto.ClearField('repeated_int32')
-    self.assertEqual(0, self.proto.ByteSize())
-
-    # Test within extension.
-    extension = more_extensions_pb2.repeated_int_extension
-    repeated = self.extended_proto.Extensions[extension]
-    repeated.append(1)
-    self.assertEqual(2, self.extended_proto.ByteSize())
-    repeated.append(1)
-    self.assertEqual(4, self.extended_proto.ByteSize())
-    repeated[1] = 128
-    self.assertEqual(5, self.extended_proto.ByteSize())
-    self.extended_proto.ClearExtension(extension)
-    self.assertEqual(0, self.extended_proto.ByteSize())
-
-  def testCacheInvalidationForNonrepeatedMessage(self):
-    # Test non-extension.
-    self.proto.optional_foreign_message.c = 1
-    self.assertEqual(5, self.proto.ByteSize())
-    self.proto.optional_foreign_message.c = 128
-    self.assertEqual(6, self.proto.ByteSize())
-    self.proto.optional_foreign_message.ClearField('c')
-    self.assertEqual(3, self.proto.ByteSize())
-    self.proto.ClearField('optional_foreign_message')
-    self.assertEqual(0, self.proto.ByteSize())
-
-    if api_implementation.Type() == 'python':
-      # This is only possible in pure-Python implementation of the API.
-      child = self.proto.optional_foreign_message
-      self.proto.ClearField('optional_foreign_message')
-      child.c = 128
-      self.assertEqual(0, self.proto.ByteSize())
-
-    # Test within extension.
-    extension = more_extensions_pb2.optional_message_extension
-    child = self.extended_proto.Extensions[extension]
-    self.assertEqual(0, self.extended_proto.ByteSize())
-    child.foreign_message_int = 1
-    self.assertEqual(4, self.extended_proto.ByteSize())
-    child.foreign_message_int = 128
-    self.assertEqual(5, self.extended_proto.ByteSize())
-    self.extended_proto.ClearExtension(extension)
-    self.assertEqual(0, self.extended_proto.ByteSize())
-
-  def testCacheInvalidationForRepeatedMessage(self):
-    # Test non-extension.
-    child0 = self.proto.repeated_foreign_message.add()
-    self.assertEqual(3, self.proto.ByteSize())
-    self.proto.repeated_foreign_message.add()
-    self.assertEqual(6, self.proto.ByteSize())
-    child0.c = 1
-    self.assertEqual(8, self.proto.ByteSize())
-    self.proto.ClearField('repeated_foreign_message')
-    self.assertEqual(0, self.proto.ByteSize())
-
-    # Test within extension.
-    extension = more_extensions_pb2.repeated_message_extension
-    child_list = self.extended_proto.Extensions[extension]
-    child0 = child_list.add()
-    self.assertEqual(2, self.extended_proto.ByteSize())
-    child_list.add()
-    self.assertEqual(4, self.extended_proto.ByteSize())
-    child0.foreign_message_int = 1
-    self.assertEqual(6, self.extended_proto.ByteSize())
-    child0.ClearField('foreign_message_int')
-    self.assertEqual(4, self.extended_proto.ByteSize())
-    self.extended_proto.ClearExtension(extension)
-    self.assertEqual(0, self.extended_proto.ByteSize())
-
-  def testPackedRepeatedScalars(self):
-    self.assertEqual(0, self.packed_proto.ByteSize())
-
-    self.packed_proto.packed_int32.append(10)   # 1 byte.
-    self.packed_proto.packed_int32.append(128)  # 2 bytes.
-    # The tag is 2 bytes (the field number is 90), and the varint
-    # storing the length is 1 byte.
-    int_size = 1 + 2 + 3
-    self.assertEqual(int_size, self.packed_proto.ByteSize())
-
-    self.packed_proto.packed_double.append(4.2)   # 8 bytes
-    self.packed_proto.packed_double.append(3.25)  # 8 bytes
-    # 2 more tag bytes, 1 more length byte.
-    double_size = 8 + 8 + 3
-    self.assertEqual(int_size+double_size, self.packed_proto.ByteSize())
-
-    self.packed_proto.ClearField('packed_int32')
-    self.assertEqual(double_size, self.packed_proto.ByteSize())
-
-  def testPackedExtensions(self):
-    self.assertEqual(0, self.packed_extended_proto.ByteSize())
-    extension = self.packed_extended_proto.Extensions[
-        unittest_pb2.packed_fixed32_extension]
-    extension.extend([1, 2, 3, 4])   # 16 bytes
-    # Tag is 3 bytes.
-    self.assertEqual(19, self.packed_extended_proto.ByteSize())
-
-
-# Issues to be sure to cover include:
-#   * Handling of unrecognized tags ("uninterpreted_bytes").
-#   * Handling of MessageSets.
-#   * Consistent ordering of tags in the wire format,
-#     including ordering between extensions and non-extension
-#     fields.
-#   * Consistent serialization of negative numbers, especially
-#     negative int32s.
-#   * Handling of empty submessages (with and without "has"
-#     bits set).
-
-@testing_refleaks.TestCase
-class SerializationTest(unittest.TestCase):
-
-  def testSerializeEmtpyMessage(self):
-    first_proto = unittest_pb2.TestAllTypes()
-    second_proto = unittest_pb2.TestAllTypes()
-    serialized = first_proto.SerializeToString()
-    self.assertEqual(first_proto.ByteSize(), len(serialized))
-    self.assertEqual(
-        len(serialized),
-        second_proto.MergeFromString(serialized))
-    self.assertEqual(first_proto, second_proto)
-
-  def testSerializeAllFields(self):
-    first_proto = unittest_pb2.TestAllTypes()
-    second_proto = unittest_pb2.TestAllTypes()
-    test_util.SetAllFields(first_proto)
-    serialized = first_proto.SerializeToString()
-    self.assertEqual(first_proto.ByteSize(), len(serialized))
-    self.assertEqual(
-        len(serialized),
-        second_proto.MergeFromString(serialized))
-    self.assertEqual(first_proto, second_proto)
-
-  def testSerializeAllExtensions(self):
-    first_proto = unittest_pb2.TestAllExtensions()
-    second_proto = unittest_pb2.TestAllExtensions()
-    test_util.SetAllExtensions(first_proto)
-    serialized = first_proto.SerializeToString()
-    self.assertEqual(
-        len(serialized),
-        second_proto.MergeFromString(serialized))
-    self.assertEqual(first_proto, second_proto)
-
-  def testSerializeWithOptionalGroup(self):
-    first_proto = unittest_pb2.TestAllTypes()
-    second_proto = unittest_pb2.TestAllTypes()
-    first_proto.optionalgroup.a = 242
-    serialized = first_proto.SerializeToString()
-    self.assertEqual(
-        len(serialized),
-        second_proto.MergeFromString(serialized))
-    self.assertEqual(first_proto, second_proto)
-
-  def testSerializeNegativeValues(self):
-    first_proto = unittest_pb2.TestAllTypes()
-
-    first_proto.optional_int32 = -1
-    first_proto.optional_int64 = -(2 << 40)
-    first_proto.optional_sint32 = -3
-    first_proto.optional_sint64 = -(4 << 40)
-    first_proto.optional_sfixed32 = -5
-    first_proto.optional_sfixed64 = -(6 << 40)
-
-    second_proto = unittest_pb2.TestAllTypes.FromString(
-        first_proto.SerializeToString())
-
-    self.assertEqual(first_proto, second_proto)
-
-  def testParseTruncated(self):
-    # This test is only applicable for the Python implementation of the API.
-    if api_implementation.Type() != 'python':
-      return
-
-    first_proto = unittest_pb2.TestAllTypes()
-    test_util.SetAllFields(first_proto)
-    serialized = memoryview(first_proto.SerializeToString())
-
-    for truncation_point in range(len(serialized) + 1):
-      try:
-        second_proto = unittest_pb2.TestAllTypes()
-        unknown_fields = unittest_pb2.TestEmptyMessage()
-        pos = second_proto._InternalParse(serialized, 0, truncation_point)
-        # If we didn't raise an error then we read exactly the amount expected.
-        self.assertEqual(truncation_point, pos)
-
-        # Parsing to unknown fields should not throw if parsing to known fields
-        # did not.
-        try:
-          pos2 = unknown_fields._InternalParse(serialized, 0, truncation_point)
-          self.assertEqual(truncation_point, pos2)
-        except message.DecodeError:
-          self.fail('Parsing unknown fields failed when parsing known fields '
-                    'did not.')
-      except message.DecodeError:
-        # Parsing unknown fields should also fail.
-        self.assertRaises(message.DecodeError, unknown_fields._InternalParse,
-                          serialized, 0, truncation_point)
-
-  def testCanonicalSerializationOrder(self):
-    proto = more_messages_pb2.OutOfOrderFields()
-    # These are also their tag numbers.  Even though we're setting these in
-    # reverse-tag order AND they're listed in reverse tag-order in the .proto
-    # file, they should nonetheless be serialized in tag order.
-    proto.optional_sint32 = 5
-    proto.Extensions[more_messages_pb2.optional_uint64] = 4
-    proto.optional_uint32 = 3
-    proto.Extensions[more_messages_pb2.optional_int64] = 2
-    proto.optional_int32 = 1
-    serialized = proto.SerializeToString()
-    self.assertEqual(proto.ByteSize(), len(serialized))
-    d = _MiniDecoder(serialized)
-    ReadTag = d.ReadFieldNumberAndWireType
-    self.assertEqual((1, wire_format.WIRETYPE_VARINT), ReadTag())
-    self.assertEqual(1, d.ReadInt32())
-    self.assertEqual((2, wire_format.WIRETYPE_VARINT), ReadTag())
-    self.assertEqual(2, d.ReadInt64())
-    self.assertEqual((3, wire_format.WIRETYPE_VARINT), ReadTag())
-    self.assertEqual(3, d.ReadUInt32())
-    self.assertEqual((4, wire_format.WIRETYPE_VARINT), ReadTag())
-    self.assertEqual(4, d.ReadUInt64())
-    self.assertEqual((5, wire_format.WIRETYPE_VARINT), ReadTag())
-    self.assertEqual(5, d.ReadSInt32())
-
-  def testCanonicalSerializationOrderSameAsCpp(self):
-    # Copy of the same test we use for C++.
-    proto = unittest_pb2.TestFieldOrderings()
-    test_util.SetAllFieldsAndExtensions(proto)
-    serialized = proto.SerializeToString()
-    test_util.ExpectAllFieldsAndExtensionsInOrder(serialized)
-
-  def testMergeFromStringWhenFieldsAlreadySet(self):
-    first_proto = unittest_pb2.TestAllTypes()
-    first_proto.repeated_string.append('foobar')
-    first_proto.optional_int32 = 23
-    first_proto.optional_nested_message.bb = 42
-    serialized = first_proto.SerializeToString()
-
-    second_proto = unittest_pb2.TestAllTypes()
-    second_proto.repeated_string.append('baz')
-    second_proto.optional_int32 = 100
-    second_proto.optional_nested_message.bb = 999
-
-    bytes_parsed = second_proto.MergeFromString(serialized)
-    self.assertEqual(len(serialized), bytes_parsed)
-
-    # Ensure that we append to repeated fields.
-    self.assertEqual(['baz', 'foobar'], list(second_proto.repeated_string))
-    # Ensure that we overwrite nonrepeatd scalars.
-    self.assertEqual(23, second_proto.optional_int32)
-    # Ensure that we recursively call MergeFromString() on
-    # submessages.
-    self.assertEqual(42, second_proto.optional_nested_message.bb)
-
-  def testMessageSetWireFormat(self):
-    proto = message_set_extensions_pb2.TestMessageSet()
-    extension_message1 = message_set_extensions_pb2.TestMessageSetExtension1
-    extension_message2 = message_set_extensions_pb2.TestMessageSetExtension2
-    extension1 = extension_message1.message_set_extension
-    extension2 = extension_message2.message_set_extension
-    extension3 = message_set_extensions_pb2.message_set_extension3
-    proto.Extensions[extension1].i = 123
-    proto.Extensions[extension2].str = 'foo'
-    proto.Extensions[extension3].text = 'bar'
-
-    # Serialize using the MessageSet wire format (this is specified in the
-    # .proto file).
-    serialized = proto.SerializeToString()
-
-    raw = unittest_mset_pb2.RawMessageSet()
-    self.assertEqual(False,
-                     raw.DESCRIPTOR.GetOptions().message_set_wire_format)
-    self.assertEqual(
-        len(serialized),
-        raw.MergeFromString(serialized))
-    self.assertEqual(3, len(raw.item))
-
-    message1 = message_set_extensions_pb2.TestMessageSetExtension1()
-    self.assertEqual(
-        len(raw.item[0].message),
-        message1.MergeFromString(raw.item[0].message))
-    self.assertEqual(123, message1.i)
-
-    message2 = message_set_extensions_pb2.TestMessageSetExtension2()
-    self.assertEqual(
-        len(raw.item[1].message),
-        message2.MergeFromString(raw.item[1].message))
-    self.assertEqual('foo', message2.str)
-
-    message3 = message_set_extensions_pb2.TestMessageSetExtension3()
-    self.assertEqual(
-        len(raw.item[2].message),
-        message3.MergeFromString(raw.item[2].message))
-    self.assertEqual('bar', message3.text)
-
-    # Deserialize using the MessageSet wire format.
-    proto2 = message_set_extensions_pb2.TestMessageSet()
-    self.assertEqual(
-        len(serialized),
-        proto2.MergeFromString(serialized))
-    self.assertEqual(123, proto2.Extensions[extension1].i)
-    self.assertEqual('foo', proto2.Extensions[extension2].str)
-    self.assertEqual('bar', proto2.Extensions[extension3].text)
-
-    # Check byte size.
-    self.assertEqual(proto2.ByteSize(), len(serialized))
-    self.assertEqual(proto.ByteSize(), len(serialized))
-
-  def testMessageSetWireFormatUnknownExtension(self):
-    # Create a message using the message set wire format with an unknown
-    # message.
-    raw = unittest_mset_pb2.RawMessageSet()
-
-    # Add an item.
-    item = raw.item.add()
-    item.type_id = 98418603
-    extension_message1 = message_set_extensions_pb2.TestMessageSetExtension1
-    message1 = message_set_extensions_pb2.TestMessageSetExtension1()
-    message1.i = 12345
-    item.message = message1.SerializeToString()
-
-    # Add a second, unknown extension.
-    item = raw.item.add()
-    item.type_id = 98418604
-    extension_message1 = message_set_extensions_pb2.TestMessageSetExtension1
-    message1 = message_set_extensions_pb2.TestMessageSetExtension1()
-    message1.i = 12346
-    item.message = message1.SerializeToString()
-
-    # Add another unknown extension.
-    item = raw.item.add()
-    item.type_id = 98418605
-    message1 = message_set_extensions_pb2.TestMessageSetExtension2()
-    message1.str = 'foo'
-    item.message = message1.SerializeToString()
-
-    serialized = raw.SerializeToString()
-
-    # Parse message using the message set wire format.
-    proto = message_set_extensions_pb2.TestMessageSet()
-    self.assertEqual(
-        len(serialized),
-        proto.MergeFromString(serialized))
-
-    # Check that the message parsed well.
-    extension_message1 = message_set_extensions_pb2.TestMessageSetExtension1
-    extension1 = extension_message1.message_set_extension
-    self.assertEqual(12345, proto.Extensions[extension1].i)
-
-  def testUnknownFields(self):
-    proto = unittest_pb2.TestAllTypes()
-    test_util.SetAllFields(proto)
-
-    serialized = proto.SerializeToString()
-
-    # The empty message should be parsable with all of the fields
-    # unknown.
-    proto2 = unittest_pb2.TestEmptyMessage()
-
-    # Parsing this message should succeed.
-    self.assertEqual(
-        len(serialized),
-        proto2.MergeFromString(serialized))
-
-    # Now test with a int64 field set.
-    proto = unittest_pb2.TestAllTypes()
-    proto.optional_int64 = 0x0fffffffffffffff
-    serialized = proto.SerializeToString()
-    # The empty message should be parsable with all of the fields
-    # unknown.
-    proto2 = unittest_pb2.TestEmptyMessage()
-    # Parsing this message should succeed.
-    self.assertEqual(
-        len(serialized),
-        proto2.MergeFromString(serialized))
-
-  def _CheckRaises(self, exc_class, callable_obj, exception):
-    """This method checks if the exception type and message are as expected."""
-    try:
-      callable_obj()
-    except exc_class as ex:
-      # Check if the exception message is the right one.
-      self.assertEqual(exception, str(ex))
-      return
-    else:
-      raise self.failureException('%s not raised' % str(exc_class))
-
-  def testSerializeUninitialized(self):
-    proto = unittest_pb2.TestRequired()
-    self._CheckRaises(
-        message.EncodeError,
-        proto.SerializeToString,
-        'Message protobuf_unittest.TestRequired is missing required fields: '
-        'a,b,c')
-    # Shouldn't raise exceptions.
-    partial = proto.SerializePartialToString()
-
-    proto2 = unittest_pb2.TestRequired()
-    self.assertFalse(proto2.HasField('a'))
-    # proto2 ParseFromString does not check that required fields are set.
-    proto2.ParseFromString(partial)
-    self.assertFalse(proto2.HasField('a'))
-
-    proto.a = 1
-    self._CheckRaises(
-        message.EncodeError,
-        proto.SerializeToString,
-        'Message protobuf_unittest.TestRequired is missing required fields: b,c')
-    # Shouldn't raise exceptions.
-    partial = proto.SerializePartialToString()
-
-    proto.b = 2
-    self._CheckRaises(
-        message.EncodeError,
-        proto.SerializeToString,
-        'Message protobuf_unittest.TestRequired is missing required fields: c')
-    # Shouldn't raise exceptions.
-    partial = proto.SerializePartialToString()
-
-    proto.c = 3
-    serialized = proto.SerializeToString()
-    # Shouldn't raise exceptions.
-    partial = proto.SerializePartialToString()
-
-    proto2 = unittest_pb2.TestRequired()
-    self.assertEqual(
-        len(serialized),
-        proto2.MergeFromString(serialized))
-    self.assertEqual(1, proto2.a)
-    self.assertEqual(2, proto2.b)
-    self.assertEqual(3, proto2.c)
-    self.assertEqual(
-        len(partial),
-        proto2.MergeFromString(partial))
-    self.assertEqual(1, proto2.a)
-    self.assertEqual(2, proto2.b)
-    self.assertEqual(3, proto2.c)
-
-  def testSerializeUninitializedSubMessage(self):
-    proto = unittest_pb2.TestRequiredForeign()
-
-    # Sub-message doesn't exist yet, so this succeeds.
-    proto.SerializeToString()
-
-    proto.optional_message.a = 1
-    self._CheckRaises(
-        message.EncodeError,
-        proto.SerializeToString,
-        'Message protobuf_unittest.TestRequiredForeign '
-        'is missing required fields: '
-        'optional_message.b,optional_message.c')
-
-    proto.optional_message.b = 2
-    proto.optional_message.c = 3
-    proto.SerializeToString()
-
-    proto.repeated_message.add().a = 1
-    proto.repeated_message.add().b = 2
-    self._CheckRaises(
-        message.EncodeError,
-        proto.SerializeToString,
-        'Message protobuf_unittest.TestRequiredForeign is missing required fields: '
-        'repeated_message[0].b,repeated_message[0].c,'
-        'repeated_message[1].a,repeated_message[1].c')
-
-    proto.repeated_message[0].b = 2
-    proto.repeated_message[0].c = 3
-    proto.repeated_message[1].a = 1
-    proto.repeated_message[1].c = 3
-    proto.SerializeToString()
-
-  def testSerializeAllPackedFields(self):
-    first_proto = unittest_pb2.TestPackedTypes()
-    second_proto = unittest_pb2.TestPackedTypes()
-    test_util.SetAllPackedFields(first_proto)
-    serialized = first_proto.SerializeToString()
-    self.assertEqual(first_proto.ByteSize(), len(serialized))
-    bytes_read = second_proto.MergeFromString(serialized)
-    self.assertEqual(second_proto.ByteSize(), bytes_read)
-    self.assertEqual(first_proto, second_proto)
-
-  def testSerializeAllPackedExtensions(self):
-    first_proto = unittest_pb2.TestPackedExtensions()
-    second_proto = unittest_pb2.TestPackedExtensions()
-    test_util.SetAllPackedExtensions(first_proto)
-    serialized = first_proto.SerializeToString()
-    bytes_read = second_proto.MergeFromString(serialized)
-    self.assertEqual(second_proto.ByteSize(), bytes_read)
-    self.assertEqual(first_proto, second_proto)
-
-  def testMergePackedFromStringWhenSomeFieldsAlreadySet(self):
-    first_proto = unittest_pb2.TestPackedTypes()
-    first_proto.packed_int32.extend([1, 2])
-    first_proto.packed_double.append(3.0)
-    serialized = first_proto.SerializeToString()
-
-    second_proto = unittest_pb2.TestPackedTypes()
-    second_proto.packed_int32.append(3)
-    second_proto.packed_double.extend([1.0, 2.0])
-    second_proto.packed_sint32.append(4)
-
-    self.assertEqual(
-        len(serialized),
-        second_proto.MergeFromString(serialized))
-    self.assertEqual([3, 1, 2], second_proto.packed_int32)
-    self.assertEqual([1.0, 2.0, 3.0], second_proto.packed_double)
-    self.assertEqual([4], second_proto.packed_sint32)
-
-  def testPackedFieldsWireFormat(self):
-    proto = unittest_pb2.TestPackedTypes()
-    proto.packed_int32.extend([1, 2, 150, 3])  # 1 + 1 + 2 + 1 bytes
-    proto.packed_double.extend([1.0, 1000.0])  # 8 + 8 bytes
-    proto.packed_float.append(2.0)             # 4 bytes, will be before double
-    serialized = proto.SerializeToString()
-    self.assertEqual(proto.ByteSize(), len(serialized))
-    d = _MiniDecoder(serialized)
-    ReadTag = d.ReadFieldNumberAndWireType
-    self.assertEqual((90, wire_format.WIRETYPE_LENGTH_DELIMITED), ReadTag())
-    self.assertEqual(1+1+1+2, d.ReadInt32())
-    self.assertEqual(1, d.ReadInt32())
-    self.assertEqual(2, d.ReadInt32())
-    self.assertEqual(150, d.ReadInt32())
-    self.assertEqual(3, d.ReadInt32())
-    self.assertEqual((100, wire_format.WIRETYPE_LENGTH_DELIMITED), ReadTag())
-    self.assertEqual(4, d.ReadInt32())
-    self.assertEqual(2.0, d.ReadFloat())
-    self.assertEqual((101, wire_format.WIRETYPE_LENGTH_DELIMITED), ReadTag())
-    self.assertEqual(8+8, d.ReadInt32())
-    self.assertEqual(1.0, d.ReadDouble())
-    self.assertEqual(1000.0, d.ReadDouble())
-    self.assertTrue(d.EndOfStream())
-
-  def testParsePackedFromUnpacked(self):
-    unpacked = unittest_pb2.TestUnpackedTypes()
-    test_util.SetAllUnpackedFields(unpacked)
-    packed = unittest_pb2.TestPackedTypes()
-    serialized = unpacked.SerializeToString()
-    self.assertEqual(
-        len(serialized),
-        packed.MergeFromString(serialized))
-    expected = unittest_pb2.TestPackedTypes()
-    test_util.SetAllPackedFields(expected)
-    self.assertEqual(expected, packed)
-
-  def testParseUnpackedFromPacked(self):
-    packed = unittest_pb2.TestPackedTypes()
-    test_util.SetAllPackedFields(packed)
-    unpacked = unittest_pb2.TestUnpackedTypes()
-    serialized = packed.SerializeToString()
-    self.assertEqual(
-        len(serialized),
-        unpacked.MergeFromString(serialized))
-    expected = unittest_pb2.TestUnpackedTypes()
-    test_util.SetAllUnpackedFields(expected)
-    self.assertEqual(expected, unpacked)
-
-  def testFieldNumbers(self):
-    proto = unittest_pb2.TestAllTypes()
-    self.assertEqual(unittest_pb2.TestAllTypes.NestedMessage.BB_FIELD_NUMBER, 1)
-    self.assertEqual(unittest_pb2.TestAllTypes.OPTIONAL_INT32_FIELD_NUMBER, 1)
-    self.assertEqual(unittest_pb2.TestAllTypes.OPTIONALGROUP_FIELD_NUMBER, 16)
-    self.assertEqual(
-      unittest_pb2.TestAllTypes.OPTIONAL_NESTED_MESSAGE_FIELD_NUMBER, 18)
-    self.assertEqual(
-      unittest_pb2.TestAllTypes.OPTIONAL_NESTED_ENUM_FIELD_NUMBER, 21)
-    self.assertEqual(unittest_pb2.TestAllTypes.REPEATED_INT32_FIELD_NUMBER, 31)
-    self.assertEqual(unittest_pb2.TestAllTypes.REPEATEDGROUP_FIELD_NUMBER, 46)
-    self.assertEqual(
-      unittest_pb2.TestAllTypes.REPEATED_NESTED_MESSAGE_FIELD_NUMBER, 48)
-    self.assertEqual(
-      unittest_pb2.TestAllTypes.REPEATED_NESTED_ENUM_FIELD_NUMBER, 51)
-
-  def testExtensionFieldNumbers(self):
-    self.assertEqual(unittest_pb2.TestRequired.single.number, 1000)
-    self.assertEqual(unittest_pb2.TestRequired.SINGLE_FIELD_NUMBER, 1000)
-    self.assertEqual(unittest_pb2.TestRequired.multi.number, 1001)
-    self.assertEqual(unittest_pb2.TestRequired.MULTI_FIELD_NUMBER, 1001)
-    self.assertEqual(unittest_pb2.optional_int32_extension.number, 1)
-    self.assertEqual(unittest_pb2.OPTIONAL_INT32_EXTENSION_FIELD_NUMBER, 1)
-    self.assertEqual(unittest_pb2.optionalgroup_extension.number, 16)
-    self.assertEqual(unittest_pb2.OPTIONALGROUP_EXTENSION_FIELD_NUMBER, 16)
-    self.assertEqual(unittest_pb2.optional_nested_message_extension.number, 18)
-    self.assertEqual(
-      unittest_pb2.OPTIONAL_NESTED_MESSAGE_EXTENSION_FIELD_NUMBER, 18)
-    self.assertEqual(unittest_pb2.optional_nested_enum_extension.number, 21)
-    self.assertEqual(unittest_pb2.OPTIONAL_NESTED_ENUM_EXTENSION_FIELD_NUMBER,
-      21)
-    self.assertEqual(unittest_pb2.repeated_int32_extension.number, 31)
-    self.assertEqual(unittest_pb2.REPEATED_INT32_EXTENSION_FIELD_NUMBER, 31)
-    self.assertEqual(unittest_pb2.repeatedgroup_extension.number, 46)
-    self.assertEqual(unittest_pb2.REPEATEDGROUP_EXTENSION_FIELD_NUMBER, 46)
-    self.assertEqual(unittest_pb2.repeated_nested_message_extension.number, 48)
-    self.assertEqual(
-      unittest_pb2.REPEATED_NESTED_MESSAGE_EXTENSION_FIELD_NUMBER, 48)
-    self.assertEqual(unittest_pb2.repeated_nested_enum_extension.number, 51)
-    self.assertEqual(unittest_pb2.REPEATED_NESTED_ENUM_EXTENSION_FIELD_NUMBER,
-      51)
-
-  def testFieldProperties(self):
-    cls = unittest_pb2.TestAllTypes
-    self.assertIs(cls.optional_int32.DESCRIPTOR,
-                  cls.DESCRIPTOR.fields_by_name['optional_int32'])
-    self.assertEqual(cls.OPTIONAL_INT32_FIELD_NUMBER,
-                     cls.optional_int32.DESCRIPTOR.number)
-    self.assertIs(cls.optional_nested_message.DESCRIPTOR,
-                  cls.DESCRIPTOR.fields_by_name['optional_nested_message'])
-    self.assertEqual(cls.OPTIONAL_NESTED_MESSAGE_FIELD_NUMBER,
-                     cls.optional_nested_message.DESCRIPTOR.number)
-    self.assertIs(cls.repeated_int32.DESCRIPTOR,
-                  cls.DESCRIPTOR.fields_by_name['repeated_int32'])
-    self.assertEqual(cls.REPEATED_INT32_FIELD_NUMBER,
-                     cls.repeated_int32.DESCRIPTOR.number)
-
-  def testFieldDataDescriptor(self):
-    msg = unittest_pb2.TestAllTypes()
-    msg.optional_int32 = 42
-    self.assertEqual(unittest_pb2.TestAllTypes.optional_int32.__get__(msg), 42)
-    unittest_pb2.TestAllTypes.optional_int32.__set__(msg, 25)
-    self.assertEqual(msg.optional_int32, 25)
-    with self.assertRaises(AttributeError):
-      del msg.optional_int32
-    try:
-      unittest_pb2.ForeignMessage.c.__get__(msg)
-    except TypeError:
-      pass  # The cpp implementation cannot mix fields from other messages.
-      # This test exercises a specific check that avoids a crash.
-    else:
-      pass  # The python implementation allows fields from other messages.
-      # This is useless, but works.
-
-  def testInitKwargs(self):
-    proto = unittest_pb2.TestAllTypes(
-        optional_int32=1,
-        optional_string='foo',
-        optional_bool=True,
-        optional_bytes=b'bar',
-        optional_nested_message=unittest_pb2.TestAllTypes.NestedMessage(bb=1),
-        optional_foreign_message=unittest_pb2.ForeignMessage(c=1),
-        optional_nested_enum=unittest_pb2.TestAllTypes.FOO,
-        optional_foreign_enum=unittest_pb2.FOREIGN_FOO,
-        repeated_int32=[1, 2, 3])
-    self.assertTrue(proto.IsInitialized())
-    self.assertTrue(proto.HasField('optional_int32'))
-    self.assertTrue(proto.HasField('optional_string'))
-    self.assertTrue(proto.HasField('optional_bool'))
-    self.assertTrue(proto.HasField('optional_bytes'))
-    self.assertTrue(proto.HasField('optional_nested_message'))
-    self.assertTrue(proto.HasField('optional_foreign_message'))
-    self.assertTrue(proto.HasField('optional_nested_enum'))
-    self.assertTrue(proto.HasField('optional_foreign_enum'))
-    self.assertEqual(1, proto.optional_int32)
-    self.assertEqual('foo', proto.optional_string)
-    self.assertEqual(True, proto.optional_bool)
-    self.assertEqual(b'bar', proto.optional_bytes)
-    self.assertEqual(1, proto.optional_nested_message.bb)
-    self.assertEqual(1, proto.optional_foreign_message.c)
-    self.assertEqual(unittest_pb2.TestAllTypes.FOO,
-                     proto.optional_nested_enum)
-    self.assertEqual(unittest_pb2.FOREIGN_FOO, proto.optional_foreign_enum)
-    self.assertEqual([1, 2, 3], proto.repeated_int32)
-
-  def testInitArgsUnknownFieldName(self):
-    def InitalizeEmptyMessageWithExtraKeywordArg():
-      unused_proto = unittest_pb2.TestEmptyMessage(unknown='unknown')
-    self._CheckRaises(
-        ValueError,
-        InitalizeEmptyMessageWithExtraKeywordArg,
-        'Protocol message TestEmptyMessage has no "unknown" field.')
-
-  def testInitRequiredKwargs(self):
-    proto = unittest_pb2.TestRequired(a=1, b=1, c=1)
-    self.assertTrue(proto.IsInitialized())
-    self.assertTrue(proto.HasField('a'))
-    self.assertTrue(proto.HasField('b'))
-    self.assertTrue(proto.HasField('c'))
-    self.assertFalse(proto.HasField('dummy2'))
-    self.assertEqual(1, proto.a)
-    self.assertEqual(1, proto.b)
-    self.assertEqual(1, proto.c)
-
-  def testInitRequiredForeignKwargs(self):
-    proto = unittest_pb2.TestRequiredForeign(
-        optional_message=unittest_pb2.TestRequired(a=1, b=1, c=1))
-    self.assertTrue(proto.IsInitialized())
-    self.assertTrue(proto.HasField('optional_message'))
-    self.assertTrue(proto.optional_message.IsInitialized())
-    self.assertTrue(proto.optional_message.HasField('a'))
-    self.assertTrue(proto.optional_message.HasField('b'))
-    self.assertTrue(proto.optional_message.HasField('c'))
-    self.assertFalse(proto.optional_message.HasField('dummy2'))
-    self.assertEqual(unittest_pb2.TestRequired(a=1, b=1, c=1),
-                     proto.optional_message)
-    self.assertEqual(1, proto.optional_message.a)
-    self.assertEqual(1, proto.optional_message.b)
-    self.assertEqual(1, proto.optional_message.c)
-
-  def testInitRepeatedKwargs(self):
-    proto = unittest_pb2.TestAllTypes(repeated_int32=[1, 2, 3])
-    self.assertTrue(proto.IsInitialized())
-    self.assertEqual(1, proto.repeated_int32[0])
-    self.assertEqual(2, proto.repeated_int32[1])
-    self.assertEqual(3, proto.repeated_int32[2])
-
-
-@testing_refleaks.TestCase
-class OptionsTest(unittest.TestCase):
-
-  def testMessageOptions(self):
-    proto = message_set_extensions_pb2.TestMessageSet()
-    self.assertEqual(True,
-                     proto.DESCRIPTOR.GetOptions().message_set_wire_format)
-    proto = unittest_pb2.TestAllTypes()
-    self.assertEqual(False,
-                     proto.DESCRIPTOR.GetOptions().message_set_wire_format)
-
-  def testPackedOptions(self):
-    proto = unittest_pb2.TestAllTypes()
-    proto.optional_int32 = 1
-    proto.optional_double = 3.0
-    for field_descriptor, _ in proto.ListFields():
-      self.assertEqual(False, field_descriptor.GetOptions().packed)
-
-    proto = unittest_pb2.TestPackedTypes()
-    proto.packed_int32.append(1)
-    proto.packed_double.append(3.0)
-    for field_descriptor, _ in proto.ListFields():
-      self.assertEqual(True, field_descriptor.GetOptions().packed)
-      self.assertEqual(descriptor.FieldDescriptor.LABEL_REPEATED,
-                       field_descriptor.label)
-
-
-
-@testing_refleaks.TestCase
-class ClassAPITest(unittest.TestCase):
-
-  @unittest.skipIf(
-      api_implementation.Type() != 'python',
-      'C++ implementation requires a call to MakeDescriptor()')
-  @testing_refleaks.SkipReferenceLeakChecker('MakeClass is not repeatable')
-  def testMakeClassWithNestedDescriptor(self):
-    leaf_desc = descriptor.Descriptor(
-        'leaf', 'package.parent.child.leaf', '',
-        containing_type=None, fields=[],
-        nested_types=[], enum_types=[],
-        extensions=[],
-        # pylint: disable=protected-access
-        create_key=descriptor._internal_create_key)
-    child_desc = descriptor.Descriptor(
-        'child', 'package.parent.child', '',
-        containing_type=None, fields=[],
-        nested_types=[leaf_desc], enum_types=[],
-        extensions=[],
-        # pylint: disable=protected-access
-        create_key=descriptor._internal_create_key)
-    sibling_desc = descriptor.Descriptor(
-        'sibling', 'package.parent.sibling',
-        '', containing_type=None, fields=[],
-        nested_types=[], enum_types=[],
-        extensions=[],
-        # pylint: disable=protected-access
-        create_key=descriptor._internal_create_key)
-    parent_desc = descriptor.Descriptor(
-        'parent', 'package.parent', '',
-        containing_type=None, fields=[],
-        nested_types=[child_desc, sibling_desc],
-        enum_types=[], extensions=[],
-        # pylint: disable=protected-access
-        create_key=descriptor._internal_create_key)
-    reflection.MakeClass(parent_desc)
-
-  def _GetSerializedFileDescriptor(self, name):
-    """Get a serialized representation of a test FileDescriptorProto.
-
-    Args:
-      name: All calls to this must use a unique message name, to avoid
-          collisions in the cpp descriptor pool.
-    Returns:
-      A string containing the serialized form of a test FileDescriptorProto.
-    """
-    file_descriptor_str = (
-        'message_type {'
-        '  name: "' + name + '"'
-        '  field {'
-        '    name: "flat"'
-        '    number: 1'
-        '    label: LABEL_REPEATED'
-        '    type: TYPE_UINT32'
-        '  }'
-        '  field {'
-        '    name: "bar"'
-        '    number: 2'
-        '    label: LABEL_OPTIONAL'
-        '    type: TYPE_MESSAGE'
-        '    type_name: "Bar"'
-        '  }'
-        '  nested_type {'
-        '    name: "Bar"'
-        '    field {'
-        '      name: "baz"'
-        '      number: 3'
-        '      label: LABEL_OPTIONAL'
-        '      type: TYPE_MESSAGE'
-        '      type_name: "Baz"'
-        '    }'
-        '    nested_type {'
-        '      name: "Baz"'
-        '      enum_type {'
-        '        name: "deep_enum"'
-        '        value {'
-        '          name: "VALUE_A"'
-        '          number: 0'
-        '        }'
-        '      }'
-        '      field {'
-        '        name: "deep"'
-        '        number: 4'
-        '        label: LABEL_OPTIONAL'
-        '        type: TYPE_UINT32'
-        '      }'
-        '    }'
-        '  }'
-        '}')
-    file_descriptor = descriptor_pb2.FileDescriptorProto()
-    text_format.Merge(file_descriptor_str, file_descriptor)
-    return file_descriptor.SerializeToString()
-
-  @testing_refleaks.SkipReferenceLeakChecker('MakeDescriptor is not repeatable')
-  # This test can only run once; the second time, it raises errors about
-  # conflicting message descriptors.
-  def testParsingFlatClassWithExplicitClassDeclaration(self):
-    """Test that the generated class can parse a flat message."""
-    # TODO(xiaofeng): This test fails with cpp implementation in the call
-    # of six.with_metaclass(). The other two callsites of with_metaclass
-    # in this file are both excluded from cpp test, so it might be expected
-    # to fail. Need someone more familiar with the python code to take a
-    # look at this.
-    if api_implementation.Type() != 'python':
-      return
-    file_descriptor = descriptor_pb2.FileDescriptorProto()
-    file_descriptor.ParseFromString(self._GetSerializedFileDescriptor('A'))
-    msg_descriptor = descriptor.MakeDescriptor(
-        file_descriptor.message_type[0])
-
-    class MessageClass(
-        message.Message, metaclass=reflection.GeneratedProtocolMessageType):
-      DESCRIPTOR = msg_descriptor
-    msg = MessageClass()
-    msg_str = (
-        'flat: 0 '
-        'flat: 1 '
-        'flat: 2 ')
-    text_format.Merge(msg_str, msg)
-    self.assertEqual(msg.flat, [0, 1, 2])
-
-  @testing_refleaks.SkipReferenceLeakChecker('MakeDescriptor is not repeatable')
-  def testParsingFlatClass(self):
-    """Test that the generated class can parse a flat message."""
-    file_descriptor = descriptor_pb2.FileDescriptorProto()
-    file_descriptor.ParseFromString(self._GetSerializedFileDescriptor('B'))
-    msg_descriptor = descriptor.MakeDescriptor(
-        file_descriptor.message_type[0])
-    msg_class = reflection.MakeClass(msg_descriptor)
-    msg = msg_class()
-    msg_str = (
-        'flat: 0 '
-        'flat: 1 '
-        'flat: 2 ')
-    text_format.Merge(msg_str, msg)
-    self.assertEqual(msg.flat, [0, 1, 2])
-
-  @testing_refleaks.SkipReferenceLeakChecker('MakeDescriptor is not repeatable')
-  def testParsingNestedClass(self):
-    """Test that the generated class can parse a nested message."""
-    file_descriptor = descriptor_pb2.FileDescriptorProto()
-    file_descriptor.ParseFromString(self._GetSerializedFileDescriptor('C'))
-    msg_descriptor = descriptor.MakeDescriptor(
-        file_descriptor.message_type[0])
-    msg_class = reflection.MakeClass(msg_descriptor)
-    msg = msg_class()
-    msg_str = (
-        'bar {'
-        '  baz {'
-        '    deep: 4'
-        '  }'
-        '}')
-    text_format.Merge(msg_str, msg)
-    self.assertEqual(msg.bar.baz.deep, 4)
-
-if __name__ == '__main__':
-  unittest.main()
diff --git a/libs/protobuf/python/google/protobuf/internal/service_reflection_test.py b/libs/protobuf/python/google/protobuf/internal/service_reflection_test.py
deleted file mode 100644
index 8e72213..0000000
--- a/libs/protobuf/python/google/protobuf/internal/service_reflection_test.py
+++ /dev/null
@@ -1,139 +0,0 @@
-# Protocol Buffers - Google's data interchange format
-# Copyright 2008 Google Inc.  All rights reserved.
-# https://developers.google.com/protocol-buffers/
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-"""Tests for google.protobuf.internal.service_reflection."""
-
-__author__ = 'petar@google.com (Petar Petrov)'
-
-
-import unittest
-
-from google.protobuf import unittest_pb2
-from google.protobuf import service_reflection
-from google.protobuf import service
-
-
-class FooUnitTest(unittest.TestCase):
-
-  def testService(self):
-    class MockRpcChannel(service.RpcChannel):
-      def CallMethod(self, method, controller, request, response, callback):
-        self.method = method
-        self.controller = controller
-        self.request = request
-        callback(response)
-
-    class MockRpcController(service.RpcController):
-      def SetFailed(self, msg):
-        self.failure_message = msg
-
-    self.callback_response = None
-
-    class MyService(unittest_pb2.TestService):
-      pass
-
-    self.callback_response = None
-
-    def MyCallback(response):
-      self.callback_response = response
-
-    rpc_controller = MockRpcController()
-    channel = MockRpcChannel()
-    srvc = MyService()
-    srvc.Foo(rpc_controller, unittest_pb2.FooRequest(), MyCallback)
-    self.assertEqual('Method Foo not implemented.',
-                     rpc_controller.failure_message)
-    self.assertEqual(None, self.callback_response)
-
-    rpc_controller.failure_message = None
-
-    service_descriptor = unittest_pb2.TestService.GetDescriptor()
-    srvc.CallMethod(service_descriptor.methods[1], rpc_controller,
-                    unittest_pb2.BarRequest(), MyCallback)
-    self.assertTrue(srvc.GetRequestClass(service_descriptor.methods[1]) is
-                    unittest_pb2.BarRequest)
-    self.assertTrue(srvc.GetResponseClass(service_descriptor.methods[1]) is
-                    unittest_pb2.BarResponse)
-    self.assertEqual('Method Bar not implemented.',
-                     rpc_controller.failure_message)
-    self.assertEqual(None, self.callback_response)
-
-    class MyServiceImpl(unittest_pb2.TestService):
-      def Foo(self, rpc_controller, request, done):
-        self.foo_called = True
-      def Bar(self, rpc_controller, request, done):
-        self.bar_called = True
-
-    srvc = MyServiceImpl()
-    rpc_controller.failure_message = None
-    srvc.Foo(rpc_controller, unittest_pb2.FooRequest(), MyCallback)
-    self.assertEqual(None, rpc_controller.failure_message)
-    self.assertEqual(True, srvc.foo_called)
-
-    rpc_controller.failure_message = None
-    srvc.CallMethod(service_descriptor.methods[1], rpc_controller,
-                    unittest_pb2.BarRequest(), MyCallback)
-    self.assertEqual(None, rpc_controller.failure_message)
-    self.assertEqual(True, srvc.bar_called)
-
-  def testServiceStub(self):
-    class MockRpcChannel(service.RpcChannel):
-      def CallMethod(self, method, controller, request,
-                     response_class, callback):
-        self.method = method
-        self.controller = controller
-        self.request = request
-        callback(response_class())
-
-    self.callback_response = None
-
-    def MyCallback(response):
-      self.callback_response = response
-
-    channel = MockRpcChannel()
-    stub = unittest_pb2.TestService_Stub(channel)
-    rpc_controller = 'controller'
-    request = 'request'
-
-    # GetDescriptor now static, still works as instance method for compatibility
-    self.assertEqual(unittest_pb2.TestService_Stub.GetDescriptor(),
-                     stub.GetDescriptor())
-
-    # Invoke method.
-    stub.Foo(rpc_controller, request, MyCallback)
-
-    self.assertIsInstance(self.callback_response, unittest_pb2.FooResponse)
-    self.assertEqual(request, channel.request)
-    self.assertEqual(rpc_controller, channel.controller)
-    self.assertEqual(stub.GetDescriptor().methods[0], channel.method)
-
-
-if __name__ == '__main__':
-  unittest.main()
diff --git a/libs/protobuf/python/google/protobuf/internal/symbol_database_test.py b/libs/protobuf/python/google/protobuf/internal/symbol_database_test.py
deleted file mode 100644
index 4fdc4ee..0000000
--- a/libs/protobuf/python/google/protobuf/internal/symbol_database_test.py
+++ /dev/null
@@ -1,133 +0,0 @@
-# Protocol Buffers - Google's data interchange format
-# Copyright 2008 Google Inc.  All rights reserved.
-# https://developers.google.com/protocol-buffers/
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-"""Tests for google.protobuf.symbol_database."""
-
-import unittest
-
-from google.protobuf import unittest_pb2
-from google.protobuf import descriptor
-from google.protobuf import descriptor_pool
-from google.protobuf import symbol_database
-
-
-class SymbolDatabaseTest(unittest.TestCase):
-
-  def _Database(self):
-    if descriptor._USE_C_DESCRIPTORS:
-      # The C++ implementation does not allow mixing descriptors from
-      # different pools.
-      db = symbol_database.SymbolDatabase(pool=descriptor_pool.Default())
-    else:
-      db = symbol_database.SymbolDatabase()
-    # Register representative types from unittest_pb2.
-    db.RegisterFileDescriptor(unittest_pb2.DESCRIPTOR)
-    db.RegisterMessage(unittest_pb2.TestAllTypes)
-    db.RegisterMessage(unittest_pb2.TestAllTypes.NestedMessage)
-    db.RegisterMessage(unittest_pb2.TestAllTypes.OptionalGroup)
-    db.RegisterMessage(unittest_pb2.TestAllTypes.RepeatedGroup)
-    db.RegisterEnumDescriptor(unittest_pb2.ForeignEnum.DESCRIPTOR)
-    db.RegisterEnumDescriptor(unittest_pb2.TestAllTypes.NestedEnum.DESCRIPTOR)
-    db.RegisterServiceDescriptor(unittest_pb2._TESTSERVICE)
-    return db
-
-  def testGetPrototype(self):
-    instance = self._Database().GetPrototype(
-        unittest_pb2.TestAllTypes.DESCRIPTOR)
-    self.assertTrue(instance is unittest_pb2.TestAllTypes)
-
-  def testGetMessages(self):
-    messages = self._Database().GetMessages(
-        ['google/protobuf/unittest.proto'])
-    self.assertTrue(
-        unittest_pb2.TestAllTypes is
-        messages['protobuf_unittest.TestAllTypes'])
-
-  def testGetSymbol(self):
-    self.assertEqual(
-        unittest_pb2.TestAllTypes, self._Database().GetSymbol(
-            'protobuf_unittest.TestAllTypes'))
-    self.assertEqual(
-        unittest_pb2.TestAllTypes.NestedMessage, self._Database().GetSymbol(
-            'protobuf_unittest.TestAllTypes.NestedMessage'))
-    self.assertEqual(
-        unittest_pb2.TestAllTypes.OptionalGroup, self._Database().GetSymbol(
-            'protobuf_unittest.TestAllTypes.OptionalGroup'))
-    self.assertEqual(
-        unittest_pb2.TestAllTypes.RepeatedGroup, self._Database().GetSymbol(
-            'protobuf_unittest.TestAllTypes.RepeatedGroup'))
-
-  def testEnums(self):
-    # Check registration of types in the pool.
-    self.assertEqual(
-        'protobuf_unittest.ForeignEnum',
-        self._Database().pool.FindEnumTypeByName(
-            'protobuf_unittest.ForeignEnum').full_name)
-    self.assertEqual(
-        'protobuf_unittest.TestAllTypes.NestedEnum',
-        self._Database().pool.FindEnumTypeByName(
-            'protobuf_unittest.TestAllTypes.NestedEnum').full_name)
-
-  def testFindMessageTypeByName(self):
-    self.assertEqual(
-        'protobuf_unittest.TestAllTypes',
-        self._Database().pool.FindMessageTypeByName(
-            'protobuf_unittest.TestAllTypes').full_name)
-    self.assertEqual(
-        'protobuf_unittest.TestAllTypes.NestedMessage',
-        self._Database().pool.FindMessageTypeByName(
-            'protobuf_unittest.TestAllTypes.NestedMessage').full_name)
-
-  def testFindServiceByName(self):
-    self.assertEqual(
-        'protobuf_unittest.TestService',
-        self._Database().pool.FindServiceByName(
-            'protobuf_unittest.TestService').full_name)
-
-  def testFindFileContainingSymbol(self):
-    # Lookup based on either enum or message.
-    self.assertEqual(
-        'google/protobuf/unittest.proto',
-        self._Database().pool.FindFileContainingSymbol(
-            'protobuf_unittest.TestAllTypes.NestedEnum').name)
-    self.assertEqual(
-        'google/protobuf/unittest.proto',
-        self._Database().pool.FindFileContainingSymbol(
-            'protobuf_unittest.TestAllTypes').name)
-
-  def testFindFileByName(self):
-    self.assertEqual(
-        'google/protobuf/unittest.proto',
-        self._Database().pool.FindFileByName(
-            'google/protobuf/unittest.proto').name)
-
-
-if __name__ == '__main__':
-  unittest.main()
diff --git a/libs/protobuf/python/google/protobuf/internal/test_bad_identifiers.proto b/libs/protobuf/python/google/protobuf/internal/test_bad_identifiers.proto
deleted file mode 100644
index caf86b5..0000000
--- a/libs/protobuf/python/google/protobuf/internal/test_bad_identifiers.proto
+++ /dev/null
@@ -1,53 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-
-syntax = "proto2";
-
-package protobuf_unittest;
-
-option py_generic_services = true;
-
-message TestBadIdentifiers {
-  extensions 100 to max;
-}
-
-// Make sure these reasonable extension names don't conflict with internal
-// variables.
-extend TestBadIdentifiers {
-  optional string message = 100 [default = "foo"];
-  optional string descriptor = 101 [default = "bar"];
-  optional string reflection = 102 [default = "baz"];
-  optional string service = 103 [default = "qux"];
-}
-
-message AnotherMessage {}
-service AnotherService {}
diff --git a/libs/protobuf/python/google/protobuf/internal/test_proto3_optional.proto b/libs/protobuf/python/google/protobuf/internal/test_proto3_optional.proto
deleted file mode 100644
index f3e0a2e..0000000
--- a/libs/protobuf/python/google/protobuf/internal/test_proto3_optional.proto
+++ /dev/null
@@ -1,70 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto3";
-
-package google.protobuf.python.internal;
-
-message TestProto3Optional {
-  message NestedMessage {
-    // The field name "b" fails to compile in proto1 because it conflicts with
-    // a local variable named "b" in one of the generated methods.  Doh.
-    // This file needs to compile in proto1 to test backwards-compatibility.
-    optional int32 bb = 1;
-  }
-
-  enum NestedEnum {
-    UNSPECIFIED = 0;
-    FOO = 1;
-    BAR = 2;
-    BAZ = 3;
-    NEG = -1;  // Intentionally negative.
-  }
-
-  // Singular
-  optional int32 optional_int32 = 1;
-  optional int64 optional_int64 = 2;
-  optional uint32 optional_uint32 = 3;
-  optional uint64 optional_uint64 = 4;
-  optional sint32 optional_sint32 = 5;
-  optional sint64 optional_sint64 = 6;
-  optional fixed32 optional_fixed32 = 7;
-  optional fixed64 optional_fixed64 = 8;
-  optional sfixed32 optional_sfixed32 = 9;
-  optional sfixed64 optional_sfixed64 = 10;
-  optional float optional_float = 11;
-  optional double optional_double = 12;
-  optional bool optional_bool = 13;
-  optional string optional_string = 14;
-  optional bytes optional_bytes = 15;
-
-  optional NestedMessage optional_nested_message = 18;
-  optional NestedEnum optional_nested_enum = 21;
-}
diff --git a/libs/protobuf/python/google/protobuf/internal/test_util.py b/libs/protobuf/python/google/protobuf/internal/test_util.py
deleted file mode 100644
index 32fb8fd..0000000
--- a/libs/protobuf/python/google/protobuf/internal/test_util.py
+++ /dev/null
@@ -1,878 +0,0 @@
-# Protocol Buffers - Google's data interchange format
-# Copyright 2008 Google Inc.  All rights reserved.
-# https://developers.google.com/protocol-buffers/
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-"""Utilities for Python proto2 tests.
-
-This is intentionally modeled on C++ code in
-//google/protobuf/test_util.*.
-"""
-
-__author__ = 'robinson@google.com (Will Robinson)'
-
-import numbers
-import operator
-import os.path
-
-from google.protobuf import unittest_import_pb2
-from google.protobuf import unittest_pb2
-
-try:
-  long        # Python 2
-except NameError:
-  long = int  # Python 3
-
-
-# Tests whether the given TestAllTypes message is proto2 or not.
-# This is used to gate several fields/features that only exist
-# for the proto2 version of the message.
-def IsProto2(message):
-  return message.DESCRIPTOR.syntax == "proto2"
-
-
-def SetAllNonLazyFields(message):
-  """Sets every non-lazy field in the message to a unique value.
-
-  Args:
-    message: A TestAllTypes instance.
-  """
-
-  #
-  # Optional fields.
-  #
-
-  message.optional_int32    = 101
-  message.optional_int64    = 102
-  message.optional_uint32   = 103
-  message.optional_uint64   = 104
-  message.optional_sint32   = 105
-  message.optional_sint64   = 106
-  message.optional_fixed32  = 107
-  message.optional_fixed64  = 108
-  message.optional_sfixed32 = 109
-  message.optional_sfixed64 = 110
-  message.optional_float    = 111
-  message.optional_double   = 112
-  message.optional_bool     = True
-  message.optional_string   = u'115'
-  message.optional_bytes    = b'116'
-
-  if IsProto2(message):
-    message.optionalgroup.a = 117
-  message.optional_nested_message.bb = 118
-  message.optional_foreign_message.c = 119
-  message.optional_import_message.d = 120
-  message.optional_public_import_message.e = 126
-
-  message.optional_nested_enum = unittest_pb2.TestAllTypes.BAZ
-  message.optional_foreign_enum = unittest_pb2.FOREIGN_BAZ
-  if IsProto2(message):
-    message.optional_import_enum = unittest_import_pb2.IMPORT_BAZ
-
-  message.optional_string_piece = u'124'
-  message.optional_cord = u'125'
-
-  #
-  # Repeated fields.
-  #
-
-  message.repeated_int32.append(201)
-  message.repeated_int64.append(202)
-  message.repeated_uint32.append(203)
-  message.repeated_uint64.append(204)
-  message.repeated_sint32.append(205)
-  message.repeated_sint64.append(206)
-  message.repeated_fixed32.append(207)
-  message.repeated_fixed64.append(208)
-  message.repeated_sfixed32.append(209)
-  message.repeated_sfixed64.append(210)
-  message.repeated_float.append(211)
-  message.repeated_double.append(212)
-  message.repeated_bool.append(True)
-  message.repeated_string.append(u'215')
-  message.repeated_bytes.append(b'216')
-
-  if IsProto2(message):
-    message.repeatedgroup.add().a = 217
-  message.repeated_nested_message.add().bb = 218
-  message.repeated_foreign_message.add().c = 219
-  message.repeated_import_message.add().d = 220
-  message.repeated_lazy_message.add().bb = 227
-
-  message.repeated_nested_enum.append(unittest_pb2.TestAllTypes.BAR)
-  message.repeated_foreign_enum.append(unittest_pb2.FOREIGN_BAR)
-  if IsProto2(message):
-    message.repeated_import_enum.append(unittest_import_pb2.IMPORT_BAR)
-
-  message.repeated_string_piece.append(u'224')
-  message.repeated_cord.append(u'225')
-
-  # Add a second one of each field and set value by index.
-  message.repeated_int32.append(0)
-  message.repeated_int64.append(0)
-  message.repeated_uint32.append(0)
-  message.repeated_uint64.append(0)
-  message.repeated_sint32.append(0)
-  message.repeated_sint64.append(0)
-  message.repeated_fixed32.append(0)
-  message.repeated_fixed64.append(0)
-  message.repeated_sfixed32.append(0)
-  message.repeated_sfixed64.append(0)
-  message.repeated_float.append(0)
-  message.repeated_double.append(0)
-  message.repeated_bool.append(True)
-  message.repeated_string.append(u'0')
-  message.repeated_bytes.append(b'0')
-  message.repeated_int32[1] = 301
-  message.repeated_int64[1] = 302
-  message.repeated_uint32[1] = 303
-  message.repeated_uint64[1] = 304
-  message.repeated_sint32[1] = 305
-  message.repeated_sint64[1] = 306
-  message.repeated_fixed32[1] = 307
-  message.repeated_fixed64[1] = 308
-  message.repeated_sfixed32[1] = 309
-  message.repeated_sfixed64[1] = 310
-  message.repeated_float[1] = 311
-  message.repeated_double[1] = 312
-  message.repeated_bool[1] = False
-  message.repeated_string[1] = u'315'
-  message.repeated_bytes[1] = b'316'
-
-  if IsProto2(message):
-    message.repeatedgroup.add().a = 317
-  message.repeated_nested_message.add().bb = 318
-  message.repeated_foreign_message.add().c = 319
-  message.repeated_import_message.add().d = 320
-  message.repeated_lazy_message.add().bb = 327
-
-  message.repeated_nested_enum.append(unittest_pb2.TestAllTypes.BAR)
-  message.repeated_nested_enum[1] = unittest_pb2.TestAllTypes.BAZ
-  message.repeated_foreign_enum.append(unittest_pb2.FOREIGN_BAZ)
-  if IsProto2(message):
-    message.repeated_import_enum.append(unittest_import_pb2.IMPORT_BAZ)
-
-  message.repeated_string_piece.append(u'324')
-  message.repeated_cord.append(u'325')
-
-  #
-  # Fields that have defaults.
-  #
-
-  if IsProto2(message):
-    message.default_int32 = 401
-    message.default_int64 = 402
-    message.default_uint32 = 403
-    message.default_uint64 = 404
-    message.default_sint32 = 405
-    message.default_sint64 = 406
-    message.default_fixed32 = 407
-    message.default_fixed64 = 408
-    message.default_sfixed32 = 409
-    message.default_sfixed64 = 410
-    message.default_float = 411
-    message.default_double = 412
-    message.default_bool = False
-    message.default_string = '415'
-    message.default_bytes = b'416'
-
-    message.default_nested_enum = unittest_pb2.TestAllTypes.FOO
-    message.default_foreign_enum = unittest_pb2.FOREIGN_FOO
-    message.default_import_enum = unittest_import_pb2.IMPORT_FOO
-
-    message.default_string_piece = '424'
-    message.default_cord = '425'
-
-  message.oneof_uint32 = 601
-  message.oneof_nested_message.bb = 602
-  message.oneof_string = '603'
-  message.oneof_bytes = b'604'
-
-
-def SetAllFields(message):
-  SetAllNonLazyFields(message)
-  message.optional_lazy_message.bb = 127
-  message.optional_unverified_lazy_message.bb = 128
-
-
-def SetAllExtensions(message):
-  """Sets every extension in the message to a unique value.
-
-  Args:
-    message: A unittest_pb2.TestAllExtensions instance.
-  """
-
-  extensions = message.Extensions
-  pb2 = unittest_pb2
-  import_pb2 = unittest_import_pb2
-
-  #
-  # Optional fields.
-  #
-
-  extensions[pb2.optional_int32_extension] = 101
-  extensions[pb2.optional_int64_extension] = 102
-  extensions[pb2.optional_uint32_extension] = 103
-  extensions[pb2.optional_uint64_extension] = 104
-  extensions[pb2.optional_sint32_extension] = 105
-  extensions[pb2.optional_sint64_extension] = 106
-  extensions[pb2.optional_fixed32_extension] = 107
-  extensions[pb2.optional_fixed64_extension] = 108
-  extensions[pb2.optional_sfixed32_extension] = 109
-  extensions[pb2.optional_sfixed64_extension] = 110
-  extensions[pb2.optional_float_extension] = 111
-  extensions[pb2.optional_double_extension] = 112
-  extensions[pb2.optional_bool_extension] = True
-  extensions[pb2.optional_string_extension] = u'115'
-  extensions[pb2.optional_bytes_extension] = b'116'
-
-  extensions[pb2.optionalgroup_extension].a = 117
-  extensions[pb2.optional_nested_message_extension].bb = 118
-  extensions[pb2.optional_foreign_message_extension].c = 119
-  extensions[pb2.optional_import_message_extension].d = 120
-  extensions[pb2.optional_public_import_message_extension].e = 126
-  extensions[pb2.optional_lazy_message_extension].bb = 127
-  extensions[pb2.optional_unverified_lazy_message_extension].bb = 128
-
-  extensions[pb2.optional_nested_enum_extension] = pb2.TestAllTypes.BAZ
-  extensions[pb2.optional_nested_enum_extension] = pb2.TestAllTypes.BAZ
-  extensions[pb2.optional_foreign_enum_extension] = pb2.FOREIGN_BAZ
-  extensions[pb2.optional_import_enum_extension] = import_pb2.IMPORT_BAZ
-
-  extensions[pb2.optional_string_piece_extension] = u'124'
-  extensions[pb2.optional_cord_extension] = u'125'
-
-  #
-  # Repeated fields.
-  #
-
-  extensions[pb2.repeated_int32_extension].append(201)
-  extensions[pb2.repeated_int64_extension].append(202)
-  extensions[pb2.repeated_uint32_extension].append(203)
-  extensions[pb2.repeated_uint64_extension].append(204)
-  extensions[pb2.repeated_sint32_extension].append(205)
-  extensions[pb2.repeated_sint64_extension].append(206)
-  extensions[pb2.repeated_fixed32_extension].append(207)
-  extensions[pb2.repeated_fixed64_extension].append(208)
-  extensions[pb2.repeated_sfixed32_extension].append(209)
-  extensions[pb2.repeated_sfixed64_extension].append(210)
-  extensions[pb2.repeated_float_extension].append(211)
-  extensions[pb2.repeated_double_extension].append(212)
-  extensions[pb2.repeated_bool_extension].append(True)
-  extensions[pb2.repeated_string_extension].append(u'215')
-  extensions[pb2.repeated_bytes_extension].append(b'216')
-
-  extensions[pb2.repeatedgroup_extension].add().a = 217
-  extensions[pb2.repeated_nested_message_extension].add().bb = 218
-  extensions[pb2.repeated_foreign_message_extension].add().c = 219
-  extensions[pb2.repeated_import_message_extension].add().d = 220
-  extensions[pb2.repeated_lazy_message_extension].add().bb = 227
-
-  extensions[pb2.repeated_nested_enum_extension].append(pb2.TestAllTypes.BAR)
-  extensions[pb2.repeated_foreign_enum_extension].append(pb2.FOREIGN_BAR)
-  extensions[pb2.repeated_import_enum_extension].append(import_pb2.IMPORT_BAR)
-
-  extensions[pb2.repeated_string_piece_extension].append(u'224')
-  extensions[pb2.repeated_cord_extension].append(u'225')
-
-  # Append a second one of each field.
-  extensions[pb2.repeated_int32_extension].append(301)
-  extensions[pb2.repeated_int64_extension].append(302)
-  extensions[pb2.repeated_uint32_extension].append(303)
-  extensions[pb2.repeated_uint64_extension].append(304)
-  extensions[pb2.repeated_sint32_extension].append(305)
-  extensions[pb2.repeated_sint64_extension].append(306)
-  extensions[pb2.repeated_fixed32_extension].append(307)
-  extensions[pb2.repeated_fixed64_extension].append(308)
-  extensions[pb2.repeated_sfixed32_extension].append(309)
-  extensions[pb2.repeated_sfixed64_extension].append(310)
-  extensions[pb2.repeated_float_extension].append(311)
-  extensions[pb2.repeated_double_extension].append(312)
-  extensions[pb2.repeated_bool_extension].append(False)
-  extensions[pb2.repeated_string_extension].append(u'315')
-  extensions[pb2.repeated_bytes_extension].append(b'316')
-
-  extensions[pb2.repeatedgroup_extension].add().a = 317
-  extensions[pb2.repeated_nested_message_extension].add().bb = 318
-  extensions[pb2.repeated_foreign_message_extension].add().c = 319
-  extensions[pb2.repeated_import_message_extension].add().d = 320
-  extensions[pb2.repeated_lazy_message_extension].add().bb = 327
-
-  extensions[pb2.repeated_nested_enum_extension].append(pb2.TestAllTypes.BAZ)
-  extensions[pb2.repeated_foreign_enum_extension].append(pb2.FOREIGN_BAZ)
-  extensions[pb2.repeated_import_enum_extension].append(import_pb2.IMPORT_BAZ)
-
-  extensions[pb2.repeated_string_piece_extension].append(u'324')
-  extensions[pb2.repeated_cord_extension].append(u'325')
-
-  #
-  # Fields with defaults.
-  #
-
-  extensions[pb2.default_int32_extension] = 401
-  extensions[pb2.default_int64_extension] = 402
-  extensions[pb2.default_uint32_extension] = 403
-  extensions[pb2.default_uint64_extension] = 404
-  extensions[pb2.default_sint32_extension] = 405
-  extensions[pb2.default_sint64_extension] = 406
-  extensions[pb2.default_fixed32_extension] = 407
-  extensions[pb2.default_fixed64_extension] = 408
-  extensions[pb2.default_sfixed32_extension] = 409
-  extensions[pb2.default_sfixed64_extension] = 410
-  extensions[pb2.default_float_extension] = 411
-  extensions[pb2.default_double_extension] = 412
-  extensions[pb2.default_bool_extension] = False
-  extensions[pb2.default_string_extension] = u'415'
-  extensions[pb2.default_bytes_extension] = b'416'
-
-  extensions[pb2.default_nested_enum_extension] = pb2.TestAllTypes.FOO
-  extensions[pb2.default_foreign_enum_extension] = pb2.FOREIGN_FOO
-  extensions[pb2.default_import_enum_extension] = import_pb2.IMPORT_FOO
-
-  extensions[pb2.default_string_piece_extension] = u'424'
-  extensions[pb2.default_cord_extension] = '425'
-
-  extensions[pb2.oneof_uint32_extension] = 601
-  extensions[pb2.oneof_nested_message_extension].bb = 602
-  extensions[pb2.oneof_string_extension] = u'603'
-  extensions[pb2.oneof_bytes_extension] = b'604'
-
-
-def SetAllFieldsAndExtensions(message):
-  """Sets every field and extension in the message to a unique value.
-
-  Args:
-    message: A unittest_pb2.TestAllExtensions message.
-  """
-  message.my_int = 1
-  message.my_string = 'foo'
-  message.my_float = 1.0
-  message.Extensions[unittest_pb2.my_extension_int] = 23
-  message.Extensions[unittest_pb2.my_extension_string] = 'bar'
-
-
-def ExpectAllFieldsAndExtensionsInOrder(serialized):
-  """Ensures that serialized is the serialization we expect for a message
-  filled with SetAllFieldsAndExtensions().  (Specifically, ensures that the
-  serialization is in canonical, tag-number order).
-  """
-  my_extension_int = unittest_pb2.my_extension_int
-  my_extension_string = unittest_pb2.my_extension_string
-  expected_strings = []
-  message = unittest_pb2.TestFieldOrderings()
-  message.my_int = 1  # Field 1.
-  expected_strings.append(message.SerializeToString())
-  message.Clear()
-  message.Extensions[my_extension_int] = 23  # Field 5.
-  expected_strings.append(message.SerializeToString())
-  message.Clear()
-  message.my_string = 'foo'  # Field 11.
-  expected_strings.append(message.SerializeToString())
-  message.Clear()
-  message.Extensions[my_extension_string] = 'bar'  # Field 50.
-  expected_strings.append(message.SerializeToString())
-  message.Clear()
-  message.my_float = 1.0
-  expected_strings.append(message.SerializeToString())
-  message.Clear()
-  expected = b''.join(expected_strings)
-
-  if expected != serialized:
-    raise ValueError('Expected %r, found %r' % (expected, serialized))
-
-
-def ExpectAllFieldsSet(test_case, message):
-  """Check all fields for correct values have after Set*Fields() is called."""
-  test_case.assertTrue(message.HasField('optional_int32'))
-  test_case.assertTrue(message.HasField('optional_int64'))
-  test_case.assertTrue(message.HasField('optional_uint32'))
-  test_case.assertTrue(message.HasField('optional_uint64'))
-  test_case.assertTrue(message.HasField('optional_sint32'))
-  test_case.assertTrue(message.HasField('optional_sint64'))
-  test_case.assertTrue(message.HasField('optional_fixed32'))
-  test_case.assertTrue(message.HasField('optional_fixed64'))
-  test_case.assertTrue(message.HasField('optional_sfixed32'))
-  test_case.assertTrue(message.HasField('optional_sfixed64'))
-  test_case.assertTrue(message.HasField('optional_float'))
-  test_case.assertTrue(message.HasField('optional_double'))
-  test_case.assertTrue(message.HasField('optional_bool'))
-  test_case.assertTrue(message.HasField('optional_string'))
-  test_case.assertTrue(message.HasField('optional_bytes'))
-
-  if IsProto2(message):
-    test_case.assertTrue(message.HasField('optionalgroup'))
-  test_case.assertTrue(message.HasField('optional_nested_message'))
-  test_case.assertTrue(message.HasField('optional_foreign_message'))
-  test_case.assertTrue(message.HasField('optional_import_message'))
-
-  test_case.assertTrue(message.optionalgroup.HasField('a'))
-  test_case.assertTrue(message.optional_nested_message.HasField('bb'))
-  test_case.assertTrue(message.optional_foreign_message.HasField('c'))
-  test_case.assertTrue(message.optional_import_message.HasField('d'))
-
-  test_case.assertTrue(message.HasField('optional_nested_enum'))
-  test_case.assertTrue(message.HasField('optional_foreign_enum'))
-  if IsProto2(message):
-    test_case.assertTrue(message.HasField('optional_import_enum'))
-
-  test_case.assertTrue(message.HasField('optional_string_piece'))
-  test_case.assertTrue(message.HasField('optional_cord'))
-
-  test_case.assertEqual(101, message.optional_int32)
-  test_case.assertEqual(102, message.optional_int64)
-  test_case.assertEqual(103, message.optional_uint32)
-  test_case.assertEqual(104, message.optional_uint64)
-  test_case.assertEqual(105, message.optional_sint32)
-  test_case.assertEqual(106, message.optional_sint64)
-  test_case.assertEqual(107, message.optional_fixed32)
-  test_case.assertEqual(108, message.optional_fixed64)
-  test_case.assertEqual(109, message.optional_sfixed32)
-  test_case.assertEqual(110, message.optional_sfixed64)
-  test_case.assertEqual(111, message.optional_float)
-  test_case.assertEqual(112, message.optional_double)
-  test_case.assertEqual(True, message.optional_bool)
-  test_case.assertEqual('115', message.optional_string)
-  test_case.assertEqual(b'116', message.optional_bytes)
-
-  if IsProto2(message):
-    test_case.assertEqual(117, message.optionalgroup.a)
-  test_case.assertEqual(118, message.optional_nested_message.bb)
-  test_case.assertEqual(119, message.optional_foreign_message.c)
-  test_case.assertEqual(120, message.optional_import_message.d)
-  test_case.assertEqual(126, message.optional_public_import_message.e)
-  test_case.assertEqual(127, message.optional_lazy_message.bb)
-  test_case.assertEqual(128, message.optional_unverified_lazy_message.bb)
-
-  test_case.assertEqual(unittest_pb2.TestAllTypes.BAZ,
-                        message.optional_nested_enum)
-  test_case.assertEqual(unittest_pb2.FOREIGN_BAZ,
-                        message.optional_foreign_enum)
-  if IsProto2(message):
-    test_case.assertEqual(unittest_import_pb2.IMPORT_BAZ,
-                          message.optional_import_enum)
-
-  # -----------------------------------------------------------------
-
-  test_case.assertEqual(2, len(message.repeated_int32))
-  test_case.assertEqual(2, len(message.repeated_int64))
-  test_case.assertEqual(2, len(message.repeated_uint32))
-  test_case.assertEqual(2, len(message.repeated_uint64))
-  test_case.assertEqual(2, len(message.repeated_sint32))
-  test_case.assertEqual(2, len(message.repeated_sint64))
-  test_case.assertEqual(2, len(message.repeated_fixed32))
-  test_case.assertEqual(2, len(message.repeated_fixed64))
-  test_case.assertEqual(2, len(message.repeated_sfixed32))
-  test_case.assertEqual(2, len(message.repeated_sfixed64))
-  test_case.assertEqual(2, len(message.repeated_float))
-  test_case.assertEqual(2, len(message.repeated_double))
-  test_case.assertEqual(2, len(message.repeated_bool))
-  test_case.assertEqual(2, len(message.repeated_string))
-  test_case.assertEqual(2, len(message.repeated_bytes))
-
-  if IsProto2(message):
-    test_case.assertEqual(2, len(message.repeatedgroup))
-  test_case.assertEqual(2, len(message.repeated_nested_message))
-  test_case.assertEqual(2, len(message.repeated_foreign_message))
-  test_case.assertEqual(2, len(message.repeated_import_message))
-  test_case.assertEqual(2, len(message.repeated_nested_enum))
-  test_case.assertEqual(2, len(message.repeated_foreign_enum))
-  if IsProto2(message):
-    test_case.assertEqual(2, len(message.repeated_import_enum))
-
-  test_case.assertEqual(2, len(message.repeated_string_piece))
-  test_case.assertEqual(2, len(message.repeated_cord))
-
-  test_case.assertEqual(201, message.repeated_int32[0])
-  test_case.assertEqual(202, message.repeated_int64[0])
-  test_case.assertEqual(203, message.repeated_uint32[0])
-  test_case.assertEqual(204, message.repeated_uint64[0])
-  test_case.assertEqual(205, message.repeated_sint32[0])
-  test_case.assertEqual(206, message.repeated_sint64[0])
-  test_case.assertEqual(207, message.repeated_fixed32[0])
-  test_case.assertEqual(208, message.repeated_fixed64[0])
-  test_case.assertEqual(209, message.repeated_sfixed32[0])
-  test_case.assertEqual(210, message.repeated_sfixed64[0])
-  test_case.assertEqual(211, message.repeated_float[0])
-  test_case.assertEqual(212, message.repeated_double[0])
-  test_case.assertEqual(True, message.repeated_bool[0])
-  test_case.assertEqual('215', message.repeated_string[0])
-  test_case.assertEqual(b'216', message.repeated_bytes[0])
-
-  if IsProto2(message):
-    test_case.assertEqual(217, message.repeatedgroup[0].a)
-  test_case.assertEqual(218, message.repeated_nested_message[0].bb)
-  test_case.assertEqual(219, message.repeated_foreign_message[0].c)
-  test_case.assertEqual(220, message.repeated_import_message[0].d)
-  test_case.assertEqual(227, message.repeated_lazy_message[0].bb)
-
-  test_case.assertEqual(unittest_pb2.TestAllTypes.BAR,
-                        message.repeated_nested_enum[0])
-  test_case.assertEqual(unittest_pb2.FOREIGN_BAR,
-                        message.repeated_foreign_enum[0])
-  if IsProto2(message):
-    test_case.assertEqual(unittest_import_pb2.IMPORT_BAR,
-                          message.repeated_import_enum[0])
-
-  test_case.assertEqual(301, message.repeated_int32[1])
-  test_case.assertEqual(302, message.repeated_int64[1])
-  test_case.assertEqual(303, message.repeated_uint32[1])
-  test_case.assertEqual(304, message.repeated_uint64[1])
-  test_case.assertEqual(305, message.repeated_sint32[1])
-  test_case.assertEqual(306, message.repeated_sint64[1])
-  test_case.assertEqual(307, message.repeated_fixed32[1])
-  test_case.assertEqual(308, message.repeated_fixed64[1])
-  test_case.assertEqual(309, message.repeated_sfixed32[1])
-  test_case.assertEqual(310, message.repeated_sfixed64[1])
-  test_case.assertEqual(311, message.repeated_float[1])
-  test_case.assertEqual(312, message.repeated_double[1])
-  test_case.assertEqual(False, message.repeated_bool[1])
-  test_case.assertEqual('315', message.repeated_string[1])
-  test_case.assertEqual(b'316', message.repeated_bytes[1])
-
-  if IsProto2(message):
-    test_case.assertEqual(317, message.repeatedgroup[1].a)
-  test_case.assertEqual(318, message.repeated_nested_message[1].bb)
-  test_case.assertEqual(319, message.repeated_foreign_message[1].c)
-  test_case.assertEqual(320, message.repeated_import_message[1].d)
-  test_case.assertEqual(327, message.repeated_lazy_message[1].bb)
-
-  test_case.assertEqual(unittest_pb2.TestAllTypes.BAZ,
-                        message.repeated_nested_enum[1])
-  test_case.assertEqual(unittest_pb2.FOREIGN_BAZ,
-                        message.repeated_foreign_enum[1])
-  if IsProto2(message):
-    test_case.assertEqual(unittest_import_pb2.IMPORT_BAZ,
-                          message.repeated_import_enum[1])
-
-  # -----------------------------------------------------------------
-
-  if IsProto2(message):
-    test_case.assertTrue(message.HasField('default_int32'))
-    test_case.assertTrue(message.HasField('default_int64'))
-    test_case.assertTrue(message.HasField('default_uint32'))
-    test_case.assertTrue(message.HasField('default_uint64'))
-    test_case.assertTrue(message.HasField('default_sint32'))
-    test_case.assertTrue(message.HasField('default_sint64'))
-    test_case.assertTrue(message.HasField('default_fixed32'))
-    test_case.assertTrue(message.HasField('default_fixed64'))
-    test_case.assertTrue(message.HasField('default_sfixed32'))
-    test_case.assertTrue(message.HasField('default_sfixed64'))
-    test_case.assertTrue(message.HasField('default_float'))
-    test_case.assertTrue(message.HasField('default_double'))
-    test_case.assertTrue(message.HasField('default_bool'))
-    test_case.assertTrue(message.HasField('default_string'))
-    test_case.assertTrue(message.HasField('default_bytes'))
-
-    test_case.assertTrue(message.HasField('default_nested_enum'))
-    test_case.assertTrue(message.HasField('default_foreign_enum'))
-    test_case.assertTrue(message.HasField('default_import_enum'))
-
-    test_case.assertEqual(401, message.default_int32)
-    test_case.assertEqual(402, message.default_int64)
-    test_case.assertEqual(403, message.default_uint32)
-    test_case.assertEqual(404, message.default_uint64)
-    test_case.assertEqual(405, message.default_sint32)
-    test_case.assertEqual(406, message.default_sint64)
-    test_case.assertEqual(407, message.default_fixed32)
-    test_case.assertEqual(408, message.default_fixed64)
-    test_case.assertEqual(409, message.default_sfixed32)
-    test_case.assertEqual(410, message.default_sfixed64)
-    test_case.assertEqual(411, message.default_float)
-    test_case.assertEqual(412, message.default_double)
-    test_case.assertEqual(False, message.default_bool)
-    test_case.assertEqual('415', message.default_string)
-    test_case.assertEqual(b'416', message.default_bytes)
-
-    test_case.assertEqual(unittest_pb2.TestAllTypes.FOO,
-                          message.default_nested_enum)
-    test_case.assertEqual(unittest_pb2.FOREIGN_FOO,
-                          message.default_foreign_enum)
-    test_case.assertEqual(unittest_import_pb2.IMPORT_FOO,
-                          message.default_import_enum)
-
-
-def GoldenFile(filename):
-  """Finds the given golden file and returns a file object representing it."""
-
-  # Search up the directory tree looking for the C++ protobuf source code.
-  path = '.'
-  while os.path.exists(path):
-    if os.path.exists(os.path.join(path, 'src/google/protobuf')):
-      # Found it.  Load the golden file from the testdata directory.
-      full_path = os.path.join(path, 'src/google/protobuf/testdata', filename)
-      return open(full_path, 'rb')
-    path = os.path.join(path, '..')
-
-  # Search internally.
-  path = '.'
-  full_path = os.path.join(path, 'third_party/py/google/protobuf/testdata',
-                           filename)
-  if os.path.exists(full_path):
-    # Found it.  Load the golden file from the testdata directory.
-    return open(full_path, 'rb')
-
-  # Search for cross-repo path.
-  full_path = os.path.join('external/com_google_protobuf/src/google/protobuf/testdata',
-                           filename)
-  if os.path.exists(full_path):
-    # Found it.  Load the golden file from the testdata directory.
-    return open(full_path, 'rb')
-
-  raise RuntimeError(
-      'Could not find golden files.  This test must be run from within the '
-      'protobuf source package so that it can read test data files from the '
-      'C++ source tree.')
-
-
-def GoldenFileData(filename):
-  """Finds the given golden file and returns its contents."""
-  with GoldenFile(filename) as f:
-    return f.read()
-
-
-def SetAllPackedFields(message):
-  """Sets every field in the message to a unique value.
-
-  Args:
-    message: A TestPackedTypes instance.
-  """
-  message.packed_int32.extend([601, 701])
-  message.packed_int64.extend([602, 702])
-  message.packed_uint32.extend([603, 703])
-  message.packed_uint64.extend([604, 704])
-  message.packed_sint32.extend([605, 705])
-  message.packed_sint64.extend([606, 706])
-  message.packed_fixed32.extend([607, 707])
-  message.packed_fixed64.extend([608, 708])
-  message.packed_sfixed32.extend([609, 709])
-  message.packed_sfixed64.extend([610, 710])
-  message.packed_float.extend([611.0, 711.0])
-  message.packed_double.extend([612.0, 712.0])
-  message.packed_bool.extend([True, False])
-  message.packed_enum.extend([unittest_pb2.FOREIGN_BAR,
-                              unittest_pb2.FOREIGN_BAZ])
-
-
-def SetAllPackedExtensions(message):
-  """Sets every extension in the message to a unique value.
-
-  Args:
-    message: A unittest_pb2.TestPackedExtensions instance.
-  """
-  extensions = message.Extensions
-  pb2 = unittest_pb2
-
-  extensions[pb2.packed_int32_extension].extend([601, 701])
-  extensions[pb2.packed_int64_extension].extend([602, 702])
-  extensions[pb2.packed_uint32_extension].extend([603, 703])
-  extensions[pb2.packed_uint64_extension].extend([604, 704])
-  extensions[pb2.packed_sint32_extension].extend([605, 705])
-  extensions[pb2.packed_sint64_extension].extend([606, 706])
-  extensions[pb2.packed_fixed32_extension].extend([607, 707])
-  extensions[pb2.packed_fixed64_extension].extend([608, 708])
-  extensions[pb2.packed_sfixed32_extension].extend([609, 709])
-  extensions[pb2.packed_sfixed64_extension].extend([610, 710])
-  extensions[pb2.packed_float_extension].extend([611.0, 711.0])
-  extensions[pb2.packed_double_extension].extend([612.0, 712.0])
-  extensions[pb2.packed_bool_extension].extend([True, False])
-  extensions[pb2.packed_enum_extension].extend([unittest_pb2.FOREIGN_BAR,
-                                                unittest_pb2.FOREIGN_BAZ])
-
-
-def SetAllUnpackedFields(message):
-  """Sets every field in the message to a unique value.
-
-  Args:
-    message: A unittest_pb2.TestUnpackedTypes instance.
-  """
-  message.unpacked_int32.extend([601, 701])
-  message.unpacked_int64.extend([602, 702])
-  message.unpacked_uint32.extend([603, 703])
-  message.unpacked_uint64.extend([604, 704])
-  message.unpacked_sint32.extend([605, 705])
-  message.unpacked_sint64.extend([606, 706])
-  message.unpacked_fixed32.extend([607, 707])
-  message.unpacked_fixed64.extend([608, 708])
-  message.unpacked_sfixed32.extend([609, 709])
-  message.unpacked_sfixed64.extend([610, 710])
-  message.unpacked_float.extend([611.0, 711.0])
-  message.unpacked_double.extend([612.0, 712.0])
-  message.unpacked_bool.extend([True, False])
-  message.unpacked_enum.extend([unittest_pb2.FOREIGN_BAR,
-                                unittest_pb2.FOREIGN_BAZ])
-
-
-class NonStandardInteger(numbers.Integral):
-  """An integer object that does not subclass int.
-
-  This is used to verify that both C++ and regular proto systems can handle
-  integer others than int and long and that they handle them in predictable
-  ways.
-
-  NonStandardInteger is the minimal legal specification for a custom Integral.
-  As such, it does not support 0 < x < 5 and it is not hashable.
-
-  Note: This is added here instead of relying on numpy or a similar library
-  with custom integers to limit dependencies.
-  """
-
-  def __init__(self, val, error_string_on_conversion=None):
-    assert isinstance(val, numbers.Integral)
-    if isinstance(val, NonStandardInteger):
-      val = val.val
-    self.val = val
-    self.error_string_on_conversion = error_string_on_conversion
-
-  def __long__(self):
-    if self.error_string_on_conversion:
-      raise RuntimeError(self.error_string_on_conversion)
-    return long(self.val)
-
-  def __abs__(self):
-    return NonStandardInteger(operator.abs(self.val))
-
-  def __add__(self, y):
-    return NonStandardInteger(operator.add(self.val, y))
-
-  def __div__(self, y):
-    return NonStandardInteger(operator.div(self.val, y))
-
-  def __eq__(self, y):
-    return operator.eq(self.val, y)
-
-  def __floordiv__(self, y):
-    return NonStandardInteger(operator.floordiv(self.val, y))
-
-  def __truediv__(self, y):
-    return NonStandardInteger(operator.truediv(self.val, y))
-
-  def __invert__(self):
-    return NonStandardInteger(operator.invert(self.val))
-
-  def __mod__(self, y):
-    return NonStandardInteger(operator.mod(self.val, y))
-
-  def __mul__(self, y):
-    return NonStandardInteger(operator.mul(self.val, y))
-
-  def __neg__(self):
-    return NonStandardInteger(operator.neg(self.val))
-
-  def __pos__(self):
-    return NonStandardInteger(operator.pos(self.val))
-
-  def __pow__(self, y):
-    return NonStandardInteger(operator.pow(self.val, y))
-
-  def __trunc__(self):
-    return int(self.val)
-
-  def __radd__(self, y):
-    return NonStandardInteger(operator.add(y, self.val))
-
-  def __rdiv__(self, y):
-    return NonStandardInteger(operator.div(y, self.val))
-
-  def __rmod__(self, y):
-    return NonStandardInteger(operator.mod(y, self.val))
-
-  def __rmul__(self, y):
-    return NonStandardInteger(operator.mul(y, self.val))
-
-  def __rpow__(self, y):
-    return NonStandardInteger(operator.pow(y, self.val))
-
-  def __rfloordiv__(self, y):
-    return NonStandardInteger(operator.floordiv(y, self.val))
-
-  def __rtruediv__(self, y):
-    return NonStandardInteger(operator.truediv(y, self.val))
-
-  def __lshift__(self, y):
-    return NonStandardInteger(operator.lshift(self.val, y))
-
-  def __rshift__(self, y):
-    return NonStandardInteger(operator.rshift(self.val, y))
-
-  def __rlshift__(self, y):
-    return NonStandardInteger(operator.lshift(y, self.val))
-
-  def __rrshift__(self, y):
-    return NonStandardInteger(operator.rshift(y, self.val))
-
-  def __le__(self, y):
-    if isinstance(y, NonStandardInteger):
-      y = y.val
-    return operator.le(self.val, y)
-
-  def __lt__(self, y):
-    if isinstance(y, NonStandardInteger):
-      y = y.val
-    return operator.lt(self.val, y)
-
-  def __and__(self, y):
-    return NonStandardInteger(operator.and_(self.val, y))
-
-  def __or__(self, y):
-    return NonStandardInteger(operator.or_(self.val, y))
-
-  def __xor__(self, y):
-    return NonStandardInteger(operator.xor(self.val, y))
-
-  def __rand__(self, y):
-    return NonStandardInteger(operator.and_(y, self.val))
-
-  def __ror__(self, y):
-    return NonStandardInteger(operator.or_(y, self.val))
-
-  def __rxor__(self, y):
-    return NonStandardInteger(operator.xor(y, self.val))
-
-  def __bool__(self):
-    return self.val
-
-  def __nonzero__(self):
-    return self.val
-
-  def __ceil__(self):
-    return self
-
-  def __floor__(self):
-    return self
-
-  def __int__(self):
-    if self.error_string_on_conversion:
-      raise RuntimeError(self.error_string_on_conversion)
-    return int(self.val)
-
-  def __round__(self):
-    return self
-
-  def __repr__(self):
-    return 'NonStandardInteger(%s)' % self.val
diff --git a/libs/protobuf/python/google/protobuf/internal/testing_refleaks.py b/libs/protobuf/python/google/protobuf/internal/testing_refleaks.py
deleted file mode 100644
index 5f19c46..0000000
--- a/libs/protobuf/python/google/protobuf/internal/testing_refleaks.py
+++ /dev/null
@@ -1,142 +0,0 @@
-# Protocol Buffers - Google's data interchange format
-# Copyright 2008 Google Inc.  All rights reserved.
-# https://developers.google.com/protocol-buffers/
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-"""A subclass of unittest.TestCase which checks for reference leaks.
-
-To use:
-- Use testing_refleak.BaseTestCase instead of unittest.TestCase
-- Configure and compile Python with --with-pydebug
-
-If sys.gettotalrefcount() is not available (because Python was built without
-the Py_DEBUG option), then this module is a no-op and tests will run normally.
-"""
-
-import copyreg
-import gc
-import sys
-import unittest
-
-
-class LocalTestResult(unittest.TestResult):
-  """A TestResult which forwards events to a parent object, except for Skips."""
-
-  def __init__(self, parent_result):
-    unittest.TestResult.__init__(self)
-    self.parent_result = parent_result
-
-  def addError(self, test, error):
-    self.parent_result.addError(test, error)
-
-  def addFailure(self, test, error):
-    self.parent_result.addFailure(test, error)
-
-  def addSkip(self, test, reason):
-    pass
-
-
-class ReferenceLeakCheckerMixin(object):
-  """A mixin class for TestCase, which checks reference counts."""
-
-  NB_RUNS = 3
-
-  def run(self, result=None):
-    testMethod = getattr(self, self._testMethodName)
-    expecting_failure_method = getattr(testMethod, "__unittest_expecting_failure__", False)
-    expecting_failure_class = getattr(self, "__unittest_expecting_failure__", False)
-    if expecting_failure_class or expecting_failure_method:
-      return
-
-    # python_message.py registers all Message classes to some pickle global
-    # registry, which makes the classes immortal.
-    # We save a copy of this registry, and reset it before we could references.
-    self._saved_pickle_registry = copyreg.dispatch_table.copy()
-
-    # Run the test twice, to warm up the instance attributes.
-    super(ReferenceLeakCheckerMixin, self).run(result=result)
-    super(ReferenceLeakCheckerMixin, self).run(result=result)
-
-    oldrefcount = 0
-    local_result = LocalTestResult(result)
-    num_flakes = 0
-
-    refcount_deltas = []
-    while len(refcount_deltas) < self.NB_RUNS:
-      oldrefcount = self._getRefcounts()
-      super(ReferenceLeakCheckerMixin, self).run(result=local_result)
-      newrefcount = self._getRefcounts()
-      # If the GC was able to collect some objects after the call to run() that
-      # it could not collect before the call, then the counts won't match.
-      if newrefcount < oldrefcount and num_flakes < 2:
-        # This result is (probably) a flake -- garbage collectors aren't very
-        # predictable, but a lower ending refcount is the opposite of the
-        # failure we are testing for. If the result is repeatable, then we will
-        # eventually report it, but not after trying to eliminate it.
-        num_flakes += 1
-        continue
-      num_flakes = 0
-      refcount_deltas.append(newrefcount - oldrefcount)
-    print(refcount_deltas, self)
-
-    try:
-      self.assertEqual(refcount_deltas, [0] * self.NB_RUNS)
-    except Exception:  # pylint: disable=broad-except
-      result.addError(self, sys.exc_info())
-
-  def _getRefcounts(self):
-    copyreg.dispatch_table.clear()
-    copyreg.dispatch_table.update(self._saved_pickle_registry)
-    # It is sometimes necessary to gc.collect() multiple times, to ensure
-    # that all objects can be collected.
-    gc.collect()
-    gc.collect()
-    gc.collect()
-    return sys.gettotalrefcount()
-
-
-if hasattr(sys, 'gettotalrefcount'):
-
-  def TestCase(test_class):
-    new_bases = (ReferenceLeakCheckerMixin,) + test_class.__bases__
-    new_class = type(test_class)(
-        test_class.__name__, new_bases, dict(test_class.__dict__))
-    return new_class
-  SkipReferenceLeakChecker = unittest.skip
-
-else:
-  # When PyDEBUG is not enabled, run the tests normally.
-
-  def TestCase(test_class):
-    return test_class
-
-  def SkipReferenceLeakChecker(reason):
-    del reason  # Don't skip, so don't need a reason.
-    def Same(func):
-      return func
-    return Same
diff --git a/libs/protobuf/python/google/protobuf/internal/text_encoding_test.py b/libs/protobuf/python/google/protobuf/internal/text_encoding_test.py
deleted file mode 100644
index f36a2cc..0000000
--- a/libs/protobuf/python/google/protobuf/internal/text_encoding_test.py
+++ /dev/null
@@ -1,67 +0,0 @@
-# Protocol Buffers - Google's data interchange format
-# Copyright 2008 Google Inc.  All rights reserved.
-# https://developers.google.com/protocol-buffers/
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-"""Tests for google.protobuf.text_encoding."""
-
-import unittest
-
-from google.protobuf import text_encoding
-
-TEST_VALUES = [
-    ("foo\\rbar\\nbaz\\t",
-     "foo\\rbar\\nbaz\\t",
-     b"foo\rbar\nbaz\t"),
-    ("\\'full of \\\"sound\\\" and \\\"fury\\\"\\'",
-     "\\'full of \\\"sound\\\" and \\\"fury\\\"\\'",
-     b"'full of \"sound\" and \"fury\"'"),
-    ("signi\\\\fying\\\\ nothing\\\\",
-     "signi\\\\fying\\\\ nothing\\\\",
-     b"signi\\fying\\ nothing\\"),
-    ("\\010\\t\\n\\013\\014\\r",
-     "\x08\\t\\n\x0b\x0c\\r",
-     b"\010\011\012\013\014\015")]
-
-
-class TextEncodingTestCase(unittest.TestCase):
-  def testCEscape(self):
-    for escaped, escaped_utf8, unescaped in TEST_VALUES:
-      self.assertEqual(escaped,
-                        text_encoding.CEscape(unescaped, as_utf8=False))
-      self.assertEqual(escaped_utf8,
-                        text_encoding.CEscape(unescaped, as_utf8=True))
-
-  def testCUnescape(self):
-    for escaped, escaped_utf8, unescaped in TEST_VALUES:
-      self.assertEqual(unescaped, text_encoding.CUnescape(escaped))
-      self.assertEqual(unescaped, text_encoding.CUnescape(escaped_utf8))
-
-
-if __name__ == "__main__":
-  unittest.main()
diff --git a/libs/protobuf/python/google/protobuf/internal/text_format_test.py b/libs/protobuf/python/google/protobuf/internal/text_format_test.py
deleted file mode 100644
index 18b784e..0000000
--- a/libs/protobuf/python/google/protobuf/internal/text_format_test.py
+++ /dev/null
@@ -1,2447 +0,0 @@
-# -*- coding: utf-8 -*-
-# Protocol Buffers - Google's data interchange format
-# Copyright 2008 Google Inc.  All rights reserved.
-# https://developers.google.com/protocol-buffers/
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-"""Test for google.protobuf.text_format."""
-
-import io
-import math
-import re
-import string
-import textwrap
-
-import unittest
-
-from google.protobuf import any_pb2
-from google.protobuf import struct_pb2
-from google.protobuf import any_test_pb2
-from google.protobuf import map_unittest_pb2
-from google.protobuf import unittest_custom_options_pb2
-from google.protobuf import unittest_mset_pb2
-from google.protobuf import unittest_pb2
-from google.protobuf import unittest_proto3_arena_pb2
-from google.protobuf import descriptor_pb2
-from google.protobuf.internal import any_test_pb2 as test_extend_any
-from google.protobuf.internal import api_implementation
-from google.protobuf.internal import message_set_extensions_pb2
-from google.protobuf.internal import test_proto3_optional_pb2
-from google.protobuf.internal import test_util
-from google.protobuf import descriptor_pool
-from google.protobuf import text_format
-from google.protobuf.internal import _parameterized
-# pylint: enable=g-import-not-at-top
-
-
-# Low-level nuts-n-bolts tests.
-class SimpleTextFormatTests(unittest.TestCase):
-
-  # The members of _QUOTES are formatted into a regexp template that
-  # expects single characters.  Therefore it's an error (in addition to being
-  # non-sensical in the first place) to try to specify a "quote mark" that is
-  # more than one character.
-  def testQuoteMarksAreSingleChars(self):
-    for quote in text_format._QUOTES:
-      self.assertEqual(1, len(quote))
-
-
-# Base class with some common functionality.
-class TextFormatBase(unittest.TestCase):
-
-  def ReadGolden(self, golden_filename):
-    with test_util.GoldenFile(golden_filename) as f:
-      return (f.readlines() if str is bytes else  # PY3
-              [golden_line.decode('utf-8') for golden_line in f])
-
-  def CompareToGoldenFile(self, text, golden_filename):
-    golden_lines = self.ReadGolden(golden_filename)
-    self.assertMultiLineEqual(text, ''.join(golden_lines))
-
-  def CompareToGoldenText(self, text, golden_text):
-    self.assertEqual(text, golden_text)
-
-  def RemoveRedundantZeros(self, text):
-    # Some platforms print 1e+5 as 1e+005.  This is fine, but we need to remove
-    # these zeros in order to match the golden file.
-    text = text.replace('e+0','e+').replace('e+0','e+') \
-               .replace('e-0','e-').replace('e-0','e-')
-    # Floating point fields are printed with .0 suffix even if they are
-    # actually integer numbers.
-    text = re.compile(r'\.0$', re.MULTILINE).sub('', text)
-    return text
-
-
-@_parameterized.parameters(unittest_pb2, unittest_proto3_arena_pb2)
-class TextFormatMessageToStringTests(TextFormatBase):
-
-  def testPrintExotic(self, message_module):
-    message = message_module.TestAllTypes()
-    message.repeated_int64.append(-9223372036854775808)
-    message.repeated_uint64.append(18446744073709551615)
-    message.repeated_double.append(123.456)
-    message.repeated_double.append(1.23e22)
-    message.repeated_double.append(1.23e-18)
-    message.repeated_string.append('\000\001\a\b\f\n\r\t\v\\\'"')
-    message.repeated_string.append(u'\u00fc\ua71f')
-    self.CompareToGoldenText(
-        self.RemoveRedundantZeros(text_format.MessageToString(message)),
-        'repeated_int64: -9223372036854775808\n'
-        'repeated_uint64: 18446744073709551615\n'
-        'repeated_double: 123.456\n'
-        'repeated_double: 1.23e+22\n'
-        'repeated_double: 1.23e-18\n'
-        'repeated_string:'
-        ' "\\000\\001\\007\\010\\014\\n\\r\\t\\013\\\\\\\'\\""\n'
-        'repeated_string: "\\303\\274\\352\\234\\237"\n')
-
-  def testPrintFloatPrecision(self, message_module):
-    message = message_module.TestAllTypes()
-
-    message.repeated_float.append(0.0)
-    message.repeated_float.append(0.8)
-    message.repeated_float.append(1.0)
-    message.repeated_float.append(1.2)
-    message.repeated_float.append(1.23)
-    message.repeated_float.append(1.234)
-    message.repeated_float.append(1.2345)
-    message.repeated_float.append(1.23456)
-    message.repeated_float.append(1.2e10)
-    message.repeated_float.append(1.23e10)
-    message.repeated_float.append(1.234e10)
-    message.repeated_float.append(1.2345e10)
-    message.repeated_float.append(1.23456e10)
-    message.repeated_float.append(float('NaN'))
-    message.repeated_float.append(float('inf'))
-    message.repeated_double.append(0.0)
-    message.repeated_double.append(0.8)
-    message.repeated_double.append(1.0)
-    message.repeated_double.append(1.2)
-    message.repeated_double.append(1.23)
-    message.repeated_double.append(1.234)
-    message.repeated_double.append(1.2345)
-    message.repeated_double.append(1.23456)
-    message.repeated_double.append(1.234567)
-    message.repeated_double.append(1.2345678)
-    message.repeated_double.append(1.23456789)
-    message.repeated_double.append(1.234567898)
-    message.repeated_double.append(1.2345678987)
-    message.repeated_double.append(1.23456789876)
-    message.repeated_double.append(1.234567898765)
-    message.repeated_double.append(1.2345678987654)
-    message.repeated_double.append(1.23456789876543)
-    message.repeated_double.append(1.2e100)
-    message.repeated_double.append(1.23e100)
-    message.repeated_double.append(1.234e100)
-    message.repeated_double.append(1.2345e100)
-    message.repeated_double.append(1.23456e100)
-    message.repeated_double.append(1.234567e100)
-    message.repeated_double.append(1.2345678e100)
-    message.repeated_double.append(1.23456789e100)
-    message.repeated_double.append(1.234567898e100)
-    message.repeated_double.append(1.2345678987e100)
-    message.repeated_double.append(1.23456789876e100)
-    message.repeated_double.append(1.234567898765e100)
-    message.repeated_double.append(1.2345678987654e100)
-    message.repeated_double.append(1.23456789876543e100)
-    # pylint: disable=g-long-ternary
-    self.CompareToGoldenText(
-        self.RemoveRedundantZeros(text_format.MessageToString(message)),
-        'repeated_float: 0\n'
-        'repeated_float: 0.8\n'
-        'repeated_float: 1\n'
-        'repeated_float: 1.2\n'
-        'repeated_float: 1.23\n'
-        'repeated_float: 1.234\n'
-        'repeated_float: 1.2345\n'
-        'repeated_float: 1.23456\n'
-        # Note that these don't use scientific notation.
-        'repeated_float: 12000000000\n'
-        'repeated_float: 12300000000\n'
-        'repeated_float: 12340000000\n'
-        'repeated_float: 12345000000\n'
-        'repeated_float: 12345600000\n'
-        'repeated_float: nan\n'
-        'repeated_float: inf\n'
-        'repeated_double: 0\n'
-        'repeated_double: 0.8\n'
-        'repeated_double: 1\n'
-        'repeated_double: 1.2\n'
-        'repeated_double: 1.23\n'
-        'repeated_double: 1.234\n'
-        'repeated_double: 1.2345\n'
-        'repeated_double: 1.23456\n'
-        'repeated_double: 1.234567\n'
-        'repeated_double: 1.2345678\n'
-        'repeated_double: 1.23456789\n'
-        'repeated_double: 1.234567898\n'
-        'repeated_double: 1.2345678987\n'
-        'repeated_double: 1.23456789876\n'
-        'repeated_double: 1.234567898765\n'
-        'repeated_double: 1.2345678987654\n'
-        'repeated_double: 1.23456789876543\n'
-        'repeated_double: 1.2e+100\n'
-        'repeated_double: 1.23e+100\n'
-        'repeated_double: 1.234e+100\n'
-        'repeated_double: 1.2345e+100\n'
-        'repeated_double: 1.23456e+100\n'
-        'repeated_double: 1.234567e+100\n'
-        'repeated_double: 1.2345678e+100\n'
-        'repeated_double: 1.23456789e+100\n'
-        'repeated_double: 1.234567898e+100\n'
-        'repeated_double: 1.2345678987e+100\n'
-        'repeated_double: 1.23456789876e+100\n'
-        'repeated_double: 1.234567898765e+100\n'
-        'repeated_double: 1.2345678987654e+100\n'
-        'repeated_double: 1.23456789876543e+100\n')
-
-  def testPrintExoticUnicodeSubclass(self, message_module):
-
-    class UnicodeSub(str):
-      pass
-
-    message = message_module.TestAllTypes()
-    message.repeated_string.append(UnicodeSub(u'\u00fc\ua71f'))
-    self.CompareToGoldenText(
-        text_format.MessageToString(message),
-        'repeated_string: "\\303\\274\\352\\234\\237"\n')
-
-  def testPrintNestedMessageAsOneLine(self, message_module):
-    message = message_module.TestAllTypes()
-    msg = message.repeated_nested_message.add()
-    msg.bb = 42
-    self.CompareToGoldenText(
-        text_format.MessageToString(message, as_one_line=True),
-        'repeated_nested_message { bb: 42 }')
-
-  def testPrintRepeatedFieldsAsOneLine(self, message_module):
-    message = message_module.TestAllTypes()
-    message.repeated_int32.append(1)
-    message.repeated_int32.append(1)
-    message.repeated_int32.append(3)
-    message.repeated_string.append('Google')
-    message.repeated_string.append('Zurich')
-    self.CompareToGoldenText(
-        text_format.MessageToString(message, as_one_line=True),
-        'repeated_int32: 1 repeated_int32: 1 repeated_int32: 3 '
-        'repeated_string: "Google" repeated_string: "Zurich"')
-
-  def VerifyPrintShortFormatRepeatedFields(self, message_module, as_one_line):
-    message = message_module.TestAllTypes()
-    message.repeated_int32.append(1)
-    message.repeated_string.append('Google')
-    message.repeated_string.append('Hello,World')
-    message.repeated_foreign_enum.append(unittest_pb2.FOREIGN_FOO)
-    message.repeated_foreign_enum.append(unittest_pb2.FOREIGN_BAR)
-    message.repeated_foreign_enum.append(unittest_pb2.FOREIGN_BAZ)
-    message.optional_nested_message.bb = 3
-    for i in (21, 32):
-      msg = message.repeated_nested_message.add()
-      msg.bb = i
-    expected_ascii = (
-        'optional_nested_message {\n  bb: 3\n}\n'
-        'repeated_int32: [1]\n'
-        'repeated_string: "Google"\n'
-        'repeated_string: "Hello,World"\n'
-        'repeated_nested_message {\n  bb: 21\n}\n'
-        'repeated_nested_message {\n  bb: 32\n}\n'
-        'repeated_foreign_enum: [FOREIGN_FOO, FOREIGN_BAR, FOREIGN_BAZ]\n')
-    if as_one_line:
-      expected_ascii = expected_ascii.replace('\n', ' ')
-      expected_ascii = re.sub(r'\s+', ' ', expected_ascii)
-      expected_ascii = re.sub(r'\s$', '', expected_ascii)
-
-    actual_ascii = text_format.MessageToString(
-        message, use_short_repeated_primitives=True,
-        as_one_line=as_one_line)
-    self.CompareToGoldenText(actual_ascii, expected_ascii)
-    parsed_message = message_module.TestAllTypes()
-    text_format.Parse(actual_ascii, parsed_message)
-    self.assertEqual(parsed_message, message)
-
-  def testPrintShortFormatRepeatedFields(self, message_module):
-    self.VerifyPrintShortFormatRepeatedFields(message_module, False)
-    self.VerifyPrintShortFormatRepeatedFields(message_module, True)
-
-  def testPrintNestedNewLineInStringAsOneLine(self, message_module):
-    message = message_module.TestAllTypes()
-    message.optional_string = 'a\nnew\nline'
-    self.CompareToGoldenText(
-        text_format.MessageToString(message, as_one_line=True),
-        'optional_string: "a\\nnew\\nline"')
-
-  def testPrintExoticAsOneLine(self, message_module):
-    message = message_module.TestAllTypes()
-    message.repeated_int64.append(-9223372036854775808)
-    message.repeated_uint64.append(18446744073709551615)
-    message.repeated_double.append(123.456)
-    message.repeated_double.append(1.23e22)
-    message.repeated_double.append(1.23e-18)
-    message.repeated_string.append('\000\001\a\b\f\n\r\t\v\\\'"')
-    message.repeated_string.append(u'\u00fc\ua71f')
-    self.CompareToGoldenText(
-        self.RemoveRedundantZeros(text_format.MessageToString(
-            message, as_one_line=True)),
-        'repeated_int64: -9223372036854775808'
-        ' repeated_uint64: 18446744073709551615'
-        ' repeated_double: 123.456'
-        ' repeated_double: 1.23e+22'
-        ' repeated_double: 1.23e-18'
-        ' repeated_string: '
-        '"\\000\\001\\007\\010\\014\\n\\r\\t\\013\\\\\\\'\\""'
-        ' repeated_string: "\\303\\274\\352\\234\\237"')
-
-  def testRoundTripExoticAsOneLine(self, message_module):
-    message = message_module.TestAllTypes()
-    message.repeated_int64.append(-9223372036854775808)
-    message.repeated_uint64.append(18446744073709551615)
-    message.repeated_double.append(123.456)
-    message.repeated_double.append(1.23e22)
-    message.repeated_double.append(1.23e-18)
-    message.repeated_string.append('\000\001\a\b\f\n\r\t\v\\\'"')
-    message.repeated_string.append(u'\u00fc\ua71f')
-
-    # Test as_utf8 = False.
-    wire_text = text_format.MessageToString(message,
-                                            as_one_line=True,
-                                            as_utf8=False)
-    parsed_message = message_module.TestAllTypes()
-    r = text_format.Parse(wire_text, parsed_message)
-    self.assertIs(r, parsed_message)
-    self.assertEqual(message, parsed_message)
-
-    # Test as_utf8 = True.
-    wire_text = text_format.MessageToString(message,
-                                            as_one_line=True,
-                                            as_utf8=True)
-    parsed_message = message_module.TestAllTypes()
-    r = text_format.Parse(wire_text, parsed_message)
-    self.assertIs(r, parsed_message)
-    self.assertEqual(message, parsed_message,
-                     '\n%s != %s' % (message, parsed_message))
-
-  def testPrintRawUtf8String(self, message_module):
-    message = message_module.TestAllTypes()
-    message.repeated_string.append(u'\u00fc\t\ua71f')
-    text = text_format.MessageToString(message, as_utf8=True)
-    golden_unicode = u'repeated_string: "\u00fc\\t\ua71f"\n'
-    golden_text = golden_unicode
-    # MessageToString always returns a native str.
-    self.CompareToGoldenText(text, golden_text)
-    parsed_message = message_module.TestAllTypes()
-    text_format.Parse(text, parsed_message)
-    self.assertEqual(
-        message, parsed_message, '\n%s != %s  (%s != %s)' %
-        (message, parsed_message, message.repeated_string[0],
-         parsed_message.repeated_string[0]))
-
-  def testPrintFloatFormat(self, message_module):
-    # Check that float_format argument is passed to sub-message formatting.
-    message = message_module.NestedTestAllTypes()
-    message.payload.optional_float = 1.25
-    # Check rounding at 15 significant digits
-    message.payload.optional_double = -.000003456789012345678
-    # Check no decimal point.
-    message.payload.repeated_float.append(-5642)
-    # Check no trailing zeros.
-    message.payload.repeated_double.append(.000078900)
-    formatted_fields = ['optional_float: 1.25',
-                        'optional_double: -3.45678901234568e-6',
-                        'repeated_float: -5642', 'repeated_double: 7.89e-5']
-    text_message = text_format.MessageToString(message, float_format='.15g')
-    self.CompareToGoldenText(
-        self.RemoveRedundantZeros(text_message),
-        'payload {{\n  {0}\n  {1}\n  {2}\n  {3}\n}}\n'.format(
-            *formatted_fields))
-    # as_one_line=True is a separate code branch where float_format is passed.
-    text_message = text_format.MessageToString(message,
-                                               as_one_line=True,
-                                               float_format='.15g')
-    self.CompareToGoldenText(
-        self.RemoveRedundantZeros(text_message),
-        'payload {{ {0} {1} {2} {3} }}'.format(*formatted_fields))
-
-    # 32-bit 1.2 is noisy when extended to 64-bit:
-    #  >>> struct.unpack('f', struct.pack('f', 1.2))[0]
-    #  1.2000000476837158
-    message.payload.optional_float = 1.2
-    formatted_fields = ['optional_float: 1.2',
-                        'optional_double: -3.45678901234568e-6',
-                        'repeated_float: -5642', 'repeated_double: 7.89e-5']
-    text_message = text_format.MessageToString(message, float_format='.7g',
-                                               double_format='.15g')
-    self.CompareToGoldenText(
-        self.RemoveRedundantZeros(text_message),
-        'payload {{\n  {0}\n  {1}\n  {2}\n  {3}\n}}\n'.format(
-            *formatted_fields))
-
-    # Test only set float_format affect both float and double fields.
-    formatted_fields = ['optional_float: 1.2',
-                        'optional_double: -3.456789e-6',
-                        'repeated_float: -5642', 'repeated_double: 7.89e-5']
-    text_message = text_format.MessageToString(message, float_format='.7g')
-    self.CompareToGoldenText(
-        self.RemoveRedundantZeros(text_message),
-        'payload {{\n  {0}\n  {1}\n  {2}\n  {3}\n}}\n'.format(
-            *formatted_fields))
-
-    # Test default float_format will automatic print shortest float.
-    message.payload.optional_float = 1.2345678912
-    message.payload.optional_double = 1.2345678912
-    formatted_fields = ['optional_float: 1.2345679',
-                        'optional_double: 1.2345678912',
-                        'repeated_float: -5642', 'repeated_double: 7.89e-5']
-    text_message = text_format.MessageToString(message)
-    self.CompareToGoldenText(
-        self.RemoveRedundantZeros(text_message),
-        'payload {{\n  {0}\n  {1}\n  {2}\n  {3}\n}}\n'.format(
-            *formatted_fields))
-
-    message.Clear()
-    message.payload.optional_float = 1.1000000000011
-    self.assertEqual(text_format.MessageToString(message),
-                     'payload {\n  optional_float: 1.1\n}\n')
-    message.payload.optional_float = 1.00000075e-36
-    self.assertEqual(text_format.MessageToString(message),
-                     'payload {\n  optional_float: 1.00000075e-36\n}\n')
-    message.payload.optional_float = 12345678912345e+11
-    self.assertEqual(text_format.MessageToString(message),
-                     'payload {\n  optional_float: 1.234568e+24\n}\n')
-
-  def testMessageToString(self, message_module):
-    message = message_module.ForeignMessage()
-    message.c = 123
-    self.assertEqual('c: 123\n', str(message))
-
-  def testMessageToStringUnicode(self, message_module):
-    golden_unicode = u'� short desçription and a �.'
-    golden_bytes = golden_unicode.encode('utf-8')
-    message = message_module.TestAllTypes()
-    message.optional_string = golden_unicode
-    message.optional_bytes = golden_bytes
-    text = text_format.MessageToString(message, as_utf8=True)
-    golden_message = textwrap.dedent(
-        'optional_string: "� short desçription and a �."\n'
-        'optional_bytes: '
-        r'"\303\201 short des\303\247ription and a \360\237\215\214."'
-        '\n')
-    self.CompareToGoldenText(text, golden_message)
-
-  def testMessageToStringASCII(self, message_module):
-    golden_unicode = u'� short desçription and a �.'
-    golden_bytes = golden_unicode.encode('utf-8')
-    message = message_module.TestAllTypes()
-    message.optional_string = golden_unicode
-    message.optional_bytes = golden_bytes
-    text = text_format.MessageToString(message, as_utf8=False)  # ASCII
-    golden_message = (
-        'optional_string: '
-        r'"\303\201 short des\303\247ription and a \360\237\215\214."'
-        '\n'
-        'optional_bytes: '
-        r'"\303\201 short des\303\247ription and a \360\237\215\214."'
-        '\n')
-    self.CompareToGoldenText(text, golden_message)
-
-  def testPrintField(self, message_module):
-    message = message_module.TestAllTypes()
-    field = message.DESCRIPTOR.fields_by_name['optional_float']
-    value = message.optional_float
-    out = text_format.TextWriter(False)
-    text_format.PrintField(field, value, out)
-    self.assertEqual('optional_float: 0.0\n', out.getvalue())
-    out.close()
-    # Test Printer
-    out = text_format.TextWriter(False)
-    printer = text_format._Printer(out)
-    printer.PrintField(field, value)
-    self.assertEqual('optional_float: 0.0\n', out.getvalue())
-    out.close()
-
-  def testPrintFieldValue(self, message_module):
-    message = message_module.TestAllTypes()
-    field = message.DESCRIPTOR.fields_by_name['optional_float']
-    value = message.optional_float
-    out = text_format.TextWriter(False)
-    text_format.PrintFieldValue(field, value, out)
-    self.assertEqual('0.0', out.getvalue())
-    out.close()
-    # Test Printer
-    out = text_format.TextWriter(False)
-    printer = text_format._Printer(out)
-    printer.PrintFieldValue(field, value)
-    self.assertEqual('0.0', out.getvalue())
-    out.close()
-
-  def testCustomOptions(self, message_module):
-    message_descriptor = (unittest_custom_options_pb2.
-                          TestMessageWithCustomOptions.DESCRIPTOR)
-    message_proto = descriptor_pb2.DescriptorProto()
-    message_descriptor.CopyToProto(message_proto)
-    expected_text = (
-        'name: "TestMessageWithCustomOptions"\n'
-        'field {\n'
-        '  name: "field1"\n'
-        '  number: 1\n'
-        '  label: LABEL_OPTIONAL\n'
-        '  type: TYPE_STRING\n'
-        '  options {\n'
-        '    ctype: CORD\n'
-        '    [protobuf_unittest.field_opt1]: 8765432109\n'
-        '  }\n'
-        '}\n'
-        'field {\n'
-        '  name: "oneof_field"\n'
-        '  number: 2\n'
-        '  label: LABEL_OPTIONAL\n'
-        '  type: TYPE_INT32\n'
-        '  oneof_index: 0\n'
-        '}\n'
-        'field {\n'
-        '  name: "map_field"\n'
-        '  number: 3\n'
-        '  label: LABEL_REPEATED\n'
-        '  type: TYPE_MESSAGE\n'
-        '  type_name: ".protobuf_unittest.TestMessageWithCustomOptions.'
-        'MapFieldEntry"\n'
-        '  options {\n'
-        '    [protobuf_unittest.field_opt1]: 12345\n'
-        '  }\n'
-        '}\n'
-        'nested_type {\n'
-        '  name: "MapFieldEntry"\n'
-        '  field {\n'
-        '    name: "key"\n'
-        '    number: 1\n'
-        '    label: LABEL_OPTIONAL\n'
-        '    type: TYPE_STRING\n'
-        '  }\n'
-        '  field {\n'
-        '    name: "value"\n'
-        '    number: 2\n'
-        '    label: LABEL_OPTIONAL\n'
-        '    type: TYPE_STRING\n'
-        '  }\n'
-        '  options {\n'
-        '    map_entry: true\n'
-        '  }\n'
-        '}\n'
-        'enum_type {\n'
-        '  name: "AnEnum"\n'
-        '  value {\n'
-        '    name: "ANENUM_VAL1"\n'
-        '    number: 1\n'
-        '  }\n'
-        '  value {\n'
-        '    name: "ANENUM_VAL2"\n'
-        '    number: 2\n'
-        '    options {\n'
-        '      [protobuf_unittest.enum_value_opt1]: 123\n'
-        '    }\n'
-        '  }\n'
-        '  options {\n'
-        '    [protobuf_unittest.enum_opt1]: -789\n'
-        '  }\n'
-        '}\n'
-        'options {\n'
-        '  message_set_wire_format: false\n'
-        '  [protobuf_unittest.message_opt1]: -56\n'
-        '}\n'
-        'oneof_decl {\n'
-        '  name: "AnOneof"\n'
-        '  options {\n'
-        '    [protobuf_unittest.oneof_opt1]: -99\n'
-        '  }\n'
-        '}\n')
-    self.assertEqual(expected_text,
-                     text_format.MessageToString(message_proto))
-    parsed_proto = descriptor_pb2.DescriptorProto()
-    text_format.Parse(expected_text, parsed_proto)
-    self.assertEqual(message_proto, parsed_proto)
-
-  @unittest.skipIf(
-      api_implementation.Type() == 'upb',
-      "upb API doesn't support old UnknownField API. The TextFormat library "
-      "needs to convert to the new API.")
-  def testPrintUnknownFieldsEmbeddedMessageInBytes(self, message_module):
-    inner_msg = message_module.TestAllTypes()
-    inner_msg.optional_int32 = 101
-    inner_msg.optional_double = 102.0
-    inner_msg.optional_string = u'hello'
-    inner_msg.optional_bytes = b'103'
-    inner_msg.optional_nested_message.bb = 105
-    inner_data = inner_msg.SerializeToString()
-    outer_message = message_module.TestAllTypes()
-    outer_message.optional_int32 = 101
-    outer_message.optional_bytes = inner_data
-    all_data = outer_message.SerializeToString()
-    empty_message = message_module.TestEmptyMessage()
-    empty_message.ParseFromString(all_data)
-
-    self.assertEqual('  1: 101\n'
-                     '  15 {\n'
-                     '    1: 101\n'
-                     '    12: 4636878028842991616\n'
-                     '    14: "hello"\n'
-                     '    15: "103"\n'
-                     '    18 {\n'
-                     '      1: 105\n'
-                     '    }\n'
-                     '  }\n',
-                     text_format.MessageToString(empty_message,
-                                                 indent=2,
-                                                 print_unknown_fields=True))
-    self.assertEqual('1: 101 '
-                     '15 { '
-                     '1: 101 '
-                     '12: 4636878028842991616 '
-                     '14: "hello" '
-                     '15: "103" '
-                     '18 { 1: 105 } '
-                     '}',
-                     text_format.MessageToString(empty_message,
-                                                 print_unknown_fields=True,
-                                                 as_one_line=True))
-
-
-@_parameterized.parameters(unittest_pb2, unittest_proto3_arena_pb2)
-class TextFormatMessageToTextBytesTests(TextFormatBase):
-
-  def testMessageToBytes(self, message_module):
-    message = message_module.ForeignMessage()
-    message.c = 123
-    self.assertEqual(b'c: 123\n', text_format.MessageToBytes(message))
-
-  def testRawUtf8RoundTrip(self, message_module):
-    message = message_module.TestAllTypes()
-    message.repeated_string.append(u'\u00fc\t\ua71f')
-    utf8_text = text_format.MessageToBytes(message, as_utf8=True)
-    golden_bytes = b'repeated_string: "\xc3\xbc\\t\xea\x9c\x9f"\n'
-    self.CompareToGoldenText(utf8_text, golden_bytes)
-    parsed_message = message_module.TestAllTypes()
-    text_format.Parse(utf8_text, parsed_message)
-    self.assertEqual(
-        message, parsed_message, '\n%s != %s  (%s != %s)' %
-        (message, parsed_message, message.repeated_string[0],
-         parsed_message.repeated_string[0]))
-
-  def testEscapedUtf8ASCIIRoundTrip(self, message_module):
-    message = message_module.TestAllTypes()
-    message.repeated_string.append(u'\u00fc\t\ua71f')
-    ascii_text = text_format.MessageToBytes(message)  # as_utf8=False default
-    golden_bytes = b'repeated_string: "\\303\\274\\t\\352\\234\\237"\n'
-    self.CompareToGoldenText(ascii_text, golden_bytes)
-    parsed_message = message_module.TestAllTypes()
-    text_format.Parse(ascii_text, parsed_message)
-    self.assertEqual(
-        message, parsed_message, '\n%s != %s  (%s != %s)' %
-        (message, parsed_message, message.repeated_string[0],
-         parsed_message.repeated_string[0]))
-
-
-@_parameterized.parameters(unittest_pb2, unittest_proto3_arena_pb2)
-class TextFormatParserTests(TextFormatBase):
-
-  def testParseAllFields(self, message_module):
-    message = message_module.TestAllTypes()
-    test_util.SetAllFields(message)
-    ascii_text = text_format.MessageToString(message)
-
-    parsed_message = message_module.TestAllTypes()
-    text_format.Parse(ascii_text, parsed_message)
-    self.assertEqual(message, parsed_message)
-    if message_module is unittest_pb2:
-      test_util.ExpectAllFieldsSet(self, message)
-
-  def testParseAndMergeUtf8(self, message_module):
-    message = message_module.TestAllTypes()
-    test_util.SetAllFields(message)
-    ascii_text = text_format.MessageToString(message)
-    ascii_text = ascii_text.encode('utf-8')
-
-    parsed_message = message_module.TestAllTypes()
-    text_format.Parse(ascii_text, parsed_message)
-    self.assertEqual(message, parsed_message)
-    if message_module is unittest_pb2:
-      test_util.ExpectAllFieldsSet(self, message)
-
-    parsed_message.Clear()
-    text_format.Merge(ascii_text, parsed_message)
-    self.assertEqual(message, parsed_message)
-    if message_module is unittest_pb2:
-      test_util.ExpectAllFieldsSet(self, message)
-
-    msg2 = message_module.TestAllTypes()
-    text = (u'optional_string: "café"')
-    text_format.Merge(text, msg2)
-    self.assertEqual(msg2.optional_string, u'café')
-    msg2.Clear()
-    self.assertEqual(msg2.optional_string, u'')
-    text_format.Parse(text, msg2)
-    self.assertEqual(msg2.optional_string, u'café')
-
-  def testParseDoubleToFloat(self, message_module):
-    message = message_module.TestAllTypes()
-    text = ('repeated_float: 3.4028235e+39\n'
-            'repeated_float: 1.4028235e-39\n')
-    text_format.Parse(text, message)
-    self.assertEqual(message.repeated_float[0], float('inf'))
-    self.assertAlmostEqual(message.repeated_float[1], 1.4028235e-39)
-
-  def testParseExotic(self, message_module):
-    message = message_module.TestAllTypes()
-    text = ('repeated_int64: -9223372036854775808\n'
-            'repeated_uint64: 18446744073709551615\n'
-            'repeated_double: 123.456\n'
-            'repeated_double: 1.23e+22\n'
-            'repeated_double: 1.23e-18\n'
-            'repeated_string: \n'
-            '"\\000\\001\\007\\010\\014\\n\\r\\t\\013\\\\\\\'\\""\n'
-            'repeated_string: "foo" \'corge\' "grault"\n'
-            'repeated_string: "\\303\\274\\352\\234\\237"\n'
-            'repeated_string: "\\xc3\\xbc"\n'
-            'repeated_string: "\xc3\xbc"\n')
-    text_format.Parse(text, message)
-
-    self.assertEqual(-9223372036854775808, message.repeated_int64[0])
-    self.assertEqual(18446744073709551615, message.repeated_uint64[0])
-    self.assertEqual(123.456, message.repeated_double[0])
-    self.assertEqual(1.23e22, message.repeated_double[1])
-    self.assertEqual(1.23e-18, message.repeated_double[2])
-    self.assertEqual('\000\001\a\b\f\n\r\t\v\\\'"', message.repeated_string[0])
-    self.assertEqual('foocorgegrault', message.repeated_string[1])
-    self.assertEqual(u'\u00fc\ua71f', message.repeated_string[2])
-    self.assertEqual(u'\u00fc', message.repeated_string[3])
-
-  def testParseTrailingCommas(self, message_module):
-    message = message_module.TestAllTypes()
-    text = ('repeated_int64: 100;\n'
-            'repeated_int64: 200;\n'
-            'repeated_int64: 300,\n'
-            'repeated_string: "one",\n'
-            'repeated_string: "two";\n')
-    text_format.Parse(text, message)
-
-    self.assertEqual(100, message.repeated_int64[0])
-    self.assertEqual(200, message.repeated_int64[1])
-    self.assertEqual(300, message.repeated_int64[2])
-    self.assertEqual(u'one', message.repeated_string[0])
-    self.assertEqual(u'two', message.repeated_string[1])
-
-  def testParseRepeatedScalarShortFormat(self, message_module):
-    message = message_module.TestAllTypes()
-    text = ('repeated_int64: [100, 200];\n'
-            'repeated_int64: []\n'
-            'repeated_int64: 300,\n'
-            'repeated_string: ["one", "two"];\n')
-    text_format.Parse(text, message)
-
-    self.assertEqual(100, message.repeated_int64[0])
-    self.assertEqual(200, message.repeated_int64[1])
-    self.assertEqual(300, message.repeated_int64[2])
-    self.assertEqual(u'one', message.repeated_string[0])
-    self.assertEqual(u'two', message.repeated_string[1])
-
-  def testParseRepeatedMessageShortFormat(self, message_module):
-    message = message_module.TestAllTypes()
-    text = ('repeated_nested_message: [{bb: 100}, {bb: 200}],\n'
-            'repeated_nested_message: {bb: 300}\n'
-            'repeated_nested_message [{bb: 400}];\n')
-    text_format.Parse(text, message)
-
-    self.assertEqual(100, message.repeated_nested_message[0].bb)
-    self.assertEqual(200, message.repeated_nested_message[1].bb)
-    self.assertEqual(300, message.repeated_nested_message[2].bb)
-    self.assertEqual(400, message.repeated_nested_message[3].bb)
-
-  def testParseEmptyText(self, message_module):
-    message = message_module.TestAllTypes()
-    text = ''
-    text_format.Parse(text, message)
-    self.assertEqual(message_module.TestAllTypes(), message)
-
-  def testParseInvalidUtf8(self, message_module):
-    message = message_module.TestAllTypes()
-    text = 'repeated_string: "\\xc3\\xc3"'
-    with self.assertRaises(text_format.ParseError) as e:
-      text_format.Parse(text, message)
-    self.assertEqual(e.exception.GetLine(), 1)
-    self.assertEqual(e.exception.GetColumn(), 28)
-
-  def testParseSingleWord(self, message_module):
-    message = message_module.TestAllTypes()
-    text = 'foo'
-    self.assertRaisesRegex(
-        text_format.ParseError,
-        (r'1:1 : Message type "\w+.TestAllTypes" has no field named '
-         r'"foo".'), text_format.Parse, text, message)
-
-  def testParseUnknownField(self, message_module):
-    message = message_module.TestAllTypes()
-    text = 'unknown_field: 8\n'
-    self.assertRaisesRegex(
-        text_format.ParseError,
-        (r'1:1 : Message type "\w+.TestAllTypes" has no field named '
-         r'"unknown_field".'), text_format.Parse, text, message)
-    text = ('optional_int32: 123\n'
-            'unknown_field: 8\n'
-            'optional_nested_message { bb: 45 }')
-    text_format.Parse(text, message, allow_unknown_field=True)
-    self.assertEqual(message.optional_nested_message.bb, 45)
-    self.assertEqual(message.optional_int32, 123)
-
-  def testParseBadEnumValue(self, message_module):
-    message = message_module.TestAllTypes()
-    text = 'optional_nested_enum: BARR'
-    self.assertRaisesRegex(text_format.ParseError,
-                           (r'1:23 : \'optional_nested_enum: BARR\': '
-                            r'Enum type "\w+.TestAllTypes.NestedEnum" '
-                            r'has no value named BARR.'), text_format.Parse,
-                           text, message)
-
-  def testParseBadIntValue(self, message_module):
-    message = message_module.TestAllTypes()
-    text = 'optional_int32: bork'
-    self.assertRaisesRegex(text_format.ParseError,
-                           ('1:17 : \'optional_int32: bork\': '
-                            'Couldn\'t parse integer: bork'), text_format.Parse,
-                           text, message)
-
-  def testParseStringFieldUnescape(self, message_module):
-    message = message_module.TestAllTypes()
-    text = r'''repeated_string: "\xf\x62"
-               repeated_string: "\\xf\\x62"
-               repeated_string: "\\\xf\\\x62"
-               repeated_string: "\\\\xf\\\\x62"
-               repeated_string: "\\\\\xf\\\\\x62"
-               repeated_string: "\x5cx20"'''
-
-    text_format.Parse(text, message)
-
-    SLASH = '\\'
-    self.assertEqual('\x0fb', message.repeated_string[0])
-    self.assertEqual(SLASH + 'xf' + SLASH + 'x62', message.repeated_string[1])
-    self.assertEqual(SLASH + '\x0f' + SLASH + 'b', message.repeated_string[2])
-    self.assertEqual(SLASH + SLASH + 'xf' + SLASH + SLASH + 'x62',
-                     message.repeated_string[3])
-    self.assertEqual(SLASH + SLASH + '\x0f' + SLASH + SLASH + 'b',
-                     message.repeated_string[4])
-    self.assertEqual(SLASH + 'x20', message.repeated_string[5])
-
-  def testParseOneof(self, message_module):
-    m = message_module.TestAllTypes()
-    m.oneof_uint32 = 11
-    m2 = message_module.TestAllTypes()
-    text_format.Parse(text_format.MessageToString(m), m2)
-    self.assertEqual('oneof_uint32', m2.WhichOneof('oneof_field'))
-
-  def testParseMultipleOneof(self, message_module):
-    m_string = '\n'.join(['oneof_uint32: 11', 'oneof_string: "foo"'])
-    m2 = message_module.TestAllTypes()
-    with self.assertRaisesRegex(text_format.ParseError,
-                                ' is specified along with field '):
-      text_format.Parse(m_string, m2)
-
-  # This example contains non-ASCII codepoint unicode data as literals
-  # which should come through as utf-8 for bytes, and as the unicode
-  # itself for string fields.  It also demonstrates escaped binary data.
-  # The ur"" string prefix is unfortunately missing from Python 3
-  # so we resort to double escaping our \s so that they come through.
-  _UNICODE_SAMPLE = u"""
-      optional_bytes: '� short desçription'
-      optional_string: '� short desçription'
-      repeated_bytes: '\\303\\201 short des\\303\\247ription'
-      repeated_bytes: '\\x12\\x34\\x56\\x78\\x90\\xab\\xcd\\xef'
-      repeated_string: '\\xd0\\x9f\\xd1\\x80\\xd0\\xb8\\xd0\\xb2\\xd0\\xb5\\xd1\\x82'
-      """
-  _BYTES_SAMPLE = _UNICODE_SAMPLE.encode('utf-8')
-  _GOLDEN_UNICODE = u'� short desçription'
-  _GOLDEN_BYTES = _GOLDEN_UNICODE.encode('utf-8')
-  _GOLDEN_BYTES_1 = b'\x12\x34\x56\x78\x90\xab\xcd\xef'
-  _GOLDEN_STR_0 = u'Привет'
-
-  def testParseUnicode(self, message_module):
-    m = message_module.TestAllTypes()
-    text_format.Parse(self._UNICODE_SAMPLE, m)
-    self.assertEqual(m.optional_bytes, self._GOLDEN_BYTES)
-    self.assertEqual(m.optional_string, self._GOLDEN_UNICODE)
-    self.assertEqual(m.repeated_bytes[0], self._GOLDEN_BYTES)
-    # repeated_bytes[1] contained simple \ escaped non-UTF-8 raw binary data.
-    self.assertEqual(m.repeated_bytes[1], self._GOLDEN_BYTES_1)
-    # repeated_string[0] contained \ escaped data representing the UTF-8
-    # representation of _GOLDEN_STR_0 - it needs to decode as such.
-    self.assertEqual(m.repeated_string[0], self._GOLDEN_STR_0)
-
-  def testParseBytes(self, message_module):
-    m = message_module.TestAllTypes()
-    text_format.Parse(self._BYTES_SAMPLE, m)
-    self.assertEqual(m.optional_bytes, self._GOLDEN_BYTES)
-    self.assertEqual(m.optional_string, self._GOLDEN_UNICODE)
-    self.assertEqual(m.repeated_bytes[0], self._GOLDEN_BYTES)
-    # repeated_bytes[1] contained simple \ escaped non-UTF-8 raw binary data.
-    self.assertEqual(m.repeated_bytes[1], self._GOLDEN_BYTES_1)
-    # repeated_string[0] contained \ escaped data representing the UTF-8
-    # representation of _GOLDEN_STR_0 - it needs to decode as such.
-    self.assertEqual(m.repeated_string[0], self._GOLDEN_STR_0)
-
-  def testFromBytesFile(self, message_module):
-    m = message_module.TestAllTypes()
-    f = io.BytesIO(self._BYTES_SAMPLE)
-    text_format.ParseLines(f, m)
-    self.assertEqual(m.optional_bytes, self._GOLDEN_BYTES)
-    self.assertEqual(m.optional_string, self._GOLDEN_UNICODE)
-    self.assertEqual(m.repeated_bytes[0], self._GOLDEN_BYTES)
-
-  def testFromUnicodeFile(self, message_module):
-    m = message_module.TestAllTypes()
-    f = io.StringIO(self._UNICODE_SAMPLE)
-    text_format.ParseLines(f, m)
-    self.assertEqual(m.optional_bytes, self._GOLDEN_BYTES)
-    self.assertEqual(m.optional_string, self._GOLDEN_UNICODE)
-    self.assertEqual(m.repeated_bytes[0], self._GOLDEN_BYTES)
-
-  def testFromBytesLines(self, message_module):
-    m = message_module.TestAllTypes()
-    text_format.ParseLines(self._BYTES_SAMPLE.split(b'\n'), m)
-    self.assertEqual(m.optional_bytes, self._GOLDEN_BYTES)
-    self.assertEqual(m.optional_string, self._GOLDEN_UNICODE)
-    self.assertEqual(m.repeated_bytes[0], self._GOLDEN_BYTES)
-
-  def testFromUnicodeLines(self, message_module):
-    m = message_module.TestAllTypes()
-    text_format.ParseLines(self._UNICODE_SAMPLE.split(u'\n'), m)
-    self.assertEqual(m.optional_bytes, self._GOLDEN_BYTES)
-    self.assertEqual(m.optional_string, self._GOLDEN_UNICODE)
-    self.assertEqual(m.repeated_bytes[0], self._GOLDEN_BYTES)
-
-  def testParseDuplicateMessages(self, message_module):
-    message = message_module.TestAllTypes()
-    text = ('optional_nested_message { bb: 1 } '
-            'optional_nested_message { bb: 2 }')
-    self.assertRaisesRegex(
-        text_format.ParseError,
-        (r'1:59 : Message type "\w+.TestAllTypes" '
-         r'should not have multiple "optional_nested_message" fields.'),
-        text_format.Parse, text, message)
-
-  def testParseDuplicateScalars(self, message_module):
-    message = message_module.TestAllTypes()
-    text = ('optional_int32: 42 ' 'optional_int32: 67')
-    self.assertRaisesRegex(
-        text_format.ParseError,
-        (r'1:36 : Message type "\w+.TestAllTypes" should not '
-         r'have multiple "optional_int32" fields.'), text_format.Parse, text,
-        message)
-
-  def testParseExistingScalarInMessage(self, message_module):
-    message = message_module.TestAllTypes(optional_int32=42)
-    text = 'optional_int32: 67'
-    self.assertRaisesRegex(text_format.ParseError,
-                           (r'Message type "\w+.TestAllTypes" should not '
-                            r'have multiple "optional_int32" fields.'),
-                           text_format.Parse, text, message)
-
-
-@_parameterized.parameters(unittest_pb2, unittest_proto3_arena_pb2)
-class TextFormatMergeTests(TextFormatBase):
-
-  def testMergeDuplicateScalarsInText(self, message_module):
-    message = message_module.TestAllTypes()
-    text = ('optional_int32: 42 ' 'optional_int32: 67')
-    r = text_format.Merge(text, message)
-    self.assertIs(r, message)
-    self.assertEqual(67, message.optional_int32)
-
-  def testMergeDuplicateNestedMessageScalars(self, message_module):
-    message = message_module.TestAllTypes()
-    text = ('optional_nested_message { bb: 1 } '
-            'optional_nested_message { bb: 2 }')
-    r = text_format.Merge(text, message)
-    self.assertTrue(r is message)
-    self.assertEqual(2, message.optional_nested_message.bb)
-
-  def testReplaceScalarInMessage(self, message_module):
-    message = message_module.TestAllTypes(optional_int32=42)
-    text = 'optional_int32: 67'
-    r = text_format.Merge(text, message)
-    self.assertIs(r, message)
-    self.assertEqual(67, message.optional_int32)
-
-  def testReplaceMessageInMessage(self, message_module):
-    message = message_module.TestAllTypes(
-        optional_int32=42, optional_nested_message=dict())
-    self.assertTrue(message.HasField('optional_nested_message'))
-    text = 'optional_nested_message{ bb: 3 }'
-    r = text_format.Merge(text, message)
-    self.assertIs(r, message)
-    self.assertEqual(3, message.optional_nested_message.bb)
-
-  def testMergeMultipleOneof(self, message_module):
-    m_string = '\n'.join(['oneof_uint32: 11', 'oneof_string: "foo"'])
-    m2 = message_module.TestAllTypes()
-    text_format.Merge(m_string, m2)
-    self.assertEqual('oneof_string', m2.WhichOneof('oneof_field'))
-
-
-# These are tests that aren't fundamentally specific to proto2, but are at
-# the moment because of differences between the proto2 and proto3 test schemas.
-# Ideally the schemas would be made more similar so these tests could pass.
-class OnlyWorksWithProto2RightNowTests(TextFormatBase):
-
-  def testPrintAllFieldsPointy(self):
-    message = unittest_pb2.TestAllTypes()
-    test_util.SetAllFields(message)
-    self.CompareToGoldenFile(
-        self.RemoveRedundantZeros(text_format.MessageToString(
-            message, pointy_brackets=True)),
-        'text_format_unittest_data_pointy_oneof.txt')
-
-  def testParseGolden(self):
-    golden_text = '\n'.join(self.ReadGolden(
-        'text_format_unittest_data_oneof_implemented.txt'))
-    parsed_message = unittest_pb2.TestAllTypes()
-    r = text_format.Parse(golden_text, parsed_message)
-    self.assertIs(r, parsed_message)
-
-    message = unittest_pb2.TestAllTypes()
-    test_util.SetAllFields(message)
-    self.assertEqual(message, parsed_message)
-
-  def testPrintAllFields(self):
-    message = unittest_pb2.TestAllTypes()
-    test_util.SetAllFields(message)
-    self.CompareToGoldenFile(
-        self.RemoveRedundantZeros(text_format.MessageToString(message)),
-        'text_format_unittest_data_oneof_implemented.txt')
-
-  def testPrintUnknownFields(self):
-    message = unittest_pb2.TestAllTypes()
-    message.optional_int32 = 101
-    message.optional_double = 102.0
-    message.optional_string = u'hello'
-    message.optional_bytes = b'103'
-    message.optionalgroup.a = 104
-    message.optional_nested_message.bb = 105
-    all_data = message.SerializeToString()
-    empty_message = unittest_pb2.TestEmptyMessage()
-    empty_message.ParseFromString(all_data)
-    self.assertEqual('  1: 101\n'
-                     '  12: 4636878028842991616\n'
-                     '  14: "hello"\n'
-                     '  15: "103"\n'
-                     '  16 {\n'
-                     '    17: 104\n'
-                     '  }\n'
-                     '  18 {\n'
-                     '    1: 105\n'
-                     '  }\n',
-                     text_format.MessageToString(empty_message,
-                                                 indent=2,
-                                                 print_unknown_fields=True))
-    self.assertEqual('1: 101 '
-                     '12: 4636878028842991616 '
-                     '14: "hello" '
-                     '15: "103" '
-                     '16 { 17: 104 } '
-                     '18 { 1: 105 }',
-                     text_format.MessageToString(empty_message,
-                                                 print_unknown_fields=True,
-                                                 as_one_line=True))
-
-  def testPrintInIndexOrder(self):
-    message = unittest_pb2.TestFieldOrderings()
-    # Fields are listed in index order instead of field number.
-    message.my_string = 'str'
-    message.my_int = 101
-    message.my_float = 111
-    message.optional_nested_message.oo = 0
-    message.optional_nested_message.bb = 1
-    message.Extensions[unittest_pb2.my_extension_string] = 'ext_str0'
-    # Extensions are listed based on the order of extension number.
-    # Extension number 12.
-    message.Extensions[unittest_pb2.TestExtensionOrderings2.
-                       test_ext_orderings2].my_string = 'ext_str2'
-    # Extension number 13.
-    message.Extensions[unittest_pb2.TestExtensionOrderings1.
-                       test_ext_orderings1].my_string = 'ext_str1'
-    # Extension number 14.
-    message.Extensions[
-        unittest_pb2.TestExtensionOrderings2.TestExtensionOrderings3.
-        test_ext_orderings3].my_string = 'ext_str3'
-
-    # Print in index order.
-    self.CompareToGoldenText(
-        self.RemoveRedundantZeros(
-            text_format.MessageToString(message, use_index_order=True)),
-        'my_string: "str"\n'
-        'my_int: 101\n'
-        'my_float: 111\n'
-        'optional_nested_message {\n'
-        '  oo: 0\n'
-        '  bb: 1\n'
-        '}\n'
-        '[protobuf_unittest.TestExtensionOrderings2.test_ext_orderings2] {\n'
-        '  my_string: "ext_str2"\n'
-        '}\n'
-        '[protobuf_unittest.TestExtensionOrderings1.test_ext_orderings1] {\n'
-        '  my_string: "ext_str1"\n'
-        '}\n'
-        '[protobuf_unittest.TestExtensionOrderings2.TestExtensionOrderings3'
-        '.test_ext_orderings3] {\n'
-        '  my_string: "ext_str3"\n'
-        '}\n'
-        '[protobuf_unittest.my_extension_string]: "ext_str0"\n')
-    # By default, print in field number order.
-    self.CompareToGoldenText(
-        self.RemoveRedundantZeros(text_format.MessageToString(message)),
-        'my_int: 101\n'
-        'my_string: "str"\n'
-        '[protobuf_unittest.TestExtensionOrderings2.test_ext_orderings2] {\n'
-        '  my_string: "ext_str2"\n'
-        '}\n'
-        '[protobuf_unittest.TestExtensionOrderings1.test_ext_orderings1] {\n'
-        '  my_string: "ext_str1"\n'
-        '}\n'
-        '[protobuf_unittest.TestExtensionOrderings2.TestExtensionOrderings3'
-        '.test_ext_orderings3] {\n'
-        '  my_string: "ext_str3"\n'
-        '}\n'
-        '[protobuf_unittest.my_extension_string]: "ext_str0"\n'
-        'my_float: 111\n'
-        'optional_nested_message {\n'
-        '  bb: 1\n'
-        '  oo: 0\n'
-        '}\n')
-
-  def testMergeLinesGolden(self):
-    opened = self.ReadGolden('text_format_unittest_data_oneof_implemented.txt')
-    parsed_message = unittest_pb2.TestAllTypes()
-    r = text_format.MergeLines(opened, parsed_message)
-    self.assertIs(r, parsed_message)
-
-    message = unittest_pb2.TestAllTypes()
-    test_util.SetAllFields(message)
-    self.assertEqual(message, parsed_message)
-
-  def testParseLinesGolden(self):
-    opened = self.ReadGolden('text_format_unittest_data_oneof_implemented.txt')
-    parsed_message = unittest_pb2.TestAllTypes()
-    r = text_format.ParseLines(opened, parsed_message)
-    self.assertIs(r, parsed_message)
-
-    message = unittest_pb2.TestAllTypes()
-    test_util.SetAllFields(message)
-    self.assertEqual(message, parsed_message)
-
-  def testPrintMap(self):
-    message = map_unittest_pb2.TestMap()
-
-    message.map_int32_int32[-123] = -456
-    message.map_int64_int64[-2**33] = -2**34
-    message.map_uint32_uint32[123] = 456
-    message.map_uint64_uint64[2**33] = 2**34
-    message.map_string_string['abc'] = '123'
-    message.map_int32_foreign_message[111].c = 5
-
-    # Maps are serialized to text format using their underlying repeated
-    # representation.
-    self.CompareToGoldenText(
-        text_format.MessageToString(message), 'map_int32_int32 {\n'
-        '  key: -123\n'
-        '  value: -456\n'
-        '}\n'
-        'map_int64_int64 {\n'
-        '  key: -8589934592\n'
-        '  value: -17179869184\n'
-        '}\n'
-        'map_uint32_uint32 {\n'
-        '  key: 123\n'
-        '  value: 456\n'
-        '}\n'
-        'map_uint64_uint64 {\n'
-        '  key: 8589934592\n'
-        '  value: 17179869184\n'
-        '}\n'
-        'map_string_string {\n'
-        '  key: "abc"\n'
-        '  value: "123"\n'
-        '}\n'
-        'map_int32_foreign_message {\n'
-        '  key: 111\n'
-        '  value {\n'
-        '    c: 5\n'
-        '  }\n'
-        '}\n')
-
-  def testDuplicateMapKey(self):
-    message = map_unittest_pb2.TestMap()
-    text = (
-        'map_uint64_uint64 {\n'
-        '  key: 123\n'
-        '  value: 17179869184\n'
-        '}\n'
-        'map_string_string {\n'
-        '  key: "abc"\n'
-        '  value: "first"\n'
-        '}\n'
-        'map_int32_foreign_message {\n'
-        '  key: 111\n'
-        '  value {\n'
-        '    c: 5\n'
-        '  }\n'
-        '}\n'
-        'map_uint64_uint64 {\n'
-        '  key: 123\n'
-        '  value: 321\n'
-        '}\n'
-        'map_string_string {\n'
-        '  key: "abc"\n'
-        '  value: "second"\n'
-        '}\n'
-        'map_int32_foreign_message {\n'
-        '  key: 111\n'
-        '  value {\n'
-        '    d: 5\n'
-        '  }\n'
-        '}\n')
-    text_format.Parse(text, message)
-    self.CompareToGoldenText(
-        text_format.MessageToString(message), 'map_uint64_uint64 {\n'
-        '  key: 123\n'
-        '  value: 321\n'
-        '}\n'
-        'map_string_string {\n'
-        '  key: "abc"\n'
-        '  value: "second"\n'
-        '}\n'
-        'map_int32_foreign_message {\n'
-        '  key: 111\n'
-        '  value {\n'
-        '    d: 5\n'
-        '  }\n'
-        '}\n')
-
-  # In cpp implementation, __str__ calls the cpp implementation of text format.
-  def testPrintMapUsingCppImplementation(self):
-    message = map_unittest_pb2.TestMap()
-    inner_msg = message.map_int32_foreign_message[111]
-    inner_msg.c = 1
-    self.assertEqual(
-        str(message),
-        'map_int32_foreign_message {\n'
-        '  key: 111\n'
-        '  value {\n'
-        '    c: 1\n'
-        '  }\n'
-        '}\n')
-    inner_msg.c = 2
-    self.assertEqual(
-        str(message),
-        'map_int32_foreign_message {\n'
-        '  key: 111\n'
-        '  value {\n'
-        '    c: 2\n'
-        '  }\n'
-        '}\n')
-
-  def testMapOrderEnforcement(self):
-    message = map_unittest_pb2.TestMap()
-    for letter in string.ascii_uppercase[13:26]:
-      message.map_string_string[letter] = 'dummy'
-    for letter in reversed(string.ascii_uppercase[0:13]):
-      message.map_string_string[letter] = 'dummy'
-    golden = ''.join(('map_string_string {\n  key: "%c"\n  value: "dummy"\n}\n'
-                      % (letter,) for letter in string.ascii_uppercase))
-    self.CompareToGoldenText(text_format.MessageToString(message), golden)
-
-  # TODO(teboring): In c/137553523, not serializing default value for map entry
-  # message has been fixed. This test needs to be disabled in order to submit
-  # that cl. Add this back when c/137553523 has been submitted.
-  # def testMapOrderSemantics(self):
-  #   golden_lines = self.ReadGolden('map_test_data.txt')
-
-  #   message = map_unittest_pb2.TestMap()
-  #   text_format.ParseLines(golden_lines, message)
-  #   candidate = text_format.MessageToString(message)
-  #   # The Python implementation emits "1.0" for the double value that the C++
-  #   # implementation emits as "1".
-  #   candidate = candidate.replace('1.0', '1', 2)
-  #   candidate = candidate.replace('0.0', '0', 2)
-  #   self.assertMultiLineEqual(candidate, ''.join(golden_lines))
-
-
-# Tests of proto2-only features (MessageSet, extensions, etc.).
-class Proto2Tests(TextFormatBase):
-
-  def testPrintMessageSet(self):
-    message = unittest_mset_pb2.TestMessageSetContainer()
-    ext1 = unittest_mset_pb2.TestMessageSetExtension1.message_set_extension
-    ext2 = unittest_mset_pb2.TestMessageSetExtension2.message_set_extension
-    message.message_set.Extensions[ext1].i = 23
-    message.message_set.Extensions[ext2].str = 'foo'
-    self.CompareToGoldenText(
-        text_format.MessageToString(message), 'message_set {\n'
-        '  [protobuf_unittest.TestMessageSetExtension1] {\n'
-        '    i: 23\n'
-        '  }\n'
-        '  [protobuf_unittest.TestMessageSetExtension2] {\n'
-        '    str: \"foo\"\n'
-        '  }\n'
-        '}\n')
-
-    message = message_set_extensions_pb2.TestMessageSet()
-    ext = message_set_extensions_pb2.message_set_extension3
-    message.Extensions[ext].text = 'bar'
-    self.CompareToGoldenText(
-        text_format.MessageToString(message),
-        '[google.protobuf.internal.TestMessageSetExtension3] {\n'
-        '  text: \"bar\"\n'
-        '}\n')
-
-  def testPrintMessageSetByFieldNumber(self):
-    out = text_format.TextWriter(False)
-    message = unittest_mset_pb2.TestMessageSetContainer()
-    ext1 = unittest_mset_pb2.TestMessageSetExtension1.message_set_extension
-    ext2 = unittest_mset_pb2.TestMessageSetExtension2.message_set_extension
-    message.message_set.Extensions[ext1].i = 23
-    message.message_set.Extensions[ext2].str = 'foo'
-    text_format.PrintMessage(message, out, use_field_number=True)
-    self.CompareToGoldenText(out.getvalue(), '1 {\n'
-                             '  1545008 {\n'
-                             '    15: 23\n'
-                             '  }\n'
-                             '  1547769 {\n'
-                             '    25: \"foo\"\n'
-                             '  }\n'
-                             '}\n')
-    out.close()
-
-  def testPrintMessageSetAsOneLine(self):
-    message = unittest_mset_pb2.TestMessageSetContainer()
-    ext1 = unittest_mset_pb2.TestMessageSetExtension1.message_set_extension
-    ext2 = unittest_mset_pb2.TestMessageSetExtension2.message_set_extension
-    message.message_set.Extensions[ext1].i = 23
-    message.message_set.Extensions[ext2].str = 'foo'
-    self.CompareToGoldenText(
-        text_format.MessageToString(message, as_one_line=True),
-        'message_set {'
-        ' [protobuf_unittest.TestMessageSetExtension1] {'
-        ' i: 23'
-        ' }'
-        ' [protobuf_unittest.TestMessageSetExtension2] {'
-        ' str: \"foo\"'
-        ' }'
-        ' }')
-
-  def testParseMessageSet(self):
-    message = unittest_pb2.TestAllTypes()
-    text = ('repeated_uint64: 1\n' 'repeated_uint64: 2\n')
-    text_format.Parse(text, message)
-    self.assertEqual(1, message.repeated_uint64[0])
-    self.assertEqual(2, message.repeated_uint64[1])
-
-    message = unittest_mset_pb2.TestMessageSetContainer()
-    text = ('message_set {\n'
-            '  [protobuf_unittest.TestMessageSetExtension1] {\n'
-            '    i: 23\n'
-            '  }\n'
-            '  [protobuf_unittest.TestMessageSetExtension2] {\n'
-            '    str: \"foo\"\n'
-            '  }\n'
-            '}\n')
-    text_format.Parse(text, message)
-    ext1 = unittest_mset_pb2.TestMessageSetExtension1.message_set_extension
-    ext2 = unittest_mset_pb2.TestMessageSetExtension2.message_set_extension
-    self.assertEqual(23, message.message_set.Extensions[ext1].i)
-    self.assertEqual('foo', message.message_set.Extensions[ext2].str)
-
-  def testExtensionInsideAnyMessage(self):
-    message = test_extend_any.TestAny()
-    text = ('value {\n'
-            '  [type.googleapis.com/google.protobuf.internal.TestAny] {\n'
-            '    [google.protobuf.internal.TestAnyExtension1.extension1] {\n'
-            '      i: 10\n'
-            '    }\n'
-            '  }\n'
-            '}\n')
-    text_format.Merge(text, message, descriptor_pool=descriptor_pool.Default())
-    self.CompareToGoldenText(
-        text_format.MessageToString(
-            message, descriptor_pool=descriptor_pool.Default()),
-        text)
-
-  def testParseMessageByFieldNumber(self):
-    message = unittest_pb2.TestAllTypes()
-    text = ('34: 1\n' 'repeated_uint64: 2\n')
-    text_format.Parse(text, message, allow_field_number=True)
-    self.assertEqual(1, message.repeated_uint64[0])
-    self.assertEqual(2, message.repeated_uint64[1])
-
-    message = unittest_mset_pb2.TestMessageSetContainer()
-    text = ('1 {\n'
-            '  1545008 {\n'
-            '    15: 23\n'
-            '  }\n'
-            '  1547769 {\n'
-            '    25: \"foo\"\n'
-            '  }\n'
-            '}\n')
-    text_format.Parse(text, message, allow_field_number=True)
-    ext1 = unittest_mset_pb2.TestMessageSetExtension1.message_set_extension
-    ext2 = unittest_mset_pb2.TestMessageSetExtension2.message_set_extension
-    self.assertEqual(23, message.message_set.Extensions[ext1].i)
-    self.assertEqual('foo', message.message_set.Extensions[ext2].str)
-
-    # Can't parse field number without set allow_field_number=True.
-    message = unittest_pb2.TestAllTypes()
-    text = '34:1\n'
-    self.assertRaisesRegex(
-        text_format.ParseError,
-        (r'1:1 : Message type "\w+.TestAllTypes" has no field named '
-         r'"34".'), text_format.Parse, text, message)
-
-    # Can't parse if field number is not found.
-    text = '1234:1\n'
-    self.assertRaisesRegex(
-        text_format.ParseError,
-        (r'1:1 : Message type "\w+.TestAllTypes" has no field named '
-         r'"1234".'),
-        text_format.Parse,
-        text,
-        message,
-        allow_field_number=True)
-
-  def testPrintAllExtensions(self):
-    message = unittest_pb2.TestAllExtensions()
-    test_util.SetAllExtensions(message)
-    self.CompareToGoldenFile(
-        self.RemoveRedundantZeros(text_format.MessageToString(message)),
-        'text_format_unittest_extensions_data.txt')
-
-  def testPrintAllExtensionsPointy(self):
-    message = unittest_pb2.TestAllExtensions()
-    test_util.SetAllExtensions(message)
-    self.CompareToGoldenFile(
-        self.RemoveRedundantZeros(text_format.MessageToString(
-            message, pointy_brackets=True)),
-        'text_format_unittest_extensions_data_pointy.txt')
-
-  def testParseGoldenExtensions(self):
-    golden_text = '\n'.join(self.ReadGolden(
-        'text_format_unittest_extensions_data.txt'))
-    parsed_message = unittest_pb2.TestAllExtensions()
-    text_format.Parse(golden_text, parsed_message)
-
-    message = unittest_pb2.TestAllExtensions()
-    test_util.SetAllExtensions(message)
-    self.assertEqual(message, parsed_message)
-
-  def testParseAllExtensions(self):
-    message = unittest_pb2.TestAllExtensions()
-    test_util.SetAllExtensions(message)
-    ascii_text = text_format.MessageToString(message)
-
-    parsed_message = unittest_pb2.TestAllExtensions()
-    text_format.Parse(ascii_text, parsed_message)
-    self.assertEqual(message, parsed_message)
-
-  def testParseAllowedUnknownExtension(self):
-    # Skip over unknown extension correctly.
-    message = unittest_mset_pb2.TestMessageSetContainer()
-    text = ('message_set {\n'
-            '  [unknown_extension] {\n'
-            '    i: 23\n'
-            '    repeated_i: []\n'
-            '    bin: "\xe0"\n'
-            '    [nested_unknown_ext]: {\n'
-            '      i: 23\n'
-            '      repeated_i: [1, 2]\n'
-            '      x: x\n'
-            '      test: "test_string"\n'
-            '      floaty_float: -0.315\n'
-            '      num: -inf\n'
-            '      multiline_str: "abc"\n'
-            '          "def"\n'
-            '          "xyz."\n'
-            '      [nested_unknown_ext.ext]: <\n'
-            '        i: 23\n'
-            '        i: 24\n'
-            '        pointfloat: .3\n'
-            '        test: "test_string"\n'
-            '        repeated_test: ["test_string1", "test_string2"]\n'
-            '        floaty_float: -0.315\n'
-            '        num: -inf\n'
-            '        long_string: "test" "test2" \n'
-            '      >\n'
-            '    }\n'
-            '  }\n'
-            '  [unknown_extension]: 5\n'
-            '  [unknown_extension_with_number_field] {\n'
-            '    1: "some_field"\n'
-            '    2: -0.451\n'
-            '  }\n'
-            '}\n')
-    text_format.Parse(text, message, allow_unknown_extension=True)
-    golden = 'message_set {\n}\n'
-    self.CompareToGoldenText(text_format.MessageToString(message), golden)
-
-    # Catch parse errors in unknown extension.
-    message = unittest_mset_pb2.TestMessageSetContainer()
-    malformed = ('message_set {\n'
-                 '  [unknown_extension] {\n'
-                 '    i:\n'  # Missing value.
-                 '  }\n'
-                 '}\n')
-    self.assertRaisesRegex(
-        text_format.ParseError,
-        'Invalid field value: }',
-        text_format.Parse,
-        malformed,
-        message,
-        allow_unknown_extension=True)
-
-    message = unittest_mset_pb2.TestMessageSetContainer()
-    malformed = ('message_set {\n'
-                 '  [unknown_extension] {\n'
-                 '    str: "malformed string\n'  # Missing closing quote.
-                 '  }\n'
-                 '}\n')
-    self.assertRaisesRegex(
-        text_format.ParseError,
-        'Invalid field value: "',
-        text_format.Parse,
-        malformed,
-        message,
-        allow_unknown_extension=True)
-
-    message = unittest_mset_pb2.TestMessageSetContainer()
-    malformed = ('message_set {\n'
-                 '  [unknown_extension] {\n'
-                 '    str: "malformed\n multiline\n string\n'
-                 '  }\n'
-                 '}\n')
-    self.assertRaisesRegex(
-        text_format.ParseError,
-        'Invalid field value: "',
-        text_format.Parse,
-        malformed,
-        message,
-        allow_unknown_extension=True)
-
-    message = unittest_mset_pb2.TestMessageSetContainer()
-    malformed = ('message_set {\n'
-                 '  [malformed_extension] <\n'
-                 '    i: -5\n'
-                 '  \n'  # Missing '>' here.
-                 '}\n')
-    self.assertRaisesRegex(
-        text_format.ParseError,
-        '5:1 : \'}\': Expected ">".',
-        text_format.Parse,
-        malformed,
-        message,
-        allow_unknown_extension=True)
-
-    # Don't allow unknown fields with allow_unknown_extension=True.
-    message = unittest_mset_pb2.TestMessageSetContainer()
-    malformed = ('message_set {\n'
-                 '  unknown_field: true\n'
-                 '}\n')
-    self.assertRaisesRegex(
-        text_format.ParseError,
-        ('2:3 : Message type '
-         '"proto2_wireformat_unittest.TestMessageSet" has no'
-         ' field named "unknown_field".'),
-        text_format.Parse,
-        malformed,
-        message,
-        allow_unknown_extension=True)
-
-    # Parse known extension correctly.
-    message = unittest_mset_pb2.TestMessageSetContainer()
-    text = ('message_set {\n'
-            '  [protobuf_unittest.TestMessageSetExtension1] {\n'
-            '    i: 23\n'
-            '  }\n'
-            '  [protobuf_unittest.TestMessageSetExtension2] {\n'
-            '    str: \"foo\"\n'
-            '  }\n'
-            '}\n')
-    text_format.Parse(text, message, allow_unknown_extension=True)
-    ext1 = unittest_mset_pb2.TestMessageSetExtension1.message_set_extension
-    ext2 = unittest_mset_pb2.TestMessageSetExtension2.message_set_extension
-    self.assertEqual(23, message.message_set.Extensions[ext1].i)
-    self.assertEqual('foo', message.message_set.Extensions[ext2].str)
-
-  def testParseBadIdentifier(self):
-    message = unittest_pb2.TestAllTypes()
-    text = ('optional_nested_message { "bb": 1 }')
-    with self.assertRaises(text_format.ParseError) as e:
-      text_format.Parse(text, message)
-    self.assertEqual(str(e.exception),
-                     '1:27 : \'optional_nested_message { "bb": 1 }\': '
-                     'Expected identifier or number, got "bb".')
-
-  def testParseBadExtension(self):
-    message = unittest_pb2.TestAllExtensions()
-    text = '[unknown_extension]: 8\n'
-    self.assertRaisesRegex(
-        text_format.ParseError,
-        '1:2 : Extension "unknown_extension" not registered.',
-        text_format.Parse, text, message)
-    message = unittest_pb2.TestAllTypes()
-    self.assertRaisesRegex(
-        text_format.ParseError,
-        ('1:2 : Message type "protobuf_unittest.TestAllTypes" does not have '
-         'extensions.'), text_format.Parse, text, message)
-
-  def testParseNumericUnknownEnum(self):
-    message = unittest_pb2.TestAllTypes()
-    text = 'optional_nested_enum: 100'
-    self.assertRaisesRegex(text_format.ParseError,
-                           (r'1:23 : \'optional_nested_enum: 100\': '
-                            r'Enum type "\w+.TestAllTypes.NestedEnum" '
-                            r'has no value with number 100.'),
-                           text_format.Parse, text, message)
-
-  def testMergeDuplicateExtensionScalars(self):
-    message = unittest_pb2.TestAllExtensions()
-    text = ('[protobuf_unittest.optional_int32_extension]: 42 '
-            '[protobuf_unittest.optional_int32_extension]: 67')
-    text_format.Merge(text, message)
-    self.assertEqual(67,
-                     message.Extensions[unittest_pb2.optional_int32_extension])
-
-  def testParseDuplicateExtensionScalars(self):
-    message = unittest_pb2.TestAllExtensions()
-    text = ('[protobuf_unittest.optional_int32_extension]: 42 '
-            '[protobuf_unittest.optional_int32_extension]: 67')
-    self.assertRaisesRegex(
-        text_format.ParseError,
-        ('1:96 : Message type "protobuf_unittest.TestAllExtensions" '
-         'should not have multiple '
-         '"protobuf_unittest.optional_int32_extension" extensions.'),
-        text_format.Parse, text, message)
-
-  def testParseDuplicateExtensionMessages(self):
-    message = unittest_pb2.TestAllExtensions()
-    text = ('[protobuf_unittest.optional_nested_message_extension]: {} '
-            '[protobuf_unittest.optional_nested_message_extension]: {}')
-    self.assertRaisesRegex(
-        text_format.ParseError,
-        ('1:114 : Message type "protobuf_unittest.TestAllExtensions" '
-         'should not have multiple '
-         '"protobuf_unittest.optional_nested_message_extension" extensions.'),
-        text_format.Parse, text, message)
-
-  def testParseGroupNotClosed(self):
-    message = unittest_pb2.TestAllTypes()
-    text = 'RepeatedGroup: <'
-    self.assertRaisesRegex(text_format.ParseError, '1:16 : Expected ">".',
-                           text_format.Parse, text, message)
-    text = 'RepeatedGroup: {'
-    self.assertRaisesRegex(text_format.ParseError, '1:16 : Expected "}".',
-                           text_format.Parse, text, message)
-
-  def testParseEmptyGroup(self):
-    message = unittest_pb2.TestAllTypes()
-    text = 'OptionalGroup: {}'
-    text_format.Parse(text, message)
-    self.assertTrue(message.HasField('optionalgroup'))
-
-    message.Clear()
-
-    message = unittest_pb2.TestAllTypes()
-    text = 'OptionalGroup: <>'
-    text_format.Parse(text, message)
-    self.assertTrue(message.HasField('optionalgroup'))
-
-  # Maps aren't really proto2-only, but our test schema only has maps for
-  # proto2.
-  def testParseMap(self):
-    text = ('map_int32_int32 {\n'
-            '  key: -123\n'
-            '  value: -456\n'
-            '}\n'
-            'map_int64_int64 {\n'
-            '  key: -8589934592\n'
-            '  value: -17179869184\n'
-            '}\n'
-            'map_uint32_uint32 {\n'
-            '  key: 123\n'
-            '  value: 456\n'
-            '}\n'
-            'map_uint64_uint64 {\n'
-            '  key: 8589934592\n'
-            '  value: 17179869184\n'
-            '}\n'
-            'map_string_string {\n'
-            '  key: "abc"\n'
-            '  value: "123"\n'
-            '}\n'
-            'map_int32_foreign_message {\n'
-            '  key: 111\n'
-            '  value {\n'
-            '    c: 5\n'
-            '  }\n'
-            '}\n')
-    message = map_unittest_pb2.TestMap()
-    text_format.Parse(text, message)
-
-    self.assertEqual(-456, message.map_int32_int32[-123])
-    self.assertEqual(-2**34, message.map_int64_int64[-2**33])
-    self.assertEqual(456, message.map_uint32_uint32[123])
-    self.assertEqual(2**34, message.map_uint64_uint64[2**33])
-    self.assertEqual('123', message.map_string_string['abc'])
-    self.assertEqual(5, message.map_int32_foreign_message[111].c)
-
-
-class Proto3Tests(unittest.TestCase):
-
-  def testPrintMessageExpandAny(self):
-    packed_message = unittest_pb2.OneString()
-    packed_message.data = 'string'
-    message = any_test_pb2.TestAny()
-    message.any_value.Pack(packed_message)
-    self.assertEqual(
-        text_format.MessageToString(message,
-                                    descriptor_pool=descriptor_pool.Default()),
-        'any_value {\n'
-        '  [type.googleapis.com/protobuf_unittest.OneString] {\n'
-        '    data: "string"\n'
-        '  }\n'
-        '}\n')
-
-  def testTopAnyMessage(self):
-    packed_msg = unittest_pb2.OneString()
-    msg = any_pb2.Any()
-    msg.Pack(packed_msg)
-    text = text_format.MessageToString(msg)
-    other_msg = text_format.Parse(text, any_pb2.Any())
-    self.assertEqual(msg, other_msg)
-
-  def testPrintMessageExpandAnyRepeated(self):
-    packed_message = unittest_pb2.OneString()
-    message = any_test_pb2.TestAny()
-    packed_message.data = 'string0'
-    message.repeated_any_value.add().Pack(packed_message)
-    packed_message.data = 'string1'
-    message.repeated_any_value.add().Pack(packed_message)
-    self.assertEqual(
-        text_format.MessageToString(message),
-        'repeated_any_value {\n'
-        '  [type.googleapis.com/protobuf_unittest.OneString] {\n'
-        '    data: "string0"\n'
-        '  }\n'
-        '}\n'
-        'repeated_any_value {\n'
-        '  [type.googleapis.com/protobuf_unittest.OneString] {\n'
-        '    data: "string1"\n'
-        '  }\n'
-        '}\n')
-
-  def testPrintMessageExpandAnyDescriptorPoolMissingType(self):
-    packed_message = unittest_pb2.OneString()
-    packed_message.data = 'string'
-    message = any_test_pb2.TestAny()
-    message.any_value.Pack(packed_message)
-    empty_pool = descriptor_pool.DescriptorPool()
-    self.assertEqual(
-        text_format.MessageToString(message, descriptor_pool=empty_pool),
-        'any_value {\n'
-        '  type_url: "type.googleapis.com/protobuf_unittest.OneString"\n'
-        '  value: "\\n\\006string"\n'
-        '}\n')
-
-  def testPrintMessageExpandAnyPointyBrackets(self):
-    packed_message = unittest_pb2.OneString()
-    packed_message.data = 'string'
-    message = any_test_pb2.TestAny()
-    message.any_value.Pack(packed_message)
-    self.assertEqual(
-        text_format.MessageToString(message,
-                                    pointy_brackets=True),
-        'any_value <\n'
-        '  [type.googleapis.com/protobuf_unittest.OneString] <\n'
-        '    data: "string"\n'
-        '  >\n'
-        '>\n')
-
-  def testPrintMessageExpandAnyAsOneLine(self):
-    packed_message = unittest_pb2.OneString()
-    packed_message.data = 'string'
-    message = any_test_pb2.TestAny()
-    message.any_value.Pack(packed_message)
-    self.assertEqual(
-        text_format.MessageToString(message,
-                                    as_one_line=True),
-        'any_value {'
-        ' [type.googleapis.com/protobuf_unittest.OneString]'
-        ' { data: "string" } '
-        '}')
-
-  def testPrintMessageExpandAnyAsOneLinePointyBrackets(self):
-    packed_message = unittest_pb2.OneString()
-    packed_message.data = 'string'
-    message = any_test_pb2.TestAny()
-    message.any_value.Pack(packed_message)
-    self.assertEqual(
-        text_format.MessageToString(message,
-                                    as_one_line=True,
-                                    pointy_brackets=True,
-                                    descriptor_pool=descriptor_pool.Default()),
-        'any_value <'
-        ' [type.googleapis.com/protobuf_unittest.OneString]'
-        ' < data: "string" > '
-        '>')
-
-  def testPrintAndParseMessageInvalidAny(self):
-    packed_message = unittest_pb2.OneString()
-    packed_message.data = 'string'
-    message = any_test_pb2.TestAny()
-    message.any_value.Pack(packed_message)
-    # Only include string after last '/' in type_url.
-    message.any_value.type_url = message.any_value.TypeName()
-    text = text_format.MessageToString(message)
-    self.assertEqual(
-        text, 'any_value {\n'
-        '  type_url: "protobuf_unittest.OneString"\n'
-        '  value: "\\n\\006string"\n'
-        '}\n')
-
-    parsed_message = any_test_pb2.TestAny()
-    text_format.Parse(text, parsed_message)
-    self.assertEqual(message, parsed_message)
-
-  def testUnknownEnums(self):
-    message = unittest_proto3_arena_pb2.TestAllTypes()
-    message2 = unittest_proto3_arena_pb2.TestAllTypes()
-    message.optional_nested_enum = 999
-    text_string = text_format.MessageToString(message)
-    text_format.Parse(text_string, message2)
-    self.assertEqual(999, message2.optional_nested_enum)
-
-  def testMergeExpandedAny(self):
-    message = any_test_pb2.TestAny()
-    text = ('any_value {\n'
-            '  [type.googleapis.com/protobuf_unittest.OneString] {\n'
-            '    data: "string"\n'
-            '  }\n'
-            '}\n')
-    text_format.Merge(text, message)
-    packed_message = unittest_pb2.OneString()
-    message.any_value.Unpack(packed_message)
-    self.assertEqual('string', packed_message.data)
-    message.Clear()
-    text_format.Parse(text, message)
-    packed_message = unittest_pb2.OneString()
-    message.any_value.Unpack(packed_message)
-    self.assertEqual('string', packed_message.data)
-
-  def testMergeExpandedAnyRepeated(self):
-    message = any_test_pb2.TestAny()
-    text = ('repeated_any_value {\n'
-            '  [type.googleapis.com/protobuf_unittest.OneString] {\n'
-            '    data: "string0"\n'
-            '  }\n'
-            '}\n'
-            'repeated_any_value {\n'
-            '  [type.googleapis.com/protobuf_unittest.OneString] {\n'
-            '    data: "string1"\n'
-            '  }\n'
-            '}\n')
-    text_format.Merge(text, message)
-    packed_message = unittest_pb2.OneString()
-    message.repeated_any_value[0].Unpack(packed_message)
-    self.assertEqual('string0', packed_message.data)
-    message.repeated_any_value[1].Unpack(packed_message)
-    self.assertEqual('string1', packed_message.data)
-
-  def testMergeExpandedAnyPointyBrackets(self):
-    message = any_test_pb2.TestAny()
-    text = ('any_value {\n'
-            '  [type.googleapis.com/protobuf_unittest.OneString] <\n'
-            '    data: "string"\n'
-            '  >\n'
-            '}\n')
-    text_format.Merge(text, message)
-    packed_message = unittest_pb2.OneString()
-    message.any_value.Unpack(packed_message)
-    self.assertEqual('string', packed_message.data)
-
-  def testMergeAlternativeUrl(self):
-    message = any_test_pb2.TestAny()
-    text = ('any_value {\n'
-            '  [type.otherapi.com/protobuf_unittest.OneString] {\n'
-            '    data: "string"\n'
-            '  }\n'
-            '}\n')
-    text_format.Merge(text, message)
-    packed_message = unittest_pb2.OneString()
-    self.assertEqual('type.otherapi.com/protobuf_unittest.OneString',
-                     message.any_value.type_url)
-
-  def testMergeExpandedAnyDescriptorPoolMissingType(self):
-    message = any_test_pb2.TestAny()
-    text = ('any_value {\n'
-            '  [type.googleapis.com/protobuf_unittest.OneString] {\n'
-            '    data: "string"\n'
-            '  }\n'
-            '}\n')
-    with self.assertRaises(text_format.ParseError) as e:
-      empty_pool = descriptor_pool.DescriptorPool()
-      text_format.Merge(text, message, descriptor_pool=empty_pool)
-    self.assertEqual(
-        str(e.exception),
-        'Type protobuf_unittest.OneString not found in descriptor pool')
-
-  def testMergeUnexpandedAny(self):
-    text = ('any_value {\n'
-            '  type_url: "type.googleapis.com/protobuf_unittest.OneString"\n'
-            '  value: "\\n\\006string"\n'
-            '}\n')
-    message = any_test_pb2.TestAny()
-    text_format.Merge(text, message)
-    packed_message = unittest_pb2.OneString()
-    message.any_value.Unpack(packed_message)
-    self.assertEqual('string', packed_message.data)
-
-  def testMergeMissingAnyEndToken(self):
-    message = any_test_pb2.TestAny()
-    text = ('any_value {\n'
-            '  [type.googleapis.com/protobuf_unittest.OneString] {\n'
-            '    data: "string"\n')
-    with self.assertRaises(text_format.ParseError) as e:
-      text_format.Merge(text, message)
-    self.assertEqual(str(e.exception), '3:11 : Expected "}".')
-
-  def testParseExpandedAnyListValue(self):
-    any_msg = any_pb2.Any()
-    any_msg.Pack(struct_pb2.ListValue())
-    msg = any_test_pb2.TestAny(any_value=any_msg)
-    text = ('any_value {\n'
-            '  [type.googleapis.com/google.protobuf.ListValue] {}\n'
-            '}\n')
-    parsed_msg = text_format.Parse(text, any_test_pb2.TestAny())
-    self.assertEqual(msg, parsed_msg)
-
-  def testProto3Optional(self):
-    msg = test_proto3_optional_pb2.TestProto3Optional()
-    self.assertEqual(text_format.MessageToString(msg), '')
-    msg.optional_int32 = 0
-    msg.optional_float = 0.0
-    msg.optional_string = ''
-    msg.optional_nested_message.bb = 0
-    text = ('optional_int32: 0\n'
-            'optional_float: 0.0\n'
-            'optional_string: ""\n'
-            'optional_nested_message {\n'
-            '  bb: 0\n'
-            '}\n')
-    self.assertEqual(text_format.MessageToString(msg), text)
-    msg2 = test_proto3_optional_pb2.TestProto3Optional()
-    text_format.Parse(text, msg2)
-    self.assertEqual(text_format.MessageToString(msg2), text)
-
-
-class TokenizerTest(unittest.TestCase):
-
-  def testSimpleTokenCases(self):
-    text = ('identifier1:"string1"\n     \n\n'
-            'identifier2 : \n \n123  \n  identifier3 :\'string\'\n'
-            'identifiER_4 : 1.1e+2 ID5:-0.23 ID6:\'aaaa\\\'bbbb\'\n'
-            'ID7 : "aa\\"bb"\n\n\n\n ID8: {A:inf B:-inf C:true D:false}\n'
-            'ID9: 22 ID10: -111111111111111111 ID11: -22\n'
-            'ID12: 2222222222222222222 ID13: 1.23456f ID14: 1.2e+2f '
-            'false_bool:  0 true_BOOL:t \n true_bool1:  1 false_BOOL1:f '
-            'False_bool: False True_bool: True X:iNf Y:-inF Z:nAN')
-    tokenizer = text_format.Tokenizer(text.splitlines())
-    methods = [(tokenizer.ConsumeIdentifier, 'identifier1'), ':',
-               (tokenizer.ConsumeString, 'string1'),
-               (tokenizer.ConsumeIdentifier, 'identifier2'), ':',
-               (tokenizer.ConsumeInteger, 123),
-               (tokenizer.ConsumeIdentifier, 'identifier3'), ':',
-               (tokenizer.ConsumeString, 'string'),
-               (tokenizer.ConsumeIdentifier, 'identifiER_4'), ':',
-               (tokenizer.ConsumeFloat, 1.1e+2),
-               (tokenizer.ConsumeIdentifier, 'ID5'), ':',
-               (tokenizer.ConsumeFloat, -0.23),
-               (tokenizer.ConsumeIdentifier, 'ID6'), ':',
-               (tokenizer.ConsumeString, 'aaaa\'bbbb'),
-               (tokenizer.ConsumeIdentifier, 'ID7'), ':',
-               (tokenizer.ConsumeString, 'aa\"bb'),
-               (tokenizer.ConsumeIdentifier, 'ID8'), ':', '{',
-               (tokenizer.ConsumeIdentifier, 'A'), ':',
-               (tokenizer.ConsumeFloat, float('inf')),
-               (tokenizer.ConsumeIdentifier, 'B'), ':',
-               (tokenizer.ConsumeFloat, -float('inf')),
-               (tokenizer.ConsumeIdentifier, 'C'), ':',
-               (tokenizer.ConsumeBool, True),
-               (tokenizer.ConsumeIdentifier, 'D'), ':',
-               (tokenizer.ConsumeBool, False), '}',
-               (tokenizer.ConsumeIdentifier, 'ID9'), ':',
-               (tokenizer.ConsumeInteger, 22),
-               (tokenizer.ConsumeIdentifier, 'ID10'), ':',
-               (tokenizer.ConsumeInteger, -111111111111111111),
-               (tokenizer.ConsumeIdentifier, 'ID11'), ':',
-               (tokenizer.ConsumeInteger, -22),
-               (tokenizer.ConsumeIdentifier, 'ID12'), ':',
-               (tokenizer.ConsumeInteger, 2222222222222222222),
-               (tokenizer.ConsumeIdentifier, 'ID13'), ':',
-               (tokenizer.ConsumeFloat, 1.23456),
-               (tokenizer.ConsumeIdentifier, 'ID14'), ':',
-               (tokenizer.ConsumeFloat, 1.2e+2),
-               (tokenizer.ConsumeIdentifier, 'false_bool'), ':',
-               (tokenizer.ConsumeBool, False),
-               (tokenizer.ConsumeIdentifier, 'true_BOOL'), ':',
-               (tokenizer.ConsumeBool, True),
-               (tokenizer.ConsumeIdentifier, 'true_bool1'), ':',
-               (tokenizer.ConsumeBool, True),
-               (tokenizer.ConsumeIdentifier, 'false_BOOL1'), ':',
-               (tokenizer.ConsumeBool, False),
-               (tokenizer.ConsumeIdentifier, 'False_bool'), ':',
-               (tokenizer.ConsumeBool, False),
-               (tokenizer.ConsumeIdentifier, 'True_bool'), ':',
-               (tokenizer.ConsumeBool, True),
-               (tokenizer.ConsumeIdentifier, 'X'), ':',
-               (tokenizer.ConsumeFloat, float('inf')),
-               (tokenizer.ConsumeIdentifier, 'Y'), ':',
-               (tokenizer.ConsumeFloat, float('-inf')),
-               (tokenizer.ConsumeIdentifier, 'Z'), ':',
-               (tokenizer.ConsumeFloat, float('nan'))]
-
-    i = 0
-    while not tokenizer.AtEnd():
-      m = methods[i]
-      if isinstance(m, str):
-        token = tokenizer.token
-        self.assertEqual(token, m)
-        tokenizer.NextToken()
-      elif isinstance(m[1], float) and math.isnan(m[1]):
-        self.assertTrue(math.isnan(m[0]()))
-      else:
-        self.assertEqual(m[1], m[0]())
-      i += 1
-
-  def testConsumeAbstractIntegers(self):
-    # This test only tests the failures in the integer parsing methods as well
-    # as the '0' special cases.
-    int64_max = (1 << 63) - 1
-    uint32_max = (1 << 32) - 1
-    text = '-1 %d %d' % (uint32_max + 1, int64_max + 1)
-    tokenizer = text_format.Tokenizer(text.splitlines())
-    self.assertEqual(-1, tokenizer.ConsumeInteger())
-
-    self.assertEqual(uint32_max + 1, tokenizer.ConsumeInteger())
-
-    self.assertEqual(int64_max + 1, tokenizer.ConsumeInteger())
-    self.assertTrue(tokenizer.AtEnd())
-
-    text = '-0 0 0 1.2'
-    tokenizer = text_format.Tokenizer(text.splitlines())
-    self.assertEqual(0, tokenizer.ConsumeInteger())
-    self.assertEqual(0, tokenizer.ConsumeInteger())
-    self.assertEqual(True, tokenizer.TryConsumeInteger())
-    self.assertEqual(False, tokenizer.TryConsumeInteger())
-    with self.assertRaises(text_format.ParseError):
-      tokenizer.ConsumeInteger()
-    self.assertEqual(1.2, tokenizer.ConsumeFloat())
-    self.assertTrue(tokenizer.AtEnd())
-
-  def testConsumeIntegers(self):
-    # This test only tests the failures in the integer parsing methods as well
-    # as the '0' special cases.
-    int64_max = (1 << 63) - 1
-    uint32_max = (1 << 32) - 1
-    text = '-1 %d %d' % (uint32_max + 1, int64_max + 1)
-    tokenizer = text_format.Tokenizer(text.splitlines())
-    self.assertRaises(text_format.ParseError,
-                      text_format._ConsumeUint32, tokenizer)
-    self.assertRaises(text_format.ParseError,
-                      text_format._ConsumeUint64, tokenizer)
-    self.assertEqual(-1, text_format._ConsumeInt32(tokenizer))
-
-    self.assertRaises(text_format.ParseError,
-                      text_format._ConsumeUint32, tokenizer)
-    self.assertRaises(text_format.ParseError,
-                      text_format._ConsumeInt32, tokenizer)
-    self.assertEqual(uint32_max + 1, text_format._ConsumeInt64(tokenizer))
-
-    self.assertRaises(text_format.ParseError,
-                      text_format._ConsumeInt64, tokenizer)
-    self.assertEqual(int64_max + 1, text_format._ConsumeUint64(tokenizer))
-    self.assertTrue(tokenizer.AtEnd())
-
-    text = '-0 -0 0 0'
-    tokenizer = text_format.Tokenizer(text.splitlines())
-    self.assertEqual(0, text_format._ConsumeUint32(tokenizer))
-    self.assertEqual(0, text_format._ConsumeUint64(tokenizer))
-    self.assertEqual(0, text_format._ConsumeUint32(tokenizer))
-    self.assertEqual(0, text_format._ConsumeUint64(tokenizer))
-    self.assertTrue(tokenizer.AtEnd())
-
-  def testConsumeOctalIntegers(self):
-    """Test support for C style octal integers."""
-    text = '00 -00 04 0755 -010 007 -0033 08 -09 01'
-    tokenizer = text_format.Tokenizer(text.splitlines())
-    self.assertEqual(0, tokenizer.ConsumeInteger())
-    self.assertEqual(0, tokenizer.ConsumeInteger())
-    self.assertEqual(4, tokenizer.ConsumeInteger())
-    self.assertEqual(0o755, tokenizer.ConsumeInteger())
-    self.assertEqual(-0o10, tokenizer.ConsumeInteger())
-    self.assertEqual(7, tokenizer.ConsumeInteger())
-    self.assertEqual(-0o033, tokenizer.ConsumeInteger())
-    with self.assertRaises(text_format.ParseError):
-      tokenizer.ConsumeInteger()  # 08
-    tokenizer.NextToken()
-    with self.assertRaises(text_format.ParseError):
-      tokenizer.ConsumeInteger()  # -09
-    tokenizer.NextToken()
-    self.assertEqual(1, tokenizer.ConsumeInteger())
-    self.assertTrue(tokenizer.AtEnd())
-
-  def testConsumeByteString(self):
-    text = '"string1\''
-    tokenizer = text_format.Tokenizer(text.splitlines())
-    self.assertRaises(text_format.ParseError, tokenizer.ConsumeByteString)
-
-    text = 'string1"'
-    tokenizer = text_format.Tokenizer(text.splitlines())
-    self.assertRaises(text_format.ParseError, tokenizer.ConsumeByteString)
-
-    text = '\n"\\xt"'
-    tokenizer = text_format.Tokenizer(text.splitlines())
-    self.assertRaises(text_format.ParseError, tokenizer.ConsumeByteString)
-
-    text = '\n"\\"'
-    tokenizer = text_format.Tokenizer(text.splitlines())
-    self.assertRaises(text_format.ParseError, tokenizer.ConsumeByteString)
-
-    text = '\n"\\x"'
-    tokenizer = text_format.Tokenizer(text.splitlines())
-    self.assertRaises(text_format.ParseError, tokenizer.ConsumeByteString)
-
-  def testConsumeBool(self):
-    text = 'not-a-bool'
-    tokenizer = text_format.Tokenizer(text.splitlines())
-    self.assertRaises(text_format.ParseError, tokenizer.ConsumeBool)
-
-  def testSkipComment(self):
-    tokenizer = text_format.Tokenizer('# some comment'.splitlines())
-    self.assertTrue(tokenizer.AtEnd())
-    self.assertRaises(text_format.ParseError, tokenizer.ConsumeComment)
-
-  def testConsumeComment(self):
-    tokenizer = text_format.Tokenizer('# some comment'.splitlines(),
-                                      skip_comments=False)
-    self.assertFalse(tokenizer.AtEnd())
-    self.assertEqual('# some comment', tokenizer.ConsumeComment())
-    self.assertTrue(tokenizer.AtEnd())
-
-  def testConsumeTwoComments(self):
-    text = '# some comment\n# another comment'
-    tokenizer = text_format.Tokenizer(text.splitlines(), skip_comments=False)
-    self.assertEqual('# some comment', tokenizer.ConsumeComment())
-    self.assertFalse(tokenizer.AtEnd())
-    self.assertEqual('# another comment', tokenizer.ConsumeComment())
-    self.assertTrue(tokenizer.AtEnd())
-
-  def testConsumeTrailingComment(self):
-    text = 'some_number: 4\n# some comment'
-    tokenizer = text_format.Tokenizer(text.splitlines(), skip_comments=False)
-    self.assertRaises(text_format.ParseError, tokenizer.ConsumeComment)
-
-    self.assertEqual('some_number', tokenizer.ConsumeIdentifier())
-    self.assertEqual(tokenizer.token, ':')
-    tokenizer.NextToken()
-    self.assertRaises(text_format.ParseError, tokenizer.ConsumeComment)
-    self.assertEqual(4, tokenizer.ConsumeInteger())
-    self.assertFalse(tokenizer.AtEnd())
-
-    self.assertEqual('# some comment', tokenizer.ConsumeComment())
-    self.assertTrue(tokenizer.AtEnd())
-
-  def testConsumeLineComment(self):
-    tokenizer = text_format.Tokenizer('# some comment'.splitlines(),
-                                      skip_comments=False)
-    self.assertFalse(tokenizer.AtEnd())
-    self.assertEqual((False, '# some comment'),
-                     tokenizer.ConsumeCommentOrTrailingComment())
-    self.assertTrue(tokenizer.AtEnd())
-
-  def testConsumeTwoLineComments(self):
-    text = '# some comment\n# another comment'
-    tokenizer = text_format.Tokenizer(text.splitlines(), skip_comments=False)
-    self.assertEqual((False, '# some comment'),
-                     tokenizer.ConsumeCommentOrTrailingComment())
-    self.assertFalse(tokenizer.AtEnd())
-    self.assertEqual((False, '# another comment'),
-                     tokenizer.ConsumeCommentOrTrailingComment())
-    self.assertTrue(tokenizer.AtEnd())
-
-  def testConsumeAndCheckTrailingComment(self):
-    text = 'some_number: 4  # some comment'  # trailing comment on the same line
-    tokenizer = text_format.Tokenizer(text.splitlines(), skip_comments=False)
-    self.assertRaises(text_format.ParseError,
-                      tokenizer.ConsumeCommentOrTrailingComment)
-
-    self.assertEqual('some_number', tokenizer.ConsumeIdentifier())
-    self.assertEqual(tokenizer.token, ':')
-    tokenizer.NextToken()
-    self.assertRaises(text_format.ParseError,
-                      tokenizer.ConsumeCommentOrTrailingComment)
-    self.assertEqual(4, tokenizer.ConsumeInteger())
-    self.assertFalse(tokenizer.AtEnd())
-
-    self.assertEqual((True, '# some comment'),
-                     tokenizer.ConsumeCommentOrTrailingComment())
-    self.assertTrue(tokenizer.AtEnd())
-
-  def testHashinComment(self):
-    text = 'some_number: 4  # some comment # not a new comment'
-    tokenizer = text_format.Tokenizer(text.splitlines(), skip_comments=False)
-    self.assertEqual('some_number', tokenizer.ConsumeIdentifier())
-    self.assertEqual(tokenizer.token, ':')
-    tokenizer.NextToken()
-    self.assertEqual(4, tokenizer.ConsumeInteger())
-    self.assertEqual((True, '# some comment # not a new comment'),
-                     tokenizer.ConsumeCommentOrTrailingComment())
-    self.assertTrue(tokenizer.AtEnd())
-
-  def testHugeString(self):
-    # With pathologic backtracking, fails with Forge OOM.
-    text = '"' + 'a' * (10 * 1024 * 1024) + '"'
-    tokenizer = text_format.Tokenizer(text.splitlines(), skip_comments=False)
-    tokenizer.ConsumeString()
-
-
-# Tests for pretty printer functionality.
-@_parameterized.parameters((unittest_pb2), (unittest_proto3_arena_pb2))
-class PrettyPrinterTest(TextFormatBase):
-
-  def testPrettyPrintNoMatch(self, message_module):
-
-    def printer(message, indent, as_one_line):
-      del message, indent, as_one_line
-      return None
-
-    message = message_module.TestAllTypes()
-    msg = message.repeated_nested_message.add()
-    msg.bb = 42
-    self.CompareToGoldenText(
-        text_format.MessageToString(
-            message, as_one_line=True, message_formatter=printer),
-        'repeated_nested_message { bb: 42 }')
-
-  def testPrettyPrintOneLine(self, message_module):
-
-    def printer(m, indent, as_one_line):
-      del indent, as_one_line
-      if m.DESCRIPTOR == message_module.TestAllTypes.NestedMessage.DESCRIPTOR:
-        return 'My lucky number is %s' % m.bb
-
-    message = message_module.TestAllTypes()
-    msg = message.repeated_nested_message.add()
-    msg.bb = 42
-    self.CompareToGoldenText(
-        text_format.MessageToString(
-            message, as_one_line=True, message_formatter=printer),
-        'repeated_nested_message { My lucky number is 42 }')
-
-  def testPrettyPrintMultiLine(self, message_module):
-
-    def printer(m, indent, as_one_line):
-      if m.DESCRIPTOR == message_module.TestAllTypes.NestedMessage.DESCRIPTOR:
-        line_deliminator = (' ' if as_one_line else '\n') + ' ' * indent
-        return 'My lucky number is:%s%s' % (line_deliminator, m.bb)
-      return None
-
-    message = message_module.TestAllTypes()
-    msg = message.repeated_nested_message.add()
-    msg.bb = 42
-    self.CompareToGoldenText(
-        text_format.MessageToString(
-            message, as_one_line=True, message_formatter=printer),
-        'repeated_nested_message { My lucky number is: 42 }')
-    self.CompareToGoldenText(
-        text_format.MessageToString(
-            message, as_one_line=False, message_formatter=printer),
-        'repeated_nested_message {\n  My lucky number is:\n  42\n}\n')
-
-  def testPrettyPrintEntireMessage(self, message_module):
-
-    def printer(m, indent, as_one_line):
-      del indent, as_one_line
-      if m.DESCRIPTOR == message_module.TestAllTypes.DESCRIPTOR:
-        return 'The is the message!'
-      return None
-
-    message = message_module.TestAllTypes()
-    self.CompareToGoldenText(
-        text_format.MessageToString(
-            message, as_one_line=False, message_formatter=printer),
-        'The is the message!\n')
-    self.CompareToGoldenText(
-        text_format.MessageToString(
-            message, as_one_line=True, message_formatter=printer),
-        'The is the message!')
-
-  def testPrettyPrintMultipleParts(self, message_module):
-
-    def printer(m, indent, as_one_line):
-      del indent, as_one_line
-      if m.DESCRIPTOR == message_module.TestAllTypes.NestedMessage.DESCRIPTOR:
-        return 'My lucky number is %s' % m.bb
-      return None
-
-    message = message_module.TestAllTypes()
-    message.optional_int32 = 61
-    msg = message.repeated_nested_message.add()
-    msg.bb = 42
-    msg = message.repeated_nested_message.add()
-    msg.bb = 99
-    msg = message.optional_nested_message
-    msg.bb = 1
-    self.CompareToGoldenText(
-        text_format.MessageToString(
-            message, as_one_line=True, message_formatter=printer),
-        ('optional_int32: 61 '
-         'optional_nested_message { My lucky number is 1 } '
-         'repeated_nested_message { My lucky number is 42 } '
-         'repeated_nested_message { My lucky number is 99 }'))
-
-    out = text_format.TextWriter(False)
-    text_format.PrintField(
-        message_module.TestAllTypes.DESCRIPTOR.fields_by_name[
-            'optional_nested_message'],
-        message.optional_nested_message,
-        out,
-        message_formatter=printer)
-    self.assertEqual(
-        'optional_nested_message {\n  My lucky number is 1\n}\n',
-        out.getvalue())
-    out.close()
-
-    out = text_format.TextWriter(False)
-    text_format.PrintFieldValue(
-        message_module.TestAllTypes.DESCRIPTOR.fields_by_name[
-            'optional_nested_message'],
-        message.optional_nested_message,
-        out,
-        message_formatter=printer)
-    self.assertEqual(
-        '{\n  My lucky number is 1\n}',
-        out.getvalue())
-    out.close()
-
-
-class WhitespaceTest(TextFormatBase):
-
-  def setUp(self):
-    self.out = text_format.TextWriter(False)
-    self.addCleanup(self.out.close)
-    self.message = unittest_pb2.NestedTestAllTypes()
-    self.message.child.payload.optional_string = 'value'
-    self.field = self.message.DESCRIPTOR.fields_by_name['child']
-    self.value = self.message.child
-
-  def testMessageToString(self):
-    self.CompareToGoldenText(
-        text_format.MessageToString(self.message),
-        textwrap.dedent("""\
-            child {
-              payload {
-                optional_string: "value"
-              }
-            }
-            """))
-
-  def testPrintMessage(self):
-    text_format.PrintMessage(self.message, self.out)
-    self.CompareToGoldenText(
-        self.out.getvalue(),
-        textwrap.dedent("""\
-            child {
-              payload {
-                optional_string: "value"
-              }
-            }
-            """))
-
-  def testPrintField(self):
-    text_format.PrintField(self.field, self.value, self.out)
-    self.CompareToGoldenText(
-        self.out.getvalue(),
-        textwrap.dedent("""\
-            child {
-              payload {
-                optional_string: "value"
-              }
-            }
-            """))
-
-  def testPrintFieldValue(self):
-    text_format.PrintFieldValue(
-        self.field, self.value, self.out)
-    self.CompareToGoldenText(
-        self.out.getvalue(),
-        textwrap.dedent("""\
-            {
-              payload {
-                optional_string: "value"
-              }
-            }"""))
-
-
-class OptionalColonMessageToStringTest(unittest.TestCase):
-
-  def testForcePrintOptionalColon(self):
-    packed_message = unittest_pb2.OneString()
-    packed_message.data = 'string'
-    message = any_test_pb2.TestAny()
-    message.any_value.Pack(packed_message)
-    output = text_format.MessageToString(
-        message,
-        force_colon=True)
-    expected = ('any_value: {\n'
-                '  [type.googleapis.com/protobuf_unittest.OneString]: {\n'
-                '    data: "string"\n'
-                '  }\n'
-                '}\n')
-    self.assertEqual(expected, output)
-
-  def testPrintShortFormatRepeatedFields(self):
-    message = unittest_pb2.TestAllTypes()
-    message.repeated_int32.append(1)
-    output = text_format.MessageToString(
-        message, use_short_repeated_primitives=True, force_colon=True)
-    self.assertEqual('repeated_int32: [1]\n', output)
-
-
-if __name__ == '__main__':
-  unittest.main()
diff --git a/libs/protobuf/python/google/protobuf/internal/type_checkers.py b/libs/protobuf/python/google/protobuf/internal/type_checkers.py
deleted file mode 100644
index a53e71f..0000000
--- a/libs/protobuf/python/google/protobuf/internal/type_checkers.py
+++ /dev/null
@@ -1,435 +0,0 @@
-# Protocol Buffers - Google's data interchange format
-# Copyright 2008 Google Inc.  All rights reserved.
-# https://developers.google.com/protocol-buffers/
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-"""Provides type checking routines.
-
-This module defines type checking utilities in the forms of dictionaries:
-
-VALUE_CHECKERS: A dictionary of field types and a value validation object.
-TYPE_TO_BYTE_SIZE_FN: A dictionary with field types and a size computing
-  function.
-TYPE_TO_SERIALIZE_METHOD: A dictionary with field types and serialization
-  function.
-FIELD_TYPE_TO_WIRE_TYPE: A dictionary with field typed and their
-  corresponding wire types.
-TYPE_TO_DESERIALIZE_METHOD: A dictionary with field types and deserialization
-  function.
-"""
-
-__author__ = 'robinson@google.com (Will Robinson)'
-
-import ctypes
-import numbers
-
-from google.protobuf.internal import decoder
-from google.protobuf.internal import encoder
-from google.protobuf.internal import wire_format
-from google.protobuf import descriptor
-
-_FieldDescriptor = descriptor.FieldDescriptor
-
-
-def TruncateToFourByteFloat(original):
-  return ctypes.c_float(original).value
-
-
-def ToShortestFloat(original):
-  """Returns the shortest float that has same value in wire."""
-  # All 4 byte floats have between 6 and 9 significant digits, so we
-  # start with 6 as the lower bound.
-  # It has to be iterative because use '.9g' directly can not get rid
-  # of the noises for most values. For example if set a float_field=0.9
-  # use '.9g' will print 0.899999976.
-  precision = 6
-  rounded = float('{0:.{1}g}'.format(original, precision))
-  while TruncateToFourByteFloat(rounded) != original:
-    precision += 1
-    rounded = float('{0:.{1}g}'.format(original, precision))
-  return rounded
-
-
-def SupportsOpenEnums(field_descriptor):
-  return field_descriptor.containing_type.syntax == 'proto3'
-
-
-def GetTypeChecker(field):
-  """Returns a type checker for a message field of the specified types.
-
-  Args:
-    field: FieldDescriptor object for this field.
-
-  Returns:
-    An instance of TypeChecker which can be used to verify the types
-    of values assigned to a field of the specified type.
-  """
-  if (field.cpp_type == _FieldDescriptor.CPPTYPE_STRING and
-      field.type == _FieldDescriptor.TYPE_STRING):
-    return UnicodeValueChecker()
-  if field.cpp_type == _FieldDescriptor.CPPTYPE_ENUM:
-    if SupportsOpenEnums(field):
-      # When open enums are supported, any int32 can be assigned.
-      return _VALUE_CHECKERS[_FieldDescriptor.CPPTYPE_INT32]
-    else:
-      return EnumValueChecker(field.enum_type)
-  return _VALUE_CHECKERS[field.cpp_type]
-
-
-# None of the typecheckers below make any attempt to guard against people
-# subclassing builtin types and doing weird things.  We're not trying to
-# protect against malicious clients here, just people accidentally shooting
-# themselves in the foot in obvious ways.
-class TypeChecker(object):
-
-  """Type checker used to catch type errors as early as possible
-  when the client is setting scalar fields in protocol messages.
-  """
-
-  def __init__(self, *acceptable_types):
-    self._acceptable_types = acceptable_types
-
-  def CheckValue(self, proposed_value):
-    """Type check the provided value and return it.
-
-    The returned value might have been normalized to another type.
-    """
-    if not isinstance(proposed_value, self._acceptable_types):
-      message = ('%.1024r has type %s, but expected one of: %s' %
-                 (proposed_value, type(proposed_value), self._acceptable_types))
-      raise TypeError(message)
-    return proposed_value
-
-
-class TypeCheckerWithDefault(TypeChecker):
-
-  def __init__(self, default_value, *acceptable_types):
-    TypeChecker.__init__(self, *acceptable_types)
-    self._default_value = default_value
-
-  def DefaultValue(self):
-    return self._default_value
-
-
-class BoolValueChecker(object):
-  """Type checker used for bool fields."""
-
-  def CheckValue(self, proposed_value):
-    if not hasattr(proposed_value, '__index__') or (
-        type(proposed_value).__module__ == 'numpy' and
-        type(proposed_value).__name__ == 'ndarray'):
-      message = ('%.1024r has type %s, but expected one of: %s' %
-                 (proposed_value, type(proposed_value), (bool, int)))
-      raise TypeError(message)
-    return bool(proposed_value)
-
-  def DefaultValue(self):
-    return False
-
-
-# IntValueChecker and its subclasses perform integer type-checks
-# and bounds-checks.
-class IntValueChecker(object):
-
-  """Checker used for integer fields.  Performs type-check and range check."""
-
-  def CheckValue(self, proposed_value):
-    if not hasattr(proposed_value, '__index__') or (
-        type(proposed_value).__module__ == 'numpy' and
-        type(proposed_value).__name__ == 'ndarray'):
-      message = ('%.1024r has type %s, but expected one of: %s' %
-                 (proposed_value, type(proposed_value), (int,)))
-      raise TypeError(message)
-
-    if not self._MIN <= int(proposed_value) <= self._MAX:
-      raise ValueError('Value out of range: %d' % proposed_value)
-    # We force all values to int to make alternate implementations where the
-    # distinction is more significant (e.g. the C++ implementation) simpler.
-    proposed_value = int(proposed_value)
-    return proposed_value
-
-  def DefaultValue(self):
-    return 0
-
-
-class EnumValueChecker(object):
-
-  """Checker used for enum fields.  Performs type-check and range check."""
-
-  def __init__(self, enum_type):
-    self._enum_type = enum_type
-
-  def CheckValue(self, proposed_value):
-    if not isinstance(proposed_value, numbers.Integral):
-      message = ('%.1024r has type %s, but expected one of: %s' %
-                 (proposed_value, type(proposed_value), (int,)))
-      raise TypeError(message)
-    if int(proposed_value) not in self._enum_type.values_by_number:
-      raise ValueError('Unknown enum value: %d' % proposed_value)
-    return proposed_value
-
-  def DefaultValue(self):
-    return self._enum_type.values[0].number
-
-
-class UnicodeValueChecker(object):
-
-  """Checker used for string fields.
-
-  Always returns a unicode value, even if the input is of type str.
-  """
-
-  def CheckValue(self, proposed_value):
-    if not isinstance(proposed_value, (bytes, str)):
-      message = ('%.1024r has type %s, but expected one of: %s' %
-                 (proposed_value, type(proposed_value), (bytes, str)))
-      raise TypeError(message)
-
-    # If the value is of type 'bytes' make sure that it is valid UTF-8 data.
-    if isinstance(proposed_value, bytes):
-      try:
-        proposed_value = proposed_value.decode('utf-8')
-      except UnicodeDecodeError:
-        raise ValueError('%.1024r has type bytes, but isn\'t valid UTF-8 '
-                         'encoding. Non-UTF-8 strings must be converted to '
-                         'unicode objects before being added.' %
-                         (proposed_value))
-    else:
-      try:
-        proposed_value.encode('utf8')
-      except UnicodeEncodeError:
-        raise ValueError('%.1024r isn\'t a valid unicode string and '
-                         'can\'t be encoded in UTF-8.'%
-                         (proposed_value))
-
-    return proposed_value
-
-  def DefaultValue(self):
-    return u""
-
-
-class Int32ValueChecker(IntValueChecker):
-  # We're sure to use ints instead of longs here since comparison may be more
-  # efficient.
-  _MIN = -2147483648
-  _MAX = 2147483647
-
-
-class Uint32ValueChecker(IntValueChecker):
-  _MIN = 0
-  _MAX = (1 << 32) - 1
-
-
-class Int64ValueChecker(IntValueChecker):
-  _MIN = -(1 << 63)
-  _MAX = (1 << 63) - 1
-
-
-class Uint64ValueChecker(IntValueChecker):
-  _MIN = 0
-  _MAX = (1 << 64) - 1
-
-
-# The max 4 bytes float is about 3.4028234663852886e+38
-_FLOAT_MAX = float.fromhex('0x1.fffffep+127')
-_FLOAT_MIN = -_FLOAT_MAX
-_INF = float('inf')
-_NEG_INF = float('-inf')
-
-
-class DoubleValueChecker(object):
-  """Checker used for double fields.
-
-  Performs type-check and range check.
-  """
-
-  def CheckValue(self, proposed_value):
-    """Check and convert proposed_value to float."""
-    if (not hasattr(proposed_value, '__float__') and
-        not hasattr(proposed_value, '__index__')) or (
-            type(proposed_value).__module__ == 'numpy' and
-            type(proposed_value).__name__ == 'ndarray'):
-      message = ('%.1024r has type %s, but expected one of: int, float' %
-                 (proposed_value, type(proposed_value)))
-      raise TypeError(message)
-    return float(proposed_value)
-
-  def DefaultValue(self):
-    return 0.0
-
-
-class FloatValueChecker(DoubleValueChecker):
-  """Checker used for float fields.
-
-  Performs type-check and range check.
-
-  Values exceeding a 32-bit float will be converted to inf/-inf.
-  """
-
-  def CheckValue(self, proposed_value):
-    """Check and convert proposed_value to float."""
-    converted_value = super().CheckValue(proposed_value)
-    # This inf rounding matches the C++ proto SafeDoubleToFloat logic.
-    if converted_value > _FLOAT_MAX:
-      return _INF
-    if converted_value < _FLOAT_MIN:
-      return _NEG_INF
-
-    return TruncateToFourByteFloat(converted_value)
-
-# Type-checkers for all scalar CPPTYPEs.
-_VALUE_CHECKERS = {
-    _FieldDescriptor.CPPTYPE_INT32: Int32ValueChecker(),
-    _FieldDescriptor.CPPTYPE_INT64: Int64ValueChecker(),
-    _FieldDescriptor.CPPTYPE_UINT32: Uint32ValueChecker(),
-    _FieldDescriptor.CPPTYPE_UINT64: Uint64ValueChecker(),
-    _FieldDescriptor.CPPTYPE_DOUBLE: DoubleValueChecker(),
-    _FieldDescriptor.CPPTYPE_FLOAT: FloatValueChecker(),
-    _FieldDescriptor.CPPTYPE_BOOL: BoolValueChecker(),
-    _FieldDescriptor.CPPTYPE_STRING: TypeCheckerWithDefault(b'', bytes),
-}
-
-
-# Map from field type to a function F, such that F(field_num, value)
-# gives the total byte size for a value of the given type.  This
-# byte size includes tag information and any other additional space
-# associated with serializing "value".
-TYPE_TO_BYTE_SIZE_FN = {
-    _FieldDescriptor.TYPE_DOUBLE: wire_format.DoubleByteSize,
-    _FieldDescriptor.TYPE_FLOAT: wire_format.FloatByteSize,
-    _FieldDescriptor.TYPE_INT64: wire_format.Int64ByteSize,
-    _FieldDescriptor.TYPE_UINT64: wire_format.UInt64ByteSize,
-    _FieldDescriptor.TYPE_INT32: wire_format.Int32ByteSize,
-    _FieldDescriptor.TYPE_FIXED64: wire_format.Fixed64ByteSize,
-    _FieldDescriptor.TYPE_FIXED32: wire_format.Fixed32ByteSize,
-    _FieldDescriptor.TYPE_BOOL: wire_format.BoolByteSize,
-    _FieldDescriptor.TYPE_STRING: wire_format.StringByteSize,
-    _FieldDescriptor.TYPE_GROUP: wire_format.GroupByteSize,
-    _FieldDescriptor.TYPE_MESSAGE: wire_format.MessageByteSize,
-    _FieldDescriptor.TYPE_BYTES: wire_format.BytesByteSize,
-    _FieldDescriptor.TYPE_UINT32: wire_format.UInt32ByteSize,
-    _FieldDescriptor.TYPE_ENUM: wire_format.EnumByteSize,
-    _FieldDescriptor.TYPE_SFIXED32: wire_format.SFixed32ByteSize,
-    _FieldDescriptor.TYPE_SFIXED64: wire_format.SFixed64ByteSize,
-    _FieldDescriptor.TYPE_SINT32: wire_format.SInt32ByteSize,
-    _FieldDescriptor.TYPE_SINT64: wire_format.SInt64ByteSize
-    }
-
-
-# Maps from field types to encoder constructors.
-TYPE_TO_ENCODER = {
-    _FieldDescriptor.TYPE_DOUBLE: encoder.DoubleEncoder,
-    _FieldDescriptor.TYPE_FLOAT: encoder.FloatEncoder,
-    _FieldDescriptor.TYPE_INT64: encoder.Int64Encoder,
-    _FieldDescriptor.TYPE_UINT64: encoder.UInt64Encoder,
-    _FieldDescriptor.TYPE_INT32: encoder.Int32Encoder,
-    _FieldDescriptor.TYPE_FIXED64: encoder.Fixed64Encoder,
-    _FieldDescriptor.TYPE_FIXED32: encoder.Fixed32Encoder,
-    _FieldDescriptor.TYPE_BOOL: encoder.BoolEncoder,
-    _FieldDescriptor.TYPE_STRING: encoder.StringEncoder,
-    _FieldDescriptor.TYPE_GROUP: encoder.GroupEncoder,
-    _FieldDescriptor.TYPE_MESSAGE: encoder.MessageEncoder,
-    _FieldDescriptor.TYPE_BYTES: encoder.BytesEncoder,
-    _FieldDescriptor.TYPE_UINT32: encoder.UInt32Encoder,
-    _FieldDescriptor.TYPE_ENUM: encoder.EnumEncoder,
-    _FieldDescriptor.TYPE_SFIXED32: encoder.SFixed32Encoder,
-    _FieldDescriptor.TYPE_SFIXED64: encoder.SFixed64Encoder,
-    _FieldDescriptor.TYPE_SINT32: encoder.SInt32Encoder,
-    _FieldDescriptor.TYPE_SINT64: encoder.SInt64Encoder,
-    }
-
-
-# Maps from field types to sizer constructors.
-TYPE_TO_SIZER = {
-    _FieldDescriptor.TYPE_DOUBLE: encoder.DoubleSizer,
-    _FieldDescriptor.TYPE_FLOAT: encoder.FloatSizer,
-    _FieldDescriptor.TYPE_INT64: encoder.Int64Sizer,
-    _FieldDescriptor.TYPE_UINT64: encoder.UInt64Sizer,
-    _FieldDescriptor.TYPE_INT32: encoder.Int32Sizer,
-    _FieldDescriptor.TYPE_FIXED64: encoder.Fixed64Sizer,
-    _FieldDescriptor.TYPE_FIXED32: encoder.Fixed32Sizer,
-    _FieldDescriptor.TYPE_BOOL: encoder.BoolSizer,
-    _FieldDescriptor.TYPE_STRING: encoder.StringSizer,
-    _FieldDescriptor.TYPE_GROUP: encoder.GroupSizer,
-    _FieldDescriptor.TYPE_MESSAGE: encoder.MessageSizer,
-    _FieldDescriptor.TYPE_BYTES: encoder.BytesSizer,
-    _FieldDescriptor.TYPE_UINT32: encoder.UInt32Sizer,
-    _FieldDescriptor.TYPE_ENUM: encoder.EnumSizer,
-    _FieldDescriptor.TYPE_SFIXED32: encoder.SFixed32Sizer,
-    _FieldDescriptor.TYPE_SFIXED64: encoder.SFixed64Sizer,
-    _FieldDescriptor.TYPE_SINT32: encoder.SInt32Sizer,
-    _FieldDescriptor.TYPE_SINT64: encoder.SInt64Sizer,
-    }
-
-
-# Maps from field type to a decoder constructor.
-TYPE_TO_DECODER = {
-    _FieldDescriptor.TYPE_DOUBLE: decoder.DoubleDecoder,
-    _FieldDescriptor.TYPE_FLOAT: decoder.FloatDecoder,
-    _FieldDescriptor.TYPE_INT64: decoder.Int64Decoder,
-    _FieldDescriptor.TYPE_UINT64: decoder.UInt64Decoder,
-    _FieldDescriptor.TYPE_INT32: decoder.Int32Decoder,
-    _FieldDescriptor.TYPE_FIXED64: decoder.Fixed64Decoder,
-    _FieldDescriptor.TYPE_FIXED32: decoder.Fixed32Decoder,
-    _FieldDescriptor.TYPE_BOOL: decoder.BoolDecoder,
-    _FieldDescriptor.TYPE_STRING: decoder.StringDecoder,
-    _FieldDescriptor.TYPE_GROUP: decoder.GroupDecoder,
-    _FieldDescriptor.TYPE_MESSAGE: decoder.MessageDecoder,
-    _FieldDescriptor.TYPE_BYTES: decoder.BytesDecoder,
-    _FieldDescriptor.TYPE_UINT32: decoder.UInt32Decoder,
-    _FieldDescriptor.TYPE_ENUM: decoder.EnumDecoder,
-    _FieldDescriptor.TYPE_SFIXED32: decoder.SFixed32Decoder,
-    _FieldDescriptor.TYPE_SFIXED64: decoder.SFixed64Decoder,
-    _FieldDescriptor.TYPE_SINT32: decoder.SInt32Decoder,
-    _FieldDescriptor.TYPE_SINT64: decoder.SInt64Decoder,
-    }
-
-# Maps from field type to expected wiretype.
-FIELD_TYPE_TO_WIRE_TYPE = {
-    _FieldDescriptor.TYPE_DOUBLE: wire_format.WIRETYPE_FIXED64,
-    _FieldDescriptor.TYPE_FLOAT: wire_format.WIRETYPE_FIXED32,
-    _FieldDescriptor.TYPE_INT64: wire_format.WIRETYPE_VARINT,
-    _FieldDescriptor.TYPE_UINT64: wire_format.WIRETYPE_VARINT,
-    _FieldDescriptor.TYPE_INT32: wire_format.WIRETYPE_VARINT,
-    _FieldDescriptor.TYPE_FIXED64: wire_format.WIRETYPE_FIXED64,
-    _FieldDescriptor.TYPE_FIXED32: wire_format.WIRETYPE_FIXED32,
-    _FieldDescriptor.TYPE_BOOL: wire_format.WIRETYPE_VARINT,
-    _FieldDescriptor.TYPE_STRING:
-      wire_format.WIRETYPE_LENGTH_DELIMITED,
-    _FieldDescriptor.TYPE_GROUP: wire_format.WIRETYPE_START_GROUP,
-    _FieldDescriptor.TYPE_MESSAGE:
-      wire_format.WIRETYPE_LENGTH_DELIMITED,
-    _FieldDescriptor.TYPE_BYTES:
-      wire_format.WIRETYPE_LENGTH_DELIMITED,
-    _FieldDescriptor.TYPE_UINT32: wire_format.WIRETYPE_VARINT,
-    _FieldDescriptor.TYPE_ENUM: wire_format.WIRETYPE_VARINT,
-    _FieldDescriptor.TYPE_SFIXED32: wire_format.WIRETYPE_FIXED32,
-    _FieldDescriptor.TYPE_SFIXED64: wire_format.WIRETYPE_FIXED64,
-    _FieldDescriptor.TYPE_SINT32: wire_format.WIRETYPE_VARINT,
-    _FieldDescriptor.TYPE_SINT64: wire_format.WIRETYPE_VARINT,
-    }
diff --git a/libs/protobuf/python/google/protobuf/internal/unknown_fields_test.py b/libs/protobuf/python/google/protobuf/internal/unknown_fields_test.py
deleted file mode 100644
index 64a0367..0000000
--- a/libs/protobuf/python/google/protobuf/internal/unknown_fields_test.py
+++ /dev/null
@@ -1,461 +0,0 @@
-# -*- coding: utf-8 -*-
-# Protocol Buffers - Google's data interchange format
-# Copyright 2008 Google Inc.  All rights reserved.
-# https://developers.google.com/protocol-buffers/
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-"""Test for preservation of unknown fields in the pure Python implementation."""
-
-__author__ = 'bohdank@google.com (Bohdan Koval)'
-
-import sys
-import unittest
-
-from google.protobuf import map_unittest_pb2
-from google.protobuf import unittest_mset_pb2
-from google.protobuf import unittest_pb2
-from google.protobuf import unittest_proto3_arena_pb2
-from google.protobuf.internal import api_implementation
-from google.protobuf.internal import encoder
-from google.protobuf.internal import message_set_extensions_pb2
-from google.protobuf.internal import missing_enum_values_pb2
-from google.protobuf.internal import test_util
-from google.protobuf.internal import testing_refleaks
-from google.protobuf.internal import type_checkers
-from google.protobuf.internal import wire_format
-from google.protobuf import descriptor
-from google.protobuf import unknown_fields
-try:
-  import tracemalloc  # pylint: disable=g-import-not-at-top
-except ImportError:
-  # Requires python 3.4+
-  pass
-
-
-@testing_refleaks.TestCase
-class UnknownFieldsTest(unittest.TestCase):
-
-  def setUp(self):
-    self.descriptor = unittest_pb2.TestAllTypes.DESCRIPTOR
-    self.all_fields = unittest_pb2.TestAllTypes()
-    test_util.SetAllFields(self.all_fields)
-    self.all_fields_data = self.all_fields.SerializeToString()
-    self.empty_message = unittest_pb2.TestEmptyMessage()
-    self.empty_message.ParseFromString(self.all_fields_data)
-
-  def testSerialize(self):
-    data = self.empty_message.SerializeToString()
-
-    # Don't use assertEqual because we don't want to dump raw binary data to
-    # stdout.
-    self.assertTrue(data == self.all_fields_data)
-
-  def testSerializeProto3(self):
-    # Verify proto3 unknown fields behavior.
-    message = unittest_proto3_arena_pb2.TestEmptyMessage()
-    message.ParseFromString(self.all_fields_data)
-    self.assertEqual(self.all_fields_data, message.SerializeToString())
-
-  def testByteSize(self):
-    self.assertEqual(self.all_fields.ByteSize(), self.empty_message.ByteSize())
-
-  def testListFields(self):
-    # Make sure ListFields doesn't return unknown fields.
-    self.assertEqual(0, len(self.empty_message.ListFields()))
-
-  def testSerializeMessageSetWireFormatUnknownExtension(self):
-    # Create a message using the message set wire format with an unknown
-    # message.
-    raw = unittest_mset_pb2.RawMessageSet()
-
-    # Add an unknown extension.
-    item = raw.item.add()
-    item.type_id = 98218603
-    message1 = message_set_extensions_pb2.TestMessageSetExtension1()
-    message1.i = 12345
-    item.message = message1.SerializeToString()
-
-    serialized = raw.SerializeToString()
-
-    # Parse message using the message set wire format.
-    proto = message_set_extensions_pb2.TestMessageSet()
-    proto.MergeFromString(serialized)
-
-    unknown_field_set = unknown_fields.UnknownFieldSet(proto)
-    self.assertEqual(len(unknown_field_set), 1)
-    # Unknown field should have wire format data which can be parsed back to
-    # original message.
-    self.assertEqual(unknown_field_set[0].field_number, item.type_id)
-    self.assertEqual(unknown_field_set[0].wire_type,
-                     wire_format.WIRETYPE_LENGTH_DELIMITED)
-    d = unknown_field_set[0].data
-    message_new = message_set_extensions_pb2.TestMessageSetExtension1()
-    message_new.ParseFromString(d)
-    self.assertEqual(message1, message_new)
-
-    # Verify that the unknown extension is serialized unchanged
-    reserialized = proto.SerializeToString()
-    new_raw = unittest_mset_pb2.RawMessageSet()
-    new_raw.MergeFromString(reserialized)
-    self.assertEqual(raw, new_raw)
-
-  def testEquals(self):
-    message = unittest_pb2.TestEmptyMessage()
-    message.ParseFromString(self.all_fields_data)
-    self.assertEqual(self.empty_message, message)
-
-    self.all_fields.ClearField('optional_string')
-    message.ParseFromString(self.all_fields.SerializeToString())
-    self.assertNotEqual(self.empty_message, message)
-
-  def testDiscardUnknownFields(self):
-    self.empty_message.DiscardUnknownFields()
-    self.assertEqual(b'', self.empty_message.SerializeToString())
-    # Test message field and repeated message field.
-    message = unittest_pb2.TestAllTypes()
-    other_message = unittest_pb2.TestAllTypes()
-    other_message.optional_string = 'discard'
-    message.optional_nested_message.ParseFromString(
-        other_message.SerializeToString())
-    message.repeated_nested_message.add().ParseFromString(
-        other_message.SerializeToString())
-    self.assertNotEqual(
-        b'', message.optional_nested_message.SerializeToString())
-    self.assertNotEqual(
-        b'', message.repeated_nested_message[0].SerializeToString())
-    message.DiscardUnknownFields()
-    self.assertEqual(b'', message.optional_nested_message.SerializeToString())
-    self.assertEqual(
-        b'', message.repeated_nested_message[0].SerializeToString())
-
-    msg = map_unittest_pb2.TestMap()
-    msg.map_int32_all_types[1].optional_nested_message.ParseFromString(
-        other_message.SerializeToString())
-    msg.map_string_string['1'] = 'test'
-    self.assertNotEqual(
-        b'',
-        msg.map_int32_all_types[1].optional_nested_message.SerializeToString())
-    msg.DiscardUnknownFields()
-    self.assertEqual(
-        b'',
-        msg.map_int32_all_types[1].optional_nested_message.SerializeToString())
-
-
-@testing_refleaks.TestCase
-class UnknownFieldsAccessorsTest(unittest.TestCase):
-
-  def setUp(self):
-    self.descriptor = unittest_pb2.TestAllTypes.DESCRIPTOR
-    self.all_fields = unittest_pb2.TestAllTypes()
-    test_util.SetAllFields(self.all_fields)
-    self.all_fields_data = self.all_fields.SerializeToString()
-    self.empty_message = unittest_pb2.TestEmptyMessage()
-    self.empty_message.ParseFromString(self.all_fields_data)
-
-  # InternalCheckUnknownField() is an additional Pure Python check which checks
-  # a detail of unknown fields. It cannot be used by the C++
-  # implementation because some protect members are called.
-  # The test is added for historical reasons. It is not necessary as
-  # serialized string is checked.
-  # TODO(jieluo): Remove message._unknown_fields.
-  def InternalCheckUnknownField(self, name, expected_value):
-    if api_implementation.Type() != 'python':
-      return
-    field_descriptor = self.descriptor.fields_by_name[name]
-    wire_type = type_checkers.FIELD_TYPE_TO_WIRE_TYPE[field_descriptor.type]
-    field_tag = encoder.TagBytes(field_descriptor.number, wire_type)
-    result_dict = {}
-    for tag_bytes, value in self.empty_message._unknown_fields:
-      if tag_bytes == field_tag:
-        decoder = unittest_pb2.TestAllTypes._decoders_by_tag[tag_bytes][0]
-        decoder(memoryview(value), 0, len(value), self.all_fields, result_dict)
-    self.assertEqual(expected_value, result_dict[field_descriptor])
-
-  def CheckUnknownField(self, name, unknown_field_set, expected_value):
-    field_descriptor = self.descriptor.fields_by_name[name]
-    expected_type = type_checkers.FIELD_TYPE_TO_WIRE_TYPE[
-        field_descriptor.type]
-    for unknown_field in unknown_field_set:
-      if unknown_field.field_number == field_descriptor.number:
-        self.assertEqual(expected_type, unknown_field.wire_type)
-        if expected_type == 3:
-          # Check group
-          self.assertEqual(expected_value[0],
-                           unknown_field.data[0].field_number)
-          self.assertEqual(expected_value[1], unknown_field.data[0].wire_type)
-          self.assertEqual(expected_value[2], unknown_field.data[0].data)
-          continue
-        if expected_type == wire_format.WIRETYPE_LENGTH_DELIMITED:
-          self.assertIn(type(unknown_field.data), (str, bytes))
-        if field_descriptor.label == descriptor.FieldDescriptor.LABEL_REPEATED:
-          self.assertIn(unknown_field.data, expected_value)
-        else:
-          self.assertEqual(expected_value, unknown_field.data)
-
-  def testCheckUnknownFieldValue(self):
-    unknown_field_set = unknown_fields.UnknownFieldSet(self.empty_message)
-    # Test enum.
-    self.CheckUnknownField('optional_nested_enum',
-                           unknown_field_set,
-                           self.all_fields.optional_nested_enum)
-    self.InternalCheckUnknownField('optional_nested_enum',
-                                   self.all_fields.optional_nested_enum)
-
-    # Test repeated enum.
-    self.CheckUnknownField('repeated_nested_enum',
-                           unknown_field_set,
-                           self.all_fields.repeated_nested_enum)
-    self.InternalCheckUnknownField('repeated_nested_enum',
-                                   self.all_fields.repeated_nested_enum)
-
-    # Test varint.
-    self.CheckUnknownField('optional_int32',
-                           unknown_field_set,
-                           self.all_fields.optional_int32)
-    self.InternalCheckUnknownField('optional_int32',
-                                   self.all_fields.optional_int32)
-
-    # Test fixed32.
-    self.CheckUnknownField('optional_fixed32',
-                           unknown_field_set,
-                           self.all_fields.optional_fixed32)
-    self.InternalCheckUnknownField('optional_fixed32',
-                                   self.all_fields.optional_fixed32)
-
-    # Test fixed64.
-    self.CheckUnknownField('optional_fixed64',
-                           unknown_field_set,
-                           self.all_fields.optional_fixed64)
-    self.InternalCheckUnknownField('optional_fixed64',
-                                   self.all_fields.optional_fixed64)
-
-    # Test length delimited.
-    self.CheckUnknownField('optional_string',
-                           unknown_field_set,
-                           self.all_fields.optional_string.encode('utf-8'))
-    self.InternalCheckUnknownField('optional_string',
-                                   self.all_fields.optional_string)
-
-    # Test group.
-    self.CheckUnknownField('optionalgroup',
-                           unknown_field_set,
-                           (17, 0, 117))
-    self.InternalCheckUnknownField('optionalgroup',
-                                   self.all_fields.optionalgroup)
-
-    self.assertEqual(98, len(unknown_field_set))
-
-  def testCopyFrom(self):
-    message = unittest_pb2.TestEmptyMessage()
-    message.CopyFrom(self.empty_message)
-    self.assertEqual(message.SerializeToString(), self.all_fields_data)
-
-  def testMergeFrom(self):
-    message = unittest_pb2.TestAllTypes()
-    message.optional_int32 = 1
-    message.optional_uint32 = 2
-    source = unittest_pb2.TestEmptyMessage()
-    source.ParseFromString(message.SerializeToString())
-
-    message.ClearField('optional_int32')
-    message.optional_int64 = 3
-    message.optional_uint32 = 4
-    destination = unittest_pb2.TestEmptyMessage()
-    unknown_field_set = unknown_fields.UnknownFieldSet(destination)
-    self.assertEqual(0, len(unknown_field_set))
-    destination.ParseFromString(message.SerializeToString())
-    self.assertEqual(0, len(unknown_field_set))
-    unknown_field_set = unknown_fields.UnknownFieldSet(destination)
-    self.assertEqual(2, len(unknown_field_set))
-    destination.MergeFrom(source)
-    self.assertEqual(2, len(unknown_field_set))
-    # Check that the fields where correctly merged, even stored in the unknown
-    # fields set.
-    message.ParseFromString(destination.SerializeToString())
-    self.assertEqual(message.optional_int32, 1)
-    self.assertEqual(message.optional_uint32, 2)
-    self.assertEqual(message.optional_int64, 3)
-
-  def testClear(self):
-    unknown_field_set = unknown_fields.UnknownFieldSet(self.empty_message)
-    self.empty_message.Clear()
-    # All cleared, even unknown fields.
-    self.assertEqual(self.empty_message.SerializeToString(), b'')
-    self.assertEqual(len(unknown_field_set), 98)
-
-  @unittest.skipIf((sys.version_info.major, sys.version_info.minor) < (3, 4),
-                   'tracemalloc requires python 3.4+')
-  def testUnknownFieldsNoMemoryLeak(self):
-    # Call to UnknownFields must not leak memory
-    nb_leaks = 1234
-
-    def leaking_function():
-      for _ in range(nb_leaks):
-        unknown_fields.UnknownFieldSet(self.empty_message)
-
-    tracemalloc.start()
-    snapshot1 = tracemalloc.take_snapshot()
-    leaking_function()
-    snapshot2 = tracemalloc.take_snapshot()
-    top_stats = snapshot2.compare_to(snapshot1, 'lineno')
-    tracemalloc.stop()
-    # There's no easy way to look for a precise leak source.
-    # Rely on a "marker" count value while checking allocated memory.
-    self.assertEqual([], [x for x in top_stats if x.count_diff == nb_leaks])
-
-  def testSubUnknownFields(self):
-    message = unittest_pb2.TestAllTypes()
-    message.optionalgroup.a = 123
-    destination = unittest_pb2.TestEmptyMessage()
-    destination.ParseFromString(message.SerializeToString())
-    sub_unknown_fields = unknown_fields.UnknownFieldSet(destination)[0].data
-    self.assertEqual(1, len(sub_unknown_fields))
-    self.assertEqual(sub_unknown_fields[0].data, 123)
-    destination.Clear()
-    self.assertEqual(1, len(sub_unknown_fields))
-    self.assertEqual(sub_unknown_fields[0].data, 123)
-    message.Clear()
-    message.optional_uint32 = 456
-    nested_message = unittest_pb2.NestedTestAllTypes()
-    nested_message.payload.optional_nested_message.ParseFromString(
-        message.SerializeToString())
-    unknown_field_set = unknown_fields.UnknownFieldSet(
-        nested_message.payload.optional_nested_message)
-    self.assertEqual(unknown_field_set[0].data, 456)
-    nested_message.ClearField('payload')
-    self.assertEqual(unknown_field_set[0].data, 456)
-    unknown_field_set = unknown_fields.UnknownFieldSet(
-        nested_message.payload.optional_nested_message)
-    self.assertEqual(0, len(unknown_field_set))
-
-  def testUnknownField(self):
-    message = unittest_pb2.TestAllTypes()
-    message.optional_int32 = 123
-    destination = unittest_pb2.TestEmptyMessage()
-    destination.ParseFromString(message.SerializeToString())
-    unknown_field = unknown_fields.UnknownFieldSet(destination)[0]
-    destination.Clear()
-    self.assertEqual(unknown_field.data, 123)
-
-  def testUnknownExtensions(self):
-    message = unittest_pb2.TestEmptyMessageWithExtensions()
-    message.ParseFromString(self.all_fields_data)
-    self.assertEqual(len(unknown_fields.UnknownFieldSet(message)), 98)
-    self.assertEqual(message.SerializeToString(), self.all_fields_data)
-
-
-@testing_refleaks.TestCase
-class UnknownEnumValuesTest(unittest.TestCase):
-
-  def setUp(self):
-    self.descriptor = missing_enum_values_pb2.TestEnumValues.DESCRIPTOR
-
-    self.message = missing_enum_values_pb2.TestEnumValues()
-    # TestEnumValues.ZERO = 0, but does not exist in the other NestedEnum.
-    self.message.optional_nested_enum = (
-        missing_enum_values_pb2.TestEnumValues.ZERO)
-    self.message.repeated_nested_enum.extend([
-        missing_enum_values_pb2.TestEnumValues.ZERO,
-        missing_enum_values_pb2.TestEnumValues.ONE,
-        ])
-    self.message.packed_nested_enum.extend([
-        missing_enum_values_pb2.TestEnumValues.ZERO,
-        missing_enum_values_pb2.TestEnumValues.ONE,
-        ])
-    self.message_data = self.message.SerializeToString()
-    self.missing_message = missing_enum_values_pb2.TestMissingEnumValues()
-    self.missing_message.ParseFromString(self.message_data)
-
-  # CheckUnknownField() is an additional Pure Python check which checks
-  # a detail of unknown fields. It cannot be used by the C++
-  # implementation because some protect members are called.
-  # The test is added for historical reasons. It is not necessary as
-  # serialized string is checked.
-
-  def CheckUnknownField(self, name, expected_value):
-    field_descriptor = self.descriptor.fields_by_name[name]
-    unknown_field_set = unknown_fields.UnknownFieldSet(self.missing_message)
-    self.assertIsInstance(unknown_field_set, unknown_fields.UnknownFieldSet)
-    count = 0
-    for field in unknown_field_set:
-      if field.field_number == field_descriptor.number:
-        count += 1
-        if field_descriptor.label == descriptor.FieldDescriptor.LABEL_REPEATED:
-          self.assertIn(field.data, expected_value)
-        else:
-          self.assertEqual(expected_value, field.data)
-    if field_descriptor.label == descriptor.FieldDescriptor.LABEL_REPEATED:
-      self.assertEqual(count, len(expected_value))
-    else:
-      self.assertEqual(count, 1)
-
-  def testUnknownParseMismatchEnumValue(self):
-    just_string = missing_enum_values_pb2.JustString()
-    just_string.dummy = 'blah'
-
-    missing = missing_enum_values_pb2.TestEnumValues()
-    # The parse is invalid, storing the string proto into the set of
-    # unknown fields.
-    missing.ParseFromString(just_string.SerializeToString())
-
-    # Fetching the enum field shouldn't crash, instead returning the
-    # default value.
-    self.assertEqual(missing.optional_nested_enum, 0)
-
-  def testUnknownEnumValue(self):
-    self.assertFalse(self.missing_message.HasField('optional_nested_enum'))
-    self.assertEqual(self.missing_message.optional_nested_enum, 2)
-    # Clear does not do anything.
-    serialized = self.missing_message.SerializeToString()
-    self.missing_message.ClearField('optional_nested_enum')
-    self.assertEqual(self.missing_message.SerializeToString(), serialized)
-
-  def testUnknownRepeatedEnumValue(self):
-    self.assertEqual([], self.missing_message.repeated_nested_enum)
-
-  def testUnknownPackedEnumValue(self):
-    self.assertEqual([], self.missing_message.packed_nested_enum)
-
-  def testCheckUnknownFieldValueForEnum(self):
-    unknown_field_set = unknown_fields.UnknownFieldSet(self.missing_message)
-    self.assertEqual(len(unknown_field_set), 5)
-    self.CheckUnknownField('optional_nested_enum',
-                           self.message.optional_nested_enum)
-    self.CheckUnknownField('repeated_nested_enum',
-                           self.message.repeated_nested_enum)
-    self.CheckUnknownField('packed_nested_enum',
-                           self.message.packed_nested_enum)
-
-  def testRoundTrip(self):
-    new_message = missing_enum_values_pb2.TestEnumValues()
-    new_message.ParseFromString(self.missing_message.SerializeToString())
-    self.assertEqual(self.message, new_message)
-
-
-if __name__ == '__main__':
-  unittest.main()
diff --git a/libs/protobuf/python/google/protobuf/internal/well_known_types.py b/libs/protobuf/python/google/protobuf/internal/well_known_types.py
deleted file mode 100644
index 8881d75..0000000
--- a/libs/protobuf/python/google/protobuf/internal/well_known_types.py
+++ /dev/null
@@ -1,880 +0,0 @@
-# Protocol Buffers - Google's data interchange format
-# Copyright 2008 Google Inc.  All rights reserved.
-# https://developers.google.com/protocol-buffers/
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-"""Contains well known classes.
-
-This files defines well known classes which need extra maintenance including:
-  - Any
-  - Duration
-  - FieldMask
-  - Struct
-  - Timestamp
-"""
-
-__author__ = 'jieluo@google.com (Jie Luo)'
-
-import calendar
-import collections.abc
-import datetime
-
-from google.protobuf.descriptor import FieldDescriptor
-
-_TIMESTAMPFOMAT = '%Y-%m-%dT%H:%M:%S'
-_NANOS_PER_SECOND = 1000000000
-_NANOS_PER_MILLISECOND = 1000000
-_NANOS_PER_MICROSECOND = 1000
-_MILLIS_PER_SECOND = 1000
-_MICROS_PER_SECOND = 1000000
-_SECONDS_PER_DAY = 24 * 3600
-_DURATION_SECONDS_MAX = 315576000000
-
-
-class Any(object):
-  """Class for Any Message type."""
-
-  __slots__ = ()
-
-  def Pack(self, msg, type_url_prefix='type.googleapis.com/',
-           deterministic=None):
-    """Packs the specified message into current Any message."""
-    if len(type_url_prefix) < 1 or type_url_prefix[-1] != '/':
-      self.type_url = '%s/%s' % (type_url_prefix, msg.DESCRIPTOR.full_name)
-    else:
-      self.type_url = '%s%s' % (type_url_prefix, msg.DESCRIPTOR.full_name)
-    self.value = msg.SerializeToString(deterministic=deterministic)
-
-  def Unpack(self, msg):
-    """Unpacks the current Any message into specified message."""
-    descriptor = msg.DESCRIPTOR
-    if not self.Is(descriptor):
-      return False
-    msg.ParseFromString(self.value)
-    return True
-
-  def TypeName(self):
-    """Returns the protobuf type name of the inner message."""
-    # Only last part is to be used: b/25630112
-    return self.type_url.split('/')[-1]
-
-  def Is(self, descriptor):
-    """Checks if this Any represents the given protobuf type."""
-    return '/' in self.type_url and self.TypeName() == descriptor.full_name
-
-
-_EPOCH_DATETIME_NAIVE = datetime.datetime.utcfromtimestamp(0)
-_EPOCH_DATETIME_AWARE = datetime.datetime.fromtimestamp(
-    0, tz=datetime.timezone.utc)
-
-
-class Timestamp(object):
-  """Class for Timestamp message type."""
-
-  __slots__ = ()
-
-  def ToJsonString(self):
-    """Converts Timestamp to RFC 3339 date string format.
-
-    Returns:
-      A string converted from timestamp. The string is always Z-normalized
-      and uses 3, 6 or 9 fractional digits as required to represent the
-      exact time. Example of the return format: '1972-01-01T10:00:20.021Z'
-    """
-    nanos = self.nanos % _NANOS_PER_SECOND
-    total_sec = self.seconds + (self.nanos - nanos) // _NANOS_PER_SECOND
-    seconds = total_sec % _SECONDS_PER_DAY
-    days = (total_sec - seconds) // _SECONDS_PER_DAY
-    dt = datetime.datetime(1970, 1, 1) + datetime.timedelta(days, seconds)
-
-    result = dt.isoformat()
-    if (nanos % 1e9) == 0:
-      # If there are 0 fractional digits, the fractional
-      # point '.' should be omitted when serializing.
-      return result + 'Z'
-    if (nanos % 1e6) == 0:
-      # Serialize 3 fractional digits.
-      return result + '.%03dZ' % (nanos / 1e6)
-    if (nanos % 1e3) == 0:
-      # Serialize 6 fractional digits.
-      return result + '.%06dZ' % (nanos / 1e3)
-    # Serialize 9 fractional digits.
-    return result + '.%09dZ' % nanos
-
-  def FromJsonString(self, value):
-    """Parse a RFC 3339 date string format to Timestamp.
-
-    Args:
-      value: A date string. Any fractional digits (or none) and any offset are
-          accepted as long as they fit into nano-seconds precision.
-          Example of accepted format: '1972-01-01T10:00:20.021-05:00'
-
-    Raises:
-      ValueError: On parsing problems.
-    """
-    if not isinstance(value, str):
-      raise ValueError('Timestamp JSON value not a string: {!r}'.format(value))
-    timezone_offset = value.find('Z')
-    if timezone_offset == -1:
-      timezone_offset = value.find('+')
-    if timezone_offset == -1:
-      timezone_offset = value.rfind('-')
-    if timezone_offset == -1:
-      raise ValueError(
-          'Failed to parse timestamp: missing valid timezone offset.')
-    time_value = value[0:timezone_offset]
-    # Parse datetime and nanos.
-    point_position = time_value.find('.')
-    if point_position == -1:
-      second_value = time_value
-      nano_value = ''
-    else:
-      second_value = time_value[:point_position]
-      nano_value = time_value[point_position + 1:]
-    if 't' in second_value:
-      raise ValueError(
-          'time data \'{0}\' does not match format \'%Y-%m-%dT%H:%M:%S\', '
-          'lowercase \'t\' is not accepted'.format(second_value))
-    date_object = datetime.datetime.strptime(second_value, _TIMESTAMPFOMAT)
-    td = date_object - datetime.datetime(1970, 1, 1)
-    seconds = td.seconds + td.days * _SECONDS_PER_DAY
-    if len(nano_value) > 9:
-      raise ValueError(
-          'Failed to parse Timestamp: nanos {0} more than '
-          '9 fractional digits.'.format(nano_value))
-    if nano_value:
-      nanos = round(float('0.' + nano_value) * 1e9)
-    else:
-      nanos = 0
-    # Parse timezone offsets.
-    if value[timezone_offset] == 'Z':
-      if len(value) != timezone_offset + 1:
-        raise ValueError('Failed to parse timestamp: invalid trailing'
-                         ' data {0}.'.format(value))
-    else:
-      timezone = value[timezone_offset:]
-      pos = timezone.find(':')
-      if pos == -1:
-        raise ValueError(
-            'Invalid timezone offset value: {0}.'.format(timezone))
-      if timezone[0] == '+':
-        seconds -= (int(timezone[1:pos])*60+int(timezone[pos+1:]))*60
-      else:
-        seconds += (int(timezone[1:pos])*60+int(timezone[pos+1:]))*60
-    # Set seconds and nanos
-    self.seconds = int(seconds)
-    self.nanos = int(nanos)
-
-  def GetCurrentTime(self):
-    """Get the current UTC into Timestamp."""
-    self.FromDatetime(datetime.datetime.utcnow())
-
-  def ToNanoseconds(self):
-    """Converts Timestamp to nanoseconds since epoch."""
-    return self.seconds * _NANOS_PER_SECOND + self.nanos
-
-  def ToMicroseconds(self):
-    """Converts Timestamp to microseconds since epoch."""
-    return (self.seconds * _MICROS_PER_SECOND +
-            self.nanos // _NANOS_PER_MICROSECOND)
-
-  def ToMilliseconds(self):
-    """Converts Timestamp to milliseconds since epoch."""
-    return (self.seconds * _MILLIS_PER_SECOND +
-            self.nanos // _NANOS_PER_MILLISECOND)
-
-  def ToSeconds(self):
-    """Converts Timestamp to seconds since epoch."""
-    return self.seconds
-
-  def FromNanoseconds(self, nanos):
-    """Converts nanoseconds since epoch to Timestamp."""
-    self.seconds = nanos // _NANOS_PER_SECOND
-    self.nanos = nanos % _NANOS_PER_SECOND
-
-  def FromMicroseconds(self, micros):
-    """Converts microseconds since epoch to Timestamp."""
-    self.seconds = micros // _MICROS_PER_SECOND
-    self.nanos = (micros % _MICROS_PER_SECOND) * _NANOS_PER_MICROSECOND
-
-  def FromMilliseconds(self, millis):
-    """Converts milliseconds since epoch to Timestamp."""
-    self.seconds = millis // _MILLIS_PER_SECOND
-    self.nanos = (millis % _MILLIS_PER_SECOND) * _NANOS_PER_MILLISECOND
-
-  def FromSeconds(self, seconds):
-    """Converts seconds since epoch to Timestamp."""
-    self.seconds = seconds
-    self.nanos = 0
-
-  def ToDatetime(self, tzinfo=None):
-    """Converts Timestamp to a datetime.
-
-    Args:
-      tzinfo: A datetime.tzinfo subclass; defaults to None.
-
-    Returns:
-      If tzinfo is None, returns a timezone-naive UTC datetime (with no timezone
-      information, i.e. not aware that it's UTC).
-
-      Otherwise, returns a timezone-aware datetime in the input timezone.
-    """
-    delta = datetime.timedelta(
-        seconds=self.seconds,
-        microseconds=_RoundTowardZero(self.nanos, _NANOS_PER_MICROSECOND))
-    if tzinfo is None:
-      return _EPOCH_DATETIME_NAIVE + delta
-    else:
-      return _EPOCH_DATETIME_AWARE.astimezone(tzinfo) + delta
-
-  def FromDatetime(self, dt):
-    """Converts datetime to Timestamp.
-
-    Args:
-      dt: A datetime. If it's timezone-naive, it's assumed to be in UTC.
-    """
-    # Using this guide: http://wiki.python.org/moin/WorkingWithTime
-    # And this conversion guide: http://docs.python.org/library/time.html
-
-    # Turn the date parameter into a tuple (struct_time) that can then be
-    # manipulated into a long value of seconds.  During the conversion from
-    # struct_time to long, the source date in UTC, and so it follows that the
-    # correct transformation is calendar.timegm()
-    self.seconds = calendar.timegm(dt.utctimetuple())
-    self.nanos = dt.microsecond * _NANOS_PER_MICROSECOND
-
-
-class Duration(object):
-  """Class for Duration message type."""
-
-  __slots__ = ()
-
-  def ToJsonString(self):
-    """Converts Duration to string format.
-
-    Returns:
-      A string converted from self. The string format will contains
-      3, 6, or 9 fractional digits depending on the precision required to
-      represent the exact Duration value. For example: "1s", "1.010s",
-      "1.000000100s", "-3.100s"
-    """
-    _CheckDurationValid(self.seconds, self.nanos)
-    if self.seconds < 0 or self.nanos < 0:
-      result = '-'
-      seconds = - self.seconds + int((0 - self.nanos) // 1e9)
-      nanos = (0 - self.nanos) % 1e9
-    else:
-      result = ''
-      seconds = self.seconds + int(self.nanos // 1e9)
-      nanos = self.nanos % 1e9
-    result += '%d' % seconds
-    if (nanos % 1e9) == 0:
-      # If there are 0 fractional digits, the fractional
-      # point '.' should be omitted when serializing.
-      return result + 's'
-    if (nanos % 1e6) == 0:
-      # Serialize 3 fractional digits.
-      return result + '.%03ds' % (nanos / 1e6)
-    if (nanos % 1e3) == 0:
-      # Serialize 6 fractional digits.
-      return result + '.%06ds' % (nanos / 1e3)
-    # Serialize 9 fractional digits.
-    return result + '.%09ds' % nanos
-
-  def FromJsonString(self, value):
-    """Converts a string to Duration.
-
-    Args:
-      value: A string to be converted. The string must end with 's'. Any
-          fractional digits (or none) are accepted as long as they fit into
-          precision. For example: "1s", "1.01s", "1.0000001s", "-3.100s
-
-    Raises:
-      ValueError: On parsing problems.
-    """
-    if not isinstance(value, str):
-      raise ValueError('Duration JSON value not a string: {!r}'.format(value))
-    if len(value) < 1 or value[-1] != 's':
-      raise ValueError(
-          'Duration must end with letter "s": {0}.'.format(value))
-    try:
-      pos = value.find('.')
-      if pos == -1:
-        seconds = int(value[:-1])
-        nanos = 0
-      else:
-        seconds = int(value[:pos])
-        if value[0] == '-':
-          nanos = int(round(float('-0{0}'.format(value[pos: -1])) *1e9))
-        else:
-          nanos = int(round(float('0{0}'.format(value[pos: -1])) *1e9))
-      _CheckDurationValid(seconds, nanos)
-      self.seconds = seconds
-      self.nanos = nanos
-    except ValueError as e:
-      raise ValueError(
-          'Couldn\'t parse duration: {0} : {1}.'.format(value, e))
-
-  def ToNanoseconds(self):
-    """Converts a Duration to nanoseconds."""
-    return self.seconds * _NANOS_PER_SECOND + self.nanos
-
-  def ToMicroseconds(self):
-    """Converts a Duration to microseconds."""
-    micros = _RoundTowardZero(self.nanos, _NANOS_PER_MICROSECOND)
-    return self.seconds * _MICROS_PER_SECOND + micros
-
-  def ToMilliseconds(self):
-    """Converts a Duration to milliseconds."""
-    millis = _RoundTowardZero(self.nanos, _NANOS_PER_MILLISECOND)
-    return self.seconds * _MILLIS_PER_SECOND + millis
-
-  def ToSeconds(self):
-    """Converts a Duration to seconds."""
-    return self.seconds
-
-  def FromNanoseconds(self, nanos):
-    """Converts nanoseconds to Duration."""
-    self._NormalizeDuration(nanos // _NANOS_PER_SECOND,
-                            nanos % _NANOS_PER_SECOND)
-
-  def FromMicroseconds(self, micros):
-    """Converts microseconds to Duration."""
-    self._NormalizeDuration(
-        micros // _MICROS_PER_SECOND,
-        (micros % _MICROS_PER_SECOND) * _NANOS_PER_MICROSECOND)
-
-  def FromMilliseconds(self, millis):
-    """Converts milliseconds to Duration."""
-    self._NormalizeDuration(
-        millis // _MILLIS_PER_SECOND,
-        (millis % _MILLIS_PER_SECOND) * _NANOS_PER_MILLISECOND)
-
-  def FromSeconds(self, seconds):
-    """Converts seconds to Duration."""
-    self.seconds = seconds
-    self.nanos = 0
-
-  def ToTimedelta(self):
-    """Converts Duration to timedelta."""
-    return datetime.timedelta(
-        seconds=self.seconds, microseconds=_RoundTowardZero(
-            self.nanos, _NANOS_PER_MICROSECOND))
-
-  def FromTimedelta(self, td):
-    """Converts timedelta to Duration."""
-    self._NormalizeDuration(td.seconds + td.days * _SECONDS_PER_DAY,
-                            td.microseconds * _NANOS_PER_MICROSECOND)
-
-  def _NormalizeDuration(self, seconds, nanos):
-    """Set Duration by seconds and nanos."""
-    # Force nanos to be negative if the duration is negative.
-    if seconds < 0 and nanos > 0:
-      seconds += 1
-      nanos -= _NANOS_PER_SECOND
-    self.seconds = seconds
-    self.nanos = nanos
-
-
-def _CheckDurationValid(seconds, nanos):
-  if seconds < -_DURATION_SECONDS_MAX or seconds > _DURATION_SECONDS_MAX:
-    raise ValueError(
-        'Duration is not valid: Seconds {0} must be in range '
-        '[-315576000000, 315576000000].'.format(seconds))
-  if nanos <= -_NANOS_PER_SECOND or nanos >= _NANOS_PER_SECOND:
-    raise ValueError(
-        'Duration is not valid: Nanos {0} must be in range '
-        '[-999999999, 999999999].'.format(nanos))
-  if (nanos < 0 and seconds > 0) or (nanos > 0 and seconds < 0):
-    raise ValueError(
-        'Duration is not valid: Sign mismatch.')
-
-
-def _RoundTowardZero(value, divider):
-  """Truncates the remainder part after division."""
-  # For some languages, the sign of the remainder is implementation
-  # dependent if any of the operands is negative. Here we enforce
-  # "rounded toward zero" semantics. For example, for (-5) / 2 an
-  # implementation may give -3 as the result with the remainder being
-  # 1. This function ensures we always return -2 (closer to zero).
-  result = value // divider
-  remainder = value % divider
-  if result < 0 and remainder > 0:
-    return result + 1
-  else:
-    return result
-
-
-class FieldMask(object):
-  """Class for FieldMask message type."""
-
-  __slots__ = ()
-
-  def ToJsonString(self):
-    """Converts FieldMask to string according to proto3 JSON spec."""
-    camelcase_paths = []
-    for path in self.paths:
-      camelcase_paths.append(_SnakeCaseToCamelCase(path))
-    return ','.join(camelcase_paths)
-
-  def FromJsonString(self, value):
-    """Converts string to FieldMask according to proto3 JSON spec."""
-    if not isinstance(value, str):
-      raise ValueError('FieldMask JSON value not a string: {!r}'.format(value))
-    self.Clear()
-    if value:
-      for path in value.split(','):
-        self.paths.append(_CamelCaseToSnakeCase(path))
-
-  def IsValidForDescriptor(self, message_descriptor):
-    """Checks whether the FieldMask is valid for Message Descriptor."""
-    for path in self.paths:
-      if not _IsValidPath(message_descriptor, path):
-        return False
-    return True
-
-  def AllFieldsFromDescriptor(self, message_descriptor):
-    """Gets all direct fields of Message Descriptor to FieldMask."""
-    self.Clear()
-    for field in message_descriptor.fields:
-      self.paths.append(field.name)
-
-  def CanonicalFormFromMask(self, mask):
-    """Converts a FieldMask to the canonical form.
-
-    Removes paths that are covered by another path. For example,
-    "foo.bar" is covered by "foo" and will be removed if "foo"
-    is also in the FieldMask. Then sorts all paths in alphabetical order.
-
-    Args:
-      mask: The original FieldMask to be converted.
-    """
-    tree = _FieldMaskTree(mask)
-    tree.ToFieldMask(self)
-
-  def Union(self, mask1, mask2):
-    """Merges mask1 and mask2 into this FieldMask."""
-    _CheckFieldMaskMessage(mask1)
-    _CheckFieldMaskMessage(mask2)
-    tree = _FieldMaskTree(mask1)
-    tree.MergeFromFieldMask(mask2)
-    tree.ToFieldMask(self)
-
-  def Intersect(self, mask1, mask2):
-    """Intersects mask1 and mask2 into this FieldMask."""
-    _CheckFieldMaskMessage(mask1)
-    _CheckFieldMaskMessage(mask2)
-    tree = _FieldMaskTree(mask1)
-    intersection = _FieldMaskTree()
-    for path in mask2.paths:
-      tree.IntersectPath(path, intersection)
-    intersection.ToFieldMask(self)
-
-  def MergeMessage(
-      self, source, destination,
-      replace_message_field=False, replace_repeated_field=False):
-    """Merges fields specified in FieldMask from source to destination.
-
-    Args:
-      source: Source message.
-      destination: The destination message to be merged into.
-      replace_message_field: Replace message field if True. Merge message
-          field if False.
-      replace_repeated_field: Replace repeated field if True. Append
-          elements of repeated field if False.
-    """
-    tree = _FieldMaskTree(self)
-    tree.MergeMessage(
-        source, destination, replace_message_field, replace_repeated_field)
-
-
-def _IsValidPath(message_descriptor, path):
-  """Checks whether the path is valid for Message Descriptor."""
-  parts = path.split('.')
-  last = parts.pop()
-  for name in parts:
-    field = message_descriptor.fields_by_name.get(name)
-    if (field is None or
-        field.label == FieldDescriptor.LABEL_REPEATED or
-        field.type != FieldDescriptor.TYPE_MESSAGE):
-      return False
-    message_descriptor = field.message_type
-  return last in message_descriptor.fields_by_name
-
-
-def _CheckFieldMaskMessage(message):
-  """Raises ValueError if message is not a FieldMask."""
-  message_descriptor = message.DESCRIPTOR
-  if (message_descriptor.name != 'FieldMask' or
-      message_descriptor.file.name != 'google/protobuf/field_mask.proto'):
-    raise ValueError('Message {0} is not a FieldMask.'.format(
-        message_descriptor.full_name))
-
-
-def _SnakeCaseToCamelCase(path_name):
-  """Converts a path name from snake_case to camelCase."""
-  result = []
-  after_underscore = False
-  for c in path_name:
-    if c.isupper():
-      raise ValueError(
-          'Fail to print FieldMask to Json string: Path name '
-          '{0} must not contain uppercase letters.'.format(path_name))
-    if after_underscore:
-      if c.islower():
-        result.append(c.upper())
-        after_underscore = False
-      else:
-        raise ValueError(
-            'Fail to print FieldMask to Json string: The '
-            'character after a "_" must be a lowercase letter '
-            'in path name {0}.'.format(path_name))
-    elif c == '_':
-      after_underscore = True
-    else:
-      result += c
-
-  if after_underscore:
-    raise ValueError('Fail to print FieldMask to Json string: Trailing "_" '
-                     'in path name {0}.'.format(path_name))
-  return ''.join(result)
-
-
-def _CamelCaseToSnakeCase(path_name):
-  """Converts a field name from camelCase to snake_case."""
-  result = []
-  for c in path_name:
-    if c == '_':
-      raise ValueError('Fail to parse FieldMask: Path name '
-                       '{0} must not contain "_"s.'.format(path_name))
-    if c.isupper():
-      result += '_'
-      result += c.lower()
-    else:
-      result += c
-  return ''.join(result)
-
-
-class _FieldMaskTree(object):
-  """Represents a FieldMask in a tree structure.
-
-  For example, given a FieldMask "foo.bar,foo.baz,bar.baz",
-  the FieldMaskTree will be:
-      [_root] -+- foo -+- bar
-            |       |
-            |       +- baz
-            |
-            +- bar --- baz
-  In the tree, each leaf node represents a field path.
-  """
-
-  __slots__ = ('_root',)
-
-  def __init__(self, field_mask=None):
-    """Initializes the tree by FieldMask."""
-    self._root = {}
-    if field_mask:
-      self.MergeFromFieldMask(field_mask)
-
-  def MergeFromFieldMask(self, field_mask):
-    """Merges a FieldMask to the tree."""
-    for path in field_mask.paths:
-      self.AddPath(path)
-
-  def AddPath(self, path):
-    """Adds a field path into the tree.
-
-    If the field path to add is a sub-path of an existing field path
-    in the tree (i.e., a leaf node), it means the tree already matches
-    the given path so nothing will be added to the tree. If the path
-    matches an existing non-leaf node in the tree, that non-leaf node
-    will be turned into a leaf node with all its children removed because
-    the path matches all the node's children. Otherwise, a new path will
-    be added.
-
-    Args:
-      path: The field path to add.
-    """
-    node = self._root
-    for name in path.split('.'):
-      if name not in node:
-        node[name] = {}
-      elif not node[name]:
-        # Pre-existing empty node implies we already have this entire tree.
-        return
-      node = node[name]
-    # Remove any sub-trees we might have had.
-    node.clear()
-
-  def ToFieldMask(self, field_mask):
-    """Converts the tree to a FieldMask."""
-    field_mask.Clear()
-    _AddFieldPaths(self._root, '', field_mask)
-
-  def IntersectPath(self, path, intersection):
-    """Calculates the intersection part of a field path with this tree.
-
-    Args:
-      path: The field path to calculates.
-      intersection: The out tree to record the intersection part.
-    """
-    node = self._root
-    for name in path.split('.'):
-      if name not in node:
-        return
-      elif not node[name]:
-        intersection.AddPath(path)
-        return
-      node = node[name]
-    intersection.AddLeafNodes(path, node)
-
-  def AddLeafNodes(self, prefix, node):
-    """Adds leaf nodes begin with prefix to this tree."""
-    if not node:
-      self.AddPath(prefix)
-    for name in node:
-      child_path = prefix + '.' + name
-      self.AddLeafNodes(child_path, node[name])
-
-  def MergeMessage(
-      self, source, destination,
-      replace_message, replace_repeated):
-    """Merge all fields specified by this tree from source to destination."""
-    _MergeMessage(
-        self._root, source, destination, replace_message, replace_repeated)
-
-
-def _StrConvert(value):
-  """Converts value to str if it is not."""
-  # This file is imported by c extension and some methods like ClearField
-  # requires string for the field name. py2/py3 has different text
-  # type and may use unicode.
-  if not isinstance(value, str):
-    return value.encode('utf-8')
-  return value
-
-
-def _MergeMessage(
-    node, source, destination, replace_message, replace_repeated):
-  """Merge all fields specified by a sub-tree from source to destination."""
-  source_descriptor = source.DESCRIPTOR
-  for name in node:
-    child = node[name]
-    field = source_descriptor.fields_by_name[name]
-    if field is None:
-      raise ValueError('Error: Can\'t find field {0} in message {1}.'.format(
-          name, source_descriptor.full_name))
-    if child:
-      # Sub-paths are only allowed for singular message fields.
-      if (field.label == FieldDescriptor.LABEL_REPEATED or
-          field.cpp_type != FieldDescriptor.CPPTYPE_MESSAGE):
-        raise ValueError('Error: Field {0} in message {1} is not a singular '
-                         'message field and cannot have sub-fields.'.format(
-                             name, source_descriptor.full_name))
-      if source.HasField(name):
-        _MergeMessage(
-            child, getattr(source, name), getattr(destination, name),
-            replace_message, replace_repeated)
-      continue
-    if field.label == FieldDescriptor.LABEL_REPEATED:
-      if replace_repeated:
-        destination.ClearField(_StrConvert(name))
-      repeated_source = getattr(source, name)
-      repeated_destination = getattr(destination, name)
-      repeated_destination.MergeFrom(repeated_source)
-    else:
-      if field.cpp_type == FieldDescriptor.CPPTYPE_MESSAGE:
-        if replace_message:
-          destination.ClearField(_StrConvert(name))
-        if source.HasField(name):
-          getattr(destination, name).MergeFrom(getattr(source, name))
-      else:
-        setattr(destination, name, getattr(source, name))
-
-
-def _AddFieldPaths(node, prefix, field_mask):
-  """Adds the field paths descended from node to field_mask."""
-  if not node and prefix:
-    field_mask.paths.append(prefix)
-    return
-  for name in sorted(node):
-    if prefix:
-      child_path = prefix + '.' + name
-    else:
-      child_path = name
-    _AddFieldPaths(node[name], child_path, field_mask)
-
-
-def _SetStructValue(struct_value, value):
-  if value is None:
-    struct_value.null_value = 0
-  elif isinstance(value, bool):
-    # Note: this check must come before the number check because in Python
-    # True and False are also considered numbers.
-    struct_value.bool_value = value
-  elif isinstance(value, str):
-    struct_value.string_value = value
-  elif isinstance(value, (int, float)):
-    struct_value.number_value = value
-  elif isinstance(value, (dict, Struct)):
-    struct_value.struct_value.Clear()
-    struct_value.struct_value.update(value)
-  elif isinstance(value, (list, ListValue)):
-    struct_value.list_value.Clear()
-    struct_value.list_value.extend(value)
-  else:
-    raise ValueError('Unexpected type')
-
-
-def _GetStructValue(struct_value):
-  which = struct_value.WhichOneof('kind')
-  if which == 'struct_value':
-    return struct_value.struct_value
-  elif which == 'null_value':
-    return None
-  elif which == 'number_value':
-    return struct_value.number_value
-  elif which == 'string_value':
-    return struct_value.string_value
-  elif which == 'bool_value':
-    return struct_value.bool_value
-  elif which == 'list_value':
-    return struct_value.list_value
-  elif which is None:
-    raise ValueError('Value not set')
-
-
-class Struct(object):
-  """Class for Struct message type."""
-
-  __slots__ = ()
-
-  def __getitem__(self, key):
-    return _GetStructValue(self.fields[key])
-
-  def __contains__(self, item):
-    return item in self.fields
-
-  def __setitem__(self, key, value):
-    _SetStructValue(self.fields[key], value)
-
-  def __delitem__(self, key):
-    del self.fields[key]
-
-  def __len__(self):
-    return len(self.fields)
-
-  def __iter__(self):
-    return iter(self.fields)
-
-  def keys(self):  # pylint: disable=invalid-name
-    return self.fields.keys()
-
-  def values(self):  # pylint: disable=invalid-name
-    return [self[key] for key in self]
-
-  def items(self):  # pylint: disable=invalid-name
-    return [(key, self[key]) for key in self]
-
-  def get_or_create_list(self, key):
-    """Returns a list for this key, creating if it didn't exist already."""
-    if not self.fields[key].HasField('list_value'):
-      # Clear will mark list_value modified which will indeed create a list.
-      self.fields[key].list_value.Clear()
-    return self.fields[key].list_value
-
-  def get_or_create_struct(self, key):
-    """Returns a struct for this key, creating if it didn't exist already."""
-    if not self.fields[key].HasField('struct_value'):
-      # Clear will mark struct_value modified which will indeed create a struct.
-      self.fields[key].struct_value.Clear()
-    return self.fields[key].struct_value
-
-  def update(self, dictionary):  # pylint: disable=invalid-name
-    for key, value in dictionary.items():
-      _SetStructValue(self.fields[key], value)
-
-collections.abc.MutableMapping.register(Struct)
-
-
-class ListValue(object):
-  """Class for ListValue message type."""
-
-  __slots__ = ()
-
-  def __len__(self):
-    return len(self.values)
-
-  def append(self, value):
-    _SetStructValue(self.values.add(), value)
-
-  def extend(self, elem_seq):
-    for value in elem_seq:
-      self.append(value)
-
-  def __getitem__(self, index):
-    """Retrieves item by the specified index."""
-    return _GetStructValue(self.values.__getitem__(index))
-
-  def __setitem__(self, index, value):
-    _SetStructValue(self.values.__getitem__(index), value)
-
-  def __delitem__(self, key):
-    del self.values[key]
-
-  def items(self):
-    for i in range(len(self)):
-      yield self[i]
-
-  def add_struct(self):
-    """Appends and returns a struct value as the next value in the list."""
-    struct_value = self.values.add().struct_value
-    # Clear will mark struct_value modified which will indeed create a struct.
-    struct_value.Clear()
-    return struct_value
-
-  def add_list(self):
-    """Appends and returns a list value as the next value in the list."""
-    list_value = self.values.add().list_value
-    # Clear will mark list_value modified which will indeed create a list.
-    list_value.Clear()
-    return list_value
-
-collections.abc.MutableSequence.register(ListValue)
-
-
-# LINT.IfChange(wktbases)
-WKTBASES = {
-    'google.protobuf.Any': Any,
-    'google.protobuf.Duration': Duration,
-    'google.protobuf.FieldMask': FieldMask,
-    'google.protobuf.ListValue': ListValue,
-    'google.protobuf.Struct': Struct,
-    'google.protobuf.Timestamp': Timestamp,
-}
-# LINT.ThenChange(//depot/google.protobuf/compiler/python/pyi_generator.cc:wktbases)
diff --git a/libs/protobuf/python/google/protobuf/internal/well_known_types_test.py b/libs/protobuf/python/google/protobuf/internal/well_known_types_test.py
deleted file mode 100644
index a32459a..0000000
--- a/libs/protobuf/python/google/protobuf/internal/well_known_types_test.py
+++ /dev/null
@@ -1,1013 +0,0 @@
-# Protocol Buffers - Google's data interchange format
-# Copyright 2008 Google Inc.  All rights reserved.
-# https://developers.google.com/protocol-buffers/
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-"""Test for google.protobuf.internal.well_known_types."""
-
-__author__ = 'jieluo@google.com (Jie Luo)'
-
-import collections.abc as collections_abc
-import datetime
-import unittest
-
-from google.protobuf import any_pb2
-from google.protobuf import duration_pb2
-from google.protobuf import field_mask_pb2
-from google.protobuf import struct_pb2
-from google.protobuf import timestamp_pb2
-from google.protobuf import map_unittest_pb2
-from google.protobuf import unittest_pb2
-from google.protobuf.internal import any_test_pb2
-from google.protobuf.internal import test_util
-from google.protobuf.internal import well_known_types
-from google.protobuf import descriptor
-from google.protobuf import text_format
-from google.protobuf.internal import _parameterized
-
-try:
-  # New module in Python 3.9:
-  import zoneinfo  # pylint:disable=g-import-not-at-top
-  _TZ_JAPAN = zoneinfo.ZoneInfo('Japan')
-  _TZ_PACIFIC = zoneinfo.ZoneInfo('US/Pacific')
-except ImportError:
-  _TZ_JAPAN = datetime.timezone(datetime.timedelta(hours=9), 'Japan')
-  _TZ_PACIFIC = datetime.timezone(datetime.timedelta(hours=-8), 'US/Pacific')
-
-
-class TimeUtilTestBase(_parameterized.TestCase):
-
-  def CheckTimestampConversion(self, message, text):
-    self.assertEqual(text, message.ToJsonString())
-    parsed_message = timestamp_pb2.Timestamp()
-    parsed_message.FromJsonString(text)
-    self.assertEqual(message, parsed_message)
-
-  def CheckDurationConversion(self, message, text):
-    self.assertEqual(text, message.ToJsonString())
-    parsed_message = duration_pb2.Duration()
-    parsed_message.FromJsonString(text)
-    self.assertEqual(message, parsed_message)
-
-
-class TimeUtilTest(TimeUtilTestBase):
-
-  def testTimestampSerializeAndParse(self):
-    message = timestamp_pb2.Timestamp()
-    # Generated output should contain 3, 6, or 9 fractional digits.
-    message.seconds = 0
-    message.nanos = 0
-    self.CheckTimestampConversion(message, '1970-01-01T00:00:00Z')
-    message.nanos = 10000000
-    self.CheckTimestampConversion(message, '1970-01-01T00:00:00.010Z')
-    message.nanos = 10000
-    self.CheckTimestampConversion(message, '1970-01-01T00:00:00.000010Z')
-    message.nanos = 10
-    self.CheckTimestampConversion(message, '1970-01-01T00:00:00.000000010Z')
-    # Test min timestamps.
-    message.seconds = -62135596800
-    message.nanos = 0
-    self.CheckTimestampConversion(message, '0001-01-01T00:00:00Z')
-    # Test max timestamps.
-    message.seconds = 253402300799
-    message.nanos = 999999999
-    self.CheckTimestampConversion(message, '9999-12-31T23:59:59.999999999Z')
-    # Test negative timestamps.
-    message.seconds = -1
-    self.CheckTimestampConversion(message, '1969-12-31T23:59:59.999999999Z')
-
-    # Parsing accepts an fractional digits as long as they fit into nano
-    # precision.
-    message.FromJsonString('1970-01-01T00:00:00.1Z')
-    self.assertEqual(0, message.seconds)
-    self.assertEqual(100000000, message.nanos)
-    # Parsing accepts offsets.
-    message.FromJsonString('1970-01-01T00:00:00-08:00')
-    self.assertEqual(8 * 3600, message.seconds)
-    self.assertEqual(0, message.nanos)
-
-    # It is not easy to check with current time. For test coverage only.
-    message.GetCurrentTime()
-    self.assertNotEqual(8 * 3600, message.seconds)
-
-  def testDurationSerializeAndParse(self):
-    message = duration_pb2.Duration()
-    # Generated output should contain 3, 6, or 9 fractional digits.
-    message.seconds = 0
-    message.nanos = 0
-    self.CheckDurationConversion(message, '0s')
-    message.nanos = 10000000
-    self.CheckDurationConversion(message, '0.010s')
-    message.nanos = 10000
-    self.CheckDurationConversion(message, '0.000010s')
-    message.nanos = 10
-    self.CheckDurationConversion(message, '0.000000010s')
-
-    # Test min and max
-    message.seconds = 315576000000
-    message.nanos = 999999999
-    self.CheckDurationConversion(message, '315576000000.999999999s')
-    message.seconds = -315576000000
-    message.nanos = -999999999
-    self.CheckDurationConversion(message, '-315576000000.999999999s')
-
-    # Parsing accepts an fractional digits as long as they fit into nano
-    # precision.
-    message.FromJsonString('0.1s')
-    self.assertEqual(100000000, message.nanos)
-    message.FromJsonString('0.0000001s')
-    self.assertEqual(100, message.nanos)
-
-  def testTimestampIntegerConversion(self):
-    message = timestamp_pb2.Timestamp()
-    message.FromNanoseconds(1)
-    self.assertEqual('1970-01-01T00:00:00.000000001Z',
-                     message.ToJsonString())
-    self.assertEqual(1, message.ToNanoseconds())
-
-    message.FromNanoseconds(-1)
-    self.assertEqual('1969-12-31T23:59:59.999999999Z',
-                     message.ToJsonString())
-    self.assertEqual(-1, message.ToNanoseconds())
-
-    message.FromMicroseconds(1)
-    self.assertEqual('1970-01-01T00:00:00.000001Z',
-                     message.ToJsonString())
-    self.assertEqual(1, message.ToMicroseconds())
-
-    message.FromMicroseconds(-1)
-    self.assertEqual('1969-12-31T23:59:59.999999Z',
-                     message.ToJsonString())
-    self.assertEqual(-1, message.ToMicroseconds())
-
-    message.FromMilliseconds(1)
-    self.assertEqual('1970-01-01T00:00:00.001Z',
-                     message.ToJsonString())
-    self.assertEqual(1, message.ToMilliseconds())
-
-    message.FromMilliseconds(-1)
-    self.assertEqual('1969-12-31T23:59:59.999Z',
-                     message.ToJsonString())
-    self.assertEqual(-1, message.ToMilliseconds())
-
-    message.FromSeconds(1)
-    self.assertEqual('1970-01-01T00:00:01Z',
-                     message.ToJsonString())
-    self.assertEqual(1, message.ToSeconds())
-
-    message.FromSeconds(-1)
-    self.assertEqual('1969-12-31T23:59:59Z',
-                     message.ToJsonString())
-    self.assertEqual(-1, message.ToSeconds())
-
-    message.FromNanoseconds(1999)
-    self.assertEqual(1, message.ToMicroseconds())
-    # For negative values, Timestamp will be rounded down.
-    # For example, "1969-12-31T23:59:59.5Z" (i.e., -0.5s) rounded to seconds
-    # will be "1969-12-31T23:59:59Z" (i.e., -1s) rather than
-    # "1970-01-01T00:00:00Z" (i.e., 0s).
-    message.FromNanoseconds(-1999)
-    self.assertEqual(-2, message.ToMicroseconds())
-
-  def testDurationIntegerConversion(self):
-    message = duration_pb2.Duration()
-    message.FromNanoseconds(1)
-    self.assertEqual('0.000000001s',
-                     message.ToJsonString())
-    self.assertEqual(1, message.ToNanoseconds())
-
-    message.FromNanoseconds(-1)
-    self.assertEqual('-0.000000001s',
-                     message.ToJsonString())
-    self.assertEqual(-1, message.ToNanoseconds())
-
-    message.FromMicroseconds(1)
-    self.assertEqual('0.000001s',
-                     message.ToJsonString())
-    self.assertEqual(1, message.ToMicroseconds())
-
-    message.FromMicroseconds(-1)
-    self.assertEqual('-0.000001s',
-                     message.ToJsonString())
-    self.assertEqual(-1, message.ToMicroseconds())
-
-    message.FromMilliseconds(1)
-    self.assertEqual('0.001s',
-                     message.ToJsonString())
-    self.assertEqual(1, message.ToMilliseconds())
-
-    message.FromMilliseconds(-1)
-    self.assertEqual('-0.001s',
-                     message.ToJsonString())
-    self.assertEqual(-1, message.ToMilliseconds())
-
-    message.FromSeconds(1)
-    self.assertEqual('1s', message.ToJsonString())
-    self.assertEqual(1, message.ToSeconds())
-
-    message.FromSeconds(-1)
-    self.assertEqual('-1s',
-                     message.ToJsonString())
-    self.assertEqual(-1, message.ToSeconds())
-
-    # Test truncation behavior.
-    message.FromNanoseconds(1999)
-    self.assertEqual(1, message.ToMicroseconds())
-
-    # For negative values, Duration will be rounded towards 0.
-    message.FromNanoseconds(-1999)
-    self.assertEqual(-1, message.ToMicroseconds())
-
-  def testTimezoneNaiveDatetimeConversion(self):
-    message = timestamp_pb2.Timestamp()
-    naive_utc_epoch = datetime.datetime(1970, 1, 1)
-    message.FromDatetime(naive_utc_epoch)
-    self.assertEqual(0, message.seconds)
-    self.assertEqual(0, message.nanos)
-
-    self.assertEqual(naive_utc_epoch, message.ToDatetime())
-
-    naive_epoch_morning = datetime.datetime(1970, 1, 1, 8, 0, 0, 1)
-    message.FromDatetime(naive_epoch_morning)
-    self.assertEqual(8 * 3600, message.seconds)
-    self.assertEqual(1000, message.nanos)
-
-    self.assertEqual(naive_epoch_morning, message.ToDatetime())
-
-    message.FromMilliseconds(1999)
-    self.assertEqual(1, message.seconds)
-    self.assertEqual(999_000_000, message.nanos)
-
-    self.assertEqual(datetime.datetime(1970, 1, 1, 0, 0, 1, 999000),
-                     message.ToDatetime())
-
-    naive_future = datetime.datetime(2555, 2, 22, 1, 2, 3, 456789)
-    message.FromDatetime(naive_future)
-    self.assertEqual(naive_future, message.ToDatetime())
-
-    naive_end_of_time = datetime.datetime.max
-    message.FromDatetime(naive_end_of_time)
-    self.assertEqual(naive_end_of_time, message.ToDatetime())
-
-  # Two hours after the Unix Epoch, around the world.
-  @_parameterized.named_parameters(
-      ('London', [1970, 1, 1, 2], datetime.timezone.utc),
-      ('Tokyo', [1970, 1, 1, 11], _TZ_JAPAN),
-      ('LA', [1969, 12, 31, 18], _TZ_PACIFIC),
-  )
-  def testTimezoneAwareDatetimeConversion(self, date_parts, tzinfo):
-    original_datetime = datetime.datetime(*date_parts, tzinfo=tzinfo)  # pylint:disable=g-tzinfo-datetime
-
-    message = timestamp_pb2.Timestamp()
-    message.FromDatetime(original_datetime)
-    self.assertEqual(7200, message.seconds)
-    self.assertEqual(0, message.nanos)
-
-    # ToDatetime() with no parameters produces a naive UTC datetime, i.e. it not
-    # only loses the original timezone information (e.g. US/Pacific) as it's
-    # "normalised" to UTC, but also drops the information that the datetime
-    # represents a UTC one.
-    naive_datetime = message.ToDatetime()
-    self.assertEqual(datetime.datetime(1970, 1, 1, 2), naive_datetime)
-    self.assertIsNone(naive_datetime.tzinfo)
-    self.assertNotEqual(original_datetime, naive_datetime)  # not even for UTC!
-
-    # In contrast, ToDatetime(tzinfo=) produces an aware datetime in the given
-    # timezone.
-    aware_datetime = message.ToDatetime(tzinfo=tzinfo)
-    self.assertEqual(original_datetime, aware_datetime)
-    self.assertEqual(
-        datetime.datetime(1970, 1, 1, 2, tzinfo=datetime.timezone.utc),
-        aware_datetime)
-    self.assertEqual(tzinfo, aware_datetime.tzinfo)
-
-  def testTimedeltaConversion(self):
-    message = duration_pb2.Duration()
-    message.FromNanoseconds(1999999999)
-    td = message.ToTimedelta()
-    self.assertEqual(1, td.seconds)
-    self.assertEqual(999999, td.microseconds)
-
-    message.FromNanoseconds(-1999999999)
-    td = message.ToTimedelta()
-    self.assertEqual(-1, td.days)
-    self.assertEqual(86398, td.seconds)
-    self.assertEqual(1, td.microseconds)
-
-    message.FromMicroseconds(-1)
-    td = message.ToTimedelta()
-    self.assertEqual(-1, td.days)
-    self.assertEqual(86399, td.seconds)
-    self.assertEqual(999999, td.microseconds)
-    converted_message = duration_pb2.Duration()
-    converted_message.FromTimedelta(td)
-    self.assertEqual(message, converted_message)
-
-  def testInvalidTimestamp(self):
-    message = timestamp_pb2.Timestamp()
-    self.assertRaisesRegex(
-        ValueError, 'Failed to parse timestamp: missing valid timezone offset.',
-        message.FromJsonString, '')
-    self.assertRaisesRegex(
-        ValueError, 'Failed to parse timestamp: invalid trailing data '
-        '1970-01-01T00:00:01Ztrail.', message.FromJsonString,
-        '1970-01-01T00:00:01Ztrail')
-    self.assertRaisesRegex(
-        ValueError, 'time data \'10000-01-01T00:00:00\' does not match'
-        ' format \'%Y-%m-%dT%H:%M:%S\'', message.FromJsonString,
-        '10000-01-01T00:00:00.00Z')
-    self.assertRaisesRegex(
-        ValueError, 'nanos 0123456789012 more than 9 fractional digits.',
-        message.FromJsonString, '1970-01-01T00:00:00.0123456789012Z')
-    self.assertRaisesRegex(
-        ValueError,
-        (r'Invalid timezone offset value: \+08.'),
-        message.FromJsonString,
-        '1972-01-01T01:00:00.01+08',
-    )
-    self.assertRaisesRegex(ValueError, 'year (0 )?is out of range',
-                           message.FromJsonString, '0000-01-01T00:00:00Z')
-    message.seconds = 253402300800
-    self.assertRaisesRegex(OverflowError, 'date value out of range',
-                           message.ToJsonString)
-
-  def testInvalidDuration(self):
-    message = duration_pb2.Duration()
-    self.assertRaisesRegex(ValueError, 'Duration must end with letter "s": 1.',
-                           message.FromJsonString, '1')
-    self.assertRaisesRegex(ValueError, 'Couldn\'t parse duration: 1...2s.',
-                           message.FromJsonString, '1...2s')
-    text = '-315576000001.000000000s'
-    self.assertRaisesRegex(
-        ValueError,
-        r'Duration is not valid\: Seconds -315576000001 must be in range'
-        r' \[-315576000000\, 315576000000\].', message.FromJsonString, text)
-    text = '315576000001.000000000s'
-    self.assertRaisesRegex(
-        ValueError,
-        r'Duration is not valid\: Seconds 315576000001 must be in range'
-        r' \[-315576000000\, 315576000000\].', message.FromJsonString, text)
-    message.seconds = -315576000001
-    message.nanos = 0
-    self.assertRaisesRegex(
-        ValueError,
-        r'Duration is not valid\: Seconds -315576000001 must be in range'
-        r' \[-315576000000\, 315576000000\].', message.ToJsonString)
-    message.seconds = 0
-    message.nanos = 999999999 + 1
-    self.assertRaisesRegex(
-        ValueError, r'Duration is not valid\: Nanos 1000000000 must be in range'
-        r' \[-999999999\, 999999999\].', message.ToJsonString)
-    message.seconds = -1
-    message.nanos = 1
-    self.assertRaisesRegex(ValueError,
-                           r'Duration is not valid\: Sign mismatch.',
-                           message.ToJsonString)
-
-
-class FieldMaskTest(unittest.TestCase):
-
-  def testStringFormat(self):
-    mask = field_mask_pb2.FieldMask()
-    self.assertEqual('', mask.ToJsonString())
-    mask.paths.append('foo')
-    self.assertEqual('foo', mask.ToJsonString())
-    mask.paths.append('bar')
-    self.assertEqual('foo,bar', mask.ToJsonString())
-
-    mask.FromJsonString('')
-    self.assertEqual('', mask.ToJsonString())
-    mask.FromJsonString('foo')
-    self.assertEqual(['foo'], mask.paths)
-    mask.FromJsonString('foo,bar')
-    self.assertEqual(['foo', 'bar'], mask.paths)
-
-    # Test camel case
-    mask.Clear()
-    mask.paths.append('foo_bar')
-    self.assertEqual('fooBar', mask.ToJsonString())
-    mask.paths.append('bar_quz')
-    self.assertEqual('fooBar,barQuz', mask.ToJsonString())
-
-    mask.FromJsonString('')
-    self.assertEqual('', mask.ToJsonString())
-    self.assertEqual([], mask.paths)
-    mask.FromJsonString('fooBar')
-    self.assertEqual(['foo_bar'], mask.paths)
-    mask.FromJsonString('fooBar,barQuz')
-    self.assertEqual(['foo_bar', 'bar_quz'], mask.paths)
-
-  def testDescriptorToFieldMask(self):
-    mask = field_mask_pb2.FieldMask()
-    msg_descriptor = unittest_pb2.TestAllTypes.DESCRIPTOR
-    mask.AllFieldsFromDescriptor(msg_descriptor)
-    self.assertEqual(76, len(mask.paths))
-    self.assertTrue(mask.IsValidForDescriptor(msg_descriptor))
-    for field in msg_descriptor.fields:
-      self.assertTrue(field.name in mask.paths)
-
-  def testIsValidForDescriptor(self):
-    msg_descriptor = unittest_pb2.TestAllTypes.DESCRIPTOR
-    # Empty mask
-    mask = field_mask_pb2.FieldMask()
-    self.assertTrue(mask.IsValidForDescriptor(msg_descriptor))
-    # All fields from descriptor
-    mask.AllFieldsFromDescriptor(msg_descriptor)
-    self.assertTrue(mask.IsValidForDescriptor(msg_descriptor))
-    # Child under optional message
-    mask.paths.append('optional_nested_message.bb')
-    self.assertTrue(mask.IsValidForDescriptor(msg_descriptor))
-    # Repeated field is only allowed in the last position of path
-    mask.paths.append('repeated_nested_message.bb')
-    self.assertFalse(mask.IsValidForDescriptor(msg_descriptor))
-    # Invalid top level field
-    mask = field_mask_pb2.FieldMask()
-    mask.paths.append('xxx')
-    self.assertFalse(mask.IsValidForDescriptor(msg_descriptor))
-    # Invalid field in root
-    mask = field_mask_pb2.FieldMask()
-    mask.paths.append('xxx.zzz')
-    self.assertFalse(mask.IsValidForDescriptor(msg_descriptor))
-    # Invalid field in internal node
-    mask = field_mask_pb2.FieldMask()
-    mask.paths.append('optional_nested_message.xxx.zzz')
-    self.assertFalse(mask.IsValidForDescriptor(msg_descriptor))
-    # Invalid field in leaf
-    mask = field_mask_pb2.FieldMask()
-    mask.paths.append('optional_nested_message.xxx')
-    self.assertFalse(mask.IsValidForDescriptor(msg_descriptor))
-
-  def testCanonicalFrom(self):
-    mask = field_mask_pb2.FieldMask()
-    out_mask = field_mask_pb2.FieldMask()
-    # Paths will be sorted.
-    mask.FromJsonString('baz.quz,bar,foo')
-    out_mask.CanonicalFormFromMask(mask)
-    self.assertEqual('bar,baz.quz,foo', out_mask.ToJsonString())
-    # Duplicated paths will be removed.
-    mask.FromJsonString('foo,bar,foo')
-    out_mask.CanonicalFormFromMask(mask)
-    self.assertEqual('bar,foo', out_mask.ToJsonString())
-    # Sub-paths of other paths will be removed.
-    mask.FromJsonString('foo.b1,bar.b1,foo.b2,bar')
-    out_mask.CanonicalFormFromMask(mask)
-    self.assertEqual('bar,foo.b1,foo.b2', out_mask.ToJsonString())
-
-    # Test more deeply nested cases.
-    mask.FromJsonString(
-        'foo.bar.baz1,foo.bar.baz2.quz,foo.bar.baz2')
-    out_mask.CanonicalFormFromMask(mask)
-    self.assertEqual('foo.bar.baz1,foo.bar.baz2',
-                     out_mask.ToJsonString())
-    mask.FromJsonString(
-        'foo.bar.baz1,foo.bar.baz2,foo.bar.baz2.quz')
-    out_mask.CanonicalFormFromMask(mask)
-    self.assertEqual('foo.bar.baz1,foo.bar.baz2',
-                     out_mask.ToJsonString())
-    mask.FromJsonString(
-        'foo.bar.baz1,foo.bar.baz2,foo.bar.baz2.quz,foo.bar')
-    out_mask.CanonicalFormFromMask(mask)
-    self.assertEqual('foo.bar', out_mask.ToJsonString())
-    mask.FromJsonString(
-        'foo.bar.baz1,foo.bar.baz2,foo.bar.baz2.quz,foo')
-    out_mask.CanonicalFormFromMask(mask)
-    self.assertEqual('foo', out_mask.ToJsonString())
-
-  def testUnion(self):
-    mask1 = field_mask_pb2.FieldMask()
-    mask2 = field_mask_pb2.FieldMask()
-    out_mask = field_mask_pb2.FieldMask()
-    mask1.FromJsonString('foo,baz')
-    mask2.FromJsonString('bar,quz')
-    out_mask.Union(mask1, mask2)
-    self.assertEqual('bar,baz,foo,quz', out_mask.ToJsonString())
-    # Overlap with duplicated paths.
-    mask1.FromJsonString('foo,baz.bb')
-    mask2.FromJsonString('baz.bb,quz')
-    out_mask.Union(mask1, mask2)
-    self.assertEqual('baz.bb,foo,quz', out_mask.ToJsonString())
-    # Overlap with paths covering some other paths.
-    mask1.FromJsonString('foo.bar.baz,quz')
-    mask2.FromJsonString('foo.bar,bar')
-    out_mask.Union(mask1, mask2)
-    self.assertEqual('bar,foo.bar,quz', out_mask.ToJsonString())
-    src = unittest_pb2.TestAllTypes()
-    with self.assertRaises(ValueError):
-      out_mask.Union(src, mask2)
-
-  def testIntersect(self):
-    mask1 = field_mask_pb2.FieldMask()
-    mask2 = field_mask_pb2.FieldMask()
-    out_mask = field_mask_pb2.FieldMask()
-    # Test cases without overlapping.
-    mask1.FromJsonString('foo,baz')
-    mask2.FromJsonString('bar,quz')
-    out_mask.Intersect(mask1, mask2)
-    self.assertEqual('', out_mask.ToJsonString())
-    self.assertEqual(len(out_mask.paths), 0)
-    self.assertEqual(out_mask.paths, [])
-    # Overlap with duplicated paths.
-    mask1.FromJsonString('foo,baz.bb')
-    mask2.FromJsonString('baz.bb,quz')
-    out_mask.Intersect(mask1, mask2)
-    self.assertEqual('baz.bb', out_mask.ToJsonString())
-    # Overlap with paths covering some other paths.
-    mask1.FromJsonString('foo.bar.baz,quz')
-    mask2.FromJsonString('foo.bar,bar')
-    out_mask.Intersect(mask1, mask2)
-    self.assertEqual('foo.bar.baz', out_mask.ToJsonString())
-    mask1.FromJsonString('foo.bar,bar')
-    mask2.FromJsonString('foo.bar.baz,quz')
-    out_mask.Intersect(mask1, mask2)
-    self.assertEqual('foo.bar.baz', out_mask.ToJsonString())
-    # Intersect '' with ''
-    mask1.Clear()
-    mask2.Clear()
-    mask1.paths.append('')
-    mask2.paths.append('')
-    self.assertEqual(mask1.paths, [''])
-    self.assertEqual('', mask1.ToJsonString())
-    out_mask.Intersect(mask1, mask2)
-    self.assertEqual(out_mask.paths, [])
-
-  def testMergeMessageWithoutMapFields(self):
-    # Test merge one field.
-    src = unittest_pb2.TestAllTypes()
-    test_util.SetAllFields(src)
-    for field in src.DESCRIPTOR.fields:
-      if field.containing_oneof:
-        continue
-      field_name = field.name
-      dst = unittest_pb2.TestAllTypes()
-      # Only set one path to mask.
-      mask = field_mask_pb2.FieldMask()
-      mask.paths.append(field_name)
-      mask.MergeMessage(src, dst)
-      # The expected result message.
-      msg = unittest_pb2.TestAllTypes()
-      if field.label == descriptor.FieldDescriptor.LABEL_REPEATED:
-        repeated_src = getattr(src, field_name)
-        repeated_msg = getattr(msg, field_name)
-        if field.cpp_type == descriptor.FieldDescriptor.CPPTYPE_MESSAGE:
-          for item in repeated_src:
-            repeated_msg.add().CopyFrom(item)
-        else:
-          repeated_msg.extend(repeated_src)
-      elif field.cpp_type == descriptor.FieldDescriptor.CPPTYPE_MESSAGE:
-        getattr(msg, field_name).CopyFrom(getattr(src, field_name))
-      else:
-        setattr(msg, field_name, getattr(src, field_name))
-      # Only field specified in mask is merged.
-      self.assertEqual(msg, dst)
-
-    # Test merge nested fields.
-    nested_src = unittest_pb2.NestedTestAllTypes()
-    nested_dst = unittest_pb2.NestedTestAllTypes()
-    nested_src.child.payload.optional_int32 = 1234
-    nested_src.child.child.payload.optional_int32 = 5678
-    mask = field_mask_pb2.FieldMask()
-    mask.FromJsonString('child.payload')
-    mask.MergeMessage(nested_src, nested_dst)
-    self.assertEqual(1234, nested_dst.child.payload.optional_int32)
-    self.assertEqual(0, nested_dst.child.child.payload.optional_int32)
-
-    mask.FromJsonString('child.child.payload')
-    mask.MergeMessage(nested_src, nested_dst)
-    self.assertEqual(1234, nested_dst.child.payload.optional_int32)
-    self.assertEqual(5678, nested_dst.child.child.payload.optional_int32)
-
-    nested_dst.Clear()
-    mask.FromJsonString('child.child.payload')
-    mask.MergeMessage(nested_src, nested_dst)
-    self.assertEqual(0, nested_dst.child.payload.optional_int32)
-    self.assertEqual(5678, nested_dst.child.child.payload.optional_int32)
-
-    nested_dst.Clear()
-    mask.FromJsonString('child')
-    mask.MergeMessage(nested_src, nested_dst)
-    self.assertEqual(1234, nested_dst.child.payload.optional_int32)
-    self.assertEqual(5678, nested_dst.child.child.payload.optional_int32)
-
-    # Test MergeOptions.
-    nested_dst.Clear()
-    nested_dst.child.payload.optional_int64 = 4321
-    # Message fields will be merged by default.
-    mask.FromJsonString('child.payload')
-    mask.MergeMessage(nested_src, nested_dst)
-    self.assertEqual(1234, nested_dst.child.payload.optional_int32)
-    self.assertEqual(4321, nested_dst.child.payload.optional_int64)
-    # Change the behavior to replace message fields.
-    mask.FromJsonString('child.payload')
-    mask.MergeMessage(nested_src, nested_dst, True, False)
-    self.assertEqual(1234, nested_dst.child.payload.optional_int32)
-    self.assertEqual(0, nested_dst.child.payload.optional_int64)
-
-    # By default, fields missing in source are not cleared in destination.
-    nested_dst.payload.optional_int32 = 1234
-    self.assertTrue(nested_dst.HasField('payload'))
-    mask.FromJsonString('payload')
-    mask.MergeMessage(nested_src, nested_dst)
-    self.assertTrue(nested_dst.HasField('payload'))
-    # But they are cleared when replacing message fields.
-    nested_dst.Clear()
-    nested_dst.payload.optional_int32 = 1234
-    mask.FromJsonString('payload')
-    mask.MergeMessage(nested_src, nested_dst, True, False)
-    self.assertFalse(nested_dst.HasField('payload'))
-
-    nested_src.payload.repeated_int32.append(1234)
-    nested_dst.payload.repeated_int32.append(5678)
-    # Repeated fields will be appended by default.
-    mask.FromJsonString('payload.repeatedInt32')
-    mask.MergeMessage(nested_src, nested_dst)
-    self.assertEqual(2, len(nested_dst.payload.repeated_int32))
-    self.assertEqual(5678, nested_dst.payload.repeated_int32[0])
-    self.assertEqual(1234, nested_dst.payload.repeated_int32[1])
-    # Change the behavior to replace repeated fields.
-    mask.FromJsonString('payload.repeatedInt32')
-    mask.MergeMessage(nested_src, nested_dst, False, True)
-    self.assertEqual(1, len(nested_dst.payload.repeated_int32))
-    self.assertEqual(1234, nested_dst.payload.repeated_int32[0])
-
-    # Test Merge oneof field.
-    new_msg = unittest_pb2.TestOneof2()
-    dst = unittest_pb2.TestOneof2()
-    dst.foo_message.moo_int = 1
-    mask = field_mask_pb2.FieldMask()
-    mask.FromJsonString('fooMessage,fooLazyMessage.mooInt')
-    mask.MergeMessage(new_msg, dst)
-    self.assertTrue(dst.HasField('foo_message'))
-    self.assertFalse(dst.HasField('foo_lazy_message'))
-
-  def testMergeMessageWithMapField(self):
-    empty_map = map_unittest_pb2.TestRecursiveMapMessage()
-    src_level_2 = map_unittest_pb2.TestRecursiveMapMessage()
-    src_level_2.a['src level 2'].CopyFrom(empty_map)
-    src = map_unittest_pb2.TestRecursiveMapMessage()
-    src.a['common key'].CopyFrom(src_level_2)
-    src.a['src level 1'].CopyFrom(src_level_2)
-
-    dst_level_2 = map_unittest_pb2.TestRecursiveMapMessage()
-    dst_level_2.a['dst level 2'].CopyFrom(empty_map)
-    dst = map_unittest_pb2.TestRecursiveMapMessage()
-    dst.a['common key'].CopyFrom(dst_level_2)
-    dst.a['dst level 1'].CopyFrom(empty_map)
-
-    mask = field_mask_pb2.FieldMask()
-    mask.FromJsonString('a')
-    mask.MergeMessage(src, dst)
-
-    # map from dst is replaced with map from src.
-    self.assertEqual(dst.a['common key'], src_level_2)
-    self.assertEqual(dst.a['src level 1'], src_level_2)
-    self.assertEqual(dst.a['dst level 1'], empty_map)
-
-  def testMergeErrors(self):
-    src = unittest_pb2.TestAllTypes()
-    dst = unittest_pb2.TestAllTypes()
-    mask = field_mask_pb2.FieldMask()
-    test_util.SetAllFields(src)
-    mask.FromJsonString('optionalInt32.field')
-    with self.assertRaises(ValueError) as e:
-      mask.MergeMessage(src, dst)
-    self.assertEqual('Error: Field optional_int32 in message '
-                     'protobuf_unittest.TestAllTypes is not a singular '
-                     'message field and cannot have sub-fields.',
-                     str(e.exception))
-
-  def testSnakeCaseToCamelCase(self):
-    self.assertEqual('fooBar',
-                     well_known_types._SnakeCaseToCamelCase('foo_bar'))
-    self.assertEqual('FooBar',
-                     well_known_types._SnakeCaseToCamelCase('_foo_bar'))
-    self.assertEqual('foo3Bar',
-                     well_known_types._SnakeCaseToCamelCase('foo3_bar'))
-
-    # No uppercase letter is allowed.
-    self.assertRaisesRegex(
-        ValueError,
-        'Fail to print FieldMask to Json string: Path name Foo must '
-        'not contain uppercase letters.',
-        well_known_types._SnakeCaseToCamelCase, 'Foo')
-    # Any character after a "_" must be a lowercase letter.
-    #   1. "_" cannot be followed by another "_".
-    #   2. "_" cannot be followed by a digit.
-    #   3. "_" cannot appear as the last character.
-    self.assertRaisesRegex(
-        ValueError,
-        'Fail to print FieldMask to Json string: The character after a '
-        '"_" must be a lowercase letter in path name foo__bar.',
-        well_known_types._SnakeCaseToCamelCase, 'foo__bar')
-    self.assertRaisesRegex(
-        ValueError,
-        'Fail to print FieldMask to Json string: The character after a '
-        '"_" must be a lowercase letter in path name foo_3bar.',
-        well_known_types._SnakeCaseToCamelCase, 'foo_3bar')
-    self.assertRaisesRegex(
-        ValueError,
-        'Fail to print FieldMask to Json string: Trailing "_" in path '
-        'name foo_bar_.', well_known_types._SnakeCaseToCamelCase, 'foo_bar_')
-
-  def testCamelCaseToSnakeCase(self):
-    self.assertEqual('foo_bar',
-                     well_known_types._CamelCaseToSnakeCase('fooBar'))
-    self.assertEqual('_foo_bar',
-                     well_known_types._CamelCaseToSnakeCase('FooBar'))
-    self.assertEqual('foo3_bar',
-                     well_known_types._CamelCaseToSnakeCase('foo3Bar'))
-    self.assertRaisesRegex(
-        ValueError,
-        'Fail to parse FieldMask: Path name foo_bar must not contain "_"s.',
-        well_known_types._CamelCaseToSnakeCase, 'foo_bar')
-
-
-class StructTest(unittest.TestCase):
-
-  def testStruct(self):
-    struct = struct_pb2.Struct()
-    self.assertIsInstance(struct, collections_abc.Mapping)
-    self.assertEqual(0, len(struct))
-    struct_class = struct.__class__
-
-    struct['key1'] = 5
-    struct['key2'] = 'abc'
-    struct['key3'] = True
-    struct.get_or_create_struct('key4')['subkey'] = 11.0
-    struct_list = struct.get_or_create_list('key5')
-    self.assertIsInstance(struct_list, collections_abc.Sequence)
-    struct_list.extend([6, 'seven', True, False, None])
-    struct_list.add_struct()['subkey2'] = 9
-    struct['key6'] = {'subkey': {}}
-    struct['key7'] = [2, False]
-
-    self.assertEqual(7, len(struct))
-    self.assertTrue(isinstance(struct, well_known_types.Struct))
-    self.assertEqual(5, struct['key1'])
-    self.assertEqual('abc', struct['key2'])
-    self.assertIs(True, struct['key3'])
-    self.assertEqual(11, struct['key4']['subkey'])
-    inner_struct = struct_class()
-    inner_struct['subkey2'] = 9
-    self.assertEqual([6, 'seven', True, False, None, inner_struct],
-                     list(struct['key5'].items()))
-    self.assertEqual({}, dict(struct['key6']['subkey'].fields))
-    self.assertEqual([2, False], list(struct['key7'].items()))
-
-    serialized = struct.SerializeToString()
-    struct2 = struct_pb2.Struct()
-    struct2.ParseFromString(serialized)
-
-    self.assertEqual(struct, struct2)
-    for key, value in struct.items():
-      self.assertIn(key, struct)
-      self.assertIn(key, struct2)
-      self.assertEqual(value, struct2[key])
-
-    self.assertEqual(7, len(struct.keys()))
-    self.assertEqual(7, len(struct.values()))
-    for key in struct.keys():
-      self.assertIn(key, struct)
-      self.assertIn(key, struct2)
-      self.assertEqual(struct[key], struct2[key])
-
-    item = (next(iter(struct.keys())), next(iter(struct.values())))
-    self.assertEqual(item, next(iter(struct.items())))
-
-    self.assertTrue(isinstance(struct2, well_known_types.Struct))
-    self.assertEqual(5, struct2['key1'])
-    self.assertEqual('abc', struct2['key2'])
-    self.assertIs(True, struct2['key3'])
-    self.assertEqual(11, struct2['key4']['subkey'])
-    self.assertEqual([6, 'seven', True, False, None, inner_struct],
-                     list(struct2['key5'].items()))
-
-    struct_list = struct2['key5']
-    self.assertEqual(6, struct_list[0])
-    self.assertEqual('seven', struct_list[1])
-    self.assertEqual(True, struct_list[2])
-    self.assertEqual(False, struct_list[3])
-    self.assertEqual(None, struct_list[4])
-    self.assertEqual(inner_struct, struct_list[5])
-
-    struct_list[1] = 7
-    self.assertEqual(7, struct_list[1])
-
-    struct_list.add_list().extend([1, 'two', True, False, None])
-    self.assertEqual([1, 'two', True, False, None],
-                     list(struct_list[6].items()))
-    struct_list.extend([{'nested_struct': 30}, ['nested_list', 99], {}, []])
-    self.assertEqual(11, len(struct_list.values))
-    self.assertEqual(30, struct_list[7]['nested_struct'])
-    self.assertEqual('nested_list', struct_list[8][0])
-    self.assertEqual(99, struct_list[8][1])
-    self.assertEqual({}, dict(struct_list[9].fields))
-    self.assertEqual([], list(struct_list[10].items()))
-    struct_list[0] = {'replace': 'set'}
-    struct_list[1] = ['replace', 'set']
-    self.assertEqual('set', struct_list[0]['replace'])
-    self.assertEqual(['replace', 'set'], list(struct_list[1].items()))
-
-    text_serialized = str(struct)
-    struct3 = struct_pb2.Struct()
-    text_format.Merge(text_serialized, struct3)
-    self.assertEqual(struct, struct3)
-
-    struct.get_or_create_struct('key3')['replace'] = 12
-    self.assertEqual(12, struct['key3']['replace'])
-
-    # Tests empty list.
-    struct.get_or_create_list('empty_list')
-    empty_list = struct['empty_list']
-    self.assertEqual([], list(empty_list.items()))
-    list2 = struct_pb2.ListValue()
-    list2.add_list()
-    empty_list = list2[0]
-    self.assertEqual([], list(empty_list.items()))
-
-    # Tests empty struct.
-    struct.get_or_create_struct('empty_struct')
-    empty_struct = struct['empty_struct']
-    self.assertEqual({}, dict(empty_struct.fields))
-    list2.add_struct()
-    empty_struct = list2[1]
-    self.assertEqual({}, dict(empty_struct.fields))
-
-    self.assertEqual(9, len(struct))
-    del struct['key3']
-    del struct['key4']
-    self.assertEqual(7, len(struct))
-    self.assertEqual(6, len(struct['key5']))
-    del struct['key5'][1]
-    self.assertEqual(5, len(struct['key5']))
-    self.assertEqual([6, True, False, None, inner_struct],
-                     list(struct['key5'].items()))
-
-  def testStructAssignment(self):
-    # Tests struct assignment from another struct
-    s1 = struct_pb2.Struct()
-    s2 = struct_pb2.Struct()
-    for value in [1, 'a', [1], ['a'], {'a': 'b'}]:
-      s1['x'] = value
-      s2['x'] = s1['x']
-      self.assertEqual(s1['x'], s2['x'])
-
-  def testMergeFrom(self):
-    struct = struct_pb2.Struct()
-    struct_class = struct.__class__
-
-    dictionary = {
-        'key1': 5,
-        'key2': 'abc',
-        'key3': True,
-        'key4': {'subkey': 11.0},
-        'key5': [6, 'seven', True, False, None, {'subkey2': 9}],
-        'key6': [['nested_list', True]],
-        'empty_struct': {},
-        'empty_list': []
-    }
-    struct.update(dictionary)
-    self.assertEqual(5, struct['key1'])
-    self.assertEqual('abc', struct['key2'])
-    self.assertIs(True, struct['key3'])
-    self.assertEqual(11, struct['key4']['subkey'])
-    inner_struct = struct_class()
-    inner_struct['subkey2'] = 9
-    self.assertEqual([6, 'seven', True, False, None, inner_struct],
-                     list(struct['key5'].items()))
-    self.assertEqual(2, len(struct['key6'][0].values))
-    self.assertEqual('nested_list', struct['key6'][0][0])
-    self.assertEqual(True, struct['key6'][0][1])
-    empty_list = struct['empty_list']
-    self.assertEqual([], list(empty_list.items()))
-    empty_struct = struct['empty_struct']
-    self.assertEqual({}, dict(empty_struct.fields))
-
-    # According to documentation: "When parsing from the wire or when merging,
-    # if there are duplicate map keys the last key seen is used".
-    duplicate = {
-        'key4': {'replace': 20},
-        'key5': [[False, 5]]
-    }
-    struct.update(duplicate)
-    self.assertEqual(1, len(struct['key4'].fields))
-    self.assertEqual(20, struct['key4']['replace'])
-    self.assertEqual(1, len(struct['key5'].values))
-    self.assertEqual(False, struct['key5'][0][0])
-    self.assertEqual(5, struct['key5'][0][1])
-
-
-class AnyTest(unittest.TestCase):
-
-  def testAnyMessage(self):
-    # Creates and sets message.
-    msg = any_test_pb2.TestAny()
-    msg_descriptor = msg.DESCRIPTOR
-    all_types = unittest_pb2.TestAllTypes()
-    all_descriptor = all_types.DESCRIPTOR
-    all_types.repeated_string.append(u'\u00fc\ua71f')
-    # Packs to Any.
-    msg.value.Pack(all_types)
-    self.assertEqual(msg.value.type_url,
-                     'type.googleapis.com/%s' % all_descriptor.full_name)
-    self.assertEqual(msg.value.value,
-                     all_types.SerializeToString())
-    # Tests Is() method.
-    self.assertTrue(msg.value.Is(all_descriptor))
-    self.assertFalse(msg.value.Is(msg_descriptor))
-    # Unpacks Any.
-    unpacked_message = unittest_pb2.TestAllTypes()
-    self.assertTrue(msg.value.Unpack(unpacked_message))
-    self.assertEqual(all_types, unpacked_message)
-    # Unpacks to different type.
-    self.assertFalse(msg.value.Unpack(msg))
-    # Only Any messages have Pack method.
-    try:
-      msg.Pack(all_types)
-    except AttributeError:
-      pass
-    else:
-      raise AttributeError('%s should not have Pack method.' %
-                           msg_descriptor.full_name)
-
-  def testUnpackWithNoSlashInTypeUrl(self):
-    msg = any_test_pb2.TestAny()
-    all_types = unittest_pb2.TestAllTypes()
-    all_descriptor = all_types.DESCRIPTOR
-    msg.value.Pack(all_types)
-    # Reset type_url to part of type_url after '/'
-    msg.value.type_url = msg.value.TypeName()
-    self.assertFalse(msg.value.Is(all_descriptor))
-    unpacked_message = unittest_pb2.TestAllTypes()
-    self.assertFalse(msg.value.Unpack(unpacked_message))
-
-  def testMessageName(self):
-    # Creates and sets message.
-    submessage = any_test_pb2.TestAny()
-    submessage.int_value = 12345
-    msg = any_pb2.Any()
-    msg.Pack(submessage)
-    self.assertEqual(msg.TypeName(), 'google.protobuf.internal.TestAny')
-
-  def testPackWithCustomTypeUrl(self):
-    submessage = any_test_pb2.TestAny()
-    submessage.int_value = 12345
-    msg = any_pb2.Any()
-    # Pack with a custom type URL prefix.
-    msg.Pack(submessage, 'type.myservice.com')
-    self.assertEqual(msg.type_url,
-                     'type.myservice.com/%s' % submessage.DESCRIPTOR.full_name)
-    # Pack with a custom type URL prefix ending with '/'.
-    msg.Pack(submessage, 'type.myservice.com/')
-    self.assertEqual(msg.type_url,
-                     'type.myservice.com/%s' % submessage.DESCRIPTOR.full_name)
-    # Pack with an empty type URL prefix.
-    msg.Pack(submessage, '')
-    self.assertEqual(msg.type_url,
-                     '/%s' % submessage.DESCRIPTOR.full_name)
-    # Test unpacking the type.
-    unpacked_message = any_test_pb2.TestAny()
-    self.assertTrue(msg.Unpack(unpacked_message))
-    self.assertEqual(submessage, unpacked_message)
-
-  def testPackDeterministic(self):
-    submessage = any_test_pb2.TestAny()
-    for i in range(10):
-      submessage.map_value[str(i)] = i * 2
-    msg = any_pb2.Any()
-    msg.Pack(submessage, deterministic=True)
-    serialized = msg.SerializeToString(deterministic=True)
-    golden = (b'\n4type.googleapis.com/google.protobuf.internal.TestAny\x12F'
-              b'\x1a\x05\n\x010\x10\x00\x1a\x05\n\x011\x10\x02\x1a\x05\n\x01'
-              b'2\x10\x04\x1a\x05\n\x013\x10\x06\x1a\x05\n\x014\x10\x08\x1a'
-              b'\x05\n\x015\x10\n\x1a\x05\n\x016\x10\x0c\x1a\x05\n\x017\x10'
-              b'\x0e\x1a\x05\n\x018\x10\x10\x1a\x05\n\x019\x10\x12')
-    self.assertEqual(golden, serialized)
-
-
-if __name__ == '__main__':
-  unittest.main()
diff --git a/libs/protobuf/python/google/protobuf/internal/wire_format.py b/libs/protobuf/python/google/protobuf/internal/wire_format.py
deleted file mode 100644
index 883f525..0000000
--- a/libs/protobuf/python/google/protobuf/internal/wire_format.py
+++ /dev/null
@@ -1,268 +0,0 @@
-# Protocol Buffers - Google's data interchange format
-# Copyright 2008 Google Inc.  All rights reserved.
-# https://developers.google.com/protocol-buffers/
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-"""Constants and static functions to support protocol buffer wire format."""
-
-__author__ = 'robinson@google.com (Will Robinson)'
-
-import struct
-from google.protobuf import descriptor
-from google.protobuf import message
-
-
-TAG_TYPE_BITS = 3  # Number of bits used to hold type info in a proto tag.
-TAG_TYPE_MASK = (1 << TAG_TYPE_BITS) - 1  # 0x7
-
-# These numbers identify the wire type of a protocol buffer value.
-# We use the least-significant TAG_TYPE_BITS bits of the varint-encoded
-# tag-and-type to store one of these WIRETYPE_* constants.
-# These values must match WireType enum in google/protobuf/wire_format.h.
-WIRETYPE_VARINT = 0
-WIRETYPE_FIXED64 = 1
-WIRETYPE_LENGTH_DELIMITED = 2
-WIRETYPE_START_GROUP = 3
-WIRETYPE_END_GROUP = 4
-WIRETYPE_FIXED32 = 5
-_WIRETYPE_MAX = 5
-
-
-# Bounds for various integer types.
-INT32_MAX = int((1 << 31) - 1)
-INT32_MIN = int(-(1 << 31))
-UINT32_MAX = (1 << 32) - 1
-
-INT64_MAX = (1 << 63) - 1
-INT64_MIN = -(1 << 63)
-UINT64_MAX = (1 << 64) - 1
-
-# "struct" format strings that will encode/decode the specified formats.
-FORMAT_UINT32_LITTLE_ENDIAN = '<I'
-FORMAT_UINT64_LITTLE_ENDIAN = '<Q'
-FORMAT_FLOAT_LITTLE_ENDIAN = '<f'
-FORMAT_DOUBLE_LITTLE_ENDIAN = '<d'
-
-
-# We'll have to provide alternate implementations of AppendLittleEndian*() on
-# any architectures where these checks fail.
-if struct.calcsize(FORMAT_UINT32_LITTLE_ENDIAN) != 4:
-  raise AssertionError('Format "I" is not a 32-bit number.')
-if struct.calcsize(FORMAT_UINT64_LITTLE_ENDIAN) != 8:
-  raise AssertionError('Format "Q" is not a 64-bit number.')
-
-
-def PackTag(field_number, wire_type):
-  """Returns an unsigned 32-bit integer that encodes the field number and
-  wire type information in standard protocol message wire format.
-
-  Args:
-    field_number: Expected to be an integer in the range [1, 1 << 29)
-    wire_type: One of the WIRETYPE_* constants.
-  """
-  if not 0 <= wire_type <= _WIRETYPE_MAX:
-    raise message.EncodeError('Unknown wire type: %d' % wire_type)
-  return (field_number << TAG_TYPE_BITS) | wire_type
-
-
-def UnpackTag(tag):
-  """The inverse of PackTag().  Given an unsigned 32-bit number,
-  returns a (field_number, wire_type) tuple.
-  """
-  return (tag >> TAG_TYPE_BITS), (tag & TAG_TYPE_MASK)
-
-
-def ZigZagEncode(value):
-  """ZigZag Transform:  Encodes signed integers so that they can be
-  effectively used with varint encoding.  See wire_format.h for
-  more details.
-  """
-  if value >= 0:
-    return value << 1
-  return (value << 1) ^ (~0)
-
-
-def ZigZagDecode(value):
-  """Inverse of ZigZagEncode()."""
-  if not value & 0x1:
-    return value >> 1
-  return (value >> 1) ^ (~0)
-
-
-
-# The *ByteSize() functions below return the number of bytes required to
-# serialize "field number + type" information and then serialize the value.
-
-
-def Int32ByteSize(field_number, int32):
-  return Int64ByteSize(field_number, int32)
-
-
-def Int32ByteSizeNoTag(int32):
-  return _VarUInt64ByteSizeNoTag(0xffffffffffffffff & int32)
-
-
-def Int64ByteSize(field_number, int64):
-  # Have to convert to uint before calling UInt64ByteSize().
-  return UInt64ByteSize(field_number, 0xffffffffffffffff & int64)
-
-
-def UInt32ByteSize(field_number, uint32):
-  return UInt64ByteSize(field_number, uint32)
-
-
-def UInt64ByteSize(field_number, uint64):
-  return TagByteSize(field_number) + _VarUInt64ByteSizeNoTag(uint64)
-
-
-def SInt32ByteSize(field_number, int32):
-  return UInt32ByteSize(field_number, ZigZagEncode(int32))
-
-
-def SInt64ByteSize(field_number, int64):
-  return UInt64ByteSize(field_number, ZigZagEncode(int64))
-
-
-def Fixed32ByteSize(field_number, fixed32):
-  return TagByteSize(field_number) + 4
-
-
-def Fixed64ByteSize(field_number, fixed64):
-  return TagByteSize(field_number) + 8
-
-
-def SFixed32ByteSize(field_number, sfixed32):
-  return TagByteSize(field_number) + 4
-
-
-def SFixed64ByteSize(field_number, sfixed64):
-  return TagByteSize(field_number) + 8
-
-
-def FloatByteSize(field_number, flt):
-  return TagByteSize(field_number) + 4
-
-
-def DoubleByteSize(field_number, double):
-  return TagByteSize(field_number) + 8
-
-
-def BoolByteSize(field_number, b):
-  return TagByteSize(field_number) + 1
-
-
-def EnumByteSize(field_number, enum):
-  return UInt32ByteSize(field_number, enum)
-
-
-def StringByteSize(field_number, string):
-  return BytesByteSize(field_number, string.encode('utf-8'))
-
-
-def BytesByteSize(field_number, b):
-  return (TagByteSize(field_number)
-          + _VarUInt64ByteSizeNoTag(len(b))
-          + len(b))
-
-
-def GroupByteSize(field_number, message):
-  return (2 * TagByteSize(field_number)  # START and END group.
-          + message.ByteSize())
-
-
-def MessageByteSize(field_number, message):
-  return (TagByteSize(field_number)
-          + _VarUInt64ByteSizeNoTag(message.ByteSize())
-          + message.ByteSize())
-
-
-def MessageSetItemByteSize(field_number, msg):
-  # First compute the sizes of the tags.
-  # There are 2 tags for the beginning and ending of the repeated group, that
-  # is field number 1, one with field number 2 (type_id) and one with field
-  # number 3 (message).
-  total_size = (2 * TagByteSize(1) + TagByteSize(2) + TagByteSize(3))
-
-  # Add the number of bytes for type_id.
-  total_size += _VarUInt64ByteSizeNoTag(field_number)
-
-  message_size = msg.ByteSize()
-
-  # The number of bytes for encoding the length of the message.
-  total_size += _VarUInt64ByteSizeNoTag(message_size)
-
-  # The size of the message.
-  total_size += message_size
-  return total_size
-
-
-def TagByteSize(field_number):
-  """Returns the bytes required to serialize a tag with this field number."""
-  # Just pass in type 0, since the type won't affect the tag+type size.
-  return _VarUInt64ByteSizeNoTag(PackTag(field_number, 0))
-
-
-# Private helper function for the *ByteSize() functions above.
-
-def _VarUInt64ByteSizeNoTag(uint64):
-  """Returns the number of bytes required to serialize a single varint
-  using boundary value comparisons. (unrolled loop optimization -WPierce)
-  uint64 must be unsigned.
-  """
-  if uint64 <= 0x7f: return 1
-  if uint64 <= 0x3fff: return 2
-  if uint64 <= 0x1fffff: return 3
-  if uint64 <= 0xfffffff: return 4
-  if uint64 <= 0x7ffffffff: return 5
-  if uint64 <= 0x3ffffffffff: return 6
-  if uint64 <= 0x1ffffffffffff: return 7
-  if uint64 <= 0xffffffffffffff: return 8
-  if uint64 <= 0x7fffffffffffffff: return 9
-  if uint64 > UINT64_MAX:
-    raise message.EncodeError('Value out of range: %d' % uint64)
-  return 10
-
-
-NON_PACKABLE_TYPES = (
-  descriptor.FieldDescriptor.TYPE_STRING,
-  descriptor.FieldDescriptor.TYPE_GROUP,
-  descriptor.FieldDescriptor.TYPE_MESSAGE,
-  descriptor.FieldDescriptor.TYPE_BYTES
-)
-
-
-def IsTypePackable(field_type):
-  """Return true iff packable = true is valid for fields of this type.
-
-  Args:
-    field_type: a FieldDescriptor::Type value.
-
-  Returns:
-    True iff fields of this type are packable.
-  """
-  return field_type not in NON_PACKABLE_TYPES
diff --git a/libs/protobuf/python/google/protobuf/internal/wire_format_test.py b/libs/protobuf/python/google/protobuf/internal/wire_format_test.py
deleted file mode 100644
index f7ad0c7..0000000
--- a/libs/protobuf/python/google/protobuf/internal/wire_format_test.py
+++ /dev/null
@@ -1,252 +0,0 @@
-# Protocol Buffers - Google's data interchange format
-# Copyright 2008 Google Inc.  All rights reserved.
-# https://developers.google.com/protocol-buffers/
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-"""Test for google.protobuf.internal.wire_format."""
-
-__author__ = 'robinson@google.com (Will Robinson)'
-
-import unittest
-
-from google.protobuf import message
-from google.protobuf.internal import wire_format
-
-
-class WireFormatTest(unittest.TestCase):
-
-  def testPackTag(self):
-    field_number = 0xabc
-    tag_type = 2
-    self.assertEqual((field_number << 3) | tag_type,
-                     wire_format.PackTag(field_number, tag_type))
-    PackTag = wire_format.PackTag
-    # Number too high.
-    self.assertRaises(message.EncodeError, PackTag, field_number, 6)
-    # Number too low.
-    self.assertRaises(message.EncodeError, PackTag, field_number, -1)
-
-  def testUnpackTag(self):
-    # Test field numbers that will require various varint sizes.
-    for expected_field_number in (1, 15, 16, 2047, 2048):
-      for expected_wire_type in range(6):  # Highest-numbered wiretype is 5.
-        field_number, wire_type = wire_format.UnpackTag(
-            wire_format.PackTag(expected_field_number, expected_wire_type))
-        self.assertEqual(expected_field_number, field_number)
-        self.assertEqual(expected_wire_type, wire_type)
-
-    self.assertRaises(TypeError, wire_format.UnpackTag, None)
-    self.assertRaises(TypeError, wire_format.UnpackTag, 'abc')
-    self.assertRaises(TypeError, wire_format.UnpackTag, 0.0)
-    self.assertRaises(TypeError, wire_format.UnpackTag, object())
-
-  def testZigZagEncode(self):
-    Z = wire_format.ZigZagEncode
-    self.assertEqual(0, Z(0))
-    self.assertEqual(1, Z(-1))
-    self.assertEqual(2, Z(1))
-    self.assertEqual(3, Z(-2))
-    self.assertEqual(4, Z(2))
-    self.assertEqual(0xfffffffe, Z(0x7fffffff))
-    self.assertEqual(0xffffffff, Z(-0x80000000))
-    self.assertEqual(0xfffffffffffffffe, Z(0x7fffffffffffffff))
-    self.assertEqual(0xffffffffffffffff, Z(-0x8000000000000000))
-
-    self.assertRaises(TypeError, Z, None)
-    self.assertRaises(TypeError, Z, 'abcd')
-    self.assertRaises(TypeError, Z, 0.0)
-    self.assertRaises(TypeError, Z, object())
-
-  def testZigZagDecode(self):
-    Z = wire_format.ZigZagDecode
-    self.assertEqual(0, Z(0))
-    self.assertEqual(-1, Z(1))
-    self.assertEqual(1, Z(2))
-    self.assertEqual(-2, Z(3))
-    self.assertEqual(2, Z(4))
-    self.assertEqual(0x7fffffff, Z(0xfffffffe))
-    self.assertEqual(-0x80000000, Z(0xffffffff))
-    self.assertEqual(0x7fffffffffffffff, Z(0xfffffffffffffffe))
-    self.assertEqual(-0x8000000000000000, Z(0xffffffffffffffff))
-
-    self.assertRaises(TypeError, Z, None)
-    self.assertRaises(TypeError, Z, 'abcd')
-    self.assertRaises(TypeError, Z, 0.0)
-    self.assertRaises(TypeError, Z, object())
-
-  def NumericByteSizeTestHelper(self, byte_size_fn, value, expected_value_size):
-    # Use field numbers that cause various byte sizes for the tag information.
-    for field_number, tag_bytes in ((15, 1), (16, 2), (2047, 2), (2048, 3)):
-      expected_size = expected_value_size + tag_bytes
-      actual_size = byte_size_fn(field_number, value)
-      self.assertEqual(expected_size, actual_size,
-                       'byte_size_fn: %s, field_number: %d, value: %r\n'
-                       'Expected: %d, Actual: %d'% (
-          byte_size_fn, field_number, value, expected_size, actual_size))
-
-  def testByteSizeFunctions(self):
-    # Test all numeric *ByteSize() functions.
-    NUMERIC_ARGS = [
-        # Int32ByteSize().
-        [wire_format.Int32ByteSize, 0, 1],
-        [wire_format.Int32ByteSize, 127, 1],
-        [wire_format.Int32ByteSize, 128, 2],
-        [wire_format.Int32ByteSize, -1, 10],
-        # Int64ByteSize().
-        [wire_format.Int64ByteSize, 0, 1],
-        [wire_format.Int64ByteSize, 127, 1],
-        [wire_format.Int64ByteSize, 128, 2],
-        [wire_format.Int64ByteSize, -1, 10],
-        # UInt32ByteSize().
-        [wire_format.UInt32ByteSize, 0, 1],
-        [wire_format.UInt32ByteSize, 127, 1],
-        [wire_format.UInt32ByteSize, 128, 2],
-        [wire_format.UInt32ByteSize, wire_format.UINT32_MAX, 5],
-        # UInt64ByteSize().
-        [wire_format.UInt64ByteSize, 0, 1],
-        [wire_format.UInt64ByteSize, 127, 1],
-        [wire_format.UInt64ByteSize, 128, 2],
-        [wire_format.UInt64ByteSize, wire_format.UINT64_MAX, 10],
-        # SInt32ByteSize().
-        [wire_format.SInt32ByteSize, 0, 1],
-        [wire_format.SInt32ByteSize, -1, 1],
-        [wire_format.SInt32ByteSize, 1, 1],
-        [wire_format.SInt32ByteSize, -63, 1],
-        [wire_format.SInt32ByteSize, 63, 1],
-        [wire_format.SInt32ByteSize, -64, 1],
-        [wire_format.SInt32ByteSize, 64, 2],
-        # SInt64ByteSize().
-        [wire_format.SInt64ByteSize, 0, 1],
-        [wire_format.SInt64ByteSize, -1, 1],
-        [wire_format.SInt64ByteSize, 1, 1],
-        [wire_format.SInt64ByteSize, -63, 1],
-        [wire_format.SInt64ByteSize, 63, 1],
-        [wire_format.SInt64ByteSize, -64, 1],
-        [wire_format.SInt64ByteSize, 64, 2],
-        # Fixed32ByteSize().
-        [wire_format.Fixed32ByteSize, 0, 4],
-        [wire_format.Fixed32ByteSize, wire_format.UINT32_MAX, 4],
-        # Fixed64ByteSize().
-        [wire_format.Fixed64ByteSize, 0, 8],
-        [wire_format.Fixed64ByteSize, wire_format.UINT64_MAX, 8],
-        # SFixed32ByteSize().
-        [wire_format.SFixed32ByteSize, 0, 4],
-        [wire_format.SFixed32ByteSize, wire_format.INT32_MIN, 4],
-        [wire_format.SFixed32ByteSize, wire_format.INT32_MAX, 4],
-        # SFixed64ByteSize().
-        [wire_format.SFixed64ByteSize, 0, 8],
-        [wire_format.SFixed64ByteSize, wire_format.INT64_MIN, 8],
-        [wire_format.SFixed64ByteSize, wire_format.INT64_MAX, 8],
-        # FloatByteSize().
-        [wire_format.FloatByteSize, 0.0, 4],
-        [wire_format.FloatByteSize, 1000000000.0, 4],
-        [wire_format.FloatByteSize, -1000000000.0, 4],
-        # DoubleByteSize().
-        [wire_format.DoubleByteSize, 0.0, 8],
-        [wire_format.DoubleByteSize, 1000000000.0, 8],
-        [wire_format.DoubleByteSize, -1000000000.0, 8],
-        # BoolByteSize().
-        [wire_format.BoolByteSize, False, 1],
-        [wire_format.BoolByteSize, True, 1],
-        # EnumByteSize().
-        [wire_format.EnumByteSize, 0, 1],
-        [wire_format.EnumByteSize, 127, 1],
-        [wire_format.EnumByteSize, 128, 2],
-        [wire_format.EnumByteSize, wire_format.UINT32_MAX, 5],
-        ]
-    for args in NUMERIC_ARGS:
-      self.NumericByteSizeTestHelper(*args)
-
-    # Test strings and bytes.
-    for byte_size_fn in (wire_format.StringByteSize, wire_format.BytesByteSize):
-      # 1 byte for tag, 1 byte for length, 3 bytes for contents.
-      self.assertEqual(5, byte_size_fn(10, 'abc'))
-      # 2 bytes for tag, 1 byte for length, 3 bytes for contents.
-      self.assertEqual(6, byte_size_fn(16, 'abc'))
-      # 2 bytes for tag, 2 bytes for length, 128 bytes for contents.
-      self.assertEqual(132, byte_size_fn(16, 'a' * 128))
-
-    # Test UTF-8 string byte size calculation.
-    # 1 byte for tag, 1 byte for length, 8 bytes for content.
-    self.assertEqual(10, wire_format.StringByteSize(
-        5, b'\xd0\xa2\xd0\xb5\xd1\x81\xd1\x82'.decode('utf-8')))
-
-    class MockMessage(object):
-      def __init__(self, byte_size):
-        self.byte_size = byte_size
-      def ByteSize(self):
-        return self.byte_size
-
-    message_byte_size = 10
-    mock_message = MockMessage(byte_size=message_byte_size)
-    # Test groups.
-    # (2 * 1) bytes for begin and end tags, plus message_byte_size.
-    self.assertEqual(2 + message_byte_size,
-                     wire_format.GroupByteSize(1, mock_message))
-    # (2 * 2) bytes for begin and end tags, plus message_byte_size.
-    self.assertEqual(4 + message_byte_size,
-                     wire_format.GroupByteSize(16, mock_message))
-
-    # Test messages.
-    # 1 byte for tag, plus 1 byte for length, plus contents.
-    self.assertEqual(2 + mock_message.byte_size,
-                     wire_format.MessageByteSize(1, mock_message))
-    # 2 bytes for tag, plus 1 byte for length, plus contents.
-    self.assertEqual(3 + mock_message.byte_size,
-                     wire_format.MessageByteSize(16, mock_message))
-    # 2 bytes for tag, plus 2 bytes for length, plus contents.
-    mock_message.byte_size = 128
-    self.assertEqual(4 + mock_message.byte_size,
-                     wire_format.MessageByteSize(16, mock_message))
-
-
-    # Test message set item byte size.
-    # 4 bytes for tags, plus 1 byte for length, plus 1 byte for type_id,
-    # plus contents.
-    mock_message.byte_size = 10
-    self.assertEqual(mock_message.byte_size + 6,
-                     wire_format.MessageSetItemByteSize(1, mock_message))
-
-    # 4 bytes for tags, plus 2 bytes for length, plus 1 byte for type_id,
-    # plus contents.
-    mock_message.byte_size = 128
-    self.assertEqual(mock_message.byte_size + 7,
-                     wire_format.MessageSetItemByteSize(1, mock_message))
-
-    # 4 bytes for tags, plus 2 bytes for length, plus 2 byte for type_id,
-    # plus contents.
-    self.assertEqual(mock_message.byte_size + 8,
-                     wire_format.MessageSetItemByteSize(128, mock_message))
-
-    # Too-long varint.
-    self.assertRaises(message.EncodeError,
-                      wire_format.UInt64ByteSize, 1, 1 << 128)
-
-
-if __name__ == '__main__':
-  unittest.main()
diff --git a/libs/protobuf/python/google/protobuf/json_format.py b/libs/protobuf/python/google/protobuf/json_format.py
deleted file mode 100644
index 5024ed8..0000000
--- a/libs/protobuf/python/google/protobuf/json_format.py
+++ /dev/null
@@ -1,912 +0,0 @@
-# Protocol Buffers - Google's data interchange format
-# Copyright 2008 Google Inc.  All rights reserved.
-# https://developers.google.com/protocol-buffers/
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-"""Contains routines for printing protocol messages in JSON format.
-
-Simple usage example:
-
-  # Create a proto object and serialize it to a json format string.
-  message = my_proto_pb2.MyMessage(foo='bar')
-  json_string = json_format.MessageToJson(message)
-
-  # Parse a json format string to proto object.
-  message = json_format.Parse(json_string, my_proto_pb2.MyMessage())
-"""
-
-__author__ = 'jieluo@google.com (Jie Luo)'
-
-
-import base64
-from collections import OrderedDict
-import json
-import math
-from operator import methodcaller
-import re
-import sys
-
-from google.protobuf.internal import type_checkers
-from google.protobuf import descriptor
-from google.protobuf import symbol_database
-
-
-_TIMESTAMPFOMAT = '%Y-%m-%dT%H:%M:%S'
-_INT_TYPES = frozenset([descriptor.FieldDescriptor.CPPTYPE_INT32,
-                        descriptor.FieldDescriptor.CPPTYPE_UINT32,
-                        descriptor.FieldDescriptor.CPPTYPE_INT64,
-                        descriptor.FieldDescriptor.CPPTYPE_UINT64])
-_INT64_TYPES = frozenset([descriptor.FieldDescriptor.CPPTYPE_INT64,
-                          descriptor.FieldDescriptor.CPPTYPE_UINT64])
-_FLOAT_TYPES = frozenset([descriptor.FieldDescriptor.CPPTYPE_FLOAT,
-                          descriptor.FieldDescriptor.CPPTYPE_DOUBLE])
-_INFINITY = 'Infinity'
-_NEG_INFINITY = '-Infinity'
-_NAN = 'NaN'
-
-_UNPAIRED_SURROGATE_PATTERN = re.compile(
-    u'[\ud800-\udbff](?![\udc00-\udfff])|(?<![\ud800-\udbff])[\udc00-\udfff]')
-
-_VALID_EXTENSION_NAME = re.compile(r'\[[a-zA-Z0-9\._]*\]$')
-
-
-class Error(Exception):
-  """Top-level module error for json_format."""
-
-
-class SerializeToJsonError(Error):
-  """Thrown if serialization to JSON fails."""
-
-
-class ParseError(Error):
-  """Thrown in case of parsing error."""
-
-
-def MessageToJson(
-    message,
-    including_default_value_fields=False,
-    preserving_proto_field_name=False,
-    indent=2,
-    sort_keys=False,
-    use_integers_for_enums=False,
-    descriptor_pool=None,
-    float_precision=None,
-    ensure_ascii=True):
-  """Converts protobuf message to JSON format.
-
-  Args:
-    message: The protocol buffers message instance to serialize.
-    including_default_value_fields: If True, singular primitive fields,
-        repeated fields, and map fields will always be serialized.  If
-        False, only serialize non-empty fields.  Singular message fields
-        and oneof fields are not affected by this option.
-    preserving_proto_field_name: If True, use the original proto field
-        names as defined in the .proto file. If False, convert the field
-        names to lowerCamelCase.
-    indent: The JSON object will be pretty-printed with this indent level.
-        An indent level of 0 or negative will only insert newlines.
-    sort_keys: If True, then the output will be sorted by field names.
-    use_integers_for_enums: If true, print integers instead of enum names.
-    descriptor_pool: A Descriptor Pool for resolving types. If None use the
-        default.
-    float_precision: If set, use this to specify float field valid digits.
-    ensure_ascii: If True, strings with non-ASCII characters are escaped.
-        If False, Unicode strings are returned unchanged.
-
-  Returns:
-    A string containing the JSON formatted protocol buffer message.
-  """
-  printer = _Printer(
-      including_default_value_fields,
-      preserving_proto_field_name,
-      use_integers_for_enums,
-      descriptor_pool,
-      float_precision=float_precision)
-  return printer.ToJsonString(message, indent, sort_keys, ensure_ascii)
-
-
-def MessageToDict(
-    message,
-    including_default_value_fields=False,
-    preserving_proto_field_name=False,
-    use_integers_for_enums=False,
-    descriptor_pool=None,
-    float_precision=None):
-  """Converts protobuf message to a dictionary.
-
-  When the dictionary is encoded to JSON, it conforms to proto3 JSON spec.
-
-  Args:
-    message: The protocol buffers message instance to serialize.
-    including_default_value_fields: If True, singular primitive fields,
-        repeated fields, and map fields will always be serialized.  If
-        False, only serialize non-empty fields.  Singular message fields
-        and oneof fields are not affected by this option.
-    preserving_proto_field_name: If True, use the original proto field
-        names as defined in the .proto file. If False, convert the field
-        names to lowerCamelCase.
-    use_integers_for_enums: If true, print integers instead of enum names.
-    descriptor_pool: A Descriptor Pool for resolving types. If None use the
-        default.
-    float_precision: If set, use this to specify float field valid digits.
-
-  Returns:
-    A dict representation of the protocol buffer message.
-  """
-  printer = _Printer(
-      including_default_value_fields,
-      preserving_proto_field_name,
-      use_integers_for_enums,
-      descriptor_pool,
-      float_precision=float_precision)
-  # pylint: disable=protected-access
-  return printer._MessageToJsonObject(message)
-
-
-def _IsMapEntry(field):
-  return (field.type == descriptor.FieldDescriptor.TYPE_MESSAGE and
-          field.message_type.has_options and
-          field.message_type.GetOptions().map_entry)
-
-
-class _Printer(object):
-  """JSON format printer for protocol message."""
-
-  def __init__(
-      self,
-      including_default_value_fields=False,
-      preserving_proto_field_name=False,
-      use_integers_for_enums=False,
-      descriptor_pool=None,
-      float_precision=None):
-    self.including_default_value_fields = including_default_value_fields
-    self.preserving_proto_field_name = preserving_proto_field_name
-    self.use_integers_for_enums = use_integers_for_enums
-    self.descriptor_pool = descriptor_pool
-    if float_precision:
-      self.float_format = '.{}g'.format(float_precision)
-    else:
-      self.float_format = None
-
-  def ToJsonString(self, message, indent, sort_keys, ensure_ascii):
-    js = self._MessageToJsonObject(message)
-    return json.dumps(
-        js, indent=indent, sort_keys=sort_keys, ensure_ascii=ensure_ascii)
-
-  def _MessageToJsonObject(self, message):
-    """Converts message to an object according to Proto3 JSON Specification."""
-    message_descriptor = message.DESCRIPTOR
-    full_name = message_descriptor.full_name
-    if _IsWrapperMessage(message_descriptor):
-      return self._WrapperMessageToJsonObject(message)
-    if full_name in _WKTJSONMETHODS:
-      return methodcaller(_WKTJSONMETHODS[full_name][0], message)(self)
-    js = {}
-    return self._RegularMessageToJsonObject(message, js)
-
-  def _RegularMessageToJsonObject(self, message, js):
-    """Converts normal message according to Proto3 JSON Specification."""
-    fields = message.ListFields()
-
-    try:
-      for field, value in fields:
-        if self.preserving_proto_field_name:
-          name = field.name
-        else:
-          name = field.json_name
-        if _IsMapEntry(field):
-          # Convert a map field.
-          v_field = field.message_type.fields_by_name['value']
-          js_map = {}
-          for key in value:
-            if isinstance(key, bool):
-              if key:
-                recorded_key = 'true'
-              else:
-                recorded_key = 'false'
-            else:
-              recorded_key = str(key)
-            js_map[recorded_key] = self._FieldToJsonObject(
-                v_field, value[key])
-          js[name] = js_map
-        elif field.label == descriptor.FieldDescriptor.LABEL_REPEATED:
-          # Convert a repeated field.
-          js[name] = [self._FieldToJsonObject(field, k)
-                      for k in value]
-        elif field.is_extension:
-          name = '[%s]' % field.full_name
-          js[name] = self._FieldToJsonObject(field, value)
-        else:
-          js[name] = self._FieldToJsonObject(field, value)
-
-      # Serialize default value if including_default_value_fields is True.
-      if self.including_default_value_fields:
-        message_descriptor = message.DESCRIPTOR
-        for field in message_descriptor.fields:
-          # Singular message fields and oneof fields will not be affected.
-          if ((field.label != descriptor.FieldDescriptor.LABEL_REPEATED and
-               field.cpp_type == descriptor.FieldDescriptor.CPPTYPE_MESSAGE) or
-              field.containing_oneof):
-            continue
-          if self.preserving_proto_field_name:
-            name = field.name
-          else:
-            name = field.json_name
-          if name in js:
-            # Skip the field which has been serialized already.
-            continue
-          if _IsMapEntry(field):
-            js[name] = {}
-          elif field.label == descriptor.FieldDescriptor.LABEL_REPEATED:
-            js[name] = []
-          else:
-            js[name] = self._FieldToJsonObject(field, field.default_value)
-
-    except ValueError as e:
-      raise SerializeToJsonError(
-          'Failed to serialize {0} field: {1}.'.format(field.name, e))
-
-    return js
-
-  def _FieldToJsonObject(self, field, value):
-    """Converts field value according to Proto3 JSON Specification."""
-    if field.cpp_type == descriptor.FieldDescriptor.CPPTYPE_MESSAGE:
-      return self._MessageToJsonObject(value)
-    elif field.cpp_type == descriptor.FieldDescriptor.CPPTYPE_ENUM:
-      if self.use_integers_for_enums:
-        return value
-      if field.enum_type.full_name == 'google.protobuf.NullValue':
-        return None
-      enum_value = field.enum_type.values_by_number.get(value, None)
-      if enum_value is not None:
-        return enum_value.name
-      else:
-        if field.file.syntax == 'proto3':
-          return value
-        raise SerializeToJsonError('Enum field contains an integer value '
-                                   'which can not mapped to an enum value.')
-    elif field.cpp_type == descriptor.FieldDescriptor.CPPTYPE_STRING:
-      if field.type == descriptor.FieldDescriptor.TYPE_BYTES:
-        # Use base64 Data encoding for bytes
-        return base64.b64encode(value).decode('utf-8')
-      else:
-        return value
-    elif field.cpp_type == descriptor.FieldDescriptor.CPPTYPE_BOOL:
-      return bool(value)
-    elif field.cpp_type in _INT64_TYPES:
-      return str(value)
-    elif field.cpp_type in _FLOAT_TYPES:
-      if math.isinf(value):
-        if value < 0.0:
-          return _NEG_INFINITY
-        else:
-          return _INFINITY
-      if math.isnan(value):
-        return _NAN
-      if field.cpp_type == descriptor.FieldDescriptor.CPPTYPE_FLOAT:
-        if self.float_format:
-          return float(format(value, self.float_format))
-        else:
-          return type_checkers.ToShortestFloat(value)
-
-    return value
-
-  def _AnyMessageToJsonObject(self, message):
-    """Converts Any message according to Proto3 JSON Specification."""
-    if not message.ListFields():
-      return {}
-    # Must print @type first, use OrderedDict instead of {}
-    js = OrderedDict()
-    type_url = message.type_url
-    js['@type'] = type_url
-    sub_message = _CreateMessageFromTypeUrl(type_url, self.descriptor_pool)
-    sub_message.ParseFromString(message.value)
-    message_descriptor = sub_message.DESCRIPTOR
-    full_name = message_descriptor.full_name
-    if _IsWrapperMessage(message_descriptor):
-      js['value'] = self._WrapperMessageToJsonObject(sub_message)
-      return js
-    if full_name in _WKTJSONMETHODS:
-      js['value'] = methodcaller(_WKTJSONMETHODS[full_name][0],
-                                 sub_message)(self)
-      return js
-    return self._RegularMessageToJsonObject(sub_message, js)
-
-  def _GenericMessageToJsonObject(self, message):
-    """Converts message according to Proto3 JSON Specification."""
-    # Duration, Timestamp and FieldMask have ToJsonString method to do the
-    # convert. Users can also call the method directly.
-    return message.ToJsonString()
-
-  def _ValueMessageToJsonObject(self, message):
-    """Converts Value message according to Proto3 JSON Specification."""
-    which = message.WhichOneof('kind')
-    # If the Value message is not set treat as null_value when serialize
-    # to JSON. The parse back result will be different from original message.
-    if which is None or which == 'null_value':
-      return None
-    if which == 'list_value':
-      return self._ListValueMessageToJsonObject(message.list_value)
-    if which == 'struct_value':
-      value = message.struct_value
-    else:
-      value = getattr(message, which)
-    oneof_descriptor = message.DESCRIPTOR.fields_by_name[which]
-    return self._FieldToJsonObject(oneof_descriptor, value)
-
-  def _ListValueMessageToJsonObject(self, message):
-    """Converts ListValue message according to Proto3 JSON Specification."""
-    return [self._ValueMessageToJsonObject(value)
-            for value in message.values]
-
-  def _StructMessageToJsonObject(self, message):
-    """Converts Struct message according to Proto3 JSON Specification."""
-    fields = message.fields
-    ret = {}
-    for key in fields:
-      ret[key] = self._ValueMessageToJsonObject(fields[key])
-    return ret
-
-  def _WrapperMessageToJsonObject(self, message):
-    return self._FieldToJsonObject(
-        message.DESCRIPTOR.fields_by_name['value'], message.value)
-
-
-def _IsWrapperMessage(message_descriptor):
-  return message_descriptor.file.name == 'google/protobuf/wrappers.proto'
-
-
-def _DuplicateChecker(js):
-  result = {}
-  for name, value in js:
-    if name in result:
-      raise ParseError('Failed to load JSON: duplicate key {0}.'.format(name))
-    result[name] = value
-  return result
-
-
-def _CreateMessageFromTypeUrl(type_url, descriptor_pool):
-  """Creates a message from a type URL."""
-  db = symbol_database.Default()
-  pool = db.pool if descriptor_pool is None else descriptor_pool
-  type_name = type_url.split('/')[-1]
-  try:
-    message_descriptor = pool.FindMessageTypeByName(type_name)
-  except KeyError:
-    raise TypeError(
-        'Can not find message descriptor by type_url: {0}'.format(type_url))
-  message_class = db.GetPrototype(message_descriptor)
-  return message_class()
-
-
-def Parse(text,
-          message,
-          ignore_unknown_fields=False,
-          descriptor_pool=None,
-          max_recursion_depth=100):
-  """Parses a JSON representation of a protocol message into a message.
-
-  Args:
-    text: Message JSON representation.
-    message: A protocol buffer message to merge into.
-    ignore_unknown_fields: If True, do not raise errors for unknown fields.
-    descriptor_pool: A Descriptor Pool for resolving types. If None use the
-      default.
-    max_recursion_depth: max recursion depth of JSON message to be
-      deserialized. JSON messages over this depth will fail to be
-      deserialized. Default value is 100.
-
-  Returns:
-    The same message passed as argument.
-
-  Raises::
-    ParseError: On JSON parsing problems.
-  """
-  if not isinstance(text, str):
-    text = text.decode('utf-8')
-  try:
-    js = json.loads(text, object_pairs_hook=_DuplicateChecker)
-  except ValueError as e:
-    raise ParseError('Failed to load JSON: {0}.'.format(str(e)))
-  return ParseDict(js, message, ignore_unknown_fields, descriptor_pool,
-                   max_recursion_depth)
-
-
-def ParseDict(js_dict,
-              message,
-              ignore_unknown_fields=False,
-              descriptor_pool=None,
-              max_recursion_depth=100):
-  """Parses a JSON dictionary representation into a message.
-
-  Args:
-    js_dict: Dict representation of a JSON message.
-    message: A protocol buffer message to merge into.
-    ignore_unknown_fields: If True, do not raise errors for unknown fields.
-    descriptor_pool: A Descriptor Pool for resolving types. If None use the
-      default.
-    max_recursion_depth: max recursion depth of JSON message to be
-      deserialized. JSON messages over this depth will fail to be
-      deserialized. Default value is 100.
-
-  Returns:
-    The same message passed as argument.
-  """
-  parser = _Parser(ignore_unknown_fields, descriptor_pool, max_recursion_depth)
-  parser.ConvertMessage(js_dict, message, '')
-  return message
-
-
-_INT_OR_FLOAT = (int, float)
-
-
-class _Parser(object):
-  """JSON format parser for protocol message."""
-
-  def __init__(self, ignore_unknown_fields, descriptor_pool,
-               max_recursion_depth):
-    self.ignore_unknown_fields = ignore_unknown_fields
-    self.descriptor_pool = descriptor_pool
-    self.max_recursion_depth = max_recursion_depth
-    self.recursion_depth = 0
-
-  def ConvertMessage(self, value, message, path):
-    """Convert a JSON object into a message.
-
-    Args:
-      value: A JSON object.
-      message: A WKT or regular protocol message to record the data.
-      path: parent path to log parse error info.
-
-    Raises:
-      ParseError: In case of convert problems.
-    """
-    self.recursion_depth += 1
-    if self.recursion_depth > self.max_recursion_depth:
-      raise ParseError('Message too deep. Max recursion depth is {0}'.format(
-          self.max_recursion_depth))
-    message_descriptor = message.DESCRIPTOR
-    full_name = message_descriptor.full_name
-    if not path:
-      path = message_descriptor.name
-    if _IsWrapperMessage(message_descriptor):
-      self._ConvertWrapperMessage(value, message, path)
-    elif full_name in _WKTJSONMETHODS:
-      methodcaller(_WKTJSONMETHODS[full_name][1], value, message, path)(self)
-    else:
-      self._ConvertFieldValuePair(value, message, path)
-    self.recursion_depth -= 1
-
-  def _ConvertFieldValuePair(self, js, message, path):
-    """Convert field value pairs into regular message.
-
-    Args:
-      js: A JSON object to convert the field value pairs.
-      message: A regular protocol message to record the data.
-      path: parent path to log parse error info.
-
-    Raises:
-      ParseError: In case of problems converting.
-    """
-    names = []
-    message_descriptor = message.DESCRIPTOR
-    fields_by_json_name = dict((f.json_name, f)
-                               for f in message_descriptor.fields)
-    for name in js:
-      try:
-        field = fields_by_json_name.get(name, None)
-        if not field:
-          field = message_descriptor.fields_by_name.get(name, None)
-        if not field and _VALID_EXTENSION_NAME.match(name):
-          if not message_descriptor.is_extendable:
-            raise ParseError(
-                'Message type {0} does not have extensions at {1}'.format(
-                    message_descriptor.full_name, path))
-          identifier = name[1:-1]  # strip [] brackets
-          # pylint: disable=protected-access
-          field = message.Extensions._FindExtensionByName(identifier)
-          # pylint: enable=protected-access
-          if not field:
-            # Try looking for extension by the message type name, dropping the
-            # field name following the final . separator in full_name.
-            identifier = '.'.join(identifier.split('.')[:-1])
-            # pylint: disable=protected-access
-            field = message.Extensions._FindExtensionByName(identifier)
-            # pylint: enable=protected-access
-        if not field:
-          if self.ignore_unknown_fields:
-            continue
-          raise ParseError(
-              ('Message type "{0}" has no field named "{1}" at "{2}".\n'
-               ' Available Fields(except extensions): "{3}"').format(
-                   message_descriptor.full_name, name, path,
-                   [f.json_name for f in message_descriptor.fields]))
-        if name in names:
-          raise ParseError('Message type "{0}" should not have multiple '
-                           '"{1}" fields at "{2}".'.format(
-                               message.DESCRIPTOR.full_name, name, path))
-        names.append(name)
-        value = js[name]
-        # Check no other oneof field is parsed.
-        if field.containing_oneof is not None and value is not None:
-          oneof_name = field.containing_oneof.name
-          if oneof_name in names:
-            raise ParseError('Message type "{0}" should not have multiple '
-                             '"{1}" oneof fields at "{2}".'.format(
-                                 message.DESCRIPTOR.full_name, oneof_name,
-                                 path))
-          names.append(oneof_name)
-
-        if value is None:
-          if (field.cpp_type == descriptor.FieldDescriptor.CPPTYPE_MESSAGE
-              and field.message_type.full_name == 'google.protobuf.Value'):
-            sub_message = getattr(message, field.name)
-            sub_message.null_value = 0
-          elif (field.cpp_type == descriptor.FieldDescriptor.CPPTYPE_ENUM
-                and field.enum_type.full_name == 'google.protobuf.NullValue'):
-            setattr(message, field.name, 0)
-          else:
-            message.ClearField(field.name)
-          continue
-
-        # Parse field value.
-        if _IsMapEntry(field):
-          message.ClearField(field.name)
-          self._ConvertMapFieldValue(value, message, field,
-                                     '{0}.{1}'.format(path, name))
-        elif field.label == descriptor.FieldDescriptor.LABEL_REPEATED:
-          message.ClearField(field.name)
-          if not isinstance(value, list):
-            raise ParseError('repeated field {0} must be in [] which is '
-                             '{1} at {2}'.format(name, value, path))
-          if field.cpp_type == descriptor.FieldDescriptor.CPPTYPE_MESSAGE:
-            # Repeated message field.
-            for index, item in enumerate(value):
-              sub_message = getattr(message, field.name).add()
-              # None is a null_value in Value.
-              if (item is None and
-                  sub_message.DESCRIPTOR.full_name != 'google.protobuf.Value'):
-                raise ParseError('null is not allowed to be used as an element'
-                                 ' in a repeated field at {0}.{1}[{2}]'.format(
-                                     path, name, index))
-              self.ConvertMessage(item, sub_message,
-                                  '{0}.{1}[{2}]'.format(path, name, index))
-          else:
-            # Repeated scalar field.
-            for index, item in enumerate(value):
-              if item is None:
-                raise ParseError('null is not allowed to be used as an element'
-                                 ' in a repeated field at {0}.{1}[{2}]'.format(
-                                     path, name, index))
-              getattr(message, field.name).append(
-                  _ConvertScalarFieldValue(
-                      item, field, '{0}.{1}[{2}]'.format(path, name, index)))
-        elif field.cpp_type == descriptor.FieldDescriptor.CPPTYPE_MESSAGE:
-          if field.is_extension:
-            sub_message = message.Extensions[field]
-          else:
-            sub_message = getattr(message, field.name)
-          sub_message.SetInParent()
-          self.ConvertMessage(value, sub_message, '{0}.{1}'.format(path, name))
-        else:
-          if field.is_extension:
-            message.Extensions[field] = _ConvertScalarFieldValue(
-                value, field, '{0}.{1}'.format(path, name))
-          else:
-            setattr(
-                message, field.name,
-                _ConvertScalarFieldValue(value, field,
-                                         '{0}.{1}'.format(path, name)))
-      except ParseError as e:
-        if field and field.containing_oneof is None:
-          raise ParseError('Failed to parse {0} field: {1}.'.format(name, e))
-        else:
-          raise ParseError(str(e))
-      except ValueError as e:
-        raise ParseError('Failed to parse {0} field: {1}.'.format(name, e))
-      except TypeError as e:
-        raise ParseError('Failed to parse {0} field: {1}.'.format(name, e))
-
-  def _ConvertAnyMessage(self, value, message, path):
-    """Convert a JSON representation into Any message."""
-    if isinstance(value, dict) and not value:
-      return
-    try:
-      type_url = value['@type']
-    except KeyError:
-      raise ParseError(
-          '@type is missing when parsing any message at {0}'.format(path))
-
-    try:
-      sub_message = _CreateMessageFromTypeUrl(type_url, self.descriptor_pool)
-    except TypeError as e:
-      raise ParseError('{0} at {1}'.format(e, path))
-    message_descriptor = sub_message.DESCRIPTOR
-    full_name = message_descriptor.full_name
-    if _IsWrapperMessage(message_descriptor):
-      self._ConvertWrapperMessage(value['value'], sub_message,
-                                  '{0}.value'.format(path))
-    elif full_name in _WKTJSONMETHODS:
-      methodcaller(_WKTJSONMETHODS[full_name][1], value['value'], sub_message,
-                   '{0}.value'.format(path))(
-                       self)
-    else:
-      del value['@type']
-      self._ConvertFieldValuePair(value, sub_message, path)
-      value['@type'] = type_url
-    # Sets Any message
-    message.value = sub_message.SerializeToString()
-    message.type_url = type_url
-
-  def _ConvertGenericMessage(self, value, message, path):
-    """Convert a JSON representation into message with FromJsonString."""
-    # Duration, Timestamp, FieldMask have a FromJsonString method to do the
-    # conversion. Users can also call the method directly.
-    try:
-      message.FromJsonString(value)
-    except ValueError as e:
-      raise ParseError('{0} at {1}'.format(e, path))
-
-  def _ConvertValueMessage(self, value, message, path):
-    """Convert a JSON representation into Value message."""
-    if isinstance(value, dict):
-      self._ConvertStructMessage(value, message.struct_value, path)
-    elif isinstance(value, list):
-      self._ConvertListValueMessage(value, message.list_value, path)
-    elif value is None:
-      message.null_value = 0
-    elif isinstance(value, bool):
-      message.bool_value = value
-    elif isinstance(value, str):
-      message.string_value = value
-    elif isinstance(value, _INT_OR_FLOAT):
-      message.number_value = value
-    else:
-      raise ParseError('Value {0} has unexpected type {1} at {2}'.format(
-          value, type(value), path))
-
-  def _ConvertListValueMessage(self, value, message, path):
-    """Convert a JSON representation into ListValue message."""
-    if not isinstance(value, list):
-      raise ParseError('ListValue must be in [] which is {0} at {1}'.format(
-          value, path))
-    message.ClearField('values')
-    for index, item in enumerate(value):
-      self._ConvertValueMessage(item, message.values.add(),
-                                '{0}[{1}]'.format(path, index))
-
-  def _ConvertStructMessage(self, value, message, path):
-    """Convert a JSON representation into Struct message."""
-    if not isinstance(value, dict):
-      raise ParseError('Struct must be in a dict which is {0} at {1}'.format(
-          value, path))
-    # Clear will mark the struct as modified so it will be created even if
-    # there are no values.
-    message.Clear()
-    for key in value:
-      self._ConvertValueMessage(value[key], message.fields[key],
-                                '{0}.{1}'.format(path, key))
-    return
-
-  def _ConvertWrapperMessage(self, value, message, path):
-    """Convert a JSON representation into Wrapper message."""
-    field = message.DESCRIPTOR.fields_by_name['value']
-    setattr(
-        message, 'value',
-        _ConvertScalarFieldValue(value, field, path='{0}.value'.format(path)))
-
-  def _ConvertMapFieldValue(self, value, message, field, path):
-    """Convert map field value for a message map field.
-
-    Args:
-      value: A JSON object to convert the map field value.
-      message: A protocol message to record the converted data.
-      field: The descriptor of the map field to be converted.
-      path: parent path to log parse error info.
-
-    Raises:
-      ParseError: In case of convert problems.
-    """
-    if not isinstance(value, dict):
-      raise ParseError(
-          'Map field {0} must be in a dict which is {1} at {2}'.format(
-              field.name, value, path))
-    key_field = field.message_type.fields_by_name['key']
-    value_field = field.message_type.fields_by_name['value']
-    for key in value:
-      key_value = _ConvertScalarFieldValue(key, key_field,
-                                           '{0}.key'.format(path), True)
-      if value_field.cpp_type == descriptor.FieldDescriptor.CPPTYPE_MESSAGE:
-        self.ConvertMessage(value[key],
-                            getattr(message, field.name)[key_value],
-                            '{0}[{1}]'.format(path, key_value))
-      else:
-        getattr(message, field.name)[key_value] = _ConvertScalarFieldValue(
-            value[key], value_field, path='{0}[{1}]'.format(path, key_value))
-
-
-def _ConvertScalarFieldValue(value, field, path, require_str=False):
-  """Convert a single scalar field value.
-
-  Args:
-    value: A scalar value to convert the scalar field value.
-    field: The descriptor of the field to convert.
-    path: parent path to log parse error info.
-    require_str: If True, the field value must be a str.
-
-  Returns:
-    The converted scalar field value
-
-  Raises:
-    ParseError: In case of convert problems.
-  """
-  try:
-    if field.cpp_type in _INT_TYPES:
-      return _ConvertInteger(value)
-    elif field.cpp_type in _FLOAT_TYPES:
-      return _ConvertFloat(value, field)
-    elif field.cpp_type == descriptor.FieldDescriptor.CPPTYPE_BOOL:
-      return _ConvertBool(value, require_str)
-    elif field.cpp_type == descriptor.FieldDescriptor.CPPTYPE_STRING:
-      if field.type == descriptor.FieldDescriptor.TYPE_BYTES:
-        if isinstance(value, str):
-          encoded = value.encode('utf-8')
-        else:
-          encoded = value
-        # Add extra padding '='
-        padded_value = encoded + b'=' * (4 - len(encoded) % 4)
-        return base64.urlsafe_b64decode(padded_value)
-      else:
-        # Checking for unpaired surrogates appears to be unreliable,
-        # depending on the specific Python version, so we check manually.
-        if _UNPAIRED_SURROGATE_PATTERN.search(value):
-          raise ParseError('Unpaired surrogate')
-        return value
-    elif field.cpp_type == descriptor.FieldDescriptor.CPPTYPE_ENUM:
-      # Convert an enum value.
-      enum_value = field.enum_type.values_by_name.get(value, None)
-      if enum_value is None:
-        try:
-          number = int(value)
-          enum_value = field.enum_type.values_by_number.get(number, None)
-        except ValueError:
-          raise ParseError('Invalid enum value {0} for enum type {1}'.format(
-              value, field.enum_type.full_name))
-        if enum_value is None:
-          if field.file.syntax == 'proto3':
-            # Proto3 accepts unknown enums.
-            return number
-          raise ParseError('Invalid enum value {0} for enum type {1}'.format(
-              value, field.enum_type.full_name))
-      return enum_value.number
-  except ParseError as e:
-    raise ParseError('{0} at {1}'.format(e, path))
-
-
-def _ConvertInteger(value):
-  """Convert an integer.
-
-  Args:
-    value: A scalar value to convert.
-
-  Returns:
-    The integer value.
-
-  Raises:
-    ParseError: If an integer couldn't be consumed.
-  """
-  if isinstance(value, float) and not value.is_integer():
-    raise ParseError('Couldn\'t parse integer: {0}'.format(value))
-
-  if isinstance(value, str) and value.find(' ') != -1:
-    raise ParseError('Couldn\'t parse integer: "{0}"'.format(value))
-
-  if isinstance(value, bool):
-    raise ParseError('Bool value {0} is not acceptable for '
-                     'integer field'.format(value))
-
-  return int(value)
-
-
-def _ConvertFloat(value, field):
-  """Convert an floating point number."""
-  if isinstance(value, float):
-    if math.isnan(value):
-      raise ParseError('Couldn\'t parse NaN, use quoted "NaN" instead')
-    if math.isinf(value):
-      if value > 0:
-        raise ParseError('Couldn\'t parse Infinity or value too large, '
-                         'use quoted "Infinity" instead')
-      else:
-        raise ParseError('Couldn\'t parse -Infinity or value too small, '
-                         'use quoted "-Infinity" instead')
-    if field.cpp_type == descriptor.FieldDescriptor.CPPTYPE_FLOAT:
-      # pylint: disable=protected-access
-      if value > type_checkers._FLOAT_MAX:
-        raise ParseError('Float value too large')
-      # pylint: disable=protected-access
-      if value < type_checkers._FLOAT_MIN:
-        raise ParseError('Float value too small')
-  if value == 'nan':
-    raise ParseError('Couldn\'t parse float "nan", use "NaN" instead')
-  try:
-    # Assume Python compatible syntax.
-    return float(value)
-  except ValueError:
-    # Check alternative spellings.
-    if value == _NEG_INFINITY:
-      return float('-inf')
-    elif value == _INFINITY:
-      return float('inf')
-    elif value == _NAN:
-      return float('nan')
-    else:
-      raise ParseError('Couldn\'t parse float: {0}'.format(value))
-
-
-def _ConvertBool(value, require_str):
-  """Convert a boolean value.
-
-  Args:
-    value: A scalar value to convert.
-    require_str: If True, value must be a str.
-
-  Returns:
-    The bool parsed.
-
-  Raises:
-    ParseError: If a boolean value couldn't be consumed.
-  """
-  if require_str:
-    if value == 'true':
-      return True
-    elif value == 'false':
-      return False
-    else:
-      raise ParseError('Expected "true" or "false", not {0}'.format(value))
-
-  if not isinstance(value, bool):
-    raise ParseError('Expected true or false without quotes')
-  return value
-
-_WKTJSONMETHODS = {
-    'google.protobuf.Any': ['_AnyMessageToJsonObject',
-                            '_ConvertAnyMessage'],
-    'google.protobuf.Duration': ['_GenericMessageToJsonObject',
-                                 '_ConvertGenericMessage'],
-    'google.protobuf.FieldMask': ['_GenericMessageToJsonObject',
-                                  '_ConvertGenericMessage'],
-    'google.protobuf.ListValue': ['_ListValueMessageToJsonObject',
-                                  '_ConvertListValueMessage'],
-    'google.protobuf.Struct': ['_StructMessageToJsonObject',
-                               '_ConvertStructMessage'],
-    'google.protobuf.Timestamp': ['_GenericMessageToJsonObject',
-                                  '_ConvertGenericMessage'],
-    'google.protobuf.Value': ['_ValueMessageToJsonObject',
-                              '_ConvertValueMessage']
-}
diff --git a/libs/protobuf/python/google/protobuf/message.py b/libs/protobuf/python/google/protobuf/message.py
deleted file mode 100644
index 76c6802..0000000
--- a/libs/protobuf/python/google/protobuf/message.py
+++ /dev/null
@@ -1,424 +0,0 @@
-# Protocol Buffers - Google's data interchange format
-# Copyright 2008 Google Inc.  All rights reserved.
-# https://developers.google.com/protocol-buffers/
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# TODO(robinson): We should just make these methods all "pure-virtual" and move
-# all implementation out, into reflection.py for now.
-
-
-"""Contains an abstract base class for protocol messages."""
-
-__author__ = 'robinson@google.com (Will Robinson)'
-
-class Error(Exception):
-  """Base error type for this module."""
-  pass
-
-
-class DecodeError(Error):
-  """Exception raised when deserializing messages."""
-  pass
-
-
-class EncodeError(Error):
-  """Exception raised when serializing messages."""
-  pass
-
-
-class Message(object):
-
-  """Abstract base class for protocol messages.
-
-  Protocol message classes are almost always generated by the protocol
-  compiler.  These generated types subclass Message and implement the methods
-  shown below.
-  """
-
-  # TODO(robinson): Link to an HTML document here.
-
-  # TODO(robinson): Document that instances of this class will also
-  # have an Extensions attribute with __getitem__ and __setitem__.
-  # Again, not sure how to best convey this.
-
-  # TODO(robinson): Document that the class must also have a static
-  #   RegisterExtension(extension_field) method.
-  #   Not sure how to best express at this point.
-
-  # TODO(robinson): Document these fields and methods.
-
-  __slots__ = []
-
-  #: The :class:`google.protobuf.descriptor.Descriptor` for this message type.
-  DESCRIPTOR = None
-
-  def __deepcopy__(self, memo=None):
-    clone = type(self)()
-    clone.MergeFrom(self)
-    return clone
-
-  def __eq__(self, other_msg):
-    """Recursively compares two messages by value and structure."""
-    raise NotImplementedError
-
-  def __ne__(self, other_msg):
-    # Can't just say self != other_msg, since that would infinitely recurse. :)
-    return not self == other_msg
-
-  def __hash__(self):
-    raise TypeError('unhashable object')
-
-  def __str__(self):
-    """Outputs a human-readable representation of the message."""
-    raise NotImplementedError
-
-  def __unicode__(self):
-    """Outputs a human-readable representation of the message."""
-    raise NotImplementedError
-
-  def MergeFrom(self, other_msg):
-    """Merges the contents of the specified message into current message.
-
-    This method merges the contents of the specified message into the current
-    message. Singular fields that are set in the specified message overwrite
-    the corresponding fields in the current message. Repeated fields are
-    appended. Singular sub-messages and groups are recursively merged.
-
-    Args:
-      other_msg (Message): A message to merge into the current message.
-    """
-    raise NotImplementedError
-
-  def CopyFrom(self, other_msg):
-    """Copies the content of the specified message into the current message.
-
-    The method clears the current message and then merges the specified
-    message using MergeFrom.
-
-    Args:
-      other_msg (Message): A message to copy into the current one.
-    """
-    if self is other_msg:
-      return
-    self.Clear()
-    self.MergeFrom(other_msg)
-
-  def Clear(self):
-    """Clears all data that was set in the message."""
-    raise NotImplementedError
-
-  def SetInParent(self):
-    """Mark this as present in the parent.
-
-    This normally happens automatically when you assign a field of a
-    sub-message, but sometimes you want to make the sub-message
-    present while keeping it empty.  If you find yourself using this,
-    you may want to reconsider your design.
-    """
-    raise NotImplementedError
-
-  def IsInitialized(self):
-    """Checks if the message is initialized.
-
-    Returns:
-      bool: The method returns True if the message is initialized (i.e. all of
-      its required fields are set).
-    """
-    raise NotImplementedError
-
-  # TODO(robinson): MergeFromString() should probably return None and be
-  # implemented in terms of a helper that returns the # of bytes read.  Our
-  # deserialization routines would use the helper when recursively
-  # deserializing, but the end user would almost always just want the no-return
-  # MergeFromString().
-
-  def MergeFromString(self, serialized):
-    """Merges serialized protocol buffer data into this message.
-
-    When we find a field in `serialized` that is already present
-    in this message:
-
-    -   If it's a "repeated" field, we append to the end of our list.
-    -   Else, if it's a scalar, we overwrite our field.
-    -   Else, (it's a nonrepeated composite), we recursively merge
-        into the existing composite.
-
-    Args:
-      serialized (bytes): Any object that allows us to call
-        ``memoryview(serialized)`` to access a string of bytes using the
-        buffer interface.
-
-    Returns:
-      int: The number of bytes read from `serialized`.
-      For non-group messages, this will always be `len(serialized)`,
-      but for messages which are actually groups, this will
-      generally be less than `len(serialized)`, since we must
-      stop when we reach an ``END_GROUP`` tag.  Note that if
-      we *do* stop because of an ``END_GROUP`` tag, the number
-      of bytes returned does not include the bytes
-      for the ``END_GROUP`` tag information.
-
-    Raises:
-      DecodeError: if the input cannot be parsed.
-    """
-    # TODO(robinson): Document handling of unknown fields.
-    # TODO(robinson): When we switch to a helper, this will return None.
-    raise NotImplementedError
-
-  def ParseFromString(self, serialized):
-    """Parse serialized protocol buffer data into this message.
-
-    Like :func:`MergeFromString()`, except we clear the object first.
-
-    Raises:
-      message.DecodeError if the input cannot be parsed.
-    """
-    self.Clear()
-    return self.MergeFromString(serialized)
-
-  def SerializeToString(self, **kwargs):
-    """Serializes the protocol message to a binary string.
-
-    Keyword Args:
-      deterministic (bool): If true, requests deterministic serialization
-        of the protobuf, with predictable ordering of map keys.
-
-    Returns:
-      A binary string representation of the message if all of the required
-      fields in the message are set (i.e. the message is initialized).
-
-    Raises:
-      EncodeError: if the message isn't initialized (see :func:`IsInitialized`).
-    """
-    raise NotImplementedError
-
-  def SerializePartialToString(self, **kwargs):
-    """Serializes the protocol message to a binary string.
-
-    This method is similar to SerializeToString but doesn't check if the
-    message is initialized.
-
-    Keyword Args:
-      deterministic (bool): If true, requests deterministic serialization
-        of the protobuf, with predictable ordering of map keys.
-
-    Returns:
-      bytes: A serialized representation of the partial message.
-    """
-    raise NotImplementedError
-
-  # TODO(robinson): Decide whether we like these better
-  # than auto-generated has_foo() and clear_foo() methods
-  # on the instances themselves.  This way is less consistent
-  # with C++, but it makes reflection-type access easier and
-  # reduces the number of magically autogenerated things.
-  #
-  # TODO(robinson): Be sure to document (and test) exactly
-  # which field names are accepted here.  Are we case-sensitive?
-  # What do we do with fields that share names with Python keywords
-  # like 'lambda' and 'yield'?
-  #
-  # nnorwitz says:
-  # """
-  # Typically (in python), an underscore is appended to names that are
-  # keywords. So they would become lambda_ or yield_.
-  # """
-  def ListFields(self):
-    """Returns a list of (FieldDescriptor, value) tuples for present fields.
-
-    A message field is non-empty if HasField() would return true. A singular
-    primitive field is non-empty if HasField() would return true in proto2 or it
-    is non zero in proto3. A repeated field is non-empty if it contains at least
-    one element. The fields are ordered by field number.
-
-    Returns:
-      list[tuple(FieldDescriptor, value)]: field descriptors and values
-      for all fields in the message which are not empty. The values vary by
-      field type.
-    """
-    raise NotImplementedError
-
-  def HasField(self, field_name):
-    """Checks if a certain field is set for the message.
-
-    For a oneof group, checks if any field inside is set. Note that if the
-    field_name is not defined in the message descriptor, :exc:`ValueError` will
-    be raised.
-
-    Args:
-      field_name (str): The name of the field to check for presence.
-
-    Returns:
-      bool: Whether a value has been set for the named field.
-
-    Raises:
-      ValueError: if the `field_name` is not a member of this message.
-    """
-    raise NotImplementedError
-
-  def ClearField(self, field_name):
-    """Clears the contents of a given field.
-
-    Inside a oneof group, clears the field set. If the name neither refers to a
-    defined field or oneof group, :exc:`ValueError` is raised.
-
-    Args:
-      field_name (str): The name of the field to check for presence.
-
-    Raises:
-      ValueError: if the `field_name` is not a member of this message.
-    """
-    raise NotImplementedError
-
-  def WhichOneof(self, oneof_group):
-    """Returns the name of the field that is set inside a oneof group.
-
-    If no field is set, returns None.
-
-    Args:
-      oneof_group (str): the name of the oneof group to check.
-
-    Returns:
-      str or None: The name of the group that is set, or None.
-
-    Raises:
-      ValueError: no group with the given name exists
-    """
-    raise NotImplementedError
-
-  def HasExtension(self, extension_handle):
-    """Checks if a certain extension is present for this message.
-
-    Extensions are retrieved using the :attr:`Extensions` mapping (if present).
-
-    Args:
-      extension_handle: The handle for the extension to check.
-
-    Returns:
-      bool: Whether the extension is present for this message.
-
-    Raises:
-      KeyError: if the extension is repeated. Similar to repeated fields,
-        there is no separate notion of presence: a "not present" repeated
-        extension is an empty list.
-    """
-    raise NotImplementedError
-
-  def ClearExtension(self, extension_handle):
-    """Clears the contents of a given extension.
-
-    Args:
-      extension_handle: The handle for the extension to clear.
-    """
-    raise NotImplementedError
-
-  def UnknownFields(self):
-    """Returns the UnknownFieldSet.
-
-    Returns:
-      UnknownFieldSet: The unknown fields stored in this message.
-    """
-    raise NotImplementedError
-
-  def DiscardUnknownFields(self):
-    """Clears all fields in the :class:`UnknownFieldSet`.
-
-    This operation is recursive for nested message.
-    """
-    raise NotImplementedError
-
-  def ByteSize(self):
-    """Returns the serialized size of this message.
-
-    Recursively calls ByteSize() on all contained messages.
-
-    Returns:
-      int: The number of bytes required to serialize this message.
-    """
-    raise NotImplementedError
-
-  @classmethod
-  def FromString(cls, s):
-    raise NotImplementedError
-
-  @staticmethod
-  def RegisterExtension(extension_handle):
-    raise NotImplementedError
-
-  def _SetListener(self, message_listener):
-    """Internal method used by the protocol message implementation.
-    Clients should not call this directly.
-
-    Sets a listener that this message will call on certain state transitions.
-
-    The purpose of this method is to register back-edges from children to
-    parents at runtime, for the purpose of setting "has" bits and
-    byte-size-dirty bits in the parent and ancestor objects whenever a child or
-    descendant object is modified.
-
-    If the client wants to disconnect this Message from the object tree, she
-    explicitly sets callback to None.
-
-    If message_listener is None, unregisters any existing listener.  Otherwise,
-    message_listener must implement the MessageListener interface in
-    internal/message_listener.py, and we discard any listener registered
-    via a previous _SetListener() call.
-    """
-    raise NotImplementedError
-
-  def __getstate__(self):
-    """Support the pickle protocol."""
-    return dict(serialized=self.SerializePartialToString())
-
-  def __setstate__(self, state):
-    """Support the pickle protocol."""
-    self.__init__()
-    serialized = state['serialized']
-    # On Python 3, using encoding='latin1' is required for unpickling
-    # protos pickled by Python 2.
-    if not isinstance(serialized, bytes):
-      serialized = serialized.encode('latin1')
-    self.ParseFromString(serialized)
-
-  def __reduce__(self):
-    message_descriptor = self.DESCRIPTOR
-    if message_descriptor.containing_type is None:
-      return type(self), (), self.__getstate__()
-    # the message type must be nested.
-    # Python does not pickle nested classes; use the symbol_database on the
-    # receiving end.
-    container = message_descriptor
-    return (_InternalConstructMessage, (container.full_name,),
-            self.__getstate__())
-
-
-def _InternalConstructMessage(full_name):
-  """Constructs a nested message."""
-  from google.protobuf import symbol_database  # pylint:disable=g-import-not-at-top
-
-  return symbol_database.Default().GetSymbol(full_name)()
diff --git a/libs/protobuf/python/google/protobuf/message_factory.py b/libs/protobuf/python/google/protobuf/message_factory.py
deleted file mode 100644
index 8d65204..0000000
--- a/libs/protobuf/python/google/protobuf/message_factory.py
+++ /dev/null
@@ -1,189 +0,0 @@
-# Protocol Buffers - Google's data interchange format
-# Copyright 2008 Google Inc.  All rights reserved.
-# https://developers.google.com/protocol-buffers/
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-"""Provides a factory class for generating dynamic messages.
-
-The easiest way to use this class is if you have access to the FileDescriptor
-protos containing the messages you want to create you can just do the following:
-
-message_classes = message_factory.GetMessages(iterable_of_file_descriptors)
-my_proto_instance = message_classes['some.proto.package.MessageName']()
-"""
-
-__author__ = 'matthewtoia@google.com (Matt Toia)'
-
-from google.protobuf.internal import api_implementation
-from google.protobuf import descriptor_pool
-from google.protobuf import message
-
-if api_implementation.Type() == 'python':
-  from google.protobuf.internal import python_message as message_impl
-else:
-  from google.protobuf.pyext import cpp_message as message_impl  # pylint: disable=g-import-not-at-top
-
-
-# The type of all Message classes.
-_GENERATED_PROTOCOL_MESSAGE_TYPE = message_impl.GeneratedProtocolMessageType
-
-
-class MessageFactory(object):
-  """Factory for creating Proto2 messages from descriptors in a pool."""
-
-  def __init__(self, pool=None):
-    """Initializes a new factory."""
-    self.pool = pool or descriptor_pool.DescriptorPool()
-
-    # local cache of all classes built from protobuf descriptors
-    self._classes = {}
-
-  def GetPrototype(self, descriptor):
-    """Obtains a proto2 message class based on the passed in descriptor.
-
-    Passing a descriptor with a fully qualified name matching a previous
-    invocation will cause the same class to be returned.
-
-    Args:
-      descriptor: The descriptor to build from.
-
-    Returns:
-      A class describing the passed in descriptor.
-    """
-    if descriptor not in self._classes:
-      result_class = self.CreatePrototype(descriptor)
-      # The assignment to _classes is redundant for the base implementation, but
-      # might avoid confusion in cases where CreatePrototype gets overridden and
-      # does not call the base implementation.
-      self._classes[descriptor] = result_class
-      return result_class
-    return self._classes[descriptor]
-
-  def CreatePrototype(self, descriptor):
-    """Builds a proto2 message class based on the passed in descriptor.
-
-    Don't call this function directly, it always creates a new class. Call
-    GetPrototype() instead. This method is meant to be overridden in subblasses
-    to perform additional operations on the newly constructed class.
-
-    Args:
-      descriptor: The descriptor to build from.
-
-    Returns:
-      A class describing the passed in descriptor.
-    """
-    descriptor_name = descriptor.name
-    result_class = _GENERATED_PROTOCOL_MESSAGE_TYPE(
-        descriptor_name,
-        (message.Message,),
-        {
-            'DESCRIPTOR': descriptor,
-            # If module not set, it wrongly points to message_factory module.
-            '__module__': None,
-        })
-    result_class._FACTORY = self  # pylint: disable=protected-access
-    # Assign in _classes before doing recursive calls to avoid infinite
-    # recursion.
-    self._classes[descriptor] = result_class
-    for field in descriptor.fields:
-      if field.message_type:
-        self.GetPrototype(field.message_type)
-    for extension in result_class.DESCRIPTOR.extensions:
-      if extension.containing_type not in self._classes:
-        self.GetPrototype(extension.containing_type)
-      extended_class = self._classes[extension.containing_type]
-      extended_class.RegisterExtension(extension)
-      if extension.message_type:
-        self.GetPrototype(extension.message_type)
-    return result_class
-
-  def GetMessages(self, files):
-    """Gets all the messages from a specified file.
-
-    This will find and resolve dependencies, failing if the descriptor
-    pool cannot satisfy them.
-
-    Args:
-      files: The file names to extract messages from.
-
-    Returns:
-      A dictionary mapping proto names to the message classes. This will include
-      any dependent messages as well as any messages defined in the same file as
-      a specified message.
-    """
-    result = {}
-    for file_name in files:
-      file_desc = self.pool.FindFileByName(file_name)
-      for desc in file_desc.message_types_by_name.values():
-        result[desc.full_name] = self.GetPrototype(desc)
-
-      # While the extension FieldDescriptors are created by the descriptor pool,
-      # the python classes created in the factory need them to be registered
-      # explicitly, which is done below.
-      #
-      # The call to RegisterExtension will specifically check if the
-      # extension was already registered on the object and either
-      # ignore the registration if the original was the same, or raise
-      # an error if they were different.
-
-      for extension in file_desc.extensions_by_name.values():
-        if extension.containing_type not in self._classes:
-          self.GetPrototype(extension.containing_type)
-        extended_class = self._classes[extension.containing_type]
-        extended_class.RegisterExtension(extension)
-        if extension.message_type:
-          self.GetPrototype(extension.message_type)
-    return result
-
-
-_FACTORY = MessageFactory()
-
-
-def GetMessages(file_protos):
-  """Builds a dictionary of all the messages available in a set of files.
-
-  Args:
-    file_protos: Iterable of FileDescriptorProto to build messages out of.
-
-  Returns:
-    A dictionary mapping proto names to the message classes. This will include
-    any dependent messages as well as any messages defined in the same file as
-    a specified message.
-  """
-  # The cpp implementation of the protocol buffer library requires to add the
-  # message in topological order of the dependency graph.
-  file_by_name = {file_proto.name: file_proto for file_proto in file_protos}
-  def _AddFile(file_proto):
-    for dependency in file_proto.dependency:
-      if dependency in file_by_name:
-        # Remove from elements to be visited, in order to cut cycles.
-        _AddFile(file_by_name.pop(dependency))
-    _FACTORY.pool.Add(file_proto)
-  while file_by_name:
-    _AddFile(file_by_name.popitem()[1])
-  return _FACTORY.GetMessages([file_proto.name for file_proto in file_protos])
diff --git a/libs/protobuf/python/google/protobuf/proto_api.h b/libs/protobuf/python/google/protobuf/proto_api.h
deleted file mode 100644
index 9969a91..0000000
--- a/libs/protobuf/python/google/protobuf/proto_api.h
+++ /dev/null
@@ -1,145 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// This file can be included by other C++ libraries, typically extension modules
-// which want to interact with the Python Messages coming from the "cpp"
-// implementation of protocol buffers.
-//
-// Usage:
-// Declare a (probably static) variable to hold the API:
-//    const PyProto_API* py_proto_api;
-// In some initialization function, write:
-//    py_proto_api = static_cast<const PyProto_API*>(PyCapsule_Import(
-//        PyProtoAPICapsuleName(), 0));
-//    if (!py_proto_api) { ...handle ImportError... }
-// Then use the methods of the returned class:
-//    py_proto_api->GetMessagePointer(...);
-
-#ifndef GOOGLE_PROTOBUF_PYTHON_PROTO_API_H__
-#define GOOGLE_PROTOBUF_PYTHON_PROTO_API_H__
-
-#define PY_SSIZE_T_CLEAN
-#include <Python.h>
-
-#include <google/protobuf/descriptor_database.h>
-#include <google/protobuf/message.h>
-
-namespace google {
-namespace protobuf {
-namespace python {
-
-// Note on the implementation:
-// This API is designed after
-// https://docs.python.org/3/extending/extending.html#providing-a-c-api-for-an-extension-module
-// The class below contains no mutable state, and all methods are "const";
-// we use a C++ class instead of a C struct with functions pointers just because
-// the code looks more readable.
-struct PyProto_API {
-  // The API object is created at initialization time and never freed.
-  // This destructor is never called.
-  virtual ~PyProto_API() {}
-
-  // Operations on Messages.
-
-  // If the passed object is a Python Message, returns its internal pointer.
-  // Otherwise, returns NULL with an exception set.
-  virtual const Message* GetMessagePointer(PyObject* msg) const = 0;
-
-  // If the passed object is a Python Message, returns a mutable pointer.
-  // Otherwise, returns NULL with an exception set.
-  // This function will succeed only if there are no other Python objects
-  // pointing to the message, like submessages or repeated containers.
-  // With the current implementation, only empty messages are in this case.
-  virtual Message* GetMutableMessagePointer(PyObject* msg) const = 0;
-
-  // If the passed object is a Python Message Descriptor, returns its internal
-  // pointer.
-  // Otherwise, returns NULL with an exception set.
-  virtual const Descriptor* MessageDescriptor_AsDescriptor(
-      PyObject* desc) const = 0;
-
-  // If the passed object is a Python Enum Descriptor, returns its internal
-  // pointer.
-  // Otherwise, returns NULL with an exception set.
-  virtual const EnumDescriptor* EnumDescriptor_AsDescriptor(
-      PyObject* enum_desc) const = 0;
-
-  // Expose the underlying DescriptorPool and MessageFactory to enable C++ code
-  // to create Python-compatible message.
-  virtual const DescriptorPool* GetDefaultDescriptorPool() const = 0;
-  virtual MessageFactory* GetDefaultMessageFactory() const = 0;
-
-  // Allocate a new protocol buffer as a python object for the provided
-  // descriptor. This function works even if no Python module has been imported
-  // for the corresponding protocol buffer class.
-  // The factory is usually null; when provided, it is the MessageFactory which
-  // owns the Python class, and will be used to find and create Extensions for
-  // this message.
-  // When null is returned, a python error has already been set.
-  virtual PyObject* NewMessage(const Descriptor* descriptor,
-                               PyObject* py_message_factory) const = 0;
-
-  // Allocate a new protocol buffer where the underlying object is owned by C++.
-  // The factory must currently be null.  This function works even if no Python
-  // module has been imported for the corresponding protocol buffer class.
-  // When null is returned, a python error has already been set.
-  //
-  // Since this call returns a python object owned by C++, some operations
-  // are risky, and it must be used carefully. In particular:
-  // * Avoid modifying the returned object from the C++ side while there are
-  // existing python references to it or it's subobjects.
-  // * Avoid using python references to this object or any subobjects after the
-  // C++ object has been freed.
-  // * Calling this with the same C++ pointer will result in multiple distinct
-  // python objects referencing the same C++ object.
-  virtual PyObject* NewMessageOwnedExternally(
-      Message* msg, PyObject* py_message_factory) const = 0;
-
-  // Returns a new reference for the given DescriptorPool.
-  // The returned object does not manage the C++ DescriptorPool: it is the
-  // responsibility of the caller to keep it alive.
-  // As long as the returned Python DescriptorPool object is kept alive,
-  // functions that process C++ descriptors or messages created from this pool
-  // can work and return their Python counterparts.
-  virtual PyObject* DescriptorPool_FromPool(
-      const google::protobuf::DescriptorPool* pool) const = 0;
-};
-
-inline const char* PyProtoAPICapsuleName() {
-  static const char kCapsuleName[] =
-      "google.protobuf.pyext._message.proto_API";
-  return kCapsuleName;
-}
-
-}  // namespace python
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // GOOGLE_PROTOBUF_PYTHON_PROTO_API_H__
diff --git a/libs/protobuf/python/google/protobuf/proto_builder.py b/libs/protobuf/python/google/protobuf/proto_builder.py
deleted file mode 100644
index a4667ce..0000000
--- a/libs/protobuf/python/google/protobuf/proto_builder.py
+++ /dev/null
@@ -1,134 +0,0 @@
-# Protocol Buffers - Google's data interchange format
-# Copyright 2008 Google Inc.  All rights reserved.
-# https://developers.google.com/protocol-buffers/
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-"""Dynamic Protobuf class creator."""
-
-from collections import OrderedDict
-import hashlib
-import os
-
-from google.protobuf import descriptor_pb2
-from google.protobuf import descriptor
-from google.protobuf import message_factory
-
-
-def _GetMessageFromFactory(factory, full_name):
-  """Get a proto class from the MessageFactory by name.
-
-  Args:
-    factory: a MessageFactory instance.
-    full_name: str, the fully qualified name of the proto type.
-  Returns:
-    A class, for the type identified by full_name.
-  Raises:
-    KeyError, if the proto is not found in the factory's descriptor pool.
-  """
-  proto_descriptor = factory.pool.FindMessageTypeByName(full_name)
-  proto_cls = factory.GetPrototype(proto_descriptor)
-  return proto_cls
-
-
-def MakeSimpleProtoClass(fields, full_name=None, pool=None):
-  """Create a Protobuf class whose fields are basic types.
-
-  Note: this doesn't validate field names!
-
-  Args:
-    fields: dict of {name: field_type} mappings for each field in the proto. If
-        this is an OrderedDict the order will be maintained, otherwise the
-        fields will be sorted by name.
-    full_name: optional str, the fully-qualified name of the proto type.
-    pool: optional DescriptorPool instance.
-  Returns:
-    a class, the new protobuf class with a FileDescriptor.
-  """
-  factory = message_factory.MessageFactory(pool=pool)
-
-  if full_name is not None:
-    try:
-      proto_cls = _GetMessageFromFactory(factory, full_name)
-      return proto_cls
-    except KeyError:
-      # The factory's DescriptorPool doesn't know about this class yet.
-      pass
-
-  # Get a list of (name, field_type) tuples from the fields dict. If fields was
-  # an OrderedDict we keep the order, but otherwise we sort the field to ensure
-  # consistent ordering.
-  field_items = fields.items()
-  if not isinstance(fields, OrderedDict):
-    field_items = sorted(field_items)
-
-  # Use a consistent file name that is unlikely to conflict with any imported
-  # proto files.
-  fields_hash = hashlib.sha1()
-  for f_name, f_type in field_items:
-    fields_hash.update(f_name.encode('utf-8'))
-    fields_hash.update(str(f_type).encode('utf-8'))
-  proto_file_name = fields_hash.hexdigest() + '.proto'
-
-  # If the proto is anonymous, use the same hash to name it.
-  if full_name is None:
-    full_name = ('net.proto2.python.public.proto_builder.AnonymousProto_' +
-                 fields_hash.hexdigest())
-    try:
-      proto_cls = _GetMessageFromFactory(factory, full_name)
-      return proto_cls
-    except KeyError:
-      # The factory's DescriptorPool doesn't know about this class yet.
-      pass
-
-  # This is the first time we see this proto: add a new descriptor to the pool.
-  factory.pool.Add(
-      _MakeFileDescriptorProto(proto_file_name, full_name, field_items))
-  return _GetMessageFromFactory(factory, full_name)
-
-
-def _MakeFileDescriptorProto(proto_file_name, full_name, field_items):
-  """Populate FileDescriptorProto for MessageFactory's DescriptorPool."""
-  package, name = full_name.rsplit('.', 1)
-  file_proto = descriptor_pb2.FileDescriptorProto()
-  file_proto.name = os.path.join(package.replace('.', '/'), proto_file_name)
-  file_proto.package = package
-  desc_proto = file_proto.message_type.add()
-  desc_proto.name = name
-  for f_number, (f_name, f_type) in enumerate(field_items, 1):
-    field_proto = desc_proto.field.add()
-    field_proto.name = f_name
-    # # If the number falls in the reserved range, reassign it to the correct
-    # # number after the range.
-    if f_number >= descriptor.FieldDescriptor.FIRST_RESERVED_FIELD_NUMBER:
-      f_number += (
-          descriptor.FieldDescriptor.LAST_RESERVED_FIELD_NUMBER -
-          descriptor.FieldDescriptor.FIRST_RESERVED_FIELD_NUMBER + 1)
-    field_proto.number = f_number
-    field_proto.label = descriptor_pb2.FieldDescriptorProto.LABEL_OPTIONAL
-    field_proto.type = f_type
-  return file_proto
diff --git a/libs/protobuf/python/google/protobuf/pyext/README b/libs/protobuf/python/google/protobuf/pyext/README
deleted file mode 100644
index 6d61cb4..0000000
--- a/libs/protobuf/python/google/protobuf/pyext/README
+++ /dev/null
@@ -1,6 +0,0 @@
-This is the 'v2' C++ implementation for python proto2.
-
-It is active when:
-
-PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=cpp
-PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION_VERSION=2
diff --git a/libs/protobuf/python/google/protobuf/pyext/__init__.py b/libs/protobuf/python/google/protobuf/pyext/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/libs/protobuf/python/google/protobuf/pyext/cpp_message.py b/libs/protobuf/python/google/protobuf/pyext/cpp_message.py
deleted file mode 100644
index ca29029..0000000
--- a/libs/protobuf/python/google/protobuf/pyext/cpp_message.py
+++ /dev/null
@@ -1,72 +0,0 @@
-# Protocol Buffers - Google's data interchange format
-# Copyright 2008 Google Inc.  All rights reserved.
-# https://developers.google.com/protocol-buffers/
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-"""Protocol message implementation hooks for C++ implementation.
-
-Contains helper functions used to create protocol message classes from
-Descriptor objects at runtime backed by the protocol buffer C++ API.
-"""
-
-__author__ = 'tibell@google.com (Johan Tibell)'
-
-from google.protobuf.internal import api_implementation
-
-
-# pylint: disable=protected-access
-_message = api_implementation._c_module
-# TODO(jieluo): Remove this import after fix api_implementation
-if _message is None:
-  from google.protobuf.pyext import _message
-
-
-class GeneratedProtocolMessageType(_message.MessageMeta):
-
-  """Metaclass for protocol message classes created at runtime from Descriptors.
-
-  The protocol compiler currently uses this metaclass to create protocol
-  message classes at runtime.  Clients can also manually create their own
-  classes at runtime, as in this example:
-
-  mydescriptor = Descriptor(.....)
-  factory = symbol_database.Default()
-  factory.pool.AddDescriptor(mydescriptor)
-  MyProtoClass = factory.GetPrototype(mydescriptor)
-  myproto_instance = MyProtoClass()
-  myproto.foo_field = 23
-  ...
-
-  The above example will not work for nested types. If you wish to include them,
-  use reflection.MakeClass() instead of manually instantiating the class in
-  order to create the appropriate class structure.
-  """
-
-  # Must be consistent with the protocol-compiler code in
-  # proto2/compiler/internal/generator.*.
-  _DESCRIPTOR_KEY = 'DESCRIPTOR'
diff --git a/libs/protobuf/python/google/protobuf/pyext/descriptor.cc b/libs/protobuf/python/google/protobuf/pyext/descriptor.cc
deleted file mode 100644
index 1625312..0000000
--- a/libs/protobuf/python/google/protobuf/pyext/descriptor.cc
+++ /dev/null
@@ -1,2040 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: petar@google.com (Petar Petrov)
-
-#include <google/protobuf/pyext/descriptor.h>
-
-#define PY_SSIZE_T_CLEAN
-#include <Python.h>
-#include <frameobject.h>
-
-#include <cstdint>
-#include <string>
-#include <unordered_map>
-
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/descriptor.pb.h>
-#include <google/protobuf/dynamic_message.h>
-#include <google/protobuf/pyext/descriptor_containers.h>
-#include <google/protobuf/pyext/descriptor_pool.h>
-#include <google/protobuf/pyext/message.h>
-#include <google/protobuf/pyext/message_factory.h>
-#include <google/protobuf/pyext/scoped_pyobject_ptr.h>
-#include <google/protobuf/stubs/hash.h>
-
-#define PyString_AsStringAndSize(ob, charpp, sizep)              \
-  (PyUnicode_Check(ob)                                           \
-       ? ((*(charpp) = const_cast<char*>(                        \
-               PyUnicode_AsUTF8AndSize(ob, (sizep)))) == nullptr \
-              ? -1                                               \
-              : 0)                                               \
-       : PyBytes_AsStringAndSize(ob, (charpp), (sizep)))
-
-namespace google {
-namespace protobuf {
-namespace python {
-
-// Store interned descriptors, so that the same C++ descriptor yields the same
-// Python object. Objects are not immortal: this map does not own the
-// references, and items are deleted when the last reference to the object is
-// released.
-// This is enough to support the "is" operator on live objects.
-// All descriptors are stored here.
-std::unordered_map<const void*, PyObject*>* interned_descriptors;
-
-PyObject* PyString_FromCppString(const std::string& str) {
-  return PyUnicode_FromStringAndSize(str.c_str(), str.size());
-}
-
-// Check that the calling Python code is the global scope of a _pb2.py module.
-// This function is used to support the current code generated by the proto
-// compiler, which creates descriptors, then update some properties.
-// For example:
-//   message_descriptor = Descriptor(
-//       name='Message',
-//       fields = [FieldDescriptor(name='field')]
-//   message_descriptor.fields[0].containing_type = message_descriptor
-//
-// This code is still executed, but the descriptors now have no other storage
-// than the (const) C++ pointer, and are immutable.
-// So we let this code pass, by simply ignoring the new value.
-//
-// From user code, descriptors still look immutable.
-//
-// TODO(amauryfa): Change the proto2 compiler to remove the assignments, and
-// remove this hack.
-bool _CalledFromGeneratedFile(int stacklevel) {
-#ifndef PYPY_VERSION
-  // This check is not critical and is somewhat difficult to implement correctly
-  // in PyPy.
-  PyFrameObject* frame = PyEval_GetFrame();
-  if (frame == nullptr) {
-    return false;
-  }
-  while (stacklevel-- > 0) {
-    frame = frame->f_back;
-    if (frame == nullptr) {
-      return false;
-    }
-  }
-
-  if (frame->f_code->co_filename == nullptr) {
-    return false;
-  }
-  char* filename;
-  Py_ssize_t filename_size;
-  if (PyString_AsStringAndSize(frame->f_code->co_filename,
-                               &filename, &filename_size) < 0) {
-    // filename is not a string.
-    PyErr_Clear();
-    return false;
-  }
-  if ((filename_size < 3) ||
-      (strcmp(&filename[filename_size - 3], ".py") != 0)) {
-    // Cython's stack does not have .py file name and is not at global module
-    // scope.
-    return true;
-  }
-  if (filename_size < 7) {
-    // filename is too short.
-    return false;
-  }
-  if (strcmp(&filename[filename_size - 7], "_pb2.py") != 0) {
-    // Filename is not ending with _pb2.
-    return false;
-  }
-
-  if (frame->f_globals != frame->f_locals) {
-    // Not at global module scope
-    return false;
-  }
-#endif
-  return true;
-}
-
-// If the calling code is not a _pb2.py file, raise AttributeError.
-// To be used in attribute setters.
-static int CheckCalledFromGeneratedFile(const char* attr_name) {
-  if (_CalledFromGeneratedFile(0)) {
-    return 0;
-  }
-  PyErr_Format(PyExc_AttributeError,
-               "attribute is not writable: %s", attr_name);
-  return -1;
-}
-
-
-#ifndef PyVarObject_HEAD_INIT
-#define PyVarObject_HEAD_INIT(type, size) PyObject_HEAD_INIT(type) size,
-#endif
-#ifndef Py_TYPE
-#define Py_TYPE(ob) (((PyObject*)(ob))->ob_type)
-#endif
-
-
-// Helper functions for descriptor objects.
-
-// A set of templates to retrieve the C++ FileDescriptor of any descriptor.
-template<class DescriptorClass>
-const FileDescriptor* GetFileDescriptor(const DescriptorClass* descriptor) {
-  return descriptor->file();
-}
-template<>
-const FileDescriptor* GetFileDescriptor(const FileDescriptor* descriptor) {
-  return descriptor;
-}
-template<>
-const FileDescriptor* GetFileDescriptor(const EnumValueDescriptor* descriptor) {
-  return descriptor->type()->file();
-}
-template<>
-const FileDescriptor* GetFileDescriptor(const OneofDescriptor* descriptor) {
-  return descriptor->containing_type()->file();
-}
-template<>
-const FileDescriptor* GetFileDescriptor(const MethodDescriptor* descriptor) {
-  return descriptor->service()->file();
-}
-
-bool Reparse(
-    PyMessageFactory* message_factory, const Message& from, Message* to) {
-  // Reparse message.
-  std::string serialized;
-  from.SerializeToString(&serialized);
-  io::CodedInputStream input(
-      reinterpret_cast<const uint8_t*>(serialized.c_str()), serialized.size());
-  input.SetExtensionRegistry(message_factory->pool->pool,
-                             message_factory->message_factory);
-  bool success = to->ParseFromCodedStream(&input);
-  if (!success) {
-    return false;
-  }
-  return true;
-}
-// Converts options into a Python protobuf, and cache the result.
-//
-// This is a bit tricky because options can contain extension fields defined in
-// the same proto file. In this case the options parsed from the serialized_pb
-// have unknown fields, and we need to parse them again.
-//
-// Always returns a new reference.
-template<class DescriptorClass>
-static PyObject* GetOrBuildOptions(const DescriptorClass *descriptor) {
-  // Options are cached in the pool that owns the descriptor.
-  // First search in the cache.
-  PyDescriptorPool* caching_pool = GetDescriptorPool_FromPool(
-      GetFileDescriptor(descriptor)->pool());
-  std::unordered_map<const void*, PyObject*>* descriptor_options =
-      caching_pool->descriptor_options;
-  if (descriptor_options->find(descriptor) != descriptor_options->end()) {
-    PyObject *value = (*descriptor_options)[descriptor];
-    Py_INCREF(value);
-    return value;
-  }
-
-  // Similar to the C++ implementation, we return an Options object from the
-  // default (generated) factory, so that client code know that they can use
-  // extensions from generated files:
-  //    d.GetOptions().Extensions[some_pb2.extension]
-  //
-  // The consequence is that extensions not defined in the default pool won't
-  // be available.  If needed, we could add an optional 'message_factory'
-  // parameter to the GetOptions() function.
-  PyMessageFactory* message_factory =
-      GetDefaultDescriptorPool()->py_message_factory;
-
-  // Build the Options object: get its Python class, and make a copy of the C++
-  // read-only instance.
-  const Message& options(descriptor->options());
-  const Descriptor *message_type = options.GetDescriptor();
-  CMessageClass* message_class = message_factory::GetOrCreateMessageClass(
-      message_factory, message_type);
-  if (message_class == nullptr) {
-    PyErr_Format(PyExc_TypeError, "Could not retrieve class for Options: %s",
-                 message_type->full_name().c_str());
-    return nullptr;
-  }
-  ScopedPyObjectPtr args(PyTuple_New(0));
-  ScopedPyObjectPtr value(
-      PyObject_Call(message_class->AsPyObject(), args.get(), nullptr));
-  Py_DECREF(message_class);
-  if (value == nullptr) {
-    return nullptr;
-  }
-  if (!PyObject_TypeCheck(value.get(), CMessage_Type)) {
-      PyErr_Format(PyExc_TypeError, "Invalid class for %s: %s",
-                   message_type->full_name().c_str(),
-                   Py_TYPE(value.get())->tp_name);
-      return nullptr;
-  }
-  CMessage* cmsg = reinterpret_cast<CMessage*>(value.get());
-
-  const Reflection* reflection = options.GetReflection();
-  const UnknownFieldSet& unknown_fields(reflection->GetUnknownFields(options));
-  if (unknown_fields.empty()) {
-    cmsg->message->CopyFrom(options);
-  } else {
-    // Reparse options string!  XXX call cmessage::MergeFromString
-    if (!Reparse(message_factory, options, cmsg->message)) {
-      PyErr_Format(PyExc_ValueError, "Error reparsing Options message");
-      return nullptr;
-    }
-  }
-
-  // Cache the result.
-  Py_INCREF(value.get());
-  (*descriptor_options)[descriptor] = value.get();
-
-  return value.release();
-}
-
-// Copy the C++ descriptor to a Python message.
-// The Python message is an instance of descriptor_pb2.DescriptorProto
-// or similar.
-template<class DescriptorProtoClass, class DescriptorClass>
-static PyObject* CopyToPythonProto(const DescriptorClass *descriptor,
-                                   PyObject *target) {
-  const Descriptor* self_descriptor =
-      DescriptorProtoClass::default_instance().GetDescriptor();
-  CMessage* message = reinterpret_cast<CMessage*>(target);
-  if (!PyObject_TypeCheck(target, CMessage_Type) ||
-      message->message->GetDescriptor() != self_descriptor) {
-    PyErr_Format(PyExc_TypeError, "Not a %s message",
-                 self_descriptor->full_name().c_str());
-    return nullptr;
-  }
-  cmessage::AssureWritable(message);
-  DescriptorProtoClass* descriptor_message =
-      static_cast<DescriptorProtoClass*>(message->message);
-  descriptor->CopyTo(descriptor_message);
-  // Custom options might in unknown extensions. Reparse
-  // the descriptor_message. Can't skip reparse when options unknown
-  // fields is empty, because they might in sub descriptors' options.
-  PyMessageFactory* message_factory =
-      GetDefaultDescriptorPool()->py_message_factory;
-  if (!Reparse(message_factory, *descriptor_message, descriptor_message)) {
-    PyErr_Format(PyExc_ValueError, "Error reparsing descriptor message");
-    return nullptr;
-  }
-
-  Py_RETURN_NONE;
-}
-
-// All Descriptors classes share the same memory layout.
-typedef struct PyBaseDescriptor {
-  PyObject_HEAD
-
-  // Pointer to the C++ proto2 descriptor.
-  // Like all descriptors, it is owned by the global DescriptorPool.
-  const void* descriptor;
-
-  // Owned reference to the DescriptorPool, to ensure it is kept alive.
-  PyDescriptorPool* pool;
-} PyBaseDescriptor;
-
-
-// FileDescriptor structure "inherits" from the base descriptor.
-typedef struct PyFileDescriptor {
-  PyBaseDescriptor base;
-
-  // The cached version of serialized pb. Either null, or a Bytes string.
-  // We own the reference.
-  PyObject *serialized_pb;
-} PyFileDescriptor;
-
-
-namespace descriptor {
-
-// Creates or retrieve a Python descriptor of the specified type.
-// Objects are interned: the same descriptor will return the same object if it
-// was kept alive.
-// 'was_created' is an optional pointer to a bool, and is set to true if a new
-// object was allocated.
-// Always return a new reference.
-template<class DescriptorClass>
-PyObject* NewInternedDescriptor(PyTypeObject* type,
-                                const DescriptorClass* descriptor,
-                                bool* was_created) {
-  if (was_created) {
-    *was_created = false;
-  }
-  if (descriptor == nullptr) {
-    PyErr_BadInternalCall();
-    return nullptr;
-  }
-
-  // See if the object is in the map of interned descriptors
-  std::unordered_map<const void*, PyObject*>::iterator it =
-      interned_descriptors->find(descriptor);
-  if (it != interned_descriptors->end()) {
-    GOOGLE_DCHECK(Py_TYPE(it->second) == type);
-    Py_INCREF(it->second);
-    return it->second;
-  }
-  // Create a new descriptor object
-  PyBaseDescriptor* py_descriptor = PyObject_GC_New(
-      PyBaseDescriptor, type);
-  if (py_descriptor == nullptr) {
-    return nullptr;
-  }
-  py_descriptor->descriptor = descriptor;
-
-  // and cache it.
-  interned_descriptors->insert(
-      std::make_pair(descriptor, reinterpret_cast<PyObject*>(py_descriptor)));
-
-  // Ensures that the DescriptorPool stays alive.
-  PyDescriptorPool* pool = GetDescriptorPool_FromPool(
-      GetFileDescriptor(descriptor)->pool());
-  if (pool == nullptr) {
-    // Don't DECREF, the object is not fully initialized.
-    PyObject_Del(py_descriptor);
-    return nullptr;
-  }
-  Py_INCREF(pool);
-  py_descriptor->pool = pool;
-
-  PyObject_GC_Track(py_descriptor);
-
-  if (was_created) {
-    *was_created = true;
-  }
-  return reinterpret_cast<PyObject*>(py_descriptor);
-}
-
-static void Dealloc(PyObject* pself) {
-  PyBaseDescriptor* self = reinterpret_cast<PyBaseDescriptor*>(pself);
-  // Remove from interned dictionary
-  interned_descriptors->erase(self->descriptor);
-  Py_CLEAR(self->pool);
-  Py_TYPE(self)->tp_free(pself);
-}
-
-static int GcTraverse(PyObject* pself, visitproc visit, void* arg) {
-  PyBaseDescriptor* self = reinterpret_cast<PyBaseDescriptor*>(pself);
-  Py_VISIT(self->pool);
-  return 0;
-}
-
-static int GcClear(PyObject* pself) {
-  PyBaseDescriptor* self = reinterpret_cast<PyBaseDescriptor*>(pself);
-  Py_CLEAR(self->pool);
-  return 0;
-}
-
-static PyGetSetDef Getters[] = {
-    {nullptr},
-};
-
-PyTypeObject PyBaseDescriptor_Type = {
-    PyVarObject_HEAD_INIT(&PyType_Type, 0) FULL_MODULE_NAME
-    ".DescriptorBase",         // tp_name
-    sizeof(PyBaseDescriptor),  // tp_basicsize
-    0,                         // tp_itemsize
-    (destructor)Dealloc,       // tp_dealloc
-#if PY_VERSION_HEX < 0x03080000
-    nullptr,  // tp_print
-#else
-    0,  // tp_vectorcall_offset
-#endif
-    nullptr,                                  // tp_getattr
-    nullptr,                                  // tp_setattr
-    nullptr,                                  // tp_compare
-    nullptr,                                  // tp_repr
-    nullptr,                                  // tp_as_number
-    nullptr,                                  // tp_as_sequence
-    nullptr,                                  // tp_as_mapping
-    nullptr,                                  // tp_hash
-    nullptr,                                  // tp_call
-    nullptr,                                  // tp_str
-    nullptr,                                  // tp_getattro
-    nullptr,                                  // tp_setattro
-    nullptr,                                  // tp_as_buffer
-    Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC,  // tp_flags
-    "Descriptors base class",                 // tp_doc
-    GcTraverse,                               // tp_traverse
-    GcClear,                                  // tp_clear
-    nullptr,                                  // tp_richcompare
-    0,                                        // tp_weaklistoffset
-    nullptr,                                  // tp_iter
-    nullptr,                                  // tp_iternext
-    nullptr,                                  // tp_methods
-    nullptr,                                  // tp_members
-    Getters,                                  // tp_getset
-};
-
-}  // namespace descriptor
-
-const void* PyDescriptor_AsVoidPtr(PyObject* obj) {
-  if (!PyObject_TypeCheck(obj, &descriptor::PyBaseDescriptor_Type)) {
-    PyErr_SetString(PyExc_TypeError, "Not a BaseDescriptor");
-    return nullptr;
-  }
-  return reinterpret_cast<PyBaseDescriptor*>(obj)->descriptor;
-}
-
-namespace message_descriptor {
-
-// Unchecked accessor to the C++ pointer.
-static const Descriptor* _GetDescriptor(PyBaseDescriptor* self) {
-  return reinterpret_cast<const Descriptor*>(self->descriptor);
-}
-
-static PyObject* GetName(PyBaseDescriptor* self, void *closure) {
-  return PyString_FromCppString(_GetDescriptor(self)->name());
-}
-
-static PyObject* GetFullName(PyBaseDescriptor* self, void *closure) {
-  return PyString_FromCppString(_GetDescriptor(self)->full_name());
-}
-
-static PyObject* GetFile(PyBaseDescriptor *self, void *closure) {
-  return PyFileDescriptor_FromDescriptor(_GetDescriptor(self)->file());
-}
-
-static PyObject* GetConcreteClass(PyBaseDescriptor* self, void *closure) {
-  // Returns the canonical class for the given descriptor.
-  // This is the class that was registered with the primary descriptor pool
-  // which contains this descriptor.
-  // This might not be the one you expect! For example the returned object does
-  // not know about extensions defined in a custom pool.
-  CMessageClass* concrete_class(message_factory::GetMessageClass(
-      GetDescriptorPool_FromPool(
-          _GetDescriptor(self)->file()->pool())->py_message_factory,
-      _GetDescriptor(self)));
-  Py_XINCREF(concrete_class);
-  return concrete_class->AsPyObject();
-}
-
-static PyObject* GetFieldsByName(PyBaseDescriptor* self, void *closure) {
-  return NewMessageFieldsByName(_GetDescriptor(self));
-}
-
-static PyObject* GetFieldsByCamelcaseName(PyBaseDescriptor* self,
-                                          void *closure) {
-  return NewMessageFieldsByCamelcaseName(_GetDescriptor(self));
-}
-
-static PyObject* GetFieldsByNumber(PyBaseDescriptor* self, void *closure) {
-  return NewMessageFieldsByNumber(_GetDescriptor(self));
-}
-
-static PyObject* GetFieldsSeq(PyBaseDescriptor* self, void *closure) {
-  return NewMessageFieldsSeq(_GetDescriptor(self));
-}
-
-static PyObject* GetNestedTypesByName(PyBaseDescriptor* self, void *closure) {
-  return NewMessageNestedTypesByName(_GetDescriptor(self));
-}
-
-static PyObject* GetNestedTypesSeq(PyBaseDescriptor* self, void *closure) {
-  return NewMessageNestedTypesSeq(_GetDescriptor(self));
-}
-
-static PyObject* GetExtensionsByName(PyBaseDescriptor* self, void *closure) {
-  return NewMessageExtensionsByName(_GetDescriptor(self));
-}
-
-static PyObject* GetExtensions(PyBaseDescriptor* self, void *closure) {
-  return NewMessageExtensionsSeq(_GetDescriptor(self));
-}
-
-static PyObject* GetEnumsSeq(PyBaseDescriptor* self, void *closure) {
-  return NewMessageEnumsSeq(_GetDescriptor(self));
-}
-
-static PyObject* GetEnumTypesByName(PyBaseDescriptor* self, void *closure) {
-  return NewMessageEnumsByName(_GetDescriptor(self));
-}
-
-static PyObject* GetEnumValuesByName(PyBaseDescriptor* self, void *closure) {
-  return NewMessageEnumValuesByName(_GetDescriptor(self));
-}
-
-static PyObject* GetOneofsByName(PyBaseDescriptor* self, void *closure) {
-  return NewMessageOneofsByName(_GetDescriptor(self));
-}
-
-static PyObject* GetOneofsSeq(PyBaseDescriptor* self, void *closure) {
-  return NewMessageOneofsSeq(_GetDescriptor(self));
-}
-
-static PyObject* IsExtendable(PyBaseDescriptor *self, void *closure) {
-  if (_GetDescriptor(self)->extension_range_count() > 0) {
-    Py_RETURN_TRUE;
-  } else {
-    Py_RETURN_FALSE;
-  }
-}
-
-static PyObject* GetExtensionRanges(PyBaseDescriptor *self, void *closure) {
-  const Descriptor* descriptor = _GetDescriptor(self);
-  PyObject* range_list = PyList_New(descriptor->extension_range_count());
-
-  for (int i = 0; i < descriptor->extension_range_count(); i++) {
-    const Descriptor::ExtensionRange* range = descriptor->extension_range(i);
-    PyObject* start = PyLong_FromLong(range->start);
-    PyObject* end = PyLong_FromLong(range->end);
-    PyList_SetItem(range_list, i, PyTuple_Pack(2, start, end));
-  }
-
-  return range_list;
-}
-
-static PyObject* GetContainingType(PyBaseDescriptor *self, void *closure) {
-  const Descriptor* containing_type =
-      _GetDescriptor(self)->containing_type();
-  if (containing_type) {
-    return PyMessageDescriptor_FromDescriptor(containing_type);
-  } else {
-    Py_RETURN_NONE;
-  }
-}
-
-static int SetContainingType(PyBaseDescriptor *self, PyObject *value,
-                             void *closure) {
-  return CheckCalledFromGeneratedFile("containing_type");
-}
-
-static PyObject* GetHasOptions(PyBaseDescriptor *self, void *closure) {
-  const MessageOptions& options(_GetDescriptor(self)->options());
-  if (&options != &MessageOptions::default_instance()) {
-    Py_RETURN_TRUE;
-  } else {
-    Py_RETURN_FALSE;
-  }
-}
-static int SetHasOptions(PyBaseDescriptor *self, PyObject *value,
-                             void *closure) {
-  return CheckCalledFromGeneratedFile("has_options");
-}
-
-static PyObject* GetOptions(PyBaseDescriptor *self) {
-  return GetOrBuildOptions(_GetDescriptor(self));
-}
-
-static int SetOptions(PyBaseDescriptor *self, PyObject *value,
-                      void *closure) {
-  return CheckCalledFromGeneratedFile("_options");
-}
-
-static int SetSerializedOptions(PyBaseDescriptor *self, PyObject *value,
-                                void *closure) {
-  return CheckCalledFromGeneratedFile("_serialized_options");
-}
-
-static PyObject* CopyToProto(PyBaseDescriptor *self, PyObject *target) {
-  return CopyToPythonProto<DescriptorProto>(_GetDescriptor(self), target);
-}
-
-static PyObject* EnumValueName(PyBaseDescriptor *self, PyObject *args) {
-  const char *enum_name;
-  int number;
-  if (!PyArg_ParseTuple(args, "si", &enum_name, &number)) return nullptr;
-  const EnumDescriptor *enum_type =
-      _GetDescriptor(self)->FindEnumTypeByName(enum_name);
-  if (enum_type == nullptr) {
-    PyErr_SetString(PyExc_KeyError, enum_name);
-    return nullptr;
-  }
-  const EnumValueDescriptor *enum_value =
-      enum_type->FindValueByNumber(number);
-  if (enum_value == nullptr) {
-    PyErr_Format(PyExc_KeyError, "%d", number);
-    return nullptr;
-  }
-  return PyString_FromCppString(enum_value->name());
-}
-
-static PyObject* GetSyntax(PyBaseDescriptor *self, void *closure) {
-  return PyUnicode_InternFromString(
-      FileDescriptor::SyntaxName(_GetDescriptor(self)->file()->syntax()));
-}
-
-static PyGetSetDef Getters[] = {
-    {"name", (getter)GetName, nullptr, "Last name"},
-    {"full_name", (getter)GetFullName, nullptr, "Full name"},
-    {"_concrete_class", (getter)GetConcreteClass, nullptr, "concrete class"},
-    {"file", (getter)GetFile, nullptr, "File descriptor"},
-
-    {"fields", (getter)GetFieldsSeq, nullptr, "Fields sequence"},
-    {"fields_by_name", (getter)GetFieldsByName, nullptr, "Fields by name"},
-    {"fields_by_camelcase_name", (getter)GetFieldsByCamelcaseName, nullptr,
-     "Fields by camelCase name"},
-    {"fields_by_number", (getter)GetFieldsByNumber, nullptr,
-     "Fields by number"},
-    {"nested_types", (getter)GetNestedTypesSeq, nullptr,
-     "Nested types sequence"},
-    {"nested_types_by_name", (getter)GetNestedTypesByName, nullptr,
-     "Nested types by name"},
-    {"extensions", (getter)GetExtensions, nullptr, "Extensions Sequence"},
-    {"extensions_by_name", (getter)GetExtensionsByName, nullptr,
-     "Extensions by name"},
-    {"extension_ranges", (getter)GetExtensionRanges, nullptr,
-     "Extension ranges"},
-    {"enum_types", (getter)GetEnumsSeq, nullptr, "Enum sequence"},
-    {"enum_types_by_name", (getter)GetEnumTypesByName, nullptr,
-     "Enum types by name"},
-    {"enum_values_by_name", (getter)GetEnumValuesByName, nullptr,
-     "Enum values by name"},
-    {"oneofs_by_name", (getter)GetOneofsByName, nullptr, "Oneofs by name"},
-    {"oneofs", (getter)GetOneofsSeq, nullptr, "Oneofs by name"},
-    {"containing_type", (getter)GetContainingType, (setter)SetContainingType,
-     "Containing type"},
-    {"is_extendable", (getter)IsExtendable, (setter) nullptr},
-    {"has_options", (getter)GetHasOptions, (setter)SetHasOptions,
-     "Has Options"},
-    {"_options", (getter) nullptr, (setter)SetOptions, "Options"},
-    {"_serialized_options", (getter) nullptr, (setter)SetSerializedOptions,
-     "Serialized Options"},
-    {"syntax", (getter)GetSyntax, (setter) nullptr, "Syntax"},
-    {nullptr},
-};
-
-static PyMethodDef Methods[] = {
-    {"GetOptions", (PyCFunction)GetOptions, METH_NOARGS},
-    {"CopyToProto", (PyCFunction)CopyToProto, METH_O},
-    {"EnumValueName", (PyCFunction)EnumValueName, METH_VARARGS},
-    {nullptr},
-};
-
-}  // namespace message_descriptor
-
-PyTypeObject PyMessageDescriptor_Type = {
-    PyVarObject_HEAD_INIT(&PyType_Type, 0) FULL_MODULE_NAME
-    ".MessageDescriptor",      // tp_name
-    sizeof(PyBaseDescriptor),  // tp_basicsize
-    0,                         // tp_itemsize
-    nullptr,                   // tp_dealloc
-#if PY_VERSION_HEX < 0x03080000
-    nullptr,  // tp_print
-#else
-    0,  // tp_vectorcall_offset
-#endif
-    nullptr,                             // tp_getattr
-    nullptr,                             // tp_setattr
-    nullptr,                             // tp_compare
-    nullptr,                             // tp_repr
-    nullptr,                             // tp_as_number
-    nullptr,                             // tp_as_sequence
-    nullptr,                             // tp_as_mapping
-    nullptr,                             // tp_hash
-    nullptr,                             // tp_call
-    nullptr,                             // tp_str
-    nullptr,                             // tp_getattro
-    nullptr,                             // tp_setattro
-    nullptr,                             // tp_as_buffer
-    Py_TPFLAGS_DEFAULT,                  // tp_flags
-    "A Message Descriptor",              // tp_doc
-    nullptr,                             // tp_traverse
-    nullptr,                             // tp_clear
-    nullptr,                             // tp_richcompare
-    0,                                   // tp_weaklistoffset
-    nullptr,                             // tp_iter
-    nullptr,                             // tp_iternext
-    message_descriptor::Methods,         // tp_methods
-    nullptr,                             // tp_members
-    message_descriptor::Getters,         // tp_getset
-    &descriptor::PyBaseDescriptor_Type,  // tp_base
-};
-
-PyObject* PyMessageDescriptor_FromDescriptor(
-    const Descriptor* message_descriptor) {
-  return descriptor::NewInternedDescriptor(&PyMessageDescriptor_Type,
-                                           message_descriptor, nullptr);
-}
-
-const Descriptor* PyMessageDescriptor_AsDescriptor(PyObject* obj) {
-  if (!PyObject_TypeCheck(obj, &PyMessageDescriptor_Type)) {
-    PyErr_SetString(PyExc_TypeError, "Not a MessageDescriptor");
-    return nullptr;
-  }
-  return reinterpret_cast<const Descriptor*>(
-      reinterpret_cast<PyBaseDescriptor*>(obj)->descriptor);
-}
-
-namespace field_descriptor {
-
-// Unchecked accessor to the C++ pointer.
-static const FieldDescriptor* _GetDescriptor(
-    PyBaseDescriptor *self) {
-  return reinterpret_cast<const FieldDescriptor*>(self->descriptor);
-}
-
-static PyObject* GetFullName(PyBaseDescriptor* self, void *closure) {
-  return PyString_FromCppString(_GetDescriptor(self)->full_name());
-}
-
-static PyObject* GetName(PyBaseDescriptor *self, void *closure) {
-  return PyString_FromCppString(_GetDescriptor(self)->name());
-}
-
-static PyObject* GetCamelcaseName(PyBaseDescriptor* self, void *closure) {
-  return PyString_FromCppString(_GetDescriptor(self)->camelcase_name());
-}
-
-static PyObject* GetJsonName(PyBaseDescriptor* self, void *closure) {
-  return PyString_FromCppString(_GetDescriptor(self)->json_name());
-}
-
-static PyObject* GetFile(PyBaseDescriptor *self, void *closure) {
-  return PyFileDescriptor_FromDescriptor(_GetDescriptor(self)->file());
-}
-
-static PyObject* GetType(PyBaseDescriptor *self, void *closure) {
-  return PyLong_FromLong(_GetDescriptor(self)->type());
-}
-
-static PyObject* GetCppType(PyBaseDescriptor *self, void *closure) {
-  return PyLong_FromLong(_GetDescriptor(self)->cpp_type());
-}
-
-static PyObject* GetLabel(PyBaseDescriptor *self, void *closure) {
-  return PyLong_FromLong(_GetDescriptor(self)->label());
-}
-
-static PyObject* GetNumber(PyBaseDescriptor *self, void *closure) {
-  return PyLong_FromLong(_GetDescriptor(self)->number());
-}
-
-static PyObject* GetIndex(PyBaseDescriptor *self, void *closure) {
-  return PyLong_FromLong(_GetDescriptor(self)->index());
-}
-
-static PyObject* GetID(PyBaseDescriptor *self, void *closure) {
-  return PyLong_FromVoidPtr(self);
-}
-
-static PyObject* IsExtension(PyBaseDescriptor *self, void *closure) {
-  return PyBool_FromLong(_GetDescriptor(self)->is_extension());
-}
-
-static PyObject* HasDefaultValue(PyBaseDescriptor *self, void *closure) {
-  return PyBool_FromLong(_GetDescriptor(self)->has_default_value());
-}
-
-static PyObject* GetDefaultValue(PyBaseDescriptor *self, void *closure) {
-  PyObject *result;
-
-  if (_GetDescriptor(self)->is_repeated()) {
-    return PyList_New(0);
-  }
-
-
-  switch (_GetDescriptor(self)->cpp_type()) {
-    case FieldDescriptor::CPPTYPE_INT32: {
-      int32_t value = _GetDescriptor(self)->default_value_int32();
-      result = PyLong_FromLong(value);
-      break;
-    }
-    case FieldDescriptor::CPPTYPE_INT64: {
-      int64_t value = _GetDescriptor(self)->default_value_int64();
-      result = PyLong_FromLongLong(value);
-      break;
-    }
-    case FieldDescriptor::CPPTYPE_UINT32: {
-      uint32_t value = _GetDescriptor(self)->default_value_uint32();
-      result = PyLong_FromSsize_t(value);
-      break;
-    }
-    case FieldDescriptor::CPPTYPE_UINT64: {
-      uint64_t value = _GetDescriptor(self)->default_value_uint64();
-      result = PyLong_FromUnsignedLongLong(value);
-      break;
-    }
-    case FieldDescriptor::CPPTYPE_FLOAT: {
-      float value = _GetDescriptor(self)->default_value_float();
-      result = PyFloat_FromDouble(value);
-      break;
-    }
-    case FieldDescriptor::CPPTYPE_DOUBLE: {
-      double value = _GetDescriptor(self)->default_value_double();
-      result = PyFloat_FromDouble(value);
-      break;
-    }
-    case FieldDescriptor::CPPTYPE_BOOL: {
-      bool value = _GetDescriptor(self)->default_value_bool();
-      result = PyBool_FromLong(value);
-      break;
-    }
-    case FieldDescriptor::CPPTYPE_STRING: {
-      const std::string& value = _GetDescriptor(self)->default_value_string();
-      result = ToStringObject(_GetDescriptor(self), value);
-      break;
-    }
-    case FieldDescriptor::CPPTYPE_ENUM: {
-      const EnumValueDescriptor* value =
-          _GetDescriptor(self)->default_value_enum();
-      result = PyLong_FromLong(value->number());
-      break;
-    }
-    case FieldDescriptor::CPPTYPE_MESSAGE: {
-      Py_RETURN_NONE;
-      break;
-    }
-    default:
-      PyErr_Format(PyExc_NotImplementedError, "default value for %s",
-                   _GetDescriptor(self)->full_name().c_str());
-      return nullptr;
-  }
-  return result;
-}
-
-static PyObject* GetCDescriptor(PyObject *self, void *closure) {
-  Py_INCREF(self);
-  return self;
-}
-
-static PyObject *GetEnumType(PyBaseDescriptor *self, void *closure) {
-  const EnumDescriptor* enum_type = _GetDescriptor(self)->enum_type();
-  if (enum_type) {
-    return PyEnumDescriptor_FromDescriptor(enum_type);
-  } else {
-    Py_RETURN_NONE;
-  }
-}
-
-static int SetEnumType(PyBaseDescriptor *self, PyObject *value, void *closure) {
-  return CheckCalledFromGeneratedFile("enum_type");
-}
-
-static PyObject *GetMessageType(PyBaseDescriptor *self, void *closure) {
-  const Descriptor* message_type = _GetDescriptor(self)->message_type();
-  if (message_type) {
-    return PyMessageDescriptor_FromDescriptor(message_type);
-  } else {
-    Py_RETURN_NONE;
-  }
-}
-
-static int SetMessageType(PyBaseDescriptor *self, PyObject *value,
-                          void *closure) {
-  return CheckCalledFromGeneratedFile("message_type");
-}
-
-static PyObject* GetContainingType(PyBaseDescriptor *self, void *closure) {
-  const Descriptor* containing_type =
-      _GetDescriptor(self)->containing_type();
-  if (containing_type) {
-    return PyMessageDescriptor_FromDescriptor(containing_type);
-  } else {
-    Py_RETURN_NONE;
-  }
-}
-
-static int SetContainingType(PyBaseDescriptor *self, PyObject *value,
-                             void *closure) {
-  return CheckCalledFromGeneratedFile("containing_type");
-}
-
-static PyObject* GetExtensionScope(PyBaseDescriptor *self, void *closure) {
-  const auto* desc = _GetDescriptor(self);
-  const Descriptor* extension_scope =
-      desc->is_extension() ? desc->extension_scope() : nullptr;
-  if (extension_scope) {
-    return PyMessageDescriptor_FromDescriptor(extension_scope);
-  } else {
-    Py_RETURN_NONE;
-  }
-}
-
-static PyObject* GetContainingOneof(PyBaseDescriptor *self, void *closure) {
-  const OneofDescriptor* containing_oneof =
-      _GetDescriptor(self)->containing_oneof();
-  if (containing_oneof) {
-    return PyOneofDescriptor_FromDescriptor(containing_oneof);
-  } else {
-    Py_RETURN_NONE;
-  }
-}
-
-static int SetContainingOneof(PyBaseDescriptor *self, PyObject *value,
-                              void *closure) {
-  return CheckCalledFromGeneratedFile("containing_oneof");
-}
-
-static PyObject* GetHasOptions(PyBaseDescriptor *self, void *closure) {
-  const FieldOptions& options(_GetDescriptor(self)->options());
-  if (&options != &FieldOptions::default_instance()) {
-    Py_RETURN_TRUE;
-  } else {
-    Py_RETURN_FALSE;
-  }
-}
-static int SetHasOptions(PyBaseDescriptor *self, PyObject *value,
-                         void *closure) {
-  return CheckCalledFromGeneratedFile("has_options");
-}
-
-static PyObject* GetHasPresence(PyBaseDescriptor* self, void* closure) {
-  if (_GetDescriptor(self)->has_presence()) {
-    Py_RETURN_TRUE;
-  } else {
-    Py_RETURN_FALSE;
-  }
-}
-
-static PyObject* GetOptions(PyBaseDescriptor *self) {
-  return GetOrBuildOptions(_GetDescriptor(self));
-}
-
-static int SetOptions(PyBaseDescriptor *self, PyObject *value,
-                      void *closure) {
-  return CheckCalledFromGeneratedFile("_options");
-}
-
-static int SetSerializedOptions(PyBaseDescriptor *self, PyObject *value,
-                                void *closure) {
-  return CheckCalledFromGeneratedFile("_serialized_options");
-}
-
-static PyGetSetDef Getters[] = {
-    {"full_name", (getter)GetFullName, nullptr, "Full name"},
-    {"name", (getter)GetName, nullptr, "Unqualified name"},
-    {"camelcase_name", (getter)GetCamelcaseName, nullptr, "Camelcase name"},
-    {"json_name", (getter)GetJsonName, nullptr, "Json name"},
-    {"file", (getter)GetFile, nullptr, "File Descriptor"},
-    {"type", (getter)GetType, nullptr, "C++ Type"},
-    {"cpp_type", (getter)GetCppType, nullptr, "C++ Type"},
-    {"label", (getter)GetLabel, nullptr, "Label"},
-    {"number", (getter)GetNumber, nullptr, "Number"},
-    {"index", (getter)GetIndex, nullptr, "Index"},
-    {"default_value", (getter)GetDefaultValue, nullptr, "Default Value"},
-    {"has_default_value", (getter)HasDefaultValue},
-    {"is_extension", (getter)IsExtension, nullptr, "ID"},
-    {"id", (getter)GetID, nullptr, "ID"},
-    {"_cdescriptor", (getter)GetCDescriptor, nullptr, "HAACK REMOVE ME"},
-
-    {"message_type", (getter)GetMessageType, (setter)SetMessageType,
-     "Message type"},
-    {"enum_type", (getter)GetEnumType, (setter)SetEnumType, "Enum type"},
-    {"containing_type", (getter)GetContainingType, (setter)SetContainingType,
-     "Containing type"},
-    {"extension_scope", (getter)GetExtensionScope, (setter) nullptr,
-     "Extension scope"},
-    {"containing_oneof", (getter)GetContainingOneof, (setter)SetContainingOneof,
-     "Containing oneof"},
-    {"has_options", (getter)GetHasOptions, (setter)SetHasOptions,
-     "Has Options"},
-    {"has_presence", (getter)GetHasPresence, (setter) nullptr, "Has Presence"},
-    {"_options", (getter) nullptr, (setter)SetOptions, "Options"},
-    {"_serialized_options", (getter) nullptr, (setter)SetSerializedOptions,
-     "Serialized Options"},
-    {nullptr},
-};
-
-static PyMethodDef Methods[] = {
-    {"GetOptions", (PyCFunction)GetOptions, METH_NOARGS},
-    {nullptr},
-};
-
-}  // namespace field_descriptor
-
-PyTypeObject PyFieldDescriptor_Type = {
-    PyVarObject_HEAD_INIT(&PyType_Type, 0) FULL_MODULE_NAME
-    ".FieldDescriptor",        // tp_name
-    sizeof(PyBaseDescriptor),  // tp_basicsize
-    0,                         // tp_itemsize
-    nullptr,                   // tp_dealloc
-#if PY_VERSION_HEX < 0x03080000
-    nullptr,  // tp_print
-#else
-    0,  // tp_vectorcall_offset
-#endif
-    nullptr,                             // tp_getattr
-    nullptr,                             // tp_setattr
-    nullptr,                             // tp_compare
-    nullptr,                             // tp_repr
-    nullptr,                             // tp_as_number
-    nullptr,                             // tp_as_sequence
-    nullptr,                             // tp_as_mapping
-    nullptr,                             // tp_hash
-    nullptr,                             // tp_call
-    nullptr,                             // tp_str
-    nullptr,                             // tp_getattro
-    nullptr,                             // tp_setattro
-    nullptr,                             // tp_as_buffer
-    Py_TPFLAGS_DEFAULT,                  // tp_flags
-    "A Field Descriptor",                // tp_doc
-    nullptr,                             // tp_traverse
-    nullptr,                             // tp_clear
-    nullptr,                             // tp_richcompare
-    0,                                   // tp_weaklistoffset
-    nullptr,                             // tp_iter
-    nullptr,                             // tp_iternext
-    field_descriptor::Methods,           // tp_methods
-    nullptr,                             // tp_members
-    field_descriptor::Getters,           // tp_getset
-    &descriptor::PyBaseDescriptor_Type,  // tp_base
-};
-
-PyObject* PyFieldDescriptor_FromDescriptor(
-    const FieldDescriptor* field_descriptor) {
-  return descriptor::NewInternedDescriptor(&PyFieldDescriptor_Type,
-                                           field_descriptor, nullptr);
-}
-
-const FieldDescriptor* PyFieldDescriptor_AsDescriptor(PyObject* obj) {
-  if (!PyObject_TypeCheck(obj, &PyFieldDescriptor_Type)) {
-    PyErr_SetString(PyExc_TypeError, "Not a FieldDescriptor");
-    return nullptr;
-  }
-  return reinterpret_cast<const FieldDescriptor*>(
-      reinterpret_cast<PyBaseDescriptor*>(obj)->descriptor);
-}
-
-namespace enum_descriptor {
-
-// Unchecked accessor to the C++ pointer.
-static const EnumDescriptor* _GetDescriptor(
-    PyBaseDescriptor *self) {
-  return reinterpret_cast<const EnumDescriptor*>(self->descriptor);
-}
-
-static PyObject* GetFullName(PyBaseDescriptor* self, void *closure) {
-  return PyString_FromCppString(_GetDescriptor(self)->full_name());
-}
-
-static PyObject* GetName(PyBaseDescriptor *self, void *closure) {
-  return PyString_FromCppString(_GetDescriptor(self)->name());
-}
-
-static PyObject* GetFile(PyBaseDescriptor *self, void *closure) {
-  return PyFileDescriptor_FromDescriptor(_GetDescriptor(self)->file());
-}
-
-static PyObject* GetEnumvaluesByName(PyBaseDescriptor* self, void *closure) {
-  return NewEnumValuesByName(_GetDescriptor(self));
-}
-
-static PyObject* GetEnumvaluesByNumber(PyBaseDescriptor* self, void *closure) {
-  return NewEnumValuesByNumber(_GetDescriptor(self));
-}
-
-static PyObject* GetEnumvaluesSeq(PyBaseDescriptor* self, void *closure) {
-  return NewEnumValuesSeq(_GetDescriptor(self));
-}
-
-static PyObject* GetContainingType(PyBaseDescriptor *self, void *closure) {
-  const Descriptor* containing_type =
-      _GetDescriptor(self)->containing_type();
-  if (containing_type) {
-    return PyMessageDescriptor_FromDescriptor(containing_type);
-  } else {
-    Py_RETURN_NONE;
-  }
-}
-
-static int SetContainingType(PyBaseDescriptor *self, PyObject *value,
-                             void *closure) {
-  return CheckCalledFromGeneratedFile("containing_type");
-}
-
-
-static PyObject* GetHasOptions(PyBaseDescriptor *self, void *closure) {
-  const EnumOptions& options(_GetDescriptor(self)->options());
-  if (&options != &EnumOptions::default_instance()) {
-    Py_RETURN_TRUE;
-  } else {
-    Py_RETURN_FALSE;
-  }
-}
-static int SetHasOptions(PyBaseDescriptor *self, PyObject *value,
-                         void *closure) {
-  return CheckCalledFromGeneratedFile("has_options");
-}
-
-static PyObject* GetOptions(PyBaseDescriptor *self) {
-  return GetOrBuildOptions(_GetDescriptor(self));
-}
-
-static int SetOptions(PyBaseDescriptor *self, PyObject *value,
-                      void *closure) {
-  return CheckCalledFromGeneratedFile("_options");
-}
-
-static int SetSerializedOptions(PyBaseDescriptor *self, PyObject *value,
-                                void *closure) {
-  return CheckCalledFromGeneratedFile("_serialized_options");
-}
-
-static PyObject* CopyToProto(PyBaseDescriptor *self, PyObject *target) {
-  return CopyToPythonProto<EnumDescriptorProto>(_GetDescriptor(self), target);
-}
-
-static PyMethodDef Methods[] = {
-    {"GetOptions", (PyCFunction)GetOptions, METH_NOARGS},
-    {"CopyToProto", (PyCFunction)CopyToProto, METH_O},
-    {nullptr},
-};
-
-static PyGetSetDef Getters[] = {
-    {"full_name", (getter)GetFullName, nullptr, "Full name"},
-    {"name", (getter)GetName, nullptr, "last name"},
-    {"file", (getter)GetFile, nullptr, "File descriptor"},
-    {"values", (getter)GetEnumvaluesSeq, nullptr, "values"},
-    {"values_by_name", (getter)GetEnumvaluesByName, nullptr,
-     "Enum values by name"},
-    {"values_by_number", (getter)GetEnumvaluesByNumber, nullptr,
-     "Enum values by number"},
-
-    {"containing_type", (getter)GetContainingType, (setter)SetContainingType,
-     "Containing type"},
-    {"has_options", (getter)GetHasOptions, (setter)SetHasOptions,
-     "Has Options"},
-    {"_options", (getter) nullptr, (setter)SetOptions, "Options"},
-    {"_serialized_options", (getter) nullptr, (setter)SetSerializedOptions,
-     "Serialized Options"},
-    {nullptr},
-};
-
-}  // namespace enum_descriptor
-
-PyTypeObject PyEnumDescriptor_Type = {
-    PyVarObject_HEAD_INIT(&PyType_Type, 0) FULL_MODULE_NAME
-    ".EnumDescriptor",         // tp_name
-    sizeof(PyBaseDescriptor),  // tp_basicsize
-    0,                         // tp_itemsize
-    nullptr,                   // tp_dealloc
-#if PY_VERSION_HEX < 0x03080000
-    nullptr,  // tp_print
-#else
-    0,  // tp_vectorcall_offset
-#endif
-    nullptr,                             // tp_getattr
-    nullptr,                             // tp_setattr
-    nullptr,                             // tp_compare
-    nullptr,                             // tp_repr
-    nullptr,                             // tp_as_number
-    nullptr,                             // tp_as_sequence
-    nullptr,                             // tp_as_mapping
-    nullptr,                             // tp_hash
-    nullptr,                             // tp_call
-    nullptr,                             // tp_str
-    nullptr,                             // tp_getattro
-    nullptr,                             // tp_setattro
-    nullptr,                             // tp_as_buffer
-    Py_TPFLAGS_DEFAULT,                  // tp_flags
-    "A Enum Descriptor",                 // tp_doc
-    nullptr,                             // tp_traverse
-    nullptr,                             // tp_clear
-    nullptr,                             // tp_richcompare
-    0,                                   // tp_weaklistoffset
-    nullptr,                             // tp_iter
-    nullptr,                             // tp_iternext
-    enum_descriptor::Methods,            // tp_methods
-    nullptr,                             // tp_members
-    enum_descriptor::Getters,            // tp_getset
-    &descriptor::PyBaseDescriptor_Type,  // tp_base
-};
-
-PyObject* PyEnumDescriptor_FromDescriptor(
-    const EnumDescriptor* enum_descriptor) {
-  return descriptor::NewInternedDescriptor(&PyEnumDescriptor_Type,
-                                           enum_descriptor, nullptr);
-}
-
-const EnumDescriptor* PyEnumDescriptor_AsDescriptor(PyObject* obj) {
-  if (!PyObject_TypeCheck(obj, &PyEnumDescriptor_Type)) {
-    PyErr_SetString(PyExc_TypeError, "Not an EnumDescriptor");
-    return nullptr;
-  }
-  return reinterpret_cast<const EnumDescriptor*>(
-      reinterpret_cast<PyBaseDescriptor*>(obj)->descriptor);
-}
-
-namespace enumvalue_descriptor {
-
-// Unchecked accessor to the C++ pointer.
-static const EnumValueDescriptor* _GetDescriptor(
-    PyBaseDescriptor *self) {
-  return reinterpret_cast<const EnumValueDescriptor*>(self->descriptor);
-}
-
-static PyObject* GetName(PyBaseDescriptor *self, void *closure) {
-  return PyString_FromCppString(_GetDescriptor(self)->name());
-}
-
-static PyObject* GetNumber(PyBaseDescriptor *self, void *closure) {
-  return PyLong_FromLong(_GetDescriptor(self)->number());
-}
-
-static PyObject* GetIndex(PyBaseDescriptor *self, void *closure) {
-  return PyLong_FromLong(_GetDescriptor(self)->index());
-}
-
-static PyObject* GetType(PyBaseDescriptor *self, void *closure) {
-  return PyEnumDescriptor_FromDescriptor(_GetDescriptor(self)->type());
-}
-
-static PyObject* GetHasOptions(PyBaseDescriptor *self, void *closure) {
-  const EnumValueOptions& options(_GetDescriptor(self)->options());
-  if (&options != &EnumValueOptions::default_instance()) {
-    Py_RETURN_TRUE;
-  } else {
-    Py_RETURN_FALSE;
-  }
-}
-static int SetHasOptions(PyBaseDescriptor *self, PyObject *value,
-                         void *closure) {
-  return CheckCalledFromGeneratedFile("has_options");
-}
-
-static PyObject* GetOptions(PyBaseDescriptor *self) {
-  return GetOrBuildOptions(_GetDescriptor(self));
-}
-
-static int SetOptions(PyBaseDescriptor *self, PyObject *value,
-                      void *closure) {
-  return CheckCalledFromGeneratedFile("_options");
-}
-
-static int SetSerializedOptions(PyBaseDescriptor *self, PyObject *value,
-                                void *closure) {
-  return CheckCalledFromGeneratedFile("_serialized_options");
-}
-
-static PyGetSetDef Getters[] = {
-    {"name", (getter)GetName, nullptr, "name"},
-    {"number", (getter)GetNumber, nullptr, "number"},
-    {"index", (getter)GetIndex, nullptr, "index"},
-    {"type", (getter)GetType, nullptr, "index"},
-
-    {"has_options", (getter)GetHasOptions, (setter)SetHasOptions,
-     "Has Options"},
-    {"_options", (getter) nullptr, (setter)SetOptions, "Options"},
-    {"_serialized_options", (getter) nullptr, (setter)SetSerializedOptions,
-     "Serialized Options"},
-    {nullptr},
-};
-
-static PyMethodDef Methods[] = {
-    {"GetOptions", (PyCFunction)GetOptions, METH_NOARGS},
-    {nullptr},
-};
-
-}  // namespace enumvalue_descriptor
-
-PyTypeObject PyEnumValueDescriptor_Type = {
-    PyVarObject_HEAD_INIT(&PyType_Type, 0) FULL_MODULE_NAME
-    ".EnumValueDescriptor",    // tp_name
-    sizeof(PyBaseDescriptor),  // tp_basicsize
-    0,                         // tp_itemsize
-    nullptr,                   // tp_dealloc
-#if PY_VERSION_HEX < 0x03080000
-    nullptr,  // tp_print
-#else
-    0,  // tp_vectorcall_offset
-#endif
-    nullptr,                             // tp_getattr
-    nullptr,                             // tp_setattr
-    nullptr,                             // tp_compare
-    nullptr,                             // tp_repr
-    nullptr,                             // tp_as_number
-    nullptr,                             // tp_as_sequence
-    nullptr,                             // tp_as_mapping
-    nullptr,                             // tp_hash
-    nullptr,                             // tp_call
-    nullptr,                             // tp_str
-    nullptr,                             // tp_getattro
-    nullptr,                             // tp_setattro
-    nullptr,                             // tp_as_buffer
-    Py_TPFLAGS_DEFAULT,                  // tp_flags
-    "A EnumValue Descriptor",            // tp_doc
-    nullptr,                             // tp_traverse
-    nullptr,                             // tp_clear
-    nullptr,                             // tp_richcompare
-    0,                                   // tp_weaklistoffset
-    nullptr,                             // tp_iter
-    nullptr,                             // tp_iternext
-    enumvalue_descriptor::Methods,       // tp_methods
-    nullptr,                             // tp_members
-    enumvalue_descriptor::Getters,       // tp_getset
-    &descriptor::PyBaseDescriptor_Type,  // tp_base
-};
-
-PyObject* PyEnumValueDescriptor_FromDescriptor(
-    const EnumValueDescriptor* enumvalue_descriptor) {
-  return descriptor::NewInternedDescriptor(&PyEnumValueDescriptor_Type,
-                                           enumvalue_descriptor, nullptr);
-}
-
-namespace file_descriptor {
-
-// Unchecked accessor to the C++ pointer.
-static const FileDescriptor* _GetDescriptor(PyFileDescriptor *self) {
-  return reinterpret_cast<const FileDescriptor*>(self->base.descriptor);
-}
-
-static void Dealloc(PyFileDescriptor* self) {
-  Py_XDECREF(self->serialized_pb);
-  descriptor::Dealloc(reinterpret_cast<PyObject*>(self));
-}
-
-static PyObject* GetPool(PyFileDescriptor *self, void *closure) {
-  PyObject* pool = reinterpret_cast<PyObject*>(
-      GetDescriptorPool_FromPool(_GetDescriptor(self)->pool()));
-  Py_XINCREF(pool);
-  return pool;
-}
-
-static PyObject* GetName(PyFileDescriptor *self, void *closure) {
-  return PyString_FromCppString(_GetDescriptor(self)->name());
-}
-
-static PyObject* GetPackage(PyFileDescriptor *self, void *closure) {
-  return PyString_FromCppString(_GetDescriptor(self)->package());
-}
-
-static PyObject* GetSerializedPb(PyFileDescriptor *self, void *closure) {
-  PyObject *serialized_pb = self->serialized_pb;
-  if (serialized_pb != nullptr) {
-    Py_INCREF(serialized_pb);
-    return serialized_pb;
-  }
-  FileDescriptorProto file_proto;
-  _GetDescriptor(self)->CopyTo(&file_proto);
-  std::string contents;
-  file_proto.SerializePartialToString(&contents);
-  self->serialized_pb = PyBytes_FromStringAndSize(
-      contents.c_str(), contents.size());
-  if (self->serialized_pb == nullptr) {
-    return nullptr;
-  }
-  Py_INCREF(self->serialized_pb);
-  return self->serialized_pb;
-}
-
-static PyObject* GetMessageTypesByName(PyFileDescriptor* self, void *closure) {
-  return NewFileMessageTypesByName(_GetDescriptor(self));
-}
-
-static PyObject* GetEnumTypesByName(PyFileDescriptor* self, void *closure) {
-  return NewFileEnumTypesByName(_GetDescriptor(self));
-}
-
-static PyObject* GetExtensionsByName(PyFileDescriptor* self, void *closure) {
-  return NewFileExtensionsByName(_GetDescriptor(self));
-}
-
-static PyObject* GetServicesByName(PyFileDescriptor* self, void *closure) {
-  return NewFileServicesByName(_GetDescriptor(self));
-}
-
-static PyObject* GetDependencies(PyFileDescriptor* self, void *closure) {
-  return NewFileDependencies(_GetDescriptor(self));
-}
-
-static PyObject* GetPublicDependencies(PyFileDescriptor* self, void *closure) {
-  return NewFilePublicDependencies(_GetDescriptor(self));
-}
-
-static PyObject* GetHasOptions(PyFileDescriptor *self, void *closure) {
-  const FileOptions& options(_GetDescriptor(self)->options());
-  if (&options != &FileOptions::default_instance()) {
-    Py_RETURN_TRUE;
-  } else {
-    Py_RETURN_FALSE;
-  }
-}
-static int SetHasOptions(PyFileDescriptor *self, PyObject *value,
-                         void *closure) {
-  return CheckCalledFromGeneratedFile("has_options");
-}
-
-static PyObject* GetDebugString(PyFileDescriptor* self) {
-  return PyString_FromCppString(_GetDescriptor(self)->DebugString());
-}
-
-static PyObject* GetOptions(PyFileDescriptor *self) {
-  return GetOrBuildOptions(_GetDescriptor(self));
-}
-
-static int SetOptions(PyFileDescriptor *self, PyObject *value,
-                      void *closure) {
-  return CheckCalledFromGeneratedFile("_options");
-}
-
-static int SetSerializedOptions(PyFileDescriptor *self, PyObject *value,
-                                void *closure) {
-  return CheckCalledFromGeneratedFile("_serialized_options");
-}
-
-static PyObject* GetSyntax(PyFileDescriptor *self, void *closure) {
-  return PyUnicode_InternFromString(
-      FileDescriptor::SyntaxName(_GetDescriptor(self)->syntax()));
-}
-
-static PyObject* CopyToProto(PyFileDescriptor *self, PyObject *target) {
-  return CopyToPythonProto<FileDescriptorProto>(_GetDescriptor(self), target);
-}
-
-static PyGetSetDef Getters[] = {
-    {"pool", (getter)GetPool, nullptr, "pool"},
-    {"name", (getter)GetName, nullptr, "name"},
-    {"package", (getter)GetPackage, nullptr, "package"},
-    {"serialized_pb", (getter)GetSerializedPb},
-    {"message_types_by_name", (getter)GetMessageTypesByName, nullptr,
-     "Messages by name"},
-    {"enum_types_by_name", (getter)GetEnumTypesByName, nullptr,
-     "Enums by name"},
-    {"extensions_by_name", (getter)GetExtensionsByName, nullptr,
-     "Extensions by name"},
-    {"services_by_name", (getter)GetServicesByName, nullptr,
-     "Services by name"},
-    {"dependencies", (getter)GetDependencies, nullptr, "Dependencies"},
-    {"public_dependencies", (getter)GetPublicDependencies, nullptr,
-     "Dependencies"},
-
-    {"has_options", (getter)GetHasOptions, (setter)SetHasOptions,
-     "Has Options"},
-    {"_options", (getter) nullptr, (setter)SetOptions, "Options"},
-    {"_serialized_options", (getter) nullptr, (setter)SetSerializedOptions,
-     "Serialized Options"},
-    {"syntax", (getter)GetSyntax, (setter) nullptr, "Syntax"},
-    {nullptr},
-};
-
-static PyMethodDef Methods[] = {
-    {"GetDebugString", (PyCFunction)GetDebugString, METH_NOARGS},
-    {"GetOptions", (PyCFunction)GetOptions, METH_NOARGS},
-    {"CopyToProto", (PyCFunction)CopyToProto, METH_O},
-    {nullptr},
-};
-
-}  // namespace file_descriptor
-
-PyTypeObject PyFileDescriptor_Type = {
-    PyVarObject_HEAD_INIT(&PyType_Type, 0) FULL_MODULE_NAME
-    ".FileDescriptor",                     // tp_name
-    sizeof(PyFileDescriptor),              // tp_basicsize
-    0,                                     // tp_itemsize
-    (destructor)file_descriptor::Dealloc,  // tp_dealloc
-#if PY_VERSION_HEX < 0x03080000
-    nullptr,  // tp_print
-#else
-    0,  // tp_vectorcall_offset
-#endif
-    nullptr,                             // tp_getattr
-    nullptr,                             // tp_setattr
-    nullptr,                             // tp_compare
-    nullptr,                             // tp_repr
-    nullptr,                             // tp_as_number
-    nullptr,                             // tp_as_sequence
-    nullptr,                             // tp_as_mapping
-    nullptr,                             // tp_hash
-    nullptr,                             // tp_call
-    nullptr,                             // tp_str
-    nullptr,                             // tp_getattro
-    nullptr,                             // tp_setattro
-    nullptr,                             // tp_as_buffer
-    Py_TPFLAGS_DEFAULT,                  // tp_flags
-    "A File Descriptor",                 // tp_doc
-    nullptr,                             // tp_traverse
-    nullptr,                             // tp_clear
-    nullptr,                             // tp_richcompare
-    0,                                   // tp_weaklistoffset
-    nullptr,                             // tp_iter
-    nullptr,                             // tp_iternext
-    file_descriptor::Methods,            // tp_methods
-    nullptr,                             // tp_members
-    file_descriptor::Getters,            // tp_getset
-    &descriptor::PyBaseDescriptor_Type,  // tp_base
-    nullptr,                             // tp_dict
-    nullptr,                             // tp_descr_get
-    nullptr,                             // tp_descr_set
-    0,                                   // tp_dictoffset
-    nullptr,                             // tp_init
-    nullptr,                             // tp_alloc
-    nullptr,                             // tp_new
-    PyObject_GC_Del,                     // tp_free
-};
-
-PyObject* PyFileDescriptor_FromDescriptor(
-    const FileDescriptor* file_descriptor) {
-  return PyFileDescriptor_FromDescriptorWithSerializedPb(file_descriptor,
-                                                         nullptr);
-}
-
-PyObject* PyFileDescriptor_FromDescriptorWithSerializedPb(
-    const FileDescriptor* file_descriptor, PyObject *serialized_pb) {
-  bool was_created;
-  PyObject* py_descriptor = descriptor::NewInternedDescriptor(
-      &PyFileDescriptor_Type, file_descriptor, &was_created);
-  if (py_descriptor == nullptr) {
-    return nullptr;
-  }
-  if (was_created) {
-    PyFileDescriptor* cfile_descriptor =
-        reinterpret_cast<PyFileDescriptor*>(py_descriptor);
-    Py_XINCREF(serialized_pb);
-    cfile_descriptor->serialized_pb = serialized_pb;
-  }
-  // TODO(amauryfa): In the case of a cached object, check that serialized_pb
-  // is the same as before.
-
-  return py_descriptor;
-}
-
-const FileDescriptor* PyFileDescriptor_AsDescriptor(PyObject* obj) {
-  if (!PyObject_TypeCheck(obj, &PyFileDescriptor_Type)) {
-    PyErr_SetString(PyExc_TypeError, "Not a FileDescriptor");
-    return nullptr;
-  }
-  return reinterpret_cast<const FileDescriptor*>(
-      reinterpret_cast<PyBaseDescriptor*>(obj)->descriptor);
-}
-
-namespace oneof_descriptor {
-
-// Unchecked accessor to the C++ pointer.
-static const OneofDescriptor* _GetDescriptor(
-    PyBaseDescriptor *self) {
-  return reinterpret_cast<const OneofDescriptor*>(self->descriptor);
-}
-
-static PyObject* GetName(PyBaseDescriptor* self, void *closure) {
-  return PyString_FromCppString(_GetDescriptor(self)->name());
-}
-
-static PyObject* GetFullName(PyBaseDescriptor* self, void *closure) {
-  return PyString_FromCppString(_GetDescriptor(self)->full_name());
-}
-
-static PyObject* GetIndex(PyBaseDescriptor *self, void *closure) {
-  return PyLong_FromLong(_GetDescriptor(self)->index());
-}
-
-static PyObject* GetFields(PyBaseDescriptor* self, void *closure) {
-  return NewOneofFieldsSeq(_GetDescriptor(self));
-}
-
-static PyObject* GetContainingType(PyBaseDescriptor *self, void *closure) {
-  const Descriptor* containing_type =
-      _GetDescriptor(self)->containing_type();
-  if (containing_type) {
-    return PyMessageDescriptor_FromDescriptor(containing_type);
-  } else {
-    Py_RETURN_NONE;
-  }
-}
-
-static PyObject* GetHasOptions(PyBaseDescriptor *self, void *closure) {
-  const OneofOptions& options(_GetDescriptor(self)->options());
-  if (&options != &OneofOptions::default_instance()) {
-    Py_RETURN_TRUE;
-  } else {
-    Py_RETURN_FALSE;
-  }
-}
-
-static int SetHasOptions(PyBaseDescriptor *self, PyObject *value,
-                         void *closure) {
-  return CheckCalledFromGeneratedFile("has_options");
-}
-
-static PyObject* GetOptions(PyBaseDescriptor *self) {
-  return GetOrBuildOptions(_GetDescriptor(self));
-}
-
-static int SetOptions(PyBaseDescriptor *self, PyObject *value,
-                      void *closure) {
-  return CheckCalledFromGeneratedFile("_options");
-}
-
-static int SetSerializedOptions(PyBaseDescriptor *self, PyObject *value,
-                                void *closure) {
-  return CheckCalledFromGeneratedFile("_serialized_options");
-}
-
-static PyGetSetDef Getters[] = {
-    {"name", (getter)GetName, nullptr, "Name"},
-    {"full_name", (getter)GetFullName, nullptr, "Full name"},
-    {"index", (getter)GetIndex, nullptr, "Index"},
-
-    {"containing_type", (getter)GetContainingType, nullptr, "Containing type"},
-    {"has_options", (getter)GetHasOptions, (setter)SetHasOptions,
-     "Has Options"},
-    {"_options", (getter) nullptr, (setter)SetOptions, "Options"},
-    {"_serialized_options", (getter) nullptr, (setter)SetSerializedOptions,
-     "Serialized Options"},
-    {"fields", (getter)GetFields, nullptr, "Fields"},
-    {nullptr},
-};
-
-static PyMethodDef Methods[] = {
-    {"GetOptions", (PyCFunction)GetOptions, METH_NOARGS},
-    {nullptr},
-};
-
-}  // namespace oneof_descriptor
-
-PyTypeObject PyOneofDescriptor_Type = {
-    PyVarObject_HEAD_INIT(&PyType_Type, 0) FULL_MODULE_NAME
-    ".OneofDescriptor",        // tp_name
-    sizeof(PyBaseDescriptor),  // tp_basicsize
-    0,                         // tp_itemsize
-    nullptr,                   // tp_dealloc
-#if PY_VERSION_HEX < 0x03080000
-    nullptr,  // tp_print
-#else
-    0,  // tp_vectorcall_offset
-#endif
-    nullptr,                             // tp_getattr
-    nullptr,                             // tp_setattr
-    nullptr,                             // tp_compare
-    nullptr,                             // tp_repr
-    nullptr,                             // tp_as_number
-    nullptr,                             // tp_as_sequence
-    nullptr,                             // tp_as_mapping
-    nullptr,                             // tp_hash
-    nullptr,                             // tp_call
-    nullptr,                             // tp_str
-    nullptr,                             // tp_getattro
-    nullptr,                             // tp_setattro
-    nullptr,                             // tp_as_buffer
-    Py_TPFLAGS_DEFAULT,                  // tp_flags
-    "A Oneof Descriptor",                // tp_doc
-    nullptr,                             // tp_traverse
-    nullptr,                             // tp_clear
-    nullptr,                             // tp_richcompare
-    0,                                   // tp_weaklistoffset
-    nullptr,                             // tp_iter
-    nullptr,                             // tp_iternext
-    oneof_descriptor::Methods,           // tp_methods
-    nullptr,                             // tp_members
-    oneof_descriptor::Getters,           // tp_getset
-    &descriptor::PyBaseDescriptor_Type,  // tp_base
-};
-
-PyObject* PyOneofDescriptor_FromDescriptor(
-    const OneofDescriptor* oneof_descriptor) {
-  return descriptor::NewInternedDescriptor(&PyOneofDescriptor_Type,
-                                           oneof_descriptor, nullptr);
-}
-
-namespace service_descriptor {
-
-// Unchecked accessor to the C++ pointer.
-static const ServiceDescriptor* _GetDescriptor(
-    PyBaseDescriptor *self) {
-  return reinterpret_cast<const ServiceDescriptor*>(self->descriptor);
-}
-
-static PyObject* GetName(PyBaseDescriptor* self, void *closure) {
-  return PyString_FromCppString(_GetDescriptor(self)->name());
-}
-
-static PyObject* GetFullName(PyBaseDescriptor* self, void *closure) {
-  return PyString_FromCppString(_GetDescriptor(self)->full_name());
-}
-
-static PyObject* GetFile(PyBaseDescriptor *self, void *closure) {
-  return PyFileDescriptor_FromDescriptor(_GetDescriptor(self)->file());
-}
-
-static PyObject* GetIndex(PyBaseDescriptor *self, void *closure) {
-  return PyLong_FromLong(_GetDescriptor(self)->index());
-}
-
-static PyObject* GetMethods(PyBaseDescriptor* self, void *closure) {
-  return NewServiceMethodsSeq(_GetDescriptor(self));
-}
-
-static PyObject* GetMethodsByName(PyBaseDescriptor* self, void *closure) {
-  return NewServiceMethodsByName(_GetDescriptor(self));
-}
-
-static PyObject* FindMethodByName(PyBaseDescriptor *self, PyObject* arg) {
-  Py_ssize_t name_size;
-  char* name;
-  if (PyString_AsStringAndSize(arg, &name, &name_size) < 0) {
-    return nullptr;
-  }
-
-  const MethodDescriptor* method_descriptor =
-      _GetDescriptor(self)->FindMethodByName(StringParam(name, name_size));
-  if (method_descriptor == nullptr) {
-    PyErr_Format(PyExc_KeyError, "Couldn't find method %.200s", name);
-    return nullptr;
-  }
-
-  return PyMethodDescriptor_FromDescriptor(method_descriptor);
-}
-
-static PyObject* GetOptions(PyBaseDescriptor *self) {
-  return GetOrBuildOptions(_GetDescriptor(self));
-}
-
-static PyObject* CopyToProto(PyBaseDescriptor *self, PyObject *target) {
-  return CopyToPythonProto<ServiceDescriptorProto>(_GetDescriptor(self),
-                                                   target);
-}
-
-static PyGetSetDef Getters[] = {
-    {"name", (getter)GetName, nullptr, "Name", nullptr},
-    {"full_name", (getter)GetFullName, nullptr, "Full name", nullptr},
-    {"file", (getter)GetFile, nullptr, "File descriptor"},
-    {"index", (getter)GetIndex, nullptr, "Index", nullptr},
-    {"methods", (getter)GetMethods, nullptr, "Methods", nullptr},
-    {"methods_by_name", (getter)GetMethodsByName, nullptr, "Methods by name",
-     nullptr},
-    {nullptr},
-};
-
-static PyMethodDef Methods[] = {
-    {"GetOptions", (PyCFunction)GetOptions, METH_NOARGS},
-    {"CopyToProto", (PyCFunction)CopyToProto, METH_O},
-    {"FindMethodByName", (PyCFunction)FindMethodByName, METH_O},
-    {nullptr},
-};
-
-}  // namespace service_descriptor
-
-PyTypeObject PyServiceDescriptor_Type = {
-    PyVarObject_HEAD_INIT(&PyType_Type, 0) FULL_MODULE_NAME
-    ".ServiceDescriptor",      // tp_name
-    sizeof(PyBaseDescriptor),  // tp_basicsize
-    0,                         // tp_itemsize
-    nullptr,                   // tp_dealloc
-#if PY_VERSION_HEX < 0x03080000
-    nullptr,  // tp_print
-#else
-    0,  // tp_vectorcall_offset
-#endif
-    nullptr,                             // tp_getattr
-    nullptr,                             // tp_setattr
-    nullptr,                             // tp_compare
-    nullptr,                             // tp_repr
-    nullptr,                             // tp_as_number
-    nullptr,                             // tp_as_sequence
-    nullptr,                             // tp_as_mapping
-    nullptr,                             // tp_hash
-    nullptr,                             // tp_call
-    nullptr,                             // tp_str
-    nullptr,                             // tp_getattro
-    nullptr,                             // tp_setattro
-    nullptr,                             // tp_as_buffer
-    Py_TPFLAGS_DEFAULT,                  // tp_flags
-    "A Service Descriptor",              // tp_doc
-    nullptr,                             // tp_traverse
-    nullptr,                             // tp_clear
-    nullptr,                             // tp_richcompare
-    0,                                   // tp_weaklistoffset
-    nullptr,                             // tp_iter
-    nullptr,                             // tp_iternext
-    service_descriptor::Methods,         // tp_methods
-    nullptr,                             // tp_members
-    service_descriptor::Getters,         // tp_getset
-    &descriptor::PyBaseDescriptor_Type,  // tp_base
-};
-
-PyObject* PyServiceDescriptor_FromDescriptor(
-    const ServiceDescriptor* service_descriptor) {
-  return descriptor::NewInternedDescriptor(&PyServiceDescriptor_Type,
-                                           service_descriptor, nullptr);
-}
-
-const ServiceDescriptor* PyServiceDescriptor_AsDescriptor(PyObject* obj) {
-  if (!PyObject_TypeCheck(obj, &PyServiceDescriptor_Type)) {
-    PyErr_SetString(PyExc_TypeError, "Not a ServiceDescriptor");
-    return nullptr;
-  }
-  return reinterpret_cast<const ServiceDescriptor*>(
-      reinterpret_cast<PyBaseDescriptor*>(obj)->descriptor);
-}
-
-namespace method_descriptor {
-
-// Unchecked accessor to the C++ pointer.
-static const MethodDescriptor* _GetDescriptor(
-    PyBaseDescriptor *self) {
-  return reinterpret_cast<const MethodDescriptor*>(self->descriptor);
-}
-
-static PyObject* GetName(PyBaseDescriptor* self, void *closure) {
-  return PyString_FromCppString(_GetDescriptor(self)->name());
-}
-
-static PyObject* GetFullName(PyBaseDescriptor* self, void *closure) {
-  return PyString_FromCppString(_GetDescriptor(self)->full_name());
-}
-
-static PyObject* GetIndex(PyBaseDescriptor *self, void *closure) {
-  return PyLong_FromLong(_GetDescriptor(self)->index());
-}
-
-static PyObject* GetContainingService(PyBaseDescriptor *self, void *closure) {
-  const ServiceDescriptor* containing_service =
-      _GetDescriptor(self)->service();
-  return PyServiceDescriptor_FromDescriptor(containing_service);
-}
-
-static PyObject* GetInputType(PyBaseDescriptor *self, void *closure) {
-  const Descriptor* input_type = _GetDescriptor(self)->input_type();
-  return PyMessageDescriptor_FromDescriptor(input_type);
-}
-
-static PyObject* GetOutputType(PyBaseDescriptor *self, void *closure) {
-  const Descriptor* output_type = _GetDescriptor(self)->output_type();
-  return PyMessageDescriptor_FromDescriptor(output_type);
-}
-
-static PyObject* GetClientStreaming(PyBaseDescriptor* self, void* closure) {
-  return PyBool_FromLong(_GetDescriptor(self)->client_streaming() ? 1 : 0);
-}
-
-static PyObject* GetServerStreaming(PyBaseDescriptor* self, void* closure) {
-  return PyBool_FromLong(_GetDescriptor(self)->server_streaming() ? 1 : 0);
-}
-
-static PyObject* GetOptions(PyBaseDescriptor *self) {
-  return GetOrBuildOptions(_GetDescriptor(self));
-}
-
-static PyObject* CopyToProto(PyBaseDescriptor *self, PyObject *target) {
-  return CopyToPythonProto<MethodDescriptorProto>(_GetDescriptor(self), target);
-}
-
-static PyGetSetDef Getters[] = {
-    {"name", (getter)GetName, nullptr, "Name", nullptr},
-    {"full_name", (getter)GetFullName, nullptr, "Full name", nullptr},
-    {"index", (getter)GetIndex, nullptr, "Index", nullptr},
-    {"containing_service", (getter)GetContainingService, nullptr,
-     "Containing service", nullptr},
-    {"input_type", (getter)GetInputType, nullptr, "Input type", nullptr},
-    {"output_type", (getter)GetOutputType, nullptr, "Output type", nullptr},
-    {"client_streaming", (getter)GetClientStreaming, nullptr,
-     "Client streaming", nullptr},
-    {"server_streaming", (getter)GetServerStreaming, nullptr,
-     "Server streaming", nullptr},
-    {nullptr},
-};
-
-static PyMethodDef Methods[] = {
-    {"GetOptions", (PyCFunction)GetOptions, METH_NOARGS},
-    {"CopyToProto", (PyCFunction)CopyToProto, METH_O},
-    {nullptr},
-};
-
-}  // namespace method_descriptor
-
-PyTypeObject PyMethodDescriptor_Type = {
-    PyVarObject_HEAD_INIT(&PyType_Type, 0) FULL_MODULE_NAME
-    ".MethodDescriptor",       // tp_name
-    sizeof(PyBaseDescriptor),  // tp_basicsize
-    0,                         // tp_itemsize
-    nullptr,                   // tp_dealloc
-#if PY_VERSION_HEX < 0x03080000
-    nullptr,  // tp_print
-#else
-    0,  // tp_vectorcall_offset
-#endif
-    nullptr,                             // tp_getattr
-    nullptr,                             // tp_setattr
-    nullptr,                             // tp_compare
-    nullptr,                             // tp_repr
-    nullptr,                             // tp_as_number
-    nullptr,                             // tp_as_sequence
-    nullptr,                             // tp_as_mapping
-    nullptr,                             // tp_hash
-    nullptr,                             // tp_call
-    nullptr,                             // tp_str
-    nullptr,                             // tp_getattro
-    nullptr,                             // tp_setattro
-    nullptr,                             // tp_as_buffer
-    Py_TPFLAGS_DEFAULT,                  // tp_flags
-    "A Method Descriptor",               // tp_doc
-    nullptr,                             // tp_traverse
-    nullptr,                             // tp_clear
-    nullptr,                             // tp_richcompare
-    0,                                   // tp_weaklistoffset
-    nullptr,                             // tp_iter
-    nullptr,                             // tp_iternext
-    method_descriptor::Methods,          // tp_methods
-    nullptr,                             // tp_members
-    method_descriptor::Getters,          // tp_getset
-    &descriptor::PyBaseDescriptor_Type,  // tp_base
-};
-
-PyObject* PyMethodDescriptor_FromDescriptor(
-    const MethodDescriptor* method_descriptor) {
-  return descriptor::NewInternedDescriptor(&PyMethodDescriptor_Type,
-                                           method_descriptor, nullptr);
-}
-
-// Add a enum values to a type dictionary.
-static bool AddEnumValues(PyTypeObject *type,
-                          const EnumDescriptor* enum_descriptor) {
-  for (int i = 0; i < enum_descriptor->value_count(); ++i) {
-    const EnumValueDescriptor* value = enum_descriptor->value(i);
-    ScopedPyObjectPtr obj(PyLong_FromLong(value->number()));
-    if (obj == nullptr) {
-      return false;
-    }
-    if (PyDict_SetItemString(type->tp_dict, value->name().c_str(), obj.get()) <
-        0) {
-      return false;
-    }
-  }
-  return true;
-}
-
-static bool AddIntConstant(PyTypeObject *type, const char* name, int value) {
-  ScopedPyObjectPtr obj(PyLong_FromLong(value));
-  if (PyDict_SetItemString(type->tp_dict, name, obj.get()) < 0) {
-    return false;
-  }
-  return true;
-}
-
-
-bool InitDescriptor() {
-  if (PyType_Ready(&PyMessageDescriptor_Type) < 0)
-    return false;
-
-  if (PyType_Ready(&PyFieldDescriptor_Type) < 0)
-    return false;
-
-  if (!AddEnumValues(&PyFieldDescriptor_Type,
-                     FieldDescriptorProto::Label_descriptor())) {
-    return false;
-  }
-  if (!AddEnumValues(&PyFieldDescriptor_Type,
-                     FieldDescriptorProto::Type_descriptor())) {
-    return false;
-  }
-#define ADD_FIELDDESC_CONSTANT(NAME) AddIntConstant( \
-    &PyFieldDescriptor_Type, #NAME, FieldDescriptor::NAME)
-  if (!ADD_FIELDDESC_CONSTANT(CPPTYPE_INT32) ||
-      !ADD_FIELDDESC_CONSTANT(CPPTYPE_INT64) ||
-      !ADD_FIELDDESC_CONSTANT(CPPTYPE_UINT32) ||
-      !ADD_FIELDDESC_CONSTANT(CPPTYPE_UINT64) ||
-      !ADD_FIELDDESC_CONSTANT(CPPTYPE_DOUBLE) ||
-      !ADD_FIELDDESC_CONSTANT(CPPTYPE_FLOAT) ||
-      !ADD_FIELDDESC_CONSTANT(CPPTYPE_BOOL) ||
-      !ADD_FIELDDESC_CONSTANT(CPPTYPE_ENUM) ||
-      !ADD_FIELDDESC_CONSTANT(CPPTYPE_STRING) ||
-      !ADD_FIELDDESC_CONSTANT(CPPTYPE_MESSAGE)) {
-    return false;
-  }
-#undef ADD_FIELDDESC_CONSTANT
-
-  if (PyType_Ready(&PyEnumDescriptor_Type) < 0)
-    return false;
-
-  if (PyType_Ready(&PyEnumValueDescriptor_Type) < 0)
-    return false;
-
-  if (PyType_Ready(&PyFileDescriptor_Type) < 0)
-    return false;
-
-  if (PyType_Ready(&PyOneofDescriptor_Type) < 0)
-    return false;
-
-  if (PyType_Ready(&PyServiceDescriptor_Type) < 0)
-    return false;
-
-  if (PyType_Ready(&PyMethodDescriptor_Type) < 0)
-    return false;
-
-  if (!InitDescriptorMappingTypes())
-    return false;
-
-  // Initialize globals defined in this file.
-  interned_descriptors = new std::unordered_map<const void*, PyObject*>;
-
-  return true;
-}
-
-}  // namespace python
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/python/google/protobuf/pyext/descriptor.h b/libs/protobuf/python/google/protobuf/pyext/descriptor.h
deleted file mode 100644
index d97e2f8..0000000
--- a/libs/protobuf/python/google/protobuf/pyext/descriptor.h
+++ /dev/null
@@ -1,108 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: petar@google.com (Petar Petrov)
-
-#ifndef GOOGLE_PROTOBUF_PYTHON_CPP_DESCRIPTOR_H__
-#define GOOGLE_PROTOBUF_PYTHON_CPP_DESCRIPTOR_H__
-
-#define PY_SSIZE_T_CLEAN
-#include <Python.h>
-
-#include <google/protobuf/descriptor.h>
-
-namespace google {
-namespace protobuf {
-namespace python {
-
-// Should match the type of ConstStringParam.
-using StringParam = std::string;
-
-extern PyTypeObject PyMessageDescriptor_Type;
-extern PyTypeObject PyFieldDescriptor_Type;
-extern PyTypeObject PyEnumDescriptor_Type;
-extern PyTypeObject PyEnumValueDescriptor_Type;
-extern PyTypeObject PyFileDescriptor_Type;
-extern PyTypeObject PyOneofDescriptor_Type;
-extern PyTypeObject PyServiceDescriptor_Type;
-extern PyTypeObject PyMethodDescriptor_Type;
-
-// Wraps a Descriptor in a Python object.
-// The C++ pointer is usually borrowed from the global DescriptorPool.
-// In any case, it must stay alive as long as the Python object.
-// Returns a new reference.
-PyObject* PyMessageDescriptor_FromDescriptor(const Descriptor* descriptor);
-PyObject* PyFieldDescriptor_FromDescriptor(const FieldDescriptor* descriptor);
-PyObject* PyEnumDescriptor_FromDescriptor(const EnumDescriptor* descriptor);
-PyObject* PyEnumValueDescriptor_FromDescriptor(
-    const EnumValueDescriptor* descriptor);
-PyObject* PyOneofDescriptor_FromDescriptor(const OneofDescriptor* descriptor);
-PyObject* PyFileDescriptor_FromDescriptor(
-    const FileDescriptor* file_descriptor);
-PyObject* PyServiceDescriptor_FromDescriptor(
-    const ServiceDescriptor* descriptor);
-PyObject* PyMethodDescriptor_FromDescriptor(
-    const MethodDescriptor* descriptor);
-
-// Alternate constructor of PyFileDescriptor, used when we already have a
-// serialized FileDescriptorProto that can be cached.
-// Returns a new reference.
-PyObject* PyFileDescriptor_FromDescriptorWithSerializedPb(
-    const FileDescriptor* file_descriptor, PyObject* serialized_pb);
-
-// Return the C++ descriptor pointer.
-// This function checks the parameter type; on error, return NULL with a Python
-// exception set.
-const Descriptor* PyMessageDescriptor_AsDescriptor(PyObject* obj);
-const FieldDescriptor* PyFieldDescriptor_AsDescriptor(PyObject* obj);
-const EnumDescriptor* PyEnumDescriptor_AsDescriptor(PyObject* obj);
-const FileDescriptor* PyFileDescriptor_AsDescriptor(PyObject* obj);
-const ServiceDescriptor* PyServiceDescriptor_AsDescriptor(PyObject* obj);
-
-// Returns the raw C++ pointer.
-const void* PyDescriptor_AsVoidPtr(PyObject* obj);
-
-// Check that the calling Python code is the global scope of a _pb2.py module.
-// This function is used to support the current code generated by the proto
-// compiler, which insists on modifying descriptors after they have been
-// created.
-//
-// stacklevel indicates which Python frame should be the _pb2.py module.
-//
-// Don't use this function outside descriptor classes.
-bool _CalledFromGeneratedFile(int stacklevel);
-
-bool InitDescriptor();
-
-}  // namespace python
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // GOOGLE_PROTOBUF_PYTHON_CPP_DESCRIPTOR_H__
diff --git a/libs/protobuf/python/google/protobuf/pyext/descriptor_containers.cc b/libs/protobuf/python/google/protobuf/pyext/descriptor_containers.cc
deleted file mode 100644
index a87155b..0000000
--- a/libs/protobuf/python/google/protobuf/pyext/descriptor_containers.cc
+++ /dev/null
@@ -1,1689 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Mappings and Sequences of descriptors.
-// Used by Descriptor.fields_by_name, EnumDescriptor.values...
-//
-// They avoid the allocation of a full dictionary or a full list: they simply
-// store a pointer to the parent descriptor, use the C++ Descriptor methods (see
-// net/proto2/public/descriptor.h) to retrieve other descriptors, and create
-// Python objects on the fly.
-//
-// The containers fully conform to abc.Mapping and abc.Sequence, and behave just
-// like read-only dictionaries and lists.
-//
-// Because the interface of C++ Descriptors is quite regular, this file actually
-// defines only three types, the exact behavior of a container is controlled by
-// a DescriptorContainerDef structure, which contains functions that uses the
-// public Descriptor API.
-//
-// Note: This DescriptorContainerDef is similar to the "virtual methods table"
-// that a C++ compiler generates for a class. We have to make it explicit
-// because the Python API is based on C, and does not play well with C++
-// inheritance.
-
-#define PY_SSIZE_T_CLEAN
-#include <Python.h>
-
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/pyext/descriptor_containers.h>
-#include <google/protobuf/pyext/descriptor_pool.h>
-#include <google/protobuf/pyext/descriptor.h>
-#include <google/protobuf/pyext/scoped_pyobject_ptr.h>
-
-#define PyString_AsStringAndSize(ob, charpp, sizep)              \
-  (PyUnicode_Check(ob)                                           \
-       ? ((*(charpp) = const_cast<char*>(                        \
-               PyUnicode_AsUTF8AndSize(ob, (sizep)))) == nullptr \
-              ? -1                                               \
-              : 0)                                               \
-       : PyBytes_AsStringAndSize(ob, (charpp), (sizep)))
-
-namespace google {
-namespace protobuf {
-namespace python {
-
-struct PyContainer;
-
-typedef int (*CountMethod)(PyContainer* self);
-typedef const void* (*GetByIndexMethod)(PyContainer* self, int index);
-typedef const void* (*GetByNameMethod)(PyContainer* self,
-                                       ConstStringParam name);
-typedef const void* (*GetByCamelcaseNameMethod)(PyContainer* self,
-                                                ConstStringParam name);
-typedef const void* (*GetByNumberMethod)(PyContainer* self, int index);
-typedef PyObject* (*NewObjectFromItemMethod)(const void* descriptor);
-typedef const std::string& (*GetItemNameMethod)(const void* descriptor);
-typedef const std::string& (*GetItemCamelcaseNameMethod)(
-    const void* descriptor);
-typedef int (*GetItemNumberMethod)(const void* descriptor);
-typedef int (*GetItemIndexMethod)(const void* descriptor);
-
-struct DescriptorContainerDef {
-  const char* mapping_name;
-  // Returns the number of items in the container.
-  CountMethod count_fn;
-  // Retrieve item by index (usually the order of declaration in the proto file)
-  // Used by sequences, but also iterators. 0 <= index < Count().
-  GetByIndexMethod get_by_index_fn;
-  // Retrieve item by name (usually a call to some 'FindByName' method).
-  // Used by "by_name" mappings.
-  GetByNameMethod get_by_name_fn;
-  // Retrieve item by camelcase name (usually a call to some
-  // 'FindByCamelcaseName' method). Used by "by_camelcase_name" mappings.
-  GetByCamelcaseNameMethod get_by_camelcase_name_fn;
-  // Retrieve item by declared number (field tag, or enum value).
-  // Used by "by_number" mappings.
-  GetByNumberMethod get_by_number_fn;
-  // Converts a item C++ descriptor to a Python object. Returns a new reference.
-  NewObjectFromItemMethod new_object_from_item_fn;
-  // Retrieve the name of an item. Used by iterators on "by_name" mappings.
-  GetItemNameMethod get_item_name_fn;
-  // Retrieve the camelcase name of an item. Used by iterators on
-  // "by_camelcase_name" mappings.
-  GetItemCamelcaseNameMethod get_item_camelcase_name_fn;
-  // Retrieve the number of an item. Used by iterators on "by_number" mappings.
-  GetItemNumberMethod get_item_number_fn;
-  // Retrieve the index of an item for the container type.
-  // Used by "__contains__".
-  // If not set, "x in sequence" will do a linear search.
-  GetItemIndexMethod get_item_index_fn;
-};
-
-struct PyContainer {
-  PyObject_HEAD
-
-  // The proto2 descriptor this container belongs to the global DescriptorPool.
-  const void* descriptor;
-
-  // A pointer to a static structure with function pointers that control the
-  // behavior of the container. Very similar to the table of virtual functions
-  // of a C++ class.
-  const DescriptorContainerDef* container_def;
-
-  // The kind of container: list, or dict by name or value.
-  enum ContainerKind {
-    KIND_SEQUENCE,
-    KIND_BYNAME,
-    KIND_BYCAMELCASENAME,
-    KIND_BYNUMBER,
-  } kind;
-};
-
-struct PyContainerIterator {
-  PyObject_HEAD
-
-  // The container we are iterating over. Own a reference.
-  PyContainer* container;
-
-  // The current index in the iterator.
-  int index;
-
-  // The kind of container: list, or dict by name or value.
-  enum IterKind {
-    KIND_ITERKEY,
-    KIND_ITERVALUE,
-    KIND_ITERITEM,
-    KIND_ITERVALUE_REVERSED,  // For sequences
-  } kind;
-};
-
-namespace descriptor {
-
-// Returns the C++ item descriptor for a given Python key.
-// When the descriptor is found, return true and set *item.
-// When the descriptor is not found, return true, but set *item to null.
-// On error, returns false with an exception set.
-static bool _GetItemByKey(PyContainer* self, PyObject* key, const void** item) {
-  switch (self->kind) {
-    case PyContainer::KIND_BYNAME: {
-      char* name;
-      Py_ssize_t name_size;
-      if (PyString_AsStringAndSize(key, &name, &name_size) < 0) {
-        if (PyErr_ExceptionMatches(PyExc_TypeError)) {
-          // Not a string, cannot be in the container.
-          PyErr_Clear();
-          *item = nullptr;
-          return true;
-        }
-        return false;
-      }
-      *item = self->container_def->get_by_name_fn(self,
-                                                  StringParam(name, name_size));
-      return true;
-    }
-    case PyContainer::KIND_BYCAMELCASENAME: {
-      char* camelcase_name;
-      Py_ssize_t name_size;
-      if (PyString_AsStringAndSize(key, &camelcase_name, &name_size) < 0) {
-        if (PyErr_ExceptionMatches(PyExc_TypeError)) {
-          // Not a string, cannot be in the container.
-          PyErr_Clear();
-          *item = nullptr;
-          return true;
-        }
-        return false;
-      }
-      *item = self->container_def->get_by_camelcase_name_fn(
-          self, StringParam(camelcase_name, name_size));
-      return true;
-    }
-    case PyContainer::KIND_BYNUMBER: {
-      Py_ssize_t number = PyNumber_AsSsize_t(key, nullptr);
-      if (number == -1 && PyErr_Occurred()) {
-        if (PyErr_ExceptionMatches(PyExc_TypeError)) {
-          // Not a number, cannot be in the container.
-          PyErr_Clear();
-          *item = nullptr;
-          return true;
-        }
-        return false;
-      }
-      *item = self->container_def->get_by_number_fn(self, number);
-      return true;
-    }
-    default:
-      PyErr_SetNone(PyExc_NotImplementedError);
-      return false;
-  }
-}
-
-// Returns the key of the object at the given index.
-// Used when iterating over mappings.
-static PyObject* _NewKey_ByIndex(PyContainer* self, Py_ssize_t index) {
-  const void* item = self->container_def->get_by_index_fn(self, index);
-  switch (self->kind) {
-    case PyContainer::KIND_BYNAME: {
-      const std::string& name(self->container_def->get_item_name_fn(item));
-      return PyUnicode_FromStringAndSize(name.c_str(), name.size());
-    }
-    case PyContainer::KIND_BYCAMELCASENAME: {
-      const std::string& name(
-          self->container_def->get_item_camelcase_name_fn(item));
-      return PyUnicode_FromStringAndSize(name.c_str(), name.size());
-    }
-    case PyContainer::KIND_BYNUMBER: {
-      int value = self->container_def->get_item_number_fn(item);
-      return PyLong_FromLong(value);
-    }
-    default:
-      PyErr_SetNone(PyExc_NotImplementedError);
-      return nullptr;
-  }
-}
-
-// Returns the object at the given index.
-// Also used when iterating over mappings.
-static PyObject* _NewObj_ByIndex(PyContainer* self, Py_ssize_t index) {
-  return self->container_def->new_object_from_item_fn(
-      self->container_def->get_by_index_fn(self, index));
-}
-
-static Py_ssize_t Length(PyContainer* self) {
-  return self->container_def->count_fn(self);
-}
-
-// The DescriptorMapping type.
-
-static PyObject* Subscript(PyContainer* self, PyObject* key) {
-  const void* item = nullptr;
-  if (!_GetItemByKey(self, key, &item)) {
-    return nullptr;
-  }
-  if (!item) {
-    PyErr_SetObject(PyExc_KeyError, key);
-    return nullptr;
-  }
-  return self->container_def->new_object_from_item_fn(item);
-}
-
-static int AssSubscript(PyContainer* self, PyObject* key, PyObject* value) {
-  if (_CalledFromGeneratedFile(0)) {
-    return 0;
-  }
-  PyErr_Format(PyExc_TypeError,
-               "'%.200s' object does not support item assignment",
-               Py_TYPE(self)->tp_name);
-  return -1;
-}
-
-static PyMappingMethods MappingMappingMethods = {
-  (lenfunc)Length,               // mp_length
-  (binaryfunc)Subscript,         // mp_subscript
-  (objobjargproc)AssSubscript,   // mp_ass_subscript
-};
-
-static int Contains(PyContainer* self, PyObject* key) {
-  const void* item = nullptr;
-  if (!_GetItemByKey(self, key, &item)) {
-    return -1;
-  }
-  if (item) {
-    return 1;
-  } else {
-    return 0;
-  }
-}
-
-static PyObject* ContainerRepr(PyContainer* self) {
-  const char* kind = "";
-  switch (self->kind) {
-    case PyContainer::KIND_SEQUENCE:
-      kind = "sequence";
-      break;
-    case PyContainer::KIND_BYNAME:
-      kind = "mapping by name";
-      break;
-    case PyContainer::KIND_BYCAMELCASENAME:
-      kind = "mapping by camelCase name";
-      break;
-    case PyContainer::KIND_BYNUMBER:
-      kind = "mapping by number";
-      break;
-  }
-  return PyUnicode_FromFormat("<%s %s>", self->container_def->mapping_name,
-                              kind);
-}
-
-extern PyTypeObject DescriptorMapping_Type;
-extern PyTypeObject DescriptorSequence_Type;
-
-// A sequence container can only be equal to another sequence container, or (for
-// backward compatibility) to a list containing the same items.
-// Returns 1 if equal, 0 if unequal, -1 on error.
-static int DescriptorSequence_Equal(PyContainer* self, PyObject* other) {
-  // Check the identity of C++ pointers.
-  if (PyObject_TypeCheck(other, &DescriptorSequence_Type)) {
-    PyContainer* other_container = reinterpret_cast<PyContainer*>(other);
-    if (self->descriptor == other_container->descriptor &&
-        self->container_def == other_container->container_def &&
-        self->kind == other_container->kind) {
-      return 1;
-    } else {
-      return 0;
-    }
-  }
-
-  // If other is a list
-  if (PyList_Check(other)) {
-    // return list(self) == other
-    int size = Length(self);
-    if (size != PyList_Size(other)) {
-      return false;
-    }
-    for (int index = 0; index < size; index++) {
-      ScopedPyObjectPtr value1(_NewObj_ByIndex(self, index));
-      if (value1 == nullptr) {
-        return -1;
-      }
-      PyObject* value2 = PyList_GetItem(other, index);
-      if (value2 == nullptr) {
-        return -1;
-      }
-      int cmp = PyObject_RichCompareBool(value1.get(), value2, Py_EQ);
-      if (cmp != 1)  // error or not equal
-          return cmp;
-    }
-    // All items were found and equal
-    return 1;
-  }
-
-  // Any other object is different.
-  return 0;
-}
-
-// A mapping container can only be equal to another mapping container, or (for
-// backward compatibility) to a dict containing the same items.
-// Returns 1 if equal, 0 if unequal, -1 on error.
-static int DescriptorMapping_Equal(PyContainer* self, PyObject* other) {
-  // Check the identity of C++ pointers.
-  if (PyObject_TypeCheck(other, &DescriptorMapping_Type)) {
-    PyContainer* other_container = reinterpret_cast<PyContainer*>(other);
-    if (self->descriptor == other_container->descriptor &&
-        self->container_def == other_container->container_def &&
-        self->kind == other_container->kind) {
-      return 1;
-    } else {
-      return 0;
-    }
-  }
-
-  // If other is a dict
-  if (PyDict_Check(other)) {
-    // equivalent to dict(self.items()) == other
-    int size = Length(self);
-    if (size != PyDict_Size(other)) {
-      return false;
-    }
-    for (int index = 0; index < size; index++) {
-      ScopedPyObjectPtr key(_NewKey_ByIndex(self, index));
-      if (key == nullptr) {
-        return -1;
-      }
-      ScopedPyObjectPtr value1(_NewObj_ByIndex(self, index));
-      if (value1 == nullptr) {
-        return -1;
-      }
-      PyObject* value2 = PyDict_GetItem(other, key.get());
-      if (value2 == nullptr) {
-        // Not found in the other dictionary
-        return 0;
-      }
-      int cmp = PyObject_RichCompareBool(value1.get(), value2, Py_EQ);
-      if (cmp != 1)  // error or not equal
-          return cmp;
-    }
-    // All items were found and equal
-    return 1;
-  }
-
-  // Any other object is different.
-  return 0;
-}
-
-static PyObject* RichCompare(PyContainer* self, PyObject* other, int opid) {
-  if (opid != Py_EQ && opid != Py_NE) {
-    Py_INCREF(Py_NotImplemented);
-    return Py_NotImplemented;
-  }
-
-  int result;
-
-  if (self->kind == PyContainer::KIND_SEQUENCE) {
-    result = DescriptorSequence_Equal(self, other);
-  } else {
-    result = DescriptorMapping_Equal(self, other);
-  }
-  if (result < 0) {
-    return nullptr;
-  }
-  if (result ^ (opid == Py_NE)) {
-    Py_RETURN_TRUE;
-  } else {
-    Py_RETURN_FALSE;
-  }
-}
-
-static PySequenceMethods MappingSequenceMethods = {
-    nullptr,               // sq_length
-    nullptr,               // sq_concat
-    nullptr,               // sq_repeat
-    nullptr,               // sq_item
-    nullptr,               // sq_slice
-    nullptr,               // sq_ass_item
-    nullptr,               // sq_ass_slice
-    (objobjproc)Contains,  // sq_contains
-};
-
-static PyObject* Get(PyContainer* self, PyObject* args) {
-  PyObject* key;
-  PyObject* default_value = Py_None;
-  if (!PyArg_UnpackTuple(args, "get", 1, 2, &key, &default_value)) {
-    return nullptr;
-  }
-
-  const void* item;
-  if (!_GetItemByKey(self, key, &item)) {
-    return nullptr;
-  }
-  if (item == nullptr) {
-    Py_INCREF(default_value);
-    return default_value;
-  }
-  return self->container_def->new_object_from_item_fn(item);
-}
-
-static PyObject* Keys(PyContainer* self, PyObject* args) {
-  Py_ssize_t count = Length(self);
-  ScopedPyObjectPtr list(PyList_New(count));
-  if (list == nullptr) {
-    return nullptr;
-  }
-  for (Py_ssize_t index = 0; index < count; ++index) {
-    PyObject* key = _NewKey_ByIndex(self, index);
-    if (key == nullptr) {
-      return nullptr;
-    }
-    PyList_SET_ITEM(list.get(), index, key);
-  }
-  return list.release();
-}
-
-static PyObject* Values(PyContainer* self, PyObject* args) {
-  Py_ssize_t count = Length(self);
-  ScopedPyObjectPtr list(PyList_New(count));
-  if (list == nullptr) {
-    return nullptr;
-  }
-  for (Py_ssize_t index = 0; index < count; ++index) {
-    PyObject* value = _NewObj_ByIndex(self, index);
-    if (value == nullptr) {
-      return nullptr;
-    }
-    PyList_SET_ITEM(list.get(), index, value);
-  }
-  return list.release();
-}
-
-static PyObject* Items(PyContainer* self, PyObject* args) {
-  Py_ssize_t count = Length(self);
-  ScopedPyObjectPtr list(PyList_New(count));
-  if (list == nullptr) {
-    return nullptr;
-  }
-  for (Py_ssize_t index = 0; index < count; ++index) {
-    ScopedPyObjectPtr obj(PyTuple_New(2));
-    if (obj == nullptr) {
-      return nullptr;
-    }
-    PyObject* key = _NewKey_ByIndex(self, index);
-    if (key == nullptr) {
-      return nullptr;
-    }
-    PyTuple_SET_ITEM(obj.get(), 0, key);
-    PyObject* value = _NewObj_ByIndex(self, index);
-    if (value == nullptr) {
-      return nullptr;
-    }
-    PyTuple_SET_ITEM(obj.get(), 1, value);
-    PyList_SET_ITEM(list.get(), index, obj.release());
-  }
-  return list.release();
-}
-
-static PyObject* NewContainerIterator(PyContainer* mapping,
-                                      PyContainerIterator::IterKind kind);
-
-static PyObject* Iter(PyContainer* self) {
-  return NewContainerIterator(self, PyContainerIterator::KIND_ITERKEY);
-}
-static PyObject* IterKeys(PyContainer* self, PyObject* args) {
-  return NewContainerIterator(self, PyContainerIterator::KIND_ITERKEY);
-}
-static PyObject* IterValues(PyContainer* self, PyObject* args) {
-  return NewContainerIterator(self, PyContainerIterator::KIND_ITERVALUE);
-}
-static PyObject* IterItems(PyContainer* self, PyObject* args) {
-  return NewContainerIterator(self, PyContainerIterator::KIND_ITERITEM);
-}
-
-static PyMethodDef MappingMethods[] = {
-    {"get", (PyCFunction)Get, METH_VARARGS},
-    {"keys", (PyCFunction)Keys, METH_NOARGS},
-    {"values", (PyCFunction)Values, METH_NOARGS},
-    {"items", (PyCFunction)Items, METH_NOARGS},
-    {"iterkeys", (PyCFunction)IterKeys, METH_NOARGS},
-    {"itervalues", (PyCFunction)IterValues, METH_NOARGS},
-    {"iteritems", (PyCFunction)IterItems, METH_NOARGS},
-    {nullptr},
-};
-
-PyTypeObject DescriptorMapping_Type = {
-    PyVarObject_HEAD_INIT(&PyType_Type, 0) "DescriptorMapping",  // tp_name
-    sizeof(PyContainer),                                         // tp_basicsize
-    0,                                                           // tp_itemsize
-    nullptr,                                                     // tp_dealloc
-#if PY_VERSION_HEX < 0x03080000
-    nullptr,  // tp_print
-#else
-    0,  // tp_vectorcall_offset
-#endif
-    nullptr,                   // tp_getattr
-    nullptr,                   // tp_setattr
-    nullptr,                   // tp_compare
-    (reprfunc)ContainerRepr,   // tp_repr
-    nullptr,                   // tp_as_number
-    &MappingSequenceMethods,   // tp_as_sequence
-    &MappingMappingMethods,    // tp_as_mapping
-    nullptr,                   // tp_hash
-    nullptr,                   // tp_call
-    nullptr,                   // tp_str
-    nullptr,                   // tp_getattro
-    nullptr,                   // tp_setattro
-    nullptr,                   // tp_as_buffer
-    Py_TPFLAGS_DEFAULT,        // tp_flags
-    nullptr,                   // tp_doc
-    nullptr,                   // tp_traverse
-    nullptr,                   // tp_clear
-    (richcmpfunc)RichCompare,  // tp_richcompare
-    0,                         // tp_weaklistoffset
-    (getiterfunc)Iter,         // tp_iter
-    nullptr,                   // tp_iternext
-    MappingMethods,            // tp_methods
-    nullptr,                   // tp_members
-    nullptr,                   // tp_getset
-    nullptr,                   // tp_base
-    nullptr,                   // tp_dict
-    nullptr,                   // tp_descr_get
-    nullptr,                   // tp_descr_set
-    0,                         // tp_dictoffset
-    nullptr,                   // tp_init
-    nullptr,                   // tp_alloc
-    nullptr,                   // tp_new
-    nullptr,                   // tp_free
-};
-
-// The DescriptorSequence type.
-
-static PyObject* GetItem(PyContainer* self, Py_ssize_t index) {
-  if (index < 0) {
-    index += Length(self);
-  }
-  if (index < 0 || index >= Length(self)) {
-    PyErr_SetString(PyExc_IndexError, "index out of range");
-    return nullptr;
-  }
-  return _NewObj_ByIndex(self, index);
-}
-
-static PyObject *
-SeqSubscript(PyContainer* self, PyObject* item) {
-  if (PyIndex_Check(item)) {
-      Py_ssize_t index;
-      index = PyNumber_AsSsize_t(item, PyExc_IndexError);
-      if (index == -1 && PyErr_Occurred()) return nullptr;
-      return GetItem(self, index);
-  }
-  // Materialize the list and delegate the operation to it.
-  ScopedPyObjectPtr list(PyObject_CallFunctionObjArgs(
-      reinterpret_cast<PyObject*>(&PyList_Type), self, nullptr));
-  if (list == nullptr) {
-    return nullptr;
-  }
-  return Py_TYPE(list.get())->tp_as_mapping->mp_subscript(list.get(), item);
-}
-
-// Returns the position of the item in the sequence, of -1 if not found.
-// This function never fails.
-int Find(PyContainer* self, PyObject* item) {
-  // The item can only be in one position: item.index.
-  // Check that self[item.index] == item, it's faster than a linear search.
-  //
-  // This assumes that sequences are only defined by syntax of the .proto file:
-  // a specific item belongs to only one sequence, depending on its position in
-  // the .proto file definition.
-  const void* descriptor_ptr = PyDescriptor_AsVoidPtr(item);
-  if (descriptor_ptr == nullptr) {
-    PyErr_Clear();
-    // Not a descriptor, it cannot be in the list.
-    return -1;
-  }
-  if (self->container_def->get_item_index_fn) {
-    int index = self->container_def->get_item_index_fn(descriptor_ptr);
-    if (index < 0 || index >= Length(self)) {
-      // This index is not from this collection.
-      return -1;
-    }
-    if (self->container_def->get_by_index_fn(self, index) != descriptor_ptr) {
-      // The descriptor at this index is not the same.
-      return -1;
-    }
-    // self[item.index] == item, so return the index.
-    return index;
-  } else {
-    // Fall back to linear search.
-    int length = Length(self);
-    for (int index=0; index < length; index++) {
-      if (self->container_def->get_by_index_fn(self, index) == descriptor_ptr) {
-        return index;
-      }
-    }
-    // Not found
-    return -1;
-  }
-}
-
-// Implements list.index(): the position of the item is in the sequence.
-static PyObject* Index(PyContainer* self, PyObject* item) {
-  int position = Find(self, item);
-  if (position < 0) {
-    // Not found
-    PyErr_SetNone(PyExc_ValueError);
-    return nullptr;
-  } else {
-    return PyLong_FromLong(position);
-  }
-}
-// Implements "list.__contains__()": is the object in the sequence.
-static int SeqContains(PyContainer* self, PyObject* item) {
-  int position = Find(self, item);
-  if (position < 0) {
-    return 0;
-  } else {
-    return 1;
-  }
-}
-
-// Implements list.count(): number of occurrences of the item in the sequence.
-// An item can only appear once in a sequence. If it exists, return 1.
-static PyObject* Count(PyContainer* self, PyObject* item) {
-  int position = Find(self, item);
-  if (position < 0) {
-    return PyLong_FromLong(0);
-  } else {
-    return PyLong_FromLong(1);
-  }
-}
-
-static PyObject* Append(PyContainer* self, PyObject* args) {
-  if (_CalledFromGeneratedFile(0)) {
-    Py_RETURN_NONE;
-  }
-  PyErr_Format(PyExc_TypeError,
-               "'%.200s' object is not a mutable sequence",
-               Py_TYPE(self)->tp_name);
-  return nullptr;
-}
-
-static PyObject* Reversed(PyContainer* self, PyObject* args) {
-  return NewContainerIterator(self,
-                              PyContainerIterator::KIND_ITERVALUE_REVERSED);
-}
-
-static PyMethodDef SeqMethods[] = {
-    {"index", (PyCFunction)Index, METH_O},
-    {"count", (PyCFunction)Count, METH_O},
-    {"append", (PyCFunction)Append, METH_O},
-    {"__reversed__", (PyCFunction)Reversed, METH_NOARGS},
-    {nullptr},
-};
-
-static PySequenceMethods SeqSequenceMethods = {
-    (lenfunc)Length,          // sq_length
-    nullptr,                  // sq_concat
-    nullptr,                  // sq_repeat
-    (ssizeargfunc)GetItem,    // sq_item
-    nullptr,                  // sq_slice
-    nullptr,                  // sq_ass_item
-    nullptr,                  // sq_ass_slice
-    (objobjproc)SeqContains,  // sq_contains
-};
-
-static PyMappingMethods SeqMappingMethods = {
-    (lenfunc)Length,           // mp_length
-    (binaryfunc)SeqSubscript,  // mp_subscript
-    nullptr,                   // mp_ass_subscript
-};
-
-PyTypeObject DescriptorSequence_Type = {
-    PyVarObject_HEAD_INIT(&PyType_Type, 0) "DescriptorSequence",  // tp_name
-    sizeof(PyContainer),  // tp_basicsize
-    0,                    // tp_itemsize
-    nullptr,              // tp_dealloc
-#if PY_VERSION_HEX < 0x03080000
-    nullptr,  // tp_print
-#else
-    0,  // tp_vectorcall_offset
-#endif
-    nullptr,                   // tp_getattr
-    nullptr,                   // tp_setattr
-    nullptr,                   // tp_compare
-    (reprfunc)ContainerRepr,   // tp_repr
-    nullptr,                   // tp_as_number
-    &SeqSequenceMethods,       // tp_as_sequence
-    &SeqMappingMethods,        // tp_as_mapping
-    nullptr,                   // tp_hash
-    nullptr,                   // tp_call
-    nullptr,                   // tp_str
-    nullptr,                   // tp_getattro
-    nullptr,                   // tp_setattro
-    nullptr,                   // tp_as_buffer
-    Py_TPFLAGS_DEFAULT,        // tp_flags
-    nullptr,                   // tp_doc
-    nullptr,                   // tp_traverse
-    nullptr,                   // tp_clear
-    (richcmpfunc)RichCompare,  // tp_richcompare
-    0,                         // tp_weaklistoffset
-    nullptr,                   // tp_iter
-    nullptr,                   // tp_iternext
-    SeqMethods,                // tp_methods
-    nullptr,                   // tp_members
-    nullptr,                   // tp_getset
-    nullptr,                   // tp_base
-    nullptr,                   // tp_dict
-    nullptr,                   // tp_descr_get
-    nullptr,                   // tp_descr_set
-    0,                         // tp_dictoffset
-    nullptr,                   // tp_init
-    nullptr,                   // tp_alloc
-    nullptr,                   // tp_new
-    nullptr,                   // tp_free
-};
-
-static PyObject* NewMappingByName(
-    DescriptorContainerDef* container_def, const void* descriptor) {
-  PyContainer* self = PyObject_New(PyContainer, &DescriptorMapping_Type);
-  if (self == nullptr) {
-    return nullptr;
-  }
-  self->descriptor = descriptor;
-  self->container_def = container_def;
-  self->kind = PyContainer::KIND_BYNAME;
-  return reinterpret_cast<PyObject*>(self);
-}
-
-static PyObject* NewMappingByCamelcaseName(
-    DescriptorContainerDef* container_def, const void* descriptor) {
-  PyContainer* self = PyObject_New(PyContainer, &DescriptorMapping_Type);
-  if (self == nullptr) {
-    return nullptr;
-  }
-  self->descriptor = descriptor;
-  self->container_def = container_def;
-  self->kind = PyContainer::KIND_BYCAMELCASENAME;
-  return reinterpret_cast<PyObject*>(self);
-}
-
-static PyObject* NewMappingByNumber(
-    DescriptorContainerDef* container_def, const void* descriptor) {
-  if (container_def->get_by_number_fn == nullptr ||
-      container_def->get_item_number_fn == nullptr) {
-    PyErr_SetNone(PyExc_NotImplementedError);
-    return nullptr;
-  }
-  PyContainer* self = PyObject_New(PyContainer, &DescriptorMapping_Type);
-  if (self == nullptr) {
-    return nullptr;
-  }
-  self->descriptor = descriptor;
-  self->container_def = container_def;
-  self->kind = PyContainer::KIND_BYNUMBER;
-  return reinterpret_cast<PyObject*>(self);
-}
-
-static PyObject* NewSequence(
-    DescriptorContainerDef* container_def, const void* descriptor) {
-  PyContainer* self = PyObject_New(PyContainer, &DescriptorSequence_Type);
-  if (self == nullptr) {
-    return nullptr;
-  }
-  self->descriptor = descriptor;
-  self->container_def = container_def;
-  self->kind = PyContainer::KIND_SEQUENCE;
-  return reinterpret_cast<PyObject*>(self);
-}
-
-// Implement iterators over PyContainers.
-
-static void Iterator_Dealloc(PyContainerIterator* self) {
-  Py_CLEAR(self->container);
-  Py_TYPE(self)->tp_free(reinterpret_cast<PyObject*>(self));
-}
-
-static PyObject* Iterator_Next(PyContainerIterator* self) {
-  int count = self->container->container_def->count_fn(self->container);
-  if (self->index >= count) {
-    // Return null with no exception to indicate the end.
-    return nullptr;
-  }
-  int index = self->index;
-  self->index += 1;
-  switch (self->kind) {
-    case PyContainerIterator::KIND_ITERKEY:
-      return _NewKey_ByIndex(self->container, index);
-    case PyContainerIterator::KIND_ITERVALUE:
-      return _NewObj_ByIndex(self->container, index);
-    case PyContainerIterator::KIND_ITERVALUE_REVERSED:
-      return _NewObj_ByIndex(self->container, count - index - 1);
-    case PyContainerIterator::KIND_ITERITEM: {
-      PyObject* obj = PyTuple_New(2);
-      if (obj == nullptr) {
-        return nullptr;
-      }
-      PyObject* key = _NewKey_ByIndex(self->container, index);
-      if (key == nullptr) {
-        Py_DECREF(obj);
-        return nullptr;
-      }
-      PyTuple_SET_ITEM(obj, 0, key);
-      PyObject* value = _NewObj_ByIndex(self->container, index);
-      if (value == nullptr) {
-        Py_DECREF(obj);
-        return nullptr;
-      }
-      PyTuple_SET_ITEM(obj, 1, value);
-      return obj;
-    }
-    default:
-      PyErr_SetNone(PyExc_NotImplementedError);
-      return nullptr;
-  }
-}
-
-static PyTypeObject ContainerIterator_Type = {
-    PyVarObject_HEAD_INIT(&PyType_Type,
-                          0) "DescriptorContainerIterator",  // tp_name
-    sizeof(PyContainerIterator),                             // tp_basicsize
-    0,                                                       // tp_itemsize
-    (destructor)Iterator_Dealloc,                            // tp_dealloc
-#if PY_VERSION_HEX < 0x03080000
-    nullptr,  // tp_print
-#else
-    0,  // tp_vectorcall_offset
-#endif
-    nullptr,                      // tp_getattr
-    nullptr,                      // tp_setattr
-    nullptr,                      // tp_compare
-    nullptr,                      // tp_repr
-    nullptr,                      // tp_as_number
-    nullptr,                      // tp_as_sequence
-    nullptr,                      // tp_as_mapping
-    nullptr,                      // tp_hash
-    nullptr,                      // tp_call
-    nullptr,                      // tp_str
-    nullptr,                      // tp_getattro
-    nullptr,                      // tp_setattro
-    nullptr,                      // tp_as_buffer
-    Py_TPFLAGS_DEFAULT,           // tp_flags
-    nullptr,                      // tp_doc
-    nullptr,                      // tp_traverse
-    nullptr,                      // tp_clear
-    nullptr,                      // tp_richcompare
-    0,                            // tp_weaklistoffset
-    PyObject_SelfIter,            // tp_iter
-    (iternextfunc)Iterator_Next,  // tp_iternext
-    nullptr,                      // tp_methods
-    nullptr,                      // tp_members
-    nullptr,                      // tp_getset
-    nullptr,                      // tp_base
-    nullptr,                      // tp_dict
-    nullptr,                      // tp_descr_get
-    nullptr,                      // tp_descr_set
-    0,                            // tp_dictoffset
-    nullptr,                      // tp_init
-    nullptr,                      // tp_alloc
-    nullptr,                      // tp_new
-    nullptr,                      // tp_free
-};
-
-static PyObject* NewContainerIterator(PyContainer* container,
-                                      PyContainerIterator::IterKind kind) {
-  PyContainerIterator* self = PyObject_New(PyContainerIterator,
-                                           &ContainerIterator_Type);
-  if (self == nullptr) {
-    return nullptr;
-  }
-  Py_INCREF(container);
-  self->container = container;
-  self->kind = kind;
-  self->index = 0;
-
-  return reinterpret_cast<PyObject*>(self);
-}
-
-}  // namespace descriptor
-
-// Now define the real collections!
-
-namespace message_descriptor {
-
-typedef const Descriptor* ParentDescriptor;
-
-static ParentDescriptor GetDescriptor(PyContainer* self) {
-  return reinterpret_cast<ParentDescriptor>(self->descriptor);
-}
-
-namespace fields {
-
-typedef const FieldDescriptor* ItemDescriptor;
-
-static int Count(PyContainer* self) {
-  return GetDescriptor(self)->field_count();
-}
-
-static const void* GetByName(PyContainer* self, ConstStringParam name) {
-  return GetDescriptor(self)->FindFieldByName(name);
-}
-
-static const void* GetByCamelcaseName(PyContainer* self,
-                                      ConstStringParam name) {
-  return GetDescriptor(self)->FindFieldByCamelcaseName(name);
-}
-
-static const void* GetByNumber(PyContainer* self, int number) {
-  return GetDescriptor(self)->FindFieldByNumber(number);
-}
-
-static const void* GetByIndex(PyContainer* self, int index) {
-  return GetDescriptor(self)->field(index);
-}
-
-static PyObject* NewObjectFromItem(const void* item) {
-  return PyFieldDescriptor_FromDescriptor(static_cast<ItemDescriptor>(item));
-}
-
-static const std::string& GetItemName(const void* item) {
-  return static_cast<ItemDescriptor>(item)->name();
-}
-
-static const std::string& GetItemCamelcaseName(const void* item) {
-  return static_cast<ItemDescriptor>(item)->camelcase_name();
-}
-
-static int GetItemNumber(const void* item) {
-  return static_cast<ItemDescriptor>(item)->number();
-}
-
-static int GetItemIndex(const void* item) {
-  return static_cast<ItemDescriptor>(item)->index();
-}
-
-static DescriptorContainerDef ContainerDef = {
-    "MessageFields",      Count,         GetByIndex,        GetByName,
-    GetByCamelcaseName,   GetByNumber,   NewObjectFromItem, GetItemName,
-    GetItemCamelcaseName, GetItemNumber, GetItemIndex,
-};
-
-}  // namespace fields
-
-PyObject* NewMessageFieldsByName(ParentDescriptor descriptor) {
-  return descriptor::NewMappingByName(&fields::ContainerDef, descriptor);
-}
-
-PyObject* NewMessageFieldsByCamelcaseName(ParentDescriptor descriptor) {
-  return descriptor::NewMappingByCamelcaseName(&fields::ContainerDef,
-                                               descriptor);
-}
-
-PyObject* NewMessageFieldsByNumber(ParentDescriptor descriptor) {
-  return descriptor::NewMappingByNumber(&fields::ContainerDef, descriptor);
-}
-
-PyObject* NewMessageFieldsSeq(ParentDescriptor descriptor) {
-  return descriptor::NewSequence(&fields::ContainerDef, descriptor);
-}
-
-namespace nested_types {
-
-typedef const Descriptor* ItemDescriptor;
-
-static int Count(PyContainer* self) {
-  return GetDescriptor(self)->nested_type_count();
-}
-
-static const void* GetByName(PyContainer* self, ConstStringParam name) {
-  return GetDescriptor(self)->FindNestedTypeByName(name);
-}
-
-static const void* GetByIndex(PyContainer* self, int index) {
-  return GetDescriptor(self)->nested_type(index);
-}
-
-static PyObject* NewObjectFromItem(const void* item) {
-  return PyMessageDescriptor_FromDescriptor(static_cast<ItemDescriptor>(item));
-}
-
-static const std::string& GetItemName(const void* item) {
-  return static_cast<ItemDescriptor>(item)->name();
-}
-
-static int GetItemIndex(const void* item) {
-  return static_cast<ItemDescriptor>(item)->index();
-}
-
-static DescriptorContainerDef ContainerDef = {
-    "MessageNestedTypes",
-    Count,
-    GetByIndex,
-    GetByName,
-    nullptr,
-    nullptr,
-    NewObjectFromItem,
-    GetItemName,
-    nullptr,
-    nullptr,
-    GetItemIndex,
-};
-
-}  // namespace nested_types
-
-PyObject* NewMessageNestedTypesSeq(ParentDescriptor descriptor) {
-  return descriptor::NewSequence(&nested_types::ContainerDef, descriptor);
-}
-
-PyObject* NewMessageNestedTypesByName(ParentDescriptor descriptor) {
-  return descriptor::NewMappingByName(&nested_types::ContainerDef, descriptor);
-}
-
-namespace enums {
-
-typedef const EnumDescriptor* ItemDescriptor;
-
-static int Count(PyContainer* self) {
-  return GetDescriptor(self)->enum_type_count();
-}
-
-static const void* GetByName(PyContainer* self, ConstStringParam name) {
-  return GetDescriptor(self)->FindEnumTypeByName(name);
-}
-
-static const void* GetByIndex(PyContainer* self, int index) {
-  return GetDescriptor(self)->enum_type(index);
-}
-
-static PyObject* NewObjectFromItem(const void* item) {
-  return PyEnumDescriptor_FromDescriptor(static_cast<ItemDescriptor>(item));
-}
-
-static const std::string& GetItemName(const void* item) {
-  return static_cast<ItemDescriptor>(item)->name();
-}
-
-static int GetItemIndex(const void* item) {
-  return static_cast<ItemDescriptor>(item)->index();
-}
-
-static DescriptorContainerDef ContainerDef = {
-    "MessageNestedEnums",
-    Count,
-    GetByIndex,
-    GetByName,
-    nullptr,
-    nullptr,
-    NewObjectFromItem,
-    GetItemName,
-    nullptr,
-    nullptr,
-    GetItemIndex,
-};
-
-}  // namespace enums
-
-PyObject* NewMessageEnumsByName(ParentDescriptor descriptor) {
-  return descriptor::NewMappingByName(&enums::ContainerDef, descriptor);
-}
-
-PyObject* NewMessageEnumsSeq(ParentDescriptor descriptor) {
-  return descriptor::NewSequence(&enums::ContainerDef, descriptor);
-}
-
-namespace enumvalues {
-
-// This is the "enum_values_by_name" mapping, which collects values from all
-// enum types in a message.
-//
-// Note that the behavior of the C++ descriptor is different: it will search and
-// return the first value that matches the name, whereas the Python
-// implementation retrieves the last one.
-
-typedef const EnumValueDescriptor* ItemDescriptor;
-
-static int Count(PyContainer* self) {
-  int count = 0;
-  for (int i = 0; i < GetDescriptor(self)->enum_type_count(); ++i) {
-    count += GetDescriptor(self)->enum_type(i)->value_count();
-  }
-  return count;
-}
-
-static const void* GetByName(PyContainer* self, ConstStringParam name) {
-  return GetDescriptor(self)->FindEnumValueByName(name);
-}
-
-static const void* GetByIndex(PyContainer* self, int index) {
-  // This is not optimal, but the number of enums *types* in a given message
-  // is small.  This function is only used when iterating over the mapping.
-  const EnumDescriptor* enum_type = nullptr;
-  int enum_type_count = GetDescriptor(self)->enum_type_count();
-  for (int i = 0; i < enum_type_count; ++i) {
-    enum_type = GetDescriptor(self)->enum_type(i);
-    int enum_value_count = enum_type->value_count();
-    if (index < enum_value_count) {
-      // Found it!
-      break;
-    }
-    index -= enum_value_count;
-  }
-  // The next statement cannot overflow, because this function is only called by
-  // internal iterators which ensure that 0 <= index < Count().
-  return enum_type->value(index);
-}
-
-static PyObject* NewObjectFromItem(const void* item) {
-  return PyEnumValueDescriptor_FromDescriptor(
-      static_cast<ItemDescriptor>(item));
-}
-
-static const std::string& GetItemName(const void* item) {
-  return static_cast<ItemDescriptor>(item)->name();
-}
-
-static DescriptorContainerDef ContainerDef = {
-    "MessageEnumValues", Count,       GetByIndex, GetByName, nullptr, nullptr,
-    NewObjectFromItem,   GetItemName, nullptr,    nullptr,   nullptr,
-};
-
-}  // namespace enumvalues
-
-PyObject* NewMessageEnumValuesByName(ParentDescriptor descriptor) {
-  return descriptor::NewMappingByName(&enumvalues::ContainerDef, descriptor);
-}
-
-namespace extensions {
-
-typedef const FieldDescriptor* ItemDescriptor;
-
-static int Count(PyContainer* self) {
-  return GetDescriptor(self)->extension_count();
-}
-
-static const void* GetByName(PyContainer* self, ConstStringParam name) {
-  return GetDescriptor(self)->FindExtensionByName(name);
-}
-
-static const void* GetByIndex(PyContainer* self, int index) {
-  return GetDescriptor(self)->extension(index);
-}
-
-static PyObject* NewObjectFromItem(const void* item) {
-  return PyFieldDescriptor_FromDescriptor(static_cast<ItemDescriptor>(item));
-}
-
-static const std::string& GetItemName(const void* item) {
-  return static_cast<ItemDescriptor>(item)->name();
-}
-
-static int GetItemIndex(const void* item) {
-  return static_cast<ItemDescriptor>(item)->index();
-}
-
-static DescriptorContainerDef ContainerDef = {
-    "MessageExtensions",
-    Count,
-    GetByIndex,
-    GetByName,
-    nullptr,
-    nullptr,
-    NewObjectFromItem,
-    GetItemName,
-    nullptr,
-    nullptr,
-    GetItemIndex,
-};
-
-}  // namespace extensions
-
-PyObject* NewMessageExtensionsByName(ParentDescriptor descriptor) {
-  return descriptor::NewMappingByName(&extensions::ContainerDef, descriptor);
-}
-
-PyObject* NewMessageExtensionsSeq(ParentDescriptor descriptor) {
-  return descriptor::NewSequence(&extensions::ContainerDef, descriptor);
-}
-
-namespace oneofs {
-
-typedef const OneofDescriptor* ItemDescriptor;
-
-static int Count(PyContainer* self) {
-  return GetDescriptor(self)->oneof_decl_count();
-}
-
-static const void* GetByName(PyContainer* self, ConstStringParam name) {
-  return GetDescriptor(self)->FindOneofByName(name);
-}
-
-static const void* GetByIndex(PyContainer* self, int index) {
-  return GetDescriptor(self)->oneof_decl(index);
-}
-
-static PyObject* NewObjectFromItem(const void* item) {
-  return PyOneofDescriptor_FromDescriptor(static_cast<ItemDescriptor>(item));
-}
-
-static const std::string& GetItemName(const void* item) {
-  return static_cast<ItemDescriptor>(item)->name();
-}
-
-static int GetItemIndex(const void* item) {
-  return static_cast<ItemDescriptor>(item)->index();
-}
-
-static DescriptorContainerDef ContainerDef = {
-    "MessageOneofs", Count,   GetByIndex,        GetByName,
-    nullptr,         nullptr, NewObjectFromItem, GetItemName,
-    nullptr,         nullptr, GetItemIndex,
-};
-
-}  // namespace oneofs
-
-PyObject* NewMessageOneofsByName(ParentDescriptor descriptor) {
-  return descriptor::NewMappingByName(&oneofs::ContainerDef, descriptor);
-}
-
-PyObject* NewMessageOneofsSeq(ParentDescriptor descriptor) {
-  return descriptor::NewSequence(&oneofs::ContainerDef, descriptor);
-}
-
-}  // namespace message_descriptor
-
-namespace enum_descriptor {
-
-typedef const EnumDescriptor* ParentDescriptor;
-
-static ParentDescriptor GetDescriptor(PyContainer* self) {
-  return reinterpret_cast<ParentDescriptor>(self->descriptor);
-}
-
-namespace enumvalues {
-
-typedef const EnumValueDescriptor* ItemDescriptor;
-
-static int Count(PyContainer* self) {
-  return GetDescriptor(self)->value_count();
-}
-
-static const void* GetByIndex(PyContainer* self, int index) {
-  return GetDescriptor(self)->value(index);
-}
-
-static const void* GetByName(PyContainer* self, ConstStringParam name) {
-  return GetDescriptor(self)->FindValueByName(name);
-}
-
-static const void* GetByNumber(PyContainer* self, int number) {
-  return GetDescriptor(self)->FindValueByNumber(number);
-}
-
-static PyObject* NewObjectFromItem(const void* item) {
-  return PyEnumValueDescriptor_FromDescriptor(
-      static_cast<ItemDescriptor>(item));
-}
-
-static const std::string& GetItemName(const void* item) {
-  return static_cast<ItemDescriptor>(item)->name();
-}
-
-static int GetItemNumber(const void* item) {
-  return static_cast<ItemDescriptor>(item)->number();
-}
-
-static int GetItemIndex(const void* item) {
-  return static_cast<ItemDescriptor>(item)->index();
-}
-
-static DescriptorContainerDef ContainerDef = {
-    "EnumValues", Count,         GetByIndex,        GetByName,
-    nullptr,      GetByNumber,   NewObjectFromItem, GetItemName,
-    nullptr,      GetItemNumber, GetItemIndex,
-};
-
-}  // namespace enumvalues
-
-PyObject* NewEnumValuesByName(ParentDescriptor descriptor) {
-  return descriptor::NewMappingByName(&enumvalues::ContainerDef, descriptor);
-}
-
-PyObject* NewEnumValuesByNumber(ParentDescriptor descriptor) {
-  return descriptor::NewMappingByNumber(&enumvalues::ContainerDef, descriptor);
-}
-
-PyObject* NewEnumValuesSeq(ParentDescriptor descriptor) {
-  return descriptor::NewSequence(&enumvalues::ContainerDef, descriptor);
-}
-
-}  // namespace enum_descriptor
-
-namespace oneof_descriptor {
-
-typedef const OneofDescriptor* ParentDescriptor;
-
-static ParentDescriptor GetDescriptor(PyContainer* self) {
-  return reinterpret_cast<ParentDescriptor>(self->descriptor);
-}
-
-namespace fields {
-
-typedef const FieldDescriptor* ItemDescriptor;
-
-static int Count(PyContainer* self) {
-  return GetDescriptor(self)->field_count();
-}
-
-static const void* GetByIndex(PyContainer* self, int index) {
-  return GetDescriptor(self)->field(index);
-}
-
-static PyObject* NewObjectFromItem(const void* item) {
-  return PyFieldDescriptor_FromDescriptor(static_cast<ItemDescriptor>(item));
-}
-
-static int GetItemIndex(const void* item) {
-  return static_cast<ItemDescriptor>(item)->index_in_oneof();
-}
-
-static DescriptorContainerDef ContainerDef = {
-    "OneofFields",     Count,   GetByIndex, nullptr, nullptr,      nullptr,
-    NewObjectFromItem, nullptr, nullptr,    nullptr, GetItemIndex,
-};
-
-}  // namespace fields
-
-PyObject* NewOneofFieldsSeq(ParentDescriptor descriptor) {
-  return descriptor::NewSequence(&fields::ContainerDef, descriptor);
-}
-
-}  // namespace oneof_descriptor
-
-namespace service_descriptor {
-
-typedef const ServiceDescriptor* ParentDescriptor;
-
-static ParentDescriptor GetDescriptor(PyContainer* self) {
-  return reinterpret_cast<ParentDescriptor>(self->descriptor);
-}
-
-namespace methods {
-
-typedef const MethodDescriptor* ItemDescriptor;
-
-static int Count(PyContainer* self) {
-  return GetDescriptor(self)->method_count();
-}
-
-static const void* GetByName(PyContainer* self, ConstStringParam name) {
-  return GetDescriptor(self)->FindMethodByName(name);
-}
-
-static const void* GetByIndex(PyContainer* self, int index) {
-  return GetDescriptor(self)->method(index);
-}
-
-static PyObject* NewObjectFromItem(const void* item) {
-  return PyMethodDescriptor_FromDescriptor(static_cast<ItemDescriptor>(item));
-}
-
-static const std::string& GetItemName(const void* item) {
-  return static_cast<ItemDescriptor>(item)->name();
-}
-
-static int GetItemIndex(const void* item) {
-  return static_cast<ItemDescriptor>(item)->index();
-}
-
-static DescriptorContainerDef ContainerDef = {
-    "ServiceMethods", Count,   GetByIndex,        GetByName,
-    nullptr,          nullptr, NewObjectFromItem, GetItemName,
-    nullptr,          nullptr, GetItemIndex,
-};
-
-}  // namespace methods
-
-PyObject* NewServiceMethodsSeq(ParentDescriptor descriptor) {
-  return descriptor::NewSequence(&methods::ContainerDef, descriptor);
-}
-
-PyObject* NewServiceMethodsByName(ParentDescriptor descriptor) {
-  return descriptor::NewMappingByName(&methods::ContainerDef, descriptor);
-}
-
-}  // namespace service_descriptor
-
-namespace file_descriptor {
-
-typedef const FileDescriptor* ParentDescriptor;
-
-static ParentDescriptor GetDescriptor(PyContainer* self) {
-  return reinterpret_cast<ParentDescriptor>(self->descriptor);
-}
-
-namespace messages {
-
-typedef const Descriptor* ItemDescriptor;
-
-static int Count(PyContainer* self) {
-  return GetDescriptor(self)->message_type_count();
-}
-
-static const void* GetByName(PyContainer* self, ConstStringParam name) {
-  return GetDescriptor(self)->FindMessageTypeByName(name);
-}
-
-static const void* GetByIndex(PyContainer* self, int index) {
-  return GetDescriptor(self)->message_type(index);
-}
-
-static PyObject* NewObjectFromItem(const void* item) {
-  return PyMessageDescriptor_FromDescriptor(static_cast<ItemDescriptor>(item));
-}
-
-static const std::string& GetItemName(const void* item) {
-  return static_cast<ItemDescriptor>(item)->name();
-}
-
-static int GetItemIndex(const void* item) {
-  return static_cast<ItemDescriptor>(item)->index();
-}
-
-static DescriptorContainerDef ContainerDef = {
-    "FileMessages", Count,   GetByIndex,        GetByName,
-    nullptr,        nullptr, NewObjectFromItem, GetItemName,
-    nullptr,        nullptr, GetItemIndex,
-};
-
-}  // namespace messages
-
-PyObject* NewFileMessageTypesByName(ParentDescriptor descriptor) {
-  return descriptor::NewMappingByName(&messages::ContainerDef, descriptor);
-}
-
-namespace enums {
-
-typedef const EnumDescriptor* ItemDescriptor;
-
-static int Count(PyContainer* self) {
-  return GetDescriptor(self)->enum_type_count();
-}
-
-static const void* GetByName(PyContainer* self, ConstStringParam name) {
-  return GetDescriptor(self)->FindEnumTypeByName(name);
-}
-
-static const void* GetByIndex(PyContainer* self, int index) {
-  return GetDescriptor(self)->enum_type(index);
-}
-
-static PyObject* NewObjectFromItem(const void* item) {
-  return PyEnumDescriptor_FromDescriptor(static_cast<ItemDescriptor>(item));
-}
-
-static const std::string& GetItemName(const void* item) {
-  return static_cast<ItemDescriptor>(item)->name();
-}
-
-static int GetItemIndex(const void* item) {
-  return static_cast<ItemDescriptor>(item)->index();
-}
-
-static DescriptorContainerDef ContainerDef = {
-    "FileEnums", Count,   GetByIndex,        GetByName,
-    nullptr,     nullptr, NewObjectFromItem, GetItemName,
-    nullptr,     nullptr, GetItemIndex,
-};
-
-}  // namespace enums
-
-PyObject* NewFileEnumTypesByName(ParentDescriptor descriptor) {
-  return descriptor::NewMappingByName(&enums::ContainerDef, descriptor);
-}
-
-namespace extensions {
-
-typedef const FieldDescriptor* ItemDescriptor;
-
-static int Count(PyContainer* self) {
-  return GetDescriptor(self)->extension_count();
-}
-
-static const void* GetByName(PyContainer* self, ConstStringParam name) {
-  return GetDescriptor(self)->FindExtensionByName(name);
-}
-
-static const void* GetByIndex(PyContainer* self, int index) {
-  return GetDescriptor(self)->extension(index);
-}
-
-static PyObject* NewObjectFromItem(const void* item) {
-  return PyFieldDescriptor_FromDescriptor(static_cast<ItemDescriptor>(item));
-}
-
-static const std::string& GetItemName(const void* item) {
-  return static_cast<ItemDescriptor>(item)->name();
-}
-
-static int GetItemIndex(const void* item) {
-  return static_cast<ItemDescriptor>(item)->index();
-}
-
-static DescriptorContainerDef ContainerDef = {
-    "FileExtensions", Count,   GetByIndex,        GetByName,
-    nullptr,          nullptr, NewObjectFromItem, GetItemName,
-    nullptr,          nullptr, GetItemIndex,
-};
-
-}  // namespace extensions
-
-PyObject* NewFileExtensionsByName(ParentDescriptor descriptor) {
-  return descriptor::NewMappingByName(&extensions::ContainerDef, descriptor);
-}
-
-namespace services {
-
-typedef const ServiceDescriptor* ItemDescriptor;
-
-static int Count(PyContainer* self) {
-  return GetDescriptor(self)->service_count();
-}
-
-static const void* GetByName(PyContainer* self, ConstStringParam name) {
-  return GetDescriptor(self)->FindServiceByName(name);
-}
-
-static const void* GetByIndex(PyContainer* self, int index) {
-  return GetDescriptor(self)->service(index);
-}
-
-static PyObject* NewObjectFromItem(const void* item) {
-  return PyServiceDescriptor_FromDescriptor(static_cast<ItemDescriptor>(item));
-}
-
-static const std::string& GetItemName(const void* item) {
-  return static_cast<ItemDescriptor>(item)->name();
-}
-
-static int GetItemIndex(const void* item) {
-  return static_cast<ItemDescriptor>(item)->index();
-}
-
-static DescriptorContainerDef ContainerDef = {
-    "FileServices", Count,   GetByIndex,        GetByName,
-    nullptr,        nullptr, NewObjectFromItem, GetItemName,
-    nullptr,        nullptr, GetItemIndex,
-};
-
-}  // namespace services
-
-PyObject* NewFileServicesByName(const FileDescriptor* descriptor) {
-  return descriptor::NewMappingByName(&services::ContainerDef, descriptor);
-}
-
-namespace dependencies {
-
-typedef const FileDescriptor* ItemDescriptor;
-
-static int Count(PyContainer* self) {
-  return GetDescriptor(self)->dependency_count();
-}
-
-static const void* GetByIndex(PyContainer* self, int index) {
-  return GetDescriptor(self)->dependency(index);
-}
-
-static PyObject* NewObjectFromItem(const void* item) {
-  return PyFileDescriptor_FromDescriptor(static_cast<ItemDescriptor>(item));
-}
-
-static DescriptorContainerDef ContainerDef = {
-    "FileDependencies", Count,   GetByIndex, nullptr, nullptr, nullptr,
-    NewObjectFromItem,  nullptr, nullptr,    nullptr, nullptr,
-};
-
-}  // namespace dependencies
-
-PyObject* NewFileDependencies(const FileDescriptor* descriptor) {
-  return descriptor::NewSequence(&dependencies::ContainerDef, descriptor);
-}
-
-namespace public_dependencies {
-
-typedef const FileDescriptor* ItemDescriptor;
-
-static int Count(PyContainer* self) {
-  return GetDescriptor(self)->public_dependency_count();
-}
-
-static const void* GetByIndex(PyContainer* self, int index) {
-  return GetDescriptor(self)->public_dependency(index);
-}
-
-static PyObject* NewObjectFromItem(const void* item) {
-  return PyFileDescriptor_FromDescriptor(static_cast<ItemDescriptor>(item));
-}
-
-static DescriptorContainerDef ContainerDef = {
-    "FilePublicDependencies", Count,   GetByIndex, nullptr, nullptr, nullptr,
-    NewObjectFromItem,        nullptr, nullptr,    nullptr, nullptr,
-};
-
-}  // namespace public_dependencies
-
-PyObject* NewFilePublicDependencies(const FileDescriptor* descriptor) {
-  return descriptor::NewSequence(&public_dependencies::ContainerDef,
-                                 descriptor);
-}
-
-}  // namespace file_descriptor
-
-
-// Register all implementations
-
-bool InitDescriptorMappingTypes() {
-  if (PyType_Ready(&descriptor::DescriptorMapping_Type) < 0)
-    return false;
-  if (PyType_Ready(&descriptor::DescriptorSequence_Type) < 0)
-    return false;
-  if (PyType_Ready(&descriptor::ContainerIterator_Type) < 0)
-    return false;
-  return true;
-}
-
-}  // namespace python
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/python/google/protobuf/pyext/descriptor_containers.h b/libs/protobuf/python/google/protobuf/pyext/descriptor_containers.h
deleted file mode 100644
index cf2cf4a..0000000
--- a/libs/protobuf/python/google/protobuf/pyext/descriptor_containers.h
+++ /dev/null
@@ -1,110 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef GOOGLE_PROTOBUF_PYTHON_CPP_DESCRIPTOR_CONTAINERS_H__
-#define GOOGLE_PROTOBUF_PYTHON_CPP_DESCRIPTOR_CONTAINERS_H__
-
-// Mappings and Sequences of descriptors.
-// They implement containers like fields_by_name, EnumDescriptor.values...
-// See descriptor_containers.cc for more description.
-#define PY_SSIZE_T_CLEAN
-#include <Python.h>
-
-namespace google {
-namespace protobuf {
-
-class Descriptor;
-class FileDescriptor;
-class EnumDescriptor;
-class OneofDescriptor;
-class ServiceDescriptor;
-
-namespace python {
-
-// Initialize the various types and objects.
-bool InitDescriptorMappingTypes();
-
-// Each function below returns a Mapping, or a Sequence of descriptors.
-// They all return a new reference.
-
-namespace message_descriptor {
-PyObject* NewMessageFieldsByName(const Descriptor* descriptor);
-PyObject* NewMessageFieldsByCamelcaseName(const Descriptor* descriptor);
-PyObject* NewMessageFieldsByNumber(const Descriptor* descriptor);
-PyObject* NewMessageFieldsSeq(const Descriptor* descriptor);
-
-PyObject* NewMessageNestedTypesSeq(const Descriptor* descriptor);
-PyObject* NewMessageNestedTypesByName(const Descriptor* descriptor);
-
-PyObject* NewMessageEnumsByName(const Descriptor* descriptor);
-PyObject* NewMessageEnumsSeq(const Descriptor* descriptor);
-PyObject* NewMessageEnumValuesByName(const Descriptor* descriptor);
-
-PyObject* NewMessageExtensionsByName(const Descriptor* descriptor);
-PyObject* NewMessageExtensionsSeq(const Descriptor* descriptor);
-
-PyObject* NewMessageOneofsByName(const Descriptor* descriptor);
-PyObject* NewMessageOneofsSeq(const Descriptor* descriptor);
-}  // namespace message_descriptor
-
-namespace enum_descriptor {
-PyObject* NewEnumValuesByName(const EnumDescriptor* descriptor);
-PyObject* NewEnumValuesByNumber(const EnumDescriptor* descriptor);
-PyObject* NewEnumValuesSeq(const EnumDescriptor* descriptor);
-}  // namespace enum_descriptor
-
-namespace oneof_descriptor {
-PyObject* NewOneofFieldsSeq(const OneofDescriptor* descriptor);
-}  // namespace oneof_descriptor
-
-namespace file_descriptor {
-PyObject* NewFileMessageTypesByName(const FileDescriptor* descriptor);
-
-PyObject* NewFileEnumTypesByName(const FileDescriptor* descriptor);
-
-PyObject* NewFileExtensionsByName(const FileDescriptor* descriptor);
-
-PyObject* NewFileServicesByName(const FileDescriptor* descriptor);
-
-PyObject* NewFileDependencies(const FileDescriptor* descriptor);
-PyObject* NewFilePublicDependencies(const FileDescriptor* descriptor);
-}  // namespace file_descriptor
-
-namespace service_descriptor {
-PyObject* NewServiceMethodsSeq(const ServiceDescriptor* descriptor);
-PyObject* NewServiceMethodsByName(const ServiceDescriptor* descriptor);
-}  // namespace service_descriptor
-
-
-}  // namespace python
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // GOOGLE_PROTOBUF_PYTHON_CPP_DESCRIPTOR_CONTAINERS_H__
diff --git a/libs/protobuf/python/google/protobuf/pyext/descriptor_database.cc b/libs/protobuf/python/google/protobuf/pyext/descriptor_database.cc
deleted file mode 100644
index f87f23d..0000000
--- a/libs/protobuf/python/google/protobuf/pyext/descriptor_database.cc
+++ /dev/null
@@ -1,187 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// This file defines a C++ DescriptorDatabase, which wraps a Python Database
-// and delegate all its operations to Python methods.
-
-#include <google/protobuf/pyext/descriptor_database.h>
-
-#include <cstdint>
-
-#include <google/protobuf/stubs/logging.h>
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/descriptor.pb.h>
-#include <google/protobuf/pyext/message.h>
-#include <google/protobuf/pyext/scoped_pyobject_ptr.h>
-
-namespace google {
-namespace protobuf {
-namespace python {
-
-PyDescriptorDatabase::PyDescriptorDatabase(PyObject* py_database)
-    : py_database_(py_database) {
-  Py_INCREF(py_database_);
-}
-
-PyDescriptorDatabase::~PyDescriptorDatabase() { Py_DECREF(py_database_); }
-
-// Convert a Python object to a FileDescriptorProto pointer.
-// Handles all kinds of Python errors, which are simply logged.
-static bool GetFileDescriptorProto(PyObject* py_descriptor,
-                                   FileDescriptorProto* output) {
-  if (py_descriptor == nullptr) {
-    if (PyErr_ExceptionMatches(PyExc_KeyError)) {
-      // Expected error: item was simply not found.
-      PyErr_Clear();
-    } else {
-      GOOGLE_LOG(ERROR) << "DescriptorDatabase method raised an error";
-      PyErr_Print();
-    }
-    return false;
-  }
-  if (py_descriptor == Py_None) {
-    return false;
-  }
-  const Descriptor* filedescriptor_descriptor =
-      FileDescriptorProto::default_instance().GetDescriptor();
-  CMessage* message = reinterpret_cast<CMessage*>(py_descriptor);
-  if (PyObject_TypeCheck(py_descriptor, CMessage_Type) &&
-      message->message->GetDescriptor() == filedescriptor_descriptor) {
-    // Fast path: Just use the pointer.
-    FileDescriptorProto* file_proto =
-        static_cast<FileDescriptorProto*>(message->message);
-    *output = *file_proto;
-    return true;
-  } else {
-    // Slow path: serialize the message. This allows to use databases which
-    // use a different implementation of FileDescriptorProto.
-    ScopedPyObjectPtr serialized_pb(
-        PyObject_CallMethod(py_descriptor, "SerializeToString", nullptr));
-    if (serialized_pb == nullptr) {
-      GOOGLE_LOG(ERROR)
-          << "DescriptorDatabase method did not return a FileDescriptorProto";
-      PyErr_Print();
-      return false;
-    }
-    char* str;
-    Py_ssize_t len;
-    if (PyBytes_AsStringAndSize(serialized_pb.get(), &str, &len) < 0) {
-      GOOGLE_LOG(ERROR)
-          << "DescriptorDatabase method did not return a FileDescriptorProto";
-      PyErr_Print();
-      return false;
-    }
-    FileDescriptorProto file_proto;
-    if (!file_proto.ParseFromArray(str, len)) {
-      GOOGLE_LOG(ERROR)
-          << "DescriptorDatabase method did not return a FileDescriptorProto";
-      return false;
-    }
-    *output = file_proto;
-    return true;
-  }
-}
-
-// Find a file by file name.
-bool PyDescriptorDatabase::FindFileByName(const std::string& filename,
-                                          FileDescriptorProto* output) {
-  ScopedPyObjectPtr py_descriptor(PyObject_CallMethod(
-      py_database_, "FindFileByName", "s#", filename.c_str(), filename.size()));
-  return GetFileDescriptorProto(py_descriptor.get(), output);
-}
-
-// Find the file that declares the given fully-qualified symbol name.
-bool PyDescriptorDatabase::FindFileContainingSymbol(
-    const std::string& symbol_name, FileDescriptorProto* output) {
-  ScopedPyObjectPtr py_descriptor(
-      PyObject_CallMethod(py_database_, "FindFileContainingSymbol", "s#",
-                          symbol_name.c_str(), symbol_name.size()));
-  return GetFileDescriptorProto(py_descriptor.get(), output);
-}
-
-// Find the file which defines an extension extending the given message type
-// with the given field number.
-// Python DescriptorDatabases are not required to implement this method.
-bool PyDescriptorDatabase::FindFileContainingExtension(
-    const std::string& containing_type, int field_number,
-    FileDescriptorProto* output) {
-  ScopedPyObjectPtr py_method(
-      PyObject_GetAttrString(py_database_, "FindFileContainingExtension"));
-  if (py_method == nullptr) {
-    // This method is not implemented, returns without error.
-    PyErr_Clear();
-    return false;
-  }
-  ScopedPyObjectPtr py_descriptor(
-      PyObject_CallFunction(py_method.get(), "s#i", containing_type.c_str(),
-                            containing_type.size(), field_number));
-  return GetFileDescriptorProto(py_descriptor.get(), output);
-}
-
-// Finds the tag numbers used by all known extensions of
-// containing_type, and appends them to output in an undefined
-// order.
-// Python DescriptorDatabases are not required to implement this method.
-bool PyDescriptorDatabase::FindAllExtensionNumbers(
-    const std::string& containing_type, std::vector<int>* output) {
-  ScopedPyObjectPtr py_method(
-      PyObject_GetAttrString(py_database_, "FindAllExtensionNumbers"));
-  if (py_method == nullptr) {
-    // This method is not implemented, returns without error.
-    PyErr_Clear();
-    return false;
-  }
-  ScopedPyObjectPtr py_list(
-      PyObject_CallFunction(py_method.get(), "s#", containing_type.c_str(),
-                            containing_type.size()));
-  if (py_list == nullptr) {
-    PyErr_Print();
-    return false;
-  }
-  Py_ssize_t size = PyList_Size(py_list.get());
-  int64_t item_value;
-  for (Py_ssize_t i = 0 ; i < size; ++i) {
-    ScopedPyObjectPtr item(PySequence_GetItem(py_list.get(), i));
-    item_value = PyLong_AsLong(item.get());
-    if (item_value < 0) {
-      GOOGLE_LOG(ERROR)
-          << "FindAllExtensionNumbers method did not return "
-          << "valid extension numbers.";
-      PyErr_Print();
-      return false;
-    }
-    output->push_back(item_value);
-  }
-  return true;
-}
-
-}  // namespace python
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/python/google/protobuf/pyext/descriptor_database.h b/libs/protobuf/python/google/protobuf/pyext/descriptor_database.h
deleted file mode 100644
index 5621a22..0000000
--- a/libs/protobuf/python/google/protobuf/pyext/descriptor_database.h
+++ /dev/null
@@ -1,83 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef GOOGLE_PROTOBUF_PYTHON_CPP_DESCRIPTOR_DATABASE_H__
-#define GOOGLE_PROTOBUF_PYTHON_CPP_DESCRIPTOR_DATABASE_H__
-
-#define PY_SSIZE_T_CLEAN
-#include <Python.h>
-
-#include <google/protobuf/descriptor_database.h>
-
-namespace google {
-namespace protobuf {
-namespace python {
-
-class PyDescriptorDatabase : public DescriptorDatabase {
- public:
-  explicit PyDescriptorDatabase(PyObject* py_database);
-  ~PyDescriptorDatabase() override;
-
-  // Implement the abstract interface. All these functions fill the output
-  // with a copy of FileDescriptorProto.
-
-  // Find a file by file name.
-  bool FindFileByName(const std::string& filename,
-                      FileDescriptorProto* output) override;
-
-  // Find the file that declares the given fully-qualified symbol name.
-  bool FindFileContainingSymbol(const std::string& symbol_name,
-                                FileDescriptorProto* output) override;
-
-  // Find the file which defines an extension extending the given message type
-  // with the given field number.
-  // Containing_type must be a fully-qualified type name.
-  // Python objects are not required to implement this method.
-  bool FindFileContainingExtension(const std::string& containing_type,
-                                   int field_number,
-                                   FileDescriptorProto* output) override;
-
-  // Finds the tag numbers used by all known extensions of
-  // containing_type, and appends them to output in an undefined
-  // order.
-  // Python objects are not required to implement this method.
-  bool FindAllExtensionNumbers(const std::string& containing_type,
-                               std::vector<int>* output) override;
-
- private:
-  // The python object that implements the database. The reference is owned.
-  PyObject* py_database_;
-};
-
-}  // namespace python
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // GOOGLE_PROTOBUF_PYTHON_CPP_DESCRIPTOR_DATABASE_H__
diff --git a/libs/protobuf/python/google/protobuf/pyext/descriptor_pool.cc b/libs/protobuf/python/google/protobuf/pyext/descriptor_pool.cc
deleted file mode 100644
index 2f39281..0000000
--- a/libs/protobuf/python/google/protobuf/pyext/descriptor_pool.cc
+++ /dev/null
@@ -1,817 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Implements the DescriptorPool, which collects all descriptors.
-
-#include <unordered_map>
-
-#define PY_SSIZE_T_CLEAN
-#include <Python.h>
-
-#include <google/protobuf/descriptor.pb.h>
-#include <google/protobuf/pyext/descriptor.h>
-#include <google/protobuf/pyext/descriptor_database.h>
-#include <google/protobuf/pyext/descriptor_pool.h>
-#include <google/protobuf/pyext/message.h>
-#include <google/protobuf/pyext/message_factory.h>
-#include <google/protobuf/pyext/scoped_pyobject_ptr.h>
-#include <google/protobuf/stubs/hash.h>
-
-#define PyString_AsStringAndSize(ob, charpp, sizep)              \
-  (PyUnicode_Check(ob)                                           \
-       ? ((*(charpp) = const_cast<char*>(                        \
-               PyUnicode_AsUTF8AndSize(ob, (sizep)))) == nullptr \
-              ? -1                                               \
-              : 0)                                               \
-       : PyBytes_AsStringAndSize(ob, (charpp), (sizep)))
-
-namespace google {
-namespace protobuf {
-namespace python {
-
-// A map to cache Python Pools per C++ pointer.
-// Pointers are not owned here, and belong to the PyDescriptorPool.
-static std::unordered_map<const DescriptorPool*, PyDescriptorPool*>*
-    descriptor_pool_map;
-
-namespace cdescriptor_pool {
-
-// Collects errors that occur during proto file building to allow them to be
-// propagated in the python exception instead of only living in ERROR logs.
-class BuildFileErrorCollector : public DescriptorPool::ErrorCollector {
- public:
-  BuildFileErrorCollector() : error_message(""), had_errors_(false) {}
-
-  void AddError(const std::string& filename, const std::string& element_name,
-                const Message* descriptor, ErrorLocation location,
-                const std::string& message) override {
-    // Replicates the logging behavior that happens in the C++ implementation
-    // when an error collector is not passed in.
-    if (!had_errors_) {
-      error_message +=
-          ("Invalid proto descriptor for file \"" + filename + "\":\n");
-      had_errors_ = true;
-    }
-    // As this only happens on failure and will result in the program not
-    // running at all, no effort is made to optimize this string manipulation.
-    error_message += ("  " + element_name + ": " + message + "\n");
-  }
-
-  void Clear() {
-    had_errors_ = false;
-    error_message = "";
-  }
-
-  std::string error_message;
-
- private:
-  bool had_errors_;
-};
-
-// Create a Python DescriptorPool object, but does not fill the "pool"
-// attribute.
-static PyDescriptorPool* _CreateDescriptorPool() {
-  PyDescriptorPool* cpool = PyObject_GC_New(
-      PyDescriptorPool, &PyDescriptorPool_Type);
-  if (cpool == nullptr) {
-    return nullptr;
-  }
-
-  cpool->error_collector = nullptr;
-  cpool->underlay = nullptr;
-  cpool->database = nullptr;
-  cpool->is_owned = false;
-  cpool->is_mutable = false;
-
-  cpool->descriptor_options = new std::unordered_map<const void*, PyObject*>();
-
-  cpool->py_message_factory = message_factory::NewMessageFactory(
-      &PyMessageFactory_Type, cpool);
-  if (cpool->py_message_factory == nullptr) {
-    Py_DECREF(cpool);
-    return nullptr;
-  }
-
-  PyObject_GC_Track(cpool);
-
-  return cpool;
-}
-
-// Create a Python DescriptorPool, using the given pool as an underlay:
-// new messages will be added to a custom pool, not to the underlay.
-//
-// Ownership of the underlay is not transferred, its pointer should
-// stay alive.
-static PyDescriptorPool* PyDescriptorPool_NewWithUnderlay(
-    const DescriptorPool* underlay) {
-  PyDescriptorPool* cpool = _CreateDescriptorPool();
-  if (cpool == nullptr) {
-    return nullptr;
-  }
-  cpool->pool = new DescriptorPool(underlay);
-  cpool->is_owned = true;
-  cpool->is_mutable = true;
-  cpool->underlay = underlay;
-
-  if (!descriptor_pool_map->insert(
-      std::make_pair(cpool->pool, cpool)).second) {
-    // Should never happen -- would indicate an internal error / bug.
-    PyErr_SetString(PyExc_ValueError, "DescriptorPool already registered");
-    return nullptr;
-  }
-
-  return cpool;
-}
-
-static PyDescriptorPool* PyDescriptorPool_NewWithDatabase(
-    DescriptorDatabase* database) {
-  PyDescriptorPool* cpool = _CreateDescriptorPool();
-  if (cpool == nullptr) {
-    return nullptr;
-  }
-  if (database != nullptr) {
-    cpool->error_collector = new BuildFileErrorCollector();
-    cpool->pool = new DescriptorPool(database, cpool->error_collector);
-    cpool->is_mutable = false;
-    cpool->database = database;
-  } else {
-    cpool->pool = new DescriptorPool();
-    cpool->is_mutable = true;
-  }
-  cpool->is_owned = true;
-
-  if (!descriptor_pool_map->insert(std::make_pair(cpool->pool, cpool)).second) {
-    // Should never happen -- would indicate an internal error / bug.
-    PyErr_SetString(PyExc_ValueError, "DescriptorPool already registered");
-    return nullptr;
-  }
-
-  return cpool;
-}
-
-// The public DescriptorPool constructor.
-static PyObject* New(PyTypeObject* type,
-                     PyObject* args, PyObject* kwargs) {
-  static const char* kwlist[] = {"descriptor_db", nullptr};
-  PyObject* py_database = nullptr;
-  if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|O",
-                                   const_cast<char**>(kwlist), &py_database)) {
-    return nullptr;
-  }
-  DescriptorDatabase* database = nullptr;
-  if (py_database && py_database != Py_None) {
-    database = new PyDescriptorDatabase(py_database);
-  }
-  return reinterpret_cast<PyObject*>(
-      PyDescriptorPool_NewWithDatabase(database));
-}
-
-static void Dealloc(PyObject* pself) {
-  PyDescriptorPool* self = reinterpret_cast<PyDescriptorPool*>(pself);
-  descriptor_pool_map->erase(self->pool);
-  Py_CLEAR(self->py_message_factory);
-  for (std::unordered_map<const void*, PyObject*>::iterator it =
-           self->descriptor_options->begin();
-       it != self->descriptor_options->end(); ++it) {
-    Py_DECREF(it->second);
-  }
-  delete self->descriptor_options;
-  delete self->database;
-  if (self->is_owned) {
-    delete self->pool;
-  }
-  delete self->error_collector;
-  Py_TYPE(self)->tp_free(pself);
-}
-
-static int GcTraverse(PyObject* pself, visitproc visit, void* arg) {
-  PyDescriptorPool* self = reinterpret_cast<PyDescriptorPool*>(pself);
-  Py_VISIT(self->py_message_factory);
-  return 0;
-}
-
-static int GcClear(PyObject* pself) {
-  PyDescriptorPool* self = reinterpret_cast<PyDescriptorPool*>(pself);
-  Py_CLEAR(self->py_message_factory);
-  return 0;
-}
-
-PyObject* SetErrorFromCollector(DescriptorPool::ErrorCollector* self,
-                                const char* name, const char* error_type) {
-  BuildFileErrorCollector* error_collector =
-      reinterpret_cast<BuildFileErrorCollector*>(self);
-  if (error_collector && !error_collector->error_message.empty()) {
-    PyErr_Format(PyExc_KeyError, "Couldn't build file for %s %.200s\n%s",
-                 error_type, name, error_collector->error_message.c_str());
-    error_collector->Clear();
-    return nullptr;
-  }
-  PyErr_Format(PyExc_KeyError, "Couldn't find %s %.200s", error_type, name);
-  return nullptr;
-}
-
-static PyObject* FindMessageByName(PyObject* self, PyObject* arg) {
-  Py_ssize_t name_size;
-  char* name;
-  if (PyString_AsStringAndSize(arg, &name, &name_size) < 0) {
-    return nullptr;
-  }
-
-  const Descriptor* message_descriptor =
-      reinterpret_cast<PyDescriptorPool*>(self)->pool->FindMessageTypeByName(
-          StringParam(name, name_size));
-
-  if (message_descriptor == nullptr) {
-    return SetErrorFromCollector(
-        reinterpret_cast<PyDescriptorPool*>(self)->error_collector, name,
-        "message");
-  }
-
-
-  return PyMessageDescriptor_FromDescriptor(message_descriptor);
-}
-
-
-
-
-static PyObject* FindFileByName(PyObject* self, PyObject* arg) {
-  Py_ssize_t name_size;
-  char* name;
-  if (PyString_AsStringAndSize(arg, &name, &name_size) < 0) {
-    return nullptr;
-  }
-
-  PyDescriptorPool* py_pool = reinterpret_cast<PyDescriptorPool*>(self);
-  const FileDescriptor* file_descriptor =
-      py_pool->pool->FindFileByName(StringParam(name, name_size));
-
-  if (file_descriptor == nullptr) {
-    return SetErrorFromCollector(py_pool->error_collector, name, "file");
-  }
-  return PyFileDescriptor_FromDescriptor(file_descriptor);
-}
-
-PyObject* FindFieldByName(PyDescriptorPool* self, PyObject* arg) {
-  Py_ssize_t name_size;
-  char* name;
-  if (PyString_AsStringAndSize(arg, &name, &name_size) < 0) {
-    return nullptr;
-  }
-
-  const FieldDescriptor* field_descriptor =
-      self->pool->FindFieldByName(StringParam(name, name_size));
-  if (field_descriptor == nullptr) {
-    return SetErrorFromCollector(self->error_collector, name, "field");
-  }
-
-
-  return PyFieldDescriptor_FromDescriptor(field_descriptor);
-}
-
-static PyObject* FindFieldByNameMethod(PyObject* self, PyObject* arg) {
-  return FindFieldByName(reinterpret_cast<PyDescriptorPool*>(self), arg);
-}
-
-PyObject* FindExtensionByName(PyDescriptorPool* self, PyObject* arg) {
-  Py_ssize_t name_size;
-  char* name;
-  if (PyString_AsStringAndSize(arg, &name, &name_size) < 0) {
-    return nullptr;
-  }
-
-  const FieldDescriptor* field_descriptor =
-      self->pool->FindExtensionByName(StringParam(name, name_size));
-  if (field_descriptor == nullptr) {
-    return SetErrorFromCollector(self->error_collector, name,
-                                 "extension field");
-  }
-
-
-  return PyFieldDescriptor_FromDescriptor(field_descriptor);
-}
-
-static PyObject* FindExtensionByNameMethod(PyObject* self, PyObject* arg) {
-  return FindExtensionByName(reinterpret_cast<PyDescriptorPool*>(self), arg);
-}
-
-PyObject* FindEnumTypeByName(PyDescriptorPool* self, PyObject* arg) {
-  Py_ssize_t name_size;
-  char* name;
-  if (PyString_AsStringAndSize(arg, &name, &name_size) < 0) {
-    return nullptr;
-  }
-
-  const EnumDescriptor* enum_descriptor =
-      self->pool->FindEnumTypeByName(StringParam(name, name_size));
-  if (enum_descriptor == nullptr) {
-    return SetErrorFromCollector(self->error_collector, name, "enum");
-  }
-
-
-  return PyEnumDescriptor_FromDescriptor(enum_descriptor);
-}
-
-static PyObject* FindEnumTypeByNameMethod(PyObject* self, PyObject* arg) {
-  return FindEnumTypeByName(reinterpret_cast<PyDescriptorPool*>(self), arg);
-}
-
-PyObject* FindOneofByName(PyDescriptorPool* self, PyObject* arg) {
-  Py_ssize_t name_size;
-  char* name;
-  if (PyString_AsStringAndSize(arg, &name, &name_size) < 0) {
-    return nullptr;
-  }
-
-  const OneofDescriptor* oneof_descriptor =
-      self->pool->FindOneofByName(StringParam(name, name_size));
-  if (oneof_descriptor == nullptr) {
-    return SetErrorFromCollector(self->error_collector, name, "oneof");
-  }
-
-
-  return PyOneofDescriptor_FromDescriptor(oneof_descriptor);
-}
-
-static PyObject* FindOneofByNameMethod(PyObject* self, PyObject* arg) {
-  return FindOneofByName(reinterpret_cast<PyDescriptorPool*>(self), arg);
-}
-
-static PyObject* FindServiceByName(PyObject* self, PyObject* arg) {
-  Py_ssize_t name_size;
-  char* name;
-  if (PyString_AsStringAndSize(arg, &name, &name_size) < 0) {
-    return nullptr;
-  }
-
-  const ServiceDescriptor* service_descriptor =
-      reinterpret_cast<PyDescriptorPool*>(self)->pool->FindServiceByName(
-          StringParam(name, name_size));
-  if (service_descriptor == nullptr) {
-    return SetErrorFromCollector(
-        reinterpret_cast<PyDescriptorPool*>(self)->error_collector, name,
-        "service");
-  }
-
-
-  return PyServiceDescriptor_FromDescriptor(service_descriptor);
-}
-
-static PyObject* FindMethodByName(PyObject* self, PyObject* arg) {
-  Py_ssize_t name_size;
-  char* name;
-  if (PyString_AsStringAndSize(arg, &name, &name_size) < 0) {
-    return nullptr;
-  }
-
-  const MethodDescriptor* method_descriptor =
-      reinterpret_cast<PyDescriptorPool*>(self)->pool->FindMethodByName(
-          StringParam(name, name_size));
-  if (method_descriptor == nullptr) {
-    return SetErrorFromCollector(
-        reinterpret_cast<PyDescriptorPool*>(self)->error_collector, name,
-        "method");
-  }
-
-
-  return PyMethodDescriptor_FromDescriptor(method_descriptor);
-}
-
-static PyObject* FindFileContainingSymbol(PyObject* self, PyObject* arg) {
-  Py_ssize_t name_size;
-  char* name;
-  if (PyString_AsStringAndSize(arg, &name, &name_size) < 0) {
-    return nullptr;
-  }
-
-  const FileDescriptor* file_descriptor =
-      reinterpret_cast<PyDescriptorPool*>(self)->pool->FindFileContainingSymbol(
-          StringParam(name, name_size));
-  if (file_descriptor == nullptr) {
-    return SetErrorFromCollector(
-        reinterpret_cast<PyDescriptorPool*>(self)->error_collector, name,
-        "symbol");
-  }
-
-
-  return PyFileDescriptor_FromDescriptor(file_descriptor);
-}
-
-static PyObject* FindExtensionByNumber(PyObject* self, PyObject* args) {
-  PyObject* message_descriptor;
-  int number;
-  if (!PyArg_ParseTuple(args, "Oi", &message_descriptor, &number)) {
-    return nullptr;
-  }
-  const Descriptor* descriptor = PyMessageDescriptor_AsDescriptor(
-      message_descriptor);
-  if (descriptor == nullptr) {
-    return nullptr;
-  }
-
-  const FieldDescriptor* extension_descriptor =
-      reinterpret_cast<PyDescriptorPool*>(self)->pool->FindExtensionByNumber(
-          descriptor, number);
-  if (extension_descriptor == nullptr) {
-    BuildFileErrorCollector* error_collector =
-        reinterpret_cast<BuildFileErrorCollector*>(
-            reinterpret_cast<PyDescriptorPool*>(self)->error_collector);
-    if (error_collector && !error_collector->error_message.empty()) {
-      PyErr_Format(PyExc_KeyError, "Couldn't build file for Extension %.d\n%s",
-                   number, error_collector->error_message.c_str());
-      error_collector->Clear();
-      return nullptr;
-    }
-    PyErr_Format(PyExc_KeyError, "Couldn't find Extension %d", number);
-    return nullptr;
-  }
-
-
-  return PyFieldDescriptor_FromDescriptor(extension_descriptor);
-}
-
-static PyObject* FindAllExtensions(PyObject* self, PyObject* arg) {
-  const Descriptor* descriptor = PyMessageDescriptor_AsDescriptor(arg);
-  if (descriptor == nullptr) {
-    return nullptr;
-  }
-
-  std::vector<const FieldDescriptor*> extensions;
-  reinterpret_cast<PyDescriptorPool*>(self)->pool->FindAllExtensions(
-      descriptor, &extensions);
-
-  ScopedPyObjectPtr result(PyList_New(extensions.size()));
-  if (result == nullptr) {
-    return nullptr;
-  }
-  for (int i = 0; i < extensions.size(); i++) {
-    PyObject* extension = PyFieldDescriptor_FromDescriptor(extensions[i]);
-    if (extension == nullptr) {
-      return nullptr;
-    }
-    PyList_SET_ITEM(result.get(), i, extension);  // Steals the reference.
-  }
-  return result.release();
-}
-
-// These functions should not exist -- the only valid way to create
-// descriptors is to call Add() or AddSerializedFile().
-// But these AddDescriptor() functions were created in Python and some people
-// call them, so we support them for now for compatibility.
-// However we do check that the existing descriptor already exists in the pool,
-// which appears to always be true for existing calls -- but then why do people
-// call a function that will just be a no-op?
-// TODO(amauryfa): Need to investigate further.
-
-static PyObject* AddFileDescriptor(PyObject* self, PyObject* descriptor) {
-  const FileDescriptor* file_descriptor =
-      PyFileDescriptor_AsDescriptor(descriptor);
-  if (!file_descriptor) {
-    return nullptr;
-  }
-  if (file_descriptor !=
-      reinterpret_cast<PyDescriptorPool*>(self)->pool->FindFileByName(
-          file_descriptor->name())) {
-    PyErr_Format(PyExc_ValueError,
-                 "The file descriptor %s does not belong to this pool",
-                 file_descriptor->name().c_str());
-    return nullptr;
-  }
-  Py_RETURN_NONE;
-}
-
-static PyObject* AddDescriptor(PyObject* self, PyObject* descriptor) {
-  const Descriptor* message_descriptor =
-      PyMessageDescriptor_AsDescriptor(descriptor);
-  if (!message_descriptor) {
-    return nullptr;
-  }
-  if (message_descriptor !=
-      reinterpret_cast<PyDescriptorPool*>(self)->pool->FindMessageTypeByName(
-          message_descriptor->full_name())) {
-    PyErr_Format(PyExc_ValueError,
-                 "The message descriptor %s does not belong to this pool",
-                 message_descriptor->full_name().c_str());
-    return nullptr;
-  }
-  Py_RETURN_NONE;
-}
-
-static PyObject* AddEnumDescriptor(PyObject* self, PyObject* descriptor) {
-  const EnumDescriptor* enum_descriptor =
-      PyEnumDescriptor_AsDescriptor(descriptor);
-  if (!enum_descriptor) {
-    return nullptr;
-  }
-  if (enum_descriptor !=
-      reinterpret_cast<PyDescriptorPool*>(self)->pool->FindEnumTypeByName(
-          enum_descriptor->full_name())) {
-    PyErr_Format(PyExc_ValueError,
-                 "The enum descriptor %s does not belong to this pool",
-                 enum_descriptor->full_name().c_str());
-    return nullptr;
-  }
-  Py_RETURN_NONE;
-}
-
-static PyObject* AddExtensionDescriptor(PyObject* self, PyObject* descriptor) {
-  const FieldDescriptor* extension_descriptor =
-      PyFieldDescriptor_AsDescriptor(descriptor);
-  if (!extension_descriptor) {
-    return nullptr;
-  }
-  if (extension_descriptor !=
-      reinterpret_cast<PyDescriptorPool*>(self)->pool->FindExtensionByName(
-          extension_descriptor->full_name())) {
-    PyErr_Format(PyExc_ValueError,
-                 "The extension descriptor %s does not belong to this pool",
-                 extension_descriptor->full_name().c_str());
-    return nullptr;
-  }
-  Py_RETURN_NONE;
-}
-
-static PyObject* AddServiceDescriptor(PyObject* self, PyObject* descriptor) {
-  const ServiceDescriptor* service_descriptor =
-      PyServiceDescriptor_AsDescriptor(descriptor);
-  if (!service_descriptor) {
-    return nullptr;
-  }
-  if (service_descriptor !=
-      reinterpret_cast<PyDescriptorPool*>(self)->pool->FindServiceByName(
-          service_descriptor->full_name())) {
-    PyErr_Format(PyExc_ValueError,
-                 "The service descriptor %s does not belong to this pool",
-                 service_descriptor->full_name().c_str());
-    return nullptr;
-  }
-  Py_RETURN_NONE;
-}
-
-// The code below loads new Descriptors from a serialized FileDescriptorProto.
-static PyObject* AddSerializedFile(PyObject* pself, PyObject* serialized_pb) {
-  PyDescriptorPool* self = reinterpret_cast<PyDescriptorPool*>(pself);
-  char* message_type;
-  Py_ssize_t message_len;
-
-  if (self->database != nullptr) {
-    PyErr_SetString(
-        PyExc_ValueError,
-        "Cannot call Add on a DescriptorPool that uses a DescriptorDatabase. "
-        "Add your file to the underlying database.");
-    return nullptr;
-  }
-  if (!self->is_mutable) {
-    PyErr_SetString(
-        PyExc_ValueError,
-        "This DescriptorPool is not mutable and cannot add new definitions.");
-    return nullptr;
-  }
-
-  if (PyBytes_AsStringAndSize(serialized_pb, &message_type, &message_len) < 0) {
-    return nullptr;
-  }
-
-  FileDescriptorProto file_proto;
-  if (!file_proto.ParseFromArray(message_type, message_len)) {
-    PyErr_SetString(PyExc_TypeError, "Couldn't parse file content!");
-    return nullptr;
-  }
-
-  // If the file was already part of a C++ library, all its descriptors are in
-  // the underlying pool.  No need to do anything else.
-  const FileDescriptor* generated_file = nullptr;
-  if (self->underlay) {
-    generated_file = self->underlay->FindFileByName(file_proto.name());
-  }
-  if (generated_file != nullptr) {
-    return PyFileDescriptor_FromDescriptorWithSerializedPb(
-        generated_file, serialized_pb);
-  }
-
-  BuildFileErrorCollector error_collector;
-  const FileDescriptor* descriptor =
-      // Pool is mutable, we can remove the "const".
-      const_cast<DescriptorPool*>(self->pool)
-          ->BuildFileCollectingErrors(file_proto, &error_collector);
-  if (descriptor == nullptr) {
-    PyErr_Format(PyExc_TypeError,
-                 "Couldn't build proto file into descriptor pool!\n%s",
-                 error_collector.error_message.c_str());
-    return nullptr;
-  }
-
-
-  return PyFileDescriptor_FromDescriptorWithSerializedPb(
-      descriptor, serialized_pb);
-}
-
-static PyObject* Add(PyObject* self, PyObject* file_descriptor_proto) {
-  ScopedPyObjectPtr serialized_pb(
-      PyObject_CallMethod(file_descriptor_proto, "SerializeToString", nullptr));
-  if (serialized_pb == nullptr) {
-    return nullptr;
-  }
-  return AddSerializedFile(self, serialized_pb.get());
-}
-
-static PyMethodDef Methods[] = {
-    {"Add", Add, METH_O,
-     "Adds the FileDescriptorProto and its types to this pool."},
-    {"AddSerializedFile", AddSerializedFile, METH_O,
-     "Adds a serialized FileDescriptorProto to this pool."},
-
-    // TODO(amauryfa): Understand why the Python implementation differs from
-    // this one, ask users to use another API and deprecate these functions.
-    {"AddFileDescriptor", AddFileDescriptor, METH_O,
-     "No-op. Add() must have been called before."},
-    {"AddDescriptor", AddDescriptor, METH_O,
-     "No-op. Add() must have been called before."},
-    {"AddEnumDescriptor", AddEnumDescriptor, METH_O,
-     "No-op. Add() must have been called before."},
-    {"AddExtensionDescriptor", AddExtensionDescriptor, METH_O,
-     "No-op. Add() must have been called before."},
-    {"AddServiceDescriptor", AddServiceDescriptor, METH_O,
-     "No-op. Add() must have been called before."},
-
-    {"FindFileByName", FindFileByName, METH_O,
-     "Searches for a file descriptor by its .proto name."},
-    {"FindMessageTypeByName", FindMessageByName, METH_O,
-     "Searches for a message descriptor by full name."},
-    {"FindFieldByName", FindFieldByNameMethod, METH_O,
-     "Searches for a field descriptor by full name."},
-    {"FindExtensionByName", FindExtensionByNameMethod, METH_O,
-     "Searches for extension descriptor by full name."},
-    {"FindEnumTypeByName", FindEnumTypeByNameMethod, METH_O,
-     "Searches for enum type descriptor by full name."},
-    {"FindOneofByName", FindOneofByNameMethod, METH_O,
-     "Searches for oneof descriptor by full name."},
-    {"FindServiceByName", FindServiceByName, METH_O,
-     "Searches for service descriptor by full name."},
-    {"FindMethodByName", FindMethodByName, METH_O,
-     "Searches for method descriptor by full name."},
-
-    {"FindFileContainingSymbol", FindFileContainingSymbol, METH_O,
-     "Gets the FileDescriptor containing the specified symbol."},
-    {"FindExtensionByNumber", FindExtensionByNumber, METH_VARARGS,
-     "Gets the extension descriptor for the given number."},
-    {"FindAllExtensions", FindAllExtensions, METH_O,
-     "Gets all known extensions of the given message descriptor."},
-    {nullptr},
-};
-
-}  // namespace cdescriptor_pool
-
-PyTypeObject PyDescriptorPool_Type = {
-    PyVarObject_HEAD_INIT(&PyType_Type, 0) FULL_MODULE_NAME
-    ".DescriptorPool",          // tp_name
-    sizeof(PyDescriptorPool),   // tp_basicsize
-    0,                          // tp_itemsize
-    cdescriptor_pool::Dealloc,  // tp_dealloc
-#if PY_VERSION_HEX < 0x03080000
-    nullptr,  // tp_print
-#else
-    0,  // tp_vectorcall_offset
-#endif
-    nullptr,                                  // tp_getattr
-    nullptr,                                  // tp_setattr
-    nullptr,                                  // tp_compare
-    nullptr,                                  // tp_repr
-    nullptr,                                  // tp_as_number
-    nullptr,                                  // tp_as_sequence
-    nullptr,                                  // tp_as_mapping
-    nullptr,                                  // tp_hash
-    nullptr,                                  // tp_call
-    nullptr,                                  // tp_str
-    nullptr,                                  // tp_getattro
-    nullptr,                                  // tp_setattro
-    nullptr,                                  // tp_as_buffer
-    Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC,  // tp_flags
-    "A Descriptor Pool",                      // tp_doc
-    cdescriptor_pool::GcTraverse,             // tp_traverse
-    cdescriptor_pool::GcClear,                // tp_clear
-    nullptr,                                  // tp_richcompare
-    0,                                        // tp_weaklistoffset
-    nullptr,                                  // tp_iter
-    nullptr,                                  // tp_iternext
-    cdescriptor_pool::Methods,                // tp_methods
-    nullptr,                                  // tp_members
-    nullptr,                                  // tp_getset
-    nullptr,                                  // tp_base
-    nullptr,                                  // tp_dict
-    nullptr,                                  // tp_descr_get
-    nullptr,                                  // tp_descr_set
-    0,                                        // tp_dictoffset
-    nullptr,                                  // tp_init
-    nullptr,                                  // tp_alloc
-    cdescriptor_pool::New,                    // tp_new
-    PyObject_GC_Del,                          // tp_free
-};
-
-// This is the DescriptorPool which contains all the definitions from the
-// generated _pb2.py modules.
-static PyDescriptorPool* python_generated_pool = nullptr;
-
-bool InitDescriptorPool() {
-  if (PyType_Ready(&PyDescriptorPool_Type) < 0)
-    return false;
-
-  // The Pool of messages declared in Python libraries.
-  // generated_pool() contains all messages already linked in C++ libraries, and
-  // is used as underlay.
-  descriptor_pool_map =
-      new std::unordered_map<const DescriptorPool*, PyDescriptorPool*>;
-  python_generated_pool = cdescriptor_pool::PyDescriptorPool_NewWithUnderlay(
-      DescriptorPool::generated_pool());
-  if (python_generated_pool == nullptr) {
-    delete descriptor_pool_map;
-    return false;
-  }
-
-  // Register this pool to be found for C++-generated descriptors.
-  descriptor_pool_map->insert(
-      std::make_pair(DescriptorPool::generated_pool(),
-                     python_generated_pool));
-
-  return true;
-}
-
-// The default DescriptorPool used everywhere in this module.
-// Today it's the python_generated_pool.
-// TODO(amauryfa): Remove all usages of this function: the pool should be
-// derived from the context.
-PyDescriptorPool* GetDefaultDescriptorPool() {
-  return python_generated_pool;
-}
-
-PyDescriptorPool* GetDescriptorPool_FromPool(const DescriptorPool* pool) {
-  // Fast path for standard descriptors.
-  if (pool == python_generated_pool->pool ||
-      pool == DescriptorPool::generated_pool()) {
-    return python_generated_pool;
-  }
-  std::unordered_map<const DescriptorPool*, PyDescriptorPool*>::iterator it =
-      descriptor_pool_map->find(pool);
-  if (it == descriptor_pool_map->end()) {
-    PyErr_SetString(PyExc_KeyError, "Unknown descriptor pool");
-    return nullptr;
-  }
-  return it->second;
-}
-
-PyObject* PyDescriptorPool_FromPool(const DescriptorPool* pool) {
-  PyDescriptorPool* existing_pool = GetDescriptorPool_FromPool(pool);
-  if (existing_pool != nullptr) {
-    Py_INCREF(existing_pool);
-    return reinterpret_cast<PyObject*>(existing_pool);
-  } else {
-    PyErr_Clear();
-  }
-
-  PyDescriptorPool* cpool = cdescriptor_pool::_CreateDescriptorPool();
-  if (cpool == nullptr) {
-    return nullptr;
-  }
-  cpool->pool = const_cast<DescriptorPool*>(pool);
-  cpool->is_owned = false;
-  cpool->is_mutable = false;
-  cpool->underlay = nullptr;
-
-  if (!descriptor_pool_map->insert(std::make_pair(cpool->pool, cpool)).second) {
-    // Should never happen -- We already checked the existence above.
-    PyErr_SetString(PyExc_ValueError, "DescriptorPool already registered");
-    return nullptr;
-  }
-
-  return reinterpret_cast<PyObject*>(cpool);
-}
-
-}  // namespace python
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/python/google/protobuf/pyext/descriptor_pool.h b/libs/protobuf/python/google/protobuf/pyext/descriptor_pool.h
deleted file mode 100644
index 5d3c3a9..0000000
--- a/libs/protobuf/python/google/protobuf/pyext/descriptor_pool.h
+++ /dev/null
@@ -1,149 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef GOOGLE_PROTOBUF_PYTHON_CPP_DESCRIPTOR_POOL_H__
-#define GOOGLE_PROTOBUF_PYTHON_CPP_DESCRIPTOR_POOL_H__
-
-#define PY_SSIZE_T_CLEAN
-#include <Python.h>
-
-#include <unordered_map>
-#include <google/protobuf/descriptor.h>
-
-namespace google {
-namespace protobuf {
-namespace python {
-
-struct PyMessageFactory;
-
-// The (meta) type of all Messages classes.
-struct CMessageClass;
-
-// Wraps operations to the global DescriptorPool which contains information
-// about all messages and fields.
-//
-// There is normally one pool per process. We make it a Python object only
-// because it contains many Python references.
-//
-// "Methods" that interacts with this DescriptorPool are in the cdescriptor_pool
-// namespace.
-typedef struct PyDescriptorPool {
-  PyObject_HEAD;
-
-  // The C++ pool containing Descriptors.
-  const DescriptorPool* pool;
-
-  // True if we should free the pointer above.
-  bool is_owned;
-
-  // True if this pool accepts new proto definitions.
-  // In this case it is allowed to const_cast<DescriptorPool*>(pool).
-  bool is_mutable;
-
-
-  // The error collector to store error info. Can be NULL. This pointer is
-  // owned.
-  DescriptorPool::ErrorCollector* error_collector;
-
-  // The C++ pool acting as an underlay. Can be NULL.
-  // This pointer is not owned and must stay alive.
-  const DescriptorPool* underlay;
-
-  // The C++ descriptor database used to fetch unknown protos. Can be NULL.
-  // This pointer is owned.
-  const DescriptorDatabase* database;
-
-  // The preferred MessageFactory to be used by descriptors.
-  // TODO(amauryfa): Don't create the Factory from the DescriptorPool, but
-  // use the one passed while creating message classes. And remove this member.
-  PyMessageFactory* py_message_factory;
-
-  // Cache the options for any kind of descriptor.
-  // Descriptor pointers are owned by the DescriptorPool above.
-  // Python objects are owned by the map.
-  std::unordered_map<const void*, PyObject*>* descriptor_options;
-} PyDescriptorPool;
-
-
-extern PyTypeObject PyDescriptorPool_Type;
-
-namespace cdescriptor_pool {
-
-
-// The functions below are also exposed as methods of the DescriptorPool type.
-
-// Looks up a field by name. Returns a PyFieldDescriptor corresponding to
-// the field on success, or NULL on failure.
-//
-// Returns a new reference.
-PyObject* FindFieldByName(PyDescriptorPool* self, PyObject* name);
-
-// Looks up an extension by name. Returns a PyFieldDescriptor corresponding
-// to the field on success, or NULL on failure.
-//
-// Returns a new reference.
-PyObject* FindExtensionByName(PyDescriptorPool* self, PyObject* arg);
-
-// Looks up an enum type by name. Returns a PyEnumDescriptor corresponding
-// to the field on success, or NULL on failure.
-//
-// Returns a new reference.
-PyObject* FindEnumTypeByName(PyDescriptorPool* self, PyObject* arg);
-
-// Looks up a oneof by name. Returns a COneofDescriptor corresponding
-// to the oneof on success, or NULL on failure.
-//
-// Returns a new reference.
-PyObject* FindOneofByName(PyDescriptorPool* self, PyObject* arg);
-
-}  // namespace cdescriptor_pool
-
-// Retrieves the global descriptor pool owned by the _message module.
-// This is the one used by pb2.py generated modules.
-// Returns a *borrowed* reference.
-// "Default" pool used to register messages from _pb2.py modules.
-PyDescriptorPool* GetDefaultDescriptorPool();
-
-// Retrieves an existing python descriptor pool owning the C++ descriptor pool.
-// Returns a *borrowed* reference.
-PyDescriptorPool* GetDescriptorPool_FromPool(const DescriptorPool* pool);
-
-// Wraps a C++ descriptor pool in a Python object, creates it if necessary.
-// Returns a new reference.
-PyObject* PyDescriptorPool_FromPool(const DescriptorPool* pool);
-
-// Initialize objects used by this module.
-bool InitDescriptorPool();
-
-}  // namespace python
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // GOOGLE_PROTOBUF_PYTHON_CPP_DESCRIPTOR_POOL_H__
diff --git a/libs/protobuf/python/google/protobuf/pyext/extension_dict.cc b/libs/protobuf/python/google/protobuf/pyext/extension_dict.cc
deleted file mode 100644
index 66703da..0000000
--- a/libs/protobuf/python/google/protobuf/pyext/extension_dict.cc
+++ /dev/null
@@ -1,484 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: anuraag@google.com (Anuraag Agrawal)
-// Author: tibell@google.com (Johan Tibell)
-
-#include <google/protobuf/pyext/extension_dict.h>
-
-#include <cstdint>
-#include <memory>
-
-#include <google/protobuf/stubs/logging.h>
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/descriptor.pb.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/dynamic_message.h>
-#include <google/protobuf/message.h>
-#include <google/protobuf/pyext/descriptor.h>
-#include <google/protobuf/pyext/message.h>
-#include <google/protobuf/pyext/message_factory.h>
-#include <google/protobuf/pyext/repeated_composite_container.h>
-#include <google/protobuf/pyext/repeated_scalar_container.h>
-#include <google/protobuf/pyext/scoped_pyobject_ptr.h>
-
-#define PyString_AsStringAndSize(ob, charpp, sizep)              \
-  (PyUnicode_Check(ob)                                           \
-       ? ((*(charpp) = const_cast<char*>(                        \
-               PyUnicode_AsUTF8AndSize(ob, (sizep)))) == nullptr \
-              ? -1                                               \
-              : 0)                                               \
-       : PyBytes_AsStringAndSize(ob, (charpp), (sizep)))
-
-namespace google {
-namespace protobuf {
-namespace python {
-
-namespace extension_dict {
-
-static Py_ssize_t len(ExtensionDict* self) {
-  Py_ssize_t size = 0;
-  std::vector<const FieldDescriptor*> fields;
-  self->parent->message->GetReflection()->ListFields(*self->parent->message,
-                                                     &fields);
-
-  for (size_t i = 0; i < fields.size(); ++i) {
-    if (fields[i]->is_extension()) {
-      // With C++ descriptors, the field can always be retrieved, but for
-      // unknown extensions which have not been imported in Python code, there
-      // is no message class and we cannot retrieve the value.
-      // ListFields() has the same behavior.
-      if (fields[i]->message_type() != nullptr &&
-          message_factory::GetMessageClass(
-              cmessage::GetFactoryForMessage(self->parent),
-              fields[i]->message_type()) == nullptr) {
-        PyErr_Clear();
-        continue;
-      }
-      ++size;
-    }
-  }
-  return size;
-}
-
-struct ExtensionIterator {
-  PyObject_HEAD;
-  Py_ssize_t index;
-  std::vector<const FieldDescriptor*> fields;
-
-  // Owned reference, to keep the FieldDescriptors alive.
-  ExtensionDict* extension_dict;
-};
-
-PyObject* GetIter(PyObject* _self) {
-  ExtensionDict* self = reinterpret_cast<ExtensionDict*>(_self);
-
-  ScopedPyObjectPtr obj(PyType_GenericAlloc(&ExtensionIterator_Type, 0));
-  if (obj == nullptr) {
-    return PyErr_Format(PyExc_MemoryError,
-                        "Could not allocate extension iterator");
-  }
-
-  ExtensionIterator* iter = reinterpret_cast<ExtensionIterator*>(obj.get());
-
-  // Call "placement new" to initialize. So the constructor of
-  // std::vector<...> fields will be called.
-  new (iter) ExtensionIterator;
-
-  self->parent->message->GetReflection()->ListFields(*self->parent->message,
-                                                     &iter->fields);
-  iter->index = 0;
-  Py_INCREF(self);
-  iter->extension_dict = self;
-
-  return obj.release();
-}
-
-static void DeallocExtensionIterator(PyObject* _self) {
-  ExtensionIterator* self = reinterpret_cast<ExtensionIterator*>(_self);
-  self->fields.clear();
-  Py_XDECREF(self->extension_dict);
-  self->~ExtensionIterator();
-  Py_TYPE(_self)->tp_free(_self);
-}
-
-PyObject* subscript(ExtensionDict* self, PyObject* key) {
-  const FieldDescriptor* descriptor = cmessage::GetExtensionDescriptor(key);
-  if (descriptor == nullptr) {
-    return nullptr;
-  }
-  if (!CheckFieldBelongsToMessage(descriptor, self->parent->message)) {
-    return nullptr;
-  }
-
-  if (descriptor->label() != FieldDescriptor::LABEL_REPEATED &&
-      descriptor->cpp_type() != FieldDescriptor::CPPTYPE_MESSAGE) {
-    return cmessage::InternalGetScalar(self->parent->message, descriptor);
-  }
-
-  CMessage::CompositeFieldsMap::iterator iterator =
-      self->parent->composite_fields->find(descriptor);
-  if (iterator != self->parent->composite_fields->end()) {
-    Py_INCREF(iterator->second);
-    return iterator->second->AsPyObject();
-  }
-
-  if (descriptor->label() != FieldDescriptor::LABEL_REPEATED &&
-      descriptor->cpp_type() == FieldDescriptor::CPPTYPE_MESSAGE) {
-    // TODO(plabatut): consider building the class on the fly!
-    ContainerBase* sub_message = cmessage::InternalGetSubMessage(
-        self->parent, descriptor);
-    if (sub_message == nullptr) {
-      return nullptr;
-    }
-    (*self->parent->composite_fields)[descriptor] = sub_message;
-    return sub_message->AsPyObject();
-  }
-
-  if (descriptor->label() == FieldDescriptor::LABEL_REPEATED) {
-    if (descriptor->cpp_type() == FieldDescriptor::CPPTYPE_MESSAGE) {
-      // On the fly message class creation is needed to support the following
-      // situation:
-      // 1- add FileDescriptor to the pool that contains extensions of a message
-      //    defined by another proto file. Do not create any message classes.
-      // 2- instantiate an extended message, and access the extension using
-      //    the field descriptor.
-      // 3- the extension submessage fails to be returned, because no class has
-      //    been created.
-      // It happens when deserializing text proto format, or when enumerating
-      // fields of a deserialized message.
-      CMessageClass* message_class = message_factory::GetOrCreateMessageClass(
-          cmessage::GetFactoryForMessage(self->parent),
-          descriptor->message_type());
-      ScopedPyObjectPtr message_class_handler(
-        reinterpret_cast<PyObject*>(message_class));
-      if (message_class == nullptr) {
-        return nullptr;
-      }
-      ContainerBase* py_container = repeated_composite_container::NewContainer(
-          self->parent, descriptor, message_class);
-      if (py_container == nullptr) {
-        return nullptr;
-      }
-      (*self->parent->composite_fields)[descriptor] = py_container;
-      return py_container->AsPyObject();
-    } else {
-      ContainerBase* py_container = repeated_scalar_container::NewContainer(
-          self->parent, descriptor);
-      if (py_container == nullptr) {
-        return nullptr;
-      }
-      (*self->parent->composite_fields)[descriptor] = py_container;
-      return py_container->AsPyObject();
-    }
-  }
-  PyErr_SetString(PyExc_ValueError, "control reached unexpected line");
-  return nullptr;
-}
-
-int ass_subscript(ExtensionDict* self, PyObject* key, PyObject* value) {
-  const FieldDescriptor* descriptor = cmessage::GetExtensionDescriptor(key);
-  if (descriptor == nullptr) {
-    return -1;
-  }
-  if (!CheckFieldBelongsToMessage(descriptor, self->parent->message)) {
-    return -1;
-  }
-
-  if (value == nullptr) {
-    return cmessage::ClearFieldByDescriptor(self->parent, descriptor);
-  }
-
-  if (descriptor->label() != FieldDescriptor::LABEL_OPTIONAL ||
-      descriptor->cpp_type() == FieldDescriptor::CPPTYPE_MESSAGE) {
-    PyErr_SetString(PyExc_TypeError, "Extension is repeated and/or composite "
-                    "type");
-    return -1;
-  }
-  cmessage::AssureWritable(self->parent);
-  if (cmessage::InternalSetScalar(self->parent, descriptor, value) < 0) {
-    return -1;
-  }
-  return 0;
-}
-
-PyObject* _FindExtensionByName(ExtensionDict* self, PyObject* arg) {
-  char* name;
-  Py_ssize_t name_size;
-  if (PyString_AsStringAndSize(arg, &name, &name_size) < 0) {
-    return nullptr;
-  }
-
-  PyDescriptorPool* pool = cmessage::GetFactoryForMessage(self->parent)->pool;
-  const FieldDescriptor* message_extension =
-      pool->pool->FindExtensionByName(StringParam(name, name_size));
-  if (message_extension == nullptr) {
-    // Is is the name of a message set extension?
-    const Descriptor* message_descriptor =
-        pool->pool->FindMessageTypeByName(StringParam(name, name_size));
-    if (message_descriptor && message_descriptor->extension_count() > 0) {
-      const FieldDescriptor* extension = message_descriptor->extension(0);
-      if (extension->is_extension() &&
-          extension->containing_type()->options().message_set_wire_format() &&
-          extension->type() == FieldDescriptor::TYPE_MESSAGE &&
-          extension->label() == FieldDescriptor::LABEL_OPTIONAL) {
-        message_extension = extension;
-      }
-    }
-  }
-  if (message_extension == nullptr) {
-    Py_RETURN_NONE;
-  }
-
-  return PyFieldDescriptor_FromDescriptor(message_extension);
-}
-
-PyObject* _FindExtensionByNumber(ExtensionDict* self, PyObject* arg) {
-  int64_t number = PyLong_AsLong(arg);
-  if (number == -1 && PyErr_Occurred()) {
-    return nullptr;
-  }
-
-  PyDescriptorPool* pool = cmessage::GetFactoryForMessage(self->parent)->pool;
-  const FieldDescriptor* message_extension = pool->pool->FindExtensionByNumber(
-      self->parent->message->GetDescriptor(), number);
-  if (message_extension == nullptr) {
-    Py_RETURN_NONE;
-  }
-
-  return PyFieldDescriptor_FromDescriptor(message_extension);
-}
-
-static int Contains(PyObject* _self, PyObject* key) {
-  ExtensionDict* self = reinterpret_cast<ExtensionDict*>(_self);
-  const FieldDescriptor* field_descriptor =
-      cmessage::GetExtensionDescriptor(key);
-  if (field_descriptor == nullptr) {
-    return -1;
-  }
-
-  if (!field_descriptor->is_extension()) {
-    PyErr_Format(PyExc_KeyError, "%s is not an extension",
-                 field_descriptor->full_name().c_str());
-    return -1;
-  }
-
-  const Message* message = self->parent->message;
-  const Reflection* reflection = message->GetReflection();
-  if (field_descriptor->is_repeated()) {
-    if (reflection->FieldSize(*message, field_descriptor) > 0) {
-      return 1;
-    }
-  } else {
-    if (reflection->HasField(*message, field_descriptor)) {
-      return 1;
-    }
-  }
-
-  return 0;
-}
-
-ExtensionDict* NewExtensionDict(CMessage *parent) {
-  ExtensionDict* self = reinterpret_cast<ExtensionDict*>(
-      PyType_GenericAlloc(&ExtensionDict_Type, 0));
-  if (self == nullptr) {
-    return nullptr;
-  }
-
-  Py_INCREF(parent);
-  self->parent = parent;
-  return self;
-}
-
-void dealloc(PyObject* pself) {
-  ExtensionDict* self = reinterpret_cast<ExtensionDict*>(pself);
-  Py_CLEAR(self->parent);
-  Py_TYPE(self)->tp_free(reinterpret_cast<PyObject*>(self));
-}
-
-static PyObject* RichCompare(ExtensionDict* self, PyObject* other, int opid) {
-  // Only equality comparisons are implemented.
-  if (opid != Py_EQ && opid != Py_NE) {
-    Py_INCREF(Py_NotImplemented);
-    return Py_NotImplemented;
-  }
-  bool equals = false;
-  if (PyObject_TypeCheck(other, &ExtensionDict_Type)) {
-    equals = self->parent == reinterpret_cast<ExtensionDict*>(other)->parent;
-  }
-  if (equals ^ (opid == Py_EQ)) {
-    Py_RETURN_FALSE;
-  } else {
-    Py_RETURN_TRUE;
-  }
-}
-static PySequenceMethods SeqMethods = {
-    (lenfunc)len,          // sq_length
-    nullptr,               // sq_concat
-    nullptr,               // sq_repeat
-    nullptr,               // sq_item
-    nullptr,               // sq_slice
-    nullptr,               // sq_ass_item
-    nullptr,               // sq_ass_slice
-    (objobjproc)Contains,  // sq_contains
-};
-
-static PyMappingMethods MpMethods = {
-  (lenfunc)len,                /* mp_length */
-  (binaryfunc)subscript,       /* mp_subscript */
-  (objobjargproc)ass_subscript,/* mp_ass_subscript */
-};
-
-#define EDMETHOD(name, args, doc) { #name, (PyCFunction)name, args, doc }
-static PyMethodDef Methods[] = {
-    EDMETHOD(_FindExtensionByName, METH_O, "Finds an extension by name."),
-    EDMETHOD(_FindExtensionByNumber, METH_O,
-             "Finds an extension by field number."),
-    {nullptr, nullptr},
-};
-
-}  // namespace extension_dict
-
-PyTypeObject ExtensionDict_Type = {
-    PyVarObject_HEAD_INIT(&PyType_Type, 0)  //
-    FULL_MODULE_NAME ".ExtensionDict",      // tp_name
-    sizeof(ExtensionDict),                  // tp_basicsize
-    0,                                      //  tp_itemsize
-    (destructor)extension_dict::dealloc,    //  tp_dealloc
-#if PY_VERSION_HEX < 0x03080000
-    nullptr,  // tp_print
-#else
-    0,  // tp_vectorcall_offset
-#endif
-    nullptr,                                   //  tp_getattr
-    nullptr,                                   //  tp_setattr
-    nullptr,                                   //  tp_compare
-    nullptr,                                   //  tp_repr
-    nullptr,                                   //  tp_as_number
-    &extension_dict::SeqMethods,               //  tp_as_sequence
-    &extension_dict::MpMethods,                //  tp_as_mapping
-    PyObject_HashNotImplemented,               //  tp_hash
-    nullptr,                                   //  tp_call
-    nullptr,                                   //  tp_str
-    nullptr,                                   //  tp_getattro
-    nullptr,                                   //  tp_setattro
-    nullptr,                                   //  tp_as_buffer
-    Py_TPFLAGS_DEFAULT,                        //  tp_flags
-    "An extension dict",                       //  tp_doc
-    nullptr,                                   //  tp_traverse
-    nullptr,                                   //  tp_clear
-    (richcmpfunc)extension_dict::RichCompare,  //  tp_richcompare
-    0,                                         //  tp_weaklistoffset
-    extension_dict::GetIter,                   //  tp_iter
-    nullptr,                                   //  tp_iternext
-    extension_dict::Methods,                   //  tp_methods
-    nullptr,                                   //  tp_members
-    nullptr,                                   //  tp_getset
-    nullptr,                                   //  tp_base
-    nullptr,                                   //  tp_dict
-    nullptr,                                   //  tp_descr_get
-    nullptr,                                   //  tp_descr_set
-    0,                                         //  tp_dictoffset
-    nullptr,                                   //  tp_init
-};
-
-PyObject* IterNext(PyObject* _self) {
-  extension_dict::ExtensionIterator* self =
-      reinterpret_cast<extension_dict::ExtensionIterator*>(_self);
-  Py_ssize_t total_size = self->fields.size();
-  Py_ssize_t index = self->index;
-  while (self->index < total_size) {
-    index = self->index;
-    ++self->index;
-    if (self->fields[index]->is_extension()) {
-      // With C++ descriptors, the field can always be retrieved, but for
-      // unknown extensions which have not been imported in Python code, there
-      // is no message class and we cannot retrieve the value.
-      // ListFields() has the same behavior.
-      if (self->fields[index]->message_type() != nullptr &&
-          message_factory::GetMessageClass(
-              cmessage::GetFactoryForMessage(self->extension_dict->parent),
-              self->fields[index]->message_type()) == nullptr) {
-        PyErr_Clear();
-        continue;
-      }
-
-      return PyFieldDescriptor_FromDescriptor(self->fields[index]);
-    }
-  }
-
-  return nullptr;
-}
-
-PyTypeObject ExtensionIterator_Type = {
-    PyVarObject_HEAD_INIT(&PyType_Type, 0)      //
-    FULL_MODULE_NAME ".ExtensionIterator",      //  tp_name
-    sizeof(extension_dict::ExtensionIterator),  //  tp_basicsize
-    0,                                          //  tp_itemsize
-    extension_dict::DeallocExtensionIterator,   //  tp_dealloc
-#if PY_VERSION_HEX < 0x03080000
-    nullptr,  // tp_print
-#else
-    0,  // tp_vectorcall_offset
-#endif
-    nullptr,                  //  tp_getattr
-    nullptr,                  //  tp_setattr
-    nullptr,                  //  tp_compare
-    nullptr,                  //  tp_repr
-    nullptr,                  //  tp_as_number
-    nullptr,                  //  tp_as_sequence
-    nullptr,                  //  tp_as_mapping
-    nullptr,                  //  tp_hash
-    nullptr,                  //  tp_call
-    nullptr,                  //  tp_str
-    nullptr,                  //  tp_getattro
-    nullptr,                  //  tp_setattro
-    nullptr,                  //  tp_as_buffer
-    Py_TPFLAGS_DEFAULT,       //  tp_flags
-    "A scalar map iterator",  //  tp_doc
-    nullptr,                  //  tp_traverse
-    nullptr,                  //  tp_clear
-    nullptr,                  //  tp_richcompare
-    0,                        //  tp_weaklistoffset
-    PyObject_SelfIter,        //  tp_iter
-    IterNext,                 //  tp_iternext
-    nullptr,                  //  tp_methods
-    nullptr,                  //  tp_members
-    nullptr,                  //  tp_getset
-    nullptr,                  //  tp_base
-    nullptr,                  //  tp_dict
-    nullptr,                  //  tp_descr_get
-    nullptr,                  //  tp_descr_set
-    0,                        //  tp_dictoffset
-    nullptr,                  //  tp_init
-};
-}  // namespace python
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/python/google/protobuf/pyext/extension_dict.h b/libs/protobuf/python/google/protobuf/pyext/extension_dict.h
deleted file mode 100644
index 86d2451..0000000
--- a/libs/protobuf/python/google/protobuf/pyext/extension_dict.h
+++ /dev/null
@@ -1,70 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: anuraag@google.com (Anuraag Agrawal)
-// Author: tibell@google.com (Johan Tibell)
-
-#ifndef GOOGLE_PROTOBUF_PYTHON_CPP_EXTENSION_DICT_H__
-#define GOOGLE_PROTOBUF_PYTHON_CPP_EXTENSION_DICT_H__
-
-#define PY_SSIZE_T_CLEAN
-#include <Python.h>
-
-#include <google/protobuf/pyext/message.h>
-
-namespace google {
-namespace protobuf {
-
-class Message;
-class FieldDescriptor;
-
-namespace python {
-
-typedef struct ExtensionDict {
-  PyObject_HEAD;
-
-  // Strong, owned reference to the parent message. Never NULL.
-  CMessage* parent;
-} ExtensionDict;
-
-extern PyTypeObject ExtensionDict_Type;
-extern PyTypeObject ExtensionIterator_Type;
-
-namespace extension_dict {
-
-// Builds an Extensions dict for a specific message.
-ExtensionDict* NewExtensionDict(CMessage *parent);
-
-}  // namespace extension_dict
-}  // namespace python
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // GOOGLE_PROTOBUF_PYTHON_CPP_EXTENSION_DICT_H__
diff --git a/libs/protobuf/python/google/protobuf/pyext/field.cc b/libs/protobuf/python/google/protobuf/pyext/field.cc
deleted file mode 100644
index 0d3b0b9..0000000
--- a/libs/protobuf/python/google/protobuf/pyext/field.cc
+++ /dev/null
@@ -1,143 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <google/protobuf/pyext/field.h>
-
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/pyext/descriptor.h>
-#include <google/protobuf/pyext/message.h>
-
-namespace google {
-namespace protobuf {
-namespace python {
-
-namespace field {
-
-static PyObject* Repr(PyMessageFieldProperty* self) {
-  return PyUnicode_FromFormat("<field property '%s'>",
-                              self->field_descriptor->full_name().c_str());
-}
-
-static PyObject* DescrGet(PyMessageFieldProperty* self, PyObject* obj,
-                          PyObject* type) {
-  if (obj == nullptr) {
-    Py_INCREF(self);
-    return reinterpret_cast<PyObject*>(self);
-  }
-  return cmessage::GetFieldValue(reinterpret_cast<CMessage*>(obj),
-                                 self->field_descriptor);
-}
-
-static int DescrSet(PyMessageFieldProperty* self, PyObject* obj,
-                    PyObject* value) {
-  if (value == nullptr) {
-    PyErr_SetString(PyExc_AttributeError, "Cannot delete field attribute");
-    return -1;
-  }
-  return cmessage::SetFieldValue(reinterpret_cast<CMessage*>(obj),
-                                 self->field_descriptor, value);
-}
-
-static PyObject* GetDescriptor(PyMessageFieldProperty* self, void* closure) {
-  return PyFieldDescriptor_FromDescriptor(self->field_descriptor);
-}
-
-static PyObject* GetDoc(PyMessageFieldProperty* self, void* closure) {
-  return PyUnicode_FromFormat("Field %s",
-                              self->field_descriptor->full_name().c_str());
-}
-
-static PyGetSetDef Getters[] = {
-    {"DESCRIPTOR", (getter)GetDescriptor, nullptr, "Field descriptor"},
-    {"__doc__", (getter)GetDoc, nullptr, nullptr},
-    {nullptr},
-};
-}  // namespace field
-
-static PyTypeObject _CFieldProperty_Type = {
-    PyVarObject_HEAD_INIT(&PyType_Type, 0)  // head
-    FULL_MODULE_NAME ".FieldProperty",      // tp_name
-    sizeof(PyMessageFieldProperty),         // tp_basicsize
-    0,                                      // tp_itemsize
-    nullptr,                                // tp_dealloc
-#if PY_VERSION_HEX < 0x03080000
-    nullptr,  // tp_print
-#else
-    0,  // tp_vectorcall_offset
-#endif
-    nullptr,                        // tp_getattr
-    nullptr,                        // tp_setattr
-    nullptr,                        // tp_compare
-    (reprfunc)field::Repr,          // tp_repr
-    nullptr,                        // tp_as_number
-    nullptr,                        // tp_as_sequence
-    nullptr,                        // tp_as_mapping
-    nullptr,                        // tp_hash
-    nullptr,                        // tp_call
-    nullptr,                        // tp_str
-    nullptr,                        // tp_getattro
-    nullptr,                        // tp_setattro
-    nullptr,                        // tp_as_buffer
-    Py_TPFLAGS_DEFAULT,             // tp_flags
-    "Field property of a Message",  // tp_doc
-    nullptr,                        // tp_traverse
-    nullptr,                        // tp_clear
-    nullptr,                        // tp_richcompare
-    0,                              // tp_weaklistoffset
-    nullptr,                        // tp_iter
-    nullptr,                        // tp_iternext
-    nullptr,                        // tp_methods
-    nullptr,                        // tp_members
-    field::Getters,                 // tp_getset
-    nullptr,                        // tp_base
-    nullptr,                        // tp_dict
-    (descrgetfunc)field::DescrGet,  // tp_descr_get
-    (descrsetfunc)field::DescrSet,  // tp_descr_set
-    0,                              // tp_dictoffset
-    nullptr,                        // tp_init
-    nullptr,                        // tp_alloc
-    nullptr,                        // tp_new
-};
-PyTypeObject* CFieldProperty_Type = &_CFieldProperty_Type;
-
-PyObject* NewFieldProperty(const FieldDescriptor* field_descriptor) {
-  // Create a new descriptor object
-  PyMessageFieldProperty* property =
-      PyObject_New(PyMessageFieldProperty, CFieldProperty_Type);
-  if (property == nullptr) {
-    return nullptr;
-  }
-  property->field_descriptor = field_descriptor;
-  return reinterpret_cast<PyObject*>(property);
-}
-
-}  // namespace python
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/python/google/protobuf/pyext/field.h b/libs/protobuf/python/google/protobuf/pyext/field.h
deleted file mode 100644
index f9f94c4..0000000
--- a/libs/protobuf/python/google/protobuf/pyext/field.h
+++ /dev/null
@@ -1,60 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef GOOGLE_PROTOBUF_PYTHON_CPP_FIELD_H__
-#define GOOGLE_PROTOBUF_PYTHON_CPP_FIELD_H__
-
-#define PY_SSIZE_T_CLEAN
-#include <Python.h>
-
-namespace google {
-namespace protobuf {
-
-class FieldDescriptor;
-
-namespace python {
-
-// A data descriptor that represents a field in a Message class.
-struct PyMessageFieldProperty {
-  PyObject_HEAD;
-
-  // This pointer is owned by the same pool as the Message class it belongs to.
-  const FieldDescriptor* field_descriptor;
-};
-
-extern PyTypeObject* CFieldProperty_Type;
-
-PyObject* NewFieldProperty(const FieldDescriptor* field_descriptor);
-
-}  // namespace python
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // GOOGLE_PROTOBUF_PYTHON_CPP_FIELD_H__
diff --git a/libs/protobuf/python/google/protobuf/pyext/map_container.cc b/libs/protobuf/python/google/protobuf/pyext/map_container.cc
deleted file mode 100644
index e8a6888..0000000
--- a/libs/protobuf/python/google/protobuf/pyext/map_container.cc
+++ /dev/null
@@ -1,931 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: haberman@google.com (Josh Haberman)
-
-#include <google/protobuf/pyext/map_container.h>
-
-#include <cstdint>
-#include <memory>
-
-#include <google/protobuf/stubs/logging.h>
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/map.h>
-#include <google/protobuf/map_field.h>
-#include <google/protobuf/message.h>
-#include <google/protobuf/pyext/message.h>
-#include <google/protobuf/pyext/message_factory.h>
-#include <google/protobuf/pyext/repeated_composite_container.h>
-#include <google/protobuf/pyext/scoped_pyobject_ptr.h>
-#include <google/protobuf/stubs/map_util.h>
-
-namespace google {
-namespace protobuf {
-namespace python {
-
-// Functions that need access to map reflection functionality.
-// They need to be contained in this class because it is friended.
-class MapReflectionFriend {
- public:
-  // Methods that are in common between the map types.
-  static PyObject* Contains(PyObject* _self, PyObject* key);
-  static Py_ssize_t Length(PyObject* _self);
-  static PyObject* GetIterator(PyObject *_self);
-  static PyObject* IterNext(PyObject* _self);
-  static PyObject* MergeFrom(PyObject* _self, PyObject* arg);
-
-  // Methods that differ between the map types.
-  static PyObject* ScalarMapGetItem(PyObject* _self, PyObject* key);
-  static PyObject* MessageMapGetItem(PyObject* _self, PyObject* key);
-  static int ScalarMapSetItem(PyObject* _self, PyObject* key, PyObject* v);
-  static int MessageMapSetItem(PyObject* _self, PyObject* key, PyObject* v);
-  static PyObject* ScalarMapToStr(PyObject* _self);
-  static PyObject* MessageMapToStr(PyObject* _self);
-};
-
-struct MapIterator {
-  PyObject_HEAD;
-
-  std::unique_ptr<::google::protobuf::MapIterator> iter;
-
-  // A pointer back to the container, so we can notice changes to the version.
-  // We own a ref on this.
-  MapContainer* container;
-
-  // We need to keep a ref on the parent Message too, because
-  // MapIterator::~MapIterator() accesses it.  Normally this would be ok because
-  // the ref on container (above) would guarantee outlive semantics.  However in
-  // the case of ClearField(), the MapContainer points to a different message,
-  // a copy of the original.  But our iterator still points to the original,
-  // which could now get deleted before us.
-  //
-  // To prevent this, we ensure that the Message will always stay alive as long
-  // as this iterator does.  This is solely for the benefit of the MapIterator
-  // destructor -- we should never actually access the iterator in this state
-  // except to delete it.
-  CMessage* parent;
-  // The version of the map when we took the iterator to it.
-  //
-  // We store this so that if the map is modified during iteration we can throw
-  // an error.
-  uint64_t version;
-};
-
-Message* MapContainer::GetMutableMessage() {
-  cmessage::AssureWritable(parent);
-  return parent->message;
-}
-
-// Consumes a reference on the Python string object.
-static bool PyStringToSTL(PyObject* py_string, std::string* stl_string) {
-  char *value;
-  Py_ssize_t value_len;
-
-  if (!py_string) {
-    return false;
-  }
-  if (PyBytes_AsStringAndSize(py_string, &value, &value_len) < 0) {
-    Py_DECREF(py_string);
-    return false;
-  } else {
-    stl_string->assign(value, value_len);
-    Py_DECREF(py_string);
-    return true;
-  }
-}
-
-static bool PythonToMapKey(MapContainer* self, PyObject* obj, MapKey* key) {
-  const FieldDescriptor* field_descriptor =
-      self->parent_field_descriptor->message_type()->map_key();
-  switch (field_descriptor->cpp_type()) {
-    case FieldDescriptor::CPPTYPE_INT32: {
-      GOOGLE_CHECK_GET_INT32(obj, value, false);
-      key->SetInt32Value(value);
-      break;
-    }
-    case FieldDescriptor::CPPTYPE_INT64: {
-      GOOGLE_CHECK_GET_INT64(obj, value, false);
-      key->SetInt64Value(value);
-      break;
-    }
-    case FieldDescriptor::CPPTYPE_UINT32: {
-      GOOGLE_CHECK_GET_UINT32(obj, value, false);
-      key->SetUInt32Value(value);
-      break;
-    }
-    case FieldDescriptor::CPPTYPE_UINT64: {
-      GOOGLE_CHECK_GET_UINT64(obj, value, false);
-      key->SetUInt64Value(value);
-      break;
-    }
-    case FieldDescriptor::CPPTYPE_BOOL: {
-      GOOGLE_CHECK_GET_BOOL(obj, value, false);
-      key->SetBoolValue(value);
-      break;
-    }
-    case FieldDescriptor::CPPTYPE_STRING: {
-      std::string str;
-      if (!PyStringToSTL(CheckString(obj, field_descriptor), &str)) {
-        return false;
-      }
-      key->SetStringValue(str);
-      break;
-    }
-    default:
-      PyErr_Format(
-          PyExc_SystemError, "Type %d cannot be a map key",
-          field_descriptor->cpp_type());
-      return false;
-  }
-  return true;
-}
-
-static PyObject* MapKeyToPython(MapContainer* self, const MapKey& key) {
-  const FieldDescriptor* field_descriptor =
-      self->parent_field_descriptor->message_type()->map_key();
-  switch (field_descriptor->cpp_type()) {
-    case FieldDescriptor::CPPTYPE_INT32:
-      return PyLong_FromLong(key.GetInt32Value());
-    case FieldDescriptor::CPPTYPE_INT64:
-      return PyLong_FromLongLong(key.GetInt64Value());
-    case FieldDescriptor::CPPTYPE_UINT32:
-      return PyLong_FromSize_t(key.GetUInt32Value());
-    case FieldDescriptor::CPPTYPE_UINT64:
-      return PyLong_FromUnsignedLongLong(key.GetUInt64Value());
-    case FieldDescriptor::CPPTYPE_BOOL:
-      return PyBool_FromLong(key.GetBoolValue());
-    case FieldDescriptor::CPPTYPE_STRING:
-      return ToStringObject(field_descriptor, key.GetStringValue());
-    default:
-      PyErr_Format(
-          PyExc_SystemError, "Couldn't convert type %d to value",
-          field_descriptor->cpp_type());
-      return nullptr;
-  }
-}
-
-// This is only used for ScalarMap, so we don't need to handle the
-// CPPTYPE_MESSAGE case.
-PyObject* MapValueRefToPython(MapContainer* self, const MapValueRef& value) {
-  const FieldDescriptor* field_descriptor =
-      self->parent_field_descriptor->message_type()->map_value();
-  switch (field_descriptor->cpp_type()) {
-    case FieldDescriptor::CPPTYPE_INT32:
-      return PyLong_FromLong(value.GetInt32Value());
-    case FieldDescriptor::CPPTYPE_INT64:
-      return PyLong_FromLongLong(value.GetInt64Value());
-    case FieldDescriptor::CPPTYPE_UINT32:
-      return PyLong_FromSize_t(value.GetUInt32Value());
-    case FieldDescriptor::CPPTYPE_UINT64:
-      return PyLong_FromUnsignedLongLong(value.GetUInt64Value());
-    case FieldDescriptor::CPPTYPE_FLOAT:
-      return PyFloat_FromDouble(value.GetFloatValue());
-    case FieldDescriptor::CPPTYPE_DOUBLE:
-      return PyFloat_FromDouble(value.GetDoubleValue());
-    case FieldDescriptor::CPPTYPE_BOOL:
-      return PyBool_FromLong(value.GetBoolValue());
-    case FieldDescriptor::CPPTYPE_STRING:
-      return ToStringObject(field_descriptor, value.GetStringValue());
-    case FieldDescriptor::CPPTYPE_ENUM:
-      return PyLong_FromLong(value.GetEnumValue());
-    default:
-      PyErr_Format(
-          PyExc_SystemError, "Couldn't convert type %d to value",
-          field_descriptor->cpp_type());
-      return nullptr;
-  }
-}
-
-// This is only used for ScalarMap, so we don't need to handle the
-// CPPTYPE_MESSAGE case.
-static bool PythonToMapValueRef(MapContainer* self, PyObject* obj,
-                                bool allow_unknown_enum_values,
-                                MapValueRef* value_ref) {
-  const FieldDescriptor* field_descriptor =
-      self->parent_field_descriptor->message_type()->map_value();
-  switch (field_descriptor->cpp_type()) {
-    case FieldDescriptor::CPPTYPE_INT32: {
-      GOOGLE_CHECK_GET_INT32(obj, value, false);
-      value_ref->SetInt32Value(value);
-      return true;
-    }
-    case FieldDescriptor::CPPTYPE_INT64: {
-      GOOGLE_CHECK_GET_INT64(obj, value, false);
-      value_ref->SetInt64Value(value);
-      return true;
-    }
-    case FieldDescriptor::CPPTYPE_UINT32: {
-      GOOGLE_CHECK_GET_UINT32(obj, value, false);
-      value_ref->SetUInt32Value(value);
-      return true;
-    }
-    case FieldDescriptor::CPPTYPE_UINT64: {
-      GOOGLE_CHECK_GET_UINT64(obj, value, false);
-      value_ref->SetUInt64Value(value);
-      return true;
-    }
-    case FieldDescriptor::CPPTYPE_FLOAT: {
-      GOOGLE_CHECK_GET_FLOAT(obj, value, false);
-      value_ref->SetFloatValue(value);
-      return true;
-    }
-    case FieldDescriptor::CPPTYPE_DOUBLE: {
-      GOOGLE_CHECK_GET_DOUBLE(obj, value, false);
-      value_ref->SetDoubleValue(value);
-      return true;
-    }
-    case FieldDescriptor::CPPTYPE_BOOL: {
-      GOOGLE_CHECK_GET_BOOL(obj, value, false);
-      value_ref->SetBoolValue(value);
-      return true;
-    }
-    case FieldDescriptor::CPPTYPE_STRING: {
-      std::string str;
-      if (!PyStringToSTL(CheckString(obj, field_descriptor), &str)) {
-        return false;
-      }
-      value_ref->SetStringValue(str);
-      return true;
-    }
-    case FieldDescriptor::CPPTYPE_ENUM: {
-      GOOGLE_CHECK_GET_INT32(obj, value, false);
-      if (allow_unknown_enum_values) {
-        value_ref->SetEnumValue(value);
-        return true;
-      } else {
-        const EnumDescriptor* enum_descriptor = field_descriptor->enum_type();
-        const EnumValueDescriptor* enum_value =
-            enum_descriptor->FindValueByNumber(value);
-        if (enum_value != nullptr) {
-          value_ref->SetEnumValue(value);
-          return true;
-        } else {
-          PyErr_Format(PyExc_ValueError, "Unknown enum value: %d", value);
-          return false;
-        }
-      }
-      break;
-    }
-    default:
-      PyErr_Format(
-          PyExc_SystemError, "Setting value to a field of unknown type %d",
-          field_descriptor->cpp_type());
-      return false;
-  }
-}
-
-// Map methods common to ScalarMap and MessageMap //////////////////////////////
-
-static MapContainer* GetMap(PyObject* obj) {
-  return reinterpret_cast<MapContainer*>(obj);
-}
-
-Py_ssize_t MapReflectionFriend::Length(PyObject* _self) {
-  MapContainer* self = GetMap(_self);
-  const google::protobuf::Message* message = self->parent->message;
-  return message->GetReflection()->MapSize(*message,
-                                           self->parent_field_descriptor);
-}
-
-PyObject* Clear(PyObject* _self) {
-  MapContainer* self = GetMap(_self);
-  Message* message = self->GetMutableMessage();
-  const Reflection* reflection = message->GetReflection();
-
-  reflection->ClearField(message, self->parent_field_descriptor);
-
-  Py_RETURN_NONE;
-}
-
-PyObject* GetEntryClass(PyObject* _self) {
-  MapContainer* self = GetMap(_self);
-  CMessageClass* message_class = message_factory::GetMessageClass(
-      cmessage::GetFactoryForMessage(self->parent),
-      self->parent_field_descriptor->message_type());
-  Py_XINCREF(message_class);
-  return reinterpret_cast<PyObject*>(message_class);
-}
-
-PyObject* MapReflectionFriend::MergeFrom(PyObject* _self, PyObject* arg) {
-  MapContainer* self = GetMap(_self);
-  if (!PyObject_TypeCheck(arg, ScalarMapContainer_Type) &&
-      !PyObject_TypeCheck(arg, MessageMapContainer_Type)) {
-    PyErr_SetString(PyExc_AttributeError, "Not a map field");
-    return nullptr;
-  }
-  MapContainer* other_map = GetMap(arg);
-  Message* message = self->GetMutableMessage();
-  const Message* other_message = other_map->parent->message;
-  const Reflection* reflection = message->GetReflection();
-  const Reflection* other_reflection = other_message->GetReflection();
-  internal::MapFieldBase* field = reflection->MutableMapData(
-      message, self->parent_field_descriptor);
-  const internal::MapFieldBase* other_field = other_reflection->GetMapData(
-      *other_message, other_map->parent_field_descriptor);
-  field->MergeFrom(*other_field);
-  self->version++;
-  Py_RETURN_NONE;
-}
-
-PyObject* MapReflectionFriend::Contains(PyObject* _self, PyObject* key) {
-  MapContainer* self = GetMap(_self);
-
-  const Message* message = self->parent->message;
-  const Reflection* reflection = message->GetReflection();
-  MapKey map_key;
-
-  if (!PythonToMapKey(self, key, &map_key)) {
-    return nullptr;
-  }
-
-  if (reflection->ContainsMapKey(*message, self->parent_field_descriptor,
-                                 map_key)) {
-    Py_RETURN_TRUE;
-  } else {
-    Py_RETURN_FALSE;
-  }
-}
-
-// ScalarMap ///////////////////////////////////////////////////////////////////
-
-MapContainer* NewScalarMapContainer(
-    CMessage* parent, const google::protobuf::FieldDescriptor* parent_field_descriptor) {
-  if (!CheckFieldBelongsToMessage(parent_field_descriptor, parent->message)) {
-    return nullptr;
-  }
-
-  PyObject* obj(PyType_GenericAlloc(ScalarMapContainer_Type, 0));
-  if (obj == nullptr) {
-    PyErr_Format(PyExc_RuntimeError,
-                 "Could not allocate new container.");
-    return nullptr;
-  }
-
-  MapContainer* self = GetMap(obj);
-
-  Py_INCREF(parent);
-  self->parent = parent;
-  self->parent_field_descriptor = parent_field_descriptor;
-  self->version = 0;
-
-  return self;
-}
-
-PyObject* MapReflectionFriend::ScalarMapGetItem(PyObject* _self,
-                                                PyObject* key) {
-  MapContainer* self = GetMap(_self);
-
-  Message* message = self->GetMutableMessage();
-  const Reflection* reflection = message->GetReflection();
-  MapKey map_key;
-  MapValueRef value;
-
-  if (!PythonToMapKey(self, key, &map_key)) {
-    return nullptr;
-  }
-
-  if (reflection->InsertOrLookupMapValue(message, self->parent_field_descriptor,
-                                         map_key, &value)) {
-    self->version++;
-  }
-
-  return MapValueRefToPython(self, value);
-}
-
-int MapReflectionFriend::ScalarMapSetItem(PyObject* _self, PyObject* key,
-                                          PyObject* v) {
-  MapContainer* self = GetMap(_self);
-
-  Message* message = self->GetMutableMessage();
-  const Reflection* reflection = message->GetReflection();
-  MapKey map_key;
-  MapValueRef value;
-
-  if (!PythonToMapKey(self, key, &map_key)) {
-    return -1;
-  }
-
-  if (v) {
-    // Set item to v.
-    if (reflection->InsertOrLookupMapValue(
-            message, self->parent_field_descriptor, map_key, &value)) {
-      self->version++;
-    }
-
-    if (!PythonToMapValueRef(self, v, reflection->SupportsUnknownEnumValues(),
-                             &value)) {
-      return -1;
-    }
-    return 0;
-  } else {
-    // Delete key from map.
-    if (reflection->DeleteMapValue(message, self->parent_field_descriptor,
-                                   map_key)) {
-      self->version++;
-      return 0;
-    } else {
-      PyErr_Format(PyExc_KeyError, "Key not present in map");
-      return -1;
-    }
-  }
-}
-
-static PyObject* ScalarMapGet(PyObject* self, PyObject* args,
-                              PyObject* kwargs) {
-  static const char* kwlist[] = {"key", "default", nullptr};
-  PyObject* key;
-  PyObject* default_value = nullptr;
-  if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O|O",
-                                   const_cast<char**>(kwlist), &key,
-                                   &default_value)) {
-    return nullptr;
-  }
-
-  ScopedPyObjectPtr is_present(MapReflectionFriend::Contains(self, key));
-  if (is_present.get() == nullptr) {
-    return nullptr;
-  }
-
-  if (PyObject_IsTrue(is_present.get())) {
-    return MapReflectionFriend::ScalarMapGetItem(self, key);
-  } else {
-    if (default_value != nullptr) {
-      Py_INCREF(default_value);
-      return default_value;
-    } else {
-      Py_RETURN_NONE;
-    }
-  }
-}
-
-PyObject* MapReflectionFriend::ScalarMapToStr(PyObject* _self) {
-  ScopedPyObjectPtr dict(PyDict_New());
-  if (dict == nullptr) {
-    return nullptr;
-  }
-  ScopedPyObjectPtr key;
-  ScopedPyObjectPtr value;
-
-  MapContainer* self = GetMap(_self);
-  Message* message = self->GetMutableMessage();
-  const Reflection* reflection = message->GetReflection();
-  for (google::protobuf::MapIterator it = reflection->MapBegin(
-           message, self->parent_field_descriptor);
-       it != reflection->MapEnd(message, self->parent_field_descriptor);
-       ++it) {
-    key.reset(MapKeyToPython(self, it.GetKey()));
-    if (key == nullptr) {
-      return nullptr;
-    }
-    value.reset(MapValueRefToPython(self, it.GetValueRef()));
-    if (value == nullptr) {
-      return nullptr;
-    }
-    if (PyDict_SetItem(dict.get(), key.get(), value.get()) < 0) {
-      return nullptr;
-    }
-  }
-  return PyObject_Repr(dict.get());
-}
-
-static void ScalarMapDealloc(PyObject* _self) {
-  MapContainer* self = GetMap(_self);
-  self->RemoveFromParentCache();
-  PyTypeObject *type = Py_TYPE(_self);
-  type->tp_free(_self);
-  if (type->tp_flags & Py_TPFLAGS_HEAPTYPE) {
-    // With Python3, the Map class is not static, and must be managed.
-    Py_DECREF(type);
-  }
-}
-
-static PyMethodDef ScalarMapMethods[] = {
-    {"__contains__", MapReflectionFriend::Contains, METH_O,
-     "Tests whether a key is a member of the map."},
-    {"clear", (PyCFunction)Clear, METH_NOARGS,
-     "Removes all elements from the map."},
-    {"get", (PyCFunction)ScalarMapGet, METH_VARARGS | METH_KEYWORDS,
-     "Gets the value for the given key if present, or otherwise a default"},
-    {"GetEntryClass", (PyCFunction)GetEntryClass, METH_NOARGS,
-     "Return the class used to build Entries of (key, value) pairs."},
-    {"MergeFrom", (PyCFunction)MapReflectionFriend::MergeFrom, METH_O,
-     "Merges a map into the current map."},
-    /*
-    { "__deepcopy__", (PyCFunction)DeepCopy, METH_VARARGS,
-      "Makes a deep copy of the class." },
-    { "__reduce__", (PyCFunction)Reduce, METH_NOARGS,
-      "Outputs picklable representation of the repeated field." },
-    */
-    {nullptr, nullptr},
-};
-
-PyTypeObject* ScalarMapContainer_Type;
-static PyType_Slot ScalarMapContainer_Type_slots[] = {
-    {Py_tp_dealloc, (void*)ScalarMapDealloc},
-    {Py_mp_length, (void*)MapReflectionFriend::Length},
-    {Py_mp_subscript, (void*)MapReflectionFriend::ScalarMapGetItem},
-    {Py_mp_ass_subscript, (void*)MapReflectionFriend::ScalarMapSetItem},
-    {Py_tp_methods, (void*)ScalarMapMethods},
-    {Py_tp_iter, (void*)MapReflectionFriend::GetIterator},
-    {Py_tp_repr, (void*)MapReflectionFriend::ScalarMapToStr},
-    {0, nullptr},
-};
-
-PyType_Spec ScalarMapContainer_Type_spec = {
-    FULL_MODULE_NAME ".ScalarMapContainer", sizeof(MapContainer), 0,
-    Py_TPFLAGS_DEFAULT, ScalarMapContainer_Type_slots};
-
-// MessageMap //////////////////////////////////////////////////////////////////
-
-static MessageMapContainer* GetMessageMap(PyObject* obj) {
-  return reinterpret_cast<MessageMapContainer*>(obj);
-}
-
-static PyObject* GetCMessage(MessageMapContainer* self, Message* message) {
-  // Get or create the CMessage object corresponding to this message.
-  return self->parent
-      ->BuildSubMessageFromPointer(self->parent_field_descriptor, message,
-                                   self->message_class)
-      ->AsPyObject();
-}
-
-MessageMapContainer* NewMessageMapContainer(
-    CMessage* parent, const google::protobuf::FieldDescriptor* parent_field_descriptor,
-    CMessageClass* message_class) {
-  if (!CheckFieldBelongsToMessage(parent_field_descriptor, parent->message)) {
-    return nullptr;
-  }
-
-  PyObject* obj = PyType_GenericAlloc(MessageMapContainer_Type, 0);
-  if (obj == nullptr) {
-    PyErr_SetString(PyExc_RuntimeError, "Could not allocate new container.");
-    return nullptr;
-  }
-
-  MessageMapContainer* self = GetMessageMap(obj);
-
-  Py_INCREF(parent);
-  self->parent = parent;
-  self->parent_field_descriptor = parent_field_descriptor;
-  self->version = 0;
-
-  Py_INCREF(message_class);
-  self->message_class = message_class;
-
-  return self;
-}
-
-int MapReflectionFriend::MessageMapSetItem(PyObject* _self, PyObject* key,
-                                           PyObject* v) {
-  if (v) {
-    PyErr_Format(PyExc_ValueError,
-                 "Direct assignment of submessage not allowed");
-    return -1;
-  }
-
-  // Now we know that this is a delete, not a set.
-
-  MessageMapContainer* self = GetMessageMap(_self);
-  Message* message = self->GetMutableMessage();
-  const Reflection* reflection = message->GetReflection();
-  MapKey map_key;
-  MapValueRef value;
-
-  self->version++;
-
-  if (!PythonToMapKey(self, key, &map_key)) {
-    return -1;
-  }
-
-  // Delete key from map.
-  if (reflection->ContainsMapKey(*message, self->parent_field_descriptor,
-                                 map_key)) {
-    // Delete key from CMessage dict.
-    MapValueRef value;
-    reflection->InsertOrLookupMapValue(message, self->parent_field_descriptor,
-                                       map_key, &value);
-    Message* sub_message = value.MutableMessageValue();
-    // If there is a living weak reference to an item, we "Release" it,
-    // otherwise we just discard the C++ value.
-    if (CMessage* released =
-            self->parent->MaybeReleaseSubMessage(sub_message)) {
-      Message* msg = released->message;
-      released->message = msg->New();
-      msg->GetReflection()->Swap(msg, released->message);
-    }
-
-    // Delete key from map.
-    reflection->DeleteMapValue(message, self->parent_field_descriptor,
-                               map_key);
-    return 0;
-  } else {
-    PyErr_Format(PyExc_KeyError, "Key not present in map");
-    return -1;
-  }
-}
-
-PyObject* MapReflectionFriend::MessageMapGetItem(PyObject* _self,
-                                                 PyObject* key) {
-  MessageMapContainer* self = GetMessageMap(_self);
-
-  Message* message = self->GetMutableMessage();
-  const Reflection* reflection = message->GetReflection();
-  MapKey map_key;
-  MapValueRef value;
-
-  if (!PythonToMapKey(self, key, &map_key)) {
-    return nullptr;
-  }
-
-  if (reflection->InsertOrLookupMapValue(message, self->parent_field_descriptor,
-                                         map_key, &value)) {
-    self->version++;
-  }
-
-  return GetCMessage(self, value.MutableMessageValue());
-}
-
-PyObject* MapReflectionFriend::MessageMapToStr(PyObject* _self) {
-  ScopedPyObjectPtr dict(PyDict_New());
-  if (dict == nullptr) {
-    return nullptr;
-  }
-  ScopedPyObjectPtr key;
-  ScopedPyObjectPtr value;
-
-  MessageMapContainer* self = GetMessageMap(_self);
-  Message* message = self->GetMutableMessage();
-  const Reflection* reflection = message->GetReflection();
-  for (google::protobuf::MapIterator it = reflection->MapBegin(
-           message, self->parent_field_descriptor);
-       it != reflection->MapEnd(message, self->parent_field_descriptor);
-       ++it) {
-    key.reset(MapKeyToPython(self, it.GetKey()));
-    if (key == nullptr) {
-      return nullptr;
-    }
-    value.reset(GetCMessage(self, it.MutableValueRef()->MutableMessageValue()));
-    if (value == nullptr) {
-      return nullptr;
-    }
-    if (PyDict_SetItem(dict.get(), key.get(), value.get()) < 0) {
-      return nullptr;
-    }
-  }
-  return PyObject_Repr(dict.get());
-}
-
-PyObject* MessageMapGet(PyObject* self, PyObject* args, PyObject* kwargs) {
-  static const char* kwlist[] = {"key", "default", nullptr};
-  PyObject* key;
-  PyObject* default_value = nullptr;
-  if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O|O",
-                                   const_cast<char**>(kwlist), &key,
-                                   &default_value)) {
-    return nullptr;
-  }
-
-  ScopedPyObjectPtr is_present(MapReflectionFriend::Contains(self, key));
-  if (is_present.get() == nullptr) {
-    return nullptr;
-  }
-
-  if (PyObject_IsTrue(is_present.get())) {
-    return MapReflectionFriend::MessageMapGetItem(self, key);
-  } else {
-    if (default_value != nullptr) {
-      Py_INCREF(default_value);
-      return default_value;
-    } else {
-      Py_RETURN_NONE;
-    }
-  }
-}
-
-static void MessageMapDealloc(PyObject* _self) {
-  MessageMapContainer* self = GetMessageMap(_self);
-  self->RemoveFromParentCache();
-  Py_DECREF(self->message_class);
-  PyTypeObject *type = Py_TYPE(_self);
-  type->tp_free(_self);
-  if (type->tp_flags & Py_TPFLAGS_HEAPTYPE) {
-    // With Python3, the Map class is not static, and must be managed.
-    Py_DECREF(type);
-  }
-}
-
-static PyMethodDef MessageMapMethods[] = {
-    {"__contains__", (PyCFunction)MapReflectionFriend::Contains, METH_O,
-     "Tests whether the map contains this element."},
-    {"clear", (PyCFunction)Clear, METH_NOARGS,
-     "Removes all elements from the map."},
-    {"get", (PyCFunction)MessageMapGet, METH_VARARGS | METH_KEYWORDS,
-     "Gets the value for the given key if present, or otherwise a default"},
-    {"get_or_create", MapReflectionFriend::MessageMapGetItem, METH_O,
-     "Alias for getitem, useful to make explicit that the map is mutated."},
-    {"GetEntryClass", (PyCFunction)GetEntryClass, METH_NOARGS,
-     "Return the class used to build Entries of (key, value) pairs."},
-    {"MergeFrom", (PyCFunction)MapReflectionFriend::MergeFrom, METH_O,
-     "Merges a map into the current map."},
-    /*
-    { "__deepcopy__", (PyCFunction)DeepCopy, METH_VARARGS,
-      "Makes a deep copy of the class." },
-    { "__reduce__", (PyCFunction)Reduce, METH_NOARGS,
-      "Outputs picklable representation of the repeated field." },
-    */
-    {nullptr, nullptr},
-};
-
-PyTypeObject* MessageMapContainer_Type;
-static PyType_Slot MessageMapContainer_Type_slots[] = {
-    {Py_tp_dealloc, (void*)MessageMapDealloc},
-    {Py_mp_length, (void*)MapReflectionFriend::Length},
-    {Py_mp_subscript, (void*)MapReflectionFriend::MessageMapGetItem},
-    {Py_mp_ass_subscript, (void*)MapReflectionFriend::MessageMapSetItem},
-    {Py_tp_methods, (void*)MessageMapMethods},
-    {Py_tp_iter, (void*)MapReflectionFriend::GetIterator},
-    {Py_tp_repr, (void*)MapReflectionFriend::MessageMapToStr},
-    {0, nullptr}};
-
-PyType_Spec MessageMapContainer_Type_spec = {
-    FULL_MODULE_NAME ".MessageMapContainer", sizeof(MessageMapContainer), 0,
-    Py_TPFLAGS_DEFAULT, MessageMapContainer_Type_slots};
-
-// MapIterator /////////////////////////////////////////////////////////////////
-
-static MapIterator* GetIter(PyObject* obj) {
-  return reinterpret_cast<MapIterator*>(obj);
-}
-
-PyObject* MapReflectionFriend::GetIterator(PyObject *_self) {
-  MapContainer* self = GetMap(_self);
-
-  ScopedPyObjectPtr obj(PyType_GenericAlloc(&MapIterator_Type, 0));
-  if (obj == nullptr) {
-    return PyErr_Format(PyExc_KeyError, "Could not allocate iterator");
-  }
-
-  MapIterator* iter = GetIter(obj.get());
-
-  Py_INCREF(self);
-  iter->container = self;
-  iter->version = self->version;
-  Py_INCREF(self->parent);
-  iter->parent = self->parent;
-
-  if (MapReflectionFriend::Length(_self) > 0) {
-    Message* message = self->GetMutableMessage();
-    const Reflection* reflection = message->GetReflection();
-
-    iter->iter.reset(new ::google::protobuf::MapIterator(
-        reflection->MapBegin(message, self->parent_field_descriptor)));
-  }
-
-  return obj.release();
-}
-
-PyObject* MapReflectionFriend::IterNext(PyObject* _self) {
-  MapIterator* self = GetIter(_self);
-
-  // This won't catch mutations to the map performed by MergeFrom(); no easy way
-  // to address that.
-  if (self->version != self->container->version) {
-    return PyErr_Format(PyExc_RuntimeError,
-                        "Map modified during iteration.");
-  }
-  if (self->parent != self->container->parent) {
-    return PyErr_Format(PyExc_RuntimeError,
-                        "Map cleared during iteration.");
-  }
-
-  if (self->iter.get() == nullptr) {
-    return nullptr;
-  }
-
-  Message* message = self->container->GetMutableMessage();
-  const Reflection* reflection = message->GetReflection();
-
-  if (*self->iter ==
-      reflection->MapEnd(message, self->container->parent_field_descriptor)) {
-    return nullptr;
-  }
-
-  PyObject* ret = MapKeyToPython(self->container, self->iter->GetKey());
-
-  ++(*self->iter);
-
-  return ret;
-}
-
-static void DeallocMapIterator(PyObject* _self) {
-  MapIterator* self = GetIter(_self);
-  self->iter.reset();
-  Py_CLEAR(self->container);
-  Py_CLEAR(self->parent);
-  Py_TYPE(_self)->tp_free(_self);
-}
-
-PyTypeObject MapIterator_Type = {
-    PyVarObject_HEAD_INIT(&PyType_Type, 0) FULL_MODULE_NAME
-    ".MapIterator",       //  tp_name
-    sizeof(MapIterator),  //  tp_basicsize
-    0,                    //  tp_itemsize
-    DeallocMapIterator,   //  tp_dealloc
-#if PY_VERSION_HEX < 0x03080000
-    nullptr,  // tp_print
-#else
-    0,  // tp_vectorcall_offset
-#endif
-    nullptr,                        //  tp_getattr
-    nullptr,                        //  tp_setattr
-    nullptr,                        //  tp_compare
-    nullptr,                        //  tp_repr
-    nullptr,                        //  tp_as_number
-    nullptr,                        //  tp_as_sequence
-    nullptr,                        //  tp_as_mapping
-    nullptr,                        //  tp_hash
-    nullptr,                        //  tp_call
-    nullptr,                        //  tp_str
-    nullptr,                        //  tp_getattro
-    nullptr,                        //  tp_setattro
-    nullptr,                        //  tp_as_buffer
-    Py_TPFLAGS_DEFAULT,             //  tp_flags
-    "A scalar map iterator",        //  tp_doc
-    nullptr,                        //  tp_traverse
-    nullptr,                        //  tp_clear
-    nullptr,                        //  tp_richcompare
-    0,                              //  tp_weaklistoffset
-    PyObject_SelfIter,              //  tp_iter
-    MapReflectionFriend::IterNext,  //  tp_iternext
-    nullptr,                        //  tp_methods
-    nullptr,                        //  tp_members
-    nullptr,                        //  tp_getset
-    nullptr,                        //  tp_base
-    nullptr,                        //  tp_dict
-    nullptr,                        //  tp_descr_get
-    nullptr,                        //  tp_descr_set
-    0,                              //  tp_dictoffset
-    nullptr,                        //  tp_init
-};
-
-bool InitMapContainers() {
-  // ScalarMapContainer_Type derives from our MutableMapping type.
-  ScopedPyObjectPtr abc(PyImport_ImportModule("collections.abc"));
-  if (abc == nullptr) {
-    return false;
-  }
-
-  ScopedPyObjectPtr mutable_mapping(
-      PyObject_GetAttrString(abc.get(), "MutableMapping"));
-  if (mutable_mapping == nullptr) {
-    return false;
-  }
-
-  Py_INCREF(mutable_mapping.get());
-  ScopedPyObjectPtr bases(PyTuple_Pack(1, mutable_mapping.get()));
-  if (bases == nullptr) {
-    return false;
-  }
-
-  ScalarMapContainer_Type = reinterpret_cast<PyTypeObject*>(
-      PyType_FromSpecWithBases(&ScalarMapContainer_Type_spec, bases.get()));
-
-  if (PyType_Ready(&MapIterator_Type) < 0) {
-    return false;
-  }
-
-  MessageMapContainer_Type = reinterpret_cast<PyTypeObject*>(
-      PyType_FromSpecWithBases(&MessageMapContainer_Type_spec, bases.get()));
-  return true;
-}
-
-}  // namespace python
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/python/google/protobuf/pyext/map_container.h b/libs/protobuf/python/google/protobuf/pyext/map_container.h
deleted file mode 100644
index af334d2..0000000
--- a/libs/protobuf/python/google/protobuf/pyext/map_container.h
+++ /dev/null
@@ -1,89 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef GOOGLE_PROTOBUF_PYTHON_CPP_MAP_CONTAINER_H__
-#define GOOGLE_PROTOBUF_PYTHON_CPP_MAP_CONTAINER_H__
-
-#define PY_SSIZE_T_CLEAN
-#include <Python.h>
-
-#include <cstdint>
-
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/message.h>
-#include <google/protobuf/pyext/message.h>
-
-namespace google {
-namespace protobuf {
-
-class Message;
-
-namespace python {
-
-struct CMessageClass;
-
-// This struct is used directly for ScalarMap, and is the base class of
-// MessageMapContainer, which is used for MessageMap.
-struct MapContainer : public ContainerBase {
-  // Use to get a mutable message when necessary.
-  Message* GetMutableMessage();
-
-  // We bump this whenever we perform a mutation, to invalidate existing
-  // iterators.
-  uint64_t version;
-};
-
-struct MessageMapContainer : public MapContainer {
-  // The type used to create new child messages.
-  CMessageClass* message_class;
-};
-
-bool InitMapContainers();
-
-extern PyTypeObject* MessageMapContainer_Type;
-extern PyTypeObject* ScalarMapContainer_Type;
-extern PyTypeObject MapIterator_Type;  // Both map types use the same iterator.
-
-// Builds a MapContainer object, from a parent message and a
-// field descriptor.
-extern MapContainer* NewScalarMapContainer(
-    CMessage* parent, const FieldDescriptor* parent_field_descriptor);
-
-// Builds a MessageMap object, from a parent message and a
-// field descriptor.
-extern MessageMapContainer* NewMessageMapContainer(
-    CMessage* parent, const FieldDescriptor* parent_field_descriptor,
-    CMessageClass* message_class);
-
-}  // namespace python
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // GOOGLE_PROTOBUF_PYTHON_CPP_MAP_CONTAINER_H__
diff --git a/libs/protobuf/python/google/protobuf/pyext/message.cc b/libs/protobuf/python/google/protobuf/pyext/message.cc
deleted file mode 100644
index 2c4a957..0000000
--- a/libs/protobuf/python/google/protobuf/pyext/message.cc
+++ /dev/null
@@ -1,3072 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: anuraag@google.com (Anuraag Agrawal)
-// Author: tibell@google.com (Johan Tibell)
-
-#include <google/protobuf/pyext/message.h>
-
-#include <structmember.h>  // A Python header file.
-
-#include <cstdint>
-#include <map>
-#include <memory>
-#include <string>
-#include <vector>
-
-#include <google/protobuf/stubs/strutil.h>
-
-#ifndef PyVarObject_HEAD_INIT
-#define PyVarObject_HEAD_INIT(type, size) PyObject_HEAD_INIT(type) size,
-#endif
-#ifndef Py_TYPE
-#define Py_TYPE(ob) (((PyObject*)(ob))->ob_type)
-#endif
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/stubs/logging.h>
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/io/zero_copy_stream_impl_lite.h>
-#include <google/protobuf/descriptor.pb.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/message.h>
-#include <google/protobuf/text_format.h>
-#include <google/protobuf/unknown_field_set.h>
-#include <google/protobuf/pyext/descriptor.h>
-#include <google/protobuf/pyext/descriptor_pool.h>
-#include <google/protobuf/pyext/extension_dict.h>
-#include <google/protobuf/pyext/field.h>
-#include <google/protobuf/pyext/map_container.h>
-#include <google/protobuf/pyext/message_factory.h>
-#include <google/protobuf/pyext/repeated_composite_container.h>
-#include <google/protobuf/pyext/repeated_scalar_container.h>
-#include <google/protobuf/pyext/safe_numerics.h>
-#include <google/protobuf/pyext/scoped_pyobject_ptr.h>
-#include <google/protobuf/pyext/unknown_field_set.h>
-#include <google/protobuf/pyext/unknown_fields.h>
-#include <google/protobuf/util/message_differencer.h>
-#include <google/protobuf/io/strtod.h>
-#include <google/protobuf/stubs/map_util.h>
-
-// clang-format off
-#include <google/protobuf/port_def.inc>
-// clang-format on
-
-#define PyString_AsString(ob) \
-  (PyUnicode_Check(ob) ? PyUnicode_AsUTF8(ob) : PyBytes_AsString(ob))
-#define PyString_AsStringAndSize(ob, charpp, sizep)              \
-  (PyUnicode_Check(ob)                                           \
-       ? ((*(charpp) = const_cast<char*>(                        \
-               PyUnicode_AsUTF8AndSize(ob, (sizep)))) == nullptr \
-              ? -1                                               \
-              : 0)                                               \
-       : PyBytes_AsStringAndSize(ob, (charpp), (sizep)))
-
-namespace google {
-namespace protobuf {
-namespace python {
-
-class MessageReflectionFriend {
- public:
-  static void UnsafeShallowSwapFields(
-      Message* lhs, Message* rhs,
-      const std::vector<const FieldDescriptor*>& fields) {
-    lhs->GetReflection()->UnsafeShallowSwapFields(lhs, rhs, fields);
-  }
-  static bool IsLazyField(const Reflection* reflection, const Message& message,
-                          const FieldDescriptor* field) {
-    return reflection->IsLazyField(field) ||
-           reflection->IsLazyExtension(message, field);
-  }
-};
-
-static PyObject* kDESCRIPTOR;
-PyObject* EnumTypeWrapper_class;
-static PyObject* PythonMessage_class;
-static PyObject* kEmptyWeakref;
-static PyObject* WKT_classes = nullptr;
-
-namespace message_meta {
-
-namespace {
-// Copied over from internal 'google/protobuf/stubs/strutil.h'.
-inline void LowerString(std::string* s) {
-  std::string::iterator end = s->end();
-  for (std::string::iterator i = s->begin(); i != end; ++i) {
-    // tolower() changes based on locale.  We don't want this!
-    if ('A' <= *i && *i <= 'Z') *i += 'a' - 'A';
-  }
-}
-}  // namespace
-
-// Finalize the creation of the Message class.
-static int AddDescriptors(PyObject* cls, const Descriptor* descriptor) {
-  // For each field set: cls.<field>_FIELD_NUMBER = <number>
-  for (int i = 0; i < descriptor->field_count(); ++i) {
-    const FieldDescriptor* field_descriptor = descriptor->field(i);
-    ScopedPyObjectPtr property(NewFieldProperty(field_descriptor));
-    if (property == nullptr) {
-      return -1;
-    }
-    if (PyObject_SetAttrString(cls, field_descriptor->name().c_str(),
-                               property.get()) < 0) {
-      return -1;
-    }
-  }
-
-  // For each enum set cls.<enum name> = EnumTypeWrapper(<enum descriptor>).
-  for (int i = 0; i < descriptor->enum_type_count(); ++i) {
-    const EnumDescriptor* enum_descriptor = descriptor->enum_type(i);
-    ScopedPyObjectPtr enum_type(
-        PyEnumDescriptor_FromDescriptor(enum_descriptor));
-    if (enum_type == nullptr) {
-      return -1;
-    }
-    // Add wrapped enum type to message class.
-    ScopedPyObjectPtr wrapped(PyObject_CallFunctionObjArgs(
-        EnumTypeWrapper_class, enum_type.get(), nullptr));
-    if (wrapped == nullptr) {
-      return -1;
-    }
-    if (PyObject_SetAttrString(
-            cls, enum_descriptor->name().c_str(), wrapped.get()) == -1) {
-      return -1;
-    }
-
-    // For each enum value add cls.<name> = <number>
-    for (int j = 0; j < enum_descriptor->value_count(); ++j) {
-      const EnumValueDescriptor* enum_value_descriptor =
-          enum_descriptor->value(j);
-      ScopedPyObjectPtr value_number(
-          PyLong_FromLong(enum_value_descriptor->number()));
-      if (value_number == nullptr) {
-        return -1;
-      }
-      if (PyObject_SetAttrString(cls, enum_value_descriptor->name().c_str(),
-                                 value_number.get()) == -1) {
-        return -1;
-      }
-    }
-  }
-
-  // For each extension set cls.<extension name> = <extension descriptor>.
-  //
-  // Extension descriptors come from
-  // <message descriptor>.extensions_by_name[name]
-  // which was defined previously.
-  for (int i = 0; i < descriptor->extension_count(); ++i) {
-    const google::protobuf::FieldDescriptor* field = descriptor->extension(i);
-    ScopedPyObjectPtr extension_field(PyFieldDescriptor_FromDescriptor(field));
-    if (extension_field == nullptr) {
-      return -1;
-    }
-
-    // Add the extension field to the message class.
-    if (PyObject_SetAttrString(
-            cls, field->name().c_str(), extension_field.get()) == -1) {
-      return -1;
-    }
-  }
-
-  return 0;
-}
-
-static PyObject* New(PyTypeObject* type, PyObject* args, PyObject* kwargs) {
-  static const char* kwlist[] = {"name", "bases", "dict", nullptr};
-  PyObject *bases, *dict;
-  const char* name;
-
-  // Check arguments: (name, bases, dict)
-  if (!PyArg_ParseTupleAndKeywords(
-          args, kwargs, "sO!O!:type", const_cast<char**>(kwlist), &name,
-          &PyTuple_Type, &bases, &PyDict_Type, &dict)) {
-    return nullptr;
-  }
-
-  // Check bases: only (), or (message.Message,) are allowed
-  if (!(PyTuple_GET_SIZE(bases) == 0 ||
-        (PyTuple_GET_SIZE(bases) == 1 &&
-         PyTuple_GET_ITEM(bases, 0) == PythonMessage_class))) {
-    PyErr_SetString(PyExc_TypeError,
-                    "A Message class can only inherit from Message");
-    return nullptr;
-  }
-
-  // Check dict['DESCRIPTOR']
-  PyObject* py_descriptor = PyDict_GetItem(dict, kDESCRIPTOR);
-  if (py_descriptor == nullptr) {
-    PyErr_SetString(PyExc_TypeError, "Message class has no DESCRIPTOR");
-    return nullptr;
-  }
-  if (!PyObject_TypeCheck(py_descriptor, &PyMessageDescriptor_Type)) {
-    PyErr_Format(PyExc_TypeError, "Expected a message Descriptor, got %s",
-                 py_descriptor->ob_type->tp_name);
-    return nullptr;
-  }
-  const Descriptor* message_descriptor =
-      PyMessageDescriptor_AsDescriptor(py_descriptor);
-  if (message_descriptor == nullptr) {
-    return nullptr;
-  }
-
-  // Messages have no __dict__
-  ScopedPyObjectPtr slots(PyTuple_New(0));
-  if (PyDict_SetItemString(dict, "__slots__", slots.get()) < 0) {
-    return nullptr;
-  }
-
-  // Build the arguments to the base metaclass.
-  // We change the __bases__ classes.
-  ScopedPyObjectPtr new_args;
-
-  if (WKT_classes == nullptr) {
-    ScopedPyObjectPtr well_known_types(PyImport_ImportModule(
-        "google.protobuf.internal.well_known_types"));
-    GOOGLE_DCHECK(well_known_types != nullptr);
-
-    WKT_classes = PyObject_GetAttrString(well_known_types.get(), "WKTBASES");
-    GOOGLE_DCHECK(WKT_classes != nullptr);
-  }
-
-  PyObject* well_known_class = PyDict_GetItemString(
-      WKT_classes, message_descriptor->full_name().c_str());
-  if (well_known_class == nullptr) {
-    new_args.reset(Py_BuildValue("s(OO)O", name, CMessage_Type,
-                                 PythonMessage_class, dict));
-  } else {
-    new_args.reset(Py_BuildValue("s(OOO)O", name, CMessage_Type,
-                                 PythonMessage_class, well_known_class, dict));
-  }
-
-  if (new_args == nullptr) {
-    return nullptr;
-  }
-  // Call the base metaclass.
-  ScopedPyObjectPtr result(PyType_Type.tp_new(type, new_args.get(), nullptr));
-  if (result == nullptr) {
-    return nullptr;
-  }
-  CMessageClass* newtype = reinterpret_cast<CMessageClass*>(result.get());
-
-  // Cache the descriptor, both as Python object and as C++ pointer.
-  const Descriptor* descriptor =
-      PyMessageDescriptor_AsDescriptor(py_descriptor);
-  if (descriptor == nullptr) {
-    return nullptr;
-  }
-  Py_INCREF(py_descriptor);
-  newtype->py_message_descriptor = py_descriptor;
-  newtype->message_descriptor = descriptor;
-  // TODO(amauryfa): Don't always use the canonical pool of the descriptor,
-  // use the MessageFactory optionally passed in the class dict.
-  PyDescriptorPool* py_descriptor_pool =
-      GetDescriptorPool_FromPool(descriptor->file()->pool());
-  if (py_descriptor_pool == nullptr) {
-    return nullptr;
-  }
-  newtype->py_message_factory = py_descriptor_pool->py_message_factory;
-  Py_INCREF(newtype->py_message_factory);
-
-  // Register the message in the MessageFactory.
-  // TODO(amauryfa): Move this call to MessageFactory.GetPrototype() when the
-  // MessageFactory is fully implemented in C++.
-  if (message_factory::RegisterMessageClass(newtype->py_message_factory,
-                                            descriptor, newtype) < 0) {
-    return nullptr;
-  }
-
-  // Continue with type initialization: add other descriptors, enum values...
-  if (AddDescriptors(result.get(), descriptor) < 0) {
-    return nullptr;
-  }
-  return result.release();
-}
-
-static void Dealloc(PyObject* pself) {
-  CMessageClass* self = reinterpret_cast<CMessageClass*>(pself);
-  Py_XDECREF(self->py_message_descriptor);
-  Py_XDECREF(self->py_message_factory);
-  return PyType_Type.tp_dealloc(pself);
-}
-
-static int GcTraverse(PyObject* pself, visitproc visit, void* arg) {
-  CMessageClass* self = reinterpret_cast<CMessageClass*>(pself);
-  Py_VISIT(self->py_message_descriptor);
-  Py_VISIT(self->py_message_factory);
-  return PyType_Type.tp_traverse(pself, visit, arg);
-}
-
-static int GcClear(PyObject* pself) {
-  // It's important to keep the descriptor and factory alive, until the
-  // C++ message is fully destructed.
-  return PyType_Type.tp_clear(pself);
-}
-
-// The _extensions_by_name dictionary is built on every access.
-// TODO(amauryfa): Migrate all users to pool.FindAllExtensions()
-static PyObject* GetExtensionsByName(CMessageClass *self, void *closure) {
-  if (self->message_descriptor == nullptr) {
-    // This is the base Message object, simply raise AttributeError.
-    PyErr_SetString(PyExc_AttributeError,
-                    "Base Message class has no DESCRIPTOR");
-    return nullptr;
-  }
-
-  const PyDescriptorPool* pool = self->py_message_factory->pool;
-
-  std::vector<const FieldDescriptor*> extensions;
-  pool->pool->FindAllExtensions(self->message_descriptor, &extensions);
-
-  ScopedPyObjectPtr result(PyDict_New());
-  for (int i = 0; i < extensions.size(); i++) {
-    ScopedPyObjectPtr extension(
-        PyFieldDescriptor_FromDescriptor(extensions[i]));
-    if (extension == nullptr) {
-      return nullptr;
-    }
-    if (PyDict_SetItemString(result.get(), extensions[i]->full_name().c_str(),
-                             extension.get()) < 0) {
-      return nullptr;
-    }
-  }
-  return result.release();
-}
-
-// The _extensions_by_number dictionary is built on every access.
-// TODO(amauryfa): Migrate all users to pool.FindExtensionByNumber()
-static PyObject* GetExtensionsByNumber(CMessageClass *self, void *closure) {
-  if (self->message_descriptor == nullptr) {
-    // This is the base Message object, simply raise AttributeError.
-    PyErr_SetString(PyExc_AttributeError,
-                    "Base Message class has no DESCRIPTOR");
-    return nullptr;
-  }
-
-  const PyDescriptorPool* pool = self->py_message_factory->pool;
-
-  std::vector<const FieldDescriptor*> extensions;
-  pool->pool->FindAllExtensions(self->message_descriptor, &extensions);
-
-  ScopedPyObjectPtr result(PyDict_New());
-  for (int i = 0; i < extensions.size(); i++) {
-    ScopedPyObjectPtr extension(
-        PyFieldDescriptor_FromDescriptor(extensions[i]));
-    if (extension == nullptr) {
-      return nullptr;
-    }
-    ScopedPyObjectPtr number(PyLong_FromLong(extensions[i]->number()));
-    if (number == nullptr) {
-      return nullptr;
-    }
-    if (PyDict_SetItem(result.get(), number.get(), extension.get()) < 0) {
-      return nullptr;
-    }
-  }
-  return result.release();
-}
-
-static PyGetSetDef Getters[] = {
-    {"_extensions_by_name", (getter)GetExtensionsByName, nullptr},
-    {"_extensions_by_number", (getter)GetExtensionsByNumber, nullptr},
-    {nullptr},
-};
-
-// Compute some class attributes on the fly:
-// - All the _FIELD_NUMBER attributes, for all fields and nested extensions.
-// Returns a new reference, or NULL with an exception set.
-static PyObject* GetClassAttribute(CMessageClass *self, PyObject* name) {
-  char* attr;
-  Py_ssize_t attr_size;
-  static const char kSuffix[] = "_FIELD_NUMBER";
-  if (PyString_AsStringAndSize(name, &attr, &attr_size) >= 0 &&
-      HasSuffixString(StringPiece(attr, attr_size), kSuffix)) {
-    std::string field_name(attr, attr_size - sizeof(kSuffix) + 1);
-    LowerString(&field_name);
-
-    // Try to find a field with the given name, without the suffix.
-    const FieldDescriptor* field =
-        self->message_descriptor->FindFieldByLowercaseName(field_name);
-    if (!field) {
-      // Search nested extensions as well.
-      field =
-          self->message_descriptor->FindExtensionByLowercaseName(field_name);
-    }
-    if (field) {
-      return PyLong_FromLong(field->number());
-    }
-  }
-  PyErr_SetObject(PyExc_AttributeError, name);
-  return nullptr;
-}
-
-static PyObject* GetAttr(CMessageClass* self, PyObject* name) {
-  PyObject* result = CMessageClass_Type->tp_base->tp_getattro(
-      reinterpret_cast<PyObject*>(self), name);
-  if (result != nullptr) {
-    return result;
-  }
-  if (!PyErr_ExceptionMatches(PyExc_AttributeError)) {
-    return nullptr;
-  }
-
-  PyErr_Clear();
-  return GetClassAttribute(self, name);
-}
-
-}  // namespace message_meta
-
-// Protobuf has a 64MB limit built in, this variable will override this. Please
-// do not enable this unless you fully understand the implications: protobufs
-// must all be kept in memory at the same time, so if they grow too big you may
-// get OOM errors. The protobuf APIs do not provide any tools for processing
-// protobufs in chunks.  If you have protos this big you should break them up if
-// it is at all convenient to do so.
-#ifdef PROTOBUF_PYTHON_ALLOW_OVERSIZE_PROTOS
-static bool allow_oversize_protos = true;
-#else
-static bool allow_oversize_protos = false;
-#endif
-
-static PyTypeObject _CMessageClass_Type = {
-    PyVarObject_HEAD_INIT(&PyType_Type, 0) FULL_MODULE_NAME
-    ".MessageMeta",         // tp_name
-    sizeof(CMessageClass),  // tp_basicsize
-    0,                      // tp_itemsize
-    message_meta::Dealloc,  // tp_dealloc
-#if PY_VERSION_HEX < 0x03080000
-    nullptr, /* tp_print */
-#else
-    0, /* tp_vectorcall_offset */
-#endif
-    nullptr,                              // tp_getattr
-    nullptr,                              // tp_setattr
-    nullptr,                              // tp_compare
-    nullptr,                              // tp_repr
-    nullptr,                              // tp_as_number
-    nullptr,                              // tp_as_sequence
-    nullptr,                              // tp_as_mapping
-    nullptr,                              // tp_hash
-    nullptr,                              // tp_call
-    nullptr,                              // tp_str
-    (getattrofunc)message_meta::GetAttr,  // tp_getattro
-    nullptr,                              // tp_setattro
-    nullptr,                              // tp_as_buffer
-    Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE | Py_TPFLAGS_HAVE_GC,  // tp_flags
-    "The metaclass of ProtocolMessages",                            // tp_doc
-    message_meta::GcTraverse,  // tp_traverse
-    message_meta::GcClear,     // tp_clear
-    nullptr,                   // tp_richcompare
-    0,                         // tp_weaklistoffset
-    nullptr,                   // tp_iter
-    nullptr,                   // tp_iternext
-    nullptr,                   // tp_methods
-    nullptr,                   // tp_members
-    message_meta::Getters,     // tp_getset
-    nullptr,                   // tp_base
-    nullptr,                   // tp_dict
-    nullptr,                   // tp_descr_get
-    nullptr,                   // tp_descr_set
-    0,                         // tp_dictoffset
-    nullptr,                   // tp_init
-    nullptr,                   // tp_alloc
-    message_meta::New,         // tp_new
-};
-PyTypeObject* CMessageClass_Type = &_CMessageClass_Type;
-
-static CMessageClass* CheckMessageClass(PyTypeObject* cls) {
-  if (!PyObject_TypeCheck(cls, CMessageClass_Type)) {
-    PyErr_Format(PyExc_TypeError, "Class %s is not a Message", cls->tp_name);
-    return nullptr;
-  }
-  return reinterpret_cast<CMessageClass*>(cls);
-}
-
-static const Descriptor* GetMessageDescriptor(PyTypeObject* cls) {
-  CMessageClass* type = CheckMessageClass(cls);
-  if (type == nullptr) {
-    return nullptr;
-  }
-  return type->message_descriptor;
-}
-
-// Forward declarations
-namespace cmessage {
-int InternalReleaseFieldByDescriptor(
-    CMessage* self,
-    const FieldDescriptor* field_descriptor);
-}  // namespace cmessage
-
-// ---------------------------------------------------------------------
-
-PyObject* EncodeError_class;
-PyObject* DecodeError_class;
-PyObject* PickleError_class;
-
-// Format an error message for unexpected types.
-// Always return with an exception set.
-void FormatTypeError(PyObject* arg, const char* expected_types) {
-  // This function is often called with an exception set.
-  // Clear it to call PyObject_Repr() in good conditions.
-  PyErr_Clear();
-  PyObject* repr = PyObject_Repr(arg);
-  if (repr) {
-    PyErr_Format(PyExc_TypeError,
-                 "%.100s has type %.100s, but expected one of: %s",
-                 PyString_AsString(repr),
-                 Py_TYPE(arg)->tp_name,
-                 expected_types);
-    Py_DECREF(repr);
-  }
-}
-
-void OutOfRangeError(PyObject* arg) {
-  PyObject *s = PyObject_Str(arg);
-  if (s) {
-    PyErr_Format(PyExc_ValueError,
-                 "Value out of range: %s",
-                 PyString_AsString(s));
-    Py_DECREF(s);
-  }
-}
-
-template<class RangeType, class ValueType>
-bool VerifyIntegerCastAndRange(PyObject* arg, ValueType value) {
-  if (PROTOBUF_PREDICT_FALSE(value == -1 && PyErr_Occurred())) {
-    if (PyErr_ExceptionMatches(PyExc_OverflowError)) {
-      // Replace it with the same ValueError as pure python protos instead of
-      // the default one.
-      PyErr_Clear();
-      OutOfRangeError(arg);
-    }  // Otherwise propagate existing error.
-    return false;
-  }
-  if (PROTOBUF_PREDICT_FALSE(!IsValidNumericCast<RangeType>(value))) {
-    OutOfRangeError(arg);
-    return false;
-  }
-  return true;
-}
-
-template <class T>
-bool CheckAndGetInteger(PyObject* arg, T* value) {
-  // This effectively defines an integer as "an object that can be cast as
-  // an integer and can be used as an ordinal number".
-  // This definition includes everything with a valid __index__() implementation
-  // and shouldn't cast the net too wide.
-  if (!strcmp(Py_TYPE(arg)->tp_name, "numpy.ndarray") ||
-      PROTOBUF_PREDICT_FALSE(!PyIndex_Check(arg))) {
-    FormatTypeError(arg, "int");
-    return false;
-  }
-
-  PyObject* arg_py_int = PyNumber_Index(arg);
-  if (PyErr_Occurred()) {
-    // Propagate existing error.
-    return false;
-  }
-
-  if (std::numeric_limits<T>::min() == 0) {
-    // Unsigned case.
-    unsigned PY_LONG_LONG ulong_result = PyLong_AsUnsignedLongLong(arg_py_int);
-    Py_DECREF(arg_py_int);
-    if (VerifyIntegerCastAndRange<T, unsigned PY_LONG_LONG>(arg,
-                                                            ulong_result)) {
-      *value = static_cast<T>(ulong_result);
-    } else {
-      return false;
-    }
-  } else {
-    // Signed case.
-    Py_DECREF(arg_py_int);
-    PY_LONG_LONG long_result = PyLong_AsLongLong(arg);
-    if (VerifyIntegerCastAndRange<T, PY_LONG_LONG>(arg, long_result)) {
-      *value = static_cast<T>(long_result);
-    } else {
-      return false;
-    }
-  }
-  return true;
-}
-
-// These are referenced by repeated_scalar_container, and must
-// be explicitly instantiated.
-template bool CheckAndGetInteger<int32>(PyObject*, int32*);
-template bool CheckAndGetInteger<int64>(PyObject*, int64*);
-template bool CheckAndGetInteger<uint32>(PyObject*, uint32*);
-template bool CheckAndGetInteger<uint64>(PyObject*, uint64*);
-
-bool CheckAndGetDouble(PyObject* arg, double* value) {
-  *value = PyFloat_AsDouble(arg);
-  if (!strcmp(Py_TYPE(arg)->tp_name, "numpy.ndarray") ||
-      PROTOBUF_PREDICT_FALSE(*value == -1 && PyErr_Occurred())) {
-    FormatTypeError(arg, "int, float");
-    return false;
-  }
-  return true;
-}
-
-bool CheckAndGetFloat(PyObject* arg, float* value) {
-  double double_value;
-  if (!CheckAndGetDouble(arg, &double_value)) {
-    return false;
-  }
-  *value = io::SafeDoubleToFloat(double_value);
-  return true;
-}
-
-bool CheckAndGetBool(PyObject* arg, bool* value) {
-  long long_value = PyLong_AsLong(arg);  // NOLINT
-  if (!strcmp(Py_TYPE(arg)->tp_name, "numpy.ndarray") ||
-      (long_value == -1 && PyErr_Occurred())) {
-    FormatTypeError(arg, "int, bool");
-    return false;
-  }
-  *value = static_cast<bool>(long_value);
-
-  return true;
-}
-
-// Checks whether the given object (which must be "bytes" or "unicode") contains
-// valid UTF-8.
-bool IsValidUTF8(PyObject* obj) {
-  if (PyBytes_Check(obj)) {
-    PyObject* unicode = PyUnicode_FromEncodedObject(obj, "utf-8", nullptr);
-
-    // Clear the error indicator; we report our own error when desired.
-    PyErr_Clear();
-
-    if (unicode) {
-      Py_DECREF(unicode);
-      return true;
-    } else {
-      return false;
-    }
-  } else {
-    // Unicode object, known to be valid UTF-8.
-    return true;
-  }
-}
-
-bool AllowInvalidUTF8(const FieldDescriptor* field) { return false; }
-
-PyObject* CheckString(PyObject* arg, const FieldDescriptor* descriptor) {
-  GOOGLE_DCHECK(descriptor->type() == FieldDescriptor::TYPE_STRING ||
-         descriptor->type() == FieldDescriptor::TYPE_BYTES);
-  if (descriptor->type() == FieldDescriptor::TYPE_STRING) {
-    if (!PyBytes_Check(arg) && !PyUnicode_Check(arg)) {
-      FormatTypeError(arg, "bytes, unicode");
-      return nullptr;
-    }
-
-    if (!IsValidUTF8(arg) && !AllowInvalidUTF8(descriptor)) {
-      PyObject* repr = PyObject_Repr(arg);
-      PyErr_Format(PyExc_ValueError,
-                   "%s has type str, but isn't valid UTF-8 "
-                   "encoding. Non-UTF-8 strings must be converted to "
-                   "unicode objects before being added.",
-                   PyString_AsString(repr));
-      Py_DECREF(repr);
-      return nullptr;
-    }
-  } else if (!PyBytes_Check(arg)) {
-    FormatTypeError(arg, "bytes");
-    return nullptr;
-  }
-
-  PyObject* encoded_string = nullptr;
-  if (descriptor->type() == FieldDescriptor::TYPE_STRING) {
-    if (PyBytes_Check(arg)) {
-      // The bytes were already validated as correctly encoded UTF-8 above.
-      encoded_string = arg;  // Already encoded.
-      Py_INCREF(encoded_string);
-    } else {
-      encoded_string = PyUnicode_AsEncodedString(arg, "utf-8", nullptr);
-    }
-  } else {
-    // In this case field type is "bytes".
-    encoded_string = arg;
-    Py_INCREF(encoded_string);
-  }
-
-  return encoded_string;
-}
-
-bool CheckAndSetString(
-    PyObject* arg, Message* message,
-    const FieldDescriptor* descriptor,
-    const Reflection* reflection,
-    bool append,
-    int index) {
-  ScopedPyObjectPtr encoded_string(CheckString(arg, descriptor));
-
-  if (encoded_string.get() == nullptr) {
-    return false;
-  }
-
-  char* value;
-  Py_ssize_t value_len;
-  if (PyBytes_AsStringAndSize(encoded_string.get(), &value, &value_len) < 0) {
-    return false;
-  }
-
-  std::string value_string(value, value_len);
-  if (append) {
-    reflection->AddString(message, descriptor, std::move(value_string));
-  } else if (index < 0) {
-    reflection->SetString(message, descriptor, std::move(value_string));
-  } else {
-    reflection->SetRepeatedString(message, descriptor, index,
-                                  std::move(value_string));
-  }
-  return true;
-}
-
-PyObject* ToStringObject(const FieldDescriptor* descriptor,
-                         const std::string& value) {
-  if (descriptor->type() != FieldDescriptor::TYPE_STRING) {
-    return PyBytes_FromStringAndSize(value.c_str(), value.length());
-  }
-
-  PyObject* result =
-      PyUnicode_DecodeUTF8(value.c_str(), value.length(), nullptr);
-  // If the string can't be decoded in UTF-8, just return a string object that
-  // contains the raw bytes. This can't happen if the value was assigned using
-  // the members of the Python message object, but can happen if the values were
-  // parsed from the wire (binary).
-  if (result == nullptr) {
-    PyErr_Clear();
-    result = PyBytes_FromStringAndSize(value.c_str(), value.length());
-  }
-  return result;
-}
-
-bool CheckFieldBelongsToMessage(const FieldDescriptor* field_descriptor,
-                                const Message* message) {
-  if (message->GetDescriptor() == field_descriptor->containing_type()) {
-    return true;
-  }
-  PyErr_Format(PyExc_KeyError, "Field '%s' does not belong to message '%s'",
-               field_descriptor->full_name().c_str(),
-               message->GetDescriptor()->full_name().c_str());
-  return false;
-}
-
-namespace cmessage {
-
-PyMessageFactory* GetFactoryForMessage(CMessage* message) {
-  GOOGLE_DCHECK(PyObject_TypeCheck(message, CMessage_Type));
-  return reinterpret_cast<CMessageClass*>(Py_TYPE(message))->py_message_factory;
-}
-
-static int MaybeReleaseOverlappingOneofField(
-    CMessage* cmessage,
-    const FieldDescriptor* field) {
-  Message* message = cmessage->message;
-  const Reflection* reflection = message->GetReflection();
-  if (!field->containing_oneof() ||
-      !reflection->HasOneof(*message, field->containing_oneof()) ||
-      reflection->HasField(*message, field)) {
-    // No other field in this oneof, no need to release.
-    return 0;
-  }
-
-  const OneofDescriptor* oneof = field->containing_oneof();
-  const FieldDescriptor* existing_field =
-      reflection->GetOneofFieldDescriptor(*message, oneof);
-  if (existing_field->cpp_type() != FieldDescriptor::CPPTYPE_MESSAGE) {
-    // Non-message fields don't need to be released.
-    return 0;
-  }
-  if (InternalReleaseFieldByDescriptor(cmessage, existing_field) < 0) {
-    return -1;
-  }
-  return 0;
-}
-
-// After a Merge, visit every sub-message that was read-only, and
-// eventually update their pointer if the Merge operation modified them.
-int FixupMessageAfterMerge(CMessage* self) {
-  if (!self->composite_fields) {
-    return 0;
-  }
-  PyMessageFactory* factory = GetFactoryForMessage(self);
-  for (const auto& item : *self->composite_fields) {
-    const FieldDescriptor* descriptor = item.first;
-    if (descriptor->cpp_type() == FieldDescriptor::CPPTYPE_MESSAGE &&
-        !descriptor->is_repeated()) {
-      CMessage* cmsg = reinterpret_cast<CMessage*>(item.second);
-      if (cmsg->read_only == false) {
-        return 0;
-      }
-      Message* message = self->message;
-      const Reflection* reflection = message->GetReflection();
-      if (reflection->HasField(*message, descriptor)) {
-        // Message used to be read_only, but is no longer. Get the new pointer
-        // and record it.
-        Message* mutable_message = reflection->MutableMessage(
-            message, descriptor, factory->message_factory);
-        cmsg->message = mutable_message;
-        cmsg->read_only = false;
-        if (FixupMessageAfterMerge(cmsg) < 0) {
-          return -1;
-        }
-      }
-    }
-  }
-
-  return 0;
-}
-
-// ---------------------------------------------------------------------
-// Making a message writable
-
-int AssureWritable(CMessage* self) {
-  if (self == nullptr || !self->read_only) {
-    return 0;
-  }
-
-  // Toplevel messages are always mutable.
-  GOOGLE_DCHECK(self->parent);
-
-  if (AssureWritable(self->parent) == -1) {
-    return -1;
-  }
-  // If this message is part of a oneof, there might be a field to release in
-  // the parent.
-  if (MaybeReleaseOverlappingOneofField(self->parent,
-                                        self->parent_field_descriptor) < 0) {
-    return -1;
-  }
-
-  // Make self->message writable.
-  Message* parent_message = self->parent->message;
-  const Reflection* reflection = parent_message->GetReflection();
-  Message* mutable_message = reflection->MutableMessage(
-      parent_message, self->parent_field_descriptor,
-      GetFactoryForMessage(self->parent)->message_factory);
-  if (mutable_message == nullptr) {
-    return -1;
-  }
-  self->message = mutable_message;
-  self->read_only = false;
-
-  return 0;
-}
-
-// --- Globals:
-
-// Retrieve a C++ FieldDescriptor for an extension handle.
-const FieldDescriptor* GetExtensionDescriptor(PyObject* extension) {
-  ScopedPyObjectPtr cdescriptor;
-  if (!PyObject_TypeCheck(extension, &PyFieldDescriptor_Type)) {
-    // Most callers consider extensions as a plain dictionary.  We should
-    // allow input which is not a field descriptor, and simply pretend it does
-    // not exist.
-    PyErr_SetObject(PyExc_KeyError, extension);
-    return nullptr;
-  }
-  return PyFieldDescriptor_AsDescriptor(extension);
-}
-
-// If value is a string, convert it into an enum value based on the labels in
-// descriptor, otherwise simply return value.  Always returns a new reference.
-static PyObject* GetIntegerEnumValue(const FieldDescriptor& descriptor,
-                                     PyObject* value) {
-  if (PyUnicode_Check(value)) {
-    const EnumDescriptor* enum_descriptor = descriptor.enum_type();
-    if (enum_descriptor == nullptr) {
-      PyErr_SetString(PyExc_TypeError, "not an enum field");
-      return nullptr;
-    }
-    char* enum_label;
-    Py_ssize_t size;
-    if (PyString_AsStringAndSize(value, &enum_label, &size) < 0) {
-      return nullptr;
-    }
-    const EnumValueDescriptor* enum_value_descriptor =
-        enum_descriptor->FindValueByName(StringParam(enum_label, size));
-    if (enum_value_descriptor == nullptr) {
-      PyErr_Format(PyExc_ValueError, "unknown enum label \"%s\"", enum_label);
-      return nullptr;
-    }
-    return PyLong_FromLong(enum_value_descriptor->number());
-  }
-  Py_INCREF(value);
-  return value;
-}
-
-// Delete a slice from a repeated field.
-// The only way to remove items in C++ protos is to delete the last one,
-// so we swap items to move the deleted ones at the end, and then strip the
-// sequence.
-int DeleteRepeatedField(
-    CMessage* self,
-    const FieldDescriptor* field_descriptor,
-    PyObject* slice) {
-  Py_ssize_t length, from, to, step, slice_length;
-  Message* message = self->message;
-  const Reflection* reflection = message->GetReflection();
-  int min, max;
-  length = reflection->FieldSize(*message, field_descriptor);
-
-  if (PySlice_Check(slice)) {
-    from = to = step = slice_length = 0;
-    PySlice_GetIndicesEx(slice, length, &from, &to, &step, &slice_length);
-    if (from < to) {
-      min = from;
-      max = to - 1;
-    } else {
-      min = to + 1;
-      max = from;
-    }
-  } else {
-    from = to = PyLong_AsLong(slice);
-    if (from == -1 && PyErr_Occurred()) {
-      PyErr_SetString(PyExc_TypeError, "list indices must be integers");
-      return -1;
-    }
-
-    if (from < 0) {
-      from = to = length + from;
-    }
-    step = 1;
-    min = max = from;
-
-    // Range check.
-    if (from < 0 || from >= length) {
-      PyErr_Format(PyExc_IndexError, "list assignment index out of range");
-      return -1;
-    }
-  }
-
-  Py_ssize_t i = from;
-  std::vector<bool> to_delete(length, false);
-  while (i >= min && i <= max) {
-    to_delete[i] = true;
-    i += step;
-  }
-
-  // Swap elements so that items to delete are at the end.
-  to = 0;
-  for (i = 0; i < length; ++i) {
-    if (!to_delete[i]) {
-      if (i != to) {
-        reflection->SwapElements(message, field_descriptor, i, to);
-      }
-      ++to;
-    }
-  }
-
-  Arena* arena = Arena::InternalGetArenaForAllocation(message);
-  GOOGLE_DCHECK_EQ(arena, nullptr)
-      << "python protobuf is expected to be allocated from heap";
-  // Remove items, starting from the end.
-  for (; length > to; length--) {
-    if (field_descriptor->cpp_type() != FieldDescriptor::CPPTYPE_MESSAGE) {
-      reflection->RemoveLast(message, field_descriptor);
-      continue;
-    }
-    // It seems that RemoveLast() is less efficient for sub-messages, and
-    // the memory is not completely released. Prefer ReleaseLast().
-    //
-    // To work around a debug hardening (PROTOBUF_FORCE_COPY_IN_RELEASE),
-    // explicitly use UnsafeArenaReleaseLast. To not break rare use cases where
-    // arena is used, we fallback to ReleaseLast (but GOOGLE_DCHECK to find/fix it).
-    //
-    // Note that arena is likely null and GOOGLE_DCHECK and ReleaesLast might be
-    // redundant. The current approach takes extra cautious path not to disrupt
-    // production.
-    Message* sub_message =
-        (arena == nullptr)
-            ? reflection->UnsafeArenaReleaseLast(message, field_descriptor)
-            : reflection->ReleaseLast(message, field_descriptor);
-    // If there is a live weak reference to an item being removed, we "Release"
-    // it, and it takes ownership of the message.
-    if (CMessage* released = self->MaybeReleaseSubMessage(sub_message)) {
-      released->message = sub_message;
-    } else {
-      // sub_message was not transferred, delete it.
-      delete sub_message;
-    }
-  }
-
-  return 0;
-}
-
-// Initializes fields of a message. Used in constructors.
-int InitAttributes(CMessage* self, PyObject* args, PyObject* kwargs) {
-  if (args != nullptr && PyTuple_Size(args) != 0) {
-    PyErr_SetString(PyExc_TypeError, "No positional arguments allowed");
-    return -1;
-  }
-
-  if (kwargs == nullptr) {
-    return 0;
-  }
-
-  Py_ssize_t pos = 0;
-  PyObject* name;
-  PyObject* value;
-  while (PyDict_Next(kwargs, &pos, &name, &value)) {
-    if (!(PyUnicode_Check(name))) {
-      PyErr_SetString(PyExc_ValueError, "Field name must be a string");
-      return -1;
-    }
-    ScopedPyObjectPtr property(
-        PyObject_GetAttr(reinterpret_cast<PyObject*>(Py_TYPE(self)), name));
-    if (property == nullptr ||
-        !PyObject_TypeCheck(property.get(), CFieldProperty_Type)) {
-      PyErr_Format(PyExc_ValueError, "Protocol message %s has no \"%s\" field.",
-                   self->message->GetDescriptor()->name().c_str(),
-                   PyString_AsString(name));
-      return -1;
-    }
-    const FieldDescriptor* descriptor =
-        reinterpret_cast<PyMessageFieldProperty*>(property.get())
-            ->field_descriptor;
-    if (value == Py_None) {
-      // field=None is the same as no field at all.
-      continue;
-    }
-    if (descriptor->is_map()) {
-      ScopedPyObjectPtr map(GetFieldValue(self, descriptor));
-      const FieldDescriptor* value_descriptor =
-          descriptor->message_type()->map_value();
-      if (value_descriptor->cpp_type() == FieldDescriptor::CPPTYPE_MESSAGE) {
-        ScopedPyObjectPtr iter(PyObject_GetIter(value));
-        if (iter == nullptr) {
-          PyErr_Format(PyExc_TypeError, "Argument %s is not iterable",
-                       PyString_AsString(name));
-          return -1;
-        }
-        ScopedPyObjectPtr next;
-        while ((next.reset(PyIter_Next(iter.get()))) != nullptr) {
-          ScopedPyObjectPtr source_value(PyObject_GetItem(value, next.get()));
-          ScopedPyObjectPtr dest_value(PyObject_GetItem(map.get(), next.get()));
-          if (source_value.get() == nullptr || dest_value.get() == nullptr) {
-            return -1;
-          }
-          ScopedPyObjectPtr ok(PyObject_CallMethod(
-              dest_value.get(), "MergeFrom", "O", source_value.get()));
-          if (ok.get() == nullptr) {
-            return -1;
-          }
-        }
-      } else {
-        ScopedPyObjectPtr function_return;
-        function_return.reset(
-            PyObject_CallMethod(map.get(), "update", "O", value));
-        if (function_return.get() == nullptr) {
-          return -1;
-        }
-      }
-    } else if (descriptor->label() == FieldDescriptor::LABEL_REPEATED) {
-      ScopedPyObjectPtr container(GetFieldValue(self, descriptor));
-      if (container == nullptr) {
-        return -1;
-      }
-      if (descriptor->cpp_type() == FieldDescriptor::CPPTYPE_MESSAGE) {
-        RepeatedCompositeContainer* rc_container =
-            reinterpret_cast<RepeatedCompositeContainer*>(container.get());
-        ScopedPyObjectPtr iter(PyObject_GetIter(value));
-        if (iter == nullptr) {
-          PyErr_SetString(PyExc_TypeError, "Value must be iterable");
-          return -1;
-        }
-        ScopedPyObjectPtr next;
-        while ((next.reset(PyIter_Next(iter.get()))) != nullptr) {
-          PyObject* kwargs = (PyDict_Check(next.get()) ? next.get() : nullptr);
-          ScopedPyObjectPtr new_msg(
-              repeated_composite_container::Add(rc_container, nullptr, kwargs));
-          if (new_msg == nullptr) {
-            return -1;
-          }
-          if (kwargs == nullptr) {
-            // next was not a dict, it's a message we need to merge
-            ScopedPyObjectPtr merged(MergeFrom(
-                reinterpret_cast<CMessage*>(new_msg.get()), next.get()));
-            if (merged.get() == nullptr) {
-              return -1;
-            }
-          }
-        }
-        if (PyErr_Occurred()) {
-          // Check to see how PyIter_Next() exited.
-          return -1;
-        }
-      } else if (descriptor->cpp_type() == FieldDescriptor::CPPTYPE_ENUM) {
-        RepeatedScalarContainer* rs_container =
-            reinterpret_cast<RepeatedScalarContainer*>(container.get());
-        ScopedPyObjectPtr iter(PyObject_GetIter(value));
-        if (iter == nullptr) {
-          PyErr_SetString(PyExc_TypeError, "Value must be iterable");
-          return -1;
-        }
-        ScopedPyObjectPtr next;
-        while ((next.reset(PyIter_Next(iter.get()))) != nullptr) {
-          ScopedPyObjectPtr enum_value(
-              GetIntegerEnumValue(*descriptor, next.get()));
-          if (enum_value == nullptr) {
-            return -1;
-          }
-          ScopedPyObjectPtr new_msg(repeated_scalar_container::Append(
-              rs_container, enum_value.get()));
-          if (new_msg == nullptr) {
-            return -1;
-          }
-        }
-        if (PyErr_Occurred()) {
-          // Check to see how PyIter_Next() exited.
-          return -1;
-        }
-      } else {
-        if (ScopedPyObjectPtr(repeated_scalar_container::Extend(
-                reinterpret_cast<RepeatedScalarContainer*>(container.get()),
-                value)) == nullptr) {
-          return -1;
-        }
-      }
-    } else if (descriptor->cpp_type() == FieldDescriptor::CPPTYPE_MESSAGE) {
-      ScopedPyObjectPtr message(GetFieldValue(self, descriptor));
-      if (message == nullptr) {
-        return -1;
-      }
-      CMessage* cmessage = reinterpret_cast<CMessage*>(message.get());
-      if (PyDict_Check(value)) {
-        // Make the message exist even if the dict is empty.
-        AssureWritable(cmessage);
-        if (InitAttributes(cmessage, nullptr, value) < 0) {
-          return -1;
-        }
-      } else {
-        ScopedPyObjectPtr merged(MergeFrom(cmessage, value));
-        if (merged == nullptr) {
-          return -1;
-        }
-      }
-    } else {
-      ScopedPyObjectPtr new_val;
-      if (descriptor->cpp_type() == FieldDescriptor::CPPTYPE_ENUM) {
-        new_val.reset(GetIntegerEnumValue(*descriptor, value));
-        if (new_val == nullptr) {
-          return -1;
-        }
-        value = new_val.get();
-      }
-      if (SetFieldValue(self, descriptor, value) < 0) {
-        return -1;
-      }
-    }
-  }
-  return 0;
-}
-
-// Allocates an incomplete Python Message: the caller must fill self->message
-// and eventually self->parent.
-CMessage* NewEmptyMessage(CMessageClass* type) {
-  CMessage* self = reinterpret_cast<CMessage*>(
-      PyType_GenericAlloc(&type->super.ht_type, 0));
-  if (self == nullptr) {
-    return nullptr;
-  }
-
-  self->message = nullptr;
-  self->parent = nullptr;
-  self->parent_field_descriptor = nullptr;
-  self->read_only = false;
-
-  self->composite_fields = nullptr;
-  self->child_submessages = nullptr;
-
-  self->unknown_field_set = nullptr;
-
-  return self;
-}
-
-// The __new__ method of Message classes.
-// Creates a new C++ message and takes ownership.
-static CMessage* NewCMessage(CMessageClass* type) {
-  // Retrieve the message descriptor and the default instance (=prototype).
-  const Descriptor* message_descriptor = type->message_descriptor;
-  if (message_descriptor == nullptr) {
-    // This would be very unexpected since the CMessageClass has already
-    // been checked.
-    PyErr_Format(PyExc_TypeError,
-                 "CMessageClass object '%s' has no descriptor.",
-                 Py_TYPE(type)->tp_name);
-    return nullptr;
-  }
-  const Message* prototype =
-      type->py_message_factory->message_factory->GetPrototype(
-          message_descriptor);
-  if (prototype == nullptr) {
-    PyErr_SetString(PyExc_TypeError, message_descriptor->full_name().c_str());
-    return nullptr;
-  }
-
-  CMessage* self = NewEmptyMessage(type);
-  if (self == nullptr) {
-    return nullptr;
-  }
-  self->message = prototype->New(nullptr);  // Ensures no arena is used.
-  self->parent = nullptr;  // This message owns its data.
-  return self;
-}
-
-static PyObject* New(PyTypeObject* cls, PyObject* unused_args,
-                     PyObject* unused_kwargs) {
-  CMessageClass* type = CheckMessageClass(cls);
-  if (type == nullptr) {
-    return nullptr;
-  }
-  return reinterpret_cast<PyObject*>(NewCMessage(type));
-}
-
-// The __init__ method of Message classes.
-// It initializes fields from keywords passed to the constructor.
-static int Init(CMessage* self, PyObject* args, PyObject* kwargs) {
-  return InitAttributes(self, args, kwargs);
-}
-
-// ---------------------------------------------------------------------
-// Deallocating a CMessage
-
-static void Dealloc(CMessage* self) {
-  if (self->weakreflist) {
-    PyObject_ClearWeakRefs(reinterpret_cast<PyObject*>(self));
-  }
-  // At this point all dependent objects have been removed.
-  GOOGLE_DCHECK(!self->child_submessages || self->child_submessages->empty());
-  GOOGLE_DCHECK(!self->composite_fields || self->composite_fields->empty());
-  delete self->child_submessages;
-  delete self->composite_fields;
-  if (self->unknown_field_set) {
-    unknown_fields::Clear(
-        reinterpret_cast<PyUnknownFields*>(self->unknown_field_set));
-  }
-
-  CMessage* parent = self->parent;
-  if (!parent) {
-    // No parent, we own the message.
-    delete self->message;
-  } else if (parent->AsPyObject() == Py_None) {
-    // Message owned externally: Nothing to dealloc
-    Py_CLEAR(self->parent);
-  } else {
-    // Clear this message from its parent's map.
-    if (self->parent_field_descriptor->is_repeated()) {
-      if (parent->child_submessages)
-        parent->child_submessages->erase(self->message);
-    } else {
-      if (parent->composite_fields)
-        parent->composite_fields->erase(self->parent_field_descriptor);
-    }
-    Py_CLEAR(self->parent);
-  }
-  Py_TYPE(self)->tp_free(reinterpret_cast<PyObject*>(self));
-}
-
-// ---------------------------------------------------------------------
-
-
-PyObject* IsInitialized(CMessage* self, PyObject* args) {
-  PyObject* errors = nullptr;
-  if (!PyArg_ParseTuple(args, "|O", &errors)) {
-    return nullptr;
-  }
-  if (self->message->IsInitialized()) {
-    Py_RETURN_TRUE;
-  }
-  if (errors != nullptr) {
-    ScopedPyObjectPtr initialization_errors(
-        FindInitializationErrors(self));
-    if (initialization_errors == nullptr) {
-      return nullptr;
-    }
-    ScopedPyObjectPtr extend_name(PyUnicode_FromString("extend"));
-    if (extend_name == nullptr) {
-      return nullptr;
-    }
-    ScopedPyObjectPtr result(PyObject_CallMethodObjArgs(
-        errors, extend_name.get(), initialization_errors.get(), nullptr));
-    if (result == nullptr) {
-      return nullptr;
-    }
-  }
-  Py_RETURN_FALSE;
-}
-
-int HasFieldByDescriptor(CMessage* self,
-                         const FieldDescriptor* field_descriptor) {
-  Message* message = self->message;
-  if (!CheckFieldBelongsToMessage(field_descriptor, message)) {
-    return -1;
-  }
-  if (field_descriptor->label() == FieldDescriptor::LABEL_REPEATED) {
-    PyErr_SetString(PyExc_KeyError,
-                    "Field is repeated. A singular method is required.");
-    return -1;
-  }
-  return message->GetReflection()->HasField(*message, field_descriptor);
-}
-
-const FieldDescriptor* FindFieldWithOneofs(const Message* message,
-                                           ConstStringParam field_name,
-                                           bool* in_oneof) {
-  *in_oneof = false;
-  const Descriptor* descriptor = message->GetDescriptor();
-  const FieldDescriptor* field_descriptor =
-      descriptor->FindFieldByName(field_name);
-  if (field_descriptor != nullptr) {
-    return field_descriptor;
-  }
-  const OneofDescriptor* oneof_desc =
-      descriptor->FindOneofByName(field_name);
-  if (oneof_desc != nullptr) {
-    *in_oneof = true;
-    return message->GetReflection()->GetOneofFieldDescriptor(*message,
-                                                             oneof_desc);
-  }
-  return nullptr;
-}
-
-bool CheckHasPresence(const FieldDescriptor* field_descriptor, bool in_oneof) {
-  auto message_name = field_descriptor->containing_type()->name();
-  if (field_descriptor->label() == FieldDescriptor::LABEL_REPEATED) {
-    PyErr_Format(PyExc_ValueError,
-                 "Protocol message %s has no singular \"%s\" field.",
-                 message_name.c_str(), field_descriptor->name().c_str());
-    return false;
-  }
-
-  if (!field_descriptor->has_presence()) {
-    PyErr_Format(PyExc_ValueError,
-                 "Can't test non-optional, non-submessage field \"%s.%s\" for "
-                 "presence in proto3.",
-                 message_name.c_str(), field_descriptor->name().c_str());
-    return false;
-  }
-
-  return true;
-}
-
-PyObject* HasField(CMessage* self, PyObject* arg) {
-  char* field_name;
-  Py_ssize_t size;
-  field_name = const_cast<char*>(PyUnicode_AsUTF8AndSize(arg, &size));
-  if (!field_name) {
-    return nullptr;
-  }
-
-  Message* message = self->message;
-  bool is_in_oneof;
-  const FieldDescriptor* field_descriptor =
-      FindFieldWithOneofs(message, StringParam(field_name, size), &is_in_oneof);
-  if (field_descriptor == nullptr) {
-    if (!is_in_oneof) {
-      PyErr_Format(PyExc_ValueError, "Protocol message %s has no field %s.",
-                   message->GetDescriptor()->name().c_str(), field_name);
-      return nullptr;
-    } else {
-      Py_RETURN_FALSE;
-    }
-  }
-
-  if (!CheckHasPresence(field_descriptor, is_in_oneof)) {
-    return nullptr;
-  }
-
-  if (message->GetReflection()->HasField(*message, field_descriptor)) {
-    Py_RETURN_TRUE;
-  }
-
-  Py_RETURN_FALSE;
-}
-
-PyObject* ClearExtension(CMessage* self, PyObject* extension) {
-  const FieldDescriptor* descriptor = GetExtensionDescriptor(extension);
-  if (descriptor == nullptr) {
-    return nullptr;
-  }
-  if (ClearFieldByDescriptor(self, descriptor) < 0) {
-    return nullptr;
-  }
-  Py_RETURN_NONE;
-}
-
-PyObject* HasExtension(CMessage* self, PyObject* extension) {
-  const FieldDescriptor* descriptor = GetExtensionDescriptor(extension);
-  if (descriptor == nullptr) {
-    return nullptr;
-  }
-  int has_field = HasFieldByDescriptor(self, descriptor);
-  if (has_field < 0) {
-    return nullptr;
-  } else {
-    return PyBool_FromLong(has_field);
-  }
-}
-
-// ---------------------------------------------------------------------
-// Releasing messages
-//
-// The Python API's ClearField() and Clear() methods behave
-// differently than their C++ counterparts.  While the C++ versions
-// clears the children, the Python versions detaches the children,
-// without touching their content.  This impedance mismatch causes
-// some complexity in the implementation, which is captured in this
-// section.
-//
-// When one or multiple fields are cleared we need to:
-//
-// * Gather all child objects that need to be detached from the message.
-//   In composite_fields and child_submessages.
-//
-// * Create a new Python message of the same kind. Use SwapFields() to move
-//   data from the original message.
-//
-// * Change the parent of all child objects: update their strong reference
-//   to their parent, and move their presence in composite_fields and
-//   child_submessages.
-
-// ---------------------------------------------------------------------
-// Release a composite child of a CMessage
-
-static int InternalReparentFields(
-    CMessage* self, const std::vector<CMessage*>& messages_to_release,
-    const std::vector<ContainerBase*>& containers_to_release) {
-  if (messages_to_release.empty() && containers_to_release.empty()) {
-    return 0;
-  }
-
-  // Move all the passed sub_messages to another message.
-  CMessage* new_message = cmessage::NewEmptyMessage(self->GetMessageClass());
-  if (new_message == nullptr) {
-    return -1;
-  }
-  new_message->message = self->message->New(nullptr);
-  ScopedPyObjectPtr holder(reinterpret_cast<PyObject*>(new_message));
-  new_message->child_submessages = new CMessage::SubMessagesMap();
-  new_message->composite_fields = new CMessage::CompositeFieldsMap();
-  std::set<const FieldDescriptor*> fields_to_swap;
-
-  // In case this the removed fields are the last reference to a message, keep
-  // a reference.
-  Py_INCREF(self);
-
-  for (const auto& to_release : messages_to_release) {
-    fields_to_swap.insert(to_release->parent_field_descriptor);
-    // Reparent
-    Py_INCREF(new_message);
-    Py_DECREF(to_release->parent);
-    to_release->parent = new_message;
-    self->child_submessages->erase(to_release->message);
-    new_message->child_submessages->emplace(to_release->message, to_release);
-  }
-
-  for (const auto& to_release : containers_to_release) {
-    fields_to_swap.insert(to_release->parent_field_descriptor);
-    Py_INCREF(new_message);
-    Py_DECREF(to_release->parent);
-    to_release->parent = new_message;
-    self->composite_fields->erase(to_release->parent_field_descriptor);
-    new_message->composite_fields->emplace(to_release->parent_field_descriptor,
-                                           to_release);
-  }
-
-  if (self->message->GetArena() == new_message->message->GetArena()) {
-    MessageReflectionFriend::UnsafeShallowSwapFields(
-        self->message, new_message->message,
-        std::vector<const FieldDescriptor*>(fields_to_swap.begin(),
-                                            fields_to_swap.end()));
-  } else {
-    self->message->GetReflection()->SwapFields(
-        self->message, new_message->message,
-        std::vector<const FieldDescriptor*>(fields_to_swap.begin(),
-                                            fields_to_swap.end()));
-  }
-
-  // This might delete the Python message completely if all children were moved.
-  Py_DECREF(self);
-
-  return 0;
-}
-
-int InternalReleaseFieldByDescriptor(
-    CMessage* self,
-    const FieldDescriptor* field_descriptor) {
-  if (!field_descriptor->is_repeated() &&
-      field_descriptor->cpp_type() != FieldDescriptor::CPPTYPE_MESSAGE) {
-    // Single scalars are not in any cache.
-    return 0;
-  }
-  std::vector<CMessage*> messages_to_release;
-  std::vector<ContainerBase*> containers_to_release;
-  if (self->child_submessages && field_descriptor->is_repeated() &&
-      field_descriptor->cpp_type() == FieldDescriptor::CPPTYPE_MESSAGE) {
-    for (const auto& child_item : *self->child_submessages) {
-      if (child_item.second->parent_field_descriptor == field_descriptor) {
-        messages_to_release.push_back(child_item.second);
-      }
-    }
-  }
-  if (self->composite_fields) {
-    CMessage::CompositeFieldsMap::iterator it =
-        self->composite_fields->find(field_descriptor);
-    if (it != self->composite_fields->end()) {
-      containers_to_release.push_back(it->second);
-    }
-  }
-
-  return InternalReparentFields(self, messages_to_release,
-                                containers_to_release);
-}
-
-int ClearFieldByDescriptor(CMessage* self,
-                           const FieldDescriptor* field_descriptor) {
-  if (!CheckFieldBelongsToMessage(field_descriptor, self->message)) {
-    return -1;
-  }
-  if (InternalReleaseFieldByDescriptor(self, field_descriptor) < 0) {
-    return -1;
-  }
-  AssureWritable(self);
-  Message* message = self->message;
-  message->GetReflection()->ClearField(message, field_descriptor);
-  return 0;
-}
-
-PyObject* ClearField(CMessage* self, PyObject* arg) {
-  char* field_name;
-  Py_ssize_t field_size;
-  if (PyString_AsStringAndSize(arg, &field_name, &field_size) < 0) {
-    return nullptr;
-  }
-  AssureWritable(self);
-  bool is_in_oneof;
-  const FieldDescriptor* field_descriptor = FindFieldWithOneofs(
-      self->message, StringParam(field_name, field_size), &is_in_oneof);
-  if (field_descriptor == nullptr) {
-    if (is_in_oneof) {
-      // We gave the name of a oneof, and none of its fields are set.
-      Py_RETURN_NONE;
-    } else {
-      PyErr_Format(PyExc_ValueError,
-                   "Protocol message has no \"%s\" field.", field_name);
-      return nullptr;
-    }
-  }
-
-  if (ClearFieldByDescriptor(self, field_descriptor) < 0) {
-    return nullptr;
-  }
-  Py_RETURN_NONE;
-}
-
-PyObject* Clear(CMessage* self) {
-  AssureWritable(self);
-  // Detach all current fields of this message
-  std::vector<CMessage*> messages_to_release;
-  std::vector<ContainerBase*> containers_to_release;
-  if (self->child_submessages) {
-    for (const auto& item : *self->child_submessages) {
-      messages_to_release.push_back(item.second);
-    }
-  }
-  if (self->composite_fields) {
-    for (const auto& item : *self->composite_fields) {
-      containers_to_release.push_back(item.second);
-    }
-  }
-  if (InternalReparentFields(self, messages_to_release, containers_to_release) <
-      0) {
-    return nullptr;
-  }
-  if (self->unknown_field_set) {
-    unknown_fields::Clear(
-        reinterpret_cast<PyUnknownFields*>(self->unknown_field_set));
-    self->unknown_field_set = nullptr;
-  }
-  self->message->Clear();
-  Py_RETURN_NONE;
-}
-
-// ---------------------------------------------------------------------
-
-static std::string GetMessageName(CMessage* self) {
-  if (self->parent_field_descriptor != nullptr) {
-    return self->parent_field_descriptor->full_name();
-  } else {
-    return self->message->GetDescriptor()->full_name();
-  }
-}
-
-static PyObject* InternalSerializeToString(
-    CMessage* self, PyObject* args, PyObject* kwargs,
-    bool require_initialized) {
-  // Parse the "deterministic" kwarg; defaults to False.
-  static const char* kwlist[] = {"deterministic", nullptr};
-  PyObject* deterministic_obj = Py_None;
-  if (!PyArg_ParseTupleAndKeywords(
-          args, kwargs, "|O", const_cast<char**>(kwlist), &deterministic_obj)) {
-    return nullptr;
-  }
-  // Preemptively convert to a bool first, so we don't need to back out of
-  // allocating memory if this raises an exception.
-  // NOTE: This is unused later if deterministic == Py_None, but that's fine.
-  int deterministic = PyObject_IsTrue(deterministic_obj);
-  if (deterministic < 0) {
-    return nullptr;
-  }
-
-  if (require_initialized && !self->message->IsInitialized()) {
-    ScopedPyObjectPtr errors(FindInitializationErrors(self));
-    if (errors == nullptr) {
-      return nullptr;
-    }
-    ScopedPyObjectPtr comma(PyUnicode_FromString(","));
-    if (comma == nullptr) {
-      return nullptr;
-    }
-    ScopedPyObjectPtr joined(
-        PyObject_CallMethod(comma.get(), "join", "O", errors.get()));
-    if (joined == nullptr) {
-      return nullptr;
-    }
-
-    // TODO(haberman): this is a (hopefully temporary) hack.  The unit testing
-    // infrastructure reloads all pure-Python modules for every test, but not
-    // C++ modules (because that's generally impossible:
-    // http://bugs.python.org/issue1144263).  But if we cache EncodeError, we'll
-    // return the EncodeError from a previous load of the module, which won't
-    // match a user's attempt to catch EncodeError.  So we have to look it up
-    // again every time.
-    ScopedPyObjectPtr message_module(PyImport_ImportModule(
-        "google.protobuf.message"));
-    if (message_module.get() == nullptr) {
-      return nullptr;
-    }
-
-    ScopedPyObjectPtr encode_error(
-        PyObject_GetAttrString(message_module.get(), "EncodeError"));
-    if (encode_error.get() == nullptr) {
-      return nullptr;
-    }
-    PyErr_Format(encode_error.get(),
-                 "Message %s is missing required fields: %s",
-                 GetMessageName(self).c_str(), PyString_AsString(joined.get()));
-    return nullptr;
-  }
-
-  // Ok, arguments parsed and errors checked, now encode to a string
-  const size_t size = self->message->ByteSizeLong();
-  if (size == 0) {
-    return PyBytes_FromString("");
-  }
-
-  if (size > INT_MAX) {
-    PyErr_Format(PyExc_ValueError,
-                 "Message %s exceeds maximum protobuf "
-                 "size of 2GB: %zu",
-                 GetMessageName(self).c_str(), size);
-    return nullptr;
-  }
-
-  PyObject* result = PyBytes_FromStringAndSize(nullptr, size);
-  if (result == nullptr) {
-    return nullptr;
-  }
-  io::ArrayOutputStream out(PyBytes_AS_STRING(result), size);
-  io::CodedOutputStream coded_out(&out);
-  if (deterministic_obj != Py_None) {
-    coded_out.SetSerializationDeterministic(deterministic);
-  }
-  self->message->SerializeWithCachedSizes(&coded_out);
-  GOOGLE_CHECK(!coded_out.HadError());
-  return result;
-}
-
-static PyObject* SerializeToString(
-    CMessage* self, PyObject* args, PyObject* kwargs) {
-  return InternalSerializeToString(self, args, kwargs,
-                                   /*require_initialized=*/true);
-}
-
-static PyObject* SerializePartialToString(
-    CMessage* self, PyObject* args, PyObject* kwargs) {
-  return InternalSerializeToString(self, args, kwargs,
-                                   /*require_initialized=*/false);
-}
-
-// Formats proto fields for ascii dumps using python formatting functions where
-// appropriate.
-class PythonFieldValuePrinter : public TextFormat::FastFieldValuePrinter {
- public:
-  // Python has some differences from C++ when printing floating point numbers.
-  //
-  // 1) Trailing .0 is always printed.
-  // 2) (Python2) Output is rounded to 12 digits.
-  // 3) (Python3) The full precision of the double is preserved (and Python uses
-  //    David M. Gay's dtoa(), when the C++ code uses SimpleDtoa. There are some
-  //    differences, but they rarely happen)
-  //
-  // We override floating point printing with the C-API function for printing
-  // Python floats to ensure consistency.
-  void PrintFloat(float val,
-                  TextFormat::BaseTextGenerator* generator) const override {
-    PrintDouble(val, generator);
-  }
-  void PrintDouble(double val,
-                   TextFormat::BaseTextGenerator* generator) const override {
-    // This implementation is not highly optimized (it allocates two temporary
-    // Python objects) but it is simple and portable.  If this is shown to be a
-    // performance bottleneck, we can optimize it, but the results will likely
-    // be more complicated to accommodate the differing behavior of double
-    // formatting between Python 2 and Python 3.
-    //
-    // (Though a valid question is: do we really want to make out output
-    // dependent on the Python version?)
-    ScopedPyObjectPtr py_value(PyFloat_FromDouble(val));
-    if (!py_value.get()) {
-      return;
-    }
-
-    ScopedPyObjectPtr py_str(PyObject_Str(py_value.get()));
-    if (!py_str.get()) {
-      return;
-    }
-
-    generator->PrintString(PyString_AsString(py_str.get()));
-  }
-};
-
-static PyObject* ToStr(CMessage* self) {
-  TextFormat::Printer printer;
-  // Passes ownership
-  printer.SetDefaultFieldValuePrinter(new PythonFieldValuePrinter());
-  printer.SetHideUnknownFields(true);
-  std::string output;
-  if (!printer.PrintToString(*self->message, &output)) {
-    PyErr_SetString(PyExc_ValueError, "Unable to convert message to str");
-    return nullptr;
-  }
-  return PyUnicode_FromString(output.c_str());
-}
-
-PyObject* MergeFrom(CMessage* self, PyObject* arg) {
-  CMessage* other_message;
-  if (!PyObject_TypeCheck(arg, CMessage_Type)) {
-    PyErr_Format(PyExc_TypeError,
-                 "Parameter to MergeFrom() must be instance of same class: "
-                 "expected %s got %s.",
-                 self->message->GetDescriptor()->full_name().c_str(),
-                 Py_TYPE(arg)->tp_name);
-    return nullptr;
-  }
-
-  other_message = reinterpret_cast<CMessage*>(arg);
-  if (other_message->message->GetDescriptor() !=
-      self->message->GetDescriptor()) {
-    PyErr_Format(PyExc_TypeError,
-                 "Parameter to MergeFrom() must be instance of same class: "
-                 "expected %s got %s.",
-                 self->message->GetDescriptor()->full_name().c_str(),
-                 other_message->message->GetDescriptor()->full_name().c_str());
-    return nullptr;
-  }
-  AssureWritable(self);
-
-  self->message->MergeFrom(*other_message->message);
-  // Child message might be lazily created before MergeFrom. Make sure they
-  // are mutable at this point if child messages are really created.
-  if (FixupMessageAfterMerge(self) < 0) {
-    return nullptr;
-  }
-
-  Py_RETURN_NONE;
-}
-
-static PyObject* CopyFrom(CMessage* self, PyObject* arg) {
-  CMessage* other_message;
-  if (!PyObject_TypeCheck(arg, CMessage_Type)) {
-    PyErr_Format(PyExc_TypeError,
-                 "Parameter to CopyFrom() must be instance of same class: "
-                 "expected %s got %s.",
-                 self->message->GetDescriptor()->full_name().c_str(),
-                 Py_TYPE(arg)->tp_name);
-    return nullptr;
-  }
-
-  other_message = reinterpret_cast<CMessage*>(arg);
-
-  if (self == other_message) {
-    Py_RETURN_NONE;
-  }
-
-  if (other_message->message->GetDescriptor() !=
-      self->message->GetDescriptor()) {
-    PyErr_Format(PyExc_TypeError,
-                 "Parameter to CopyFrom() must be instance of same class: "
-                 "expected %s got %s.",
-                 self->message->GetDescriptor()->full_name().c_str(),
-                 other_message->message->GetDescriptor()->full_name().c_str());
-    return nullptr;
-  }
-
-  AssureWritable(self);
-
-  // CopyFrom on the message will not clean up self->composite_fields,
-  // which can leave us in an inconsistent state, so clear it out here.
-  (void)ScopedPyObjectPtr(Clear(self));
-
-  self->message->CopyFrom(*other_message->message);
-
-  Py_RETURN_NONE;
-}
-
-// Provide a method in the module to set allow_oversize_protos to a boolean
-// value. This method returns the newly value of allow_oversize_protos.
-PyObject* SetAllowOversizeProtos(PyObject* m, PyObject* arg) {
-  if (!arg || !PyBool_Check(arg)) {
-    PyErr_SetString(PyExc_TypeError,
-                    "Argument to SetAllowOversizeProtos must be boolean");
-    return nullptr;
-  }
-  allow_oversize_protos = PyObject_IsTrue(arg);
-  if (allow_oversize_protos) {
-    Py_RETURN_TRUE;
-  } else {
-    Py_RETURN_FALSE;
-  }
-}
-
-static PyObject* MergeFromString(CMessage* self, PyObject* arg) {
-  Py_buffer data;
-  if (PyObject_GetBuffer(arg, &data, PyBUF_SIMPLE) < 0) {
-    return nullptr;
-  }
-
-  AssureWritable(self);
-
-  PyMessageFactory* factory = GetFactoryForMessage(self);
-  int depth = allow_oversize_protos
-                  ? INT_MAX
-                  : io::CodedInputStream::GetDefaultRecursionLimit();
-  const char* ptr;
-  internal::ParseContext ctx(
-      depth, false, &ptr,
-      StringPiece(static_cast<const char*>(data.buf), data.len));
-  PyBuffer_Release(&data);
-  ctx.data().pool = factory->pool->pool;
-  ctx.data().factory = factory->message_factory;
-
-  ptr = self->message->_InternalParse(ptr, &ctx);
-
-  // Child message might be lazily created before MergeFrom. Make sure they
-  // are mutable at this point if child messages are really created.
-  if (FixupMessageAfterMerge(self) < 0) {
-    return nullptr;
-  }
-
-  // Python makes distinction in error message, between a general parse failure
-  // and in-correct ending on a terminating tag. Hence we need to be a bit more
-  // explicit in our correctness checks.
-  if (ptr == nullptr) {
-    // Parse error.
-    PyErr_Format(
-        DecodeError_class, "Error parsing message with type '%s'",
-        self->GetMessageClass()->message_descriptor->full_name().c_str());
-    return nullptr;
-  }
-  if (ctx.BytesUntilLimit(ptr) < 0) {
-    // The parser overshot the limit.
-    PyErr_Format(
-        DecodeError_class,
-        "Error parsing message as the message exceeded the protobuf limit "
-        "with type '%s'",
-        self->GetMessageClass()->message_descriptor->full_name().c_str());
-    return nullptr;
-  }
-
-  // ctx has an explicit limit set (length of string_view), so we have to
-  // check we ended at that limit.
-  if (!ctx.EndedAtLimit()) {
-    // TODO(jieluo): Raise error and return NULL instead.
-    // b/27494216
-    PyErr_Warn(nullptr, "Unexpected end-group tag: Not all data was converted");
-    return PyLong_FromLong(data.len - ctx.BytesUntilLimit(ptr));
-  }
-  return PyLong_FromLong(data.len);
-}
-
-static PyObject* ParseFromString(CMessage* self, PyObject* arg) {
-  if (ScopedPyObjectPtr(Clear(self)) == nullptr) {
-    return nullptr;
-  }
-  return MergeFromString(self, arg);
-}
-
-static PyObject* ByteSize(CMessage* self, PyObject* args) {
-  return PyLong_FromLong(self->message->ByteSizeLong());
-}
-
-PyObject* RegisterExtension(PyObject* cls, PyObject* extension_handle) {
-  const FieldDescriptor* descriptor =
-      GetExtensionDescriptor(extension_handle);
-  if (descriptor == nullptr) {
-    return nullptr;
-  }
-  if (!PyObject_TypeCheck(cls, CMessageClass_Type)) {
-    PyErr_Format(PyExc_TypeError, "Expected a message class, got %s",
-                 cls->ob_type->tp_name);
-    return nullptr;
-  }
-  CMessageClass *message_class = reinterpret_cast<CMessageClass*>(cls);
-  if (message_class == nullptr) {
-    return nullptr;
-  }
-  // If the extension was already registered, check that it is the same.
-  const FieldDescriptor* existing_extension =
-      message_class->py_message_factory->pool->pool->FindExtensionByNumber(
-          descriptor->containing_type(), descriptor->number());
-  if (existing_extension != nullptr && existing_extension != descriptor) {
-    PyErr_SetString(PyExc_ValueError, "Double registration of Extensions");
-    return nullptr;
-  }
-  Py_RETURN_NONE;
-}
-
-static PyObject* SetInParent(CMessage* self, PyObject* args) {
-  AssureWritable(self);
-  Py_RETURN_NONE;
-}
-
-static PyObject* WhichOneof(CMessage* self, PyObject* arg) {
-  Py_ssize_t name_size;
-  char *name_data;
-  if (PyString_AsStringAndSize(arg, &name_data, &name_size) < 0) return nullptr;
-  const OneofDescriptor* oneof_desc =
-      self->message->GetDescriptor()->FindOneofByName(
-          StringParam(name_data, name_size));
-  if (oneof_desc == nullptr) {
-    PyErr_Format(PyExc_ValueError,
-                 "Protocol message has no oneof \"%s\" field.", name_data);
-    return nullptr;
-  }
-  const FieldDescriptor* field_in_oneof =
-      self->message->GetReflection()->GetOneofFieldDescriptor(
-          *self->message, oneof_desc);
-  if (field_in_oneof == nullptr) {
-    Py_RETURN_NONE;
-  } else {
-    const std::string& name = field_in_oneof->name();
-    return PyUnicode_FromStringAndSize(name.c_str(), name.size());
-  }
-}
-
-static PyObject* GetExtensionDict(CMessage* self, void *closure);
-
-static PyObject* ListFields(CMessage* self) {
-  std::vector<const FieldDescriptor*> fields;
-  self->message->GetReflection()->ListFields(*self->message, &fields);
-
-  // Normally, the list will be exactly the size of the fields.
-  ScopedPyObjectPtr all_fields(PyList_New(fields.size()));
-  if (all_fields == nullptr) {
-    return nullptr;
-  }
-
-  // When there are unknown extensions, the py list will *not* contain
-  // the field information.  Thus the actual size of the py list will be
-  // smaller than the size of fields.  Set the actual size at the end.
-  Py_ssize_t actual_size = 0;
-  for (size_t i = 0; i < fields.size(); ++i) {
-    ScopedPyObjectPtr t(PyTuple_New(2));
-    if (t == nullptr) {
-      return nullptr;
-    }
-
-    if (fields[i]->is_extension()) {
-      ScopedPyObjectPtr extension_field(
-          PyFieldDescriptor_FromDescriptor(fields[i]));
-      if (extension_field == nullptr) {
-        return nullptr;
-      }
-      // With C++ descriptors, the field can always be retrieved, but for
-      // unknown extensions which have not been imported in Python code, there
-      // is no message class and we cannot retrieve the value.
-      // TODO(amauryfa): consider building the class on the fly!
-      if (fields[i]->message_type() != nullptr &&
-          message_factory::GetMessageClass(GetFactoryForMessage(self),
-                                           fields[i]->message_type()) ==
-              nullptr) {
-        PyErr_Clear();
-        continue;
-      }
-      ScopedPyObjectPtr extensions(GetExtensionDict(self, nullptr));
-      if (extensions == nullptr) {
-        return nullptr;
-      }
-      // 'extension' reference later stolen by PyTuple_SET_ITEM.
-      PyObject* extension = PyObject_GetItem(
-          extensions.get(), extension_field.get());
-      if (extension == nullptr) {
-        return nullptr;
-      }
-      PyTuple_SET_ITEM(t.get(), 0, extension_field.release());
-      // Steals reference to 'extension'
-      PyTuple_SET_ITEM(t.get(), 1, extension);
-    } else {
-      // Normal field
-      ScopedPyObjectPtr field_descriptor(
-          PyFieldDescriptor_FromDescriptor(fields[i]));
-      if (field_descriptor == nullptr) {
-        return nullptr;
-      }
-
-      PyObject* field_value = GetFieldValue(self, fields[i]);
-      if (field_value == nullptr) {
-        PyErr_SetString(PyExc_ValueError, fields[i]->name().c_str());
-        return nullptr;
-      }
-      PyTuple_SET_ITEM(t.get(), 0, field_descriptor.release());
-      PyTuple_SET_ITEM(t.get(), 1, field_value);
-    }
-    PyList_SET_ITEM(all_fields.get(), actual_size, t.release());
-    ++actual_size;
-  }
-  if (static_cast<size_t>(actual_size) != fields.size() &&
-      (PyList_SetSlice(all_fields.get(), actual_size, fields.size(), nullptr) <
-       0)) {
-    return nullptr;
-  }
-  return all_fields.release();
-}
-
-static PyObject* DiscardUnknownFields(CMessage* self) {
-  AssureWritable(self);
-  self->message->DiscardUnknownFields();
-  Py_RETURN_NONE;
-}
-
-PyObject* FindInitializationErrors(CMessage* self) {
-  Message* message = self->message;
-  std::vector<std::string> errors;
-  message->FindInitializationErrors(&errors);
-
-  PyObject* error_list = PyList_New(errors.size());
-  if (error_list == nullptr) {
-    return nullptr;
-  }
-  for (size_t i = 0; i < errors.size(); ++i) {
-    const std::string& error = errors[i];
-    PyObject* error_string =
-        PyUnicode_FromStringAndSize(error.c_str(), error.length());
-    if (error_string == nullptr) {
-      Py_DECREF(error_list);
-      return nullptr;
-    }
-    PyList_SET_ITEM(error_list, i, error_string);
-  }
-  return error_list;
-}
-
-static PyObject* RichCompare(CMessage* self, PyObject* other, int opid) {
-  // Only equality comparisons are implemented.
-  if (opid != Py_EQ && opid != Py_NE) {
-    Py_INCREF(Py_NotImplemented);
-    return Py_NotImplemented;
-  }
-  bool equals = true;
-  // If other is not a message, it cannot be equal.
-  if (!PyObject_TypeCheck(other, CMessage_Type)) {
-    equals = false;
-  } else {
-    // Otherwise, we have a CMessage whose message we can inspect.
-    const google::protobuf::Message* other_message =
-        reinterpret_cast<CMessage*>(other)->message;
-    // If messages don't have the same descriptors, they are not equal.
-    if (equals &&
-        self->message->GetDescriptor() != other_message->GetDescriptor()) {
-      equals = false;
-    }
-    // Check the message contents.
-    if (equals &&
-        !google::protobuf::util::MessageDifferencer::Equals(
-            *self->message, *reinterpret_cast<CMessage*>(other)->message)) {
-      equals = false;
-    }
-  }
-
-  if (equals ^ (opid == Py_EQ)) {
-    Py_RETURN_FALSE;
-  } else {
-    Py_RETURN_TRUE;
-  }
-}
-
-PyObject* InternalGetScalar(const Message* message,
-                            const FieldDescriptor* field_descriptor) {
-  const Reflection* reflection = message->GetReflection();
-
-  if (!CheckFieldBelongsToMessage(field_descriptor, message)) {
-    return nullptr;
-  }
-
-  PyObject* result = nullptr;
-  switch (field_descriptor->cpp_type()) {
-    case FieldDescriptor::CPPTYPE_INT32: {
-      int32_t value = reflection->GetInt32(*message, field_descriptor);
-      result = PyLong_FromLong(value);
-      break;
-    }
-    case FieldDescriptor::CPPTYPE_INT64: {
-      int64_t value = reflection->GetInt64(*message, field_descriptor);
-      result = PyLong_FromLongLong(value);
-      break;
-    }
-    case FieldDescriptor::CPPTYPE_UINT32: {
-      uint32_t value = reflection->GetUInt32(*message, field_descriptor);
-      result = PyLong_FromSsize_t(value);
-      break;
-    }
-    case FieldDescriptor::CPPTYPE_UINT64: {
-      uint64_t value = reflection->GetUInt64(*message, field_descriptor);
-      result = PyLong_FromUnsignedLongLong(value);
-      break;
-    }
-    case FieldDescriptor::CPPTYPE_FLOAT: {
-      float value = reflection->GetFloat(*message, field_descriptor);
-      result = PyFloat_FromDouble(value);
-      break;
-    }
-    case FieldDescriptor::CPPTYPE_DOUBLE: {
-      double value = reflection->GetDouble(*message, field_descriptor);
-      result = PyFloat_FromDouble(value);
-      break;
-    }
-    case FieldDescriptor::CPPTYPE_BOOL: {
-      bool value = reflection->GetBool(*message, field_descriptor);
-      result = PyBool_FromLong(value);
-      break;
-    }
-    case FieldDescriptor::CPPTYPE_STRING: {
-      std::string scratch;
-      const std::string& value =
-          reflection->GetStringReference(*message, field_descriptor, &scratch);
-      result = ToStringObject(field_descriptor, value);
-      break;
-    }
-    case FieldDescriptor::CPPTYPE_ENUM: {
-      const EnumValueDescriptor* enum_value =
-          message->GetReflection()->GetEnum(*message, field_descriptor);
-      result = PyLong_FromLong(enum_value->number());
-      break;
-    }
-    default:
-      PyErr_Format(
-          PyExc_SystemError, "Getting a value from a field of unknown type %d",
-          field_descriptor->cpp_type());
-  }
-
-  return result;
-}
-
-CMessage* InternalGetSubMessage(
-    CMessage* self, const FieldDescriptor* field_descriptor) {
-  const Reflection* reflection = self->message->GetReflection();
-  PyMessageFactory* factory = GetFactoryForMessage(self);
-
-  CMessageClass* message_class = message_factory::GetOrCreateMessageClass(
-      factory, field_descriptor->message_type());
-  ScopedPyObjectPtr message_class_owner(
-      reinterpret_cast<PyObject*>(message_class));
-  if (message_class == nullptr) {
-    return nullptr;
-  }
-
-  CMessage* cmsg = cmessage::NewEmptyMessage(message_class);
-  if (cmsg == nullptr) {
-    return nullptr;
-  }
-
-  Py_INCREF(self);
-  cmsg->parent = self;
-  cmsg->parent_field_descriptor = field_descriptor;
-  if (reflection->HasField(*self->message, field_descriptor)) {
-    // Force triggering MutableMessage to set the lazy message 'Dirty'
-    if (MessageReflectionFriend::IsLazyField(reflection, *self->message,
-                                             field_descriptor)) {
-      Message* sub_message = reflection->MutableMessage(
-          self->message, field_descriptor, factory->message_factory);
-      cmsg->read_only = false;
-      cmsg->message = sub_message;
-      return cmsg;
-    }
-  } else {
-    cmsg->read_only = true;
-  }
-  const Message& sub_message = reflection->GetMessage(
-      *self->message, field_descriptor, factory->message_factory);
-  cmsg->message = const_cast<Message*>(&sub_message);
-  return cmsg;
-}
-
-int InternalSetNonOneofScalar(
-    Message* message,
-    const FieldDescriptor* field_descriptor,
-    PyObject* arg) {
-  const Reflection* reflection = message->GetReflection();
-
-  if (!CheckFieldBelongsToMessage(field_descriptor, message)) {
-    return -1;
-  }
-
-  switch (field_descriptor->cpp_type()) {
-    case FieldDescriptor::CPPTYPE_INT32: {
-      GOOGLE_CHECK_GET_INT32(arg, value, -1);
-      reflection->SetInt32(message, field_descriptor, value);
-      break;
-    }
-    case FieldDescriptor::CPPTYPE_INT64: {
-      GOOGLE_CHECK_GET_INT64(arg, value, -1);
-      reflection->SetInt64(message, field_descriptor, value);
-      break;
-    }
-    case FieldDescriptor::CPPTYPE_UINT32: {
-      GOOGLE_CHECK_GET_UINT32(arg, value, -1);
-      reflection->SetUInt32(message, field_descriptor, value);
-      break;
-    }
-    case FieldDescriptor::CPPTYPE_UINT64: {
-      GOOGLE_CHECK_GET_UINT64(arg, value, -1);
-      reflection->SetUInt64(message, field_descriptor, value);
-      break;
-    }
-    case FieldDescriptor::CPPTYPE_FLOAT: {
-      GOOGLE_CHECK_GET_FLOAT(arg, value, -1);
-      reflection->SetFloat(message, field_descriptor, value);
-      break;
-    }
-    case FieldDescriptor::CPPTYPE_DOUBLE: {
-      GOOGLE_CHECK_GET_DOUBLE(arg, value, -1);
-      reflection->SetDouble(message, field_descriptor, value);
-      break;
-    }
-    case FieldDescriptor::CPPTYPE_BOOL: {
-      GOOGLE_CHECK_GET_BOOL(arg, value, -1);
-      reflection->SetBool(message, field_descriptor, value);
-      break;
-    }
-    case FieldDescriptor::CPPTYPE_STRING: {
-      if (!CheckAndSetString(
-          arg, message, field_descriptor, reflection, false, -1)) {
-        return -1;
-      }
-      break;
-    }
-    case FieldDescriptor::CPPTYPE_ENUM: {
-      GOOGLE_CHECK_GET_INT32(arg, value, -1);
-      if (reflection->SupportsUnknownEnumValues()) {
-        reflection->SetEnumValue(message, field_descriptor, value);
-      } else {
-        const EnumDescriptor* enum_descriptor = field_descriptor->enum_type();
-        const EnumValueDescriptor* enum_value =
-            enum_descriptor->FindValueByNumber(value);
-        if (enum_value != nullptr) {
-          reflection->SetEnum(message, field_descriptor, enum_value);
-        } else {
-          PyErr_Format(PyExc_ValueError, "Unknown enum value: %d", value);
-          return -1;
-        }
-      }
-      break;
-    }
-    default:
-      PyErr_Format(
-          PyExc_SystemError, "Setting value to a field of unknown type %d",
-          field_descriptor->cpp_type());
-      return -1;
-  }
-
-  return 0;
-}
-
-int InternalSetScalar(
-    CMessage* self,
-    const FieldDescriptor* field_descriptor,
-    PyObject* arg) {
-  if (!CheckFieldBelongsToMessage(field_descriptor, self->message)) {
-    return -1;
-  }
-
-  if (MaybeReleaseOverlappingOneofField(self, field_descriptor) < 0) {
-    return -1;
-  }
-
-  return InternalSetNonOneofScalar(self->message, field_descriptor, arg);
-}
-
-PyObject* FromString(PyTypeObject* cls, PyObject* serialized) {
-  PyObject* py_cmsg =
-      PyObject_CallObject(reinterpret_cast<PyObject*>(cls), nullptr);
-  if (py_cmsg == nullptr) {
-    return nullptr;
-  }
-  CMessage* cmsg = reinterpret_cast<CMessage*>(py_cmsg);
-
-  ScopedPyObjectPtr py_length(MergeFromString(cmsg, serialized));
-  if (py_length == nullptr) {
-    Py_DECREF(py_cmsg);
-    return nullptr;
-  }
-
-  return py_cmsg;
-}
-
-PyObject* DeepCopy(CMessage* self, PyObject* arg) {
-  PyObject* clone =
-      PyObject_CallObject(reinterpret_cast<PyObject*>(Py_TYPE(self)), nullptr);
-  if (clone == nullptr) {
-    return nullptr;
-  }
-  if (!PyObject_TypeCheck(clone, CMessage_Type)) {
-    Py_DECREF(clone);
-    return nullptr;
-  }
-  if (ScopedPyObjectPtr(MergeFrom(reinterpret_cast<CMessage*>(clone),
-                                  reinterpret_cast<PyObject*>(self))) ==
-      nullptr) {
-    Py_DECREF(clone);
-    return nullptr;
-  }
-  return clone;
-}
-
-PyObject* ToUnicode(CMessage* self) {
-  // Lazy import to prevent circular dependencies
-  ScopedPyObjectPtr text_format(
-      PyImport_ImportModule("google.protobuf.text_format"));
-  if (text_format == nullptr) {
-    return nullptr;
-  }
-  ScopedPyObjectPtr method_name(PyUnicode_FromString("MessageToString"));
-  if (method_name == nullptr) {
-    return nullptr;
-  }
-  Py_INCREF(Py_True);
-  ScopedPyObjectPtr encoded(PyObject_CallMethodObjArgs(
-      text_format.get(), method_name.get(), self, Py_True, nullptr));
-  Py_DECREF(Py_True);
-  if (encoded == nullptr) {
-    return nullptr;
-  }
-  PyObject* decoded =
-      PyUnicode_FromEncodedObject(encoded.get(), "utf-8", nullptr);
-  if (decoded == nullptr) {
-    return nullptr;
-  }
-  return decoded;
-}
-
-// CMessage static methods:
-PyObject* _CheckCalledFromGeneratedFile(PyObject* unused,
-                                        PyObject* unused_arg) {
-  if (!_CalledFromGeneratedFile(1)) {
-    PyErr_SetString(PyExc_TypeError,
-                    "Descriptors should not be created directly, "
-                    "but only retrieved from their parent.");
-    return nullptr;
-  }
-  Py_RETURN_NONE;
-}
-
-static PyObject* GetExtensionDict(CMessage* self, void *closure) {
-  // If there are extension_ranges, the message is "extendable". Allocate a
-  // dictionary to store the extension fields.
-  const Descriptor* descriptor = GetMessageDescriptor(Py_TYPE(self));
-  if (!descriptor->extension_range_count()) {
-    PyErr_SetNone(PyExc_AttributeError);
-    return nullptr;
-  }
-  if (!self->composite_fields) {
-    self->composite_fields = new CMessage::CompositeFieldsMap();
-  }
-  if (!self->composite_fields) {
-    return nullptr;
-  }
-  ExtensionDict* extension_dict = extension_dict::NewExtensionDict(self);
-  return reinterpret_cast<PyObject*>(extension_dict);
-}
-
-static PyObject* GetUnknownFields(CMessage* self) {
-  if (self->unknown_field_set == nullptr) {
-    self->unknown_field_set = unknown_fields::NewPyUnknownFields(self);
-  } else {
-    Py_INCREF(self->unknown_field_set);
-  }
-  return self->unknown_field_set;
-}
-
-static PyObject* GetExtensionsByName(CMessage *self, void *closure) {
-  return message_meta::GetExtensionsByName(
-      reinterpret_cast<CMessageClass*>(Py_TYPE(self)), closure);
-}
-
-static PyObject* GetExtensionsByNumber(CMessage *self, void *closure) {
-  return message_meta::GetExtensionsByNumber(
-      reinterpret_cast<CMessageClass*>(Py_TYPE(self)), closure);
-}
-
-static PyGetSetDef Getters[] = {
-    {"Extensions", (getter)GetExtensionDict, nullptr, "Extension dict"},
-    {"_extensions_by_name", (getter)GetExtensionsByName, nullptr},
-    {"_extensions_by_number", (getter)GetExtensionsByNumber, nullptr},
-    {nullptr},
-};
-
-static PyMethodDef Methods[] = {
-    {"__deepcopy__", (PyCFunction)DeepCopy, METH_VARARGS,
-     "Makes a deep copy of the class."},
-    {"__unicode__", (PyCFunction)ToUnicode, METH_NOARGS,
-     "Outputs a unicode representation of the message."},
-    {"ByteSize", (PyCFunction)ByteSize, METH_NOARGS,
-     "Returns the size of the message in bytes."},
-    {"Clear", (PyCFunction)Clear, METH_NOARGS, "Clears the message."},
-    {"ClearExtension", (PyCFunction)ClearExtension, METH_O,
-     "Clears a message field."},
-    {"ClearField", (PyCFunction)ClearField, METH_O, "Clears a message field."},
-    {"CopyFrom", (PyCFunction)CopyFrom, METH_O,
-     "Copies a protocol message into the current message."},
-    {"DiscardUnknownFields", (PyCFunction)DiscardUnknownFields, METH_NOARGS,
-     "Discards the unknown fields."},
-    {"FindInitializationErrors", (PyCFunction)FindInitializationErrors,
-     METH_NOARGS, "Finds unset required fields."},
-    {"FromString", (PyCFunction)FromString, METH_O | METH_CLASS,
-     "Creates new method instance from given serialized data."},
-    {"HasExtension", (PyCFunction)HasExtension, METH_O,
-     "Checks if a message field is set."},
-    {"HasField", (PyCFunction)HasField, METH_O,
-     "Checks if a message field is set."},
-    {"IsInitialized", (PyCFunction)IsInitialized, METH_VARARGS,
-     "Checks if all required fields of a protocol message are set."},
-    {"ListFields", (PyCFunction)ListFields, METH_NOARGS,
-     "Lists all set fields of a message."},
-    {"MergeFrom", (PyCFunction)MergeFrom, METH_O,
-     "Merges a protocol message into the current message."},
-    {"MergeFromString", (PyCFunction)MergeFromString, METH_O,
-     "Merges a serialized message into the current message."},
-    {"ParseFromString", (PyCFunction)ParseFromString, METH_O,
-     "Parses a serialized message into the current message."},
-    {"RegisterExtension", (PyCFunction)RegisterExtension, METH_O | METH_CLASS,
-     "Registers an extension with the current message."},
-    {"SerializePartialToString", (PyCFunction)SerializePartialToString,
-     METH_VARARGS | METH_KEYWORDS,
-     "Serializes the message to a string, even if it isn't initialized."},
-    {"SerializeToString", (PyCFunction)SerializeToString,
-     METH_VARARGS | METH_KEYWORDS,
-     "Serializes the message to a string, only for initialized messages."},
-    {"SetInParent", (PyCFunction)SetInParent, METH_NOARGS,
-     "Sets the has bit of the given field in its parent message."},
-    {"UnknownFields", (PyCFunction)GetUnknownFields, METH_NOARGS,
-     "Parse unknown field set"},
-    {"WhichOneof", (PyCFunction)WhichOneof, METH_O,
-     "Returns the name of the field set inside a oneof, "
-     "or None if no field is set."},
-
-    // Static Methods.
-    {"_CheckCalledFromGeneratedFile",
-     (PyCFunction)_CheckCalledFromGeneratedFile, METH_NOARGS | METH_STATIC,
-     "Raises TypeError if the caller is not in a _pb2.py file."},
-    {nullptr, nullptr}};
-
-bool SetCompositeField(CMessage* self, const FieldDescriptor* field,
-                       ContainerBase* value) {
-  if (self->composite_fields == nullptr) {
-    self->composite_fields = new CMessage::CompositeFieldsMap();
-  }
-  (*self->composite_fields)[field] = value;
-  return true;
-}
-
-bool SetSubmessage(CMessage* self, CMessage* submessage) {
-  if (self->child_submessages == nullptr) {
-    self->child_submessages = new CMessage::SubMessagesMap();
-  }
-  (*self->child_submessages)[submessage->message] = submessage;
-  return true;
-}
-
-PyObject* GetAttr(PyObject* pself, PyObject* name) {
-  CMessage* self = reinterpret_cast<CMessage*>(pself);
-  PyObject* result = PyObject_GenericGetAttr(
-      reinterpret_cast<PyObject*>(self), name);
-  if (result != nullptr) {
-    return result;
-  }
-  if (!PyErr_ExceptionMatches(PyExc_AttributeError)) {
-    return nullptr;
-  }
-
-  PyErr_Clear();
-  return message_meta::GetClassAttribute(
-      CheckMessageClass(Py_TYPE(self)), name);
-}
-
-PyObject* GetFieldValue(CMessage* self,
-                        const FieldDescriptor* field_descriptor) {
-  if (self->composite_fields) {
-    CMessage::CompositeFieldsMap::iterator it =
-        self->composite_fields->find(field_descriptor);
-    if (it != self->composite_fields->end()) {
-      ContainerBase* value = it->second;
-      Py_INCREF(value);
-      return value->AsPyObject();
-    }
-  }
-
-  if (self->message->GetDescriptor() != field_descriptor->containing_type()) {
-    PyErr_Format(PyExc_TypeError,
-                 "descriptor to field '%s' doesn't apply to '%s' object",
-                 field_descriptor->full_name().c_str(),
-                 Py_TYPE(self)->tp_name);
-    return nullptr;
-  }
-
-  if (!field_descriptor->is_repeated() &&
-      field_descriptor->cpp_type() != FieldDescriptor::CPPTYPE_MESSAGE) {
-    return InternalGetScalar(self->message, field_descriptor);
-  }
-
-  ContainerBase* py_container = nullptr;
-  if (field_descriptor->is_map()) {
-    const Descriptor* entry_type = field_descriptor->message_type();
-    const FieldDescriptor* value_type = entry_type->map_value();
-    if (value_type->cpp_type() == FieldDescriptor::CPPTYPE_MESSAGE) {
-      CMessageClass* value_class = message_factory::GetMessageClass(
-          GetFactoryForMessage(self), value_type->message_type());
-      if (value_class == nullptr) {
-        return nullptr;
-      }
-      py_container =
-          NewMessageMapContainer(self, field_descriptor, value_class);
-    } else {
-      py_container = NewScalarMapContainer(self, field_descriptor);
-    }
-  } else if (field_descriptor->is_repeated()) {
-    if (field_descriptor->cpp_type() == FieldDescriptor::CPPTYPE_MESSAGE) {
-      CMessageClass* message_class = message_factory::GetMessageClass(
-          GetFactoryForMessage(self), field_descriptor->message_type());
-      if (message_class == nullptr) {
-        return nullptr;
-      }
-      py_container = repeated_composite_container::NewContainer(
-          self, field_descriptor, message_class);
-    } else {
-      py_container =
-          repeated_scalar_container::NewContainer(self, field_descriptor);
-    }
-  } else if (field_descriptor->cpp_type() ==
-             FieldDescriptor::CPPTYPE_MESSAGE) {
-    py_container = InternalGetSubMessage(self, field_descriptor);
-  } else {
-    PyErr_SetString(PyExc_SystemError, "Should never happen");
-  }
-
-  if (py_container == nullptr) {
-    return nullptr;
-  }
-  if (!SetCompositeField(self, field_descriptor, py_container)) {
-    Py_DECREF(py_container);
-    return nullptr;
-  }
-  return py_container->AsPyObject();
-}
-
-int SetFieldValue(CMessage* self, const FieldDescriptor* field_descriptor,
-                  PyObject* value) {
-  if (self->message->GetDescriptor() != field_descriptor->containing_type()) {
-    PyErr_Format(PyExc_TypeError,
-                 "descriptor to field '%s' doesn't apply to '%s' object",
-                 field_descriptor->full_name().c_str(),
-                 Py_TYPE(self)->tp_name);
-    return -1;
-  } else if (field_descriptor->label() == FieldDescriptor::LABEL_REPEATED) {
-    PyErr_Format(PyExc_AttributeError,
-                 "Assignment not allowed to repeated "
-                 "field \"%s\" in protocol message object.",
-                 field_descriptor->name().c_str());
-    return -1;
-  } else if (field_descriptor->cpp_type() == FieldDescriptor::CPPTYPE_MESSAGE) {
-    PyErr_Format(PyExc_AttributeError,
-                 "Assignment not allowed to "
-                 "field \"%s\" in protocol message object.",
-                 field_descriptor->name().c_str());
-    return -1;
-  } else {
-    AssureWritable(self);
-    return InternalSetScalar(self, field_descriptor, value);
-  }
-}
-
-}  // namespace cmessage
-
-// All containers which are not messages:
-// - Make a new parent message
-// - Copy the field
-// - return the field.
-PyObject* ContainerBase::DeepCopy() {
-  CMessage* new_parent =
-      cmessage::NewEmptyMessage(this->parent->GetMessageClass());
-  new_parent->message = this->parent->message->New(nullptr);
-
-  // Copy the map field into the new message.
-  this->parent->message->GetReflection()->SwapFields(
-      this->parent->message, new_parent->message,
-      {this->parent_field_descriptor});
-  this->parent->message->MergeFrom(*new_parent->message);
-
-  PyObject* result =
-      cmessage::GetFieldValue(new_parent, this->parent_field_descriptor);
-  Py_DECREF(new_parent);
-  return result;
-}
-
-void ContainerBase::RemoveFromParentCache() {
-  CMessage* parent = this->parent;
-  if (parent) {
-    if (parent->composite_fields)
-      parent->composite_fields->erase(this->parent_field_descriptor);
-    Py_CLEAR(parent);
-  }
-}
-
-CMessage* CMessage::BuildSubMessageFromPointer(
-    const FieldDescriptor* field_descriptor, Message* sub_message,
-    CMessageClass* message_class) {
-  if (!this->child_submessages) {
-    this->child_submessages = new CMessage::SubMessagesMap();
-  }
-  CMessage* cmsg = FindPtrOrNull(
-      *this->child_submessages, sub_message);
-  if (cmsg) {
-    Py_INCREF(cmsg);
-  } else {
-    cmsg = cmessage::NewEmptyMessage(message_class);
-
-    if (cmsg == nullptr) {
-      return nullptr;
-    }
-    cmsg->message = sub_message;
-    Py_INCREF(this);
-    cmsg->parent = this;
-    cmsg->parent_field_descriptor = field_descriptor;
-    cmessage::SetSubmessage(this, cmsg);
-  }
-  return cmsg;
-}
-
-CMessage* CMessage::MaybeReleaseSubMessage(Message* sub_message) {
-  if (!this->child_submessages) {
-    return nullptr;
-  }
-  CMessage* released = FindPtrOrNull(
-      *this->child_submessages, sub_message);
-  if (!released) {
-    return nullptr;
-  }
-  // The target message will now own its content.
-  Py_CLEAR(released->parent);
-  released->parent_field_descriptor = nullptr;
-  released->read_only = false;
-  // Delete it from the cache.
-  this->child_submessages->erase(sub_message);
-  return released;
-}
-
-static CMessageClass _CMessage_Type = {{{
-    PyVarObject_HEAD_INIT(&_CMessageClass_Type, 0) FULL_MODULE_NAME
-    ".CMessage",                    // tp_name
-    sizeof(CMessage),               // tp_basicsize
-    0,                              //  tp_itemsize
-    (destructor)cmessage::Dealloc,  //  tp_dealloc
-#if PY_VERSION_HEX < 0x03080000
-    nullptr,  // tp_print
-#else
-    0,  // tp_vectorcall_offset
-#endif
-    nullptr,                      //  tp_getattr
-    nullptr,                      //  tp_setattr
-    nullptr,                      //  tp_compare
-    (reprfunc)cmessage::ToStr,    //  tp_repr
-    nullptr,                      //  tp_as_number
-    nullptr,                      //  tp_as_sequence
-    nullptr,                      //  tp_as_mapping
-    PyObject_HashNotImplemented,  //  tp_hash
-    nullptr,                      //  tp_call
-    (reprfunc)cmessage::ToStr,    //  tp_str
-    cmessage::GetAttr,            //  tp_getattro
-    nullptr,                      //  tp_setattro
-    nullptr,                      //  tp_as_buffer
-    Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE |
-        Py_TPFLAGS_HAVE_VERSION_TAG,     //  tp_flags
-    "A ProtocolMessage",                 //  tp_doc
-    nullptr,                             //  tp_traverse
-    nullptr,                             //  tp_clear
-    (richcmpfunc)cmessage::RichCompare,  //  tp_richcompare
-    offsetof(CMessage, weakreflist),     //  tp_weaklistoffset
-    nullptr,                             //  tp_iter
-    nullptr,                             //  tp_iternext
-    cmessage::Methods,                   //  tp_methods
-    nullptr,                             //  tp_members
-    cmessage::Getters,                   //  tp_getset
-    nullptr,                             //  tp_base
-    nullptr,                             //  tp_dict
-    nullptr,                             //  tp_descr_get
-    nullptr,                             //  tp_descr_set
-    0,                                   //  tp_dictoffset
-    (initproc)cmessage::Init,            //  tp_init
-    nullptr,                             //  tp_alloc
-    cmessage::New,                       //  tp_new
-}}};
-PyTypeObject* CMessage_Type = &_CMessage_Type.super.ht_type;
-
-// --- Exposing the C proto living inside Python proto to C code:
-
-const Message* (*GetCProtoInsidePyProtoPtr)(PyObject* msg);
-Message* (*MutableCProtoInsidePyProtoPtr)(PyObject* msg);
-
-static const Message* GetCProtoInsidePyProtoImpl(PyObject* msg) {
-  const Message* message = PyMessage_GetMessagePointer(msg);
-  if (message == nullptr) {
-    PyErr_Clear();
-    return nullptr;
-  }
-  return message;
-}
-
-static Message* MutableCProtoInsidePyProtoImpl(PyObject* msg) {
-  Message* message = PyMessage_GetMutableMessagePointer(msg);
-  if (message == nullptr) {
-    PyErr_Clear();
-    return nullptr;
-  }
-  return message;
-}
-
-const Message* PyMessage_GetMessagePointer(PyObject* msg) {
-  if (!PyObject_TypeCheck(msg, CMessage_Type)) {
-    PyErr_SetString(PyExc_TypeError, "Not a Message instance");
-    return nullptr;
-  }
-  CMessage* cmsg = reinterpret_cast<CMessage*>(msg);
-  return cmsg->message;
-}
-
-Message* PyMessage_GetMutableMessagePointer(PyObject* msg) {
-  if (!PyObject_TypeCheck(msg, CMessage_Type)) {
-    PyErr_SetString(PyExc_TypeError, "Not a Message instance");
-    return nullptr;
-  }
-  CMessage* cmsg = reinterpret_cast<CMessage*>(msg);
-
-
-  if ((cmsg->composite_fields && !cmsg->composite_fields->empty()) ||
-      (cmsg->child_submessages && !cmsg->child_submessages->empty())) {
-    // There is currently no way of accurately syncing arbitrary changes to
-    // the underlying C++ message back to the CMessage (e.g. removed repeated
-    // composite containers). We only allow direct mutation of the underlying
-    // C++ message if there is no child data in the CMessage.
-    PyErr_SetString(PyExc_ValueError,
-                    "Cannot reliably get a mutable pointer "
-                    "to a message with extra references");
-    return nullptr;
-  }
-  cmessage::AssureWritable(cmsg);
-  return cmsg->message;
-}
-
-// Returns a new reference to the MessageClass to use for message creation.
-// - if a PyMessageFactory is passed, use it.
-// - Otherwise, if a PyDescriptorPool was created, use its factory.
-static CMessageClass* GetMessageClassFromDescriptor(
-    const Descriptor* descriptor, PyObject* py_message_factory) {
-  PyMessageFactory* factory = nullptr;
-  if (py_message_factory == nullptr) {
-    PyDescriptorPool* pool =
-        GetDescriptorPool_FromPool(descriptor->file()->pool());
-    if (pool == nullptr) {
-      PyErr_SetString(PyExc_TypeError,
-                      "Unknown descriptor pool; C++ users should call "
-                      "DescriptorPool_FromPool and keep it alive");
-      return nullptr;
-    }
-    factory = pool->py_message_factory;
-  } else if (PyObject_TypeCheck(py_message_factory, &PyMessageFactory_Type)) {
-    factory = reinterpret_cast<PyMessageFactory*>(py_message_factory);
-  } else {
-    PyErr_SetString(PyExc_TypeError, "Expected a MessageFactory");
-    return nullptr;
-  }
-
-  return message_factory::GetOrCreateMessageClass(factory, descriptor);
-}
-
-PyObject* PyMessage_New(const Descriptor* descriptor,
-                        PyObject* py_message_factory) {
-  CMessageClass* message_class =
-      GetMessageClassFromDescriptor(descriptor, py_message_factory);
-  if (message_class == nullptr) {
-    return nullptr;
-  }
-
-  CMessage* self = cmessage::NewCMessage(message_class);
-  Py_DECREF(message_class);
-  if (self == nullptr) {
-    return nullptr;
-  }
-  return self->AsPyObject();
-}
-
-PyObject* PyMessage_NewMessageOwnedExternally(Message* message,
-                                              PyObject* py_message_factory) {
-  CMessageClass* message_class = GetMessageClassFromDescriptor(
-      message->GetDescriptor(), py_message_factory);
-  if (message_class == nullptr) {
-    return nullptr;
-  }
-
-  CMessage* self = cmessage::NewEmptyMessage(message_class);
-  Py_DECREF(message_class);
-  if (self == nullptr) {
-    return nullptr;
-  }
-  self->message = message;
-  Py_INCREF(Py_None);
-  self->parent = reinterpret_cast<CMessage*>(Py_None);
-  return self->AsPyObject();
-}
-
-void InitGlobals() {
-  // TODO(gps): Check all return values in this function for NULL and propagate
-  // the error (MemoryError) on up to result in an import failure.  These should
-  // also be freed and reset to NULL during finalization.
-  kDESCRIPTOR = PyUnicode_FromString("DESCRIPTOR");
-
-  PyObject* dummy_obj = PySet_New(nullptr);
-  kEmptyWeakref = PyWeakref_NewRef(dummy_obj, nullptr);
-  Py_DECREF(dummy_obj);
-}
-
-bool InitProto2MessageModule(PyObject *m) {
-  // Initialize types and globals in descriptor.cc
-  if (!InitDescriptor()) {
-    return false;
-  }
-
-  // Initialize types and globals in descriptor_pool.cc
-  if (!InitDescriptorPool()) {
-    return false;
-  }
-
-  // Initialize types and globals in message_factory.cc
-  if (!InitMessageFactory()) {
-    return false;
-  }
-
-  // Initialize constants defined in this file.
-  InitGlobals();
-
-  CMessageClass_Type->tp_base = &PyType_Type;
-  if (PyType_Ready(CMessageClass_Type) < 0) {
-    return false;
-  }
-  PyModule_AddObject(m, "MessageMeta",
-                     reinterpret_cast<PyObject*>(CMessageClass_Type));
-
-  if (PyType_Ready(CMessage_Type) < 0) {
-    return false;
-  }
-  if (PyType_Ready(CFieldProperty_Type) < 0) {
-    return false;
-  }
-
-  // DESCRIPTOR is set on each protocol buffer message class elsewhere, but set
-  // it here as well to document that subclasses need to set it.
-  PyDict_SetItem(CMessage_Type->tp_dict, kDESCRIPTOR, Py_None);
-  // Invalidate any cached data for the CMessage type.
-  // This call is necessary to correctly support Py_TPFLAGS_HAVE_VERSION_TAG,
-  // after we have modified CMessage_Type.tp_dict.
-  PyType_Modified(CMessage_Type);
-
-  PyModule_AddObject(m, "Message", reinterpret_cast<PyObject*>(CMessage_Type));
-
-  // Initialize Repeated container types.
-  {
-    if (PyType_Ready(&RepeatedScalarContainer_Type) < 0) {
-      return false;
-    }
-
-    PyModule_AddObject(
-        m, "RepeatedScalarContainer",
-        reinterpret_cast<PyObject*>(&RepeatedScalarContainer_Type));
-
-    if (PyType_Ready(&RepeatedCompositeContainer_Type) < 0) {
-      return false;
-    }
-
-    PyModule_AddObject(
-        m, "RepeatedCompositeContainer",
-        reinterpret_cast<PyObject*>(&RepeatedCompositeContainer_Type));
-
-    // Register them as MutableSequence.
-    ScopedPyObjectPtr collections(PyImport_ImportModule("collections.abc"));
-    if (collections == nullptr) {
-      return false;
-    }
-    ScopedPyObjectPtr mutable_sequence(
-        PyObject_GetAttrString(collections.get(), "MutableSequence"));
-    if (mutable_sequence == nullptr) {
-      return false;
-    }
-    if (ScopedPyObjectPtr(
-            PyObject_CallMethod(mutable_sequence.get(), "register", "O",
-                                &RepeatedScalarContainer_Type)) == nullptr) {
-      return false;
-    }
-    if (ScopedPyObjectPtr(
-            PyObject_CallMethod(mutable_sequence.get(), "register", "O",
-                                &RepeatedCompositeContainer_Type)) == nullptr) {
-      return false;
-    }
-  }
-
-  if (PyType_Ready(&PyUnknownFields_Type) < 0) {
-    return false;
-  }
-
-  if (PyType_Ready(&PyUnknownFieldSet_Type) < 0) {
-    return false;
-  }
-
-  PyModule_AddObject(m, "UnknownFieldSet",
-                     reinterpret_cast<PyObject*>(&PyUnknownFieldSet_Type));
-
-  if (PyType_Ready(&PyUnknownFieldRef_Type) < 0) {
-    return false;
-  }
-
-  if (PyType_Ready(&PyUnknownField_Type) < 0) {
-    return false;
-  }
-
-  // Initialize Map container types.
-  if (!InitMapContainers()) {
-    return false;
-  }
-  PyModule_AddObject(m, "ScalarMapContainer",
-                     reinterpret_cast<PyObject*>(ScalarMapContainer_Type));
-  PyModule_AddObject(m, "MessageMapContainer",
-                     reinterpret_cast<PyObject*>(MessageMapContainer_Type));
-  PyModule_AddObject(m, "MapIterator",
-                     reinterpret_cast<PyObject*>(&MapIterator_Type));
-
-  if (PyType_Ready(&ExtensionDict_Type) < 0) {
-    return false;
-  }
-  PyModule_AddObject(m, "ExtensionDict",
-                     reinterpret_cast<PyObject*>(&ExtensionDict_Type));
-  if (PyType_Ready(&ExtensionIterator_Type) < 0) {
-    return false;
-  }
-  PyModule_AddObject(m, "ExtensionIterator",
-                     reinterpret_cast<PyObject*>(&ExtensionIterator_Type));
-
-  // Expose the DescriptorPool used to hold all descriptors added from generated
-  // pb2.py files.
-  // PyModule_AddObject steals a reference.
-  Py_INCREF(GetDefaultDescriptorPool());
-  PyModule_AddObject(m, "default_pool",
-                     reinterpret_cast<PyObject*>(GetDefaultDescriptorPool()));
-
-  PyModule_AddObject(m, "DescriptorPool",
-                     reinterpret_cast<PyObject*>(&PyDescriptorPool_Type));
-  PyModule_AddObject(m, "Descriptor",
-                     reinterpret_cast<PyObject*>(&PyMessageDescriptor_Type));
-  PyModule_AddObject(m, "FieldDescriptor",
-                     reinterpret_cast<PyObject*>(&PyFieldDescriptor_Type));
-  PyModule_AddObject(m, "EnumDescriptor",
-                     reinterpret_cast<PyObject*>(&PyEnumDescriptor_Type));
-  PyModule_AddObject(m, "EnumValueDescriptor",
-                     reinterpret_cast<PyObject*>(&PyEnumValueDescriptor_Type));
-  PyModule_AddObject(m, "FileDescriptor",
-                     reinterpret_cast<PyObject*>(&PyFileDescriptor_Type));
-  PyModule_AddObject(m, "OneofDescriptor",
-                     reinterpret_cast<PyObject*>(&PyOneofDescriptor_Type));
-  PyModule_AddObject(m, "ServiceDescriptor",
-                     reinterpret_cast<PyObject*>(&PyServiceDescriptor_Type));
-  PyModule_AddObject(m, "MethodDescriptor",
-                     reinterpret_cast<PyObject*>(&PyMethodDescriptor_Type));
-
-  PyObject* enum_type_wrapper = PyImport_ImportModule(
-      "google.protobuf.internal.enum_type_wrapper");
-  if (enum_type_wrapper == nullptr) {
-    return false;
-  }
-  EnumTypeWrapper_class =
-      PyObject_GetAttrString(enum_type_wrapper, "EnumTypeWrapper");
-  Py_DECREF(enum_type_wrapper);
-
-  PyObject* message_module = PyImport_ImportModule(
-      "google.protobuf.message");
-  if (message_module == nullptr) {
-    return false;
-  }
-  EncodeError_class = PyObject_GetAttrString(message_module, "EncodeError");
-  DecodeError_class = PyObject_GetAttrString(message_module, "DecodeError");
-  PythonMessage_class = PyObject_GetAttrString(message_module, "Message");
-  Py_DECREF(message_module);
-
-  PyObject* pickle_module = PyImport_ImportModule("pickle");
-  if (pickle_module == nullptr) {
-    return false;
-  }
-  PickleError_class = PyObject_GetAttrString(pickle_module, "PickleError");
-  Py_DECREF(pickle_module);
-
-  // Override {Get,Mutable}CProtoInsidePyProto.
-  GetCProtoInsidePyProtoPtr = GetCProtoInsidePyProtoImpl;
-  MutableCProtoInsidePyProtoPtr = MutableCProtoInsidePyProtoImpl;
-
-  return true;
-}
-
-}  // namespace python
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/python/google/protobuf/pyext/message.h b/libs/protobuf/python/google/protobuf/pyext/message.h
deleted file mode 100644
index b17daa5..0000000
--- a/libs/protobuf/python/google/protobuf/pyext/message.h
+++ /dev/null
@@ -1,377 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: anuraag@google.com (Anuraag Agrawal)
-// Author: tibell@google.com (Johan Tibell)
-
-#ifndef GOOGLE_PROTOBUF_PYTHON_CPP_MESSAGE_H__
-#define GOOGLE_PROTOBUF_PYTHON_CPP_MESSAGE_H__
-
-#define PY_SSIZE_T_CLEAN
-#include <Python.h>
-
-#include <cstdint>
-#include <memory>
-#include <string>
-#include <unordered_map>
-
-#include <google/protobuf/stubs/common.h>
-
-namespace google {
-namespace protobuf {
-
-class Message;
-class Reflection;
-class FieldDescriptor;
-class Descriptor;
-class DescriptorPool;
-class MessageFactory;
-
-namespace python {
-
-struct ExtensionDict;
-struct PyMessageFactory;
-struct CMessageClass;
-
-// Most of the complexity of the Message class comes from the "Release"
-// behavior:
-//
-// When a field is cleared, it is only detached from its message. Existing
-// references to submessages, to repeated container etc. won't see any change,
-// as if the data was effectively managed by these containers.
-//
-// ExtensionDicts and UnknownFields containers do NOT follow this rule. They
-// don't store any data, and always refer to their parent message.
-
-struct ContainerBase {
-  PyObject_HEAD;
-
-  // Strong reference to a parent message object. For a CMessage there are three
-  // cases:
-  // - For a top-level message, this pointer is NULL.
-  // - For a sub-message, this points to the parent message.
-  // - For a message managed externally, this is a owned reference to Py_None.
-  //
-  // For all other types: repeated containers, maps, it always point to a
-  // valid parent CMessage.
-  struct CMessage* parent;
-
-  // If this object belongs to a parent message, describes which field it comes
-  // from.
-  // The pointer is owned by the DescriptorPool (which is kept alive
-  // through the message's Python class)
-  const FieldDescriptor* parent_field_descriptor;
-
-  PyObject* AsPyObject() { return reinterpret_cast<PyObject*>(this); }
-
-  // The Three methods below are only used by Repeated containers, and Maps.
-
-  // This implementation works for all containers which have a parent.
-  PyObject* DeepCopy();
-  // Delete this container object from its parent. Does not work for messages.
-  void RemoveFromParentCache();
-};
-
-typedef struct CMessage : public ContainerBase {
-  // Pointer to the C++ Message object for this CMessage.
-  // - If this object has no parent, we own this pointer.
-  // - If this object has a parent message, the parent owns this pointer.
-  Message* message;
-
-  // Indicates this submessage is pointing to a default instance of a message.
-  // Submessages are always first created as read only messages and are then
-  // made writable, at which point this field is set to false.
-  bool read_only;
-
-  // A mapping indexed by field, containing weak references to contained objects
-  // which need to implement the "Release" mechanism:
-  // direct submessages, RepeatedCompositeContainer, RepeatedScalarContainer
-  // and MapContainer.
-  typedef std::unordered_map<const FieldDescriptor*, ContainerBase*>
-      CompositeFieldsMap;
-  CompositeFieldsMap* composite_fields;
-
-  // A mapping containing weak references to indirect child messages, accessed
-  // through containers: repeated messages, and values of message maps.
-  // This avoid the creation of similar maps in each of those containers.
-  typedef std::unordered_map<const Message*, CMessage*> SubMessagesMap;
-  SubMessagesMap* child_submessages;
-
-  // A reference to PyUnknownFields.
-  PyObject* unknown_field_set;
-
-  // Implements the "weakref" protocol for this object.
-  PyObject* weakreflist;
-
-  // Return a *borrowed* reference to the message class.
-  CMessageClass* GetMessageClass() {
-    return reinterpret_cast<CMessageClass*>(Py_TYPE(this));
-  }
-
-  // For container containing messages, return a Python object for the given
-  // pointer to a message.
-  CMessage* BuildSubMessageFromPointer(const FieldDescriptor* field_descriptor,
-                                       Message* sub_message,
-                                       CMessageClass* message_class);
-  CMessage* MaybeReleaseSubMessage(Message* sub_message);
-} CMessage;
-
-// The (meta) type of all Messages classes.
-// It allows us to cache some C++ pointers in the class object itself, they are
-// faster to extract than from the type's dictionary.
-
-struct CMessageClass {
-  // This is how CPython subclasses C structures: the base structure must be
-  // the first member of the object.
-  PyHeapTypeObject super;
-
-  // C++ descriptor of this message.
-  const Descriptor* message_descriptor;
-
-  // Owned reference, used to keep the pointer above alive.
-  // This reference must stay alive until all message pointers are destructed.
-  PyObject* py_message_descriptor;
-
-  // The Python MessageFactory used to create the class. It is needed to resolve
-  // fields descriptors, including extensions fields; its C++ MessageFactory is
-  // used to instantiate submessages.
-  // This reference must stay alive until all message pointers are destructed.
-  PyMessageFactory* py_message_factory;
-
-  PyObject* AsPyObject() {
-    return reinterpret_cast<PyObject*>(this);
-  }
-};
-
-extern PyTypeObject* CMessageClass_Type;
-extern PyTypeObject* CMessage_Type;
-
-namespace cmessage {
-
-// Internal function to create a new empty Message Python object, but with empty
-// pointers to the C++ objects.
-// The caller must fill self->message, self->owner and eventually self->parent.
-CMessage* NewEmptyMessage(CMessageClass* type);
-
-// Retrieves the C++ descriptor of a Python Extension descriptor.
-// On error, return NULL with an exception set.
-const FieldDescriptor* GetExtensionDescriptor(PyObject* extension);
-
-// Initializes a new CMessage instance for a submessage. Only called once per
-// submessage as the result is cached in composite_fields.
-//
-// Corresponds to reflection api method GetMessage.
-CMessage* InternalGetSubMessage(
-    CMessage* self, const FieldDescriptor* field_descriptor);
-
-// Deletes a range of items in a repeated field (following a
-// removal in a RepeatedCompositeContainer).
-//
-// Corresponds to reflection api method RemoveLast.
-int DeleteRepeatedField(CMessage* self,
-                        const FieldDescriptor* field_descriptor,
-                        PyObject* slice);
-
-// Sets the specified scalar value to the message.
-int InternalSetScalar(CMessage* self,
-                      const FieldDescriptor* field_descriptor,
-                      PyObject* value);
-
-// Sets the specified scalar value to the message.  Requires it is not a Oneof.
-int InternalSetNonOneofScalar(Message* message,
-                              const FieldDescriptor* field_descriptor,
-                              PyObject* arg);
-
-// Retrieves the specified scalar value from the message.
-//
-// Returns a new python reference.
-PyObject* InternalGetScalar(const Message* message,
-                            const FieldDescriptor* field_descriptor);
-
-bool SetCompositeField(CMessage* self, const FieldDescriptor* field,
-                       ContainerBase* value);
-
-bool SetSubmessage(CMessage* self, CMessage* submessage);
-
-// Clears the message, removing all contained data. Extension dictionary and
-// submessages are released first if there are remaining external references.
-//
-// Corresponds to message api method Clear.
-PyObject* Clear(CMessage* self);
-
-// Clears the data described by the given descriptor.
-// Returns -1 on error.
-//
-// Corresponds to reflection api method ClearField.
-int ClearFieldByDescriptor(CMessage* self, const FieldDescriptor* descriptor);
-
-// Checks if the message has the field described by the descriptor. Used for
-// extensions (which have no name).
-// Returns 1 if true, 0 if false, and -1 on error.
-//
-// Corresponds to reflection api method HasField
-int HasFieldByDescriptor(CMessage* self,
-                         const FieldDescriptor* field_descriptor);
-
-// Checks if the message has the named field.
-//
-// Corresponds to reflection api method HasField.
-PyObject* HasField(CMessage* self, PyObject* arg);
-
-// Initializes values of fields on a newly constructed message.
-// Note that positional arguments are disallowed: 'args' must be NULL or the
-// empty tuple.
-int InitAttributes(CMessage* self, PyObject* args, PyObject* kwargs);
-
-PyObject* MergeFrom(CMessage* self, PyObject* arg);
-
-// This method does not do anything beyond checking that no other extension
-// has been registered with the same field number on this class.
-PyObject* RegisterExtension(PyObject* cls, PyObject* extension_handle);
-
-// Get a field from a message.
-PyObject* GetFieldValue(CMessage* self,
-                        const FieldDescriptor* field_descriptor);
-// Sets the value of a scalar field in a message.
-// On error, return -1 with an extension set.
-int SetFieldValue(CMessage* self, const FieldDescriptor* field_descriptor,
-                  PyObject* value);
-
-PyObject* FindInitializationErrors(CMessage* self);
-
-int AssureWritable(CMessage* self);
-
-// Returns the message factory for the given message.
-// This is equivalent to message.MESSAGE_FACTORY
-//
-// The returned factory is suitable for finding fields and building submessages,
-// even in the case of extensions.
-// Returns a *borrowed* reference, and never fails because we pass a CMessage.
-PyMessageFactory* GetFactoryForMessage(CMessage* message);
-
-PyObject* SetAllowOversizeProtos(PyObject* m, PyObject* arg);
-
-}  // namespace cmessage
-
-
-/* Is 64bit */
-#define IS_64BIT (SIZEOF_LONG == 8)
-
-#define FIELD_IS_REPEATED(field_descriptor) \
-  ((field_descriptor)->label() == FieldDescriptor::LABEL_REPEATED)
-
-#define GOOGLE_CHECK_GET_INT32(arg, value, err)  \
-  int32_t value;                          \
-  if (!CheckAndGetInteger(arg, &value)) { \
-    return err;                           \
-  }
-
-#define GOOGLE_CHECK_GET_INT64(arg, value, err)  \
-  int64_t value;                          \
-  if (!CheckAndGetInteger(arg, &value)) { \
-    return err;                           \
-  }
-
-#define GOOGLE_CHECK_GET_UINT32(arg, value, err) \
-  uint32_t value;                         \
-  if (!CheckAndGetInteger(arg, &value)) { \
-    return err;                           \
-  }
-
-#define GOOGLE_CHECK_GET_UINT64(arg, value, err) \
-  uint64_t value;                         \
-  if (!CheckAndGetInteger(arg, &value)) { \
-    return err;                           \
-  }
-
-#define GOOGLE_CHECK_GET_FLOAT(arg, value, err) \
-  float value;                           \
-  if (!CheckAndGetFloat(arg, &value)) {  \
-    return err;                          \
-  }
-
-#define GOOGLE_CHECK_GET_DOUBLE(arg, value, err) \
-  double value;                           \
-  if (!CheckAndGetDouble(arg, &value)) {  \
-    return err;                           \
-  }
-
-#define GOOGLE_CHECK_GET_BOOL(arg, value, err) \
-  bool value;                           \
-  if (!CheckAndGetBool(arg, &value)) {  \
-    return err;                         \
-  }
-
-#define FULL_MODULE_NAME "google.protobuf.pyext._message"
-
-void FormatTypeError(PyObject* arg, const char* expected_types);
-template<class T>
-bool CheckAndGetInteger(PyObject* arg, T* value);
-bool CheckAndGetDouble(PyObject* arg, double* value);
-bool CheckAndGetFloat(PyObject* arg, float* value);
-bool CheckAndGetBool(PyObject* arg, bool* value);
-PyObject* CheckString(PyObject* arg, const FieldDescriptor* descriptor);
-bool CheckAndSetString(
-    PyObject* arg, Message* message,
-    const FieldDescriptor* descriptor,
-    const Reflection* reflection,
-    bool append,
-    int index);
-PyObject* ToStringObject(const FieldDescriptor* descriptor,
-                         const std::string& value);
-
-// Check if the passed field descriptor belongs to the given message.
-// If not, return false and set a Python exception (a KeyError)
-bool CheckFieldBelongsToMessage(const FieldDescriptor* field_descriptor,
-                                const Message* message);
-
-extern PyObject* PickleError_class;
-
-PyObject* PyMessage_New(const Descriptor* descriptor,
-                        PyObject* py_message_factory);
-const Message* PyMessage_GetMessagePointer(PyObject* msg);
-Message* PyMessage_GetMutableMessagePointer(PyObject* msg);
-PyObject* PyMessage_NewMessageOwnedExternally(Message* message,
-                                              PyObject* py_message_factory);
-
-bool InitProto2MessageModule(PyObject *m);
-
-// These are referenced by repeated_scalar_container, and must
-// be explicitly instantiated.
-extern template bool CheckAndGetInteger<int32>(PyObject*, int32*);
-extern template bool CheckAndGetInteger<int64>(PyObject*, int64*);
-extern template bool CheckAndGetInteger<uint32>(PyObject*, uint32*);
-extern template bool CheckAndGetInteger<uint64>(PyObject*, uint64*);
-
-}  // namespace python
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // GOOGLE_PROTOBUF_PYTHON_CPP_MESSAGE_H__
diff --git a/libs/protobuf/python/google/protobuf/pyext/message_factory.cc b/libs/protobuf/python/google/protobuf/pyext/message_factory.cc
deleted file mode 100644
index bc44dd4..0000000
--- a/libs/protobuf/python/google/protobuf/pyext/message_factory.cc
+++ /dev/null
@@ -1,306 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <unordered_map>
-
-#define PY_SSIZE_T_CLEAN
-#include <Python.h>
-
-#include <google/protobuf/dynamic_message.h>
-#include <google/protobuf/pyext/descriptor.h>
-#include <google/protobuf/pyext/message.h>
-#include <google/protobuf/pyext/message_factory.h>
-#include <google/protobuf/pyext/scoped_pyobject_ptr.h>
-
-#define PyString_AsStringAndSize(ob, charpp, sizep)              \
-  (PyUnicode_Check(ob)                                           \
-       ? ((*(charpp) = const_cast<char*>(                        \
-               PyUnicode_AsUTF8AndSize(ob, (sizep)))) == nullptr \
-              ? -1                                               \
-              : 0)                                               \
-       : PyBytes_AsStringAndSize(ob, (charpp), (sizep)))
-
-namespace google {
-namespace protobuf {
-namespace python {
-
-namespace message_factory {
-
-PyMessageFactory* NewMessageFactory(PyTypeObject* type, PyDescriptorPool* pool) {
-  PyMessageFactory* factory = reinterpret_cast<PyMessageFactory*>(
-      PyType_GenericAlloc(type, 0));
-  if (factory == nullptr) {
-    return nullptr;
-  }
-
-  DynamicMessageFactory* message_factory = new DynamicMessageFactory();
-  // This option might be the default some day.
-  message_factory->SetDelegateToGeneratedFactory(true);
-  factory->message_factory = message_factory;
-
-  factory->pool = pool;
-  Py_INCREF(pool);
-
-  factory->classes_by_descriptor = new PyMessageFactory::ClassesByMessageMap();
-
-  return factory;
-}
-
-PyObject* New(PyTypeObject* type, PyObject* args, PyObject* kwargs) {
-  static const char* kwlist[] = {"pool", nullptr};
-  PyObject* pool = nullptr;
-  if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|O",
-                                   const_cast<char**>(kwlist), &pool)) {
-    return nullptr;
-  }
-  ScopedPyObjectPtr owned_pool;
-  if (pool == nullptr || pool == Py_None) {
-    owned_pool.reset(PyObject_CallFunction(
-        reinterpret_cast<PyObject*>(&PyDescriptorPool_Type), nullptr));
-    if (owned_pool == nullptr) {
-      return nullptr;
-    }
-    pool = owned_pool.get();
-  } else {
-    if (!PyObject_TypeCheck(pool, &PyDescriptorPool_Type)) {
-      PyErr_Format(PyExc_TypeError, "Expected a DescriptorPool, got %s",
-                   pool->ob_type->tp_name);
-      return nullptr;
-    }
-  }
-
-  return reinterpret_cast<PyObject*>(
-      NewMessageFactory(type, reinterpret_cast<PyDescriptorPool*>(pool)));
-}
-
-static void Dealloc(PyObject* pself) {
-  PyMessageFactory* self = reinterpret_cast<PyMessageFactory*>(pself);
-
-  typedef PyMessageFactory::ClassesByMessageMap::iterator iterator;
-  for (iterator it = self->classes_by_descriptor->begin();
-       it != self->classes_by_descriptor->end(); ++it) {
-    Py_CLEAR(it->second);
-  }
-  delete self->classes_by_descriptor;
-  delete self->message_factory;
-  Py_CLEAR(self->pool);
-  Py_TYPE(self)->tp_free(pself);
-}
-
-static int GcTraverse(PyObject* pself, visitproc visit, void* arg) {
-  PyMessageFactory* self = reinterpret_cast<PyMessageFactory*>(pself);
-  Py_VISIT(self->pool);
-  for (const auto& desc_and_class : *self->classes_by_descriptor) {
-    Py_VISIT(desc_and_class.second);
-  }
-  return 0;
-}
-
-static int GcClear(PyObject* pself) {
-  PyMessageFactory* self = reinterpret_cast<PyMessageFactory*>(pself);
-  // Here it's important to not clear self->pool, so that the C++ DescriptorPool
-  // is still alive when self->message_factory is destructed.
-  for (auto& desc_and_class : *self->classes_by_descriptor) {
-    Py_CLEAR(desc_and_class.second);
-  }
-
-  return 0;
-}
-
-// Add a message class to our database.
-int RegisterMessageClass(PyMessageFactory* self,
-                         const Descriptor* message_descriptor,
-                         CMessageClass* message_class) {
-  Py_INCREF(message_class);
-  typedef PyMessageFactory::ClassesByMessageMap::iterator iterator;
-  std::pair<iterator, bool> ret = self->classes_by_descriptor->insert(
-      std::make_pair(message_descriptor, message_class));
-  if (!ret.second) {
-    // Update case: DECREF the previous value.
-    Py_DECREF(ret.first->second);
-    ret.first->second = message_class;
-  }
-  return 0;
-}
-
-CMessageClass* GetOrCreateMessageClass(PyMessageFactory* self,
-                                       const Descriptor* descriptor) {
-  // This is the same implementation as MessageFactory.GetPrototype().
-
-  // Do not create a MessageClass that already exists.
-  std::unordered_map<const Descriptor*, CMessageClass*>::iterator it =
-      self->classes_by_descriptor->find(descriptor);
-  if (it != self->classes_by_descriptor->end()) {
-    Py_INCREF(it->second);
-    return it->second;
-  }
-  ScopedPyObjectPtr py_descriptor(
-      PyMessageDescriptor_FromDescriptor(descriptor));
-  if (py_descriptor == nullptr) {
-    return nullptr;
-  }
-  // Create a new message class.
-  ScopedPyObjectPtr args(Py_BuildValue(
-      "s(){sOsOsO}", descriptor->name().c_str(),
-      "DESCRIPTOR", py_descriptor.get(),
-      "__module__", Py_None,
-      "message_factory", self));
-  if (args == nullptr) {
-    return nullptr;
-  }
-  ScopedPyObjectPtr message_class(PyObject_CallObject(
-      reinterpret_cast<PyObject*>(CMessageClass_Type), args.get()));
-  if (message_class == nullptr) {
-    return nullptr;
-  }
-  // Create messages class for the messages used by the fields, and registers
-  // all extensions for these messages during the recursion.
-  for (int field_idx = 0; field_idx < descriptor->field_count(); field_idx++) {
-    const Descriptor* sub_descriptor =
-        descriptor->field(field_idx)->message_type();
-    // It is null if the field type is not a message.
-    if (sub_descriptor != nullptr) {
-      CMessageClass* result = GetOrCreateMessageClass(self, sub_descriptor);
-      if (result == nullptr) {
-        return nullptr;
-      }
-      Py_DECREF(result);
-    }
-  }
-
-  // Register extensions defined in this message.
-  for (int ext_idx = 0 ; ext_idx < descriptor->extension_count() ; ext_idx++) {
-    const FieldDescriptor* extension = descriptor->extension(ext_idx);
-    ScopedPyObjectPtr py_extended_class(
-        GetOrCreateMessageClass(self, extension->containing_type())
-            ->AsPyObject());
-    if (py_extended_class == nullptr) {
-      return nullptr;
-    }
-    ScopedPyObjectPtr py_extension(PyFieldDescriptor_FromDescriptor(extension));
-    if (py_extension == nullptr) {
-      return nullptr;
-    }
-    ScopedPyObjectPtr result(cmessage::RegisterExtension(
-        py_extended_class.get(), py_extension.get()));
-    if (result == nullptr) {
-      return nullptr;
-    }
-  }
-  return reinterpret_cast<CMessageClass*>(message_class.release());
-}
-
-// Retrieve the message class added to our database.
-CMessageClass* GetMessageClass(PyMessageFactory* self,
-                               const Descriptor* message_descriptor) {
-  typedef PyMessageFactory::ClassesByMessageMap::iterator iterator;
-  iterator ret = self->classes_by_descriptor->find(message_descriptor);
-  if (ret == self->classes_by_descriptor->end()) {
-    PyErr_Format(PyExc_TypeError, "No message class registered for '%s'",
-                 message_descriptor->full_name().c_str());
-    return nullptr;
-  } else {
-    return ret->second;
-  }
-}
-
-static PyMethodDef Methods[] = {
-    {nullptr},
-};
-
-static PyObject* GetPool(PyMessageFactory* self, void* closure) {
-  Py_INCREF(self->pool);
-  return reinterpret_cast<PyObject*>(self->pool);
-}
-
-static PyGetSetDef Getters[] = {
-    {"pool", (getter)GetPool, nullptr, "DescriptorPool"},
-    {nullptr},
-};
-
-}  // namespace message_factory
-
-PyTypeObject PyMessageFactory_Type = {
-    PyVarObject_HEAD_INIT(&PyType_Type, 0) FULL_MODULE_NAME
-    ".MessageFactory",         // tp_name
-    sizeof(PyMessageFactory),  // tp_basicsize
-    0,                         // tp_itemsize
-    message_factory::Dealloc,  // tp_dealloc
-#if PY_VERSION_HEX < 0x03080000
-    nullptr,  // tp_print
-#else
-    0,  // tp_vectorcall_offset
-#endif
-    nullptr,  // tp_getattr
-    nullptr,  // tp_setattr
-    nullptr,  // tp_compare
-    nullptr,  // tp_repr
-    nullptr,  // tp_as_number
-    nullptr,  // tp_as_sequence
-    nullptr,  // tp_as_mapping
-    nullptr,  // tp_hash
-    nullptr,  // tp_call
-    nullptr,  // tp_str
-    nullptr,  // tp_getattro
-    nullptr,  // tp_setattro
-    nullptr,  // tp_as_buffer
-    Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE | Py_TPFLAGS_HAVE_GC,  // tp_flags
-    "A static Message Factory",                                     // tp_doc
-    message_factory::GcTraverse,  // tp_traverse
-    message_factory::GcClear,     // tp_clear
-    nullptr,                      // tp_richcompare
-    0,                            // tp_weaklistoffset
-    nullptr,                      // tp_iter
-    nullptr,                      // tp_iternext
-    message_factory::Methods,     // tp_methods
-    nullptr,                      // tp_members
-    message_factory::Getters,     // tp_getset
-    nullptr,                      // tp_base
-    nullptr,                      // tp_dict
-    nullptr,                      // tp_descr_get
-    nullptr,                      // tp_descr_set
-    0,                            // tp_dictoffset
-    nullptr,                      // tp_init
-    nullptr,                      // tp_alloc
-    message_factory::New,         // tp_new
-    PyObject_GC_Del,              // tp_free
-};
-
-bool InitMessageFactory() {
-  if (PyType_Ready(&PyMessageFactory_Type) < 0) {
-    return false;
-  }
-
-  return true;
-}
-
-}  // namespace python
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/python/google/protobuf/pyext/message_factory.h b/libs/protobuf/python/google/protobuf/pyext/message_factory.h
deleted file mode 100644
index 7dfe425..0000000
--- a/libs/protobuf/python/google/protobuf/pyext/message_factory.h
+++ /dev/null
@@ -1,104 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef GOOGLE_PROTOBUF_PYTHON_CPP_MESSAGE_FACTORY_H__
-#define GOOGLE_PROTOBUF_PYTHON_CPP_MESSAGE_FACTORY_H__
-
-#define PY_SSIZE_T_CLEAN
-#include <Python.h>
-
-#include <unordered_map>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/pyext/descriptor_pool.h>
-
-namespace google {
-namespace protobuf {
-class MessageFactory;
-
-namespace python {
-
-// The (meta) type of all Messages classes.
-struct CMessageClass;
-
-struct PyMessageFactory {
-  PyObject_HEAD
-
-  // DynamicMessageFactory used to create C++ instances of messages.
-  // This object cache the descriptors that were used, so the DescriptorPool
-  // needs to get rid of it before it can delete itself.
-  //
-  // Note: A C++ MessageFactory is different from the PyMessageFactory.
-  // The C++ one creates messages, when the Python one creates classes.
-  MessageFactory* message_factory;
-
-  // Owned reference to a Python DescriptorPool.
-  // This reference must stay until the message_factory is destructed.
-  PyDescriptorPool* pool;
-
-  // Make our own mapping to retrieve Python classes from C++ descriptors.
-  //
-  // Descriptor pointers stored here are owned by the DescriptorPool above.
-  // Python references to classes are owned by this PyDescriptorPool.
-  typedef std::unordered_map<const Descriptor*, CMessageClass*>
-      ClassesByMessageMap;
-  ClassesByMessageMap* classes_by_descriptor;
-};
-
-extern PyTypeObject PyMessageFactory_Type;
-
-namespace message_factory {
-
-// Creates a new MessageFactory instance.
-PyMessageFactory* NewMessageFactory(PyTypeObject* type, PyDescriptorPool* pool);
-
-// Registers a new Python class for the given message descriptor.
-// On error, returns -1 with a Python exception set.
-int RegisterMessageClass(PyMessageFactory* self,
-                         const Descriptor* message_descriptor,
-                         CMessageClass* message_class);
-// Retrieves the Python class registered with the given message descriptor, or
-// fail with a TypeError. Returns a *borrowed* reference.
-CMessageClass* GetMessageClass(PyMessageFactory* self,
-                               const Descriptor* message_descriptor);
-// Retrieves the Python class registered with the given message descriptor.
-// The class is created if not done yet. Returns a *new* reference.
-CMessageClass* GetOrCreateMessageClass(PyMessageFactory* self,
-                                       const Descriptor* message_descriptor);
-}  // namespace message_factory
-
-// Initialize objects used by this module.
-// On error, returns false with a Python exception set.
-bool InitMessageFactory();
-
-}  // namespace python
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // GOOGLE_PROTOBUF_PYTHON_CPP_MESSAGE_FACTORY_H__
diff --git a/libs/protobuf/python/google/protobuf/pyext/message_module.cc b/libs/protobuf/python/google/protobuf/pyext/message_module.cc
deleted file mode 100644
index 2d3c1d2..0000000
--- a/libs/protobuf/python/google/protobuf/pyext/message_module.cc
+++ /dev/null
@@ -1,134 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#define PY_SSIZE_T_CLEAN
-#include <Python.h>
-
-#include <google/protobuf/message_lite.h>
-#include <google/protobuf/pyext/descriptor.h>
-#include <google/protobuf/pyext/descriptor_pool.h>
-#include <google/protobuf/pyext/message.h>
-#include <google/protobuf/pyext/message_factory.h>
-#include <google/protobuf/proto_api.h>
-
-namespace {
-
-// C++ API.  Clients get at this via proto_api.h
-struct ApiImplementation : google::protobuf::python::PyProto_API {
-  const google::protobuf::Message* GetMessagePointer(PyObject* msg) const override {
-    return google::protobuf::python::PyMessage_GetMessagePointer(msg);
-  }
-  google::protobuf::Message* GetMutableMessagePointer(PyObject* msg) const override {
-    return google::protobuf::python::PyMessage_GetMutableMessagePointer(msg);
-  }
-  const google::protobuf::Descriptor* MessageDescriptor_AsDescriptor(
-      PyObject* desc) const override {
-    return google::protobuf::python::PyMessageDescriptor_AsDescriptor(desc);
-  }
-  const google::protobuf::EnumDescriptor* EnumDescriptor_AsDescriptor(
-      PyObject* enum_desc) const override {
-    return google::protobuf::python::PyEnumDescriptor_AsDescriptor(enum_desc);
-  }
-
-  const google::protobuf::DescriptorPool* GetDefaultDescriptorPool() const override {
-    return google::protobuf::python::GetDefaultDescriptorPool()->pool;
-  }
-
-  google::protobuf::MessageFactory* GetDefaultMessageFactory() const override {
-    return google::protobuf::python::GetDefaultDescriptorPool()
-        ->py_message_factory->message_factory;
-  }
-  PyObject* NewMessage(const google::protobuf::Descriptor* descriptor,
-                       PyObject* py_message_factory) const override {
-    return google::protobuf::python::PyMessage_New(descriptor, py_message_factory);
-  }
-  PyObject* NewMessageOwnedExternally(
-      google::protobuf::Message* msg, PyObject* py_message_factory) const override {
-    return google::protobuf::python::PyMessage_NewMessageOwnedExternally(
-        msg, py_message_factory);
-  }
-  PyObject* DescriptorPool_FromPool(
-      const google::protobuf::DescriptorPool* pool) const override {
-    return google::protobuf::python::PyDescriptorPool_FromPool(pool);
-  }
-};
-
-}  // namespace
-
-static const char module_docstring[] =
-    "python-proto2 is a module that can be used to enhance proto2 Python API\n"
-    "performance.\n"
-    "\n"
-    "It provides access to the protocol buffers C++ reflection API that\n"
-    "implements the basic protocol buffer functions.";
-
-static PyMethodDef ModuleMethods[] = {
-    {"SetAllowOversizeProtos",
-     (PyCFunction)google::protobuf::python::cmessage::SetAllowOversizeProtos, METH_O,
-     "Enable/disable oversize proto parsing."},
-    // DO NOT USE: For migration and testing only.
-    {nullptr, nullptr}};
-
-static struct PyModuleDef _module = {PyModuleDef_HEAD_INIT,
-                                     "_message",
-                                     module_docstring,
-                                     -1,
-                                     ModuleMethods, /* m_methods */
-                                     nullptr,
-                                     nullptr,
-                                     nullptr,
-                                     nullptr};
-
-PyMODINIT_FUNC PyInit__message() {
-  PyObject* m;
-  m = PyModule_Create(&_module);
-  if (m == nullptr) {
-    return nullptr;
-  }
-
-  if (!google::protobuf::python::InitProto2MessageModule(m)) {
-    Py_DECREF(m);
-    return nullptr;
-  }
-
-  // Adds the C++ API
-  if (PyObject* api = PyCapsule_New(
-          new ApiImplementation(), google::protobuf::python::PyProtoAPICapsuleName(),
-          [](PyObject* o) {
-            delete (ApiImplementation*)PyCapsule_GetPointer(
-                o, google::protobuf::python::PyProtoAPICapsuleName());
-          })) {
-    PyModule_AddObject(m, "proto_API", api);
-  } else {
-    return nullptr;
-  }
-
-  return m;
-}
diff --git a/libs/protobuf/python/google/protobuf/pyext/proto2_api_test.proto b/libs/protobuf/python/google/protobuf/pyext/proto2_api_test.proto
deleted file mode 100644
index 1fd78e8..0000000
--- a/libs/protobuf/python/google/protobuf/pyext/proto2_api_test.proto
+++ /dev/null
@@ -1,40 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto2";
-
-package google.protobuf.python.internal;
-
-import "google/protobuf/internal/cpp/proto1_api_test.proto";
-
-message TestNestedProto1APIMessage {
-  optional int32 a = 1;
-  optional TestMessage.NestedMessage b = 2;
-}
diff --git a/libs/protobuf/python/google/protobuf/pyext/python.proto b/libs/protobuf/python/google/protobuf/pyext/python.proto
deleted file mode 100644
index 2e50df7..0000000
--- a/libs/protobuf/python/google/protobuf/pyext/python.proto
+++ /dev/null
@@ -1,68 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: tibell@google.com (Johan Tibell)
-//
-// These message definitions are used to exercises known corner cases
-// in the C++ implementation of the Python API.
-
-syntax = "proto2";
-
-package google.protobuf.python.internal;
-
-// Protos optimized for SPEED use a strict superset of the generated code
-// of equivalent ones optimized for CODE_SIZE, so we should optimize all our
-// tests for speed unless explicitly testing code size optimization.
-option optimize_for = SPEED;
-
-message TestAllTypes {
-  message NestedMessage {
-    optional int32 bb = 1;
-    optional ForeignMessage cc = 2;
-  }
-
-  repeated NestedMessage repeated_nested_message = 1;
-  optional NestedMessage optional_nested_message = 2;
-  optional int32 optional_int32 = 3;
-}
-
-message ForeignMessage {
-  optional int32 c = 1;
-  repeated int32 d = 2;
-}
-
-message TestAllExtensions {  // extension begin
-  extensions 1 to max;
-}  // extension end
-
-extend TestAllExtensions {  // extension begin
-  optional TestAllTypes.NestedMessage optional_nested_message_extension = 1;
-  repeated TestAllTypes.NestedMessage repeated_nested_message_extension = 2;
-}  // extension end
diff --git a/libs/protobuf/python/google/protobuf/pyext/repeated_composite_container.cc b/libs/protobuf/python/google/protobuf/pyext/repeated_composite_container.cc
deleted file mode 100644
index 0b63f82..0000000
--- a/libs/protobuf/python/google/protobuf/pyext/repeated_composite_container.cc
+++ /dev/null
@@ -1,591 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: anuraag@google.com (Anuraag Agrawal)
-// Author: tibell@google.com (Johan Tibell)
-
-#include <google/protobuf/pyext/repeated_composite_container.h>
-
-#include <memory>
-
-#include <google/protobuf/stubs/logging.h>
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/dynamic_message.h>
-#include <google/protobuf/message.h>
-#include <google/protobuf/reflection.h>
-#include <google/protobuf/pyext/descriptor.h>
-#include <google/protobuf/pyext/descriptor_pool.h>
-#include <google/protobuf/pyext/message.h>
-#include <google/protobuf/pyext/message_factory.h>
-#include <google/protobuf/pyext/scoped_pyobject_ptr.h>
-#include <google/protobuf/stubs/map_util.h>
-
-namespace google {
-namespace protobuf {
-namespace python {
-
-namespace repeated_composite_container {
-
-// ---------------------------------------------------------------------
-// len()
-
-static Py_ssize_t Length(PyObject* pself) {
-  RepeatedCompositeContainer* self =
-      reinterpret_cast<RepeatedCompositeContainer*>(pself);
-
-  Message* message = self->parent->message;
-  return message->GetReflection()->FieldSize(*message,
-                                             self->parent_field_descriptor);
-}
-
-// ---------------------------------------------------------------------
-// add()
-
-PyObject* Add(RepeatedCompositeContainer* self, PyObject* args,
-              PyObject* kwargs) {
-  if (cmessage::AssureWritable(self->parent) == -1) return nullptr;
-  Message* message = self->parent->message;
-
-  Message* sub_message = message->GetReflection()->AddMessage(
-      message, self->parent_field_descriptor,
-      self->child_message_class->py_message_factory->message_factory);
-  CMessage* cmsg = self->parent->BuildSubMessageFromPointer(
-      self->parent_field_descriptor, sub_message, self->child_message_class);
-
-  if (cmessage::InitAttributes(cmsg, args, kwargs) < 0) {
-    message->GetReflection()->RemoveLast(message,
-                                         self->parent_field_descriptor);
-    Py_DECREF(cmsg);
-    return nullptr;
-  }
-
-  return cmsg->AsPyObject();
-}
-
-static PyObject* AddMethod(PyObject* self, PyObject* args, PyObject* kwargs) {
-  return Add(reinterpret_cast<RepeatedCompositeContainer*>(self), args, kwargs);
-}
-
-// ---------------------------------------------------------------------
-// append()
-
-static PyObject* AddMessage(RepeatedCompositeContainer* self, PyObject* value) {
-  cmessage::AssureWritable(self->parent);
-  PyObject* py_cmsg;
-  Message* message = self->parent->message;
-  const Reflection* reflection = message->GetReflection();
-  py_cmsg = Add(self, nullptr, nullptr);
-  if (py_cmsg == nullptr) return nullptr;
-  CMessage* cmsg = reinterpret_cast<CMessage*>(py_cmsg);
-  if (ScopedPyObjectPtr(cmessage::MergeFrom(cmsg, value)) == nullptr) {
-    reflection->RemoveLast(message, self->parent_field_descriptor);
-    Py_DECREF(cmsg);
-    return nullptr;
-  }
-  return py_cmsg;
-}
-
-static PyObject* AppendMethod(PyObject* pself, PyObject* value) {
-  RepeatedCompositeContainer* self =
-      reinterpret_cast<RepeatedCompositeContainer*>(pself);
-  ScopedPyObjectPtr py_cmsg(AddMessage(self, value));
-  if (py_cmsg == nullptr) {
-    return nullptr;
-  }
-
-  Py_RETURN_NONE;
-}
-
-// ---------------------------------------------------------------------
-// insert()
-static PyObject* Insert(PyObject* pself, PyObject* args) {
-  RepeatedCompositeContainer* self =
-      reinterpret_cast<RepeatedCompositeContainer*>(pself);
-
-  Py_ssize_t index;
-  PyObject* value;
-  if (!PyArg_ParseTuple(args, "nO", &index, &value)) {
-    return nullptr;
-  }
-
-  ScopedPyObjectPtr py_cmsg(AddMessage(self, value));
-  if (py_cmsg == nullptr) {
-    return nullptr;
-  }
-
-  // Swap the element to right position.
-  Message* message = self->parent->message;
-  const Reflection* reflection = message->GetReflection();
-  const FieldDescriptor* field_descriptor = self->parent_field_descriptor;
-  Py_ssize_t length = reflection->FieldSize(*message, field_descriptor) - 1;
-  Py_ssize_t end_index = index;
-  if (end_index < 0) end_index += length;
-  if (end_index < 0) end_index = 0;
-  for (Py_ssize_t i = length; i > end_index; i--) {
-    reflection->SwapElements(message, field_descriptor, i, i - 1);
-  }
-
-  Py_RETURN_NONE;
-}
-
-// ---------------------------------------------------------------------
-// extend()
-
-PyObject* Extend(RepeatedCompositeContainer* self, PyObject* value) {
-  cmessage::AssureWritable(self->parent);
-  ScopedPyObjectPtr iter(PyObject_GetIter(value));
-  if (iter == nullptr) {
-    PyErr_SetString(PyExc_TypeError, "Value must be iterable");
-    return nullptr;
-  }
-  ScopedPyObjectPtr next;
-  while ((next.reset(PyIter_Next(iter.get()))) != nullptr) {
-    if (!PyObject_TypeCheck(next.get(), CMessage_Type)) {
-      PyErr_SetString(PyExc_TypeError, "Not a cmessage");
-      return nullptr;
-    }
-    ScopedPyObjectPtr new_message(Add(self, nullptr, nullptr));
-    if (new_message == nullptr) {
-      return nullptr;
-    }
-    CMessage* new_cmessage = reinterpret_cast<CMessage*>(new_message.get());
-    if (ScopedPyObjectPtr(cmessage::MergeFrom(new_cmessage, next.get())) ==
-        nullptr) {
-      return nullptr;
-    }
-  }
-  if (PyErr_Occurred()) {
-    return nullptr;
-  }
-  Py_RETURN_NONE;
-}
-
-static PyObject* ExtendMethod(PyObject* self, PyObject* value) {
-  return Extend(reinterpret_cast<RepeatedCompositeContainer*>(self), value);
-}
-
-PyObject* MergeFrom(RepeatedCompositeContainer* self, PyObject* other) {
-  return Extend(self, other);
-}
-
-static PyObject* MergeFromMethod(PyObject* self, PyObject* other) {
-  return MergeFrom(reinterpret_cast<RepeatedCompositeContainer*>(self), other);
-}
-
-// This function does not check the bounds.
-static PyObject* GetItem(RepeatedCompositeContainer* self, Py_ssize_t index,
-                         Py_ssize_t length = -1) {
-  if (length == -1) {
-    Message* message = self->parent->message;
-    const Reflection* reflection = message->GetReflection();
-    length = reflection->FieldSize(*message, self->parent_field_descriptor);
-  }
-  if (index < 0 || index >= length) {
-    PyErr_Format(PyExc_IndexError, "list index (%zd) out of range", index);
-    return nullptr;
-  }
-  Message* message = self->parent->message;
-  Message* sub_message = message->GetReflection()->MutableRepeatedMessage(
-      message, self->parent_field_descriptor, index);
-  return self->parent
-      ->BuildSubMessageFromPointer(self->parent_field_descriptor, sub_message,
-                                   self->child_message_class)
-      ->AsPyObject();
-}
-
-PyObject* Subscript(RepeatedCompositeContainer* self, PyObject* item) {
-  Message* message = self->parent->message;
-  const Reflection* reflection = message->GetReflection();
-  Py_ssize_t length =
-      reflection->FieldSize(*message, self->parent_field_descriptor);
-
-  if (PyIndex_Check(item)) {
-    Py_ssize_t index;
-    index = PyNumber_AsSsize_t(item, PyExc_IndexError);
-    if (index == -1 && PyErr_Occurred()) return nullptr;
-    if (index < 0) index += length;
-    return GetItem(self, index, length);
-  } else if (PySlice_Check(item)) {
-    Py_ssize_t from, to, step, slicelength, cur, i;
-    PyObject* result;
-
-    if (PySlice_GetIndicesEx(item, length, &from, &to, &step, &slicelength) ==
-        -1) {
-      return nullptr;
-    }
-
-    if (slicelength <= 0) {
-      return PyList_New(0);
-    } else {
-      result = PyList_New(slicelength);
-      if (!result) return nullptr;
-
-      for (cur = from, i = 0; i < slicelength; cur += step, i++) {
-        PyList_SET_ITEM(result, i, GetItem(self, cur, length));
-      }
-
-      return result;
-    }
-  } else {
-    PyErr_Format(PyExc_TypeError, "indices must be integers, not %.200s",
-                 item->ob_type->tp_name);
-    return nullptr;
-  }
-}
-
-static PyObject* SubscriptMethod(PyObject* self, PyObject* slice) {
-  return Subscript(reinterpret_cast<RepeatedCompositeContainer*>(self), slice);
-}
-
-int AssignSubscript(RepeatedCompositeContainer* self, PyObject* slice,
-                    PyObject* value) {
-  if (value != nullptr) {
-    PyErr_SetString(PyExc_TypeError, "does not support assignment");
-    return -1;
-  }
-
-  return cmessage::DeleteRepeatedField(self->parent,
-                                       self->parent_field_descriptor, slice);
-}
-
-static int AssignSubscriptMethod(PyObject* self, PyObject* slice,
-                                 PyObject* value) {
-  return AssignSubscript(reinterpret_cast<RepeatedCompositeContainer*>(self),
-                         slice, value);
-}
-
-static PyObject* Remove(PyObject* pself, PyObject* value) {
-  RepeatedCompositeContainer* self =
-      reinterpret_cast<RepeatedCompositeContainer*>(pself);
-  Py_ssize_t len = Length(reinterpret_cast<PyObject*>(self));
-
-  for (Py_ssize_t i = 0; i < len; i++) {
-    ScopedPyObjectPtr item(GetItem(self, i, len));
-    if (item == nullptr) {
-      return nullptr;
-    }
-    int result = PyObject_RichCompareBool(item.get(), value, Py_EQ);
-    if (result < 0) {
-      return nullptr;
-    }
-    if (result) {
-      ScopedPyObjectPtr py_index(PyLong_FromSsize_t(i));
-      if (AssignSubscript(self, py_index.get(), nullptr) < 0) {
-        return nullptr;
-      }
-      Py_RETURN_NONE;
-    }
-  }
-  PyErr_SetString(PyExc_ValueError, "Item to delete not in list");
-  return nullptr;
-}
-
-static PyObject* RichCompare(PyObject* pself, PyObject* other, int opid) {
-  RepeatedCompositeContainer* self =
-      reinterpret_cast<RepeatedCompositeContainer*>(pself);
-
-  if (!PyObject_TypeCheck(other, &RepeatedCompositeContainer_Type)) {
-    PyErr_SetString(PyExc_TypeError,
-                    "Can only compare repeated composite fields "
-                    "against other repeated composite fields.");
-    return nullptr;
-  }
-  if (opid == Py_EQ || opid == Py_NE) {
-    // TODO(anuraag): Don't make new lists just for this...
-    ScopedPyObjectPtr full_slice(PySlice_New(nullptr, nullptr, nullptr));
-    if (full_slice == nullptr) {
-      return nullptr;
-    }
-    ScopedPyObjectPtr list(Subscript(self, full_slice.get()));
-    if (list == nullptr) {
-      return nullptr;
-    }
-    ScopedPyObjectPtr other_list(
-        Subscript(reinterpret_cast<RepeatedCompositeContainer*>(other),
-                  full_slice.get()));
-    if (other_list == nullptr) {
-      return nullptr;
-    }
-    return PyObject_RichCompare(list.get(), other_list.get(), opid);
-  } else {
-    Py_INCREF(Py_NotImplemented);
-    return Py_NotImplemented;
-  }
-}
-
-static PyObject* ToStr(PyObject* pself) {
-  ScopedPyObjectPtr full_slice(PySlice_New(nullptr, nullptr, nullptr));
-  if (full_slice == nullptr) {
-    return nullptr;
-  }
-  ScopedPyObjectPtr list(Subscript(
-      reinterpret_cast<RepeatedCompositeContainer*>(pself), full_slice.get()));
-  if (list == nullptr) {
-    return nullptr;
-  }
-  return PyObject_Repr(list.get());
-}
-
-// ---------------------------------------------------------------------
-// sort()
-
-static void ReorderAttached(RepeatedCompositeContainer* self,
-                            PyObject* child_list) {
-  Message* message = self->parent->message;
-  const Reflection* reflection = message->GetReflection();
-  const FieldDescriptor* descriptor = self->parent_field_descriptor;
-  const Py_ssize_t length = Length(reinterpret_cast<PyObject*>(self));
-
-  // We need to rearrange things to match python's sort order.
-  for (Py_ssize_t i = 0; i < length; ++i) {
-    reflection->UnsafeArenaReleaseLast(message, descriptor);
-  }
-  for (Py_ssize_t i = 0; i < length; ++i) {
-    Message* child_message =
-        reinterpret_cast<CMessage*>(PyList_GET_ITEM(child_list, i))->message;
-    reflection->UnsafeArenaAddAllocatedMessage(message, descriptor,
-                                               child_message);
-  }
-}
-
-// Returns 0 if successful; returns -1 and sets an exception if
-// unsuccessful.
-static int SortPythonMessages(RepeatedCompositeContainer* self, PyObject* args,
-                              PyObject* kwds) {
-  ScopedPyObjectPtr child_list(
-      PySequence_List(reinterpret_cast<PyObject*>(self)));
-  if (child_list == nullptr) {
-    return -1;
-  }
-  ScopedPyObjectPtr m(PyObject_GetAttrString(child_list.get(), "sort"));
-  if (m == nullptr) return -1;
-  if (ScopedPyObjectPtr(PyObject_Call(m.get(), args, kwds)) == nullptr)
-    return -1;
-  ReorderAttached(self, child_list.get());
-  return 0;
-}
-
-static PyObject* Sort(PyObject* pself, PyObject* args, PyObject* kwds) {
-  RepeatedCompositeContainer* self =
-      reinterpret_cast<RepeatedCompositeContainer*>(pself);
-
-  // Support the old sort_function argument for backwards
-  // compatibility.
-  if (kwds != nullptr) {
-    PyObject* sort_func = PyDict_GetItemString(kwds, "sort_function");
-    if (sort_func != nullptr) {
-      // Must set before deleting as sort_func is a borrowed reference
-      // and kwds might be the only thing keeping it alive.
-      PyDict_SetItemString(kwds, "cmp", sort_func);
-      PyDict_DelItemString(kwds, "sort_function");
-    }
-  }
-
-  if (SortPythonMessages(self, args, kwds) < 0) {
-    return nullptr;
-  }
-  Py_RETURN_NONE;
-}
-
-// ---------------------------------------------------------------------
-// reverse()
-
-// Returns 0 if successful; returns -1 and sets an exception if
-// unsuccessful.
-static int ReversePythonMessages(RepeatedCompositeContainer* self) {
-  ScopedPyObjectPtr child_list(
-      PySequence_List(reinterpret_cast<PyObject*>(self)));
-  if (child_list == nullptr) {
-    return -1;
-  }
-  if (ScopedPyObjectPtr(
-          PyObject_CallMethod(child_list.get(), "reverse", nullptr)) == nullptr)
-    return -1;
-  ReorderAttached(self, child_list.get());
-  return 0;
-}
-
-static PyObject* Reverse(PyObject* pself) {
-  RepeatedCompositeContainer* self =
-      reinterpret_cast<RepeatedCompositeContainer*>(pself);
-
-  if (ReversePythonMessages(self) < 0) {
-    return nullptr;
-  }
-  Py_RETURN_NONE;
-}
-
-// ---------------------------------------------------------------------
-
-static PyObject* Item(PyObject* pself, Py_ssize_t index) {
-  RepeatedCompositeContainer* self =
-      reinterpret_cast<RepeatedCompositeContainer*>(pself);
-  return GetItem(self, index);
-}
-
-static PyObject* Pop(PyObject* pself, PyObject* args) {
-  RepeatedCompositeContainer* self =
-      reinterpret_cast<RepeatedCompositeContainer*>(pself);
-
-  Py_ssize_t index = -1;
-  if (!PyArg_ParseTuple(args, "|n", &index)) {
-    return nullptr;
-  }
-  Py_ssize_t length = Length(pself);
-  if (index < 0) index += length;
-  PyObject* item = GetItem(self, index, length);
-  if (item == nullptr) {
-    return nullptr;
-  }
-  ScopedPyObjectPtr py_index(PyLong_FromSsize_t(index));
-  if (AssignSubscript(self, py_index.get(), nullptr) < 0) {
-    return nullptr;
-  }
-  return item;
-}
-
-PyObject* DeepCopy(PyObject* pself, PyObject* arg) {
-  return reinterpret_cast<RepeatedCompositeContainer*>(pself)->DeepCopy();
-}
-
-// The private constructor of RepeatedCompositeContainer objects.
-RepeatedCompositeContainer* NewContainer(
-    CMessage* parent, const FieldDescriptor* parent_field_descriptor,
-    CMessageClass* child_message_class) {
-  if (!CheckFieldBelongsToMessage(parent_field_descriptor, parent->message)) {
-    return nullptr;
-  }
-
-  RepeatedCompositeContainer* self =
-      reinterpret_cast<RepeatedCompositeContainer*>(
-          PyType_GenericAlloc(&RepeatedCompositeContainer_Type, 0));
-  if (self == nullptr) {
-    return nullptr;
-  }
-
-  Py_INCREF(parent);
-  self->parent = parent;
-  self->parent_field_descriptor = parent_field_descriptor;
-  Py_INCREF(child_message_class);
-  self->child_message_class = child_message_class;
-  return self;
-}
-
-static void Dealloc(PyObject* pself) {
-  RepeatedCompositeContainer* self =
-      reinterpret_cast<RepeatedCompositeContainer*>(pself);
-  self->RemoveFromParentCache();
-  Py_CLEAR(self->child_message_class);
-  Py_TYPE(self)->tp_free(pself);
-}
-
-static PySequenceMethods SqMethods = {
-    Length,  /* sq_length */
-    nullptr, /* sq_concat */
-    nullptr, /* sq_repeat */
-    Item     /* sq_item */
-};
-
-static PyMappingMethods MpMethods = {
-    Length,                /* mp_length */
-    SubscriptMethod,       /* mp_subscript */
-    AssignSubscriptMethod, /* mp_ass_subscript */
-};
-
-static PyMethodDef Methods[] = {
-    {"__deepcopy__", DeepCopy, METH_VARARGS, "Makes a deep copy of the class."},
-    {"add", reinterpret_cast<PyCFunction>(AddMethod),
-     METH_VARARGS | METH_KEYWORDS, "Adds an object to the repeated container."},
-    {"append", AppendMethod, METH_O,
-     "Appends a message to the end of the repeated container."},
-    {"insert", Insert, METH_VARARGS,
-     "Inserts a message before the specified index."},
-    {"extend", ExtendMethod, METH_O, "Adds objects to the repeated container."},
-    {"pop", Pop, METH_VARARGS,
-     "Removes an object from the repeated container and returns it."},
-    {"remove", Remove, METH_O,
-     "Removes an object from the repeated container."},
-    {"sort", reinterpret_cast<PyCFunction>(Sort), METH_VARARGS | METH_KEYWORDS,
-     "Sorts the repeated container."},
-    {"reverse", reinterpret_cast<PyCFunction>(Reverse), METH_NOARGS,
-     "Reverses elements order of the repeated container."},
-    {"MergeFrom", MergeFromMethod, METH_O,
-     "Adds objects to the repeated container."},
-    {nullptr, nullptr}};
-
-}  // namespace repeated_composite_container
-
-PyTypeObject RepeatedCompositeContainer_Type = {
-    PyVarObject_HEAD_INIT(&PyType_Type, 0) FULL_MODULE_NAME
-    ".RepeatedCompositeContainer",          // tp_name
-    sizeof(RepeatedCompositeContainer),     // tp_basicsize
-    0,                                      //  tp_itemsize
-    repeated_composite_container::Dealloc,  //  tp_dealloc
-#if PY_VERSION_HEX >= 0x03080000
-    0,  //  tp_vectorcall_offset
-#else
-    nullptr,  //  tp_print
-#endif
-    nullptr,                                    //  tp_getattr
-    nullptr,                                    //  tp_setattr
-    nullptr,                                    //  tp_compare
-    repeated_composite_container::ToStr,        //  tp_repr
-    nullptr,                                    //  tp_as_number
-    &repeated_composite_container::SqMethods,   //  tp_as_sequence
-    &repeated_composite_container::MpMethods,   //  tp_as_mapping
-    PyObject_HashNotImplemented,                //  tp_hash
-    nullptr,                                    //  tp_call
-    nullptr,                                    //  tp_str
-    nullptr,                                    //  tp_getattro
-    nullptr,                                    //  tp_setattro
-    nullptr,                                    //  tp_as_buffer
-    Py_TPFLAGS_DEFAULT,                         //  tp_flags
-    "A Repeated scalar container",              //  tp_doc
-    nullptr,                                    //  tp_traverse
-    nullptr,                                    //  tp_clear
-    repeated_composite_container::RichCompare,  //  tp_richcompare
-    0,                                          //  tp_weaklistoffset
-    nullptr,                                    //  tp_iter
-    nullptr,                                    //  tp_iternext
-    repeated_composite_container::Methods,      //  tp_methods
-    nullptr,                                    //  tp_members
-    nullptr,                                    //  tp_getset
-    nullptr,                                    //  tp_base
-    nullptr,                                    //  tp_dict
-    nullptr,                                    //  tp_descr_get
-    nullptr,                                    //  tp_descr_set
-    0,                                          //  tp_dictoffset
-    nullptr,                                    //  tp_init
-};
-
-}  // namespace python
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/python/google/protobuf/pyext/repeated_composite_container.h b/libs/protobuf/python/google/protobuf/pyext/repeated_composite_container.h
deleted file mode 100644
index 6fa6e17..0000000
--- a/libs/protobuf/python/google/protobuf/pyext/repeated_composite_container.h
+++ /dev/null
@@ -1,109 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: anuraag@google.com (Anuraag Agrawal)
-// Author: tibell@google.com (Johan Tibell)
-
-#ifndef GOOGLE_PROTOBUF_PYTHON_CPP_REPEATED_COMPOSITE_CONTAINER_H__
-#define GOOGLE_PROTOBUF_PYTHON_CPP_REPEATED_COMPOSITE_CONTAINER_H__
-
-#define PY_SSIZE_T_CLEAN
-#include <Python.h>
-
-#include <google/protobuf/pyext/message.h>
-
-namespace google {
-namespace protobuf {
-
-class FieldDescriptor;
-class Message;
-
-namespace python {
-
-struct CMessageClass;
-
-// A RepeatedCompositeContainer always has a parent message.
-// The parent message also caches reference to items of the container.
-typedef struct RepeatedCompositeContainer : public ContainerBase {
-  // The type used to create new child messages.
-  CMessageClass* child_message_class;
-} RepeatedCompositeContainer;
-
-extern PyTypeObject RepeatedCompositeContainer_Type;
-
-namespace repeated_composite_container {
-
-// Builds a RepeatedCompositeContainer object, from a parent message and a
-// field descriptor.
-RepeatedCompositeContainer* NewContainer(
-    CMessage* parent,
-    const FieldDescriptor* parent_field_descriptor,
-    CMessageClass *child_message_class);
-
-// Appends a new CMessage to the container and returns it.  The
-// CMessage is initialized using the content of kwargs.
-//
-// Returns a new reference if successful; returns NULL and sets an
-// exception if unsuccessful.
-PyObject* Add(RepeatedCompositeContainer* self,
-              PyObject* args,
-              PyObject* kwargs);
-
-// Appends all the CMessages in the input iterator to the container.
-//
-// Returns None if successful; returns NULL and sets an exception if
-// unsuccessful.
-PyObject* Extend(RepeatedCompositeContainer* self, PyObject* value);
-
-// Appends a new message to the container for each message in the
-// input iterator, merging each data element in. Equivalent to extend.
-//
-// Returns None if successful; returns NULL and sets an exception if
-// unsuccessful.
-PyObject* MergeFrom(RepeatedCompositeContainer* self, PyObject* other);
-
-// Accesses messages in the container.
-//
-// Returns a new reference to the message for an integer parameter.
-// Returns a new reference to a list of messages for a slice.
-PyObject* Subscript(RepeatedCompositeContainer* self, PyObject* slice);
-
-// Deletes items from the container (cannot be used for assignment).
-//
-// Returns 0 on success, -1 on failure.
-int AssignSubscript(RepeatedCompositeContainer* self,
-                    PyObject* slice,
-                    PyObject* value);
-}  // namespace repeated_composite_container
-}  // namespace python
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // GOOGLE_PROTOBUF_PYTHON_CPP_REPEATED_COMPOSITE_CONTAINER_H__
diff --git a/libs/protobuf/python/google/protobuf/pyext/repeated_scalar_container.cc b/libs/protobuf/python/google/protobuf/pyext/repeated_scalar_container.cc
deleted file mode 100644
index f4a8df2..0000000
--- a/libs/protobuf/python/google/protobuf/pyext/repeated_scalar_container.cc
+++ /dev/null
@@ -1,774 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: anuraag@google.com (Anuraag Agrawal)
-// Author: tibell@google.com (Johan Tibell)
-
-#include <google/protobuf/pyext/repeated_scalar_container.h>
-
-#include <cstdint>
-#include <memory>
-
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/stubs/logging.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/dynamic_message.h>
-#include <google/protobuf/message.h>
-#include <google/protobuf/pyext/descriptor.h>
-#include <google/protobuf/pyext/descriptor_pool.h>
-#include <google/protobuf/pyext/message.h>
-#include <google/protobuf/pyext/scoped_pyobject_ptr.h>
-
-#define PyString_AsString(ob) \
-  (PyUnicode_Check(ob) ? PyUnicode_AsUTF8(ob) : PyBytes_AsString(ob))
-
-namespace google {
-namespace protobuf {
-namespace python {
-
-namespace repeated_scalar_container {
-
-static int InternalAssignRepeatedField(RepeatedScalarContainer* self,
-                                       PyObject* list) {
-  Message* message = self->parent->message;
-  message->GetReflection()->ClearField(message, self->parent_field_descriptor);
-  for (Py_ssize_t i = 0; i < PyList_GET_SIZE(list); ++i) {
-    PyObject* value = PyList_GET_ITEM(list, i);
-    if (ScopedPyObjectPtr(Append(self, value)) == nullptr) {
-      return -1;
-    }
-  }
-  return 0;
-}
-
-static Py_ssize_t Len(PyObject* pself) {
-  RepeatedScalarContainer* self =
-      reinterpret_cast<RepeatedScalarContainer*>(pself);
-  Message* message = self->parent->message;
-  return message->GetReflection()->FieldSize(*message,
-                                             self->parent_field_descriptor);
-}
-
-static int AssignItem(PyObject* pself, Py_ssize_t index, PyObject* arg) {
-  RepeatedScalarContainer* self =
-      reinterpret_cast<RepeatedScalarContainer*>(pself);
-
-  cmessage::AssureWritable(self->parent);
-  Message* message = self->parent->message;
-  const FieldDescriptor* field_descriptor = self->parent_field_descriptor;
-
-  const Reflection* reflection = message->GetReflection();
-  int field_size = reflection->FieldSize(*message, field_descriptor);
-  if (index < 0) {
-    index = field_size + index;
-  }
-  if (index < 0 || index >= field_size) {
-    PyErr_Format(PyExc_IndexError, "list assignment index (%d) out of range",
-                 static_cast<int>(index));
-    return -1;
-  }
-
-  if (arg == nullptr) {
-    ScopedPyObjectPtr py_index(PyLong_FromLong(index));
-    return cmessage::DeleteRepeatedField(self->parent, field_descriptor,
-                                         py_index.get());
-  }
-
-  if (PySequence_Check(arg) && !(PyBytes_Check(arg) || PyUnicode_Check(arg))) {
-    PyErr_SetString(PyExc_TypeError, "Value must be scalar");
-    return -1;
-  }
-
-  switch (field_descriptor->cpp_type()) {
-    case FieldDescriptor::CPPTYPE_INT32: {
-      GOOGLE_CHECK_GET_INT32(arg, value, -1);
-      reflection->SetRepeatedInt32(message, field_descriptor, index, value);
-      break;
-    }
-    case FieldDescriptor::CPPTYPE_INT64: {
-      GOOGLE_CHECK_GET_INT64(arg, value, -1);
-      reflection->SetRepeatedInt64(message, field_descriptor, index, value);
-      break;
-    }
-    case FieldDescriptor::CPPTYPE_UINT32: {
-      GOOGLE_CHECK_GET_UINT32(arg, value, -1);
-      reflection->SetRepeatedUInt32(message, field_descriptor, index, value);
-      break;
-    }
-    case FieldDescriptor::CPPTYPE_UINT64: {
-      GOOGLE_CHECK_GET_UINT64(arg, value, -1);
-      reflection->SetRepeatedUInt64(message, field_descriptor, index, value);
-      break;
-    }
-    case FieldDescriptor::CPPTYPE_FLOAT: {
-      GOOGLE_CHECK_GET_FLOAT(arg, value, -1);
-      reflection->SetRepeatedFloat(message, field_descriptor, index, value);
-      break;
-    }
-    case FieldDescriptor::CPPTYPE_DOUBLE: {
-      GOOGLE_CHECK_GET_DOUBLE(arg, value, -1);
-      reflection->SetRepeatedDouble(message, field_descriptor, index, value);
-      break;
-    }
-    case FieldDescriptor::CPPTYPE_BOOL: {
-      GOOGLE_CHECK_GET_BOOL(arg, value, -1);
-      reflection->SetRepeatedBool(message, field_descriptor, index, value);
-      break;
-    }
-    case FieldDescriptor::CPPTYPE_STRING: {
-      if (!CheckAndSetString(arg, message, field_descriptor, reflection, false,
-                             index)) {
-        return -1;
-      }
-      break;
-    }
-    case FieldDescriptor::CPPTYPE_ENUM: {
-      GOOGLE_CHECK_GET_INT32(arg, value, -1);
-      if (reflection->SupportsUnknownEnumValues()) {
-        reflection->SetRepeatedEnumValue(message, field_descriptor, index,
-                                         value);
-      } else {
-        const EnumDescriptor* enum_descriptor = field_descriptor->enum_type();
-        const EnumValueDescriptor* enum_value =
-            enum_descriptor->FindValueByNumber(value);
-        if (enum_value != nullptr) {
-          reflection->SetRepeatedEnum(message, field_descriptor, index,
-                                      enum_value);
-        } else {
-          ScopedPyObjectPtr s(PyObject_Str(arg));
-          if (s != nullptr) {
-            PyErr_Format(PyExc_ValueError, "Unknown enum value: %s",
-                         PyString_AsString(s.get()));
-          }
-          return -1;
-        }
-      }
-      break;
-    }
-    default:
-      PyErr_Format(PyExc_SystemError,
-                   "Adding value to a field of unknown type %d",
-                   field_descriptor->cpp_type());
-      return -1;
-  }
-  return 0;
-}
-
-static PyObject* Item(PyObject* pself, Py_ssize_t index) {
-  RepeatedScalarContainer* self =
-      reinterpret_cast<RepeatedScalarContainer*>(pself);
-
-  Message* message = self->parent->message;
-  const FieldDescriptor* field_descriptor = self->parent_field_descriptor;
-  const Reflection* reflection = message->GetReflection();
-
-  int field_size = reflection->FieldSize(*message, field_descriptor);
-  if (index < 0) {
-    index = field_size + index;
-  }
-  if (index < 0 || index >= field_size) {
-    PyErr_Format(PyExc_IndexError, "list index (%zd) out of range", index);
-    return nullptr;
-  }
-
-  PyObject* result = nullptr;
-  switch (field_descriptor->cpp_type()) {
-    case FieldDescriptor::CPPTYPE_INT32: {
-      int32_t value =
-          reflection->GetRepeatedInt32(*message, field_descriptor, index);
-      result = PyLong_FromLong(value);
-      break;
-    }
-    case FieldDescriptor::CPPTYPE_INT64: {
-      int64_t value =
-          reflection->GetRepeatedInt64(*message, field_descriptor, index);
-      result = PyLong_FromLongLong(value);
-      break;
-    }
-    case FieldDescriptor::CPPTYPE_UINT32: {
-      uint32_t value =
-          reflection->GetRepeatedUInt32(*message, field_descriptor, index);
-      result = PyLong_FromLongLong(value);
-      break;
-    }
-    case FieldDescriptor::CPPTYPE_UINT64: {
-      uint64_t value =
-          reflection->GetRepeatedUInt64(*message, field_descriptor, index);
-      result = PyLong_FromUnsignedLongLong(value);
-      break;
-    }
-    case FieldDescriptor::CPPTYPE_FLOAT: {
-      float value =
-          reflection->GetRepeatedFloat(*message, field_descriptor, index);
-      result = PyFloat_FromDouble(value);
-      break;
-    }
-    case FieldDescriptor::CPPTYPE_DOUBLE: {
-      double value =
-          reflection->GetRepeatedDouble(*message, field_descriptor, index);
-      result = PyFloat_FromDouble(value);
-      break;
-    }
-    case FieldDescriptor::CPPTYPE_BOOL: {
-      bool value =
-          reflection->GetRepeatedBool(*message, field_descriptor, index);
-      result = PyBool_FromLong(value ? 1 : 0);
-      break;
-    }
-    case FieldDescriptor::CPPTYPE_ENUM: {
-      const EnumValueDescriptor* enum_value =
-          message->GetReflection()->GetRepeatedEnum(*message, field_descriptor,
-                                                    index);
-      result = PyLong_FromLong(enum_value->number());
-      break;
-    }
-    case FieldDescriptor::CPPTYPE_STRING: {
-      std::string scratch;
-      const std::string& value = reflection->GetRepeatedStringReference(
-          *message, field_descriptor, index, &scratch);
-      result = ToStringObject(field_descriptor, value);
-      break;
-    }
-    default:
-      PyErr_Format(PyExc_SystemError,
-                   "Getting value from a repeated field of unknown type %d",
-                   field_descriptor->cpp_type());
-  }
-
-  return result;
-}
-
-static PyObject* Subscript(PyObject* pself, PyObject* slice) {
-  Py_ssize_t from;
-  Py_ssize_t to;
-  Py_ssize_t step;
-  Py_ssize_t length;
-  Py_ssize_t slicelength;
-  bool return_list = false;
-  if (PyLong_Check(slice)) {
-    from = to = PyLong_AsLong(slice);
-  } else if (PyIndex_Check(slice)) {
-    from = to = PyNumber_AsSsize_t(slice, PyExc_ValueError);
-    if (from == -1 && PyErr_Occurred()) {
-      return nullptr;
-    }
-  } else if (PySlice_Check(slice)) {
-    length = Len(pself);
-    if (PySlice_GetIndicesEx(slice, length, &from, &to, &step, &slicelength) ==
-        -1) {
-      return nullptr;
-    }
-    return_list = true;
-  } else {
-    PyErr_SetString(PyExc_TypeError, "list indices must be integers");
-    return nullptr;
-  }
-
-  if (!return_list) {
-    return Item(pself, from);
-  }
-
-  PyObject* list = PyList_New(0);
-  if (list == nullptr) {
-    return nullptr;
-  }
-  if (from <= to) {
-    if (step < 0) {
-      return list;
-    }
-    for (Py_ssize_t index = from; index < to; index += step) {
-      if (index < 0 || index >= length) {
-        break;
-      }
-      ScopedPyObjectPtr s(Item(pself, index));
-      PyList_Append(list, s.get());
-    }
-  } else {
-    if (step > 0) {
-      return list;
-    }
-    for (Py_ssize_t index = from; index > to; index += step) {
-      if (index < 0 || index >= length) {
-        break;
-      }
-      ScopedPyObjectPtr s(Item(pself, index));
-      PyList_Append(list, s.get());
-    }
-  }
-  return list;
-}
-
-PyObject* Append(RepeatedScalarContainer* self, PyObject* item) {
-  cmessage::AssureWritable(self->parent);
-  Message* message = self->parent->message;
-  const FieldDescriptor* field_descriptor = self->parent_field_descriptor;
-
-  const Reflection* reflection = message->GetReflection();
-  switch (field_descriptor->cpp_type()) {
-    case FieldDescriptor::CPPTYPE_INT32: {
-      GOOGLE_CHECK_GET_INT32(item, value, nullptr);
-      reflection->AddInt32(message, field_descriptor, value);
-      break;
-    }
-    case FieldDescriptor::CPPTYPE_INT64: {
-      GOOGLE_CHECK_GET_INT64(item, value, nullptr);
-      reflection->AddInt64(message, field_descriptor, value);
-      break;
-    }
-    case FieldDescriptor::CPPTYPE_UINT32: {
-      GOOGLE_CHECK_GET_UINT32(item, value, nullptr);
-      reflection->AddUInt32(message, field_descriptor, value);
-      break;
-    }
-    case FieldDescriptor::CPPTYPE_UINT64: {
-      GOOGLE_CHECK_GET_UINT64(item, value, nullptr);
-      reflection->AddUInt64(message, field_descriptor, value);
-      break;
-    }
-    case FieldDescriptor::CPPTYPE_FLOAT: {
-      GOOGLE_CHECK_GET_FLOAT(item, value, nullptr);
-      reflection->AddFloat(message, field_descriptor, value);
-      break;
-    }
-    case FieldDescriptor::CPPTYPE_DOUBLE: {
-      GOOGLE_CHECK_GET_DOUBLE(item, value, nullptr);
-      reflection->AddDouble(message, field_descriptor, value);
-      break;
-    }
-    case FieldDescriptor::CPPTYPE_BOOL: {
-      GOOGLE_CHECK_GET_BOOL(item, value, nullptr);
-      reflection->AddBool(message, field_descriptor, value);
-      break;
-    }
-    case FieldDescriptor::CPPTYPE_STRING: {
-      if (!CheckAndSetString(item, message, field_descriptor, reflection, true,
-                             -1)) {
-        return nullptr;
-      }
-      break;
-    }
-    case FieldDescriptor::CPPTYPE_ENUM: {
-      GOOGLE_CHECK_GET_INT32(item, value, nullptr);
-      if (reflection->SupportsUnknownEnumValues()) {
-        reflection->AddEnumValue(message, field_descriptor, value);
-      } else {
-        const EnumDescriptor* enum_descriptor = field_descriptor->enum_type();
-        const EnumValueDescriptor* enum_value =
-            enum_descriptor->FindValueByNumber(value);
-        if (enum_value != nullptr) {
-          reflection->AddEnum(message, field_descriptor, enum_value);
-        } else {
-          ScopedPyObjectPtr s(PyObject_Str(item));
-          if (s != nullptr) {
-            PyErr_Format(PyExc_ValueError, "Unknown enum value: %s",
-                         PyString_AsString(s.get()));
-          }
-          return nullptr;
-        }
-      }
-      break;
-    }
-    default:
-      PyErr_Format(PyExc_SystemError,
-                   "Adding value to a field of unknown type %d",
-                   field_descriptor->cpp_type());
-      return nullptr;
-  }
-
-  Py_RETURN_NONE;
-}
-
-static PyObject* AppendMethod(PyObject* self, PyObject* item) {
-  return Append(reinterpret_cast<RepeatedScalarContainer*>(self), item);
-}
-
-static int AssSubscript(PyObject* pself, PyObject* slice, PyObject* value) {
-  RepeatedScalarContainer* self =
-      reinterpret_cast<RepeatedScalarContainer*>(pself);
-
-  Py_ssize_t from;
-  Py_ssize_t to;
-  Py_ssize_t step;
-  Py_ssize_t length;
-  Py_ssize_t slicelength;
-  bool create_list = false;
-
-  cmessage::AssureWritable(self->parent);
-  Message* message = self->parent->message;
-  const FieldDescriptor* field_descriptor = self->parent_field_descriptor;
-
-  if (PyLong_Check(slice)) {
-    from = to = PyLong_AsLong(slice);
-  } else if (PySlice_Check(slice)) {
-    const Reflection* reflection = message->GetReflection();
-    length = reflection->FieldSize(*message, field_descriptor);
-    if (PySlice_GetIndicesEx(slice, length, &from, &to, &step, &slicelength) ==
-        -1) {
-      return -1;
-    }
-    create_list = true;
-  } else {
-    PyErr_SetString(PyExc_TypeError, "list indices must be integers");
-    return -1;
-  }
-
-  if (value == nullptr) {
-    return cmessage::DeleteRepeatedField(self->parent, field_descriptor, slice);
-  }
-
-  if (!create_list) {
-    return AssignItem(pself, from, value);
-  }
-
-  ScopedPyObjectPtr full_slice(PySlice_New(nullptr, nullptr, nullptr));
-  if (full_slice == nullptr) {
-    return -1;
-  }
-  ScopedPyObjectPtr new_list(Subscript(pself, full_slice.get()));
-  if (new_list == nullptr) {
-    return -1;
-  }
-  if (PySequence_SetSlice(new_list.get(), from, to, value) < 0) {
-    return -1;
-  }
-
-  return InternalAssignRepeatedField(self, new_list.get());
-}
-
-PyObject* Extend(RepeatedScalarContainer* self, PyObject* value) {
-  cmessage::AssureWritable(self->parent);
-
-  // TODO(ptucker): Deprecate this behavior. b/18413862
-  if (value == Py_None) {
-    Py_RETURN_NONE;
-  }
-  if ((Py_TYPE(value)->tp_as_sequence == nullptr) && PyObject_Not(value)) {
-    Py_RETURN_NONE;
-  }
-
-  ScopedPyObjectPtr iter(PyObject_GetIter(value));
-  if (iter == nullptr) {
-    PyErr_SetString(PyExc_TypeError, "Value must be iterable");
-    return nullptr;
-  }
-  ScopedPyObjectPtr next;
-  while ((next.reset(PyIter_Next(iter.get()))) != nullptr) {
-    if (ScopedPyObjectPtr(Append(self, next.get())) == nullptr) {
-      return nullptr;
-    }
-  }
-  if (PyErr_Occurred()) {
-    return nullptr;
-  }
-  Py_RETURN_NONE;
-}
-
-static PyObject* Insert(PyObject* pself, PyObject* args) {
-  RepeatedScalarContainer* self =
-      reinterpret_cast<RepeatedScalarContainer*>(pself);
-
-  Py_ssize_t index;
-  PyObject* value;
-  if (!PyArg_ParseTuple(args, "lO", &index, &value)) {
-    return nullptr;
-  }
-  ScopedPyObjectPtr full_slice(PySlice_New(nullptr, nullptr, nullptr));
-  ScopedPyObjectPtr new_list(Subscript(pself, full_slice.get()));
-  if (PyList_Insert(new_list.get(), index, value) < 0) {
-    return nullptr;
-  }
-  int ret = InternalAssignRepeatedField(self, new_list.get());
-  if (ret < 0) {
-    return nullptr;
-  }
-  Py_RETURN_NONE;
-}
-
-static PyObject* Remove(PyObject* pself, PyObject* value) {
-  Py_ssize_t match_index = -1;
-  for (Py_ssize_t i = 0; i < Len(pself); ++i) {
-    ScopedPyObjectPtr elem(Item(pself, i));
-    if (PyObject_RichCompareBool(elem.get(), value, Py_EQ)) {
-      match_index = i;
-      break;
-    }
-  }
-  if (match_index == -1) {
-    PyErr_SetString(PyExc_ValueError, "remove(x): x not in container");
-    return nullptr;
-  }
-  if (AssignItem(pself, match_index, nullptr) < 0) {
-    return nullptr;
-  }
-  Py_RETURN_NONE;
-}
-
-static PyObject* ExtendMethod(PyObject* self, PyObject* value) {
-  return Extend(reinterpret_cast<RepeatedScalarContainer*>(self), value);
-}
-
-static PyObject* RichCompare(PyObject* pself, PyObject* other, int opid) {
-  if (opid != Py_EQ && opid != Py_NE) {
-    Py_INCREF(Py_NotImplemented);
-    return Py_NotImplemented;
-  }
-
-  // Copy the contents of this repeated scalar container, and other if it is
-  // also a repeated scalar container, into Python lists so we can delegate
-  // to the list's compare method.
-
-  ScopedPyObjectPtr full_slice(PySlice_New(nullptr, nullptr, nullptr));
-  if (full_slice == nullptr) {
-    return nullptr;
-  }
-
-  ScopedPyObjectPtr other_list_deleter;
-  if (PyObject_TypeCheck(other, &RepeatedScalarContainer_Type)) {
-    other_list_deleter.reset(Subscript(other, full_slice.get()));
-    other = other_list_deleter.get();
-  }
-
-  ScopedPyObjectPtr list(Subscript(pself, full_slice.get()));
-  if (list == nullptr) {
-    return nullptr;
-  }
-  return PyObject_RichCompare(list.get(), other, opid);
-}
-
-PyObject* Reduce(PyObject* unused_self, PyObject* unused_other) {
-  PyErr_Format(PickleError_class,
-               "can't pickle repeated message fields, convert to list first");
-  return nullptr;
-}
-
-static PyObject* Sort(PyObject* pself, PyObject* args, PyObject* kwds) {
-  // Support the old sort_function argument for backwards
-  // compatibility.
-  if (kwds != nullptr) {
-    PyObject* sort_func = PyDict_GetItemString(kwds, "sort_function");
-    if (sort_func != nullptr) {
-      // Must set before deleting as sort_func is a borrowed reference
-      // and kwds might be the only thing keeping it alive.
-      if (PyDict_SetItemString(kwds, "cmp", sort_func) == -1) return nullptr;
-      if (PyDict_DelItemString(kwds, "sort_function") == -1) return nullptr;
-    }
-  }
-
-  ScopedPyObjectPtr full_slice(PySlice_New(nullptr, nullptr, nullptr));
-  if (full_slice == nullptr) {
-    return nullptr;
-  }
-  ScopedPyObjectPtr list(Subscript(pself, full_slice.get()));
-  if (list == nullptr) {
-    return nullptr;
-  }
-  ScopedPyObjectPtr m(PyObject_GetAttrString(list.get(), "sort"));
-  if (m == nullptr) {
-    return nullptr;
-  }
-  ScopedPyObjectPtr res(PyObject_Call(m.get(), args, kwds));
-  if (res == nullptr) {
-    return nullptr;
-  }
-  int ret = InternalAssignRepeatedField(
-      reinterpret_cast<RepeatedScalarContainer*>(pself), list.get());
-  if (ret < 0) {
-    return nullptr;
-  }
-  Py_RETURN_NONE;
-}
-
-static PyObject* Reverse(PyObject* pself) {
-  ScopedPyObjectPtr full_slice(PySlice_New(nullptr, nullptr, nullptr));
-  if (full_slice == nullptr) {
-    return nullptr;
-  }
-  ScopedPyObjectPtr list(Subscript(pself, full_slice.get()));
-  if (list == nullptr) {
-    return nullptr;
-  }
-  ScopedPyObjectPtr res(PyObject_CallMethod(list.get(), "reverse", nullptr));
-  if (res == nullptr) {
-    return nullptr;
-  }
-  int ret = InternalAssignRepeatedField(
-      reinterpret_cast<RepeatedScalarContainer*>(pself), list.get());
-  if (ret < 0) {
-    return nullptr;
-  }
-  Py_RETURN_NONE;
-}
-
-static PyObject* Pop(PyObject* pself, PyObject* args) {
-  Py_ssize_t index = -1;
-  if (!PyArg_ParseTuple(args, "|n", &index)) {
-    return nullptr;
-  }
-  PyObject* item = Item(pself, index);
-  if (item == nullptr) {
-    PyErr_Format(PyExc_IndexError, "list index (%zd) out of range", index);
-    return nullptr;
-  }
-  if (AssignItem(pself, index, nullptr) < 0) {
-    return nullptr;
-  }
-  return item;
-}
-
-static PyObject* ToStr(PyObject* pself) {
-  ScopedPyObjectPtr full_slice(PySlice_New(nullptr, nullptr, nullptr));
-  if (full_slice == nullptr) {
-    return nullptr;
-  }
-  ScopedPyObjectPtr list(Subscript(pself, full_slice.get()));
-  if (list == nullptr) {
-    return nullptr;
-  }
-  return PyObject_Repr(list.get());
-}
-
-static PyObject* MergeFrom(PyObject* pself, PyObject* arg) {
-  return Extend(reinterpret_cast<RepeatedScalarContainer*>(pself), arg);
-}
-
-// The private constructor of RepeatedScalarContainer objects.
-RepeatedScalarContainer* NewContainer(
-    CMessage* parent, const FieldDescriptor* parent_field_descriptor) {
-  if (!CheckFieldBelongsToMessage(parent_field_descriptor, parent->message)) {
-    return nullptr;
-  }
-
-  RepeatedScalarContainer* self = reinterpret_cast<RepeatedScalarContainer*>(
-      PyType_GenericAlloc(&RepeatedScalarContainer_Type, 0));
-  if (self == nullptr) {
-    return nullptr;
-  }
-
-  Py_INCREF(parent);
-  self->parent = parent;
-  self->parent_field_descriptor = parent_field_descriptor;
-
-  return self;
-}
-
-PyObject* DeepCopy(PyObject* pself, PyObject* arg) {
-  return reinterpret_cast<RepeatedScalarContainer*>(pself)->DeepCopy();
-}
-
-static void Dealloc(PyObject* pself) {
-  reinterpret_cast<RepeatedScalarContainer*>(pself)->RemoveFromParentCache();
-  Py_TYPE(pself)->tp_free(pself);
-}
-
-static PySequenceMethods SqMethods = {
-    Len,       /* sq_length */
-    nullptr,   /* sq_concat */
-    nullptr,   /* sq_repeat */
-    Item,      /* sq_item */
-    nullptr,   /* sq_slice */
-    AssignItem /* sq_ass_item */
-};
-
-static PyMappingMethods MpMethods = {
-    Len,          /* mp_length */
-    Subscript,    /* mp_subscript */
-    AssSubscript, /* mp_ass_subscript */
-};
-
-static PyMethodDef Methods[] = {
-    {"__deepcopy__", DeepCopy, METH_VARARGS, "Makes a deep copy of the class."},
-    {"__reduce__", Reduce, METH_NOARGS,
-     "Outputs picklable representation of the repeated field."},
-    {"append", AppendMethod, METH_O,
-     "Appends an object to the repeated container."},
-    {"extend", ExtendMethod, METH_O,
-     "Appends objects to the repeated container."},
-    {"insert", Insert, METH_VARARGS,
-     "Inserts an object at the specified position in the container."},
-    {"pop", Pop, METH_VARARGS,
-     "Removes an object from the repeated container and returns it."},
-    {"remove", Remove, METH_O,
-     "Removes an object from the repeated container."},
-    {"sort", reinterpret_cast<PyCFunction>(Sort), METH_VARARGS | METH_KEYWORDS,
-     "Sorts the repeated container."},
-    {"reverse", reinterpret_cast<PyCFunction>(Reverse), METH_NOARGS,
-     "Reverses elements order of the repeated container."},
-    {"MergeFrom", static_cast<PyCFunction>(MergeFrom), METH_O,
-     "Merges a repeated container into the current container."},
-    {nullptr, nullptr}};
-
-}  // namespace repeated_scalar_container
-
-PyTypeObject RepeatedScalarContainer_Type = {
-    PyVarObject_HEAD_INIT(&PyType_Type, 0) FULL_MODULE_NAME
-    ".RepeatedScalarContainer",              // tp_name
-    sizeof(RepeatedScalarContainer),         // tp_basicsize
-    0,                                       //  tp_itemsize
-    repeated_scalar_container::Dealloc,      //  tp_dealloc
-#if PY_VERSION_HEX >= 0x03080000
-    0,                                       //  tp_vectorcall_offset
-#else
-    nullptr,                                 //  tp_print
-#endif
-    nullptr,                                 //  tp_getattr
-    nullptr,                                 //  tp_setattr
-    nullptr,                                 //  tp_compare
-    repeated_scalar_container::ToStr,        //  tp_repr
-    nullptr,                                 //  tp_as_number
-    &repeated_scalar_container::SqMethods,   //  tp_as_sequence
-    &repeated_scalar_container::MpMethods,   //  tp_as_mapping
-    PyObject_HashNotImplemented,             //  tp_hash
-    nullptr,                                 //  tp_call
-    nullptr,                                 //  tp_str
-    nullptr,                                 //  tp_getattro
-    nullptr,                                 //  tp_setattro
-    nullptr,                                 //  tp_as_buffer
-    Py_TPFLAGS_DEFAULT,                      //  tp_flags
-    "A Repeated scalar container",           //  tp_doc
-    nullptr,                                 //  tp_traverse
-    nullptr,                                 //  tp_clear
-    repeated_scalar_container::RichCompare,  //  tp_richcompare
-    0,                                       //  tp_weaklistoffset
-    nullptr,                                 //  tp_iter
-    nullptr,                                 //  tp_iternext
-    repeated_scalar_container::Methods,      //  tp_methods
-    nullptr,                                 //  tp_members
-    nullptr,                                 //  tp_getset
-    nullptr,                                 //  tp_base
-    nullptr,                                 //  tp_dict
-    nullptr,                                 //  tp_descr_get
-    nullptr,                                 //  tp_descr_set
-    0,                                       //  tp_dictoffset
-    nullptr,                                 //  tp_init
-};
-
-}  // namespace python
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/python/google/protobuf/pyext/repeated_scalar_container.h b/libs/protobuf/python/google/protobuf/pyext/repeated_scalar_container.h
deleted file mode 100644
index 67423ab..0000000
--- a/libs/protobuf/python/google/protobuf/pyext/repeated_scalar_container.h
+++ /dev/null
@@ -1,76 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: anuraag@google.com (Anuraag Agrawal)
-// Author: tibell@google.com (Johan Tibell)
-
-#ifndef GOOGLE_PROTOBUF_PYTHON_CPP_REPEATED_SCALAR_CONTAINER_H__
-#define GOOGLE_PROTOBUF_PYTHON_CPP_REPEATED_SCALAR_CONTAINER_H__
-
-#define PY_SSIZE_T_CLEAN
-#include <Python.h>
-
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/pyext/message.h>
-
-namespace google {
-namespace protobuf {
-namespace python {
-
-typedef struct RepeatedScalarContainer : public ContainerBase {
-} RepeatedScalarContainer;
-
-extern PyTypeObject RepeatedScalarContainer_Type;
-
-namespace repeated_scalar_container {
-
-// Builds a RepeatedScalarContainer object, from a parent message and a
-// field descriptor.
-extern RepeatedScalarContainer* NewContainer(
-    CMessage* parent, const FieldDescriptor* parent_field_descriptor);
-
-// Appends the scalar 'item' to the end of the container 'self'.
-//
-// Returns None if successful; returns NULL and sets an exception if
-// unsuccessful.
-PyObject* Append(RepeatedScalarContainer* self, PyObject* item);
-
-// Appends all the elements in the input iterator to the container.
-//
-// Returns None if successful; returns NULL and sets an exception if
-// unsuccessful.
-PyObject* Extend(RepeatedScalarContainer* self, PyObject* value);
-
-}  // namespace repeated_scalar_container
-}  // namespace python
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // GOOGLE_PROTOBUF_PYTHON_CPP_REPEATED_SCALAR_CONTAINER_H__
diff --git a/libs/protobuf/python/google/protobuf/pyext/safe_numerics.h b/libs/protobuf/python/google/protobuf/pyext/safe_numerics.h
deleted file mode 100644
index 93ae640..0000000
--- a/libs/protobuf/python/google/protobuf/pyext/safe_numerics.h
+++ /dev/null
@@ -1,164 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef GOOGLE_PROTOBUF_PYTHON_CPP_SAFE_NUMERICS_H__
-#define GOOGLE_PROTOBUF_PYTHON_CPP_SAFE_NUMERICS_H__
-// Copied from chromium with only changes to the namespace.
-
-#include <limits>
-
-#include <google/protobuf/stubs/logging.h>
-#include <google/protobuf/stubs/common.h>
-
-namespace google {
-namespace protobuf {
-namespace python {
-
-template <bool SameSize, bool DestLarger,
-          bool DestIsSigned, bool SourceIsSigned>
-struct IsValidNumericCastImpl;
-
-#define BASE_NUMERIC_CAST_CASE_SPECIALIZATION(A, B, C, D, Code) \
-template <> struct IsValidNumericCastImpl<A, B, C, D> { \
-  template <class Source, class DestBounds> static inline bool Test( \
-      Source source, DestBounds min, DestBounds max) { \
-    return Code; \
-  } \
-}
-
-#define BASE_NUMERIC_CAST_CASE_SAME_SIZE(DestSigned, SourceSigned, Code) \
-  BASE_NUMERIC_CAST_CASE_SPECIALIZATION( \
-      true, true, DestSigned, SourceSigned, Code); \
-  BASE_NUMERIC_CAST_CASE_SPECIALIZATION( \
-      true, false, DestSigned, SourceSigned, Code)
-
-#define BASE_NUMERIC_CAST_CASE_SOURCE_LARGER(DestSigned, SourceSigned, Code) \
-  BASE_NUMERIC_CAST_CASE_SPECIALIZATION( \
-      false, false, DestSigned, SourceSigned, Code); \
-
-#define BASE_NUMERIC_CAST_CASE_DEST_LARGER(DestSigned, SourceSigned, Code) \
-  BASE_NUMERIC_CAST_CASE_SPECIALIZATION( \
-      false, true, DestSigned, SourceSigned, Code); \
-
-// The three top level cases are:
-// - Same size
-// - Source larger
-// - Dest larger
-// And for each of those three cases, we handle the 4 different possibilities
-// of signed and unsigned. This gives 12 cases to handle, which we enumerate
-// below.
-//
-// The last argument in each of the macros is the actual comparison code. It
-// has three arguments available, source (the value), and min/max which are
-// the ranges of the destination.
-
-
-// These are the cases where both types have the same size.
-
-// Both signed.
-BASE_NUMERIC_CAST_CASE_SAME_SIZE(true, true, true);
-// Both unsigned.
-BASE_NUMERIC_CAST_CASE_SAME_SIZE(false, false, true);
-// Dest unsigned, Source signed.
-BASE_NUMERIC_CAST_CASE_SAME_SIZE(false, true, source >= 0);
-// Dest signed, Source unsigned.
-// This cast is OK because Dest's max must be less than Source's.
-BASE_NUMERIC_CAST_CASE_SAME_SIZE(true, false,
-                                 source <= static_cast<Source>(max));
-
-
-// These are the cases where Source is larger.
-
-// Both unsigned.
-BASE_NUMERIC_CAST_CASE_SOURCE_LARGER(false, false, source <= max);
-// Both signed.
-BASE_NUMERIC_CAST_CASE_SOURCE_LARGER(true, true,
-                                     source >= min && source <= max);
-// Dest is unsigned, Source is signed.
-BASE_NUMERIC_CAST_CASE_SOURCE_LARGER(false, true,
-                                     source >= 0 && source <= max);
-// Dest is signed, Source is unsigned.
-// This cast is OK because Dest's max must be less than Source's.
-BASE_NUMERIC_CAST_CASE_SOURCE_LARGER(true, false,
-                                     source <= static_cast<Source>(max));
-
-
-// These are the cases where Dest is larger.
-
-// Both unsigned.
-BASE_NUMERIC_CAST_CASE_DEST_LARGER(false, false, true);
-// Both signed.
-BASE_NUMERIC_CAST_CASE_DEST_LARGER(true, true, true);
-// Dest is unsigned, Source is signed.
-BASE_NUMERIC_CAST_CASE_DEST_LARGER(false, true, source >= 0);
-// Dest is signed, Source is unsigned.
-BASE_NUMERIC_CAST_CASE_DEST_LARGER(true, false, true);
-
-#undef BASE_NUMERIC_CAST_CASE_SPECIALIZATION
-#undef BASE_NUMERIC_CAST_CASE_SAME_SIZE
-#undef BASE_NUMERIC_CAST_CASE_SOURCE_LARGER
-#undef BASE_NUMERIC_CAST_CASE_DEST_LARGER
-
-
-// The main test for whether the conversion will under or overflow.
-template <class Dest, class Source>
-inline bool IsValidNumericCast(Source source) {
-  typedef std::numeric_limits<Source> SourceLimits;
-  typedef std::numeric_limits<Dest> DestLimits;
-  static_assert(SourceLimits::is_specialized, "argument must be numeric");
-  static_assert(SourceLimits::is_integer, "argument must be integral");
-  static_assert(DestLimits::is_specialized, "result must be numeric");
-  static_assert(DestLimits::is_integer, "result must be integral");
-
-  return IsValidNumericCastImpl<
-      sizeof(Dest) == sizeof(Source),
-      (sizeof(Dest) > sizeof(Source)),
-      DestLimits::is_signed,
-      SourceLimits::is_signed>::Test(
-          source,
-          DestLimits::min(),
-          DestLimits::max());
-}
-
-// checked_numeric_cast<> is analogous to static_cast<> for numeric types,
-// except that it CHECKs that the specified numeric conversion will not
-// overflow or underflow. Floating point arguments are not currently allowed
-// (this is static_asserted), though this could be supported if necessary.
-template <class Dest, class Source>
-inline Dest checked_numeric_cast(Source source) {
-  GOOGLE_CHECK(IsValidNumericCast<Dest>(source));
-  return static_cast<Dest>(source);
-}
-
-}  // namespace python
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // GOOGLE_PROTOBUF_PYTHON_CPP_SAFE_NUMERICS_H__
diff --git a/libs/protobuf/python/google/protobuf/pyext/scoped_pyobject_ptr.h b/libs/protobuf/python/google/protobuf/pyext/scoped_pyobject_ptr.h
deleted file mode 100644
index ad3fa94..0000000
--- a/libs/protobuf/python/google/protobuf/pyext/scoped_pyobject_ptr.h
+++ /dev/null
@@ -1,101 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: tibell@google.com (Johan Tibell)
-
-#ifndef GOOGLE_PROTOBUF_PYTHON_CPP_SCOPED_PYOBJECT_PTR_H__
-#define GOOGLE_PROTOBUF_PYTHON_CPP_SCOPED_PYOBJECT_PTR_H__
-
-#include <google/protobuf/stubs/common.h>
-
-#define PY_SSIZE_T_CLEAN
-#include <Python.h>
-namespace google {
-namespace protobuf {
-namespace python {
-
-// Owns a python object and decrements the reference count on destruction.
-// This class is not threadsafe.
-template <typename PyObjectStruct>
-class ScopedPythonPtr {
- public:
-  // Takes the ownership of the specified object to ScopedPythonPtr.
-  // The reference count of the specified py_object is not incremented.
-  explicit ScopedPythonPtr(PyObjectStruct* py_object = nullptr)
-      : ptr_(py_object) {}
-
-  // If a PyObject is owned, decrement its reference count.
-  ~ScopedPythonPtr() { Py_XDECREF(ptr_); }
-
-  // Deletes the current owned object, if any.
-  // Then takes ownership of a new object without incrementing the reference
-  // count.
-  // This function must be called with a reference that you own.
-  //   this->reset(this->get()) is wrong!
-  //   this->reset(this->release()) is OK.
-  PyObjectStruct* reset(PyObjectStruct* p = nullptr) {
-    Py_XDECREF(ptr_);
-    ptr_ = p;
-    return ptr_;
-  }
-
-  // Releases ownership of the object without decrementing the reference count.
-  // The caller now owns the returned reference.
-  PyObjectStruct* release() {
-    PyObject* p = ptr_;
-    ptr_ = nullptr;
-    return p;
-  }
-
-  PyObjectStruct* get() const { return ptr_; }
-
-  PyObject* as_pyobject() const { return reinterpret_cast<PyObject*>(ptr_); }
-
-  // Increments the reference count of the current object.
-  // Should not be called when no object is held.
-  void inc() const { Py_INCREF(ptr_); }
-
-  // True when a ScopedPyObjectPtr and a raw pointer refer to the same object.
-  // Comparison operators are non reflexive.
-  bool operator==(const PyObjectStruct* p) const { return ptr_ == p; }
-  bool operator!=(const PyObjectStruct* p) const { return ptr_ != p; }
-
- private:
-  PyObjectStruct* ptr_;
-
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(ScopedPythonPtr);
-};
-
-typedef ScopedPythonPtr<PyObject> ScopedPyObjectPtr;
-
-}  // namespace python
-}  // namespace protobuf
-}  // namespace google
-#endif  // GOOGLE_PROTOBUF_PYTHON_CPP_SCOPED_PYOBJECT_PTR_H__
diff --git a/libs/protobuf/python/google/protobuf/pyext/unknown_field_set.cc b/libs/protobuf/python/google/protobuf/pyext/unknown_field_set.cc
deleted file mode 100644
index 42f9bbc..0000000
--- a/libs/protobuf/python/google/protobuf/pyext/unknown_field_set.cc
+++ /dev/null
@@ -1,355 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <google/protobuf/pyext/unknown_field_set.h>
-
-#define PY_SSIZE_T_CLEAN
-#include <Python.h>
-
-#include <memory>
-#include <set>
-
-#include <google/protobuf/message.h>
-#include <google/protobuf/unknown_field_set.h>
-#include <google/protobuf/wire_format_lite.h>
-#include <google/protobuf/pyext/message.h>
-#include <google/protobuf/pyext/scoped_pyobject_ptr.h>
-
-namespace google {
-namespace protobuf {
-namespace python {
-
-namespace unknown_field_set {
-
-static Py_ssize_t Len(PyObject* pself) {
-  PyUnknownFieldSet* self = reinterpret_cast<PyUnknownFieldSet*>(pself);
-  if (self->fields == nullptr) {
-    PyErr_Format(PyExc_ValueError, "UnknownFieldSet does not exist. ");
-    return -1;
-  }
-  return self->fields->field_count();
-}
-
-PyObject* NewPyUnknownField(PyUnknownFieldSet* parent, Py_ssize_t index);
-
-static PyObject* Item(PyObject* pself, Py_ssize_t index) {
-  PyUnknownFieldSet* self = reinterpret_cast<PyUnknownFieldSet*>(pself);
-  if (self->fields == nullptr) {
-    PyErr_Format(PyExc_ValueError, "UnknownFieldSet does not exist. ");
-    return nullptr;
-  }
-  Py_ssize_t total_size = self->fields->field_count();
-  if (index < 0) {
-    index = total_size + index;
-  }
-  if (index < 0 || index >= total_size) {
-    PyErr_Format(PyExc_IndexError, "index (%zd) out of range", index);
-    return nullptr;
-  }
-  return unknown_field_set::NewPyUnknownField(self, index);
-}
-
-PyObject* New(PyTypeObject* type, PyObject* args, PyObject* kwargs) {
-  if (args == nullptr || PyTuple_Size(args) != 1) {
-    PyErr_SetString(PyExc_TypeError,
-                    "Must provide a message to create UnknownFieldSet");
-    return nullptr;
-  }
-
-  PyObject* c_message;
-  if (!PyArg_ParseTuple(args, "O", &c_message)) {
-    PyErr_SetString(PyExc_TypeError,
-                    "Must provide a message to create UnknownFieldSet");
-    return nullptr;
-  }
-
-  if (!PyObject_TypeCheck(c_message, CMessage_Type)) {
-    PyErr_Format(PyExc_TypeError,
-                 "Parameter to UnknownFieldSet() must be a message "
-                 "got %s.",
-                 Py_TYPE(c_message)->tp_name);
-    return nullptr;
-  }
-
-  PyUnknownFieldSet* self = reinterpret_cast<PyUnknownFieldSet*>(
-      PyType_GenericAlloc(&PyUnknownFieldSet_Type, 0));
-  if (self == nullptr) {
-    return nullptr;
-  }
-
-  // Top UnknownFieldSet should set parent nullptr.
-  self->parent = nullptr;
-
-  // Copy c_message's UnknownFieldSet.
-  Message* message = reinterpret_cast<CMessage*>(c_message)->message;
-  const Reflection* reflection = message->GetReflection();
-  self->fields = new google::protobuf::UnknownFieldSet;
-  self->fields->MergeFrom(reflection->GetUnknownFields(*message));
-  return reinterpret_cast<PyObject*>(self);
-}
-
-PyObject* NewPyUnknownField(PyUnknownFieldSet* parent, Py_ssize_t index) {
-  PyUnknownField* self = reinterpret_cast<PyUnknownField*>(
-      PyType_GenericAlloc(&PyUnknownField_Type, 0));
-  if (self == nullptr) {
-    return nullptr;
-  }
-
-  Py_INCREF(parent);
-  self->parent = parent;
-  self->index = index;
-
-  return reinterpret_cast<PyObject*>(self);
-}
-
-static void Dealloc(PyObject* pself) {
-  PyUnknownFieldSet* self = reinterpret_cast<PyUnknownFieldSet*>(pself);
-  if (self->parent == nullptr) {
-    delete self->fields;
-  } else {
-    Py_CLEAR(self->parent);
-  }
-  auto* py_type = Py_TYPE(pself);
-  self->~PyUnknownFieldSet();
-  py_type->tp_free(pself);
-}
-
-static PySequenceMethods SqMethods = {
-    Len,     /* sq_length */
-    nullptr, /* sq_concat */
-    nullptr, /* sq_repeat */
-    Item,    /* sq_item */
-    nullptr, /* sq_slice */
-    nullptr, /* sq_ass_item */
-};
-
-}  // namespace unknown_field_set
-
-PyTypeObject PyUnknownFieldSet_Type = {
-    PyVarObject_HEAD_INIT(&PyType_Type, 0) FULL_MODULE_NAME
-    ".PyUnknownFieldSet",        // tp_name
-    sizeof(PyUnknownFieldSet),   // tp_basicsize
-    0,                           //  tp_itemsize
-    unknown_field_set::Dealloc,  //  tp_dealloc
-#if PY_VERSION_HEX < 0x03080000
-    nullptr,  // tp_print
-#else
-    0,  // tp_vectorcall_offset
-#endif
-    nullptr,                        //  tp_getattr
-    nullptr,                        //  tp_setattr
-    nullptr,                        //  tp_compare
-    nullptr,                        //  tp_repr
-    nullptr,                        //  tp_as_number
-    &unknown_field_set::SqMethods,  //  tp_as_sequence
-    nullptr,                        //  tp_as_mapping
-    PyObject_HashNotImplemented,    //  tp_hash
-    nullptr,                        //  tp_call
-    nullptr,                        //  tp_str
-    nullptr,                        //  tp_getattro
-    nullptr,                        //  tp_setattro
-    nullptr,                        //  tp_as_buffer
-    Py_TPFLAGS_DEFAULT,             //  tp_flags
-    "unknown field set",            //  tp_doc
-    nullptr,                        //  tp_traverse
-    nullptr,                        //  tp_clear
-    nullptr,                        //  tp_richcompare
-    0,                              //  tp_weaklistoffset
-    nullptr,                        //  tp_iter
-    nullptr,                        //  tp_iternext
-    nullptr,                        //  tp_methods
-    nullptr,                        //  tp_members
-    nullptr,                        //  tp_getset
-    nullptr,                        //  tp_base
-    nullptr,                        //  tp_dict
-    nullptr,                        //  tp_descr_get
-    nullptr,                        //  tp_descr_set
-    0,                              //  tp_dictoffset
-    nullptr,                        //  tp_init
-    nullptr,                        //  tp_alloc
-    unknown_field_set::New,         //  tp_new
-};
-
-namespace unknown_field {
-static PyObject* PyUnknownFieldSet_FromUnknownFieldSet(
-    PyUnknownFieldSet* parent, const UnknownFieldSet& fields) {
-  PyUnknownFieldSet* self = reinterpret_cast<PyUnknownFieldSet*>(
-      PyType_GenericAlloc(&PyUnknownFieldSet_Type, 0));
-  if (self == nullptr) {
-    return nullptr;
-  }
-
-  Py_INCREF(parent);
-  self->parent = parent;
-  self->fields = const_cast<UnknownFieldSet*>(&fields);
-
-  return reinterpret_cast<PyObject*>(self);
-}
-
-const UnknownField* GetUnknownField(PyUnknownField* self) {
-  const UnknownFieldSet* fields = self->parent->fields;
-  if (fields == nullptr) {
-    PyErr_Format(PyExc_ValueError, "UnknownField does not exist. ");
-    return nullptr;
-  }
-  Py_ssize_t total_size = fields->field_count();
-  if (self->index >= total_size) {
-    PyErr_Format(PyExc_ValueError, "UnknownField does not exist. ");
-    return nullptr;
-  }
-  return &fields->field(self->index);
-}
-
-static PyObject* GetFieldNumber(PyUnknownField* self, void* closure) {
-  const UnknownField* unknown_field = GetUnknownField(self);
-  if (unknown_field == nullptr) {
-    return nullptr;
-  }
-  return PyLong_FromLong(unknown_field->number());
-}
-
-using internal::WireFormatLite;
-static PyObject* GetWireType(PyUnknownField* self, void* closure) {
-  const UnknownField* unknown_field = GetUnknownField(self);
-  if (unknown_field == nullptr) {
-    return nullptr;
-  }
-
-  // Assign a default value to suppress may-uninitialized warnings (errors
-  // when built in some places).
-  WireFormatLite::WireType wire_type = WireFormatLite::WIRETYPE_VARINT;
-  switch (unknown_field->type()) {
-    case UnknownField::TYPE_VARINT:
-      wire_type = WireFormatLite::WIRETYPE_VARINT;
-      break;
-    case UnknownField::TYPE_FIXED32:
-      wire_type = WireFormatLite::WIRETYPE_FIXED32;
-      break;
-    case UnknownField::TYPE_FIXED64:
-      wire_type = WireFormatLite::WIRETYPE_FIXED64;
-      break;
-    case UnknownField::TYPE_LENGTH_DELIMITED:
-      wire_type = WireFormatLite::WIRETYPE_LENGTH_DELIMITED;
-      break;
-    case UnknownField::TYPE_GROUP:
-      wire_type = WireFormatLite::WIRETYPE_START_GROUP;
-      break;
-  }
-  return PyLong_FromLong(wire_type);
-}
-
-static PyObject* GetData(PyUnknownField* self, void* closure) {
-  const UnknownField* field = GetUnknownField(self);
-  if (field == nullptr) {
-    return nullptr;
-  }
-  PyObject* data = nullptr;
-  switch (field->type()) {
-    case UnknownField::TYPE_VARINT:
-      data = PyLong_FromUnsignedLongLong(field->varint());
-      break;
-    case UnknownField::TYPE_FIXED32:
-      data = PyLong_FromUnsignedLong(field->fixed32());
-      break;
-    case UnknownField::TYPE_FIXED64:
-      data = PyLong_FromUnsignedLongLong(field->fixed64());
-      break;
-    case UnknownField::TYPE_LENGTH_DELIMITED:
-      data = PyBytes_FromStringAndSize(field->length_delimited().data(),
-                                       field->GetLengthDelimitedSize());
-      break;
-    case UnknownField::TYPE_GROUP:
-      data =
-          PyUnknownFieldSet_FromUnknownFieldSet(self->parent, field->group());
-      break;
-  }
-  return data;
-}
-
-static void Dealloc(PyObject* pself) {
-  PyUnknownField* self = reinterpret_cast<PyUnknownField*>(pself);
-  Py_CLEAR(self->parent);
-}
-
-static PyGetSetDef Getters[] = {
-    {"field_number", (getter)GetFieldNumber, nullptr},
-    {"wire_type", (getter)GetWireType, nullptr},
-    {"data", (getter)GetData, nullptr},
-    {nullptr},
-};
-
-}  // namespace unknown_field
-
-PyTypeObject PyUnknownField_Type = {
-    PyVarObject_HEAD_INIT(&PyType_Type, 0) FULL_MODULE_NAME
-    ".PyUnknownField",       // tp_name
-    sizeof(PyUnknownField),  //  tp_basicsize
-    0,                       //  tp_itemsize
-    unknown_field::Dealloc,  //  tp_dealloc
-#if PY_VERSION_HEX < 0x03080000
-    nullptr,  // tp_print
-#else
-    0,  // tp_vectorcall_offset
-#endif
-    nullptr,                      //  tp_getattr
-    nullptr,                      //  tp_setattr
-    nullptr,                      //  tp_compare
-    nullptr,                      //  tp_repr
-    nullptr,                      //  tp_as_number
-    nullptr,                      //  tp_as_sequence
-    nullptr,                      //  tp_as_mapping
-    PyObject_HashNotImplemented,  //  tp_hash
-    nullptr,                      //  tp_call
-    nullptr,                      //  tp_str
-    nullptr,                      //  tp_getattro
-    nullptr,                      //  tp_setattro
-    nullptr,                      //  tp_as_buffer
-    Py_TPFLAGS_DEFAULT,           //  tp_flags
-    "unknown field",              //  tp_doc
-    nullptr,                      //  tp_traverse
-    nullptr,                      //  tp_clear
-    nullptr,                      //  tp_richcompare
-    0,                            //  tp_weaklistoffset
-    nullptr,                      //  tp_iter
-    nullptr,                      //  tp_iternext
-    nullptr,                      //  tp_methods
-    nullptr,                      //  tp_members
-    unknown_field::Getters,       //  tp_getset
-    nullptr,                      //  tp_base
-    nullptr,                      //  tp_dict
-    nullptr,                      //  tp_descr_get
-    nullptr,                      //  tp_descr_set
-    0,                            //  tp_dictoffset
-    nullptr,                      //  tp_init
-};
-
-}  // namespace python
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/python/google/protobuf/pyext/unknown_field_set.h b/libs/protobuf/python/google/protobuf/pyext/unknown_field_set.h
deleted file mode 100644
index 3fa764d..0000000
--- a/libs/protobuf/python/google/protobuf/pyext/unknown_field_set.h
+++ /dev/null
@@ -1,78 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef GOOGLE_PROTOBUF_PYTHON_CPP_UNKNOWN_FIELD_SET_H__
-#define GOOGLE_PROTOBUF_PYTHON_CPP_UNKNOWN_FIELD_SET_H__
-
-#define PY_SSIZE_T_CLEAN
-#include <Python.h>
-
-#include <memory>
-#include <set>
-
-#include <google/protobuf/pyext/message.h>
-
-namespace google {
-namespace protobuf {
-
-class UnknownField;
-class UnknownFieldSet;
-
-namespace python {
-struct CMessage;
-
-struct PyUnknownFieldSet {
-  PyObject_HEAD;
-  // If parent is nullptr, it is a top UnknownFieldSet.
-  PyUnknownFieldSet* parent;
-
-  // Top UnknownFieldSet owns fields pointer. Sub UnknownFieldSet
-  // does not own fields pointer.
-  UnknownFieldSet* fields;
-};
-
-struct PyUnknownField {
-  PyObject_HEAD;
-  // Every Python PyUnknownField holds a reference to its parent
-  // PyUnknownFieldSet in order to keep it alive.
-  PyUnknownFieldSet* parent;
-
-  // The UnknownField index in UnknownFieldSet.
-  Py_ssize_t index;
-};
-
-extern PyTypeObject PyUnknownFieldSet_Type;
-extern PyTypeObject PyUnknownField_Type;
-
-}  // namespace python
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // GOOGLE_PROTOBUF_PYTHON_CPP_UNKNOWN_FIELD_SET_H__
diff --git a/libs/protobuf/python/google/protobuf/pyext/unknown_fields.cc b/libs/protobuf/python/google/protobuf/pyext/unknown_fields.cc
deleted file mode 100644
index dcd63b2..0000000
--- a/libs/protobuf/python/google/protobuf/pyext/unknown_fields.cc
+++ /dev/null
@@ -1,363 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <google/protobuf/pyext/unknown_fields.h>
-
-#define PY_SSIZE_T_CLEAN
-#include <Python.h>
-#include <set>
-#include <memory>
-
-#include <google/protobuf/message.h>
-#include <google/protobuf/pyext/message.h>
-#include <google/protobuf/pyext/scoped_pyobject_ptr.h>
-#include <google/protobuf/unknown_field_set.h>
-#include <google/protobuf/wire_format_lite.h>
-
-namespace google {
-namespace protobuf {
-namespace python {
-
-namespace unknown_fields {
-
-static Py_ssize_t Len(PyObject* pself) {
-  PyUnknownFields* self =
-      reinterpret_cast<PyUnknownFields*>(pself);
-  if (self->fields == nullptr) {
-    PyErr_Format(PyExc_ValueError,
-                 "UnknownFields does not exist. "
-                 "The parent message might be cleared.");
-    return -1;
-  }
-  return self->fields->field_count();
-}
-
-void Clear(PyUnknownFields* self) {
-  for (std::set<PyUnknownFields*>::iterator it =
-           self->sub_unknown_fields.begin();
-       it != self->sub_unknown_fields.end(); it++) {
-    Clear(*it);
-  }
-  self->fields = nullptr;
-  self->sub_unknown_fields.clear();
-}
-
-PyObject* NewPyUnknownFieldRef(PyUnknownFields* parent,
-                               Py_ssize_t index);
-
-static PyObject* Item(PyObject* pself, Py_ssize_t index) {
-  PyUnknownFields* self =
-      reinterpret_cast<PyUnknownFields*>(pself);
-  if (self->fields == nullptr) {
-    PyErr_Format(PyExc_ValueError,
-                 "UnknownFields does not exist. "
-                 "The parent message might be cleared.");
-    return nullptr;
-  }
-  Py_ssize_t total_size = self->fields->field_count();
-  if (index < 0) {
-    index = total_size + index;
-  }
-  if (index < 0 || index >= total_size) {
-    PyErr_Format(PyExc_IndexError,
-                 "index (%zd) out of range",
-                 index);
-    return nullptr;
-  }
-
-  return unknown_fields::NewPyUnknownFieldRef(self, index);
-}
-
-PyObject* NewPyUnknownFields(CMessage* c_message) {
-  PyUnknownFields* self = reinterpret_cast<PyUnknownFields*>(
-      PyType_GenericAlloc(&PyUnknownFields_Type, 0));
-  if (self == nullptr) {
-    return nullptr;
-  }
-  // Call "placement new" to initialize PyUnknownFields.
-  new (self) PyUnknownFields;
-
-  Py_INCREF(c_message);
-  self->parent = reinterpret_cast<PyObject*>(c_message);
-  Message* message = c_message->message;
-  const Reflection* reflection = message->GetReflection();
-  self->fields = &reflection->GetUnknownFields(*message);
-
-  return reinterpret_cast<PyObject*>(self);
-}
-
-PyObject* NewPyUnknownFieldRef(PyUnknownFields* parent,
-                               Py_ssize_t index) {
-  PyUnknownFieldRef* self = reinterpret_cast<PyUnknownFieldRef*>(
-      PyType_GenericAlloc(&PyUnknownFieldRef_Type, 0));
-  if (self == nullptr) {
-    return nullptr;
-  }
-
-  Py_INCREF(parent);
-  self->parent = parent;
-  self->index = index;
-
-  return reinterpret_cast<PyObject*>(self);
-}
-
-static void Dealloc(PyObject* pself) {
-  PyUnknownFields* self =
-      reinterpret_cast<PyUnknownFields*>(pself);
-  if (PyObject_TypeCheck(self->parent, &PyUnknownFields_Type)) {
-    reinterpret_cast<PyUnknownFields*>(
-        self->parent)->sub_unknown_fields.erase(self);
-  } else {
-    reinterpret_cast<CMessage*>(self->parent)->unknown_field_set = nullptr;
-  }
-  Py_CLEAR(self->parent);
-  auto* py_type = Py_TYPE(pself);
-  self->~PyUnknownFields();
-  py_type->tp_free(pself);
-}
-
-static PySequenceMethods SqMethods = {
-    Len,     /* sq_length */
-    nullptr, /* sq_concat */
-    nullptr, /* sq_repeat */
-    Item,    /* sq_item */
-    nullptr, /* sq_slice */
-    nullptr, /* sq_ass_item */
-};
-
-}  // namespace unknown_fields
-
-PyTypeObject PyUnknownFields_Type = {
-    PyVarObject_HEAD_INIT(&PyType_Type, 0) FULL_MODULE_NAME
-    ".PyUnknownFields",       // tp_name
-    sizeof(PyUnknownFields),  // tp_basicsize
-    0,                        //  tp_itemsize
-    unknown_fields::Dealloc,  //  tp_dealloc
-#if PY_VERSION_HEX < 0x03080000
-    nullptr,  // tp_print
-#else
-    0,  // tp_vectorcall_offset
-#endif
-    nullptr,                      //  tp_getattr
-    nullptr,                      //  tp_setattr
-    nullptr,                      //  tp_compare
-    nullptr,                      //  tp_repr
-    nullptr,                      //  tp_as_number
-    &unknown_fields::SqMethods,   //  tp_as_sequence
-    nullptr,                      //  tp_as_mapping
-    PyObject_HashNotImplemented,  //  tp_hash
-    nullptr,                      //  tp_call
-    nullptr,                      //  tp_str
-    nullptr,                      //  tp_getattro
-    nullptr,                      //  tp_setattro
-    nullptr,                      //  tp_as_buffer
-    Py_TPFLAGS_DEFAULT,           //  tp_flags
-    "unknown field set",          //  tp_doc
-    nullptr,                      //  tp_traverse
-    nullptr,                      //  tp_clear
-    nullptr,                      //  tp_richcompare
-    0,                            //  tp_weaklistoffset
-    nullptr,                      //  tp_iter
-    nullptr,                      //  tp_iternext
-    nullptr,                      //  tp_methods
-    nullptr,                      //  tp_members
-    nullptr,                      //  tp_getset
-    nullptr,                      //  tp_base
-    nullptr,                      //  tp_dict
-    nullptr,                      //  tp_descr_get
-    nullptr,                      //  tp_descr_set
-    0,                            //  tp_dictoffset
-    nullptr,                      //  tp_init
-};
-
-namespace unknown_field {
-static PyObject* PyUnknownFields_FromUnknownFieldSet(
-    PyUnknownFields* parent, const UnknownFieldSet& fields) {
-  PyUnknownFields* self = reinterpret_cast<PyUnknownFields*>(
-      PyType_GenericAlloc(&PyUnknownFields_Type, 0));
-  if (self == nullptr) {
-    return nullptr;
-  }
-  // Call "placement new" to initialize PyUnknownFields.
-  new (self) PyUnknownFields;
-
-  Py_INCREF(parent);
-  self->parent = reinterpret_cast<PyObject*>(parent);
-  self->fields = &fields;
-  parent->sub_unknown_fields.emplace(self);
-
-  return reinterpret_cast<PyObject*>(self);
-}
-
-const UnknownField* GetUnknownField(PyUnknownFieldRef* self) {
-  const UnknownFieldSet* fields = self->parent->fields;
-  if (fields == nullptr) {
-    PyErr_Format(PyExc_ValueError,
-                 "UnknownField does not exist. "
-                 "The parent message might be cleared.");
-    return nullptr;
-  }
-  Py_ssize_t total_size = fields->field_count();
-  if (self->index >= total_size) {
-    PyErr_Format(PyExc_ValueError,
-                 "UnknownField does not exist. "
-                 "The parent message might be cleared.");
-    return nullptr;
-  }
-  return &fields->field(self->index);
-}
-
-static PyObject* GetFieldNumber(PyUnknownFieldRef* self, void *closure) {
-  const UnknownField* unknown_field = GetUnknownField(self);
-  if (unknown_field == nullptr) {
-    return nullptr;
-  }
-  return PyLong_FromLong(unknown_field->number());
-}
-
-using internal::WireFormatLite;
-static PyObject* GetWireType(PyUnknownFieldRef* self, void *closure) {
-  const UnknownField* unknown_field = GetUnknownField(self);
-  if (unknown_field == nullptr) {
-    return nullptr;
-  }
-
-  // Assign a default value to suppress may-uninitialized warnings (errors
-  // when built in some places).
-  WireFormatLite::WireType wire_type = WireFormatLite::WIRETYPE_VARINT;
-  switch (unknown_field->type()) {
-    case UnknownField::TYPE_VARINT:
-      wire_type = WireFormatLite::WIRETYPE_VARINT;
-      break;
-    case UnknownField::TYPE_FIXED32:
-      wire_type = WireFormatLite::WIRETYPE_FIXED32;
-      break;
-    case UnknownField::TYPE_FIXED64:
-      wire_type = WireFormatLite::WIRETYPE_FIXED64;
-      break;
-    case UnknownField::TYPE_LENGTH_DELIMITED:
-      wire_type = WireFormatLite::WIRETYPE_LENGTH_DELIMITED;
-      break;
-    case UnknownField::TYPE_GROUP:
-      wire_type = WireFormatLite::WIRETYPE_START_GROUP;
-      break;
-  }
-  return PyLong_FromLong(wire_type);
-}
-
-static PyObject* GetData(PyUnknownFieldRef* self, void *closure) {
-  const UnknownField* field = GetUnknownField(self);
-  if (field == nullptr) {
-    return nullptr;
-  }
-  PyObject* data = nullptr;
-  switch (field->type()) {
-    case UnknownField::TYPE_VARINT:
-      data = PyLong_FromUnsignedLongLong(field->varint());
-      break;
-    case UnknownField::TYPE_FIXED32:
-      data = PyLong_FromUnsignedLong(field->fixed32());
-      break;
-    case UnknownField::TYPE_FIXED64:
-      data = PyLong_FromUnsignedLongLong(field->fixed64());
-      break;
-    case UnknownField::TYPE_LENGTH_DELIMITED:
-      data = PyBytes_FromStringAndSize(field->length_delimited().data(),
-                                       field->GetLengthDelimitedSize());
-      break;
-    case UnknownField::TYPE_GROUP:
-      data = PyUnknownFields_FromUnknownFieldSet(
-          self->parent, field->group());
-      break;
-  }
-  return data;
-}
-
-static void Dealloc(PyObject* pself) {
-  PyUnknownFieldRef* self =
-      reinterpret_cast<PyUnknownFieldRef*>(pself);
-  Py_CLEAR(self->parent);
-}
-
-static PyGetSetDef Getters[] = {
-    {"field_number", (getter)GetFieldNumber, nullptr},
-    {"wire_type", (getter)GetWireType, nullptr},
-    {"data", (getter)GetData, nullptr},
-    {nullptr},
-};
-
-}  // namespace unknown_field
-
-PyTypeObject PyUnknownFieldRef_Type = {
-    PyVarObject_HEAD_INIT(&PyType_Type, 0) FULL_MODULE_NAME
-    ".PyUnknownFieldRef",       // tp_name
-    sizeof(PyUnknownFieldRef),  //  tp_basicsize
-    0,                          //  tp_itemsize
-    unknown_field::Dealloc,     //  tp_dealloc
-#if PY_VERSION_HEX < 0x03080000
-    nullptr,  // tp_print
-#else
-    0,  // tp_vectorcall_offset
-#endif
-    nullptr,                      //  tp_getattr
-    nullptr,                      //  tp_setattr
-    nullptr,                      //  tp_compare
-    nullptr,                      //  tp_repr
-    nullptr,                      //  tp_as_number
-    nullptr,                      //  tp_as_sequence
-    nullptr,                      //  tp_as_mapping
-    PyObject_HashNotImplemented,  //  tp_hash
-    nullptr,                      //  tp_call
-    nullptr,                      //  tp_str
-    nullptr,                      //  tp_getattro
-    nullptr,                      //  tp_setattro
-    nullptr,                      //  tp_as_buffer
-    Py_TPFLAGS_DEFAULT,           //  tp_flags
-    "unknown field",              //  tp_doc
-    nullptr,                      //  tp_traverse
-    nullptr,                      //  tp_clear
-    nullptr,                      //  tp_richcompare
-    0,                            //  tp_weaklistoffset
-    nullptr,                      //  tp_iter
-    nullptr,                      //  tp_iternext
-    nullptr,                      //  tp_methods
-    nullptr,                      //  tp_members
-    unknown_field::Getters,       //  tp_getset
-    nullptr,                      //  tp_base
-    nullptr,                      //  tp_dict
-    nullptr,                      //  tp_descr_get
-    nullptr,                      //  tp_descr_set
-    0,                            //  tp_dictoffset
-    nullptr,                      //  tp_init
-};
-
-}  // namespace python
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/python/google/protobuf/pyext/unknown_fields.h b/libs/protobuf/python/google/protobuf/pyext/unknown_fields.h
deleted file mode 100644
index e7b0b35..0000000
--- a/libs/protobuf/python/google/protobuf/pyext/unknown_fields.h
+++ /dev/null
@@ -1,91 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef GOOGLE_PROTOBUF_PYTHON_CPP_UNKNOWN_FIELDS_H__
-#define GOOGLE_PROTOBUF_PYTHON_CPP_UNKNOWN_FIELDS_H__
-
-#define PY_SSIZE_T_CLEAN
-#include <Python.h>
-
-#include <memory>
-#include <set>
-
-#include <google/protobuf/pyext/message.h>
-
-namespace google {
-namespace protobuf {
-
-class UnknownField;
-class UnknownFieldSet;
-
-namespace python {
-struct CMessage;
-
-typedef struct PyUnknownFields {
-  PyObject_HEAD;
-  // Strong pointer to the parent CMessage or PyUnknownFields.
-  // The top PyUnknownFields holds a reference to its parent CMessage
-  // object before release.
-  // Sub PyUnknownFields holds reference to parent PyUnknownFields.
-  PyObject* parent;
-
-  // Pointer to the C++ UnknownFieldSet.
-  // PyUnknownFields does not own this pointer.
-  const UnknownFieldSet* fields;
-
-  // Weak references to child unknown fields.
-  std::set<PyUnknownFields*> sub_unknown_fields;
-} PyUnknownFields;
-
-typedef struct PyUnknownFieldRef {
-  PyObject_HEAD;
-  // Every Python PyUnknownFieldRef holds a reference to its parent
-  // PyUnknownFields in order to keep it alive.
-  PyUnknownFields* parent;
-
-  // The UnknownField index in UnknownFields.
-  Py_ssize_t index;
-} UknownFieldRef;
-
-extern PyTypeObject PyUnknownFields_Type;
-extern PyTypeObject PyUnknownFieldRef_Type;
-
-namespace unknown_fields {
-
-// Builds an PyUnknownFields for a specific message.
-PyObject* NewPyUnknownFields(CMessage *parent);
-void Clear(PyUnknownFields* self);
-
-}  // namespace unknown_fields
-}  // namespace python
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // GOOGLE_PROTOBUF_PYTHON_CPP_UNKNOWN_FIELDS_H__
diff --git a/libs/protobuf/python/google/protobuf/python_protobuf.h b/libs/protobuf/python/google/protobuf/python_protobuf.h
deleted file mode 100644
index 4fcf065..0000000
--- a/libs/protobuf/python/google/protobuf/python_protobuf.h
+++ /dev/null
@@ -1,58 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: qrczak@google.com (Marcin Kowalczyk)
-//
-// This module exposes the C proto inside the given Python proto, in
-// case the Python proto is implemented with a C proto.
-
-#ifndef GOOGLE_PROTOBUF_PYTHON_PYTHON_PROTOBUF_H__
-#define GOOGLE_PROTOBUF_PYTHON_PYTHON_PROTOBUF_H__
-
-#define PY_SSIZE_T_CLEAN
-#include <Python.h>
-
-namespace google {
-namespace protobuf {
-
-class Message;
-
-namespace python {
-
-// Return the pointer to the C proto inside the given Python proto,
-// or NULL when this is not a Python proto implemented with a C proto.
-const Message* GetCProtoInsidePyProto(PyObject* msg);
-Message* MutableCProtoInsidePyProto(PyObject* msg);
-
-}  // namespace python
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // GOOGLE_PROTOBUF_PYTHON_PYTHON_PROTOBUF_H__
diff --git a/libs/protobuf/python/google/protobuf/reflection.py b/libs/protobuf/python/google/protobuf/reflection.py
deleted file mode 100644
index 81e1885..0000000
--- a/libs/protobuf/python/google/protobuf/reflection.py
+++ /dev/null
@@ -1,95 +0,0 @@
-# Protocol Buffers - Google's data interchange format
-# Copyright 2008 Google Inc.  All rights reserved.
-# https://developers.google.com/protocol-buffers/
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# This code is meant to work on Python 2.4 and above only.
-
-"""Contains a metaclass and helper functions used to create
-protocol message classes from Descriptor objects at runtime.
-
-Recall that a metaclass is the "type" of a class.
-(A class is to a metaclass what an instance is to a class.)
-
-In this case, we use the GeneratedProtocolMessageType metaclass
-to inject all the useful functionality into the classes
-output by the protocol compiler at compile-time.
-
-The upshot of all this is that the real implementation
-details for ALL pure-Python protocol buffers are *here in
-this file*.
-"""
-
-__author__ = 'robinson@google.com (Will Robinson)'
-
-
-from google.protobuf import message_factory
-from google.protobuf import symbol_database
-
-# The type of all Message classes.
-# Part of the public interface, but normally only used by message factories.
-GeneratedProtocolMessageType = message_factory._GENERATED_PROTOCOL_MESSAGE_TYPE
-
-MESSAGE_CLASS_CACHE = {}
-
-
-# Deprecated. Please NEVER use reflection.ParseMessage().
-def ParseMessage(descriptor, byte_str):
-  """Generate a new Message instance from this Descriptor and a byte string.
-
-  DEPRECATED: ParseMessage is deprecated because it is using MakeClass().
-  Please use MessageFactory.GetPrototype() instead.
-
-  Args:
-    descriptor: Protobuf Descriptor object
-    byte_str: Serialized protocol buffer byte string
-
-  Returns:
-    Newly created protobuf Message object.
-  """
-  result_class = MakeClass(descriptor)
-  new_msg = result_class()
-  new_msg.ParseFromString(byte_str)
-  return new_msg
-
-
-# Deprecated. Please NEVER use reflection.MakeClass().
-def MakeClass(descriptor):
-  """Construct a class object for a protobuf described by descriptor.
-
-  DEPRECATED: use MessageFactory.GetPrototype() instead.
-
-  Args:
-    descriptor: A descriptor.Descriptor object describing the protobuf.
-  Returns:
-    The Message class object described by the descriptor.
-  """
-  # Original implementation leads to duplicate message classes, which won't play
-  # well with extensions. Message factory info is also missing.
-  # Redirect to message_factory.
-  return symbol_database.Default().GetPrototype(descriptor)
diff --git a/libs/protobuf/python/google/protobuf/service.py b/libs/protobuf/python/google/protobuf/service.py
deleted file mode 100644
index 5625246..0000000
--- a/libs/protobuf/python/google/protobuf/service.py
+++ /dev/null
@@ -1,228 +0,0 @@
-# Protocol Buffers - Google's data interchange format
-# Copyright 2008 Google Inc.  All rights reserved.
-# https://developers.google.com/protocol-buffers/
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-"""DEPRECATED:  Declares the RPC service interfaces.
-
-This module declares the abstract interfaces underlying proto2 RPC
-services.  These are intended to be independent of any particular RPC
-implementation, so that proto2 services can be used on top of a variety
-of implementations.  Starting with version 2.3.0, RPC implementations should
-not try to build on these, but should instead provide code generator plugins
-which generate code specific to the particular RPC implementation.  This way
-the generated code can be more appropriate for the implementation in use
-and can avoid unnecessary layers of indirection.
-"""
-
-__author__ = 'petar@google.com (Petar Petrov)'
-
-
-class RpcException(Exception):
-  """Exception raised on failed blocking RPC method call."""
-  pass
-
-
-class Service(object):
-
-  """Abstract base interface for protocol-buffer-based RPC services.
-
-  Services themselves are abstract classes (implemented either by servers or as
-  stubs), but they subclass this base interface. The methods of this
-  interface can be used to call the methods of the service without knowing
-  its exact type at compile time (analogous to the Message interface).
-  """
-
-  def GetDescriptor():
-    """Retrieves this service's descriptor."""
-    raise NotImplementedError
-
-  def CallMethod(self, method_descriptor, rpc_controller,
-                 request, done):
-    """Calls a method of the service specified by method_descriptor.
-
-    If "done" is None then the call is blocking and the response
-    message will be returned directly.  Otherwise the call is asynchronous
-    and "done" will later be called with the response value.
-
-    In the blocking case, RpcException will be raised on error.
-
-    Preconditions:
-
-    * method_descriptor.service == GetDescriptor
-    * request is of the exact same classes as returned by
-      GetRequestClass(method).
-    * After the call has started, the request must not be modified.
-    * "rpc_controller" is of the correct type for the RPC implementation being
-      used by this Service.  For stubs, the "correct type" depends on the
-      RpcChannel which the stub is using.
-
-    Postconditions:
-
-    * "done" will be called when the method is complete.  This may be
-      before CallMethod() returns or it may be at some point in the future.
-    * If the RPC failed, the response value passed to "done" will be None.
-      Further details about the failure can be found by querying the
-      RpcController.
-    """
-    raise NotImplementedError
-
-  def GetRequestClass(self, method_descriptor):
-    """Returns the class of the request message for the specified method.
-
-    CallMethod() requires that the request is of a particular subclass of
-    Message. GetRequestClass() gets the default instance of this required
-    type.
-
-    Example:
-      method = service.GetDescriptor().FindMethodByName("Foo")
-      request = stub.GetRequestClass(method)()
-      request.ParseFromString(input)
-      service.CallMethod(method, request, callback)
-    """
-    raise NotImplementedError
-
-  def GetResponseClass(self, method_descriptor):
-    """Returns the class of the response message for the specified method.
-
-    This method isn't really needed, as the RpcChannel's CallMethod constructs
-    the response protocol message. It's provided anyway in case it is useful
-    for the caller to know the response type in advance.
-    """
-    raise NotImplementedError
-
-
-class RpcController(object):
-
-  """An RpcController mediates a single method call.
-
-  The primary purpose of the controller is to provide a way to manipulate
-  settings specific to the RPC implementation and to find out about RPC-level
-  errors. The methods provided by the RpcController interface are intended
-  to be a "least common denominator" set of features which we expect all
-  implementations to support.  Specific implementations may provide more
-  advanced features (e.g. deadline propagation).
-  """
-
-  # Client-side methods below
-
-  def Reset(self):
-    """Resets the RpcController to its initial state.
-
-    After the RpcController has been reset, it may be reused in
-    a new call. Must not be called while an RPC is in progress.
-    """
-    raise NotImplementedError
-
-  def Failed(self):
-    """Returns true if the call failed.
-
-    After a call has finished, returns true if the call failed.  The possible
-    reasons for failure depend on the RPC implementation.  Failed() must not
-    be called before a call has finished.  If Failed() returns true, the
-    contents of the response message are undefined.
-    """
-    raise NotImplementedError
-
-  def ErrorText(self):
-    """If Failed is true, returns a human-readable description of the error."""
-    raise NotImplementedError
-
-  def StartCancel(self):
-    """Initiate cancellation.
-
-    Advises the RPC system that the caller desires that the RPC call be
-    canceled.  The RPC system may cancel it immediately, may wait awhile and
-    then cancel it, or may not even cancel the call at all.  If the call is
-    canceled, the "done" callback will still be called and the RpcController
-    will indicate that the call failed at that time.
-    """
-    raise NotImplementedError
-
-  # Server-side methods below
-
-  def SetFailed(self, reason):
-    """Sets a failure reason.
-
-    Causes Failed() to return true on the client side.  "reason" will be
-    incorporated into the message returned by ErrorText().  If you find
-    you need to return machine-readable information about failures, you
-    should incorporate it into your response protocol buffer and should
-    NOT call SetFailed().
-    """
-    raise NotImplementedError
-
-  def IsCanceled(self):
-    """Checks if the client cancelled the RPC.
-
-    If true, indicates that the client canceled the RPC, so the server may
-    as well give up on replying to it.  The server should still call the
-    final "done" callback.
-    """
-    raise NotImplementedError
-
-  def NotifyOnCancel(self, callback):
-    """Sets a callback to invoke on cancel.
-
-    Asks that the given callback be called when the RPC is canceled.  The
-    callback will always be called exactly once.  If the RPC completes without
-    being canceled, the callback will be called after completion.  If the RPC
-    has already been canceled when NotifyOnCancel() is called, the callback
-    will be called immediately.
-
-    NotifyOnCancel() must be called no more than once per request.
-    """
-    raise NotImplementedError
-
-
-class RpcChannel(object):
-
-  """Abstract interface for an RPC channel.
-
-  An RpcChannel represents a communication line to a service which can be used
-  to call that service's methods.  The service may be running on another
-  machine. Normally, you should not use an RpcChannel directly, but instead
-  construct a stub {@link Service} wrapping it.  Example:
-
-  Example:
-    RpcChannel channel = rpcImpl.Channel("remotehost.example.com:1234")
-    RpcController controller = rpcImpl.Controller()
-    MyService service = MyService_Stub(channel)
-    service.MyMethod(controller, request, callback)
-  """
-
-  def CallMethod(self, method_descriptor, rpc_controller,
-                 request, response_class, done):
-    """Calls the method identified by the descriptor.
-
-    Call the given method of the remote service.  The signature of this
-    procedure looks the same as Service.CallMethod(), but the requirements
-    are less strict in one important way:  the request object doesn't have to
-    be of any specific class as long as its descriptor is method.input_type.
-    """
-    raise NotImplementedError
diff --git a/libs/protobuf/python/google/protobuf/service_reflection.py b/libs/protobuf/python/google/protobuf/service_reflection.py
deleted file mode 100644
index f82ab71..0000000
--- a/libs/protobuf/python/google/protobuf/service_reflection.py
+++ /dev/null
@@ -1,295 +0,0 @@
-# Protocol Buffers - Google's data interchange format
-# Copyright 2008 Google Inc.  All rights reserved.
-# https://developers.google.com/protocol-buffers/
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-"""Contains metaclasses used to create protocol service and service stub
-classes from ServiceDescriptor objects at runtime.
-
-The GeneratedServiceType and GeneratedServiceStubType metaclasses are used to
-inject all useful functionality into the classes output by the protocol
-compiler at compile-time.
-"""
-
-__author__ = 'petar@google.com (Petar Petrov)'
-
-
-class GeneratedServiceType(type):
-
-  """Metaclass for service classes created at runtime from ServiceDescriptors.
-
-  Implementations for all methods described in the Service class are added here
-  by this class. We also create properties to allow getting/setting all fields
-  in the protocol message.
-
-  The protocol compiler currently uses this metaclass to create protocol service
-  classes at runtime. Clients can also manually create their own classes at
-  runtime, as in this example::
-
-    mydescriptor = ServiceDescriptor(.....)
-    class MyProtoService(service.Service):
-      __metaclass__ = GeneratedServiceType
-      DESCRIPTOR = mydescriptor
-    myservice_instance = MyProtoService()
-    # ...
-  """
-
-  _DESCRIPTOR_KEY = 'DESCRIPTOR'
-
-  def __init__(cls, name, bases, dictionary):
-    """Creates a message service class.
-
-    Args:
-      name: Name of the class (ignored, but required by the metaclass
-        protocol).
-      bases: Base classes of the class being constructed.
-      dictionary: The class dictionary of the class being constructed.
-        dictionary[_DESCRIPTOR_KEY] must contain a ServiceDescriptor object
-        describing this protocol service type.
-    """
-    # Don't do anything if this class doesn't have a descriptor. This happens
-    # when a service class is subclassed.
-    if GeneratedServiceType._DESCRIPTOR_KEY not in dictionary:
-      return
-
-    descriptor = dictionary[GeneratedServiceType._DESCRIPTOR_KEY]
-    service_builder = _ServiceBuilder(descriptor)
-    service_builder.BuildService(cls)
-    cls.DESCRIPTOR = descriptor
-
-
-class GeneratedServiceStubType(GeneratedServiceType):
-
-  """Metaclass for service stubs created at runtime from ServiceDescriptors.
-
-  This class has similar responsibilities as GeneratedServiceType, except that
-  it creates the service stub classes.
-  """
-
-  _DESCRIPTOR_KEY = 'DESCRIPTOR'
-
-  def __init__(cls, name, bases, dictionary):
-    """Creates a message service stub class.
-
-    Args:
-      name: Name of the class (ignored, here).
-      bases: Base classes of the class being constructed.
-      dictionary: The class dictionary of the class being constructed.
-        dictionary[_DESCRIPTOR_KEY] must contain a ServiceDescriptor object
-        describing this protocol service type.
-    """
-    super(GeneratedServiceStubType, cls).__init__(name, bases, dictionary)
-    # Don't do anything if this class doesn't have a descriptor. This happens
-    # when a service stub is subclassed.
-    if GeneratedServiceStubType._DESCRIPTOR_KEY not in dictionary:
-      return
-
-    descriptor = dictionary[GeneratedServiceStubType._DESCRIPTOR_KEY]
-    service_stub_builder = _ServiceStubBuilder(descriptor)
-    service_stub_builder.BuildServiceStub(cls)
-
-
-class _ServiceBuilder(object):
-
-  """This class constructs a protocol service class using a service descriptor.
-
-  Given a service descriptor, this class constructs a class that represents
-  the specified service descriptor. One service builder instance constructs
-  exactly one service class. That means all instances of that class share the
-  same builder.
-  """
-
-  def __init__(self, service_descriptor):
-    """Initializes an instance of the service class builder.
-
-    Args:
-      service_descriptor: ServiceDescriptor to use when constructing the
-        service class.
-    """
-    self.descriptor = service_descriptor
-
-  def BuildService(builder, cls):
-    """Constructs the service class.
-
-    Args:
-      cls: The class that will be constructed.
-    """
-
-    # CallMethod needs to operate with an instance of the Service class. This
-    # internal wrapper function exists only to be able to pass the service
-    # instance to the method that does the real CallMethod work.
-    # Making sure to use exact argument names from the abstract interface in
-    # service.py to match the type signature
-    def _WrapCallMethod(self, method_descriptor, rpc_controller, request, done):
-      return builder._CallMethod(self, method_descriptor, rpc_controller,
-                                 request, done)
-
-    def _WrapGetRequestClass(self, method_descriptor):
-      return builder._GetRequestClass(method_descriptor)
-
-    def _WrapGetResponseClass(self, method_descriptor):
-      return builder._GetResponseClass(method_descriptor)
-
-    builder.cls = cls
-    cls.CallMethod = _WrapCallMethod
-    cls.GetDescriptor = staticmethod(lambda: builder.descriptor)
-    cls.GetDescriptor.__doc__ = 'Returns the service descriptor.'
-    cls.GetRequestClass = _WrapGetRequestClass
-    cls.GetResponseClass = _WrapGetResponseClass
-    for method in builder.descriptor.methods:
-      setattr(cls, method.name, builder._GenerateNonImplementedMethod(method))
-
-  def _CallMethod(self, srvc, method_descriptor,
-                  rpc_controller, request, callback):
-    """Calls the method described by a given method descriptor.
-
-    Args:
-      srvc: Instance of the service for which this method is called.
-      method_descriptor: Descriptor that represent the method to call.
-      rpc_controller: RPC controller to use for this method's execution.
-      request: Request protocol message.
-      callback: A callback to invoke after the method has completed.
-    """
-    if method_descriptor.containing_service != self.descriptor:
-      raise RuntimeError(
-          'CallMethod() given method descriptor for wrong service type.')
-    method = getattr(srvc, method_descriptor.name)
-    return method(rpc_controller, request, callback)
-
-  def _GetRequestClass(self, method_descriptor):
-    """Returns the class of the request protocol message.
-
-    Args:
-      method_descriptor: Descriptor of the method for which to return the
-        request protocol message class.
-
-    Returns:
-      A class that represents the input protocol message of the specified
-      method.
-    """
-    if method_descriptor.containing_service != self.descriptor:
-      raise RuntimeError(
-          'GetRequestClass() given method descriptor for wrong service type.')
-    return method_descriptor.input_type._concrete_class
-
-  def _GetResponseClass(self, method_descriptor):
-    """Returns the class of the response protocol message.
-
-    Args:
-      method_descriptor: Descriptor of the method for which to return the
-        response protocol message class.
-
-    Returns:
-      A class that represents the output protocol message of the specified
-      method.
-    """
-    if method_descriptor.containing_service != self.descriptor:
-      raise RuntimeError(
-          'GetResponseClass() given method descriptor for wrong service type.')
-    return method_descriptor.output_type._concrete_class
-
-  def _GenerateNonImplementedMethod(self, method):
-    """Generates and returns a method that can be set for a service methods.
-
-    Args:
-      method: Descriptor of the service method for which a method is to be
-        generated.
-
-    Returns:
-      A method that can be added to the service class.
-    """
-    return lambda inst, rpc_controller, request, callback: (
-        self._NonImplementedMethod(method.name, rpc_controller, callback))
-
-  def _NonImplementedMethod(self, method_name, rpc_controller, callback):
-    """The body of all methods in the generated service class.
-
-    Args:
-      method_name: Name of the method being executed.
-      rpc_controller: RPC controller used to execute this method.
-      callback: A callback which will be invoked when the method finishes.
-    """
-    rpc_controller.SetFailed('Method %s not implemented.' % method_name)
-    callback(None)
-
-
-class _ServiceStubBuilder(object):
-
-  """Constructs a protocol service stub class using a service descriptor.
-
-  Given a service descriptor, this class constructs a suitable stub class.
-  A stub is just a type-safe wrapper around an RpcChannel which emulates a
-  local implementation of the service.
-
-  One service stub builder instance constructs exactly one class. It means all
-  instances of that class share the same service stub builder.
-  """
-
-  def __init__(self, service_descriptor):
-    """Initializes an instance of the service stub class builder.
-
-    Args:
-      service_descriptor: ServiceDescriptor to use when constructing the
-        stub class.
-    """
-    self.descriptor = service_descriptor
-
-  def BuildServiceStub(self, cls):
-    """Constructs the stub class.
-
-    Args:
-      cls: The class that will be constructed.
-    """
-
-    def _ServiceStubInit(stub, rpc_channel):
-      stub.rpc_channel = rpc_channel
-    self.cls = cls
-    cls.__init__ = _ServiceStubInit
-    for method in self.descriptor.methods:
-      setattr(cls, method.name, self._GenerateStubMethod(method))
-
-  def _GenerateStubMethod(self, method):
-    return (lambda inst, rpc_controller, request, callback=None:
-        self._StubMethod(inst, method, rpc_controller, request, callback))
-
-  def _StubMethod(self, stub, method_descriptor,
-                  rpc_controller, request, callback):
-    """The body of all service methods in the generated stub class.
-
-    Args:
-      stub: Stub instance.
-      method_descriptor: Descriptor of the invoked method.
-      rpc_controller: Rpc controller to execute the method.
-      request: Request protocol message.
-      callback: A callback to execute when the method finishes.
-    Returns:
-      Response message (in case of blocking call).
-    """
-    return stub.rpc_channel.CallMethod(
-        method_descriptor, rpc_controller, request,
-        method_descriptor.output_type._concrete_class, callback)
diff --git a/libs/protobuf/python/google/protobuf/symbol_database.py b/libs/protobuf/python/google/protobuf/symbol_database.py
deleted file mode 100644
index fdcf8cf..0000000
--- a/libs/protobuf/python/google/protobuf/symbol_database.py
+++ /dev/null
@@ -1,194 +0,0 @@
-# Protocol Buffers - Google's data interchange format
-# Copyright 2008 Google Inc.  All rights reserved.
-# https://developers.google.com/protocol-buffers/
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-"""A database of Python protocol buffer generated symbols.
-
-SymbolDatabase is the MessageFactory for messages generated at compile time,
-and makes it easy to create new instances of a registered type, given only the
-type's protocol buffer symbol name.
-
-Example usage::
-
-  db = symbol_database.SymbolDatabase()
-
-  # Register symbols of interest, from one or multiple files.
-  db.RegisterFileDescriptor(my_proto_pb2.DESCRIPTOR)
-  db.RegisterMessage(my_proto_pb2.MyMessage)
-  db.RegisterEnumDescriptor(my_proto_pb2.MyEnum.DESCRIPTOR)
-
-  # The database can be used as a MessageFactory, to generate types based on
-  # their name:
-  types = db.GetMessages(['my_proto.proto'])
-  my_message_instance = types['MyMessage']()
-
-  # The database's underlying descriptor pool can be queried, so it's not
-  # necessary to know a type's filename to be able to generate it:
-  filename = db.pool.FindFileContainingSymbol('MyMessage')
-  my_message_instance = db.GetMessages([filename])['MyMessage']()
-
-  # This functionality is also provided directly via a convenience method:
-  my_message_instance = db.GetSymbol('MyMessage')()
-"""
-
-
-from google.protobuf.internal import api_implementation
-from google.protobuf import descriptor_pool
-from google.protobuf import message_factory
-
-
-class SymbolDatabase(message_factory.MessageFactory):
-  """A database of Python generated symbols."""
-
-  def RegisterMessage(self, message):
-    """Registers the given message type in the local database.
-
-    Calls to GetSymbol() and GetMessages() will return messages registered here.
-
-    Args:
-      message: A :class:`google.protobuf.message.Message` subclass (or
-        instance); its descriptor will be registered.
-
-    Returns:
-      The provided message.
-    """
-
-    desc = message.DESCRIPTOR
-    self._classes[desc] = message
-    self.RegisterMessageDescriptor(desc)
-    return message
-
-  def RegisterMessageDescriptor(self, message_descriptor):
-    """Registers the given message descriptor in the local database.
-
-    Args:
-      message_descriptor (Descriptor): the message descriptor to add.
-    """
-    if api_implementation.Type() == 'python':
-      # pylint: disable=protected-access
-      self.pool._AddDescriptor(message_descriptor)
-
-  def RegisterEnumDescriptor(self, enum_descriptor):
-    """Registers the given enum descriptor in the local database.
-
-    Args:
-      enum_descriptor (EnumDescriptor): The enum descriptor to register.
-
-    Returns:
-      EnumDescriptor: The provided descriptor.
-    """
-    if api_implementation.Type() == 'python':
-      # pylint: disable=protected-access
-      self.pool._AddEnumDescriptor(enum_descriptor)
-    return enum_descriptor
-
-  def RegisterServiceDescriptor(self, service_descriptor):
-    """Registers the given service descriptor in the local database.
-
-    Args:
-      service_descriptor (ServiceDescriptor): the service descriptor to
-        register.
-    """
-    if api_implementation.Type() == 'python':
-      # pylint: disable=protected-access
-      self.pool._AddServiceDescriptor(service_descriptor)
-
-  def RegisterFileDescriptor(self, file_descriptor):
-    """Registers the given file descriptor in the local database.
-
-    Args:
-      file_descriptor (FileDescriptor): The file descriptor to register.
-    """
-    if api_implementation.Type() == 'python':
-      # pylint: disable=protected-access
-      self.pool._InternalAddFileDescriptor(file_descriptor)
-
-  def GetSymbol(self, symbol):
-    """Tries to find a symbol in the local database.
-
-    Currently, this method only returns message.Message instances, however, if
-    may be extended in future to support other symbol types.
-
-    Args:
-      symbol (str): a protocol buffer symbol.
-
-    Returns:
-      A Python class corresponding to the symbol.
-
-    Raises:
-      KeyError: if the symbol could not be found.
-    """
-
-    return self._classes[self.pool.FindMessageTypeByName(symbol)]
-
-  def GetMessages(self, files):
-    # TODO(amauryfa): Fix the differences with MessageFactory.
-    """Gets all registered messages from a specified file.
-
-    Only messages already created and registered will be returned; (this is the
-    case for imported _pb2 modules)
-    But unlike MessageFactory, this version also returns already defined nested
-    messages, but does not register any message extensions.
-
-    Args:
-      files (list[str]): The file names to extract messages from.
-
-    Returns:
-      A dictionary mapping proto names to the message classes.
-
-    Raises:
-      KeyError: if a file could not be found.
-    """
-
-    def _GetAllMessages(desc):
-      """Walk a message Descriptor and recursively yields all message names."""
-      yield desc
-      for msg_desc in desc.nested_types:
-        for nested_desc in _GetAllMessages(msg_desc):
-          yield nested_desc
-
-    result = {}
-    for file_name in files:
-      file_desc = self.pool.FindFileByName(file_name)
-      for msg_desc in file_desc.message_types_by_name.values():
-        for desc in _GetAllMessages(msg_desc):
-          try:
-            result[desc.full_name] = self._classes[desc]
-          except KeyError:
-            # This descriptor has no registered class, skip it.
-            pass
-    return result
-
-
-_DEFAULT = SymbolDatabase(pool=descriptor_pool.Default())
-
-
-def Default():
-  """Returns the default SymbolDatabase."""
-  return _DEFAULT
diff --git a/libs/protobuf/python/google/protobuf/text_encoding.py b/libs/protobuf/python/google/protobuf/text_encoding.py
deleted file mode 100644
index 759cf11..0000000
--- a/libs/protobuf/python/google/protobuf/text_encoding.py
+++ /dev/null
@@ -1,110 +0,0 @@
-# Protocol Buffers - Google's data interchange format
-# Copyright 2008 Google Inc.  All rights reserved.
-# https://developers.google.com/protocol-buffers/
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-"""Encoding related utilities."""
-import re
-
-_cescape_chr_to_symbol_map = {}
-_cescape_chr_to_symbol_map[9] = r'\t'  # optional escape
-_cescape_chr_to_symbol_map[10] = r'\n'  # optional escape
-_cescape_chr_to_symbol_map[13] = r'\r'  # optional escape
-_cescape_chr_to_symbol_map[34] = r'\"'  # necessary escape
-_cescape_chr_to_symbol_map[39] = r"\'"  # optional escape
-_cescape_chr_to_symbol_map[92] = r'\\'  # necessary escape
-
-# Lookup table for unicode
-_cescape_unicode_to_str = [chr(i) for i in range(0, 256)]
-for byte, string in _cescape_chr_to_symbol_map.items():
-  _cescape_unicode_to_str[byte] = string
-
-# Lookup table for non-utf8, with necessary escapes at (o >= 127 or o < 32)
-_cescape_byte_to_str = ([r'\%03o' % i for i in range(0, 32)] +
-                        [chr(i) for i in range(32, 127)] +
-                        [r'\%03o' % i for i in range(127, 256)])
-for byte, string in _cescape_chr_to_symbol_map.items():
-  _cescape_byte_to_str[byte] = string
-del byte, string
-
-
-def CEscape(text, as_utf8):
-  # type: (...) -> str
-  """Escape a bytes string for use in an text protocol buffer.
-
-  Args:
-    text: A byte string to be escaped.
-    as_utf8: Specifies if result may contain non-ASCII characters.
-        In Python 3 this allows unescaped non-ASCII Unicode characters.
-        In Python 2 the return value will be valid UTF-8 rather than only ASCII.
-  Returns:
-    Escaped string (str).
-  """
-  # Python's text.encode() 'string_escape' or 'unicode_escape' codecs do not
-  # satisfy our needs; they encodes unprintable characters using two-digit hex
-  # escapes whereas our C++ unescaping function allows hex escapes to be any
-  # length.  So, "\0011".encode('string_escape') ends up being "\\x011", which
-  # will be decoded in C++ as a single-character string with char code 0x11.
-  text_is_unicode = isinstance(text, str)
-  if as_utf8 and text_is_unicode:
-    # We're already unicode, no processing beyond control char escapes.
-    return text.translate(_cescape_chr_to_symbol_map)
-  ord_ = ord if text_is_unicode else lambda x: x  # bytes iterate as ints.
-  if as_utf8:
-    return ''.join(_cescape_unicode_to_str[ord_(c)] for c in text)
-  return ''.join(_cescape_byte_to_str[ord_(c)] for c in text)
-
-
-_CUNESCAPE_HEX = re.compile(r'(\\+)x([0-9a-fA-F])(?![0-9a-fA-F])')
-
-
-def CUnescape(text):
-  # type: (str) -> bytes
-  """Unescape a text string with C-style escape sequences to UTF-8 bytes.
-
-  Args:
-    text: The data to parse in a str.
-  Returns:
-    A byte string.
-  """
-
-  def ReplaceHex(m):
-    # Only replace the match if the number of leading back slashes is odd. i.e.
-    # the slash itself is not escaped.
-    if len(m.group(1)) & 1:
-      return m.group(1) + 'x0' + m.group(2)
-    return m.group(0)
-
-  # This is required because the 'string_escape' encoding doesn't
-  # allow single-digit hex escapes (like '\xf').
-  result = _CUNESCAPE_HEX.sub(ReplaceHex, text)
-
-  return (result.encode('utf-8')  # Make it bytes to allow decode.
-          .decode('unicode_escape')
-          # Make it bytes again to return the proper type.
-          .encode('raw_unicode_escape'))
diff --git a/libs/protobuf/python/google/protobuf/text_format.py b/libs/protobuf/python/google/protobuf/text_format.py
deleted file mode 100644
index a6d8bcf..0000000
--- a/libs/protobuf/python/google/protobuf/text_format.py
+++ /dev/null
@@ -1,1842 +0,0 @@
-# Protocol Buffers - Google's data interchange format
-# Copyright 2008 Google Inc.  All rights reserved.
-# https://developers.google.com/protocol-buffers/
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-"""Contains routines for printing protocol messages in text format.
-
-Simple usage example::
-
-  # Create a proto object and serialize it to a text proto string.
-  message = my_proto_pb2.MyMessage(foo='bar')
-  text_proto = text_format.MessageToString(message)
-
-  # Parse a text proto string.
-  message = text_format.Parse(text_proto, my_proto_pb2.MyMessage())
-"""
-
-__author__ = 'kenton@google.com (Kenton Varda)'
-
-# TODO(b/129989314) Import thread contention leads to test failures.
-import encodings.raw_unicode_escape  # pylint: disable=unused-import
-import encodings.unicode_escape  # pylint: disable=unused-import
-import io
-import math
-import re
-
-from google.protobuf.internal import decoder
-from google.protobuf.internal import type_checkers
-from google.protobuf import descriptor
-from google.protobuf import text_encoding
-from google.protobuf import unknown_fields
-
-# pylint: disable=g-import-not-at-top
-__all__ = ['MessageToString', 'Parse', 'PrintMessage', 'PrintField',
-           'PrintFieldValue', 'Merge', 'MessageToBytes']
-
-_INTEGER_CHECKERS = (type_checkers.Uint32ValueChecker(),
-                     type_checkers.Int32ValueChecker(),
-                     type_checkers.Uint64ValueChecker(),
-                     type_checkers.Int64ValueChecker())
-_FLOAT_INFINITY = re.compile('-?inf(?:inity)?f?$', re.IGNORECASE)
-_FLOAT_NAN = re.compile('nanf?$', re.IGNORECASE)
-_QUOTES = frozenset(("'", '"'))
-_ANY_FULL_TYPE_NAME = 'google.protobuf.Any'
-
-
-class Error(Exception):
-  """Top-level module error for text_format."""
-
-
-class ParseError(Error):
-  """Thrown in case of text parsing or tokenizing error."""
-
-  def __init__(self, message=None, line=None, column=None):
-    if message is not None and line is not None:
-      loc = str(line)
-      if column is not None:
-        loc += ':{0}'.format(column)
-      message = '{0} : {1}'.format(loc, message)
-    if message is not None:
-      super(ParseError, self).__init__(message)
-    else:
-      super(ParseError, self).__init__()
-    self._line = line
-    self._column = column
-
-  def GetLine(self):
-    return self._line
-
-  def GetColumn(self):
-    return self._column
-
-
-class TextWriter(object):
-
-  def __init__(self, as_utf8):
-    self._writer = io.StringIO()
-
-  def write(self, val):
-    return self._writer.write(val)
-
-  def close(self):
-    return self._writer.close()
-
-  def getvalue(self):
-    return self._writer.getvalue()
-
-
-def MessageToString(
-    message,
-    as_utf8=False,
-    as_one_line=False,
-    use_short_repeated_primitives=False,
-    pointy_brackets=False,
-    use_index_order=False,
-    float_format=None,
-    double_format=None,
-    use_field_number=False,
-    descriptor_pool=None,
-    indent=0,
-    message_formatter=None,
-    print_unknown_fields=False,
-    force_colon=False):
-  # type: (...) -> str
-  """Convert protobuf message to text format.
-
-  Double values can be formatted compactly with 15 digits of
-  precision (which is the most that IEEE 754 "double" can guarantee)
-  using double_format='.15g'. To ensure that converting to text and back to a
-  proto will result in an identical value, double_format='.17g' should be used.
-
-  Args:
-    message: The protocol buffers message.
-    as_utf8: Return unescaped Unicode for non-ASCII characters.
-    as_one_line: Don't introduce newlines between fields.
-    use_short_repeated_primitives: Use short repeated format for primitives.
-    pointy_brackets: If True, use angle brackets instead of curly braces for
-      nesting.
-    use_index_order: If True, fields of a proto message will be printed using
-      the order defined in source code instead of the field number, extensions
-      will be printed at the end of the message and their relative order is
-      determined by the extension number. By default, use the field number
-      order.
-    float_format (str): If set, use this to specify float field formatting
-      (per the "Format Specification Mini-Language"); otherwise, shortest float
-      that has same value in wire will be printed. Also affect double field
-      if double_format is not set but float_format is set.
-    double_format (str): If set, use this to specify double field formatting
-      (per the "Format Specification Mini-Language"); if it is not set but
-      float_format is set, use float_format. Otherwise, use ``str()``
-    use_field_number: If True, print field numbers instead of names.
-    descriptor_pool (DescriptorPool): Descriptor pool used to resolve Any types.
-    indent (int): The initial indent level, in terms of spaces, for pretty
-      print.
-    message_formatter (function(message, indent, as_one_line) -> unicode|None):
-      Custom formatter for selected sub-messages (usually based on message
-      type). Use to pretty print parts of the protobuf for easier diffing.
-    print_unknown_fields: If True, unknown fields will be printed.
-    force_colon: If set, a colon will be added after the field name even if the
-      field is a proto message.
-
-  Returns:
-    str: A string of the text formatted protocol buffer message.
-  """
-  out = TextWriter(as_utf8)
-  printer = _Printer(
-      out,
-      indent,
-      as_utf8,
-      as_one_line,
-      use_short_repeated_primitives,
-      pointy_brackets,
-      use_index_order,
-      float_format,
-      double_format,
-      use_field_number,
-      descriptor_pool,
-      message_formatter,
-      print_unknown_fields=print_unknown_fields,
-      force_colon=force_colon)
-  printer.PrintMessage(message)
-  result = out.getvalue()
-  out.close()
-  if as_one_line:
-    return result.rstrip()
-  return result
-
-
-def MessageToBytes(message, **kwargs):
-  # type: (...) -> bytes
-  """Convert protobuf message to encoded text format.  See MessageToString."""
-  text = MessageToString(message, **kwargs)
-  if isinstance(text, bytes):
-    return text
-  codec = 'utf-8' if kwargs.get('as_utf8') else 'ascii'
-  return text.encode(codec)
-
-
-def _IsMapEntry(field):
-  return (field.type == descriptor.FieldDescriptor.TYPE_MESSAGE and
-          field.message_type.has_options and
-          field.message_type.GetOptions().map_entry)
-
-
-def PrintMessage(message,
-                 out,
-                 indent=0,
-                 as_utf8=False,
-                 as_one_line=False,
-                 use_short_repeated_primitives=False,
-                 pointy_brackets=False,
-                 use_index_order=False,
-                 float_format=None,
-                 double_format=None,
-                 use_field_number=False,
-                 descriptor_pool=None,
-                 message_formatter=None,
-                 print_unknown_fields=False,
-                 force_colon=False):
-  """Convert the message to text format and write it to the out stream.
-
-  Args:
-    message: The Message object to convert to text format.
-    out: A file handle to write the message to.
-    indent: The initial indent level for pretty print.
-    as_utf8: Return unescaped Unicode for non-ASCII characters.
-    as_one_line: Don't introduce newlines between fields.
-    use_short_repeated_primitives: Use short repeated format for primitives.
-    pointy_brackets: If True, use angle brackets instead of curly braces for
-      nesting.
-    use_index_order: If True, print fields of a proto message using the order
-      defined in source code instead of the field number. By default, use the
-      field number order.
-    float_format: If set, use this to specify float field formatting
-      (per the "Format Specification Mini-Language"); otherwise, shortest
-      float that has same value in wire will be printed. Also affect double
-      field if double_format is not set but float_format is set.
-    double_format: If set, use this to specify double field formatting
-      (per the "Format Specification Mini-Language"); if it is not set but
-      float_format is set, use float_format. Otherwise, str() is used.
-    use_field_number: If True, print field numbers instead of names.
-    descriptor_pool: A DescriptorPool used to resolve Any types.
-    message_formatter: A function(message, indent, as_one_line): unicode|None
-      to custom format selected sub-messages (usually based on message type).
-      Use to pretty print parts of the protobuf for easier diffing.
-    print_unknown_fields: If True, unknown fields will be printed.
-    force_colon: If set, a colon will be added after the field name even if
-      the field is a proto message.
-  """
-  printer = _Printer(
-      out=out, indent=indent, as_utf8=as_utf8,
-      as_one_line=as_one_line,
-      use_short_repeated_primitives=use_short_repeated_primitives,
-      pointy_brackets=pointy_brackets,
-      use_index_order=use_index_order,
-      float_format=float_format,
-      double_format=double_format,
-      use_field_number=use_field_number,
-      descriptor_pool=descriptor_pool,
-      message_formatter=message_formatter,
-      print_unknown_fields=print_unknown_fields,
-      force_colon=force_colon)
-  printer.PrintMessage(message)
-
-
-def PrintField(field,
-               value,
-               out,
-               indent=0,
-               as_utf8=False,
-               as_one_line=False,
-               use_short_repeated_primitives=False,
-               pointy_brackets=False,
-               use_index_order=False,
-               float_format=None,
-               double_format=None,
-               message_formatter=None,
-               print_unknown_fields=False,
-               force_colon=False):
-  """Print a single field name/value pair."""
-  printer = _Printer(out, indent, as_utf8, as_one_line,
-                     use_short_repeated_primitives, pointy_brackets,
-                     use_index_order, float_format, double_format,
-                     message_formatter=message_formatter,
-                     print_unknown_fields=print_unknown_fields,
-                     force_colon=force_colon)
-  printer.PrintField(field, value)
-
-
-def PrintFieldValue(field,
-                    value,
-                    out,
-                    indent=0,
-                    as_utf8=False,
-                    as_one_line=False,
-                    use_short_repeated_primitives=False,
-                    pointy_brackets=False,
-                    use_index_order=False,
-                    float_format=None,
-                    double_format=None,
-                    message_formatter=None,
-                    print_unknown_fields=False,
-                    force_colon=False):
-  """Print a single field value (not including name)."""
-  printer = _Printer(out, indent, as_utf8, as_one_line,
-                     use_short_repeated_primitives, pointy_brackets,
-                     use_index_order, float_format, double_format,
-                     message_formatter=message_formatter,
-                     print_unknown_fields=print_unknown_fields,
-                     force_colon=force_colon)
-  printer.PrintFieldValue(field, value)
-
-
-def _BuildMessageFromTypeName(type_name, descriptor_pool):
-  """Returns a protobuf message instance.
-
-  Args:
-    type_name: Fully-qualified protobuf  message type name string.
-    descriptor_pool: DescriptorPool instance.
-
-  Returns:
-    A Message instance of type matching type_name, or None if the a Descriptor
-    wasn't found matching type_name.
-  """
-  # pylint: disable=g-import-not-at-top
-  if descriptor_pool is None:
-    from google.protobuf import descriptor_pool as pool_mod
-    descriptor_pool = pool_mod.Default()
-  from google.protobuf import symbol_database
-  database = symbol_database.Default()
-  try:
-    message_descriptor = descriptor_pool.FindMessageTypeByName(type_name)
-  except KeyError:
-    return None
-  message_type = database.GetPrototype(message_descriptor)
-  return message_type()
-
-
-# These values must match WireType enum in google/protobuf/wire_format.h.
-WIRETYPE_LENGTH_DELIMITED = 2
-WIRETYPE_START_GROUP = 3
-
-
-class _Printer(object):
-  """Text format printer for protocol message."""
-
-  def __init__(
-      self,
-      out,
-      indent=0,
-      as_utf8=False,
-      as_one_line=False,
-      use_short_repeated_primitives=False,
-      pointy_brackets=False,
-      use_index_order=False,
-      float_format=None,
-      double_format=None,
-      use_field_number=False,
-      descriptor_pool=None,
-      message_formatter=None,
-      print_unknown_fields=False,
-      force_colon=False):
-    """Initialize the Printer.
-
-    Double values can be formatted compactly with 15 digits of precision
-    (which is the most that IEEE 754 "double" can guarantee) using
-    double_format='.15g'. To ensure that converting to text and back to a proto
-    will result in an identical value, double_format='.17g' should be used.
-
-    Args:
-      out: To record the text format result.
-      indent: The initial indent level for pretty print.
-      as_utf8: Return unescaped Unicode for non-ASCII characters.
-      as_one_line: Don't introduce newlines between fields.
-      use_short_repeated_primitives: Use short repeated format for primitives.
-      pointy_brackets: If True, use angle brackets instead of curly braces for
-        nesting.
-      use_index_order: If True, print fields of a proto message using the order
-        defined in source code instead of the field number. By default, use the
-        field number order.
-      float_format: If set, use this to specify float field formatting
-        (per the "Format Specification Mini-Language"); otherwise, shortest
-        float that has same value in wire will be printed. Also affect double
-        field if double_format is not set but float_format is set.
-      double_format: If set, use this to specify double field formatting
-        (per the "Format Specification Mini-Language"); if it is not set but
-        float_format is set, use float_format. Otherwise, str() is used.
-      use_field_number: If True, print field numbers instead of names.
-      descriptor_pool: A DescriptorPool used to resolve Any types.
-      message_formatter: A function(message, indent, as_one_line): unicode|None
-        to custom format selected sub-messages (usually based on message type).
-        Use to pretty print parts of the protobuf for easier diffing.
-      print_unknown_fields: If True, unknown fields will be printed.
-      force_colon: If set, a colon will be added after the field name even if
-        the field is a proto message.
-    """
-    self.out = out
-    self.indent = indent
-    self.as_utf8 = as_utf8
-    self.as_one_line = as_one_line
-    self.use_short_repeated_primitives = use_short_repeated_primitives
-    self.pointy_brackets = pointy_brackets
-    self.use_index_order = use_index_order
-    self.float_format = float_format
-    if double_format is not None:
-      self.double_format = double_format
-    else:
-      self.double_format = float_format
-    self.use_field_number = use_field_number
-    self.descriptor_pool = descriptor_pool
-    self.message_formatter = message_formatter
-    self.print_unknown_fields = print_unknown_fields
-    self.force_colon = force_colon
-
-  def _TryPrintAsAnyMessage(self, message):
-    """Serializes if message is a google.protobuf.Any field."""
-    if '/' not in message.type_url:
-      return False
-    packed_message = _BuildMessageFromTypeName(message.TypeName(),
-                                               self.descriptor_pool)
-    if packed_message:
-      packed_message.MergeFromString(message.value)
-      colon = ':' if self.force_colon else ''
-      self.out.write('%s[%s]%s ' % (self.indent * ' ', message.type_url, colon))
-      self._PrintMessageFieldValue(packed_message)
-      self.out.write(' ' if self.as_one_line else '\n')
-      return True
-    else:
-      return False
-
-  def _TryCustomFormatMessage(self, message):
-    formatted = self.message_formatter(message, self.indent, self.as_one_line)
-    if formatted is None:
-      return False
-
-    out = self.out
-    out.write(' ' * self.indent)
-    out.write(formatted)
-    out.write(' ' if self.as_one_line else '\n')
-    return True
-
-  def PrintMessage(self, message):
-    """Convert protobuf message to text format.
-
-    Args:
-      message: The protocol buffers message.
-    """
-    if self.message_formatter and self._TryCustomFormatMessage(message):
-      return
-    if (message.DESCRIPTOR.full_name == _ANY_FULL_TYPE_NAME and
-        self._TryPrintAsAnyMessage(message)):
-      return
-    fields = message.ListFields()
-    if self.use_index_order:
-      fields.sort(
-          key=lambda x: x[0].number if x[0].is_extension else x[0].index)
-    for field, value in fields:
-      if _IsMapEntry(field):
-        for key in sorted(value):
-          # This is slow for maps with submessage entries because it copies the
-          # entire tree.  Unfortunately this would take significant refactoring
-          # of this file to work around.
-          #
-          # TODO(haberman): refactor and optimize if this becomes an issue.
-          entry_submsg = value.GetEntryClass()(key=key, value=value[key])
-          self.PrintField(field, entry_submsg)
-      elif field.label == descriptor.FieldDescriptor.LABEL_REPEATED:
-        if (self.use_short_repeated_primitives
-            and field.cpp_type != descriptor.FieldDescriptor.CPPTYPE_MESSAGE
-            and field.cpp_type != descriptor.FieldDescriptor.CPPTYPE_STRING):
-          self._PrintShortRepeatedPrimitivesValue(field, value)
-        else:
-          for element in value:
-            self.PrintField(field, element)
-      else:
-        self.PrintField(field, value)
-
-    if self.print_unknown_fields:
-      self._PrintUnknownFields(unknown_fields.UnknownFieldSet(message))
-
-  def _PrintUnknownFields(self, unknown_field_set):
-    """Print unknown fields."""
-    out = self.out
-    for field in unknown_field_set:
-      out.write(' ' * self.indent)
-      out.write(str(field.field_number))
-      if field.wire_type == WIRETYPE_START_GROUP:
-        if self.as_one_line:
-          out.write(' { ')
-        else:
-          out.write(' {\n')
-          self.indent += 2
-
-        self._PrintUnknownFields(field.data)
-
-        if self.as_one_line:
-          out.write('} ')
-        else:
-          self.indent -= 2
-          out.write(' ' * self.indent + '}\n')
-      elif field.wire_type == WIRETYPE_LENGTH_DELIMITED:
-        try:
-          # If this field is parseable as a Message, it is probably
-          # an embedded message.
-          # pylint: disable=protected-access
-          (embedded_unknown_message, pos) = decoder._DecodeUnknownFieldSet(
-              memoryview(field.data), 0, len(field.data))
-        except Exception:    # pylint: disable=broad-except
-          pos = 0
-
-        if pos == len(field.data):
-          if self.as_one_line:
-            out.write(' { ')
-          else:
-            out.write(' {\n')
-            self.indent += 2
-
-          self._PrintUnknownFields(embedded_unknown_message)
-
-          if self.as_one_line:
-            out.write('} ')
-          else:
-            self.indent -= 2
-            out.write(' ' * self.indent + '}\n')
-        else:
-          # A string or bytes field. self.as_utf8 may not work.
-          out.write(': \"')
-          out.write(text_encoding.CEscape(field.data, False))
-          out.write('\" ' if self.as_one_line else '\"\n')
-      else:
-        # varint, fixed32, fixed64
-        out.write(': ')
-        out.write(str(field.data))
-        out.write(' ' if self.as_one_line else '\n')
-
-  def _PrintFieldName(self, field):
-    """Print field name."""
-    out = self.out
-    out.write(' ' * self.indent)
-    if self.use_field_number:
-      out.write(str(field.number))
-    else:
-      if field.is_extension:
-        out.write('[')
-        if (field.containing_type.GetOptions().message_set_wire_format and
-            field.type == descriptor.FieldDescriptor.TYPE_MESSAGE and
-            field.label == descriptor.FieldDescriptor.LABEL_OPTIONAL):
-          out.write(field.message_type.full_name)
-        else:
-          out.write(field.full_name)
-        out.write(']')
-      elif field.type == descriptor.FieldDescriptor.TYPE_GROUP:
-        # For groups, use the capitalized name.
-        out.write(field.message_type.name)
-      else:
-          out.write(field.name)
-
-    if (self.force_colon or
-        field.cpp_type != descriptor.FieldDescriptor.CPPTYPE_MESSAGE):
-      # The colon is optional in this case, but our cross-language golden files
-      # don't include it. Here, the colon is only included if force_colon is
-      # set to True
-      out.write(':')
-
-  def PrintField(self, field, value):
-    """Print a single field name/value pair."""
-    self._PrintFieldName(field)
-    self.out.write(' ')
-    self.PrintFieldValue(field, value)
-    self.out.write(' ' if self.as_one_line else '\n')
-
-  def _PrintShortRepeatedPrimitivesValue(self, field, value):
-    """"Prints short repeated primitives value."""
-    # Note: this is called only when value has at least one element.
-    self._PrintFieldName(field)
-    self.out.write(' [')
-    for i in range(len(value) - 1):
-      self.PrintFieldValue(field, value[i])
-      self.out.write(', ')
-    self.PrintFieldValue(field, value[-1])
-    self.out.write(']')
-    self.out.write(' ' if self.as_one_line else '\n')
-
-  def _PrintMessageFieldValue(self, value):
-    if self.pointy_brackets:
-      openb = '<'
-      closeb = '>'
-    else:
-      openb = '{'
-      closeb = '}'
-
-    if self.as_one_line:
-      self.out.write('%s ' % openb)
-      self.PrintMessage(value)
-      self.out.write(closeb)
-    else:
-      self.out.write('%s\n' % openb)
-      self.indent += 2
-      self.PrintMessage(value)
-      self.indent -= 2
-      self.out.write(' ' * self.indent + closeb)
-
-  def PrintFieldValue(self, field, value):
-    """Print a single field value (not including name).
-
-    For repeated fields, the value should be a single element.
-
-    Args:
-      field: The descriptor of the field to be printed.
-      value: The value of the field.
-    """
-    out = self.out
-    if field.cpp_type == descriptor.FieldDescriptor.CPPTYPE_MESSAGE:
-      self._PrintMessageFieldValue(value)
-    elif field.cpp_type == descriptor.FieldDescriptor.CPPTYPE_ENUM:
-      enum_value = field.enum_type.values_by_number.get(value, None)
-      if enum_value is not None:
-        out.write(enum_value.name)
-      else:
-        out.write(str(value))
-    elif field.cpp_type == descriptor.FieldDescriptor.CPPTYPE_STRING:
-      out.write('\"')
-      if isinstance(value, str) and not self.as_utf8:
-        out_value = value.encode('utf-8')
-      else:
-        out_value = value
-      if field.type == descriptor.FieldDescriptor.TYPE_BYTES:
-        # We always need to escape all binary data in TYPE_BYTES fields.
-        out_as_utf8 = False
-      else:
-        out_as_utf8 = self.as_utf8
-      out.write(text_encoding.CEscape(out_value, out_as_utf8))
-      out.write('\"')
-    elif field.cpp_type == descriptor.FieldDescriptor.CPPTYPE_BOOL:
-      if value:
-        out.write('true')
-      else:
-        out.write('false')
-    elif field.cpp_type == descriptor.FieldDescriptor.CPPTYPE_FLOAT:
-      if self.float_format is not None:
-        out.write('{1:{0}}'.format(self.float_format, value))
-      else:
-        if math.isnan(value):
-          out.write(str(value))
-        else:
-          out.write(str(type_checkers.ToShortestFloat(value)))
-    elif (field.cpp_type == descriptor.FieldDescriptor.CPPTYPE_DOUBLE and
-          self.double_format is not None):
-      out.write('{1:{0}}'.format(self.double_format, value))
-    else:
-      out.write(str(value))
-
-
-def Parse(text,
-          message,
-          allow_unknown_extension=False,
-          allow_field_number=False,
-          descriptor_pool=None,
-          allow_unknown_field=False):
-  """Parses a text representation of a protocol message into a message.
-
-  NOTE: for historical reasons this function does not clear the input
-  message. This is different from what the binary msg.ParseFrom(...) does.
-  If text contains a field already set in message, the value is appended if the
-  field is repeated. Otherwise, an error is raised.
-
-  Example::
-
-    a = MyProto()
-    a.repeated_field.append('test')
-    b = MyProto()
-
-    # Repeated fields are combined
-    text_format.Parse(repr(a), b)
-    text_format.Parse(repr(a), b) # repeated_field contains ["test", "test"]
-
-    # Non-repeated fields cannot be overwritten
-    a.singular_field = 1
-    b.singular_field = 2
-    text_format.Parse(repr(a), b) # ParseError
-
-    # Binary version:
-    b.ParseFromString(a.SerializeToString()) # repeated_field is now "test"
-
-  Caller is responsible for clearing the message as needed.
-
-  Args:
-    text (str): Message text representation.
-    message (Message): A protocol buffer message to merge into.
-    allow_unknown_extension: if True, skip over missing extensions and keep
-      parsing
-    allow_field_number: if True, both field number and field name are allowed.
-    descriptor_pool (DescriptorPool): Descriptor pool used to resolve Any types.
-    allow_unknown_field: if True, skip over unknown field and keep
-      parsing. Avoid to use this option if possible. It may hide some
-      errors (e.g. spelling error on field name)
-
-  Returns:
-    Message: The same message passed as argument.
-
-  Raises:
-    ParseError: On text parsing problems.
-  """
-  return ParseLines(text.split(b'\n' if isinstance(text, bytes) else u'\n'),
-                    message,
-                    allow_unknown_extension,
-                    allow_field_number,
-                    descriptor_pool=descriptor_pool,
-                    allow_unknown_field=allow_unknown_field)
-
-
-def Merge(text,
-          message,
-          allow_unknown_extension=False,
-          allow_field_number=False,
-          descriptor_pool=None,
-          allow_unknown_field=False):
-  """Parses a text representation of a protocol message into a message.
-
-  Like Parse(), but allows repeated values for a non-repeated field, and uses
-  the last one. This means any non-repeated, top-level fields specified in text
-  replace those in the message.
-
-  Args:
-    text (str): Message text representation.
-    message (Message): A protocol buffer message to merge into.
-    allow_unknown_extension: if True, skip over missing extensions and keep
-      parsing
-    allow_field_number: if True, both field number and field name are allowed.
-    descriptor_pool (DescriptorPool): Descriptor pool used to resolve Any types.
-    allow_unknown_field: if True, skip over unknown field and keep
-      parsing. Avoid to use this option if possible. It may hide some
-      errors (e.g. spelling error on field name)
-
-  Returns:
-    Message: The same message passed as argument.
-
-  Raises:
-    ParseError: On text parsing problems.
-  """
-  return MergeLines(
-      text.split(b'\n' if isinstance(text, bytes) else u'\n'),
-      message,
-      allow_unknown_extension,
-      allow_field_number,
-      descriptor_pool=descriptor_pool,
-      allow_unknown_field=allow_unknown_field)
-
-
-def ParseLines(lines,
-               message,
-               allow_unknown_extension=False,
-               allow_field_number=False,
-               descriptor_pool=None,
-               allow_unknown_field=False):
-  """Parses a text representation of a protocol message into a message.
-
-  See Parse() for caveats.
-
-  Args:
-    lines: An iterable of lines of a message's text representation.
-    message: A protocol buffer message to merge into.
-    allow_unknown_extension: if True, skip over missing extensions and keep
-      parsing
-    allow_field_number: if True, both field number and field name are allowed.
-    descriptor_pool: A DescriptorPool used to resolve Any types.
-    allow_unknown_field: if True, skip over unknown field and keep
-      parsing. Avoid to use this option if possible. It may hide some
-      errors (e.g. spelling error on field name)
-
-  Returns:
-    The same message passed as argument.
-
-  Raises:
-    ParseError: On text parsing problems.
-  """
-  parser = _Parser(allow_unknown_extension,
-                   allow_field_number,
-                   descriptor_pool=descriptor_pool,
-                   allow_unknown_field=allow_unknown_field)
-  return parser.ParseLines(lines, message)
-
-
-def MergeLines(lines,
-               message,
-               allow_unknown_extension=False,
-               allow_field_number=False,
-               descriptor_pool=None,
-               allow_unknown_field=False):
-  """Parses a text representation of a protocol message into a message.
-
-  See Merge() for more details.
-
-  Args:
-    lines: An iterable of lines of a message's text representation.
-    message: A protocol buffer message to merge into.
-    allow_unknown_extension: if True, skip over missing extensions and keep
-      parsing
-    allow_field_number: if True, both field number and field name are allowed.
-    descriptor_pool: A DescriptorPool used to resolve Any types.
-    allow_unknown_field: if True, skip over unknown field and keep
-      parsing. Avoid to use this option if possible. It may hide some
-      errors (e.g. spelling error on field name)
-
-  Returns:
-    The same message passed as argument.
-
-  Raises:
-    ParseError: On text parsing problems.
-  """
-  parser = _Parser(allow_unknown_extension,
-                   allow_field_number,
-                   descriptor_pool=descriptor_pool,
-                   allow_unknown_field=allow_unknown_field)
-  return parser.MergeLines(lines, message)
-
-
-class _Parser(object):
-  """Text format parser for protocol message."""
-
-  def __init__(self,
-               allow_unknown_extension=False,
-               allow_field_number=False,
-               descriptor_pool=None,
-               allow_unknown_field=False):
-    self.allow_unknown_extension = allow_unknown_extension
-    self.allow_field_number = allow_field_number
-    self.descriptor_pool = descriptor_pool
-    self.allow_unknown_field = allow_unknown_field
-
-  def ParseLines(self, lines, message):
-    """Parses a text representation of a protocol message into a message."""
-    self._allow_multiple_scalars = False
-    self._ParseOrMerge(lines, message)
-    return message
-
-  def MergeLines(self, lines, message):
-    """Merges a text representation of a protocol message into a message."""
-    self._allow_multiple_scalars = True
-    self._ParseOrMerge(lines, message)
-    return message
-
-  def _ParseOrMerge(self, lines, message):
-    """Converts a text representation of a protocol message into a message.
-
-    Args:
-      lines: Lines of a message's text representation.
-      message: A protocol buffer message to merge into.
-
-    Raises:
-      ParseError: On text parsing problems.
-    """
-    # Tokenize expects native str lines.
-    str_lines = (
-        line if isinstance(line, str) else line.decode('utf-8')
-        for line in lines)
-    tokenizer = Tokenizer(str_lines)
-    while not tokenizer.AtEnd():
-      self._MergeField(tokenizer, message)
-
-  def _MergeField(self, tokenizer, message):
-    """Merges a single protocol message field into a message.
-
-    Args:
-      tokenizer: A tokenizer to parse the field name and values.
-      message: A protocol message to record the data.
-
-    Raises:
-      ParseError: In case of text parsing problems.
-    """
-    message_descriptor = message.DESCRIPTOR
-    if (message_descriptor.full_name == _ANY_FULL_TYPE_NAME and
-        tokenizer.TryConsume('[')):
-      type_url_prefix, packed_type_name = self._ConsumeAnyTypeUrl(tokenizer)
-      tokenizer.Consume(']')
-      tokenizer.TryConsume(':')
-      if tokenizer.TryConsume('<'):
-        expanded_any_end_token = '>'
-      else:
-        tokenizer.Consume('{')
-        expanded_any_end_token = '}'
-      expanded_any_sub_message = _BuildMessageFromTypeName(packed_type_name,
-                                                           self.descriptor_pool)
-      # Direct comparison with None is used instead of implicit bool conversion
-      # to avoid false positives with falsy initial values, e.g. for
-      # google.protobuf.ListValue.
-      if expanded_any_sub_message is None:
-        raise ParseError('Type %s not found in descriptor pool' %
-                         packed_type_name)
-      while not tokenizer.TryConsume(expanded_any_end_token):
-        if tokenizer.AtEnd():
-          raise tokenizer.ParseErrorPreviousToken('Expected "%s".' %
-                                                  (expanded_any_end_token,))
-        self._MergeField(tokenizer, expanded_any_sub_message)
-      deterministic = False
-
-      message.Pack(expanded_any_sub_message,
-                   type_url_prefix=type_url_prefix,
-                   deterministic=deterministic)
-      return
-
-    if tokenizer.TryConsume('['):
-      name = [tokenizer.ConsumeIdentifier()]
-      while tokenizer.TryConsume('.'):
-        name.append(tokenizer.ConsumeIdentifier())
-      name = '.'.join(name)
-
-      if not message_descriptor.is_extendable:
-        raise tokenizer.ParseErrorPreviousToken(
-            'Message type "%s" does not have extensions.' %
-            message_descriptor.full_name)
-      # pylint: disable=protected-access
-      field = message.Extensions._FindExtensionByName(name)
-      # pylint: enable=protected-access
-
-
-      if not field:
-        if self.allow_unknown_extension:
-          field = None
-        else:
-          raise tokenizer.ParseErrorPreviousToken(
-              'Extension "%s" not registered. '
-              'Did you import the _pb2 module which defines it? '
-              'If you are trying to place the extension in the MessageSet '
-              'field of another message that is in an Any or MessageSet field, '
-              'that message\'s _pb2 module must be imported as well' % name)
-      elif message_descriptor != field.containing_type:
-        raise tokenizer.ParseErrorPreviousToken(
-            'Extension "%s" does not extend message type "%s".' %
-            (name, message_descriptor.full_name))
-
-      tokenizer.Consume(']')
-
-    else:
-      name = tokenizer.ConsumeIdentifierOrNumber()
-      if self.allow_field_number and name.isdigit():
-        number = ParseInteger(name, True, True)
-        field = message_descriptor.fields_by_number.get(number, None)
-        if not field and message_descriptor.is_extendable:
-          field = message.Extensions._FindExtensionByNumber(number)
-      else:
-        field = message_descriptor.fields_by_name.get(name, None)
-
-        # Group names are expected to be capitalized as they appear in the
-        # .proto file, which actually matches their type names, not their field
-        # names.
-        if not field:
-          field = message_descriptor.fields_by_name.get(name.lower(), None)
-          if field and field.type != descriptor.FieldDescriptor.TYPE_GROUP:
-            field = None
-
-        if (field and field.type == descriptor.FieldDescriptor.TYPE_GROUP and
-            field.message_type.name != name):
-          field = None
-
-      if not field and not self.allow_unknown_field:
-        raise tokenizer.ParseErrorPreviousToken(
-            'Message type "%s" has no field named "%s".' %
-            (message_descriptor.full_name, name))
-
-    if field:
-      if not self._allow_multiple_scalars and field.containing_oneof:
-        # Check if there's a different field set in this oneof.
-        # Note that we ignore the case if the same field was set before, and we
-        # apply _allow_multiple_scalars to non-scalar fields as well.
-        which_oneof = message.WhichOneof(field.containing_oneof.name)
-        if which_oneof is not None and which_oneof != field.name:
-          raise tokenizer.ParseErrorPreviousToken(
-              'Field "%s" is specified along with field "%s", another member '
-              'of oneof "%s" for message type "%s".' %
-              (field.name, which_oneof, field.containing_oneof.name,
-               message_descriptor.full_name))
-
-      if field.cpp_type == descriptor.FieldDescriptor.CPPTYPE_MESSAGE:
-        tokenizer.TryConsume(':')
-        merger = self._MergeMessageField
-      else:
-        tokenizer.Consume(':')
-        merger = self._MergeScalarField
-
-      if (field.label == descriptor.FieldDescriptor.LABEL_REPEATED and
-          tokenizer.TryConsume('[')):
-        # Short repeated format, e.g. "foo: [1, 2, 3]"
-        if not tokenizer.TryConsume(']'):
-          while True:
-            merger(tokenizer, message, field)
-            if tokenizer.TryConsume(']'):
-              break
-            tokenizer.Consume(',')
-
-      else:
-        merger(tokenizer, message, field)
-
-    else:  # Proto field is unknown.
-      assert (self.allow_unknown_extension or self.allow_unknown_field)
-      _SkipFieldContents(tokenizer)
-
-    # For historical reasons, fields may optionally be separated by commas or
-    # semicolons.
-    if not tokenizer.TryConsume(','):
-      tokenizer.TryConsume(';')
-
-
-  def _ConsumeAnyTypeUrl(self, tokenizer):
-    """Consumes a google.protobuf.Any type URL and returns the type name."""
-    # Consume "type.googleapis.com/".
-    prefix = [tokenizer.ConsumeIdentifier()]
-    tokenizer.Consume('.')
-    prefix.append(tokenizer.ConsumeIdentifier())
-    tokenizer.Consume('.')
-    prefix.append(tokenizer.ConsumeIdentifier())
-    tokenizer.Consume('/')
-    # Consume the fully-qualified type name.
-    name = [tokenizer.ConsumeIdentifier()]
-    while tokenizer.TryConsume('.'):
-      name.append(tokenizer.ConsumeIdentifier())
-    return '.'.join(prefix), '.'.join(name)
-
-  def _MergeMessageField(self, tokenizer, message, field):
-    """Merges a single scalar field into a message.
-
-    Args:
-      tokenizer: A tokenizer to parse the field value.
-      message: The message of which field is a member.
-      field: The descriptor of the field to be merged.
-
-    Raises:
-      ParseError: In case of text parsing problems.
-    """
-    is_map_entry = _IsMapEntry(field)
-
-    if tokenizer.TryConsume('<'):
-      end_token = '>'
-    else:
-      tokenizer.Consume('{')
-      end_token = '}'
-
-    if field.label == descriptor.FieldDescriptor.LABEL_REPEATED:
-      if field.is_extension:
-        sub_message = message.Extensions[field].add()
-      elif is_map_entry:
-        sub_message = getattr(message, field.name).GetEntryClass()()
-      else:
-        sub_message = getattr(message, field.name).add()
-    else:
-      if field.is_extension:
-        if (not self._allow_multiple_scalars and
-            message.HasExtension(field)):
-          raise tokenizer.ParseErrorPreviousToken(
-              'Message type "%s" should not have multiple "%s" extensions.' %
-              (message.DESCRIPTOR.full_name, field.full_name))
-        sub_message = message.Extensions[field]
-      else:
-        # Also apply _allow_multiple_scalars to message field.
-        # TODO(jieluo): Change to _allow_singular_overwrites.
-        if (not self._allow_multiple_scalars and
-            message.HasField(field.name)):
-          raise tokenizer.ParseErrorPreviousToken(
-              'Message type "%s" should not have multiple "%s" fields.' %
-              (message.DESCRIPTOR.full_name, field.name))
-        sub_message = getattr(message, field.name)
-      sub_message.SetInParent()
-
-    while not tokenizer.TryConsume(end_token):
-      if tokenizer.AtEnd():
-        raise tokenizer.ParseErrorPreviousToken('Expected "%s".' % (end_token,))
-      self._MergeField(tokenizer, sub_message)
-
-    if is_map_entry:
-      value_cpptype = field.message_type.fields_by_name['value'].cpp_type
-      if value_cpptype == descriptor.FieldDescriptor.CPPTYPE_MESSAGE:
-        value = getattr(message, field.name)[sub_message.key]
-        value.CopyFrom(sub_message.value)
-      else:
-        getattr(message, field.name)[sub_message.key] = sub_message.value
-
-  @staticmethod
-  def _IsProto3Syntax(message):
-    message_descriptor = message.DESCRIPTOR
-    return (hasattr(message_descriptor, 'syntax') and
-            message_descriptor.syntax == 'proto3')
-
-  def _MergeScalarField(self, tokenizer, message, field):
-    """Merges a single scalar field into a message.
-
-    Args:
-      tokenizer: A tokenizer to parse the field value.
-      message: A protocol message to record the data.
-      field: The descriptor of the field to be merged.
-
-    Raises:
-      ParseError: In case of text parsing problems.
-      RuntimeError: On runtime errors.
-    """
-    _ = self.allow_unknown_extension
-    value = None
-
-    if field.type in (descriptor.FieldDescriptor.TYPE_INT32,
-                      descriptor.FieldDescriptor.TYPE_SINT32,
-                      descriptor.FieldDescriptor.TYPE_SFIXED32):
-      value = _ConsumeInt32(tokenizer)
-    elif field.type in (descriptor.FieldDescriptor.TYPE_INT64,
-                        descriptor.FieldDescriptor.TYPE_SINT64,
-                        descriptor.FieldDescriptor.TYPE_SFIXED64):
-      value = _ConsumeInt64(tokenizer)
-    elif field.type in (descriptor.FieldDescriptor.TYPE_UINT32,
-                        descriptor.FieldDescriptor.TYPE_FIXED32):
-      value = _ConsumeUint32(tokenizer)
-    elif field.type in (descriptor.FieldDescriptor.TYPE_UINT64,
-                        descriptor.FieldDescriptor.TYPE_FIXED64):
-      value = _ConsumeUint64(tokenizer)
-    elif field.type in (descriptor.FieldDescriptor.TYPE_FLOAT,
-                        descriptor.FieldDescriptor.TYPE_DOUBLE):
-      value = tokenizer.ConsumeFloat()
-    elif field.type == descriptor.FieldDescriptor.TYPE_BOOL:
-      value = tokenizer.ConsumeBool()
-    elif field.type == descriptor.FieldDescriptor.TYPE_STRING:
-      value = tokenizer.ConsumeString()
-    elif field.type == descriptor.FieldDescriptor.TYPE_BYTES:
-      value = tokenizer.ConsumeByteString()
-    elif field.type == descriptor.FieldDescriptor.TYPE_ENUM:
-      value = tokenizer.ConsumeEnum(field)
-    else:
-      raise RuntimeError('Unknown field type %d' % field.type)
-
-    if field.label == descriptor.FieldDescriptor.LABEL_REPEATED:
-      if field.is_extension:
-        message.Extensions[field].append(value)
-      else:
-        getattr(message, field.name).append(value)
-    else:
-      if field.is_extension:
-        if (not self._allow_multiple_scalars and
-            not self._IsProto3Syntax(message) and
-            message.HasExtension(field)):
-          raise tokenizer.ParseErrorPreviousToken(
-              'Message type "%s" should not have multiple "%s" extensions.' %
-              (message.DESCRIPTOR.full_name, field.full_name))
-        else:
-          message.Extensions[field] = value
-      else:
-        duplicate_error = False
-        if not self._allow_multiple_scalars:
-          if self._IsProto3Syntax(message):
-            # Proto3 doesn't represent presence so we try best effort to check
-            # multiple scalars by compare to default values.
-            duplicate_error = bool(getattr(message, field.name))
-          else:
-            duplicate_error = message.HasField(field.name)
-
-        if duplicate_error:
-          raise tokenizer.ParseErrorPreviousToken(
-              'Message type "%s" should not have multiple "%s" fields.' %
-              (message.DESCRIPTOR.full_name, field.name))
-        else:
-          setattr(message, field.name, value)
-
-
-def _SkipFieldContents(tokenizer):
-  """Skips over contents (value or message) of a field.
-
-  Args:
-    tokenizer: A tokenizer to parse the field name and values.
-  """
-  # Try to guess the type of this field.
-  # If this field is not a message, there should be a ":" between the
-  # field name and the field value and also the field value should not
-  # start with "{" or "<" which indicates the beginning of a message body.
-  # If there is no ":" or there is a "{" or "<" after ":", this field has
-  # to be a message or the input is ill-formed.
-  if tokenizer.TryConsume(
-      ':') and not tokenizer.LookingAt('{') and not tokenizer.LookingAt('<'):
-    if tokenizer.LookingAt('['):
-      _SkipRepeatedFieldValue(tokenizer)
-    else:
-      _SkipFieldValue(tokenizer)
-  else:
-    _SkipFieldMessage(tokenizer)
-
-
-def _SkipField(tokenizer):
-  """Skips over a complete field (name and value/message).
-
-  Args:
-    tokenizer: A tokenizer to parse the field name and values.
-  """
-  if tokenizer.TryConsume('['):
-    # Consume extension name.
-    tokenizer.ConsumeIdentifier()
-    while tokenizer.TryConsume('.'):
-      tokenizer.ConsumeIdentifier()
-    tokenizer.Consume(']')
-  else:
-    tokenizer.ConsumeIdentifierOrNumber()
-
-  _SkipFieldContents(tokenizer)
-
-  # For historical reasons, fields may optionally be separated by commas or
-  # semicolons.
-  if not tokenizer.TryConsume(','):
-    tokenizer.TryConsume(';')
-
-
-def _SkipFieldMessage(tokenizer):
-  """Skips over a field message.
-
-  Args:
-    tokenizer: A tokenizer to parse the field name and values.
-  """
-
-  if tokenizer.TryConsume('<'):
-    delimiter = '>'
-  else:
-    tokenizer.Consume('{')
-    delimiter = '}'
-
-  while not tokenizer.LookingAt('>') and not tokenizer.LookingAt('}'):
-    _SkipField(tokenizer)
-
-  tokenizer.Consume(delimiter)
-
-
-def _SkipFieldValue(tokenizer):
-  """Skips over a field value.
-
-  Args:
-    tokenizer: A tokenizer to parse the field name and values.
-
-  Raises:
-    ParseError: In case an invalid field value is found.
-  """
-  # String/bytes tokens can come in multiple adjacent string literals.
-  # If we can consume one, consume as many as we can.
-  if tokenizer.TryConsumeByteString():
-    while tokenizer.TryConsumeByteString():
-      pass
-    return
-
-  if (not tokenizer.TryConsumeIdentifier() and
-      not _TryConsumeInt64(tokenizer) and not _TryConsumeUint64(tokenizer) and
-      not tokenizer.TryConsumeFloat()):
-    raise ParseError('Invalid field value: ' + tokenizer.token)
-
-
-def _SkipRepeatedFieldValue(tokenizer):
-  """Skips over a repeated field value.
-
-  Args:
-    tokenizer: A tokenizer to parse the field value.
-  """
-  tokenizer.Consume('[')
-  if not tokenizer.LookingAt(']'):
-    _SkipFieldValue(tokenizer)
-    while tokenizer.TryConsume(','):
-      _SkipFieldValue(tokenizer)
-  tokenizer.Consume(']')
-
-
-class Tokenizer(object):
-  """Protocol buffer text representation tokenizer.
-
-  This class handles the lower level string parsing by splitting it into
-  meaningful tokens.
-
-  It was directly ported from the Java protocol buffer API.
-  """
-
-  _WHITESPACE = re.compile(r'\s+')
-  _COMMENT = re.compile(r'(\s*#.*$)', re.MULTILINE)
-  _WHITESPACE_OR_COMMENT = re.compile(r'(\s|(#.*$))+', re.MULTILINE)
-  _TOKEN = re.compile('|'.join([
-      r'[a-zA-Z_][0-9a-zA-Z_+-]*',  # an identifier
-      r'([0-9+-]|(\.[0-9]))[0-9a-zA-Z_.+-]*',  # a number
-  ] + [  # quoted str for each quote mark
-      # Avoid backtracking! https://stackoverflow.com/a/844267
-      r'{qt}[^{qt}\n\\]*((\\.)+[^{qt}\n\\]*)*({qt}|\\?$)'.format(qt=mark)
-      for mark in _QUOTES
-  ]))
-
-  _IDENTIFIER = re.compile(r'[^\d\W]\w*')
-  _IDENTIFIER_OR_NUMBER = re.compile(r'\w+')
-
-  def __init__(self, lines, skip_comments=True):
-    self._position = 0
-    self._line = -1
-    self._column = 0
-    self._token_start = None
-    self.token = ''
-    self._lines = iter(lines)
-    self._current_line = ''
-    self._previous_line = 0
-    self._previous_column = 0
-    self._more_lines = True
-    self._skip_comments = skip_comments
-    self._whitespace_pattern = (skip_comments and self._WHITESPACE_OR_COMMENT
-                                or self._WHITESPACE)
-    self._SkipWhitespace()
-    self.NextToken()
-
-  def LookingAt(self, token):
-    return self.token == token
-
-  def AtEnd(self):
-    """Checks the end of the text was reached.
-
-    Returns:
-      True iff the end was reached.
-    """
-    return not self.token
-
-  def _PopLine(self):
-    while len(self._current_line) <= self._column:
-      try:
-        self._current_line = next(self._lines)
-      except StopIteration:
-        self._current_line = ''
-        self._more_lines = False
-        return
-      else:
-        self._line += 1
-        self._column = 0
-
-  def _SkipWhitespace(self):
-    while True:
-      self._PopLine()
-      match = self._whitespace_pattern.match(self._current_line, self._column)
-      if not match:
-        break
-      length = len(match.group(0))
-      self._column += length
-
-  def TryConsume(self, token):
-    """Tries to consume a given piece of text.
-
-    Args:
-      token: Text to consume.
-
-    Returns:
-      True iff the text was consumed.
-    """
-    if self.token == token:
-      self.NextToken()
-      return True
-    return False
-
-  def Consume(self, token):
-    """Consumes a piece of text.
-
-    Args:
-      token: Text to consume.
-
-    Raises:
-      ParseError: If the text couldn't be consumed.
-    """
-    if not self.TryConsume(token):
-      raise self.ParseError('Expected "%s".' % token)
-
-  def ConsumeComment(self):
-    result = self.token
-    if not self._COMMENT.match(result):
-      raise self.ParseError('Expected comment.')
-    self.NextToken()
-    return result
-
-  def ConsumeCommentOrTrailingComment(self):
-    """Consumes a comment, returns a 2-tuple (trailing bool, comment str)."""
-
-    # Tokenizer initializes _previous_line and _previous_column to 0. As the
-    # tokenizer starts, it looks like there is a previous token on the line.
-    just_started = self._line == 0 and self._column == 0
-
-    before_parsing = self._previous_line
-    comment = self.ConsumeComment()
-
-    # A trailing comment is a comment on the same line than the previous token.
-    trailing = (self._previous_line == before_parsing
-                and not just_started)
-
-    return trailing, comment
-
-  def TryConsumeIdentifier(self):
-    try:
-      self.ConsumeIdentifier()
-      return True
-    except ParseError:
-      return False
-
-  def ConsumeIdentifier(self):
-    """Consumes protocol message field identifier.
-
-    Returns:
-      Identifier string.
-
-    Raises:
-      ParseError: If an identifier couldn't be consumed.
-    """
-    result = self.token
-    if not self._IDENTIFIER.match(result):
-      raise self.ParseError('Expected identifier.')
-    self.NextToken()
-    return result
-
-  def TryConsumeIdentifierOrNumber(self):
-    try:
-      self.ConsumeIdentifierOrNumber()
-      return True
-    except ParseError:
-      return False
-
-  def ConsumeIdentifierOrNumber(self):
-    """Consumes protocol message field identifier.
-
-    Returns:
-      Identifier string.
-
-    Raises:
-      ParseError: If an identifier couldn't be consumed.
-    """
-    result = self.token
-    if not self._IDENTIFIER_OR_NUMBER.match(result):
-      raise self.ParseError('Expected identifier or number, got %s.' % result)
-    self.NextToken()
-    return result
-
-  def TryConsumeInteger(self):
-    try:
-      self.ConsumeInteger()
-      return True
-    except ParseError:
-      return False
-
-  def ConsumeInteger(self):
-    """Consumes an integer number.
-
-    Returns:
-      The integer parsed.
-
-    Raises:
-      ParseError: If an integer couldn't be consumed.
-    """
-    try:
-      result = _ParseAbstractInteger(self.token)
-    except ValueError as e:
-      raise self.ParseError(str(e))
-    self.NextToken()
-    return result
-
-  def TryConsumeFloat(self):
-    try:
-      self.ConsumeFloat()
-      return True
-    except ParseError:
-      return False
-
-  def ConsumeFloat(self):
-    """Consumes an floating point number.
-
-    Returns:
-      The number parsed.
-
-    Raises:
-      ParseError: If a floating point number couldn't be consumed.
-    """
-    try:
-      result = ParseFloat(self.token)
-    except ValueError as e:
-      raise self.ParseError(str(e))
-    self.NextToken()
-    return result
-
-  def ConsumeBool(self):
-    """Consumes a boolean value.
-
-    Returns:
-      The bool parsed.
-
-    Raises:
-      ParseError: If a boolean value couldn't be consumed.
-    """
-    try:
-      result = ParseBool(self.token)
-    except ValueError as e:
-      raise self.ParseError(str(e))
-    self.NextToken()
-    return result
-
-  def TryConsumeByteString(self):
-    try:
-      self.ConsumeByteString()
-      return True
-    except ParseError:
-      return False
-
-  def ConsumeString(self):
-    """Consumes a string value.
-
-    Returns:
-      The string parsed.
-
-    Raises:
-      ParseError: If a string value couldn't be consumed.
-    """
-    the_bytes = self.ConsumeByteString()
-    try:
-      return str(the_bytes, 'utf-8')
-    except UnicodeDecodeError as e:
-      raise self._StringParseError(e)
-
-  def ConsumeByteString(self):
-    """Consumes a byte array value.
-
-    Returns:
-      The array parsed (as a string).
-
-    Raises:
-      ParseError: If a byte array value couldn't be consumed.
-    """
-    the_list = [self._ConsumeSingleByteString()]
-    while self.token and self.token[0] in _QUOTES:
-      the_list.append(self._ConsumeSingleByteString())
-    return b''.join(the_list)
-
-  def _ConsumeSingleByteString(self):
-    """Consume one token of a string literal.
-
-    String literals (whether bytes or text) can come in multiple adjacent
-    tokens which are automatically concatenated, like in C or Python.  This
-    method only consumes one token.
-
-    Returns:
-      The token parsed.
-    Raises:
-      ParseError: When the wrong format data is found.
-    """
-    text = self.token
-    if len(text) < 1 or text[0] not in _QUOTES:
-      raise self.ParseError('Expected string but found: %r' % (text,))
-
-    if len(text) < 2 or text[-1] != text[0]:
-      raise self.ParseError('String missing ending quote: %r' % (text,))
-
-    try:
-      result = text_encoding.CUnescape(text[1:-1])
-    except ValueError as e:
-      raise self.ParseError(str(e))
-    self.NextToken()
-    return result
-
-  def ConsumeEnum(self, field):
-    try:
-      result = ParseEnum(field, self.token)
-    except ValueError as e:
-      raise self.ParseError(str(e))
-    self.NextToken()
-    return result
-
-  def ParseErrorPreviousToken(self, message):
-    """Creates and *returns* a ParseError for the previously read token.
-
-    Args:
-      message: A message to set for the exception.
-
-    Returns:
-      A ParseError instance.
-    """
-    return ParseError(message, self._previous_line + 1,
-                      self._previous_column + 1)
-
-  def ParseError(self, message):
-    """Creates and *returns* a ParseError for the current token."""
-    return ParseError('\'' + self._current_line + '\': ' + message,
-                      self._line + 1, self._column + 1)
-
-  def _StringParseError(self, e):
-    return self.ParseError('Couldn\'t parse string: ' + str(e))
-
-  def NextToken(self):
-    """Reads the next meaningful token."""
-    self._previous_line = self._line
-    self._previous_column = self._column
-
-    self._column += len(self.token)
-    self._SkipWhitespace()
-
-    if not self._more_lines:
-      self.token = ''
-      return
-
-    match = self._TOKEN.match(self._current_line, self._column)
-    if not match and not self._skip_comments:
-      match = self._COMMENT.match(self._current_line, self._column)
-    if match:
-      token = match.group(0)
-      self.token = token
-    else:
-      self.token = self._current_line[self._column]
-
-# Aliased so it can still be accessed by current visibility violators.
-# TODO(dbarnett): Migrate violators to textformat_tokenizer.
-_Tokenizer = Tokenizer  # pylint: disable=invalid-name
-
-
-def _ConsumeInt32(tokenizer):
-  """Consumes a signed 32bit integer number from tokenizer.
-
-  Args:
-    tokenizer: A tokenizer used to parse the number.
-
-  Returns:
-    The integer parsed.
-
-  Raises:
-    ParseError: If a signed 32bit integer couldn't be consumed.
-  """
-  return _ConsumeInteger(tokenizer, is_signed=True, is_long=False)
-
-
-def _ConsumeUint32(tokenizer):
-  """Consumes an unsigned 32bit integer number from tokenizer.
-
-  Args:
-    tokenizer: A tokenizer used to parse the number.
-
-  Returns:
-    The integer parsed.
-
-  Raises:
-    ParseError: If an unsigned 32bit integer couldn't be consumed.
-  """
-  return _ConsumeInteger(tokenizer, is_signed=False, is_long=False)
-
-
-def _TryConsumeInt64(tokenizer):
-  try:
-    _ConsumeInt64(tokenizer)
-    return True
-  except ParseError:
-    return False
-
-
-def _ConsumeInt64(tokenizer):
-  """Consumes a signed 32bit integer number from tokenizer.
-
-  Args:
-    tokenizer: A tokenizer used to parse the number.
-
-  Returns:
-    The integer parsed.
-
-  Raises:
-    ParseError: If a signed 32bit integer couldn't be consumed.
-  """
-  return _ConsumeInteger(tokenizer, is_signed=True, is_long=True)
-
-
-def _TryConsumeUint64(tokenizer):
-  try:
-    _ConsumeUint64(tokenizer)
-    return True
-  except ParseError:
-    return False
-
-
-def _ConsumeUint64(tokenizer):
-  """Consumes an unsigned 64bit integer number from tokenizer.
-
-  Args:
-    tokenizer: A tokenizer used to parse the number.
-
-  Returns:
-    The integer parsed.
-
-  Raises:
-    ParseError: If an unsigned 64bit integer couldn't be consumed.
-  """
-  return _ConsumeInteger(tokenizer, is_signed=False, is_long=True)
-
-
-def _ConsumeInteger(tokenizer, is_signed=False, is_long=False):
-  """Consumes an integer number from tokenizer.
-
-  Args:
-    tokenizer: A tokenizer used to parse the number.
-    is_signed: True if a signed integer must be parsed.
-    is_long: True if a long integer must be parsed.
-
-  Returns:
-    The integer parsed.
-
-  Raises:
-    ParseError: If an integer with given characteristics couldn't be consumed.
-  """
-  try:
-    result = ParseInteger(tokenizer.token, is_signed=is_signed, is_long=is_long)
-  except ValueError as e:
-    raise tokenizer.ParseError(str(e))
-  tokenizer.NextToken()
-  return result
-
-
-def ParseInteger(text, is_signed=False, is_long=False):
-  """Parses an integer.
-
-  Args:
-    text: The text to parse.
-    is_signed: True if a signed integer must be parsed.
-    is_long: True if a long integer must be parsed.
-
-  Returns:
-    The integer value.
-
-  Raises:
-    ValueError: Thrown Iff the text is not a valid integer.
-  """
-  # Do the actual parsing. Exception handling is propagated to caller.
-  result = _ParseAbstractInteger(text)
-
-  # Check if the integer is sane. Exceptions handled by callers.
-  checker = _INTEGER_CHECKERS[2 * int(is_long) + int(is_signed)]
-  checker.CheckValue(result)
-  return result
-
-
-def _ParseAbstractInteger(text):
-  """Parses an integer without checking size/signedness.
-
-  Args:
-    text: The text to parse.
-
-  Returns:
-    The integer value.
-
-  Raises:
-    ValueError: Thrown Iff the text is not a valid integer.
-  """
-  # Do the actual parsing. Exception handling is propagated to caller.
-  orig_text = text
-  c_octal_match = re.match(r'(-?)0(\d+)$', text)
-  if c_octal_match:
-    # Python 3 no longer supports 0755 octal syntax without the 'o', so
-    # we always use the '0o' prefix for multi-digit numbers starting with 0.
-    text = c_octal_match.group(1) + '0o' + c_octal_match.group(2)
-  try:
-    return int(text, 0)
-  except ValueError:
-    raise ValueError('Couldn\'t parse integer: %s' % orig_text)
-
-
-def ParseFloat(text):
-  """Parse a floating point number.
-
-  Args:
-    text: Text to parse.
-
-  Returns:
-    The number parsed.
-
-  Raises:
-    ValueError: If a floating point number couldn't be parsed.
-  """
-  try:
-    # Assume Python compatible syntax.
-    return float(text)
-  except ValueError:
-    # Check alternative spellings.
-    if _FLOAT_INFINITY.match(text):
-      if text[0] == '-':
-        return float('-inf')
-      else:
-        return float('inf')
-    elif _FLOAT_NAN.match(text):
-      return float('nan')
-    else:
-      # assume '1.0f' format
-      try:
-        return float(text.rstrip('f'))
-      except ValueError:
-        raise ValueError('Couldn\'t parse float: %s' % text)
-
-
-def ParseBool(text):
-  """Parse a boolean value.
-
-  Args:
-    text: Text to parse.
-
-  Returns:
-    Boolean values parsed
-
-  Raises:
-    ValueError: If text is not a valid boolean.
-  """
-  if text in ('true', 't', '1', 'True'):
-    return True
-  elif text in ('false', 'f', '0', 'False'):
-    return False
-  else:
-    raise ValueError('Expected "true" or "false".')
-
-
-def ParseEnum(field, value):
-  """Parse an enum value.
-
-  The value can be specified by a number (the enum value), or by
-  a string literal (the enum name).
-
-  Args:
-    field: Enum field descriptor.
-    value: String value.
-
-  Returns:
-    Enum value number.
-
-  Raises:
-    ValueError: If the enum value could not be parsed.
-  """
-  enum_descriptor = field.enum_type
-  try:
-    number = int(value, 0)
-  except ValueError:
-    # Identifier.
-    enum_value = enum_descriptor.values_by_name.get(value, None)
-    if enum_value is None:
-      raise ValueError('Enum type "%s" has no value named %s.' %
-                       (enum_descriptor.full_name, value))
-  else:
-    # Numeric value.
-    if hasattr(field.file, 'syntax'):
-      # Attribute is checked for compatibility.
-      if field.file.syntax == 'proto3':
-        # Proto3 accept numeric unknown enums.
-        return number
-    enum_value = enum_descriptor.values_by_number.get(number, None)
-    if enum_value is None:
-      raise ValueError('Enum type "%s" has no value with number %d.' %
-                       (enum_descriptor.full_name, number))
-  return enum_value.number
diff --git a/libs/protobuf/python/google/protobuf/unknown_fields.py b/libs/protobuf/python/google/protobuf/unknown_fields.py
deleted file mode 100644
index 3bd8286..0000000
--- a/libs/protobuf/python/google/protobuf/unknown_fields.py
+++ /dev/null
@@ -1,120 +0,0 @@
-# Protocol Buffers - Google's data interchange format
-# Copyright 2008 Google Inc.  All rights reserved.
-# https://developers.google.com/protocol-buffers/
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-"""Contains Unknown Fields APIs.
-
-Simple usage example:
-  unknown_field_set = UnknownFieldSet(message)
-  for unknown_field in unknown_field_set:
-    wire_type = unknown_field.wire_type
-    field_number = unknown_field.field_number
-    data = unknown_field.data
-"""
-
-
-from google.protobuf.internal import api_implementation
-
-if api_implementation._c_module is not None:  # pylint: disable=protected-access
-  UnknownFieldSet = api_implementation._c_module.UnknownFieldSet  # pylint: disable=protected-access
-else:
-  from google.protobuf.internal import decoder  # pylint: disable=g-import-not-at-top
-  from google.protobuf.internal import wire_format  # pylint: disable=g-import-not-at-top
-
-  class UnknownField:
-    """A parsed unknown field."""
-
-    # Disallows assignment to other attributes.
-    __slots__ = ['_field_number', '_wire_type', '_data']
-
-    def __init__(self, field_number, wire_type, data):
-      self._field_number = field_number
-      self._wire_type = wire_type
-      self._data = data
-      return
-
-    @property
-    def field_number(self):
-      return self._field_number
-
-    @property
-    def wire_type(self):
-      return self._wire_type
-
-    @property
-    def data(self):
-      return self._data
-
-  class UnknownFieldSet:
-    """UnknownField container."""
-
-    # Disallows assignment to other attributes.
-    __slots__ = ['_values']
-
-    def __init__(self, msg):
-
-      def InternalAdd(field_number, wire_type, data):
-        unknown_field = UnknownField(field_number, wire_type, data)
-        self._values.append(unknown_field)
-
-      self._values = []
-      msg_des = msg.DESCRIPTOR
-      # pylint: disable=protected-access
-      unknown_fields = msg._unknown_fields
-      if (msg_des.has_options and
-          msg_des.GetOptions().message_set_wire_format):
-        local_decoder = decoder.UnknownMessageSetItemDecoder()
-        for _, buffer in unknown_fields:
-          (field_number, data) = local_decoder(memoryview(buffer))
-          InternalAdd(field_number, wire_format.WIRETYPE_LENGTH_DELIMITED, data)
-      else:
-        for tag_bytes, buffer in unknown_fields:
-          # pylint: disable=protected-access
-          (tag, _) = decoder._DecodeVarint(tag_bytes, 0)
-          field_number, wire_type = wire_format.UnpackTag(tag)
-          if field_number == 0:
-            raise RuntimeError('Field number 0 is illegal.')
-          (data, _) = decoder._DecodeUnknownField(
-              memoryview(buffer), 0, wire_type)
-          InternalAdd(field_number, wire_type, data)
-
-    def __getitem__(self, index):
-      size = len(self._values)
-      if index < 0:
-        index += size
-      if index < 0 or index >= size:
-        raise IndexError('index %d out of range'.index)
-
-      return self._values[index]
-
-    def __len__(self):
-      return len(self._values)
-
-    def __iter__(self):
-      return iter(self._values)
diff --git a/libs/protobuf/python/google/protobuf/util/__init__.py b/libs/protobuf/python/google/protobuf/util/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/libs/protobuf/python/mox.py b/libs/protobuf/python/mox.py
deleted file mode 100755
index 9dd8ac7..0000000
--- a/libs/protobuf/python/mox.py
+++ /dev/null
@@ -1,1401 +0,0 @@
-#!/usr/bin/python2.4
-#
-# Copyright 2008 Google Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# This file is used for testing.  The original is at:
-#   http://code.google.com/p/pymox/
-
-"""Mox, an object-mocking framework for Python.
-
-Mox works in the record-replay-verify paradigm.  When you first create
-a mock object, it is in record mode.  You then programmatically set
-the expected behavior of the mock object (what methods are to be
-called on it, with what parameters, what they should return, and in
-what order).
-
-Once you have set up the expected mock behavior, you put it in replay
-mode.  Now the mock responds to method calls just as you told it to.
-If an unexpected method (or an expected method with unexpected
-parameters) is called, then an exception will be raised.
-
-Once you are done interacting with the mock, you need to verify that
-all the expected interactions occurred.  (Maybe your code exited
-prematurely without calling some cleanup method!)  The verify phase
-ensures that every expected method was called; otherwise, an exception
-will be raised.
-
-Suggested usage / workflow:
-
-  # Create Mox factory
-  my_mox = Mox()
-
-  # Create a mock data access object
-  mock_dao = my_mox.CreateMock(DAOClass)
-
-  # Set up expected behavior
-  mock_dao.RetrievePersonWithIdentifier('1').AndReturn(person)
-  mock_dao.DeletePerson(person)
-
-  # Put mocks in replay mode
-  my_mox.ReplayAll()
-
-  # Inject mock object and run test
-  controller.SetDao(mock_dao)
-  controller.DeletePersonById('1')
-
-  # Verify all methods were called as expected
-  my_mox.VerifyAll()
-"""
-
-from collections import deque
-import re
-import types
-import unittest
-
-import stubout
-
-class Error(AssertionError):
-  """Base exception for this module."""
-
-  pass
-
-
-class ExpectedMethodCallsError(Error):
-  """Raised when Verify() is called before all expected methods have been called
-  """
-
-  def __init__(self, expected_methods):
-    """Init exception.
-
-    Args:
-      # expected_methods: A sequence of MockMethod objects that should have been
-      #   called.
-      expected_methods: [MockMethod]
-
-    Raises:
-      ValueError: if expected_methods contains no methods.
-    """
-
-    if not expected_methods:
-      raise ValueError("There must be at least one expected method")
-    Error.__init__(self)
-    self._expected_methods = expected_methods
-
-  def __str__(self):
-    calls = "\n".join(["%3d.  %s" % (i, m)
-                       for i, m in enumerate(self._expected_methods)])
-    return "Verify: Expected methods never called:\n%s" % (calls,)
-
-
-class UnexpectedMethodCallError(Error):
-  """Raised when an unexpected method is called.
-
-  This can occur if a method is called with incorrect parameters, or out of the
-  specified order.
-  """
-
-  def __init__(self, unexpected_method, expected):
-    """Init exception.
-
-    Args:
-      # unexpected_method: MockMethod that was called but was not at the head of
-      #   the expected_method queue.
-      # expected: MockMethod or UnorderedGroup the method should have
-      #   been in.
-      unexpected_method: MockMethod
-      expected: MockMethod or UnorderedGroup
-    """
-
-    Error.__init__(self)
-    self._unexpected_method = unexpected_method
-    self._expected = expected
-
-  def __str__(self):
-    return "Unexpected method call: %s.  Expecting: %s" % \
-      (self._unexpected_method, self._expected)
-
-
-class UnknownMethodCallError(Error):
-  """Raised if an unknown method is requested of the mock object."""
-
-  def __init__(self, unknown_method_name):
-    """Init exception.
-
-    Args:
-      # unknown_method_name: Method call that is not part of the mocked class's
-      #   public interface.
-      unknown_method_name: str
-    """
-
-    Error.__init__(self)
-    self._unknown_method_name = unknown_method_name
-
-  def __str__(self):
-    return "Method called is not a member of the object: %s" % \
-      self._unknown_method_name
-
-
-class Mox(object):
-  """Mox: a factory for creating mock objects."""
-
-  # A list of types that should be stubbed out with MockObjects (as
-  # opposed to MockAnythings).
-  _USE_MOCK_OBJECT = [types.ClassType, types.InstanceType, types.ModuleType,
-                      types.ObjectType, types.TypeType]
-
-  def __init__(self):
-    """Initialize a new Mox."""
-
-    self._mock_objects = []
-    self.stubs = stubout.StubOutForTesting()
-
-  def CreateMock(self, class_to_mock):
-    """Create a new mock object.
-
-    Args:
-      # class_to_mock: the class to be mocked
-      class_to_mock: class
-
-    Returns:
-      MockObject that can be used as the class_to_mock would be.
-    """
-
-    new_mock = MockObject(class_to_mock)
-    self._mock_objects.append(new_mock)
-    return new_mock
-
-  def CreateMockAnything(self):
-    """Create a mock that will accept any method calls.
-
-    This does not enforce an interface.
-    """
-
-    new_mock = MockAnything()
-    self._mock_objects.append(new_mock)
-    return new_mock
-
-  def ReplayAll(self):
-    """Set all mock objects to replay mode."""
-
-    for mock_obj in self._mock_objects:
-      mock_obj._Replay()
-
-
-  def VerifyAll(self):
-    """Call verify on all mock objects created."""
-
-    for mock_obj in self._mock_objects:
-      mock_obj._Verify()
-
-  def ResetAll(self):
-    """Call reset on all mock objects.  This does not unset stubs."""
-
-    for mock_obj in self._mock_objects:
-      mock_obj._Reset()
-
-  def StubOutWithMock(self, obj, attr_name, use_mock_anything=False):
-    """Replace a method, attribute, etc. with a Mock.
-
-    This will replace a class or module with a MockObject, and everything else
-    (method, function, etc) with a MockAnything.  This can be overridden to
-    always use a MockAnything by setting use_mock_anything to True.
-
-    Args:
-      obj: A Python object (class, module, instance, callable).
-      attr_name: str.  The name of the attribute to replace with a mock.
-      use_mock_anything: bool. True if a MockAnything should be used regardless
-        of the type of attribute.
-    """
-
-    attr_to_replace = getattr(obj, attr_name)
-    if type(attr_to_replace) in self._USE_MOCK_OBJECT and not use_mock_anything:
-      stub = self.CreateMock(attr_to_replace)
-    else:
-      stub = self.CreateMockAnything()
-
-    self.stubs.Set(obj, attr_name, stub)
-
-  def UnsetStubs(self):
-    """Restore stubs to their original state."""
-
-    self.stubs.UnsetAll()
-
-def Replay(*args):
-  """Put mocks into Replay mode.
-
-  Args:
-    # args is any number of mocks to put into replay mode.
-  """
-
-  for mock in args:
-    mock._Replay()
-
-
-def Verify(*args):
-  """Verify mocks.
-
-  Args:
-    # args is any number of mocks to be verified.
-  """
-
-  for mock in args:
-    mock._Verify()
-
-
-def Reset(*args):
-  """Reset mocks.
-
-  Args:
-    # args is any number of mocks to be reset.
-  """
-
-  for mock in args:
-    mock._Reset()
-
-
-class MockAnything:
-  """A mock that can be used to mock anything.
-
-  This is helpful for mocking classes that do not provide a public interface.
-  """
-
-  def __init__(self):
-    """ """
-    self._Reset()
-
-  def __getattr__(self, method_name):
-    """Intercept method calls on this object.
-
-     A new MockMethod is returned that is aware of the MockAnything's
-     state (record or replay).  The call will be recorded or replayed
-     by the MockMethod's __call__.
-
-    Args:
-      # method name: the name of the method being called.
-      method_name: str
-
-    Returns:
-      A new MockMethod aware of MockAnything's state (record or replay).
-    """
-
-    return self._CreateMockMethod(method_name)
-
-  def _CreateMockMethod(self, method_name):
-    """Create a new mock method call and return it.
-
-    Args:
-      # method name: the name of the method being called.
-      method_name: str
-
-    Returns:
-      A new MockMethod aware of MockAnything's state (record or replay).
-    """
-
-    return MockMethod(method_name, self._expected_calls_queue,
-                      self._replay_mode)
-
-  def __nonzero__(self):
-    """Return 1 for nonzero so the mock can be used as a conditional."""
-
-    return 1
-
-  def __eq__(self, rhs):
-    """Provide custom logic to compare objects."""
-
-    return (isinstance(rhs, MockAnything) and
-            self._replay_mode == rhs._replay_mode and
-            self._expected_calls_queue == rhs._expected_calls_queue)
-
-  def __ne__(self, rhs):
-    """Provide custom logic to compare objects."""
-
-    return not self == rhs
-
-  def _Replay(self):
-    """Start replaying expected method calls."""
-
-    self._replay_mode = True
-
-  def _Verify(self):
-    """Verify that all of the expected calls have been made.
-
-    Raises:
-      ExpectedMethodCallsError: if there are still more method calls in the
-        expected queue.
-    """
-
-    # If the list of expected calls is not empty, raise an exception
-    if self._expected_calls_queue:
-      # The last MultipleTimesGroup is not popped from the queue.
-      if (len(self._expected_calls_queue) == 1 and
-          isinstance(self._expected_calls_queue[0], MultipleTimesGroup) and
-          self._expected_calls_queue[0].IsSatisfied()):
-        pass
-      else:
-        raise ExpectedMethodCallsError(self._expected_calls_queue)
-
-  def _Reset(self):
-    """Reset the state of this mock to record mode with an empty queue."""
-
-    # Maintain a list of method calls we are expecting
-    self._expected_calls_queue = deque()
-
-    # Make sure we are in setup mode, not replay mode
-    self._replay_mode = False
-
-
-class MockObject(MockAnything, object):
-  """A mock object that simulates the public/protected interface of a class."""
-
-  def __init__(self, class_to_mock):
-    """Initialize a mock object.
-
-    This determines the methods and properties of the class and stores them.
-
-    Args:
-      # class_to_mock: class to be mocked
-      class_to_mock: class
-    """
-
-    # This is used to hack around the mixin/inheritance of MockAnything, which
-    # is not a proper object (it can be anything. :-)
-    MockAnything.__dict__['__init__'](self)
-
-    # Get a list of all the public and special methods we should mock.
-    self._known_methods = set()
-    self._known_vars = set()
-    self._class_to_mock = class_to_mock
-    for method in dir(class_to_mock):
-      if callable(getattr(class_to_mock, method)):
-        self._known_methods.add(method)
-      else:
-        self._known_vars.add(method)
-
-  def __getattr__(self, name):
-    """Intercept attribute request on this object.
-
-    If the attribute is a public class variable, it will be returned and not
-    recorded as a call.
-
-    If the attribute is not a variable, it is handled like a method
-    call. The method name is checked against the set of mockable
-    methods, and a new MockMethod is returned that is aware of the
-    MockObject's state (record or replay).  The call will be recorded
-    or replayed by the MockMethod's __call__.
-
-    Args:
-      # name: the name of the attribute being requested.
-      name: str
-
-    Returns:
-      Either a class variable or a new MockMethod that is aware of the state
-      of the mock (record or replay).
-
-    Raises:
-      UnknownMethodCallError if the MockObject does not mock the requested
-          method.
-    """
-
-    if name in self._known_vars:
-      return getattr(self._class_to_mock, name)
-
-    if name in self._known_methods:
-      return self._CreateMockMethod(name)
-
-    raise UnknownMethodCallError(name)
-
-  def __eq__(self, rhs):
-    """Provide custom logic to compare objects."""
-
-    return (isinstance(rhs, MockObject) and
-            self._class_to_mock == rhs._class_to_mock and
-            self._replay_mode == rhs._replay_mode and
-            self._expected_calls_queue == rhs._expected_calls_queue)
-
-  def __setitem__(self, key, value):
-    """Provide custom logic for mocking classes that support item assignment.
-
-    Args:
-      key: Key to set the value for.
-      value: Value to set.
-
-    Returns:
-      Expected return value in replay mode.  A MockMethod object for the
-      __setitem__ method that has already been called if not in replay mode.
-
-    Raises:
-      TypeError if the underlying class does not support item assignment.
-      UnexpectedMethodCallError if the object does not expect the call to
-        __setitem__.
-
-    """
-    setitem = self._class_to_mock.__dict__.get('__setitem__', None)
-
-    # Verify the class supports item assignment.
-    if setitem is None:
-      raise TypeError('object does not support item assignment')
-
-    # If we are in replay mode then simply call the mock __setitem__ method.
-    if self._replay_mode:
-      return MockMethod('__setitem__', self._expected_calls_queue,
-                        self._replay_mode)(key, value)
-
-
-    # Otherwise, create a mock method __setitem__.
-    return self._CreateMockMethod('__setitem__')(key, value)
-
-  def __getitem__(self, key):
-    """Provide custom logic for mocking classes that are subscriptable.
-
-    Args:
-      key: Key to return the value for.
-
-    Returns:
-      Expected return value in replay mode.  A MockMethod object for the
-      __getitem__ method that has already been called if not in replay mode.
-
-    Raises:
-      TypeError if the underlying class is not subscriptable.
-      UnexpectedMethodCallError if the object does not expect the call to
-        __setitem__.
-
-    """
-    getitem = self._class_to_mock.__dict__.get('__getitem__', None)
-
-    # Verify the class supports item assignment.
-    if getitem is None:
-      raise TypeError('unsubscriptable object')
-
-    # If we are in replay mode then simply call the mock __getitem__ method.
-    if self._replay_mode:
-      return MockMethod('__getitem__', self._expected_calls_queue,
-                        self._replay_mode)(key)
-
-
-    # Otherwise, create a mock method __getitem__.
-    return self._CreateMockMethod('__getitem__')(key)
-
-  def __call__(self, *params, **named_params):
-    """Provide custom logic for mocking classes that are callable."""
-
-    # Verify the class we are mocking is callable
-    callable = self._class_to_mock.__dict__.get('__call__', None)
-    if callable is None:
-      raise TypeError('Not callable')
-
-    # Because the call is happening directly on this object instead of a method,
-    # the call on the mock method is made right here
-    mock_method = self._CreateMockMethod('__call__')
-    return mock_method(*params, **named_params)
-
-  @property
-  def __class__(self):
-    """Return the class that is being mocked."""
-
-    return self._class_to_mock
-
-
-class MockMethod(object):
-  """Callable mock method.
-
-  A MockMethod should act exactly like the method it mocks, accepting parameters
-  and returning a value, or throwing an exception (as specified).  When this
-  method is called, it can optionally verify whether the called method (name and
-  signature) matches the expected method.
-  """
-
-  def __init__(self, method_name, call_queue, replay_mode):
-    """Construct a new mock method.
-
-    Args:
-      # method_name: the name of the method
-      # call_queue: deque of calls, verify this call against the head, or add
-      #     this call to the queue.
-      # replay_mode: False if we are recording, True if we are verifying calls
-      #     against the call queue.
-      method_name: str
-      call_queue: list or deque
-      replay_mode: bool
-    """
-
-    self._name = method_name
-    self._call_queue = call_queue
-    if not isinstance(call_queue, deque):
-      self._call_queue = deque(self._call_queue)
-    self._replay_mode = replay_mode
-
-    self._params = None
-    self._named_params = None
-    self._return_value = None
-    self._exception = None
-    self._side_effects = None
-
-  def __call__(self, *params, **named_params):
-    """Log parameters and return the specified return value.
-
-    If the Mock(Anything/Object) associated with this call is in record mode,
-    this MockMethod will be pushed onto the expected call queue.  If the mock
-    is in replay mode, this will pop a MockMethod off the top of the queue and
-    verify this call is equal to the expected call.
-
-    Raises:
-      UnexpectedMethodCall if this call is supposed to match an expected method
-        call and it does not.
-    """
-
-    self._params = params
-    self._named_params = named_params
-
-    if not self._replay_mode:
-      self._call_queue.append(self)
-      return self
-
-    expected_method = self._VerifyMethodCall()
-
-    if expected_method._side_effects:
-      expected_method._side_effects(*params, **named_params)
-
-    if expected_method._exception:
-      raise expected_method._exception
-
-    return expected_method._return_value
-
-  def __getattr__(self, name):
-    """Raise an AttributeError with a helpful message."""
-
-    raise AttributeError('MockMethod has no attribute "%s". '
-        'Did you remember to put your mocks in replay mode?' % name)
-
-  def _PopNextMethod(self):
-    """Pop the next method from our call queue."""
-    try:
-      return self._call_queue.popleft()
-    except IndexError:
-      raise UnexpectedMethodCallError(self, None)
-
-  def _VerifyMethodCall(self):
-    """Verify the called method is expected.
-
-    This can be an ordered method, or part of an unordered set.
-
-    Returns:
-      The expected mock method.
-
-    Raises:
-      UnexpectedMethodCall if the method called was not expected.
-    """
-
-    expected = self._PopNextMethod()
-
-    # Loop here, because we might have a MethodGroup followed by another
-    # group.
-    while isinstance(expected, MethodGroup):
-      expected, method = expected.MethodCalled(self)
-      if method is not None:
-        return method
-
-    # This is a mock method, so just check equality.
-    if expected != self:
-      raise UnexpectedMethodCallError(self, expected)
-
-    return expected
-
-  def __str__(self):
-    params = ', '.join(
-        [repr(p) for p in self._params or []] +
-        ['%s=%r' % x for x in sorted((self._named_params or {}).items())])
-    desc = "%s(%s) -> %r" % (self._name, params, self._return_value)
-    return desc
-
-  def __eq__(self, rhs):
-    """Test whether this MockMethod is equivalent to another MockMethod.
-
-    Args:
-      # rhs: the right hand side of the test
-      rhs: MockMethod
-    """
-
-    return (isinstance(rhs, MockMethod) and
-            self._name == rhs._name and
-            self._params == rhs._params and
-            self._named_params == rhs._named_params)
-
-  def __ne__(self, rhs):
-    """Test whether this MockMethod is not equivalent to another MockMethod.
-
-    Args:
-      # rhs: the right hand side of the test
-      rhs: MockMethod
-    """
-
-    return not self == rhs
-
-  def GetPossibleGroup(self):
-    """Returns a possible group from the end of the call queue or None if no
-    other methods are on the stack.
-    """
-
-    # Remove this method from the tail of the queue so we can add it to a group.
-    this_method = self._call_queue.pop()
-    assert this_method == self
-
-    # Determine if the tail of the queue is a group, or just a regular ordered
-    # mock method.
-    group = None
-    try:
-      group = self._call_queue[-1]
-    except IndexError:
-      pass
-
-    return group
-
-  def _CheckAndCreateNewGroup(self, group_name, group_class):
-    """Checks if the last method (a possible group) is an instance of our
-    group_class. Adds the current method to this group or creates a new one.
-
-    Args:
-
-      group_name: the name of the group.
-      group_class: the class used to create instance of this new group
-    """
-    group = self.GetPossibleGroup()
-
-    # If this is a group, and it is the correct group, add the method.
-    if isinstance(group, group_class) and group.group_name() == group_name:
-      group.AddMethod(self)
-      return self
-
-    # Create a new group and add the method.
-    new_group = group_class(group_name)
-    new_group.AddMethod(self)
-    self._call_queue.append(new_group)
-    return self
-
-  def InAnyOrder(self, group_name="default"):
-    """Move this method into a group of unordered calls.
-
-    A group of unordered calls must be defined together, and must be executed
-    in full before the next expected method can be called.  There can be
-    multiple groups that are expected serially, if they are given
-    different group names.  The same group name can be reused if there is a
-    standard method call, or a group with a different name, spliced between
-    usages.
-
-    Args:
-      group_name: the name of the unordered group.
-
-    Returns:
-      self
-    """
-    return self._CheckAndCreateNewGroup(group_name, UnorderedGroup)
-
-  def MultipleTimes(self, group_name="default"):
-    """Move this method into group of calls which may be called multiple times.
-
-    A group of repeating calls must be defined together, and must be executed in
-    full before the next expected method can be called.
-
-    Args:
-      group_name: the name of the unordered group.
-
-    Returns:
-      self
-    """
-    return self._CheckAndCreateNewGroup(group_name, MultipleTimesGroup)
-
-  def AndReturn(self, return_value):
-    """Set the value to return when this method is called.
-
-    Args:
-      # return_value can be anything.
-    """
-
-    self._return_value = return_value
-    return return_value
-
-  def AndRaise(self, exception):
-    """Set the exception to raise when this method is called.
-
-    Args:
-      # exception: the exception to raise when this method is called.
-      exception: Exception
-    """
-
-    self._exception = exception
-
-  def WithSideEffects(self, side_effects):
-    """Set the side effects that are simulated when this method is called.
-
-    Args:
-      side_effects: A callable which modifies the parameters or other relevant
-        state which a given test case depends on.
-
-    Returns:
-      Self for chaining with AndReturn and AndRaise.
-    """
-    self._side_effects = side_effects
-    return self
-
-class Comparator:
-  """Base class for all Mox comparators.
-
-  A Comparator can be used as a parameter to a mocked method when the exact
-  value is not known.  For example, the code you are testing might build up a
-  long SQL string that is passed to your mock DAO. You're only interested that
-  the IN clause contains the proper primary keys, so you can set your mock
-  up as follows:
-
-  mock_dao.RunQuery(StrContains('IN (1, 2, 4, 5)')).AndReturn(mock_result)
-
-  Now whatever query is passed in must contain the string 'IN (1, 2, 4, 5)'.
-
-  A Comparator may replace one or more parameters, for example:
-  # return at most 10 rows
-  mock_dao.RunQuery(StrContains('SELECT'), 10)
-
-  or
-
-  # Return some non-deterministic number of rows
-  mock_dao.RunQuery(StrContains('SELECT'), IsA(int))
-  """
-
-  def equals(self, rhs):
-    """Special equals method that all comparators must implement.
-
-    Args:
-      rhs: any python object
-    """
-
-    raise NotImplementedError('method must be implemented by a subclass.')
-
-  def __eq__(self, rhs):
-    return self.equals(rhs)
-
-  def __ne__(self, rhs):
-    return not self.equals(rhs)
-
-
-class IsA(Comparator):
-  """This class wraps a basic Python type or class.  It is used to verify
-  that a parameter is of the given type or class.
-
-  Example:
-  mock_dao.Connect(IsA(DbConnectInfo))
-  """
-
-  def __init__(self, class_name):
-    """Initialize IsA
-
-    Args:
-      class_name: basic python type or a class
-    """
-
-    self._class_name = class_name
-
-  def equals(self, rhs):
-    """Check to see if the RHS is an instance of class_name.
-
-    Args:
-      # rhs: the right hand side of the test
-      rhs: object
-
-    Returns:
-      bool
-    """
-
-    try:
-      return isinstance(rhs, self._class_name)
-    except TypeError:
-      # Check raw types if there was a type error.  This is helpful for
-      # things like cStringIO.StringIO.
-      return type(rhs) == type(self._class_name)
-
-  def __repr__(self):
-    return str(self._class_name)
-
-class IsAlmost(Comparator):
-  """Comparison class used to check whether a parameter is nearly equal
-  to a given value.  Generally useful for floating point numbers.
-
-  Example mock_dao.SetTimeout((IsAlmost(3.9)))
-  """
-
-  def __init__(self, float_value, places=7):
-    """Initialize IsAlmost.
-
-    Args:
-      float_value: The value for making the comparison.
-      places: The number of decimal places to round to.
-    """
-
-    self._float_value = float_value
-    self._places = places
-
-  def equals(self, rhs):
-    """Check to see if RHS is almost equal to float_value
-
-    Args:
-      rhs: the value to compare to float_value
-
-    Returns:
-      bool
-    """
-
-    try:
-      return round(rhs-self._float_value, self._places) == 0
-    except TypeError:
-      # This is probably because either float_value or rhs is not a number.
-      return False
-
-  def __repr__(self):
-    return str(self._float_value)
-
-class StrContains(Comparator):
-  """Comparison class used to check whether a substring exists in a
-  string parameter.  This can be useful in mocking a database with SQL
-  passed in as a string parameter, for example.
-
-  Example:
-  mock_dao.RunQuery(StrContains('IN (1, 2, 4, 5)')).AndReturn(mock_result)
-  """
-
-  def __init__(self, search_string):
-    """Initialize.
-
-    Args:
-      # search_string: the string you are searching for
-      search_string: str
-    """
-
-    self._search_string = search_string
-
-  def equals(self, rhs):
-    """Check to see if the search_string is contained in the rhs string.
-
-    Args:
-      # rhs: the right hand side of the test
-      rhs: object
-
-    Returns:
-      bool
-    """
-
-    try:
-      return rhs.find(self._search_string) > -1
-    except Exception:
-      return False
-
-  def __repr__(self):
-    return '<str containing \'%s\'>' % self._search_string
-
-
-class Regex(Comparator):
-  """Checks if a string matches a regular expression.
-
-  This uses a given regular expression to determine equality.
-  """
-
-  def __init__(self, pattern, flags=0):
-    """Initialize.
-
-    Args:
-      # pattern is the regular expression to search for
-      pattern: str
-      # flags passed to re.compile function as the second argument
-      flags: int
-    """
-
-    self.regex = re.compile(pattern, flags=flags)
-
-  def equals(self, rhs):
-    """Check to see if rhs matches regular expression pattern.
-
-    Returns:
-      bool
-    """
-
-    return self.regex.search(rhs) is not None
-
-  def __repr__(self):
-    s = '<regular expression \'%s\'' % self.regex.pattern
-    if self.regex.flags:
-      s += ', flags=%d' % self.regex.flags
-    s += '>'
-    return s
-
-
-class In(Comparator):
-  """Checks whether an item (or key) is in a list (or dict) parameter.
-
-  Example:
-  mock_dao.GetUsersInfo(In('expectedUserName')).AndReturn(mock_result)
-  """
-
-  def __init__(self, key):
-    """Initialize.
-
-    Args:
-      # key is any thing that could be in a list or a key in a dict
-    """
-
-    self._key = key
-
-  def equals(self, rhs):
-    """Check to see whether key is in rhs.
-
-    Args:
-      rhs: dict
-
-    Returns:
-      bool
-    """
-
-    return self._key in rhs
-
-  def __repr__(self):
-    return '<sequence or map containing \'%s\'>' % self._key
-
-
-class ContainsKeyValue(Comparator):
-  """Checks whether a key/value pair is in a dict parameter.
-
-  Example:
-  mock_dao.UpdateUsers(ContainsKeyValue('stevepm', stevepm_user_info))
-  """
-
-  def __init__(self, key, value):
-    """Initialize.
-
-    Args:
-      # key: a key in a dict
-      # value: the corresponding value
-    """
-
-    self._key = key
-    self._value = value
-
-  def equals(self, rhs):
-    """Check whether the given key/value pair is in the rhs dict.
-
-    Returns:
-      bool
-    """
-
-    try:
-      return rhs[self._key] == self._value
-    except Exception:
-      return False
-
-  def __repr__(self):
-    return '<map containing the entry \'%s: %s\'>' % (self._key, self._value)
-
-
-class SameElementsAs(Comparator):
-  """Checks whether iterables contain the same elements (ignoring order).
-
-  Example:
-  mock_dao.ProcessUsers(SameElementsAs('stevepm', 'salomaki'))
-  """
-
-  def __init__(self, expected_seq):
-    """Initialize.
-
-    Args:
-      expected_seq: a sequence
-    """
-
-    self._expected_seq = expected_seq
-
-  def equals(self, actual_seq):
-    """Check to see whether actual_seq has same elements as expected_seq.
-
-    Args:
-      actual_seq: sequence
-
-    Returns:
-      bool
-    """
-
-    try:
-      expected = dict([(element, None) for element in self._expected_seq])
-      actual = dict([(element, None) for element in actual_seq])
-    except TypeError:
-      # Fall back to slower list-compare if any of the objects are unhashable.
-      expected = list(self._expected_seq)
-      actual = list(actual_seq)
-      expected.sort()
-      actual.sort()
-    return expected == actual
-
-  def __repr__(self):
-    return '<sequence with same elements as \'%s\'>' % self._expected_seq
-
-
-class And(Comparator):
-  """Evaluates one or more Comparators on RHS and returns an AND of the results.
-  """
-
-  def __init__(self, *args):
-    """Initialize.
-
-    Args:
-      *args: One or more Comparator
-    """
-
-    self._comparators = args
-
-  def equals(self, rhs):
-    """Checks whether all Comparators are equal to rhs.
-
-    Args:
-      # rhs: can be anything
-
-    Returns:
-      bool
-    """
-
-    for comparator in self._comparators:
-      if not comparator.equals(rhs):
-        return False
-
-    return True
-
-  def __repr__(self):
-    return '<AND %s>' % str(self._comparators)
-
-
-class Or(Comparator):
-  """Evaluates one or more Comparators on RHS and returns an OR of the results.
-  """
-
-  def __init__(self, *args):
-    """Initialize.
-
-    Args:
-      *args: One or more Mox comparators
-    """
-
-    self._comparators = args
-
-  def equals(self, rhs):
-    """Checks whether any Comparator is equal to rhs.
-
-    Args:
-      # rhs: can be anything
-
-    Returns:
-      bool
-    """
-
-    for comparator in self._comparators:
-      if comparator.equals(rhs):
-        return True
-
-    return False
-
-  def __repr__(self):
-    return '<OR %s>' % str(self._comparators)
-
-
-class Func(Comparator):
-  """Call a function that should verify the parameter passed in is correct.
-
-  You may need the ability to perform more advanced operations on the parameter
-  in order to validate it.  You can use this to have a callable validate any
-  parameter. The callable should return either True or False.
-
-
-  Example:
-
-  def myParamValidator(param):
-    # Advanced logic here
-    return True
-
-  mock_dao.DoSomething(Func(myParamValidator), true)
-  """
-
-  def __init__(self, func):
-    """Initialize.
-
-    Args:
-      func: callable that takes one parameter and returns a bool
-    """
-
-    self._func = func
-
-  def equals(self, rhs):
-    """Test whether rhs passes the function test.
-
-    rhs is passed into func.
-
-    Args:
-      rhs: any python object
-
-    Returns:
-      the result of func(rhs)
-    """
-
-    return self._func(rhs)
-
-  def __repr__(self):
-    return str(self._func)
-
-
-class IgnoreArg(Comparator):
-  """Ignore an argument.
-
-  This can be used when we don't care about an argument of a method call.
-
-  Example:
-  # Check if CastMagic is called with 3 as first arg and 'disappear' as third.
-  mymock.CastMagic(3, IgnoreArg(), 'disappear')
-  """
-
-  def equals(self, unused_rhs):
-    """Ignores arguments and returns True.
-
-    Args:
-      unused_rhs: any python object
-
-    Returns:
-      always returns True
-    """
-
-    return True
-
-  def __repr__(self):
-    return '<IgnoreArg>'
-
-
-class MethodGroup(object):
-  """Base class containing common behaviour for MethodGroups."""
-
-  def __init__(self, group_name):
-    self._group_name = group_name
-
-  def group_name(self):
-    return self._group_name
-
-  def __str__(self):
-    return '<%s "%s">' % (self.__class__.__name__, self._group_name)
-
-  def AddMethod(self, mock_method):
-    raise NotImplementedError
-
-  def MethodCalled(self, mock_method):
-    raise NotImplementedError
-
-  def IsSatisfied(self):
-    raise NotImplementedError
-
-class UnorderedGroup(MethodGroup):
-  """UnorderedGroup holds a set of method calls that may occur in any order.
-
-  This construct is helpful for non-deterministic events, such as iterating
-  over the keys of a dict.
-  """
-
-  def __init__(self, group_name):
-    super(UnorderedGroup, self).__init__(group_name)
-    self._methods = []
-
-  def AddMethod(self, mock_method):
-    """Add a method to this group.
-
-    Args:
-      mock_method: A mock method to be added to this group.
-    """
-
-    self._methods.append(mock_method)
-
-  def MethodCalled(self, mock_method):
-    """Remove a method call from the group.
-
-    If the method is not in the set, an UnexpectedMethodCallError will be
-    raised.
-
-    Args:
-      mock_method: a mock method that should be equal to a method in the group.
-
-    Returns:
-      The mock method from the group
-
-    Raises:
-      UnexpectedMethodCallError if the mock_method was not in the group.
-    """
-
-    # Check to see if this method exists, and if so, remove it from the set
-    # and return it.
-    for method in self._methods:
-      if method == mock_method:
-        # Remove the called mock_method instead of the method in the group.
-        # The called method will match any comparators when equality is checked
-        # during removal.  The method in the group could pass a comparator to
-        # another comparator during the equality check.
-        self._methods.remove(mock_method)
-
-        # If this group is not empty, put it back at the head of the queue.
-        if not self.IsSatisfied():
-          mock_method._call_queue.appendleft(self)
-
-        return self, method
-
-    raise UnexpectedMethodCallError(mock_method, self)
-
-  def IsSatisfied(self):
-    """Return True if there are not any methods in this group."""
-
-    return len(self._methods) == 0
-
-
-class MultipleTimesGroup(MethodGroup):
-  """MultipleTimesGroup holds methods that may be called any number of times.
-
-  Note: Each method must be called at least once.
-
-  This is helpful, if you don't know or care how many times a method is called.
-  """
-
-  def __init__(self, group_name):
-    super(MultipleTimesGroup, self).__init__(group_name)
-    self._methods = set()
-    self._methods_called = set()
-
-  def AddMethod(self, mock_method):
-    """Add a method to this group.
-
-    Args:
-      mock_method: A mock method to be added to this group.
-    """
-
-    self._methods.add(mock_method)
-
-  def MethodCalled(self, mock_method):
-    """Remove a method call from the group.
-
-    If the method is not in the set, an UnexpectedMethodCallError will be
-    raised.
-
-    Args:
-      mock_method: a mock method that should be equal to a method in the group.
-
-    Returns:
-      The mock method from the group
-
-    Raises:
-      UnexpectedMethodCallError if the mock_method was not in the group.
-    """
-
-    # Check to see if this method exists, and if so add it to the set of
-    # called methods.
-
-    for method in self._methods:
-      if method == mock_method:
-        self._methods_called.add(mock_method)
-        # Always put this group back on top of the queue, because we don't know
-        # when we are done.
-        mock_method._call_queue.appendleft(self)
-        return self, method
-
-    if self.IsSatisfied():
-      next_method = mock_method._PopNextMethod();
-      return next_method, None
-    else:
-      raise UnexpectedMethodCallError(mock_method, self)
-
-  def IsSatisfied(self):
-    """Return True if all methods in this group are called at least once."""
-    # NOTE(psycho): We can't use the simple set difference here because we want
-    # to match different parameters which are considered the same e.g. IsA(str)
-    # and some string. This solution is O(n^2) but n should be small.
-    tmp = self._methods.copy()
-    for called in self._methods_called:
-      for expected in tmp:
-        if called == expected:
-          tmp.remove(expected)
-          if not tmp:
-            return True
-          break
-    return False
-
-
-class MoxMetaTestBase(type):
-  """Metaclass to add mox cleanup and verification to every test.
-
-  As the mox unit testing class is being constructed (MoxTestBase or a
-  subclass), this metaclass will modify all test functions to call the
-  CleanUpMox method of the test class after they finish. This means that
-  unstubbing and verifying will happen for every test with no additional code,
-  and any failures will result in test failures as opposed to errors.
-  """
-
-  def __init__(cls, name, bases, d):
-    type.__init__(cls, name, bases, d)
-
-    # also get all the attributes from the base classes to account
-    # for a case when test class is not the immediate child of MoxTestBase
-    for base in bases:
-      for attr_name in dir(base):
-        d[attr_name] = getattr(base, attr_name)
-
-    for func_name, func in d.items():
-      if func_name.startswith('test') and callable(func):
-        setattr(cls, func_name, MoxMetaTestBase.CleanUpTest(cls, func))
-
-  @staticmethod
-  def CleanUpTest(cls, func):
-    """Adds Mox cleanup code to any MoxTestBase method.
-
-    Always unsets stubs after a test. Will verify all mocks for tests that
-    otherwise pass.
-
-    Args:
-      cls: MoxTestBase or subclass; the class whose test method we are altering.
-      func: method; the method of the MoxTestBase test class we wish to alter.
-
-    Returns:
-      The modified method.
-    """
-    def new_method(self, *args, **kwargs):
-      mox_obj = getattr(self, 'mox', None)
-      cleanup_mox = False
-      if mox_obj and isinstance(mox_obj, Mox):
-        cleanup_mox = True
-      try:
-        func(self, *args, **kwargs)
-      finally:
-        if cleanup_mox:
-          mox_obj.UnsetStubs()
-      if cleanup_mox:
-        mox_obj.VerifyAll()
-    new_method.__name__ = func.__name__
-    new_method.__doc__ = func.__doc__
-    new_method.__module__ = func.__module__
-    return new_method
-
-
-class MoxTestBase(unittest.TestCase):
-  """Convenience test class to make stubbing easier.
-
-  Sets up a "mox" attribute which is an instance of Mox - any mox tests will
-  want this. Also automatically unsets any stubs and verifies that all mock
-  methods have been called at the end of each test, eliminating boilerplate
-  code.
-  """
-
-  __metaclass__ = MoxMetaTestBase
-
-  def setUp(self):
-    self.mox = Mox()
diff --git a/libs/protobuf/python/protobuf_distutils/README.md b/libs/protobuf/python/protobuf_distutils/README.md
deleted file mode 100644
index 63d12b5..0000000
--- a/libs/protobuf/python/protobuf_distutils/README.md
+++ /dev/null
@@ -1,121 +0,0 @@
-# Python setuptools extension
-
-This is an extension for Python setuptools which uses an installed protobuf
-compiler (`protoc`) to generate Python sources.
-
-## Installing
-
-To use this extension, it needs to be installed so it can be imported by other
-projects' setup.py.
-
-```shell
-$ python setup.py build
-$ python -m pip install .
-```
-
-(If you want to test changes to the extension, you can use `python setup.py
-develop`.)
-
-## Usage
-
-### Example setup.py configuration
-
-```python
-from setuptools import setup
-setup(
-    # ...
-    name='example_project',
-
-    # Require this package, but only for setup (not installation):
-    setup_requires=['protobuf_distutils'],
-
-    options={
-        # See below for details.
-        'generate_py_protobufs': {
-            'source_dir':        'path/to/protos',
-            'extra_proto_paths': ['path/to/other/project/protos'],
-            'output_dir':        'path/to/project/sources',  # default '.'
-            'proto_files':       ['relative/path/to/just_this_file.proto'],
-            'protoc':            'path/to/protoc.exe',
-        },
-    },
-)
-```
-
-### Example build invocation
-
-These steps will generate protobuf sources so they are included when building
-and installing `example_project` (see above):
-
-```shell
-$ python setup.py generate_py_protobufs
-$ python setup.py build
-$ python -m pip install .
-```
-
-## Options
-
-- `source_dir`:
-
-  This is the directory holding .proto files to be processed.
-
-  The default behavior is to generate sources for all .proto files found under
-  `source_dir`, recursively. This behavior can be controlled with options below.
-
-- `proto_root_path`:
-
-  This is the root path for resolving imports in source .proto files.
-
-  The default is the shortest prefix of `source_dir` among `[source_dir] +
-  self.extra_proto_paths`.
-
-- `extra_proto_paths`:
-
-  Specifies additional paths that should be used to find imports, in
-  addition to `source_dir`.
-
-  This option can be used to specify the path to other protobuf sources,
-  which are imported by files under `source_dir`.  No Python code will
-  be generated for .proto files under `extra_proto_paths`.
-
-- `output_dir`:
-
-  Specifies where generated code should be placed.
-
-  Typically, this should be the root package that generated Python modules
-  should be below.
-
-  The generated files will be placed under `output_dir` according to the
-  relative source paths under `proto_root_path`. For example, the source file
-  `${proto_root_path}/subdir/message.proto` will be generated as the Python
-  module `${output_dir}/subdir/message_pb2.py`.
-
-- `proto_files`:
-
-  A list of strings, specific .proto file paths for generating code, instead of
-  searching for all .proto files under `source_path`.
-
-  These paths are relative to `source_dir`. For example, to generate code
-  for just `${source_dir}/subdir/message.proto`, specify
-  `['subdir/message.proto']`.
-
-- `protoc`:
-
-  By default, the protoc binary (the Protobuf compiler) is found by
-  searching the environment path. To use a specific protoc binary, its
-  path can be specified. Resolution of the `protoc` value is as follows:
-  1. If the `--protoc=VALUE` flag is passed to `generate_py_protobufs`,
-     then `VALUE` will be used.
-     For example:
-     ```shell
-     $ python setup.py generate_py_protobufs --protoc=/path/to/protoc
-     ```
-  2. Otherwise, if a value was set in the `options`, it will be used.
-     (See "Example setup.py configuration," above.)
-  3. Otherwise, if the `PROTOC` environment variable is set, it will be
-     used. For example:
-     For example:
-     ```shell
-     $ PROTOC=/path/to/protoc python setup.py generate_py_protobufs
-     ```
-  4. Otherwise, `$PATH` will be searched.
diff --git a/libs/protobuf/python/protobuf_distutils/protobuf_distutils/__init__.py b/libs/protobuf/python/protobuf_distutils/protobuf_distutils/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/libs/protobuf/python/protobuf_distutils/protobuf_distutils/generate_py_protobufs.py b/libs/protobuf/python/protobuf_distutils/protobuf_distutils/generate_py_protobufs.py
deleted file mode 100644
index 88b8d45..0000000
--- a/libs/protobuf/python/protobuf_distutils/protobuf_distutils/generate_py_protobufs.py
+++ /dev/null
@@ -1,147 +0,0 @@
-# Protocol Buffers - Google's data interchange format
-# Copyright 2008 Google Inc.  All rights reserved.
-# https://developers.google.com/protocol-buffers/
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-"""Implements the generate_py_protobufs command."""
-
-__author__ = 'dlj@google.com (David L. Jones)'
-
-import glob
-import sys
-import os
-import distutils.spawn as spawn
-from distutils.cmd import Command
-from distutils.errors import DistutilsOptionError, DistutilsExecError
-
-class generate_py_protobufs(Command):
-    """Generates Python sources for .proto files."""
-
-    description = 'Generate Python sources for .proto files'
-    user_options = [
-        ('extra-proto-paths=', None,
-         'Additional paths to resolve imports in .proto files.'),
-
-        ('protoc=', None,
-         'Path to a specific `protoc` command to use.'),
-    ]
-    boolean_options = ['recurse']
-
-    def initialize_options(self):
-        """Sets the defaults for the command options."""
-        self.source_dir = None
-        self.proto_root_path = None
-        self.extra_proto_paths = []
-        self.output_dir = '.'
-        self.proto_files = None
-        self.recurse = True
-        self.protoc = None
-
-    def finalize_options(self):
-        """Sets the final values for the command options.
-
-        Defaults were set in `initialize_options`, but could have been changed
-        by command-line options or by other commands.
-        """
-        self.ensure_dirname('source_dir')
-        self.ensure_string_list('extra_proto_paths')
-
-        if self.output_dir is None:
-            self.output_dir = '.'
-        self.ensure_dirname('output_dir')
-
-        # SUBTLE: if 'source_dir' is a subdirectory of any entry in
-        # 'extra_proto_paths', then in general, the shortest --proto_path prefix
-        # (and the longest relative .proto filenames) must be used for
-        # correctness. For example, consider:
-        #
-        #     source_dir = 'a/b/c'
-        #     extra_proto_paths = ['a/b', 'x/y']
-        #
-        # In this case, we must ensure that a/b/c/d/foo.proto resolves
-        # canonically as c/d/foo.proto, not just d/foo.proto. Otherwise, this
-        # import:
-        #
-        #     import "c/d/foo.proto";
-        #
-        # would result in different FileDescriptor.name keys from "d/foo.proto".
-        # That will cause all the definitions in the file to be flagged as
-        # duplicates, with an error similar to:
-        #
-        #     c/d/foo.proto: "packagename.MessageName" is already defined in file "d/foo.proto"
-        #
-        # For paths in self.proto_files, we transform them to be relative to
-        # self.proto_root_path, which may be different from self.source_dir.
-        #
-        # Although the order of --proto_paths is significant, shadowed filenames
-        # are errors: if 'a/b/c.proto' resolves to different files under two
-        # different --proto_path arguments, then the path is rejected as an
-        # error. (Implementation note: this is enforced in protoc's
-        # DiskSourceTree class.)
-
-        if self.proto_root_path is None:
-            self.proto_root_path = os.path.normpath(self.source_dir)
-            for root_candidate in self.extra_proto_paths:
-                root_candidate = os.path.normpath(root_candidate)
-                if self.proto_root_path.startswith(root_candidate):
-                    self.proto_root_path = root_candidate
-            if self.proto_root_path != self.source_dir:
-                self.announce('using computed proto_root_path: ' + self.proto_root_path, level=2)
-
-        if not self.source_dir.startswith(self.proto_root_path):
-            raise DistutilsOptionError('source_dir ' + self.source_dir +
-                                       ' is not under proto_root_path ' + self.proto_root_path)
-
-        if self.proto_files is None:
-            files = glob.glob(os.path.join(self.source_dir, '*.proto'))
-            if self.recurse:
-                files.extend(glob.glob(os.path.join(self.source_dir, '**', '*.proto'), recursive=True))
-            self.proto_files = [f.partition(self.proto_root_path + os.path.sep)[-1] for f in files]
-            if not self.proto_files:
-                raise DistutilsOptionError('no .proto files were found under ' + self.source_dir)
-
-        self.ensure_string_list('proto_files')
-
-        if self.protoc is None:
-            self.protoc = os.getenv('PROTOC')
-        if self.protoc is None:
-            self.protoc = spawn.find_executable('protoc')
-
-    def run(self):
-        # All proto file paths were adjusted in finalize_options to be relative
-        # to self.proto_root_path.
-        proto_paths = ['--proto_path=' + self.proto_root_path]
-        proto_paths.extend(['--proto_path=' + x for x in self.extra_proto_paths])
-
-        # Run protoc. It was already resolved, so don't try to resolve
-        # through PATH.
-        spawn.spawn(
-            [self.protoc,
-             '--python_out=' + self.output_dir,
-            ] + proto_paths + self.proto_files,
-            search_path=0)
diff --git a/libs/protobuf/python/protobuf_distutils/setup.py b/libs/protobuf/python/protobuf_distutils/setup.py
deleted file mode 100644
index 9a19032..0000000
--- a/libs/protobuf/python/protobuf_distutils/setup.py
+++ /dev/null
@@ -1,75 +0,0 @@
-# Protocol Buffers - Google's data interchange format
-# Copyright 2008 Google Inc.  All rights reserved.
-# https://developers.google.com/protocol-buffers/
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-"""Setuptools/distutils extension for generating Python protobuf code."""
-
-__author__ = 'dlj@google.com (David L. Jones)'
-
-from os import path
-from setuptools import setup, find_packages
-
-# Use README.md as the source for long_description.
-this_directory = path.abspath(path.dirname(__file__))
-with open(path.join(this_directory, 'README.md'), encoding='utf-8') as f:
-    _readme = f.read()
-
-setup(
-    name='protobuf_distutils',
-    version='1.0',
-    packages=find_packages(),
-    maintainer='protobuf@googlegroups.com',
-    maintainer_email='protobuf@googlegroups.com',
-    license='BSD-3-Clause',
-    classifiers=[
-        "Framework :: Setuptools Plugin",
-        "Operating System :: OS Independent",
-        # These Python versions should match the protobuf package:
-        "Programming Language :: Python",
-        "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.3",
-        "Programming Language :: Python :: 3.4",
-        "Programming Language :: Python :: 3.5",
-        "Programming Language :: Python :: 3.6",
-        "Programming Language :: Python :: 3.7",
-        "Programming Language :: Python :: 3.8",
-        "Topic :: Software Development :: Code Generators",
-    ],
-    description=('This is a distutils extension to generate Python code for '
-                 '.proto files using an installed protoc binary.'),
-    long_description=_readme,
-    long_description_content_type='text/markdown',
-    url='https://github.com/protocolbuffers/protobuf/',
-    entry_points={
-        'distutils.commands': [
-            ('generate_py_protobufs = '
-             'protobuf_distutils.generate_py_protobufs:generate_py_protobufs'),
-        ],
-    },
-)
diff --git a/libs/protobuf/python/release.sh b/libs/protobuf/python/release.sh
deleted file mode 100755
index 87fcf8c..0000000
--- a/libs/protobuf/python/release.sh
+++ /dev/null
@@ -1,137 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-function get_source_version() {
-  grep "__version__ = '.*'" python/google/protobuf/__init__.py | sed -r "s/__version__ = '(.*)'/\1/"
-}
-
-function run_install_test() {
-  local VERSION=$1
-  local PYTHON=$2
-  local PYPI=$3
-
-  virtualenv -p `which $PYTHON` test-venv
-
-  # Intentionally put a broken protoc in the path to make sure installation
-  # doesn't require protoc installed.
-  touch test-venv/bin/protoc
-  chmod +x test-venv/bin/protoc
-
-  source test-venv/bin/activate
-  (pip install -i ${PYPI} protobuf==${VERSION} --no-cache-dir) || (retry_pip_install ${PYPI} ${VERSION})
-  deactivate
-  rm -fr test-venv
-}
-
-function retry_pip_install() {
-  local PYPI=$1
-  local VERSION=$2
-  
-  read -p "pip install failed, possibly due to delay between upload and availability on pip. Retry? [y/n]" -r
-  echo
-  if [[ ! $REPLY =~ ^[Yy]$ ]]; then
-    exit 1
-  fi
-
-  (pip install -i ${PYPI} protobuf==${VERSION} --no-cache-dir) || (retry_pip_install ${PYPI} ${VERSION})
-}
-
-
-[ $# -lt 1 ] && {
-  echo "Usage: $0 VERSION ["
-  echo ""
-  echo "Examples:"
-  echo "  Test 3.3.0 release using version number 3.3.0.dev1:"
-  echo "    $0 3.0.0 dev1"
-  echo "  Actually release 3.3.0 to PyPI:"
-  echo "    $0 3.3.0"
-  exit 1
-}
-VERSION=$1
-DEV=$2
-
-# Make sure we are in a protobuf source tree.
-[ -f "python/google/protobuf/__init__.py" ] || {
-  echo "This script must be ran under root of protobuf source tree."
-  exit 1
-}
-
-# Make sure all files are world-readable.
-find python -type d -exec chmod a+r,a+x {} +
-find python -type f -exec chmod a+r {} +
-umask 0022
-
-# Check that the supplied version number matches what's inside the source code.
-SOURCE_VERSION=`get_source_version`
-
-[ "${VERSION}" == "${SOURCE_VERSION}" -o "${VERSION}.${DEV}" == "${SOURCE_VERSION}" ] || {
-  echo "Version number specified on the command line ${VERSION} doesn't match"
-  echo "the actual version number in the source code: ${SOURCE_VERSION}"
-  exit 1
-}
-
-TESTING_ONLY=1
-TESTING_VERSION=${VERSION}.${DEV}
-if [ -z "${DEV}" ]; then
-  read -p "You are releasing ${VERSION} to PyPI. Are you sure? [y/n]" -r
-  echo
-  if [[ ! $REPLY =~ ^[Yy]$ ]]; then
-    exit 1
-  fi
-  TESTING_ONLY=0
-  TESTING_VERSION=${VERSION}
-else
-  # Use dev version number for testing.
-  sed -i -r "s/__version__ = '.*'/__version__ = '${VERSION}.${DEV}'/" python/google/protobuf/__init__.py
-fi
-
-# Copy LICENSE
-cp LICENSE python/LICENSE
-
-cd python
-
-# Run tests locally.
-python3 setup.py build
-python3 setup.py test
-
-# Deploy source package to testing PyPI
-python3 setup.py sdist
-twine upload --skip-existing -r testpypi -u protobuf-wheel-test dist/*
-
-# Sleep to allow time for distribution to be available on pip.
-sleep 5m
-
-# Test locally.
-run_install_test ${TESTING_VERSION} python3 https://test.pypi.org/simple
-
-# Deploy egg/wheel packages to testing PyPI and test again.
-python3 setup.py clean build bdist_wheel
-twine upload --skip-existing -r testpypi -u protobuf-wheel-test dist/*
-sleep 5m
-run_install_test ${TESTING_VERSION} python3 https://test.pypi.org/simple
-
-echo "All install tests have passed using testing PyPI."
-
-if [ $TESTING_ONLY -eq 0 ]; then
-  read -p "Publish to PyPI? [y/n]" -r
-  echo
-  if [[ ! $REPLY =~ ^[Yy]$ ]]; then
-    exit 1
-  fi
-  echo "Publishing to PyPI..."
-  # Be sure to run build before sdist, because otherwise sdist will not include
-  # well-known types.
-  python3 setup.py clean build sdist
-  twine upload --skip-existing -u protobuf-packages dist/*
-  # Be sure to run clean before bdist_xxx, because otherwise bdist_xxx will
-  # include files you may not want in the package. E.g., if you have built
-  # and tested with --cpp_implemenation, bdist_xxx will include the _message.so
-  # file even when you no longer pass the --cpp_implemenation flag. See:
-  #   https://github.com/protocolbuffers/protobuf/issues/3042
-  python3 setup.py clean build bdist_wheel
-  twine upload --skip-existing -u protobuf-packages dist/*
-else
-  # Set the version number back (i.e., remove dev suffix).
-  sed -i -r "s/__version__ = '.*'/__version__ = '${VERSION}'/" google/protobuf/__init__.py
-fi
diff --git a/libs/protobuf/python/setup.cfg b/libs/protobuf/python/setup.cfg
deleted file mode 100644
index 2a9acf1..0000000
--- a/libs/protobuf/python/setup.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-[bdist_wheel]
-universal = 1
diff --git a/libs/protobuf/python/setup.py b/libs/protobuf/python/setup.py
deleted file mode 100755
index cbb9a59..0000000
--- a/libs/protobuf/python/setup.py
+++ /dev/null
@@ -1,358 +0,0 @@
-#! /usr/bin/env python
-#
-# See README for usage instructions.
-
-# pylint:disable=missing-module-docstring
-# pylint:disable=g-bad-import-order
-from distutils import util
-import fnmatch
-import glob
-import os
-import pkg_resources
-import re
-import subprocess
-import sys
-import sysconfig
-
-# pylint:disable=g-importing-member
-# pylint:disable=g-multiple-import
-
-# We must use setuptools, not distutils, because we need to use the
-# namespace_packages option for the "google" package.
-from setuptools import setup, Extension, find_packages
-
-from distutils.command.build_ext import build_ext as _build_ext
-from distutils.command.build_py import build_py as _build_py
-from distutils.command.clean import clean as _clean
-from distutils.spawn import find_executable
-
-# Find the Protocol Compiler.
-if 'PROTOC' in os.environ and os.path.exists(os.environ['PROTOC']):
-  protoc = os.environ['PROTOC']
-elif os.path.exists('../src/protoc'):
-  protoc = '../src/protoc'
-elif os.path.exists('../src/protoc.exe'):
-  protoc = '../src/protoc.exe'
-elif os.path.exists('../vsprojects/Debug/protoc.exe'):
-  protoc = '../vsprojects/Debug/protoc.exe'
-elif os.path.exists('../vsprojects/Release/protoc.exe'):
-  protoc = '../vsprojects/Release/protoc.exe'
-else:
-  protoc = find_executable('protoc')
-
-
-def GetVersion():
-  """Reads and returns the version from google/protobuf/__init__.py.
-
-  Do not import google.protobuf.__init__ directly, because an installed
-  protobuf library may be loaded instead.
-
-  Returns:
-      The version.
-  """
-
-  with open(os.path.join('google', 'protobuf', '__init__.py')) as version_file:
-    exec(version_file.read(), globals())  # pylint:disable=exec-used
-    return __version__  # pylint:disable=undefined-variable
-
-
-def GenProto(source, require=True):
-  """Generates a _pb2.py from the given .proto file.
-
-  Does nothing if the output already exists and is newer than the input.
-
-  Args:
-      source: the .proto file path.
-      require: if True, exit immediately when a path is not found.
-  """
-
-  if not require and not os.path.exists(source):
-    return
-
-  output = source.replace('.proto', '_pb2.py').replace('../src/', '')
-
-  if (not os.path.exists(output) or
-      (os.path.exists(source) and
-       os.path.getmtime(source) > os.path.getmtime(output))):
-    print('Generating %s...' % output)
-
-    if not os.path.exists(source):
-      sys.stderr.write("Can't find required file: %s\n" % source)
-      sys.exit(-1)
-
-    if protoc is None:
-      sys.stderr.write(
-          'protoc is not installed nor found in ../src.  Please compile it '
-          'or install the binary package.\n')
-      sys.exit(-1)
-
-    protoc_command = [protoc, '-I../src', '-I.', '--python_out=.', source]
-    if subprocess.call(protoc_command) != 0:
-      sys.exit(-1)
-
-
-def GenerateUnittestProtos():
-  """Generates protobuf code for unittests."""
-  GenProto('../src/google/protobuf/any_test.proto', False)
-  GenProto('../src/google/protobuf/map_proto2_unittest.proto', False)
-  GenProto('../src/google/protobuf/map_unittest.proto', False)
-  GenProto('../src/google/protobuf/test_messages_proto3.proto', False)
-  GenProto('../src/google/protobuf/test_messages_proto2.proto', False)
-  GenProto('../src/google/protobuf/unittest_arena.proto', False)
-  GenProto('../src/google/protobuf/unittest.proto', False)
-  GenProto('../src/google/protobuf/unittest_custom_options.proto', False)
-  GenProto('../src/google/protobuf/unittest_import.proto', False)
-  GenProto('../src/google/protobuf/unittest_import_public.proto', False)
-  GenProto('../src/google/protobuf/unittest_mset.proto', False)
-  GenProto('../src/google/protobuf/unittest_mset_wire_format.proto', False)
-  GenProto('../src/google/protobuf/unittest_no_generic_services.proto', False)
-  GenProto('../src/google/protobuf/unittest_proto3_arena.proto', False)
-  GenProto('../src/google/protobuf/util/json_format.proto', False)
-  GenProto('../src/google/protobuf/util/json_format_proto3.proto', False)
-  GenProto('google/protobuf/internal/any_test.proto', False)
-  GenProto('google/protobuf/internal/descriptor_pool_test1.proto', False)
-  GenProto('google/protobuf/internal/descriptor_pool_test2.proto', False)
-  GenProto('google/protobuf/internal/factory_test1.proto', False)
-  GenProto('google/protobuf/internal/factory_test2.proto', False)
-  GenProto('google/protobuf/internal/file_options_test.proto', False)
-  GenProto('google/protobuf/internal/import_test_package/import_public.proto',
-           False)
-  GenProto(
-      'google/protobuf/internal/import_test_package/import_public_nested.proto',
-      False)
-  GenProto('google/protobuf/internal/import_test_package/inner.proto', False)
-  GenProto('google/protobuf/internal/import_test_package/outer.proto', False)
-  GenProto('google/protobuf/internal/missing_enum_values.proto', False)
-  GenProto('google/protobuf/internal/message_set_extensions.proto', False)
-  GenProto('google/protobuf/internal/more_extensions.proto', False)
-  GenProto('google/protobuf/internal/more_extensions_dynamic.proto', False)
-  GenProto('google/protobuf/internal/more_messages.proto', False)
-  GenProto('google/protobuf/internal/no_package.proto', False)
-  GenProto('google/protobuf/internal/packed_field_test.proto', False)
-  GenProto('google/protobuf/internal/test_bad_identifiers.proto', False)
-  GenProto('google/protobuf/internal/test_proto3_optional.proto', False)
-  GenProto('google/protobuf/pyext/python.proto', False)
-
-
-class CleanCmd(_clean):
-  """Custom clean command for building the protobuf extension."""
-
-  def run(self):
-    # Delete generated files in the code tree.
-    for (dirpath, unused_dirnames, filenames) in os.walk('.'):
-      for filename in filenames:
-        filepath = os.path.join(dirpath, filename)
-        if (filepath.endswith('_pb2.py') or filepath.endswith('.pyc') or
-            filepath.endswith('.so') or filepath.endswith('.o')):
-          os.remove(filepath)
-    # _clean is an old-style class, so super() doesn't work.
-    _clean.run(self)
-
-
-class BuildPyCmd(_build_py):
-  """Custom build_py command for building the protobuf runtime."""
-
-  def run(self):
-    # Generate necessary .proto file if it doesn't exist.
-    GenProto('../src/google/protobuf/descriptor.proto')
-    GenProto('../src/google/protobuf/compiler/plugin.proto')
-    GenProto('../src/google/protobuf/any.proto')
-    GenProto('../src/google/protobuf/api.proto')
-    GenProto('../src/google/protobuf/duration.proto')
-    GenProto('../src/google/protobuf/empty.proto')
-    GenProto('../src/google/protobuf/field_mask.proto')
-    GenProto('../src/google/protobuf/source_context.proto')
-    GenProto('../src/google/protobuf/struct.proto')
-    GenProto('../src/google/protobuf/timestamp.proto')
-    GenProto('../src/google/protobuf/type.proto')
-    GenProto('../src/google/protobuf/wrappers.proto')
-    GenerateUnittestProtos()
-
-    # _build_py is an old-style class, so super() doesn't work.
-    _build_py.run(self)
-
-  def find_package_modules(self, package, package_dir):
-    exclude = (
-        '*test*',
-        'google/protobuf/internal/*_pb2.py',
-        'google/protobuf/internal/_parameterized.py',
-        'google/protobuf/pyext/python_pb2.py',
-    )
-    modules = _build_py.find_package_modules(self, package, package_dir)
-    return [(pkg, mod, fil) for (pkg, mod, fil) in modules
-            if not any(fnmatch.fnmatchcase(fil, pat=pat) for pat in exclude)]
-
-
-class BuildExtCmd(_build_ext):
-  """Command class for building the protobuf Python extension."""
-
-  def get_ext_filename(self, ext_name):
-    # since python3.5, python extensions' shared libraries use a suffix that
-    # corresponds to the value of sysconfig.get_config_var('EXT_SUFFIX') and
-    # contains info about the architecture the library targets.  E.g. on x64
-    # linux the suffix is ".cpython-XYZ-x86_64-linux-gnu.so" When
-    # crosscompiling python wheels, we need to be able to override this
-    # suffix so that the resulting file name matches the target architecture
-    # and we end up with a well-formed wheel.
-    filename = _build_ext.get_ext_filename(self, ext_name)
-    orig_ext_suffix = sysconfig.get_config_var('EXT_SUFFIX')
-    new_ext_suffix = os.getenv('PROTOCOL_BUFFERS_OVERRIDE_EXT_SUFFIX')
-    if new_ext_suffix and filename.endswith(orig_ext_suffix):
-      filename = filename[:-len(orig_ext_suffix)] + new_ext_suffix
-    return filename
-
-
-class TestConformanceCmd(_build_py):
-  target = 'test_python'
-
-  def run(self):
-    # Python 2.6 dodges these extra failures.
-    os.environ['CONFORMANCE_PYTHON_EXTRA_FAILURES'] = (
-        '--failure_list failure_list_python-post26.txt')
-    cmd = 'cd ../conformance && make %s' % (TestConformanceCmd.target)
-    subprocess.check_call(cmd, shell=True)
-
-
-def GetOptionFromArgv(option_str):
-  if option_str in sys.argv:
-    sys.argv.remove(option_str)
-    return True
-  return False
-
-
-if __name__ == '__main__':
-  ext_module_list = []
-  warnings_as_errors = '--warnings_as_errors'
-  if GetOptionFromArgv('--cpp_implementation'):
-    # Link libprotobuf.a and libprotobuf-lite.a statically with the
-    # extension. Note that those libraries have to be compiled with
-    # -fPIC for this to work.
-    compile_static_ext = GetOptionFromArgv('--compile_static_extension')
-    libraries = ['protobuf']
-    extra_objects = None
-    if compile_static_ext:
-      libraries = None
-      extra_objects = ['../src/.libs/libprotobuf.a',
-                       '../src/.libs/libprotobuf-lite.a']
-    TestConformanceCmd.target = 'test_python_cpp'
-
-    extra_compile_args = []
-
-    message_extra_link_args = None
-    api_implementation_link_args = None
-    if 'darwin' in sys.platform:
-      if sys.version_info[0] == 2:
-        message_init_symbol = 'init_message'
-        api_implementation_init_symbol = 'init_api_implementation'
-      else:
-        message_init_symbol = 'PyInit__message'
-        api_implementation_init_symbol = 'PyInit__api_implementation'
-      message_extra_link_args = [
-          '-Wl,-exported_symbol,_%s' % message_init_symbol
-      ]
-      api_implementation_link_args = [
-          '-Wl,-exported_symbol,_%s' % api_implementation_init_symbol
-      ]
-
-    if sys.platform != 'win32':
-      extra_compile_args.append('-Wno-write-strings')
-      extra_compile_args.append('-Wno-invalid-offsetof')
-      extra_compile_args.append('-Wno-sign-compare')
-      extra_compile_args.append('-Wno-unused-variable')
-      extra_compile_args.append('-std=c++11')
-
-    if sys.platform == 'darwin':
-      extra_compile_args.append('-Wno-shorten-64-to-32')
-      extra_compile_args.append('-Wno-deprecated-register')
-
-    # https://developer.apple.com/documentation/xcode_release_notes/xcode_10_release_notes
-    # C++ projects must now migrate to libc++ and are recommended to set a
-    # deployment target of macOS 10.9 or later, or iOS 7 or later.
-    if sys.platform == 'darwin':
-      mac_target = str(sysconfig.get_config_var('MACOSX_DEPLOYMENT_TARGET'))
-      if mac_target and (pkg_resources.parse_version(mac_target) <
-                         pkg_resources.parse_version('10.9.0')):
-        os.environ['MACOSX_DEPLOYMENT_TARGET'] = '10.9'
-        os.environ['_PYTHON_HOST_PLATFORM'] = re.sub(
-            r'macosx-[0-9]+\.[0-9]+-(.+)', r'macosx-10.9-\1',
-            util.get_platform())
-
-    # https://github.com/Theano/Theano/issues/4926
-    if sys.platform == 'win32':
-      extra_compile_args.append('-D_hypot=hypot')
-
-    # https://github.com/tpaviot/pythonocc-core/issues/48
-    if sys.platform == 'win32' and  '64 bit' in sys.version:
-      extra_compile_args.append('-DMS_WIN64')
-
-    # MSVS default is dymanic
-    if sys.platform == 'win32':
-      extra_compile_args.append('/MT')
-
-    if 'clang' in os.popen('$CC --version 2> /dev/null').read():
-      extra_compile_args.append('-Wno-shorten-64-to-32')
-
-    if warnings_as_errors in sys.argv:
-      extra_compile_args.append('-Werror')
-      sys.argv.remove(warnings_as_errors)
-
-    # C++ implementation extension
-    ext_module_list.extend([
-        Extension(
-            'google.protobuf.pyext._message',
-            glob.glob('google/protobuf/pyext/*.cc'),
-            include_dirs=['.', '../src'],
-            libraries=libraries,
-            extra_objects=extra_objects,
-            extra_link_args=message_extra_link_args,
-            library_dirs=['../src/.libs'],
-            extra_compile_args=extra_compile_args,
-        ),
-        Extension(
-            'google.protobuf.internal._api_implementation',
-            glob.glob('google/protobuf/internal/api_implementation.cc'),
-            extra_compile_args=(extra_compile_args +
-                                ['-DPYTHON_PROTO2_CPP_IMPL_V2']),
-            extra_link_args=api_implementation_link_args,
-        ),
-    ])
-    os.environ['PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION'] = 'cpp'
-
-  # Keep this list of dependencies in sync with tox.ini.
-  install_requires = []
-
-  setup(
-      name='protobuf',
-      version=GetVersion(),
-      description='Protocol Buffers',
-      download_url='https://github.com/protocolbuffers/protobuf/releases',
-      long_description="Protocol Buffers are Google's data interchange format",
-      url='https://developers.google.com/protocol-buffers/',
-      maintainer='protobuf@googlegroups.com',
-      maintainer_email='protobuf@googlegroups.com',
-      license='BSD-3-Clause',
-      classifiers=[
-          'Programming Language :: Python',
-          'Programming Language :: Python :: 3',
-          'Programming Language :: Python :: 3.7',
-          'Programming Language :: Python :: 3.8',
-          'Programming Language :: Python :: 3.9',
-          'Programming Language :: Python :: 3.10',
-      ],
-      namespace_packages=['google'],
-      packages=find_packages(
-          exclude=[
-              'import_test_package',
-              'protobuf_distutils',
-          ],),
-      test_suite='google.protobuf.internal',
-      cmdclass={
-          'clean': CleanCmd,
-          'build_py': BuildPyCmd,
-          'build_ext': BuildExtCmd,
-          'test_conformance': TestConformanceCmd,
-      },
-      install_requires=install_requires,
-      ext_modules=ext_module_list,
-      python_requires='>=3.7',
-  )
diff --git a/libs/protobuf/python/stubout.py b/libs/protobuf/python/stubout.py
deleted file mode 100755
index ba39104..0000000
--- a/libs/protobuf/python/stubout.py
+++ /dev/null
@@ -1,143 +0,0 @@
-#!/usr/bin/python2.4
-#
-# Copyright 2008 Google Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# This file is used for testing.  The original is at:
-#   http://code.google.com/p/pymox/
-
-import inspect
-
-
-class StubOutForTesting:
-  """Sample Usage:
-     You want os.path.exists() to always return true during testing.
-
-     stubs = StubOutForTesting()
-     stubs.Set(os.path, 'exists', lambda x: 1)
-       ...
-     stubs.UnsetAll()
-
-     The above changes os.path.exists into a lambda that returns 1.  Once
-     the ... part of the code finishes, the UnsetAll() looks up the old value
-     of os.path.exists and restores it.
-
-  """
-  def __init__(self):
-    self.cache = []
-    self.stubs = []
-
-  def __del__(self):
-    self.SmartUnsetAll()
-    self.UnsetAll()
-
-  def SmartSet(self, obj, attr_name, new_attr):
-    """Replace obj.attr_name with new_attr. This method is smart and works
-       at the module, class, and instance level while preserving proper
-       inheritance. It will not stub out C types however unless that has been
-       explicitly allowed by the type.
-
-       This method supports the case where attr_name is a staticmethod or a
-       classmethod of obj.
-
-       Notes:
-      - If obj is an instance, then it is its class that will actually be
-        stubbed. Note that the method Set() does not do that: if obj is
-        an instance, it (and not its class) will be stubbed.
-      - The stubbing is using the builtin getattr and setattr. So, the __get__
-        and __set__ will be called when stubbing (TODO: A better idea would
-        probably be to manipulate obj.__dict__ instead of getattr() and
-        setattr()).
-
-       Raises AttributeError if the attribute cannot be found.
-    """
-    if (inspect.ismodule(obj) or
-        (not inspect.isclass(obj) and obj.__dict__.has_key(attr_name))):
-      orig_obj = obj
-      orig_attr = getattr(obj, attr_name)
-
-    else:
-      if not inspect.isclass(obj):
-        mro = list(inspect.getmro(obj.__class__))
-      else:
-        mro = list(inspect.getmro(obj))
-
-      mro.reverse()
-
-      orig_attr = None
-
-      for cls in mro:
-        try:
-          orig_obj = cls
-          orig_attr = getattr(obj, attr_name)
-        except AttributeError:
-          continue
-
-    if orig_attr is None:
-      raise AttributeError("Attribute not found.")
-
-    # Calling getattr() on a staticmethod transforms it to a 'normal' function.
-    # We need to ensure that we put it back as a staticmethod.
-    old_attribute = obj.__dict__.get(attr_name)
-    if old_attribute is not None and isinstance(old_attribute, staticmethod):
-      orig_attr = staticmethod(orig_attr)
-
-    self.stubs.append((orig_obj, attr_name, orig_attr))
-    setattr(orig_obj, attr_name, new_attr)
-
-  def SmartUnsetAll(self):
-    """Reverses all the SmartSet() calls, restoring things to their original
-    definition.  Its okay to call SmartUnsetAll() repeatedly, as later calls
-    have no effect if no SmartSet() calls have been made.
-
-    """
-    self.stubs.reverse()
-
-    for args in self.stubs:
-      setattr(*args)
-
-    self.stubs = []
-
-  def Set(self, parent, child_name, new_child):
-    """Replace child_name's old definition with new_child, in the context
-    of the given parent.  The parent could be a module when the child is a
-    function at module scope.  Or the parent could be a class when a class'
-    method is being replaced.  The named child is set to new_child, while
-    the prior definition is saved away for later, when UnsetAll() is called.
-
-    This method supports the case where child_name is a staticmethod or a
-    classmethod of parent.
-    """
-    old_child = getattr(parent, child_name)
-
-    old_attribute = parent.__dict__.get(child_name)
-    if old_attribute is not None and isinstance(old_attribute, staticmethod):
-      old_child = staticmethod(old_child)
-
-    self.cache.append((parent, old_child, child_name))
-    setattr(parent, child_name, new_child)
-
-  def UnsetAll(self):
-    """Reverses all the Set() calls, restoring things to their original
-    definition.  Its okay to call UnsetAll() repeatedly, as later calls have
-    no effect if no Set() calls have been made.
-
-    """
-    # Undo calls to Set() in reverse order, in case Set() was called on the
-    # same arguments repeatedly (want the original call to be last one undone)
-    self.cache.reverse()
-
-    for (parent, old_child, child_name) in self.cache:
-      setattr(parent, child_name, old_child)
-    self.cache = []
diff --git a/libs/protobuf/python/tox.ini b/libs/protobuf/python/tox.ini
deleted file mode 100644
index b923a4a..0000000
--- a/libs/protobuf/python/tox.ini
+++ /dev/null
@@ -1,21 +0,0 @@
-[tox]
-envlist =
-    py{37,38,39,310}-{cpp,python}
-
-[testenv]
-usedevelop=true
-passenv =
-    CC KOKORO_BUILD_ID KOKORO_BUILD_NUMBER
-setenv =
-    cpp: LD_LIBRARY_PATH={toxinidir}/../src/.libs
-    cpp: DYLD_LIBRARY_PATH={toxinidir}/../src/.libs
-    cpp: PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=cpp
-    python: PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=python
-commands =
-    python setup.py -q build_py
-    python: python setup.py -q build
-    py{37,38,39,310}-cpp: python setup.py -q build --cpp_implementation --warnings_as_errors --compile_static_extension
-    python: python setup.py -q test -q
-    cpp: python setup.py -q test -q --cpp_implementation
-    python: python setup.py -q test_conformance
-    cpp: python setup.py -q test_conformance --cpp_implementation
diff --git a/libs/protobuf/ruby/.gitignore b/libs/protobuf/ruby/.gitignore
deleted file mode 100644
index 6533098..0000000
--- a/libs/protobuf/ruby/.gitignore
+++ /dev/null
@@ -1,9 +0,0 @@
-*.bundle
-tags
-.idea/
-lib/google/protobuf_java.jar
-protobuf-jruby.iml
-target/
-pkg/
-tmp/
-tests/google/
\ No newline at end of file
diff --git a/libs/protobuf/ruby/BUILD.bazel b/libs/protobuf/ruby/BUILD.bazel
deleted file mode 100644
index fe336e5..0000000
--- a/libs/protobuf/ruby/BUILD.bazel
+++ /dev/null
@@ -1,34 +0,0 @@
-# Protobuf Ruby runtime
-#
-# See also code generation logic under /src/google/protobuf/compiler/ruby.
-
-load("@rules_pkg//:mappings.bzl", "pkg_files", "strip_prefix")
-
-pkg_files(
-    name = "dist_files",
-    srcs = glob([
-        "compatibility_tests/v3.0.0/**/*",
-        "ext/google/protobuf_c/*",
-        "src/main/java/com/google/protobuf/jruby/*.java",
-        "tests/*.proto",
-        "tests/*.rb",
-    ]) + [
-        ".gitignore",
-        "BUILD.bazel",
-        "Gemfile",
-        "README.md",
-        "Rakefile",
-        "google-protobuf.gemspec",
-        "lib/google/protobuf.rb",
-        "lib/google/protobuf/descriptor_dsl.rb",
-        "lib/google/protobuf/message_exts.rb",
-        "lib/google/protobuf/repeated_field.rb",
-        "lib/google/protobuf/well_known_types.rb",
-        "pom.xml",
-        "src/main/java/google/ProtobufJavaService.java",
-        "src/main/sentinel.proto",
-        "travis-test.sh",
-    ],
-    strip_prefix = strip_prefix.from_root(""),
-    visibility = ["//pkg:__pkg__"],
-)
diff --git a/libs/protobuf/ruby/Gemfile b/libs/protobuf/ruby/Gemfile
deleted file mode 100644
index fa75df1..0000000
--- a/libs/protobuf/ruby/Gemfile
+++ /dev/null
@@ -1,3 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec
diff --git a/libs/protobuf/ruby/README.md b/libs/protobuf/ruby/README.md
deleted file mode 100644
index 42a1ffa..0000000
--- a/libs/protobuf/ruby/README.md
+++ /dev/null
@@ -1,111 +0,0 @@
-This directory contains the Ruby extension that implements Protocol Buffers
-functionality in Ruby.
-
-The Ruby extension makes use of generated Ruby code that defines message and
-enum types in a Ruby DSL. You may write definitions in this DSL directly, but
-we recommend using protoc's Ruby generation support with .proto files. The
-build process in this directory only installs the extension; you need to
-install protoc as well to have Ruby code generation functionality.
-
-Installation from Gem
----------------------
-In Gemfile (Please check a version of Protocol Buffers you needed [RubyGems](https://rubygems.org/gems/google-protobuf)):
-
-    gem 'google-protobuf'
-
-Or for using this pre-packaged gem, simply install it as you would any other gem:
-
-    $ gem install [--prerelease] google-protobuf
-
-Once the gem is installed, you may or may not need `protoc`. If you write your
-message type descriptions directly in the Ruby DSL, you do not need it.
-However, if you wish to generate the Ruby DSL from a `.proto` file, you will
-also want to install Protocol Buffers itself, as described in this repository's
-main `README` file. The version of `protoc` included in the latest release
-supports the `--ruby_out` option to generate Ruby code.
-
-A simple example of using the Ruby extension follows. More extensive
-documentation may be found in the RubyDoc comments (`call-seq` tags) in the
-source, and we plan to release separate, more detailed, documentation at a
-later date.
-
-```ruby
-require 'google/protobuf'
-
-# generated from my_proto_types.proto with protoc:
-#  $ protoc --ruby_out=. my_proto_types.proto
-require 'my_proto_types'
-
-mymessage = MyTestMessage.new(:field1 => 42, :field2 => ["a", "b", "c"])
-mymessage.field1 = 43
-mymessage.field2.push("d")
-mymessage.field3 = SubMessage.new(:foo => 100)
-
-encoded_data = MyTestMessage.encode(mymessage)
-decoded = MyTestMessage.decode(encoded_data)
-assert decoded == mymessage
-
-puts "JSON:"
-puts MyTestMessage.encode_json(mymessage)
-```
-
-Installation from Source (Building Gem)
----------------------------------------
-
-To build this Ruby extension, you will need:
-
-* Rake
-* Bundler
-* Ruby development headers
-* a C compiler
-
-To Build the JRuby extension, you will need:
-
-* Maven
-* The latest version of the protobuf java library (see ../java/README.md)
-* Install JRuby via rbenv or RVM
-
-First switch to the desired platform with rbenv or RVM.
-
-Then install the required Ruby gems:
-
-    $ gem install bundler
-    $ bundle
-
-Then build the Gem:
-
-    $ rake
-    $ rake clobber_package gem
-    $ gem install `ls pkg/google-protobuf-*.gem`
-
-To run the specs:
-
-    $ rake test
-
-This gem includes the upb parsing and serialization library as a single-file
-amalgamation. It is up-to-date with upb git commit
-`535bc2fe2f2b467f59347ffc9449e11e47791257`.
-
-Version Number Scheme
----------------------
-
-We are using a version number scheme that is a hybrid of Protocol Buffers'
-overall version number and some Ruby-specific rules. Gem does not allow
-re-uploads of a gem with the same version number, so we add a sequence number
-("upload version") to the version. We also format alphabetical tags (alpha,
-pre, ...) slightly differently, and we avoid hyphens. In more detail:
-
-* First, we determine the prefix: a Protocol Buffers version "3.0.0-alpha-2"
-  becomes "3.0.0.alpha.2". When we release 3.0.0, this prefix will be simply
-  "3.0.0".
-* We then append the upload version: "3.0.0.alpha.2.0" or "3.0.0.0". If we need
-  to upload a new version of the gem to fix an issue, the version becomes
-  "3.0.0.alpha.2.1" or "3.0.0.1".
-* If we are working on a prerelease version, we append a prerelease tag:
-  "3.0.0.alpha.3.0.pre". The prerelease tag comes at the end so that when
-  version numbers are sorted, any prerelease builds are ordered between the
-  prior version and current version.
-
-These rules are designed to work with the sorting rules for
-[Gem::Version](http://ruby-doc.org/stdlib-2.0/libdoc/rubygems/rdoc/Gem/Version.html):
-release numbers should sort in actual release order.
diff --git a/libs/protobuf/ruby/Rakefile b/libs/protobuf/ruby/Rakefile
deleted file mode 100644
index d8ac763..0000000
--- a/libs/protobuf/ruby/Rakefile
+++ /dev/null
@@ -1,169 +0,0 @@
-require "rubygems"
-require "rubygems/package_task"
-require "rake/extensiontask" unless RUBY_PLATFORM == "java"
-require "rake/testtask"
-
-spec = Gem::Specification.load("google-protobuf.gemspec")
-
-well_known_protos = %w[
-  google/protobuf/any.proto
-  google/protobuf/api.proto
-  google/protobuf/descriptor.proto
-  google/protobuf/duration.proto
-  google/protobuf/empty.proto
-  google/protobuf/field_mask.proto
-  google/protobuf/source_context.proto
-  google/protobuf/struct.proto
-  google/protobuf/timestamp.proto
-  google/protobuf/type.proto
-  google/protobuf/wrappers.proto
-]
-
-test_protos = %w[
-  tests/basic_test.proto
-  tests/basic_test_proto2.proto
-  tests/generated_code.proto
-  tests/generated_code_proto2.proto
-  tests/multi_level_nesting_test.proto
-  tests/test_import.proto
-  tests/test_import_proto2.proto
-  tests/test_ruby_package.proto
-  tests/test_ruby_package_proto2.proto
-]
-
-# These are omitted for now because we don't support proto2.
-proto2_protos = %w[
-  google/protobuf/descriptor.proto
-  google/protobuf/compiler/plugin.proto
-]
-
-if !ENV['PROTOC'].nil?
-  protoc_command = ENV['PROTOC']
-elsif system('../src/protoc --version')
-  protoc_command = '../src/protoc'
-else
-  protoc_command = 'protoc'
-end
-
-genproto_output = []
-
-# We won't have access to .. from within docker, but the proto files
-# will be there, thanks to the :genproto rule dependency for gem:native.
-unless ENV['IN_DOCKER'] == 'true'
-  well_known_protos.each do |proto_file|
-    input_file = "../src/" + proto_file
-    output_file = "lib/" + proto_file.sub(/\.proto$/, "_pb.rb")
-    genproto_output << output_file
-    file output_file => input_file do |file_task|
-      sh "#{protoc_command} -I../src --ruby_out=lib #{input_file}"
-    end
-  end
-
-  test_protos.each do |proto_file|
-    output_file = proto_file.sub(/\.proto$/, "_pb.rb")
-    genproto_output << output_file
-    file output_file => proto_file do |file_task|
-      sh "#{protoc_command} -I../src -I. -I./tests --ruby_out=.  #{proto_file}"
-    end
-  end
-end
-
-if RUBY_PLATFORM == "java"
-  task :clean => :require_mvn do
-    system("mvn --batch-mode clean")
-  end
-
-  task :compile => :require_mvn do
-    system("mvn --batch-mode package")
-  end
-
-  task :require_mvn do
-    raise ArgumentError, "maven needs to be installed" if `which mvn` == ''
-  end
-
-else
-  unless ENV['IN_DOCKER'] == 'true'
-    # We need utf8_range in-tree.
-    FileUtils.mkdir_p("ext/google/protobuf_c/third_party/utf8_range")
-    FileUtils.cp("../third_party/utf8_range/utf8_range.h", "ext/google/protobuf_c/third_party/utf8_range")
-    FileUtils.cp("../third_party/utf8_range/naive.c", "ext/google/protobuf_c/third_party/utf8_range")
-    FileUtils.cp("../third_party/utf8_range/range2-neon.c", "ext/google/protobuf_c/third_party/utf8_range")
-    FileUtils.cp("../third_party/utf8_range/range2-sse.c", "ext/google/protobuf_c/third_party/utf8_range")
-    FileUtils.cp("../third_party/utf8_range/LICENSE", "ext/google/protobuf_c/third_party/utf8_range")
-  end
-
-  Rake::ExtensionTask.new("protobuf_c", spec) do |ext|
-    unless RUBY_PLATFORM =~ /darwin/
-      # TODO: also set "no_native to true" for mac if possible. As is,
-      # "no_native" can only be set if the RUBY_PLATFORM doing
-      # cross-compilation is contained in the "ext.cross_platform" array.
-      ext.no_native = true
-    end
-    ext.ext_dir = "ext/google/protobuf_c"
-    ext.lib_dir = "lib/google"
-    ext.cross_compile = true
-    ext.cross_platform = [
-      'x86-mingw32', 'x64-mingw32', 'x64-mingw-ucrt',
-      'x86_64-linux', 'x86-linux',
-      'x86_64-darwin', 'arm64-darwin',
-    ]
-  end
-
-  task 'gem:java' do
-    sh "rm Gemfile.lock"
-    require 'rake_compiler_dock'
-    # Specify the repo root as the working and mount directory to provide access
-    # to the java directory
-    repo_root = File.realdirpath File.join(Dir.pwd, '..')
-    RakeCompilerDock.sh <<-"EOT", platform: 'jruby', rubyvm: :jruby, mountdir: repo_root, workdir: repo_root
-      sudo apt-get install maven -y && \
-      cd java && mvn install -Dmaven.test.skip=true && cd ../ruby && \
-      bundle && \
-      IN_DOCKER=true rake compile gem
-    EOT
-  end
-
-  task 'gem:windows' do
-    sh "rm Gemfile.lock"
-    require 'rake_compiler_dock'
-    ['x86-mingw32', 'x64-mingw32', 'x64-mingw-ucrt', 'x86_64-linux', 'x86-linux'].each do |plat|
-      RakeCompilerDock.sh <<-"EOT", platform: plat
-        bundle && \
-        IN_DOCKER=true rake native:#{plat} pkg/#{spec.full_name}-#{plat}.gem RUBY_CC_VERSION=3.1.0:3.0.0:2.7.0:2.6.0:2.5.0
-      EOT
-    end
-  end
-
-  if RUBY_PLATFORM =~ /darwin/
-    task 'gem:native' do
-      system "rake genproto"
-      system "rake cross native gem RUBY_CC_VERSION=3.1.0:3.0.0:2.7.0:2.6.0:2.5.1"
-    end
-  else
-    task 'gem:native' => [:genproto, 'gem:windows', 'gem:java']
-  end
-end
-
-task :genproto => genproto_output
-
-task :clean do
-  sh "rm -f #{genproto_output.join(' ')}"
-end
-
-Gem::PackageTask.new(spec) do |pkg|
-end
-
-Rake::TestTask.new(:test => [:build, :genproto]) do |t|
-  t.test_files = FileList["tests/*.rb"].exclude("tests/gc_test.rb", "tests/common_tests.rb")
-end
-
-# gc_test needs to be split out to ensure the generated file hasn't been
-# imported by other tests.
-Rake::TestTask.new(:gc_test => :build) do |t|
-  t.test_files = FileList["tests/gc_test.rb"]
-end
-
-task :build => [:clean, :genproto, :compile]
-task :default => [:build]
-
-# vim:sw=2:et
diff --git a/libs/protobuf/ruby/compatibility_tests/v3.0.0/README.md b/libs/protobuf/ruby/compatibility_tests/v3.0.0/README.md
deleted file mode 100644
index 06d981c..0000000
--- a/libs/protobuf/ruby/compatibility_tests/v3.0.0/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# Protobuf Ruby Compatibility Tests
-
-This directory contains a snapshot of protobuf ruby 3.0.0 unittest code and
-test scripts used to verifies whether the latest version of protobuf is
-still compatible with 3.0.0 generated code.
diff --git a/libs/protobuf/ruby/compatibility_tests/v3.0.0/Rakefile b/libs/protobuf/ruby/compatibility_tests/v3.0.0/Rakefile
deleted file mode 100644
index 19a4ba1..0000000
--- a/libs/protobuf/ruby/compatibility_tests/v3.0.0/Rakefile
+++ /dev/null
@@ -1,25 +0,0 @@
-require "rake/testtask"
-
-# Proto for tests.
-genproto_output = []
-genproto_output << "tests/generated_code.rb"
-genproto_output << "tests/test_import.rb"
-file "tests/generated_code.rb" => "tests/generated_code.proto" do |file_task|
-  sh "./protoc --ruby_out=. tests/generated_code.proto"
-end
-
-file "tests/test_import.rb" => "tests/test_import.proto" do |file_task|
-  sh "./protoc --ruby_out=. tests/test_import.proto"
-end
-
-task :genproto => genproto_output
-
-task :clean do
-  sh "rm -f #{genproto_output.join(' ')}"
-end
-
-Rake::TestTask.new(:test => :genproto) do |t|
-  t.test_files = FileList["tests/*.rb"]
-end
-
-task :default => [:test]
diff --git a/libs/protobuf/ruby/compatibility_tests/v3.0.0/test.sh b/libs/protobuf/ruby/compatibility_tests/v3.0.0/test.sh
deleted file mode 100755
index 1a9b798..0000000
--- a/libs/protobuf/ruby/compatibility_tests/v3.0.0/test.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-# Change to the script's directory
-cd $(dirname $0)
-
-# Download 3.0.0 version of protoc
-PROTOC_BINARY_NAME="protoc-3.0.0-linux-x86_64.exe"
-if [ `uname` = "Darwin" ]; then
-  PROTOC_BINARY_NAME="protoc-3.0.0-osx-x86_64.exe"
-fi
-wget https://repo1.maven.org/maven2/com/google/protobuf/protoc/3.0.0/${PROTOC_BINARY_NAME} -O protoc
-chmod +x protoc
-
-# Run tests
-RUBYLIB=../../lib:. rake test
diff --git a/libs/protobuf/ruby/compatibility_tests/v3.0.0/tests/basic.rb b/libs/protobuf/ruby/compatibility_tests/v3.0.0/tests/basic.rb
deleted file mode 100755
index d45c196..0000000
--- a/libs/protobuf/ruby/compatibility_tests/v3.0.0/tests/basic.rb
+++ /dev/null
@@ -1,1276 +0,0 @@
-#!/usr/bin/ruby
-
-require 'google/protobuf'
-require 'test/unit'
-
-# ------------- generated code --------------
-
-module BasicTest
-  pool = Google::Protobuf::DescriptorPool.new
-  pool.build do
-    add_message "Foo" do
-      optional :bar, :message, 1, "Bar"
-      repeated :baz, :message, 2, "Baz"
-    end
-
-    add_message "Bar" do
-      optional :msg, :string, 1
-    end
-
-    add_message "Baz" do
-      optional :msg, :string, 1
-    end
-
-    add_message "TestMessage" do
-      optional :optional_int32,  :int32,        1
-      optional :optional_int64,  :int64,        2
-      optional :optional_uint32, :uint32,       3
-      optional :optional_uint64, :uint64,       4
-      optional :optional_bool,   :bool,         5
-      optional :optional_float,  :float,        6
-      optional :optional_double, :double,       7
-      optional :optional_string, :string,       8
-      optional :optional_bytes,  :bytes,        9
-      optional :optional_msg,    :message,      10, "TestMessage2"
-      optional :optional_enum,   :enum,         11, "TestEnum"
-
-      repeated :repeated_int32,  :int32,        12
-      repeated :repeated_int64,  :int64,        13
-      repeated :repeated_uint32, :uint32,       14
-      repeated :repeated_uint64, :uint64,       15
-      repeated :repeated_bool,   :bool,         16
-      repeated :repeated_float,  :float,        17
-      repeated :repeated_double, :double,       18
-      repeated :repeated_string, :string,       19
-      repeated :repeated_bytes,  :bytes,        20
-      repeated :repeated_msg,    :message,      21, "TestMessage2"
-      repeated :repeated_enum,   :enum,         22, "TestEnum"
-    end
-    add_message "TestMessage2" do
-      optional :foo, :int32, 1
-    end
-
-    add_message "Recursive1" do
-      optional :foo, :message, 1, "Recursive2"
-    end
-    add_message "Recursive2" do
-      optional :foo, :message, 1, "Recursive1"
-    end
-
-    add_enum "TestEnum" do
-      value :Default, 0
-      value :A, 1
-      value :B, 2
-      value :C, 3
-    end
-
-    add_message "BadFieldNames" do
-      optional :dup, :int32, 1
-      optional :class, :int32, 2
-    end
-
-    add_message "MapMessage" do
-      map :map_string_int32, :string, :int32, 1
-      map :map_string_msg, :string, :message, 2, "TestMessage2"
-    end
-    add_message "MapMessageWireEquiv" do
-      repeated :map_string_int32, :message, 1, "MapMessageWireEquiv_entry1"
-      repeated :map_string_msg, :message, 2, "MapMessageWireEquiv_entry2"
-    end
-    add_message "MapMessageWireEquiv_entry1" do
-      optional :key, :string, 1
-      optional :value, :int32, 2
-    end
-    add_message "MapMessageWireEquiv_entry2" do
-      optional :key, :string, 1
-      optional :value, :message, 2, "TestMessage2"
-    end
-
-    add_message "OneofMessage" do
-      oneof :my_oneof do
-        optional :a, :string, 1
-        optional :b, :int32, 2
-        optional :c, :message, 3, "TestMessage2"
-        optional :d, :enum, 4, "TestEnum"
-      end
-    end
-  end
-
-  Foo = pool.lookup("Foo").msgclass
-  Bar = pool.lookup("Bar").msgclass
-  Baz = pool.lookup("Baz").msgclass
-  TestMessage = pool.lookup("TestMessage").msgclass
-  TestMessage2 = pool.lookup("TestMessage2").msgclass
-  Recursive1 = pool.lookup("Recursive1").msgclass
-  Recursive2 = pool.lookup("Recursive2").msgclass
-  TestEnum = pool.lookup("TestEnum").enummodule
-  BadFieldNames = pool.lookup("BadFieldNames").msgclass
-  MapMessage = pool.lookup("MapMessage").msgclass
-  MapMessageWireEquiv = pool.lookup("MapMessageWireEquiv").msgclass
-  MapMessageWireEquiv_entry1 =
-    pool.lookup("MapMessageWireEquiv_entry1").msgclass
-  MapMessageWireEquiv_entry2 =
-    pool.lookup("MapMessageWireEquiv_entry2").msgclass
-  OneofMessage = pool.lookup("OneofMessage").msgclass
-
-# ------------ test cases ---------------
-
-  class MessageContainerTest < Test::Unit::TestCase
-
-    def test_defaults
-      m = TestMessage.new
-      assert m.optional_int32 == 0
-      assert m.optional_int64 == 0
-      assert m.optional_uint32 == 0
-      assert m.optional_uint64 == 0
-      assert m.optional_bool == false
-      assert m.optional_float == 0.0
-      assert m.optional_double == 0.0
-      assert m.optional_string == ""
-      assert m.optional_bytes == ""
-      assert m.optional_msg == nil
-      assert m.optional_enum == :Default
-    end
-
-    def test_setters
-      m = TestMessage.new
-      m.optional_int32 = -42
-      assert m.optional_int32 == -42
-      m.optional_int64 = -0x1_0000_0000
-      assert m.optional_int64 == -0x1_0000_0000
-      m.optional_uint32 = 0x9000_0000
-      assert m.optional_uint32 == 0x9000_0000
-      m.optional_uint64 = 0x9000_0000_0000_0000
-      assert m.optional_uint64 == 0x9000_0000_0000_0000
-      m.optional_bool = true
-      assert m.optional_bool == true
-      m.optional_float = 0.5
-      assert m.optional_float == 0.5
-      m.optional_double = 0.5
-      m.optional_string = "hello"
-      assert m.optional_string == "hello"
-      m.optional_bytes = "world".encode!('ASCII-8BIT')
-      assert m.optional_bytes == "world"
-      m.optional_msg = TestMessage2.new(:foo => 42)
-      assert m.optional_msg == TestMessage2.new(:foo => 42)
-      m.optional_msg = nil
-      assert m.optional_msg == nil
-    end
-
-    def test_ctor_args
-      m = TestMessage.new(:optional_int32 => -42,
-                          :optional_msg => TestMessage2.new,
-                          :optional_enum => :C,
-                          :repeated_string => ["hello", "there", "world"])
-      assert m.optional_int32 == -42
-      assert m.optional_msg.class == TestMessage2
-      assert m.repeated_string.length == 3
-      assert m.optional_enum == :C
-      assert m.repeated_string[0] == "hello"
-      assert m.repeated_string[1] == "there"
-      assert m.repeated_string[2] == "world"
-    end
-
-    def test_inspect
-      m = TestMessage.new(:optional_int32 => -42,
-                          :optional_enum => :A,
-                          :optional_msg => TestMessage2.new,
-                          :repeated_string => ["hello", "there", "world"])
-      expected = '<BasicTest::TestMessage: optional_int32: -42, optional_int64: 0, optional_uint32: 0, optional_uint64: 0, optional_bool: false, optional_float: 0.0, optional_double: 0.0, optional_string: "", optional_bytes: "", optional_msg: <BasicTest::TestMessage2: foo: 0>, optional_enum: :A, repeated_int32: [], repeated_int64: [], repeated_uint32: [], repeated_uint64: [], repeated_bool: [], repeated_float: [], repeated_double: [], repeated_string: ["hello", "there", "world"], repeated_bytes: [], repeated_msg: [], repeated_enum: []>'
-      assert_equal expected, m.inspect
-    end
-
-    def test_hash
-      m1 = TestMessage.new(:optional_int32 => 42)
-      m2 = TestMessage.new(:optional_int32 => 102)
-      assert m1.hash != 0
-      assert m2.hash != 0
-      # relying on the randomness here -- if hash function changes and we are
-      # unlucky enough to get a collision, then change the values above.
-      assert m1.hash != m2.hash
-    end
-
-    def test_unknown_field_errors
-      e = assert_raise NoMethodError do
-        TestMessage.new.hello
-      end
-      assert_match(/hello/, e.message)
-
-      e = assert_raise NoMethodError do
-        TestMessage.new.hello = "world"
-      end
-      assert_match(/hello/, e.message)
-    end
-
-    def test_initialization_map_errors
-      e = assert_raise ArgumentError do
-        TestMessage.new(:hello => "world")
-      end
-      assert_match(/hello/, e.message)
-
-      e = assert_raise ArgumentError do
-        MapMessage.new(:map_string_int32 => "hello")
-      end
-      assert_equal e.message, "Expected Hash object as initializer value for map field 'map_string_int32' (given String)."
-
-      e = assert_raise ArgumentError do
-        TestMessage.new(:repeated_uint32 => "hello")
-      end
-      assert_equal e.message, "Expected array as initializer value for repeated field 'repeated_uint32' (given String)."
-    end
-
-    def test_type_errors
-      m = TestMessage.new
-
-      # Use rescue to allow subclasses of error
-      success = false
-      begin
-        m.optional_int32 = "hello"
-      rescue TypeError
-        success = true
-      end
-      assert(success)
-
-      success = false
-      begin
-        m.optional_string = nil
-      rescue TypeError
-        success = true
-      end
-      assert(success)
-
-      success = false
-      begin
-        m.optional_bool = 42
-      rescue TypeError
-        success = true
-      end
-      assert(success)
-
-      success = false
-      begin
-        m.optional_msg = TestMessage.new  # expects TestMessage2
-      rescue TypeError
-        success = true
-      end
-      assert(success)
-
-      success = false
-      begin
-        m.repeated_int32 = []  # needs RepeatedField
-      rescue TypeError
-        success = true
-      end
-      assert(success)
-
-      success = false
-      begin
-        m.repeated_msg.push TestMessage.new
-      rescue TypeError
-        success = true
-      end
-      assert(success)
-    end
-
-    def test_string_encoding
-      m = TestMessage.new
-
-      # Assigning a normal (ASCII or UTF8) string to a bytes field, or
-      # ASCII-8BIT to a string field will convert to the proper encoding.
-      m.optional_bytes = "Test string ASCII".encode!('ASCII')
-      assert m.optional_bytes.frozen?
-      assert_equal Encoding::ASCII_8BIT, m.optional_bytes.encoding
-      assert_equal "Test string ASCII", m.optional_bytes
-
-      assert_raise Encoding::UndefinedConversionError do
-        m.optional_bytes = "Test string UTF-8 \u0100".encode!('UTF-8')
-      end
-
-      assert_raise Encoding::UndefinedConversionError do
-        m.optional_string = ["FFFF"].pack('H*')
-      end
-
-      # "Ordinary" use case.
-      m.optional_bytes = ["FFFF"].pack('H*')
-      m.optional_string = "\u0100"
-
-      # strings are immutable so we can't do this, but serialize should catch it.
-      m.optional_string = "asdf".encode!('UTF-8')
-      assert_raise do
-        m.optional_string.encode!('ASCII-8BIT')
-      end
-    end
-
-    def test_rptfield_int32
-      l = Google::Protobuf::RepeatedField.new(:int32)
-      assert l.count == 0
-      l = Google::Protobuf::RepeatedField.new(:int32, [1, 2, 3])
-      assert l.count == 3
-      assert_equal [1, 2, 3], l
-      assert_equal l, [1, 2, 3]
-      l.push 4
-      assert l == [1, 2, 3, 4]
-      dst_list = []
-      l.each { |val| dst_list.push val }
-      assert dst_list == [1, 2, 3, 4]
-      assert l.to_a == [1, 2, 3, 4]
-      assert l[0] == 1
-      assert l[3] == 4
-      l[0] = 5
-      assert l == [5, 2, 3, 4]
-
-      l2 = l.dup
-      assert l == l2
-      assert l.object_id != l2.object_id
-      l2.push 6
-      assert l.count == 4
-      assert l2.count == 5
-
-      assert l.inspect == '[5, 2, 3, 4]'
-
-      l.concat([7, 8, 9])
-      assert l == [5, 2, 3, 4, 7, 8, 9]
-      assert l.pop == 9
-      assert l == [5, 2, 3, 4, 7, 8]
-
-      success = false
-      begin
-        m = TestMessage.new
-        l.push m
-      rescue TypeError
-        success = true
-      end
-      assert(success)
-
-      m = TestMessage.new
-      m.repeated_int32 = l
-      assert m.repeated_int32 == [5, 2, 3, 4, 7, 8]
-      assert m.repeated_int32.object_id == l.object_id
-      l.push 42
-      assert m.repeated_int32.pop == 42
-
-      l3 = l + l.dup
-      assert l3.count == l.count * 2
-      l.count.times do |i|
-        assert l3[i] == l[i]
-        assert l3[l.count + i] == l[i]
-      end
-
-      l.clear
-      assert l.count == 0
-      l += [1, 2, 3, 4]
-      l.replace([5, 6, 7, 8])
-      assert l == [5, 6, 7, 8]
-
-      l4 = Google::Protobuf::RepeatedField.new(:int32)
-      l4[5] = 42
-      assert l4 == [0, 0, 0, 0, 0, 42]
-
-      l4 << 100
-      assert l4 == [0, 0, 0, 0, 0, 42, 100]
-      l4 << 101 << 102
-      assert l4 == [0, 0, 0, 0, 0, 42, 100, 101, 102]
-    end
-
-    def test_parent_rptfield
-      #make sure we set the RepeatedField and can add to it
-      m = TestMessage.new
-      assert m.repeated_string == []
-      m.repeated_string << 'ok'
-      m.repeated_string.push('ok2')
-      assert m.repeated_string == ['ok', 'ok2']
-      m.repeated_string += ['ok3']
-      assert m.repeated_string == ['ok', 'ok2', 'ok3']
-    end
-
-    def test_rptfield_msg
-      l = Google::Protobuf::RepeatedField.new(:message, TestMessage)
-      l.push TestMessage.new
-      assert l.count == 1
-
-      success = false
-      begin
-        l.push TestMessage2.new
-      rescue TypeError
-        success = true
-      end
-      assert(success)
-
-      success = false
-      begin
-        l.push 42
-      rescue TypeError
-        success = true
-      end
-      assert(success)
-
-      l2 = l.dup
-      assert l2[0] == l[0]
-      assert l2[0].object_id == l[0].object_id
-
-      l2 = Google::Protobuf.deep_copy(l)
-      assert l2[0] == l[0]
-      assert l2[0].object_id != l[0].object_id
-
-      l3 = l + l2
-      assert l3.count == 2
-      assert l3[0] == l[0]
-      assert l3[1] == l2[0]
-      l3[0].optional_int32 = 1000
-      assert l[0].optional_int32 == 1000
-
-      new_msg = TestMessage.new(:optional_int32 => 200)
-      l4 = l + [new_msg]
-      assert l4.count == 2
-      new_msg.optional_int32 = 1000
-      assert l4[1].optional_int32 == 1000
-    end
-
-    def test_rptfield_enum
-      l = Google::Protobuf::RepeatedField.new(:enum, TestEnum)
-      l.push :A
-      l.push :B
-      l.push :C
-      assert l.count == 3
-      assert_raise RangeError do
-        l.push :D
-      end
-      assert l[0] == :A
-
-      l.push 4
-      assert l[3] == 4
-    end
-
-    def test_rptfield_initialize
-      assert_raise ArgumentError do
-        l = Google::Protobuf::RepeatedField.new
-      end
-      assert_raise ArgumentError do
-        l = Google::Protobuf::RepeatedField.new(:message)
-      end
-      assert_raise ArgumentError do
-        l = Google::Protobuf::RepeatedField.new([1, 2, 3])
-      end
-      assert_raise ArgumentError do
-        l = Google::Protobuf::RepeatedField.new(:message, [TestMessage2.new])
-      end
-    end
-
-    def test_rptfield_array_ducktyping
-      l = Google::Protobuf::RepeatedField.new(:int32)
-      length_methods = %w(count length size)
-      length_methods.each do |lm|
-        assert l.send(lm)  == 0
-      end
-      # out of bounds returns a nil
-      assert l[0] == nil
-      assert l[1] == nil
-      assert l[-1] == nil
-      l.push 4
-      length_methods.each do |lm|
-        assert l.send(lm) == 1
-      end
-      assert l[0] == 4
-      assert l[1] == nil
-      assert l[-1] == 4
-      assert l[-2] == nil
-
-      l.push 2
-      length_methods.each do |lm|
-        assert l.send(lm) == 2
-      end
-      assert l[0] == 4
-      assert l[1] == 2
-      assert l[2] == nil
-      assert l[-1] == 2
-      assert l[-2] == 4
-      assert l[-3] == nil
-
-      #adding out of scope will backfill with empty objects
-    end
-
-    def test_map_basic
-      # allowed key types:
-      # :int32, :int64, :uint32, :uint64, :bool, :string, :bytes.
-
-      m = Google::Protobuf::Map.new(:string, :int32)
-      m["asdf"] = 1
-      assert m["asdf"] == 1
-      m["jkl;"] = 42
-      assert m == { "jkl;" => 42, "asdf" => 1 }
-      assert m.has_key?("asdf")
-      assert !m.has_key?("qwerty")
-      assert m.length == 2
-
-      m2 = m.dup
-      assert m == m2
-      assert m.hash != 0
-      assert m.hash == m2.hash
-
-      collected = {}
-      m.each { |k,v| collected[v] = k }
-      assert collected == { 42 => "jkl;", 1 => "asdf" }
-
-      assert m.delete("asdf") == 1
-      assert !m.has_key?("asdf")
-      assert m["asdf"] == nil
-      assert !m.has_key?("asdf")
-
-      # We only assert on inspect value when there is one map entry because the
-      # order in which elements appear is unspecified (depends on the internal
-      # hash function). We don't want a brittle test.
-      assert m.inspect == "{\"jkl;\"=>42}"
-
-      assert m.keys == ["jkl;"]
-      assert m.values == [42]
-
-      m.clear
-      assert m.length == 0
-      assert m == {}
-
-      success = false
-      begin
-        m[1] = 1
-      rescue TypeError
-        success = true
-      end
-      assert(success)
-
-      assert_raise RangeError do
-        m["asdf"] = 0x1_0000_0000
-      end
-    end
-
-    def test_map_ctor
-      m = Google::Protobuf::Map.new(:string, :int32,
-                                    {"a" => 1, "b" => 2, "c" => 3})
-      assert m == {"a" => 1, "c" => 3, "b" => 2}
-    end
-
-    def test_map_keytypes
-      m = Google::Protobuf::Map.new(:int32, :int32)
-      m[1] = 42
-      m[-1] = 42
-      assert_raise RangeError do
-        m[0x8000_0000] = 1
-      end
-
-      success = false
-      begin
-        m["asdf"] = 1
-      rescue TypeError
-        success = true
-      end
-      assert(success)
-
-      m = Google::Protobuf::Map.new(:int64, :int32)
-      m[0x1000_0000_0000_0000] = 1
-      assert_raise RangeError do
-        m[0x1_0000_0000_0000_0000] = 1
-      end
-
-      success = false
-      begin
-        m["asdf"] = 1
-      rescue TypeError
-        success = true
-      end
-      assert(success)
-
-      m = Google::Protobuf::Map.new(:uint32, :int32)
-      m[0x8000_0000] = 1
-      assert_raise RangeError do
-        m[0x1_0000_0000] = 1
-      end
-      assert_raise RangeError do
-        m[-1] = 1
-      end
-
-      m = Google::Protobuf::Map.new(:uint64, :int32)
-      m[0x8000_0000_0000_0000] = 1
-      assert_raise RangeError do
-        m[0x1_0000_0000_0000_0000] = 1
-      end
-      assert_raise RangeError do
-        m[-1] = 1
-      end
-
-      m = Google::Protobuf::Map.new(:bool, :int32)
-      m[true] = 1
-      m[false] = 2
-
-      success = false
-      begin
-        m[1] = 1
-      rescue TypeError
-        success = true
-      end
-      assert(success)
-
-      success = false
-      begin
-        m["asdf"] = 1
-      rescue TypeError
-        success = true
-      end
-      assert(success)
-
-      m = Google::Protobuf::Map.new(:string, :int32)
-      m["asdf"] = 1
-      success = false
-      begin
-        m[1] = 1
-      rescue TypeError
-        success = true
-      end
-      assert(success)
-      assert_raise Encoding::UndefinedConversionError do
-        bytestring = ["FFFF"].pack("H*")
-        m[bytestring] = 1
-      end
-
-      m = Google::Protobuf::Map.new(:bytes, :int32)
-      bytestring = ["FFFF"].pack("H*")
-      m[bytestring] = 1
-      # Allowed -- we will automatically convert to ASCII-8BIT.
-      m["asdf"] = 1
-      success = false
-      begin
-        m[1] = 1
-      rescue TypeError
-        success = true
-      end
-      assert(success)
-    end
-
-    def test_map_msg_enum_valuetypes
-      m = Google::Protobuf::Map.new(:string, :message, TestMessage)
-      m["asdf"] = TestMessage.new
-      success = false
-      begin
-        m["jkl;"] = TestMessage2.new
-      rescue TypeError
-        success = true
-      end
-      assert(success)
-
-      m = Google::Protobuf::Map.new(
-        :string, :message, TestMessage,
-        { "a" => TestMessage.new(:optional_int32 => 42),
-          "b" => TestMessage.new(:optional_int32 => 84) })
-      assert m.length == 2
-      assert m.values.map{|msg| msg.optional_int32}.sort == [42, 84]
-
-      m = Google::Protobuf::Map.new(:string, :enum, TestEnum,
-                                    { "x" => :A, "y" => :B, "z" => :C })
-      assert m.length == 3
-      assert m["z"] == :C
-      m["z"] = 2
-      assert m["z"] == :B
-      m["z"] = 5
-      assert m["z"] == 5
-      assert_raise RangeError do
-        m["z"] = :Z
-      end
-      assert_raise RangeError do
-        m["z"] = "z"
-      end
-    end
-
-    def test_map_dup_deep_copy
-      m = Google::Protobuf::Map.new(
-        :string, :message, TestMessage,
-        { "a" => TestMessage.new(:optional_int32 => 42),
-          "b" => TestMessage.new(:optional_int32 => 84) })
-
-      m2 = m.dup
-      assert m == m2
-      assert m.object_id != m2.object_id
-      assert m["a"].object_id == m2["a"].object_id
-      assert m["b"].object_id == m2["b"].object_id
-
-      m2 = Google::Protobuf.deep_copy(m)
-      assert m == m2
-      assert m.object_id != m2.object_id
-      assert m["a"].object_id != m2["a"].object_id
-      assert m["b"].object_id != m2["b"].object_id
-    end
-
-    def test_map_field
-      m = MapMessage.new
-      assert m.map_string_int32 == {}
-      assert m.map_string_msg == {}
-
-      m = MapMessage.new(
-        :map_string_int32 => {"a" => 1, "b" => 2},
-        :map_string_msg => {"a" => TestMessage2.new(:foo => 1),
-                            "b" => TestMessage2.new(:foo => 2)})
-      assert m.map_string_int32.keys.sort == ["a", "b"]
-      assert m.map_string_int32["a"] == 1
-      assert m.map_string_msg["b"].foo == 2
-
-      m.map_string_int32["c"] = 3
-      assert m.map_string_int32["c"] == 3
-      m.map_string_msg["c"] = TestMessage2.new(:foo => 3)
-      assert m.map_string_msg["c"] == TestMessage2.new(:foo => 3)
-      m.map_string_msg.delete("b")
-      m.map_string_msg.delete("c")
-      assert m.map_string_msg == { "a" => TestMessage2.new(:foo => 1) }
-
-      success = false
-      begin
-        m.map_string_msg["e"] = TestMessage.new # wrong value type
-      rescue TypeError
-        success = true
-      end
-      assert(success)
-      # ensure nothing was added by the above
-      assert m.map_string_msg == { "a" => TestMessage2.new(:foo => 1) }
-
-      m.map_string_int32 = Google::Protobuf::Map.new(:string, :int32)
-      success = false
-      begin
-        m.map_string_int32 = Google::Protobuf::Map.new(:string, :int64)
-      rescue TypeError
-        success = true
-      end
-      assert(success)
-      success = false
-      begin
-        m.map_string_int32 = {}
-      rescue TypeError
-        success = true
-      end
-      assert(success)
-
-      success = false
-      begin
-        m = MapMessage.new(:map_string_int32 => { 1 => "I am not a number" })
-      rescue TypeError
-        success = true
-      end
-      assert(success)
-    end
-
-    def test_map_encode_decode
-      m = MapMessage.new(
-        :map_string_int32 => {"a" => 1, "b" => 2},
-        :map_string_msg => {"a" => TestMessage2.new(:foo => 1),
-                            "b" => TestMessage2.new(:foo => 2)})
-      m2 = MapMessage.decode(MapMessage.encode(m))
-      assert m == m2
-
-      m3 = MapMessageWireEquiv.decode(MapMessage.encode(m))
-      assert m3.map_string_int32.length == 2
-
-      kv = {}
-      m3.map_string_int32.map { |msg| kv[msg.key] = msg.value }
-      assert kv == {"a" => 1, "b" => 2}
-
-      kv = {}
-      m3.map_string_msg.map { |msg| kv[msg.key] = msg.value }
-      assert kv == {"a" => TestMessage2.new(:foo => 1),
-                    "b" => TestMessage2.new(:foo => 2)}
-    end
-
-    def test_oneof_descriptors
-      d = OneofMessage.descriptor
-      o = d.lookup_oneof("my_oneof")
-      assert o != nil
-      assert o.class == Google::Protobuf::OneofDescriptor
-      assert o.name == "my_oneof"
-      oneof_count = 0
-      d.each_oneof{ |oneof|
-        oneof_count += 1
-        assert oneof == o
-      }
-      assert oneof_count == 1
-      assert o.count == 4
-      field_names = o.map{|f| f.name}.sort
-      assert field_names == ["a", "b", "c", "d"]
-    end
-
-    def test_oneof
-      d = OneofMessage.new
-      assert d.a == ""
-      assert d.b == 0
-      assert d.c == nil
-      assert d.d == :Default
-      assert d.my_oneof == nil
-
-      d.a = "hi"
-      assert d.a == "hi"
-      assert d.b == 0
-      assert d.c == nil
-      assert d.d == :Default
-      assert d.my_oneof == :a
-
-      d.b = 42
-      assert d.a == ""
-      assert d.b == 42
-      assert d.c == nil
-      assert d.d == :Default
-      assert d.my_oneof == :b
-
-      d.c = TestMessage2.new(:foo => 100)
-      assert d.a == ""
-      assert d.b == 0
-      assert d.c.foo == 100
-      assert d.d == :Default
-      assert d.my_oneof == :c
-
-      d.d = :C
-      assert d.a == ""
-      assert d.b == 0
-      assert d.c == nil
-      assert d.d == :C
-      assert d.my_oneof == :d
-
-      d2 = OneofMessage.decode(OneofMessage.encode(d))
-      assert d2 == d
-
-      encoded_field_a = OneofMessage.encode(OneofMessage.new(:a => "string"))
-      encoded_field_b = OneofMessage.encode(OneofMessage.new(:b => 1000))
-      encoded_field_c = OneofMessage.encode(
-        OneofMessage.new(:c => TestMessage2.new(:foo => 1)))
-      encoded_field_d = OneofMessage.encode(OneofMessage.new(:d => :B))
-
-      d3 = OneofMessage.decode(
-        encoded_field_c + encoded_field_a + encoded_field_d)
-      assert d3.a == ""
-      assert d3.b == 0
-      assert d3.c == nil
-      assert d3.d == :B
-
-      d4 = OneofMessage.decode(
-        encoded_field_c + encoded_field_a + encoded_field_d +
-        encoded_field_c)
-      assert d4.a == ""
-      assert d4.b == 0
-      assert d4.c.foo == 1
-      assert d4.d == :Default
-
-      d5 = OneofMessage.new(:a => "hello")
-      assert d5.a == "hello"
-      d5.a = nil
-      assert d5.a == ""
-      assert OneofMessage.encode(d5) == ''
-      assert d5.my_oneof == nil
-    end
-
-    def test_enum_field
-      m = TestMessage.new
-      assert m.optional_enum == :Default
-      m.optional_enum = :A
-      assert m.optional_enum == :A
-      assert_raise RangeError do
-        m.optional_enum = :ASDF
-      end
-      m.optional_enum = 1
-      assert m.optional_enum == :A
-      m.optional_enum = 100
-      assert m.optional_enum == 100
-    end
-
-    def test_dup
-      m = TestMessage.new
-      m.optional_string = "hello"
-      m.optional_int32 = 42
-      tm1 = TestMessage2.new(:foo => 100)
-      tm2 = TestMessage2.new(:foo => 200)
-      m.repeated_msg.push tm1
-      assert m.repeated_msg[-1] == tm1
-      m.repeated_msg.push tm2
-      assert m.repeated_msg[-1] == tm2
-      m2 = m.dup
-      assert m == m2
-      m.optional_int32 += 1
-      assert m != m2
-      assert m.repeated_msg[0] == m2.repeated_msg[0]
-      assert m.repeated_msg[0].object_id == m2.repeated_msg[0].object_id
-    end
-
-    def test_deep_copy
-      m = TestMessage.new(:optional_int32 => 42,
-                          :repeated_msg => [TestMessage2.new(:foo => 100)])
-      m2 = Google::Protobuf.deep_copy(m)
-      assert m == m2
-      assert m.repeated_msg == m2.repeated_msg
-      assert m.repeated_msg.object_id != m2.repeated_msg.object_id
-      assert m.repeated_msg[0].object_id != m2.repeated_msg[0].object_id
-    end
-
-    def test_eq
-      m = TestMessage.new(:optional_int32 => 42,
-                          :repeated_int32 => [1, 2, 3])
-      m2 = TestMessage.new(:optional_int32 => 43,
-                           :repeated_int32 => [1, 2, 3])
-      assert m != m2
-    end
-
-    def test_enum_lookup
-      assert TestEnum::A == 1
-      assert TestEnum::B == 2
-      assert TestEnum::C == 3
-
-      assert TestEnum::lookup(1) == :A
-      assert TestEnum::lookup(2) == :B
-      assert TestEnum::lookup(3) == :C
-
-      assert TestEnum::resolve(:A) == 1
-      assert TestEnum::resolve(:B) == 2
-      assert TestEnum::resolve(:C) == 3
-    end
-
-    def test_parse_serialize
-      m = TestMessage.new(:optional_int32 => 42,
-                          :optional_string => "hello world",
-                          :optional_enum => :B,
-                          :repeated_string => ["a", "b", "c"],
-                          :repeated_int32 => [42, 43, 44],
-                          :repeated_enum => [:A, :B, :C, 100],
-                          :repeated_msg => [TestMessage2.new(:foo => 1),
-                                            TestMessage2.new(:foo => 2)])
-      data = TestMessage.encode m
-      m2 = TestMessage.decode data
-      assert m == m2
-
-      data = Google::Protobuf.encode m
-      m2 = Google::Protobuf.decode(TestMessage, data)
-      assert m == m2
-    end
-
-    def test_encode_decode_helpers
-      m = TestMessage.new(:optional_string => 'foo', :repeated_string => ['bar1', 'bar2'])
-      assert_equal 'foo', m.optional_string
-      assert_equal ['bar1', 'bar2'], m.repeated_string
-
-      json = m.to_json
-      m2 = TestMessage.decode_json(json)
-      assert_equal 'foo', m2.optional_string
-      assert_equal ['bar1', 'bar2'], m2.repeated_string
-      if RUBY_PLATFORM != "java"
-        assert m2.optional_string.frozen?
-        assert m2.repeated_string[0].frozen?
-      end
-
-      proto = m.to_proto
-      m2 = TestMessage.decode(proto)
-      assert_equal 'foo', m2.optional_string
-      assert_equal ['bar1', 'bar2'], m2.repeated_string
-    end
-
-    def test_protobuf_encode_decode_helpers
-      m = TestMessage.new(:optional_string => 'foo', :repeated_string => ['bar1', 'bar2'])
-      encoded_msg = Google::Protobuf.encode(m)
-      assert_equal m.to_proto, encoded_msg
-
-      decoded_msg = Google::Protobuf.decode(TestMessage, encoded_msg)
-      assert_equal TestMessage.decode(m.to_proto), decoded_msg
-    end
-
-    def test_protobuf_encode_decode_json_helpers
-      m = TestMessage.new(:optional_string => 'foo', :repeated_string => ['bar1', 'bar2'])
-      encoded_msg = Google::Protobuf.encode_json(m)
-      assert_equal m.to_json, encoded_msg
-
-      decoded_msg = Google::Protobuf.decode_json(TestMessage, encoded_msg)
-      assert_equal TestMessage.decode_json(m.to_json), decoded_msg
-    end
-
-    def test_to_h
-      m = TestMessage.new(:optional_bool => true, :optional_double => -10.100001, :optional_string => 'foo', :repeated_string => ['bar1', 'bar2'])
-      expected_result = {
-        :optional_bool=>true,
-        :optional_bytes=>"",
-        :optional_double=>-10.100001,
-        :optional_enum=>:Default,
-        :optional_float=>0.0,
-        :optional_int32=>0,
-        :optional_int64=>0,
-        :optional_msg=>nil,
-        :optional_string=>"foo",
-        :optional_uint32=>0,
-        :optional_uint64=>0,
-        :repeated_bool=>[],
-        :repeated_bytes=>[],
-        :repeated_double=>[],
-        :repeated_enum=>[],
-        :repeated_float=>[],
-        :repeated_int32=>[],
-        :repeated_int64=>[],
-        :repeated_msg=>[],
-        :repeated_string=>["bar1", "bar2"],
-        :repeated_uint32=>[],
-        :repeated_uint64=>[]
-      }
-      assert_equal expected_result, m.to_h
-    end
-
-
-    def test_def_errors
-      s = Google::Protobuf::DescriptorPool.new
-      success = false
-      begin
-        s.build do
-          # enum with no default (integer value 0)
-          add_enum "MyEnum" do
-            value :A, 1
-          end
-        end
-      rescue TypeError
-        success = true
-      end
-      assert(success)
-      success = false
-      begin
-        s.build do
-          # message with required field (unsupported in proto3)
-          add_message "MyMessage" do
-            required :foo, :int32, 1
-          end
-        end
-      rescue TypeError
-        success = true
-      end
-      assert(success)
-    end
-
-    def test_corecursive
-      # just be sure that we can instantiate types with corecursive field-type
-      # references.
-      m = Recursive1.new(:foo => Recursive2.new(:foo => Recursive1.new))
-      assert Recursive1.descriptor.lookup("foo").subtype ==
-        Recursive2.descriptor
-      assert Recursive2.descriptor.lookup("foo").subtype ==
-        Recursive1.descriptor
-
-      serialized = Recursive1.encode(m)
-      m2 = Recursive1.decode(serialized)
-      assert m == m2
-    end
-
-    def test_serialize_cycle
-      m = Recursive1.new(:foo => Recursive2.new)
-      m.foo.foo = m
-      assert_raise RuntimeError do
-        serialized = Recursive1.encode(m)
-      end
-    end
-
-    def test_bad_field_names
-      m = BadFieldNames.new(:dup => 1, :class => 2)
-      m2 = m.dup
-      assert m == m2
-      assert m['dup'] == 1
-      assert m['class'] == 2
-      m['dup'] = 3
-      assert m['dup'] == 3
-    end
-
-    def test_int_ranges
-      m = TestMessage.new
-
-      m.optional_int32 = 0
-      m.optional_int32 = -0x8000_0000
-      m.optional_int32 = +0x7fff_ffff
-      m.optional_int32 = 1.0
-      m.optional_int32 = -1.0
-      m.optional_int32 = 2e9
-      assert_raise RangeError do
-        m.optional_int32 = -0x8000_0001
-      end
-      assert_raise RangeError do
-        m.optional_int32 = +0x8000_0000
-      end
-      assert_raise RangeError do
-        m.optional_int32 = +0x1000_0000_0000_0000_0000_0000 # force Bignum
-      end
-      assert_raise RangeError do
-        m.optional_int32 = 1e12
-      end
-      assert_raise RangeError do
-        m.optional_int32 = 1.5
-      end
-
-      m.optional_uint32 = 0
-      m.optional_uint32 = +0xffff_ffff
-      m.optional_uint32 = 1.0
-      m.optional_uint32 = 4e9
-      assert_raise RangeError do
-        m.optional_uint32 = -1
-      end
-      assert_raise RangeError do
-        m.optional_uint32 = -1.5
-      end
-      assert_raise RangeError do
-        m.optional_uint32 = -1.5e12
-      end
-      assert_raise RangeError do
-        m.optional_uint32 = -0x1000_0000_0000_0000
-      end
-      assert_raise RangeError do
-        m.optional_uint32 = +0x1_0000_0000
-      end
-      assert_raise RangeError do
-        m.optional_uint32 = +0x1000_0000_0000_0000_0000_0000 # force Bignum
-      end
-      assert_raise RangeError do
-        m.optional_uint32 = 1e12
-      end
-      assert_raise RangeError do
-        m.optional_uint32 = 1.5
-      end
-
-      m.optional_int64 = 0
-      m.optional_int64 = -0x8000_0000_0000_0000
-      m.optional_int64 = +0x7fff_ffff_ffff_ffff
-      m.optional_int64 = 1.0
-      m.optional_int64 = -1.0
-      m.optional_int64 = 8e18
-      m.optional_int64 = -8e18
-      assert_raise RangeError do
-        m.optional_int64 = -0x8000_0000_0000_0001
-      end
-      assert_raise RangeError do
-        m.optional_int64 = +0x8000_0000_0000_0000
-      end
-      assert_raise RangeError do
-        m.optional_int64 = +0x1000_0000_0000_0000_0000_0000 # force Bignum
-      end
-      assert_raise RangeError do
-        m.optional_int64 = 1e50
-      end
-      assert_raise RangeError do
-        m.optional_int64 = 1.5
-      end
-
-      m.optional_uint64 = 0
-      m.optional_uint64 = +0xffff_ffff_ffff_ffff
-      m.optional_uint64 = 1.0
-      m.optional_uint64 = 16e18
-      assert_raise RangeError do
-        m.optional_uint64 = -1
-      end
-      assert_raise RangeError do
-        m.optional_uint64 = -1.5
-      end
-      assert_raise RangeError do
-        m.optional_uint64 = -1.5e12
-      end
-      assert_raise RangeError do
-        m.optional_uint64 = -0x1_0000_0000_0000_0000
-      end
-      assert_raise RangeError do
-        m.optional_uint64 = +0x1_0000_0000_0000_0000
-      end
-      assert_raise RangeError do
-        m.optional_uint64 = +0x1000_0000_0000_0000_0000_0000 # force Bignum
-      end
-      assert_raise RangeError do
-        m.optional_uint64 = 1e50
-      end
-      assert_raise RangeError do
-        m.optional_uint64 = 1.5
-      end
-    end
-
-    def test_stress_test
-      m = TestMessage.new
-      m.optional_int32 = 42
-      m.optional_int64 = 0x100000000
-      m.optional_string = "hello world"
-      10.times do m.repeated_msg.push TestMessage2.new(:foo => 42) end
-      10.times do m.repeated_string.push "hello world" end
-
-      data = TestMessage.encode(m)
-
-      l = 0
-      10_000.times do
-        m = TestMessage.decode(data)
-        data_new = TestMessage.encode(m)
-        assert data_new == data
-        data = data_new
-      end
-    end
-
-    def test_reflection
-      m = TestMessage.new(:optional_int32 => 1234)
-      msgdef = m.class.descriptor
-      assert msgdef.class == Google::Protobuf::Descriptor
-      assert msgdef.any? {|field| field.name == "optional_int32"}
-      optional_int32 = msgdef.lookup "optional_int32"
-      assert optional_int32.class == Google::Protobuf::FieldDescriptor
-      assert optional_int32 != nil
-      assert optional_int32.name == "optional_int32"
-      assert optional_int32.type == :int32
-      optional_int32.set(m, 5678)
-      assert m.optional_int32 == 5678
-      m.optional_int32 = 1000
-      assert optional_int32.get(m) == 1000
-
-      optional_msg = msgdef.lookup "optional_msg"
-      assert optional_msg.subtype == TestMessage2.descriptor
-
-      optional_msg.set(m, optional_msg.subtype.msgclass.new)
-
-      assert msgdef.msgclass == TestMessage
-
-      optional_enum = msgdef.lookup "optional_enum"
-      assert optional_enum.subtype == TestEnum.descriptor
-      assert optional_enum.subtype.class == Google::Protobuf::EnumDescriptor
-      optional_enum.subtype.each do |k, v|
-        # set with integer, check resolution to symbolic name
-        optional_enum.set(m, v)
-        assert optional_enum.get(m) == k
-      end
-    end
-
-    def test_json
-      # TODO: Fix JSON in JRuby version.
-      return if RUBY_PLATFORM == "java"
-      m = TestMessage.new(:optional_int32 => 1234,
-                          :optional_int64 => -0x1_0000_0000,
-                          :optional_uint32 => 0x8000_0000,
-                          :optional_uint64 => 0xffff_ffff_ffff_ffff,
-                          :optional_bool => true,
-                          :optional_float => 1.0,
-                          :optional_double => -1e100,
-                          :optional_string => "Test string",
-                          :optional_bytes => ["FFFFFFFF"].pack('H*'),
-                          :optional_msg => TestMessage2.new(:foo => 42),
-                          :repeated_int32 => [1, 2, 3, 4],
-                          :repeated_string => ["a", "b", "c"],
-                          :repeated_bool => [true, false, true, false],
-                          :repeated_msg => [TestMessage2.new(:foo => 1),
-                                            TestMessage2.new(:foo => 2)])
-
-      json_text = TestMessage.encode_json(m)
-      m2 = TestMessage.decode_json(json_text)
-      assert m == m2
-
-      # Crash case from GitHub issue 283.
-      bar = Bar.new(msg: "bar")
-      baz1 = Baz.new(msg: "baz")
-      baz2 = Baz.new(msg: "quux")
-      Foo.encode_json(Foo.new)
-      Foo.encode_json(Foo.new(bar: bar))
-      Foo.encode_json(Foo.new(bar: bar, baz: [baz1, baz2]))
-    end
-
-    def test_json_maps
-      # TODO: Fix JSON in JRuby version.
-      return if RUBY_PLATFORM == "java"
-      m = MapMessage.new(:map_string_int32 => {"a" => 1})
-      expected = '{"mapStringInt32":{"a":1},"mapStringMsg":{}}'
-      expected_preserve = '{"map_string_int32":{"a":1},"map_string_msg":{}}'
-      assert_equal expected, MapMessage.encode_json(m, :emit_defaults => true)
-
-      json = MapMessage.encode_json(m, :preserve_proto_fieldnames => true, :emit_defaults => true)
-      assert_equal expected_preserve, json
-
-      m2 = MapMessage.decode_json(MapMessage.encode_json(m))
-      assert m == m2
-    end
-  end
-end
diff --git a/libs/protobuf/ruby/compatibility_tests/v3.0.0/tests/generated_code.proto b/libs/protobuf/ruby/compatibility_tests/v3.0.0/tests/generated_code.proto
deleted file mode 100644
index 62fd83e..0000000
--- a/libs/protobuf/ruby/compatibility_tests/v3.0.0/tests/generated_code.proto
+++ /dev/null
@@ -1,67 +0,0 @@
-syntax = "proto3";
-
-package a.b.c;
-
-message TestMessage {
-  int32 optional_int32 = 1;
-  int64 optional_int64 = 2;
-  uint32 optional_uint32 = 3;
-  uint64 optional_uint64 = 4;
-  bool optional_bool = 5;
-  double optional_double = 6;
-  float optional_float = 7;
-  string optional_string = 8;
-  bytes optional_bytes = 9;
-  TestEnum optional_enum = 10;
-  TestMessage optional_msg = 11;
-
-  repeated int32 repeated_int32 = 21;
-  repeated int64 repeated_int64 = 22;
-  repeated uint32 repeated_uint32 = 23;
-  repeated uint64 repeated_uint64 = 24;
-  repeated bool repeated_bool = 25;
-  repeated double repeated_double = 26;
-  repeated float repeated_float = 27;
-  repeated string repeated_string = 28;
-  repeated bytes repeated_bytes = 29;
-  repeated TestEnum repeated_enum = 30;
-  repeated TestMessage repeated_msg = 31;
-
-  oneof my_oneof {
-    int32 oneof_int32 = 41;
-    int64 oneof_int64 = 42;
-    uint32 oneof_uint32 = 43;
-    uint64 oneof_uint64 = 44;
-    bool oneof_bool = 45;
-    double oneof_double = 46;
-    float oneof_float = 47;
-    string oneof_string = 48;
-    bytes oneof_bytes = 49;
-    TestEnum oneof_enum = 50;
-    TestMessage oneof_msg = 51;
-  }
-
-  map<int32, string> map_int32_string = 61;
-  map<int64, string> map_int64_string = 62;
-  map<uint32, string> map_uint32_string = 63;
-  map<uint64, string> map_uint64_string = 64;
-  map<bool, string> map_bool_string = 65;
-  map<string, string> map_string_string = 66;
-  map<string, TestMessage> map_string_msg = 67;
-  map<string, TestEnum> map_string_enum = 68;
-  map<string, int32> map_string_int32 = 69;
-  map<string, bool> map_string_bool = 70;
-
-  message NestedMessage {
-    int32 foo = 1;
-  }
-
-  NestedMessage nested_message = 80;
-}
-
-enum TestEnum {
-  Default = 0;
-  A = 1;
-  B = 2;
-  C = 3;
-}
diff --git a/libs/protobuf/ruby/compatibility_tests/v3.0.0/tests/generated_code_test.rb b/libs/protobuf/ruby/compatibility_tests/v3.0.0/tests/generated_code_test.rb
deleted file mode 100755
index b92b046..0000000
--- a/libs/protobuf/ruby/compatibility_tests/v3.0.0/tests/generated_code_test.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/ruby
-
-# generated_code.rb is in the same directory as this test.
-$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__)))
-
-require 'generated_code_pb'
-require 'test_import_pb'
-require 'test/unit'
-
-class GeneratedCodeTest < Test::Unit::TestCase
-  def test_generated_msg
-    # just test that we can instantiate the message. The purpose of this test
-    # is to ensure that the output of the code generator is valid Ruby and
-    # successfully creates message definitions and classes, not to test every
-    # aspect of the extension (basic.rb is for that).
-    m = A::B::C::TestMessage.new()
-    m2 = FooBar::TestImportedMessage.new()
-  end
-end
diff --git a/libs/protobuf/ruby/compatibility_tests/v3.0.0/tests/repeated_field_test.rb b/libs/protobuf/ruby/compatibility_tests/v3.0.0/tests/repeated_field_test.rb
deleted file mode 100755
index caebde1..0000000
--- a/libs/protobuf/ruby/compatibility_tests/v3.0.0/tests/repeated_field_test.rb
+++ /dev/null
@@ -1,631 +0,0 @@
-#!/usr/bin/ruby
-
-require 'google/protobuf'
-require 'test/unit'
-
-class RepeatedFieldTest < Test::Unit::TestCase
-
-  def test_acts_like_enumerator
-    m = TestMessage.new
-    (Enumerable.instance_methods - TestMessage.new.repeated_string.methods).each do |method_name|
-      assert m.repeated_string.respond_to?(method_name) == true, "does not respond to #{method_name}"
-    end
-  end
-
-  def test_acts_like_an_array
-    m = TestMessage.new
-    arr_methods = ([].methods - TestMessage.new.repeated_string.methods)
-    # jRuby additions to the Array class that we can ignore
-    arr_methods -= [ :indices, :iter_for_each, :iter_for_each_index,
-      :iter_for_each_with_index, :dimensions, :copy_data, :copy_data_simple,
-      :nitems, :iter_for_reverse_each, :indexes, :append, :prepend]
-    arr_methods -= [:union, :difference, :filter!]
-    arr_methods -= [:intersection, :deconstruct] # ruby 2.7 methods we can ignore
-    arr_methods -= [:intersect?] # ruby 3.1 methods we can ignore
-    arr_methods.each do |method_name|
-      assert m.repeated_string.respond_to?(method_name) == true, "does not respond to #{method_name}"
-    end
-  end
-
-  def test_first
-    m = TestMessage.new
-    repeated_field_names(TestMessage).each do |field_name|
-      assert_nil m.send(field_name).first
-    end
-    fill_test_msg(m)
-    assert_equal -10, m.repeated_int32.first
-    assert_equal -1_000_000, m.repeated_int64.first
-    assert_equal 10, m.repeated_uint32.first
-    assert_equal 1_000_000, m.repeated_uint64.first
-    assert_equal true, m.repeated_bool.first
-    assert_equal -1.01,  m.repeated_float.first.round(2)
-    assert_equal -1.0000000000001, m.repeated_double.first
-    assert_equal 'foo', m.repeated_string.first
-    assert_equal "bar".encode!('ASCII-8BIT'), m.repeated_bytes.first
-    assert_equal TestMessage2.new(:foo => 1), m.repeated_msg.first
-    assert_equal :A, m.repeated_enum.first
-  end
-
-
-  def test_last
-    m = TestMessage.new
-    repeated_field_names(TestMessage).each do |field_name|
-      assert_nil m.send(field_name).first
-    end
-    fill_test_msg(m)
-    assert_equal -11, m.repeated_int32.last
-    assert_equal -1_000_001, m.repeated_int64.last
-    assert_equal 11, m.repeated_uint32.last
-    assert_equal 1_000_001, m.repeated_uint64.last
-    assert_equal false, m.repeated_bool.last
-    assert_equal -1.02, m.repeated_float.last.round(2)
-    assert_equal -1.0000000000002, m.repeated_double.last
-    assert_equal 'bar', m.repeated_string.last
-    assert_equal "foo".encode!('ASCII-8BIT'), m.repeated_bytes.last
-    assert_equal TestMessage2.new(:foo => 2), m.repeated_msg.last
-    assert_equal :B, m.repeated_enum.last
-  end
-
-
-  def test_pop
-    m = TestMessage.new
-    repeated_field_names(TestMessage).each do |field_name|
-      assert_nil m.send(field_name).pop
-    end
-    fill_test_msg(m)
-
-    assert_equal -11, m.repeated_int32.pop
-    assert_equal -10, m.repeated_int32.pop
-    assert_equal -1_000_001, m.repeated_int64.pop
-    assert_equal -1_000_000, m.repeated_int64.pop
-    assert_equal 11, m.repeated_uint32.pop
-    assert_equal 10, m.repeated_uint32.pop
-    assert_equal 1_000_001, m.repeated_uint64.pop
-    assert_equal 1_000_000, m.repeated_uint64.pop
-    assert_equal false, m.repeated_bool.pop
-    assert_equal true, m.repeated_bool.pop
-    assert_equal -1.02,  m.repeated_float.pop.round(2)
-    assert_equal -1.01,  m.repeated_float.pop.round(2)
-    assert_equal -1.0000000000002, m.repeated_double.pop
-    assert_equal -1.0000000000001, m.repeated_double.pop
-    assert_equal 'bar', m.repeated_string.pop
-    assert_equal 'foo', m.repeated_string.pop
-    assert_equal "foo".encode!('ASCII-8BIT'), m.repeated_bytes.pop
-    assert_equal "bar".encode!('ASCII-8BIT'), m.repeated_bytes.pop
-    assert_equal TestMessage2.new(:foo => 2), m.repeated_msg.pop
-    assert_equal TestMessage2.new(:foo => 1), m.repeated_msg.pop
-    assert_equal :B, m.repeated_enum.pop
-    assert_equal :A, m.repeated_enum.pop
-    repeated_field_names(TestMessage).each do |field_name|
-      assert_nil m.send(field_name).pop
-    end
-
-    fill_test_msg(m)
-    assert_equal ['bar', 'foo'], m.repeated_string.pop(2)
-    assert_nil m.repeated_string.pop
-  end
-
-
-  def test_each
-    m = TestMessage.new
-    5.times{|i| m.repeated_string << 'string' }
-    count = 0
-    m.repeated_string.each do |val|
-      assert_equal 'string', val
-      count += 1
-    end
-    assert_equal 5, count
-    result = m.repeated_string.each{|val| val + '_junk'}
-    assert_equal ['string'] * 5, result
-  end
-
-
-  def test_empty?
-    m = TestMessage.new
-    assert_equal true, m.repeated_string.empty?
-    m.repeated_string << 'foo'
-    assert_equal false, m.repeated_string.empty?
-    m.repeated_string << 'bar'
-    assert_equal false, m.repeated_string.empty?
-  end
-
-  def test_array_accessor
-    m = TestMessage.new
-    reference_arr = %w(foo bar baz)
-    m.repeated_string += reference_arr.clone
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr[1]
-    end
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr[-2]
-    end
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr[20]
-    end
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr[1, 2]
-    end
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr[0..2]
-    end
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr[-1, 1]
-    end
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr[10, 12]
-    end
-  end
-
-  def test_array_settor
-    m = TestMessage.new
-    reference_arr = %w(foo bar baz)
-    m.repeated_string += reference_arr.clone
-
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr[1] = 'junk'
-    end
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr[-2] = 'snappy'
-    end
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr[3] = ''
-    end
-    # slight deviation; we are strongly typed, and nil is not allowed
-    # for string types;
-    m.repeated_string[5] = 'spacious'
-    assert_equal ["foo", "snappy", "baz", "", "", "spacious"], m.repeated_string
-
-    #make sure it sests the default types for other fields besides strings
-    %w(repeated_int32 repeated_int64 repeated_uint32 repeated_uint64).each do |field_name|
-      m.send(field_name)[3] = 10
-      assert_equal [0,0,0,10], m.send(field_name)
-    end
-    m.repeated_float[3] = 10.1
-    #wonky mri float handling
-    assert_equal [0,0,0], m.repeated_float.to_a[0..2]
-    assert_equal 10.1, m.repeated_float[3].round(1)
-    m.repeated_double[3] = 10.1
-    assert_equal [0,0,0,10.1], m.repeated_double
-    m.repeated_bool[3] = true
-    assert_equal [false, false, false, true], m.repeated_bool
-    m.repeated_bytes[3] = "bar".encode!('ASCII-8BIT')
-    assert_equal ['', '', '', "bar".encode!('ASCII-8BIT')], m.repeated_bytes
-    m.repeated_msg[3] = TestMessage2.new(:foo => 1)
-    assert_equal [nil, nil, nil, TestMessage2.new(:foo => 1)], m.repeated_msg
-    m.repeated_enum[3] = :A
-    assert_equal [:Default, :Default, :Default, :A], m.repeated_enum
-
-    # check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-    #   arr[20] = 'spacious'
-    # end
-    # TODO: accessor doesn't allow other ruby-like methods
-    # check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-    #   arr[1, 2] = 'fizz'
-    # end
-    # check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-    #   arr[0..2] = 'buzz'
-    # end
-  end
-
-  def test_push
-    m = TestMessage.new
-    reference_arr = %w(foo bar baz)
-    m.repeated_string += reference_arr.clone
-
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr.push('fizz')
-    end
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr << 'fizz'
-    end
-    #TODO: push should support multiple
-    # check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-    #   arr.push('fizz', 'buzz')
-    # end
-  end
-
-  def test_clear
-    m = TestMessage.new
-    reference_arr = %w(foo bar baz)
-    m.repeated_string += reference_arr.clone
-
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr.clear
-    end
-  end
-
-  def test_concat
-    m = TestMessage.new
-    reference_arr = %w(foo bar baz)
-    m.repeated_string += reference_arr.clone
-    m.repeated_string.concat(['fizz', 'buzz'])
-    assert_equal %w(foo bar baz fizz buzz), m.repeated_string
-    #TODO: concat should return the orig array
-    # check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-    #   arr.concat(['fizz', 'buzz'])
-    # end
-  end
-
-  def test_equal
-    m = TestMessage.new
-    reference_arr = %w(foo bar baz)
-    m.repeated_string += reference_arr.clone
-    assert_equal reference_arr, m.repeated_string
-    reference_arr << 'fizz'
-    assert_not_equal reference_arr, m.repeated_string
-    m.repeated_string << 'fizz'
-    assert_equal reference_arr, m.repeated_string
-  end
-
-  def test_hash
-    # just a sanity check
-    m = TestMessage.new
-    reference_arr = %w(foo bar baz)
-    m.repeated_string += reference_arr.clone
-    assert m.repeated_string.hash.is_a?(Integer)
-    hash = m.repeated_string.hash
-    assert_equal hash, m.repeated_string.hash
-    m.repeated_string << 'j'
-    assert_not_equal hash, m.repeated_string.hash
-  end
-
-  def test_plus
-    m = TestMessage.new
-    reference_arr = %w(foo bar baz)
-    m.repeated_string += reference_arr.clone
-
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr + ['fizz', 'buzz']
-    end
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr += ['fizz', 'buzz']
-    end
-  end
-
-  def test_replace
-    m = TestMessage.new
-    reference_arr = %w(foo bar baz)
-    m.repeated_string += reference_arr.clone
-
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr.replace(['fizz', 'buzz'])
-    end
-  end
-
-  def test_to_a
-    m = TestMessage.new
-    reference_arr = %w(foo bar baz)
-    m.repeated_string += reference_arr.clone
-
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr.to_a
-    end
-  end
-
-  def test_to_ary
-    m = TestMessage.new
-    reference_arr = %w(foo bar baz)
-    m.repeated_string += reference_arr.clone
-
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr.to_ary
-    end
-  end
-
-  # emulate Array behavior
-  ##########################
-
-  def test_collect!
-    m = TestMessage.new
-    reference_arr = %w(foo bar baz)
-    m.repeated_string += reference_arr.clone
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr.collect!{|x| x + "!" }
-    end
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr.collect!.with_index{|x, i| x[0...i] }
-    end
-  end
-
-  def test_delete
-    m = TestMessage.new
-    reference_arr = %w(foo bar baz)
-    m.repeated_string += reference_arr.clone
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr.delete('bar')
-    end
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr.delete('nope')
-    end
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr.delete('nope'){'within'}
-    end
-  end
-
-  def test_delete_at
-    m = TestMessage.new
-    reference_arr = %w(foo bar baz)
-    m.repeated_string += reference_arr.clone
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr.delete_at(2)
-    end
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr.delete_at(10)
-    end
-  end
-
-  def test_fill
-    m = TestMessage.new
-    reference_arr = %w(foo bar baz)
-    m.repeated_string += reference_arr.clone
-
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr.fill("x")
-    end
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr.fill("z", 2, 2)
-    end
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr.fill("y", 0..1)
-    end
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr.fill { |i| (i*i).to_s }
-    end
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr.fill(-2) { |i| (i*i*i).to_s }
-    end
-  end
-
-  def test_flatten!
-    m = TestMessage.new
-    reference_arr = %w(foo bar baz)
-    m.repeated_string += reference_arr.clone
-
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr.flatten!
-    end
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr.flatten!(1)
-    end
-  end
-
-  def test_insert
-    m = TestMessage.new
-    reference_arr = %w(foo bar baz)
-    m.repeated_string += reference_arr.clone
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr.insert(2, 'fizz')
-    end
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr.insert(3, 'fizz', 'buzz', 'bazz')
-    end
-  end
-
-  def test_inspect
-    m = TestMessage.new
-    assert_equal '[]', m.repeated_string.inspect
-    m.repeated_string << 'foo'
-    assert_equal m.repeated_string.to_a.inspect, m.repeated_string.inspect
-    m.repeated_string << 'bar'
-    assert_equal m.repeated_string.to_a.inspect, m.repeated_string.inspect
-  end
-
-  def test_reverse!
-    m = TestMessage.new
-    reference_arr = %w(foo bar baz)
-    m.repeated_string += reference_arr.clone
-
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr.reverse!
-    end
-  end
-
-  def test_rotate!
-    m = TestMessage.new
-    reference_arr = %w(foo bar baz)
-    m.repeated_string += reference_arr.clone
-
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr.rotate!
-    end
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr.rotate!(2)
-    end
-  end
-
-  def test_select!
-    m = TestMessage.new
-    reference_arr = %w(foo bar baz)
-    m.repeated_string += reference_arr.clone
-
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr.select! { |v| v =~ /[aeiou]/ }
-    end
-  end
-
-  def test_shift
-    m = TestMessage.new
-    reference_arr = %w(foo bar baz)
-    m.repeated_string += reference_arr.clone
-
-    # should return an element
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr.shift
-    end
-    # should return an array
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr.shift(2)
-    end
-    # should return nil
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr.shift
-    end
-  end
-
-  def test_shuffle!
-    m = TestMessage.new
-    m.repeated_string += %w(foo bar baz)
-    orig_repeated_string = m.repeated_string.clone
-    result = m.repeated_string.shuffle!
-    assert_equal m.repeated_string, result
-    # NOTE: sometimes it doesn't change the order...
-    # assert_not_equal m.repeated_string.to_a, orig_repeated_string.to_a
-  end
-
-  def test_slice!
-    m = TestMessage.new
-    reference_arr = %w(foo bar baz bar fizz buzz)
-    m.repeated_string += reference_arr.clone
-
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr.slice!(2)
-    end
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr.slice!(1,2)
-    end
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr.slice!(0..1)
-    end
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr.slice!(10)
-    end
-  end
-
-  def test_sort!
-    m = TestMessage.new
-    reference_arr = %w(foo bar baz)
-    m.repeated_string += reference_arr.clone
-
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr.sort!
-    end
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr.sort! { |x,y| y <=> x }
-    end
-  end
-
-  def test_sort_by!
-    m = TestMessage.new
-    reference_arr = %w(foo bar baz)
-    m.repeated_string += reference_arr.clone
-
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr.sort_by!
-    end
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr.sort_by!(&:hash)
-    end
-  end
-
-  def test_uniq!
-    m = TestMessage.new
-    reference_arr = %w(foo bar baz)
-    m.repeated_string += reference_arr.clone
-
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr.uniq!
-    end
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr.uniq!{|s| s[0] }
-    end
-  end
-
-  def test_unshift
-    m = TestMessage.new
-    reference_arr = %w(foo bar baz)
-    m.repeated_string += reference_arr.clone
-
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr.unshift('1')
-    end
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr.unshift('a', 'b')
-    end
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr.unshift('')
-    end
-  end
-
-
-  ##### HELPER METHODS
-
-  def check_self_modifying_method(repeated_field, ref_array)
-    expected_result = yield(ref_array)
-    actual_result = yield(repeated_field)
-    if expected_result.is_a?(Enumerator)
-      assert_equal expected_result.to_a, actual_result.to_a
-    else
-      assert_equal expected_result, actual_result
-    end
-    assert_equal ref_array, repeated_field
-  end
-
-
-  def repeated_field_names(klass)
-    klass.descriptor.find_all{|f| f.label == :repeated}.map(&:name)
-  end
-
-
-  def fill_test_msg(test_msg)
-    test_msg.repeated_int32  += [-10, -11]
-    test_msg.repeated_int64  += [-1_000_000, -1_000_001]
-    test_msg.repeated_uint32 += [10, 11]
-    test_msg.repeated_uint64 += [1_000_000, 1_000_001]
-    test_msg.repeated_bool   += [true, false]
-    test_msg.repeated_float  += [-1.01, -1.02]
-    test_msg.repeated_double += [-1.0000000000001, -1.0000000000002]
-    test_msg.repeated_string += %w(foo bar)
-    test_msg.repeated_bytes  += ["bar".encode!('ASCII-8BIT'), "foo".encode!('ASCII-8BIT')]
-    test_msg.repeated_msg    << TestMessage2.new(:foo => 1)
-    test_msg.repeated_msg    << TestMessage2.new(:foo => 2)
-    test_msg.repeated_enum   << :A
-    test_msg.repeated_enum   << :B
-  end
-
-
-  pool = Google::Protobuf::DescriptorPool.new
-  pool.build do
-
-    add_message "TestMessage" do
-      optional :optional_int32,  :int32,        1
-      optional :optional_int64,  :int64,        2
-      optional :optional_uint32, :uint32,       3
-      optional :optional_uint64, :uint64,       4
-      optional :optional_bool,   :bool,         5
-      optional :optional_float,  :float,        6
-      optional :optional_double, :double,       7
-      optional :optional_string, :string,       8
-      optional :optional_bytes,  :bytes,        9
-      optional :optional_msg,    :message,      10, "TestMessage2"
-      optional :optional_enum,   :enum,         11, "TestEnum"
-
-      repeated :repeated_int32,  :int32,        12
-      repeated :repeated_int64,  :int64,        13
-      repeated :repeated_uint32, :uint32,       14
-      repeated :repeated_uint64, :uint64,       15
-      repeated :repeated_bool,   :bool,         16
-      repeated :repeated_float,  :float,        17
-      repeated :repeated_double, :double,       18
-      repeated :repeated_string, :string,       19
-      repeated :repeated_bytes,  :bytes,        20
-      repeated :repeated_msg,    :message,      21, "TestMessage2"
-      repeated :repeated_enum,   :enum,         22, "TestEnum"
-    end
-    add_message "TestMessage2" do
-      optional :foo, :int32, 1
-    end
-
-    add_enum "TestEnum" do
-      value :Default, 0
-      value :A, 1
-      value :B, 2
-      value :C, 3
-    end
-  end
-
-  TestMessage = pool.lookup("TestMessage").msgclass
-  TestMessage2 = pool.lookup("TestMessage2").msgclass
-  TestEnum = pool.lookup("TestEnum").enummodule
-
-
-end
diff --git a/libs/protobuf/ruby/compatibility_tests/v3.0.0/tests/stress.rb b/libs/protobuf/ruby/compatibility_tests/v3.0.0/tests/stress.rb
deleted file mode 100755
index 082d5e2..0000000
--- a/libs/protobuf/ruby/compatibility_tests/v3.0.0/tests/stress.rb
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/usr/bin/ruby
-
-require 'google/protobuf'
-require 'test/unit'
-
-module StressTest
-  pool = Google::Protobuf::DescriptorPool.new
-  pool.build do
-    add_message "TestMessage" do
-      optional :a,  :int32,        1
-      repeated :b,  :message,      2, "M"
-    end
-    add_message "M" do
-      optional :foo, :string, 1
-    end
-  end
-
-  TestMessage = pool.lookup("TestMessage").msgclass
-  M = pool.lookup("M").msgclass
-
-  class StressTest < Test::Unit::TestCase
-    def get_msg
-      TestMessage.new(:a => 1000,
-                      :b => [M.new(:foo => "hello"),
-                             M.new(:foo => "world")])
-    end
-    def test_stress
-      m = get_msg
-      data = TestMessage.encode(m)
-      100_000.times do
-        mnew = TestMessage.decode(data)
-        mnew = mnew.dup
-        assert_equal mnew.inspect, m.inspect
-        assert TestMessage.encode(mnew) == data
-      end
-    end
-  end
-end
diff --git a/libs/protobuf/ruby/compatibility_tests/v3.0.0/tests/test_import.proto b/libs/protobuf/ruby/compatibility_tests/v3.0.0/tests/test_import.proto
deleted file mode 100644
index 230484e..0000000
--- a/libs/protobuf/ruby/compatibility_tests/v3.0.0/tests/test_import.proto
+++ /dev/null
@@ -1,5 +0,0 @@
-syntax = "proto3";
-
-package foo_bar;
-
-message TestImportedMessage {}
diff --git a/libs/protobuf/ruby/ext/google/protobuf_c/convert.c b/libs/protobuf/ruby/ext/google/protobuf_c/convert.c
deleted file mode 100644
index bdc7159..0000000
--- a/libs/protobuf/ruby/ext/google/protobuf_c/convert.c
+++ /dev/null
@@ -1,361 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// -----------------------------------------------------------------------------
-// Ruby <-> upb data conversion functions.
-//
-// This file Also contains a few other assorted algorithms on upb_MessageValue.
-//
-// None of the algorithms in this file require any access to the internal
-// representation of Ruby or upb objects.
-// -----------------------------------------------------------------------------
-
-#include "convert.h"
-
-#include "message.h"
-#include "protobuf.h"
-
-static upb_StringView Convert_StringData(VALUE str, upb_Arena* arena) {
-  upb_StringView ret;
-  if (arena) {
-    char* ptr = upb_Arena_Malloc(arena, RSTRING_LEN(str));
-    memcpy(ptr, RSTRING_PTR(str), RSTRING_LEN(str));
-    ret.data = ptr;
-  } else {
-    // Data is only needed temporarily (within map lookup).
-    ret.data = RSTRING_PTR(str);
-  }
-  ret.size = RSTRING_LEN(str);
-  return ret;
-}
-
-static bool is_ruby_num(VALUE value) {
-  return (TYPE(value) == T_FLOAT || TYPE(value) == T_FIXNUM ||
-          TYPE(value) == T_BIGNUM);
-}
-
-static void Convert_CheckInt(const char* name, upb_CType type, VALUE val) {
-  if (!is_ruby_num(val)) {
-    rb_raise(cTypeError,
-             "Expected number type for integral field '%s' (given %s).", name,
-             rb_class2name(CLASS_OF(val)));
-  }
-
-  // NUM2{INT,UINT,LL,ULL} macros do the appropriate range checks on upper
-  // bound; we just need to do precision checks (i.e., disallow rounding) and
-  // check for < 0 on unsigned types.
-  if (TYPE(val) == T_FLOAT) {
-    double dbl_val = NUM2DBL(val);
-    if (floor(dbl_val) != dbl_val) {
-      rb_raise(rb_eRangeError,
-               "Non-integral floating point value assigned to integer field "
-               "'%s' (given %s).",
-               name, rb_class2name(CLASS_OF(val)));
-    }
-  }
-  if (type == kUpb_CType_UInt32 || type == kUpb_CType_UInt64) {
-    if (NUM2DBL(val) < 0) {
-      rb_raise(
-          rb_eRangeError,
-          "Assigning negative value to unsigned integer field '%s' (given %s).",
-          name, rb_class2name(CLASS_OF(val)));
-    }
-  }
-}
-
-static int32_t Convert_ToEnum(VALUE value, const char* name,
-                              const upb_EnumDef* e) {
-  int32_t val;
-
-  switch (TYPE(value)) {
-    case T_FLOAT:
-    case T_FIXNUM:
-    case T_BIGNUM:
-      Convert_CheckInt(name, kUpb_CType_Int32, value);
-      val = NUM2INT(value);
-      break;
-    case T_STRING: {
-      const upb_EnumValueDef* ev = upb_EnumDef_FindValueByNameWithSize(
-          e, RSTRING_PTR(value), RSTRING_LEN(value));
-      if (!ev) goto unknownval;
-      val = upb_EnumValueDef_Number(ev);
-      break;
-    }
-    case T_SYMBOL: {
-      const upb_EnumValueDef* ev =
-          upb_EnumDef_FindValueByName(e, rb_id2name(SYM2ID(value)));
-      if (!ev)
-        goto unknownval;
-      val = upb_EnumValueDef_Number(ev);
-      break;
-    }
-    default:
-      rb_raise(cTypeError,
-               "Expected number or symbol type for enum field '%s'.", name);
-  }
-
-  return val;
-
-unknownval:
-  rb_raise(rb_eRangeError, "Unknown symbol value for enum field '%s'.", name);
-}
-
-upb_MessageValue Convert_RubyToUpb(VALUE value, const char* name,
-                                   TypeInfo type_info, upb_Arena* arena) {
-  upb_MessageValue ret;
-
-  switch (type_info.type) {
-    case kUpb_CType_Float:
-      if (!is_ruby_num(value)) {
-        rb_raise(cTypeError,
-                 "Expected number type for float field '%s' (given %s).", name,
-                 rb_class2name(CLASS_OF(value)));
-      }
-      ret.float_val = NUM2DBL(value);
-      break;
-    case kUpb_CType_Double:
-      if (!is_ruby_num(value)) {
-        rb_raise(cTypeError,
-                 "Expected number type for double field '%s' (given %s).", name,
-                 rb_class2name(CLASS_OF(value)));
-      }
-      ret.double_val = NUM2DBL(value);
-      break;
-    case kUpb_CType_Bool: {
-      if (value == Qtrue) {
-        ret.bool_val = 1;
-      } else if (value == Qfalse) {
-        ret.bool_val = 0;
-      } else {
-        rb_raise(cTypeError,
-                 "Invalid argument for boolean field '%s' (given %s).", name,
-                 rb_class2name(CLASS_OF(value)));
-      }
-      break;
-    }
-    case kUpb_CType_String: {
-      VALUE utf8 = rb_enc_from_encoding(rb_utf8_encoding());
-      if (rb_obj_class(value) == rb_cSymbol) {
-        value = rb_funcall(value, rb_intern("to_s"), 0);
-      } else if (rb_obj_class(value) != rb_cString) {
-        rb_raise(cTypeError,
-                 "Invalid argument for string field '%s' (given %s).", name,
-                 rb_class2name(CLASS_OF(value)));
-      }
-
-      if (rb_obj_encoding(value) != utf8) {
-        // Note: this will not duplicate underlying string data unless
-        // necessary.
-        value = rb_str_encode(value, utf8, 0, Qnil);
-
-        if (rb_enc_str_coderange(value) == ENC_CODERANGE_BROKEN) {
-          rb_raise(rb_eEncodingError, "String is invalid UTF-8");
-        }
-      }
-
-      ret.str_val = Convert_StringData(value, arena);
-      break;
-    }
-    case kUpb_CType_Bytes: {
-      VALUE bytes = rb_enc_from_encoding(rb_ascii8bit_encoding());
-      if (rb_obj_class(value) != rb_cString) {
-        rb_raise(cTypeError,
-                 "Invalid argument for bytes field '%s' (given %s).", name,
-                 rb_class2name(CLASS_OF(value)));
-      }
-
-      if (rb_obj_encoding(value) != bytes) {
-        // Note: this will not duplicate underlying string data unless
-        // necessary.
-        // TODO(haberman): is this really necessary to get raw bytes?
-        value = rb_str_encode(value, bytes, 0, Qnil);
-      }
-
-      ret.str_val = Convert_StringData(value, arena);
-      break;
-    }
-    case kUpb_CType_Message:
-      ret.msg_val =
-          Message_GetUpbMessage(value, type_info.def.msgdef, name, arena);
-      break;
-    case kUpb_CType_Enum:
-      ret.int32_val = Convert_ToEnum(value, name, type_info.def.enumdef);
-      break;
-    case kUpb_CType_Int32:
-    case kUpb_CType_Int64:
-    case kUpb_CType_UInt32:
-    case kUpb_CType_UInt64:
-      Convert_CheckInt(name, type_info.type, value);
-      switch (type_info.type) {
-        case kUpb_CType_Int32:
-          ret.int32_val = NUM2INT(value);
-          break;
-        case kUpb_CType_Int64:
-          ret.int64_val = NUM2LL(value);
-          break;
-        case kUpb_CType_UInt32:
-          ret.uint32_val = NUM2UINT(value);
-          break;
-        case kUpb_CType_UInt64:
-          ret.uint64_val = NUM2ULL(value);
-          break;
-        default:
-          break;
-      }
-      break;
-    default:
-      break;
-  }
-
-  return ret;
-}
-
-VALUE Convert_UpbToRuby(upb_MessageValue upb_val, TypeInfo type_info,
-                        VALUE arena) {
-  switch (type_info.type) {
-    case kUpb_CType_Float:
-      return DBL2NUM(upb_val.float_val);
-    case kUpb_CType_Double:
-      return DBL2NUM(upb_val.double_val);
-    case kUpb_CType_Bool:
-      return upb_val.bool_val ? Qtrue : Qfalse;
-    case kUpb_CType_Int32:
-      return INT2NUM(upb_val.int32_val);
-    case kUpb_CType_Int64:
-      return LL2NUM(upb_val.int64_val);
-    case kUpb_CType_UInt32:
-      return UINT2NUM(upb_val.uint32_val);
-    case kUpb_CType_UInt64:
-      return ULL2NUM(upb_val.int64_val);
-    case kUpb_CType_Enum: {
-      const upb_EnumValueDef *ev = upb_EnumDef_FindValueByNumber(
-          type_info.def.enumdef, upb_val.int32_val);
-      if (ev) {
-        return ID2SYM(rb_intern(upb_EnumValueDef_Name(ev)));
-      } else {
-        return INT2NUM(upb_val.int32_val);
-      }
-    }
-    case kUpb_CType_String: {
-      VALUE str_rb = rb_str_new(upb_val.str_val.data, upb_val.str_val.size);
-      rb_enc_associate(str_rb, rb_utf8_encoding());
-      rb_obj_freeze(str_rb);
-      return str_rb;
-    }
-    case kUpb_CType_Bytes: {
-      VALUE str_rb = rb_str_new(upb_val.str_val.data, upb_val.str_val.size);
-      rb_enc_associate(str_rb, rb_ascii8bit_encoding());
-      rb_obj_freeze(str_rb);
-      return str_rb;
-    }
-    case kUpb_CType_Message:
-      return Message_GetRubyWrapper((upb_Message*)upb_val.msg_val,
-                                    type_info.def.msgdef, arena);
-    default:
-      rb_raise(rb_eRuntimeError, "Convert_UpbToRuby(): Unexpected type %d",
-               (int)type_info.type);
-  }
-}
-
-upb_MessageValue Msgval_DeepCopy(upb_MessageValue msgval, TypeInfo type_info,
-                                 upb_Arena* arena) {
-  upb_MessageValue new_msgval;
-
-  switch (type_info.type) {
-    default:
-      memcpy(&new_msgval, &msgval, sizeof(msgval));
-      break;
-    case kUpb_CType_String:
-    case kUpb_CType_Bytes: {
-      size_t n = msgval.str_val.size;
-      char* mem = upb_Arena_Malloc(arena, n);
-      new_msgval.str_val.data = mem;
-      new_msgval.str_val.size = n;
-      memcpy(mem, msgval.str_val.data, n);
-      break;
-    }
-    case kUpb_CType_Message:
-      new_msgval.msg_val =
-          Message_deep_copy(msgval.msg_val, type_info.def.msgdef, arena);
-      break;
-  }
-
-  return new_msgval;
-}
-
-bool Msgval_IsEqual(upb_MessageValue val1, upb_MessageValue val2,
-                    TypeInfo type_info) {
-  switch (type_info.type) {
-    case kUpb_CType_Bool:
-      return memcmp(&val1, &val2, 1) == 0;
-    case kUpb_CType_Float:
-    case kUpb_CType_Int32:
-    case kUpb_CType_UInt32:
-    case kUpb_CType_Enum:
-      return memcmp(&val1, &val2, 4) == 0;
-    case kUpb_CType_Double:
-    case kUpb_CType_Int64:
-    case kUpb_CType_UInt64:
-      return memcmp(&val1, &val2, 8) == 0;
-    case kUpb_CType_String:
-    case kUpb_CType_Bytes:
-      return val1.str_val.size == val2.str_val.size &&
-             memcmp(val1.str_val.data, val2.str_val.data, val1.str_val.size) ==
-                 0;
-    case kUpb_CType_Message:
-      return Message_Equal(val1.msg_val, val2.msg_val, type_info.def.msgdef);
-    default:
-      rb_raise(rb_eRuntimeError, "Internal error, unexpected type");
-  }
-}
-
-uint64_t Msgval_GetHash(upb_MessageValue val, TypeInfo type_info,
-                        uint64_t seed) {
-  switch (type_info.type) {
-    case kUpb_CType_Bool:
-      return _upb_Hash(&val, 1, seed);
-    case kUpb_CType_Float:
-    case kUpb_CType_Int32:
-    case kUpb_CType_UInt32:
-    case kUpb_CType_Enum:
-      return _upb_Hash(&val, 4, seed);
-    case kUpb_CType_Double:
-    case kUpb_CType_Int64:
-    case kUpb_CType_UInt64:
-      return _upb_Hash(&val, 8, seed);
-    case kUpb_CType_String:
-    case kUpb_CType_Bytes:
-      return _upb_Hash(val.str_val.data, val.str_val.size, seed);
-    case kUpb_CType_Message:
-      return Message_Hash(val.msg_val, type_info.def.msgdef, seed);
-    default:
-      rb_raise(rb_eRuntimeError, "Internal error, unexpected type");
-  }
-}
diff --git a/libs/protobuf/ruby/ext/google/protobuf_c/convert.h b/libs/protobuf/ruby/ext/google/protobuf_c/convert.h
deleted file mode 100644
index e48c979..0000000
--- a/libs/protobuf/ruby/ext/google/protobuf_c/convert.h
+++ /dev/null
@@ -1,75 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef RUBY_PROTOBUF_CONVERT_H_
-#define RUBY_PROTOBUF_CONVERT_H_
-
-#include <ruby/ruby.h>
-
-#include "protobuf.h"
-#include "ruby-upb.h"
-
-// Converts |ruby_val| to a upb_MessageValue according to |type_info|.
-//
-// The |arena| parameter indicates the lifetime of the container where this
-// value will be assigned. It is used as follows:
-// - If type is string or bytes, the string data will be copied into |arena|.
-// - If type is message, and we need to auto-construct a message due to implicit
-//   conversions (eg. Time -> Google::Protobuf::Timestamp), the new message
-//   will be created in |arena|.
-// - If type is message and the Ruby value is a message instance, we will fuse
-//   the message's arena into |arena|, to ensure that this message outlives the
-//   container.
-upb_MessageValue Convert_RubyToUpb(VALUE ruby_val, const char *name,
-                                   TypeInfo type_info, upb_Arena *arena);
-
-// Converts |upb_val| to a Ruby VALUE according to |type_info|. This may involve
-// creating a Ruby wrapper object.
-//
-// The |arena| parameter indicates the arena that owns the lifetime of
-// |upb_val|. Any Ruby wrapper object that is created will reference |arena|
-// and ensure it outlives the wrapper.
-VALUE Convert_UpbToRuby(upb_MessageValue upb_val, TypeInfo type_info,
-                        VALUE arena);
-
-// Creates a deep copy of |msgval| in |arena|.
-upb_MessageValue Msgval_DeepCopy(upb_MessageValue msgval, TypeInfo type_info,
-                                 upb_Arena *arena);
-
-// Returns true if |val1| and |val2| are equal. Their type is given by
-// |type_info|.
-bool Msgval_IsEqual(upb_MessageValue val1, upb_MessageValue val2,
-                    TypeInfo type_info);
-
-// Returns a hash value for the given upb_MessageValue.
-uint64_t Msgval_GetHash(upb_MessageValue val, TypeInfo type_info,
-                        uint64_t seed);
-
-#endif  // RUBY_PROTOBUF_CONVERT_H_
diff --git a/libs/protobuf/ruby/ext/google/protobuf_c/defs.c b/libs/protobuf/ruby/ext/google/protobuf_c/defs.c
deleted file mode 100644
index 3bd18e8..0000000
--- a/libs/protobuf/ruby/ext/google/protobuf_c/defs.c
+++ /dev/null
@@ -1,1280 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2014 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <ctype.h>
-#include <errno.h>
-#include <ruby/version.h>
-
-#include "convert.h"
-#include "message.h"
-#include "protobuf.h"
-
-// -----------------------------------------------------------------------------
-// Global map from upb {msg,enum}defs to wrapper Descriptor/EnumDescriptor
-// instances.
-// -----------------------------------------------------------------------------
-
-static VALUE get_msgdef_obj(VALUE descriptor_pool, const upb_MessageDef* def);
-static VALUE get_enumdef_obj(VALUE descriptor_pool, const upb_EnumDef* def);
-static VALUE get_fielddef_obj(VALUE descriptor_pool, const upb_FieldDef* def);
-static VALUE get_filedef_obj(VALUE descriptor_pool, const upb_FileDef* def);
-static VALUE get_oneofdef_obj(VALUE descriptor_pool, const upb_OneofDef* def);
-
-// A distinct object that is not accessible from Ruby.  We use this as a
-// constructor argument to enforce that certain objects cannot be created from
-// Ruby.
-VALUE c_only_cookie = Qnil;
-
-// -----------------------------------------------------------------------------
-// Common utilities.
-// -----------------------------------------------------------------------------
-
-static const char* get_str(VALUE str) {
-  Check_Type(str, T_STRING);
-  return RSTRING_PTR(str);
-}
-
-static VALUE rb_str_maybe_null(const char* s) {
-  if (s == NULL) {
-    s = "";
-  }
-  return rb_str_new2(s);
-}
-
-// -----------------------------------------------------------------------------
-// DescriptorPool.
-// -----------------------------------------------------------------------------
-
-typedef struct {
-  VALUE def_to_descriptor;  // Hash table of def* -> Ruby descriptor.
-  upb_DefPool* symtab;
-} DescriptorPool;
-
-VALUE cDescriptorPool = Qnil;
-
-// Global singleton DescriptorPool. The user is free to create others, but this
-// is used by generated code.
-VALUE generated_pool = Qnil;
-
-static void DescriptorPool_mark(void* _self) {
-  DescriptorPool* self = _self;
-  rb_gc_mark(self->def_to_descriptor);
-}
-
-static void DescriptorPool_free(void* _self) {
-  DescriptorPool* self = _self;
-  upb_DefPool_Free(self->symtab);
-  xfree(self);
-}
-
-static const rb_data_type_t DescriptorPool_type = {
-    "Google::Protobuf::DescriptorPool",
-    {DescriptorPool_mark, DescriptorPool_free, NULL},
-    .flags = RUBY_TYPED_FREE_IMMEDIATELY,
-};
-
-static DescriptorPool* ruby_to_DescriptorPool(VALUE val) {
-  DescriptorPool* ret;
-  TypedData_Get_Struct(val, DescriptorPool, &DescriptorPool_type, ret);
-  return ret;
-}
-
-// Exposed to other modules in defs.h.
-const upb_DefPool* DescriptorPool_GetSymtab(VALUE desc_pool_rb) {
-  DescriptorPool* pool = ruby_to_DescriptorPool(desc_pool_rb);
-  return pool->symtab;
-}
-
-/*
- * call-seq:
- *     DescriptorPool.new => pool
- *
- * Creates a new, empty, descriptor pool.
- */
-static VALUE DescriptorPool_alloc(VALUE klass) {
-  DescriptorPool* self = ALLOC(DescriptorPool);
-  VALUE ret;
-
-  self->def_to_descriptor = Qnil;
-  ret = TypedData_Wrap_Struct(klass, &DescriptorPool_type, self);
-
-  self->def_to_descriptor = rb_hash_new();
-  self->symtab = upb_DefPool_New();
-  ObjectCache_Add(self->symtab, ret);
-
-  return ret;
-}
-
-/*
- * call-seq:
- *     DescriptorPool.add_serialized_file(serialized_file_proto)
- *
- * Adds the given serialized FileDescriptorProto to the pool.
- */
-VALUE DescriptorPool_add_serialized_file(VALUE _self,
-                                         VALUE serialized_file_proto) {
-  DescriptorPool* self = ruby_to_DescriptorPool(_self);
-  Check_Type(serialized_file_proto, T_STRING);
-  VALUE arena_rb = Arena_new();
-  upb_Arena* arena = Arena_get(arena_rb);
-  google_protobuf_FileDescriptorProto* file_proto =
-      google_protobuf_FileDescriptorProto_parse(
-          RSTRING_PTR(serialized_file_proto),
-          RSTRING_LEN(serialized_file_proto), arena);
-  if (!file_proto) {
-    rb_raise(rb_eArgError, "Unable to parse FileDescriptorProto");
-  }
-  upb_Status status;
-  upb_Status_Clear(&status);
-  const upb_FileDef* filedef =
-      upb_DefPool_AddFile(self->symtab, file_proto, &status);
-  if (!filedef) {
-    rb_raise(cTypeError, "Unable to build file to DescriptorPool: %s",
-             upb_Status_ErrorMessage(&status));
-  }
-  RB_GC_GUARD(arena_rb);
-  return get_filedef_obj(_self, filedef);
-}
-
-/*
- * call-seq:
- *     DescriptorPool.lookup(name) => descriptor
- *
- * Finds a Descriptor or EnumDescriptor by name and returns it, or nil if none
- * exists with the given name.
- */
-static VALUE DescriptorPool_lookup(VALUE _self, VALUE name) {
-  DescriptorPool* self = ruby_to_DescriptorPool(_self);
-  const char* name_str = get_str(name);
-  const upb_MessageDef* msgdef;
-  const upb_EnumDef* enumdef;
-
-  msgdef = upb_DefPool_FindMessageByName(self->symtab, name_str);
-  if (msgdef) {
-    return get_msgdef_obj(_self, msgdef);
-  }
-
-  enumdef = upb_DefPool_FindEnumByName(self->symtab, name_str);
-  if (enumdef) {
-    return get_enumdef_obj(_self, enumdef);
-  }
-
-  return Qnil;
-}
-
-/*
- * call-seq:
- *     DescriptorPool.generated_pool => descriptor_pool
- *
- * Class method that returns the global DescriptorPool. This is a singleton into
- * which generated-code message and enum types are registered. The user may also
- * register types in this pool for convenience so that they do not have to hold
- * a reference to a private pool instance.
- */
-static VALUE DescriptorPool_generated_pool(VALUE _self) {
-  return generated_pool;
-}
-
-static void DescriptorPool_register(VALUE module) {
-  VALUE klass = rb_define_class_under(module, "DescriptorPool", rb_cObject);
-  rb_define_alloc_func(klass, DescriptorPool_alloc);
-  rb_define_method(klass, "add_serialized_file",
-                   DescriptorPool_add_serialized_file, 1);
-  rb_define_method(klass, "lookup", DescriptorPool_lookup, 1);
-  rb_define_singleton_method(klass, "generated_pool",
-                             DescriptorPool_generated_pool, 0);
-  rb_gc_register_address(&cDescriptorPool);
-  cDescriptorPool = klass;
-
-  rb_gc_register_address(&generated_pool);
-  generated_pool = rb_class_new_instance(0, NULL, klass);
-}
-
-// -----------------------------------------------------------------------------
-// Descriptor.
-// -----------------------------------------------------------------------------
-
-typedef struct {
-  const upb_MessageDef* msgdef;
-  VALUE klass;
-  VALUE descriptor_pool;
-} Descriptor;
-
-VALUE cDescriptor = Qnil;
-
-static void Descriptor_mark(void* _self) {
-  Descriptor* self = _self;
-  rb_gc_mark(self->klass);
-  rb_gc_mark(self->descriptor_pool);
-}
-
-static const rb_data_type_t Descriptor_type = {
-    "Google::Protobuf::Descriptor",
-    {Descriptor_mark, RUBY_DEFAULT_FREE, NULL},
-    .flags = RUBY_TYPED_FREE_IMMEDIATELY,
-};
-
-static Descriptor* ruby_to_Descriptor(VALUE val) {
-  Descriptor* ret;
-  TypedData_Get_Struct(val, Descriptor, &Descriptor_type, ret);
-  return ret;
-}
-
-/*
- * call-seq:
- *     Descriptor.new => descriptor
- *
- * Creates a new, empty, message type descriptor. At a minimum, its name must be
- * set before it is added to a pool. It cannot be used to create messages until
- * it is added to a pool, after which it becomes immutable (as part of a
- * finalization process).
- */
-static VALUE Descriptor_alloc(VALUE klass) {
-  Descriptor* self = ALLOC(Descriptor);
-  VALUE ret = TypedData_Wrap_Struct(klass, &Descriptor_type, self);
-  self->msgdef = NULL;
-  self->klass = Qnil;
-  self->descriptor_pool = Qnil;
-  return ret;
-}
-
-/*
- * call-seq:
- *    Descriptor.new(c_only_cookie, ptr) => Descriptor
- *
- * Creates a descriptor wrapper object.  May only be called from C.
- */
-static VALUE Descriptor_initialize(VALUE _self, VALUE cookie,
-                                   VALUE descriptor_pool, VALUE ptr) {
-  Descriptor* self = ruby_to_Descriptor(_self);
-
-  if (cookie != c_only_cookie) {
-    rb_raise(rb_eRuntimeError,
-             "Descriptor objects may not be created from Ruby.");
-  }
-
-  self->descriptor_pool = descriptor_pool;
-  self->msgdef = (const upb_MessageDef*)NUM2ULL(ptr);
-
-  return Qnil;
-}
-
-/*
- * call-seq:
- *    Descriptor.file_descriptor
- *
- * Returns the FileDescriptor object this message belongs to.
- */
-static VALUE Descriptor_file_descriptor(VALUE _self) {
-  Descriptor* self = ruby_to_Descriptor(_self);
-  return get_filedef_obj(self->descriptor_pool,
-                         upb_MessageDef_File(self->msgdef));
-}
-
-/*
- * call-seq:
- *     Descriptor.name => name
- *
- * Returns the name of this message type as a fully-qualified string (e.g.,
- * My.Package.MessageType).
- */
-static VALUE Descriptor_name(VALUE _self) {
-  Descriptor* self = ruby_to_Descriptor(_self);
-  return rb_str_maybe_null(upb_MessageDef_FullName(self->msgdef));
-}
-
-/*
- * call-seq:
- *     Descriptor.each(&block)
- *
- * Iterates over fields in this message type, yielding to the block on each one.
- */
-static VALUE Descriptor_each(VALUE _self) {
-  Descriptor* self = ruby_to_Descriptor(_self);
-
-  int n = upb_MessageDef_FieldCount(self->msgdef);
-  for (int i = 0; i < n; i++) {
-    const upb_FieldDef* field = upb_MessageDef_Field(self->msgdef, i);
-    VALUE obj = get_fielddef_obj(self->descriptor_pool, field);
-    rb_yield(obj);
-  }
-  return Qnil;
-}
-
-/*
- * call-seq:
- *     Descriptor.lookup(name) => FieldDescriptor
- *
- * Returns the field descriptor for the field with the given name, if present,
- * or nil if none.
- */
-static VALUE Descriptor_lookup(VALUE _self, VALUE name) {
-  Descriptor* self = ruby_to_Descriptor(_self);
-  const char* s = get_str(name);
-  const upb_FieldDef* field = upb_MessageDef_FindFieldByName(self->msgdef, s);
-  if (field == NULL) {
-    return Qnil;
-  }
-  return get_fielddef_obj(self->descriptor_pool, field);
-}
-
-/*
- * call-seq:
- *     Descriptor.each_oneof(&block) => nil
- *
- * Invokes the given block for each oneof in this message type, passing the
- * corresponding OneofDescriptor.
- */
-static VALUE Descriptor_each_oneof(VALUE _self) {
-  Descriptor* self = ruby_to_Descriptor(_self);
-
-  int n = upb_MessageDef_OneofCount(self->msgdef);
-  for (int i = 0; i < n; i++) {
-    const upb_OneofDef* oneof = upb_MessageDef_Oneof(self->msgdef, i);
-    VALUE obj = get_oneofdef_obj(self->descriptor_pool, oneof);
-    rb_yield(obj);
-  }
-  return Qnil;
-}
-
-/*
- * call-seq:
- *     Descriptor.lookup_oneof(name) => OneofDescriptor
- *
- * Returns the oneof descriptor for the oneof with the given name, if present,
- * or nil if none.
- */
-static VALUE Descriptor_lookup_oneof(VALUE _self, VALUE name) {
-  Descriptor* self = ruby_to_Descriptor(_self);
-  const char* s = get_str(name);
-  const upb_OneofDef* oneof = upb_MessageDef_FindOneofByName(self->msgdef, s);
-  if (oneof == NULL) {
-    return Qnil;
-  }
-  return get_oneofdef_obj(self->descriptor_pool, oneof);
-}
-
-/*
- * call-seq:
- *     Descriptor.msgclass => message_klass
- *
- * Returns the Ruby class created for this message type.
- */
-static VALUE Descriptor_msgclass(VALUE _self) {
-  Descriptor* self = ruby_to_Descriptor(_self);
-  if (self->klass == Qnil) {
-    self->klass = build_class_from_descriptor(_self);
-  }
-  return self->klass;
-}
-
-static void Descriptor_register(VALUE module) {
-  VALUE klass = rb_define_class_under(module, "Descriptor", rb_cObject);
-  rb_define_alloc_func(klass, Descriptor_alloc);
-  rb_define_method(klass, "initialize", Descriptor_initialize, 3);
-  rb_define_method(klass, "each", Descriptor_each, 0);
-  rb_define_method(klass, "lookup", Descriptor_lookup, 1);
-  rb_define_method(klass, "each_oneof", Descriptor_each_oneof, 0);
-  rb_define_method(klass, "lookup_oneof", Descriptor_lookup_oneof, 1);
-  rb_define_method(klass, "msgclass", Descriptor_msgclass, 0);
-  rb_define_method(klass, "name", Descriptor_name, 0);
-  rb_define_method(klass, "file_descriptor", Descriptor_file_descriptor, 0);
-  rb_include_module(klass, rb_mEnumerable);
-  rb_gc_register_address(&cDescriptor);
-  cDescriptor = klass;
-}
-
-// -----------------------------------------------------------------------------
-// FileDescriptor.
-// -----------------------------------------------------------------------------
-
-typedef struct {
-  const upb_FileDef* filedef;
-  VALUE descriptor_pool;  // Owns the upb_FileDef.
-} FileDescriptor;
-
-static VALUE cFileDescriptor = Qnil;
-
-static void FileDescriptor_mark(void* _self) {
-  FileDescriptor* self = _self;
-  rb_gc_mark(self->descriptor_pool);
-}
-
-static const rb_data_type_t FileDescriptor_type = {
-    "Google::Protobuf::FileDescriptor",
-    {FileDescriptor_mark, RUBY_DEFAULT_FREE, NULL},
-    .flags = RUBY_TYPED_FREE_IMMEDIATELY,
-};
-
-static FileDescriptor* ruby_to_FileDescriptor(VALUE val) {
-  FileDescriptor* ret;
-  TypedData_Get_Struct(val, FileDescriptor, &FileDescriptor_type, ret);
-  return ret;
-}
-
-static VALUE FileDescriptor_alloc(VALUE klass) {
-  FileDescriptor* self = ALLOC(FileDescriptor);
-  VALUE ret = TypedData_Wrap_Struct(klass, &FileDescriptor_type, self);
-  self->descriptor_pool = Qnil;
-  self->filedef = NULL;
-  return ret;
-}
-
-/*
- * call-seq:
- *     FileDescriptor.new => file
- *
- * Returns a new file descriptor. The syntax must be set before it's passed
- * to a builder.
- */
-static VALUE FileDescriptor_initialize(VALUE _self, VALUE cookie,
-                                       VALUE descriptor_pool, VALUE ptr) {
-  FileDescriptor* self = ruby_to_FileDescriptor(_self);
-
-  if (cookie != c_only_cookie) {
-    rb_raise(rb_eRuntimeError,
-             "Descriptor objects may not be created from Ruby.");
-  }
-
-  self->descriptor_pool = descriptor_pool;
-  self->filedef = (const upb_FileDef*)NUM2ULL(ptr);
-
-  return Qnil;
-}
-
-/*
- * call-seq:
- *     FileDescriptor.name => name
- *
- * Returns the name of the file.
- */
-static VALUE FileDescriptor_name(VALUE _self) {
-  FileDescriptor* self = ruby_to_FileDescriptor(_self);
-  const char* name = upb_FileDef_Name(self->filedef);
-  return name == NULL ? Qnil : rb_str_new2(name);
-}
-
-/*
- * call-seq:
- *     FileDescriptor.syntax => syntax
- *
- * Returns this file descriptors syntax.
- *
- * Valid syntax versions are:
- *     :proto2 or :proto3.
- */
-static VALUE FileDescriptor_syntax(VALUE _self) {
-  FileDescriptor* self = ruby_to_FileDescriptor(_self);
-
-  switch (upb_FileDef_Syntax(self->filedef)) {
-    case kUpb_Syntax_Proto3:
-      return ID2SYM(rb_intern("proto3"));
-    case kUpb_Syntax_Proto2:
-      return ID2SYM(rb_intern("proto2"));
-    default:
-      return Qnil;
-  }
-}
-
-static void FileDescriptor_register(VALUE module) {
-  VALUE klass = rb_define_class_under(module, "FileDescriptor", rb_cObject);
-  rb_define_alloc_func(klass, FileDescriptor_alloc);
-  rb_define_method(klass, "initialize", FileDescriptor_initialize, 3);
-  rb_define_method(klass, "name", FileDescriptor_name, 0);
-  rb_define_method(klass, "syntax", FileDescriptor_syntax, 0);
-  rb_gc_register_address(&cFileDescriptor);
-  cFileDescriptor = klass;
-}
-
-// -----------------------------------------------------------------------------
-// FieldDescriptor.
-// -----------------------------------------------------------------------------
-
-typedef struct {
-  const upb_FieldDef* fielddef;
-  VALUE descriptor_pool;  // Owns the upb_FieldDef.
-} FieldDescriptor;
-
-static VALUE cFieldDescriptor = Qnil;
-
-static void FieldDescriptor_mark(void* _self) {
-  FieldDescriptor* self = _self;
-  rb_gc_mark(self->descriptor_pool);
-}
-
-static const rb_data_type_t FieldDescriptor_type = {
-    "Google::Protobuf::FieldDescriptor",
-    {FieldDescriptor_mark, RUBY_DEFAULT_FREE, NULL},
-    .flags = RUBY_TYPED_FREE_IMMEDIATELY,
-};
-
-static FieldDescriptor* ruby_to_FieldDescriptor(VALUE val) {
-  FieldDescriptor* ret;
-  TypedData_Get_Struct(val, FieldDescriptor, &FieldDescriptor_type, ret);
-  return ret;
-}
-
-/*
- * call-seq:
- *     FieldDescriptor.new => field
- *
- * Returns a new field descriptor. Its name, type, etc. must be set before it is
- * added to a message type.
- */
-static VALUE FieldDescriptor_alloc(VALUE klass) {
-  FieldDescriptor* self = ALLOC(FieldDescriptor);
-  VALUE ret = TypedData_Wrap_Struct(klass, &FieldDescriptor_type, self);
-  self->fielddef = NULL;
-  return ret;
-}
-
-/*
- * call-seq:
- *    EnumDescriptor.new(c_only_cookie, pool, ptr) => EnumDescriptor
- *
- * Creates a descriptor wrapper object.  May only be called from C.
- */
-static VALUE FieldDescriptor_initialize(VALUE _self, VALUE cookie,
-                                        VALUE descriptor_pool, VALUE ptr) {
-  FieldDescriptor* self = ruby_to_FieldDescriptor(_self);
-
-  if (cookie != c_only_cookie) {
-    rb_raise(rb_eRuntimeError,
-             "Descriptor objects may not be created from Ruby.");
-  }
-
-  self->descriptor_pool = descriptor_pool;
-  self->fielddef = (const upb_FieldDef*)NUM2ULL(ptr);
-
-  return Qnil;
-}
-
-/*
- * call-seq:
- *     FieldDescriptor.name => name
- *
- * Returns the name of this field.
- */
-static VALUE FieldDescriptor_name(VALUE _self) {
-  FieldDescriptor* self = ruby_to_FieldDescriptor(_self);
-  return rb_str_maybe_null(upb_FieldDef_Name(self->fielddef));
-}
-
-// Non-static, exposed to other .c files.
-upb_CType ruby_to_fieldtype(VALUE type) {
-  if (TYPE(type) != T_SYMBOL) {
-    rb_raise(rb_eArgError, "Expected symbol for field type.");
-  }
-
-#define CONVERT(upb, ruby)                \
-  if (SYM2ID(type) == rb_intern(#ruby)) { \
-    return kUpb_CType_##upb;                \
-  }
-
-  CONVERT(Float, float);
-  CONVERT(Double, double);
-  CONVERT(Bool, bool);
-  CONVERT(String, string);
-  CONVERT(Bytes, bytes);
-  CONVERT(Message, message);
-  CONVERT(Enum, enum);
-  CONVERT(Int32, int32);
-  CONVERT(Int64, int64);
-  CONVERT(UInt32, uint32);
-  CONVERT(UInt64, uint64);
-
-#undef CONVERT
-
-  rb_raise(rb_eArgError, "Unknown field type.");
-  return 0;
-}
-
-static VALUE descriptortype_to_ruby(upb_FieldType type) {
-  switch (type) {
-#define CONVERT(upb, ruby)        \
-  case kUpb_FieldType_##upb: \
-    return ID2SYM(rb_intern(#ruby));
-    CONVERT(Float, float);
-    CONVERT(Double, double);
-    CONVERT(Bool, bool);
-    CONVERT(String, string);
-    CONVERT(Bytes, bytes);
-    CONVERT(Message, message);
-    CONVERT(Group, group);
-    CONVERT(Enum, enum);
-    CONVERT(Int32, int32);
-    CONVERT(Int64, int64);
-    CONVERT(UInt32, uint32);
-    CONVERT(UInt64, uint64);
-    CONVERT(SInt32, sint32);
-    CONVERT(SInt64, sint64);
-    CONVERT(Fixed32, fixed32);
-    CONVERT(Fixed64, fixed64);
-    CONVERT(SFixed32, sfixed32);
-    CONVERT(SFixed64, sfixed64);
-#undef CONVERT
-  }
-  return Qnil;
-}
-
-/*
- * call-seq:
- *     FieldDescriptor.type => type
- *
- * Returns this field's type, as a Ruby symbol, or nil if not yet set.
- *
- * Valid field types are:
- *     :int32, :int64, :uint32, :uint64, :float, :double, :bool, :string,
- *     :bytes, :message.
- */
-static VALUE FieldDescriptor__type(VALUE _self) {
-  FieldDescriptor* self = ruby_to_FieldDescriptor(_self);
-  return descriptortype_to_ruby(upb_FieldDef_Type(self->fielddef));
-}
-
-/*
- * call-seq:
- *     FieldDescriptor.default => default
- *
- * Returns this field's default, as a Ruby object, or nil if not yet set.
- */
-static VALUE FieldDescriptor_default(VALUE _self) {
-  FieldDescriptor* self = ruby_to_FieldDescriptor(_self);
-  const upb_FieldDef* f = self->fielddef;
-  upb_MessageValue default_val = {0};
-  if (upb_FieldDef_IsSubMessage(f)) {
-    return Qnil;
-  } else if (!upb_FieldDef_IsRepeated(f)) {
-    default_val = upb_FieldDef_Default(f);
-  }
-  return Convert_UpbToRuby(default_val, TypeInfo_get(self->fielddef), Qnil);
-}
-
-/*
- * call-seq:
- *     FieldDescriptor.json_name => json_name
- *
- * Returns this field's json_name, as a Ruby string, or nil if not yet set.
- */
-static VALUE FieldDescriptor_json_name(VALUE _self) {
-  FieldDescriptor* self = ruby_to_FieldDescriptor(_self);
-  const upb_FieldDef* f = self->fielddef;
-  const char* json_name = upb_FieldDef_JsonName(f);
-  return rb_str_new2(json_name);
-}
-
-/*
- * call-seq:
- *     FieldDescriptor.label => label
- *
- * Returns this field's label (i.e., plurality), as a Ruby symbol.
- *
- * Valid field labels are:
- *     :optional, :repeated
- */
-static VALUE FieldDescriptor_label(VALUE _self) {
-  FieldDescriptor* self = ruby_to_FieldDescriptor(_self);
-  switch (upb_FieldDef_Label(self->fielddef)) {
-#define CONVERT(upb, ruby) \
-  case kUpb_Label_##upb:    \
-    return ID2SYM(rb_intern(#ruby));
-
-    CONVERT(Optional, optional);
-    CONVERT(Required, required);
-    CONVERT(Repeated, repeated);
-
-#undef CONVERT
-  }
-
-  return Qnil;
-}
-
-/*
- * call-seq:
- *     FieldDescriptor.number => number
- *
- * Returns the tag number for this field.
- */
-static VALUE FieldDescriptor_number(VALUE _self) {
-  FieldDescriptor* self = ruby_to_FieldDescriptor(_self);
-  return INT2NUM(upb_FieldDef_Number(self->fielddef));
-}
-
-/*
- * call-seq:
- *     FieldDescriptor.submsg_name => submsg_name
- *
- * Returns the name of the message or enum type corresponding to this field, if
- * it is a message or enum field (respectively), or nil otherwise. This type
- * name will be resolved within the context of the pool to which the containing
- * message type is added.
- */
-static VALUE FieldDescriptor_submsg_name(VALUE _self) {
-  FieldDescriptor* self = ruby_to_FieldDescriptor(_self);
-  switch (upb_FieldDef_CType(self->fielddef)) {
-    case kUpb_CType_Enum:
-      return rb_str_new2(
-          upb_EnumDef_FullName(upb_FieldDef_EnumSubDef(self->fielddef)));
-    case kUpb_CType_Message:
-      return rb_str_new2(
-          upb_MessageDef_FullName(upb_FieldDef_MessageSubDef(self->fielddef)));
-    default:
-      return Qnil;
-  }
-}
-
-/*
- * call-seq:
- *     FieldDescriptor.subtype => message_or_enum_descriptor
- *
- * Returns the message or enum descriptor corresponding to this field's type if
- * it is a message or enum field, respectively, or nil otherwise. Cannot be
- * called *until* the containing message type is added to a pool (and thus
- * resolved).
- */
-static VALUE FieldDescriptor_subtype(VALUE _self) {
-  FieldDescriptor* self = ruby_to_FieldDescriptor(_self);
-  switch (upb_FieldDef_CType(self->fielddef)) {
-    case kUpb_CType_Enum:
-      return get_enumdef_obj(self->descriptor_pool,
-                             upb_FieldDef_EnumSubDef(self->fielddef));
-    case kUpb_CType_Message:
-      return get_msgdef_obj(self->descriptor_pool,
-                            upb_FieldDef_MessageSubDef(self->fielddef));
-    default:
-      return Qnil;
-  }
-}
-
-/*
- * call-seq:
- *     FieldDescriptor.get(message) => value
- *
- * Returns the value set for this field on the given message. Raises an
- * exception if message is of the wrong type.
- */
-static VALUE FieldDescriptor_get(VALUE _self, VALUE msg_rb) {
-  FieldDescriptor* self = ruby_to_FieldDescriptor(_self);
-  const upb_MessageDef* m;
-
-  Message_Get(msg_rb, &m);
-
-  if (m != upb_FieldDef_ContainingType(self->fielddef)) {
-    rb_raise(cTypeError, "get method called on wrong message type");
-  }
-
-  return Message_getfield(msg_rb, self->fielddef);
-}
-
-/*
- * call-seq:
- *     FieldDescriptor.has?(message) => boolean
- *
- * Returns whether the value is set on the given message. Raises an
- * exception when calling for fields that do not have presence.
- */
-static VALUE FieldDescriptor_has(VALUE _self, VALUE msg_rb) {
-  FieldDescriptor* self = ruby_to_FieldDescriptor(_self);
-  const upb_MessageDef* m;
-  const upb_MessageDef* msg = Message_Get(msg_rb, &m);
-
-  if (m != upb_FieldDef_ContainingType(self->fielddef)) {
-    rb_raise(cTypeError, "has method called on wrong message type");
-  } else if (!upb_FieldDef_HasPresence(self->fielddef)) {
-    rb_raise(rb_eArgError, "does not track presence");
-  }
-
-  return upb_Message_Has(msg, self->fielddef) ? Qtrue : Qfalse;
-}
-
-/*
- * call-seq:
- *     FieldDescriptor.clear(message)
- *
- * Clears the field from the message if it's set.
- */
-static VALUE FieldDescriptor_clear(VALUE _self, VALUE msg_rb) {
-  FieldDescriptor* self = ruby_to_FieldDescriptor(_self);
-  const upb_MessageDef* m;
-  upb_MessageDef* msg = Message_GetMutable(msg_rb, &m);
-
-  if (m != upb_FieldDef_ContainingType(self->fielddef)) {
-    rb_raise(cTypeError, "has method called on wrong message type");
-  }
-
-  upb_Message_ClearField(msg, self->fielddef);
-  return Qnil;
-}
-
-/*
- * call-seq:
- *     FieldDescriptor.set(message, value)
- *
- * Sets the value corresponding to this field to the given value on the given
- * message. Raises an exception if message is of the wrong type. Performs the
- * ordinary type-checks for field setting.
- */
-static VALUE FieldDescriptor_set(VALUE _self, VALUE msg_rb, VALUE value) {
-  FieldDescriptor* self = ruby_to_FieldDescriptor(_self);
-  const upb_MessageDef* m;
-  upb_MessageDef* msg = Message_GetMutable(msg_rb, &m);
-  upb_Arena* arena = Arena_get(Message_GetArena(msg_rb));
-  upb_MessageValue msgval;
-
-  if (m != upb_FieldDef_ContainingType(self->fielddef)) {
-    rb_raise(cTypeError, "set method called on wrong message type");
-  }
-
-  msgval = Convert_RubyToUpb(value, upb_FieldDef_Name(self->fielddef),
-                             TypeInfo_get(self->fielddef), arena);
-  upb_Message_Set(msg, self->fielddef, msgval, arena);
-  return Qnil;
-}
-
-static void FieldDescriptor_register(VALUE module) {
-  VALUE klass = rb_define_class_under(module, "FieldDescriptor", rb_cObject);
-  rb_define_alloc_func(klass, FieldDescriptor_alloc);
-  rb_define_method(klass, "initialize", FieldDescriptor_initialize, 3);
-  rb_define_method(klass, "name", FieldDescriptor_name, 0);
-  rb_define_method(klass, "type", FieldDescriptor__type, 0);
-  rb_define_method(klass, "default", FieldDescriptor_default, 0);
-  rb_define_method(klass, "json_name", FieldDescriptor_json_name, 0);
-  rb_define_method(klass, "label", FieldDescriptor_label, 0);
-  rb_define_method(klass, "number", FieldDescriptor_number, 0);
-  rb_define_method(klass, "submsg_name", FieldDescriptor_submsg_name, 0);
-  rb_define_method(klass, "subtype", FieldDescriptor_subtype, 0);
-  rb_define_method(klass, "has?", FieldDescriptor_has, 1);
-  rb_define_method(klass, "clear", FieldDescriptor_clear, 1);
-  rb_define_method(klass, "get", FieldDescriptor_get, 1);
-  rb_define_method(klass, "set", FieldDescriptor_set, 2);
-  rb_gc_register_address(&cFieldDescriptor);
-  cFieldDescriptor = klass;
-}
-
-// -----------------------------------------------------------------------------
-// OneofDescriptor.
-// -----------------------------------------------------------------------------
-
-typedef struct {
-  const upb_OneofDef* oneofdef;
-  VALUE descriptor_pool;  // Owns the upb_OneofDef.
-} OneofDescriptor;
-
-static VALUE cOneofDescriptor = Qnil;
-
-static void OneofDescriptor_mark(void* _self) {
-  OneofDescriptor* self = _self;
-  rb_gc_mark(self->descriptor_pool);
-}
-
-static const rb_data_type_t OneofDescriptor_type = {
-    "Google::Protobuf::OneofDescriptor",
-    {OneofDescriptor_mark, RUBY_DEFAULT_FREE, NULL},
-    .flags = RUBY_TYPED_FREE_IMMEDIATELY,
-};
-
-static OneofDescriptor* ruby_to_OneofDescriptor(VALUE val) {
-  OneofDescriptor* ret;
-  TypedData_Get_Struct(val, OneofDescriptor, &OneofDescriptor_type, ret);
-  return ret;
-}
-
-/*
- * call-seq:
- *     OneofDescriptor.new => oneof_descriptor
- *
- * Creates a new, empty, oneof descriptor. The oneof may only be modified prior
- * to being added to a message descriptor which is subsequently added to a pool.
- */
-static VALUE OneofDescriptor_alloc(VALUE klass) {
-  OneofDescriptor* self = ALLOC(OneofDescriptor);
-  VALUE ret = TypedData_Wrap_Struct(klass, &OneofDescriptor_type, self);
-  self->oneofdef = NULL;
-  self->descriptor_pool = Qnil;
-  return ret;
-}
-
-/*
- * call-seq:
- *    OneofDescriptor.new(c_only_cookie, pool, ptr) => OneofDescriptor
- *
- * Creates a descriptor wrapper object.  May only be called from C.
- */
-static VALUE OneofDescriptor_initialize(VALUE _self, VALUE cookie,
-                                        VALUE descriptor_pool, VALUE ptr) {
-  OneofDescriptor* self = ruby_to_OneofDescriptor(_self);
-
-  if (cookie != c_only_cookie) {
-    rb_raise(rb_eRuntimeError,
-             "Descriptor objects may not be created from Ruby.");
-  }
-
-  self->descriptor_pool = descriptor_pool;
-  self->oneofdef = (const upb_OneofDef*)NUM2ULL(ptr);
-
-  return Qnil;
-}
-
-/*
- * call-seq:
- *     OneofDescriptor.name => name
- *
- * Returns the name of this oneof.
- */
-static VALUE OneofDescriptor_name(VALUE _self) {
-  OneofDescriptor* self = ruby_to_OneofDescriptor(_self);
-  return rb_str_maybe_null(upb_OneofDef_Name(self->oneofdef));
-}
-
-/*
- * call-seq:
- *     OneofDescriptor.each(&block) => nil
- *
- * Iterates through fields in this oneof, yielding to the block on each one.
- */
-static VALUE OneofDescriptor_each(VALUE _self) {
-  OneofDescriptor* self = ruby_to_OneofDescriptor(_self);
-
-  int n = upb_OneofDef_FieldCount(self->oneofdef);
-  for (int i = 0; i < n; i++) {
-    const upb_FieldDef* f = upb_OneofDef_Field(self->oneofdef, i);
-    VALUE obj = get_fielddef_obj(self->descriptor_pool, f);
-    rb_yield(obj);
-  }
-  return Qnil;
-}
-
-static void OneofDescriptor_register(VALUE module) {
-  VALUE klass = rb_define_class_under(module, "OneofDescriptor", rb_cObject);
-  rb_define_alloc_func(klass, OneofDescriptor_alloc);
-  rb_define_method(klass, "initialize", OneofDescriptor_initialize, 3);
-  rb_define_method(klass, "name", OneofDescriptor_name, 0);
-  rb_define_method(klass, "each", OneofDescriptor_each, 0);
-  rb_include_module(klass, rb_mEnumerable);
-  rb_gc_register_address(&cOneofDescriptor);
-  cOneofDescriptor = klass;
-}
-
-// -----------------------------------------------------------------------------
-// EnumDescriptor.
-// -----------------------------------------------------------------------------
-
-typedef struct {
-  const upb_EnumDef* enumdef;
-  VALUE module;           // begins as nil
-  VALUE descriptor_pool;  // Owns the upb_EnumDef.
-} EnumDescriptor;
-
-static VALUE cEnumDescriptor = Qnil;
-
-static void EnumDescriptor_mark(void* _self) {
-  EnumDescriptor* self = _self;
-  rb_gc_mark(self->module);
-  rb_gc_mark(self->descriptor_pool);
-}
-
-static const rb_data_type_t EnumDescriptor_type = {
-    "Google::Protobuf::EnumDescriptor",
-    {EnumDescriptor_mark, RUBY_DEFAULT_FREE, NULL},
-    .flags = RUBY_TYPED_FREE_IMMEDIATELY,
-};
-
-static EnumDescriptor* ruby_to_EnumDescriptor(VALUE val) {
-  EnumDescriptor* ret;
-  TypedData_Get_Struct(val, EnumDescriptor, &EnumDescriptor_type, ret);
-  return ret;
-}
-
-static VALUE EnumDescriptor_alloc(VALUE klass) {
-  EnumDescriptor* self = ALLOC(EnumDescriptor);
-  VALUE ret = TypedData_Wrap_Struct(klass, &EnumDescriptor_type, self);
-  self->enumdef = NULL;
-  self->module = Qnil;
-  self->descriptor_pool = Qnil;
-  return ret;
-}
-
-// Exposed to other modules in defs.h.
-const upb_EnumDef* EnumDescriptor_GetEnumDef(VALUE enum_desc_rb) {
-  EnumDescriptor* desc = ruby_to_EnumDescriptor(enum_desc_rb);
-  return desc->enumdef;
-}
-
-/*
- * call-seq:
- *    EnumDescriptor.new(c_only_cookie, ptr) => EnumDescriptor
- *
- * Creates a descriptor wrapper object.  May only be called from C.
- */
-static VALUE EnumDescriptor_initialize(VALUE _self, VALUE cookie,
-                                       VALUE descriptor_pool, VALUE ptr) {
-  EnumDescriptor* self = ruby_to_EnumDescriptor(_self);
-
-  if (cookie != c_only_cookie) {
-    rb_raise(rb_eRuntimeError,
-             "Descriptor objects may not be created from Ruby.");
-  }
-
-  self->descriptor_pool = descriptor_pool;
-  self->enumdef = (const upb_EnumDef*)NUM2ULL(ptr);
-
-  return Qnil;
-}
-
-/*
- * call-seq:
- *    EnumDescriptor.file_descriptor
- *
- * Returns the FileDescriptor object this enum belongs to.
- */
-static VALUE EnumDescriptor_file_descriptor(VALUE _self) {
-  EnumDescriptor* self = ruby_to_EnumDescriptor(_self);
-  return get_filedef_obj(self->descriptor_pool,
-                         upb_EnumDef_File(self->enumdef));
-}
-
-/*
- * call-seq:
- *     EnumDescriptor.name => name
- *
- * Returns the name of this enum type.
- */
-static VALUE EnumDescriptor_name(VALUE _self) {
-  EnumDescriptor* self = ruby_to_EnumDescriptor(_self);
-  return rb_str_maybe_null(upb_EnumDef_FullName(self->enumdef));
-}
-
-/*
- * call-seq:
- *     EnumDescriptor.lookup_name(name) => value
- *
- * Returns the numeric value corresponding to the given key name (as a Ruby
- * symbol), or nil if none.
- */
-static VALUE EnumDescriptor_lookup_name(VALUE _self, VALUE name) {
-  EnumDescriptor* self = ruby_to_EnumDescriptor(_self);
-  const char* name_str = rb_id2name(SYM2ID(name));
-  const upb_EnumValueDef *ev =
-      upb_EnumDef_FindValueByName(self->enumdef, name_str);
-  if (ev) {
-    return INT2NUM(upb_EnumValueDef_Number(ev));
-  } else {
-    return Qnil;
-  }
-}
-
-/*
- * call-seq:
- *     EnumDescriptor.lookup_value(name) => value
- *
- * Returns the key name (as a Ruby symbol) corresponding to the integer value,
- * or nil if none.
- */
-static VALUE EnumDescriptor_lookup_value(VALUE _self, VALUE number) {
-  EnumDescriptor* self = ruby_to_EnumDescriptor(_self);
-  int32_t val = NUM2INT(number);
-  const upb_EnumValueDef* ev = upb_EnumDef_FindValueByNumber(self->enumdef, val);
-  if (ev) {
-    return ID2SYM(rb_intern(upb_EnumValueDef_Name(ev)));
-  } else {
-    return Qnil;
-  }
-}
-
-/*
- * call-seq:
- *     EnumDescriptor.each(&block)
- *
- * Iterates over key => value mappings in this enum's definition, yielding to
- * the block with (key, value) arguments for each one.
- */
-static VALUE EnumDescriptor_each(VALUE _self) {
-  EnumDescriptor* self = ruby_to_EnumDescriptor(_self);
-
-  int n = upb_EnumDef_ValueCount(self->enumdef);
-  for (int i = 0; i < n; i++) {
-    const upb_EnumValueDef* ev = upb_EnumDef_Value(self->enumdef, i);
-    VALUE key = ID2SYM(rb_intern(upb_EnumValueDef_Name(ev)));
-    VALUE number = INT2NUM(upb_EnumValueDef_Number(ev));
-    rb_yield_values(2, key, number);
-  }
-
-  return Qnil;
-}
-
-/*
- * call-seq:
- *     EnumDescriptor.enummodule => module
- *
- * Returns the Ruby module corresponding to this enum type.
- */
-static VALUE EnumDescriptor_enummodule(VALUE _self) {
-  EnumDescriptor* self = ruby_to_EnumDescriptor(_self);
-  if (self->module == Qnil) {
-    self->module = build_module_from_enumdesc(_self);
-  }
-  return self->module;
-}
-
-static void EnumDescriptor_register(VALUE module) {
-  VALUE klass = rb_define_class_under(module, "EnumDescriptor", rb_cObject);
-  rb_define_alloc_func(klass, EnumDescriptor_alloc);
-  rb_define_method(klass, "initialize", EnumDescriptor_initialize, 3);
-  rb_define_method(klass, "name", EnumDescriptor_name, 0);
-  rb_define_method(klass, "lookup_name", EnumDescriptor_lookup_name, 1);
-  rb_define_method(klass, "lookup_value", EnumDescriptor_lookup_value, 1);
-  rb_define_method(klass, "each", EnumDescriptor_each, 0);
-  rb_define_method(klass, "enummodule", EnumDescriptor_enummodule, 0);
-  rb_define_method(klass, "file_descriptor", EnumDescriptor_file_descriptor, 0);
-  rb_include_module(klass, rb_mEnumerable);
-  rb_gc_register_address(&cEnumDescriptor);
-  cEnumDescriptor = klass;
-}
-
-static VALUE get_def_obj(VALUE _descriptor_pool, const void* ptr, VALUE klass) {
-  DescriptorPool* descriptor_pool = ruby_to_DescriptorPool(_descriptor_pool);
-  VALUE key = ULL2NUM((intptr_t)ptr);
-  VALUE def;
-
-  def = rb_hash_aref(descriptor_pool->def_to_descriptor, key);
-
-  if (ptr == NULL) {
-    return Qnil;
-  }
-
-  if (def == Qnil) {
-    // Lazily create wrapper object.
-    VALUE args[3] = {c_only_cookie, _descriptor_pool, key};
-    def = rb_class_new_instance(3, args, klass);
-    rb_hash_aset(descriptor_pool->def_to_descriptor, key, def);
-  }
-
-  return def;
-}
-
-static VALUE get_msgdef_obj(VALUE descriptor_pool, const upb_MessageDef* def) {
-  return get_def_obj(descriptor_pool, def, cDescriptor);
-}
-
-static VALUE get_enumdef_obj(VALUE descriptor_pool, const upb_EnumDef* def) {
-  return get_def_obj(descriptor_pool, def, cEnumDescriptor);
-}
-
-static VALUE get_fielddef_obj(VALUE descriptor_pool, const upb_FieldDef* def) {
-  return get_def_obj(descriptor_pool, def, cFieldDescriptor);
-}
-
-static VALUE get_filedef_obj(VALUE descriptor_pool, const upb_FileDef* def) {
-  return get_def_obj(descriptor_pool, def, cFileDescriptor);
-}
-
-static VALUE get_oneofdef_obj(VALUE descriptor_pool, const upb_OneofDef* def) {
-  return get_def_obj(descriptor_pool, def, cOneofDescriptor);
-}
-
-// -----------------------------------------------------------------------------
-// Shared functions
-// -----------------------------------------------------------------------------
-
-// Functions exposed to other modules in defs.h.
-
-VALUE Descriptor_DefToClass(const upb_MessageDef* m) {
-  const upb_DefPool* symtab = upb_FileDef_Pool(upb_MessageDef_File(m));
-  VALUE pool = ObjectCache_Get(symtab);
-  PBRUBY_ASSERT(pool != Qnil);
-  VALUE desc_rb = get_msgdef_obj(pool, m);
-  const Descriptor* desc = ruby_to_Descriptor(desc_rb);
-  return desc->klass;
-}
-
-const upb_MessageDef* Descriptor_GetMsgDef(VALUE desc_rb) {
-  const Descriptor* desc = ruby_to_Descriptor(desc_rb);
-  return desc->msgdef;
-}
-
-VALUE TypeInfo_InitArg(int argc, VALUE* argv, int skip_arg) {
-  if (argc > skip_arg) {
-    if (argc > 1 + skip_arg) {
-      rb_raise(rb_eArgError, "Expected a maximum of %d arguments.",
-               skip_arg + 1);
-    }
-    return argv[skip_arg];
-  } else {
-    return Qnil;
-  }
-}
-
-TypeInfo TypeInfo_FromClass(int argc, VALUE* argv, int skip_arg,
-                            VALUE* type_class, VALUE* init_arg) {
-  TypeInfo ret = {ruby_to_fieldtype(argv[skip_arg])};
-
-  if (ret.type == kUpb_CType_Message || ret.type == kUpb_CType_Enum) {
-    *init_arg = TypeInfo_InitArg(argc, argv, skip_arg + 2);
-
-    if (argc < 2 + skip_arg) {
-      rb_raise(rb_eArgError, "Expected at least %d arguments for message/enum.",
-               2 + skip_arg);
-    }
-
-    VALUE klass = argv[1 + skip_arg];
-    VALUE desc = MessageOrEnum_GetDescriptor(klass);
-    *type_class = klass;
-
-    if (desc == Qnil) {
-      rb_raise(rb_eArgError,
-               "Type class has no descriptor. Please pass a "
-               "class or enum as returned by the DescriptorPool.");
-    }
-
-    if (ret.type == kUpb_CType_Message) {
-      ret.def.msgdef = ruby_to_Descriptor(desc)->msgdef;
-      Message_CheckClass(klass);
-    } else {
-      PBRUBY_ASSERT(ret.type == kUpb_CType_Enum);
-      ret.def.enumdef = ruby_to_EnumDescriptor(desc)->enumdef;
-    }
-  } else {
-    *init_arg = TypeInfo_InitArg(argc, argv, skip_arg + 1);
-  }
-
-  return ret;
-}
-
-void Defs_register(VALUE module) {
-  DescriptorPool_register(module);
-  Descriptor_register(module);
-  FileDescriptor_register(module);
-  FieldDescriptor_register(module);
-  OneofDescriptor_register(module);
-  EnumDescriptor_register(module);
-
-  rb_gc_register_address(&c_only_cookie);
-  c_only_cookie = rb_class_new_instance(0, NULL, rb_cObject);
-}
diff --git a/libs/protobuf/ruby/ext/google/protobuf_c/defs.h b/libs/protobuf/ruby/ext/google/protobuf_c/defs.h
deleted file mode 100644
index f559cb0..0000000
--- a/libs/protobuf/ruby/ext/google/protobuf_c/defs.h
+++ /dev/null
@@ -1,107 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef RUBY_PROTOBUF_DEFS_H_
-#define RUBY_PROTOBUF_DEFS_H_
-
-#include <ruby/ruby.h>
-
-#include "protobuf.h"
-#include "ruby-upb.h"
-
-// -----------------------------------------------------------------------------
-// TypeInfo
-// -----------------------------------------------------------------------------
-
-// This bundles a upb_CType and msgdef/enumdef when appropriate. This is
-// convenient for functions that need type information but cannot necessarily
-// assume a upb_FieldDef will be available.
-//
-// For example, Google::Protobuf::Map and Google::Protobuf::RepeatedField can
-// be constructed with type information alone:
-//
-//   # RepeatedField will internally store the type information in a TypeInfo.
-//   Google::Protobuf::RepeatedField.new(:message, FooMessage)
-
-typedef struct {
-  upb_CType type;
-  union {
-    const upb_MessageDef* msgdef;  // When type == kUpb_CType_Message
-    const upb_EnumDef* enumdef;    // When type == kUpb_CType_Enum
-  } def;
-} TypeInfo;
-
-static inline TypeInfo TypeInfo_get(const upb_FieldDef* f) {
-  TypeInfo ret = {upb_FieldDef_CType(f), {NULL}};
-  switch (ret.type) {
-    case kUpb_CType_Message:
-      ret.def.msgdef = upb_FieldDef_MessageSubDef(f);
-      break;
-    case kUpb_CType_Enum:
-      ret.def.enumdef = upb_FieldDef_EnumSubDef(f);
-      break;
-    default:
-      break;
-  }
-  return ret;
-}
-
-TypeInfo TypeInfo_FromClass(int argc, VALUE* argv, int skip_arg,
-                            VALUE* type_class, VALUE* init_arg);
-
-static inline TypeInfo TypeInfo_from_type(upb_CType type) {
-  TypeInfo ret = {type};
-  assert(type != kUpb_CType_Message && type != kUpb_CType_Enum);
-  return ret;
-}
-
-// -----------------------------------------------------------------------------
-// Other utilities
-// -----------------------------------------------------------------------------
-
-VALUE Descriptor_DefToClass(const upb_MessageDef* m);
-
-// Returns the underlying msgdef, enumdef, or symtab (respectively) for the
-// given Descriptor, EnumDescriptor, or DescriptorPool Ruby object.
-const upb_EnumDef* EnumDescriptor_GetEnumDef(VALUE enum_desc_rb);
-const upb_DefPool* DescriptorPool_GetSymtab(VALUE desc_pool_rb);
-const upb_MessageDef* Descriptor_GetMsgDef(VALUE desc_rb);
-
-// Returns a upb field type for the given Ruby symbol
-// (eg. :float => kUpb_CType_Float).
-upb_CType ruby_to_fieldtype(VALUE type);
-
-// The singleton generated pool (a DescriptorPool object).
-extern VALUE generated_pool;
-
-// Call at startup to register all types in this module.
-void Defs_register(VALUE module);
-
-#endif  // RUBY_PROTOBUF_DEFS_H_
diff --git a/libs/protobuf/ruby/ext/google/protobuf_c/extconf.rb b/libs/protobuf/ruby/ext/google/protobuf_c/extconf.rb
deleted file mode 100755
index 8bc96ae..0000000
--- a/libs/protobuf/ruby/ext/google/protobuf_c/extconf.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/usr/bin/ruby
-
-require 'mkmf'
-
-ext_name = "google/protobuf_c"
-
-dir_config(ext_name)
-
-if RUBY_PLATFORM =~ /darwin/ || RUBY_PLATFORM =~ /linux/
-  $CFLAGS += " -std=gnu99 -O3 -DNDEBUG -fvisibility=hidden -Wall -Wsign-compare -Wno-declaration-after-statement"
-else
-  $CFLAGS += " -std=gnu99 -O3 -DNDEBUG"
-end
-
-
-if RUBY_PLATFORM =~ /linux/
-  # Instruct the linker to point memcpy calls at our __wrap_memcpy wrapper.
-  $LDFLAGS += " -Wl,-wrap,memcpy"
-end
-
-$VPATH << "$(srcdir)/third_party/utf8_range"
-$INCFLAGS << "$(srcdir)/third_party/utf8_range"
-
-$srcs = ["protobuf.c", "convert.c", "defs.c", "message.c",
-         "repeated_field.c", "map.c", "ruby-upb.c", "wrap_memcpy.c",
-         "naive.c", "range2-neon.c", "range2-sse.c"]
-
-create_makefile(ext_name)
diff --git a/libs/protobuf/ruby/ext/google/protobuf_c/map.c b/libs/protobuf/ruby/ext/google/protobuf_c/map.c
deleted file mode 100644
index 5d30319..0000000
--- a/libs/protobuf/ruby/ext/google/protobuf_c/map.c
+++ /dev/null
@@ -1,702 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2014 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include "convert.h"
-#include "defs.h"
-#include "message.h"
-#include "protobuf.h"
-
-// -----------------------------------------------------------------------------
-// Basic map operations on top of upb_Map.
-//
-// Note that we roll our own `Map` container here because, as for
-// `RepeatedField`, we want a strongly-typed container. This is so that any user
-// errors due to incorrect map key or value types are raised as close as
-// possible to the error site, rather than at some deferred point (e.g.,
-// serialization).
-// -----------------------------------------------------------------------------
-
-// -----------------------------------------------------------------------------
-// Map container type.
-// -----------------------------------------------------------------------------
-
-typedef struct {
-  const upb_Map* map;  // Can convert to mutable when non-frozen.
-  upb_CType key_type;
-  TypeInfo value_type_info;
-  VALUE value_type_class;
-  VALUE arena;
-} Map;
-
-static void Map_mark(void* _self) {
-  Map* self = _self;
-  rb_gc_mark(self->value_type_class);
-  rb_gc_mark(self->arena);
-}
-
-const rb_data_type_t Map_type = {
-    "Google::Protobuf::Map",
-    {Map_mark, RUBY_DEFAULT_FREE, NULL},
-    .flags = RUBY_TYPED_FREE_IMMEDIATELY,
-};
-
-VALUE cMap;
-
-static Map* ruby_to_Map(VALUE _self) {
-  Map* self;
-  TypedData_Get_Struct(_self, Map, &Map_type, self);
-  return self;
-}
-
-static VALUE Map_alloc(VALUE klass) {
-  Map* self = ALLOC(Map);
-  self->map = NULL;
-  self->value_type_class = Qnil;
-  self->value_type_info.def.msgdef = NULL;
-  self->arena = Qnil;
-  return TypedData_Wrap_Struct(klass, &Map_type, self);
-}
-
-VALUE Map_GetRubyWrapper(upb_Map* map, upb_CType key_type, TypeInfo value_type,
-                         VALUE arena) {
-  PBRUBY_ASSERT(map);
-
-  VALUE val = ObjectCache_Get(map);
-
-  if (val == Qnil) {
-    val = Map_alloc(cMap);
-    Map* self;
-    ObjectCache_Add(map, val);
-    TypedData_Get_Struct(val, Map, &Map_type, self);
-    self->map = map;
-    self->arena = arena;
-    self->key_type = key_type;
-    self->value_type_info = value_type;
-    if (self->value_type_info.type == kUpb_CType_Message) {
-      const upb_MessageDef* val_m = self->value_type_info.def.msgdef;
-      self->value_type_class = Descriptor_DefToClass(val_m);
-    }
-  }
-
-  return val;
-}
-
-static VALUE Map_new_this_type(Map* from) {
-  VALUE arena_rb = Arena_new();
-  upb_Map* map = upb_Map_New(Arena_get(arena_rb), from->key_type,
-                             from->value_type_info.type);
-  VALUE ret =
-      Map_GetRubyWrapper(map, from->key_type, from->value_type_info, arena_rb);
-  PBRUBY_ASSERT(ruby_to_Map(ret)->value_type_class == from->value_type_class);
-  return ret;
-}
-
-static TypeInfo Map_keyinfo(Map* self) {
-  TypeInfo ret;
-  ret.type = self->key_type;
-  ret.def.msgdef = NULL;
-  return ret;
-}
-
-static upb_Map* Map_GetMutable(VALUE _self) {
-  rb_check_frozen(_self);
-  return (upb_Map*)ruby_to_Map(_self)->map;
-}
-
-VALUE Map_CreateHash(const upb_Map* map, upb_CType key_type,
-                     TypeInfo val_info) {
-  VALUE hash = rb_hash_new();
-  size_t iter = kUpb_Map_Begin;
-  TypeInfo key_info = TypeInfo_from_type(key_type);
-
-  if (!map) return hash;
-
-  while (upb_MapIterator_Next(map, &iter)) {
-    upb_MessageValue key = upb_MapIterator_Key(map, iter);
-    upb_MessageValue val = upb_MapIterator_Value(map, iter);
-    VALUE key_val = Convert_UpbToRuby(key, key_info, Qnil);
-    VALUE val_val = Scalar_CreateHash(val, val_info);
-    rb_hash_aset(hash, key_val, val_val);
-  }
-
-  return hash;
-}
-
-VALUE Map_deep_copy(VALUE obj) {
-  Map* self = ruby_to_Map(obj);
-  VALUE new_arena_rb = Arena_new();
-  upb_Arena* arena = Arena_get(new_arena_rb);
-  upb_Map* new_map =
-      upb_Map_New(arena, self->key_type, self->value_type_info.type);
-  size_t iter = kUpb_Map_Begin;
-  while (upb_MapIterator_Next(self->map, &iter)) {
-    upb_MessageValue key = upb_MapIterator_Key(self->map, iter);
-    upb_MessageValue val = upb_MapIterator_Value(self->map, iter);
-    upb_MessageValue val_copy =
-        Msgval_DeepCopy(val, self->value_type_info, arena);
-    upb_Map_Set(new_map, key, val_copy, arena);
-  }
-
-  return Map_GetRubyWrapper(new_map, self->key_type, self->value_type_info,
-                            new_arena_rb);
-}
-
-const upb_Map* Map_GetUpbMap(VALUE val, const upb_FieldDef* field,
-                             upb_Arena* arena) {
-  const upb_FieldDef* key_field = map_field_key(field);
-  const upb_FieldDef* value_field = map_field_value(field);
-  TypeInfo value_type_info = TypeInfo_get(value_field);
-  Map* self;
-
-  if (!RB_TYPE_P(val, T_DATA) || !RTYPEDDATA_P(val) ||
-      RTYPEDDATA_TYPE(val) != &Map_type) {
-    rb_raise(cTypeError, "Expected Map instance");
-  }
-
-  self = ruby_to_Map(val);
-  if (self->key_type != upb_FieldDef_CType(key_field)) {
-    rb_raise(cTypeError, "Map key type does not match field's key type");
-  }
-  if (self->value_type_info.type != value_type_info.type) {
-    rb_raise(cTypeError, "Map value type does not match field's value type");
-  }
-  if (self->value_type_info.def.msgdef != value_type_info.def.msgdef) {
-    rb_raise(cTypeError, "Map value type has wrong message/enum class");
-  }
-
-  Arena_fuse(self->arena, arena);
-  return self->map;
-}
-
-void Map_Inspect(StringBuilder* b, const upb_Map* map, upb_CType key_type,
-                 TypeInfo val_type) {
-  bool first = true;
-  TypeInfo key_type_info = {key_type};
-  StringBuilder_Printf(b, "{");
-  if (map) {
-    size_t iter = kUpb_Map_Begin;
-    while (upb_MapIterator_Next(map, &iter)) {
-      upb_MessageValue key = upb_MapIterator_Key(map, iter);
-      upb_MessageValue val = upb_MapIterator_Value(map, iter);
-      if (first) {
-        first = false;
-      } else {
-        StringBuilder_Printf(b, ", ");
-      }
-      StringBuilder_PrintMsgval(b, key, key_type_info);
-      StringBuilder_Printf(b, "=>");
-      StringBuilder_PrintMsgval(b, val, val_type);
-    }
-  }
-  StringBuilder_Printf(b, "}");
-}
-
-static int merge_into_self_callback(VALUE key, VALUE val, VALUE _self) {
-  Map* self = ruby_to_Map(_self);
-  upb_Arena* arena = Arena_get(self->arena);
-  upb_MessageValue key_val =
-      Convert_RubyToUpb(key, "", Map_keyinfo(self), arena);
-  upb_MessageValue val_val =
-      Convert_RubyToUpb(val, "", self->value_type_info, arena);
-  upb_Map_Set(Map_GetMutable(_self), key_val, val_val, arena);
-  return ST_CONTINUE;
-}
-
-// Used only internally -- shared by #merge and #initialize.
-static VALUE Map_merge_into_self(VALUE _self, VALUE hashmap) {
-  if (TYPE(hashmap) == T_HASH) {
-    rb_hash_foreach(hashmap, merge_into_self_callback, _self);
-  } else if (RB_TYPE_P(hashmap, T_DATA) && RTYPEDDATA_P(hashmap) &&
-             RTYPEDDATA_TYPE(hashmap) == &Map_type) {
-    Map* self = ruby_to_Map(_self);
-    Map* other = ruby_to_Map(hashmap);
-    upb_Arena* arena = Arena_get(self->arena);
-    upb_Message* self_msg = Map_GetMutable(_self);
-    size_t iter = kUpb_Map_Begin;
-
-    Arena_fuse(other->arena, arena);
-
-    if (self->key_type != other->key_type ||
-        self->value_type_info.type != other->value_type_info.type ||
-        self->value_type_class != other->value_type_class) {
-      rb_raise(rb_eArgError, "Attempt to merge Map with mismatching types");
-    }
-
-    while (upb_MapIterator_Next(other->map, &iter)) {
-      upb_MessageValue key = upb_MapIterator_Key(other->map, iter);
-      upb_MessageValue val = upb_MapIterator_Value(other->map, iter);
-      upb_Map_Set(self_msg, key, val, arena);
-    }
-  } else {
-    rb_raise(rb_eArgError, "Unknown type merging into Map");
-  }
-  return _self;
-}
-
-/*
- * call-seq:
- *     Map.new(key_type, value_type, value_typeclass = nil, init_hashmap = {})
- *     => new map
- *
- * Allocates a new Map container. This constructor may be called with 2, 3, or 4
- * arguments. The first two arguments are always present and are symbols (taking
- * on the same values as field-type symbols in message descriptors) that
- * indicate the type of the map key and value fields.
- *
- * The supported key types are: :int32, :int64, :uint32, :uint64, :bool,
- * :string, :bytes.
- *
- * The supported value types are: :int32, :int64, :uint32, :uint64, :bool,
- * :string, :bytes, :enum, :message.
- *
- * The third argument, value_typeclass, must be present if value_type is :enum
- * or :message. As in RepeatedField#new, this argument must be a message class
- * (for :message) or enum module (for :enum).
- *
- * The last argument, if present, provides initial content for map. Note that
- * this may be an ordinary Ruby hashmap or another Map instance with identical
- * key and value types. Also note that this argument may be present whether or
- * not value_typeclass is present (and it is unambiguously separate from
- * value_typeclass because value_typeclass's presence is strictly determined by
- * value_type). The contents of this initial hashmap or Map instance are
- * shallow-copied into the new Map: the original map is unmodified, but
- * references to underlying objects will be shared if the value type is a
- * message type.
- */
-static VALUE Map_init(int argc, VALUE* argv, VALUE _self) {
-  Map* self = ruby_to_Map(_self);
-  VALUE init_arg;
-
-  // We take either two args (:key_type, :value_type), three args (:key_type,
-  // :value_type, "ValueMessageType"), or four args (the above plus an initial
-  // hashmap).
-  if (argc < 2 || argc > 4) {
-    rb_raise(rb_eArgError, "Map constructor expects 2, 3 or 4 arguments.");
-  }
-
-  self->key_type = ruby_to_fieldtype(argv[0]);
-  self->value_type_info =
-      TypeInfo_FromClass(argc, argv, 1, &self->value_type_class, &init_arg);
-  self->arena = Arena_new();
-
-  // Check that the key type is an allowed type.
-  switch (self->key_type) {
-    case kUpb_CType_Int32:
-    case kUpb_CType_Int64:
-    case kUpb_CType_UInt32:
-    case kUpb_CType_UInt64:
-    case kUpb_CType_Bool:
-    case kUpb_CType_String:
-    case kUpb_CType_Bytes:
-      // These are OK.
-      break;
-    default:
-      rb_raise(rb_eArgError, "Invalid key type for map.");
-  }
-
-  self->map = upb_Map_New(Arena_get(self->arena), self->key_type,
-                          self->value_type_info.type);
-  ObjectCache_Add(self->map, _self);
-
-  if (init_arg != Qnil) {
-    Map_merge_into_self(_self, init_arg);
-  }
-
-  return Qnil;
-}
-
-/*
- * call-seq:
- *     Map.each(&block)
- *
- * Invokes &block on each |key, value| pair in the map, in unspecified order.
- * Note that Map also includes Enumerable; map thus acts like a normal Ruby
- * sequence.
- */
-static VALUE Map_each(VALUE _self) {
-  Map* self = ruby_to_Map(_self);
-  size_t iter = kUpb_Map_Begin;
-
-  while (upb_MapIterator_Next(self->map, &iter)) {
-    upb_MessageValue key = upb_MapIterator_Key(self->map, iter);
-    upb_MessageValue val = upb_MapIterator_Value(self->map, iter);
-    VALUE key_val = Convert_UpbToRuby(key, Map_keyinfo(self), self->arena);
-    VALUE val_val = Convert_UpbToRuby(val, self->value_type_info, self->arena);
-    rb_yield_values(2, key_val, val_val);
-  }
-
-  return Qnil;
-}
-
-/*
- * call-seq:
- *     Map.keys => [list_of_keys]
- *
- * Returns the list of keys contained in the map, in unspecified order.
- */
-static VALUE Map_keys(VALUE _self) {
-  Map* self = ruby_to_Map(_self);
-  size_t iter = kUpb_Map_Begin;
-  VALUE ret = rb_ary_new();
-
-  while (upb_MapIterator_Next(self->map, &iter)) {
-    upb_MessageValue key = upb_MapIterator_Key(self->map, iter);
-    VALUE key_val = Convert_UpbToRuby(key, Map_keyinfo(self), self->arena);
-    rb_ary_push(ret, key_val);
-  }
-
-  return ret;
-}
-
-/*
- * call-seq:
- *     Map.values => [list_of_values]
- *
- * Returns the list of values contained in the map, in unspecified order.
- */
-static VALUE Map_values(VALUE _self) {
-  Map* self = ruby_to_Map(_self);
-  size_t iter = kUpb_Map_Begin;
-  VALUE ret = rb_ary_new();
-
-  while (upb_MapIterator_Next(self->map, &iter)) {
-    upb_MessageValue val = upb_MapIterator_Value(self->map, iter);
-    VALUE val_val = Convert_UpbToRuby(val, self->value_type_info, self->arena);
-    rb_ary_push(ret, val_val);
-  }
-
-  return ret;
-}
-
-/*
- * call-seq:
- *     Map.[](key) => value
- *
- * Accesses the element at the given key. Throws an exception if the key type is
- * incorrect. Returns nil when the key is not present in the map.
- */
-static VALUE Map_index(VALUE _self, VALUE key) {
-  Map* self = ruby_to_Map(_self);
-  upb_MessageValue key_upb =
-      Convert_RubyToUpb(key, "", Map_keyinfo(self), NULL);
-  upb_MessageValue val;
-
-  if (upb_Map_Get(self->map, key_upb, &val)) {
-    return Convert_UpbToRuby(val, self->value_type_info, self->arena);
-  } else {
-    return Qnil;
-  }
-}
-
-/*
- * call-seq:
- *     Map.[]=(key, value) => value
- *
- * Inserts or overwrites the value at the given key with the given new value.
- * Throws an exception if the key type is incorrect. Returns the new value that
- * was just inserted.
- */
-static VALUE Map_index_set(VALUE _self, VALUE key, VALUE val) {
-  Map* self = ruby_to_Map(_self);
-  upb_Arena* arena = Arena_get(self->arena);
-  upb_MessageValue key_upb =
-      Convert_RubyToUpb(key, "", Map_keyinfo(self), NULL);
-  upb_MessageValue val_upb =
-      Convert_RubyToUpb(val, "", self->value_type_info, arena);
-
-  upb_Map_Set(Map_GetMutable(_self), key_upb, val_upb, arena);
-
-  return val;
-}
-
-/*
- * call-seq:
- *     Map.has_key?(key) => bool
- *
- * Returns true if the given key is present in the map. Throws an exception if
- * the key has the wrong type.
- */
-static VALUE Map_has_key(VALUE _self, VALUE key) {
-  Map* self = ruby_to_Map(_self);
-  upb_MessageValue key_upb =
-      Convert_RubyToUpb(key, "", Map_keyinfo(self), NULL);
-
-  if (upb_Map_Get(self->map, key_upb, NULL)) {
-    return Qtrue;
-  } else {
-    return Qfalse;
-  }
-}
-
-/*
- * call-seq:
- *     Map.delete(key) => old_value
- *
- * Deletes the value at the given key, if any, returning either the old value or
- * nil if none was present. Throws an exception if the key is of the wrong type.
- */
-static VALUE Map_delete(VALUE _self, VALUE key) {
-  Map* self = ruby_to_Map(_self);
-  upb_MessageValue key_upb =
-      Convert_RubyToUpb(key, "", Map_keyinfo(self), NULL);
-  upb_MessageValue val_upb;
-  VALUE ret;
-
-  rb_check_frozen(_self);
-
-  // TODO(haberman): make upb_Map_Delete() also capable of returning the deleted
-  // value.
-  if (upb_Map_Get(self->map, key_upb, &val_upb)) {
-    ret = Convert_UpbToRuby(val_upb, self->value_type_info, self->arena);
-  } else {
-    ret = Qnil;
-  }
-
-  upb_Map_Delete(Map_GetMutable(_self), key_upb);
-
-  return ret;
-}
-
-/*
- * call-seq:
- *     Map.clear
- *
- * Removes all entries from the map.
- */
-static VALUE Map_clear(VALUE _self) {
-  upb_Map_Clear(Map_GetMutable(_self));
-  return Qnil;
-}
-
-/*
- * call-seq:
- *     Map.length
- *
- * Returns the number of entries (key-value pairs) in the map.
- */
-static VALUE Map_length(VALUE _self) {
-  Map* self = ruby_to_Map(_self);
-  return ULL2NUM(upb_Map_Size(self->map));
-}
-
-/*
- * call-seq:
- *     Map.dup => new_map
- *
- * Duplicates this map with a shallow copy. References to all non-primitive
- * element objects (e.g., submessages) are shared.
- */
-static VALUE Map_dup(VALUE _self) {
-  Map* self = ruby_to_Map(_self);
-  VALUE new_map_rb = Map_new_this_type(self);
-  Map* new_self = ruby_to_Map(new_map_rb);
-  size_t iter = kUpb_Map_Begin;
-  upb_Arena* arena = Arena_get(new_self->arena);
-  upb_Map* new_map = Map_GetMutable(new_map_rb);
-
-  Arena_fuse(self->arena, arena);
-
-  while (upb_MapIterator_Next(self->map, &iter)) {
-    upb_MessageValue key = upb_MapIterator_Key(self->map, iter);
-    upb_MessageValue val = upb_MapIterator_Value(self->map, iter);
-    upb_Map_Set(new_map, key, val, arena);
-  }
-
-  return new_map_rb;
-}
-
-/*
- * call-seq:
- *     Map.==(other) => boolean
- *
- * Compares this map to another. Maps are equal if they have identical key sets,
- * and for each key, the values in both maps compare equal. Elements are
- * compared as per normal Ruby semantics, by calling their :== methods (or
- * performing a more efficient comparison for primitive types).
- *
- * Maps with dissimilar key types or value types/typeclasses are never equal,
- * even if value comparison (for example, between integers and floats) would
- * have otherwise indicated that every element has equal value.
- */
-VALUE Map_eq(VALUE _self, VALUE _other) {
-  Map* self = ruby_to_Map(_self);
-  Map* other;
-
-  // Allow comparisons to Ruby hashmaps by converting to a temporary Map
-  // instance. Slow, but workable.
-  if (TYPE(_other) == T_HASH) {
-    VALUE other_map = Map_new_this_type(self);
-    Map_merge_into_self(other_map, _other);
-    _other = other_map;
-  }
-
-  other = ruby_to_Map(_other);
-
-  if (self == other) {
-    return Qtrue;
-  }
-  if (self->key_type != other->key_type ||
-      self->value_type_info.type != other->value_type_info.type ||
-      self->value_type_class != other->value_type_class) {
-    return Qfalse;
-  }
-  if (upb_Map_Size(self->map) != upb_Map_Size(other->map)) {
-    return Qfalse;
-  }
-
-  // For each member of self, check that an equal member exists at the same key
-  // in other.
-  size_t iter = kUpb_Map_Begin;
-  while (upb_MapIterator_Next(self->map, &iter)) {
-    upb_MessageValue key = upb_MapIterator_Key(self->map, iter);
-    upb_MessageValue val = upb_MapIterator_Value(self->map, iter);
-    upb_MessageValue other_val;
-    if (!upb_Map_Get(other->map, key, &other_val)) {
-      // Not present in other map.
-      return Qfalse;
-    }
-    if (!Msgval_IsEqual(val, other_val, self->value_type_info)) {
-      // Present but different value.
-      return Qfalse;
-    }
-  }
-
-  return Qtrue;
-}
-
-/*
- * call-seq:
- *     Message.freeze => self
- *
- * Freezes the message object. We have to intercept this so we can pin the
- * Ruby object into memory so we don't forget it's frozen.
- */
-static VALUE Map_freeze(VALUE _self) {
-  Map* self = ruby_to_Map(_self);
-  if (!RB_OBJ_FROZEN(_self)) {
-    Arena_Pin(self->arena, _self);
-    RB_OBJ_FREEZE(_self);
-  }
-  return _self;
-}
-
-/*
- * call-seq:
- *     Map.hash => hash_value
- *
- * Returns a hash value based on this map's contents.
- */
-VALUE Map_hash(VALUE _self) {
-  Map* self = ruby_to_Map(_self);
-  uint64_t hash = 0;
-
-  size_t iter = kUpb_Map_Begin;
-  TypeInfo key_info = {self->key_type};
-  while (upb_MapIterator_Next(self->map, &iter)) {
-    upb_MessageValue key = upb_MapIterator_Key(self->map, iter);
-    upb_MessageValue val = upb_MapIterator_Value(self->map, iter);
-    hash = Msgval_GetHash(key, key_info, hash);
-    hash = Msgval_GetHash(val, self->value_type_info, hash);
-  }
-
-  return LL2NUM(hash);
-}
-
-/*
- * call-seq:
- *     Map.to_h => {}
- *
- * Returns a Ruby Hash object containing all the values within the map
- */
-VALUE Map_to_h(VALUE _self) {
-  Map* self = ruby_to_Map(_self);
-  return Map_CreateHash(self->map, self->key_type, self->value_type_info);
-}
-
-/*
- * call-seq:
- *     Map.inspect => string
- *
- * Returns a string representing this map's elements. It will be formatted as
- * "{key => value, key => value, ...}", with each key and value string
- * representation computed by its own #inspect method.
- */
-VALUE Map_inspect(VALUE _self) {
-  Map* self = ruby_to_Map(_self);
-
-  StringBuilder* builder = StringBuilder_New();
-  Map_Inspect(builder, self->map, self->key_type, self->value_type_info);
-  VALUE ret = StringBuilder_ToRubyString(builder);
-  StringBuilder_Free(builder);
-  return ret;
-}
-
-/*
- * call-seq:
- *     Map.merge(other_map) => map
- *
- * Copies key/value pairs from other_map into a copy of this map. If a key is
- * set in other_map and this map, the value from other_map overwrites the value
- * in the new copy of this map. Returns the new copy of this map with merged
- * contents.
- */
-static VALUE Map_merge(VALUE _self, VALUE hashmap) {
-  VALUE dupped = Map_dup(_self);
-  return Map_merge_into_self(dupped, hashmap);
-}
-
-void Map_register(VALUE module) {
-  VALUE klass = rb_define_class_under(module, "Map", rb_cObject);
-  rb_define_alloc_func(klass, Map_alloc);
-  rb_gc_register_address(&cMap);
-  cMap = klass;
-
-  rb_define_method(klass, "initialize", Map_init, -1);
-  rb_define_method(klass, "each", Map_each, 0);
-  rb_define_method(klass, "keys", Map_keys, 0);
-  rb_define_method(klass, "values", Map_values, 0);
-  rb_define_method(klass, "[]", Map_index, 1);
-  rb_define_method(klass, "[]=", Map_index_set, 2);
-  rb_define_method(klass, "has_key?", Map_has_key, 1);
-  rb_define_method(klass, "delete", Map_delete, 1);
-  rb_define_method(klass, "clear", Map_clear, 0);
-  rb_define_method(klass, "length", Map_length, 0);
-  rb_define_method(klass, "size", Map_length, 0);
-  rb_define_method(klass, "dup", Map_dup, 0);
-  // Also define #clone so that we don't inherit Object#clone.
-  rb_define_method(klass, "clone", Map_dup, 0);
-  rb_define_method(klass, "==", Map_eq, 1);
-  rb_define_method(klass, "freeze", Map_freeze, 0);
-  rb_define_method(klass, "hash", Map_hash, 0);
-  rb_define_method(klass, "to_h", Map_to_h, 0);
-  rb_define_method(klass, "inspect", Map_inspect, 0);
-  rb_define_method(klass, "merge", Map_merge, 1);
-  rb_include_module(klass, rb_mEnumerable);
-}
diff --git a/libs/protobuf/ruby/ext/google/protobuf_c/map.h b/libs/protobuf/ruby/ext/google/protobuf_c/map.h
deleted file mode 100644
index 7b4a151..0000000
--- a/libs/protobuf/ruby/ext/google/protobuf_c/map.h
+++ /dev/null
@@ -1,66 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef RUBY_PROTOBUF_MAP_H_
-#define RUBY_PROTOBUF_MAP_H_
-
-#include <ruby/ruby.h>
-
-#include "protobuf.h"
-#include "ruby-upb.h"
-
-// Returns a Ruby wrapper object for the given map, which will be created if
-// one does not exist already.
-VALUE Map_GetRubyWrapper(upb_Map *map, upb_CType key_type, TypeInfo value_type,
-                         VALUE arena);
-
-// Gets the underlying upb_Map for this Ruby map object, which must have
-// key/value type that match |field|. If this is not a map or the type doesn't
-// match, raises an exception.
-const upb_Map *Map_GetUpbMap(VALUE val, const upb_FieldDef *field,
-                             upb_Arena *arena);
-
-// Implements #inspect for this map by appending its contents to |b|.
-void Map_Inspect(StringBuilder *b, const upb_Map *map, upb_CType key_type,
-                 TypeInfo val_type);
-
-// Returns a new Hash object containing the contents of this Map.
-VALUE Map_CreateHash(const upb_Map *map, upb_CType key_type, TypeInfo val_info);
-
-// Returns a deep copy of this Map object.
-VALUE Map_deep_copy(VALUE obj);
-
-// Ruby class of Google::Protobuf::Map.
-extern VALUE cMap;
-
-// Call at startup to register all types in this module.
-void Map_register(VALUE module);
-
-#endif  // RUBY_PROTOBUF_MAP_H_
diff --git a/libs/protobuf/ruby/ext/google/protobuf_c/message.c b/libs/protobuf/ruby/ext/google/protobuf_c/message.c
deleted file mode 100644
index fd83dc1..0000000
--- a/libs/protobuf/ruby/ext/google/protobuf_c/message.c
+++ /dev/null
@@ -1,1409 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2014 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include "message.h"
-
-#include "convert.h"
-#include "defs.h"
-#include "map.h"
-#include "protobuf.h"
-#include "repeated_field.h"
-
-static VALUE cParseError = Qnil;
-static ID descriptor_instancevar_interned;
-
-static VALUE initialize_rb_class_with_no_args(VALUE klass) {
-  return rb_funcall(klass, rb_intern("new"), 0);
-}
-
-VALUE MessageOrEnum_GetDescriptor(VALUE klass) {
-  return rb_ivar_get(klass, descriptor_instancevar_interned);
-}
-
-// -----------------------------------------------------------------------------
-// Class/module creation from msgdefs and enumdefs, respectively.
-// -----------------------------------------------------------------------------
-
-typedef struct {
-  VALUE arena;
-  const upb_Message* msg;  // Can get as mutable when non-frozen.
-  const upb_MessageDef*
-      msgdef;  // kept alive by self.class.descriptor reference.
-} Message;
-
-static void Message_mark(void* _self) {
-  Message* self = (Message*)_self;
-  rb_gc_mark(self->arena);
-}
-
-static rb_data_type_t Message_type = {
-    "Message",
-    {Message_mark, RUBY_DEFAULT_FREE, NULL},
-    .flags = RUBY_TYPED_FREE_IMMEDIATELY,
-};
-
-static Message* ruby_to_Message(VALUE msg_rb) {
-  Message* msg;
-  TypedData_Get_Struct(msg_rb, Message, &Message_type, msg);
-  return msg;
-}
-
-static VALUE Message_alloc(VALUE klass) {
-  VALUE descriptor = rb_ivar_get(klass, descriptor_instancevar_interned);
-  Message* msg = ALLOC(Message);
-  VALUE ret;
-
-  msg->msgdef = Descriptor_GetMsgDef(descriptor);
-  msg->arena = Qnil;
-  msg->msg = NULL;
-
-  ret = TypedData_Wrap_Struct(klass, &Message_type, msg);
-  rb_ivar_set(ret, descriptor_instancevar_interned, descriptor);
-
-  return ret;
-}
-
-const upb_Message* Message_Get(VALUE msg_rb, const upb_MessageDef** m) {
-  Message* msg = ruby_to_Message(msg_rb);
-  if (m) *m = msg->msgdef;
-  return msg->msg;
-}
-
-upb_Message* Message_GetMutable(VALUE msg_rb, const upb_MessageDef** m) {
-  rb_check_frozen(msg_rb);
-  return (upb_Message*)Message_Get(msg_rb, m);
-}
-
-void Message_InitPtr(VALUE self_, upb_Message* msg, VALUE arena) {
-  Message* self = ruby_to_Message(self_);
-  self->msg = msg;
-  self->arena = arena;
-  ObjectCache_Add(msg, self_);
-}
-
-VALUE Message_GetArena(VALUE msg_rb) {
-  Message* msg = ruby_to_Message(msg_rb);
-  return msg->arena;
-}
-
-void Message_CheckClass(VALUE klass) {
-  if (rb_get_alloc_func(klass) != &Message_alloc) {
-    rb_raise(rb_eArgError,
-             "Message class was not returned by the DescriptorPool.");
-  }
-}
-
-VALUE Message_GetRubyWrapper(upb_Message* msg, const upb_MessageDef* m,
-                             VALUE arena) {
-  if (msg == NULL) return Qnil;
-
-  VALUE val = ObjectCache_Get(msg);
-
-  if (val == Qnil) {
-    VALUE klass = Descriptor_DefToClass(m);
-    val = Message_alloc(klass);
-    Message_InitPtr(val, msg, arena);
-  }
-
-  return val;
-}
-
-void Message_PrintMessage(StringBuilder* b, const upb_Message* msg,
-                          const upb_MessageDef* m) {
-  bool first = true;
-  int n = upb_MessageDef_FieldCount(m);
-  VALUE klass = Descriptor_DefToClass(m);
-  StringBuilder_Printf(b, "<%s: ", rb_class2name(klass));
-
-  for (int i = 0; i < n; i++) {
-    const upb_FieldDef* field = upb_MessageDef_Field(m, i);
-
-    if (upb_FieldDef_HasPresence(field) && !upb_Message_Has(msg, field)) {
-      continue;
-    }
-
-    if (!first) {
-      StringBuilder_Printf(b, ", ");
-    } else {
-      first = false;
-    }
-
-    upb_MessageValue msgval = upb_Message_Get(msg, field);
-
-    StringBuilder_Printf(b, "%s: ", upb_FieldDef_Name(field));
-
-    if (upb_FieldDef_IsMap(field)) {
-      const upb_MessageDef* entry_m = upb_FieldDef_MessageSubDef(field);
-      const upb_FieldDef* key_f = upb_MessageDef_FindFieldByNumber(entry_m, 1);
-      const upb_FieldDef* val_f = upb_MessageDef_FindFieldByNumber(entry_m, 2);
-      TypeInfo val_info = TypeInfo_get(val_f);
-      Map_Inspect(b, msgval.map_val, upb_FieldDef_CType(key_f), val_info);
-    } else if (upb_FieldDef_IsRepeated(field)) {
-      RepeatedField_Inspect(b, msgval.array_val, TypeInfo_get(field));
-    } else {
-      StringBuilder_PrintMsgval(b, msgval, TypeInfo_get(field));
-    }
-  }
-
-  StringBuilder_Printf(b, ">");
-}
-
-// Helper functions for #method_missing ////////////////////////////////////////
-
-enum {
-  METHOD_UNKNOWN = 0,
-  METHOD_GETTER = 1,
-  METHOD_SETTER = 2,
-  METHOD_CLEAR = 3,
-  METHOD_PRESENCE = 4,
-  METHOD_ENUM_GETTER = 5,
-  METHOD_WRAPPER_GETTER = 6,
-  METHOD_WRAPPER_SETTER = 7
-};
-
-// Check if the field is a well known wrapper type
-static bool IsWrapper(const upb_MessageDef* m) {
-  if (!m) return false;
-  switch (upb_MessageDef_WellKnownType(m)) {
-    case kUpb_WellKnown_DoubleValue:
-    case kUpb_WellKnown_FloatValue:
-    case kUpb_WellKnown_Int64Value:
-    case kUpb_WellKnown_UInt64Value:
-    case kUpb_WellKnown_Int32Value:
-    case kUpb_WellKnown_UInt32Value:
-    case kUpb_WellKnown_StringValue:
-    case kUpb_WellKnown_BytesValue:
-    case kUpb_WellKnown_BoolValue:
-      return true;
-    default:
-      return false;
-  }
-}
-
-static bool IsFieldWrapper(const upb_FieldDef* f) {
-  return IsWrapper(upb_FieldDef_MessageSubDef(f));
-}
-
-static bool Match(const upb_MessageDef* m, const char* name,
-                  const upb_FieldDef** f, const upb_OneofDef** o,
-                  const char* prefix, const char* suffix) {
-  size_t sp = strlen(prefix);
-  size_t ss = strlen(suffix);
-  size_t sn = strlen(name);
-
-  if (sn <= sp + ss) return false;
-
-  if (memcmp(name, prefix, sp) != 0 ||
-      memcmp(name + sn - ss, suffix, ss) != 0) {
-    return false;
-  }
-
-  return upb_MessageDef_FindByNameWithSize(m, name + sp, sn - sp - ss, f, o);
-}
-
-static int extract_method_call(VALUE method_name, Message* self,
-                               const upb_FieldDef** f, const upb_OneofDef** o) {
-  const upb_MessageDef* m = self->msgdef;
-  const char* name;
-
-  Check_Type(method_name, T_SYMBOL);
-  name = rb_id2name(SYM2ID(method_name));
-
-  if (Match(m, name, f, o, "", "")) return METHOD_GETTER;
-  if (Match(m, name, f, o, "", "=")) return METHOD_SETTER;
-  if (Match(m, name, f, o, "clear_", "")) return METHOD_CLEAR;
-  if (Match(m, name, f, o, "has_", "?") &&
-      (*o || (*f && upb_FieldDef_HasPresence(*f)))) {
-    // Disallow oneof hazzers for proto3.
-    // TODO(haberman): remove this test when we are enabling oneof hazzers for
-    // proto3.
-    if (*f && !upb_FieldDef_IsSubMessage(*f) &&
-        upb_FieldDef_RealContainingOneof(*f) &&
-        upb_MessageDef_Syntax(upb_FieldDef_ContainingType(*f)) !=
-            kUpb_Syntax_Proto2) {
-      return METHOD_UNKNOWN;
-    }
-    return METHOD_PRESENCE;
-  }
-  if (Match(m, name, f, o, "", "_as_value") && *f &&
-      !upb_FieldDef_IsRepeated(*f) && IsFieldWrapper(*f)) {
-    return METHOD_WRAPPER_GETTER;
-  }
-  if (Match(m, name, f, o, "", "_as_value=") && *f &&
-      !upb_FieldDef_IsRepeated(*f) && IsFieldWrapper(*f)) {
-    return METHOD_WRAPPER_SETTER;
-  }
-  if (Match(m, name, f, o, "", "_const") && *f &&
-      upb_FieldDef_CType(*f) == kUpb_CType_Enum) {
-    return METHOD_ENUM_GETTER;
-  }
-
-  return METHOD_UNKNOWN;
-}
-
-static VALUE Message_oneof_accessor(VALUE _self, const upb_OneofDef* o,
-                                    int accessor_type) {
-  Message* self = ruby_to_Message(_self);
-  const upb_FieldDef* oneof_field = upb_Message_WhichOneof(self->msg, o);
-
-  switch (accessor_type) {
-    case METHOD_PRESENCE:
-      return oneof_field == NULL ? Qfalse : Qtrue;
-    case METHOD_CLEAR:
-      if (oneof_field != NULL) {
-        upb_Message_ClearField(Message_GetMutable(_self, NULL), oneof_field);
-      }
-      return Qnil;
-    case METHOD_GETTER:
-      return oneof_field == NULL
-                 ? Qnil
-                 : ID2SYM(rb_intern(upb_FieldDef_Name(oneof_field)));
-    case METHOD_SETTER:
-      rb_raise(rb_eRuntimeError, "Oneof accessors are read-only.");
-  }
-  rb_raise(rb_eRuntimeError, "Invalid access of oneof field.");
-}
-
-static void Message_setfield(upb_Message* msg, const upb_FieldDef* f, VALUE val,
-                             upb_Arena* arena) {
-  upb_MessageValue msgval;
-  if (upb_FieldDef_IsMap(f)) {
-    msgval.map_val = Map_GetUpbMap(val, f, arena);
-  } else if (upb_FieldDef_IsRepeated(f)) {
-    msgval.array_val = RepeatedField_GetUpbArray(val, f, arena);
-  } else {
-    if (val == Qnil &&
-        (upb_FieldDef_IsSubMessage(f) || upb_FieldDef_RealContainingOneof(f))) {
-      upb_Message_ClearField(msg, f);
-      return;
-    }
-    msgval =
-        Convert_RubyToUpb(val, upb_FieldDef_Name(f), TypeInfo_get(f), arena);
-  }
-  upb_Message_Set(msg, f, msgval, arena);
-}
-
-VALUE Message_getfield(VALUE _self, const upb_FieldDef* f) {
-  Message* self = ruby_to_Message(_self);
-  // This is a special-case: upb_Message_Mutable() for map & array are logically
-  // const (they will not change what is serialized) but physically
-  // non-const, as they do allocate a repeated field or map. The logical
-  // constness means it's ok to do even if the message is frozen.
-  upb_Message* msg = (upb_Message*)self->msg;
-  upb_Arena* arena = Arena_get(self->arena);
-  if (upb_FieldDef_IsMap(f)) {
-    upb_Map* map = upb_Message_Mutable(msg, f, arena).map;
-    const upb_FieldDef* key_f = map_field_key(f);
-    const upb_FieldDef* val_f = map_field_value(f);
-    upb_CType key_type = upb_FieldDef_CType(key_f);
-    TypeInfo value_type_info = TypeInfo_get(val_f);
-    return Map_GetRubyWrapper(map, key_type, value_type_info, self->arena);
-  } else if (upb_FieldDef_IsRepeated(f)) {
-    upb_Array* arr = upb_Message_Mutable(msg, f, arena).array;
-    return RepeatedField_GetRubyWrapper(arr, TypeInfo_get(f), self->arena);
-  } else if (upb_FieldDef_IsSubMessage(f)) {
-    if (!upb_Message_Has(self->msg, f)) return Qnil;
-    upb_Message* submsg = upb_Message_Mutable(msg, f, arena).msg;
-    const upb_MessageDef* m = upb_FieldDef_MessageSubDef(f);
-    return Message_GetRubyWrapper(submsg, m, self->arena);
-  } else {
-    upb_MessageValue msgval = upb_Message_Get(self->msg, f);
-    return Convert_UpbToRuby(msgval, TypeInfo_get(f), self->arena);
-  }
-}
-
-static VALUE Message_field_accessor(VALUE _self, const upb_FieldDef* f,
-                                    int accessor_type, int argc, VALUE* argv) {
-  upb_Arena* arena = Arena_get(Message_GetArena(_self));
-
-  switch (accessor_type) {
-    case METHOD_SETTER:
-      Message_setfield(Message_GetMutable(_self, NULL), f, argv[1], arena);
-      return Qnil;
-    case METHOD_CLEAR:
-      upb_Message_ClearField(Message_GetMutable(_self, NULL), f);
-      return Qnil;
-    case METHOD_PRESENCE:
-      if (!upb_FieldDef_HasPresence(f)) {
-        rb_raise(rb_eRuntimeError, "Field does not have presence.");
-      }
-      return upb_Message_Has(Message_Get(_self, NULL), f);
-    case METHOD_WRAPPER_GETTER: {
-      Message* self = ruby_to_Message(_self);
-      if (upb_Message_Has(self->msg, f)) {
-        PBRUBY_ASSERT(upb_FieldDef_IsSubMessage(f) &&
-                      !upb_FieldDef_IsRepeated(f));
-        upb_MessageValue wrapper = upb_Message_Get(self->msg, f);
-        const upb_MessageDef* wrapper_m = upb_FieldDef_MessageSubDef(f);
-        const upb_FieldDef* value_f =
-            upb_MessageDef_FindFieldByNumber(wrapper_m, 1);
-        upb_MessageValue value = upb_Message_Get(wrapper.msg_val, value_f);
-        return Convert_UpbToRuby(value, TypeInfo_get(value_f), self->arena);
-      } else {
-        return Qnil;
-      }
-    }
-    case METHOD_WRAPPER_SETTER: {
-      upb_Message* msg = Message_GetMutable(_self, NULL);
-      if (argv[1] == Qnil) {
-        upb_Message_ClearField(msg, f);
-      } else {
-        const upb_FieldDef* val_f =
-            upb_MessageDef_FindFieldByNumber(upb_FieldDef_MessageSubDef(f), 1);
-        upb_MessageValue msgval = Convert_RubyToUpb(
-            argv[1], upb_FieldDef_Name(f), TypeInfo_get(val_f), arena);
-        upb_Message* wrapper = upb_Message_Mutable(msg, f, arena).msg;
-        upb_Message_Set(wrapper, val_f, msgval, arena);
-      }
-      return Qnil;
-    }
-    case METHOD_ENUM_GETTER: {
-      upb_MessageValue msgval = upb_Message_Get(Message_Get(_self, NULL), f);
-
-      if (upb_FieldDef_Label(f) == kUpb_Label_Repeated) {
-        // Map repeated fields to a new type with ints
-        VALUE arr = rb_ary_new();
-        size_t i, n = upb_Array_Size(msgval.array_val);
-        for (i = 0; i < n; i++) {
-          upb_MessageValue elem = upb_Array_Get(msgval.array_val, i);
-          rb_ary_push(arr, INT2NUM(elem.int32_val));
-        }
-        return arr;
-      } else {
-        return INT2NUM(msgval.int32_val);
-      }
-    }
-    case METHOD_GETTER:
-      return Message_getfield(_self, f);
-    default:
-      rb_raise(rb_eRuntimeError, "Internal error, no such accessor: %d",
-               accessor_type);
-  }
-}
-
-/*
- * call-seq:
- *     Message.method_missing(*args)
- *
- * Provides accessors and setters and methods to clear and check for presence of
- * message fields according to their field names.
- *
- * For any field whose name does not conflict with a built-in method, an
- * accessor is provided with the same name as the field, and a setter is
- * provided with the name of the field plus the '=' suffix. Thus, given a
- * message instance 'msg' with field 'foo', the following code is valid:
- *
- *     msg.foo = 42
- *     puts msg.foo
- *
- * This method also provides read-only accessors for oneofs. If a oneof exists
- * with name 'my_oneof', then msg.my_oneof will return a Ruby symbol equal to
- * the name of the field in that oneof that is currently set, or nil if none.
- *
- * It also provides methods of the form 'clear_fieldname' to clear the value
- * of the field 'fieldname'. For basic data types, this will set the default
- * value of the field.
- *
- * Additionally, it provides methods of the form 'has_fieldname?', which returns
- * true if the field 'fieldname' is set in the message object, else false. For
- * 'proto3' syntax, calling this for a basic type field will result in an error.
- */
-static VALUE Message_method_missing(int argc, VALUE* argv, VALUE _self) {
-  Message* self = ruby_to_Message(_self);
-  const upb_OneofDef* o;
-  const upb_FieldDef* f;
-  int accessor_type;
-
-  if (argc < 1) {
-    rb_raise(rb_eArgError, "Expected method name as first argument.");
-  }
-
-  accessor_type = extract_method_call(argv[0], self, &f, &o);
-
-  if (accessor_type == METHOD_UNKNOWN) return rb_call_super(argc, argv);
-
-  // Validate argument count.
-  switch (accessor_type) {
-    case METHOD_SETTER:
-    case METHOD_WRAPPER_SETTER:
-      if (argc != 2) {
-        rb_raise(rb_eArgError, "Expected 2 arguments, received %d", argc);
-      }
-      rb_check_frozen(_self);
-      break;
-    default:
-      if (argc != 1) {
-        rb_raise(rb_eArgError, "Expected 1 argument, received %d", argc);
-      }
-      break;
-  }
-
-  // Dispatch accessor.
-  if (o != NULL) {
-    return Message_oneof_accessor(_self, o, accessor_type);
-  } else {
-    return Message_field_accessor(_self, f, accessor_type, argc, argv);
-  }
-}
-
-static VALUE Message_respond_to_missing(int argc, VALUE* argv, VALUE _self) {
-  Message* self = ruby_to_Message(_self);
-  const upb_OneofDef* o;
-  const upb_FieldDef* f;
-  int accessor_type;
-
-  if (argc < 1) {
-    rb_raise(rb_eArgError, "Expected method name as first argument.");
-  }
-
-  accessor_type = extract_method_call(argv[0], self, &f, &o);
-
-  if (accessor_type == METHOD_UNKNOWN) {
-    return rb_call_super(argc, argv);
-  } else if (o != NULL) {
-    return accessor_type == METHOD_SETTER ? Qfalse : Qtrue;
-  } else {
-    return Qtrue;
-  }
-}
-
-void Message_InitFromValue(upb_Message* msg, const upb_MessageDef* m, VALUE val,
-                           upb_Arena* arena);
-
-typedef struct {
-  upb_Map* map;
-  TypeInfo key_type;
-  TypeInfo val_type;
-  upb_Arena* arena;
-} MapInit;
-
-static int Map_initialize_kwarg(VALUE key, VALUE val, VALUE _self) {
-  MapInit* map_init = (MapInit*)_self;
-  upb_MessageValue k, v;
-  k = Convert_RubyToUpb(key, "", map_init->key_type, NULL);
-
-  if (map_init->val_type.type == kUpb_CType_Message && TYPE(val) == T_HASH) {
-    upb_Message* msg =
-        upb_Message_New(map_init->val_type.def.msgdef, map_init->arena);
-    Message_InitFromValue(msg, map_init->val_type.def.msgdef, val,
-                          map_init->arena);
-    v.msg_val = msg;
-  } else {
-    v = Convert_RubyToUpb(val, "", map_init->val_type, map_init->arena);
-  }
-  upb_Map_Set(map_init->map, k, v, map_init->arena);
-  return ST_CONTINUE;
-}
-
-static void Map_InitFromValue(upb_Map* map, const upb_FieldDef* f, VALUE val,
-                              upb_Arena* arena) {
-  const upb_MessageDef* entry_m = upb_FieldDef_MessageSubDef(f);
-  const upb_FieldDef* key_f = upb_MessageDef_FindFieldByNumber(entry_m, 1);
-  const upb_FieldDef* val_f = upb_MessageDef_FindFieldByNumber(entry_m, 2);
-  if (TYPE(val) != T_HASH) {
-    rb_raise(rb_eArgError,
-             "Expected Hash object as initializer value for map field '%s' "
-             "(given %s).",
-             upb_FieldDef_Name(f), rb_class2name(CLASS_OF(val)));
-  }
-  MapInit map_init = {map, TypeInfo_get(key_f), TypeInfo_get(val_f), arena};
-  rb_hash_foreach(val, Map_initialize_kwarg, (VALUE)&map_init);
-}
-
-static upb_MessageValue MessageValue_FromValue(VALUE val, TypeInfo info,
-                                               upb_Arena* arena) {
-  if (info.type == kUpb_CType_Message) {
-    upb_MessageValue msgval;
-    upb_Message* msg = upb_Message_New(info.def.msgdef, arena);
-    Message_InitFromValue(msg, info.def.msgdef, val, arena);
-    msgval.msg_val = msg;
-    return msgval;
-  } else {
-    return Convert_RubyToUpb(val, "", info, arena);
-  }
-}
-
-static void RepeatedField_InitFromValue(upb_Array* arr, const upb_FieldDef* f,
-                                        VALUE val, upb_Arena* arena) {
-  TypeInfo type_info = TypeInfo_get(f);
-
-  if (TYPE(val) != T_ARRAY) {
-    rb_raise(rb_eArgError,
-             "Expected array as initializer value for repeated field '%s' "
-             "(given %s).",
-             upb_FieldDef_Name(f), rb_class2name(CLASS_OF(val)));
-  }
-
-  for (int i = 0; i < RARRAY_LEN(val); i++) {
-    VALUE entry = rb_ary_entry(val, i);
-    upb_MessageValue msgval;
-    if (upb_FieldDef_IsSubMessage(f) && TYPE(entry) == T_HASH) {
-      msgval = MessageValue_FromValue(entry, type_info, arena);
-    } else {
-      msgval = Convert_RubyToUpb(entry, upb_FieldDef_Name(f), type_info, arena);
-    }
-    upb_Array_Append(arr, msgval, arena);
-  }
-}
-
-static void Message_InitFieldFromValue(upb_Message* msg, const upb_FieldDef* f,
-                                       VALUE val, upb_Arena* arena) {
-  if (TYPE(val) == T_NIL) return;
-
-  if (upb_FieldDef_IsMap(f)) {
-    upb_Map* map = upb_Message_Mutable(msg, f, arena).map;
-    Map_InitFromValue(map, f, val, arena);
-  } else if (upb_FieldDef_Label(f) == kUpb_Label_Repeated) {
-    upb_Array* arr = upb_Message_Mutable(msg, f, arena).array;
-    RepeatedField_InitFromValue(arr, f, val, arena);
-  } else if (upb_FieldDef_IsSubMessage(f)) {
-    if (TYPE(val) == T_HASH) {
-      upb_Message* submsg = upb_Message_Mutable(msg, f, arena).msg;
-      Message_InitFromValue(submsg, upb_FieldDef_MessageSubDef(f), val, arena);
-    } else {
-      Message_setfield(msg, f, val, arena);
-    }
-  } else {
-    upb_MessageValue msgval =
-        Convert_RubyToUpb(val, upb_FieldDef_Name(f), TypeInfo_get(f), arena);
-    upb_Message_Set(msg, f, msgval, arena);
-  }
-}
-
-typedef struct {
-  upb_Message* msg;
-  const upb_MessageDef* msgdef;
-  upb_Arena* arena;
-} MsgInit;
-
-static int Message_initialize_kwarg(VALUE key, VALUE val, VALUE _self) {
-  MsgInit* msg_init = (MsgInit*)_self;
-  const char* name;
-
-  if (TYPE(key) == T_STRING) {
-    name = RSTRING_PTR(key);
-  } else if (TYPE(key) == T_SYMBOL) {
-    name = RSTRING_PTR(rb_id2str(SYM2ID(key)));
-  } else {
-    rb_raise(rb_eArgError,
-             "Expected string or symbols as hash keys when initializing proto "
-             "from hash.");
-  }
-
-  const upb_FieldDef* f =
-      upb_MessageDef_FindFieldByName(msg_init->msgdef, name);
-
-  if (f == NULL) {
-    rb_raise(rb_eArgError,
-             "Unknown field name '%s' in initialization map entry.", name);
-  }
-
-  Message_InitFieldFromValue(msg_init->msg, f, val, msg_init->arena);
-  return ST_CONTINUE;
-}
-
-void Message_InitFromValue(upb_Message* msg, const upb_MessageDef* m, VALUE val,
-                           upb_Arena* arena) {
-  MsgInit msg_init = {msg, m, arena};
-  if (TYPE(val) == T_HASH) {
-    rb_hash_foreach(val, Message_initialize_kwarg, (VALUE)&msg_init);
-  } else {
-    rb_raise(rb_eArgError, "Expected hash arguments or message, not %s",
-             rb_class2name(CLASS_OF(val)));
-  }
-}
-
-/*
- * call-seq:
- *     Message.new(kwargs) => new_message
- *
- * Creates a new instance of the given message class. Keyword arguments may be
- * provided with keywords corresponding to field names.
- *
- * Note that no literal Message class exists. Only concrete classes per message
- * type exist, as provided by the #msgclass method on Descriptors after they
- * have been added to a pool. The method definitions described here on the
- * Message class are provided on each concrete message class.
- */
-static VALUE Message_initialize(int argc, VALUE* argv, VALUE _self) {
-  Message* self = ruby_to_Message(_self);
-  VALUE arena_rb = Arena_new();
-  upb_Arena* arena = Arena_get(arena_rb);
-  upb_Message* msg = upb_Message_New(self->msgdef, arena);
-
-  Message_InitPtr(_self, msg, arena_rb);
-
-  if (argc == 0) {
-    return Qnil;
-  }
-  if (argc != 1) {
-    rb_raise(rb_eArgError, "Expected 0 or 1 arguments.");
-  }
-  Message_InitFromValue((upb_Message*)self->msg, self->msgdef, argv[0], arena);
-  return Qnil;
-}
-
-/*
- * call-seq:
- *     Message.dup => new_message
- *
- * Performs a shallow copy of this message and returns the new copy.
- */
-static VALUE Message_dup(VALUE _self) {
-  Message* self = ruby_to_Message(_self);
-  VALUE new_msg = rb_class_new_instance(0, NULL, CLASS_OF(_self));
-  Message* new_msg_self = ruby_to_Message(new_msg);
-  size_t size = upb_MessageDef_MiniTable(self->msgdef)->size;
-
-  // TODO(copy unknown fields?)
-  // TODO(use official upb msg copy function)
-  memcpy((upb_Message*)new_msg_self->msg, self->msg, size);
-  Arena_fuse(self->arena, Arena_get(new_msg_self->arena));
-  return new_msg;
-}
-
-// Support function for Message_eq, and also used by other #eq functions.
-bool Message_Equal(const upb_Message* m1, const upb_Message* m2,
-                   const upb_MessageDef* m) {
-  if (m1 == m2) return true;
-
-  size_t size1, size2;
-  int encode_opts = kUpb_Encode_SkipUnknown | kUpb_Encode_Deterministic;
-  upb_Arena* arena_tmp = upb_Arena_New();
-  const upb_MiniTable* layout = upb_MessageDef_MiniTable(m);
-
-  // Compare deterministically serialized payloads with no unknown fields.
-  char* data1 = upb_Encode(m1, layout, encode_opts, arena_tmp, &size1);
-  char* data2 = upb_Encode(m2, layout, encode_opts, arena_tmp, &size2);
-
-  if (data1 && data2) {
-    bool ret = (size1 == size2) && (memcmp(data1, data2, size1) == 0);
-    upb_Arena_Free(arena_tmp);
-    return ret;
-  } else {
-    upb_Arena_Free(arena_tmp);
-    rb_raise(cParseError, "Error comparing messages");
-  }
-}
-
-/*
- * call-seq:
- *     Message.==(other) => boolean
- *
- * Performs a deep comparison of this message with another. Messages are equal
- * if they have the same type and if each field is equal according to the :==
- * method's semantics (a more efficient comparison may actually be done if the
- * field is of a primitive type).
- */
-static VALUE Message_eq(VALUE _self, VALUE _other) {
-  if (CLASS_OF(_self) != CLASS_OF(_other)) return Qfalse;
-
-  Message* self = ruby_to_Message(_self);
-  Message* other = ruby_to_Message(_other);
-  assert(self->msgdef == other->msgdef);
-
-  return Message_Equal(self->msg, other->msg, self->msgdef) ? Qtrue : Qfalse;
-}
-
-uint64_t Message_Hash(const upb_Message* msg, const upb_MessageDef* m,
-                      uint64_t seed) {
-  upb_Arena* arena = upb_Arena_New();
-  const char* data;
-  size_t size;
-
-  // Hash a deterministically serialized payloads with no unknown fields.
-  data = upb_Encode(msg, upb_MessageDef_MiniTable(m),
-                    kUpb_Encode_SkipUnknown | kUpb_Encode_Deterministic, arena,
-                    &size);
-
-  if (data) {
-    uint64_t ret = _upb_Hash(data, size, seed);
-    upb_Arena_Free(arena);
-    return ret;
-  } else {
-    upb_Arena_Free(arena);
-    rb_raise(cParseError, "Error calculating hash");
-  }
-}
-
-/*
- * call-seq:
- *     Message.hash => hash_value
- *
- * Returns a hash value that represents this message's field values.
- */
-static VALUE Message_hash(VALUE _self) {
-  Message* self = ruby_to_Message(_self);
-  uint64_t hash_value = Message_Hash(self->msg, self->msgdef, 0);
-  // RUBY_FIXNUM_MAX should be one less than a power of 2.
-  assert((RUBY_FIXNUM_MAX & (RUBY_FIXNUM_MAX + 1)) == 0);
-  return INT2FIX(hash_value & RUBY_FIXNUM_MAX);
-}
-
-/*
- * call-seq:
- *     Message.inspect => string
- *
- * Returns a human-readable string representing this message. It will be
- * formatted as "<MessageType: field1: value1, field2: value2, ...>". Each
- * field's value is represented according to its own #inspect method.
- */
-static VALUE Message_inspect(VALUE _self) {
-  Message* self = ruby_to_Message(_self);
-
-  StringBuilder* builder = StringBuilder_New();
-  Message_PrintMessage(builder, self->msg, self->msgdef);
-  VALUE ret = StringBuilder_ToRubyString(builder);
-  StringBuilder_Free(builder);
-  return ret;
-}
-
-// Support functions for Message_to_h //////////////////////////////////////////
-
-static VALUE RepeatedField_CreateArray(const upb_Array* arr,
-                                       TypeInfo type_info) {
-  int size = arr ? upb_Array_Size(arr) : 0;
-  VALUE ary = rb_ary_new2(size);
-
-  for (int i = 0; i < size; i++) {
-    upb_MessageValue msgval = upb_Array_Get(arr, i);
-    VALUE val = Scalar_CreateHash(msgval, type_info);
-    rb_ary_push(ary, val);
-  }
-
-  return ary;
-}
-
-static VALUE Message_CreateHash(const upb_Message* msg,
-                                const upb_MessageDef* m) {
-  if (!msg) return Qnil;
-
-  VALUE hash = rb_hash_new();
-  int n = upb_MessageDef_FieldCount(m);
-  bool is_proto2;
-
-  // We currently have a few behaviors that are specific to proto2.
-  // This is unfortunate, we should key behaviors off field attributes (like
-  // whether a field has presence), not proto2 vs. proto3. We should see if we
-  // can change this without breaking users.
-  is_proto2 = upb_MessageDef_Syntax(m) == kUpb_Syntax_Proto2;
-
-  for (int i = 0; i < n; i++) {
-    const upb_FieldDef* field = upb_MessageDef_Field(m, i);
-    TypeInfo type_info = TypeInfo_get(field);
-    upb_MessageValue msgval;
-    VALUE msg_value;
-    VALUE msg_key;
-
-    if (!is_proto2 && upb_FieldDef_IsSubMessage(field) &&
-        !upb_FieldDef_IsRepeated(field) && !upb_Message_Has(msg, field)) {
-      // TODO: Legacy behavior, remove when we fix the is_proto2 differences.
-      msg_key = ID2SYM(rb_intern(upb_FieldDef_Name(field)));
-      rb_hash_aset(hash, msg_key, Qnil);
-      continue;
-    }
-
-    // Do not include fields that are not present (oneof or optional fields).
-    if (is_proto2 && upb_FieldDef_HasPresence(field) &&
-        !upb_Message_Has(msg, field)) {
-      continue;
-    }
-
-    msg_key = ID2SYM(rb_intern(upb_FieldDef_Name(field)));
-    msgval = upb_Message_Get(msg, field);
-
-    // Proto2 omits empty map/repeated filds also.
-
-    if (upb_FieldDef_IsMap(field)) {
-      const upb_MessageDef* entry_m = upb_FieldDef_MessageSubDef(field);
-      const upb_FieldDef* key_f = upb_MessageDef_FindFieldByNumber(entry_m, 1);
-      const upb_FieldDef* val_f = upb_MessageDef_FindFieldByNumber(entry_m, 2);
-      upb_CType key_type = upb_FieldDef_CType(key_f);
-      msg_value = Map_CreateHash(msgval.map_val, key_type, TypeInfo_get(val_f));
-    } else if (upb_FieldDef_IsRepeated(field)) {
-      if (is_proto2 &&
-          (!msgval.array_val || upb_Array_Size(msgval.array_val) == 0)) {
-        continue;
-      }
-      msg_value = RepeatedField_CreateArray(msgval.array_val, type_info);
-    } else {
-      msg_value = Scalar_CreateHash(msgval, type_info);
-    }
-
-    rb_hash_aset(hash, msg_key, msg_value);
-  }
-
-  return hash;
-}
-
-VALUE Scalar_CreateHash(upb_MessageValue msgval, TypeInfo type_info) {
-  if (type_info.type == kUpb_CType_Message) {
-    return Message_CreateHash(msgval.msg_val, type_info.def.msgdef);
-  } else {
-    return Convert_UpbToRuby(msgval, type_info, Qnil);
-  }
-}
-
-/*
- * call-seq:
- *     Message.to_h => {}
- *
- * Returns the message as a Ruby Hash object, with keys as symbols.
- */
-static VALUE Message_to_h(VALUE _self) {
-  Message* self = ruby_to_Message(_self);
-  return Message_CreateHash(self->msg, self->msgdef);
-}
-
-/*
- * call-seq:
- *     Message.freeze => self
- *
- * Freezes the message object. We have to intercept this so we can pin the
- * Ruby object into memory so we don't forget it's frozen.
- */
-static VALUE Message_freeze(VALUE _self) {
-  Message* self = ruby_to_Message(_self);
-  if (!RB_OBJ_FROZEN(_self)) {
-    Arena_Pin(self->arena, _self);
-    RB_OBJ_FREEZE(_self);
-  }
-  return _self;
-}
-
-/*
- * call-seq:
- *     Message.[](index) => value
- *
- * Accesses a field's value by field name. The provided field name should be a
- * string.
- */
-static VALUE Message_index(VALUE _self, VALUE field_name) {
-  Message* self = ruby_to_Message(_self);
-  const upb_FieldDef* field;
-
-  Check_Type(field_name, T_STRING);
-  field = upb_MessageDef_FindFieldByName(self->msgdef, RSTRING_PTR(field_name));
-
-  if (field == NULL) {
-    return Qnil;
-  }
-
-  return Message_getfield(_self, field);
-}
-
-/*
- * call-seq:
- *     Message.[]=(index, value)
- *
- * Sets a field's value by field name. The provided field name should be a
- * string.
- */
-static VALUE Message_index_set(VALUE _self, VALUE field_name, VALUE value) {
-  Message* self = ruby_to_Message(_self);
-  const upb_FieldDef* f;
-  upb_MessageValue val;
-  upb_Arena* arena = Arena_get(self->arena);
-
-  Check_Type(field_name, T_STRING);
-  f = upb_MessageDef_FindFieldByName(self->msgdef, RSTRING_PTR(field_name));
-
-  if (f == NULL) {
-    rb_raise(rb_eArgError, "Unknown field: %s", RSTRING_PTR(field_name));
-  }
-
-  val = Convert_RubyToUpb(value, upb_FieldDef_Name(f), TypeInfo_get(f), arena);
-  upb_Message_Set(Message_GetMutable(_self, NULL), f, val, arena);
-
-  return Qnil;
-}
-
-/*
- * call-seq:
- *     MessageClass.decode(data, options) => message
- *
- * Decodes the given data (as a string containing bytes in protocol buffers wire
- * format) under the interpretration given by this message class's definition
- * and returns a message object with the corresponding field values.
- * @param options [Hash] options for the decoder
- *  recursion_limit: set to maximum decoding depth for message (default is 64)
- */
-static VALUE Message_decode(int argc, VALUE* argv, VALUE klass) {
-  VALUE data = argv[0];
-  int options = 0;
-
-  if (argc < 1 || argc > 2) {
-    rb_raise(rb_eArgError, "Expected 1 or 2 arguments.");
-  }
-
-  if (argc == 2) {
-    VALUE hash_args = argv[1];
-    if (TYPE(hash_args) != T_HASH) {
-      rb_raise(rb_eArgError, "Expected hash arguments.");
-    }
-
-    VALUE depth = rb_hash_lookup(hash_args, ID2SYM(rb_intern("recursion_limit")));
-
-    if (depth != Qnil && TYPE(depth) == T_FIXNUM) {
-      options |= UPB_DECODE_MAXDEPTH(FIX2INT(depth));
-    }
-  }
-
-  if (TYPE(data) != T_STRING) {
-    rb_raise(rb_eArgError, "Expected string for binary protobuf data.");
-  }
-
-  VALUE msg_rb = initialize_rb_class_with_no_args(klass);
-  Message* msg = ruby_to_Message(msg_rb);
-
-  upb_DecodeStatus status = upb_Decode(
-      RSTRING_PTR(data), RSTRING_LEN(data), (upb_Message*)msg->msg,
-      upb_MessageDef_MiniTable(msg->msgdef), NULL, options, Arena_get(msg->arena));
-
-  if (status != kUpb_DecodeStatus_Ok) {
-    rb_raise(cParseError, "Error occurred during parsing");
-  }
-
-  return msg_rb;
-}
-
-/*
- * call-seq:
- *     MessageClass.decode_json(data, options = {}) => message
- *
- * Decodes the given data (as a string containing bytes in protocol buffers wire
- * format) under the interpretration given by this message class's definition
- * and returns a message object with the corresponding field values.
- *
- *  @param options [Hash] options for the decoder
- *   ignore_unknown_fields: set true to ignore unknown fields (default is to
- *   raise an error)
- */
-static VALUE Message_decode_json(int argc, VALUE* argv, VALUE klass) {
-  VALUE data = argv[0];
-  int options = 0;
-  upb_Status status;
-
-  // TODO(haberman): use this message's pool instead.
-  const upb_DefPool* symtab = DescriptorPool_GetSymtab(generated_pool);
-
-  if (argc < 1 || argc > 2) {
-    rb_raise(rb_eArgError, "Expected 1 or 2 arguments.");
-  }
-
-  if (argc == 2) {
-    VALUE hash_args = argv[1];
-    if (TYPE(hash_args) != T_HASH) {
-      rb_raise(rb_eArgError, "Expected hash arguments.");
-    }
-
-    if (RTEST(rb_hash_lookup2(
-            hash_args, ID2SYM(rb_intern("ignore_unknown_fields")), Qfalse))) {
-      options |= upb_JsonDecode_IgnoreUnknown;
-    }
-  }
-
-  if (TYPE(data) != T_STRING) {
-    rb_raise(rb_eArgError, "Expected string for JSON data.");
-  }
-
-  // TODO(cfallin): Check and respect string encoding. If not UTF-8, we need to
-  // convert, because string handlers pass data directly to message string
-  // fields.
-
-  VALUE msg_rb = initialize_rb_class_with_no_args(klass);
-  Message* msg = ruby_to_Message(msg_rb);
-
-  // We don't allow users to decode a wrapper type directly.
-  if (IsWrapper(msg->msgdef)) {
-    rb_raise(rb_eRuntimeError, "Cannot parse a wrapper directly.");
-  }
-
-  upb_Status_Clear(&status);
-  if (!upb_JsonDecode(RSTRING_PTR(data), RSTRING_LEN(data),
-                      (upb_Message*)msg->msg, msg->msgdef, symtab, options,
-                      Arena_get(msg->arena), &status)) {
-    rb_raise(cParseError, "Error occurred during parsing: %s",
-             upb_Status_ErrorMessage(&status));
-  }
-
-  return msg_rb;
-}
-
-/*
- * call-seq:
- *     MessageClass.encode(msg, options) => bytes
- *
- * Encodes the given message object to its serialized form in protocol buffers
- * wire format.
- * @param options [Hash] options for the encoder
- *  recursion_limit: set to maximum encoding depth for message (default is 64)
- */
-static VALUE Message_encode(int argc, VALUE* argv, VALUE klass) {
-  Message* msg = ruby_to_Message(argv[0]);
-  int options = 0;
-  const char* data;
-  size_t size;
-
-  if (CLASS_OF(argv[0]) != klass) {
-    rb_raise(rb_eArgError, "Message of wrong type.");
-  }
-
-  if (argc < 1 || argc > 2) {
-    rb_raise(rb_eArgError, "Expected 1 or 2 arguments.");
-  }
-
-  if (argc == 2) {
-    VALUE hash_args = argv[1];
-    if (TYPE(hash_args) != T_HASH) {
-      rb_raise(rb_eArgError, "Expected hash arguments.");
-    }
-    VALUE depth = rb_hash_lookup(hash_args, ID2SYM(rb_intern("recursion_limit")));
-
-    if (depth != Qnil && TYPE(depth) == T_FIXNUM) {
-      options |= UPB_DECODE_MAXDEPTH(FIX2INT(depth));
-    }
-  }
-
-  upb_Arena *arena = upb_Arena_New();
-
-  data = upb_Encode(msg->msg, upb_MessageDef_MiniTable(msg->msgdef),
-                    options, arena, &size);
-
-  if (data) {
-    VALUE ret = rb_str_new(data, size);
-    rb_enc_associate(ret, rb_ascii8bit_encoding());
-    upb_Arena_Free(arena);
-    return ret;
-  } else {
-    upb_Arena_Free(arena);
-    rb_raise(rb_eRuntimeError, "Exceeded maximum depth (possibly cycle)");
-  }
-}
-
-/*
- * call-seq:
- *     MessageClass.encode_json(msg, options = {}) => json_string
- *
- * Encodes the given message object into its serialized JSON representation.
- * @param options [Hash] options for the decoder
- *  preserve_proto_fieldnames: set true to use original fieldnames (default is
- * to camelCase) emit_defaults: set true to emit 0/false values (default is to
- * omit them)
- */
-static VALUE Message_encode_json(int argc, VALUE* argv, VALUE klass) {
-  Message* msg = ruby_to_Message(argv[0]);
-  int options = 0;
-  char buf[1024];
-  size_t size;
-  upb_Status status;
-
-  // TODO(haberman): use this message's pool instead.
-  const upb_DefPool* symtab = DescriptorPool_GetSymtab(generated_pool);
-
-  if (argc < 1 || argc > 2) {
-    rb_raise(rb_eArgError, "Expected 1 or 2 arguments.");
-  }
-
-  if (argc == 2) {
-    VALUE hash_args = argv[1];
-    if (TYPE(hash_args) != T_HASH) {
-      if (RTEST(rb_funcall(hash_args, rb_intern("respond_to?"), 1, rb_str_new2("to_h")))) {
-        hash_args = rb_funcall(hash_args, rb_intern("to_h"), 0);
-      } else {
-        rb_raise(rb_eArgError, "Expected hash arguments.");
-      }
-    }
-
-    if (RTEST(rb_hash_lookup2(hash_args,
-                              ID2SYM(rb_intern("preserve_proto_fieldnames")),
-                              Qfalse))) {
-      options |= upb_JsonEncode_UseProtoNames;
-    }
-
-    if (RTEST(rb_hash_lookup2(hash_args, ID2SYM(rb_intern("emit_defaults")),
-                              Qfalse))) {
-      options |= upb_JsonEncode_EmitDefaults;
-    }
-  }
-
-  upb_Status_Clear(&status);
-  size = upb_JsonEncode(msg->msg, msg->msgdef, symtab, options, buf,
-                        sizeof(buf), &status);
-
-  if (!upb_Status_IsOk(&status)) {
-    rb_raise(cParseError, "Error occurred during encoding: %s",
-             upb_Status_ErrorMessage(&status));
-  }
-
-  VALUE ret;
-  if (size >= sizeof(buf)) {
-    char* buf2 = malloc(size + 1);
-    upb_JsonEncode(msg->msg, msg->msgdef, symtab, options, buf2, size + 1,
-                   &status);
-    ret = rb_str_new(buf2, size);
-    free(buf2);
-  } else {
-    ret = rb_str_new(buf, size);
-  }
-
-  rb_enc_associate(ret, rb_utf8_encoding());
-  return ret;
-}
-
-/*
- * call-seq:
- *     Message.descriptor => descriptor
- *
- * Class method that returns the Descriptor instance corresponding to this
- * message class's type.
- */
-static VALUE Message_descriptor(VALUE klass) {
-  return rb_ivar_get(klass, descriptor_instancevar_interned);
-}
-
-VALUE build_class_from_descriptor(VALUE descriptor) {
-  const char* name;
-  VALUE klass;
-
-  name = upb_MessageDef_FullName(Descriptor_GetMsgDef(descriptor));
-  if (name == NULL) {
-    rb_raise(rb_eRuntimeError, "Descriptor does not have assigned name.");
-  }
-
-  klass = rb_define_class_id(
-      // Docs say this parameter is ignored. User will assign return value to
-      // their own toplevel constant class name.
-      rb_intern("Message"), rb_cObject);
-  rb_ivar_set(klass, descriptor_instancevar_interned, descriptor);
-  rb_define_alloc_func(klass, Message_alloc);
-  rb_require("google/protobuf/message_exts");
-  rb_include_module(klass, rb_eval_string("::Google::Protobuf::MessageExts"));
-  rb_extend_object(
-      klass, rb_eval_string("::Google::Protobuf::MessageExts::ClassMethods"));
-
-  rb_define_method(klass, "method_missing", Message_method_missing, -1);
-  rb_define_method(klass, "respond_to_missing?", Message_respond_to_missing,
-                   -1);
-  rb_define_method(klass, "initialize", Message_initialize, -1);
-  rb_define_method(klass, "dup", Message_dup, 0);
-  // Also define #clone so that we don't inherit Object#clone.
-  rb_define_method(klass, "clone", Message_dup, 0);
-  rb_define_method(klass, "==", Message_eq, 1);
-  rb_define_method(klass, "eql?", Message_eq, 1);
-  rb_define_method(klass, "freeze", Message_freeze, 0);
-  rb_define_method(klass, "hash", Message_hash, 0);
-  rb_define_method(klass, "to_h", Message_to_h, 0);
-  rb_define_method(klass, "inspect", Message_inspect, 0);
-  rb_define_method(klass, "to_s", Message_inspect, 0);
-  rb_define_method(klass, "[]", Message_index, 1);
-  rb_define_method(klass, "[]=", Message_index_set, 2);
-  rb_define_singleton_method(klass, "decode", Message_decode, -1);
-  rb_define_singleton_method(klass, "encode", Message_encode, -1);
-  rb_define_singleton_method(klass, "decode_json", Message_decode_json, -1);
-  rb_define_singleton_method(klass, "encode_json", Message_encode_json, -1);
-  rb_define_singleton_method(klass, "descriptor", Message_descriptor, 0);
-
-  return klass;
-}
-
-/*
- * call-seq:
- *     Enum.lookup(number) => name
- *
- * This module method, provided on each generated enum module, looks up an enum
- * value by number and returns its name as a Ruby symbol, or nil if not found.
- */
-static VALUE enum_lookup(VALUE self, VALUE number) {
-  int32_t num = NUM2INT(number);
-  VALUE desc = rb_ivar_get(self, descriptor_instancevar_interned);
-  const upb_EnumDef* e = EnumDescriptor_GetEnumDef(desc);
-  const upb_EnumValueDef* ev = upb_EnumDef_FindValueByNumber(e, num);
-  if (ev) {
-    return ID2SYM(rb_intern(upb_EnumValueDef_Name(ev)));
-  } else {
-    return Qnil;
-  }
-}
-
-/*
- * call-seq:
- *     Enum.resolve(name) => number
- *
- * This module method, provided on each generated enum module, looks up an enum
- * value by name (as a Ruby symbol) and returns its name, or nil if not found.
- */
-static VALUE enum_resolve(VALUE self, VALUE sym) {
-  const char* name = rb_id2name(SYM2ID(sym));
-  VALUE desc = rb_ivar_get(self, descriptor_instancevar_interned);
-  const upb_EnumDef* e = EnumDescriptor_GetEnumDef(desc);
-  const upb_EnumValueDef* ev = upb_EnumDef_FindValueByName(e, name);
-  if (ev) {
-    return INT2NUM(upb_EnumValueDef_Number(ev));
-  } else {
-    return Qnil;
-  }
-}
-
-/*
- * call-seq:
- *     Enum.descriptor
- *
- * This module method, provided on each generated enum module, returns the
- * EnumDescriptor corresponding to this enum type.
- */
-static VALUE enum_descriptor(VALUE self) {
-  return rb_ivar_get(self, descriptor_instancevar_interned);
-}
-
-VALUE build_module_from_enumdesc(VALUE _enumdesc) {
-  const upb_EnumDef* e = EnumDescriptor_GetEnumDef(_enumdesc);
-  VALUE mod = rb_define_module_id(rb_intern(upb_EnumDef_FullName(e)));
-
-  int n = upb_EnumDef_ValueCount(e);
-  for (int i = 0; i < n; i++) {
-    const upb_EnumValueDef* ev = upb_EnumDef_Value(e, i);
-    upb_Arena* arena = upb_Arena_New();
-    const char* src_name = upb_EnumValueDef_Name(ev);
-    char* name = upb_strdup2(src_name, strlen(src_name), arena);
-    int32_t value = upb_EnumValueDef_Number(ev);
-    if (name[0] < 'A' || name[0] > 'Z') {
-      if (name[0] >= 'a' && name[0] <= 'z') {
-        name[0] -= 32; // auto capitalize
-      } else {
-        rb_warn(
-          "Enum value '%s' does not start with an uppercase letter "
-          "as is required for Ruby constants.",
-          name);
-      }
-    }
-    rb_define_const(mod, name, INT2NUM(value));
-    upb_Arena_Free(arena);
-  }
-
-  rb_define_singleton_method(mod, "lookup", enum_lookup, 1);
-  rb_define_singleton_method(mod, "resolve", enum_resolve, 1);
-  rb_define_singleton_method(mod, "descriptor", enum_descriptor, 0);
-  rb_ivar_set(mod, descriptor_instancevar_interned, _enumdesc);
-
-  return mod;
-}
-
-// Internal only; used by Google::Protobuf.deep_copy.
-upb_Message* Message_deep_copy(const upb_Message* msg, const upb_MessageDef* m,
-                               upb_Arena* arena) {
-  // Serialize and parse.
-  upb_Arena* tmp_arena = upb_Arena_New();
-  const upb_MiniTable* layout = upb_MessageDef_MiniTable(m);
-  size_t size;
-
-  char* data = upb_Encode(msg, layout, 0, tmp_arena, &size);
-  upb_Message* new_msg = upb_Message_New(m, arena);
-
-  if (!data || upb_Decode(data, size, new_msg, layout, NULL, 0, arena) !=
-                   kUpb_DecodeStatus_Ok) {
-    upb_Arena_Free(tmp_arena);
-    rb_raise(cParseError, "Error occurred copying proto");
-  }
-
-  upb_Arena_Free(tmp_arena);
-  return new_msg;
-}
-
-const upb_Message* Message_GetUpbMessage(VALUE value, const upb_MessageDef* m,
-                                         const char* name, upb_Arena* arena) {
-  if (value == Qnil) {
-    rb_raise(cTypeError, "nil message not allowed here.");
-  }
-
-  VALUE klass = CLASS_OF(value);
-  VALUE desc_rb = rb_ivar_get(klass, descriptor_instancevar_interned);
-  const upb_MessageDef* val_m =
-      desc_rb == Qnil ? NULL : Descriptor_GetMsgDef(desc_rb);
-
-  if (val_m != m) {
-    // Check for possible implicit conversions
-    // TODO: hash conversion?
-
-    switch (upb_MessageDef_WellKnownType(m)) {
-      case kUpb_WellKnown_Timestamp: {
-        // Time -> Google::Protobuf::Timestamp
-        upb_Message* msg = upb_Message_New(m, arena);
-        upb_MessageValue sec, nsec;
-        struct timespec time;
-        const upb_FieldDef* sec_f = upb_MessageDef_FindFieldByNumber(m, 1);
-        const upb_FieldDef* nsec_f = upb_MessageDef_FindFieldByNumber(m, 2);
-
-        if (!rb_obj_is_kind_of(value, rb_cTime)) goto badtype;
-
-        time = rb_time_timespec(value);
-        sec.int64_val = time.tv_sec;
-        nsec.int32_val = time.tv_nsec;
-        upb_Message_Set(msg, sec_f, sec, arena);
-        upb_Message_Set(msg, nsec_f, nsec, arena);
-        return msg;
-      }
-      case kUpb_WellKnown_Duration: {
-        // Numeric -> Google::Protobuf::Duration
-        upb_Message* msg = upb_Message_New(m, arena);
-        upb_MessageValue sec, nsec;
-        const upb_FieldDef* sec_f = upb_MessageDef_FindFieldByNumber(m, 1);
-        const upb_FieldDef* nsec_f = upb_MessageDef_FindFieldByNumber(m, 2);
-
-        if (!rb_obj_is_kind_of(value, rb_cNumeric)) goto badtype;
-
-        sec.int64_val = NUM2LL(value);
-        nsec.int32_val = round((NUM2DBL(value) - NUM2LL(value)) * 1000000000);
-        upb_Message_Set(msg, sec_f, sec, arena);
-        upb_Message_Set(msg, nsec_f, nsec, arena);
-        return msg;
-      }
-      default:
-      badtype:
-        rb_raise(cTypeError,
-                 "Invalid type %s to assign to submessage field '%s'.",
-                 rb_class2name(CLASS_OF(value)), name);
-    }
-  }
-
-  Message* self = ruby_to_Message(value);
-  Arena_fuse(self->arena, arena);
-
-  return self->msg;
-}
-
-void Message_register(VALUE protobuf) {
-  cParseError = rb_const_get(protobuf, rb_intern("ParseError"));
-
-  // Ruby-interned string: "descriptor". We use this identifier to store an
-  // instance variable on message classes we create in order to link them back
-  // to their descriptors.
-  descriptor_instancevar_interned = rb_intern("descriptor");
-}
diff --git a/libs/protobuf/ruby/ext/google/protobuf_c/message.h b/libs/protobuf/ruby/ext/google/protobuf_c/message.h
deleted file mode 100644
index b409650..0000000
--- a/libs/protobuf/ruby/ext/google/protobuf_c/message.h
+++ /dev/null
@@ -1,104 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef RUBY_PROTOBUF_MESSAGE_H_
-#define RUBY_PROTOBUF_MESSAGE_H_
-
-#include <ruby/ruby.h>
-
-#include "protobuf.h"
-#include "ruby-upb.h"
-
-// Gets the underlying upb_Message* and upb_MessageDef for the given Ruby
-// message wrapper. Requires that |value| is indeed a message object.
-const upb_Message* Message_Get(VALUE value, const upb_MessageDef** m);
-
-// Like Message_Get(), but checks that the object is not frozen and returns a
-// mutable pointer.
-upb_Message* Message_GetMutable(VALUE value, const upb_MessageDef** m);
-
-// Returns the Arena object for this message.
-VALUE Message_GetArena(VALUE value);
-
-// Converts |value| into a upb_Message value of the expected upb_MessageDef
-// type, raising an error if this is not possible. Used when assigning |value|
-// to a field of another message, which means the message must be of a
-// particular type.
-//
-// This will perform automatic conversions in some cases (for example, Time ->
-// Google::Protobuf::Timestamp). If any new message is created, it will be
-// created on |arena|, and any existing message will have its arena fused with
-// |arena|.
-const upb_Message* Message_GetUpbMessage(VALUE value, const upb_MessageDef* m,
-                                         const char* name, upb_Arena* arena);
-
-// Gets or constructs a Ruby wrapper object for the given message. The wrapper
-// object will reference |arena| and ensure that it outlives this object.
-VALUE Message_GetRubyWrapper(upb_Message* msg, const upb_MessageDef* m,
-                             VALUE arena);
-
-// Gets the given field from this message.
-VALUE Message_getfield(VALUE _self, const upb_FieldDef* f);
-
-// Implements #inspect for this message, printing the text to |b|.
-void Message_PrintMessage(StringBuilder* b, const upb_Message* msg,
-                          const upb_MessageDef* m);
-
-// Returns a hash value for the given message.
-uint64_t Message_Hash(const upb_Message* msg, const upb_MessageDef* m,
-                      uint64_t seed);
-
-// Returns a deep copy of the given message.
-upb_Message* Message_deep_copy(const upb_Message* msg, const upb_MessageDef* m,
-                               upb_Arena* arena);
-
-// Returns true if these two messages are equal.
-bool Message_Equal(const upb_Message* m1, const upb_Message* m2,
-                   const upb_MessageDef* m);
-
-// Checks that this Ruby object is a message, and raises an exception if not.
-void Message_CheckClass(VALUE klass);
-
-// Returns a new Hash object containing the contents of this message.
-VALUE Scalar_CreateHash(upb_MessageValue val, TypeInfo type_info);
-
-// Creates a message class or enum module for this descriptor, respectively.
-VALUE build_class_from_descriptor(VALUE descriptor);
-VALUE build_module_from_enumdesc(VALUE _enumdesc);
-
-// Returns the Descriptor/EnumDescriptor for the given message class or enum
-// module, respectively. Returns nil if this is not a message class or enum
-// module.
-VALUE MessageOrEnum_GetDescriptor(VALUE klass);
-
-// Call at startup to register all types in this module.
-void Message_register(VALUE protobuf);
-
-#endif  // RUBY_PROTOBUF_MESSAGE_H_
diff --git a/libs/protobuf/ruby/ext/google/protobuf_c/protobuf.c b/libs/protobuf/ruby/ext/google/protobuf_c/protobuf.c
deleted file mode 100644
index 3c765c5..0000000
--- a/libs/protobuf/ruby/ext/google/protobuf_c/protobuf.c
+++ /dev/null
@@ -1,480 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2014 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include "protobuf.h"
-
-#include <ruby/version.h>
-
-#include "defs.h"
-#include "map.h"
-#include "message.h"
-#include "repeated_field.h"
-
-VALUE cParseError;
-VALUE cTypeError;
-
-const upb_FieldDef *map_field_key(const upb_FieldDef *field) {
-  const upb_MessageDef *entry = upb_FieldDef_MessageSubDef(field);
-  return upb_MessageDef_FindFieldByNumber(entry, 1);
-}
-
-const upb_FieldDef *map_field_value(const upb_FieldDef *field) {
-  const upb_MessageDef *entry = upb_FieldDef_MessageSubDef(field);
-  return upb_MessageDef_FindFieldByNumber(entry, 2);
-}
-
-// -----------------------------------------------------------------------------
-// StringBuilder, for inspect
-// -----------------------------------------------------------------------------
-
-struct StringBuilder {
-  size_t size;
-  size_t cap;
-  char *data;
-};
-
-typedef struct StringBuilder StringBuilder;
-
-static size_t StringBuilder_SizeOf(size_t cap) {
-  return sizeof(StringBuilder) + cap;
-}
-
-StringBuilder *StringBuilder_New() {
-  const size_t cap = 128;
-  StringBuilder *builder = malloc(sizeof(*builder));
-  builder->size = 0;
-  builder->cap = cap;
-  builder->data = malloc(builder->cap);
-  return builder;
-}
-
-void StringBuilder_Free(StringBuilder *b) {
-  free(b->data);
-  free(b);
-}
-
-void StringBuilder_Printf(StringBuilder *b, const char *fmt, ...) {
-  size_t have = b->cap - b->size;
-  size_t n;
-  va_list args;
-
-  va_start(args, fmt);
-  n = vsnprintf(&b->data[b->size], have, fmt, args);
-  va_end(args);
-
-  if (have <= n) {
-    while (have <= n) {
-      b->cap *= 2;
-      have = b->cap - b->size;
-    }
-    b->data = realloc(b->data, StringBuilder_SizeOf(b->cap));
-    va_start(args, fmt);
-    n = vsnprintf(&b->data[b->size], have, fmt, args);
-    va_end(args);
-    PBRUBY_ASSERT(n < have);
-  }
-
-  b->size += n;
-}
-
-VALUE StringBuilder_ToRubyString(StringBuilder *b) {
-  VALUE ret = rb_str_new(b->data, b->size);
-  rb_enc_associate(ret, rb_utf8_encoding());
-  return ret;
-}
-
-static void StringBuilder_PrintEnum(StringBuilder *b, int32_t val,
-                                    const upb_EnumDef *e) {
-  const upb_EnumValueDef *ev = upb_EnumDef_FindValueByNumber(e, val);
-  if (ev) {
-    StringBuilder_Printf(b, ":%s", upb_EnumValueDef_Name(ev));
-  } else {
-    StringBuilder_Printf(b, "%" PRId32, val);
-  }
-}
-
-void StringBuilder_PrintMsgval(StringBuilder *b, upb_MessageValue val,
-                               TypeInfo info) {
-  switch (info.type) {
-    case kUpb_CType_Bool:
-      StringBuilder_Printf(b, "%s", val.bool_val ? "true" : "false");
-      break;
-    case kUpb_CType_Float: {
-      VALUE str = rb_inspect(DBL2NUM(val.float_val));
-      StringBuilder_Printf(b, "%s", RSTRING_PTR(str));
-      break;
-    }
-    case kUpb_CType_Double: {
-      VALUE str = rb_inspect(DBL2NUM(val.double_val));
-      StringBuilder_Printf(b, "%s", RSTRING_PTR(str));
-      break;
-    }
-    case kUpb_CType_Int32:
-      StringBuilder_Printf(b, "%" PRId32, val.int32_val);
-      break;
-    case kUpb_CType_UInt32:
-      StringBuilder_Printf(b, "%" PRIu32, val.uint32_val);
-      break;
-    case kUpb_CType_Int64:
-      StringBuilder_Printf(b, "%" PRId64, val.int64_val);
-      break;
-    case kUpb_CType_UInt64:
-      StringBuilder_Printf(b, "%" PRIu64, val.uint64_val);
-      break;
-    case kUpb_CType_String:
-      StringBuilder_Printf(b, "\"%.*s\"", (int)val.str_val.size,
-                           val.str_val.data);
-      break;
-    case kUpb_CType_Bytes:
-      StringBuilder_Printf(b, "\"%.*s\"", (int)val.str_val.size,
-                           val.str_val.data);
-      break;
-    case kUpb_CType_Enum:
-      StringBuilder_PrintEnum(b, val.int32_val, info.def.enumdef);
-      break;
-    case kUpb_CType_Message:
-      Message_PrintMessage(b, val.msg_val, info.def.msgdef);
-      break;
-  }
-}
-
-// -----------------------------------------------------------------------------
-// Arena
-// -----------------------------------------------------------------------------
-
-typedef struct {
-  upb_Arena *arena;
-  VALUE pinned_objs;
-} Arena;
-
-static void Arena_mark(void *data) {
-  Arena *arena = data;
-  rb_gc_mark(arena->pinned_objs);
-}
-
-static void Arena_free(void *data) {
-  Arena *arena = data;
-  upb_Arena_Free(arena->arena);
-  xfree(arena);
-}
-
-static VALUE cArena;
-
-const rb_data_type_t Arena_type = {
-    "Google::Protobuf::Internal::Arena",
-    {Arena_mark, Arena_free, NULL},
-    .flags = RUBY_TYPED_FREE_IMMEDIATELY,
-};
-
-static void* ruby_upb_allocfunc(upb_alloc* alloc, void* ptr, size_t oldsize, size_t size) {
-  if (size == 0) {
-    xfree(ptr);
-    return NULL;
-  } else {
-    return xrealloc(ptr, size);
-  }
-}
-
-upb_alloc ruby_upb_alloc = {&ruby_upb_allocfunc};
-
-static VALUE Arena_alloc(VALUE klass) {
-  Arena *arena = ALLOC(Arena);
-  arena->arena = upb_Arena_Init(NULL, 0, &ruby_upb_alloc);
-  arena->pinned_objs = Qnil;
-  return TypedData_Wrap_Struct(klass, &Arena_type, arena);
-}
-
-upb_Arena *Arena_get(VALUE _arena) {
-  Arena *arena;
-  TypedData_Get_Struct(_arena, Arena, &Arena_type, arena);
-  return arena->arena;
-}
-
-void Arena_fuse(VALUE _arena, upb_Arena *other) {
-  Arena *arena;
-  TypedData_Get_Struct(_arena, Arena, &Arena_type, arena);
-  if (!upb_Arena_Fuse(arena->arena, other)) {
-    rb_raise(rb_eRuntimeError,
-             "Unable to fuse arenas. This should never happen since Ruby does "
-             "not use initial blocks");
-  }
-}
-
-VALUE Arena_new() { return Arena_alloc(cArena); }
-
-void Arena_Pin(VALUE _arena, VALUE obj) {
-  Arena *arena;
-  TypedData_Get_Struct(_arena, Arena, &Arena_type, arena);
-  if (arena->pinned_objs == Qnil) {
-    arena->pinned_objs = rb_ary_new();
-  }
-  rb_ary_push(arena->pinned_objs, obj);
-}
-
-void Arena_register(VALUE module) {
-  VALUE internal = rb_define_module_under(module, "Internal");
-  VALUE klass = rb_define_class_under(internal, "Arena", rb_cObject);
-  rb_define_alloc_func(klass, Arena_alloc);
-  rb_gc_register_address(&cArena);
-  cArena = klass;
-}
-
-// -----------------------------------------------------------------------------
-// Object Cache
-// -----------------------------------------------------------------------------
-
-// A pointer -> Ruby Object cache that keeps references to Ruby wrapper
-// objects.  This allows us to look up any Ruby wrapper object by the address
-// of the object it is wrapping. That way we can avoid ever creating two
-// different wrapper objects for the same C object, which saves memory and
-// preserves object identity.
-//
-// We use WeakMap for the cache. For Ruby <2.7 we also need a secondary Hash
-// to store WeakMap keys because Ruby <2.7 WeakMap doesn't allow non-finalizable
-// keys.
-//
-// We also need the secondary Hash if sizeof(long) < sizeof(VALUE), because this
-// means it may not be possible to fit a pointer into a Fixnum. Keys are
-// pointers, and if they fit into a Fixnum, Ruby doesn't collect them, but if
-// they overflow and require allocating a Bignum, they could get collected
-// prematurely, thus removing the cache entry. This happens on 64-bit Windows,
-// on which pointers are 64 bits but longs are 32 bits. In this case, we enable
-// the secondary Hash to hold the keys and prevent them from being collected.
-
-#if RUBY_API_VERSION_CODE >= 20700 && SIZEOF_LONG >= SIZEOF_VALUE
-#define USE_SECONDARY_MAP 0
-#else
-#define USE_SECONDARY_MAP 1
-#endif
-
-#if USE_SECONDARY_MAP
-
-// Maps Numeric -> Object. The object is then used as a key into the WeakMap.
-// This is needed for Ruby <2.7 where a number cannot be a key to WeakMap.
-// The object is used only for its identity; it does not contain any data.
-VALUE secondary_map = Qnil;
-
-// Mutations to the map are under a mutex, because SeconaryMap_MaybeGC()
-// iterates over the map which cannot happen in parallel with insertions, or
-// Ruby will throw:
-//   can't add a new key into hash during iteration (RuntimeError)
-VALUE secondary_map_mutex = Qnil;
-
-// Lambda that will GC entries from the secondary map that are no longer present
-// in the primary map.
-VALUE gc_secondary_map_lambda = Qnil;
-ID length;
-
-extern VALUE weak_obj_cache;
-
-static void SecondaryMap_Init() {
-  rb_gc_register_address(&secondary_map);
-  rb_gc_register_address(&gc_secondary_map_lambda);
-  rb_gc_register_address(&secondary_map_mutex);
-  secondary_map = rb_hash_new();
-  gc_secondary_map_lambda = rb_eval_string(
-      "->(secondary, weak) {\n"
-      "  secondary.delete_if { |k, v| !weak.key?(v) }\n"
-      "}\n");
-  secondary_map_mutex = rb_mutex_new();
-  length = rb_intern("length");
-}
-
-// The secondary map is a regular Hash, and will never shrink on its own.
-// The main object cache is a WeakMap that will automatically remove entries
-// when the target object is no longer reachable, but unless we manually
-// remove the corresponding entries from the secondary map, it will grow
-// without bound.
-//
-// To avoid this unbounded growth we periodically remove entries from the
-// secondary map that are no longer present in the WeakMap. The logic of
-// how often to perform this GC is an artbirary tuning parameter that
-// represents a straightforward CPU/memory tradeoff.
-//
-// Requires: secondary_map_mutex is held.
-static void SecondaryMap_MaybeGC() {
-  PBRUBY_ASSERT(rb_mutex_locked_p(secondary_map_mutex) == Qtrue);
-  size_t weak_len = NUM2ULL(rb_funcall(weak_obj_cache, length, 0));
-  size_t secondary_len = RHASH_SIZE(secondary_map);
-  if (secondary_len < weak_len) {
-    // Logically this case should not be possible: a valid entry cannot exist in
-    // the weak table unless there is a corresponding entry in the secondary
-    // table. It should *always* be the case that secondary_len >= weak_len.
-    //
-    // However ObjectSpace::WeakMap#length (and therefore weak_len) is
-    // unreliable: it overreports its true length by including non-live objects.
-    // However these non-live objects are not yielded in iteration, so we may
-    // have previously deleted them from the secondary map in a previous
-    // invocation of SecondaryMap_MaybeGC().
-    //
-    // In this case, we can't measure any waste, so we just return.
-    return;
-  }
-  size_t waste = secondary_len - weak_len;
-  // GC if we could remove at least 2000 entries or 20% of the table size
-  // (whichever is greater).  Since the cost of the GC pass is O(N), we
-  // want to make sure that we condition this on overall table size, to
-  // avoid O(N^2) CPU costs.
-  size_t threshold = PBRUBY_MAX(secondary_len * 0.2, 2000);
-  if (waste > threshold) {
-    rb_funcall(gc_secondary_map_lambda, rb_intern("call"), 2, secondary_map,
-               weak_obj_cache);
-  }
-}
-
-// Requires: secondary_map_mutex is held by this thread iff create == true.
-static VALUE SecondaryMap_Get(VALUE key, bool create) {
-  PBRUBY_ASSERT(!create || rb_mutex_locked_p(secondary_map_mutex) == Qtrue);
-  VALUE ret = rb_hash_lookup(secondary_map, key);
-  if (ret == Qnil && create) {
-    SecondaryMap_MaybeGC();
-    ret = rb_class_new_instance(0, NULL, rb_cObject);
-    rb_hash_aset(secondary_map, key, ret);
-  }
-  return ret;
-}
-
-#endif
-
-// Requires: secondary_map_mutex is held by this thread iff create == true.
-static VALUE ObjectCache_GetKey(const void *key, bool create) {
-  VALUE key_val = (VALUE)key;
-  PBRUBY_ASSERT((key_val & 3) == 0);
-  VALUE ret = LL2NUM(key_val >> 2);
-#if USE_SECONDARY_MAP
-  ret = SecondaryMap_Get(ret, create);
-#endif
-  return ret;
-}
-
-// Public ObjectCache API.
-
-VALUE weak_obj_cache = Qnil;
-ID item_get;
-ID item_set;
-
-static void ObjectCache_Init() {
-  rb_gc_register_address(&weak_obj_cache);
-  VALUE klass = rb_eval_string("ObjectSpace::WeakMap");
-  weak_obj_cache = rb_class_new_instance(0, NULL, klass);
-  item_get = rb_intern("[]");
-  item_set = rb_intern("[]=");
-#if USE_SECONDARY_MAP
-  SecondaryMap_Init();
-#endif
-}
-
-void ObjectCache_Add(const void *key, VALUE val) {
-  PBRUBY_ASSERT(ObjectCache_Get(key) == Qnil);
-#if USE_SECONDARY_MAP
-  rb_mutex_lock(secondary_map_mutex);
-#endif
-  VALUE key_rb = ObjectCache_GetKey(key, true);
-  rb_funcall(weak_obj_cache, item_set, 2, key_rb, val);
-#if USE_SECONDARY_MAP
-  rb_mutex_unlock(secondary_map_mutex);
-#endif
-  PBRUBY_ASSERT(ObjectCache_Get(key) == val);
-}
-
-// Returns the cached object for this key, if any. Otherwise returns Qnil.
-VALUE ObjectCache_Get(const void *key) {
-  VALUE key_rb = ObjectCache_GetKey(key, false);
-  return rb_funcall(weak_obj_cache, item_get, 1, key_rb);
-}
-
-/*
- * call-seq:
- *     Google::Protobuf.discard_unknown(msg)
- *
- * Discard unknown fields in the given message object and recursively discard
- * unknown fields in submessages.
- */
-static VALUE Google_Protobuf_discard_unknown(VALUE self, VALUE msg_rb) {
-  const upb_MessageDef *m;
-  upb_Message *msg = Message_GetMutable(msg_rb, &m);
-  if (!upb_Message_DiscardUnknown(msg, m, 128)) {
-    rb_raise(rb_eRuntimeError, "Messages nested too deeply.");
-  }
-
-  return Qnil;
-}
-
-/*
- * call-seq:
- *     Google::Protobuf.deep_copy(obj) => copy_of_obj
- *
- * Performs a deep copy of a RepeatedField instance, a Map instance, or a
- * message object, recursively copying its members.
- */
-VALUE Google_Protobuf_deep_copy(VALUE self, VALUE obj) {
-  VALUE klass = CLASS_OF(obj);
-  if (klass == cRepeatedField) {
-    return RepeatedField_deep_copy(obj);
-  } else if (klass == cMap) {
-    return Map_deep_copy(obj);
-  } else {
-    VALUE new_arena_rb = Arena_new();
-    upb_Arena *new_arena = Arena_get(new_arena_rb);
-    const upb_MessageDef *m;
-    const upb_Message *msg = Message_Get(obj, &m);
-    upb_Message *new_msg = Message_deep_copy(msg, m, new_arena);
-    return Message_GetRubyWrapper(new_msg, m, new_arena_rb);
-  }
-}
-
-// -----------------------------------------------------------------------------
-// Initialization/entry point.
-// -----------------------------------------------------------------------------
-
-// This must be named "Init_protobuf_c" because the Ruby module is named
-// "protobuf_c" -- the VM looks for this symbol in our .so.
-__attribute__((visibility("default"))) void Init_protobuf_c() {
-  ObjectCache_Init();
-
-  VALUE google = rb_define_module("Google");
-  VALUE protobuf = rb_define_module_under(google, "Protobuf");
-
-  Arena_register(protobuf);
-  Defs_register(protobuf);
-  RepeatedField_register(protobuf);
-  Map_register(protobuf);
-  Message_register(protobuf);
-
-  cParseError = rb_const_get(protobuf, rb_intern("ParseError"));
-  rb_gc_register_mark_object(cParseError);
-  cTypeError = rb_const_get(protobuf, rb_intern("TypeError"));
-  rb_gc_register_mark_object(cTypeError);
-
-  rb_define_singleton_method(protobuf, "discard_unknown",
-                             Google_Protobuf_discard_unknown, 1);
-  rb_define_singleton_method(protobuf, "deep_copy", Google_Protobuf_deep_copy,
-                             1);
-}
diff --git a/libs/protobuf/ruby/ext/google/protobuf_c/protobuf.h b/libs/protobuf/ruby/ext/google/protobuf_c/protobuf.h
deleted file mode 100644
index c6af98f..0000000
--- a/libs/protobuf/ruby/ext/google/protobuf_c/protobuf.h
+++ /dev/null
@@ -1,120 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2014 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef __GOOGLE_PROTOBUF_RUBY_PROTOBUF_H__
-#define __GOOGLE_PROTOBUF_RUBY_PROTOBUF_H__
-
-#include <ruby/encoding.h>
-#include <ruby/ruby.h>
-#include <ruby/vm.h>
-
-#include "defs.h"
-#include "ruby-upb.h"
-
-// These operate on a map field (i.e., a repeated field of submessages whose
-// submessage type is a map-entry msgdef).
-const upb_FieldDef* map_field_key(const upb_FieldDef* field);
-const upb_FieldDef* map_field_value(const upb_FieldDef* field);
-
-// -----------------------------------------------------------------------------
-// Arena
-// -----------------------------------------------------------------------------
-
-// A Ruby object that wraps an underlying upb_Arena.  Any objects that are
-// allocated from this arena should reference the Arena in rb_gc_mark(), to
-// ensure that the object's underlying memory outlives any Ruby object that can
-// reach it.
-
-VALUE Arena_new();
-upb_Arena* Arena_get(VALUE arena);
-
-// Fuses this arena to another, throwing a Ruby exception if this is not
-// possible.
-void Arena_fuse(VALUE arena, upb_Arena* other);
-
-// Pins this Ruby object to the lifetime of this arena, so that as long as the
-// arena is alive this object will not be collected.
-//
-// We use this to guarantee that the "frozen" bit on the object will be
-// remembered, even if the user drops their reference to this precise object.
-void Arena_Pin(VALUE arena, VALUE obj);
-
-// -----------------------------------------------------------------------------
-// ObjectCache
-// -----------------------------------------------------------------------------
-
-// Global object cache from upb array/map/message/symtab to wrapper object.
-//
-// This is a conceptually "weak" cache, in that it does not prevent "val" from
-// being collected (though in Ruby <2.7 is it effectively strong, due to
-// implementation limitations).
-
-// Adds an entry to the cache. The "arena" parameter must give the arena that
-// "key" was allocated from.  In Ruby <2.7.0, it will be used to remove the key
-// from the cache when the arena is destroyed.
-void ObjectCache_Add(const void* key, VALUE val);
-
-// Returns the cached object for this key, if any. Otherwise returns Qnil.
-VALUE ObjectCache_Get(const void* key);
-
-// -----------------------------------------------------------------------------
-// StringBuilder, for inspect
-// -----------------------------------------------------------------------------
-
-struct StringBuilder;
-typedef struct StringBuilder StringBuilder;
-
-StringBuilder* StringBuilder_New();
-void StringBuilder_Free(StringBuilder* b);
-void StringBuilder_Printf(StringBuilder* b, const char* fmt, ...);
-VALUE StringBuilder_ToRubyString(StringBuilder* b);
-
-void StringBuilder_PrintMsgval(StringBuilder* b, upb_MessageValue val,
-                               TypeInfo info);
-
-// -----------------------------------------------------------------------------
-// Utilities.
-// -----------------------------------------------------------------------------
-
-extern VALUE cTypeError;
-
-#ifdef NDEBUG
-#define PBRUBY_ASSERT(expr) \
-  do {                      \
-  } while (false && (expr))
-#else
-#define PBRUBY_ASSERT(expr) assert(expr)
-#endif
-
-#define PBRUBY_MAX(x, y) (((x) > (y)) ? (x) : (y))
-
-#define UPB_UNUSED(var) (void)var
-
-#endif  // __GOOGLE_PROTOBUF_RUBY_PROTOBUF_H__
diff --git a/libs/protobuf/ruby/ext/google/protobuf_c/repeated_field.c b/libs/protobuf/ruby/ext/google/protobuf_c/repeated_field.c
deleted file mode 100644
index 700ca16..0000000
--- a/libs/protobuf/ruby/ext/google/protobuf_c/repeated_field.c
+++ /dev/null
@@ -1,657 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2014 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include "repeated_field.h"
-
-#include "convert.h"
-#include "defs.h"
-#include "message.h"
-#include "protobuf.h"
-
-// -----------------------------------------------------------------------------
-// Repeated field container type.
-// -----------------------------------------------------------------------------
-
-typedef struct {
-  const upb_Array* array;  // Can get as mutable when non-frozen.
-  TypeInfo type_info;
-  VALUE type_class;  // To GC-root the msgdef/enumdef in type_info.
-  VALUE arena;       // To GC-root the upb_Array.
-} RepeatedField;
-
-VALUE cRepeatedField;
-
-static void RepeatedField_mark(void* _self) {
-  RepeatedField* self = (RepeatedField*)_self;
-  rb_gc_mark(self->type_class);
-  rb_gc_mark(self->arena);
-}
-
-const rb_data_type_t RepeatedField_type = {
-    "Google::Protobuf::RepeatedField",
-    {RepeatedField_mark, RUBY_DEFAULT_FREE, NULL},
-    .flags = RUBY_TYPED_FREE_IMMEDIATELY,
-};
-
-static RepeatedField* ruby_to_RepeatedField(VALUE _self) {
-  RepeatedField* self;
-  TypedData_Get_Struct(_self, RepeatedField, &RepeatedField_type, self);
-  return self;
-}
-
-static upb_Array* RepeatedField_GetMutable(VALUE _self) {
-  rb_check_frozen(_self);
-  return (upb_Array*)ruby_to_RepeatedField(_self)->array;
-}
-
-VALUE RepeatedField_alloc(VALUE klass) {
-  RepeatedField* self = ALLOC(RepeatedField);
-  self->arena = Qnil;
-  self->type_class = Qnil;
-  self->array = NULL;
-  return TypedData_Wrap_Struct(klass, &RepeatedField_type, self);
-}
-
-VALUE RepeatedField_GetRubyWrapper(upb_Array* array, TypeInfo type_info,
-                                   VALUE arena) {
-  PBRUBY_ASSERT(array);
-  VALUE val = ObjectCache_Get(array);
-
-  if (val == Qnil) {
-    val = RepeatedField_alloc(cRepeatedField);
-    RepeatedField* self;
-    ObjectCache_Add(array, val);
-    TypedData_Get_Struct(val, RepeatedField, &RepeatedField_type, self);
-    self->array = array;
-    self->arena = arena;
-    self->type_info = type_info;
-    if (self->type_info.type == kUpb_CType_Message) {
-      self->type_class = Descriptor_DefToClass(type_info.def.msgdef);
-    }
-  }
-
-  PBRUBY_ASSERT(ruby_to_RepeatedField(val)->type_info.type == type_info.type);
-  PBRUBY_ASSERT(ruby_to_RepeatedField(val)->type_info.def.msgdef ==
-                type_info.def.msgdef);
-  return val;
-}
-
-static VALUE RepeatedField_new_this_type(RepeatedField* from) {
-  VALUE arena_rb = Arena_new();
-  upb_Array* array = upb_Array_New(Arena_get(arena_rb), from->type_info.type);
-  VALUE ret = RepeatedField_GetRubyWrapper(array, from->type_info, arena_rb);
-  PBRUBY_ASSERT(ruby_to_RepeatedField(ret)->type_class == from->type_class);
-  return ret;
-}
-
-void RepeatedField_Inspect(StringBuilder* b, const upb_Array* array,
-                           TypeInfo info) {
-  bool first = true;
-  StringBuilder_Printf(b, "[");
-  size_t n = array ? upb_Array_Size(array) : 0;
-  for (size_t i = 0; i < n; i++) {
-    if (first) {
-      first = false;
-    } else {
-      StringBuilder_Printf(b, ", ");
-    }
-    StringBuilder_PrintMsgval(b, upb_Array_Get(array, i), info);
-  }
-  StringBuilder_Printf(b, "]");
-}
-
-VALUE RepeatedField_deep_copy(VALUE _self) {
-  RepeatedField* self = ruby_to_RepeatedField(_self);
-  VALUE new_rptfield = RepeatedField_new_this_type(self);
-  RepeatedField* new_self = ruby_to_RepeatedField(new_rptfield);
-  VALUE arena_rb = new_self->arena;
-  upb_Array* new_array = RepeatedField_GetMutable(new_rptfield);
-  upb_Arena* arena = Arena_get(arena_rb);
-  size_t elements = upb_Array_Size(self->array);
-
-  upb_Array_Resize(new_array, elements, arena);
-
-  size_t size = upb_Array_Size(self->array);
-  for (size_t i = 0; i < size; i++) {
-    upb_MessageValue msgval = upb_Array_Get(self->array, i);
-    upb_MessageValue copy = Msgval_DeepCopy(msgval, self->type_info, arena);
-    upb_Array_Set(new_array, i, copy);
-  }
-
-  return new_rptfield;
-}
-
-const upb_Array* RepeatedField_GetUpbArray(VALUE val, const upb_FieldDef* field,
-                                           upb_Arena* arena) {
-  RepeatedField* self;
-  TypeInfo type_info = TypeInfo_get(field);
-
-  if (!RB_TYPE_P(val, T_DATA) || !RTYPEDDATA_P(val) ||
-      RTYPEDDATA_TYPE(val) != &RepeatedField_type) {
-    rb_raise(cTypeError, "Expected repeated field array");
-  }
-
-  self = ruby_to_RepeatedField(val);
-  if (self->type_info.type != type_info.type) {
-    rb_raise(cTypeError, "Repeated field array has wrong element type");
-  }
-
-  if (self->type_info.def.msgdef != type_info.def.msgdef) {
-    rb_raise(cTypeError, "Repeated field array has wrong message/enum class");
-  }
-
-  Arena_fuse(self->arena, arena);
-  return self->array;
-}
-
-static int index_position(VALUE _index, RepeatedField* repeated_field) {
-  int index = NUM2INT(_index);
-  if (index < 0) index += upb_Array_Size(repeated_field->array);
-  return index;
-}
-
-static VALUE RepeatedField_subarray(RepeatedField* self, long beg, long len) {
-  size_t size = upb_Array_Size(self->array);
-  VALUE ary = rb_ary_new2(size);
-  long i;
-
-  for (i = beg; i < beg + len; i++) {
-    upb_MessageValue msgval = upb_Array_Get(self->array, i);
-    VALUE elem = Convert_UpbToRuby(msgval, self->type_info, self->arena);
-    rb_ary_push(ary, elem);
-  }
-  return ary;
-}
-
-/*
- * call-seq:
- *     RepeatedField.each(&block)
- *
- * Invokes the block once for each element of the repeated field. RepeatedField
- * also includes Enumerable; combined with this method, the repeated field thus
- * acts like an ordinary Ruby sequence.
- */
-static VALUE RepeatedField_each(VALUE _self) {
-  RepeatedField* self = ruby_to_RepeatedField(_self);
-  int size = upb_Array_Size(self->array);
-  int i;
-
-  for (i = 0; i < size; i++) {
-    upb_MessageValue msgval = upb_Array_Get(self->array, i);
-    VALUE val = Convert_UpbToRuby(msgval, self->type_info, self->arena);
-    rb_yield(val);
-  }
-  return _self;
-}
-
-/*
- * call-seq:
- *     RepeatedField.[](index) => value
- *
- * Accesses the element at the given index. Returns nil on out-of-bounds
- */
-static VALUE RepeatedField_index(int argc, VALUE* argv, VALUE _self) {
-  RepeatedField* self = ruby_to_RepeatedField(_self);
-  long size = upb_Array_Size(self->array);
-
-  VALUE arg = argv[0];
-  long beg, len;
-
-  if (argc == 1) {
-    if (FIXNUM_P(arg)) {
-      /* standard case */
-      upb_MessageValue msgval;
-      int index = index_position(argv[0], self);
-      if (index < 0 || (size_t)index >= upb_Array_Size(self->array)) {
-        return Qnil;
-      }
-      msgval = upb_Array_Get(self->array, index);
-      return Convert_UpbToRuby(msgval, self->type_info, self->arena);
-    } else {
-      /* check if idx is Range */
-      switch (rb_range_beg_len(arg, &beg, &len, size, 0)) {
-        case Qfalse:
-          break;
-        case Qnil:
-          return Qnil;
-        default:
-          return RepeatedField_subarray(self, beg, len);
-      }
-    }
-  }
-
-  /* assume 2 arguments */
-  beg = NUM2LONG(argv[0]);
-  len = NUM2LONG(argv[1]);
-  if (beg < 0) {
-    beg += size;
-  }
-  if (beg >= size) {
-    return Qnil;
-  }
-  return RepeatedField_subarray(self, beg, len);
-}
-
-/*
- * call-seq:
- *     RepeatedField.[]=(index, value)
- *
- * Sets the element at the given index. On out-of-bounds assignments, extends
- * the array and fills the hole (if any) with default values.
- */
-static VALUE RepeatedField_index_set(VALUE _self, VALUE _index, VALUE val) {
-  RepeatedField* self = ruby_to_RepeatedField(_self);
-  int size = upb_Array_Size(self->array);
-  upb_Array* array = RepeatedField_GetMutable(_self);
-  upb_Arena* arena = Arena_get(self->arena);
-  upb_MessageValue msgval = Convert_RubyToUpb(val, "", self->type_info, arena);
-
-  int index = index_position(_index, self);
-  if (index < 0 || index >= (INT_MAX - 1)) {
-    return Qnil;
-  }
-
-  if (index >= size) {
-    upb_Array_Resize(array, index + 1, arena);
-    upb_MessageValue fill;
-    memset(&fill, 0, sizeof(fill));
-    for (int i = size; i < index; i++) {
-      // Fill default values.
-      // TODO(haberman): should this happen at the upb level?
-      upb_Array_Set(array, i, fill);
-    }
-  }
-
-  upb_Array_Set(array, index, msgval);
-  return Qnil;
-}
-
-/*
- * call-seq:
- *     RepeatedField.push(value, ...)
- *
- * Adds a new element to the repeated field.
- */
-static VALUE RepeatedField_push_vararg(int argc, VALUE* argv, VALUE _self) {
-  RepeatedField* self = ruby_to_RepeatedField(_self);
-  upb_Arena* arena = Arena_get(self->arena);
-  upb_Array* array = RepeatedField_GetMutable(_self);
-  int i;
-
-  for (i = 0; i < argc; i++) {
-    upb_MessageValue msgval =
-        Convert_RubyToUpb(argv[i], "", self->type_info, arena);
-    upb_Array_Append(array, msgval, arena);
-  }
-
-  return _self;
-}
-
-/*
- * call-seq:
- *     RepeatedField.<<(value)
- *
- * Adds a new element to the repeated field.
- */
-static VALUE RepeatedField_push(VALUE _self, VALUE val) {
-  RepeatedField* self = ruby_to_RepeatedField(_self);
-  upb_Arena* arena = Arena_get(self->arena);
-  upb_Array* array = RepeatedField_GetMutable(_self);
-
-  upb_MessageValue msgval = Convert_RubyToUpb(val, "", self->type_info, arena);
-  upb_Array_Append(array, msgval, arena);
-
-  return _self;
-}
-
-/*
- * Private ruby method, used by RepeatedField.pop
- */
-static VALUE RepeatedField_pop_one(VALUE _self) {
-  RepeatedField* self = ruby_to_RepeatedField(_self);
-  size_t size = upb_Array_Size(self->array);
-  upb_Array* array = RepeatedField_GetMutable(_self);
-  upb_MessageValue last;
-  VALUE ret;
-
-  if (size == 0) {
-    return Qnil;
-  }
-
-  last = upb_Array_Get(self->array, size - 1);
-  ret = Convert_UpbToRuby(last, self->type_info, self->arena);
-
-  upb_Array_Resize(array, size - 1, Arena_get(self->arena));
-  return ret;
-}
-
-/*
- * call-seq:
- *     RepeatedField.replace(list)
- *
- * Replaces the contents of the repeated field with the given list of elements.
- */
-static VALUE RepeatedField_replace(VALUE _self, VALUE list) {
-  RepeatedField* self = ruby_to_RepeatedField(_self);
-  upb_Array* array = RepeatedField_GetMutable(_self);
-  int i;
-
-  Check_Type(list, T_ARRAY);
-  upb_Array_Resize(array, 0, Arena_get(self->arena));
-
-  for (i = 0; i < RARRAY_LEN(list); i++) {
-    RepeatedField_push(_self, rb_ary_entry(list, i));
-  }
-
-  return list;
-}
-
-/*
- * call-seq:
- *     RepeatedField.clear
- *
- * Clears (removes all elements from) this repeated field.
- */
-static VALUE RepeatedField_clear(VALUE _self) {
-  RepeatedField* self = ruby_to_RepeatedField(_self);
-  upb_Array* array = RepeatedField_GetMutable(_self);
-  upb_Array_Resize(array, 0, Arena_get(self->arena));
-  return _self;
-}
-
-/*
- * call-seq:
- *     RepeatedField.length
- *
- * Returns the length of this repeated field.
- */
-static VALUE RepeatedField_length(VALUE _self) {
-  RepeatedField* self = ruby_to_RepeatedField(_self);
-  return INT2NUM(upb_Array_Size(self->array));
-}
-
-/*
- * call-seq:
- *     RepeatedField.dup => repeated_field
- *
- * Duplicates this repeated field with a shallow copy. References to all
- * non-primitive element objects (e.g., submessages) are shared.
- */
-static VALUE RepeatedField_dup(VALUE _self) {
-  RepeatedField* self = ruby_to_RepeatedField(_self);
-  VALUE new_rptfield = RepeatedField_new_this_type(self);
-  RepeatedField* new_rptfield_self = ruby_to_RepeatedField(new_rptfield);
-  upb_Array* new_array = RepeatedField_GetMutable(new_rptfield);
-  upb_Arena* arena = Arena_get(new_rptfield_self->arena);
-  int size = upb_Array_Size(self->array);
-  int i;
-
-  Arena_fuse(self->arena, arena);
-
-  for (i = 0; i < size; i++) {
-    upb_MessageValue msgval = upb_Array_Get(self->array, i);
-    upb_Array_Append(new_array, msgval, arena);
-  }
-
-  return new_rptfield;
-}
-
-/*
- * call-seq:
- *     RepeatedField.to_ary => array
- *
- * Used when converted implicitly into array, e.g. compared to an Array.
- * Also called as a fallback of Object#to_a
- */
-VALUE RepeatedField_to_ary(VALUE _self) {
-  RepeatedField* self = ruby_to_RepeatedField(_self);
-  int size = upb_Array_Size(self->array);
-  VALUE ary = rb_ary_new2(size);
-  int i;
-
-  for (i = 0; i < size; i++) {
-    upb_MessageValue msgval = upb_Array_Get(self->array, i);
-    VALUE val = Convert_UpbToRuby(msgval, self->type_info, self->arena);
-    rb_ary_push(ary, val);
-  }
-
-  return ary;
-}
-
-/*
- * call-seq:
- *     RepeatedField.==(other) => boolean
- *
- * Compares this repeated field to another. Repeated fields are equal if their
- * element types are equal, their lengths are equal, and each element is equal.
- * Elements are compared as per normal Ruby semantics, by calling their :==
- * methods (or performing a more efficient comparison for primitive types).
- *
- * Repeated fields with dissimilar element types are never equal, even if value
- * comparison (for example, between integers and floats) would have otherwise
- * indicated that every element has equal value.
- */
-VALUE RepeatedField_eq(VALUE _self, VALUE _other) {
-  RepeatedField* self;
-  RepeatedField* other;
-
-  if (_self == _other) {
-    return Qtrue;
-  }
-
-  if (TYPE(_other) == T_ARRAY) {
-    VALUE self_ary = RepeatedField_to_ary(_self);
-    return rb_equal(self_ary, _other);
-  }
-
-  self = ruby_to_RepeatedField(_self);
-  other = ruby_to_RepeatedField(_other);
-  size_t n = upb_Array_Size(self->array);
-
-  if (self->type_info.type != other->type_info.type ||
-      self->type_class != other->type_class ||
-      upb_Array_Size(other->array) != n) {
-    return Qfalse;
-  }
-
-  for (size_t i = 0; i < n; i++) {
-    upb_MessageValue val1 = upb_Array_Get(self->array, i);
-    upb_MessageValue val2 = upb_Array_Get(other->array, i);
-    if (!Msgval_IsEqual(val1, val2, self->type_info)) {
-      return Qfalse;
-    }
-  }
-
-  return Qtrue;
-}
-
-/*
- * call-seq:
- *     RepeatedField.freeze => self
- *
- * Freezes the repeated field. We have to intercept this so we can pin the Ruby
- * object into memory so we don't forget it's frozen.
- */
-static VALUE RepeatedField_freeze(VALUE _self) {
-  RepeatedField* self = ruby_to_RepeatedField(_self);
-  if (!RB_OBJ_FROZEN(_self)) {
-    Arena_Pin(self->arena, _self);
-    RB_OBJ_FREEZE(_self);
-  }
-  return _self;
-}
-
-/*
- * call-seq:
- *     RepeatedField.hash => hash_value
- *
- * Returns a hash value computed from this repeated field's elements.
- */
-VALUE RepeatedField_hash(VALUE _self) {
-  RepeatedField* self = ruby_to_RepeatedField(_self);
-  uint64_t hash = 0;
-  size_t n = upb_Array_Size(self->array);
-
-  for (size_t i = 0; i < n; i++) {
-    upb_MessageValue val = upb_Array_Get(self->array, i);
-    hash = Msgval_GetHash(val, self->type_info, hash);
-  }
-
-  return LL2NUM(hash);
-}
-
-/*
- * call-seq:
- *     RepeatedField.+(other) => repeated field
- *
- * Returns a new repeated field that contains the concatenated list of this
- * repeated field's elements and other's elements. The other (second) list may
- * be either another repeated field or a Ruby array.
- */
-VALUE RepeatedField_plus(VALUE _self, VALUE list) {
-  VALUE dupped_ = RepeatedField_dup(_self);
-
-  if (TYPE(list) == T_ARRAY) {
-    int i;
-    for (i = 0; i < RARRAY_LEN(list); i++) {
-      VALUE elem = rb_ary_entry(list, i);
-      RepeatedField_push(dupped_, elem);
-    }
-  } else if (RB_TYPE_P(list, T_DATA) && RTYPEDDATA_P(list) &&
-             RTYPEDDATA_TYPE(list) == &RepeatedField_type) {
-    RepeatedField* self = ruby_to_RepeatedField(_self);
-    RepeatedField* list_rptfield = ruby_to_RepeatedField(list);
-    RepeatedField* dupped = ruby_to_RepeatedField(dupped_);
-    upb_Array* dupped_array = RepeatedField_GetMutable(dupped_);
-    upb_Arena* arena = Arena_get(dupped->arena);
-    Arena_fuse(list_rptfield->arena, arena);
-    int size = upb_Array_Size(list_rptfield->array);
-    int i;
-
-    if (self->type_info.type != list_rptfield->type_info.type ||
-        self->type_class != list_rptfield->type_class) {
-      rb_raise(rb_eArgError,
-               "Attempt to append RepeatedField with different element type.");
-    }
-
-    for (i = 0; i < size; i++) {
-      upb_MessageValue msgval = upb_Array_Get(list_rptfield->array, i);
-      upb_Array_Append(dupped_array, msgval, arena);
-    }
-  } else {
-    rb_raise(rb_eArgError, "Unknown type appending to RepeatedField");
-  }
-
-  return dupped_;
-}
-
-/*
- * call-seq:
- *     RepeatedField.concat(other) => self
- *
- * concats the passed in array to self.  Returns a Ruby array.
- */
-VALUE RepeatedField_concat(VALUE _self, VALUE list) {
-  int i;
-
-  Check_Type(list, T_ARRAY);
-  for (i = 0; i < RARRAY_LEN(list); i++) {
-    RepeatedField_push(_self, rb_ary_entry(list, i));
-  }
-  return _self;
-}
-
-/*
- * call-seq:
- *     RepeatedField.new(type, type_class = nil, initial_elems = [])
- *
- * Creates a new repeated field. The provided type must be a Ruby symbol, and
- * can take on the same values as those accepted by FieldDescriptor#type=. If
- * the type is :message or :enum, type_class must be non-nil, and must be the
- * Ruby class or module returned by Descriptor#msgclass or
- * EnumDescriptor#enummodule, respectively. An initial list of elements may also
- * be provided.
- */
-VALUE RepeatedField_init(int argc, VALUE* argv, VALUE _self) {
-  RepeatedField* self = ruby_to_RepeatedField(_self);
-  upb_Arena* arena;
-  VALUE ary = Qnil;
-
-  self->arena = Arena_new();
-  arena = Arena_get(self->arena);
-
-  if (argc < 1) {
-    rb_raise(rb_eArgError, "Expected at least 1 argument.");
-  }
-
-  self->type_info = TypeInfo_FromClass(argc, argv, 0, &self->type_class, &ary);
-  self->array = upb_Array_New(arena, self->type_info.type);
-  ObjectCache_Add(self->array, _self);
-
-  if (ary != Qnil) {
-    if (!RB_TYPE_P(ary, T_ARRAY)) {
-      rb_raise(rb_eArgError, "Expected array as initialize argument");
-    }
-    for (int i = 0; i < RARRAY_LEN(ary); i++) {
-      RepeatedField_push(_self, rb_ary_entry(ary, i));
-    }
-  }
-  return Qnil;
-}
-
-void RepeatedField_register(VALUE module) {
-  VALUE klass = rb_define_class_under(module, "RepeatedField", rb_cObject);
-  rb_define_alloc_func(klass, RepeatedField_alloc);
-  rb_gc_register_address(&cRepeatedField);
-  cRepeatedField = klass;
-
-  rb_define_method(klass, "initialize", RepeatedField_init, -1);
-  rb_define_method(klass, "each", RepeatedField_each, 0);
-  rb_define_method(klass, "[]", RepeatedField_index, -1);
-  rb_define_method(klass, "at", RepeatedField_index, -1);
-  rb_define_method(klass, "[]=", RepeatedField_index_set, 2);
-  rb_define_method(klass, "push", RepeatedField_push_vararg, -1);
-  rb_define_method(klass, "<<", RepeatedField_push, 1);
-  rb_define_private_method(klass, "pop_one", RepeatedField_pop_one, 0);
-  rb_define_method(klass, "replace", RepeatedField_replace, 1);
-  rb_define_method(klass, "clear", RepeatedField_clear, 0);
-  rb_define_method(klass, "length", RepeatedField_length, 0);
-  rb_define_method(klass, "size", RepeatedField_length, 0);
-  rb_define_method(klass, "dup", RepeatedField_dup, 0);
-  // Also define #clone so that we don't inherit Object#clone.
-  rb_define_method(klass, "clone", RepeatedField_dup, 0);
-  rb_define_method(klass, "==", RepeatedField_eq, 1);
-  rb_define_method(klass, "to_ary", RepeatedField_to_ary, 0);
-  rb_define_method(klass, "freeze", RepeatedField_freeze, 0);
-  rb_define_method(klass, "hash", RepeatedField_hash, 0);
-  rb_define_method(klass, "+", RepeatedField_plus, 1);
-  rb_define_method(klass, "concat", RepeatedField_concat, 1);
-  rb_include_module(klass, rb_mEnumerable);
-}
diff --git a/libs/protobuf/ruby/ext/google/protobuf_c/repeated_field.h b/libs/protobuf/ruby/ext/google/protobuf_c/repeated_field.h
deleted file mode 100644
index b058163..0000000
--- a/libs/protobuf/ruby/ext/google/protobuf_c/repeated_field.h
+++ /dev/null
@@ -1,63 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef RUBY_PROTOBUF_REPEATED_FIELD_H_
-#define RUBY_PROTOBUF_REPEATED_FIELD_H_
-
-#include <ruby/ruby.h>
-
-#include "protobuf.h"
-#include "ruby-upb.h"
-
-// Returns a Ruby wrapper object for the given upb_Array, which will be created
-// if one does not exist already.
-VALUE RepeatedField_GetRubyWrapper(upb_Array* msg, TypeInfo type_info,
-                                   VALUE arena);
-
-// Gets the underlying upb_Array for this Ruby RepeatedField object, which must
-// have a type that matches |f|. If this is not a repeated field or the type
-// doesn't match, raises an exception.
-const upb_Array* RepeatedField_GetUpbArray(VALUE value, const upb_FieldDef* f,
-                                           upb_Arena* arena);
-
-// Implements #inspect for this repeated field by appending its contents to |b|.
-void RepeatedField_Inspect(StringBuilder* b, const upb_Array* array,
-                           TypeInfo info);
-
-// Returns a deep copy of this RepeatedField object.
-VALUE RepeatedField_deep_copy(VALUE obj);
-
-// Ruby class of Google::Protobuf::RepeatedField.
-extern VALUE cRepeatedField;
-
-// Call at startup to register all types in this module.
-void RepeatedField_register(VALUE module);
-
-#endif  // RUBY_PROTOBUF_REPEATED_FIELD_H_
diff --git a/libs/protobuf/ruby/ext/google/protobuf_c/ruby-upb.c b/libs/protobuf/ruby/ext/google/protobuf_c/ruby-upb.c
deleted file mode 100755
index 3d3c35b..0000000
--- a/libs/protobuf/ruby/ext/google/protobuf_c/ruby-upb.c
+++ /dev/null
@@ -1,12529 +0,0 @@
-/* Amalgamated source file */
-#include "ruby-upb.h"
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * This is where we define macros used across upb.
- *
- * All of these macros are undef'd in port_undef.inc to avoid leaking them to
- * users.
- *
- * The correct usage is:
- *
- *   #include "upb/foobar.h"
- *   #include "upb/baz.h"
- *
- *   // MUST be last included header.
- *   #include "upb/port_def.inc"
- *
- *   // Code for this file.
- *   // <...>
- *
- *   // Can be omitted for .c files, required for .h.
- *   #include "upb/port_undef.inc"
- *
- * This file is private and must not be included by users!
- */
-
-#if !((defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || \
-      (defined(__cplusplus) && __cplusplus >= 201103L) ||           \
-      (defined(_MSC_VER) && _MSC_VER >= 1900))
-#error upb requires C99 or C++11 or MSVC >= 2015.
-#endif
-
-#include <stdint.h>
-#include <stddef.h>
-
-#if UINTPTR_MAX == 0xffffffff
-#define UPB_SIZE(size32, size64) size32
-#else
-#define UPB_SIZE(size32, size64) size64
-#endif
-
-/* If we always read/write as a consistent type to each address, this shouldn't
- * violate aliasing.
- */
-#define UPB_PTR_AT(msg, ofs, type) ((type*)((char*)(msg) + (ofs)))
-
-#define UPB_READ_ONEOF(msg, fieldtype, offset, case_offset, case_val, default) \
-  *UPB_PTR_AT(msg, case_offset, int) == case_val                              \
-      ? *UPB_PTR_AT(msg, offset, fieldtype)                                   \
-      : default
-
-#define UPB_WRITE_ONEOF(msg, fieldtype, offset, value, case_offset, case_val) \
-  *UPB_PTR_AT(msg, case_offset, int) = case_val;                             \
-  *UPB_PTR_AT(msg, offset, fieldtype) = value;
-
-#define UPB_MAPTYPE_STRING 0
-
-/* UPB_INLINE: inline if possible, emit standalone code if required. */
-#ifdef __cplusplus
-#define UPB_INLINE inline
-#elif defined (__GNUC__) || defined(__clang__)
-#define UPB_INLINE static __inline__
-#else
-#define UPB_INLINE static
-#endif
-
-#define UPB_MALLOC_ALIGN 8
-#define UPB_ALIGN_UP(size, align) (((size) + (align) - 1) / (align) * (align))
-#define UPB_ALIGN_DOWN(size, align) ((size) / (align) * (align))
-#define UPB_ALIGN_MALLOC(size) UPB_ALIGN_UP(size, UPB_MALLOC_ALIGN)
-#define UPB_ALIGN_OF(type) offsetof (struct { char c; type member; }, member)
-
-// Hints to the compiler about likely/unlikely branches.
-#if defined (__GNUC__) || defined(__clang__)
-#define UPB_LIKELY(x) __builtin_expect((bool)(x), 1)
-#define UPB_UNLIKELY(x) __builtin_expect((bool)(x), 0)
-#else
-#define UPB_LIKELY(x) (x)
-#define UPB_UNLIKELY(x) (x)
-#endif
-
-// Macros for function attributes on compilers that support them.
-#ifdef __GNUC__
-#define UPB_FORCEINLINE __inline__ __attribute__((always_inline))
-#define UPB_NOINLINE __attribute__((noinline))
-#define UPB_NORETURN __attribute__((__noreturn__))
-#define UPB_PRINTF(str, first_vararg) __attribute__((format (printf, str, first_vararg)))
-#elif defined(_MSC_VER)
-#define UPB_NOINLINE
-#define UPB_FORCEINLINE
-#define UPB_NORETURN __declspec(noreturn)
-#define UPB_PRINTF(str, first_vararg)
-#else  /* !defined(__GNUC__) */
-#define UPB_FORCEINLINE
-#define UPB_NOINLINE
-#define UPB_NORETURN
-#define UPB_PRINTF(str, first_vararg)
-#endif
-
-#define UPB_MAX(x, y) ((x) > (y) ? (x) : (y))
-#define UPB_MIN(x, y) ((x) < (y) ? (x) : (y))
-
-#define UPB_UNUSED(var) (void)var
-
-// UPB_ASSUME(): in release mode, we tell the compiler to assume this is true.
-#ifdef NDEBUG
-#ifdef __GNUC__
-#define UPB_ASSUME(expr) if (!(expr)) __builtin_unreachable()
-#elif defined _MSC_VER
-#define UPB_ASSUME(expr) if (!(expr)) __assume(0)
-#else
-#define UPB_ASSUME(expr) do {} while (false && (expr))
-#endif
-#else
-#define UPB_ASSUME(expr) assert(expr)
-#endif
-
-/* UPB_ASSERT(): in release mode, we use the expression without letting it be
- * evaluated.  This prevents "unused variable" warnings. */
-#ifdef NDEBUG
-#define UPB_ASSERT(expr) do {} while (false && (expr))
-#else
-#define UPB_ASSERT(expr) assert(expr)
-#endif
-
-#if defined(__GNUC__) || defined(__clang__)
-#define UPB_UNREACHABLE() do { assert(0); __builtin_unreachable(); } while(0)
-#else
-#define UPB_UNREACHABLE() do { assert(0); } while(0)
-#endif
-
-/* UPB_SETJMP() / UPB_LONGJMP(): avoid setting/restoring signal mask. */
-#ifdef __APPLE__
-#define UPB_SETJMP(buf) _setjmp(buf)
-#define UPB_LONGJMP(buf, val) _longjmp(buf, val)
-#else
-#define UPB_SETJMP(buf) setjmp(buf)
-#define UPB_LONGJMP(buf, val) longjmp(buf, val)
-#endif
-
-/* UPB_PTRADD(ptr, ofs): add pointer while avoiding "NULL + 0" UB */
-#define UPB_PTRADD(ptr, ofs) ((ofs) ? (ptr) + (ofs) : (ptr))
-
-/* Configure whether fasttable is switched on or not. *************************/
-
-#ifdef __has_attribute
-#define UPB_HAS_ATTRIBUTE(x) __has_attribute(x)
-#else
-#define UPB_HAS_ATTRIBUTE(x) 0
-#endif
-
-#if UPB_HAS_ATTRIBUTE(musttail)
-#define UPB_MUSTTAIL __attribute__((musttail))
-#else
-#define UPB_MUSTTAIL
-#endif
-
-#undef UPB_HAS_ATTRIBUTE
-
-/* This check is not fully robust: it does not require that we have "musttail"
- * support available. We need tail calls to avoid consuming arbitrary amounts
- * of stack space.
- *
- * GCC/Clang can mostly be trusted to generate tail calls as long as
- * optimization is enabled, but, debug builds will not generate tail calls
- * unless "musttail" is available.
- *
- * We should probably either:
- *   1. require that the compiler supports musttail.
- *   2. add some fallback code for when musttail isn't available (ie. return
- *      instead of tail calling). This is safe and portable, but this comes at
- *      a CPU cost.
- */
-#if (defined(__x86_64__) || defined(__aarch64__)) && defined(__GNUC__)
-#define UPB_FASTTABLE_SUPPORTED 1
-#else
-#define UPB_FASTTABLE_SUPPORTED 0
-#endif
-
-/* define UPB_ENABLE_FASTTABLE to force fast table support.
- * This is useful when we want to ensure we are really getting fasttable,
- * for example for testing or benchmarking. */
-#if defined(UPB_ENABLE_FASTTABLE)
-#if !UPB_FASTTABLE_SUPPORTED
-#error fasttable is x86-64/ARM64 only and requires GCC or Clang.
-#endif
-#define UPB_FASTTABLE 1
-/* Define UPB_TRY_ENABLE_FASTTABLE to use fasttable if possible.
- * This is useful for releasing code that might be used on multiple platforms,
- * for example the PHP or Ruby C extensions. */
-#elif defined(UPB_TRY_ENABLE_FASTTABLE)
-#define UPB_FASTTABLE UPB_FASTTABLE_SUPPORTED
-#else
-#define UPB_FASTTABLE 0
-#endif
-
-/* UPB_FASTTABLE_INIT() allows protos compiled for fasttable to gracefully
- * degrade to non-fasttable if we are using UPB_TRY_ENABLE_FASTTABLE. */
-#if !UPB_FASTTABLE && defined(UPB_TRY_ENABLE_FASTTABLE)
-#define UPB_FASTTABLE_INIT(...)
-#else
-#define UPB_FASTTABLE_INIT(...) __VA_ARGS__
-#endif
-
-#undef UPB_FASTTABLE_SUPPORTED
-
-/* ASAN poisoning (for arena) *************************************************/
-
-#if defined(__SANITIZE_ADDRESS__)
-#define UPB_ASAN 1
-#ifdef __cplusplus
-extern "C" {
-#endif
-void __asan_poison_memory_region(void const volatile *addr, size_t size);
-void __asan_unpoison_memory_region(void const volatile *addr, size_t size);
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-#define UPB_POISON_MEMORY_REGION(addr, size) \
-  __asan_poison_memory_region((addr), (size))
-#define UPB_UNPOISON_MEMORY_REGION(addr, size) \
-  __asan_unpoison_memory_region((addr), (size))
-#else
-#define UPB_ASAN 0
-#define UPB_POISON_MEMORY_REGION(addr, size) \
-  ((void)(addr), (void)(size))
-#define UPB_UNPOISON_MEMORY_REGION(addr, size) \
-  ((void)(addr), (void)(size))
-#endif
-
-/* Disable proto2 arena behavior (TEMPORARY) **********************************/
-
-#ifdef UPB_DISABLE_PROTO2_ENUM_CHECKING
-#define UPB_TREAT_PROTO2_ENUMS_LIKE_PROTO3 1
-#else
-#define UPB_TREAT_PROTO2_ENUMS_LIKE_PROTO3 0
-#endif
-
-/** upb/collections.c ************************************************************/
-
-#include <string.h>
-
-
-/* Strings/bytes are special-cased in maps. */
-static char _upb_CTypeo_mapsize[12] = {
-    0,
-    1,             /* kUpb_CType_Bool */
-    4,             /* kUpb_CType_Float */
-    4,             /* kUpb_CType_Int32 */
-    4,             /* kUpb_CType_UInt32 */
-    4,             /* kUpb_CType_Enum */
-    sizeof(void*), /* kUpb_CType_Message */
-    8,             /* kUpb_CType_Double */
-    8,             /* kUpb_CType_Int64 */
-    8,             /* kUpb_CType_UInt64 */
-    0,             /* kUpb_CType_String */
-    0,             /* kUpb_CType_Bytes */
-};
-
-static const char _upb_CTypeo_sizelg2[12] = {
-    0,
-    0,              /* kUpb_CType_Bool */
-    2,              /* kUpb_CType_Float */
-    2,              /* kUpb_CType_Int32 */
-    2,              /* kUpb_CType_UInt32 */
-    2,              /* kUpb_CType_Enum */
-    UPB_SIZE(2, 3), /* kUpb_CType_Message */
-    3,              /* kUpb_CType_Double */
-    3,              /* kUpb_CType_Int64 */
-    3,              /* kUpb_CType_UInt64 */
-    UPB_SIZE(3, 4), /* kUpb_CType_String */
-    UPB_SIZE(3, 4), /* kUpb_CType_Bytes */
-};
-
-/** upb_Array *****************************************************************/
-
-upb_Array* upb_Array_New(upb_Arena* a, upb_CType type) {
-  return _upb_Array_New(a, 4, _upb_CTypeo_sizelg2[type]);
-}
-
-size_t upb_Array_Size(const upb_Array* arr) { return arr->len; }
-
-upb_MessageValue upb_Array_Get(const upb_Array* arr, size_t i) {
-  upb_MessageValue ret;
-  const char* data = _upb_array_constptr(arr);
-  int lg2 = arr->data & 7;
-  UPB_ASSERT(i < arr->len);
-  memcpy(&ret, data + (i << lg2), 1 << lg2);
-  return ret;
-}
-
-void upb_Array_Set(upb_Array* arr, size_t i, upb_MessageValue val) {
-  char* data = _upb_array_ptr(arr);
-  int lg2 = arr->data & 7;
-  UPB_ASSERT(i < arr->len);
-  memcpy(data + (i << lg2), &val, 1 << lg2);
-}
-
-bool upb_Array_Append(upb_Array* arr, upb_MessageValue val, upb_Arena* arena) {
-  if (!upb_Array_Resize(arr, arr->len + 1, arena)) {
-    return false;
-  }
-  upb_Array_Set(arr, arr->len - 1, val);
-  return true;
-}
-
-void upb_Array_Move(upb_Array* arr, size_t dst_idx, size_t src_idx,
-                    size_t count) {
-  char* data = _upb_array_ptr(arr);
-  int lg2 = arr->data & 7;
-  memmove(&data[dst_idx << lg2], &data[src_idx << lg2], count << lg2);
-}
-
-bool upb_Array_Insert(upb_Array* arr, size_t i, size_t count,
-                      upb_Arena* arena) {
-  UPB_ASSERT(i <= arr->len);
-  UPB_ASSERT(count + arr->len >= count);
-  size_t oldsize = arr->len;
-  if (!upb_Array_Resize(arr, arr->len + count, arena)) {
-    return false;
-  }
-  upb_Array_Move(arr, i + count, i, oldsize - i);
-  return true;
-}
-
-/*
- *              i        end      arr->len
- * |------------|XXXXXXXX|--------|
- */
-void upb_Array_Delete(upb_Array* arr, size_t i, size_t count) {
-  size_t end = i + count;
-  UPB_ASSERT(i <= end);
-  UPB_ASSERT(end <= arr->len);
-  upb_Array_Move(arr, i, end, arr->len - end);
-  arr->len -= count;
-}
-
-bool upb_Array_Resize(upb_Array* arr, size_t size, upb_Arena* arena) {
-  return _upb_Array_Resize(arr, size, arena);
-}
-
-/** upb_Map *******************************************************************/
-
-upb_Map* upb_Map_New(upb_Arena* a, upb_CType key_type, upb_CType value_type) {
-  return _upb_Map_New(a, _upb_CTypeo_mapsize[key_type],
-                      _upb_CTypeo_mapsize[value_type]);
-}
-
-size_t upb_Map_Size(const upb_Map* map) { return _upb_Map_Size(map); }
-
-bool upb_Map_Get(const upb_Map* map, upb_MessageValue key,
-                 upb_MessageValue* val) {
-  return _upb_Map_Get(map, &key, map->key_size, val, map->val_size);
-}
-
-void upb_Map_Clear(upb_Map* map) { _upb_Map_Clear(map); }
-
-upb_MapInsertStatus upb_Map_Insert(upb_Map* map, upb_MessageValue key,
-                                   upb_MessageValue val, upb_Arena* arena) {
-  return (upb_MapInsertStatus)_upb_Map_Insert(map, &key, map->key_size, &val,
-                                              map->val_size, arena);
-}
-
-bool upb_Map_Delete(upb_Map* map, upb_MessageValue key) {
-  return _upb_Map_Delete(map, &key, map->key_size);
-}
-
-bool upb_MapIterator_Next(const upb_Map* map, size_t* iter) {
-  return _upb_map_next(map, iter);
-}
-
-bool upb_MapIterator_Done(const upb_Map* map, size_t iter) {
-  upb_strtable_iter i;
-  UPB_ASSERT(iter != kUpb_Map_Begin);
-  i.t = &map->table;
-  i.index = iter;
-  return upb_strtable_done(&i);
-}
-
-/* Returns the key and value for this entry of the map. */
-upb_MessageValue upb_MapIterator_Key(const upb_Map* map, size_t iter) {
-  upb_strtable_iter i;
-  upb_MessageValue ret;
-  i.t = &map->table;
-  i.index = iter;
-  _upb_map_fromkey(upb_strtable_iter_key(&i), &ret, map->key_size);
-  return ret;
-}
-
-upb_MessageValue upb_MapIterator_Value(const upb_Map* map, size_t iter) {
-  upb_strtable_iter i;
-  upb_MessageValue ret;
-  i.t = &map->table;
-  i.index = iter;
-  _upb_map_fromvalue(upb_strtable_iter_value(&i), &ret, map->val_size);
-  return ret;
-}
-
-/* void upb_MapIterator_SetValue(upb_Map *map, size_t iter, upb_MessageValue
- * value); */
-
-/** bazel-out/k8-fastbuild/bin/external/com_google_protobuf/google/protobuf/descriptor.upb.c ************************************************************//* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     google/protobuf/descriptor.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#include <stddef.h>
-
-
-static const upb_MiniTable_Sub google_protobuf_FileDescriptorSet_submsgs[1] = {
-  {.submsg = &google_protobuf_FileDescriptorProto_msginit},
-};
-
-static const upb_MiniTable_Field google_protobuf_FileDescriptorSet__fields[1] = {
-  {1, UPB_SIZE(0, 0), UPB_SIZE(0, 0), 0, 11, kUpb_FieldMode_Array | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_FileDescriptorSet_msginit = {
-  &google_protobuf_FileDescriptorSet_submsgs[0],
-  &google_protobuf_FileDescriptorSet__fields[0],
-  UPB_SIZE(8, 8), 1, kUpb_ExtMode_NonExtendable, 1, 255, 0,
-};
-
-static const upb_MiniTable_Sub google_protobuf_FileDescriptorProto_submsgs[6] = {
-  {.submsg = &google_protobuf_DescriptorProto_msginit},
-  {.submsg = &google_protobuf_EnumDescriptorProto_msginit},
-  {.submsg = &google_protobuf_ServiceDescriptorProto_msginit},
-  {.submsg = &google_protobuf_FieldDescriptorProto_msginit},
-  {.submsg = &google_protobuf_FileOptions_msginit},
-  {.submsg = &google_protobuf_SourceCodeInfo_msginit},
-};
-
-static const upb_MiniTable_Field google_protobuf_FileDescriptorProto__fields[12] = {
-  {1, UPB_SIZE(4, 8), UPB_SIZE(1, 1), kUpb_NoSub, 12, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(12, 24), UPB_SIZE(2, 2), kUpb_NoSub, 12, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(20, 40), UPB_SIZE(0, 0), kUpb_NoSub, 12, kUpb_FieldMode_Array | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(24, 48), UPB_SIZE(0, 0), 0, 11, kUpb_FieldMode_Array | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(28, 56), UPB_SIZE(0, 0), 1, 11, kUpb_FieldMode_Array | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(32, 64), UPB_SIZE(0, 0), 2, 11, kUpb_FieldMode_Array | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
-  {7, UPB_SIZE(36, 72), UPB_SIZE(0, 0), 3, 11, kUpb_FieldMode_Array | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
-  {8, UPB_SIZE(40, 80), UPB_SIZE(3, 3), 4, 11, kUpb_FieldMode_Scalar | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
-  {9, UPB_SIZE(44, 88), UPB_SIZE(4, 4), 5, 11, kUpb_FieldMode_Scalar | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
-  {10, UPB_SIZE(48, 96), UPB_SIZE(0, 0), kUpb_NoSub, 5, kUpb_FieldMode_Array | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
-  {11, UPB_SIZE(52, 104), UPB_SIZE(0, 0), kUpb_NoSub, 5, kUpb_FieldMode_Array | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
-  {12, UPB_SIZE(56, 112), UPB_SIZE(5, 5), kUpb_NoSub, 12, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_FileDescriptorProto_msginit = {
-  &google_protobuf_FileDescriptorProto_submsgs[0],
-  &google_protobuf_FileDescriptorProto__fields[0],
-  UPB_SIZE(64, 128), 12, kUpb_ExtMode_NonExtendable, 12, 255, 0,
-};
-
-static const upb_MiniTable_Sub google_protobuf_DescriptorProto_submsgs[8] = {
-  {.submsg = &google_protobuf_FieldDescriptorProto_msginit},
-  {.submsg = &google_protobuf_DescriptorProto_msginit},
-  {.submsg = &google_protobuf_EnumDescriptorProto_msginit},
-  {.submsg = &google_protobuf_DescriptorProto_ExtensionRange_msginit},
-  {.submsg = &google_protobuf_FieldDescriptorProto_msginit},
-  {.submsg = &google_protobuf_MessageOptions_msginit},
-  {.submsg = &google_protobuf_OneofDescriptorProto_msginit},
-  {.submsg = &google_protobuf_DescriptorProto_ReservedRange_msginit},
-};
-
-static const upb_MiniTable_Field google_protobuf_DescriptorProto__fields[10] = {
-  {1, UPB_SIZE(4, 8), UPB_SIZE(1, 1), kUpb_NoSub, 12, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(12, 24), UPB_SIZE(0, 0), 0, 11, kUpb_FieldMode_Array | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(16, 32), UPB_SIZE(0, 0), 1, 11, kUpb_FieldMode_Array | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(20, 40), UPB_SIZE(0, 0), 2, 11, kUpb_FieldMode_Array | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(24, 48), UPB_SIZE(0, 0), 3, 11, kUpb_FieldMode_Array | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(28, 56), UPB_SIZE(0, 0), 4, 11, kUpb_FieldMode_Array | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
-  {7, UPB_SIZE(32, 64), UPB_SIZE(2, 2), 5, 11, kUpb_FieldMode_Scalar | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
-  {8, UPB_SIZE(36, 72), UPB_SIZE(0, 0), 6, 11, kUpb_FieldMode_Array | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
-  {9, UPB_SIZE(40, 80), UPB_SIZE(0, 0), 7, 11, kUpb_FieldMode_Array | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
-  {10, UPB_SIZE(44, 88), UPB_SIZE(0, 0), kUpb_NoSub, 12, kUpb_FieldMode_Array | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_DescriptorProto_msginit = {
-  &google_protobuf_DescriptorProto_submsgs[0],
-  &google_protobuf_DescriptorProto__fields[0],
-  UPB_SIZE(48, 96), 10, kUpb_ExtMode_NonExtendable, 10, 255, 0,
-};
-
-static const upb_MiniTable_Sub google_protobuf_DescriptorProto_ExtensionRange_submsgs[1] = {
-  {.submsg = &google_protobuf_ExtensionRangeOptions_msginit},
-};
-
-static const upb_MiniTable_Field google_protobuf_DescriptorProto_ExtensionRange__fields[3] = {
-  {1, UPB_SIZE(4, 4), UPB_SIZE(1, 1), kUpb_NoSub, 5, kUpb_FieldMode_Scalar | (kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 8), UPB_SIZE(2, 2), kUpb_NoSub, 5, kUpb_FieldMode_Scalar | (kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(12, 16), UPB_SIZE(3, 3), 0, 11, kUpb_FieldMode_Scalar | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_DescriptorProto_ExtensionRange_msginit = {
-  &google_protobuf_DescriptorProto_ExtensionRange_submsgs[0],
-  &google_protobuf_DescriptorProto_ExtensionRange__fields[0],
-  UPB_SIZE(16, 24), 3, kUpb_ExtMode_NonExtendable, 3, 255, 0,
-};
-
-static const upb_MiniTable_Field google_protobuf_DescriptorProto_ReservedRange__fields[2] = {
-  {1, UPB_SIZE(4, 4), UPB_SIZE(1, 1), kUpb_NoSub, 5, kUpb_FieldMode_Scalar | (kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 8), UPB_SIZE(2, 2), kUpb_NoSub, 5, kUpb_FieldMode_Scalar | (kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_DescriptorProto_ReservedRange_msginit = {
-  NULL,
-  &google_protobuf_DescriptorProto_ReservedRange__fields[0],
-  UPB_SIZE(16, 16), 2, kUpb_ExtMode_NonExtendable, 2, 255, 0,
-};
-
-static const upb_MiniTable_Sub google_protobuf_ExtensionRangeOptions_submsgs[1] = {
-  {.submsg = &google_protobuf_UninterpretedOption_msginit},
-};
-
-static const upb_MiniTable_Field google_protobuf_ExtensionRangeOptions__fields[1] = {
-  {999, UPB_SIZE(0, 0), UPB_SIZE(0, 0), 0, 11, kUpb_FieldMode_Array | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_ExtensionRangeOptions_msginit = {
-  &google_protobuf_ExtensionRangeOptions_submsgs[0],
-  &google_protobuf_ExtensionRangeOptions__fields[0],
-  UPB_SIZE(8, 8), 1, kUpb_ExtMode_Extendable, 0, 255, 0,
-};
-
-static const upb_MiniTable_Sub google_protobuf_FieldDescriptorProto_submsgs[3] = {
-  {.subenum = &google_protobuf_FieldDescriptorProto_Label_enuminit},
-  {.subenum = &google_protobuf_FieldDescriptorProto_Type_enuminit},
-  {.submsg = &google_protobuf_FieldOptions_msginit},
-};
-
-static const upb_MiniTable_Field google_protobuf_FieldDescriptorProto__fields[11] = {
-  {1, UPB_SIZE(24, 24), UPB_SIZE(1, 1), kUpb_NoSub, 12, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(32, 40), UPB_SIZE(2, 2), kUpb_NoSub, 12, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(4, 4), UPB_SIZE(3, 3), kUpb_NoSub, 5, kUpb_FieldMode_Scalar | (kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(8, 8), UPB_SIZE(4, 4), 0, 14, kUpb_FieldMode_Scalar | (kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(12, 12), UPB_SIZE(5, 5), 1, 14, kUpb_FieldMode_Scalar | (kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(40, 56), UPB_SIZE(6, 6), kUpb_NoSub, 12, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {7, UPB_SIZE(48, 72), UPB_SIZE(7, 7), kUpb_NoSub, 12, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {8, UPB_SIZE(56, 88), UPB_SIZE(8, 8), 2, 11, kUpb_FieldMode_Scalar | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
-  {9, UPB_SIZE(16, 16), UPB_SIZE(9, 9), kUpb_NoSub, 5, kUpb_FieldMode_Scalar | (kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {10, UPB_SIZE(60, 96), UPB_SIZE(10, 10), kUpb_NoSub, 12, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {17, UPB_SIZE(20, 20), UPB_SIZE(11, 11), kUpb_NoSub, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_FieldDescriptorProto_msginit = {
-  &google_protobuf_FieldDescriptorProto_submsgs[0],
-  &google_protobuf_FieldDescriptorProto__fields[0],
-  UPB_SIZE(72, 112), 11, kUpb_ExtMode_NonExtendable, 10, 255, 0,
-};
-
-static const upb_MiniTable_Sub google_protobuf_OneofDescriptorProto_submsgs[1] = {
-  {.submsg = &google_protobuf_OneofOptions_msginit},
-};
-
-static const upb_MiniTable_Field google_protobuf_OneofDescriptorProto__fields[2] = {
-  {1, UPB_SIZE(4, 8), UPB_SIZE(1, 1), kUpb_NoSub, 12, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(12, 24), UPB_SIZE(2, 2), 0, 11, kUpb_FieldMode_Scalar | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_OneofDescriptorProto_msginit = {
-  &google_protobuf_OneofDescriptorProto_submsgs[0],
-  &google_protobuf_OneofDescriptorProto__fields[0],
-  UPB_SIZE(16, 32), 2, kUpb_ExtMode_NonExtendable, 2, 255, 0,
-};
-
-static const upb_MiniTable_Sub google_protobuf_EnumDescriptorProto_submsgs[3] = {
-  {.submsg = &google_protobuf_EnumValueDescriptorProto_msginit},
-  {.submsg = &google_protobuf_EnumOptions_msginit},
-  {.submsg = &google_protobuf_EnumDescriptorProto_EnumReservedRange_msginit},
-};
-
-static const upb_MiniTable_Field google_protobuf_EnumDescriptorProto__fields[5] = {
-  {1, UPB_SIZE(4, 8), UPB_SIZE(1, 1), kUpb_NoSub, 12, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(12, 24), UPB_SIZE(0, 0), 0, 11, kUpb_FieldMode_Array | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(16, 32), UPB_SIZE(2, 2), 1, 11, kUpb_FieldMode_Scalar | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(20, 40), UPB_SIZE(0, 0), 2, 11, kUpb_FieldMode_Array | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(24, 48), UPB_SIZE(0, 0), kUpb_NoSub, 12, kUpb_FieldMode_Array | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_EnumDescriptorProto_msginit = {
-  &google_protobuf_EnumDescriptorProto_submsgs[0],
-  &google_protobuf_EnumDescriptorProto__fields[0],
-  UPB_SIZE(32, 56), 5, kUpb_ExtMode_NonExtendable, 5, 255, 0,
-};
-
-static const upb_MiniTable_Field google_protobuf_EnumDescriptorProto_EnumReservedRange__fields[2] = {
-  {1, UPB_SIZE(4, 4), UPB_SIZE(1, 1), kUpb_NoSub, 5, kUpb_FieldMode_Scalar | (kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 8), UPB_SIZE(2, 2), kUpb_NoSub, 5, kUpb_FieldMode_Scalar | (kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_EnumDescriptorProto_EnumReservedRange_msginit = {
-  NULL,
-  &google_protobuf_EnumDescriptorProto_EnumReservedRange__fields[0],
-  UPB_SIZE(16, 16), 2, kUpb_ExtMode_NonExtendable, 2, 255, 0,
-};
-
-static const upb_MiniTable_Sub google_protobuf_EnumValueDescriptorProto_submsgs[1] = {
-  {.submsg = &google_protobuf_EnumValueOptions_msginit},
-};
-
-static const upb_MiniTable_Field google_protobuf_EnumValueDescriptorProto__fields[3] = {
-  {1, UPB_SIZE(8, 8), UPB_SIZE(1, 1), kUpb_NoSub, 12, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(4, 4), UPB_SIZE(2, 2), kUpb_NoSub, 5, kUpb_FieldMode_Scalar | (kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(16, 24), UPB_SIZE(3, 3), 0, 11, kUpb_FieldMode_Scalar | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_EnumValueDescriptorProto_msginit = {
-  &google_protobuf_EnumValueDescriptorProto_submsgs[0],
-  &google_protobuf_EnumValueDescriptorProto__fields[0],
-  UPB_SIZE(24, 32), 3, kUpb_ExtMode_NonExtendable, 3, 255, 0,
-};
-
-static const upb_MiniTable_Sub google_protobuf_ServiceDescriptorProto_submsgs[2] = {
-  {.submsg = &google_protobuf_MethodDescriptorProto_msginit},
-  {.submsg = &google_protobuf_ServiceOptions_msginit},
-};
-
-static const upb_MiniTable_Field google_protobuf_ServiceDescriptorProto__fields[3] = {
-  {1, UPB_SIZE(4, 8), UPB_SIZE(1, 1), kUpb_NoSub, 12, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(12, 24), UPB_SIZE(0, 0), 0, 11, kUpb_FieldMode_Array | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(16, 32), UPB_SIZE(2, 2), 1, 11, kUpb_FieldMode_Scalar | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_ServiceDescriptorProto_msginit = {
-  &google_protobuf_ServiceDescriptorProto_submsgs[0],
-  &google_protobuf_ServiceDescriptorProto__fields[0],
-  UPB_SIZE(24, 40), 3, kUpb_ExtMode_NonExtendable, 3, 255, 0,
-};
-
-static const upb_MiniTable_Sub google_protobuf_MethodDescriptorProto_submsgs[1] = {
-  {.submsg = &google_protobuf_MethodOptions_msginit},
-};
-
-static const upb_MiniTable_Field google_protobuf_MethodDescriptorProto__fields[6] = {
-  {1, UPB_SIZE(4, 8), UPB_SIZE(1, 1), kUpb_NoSub, 12, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(12, 24), UPB_SIZE(2, 2), kUpb_NoSub, 12, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(20, 40), UPB_SIZE(3, 3), kUpb_NoSub, 12, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(28, 56), UPB_SIZE(4, 4), 0, 11, kUpb_FieldMode_Scalar | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(1, 1), UPB_SIZE(5, 5), kUpb_NoSub, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(2, 2), UPB_SIZE(6, 6), kUpb_NoSub, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_MethodDescriptorProto_msginit = {
-  &google_protobuf_MethodDescriptorProto_submsgs[0],
-  &google_protobuf_MethodDescriptorProto__fields[0],
-  UPB_SIZE(32, 64), 6, kUpb_ExtMode_NonExtendable, 6, 255, 0,
-};
-
-static const upb_MiniTable_Sub google_protobuf_FileOptions_submsgs[2] = {
-  {.subenum = &google_protobuf_FileOptions_OptimizeMode_enuminit},
-  {.submsg = &google_protobuf_UninterpretedOption_msginit},
-};
-
-static const upb_MiniTable_Field google_protobuf_FileOptions__fields[21] = {
-  {1, UPB_SIZE(20, 24), UPB_SIZE(1, 1), kUpb_NoSub, 12, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {8, UPB_SIZE(28, 40), UPB_SIZE(2, 2), kUpb_NoSub, 12, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {9, UPB_SIZE(4, 4), UPB_SIZE(3, 3), 0, 14, kUpb_FieldMode_Scalar | (kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {10, UPB_SIZE(8, 8), UPB_SIZE(4, 4), kUpb_NoSub, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {11, UPB_SIZE(36, 56), UPB_SIZE(5, 5), kUpb_NoSub, 12, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {16, UPB_SIZE(9, 9), UPB_SIZE(6, 6), kUpb_NoSub, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {17, UPB_SIZE(10, 10), UPB_SIZE(7, 7), kUpb_NoSub, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {18, UPB_SIZE(11, 11), UPB_SIZE(8, 8), kUpb_NoSub, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {20, UPB_SIZE(12, 12), UPB_SIZE(9, 9), kUpb_NoSub, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {23, UPB_SIZE(13, 13), UPB_SIZE(10, 10), kUpb_NoSub, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {27, UPB_SIZE(14, 14), UPB_SIZE(11, 11), kUpb_NoSub, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {31, UPB_SIZE(15, 15), UPB_SIZE(12, 12), kUpb_NoSub, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {36, UPB_SIZE(44, 72), UPB_SIZE(13, 13), kUpb_NoSub, 12, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {37, UPB_SIZE(52, 88), UPB_SIZE(14, 14), kUpb_NoSub, 12, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {39, UPB_SIZE(60, 104), UPB_SIZE(15, 15), kUpb_NoSub, 12, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {40, UPB_SIZE(68, 120), UPB_SIZE(16, 16), kUpb_NoSub, 12, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {41, UPB_SIZE(76, 136), UPB_SIZE(17, 17), kUpb_NoSub, 12, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {42, UPB_SIZE(16, 16), UPB_SIZE(18, 18), kUpb_NoSub, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {44, UPB_SIZE(84, 152), UPB_SIZE(19, 19), kUpb_NoSub, 12, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {45, UPB_SIZE(92, 168), UPB_SIZE(20, 20), kUpb_NoSub, 12, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {999, UPB_SIZE(100, 184), UPB_SIZE(0, 0), 1, 11, kUpb_FieldMode_Array | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_FileOptions_msginit = {
-  &google_protobuf_FileOptions_submsgs[0],
-  &google_protobuf_FileOptions__fields[0],
-  UPB_SIZE(104, 192), 21, kUpb_ExtMode_Extendable, 1, 255, 0,
-};
-
-static const upb_MiniTable_Sub google_protobuf_MessageOptions_submsgs[1] = {
-  {.submsg = &google_protobuf_UninterpretedOption_msginit},
-};
-
-static const upb_MiniTable_Field google_protobuf_MessageOptions__fields[5] = {
-  {1, UPB_SIZE(1, 1), UPB_SIZE(1, 1), kUpb_NoSub, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(2, 2), UPB_SIZE(2, 2), kUpb_NoSub, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(3, 3), UPB_SIZE(3, 3), kUpb_NoSub, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {7, UPB_SIZE(4, 4), UPB_SIZE(4, 4), kUpb_NoSub, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {999, UPB_SIZE(8, 8), UPB_SIZE(0, 0), 0, 11, kUpb_FieldMode_Array | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_MessageOptions_msginit = {
-  &google_protobuf_MessageOptions_submsgs[0],
-  &google_protobuf_MessageOptions__fields[0],
-  UPB_SIZE(16, 16), 5, kUpb_ExtMode_Extendable, 3, 255, 0,
-};
-
-static const upb_MiniTable_Sub google_protobuf_FieldOptions_submsgs[3] = {
-  {.subenum = &google_protobuf_FieldOptions_CType_enuminit},
-  {.subenum = &google_protobuf_FieldOptions_JSType_enuminit},
-  {.submsg = &google_protobuf_UninterpretedOption_msginit},
-};
-
-static const upb_MiniTable_Field google_protobuf_FieldOptions__fields[8] = {
-  {1, UPB_SIZE(4, 4), UPB_SIZE(1, 1), 0, 14, kUpb_FieldMode_Scalar | (kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 8), UPB_SIZE(2, 2), kUpb_NoSub, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(9, 9), UPB_SIZE(3, 3), kUpb_NoSub, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(10, 10), UPB_SIZE(4, 4), kUpb_NoSub, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(12, 12), UPB_SIZE(5, 5), 1, 14, kUpb_FieldMode_Scalar | (kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {10, UPB_SIZE(16, 16), UPB_SIZE(6, 6), kUpb_NoSub, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {15, UPB_SIZE(17, 17), UPB_SIZE(7, 7), kUpb_NoSub, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {999, UPB_SIZE(20, 24), UPB_SIZE(0, 0), 2, 11, kUpb_FieldMode_Array | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_FieldOptions_msginit = {
-  &google_protobuf_FieldOptions_submsgs[0],
-  &google_protobuf_FieldOptions__fields[0],
-  UPB_SIZE(24, 32), 8, kUpb_ExtMode_Extendable, 3, 255, 0,
-};
-
-static const upb_MiniTable_Sub google_protobuf_OneofOptions_submsgs[1] = {
-  {.submsg = &google_protobuf_UninterpretedOption_msginit},
-};
-
-static const upb_MiniTable_Field google_protobuf_OneofOptions__fields[1] = {
-  {999, UPB_SIZE(0, 0), UPB_SIZE(0, 0), 0, 11, kUpb_FieldMode_Array | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_OneofOptions_msginit = {
-  &google_protobuf_OneofOptions_submsgs[0],
-  &google_protobuf_OneofOptions__fields[0],
-  UPB_SIZE(8, 8), 1, kUpb_ExtMode_Extendable, 0, 255, 0,
-};
-
-static const upb_MiniTable_Sub google_protobuf_EnumOptions_submsgs[1] = {
-  {.submsg = &google_protobuf_UninterpretedOption_msginit},
-};
-
-static const upb_MiniTable_Field google_protobuf_EnumOptions__fields[3] = {
-  {2, UPB_SIZE(1, 1), UPB_SIZE(1, 1), kUpb_NoSub, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(2, 2), UPB_SIZE(2, 2), kUpb_NoSub, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {999, UPB_SIZE(4, 8), UPB_SIZE(0, 0), 0, 11, kUpb_FieldMode_Array | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_EnumOptions_msginit = {
-  &google_protobuf_EnumOptions_submsgs[0],
-  &google_protobuf_EnumOptions__fields[0],
-  UPB_SIZE(8, 16), 3, kUpb_ExtMode_Extendable, 0, 255, 0,
-};
-
-static const upb_MiniTable_Sub google_protobuf_EnumValueOptions_submsgs[1] = {
-  {.submsg = &google_protobuf_UninterpretedOption_msginit},
-};
-
-static const upb_MiniTable_Field google_protobuf_EnumValueOptions__fields[2] = {
-  {1, UPB_SIZE(1, 1), UPB_SIZE(1, 1), kUpb_NoSub, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {999, UPB_SIZE(4, 8), UPB_SIZE(0, 0), 0, 11, kUpb_FieldMode_Array | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_EnumValueOptions_msginit = {
-  &google_protobuf_EnumValueOptions_submsgs[0],
-  &google_protobuf_EnumValueOptions__fields[0],
-  UPB_SIZE(8, 16), 2, kUpb_ExtMode_Extendable, 1, 255, 0,
-};
-
-static const upb_MiniTable_Sub google_protobuf_ServiceOptions_submsgs[1] = {
-  {.submsg = &google_protobuf_UninterpretedOption_msginit},
-};
-
-static const upb_MiniTable_Field google_protobuf_ServiceOptions__fields[2] = {
-  {33, UPB_SIZE(1, 1), UPB_SIZE(1, 1), kUpb_NoSub, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {999, UPB_SIZE(4, 8), UPB_SIZE(0, 0), 0, 11, kUpb_FieldMode_Array | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_ServiceOptions_msginit = {
-  &google_protobuf_ServiceOptions_submsgs[0],
-  &google_protobuf_ServiceOptions__fields[0],
-  UPB_SIZE(8, 16), 2, kUpb_ExtMode_Extendable, 0, 255, 0,
-};
-
-static const upb_MiniTable_Sub google_protobuf_MethodOptions_submsgs[2] = {
-  {.subenum = &google_protobuf_MethodOptions_IdempotencyLevel_enuminit},
-  {.submsg = &google_protobuf_UninterpretedOption_msginit},
-};
-
-static const upb_MiniTable_Field google_protobuf_MethodOptions__fields[3] = {
-  {33, UPB_SIZE(1, 1), UPB_SIZE(1, 1), kUpb_NoSub, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-  {34, UPB_SIZE(4, 4), UPB_SIZE(2, 2), 0, 14, kUpb_FieldMode_Scalar | (kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {999, UPB_SIZE(8, 8), UPB_SIZE(0, 0), 1, 11, kUpb_FieldMode_Array | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_MethodOptions_msginit = {
-  &google_protobuf_MethodOptions_submsgs[0],
-  &google_protobuf_MethodOptions__fields[0],
-  UPB_SIZE(16, 16), 3, kUpb_ExtMode_Extendable, 0, 255, 0,
-};
-
-static const upb_MiniTable_Sub google_protobuf_UninterpretedOption_submsgs[1] = {
-  {.submsg = &google_protobuf_UninterpretedOption_NamePart_msginit},
-};
-
-static const upb_MiniTable_Field google_protobuf_UninterpretedOption__fields[7] = {
-  {2, UPB_SIZE(4, 8), UPB_SIZE(0, 0), 0, 11, kUpb_FieldMode_Array | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(8, 16), UPB_SIZE(1, 1), kUpb_NoSub, 12, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(32, 64), UPB_SIZE(2, 2), kUpb_NoSub, 4, kUpb_FieldMode_Scalar | (kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {5, UPB_SIZE(40, 72), UPB_SIZE(3, 3), kUpb_NoSub, 3, kUpb_FieldMode_Scalar | (kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(48, 80), UPB_SIZE(4, 4), kUpb_NoSub, 1, kUpb_FieldMode_Scalar | (kUpb_FieldRep_8Byte << kUpb_FieldRep_Shift)},
-  {7, UPB_SIZE(16, 32), UPB_SIZE(5, 5), kUpb_NoSub, 12, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {8, UPB_SIZE(24, 48), UPB_SIZE(6, 6), kUpb_NoSub, 12, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_UninterpretedOption_msginit = {
-  &google_protobuf_UninterpretedOption_submsgs[0],
-  &google_protobuf_UninterpretedOption__fields[0],
-  UPB_SIZE(56, 88), 7, kUpb_ExtMode_NonExtendable, 0, 255, 0,
-};
-
-static const upb_MiniTable_Field google_protobuf_UninterpretedOption_NamePart__fields[2] = {
-  {1, UPB_SIZE(4, 8), UPB_SIZE(1, 1), kUpb_NoSub, 12, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(1, 1), UPB_SIZE(2, 2), kUpb_NoSub, 8, kUpb_FieldMode_Scalar | (kUpb_FieldRep_1Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_UninterpretedOption_NamePart_msginit = {
-  NULL,
-  &google_protobuf_UninterpretedOption_NamePart__fields[0],
-  UPB_SIZE(16, 24), 2, kUpb_ExtMode_NonExtendable, 2, 255, 2,
-};
-
-static const upb_MiniTable_Sub google_protobuf_SourceCodeInfo_submsgs[1] = {
-  {.submsg = &google_protobuf_SourceCodeInfo_Location_msginit},
-};
-
-static const upb_MiniTable_Field google_protobuf_SourceCodeInfo__fields[1] = {
-  {1, UPB_SIZE(0, 0), UPB_SIZE(0, 0), 0, 11, kUpb_FieldMode_Array | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_SourceCodeInfo_msginit = {
-  &google_protobuf_SourceCodeInfo_submsgs[0],
-  &google_protobuf_SourceCodeInfo__fields[0],
-  UPB_SIZE(8, 8), 1, kUpb_ExtMode_NonExtendable, 1, 255, 0,
-};
-
-static const upb_MiniTable_Field google_protobuf_SourceCodeInfo_Location__fields[5] = {
-  {1, UPB_SIZE(4, 8), UPB_SIZE(0, 0), kUpb_NoSub, 5, kUpb_FieldMode_Array | kUpb_LabelFlags_IsPacked | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(8, 16), UPB_SIZE(0, 0), kUpb_NoSub, 5, kUpb_FieldMode_Array | kUpb_LabelFlags_IsPacked | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(12, 24), UPB_SIZE(1, 1), kUpb_NoSub, 12, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(20, 40), UPB_SIZE(2, 2), kUpb_NoSub, 12, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {6, UPB_SIZE(28, 56), UPB_SIZE(0, 0), kUpb_NoSub, 12, kUpb_FieldMode_Array | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_SourceCodeInfo_Location_msginit = {
-  NULL,
-  &google_protobuf_SourceCodeInfo_Location__fields[0],
-  UPB_SIZE(32, 64), 5, kUpb_ExtMode_NonExtendable, 4, 255, 0,
-};
-
-static const upb_MiniTable_Sub google_protobuf_GeneratedCodeInfo_submsgs[1] = {
-  {.submsg = &google_protobuf_GeneratedCodeInfo_Annotation_msginit},
-};
-
-static const upb_MiniTable_Field google_protobuf_GeneratedCodeInfo__fields[1] = {
-  {1, UPB_SIZE(0, 0), UPB_SIZE(0, 0), 0, 11, kUpb_FieldMode_Array | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_GeneratedCodeInfo_msginit = {
-  &google_protobuf_GeneratedCodeInfo_submsgs[0],
-  &google_protobuf_GeneratedCodeInfo__fields[0],
-  UPB_SIZE(8, 8), 1, kUpb_ExtMode_NonExtendable, 1, 255, 0,
-};
-
-static const upb_MiniTable_Field google_protobuf_GeneratedCodeInfo_Annotation__fields[4] = {
-  {1, UPB_SIZE(12, 16), UPB_SIZE(0, 0), kUpb_NoSub, 5, kUpb_FieldMode_Array | kUpb_LabelFlags_IsPacked | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift)},
-  {2, UPB_SIZE(16, 24), UPB_SIZE(1, 1), kUpb_NoSub, 12, kUpb_FieldMode_Scalar | (kUpb_FieldRep_StringView << kUpb_FieldRep_Shift)},
-  {3, UPB_SIZE(4, 4), UPB_SIZE(2, 2), kUpb_NoSub, 5, kUpb_FieldMode_Scalar | (kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-  {4, UPB_SIZE(8, 8), UPB_SIZE(3, 3), kUpb_NoSub, 5, kUpb_FieldMode_Scalar | (kUpb_FieldRep_4Byte << kUpb_FieldRep_Shift)},
-};
-
-const upb_MiniTable google_protobuf_GeneratedCodeInfo_Annotation_msginit = {
-  NULL,
-  &google_protobuf_GeneratedCodeInfo_Annotation__fields[0],
-  UPB_SIZE(24, 40), 4, kUpb_ExtMode_NonExtendable, 4, 255, 0,
-};
-
-static const upb_MiniTable *messages_layout[27] = {
-  &google_protobuf_FileDescriptorSet_msginit,
-  &google_protobuf_FileDescriptorProto_msginit,
-  &google_protobuf_DescriptorProto_msginit,
-  &google_protobuf_DescriptorProto_ExtensionRange_msginit,
-  &google_protobuf_DescriptorProto_ReservedRange_msginit,
-  &google_protobuf_ExtensionRangeOptions_msginit,
-  &google_protobuf_FieldDescriptorProto_msginit,
-  &google_protobuf_OneofDescriptorProto_msginit,
-  &google_protobuf_EnumDescriptorProto_msginit,
-  &google_protobuf_EnumDescriptorProto_EnumReservedRange_msginit,
-  &google_protobuf_EnumValueDescriptorProto_msginit,
-  &google_protobuf_ServiceDescriptorProto_msginit,
-  &google_protobuf_MethodDescriptorProto_msginit,
-  &google_protobuf_FileOptions_msginit,
-  &google_protobuf_MessageOptions_msginit,
-  &google_protobuf_FieldOptions_msginit,
-  &google_protobuf_OneofOptions_msginit,
-  &google_protobuf_EnumOptions_msginit,
-  &google_protobuf_EnumValueOptions_msginit,
-  &google_protobuf_ServiceOptions_msginit,
-  &google_protobuf_MethodOptions_msginit,
-  &google_protobuf_UninterpretedOption_msginit,
-  &google_protobuf_UninterpretedOption_NamePart_msginit,
-  &google_protobuf_SourceCodeInfo_msginit,
-  &google_protobuf_SourceCodeInfo_Location_msginit,
-  &google_protobuf_GeneratedCodeInfo_msginit,
-  &google_protobuf_GeneratedCodeInfo_Annotation_msginit,
-};
-
-const upb_MiniTable_Enum google_protobuf_FieldDescriptorProto_Type_enuminit = {
-    NULL,
-    0x7fffeULL,
-    0,
-};
-
-const upb_MiniTable_Enum google_protobuf_FieldDescriptorProto_Label_enuminit = {
-    NULL,
-    0xeULL,
-    0,
-};
-
-const upb_MiniTable_Enum google_protobuf_FileOptions_OptimizeMode_enuminit = {
-    NULL,
-    0xeULL,
-    0,
-};
-
-const upb_MiniTable_Enum google_protobuf_FieldOptions_CType_enuminit = {
-    NULL,
-    0x7ULL,
-    0,
-};
-
-const upb_MiniTable_Enum google_protobuf_FieldOptions_JSType_enuminit = {
-    NULL,
-    0x7ULL,
-    0,
-};
-
-const upb_MiniTable_Enum google_protobuf_MethodOptions_IdempotencyLevel_enuminit = {
-    NULL,
-    0x7ULL,
-    0,
-};
-
-static const upb_MiniTable_Enum *enums_layout[6] = {
-  &google_protobuf_FieldDescriptorProto_Type_enuminit,
-  &google_protobuf_FieldDescriptorProto_Label_enuminit,
-  &google_protobuf_FileOptions_OptimizeMode_enuminit,
-  &google_protobuf_FieldOptions_CType_enuminit,
-  &google_protobuf_FieldOptions_JSType_enuminit,
-  &google_protobuf_MethodOptions_IdempotencyLevel_enuminit,
-};
-
-const upb_MiniTable_File google_protobuf_descriptor_proto_upb_file_layout = {
-  messages_layout,
-  enums_layout,
-  NULL,
-  27,
-  6,
-  0,
-};
-
-
-
-/** upb/decode_fast.c ************************************************************/
-// Fast decoder: ~3x the speed of decode.c, but requires x86-64/ARM64.
-// Also the table size grows by 2x.
-//
-// Could potentially be ported to other 64-bit archs that pass at least six
-// arguments in registers and have 8 unused high bits in pointers.
-//
-// The overall design is to create specialized functions for every possible
-// field type (eg. oneof boolean field with a 1 byte tag) and then dispatch
-// to the specialized function as quickly as possible.
-
-
-
-/* Must be last. */
-
-#if UPB_FASTTABLE
-
-// The standard set of arguments passed to each parsing function.
-// Thanks to x86-64 calling conventions, these will stay in registers.
-#define UPB_PARSE_PARAMS                                             \
-  upb_Decoder *d, const char *ptr, upb_Message *msg, intptr_t table, \
-      uint64_t hasbits, uint64_t data
-
-#define UPB_PARSE_ARGS d, ptr, msg, table, hasbits, data
-
-#define RETURN_GENERIC(m)                                 \
-  /* Uncomment either of these for debugging purposes. */ \
-  /* fprintf(stderr, m); */                               \
-  /*__builtin_trap(); */                                  \
-  return fastdecode_generic(d, ptr, msg, table, hasbits, 0);
-
-typedef enum {
-  CARD_s = 0, /* Singular (optional, non-repeated) */
-  CARD_o = 1, /* Oneof */
-  CARD_r = 2, /* Repeated */
-  CARD_p = 3  /* Packed Repeated */
-} upb_card;
-
-UPB_NOINLINE
-static const char* fastdecode_isdonefallback(UPB_PARSE_PARAMS) {
-  int overrun = data;
-  int status;
-  ptr = decode_isdonefallback_inl(d, ptr, overrun, &status);
-  if (ptr == NULL) {
-    return fastdecode_err(d, status);
-  }
-  data = fastdecode_loadtag(ptr);
-  UPB_MUSTTAIL return fastdecode_tagdispatch(UPB_PARSE_ARGS);
-}
-
-UPB_FORCEINLINE
-static const char* fastdecode_dispatch(UPB_PARSE_PARAMS) {
-  if (UPB_UNLIKELY(ptr >= d->limit_ptr)) {
-    int overrun = ptr - d->end;
-    if (UPB_LIKELY(overrun == d->limit)) {
-      // Parse is finished.
-      *(uint32_t*)msg |= hasbits;  // Sync hasbits.
-      const upb_MiniTable* l = decode_totablep(table);
-      return UPB_UNLIKELY(l->required_count)
-                 ? decode_checkrequired(d, ptr, msg, l)
-                 : ptr;
-    } else {
-      data = overrun;
-      UPB_MUSTTAIL return fastdecode_isdonefallback(UPB_PARSE_ARGS);
-    }
-  }
-
-  // Read two bytes of tag data (for a one-byte tag, the high byte is junk).
-  data = fastdecode_loadtag(ptr);
-  UPB_MUSTTAIL return fastdecode_tagdispatch(UPB_PARSE_ARGS);
-}
-
-UPB_FORCEINLINE
-static bool fastdecode_checktag(uint16_t data, int tagbytes) {
-  if (tagbytes == 1) {
-    return (data & 0xff) == 0;
-  } else {
-    return data == 0;
-  }
-}
-
-UPB_FORCEINLINE
-static const char* fastdecode_longsize(const char* ptr, int* size) {
-  int i;
-  UPB_ASSERT(*size & 0x80);
-  *size &= 0xff;
-  for (i = 0; i < 3; i++) {
-    ptr++;
-    size_t byte = (uint8_t)ptr[-1];
-    *size += (byte - 1) << (7 + 7 * i);
-    if (UPB_LIKELY((byte & 0x80) == 0)) return ptr;
-  }
-  ptr++;
-  size_t byte = (uint8_t)ptr[-1];
-  // len is limited by 2gb not 4gb, hence 8 and not 16 as normally expected
-  // for a 32 bit varint.
-  if (UPB_UNLIKELY(byte >= 8)) return NULL;
-  *size += (byte - 1) << 28;
-  return ptr;
-}
-
-UPB_FORCEINLINE
-static bool fastdecode_boundscheck(const char* ptr, size_t len,
-                                   const char* end) {
-  uintptr_t uptr = (uintptr_t)ptr;
-  uintptr_t uend = (uintptr_t)end + 16;
-  uintptr_t res = uptr + len;
-  return res < uptr || res > uend;
-}
-
-UPB_FORCEINLINE
-static bool fastdecode_boundscheck2(const char* ptr, size_t len,
-                                    const char* end) {
-  // This is one extra branch compared to the more normal:
-  //   return (size_t)(end - ptr) < size;
-  // However it is one less computation if we are just about to use "ptr + len":
-  //   https://godbolt.org/z/35YGPz
-  // In microbenchmarks this shows an overall 4% improvement.
-  uintptr_t uptr = (uintptr_t)ptr;
-  uintptr_t uend = (uintptr_t)end;
-  uintptr_t res = uptr + len;
-  return res < uptr || res > uend;
-}
-
-typedef const char* fastdecode_delimfunc(upb_Decoder* d, const char* ptr,
-                                         void* ctx);
-
-UPB_FORCEINLINE
-static const char* fastdecode_delimited(upb_Decoder* d, const char* ptr,
-                                        fastdecode_delimfunc* func, void* ctx) {
-  ptr++;
-  int len = (int8_t)ptr[-1];
-  if (fastdecode_boundscheck2(ptr, len, d->limit_ptr)) {
-    // Slow case: Sub-message is >=128 bytes and/or exceeds the current buffer.
-    // If it exceeds the buffer limit, limit/limit_ptr will change during
-    // sub-message parsing, so we need to preserve delta, not limit.
-    if (UPB_UNLIKELY(len & 0x80)) {
-      // Size varint >1 byte (length >= 128).
-      ptr = fastdecode_longsize(ptr, &len);
-      if (!ptr) {
-        // Corrupt wire format: size exceeded INT_MAX.
-        return NULL;
-      }
-    }
-    if (ptr - d->end + (int)len > d->limit) {
-      // Corrupt wire format: invalid limit.
-      return NULL;
-    }
-    int delta = decode_pushlimit(d, ptr, len);
-    ptr = func(d, ptr, ctx);
-    decode_poplimit(d, ptr, delta);
-  } else {
-    // Fast case: Sub-message is <128 bytes and fits in the current buffer.
-    // This means we can preserve limit/limit_ptr verbatim.
-    const char* saved_limit_ptr = d->limit_ptr;
-    int saved_limit = d->limit;
-    d->limit_ptr = ptr + len;
-    d->limit = d->limit_ptr - d->end;
-    UPB_ASSERT(d->limit_ptr == d->end + UPB_MIN(0, d->limit));
-    ptr = func(d, ptr, ctx);
-    d->limit_ptr = saved_limit_ptr;
-    d->limit = saved_limit;
-    UPB_ASSERT(d->limit_ptr == d->end + UPB_MIN(0, d->limit));
-  }
-  return ptr;
-}
-
-/* singular, oneof, repeated field handling ***********************************/
-
-typedef struct {
-  upb_Array* arr;
-  void* end;
-} fastdecode_arr;
-
-typedef enum {
-  FD_NEXT_ATLIMIT,
-  FD_NEXT_SAMEFIELD,
-  FD_NEXT_OTHERFIELD
-} fastdecode_next;
-
-typedef struct {
-  void* dst;
-  fastdecode_next next;
-  uint32_t tag;
-} fastdecode_nextret;
-
-UPB_FORCEINLINE
-static void* fastdecode_resizearr(upb_Decoder* d, void* dst,
-                                  fastdecode_arr* farr, int valbytes) {
-  if (UPB_UNLIKELY(dst == farr->end)) {
-    size_t old_size = farr->arr->size;
-    size_t old_bytes = old_size * valbytes;
-    size_t new_size = old_size * 2;
-    size_t new_bytes = new_size * valbytes;
-    char* old_ptr = _upb_array_ptr(farr->arr);
-    char* new_ptr = upb_Arena_Realloc(&d->arena, old_ptr, old_bytes, new_bytes);
-    uint8_t elem_size_lg2 = __builtin_ctz(valbytes);
-    farr->arr->size = new_size;
-    farr->arr->data = _upb_array_tagptr(new_ptr, elem_size_lg2);
-    dst = (void*)(new_ptr + (old_size * valbytes));
-    farr->end = (void*)(new_ptr + (new_size * valbytes));
-  }
-  return dst;
-}
-
-UPB_FORCEINLINE
-static bool fastdecode_tagmatch(uint32_t tag, uint64_t data, int tagbytes) {
-  if (tagbytes == 1) {
-    return (uint8_t)tag == (uint8_t)data;
-  } else {
-    return (uint16_t)tag == (uint16_t)data;
-  }
-}
-
-UPB_FORCEINLINE
-static void fastdecode_commitarr(void* dst, fastdecode_arr* farr,
-                                 int valbytes) {
-  farr->arr->len =
-      (size_t)((char*)dst - (char*)_upb_array_ptr(farr->arr)) / valbytes;
-}
-
-UPB_FORCEINLINE
-static fastdecode_nextret fastdecode_nextrepeated(upb_Decoder* d, void* dst,
-                                                  const char** ptr,
-                                                  fastdecode_arr* farr,
-                                                  uint64_t data, int tagbytes,
-                                                  int valbytes) {
-  fastdecode_nextret ret;
-  dst = (char*)dst + valbytes;
-
-  if (UPB_LIKELY(!decode_isdone(d, ptr))) {
-    ret.tag = fastdecode_loadtag(*ptr);
-    if (fastdecode_tagmatch(ret.tag, data, tagbytes)) {
-      ret.next = FD_NEXT_SAMEFIELD;
-    } else {
-      fastdecode_commitarr(dst, farr, valbytes);
-      ret.next = FD_NEXT_OTHERFIELD;
-    }
-  } else {
-    fastdecode_commitarr(dst, farr, valbytes);
-    ret.next = FD_NEXT_ATLIMIT;
-  }
-
-  ret.dst = dst;
-  return ret;
-}
-
-UPB_FORCEINLINE
-static void* fastdecode_fieldmem(upb_Message* msg, uint64_t data) {
-  size_t ofs = data >> 48;
-  return (char*)msg + ofs;
-}
-
-UPB_FORCEINLINE
-static void* fastdecode_getfield(upb_Decoder* d, const char* ptr,
-                                 upb_Message* msg, uint64_t* data,
-                                 uint64_t* hasbits, fastdecode_arr* farr,
-                                 int valbytes, upb_card card) {
-  switch (card) {
-    case CARD_s: {
-      uint8_t hasbit_index = *data >> 24;
-      // Set hasbit and return pointer to scalar field.
-      *hasbits |= 1ull << hasbit_index;
-      return fastdecode_fieldmem(msg, *data);
-    }
-    case CARD_o: {
-      uint16_t case_ofs = *data >> 32;
-      uint32_t* oneof_case = UPB_PTR_AT(msg, case_ofs, uint32_t);
-      uint8_t field_number = *data >> 24;
-      *oneof_case = field_number;
-      return fastdecode_fieldmem(msg, *data);
-    }
-    case CARD_r: {
-      // Get pointer to upb_Array and allocate/expand if necessary.
-      uint8_t elem_size_lg2 = __builtin_ctz(valbytes);
-      upb_Array** arr_p = fastdecode_fieldmem(msg, *data);
-      char* begin;
-      *(uint32_t*)msg |= *hasbits;
-      *hasbits = 0;
-      if (UPB_LIKELY(!*arr_p)) {
-        farr->arr = _upb_Array_New(&d->arena, 8, elem_size_lg2);
-        *arr_p = farr->arr;
-      } else {
-        farr->arr = *arr_p;
-      }
-      begin = _upb_array_ptr(farr->arr);
-      farr->end = begin + (farr->arr->size * valbytes);
-      *data = fastdecode_loadtag(ptr);
-      return begin + (farr->arr->len * valbytes);
-    }
-    default:
-      UPB_UNREACHABLE();
-  }
-}
-
-UPB_FORCEINLINE
-static bool fastdecode_flippacked(uint64_t* data, int tagbytes) {
-  *data ^= (0x2 ^ 0x0);  // Patch data to match packed wiretype.
-  return fastdecode_checktag(*data, tagbytes);
-}
-
-#define FASTDECODE_CHECKPACKED(tagbytes, card, func)                \
-  if (UPB_UNLIKELY(!fastdecode_checktag(data, tagbytes))) {         \
-    if (card == CARD_r && fastdecode_flippacked(&data, tagbytes)) { \
-      UPB_MUSTTAIL return func(UPB_PARSE_ARGS);                     \
-    }                                                               \
-    RETURN_GENERIC("packed check tag mismatch\n");                  \
-  }
-
-/* varint fields **************************************************************/
-
-UPB_FORCEINLINE
-static uint64_t fastdecode_munge(uint64_t val, int valbytes, bool zigzag) {
-  if (valbytes == 1) {
-    return val != 0;
-  } else if (zigzag) {
-    if (valbytes == 4) {
-      uint32_t n = val;
-      return (n >> 1) ^ -(int32_t)(n & 1);
-    } else if (valbytes == 8) {
-      return (val >> 1) ^ -(int64_t)(val & 1);
-    }
-    UPB_UNREACHABLE();
-  }
-  return val;
-}
-
-UPB_FORCEINLINE
-static const char* fastdecode_varint64(const char* ptr, uint64_t* val) {
-  ptr++;
-  *val = (uint8_t)ptr[-1];
-  if (UPB_UNLIKELY(*val & 0x80)) {
-    int i;
-    for (i = 0; i < 8; i++) {
-      ptr++;
-      uint64_t byte = (uint8_t)ptr[-1];
-      *val += (byte - 1) << (7 + 7 * i);
-      if (UPB_LIKELY((byte & 0x80) == 0)) goto done;
-    }
-    ptr++;
-    uint64_t byte = (uint8_t)ptr[-1];
-    if (byte > 1) {
-      return NULL;
-    }
-    *val += (byte - 1) << 63;
-  }
-done:
-  UPB_ASSUME(ptr != NULL);
-  return ptr;
-}
-
-#define FASTDECODE_UNPACKEDVARINT(d, ptr, msg, table, hasbits, data, tagbytes, \
-                                  valbytes, card, zigzag, packed)              \
-  uint64_t val;                                                                \
-  void* dst;                                                                   \
-  fastdecode_arr farr;                                                         \
-                                                                               \
-  FASTDECODE_CHECKPACKED(tagbytes, card, packed);                              \
-                                                                               \
-  dst = fastdecode_getfield(d, ptr, msg, &data, &hasbits, &farr, valbytes,     \
-                            card);                                             \
-  if (card == CARD_r) {                                                        \
-    if (UPB_UNLIKELY(!dst)) {                                                  \
-      RETURN_GENERIC("need array resize\n");                                   \
-    }                                                                          \
-  }                                                                            \
-                                                                               \
-  again:                                                                       \
-  if (card == CARD_r) {                                                        \
-    dst = fastdecode_resizearr(d, dst, &farr, valbytes);                       \
-  }                                                                            \
-                                                                               \
-  ptr += tagbytes;                                                             \
-  ptr = fastdecode_varint64(ptr, &val);                                        \
-  if (ptr == NULL) return fastdecode_err(d, kUpb_DecodeStatus_Malformed);      \
-  val = fastdecode_munge(val, valbytes, zigzag);                               \
-  memcpy(dst, &val, valbytes);                                                 \
-                                                                               \
-  if (card == CARD_r) {                                                        \
-    fastdecode_nextret ret = fastdecode_nextrepeated(                          \
-        d, dst, &ptr, &farr, data, tagbytes, valbytes);                        \
-    switch (ret.next) {                                                        \
-      case FD_NEXT_SAMEFIELD:                                                  \
-        dst = ret.dst;                                                         \
-        goto again;                                                            \
-      case FD_NEXT_OTHERFIELD:                                                 \
-        data = ret.tag;                                                        \
-        UPB_MUSTTAIL return fastdecode_tagdispatch(UPB_PARSE_ARGS);            \
-      case FD_NEXT_ATLIMIT:                                                    \
-        return ptr;                                                            \
-    }                                                                          \
-  }                                                                            \
-                                                                               \
-  UPB_MUSTTAIL return fastdecode_dispatch(UPB_PARSE_ARGS);
-
-typedef struct {
-  uint8_t valbytes;
-  bool zigzag;
-  void* dst;
-  fastdecode_arr farr;
-} fastdecode_varintdata;
-
-UPB_FORCEINLINE
-static const char* fastdecode_topackedvarint(upb_Decoder* d, const char* ptr,
-                                             void* ctx) {
-  fastdecode_varintdata* data = ctx;
-  void* dst = data->dst;
-  uint64_t val;
-
-  while (!decode_isdone(d, &ptr)) {
-    dst = fastdecode_resizearr(d, dst, &data->farr, data->valbytes);
-    ptr = fastdecode_varint64(ptr, &val);
-    if (ptr == NULL) return NULL;
-    val = fastdecode_munge(val, data->valbytes, data->zigzag);
-    memcpy(dst, &val, data->valbytes);
-    dst = (char*)dst + data->valbytes;
-  }
-
-  fastdecode_commitarr(dst, &data->farr, data->valbytes);
-  return ptr;
-}
-
-#define FASTDECODE_PACKEDVARINT(d, ptr, msg, table, hasbits, data, tagbytes, \
-                                valbytes, zigzag, unpacked)                  \
-  fastdecode_varintdata ctx = {valbytes, zigzag};                            \
-                                                                             \
-  FASTDECODE_CHECKPACKED(tagbytes, CARD_r, unpacked);                        \
-                                                                             \
-  ctx.dst = fastdecode_getfield(d, ptr, msg, &data, &hasbits, &ctx.farr,     \
-                                valbytes, CARD_r);                           \
-  if (UPB_UNLIKELY(!ctx.dst)) {                                              \
-    RETURN_GENERIC("need array resize\n");                                   \
-  }                                                                          \
-                                                                             \
-  ptr += tagbytes;                                                           \
-  ptr = fastdecode_delimited(d, ptr, &fastdecode_topackedvarint, &ctx);      \
-                                                                             \
-  if (UPB_UNLIKELY(ptr == NULL)) {                                           \
-    return fastdecode_err(d, kUpb_DecodeStatus_Malformed);                   \
-  }                                                                          \
-                                                                             \
-  UPB_MUSTTAIL return fastdecode_dispatch(d, ptr, msg, table, hasbits, 0);
-
-#define FASTDECODE_VARINT(d, ptr, msg, table, hasbits, data, tagbytes,     \
-                          valbytes, card, zigzag, unpacked, packed)        \
-  if (card == CARD_p) {                                                    \
-    FASTDECODE_PACKEDVARINT(d, ptr, msg, table, hasbits, data, tagbytes,   \
-                            valbytes, zigzag, unpacked);                   \
-  } else {                                                                 \
-    FASTDECODE_UNPACKEDVARINT(d, ptr, msg, table, hasbits, data, tagbytes, \
-                              valbytes, card, zigzag, packed);             \
-  }
-
-#define z_ZZ true
-#define b_ZZ false
-#define v_ZZ false
-
-/* Generate all combinations:
- * {s,o,r,p} x {b1,v4,z4,v8,z8} x {1bt,2bt} */
-
-#define F(card, type, valbytes, tagbytes)                                      \
-  UPB_NOINLINE                                                                 \
-  const char* upb_p##card##type##valbytes##_##tagbytes##bt(UPB_PARSE_PARAMS) { \
-    FASTDECODE_VARINT(d, ptr, msg, table, hasbits, data, tagbytes, valbytes,   \
-                      CARD_##card, type##_ZZ,                                  \
-                      upb_pr##type##valbytes##_##tagbytes##bt,                 \
-                      upb_pp##type##valbytes##_##tagbytes##bt);                \
-  }
-
-#define TYPES(card, tagbytes) \
-  F(card, b, 1, tagbytes)     \
-  F(card, v, 4, tagbytes)     \
-  F(card, v, 8, tagbytes)     \
-  F(card, z, 4, tagbytes)     \
-  F(card, z, 8, tagbytes)
-
-#define TAGBYTES(card) \
-  TYPES(card, 1)       \
-  TYPES(card, 2)
-
-TAGBYTES(s)
-TAGBYTES(o)
-TAGBYTES(r)
-TAGBYTES(p)
-
-#undef z_ZZ
-#undef b_ZZ
-#undef v_ZZ
-#undef o_ONEOF
-#undef s_ONEOF
-#undef r_ONEOF
-#undef F
-#undef TYPES
-#undef TAGBYTES
-#undef FASTDECODE_UNPACKEDVARINT
-#undef FASTDECODE_PACKEDVARINT
-#undef FASTDECODE_VARINT
-
-/* fixed fields ***************************************************************/
-
-#define FASTDECODE_UNPACKEDFIXED(d, ptr, msg, table, hasbits, data, tagbytes, \
-                                 valbytes, card, packed)                      \
-  void* dst;                                                                  \
-  fastdecode_arr farr;                                                        \
-                                                                              \
-  FASTDECODE_CHECKPACKED(tagbytes, card, packed)                              \
-                                                                              \
-  dst = fastdecode_getfield(d, ptr, msg, &data, &hasbits, &farr, valbytes,    \
-                            card);                                            \
-  if (card == CARD_r) {                                                       \
-    if (UPB_UNLIKELY(!dst)) {                                                 \
-      RETURN_GENERIC("couldn't allocate array in arena\n");                   \
-    }                                                                         \
-  }                                                                           \
-                                                                              \
-  again:                                                                      \
-  if (card == CARD_r) {                                                       \
-    dst = fastdecode_resizearr(d, dst, &farr, valbytes);                      \
-  }                                                                           \
-                                                                              \
-  ptr += tagbytes;                                                            \
-  memcpy(dst, ptr, valbytes);                                                 \
-  ptr += valbytes;                                                            \
-                                                                              \
-  if (card == CARD_r) {                                                       \
-    fastdecode_nextret ret = fastdecode_nextrepeated(                         \
-        d, dst, &ptr, &farr, data, tagbytes, valbytes);                       \
-    switch (ret.next) {                                                       \
-      case FD_NEXT_SAMEFIELD:                                                 \
-        dst = ret.dst;                                                        \
-        goto again;                                                           \
-      case FD_NEXT_OTHERFIELD:                                                \
-        data = ret.tag;                                                       \
-        UPB_MUSTTAIL return fastdecode_tagdispatch(UPB_PARSE_ARGS);           \
-      case FD_NEXT_ATLIMIT:                                                   \
-        return ptr;                                                           \
-    }                                                                         \
-  }                                                                           \
-                                                                              \
-  UPB_MUSTTAIL return fastdecode_dispatch(UPB_PARSE_ARGS);
-
-#define FASTDECODE_PACKEDFIXED(d, ptr, msg, table, hasbits, data, tagbytes, \
-                               valbytes, unpacked)                          \
-  FASTDECODE_CHECKPACKED(tagbytes, CARD_r, unpacked)                        \
-                                                                            \
-  ptr += tagbytes;                                                          \
-  int size = (uint8_t)ptr[0];                                               \
-  ptr++;                                                                    \
-  if (size & 0x80) {                                                        \
-    ptr = fastdecode_longsize(ptr, &size);                                  \
-  }                                                                         \
-                                                                            \
-  if (UPB_UNLIKELY(fastdecode_boundscheck(ptr, size, d->limit_ptr) ||       \
-                   (size % valbytes) != 0)) {                               \
-    return fastdecode_err(d, kUpb_DecodeStatus_Malformed);                  \
-  }                                                                         \
-                                                                            \
-  upb_Array** arr_p = fastdecode_fieldmem(msg, data);                       \
-  upb_Array* arr = *arr_p;                                                  \
-  uint8_t elem_size_lg2 = __builtin_ctz(valbytes);                          \
-  int elems = size / valbytes;                                              \
-                                                                            \
-  if (UPB_LIKELY(!arr)) {                                                   \
-    *arr_p = arr = _upb_Array_New(&d->arena, elems, elem_size_lg2);         \
-    if (!arr) {                                                             \
-      return fastdecode_err(d, kUpb_DecodeStatus_Malformed);                \
-    }                                                                       \
-  } else {                                                                  \
-    _upb_Array_Resize(arr, elems, &d->arena);                               \
-  }                                                                         \
-                                                                            \
-  char* dst = _upb_array_ptr(arr);                                          \
-  memcpy(dst, ptr, size);                                                   \
-  arr->len = elems;                                                         \
-                                                                            \
-  ptr += size;                                                              \
-  UPB_MUSTTAIL return fastdecode_dispatch(UPB_PARSE_ARGS);
-
-#define FASTDECODE_FIXED(d, ptr, msg, table, hasbits, data, tagbytes,     \
-                         valbytes, card, unpacked, packed)                \
-  if (card == CARD_p) {                                                   \
-    FASTDECODE_PACKEDFIXED(d, ptr, msg, table, hasbits, data, tagbytes,   \
-                           valbytes, unpacked);                           \
-  } else {                                                                \
-    FASTDECODE_UNPACKEDFIXED(d, ptr, msg, table, hasbits, data, tagbytes, \
-                             valbytes, card, packed);                     \
-  }
-
-/* Generate all combinations:
- * {s,o,r,p} x {f4,f8} x {1bt,2bt} */
-
-#define F(card, valbytes, tagbytes)                                         \
-  UPB_NOINLINE                                                              \
-  const char* upb_p##card##f##valbytes##_##tagbytes##bt(UPB_PARSE_PARAMS) { \
-    FASTDECODE_FIXED(d, ptr, msg, table, hasbits, data, tagbytes, valbytes, \
-                     CARD_##card, upb_ppf##valbytes##_##tagbytes##bt,       \
-                     upb_prf##valbytes##_##tagbytes##bt);                   \
-  }
-
-#define TYPES(card, tagbytes) \
-  F(card, 4, tagbytes)        \
-  F(card, 8, tagbytes)
-
-#define TAGBYTES(card) \
-  TYPES(card, 1)       \
-  TYPES(card, 2)
-
-TAGBYTES(s)
-TAGBYTES(o)
-TAGBYTES(r)
-TAGBYTES(p)
-
-#undef F
-#undef TYPES
-#undef TAGBYTES
-#undef FASTDECODE_UNPACKEDFIXED
-#undef FASTDECODE_PACKEDFIXED
-
-/* string fields **************************************************************/
-
-typedef const char* fastdecode_copystr_func(struct upb_Decoder* d,
-                                            const char* ptr, upb_Message* msg,
-                                            const upb_MiniTable* table,
-                                            uint64_t hasbits,
-                                            upb_StringView* dst);
-
-UPB_NOINLINE
-static const char* fastdecode_verifyutf8(upb_Decoder* d, const char* ptr,
-                                         upb_Message* msg, intptr_t table,
-                                         uint64_t hasbits, uint64_t data) {
-  upb_StringView* dst = (upb_StringView*)data;
-  if (!decode_verifyutf8_inl(dst->data, dst->size)) {
-    return fastdecode_err(d, kUpb_DecodeStatus_BadUtf8);
-  }
-  UPB_MUSTTAIL return fastdecode_dispatch(UPB_PARSE_ARGS);
-}
-
-#define FASTDECODE_LONGSTRING(d, ptr, msg, table, hasbits, dst, validate_utf8) \
-  int size = (uint8_t)ptr[0]; /* Could plumb through hasbits. */               \
-  ptr++;                                                                       \
-  if (size & 0x80) {                                                           \
-    ptr = fastdecode_longsize(ptr, &size);                                     \
-  }                                                                            \
-                                                                               \
-  if (UPB_UNLIKELY(fastdecode_boundscheck(ptr, size, d->limit_ptr))) {         \
-    dst->size = 0;                                                             \
-    return fastdecode_err(d, kUpb_DecodeStatus_Malformed);                     \
-  }                                                                            \
-                                                                               \
-  if (d->options & kUpb_DecodeOption_AliasString) {                            \
-    dst->data = ptr;                                                           \
-    dst->size = size;                                                          \
-  } else {                                                                     \
-    char* data = upb_Arena_Malloc(&d->arena, size);                            \
-    if (!data) {                                                               \
-      return fastdecode_err(d, kUpb_DecodeStatus_OutOfMemory);                 \
-    }                                                                          \
-    memcpy(data, ptr, size);                                                   \
-    dst->data = data;                                                          \
-    dst->size = size;                                                          \
-  }                                                                            \
-                                                                               \
-  ptr += size;                                                                 \
-  if (validate_utf8) {                                                         \
-    data = (uint64_t)dst;                                                      \
-    UPB_MUSTTAIL return fastdecode_verifyutf8(UPB_PARSE_ARGS);                 \
-  } else {                                                                     \
-    UPB_MUSTTAIL return fastdecode_dispatch(UPB_PARSE_ARGS);                   \
-  }
-
-UPB_NOINLINE
-static const char* fastdecode_longstring_utf8(struct upb_Decoder* d,
-                                              const char* ptr, upb_Message* msg,
-                                              intptr_t table, uint64_t hasbits,
-                                              uint64_t data) {
-  upb_StringView* dst = (upb_StringView*)data;
-  FASTDECODE_LONGSTRING(d, ptr, msg, table, hasbits, dst, true);
-}
-
-UPB_NOINLINE
-static const char* fastdecode_longstring_noutf8(
-    struct upb_Decoder* d, const char* ptr, upb_Message* msg, intptr_t table,
-    uint64_t hasbits, uint64_t data) {
-  upb_StringView* dst = (upb_StringView*)data;
-  FASTDECODE_LONGSTRING(d, ptr, msg, table, hasbits, dst, false);
-}
-
-UPB_FORCEINLINE
-static void fastdecode_docopy(upb_Decoder* d, const char* ptr, uint32_t size,
-                              int copy, char* data, upb_StringView* dst) {
-  d->arena.head.ptr += copy;
-  dst->data = data;
-  UPB_UNPOISON_MEMORY_REGION(data, copy);
-  memcpy(data, ptr, copy);
-  UPB_POISON_MEMORY_REGION(data + size, copy - size);
-}
-
-#define FASTDECODE_COPYSTRING(d, ptr, msg, table, hasbits, data, tagbytes,    \
-                              card, validate_utf8)                            \
-  upb_StringView* dst;                                                        \
-  fastdecode_arr farr;                                                        \
-  int64_t size;                                                               \
-  size_t arena_has;                                                           \
-  size_t common_has;                                                          \
-  char* buf;                                                                  \
-                                                                              \
-  UPB_ASSERT((d->options & kUpb_DecodeOption_AliasString) == 0);              \
-  UPB_ASSERT(fastdecode_checktag(data, tagbytes));                            \
-                                                                              \
-  dst = fastdecode_getfield(d, ptr, msg, &data, &hasbits, &farr,              \
-                            sizeof(upb_StringView), card);                    \
-                                                                              \
-  again:                                                                      \
-  if (card == CARD_r) {                                                       \
-    dst = fastdecode_resizearr(d, dst, &farr, sizeof(upb_StringView));        \
-  }                                                                           \
-                                                                              \
-  size = (uint8_t)ptr[tagbytes];                                              \
-  ptr += tagbytes + 1;                                                        \
-  dst->size = size;                                                           \
-                                                                              \
-  buf = d->arena.head.ptr;                                                    \
-  arena_has = _upb_ArenaHas(&d->arena);                                       \
-  common_has = UPB_MIN(arena_has, (d->end - ptr) + 16);                       \
-                                                                              \
-  if (UPB_LIKELY(size <= 15 - tagbytes)) {                                    \
-    if (arena_has < 16) goto longstr;                                         \
-    d->arena.head.ptr += 16;                                                  \
-    memcpy(buf, ptr - tagbytes - 1, 16);                                      \
-    dst->data = buf + tagbytes + 1;                                           \
-  } else if (UPB_LIKELY(size <= 32)) {                                        \
-    if (UPB_UNLIKELY(common_has < 32)) goto longstr;                          \
-    fastdecode_docopy(d, ptr, size, 32, buf, dst);                            \
-  } else if (UPB_LIKELY(size <= 64)) {                                        \
-    if (UPB_UNLIKELY(common_has < 64)) goto longstr;                          \
-    fastdecode_docopy(d, ptr, size, 64, buf, dst);                            \
-  } else if (UPB_LIKELY(size < 128)) {                                        \
-    if (UPB_UNLIKELY(common_has < 128)) goto longstr;                         \
-    fastdecode_docopy(d, ptr, size, 128, buf, dst);                           \
-  } else {                                                                    \
-    goto longstr;                                                             \
-  }                                                                           \
-                                                                              \
-  ptr += size;                                                                \
-                                                                              \
-  if (card == CARD_r) {                                                       \
-    if (validate_utf8 && !decode_verifyutf8_inl(dst->data, dst->size)) {      \
-      return fastdecode_err(d, kUpb_DecodeStatus_BadUtf8);                    \
-    }                                                                         \
-    fastdecode_nextret ret = fastdecode_nextrepeated(                         \
-        d, dst, &ptr, &farr, data, tagbytes, sizeof(upb_StringView));         \
-    switch (ret.next) {                                                       \
-      case FD_NEXT_SAMEFIELD:                                                 \
-        dst = ret.dst;                                                        \
-        goto again;                                                           \
-      case FD_NEXT_OTHERFIELD:                                                \
-        data = ret.tag;                                                       \
-        UPB_MUSTTAIL return fastdecode_tagdispatch(UPB_PARSE_ARGS);           \
-      case FD_NEXT_ATLIMIT:                                                   \
-        return ptr;                                                           \
-    }                                                                         \
-  }                                                                           \
-                                                                              \
-  if (card != CARD_r && validate_utf8) {                                      \
-    data = (uint64_t)dst;                                                     \
-    UPB_MUSTTAIL return fastdecode_verifyutf8(UPB_PARSE_ARGS);                \
-  }                                                                           \
-                                                                              \
-  UPB_MUSTTAIL return fastdecode_dispatch(UPB_PARSE_ARGS);                    \
-                                                                              \
-  longstr:                                                                    \
-  if (card == CARD_r) {                                                       \
-    fastdecode_commitarr(dst + 1, &farr, sizeof(upb_StringView));             \
-  }                                                                           \
-  ptr--;                                                                      \
-  if (validate_utf8) {                                                        \
-    UPB_MUSTTAIL return fastdecode_longstring_utf8(d, ptr, msg, table,        \
-                                                   hasbits, (uint64_t)dst);   \
-  } else {                                                                    \
-    UPB_MUSTTAIL return fastdecode_longstring_noutf8(d, ptr, msg, table,      \
-                                                     hasbits, (uint64_t)dst); \
-  }
-
-#define FASTDECODE_STRING(d, ptr, msg, table, hasbits, data, tagbytes, card,   \
-                          copyfunc, validate_utf8)                             \
-  upb_StringView* dst;                                                         \
-  fastdecode_arr farr;                                                         \
-  int64_t size;                                                                \
-                                                                               \
-  if (UPB_UNLIKELY(!fastdecode_checktag(data, tagbytes))) {                    \
-    RETURN_GENERIC("string field tag mismatch\n");                             \
-  }                                                                            \
-                                                                               \
-  if (UPB_UNLIKELY((d->options & kUpb_DecodeOption_AliasString) == 0)) {       \
-    UPB_MUSTTAIL return copyfunc(UPB_PARSE_ARGS);                              \
-  }                                                                            \
-                                                                               \
-  dst = fastdecode_getfield(d, ptr, msg, &data, &hasbits, &farr,               \
-                            sizeof(upb_StringView), card);                     \
-                                                                               \
-  again:                                                                       \
-  if (card == CARD_r) {                                                        \
-    dst = fastdecode_resizearr(d, dst, &farr, sizeof(upb_StringView));         \
-  }                                                                            \
-                                                                               \
-  size = (int8_t)ptr[tagbytes];                                                \
-  ptr += tagbytes + 1;                                                         \
-  dst->data = ptr;                                                             \
-  dst->size = size;                                                            \
-                                                                               \
-  if (UPB_UNLIKELY(fastdecode_boundscheck(ptr, size, d->end))) {               \
-    ptr--;                                                                     \
-    if (validate_utf8) {                                                       \
-      return fastdecode_longstring_utf8(d, ptr, msg, table, hasbits,           \
-                                        (uint64_t)dst);                        \
-    } else {                                                                   \
-      return fastdecode_longstring_noutf8(d, ptr, msg, table, hasbits,         \
-                                          (uint64_t)dst);                      \
-    }                                                                          \
-  }                                                                            \
-                                                                               \
-  ptr += size;                                                                 \
-                                                                               \
-  if (card == CARD_r) {                                                        \
-    if (validate_utf8 && !decode_verifyutf8_inl(dst->data, dst->size)) {       \
-      return fastdecode_err(d, kUpb_DecodeStatus_BadUtf8);                     \
-    }                                                                          \
-    fastdecode_nextret ret = fastdecode_nextrepeated(                          \
-        d, dst, &ptr, &farr, data, tagbytes, sizeof(upb_StringView));          \
-    switch (ret.next) {                                                        \
-      case FD_NEXT_SAMEFIELD:                                                  \
-        dst = ret.dst;                                                         \
-        if (UPB_UNLIKELY((d->options & kUpb_DecodeOption_AliasString) == 0)) { \
-          /* Buffer flipped and we can't alias any more. Bounce to */          \
-          /* copyfunc(), but via dispatch since we need to reload table */     \
-          /* data also. */                                                     \
-          fastdecode_commitarr(dst, &farr, sizeof(upb_StringView));            \
-          data = ret.tag;                                                      \
-          UPB_MUSTTAIL return fastdecode_tagdispatch(UPB_PARSE_ARGS);          \
-        }                                                                      \
-        goto again;                                                            \
-      case FD_NEXT_OTHERFIELD:                                                 \
-        data = ret.tag;                                                        \
-        UPB_MUSTTAIL return fastdecode_tagdispatch(UPB_PARSE_ARGS);            \
-      case FD_NEXT_ATLIMIT:                                                    \
-        return ptr;                                                            \
-    }                                                                          \
-  }                                                                            \
-                                                                               \
-  if (card != CARD_r && validate_utf8) {                                       \
-    data = (uint64_t)dst;                                                      \
-    UPB_MUSTTAIL return fastdecode_verifyutf8(UPB_PARSE_ARGS);                 \
-  }                                                                            \
-                                                                               \
-  UPB_MUSTTAIL return fastdecode_dispatch(UPB_PARSE_ARGS);
-
-/* Generate all combinations:
- * {p,c} x {s,o,r} x {s, b} x {1bt,2bt} */
-
-#define s_VALIDATE true
-#define b_VALIDATE false
-
-#define F(card, tagbytes, type)                                        \
-  UPB_NOINLINE                                                         \
-  const char* upb_c##card##type##_##tagbytes##bt(UPB_PARSE_PARAMS) {   \
-    FASTDECODE_COPYSTRING(d, ptr, msg, table, hasbits, data, tagbytes, \
-                          CARD_##card, type##_VALIDATE);               \
-  }                                                                    \
-  const char* upb_p##card##type##_##tagbytes##bt(UPB_PARSE_PARAMS) {   \
-    FASTDECODE_STRING(d, ptr, msg, table, hasbits, data, tagbytes,     \
-                      CARD_##card, upb_c##card##type##_##tagbytes##bt, \
-                      type##_VALIDATE);                                \
-  }
-
-#define UTF8(card, tagbytes) \
-  F(card, tagbytes, s)       \
-  F(card, tagbytes, b)
-
-#define TAGBYTES(card) \
-  UTF8(card, 1)        \
-  UTF8(card, 2)
-
-TAGBYTES(s)
-TAGBYTES(o)
-TAGBYTES(r)
-
-#undef s_VALIDATE
-#undef b_VALIDATE
-#undef F
-#undef TAGBYTES
-#undef FASTDECODE_LONGSTRING
-#undef FASTDECODE_COPYSTRING
-#undef FASTDECODE_STRING
-
-/* message fields *************************************************************/
-
-UPB_INLINE
-upb_Message* decode_newmsg_ceil(upb_Decoder* d, const upb_MiniTable* l,
-                                int msg_ceil_bytes) {
-  size_t size = l->size + sizeof(upb_Message_Internal);
-  char* msg_data;
-  if (UPB_LIKELY(msg_ceil_bytes > 0 &&
-                 _upb_ArenaHas(&d->arena) >= msg_ceil_bytes)) {
-    UPB_ASSERT(size <= (size_t)msg_ceil_bytes);
-    msg_data = d->arena.head.ptr;
-    d->arena.head.ptr += size;
-    UPB_UNPOISON_MEMORY_REGION(msg_data, msg_ceil_bytes);
-    memset(msg_data, 0, msg_ceil_bytes);
-    UPB_POISON_MEMORY_REGION(msg_data + size, msg_ceil_bytes - size);
-  } else {
-    msg_data = (char*)upb_Arena_Malloc(&d->arena, size);
-    memset(msg_data, 0, size);
-  }
-  return msg_data + sizeof(upb_Message_Internal);
-}
-
-typedef struct {
-  intptr_t table;
-  upb_Message* msg;
-} fastdecode_submsgdata;
-
-UPB_FORCEINLINE
-static const char* fastdecode_tosubmsg(upb_Decoder* d, const char* ptr,
-                                       void* ctx) {
-  fastdecode_submsgdata* submsg = ctx;
-  ptr = fastdecode_dispatch(d, ptr, submsg->msg, submsg->table, 0, 0);
-  UPB_ASSUME(ptr != NULL);
-  return ptr;
-}
-
-#define FASTDECODE_SUBMSG(d, ptr, msg, table, hasbits, data, tagbytes,    \
-                          msg_ceil_bytes, card)                           \
-                                                                          \
-  if (UPB_UNLIKELY(!fastdecode_checktag(data, tagbytes))) {               \
-    RETURN_GENERIC("submessage field tag mismatch\n");                    \
-  }                                                                       \
-                                                                          \
-  if (--d->depth == 0) {                                                  \
-    return fastdecode_err(d, kUpb_DecodeStatus_MaxDepthExceeded);         \
-  }                                                                       \
-                                                                          \
-  upb_Message** dst;                                                      \
-  uint32_t submsg_idx = (data >> 16) & 0xff;                              \
-  const upb_MiniTable* tablep = decode_totablep(table);                   \
-  const upb_MiniTable* subtablep = tablep->subs[submsg_idx].submsg;       \
-  fastdecode_submsgdata submsg = {decode_totable(subtablep)};             \
-  fastdecode_arr farr;                                                    \
-                                                                          \
-  if (subtablep->table_mask == (uint8_t)-1) {                             \
-    RETURN_GENERIC("submessage doesn't have fast tables.");               \
-  }                                                                       \
-                                                                          \
-  dst = fastdecode_getfield(d, ptr, msg, &data, &hasbits, &farr,          \
-                            sizeof(upb_Message*), card);                  \
-                                                                          \
-  if (card == CARD_s) {                                                   \
-    *(uint32_t*)msg |= hasbits;                                           \
-    hasbits = 0;                                                          \
-  }                                                                       \
-                                                                          \
-  again:                                                                  \
-  if (card == CARD_r) {                                                   \
-    dst = fastdecode_resizearr(d, dst, &farr, sizeof(upb_Message*));      \
-  }                                                                       \
-                                                                          \
-  submsg.msg = *dst;                                                      \
-                                                                          \
-  if (card == CARD_r || UPB_LIKELY(!submsg.msg)) {                        \
-    *dst = submsg.msg = decode_newmsg_ceil(d, subtablep, msg_ceil_bytes); \
-  }                                                                       \
-                                                                          \
-  ptr += tagbytes;                                                        \
-  ptr = fastdecode_delimited(d, ptr, fastdecode_tosubmsg, &submsg);       \
-                                                                          \
-  if (UPB_UNLIKELY(ptr == NULL || d->end_group != DECODE_NOGROUP)) {      \
-    return fastdecode_err(d, kUpb_DecodeStatus_Malformed);                \
-  }                                                                       \
-                                                                          \
-  if (card == CARD_r) {                                                   \
-    fastdecode_nextret ret = fastdecode_nextrepeated(                     \
-        d, dst, &ptr, &farr, data, tagbytes, sizeof(upb_Message*));       \
-    switch (ret.next) {                                                   \
-      case FD_NEXT_SAMEFIELD:                                             \
-        dst = ret.dst;                                                    \
-        goto again;                                                       \
-      case FD_NEXT_OTHERFIELD:                                            \
-        d->depth++;                                                       \
-        data = ret.tag;                                                   \
-        UPB_MUSTTAIL return fastdecode_tagdispatch(UPB_PARSE_ARGS);       \
-      case FD_NEXT_ATLIMIT:                                               \
-        d->depth++;                                                       \
-        return ptr;                                                       \
-    }                                                                     \
-  }                                                                       \
-                                                                          \
-  d->depth++;                                                             \
-  UPB_MUSTTAIL return fastdecode_dispatch(UPB_PARSE_ARGS);
-
-#define F(card, tagbytes, size_ceil, ceil_arg)                               \
-  const char* upb_p##card##m_##tagbytes##bt_max##size_ceil##b(               \
-      UPB_PARSE_PARAMS) {                                                    \
-    FASTDECODE_SUBMSG(d, ptr, msg, table, hasbits, data, tagbytes, ceil_arg, \
-                      CARD_##card);                                          \
-  }
-
-#define SIZES(card, tagbytes) \
-  F(card, tagbytes, 64, 64)   \
-  F(card, tagbytes, 128, 128) \
-  F(card, tagbytes, 192, 192) \
-  F(card, tagbytes, 256, 256) \
-  F(card, tagbytes, max, -1)
-
-#define TAGBYTES(card) \
-  SIZES(card, 1)       \
-  SIZES(card, 2)
-
-TAGBYTES(s)
-TAGBYTES(o)
-TAGBYTES(r)
-
-#undef TAGBYTES
-#undef SIZES
-#undef F
-#undef FASTDECODE_SUBMSG
-
-#endif /* UPB_FASTTABLE */
-
-/** upb/json_decode.c ************************************************************/
-
-#include <errno.h>
-#include <float.h>
-#include <inttypes.h>
-#include <limits.h>
-#include <math.h>
-#include <setjmp.h>
-#include <stdlib.h>
-#include <string.h>
-
-
-/* Special header, must be included last. */
-
-typedef struct {
-  const char *ptr, *end;
-  upb_Arena* arena; /* TODO: should we have a tmp arena for tmp data? */
-  const upb_DefPool* symtab;
-  int depth;
-  upb_Status* status;
-  jmp_buf err;
-  int line;
-  const char* line_begin;
-  bool is_first;
-  int options;
-  const upb_FieldDef* debug_field;
-} jsondec;
-
-enum { JD_OBJECT, JD_ARRAY, JD_STRING, JD_NUMBER, JD_TRUE, JD_FALSE, JD_NULL };
-
-/* Forward declarations of mutually-recursive functions. */
-static void jsondec_wellknown(jsondec* d, upb_Message* msg,
-                              const upb_MessageDef* m);
-static upb_MessageValue jsondec_value(jsondec* d, const upb_FieldDef* f);
-static void jsondec_wellknownvalue(jsondec* d, upb_Message* msg,
-                                   const upb_MessageDef* m);
-static void jsondec_object(jsondec* d, upb_Message* msg,
-                           const upb_MessageDef* m);
-
-static bool jsondec_streql(upb_StringView str, const char* lit) {
-  return str.size == strlen(lit) && memcmp(str.data, lit, str.size) == 0;
-}
-
-static bool jsondec_isnullvalue(const upb_FieldDef* f) {
-  return upb_FieldDef_CType(f) == kUpb_CType_Enum &&
-         strcmp(upb_EnumDef_FullName(upb_FieldDef_EnumSubDef(f)),
-                "google.protobuf.NullValue") == 0;
-}
-
-static bool jsondec_isvalue(const upb_FieldDef* f) {
-  return (upb_FieldDef_CType(f) == kUpb_CType_Message &&
-          upb_MessageDef_WellKnownType(upb_FieldDef_MessageSubDef(f)) ==
-              kUpb_WellKnown_Value) ||
-         jsondec_isnullvalue(f);
-}
-
-UPB_NORETURN static void jsondec_err(jsondec* d, const char* msg) {
-  upb_Status_SetErrorFormat(d->status, "Error parsing JSON @%d:%d: %s", d->line,
-                            (int)(d->ptr - d->line_begin), msg);
-  UPB_LONGJMP(d->err, 1);
-}
-
-UPB_PRINTF(2, 3)
-UPB_NORETURN static void jsondec_errf(jsondec* d, const char* fmt, ...) {
-  va_list argp;
-  upb_Status_SetErrorFormat(d->status, "Error parsing JSON @%d:%d: ", d->line,
-                            (int)(d->ptr - d->line_begin));
-  va_start(argp, fmt);
-  upb_Status_VAppendErrorFormat(d->status, fmt, argp);
-  va_end(argp);
-  UPB_LONGJMP(d->err, 1);
-}
-
-static void jsondec_skipws(jsondec* d) {
-  while (d->ptr != d->end) {
-    switch (*d->ptr) {
-      case '\n':
-        d->line++;
-        d->line_begin = d->ptr;
-        /* Fallthrough. */
-      case '\r':
-      case '\t':
-      case ' ':
-        d->ptr++;
-        break;
-      default:
-        return;
-    }
-  }
-  jsondec_err(d, "Unexpected EOF");
-}
-
-static bool jsondec_tryparsech(jsondec* d, char ch) {
-  if (d->ptr == d->end || *d->ptr != ch) return false;
-  d->ptr++;
-  return true;
-}
-
-static void jsondec_parselit(jsondec* d, const char* lit) {
-  size_t avail = d->end - d->ptr;
-  size_t len = strlen(lit);
-  if (avail < len || memcmp(d->ptr, lit, len) != 0) {
-    jsondec_errf(d, "Expected: '%s'", lit);
-  }
-  d->ptr += len;
-}
-
-static void jsondec_wsch(jsondec* d, char ch) {
-  jsondec_skipws(d);
-  if (!jsondec_tryparsech(d, ch)) {
-    jsondec_errf(d, "Expected: '%c'", ch);
-  }
-}
-
-static void jsondec_true(jsondec* d) { jsondec_parselit(d, "true"); }
-static void jsondec_false(jsondec* d) { jsondec_parselit(d, "false"); }
-static void jsondec_null(jsondec* d) { jsondec_parselit(d, "null"); }
-
-static void jsondec_entrysep(jsondec* d) {
-  jsondec_skipws(d);
-  jsondec_parselit(d, ":");
-}
-
-static int jsondec_rawpeek(jsondec* d) {
-  switch (*d->ptr) {
-    case '{':
-      return JD_OBJECT;
-    case '[':
-      return JD_ARRAY;
-    case '"':
-      return JD_STRING;
-    case '-':
-    case '0':
-    case '1':
-    case '2':
-    case '3':
-    case '4':
-    case '5':
-    case '6':
-    case '7':
-    case '8':
-    case '9':
-      return JD_NUMBER;
-    case 't':
-      return JD_TRUE;
-    case 'f':
-      return JD_FALSE;
-    case 'n':
-      return JD_NULL;
-    default:
-      jsondec_errf(d, "Unexpected character: '%c'", *d->ptr);
-  }
-}
-
-/* JSON object/array **********************************************************/
-
-/* These are used like so:
- *
- * jsondec_objstart(d);
- * while (jsondec_objnext(d)) {
- *   ...
- * }
- * jsondec_objend(d) */
-
-static int jsondec_peek(jsondec* d) {
-  jsondec_skipws(d);
-  return jsondec_rawpeek(d);
-}
-
-static void jsondec_push(jsondec* d) {
-  if (--d->depth < 0) {
-    jsondec_err(d, "Recursion limit exceeded");
-  }
-  d->is_first = true;
-}
-
-static bool jsondec_seqnext(jsondec* d, char end_ch) {
-  bool is_first = d->is_first;
-  d->is_first = false;
-  jsondec_skipws(d);
-  if (*d->ptr == end_ch) return false;
-  if (!is_first) jsondec_parselit(d, ",");
-  return true;
-}
-
-static void jsondec_arrstart(jsondec* d) {
-  jsondec_push(d);
-  jsondec_wsch(d, '[');
-}
-
-static void jsondec_arrend(jsondec* d) {
-  d->depth++;
-  jsondec_wsch(d, ']');
-}
-
-static bool jsondec_arrnext(jsondec* d) { return jsondec_seqnext(d, ']'); }
-
-static void jsondec_objstart(jsondec* d) {
-  jsondec_push(d);
-  jsondec_wsch(d, '{');
-}
-
-static void jsondec_objend(jsondec* d) {
-  d->depth++;
-  jsondec_wsch(d, '}');
-}
-
-static bool jsondec_objnext(jsondec* d) {
-  if (!jsondec_seqnext(d, '}')) return false;
-  if (jsondec_peek(d) != JD_STRING) {
-    jsondec_err(d, "Object must start with string");
-  }
-  return true;
-}
-
-/* JSON number ****************************************************************/
-
-static bool jsondec_tryskipdigits(jsondec* d) {
-  const char* start = d->ptr;
-
-  while (d->ptr < d->end) {
-    if (*d->ptr < '0' || *d->ptr > '9') {
-      break;
-    }
-    d->ptr++;
-  }
-
-  return d->ptr != start;
-}
-
-static void jsondec_skipdigits(jsondec* d) {
-  if (!jsondec_tryskipdigits(d)) {
-    jsondec_err(d, "Expected one or more digits");
-  }
-}
-
-static double jsondec_number(jsondec* d) {
-  const char* start = d->ptr;
-
-  assert(jsondec_rawpeek(d) == JD_NUMBER);
-
-  /* Skip over the syntax of a number, as specified by JSON. */
-  if (*d->ptr == '-') d->ptr++;
-
-  if (jsondec_tryparsech(d, '0')) {
-    if (jsondec_tryskipdigits(d)) {
-      jsondec_err(d, "number cannot have leading zero");
-    }
-  } else {
-    jsondec_skipdigits(d);
-  }
-
-  if (d->ptr == d->end) goto parse;
-  if (jsondec_tryparsech(d, '.')) {
-    jsondec_skipdigits(d);
-  }
-  if (d->ptr == d->end) goto parse;
-
-  if (*d->ptr == 'e' || *d->ptr == 'E') {
-    d->ptr++;
-    if (d->ptr == d->end) {
-      jsondec_err(d, "Unexpected EOF in number");
-    }
-    if (*d->ptr == '+' || *d->ptr == '-') {
-      d->ptr++;
-    }
-    jsondec_skipdigits(d);
-  }
-
-parse:
-  /* Having verified the syntax of a JSON number, use strtod() to parse
-   * (strtod() accepts a superset of JSON syntax). */
-  errno = 0;
-  {
-    char* end;
-    double val = strtod(start, &end);
-    assert(end == d->ptr);
-
-    /* Currently the min/max-val conformance tests fail if we check this.  Does
-     * this mean the conformance tests are wrong or strtod() is wrong, or
-     * something else?  Investigate further. */
-    /*
-    if (errno == ERANGE) {
-      jsondec_err(d, "Number out of range");
-    }
-    */
-
-    if (val > DBL_MAX || val < -DBL_MAX) {
-      jsondec_err(d, "Number out of range");
-    }
-
-    return val;
-  }
-}
-
-/* JSON string ****************************************************************/
-
-static char jsondec_escape(jsondec* d) {
-  switch (*d->ptr++) {
-    case '"':
-      return '\"';
-    case '\\':
-      return '\\';
-    case '/':
-      return '/';
-    case 'b':
-      return '\b';
-    case 'f':
-      return '\f';
-    case 'n':
-      return '\n';
-    case 'r':
-      return '\r';
-    case 't':
-      return '\t';
-    default:
-      jsondec_err(d, "Invalid escape char");
-  }
-}
-
-static uint32_t jsondec_codepoint(jsondec* d) {
-  uint32_t cp = 0;
-  const char* end;
-
-  if (d->end - d->ptr < 4) {
-    jsondec_err(d, "EOF inside string");
-  }
-
-  end = d->ptr + 4;
-  while (d->ptr < end) {
-    char ch = *d->ptr++;
-    if (ch >= '0' && ch <= '9') {
-      ch -= '0';
-    } else if (ch >= 'a' && ch <= 'f') {
-      ch = ch - 'a' + 10;
-    } else if (ch >= 'A' && ch <= 'F') {
-      ch = ch - 'A' + 10;
-    } else {
-      jsondec_err(d, "Invalid hex digit");
-    }
-    cp = (cp << 4) | ch;
-  }
-
-  return cp;
-}
-
-/* Parses a \uXXXX unicode escape (possibly a surrogate pair). */
-static size_t jsondec_unicode(jsondec* d, char* out) {
-  uint32_t cp = jsondec_codepoint(d);
-  if (cp >= 0xd800 && cp <= 0xdbff) {
-    /* Surrogate pair: two 16-bit codepoints become a 32-bit codepoint. */
-    uint32_t high = cp;
-    uint32_t low;
-    jsondec_parselit(d, "\\u");
-    low = jsondec_codepoint(d);
-    if (low < 0xdc00 || low > 0xdfff) {
-      jsondec_err(d, "Invalid low surrogate");
-    }
-    cp = (high & 0x3ff) << 10;
-    cp |= (low & 0x3ff);
-    cp += 0x10000;
-  } else if (cp >= 0xdc00 && cp <= 0xdfff) {
-    jsondec_err(d, "Unpaired low surrogate");
-  }
-
-  /* Write to UTF-8 */
-  if (cp <= 0x7f) {
-    out[0] = cp;
-    return 1;
-  } else if (cp <= 0x07FF) {
-    out[0] = ((cp >> 6) & 0x1F) | 0xC0;
-    out[1] = ((cp >> 0) & 0x3F) | 0x80;
-    return 2;
-  } else if (cp <= 0xFFFF) {
-    out[0] = ((cp >> 12) & 0x0F) | 0xE0;
-    out[1] = ((cp >> 6) & 0x3F) | 0x80;
-    out[2] = ((cp >> 0) & 0x3F) | 0x80;
-    return 3;
-  } else if (cp < 0x10FFFF) {
-    out[0] = ((cp >> 18) & 0x07) | 0xF0;
-    out[1] = ((cp >> 12) & 0x3f) | 0x80;
-    out[2] = ((cp >> 6) & 0x3f) | 0x80;
-    out[3] = ((cp >> 0) & 0x3f) | 0x80;
-    return 4;
-  } else {
-    jsondec_err(d, "Invalid codepoint");
-  }
-}
-
-static void jsondec_resize(jsondec* d, char** buf, char** end, char** buf_end) {
-  size_t oldsize = *buf_end - *buf;
-  size_t len = *end - *buf;
-  size_t size = UPB_MAX(8, 2 * oldsize);
-
-  *buf = upb_Arena_Realloc(d->arena, *buf, len, size);
-  if (!*buf) jsondec_err(d, "Out of memory");
-
-  *end = *buf + len;
-  *buf_end = *buf + size;
-}
-
-static upb_StringView jsondec_string(jsondec* d) {
-  char* buf = NULL;
-  char* end = NULL;
-  char* buf_end = NULL;
-
-  jsondec_skipws(d);
-
-  if (*d->ptr++ != '"') {
-    jsondec_err(d, "Expected string");
-  }
-
-  while (d->ptr < d->end) {
-    char ch = *d->ptr++;
-
-    if (end == buf_end) {
-      jsondec_resize(d, &buf, &end, &buf_end);
-    }
-
-    switch (ch) {
-      case '"': {
-        upb_StringView ret;
-        ret.data = buf;
-        ret.size = end - buf;
-        *end = '\0'; /* Needed for possible strtod(). */
-        return ret;
-      }
-      case '\\':
-        if (d->ptr == d->end) goto eof;
-        if (*d->ptr == 'u') {
-          d->ptr++;
-          if (buf_end - end < 4) {
-            /* Allow space for maximum-sized code point (4 bytes). */
-            jsondec_resize(d, &buf, &end, &buf_end);
-          }
-          end += jsondec_unicode(d, end);
-        } else {
-          *end++ = jsondec_escape(d);
-        }
-        break;
-      default:
-        if ((unsigned char)*d->ptr < 0x20) {
-          jsondec_err(d, "Invalid char in JSON string");
-        }
-        *end++ = ch;
-        break;
-    }
-  }
-
-eof:
-  jsondec_err(d, "EOF inside string");
-}
-
-static void jsondec_skipval(jsondec* d) {
-  switch (jsondec_peek(d)) {
-    case JD_OBJECT:
-      jsondec_objstart(d);
-      while (jsondec_objnext(d)) {
-        jsondec_string(d);
-        jsondec_entrysep(d);
-        jsondec_skipval(d);
-      }
-      jsondec_objend(d);
-      break;
-    case JD_ARRAY:
-      jsondec_arrstart(d);
-      while (jsondec_arrnext(d)) {
-        jsondec_skipval(d);
-      }
-      jsondec_arrend(d);
-      break;
-    case JD_TRUE:
-      jsondec_true(d);
-      break;
-    case JD_FALSE:
-      jsondec_false(d);
-      break;
-    case JD_NULL:
-      jsondec_null(d);
-      break;
-    case JD_STRING:
-      jsondec_string(d);
-      break;
-    case JD_NUMBER:
-      jsondec_number(d);
-      break;
-  }
-}
-
-/* Base64 decoding for bytes fields. ******************************************/
-
-static unsigned int jsondec_base64_tablelookup(const char ch) {
-  /* Table includes the normal base64 chars plus the URL-safe variant. */
-  const signed char table[256] = {
-      -1,       -1,       -1,       -1,       -1,       -1,        -1,
-      -1,       -1,       -1,       -1,       -1,       -1,        -1,
-      -1,       -1,       -1,       -1,       -1,       -1,        -1,
-      -1,       -1,       -1,       -1,       -1,       -1,        -1,
-      -1,       -1,       -1,       -1,       -1,       -1,        -1,
-      -1,       -1,       -1,       -1,       -1,       -1,        -1,
-      -1,       62 /*+*/, -1,       62 /*-*/, -1,       63 /*/ */, 52 /*0*/,
-      53 /*1*/, 54 /*2*/, 55 /*3*/, 56 /*4*/, 57 /*5*/, 58 /*6*/,  59 /*7*/,
-      60 /*8*/, 61 /*9*/, -1,       -1,       -1,       -1,        -1,
-      -1,       -1,       0 /*A*/,  1 /*B*/,  2 /*C*/,  3 /*D*/,   4 /*E*/,
-      5 /*F*/,  6 /*G*/,  07 /*H*/, 8 /*I*/,  9 /*J*/,  10 /*K*/,  11 /*L*/,
-      12 /*M*/, 13 /*N*/, 14 /*O*/, 15 /*P*/, 16 /*Q*/, 17 /*R*/,  18 /*S*/,
-      19 /*T*/, 20 /*U*/, 21 /*V*/, 22 /*W*/, 23 /*X*/, 24 /*Y*/,  25 /*Z*/,
-      -1,       -1,       -1,       -1,       63 /*_*/, -1,        26 /*a*/,
-      27 /*b*/, 28 /*c*/, 29 /*d*/, 30 /*e*/, 31 /*f*/, 32 /*g*/,  33 /*h*/,
-      34 /*i*/, 35 /*j*/, 36 /*k*/, 37 /*l*/, 38 /*m*/, 39 /*n*/,  40 /*o*/,
-      41 /*p*/, 42 /*q*/, 43 /*r*/, 44 /*s*/, 45 /*t*/, 46 /*u*/,  47 /*v*/,
-      48 /*w*/, 49 /*x*/, 50 /*y*/, 51 /*z*/, -1,       -1,        -1,
-      -1,       -1,       -1,       -1,       -1,       -1,        -1,
-      -1,       -1,       -1,       -1,       -1,       -1,        -1,
-      -1,       -1,       -1,       -1,       -1,       -1,        -1,
-      -1,       -1,       -1,       -1,       -1,       -1,        -1,
-      -1,       -1,       -1,       -1,       -1,       -1,        -1,
-      -1,       -1,       -1,       -1,       -1,       -1,        -1,
-      -1,       -1,       -1,       -1,       -1,       -1,        -1,
-      -1,       -1,       -1,       -1,       -1,       -1,        -1,
-      -1,       -1,       -1,       -1,       -1,       -1,        -1,
-      -1,       -1,       -1,       -1,       -1,       -1,        -1,
-      -1,       -1,       -1,       -1,       -1,       -1,        -1,
-      -1,       -1,       -1,       -1,       -1,       -1,        -1,
-      -1,       -1,       -1,       -1,       -1,       -1,        -1,
-      -1,       -1,       -1,       -1,       -1,       -1,        -1,
-      -1,       -1,       -1,       -1,       -1,       -1,        -1,
-      -1,       -1,       -1,       -1,       -1,       -1,        -1,
-      -1,       -1,       -1,       -1,       -1,       -1,        -1,
-      -1,       -1,       -1,       -1,       -1,       -1,        -1,
-      -1,       -1,       -1,       -1};
-
-  /* Sign-extend return value so high bit will be set on any unexpected char. */
-  return table[(unsigned)ch];
-}
-
-static char* jsondec_partialbase64(jsondec* d, const char* ptr, const char* end,
-                                   char* out) {
-  int32_t val = -1;
-
-  switch (end - ptr) {
-    case 2:
-      val = jsondec_base64_tablelookup(ptr[0]) << 18 |
-            jsondec_base64_tablelookup(ptr[1]) << 12;
-      out[0] = val >> 16;
-      out += 1;
-      break;
-    case 3:
-      val = jsondec_base64_tablelookup(ptr[0]) << 18 |
-            jsondec_base64_tablelookup(ptr[1]) << 12 |
-            jsondec_base64_tablelookup(ptr[2]) << 6;
-      out[0] = val >> 16;
-      out[1] = (val >> 8) & 0xff;
-      out += 2;
-      break;
-  }
-
-  if (val < 0) {
-    jsondec_err(d, "Corrupt base64");
-  }
-
-  return out;
-}
-
-static size_t jsondec_base64(jsondec* d, upb_StringView str) {
-  /* We decode in place. This is safe because this is a new buffer (not
-   * aliasing the input) and because base64 decoding shrinks 4 bytes into 3. */
-  char* out = (char*)str.data;
-  const char* ptr = str.data;
-  const char* end = ptr + str.size;
-  const char* end4 = ptr + (str.size & -4); /* Round down to multiple of 4. */
-
-  for (; ptr < end4; ptr += 4, out += 3) {
-    int val = jsondec_base64_tablelookup(ptr[0]) << 18 |
-              jsondec_base64_tablelookup(ptr[1]) << 12 |
-              jsondec_base64_tablelookup(ptr[2]) << 6 |
-              jsondec_base64_tablelookup(ptr[3]) << 0;
-
-    if (val < 0) {
-      /* Junk chars or padding. Remove trailing padding, if any. */
-      if (end - ptr == 4 && ptr[3] == '=') {
-        if (ptr[2] == '=') {
-          end -= 2;
-        } else {
-          end -= 1;
-        }
-      }
-      break;
-    }
-
-    out[0] = val >> 16;
-    out[1] = (val >> 8) & 0xff;
-    out[2] = val & 0xff;
-  }
-
-  if (ptr < end) {
-    /* Process remaining chars. We do not require padding. */
-    out = jsondec_partialbase64(d, ptr, end, out);
-  }
-
-  return out - str.data;
-}
-
-/* Low-level integer parsing **************************************************/
-
-/* We use these hand-written routines instead of strto[u]l() because the "long
- * long" variants aren't in c89. Also our version allows setting a ptr limit. */
-
-static const char* jsondec_buftouint64(jsondec* d, const char* ptr,
-                                       const char* end, uint64_t* val) {
-  uint64_t u64 = 0;
-  while (ptr < end) {
-    unsigned ch = *ptr - '0';
-    if (ch >= 10) break;
-    if (u64 > UINT64_MAX / 10 || u64 * 10 > UINT64_MAX - ch) {
-      jsondec_err(d, "Integer overflow");
-    }
-    u64 *= 10;
-    u64 += ch;
-    ptr++;
-  }
-
-  *val = u64;
-  return ptr;
-}
-
-static const char* jsondec_buftoint64(jsondec* d, const char* ptr,
-                                      const char* end, int64_t* val) {
-  bool neg = false;
-  uint64_t u64;
-
-  if (ptr != end && *ptr == '-') {
-    ptr++;
-    neg = true;
-  }
-
-  ptr = jsondec_buftouint64(d, ptr, end, &u64);
-  if (u64 > (uint64_t)INT64_MAX + neg) {
-    jsondec_err(d, "Integer overflow");
-  }
-
-  *val = neg ? -u64 : u64;
-  return ptr;
-}
-
-static uint64_t jsondec_strtouint64(jsondec* d, upb_StringView str) {
-  const char* end = str.data + str.size;
-  uint64_t ret;
-  if (jsondec_buftouint64(d, str.data, end, &ret) != end) {
-    jsondec_err(d, "Non-number characters in quoted integer");
-  }
-  return ret;
-}
-
-static int64_t jsondec_strtoint64(jsondec* d, upb_StringView str) {
-  const char* end = str.data + str.size;
-  int64_t ret;
-  if (jsondec_buftoint64(d, str.data, end, &ret) != end) {
-    jsondec_err(d, "Non-number characters in quoted integer");
-  }
-  return ret;
-}
-
-/* Primitive value types ******************************************************/
-
-/* Parse INT32 or INT64 value. */
-static upb_MessageValue jsondec_int(jsondec* d, const upb_FieldDef* f) {
-  upb_MessageValue val;
-
-  switch (jsondec_peek(d)) {
-    case JD_NUMBER: {
-      double dbl = jsondec_number(d);
-      if (dbl > 9223372036854774784.0 || dbl < -9223372036854775808.0) {
-        jsondec_err(d, "JSON number is out of range.");
-      }
-      val.int64_val = dbl; /* must be guarded, overflow here is UB */
-      if (val.int64_val != dbl) {
-        jsondec_errf(d, "JSON number was not integral (%f != %" PRId64 ")", dbl,
-                     val.int64_val);
-      }
-      break;
-    }
-    case JD_STRING: {
-      upb_StringView str = jsondec_string(d);
-      val.int64_val = jsondec_strtoint64(d, str);
-      break;
-    }
-    default:
-      jsondec_err(d, "Expected number or string");
-  }
-
-  if (upb_FieldDef_CType(f) == kUpb_CType_Int32 ||
-      upb_FieldDef_CType(f) == kUpb_CType_Enum) {
-    if (val.int64_val > INT32_MAX || val.int64_val < INT32_MIN) {
-      jsondec_err(d, "Integer out of range.");
-    }
-    val.int32_val = (int32_t)val.int64_val;
-  }
-
-  return val;
-}
-
-/* Parse UINT32 or UINT64 value. */
-static upb_MessageValue jsondec_uint(jsondec* d, const upb_FieldDef* f) {
-  upb_MessageValue val = {0};
-
-  switch (jsondec_peek(d)) {
-    case JD_NUMBER: {
-      double dbl = jsondec_number(d);
-      if (dbl > 18446744073709549568.0 || dbl < 0) {
-        jsondec_err(d, "JSON number is out of range.");
-      }
-      val.uint64_val = dbl; /* must be guarded, overflow here is UB */
-      if (val.uint64_val != dbl) {
-        jsondec_errf(d, "JSON number was not integral (%f != %" PRIu64 ")", dbl,
-                     val.uint64_val);
-      }
-      break;
-    }
-    case JD_STRING: {
-      upb_StringView str = jsondec_string(d);
-      val.uint64_val = jsondec_strtouint64(d, str);
-      break;
-    }
-    default:
-      jsondec_err(d, "Expected number or string");
-  }
-
-  if (upb_FieldDef_CType(f) == kUpb_CType_UInt32) {
-    if (val.uint64_val > UINT32_MAX) {
-      jsondec_err(d, "Integer out of range.");
-    }
-    val.uint32_val = (uint32_t)val.uint64_val;
-  }
-
-  return val;
-}
-
-/* Parse DOUBLE or FLOAT value. */
-static upb_MessageValue jsondec_double(jsondec* d, const upb_FieldDef* f) {
-  upb_StringView str;
-  upb_MessageValue val = {0};
-
-  switch (jsondec_peek(d)) {
-    case JD_NUMBER:
-      val.double_val = jsondec_number(d);
-      break;
-    case JD_STRING:
-      str = jsondec_string(d);
-      if (jsondec_streql(str, "NaN")) {
-        val.double_val = NAN;
-      } else if (jsondec_streql(str, "Infinity")) {
-        val.double_val = INFINITY;
-      } else if (jsondec_streql(str, "-Infinity")) {
-        val.double_val = -INFINITY;
-      } else {
-        val.double_val = strtod(str.data, NULL);
-      }
-      break;
-    default:
-      jsondec_err(d, "Expected number or string");
-  }
-
-  if (upb_FieldDef_CType(f) == kUpb_CType_Float) {
-    if (val.double_val != INFINITY && val.double_val != -INFINITY &&
-        (val.double_val > FLT_MAX || val.double_val < -FLT_MAX)) {
-      jsondec_err(d, "Float out of range");
-    }
-    val.float_val = val.double_val;
-  }
-
-  return val;
-}
-
-/* Parse STRING or BYTES value. */
-static upb_MessageValue jsondec_strfield(jsondec* d, const upb_FieldDef* f) {
-  upb_MessageValue val;
-  val.str_val = jsondec_string(d);
-  if (upb_FieldDef_CType(f) == kUpb_CType_Bytes) {
-    val.str_val.size = jsondec_base64(d, val.str_val);
-  }
-  return val;
-}
-
-static upb_MessageValue jsondec_enum(jsondec* d, const upb_FieldDef* f) {
-  switch (jsondec_peek(d)) {
-    case JD_STRING: {
-      upb_StringView str = jsondec_string(d);
-      const upb_EnumDef* e = upb_FieldDef_EnumSubDef(f);
-      const upb_EnumValueDef* ev =
-          upb_EnumDef_FindValueByNameWithSize(e, str.data, str.size);
-      upb_MessageValue val;
-      if (ev) {
-        val.int32_val = upb_EnumValueDef_Number(ev);
-      } else {
-        if (d->options & upb_JsonDecode_IgnoreUnknown) {
-          val.int32_val = 0;
-        } else {
-          jsondec_errf(d, "Unknown enumerator: '" UPB_STRINGVIEW_FORMAT "'",
-                       UPB_STRINGVIEW_ARGS(str));
-        }
-      }
-      return val;
-    }
-    case JD_NULL: {
-      if (jsondec_isnullvalue(f)) {
-        upb_MessageValue val;
-        jsondec_null(d);
-        val.int32_val = 0;
-        return val;
-      }
-    }
-      /* Fallthrough. */
-    default:
-      return jsondec_int(d, f);
-  }
-}
-
-static upb_MessageValue jsondec_bool(jsondec* d, const upb_FieldDef* f) {
-  bool is_map_key = upb_FieldDef_Number(f) == 1 &&
-                    upb_MessageDef_IsMapEntry(upb_FieldDef_ContainingType(f));
-  upb_MessageValue val;
-
-  if (is_map_key) {
-    upb_StringView str = jsondec_string(d);
-    if (jsondec_streql(str, "true")) {
-      val.bool_val = true;
-    } else if (jsondec_streql(str, "false")) {
-      val.bool_val = false;
-    } else {
-      jsondec_err(d, "Invalid boolean map key");
-    }
-  } else {
-    switch (jsondec_peek(d)) {
-      case JD_TRUE:
-        val.bool_val = true;
-        jsondec_true(d);
-        break;
-      case JD_FALSE:
-        val.bool_val = false;
-        jsondec_false(d);
-        break;
-      default:
-        jsondec_err(d, "Expected true or false");
-    }
-  }
-
-  return val;
-}
-
-/* Composite types (array/message/map) ****************************************/
-
-static void jsondec_array(jsondec* d, upb_Message* msg, const upb_FieldDef* f) {
-  upb_Array* arr = upb_Message_Mutable(msg, f, d->arena).array;
-
-  jsondec_arrstart(d);
-  while (jsondec_arrnext(d)) {
-    upb_MessageValue elem = jsondec_value(d, f);
-    upb_Array_Append(arr, elem, d->arena);
-  }
-  jsondec_arrend(d);
-}
-
-static void jsondec_map(jsondec* d, upb_Message* msg, const upb_FieldDef* f) {
-  upb_Map* map = upb_Message_Mutable(msg, f, d->arena).map;
-  const upb_MessageDef* entry = upb_FieldDef_MessageSubDef(f);
-  const upb_FieldDef* key_f = upb_MessageDef_FindFieldByNumber(entry, 1);
-  const upb_FieldDef* val_f = upb_MessageDef_FindFieldByNumber(entry, 2);
-
-  jsondec_objstart(d);
-  while (jsondec_objnext(d)) {
-    upb_MessageValue key, val;
-    key = jsondec_value(d, key_f);
-    jsondec_entrysep(d);
-    val = jsondec_value(d, val_f);
-    upb_Map_Set(map, key, val, d->arena);
-  }
-  jsondec_objend(d);
-}
-
-static void jsondec_tomsg(jsondec* d, upb_Message* msg,
-                          const upb_MessageDef* m) {
-  if (upb_MessageDef_WellKnownType(m) == kUpb_WellKnown_Unspecified) {
-    jsondec_object(d, msg, m);
-  } else {
-    jsondec_wellknown(d, msg, m);
-  }
-}
-
-static upb_MessageValue jsondec_msg(jsondec* d, const upb_FieldDef* f) {
-  const upb_MessageDef* m = upb_FieldDef_MessageSubDef(f);
-  upb_Message* msg = upb_Message_New(m, d->arena);
-  upb_MessageValue val;
-
-  jsondec_tomsg(d, msg, m);
-  val.msg_val = msg;
-  return val;
-}
-
-static void jsondec_field(jsondec* d, upb_Message* msg,
-                          const upb_MessageDef* m) {
-  upb_StringView name;
-  const upb_FieldDef* f;
-  const upb_FieldDef* preserved;
-
-  name = jsondec_string(d);
-  jsondec_entrysep(d);
-
-  if (name.size >= 2 && name.data[0] == '[' &&
-      name.data[name.size - 1] == ']') {
-    f = upb_DefPool_FindExtensionByNameWithSize(d->symtab, name.data + 1,
-                                                name.size - 2);
-    if (f && upb_FieldDef_ContainingType(f) != m) {
-      jsondec_errf(
-          d, "Extension %s extends message %s, but was seen in message %s",
-          upb_FieldDef_FullName(f),
-          upb_MessageDef_FullName(upb_FieldDef_ContainingType(f)),
-          upb_MessageDef_FullName(m));
-    }
-  } else {
-    f = upb_MessageDef_FindByJsonNameWithSize(m, name.data, name.size);
-  }
-
-  if (!f) {
-    if ((d->options & upb_JsonDecode_IgnoreUnknown) == 0) {
-      jsondec_errf(d, "No such field: " UPB_STRINGVIEW_FORMAT,
-                   UPB_STRINGVIEW_ARGS(name));
-    }
-    jsondec_skipval(d);
-    return;
-  }
-
-  if (jsondec_peek(d) == JD_NULL && !jsondec_isvalue(f)) {
-    /* JSON "null" indicates a default value, so no need to set anything. */
-    jsondec_null(d);
-    return;
-  }
-
-  if (upb_FieldDef_RealContainingOneof(f) &&
-      upb_Message_WhichOneof(msg, upb_FieldDef_ContainingOneof(f))) {
-    jsondec_err(d, "More than one field for this oneof.");
-  }
-
-  preserved = d->debug_field;
-  d->debug_field = f;
-
-  if (upb_FieldDef_IsMap(f)) {
-    jsondec_map(d, msg, f);
-  } else if (upb_FieldDef_IsRepeated(f)) {
-    jsondec_array(d, msg, f);
-  } else if (upb_FieldDef_IsSubMessage(f)) {
-    upb_Message* submsg = upb_Message_Mutable(msg, f, d->arena).msg;
-    const upb_MessageDef* subm = upb_FieldDef_MessageSubDef(f);
-    jsondec_tomsg(d, submsg, subm);
-  } else {
-    upb_MessageValue val = jsondec_value(d, f);
-    upb_Message_Set(msg, f, val, d->arena);
-  }
-
-  d->debug_field = preserved;
-}
-
-static void jsondec_object(jsondec* d, upb_Message* msg,
-                           const upb_MessageDef* m) {
-  jsondec_objstart(d);
-  while (jsondec_objnext(d)) {
-    jsondec_field(d, msg, m);
-  }
-  jsondec_objend(d);
-}
-
-static upb_MessageValue jsondec_value(jsondec* d, const upb_FieldDef* f) {
-  switch (upb_FieldDef_CType(f)) {
-    case kUpb_CType_Bool:
-      return jsondec_bool(d, f);
-    case kUpb_CType_Float:
-    case kUpb_CType_Double:
-      return jsondec_double(d, f);
-    case kUpb_CType_UInt32:
-    case kUpb_CType_UInt64:
-      return jsondec_uint(d, f);
-    case kUpb_CType_Int32:
-    case kUpb_CType_Int64:
-      return jsondec_int(d, f);
-    case kUpb_CType_String:
-    case kUpb_CType_Bytes:
-      return jsondec_strfield(d, f);
-    case kUpb_CType_Enum:
-      return jsondec_enum(d, f);
-    case kUpb_CType_Message:
-      return jsondec_msg(d, f);
-    default:
-      UPB_UNREACHABLE();
-  }
-}
-
-/* Well-known types ***********************************************************/
-
-static int jsondec_tsdigits(jsondec* d, const char** ptr, size_t digits,
-                            const char* after) {
-  uint64_t val;
-  const char* p = *ptr;
-  const char* end = p + digits;
-  size_t after_len = after ? strlen(after) : 0;
-
-  UPB_ASSERT(digits <= 9); /* int can't overflow. */
-
-  if (jsondec_buftouint64(d, p, end, &val) != end ||
-      (after_len && memcmp(end, after, after_len) != 0)) {
-    jsondec_err(d, "Malformed timestamp");
-  }
-
-  UPB_ASSERT(val < INT_MAX);
-
-  *ptr = end + after_len;
-  return (int)val;
-}
-
-static int jsondec_nanos(jsondec* d, const char** ptr, const char* end) {
-  uint64_t nanos = 0;
-  const char* p = *ptr;
-
-  if (p != end && *p == '.') {
-    const char* nano_end = jsondec_buftouint64(d, p + 1, end, &nanos);
-    int digits = (int)(nano_end - p - 1);
-    int exp_lg10 = 9 - digits;
-    if (digits > 9) {
-      jsondec_err(d, "Too many digits for partial seconds");
-    }
-    while (exp_lg10--) nanos *= 10;
-    *ptr = nano_end;
-  }
-
-  UPB_ASSERT(nanos < INT_MAX);
-
-  return (int)nanos;
-}
-
-/* jsondec_epochdays(1970, 1, 1) == 1970-01-01 == 0. */
-int jsondec_epochdays(int y, int m, int d) {
-  const uint32_t year_base = 4800; /* Before min year, multiple of 400. */
-  const uint32_t m_adj = m - 3;    /* March-based month. */
-  const uint32_t carry = m_adj > (uint32_t)m ? 1 : 0;
-  const uint32_t adjust = carry ? 12 : 0;
-  const uint32_t y_adj = y + year_base - carry;
-  const uint32_t month_days = ((m_adj + adjust) * 62719 + 769) / 2048;
-  const uint32_t leap_days = y_adj / 4 - y_adj / 100 + y_adj / 400;
-  return y_adj * 365 + leap_days + month_days + (d - 1) - 2472632;
-}
-
-static int64_t jsondec_unixtime(int y, int m, int d, int h, int min, int s) {
-  return (int64_t)jsondec_epochdays(y, m, d) * 86400 + h * 3600 + min * 60 + s;
-}
-
-static void jsondec_timestamp(jsondec* d, upb_Message* msg,
-                              const upb_MessageDef* m) {
-  upb_MessageValue seconds;
-  upb_MessageValue nanos;
-  upb_StringView str = jsondec_string(d);
-  const char* ptr = str.data;
-  const char* end = ptr + str.size;
-
-  if (str.size < 20) goto malformed;
-
-  {
-    /* 1972-01-01T01:00:00 */
-    int year = jsondec_tsdigits(d, &ptr, 4, "-");
-    int mon = jsondec_tsdigits(d, &ptr, 2, "-");
-    int day = jsondec_tsdigits(d, &ptr, 2, "T");
-    int hour = jsondec_tsdigits(d, &ptr, 2, ":");
-    int min = jsondec_tsdigits(d, &ptr, 2, ":");
-    int sec = jsondec_tsdigits(d, &ptr, 2, NULL);
-
-    seconds.int64_val = jsondec_unixtime(year, mon, day, hour, min, sec);
-  }
-
-  nanos.int32_val = jsondec_nanos(d, &ptr, end);
-
-  {
-    /* [+-]08:00 or Z */
-    int ofs_hour = 0;
-    int ofs_min = 0;
-    bool neg = false;
-
-    if (ptr == end) goto malformed;
-
-    switch (*ptr++) {
-      case '-':
-        neg = true;
-        /* fallthrough */
-      case '+':
-        if ((end - ptr) != 5) goto malformed;
-        ofs_hour = jsondec_tsdigits(d, &ptr, 2, ":");
-        ofs_min = jsondec_tsdigits(d, &ptr, 2, NULL);
-        ofs_min = ((ofs_hour * 60) + ofs_min) * 60;
-        seconds.int64_val += (neg ? ofs_min : -ofs_min);
-        break;
-      case 'Z':
-        if (ptr != end) goto malformed;
-        break;
-      default:
-        goto malformed;
-    }
-  }
-
-  if (seconds.int64_val < -62135596800) {
-    jsondec_err(d, "Timestamp out of range");
-  }
-
-  upb_Message_Set(msg, upb_MessageDef_FindFieldByNumber(m, 1), seconds,
-                  d->arena);
-  upb_Message_Set(msg, upb_MessageDef_FindFieldByNumber(m, 2), nanos, d->arena);
-  return;
-
-malformed:
-  jsondec_err(d, "Malformed timestamp");
-}
-
-static void jsondec_duration(jsondec* d, upb_Message* msg,
-                             const upb_MessageDef* m) {
-  upb_MessageValue seconds;
-  upb_MessageValue nanos;
-  upb_StringView str = jsondec_string(d);
-  const char* ptr = str.data;
-  const char* end = ptr + str.size;
-  const int64_t max = (uint64_t)3652500 * 86400;
-
-  /* "3.000000001s", "3s", etc. */
-  ptr = jsondec_buftoint64(d, ptr, end, &seconds.int64_val);
-  nanos.int32_val = jsondec_nanos(d, &ptr, end);
-
-  if (end - ptr != 1 || *ptr != 's') {
-    jsondec_err(d, "Malformed duration");
-  }
-
-  if (seconds.int64_val < -max || seconds.int64_val > max) {
-    jsondec_err(d, "Duration out of range");
-  }
-
-  if (seconds.int64_val < 0) {
-    nanos.int32_val = -nanos.int32_val;
-  }
-
-  upb_Message_Set(msg, upb_MessageDef_FindFieldByNumber(m, 1), seconds,
-                  d->arena);
-  upb_Message_Set(msg, upb_MessageDef_FindFieldByNumber(m, 2), nanos, d->arena);
-}
-
-static void jsondec_listvalue(jsondec* d, upb_Message* msg,
-                              const upb_MessageDef* m) {
-  const upb_FieldDef* values_f = upb_MessageDef_FindFieldByNumber(m, 1);
-  const upb_MessageDef* value_m = upb_FieldDef_MessageSubDef(values_f);
-  upb_Array* values = upb_Message_Mutable(msg, values_f, d->arena).array;
-
-  jsondec_arrstart(d);
-  while (jsondec_arrnext(d)) {
-    upb_Message* value_msg = upb_Message_New(value_m, d->arena);
-    upb_MessageValue value;
-    value.msg_val = value_msg;
-    upb_Array_Append(values, value, d->arena);
-    jsondec_wellknownvalue(d, value_msg, value_m);
-  }
-  jsondec_arrend(d);
-}
-
-static void jsondec_struct(jsondec* d, upb_Message* msg,
-                           const upb_MessageDef* m) {
-  const upb_FieldDef* fields_f = upb_MessageDef_FindFieldByNumber(m, 1);
-  const upb_MessageDef* entry_m = upb_FieldDef_MessageSubDef(fields_f);
-  const upb_FieldDef* value_f = upb_MessageDef_FindFieldByNumber(entry_m, 2);
-  const upb_MessageDef* value_m = upb_FieldDef_MessageSubDef(value_f);
-  upb_Map* fields = upb_Message_Mutable(msg, fields_f, d->arena).map;
-
-  jsondec_objstart(d);
-  while (jsondec_objnext(d)) {
-    upb_MessageValue key, value;
-    upb_Message* value_msg = upb_Message_New(value_m, d->arena);
-    key.str_val = jsondec_string(d);
-    value.msg_val = value_msg;
-    upb_Map_Set(fields, key, value, d->arena);
-    jsondec_entrysep(d);
-    jsondec_wellknownvalue(d, value_msg, value_m);
-  }
-  jsondec_objend(d);
-}
-
-static void jsondec_wellknownvalue(jsondec* d, upb_Message* msg,
-                                   const upb_MessageDef* m) {
-  upb_MessageValue val;
-  const upb_FieldDef* f;
-  upb_Message* submsg;
-
-  switch (jsondec_peek(d)) {
-    case JD_NUMBER:
-      /* double number_value = 2; */
-      f = upb_MessageDef_FindFieldByNumber(m, 2);
-      val.double_val = jsondec_number(d);
-      break;
-    case JD_STRING:
-      /* string string_value = 3; */
-      f = upb_MessageDef_FindFieldByNumber(m, 3);
-      val.str_val = jsondec_string(d);
-      break;
-    case JD_FALSE:
-      /* bool bool_value = 4; */
-      f = upb_MessageDef_FindFieldByNumber(m, 4);
-      val.bool_val = false;
-      jsondec_false(d);
-      break;
-    case JD_TRUE:
-      /* bool bool_value = 4; */
-      f = upb_MessageDef_FindFieldByNumber(m, 4);
-      val.bool_val = true;
-      jsondec_true(d);
-      break;
-    case JD_NULL:
-      /* NullValue null_value = 1; */
-      f = upb_MessageDef_FindFieldByNumber(m, 1);
-      val.int32_val = 0;
-      jsondec_null(d);
-      break;
-    /* Note: these cases return, because upb_Message_Mutable() is enough. */
-    case JD_OBJECT:
-      /* Struct struct_value = 5; */
-      f = upb_MessageDef_FindFieldByNumber(m, 5);
-      submsg = upb_Message_Mutable(msg, f, d->arena).msg;
-      jsondec_struct(d, submsg, upb_FieldDef_MessageSubDef(f));
-      return;
-    case JD_ARRAY:
-      /* ListValue list_value = 6; */
-      f = upb_MessageDef_FindFieldByNumber(m, 6);
-      submsg = upb_Message_Mutable(msg, f, d->arena).msg;
-      jsondec_listvalue(d, submsg, upb_FieldDef_MessageSubDef(f));
-      return;
-    default:
-      UPB_UNREACHABLE();
-  }
-
-  upb_Message_Set(msg, f, val, d->arena);
-}
-
-static upb_StringView jsondec_mask(jsondec* d, const char* buf,
-                                   const char* end) {
-  /* FieldMask fields grow due to inserted '_' characters, so we can't do the
-   * transform in place. */
-  const char* ptr = buf;
-  upb_StringView ret;
-  char* out;
-
-  ret.size = end - ptr;
-  while (ptr < end) {
-    ret.size += (*ptr >= 'A' && *ptr <= 'Z');
-    ptr++;
-  }
-
-  out = upb_Arena_Malloc(d->arena, ret.size);
-  ptr = buf;
-  ret.data = out;
-
-  while (ptr < end) {
-    char ch = *ptr++;
-    if (ch >= 'A' && ch <= 'Z') {
-      *out++ = '_';
-      *out++ = ch + 32;
-    } else if (ch == '_') {
-      jsondec_err(d, "field mask may not contain '_'");
-    } else {
-      *out++ = ch;
-    }
-  }
-
-  return ret;
-}
-
-static void jsondec_fieldmask(jsondec* d, upb_Message* msg,
-                              const upb_MessageDef* m) {
-  /* repeated string paths = 1; */
-  const upb_FieldDef* paths_f = upb_MessageDef_FindFieldByNumber(m, 1);
-  upb_Array* arr = upb_Message_Mutable(msg, paths_f, d->arena).array;
-  upb_StringView str = jsondec_string(d);
-  const char* ptr = str.data;
-  const char* end = ptr + str.size;
-  upb_MessageValue val;
-
-  while (ptr < end) {
-    const char* elem_end = memchr(ptr, ',', end - ptr);
-    if (elem_end) {
-      val.str_val = jsondec_mask(d, ptr, elem_end);
-      ptr = elem_end + 1;
-    } else {
-      val.str_val = jsondec_mask(d, ptr, end);
-      ptr = end;
-    }
-    upb_Array_Append(arr, val, d->arena);
-  }
-}
-
-static void jsondec_anyfield(jsondec* d, upb_Message* msg,
-                             const upb_MessageDef* m) {
-  if (upb_MessageDef_WellKnownType(m) == kUpb_WellKnown_Unspecified) {
-    /* For regular types: {"@type": "[user type]", "f1": <V1>, "f2": <V2>}
-     * where f1, f2, etc. are the normal fields of this type. */
-    jsondec_field(d, msg, m);
-  } else {
-    /* For well-known types: {"@type": "[well-known type]", "value": <X>}
-     * where <X> is whatever encoding the WKT normally uses. */
-    upb_StringView str = jsondec_string(d);
-    jsondec_entrysep(d);
-    if (!jsondec_streql(str, "value")) {
-      jsondec_err(d, "Key for well-known type must be 'value'");
-    }
-    jsondec_wellknown(d, msg, m);
-  }
-}
-
-static const upb_MessageDef* jsondec_typeurl(jsondec* d, upb_Message* msg,
-                                             const upb_MessageDef* m) {
-  const upb_FieldDef* type_url_f = upb_MessageDef_FindFieldByNumber(m, 1);
-  const upb_MessageDef* type_m;
-  upb_StringView type_url = jsondec_string(d);
-  const char* end = type_url.data + type_url.size;
-  const char* ptr = end;
-  upb_MessageValue val;
-
-  val.str_val = type_url;
-  upb_Message_Set(msg, type_url_f, val, d->arena);
-
-  /* Find message name after the last '/' */
-  while (ptr > type_url.data && *--ptr != '/') {
-  }
-
-  if (ptr == type_url.data || ptr == end) {
-    jsondec_err(d, "Type url must have at least one '/' and non-empty host");
-  }
-
-  ptr++;
-  type_m = upb_DefPool_FindMessageByNameWithSize(d->symtab, ptr, end - ptr);
-
-  if (!type_m) {
-    jsondec_err(d, "Type was not found");
-  }
-
-  return type_m;
-}
-
-static void jsondec_any(jsondec* d, upb_Message* msg, const upb_MessageDef* m) {
-  /* string type_url = 1;
-   * bytes value = 2; */
-  const upb_FieldDef* value_f = upb_MessageDef_FindFieldByNumber(m, 2);
-  upb_Message* any_msg;
-  const upb_MessageDef* any_m = NULL;
-  const char* pre_type_data = NULL;
-  const char* pre_type_end = NULL;
-  upb_MessageValue encoded;
-
-  jsondec_objstart(d);
-
-  /* Scan looking for "@type", which is not necessarily first. */
-  while (!any_m && jsondec_objnext(d)) {
-    const char* start = d->ptr;
-    upb_StringView name = jsondec_string(d);
-    jsondec_entrysep(d);
-    if (jsondec_streql(name, "@type")) {
-      any_m = jsondec_typeurl(d, msg, m);
-      if (pre_type_data) {
-        pre_type_end = start;
-        while (*pre_type_end != ',') pre_type_end--;
-      }
-    } else {
-      if (!pre_type_data) pre_type_data = start;
-      jsondec_skipval(d);
-    }
-  }
-
-  if (!any_m) {
-    jsondec_err(d, "Any object didn't contain a '@type' field");
-  }
-
-  any_msg = upb_Message_New(any_m, d->arena);
-
-  if (pre_type_data) {
-    size_t len = pre_type_end - pre_type_data + 1;
-    char* tmp = upb_Arena_Malloc(d->arena, len);
-    const char* saved_ptr = d->ptr;
-    const char* saved_end = d->end;
-    memcpy(tmp, pre_type_data, len - 1);
-    tmp[len - 1] = '}';
-    d->ptr = tmp;
-    d->end = tmp + len;
-    d->is_first = true;
-    while (jsondec_objnext(d)) {
-      jsondec_anyfield(d, any_msg, any_m);
-    }
-    d->ptr = saved_ptr;
-    d->end = saved_end;
-  }
-
-  while (jsondec_objnext(d)) {
-    jsondec_anyfield(d, any_msg, any_m);
-  }
-
-  jsondec_objend(d);
-
-  encoded.str_val.data = upb_Encode(any_msg, upb_MessageDef_MiniTable(any_m), 0,
-                                    d->arena, &encoded.str_val.size);
-  upb_Message_Set(msg, value_f, encoded, d->arena);
-}
-
-static void jsondec_wrapper(jsondec* d, upb_Message* msg,
-                            const upb_MessageDef* m) {
-  const upb_FieldDef* value_f = upb_MessageDef_FindFieldByNumber(m, 1);
-  upb_MessageValue val = jsondec_value(d, value_f);
-  upb_Message_Set(msg, value_f, val, d->arena);
-}
-
-static void jsondec_wellknown(jsondec* d, upb_Message* msg,
-                              const upb_MessageDef* m) {
-  switch (upb_MessageDef_WellKnownType(m)) {
-    case kUpb_WellKnown_Any:
-      jsondec_any(d, msg, m);
-      break;
-    case kUpb_WellKnown_FieldMask:
-      jsondec_fieldmask(d, msg, m);
-      break;
-    case kUpb_WellKnown_Duration:
-      jsondec_duration(d, msg, m);
-      break;
-    case kUpb_WellKnown_Timestamp:
-      jsondec_timestamp(d, msg, m);
-      break;
-    case kUpb_WellKnown_Value:
-      jsondec_wellknownvalue(d, msg, m);
-      break;
-    case kUpb_WellKnown_ListValue:
-      jsondec_listvalue(d, msg, m);
-      break;
-    case kUpb_WellKnown_Struct:
-      jsondec_struct(d, msg, m);
-      break;
-    case kUpb_WellKnown_DoubleValue:
-    case kUpb_WellKnown_FloatValue:
-    case kUpb_WellKnown_Int64Value:
-    case kUpb_WellKnown_UInt64Value:
-    case kUpb_WellKnown_Int32Value:
-    case kUpb_WellKnown_UInt32Value:
-    case kUpb_WellKnown_StringValue:
-    case kUpb_WellKnown_BytesValue:
-    case kUpb_WellKnown_BoolValue:
-      jsondec_wrapper(d, msg, m);
-      break;
-    default:
-      UPB_UNREACHABLE();
-  }
-}
-
-bool upb_JsonDecode(const char* buf, size_t size, upb_Message* msg,
-                    const upb_MessageDef* m, const upb_DefPool* symtab,
-                    int options, upb_Arena* arena, upb_Status* status) {
-  jsondec d;
-
-  if (size == 0) return true;
-
-  d.ptr = buf;
-  d.end = buf + size;
-  d.arena = arena;
-  d.symtab = symtab;
-  d.status = status;
-  d.options = options;
-  d.depth = 64;
-  d.line = 1;
-  d.line_begin = d.ptr;
-  d.debug_field = NULL;
-  d.is_first = false;
-
-  if (UPB_SETJMP(d.err)) return false;
-
-  jsondec_tomsg(&d, msg, m);
-  return true;
-}
-
-/** upb/json_encode.c ************************************************************/
-
-#include <ctype.h>
-#include <float.h>
-#include <inttypes.h>
-#include <math.h>
-#include <setjmp.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <string.h>
-
-
-/* Must be last. */
-
-typedef struct {
-  char *buf, *ptr, *end;
-  size_t overflow;
-  int indent_depth;
-  int options;
-  const upb_DefPool* ext_pool;
-  jmp_buf err;
-  upb_Status* status;
-  upb_Arena* arena;
-} jsonenc;
-
-static void jsonenc_msg(jsonenc* e, const upb_Message* msg,
-                        const upb_MessageDef* m);
-static void jsonenc_scalar(jsonenc* e, upb_MessageValue val,
-                           const upb_FieldDef* f);
-static void jsonenc_msgfield(jsonenc* e, const upb_Message* msg,
-                             const upb_MessageDef* m);
-static void jsonenc_msgfields(jsonenc* e, const upb_Message* msg,
-                              const upb_MessageDef* m, bool first);
-static void jsonenc_value(jsonenc* e, const upb_Message* msg,
-                          const upb_MessageDef* m);
-
-UPB_NORETURN static void jsonenc_err(jsonenc* e, const char* msg) {
-  upb_Status_SetErrorMessage(e->status, msg);
-  longjmp(e->err, 1);
-}
-
-UPB_PRINTF(2, 3)
-UPB_NORETURN static void jsonenc_errf(jsonenc* e, const char* fmt, ...) {
-  va_list argp;
-  va_start(argp, fmt);
-  upb_Status_VSetErrorFormat(e->status, fmt, argp);
-  va_end(argp);
-  longjmp(e->err, 1);
-}
-
-static upb_Arena* jsonenc_arena(jsonenc* e) {
-  /* Create lazily, since it's only needed for Any */
-  if (!e->arena) {
-    e->arena = upb_Arena_New();
-  }
-  return e->arena;
-}
-
-static void jsonenc_putbytes(jsonenc* e, const void* data, size_t len) {
-  size_t have = e->end - e->ptr;
-  if (UPB_LIKELY(have >= len)) {
-    memcpy(e->ptr, data, len);
-    e->ptr += len;
-  } else {
-    if (have) {
-      memcpy(e->ptr, data, have);
-      e->ptr += have;
-    }
-    e->overflow += (len - have);
-  }
-}
-
-static void jsonenc_putstr(jsonenc* e, const char* str) {
-  jsonenc_putbytes(e, str, strlen(str));
-}
-
-UPB_PRINTF(2, 3)
-static void jsonenc_printf(jsonenc* e, const char* fmt, ...) {
-  size_t n;
-  size_t have = e->end - e->ptr;
-  va_list args;
-
-  va_start(args, fmt);
-  n = _upb_vsnprintf(e->ptr, have, fmt, args);
-  va_end(args);
-
-  if (UPB_LIKELY(have > n)) {
-    e->ptr += n;
-  } else {
-    e->ptr = UPB_PTRADD(e->ptr, have);
-    e->overflow += (n - have);
-  }
-}
-
-static void jsonenc_nanos(jsonenc* e, int32_t nanos) {
-  int digits = 9;
-
-  if (nanos == 0) return;
-  if (nanos < 0 || nanos >= 1000000000) {
-    jsonenc_err(e, "error formatting timestamp as JSON: invalid nanos");
-  }
-
-  while (nanos % 1000 == 0) {
-    nanos /= 1000;
-    digits -= 3;
-  }
-
-  jsonenc_printf(e, ".%.*" PRId32, digits, nanos);
-}
-
-static void jsonenc_timestamp(jsonenc* e, const upb_Message* msg,
-                              const upb_MessageDef* m) {
-  const upb_FieldDef* seconds_f = upb_MessageDef_FindFieldByNumber(m, 1);
-  const upb_FieldDef* nanos_f = upb_MessageDef_FindFieldByNumber(m, 2);
-  int64_t seconds = upb_Message_Get(msg, seconds_f).int64_val;
-  int32_t nanos = upb_Message_Get(msg, nanos_f).int32_val;
-  int L, N, I, J, K, hour, min, sec;
-
-  if (seconds < -62135596800) {
-    jsonenc_err(e,
-                "error formatting timestamp as JSON: minimum acceptable value "
-                "is 0001-01-01T00:00:00Z");
-  } else if (seconds > 253402300799) {
-    jsonenc_err(e,
-                "error formatting timestamp as JSON: maximum acceptable value "
-                "is 9999-12-31T23:59:59Z");
-  }
-
-  /* Julian Day -> Y/M/D, Algorithm from:
-   * Fliegel, H. F., and Van Flandern, T. C., "A Machine Algorithm for
-   *   Processing Calendar Dates," Communications of the Association of
-   *   Computing Machines, vol. 11 (1968), p. 657.  */
-  seconds += 62135596800;  // Ensure seconds is positive.
-  L = (int)(seconds / 86400) - 719162 + 68569 + 2440588;
-  N = 4 * L / 146097;
-  L = L - (146097 * N + 3) / 4;
-  I = 4000 * (L + 1) / 1461001;
-  L = L - 1461 * I / 4 + 31;
-  J = 80 * L / 2447;
-  K = L - 2447 * J / 80;
-  L = J / 11;
-  J = J + 2 - 12 * L;
-  I = 100 * (N - 49) + I + L;
-
-  sec = seconds % 60;
-  min = (seconds / 60) % 60;
-  hour = (seconds / 3600) % 24;
-
-  jsonenc_printf(e, "\"%04d-%02d-%02dT%02d:%02d:%02d", I, J, K, hour, min, sec);
-  jsonenc_nanos(e, nanos);
-  jsonenc_putstr(e, "Z\"");
-}
-
-static void jsonenc_duration(jsonenc* e, const upb_Message* msg,
-                             const upb_MessageDef* m) {
-  const upb_FieldDef* seconds_f = upb_MessageDef_FindFieldByNumber(m, 1);
-  const upb_FieldDef* nanos_f = upb_MessageDef_FindFieldByNumber(m, 2);
-  int64_t seconds = upb_Message_Get(msg, seconds_f).int64_val;
-  int32_t nanos = upb_Message_Get(msg, nanos_f).int32_val;
-
-  if (seconds > 315576000000 || seconds < -315576000000 ||
-      (seconds < 0) != (nanos < 0)) {
-    jsonenc_err(e, "bad duration");
-  }
-
-  if (nanos < 0) {
-    nanos = -nanos;
-  }
-
-  jsonenc_printf(e, "\"%" PRId64, seconds);
-  jsonenc_nanos(e, nanos);
-  jsonenc_putstr(e, "s\"");
-}
-
-static void jsonenc_enum(int32_t val, const upb_FieldDef* f, jsonenc* e) {
-  const upb_EnumDef* e_def = upb_FieldDef_EnumSubDef(f);
-
-  if (strcmp(upb_EnumDef_FullName(e_def), "google.protobuf.NullValue") == 0) {
-    jsonenc_putstr(e, "null");
-  } else {
-    const upb_EnumValueDef* ev = upb_EnumDef_FindValueByNumber(e_def, val);
-
-    if (ev) {
-      jsonenc_printf(e, "\"%s\"", upb_EnumValueDef_Name(ev));
-    } else {
-      jsonenc_printf(e, "%" PRId32, val);
-    }
-  }
-}
-
-static void jsonenc_bytes(jsonenc* e, upb_StringView str) {
-  /* This is the regular base64, not the "web-safe" version. */
-  static const char base64[] =
-      "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-  const unsigned char* ptr = (unsigned char*)str.data;
-  const unsigned char* end = UPB_PTRADD(ptr, str.size);
-  char buf[4];
-
-  jsonenc_putstr(e, "\"");
-
-  while (end - ptr >= 3) {
-    buf[0] = base64[ptr[0] >> 2];
-    buf[1] = base64[((ptr[0] & 0x3) << 4) | (ptr[1] >> 4)];
-    buf[2] = base64[((ptr[1] & 0xf) << 2) | (ptr[2] >> 6)];
-    buf[3] = base64[ptr[2] & 0x3f];
-    jsonenc_putbytes(e, buf, 4);
-    ptr += 3;
-  }
-
-  switch (end - ptr) {
-    case 2:
-      buf[0] = base64[ptr[0] >> 2];
-      buf[1] = base64[((ptr[0] & 0x3) << 4) | (ptr[1] >> 4)];
-      buf[2] = base64[(ptr[1] & 0xf) << 2];
-      buf[3] = '=';
-      jsonenc_putbytes(e, buf, 4);
-      break;
-    case 1:
-      buf[0] = base64[ptr[0] >> 2];
-      buf[1] = base64[((ptr[0] & 0x3) << 4)];
-      buf[2] = '=';
-      buf[3] = '=';
-      jsonenc_putbytes(e, buf, 4);
-      break;
-  }
-
-  jsonenc_putstr(e, "\"");
-}
-
-static void jsonenc_stringbody(jsonenc* e, upb_StringView str) {
-  const char* ptr = str.data;
-  const char* end = UPB_PTRADD(ptr, str.size);
-
-  while (ptr < end) {
-    switch (*ptr) {
-      case '\n':
-        jsonenc_putstr(e, "\\n");
-        break;
-      case '\r':
-        jsonenc_putstr(e, "\\r");
-        break;
-      case '\t':
-        jsonenc_putstr(e, "\\t");
-        break;
-      case '\"':
-        jsonenc_putstr(e, "\\\"");
-        break;
-      case '\f':
-        jsonenc_putstr(e, "\\f");
-        break;
-      case '\b':
-        jsonenc_putstr(e, "\\b");
-        break;
-      case '\\':
-        jsonenc_putstr(e, "\\\\");
-        break;
-      default:
-        if ((uint8_t)*ptr < 0x20) {
-          jsonenc_printf(e, "\\u%04x", (int)(uint8_t)*ptr);
-        } else {
-          /* This could be a non-ASCII byte.  We rely on the string being valid
-           * UTF-8. */
-          jsonenc_putbytes(e, ptr, 1);
-        }
-        break;
-    }
-    ptr++;
-  }
-}
-
-static void jsonenc_string(jsonenc* e, upb_StringView str) {
-  jsonenc_putstr(e, "\"");
-  jsonenc_stringbody(e, str);
-  jsonenc_putstr(e, "\"");
-}
-
-static bool upb_JsonEncode_HandleSpecialDoubles(jsonenc* e, double val) {
-  if (val == INFINITY) {
-    jsonenc_putstr(e, "\"Infinity\"");
-  } else if (val == -INFINITY) {
-    jsonenc_putstr(e, "\"-Infinity\"");
-  } else if (val != val) {
-    jsonenc_putstr(e, "\"NaN\"");
-  } else {
-    return false;
-  }
-  return true;
-}
-
-static void upb_JsonEncode_Double(jsonenc* e, double val) {
-  if (upb_JsonEncode_HandleSpecialDoubles(e, val)) return;
-  char buf[32];
-  _upb_EncodeRoundTripDouble(val, buf, sizeof(buf));
-  jsonenc_putstr(e, buf);
-}
-
-static void upb_JsonEncode_Float(jsonenc* e, float val) {
-  if (upb_JsonEncode_HandleSpecialDoubles(e, val)) return;
-  char buf[32];
-  _upb_EncodeRoundTripFloat(val, buf, sizeof(buf));
-  jsonenc_putstr(e, buf);
-}
-
-static void jsonenc_wrapper(jsonenc* e, const upb_Message* msg,
-                            const upb_MessageDef* m) {
-  const upb_FieldDef* val_f = upb_MessageDef_FindFieldByNumber(m, 1);
-  upb_MessageValue val = upb_Message_Get(msg, val_f);
-  jsonenc_scalar(e, val, val_f);
-}
-
-static const upb_MessageDef* jsonenc_getanymsg(jsonenc* e,
-                                               upb_StringView type_url) {
-  /* Find last '/', if any. */
-  const char* end = type_url.data + type_url.size;
-  const char* ptr = end;
-  const upb_MessageDef* ret;
-
-  if (!e->ext_pool) {
-    jsonenc_err(e, "Tried to encode Any, but no symtab was provided");
-  }
-
-  if (type_url.size == 0) goto badurl;
-
-  while (true) {
-    if (--ptr == type_url.data) {
-      /* Type URL must contain at least one '/', with host before. */
-      goto badurl;
-    }
-    if (*ptr == '/') {
-      ptr++;
-      break;
-    }
-  }
-
-  ret = upb_DefPool_FindMessageByNameWithSize(e->ext_pool, ptr, end - ptr);
-
-  if (!ret) {
-    jsonenc_errf(e, "Couldn't find Any type: %.*s", (int)(end - ptr), ptr);
-  }
-
-  return ret;
-
-badurl:
-  jsonenc_errf(e, "Bad type URL: " UPB_STRINGVIEW_FORMAT,
-               UPB_STRINGVIEW_ARGS(type_url));
-}
-
-static void jsonenc_any(jsonenc* e, const upb_Message* msg,
-                        const upb_MessageDef* m) {
-  const upb_FieldDef* type_url_f = upb_MessageDef_FindFieldByNumber(m, 1);
-  const upb_FieldDef* value_f = upb_MessageDef_FindFieldByNumber(m, 2);
-  upb_StringView type_url = upb_Message_Get(msg, type_url_f).str_val;
-  upb_StringView value = upb_Message_Get(msg, value_f).str_val;
-  const upb_MessageDef* any_m = jsonenc_getanymsg(e, type_url);
-  const upb_MiniTable* any_layout = upb_MessageDef_MiniTable(any_m);
-  upb_Arena* arena = jsonenc_arena(e);
-  upb_Message* any = upb_Message_New(any_m, arena);
-
-  if (upb_Decode(value.data, value.size, any, any_layout, NULL, 0, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    jsonenc_err(e, "Error decoding message in Any");
-  }
-
-  jsonenc_putstr(e, "{\"@type\":");
-  jsonenc_string(e, type_url);
-
-  if (upb_MessageDef_WellKnownType(any_m) == kUpb_WellKnown_Unspecified) {
-    /* Regular messages: {"@type": "...","foo": 1, "bar": 2} */
-    jsonenc_msgfields(e, any, any_m, false);
-  } else {
-    /* Well-known type: {"@type": "...","value": <well-known encoding>} */
-    jsonenc_putstr(e, ",\"value\":");
-    jsonenc_msgfield(e, any, any_m);
-  }
-
-  jsonenc_putstr(e, "}");
-}
-
-static void jsonenc_putsep(jsonenc* e, const char* str, bool* first) {
-  if (*first) {
-    *first = false;
-  } else {
-    jsonenc_putstr(e, str);
-  }
-}
-
-static void jsonenc_fieldpath(jsonenc* e, upb_StringView path) {
-  const char* ptr = path.data;
-  const char* end = ptr + path.size;
-
-  while (ptr < end) {
-    char ch = *ptr;
-
-    if (ch >= 'A' && ch <= 'Z') {
-      jsonenc_err(e, "Field mask element may not have upper-case letter.");
-    } else if (ch == '_') {
-      if (ptr == end - 1 || *(ptr + 1) < 'a' || *(ptr + 1) > 'z') {
-        jsonenc_err(e, "Underscore must be followed by a lowercase letter.");
-      }
-      ch = *++ptr - 32;
-    }
-
-    jsonenc_putbytes(e, &ch, 1);
-    ptr++;
-  }
-}
-
-static void jsonenc_fieldmask(jsonenc* e, const upb_Message* msg,
-                              const upb_MessageDef* m) {
-  const upb_FieldDef* paths_f = upb_MessageDef_FindFieldByNumber(m, 1);
-  const upb_Array* paths = upb_Message_Get(msg, paths_f).array_val;
-  bool first = true;
-  size_t i, n = 0;
-
-  if (paths) n = upb_Array_Size(paths);
-
-  jsonenc_putstr(e, "\"");
-
-  for (i = 0; i < n; i++) {
-    jsonenc_putsep(e, ",", &first);
-    jsonenc_fieldpath(e, upb_Array_Get(paths, i).str_val);
-  }
-
-  jsonenc_putstr(e, "\"");
-}
-
-static void jsonenc_struct(jsonenc* e, const upb_Message* msg,
-                           const upb_MessageDef* m) {
-  const upb_FieldDef* fields_f = upb_MessageDef_FindFieldByNumber(m, 1);
-  const upb_Map* fields = upb_Message_Get(msg, fields_f).map_val;
-  const upb_MessageDef* entry_m = upb_FieldDef_MessageSubDef(fields_f);
-  const upb_FieldDef* value_f = upb_MessageDef_FindFieldByNumber(entry_m, 2);
-  size_t iter = kUpb_Map_Begin;
-  bool first = true;
-
-  jsonenc_putstr(e, "{");
-
-  if (fields) {
-    while (upb_MapIterator_Next(fields, &iter)) {
-      upb_MessageValue key = upb_MapIterator_Key(fields, iter);
-      upb_MessageValue val = upb_MapIterator_Value(fields, iter);
-
-      jsonenc_putsep(e, ",", &first);
-      jsonenc_string(e, key.str_val);
-      jsonenc_putstr(e, ":");
-      jsonenc_value(e, val.msg_val, upb_FieldDef_MessageSubDef(value_f));
-    }
-  }
-
-  jsonenc_putstr(e, "}");
-}
-
-static void jsonenc_listvalue(jsonenc* e, const upb_Message* msg,
-                              const upb_MessageDef* m) {
-  const upb_FieldDef* values_f = upb_MessageDef_FindFieldByNumber(m, 1);
-  const upb_MessageDef* values_m = upb_FieldDef_MessageSubDef(values_f);
-  const upb_Array* values = upb_Message_Get(msg, values_f).array_val;
-  size_t i;
-  bool first = true;
-
-  jsonenc_putstr(e, "[");
-
-  if (values) {
-    const size_t size = upb_Array_Size(values);
-    for (i = 0; i < size; i++) {
-      upb_MessageValue elem = upb_Array_Get(values, i);
-
-      jsonenc_putsep(e, ",", &first);
-      jsonenc_value(e, elem.msg_val, values_m);
-    }
-  }
-
-  jsonenc_putstr(e, "]");
-}
-
-static void jsonenc_value(jsonenc* e, const upb_Message* msg,
-                          const upb_MessageDef* m) {
-  /* TODO(haberman): do we want a reflection method to get oneof case? */
-  size_t iter = kUpb_Message_Begin;
-  const upb_FieldDef* f;
-  upb_MessageValue val;
-
-  if (!upb_Message_Next(msg, m, NULL, &f, &val, &iter)) {
-    jsonenc_err(e, "No value set in Value proto");
-  }
-
-  switch (upb_FieldDef_Number(f)) {
-    case 1:
-      jsonenc_putstr(e, "null");
-      break;
-    case 2:
-      upb_JsonEncode_Double(e, val.double_val);
-      break;
-    case 3:
-      jsonenc_string(e, val.str_val);
-      break;
-    case 4:
-      jsonenc_putstr(e, val.bool_val ? "true" : "false");
-      break;
-    case 5:
-      jsonenc_struct(e, val.msg_val, upb_FieldDef_MessageSubDef(f));
-      break;
-    case 6:
-      jsonenc_listvalue(e, val.msg_val, upb_FieldDef_MessageSubDef(f));
-      break;
-  }
-}
-
-static void jsonenc_msgfield(jsonenc* e, const upb_Message* msg,
-                             const upb_MessageDef* m) {
-  switch (upb_MessageDef_WellKnownType(m)) {
-    case kUpb_WellKnown_Unspecified:
-      jsonenc_msg(e, msg, m);
-      break;
-    case kUpb_WellKnown_Any:
-      jsonenc_any(e, msg, m);
-      break;
-    case kUpb_WellKnown_FieldMask:
-      jsonenc_fieldmask(e, msg, m);
-      break;
-    case kUpb_WellKnown_Duration:
-      jsonenc_duration(e, msg, m);
-      break;
-    case kUpb_WellKnown_Timestamp:
-      jsonenc_timestamp(e, msg, m);
-      break;
-    case kUpb_WellKnown_DoubleValue:
-    case kUpb_WellKnown_FloatValue:
-    case kUpb_WellKnown_Int64Value:
-    case kUpb_WellKnown_UInt64Value:
-    case kUpb_WellKnown_Int32Value:
-    case kUpb_WellKnown_UInt32Value:
-    case kUpb_WellKnown_StringValue:
-    case kUpb_WellKnown_BytesValue:
-    case kUpb_WellKnown_BoolValue:
-      jsonenc_wrapper(e, msg, m);
-      break;
-    case kUpb_WellKnown_Value:
-      jsonenc_value(e, msg, m);
-      break;
-    case kUpb_WellKnown_ListValue:
-      jsonenc_listvalue(e, msg, m);
-      break;
-    case kUpb_WellKnown_Struct:
-      jsonenc_struct(e, msg, m);
-      break;
-  }
-}
-
-static void jsonenc_scalar(jsonenc* e, upb_MessageValue val,
-                           const upb_FieldDef* f) {
-  switch (upb_FieldDef_CType(f)) {
-    case kUpb_CType_Bool:
-      jsonenc_putstr(e, val.bool_val ? "true" : "false");
-      break;
-    case kUpb_CType_Float:
-      upb_JsonEncode_Float(e, val.float_val);
-      break;
-    case kUpb_CType_Double:
-      upb_JsonEncode_Double(e, val.double_val);
-      break;
-    case kUpb_CType_Int32:
-      jsonenc_printf(e, "%" PRId32, val.int32_val);
-      break;
-    case kUpb_CType_UInt32:
-      jsonenc_printf(e, "%" PRIu32, val.uint32_val);
-      break;
-    case kUpb_CType_Int64:
-      jsonenc_printf(e, "\"%" PRId64 "\"", val.int64_val);
-      break;
-    case kUpb_CType_UInt64:
-      jsonenc_printf(e, "\"%" PRIu64 "\"", val.uint64_val);
-      break;
-    case kUpb_CType_String:
-      jsonenc_string(e, val.str_val);
-      break;
-    case kUpb_CType_Bytes:
-      jsonenc_bytes(e, val.str_val);
-      break;
-    case kUpb_CType_Enum:
-      jsonenc_enum(val.int32_val, f, e);
-      break;
-    case kUpb_CType_Message:
-      jsonenc_msgfield(e, val.msg_val, upb_FieldDef_MessageSubDef(f));
-      break;
-  }
-}
-
-static void jsonenc_mapkey(jsonenc* e, upb_MessageValue val,
-                           const upb_FieldDef* f) {
-  jsonenc_putstr(e, "\"");
-
-  switch (upb_FieldDef_CType(f)) {
-    case kUpb_CType_Bool:
-      jsonenc_putstr(e, val.bool_val ? "true" : "false");
-      break;
-    case kUpb_CType_Int32:
-      jsonenc_printf(e, "%" PRId32, val.int32_val);
-      break;
-    case kUpb_CType_UInt32:
-      jsonenc_printf(e, "%" PRIu32, val.uint32_val);
-      break;
-    case kUpb_CType_Int64:
-      jsonenc_printf(e, "%" PRId64, val.int64_val);
-      break;
-    case kUpb_CType_UInt64:
-      jsonenc_printf(e, "%" PRIu64, val.uint64_val);
-      break;
-    case kUpb_CType_String:
-      jsonenc_stringbody(e, val.str_val);
-      break;
-    default:
-      UPB_UNREACHABLE();
-  }
-
-  jsonenc_putstr(e, "\":");
-}
-
-static void jsonenc_array(jsonenc* e, const upb_Array* arr,
-                          const upb_FieldDef* f) {
-  size_t i;
-  size_t size = arr ? upb_Array_Size(arr) : 0;
-  bool first = true;
-
-  jsonenc_putstr(e, "[");
-
-  for (i = 0; i < size; i++) {
-    jsonenc_putsep(e, ",", &first);
-    jsonenc_scalar(e, upb_Array_Get(arr, i), f);
-  }
-
-  jsonenc_putstr(e, "]");
-}
-
-static void jsonenc_map(jsonenc* e, const upb_Map* map, const upb_FieldDef* f) {
-  const upb_MessageDef* entry = upb_FieldDef_MessageSubDef(f);
-  const upb_FieldDef* key_f = upb_MessageDef_FindFieldByNumber(entry, 1);
-  const upb_FieldDef* val_f = upb_MessageDef_FindFieldByNumber(entry, 2);
-  size_t iter = kUpb_Map_Begin;
-  bool first = true;
-
-  jsonenc_putstr(e, "{");
-
-  if (map) {
-    while (upb_MapIterator_Next(map, &iter)) {
-      jsonenc_putsep(e, ",", &first);
-      jsonenc_mapkey(e, upb_MapIterator_Key(map, iter), key_f);
-      jsonenc_scalar(e, upb_MapIterator_Value(map, iter), val_f);
-    }
-  }
-
-  jsonenc_putstr(e, "}");
-}
-
-static void jsonenc_fieldval(jsonenc* e, const upb_FieldDef* f,
-                             upb_MessageValue val, bool* first) {
-  const char* name;
-
-  jsonenc_putsep(e, ",", first);
-
-  if (upb_FieldDef_IsExtension(f)) {
-    // TODO: For MessageSet, I would have expected this to print the message
-    // name here, but Python doesn't appear to do this. We should do more
-    // research here about what various implementations do.
-    jsonenc_printf(e, "\"[%s]\":", upb_FieldDef_FullName(f));
-  } else {
-    if (e->options & upb_JsonEncode_UseProtoNames) {
-      name = upb_FieldDef_Name(f);
-    } else {
-      name = upb_FieldDef_JsonName(f);
-    }
-    jsonenc_printf(e, "\"%s\":", name);
-  }
-
-  if (upb_FieldDef_IsMap(f)) {
-    jsonenc_map(e, val.map_val, f);
-  } else if (upb_FieldDef_IsRepeated(f)) {
-    jsonenc_array(e, val.array_val, f);
-  } else {
-    jsonenc_scalar(e, val, f);
-  }
-}
-
-static void jsonenc_msgfields(jsonenc* e, const upb_Message* msg,
-                              const upb_MessageDef* m, bool first) {
-  upb_MessageValue val;
-  const upb_FieldDef* f;
-
-  if (e->options & upb_JsonEncode_EmitDefaults) {
-    /* Iterate over all fields. */
-    int i = 0;
-    int n = upb_MessageDef_FieldCount(m);
-    for (i = 0; i < n; i++) {
-      f = upb_MessageDef_Field(m, i);
-      if (!upb_FieldDef_HasPresence(f) || upb_Message_Has(msg, f)) {
-        jsonenc_fieldval(e, f, upb_Message_Get(msg, f), &first);
-      }
-    }
-  } else {
-    /* Iterate over non-empty fields. */
-    size_t iter = kUpb_Message_Begin;
-    while (upb_Message_Next(msg, m, e->ext_pool, &f, &val, &iter)) {
-      jsonenc_fieldval(e, f, val, &first);
-    }
-  }
-}
-
-static void jsonenc_msg(jsonenc* e, const upb_Message* msg,
-                        const upb_MessageDef* m) {
-  jsonenc_putstr(e, "{");
-  jsonenc_msgfields(e, msg, m, true);
-  jsonenc_putstr(e, "}");
-}
-
-static size_t jsonenc_nullz(jsonenc* e, size_t size) {
-  size_t ret = e->ptr - e->buf + e->overflow;
-
-  if (size > 0) {
-    if (e->ptr == e->end) e->ptr--;
-    *e->ptr = '\0';
-  }
-
-  return ret;
-}
-
-size_t upb_JsonEncode(const upb_Message* msg, const upb_MessageDef* m,
-                      const upb_DefPool* ext_pool, int options, char* buf,
-                      size_t size, upb_Status* status) {
-  jsonenc e;
-
-  e.buf = buf;
-  e.ptr = buf;
-  e.end = UPB_PTRADD(buf, size);
-  e.overflow = 0;
-  e.options = options;
-  e.ext_pool = ext_pool;
-  e.status = status;
-  e.arena = NULL;
-
-  if (setjmp(e.err)) return -1;
-
-  jsonenc_msgfield(&e, msg, m);
-  if (e.arena) upb_Arena_Free(e.arena);
-  return jsonenc_nullz(&e, size);
-}
-
-/** upb/mini_table.c ************************************************************/
-
-#include <inttypes.h>
-#include <setjmp.h>
-
-
-// Must be last.
-
-typedef enum {
-  kUpb_EncodedType_Double = 0,
-  kUpb_EncodedType_Float = 1,
-  kUpb_EncodedType_Fixed32 = 2,
-  kUpb_EncodedType_Fixed64 = 3,
-  kUpb_EncodedType_SFixed32 = 4,
-  kUpb_EncodedType_SFixed64 = 5,
-  kUpb_EncodedType_Int32 = 6,
-  kUpb_EncodedType_UInt32 = 7,
-  kUpb_EncodedType_SInt32 = 8,
-  kUpb_EncodedType_Int64 = 9,
-  kUpb_EncodedType_UInt64 = 10,
-  kUpb_EncodedType_SInt64 = 11,
-  kUpb_EncodedType_Enum = 12,
-  kUpb_EncodedType_Bool = 13,
-  kUpb_EncodedType_Bytes = 14,
-  kUpb_EncodedType_String = 15,
-  kUpb_EncodedType_Group = 16,
-  kUpb_EncodedType_Message = 17,
-
-  kUpb_EncodedType_RepeatedBase = 20,
-} upb_EncodedType;
-
-typedef enum {
-  kUpb_EncodedFieldModifier_FlipPacked = 1 << 0,
-  kUpb_EncodedFieldModifier_IsClosedEnum = 1 << 1,
-  // upb only.
-  kUpb_EncodedFieldModifier_IsProto3Singular = 1 << 2,
-  kUpb_EncodedFieldModifier_IsRequired = 1 << 3,
-} upb_EncodedFieldModifier;
-
-enum {
-  kUpb_EncodedValue_MinField = ' ',
-  kUpb_EncodedValue_MaxField = 'K',
-  kUpb_EncodedValue_MinModifier = 'L',
-  kUpb_EncodedValue_MaxModifier = '[',
-  kUpb_EncodedValue_End = '^',
-  kUpb_EncodedValue_MinSkip = '_',
-  kUpb_EncodedValue_MaxSkip = '~',
-  kUpb_EncodedValue_OneofSeparator = '~',
-  kUpb_EncodedValue_FieldSeparator = '|',
-  kUpb_EncodedValue_MinOneofField = ' ',
-  kUpb_EncodedValue_MaxOneofField = 'b',
-  kUpb_EncodedValue_MaxEnumMask = 'A',
-};
-
-char upb_ToBase92(int8_t ch) {
-  static const char kUpb_ToBase92[] = {
-      ' ', '!', '#', '$', '%', '&', '(', ')', '*', '+', ',', '-', '.', '/',
-      '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', ':', ';', '<', '=',
-      '>', '?', '@', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K',
-      'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y',
-      'Z', '[', ']', '^', '_', '`', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h',
-      'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v',
-      'w', 'x', 'y', 'z', '{', '|', '}', '~',
-  };
-
-  UPB_ASSERT(0 <= ch && ch < 92);
-  return kUpb_ToBase92[ch];
-}
-
-char upb_FromBase92(uint8_t ch) {
-  static const int8_t kUpb_FromBase92[] = {
-      0,  1,  -1, 2,  3,  4,  5,  -1, 6,  7,  8,  9,  10, 11, 12, 13,
-      14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
-      30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45,
-      46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, -1, 58, 59, 60,
-      61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76,
-      77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91,
-  };
-
-  if (' ' > ch || ch > '~') return -1;
-  return kUpb_FromBase92[ch - ' '];
-}
-
-bool upb_IsTypePackable(upb_FieldType type) {
-  // clang-format off
-  static const unsigned kUnpackableTypes =
-      (1 << kUpb_FieldType_String) |
-      (1 << kUpb_FieldType_Bytes) |
-      (1 << kUpb_FieldType_Message) |
-      (1 << kUpb_FieldType_Group);
-  // clang-format on
-  return (1 << type) & ~kUnpackableTypes;
-}
-
-/** upb_MtDataEncoder *********************************************************/
-
-typedef struct {
-  uint64_t present_values_mask;
-  uint32_t last_written_value;
-} upb_MtDataEncoderInternal_EnumState;
-
-typedef struct {
-  uint64_t msg_modifiers;
-  uint32_t last_field_num;
-  enum {
-    kUpb_OneofState_NotStarted,
-    kUpb_OneofState_StartedOneof,
-    kUpb_OneofState_EmittedOneofField,
-  } oneof_state;
-} upb_MtDataEncoderInternal_MsgState;
-
-typedef struct {
-  char* buf_start;  // Only for checking kUpb_MtDataEncoder_MinSize.
-  union {
-    upb_MtDataEncoderInternal_EnumState enum_state;
-    upb_MtDataEncoderInternal_MsgState msg_state;
-  } state;
-} upb_MtDataEncoderInternal;
-
-static upb_MtDataEncoderInternal* upb_MtDataEncoder_GetInternal(
-    upb_MtDataEncoder* e, char* buf_start) {
-  UPB_ASSERT(sizeof(upb_MtDataEncoderInternal) <= sizeof(e->internal));
-  upb_MtDataEncoderInternal* ret = (upb_MtDataEncoderInternal*)e->internal;
-  ret->buf_start = buf_start;
-  return ret;
-}
-
-static char* upb_MtDataEncoder_Put(upb_MtDataEncoder* e, char* ptr, char ch) {
-  upb_MtDataEncoderInternal* in = (upb_MtDataEncoderInternal*)e->internal;
-  UPB_ASSERT(ptr - in->buf_start < kUpb_MtDataEncoder_MinSize);
-  if (ptr == e->end) return NULL;
-  *ptr++ = upb_ToBase92(ch);
-  return ptr;
-}
-
-static char* upb_MtDataEncoder_PutBase92Varint(upb_MtDataEncoder* e, char* ptr,
-                                               uint32_t val, int min, int max) {
-  int shift = _upb_Log2Ceiling(upb_FromBase92(max) - upb_FromBase92(min) + 1);
-  UPB_ASSERT(shift <= 6);
-  uint32_t mask = (1 << shift) - 1;
-  do {
-    uint32_t bits = val & mask;
-    ptr = upb_MtDataEncoder_Put(e, ptr, bits + upb_FromBase92(min));
-    if (!ptr) return NULL;
-    val >>= shift;
-  } while (val);
-  return ptr;
-}
-
-char* upb_MtDataEncoder_PutModifier(upb_MtDataEncoder* e, char* ptr,
-                                    uint64_t mod) {
-  if (mod) {
-    ptr = upb_MtDataEncoder_PutBase92Varint(e, ptr, mod,
-                                            kUpb_EncodedValue_MinModifier,
-                                            kUpb_EncodedValue_MaxModifier);
-  }
-  return ptr;
-}
-
-char* upb_MtDataEncoder_StartMessage(upb_MtDataEncoder* e, char* ptr,
-                                     uint64_t msg_mod) {
-  upb_MtDataEncoderInternal* in = upb_MtDataEncoder_GetInternal(e, ptr);
-  in->state.msg_state.msg_modifiers = msg_mod;
-  in->state.msg_state.last_field_num = 0;
-  in->state.msg_state.oneof_state = kUpb_OneofState_NotStarted;
-  return upb_MtDataEncoder_PutModifier(e, ptr, msg_mod);
-}
-
-char* upb_MtDataEncoder_PutField(upb_MtDataEncoder* e, char* ptr,
-                                 upb_FieldType type, uint32_t field_num,
-                                 uint64_t field_mod) {
-  static const char kUpb_TypeToEncoded[] = {
-      [kUpb_FieldType_Double] = kUpb_EncodedType_Double,
-      [kUpb_FieldType_Float] = kUpb_EncodedType_Float,
-      [kUpb_FieldType_Int64] = kUpb_EncodedType_Int64,
-      [kUpb_FieldType_UInt64] = kUpb_EncodedType_UInt64,
-      [kUpb_FieldType_Int32] = kUpb_EncodedType_Int32,
-      [kUpb_FieldType_Fixed64] = kUpb_EncodedType_Fixed64,
-      [kUpb_FieldType_Fixed32] = kUpb_EncodedType_Fixed32,
-      [kUpb_FieldType_Bool] = kUpb_EncodedType_Bool,
-      [kUpb_FieldType_String] = kUpb_EncodedType_String,
-      [kUpb_FieldType_Group] = kUpb_EncodedType_Group,
-      [kUpb_FieldType_Message] = kUpb_EncodedType_Message,
-      [kUpb_FieldType_Bytes] = kUpb_EncodedType_Bytes,
-      [kUpb_FieldType_UInt32] = kUpb_EncodedType_UInt32,
-      [kUpb_FieldType_Enum] = kUpb_EncodedType_Enum,
-      [kUpb_FieldType_SFixed32] = kUpb_EncodedType_SFixed32,
-      [kUpb_FieldType_SFixed64] = kUpb_EncodedType_SFixed64,
-      [kUpb_FieldType_SInt32] = kUpb_EncodedType_SInt32,
-      [kUpb_FieldType_SInt64] = kUpb_EncodedType_SInt64,
-  };
-
-  upb_MtDataEncoderInternal* in = upb_MtDataEncoder_GetInternal(e, ptr);
-  if (field_num <= in->state.msg_state.last_field_num) return NULL;
-  if (in->state.msg_state.last_field_num + 1 != field_num) {
-    // Put skip.
-    UPB_ASSERT(field_num > in->state.msg_state.last_field_num);
-    uint32_t skip = field_num - in->state.msg_state.last_field_num;
-    ptr = upb_MtDataEncoder_PutBase92Varint(
-        e, ptr, skip, kUpb_EncodedValue_MinSkip, kUpb_EncodedValue_MaxSkip);
-    if (!ptr) return NULL;
-  }
-  in->state.msg_state.last_field_num = field_num;
-
-  uint32_t encoded_modifiers = 0;
-
-  // Put field type.
-  if (type == kUpb_FieldType_Enum &&
-      !(field_mod & kUpb_FieldModifier_IsClosedEnum)) {
-    type = kUpb_FieldType_Int32;
-  }
-
-  int encoded_type = kUpb_TypeToEncoded[type];
-  if (field_mod & kUpb_FieldModifier_IsRepeated) {
-    // Repeated fields shift the type number up (unlike other modifiers which
-    // are bit flags).
-    encoded_type += kUpb_EncodedType_RepeatedBase;
-
-    if (upb_IsTypePackable(type)) {
-      bool field_is_packed = field_mod & kUpb_FieldModifier_IsPacked;
-      bool default_is_packed = in->state.msg_state.msg_modifiers &
-                               kUpb_MessageModifier_DefaultIsPacked;
-      if (field_is_packed != default_is_packed) {
-        encoded_modifiers |= kUpb_EncodedFieldModifier_FlipPacked;
-      }
-    }
-  }
-  ptr = upb_MtDataEncoder_Put(e, ptr, encoded_type);
-  if (!ptr) return NULL;
-
-  if (field_mod & kUpb_FieldModifier_IsProto3Singular) {
-    encoded_modifiers |= kUpb_EncodedFieldModifier_IsProto3Singular;
-  }
-  if (field_mod & kUpb_FieldModifier_IsRequired) {
-    encoded_modifiers |= kUpb_EncodedFieldModifier_IsRequired;
-  }
-  return upb_MtDataEncoder_PutModifier(e, ptr, encoded_modifiers);
-}
-
-char* upb_MtDataEncoder_StartOneof(upb_MtDataEncoder* e, char* ptr) {
-  upb_MtDataEncoderInternal* in = upb_MtDataEncoder_GetInternal(e, ptr);
-  if (in->state.msg_state.oneof_state == kUpb_OneofState_NotStarted) {
-    ptr = upb_MtDataEncoder_Put(e, ptr, upb_FromBase92(kUpb_EncodedValue_End));
-  } else {
-    ptr = upb_MtDataEncoder_Put(
-        e, ptr, upb_FromBase92(kUpb_EncodedValue_OneofSeparator));
-  }
-  in->state.msg_state.oneof_state = kUpb_OneofState_StartedOneof;
-  return ptr;
-}
-
-char* upb_MtDataEncoder_PutOneofField(upb_MtDataEncoder* e, char* ptr,
-                                      uint32_t field_num) {
-  upb_MtDataEncoderInternal* in = upb_MtDataEncoder_GetInternal(e, ptr);
-  if (in->state.msg_state.oneof_state == kUpb_OneofState_EmittedOneofField) {
-    ptr = upb_MtDataEncoder_Put(
-        e, ptr, upb_FromBase92(kUpb_EncodedValue_FieldSeparator));
-    if (!ptr) return NULL;
-  }
-  ptr = upb_MtDataEncoder_PutBase92Varint(e, ptr, field_num, upb_ToBase92(0),
-                                          upb_ToBase92(63));
-  in->state.msg_state.oneof_state = kUpb_OneofState_EmittedOneofField;
-  return ptr;
-}
-
-void upb_MtDataEncoder_StartEnum(upb_MtDataEncoder* e) {
-  upb_MtDataEncoderInternal* in = upb_MtDataEncoder_GetInternal(e, NULL);
-  in->state.enum_state.present_values_mask = 0;
-  in->state.enum_state.last_written_value = 0;
-}
-
-static char* upb_MtDataEncoder_FlushDenseEnumMask(upb_MtDataEncoder* e,
-                                                  char* ptr) {
-  upb_MtDataEncoderInternal* in = (upb_MtDataEncoderInternal*)e->internal;
-  ptr = upb_MtDataEncoder_Put(e, ptr, in->state.enum_state.present_values_mask);
-  in->state.enum_state.present_values_mask = 0;
-  in->state.enum_state.last_written_value += 5;
-  return ptr;
-}
-
-char* upb_MtDataEncoder_PutEnumValue(upb_MtDataEncoder* e, char* ptr,
-                                     uint32_t val) {
-  // TODO(b/229641772): optimize this encoding.
-  upb_MtDataEncoderInternal* in = upb_MtDataEncoder_GetInternal(e, ptr);
-  UPB_ASSERT(val >= in->state.enum_state.last_written_value);
-  uint32_t delta = val - in->state.enum_state.last_written_value;
-  if (delta >= 5 && in->state.enum_state.present_values_mask) {
-    ptr = upb_MtDataEncoder_FlushDenseEnumMask(e, ptr);
-    delta -= 5;
-  }
-
-  if (delta >= 5) {
-    ptr = upb_MtDataEncoder_PutBase92Varint(
-        e, ptr, delta, kUpb_EncodedValue_MinSkip, kUpb_EncodedValue_MaxSkip);
-    in->state.enum_state.last_written_value += delta;
-    delta = 0;
-  }
-
-  UPB_ASSERT((in->state.enum_state.present_values_mask >> delta) == 0);
-  in->state.enum_state.present_values_mask |= 1ULL << delta;
-  return ptr;
-}
-
-char* upb_MtDataEncoder_EndEnum(upb_MtDataEncoder* e, char* ptr) {
-  upb_MtDataEncoderInternal* in = upb_MtDataEncoder_GetInternal(e, ptr);
-  if (!in->state.enum_state.present_values_mask) return ptr;
-  return upb_MtDataEncoder_FlushDenseEnumMask(e, ptr);
-}
-
-const upb_MiniTable_Field* upb_MiniTable_FindFieldByNumber(
-    const upb_MiniTable* table, uint32_t number) {
-  int n = table->field_count;
-  for (int i = 0; i < n; i++) {
-    if (table->fields[i].number == number) {
-      return &table->fields[i];
-    }
-  }
-  return NULL;
-}
-
-/** Data decoder **************************************************************/
-
-// Note: we sort by this number when calculating layout order.
-typedef enum {
-  kUpb_LayoutItemType_OneofCase,   // Oneof case.
-  kUpb_LayoutItemType_OneofField,  // Oneof field data.
-  kUpb_LayoutItemType_Field,       // Non-oneof field data.
-
-  kUpb_LayoutItemType_Max = kUpb_LayoutItemType_Field,
-} upb_LayoutItemType;
-
-#define kUpb_LayoutItem_IndexSentinel ((uint16_t)-1)
-
-typedef struct {
-  // Index of the corresponding field.  When this is a oneof field, the field's
-  // offset will be the index of the next field in a linked list.
-  uint16_t field_index;
-  uint16_t offset;
-  upb_FieldRep rep;
-  upb_LayoutItemType type;
-} upb_LayoutItem;
-
-typedef struct {
-  upb_LayoutItem* data;
-  size_t size;
-  size_t capacity;
-} upb_LayoutItemVector;
-
-typedef struct {
-  const char* end;
-  upb_MiniTable* table;
-  upb_MiniTable_Field* fields;
-  upb_MiniTablePlatform platform;
-  upb_LayoutItemVector vec;
-  upb_Arena* arena;
-  upb_Status* status;
-  jmp_buf err;
-} upb_MtDecoder;
-
-UPB_PRINTF(2, 3)
-UPB_NORETURN static void upb_MtDecoder_ErrorFormat(upb_MtDecoder* d,
-                                                   const char* fmt, ...) {
-  va_list argp;
-  upb_Status_SetErrorMessage(d->status, "Error building mini table: ");
-  va_start(argp, fmt);
-  upb_Status_VAppendErrorFormat(d->status, fmt, argp);
-  va_end(argp);
-  UPB_LONGJMP(d->err, 1);
-}
-
-static void upb_MtDecoder_CheckOutOfMemory(upb_MtDecoder* d, const void* ptr) {
-  if (!ptr) upb_MtDecoder_ErrorFormat(d, "Out of memory");
-}
-
-// In each field's offset, we temporarily store a presence classifier:
-enum PresenceClass {
-  kNoPresence = 0,
-  kHasbitPresence = 1,
-  kRequiredPresence = 2,
-  kOneofBase = 3,
-  // Negative values refer to a specific oneof with that number.  Positive
-  // values >= kOneofBase indicate that this field is in a oneof, and specify
-  // the next field in this oneof's linked list.
-};
-
-static const char* upb_MiniTable_DecodeBase92Varint(upb_MtDecoder* d,
-                                                    const char* ptr,
-                                                    char first_ch, uint8_t min,
-                                                    uint8_t max,
-                                                    uint32_t* out_val) {
-  uint32_t val = 0;
-  uint32_t shift = 0;
-  const int bits_per_char =
-      _upb_Log2Ceiling(upb_FromBase92(max) - upb_FromBase92(min));
-  char ch = first_ch;
-  while (1) {
-    uint32_t bits = upb_FromBase92(ch) - upb_FromBase92(min);
-    UPB_ASSERT(shift < 32);
-    val |= bits << shift;
-    if (ptr == d->end || *ptr < min || max < *ptr) {
-      *out_val = val;
-      return ptr;
-    }
-    ch = *ptr++;
-    shift += bits_per_char;
-  }
-}
-
-static bool upb_MiniTable_HasSub(upb_MiniTable_Field* field,
-                                 uint64_t msg_modifiers) {
-  switch (field->descriptortype) {
-    case kUpb_FieldType_Message:
-    case kUpb_FieldType_Group:
-    case kUpb_FieldType_Enum:
-      return true;
-    case kUpb_FieldType_String:
-      if (!(msg_modifiers & kUpb_MessageModifier_ValidateUtf8)) {
-        field->descriptortype = kUpb_FieldType_Bytes;
-      }
-      return false;
-    default:
-      return false;
-  }
-}
-
-static bool upb_MtDecoder_FieldIsPackable(upb_MiniTable_Field* field) {
-  return (field->mode & kUpb_FieldMode_Array) &&
-         upb_IsTypePackable(field->descriptortype);
-}
-
-static void upb_MiniTable_SetTypeAndSub(upb_MiniTable_Field* field,
-                                        upb_FieldType type, uint32_t* sub_count,
-                                        uint64_t msg_modifiers) {
-  field->descriptortype = type;
-  if (upb_MiniTable_HasSub(field, msg_modifiers)) {
-    field->submsg_index = sub_count ? (*sub_count)++ : 0;
-  } else {
-    field->submsg_index = kUpb_NoSub;
-  }
-
-  if (upb_MtDecoder_FieldIsPackable(field) &&
-      (msg_modifiers & kUpb_MessageModifier_DefaultIsPacked)) {
-    field->mode |= kUpb_LabelFlags_IsPacked;
-  }
-}
-
-static void upb_MiniTable_SetField(upb_MtDecoder* d, uint8_t ch,
-                                   upb_MiniTable_Field* field,
-                                   uint64_t msg_modifiers,
-                                   uint32_t* sub_count) {
-  static const char kUpb_EncodedToFieldRep[] = {
-      [kUpb_EncodedType_Double] = kUpb_FieldRep_8Byte,
-      [kUpb_EncodedType_Float] = kUpb_FieldRep_4Byte,
-      [kUpb_EncodedType_Int64] = kUpb_FieldRep_8Byte,
-      [kUpb_EncodedType_UInt64] = kUpb_FieldRep_8Byte,
-      [kUpb_EncodedType_Int32] = kUpb_FieldRep_4Byte,
-      [kUpb_EncodedType_Fixed64] = kUpb_FieldRep_8Byte,
-      [kUpb_EncodedType_Fixed32] = kUpb_FieldRep_4Byte,
-      [kUpb_EncodedType_Bool] = kUpb_FieldRep_1Byte,
-      [kUpb_EncodedType_String] = kUpb_FieldRep_StringView,
-      [kUpb_EncodedType_Group] = kUpb_FieldRep_Pointer,
-      [kUpb_EncodedType_Message] = kUpb_FieldRep_Pointer,
-      [kUpb_EncodedType_Bytes] = kUpb_FieldRep_StringView,
-      [kUpb_EncodedType_UInt32] = kUpb_FieldRep_4Byte,
-      [kUpb_EncodedType_Enum] = kUpb_FieldRep_4Byte,
-      [kUpb_EncodedType_SFixed32] = kUpb_FieldRep_4Byte,
-      [kUpb_EncodedType_SFixed64] = kUpb_FieldRep_8Byte,
-      [kUpb_EncodedType_SInt32] = kUpb_FieldRep_4Byte,
-      [kUpb_EncodedType_SInt64] = kUpb_FieldRep_8Byte,
-  };
-
-  static const char kUpb_EncodedToType[] = {
-      [kUpb_EncodedType_Double] = kUpb_FieldType_Double,
-      [kUpb_EncodedType_Float] = kUpb_FieldType_Float,
-      [kUpb_EncodedType_Int64] = kUpb_FieldType_Int64,
-      [kUpb_EncodedType_UInt64] = kUpb_FieldType_UInt64,
-      [kUpb_EncodedType_Int32] = kUpb_FieldType_Int32,
-      [kUpb_EncodedType_Fixed64] = kUpb_FieldType_Fixed64,
-      [kUpb_EncodedType_Fixed32] = kUpb_FieldType_Fixed32,
-      [kUpb_EncodedType_Bool] = kUpb_FieldType_Bool,
-      [kUpb_EncodedType_String] = kUpb_FieldType_String,
-      [kUpb_EncodedType_Group] = kUpb_FieldType_Group,
-      [kUpb_EncodedType_Message] = kUpb_FieldType_Message,
-      [kUpb_EncodedType_Bytes] = kUpb_FieldType_Bytes,
-      [kUpb_EncodedType_UInt32] = kUpb_FieldType_UInt32,
-      [kUpb_EncodedType_Enum] = kUpb_FieldType_Enum,
-      [kUpb_EncodedType_SFixed32] = kUpb_FieldType_SFixed32,
-      [kUpb_EncodedType_SFixed64] = kUpb_FieldType_SFixed64,
-      [kUpb_EncodedType_SInt32] = kUpb_FieldType_SInt32,
-      [kUpb_EncodedType_SInt64] = kUpb_FieldType_SInt64,
-  };
-
-  int8_t type = upb_FromBase92(ch);
-  if (ch >= upb_ToBase92(kUpb_EncodedType_RepeatedBase)) {
-    type -= kUpb_EncodedType_RepeatedBase;
-    field->mode = kUpb_FieldMode_Array;
-    field->mode |= kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift;
-    field->offset = kNoPresence;
-  } else {
-    field->mode = kUpb_FieldMode_Scalar;
-    field->mode |= kUpb_EncodedToFieldRep[type] << kUpb_FieldRep_Shift;
-    field->offset = kHasbitPresence;
-  }
-  if (type >= 18) {
-    upb_MtDecoder_ErrorFormat(d, "Invalid field type: %d", (int)type);
-    UPB_UNREACHABLE();
-  }
-  upb_MiniTable_SetTypeAndSub(field, kUpb_EncodedToType[type], sub_count,
-                              msg_modifiers);
-}
-
-static void upb_MtDecoder_ModifyField(upb_MtDecoder* d,
-                                      uint32_t message_modifiers,
-                                      uint32_t field_modifiers,
-                                      upb_MiniTable_Field* field) {
-  if (field_modifiers & kUpb_EncodedFieldModifier_FlipPacked) {
-    if (!upb_MtDecoder_FieldIsPackable(field)) {
-      upb_MtDecoder_ErrorFormat(
-          d, "Cannot flip packed on unpackable field %" PRIu32, field->number);
-      UPB_UNREACHABLE();
-    }
-    field->mode ^= kUpb_LabelFlags_IsPacked;
-  }
-
-  bool singular = field_modifiers & kUpb_EncodedFieldModifier_IsProto3Singular;
-  bool required = field_modifiers & kUpb_EncodedFieldModifier_IsRequired;
-
-  // Validate.
-  if ((singular || required) && field->offset != kHasbitPresence) {
-    upb_MtDecoder_ErrorFormat(
-        d, "Invalid modifier(s) for repeated field %" PRIu32, field->number);
-    UPB_UNREACHABLE();
-  }
-  if (singular && required) {
-    upb_MtDecoder_ErrorFormat(
-        d, "Field %" PRIu32 " cannot be both singular and required",
-        field->number);
-    UPB_UNREACHABLE();
-  }
-
-  if (singular) field->offset = kNoPresence;
-  if (required) {
-    field->offset = kRequiredPresence;
-  }
-}
-
-static void upb_MtDecoder_PushItem(upb_MtDecoder* d, upb_LayoutItem item) {
-  if (d->vec.size == d->vec.capacity) {
-    size_t new_cap = UPB_MAX(8, d->vec.size * 2);
-    d->vec.data = realloc(d->vec.data, new_cap * sizeof(*d->vec.data));
-    upb_MtDecoder_CheckOutOfMemory(d, d->vec.data);
-    d->vec.capacity = new_cap;
-  }
-  d->vec.data[d->vec.size++] = item;
-}
-
-static void upb_MtDecoder_PushOneof(upb_MtDecoder* d, upb_LayoutItem item) {
-  if (item.field_index == kUpb_LayoutItem_IndexSentinel) {
-    upb_MtDecoder_ErrorFormat(d, "Empty oneof");
-    UPB_UNREACHABLE();
-  }
-  item.field_index -= kOneofBase;
-
-  // Push oneof data.
-  item.type = kUpb_LayoutItemType_OneofField;
-  upb_MtDecoder_PushItem(d, item);
-
-  // Push oneof case.
-  item.rep = kUpb_FieldRep_4Byte;  // Field Number.
-  item.type = kUpb_LayoutItemType_OneofCase;
-  upb_MtDecoder_PushItem(d, item);
-}
-
-size_t upb_MtDecoder_SizeOfRep(upb_FieldRep rep,
-                               upb_MiniTablePlatform platform) {
-  static const uint8_t kRepToSize32[] = {
-      [kUpb_FieldRep_1Byte] = 1,   [kUpb_FieldRep_4Byte] = 4,
-      [kUpb_FieldRep_Pointer] = 4, [kUpb_FieldRep_StringView] = 8,
-      [kUpb_FieldRep_8Byte] = 8,
-  };
-  static const uint8_t kRepToSize64[] = {
-      [kUpb_FieldRep_1Byte] = 1,   [kUpb_FieldRep_4Byte] = 4,
-      [kUpb_FieldRep_Pointer] = 8, [kUpb_FieldRep_StringView] = 16,
-      [kUpb_FieldRep_8Byte] = 8,
-  };
-  UPB_ASSERT(sizeof(upb_StringView) ==
-             UPB_SIZE(kRepToSize32, kRepToSize64)[kUpb_FieldRep_StringView]);
-  return platform == kUpb_MiniTablePlatform_32Bit ? kRepToSize32[rep]
-                                                  : kRepToSize64[rep];
-}
-
-size_t upb_MtDecoder_AlignOfRep(upb_FieldRep rep,
-                                upb_MiniTablePlatform platform) {
-  static const uint8_t kRepToAlign32[] = {
-      [kUpb_FieldRep_1Byte] = 1,   [kUpb_FieldRep_4Byte] = 4,
-      [kUpb_FieldRep_Pointer] = 4, [kUpb_FieldRep_StringView] = 4,
-      [kUpb_FieldRep_8Byte] = 8,
-  };
-  static const uint8_t kRepToAlign64[] = {
-      [kUpb_FieldRep_1Byte] = 1,   [kUpb_FieldRep_4Byte] = 4,
-      [kUpb_FieldRep_Pointer] = 8, [kUpb_FieldRep_StringView] = 8,
-      [kUpb_FieldRep_8Byte] = 8,
-  };
-  UPB_ASSERT(UPB_ALIGN_OF(upb_StringView) ==
-             UPB_SIZE(kRepToAlign32, kRepToAlign64)[kUpb_FieldRep_StringView]);
-  return platform == kUpb_MiniTablePlatform_32Bit ? kRepToAlign32[rep]
-                                                  : kRepToAlign64[rep];
-}
-
-static const char* upb_MtDecoder_DecodeOneofField(upb_MtDecoder* d,
-                                                  const char* ptr,
-                                                  char first_ch,
-                                                  upb_LayoutItem* item) {
-  uint32_t field_num;
-  ptr = upb_MiniTable_DecodeBase92Varint(
-      d, ptr, first_ch, kUpb_EncodedValue_MinOneofField,
-      kUpb_EncodedValue_MaxOneofField, &field_num);
-  upb_MiniTable_Field* f =
-      (void*)upb_MiniTable_FindFieldByNumber(d->table, field_num);
-
-  if (!f) {
-    upb_MtDecoder_ErrorFormat(d,
-                              "Couldn't add field number %" PRIu32
-                              " to oneof, no such field number.",
-                              field_num);
-    UPB_UNREACHABLE();
-  }
-  if (f->offset != kHasbitPresence) {
-    upb_MtDecoder_ErrorFormat(
-        d,
-        "Cannot add repeated, required, or singular field %" PRIu32
-        " to oneof.",
-        field_num);
-    UPB_UNREACHABLE();
-  }
-
-  // Oneof storage must be large enough to accommodate the largest member.
-  int rep = f->mode >> kUpb_FieldRep_Shift;
-  if (upb_MtDecoder_SizeOfRep(rep, d->platform) >
-      upb_MtDecoder_SizeOfRep(item->rep, d->platform)) {
-    item->rep = rep;
-  }
-  // Prepend this field to the linked list.
-  f->offset = item->field_index;
-  item->field_index = (f - d->fields) + kOneofBase;
-  return ptr;
-}
-
-static const char* upb_MtDecoder_DecodeOneofs(upb_MtDecoder* d,
-                                              const char* ptr) {
-  upb_LayoutItem item = {.rep = 0,
-                         .field_index = kUpb_LayoutItem_IndexSentinel};
-  while (ptr < d->end) {
-    char ch = *ptr++;
-    if (ch == kUpb_EncodedValue_FieldSeparator) {
-      // Field separator, no action needed.
-    } else if (ch == kUpb_EncodedValue_OneofSeparator) {
-      // End of oneof.
-      upb_MtDecoder_PushOneof(d, item);
-      item.field_index = kUpb_LayoutItem_IndexSentinel;  // Move to next oneof.
-    } else {
-      ptr = upb_MtDecoder_DecodeOneofField(d, ptr, ch, &item);
-    }
-  }
-
-  // Push final oneof.
-  upb_MtDecoder_PushOneof(d, item);
-  return ptr;
-}
-
-static const char* upb_MtDecoder_ParseModifier(upb_MtDecoder* d,
-                                               const char* ptr, char first_ch,
-                                               upb_MiniTable_Field* last_field,
-                                               uint64_t* msg_modifiers) {
-  uint32_t mod;
-  ptr = upb_MiniTable_DecodeBase92Varint(d, ptr, first_ch,
-                                         kUpb_EncodedValue_MinModifier,
-                                         kUpb_EncodedValue_MaxModifier, &mod);
-  if (last_field) {
-    upb_MtDecoder_ModifyField(d, *msg_modifiers, mod, last_field);
-  } else {
-    if (!d->table) {
-      upb_MtDecoder_ErrorFormat(d, "Extensions cannot have message modifiers");
-      UPB_UNREACHABLE();
-    }
-    *msg_modifiers = mod;
-  }
-
-  return ptr;
-}
-
-static void upb_MtDecoder_AllocateSubs(upb_MtDecoder* d, uint32_t sub_count) {
-  size_t subs_bytes = sizeof(*d->table->subs) * sub_count;
-  d->table->subs = upb_Arena_Malloc(d->arena, subs_bytes);
-  upb_MtDecoder_CheckOutOfMemory(d, d->table->subs);
-}
-
-static void upb_MtDecoder_Parse(upb_MtDecoder* d, const char* ptr, size_t len,
-                                void* fields, size_t field_size,
-                                uint16_t* field_count, uint32_t* sub_count) {
-  uint64_t msg_modifiers = 0;
-  uint32_t last_field_number = 0;
-  upb_MiniTable_Field* last_field = NULL;
-  bool need_dense_below = d->table != NULL;
-
-  d->end = UPB_PTRADD(ptr, len);
-
-  while (ptr < d->end) {
-    char ch = *ptr++;
-    if (ch <= kUpb_EncodedValue_MaxField) {
-      upb_MiniTable_Field* field = fields;
-      *field_count += 1;
-      fields = (char*)fields + field_size;
-      field->number = ++last_field_number;
-      last_field = field;
-      upb_MiniTable_SetField(d, ch, field, msg_modifiers, sub_count);
-    } else if (kUpb_EncodedValue_MinModifier <= ch &&
-               ch <= kUpb_EncodedValue_MaxModifier) {
-      ptr = upb_MtDecoder_ParseModifier(d, ptr, ch, last_field, &msg_modifiers);
-      if (msg_modifiers & kUpb_MessageModifier_IsExtendable) {
-        d->table->ext |= kUpb_ExtMode_Extendable;
-      }
-    } else if (ch == kUpb_EncodedValue_End) {
-      if (!d->table) {
-        upb_MtDecoder_ErrorFormat(d, "Extensions cannot have oneofs.");
-        UPB_UNREACHABLE();
-      }
-      ptr = upb_MtDecoder_DecodeOneofs(d, ptr);
-    } else if (kUpb_EncodedValue_MinSkip <= ch &&
-               ch <= kUpb_EncodedValue_MaxSkip) {
-      if (need_dense_below) {
-        d->table->dense_below = d->table->field_count;
-        need_dense_below = false;
-      }
-      uint32_t skip;
-      ptr = upb_MiniTable_DecodeBase92Varint(d, ptr, ch,
-                                             kUpb_EncodedValue_MinSkip,
-                                             kUpb_EncodedValue_MaxSkip, &skip);
-      last_field_number += skip;
-      last_field_number--;  // Next field seen will increment.
-    }
-  }
-
-  if (need_dense_below) {
-    d->table->dense_below = d->table->field_count;
-  }
-}
-
-static void upb_MtDecoder_ParseMessage(upb_MtDecoder* d, const char* data,
-                                       size_t len) {
-  // Buffer length is an upper bound on the number of fields. We will return
-  // what we don't use.
-  d->fields = upb_Arena_Malloc(d->arena, sizeof(*d->fields) * len);
-  upb_MtDecoder_CheckOutOfMemory(d, d->fields);
-
-  uint32_t sub_count = 0;
-  d->table->field_count = 0;
-  d->table->fields = d->fields;
-  upb_MtDecoder_Parse(d, data, len, d->fields, sizeof(*d->fields),
-                      &d->table->field_count, &sub_count);
-
-  upb_Arena_ShrinkLast(d->arena, d->fields, sizeof(*d->fields) * len,
-                       sizeof(*d->fields) * d->table->field_count);
-  d->table->fields = d->fields;
-  upb_MtDecoder_AllocateSubs(d, sub_count);
-}
-
-int upb_MtDecoder_CompareFields(const void* _a, const void* _b) {
-  const upb_LayoutItem* a = _a;
-  const upb_LayoutItem* b = _b;
-  // Currently we just sort by:
-  //  1. rep (smallest fields first)
-  //  2. type (oneof cases first)
-  //  2. field_index (smallest numbers first)
-  // The main goal of this is to reduce space lost to padding.
-  // Later we may have more subtle reasons to prefer a different ordering.
-  const int rep_bits = _upb_Log2Ceiling(kUpb_FieldRep_Max);
-  const int type_bits = _upb_Log2Ceiling(kUpb_LayoutItemType_Max);
-  const int idx_bits = (sizeof(a->field_index) * 8);
-  UPB_ASSERT(idx_bits + rep_bits + type_bits < 32);
-#define UPB_COMBINE(rep, ty, idx) (((rep << type_bits) | ty) << idx_bits) | idx
-  uint32_t a_packed = UPB_COMBINE(a->rep, a->type, a->field_index);
-  uint32_t b_packed = UPB_COMBINE(b->rep, b->type, b->field_index);
-  assert(a_packed != b_packed);
-#undef UPB_COMBINE
-  return a_packed < b_packed ? -1 : 1;
-}
-
-static bool upb_MtDecoder_SortLayoutItems(upb_MtDecoder* d) {
-  // Add items for all non-oneof fields (oneofs were already added).
-  int n = d->table->field_count;
-  for (int i = 0; i < n; i++) {
-    upb_MiniTable_Field* f = &d->fields[i];
-    if (f->offset >= kOneofBase) continue;
-    upb_LayoutItem item = {.field_index = i,
-                           .rep = f->mode >> kUpb_FieldRep_Shift,
-                           .type = kUpb_LayoutItemType_Field};
-    upb_MtDecoder_PushItem(d, item);
-  }
-
-  if (d->vec.size) {
-    qsort(d->vec.data, d->vec.size, sizeof(*d->vec.data),
-          upb_MtDecoder_CompareFields);
-  }
-
-  return true;
-}
-
-static size_t upb_MiniTable_DivideRoundUp(size_t n, size_t d) {
-  return (n + d - 1) / d;
-}
-
-static void upb_MtDecoder_AssignHasbits(upb_MiniTable* ret) {
-  int n = ret->field_count;
-  int last_hasbit = 0;  // 0 cannot be used.
-
-  // First assign required fields, which must have the lowest hasbits.
-  for (int i = 0; i < n; i++) {
-    upb_MiniTable_Field* field = (upb_MiniTable_Field*)&ret->fields[i];
-    if (field->offset == kRequiredPresence) {
-      field->presence = ++last_hasbit;
-    } else if (field->offset == kNoPresence) {
-      field->presence = 0;
-    }
-  }
-  ret->required_count = last_hasbit;
-
-  // Next assign non-required hasbit fields.
-  for (int i = 0; i < n; i++) {
-    upb_MiniTable_Field* field = (upb_MiniTable_Field*)&ret->fields[i];
-    if (field->offset == kHasbitPresence) {
-      field->presence = ++last_hasbit;
-    }
-  }
-
-  ret->size = last_hasbit ? upb_MiniTable_DivideRoundUp(last_hasbit + 1, 8) : 0;
-}
-
-size_t upb_MtDecoder_Place(upb_MtDecoder* d, upb_FieldRep rep) {
-  size_t size = upb_MtDecoder_SizeOfRep(rep, d->platform);
-  size_t align = upb_MtDecoder_AlignOfRep(rep, d->platform);
-  size_t ret = UPB_ALIGN_UP(d->table->size, align);
-  d->table->size = ret + size;
-  return ret;
-}
-
-static void upb_MtDecoder_AssignOffsets(upb_MtDecoder* d) {
-  upb_LayoutItem* end = UPB_PTRADD(d->vec.data, d->vec.size);
-
-  // Compute offsets.
-  for (upb_LayoutItem* item = d->vec.data; item < end; item++) {
-    item->offset = upb_MtDecoder_Place(d, item->rep);
-  }
-
-  // Assign oneof case offsets.  We must do these first, since assigning
-  // actual offsets will overwrite the links of the linked list.
-  for (upb_LayoutItem* item = d->vec.data; item < end; item++) {
-    if (item->type != kUpb_LayoutItemType_OneofCase) continue;
-    upb_MiniTable_Field* f = &d->fields[item->field_index];
-    while (true) {
-      f->presence = ~item->offset;
-      if (f->offset == kUpb_LayoutItem_IndexSentinel) break;
-      UPB_ASSERT(f->offset - kOneofBase < d->table->field_count);
-      f = &d->fields[f->offset - kOneofBase];
-    }
-  }
-
-  // Assign offsets.
-  for (upb_LayoutItem* item = d->vec.data; item < end; item++) {
-    upb_MiniTable_Field* f = &d->fields[item->field_index];
-    switch (item->type) {
-      case kUpb_LayoutItemType_OneofField:
-        while (true) {
-          uint16_t next_offset = f->offset;
-          f->offset = item->offset;
-          if (next_offset == kUpb_LayoutItem_IndexSentinel) break;
-          f = &d->fields[next_offset - kOneofBase];
-        }
-        break;
-      case kUpb_LayoutItemType_Field:
-        f->offset = item->offset;
-        break;
-      default:
-        break;
-    }
-  }
-
-  // The fasttable parser (supported on 64-bit only) depends on this being a
-  // multiple of 8 in order to satisfy UPB_MALLOC_ALIGN, which is also 8.
-  //
-  // On 32-bit we could potentially make this smaller, but there is no
-  // compelling reason to optimize this right now.
-  d->table->size = UPB_ALIGN_UP(d->table->size, 8);
-}
-
-upb_MiniTable* upb_MiniTable_BuildWithBuf(const char* data, size_t len,
-                                          upb_MiniTablePlatform platform,
-                                          upb_Arena* arena, void** buf,
-                                          size_t* buf_size,
-                                          upb_Status* status) {
-  upb_MtDecoder decoder = {
-      .platform = platform,
-      .vec =
-          {
-              .data = *buf,
-              .capacity = *buf_size / sizeof(*decoder.vec.data),
-              .size = 0,
-          },
-      .arena = arena,
-      .status = status,
-      .table = upb_Arena_Malloc(arena, sizeof(*decoder.table)),
-  };
-
-  if (UPB_SETJMP(decoder.err)) {
-    decoder.table = NULL;
-    goto done;
-  }
-
-  upb_MtDecoder_CheckOutOfMemory(&decoder, decoder.table);
-
-  decoder.table->size = 0;
-  decoder.table->field_count = 0;
-  decoder.table->ext = kUpb_ExtMode_NonExtendable;
-  decoder.table->dense_below = 0;
-  decoder.table->table_mask = -1;
-  decoder.table->required_count = 0;
-
-  upb_MtDecoder_ParseMessage(&decoder, data, len);
-  upb_MtDecoder_AssignHasbits(decoder.table);
-  upb_MtDecoder_SortLayoutItems(&decoder);
-  upb_MtDecoder_AssignOffsets(&decoder);
-
-done:
-  *buf = decoder.vec.data;
-  *buf_size = decoder.vec.capacity / sizeof(*decoder.vec.data);
-  return decoder.table;
-}
-
-upb_MiniTable* upb_MiniTable_BuildMessageSet(upb_MiniTablePlatform platform,
-                                             upb_Arena* arena) {
-  upb_MiniTable* ret = upb_Arena_Malloc(arena, sizeof(*ret));
-  if (!ret) return NULL;
-
-  ret->size = 0;
-  ret->field_count = 0;
-  ret->ext = kUpb_ExtMode_IsMessageSet;
-  ret->dense_below = 0;
-  ret->table_mask = -1;
-  ret->required_count = 0;
-  return ret;
-}
-
-upb_MiniTable* upb_MiniTable_BuildMapEntry(upb_FieldType key_type,
-                                           upb_FieldType value_type,
-                                           bool value_is_proto3_enum,
-                                           upb_MiniTablePlatform platform,
-                                           upb_Arena* arena) {
-  upb_MiniTable* ret = upb_Arena_Malloc(arena, sizeof(*ret));
-  upb_MiniTable_Field* fields = upb_Arena_Malloc(arena, sizeof(*fields) * 2);
-  if (!ret || !fields) return NULL;
-
-  upb_MiniTable_Sub* subs = NULL;
-  if (value_is_proto3_enum) value_type = kUpb_FieldType_Int32;
-  if (value_type == kUpb_FieldType_Message ||
-      value_type == kUpb_FieldType_Group || value_type == kUpb_FieldType_Enum) {
-    subs = upb_Arena_Malloc(arena, sizeof(*subs));
-    if (!subs) return NULL;
-  }
-
-  size_t field_size =
-      upb_MtDecoder_SizeOfRep(kUpb_FieldRep_StringView, platform);
-
-  fields[0].number = 1;
-  fields[1].number = 2;
-  fields[0].mode = kUpb_FieldMode_Scalar;
-  fields[1].mode = kUpb_FieldMode_Scalar;
-  fields[0].presence = 0;
-  fields[1].presence = 0;
-  fields[0].offset = 0;
-  fields[1].offset = field_size;
-
-  upb_MiniTable_SetTypeAndSub(&fields[0], key_type, NULL, 0);
-  upb_MiniTable_SetTypeAndSub(&fields[1], value_type, NULL, 0);
-
-  ret->size = UPB_ALIGN_UP(2 * field_size, 8);
-  ret->field_count = 2;
-  ret->ext = kUpb_ExtMode_NonExtendable | kUpb_ExtMode_IsMapEntry;
-  ret->dense_below = 2;
-  ret->table_mask = -1;
-  ret->required_count = 0;
-  ret->subs = subs;
-  ret->fields = fields;
-  return ret;
-}
-
-static bool upb_MiniTable_BuildEnumValue(upb_MtDecoder* d,
-                                         upb_MiniTable_Enum* table,
-                                         uint32_t val, upb_Arena* arena) {
-  if (val < 64) {
-    table->mask |= 1ULL << val;
-    return true;
-  }
-
-  int32_t* values = (void*)table->values;
-  values = upb_Arena_Realloc(arena, values, table->value_count * 4,
-                             (table->value_count + 1) * 4);
-  upb_MtDecoder_CheckOutOfMemory(d, values);
-  values[table->value_count++] = (int32_t)val;
-  table->values = values;
-  return true;
-}
-
-upb_MiniTable_Enum* upb_MiniTable_BuildEnum(const char* data, size_t len,
-                                            upb_Arena* arena,
-                                            upb_Status* status) {
-  upb_MtDecoder d = {
-      .status = status,
-      .end = UPB_PTRADD(data, len),
-  };
-
-  if (UPB_SETJMP(d.err)) {
-    return NULL;
-  }
-
-  upb_MiniTable_Enum* table = upb_Arena_Malloc(arena, sizeof(*table));
-  upb_MtDecoder_CheckOutOfMemory(&d, table);
-
-  table->mask = 0;
-  table->value_count = 0;
-  table->values = NULL;
-
-  const char* ptr = data;
-  uint32_t base = 0;
-
-  while (ptr < d.end) {
-    char ch = *ptr++;
-    if (ch <= kUpb_EncodedValue_MaxEnumMask) {
-      uint32_t mask = upb_FromBase92(ch);
-      for (int i = 0; i < 5; i++, base++, mask >>= 1) {
-        if (mask & 1) {
-          if (!upb_MiniTable_BuildEnumValue(&d, table, base, arena)) {
-            return NULL;
-          }
-        }
-      }
-    } else if (kUpb_EncodedValue_MinSkip <= ch &&
-               ch <= kUpb_EncodedValue_MaxSkip) {
-      uint32_t skip;
-      ptr = upb_MiniTable_DecodeBase92Varint(&d, ptr, ch,
-                                             kUpb_EncodedValue_MinSkip,
-                                             kUpb_EncodedValue_MaxSkip, &skip);
-      base += skip;
-    } else {
-      upb_Status_SetErrorFormat(status, "Unexpected character: %c", ch);
-      return NULL;
-    }
-  }
-
-  return table;
-}
-
-bool upb_MiniTable_BuildExtension(const char* data, size_t len,
-                                  upb_MiniTable_Extension* ext,
-                                  upb_MiniTable_Sub sub, upb_Status* status) {
-  upb_MtDecoder decoder = {
-      .arena = NULL,
-      .status = status,
-      .table = NULL,
-  };
-
-  if (UPB_SETJMP(decoder.err)) {
-    return false;
-  }
-
-  uint16_t count = 0;
-  upb_MtDecoder_Parse(&decoder, data, len, ext, sizeof(*ext), &count, NULL);
-  ext->field.mode |= kUpb_LabelFlags_IsExtension;
-  ext->field.offset = 0;
-  return true;
-}
-
-upb_MiniTable* upb_MiniTable_Build(const char* data, size_t len,
-                                   upb_MiniTablePlatform platform,
-                                   upb_Arena* arena, upb_Status* status) {
-  void* buf = NULL;
-  size_t size = 0;
-  upb_MiniTable* ret = upb_MiniTable_BuildWithBuf(data, len, platform, arena,
-                                                  &buf, &size, status);
-  free(buf);
-  return ret;
-}
-
-void upb_MiniTable_SetSubMessage(upb_MiniTable* table,
-                                 upb_MiniTable_Field* field,
-                                 const upb_MiniTable* sub) {
-  UPB_ASSERT((uintptr_t)table->fields <= (uintptr_t)field &&
-             (uintptr_t)field <
-                 (uintptr_t)(table->fields + table->field_count));
-  if (sub->ext & kUpb_ExtMode_IsMapEntry) {
-    field->mode =
-        (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift) | kUpb_FieldMode_Map;
-  }
-  upb_MiniTable_Sub* table_sub = (void*)&table->subs[field->submsg_index];
-  table_sub->submsg = sub;
-}
-
-void upb_MiniTable_SetSubEnum(upb_MiniTable* table, upb_MiniTable_Field* field,
-                              const upb_MiniTable_Enum* sub) {
-  UPB_ASSERT((uintptr_t)table->fields <= (uintptr_t)field &&
-             (uintptr_t)field <
-                 (uintptr_t)(table->fields + table->field_count));
-  upb_MiniTable_Sub* table_sub = (void*)&table->subs[field->submsg_index];
-  table_sub->subenum = sub;
-}
-
-/** upb/def.c ************************************************************/
-
-#include <ctype.h>
-#include <errno.h>
-#include <setjmp.h>
-#include <stdlib.h>
-#include <string.h>
-
-
-/* Must be last. */
-
-typedef struct {
-  size_t len;
-  char str[1]; /* Null-terminated string data follows. */
-} str_t;
-
-/* The upb core does not generally have a concept of default instances. However
- * for descriptor options we make an exception since the max size is known and
- * modest (<200 bytes). All types can share a default instance since it is
- * initialized to zeroes.
- *
- * We have to allocate an extra pointer for upb's internal metadata. */
-static const char opt_default_buf[_UPB_MAXOPT_SIZE + sizeof(void*)] = {0};
-static const char* opt_default = &opt_default_buf[sizeof(void*)];
-
-struct upb_FieldDef {
-  const google_protobuf_FieldOptions* opts;
-  const upb_FileDef* file;
-  const upb_MessageDef* msgdef;
-  const char* full_name;
-  const char* json_name;
-  union {
-    int64_t sint;
-    uint64_t uint;
-    double dbl;
-    float flt;
-    bool boolean;
-    str_t* str;
-  } defaultval;
-  union {
-    const upb_OneofDef* oneof;
-    const upb_MessageDef* extension_scope;
-  } scope;
-  union {
-    const upb_MessageDef* msgdef;
-    const upb_EnumDef* enumdef;
-    const google_protobuf_FieldDescriptorProto* unresolved;
-  } sub;
-  uint32_t number_;
-  uint16_t index_;
-  uint16_t layout_index; /* Index into msgdef->layout->fields or file->exts */
-  bool has_default;
-  bool is_extension_;
-  bool packed_;
-  bool proto3_optional_;
-  bool has_json_name_;
-  upb_FieldType type_;
-  upb_Label label_;
-#if UINTPTR_MAX == 0xffffffff
-  uint32_t padding;  // Increase size to a multiple of 8.
-#endif
-};
-
-struct upb_ExtensionRange {
-  const google_protobuf_ExtensionRangeOptions* opts;
-  int32_t start;
-  int32_t end;
-};
-
-struct upb_MessageDef {
-  const google_protobuf_MessageOptions* opts;
-  const upb_MiniTable* layout;
-  const upb_FileDef* file;
-  const upb_MessageDef* containing_type;
-  const char* full_name;
-
-  /* Tables for looking up fields by number and name. */
-  upb_inttable itof;
-  upb_strtable ntof;
-
-  /* All nested defs.
-   * MEM: We could save some space here by putting nested defs in a contiguous
-   * region and calculating counts from offsets or vice-versa. */
-  const upb_FieldDef* fields;
-  const upb_OneofDef* oneofs;
-  const upb_ExtensionRange* ext_ranges;
-  const upb_StringView* res_names;
-  const upb_MessageDef* nested_msgs;
-  const upb_MessageReservedRange* res_ranges;
-  const upb_EnumDef* nested_enums;
-  const upb_FieldDef* nested_exts;
-  int field_count;
-  int real_oneof_count;
-  int oneof_count;
-  int ext_range_count;
-  int res_range_count;
-  int res_name_count;
-  int nested_msg_count;
-  int nested_enum_count;
-  int nested_ext_count;
-  bool in_message_set;
-  upb_WellKnown well_known_type;
-#if UINTPTR_MAX == 0xffffffff
-  uint32_t padding;  // Increase size to a multiple of 8.
-#endif
-};
-
-struct upb_EnumDef {
-  const google_protobuf_EnumOptions* opts;
-  const upb_MiniTable_Enum* layout;  // Only for proto2.
-  const upb_FileDef* file;
-  const upb_MessageDef* containing_type;  // Could be merged with "file".
-  const char* full_name;
-  upb_strtable ntoi;
-  upb_inttable iton;
-  const upb_EnumValueDef* values;
-  const upb_EnumReservedRange* res_ranges;
-  const upb_StringView* res_names;
-  int value_count;
-  int res_range_count;
-  int res_name_count;
-  int32_t defaultval;
-#if UINTPTR_MAX == 0xffffffff
-  uint32_t padding;  // Increase size to a multiple of 8.
-#endif
-};
-
-struct upb_EnumValueDef {
-  const google_protobuf_EnumValueOptions* opts;
-  const upb_EnumDef* parent;
-  const char* full_name;
-  int32_t number;
-};
-
-struct upb_OneofDef {
-  const google_protobuf_OneofOptions* opts;
-  const upb_MessageDef* parent;
-  const char* full_name;
-  int field_count;
-  bool synthetic;
-  const upb_FieldDef** fields;
-  upb_strtable ntof;
-  upb_inttable itof;
-#if UINTPTR_MAX == 0xffffffff
-  uint32_t padding;  // Increase size to a multiple of 8.
-#endif
-};
-
-struct upb_FileDef {
-  const google_protobuf_FileOptions* opts;
-  const char* name;
-  const char* package;
-
-  const upb_FileDef** deps;
-  const int32_t* public_deps;
-  const int32_t* weak_deps;
-  const upb_MessageDef* top_lvl_msgs;
-  const upb_EnumDef* top_lvl_enums;
-  const upb_FieldDef* top_lvl_exts;
-  const upb_ServiceDef* services;
-  const upb_MiniTable_Extension** ext_layouts;
-  const upb_DefPool* symtab;
-
-  int dep_count;
-  int public_dep_count;
-  int weak_dep_count;
-  int top_lvl_msg_count;
-  int top_lvl_enum_count;
-  int top_lvl_ext_count;
-  int service_count;
-  int ext_count; /* All exts in the file. */
-  upb_Syntax syntax;
-};
-
-struct upb_MethodDef {
-  const google_protobuf_MethodOptions* opts;
-  upb_ServiceDef* service;
-  const char* full_name;
-  const upb_MessageDef* input_type;
-  const upb_MessageDef* output_type;
-  int index;
-  bool client_streaming;
-  bool server_streaming;
-};
-
-struct upb_ServiceDef {
-  const google_protobuf_ServiceOptions* opts;
-  const upb_FileDef* file;
-  const char* full_name;
-  upb_MethodDef* methods;
-  int method_count;
-  int index;
-};
-
-struct upb_DefPool {
-  upb_Arena* arena;
-  upb_strtable syms;  /* full_name -> packed def ptr */
-  upb_strtable files; /* file_name -> upb_FileDef* */
-  upb_inttable exts;  /* upb_MiniTable_Extension* -> upb_FieldDef* */
-  upb_ExtensionRegistry* extreg;
-  size_t bytes_loaded;
-};
-
-/* Inside a symtab we store tagged pointers to specific def types. */
-typedef enum {
-  UPB_DEFTYPE_MASK = 7,
-
-  /* Only inside symtab table. */
-  UPB_DEFTYPE_EXT = 0,
-  UPB_DEFTYPE_MSG = 1,
-  UPB_DEFTYPE_ENUM = 2,
-  UPB_DEFTYPE_ENUMVAL = 3,
-  UPB_DEFTYPE_SERVICE = 4,
-
-  /* Only inside message table. */
-  UPB_DEFTYPE_FIELD = 0,
-  UPB_DEFTYPE_ONEOF = 1,
-  UPB_DEFTYPE_FIELD_JSONNAME = 2,
-
-  /* Only inside file table. */
-  UPB_DEFTYPE_FILE = 0,
-  UPB_DEFTYPE_LAYOUT = 1
-} upb_deftype_t;
-
-#define FIELD_TYPE_UNSPECIFIED 0
-
-struct upb_MessageReservedRange {
-  int32_t start;
-  int32_t end;
-};
-
-struct symtab_addctx {
-  upb_DefPool* symtab;
-  upb_FileDef* file;                /* File we are building. */
-  upb_Arena* arena;                 /* Allocate defs here. */
-  upb_Arena* tmp_arena;             /* For temporary allocations. */
-  const upb_MiniTable_File* layout; /* NULL if we should build layouts. */
-  int enum_count;                   /* Count of enums built so far. */
-  int msg_count;                    /* Count of messages built so far. */
-  int ext_count;                    /* Count of extensions built so far. */
-  upb_Status* status;               /* Record errors here. */
-  jmp_buf err;                      /* longjmp() on error. */
-};
-
-static upb_deftype_t deftype(upb_value v) {
-  uintptr_t num = (uintptr_t)upb_value_getconstptr(v);
-  return num & UPB_DEFTYPE_MASK;
-}
-
-static const void* unpack_def(upb_value v, upb_deftype_t type) {
-  uintptr_t num = (uintptr_t)upb_value_getconstptr(v);
-  return (num & UPB_DEFTYPE_MASK) == type
-             ? (const void*)(num & ~UPB_DEFTYPE_MASK)
-             : NULL;
-}
-
-static upb_value pack_def(const void* ptr, upb_deftype_t type) {
-  // Our 3-bit pointer tagging requires all pointers to be multiples of 8.
-  // The arena will always yield 8-byte-aligned addresses, however we put
-  // the defs into arrays.  For each element in the array to be 8-byte-aligned,
-  // the sizes of each def type must also be a multiple of 8.
-  //
-  // If any of these asserts fail, we need to add or remove padding on 32-bit
-  // machines (64-bit machines will have 8-byte alignment already due to
-  // pointers, which all of these structs have).
-  UPB_ASSERT((sizeof(upb_FieldDef) & UPB_DEFTYPE_MASK) == 0);
-  UPB_ASSERT((sizeof(upb_MessageDef) & UPB_DEFTYPE_MASK) == 0);
-  UPB_ASSERT((sizeof(upb_EnumDef) & UPB_DEFTYPE_MASK) == 0);
-  UPB_ASSERT((sizeof(upb_EnumValueDef) & UPB_DEFTYPE_MASK) == 0);
-  UPB_ASSERT((sizeof(upb_ServiceDef) & UPB_DEFTYPE_MASK) == 0);
-  UPB_ASSERT((sizeof(upb_OneofDef) & UPB_DEFTYPE_MASK) == 0);
-  uintptr_t num = (uintptr_t)ptr;
-  UPB_ASSERT((num & UPB_DEFTYPE_MASK) == 0);
-  num |= type;
-  return upb_value_constptr((const void*)num);
-}
-
-/* isalpha() etc. from <ctype.h> are locale-dependent, which we don't want. */
-static bool upb_isbetween(uint8_t c, uint8_t low, uint8_t high) {
-  return c >= low && c <= high;
-}
-
-static char upb_ascii_lower(char ch) {
-  // Per ASCII this will lower-case a letter.  If the result is a letter, the
-  // input was definitely a letter.  If the output is not a letter, this may
-  // have transformed the character unpredictably.
-  return ch | 0x20;
-}
-
-static bool upb_isletter(char c) {
-  char lower = upb_ascii_lower(c);
-  return upb_isbetween(lower, 'a', 'z') || c == '_';
-}
-
-static bool upb_isalphanum(char c) {
-  return upb_isletter(c) || upb_isbetween(c, '0', '9');
-}
-
-static const char* shortdefname(const char* fullname) {
-  const char* p;
-
-  if (fullname == NULL) {
-    return NULL;
-  } else if ((p = strrchr(fullname, '.')) == NULL) {
-    /* No '.' in the name, return the full string. */
-    return fullname;
-  } else {
-    /* Return one past the last '.'. */
-    return p + 1;
-  }
-}
-
-/* All submessage fields are lower than all other fields.
- * Secondly, fields are increasing in order. */
-uint32_t field_rank(const upb_FieldDef* f) {
-  uint32_t ret = upb_FieldDef_Number(f);
-  const uint32_t high_bit = 1 << 30;
-  UPB_ASSERT(ret < high_bit);
-  if (!upb_FieldDef_IsSubMessage(f)) ret |= high_bit;
-  return ret;
-}
-
-int cmp_fields(const void* p1, const void* p2) {
-  const upb_FieldDef* f1 = *(upb_FieldDef* const*)p1;
-  const upb_FieldDef* f2 = *(upb_FieldDef* const*)p2;
-  return field_rank(f1) - field_rank(f2);
-}
-
-static void upb_Status_setoom(upb_Status* status) {
-  upb_Status_SetErrorMessage(status, "out of memory");
-}
-
-static void assign_msg_wellknowntype(upb_MessageDef* m) {
-  const char* name = upb_MessageDef_FullName(m);
-  if (name == NULL) {
-    m->well_known_type = kUpb_WellKnown_Unspecified;
-    return;
-  }
-  if (!strcmp(name, "google.protobuf.Any")) {
-    m->well_known_type = kUpb_WellKnown_Any;
-  } else if (!strcmp(name, "google.protobuf.FieldMask")) {
-    m->well_known_type = kUpb_WellKnown_FieldMask;
-  } else if (!strcmp(name, "google.protobuf.Duration")) {
-    m->well_known_type = kUpb_WellKnown_Duration;
-  } else if (!strcmp(name, "google.protobuf.Timestamp")) {
-    m->well_known_type = kUpb_WellKnown_Timestamp;
-  } else if (!strcmp(name, "google.protobuf.DoubleValue")) {
-    m->well_known_type = kUpb_WellKnown_DoubleValue;
-  } else if (!strcmp(name, "google.protobuf.FloatValue")) {
-    m->well_known_type = kUpb_WellKnown_FloatValue;
-  } else if (!strcmp(name, "google.protobuf.Int64Value")) {
-    m->well_known_type = kUpb_WellKnown_Int64Value;
-  } else if (!strcmp(name, "google.protobuf.UInt64Value")) {
-    m->well_known_type = kUpb_WellKnown_UInt64Value;
-  } else if (!strcmp(name, "google.protobuf.Int32Value")) {
-    m->well_known_type = kUpb_WellKnown_Int32Value;
-  } else if (!strcmp(name, "google.protobuf.UInt32Value")) {
-    m->well_known_type = kUpb_WellKnown_UInt32Value;
-  } else if (!strcmp(name, "google.protobuf.BoolValue")) {
-    m->well_known_type = kUpb_WellKnown_BoolValue;
-  } else if (!strcmp(name, "google.protobuf.StringValue")) {
-    m->well_known_type = kUpb_WellKnown_StringValue;
-  } else if (!strcmp(name, "google.protobuf.BytesValue")) {
-    m->well_known_type = kUpb_WellKnown_BytesValue;
-  } else if (!strcmp(name, "google.protobuf.Value")) {
-    m->well_known_type = kUpb_WellKnown_Value;
-  } else if (!strcmp(name, "google.protobuf.ListValue")) {
-    m->well_known_type = kUpb_WellKnown_ListValue;
-  } else if (!strcmp(name, "google.protobuf.Struct")) {
-    m->well_known_type = kUpb_WellKnown_Struct;
-  } else {
-    m->well_known_type = kUpb_WellKnown_Unspecified;
-  }
-}
-
-/* upb_EnumDef ****************************************************************/
-
-const google_protobuf_EnumOptions* upb_EnumDef_Options(const upb_EnumDef* e) {
-  return e->opts;
-}
-
-bool upb_EnumDef_HasOptions(const upb_EnumDef* e) {
-  return e->opts != (void*)opt_default;
-}
-
-const char* upb_EnumDef_FullName(const upb_EnumDef* e) { return e->full_name; }
-
-const char* upb_EnumDef_Name(const upb_EnumDef* e) {
-  return shortdefname(e->full_name);
-}
-
-const upb_FileDef* upb_EnumDef_File(const upb_EnumDef* e) { return e->file; }
-
-const upb_MessageDef* upb_EnumDef_ContainingType(const upb_EnumDef* e) {
-  return e->containing_type;
-}
-
-int32_t upb_EnumDef_Default(const upb_EnumDef* e) {
-  UPB_ASSERT(upb_EnumDef_FindValueByNumber(e, e->defaultval));
-  return e->defaultval;
-}
-
-int upb_EnumDef_ReservedRangeCount(const upb_EnumDef* e) {
-  return e->res_range_count;
-}
-
-/* upb_EnumReservedRange ******************************************************/
-
-struct upb_EnumReservedRange {
-  int32_t start;
-  int32_t end;
-};
-
-upb_EnumReservedRange* _upb_EnumReservedRange_At(const upb_EnumReservedRange* r,
-                                                 int i) {
-  return (upb_EnumReservedRange*)&r[i];
-}
-
-int32_t upb_EnumReservedRange_Start(const upb_EnumReservedRange* r) {
-  return r->start;
-}
-int32_t upb_EnumReservedRange_End(const upb_EnumReservedRange* r) {
-  return r->end;
-}
-
-UPB_NORETURN UPB_NOINLINE UPB_PRINTF(2, 3) static void symtab_errf(
-    symtab_addctx* ctx, const char* fmt, ...) {
-  va_list argp;
-  va_start(argp, fmt);
-  upb_Status_VSetErrorFormat(ctx->status, fmt, argp);
-  va_end(argp);
-  UPB_LONGJMP(ctx->err, 1);
-}
-
-upb_EnumReservedRange* _upb_EnumReservedRanges_New(
-    symtab_addctx* ctx, int n,
-    const google_protobuf_EnumDescriptorProto_EnumReservedRange* const* protos,
-    const upb_EnumDef* e) {
-  upb_EnumReservedRange* r =
-      upb_Arena_Malloc(ctx->arena, sizeof(upb_EnumReservedRange) * n);
-
-  for (int i = 0; i < n; i++) {
-    const int32_t start =
-        google_protobuf_EnumDescriptorProto_EnumReservedRange_start(protos[i]);
-    const int32_t end =
-        google_protobuf_EnumDescriptorProto_EnumReservedRange_end(protos[i]);
-
-    // A full validation would also check that each range is disjoint, and that
-    // none of the fields overlap with the extension ranges, but we are just
-    // sanity checking here.
-
-    // Note: Not a typo! Unlike extension ranges and message reserved ranges,
-    // the end value of an enum reserved range is *inclusive*!
-    if (end < start) {
-      symtab_errf(ctx, "Reserved range (%d, %d) is invalid, enum=%s\n",
-                           (int)start, (int)end, upb_EnumDef_FullName(e));
-    }
-
-    r[i].start = start;
-    r[i].end = end;
-  }
-
-  return r;
-}
-
-const upb_EnumReservedRange* upb_EnumDef_ReservedRange(const upb_EnumDef* e,
-                                                       int i) {
-  UPB_ASSERT(0 <= i && i < e->res_range_count);
-  return _upb_EnumReservedRange_At(e->res_ranges, i);
-}
-
-int upb_EnumDef_ReservedNameCount(const upb_EnumDef* e) {
-  return e->res_name_count;
-}
-
-upb_StringView upb_EnumDef_ReservedName(const upb_EnumDef* e, int i) {
-  UPB_ASSERT(0 <= i && i < e->res_name_count);
-  return e->res_names[i];
-}
-
-int upb_EnumDef_ValueCount(const upb_EnumDef* e) { return e->value_count; }
-
-const upb_EnumValueDef* upb_EnumDef_FindValueByNameWithSize(
-    const upb_EnumDef* def, const char* name, size_t len) {
-  upb_value v;
-  return upb_strtable_lookup2(&def->ntoi, name, len, &v)
-             ? upb_value_getconstptr(v)
-             : NULL;
-}
-
-const upb_EnumValueDef* upb_EnumDef_FindValueByNumber(const upb_EnumDef* def,
-                                                      int32_t num) {
-  upb_value v;
-  return upb_inttable_lookup(&def->iton, num, &v) ? upb_value_getconstptr(v)
-                                                  : NULL;
-}
-
-bool upb_EnumDef_CheckNumber(const upb_EnumDef* e, int32_t num) {
-  // We could use upb_EnumDef_FindValueByNumber(e, num) != NULL, but we expect
-  // this to be faster (especially for small numbers).
-  return upb_MiniTable_Enum_CheckValue(e->layout, num);
-}
-
-const upb_EnumValueDef* upb_EnumDef_Value(const upb_EnumDef* e, int i) {
-  UPB_ASSERT(0 <= i && i < e->value_count);
-  return &e->values[i];
-}
-
-/* upb_EnumValueDef ***********************************************************/
-
-const google_protobuf_EnumValueOptions* upb_EnumValueDef_Options(
-    const upb_EnumValueDef* e) {
-  return e->opts;
-}
-
-bool upb_EnumValueDef_HasOptions(const upb_EnumValueDef* e) {
-  return e->opts != (void*)opt_default;
-}
-
-const upb_EnumDef* upb_EnumValueDef_Enum(const upb_EnumValueDef* ev) {
-  return ev->parent;
-}
-
-const char* upb_EnumValueDef_FullName(const upb_EnumValueDef* ev) {
-  return ev->full_name;
-}
-
-const char* upb_EnumValueDef_Name(const upb_EnumValueDef* ev) {
-  return shortdefname(ev->full_name);
-}
-
-int32_t upb_EnumValueDef_Number(const upb_EnumValueDef* ev) {
-  return ev->number;
-}
-
-uint32_t upb_EnumValueDef_Index(const upb_EnumValueDef* ev) {
-  // Compute index in our parent's array.
-  return ev - ev->parent->values;
-}
-
-/* upb_ExtensionRange
- * ***************************************************************/
-
-const google_protobuf_ExtensionRangeOptions* upb_ExtensionRange_Options(
-    const upb_ExtensionRange* r) {
-  return r->opts;
-}
-
-bool upb_ExtensionRange_HasOptions(const upb_ExtensionRange* r) {
-  return r->opts != (void*)opt_default;
-}
-
-int32_t upb_ExtensionRange_Start(const upb_ExtensionRange* e) {
-  return e->start;
-}
-
-int32_t upb_ExtensionRange_End(const upb_ExtensionRange* e) { return e->end; }
-
-/* upb_FieldDef ***************************************************************/
-
-const google_protobuf_FieldOptions* upb_FieldDef_Options(
-    const upb_FieldDef* f) {
-  return f->opts;
-}
-
-bool upb_FieldDef_HasOptions(const upb_FieldDef* f) {
-  return f->opts != (void*)opt_default;
-}
-
-const char* upb_FieldDef_FullName(const upb_FieldDef* f) {
-  return f->full_name;
-}
-
-upb_CType upb_FieldDef_CType(const upb_FieldDef* f) {
-  switch (f->type_) {
-    case kUpb_FieldType_Double:
-      return kUpb_CType_Double;
-    case kUpb_FieldType_Float:
-      return kUpb_CType_Float;
-    case kUpb_FieldType_Int64:
-    case kUpb_FieldType_SInt64:
-    case kUpb_FieldType_SFixed64:
-      return kUpb_CType_Int64;
-    case kUpb_FieldType_Int32:
-    case kUpb_FieldType_SFixed32:
-    case kUpb_FieldType_SInt32:
-      return kUpb_CType_Int32;
-    case kUpb_FieldType_UInt64:
-    case kUpb_FieldType_Fixed64:
-      return kUpb_CType_UInt64;
-    case kUpb_FieldType_UInt32:
-    case kUpb_FieldType_Fixed32:
-      return kUpb_CType_UInt32;
-    case kUpb_FieldType_Enum:
-      return kUpb_CType_Enum;
-    case kUpb_FieldType_Bool:
-      return kUpb_CType_Bool;
-    case kUpb_FieldType_String:
-      return kUpb_CType_String;
-    case kUpb_FieldType_Bytes:
-      return kUpb_CType_Bytes;
-    case kUpb_FieldType_Group:
-    case kUpb_FieldType_Message:
-      return kUpb_CType_Message;
-  }
-  UPB_UNREACHABLE();
-}
-
-upb_FieldType upb_FieldDef_Type(const upb_FieldDef* f) { return f->type_; }
-
-uint32_t upb_FieldDef_Index(const upb_FieldDef* f) { return f->index_; }
-
-upb_Label upb_FieldDef_Label(const upb_FieldDef* f) { return f->label_; }
-
-uint32_t upb_FieldDef_Number(const upb_FieldDef* f) { return f->number_; }
-
-bool upb_FieldDef_IsExtension(const upb_FieldDef* f) {
-  return f->is_extension_;
-}
-
-bool upb_FieldDef_IsPacked(const upb_FieldDef* f) { return f->packed_; }
-
-const char* upb_FieldDef_Name(const upb_FieldDef* f) {
-  return shortdefname(f->full_name);
-}
-
-const char* upb_FieldDef_JsonName(const upb_FieldDef* f) {
-  return f->json_name;
-}
-
-bool upb_FieldDef_HasJsonName(const upb_FieldDef* f) {
-  return f->has_json_name_;
-}
-
-const upb_FileDef* upb_FieldDef_File(const upb_FieldDef* f) { return f->file; }
-
-const upb_MessageDef* upb_FieldDef_ContainingType(const upb_FieldDef* f) {
-  return f->msgdef;
-}
-
-const upb_MessageDef* upb_FieldDef_ExtensionScope(const upb_FieldDef* f) {
-  return f->is_extension_ ? f->scope.extension_scope : NULL;
-}
-
-const upb_OneofDef* upb_FieldDef_ContainingOneof(const upb_FieldDef* f) {
-  return f->is_extension_ ? NULL : f->scope.oneof;
-}
-
-const upb_OneofDef* upb_FieldDef_RealContainingOneof(const upb_FieldDef* f) {
-  const upb_OneofDef* oneof = upb_FieldDef_ContainingOneof(f);
-  if (!oneof || upb_OneofDef_IsSynthetic(oneof)) return NULL;
-  return oneof;
-}
-
-upb_MessageValue upb_FieldDef_Default(const upb_FieldDef* f) {
-  UPB_ASSERT(!upb_FieldDef_IsSubMessage(f));
-  upb_MessageValue ret;
-
-  switch (upb_FieldDef_CType(f)) {
-    case kUpb_CType_Bool:
-      return (upb_MessageValue){.bool_val = f->defaultval.boolean};
-    case kUpb_CType_Int64:
-      return (upb_MessageValue){.int64_val = f->defaultval.sint};
-    case kUpb_CType_UInt64:
-      return (upb_MessageValue){.uint64_val = f->defaultval.uint};
-    case kUpb_CType_Enum:
-    case kUpb_CType_Int32:
-      return (upb_MessageValue){.int32_val = (int32_t)f->defaultval.sint};
-    case kUpb_CType_UInt32:
-      return (upb_MessageValue){.uint32_val = (uint32_t)f->defaultval.uint};
-    case kUpb_CType_Float:
-      return (upb_MessageValue){.float_val = f->defaultval.flt};
-    case kUpb_CType_Double:
-      return (upb_MessageValue){.double_val = f->defaultval.dbl};
-    case kUpb_CType_String:
-    case kUpb_CType_Bytes: {
-      str_t* str = f->defaultval.str;
-      if (str) {
-        return (upb_MessageValue){
-            .str_val = (upb_StringView){.data = str->str, .size = str->len}};
-      } else {
-        return (upb_MessageValue){
-            .str_val = (upb_StringView){.data = NULL, .size = 0}};
-      }
-    }
-    default:
-      UPB_UNREACHABLE();
-  }
-
-  return ret;
-}
-
-const upb_MessageDef* upb_FieldDef_MessageSubDef(const upb_FieldDef* f) {
-  return upb_FieldDef_CType(f) == kUpb_CType_Message ? f->sub.msgdef : NULL;
-}
-
-const upb_EnumDef* upb_FieldDef_EnumSubDef(const upb_FieldDef* f) {
-  return upb_FieldDef_CType(f) == kUpb_CType_Enum ? f->sub.enumdef : NULL;
-}
-
-const upb_MiniTable_Field* upb_FieldDef_MiniTable(const upb_FieldDef* f) {
-  UPB_ASSERT(!upb_FieldDef_IsExtension(f));
-  return &f->msgdef->layout->fields[f->layout_index];
-}
-
-const upb_MiniTable_Extension* _upb_FieldDef_ExtensionMiniTable(
-    const upb_FieldDef* f) {
-  UPB_ASSERT(upb_FieldDef_IsExtension(f));
-  return f->file->ext_layouts[f->layout_index];
-}
-
-bool _upb_FieldDef_IsProto3Optional(const upb_FieldDef* f) {
-  return f->proto3_optional_;
-}
-
-bool upb_FieldDef_IsSubMessage(const upb_FieldDef* f) {
-  return upb_FieldDef_CType(f) == kUpb_CType_Message;
-}
-
-bool upb_FieldDef_IsString(const upb_FieldDef* f) {
-  return upb_FieldDef_CType(f) == kUpb_CType_String ||
-         upb_FieldDef_CType(f) == kUpb_CType_Bytes;
-}
-
-bool upb_FieldDef_IsRepeated(const upb_FieldDef* f) {
-  return upb_FieldDef_Label(f) == kUpb_Label_Repeated;
-}
-
-bool upb_FieldDef_IsPrimitive(const upb_FieldDef* f) {
-  return !upb_FieldDef_IsString(f) && !upb_FieldDef_IsSubMessage(f);
-}
-
-bool upb_FieldDef_IsMap(const upb_FieldDef* f) {
-  return upb_FieldDef_IsRepeated(f) && upb_FieldDef_IsSubMessage(f) &&
-         upb_MessageDef_IsMapEntry(upb_FieldDef_MessageSubDef(f));
-}
-
-bool upb_FieldDef_HasDefault(const upb_FieldDef* f) { return f->has_default; }
-
-bool upb_FieldDef_HasSubDef(const upb_FieldDef* f) {
-  return upb_FieldDef_IsSubMessage(f) ||
-         upb_FieldDef_CType(f) == kUpb_CType_Enum;
-}
-
-bool upb_FieldDef_HasPresence(const upb_FieldDef* f) {
-  if (upb_FieldDef_IsRepeated(f)) return false;
-  return upb_FieldDef_IsSubMessage(f) || upb_FieldDef_ContainingOneof(f) ||
-         f->file->syntax == kUpb_Syntax_Proto2;
-}
-
-static bool between(int32_t x, int32_t low, int32_t high) {
-  return x >= low && x <= high;
-}
-
-bool upb_FieldDef_checklabel(int32_t label) { return between(label, 1, 3); }
-bool upb_FieldDef_checktype(int32_t type) { return between(type, 1, 11); }
-bool upb_FieldDef_checkintfmt(int32_t fmt) { return between(fmt, 1, 3); }
-
-bool upb_FieldDef_checkdescriptortype(int32_t type) {
-  return between(type, 1, 18);
-}
-
-/* upb_MessageDef
- * *****************************************************************/
-
-const google_protobuf_MessageOptions* upb_MessageDef_Options(
-    const upb_MessageDef* m) {
-  return m->opts;
-}
-
-bool upb_MessageDef_HasOptions(const upb_MessageDef* m) {
-  return m->opts != (void*)opt_default;
-}
-
-const char* upb_MessageDef_FullName(const upb_MessageDef* m) {
-  return m->full_name;
-}
-
-const upb_FileDef* upb_MessageDef_File(const upb_MessageDef* m) {
-  return m->file;
-}
-
-const upb_MessageDef* upb_MessageDef_ContainingType(const upb_MessageDef* m) {
-  return m->containing_type;
-}
-
-const char* upb_MessageDef_Name(const upb_MessageDef* m) {
-  return shortdefname(m->full_name);
-}
-
-upb_Syntax upb_MessageDef_Syntax(const upb_MessageDef* m) {
-  return m->file->syntax;
-}
-
-const upb_FieldDef* upb_MessageDef_FindFieldByNumber(const upb_MessageDef* m,
-                                                     uint32_t i) {
-  upb_value val;
-  return upb_inttable_lookup(&m->itof, i, &val) ? upb_value_getconstptr(val)
-                                                : NULL;
-}
-
-const upb_FieldDef* upb_MessageDef_FindFieldByNameWithSize(
-    const upb_MessageDef* m, const char* name, size_t len) {
-  upb_value val;
-
-  if (!upb_strtable_lookup2(&m->ntof, name, len, &val)) {
-    return NULL;
-  }
-
-  return unpack_def(val, UPB_DEFTYPE_FIELD);
-}
-
-const upb_OneofDef* upb_MessageDef_FindOneofByNameWithSize(
-    const upb_MessageDef* m, const char* name, size_t len) {
-  upb_value val;
-
-  if (!upb_strtable_lookup2(&m->ntof, name, len, &val)) {
-    return NULL;
-  }
-
-  return unpack_def(val, UPB_DEFTYPE_ONEOF);
-}
-
-bool upb_MessageDef_FindByNameWithSize(const upb_MessageDef* m,
-                                       const char* name, size_t len,
-                                       const upb_FieldDef** out_f,
-                                       const upb_OneofDef** out_o) {
-  upb_value val;
-
-  if (!upb_strtable_lookup2(&m->ntof, name, len, &val)) {
-    return false;
-  }
-
-  const upb_FieldDef* f = unpack_def(val, UPB_DEFTYPE_FIELD);
-  const upb_OneofDef* o = unpack_def(val, UPB_DEFTYPE_ONEOF);
-  if (out_f) *out_f = f;
-  if (out_o) *out_o = o;
-  return f || o; /* False if this was a JSON name. */
-}
-
-const upb_FieldDef* upb_MessageDef_FindByJsonNameWithSize(
-    const upb_MessageDef* m, const char* name, size_t len) {
-  upb_value val;
-  const upb_FieldDef* f;
-
-  if (!upb_strtable_lookup2(&m->ntof, name, len, &val)) {
-    return NULL;
-  }
-
-  f = unpack_def(val, UPB_DEFTYPE_FIELD);
-  if (!f) f = unpack_def(val, UPB_DEFTYPE_FIELD_JSONNAME);
-
-  return f;
-}
-
-int upb_MessageDef_numfields(const upb_MessageDef* m) { return m->field_count; }
-
-int upb_MessageDef_numoneofs(const upb_MessageDef* m) { return m->oneof_count; }
-
-int upb_MessageDef_numrealoneofs(const upb_MessageDef* m) {
-  return m->real_oneof_count;
-}
-
-int upb_MessageDef_ExtensionRangeCount(const upb_MessageDef* m) {
-  return m->ext_range_count;
-}
-
-int upb_MessageDef_ReservedRangeCount(const upb_MessageDef* m) {
-  return m->res_range_count;
-}
-
-int upb_MessageDef_ReservedNameCount(const upb_MessageDef* m) {
-  return m->res_name_count;
-}
-
-int upb_MessageDef_FieldCount(const upb_MessageDef* m) {
-  return m->field_count;
-}
-
-int upb_MessageDef_OneofCount(const upb_MessageDef* m) {
-  return m->oneof_count;
-}
-
-int upb_MessageDef_NestedMessageCount(const upb_MessageDef* m) {
-  return m->nested_msg_count;
-}
-
-int upb_MessageDef_NestedEnumCount(const upb_MessageDef* m) {
-  return m->nested_enum_count;
-}
-
-int upb_MessageDef_NestedExtensionCount(const upb_MessageDef* m) {
-  return m->nested_ext_count;
-}
-
-int upb_MessageDef_realoneofcount(const upb_MessageDef* m) {
-  return m->real_oneof_count;
-}
-
-const upb_MiniTable* upb_MessageDef_MiniTable(const upb_MessageDef* m) {
-  return m->layout;
-}
-
-const upb_ExtensionRange* upb_MessageDef_ExtensionRange(const upb_MessageDef* m,
-                                                        int i) {
-  UPB_ASSERT(0 <= i && i < m->ext_range_count);
-  return &m->ext_ranges[i];
-}
-
-upb_MessageReservedRange* _upb_MessageReservedRange_At(
-    const upb_MessageReservedRange* r, int i) {
-  return (upb_MessageReservedRange*)&r[i];
-}
-
-const upb_MessageReservedRange* upb_MessageDef_ReservedRange(
-    const upb_MessageDef* m, int i) {
-  UPB_ASSERT(0 <= i && i < m->res_range_count);
-  return _upb_MessageReservedRange_At(m->res_ranges, i);
-}
-
-upb_StringView upb_MessageDef_ReservedName(const upb_MessageDef* m, int i) {
-  UPB_ASSERT(0 <= i && i < m->res_name_count);
-  return m->res_names[i];
-}
-
-int32_t upb_MessageReservedRange_Start(const upb_MessageReservedRange* r) {
-  return r->start;
-}
-int32_t upb_MessageReservedRange_End(const upb_MessageReservedRange* r) {
-  return r->end;
-}
-
-upb_MessageReservedRange* _upb_MessageReservedRanges_New(
-    symtab_addctx* ctx, int n,
-    const google_protobuf_DescriptorProto_ReservedRange* const* protos,
-    const upb_MessageDef* m) {
-  upb_MessageReservedRange* r =
-      upb_Arena_Malloc(ctx->arena, sizeof(upb_MessageReservedRange) * n);
-
-  for (int i = 0; i < n; i++) {
-    const int32_t start = google_protobuf_DescriptorProto_ReservedRange_start(protos[i]);
-    const int32_t end = google_protobuf_DescriptorProto_ReservedRange_end(protos[i]);
-    const int32_t max = kUpb_MaxFieldNumber + 1;
-
-    // A full validation would also check that each range is disjoint, and that
-    // none of the fields overlap with the extension ranges, but we are just
-    // sanity checking here.
-    if (start < 1 || end <= start || end > max) {
-      symtab_errf(ctx,
-                           "Reserved range (%d, %d) is invalid, message=%s\n",
-                           (int)start, (int)end, upb_MessageDef_FullName(m));
-    }
-
-    r[i].start = start;
-    r[i].end = end;
-  }
-
-  return r;
-}
-
-const upb_FieldDef* upb_MessageDef_Field(const upb_MessageDef* m, int i) {
-  UPB_ASSERT(0 <= i && i < m->field_count);
-  return &m->fields[i];
-}
-
-const upb_OneofDef* upb_MessageDef_Oneof(const upb_MessageDef* m, int i) {
-  UPB_ASSERT(0 <= i && i < m->oneof_count);
-  return &m->oneofs[i];
-}
-
-const upb_MessageDef* upb_MessageDef_NestedMessage(const upb_MessageDef* m,
-                                                   int i) {
-  UPB_ASSERT(0 <= i && i < m->nested_msg_count);
-  return &m->nested_msgs[i];
-}
-
-const upb_EnumDef* upb_MessageDef_NestedEnum(const upb_MessageDef* m, int i) {
-  UPB_ASSERT(0 <= i && i < m->nested_enum_count);
-  return &m->nested_enums[i];
-}
-
-const upb_FieldDef* upb_MessageDef_NestedExtension(const upb_MessageDef* m,
-                                                   int i) {
-  UPB_ASSERT(0 <= i && i < m->nested_ext_count);
-  return &m->nested_exts[i];
-}
-
-upb_WellKnown upb_MessageDef_WellKnownType(const upb_MessageDef* m) {
-  return m->well_known_type;
-}
-
-/* upb_OneofDef ***************************************************************/
-
-const google_protobuf_OneofOptions* upb_OneofDef_Options(
-    const upb_OneofDef* o) {
-  return o->opts;
-}
-
-bool upb_OneofDef_HasOptions(const upb_OneofDef* o) {
-  return o->opts != (void*)opt_default;
-}
-
-const char* upb_OneofDef_Name(const upb_OneofDef* o) {
-  return shortdefname(o->full_name);
-}
-
-const upb_MessageDef* upb_OneofDef_ContainingType(const upb_OneofDef* o) {
-  return o->parent;
-}
-
-int upb_OneofDef_FieldCount(const upb_OneofDef* o) { return o->field_count; }
-
-const upb_FieldDef* upb_OneofDef_Field(const upb_OneofDef* o, int i) {
-  UPB_ASSERT(i < o->field_count);
-  return o->fields[i];
-}
-
-int upb_OneofDef_numfields(const upb_OneofDef* o) { return o->field_count; }
-
-uint32_t upb_OneofDef_Index(const upb_OneofDef* o) {
-  // Compute index in our parent's array.
-  return o - o->parent->oneofs;
-}
-
-bool upb_OneofDef_IsSynthetic(const upb_OneofDef* o) { return o->synthetic; }
-
-const upb_FieldDef* upb_OneofDef_LookupNameWithSize(const upb_OneofDef* o,
-                                                    const char* name,
-                                                    size_t length) {
-  upb_value val;
-  return upb_strtable_lookup2(&o->ntof, name, length, &val)
-             ? upb_value_getptr(val)
-             : NULL;
-}
-
-const upb_FieldDef* upb_OneofDef_LookupNumber(const upb_OneofDef* o,
-                                              uint32_t num) {
-  upb_value val;
-  return upb_inttable_lookup(&o->itof, num, &val) ? upb_value_getptr(val)
-                                                  : NULL;
-}
-
-/* upb_FileDef ****************************************************************/
-
-const google_protobuf_FileOptions* upb_FileDef_Options(const upb_FileDef* f) {
-  return f->opts;
-}
-
-bool upb_FileDef_HasOptions(const upb_FileDef* f) {
-  return f->opts != (void*)opt_default;
-}
-
-const char* upb_FileDef_Name(const upb_FileDef* f) { return f->name; }
-
-const char* upb_FileDef_Package(const upb_FileDef* f) {
-  return f->package ? f->package : "";
-}
-
-upb_Syntax upb_FileDef_Syntax(const upb_FileDef* f) { return f->syntax; }
-
-int upb_FileDef_TopLevelMessageCount(const upb_FileDef* f) {
-  return f->top_lvl_msg_count;
-}
-
-int upb_FileDef_DependencyCount(const upb_FileDef* f) { return f->dep_count; }
-
-int upb_FileDef_PublicDependencyCount(const upb_FileDef* f) {
-  return f->public_dep_count;
-}
-
-int upb_FileDef_WeakDependencyCount(const upb_FileDef* f) {
-  return f->weak_dep_count;
-}
-
-const int32_t* _upb_FileDef_PublicDependencyIndexes(const upb_FileDef* f) {
-  return f->public_deps;
-}
-
-const int32_t* _upb_FileDef_WeakDependencyIndexes(const upb_FileDef* f) {
-  return f->weak_deps;
-}
-
-int upb_FileDef_TopLevelEnumCount(const upb_FileDef* f) {
-  return f->top_lvl_enum_count;
-}
-
-int upb_FileDef_TopLevelExtensionCount(const upb_FileDef* f) {
-  return f->top_lvl_ext_count;
-}
-
-int upb_FileDef_ServiceCount(const upb_FileDef* f) { return f->service_count; }
-
-const upb_FileDef* upb_FileDef_Dependency(const upb_FileDef* f, int i) {
-  UPB_ASSERT(0 <= i && i < f->dep_count);
-  return f->deps[i];
-}
-
-const upb_FileDef* upb_FileDef_PublicDependency(const upb_FileDef* f, int i) {
-  UPB_ASSERT(0 <= i && i < f->public_dep_count);
-  return f->deps[f->public_deps[i]];
-}
-
-const upb_FileDef* upb_FileDef_WeakDependency(const upb_FileDef* f, int i) {
-  UPB_ASSERT(0 <= i && i < f->public_dep_count);
-  return f->deps[f->weak_deps[i]];
-}
-
-const upb_MessageDef* upb_FileDef_TopLevelMessage(const upb_FileDef* f, int i) {
-  UPB_ASSERT(0 <= i && i < f->top_lvl_msg_count);
-  return &f->top_lvl_msgs[i];
-}
-
-const upb_EnumDef* upb_FileDef_TopLevelEnum(const upb_FileDef* f, int i) {
-  UPB_ASSERT(0 <= i && i < f->top_lvl_enum_count);
-  return &f->top_lvl_enums[i];
-}
-
-const upb_FieldDef* upb_FileDef_TopLevelExtension(const upb_FileDef* f, int i) {
-  UPB_ASSERT(0 <= i && i < f->top_lvl_ext_count);
-  return &f->top_lvl_exts[i];
-}
-
-const upb_ServiceDef* upb_FileDef_Service(const upb_FileDef* f, int i) {
-  UPB_ASSERT(0 <= i && i < f->service_count);
-  return &f->services[i];
-}
-
-const upb_DefPool* upb_FileDef_Pool(const upb_FileDef* f) { return f->symtab; }
-
-/* upb_MethodDef **************************************************************/
-
-const google_protobuf_MethodOptions* upb_MethodDef_Options(
-    const upb_MethodDef* m) {
-  return m->opts;
-}
-
-bool upb_MethodDef_HasOptions(const upb_MethodDef* m) {
-  return m->opts != (void*)opt_default;
-}
-
-const char* upb_MethodDef_FullName(const upb_MethodDef* m) {
-  return m->full_name;
-}
-
-int upb_MethodDef_Index(const upb_MethodDef* m) { return m->index; }
-
-const char* upb_MethodDef_Name(const upb_MethodDef* m) {
-  return shortdefname(m->full_name);
-}
-
-const upb_ServiceDef* upb_MethodDef_Service(const upb_MethodDef* m) {
-  return m->service;
-}
-
-const upb_MessageDef* upb_MethodDef_InputType(const upb_MethodDef* m) {
-  return m->input_type;
-}
-
-const upb_MessageDef* upb_MethodDef_OutputType(const upb_MethodDef* m) {
-  return m->output_type;
-}
-
-bool upb_MethodDef_ClientStreaming(const upb_MethodDef* m) {
-  return m->client_streaming;
-}
-
-bool upb_MethodDef_ServerStreaming(const upb_MethodDef* m) {
-  return m->server_streaming;
-}
-
-/* upb_ServiceDef *************************************************************/
-
-const google_protobuf_ServiceOptions* upb_ServiceDef_Options(
-    const upb_ServiceDef* s) {
-  return s->opts;
-}
-
-bool upb_ServiceDef_HasOptions(const upb_ServiceDef* s) {
-  return s->opts != (void*)opt_default;
-}
-
-const char* upb_ServiceDef_FullName(const upb_ServiceDef* s) {
-  return s->full_name;
-}
-
-const char* upb_ServiceDef_Name(const upb_ServiceDef* s) {
-  return shortdefname(s->full_name);
-}
-
-int upb_ServiceDef_Index(const upb_ServiceDef* s) { return s->index; }
-
-const upb_FileDef* upb_ServiceDef_File(const upb_ServiceDef* s) {
-  return s->file;
-}
-
-int upb_ServiceDef_MethodCount(const upb_ServiceDef* s) {
-  return s->method_count;
-}
-
-const upb_MethodDef* upb_ServiceDef_Method(const upb_ServiceDef* s, int i) {
-  return i < 0 || i >= s->method_count ? NULL : &s->methods[i];
-}
-
-const upb_MethodDef* upb_ServiceDef_FindMethodByName(const upb_ServiceDef* s,
-                                                     const char* name) {
-  for (int i = 0; i < s->method_count; i++) {
-    if (strcmp(name, upb_MethodDef_Name(&s->methods[i])) == 0) {
-      return &s->methods[i];
-    }
-  }
-  return NULL;
-}
-
-/* upb_DefPool ****************************************************************/
-
-void upb_DefPool_Free(upb_DefPool* s) {
-  upb_Arena_Free(s->arena);
-  upb_gfree(s);
-}
-
-upb_DefPool* upb_DefPool_New(void) {
-  upb_DefPool* s = upb_gmalloc(sizeof(*s));
-
-  if (!s) {
-    return NULL;
-  }
-
-  s->arena = upb_Arena_New();
-  s->bytes_loaded = 0;
-
-  if (!upb_strtable_init(&s->syms, 32, s->arena) ||
-      !upb_strtable_init(&s->files, 4, s->arena) ||
-      !upb_inttable_init(&s->exts, s->arena)) {
-    goto err;
-  }
-
-  s->extreg = upb_ExtensionRegistry_New(s->arena);
-  if (!s->extreg) goto err;
-  return s;
-
-err:
-  upb_Arena_Free(s->arena);
-  upb_gfree(s);
-  return NULL;
-}
-
-static const void* symtab_lookup(const upb_DefPool* s, const char* sym,
-                                 upb_deftype_t type) {
-  upb_value v;
-  return upb_strtable_lookup(&s->syms, sym, &v) ? unpack_def(v, type) : NULL;
-}
-
-static const void* symtab_lookup2(const upb_DefPool* s, const char* sym,
-                                  size_t size, upb_deftype_t type) {
-  upb_value v;
-  return upb_strtable_lookup2(&s->syms, sym, size, &v) ? unpack_def(v, type)
-                                                       : NULL;
-}
-
-const upb_MessageDef* upb_DefPool_FindMessageByName(const upb_DefPool* s,
-                                                    const char* sym) {
-  return symtab_lookup(s, sym, UPB_DEFTYPE_MSG);
-}
-
-const upb_MessageDef* upb_DefPool_FindMessageByNameWithSize(
-    const upb_DefPool* s, const char* sym, size_t len) {
-  return symtab_lookup2(s, sym, len, UPB_DEFTYPE_MSG);
-}
-
-const upb_EnumDef* upb_DefPool_FindEnumByName(const upb_DefPool* s,
-                                              const char* sym) {
-  return symtab_lookup(s, sym, UPB_DEFTYPE_ENUM);
-}
-
-const upb_EnumValueDef* upb_DefPool_FindEnumByNameval(const upb_DefPool* s,
-                                                      const char* sym) {
-  return symtab_lookup(s, sym, UPB_DEFTYPE_ENUMVAL);
-}
-
-const upb_FileDef* upb_DefPool_FindFileByName(const upb_DefPool* s,
-                                              const char* name) {
-  upb_value v;
-  return upb_strtable_lookup(&s->files, name, &v)
-             ? unpack_def(v, UPB_DEFTYPE_FILE)
-             : NULL;
-}
-
-const upb_FileDef* upb_DefPool_FindFileByNameWithSize(const upb_DefPool* s,
-                                                      const char* name,
-                                                      size_t len) {
-  upb_value v;
-  return upb_strtable_lookup2(&s->files, name, len, &v)
-             ? unpack_def(v, UPB_DEFTYPE_FILE)
-             : NULL;
-}
-
-const upb_FieldDef* upb_DefPool_FindExtensionByNameWithSize(
-    const upb_DefPool* s, const char* name, size_t size) {
-  upb_value v;
-  if (!upb_strtable_lookup2(&s->syms, name, size, &v)) return NULL;
-
-  switch (deftype(v)) {
-    case UPB_DEFTYPE_FIELD:
-      return unpack_def(v, UPB_DEFTYPE_FIELD);
-    case UPB_DEFTYPE_MSG: {
-      const upb_MessageDef* m = unpack_def(v, UPB_DEFTYPE_MSG);
-      return m->in_message_set ? &m->nested_exts[0] : NULL;
-    }
-    default:
-      break;
-  }
-
-  return NULL;
-}
-
-const upb_FieldDef* upb_DefPool_FindExtensionByName(const upb_DefPool* s,
-                                                    const char* sym) {
-  return upb_DefPool_FindExtensionByNameWithSize(s, sym, strlen(sym));
-}
-
-const upb_ServiceDef* upb_DefPool_FindServiceByName(const upb_DefPool* s,
-                                                    const char* name) {
-  return symtab_lookup(s, name, UPB_DEFTYPE_SERVICE);
-}
-
-const upb_ServiceDef* upb_DefPool_FindServiceByNameWithSize(
-    const upb_DefPool* s, const char* name, size_t size) {
-  return symtab_lookup2(s, name, size, UPB_DEFTYPE_SERVICE);
-}
-
-const upb_FileDef* upb_DefPool_FindFileContainingSymbol(const upb_DefPool* s,
-                                                        const char* name) {
-  upb_value v;
-  // TODO(haberman): non-extension fields and oneofs.
-  if (upb_strtable_lookup(&s->syms, name, &v)) {
-    switch (deftype(v)) {
-      case UPB_DEFTYPE_EXT: {
-        const upb_FieldDef* f = unpack_def(v, UPB_DEFTYPE_EXT);
-        return upb_FieldDef_File(f);
-      }
-      case UPB_DEFTYPE_MSG: {
-        const upb_MessageDef* m = unpack_def(v, UPB_DEFTYPE_MSG);
-        return upb_MessageDef_File(m);
-      }
-      case UPB_DEFTYPE_ENUM: {
-        const upb_EnumDef* e = unpack_def(v, UPB_DEFTYPE_ENUM);
-        return upb_EnumDef_File(e);
-      }
-      case UPB_DEFTYPE_ENUMVAL: {
-        const upb_EnumValueDef* ev = unpack_def(v, UPB_DEFTYPE_ENUMVAL);
-        return upb_EnumDef_File(upb_EnumValueDef_Enum(ev));
-      }
-      case UPB_DEFTYPE_SERVICE: {
-        const upb_ServiceDef* service = unpack_def(v, UPB_DEFTYPE_SERVICE);
-        return upb_ServiceDef_File(service);
-      }
-      default:
-        UPB_UNREACHABLE();
-    }
-  }
-
-  const char* last_dot = strrchr(name, '.');
-  if (last_dot) {
-    const upb_MessageDef* parent =
-        upb_DefPool_FindMessageByNameWithSize(s, name, last_dot - name);
-    if (parent) {
-      const char* shortname = last_dot + 1;
-      if (upb_MessageDef_FindByNameWithSize(parent, shortname,
-                                            strlen(shortname), NULL, NULL)) {
-        return upb_MessageDef_File(parent);
-      }
-    }
-  }
-
-  return NULL;
-}
-
-/* Code to build defs from descriptor protos. *********************************/
-
-/* There is a question of how much validation to do here.  It will be difficult
- * to perfectly match the amount of validation performed by proto2.  But since
- * this code is used to directly build defs from Ruby (for example) we do need
- * to validate important constraints like uniqueness of names and numbers. */
-
-#define CHK_OOM(x)      \
-  if (!(x)) {           \
-    symtab_oomerr(ctx); \
-  }
-
-UPB_NORETURN UPB_NOINLINE static void symtab_oomerr(symtab_addctx* ctx) {
-  upb_Status_setoom(ctx->status);
-  UPB_LONGJMP(ctx->err, 1);
-}
-
-void* symtab_alloc(symtab_addctx* ctx, size_t bytes) {
-  if (bytes == 0) return NULL;
-  void* ret = upb_Arena_Malloc(ctx->arena, bytes);
-  if (!ret) symtab_oomerr(ctx);
-  return ret;
-}
-
-// We want to copy the options verbatim into the destination options proto.
-// We use serialize+parse as our deep copy.
-#define SET_OPTIONS(target, desc_type, options_type, proto)                   \
-  if (google_protobuf_##desc_type##_has_options(proto)) {                     \
-    size_t size;                                                              \
-    char* pb = google_protobuf_##options_type##_serialize(                    \
-        google_protobuf_##desc_type##_options(proto), ctx->tmp_arena, &size); \
-    CHK_OOM(pb);                                                              \
-    target = google_protobuf_##options_type##_parse(pb, size, ctx->arena);    \
-    CHK_OOM(target);                                                          \
-  } else {                                                                    \
-    target = (const google_protobuf_##options_type*)opt_default;              \
-  }
-
-static void check_ident(symtab_addctx* ctx, upb_StringView name, bool full) {
-  const char* str = name.data;
-  size_t len = name.size;
-  bool start = true;
-  size_t i;
-  for (i = 0; i < len; i++) {
-    char c = str[i];
-    if (c == '.') {
-      if (start || !full) {
-        symtab_errf(ctx, "invalid name: unexpected '.' (%.*s)", (int)len, str);
-      }
-      start = true;
-    } else if (start) {
-      if (!upb_isletter(c)) {
-        symtab_errf(
-            ctx,
-            "invalid name: path components must start with a letter (%.*s)",
-            (int)len, str);
-      }
-      start = false;
-    } else {
-      if (!upb_isalphanum(c)) {
-        symtab_errf(ctx, "invalid name: non-alphanumeric character (%.*s)",
-                    (int)len, str);
-      }
-    }
-  }
-  if (start) {
-    symtab_errf(ctx, "invalid name: empty part (%.*s)", (int)len, str);
-  }
-}
-
-static size_t div_round_up(size_t n, size_t d) { return (n + d - 1) / d; }
-
-static size_t upb_MessageValue_sizeof(upb_CType type) {
-  switch (type) {
-    case kUpb_CType_Double:
-    case kUpb_CType_Int64:
-    case kUpb_CType_UInt64:
-      return 8;
-    case kUpb_CType_Enum:
-    case kUpb_CType_Int32:
-    case kUpb_CType_UInt32:
-    case kUpb_CType_Float:
-      return 4;
-    case kUpb_CType_Bool:
-      return 1;
-    case kUpb_CType_Message:
-      return sizeof(void*);
-    case kUpb_CType_Bytes:
-    case kUpb_CType_String:
-      return sizeof(upb_StringView);
-  }
-  UPB_UNREACHABLE();
-}
-
-static uint8_t upb_msg_fielddefsize(const upb_FieldDef* f) {
-  if (upb_MessageDef_IsMapEntry(upb_FieldDef_ContainingType(f))) {
-    upb_MapEntry ent;
-    UPB_ASSERT(sizeof(ent.k) == sizeof(ent.v));
-    return sizeof(ent.k);
-  } else if (upb_FieldDef_IsRepeated(f)) {
-    return sizeof(void*);
-  } else {
-    return upb_MessageValue_sizeof(upb_FieldDef_CType(f));
-  }
-}
-
-static uint32_t upb_MiniTable_place(symtab_addctx* ctx, upb_MiniTable* l,
-                                    size_t size, const upb_MessageDef* m) {
-  size_t ofs = UPB_ALIGN_UP(l->size, size);
-  size_t next = ofs + size;
-
-  if (next > UINT16_MAX) {
-    symtab_errf(ctx, "size of message %s exceeded max size of %zu bytes",
-                upb_MessageDef_FullName(m), (size_t)UINT16_MAX);
-  }
-
-  l->size = next;
-  return ofs;
-}
-
-static int field_number_cmp(const void* p1, const void* p2) {
-  const upb_MiniTable_Field* f1 = p1;
-  const upb_MiniTable_Field* f2 = p2;
-  return f1->number - f2->number;
-}
-
-static void assign_layout_indices(const upb_MessageDef* m, upb_MiniTable* l,
-                                  upb_MiniTable_Field* fields) {
-  int i;
-  int n = upb_MessageDef_numfields(m);
-  int dense_below = 0;
-  for (i = 0; i < n; i++) {
-    upb_FieldDef* f =
-        (upb_FieldDef*)upb_MessageDef_FindFieldByNumber(m, fields[i].number);
-    UPB_ASSERT(f);
-    f->layout_index = i;
-    if (i < UINT8_MAX && fields[i].number == i + 1 &&
-        (i == 0 || fields[i - 1].number == i)) {
-      dense_below = i + 1;
-    }
-  }
-  l->dense_below = dense_below;
-}
-
-static uint8_t map_descriptortype(const upb_FieldDef* f) {
-  uint8_t type = upb_FieldDef_Type(f);
-  /* See TableDescriptorType() in upbc/generator.cc for details and
-   * rationale of these exceptions. */
-  if (type == kUpb_FieldType_String && f->file->syntax == kUpb_Syntax_Proto2) {
-    return kUpb_FieldType_Bytes;
-  } else if (type == kUpb_FieldType_Enum &&
-             (f->sub.enumdef->file->syntax == kUpb_Syntax_Proto3 ||
-              UPB_TREAT_PROTO2_ENUMS_LIKE_PROTO3 ||
-              // TODO(https://github.com/protocolbuffers/upb/issues/541):
-              // fix map enum values to check for unknown enum values and put
-              // them in the unknown field set.
-              upb_MessageDef_IsMapEntry(upb_FieldDef_ContainingType(f)))) {
-    return kUpb_FieldType_Int32;
-  }
-  return type;
-}
-
-static void fill_fieldlayout(upb_MiniTable_Field* field,
-                             const upb_FieldDef* f) {
-  field->number = upb_FieldDef_Number(f);
-  field->descriptortype = map_descriptortype(f);
-
-  if (upb_FieldDef_IsMap(f)) {
-    field->mode =
-        kUpb_FieldMode_Map | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift);
-  } else if (upb_FieldDef_IsRepeated(f)) {
-    field->mode =
-        kUpb_FieldMode_Array | (kUpb_FieldRep_Pointer << kUpb_FieldRep_Shift);
-  } else {
-    /* Maps descriptor type -> elem_size_lg2.  */
-    static const uint8_t sizes[] = {
-        -1,                       /* invalid descriptor type */
-        kUpb_FieldRep_8Byte,      /* DOUBLE */
-        kUpb_FieldRep_4Byte,      /* FLOAT */
-        kUpb_FieldRep_8Byte,      /* INT64 */
-        kUpb_FieldRep_8Byte,      /* UINT64 */
-        kUpb_FieldRep_4Byte,      /* INT32 */
-        kUpb_FieldRep_8Byte,      /* FIXED64 */
-        kUpb_FieldRep_4Byte,      /* FIXED32 */
-        kUpb_FieldRep_1Byte,      /* BOOL */
-        kUpb_FieldRep_StringView, /* STRING */
-        kUpb_FieldRep_Pointer,    /* GROUP */
-        kUpb_FieldRep_Pointer,    /* MESSAGE */
-        kUpb_FieldRep_StringView, /* BYTES */
-        kUpb_FieldRep_4Byte,      /* UINT32 */
-        kUpb_FieldRep_4Byte,      /* ENUM */
-        kUpb_FieldRep_4Byte,      /* SFIXED32 */
-        kUpb_FieldRep_8Byte,      /* SFIXED64 */
-        kUpb_FieldRep_4Byte,      /* SINT32 */
-        kUpb_FieldRep_8Byte,      /* SINT64 */
-    };
-    field->mode = kUpb_FieldMode_Scalar |
-                  (sizes[field->descriptortype] << kUpb_FieldRep_Shift);
-  }
-
-  if (upb_FieldDef_IsPacked(f)) {
-    field->mode |= kUpb_LabelFlags_IsPacked;
-  }
-
-  if (upb_FieldDef_IsExtension(f)) {
-    field->mode |= kUpb_LabelFlags_IsExtension;
-  }
-}
-
-/* This function is the dynamic equivalent of message_layout.{cc,h} in upbc.
- * It computes a dynamic layout for all of the fields in |m|. */
-static void make_layout(symtab_addctx* ctx, const upb_MessageDef* m) {
-  upb_MiniTable* l = (upb_MiniTable*)m->layout;
-  size_t field_count = upb_MessageDef_numfields(m);
-  size_t sublayout_count = 0;
-  upb_MiniTable_Sub* subs;
-  upb_MiniTable_Field* fields;
-
-  memset(l, 0, sizeof(*l) + sizeof(_upb_FastTable_Entry));
-
-  /* Count sub-messages. */
-  for (size_t i = 0; i < field_count; i++) {
-    const upb_FieldDef* f = &m->fields[i];
-    if (upb_FieldDef_IsSubMessage(f)) {
-      sublayout_count++;
-    }
-    if (upb_FieldDef_CType(f) == kUpb_CType_Enum &&
-        f->sub.enumdef->file->syntax == kUpb_Syntax_Proto2) {
-      sublayout_count++;
-    }
-  }
-
-  fields = symtab_alloc(ctx, field_count * sizeof(*fields));
-  subs = symtab_alloc(ctx, sublayout_count * sizeof(*subs));
-
-  l->field_count = upb_MessageDef_numfields(m);
-  l->fields = fields;
-  l->subs = subs;
-  l->table_mask = 0;
-  l->required_count = 0;
-
-  if (upb_MessageDef_ExtensionRangeCount(m) > 0) {
-    if (google_protobuf_MessageOptions_message_set_wire_format(m->opts)) {
-      l->ext = kUpb_ExtMode_IsMessageSet;
-    } else {
-      l->ext = kUpb_ExtMode_Extendable;
-    }
-  } else {
-    l->ext = kUpb_ExtMode_NonExtendable;
-  }
-
-  /* TODO(haberman): initialize fast tables so that reflection-based parsing
-   * can get the same speeds as linked-in types. */
-  l->fasttable[0].field_parser = &fastdecode_generic;
-  l->fasttable[0].field_data = 0;
-
-  if (upb_MessageDef_IsMapEntry(m)) {
-    /* TODO(haberman): refactor this method so this special case is more
-     * elegant. */
-    const upb_FieldDef* key = upb_MessageDef_FindFieldByNumber(m, 1);
-    const upb_FieldDef* val = upb_MessageDef_FindFieldByNumber(m, 2);
-    if (key == NULL || val == NULL) {
-      symtab_errf(ctx, "Malformed map entry from message: %s",
-                  upb_MessageDef_FullName(m));
-    }
-    fields[0].number = 1;
-    fields[1].number = 2;
-    fields[0].mode = kUpb_FieldMode_Scalar;
-    fields[1].mode = kUpb_FieldMode_Scalar;
-    fields[0].presence = 0;
-    fields[1].presence = 0;
-    fields[0].descriptortype = map_descriptortype(key);
-    fields[1].descriptortype = map_descriptortype(val);
-    fields[0].offset = 0;
-    fields[1].offset = sizeof(upb_StringView);
-    fields[1].submsg_index = 0;
-
-    if (upb_FieldDef_CType(val) == kUpb_CType_Message) {
-      subs[0].submsg = upb_FieldDef_MessageSubDef(val)->layout;
-    }
-
-    upb_FieldDef* fielddefs = (upb_FieldDef*)&m->fields[0];
-    UPB_ASSERT(fielddefs[0].number_ == 1);
-    UPB_ASSERT(fielddefs[1].number_ == 2);
-    fielddefs[0].layout_index = 0;
-    fielddefs[1].layout_index = 1;
-
-    l->field_count = 2;
-    l->size = 2 * sizeof(upb_StringView);
-    l->size = UPB_ALIGN_UP(l->size, 8);
-    l->dense_below = 2;
-    return;
-  }
-
-  /* Allocate data offsets in three stages:
-   *
-   * 1. hasbits.
-   * 2. regular fields.
-   * 3. oneof fields.
-   *
-   * OPT: There is a lot of room for optimization here to minimize the size.
-   */
-
-  /* Assign hasbits for required fields first. */
-  size_t hasbit = 0;
-
-  for (int i = 0; i < m->field_count; i++) {
-    const upb_FieldDef* f = &m->fields[i];
-    upb_MiniTable_Field* field = &fields[upb_FieldDef_Index(f)];
-    if (upb_FieldDef_Label(f) == kUpb_Label_Required) {
-      field->presence = ++hasbit;
-      if (hasbit >= 63) {
-        symtab_errf(ctx, "Message with >=63 required fields: %s",
-                    upb_MessageDef_FullName(m));
-      }
-      l->required_count++;
-    }
-  }
-
-  /* Allocate hasbits and set basic field attributes. */
-  sublayout_count = 0;
-  for (int i = 0; i < m->field_count; i++) {
-    const upb_FieldDef* f = &m->fields[i];
-    upb_MiniTable_Field* field = &fields[upb_FieldDef_Index(f)];
-
-    fill_fieldlayout(field, f);
-
-    if (field->descriptortype == kUpb_FieldType_Message ||
-        field->descriptortype == kUpb_FieldType_Group) {
-      field->submsg_index = sublayout_count++;
-      subs[field->submsg_index].submsg = upb_FieldDef_MessageSubDef(f)->layout;
-    } else if (field->descriptortype == kUpb_FieldType_Enum) {
-      field->submsg_index = sublayout_count++;
-      subs[field->submsg_index].subenum = upb_FieldDef_EnumSubDef(f)->layout;
-      UPB_ASSERT(subs[field->submsg_index].subenum);
-    }
-
-    if (upb_FieldDef_Label(f) == kUpb_Label_Required) {
-      /* Hasbit was already assigned. */
-    } else if (upb_FieldDef_HasPresence(f) &&
-               !upb_FieldDef_RealContainingOneof(f)) {
-      /* We don't use hasbit 0, so that 0 can indicate "no presence" in the
-       * table. This wastes one hasbit, but we don't worry about it for now. */
-      field->presence = ++hasbit;
-    } else {
-      field->presence = 0;
-    }
-  }
-
-  /* Account for space used by hasbits. */
-  l->size = hasbit ? div_round_up(hasbit + 1, 8) : 0;
-
-  /* Allocate non-oneof fields. */
-  for (int i = 0; i < m->field_count; i++) {
-    const upb_FieldDef* f = &m->fields[i];
-    size_t field_size = upb_msg_fielddefsize(f);
-    size_t index = upb_FieldDef_Index(f);
-
-    if (upb_FieldDef_RealContainingOneof(f)) {
-      /* Oneofs are handled separately below. */
-      continue;
-    }
-
-    fields[index].offset = upb_MiniTable_place(ctx, l, field_size, m);
-  }
-
-  /* Allocate oneof fields.  Each oneof field consists of a uint32 for the case
-   * and space for the actual data. */
-  for (int i = 0; i < m->oneof_count; i++) {
-    const upb_OneofDef* o = &m->oneofs[i];
-    size_t case_size = sizeof(uint32_t); /* Could potentially optimize this. */
-    size_t field_size = 0;
-    uint32_t case_offset;
-    uint32_t data_offset;
-
-    if (upb_OneofDef_IsSynthetic(o)) continue;
-
-    if (o->field_count == 0) {
-      symtab_errf(ctx, "Oneof must have at least one field (%s)", o->full_name);
-    }
-
-    /* Calculate field size: the max of all field sizes. */
-    for (int j = 0; j < o->field_count; j++) {
-      const upb_FieldDef* f = o->fields[j];
-      field_size = UPB_MAX(field_size, upb_msg_fielddefsize(f));
-    }
-
-    /* Align and allocate case offset. */
-    case_offset = upb_MiniTable_place(ctx, l, case_size, m);
-    data_offset = upb_MiniTable_place(ctx, l, field_size, m);
-
-    for (int i = 0; i < o->field_count; i++) {
-      const upb_FieldDef* f = o->fields[i];
-      fields[upb_FieldDef_Index(f)].offset = data_offset;
-      fields[upb_FieldDef_Index(f)].presence = ~case_offset;
-    }
-  }
-
-  /* Size of the entire structure should be a multiple of its greatest
-   * alignment.  TODO: track overall alignment for real? */
-  l->size = UPB_ALIGN_UP(l->size, 8);
-
-  /* Sort fields by number. */
-  if (fields) {
-    qsort(fields, upb_MessageDef_numfields(m), sizeof(*fields),
-          field_number_cmp);
-  }
-  assign_layout_indices(m, l, fields);
-}
-
-static char* strviewdup(symtab_addctx* ctx, upb_StringView view) {
-  char* ret = upb_strdup2(view.data, view.size, ctx->arena);
-  CHK_OOM(ret);
-  return ret;
-}
-
-static bool streql2(const char* a, size_t n, const char* b) {
-  return n == strlen(b) && memcmp(a, b, n) == 0;
-}
-
-static bool streql_view(upb_StringView view, const char* b) {
-  return streql2(view.data, view.size, b);
-}
-
-static const char* makefullname(symtab_addctx* ctx, const char* prefix,
-                                upb_StringView name) {
-  if (prefix) {
-    /* ret = prefix + '.' + name; */
-    size_t n = strlen(prefix);
-    char* ret = symtab_alloc(ctx, n + name.size + 2);
-    strcpy(ret, prefix);
-    ret[n] = '.';
-    memcpy(&ret[n + 1], name.data, name.size);
-    ret[n + 1 + name.size] = '\0';
-    return ret;
-  } else {
-    return strviewdup(ctx, name);
-  }
-}
-
-static void finalize_oneofs(symtab_addctx* ctx, upb_MessageDef* m) {
-  int i;
-  int synthetic_count = 0;
-  upb_OneofDef* mutable_oneofs = (upb_OneofDef*)m->oneofs;
-
-  for (i = 0; i < m->oneof_count; i++) {
-    upb_OneofDef* o = &mutable_oneofs[i];
-
-    if (o->synthetic && o->field_count != 1) {
-      symtab_errf(ctx, "Synthetic oneofs must have one field, not %d: %s",
-                  o->field_count, upb_OneofDef_Name(o));
-    }
-
-    if (o->synthetic) {
-      synthetic_count++;
-    } else if (synthetic_count != 0) {
-      symtab_errf(ctx, "Synthetic oneofs must be after all other oneofs: %s",
-                  upb_OneofDef_Name(o));
-    }
-
-    o->fields = symtab_alloc(ctx, sizeof(upb_FieldDef*) * o->field_count);
-    o->field_count = 0;
-  }
-
-  for (i = 0; i < m->field_count; i++) {
-    const upb_FieldDef* f = &m->fields[i];
-    upb_OneofDef* o = (upb_OneofDef*)upb_FieldDef_ContainingOneof(f);
-    if (o) {
-      o->fields[o->field_count++] = f;
-    }
-  }
-
-  m->real_oneof_count = m->oneof_count - synthetic_count;
-}
-
-size_t getjsonname(const char* name, char* buf, size_t len) {
-  size_t src, dst = 0;
-  bool ucase_next = false;
-
-#define WRITE(byte)      \
-  ++dst;                 \
-  if (dst < len)         \
-    buf[dst - 1] = byte; \
-  else if (dst == len)   \
-  buf[dst - 1] = '\0'
-
-  if (!name) {
-    WRITE('\0');
-    return 0;
-  }
-
-  /* Implement the transformation as described in the spec:
-   *   1. upper case all letters after an underscore.
-   *   2. remove all underscores.
-   */
-  for (src = 0; name[src]; src++) {
-    if (name[src] == '_') {
-      ucase_next = true;
-      continue;
-    }
-
-    if (ucase_next) {
-      WRITE(toupper(name[src]));
-      ucase_next = false;
-    } else {
-      WRITE(name[src]);
-    }
-  }
-
-  WRITE('\0');
-  return dst;
-
-#undef WRITE
-}
-
-static char* makejsonname(symtab_addctx* ctx, const char* name) {
-  size_t size = getjsonname(name, NULL, 0);
-  char* json_name = symtab_alloc(ctx, size);
-  getjsonname(name, json_name, size);
-  return json_name;
-}
-
-/* Adds a symbol |v| to the symtab, which must be a def pointer previously
- * packed with pack_def().  The def's pointer to upb_FileDef* must be set before
- * adding, so we know which entries to remove if building this file fails. */
-static void symtab_add(symtab_addctx* ctx, const char* name, upb_value v) {
-  // TODO: table should support an operation "tryinsert" to avoid the double
-  // lookup.
-  if (upb_strtable_lookup(&ctx->symtab->syms, name, NULL)) {
-    symtab_errf(ctx, "duplicate symbol '%s'", name);
-  }
-  size_t len = strlen(name);
-  CHK_OOM(upb_strtable_insert(&ctx->symtab->syms, name, len, v,
-                              ctx->symtab->arena));
-}
-
-static bool remove_component(char* base, size_t* len) {
-  if (*len == 0) return false;
-
-  for (size_t i = *len - 1; i > 0; i--) {
-    if (base[i] == '.') {
-      *len = i;
-      return true;
-    }
-  }
-
-  *len = 0;
-  return true;
-}
-
-/* Given a symbol and the base symbol inside which it is defined, find the
- * symbol's definition in t. */
-static const void* symtab_resolveany(symtab_addctx* ctx,
-                                     const char* from_name_dbg,
-                                     const char* base, upb_StringView sym,
-                                     upb_deftype_t* type) {
-  const upb_strtable* t = &ctx->symtab->syms;
-  if (sym.size == 0) goto notfound;
-  upb_value v;
-  if (sym.data[0] == '.') {
-    /* Symbols starting with '.' are absolute, so we do a single lookup.
-     * Slice to omit the leading '.' */
-    if (!upb_strtable_lookup2(t, sym.data + 1, sym.size - 1, &v)) {
-      goto notfound;
-    }
-  } else {
-    /* Remove components from base until we find an entry or run out. */
-    size_t baselen = base ? strlen(base) : 0;
-    char* tmp = malloc(sym.size + baselen + 1);
-    while (1) {
-      char* p = tmp;
-      if (baselen) {
-        memcpy(p, base, baselen);
-        p[baselen] = '.';
-        p += baselen + 1;
-      }
-      memcpy(p, sym.data, sym.size);
-      p += sym.size;
-      if (upb_strtable_lookup2(t, tmp, p - tmp, &v)) {
-        break;
-      }
-      if (!remove_component(tmp, &baselen)) {
-        free(tmp);
-        goto notfound;
-      }
-    }
-    free(tmp);
-  }
-
-  *type = deftype(v);
-  return unpack_def(v, *type);
-
-notfound:
-  symtab_errf(ctx, "couldn't resolve name '" UPB_STRINGVIEW_FORMAT "'",
-              UPB_STRINGVIEW_ARGS(sym));
-}
-
-static const void* symtab_resolve(symtab_addctx* ctx, const char* from_name_dbg,
-                                  const char* base, upb_StringView sym,
-                                  upb_deftype_t type) {
-  upb_deftype_t found_type;
-  const void* ret =
-      symtab_resolveany(ctx, from_name_dbg, base, sym, &found_type);
-  if (ret && found_type != type) {
-    symtab_errf(ctx,
-                "type mismatch when resolving %s: couldn't find "
-                "name " UPB_STRINGVIEW_FORMAT " with type=%d",
-                from_name_dbg, UPB_STRINGVIEW_ARGS(sym), (int)type);
-  }
-  return ret;
-}
-
-static void create_oneofdef(
-    symtab_addctx* ctx, upb_MessageDef* m,
-    const google_protobuf_OneofDescriptorProto* oneof_proto,
-    const upb_OneofDef* _o) {
-  upb_OneofDef* o = (upb_OneofDef*)_o;
-  upb_StringView name = google_protobuf_OneofDescriptorProto_name(oneof_proto);
-  upb_value v;
-
-  o->parent = m;
-  o->full_name = makefullname(ctx, m->full_name, name);
-  o->field_count = 0;
-  o->synthetic = false;
-
-  SET_OPTIONS(o->opts, OneofDescriptorProto, OneofOptions, oneof_proto);
-
-  upb_value existing_v;
-  if (upb_strtable_lookup2(&m->ntof, name.data, name.size, &existing_v)) {
-    symtab_errf(ctx, "duplicate oneof name (%s)", o->full_name);
-  }
-
-  v = pack_def(o, UPB_DEFTYPE_ONEOF);
-  CHK_OOM(upb_strtable_insert(&m->ntof, name.data, name.size, v, ctx->arena));
-
-  CHK_OOM(upb_inttable_init(&o->itof, ctx->arena));
-  CHK_OOM(upb_strtable_init(&o->ntof, 4, ctx->arena));
-}
-
-static str_t* newstr(symtab_addctx* ctx, const char* data, size_t len) {
-  str_t* ret = symtab_alloc(ctx, sizeof(*ret) + len);
-  CHK_OOM(ret);
-  ret->len = len;
-  if (len) memcpy(ret->str, data, len);
-  ret->str[len] = '\0';
-  return ret;
-}
-
-static bool upb_DefPool_TryGetChar(const char** src, const char* end,
-                                   char* ch) {
-  if (*src == end) return false;
-  *ch = **src;
-  *src += 1;
-  return true;
-}
-
-static char upb_DefPool_TryGetHexDigit(symtab_addctx* ctx,
-                                       const upb_FieldDef* f, const char** src,
-                                       const char* end) {
-  char ch;
-  if (!upb_DefPool_TryGetChar(src, end, &ch)) return -1;
-  if ('0' <= ch && ch <= '9') {
-    return ch - '0';
-  }
-  ch = upb_ascii_lower(ch);
-  if ('a' <= ch && ch <= 'f') {
-    return ch - 'a' + 0xa;
-  }
-  *src -= 1;  // Char wasn't actually a hex digit.
-  return -1;
-}
-
-static char upb_DefPool_ParseHexEscape(symtab_addctx* ctx,
-                                       const upb_FieldDef* f, const char** src,
-                                       const char* end) {
-  char hex_digit = upb_DefPool_TryGetHexDigit(ctx, f, src, end);
-  if (hex_digit < 0) {
-    symtab_errf(ctx,
-                "\\x cannot be followed by non-hex digit in field '%s' default",
-                upb_FieldDef_FullName(f));
-    return 0;
-  }
-  unsigned int ret = hex_digit;
-  while ((hex_digit = upb_DefPool_TryGetHexDigit(ctx, f, src, end)) >= 0) {
-    ret = (ret << 4) | hex_digit;
-  }
-  if (ret > 0xff) {
-    symtab_errf(ctx, "Value of hex escape in field %s exceeds 8 bits",
-                upb_FieldDef_FullName(f));
-    return 0;
-  }
-  return ret;
-}
-
-char upb_DefPool_TryGetOctalDigit(const char** src, const char* end) {
-  char ch;
-  if (!upb_DefPool_TryGetChar(src, end, &ch)) return -1;
-  if ('0' <= ch && ch <= '7') {
-    return ch - '0';
-  }
-  *src -= 1;  // Char wasn't actually an octal digit.
-  return -1;
-}
-
-static char upb_DefPool_ParseOctalEscape(symtab_addctx* ctx,
-                                         const upb_FieldDef* f,
-                                         const char** src, const char* end) {
-  char ch = 0;
-  for (int i = 0; i < 3; i++) {
-    char digit;
-    if ((digit = upb_DefPool_TryGetOctalDigit(src, end)) >= 0) {
-      ch = (ch << 3) | digit;
-    }
-  }
-  return ch;
-}
-
-static char upb_DefPool_ParseEscape(symtab_addctx* ctx, const upb_FieldDef* f,
-                                    const char** src, const char* end) {
-  char ch;
-  if (!upb_DefPool_TryGetChar(src, end, &ch)) {
-    symtab_errf(ctx, "unterminated escape sequence in field %s",
-                upb_FieldDef_FullName(f));
-    return 0;
-  }
-  switch (ch) {
-    case 'a':
-      return '\a';
-    case 'b':
-      return '\b';
-    case 'f':
-      return '\f';
-    case 'n':
-      return '\n';
-    case 'r':
-      return '\r';
-    case 't':
-      return '\t';
-    case 'v':
-      return '\v';
-    case '\\':
-      return '\\';
-    case '\'':
-      return '\'';
-    case '\"':
-      return '\"';
-    case '?':
-      return '\?';
-    case 'x':
-    case 'X':
-      return upb_DefPool_ParseHexEscape(ctx, f, src, end);
-    case '0':
-    case '1':
-    case '2':
-    case '3':
-    case '4':
-    case '5':
-    case '6':
-    case '7':
-      *src -= 1;
-      return upb_DefPool_ParseOctalEscape(ctx, f, src, end);
-  }
-  symtab_errf(ctx, "Unknown escape sequence: \\%c", ch);
-}
-
-static str_t* unescape(symtab_addctx* ctx, const upb_FieldDef* f,
-                       const char* data, size_t len) {
-  // Size here is an upper bound; escape sequences could ultimately shrink it.
-  str_t* ret = symtab_alloc(ctx, sizeof(*ret) + len);
-  char* dst = &ret->str[0];
-  const char* src = data;
-  const char* end = data + len;
-
-  while (src < end) {
-    if (*src == '\\') {
-      src++;
-      *dst++ = upb_DefPool_ParseEscape(ctx, f, &src, end);
-    } else {
-      *dst++ = *src++;
-    }
-  }
-
-  ret->len = dst - &ret->str[0];
-  return ret;
-}
-
-static void parse_default(symtab_addctx* ctx, const char* str, size_t len,
-                          upb_FieldDef* f) {
-  char* end;
-  char nullz[64];
-  errno = 0;
-
-  switch (upb_FieldDef_CType(f)) {
-    case kUpb_CType_Int32:
-    case kUpb_CType_Int64:
-    case kUpb_CType_UInt32:
-    case kUpb_CType_UInt64:
-    case kUpb_CType_Double:
-    case kUpb_CType_Float:
-      /* Standard C number parsing functions expect null-terminated strings. */
-      if (len >= sizeof(nullz) - 1) {
-        symtab_errf(ctx, "Default too long: %.*s", (int)len, str);
-      }
-      memcpy(nullz, str, len);
-      nullz[len] = '\0';
-      str = nullz;
-      break;
-    default:
-      break;
-  }
-
-  switch (upb_FieldDef_CType(f)) {
-    case kUpb_CType_Int32: {
-      long val = strtol(str, &end, 0);
-      if (val > INT32_MAX || val < INT32_MIN || errno == ERANGE || *end) {
-        goto invalid;
-      }
-      f->defaultval.sint = val;
-      break;
-    }
-    case kUpb_CType_Enum: {
-      const upb_EnumDef* e = f->sub.enumdef;
-      const upb_EnumValueDef* ev =
-          upb_EnumDef_FindValueByNameWithSize(e, str, len);
-      if (!ev) {
-        goto invalid;
-      }
-      f->defaultval.sint = ev->number;
-      break;
-    }
-    case kUpb_CType_Int64: {
-      long long val = strtoll(str, &end, 0);
-      if (val > INT64_MAX || val < INT64_MIN || errno == ERANGE || *end) {
-        goto invalid;
-      }
-      f->defaultval.sint = val;
-      break;
-    }
-    case kUpb_CType_UInt32: {
-      unsigned long val = strtoul(str, &end, 0);
-      if (val > UINT32_MAX || errno == ERANGE || *end) {
-        goto invalid;
-      }
-      f->defaultval.uint = val;
-      break;
-    }
-    case kUpb_CType_UInt64: {
-      unsigned long long val = strtoull(str, &end, 0);
-      if (val > UINT64_MAX || errno == ERANGE || *end) {
-        goto invalid;
-      }
-      f->defaultval.uint = val;
-      break;
-    }
-    case kUpb_CType_Double: {
-      double val = strtod(str, &end);
-      if (errno == ERANGE || *end) {
-        goto invalid;
-      }
-      f->defaultval.dbl = val;
-      break;
-    }
-    case kUpb_CType_Float: {
-      float val = strtof(str, &end);
-      if (errno == ERANGE || *end) {
-        goto invalid;
-      }
-      f->defaultval.flt = val;
-      break;
-    }
-    case kUpb_CType_Bool: {
-      if (streql2(str, len, "false")) {
-        f->defaultval.boolean = false;
-      } else if (streql2(str, len, "true")) {
-        f->defaultval.boolean = true;
-      } else {
-        goto invalid;
-      }
-      break;
-    }
-    case kUpb_CType_String:
-      f->defaultval.str = newstr(ctx, str, len);
-      break;
-    case kUpb_CType_Bytes:
-      f->defaultval.str = unescape(ctx, f, str, len);
-      break;
-    case kUpb_CType_Message:
-      /* Should not have a default value. */
-      symtab_errf(ctx, "Message should not have a default (%s)",
-                  upb_FieldDef_FullName(f));
-  }
-
-  return;
-
-invalid:
-  symtab_errf(ctx, "Invalid default '%.*s' for field %s of type %d", (int)len,
-              str, upb_FieldDef_FullName(f), (int)upb_FieldDef_Type(f));
-}
-
-static void set_default_default(symtab_addctx* ctx, upb_FieldDef* f) {
-  switch (upb_FieldDef_CType(f)) {
-    case kUpb_CType_Int32:
-    case kUpb_CType_Int64:
-      f->defaultval.sint = 0;
-      break;
-    case kUpb_CType_UInt64:
-    case kUpb_CType_UInt32:
-      f->defaultval.uint = 0;
-      break;
-    case kUpb_CType_Double:
-    case kUpb_CType_Float:
-      f->defaultval.dbl = 0;
-      break;
-    case kUpb_CType_String:
-    case kUpb_CType_Bytes:
-      f->defaultval.str = newstr(ctx, NULL, 0);
-      break;
-    case kUpb_CType_Bool:
-      f->defaultval.boolean = false;
-      break;
-    case kUpb_CType_Enum:
-      f->defaultval.sint = f->sub.enumdef->values[0].number;
-    case kUpb_CType_Message:
-      break;
-  }
-}
-
-static void create_fielddef(
-    symtab_addctx* ctx, const char* prefix, upb_MessageDef* m,
-    const google_protobuf_FieldDescriptorProto* field_proto,
-    const upb_FieldDef* _f, bool is_extension) {
-  upb_FieldDef* f = (upb_FieldDef*)_f;
-  upb_StringView name;
-  const char* full_name;
-  const char* json_name;
-  const char* shortname;
-  int32_t field_number;
-
-  f->file = ctx->file; /* Must happen prior to symtab_add(). */
-
-  if (!google_protobuf_FieldDescriptorProto_has_name(field_proto)) {
-    symtab_errf(ctx, "field has no name");
-  }
-
-  name = google_protobuf_FieldDescriptorProto_name(field_proto);
-  check_ident(ctx, name, false);
-  full_name = makefullname(ctx, prefix, name);
-  shortname = shortdefname(full_name);
-
-  if (google_protobuf_FieldDescriptorProto_has_json_name(field_proto)) {
-    json_name = strviewdup(
-        ctx, google_protobuf_FieldDescriptorProto_json_name(field_proto));
-    f->has_json_name_ = true;
-  } else {
-    json_name = makejsonname(ctx, shortname);
-    f->has_json_name_ = false;
-  }
-
-  field_number = google_protobuf_FieldDescriptorProto_number(field_proto);
-
-  f->full_name = full_name;
-  f->json_name = json_name;
-  f->label_ = (int)google_protobuf_FieldDescriptorProto_label(field_proto);
-  f->number_ = field_number;
-  f->scope.oneof = NULL;
-  f->proto3_optional_ =
-      google_protobuf_FieldDescriptorProto_proto3_optional(field_proto);
-
-  bool has_type = google_protobuf_FieldDescriptorProto_has_type(field_proto);
-  bool has_type_name =
-      google_protobuf_FieldDescriptorProto_has_type_name(field_proto);
-
-  f->type_ = (int)google_protobuf_FieldDescriptorProto_type(field_proto);
-
-  if (has_type) {
-    switch (f->type_) {
-      case kUpb_FieldType_Message:
-      case kUpb_FieldType_Group:
-      case kUpb_FieldType_Enum:
-        if (!has_type_name) {
-          symtab_errf(ctx, "field of type %d requires type name (%s)",
-                      (int)f->type_, full_name);
-        }
-        break;
-      default:
-        if (has_type_name) {
-          symtab_errf(ctx, "invalid type for field with type_name set (%s, %d)",
-                      full_name, (int)f->type_);
-        }
-    }
-  } else if (has_type_name) {
-    f->type_ =
-        FIELD_TYPE_UNSPECIFIED;  // We'll fill this in in resolve_fielddef().
-  }
-
-  if (!is_extension) {
-    /* direct message field. */
-    upb_value v, field_v, json_v, existing_v;
-    size_t json_size;
-
-    if (field_number <= 0 || field_number > kUpb_MaxFieldNumber) {
-      symtab_errf(ctx, "invalid field number (%u)", field_number);
-    }
-
-    f->index_ = f - m->fields;
-    f->msgdef = m;
-    f->is_extension_ = false;
-
-    field_v = pack_def(f, UPB_DEFTYPE_FIELD);
-    json_v = pack_def(f, UPB_DEFTYPE_FIELD_JSONNAME);
-    v = upb_value_constptr(f);
-    json_size = strlen(json_name);
-
-    if (upb_strtable_lookup(&m->ntof, shortname, &existing_v)) {
-      symtab_errf(ctx, "duplicate field name (%s)", shortname);
-    }
-
-    CHK_OOM(upb_strtable_insert(&m->ntof, name.data, name.size, field_v,
-                                ctx->arena));
-
-    if (strcmp(shortname, json_name) != 0) {
-      if (upb_strtable_lookup(&m->ntof, json_name, &v)) {
-        symtab_errf(ctx, "duplicate json_name (%s)", json_name);
-      } else {
-        CHK_OOM(upb_strtable_insert(&m->ntof, json_name, json_size, json_v,
-                                    ctx->arena));
-      }
-    }
-
-    if (upb_inttable_lookup(&m->itof, field_number, NULL)) {
-      symtab_errf(ctx, "duplicate field number (%u)", field_number);
-    }
-
-    CHK_OOM(upb_inttable_insert(&m->itof, field_number, v, ctx->arena));
-
-    if (ctx->layout) {
-      const upb_MiniTable_Field* fields = m->layout->fields;
-      int count = m->layout->field_count;
-      bool found = false;
-      for (int i = 0; i < count; i++) {
-        if (fields[i].number == field_number) {
-          f->layout_index = i;
-          found = true;
-          break;
-        }
-      }
-      UPB_ASSERT(found);
-    }
-  } else {
-    /* extension field. */
-    f->is_extension_ = true;
-    f->scope.extension_scope = m;
-    symtab_add(ctx, full_name, pack_def(f, UPB_DEFTYPE_EXT));
-    f->layout_index = ctx->ext_count++;
-    if (ctx->layout) {
-      UPB_ASSERT(ctx->file->ext_layouts[f->layout_index]->field.number ==
-                 field_number);
-    }
-  }
-
-  if (f->type_ < kUpb_FieldType_Double || f->type_ > kUpb_FieldType_SInt64) {
-    symtab_errf(ctx, "invalid type for field %s (%d)", f->full_name, f->type_);
-  }
-
-  if (f->label_ < kUpb_Label_Optional || f->label_ > kUpb_Label_Repeated) {
-    symtab_errf(ctx, "invalid label for field %s (%d)", f->full_name,
-                f->label_);
-  }
-
-  /* We can't resolve the subdef or (in the case of extensions) the containing
-   * message yet, because it may not have been defined yet.  We stash a pointer
-   * to the field_proto until later when we can properly resolve it. */
-  f->sub.unresolved = field_proto;
-
-  if (f->label_ == kUpb_Label_Required &&
-      f->file->syntax == kUpb_Syntax_Proto3) {
-    symtab_errf(ctx, "proto3 fields cannot be required (%s)", f->full_name);
-  }
-
-  if (google_protobuf_FieldDescriptorProto_has_oneof_index(field_proto)) {
-    uint32_t oneof_index = google_protobuf_FieldDescriptorProto_oneof_index(field_proto);
-    upb_OneofDef* oneof;
-    upb_value v = upb_value_constptr(f);
-
-    if (upb_FieldDef_Label(f) != kUpb_Label_Optional) {
-      symtab_errf(ctx, "fields in oneof must have OPTIONAL label (%s)",
-                  f->full_name);
-    }
-
-    if (!m) {
-      symtab_errf(ctx, "oneof_index provided for extension field (%s)",
-                  f->full_name);
-    }
-
-    if (oneof_index >= m->oneof_count) {
-      symtab_errf(ctx, "oneof_index out of range (%s)", f->full_name);
-    }
-
-    oneof = (upb_OneofDef*)&m->oneofs[oneof_index];
-    f->scope.oneof = oneof;
-
-    oneof->field_count++;
-    if (f->proto3_optional_) {
-      oneof->synthetic = true;
-    }
-    CHK_OOM(upb_inttable_insert(&oneof->itof, f->number_, v, ctx->arena));
-    CHK_OOM(
-        upb_strtable_insert(&oneof->ntof, name.data, name.size, v, ctx->arena));
-  } else {
-    if (f->proto3_optional_ && !is_extension) {
-      symtab_errf(ctx, "field with proto3_optional was not in a oneof (%s)",
-                  f->full_name);
-    }
-  }
-
-  SET_OPTIONS(f->opts, FieldDescriptorProto, FieldOptions, field_proto);
-
-  if (google_protobuf_FieldOptions_has_packed(f->opts)) {
-    f->packed_ = google_protobuf_FieldOptions_packed(f->opts);
-  } else {
-    /* Repeated fields default to packed for proto3 only. */
-    f->packed_ = upb_FieldDef_IsPrimitive(f) &&
-                 f->label_ == kUpb_Label_Repeated &&
-                 f->file->syntax == kUpb_Syntax_Proto3;
-  }
-}
-
-static void create_service(
-    symtab_addctx* ctx, const google_protobuf_ServiceDescriptorProto* svc_proto,
-    const upb_ServiceDef* _s) {
-  upb_ServiceDef* s = (upb_ServiceDef*)_s;
-  upb_StringView name;
-  const google_protobuf_MethodDescriptorProto* const* methods;
-  size_t i, n;
-
-  s->file = ctx->file; /* Must happen prior to symtab_add. */
-
-  name = google_protobuf_ServiceDescriptorProto_name(svc_proto);
-  check_ident(ctx, name, false);
-  s->full_name = makefullname(ctx, ctx->file->package, name);
-  symtab_add(ctx, s->full_name, pack_def(s, UPB_DEFTYPE_SERVICE));
-
-  methods = google_protobuf_ServiceDescriptorProto_method(svc_proto, &n);
-
-  s->method_count = n;
-  s->methods = symtab_alloc(ctx, sizeof(*s->methods) * n);
-
-  SET_OPTIONS(s->opts, ServiceDescriptorProto, ServiceOptions, svc_proto);
-
-  for (i = 0; i < n; i++) {
-    const google_protobuf_MethodDescriptorProto* method_proto = methods[i];
-    upb_MethodDef* m = (upb_MethodDef*)&s->methods[i];
-    upb_StringView name =
-        google_protobuf_MethodDescriptorProto_name(method_proto);
-
-    m->service = s;
-    m->full_name = makefullname(ctx, s->full_name, name);
-    m->index = i;
-    m->client_streaming =
-        google_protobuf_MethodDescriptorProto_client_streaming(method_proto);
-    m->server_streaming =
-        google_protobuf_MethodDescriptorProto_server_streaming(method_proto);
-    m->input_type = symtab_resolve(
-        ctx, m->full_name, m->full_name,
-        google_protobuf_MethodDescriptorProto_input_type(method_proto),
-        UPB_DEFTYPE_MSG);
-    m->output_type = symtab_resolve(
-        ctx, m->full_name, m->full_name,
-        google_protobuf_MethodDescriptorProto_output_type(method_proto),
-        UPB_DEFTYPE_MSG);
-
-    SET_OPTIONS(m->opts, MethodDescriptorProto, MethodOptions, method_proto);
-  }
-}
-
-static int count_bits_debug(uint64_t x) {
-  // For assertions only, speed does not matter.
-  int n = 0;
-  while (x) {
-    if (x & 1) n++;
-    x >>= 1;
-  }
-  return n;
-}
-
-static int compare_int32(const void* a_ptr, const void* b_ptr) {
-  int32_t a = *(int32_t*)a_ptr;
-  int32_t b = *(int32_t*)b_ptr;
-  return a < b ? -1 : (a == b ? 0 : 1);
-}
-
-upb_MiniTable_Enum* create_enumlayout(symtab_addctx* ctx,
-                                      const upb_EnumDef* e) {
-  int n = 0;
-  uint64_t mask = 0;
-
-  for (int i = 0; i < e->value_count; i++) {
-    uint32_t val = (uint32_t)e->values[i].number;
-    if (val < 64) {
-      mask |= 1ULL << val;
-    } else {
-      n++;
-    }
-  }
-
-  int32_t* values = symtab_alloc(ctx, sizeof(*values) * n);
-
-  if (n) {
-    int32_t* p = values;
-
-    // Add values outside the bitmask range to the list, as described in the
-    // comments for upb_MiniTable_Enum.
-    for (int i = 0; i < e->value_count; i++) {
-      int32_t val = e->values[i].number;
-      if ((uint32_t)val >= 64) {
-        *p++ = val;
-      }
-    }
-    UPB_ASSERT(p == values + n);
-  }
-
-  // Enums can have duplicate values; we must sort+uniq them.
-  if (values) qsort(values, n, sizeof(*values), &compare_int32);
-
-  int dst = 0;
-  for (int i = 0; i < n; dst++) {
-    int32_t val = values[i];
-    while (i < n && values[i] == val) i++;  // Skip duplicates.
-    values[dst] = val;
-  }
-  n = dst;
-
-  UPB_ASSERT(upb_inttable_count(&e->iton) == n + count_bits_debug(mask));
-
-  upb_MiniTable_Enum* layout = symtab_alloc(ctx, sizeof(*layout));
-  layout->value_count = n;
-  layout->mask = mask;
-  layout->values = values;
-
-  return layout;
-}
-
-static void create_enumvaldef(
-    symtab_addctx* ctx, const char* prefix,
-    const google_protobuf_EnumValueDescriptorProto* val_proto, upb_EnumDef* e,
-    int i) {
-  upb_EnumValueDef* val = (upb_EnumValueDef*)&e->values[i];
-  upb_StringView name =
-      google_protobuf_EnumValueDescriptorProto_name(val_proto);
-  upb_value v = upb_value_constptr(val);
-
-  val->parent = e; /* Must happen prior to symtab_add(). */
-  val->full_name = makefullname(ctx, prefix, name);
-  val->number = google_protobuf_EnumValueDescriptorProto_number(val_proto);
-  symtab_add(ctx, val->full_name, pack_def(val, UPB_DEFTYPE_ENUMVAL));
-
-  SET_OPTIONS(val->opts, EnumValueDescriptorProto, EnumValueOptions, val_proto);
-
-  if (i == 0 && e->file->syntax == kUpb_Syntax_Proto3 && val->number != 0) {
-    symtab_errf(ctx, "for proto3, the first enum value must be zero (%s)",
-                e->full_name);
-  }
-
-  CHK_OOM(upb_strtable_insert(&e->ntoi, name.data, name.size, v, ctx->arena));
-
-  // Multiple enumerators can have the same number, first one wins.
-  if (!upb_inttable_lookup(&e->iton, val->number, NULL)) {
-    CHK_OOM(upb_inttable_insert(&e->iton, val->number, v, ctx->arena));
-  }
-}
-
-static upb_StringView* _upb_EnumReservedNames_New(
-    symtab_addctx* ctx, int n, const upb_StringView* protos) {
-  upb_StringView* sv =
-      upb_Arena_Malloc(ctx->arena, sizeof(upb_StringView) * n);
-  for (size_t i = 0; i < n; i++) {
-    sv[i].data =
-        upb_strdup2(protos[i].data, protos[i].size, ctx->arena);
-    sv[i].size = protos[i].size;
-  }
-  return sv;
-}
-
-static void create_enumdef(
-    symtab_addctx* ctx, const char* prefix,
-    const google_protobuf_EnumDescriptorProto* enum_proto,
-    const upb_MessageDef* containing_type, const upb_EnumDef* _e) {
-  upb_EnumDef* e = (upb_EnumDef*)_e;
-  ;
-  const google_protobuf_EnumValueDescriptorProto* const* values;
-  const google_protobuf_EnumDescriptorProto_EnumReservedRange* const* res_ranges;
-  const upb_StringView* res_names;
-  upb_StringView name;
-  size_t i, n, n_res_range, n_res_name;
-
-  e->file = ctx->file; /* Must happen prior to symtab_add() */
-  e->containing_type = containing_type;
-
-  name = google_protobuf_EnumDescriptorProto_name(enum_proto);
-  check_ident(ctx, name, false);
-
-  e->full_name = makefullname(ctx, prefix, name);
-  symtab_add(ctx, e->full_name, pack_def(e, UPB_DEFTYPE_ENUM));
-
-  values = google_protobuf_EnumDescriptorProto_value(enum_proto, &n);
-  CHK_OOM(upb_strtable_init(&e->ntoi, n, ctx->arena));
-  CHK_OOM(upb_inttable_init(&e->iton, ctx->arena));
-
-  e->defaultval = 0;
-  e->value_count = n;
-  e->values = symtab_alloc(ctx, sizeof(*e->values) * n);
-
-  if (n == 0) {
-    symtab_errf(ctx, "enums must contain at least one value (%s)",
-                e->full_name);
-  }
-
-  res_ranges =
-      google_protobuf_EnumDescriptorProto_reserved_range(enum_proto, &n_res_range);
-  e->res_range_count = n_res_range;
-  e->res_ranges = _upb_EnumReservedRanges_New(ctx, n_res_range, res_ranges, e);
-
-  res_names = google_protobuf_EnumDescriptorProto_reserved_name(enum_proto, &n_res_name);
-  e->res_name_count = n_res_name;
-  e->res_names = _upb_EnumReservedNames_New(ctx, n_res_name, res_names);
-
-  SET_OPTIONS(e->opts, EnumDescriptorProto, EnumOptions, enum_proto);
-
-  for (i = 0; i < n; i++) {
-    create_enumvaldef(ctx, prefix, values[i], e, i);
-  }
-
-  upb_inttable_compact(&e->iton, ctx->arena);
-
-  if (e->file->syntax == kUpb_Syntax_Proto2) {
-    if (ctx->layout) {
-      UPB_ASSERT(ctx->enum_count < ctx->layout->enum_count);
-      e->layout = ctx->layout->enums[ctx->enum_count++];
-      UPB_ASSERT(upb_inttable_count(&e->iton) ==
-                 e->layout->value_count + count_bits_debug(e->layout->mask));
-    } else {
-      e->layout = create_enumlayout(ctx, e);
-    }
-  } else {
-    e->layout = NULL;
-  }
-}
-
-static void msgdef_create_nested(
-    symtab_addctx* ctx, const google_protobuf_DescriptorProto* msg_proto,
-    upb_MessageDef* m);
-
-static upb_StringView* _upb_ReservedNames_New(symtab_addctx* ctx, int n,
-                                              const upb_StringView* protos) {
-  upb_StringView* sv = upb_Arena_Malloc(ctx->arena, sizeof(upb_StringView) * n);
-  for (size_t i = 0; i < n; i++) {
-    sv[i].data =
-        upb_strdup2(protos[i].data, protos[i].size, ctx->arena);
-    sv[i].size = protos[i].size;
-  }
-  return sv;
-}
-
-static void create_msgdef(symtab_addctx* ctx, const char* prefix,
-                          const google_protobuf_DescriptorProto* msg_proto,
-                          const upb_MessageDef* containing_type,
-                          const upb_MessageDef* _m) {
-  upb_MessageDef* m = (upb_MessageDef*)_m;
-  const google_protobuf_OneofDescriptorProto* const* oneofs;
-  const google_protobuf_FieldDescriptorProto* const* fields;
-  const google_protobuf_DescriptorProto_ExtensionRange* const* ext_ranges;
-
-  const google_protobuf_DescriptorProto_ReservedRange* const* res_ranges;
-  const upb_StringView* res_names;
-  size_t i, n_oneof, n_field, n_ext_range;
-  size_t n_res_range, n_res_name;
-  upb_StringView name;
-
-  m->file = ctx->file; /* Must happen prior to symtab_add(). */
-  m->containing_type = containing_type;
-
-  name = google_protobuf_DescriptorProto_name(msg_proto);
-  check_ident(ctx, name, false);
-
-  m->full_name = makefullname(ctx, prefix, name);
-  symtab_add(ctx, m->full_name, pack_def(m, UPB_DEFTYPE_MSG));
-
-  oneofs = google_protobuf_DescriptorProto_oneof_decl(msg_proto, &n_oneof);
-  fields = google_protobuf_DescriptorProto_field(msg_proto, &n_field);
-  ext_ranges =
-      google_protobuf_DescriptorProto_extension_range(msg_proto, &n_ext_range);
-  res_ranges = google_protobuf_DescriptorProto_reserved_range(msg_proto, &n_res_range);
-  res_names = google_protobuf_DescriptorProto_reserved_name(msg_proto, &n_res_name);
-
-  CHK_OOM(upb_inttable_init(&m->itof, ctx->arena));
-  CHK_OOM(upb_strtable_init(&m->ntof, n_oneof + n_field, ctx->arena));
-
-  if (ctx->layout) {
-    /* create_fielddef() below depends on this being set. */
-    UPB_ASSERT(ctx->msg_count < ctx->layout->msg_count);
-    m->layout = ctx->layout->msgs[ctx->msg_count++];
-    UPB_ASSERT(n_field == m->layout->field_count);
-  } else {
-    /* Allocate now (to allow cross-linking), populate later. */
-    m->layout =
-        symtab_alloc(ctx, sizeof(*m->layout) + sizeof(_upb_FastTable_Entry));
-  }
-
-  SET_OPTIONS(m->opts, DescriptorProto, MessageOptions, msg_proto);
-
-  m->oneof_count = n_oneof;
-  m->oneofs = symtab_alloc(ctx, sizeof(*m->oneofs) * n_oneof);
-  for (i = 0; i < n_oneof; i++) {
-    create_oneofdef(ctx, m, oneofs[i], &m->oneofs[i]);
-  }
-
-  m->field_count = n_field;
-  m->fields = symtab_alloc(ctx, sizeof(*m->fields) * n_field);
-  for (i = 0; i < n_field; i++) {
-    create_fielddef(ctx, m->full_name, m, fields[i], &m->fields[i],
-                    /* is_extension= */ false);
-  }
-
-  m->ext_range_count = n_ext_range;
-  m->ext_ranges = symtab_alloc(ctx, sizeof(*m->ext_ranges) * n_ext_range);
-  for (i = 0; i < n_ext_range; i++) {
-    const google_protobuf_DescriptorProto_ExtensionRange* r = ext_ranges[i];
-    upb_ExtensionRange* r_def = (upb_ExtensionRange*)&m->ext_ranges[i];
-    int32_t start = google_protobuf_DescriptorProto_ExtensionRange_start(r);
-    int32_t end = google_protobuf_DescriptorProto_ExtensionRange_end(r);
-    int32_t max =
-        google_protobuf_MessageOptions_message_set_wire_format(m->opts)
-            ? INT32_MAX
-            : kUpb_MaxFieldNumber + 1;
-
-    // A full validation would also check that each range is disjoint, and that
-    // none of the fields overlap with the extension ranges, but we are just
-    // sanity checking here.
-    if (start < 1 || end <= start || end > max) {
-      symtab_errf(ctx, "Extension range (%d, %d) is invalid, message=%s\n",
-                  (int)start, (int)end, m->full_name);
-    }
-
-    r_def->start = start;
-    r_def->end = end;
-    SET_OPTIONS(r_def->opts, DescriptorProto_ExtensionRange,
-                ExtensionRangeOptions, r);
-  }
-
-  m->res_range_count = n_res_range;
-  m->res_ranges =
-      _upb_MessageReservedRanges_New(ctx, n_res_range, res_ranges, m);
-
-  m->res_name_count = n_res_name;
-  m->res_names = _upb_ReservedNames_New(ctx, n_res_name, res_names);
-
-  finalize_oneofs(ctx, m);
-  assign_msg_wellknowntype(m);
-  upb_inttable_compact(&m->itof, ctx->arena);
-  msgdef_create_nested(ctx, msg_proto, m);
-}
-
-static void msgdef_create_nested(
-    symtab_addctx* ctx, const google_protobuf_DescriptorProto* msg_proto,
-    upb_MessageDef* m) {
-  size_t n;
-
-  const google_protobuf_EnumDescriptorProto* const* enums =
-      google_protobuf_DescriptorProto_enum_type(msg_proto, &n);
-  m->nested_enum_count = n;
-  m->nested_enums = symtab_alloc(ctx, sizeof(*m->nested_enums) * n);
-  for (size_t i = 0; i < n; i++) {
-    m->nested_enum_count = i + 1;
-    create_enumdef(ctx, m->full_name, enums[i], m, &m->nested_enums[i]);
-  }
-
-  const google_protobuf_FieldDescriptorProto* const* exts =
-      google_protobuf_DescriptorProto_extension(msg_proto, &n);
-  m->nested_ext_count = n;
-  m->nested_exts = symtab_alloc(ctx, sizeof(*m->nested_exts) * n);
-  for (size_t i = 0; i < n; i++) {
-    create_fielddef(ctx, m->full_name, m, exts[i], &m->nested_exts[i],
-                    /* is_extension= */ true);
-    ((upb_FieldDef*)&m->nested_exts[i])->index_ = i;
-  }
-
-  const google_protobuf_DescriptorProto* const* msgs =
-      google_protobuf_DescriptorProto_nested_type(msg_proto, &n);
-  m->nested_msg_count = n;
-  m->nested_msgs = symtab_alloc(ctx, sizeof(*m->nested_msgs) * n);
-  for (size_t i = 0; i < n; i++) {
-    create_msgdef(ctx, m->full_name, msgs[i], m, &m->nested_msgs[i]);
-  }
-}
-
-static void resolve_subdef(symtab_addctx* ctx, const char* prefix,
-                           upb_FieldDef* f) {
-  const google_protobuf_FieldDescriptorProto* field_proto = f->sub.unresolved;
-  upb_StringView name =
-      google_protobuf_FieldDescriptorProto_type_name(field_proto);
-  bool has_name =
-      google_protobuf_FieldDescriptorProto_has_type_name(field_proto);
-  switch ((int)f->type_) {
-    case FIELD_TYPE_UNSPECIFIED: {
-      // Type was not specified and must be inferred.
-      UPB_ASSERT(has_name);
-      upb_deftype_t type;
-      const void* def =
-          symtab_resolveany(ctx, f->full_name, prefix, name, &type);
-      switch (type) {
-        case UPB_DEFTYPE_ENUM:
-          f->sub.enumdef = def;
-          f->type_ = kUpb_FieldType_Enum;
-          break;
-        case UPB_DEFTYPE_MSG:
-          f->sub.msgdef = def;
-          f->type_ = kUpb_FieldType_Message;  // It appears there is no way of
-                                              // this being a group.
-          break;
-        default:
-          symtab_errf(ctx, "Couldn't resolve type name for field %s",
-                      f->full_name);
-      }
-    }
-    case kUpb_FieldType_Message:
-    case kUpb_FieldType_Group:
-      UPB_ASSERT(has_name);
-      f->sub.msgdef =
-          symtab_resolve(ctx, f->full_name, prefix, name, UPB_DEFTYPE_MSG);
-      break;
-    case kUpb_FieldType_Enum:
-      UPB_ASSERT(has_name);
-      f->sub.enumdef =
-          symtab_resolve(ctx, f->full_name, prefix, name, UPB_DEFTYPE_ENUM);
-      break;
-    default:
-      // No resolution necessary.
-      break;
-  }
-}
-
-static void resolve_extension(
-    symtab_addctx* ctx, const char* prefix, upb_FieldDef* f,
-    const google_protobuf_FieldDescriptorProto* field_proto) {
-  if (!google_protobuf_FieldDescriptorProto_has_extendee(field_proto)) {
-    symtab_errf(ctx, "extension for field '%s' had no extendee", f->full_name);
-  }
-
-  upb_StringView name =
-      google_protobuf_FieldDescriptorProto_extendee(field_proto);
-  const upb_MessageDef* m =
-      symtab_resolve(ctx, f->full_name, prefix, name, UPB_DEFTYPE_MSG);
-  f->msgdef = m;
-
-  bool found = false;
-
-  for (int i = 0, n = m->ext_range_count; i < n; i++) {
-    const upb_ExtensionRange* r = &m->ext_ranges[i];
-    if (r->start <= f->number_ && f->number_ < r->end) {
-      found = true;
-      break;
-    }
-  }
-
-  if (!found) {
-    symtab_errf(ctx,
-                "field number %u in extension %s has no extension range in "
-                "message %s",
-                (unsigned)f->number_, f->full_name, f->msgdef->full_name);
-  }
-
-  const upb_MiniTable_Extension* ext = ctx->file->ext_layouts[f->layout_index];
-  if (ctx->layout) {
-    UPB_ASSERT(upb_FieldDef_Number(f) == ext->field.number);
-  } else {
-    upb_MiniTable_Extension* mut_ext = (upb_MiniTable_Extension*)ext;
-    fill_fieldlayout(&mut_ext->field, f);
-    mut_ext->field.presence = 0;
-    mut_ext->field.offset = 0;
-    mut_ext->field.submsg_index = 0;
-    mut_ext->extendee = f->msgdef->layout;
-    mut_ext->sub.submsg = f->sub.msgdef->layout;
-  }
-
-  CHK_OOM(upb_inttable_insert(&ctx->symtab->exts, (uintptr_t)ext,
-                              upb_value_constptr(f), ctx->arena));
-}
-
-static void resolve_default(
-    symtab_addctx* ctx, upb_FieldDef* f,
-    const google_protobuf_FieldDescriptorProto* field_proto) {
-  // Have to delay resolving of the default value until now because of the enum
-  // case, since enum defaults are specified with a label.
-  if (google_protobuf_FieldDescriptorProto_has_default_value(field_proto)) {
-    upb_StringView defaultval =
-        google_protobuf_FieldDescriptorProto_default_value(field_proto);
-
-    if (f->file->syntax == kUpb_Syntax_Proto3) {
-      symtab_errf(ctx, "proto3 fields cannot have explicit defaults (%s)",
-                  f->full_name);
-    }
-
-    if (upb_FieldDef_IsSubMessage(f)) {
-      symtab_errf(ctx, "message fields cannot have explicit defaults (%s)",
-                  f->full_name);
-    }
-
-    parse_default(ctx, defaultval.data, defaultval.size, f);
-    f->has_default = true;
-  } else {
-    set_default_default(ctx, f);
-    f->has_default = false;
-  }
-}
-
-static void resolve_fielddef(symtab_addctx* ctx, const char* prefix,
-                             upb_FieldDef* f) {
-  // We have to stash this away since resolve_subdef() may overwrite it.
-  const google_protobuf_FieldDescriptorProto* field_proto = f->sub.unresolved;
-
-  resolve_subdef(ctx, prefix, f);
-  resolve_default(ctx, f, field_proto);
-
-  if (f->is_extension_) {
-    resolve_extension(ctx, prefix, f, field_proto);
-  }
-}
-
-static void resolve_msgdef(symtab_addctx* ctx, upb_MessageDef* m) {
-  for (int i = 0; i < m->field_count; i++) {
-    resolve_fielddef(ctx, m->full_name, (upb_FieldDef*)&m->fields[i]);
-  }
-
-  m->in_message_set = false;
-  for (int i = 0; i < m->nested_ext_count; i++) {
-    upb_FieldDef* ext = (upb_FieldDef*)&m->nested_exts[i];
-    resolve_fielddef(ctx, m->full_name, ext);
-    if (ext->type_ == kUpb_FieldType_Message &&
-        ext->label_ == kUpb_Label_Optional && ext->sub.msgdef == m &&
-        google_protobuf_MessageOptions_message_set_wire_format(
-            ext->msgdef->opts)) {
-      m->in_message_set = true;
-    }
-  }
-
-  if (!ctx->layout) make_layout(ctx, m);
-
-  for (int i = 0; i < m->nested_msg_count; i++) {
-    resolve_msgdef(ctx, (upb_MessageDef*)&m->nested_msgs[i]);
-  }
-}
-
-static int count_exts_in_msg(const google_protobuf_DescriptorProto* msg_proto) {
-  size_t n;
-  google_protobuf_DescriptorProto_extension(msg_proto, &n);
-  int ext_count = n;
-
-  const google_protobuf_DescriptorProto* const* nested_msgs =
-      google_protobuf_DescriptorProto_nested_type(msg_proto, &n);
-  for (size_t i = 0; i < n; i++) {
-    ext_count += count_exts_in_msg(nested_msgs[i]);
-  }
-
-  return ext_count;
-}
-
-static void build_filedef(
-    symtab_addctx* ctx, upb_FileDef* file,
-    const google_protobuf_FileDescriptorProto* file_proto) {
-  const google_protobuf_DescriptorProto* const* msgs;
-  const google_protobuf_EnumDescriptorProto* const* enums;
-  const google_protobuf_FieldDescriptorProto* const* exts;
-  const google_protobuf_ServiceDescriptorProto* const* services;
-  const upb_StringView* strs;
-  const int32_t* public_deps;
-  const int32_t* weak_deps;
-  size_t i, n;
-
-  file->symtab = ctx->symtab;
-
-  /* Count all extensions in the file, to build a flat array of layouts. */
-  google_protobuf_FileDescriptorProto_extension(file_proto, &n);
-  int ext_count = n;
-  msgs = google_protobuf_FileDescriptorProto_message_type(file_proto, &n);
-  for (int i = 0; i < n; i++) {
-    ext_count += count_exts_in_msg(msgs[i]);
-  }
-  file->ext_count = ext_count;
-
-  if (ctx->layout) {
-    /* We are using the ext layouts that were passed in. */
-    file->ext_layouts = ctx->layout->exts;
-    if (ctx->layout->ext_count != file->ext_count) {
-      symtab_errf(ctx, "Extension count did not match layout (%d vs %d)",
-                  ctx->layout->ext_count, file->ext_count);
-    }
-  } else {
-    /* We are building ext layouts from scratch. */
-    file->ext_layouts =
-        symtab_alloc(ctx, sizeof(*file->ext_layouts) * file->ext_count);
-    upb_MiniTable_Extension* ext =
-        symtab_alloc(ctx, sizeof(*ext) * file->ext_count);
-    for (int i = 0; i < file->ext_count; i++) {
-      file->ext_layouts[i] = &ext[i];
-    }
-  }
-
-  if (!google_protobuf_FileDescriptorProto_has_name(file_proto)) {
-    symtab_errf(ctx, "File has no name");
-  }
-
-  file->name =
-      strviewdup(ctx, google_protobuf_FileDescriptorProto_name(file_proto));
-
-  upb_StringView package = google_protobuf_FileDescriptorProto_package(file_proto);
-  if (package.size) {
-    check_ident(ctx, package, true);
-    file->package = strviewdup(ctx, package);
-  } else {
-    file->package = NULL;
-  }
-
-  if (google_protobuf_FileDescriptorProto_has_syntax(file_proto)) {
-    upb_StringView syntax =
-        google_protobuf_FileDescriptorProto_syntax(file_proto);
-
-    if (streql_view(syntax, "proto2")) {
-      file->syntax = kUpb_Syntax_Proto2;
-    } else if (streql_view(syntax, "proto3")) {
-      file->syntax = kUpb_Syntax_Proto3;
-    } else {
-      symtab_errf(ctx, "Invalid syntax '" UPB_STRINGVIEW_FORMAT "'",
-                  UPB_STRINGVIEW_ARGS(syntax));
-    }
-  } else {
-    file->syntax = kUpb_Syntax_Proto2;
-  }
-
-  /* Read options. */
-  SET_OPTIONS(file->opts, FileDescriptorProto, FileOptions, file_proto);
-
-  /* Verify dependencies. */
-  strs = google_protobuf_FileDescriptorProto_dependency(file_proto, &n);
-  file->dep_count = n;
-  file->deps = symtab_alloc(ctx, sizeof(*file->deps) * n);
-
-  for (i = 0; i < n; i++) {
-    upb_StringView str = strs[i];
-    file->deps[i] =
-        upb_DefPool_FindFileByNameWithSize(ctx->symtab, str.data, str.size);
-    if (!file->deps[i]) {
-      symtab_errf(ctx,
-                  "Depends on file '" UPB_STRINGVIEW_FORMAT
-                  "', but it has not been loaded",
-                  UPB_STRINGVIEW_ARGS(str));
-    }
-  }
-
-  public_deps =
-      google_protobuf_FileDescriptorProto_public_dependency(file_proto, &n);
-  file->public_dep_count = n;
-  file->public_deps = symtab_alloc(ctx, sizeof(*file->public_deps) * n);
-  int32_t* mutable_public_deps = (int32_t*)file->public_deps;
-  for (i = 0; i < n; i++) {
-    if (public_deps[i] >= file->dep_count) {
-      symtab_errf(ctx, "public_dep %d is out of range", (int)public_deps[i]);
-    }
-    mutable_public_deps[i] = public_deps[i];
-  }
-
-  weak_deps =
-      google_protobuf_FileDescriptorProto_weak_dependency(file_proto, &n);
-  file->weak_dep_count = n;
-  file->weak_deps = symtab_alloc(ctx, sizeof(*file->weak_deps) * n);
-  int32_t* mutable_weak_deps = (int32_t*)file->weak_deps;
-  for (i = 0; i < n; i++) {
-    if (weak_deps[i] >= file->dep_count) {
-      symtab_errf(ctx, "weak_dep %d is out of range", (int)weak_deps[i]);
-    }
-    mutable_weak_deps[i] = weak_deps[i];
-  }
-
-  /* Create enums. */
-  enums = google_protobuf_FileDescriptorProto_enum_type(file_proto, &n);
-  file->top_lvl_enum_count = n;
-  file->top_lvl_enums = symtab_alloc(ctx, sizeof(*file->top_lvl_enums) * n);
-  for (i = 0; i < n; i++) {
-    create_enumdef(ctx, file->package, enums[i], NULL, &file->top_lvl_enums[i]);
-  }
-
-  /* Create extensions. */
-  exts = google_protobuf_FileDescriptorProto_extension(file_proto, &n);
-  file->top_lvl_ext_count = n;
-  file->top_lvl_exts = symtab_alloc(ctx, sizeof(*file->top_lvl_exts) * n);
-  for (i = 0; i < n; i++) {
-    create_fielddef(ctx, file->package, NULL, exts[i], &file->top_lvl_exts[i],
-                    /* is_extension= */ true);
-    ((upb_FieldDef*)&file->top_lvl_exts[i])->index_ = i;
-  }
-
-  /* Create messages. */
-  msgs = google_protobuf_FileDescriptorProto_message_type(file_proto, &n);
-  file->top_lvl_msg_count = n;
-  file->top_lvl_msgs = symtab_alloc(ctx, sizeof(*file->top_lvl_msgs) * n);
-  for (i = 0; i < n; i++) {
-    create_msgdef(ctx, file->package, msgs[i], NULL, &file->top_lvl_msgs[i]);
-  }
-
-  /* Create services. */
-  services = google_protobuf_FileDescriptorProto_service(file_proto, &n);
-  file->service_count = n;
-  file->services = symtab_alloc(ctx, sizeof(*file->services) * n);
-  for (i = 0; i < n; i++) {
-    create_service(ctx, services[i], &file->services[i]);
-    ((upb_ServiceDef*)&file->services[i])->index = i;
-  }
-
-  /* Now that all names are in the table, build layouts and resolve refs. */
-  for (i = 0; i < (size_t)file->top_lvl_ext_count; i++) {
-    resolve_fielddef(ctx, file->package, (upb_FieldDef*)&file->top_lvl_exts[i]);
-  }
-
-  for (i = 0; i < (size_t)file->top_lvl_msg_count; i++) {
-    resolve_msgdef(ctx, (upb_MessageDef*)&file->top_lvl_msgs[i]);
-  }
-
-  if (file->ext_count) {
-    CHK_OOM(_upb_extreg_add(ctx->symtab->extreg, file->ext_layouts,
-                            file->ext_count));
-  }
-}
-
-static void remove_filedef(upb_DefPool* s, upb_FileDef* file) {
-  intptr_t iter = UPB_INTTABLE_BEGIN;
-  upb_StringView key;
-  upb_value val;
-  while (upb_strtable_next2(&s->syms, &key, &val, &iter)) {
-    const upb_FileDef* f;
-    switch (deftype(val)) {
-      case UPB_DEFTYPE_EXT:
-        f = upb_FieldDef_File(unpack_def(val, UPB_DEFTYPE_EXT));
-        break;
-      case UPB_DEFTYPE_MSG:
-        f = upb_MessageDef_File(unpack_def(val, UPB_DEFTYPE_MSG));
-        break;
-      case UPB_DEFTYPE_ENUM:
-        f = upb_EnumDef_File(unpack_def(val, UPB_DEFTYPE_ENUM));
-        break;
-      case UPB_DEFTYPE_ENUMVAL:
-        f = upb_EnumDef_File(
-            upb_EnumValueDef_Enum(unpack_def(val, UPB_DEFTYPE_ENUMVAL)));
-        break;
-      case UPB_DEFTYPE_SERVICE:
-        f = upb_ServiceDef_File(unpack_def(val, UPB_DEFTYPE_SERVICE));
-        break;
-      default:
-        UPB_UNREACHABLE();
-    }
-
-    if (f == file) upb_strtable_removeiter(&s->syms, &iter);
-  }
-}
-
-static const upb_FileDef* _upb_DefPool_AddFile(
-    upb_DefPool* s, const google_protobuf_FileDescriptorProto* file_proto,
-    const upb_MiniTable_File* layout, upb_Status* status) {
-  symtab_addctx ctx;
-  upb_StringView name = google_protobuf_FileDescriptorProto_name(file_proto);
-  upb_value v;
-
-  if (upb_strtable_lookup2(&s->files, name.data, name.size, &v)) {
-    if (unpack_def(v, UPB_DEFTYPE_FILE)) {
-      upb_Status_SetErrorFormat(status, "duplicate file name (%.*s)",
-                                UPB_STRINGVIEW_ARGS(name));
-      return NULL;
-    }
-    const upb_MiniTable_File* registered = unpack_def(v, UPB_DEFTYPE_LAYOUT);
-    UPB_ASSERT(registered);
-    if (layout && layout != registered) {
-      upb_Status_SetErrorFormat(
-          status, "tried to build with a different layout (filename=%.*s)",
-          UPB_STRINGVIEW_ARGS(name));
-      return NULL;
-    }
-    layout = registered;
-  }
-
-  ctx.symtab = s;
-  ctx.layout = layout;
-  ctx.msg_count = 0;
-  ctx.enum_count = 0;
-  ctx.ext_count = 0;
-  ctx.status = status;
-  ctx.file = NULL;
-  ctx.arena = upb_Arena_New();
-  ctx.tmp_arena = upb_Arena_New();
-
-  if (!ctx.arena || !ctx.tmp_arena) {
-    if (ctx.arena) upb_Arena_Free(ctx.arena);
-    if (ctx.tmp_arena) upb_Arena_Free(ctx.tmp_arena);
-    upb_Status_setoom(status);
-    return NULL;
-  }
-
-  if (UPB_UNLIKELY(UPB_SETJMP(ctx.err))) {
-    UPB_ASSERT(!upb_Status_IsOk(status));
-    if (ctx.file) {
-      remove_filedef(s, ctx.file);
-      ctx.file = NULL;
-    }
-  } else {
-    ctx.file = symtab_alloc(&ctx, sizeof(*ctx.file));
-    build_filedef(&ctx, ctx.file, file_proto);
-    upb_strtable_insert(&s->files, name.data, name.size,
-                        pack_def(ctx.file, UPB_DEFTYPE_FILE), ctx.arena);
-    UPB_ASSERT(upb_Status_IsOk(status));
-    upb_Arena_Fuse(s->arena, ctx.arena);
-  }
-
-  upb_Arena_Free(ctx.arena);
-  upb_Arena_Free(ctx.tmp_arena);
-  return ctx.file;
-}
-
-const upb_FileDef* upb_DefPool_AddFile(
-    upb_DefPool* s, const google_protobuf_FileDescriptorProto* file_proto,
-    upb_Status* status) {
-  return _upb_DefPool_AddFile(s, file_proto, NULL, status);
-}
-
-/* Include here since we want most of this file to be stdio-free. */
-#include <stdio.h>
-
-bool _upb_DefPool_LoadDefInitEx(upb_DefPool* s, const _upb_DefPool_Init* init,
-                                bool rebuild_minitable) {
-  /* Since this function should never fail (it would indicate a bug in upb) we
-   * print errors to stderr instead of returning error status to the user. */
-  _upb_DefPool_Init** deps = init->deps;
-  google_protobuf_FileDescriptorProto* file;
-  upb_Arena* arena;
-  upb_Status status;
-
-  upb_Status_Clear(&status);
-
-  if (upb_DefPool_FindFileByName(s, init->filename)) {
-    return true;
-  }
-
-  arena = upb_Arena_New();
-
-  for (; *deps; deps++) {
-    if (!_upb_DefPool_LoadDefInitEx(s, *deps, rebuild_minitable)) goto err;
-  }
-
-  file = google_protobuf_FileDescriptorProto_parse_ex(
-      init->descriptor.data, init->descriptor.size, NULL,
-      kUpb_DecodeOption_AliasString, arena);
-  s->bytes_loaded += init->descriptor.size;
-
-  if (!file) {
-    upb_Status_SetErrorFormat(
-        &status,
-        "Failed to parse compiled-in descriptor for file '%s'. This should "
-        "never happen.",
-        init->filename);
-    goto err;
-  }
-
-  const upb_MiniTable_File* mt = rebuild_minitable ? NULL : init->layout;
-  if (!_upb_DefPool_AddFile(s, file, mt, &status)) {
-    goto err;
-  }
-
-  upb_Arena_Free(arena);
-  return true;
-
-err:
-  fprintf(stderr,
-          "Error loading compiled-in descriptor for file '%s' (this should "
-          "never happen): %s\n",
-          init->filename, upb_Status_ErrorMessage(&status));
-  upb_Arena_Free(arena);
-  return false;
-}
-
-size_t _upb_DefPool_BytesLoaded(const upb_DefPool* s) {
-  return s->bytes_loaded;
-}
-
-upb_Arena* _upb_DefPool_Arena(const upb_DefPool* s) { return s->arena; }
-
-const upb_FieldDef* _upb_DefPool_FindExtensionByMiniTable(
-    const upb_DefPool* s, const upb_MiniTable_Extension* ext) {
-  upb_value v;
-  bool ok = upb_inttable_lookup(&s->exts, (uintptr_t)ext, &v);
-  UPB_ASSERT(ok);
-  return upb_value_getconstptr(v);
-}
-
-const upb_FieldDef* upb_DefPool_FindExtensionByNumber(const upb_DefPool* s,
-                                                      const upb_MessageDef* m,
-                                                      int32_t fieldnum) {
-  const upb_MiniTable* l = upb_MessageDef_MiniTable(m);
-  const upb_MiniTable_Extension* ext = _upb_extreg_get(s->extreg, l, fieldnum);
-  return ext ? _upb_DefPool_FindExtensionByMiniTable(s, ext) : NULL;
-}
-
-bool _upb_DefPool_registerlayout(upb_DefPool* s, const char* filename,
-                                 const upb_MiniTable_File* file) {
-  if (upb_DefPool_FindFileByName(s, filename)) return false;
-  upb_value v = pack_def(file, UPB_DEFTYPE_LAYOUT);
-  return upb_strtable_insert(&s->files, filename, strlen(filename), v,
-                             s->arena);
-}
-
-const upb_ExtensionRegistry* upb_DefPool_ExtensionRegistry(
-    const upb_DefPool* s) {
-  return s->extreg;
-}
-
-const upb_FieldDef** upb_DefPool_GetAllExtensions(const upb_DefPool* s,
-                                                  const upb_MessageDef* m,
-                                                  size_t* count) {
-  size_t n = 0;
-  intptr_t iter = UPB_INTTABLE_BEGIN;
-  uintptr_t key;
-  upb_value val;
-  // This is O(all exts) instead of O(exts for m).  If we need this to be
-  // efficient we may need to make extreg into a two-level table, or have a
-  // second per-message index.
-  while (upb_inttable_next2(&s->exts, &key, &val, &iter)) {
-    const upb_FieldDef* f = upb_value_getconstptr(val);
-    if (upb_FieldDef_ContainingType(f) == m) n++;
-  }
-  const upb_FieldDef** exts = malloc(n * sizeof(*exts));
-  iter = UPB_INTTABLE_BEGIN;
-  size_t i = 0;
-  while (upb_inttable_next2(&s->exts, &key, &val, &iter)) {
-    const upb_FieldDef* f = upb_value_getconstptr(val);
-    if (upb_FieldDef_ContainingType(f) == m) exts[i++] = f;
-  }
-  *count = n;
-  return exts;
-}
-
-#undef CHK_OOM
-
-/** upb/reflection.c ************************************************************/
-
-#include <string.h>
-
-
-static size_t get_field_size(const upb_MiniTable_Field* f) {
-  static unsigned char sizes[] = {
-      0,                      /* 0 */
-      8,                      /* kUpb_FieldType_Double */
-      4,                      /* kUpb_FieldType_Float */
-      8,                      /* kUpb_FieldType_Int64 */
-      8,                      /* kUpb_FieldType_UInt64 */
-      4,                      /* kUpb_FieldType_Int32 */
-      8,                      /* kUpb_FieldType_Fixed64 */
-      4,                      /* kUpb_FieldType_Fixed32 */
-      1,                      /* kUpb_FieldType_Bool */
-      sizeof(upb_StringView), /* kUpb_FieldType_String */
-      sizeof(void*),          /* kUpb_FieldType_Group */
-      sizeof(void*),          /* kUpb_FieldType_Message */
-      sizeof(upb_StringView), /* kUpb_FieldType_Bytes */
-      4,                      /* kUpb_FieldType_UInt32 */
-      4,                      /* kUpb_FieldType_Enum */
-      4,                      /* kUpb_FieldType_SFixed32 */
-      8,                      /* kUpb_FieldType_SFixed64 */
-      4,                      /* kUpb_FieldType_SInt32 */
-      8,                      /* kUpb_FieldType_SInt64 */
-  };
-  return upb_IsRepeatedOrMap(f) ? sizeof(void*) : sizes[f->descriptortype];
-}
-
-/** upb_Message
- * *******************************************************************/
-
-upb_Message* upb_Message_New(const upb_MessageDef* m, upb_Arena* a) {
-  return _upb_Message_New(upb_MessageDef_MiniTable(m), a);
-}
-
-static bool in_oneof(const upb_MiniTable_Field* field) {
-  return field->presence < 0;
-}
-
-static upb_MessageValue _upb_Message_Getraw(const upb_Message* msg,
-                                            const upb_FieldDef* f) {
-  const upb_MiniTable_Field* field = upb_FieldDef_MiniTable(f);
-  const char* mem = UPB_PTR_AT(msg, field->offset, char);
-  upb_MessageValue val = {0};
-  memcpy(&val, mem, get_field_size(field));
-  return val;
-}
-
-bool upb_Message_Has(const upb_Message* msg, const upb_FieldDef* f) {
-  assert(upb_FieldDef_HasPresence(f));
-  if (upb_FieldDef_IsExtension(f)) {
-    const upb_MiniTable_Extension* ext = _upb_FieldDef_ExtensionMiniTable(f);
-    return _upb_Message_Getext(msg, ext) != NULL;
-  } else {
-    const upb_MiniTable_Field* field = upb_FieldDef_MiniTable(f);
-    if (in_oneof(field)) {
-      return _upb_getoneofcase_field(msg, field) == field->number;
-    } else if (field->presence > 0) {
-      return _upb_hasbit_field(msg, field);
-    } else {
-      UPB_ASSERT(field->descriptortype == kUpb_FieldType_Message ||
-                 field->descriptortype == kUpb_FieldType_Group);
-      return _upb_Message_Getraw(msg, f).msg_val != NULL;
-    }
-  }
-}
-
-const upb_FieldDef* upb_Message_WhichOneof(const upb_Message* msg,
-                                           const upb_OneofDef* o) {
-  const upb_FieldDef* f = upb_OneofDef_Field(o, 0);
-  if (upb_OneofDef_IsSynthetic(o)) {
-    UPB_ASSERT(upb_OneofDef_FieldCount(o) == 1);
-    return upb_Message_Has(msg, f) ? f : NULL;
-  } else {
-    const upb_MiniTable_Field* field = upb_FieldDef_MiniTable(f);
-    uint32_t oneof_case = _upb_getoneofcase_field(msg, field);
-    f = oneof_case ? upb_OneofDef_LookupNumber(o, oneof_case) : NULL;
-    UPB_ASSERT((f != NULL) == (oneof_case != 0));
-    return f;
-  }
-}
-
-upb_MessageValue upb_Message_Get(const upb_Message* msg,
-                                 const upb_FieldDef* f) {
-  if (upb_FieldDef_IsExtension(f)) {
-    const upb_Message_Extension* ext =
-        _upb_Message_Getext(msg, _upb_FieldDef_ExtensionMiniTable(f));
-    if (ext) {
-      upb_MessageValue val;
-      memcpy(&val, &ext->data, sizeof(val));
-      return val;
-    } else if (upb_FieldDef_IsRepeated(f)) {
-      return (upb_MessageValue){.array_val = NULL};
-    }
-  } else if (!upb_FieldDef_HasPresence(f) || upb_Message_Has(msg, f)) {
-    return _upb_Message_Getraw(msg, f);
-  }
-  return upb_FieldDef_Default(f);
-}
-
-upb_MutableMessageValue upb_Message_Mutable(upb_Message* msg,
-                                            const upb_FieldDef* f,
-                                            upb_Arena* a) {
-  UPB_ASSERT(upb_FieldDef_IsSubMessage(f) || upb_FieldDef_IsRepeated(f));
-  if (upb_FieldDef_HasPresence(f) && !upb_Message_Has(msg, f)) {
-    // We need to skip the upb_Message_Get() call in this case.
-    goto make;
-  }
-
-  upb_MessageValue val = upb_Message_Get(msg, f);
-  if (val.array_val) {
-    return (upb_MutableMessageValue){.array = (upb_Array*)val.array_val};
-  }
-
-  upb_MutableMessageValue ret;
-make:
-  if (!a) return (upb_MutableMessageValue){.array = NULL};
-  if (upb_FieldDef_IsMap(f)) {
-    const upb_MessageDef* entry = upb_FieldDef_MessageSubDef(f);
-    const upb_FieldDef* key =
-        upb_MessageDef_FindFieldByNumber(entry, kUpb_MapEntry_KeyFieldNumber);
-    const upb_FieldDef* value =
-        upb_MessageDef_FindFieldByNumber(entry, kUpb_MapEntry_ValueFieldNumber);
-    ret.map =
-        upb_Map_New(a, upb_FieldDef_CType(key), upb_FieldDef_CType(value));
-  } else if (upb_FieldDef_IsRepeated(f)) {
-    ret.array = upb_Array_New(a, upb_FieldDef_CType(f));
-  } else {
-    UPB_ASSERT(upb_FieldDef_IsSubMessage(f));
-    ret.msg = upb_Message_New(upb_FieldDef_MessageSubDef(f), a);
-  }
-
-  val.array_val = ret.array;
-  upb_Message_Set(msg, f, val, a);
-
-  return ret;
-}
-
-bool upb_Message_Set(upb_Message* msg, const upb_FieldDef* f,
-                     upb_MessageValue val, upb_Arena* a) {
-  if (upb_FieldDef_IsExtension(f)) {
-    upb_Message_Extension* ext = _upb_Message_GetOrCreateExtension(
-        msg, _upb_FieldDef_ExtensionMiniTable(f), a);
-    if (!ext) return false;
-    memcpy(&ext->data, &val, sizeof(val));
-  } else {
-    const upb_MiniTable_Field* field = upb_FieldDef_MiniTable(f);
-    char* mem = UPB_PTR_AT(msg, field->offset, char);
-    memcpy(mem, &val, get_field_size(field));
-    if (field->presence > 0) {
-      _upb_sethas_field(msg, field);
-    } else if (in_oneof(field)) {
-      *_upb_oneofcase_field(msg, field) = field->number;
-    }
-  }
-  return true;
-}
-
-void upb_Message_ClearField(upb_Message* msg, const upb_FieldDef* f) {
-  if (upb_FieldDef_IsExtension(f)) {
-    _upb_Message_Clearext(msg, _upb_FieldDef_ExtensionMiniTable(f));
-  } else {
-    const upb_MiniTable_Field* field = upb_FieldDef_MiniTable(f);
-    char* mem = UPB_PTR_AT(msg, field->offset, char);
-
-    if (field->presence > 0) {
-      _upb_clearhas_field(msg, field);
-    } else if (in_oneof(field)) {
-      uint32_t* oneof_case = _upb_oneofcase_field(msg, field);
-      if (*oneof_case != field->number) return;
-      *oneof_case = 0;
-    }
-
-    memset(mem, 0, get_field_size(field));
-  }
-}
-
-void upb_Message_Clear(upb_Message* msg, const upb_MessageDef* m) {
-  _upb_Message_Clear(msg, upb_MessageDef_MiniTable(m));
-}
-
-bool upb_Message_Next(const upb_Message* msg, const upb_MessageDef* m,
-                      const upb_DefPool* ext_pool, const upb_FieldDef** out_f,
-                      upb_MessageValue* out_val, size_t* iter) {
-  size_t i = *iter;
-  size_t n = upb_MessageDef_FieldCount(m);
-  const upb_MessageValue zero = {0};
-  UPB_UNUSED(ext_pool);
-
-  /* Iterate over normal fields, returning the first one that is set. */
-  while (++i < n) {
-    const upb_FieldDef* f = upb_MessageDef_Field(m, i);
-    upb_MessageValue val = _upb_Message_Getraw(msg, f);
-
-    /* Skip field if unset or empty. */
-    if (upb_FieldDef_HasPresence(f)) {
-      if (!upb_Message_Has(msg, f)) continue;
-    } else {
-      upb_MessageValue test = val;
-      if (upb_FieldDef_IsString(f) && !upb_FieldDef_IsRepeated(f)) {
-        /* Clear string pointer, only size matters (ptr could be non-NULL). */
-        test.str_val.data = NULL;
-      }
-      /* Continue if NULL or 0. */
-      if (memcmp(&test, &zero, sizeof(test)) == 0) continue;
-
-      /* Continue on empty array or map. */
-      if (upb_FieldDef_IsMap(f)) {
-        if (upb_Map_Size(test.map_val) == 0) continue;
-      } else if (upb_FieldDef_IsRepeated(f)) {
-        if (upb_Array_Size(test.array_val) == 0) continue;
-      }
-    }
-
-    *out_val = val;
-    *out_f = f;
-    *iter = i;
-    return true;
-  }
-
-  if (ext_pool) {
-    /* Return any extensions that are set. */
-    size_t count;
-    const upb_Message_Extension* ext = _upb_Message_Getexts(msg, &count);
-    if (i - n < count) {
-      ext += count - 1 - (i - n);
-      memcpy(out_val, &ext->data, sizeof(*out_val));
-      *out_f = _upb_DefPool_FindExtensionByMiniTable(ext_pool, ext->ext);
-      *iter = i;
-      return true;
-    }
-  }
-
-  *iter = i;
-  return false;
-}
-
-bool _upb_Message_DiscardUnknown(upb_Message* msg, const upb_MessageDef* m,
-                                 int depth) {
-  size_t iter = kUpb_Message_Begin;
-  const upb_FieldDef* f;
-  upb_MessageValue val;
-  bool ret = true;
-
-  if (--depth == 0) return false;
-
-  _upb_Message_DiscardUnknown_shallow(msg);
-
-  while (upb_Message_Next(msg, m, NULL /*ext_pool*/, &f, &val, &iter)) {
-    const upb_MessageDef* subm = upb_FieldDef_MessageSubDef(f);
-    if (!subm) continue;
-    if (upb_FieldDef_IsMap(f)) {
-      const upb_FieldDef* val_f = upb_MessageDef_FindFieldByNumber(subm, 2);
-      const upb_MessageDef* val_m = upb_FieldDef_MessageSubDef(val_f);
-      upb_Map* map = (upb_Map*)val.map_val;
-      size_t iter = kUpb_Map_Begin;
-
-      if (!val_m) continue;
-
-      while (upb_MapIterator_Next(map, &iter)) {
-        upb_MessageValue map_val = upb_MapIterator_Value(map, iter);
-        if (!_upb_Message_DiscardUnknown((upb_Message*)map_val.msg_val, val_m,
-                                         depth)) {
-          ret = false;
-        }
-      }
-    } else if (upb_FieldDef_IsRepeated(f)) {
-      const upb_Array* arr = val.array_val;
-      size_t i, n = upb_Array_Size(arr);
-      for (i = 0; i < n; i++) {
-        upb_MessageValue elem = upb_Array_Get(arr, i);
-        if (!_upb_Message_DiscardUnknown((upb_Message*)elem.msg_val, subm,
-                                         depth)) {
-          ret = false;
-        }
-      }
-    } else {
-      if (!_upb_Message_DiscardUnknown((upb_Message*)val.msg_val, subm,
-                                       depth)) {
-        ret = false;
-      }
-    }
-  }
-
-  return ret;
-}
-
-bool upb_Message_DiscardUnknown(upb_Message* msg, const upb_MessageDef* m,
-                                int maxdepth) {
-  return _upb_Message_DiscardUnknown(msg, m, maxdepth);
-}
-
-/** upb/decode.c ************************************************************/
-
-#include <setjmp.h>
-#include <string.h>
-
-
-/* Must be last. */
-
-/* Maps descriptor type -> elem_size_lg2.  */
-static const uint8_t desctype_to_elem_size_lg2[] = {
-    -1,             /* invalid descriptor type */
-    3,              /* DOUBLE */
-    2,              /* FLOAT */
-    3,              /* INT64 */
-    3,              /* UINT64 */
-    2,              /* INT32 */
-    3,              /* FIXED64 */
-    2,              /* FIXED32 */
-    0,              /* BOOL */
-    UPB_SIZE(3, 4), /* STRING */
-    UPB_SIZE(2, 3), /* GROUP */
-    UPB_SIZE(2, 3), /* MESSAGE */
-    UPB_SIZE(3, 4), /* BYTES */
-    2,              /* UINT32 */
-    2,              /* ENUM */
-    2,              /* SFIXED32 */
-    3,              /* SFIXED64 */
-    2,              /* SINT32 */
-    3,              /* SINT64 */
-};
-
-/* Maps descriptor type -> upb map size.  */
-static const uint8_t desctype_to_mapsize[] = {
-    -1,                 /* invalid descriptor type */
-    8,                  /* DOUBLE */
-    4,                  /* FLOAT */
-    8,                  /* INT64 */
-    8,                  /* UINT64 */
-    4,                  /* INT32 */
-    8,                  /* FIXED64 */
-    4,                  /* FIXED32 */
-    1,                  /* BOOL */
-    UPB_MAPTYPE_STRING, /* STRING */
-    sizeof(void*),      /* GROUP */
-    sizeof(void*),      /* MESSAGE */
-    UPB_MAPTYPE_STRING, /* BYTES */
-    4,                  /* UINT32 */
-    4,                  /* ENUM */
-    4,                  /* SFIXED32 */
-    8,                  /* SFIXED64 */
-    4,                  /* SINT32 */
-    8,                  /* SINT64 */
-};
-
-static const unsigned FIXED32_OK_MASK = (1 << kUpb_FieldType_Float) |
-                                        (1 << kUpb_FieldType_Fixed32) |
-                                        (1 << kUpb_FieldType_SFixed32);
-
-static const unsigned FIXED64_OK_MASK = (1 << kUpb_FieldType_Double) |
-                                        (1 << kUpb_FieldType_Fixed64) |
-                                        (1 << kUpb_FieldType_SFixed64);
-
-/* Three fake field types for MessageSet. */
-#define TYPE_MSGSET_ITEM 19
-#define TYPE_COUNT 19
-
-/* Op: an action to be performed for a wire-type/field-type combination. */
-#define OP_UNKNOWN -1 /* Unknown field. */
-#define OP_MSGSET_ITEM -2
-#define OP_SCALAR_LG2(n) (n) /* n in [0, 2, 3] => op in [0, 2, 3] */
-#define OP_ENUM 1
-#define OP_STRING 4
-#define OP_BYTES 5
-#define OP_SUBMSG 6
-/* Scalar fields use only ops above. Repeated fields can use any op.  */
-#define OP_FIXPCK_LG2(n) (n + 5) /* n in [2, 3] => op in [7, 8] */
-#define OP_VARPCK_LG2(n) (n + 9) /* n in [0, 2, 3] => op in [9, 11, 12] */
-#define OP_PACKED_ENUM 13
-
-static const int8_t varint_ops[] = {
-    OP_UNKNOWN,       /* field not found */
-    OP_UNKNOWN,       /* DOUBLE */
-    OP_UNKNOWN,       /* FLOAT */
-    OP_SCALAR_LG2(3), /* INT64 */
-    OP_SCALAR_LG2(3), /* UINT64 */
-    OP_SCALAR_LG2(2), /* INT32 */
-    OP_UNKNOWN,       /* FIXED64 */
-    OP_UNKNOWN,       /* FIXED32 */
-    OP_SCALAR_LG2(0), /* BOOL */
-    OP_UNKNOWN,       /* STRING */
-    OP_UNKNOWN,       /* GROUP */
-    OP_UNKNOWN,       /* MESSAGE */
-    OP_UNKNOWN,       /* BYTES */
-    OP_SCALAR_LG2(2), /* UINT32 */
-    OP_ENUM,          /* ENUM */
-    OP_UNKNOWN,       /* SFIXED32 */
-    OP_UNKNOWN,       /* SFIXED64 */
-    OP_SCALAR_LG2(2), /* SINT32 */
-    OP_SCALAR_LG2(3), /* SINT64 */
-    OP_UNKNOWN,       /* MSGSET_ITEM */
-};
-
-static const int8_t delim_ops[] = {
-    /* For non-repeated field type. */
-    OP_UNKNOWN, /* field not found */
-    OP_UNKNOWN, /* DOUBLE */
-    OP_UNKNOWN, /* FLOAT */
-    OP_UNKNOWN, /* INT64 */
-    OP_UNKNOWN, /* UINT64 */
-    OP_UNKNOWN, /* INT32 */
-    OP_UNKNOWN, /* FIXED64 */
-    OP_UNKNOWN, /* FIXED32 */
-    OP_UNKNOWN, /* BOOL */
-    OP_STRING,  /* STRING */
-    OP_UNKNOWN, /* GROUP */
-    OP_SUBMSG,  /* MESSAGE */
-    OP_BYTES,   /* BYTES */
-    OP_UNKNOWN, /* UINT32 */
-    OP_UNKNOWN, /* ENUM */
-    OP_UNKNOWN, /* SFIXED32 */
-    OP_UNKNOWN, /* SFIXED64 */
-    OP_UNKNOWN, /* SINT32 */
-    OP_UNKNOWN, /* SINT64 */
-    OP_UNKNOWN, /* MSGSET_ITEM */
-    /* For repeated field type. */
-    OP_FIXPCK_LG2(3), /* REPEATED DOUBLE */
-    OP_FIXPCK_LG2(2), /* REPEATED FLOAT */
-    OP_VARPCK_LG2(3), /* REPEATED INT64 */
-    OP_VARPCK_LG2(3), /* REPEATED UINT64 */
-    OP_VARPCK_LG2(2), /* REPEATED INT32 */
-    OP_FIXPCK_LG2(3), /* REPEATED FIXED64 */
-    OP_FIXPCK_LG2(2), /* REPEATED FIXED32 */
-    OP_VARPCK_LG2(0), /* REPEATED BOOL */
-    OP_STRING,        /* REPEATED STRING */
-    OP_SUBMSG,        /* REPEATED GROUP */
-    OP_SUBMSG,        /* REPEATED MESSAGE */
-    OP_BYTES,         /* REPEATED BYTES */
-    OP_VARPCK_LG2(2), /* REPEATED UINT32 */
-    OP_PACKED_ENUM,   /* REPEATED ENUM */
-    OP_FIXPCK_LG2(2), /* REPEATED SFIXED32 */
-    OP_FIXPCK_LG2(3), /* REPEATED SFIXED64 */
-    OP_VARPCK_LG2(2), /* REPEATED SINT32 */
-    OP_VARPCK_LG2(3), /* REPEATED SINT64 */
-    /* Omitting MSGSET_*, because we never emit a repeated msgset type */
-};
-
-typedef union {
-  bool bool_val;
-  uint32_t uint32_val;
-  uint64_t uint64_val;
-  uint32_t size;
-} wireval;
-
-static const char* decode_msg(upb_Decoder* d, const char* ptr, upb_Message* msg,
-                              const upb_MiniTable* layout);
-
-UPB_NORETURN static void* decode_err(upb_Decoder* d, upb_DecodeStatus status) {
-  assert(status != kUpb_DecodeStatus_Ok);
-  UPB_LONGJMP(d->err, status);
-}
-
-const char* fastdecode_err(upb_Decoder* d, int status) {
-  assert(status != kUpb_DecodeStatus_Ok);
-  UPB_LONGJMP(d->err, status);
-  return NULL;
-}
-static void decode_verifyutf8(upb_Decoder* d, const char* buf, int len) {
-  if (!decode_verifyutf8_inl(buf, len))
-    decode_err(d, kUpb_DecodeStatus_BadUtf8);
-}
-
-static bool decode_reserve(upb_Decoder* d, upb_Array* arr, size_t elem) {
-  bool need_realloc = arr->size - arr->len < elem;
-  if (need_realloc && !_upb_array_realloc(arr, arr->len + elem, &d->arena)) {
-    decode_err(d, kUpb_DecodeStatus_OutOfMemory);
-  }
-  return need_realloc;
-}
-
-typedef struct {
-  const char* ptr;
-  uint64_t val;
-} decode_vret;
-
-UPB_NOINLINE
-static decode_vret decode_longvarint64(const char* ptr, uint64_t val) {
-  decode_vret ret = {NULL, 0};
-  uint64_t byte;
-  int i;
-  for (i = 1; i < 10; i++) {
-    byte = (uint8_t)ptr[i];
-    val += (byte - 1) << (i * 7);
-    if (!(byte & 0x80)) {
-      ret.ptr = ptr + i + 1;
-      ret.val = val;
-      return ret;
-    }
-  }
-  return ret;
-}
-
-UPB_FORCEINLINE
-static const char* decode_varint64(upb_Decoder* d, const char* ptr,
-                                   uint64_t* val) {
-  uint64_t byte = (uint8_t)*ptr;
-  if (UPB_LIKELY((byte & 0x80) == 0)) {
-    *val = byte;
-    return ptr + 1;
-  } else {
-    decode_vret res = decode_longvarint64(ptr, byte);
-    if (!res.ptr) return decode_err(d, kUpb_DecodeStatus_Malformed);
-    *val = res.val;
-    return res.ptr;
-  }
-}
-
-UPB_FORCEINLINE
-static const char* decode_tag(upb_Decoder* d, const char* ptr, uint32_t* val) {
-  uint64_t byte = (uint8_t)*ptr;
-  if (UPB_LIKELY((byte & 0x80) == 0)) {
-    *val = byte;
-    return ptr + 1;
-  } else {
-    const char* start = ptr;
-    decode_vret res = decode_longvarint64(ptr, byte);
-    if (!res.ptr || res.ptr - start > 5 || res.val > UINT32_MAX) {
-      return decode_err(d, kUpb_DecodeStatus_Malformed);
-    }
-    *val = res.val;
-    return res.ptr;
-  }
-}
-
-UPB_FORCEINLINE
-static const char* upb_Decoder_DecodeSize(upb_Decoder* d, const char* ptr,
-                                          uint32_t* size) {
-  uint64_t size64;
-  ptr = decode_varint64(d, ptr, &size64);
-  if (size64 >= INT32_MAX || ptr - d->end + (int)size64 > d->limit) {
-    decode_err(d, kUpb_DecodeStatus_Malformed);
-  }
-  *size = size64;
-  return ptr;
-}
-
-static void decode_munge_int32(wireval* val) {
-  if (!_upb_IsLittleEndian()) {
-    /* The next stage will memcpy(dst, &val, 4) */
-    val->uint32_val = val->uint64_val;
-  }
-}
-
-static void decode_munge(int type, wireval* val) {
-  switch (type) {
-    case kUpb_FieldType_Bool:
-      val->bool_val = val->uint64_val != 0;
-      break;
-    case kUpb_FieldType_SInt32: {
-      uint32_t n = val->uint64_val;
-      val->uint32_val = (n >> 1) ^ -(int32_t)(n & 1);
-      break;
-    }
-    case kUpb_FieldType_SInt64: {
-      uint64_t n = val->uint64_val;
-      val->uint64_val = (n >> 1) ^ -(int64_t)(n & 1);
-      break;
-    }
-    case kUpb_FieldType_Int32:
-    case kUpb_FieldType_UInt32:
-    case kUpb_FieldType_Enum:
-      decode_munge_int32(val);
-      break;
-  }
-}
-
-static upb_Message* decode_newsubmsg(upb_Decoder* d,
-                                     const upb_MiniTable_Sub* subs,
-                                     const upb_MiniTable_Field* field) {
-  const upb_MiniTable* subl = subs[field->submsg_index].submsg;
-  upb_Message* msg = _upb_Message_New_inl(subl, &d->arena);
-  if (!msg) decode_err(d, kUpb_DecodeStatus_OutOfMemory);
-  return msg;
-}
-
-UPB_NOINLINE
-const char* decode_isdonefallback(upb_Decoder* d, const char* ptr,
-                                  int overrun) {
-  int status;
-  ptr = decode_isdonefallback_inl(d, ptr, overrun, &status);
-  if (ptr == NULL) {
-    return decode_err(d, status);
-  }
-  return ptr;
-}
-
-static const char* decode_readstr(upb_Decoder* d, const char* ptr, int size,
-                                  upb_StringView* str) {
-  if (d->options & kUpb_DecodeOption_AliasString) {
-    str->data = ptr;
-  } else {
-    char* data = upb_Arena_Malloc(&d->arena, size);
-    if (!data) return decode_err(d, kUpb_DecodeStatus_OutOfMemory);
-    memcpy(data, ptr, size);
-    str->data = data;
-  }
-  str->size = size;
-  return ptr + size;
-}
-
-UPB_FORCEINLINE
-static const char* decode_tosubmsg2(upb_Decoder* d, const char* ptr,
-                                    upb_Message* submsg,
-                                    const upb_MiniTable* subl, int size) {
-  int saved_delta = decode_pushlimit(d, ptr, size);
-  if (--d->depth < 0) return decode_err(d, kUpb_DecodeStatus_MaxDepthExceeded);
-  ptr = decode_msg(d, ptr, submsg, subl);
-  if (d->end_group != DECODE_NOGROUP)
-    return decode_err(d, kUpb_DecodeStatus_Malformed);
-  decode_poplimit(d, ptr, saved_delta);
-  d->depth++;
-  return ptr;
-}
-
-UPB_FORCEINLINE
-static const char* decode_tosubmsg(upb_Decoder* d, const char* ptr,
-                                   upb_Message* submsg,
-                                   const upb_MiniTable_Sub* subs,
-                                   const upb_MiniTable_Field* field, int size) {
-  return decode_tosubmsg2(d, ptr, submsg, subs[field->submsg_index].submsg,
-                          size);
-}
-
-UPB_FORCEINLINE
-static const char* decode_group(upb_Decoder* d, const char* ptr,
-                                upb_Message* submsg, const upb_MiniTable* subl,
-                                uint32_t number) {
-  if (--d->depth < 0) return decode_err(d, kUpb_DecodeStatus_MaxDepthExceeded);
-  if (decode_isdone(d, &ptr)) {
-    return decode_err(d, kUpb_DecodeStatus_Malformed);
-  }
-  ptr = decode_msg(d, ptr, submsg, subl);
-  if (d->end_group != number) return decode_err(d, kUpb_DecodeStatus_Malformed);
-  d->end_group = DECODE_NOGROUP;
-  d->depth++;
-  return ptr;
-}
-
-UPB_FORCEINLINE
-static const char* decode_togroup(upb_Decoder* d, const char* ptr,
-                                  upb_Message* submsg,
-                                  const upb_MiniTable_Sub* subs,
-                                  const upb_MiniTable_Field* field) {
-  const upb_MiniTable* subl = subs[field->submsg_index].submsg;
-  return decode_group(d, ptr, submsg, subl, field->number);
-}
-
-static char* upb_Decoder_EncodeVarint32(uint32_t val, char* ptr) {
-  do {
-    uint8_t byte = val & 0x7fU;
-    val >>= 7;
-    if (val) byte |= 0x80U;
-    *(ptr++) = byte;
-  } while (val);
-  return ptr;
-}
-
-static void upb_Decode_AddUnknownVarints(upb_Decoder* d, upb_Message* msg,
-                                         uint32_t val1, uint32_t val2) {
-  char buf[20];
-  char* end = buf;
-  end = upb_Decoder_EncodeVarint32(val1, end);
-  end = upb_Decoder_EncodeVarint32(val2, end);
-
-  if (!_upb_Message_AddUnknown(msg, buf, end - buf, &d->arena)) {
-    decode_err(d, kUpb_DecodeStatus_OutOfMemory);
-  }
-}
-
-UPB_NOINLINE
-static bool decode_checkenum_slow(upb_Decoder* d, const char* ptr,
-                                  upb_Message* msg, const upb_MiniTable_Enum* e,
-                                  const upb_MiniTable_Field* field,
-                                  uint32_t v) {
-  // OPT: binary search long lists?
-  int n = e->value_count;
-  for (int i = 0; i < n; i++) {
-    if ((uint32_t)e->values[i] == v) return true;
-  }
-
-  // Unrecognized enum goes into unknown fields.
-  // For packed fields the tag could be arbitrarily far in the past, so we
-  // just re-encode the tag and value here.
-  uint32_t tag = ((uint32_t)field->number << 3) | kUpb_WireType_Varint;
-  upb_Message* unknown_msg =
-      field->mode & kUpb_LabelFlags_IsExtension ? d->unknown_msg : msg;
-  upb_Decode_AddUnknownVarints(d, unknown_msg, tag, v);
-  return false;
-}
-
-UPB_FORCEINLINE
-static bool decode_checkenum(upb_Decoder* d, const char* ptr, upb_Message* msg,
-                             const upb_MiniTable_Enum* e,
-                             const upb_MiniTable_Field* field, wireval* val) {
-  uint32_t v = val->uint32_val;
-
-  if (UPB_LIKELY(v < 64) && UPB_LIKELY(((1ULL << v) & e->mask))) return true;
-
-  return decode_checkenum_slow(d, ptr, msg, e, field, v);
-}
-
-UPB_NOINLINE
-static const char* decode_enum_toarray(upb_Decoder* d, const char* ptr,
-                                       upb_Message* msg, upb_Array* arr,
-                                       const upb_MiniTable_Sub* subs,
-                                       const upb_MiniTable_Field* field,
-                                       wireval* val) {
-  const upb_MiniTable_Enum* e = subs[field->submsg_index].subenum;
-  if (!decode_checkenum(d, ptr, msg, e, field, val)) return ptr;
-  void* mem = UPB_PTR_AT(_upb_array_ptr(arr), arr->len * 4, void);
-  arr->len++;
-  memcpy(mem, val, 4);
-  return ptr;
-}
-
-UPB_FORCEINLINE
-static const char* decode_fixed_packed(upb_Decoder* d, const char* ptr,
-                                       upb_Array* arr, wireval* val,
-                                       const upb_MiniTable_Field* field,
-                                       int lg2) {
-  int mask = (1 << lg2) - 1;
-  size_t count = val->size >> lg2;
-  if ((val->size & mask) != 0) {
-    // Length isn't a round multiple of elem size.
-    return decode_err(d, kUpb_DecodeStatus_Malformed);
-  }
-  decode_reserve(d, arr, count);
-  void* mem = UPB_PTR_AT(_upb_array_ptr(arr), arr->len << lg2, void);
-  arr->len += count;
-  // Note: if/when the decoder supports multi-buffer input, we will need to
-  // handle buffer seams here.
-  if (_upb_IsLittleEndian()) {
-    memcpy(mem, ptr, val->size);
-    ptr += val->size;
-  } else {
-    const char* end = ptr + val->size;
-    char* dst = mem;
-    while (ptr < end) {
-      if (lg2 == 2) {
-        uint32_t val;
-        memcpy(&val, ptr, sizeof(val));
-        val = _upb_BigEndian_Swap32(val);
-        memcpy(dst, &val, sizeof(val));
-      } else {
-        UPB_ASSERT(lg2 == 3);
-        uint64_t val;
-        memcpy(&val, ptr, sizeof(val));
-        val = _upb_BigEndian_Swap64(val);
-        memcpy(dst, &val, sizeof(val));
-      }
-      ptr += 1 << lg2;
-      dst += 1 << lg2;
-    }
-  }
-
-  return ptr;
-}
-
-UPB_FORCEINLINE
-static const char* decode_varint_packed(upb_Decoder* d, const char* ptr,
-                                        upb_Array* arr, wireval* val,
-                                        const upb_MiniTable_Field* field,
-                                        int lg2) {
-  int scale = 1 << lg2;
-  int saved_limit = decode_pushlimit(d, ptr, val->size);
-  char* out = UPB_PTR_AT(_upb_array_ptr(arr), arr->len << lg2, void);
-  while (!decode_isdone(d, &ptr)) {
-    wireval elem;
-    ptr = decode_varint64(d, ptr, &elem.uint64_val);
-    decode_munge(field->descriptortype, &elem);
-    if (decode_reserve(d, arr, 1)) {
-      out = UPB_PTR_AT(_upb_array_ptr(arr), arr->len << lg2, void);
-    }
-    arr->len++;
-    memcpy(out, &elem, scale);
-    out += scale;
-  }
-  decode_poplimit(d, ptr, saved_limit);
-  return ptr;
-}
-
-UPB_NOINLINE
-static const char* decode_enum_packed(upb_Decoder* d, const char* ptr,
-                                      upb_Message* msg, upb_Array* arr,
-                                      const upb_MiniTable_Sub* subs,
-                                      const upb_MiniTable_Field* field,
-                                      wireval* val) {
-  const upb_MiniTable_Enum* e = subs[field->submsg_index].subenum;
-  int saved_limit = decode_pushlimit(d, ptr, val->size);
-  char* out = UPB_PTR_AT(_upb_array_ptr(arr), arr->len * 4, void);
-  while (!decode_isdone(d, &ptr)) {
-    wireval elem;
-    ptr = decode_varint64(d, ptr, &elem.uint64_val);
-    decode_munge_int32(&elem);
-    if (!decode_checkenum(d, ptr, msg, e, field, &elem)) {
-      continue;
-    }
-    if (decode_reserve(d, arr, 1)) {
-      out = UPB_PTR_AT(_upb_array_ptr(arr), arr->len * 4, void);
-    }
-    arr->len++;
-    memcpy(out, &elem, 4);
-    out += 4;
-  }
-  decode_poplimit(d, ptr, saved_limit);
-  return ptr;
-}
-
-static const char* decode_toarray(upb_Decoder* d, const char* ptr,
-                                  upb_Message* msg,
-                                  const upb_MiniTable_Sub* subs,
-                                  const upb_MiniTable_Field* field,
-                                  wireval* val, int op) {
-  upb_Array** arrp = UPB_PTR_AT(msg, field->offset, void);
-  upb_Array* arr = *arrp;
-  void* mem;
-
-  if (arr) {
-    decode_reserve(d, arr, 1);
-  } else {
-    size_t lg2 = desctype_to_elem_size_lg2[field->descriptortype];
-    arr = _upb_Array_New(&d->arena, 4, lg2);
-    if (!arr) return decode_err(d, kUpb_DecodeStatus_OutOfMemory);
-    *arrp = arr;
-  }
-
-  switch (op) {
-    case OP_SCALAR_LG2(0):
-    case OP_SCALAR_LG2(2):
-    case OP_SCALAR_LG2(3):
-      /* Append scalar value. */
-      mem = UPB_PTR_AT(_upb_array_ptr(arr), arr->len << op, void);
-      arr->len++;
-      memcpy(mem, val, 1 << op);
-      return ptr;
-    case OP_STRING:
-      decode_verifyutf8(d, ptr, val->size);
-      /* Fallthrough. */
-    case OP_BYTES: {
-      /* Append bytes. */
-      upb_StringView* str = (upb_StringView*)_upb_array_ptr(arr) + arr->len;
-      arr->len++;
-      return decode_readstr(d, ptr, val->size, str);
-    }
-    case OP_SUBMSG: {
-      /* Append submessage / group. */
-      upb_Message* submsg = decode_newsubmsg(d, subs, field);
-      *UPB_PTR_AT(_upb_array_ptr(arr), arr->len * sizeof(void*), upb_Message*) =
-          submsg;
-      arr->len++;
-      if (UPB_UNLIKELY(field->descriptortype == kUpb_FieldType_Group)) {
-        return decode_togroup(d, ptr, submsg, subs, field);
-      } else {
-        return decode_tosubmsg(d, ptr, submsg, subs, field, val->size);
-      }
-    }
-    case OP_FIXPCK_LG2(2):
-    case OP_FIXPCK_LG2(3):
-      return decode_fixed_packed(d, ptr, arr, val, field,
-                                 op - OP_FIXPCK_LG2(0));
-    case OP_VARPCK_LG2(0):
-    case OP_VARPCK_LG2(2):
-    case OP_VARPCK_LG2(3):
-      return decode_varint_packed(d, ptr, arr, val, field,
-                                  op - OP_VARPCK_LG2(0));
-    case OP_ENUM:
-      return decode_enum_toarray(d, ptr, msg, arr, subs, field, val);
-    case OP_PACKED_ENUM:
-      return decode_enum_packed(d, ptr, msg, arr, subs, field, val);
-    default:
-      UPB_UNREACHABLE();
-  }
-}
-
-static const char* decode_tomap(upb_Decoder* d, const char* ptr,
-                                upb_Message* msg, const upb_MiniTable_Sub* subs,
-                                const upb_MiniTable_Field* field,
-                                wireval* val) {
-  upb_Map** map_p = UPB_PTR_AT(msg, field->offset, upb_Map*);
-  upb_Map* map = *map_p;
-  upb_MapEntry ent;
-  const upb_MiniTable* entry = subs[field->submsg_index].submsg;
-
-  if (!map) {
-    /* Lazily create map. */
-    const upb_MiniTable_Field* key_field = &entry->fields[0];
-    const upb_MiniTable_Field* val_field = &entry->fields[1];
-    char key_size = desctype_to_mapsize[key_field->descriptortype];
-    char val_size = desctype_to_mapsize[val_field->descriptortype];
-    UPB_ASSERT(key_field->offset == 0);
-    UPB_ASSERT(val_field->offset == sizeof(upb_StringView));
-    map = _upb_Map_New(&d->arena, key_size, val_size);
-    *map_p = map;
-  }
-
-  /* Parse map entry. */
-  memset(&ent, 0, sizeof(ent));
-
-  if (entry->fields[1].descriptortype == kUpb_FieldType_Message ||
-      entry->fields[1].descriptortype == kUpb_FieldType_Group) {
-    /* Create proactively to handle the case where it doesn't appear. */
-    ent.v.val =
-        upb_value_ptr(_upb_Message_New(entry->subs[0].submsg, &d->arena));
-  }
-
-  const char* start = ptr;
-  ptr = decode_tosubmsg(d, ptr, &ent.k, subs, field, val->size);
-  // check if ent had any unknown fields
-  size_t size;
-  upb_Message_GetUnknown(&ent.k, &size);
-  if (size != 0) {
-    uint32_t tag = ((uint32_t)field->number << 3) | kUpb_WireType_Delimited;
-    upb_Decode_AddUnknownVarints(d, msg, tag, (uint32_t)(ptr - start));
-    if (!_upb_Message_AddUnknown(msg, start, ptr - start, &d->arena)) {
-      decode_err(d, kUpb_DecodeStatus_OutOfMemory);
-    }
-  } else {
-    if (_upb_Map_Insert(map, &ent.k, map->key_size, &ent.v, map->val_size,
-                        &d->arena) == _kUpb_MapInsertStatus_OutOfMemory) {
-      decode_err(d, kUpb_DecodeStatus_OutOfMemory);
-    }
-  }
-  return ptr;
-}
-
-static const char* decode_tomsg(upb_Decoder* d, const char* ptr,
-                                upb_Message* msg, const upb_MiniTable_Sub* subs,
-                                const upb_MiniTable_Field* field, wireval* val,
-                                int op) {
-  void* mem = UPB_PTR_AT(msg, field->offset, void);
-  int type = field->descriptortype;
-
-  if (UPB_UNLIKELY(op == OP_ENUM) &&
-      !decode_checkenum(d, ptr, msg, subs[field->submsg_index].subenum, field,
-                        val)) {
-    return ptr;
-  }
-
-  /* Set presence if necessary. */
-  if (field->presence > 0) {
-    _upb_sethas_field(msg, field);
-  } else if (field->presence < 0) {
-    /* Oneof case */
-    uint32_t* oneof_case = _upb_oneofcase_field(msg, field);
-    if (op == OP_SUBMSG && *oneof_case != field->number) {
-      memset(mem, 0, sizeof(void*));
-    }
-    *oneof_case = field->number;
-  }
-
-  /* Store into message. */
-  switch (op) {
-    case OP_SUBMSG: {
-      upb_Message** submsgp = mem;
-      upb_Message* submsg = *submsgp;
-      if (!submsg) {
-        submsg = decode_newsubmsg(d, subs, field);
-        *submsgp = submsg;
-      }
-      if (UPB_UNLIKELY(type == kUpb_FieldType_Group)) {
-        ptr = decode_togroup(d, ptr, submsg, subs, field);
-      } else {
-        ptr = decode_tosubmsg(d, ptr, submsg, subs, field, val->size);
-      }
-      break;
-    }
-    case OP_STRING:
-      decode_verifyutf8(d, ptr, val->size);
-      /* Fallthrough. */
-    case OP_BYTES:
-      return decode_readstr(d, ptr, val->size, mem);
-    case OP_SCALAR_LG2(3):
-      memcpy(mem, val, 8);
-      break;
-    case OP_ENUM:
-    case OP_SCALAR_LG2(2):
-      memcpy(mem, val, 4);
-      break;
-    case OP_SCALAR_LG2(0):
-      memcpy(mem, val, 1);
-      break;
-    default:
-      UPB_UNREACHABLE();
-  }
-
-  return ptr;
-}
-
-UPB_NOINLINE
-const char* decode_checkrequired(upb_Decoder* d, const char* ptr,
-                                 const upb_Message* msg,
-                                 const upb_MiniTable* l) {
-  assert(l->required_count);
-  if (UPB_LIKELY((d->options & kUpb_DecodeOption_CheckRequired) == 0)) {
-    return ptr;
-  }
-  uint64_t msg_head;
-  memcpy(&msg_head, msg, 8);
-  msg_head = _upb_BigEndian_Swap64(msg_head);
-  if (upb_MiniTable_requiredmask(l) & ~msg_head) {
-    d->missing_required = true;
-  }
-  return ptr;
-}
-
-UPB_FORCEINLINE
-static bool decode_tryfastdispatch(upb_Decoder* d, const char** ptr,
-                                   upb_Message* msg,
-                                   const upb_MiniTable* layout) {
-#if UPB_FASTTABLE
-  if (layout && layout->table_mask != (unsigned char)-1) {
-    uint16_t tag = fastdecode_loadtag(*ptr);
-    intptr_t table = decode_totable(layout);
-    *ptr = fastdecode_tagdispatch(d, *ptr, msg, table, 0, tag);
-    return true;
-  }
-#endif
-  return false;
-}
-
-static const char* upb_Decoder_SkipField(upb_Decoder* d, const char* ptr,
-                                         uint32_t tag) {
-  int field_number = tag >> 3;
-  int wire_type = tag & 7;
-  switch (wire_type) {
-    case kUpb_WireType_Varint: {
-      uint64_t val;
-      return decode_varint64(d, ptr, &val);
-    }
-    case kUpb_WireType_64Bit:
-      return ptr + 8;
-    case kUpb_WireType_32Bit:
-      return ptr + 4;
-    case kUpb_WireType_Delimited: {
-      uint32_t size;
-      ptr = upb_Decoder_DecodeSize(d, ptr, &size);
-      return ptr + size;
-    }
-    case kUpb_WireType_StartGroup:
-      return decode_group(d, ptr, NULL, NULL, field_number);
-    default:
-      decode_err(d, kUpb_DecodeStatus_Malformed);
-  }
-}
-
-enum {
-  kStartItemTag = ((1 << 3) | kUpb_WireType_StartGroup),
-  kEndItemTag = ((1 << 3) | kUpb_WireType_EndGroup),
-  kTypeIdTag = ((2 << 3) | kUpb_WireType_Varint),
-  kMessageTag = ((3 << 3) | kUpb_WireType_Delimited),
-};
-
-static void upb_Decoder_AddKnownMessageSetItem(
-    upb_Decoder* d, upb_Message* msg, const upb_MiniTable_Extension* item_mt,
-    const char* data, uint32_t size) {
-  upb_Message_Extension* ext =
-      _upb_Message_GetOrCreateExtension(msg, item_mt, &d->arena);
-  if (UPB_UNLIKELY(!ext)) decode_err(d, kUpb_DecodeStatus_OutOfMemory);
-  upb_Message* submsg = decode_newsubmsg(d, &ext->ext->sub, &ext->ext->field);
-  upb_DecodeStatus status = upb_Decode(data, size, submsg, item_mt->sub.submsg,
-                                       d->extreg, d->options, &d->arena);
-  memcpy(&ext->data, &submsg, sizeof(submsg));
-  if (status != kUpb_DecodeStatus_Ok) decode_err(d, status);
-}
-
-static void upb_Decoder_AddUnknownMessageSetItem(upb_Decoder* d,
-                                                 upb_Message* msg,
-                                                 uint32_t type_id,
-                                                 const char* message_data,
-                                                 uint32_t message_size) {
-  char buf[60];
-  char* ptr = buf;
-  ptr = upb_Decoder_EncodeVarint32(kStartItemTag, ptr);
-  ptr = upb_Decoder_EncodeVarint32(kTypeIdTag, ptr);
-  ptr = upb_Decoder_EncodeVarint32(type_id, ptr);
-  ptr = upb_Decoder_EncodeVarint32(kMessageTag, ptr);
-  ptr = upb_Decoder_EncodeVarint32(message_size, ptr);
-  char* split = ptr;
-
-  ptr = upb_Decoder_EncodeVarint32(kEndItemTag, ptr);
-  char* end = ptr;
-
-  if (!_upb_Message_AddUnknown(msg, buf, split - buf, &d->arena) ||
-      !_upb_Message_AddUnknown(msg, message_data, message_size, &d->arena) ||
-      !_upb_Message_AddUnknown(msg, split, end - split, &d->arena)) {
-    decode_err(d, kUpb_DecodeStatus_OutOfMemory);
-  }
-}
-
-static void upb_Decoder_AddMessageSetItem(upb_Decoder* d, upb_Message* msg,
-                                          const upb_MiniTable* layout,
-                                          uint32_t type_id, const char* data,
-                                          uint32_t size) {
-  const upb_MiniTable_Extension* item_mt =
-      _upb_extreg_get(d->extreg, layout, type_id);
-  if (item_mt) {
-    upb_Decoder_AddKnownMessageSetItem(d, msg, item_mt, data, size);
-  } else {
-    upb_Decoder_AddUnknownMessageSetItem(d, msg, type_id, data, size);
-  }
-}
-
-static const char* upb_Decoder_DecodeMessageSetItem(
-    upb_Decoder* d, const char* ptr, upb_Message* msg,
-    const upb_MiniTable* layout) {
-  uint32_t type_id = 0;
-  upb_StringView preserved = {NULL, 0};
-  typedef enum {
-    kUpb_HaveId = 1 << 0,
-    kUpb_HavePayload = 1 << 1,
-  } StateMask;
-  StateMask state_mask = 0;
-  while (!decode_isdone(d, &ptr)) {
-    uint32_t tag;
-    ptr = decode_tag(d, ptr, &tag);
-    switch (tag) {
-      case kEndItemTag:
-        return ptr;
-      case kTypeIdTag: {
-        uint64_t tmp;
-        ptr = decode_varint64(d, ptr, &tmp);
-        if (state_mask & kUpb_HaveId) break;  // Ignore dup.
-        state_mask |= kUpb_HaveId;
-        type_id = tmp;
-        if (state_mask & kUpb_HavePayload) {
-          upb_Decoder_AddMessageSetItem(d, msg, layout, type_id, preserved.data,
-                                        preserved.size);
-        }
-        break;
-      }
-      case kMessageTag: {
-        uint32_t size;
-        ptr = upb_Decoder_DecodeSize(d, ptr, &size);
-        const char* data = ptr;
-        ptr += size;
-        if (state_mask & kUpb_HavePayload) break;  // Ignore dup.
-        state_mask |= kUpb_HavePayload;
-        if (state_mask & kUpb_HaveId) {
-          upb_Decoder_AddMessageSetItem(d, msg, layout, type_id, data, size);
-        } else {
-          // Out of order, we must preserve the payload.
-          preserved.data = data;
-          preserved.size = size;
-        }
-        break;
-      }
-      default:
-        // We do not preserve unexpected fields inside a message set item.
-        ptr = upb_Decoder_SkipField(d, ptr, tag);
-        break;
-    }
-  }
-  decode_err(d, kUpb_DecodeStatus_Malformed);
-}
-
-static const upb_MiniTable_Field* decode_findfield(upb_Decoder* d,
-                                                   const upb_MiniTable* l,
-                                                   uint32_t field_number,
-                                                   int* last_field_index) {
-  static upb_MiniTable_Field none = {0, 0, 0, 0, 0, 0};
-  if (l == NULL) return &none;
-
-  size_t idx = ((size_t)field_number) - 1;  // 0 wraps to SIZE_MAX
-  if (idx < l->dense_below) {
-    /* Fastest case: index into dense fields. */
-    goto found;
-  }
-
-  if (l->dense_below < l->field_count) {
-    /* Linear search non-dense fields. Resume scanning from last_field_index
-     * since fields are usually in order. */
-    int last = *last_field_index;
-    for (idx = last; idx < l->field_count; idx++) {
-      if (l->fields[idx].number == field_number) {
-        goto found;
-      }
-    }
-
-    for (idx = l->dense_below; idx < last; idx++) {
-      if (l->fields[idx].number == field_number) {
-        goto found;
-      }
-    }
-  }
-
-  if (d->extreg) {
-    switch (l->ext) {
-      case kUpb_ExtMode_Extendable: {
-        const upb_MiniTable_Extension* ext =
-            _upb_extreg_get(d->extreg, l, field_number);
-        if (ext) return &ext->field;
-        break;
-      }
-      case kUpb_ExtMode_IsMessageSet:
-        if (field_number == _UPB_MSGSET_ITEM) {
-          static upb_MiniTable_Field item = {0, 0, 0, 0, TYPE_MSGSET_ITEM, 0};
-          return &item;
-        }
-        break;
-    }
-  }
-
-  return &none; /* Unknown field. */
-
-found:
-  UPB_ASSERT(l->fields[idx].number == field_number);
-  *last_field_index = idx;
-  return &l->fields[idx];
-}
-
-UPB_FORCEINLINE
-static const char* decode_wireval(upb_Decoder* d, const char* ptr,
-                                  const upb_MiniTable_Field* field,
-                                  int wire_type, wireval* val, int* op) {
-  switch (wire_type) {
-    case kUpb_WireType_Varint:
-      ptr = decode_varint64(d, ptr, &val->uint64_val);
-      *op = varint_ops[field->descriptortype];
-      decode_munge(field->descriptortype, val);
-      return ptr;
-    case kUpb_WireType_32Bit:
-      memcpy(&val->uint32_val, ptr, 4);
-      val->uint32_val = _upb_BigEndian_Swap32(val->uint32_val);
-      *op = OP_SCALAR_LG2(2);
-      if (((1 << field->descriptortype) & FIXED32_OK_MASK) == 0) {
-        *op = OP_UNKNOWN;
-      }
-      return ptr + 4;
-    case kUpb_WireType_64Bit:
-      memcpy(&val->uint64_val, ptr, 8);
-      val->uint64_val = _upb_BigEndian_Swap64(val->uint64_val);
-      *op = OP_SCALAR_LG2(3);
-      if (((1 << field->descriptortype) & FIXED64_OK_MASK) == 0) {
-        *op = OP_UNKNOWN;
-      }
-      return ptr + 8;
-    case kUpb_WireType_Delimited: {
-      int ndx = field->descriptortype;
-      if (upb_FieldMode_Get(field) == kUpb_FieldMode_Array) ndx += TYPE_COUNT;
-      ptr = upb_Decoder_DecodeSize(d, ptr, &val->size);
-      *op = delim_ops[ndx];
-      return ptr;
-    }
-    case kUpb_WireType_StartGroup:
-      val->uint32_val = field->number;
-      if (field->descriptortype == kUpb_FieldType_Group) {
-        *op = OP_SUBMSG;
-      } else if (field->descriptortype == TYPE_MSGSET_ITEM) {
-        *op = OP_MSGSET_ITEM;
-      } else {
-        *op = OP_UNKNOWN;
-      }
-      return ptr;
-    default:
-      break;
-  }
-  return decode_err(d, kUpb_DecodeStatus_Malformed);
-}
-
-UPB_FORCEINLINE
-static const char* decode_known(upb_Decoder* d, const char* ptr,
-                                upb_Message* msg, const upb_MiniTable* layout,
-                                const upb_MiniTable_Field* field, int op,
-                                wireval* val) {
-  const upb_MiniTable_Sub* subs = layout->subs;
-  uint8_t mode = field->mode;
-
-  if (UPB_UNLIKELY(mode & kUpb_LabelFlags_IsExtension)) {
-    const upb_MiniTable_Extension* ext_layout =
-        (const upb_MiniTable_Extension*)field;
-    upb_Message_Extension* ext =
-        _upb_Message_GetOrCreateExtension(msg, ext_layout, &d->arena);
-    if (UPB_UNLIKELY(!ext)) return decode_err(d, kUpb_DecodeStatus_OutOfMemory);
-    d->unknown_msg = msg;
-    msg = &ext->data;
-    subs = &ext->ext->sub;
-  }
-
-  switch (mode & kUpb_FieldMode_Mask) {
-    case kUpb_FieldMode_Array:
-      return decode_toarray(d, ptr, msg, subs, field, val, op);
-    case kUpb_FieldMode_Map:
-      return decode_tomap(d, ptr, msg, subs, field, val);
-    case kUpb_FieldMode_Scalar:
-      return decode_tomsg(d, ptr, msg, subs, field, val, op);
-    default:
-      UPB_UNREACHABLE();
-  }
-}
-
-static const char* decode_reverse_skip_varint(const char* ptr, uint32_t val) {
-  uint32_t seen = 0;
-  do {
-    ptr--;
-    seen <<= 7;
-    seen |= *ptr & 0x7f;
-  } while (seen != val);
-  return ptr;
-}
-
-static const char* decode_unknown(upb_Decoder* d, const char* ptr,
-                                  upb_Message* msg, int field_number,
-                                  int wire_type, wireval val) {
-  if (field_number == 0) return decode_err(d, kUpb_DecodeStatus_Malformed);
-
-  // Since unknown fields are the uncommon case, we do a little extra work here
-  // to walk backwards through the buffer to find the field start.  This frees
-  // up a register in the fast paths (when the field is known), which leads to
-  // significant speedups in benchmarks.
-  const char* start = ptr;
-
-  if (wire_type == kUpb_WireType_Delimited) ptr += val.size;
-  if (msg) {
-    switch (wire_type) {
-      case kUpb_WireType_Varint:
-      case kUpb_WireType_Delimited:
-        start--;
-        while (start[-1] & 0x80) start--;
-        break;
-      case kUpb_WireType_32Bit:
-        start -= 4;
-        break;
-      case kUpb_WireType_64Bit:
-        start -= 8;
-        break;
-      default:
-        break;
-    }
-
-    assert(start == d->debug_valstart);
-    uint32_t tag = ((uint32_t)field_number << 3) | wire_type;
-    start = decode_reverse_skip_varint(start, tag);
-    assert(start == d->debug_tagstart);
-
-    if (wire_type == kUpb_WireType_StartGroup) {
-      d->unknown = start;
-      d->unknown_msg = msg;
-      ptr = decode_group(d, ptr, NULL, NULL, field_number);
-      start = d->unknown;
-      d->unknown = NULL;
-    }
-    if (!_upb_Message_AddUnknown(msg, start, ptr - start, &d->arena)) {
-      return decode_err(d, kUpb_DecodeStatus_OutOfMemory);
-    }
-  } else if (wire_type == kUpb_WireType_StartGroup) {
-    ptr = decode_group(d, ptr, NULL, NULL, field_number);
-  }
-  return ptr;
-}
-
-UPB_NOINLINE
-static const char* decode_msg(upb_Decoder* d, const char* ptr, upb_Message* msg,
-                              const upb_MiniTable* layout) {
-  int last_field_index = 0;
-
-#if UPB_FASTTABLE
-  // The first time we want to skip fast dispatch, because we may have just been
-  // invoked by the fast parser to handle a case that it bailed on.
-  if (!decode_isdone(d, &ptr)) goto nofast;
-#endif
-
-  while (!decode_isdone(d, &ptr)) {
-    uint32_t tag;
-    const upb_MiniTable_Field* field;
-    int field_number;
-    int wire_type;
-    wireval val;
-    int op;
-
-    if (decode_tryfastdispatch(d, &ptr, msg, layout)) break;
-
-#if UPB_FASTTABLE
-  nofast:
-#endif
-
-#ifndef NDEBUG
-    d->debug_tagstart = ptr;
-#endif
-
-    UPB_ASSERT(ptr < d->limit_ptr);
-    ptr = decode_tag(d, ptr, &tag);
-    field_number = tag >> 3;
-    wire_type = tag & 7;
-
-#ifndef NDEBUG
-    d->debug_valstart = ptr;
-#endif
-
-    if (wire_type == kUpb_WireType_EndGroup) {
-      d->end_group = field_number;
-      return ptr;
-    }
-
-    field = decode_findfield(d, layout, field_number, &last_field_index);
-    ptr = decode_wireval(d, ptr, field, wire_type, &val, &op);
-
-    if (op >= 0) {
-      ptr = decode_known(d, ptr, msg, layout, field, op, &val);
-    } else {
-      switch (op) {
-        case OP_UNKNOWN:
-          ptr = decode_unknown(d, ptr, msg, field_number, wire_type, val);
-          break;
-        case OP_MSGSET_ITEM:
-          ptr = upb_Decoder_DecodeMessageSetItem(d, ptr, msg, layout);
-          break;
-      }
-    }
-  }
-
-  return UPB_UNLIKELY(layout && layout->required_count)
-             ? decode_checkrequired(d, ptr, msg, layout)
-             : ptr;
-}
-
-const char* fastdecode_generic(struct upb_Decoder* d, const char* ptr,
-                               upb_Message* msg, intptr_t table,
-                               uint64_t hasbits, uint64_t data) {
-  (void)data;
-  *(uint32_t*)msg |= hasbits;
-  return decode_msg(d, ptr, msg, decode_totablep(table));
-}
-
-static upb_DecodeStatus decode_top(struct upb_Decoder* d, const char* buf,
-                                   void* msg, const upb_MiniTable* l) {
-  if (!decode_tryfastdispatch(d, &buf, msg, l)) {
-    decode_msg(d, buf, msg, l);
-  }
-  if (d->end_group != DECODE_NOGROUP) return kUpb_DecodeStatus_Malformed;
-  if (d->missing_required) return kUpb_DecodeStatus_MissingRequired;
-  return kUpb_DecodeStatus_Ok;
-}
-
-upb_DecodeStatus upb_Decode(const char* buf, size_t size, void* msg,
-                            const upb_MiniTable* l,
-                            const upb_ExtensionRegistry* extreg, int options,
-                            upb_Arena* arena) {
-  upb_Decoder state;
-  unsigned depth = (unsigned)options >> 16;
-
-  if (size <= 16) {
-    memset(&state.patch, 0, 32);
-    if (size) memcpy(&state.patch, buf, size);
-    buf = state.patch;
-    state.end = buf + size;
-    state.limit = 0;
-    options &= ~kUpb_DecodeOption_AliasString;  // Can't alias patch buf.
-  } else {
-    state.end = buf + size - 16;
-    state.limit = 16;
-  }
-
-  state.extreg = extreg;
-  state.limit_ptr = state.end;
-  state.unknown = NULL;
-  state.depth = depth ? depth : 64;
-  state.end_group = DECODE_NOGROUP;
-  state.options = (uint16_t)options;
-  state.missing_required = false;
-  state.arena.head = arena->head;
-  state.arena.last_size = arena->last_size;
-  state.arena.cleanup_metadata = arena->cleanup_metadata;
-  state.arena.parent = arena;
-
-  upb_DecodeStatus status = UPB_SETJMP(state.err);
-  if (UPB_LIKELY(status == kUpb_DecodeStatus_Ok)) {
-    status = decode_top(&state, buf, msg, l);
-  }
-
-  arena->head.ptr = state.arena.head.ptr;
-  arena->head.end = state.arena.head.end;
-  arena->cleanup_metadata = state.arena.cleanup_metadata;
-  return status;
-}
-
-#undef OP_UNKNOWN
-#undef OP_SKIP
-#undef OP_SCALAR_LG2
-#undef OP_FIXPCK_LG2
-#undef OP_VARPCK_LG2
-#undef OP_STRING
-#undef OP_BYTES
-#undef OP_SUBMSG
-
-/** upb/encode.c ************************************************************/
-/* We encode backwards, to avoid pre-computing lengths (one-pass encode). */
-
-
-#include <setjmp.h>
-#include <string.h>
-
-
-/* Must be last. */
-
-#define UPB_PB_VARINT_MAX_LEN 10
-
-UPB_NOINLINE
-static size_t encode_varint64(uint64_t val, char* buf) {
-  size_t i = 0;
-  do {
-    uint8_t byte = val & 0x7fU;
-    val >>= 7;
-    if (val) byte |= 0x80U;
-    buf[i++] = byte;
-  } while (val);
-  return i;
-}
-
-static uint32_t encode_zz32(int32_t n) {
-  return ((uint32_t)n << 1) ^ (n >> 31);
-}
-static uint64_t encode_zz64(int64_t n) {
-  return ((uint64_t)n << 1) ^ (n >> 63);
-}
-
-typedef struct {
-  jmp_buf err;
-  upb_alloc* alloc;
-  char *buf, *ptr, *limit;
-  int options;
-  int depth;
-  _upb_mapsorter sorter;
-} upb_encstate;
-
-static size_t upb_roundup_pow2(size_t bytes) {
-  size_t ret = 128;
-  while (ret < bytes) {
-    ret *= 2;
-  }
-  return ret;
-}
-
-UPB_NORETURN static void encode_err(upb_encstate* e) { UPB_LONGJMP(e->err, 1); }
-
-UPB_NOINLINE
-static void encode_growbuffer(upb_encstate* e, size_t bytes) {
-  size_t old_size = e->limit - e->buf;
-  size_t new_size = upb_roundup_pow2(bytes + (e->limit - e->ptr));
-  char* new_buf = upb_realloc(e->alloc, e->buf, old_size, new_size);
-
-  if (!new_buf) encode_err(e);
-
-  /* We want previous data at the end, realloc() put it at the beginning. */
-  if (old_size > 0) {
-    memmove(new_buf + new_size - old_size, e->buf, old_size);
-  }
-
-  e->ptr = new_buf + new_size - (e->limit - e->ptr);
-  e->limit = new_buf + new_size;
-  e->buf = new_buf;
-
-  e->ptr -= bytes;
-}
-
-/* Call to ensure that at least "bytes" bytes are available for writing at
- * e->ptr.  Returns false if the bytes could not be allocated. */
-UPB_FORCEINLINE
-static void encode_reserve(upb_encstate* e, size_t bytes) {
-  if ((size_t)(e->ptr - e->buf) < bytes) {
-    encode_growbuffer(e, bytes);
-    return;
-  }
-
-  e->ptr -= bytes;
-}
-
-/* Writes the given bytes to the buffer, handling reserve/advance. */
-static void encode_bytes(upb_encstate* e, const void* data, size_t len) {
-  if (len == 0) return; /* memcpy() with zero size is UB */
-  encode_reserve(e, len);
-  memcpy(e->ptr, data, len);
-}
-
-static void encode_fixed64(upb_encstate* e, uint64_t val) {
-  val = _upb_BigEndian_Swap64(val);
-  encode_bytes(e, &val, sizeof(uint64_t));
-}
-
-static void encode_fixed32(upb_encstate* e, uint32_t val) {
-  val = _upb_BigEndian_Swap32(val);
-  encode_bytes(e, &val, sizeof(uint32_t));
-}
-
-UPB_NOINLINE
-static void encode_longvarint(upb_encstate* e, uint64_t val) {
-  size_t len;
-  char* start;
-
-  encode_reserve(e, UPB_PB_VARINT_MAX_LEN);
-  len = encode_varint64(val, e->ptr);
-  start = e->ptr + UPB_PB_VARINT_MAX_LEN - len;
-  memmove(start, e->ptr, len);
-  e->ptr = start;
-}
-
-UPB_FORCEINLINE
-static void encode_varint(upb_encstate* e, uint64_t val) {
-  if (val < 128 && e->ptr != e->buf) {
-    --e->ptr;
-    *e->ptr = val;
-  } else {
-    encode_longvarint(e, val);
-  }
-}
-
-static void encode_double(upb_encstate* e, double d) {
-  uint64_t u64;
-  UPB_ASSERT(sizeof(double) == sizeof(uint64_t));
-  memcpy(&u64, &d, sizeof(uint64_t));
-  encode_fixed64(e, u64);
-}
-
-static void encode_float(upb_encstate* e, float d) {
-  uint32_t u32;
-  UPB_ASSERT(sizeof(float) == sizeof(uint32_t));
-  memcpy(&u32, &d, sizeof(uint32_t));
-  encode_fixed32(e, u32);
-}
-
-static void encode_tag(upb_encstate* e, uint32_t field_number,
-                       uint8_t wire_type) {
-  encode_varint(e, (field_number << 3) | wire_type);
-}
-
-static void encode_fixedarray(upb_encstate* e, const upb_Array* arr,
-                              size_t elem_size, uint32_t tag) {
-  size_t bytes = arr->len * elem_size;
-  const char* data = _upb_array_constptr(arr);
-  const char* ptr = data + bytes - elem_size;
-
-  if (tag || !_upb_IsLittleEndian()) {
-    while (true) {
-      if (elem_size == 4) {
-        uint32_t val;
-        memcpy(&val, ptr, sizeof(val));
-        val = _upb_BigEndian_Swap32(val);
-        encode_bytes(e, &val, elem_size);
-      } else {
-        UPB_ASSERT(elem_size == 8);
-        uint64_t val;
-        memcpy(&val, ptr, sizeof(val));
-        val = _upb_BigEndian_Swap64(val);
-        encode_bytes(e, &val, elem_size);
-      }
-
-      if (tag) encode_varint(e, tag);
-      if (ptr == data) break;
-      ptr -= elem_size;
-    }
-  } else {
-    encode_bytes(e, data, bytes);
-  }
-}
-
-static void encode_message(upb_encstate* e, const upb_Message* msg,
-                           const upb_MiniTable* m, size_t* size);
-
-static void encode_scalar(upb_encstate* e, const void* _field_mem,
-                          const upb_MiniTable_Sub* subs,
-                          const upb_MiniTable_Field* f) {
-  const char* field_mem = _field_mem;
-  int wire_type;
-
-#define CASE(ctype, type, wtype, encodeval) \
-  {                                         \
-    ctype val = *(ctype*)field_mem;         \
-    encode_##type(e, encodeval);            \
-    wire_type = wtype;                      \
-    break;                                  \
-  }
-
-  switch (f->descriptortype) {
-    case kUpb_FieldType_Double:
-      CASE(double, double, kUpb_WireType_64Bit, val);
-    case kUpb_FieldType_Float:
-      CASE(float, float, kUpb_WireType_32Bit, val);
-    case kUpb_FieldType_Int64:
-    case kUpb_FieldType_UInt64:
-      CASE(uint64_t, varint, kUpb_WireType_Varint, val);
-    case kUpb_FieldType_UInt32:
-      CASE(uint32_t, varint, kUpb_WireType_Varint, val);
-    case kUpb_FieldType_Int32:
-    case kUpb_FieldType_Enum:
-      CASE(int32_t, varint, kUpb_WireType_Varint, (int64_t)val);
-    case kUpb_FieldType_SFixed64:
-    case kUpb_FieldType_Fixed64:
-      CASE(uint64_t, fixed64, kUpb_WireType_64Bit, val);
-    case kUpb_FieldType_Fixed32:
-    case kUpb_FieldType_SFixed32:
-      CASE(uint32_t, fixed32, kUpb_WireType_32Bit, val);
-    case kUpb_FieldType_Bool:
-      CASE(bool, varint, kUpb_WireType_Varint, val);
-    case kUpb_FieldType_SInt32:
-      CASE(int32_t, varint, kUpb_WireType_Varint, encode_zz32(val));
-    case kUpb_FieldType_SInt64:
-      CASE(int64_t, varint, kUpb_WireType_Varint, encode_zz64(val));
-    case kUpb_FieldType_String:
-    case kUpb_FieldType_Bytes: {
-      upb_StringView view = *(upb_StringView*)field_mem;
-      encode_bytes(e, view.data, view.size);
-      encode_varint(e, view.size);
-      wire_type = kUpb_WireType_Delimited;
-      break;
-    }
-    case kUpb_FieldType_Group: {
-      size_t size;
-      void* submsg = *(void**)field_mem;
-      const upb_MiniTable* subm = subs[f->submsg_index].submsg;
-      if (submsg == NULL) {
-        return;
-      }
-      if (--e->depth == 0) encode_err(e);
-      encode_tag(e, f->number, kUpb_WireType_EndGroup);
-      encode_message(e, submsg, subm, &size);
-      wire_type = kUpb_WireType_StartGroup;
-      e->depth++;
-      break;
-    }
-    case kUpb_FieldType_Message: {
-      size_t size;
-      void* submsg = *(void**)field_mem;
-      const upb_MiniTable* subm = subs[f->submsg_index].submsg;
-      if (submsg == NULL) {
-        return;
-      }
-      if (--e->depth == 0) encode_err(e);
-      encode_message(e, submsg, subm, &size);
-      encode_varint(e, size);
-      wire_type = kUpb_WireType_Delimited;
-      e->depth++;
-      break;
-    }
-    default:
-      UPB_UNREACHABLE();
-  }
-#undef CASE
-
-  encode_tag(e, f->number, wire_type);
-}
-
-static void encode_array(upb_encstate* e, const upb_Message* msg,
-                         const upb_MiniTable_Sub* subs,
-                         const upb_MiniTable_Field* f) {
-  const upb_Array* arr = *UPB_PTR_AT(msg, f->offset, upb_Array*);
-  bool packed = f->mode & kUpb_LabelFlags_IsPacked;
-  size_t pre_len = e->limit - e->ptr;
-
-  if (arr == NULL || arr->len == 0) {
-    return;
-  }
-
-#define VARINT_CASE(ctype, encode)                                       \
-  {                                                                      \
-    const ctype* start = _upb_array_constptr(arr);                       \
-    const ctype* ptr = start + arr->len;                                 \
-    uint32_t tag = packed ? 0 : (f->number << 3) | kUpb_WireType_Varint; \
-    do {                                                                 \
-      ptr--;                                                             \
-      encode_varint(e, encode);                                          \
-      if (tag) encode_varint(e, tag);                                    \
-    } while (ptr != start);                                              \
-  }                                                                      \
-  break;
-
-#define TAG(wire_type) (packed ? 0 : (f->number << 3 | wire_type))
-
-  switch (f->descriptortype) {
-    case kUpb_FieldType_Double:
-      encode_fixedarray(e, arr, sizeof(double), TAG(kUpb_WireType_64Bit));
-      break;
-    case kUpb_FieldType_Float:
-      encode_fixedarray(e, arr, sizeof(float), TAG(kUpb_WireType_32Bit));
-      break;
-    case kUpb_FieldType_SFixed64:
-    case kUpb_FieldType_Fixed64:
-      encode_fixedarray(e, arr, sizeof(uint64_t), TAG(kUpb_WireType_64Bit));
-      break;
-    case kUpb_FieldType_Fixed32:
-    case kUpb_FieldType_SFixed32:
-      encode_fixedarray(e, arr, sizeof(uint32_t), TAG(kUpb_WireType_32Bit));
-      break;
-    case kUpb_FieldType_Int64:
-    case kUpb_FieldType_UInt64:
-      VARINT_CASE(uint64_t, *ptr);
-    case kUpb_FieldType_UInt32:
-      VARINT_CASE(uint32_t, *ptr);
-    case kUpb_FieldType_Int32:
-    case kUpb_FieldType_Enum:
-      VARINT_CASE(int32_t, (int64_t)*ptr);
-    case kUpb_FieldType_Bool:
-      VARINT_CASE(bool, *ptr);
-    case kUpb_FieldType_SInt32:
-      VARINT_CASE(int32_t, encode_zz32(*ptr));
-    case kUpb_FieldType_SInt64:
-      VARINT_CASE(int64_t, encode_zz64(*ptr));
-    case kUpb_FieldType_String:
-    case kUpb_FieldType_Bytes: {
-      const upb_StringView* start = _upb_array_constptr(arr);
-      const upb_StringView* ptr = start + arr->len;
-      do {
-        ptr--;
-        encode_bytes(e, ptr->data, ptr->size);
-        encode_varint(e, ptr->size);
-        encode_tag(e, f->number, kUpb_WireType_Delimited);
-      } while (ptr != start);
-      return;
-    }
-    case kUpb_FieldType_Group: {
-      const void* const* start = _upb_array_constptr(arr);
-      const void* const* ptr = start + arr->len;
-      const upb_MiniTable* subm = subs[f->submsg_index].submsg;
-      if (--e->depth == 0) encode_err(e);
-      do {
-        size_t size;
-        ptr--;
-        encode_tag(e, f->number, kUpb_WireType_EndGroup);
-        encode_message(e, *ptr, subm, &size);
-        encode_tag(e, f->number, kUpb_WireType_StartGroup);
-      } while (ptr != start);
-      e->depth++;
-      return;
-    }
-    case kUpb_FieldType_Message: {
-      const void* const* start = _upb_array_constptr(arr);
-      const void* const* ptr = start + arr->len;
-      const upb_MiniTable* subm = subs[f->submsg_index].submsg;
-      if (--e->depth == 0) encode_err(e);
-      do {
-        size_t size;
-        ptr--;
-        encode_message(e, *ptr, subm, &size);
-        encode_varint(e, size);
-        encode_tag(e, f->number, kUpb_WireType_Delimited);
-      } while (ptr != start);
-      e->depth++;
-      return;
-    }
-  }
-#undef VARINT_CASE
-
-  if (packed) {
-    encode_varint(e, e->limit - e->ptr - pre_len);
-    encode_tag(e, f->number, kUpb_WireType_Delimited);
-  }
-}
-
-static void encode_mapentry(upb_encstate* e, uint32_t number,
-                            const upb_MiniTable* layout,
-                            const upb_MapEntry* ent) {
-  const upb_MiniTable_Field* key_field = &layout->fields[0];
-  const upb_MiniTable_Field* val_field = &layout->fields[1];
-  size_t pre_len = e->limit - e->ptr;
-  size_t size;
-  encode_scalar(e, &ent->v, layout->subs, val_field);
-  encode_scalar(e, &ent->k, layout->subs, key_field);
-  size = (e->limit - e->ptr) - pre_len;
-  encode_varint(e, size);
-  encode_tag(e, number, kUpb_WireType_Delimited);
-}
-
-static void encode_map(upb_encstate* e, const upb_Message* msg,
-                       const upb_MiniTable_Sub* subs,
-                       const upb_MiniTable_Field* f) {
-  const upb_Map* map = *UPB_PTR_AT(msg, f->offset, const upb_Map*);
-  const upb_MiniTable* layout = subs[f->submsg_index].submsg;
-  UPB_ASSERT(layout->field_count == 2);
-
-  if (map == NULL) return;
-
-  if (e->options & kUpb_Encode_Deterministic) {
-    _upb_sortedmap sorted;
-    _upb_mapsorter_pushmap(&e->sorter, layout->fields[0].descriptortype, map,
-                           &sorted);
-    upb_MapEntry ent;
-    while (_upb_sortedmap_next(&e->sorter, map, &sorted, &ent)) {
-      encode_mapentry(e, f->number, layout, &ent);
-    }
-    _upb_mapsorter_popmap(&e->sorter, &sorted);
-  } else {
-    upb_strtable_iter i;
-    upb_strtable_begin(&i, &map->table);
-    for (; !upb_strtable_done(&i); upb_strtable_next(&i)) {
-      upb_StringView key = upb_strtable_iter_key(&i);
-      const upb_value val = upb_strtable_iter_value(&i);
-      upb_MapEntry ent;
-      _upb_map_fromkey(key, &ent.k, map->key_size);
-      _upb_map_fromvalue(val, &ent.v, map->val_size);
-      encode_mapentry(e, f->number, layout, &ent);
-    }
-  }
-}
-
-static bool encode_shouldencode(upb_encstate* e, const upb_Message* msg,
-                                const upb_MiniTable_Sub* subs,
-                                const upb_MiniTable_Field* f) {
-  if (f->presence == 0) {
-    /* Proto3 presence or map/array. */
-    const void* mem = UPB_PTR_AT(msg, f->offset, void);
-    switch (f->mode >> kUpb_FieldRep_Shift) {
-      case kUpb_FieldRep_1Byte: {
-        char ch;
-        memcpy(&ch, mem, 1);
-        return ch != 0;
-      }
-#if UINTPTR_MAX == 0xffffffff
-      case kUpb_FieldRep_Pointer:
-#endif
-      case kUpb_FieldRep_4Byte: {
-        uint32_t u32;
-        memcpy(&u32, mem, 4);
-        return u32 != 0;
-      }
-#if UINTPTR_MAX != 0xffffffff
-      case kUpb_FieldRep_Pointer:
-#endif
-      case kUpb_FieldRep_8Byte: {
-        uint64_t u64;
-        memcpy(&u64, mem, 8);
-        return u64 != 0;
-      }
-      case kUpb_FieldRep_StringView: {
-        const upb_StringView* str = (const upb_StringView*)mem;
-        return str->size != 0;
-      }
-      default:
-        UPB_UNREACHABLE();
-    }
-  } else if (f->presence > 0) {
-    /* Proto2 presence: hasbit. */
-    return _upb_hasbit_field(msg, f);
-  } else {
-    /* Field is in a oneof. */
-    return _upb_getoneofcase_field(msg, f) == f->number;
-  }
-}
-
-static void encode_field(upb_encstate* e, const upb_Message* msg,
-                         const upb_MiniTable_Sub* subs,
-                         const upb_MiniTable_Field* field) {
-  switch (upb_FieldMode_Get(field)) {
-    case kUpb_FieldMode_Array:
-      encode_array(e, msg, subs, field);
-      break;
-    case kUpb_FieldMode_Map:
-      encode_map(e, msg, subs, field);
-      break;
-    case kUpb_FieldMode_Scalar:
-      encode_scalar(e, UPB_PTR_AT(msg, field->offset, void), subs, field);
-      break;
-    default:
-      UPB_UNREACHABLE();
-  }
-}
-
-/* message MessageSet {
- *   repeated group Item = 1 {
- *     required int32 type_id = 2;
- *     required string message = 3;
- *   }
- * } */
-static void encode_msgset_item(upb_encstate* e,
-                               const upb_Message_Extension* ext) {
-  size_t size;
-  encode_tag(e, 1, kUpb_WireType_EndGroup);
-  encode_message(e, ext->data.ptr, ext->ext->sub.submsg, &size);
-  encode_varint(e, size);
-  encode_tag(e, 3, kUpb_WireType_Delimited);
-  encode_varint(e, ext->ext->field.number);
-  encode_tag(e, 2, kUpb_WireType_Varint);
-  encode_tag(e, 1, kUpb_WireType_StartGroup);
-}
-
-static void encode_message(upb_encstate* e, const upb_Message* msg,
-                           const upb_MiniTable* m, size_t* size) {
-  size_t pre_len = e->limit - e->ptr;
-
-  if ((e->options & kUpb_Encode_CheckRequired) && m->required_count) {
-    uint64_t msg_head;
-    memcpy(&msg_head, msg, 8);
-    msg_head = _upb_BigEndian_Swap64(msg_head);
-    if (upb_MiniTable_requiredmask(m) & ~msg_head) {
-      encode_err(e);
-    }
-  }
-
-  if ((e->options & kUpb_Encode_SkipUnknown) == 0) {
-    size_t unknown_size;
-    const char* unknown = upb_Message_GetUnknown(msg, &unknown_size);
-
-    if (unknown) {
-      encode_bytes(e, unknown, unknown_size);
-    }
-  }
-
-  if (m->ext != kUpb_ExtMode_NonExtendable) {
-    /* Encode all extensions together. Unlike C++, we do not attempt to keep
-     * these in field number order relative to normal fields or even to each
-     * other. */
-    size_t ext_count;
-    const upb_Message_Extension* ext = _upb_Message_Getexts(msg, &ext_count);
-    if (ext_count) {
-      const upb_Message_Extension* end = ext + ext_count;
-      for (; ext != end; ext++) {
-        if (UPB_UNLIKELY(m->ext == kUpb_ExtMode_IsMessageSet)) {
-          encode_msgset_item(e, ext);
-        } else {
-          encode_field(e, &ext->data, &ext->ext->sub, &ext->ext->field);
-        }
-      }
-    }
-  }
-
-  if (m->field_count) {
-    const upb_MiniTable_Field* f = &m->fields[m->field_count];
-    const upb_MiniTable_Field* first = &m->fields[0];
-    while (f != first) {
-      f--;
-      if (encode_shouldencode(e, msg, m->subs, f)) {
-        encode_field(e, msg, m->subs, f);
-      }
-    }
-  }
-
-  *size = (e->limit - e->ptr) - pre_len;
-}
-
-char* upb_Encode(const void* msg, const upb_MiniTable* l, int options,
-                 upb_Arena* arena, size_t* size) {
-  upb_encstate e;
-  unsigned depth = (unsigned)options >> 16;
-
-  e.alloc = upb_Arena_Alloc(arena);
-  e.buf = NULL;
-  e.limit = NULL;
-  e.ptr = NULL;
-  e.depth = depth ? depth : 64;
-  e.options = options;
-  _upb_mapsorter_init(&e.sorter);
-  char* ret = NULL;
-
-  if (UPB_SETJMP(e.err)) {
-    *size = 0;
-    ret = NULL;
-  } else {
-    encode_message(&e, msg, l, size);
-    *size = e.limit - e.ptr;
-    if (*size == 0) {
-      static char ch;
-      ret = &ch;
-    } else {
-      UPB_ASSERT(e.ptr);
-      ret = e.ptr;
-    }
-  }
-
-  _upb_mapsorter_destroy(&e.sorter);
-  return ret;
-}
-
-/** upb/msg.c ************************************************************/
-
-
-/** upb_Message ***************************************************************/
-
-static const size_t overhead = sizeof(upb_Message_InternalData);
-
-static const upb_Message_Internal* upb_Message_Getinternal_const(
-    const upb_Message* msg) {
-  ptrdiff_t size = sizeof(upb_Message_Internal);
-  return (upb_Message_Internal*)((char*)msg - size);
-}
-
-upb_Message* _upb_Message_New(const upb_MiniTable* l, upb_Arena* a) {
-  return _upb_Message_New_inl(l, a);
-}
-
-void _upb_Message_Clear(upb_Message* msg, const upb_MiniTable* l) {
-  void* mem = UPB_PTR_AT(msg, -sizeof(upb_Message_Internal), char);
-  memset(mem, 0, upb_msg_sizeof(l));
-}
-
-static bool realloc_internal(upb_Message* msg, size_t need, upb_Arena* arena) {
-  upb_Message_Internal* in = upb_Message_Getinternal(msg);
-  if (!in->internal) {
-    /* No internal data, allocate from scratch. */
-    size_t size = UPB_MAX(128, _upb_Log2CeilingSize(need + overhead));
-    upb_Message_InternalData* internal = upb_Arena_Malloc(arena, size);
-    if (!internal) return false;
-    internal->size = size;
-    internal->unknown_end = overhead;
-    internal->ext_begin = size;
-    in->internal = internal;
-  } else if (in->internal->ext_begin - in->internal->unknown_end < need) {
-    /* Internal data is too small, reallocate. */
-    size_t new_size = _upb_Log2CeilingSize(in->internal->size + need);
-    size_t ext_bytes = in->internal->size - in->internal->ext_begin;
-    size_t new_ext_begin = new_size - ext_bytes;
-    upb_Message_InternalData* internal =
-        upb_Arena_Realloc(arena, in->internal, in->internal->size, new_size);
-    if (!internal) return false;
-    if (ext_bytes) {
-      /* Need to move extension data to the end. */
-      char* ptr = (char*)internal;
-      memmove(ptr + new_ext_begin, ptr + internal->ext_begin, ext_bytes);
-    }
-    internal->ext_begin = new_ext_begin;
-    internal->size = new_size;
-    in->internal = internal;
-  }
-  UPB_ASSERT(in->internal->ext_begin - in->internal->unknown_end >= need);
-  return true;
-}
-
-bool _upb_Message_AddUnknown(upb_Message* msg, const char* data, size_t len,
-                             upb_Arena* arena) {
-  if (!realloc_internal(msg, len, arena)) return false;
-  upb_Message_Internal* in = upb_Message_Getinternal(msg);
-  memcpy(UPB_PTR_AT(in->internal, in->internal->unknown_end, char), data, len);
-  in->internal->unknown_end += len;
-  return true;
-}
-
-void _upb_Message_DiscardUnknown_shallow(upb_Message* msg) {
-  upb_Message_Internal* in = upb_Message_Getinternal(msg);
-  if (in->internal) {
-    in->internal->unknown_end = overhead;
-  }
-}
-
-const char* upb_Message_GetUnknown(const upb_Message* msg, size_t* len) {
-  const upb_Message_Internal* in = upb_Message_Getinternal_const(msg);
-  if (in->internal) {
-    *len = in->internal->unknown_end - overhead;
-    return (char*)(in->internal + 1);
-  } else {
-    *len = 0;
-    return NULL;
-  }
-}
-
-const upb_Message_Extension* _upb_Message_Getexts(const upb_Message* msg,
-                                                  size_t* count) {
-  const upb_Message_Internal* in = upb_Message_Getinternal_const(msg);
-  if (in->internal) {
-    *count = (in->internal->size - in->internal->ext_begin) /
-             sizeof(upb_Message_Extension);
-    return UPB_PTR_AT(in->internal, in->internal->ext_begin, void);
-  } else {
-    *count = 0;
-    return NULL;
-  }
-}
-
-const upb_Message_Extension* _upb_Message_Getext(
-    const upb_Message* msg, const upb_MiniTable_Extension* e) {
-  size_t n;
-  const upb_Message_Extension* ext = _upb_Message_Getexts(msg, &n);
-
-  /* For now we use linear search exclusively to find extensions. If this
-   * becomes an issue due to messages with lots of extensions, we can introduce
-   * a table of some sort. */
-  for (size_t i = 0; i < n; i++) {
-    if (ext[i].ext == e) {
-      return &ext[i];
-    }
-  }
-
-  return NULL;
-}
-
-void _upb_Message_Clearext(upb_Message* msg,
-                           const upb_MiniTable_Extension* ext_l) {
-  upb_Message_Internal* in = upb_Message_Getinternal(msg);
-  if (!in->internal) return;
-  const upb_Message_Extension* base =
-      UPB_PTR_AT(in->internal, in->internal->ext_begin, void);
-  upb_Message_Extension* ext =
-      (upb_Message_Extension*)_upb_Message_Getext(msg, ext_l);
-  if (ext) {
-    *ext = *base;
-    in->internal->ext_begin += sizeof(upb_Message_Extension);
-  }
-}
-
-upb_Message_Extension* _upb_Message_GetOrCreateExtension(
-    upb_Message* msg, const upb_MiniTable_Extension* e, upb_Arena* arena) {
-  upb_Message_Extension* ext =
-      (upb_Message_Extension*)_upb_Message_Getext(msg, e);
-  if (ext) return ext;
-  if (!realloc_internal(msg, sizeof(upb_Message_Extension), arena)) return NULL;
-  upb_Message_Internal* in = upb_Message_Getinternal(msg);
-  in->internal->ext_begin -= sizeof(upb_Message_Extension);
-  ext = UPB_PTR_AT(in->internal, in->internal->ext_begin, void);
-  memset(ext, 0, sizeof(upb_Message_Extension));
-  ext->ext = e;
-  return ext;
-}
-
-size_t upb_Message_ExtensionCount(const upb_Message* msg) {
-  size_t count;
-  _upb_Message_Getexts(msg, &count);
-  return count;
-}
-
-/** upb_Array *****************************************************************/
-
-bool _upb_array_realloc(upb_Array* arr, size_t min_size, upb_Arena* arena) {
-  size_t new_size = UPB_MAX(arr->size, 4);
-  int elem_size_lg2 = arr->data & 7;
-  size_t old_bytes = arr->size << elem_size_lg2;
-  size_t new_bytes;
-  void* ptr = _upb_array_ptr(arr);
-
-  /* Log2 ceiling of size. */
-  while (new_size < min_size) new_size *= 2;
-
-  new_bytes = new_size << elem_size_lg2;
-  ptr = upb_Arena_Realloc(arena, ptr, old_bytes, new_bytes);
-
-  if (!ptr) {
-    return false;
-  }
-
-  arr->data = _upb_tag_arrptr(ptr, elem_size_lg2);
-  arr->size = new_size;
-  return true;
-}
-
-static upb_Array* getorcreate_array(upb_Array** arr_ptr, int elem_size_lg2,
-                                    upb_Arena* arena) {
-  upb_Array* arr = *arr_ptr;
-  if (!arr) {
-    arr = _upb_Array_New(arena, 4, elem_size_lg2);
-    if (!arr) return NULL;
-    *arr_ptr = arr;
-  }
-  return arr;
-}
-
-void* _upb_Array_Resize_fallback(upb_Array** arr_ptr, size_t size,
-                                 int elem_size_lg2, upb_Arena* arena) {
-  upb_Array* arr = getorcreate_array(arr_ptr, elem_size_lg2, arena);
-  return arr && _upb_Array_Resize(arr, size, arena) ? _upb_array_ptr(arr)
-                                                    : NULL;
-}
-
-bool _upb_Array_Append_fallback(upb_Array** arr_ptr, const void* value,
-                                int elem_size_lg2, upb_Arena* arena) {
-  upb_Array* arr = getorcreate_array(arr_ptr, elem_size_lg2, arena);
-  if (!arr) return false;
-
-  size_t elems = arr->len;
-
-  if (!_upb_Array_Resize(arr, elems + 1, arena)) {
-    return false;
-  }
-
-  char* data = _upb_array_ptr(arr);
-  memcpy(data + (elems << elem_size_lg2), value, 1 << elem_size_lg2);
-  return true;
-}
-
-/** upb_Map *******************************************************************/
-
-upb_Map* _upb_Map_New(upb_Arena* a, size_t key_size, size_t value_size) {
-  upb_Map* map = upb_Arena_Malloc(a, sizeof(upb_Map));
-
-  if (!map) {
-    return NULL;
-  }
-
-  upb_strtable_init(&map->table, 4, a);
-  map->key_size = key_size;
-  map->val_size = value_size;
-
-  return map;
-}
-
-static void _upb_mapsorter_getkeys(const void* _a, const void* _b, void* a_key,
-                                   void* b_key, size_t size) {
-  const upb_tabent* const* a = _a;
-  const upb_tabent* const* b = _b;
-  upb_StringView a_tabkey = upb_tabstrview((*a)->key);
-  upb_StringView b_tabkey = upb_tabstrview((*b)->key);
-  _upb_map_fromkey(a_tabkey, a_key, size);
-  _upb_map_fromkey(b_tabkey, b_key, size);
-}
-
-#define UPB_COMPARE_INTEGERS(a, b) ((a) < (b) ? -1 : ((a) == (b) ? 0 : 1))
-
-static int _upb_mapsorter_cmpi64(const void* _a, const void* _b) {
-  int64_t a, b;
-  _upb_mapsorter_getkeys(_a, _b, &a, &b, 8);
-  return UPB_COMPARE_INTEGERS(a, b);
-}
-
-static int _upb_mapsorter_cmpu64(const void* _a, const void* _b) {
-  uint64_t a, b;
-  _upb_mapsorter_getkeys(_a, _b, &a, &b, 8);
-  return UPB_COMPARE_INTEGERS(a, b);
-}
-
-static int _upb_mapsorter_cmpi32(const void* _a, const void* _b) {
-  int32_t a, b;
-  _upb_mapsorter_getkeys(_a, _b, &a, &b, 4);
-  return UPB_COMPARE_INTEGERS(a, b);
-}
-
-static int _upb_mapsorter_cmpu32(const void* _a, const void* _b) {
-  uint32_t a, b;
-  _upb_mapsorter_getkeys(_a, _b, &a, &b, 4);
-  return UPB_COMPARE_INTEGERS(a, b);
-}
-
-static int _upb_mapsorter_cmpbool(const void* _a, const void* _b) {
-  bool a, b;
-  _upb_mapsorter_getkeys(_a, _b, &a, &b, 1);
-  return UPB_COMPARE_INTEGERS(a, b);
-}
-
-static int _upb_mapsorter_cmpstr(const void* _a, const void* _b) {
-  upb_StringView a, b;
-  _upb_mapsorter_getkeys(_a, _b, &a, &b, UPB_MAPTYPE_STRING);
-  size_t common_size = UPB_MIN(a.size, b.size);
-  int cmp = memcmp(a.data, b.data, common_size);
-  if (cmp) return -cmp;
-  return UPB_COMPARE_INTEGERS(a.size, b.size);
-}
-
-#undef UPB_COMPARE_INTEGERS
-
-bool _upb_mapsorter_pushmap(_upb_mapsorter* s, upb_FieldType key_type,
-                            const upb_Map* map, _upb_sortedmap* sorted) {
-  int map_size = _upb_Map_Size(map);
-  sorted->start = s->size;
-  sorted->pos = sorted->start;
-  sorted->end = sorted->start + map_size;
-
-  /* Grow s->entries if necessary. */
-  if (sorted->end > s->cap) {
-    s->cap = _upb_Log2CeilingSize(sorted->end);
-    s->entries = realloc(s->entries, s->cap * sizeof(*s->entries));
-    if (!s->entries) return false;
-  }
-
-  s->size = sorted->end;
-
-  /* Copy non-empty entries from the table to s->entries. */
-  upb_tabent const** dst = &s->entries[sorted->start];
-  const upb_tabent* src = map->table.t.entries;
-  const upb_tabent* end = src + upb_table_size(&map->table.t);
-  for (; src < end; src++) {
-    if (!upb_tabent_isempty(src)) {
-      *dst = src;
-      dst++;
-    }
-  }
-  UPB_ASSERT(dst == &s->entries[sorted->end]);
-
-  /* Sort entries according to the key type. */
-
-  int (*compar)(const void*, const void*);
-
-  switch (key_type) {
-    case kUpb_FieldType_Int64:
-    case kUpb_FieldType_SFixed64:
-    case kUpb_FieldType_SInt64:
-      compar = _upb_mapsorter_cmpi64;
-      break;
-    case kUpb_FieldType_UInt64:
-    case kUpb_FieldType_Fixed64:
-      compar = _upb_mapsorter_cmpu64;
-      break;
-    case kUpb_FieldType_Int32:
-    case kUpb_FieldType_SInt32:
-    case kUpb_FieldType_SFixed32:
-    case kUpb_FieldType_Enum:
-      compar = _upb_mapsorter_cmpi32;
-      break;
-    case kUpb_FieldType_UInt32:
-    case kUpb_FieldType_Fixed32:
-      compar = _upb_mapsorter_cmpu32;
-      break;
-    case kUpb_FieldType_Bool:
-      compar = _upb_mapsorter_cmpbool;
-      break;
-    case kUpb_FieldType_String:
-    case kUpb_FieldType_Bytes:
-      compar = _upb_mapsorter_cmpstr;
-      break;
-    default:
-      UPB_UNREACHABLE();
-  }
-
-  qsort(&s->entries[sorted->start], map_size, sizeof(*s->entries), compar);
-  return true;
-}
-
-/** upb_ExtensionRegistry *****************************************************/
-
-struct upb_ExtensionRegistry {
-  upb_Arena* arena;
-  upb_strtable exts; /* Key is upb_MiniTable* concatenated with fieldnum. */
-};
-
-#define EXTREG_KEY_SIZE (sizeof(upb_MiniTable*) + sizeof(uint32_t))
-
-static void extreg_key(char* buf, const upb_MiniTable* l, uint32_t fieldnum) {
-  memcpy(buf, &l, sizeof(l));
-  memcpy(buf + sizeof(l), &fieldnum, sizeof(fieldnum));
-}
-
-upb_ExtensionRegistry* upb_ExtensionRegistry_New(upb_Arena* arena) {
-  upb_ExtensionRegistry* r = upb_Arena_Malloc(arena, sizeof(*r));
-  if (!r) return NULL;
-  r->arena = arena;
-  if (!upb_strtable_init(&r->exts, 8, arena)) return NULL;
-  return r;
-}
-
-bool _upb_extreg_add(upb_ExtensionRegistry* r,
-                     const upb_MiniTable_Extension** e, size_t count) {
-  char buf[EXTREG_KEY_SIZE];
-  const upb_MiniTable_Extension** start = e;
-  const upb_MiniTable_Extension** end = UPB_PTRADD(e, count);
-  for (; e < end; e++) {
-    const upb_MiniTable_Extension* ext = *e;
-    extreg_key(buf, ext->extendee, ext->field.number);
-    upb_value v;
-    if (upb_strtable_lookup2(&r->exts, buf, EXTREG_KEY_SIZE, &v)) {
-      goto failure;
-    }
-    if (!upb_strtable_insert(&r->exts, buf, EXTREG_KEY_SIZE,
-                             upb_value_constptr(ext), r->arena)) {
-      goto failure;
-    }
-  }
-  return true;
-
-failure:
-  /* Back out the entries previously added. */
-  for (end = e, e = start; e < end; e++) {
-    const upb_MiniTable_Extension* ext = *e;
-    extreg_key(buf, ext->extendee, ext->field.number);
-    upb_strtable_remove2(&r->exts, buf, EXTREG_KEY_SIZE, NULL);
-  }
-  return false;
-}
-
-const upb_MiniTable_Extension* _upb_extreg_get(const upb_ExtensionRegistry* r,
-                                               const upb_MiniTable* l,
-                                               uint32_t num) {
-  char buf[EXTREG_KEY_SIZE];
-  upb_value v;
-  extreg_key(buf, l, num);
-  if (upb_strtable_lookup2(&r->exts, buf, EXTREG_KEY_SIZE, &v)) {
-    return upb_value_getconstptr(v);
-  } else {
-    return NULL;
-  }
-}
-
-/** upb/table.c ************************************************************/
-/*
- * upb_table Implementation
- *
- * Implementation is heavily inspired by Lua's ltable.c.
- */
-
-#include <string.h>
-
-
-/* Must be last. */
-
-#define UPB_MAXARRSIZE 16 /* 64k. */
-
-/* From Chromium. */
-#define ARRAY_SIZE(x) \
-  ((sizeof(x) / sizeof(0 [x])) / ((size_t)(!(sizeof(x) % sizeof(0 [x])))))
-
-static const double MAX_LOAD = 0.85;
-
-/* The minimum utilization of the array part of a mixed hash/array table.  This
- * is a speed/memory-usage tradeoff (though it's not straightforward because of
- * cache effects).  The lower this is, the more memory we'll use. */
-static const double MIN_DENSITY = 0.1;
-
-static bool is_pow2(uint64_t v) { return v == 0 || (v & (v - 1)) == 0; }
-
-static upb_value _upb_value_val(uint64_t val) {
-  upb_value ret;
-  _upb_value_setval(&ret, val);
-  return ret;
-}
-
-static int log2ceil(uint64_t v) {
-  int ret = 0;
-  bool pow2 = is_pow2(v);
-  while (v >>= 1) ret++;
-  ret = pow2 ? ret : ret + 1; /* Ceiling. */
-  return UPB_MIN(UPB_MAXARRSIZE, ret);
-}
-
-char* upb_strdup2(const char* s, size_t len, upb_Arena* a) {
-  size_t n;
-  char* p;
-
-  /* Prevent overflow errors. */
-  if (len == SIZE_MAX) return NULL;
-  /* Always null-terminate, even if binary data; but don't rely on the input to
-   * have a null-terminating byte since it may be a raw binary buffer. */
-  n = len + 1;
-  p = upb_Arena_Malloc(a, n);
-  if (p) {
-    memcpy(p, s, len);
-    p[len] = 0;
-  }
-  return p;
-}
-
-/* A type to represent the lookup key of either a strtable or an inttable. */
-typedef union {
-  uintptr_t num;
-  struct {
-    const char* str;
-    size_t len;
-  } str;
-} lookupkey_t;
-
-static lookupkey_t strkey2(const char* str, size_t len) {
-  lookupkey_t k;
-  k.str.str = str;
-  k.str.len = len;
-  return k;
-}
-
-static lookupkey_t intkey(uintptr_t key) {
-  lookupkey_t k;
-  k.num = key;
-  return k;
-}
-
-typedef uint32_t hashfunc_t(upb_tabkey key);
-typedef bool eqlfunc_t(upb_tabkey k1, lookupkey_t k2);
-
-/* Base table (shared code) ***************************************************/
-
-static uint32_t upb_inthash(uintptr_t key) { return (uint32_t)key; }
-
-static const upb_tabent* upb_getentry(const upb_table* t, uint32_t hash) {
-  return t->entries + (hash & t->mask);
-}
-
-static bool upb_arrhas(upb_tabval key) { return key.val != (uint64_t)-1; }
-
-static bool isfull(upb_table* t) { return t->count == t->max_count; }
-
-static bool init(upb_table* t, uint8_t size_lg2, upb_Arena* a) {
-  size_t bytes;
-
-  t->count = 0;
-  t->size_lg2 = size_lg2;
-  t->mask = upb_table_size(t) ? upb_table_size(t) - 1 : 0;
-  t->max_count = upb_table_size(t) * MAX_LOAD;
-  bytes = upb_table_size(t) * sizeof(upb_tabent);
-  if (bytes > 0) {
-    t->entries = upb_Arena_Malloc(a, bytes);
-    if (!t->entries) return false;
-    memset(t->entries, 0, bytes);
-  } else {
-    t->entries = NULL;
-  }
-  return true;
-}
-
-static upb_tabent* emptyent(upb_table* t, upb_tabent* e) {
-  upb_tabent* begin = t->entries;
-  upb_tabent* end = begin + upb_table_size(t);
-  for (e = e + 1; e < end; e++) {
-    if (upb_tabent_isempty(e)) return e;
-  }
-  for (e = begin; e < end; e++) {
-    if (upb_tabent_isempty(e)) return e;
-  }
-  UPB_ASSERT(false);
-  return NULL;
-}
-
-static upb_tabent* getentry_mutable(upb_table* t, uint32_t hash) {
-  return (upb_tabent*)upb_getentry(t, hash);
-}
-
-static const upb_tabent* findentry(const upb_table* t, lookupkey_t key,
-                                   uint32_t hash, eqlfunc_t* eql) {
-  const upb_tabent* e;
-
-  if (t->size_lg2 == 0) return NULL;
-  e = upb_getentry(t, hash);
-  if (upb_tabent_isempty(e)) return NULL;
-  while (1) {
-    if (eql(e->key, key)) return e;
-    if ((e = e->next) == NULL) return NULL;
-  }
-}
-
-static upb_tabent* findentry_mutable(upb_table* t, lookupkey_t key,
-                                     uint32_t hash, eqlfunc_t* eql) {
-  return (upb_tabent*)findentry(t, key, hash, eql);
-}
-
-static bool lookup(const upb_table* t, lookupkey_t key, upb_value* v,
-                   uint32_t hash, eqlfunc_t* eql) {
-  const upb_tabent* e = findentry(t, key, hash, eql);
-  if (e) {
-    if (v) {
-      _upb_value_setval(v, e->val.val);
-    }
-    return true;
-  } else {
-    return false;
-  }
-}
-
-/* The given key must not already exist in the table. */
-static void insert(upb_table* t, lookupkey_t key, upb_tabkey tabkey,
-                   upb_value val, uint32_t hash, hashfunc_t* hashfunc,
-                   eqlfunc_t* eql) {
-  upb_tabent* mainpos_e;
-  upb_tabent* our_e;
-
-  UPB_ASSERT(findentry(t, key, hash, eql) == NULL);
-
-  t->count++;
-  mainpos_e = getentry_mutable(t, hash);
-  our_e = mainpos_e;
-
-  if (upb_tabent_isempty(mainpos_e)) {
-    /* Our main position is empty; use it. */
-    our_e->next = NULL;
-  } else {
-    /* Collision. */
-    upb_tabent* new_e = emptyent(t, mainpos_e);
-    /* Head of collider's chain. */
-    upb_tabent* chain = getentry_mutable(t, hashfunc(mainpos_e->key));
-    if (chain == mainpos_e) {
-      /* Existing ent is in its main position (it has the same hash as us, and
-       * is the head of our chain).  Insert to new ent and append to this chain.
-       */
-      new_e->next = mainpos_e->next;
-      mainpos_e->next = new_e;
-      our_e = new_e;
-    } else {
-      /* Existing ent is not in its main position (it is a node in some other
-       * chain).  This implies that no existing ent in the table has our hash.
-       * Evict it (updating its chain) and use its ent for head of our chain. */
-      *new_e = *mainpos_e; /* copies next. */
-      while (chain->next != mainpos_e) {
-        chain = (upb_tabent*)chain->next;
-        UPB_ASSERT(chain);
-      }
-      chain->next = new_e;
-      our_e = mainpos_e;
-      our_e->next = NULL;
-    }
-  }
-  our_e->key = tabkey;
-  our_e->val.val = val.val;
-  UPB_ASSERT(findentry(t, key, hash, eql) == our_e);
-}
-
-static bool rm(upb_table* t, lookupkey_t key, upb_value* val,
-               upb_tabkey* removed, uint32_t hash, eqlfunc_t* eql) {
-  upb_tabent* chain = getentry_mutable(t, hash);
-  if (upb_tabent_isempty(chain)) return false;
-  if (eql(chain->key, key)) {
-    /* Element to remove is at the head of its chain. */
-    t->count--;
-    if (val) _upb_value_setval(val, chain->val.val);
-    if (removed) *removed = chain->key;
-    if (chain->next) {
-      upb_tabent* move = (upb_tabent*)chain->next;
-      *chain = *move;
-      move->key = 0; /* Make the slot empty. */
-    } else {
-      chain->key = 0; /* Make the slot empty. */
-    }
-    return true;
-  } else {
-    /* Element to remove is either in a non-head position or not in the
-     * table. */
-    while (chain->next && !eql(chain->next->key, key)) {
-      chain = (upb_tabent*)chain->next;
-    }
-    if (chain->next) {
-      /* Found element to remove. */
-      upb_tabent* rm = (upb_tabent*)chain->next;
-      t->count--;
-      if (val) _upb_value_setval(val, chain->next->val.val);
-      if (removed) *removed = rm->key;
-      rm->key = 0; /* Make the slot empty. */
-      chain->next = rm->next;
-      return true;
-    } else {
-      /* Element to remove is not in the table. */
-      return false;
-    }
-  }
-}
-
-static size_t next(const upb_table* t, size_t i) {
-  do {
-    if (++i >= upb_table_size(t)) return SIZE_MAX - 1; /* Distinct from -1. */
-  } while (upb_tabent_isempty(&t->entries[i]));
-
-  return i;
-}
-
-static size_t begin(const upb_table* t) { return next(t, -1); }
-
-/* upb_strtable ***************************************************************/
-
-/* A simple "subclass" of upb_table that only adds a hash function for strings.
- */
-
-static upb_tabkey strcopy(lookupkey_t k2, upb_Arena* a) {
-  uint32_t len = (uint32_t)k2.str.len;
-  char* str = upb_Arena_Malloc(a, k2.str.len + sizeof(uint32_t) + 1);
-  if (str == NULL) return 0;
-  memcpy(str, &len, sizeof(uint32_t));
-  if (k2.str.len) memcpy(str + sizeof(uint32_t), k2.str.str, k2.str.len);
-  str[sizeof(uint32_t) + k2.str.len] = '\0';
-  return (uintptr_t)str;
-}
-
-/* Adapted from ABSL's wyhash. */
-
-static uint64_t UnalignedLoad64(const void* p) {
-  uint64_t val;
-  memcpy(&val, p, 8);
-  return val;
-}
-
-static uint32_t UnalignedLoad32(const void* p) {
-  uint32_t val;
-  memcpy(&val, p, 4);
-  return val;
-}
-
-#if defined(_MSC_VER) && defined(_M_X64)
-#include <intrin.h>
-#endif
-
-/* Computes a * b, returning the low 64 bits of the result and storing the high
- * 64 bits in |*high|. */
-static uint64_t upb_umul128(uint64_t v0, uint64_t v1, uint64_t* out_high) {
-#ifdef __SIZEOF_INT128__
-  __uint128_t p = v0;
-  p *= v1;
-  *out_high = (uint64_t)(p >> 64);
-  return (uint64_t)p;
-#elif defined(_MSC_VER) && defined(_M_X64)
-  return _umul128(v0, v1, out_high);
-#else
-  uint64_t a32 = v0 >> 32;
-  uint64_t a00 = v0 & 0xffffffff;
-  uint64_t b32 = v1 >> 32;
-  uint64_t b00 = v1 & 0xffffffff;
-  uint64_t high = a32 * b32;
-  uint64_t low = a00 * b00;
-  uint64_t mid1 = a32 * b00;
-  uint64_t mid2 = a00 * b32;
-  low += (mid1 << 32) + (mid2 << 32);
-  // Omit carry bit, for mixing we do not care about exact numerical precision.
-  high += (mid1 >> 32) + (mid2 >> 32);
-  *out_high = high;
-  return low;
-#endif
-}
-
-static uint64_t WyhashMix(uint64_t v0, uint64_t v1) {
-  uint64_t high;
-  uint64_t low = upb_umul128(v0, v1, &high);
-  return low ^ high;
-}
-
-static uint64_t Wyhash(const void* data, size_t len, uint64_t seed,
-                       const uint64_t salt[]) {
-  const uint8_t* ptr = (const uint8_t*)data;
-  uint64_t starting_length = (uint64_t)len;
-  uint64_t current_state = seed ^ salt[0];
-
-  if (len > 64) {
-    // If we have more than 64 bytes, we're going to handle chunks of 64
-    // bytes at a time. We're going to build up two separate hash states
-    // which we will then hash together.
-    uint64_t duplicated_state = current_state;
-
-    do {
-      uint64_t a = UnalignedLoad64(ptr);
-      uint64_t b = UnalignedLoad64(ptr + 8);
-      uint64_t c = UnalignedLoad64(ptr + 16);
-      uint64_t d = UnalignedLoad64(ptr + 24);
-      uint64_t e = UnalignedLoad64(ptr + 32);
-      uint64_t f = UnalignedLoad64(ptr + 40);
-      uint64_t g = UnalignedLoad64(ptr + 48);
-      uint64_t h = UnalignedLoad64(ptr + 56);
-
-      uint64_t cs0 = WyhashMix(a ^ salt[1], b ^ current_state);
-      uint64_t cs1 = WyhashMix(c ^ salt[2], d ^ current_state);
-      current_state = (cs0 ^ cs1);
-
-      uint64_t ds0 = WyhashMix(e ^ salt[3], f ^ duplicated_state);
-      uint64_t ds1 = WyhashMix(g ^ salt[4], h ^ duplicated_state);
-      duplicated_state = (ds0 ^ ds1);
-
-      ptr += 64;
-      len -= 64;
-    } while (len > 64);
-
-    current_state = current_state ^ duplicated_state;
-  }
-
-  // We now have a data `ptr` with at most 64 bytes and the current state
-  // of the hashing state machine stored in current_state.
-  while (len > 16) {
-    uint64_t a = UnalignedLoad64(ptr);
-    uint64_t b = UnalignedLoad64(ptr + 8);
-
-    current_state = WyhashMix(a ^ salt[1], b ^ current_state);
-
-    ptr += 16;
-    len -= 16;
-  }
-
-  // We now have a data `ptr` with at most 16 bytes.
-  uint64_t a = 0;
-  uint64_t b = 0;
-  if (len > 8) {
-    // When we have at least 9 and at most 16 bytes, set A to the first 64
-    // bits of the input and B to the last 64 bits of the input. Yes, they will
-    // overlap in the middle if we are working with less than the full 16
-    // bytes.
-    a = UnalignedLoad64(ptr);
-    b = UnalignedLoad64(ptr + len - 8);
-  } else if (len > 3) {
-    // If we have at least 4 and at most 8 bytes, set A to the first 32
-    // bits and B to the last 32 bits.
-    a = UnalignedLoad32(ptr);
-    b = UnalignedLoad32(ptr + len - 4);
-  } else if (len > 0) {
-    // If we have at least 1 and at most 3 bytes, read all of the provided
-    // bits into A, with some adjustments.
-    a = ((ptr[0] << 16) | (ptr[len >> 1] << 8) | ptr[len - 1]);
-    b = 0;
-  } else {
-    a = 0;
-    b = 0;
-  }
-
-  uint64_t w = WyhashMix(a ^ salt[1], b ^ current_state);
-  uint64_t z = salt[1] ^ starting_length;
-  return WyhashMix(w, z);
-}
-
-const uint64_t kWyhashSalt[5] = {
-    0x243F6A8885A308D3ULL, 0x13198A2E03707344ULL, 0xA4093822299F31D0ULL,
-    0x082EFA98EC4E6C89ULL, 0x452821E638D01377ULL,
-};
-
-uint32_t _upb_Hash(const void* p, size_t n, uint64_t seed) {
-  return Wyhash(p, n, seed, kWyhashSalt);
-}
-
-static uint32_t _upb_Hash_NoSeed(const char* p, size_t n) {
-  return _upb_Hash(p, n, 0);
-}
-
-static uint32_t strhash(upb_tabkey key) {
-  uint32_t len;
-  char* str = upb_tabstr(key, &len);
-  return _upb_Hash_NoSeed(str, len);
-}
-
-static bool streql(upb_tabkey k1, lookupkey_t k2) {
-  uint32_t len;
-  char* str = upb_tabstr(k1, &len);
-  return len == k2.str.len && (len == 0 || memcmp(str, k2.str.str, len) == 0);
-}
-
-bool upb_strtable_init(upb_strtable* t, size_t expected_size, upb_Arena* a) {
-  // Multiply by approximate reciprocal of MAX_LOAD (0.85), with pow2
-  // denominator.
-  size_t need_entries = (expected_size + 1) * 1204 / 1024;
-  UPB_ASSERT(need_entries >= expected_size * 0.85);
-  int size_lg2 = _upb_Log2Ceiling(need_entries);
-  return init(&t->t, size_lg2, a);
-}
-
-void upb_strtable_clear(upb_strtable* t) {
-  size_t bytes = upb_table_size(&t->t) * sizeof(upb_tabent);
-  t->t.count = 0;
-  memset((char*)t->t.entries, 0, bytes);
-}
-
-bool upb_strtable_resize(upb_strtable* t, size_t size_lg2, upb_Arena* a) {
-  upb_strtable new_table;
-  upb_strtable_iter i;
-
-  if (!init(&new_table.t, size_lg2, a)) return false;
-  upb_strtable_begin(&i, t);
-  for (; !upb_strtable_done(&i); upb_strtable_next(&i)) {
-    upb_StringView key = upb_strtable_iter_key(&i);
-    upb_strtable_insert(&new_table, key.data, key.size,
-                        upb_strtable_iter_value(&i), a);
-  }
-  *t = new_table;
-  return true;
-}
-
-bool upb_strtable_insert(upb_strtable* t, const char* k, size_t len,
-                         upb_value v, upb_Arena* a) {
-  lookupkey_t key;
-  upb_tabkey tabkey;
-  uint32_t hash;
-
-  if (isfull(&t->t)) {
-    /* Need to resize.  New table of double the size, add old elements to it. */
-    if (!upb_strtable_resize(t, t->t.size_lg2 + 1, a)) {
-      return false;
-    }
-  }
-
-  key = strkey2(k, len);
-  tabkey = strcopy(key, a);
-  if (tabkey == 0) return false;
-
-  hash = _upb_Hash_NoSeed(key.str.str, key.str.len);
-  insert(&t->t, key, tabkey, v, hash, &strhash, &streql);
-  return true;
-}
-
-bool upb_strtable_lookup2(const upb_strtable* t, const char* key, size_t len,
-                          upb_value* v) {
-  uint32_t hash = _upb_Hash_NoSeed(key, len);
-  return lookup(&t->t, strkey2(key, len), v, hash, &streql);
-}
-
-bool upb_strtable_remove2(upb_strtable* t, const char* key, size_t len,
-                          upb_value* val) {
-  uint32_t hash = _upb_Hash_NoSeed(key, len);
-  upb_tabkey tabkey;
-  return rm(&t->t, strkey2(key, len), val, &tabkey, hash, &streql);
-}
-
-/* Iteration */
-
-void upb_strtable_begin(upb_strtable_iter* i, const upb_strtable* t) {
-  i->t = t;
-  i->index = begin(&t->t);
-}
-
-void upb_strtable_next(upb_strtable_iter* i) {
-  i->index = next(&i->t->t, i->index);
-}
-
-bool upb_strtable_done(const upb_strtable_iter* i) {
-  if (!i->t) return true;
-  return i->index >= upb_table_size(&i->t->t) ||
-         upb_tabent_isempty(str_tabent(i));
-}
-
-upb_StringView upb_strtable_iter_key(const upb_strtable_iter* i) {
-  upb_StringView key;
-  uint32_t len;
-  UPB_ASSERT(!upb_strtable_done(i));
-  key.data = upb_tabstr(str_tabent(i)->key, &len);
-  key.size = len;
-  return key;
-}
-
-upb_value upb_strtable_iter_value(const upb_strtable_iter* i) {
-  UPB_ASSERT(!upb_strtable_done(i));
-  return _upb_value_val(str_tabent(i)->val.val);
-}
-
-void upb_strtable_iter_setdone(upb_strtable_iter* i) {
-  i->t = NULL;
-  i->index = SIZE_MAX;
-}
-
-bool upb_strtable_iter_isequal(const upb_strtable_iter* i1,
-                               const upb_strtable_iter* i2) {
-  if (upb_strtable_done(i1) && upb_strtable_done(i2)) return true;
-  return i1->t == i2->t && i1->index == i2->index;
-}
-
-/* upb_inttable ***************************************************************/
-
-/* For inttables we use a hybrid structure where small keys are kept in an
- * array and large keys are put in the hash table. */
-
-static uint32_t inthash(upb_tabkey key) { return upb_inthash(key); }
-
-static bool inteql(upb_tabkey k1, lookupkey_t k2) { return k1 == k2.num; }
-
-static upb_tabval* mutable_array(upb_inttable* t) {
-  return (upb_tabval*)t->array;
-}
-
-static upb_tabval* inttable_val(upb_inttable* t, uintptr_t key) {
-  if (key < t->array_size) {
-    return upb_arrhas(t->array[key]) ? &(mutable_array(t)[key]) : NULL;
-  } else {
-    upb_tabent* e =
-        findentry_mutable(&t->t, intkey(key), upb_inthash(key), &inteql);
-    return e ? &e->val : NULL;
-  }
-}
-
-static const upb_tabval* inttable_val_const(const upb_inttable* t,
-                                            uintptr_t key) {
-  return inttable_val((upb_inttable*)t, key);
-}
-
-size_t upb_inttable_count(const upb_inttable* t) {
-  return t->t.count + t->array_count;
-}
-
-static void check(upb_inttable* t) {
-  UPB_UNUSED(t);
-#if defined(UPB_DEBUG_TABLE) && !defined(NDEBUG)
-  {
-    /* This check is very expensive (makes inserts/deletes O(N)). */
-    size_t count = 0;
-    upb_inttable_iter i;
-    upb_inttable_begin(&i, t);
-    for (; !upb_inttable_done(&i); upb_inttable_next(&i), count++) {
-      UPB_ASSERT(upb_inttable_lookup(t, upb_inttable_iter_key(&i), NULL));
-    }
-    UPB_ASSERT(count == upb_inttable_count(t));
-  }
-#endif
-}
-
-bool upb_inttable_sizedinit(upb_inttable* t, size_t asize, int hsize_lg2,
-                            upb_Arena* a) {
-  size_t array_bytes;
-
-  if (!init(&t->t, hsize_lg2, a)) return false;
-  /* Always make the array part at least 1 long, so that we know key 0
-   * won't be in the hash part, which simplifies things. */
-  t->array_size = UPB_MAX(1, asize);
-  t->array_count = 0;
-  array_bytes = t->array_size * sizeof(upb_value);
-  t->array = upb_Arena_Malloc(a, array_bytes);
-  if (!t->array) {
-    return false;
-  }
-  memset(mutable_array(t), 0xff, array_bytes);
-  check(t);
-  return true;
-}
-
-bool upb_inttable_init(upb_inttable* t, upb_Arena* a) {
-  return upb_inttable_sizedinit(t, 0, 4, a);
-}
-
-bool upb_inttable_insert(upb_inttable* t, uintptr_t key, upb_value val,
-                         upb_Arena* a) {
-  upb_tabval tabval;
-  tabval.val = val.val;
-  UPB_ASSERT(
-      upb_arrhas(tabval)); /* This will reject (uint64_t)-1.  Fix this. */
-
-  if (key < t->array_size) {
-    UPB_ASSERT(!upb_arrhas(t->array[key]));
-    t->array_count++;
-    mutable_array(t)[key].val = val.val;
-  } else {
-    if (isfull(&t->t)) {
-      /* Need to resize the hash part, but we re-use the array part. */
-      size_t i;
-      upb_table new_table;
-
-      if (!init(&new_table, t->t.size_lg2 + 1, a)) {
-        return false;
-      }
-
-      for (i = begin(&t->t); i < upb_table_size(&t->t); i = next(&t->t, i)) {
-        const upb_tabent* e = &t->t.entries[i];
-        uint32_t hash;
-        upb_value v;
-
-        _upb_value_setval(&v, e->val.val);
-        hash = upb_inthash(e->key);
-        insert(&new_table, intkey(e->key), e->key, v, hash, &inthash, &inteql);
-      }
-
-      UPB_ASSERT(t->t.count == new_table.count);
-
-      t->t = new_table;
-    }
-    insert(&t->t, intkey(key), key, val, upb_inthash(key), &inthash, &inteql);
-  }
-  check(t);
-  return true;
-}
-
-bool upb_inttable_lookup(const upb_inttable* t, uintptr_t key, upb_value* v) {
-  const upb_tabval* table_v = inttable_val_const(t, key);
-  if (!table_v) return false;
-  if (v) _upb_value_setval(v, table_v->val);
-  return true;
-}
-
-bool upb_inttable_replace(upb_inttable* t, uintptr_t key, upb_value val) {
-  upb_tabval* table_v = inttable_val(t, key);
-  if (!table_v) return false;
-  table_v->val = val.val;
-  return true;
-}
-
-bool upb_inttable_remove(upb_inttable* t, uintptr_t key, upb_value* val) {
-  bool success;
-  if (key < t->array_size) {
-    if (upb_arrhas(t->array[key])) {
-      upb_tabval empty = UPB_TABVALUE_EMPTY_INIT;
-      t->array_count--;
-      if (val) {
-        _upb_value_setval(val, t->array[key].val);
-      }
-      mutable_array(t)[key] = empty;
-      success = true;
-    } else {
-      success = false;
-    }
-  } else {
-    success = rm(&t->t, intkey(key), val, NULL, upb_inthash(key), &inteql);
-  }
-  check(t);
-  return success;
-}
-
-void upb_inttable_compact(upb_inttable* t, upb_Arena* a) {
-  /* A power-of-two histogram of the table keys. */
-  size_t counts[UPB_MAXARRSIZE + 1] = {0};
-
-  /* The max key in each bucket. */
-  uintptr_t max[UPB_MAXARRSIZE + 1] = {0};
-
-  upb_inttable_iter i;
-  size_t arr_count;
-  int size_lg2;
-  upb_inttable new_t;
-
-  upb_inttable_begin(&i, t);
-  for (; !upb_inttable_done(&i); upb_inttable_next(&i)) {
-    uintptr_t key = upb_inttable_iter_key(&i);
-    int bucket = log2ceil(key);
-    max[bucket] = UPB_MAX(max[bucket], key);
-    counts[bucket]++;
-  }
-
-  /* Find the largest power of two that satisfies the MIN_DENSITY
-   * definition (while actually having some keys). */
-  arr_count = upb_inttable_count(t);
-
-  for (size_lg2 = ARRAY_SIZE(counts) - 1; size_lg2 > 0; size_lg2--) {
-    if (counts[size_lg2] == 0) {
-      /* We can halve again without losing any entries. */
-      continue;
-    } else if (arr_count >= (1 << size_lg2) * MIN_DENSITY) {
-      break;
-    }
-
-    arr_count -= counts[size_lg2];
-  }
-
-  UPB_ASSERT(arr_count <= upb_inttable_count(t));
-
-  {
-    /* Insert all elements into new, perfectly-sized table. */
-    size_t arr_size = max[size_lg2] + 1; /* +1 so arr[max] will fit. */
-    size_t hash_count = upb_inttable_count(t) - arr_count;
-    size_t hash_size = hash_count ? (hash_count / MAX_LOAD) + 1 : 0;
-    int hashsize_lg2 = log2ceil(hash_size);
-
-    upb_inttable_sizedinit(&new_t, arr_size, hashsize_lg2, a);
-    upb_inttable_begin(&i, t);
-    for (; !upb_inttable_done(&i); upb_inttable_next(&i)) {
-      uintptr_t k = upb_inttable_iter_key(&i);
-      upb_inttable_insert(&new_t, k, upb_inttable_iter_value(&i), a);
-    }
-    UPB_ASSERT(new_t.array_size == arr_size);
-    UPB_ASSERT(new_t.t.size_lg2 == hashsize_lg2);
-  }
-  *t = new_t;
-}
-
-/* Iteration. */
-
-static const upb_tabent* int_tabent(const upb_inttable_iter* i) {
-  UPB_ASSERT(!i->array_part);
-  return &i->t->t.entries[i->index];
-}
-
-static upb_tabval int_arrent(const upb_inttable_iter* i) {
-  UPB_ASSERT(i->array_part);
-  return i->t->array[i->index];
-}
-
-void upb_inttable_begin(upb_inttable_iter* i, const upb_inttable* t) {
-  i->t = t;
-  i->index = -1;
-  i->array_part = true;
-  upb_inttable_next(i);
-}
-
-void upb_inttable_next(upb_inttable_iter* iter) {
-  const upb_inttable* t = iter->t;
-  if (iter->array_part) {
-    while (++iter->index < t->array_size) {
-      if (upb_arrhas(int_arrent(iter))) {
-        return;
-      }
-    }
-    iter->array_part = false;
-    iter->index = begin(&t->t);
-  } else {
-    iter->index = next(&t->t, iter->index);
-  }
-}
-
-bool upb_inttable_next2(const upb_inttable* t, uintptr_t* key, upb_value* val,
-                        intptr_t* iter) {
-  intptr_t i = *iter;
-  if (i < t->array_size) {
-    while (++i < t->array_size) {
-      upb_tabval ent = t->array[i];
-      if (upb_arrhas(ent)) {
-        *key = i;
-        *val = _upb_value_val(ent.val);
-        *iter = i;
-        return true;
-      }
-    }
-  }
-
-  size_t tab_idx = next(&t->t, i == -1 ? -1 : i - t->array_size);
-  if (tab_idx < upb_table_size(&t->t)) {
-    upb_tabent* ent = &t->t.entries[tab_idx];
-    *key = ent->key;
-    *val = _upb_value_val(ent->val.val);
-    *iter = tab_idx + t->array_size;
-    return true;
-  }
-
-  return false;
-}
-
-void upb_inttable_removeiter(upb_inttable* t, intptr_t* iter) {
-  intptr_t i = *iter;
-  if (i < t->array_size) {
-    t->array_count--;
-    mutable_array(t)[i].val = -1;
-  } else {
-    upb_tabent* ent = &t->t.entries[i - t->array_size];
-    upb_tabent* prev = NULL;
-
-    // Linear search, not great.
-    upb_tabent* end = &t->t.entries[upb_table_size(&t->t)];
-    for (upb_tabent* e = t->t.entries; e != end; e++) {
-      if (e->next == ent) {
-        prev = e;
-        break;
-      }
-    }
-
-    if (prev) {
-      prev->next = ent->next;
-    }
-
-    t->t.count--;
-    ent->key = 0;
-    ent->next = NULL;
-  }
-}
-
-bool upb_strtable_next2(const upb_strtable* t, upb_StringView* key,
-                        upb_value* val, intptr_t* iter) {
-  size_t tab_idx = next(&t->t, *iter);
-  if (tab_idx < upb_table_size(&t->t)) {
-    upb_tabent* ent = &t->t.entries[tab_idx];
-    uint32_t len;
-    key->data = upb_tabstr(ent->key, &len);
-    key->size = len;
-    *val = _upb_value_val(ent->val.val);
-    *iter = tab_idx;
-    return true;
-  }
-
-  return false;
-}
-
-void upb_strtable_removeiter(upb_strtable* t, intptr_t* iter) {
-  intptr_t i = *iter;
-  upb_tabent* ent = &t->t.entries[i];
-  upb_tabent* prev = NULL;
-
-  // Linear search, not great.
-  upb_tabent* end = &t->t.entries[upb_table_size(&t->t)];
-  for (upb_tabent* e = t->t.entries; e != end; e++) {
-    if (e->next == ent) {
-      prev = e;
-      break;
-    }
-  }
-
-  if (prev) {
-    prev->next = ent->next;
-  }
-
-  t->t.count--;
-  ent->key = 0;
-  ent->next = NULL;
-}
-
-bool upb_inttable_done(const upb_inttable_iter* i) {
-  if (!i->t) return true;
-  if (i->array_part) {
-    return i->index >= i->t->array_size || !upb_arrhas(int_arrent(i));
-  } else {
-    return i->index >= upb_table_size(&i->t->t) ||
-           upb_tabent_isempty(int_tabent(i));
-  }
-}
-
-uintptr_t upb_inttable_iter_key(const upb_inttable_iter* i) {
-  UPB_ASSERT(!upb_inttable_done(i));
-  return i->array_part ? i->index : int_tabent(i)->key;
-}
-
-upb_value upb_inttable_iter_value(const upb_inttable_iter* i) {
-  UPB_ASSERT(!upb_inttable_done(i));
-  return _upb_value_val(i->array_part ? i->t->array[i->index].val
-                                      : int_tabent(i)->val.val);
-}
-
-void upb_inttable_iter_setdone(upb_inttable_iter* i) {
-  i->t = NULL;
-  i->index = SIZE_MAX;
-  i->array_part = false;
-}
-
-bool upb_inttable_iter_isequal(const upb_inttable_iter* i1,
-                               const upb_inttable_iter* i2) {
-  if (upb_inttable_done(i1) && upb_inttable_done(i2)) return true;
-  return i1->t == i2->t && i1->index == i2->index &&
-         i1->array_part == i2->array_part;
-}
-
-/** upb/upb.c ************************************************************/
-#include <errno.h>
-#include <float.h>
-#include <stdarg.h>
-#include <stddef.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-
-// Must be last.
-
-/* upb_Status *****************************************************************/
-
-void upb_Status_Clear(upb_Status* status) {
-  if (!status) return;
-  status->ok = true;
-  status->msg[0] = '\0';
-}
-
-bool upb_Status_IsOk(const upb_Status* status) { return status->ok; }
-
-const char* upb_Status_ErrorMessage(const upb_Status* status) {
-  return status->msg;
-}
-
-void upb_Status_SetErrorMessage(upb_Status* status, const char* msg) {
-  if (!status) return;
-  status->ok = false;
-  strncpy(status->msg, msg, _kUpb_Status_MaxMessage - 1);
-  status->msg[_kUpb_Status_MaxMessage - 1] = '\0';
-}
-
-void upb_Status_SetErrorFormat(upb_Status* status, const char* fmt, ...) {
-  va_list args;
-  va_start(args, fmt);
-  upb_Status_VSetErrorFormat(status, fmt, args);
-  va_end(args);
-}
-
-void upb_Status_VSetErrorFormat(upb_Status* status, const char* fmt,
-                                va_list args) {
-  if (!status) return;
-  status->ok = false;
-  vsnprintf(status->msg, sizeof(status->msg), fmt, args);
-  status->msg[_kUpb_Status_MaxMessage - 1] = '\0';
-}
-
-void upb_Status_VAppendErrorFormat(upb_Status* status, const char* fmt,
-                                   va_list args) {
-  size_t len;
-  if (!status) return;
-  status->ok = false;
-  len = strlen(status->msg);
-  vsnprintf(status->msg + len, sizeof(status->msg) - len, fmt, args);
-  status->msg[_kUpb_Status_MaxMessage - 1] = '\0';
-}
-
-/* upb_alloc ******************************************************************/
-
-static void* upb_global_allocfunc(upb_alloc* alloc, void* ptr, size_t oldsize,
-                                  size_t size) {
-  UPB_UNUSED(alloc);
-  UPB_UNUSED(oldsize);
-  if (size == 0) {
-    free(ptr);
-    return NULL;
-  } else {
-    return realloc(ptr, size);
-  }
-}
-
-static uint32_t* upb_cleanup_pointer(uintptr_t cleanup_metadata) {
-  return (uint32_t*)(cleanup_metadata & ~0x1);
-}
-
-static bool upb_cleanup_has_initial_block(uintptr_t cleanup_metadata) {
-  return cleanup_metadata & 0x1;
-}
-
-static uintptr_t upb_cleanup_metadata(uint32_t* cleanup,
-                                      bool has_initial_block) {
-  return (uintptr_t)cleanup | has_initial_block;
-}
-
-upb_alloc upb_alloc_global = {&upb_global_allocfunc};
-
-/* upb_Arena ******************************************************************/
-
-struct mem_block {
-  struct mem_block* next;
-  uint32_t size;
-  uint32_t cleanups;
-  /* Data follows. */
-};
-
-typedef struct cleanup_ent {
-  upb_CleanupFunc* cleanup;
-  void* ud;
-} cleanup_ent;
-
-static const size_t memblock_reserve =
-    UPB_ALIGN_UP(sizeof(mem_block), UPB_MALLOC_ALIGN);
-
-static upb_Arena* arena_findroot(upb_Arena* a) {
-  /* Path splitting keeps time complexity down, see:
-   *   https://en.wikipedia.org/wiki/Disjoint-set_data_structure */
-  while (a->parent != a) {
-    upb_Arena* next = a->parent;
-    a->parent = next->parent;
-    a = next;
-  }
-  return a;
-}
-
-static void upb_Arena_addblock(upb_Arena* a, upb_Arena* root, void* ptr,
-                               size_t size) {
-  mem_block* block = ptr;
-
-  /* The block is for arena |a|, but should appear in the freelist of |root|. */
-  block->next = root->freelist;
-  block->size = (uint32_t)size;
-  block->cleanups = 0;
-  root->freelist = block;
-  a->last_size = block->size;
-  if (!root->freelist_tail) root->freelist_tail = block;
-
-  a->head.ptr = UPB_PTR_AT(block, memblock_reserve, char);
-  a->head.end = UPB_PTR_AT(block, size, char);
-  a->cleanup_metadata = upb_cleanup_metadata(
-      &block->cleanups, upb_cleanup_has_initial_block(a->cleanup_metadata));
-
-  UPB_POISON_MEMORY_REGION(a->head.ptr, a->head.end - a->head.ptr);
-}
-
-static bool upb_Arena_Allocblock(upb_Arena* a, size_t size) {
-  upb_Arena* root = arena_findroot(a);
-  size_t block_size = UPB_MAX(size, a->last_size * 2) + memblock_reserve;
-  mem_block* block = upb_malloc(root->block_alloc, block_size);
-
-  if (!block) return false;
-  upb_Arena_addblock(a, root, block, block_size);
-  return true;
-}
-
-void* _upb_Arena_SlowMalloc(upb_Arena* a, size_t size) {
-  if (!upb_Arena_Allocblock(a, size)) return NULL; /* Out of memory. */
-  UPB_ASSERT(_upb_ArenaHas(a) >= size);
-  return upb_Arena_Malloc(a, size);
-}
-
-static void* upb_Arena_doalloc(upb_alloc* alloc, void* ptr, size_t oldsize,
-                               size_t size) {
-  upb_Arena* a = (upb_Arena*)alloc; /* upb_alloc is initial member. */
-  return upb_Arena_Realloc(a, ptr, oldsize, size);
-}
-
-/* Public Arena API ***********************************************************/
-
-upb_Arena* arena_initslow(void* mem, size_t n, upb_alloc* alloc) {
-  const size_t first_block_overhead = sizeof(upb_Arena) + memblock_reserve;
-  upb_Arena* a;
-
-  /* We need to malloc the initial block. */
-  n = first_block_overhead + 256;
-  if (!alloc || !(mem = upb_malloc(alloc, n))) {
-    return NULL;
-  }
-
-  a = UPB_PTR_AT(mem, n - sizeof(*a), upb_Arena);
-  n -= sizeof(*a);
-
-  a->head.alloc.func = &upb_Arena_doalloc;
-  a->block_alloc = alloc;
-  a->parent = a;
-  a->refcount = 1;
-  a->freelist = NULL;
-  a->freelist_tail = NULL;
-  a->cleanup_metadata = upb_cleanup_metadata(NULL, false);
-
-  upb_Arena_addblock(a, a, mem, n);
-
-  return a;
-}
-
-upb_Arena* upb_Arena_Init(void* mem, size_t n, upb_alloc* alloc) {
-  upb_Arena* a;
-
-  if (n) {
-    /* Align initial pointer up so that we return properly-aligned pointers. */
-    void* aligned = (void*)UPB_ALIGN_UP((uintptr_t)mem, UPB_MALLOC_ALIGN);
-    size_t delta = (uintptr_t)aligned - (uintptr_t)mem;
-    n = delta <= n ? n - delta : 0;
-    mem = aligned;
-  }
-
-  /* Round block size down to alignof(*a) since we will allocate the arena
-   * itself at the end. */
-  n = UPB_ALIGN_DOWN(n, UPB_ALIGN_OF(upb_Arena));
-
-  if (UPB_UNLIKELY(n < sizeof(upb_Arena))) {
-    return arena_initslow(mem, n, alloc);
-  }
-
-  a = UPB_PTR_AT(mem, n - sizeof(*a), upb_Arena);
-
-  a->head.alloc.func = &upb_Arena_doalloc;
-  a->block_alloc = alloc;
-  a->parent = a;
-  a->refcount = 1;
-  a->last_size = UPB_MAX(128, n);
-  a->head.ptr = mem;
-  a->head.end = UPB_PTR_AT(mem, n - sizeof(*a), char);
-  a->freelist = NULL;
-  a->cleanup_metadata = upb_cleanup_metadata(NULL, true);
-
-  return a;
-}
-
-static void arena_dofree(upb_Arena* a) {
-  mem_block* block = a->freelist;
-  UPB_ASSERT(a->parent == a);
-  UPB_ASSERT(a->refcount == 0);
-
-  while (block) {
-    /* Load first since we are deleting block. */
-    mem_block* next = block->next;
-
-    if (block->cleanups > 0) {
-      cleanup_ent* end = UPB_PTR_AT(block, block->size, void);
-      cleanup_ent* ptr = end - block->cleanups;
-
-      for (; ptr < end; ptr++) {
-        ptr->cleanup(ptr->ud);
-      }
-    }
-
-    upb_free(a->block_alloc, block);
-    block = next;
-  }
-}
-
-void upb_Arena_Free(upb_Arena* a) {
-  a = arena_findroot(a);
-  if (--a->refcount == 0) arena_dofree(a);
-}
-
-bool upb_Arena_AddCleanup(upb_Arena* a, void* ud, upb_CleanupFunc* func) {
-  cleanup_ent* ent;
-  uint32_t* cleanups = upb_cleanup_pointer(a->cleanup_metadata);
-
-  if (!cleanups || _upb_ArenaHas(a) < sizeof(cleanup_ent)) {
-    if (!upb_Arena_Allocblock(a, 128)) return false; /* Out of memory. */
-    UPB_ASSERT(_upb_ArenaHas(a) >= sizeof(cleanup_ent));
-    cleanups = upb_cleanup_pointer(a->cleanup_metadata);
-  }
-
-  a->head.end -= sizeof(cleanup_ent);
-  ent = (cleanup_ent*)a->head.end;
-  (*cleanups)++;
-  UPB_UNPOISON_MEMORY_REGION(ent, sizeof(cleanup_ent));
-
-  ent->cleanup = func;
-  ent->ud = ud;
-
-  return true;
-}
-
-bool upb_Arena_Fuse(upb_Arena* a1, upb_Arena* a2) {
-  upb_Arena* r1 = arena_findroot(a1);
-  upb_Arena* r2 = arena_findroot(a2);
-
-  if (r1 == r2) return true; /* Already fused. */
-
-  /* Do not fuse initial blocks since we cannot lifetime extend them. */
-  if (upb_cleanup_has_initial_block(r1->cleanup_metadata)) return false;
-  if (upb_cleanup_has_initial_block(r2->cleanup_metadata)) return false;
-
-  /* Only allow fuse with a common allocator */
-  if (r1->block_alloc != r2->block_alloc) return false;
-
-  /* We want to join the smaller tree to the larger tree.
-   * So swap first if they are backwards. */
-  if (r1->refcount < r2->refcount) {
-    upb_Arena* tmp = r1;
-    r1 = r2;
-    r2 = tmp;
-  }
-
-  /* r1 takes over r2's freelist and refcount. */
-  r1->refcount += r2->refcount;
-  if (r2->freelist_tail) {
-    UPB_ASSERT(r2->freelist_tail->next == NULL);
-    r2->freelist_tail->next = r1->freelist;
-    r1->freelist = r2->freelist;
-  }
-  r2->parent = r1;
-  return true;
-}
-
-/* Miscellaneous utilities ****************************************************/
-
-static void upb_FixLocale(char* p) {
-  /* printf() is dependent on locales; sadly there is no easy and portable way
-   * to avoid this. This little post-processing step will translate 1,2 -> 1.2
-   * since JSON needs the latter. Arguably a hack, but it is simple and the
-   * alternatives are far more complicated, platform-dependent, and/or larger
-   * in code size. */
-  for (; *p; p++) {
-    if (*p == ',') *p = '.';
-  }
-}
-
-void _upb_EncodeRoundTripDouble(double val, char* buf, size_t size) {
-  assert(size >= kUpb_RoundTripBufferSize);
-  snprintf(buf, size, "%.*g", DBL_DIG, val);
-  if (strtod(buf, NULL) != val) {
-    snprintf(buf, size, "%.*g", DBL_DIG + 2, val);
-    assert(strtod(buf, NULL) == val);
-  }
-  upb_FixLocale(buf);
-}
-
-void _upb_EncodeRoundTripFloat(float val, char* buf, size_t size) {
-  assert(size >= kUpb_RoundTripBufferSize);
-  snprintf(buf, size, "%.*g", FLT_DIG, val);
-  if (strtof(buf, NULL) != val) {
-    snprintf(buf, size, "%.*g", FLT_DIG + 3, val);
-    assert(strtof(buf, NULL) == val);
-  }
-  upb_FixLocale(buf);
-}
-
-/** upb/port_undef.inc ************************************************************/
-/* See port_def.inc.  This should #undef all macros #defined there. */
-
-#undef UPB_SIZE
-#undef UPB_PTR_AT
-#undef UPB_READ_ONEOF
-#undef UPB_WRITE_ONEOF
-#undef UPB_MAPTYPE_STRING
-#undef UPB_INLINE
-#undef UPB_ALIGN_UP
-#undef UPB_ALIGN_DOWN
-#undef UPB_ALIGN_MALLOC
-#undef UPB_ALIGN_OF
-#undef UPB_MALLOC_ALIGN
-#undef UPB_LIKELY
-#undef UPB_UNLIKELY
-#undef UPB_FORCEINLINE
-#undef UPB_NOINLINE
-#undef UPB_NORETURN
-#undef UPB_PRINTF
-#undef UPB_MAX
-#undef UPB_MIN
-#undef UPB_UNUSED
-#undef UPB_ASSUME
-#undef UPB_ASSERT
-#undef UPB_UNREACHABLE
-#undef UPB_SETJMP
-#undef UPB_LONGJMP
-#undef UPB_PTRADD
-#undef UPB_MUSTTAIL
-#undef UPB_FASTTABLE_SUPPORTED
-#undef UPB_FASTTABLE
-#undef UPB_FASTTABLE_INIT
-#undef UPB_POISON_MEMORY_REGION
-#undef UPB_UNPOISON_MEMORY_REGION
-#undef UPB_ASAN
-#undef UPB_TREAT_PROTO2_ENUMS_LIKE_PROTO3
diff --git a/libs/protobuf/ruby/ext/google/protobuf_c/ruby-upb.h b/libs/protobuf/ruby/ext/google/protobuf_c/ruby-upb.h
deleted file mode 100755
index 54865a1..0000000
--- a/libs/protobuf/ruby/ext/google/protobuf_c/ruby-upb.h
+++ /dev/null
@@ -1,6341 +0,0 @@
-// Ruby is still using proto3 enum semantics for proto2
-#define UPB_DISABLE_PROTO2_ENUM_CHECKING
-/* Amalgamated source file */
-/*
- * Copyright (c) 2009-2021, Google LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Google LLC nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * This is where we define macros used across upb.
- *
- * All of these macros are undef'd in port_undef.inc to avoid leaking them to
- * users.
- *
- * The correct usage is:
- *
- *   #include "upb/foobar.h"
- *   #include "upb/baz.h"
- *
- *   // MUST be last included header.
- *   #include "upb/port_def.inc"
- *
- *   // Code for this file.
- *   // <...>
- *
- *   // Can be omitted for .c files, required for .h.
- *   #include "upb/port_undef.inc"
- *
- * This file is private and must not be included by users!
- */
-
-#if !((defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || \
-      (defined(__cplusplus) && __cplusplus >= 201103L) ||           \
-      (defined(_MSC_VER) && _MSC_VER >= 1900))
-#error upb requires C99 or C++11 or MSVC >= 2015.
-#endif
-
-#include <stdint.h>
-#include <stddef.h>
-
-#if UINTPTR_MAX == 0xffffffff
-#define UPB_SIZE(size32, size64) size32
-#else
-#define UPB_SIZE(size32, size64) size64
-#endif
-
-/* If we always read/write as a consistent type to each address, this shouldn't
- * violate aliasing.
- */
-#define UPB_PTR_AT(msg, ofs, type) ((type*)((char*)(msg) + (ofs)))
-
-#define UPB_READ_ONEOF(msg, fieldtype, offset, case_offset, case_val, default) \
-  *UPB_PTR_AT(msg, case_offset, int) == case_val                              \
-      ? *UPB_PTR_AT(msg, offset, fieldtype)                                   \
-      : default
-
-#define UPB_WRITE_ONEOF(msg, fieldtype, offset, value, case_offset, case_val) \
-  *UPB_PTR_AT(msg, case_offset, int) = case_val;                             \
-  *UPB_PTR_AT(msg, offset, fieldtype) = value;
-
-#define UPB_MAPTYPE_STRING 0
-
-/* UPB_INLINE: inline if possible, emit standalone code if required. */
-#ifdef __cplusplus
-#define UPB_INLINE inline
-#elif defined (__GNUC__) || defined(__clang__)
-#define UPB_INLINE static __inline__
-#else
-#define UPB_INLINE static
-#endif
-
-#define UPB_MALLOC_ALIGN 8
-#define UPB_ALIGN_UP(size, align) (((size) + (align) - 1) / (align) * (align))
-#define UPB_ALIGN_DOWN(size, align) ((size) / (align) * (align))
-#define UPB_ALIGN_MALLOC(size) UPB_ALIGN_UP(size, UPB_MALLOC_ALIGN)
-#define UPB_ALIGN_OF(type) offsetof (struct { char c; type member; }, member)
-
-// Hints to the compiler about likely/unlikely branches.
-#if defined (__GNUC__) || defined(__clang__)
-#define UPB_LIKELY(x) __builtin_expect((bool)(x), 1)
-#define UPB_UNLIKELY(x) __builtin_expect((bool)(x), 0)
-#else
-#define UPB_LIKELY(x) (x)
-#define UPB_UNLIKELY(x) (x)
-#endif
-
-// Macros for function attributes on compilers that support them.
-#ifdef __GNUC__
-#define UPB_FORCEINLINE __inline__ __attribute__((always_inline))
-#define UPB_NOINLINE __attribute__((noinline))
-#define UPB_NORETURN __attribute__((__noreturn__))
-#define UPB_PRINTF(str, first_vararg) __attribute__((format (printf, str, first_vararg)))
-#elif defined(_MSC_VER)
-#define UPB_NOINLINE
-#define UPB_FORCEINLINE
-#define UPB_NORETURN __declspec(noreturn)
-#define UPB_PRINTF(str, first_vararg)
-#else  /* !defined(__GNUC__) */
-#define UPB_FORCEINLINE
-#define UPB_NOINLINE
-#define UPB_NORETURN
-#define UPB_PRINTF(str, first_vararg)
-#endif
-
-#define UPB_MAX(x, y) ((x) > (y) ? (x) : (y))
-#define UPB_MIN(x, y) ((x) < (y) ? (x) : (y))
-
-#define UPB_UNUSED(var) (void)var
-
-// UPB_ASSUME(): in release mode, we tell the compiler to assume this is true.
-#ifdef NDEBUG
-#ifdef __GNUC__
-#define UPB_ASSUME(expr) if (!(expr)) __builtin_unreachable()
-#elif defined _MSC_VER
-#define UPB_ASSUME(expr) if (!(expr)) __assume(0)
-#else
-#define UPB_ASSUME(expr) do {} while (false && (expr))
-#endif
-#else
-#define UPB_ASSUME(expr) assert(expr)
-#endif
-
-/* UPB_ASSERT(): in release mode, we use the expression without letting it be
- * evaluated.  This prevents "unused variable" warnings. */
-#ifdef NDEBUG
-#define UPB_ASSERT(expr) do {} while (false && (expr))
-#else
-#define UPB_ASSERT(expr) assert(expr)
-#endif
-
-#if defined(__GNUC__) || defined(__clang__)
-#define UPB_UNREACHABLE() do { assert(0); __builtin_unreachable(); } while(0)
-#else
-#define UPB_UNREACHABLE() do { assert(0); } while(0)
-#endif
-
-/* UPB_SETJMP() / UPB_LONGJMP(): avoid setting/restoring signal mask. */
-#ifdef __APPLE__
-#define UPB_SETJMP(buf) _setjmp(buf)
-#define UPB_LONGJMP(buf, val) _longjmp(buf, val)
-#else
-#define UPB_SETJMP(buf) setjmp(buf)
-#define UPB_LONGJMP(buf, val) longjmp(buf, val)
-#endif
-
-/* UPB_PTRADD(ptr, ofs): add pointer while avoiding "NULL + 0" UB */
-#define UPB_PTRADD(ptr, ofs) ((ofs) ? (ptr) + (ofs) : (ptr))
-
-/* Configure whether fasttable is switched on or not. *************************/
-
-#ifdef __has_attribute
-#define UPB_HAS_ATTRIBUTE(x) __has_attribute(x)
-#else
-#define UPB_HAS_ATTRIBUTE(x) 0
-#endif
-
-#if UPB_HAS_ATTRIBUTE(musttail)
-#define UPB_MUSTTAIL __attribute__((musttail))
-#else
-#define UPB_MUSTTAIL
-#endif
-
-#undef UPB_HAS_ATTRIBUTE
-
-/* This check is not fully robust: it does not require that we have "musttail"
- * support available. We need tail calls to avoid consuming arbitrary amounts
- * of stack space.
- *
- * GCC/Clang can mostly be trusted to generate tail calls as long as
- * optimization is enabled, but, debug builds will not generate tail calls
- * unless "musttail" is available.
- *
- * We should probably either:
- *   1. require that the compiler supports musttail.
- *   2. add some fallback code for when musttail isn't available (ie. return
- *      instead of tail calling). This is safe and portable, but this comes at
- *      a CPU cost.
- */
-#if (defined(__x86_64__) || defined(__aarch64__)) && defined(__GNUC__)
-#define UPB_FASTTABLE_SUPPORTED 1
-#else
-#define UPB_FASTTABLE_SUPPORTED 0
-#endif
-
-/* define UPB_ENABLE_FASTTABLE to force fast table support.
- * This is useful when we want to ensure we are really getting fasttable,
- * for example for testing or benchmarking. */
-#if defined(UPB_ENABLE_FASTTABLE)
-#if !UPB_FASTTABLE_SUPPORTED
-#error fasttable is x86-64/ARM64 only and requires GCC or Clang.
-#endif
-#define UPB_FASTTABLE 1
-/* Define UPB_TRY_ENABLE_FASTTABLE to use fasttable if possible.
- * This is useful for releasing code that might be used on multiple platforms,
- * for example the PHP or Ruby C extensions. */
-#elif defined(UPB_TRY_ENABLE_FASTTABLE)
-#define UPB_FASTTABLE UPB_FASTTABLE_SUPPORTED
-#else
-#define UPB_FASTTABLE 0
-#endif
-
-/* UPB_FASTTABLE_INIT() allows protos compiled for fasttable to gracefully
- * degrade to non-fasttable if we are using UPB_TRY_ENABLE_FASTTABLE. */
-#if !UPB_FASTTABLE && defined(UPB_TRY_ENABLE_FASTTABLE)
-#define UPB_FASTTABLE_INIT(...)
-#else
-#define UPB_FASTTABLE_INIT(...) __VA_ARGS__
-#endif
-
-#undef UPB_FASTTABLE_SUPPORTED
-
-/* ASAN poisoning (for arena) *************************************************/
-
-#if defined(__SANITIZE_ADDRESS__)
-#define UPB_ASAN 1
-#ifdef __cplusplus
-extern "C" {
-#endif
-void __asan_poison_memory_region(void const volatile *addr, size_t size);
-void __asan_unpoison_memory_region(void const volatile *addr, size_t size);
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-#define UPB_POISON_MEMORY_REGION(addr, size) \
-  __asan_poison_memory_region((addr), (size))
-#define UPB_UNPOISON_MEMORY_REGION(addr, size) \
-  __asan_unpoison_memory_region((addr), (size))
-#else
-#define UPB_ASAN 0
-#define UPB_POISON_MEMORY_REGION(addr, size) \
-  ((void)(addr), (void)(size))
-#define UPB_UNPOISON_MEMORY_REGION(addr, size) \
-  ((void)(addr), (void)(size))
-#endif
-
-/* Disable proto2 arena behavior (TEMPORARY) **********************************/
-
-#ifdef UPB_DISABLE_PROTO2_ENUM_CHECKING
-#define UPB_TREAT_PROTO2_ENUMS_LIKE_PROTO3 1
-#else
-#define UPB_TREAT_PROTO2_ENUMS_LIKE_PROTO3 0
-#endif
-
-/** upb/collections.h ************************************************************/
-#ifndef UPB_COLLECTIONS_H_
-#define UPB_COLLECTIONS_H_
-
-
-/** google/protobuf/descriptor.upb.h ************************************************************//* This file was generated by upbc (the upb compiler) from the input
- * file:
- *
- *     google/protobuf/descriptor.proto
- *
- * Do not edit -- your changes will be discarded when the file is
- * regenerated. */
-
-#ifndef GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H_
-#define GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H_
-
-
-/** upb/msg_internal.h ************************************************************/
-/*
-** Our memory representation for parsing tables and messages themselves.
-** Functions in this file are used by generated code and possibly reflection.
-**
-** The definitions in this file are internal to upb.
-**/
-
-#ifndef UPB_MSG_INT_H_
-#define UPB_MSG_INT_H_
-
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
-
-
-/** upb/msg.h ************************************************************/
-/*
- * Public APIs for message operations that do not require descriptors.
- * These functions can be used even in build that does not want to depend on
- * reflection or descriptors.
- *
- * Descriptor-based reflection functionality lives in reflection.h.
- */
-
-#ifndef UPB_MSG_H_
-#define UPB_MSG_H_
-
-#include <stddef.h>
-
-
-/** upb/upb.h ************************************************************/
-/*
- * This file contains shared definitions that are widely used across upb.
- */
-
-#ifndef UPB_H_
-#define UPB_H_
-
-#include <assert.h>
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stddef.h>
-#include <stdint.h>
-#include <string.h>
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* upb_Status *****************************************************************/
-
-#define _kUpb_Status_MaxMessage 127
-
-typedef struct {
-  bool ok;
-  char msg[_kUpb_Status_MaxMessage]; /* Error message; NULL-terminated. */
-} upb_Status;
-
-const char* upb_Status_ErrorMessage(const upb_Status* status);
-bool upb_Status_IsOk(const upb_Status* status);
-
-/* These are no-op if |status| is NULL. */
-void upb_Status_Clear(upb_Status* status);
-void upb_Status_SetErrorMessage(upb_Status* status, const char* msg);
-void upb_Status_SetErrorFormat(upb_Status* status, const char* fmt, ...)
-    UPB_PRINTF(2, 3);
-void upb_Status_VSetErrorFormat(upb_Status* status, const char* fmt,
-                                va_list args) UPB_PRINTF(2, 0);
-void upb_Status_VAppendErrorFormat(upb_Status* status, const char* fmt,
-                                   va_list args) UPB_PRINTF(2, 0);
-
-/** upb_StringView ************************************************************/
-
-typedef struct {
-  const char* data;
-  size_t size;
-} upb_StringView;
-
-UPB_INLINE upb_StringView upb_StringView_FromDataAndSize(const char* data,
-                                                         size_t size) {
-  upb_StringView ret;
-  ret.data = data;
-  ret.size = size;
-  return ret;
-}
-
-UPB_INLINE upb_StringView upb_StringView_FromString(const char* data) {
-  return upb_StringView_FromDataAndSize(data, strlen(data));
-}
-
-UPB_INLINE bool upb_StringView_IsEqual(upb_StringView a, upb_StringView b) {
-  return a.size == b.size && memcmp(a.data, b.data, a.size) == 0;
-}
-
-#define UPB_STRINGVIEW_INIT(ptr, len) \
-  { ptr, len }
-
-#define UPB_STRINGVIEW_FORMAT "%.*s"
-#define UPB_STRINGVIEW_ARGS(view) (int)(view).size, (view).data
-
-/** upb_alloc *****************************************************************/
-
-/* A upb_alloc is a possibly-stateful allocator object.
- *
- * It could either be an arena allocator (which doesn't require individual
- * free() calls) or a regular malloc() (which does).  The client must therefore
- * free memory unless it knows that the allocator is an arena allocator. */
-
-struct upb_alloc;
-typedef struct upb_alloc upb_alloc;
-
-/* A malloc()/free() function.
- * If "size" is 0 then the function acts like free(), otherwise it acts like
- * realloc().  Only "oldsize" bytes from a previous allocation are preserved. */
-typedef void* upb_alloc_func(upb_alloc* alloc, void* ptr, size_t oldsize,
-                             size_t size);
-
-struct upb_alloc {
-  upb_alloc_func* func;
-};
-
-UPB_INLINE void* upb_malloc(upb_alloc* alloc, size_t size) {
-  UPB_ASSERT(alloc);
-  return alloc->func(alloc, NULL, 0, size);
-}
-
-UPB_INLINE void* upb_realloc(upb_alloc* alloc, void* ptr, size_t oldsize,
-                             size_t size) {
-  UPB_ASSERT(alloc);
-  return alloc->func(alloc, ptr, oldsize, size);
-}
-
-UPB_INLINE void upb_free(upb_alloc* alloc, void* ptr) {
-  assert(alloc);
-  alloc->func(alloc, ptr, 0, 0);
-}
-
-/* The global allocator used by upb.  Uses the standard malloc()/free(). */
-
-extern upb_alloc upb_alloc_global;
-
-/* Functions that hard-code the global malloc.
- *
- * We still get benefit because we can put custom logic into our global
- * allocator, like injecting out-of-memory faults in debug/testing builds. */
-
-UPB_INLINE void* upb_gmalloc(size_t size) {
-  return upb_malloc(&upb_alloc_global, size);
-}
-
-UPB_INLINE void* upb_grealloc(void* ptr, size_t oldsize, size_t size) {
-  return upb_realloc(&upb_alloc_global, ptr, oldsize, size);
-}
-
-UPB_INLINE void upb_gfree(void* ptr) { upb_free(&upb_alloc_global, ptr); }
-
-/* upb_Arena ******************************************************************/
-
-/* upb_Arena is a specific allocator implementation that uses arena allocation.
- * The user provides an allocator that will be used to allocate the underlying
- * arena blocks.  Arenas by nature do not require the individual allocations
- * to be freed.  However the Arena does allow users to register cleanup
- * functions that will run when the arena is destroyed.
- *
- * A upb_Arena is *not* thread-safe.
- *
- * You could write a thread-safe arena allocator that satisfies the
- * upb_alloc interface, but it would not be as efficient for the
- * single-threaded case. */
-
-typedef void upb_CleanupFunc(void* ud);
-
-struct upb_Arena;
-typedef struct upb_Arena upb_Arena;
-
-typedef struct {
-  /* We implement the allocator interface.
-   * This must be the first member of upb_Arena!
-   * TODO(haberman): remove once handlers are gone. */
-  upb_alloc alloc;
-
-  char *ptr, *end;
-} _upb_ArenaHead;
-
-/* Creates an arena from the given initial block (if any -- n may be 0).
- * Additional blocks will be allocated from |alloc|.  If |alloc| is NULL, this
- * is a fixed-size arena and cannot grow. */
-upb_Arena* upb_Arena_Init(void* mem, size_t n, upb_alloc* alloc);
-void upb_Arena_Free(upb_Arena* a);
-bool upb_Arena_AddCleanup(upb_Arena* a, void* ud, upb_CleanupFunc* func);
-bool upb_Arena_Fuse(upb_Arena* a, upb_Arena* b);
-void* _upb_Arena_SlowMalloc(upb_Arena* a, size_t size);
-
-UPB_INLINE upb_alloc* upb_Arena_Alloc(upb_Arena* a) { return (upb_alloc*)a; }
-
-UPB_INLINE size_t _upb_ArenaHas(upb_Arena* a) {
-  _upb_ArenaHead* h = (_upb_ArenaHead*)a;
-  return (size_t)(h->end - h->ptr);
-}
-
-UPB_INLINE void* _upb_Arena_FastMalloc(upb_Arena* a, size_t size) {
-  _upb_ArenaHead* h = (_upb_ArenaHead*)a;
-  void* ret = h->ptr;
-  UPB_ASSERT(UPB_ALIGN_MALLOC((uintptr_t)ret) == (uintptr_t)ret);
-  UPB_ASSERT(UPB_ALIGN_MALLOC(size) == size);
-  UPB_UNPOISON_MEMORY_REGION(ret, size);
-
-  h->ptr += size;
-
-#if UPB_ASAN
-  {
-    size_t guard_size = 32;
-    if (_upb_ArenaHas(a) >= guard_size) {
-      h->ptr += guard_size;
-    } else {
-      h->ptr = h->end;
-    }
-  }
-#endif
-
-  return ret;
-}
-
-UPB_INLINE void* upb_Arena_Malloc(upb_Arena* a, size_t size) {
-  size = UPB_ALIGN_MALLOC(size);
-
-  if (UPB_UNLIKELY(_upb_ArenaHas(a) < size)) {
-    return _upb_Arena_SlowMalloc(a, size);
-  }
-
-  return _upb_Arena_FastMalloc(a, size);
-}
-
-// Shrinks the last alloc from arena.
-// REQUIRES: (ptr, oldsize) was the last malloc/realloc from this arena.
-// We could also add a upb_Arena_TryShrinkLast() which is simply a no-op if
-// this was not the last alloc.
-UPB_INLINE void upb_Arena_ShrinkLast(upb_Arena* a, void* ptr, size_t oldsize,
-                                     size_t size) {
-  _upb_ArenaHead* h = (_upb_ArenaHead*)a;
-  oldsize = UPB_ALIGN_MALLOC(oldsize);
-  size = UPB_ALIGN_MALLOC(size);
-  UPB_ASSERT((char*)ptr + oldsize == h->ptr);  // Must be the last alloc.
-  UPB_ASSERT(size <= oldsize);
-  h->ptr = (char*)ptr + size;
-}
-
-UPB_INLINE void* upb_Arena_Realloc(upb_Arena* a, void* ptr, size_t oldsize,
-                                   size_t size) {
-  _upb_ArenaHead* h = (_upb_ArenaHead*)a;
-  oldsize = UPB_ALIGN_MALLOC(oldsize);
-  size = UPB_ALIGN_MALLOC(size);
-  bool is_most_recent_alloc = (uintptr_t)ptr + oldsize == (uintptr_t)h->ptr;
-
-  if (is_most_recent_alloc) {
-    ptrdiff_t diff = size - oldsize;
-    if ((ptrdiff_t)_upb_ArenaHas(a) >= diff) {
-      h->ptr += diff;
-      return ptr;
-    }
-  } else if (size <= oldsize) {
-    return ptr;
-  }
-
-  void* ret = upb_Arena_Malloc(a, size);
-
-  if (ret && oldsize > 0) {
-    memcpy(ret, ptr, UPB_MIN(oldsize, size));
-  }
-
-  return ret;
-}
-
-UPB_INLINE upb_Arena* upb_Arena_New(void) {
-  return upb_Arena_Init(NULL, 0, &upb_alloc_global);
-}
-
-/* Constants ******************************************************************/
-
-/* A list of types as they are encoded on-the-wire. */
-typedef enum {
-  kUpb_WireType_Varint = 0,
-  kUpb_WireType_64Bit = 1,
-  kUpb_WireType_Delimited = 2,
-  kUpb_WireType_StartGroup = 3,
-  kUpb_WireType_EndGroup = 4,
-  kUpb_WireType_32Bit = 5
-} upb_WireType;
-
-/* The types a field can have.  Note that this list is not identical to the
- * types defined in descriptor.proto, which gives INT32 and SINT32 separate
- * types (we distinguish the two with the "integer encoding" enum below). */
-typedef enum {
-  kUpb_CType_Bool = 1,
-  kUpb_CType_Float = 2,
-  kUpb_CType_Int32 = 3,
-  kUpb_CType_UInt32 = 4,
-  kUpb_CType_Enum = 5, /* Enum values are int32. */
-  kUpb_CType_Message = 6,
-  kUpb_CType_Double = 7,
-  kUpb_CType_Int64 = 8,
-  kUpb_CType_UInt64 = 9,
-  kUpb_CType_String = 10,
-  kUpb_CType_Bytes = 11
-} upb_CType;
-
-/* The repeated-ness of each field; this matches descriptor.proto. */
-typedef enum {
-  kUpb_Label_Optional = 1,
-  kUpb_Label_Required = 2,
-  kUpb_Label_Repeated = 3
-} upb_Label;
-
-/* Descriptor types, as defined in descriptor.proto. */
-typedef enum {
-  kUpb_FieldType_Double = 1,
-  kUpb_FieldType_Float = 2,
-  kUpb_FieldType_Int64 = 3,
-  kUpb_FieldType_UInt64 = 4,
-  kUpb_FieldType_Int32 = 5,
-  kUpb_FieldType_Fixed64 = 6,
-  kUpb_FieldType_Fixed32 = 7,
-  kUpb_FieldType_Bool = 8,
-  kUpb_FieldType_String = 9,
-  kUpb_FieldType_Group = 10,
-  kUpb_FieldType_Message = 11,
-  kUpb_FieldType_Bytes = 12,
-  kUpb_FieldType_UInt32 = 13,
-  kUpb_FieldType_Enum = 14,
-  kUpb_FieldType_SFixed32 = 15,
-  kUpb_FieldType_SFixed64 = 16,
-  kUpb_FieldType_SInt32 = 17,
-  kUpb_FieldType_SInt64 = 18
-} upb_FieldType;
-
-#define kUpb_Map_Begin ((size_t)-1)
-
-UPB_INLINE bool _upb_IsLittleEndian(void) {
-  int x = 1;
-  return *(char*)&x == 1;
-}
-
-UPB_INLINE uint32_t _upb_BigEndian_Swap32(uint32_t val) {
-  if (_upb_IsLittleEndian()) {
-    return val;
-  } else {
-    return ((val & 0xff) << 24) | ((val & 0xff00) << 8) |
-           ((val & 0xff0000) >> 8) | ((val & 0xff000000) >> 24);
-  }
-}
-
-UPB_INLINE uint64_t _upb_BigEndian_Swap64(uint64_t val) {
-  if (_upb_IsLittleEndian()) {
-    return val;
-  } else {
-    return ((uint64_t)_upb_BigEndian_Swap32((uint32_t)val) << 32) |
-           _upb_BigEndian_Swap32((uint32_t)(val >> 32));
-  }
-}
-
-UPB_INLINE int _upb_Log2Ceiling(int x) {
-  if (x <= 1) return 0;
-#ifdef __GNUC__
-  return 32 - __builtin_clz(x - 1);
-#else
-  int lg2 = 0;
-  while (1 << lg2 < x) lg2++;
-  return lg2;
-#endif
-}
-
-UPB_INLINE int _upb_Log2CeilingSize(int x) { return 1 << _upb_Log2Ceiling(x); }
-
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#endif /* UPB_H_ */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** upb_Message ***************************************************************/
-
-typedef void upb_Message;
-
-/* For users these are opaque. They can be obtained from
- * upb_MessageDef_MiniTable() but users cannot access any of the members. */
-struct upb_MiniTable;
-typedef struct upb_MiniTable upb_MiniTable;
-
-/* Adds unknown data (serialized protobuf data) to the given message.  The data
- * is copied into the message instance. */
-void upb_Message_AddUnknown(upb_Message* msg, const char* data, size_t len,
-                            upb_Arena* arena);
-
-/* Returns a reference to the message's unknown data. */
-const char* upb_Message_GetUnknown(const upb_Message* msg, size_t* len);
-
-/* Returns the number of extensions present in this message. */
-size_t upb_Message_ExtensionCount(const upb_Message* msg);
-
-/** upb_ExtensionRegistry *****************************************************/
-
-/* Extension registry: a dynamic data structure that stores a map of:
- *   (upb_MiniTable, number) -> extension info
- *
- * upb_decode() uses upb_ExtensionRegistry to look up extensions while parsing
- * binary format.
- *
- * upb_ExtensionRegistry is part of the mini-table (msglayout) family of
- * objects. Like all mini-table objects, it is suitable for reflection-less
- * builds that do not want to expose names into the binary.
- *
- * Unlike most mini-table types, upb_ExtensionRegistry requires dynamic memory
- * allocation and dynamic initialization:
- * * If reflection is being used, then upb_DefPool will construct an appropriate
- *   upb_ExtensionRegistry automatically.
- * * For a mini-table only build, the user must manually construct the
- *   upb_ExtensionRegistry and populate it with all of the extensions the user
- * cares about.
- * * A third alternative is to manually unpack relevant extensions after the
- *   main parse is complete, similar to how Any works. This is perhaps the
- *   nicest solution from the perspective of reducing dependencies, avoiding
- *   dynamic memory allocation, and avoiding the need to parse uninteresting
- *   extensions.  The downsides are:
- *     (1) parse errors are not caught during the main parse
- *     (2) the CPU hit of parsing comes during access, which could cause an
- *         undesirable stutter in application performance.
- *
- * Users cannot directly get or put into this map. Users can only add the
- * extensions from a generated module and pass the extension registry to the
- * binary decoder.
- *
- * A upb_DefPool provides a upb_ExtensionRegistry, so any users who use
- * reflection do not need to populate a upb_ExtensionRegistry directly.
- */
-
-struct upb_ExtensionRegistry;
-typedef struct upb_ExtensionRegistry upb_ExtensionRegistry;
-
-/* Creates a upb_ExtensionRegistry in the given arena.  The arena must outlive
- * any use of the extreg. */
-upb_ExtensionRegistry* upb_ExtensionRegistry_New(upb_Arena* arena);
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#endif /* UPB_MSG_INT_H_ */
-
-/** upb/table_internal.h ************************************************************/
-/*
- * upb_table
- *
- * This header is INTERNAL-ONLY!  Its interfaces are not public or stable!
- * This file defines very fast int->upb_value (inttable) and string->upb_value
- * (strtable) hash tables.
- *
- * The table uses chained scatter with Brent's variation (inspired by the Lua
- * implementation of hash tables).  The hash function for strings is Austin
- * Appleby's "MurmurHash."
- *
- * The inttable uses uintptr_t as its key, which guarantees it can be used to
- * store pointers or integers of at least 32 bits (upb isn't really useful on
- * systems where sizeof(void*) < 4).
- *
- * The table must be homogeneous (all values of the same type).  In debug
- * mode, we check this on insert and lookup.
- */
-
-#ifndef UPB_TABLE_H_
-#define UPB_TABLE_H_
-
-#include <stdint.h>
-#include <string.h>
-
-
-// Must be last.
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* upb_value ******************************************************************/
-
-typedef struct {
-  uint64_t val;
-} upb_value;
-
-/* Variant that works with a length-delimited rather than NULL-delimited string,
- * as supported by strtable. */
-char* upb_strdup2(const char* s, size_t len, upb_Arena* a);
-
-UPB_INLINE void _upb_value_setval(upb_value* v, uint64_t val) { v->val = val; }
-
-/* For each value ctype, define the following set of functions:
- *
- * // Get/set an int32 from a upb_value.
- * int32_t upb_value_getint32(upb_value val);
- * void upb_value_setint32(upb_value *val, int32_t cval);
- *
- * // Construct a new upb_value from an int32.
- * upb_value upb_value_int32(int32_t val); */
-#define FUNCS(name, membername, type_t, converter, proto_type)       \
-  UPB_INLINE void upb_value_set##name(upb_value* val, type_t cval) { \
-    val->val = (converter)cval;                                      \
-  }                                                                  \
-  UPB_INLINE upb_value upb_value_##name(type_t val) {                \
-    upb_value ret;                                                   \
-    upb_value_set##name(&ret, val);                                  \
-    return ret;                                                      \
-  }                                                                  \
-  UPB_INLINE type_t upb_value_get##name(upb_value val) {             \
-    return (type_t)(converter)val.val;                               \
-  }
-
-FUNCS(int32, int32, int32_t, int32_t, UPB_CTYPE_INT32)
-FUNCS(int64, int64, int64_t, int64_t, UPB_CTYPE_INT64)
-FUNCS(uint32, uint32, uint32_t, uint32_t, UPB_CTYPE_UINT32)
-FUNCS(uint64, uint64, uint64_t, uint64_t, UPB_CTYPE_UINT64)
-FUNCS(bool, _bool, bool, bool, UPB_CTYPE_BOOL)
-FUNCS(cstr, cstr, char*, uintptr_t, UPB_CTYPE_CSTR)
-FUNCS(ptr, ptr, void*, uintptr_t, UPB_CTYPE_PTR)
-FUNCS(constptr, constptr, const void*, uintptr_t, UPB_CTYPE_CONSTPTR)
-
-#undef FUNCS
-
-UPB_INLINE void upb_value_setfloat(upb_value* val, float cval) {
-  memcpy(&val->val, &cval, sizeof(cval));
-}
-
-UPB_INLINE void upb_value_setdouble(upb_value* val, double cval) {
-  memcpy(&val->val, &cval, sizeof(cval));
-}
-
-UPB_INLINE upb_value upb_value_float(float cval) {
-  upb_value ret;
-  upb_value_setfloat(&ret, cval);
-  return ret;
-}
-
-UPB_INLINE upb_value upb_value_double(double cval) {
-  upb_value ret;
-  upb_value_setdouble(&ret, cval);
-  return ret;
-}
-
-#undef SET_TYPE
-
-/* upb_tabkey *****************************************************************/
-
-/* Either:
- *   1. an actual integer key, or
- *   2. a pointer to a string prefixed by its uint32_t length, owned by us.
- *
- * ...depending on whether this is a string table or an int table.  We would
- * make this a union of those two types, but C89 doesn't support statically
- * initializing a non-first union member. */
-typedef uintptr_t upb_tabkey;
-
-UPB_INLINE char* upb_tabstr(upb_tabkey key, uint32_t* len) {
-  char* mem = (char*)key;
-  if (len) memcpy(len, mem, sizeof(*len));
-  return mem + sizeof(*len);
-}
-
-UPB_INLINE upb_StringView upb_tabstrview(upb_tabkey key) {
-  upb_StringView ret;
-  uint32_t len;
-  ret.data = upb_tabstr(key, &len);
-  ret.size = len;
-  return ret;
-}
-
-/* upb_tabval *****************************************************************/
-
-typedef struct upb_tabval {
-  uint64_t val;
-} upb_tabval;
-
-#define UPB_TABVALUE_EMPTY_INIT \
-  { -1 }
-
-/* upb_table ******************************************************************/
-
-typedef struct _upb_tabent {
-  upb_tabkey key;
-  upb_tabval val;
-
-  /* Internal chaining.  This is const so we can create static initializers for
-   * tables.  We cast away const sometimes, but *only* when the containing
-   * upb_table is known to be non-const.  This requires a bit of care, but
-   * the subtlety is confined to table.c. */
-  const struct _upb_tabent* next;
-} upb_tabent;
-
-typedef struct {
-  size_t count;       /* Number of entries in the hash part. */
-  uint32_t mask;      /* Mask to turn hash value -> bucket. */
-  uint32_t max_count; /* Max count before we hit our load limit. */
-  uint8_t size_lg2;   /* Size of the hashtable part is 2^size_lg2 entries. */
-  upb_tabent* entries;
-} upb_table;
-
-typedef struct {
-  upb_table t;
-} upb_strtable;
-
-typedef struct {
-  upb_table t;             /* For entries that don't fit in the array part. */
-  const upb_tabval* array; /* Array part of the table. See const note above. */
-  size_t array_size;       /* Array part size. */
-  size_t array_count;      /* Array part number of elements. */
-} upb_inttable;
-
-UPB_INLINE size_t upb_table_size(const upb_table* t) {
-  if (t->size_lg2 == 0)
-    return 0;
-  else
-    return 1 << t->size_lg2;
-}
-
-/* Internal-only functions, in .h file only out of necessity. */
-UPB_INLINE bool upb_tabent_isempty(const upb_tabent* e) { return e->key == 0; }
-
-/* Initialize and uninitialize a table, respectively.  If memory allocation
- * failed, false is returned that the table is uninitialized. */
-bool upb_inttable_init(upb_inttable* table, upb_Arena* a);
-bool upb_strtable_init(upb_strtable* table, size_t expected_size, upb_Arena* a);
-
-/* Returns the number of values in the table. */
-size_t upb_inttable_count(const upb_inttable* t);
-UPB_INLINE size_t upb_strtable_count(const upb_strtable* t) {
-  return t->t.count;
-}
-
-void upb_strtable_clear(upb_strtable* t);
-
-/* Inserts the given key into the hashtable with the given value.  The key must
- * not already exist in the hash table.  For string tables, the key must be
- * NULL-terminated, and the table will make an internal copy of the key.
- * Inttables must not insert a value of UINTPTR_MAX.
- *
- * If a table resize was required but memory allocation failed, false is
- * returned and the table is unchanged. */
-bool upb_inttable_insert(upb_inttable* t, uintptr_t key, upb_value val,
-                         upb_Arena* a);
-bool upb_strtable_insert(upb_strtable* t, const char* key, size_t len,
-                         upb_value val, upb_Arena* a);
-
-/* Looks up key in this table, returning "true" if the key was found.
- * If v is non-NULL, copies the value for this key into *v. */
-bool upb_inttable_lookup(const upb_inttable* t, uintptr_t key, upb_value* v);
-bool upb_strtable_lookup2(const upb_strtable* t, const char* key, size_t len,
-                          upb_value* v);
-
-/* For NULL-terminated strings. */
-UPB_INLINE bool upb_strtable_lookup(const upb_strtable* t, const char* key,
-                                    upb_value* v) {
-  return upb_strtable_lookup2(t, key, strlen(key), v);
-}
-
-/* Removes an item from the table.  Returns true if the remove was successful,
- * and stores the removed item in *val if non-NULL. */
-bool upb_inttable_remove(upb_inttable* t, uintptr_t key, upb_value* val);
-bool upb_strtable_remove2(upb_strtable* t, const char* key, size_t len,
-                          upb_value* val);
-
-UPB_INLINE bool upb_strtable_remove(upb_strtable* t, const char* key,
-                                    upb_value* v) {
-  return upb_strtable_remove2(t, key, strlen(key), v);
-}
-
-/* Updates an existing entry in an inttable.  If the entry does not exist,
- * returns false and does nothing.  Unlike insert/remove, this does not
- * invalidate iterators. */
-bool upb_inttable_replace(upb_inttable* t, uintptr_t key, upb_value val);
-
-/* Optimizes the table for the current set of entries, for both memory use and
- * lookup time.  Client should call this after all entries have been inserted;
- * inserting more entries is legal, but will likely require a table resize. */
-void upb_inttable_compact(upb_inttable* t, upb_Arena* a);
-
-/* Exposed for testing only. */
-bool upb_strtable_resize(upb_strtable* t, size_t size_lg2, upb_Arena* a);
-
-/* Iterators ******************************************************************/
-
-/* Iteration over inttable.
- *
- *   intptr_t iter = UPB_INTTABLE_BEGIN;
- *   uintptr_t key;
- *   upb_value val;
- *   while (upb_inttable_next2(t, &key, &val, &iter)) {
- *      // ...
- *   }
- */
-
-#define UPB_INTTABLE_BEGIN -1
-
-bool upb_inttable_next2(const upb_inttable* t, uintptr_t* key, upb_value* val,
-                        intptr_t* iter);
-void upb_inttable_removeiter(upb_inttable* t, intptr_t* iter);
-
-/* Iteration over strtable.
- *
- *   intptr_t iter = UPB_INTTABLE_BEGIN;
- *   upb_StringView key;
- *   upb_value val;
- *   while (upb_strtable_next2(t, &key, &val, &iter)) {
- *      // ...
- *   }
- */
-
-#define UPB_STRTABLE_BEGIN -1
-
-bool upb_strtable_next2(const upb_strtable* t, upb_StringView* key,
-                        upb_value* val, intptr_t* iter);
-void upb_strtable_removeiter(upb_strtable* t, intptr_t* iter);
-
-/* DEPRECATED iterators, slated for removal.
- *
- * Iterators for int and string tables.  We are subject to some kind of unusual
- * design constraints:
- *
- * For high-level languages:
- *  - we must be able to guarantee that we don't crash or corrupt memory even if
- *    the program accesses an invalidated iterator.
- *
- * For C++11 range-based for:
- *  - iterators must be copyable
- *  - iterators must be comparable
- *  - it must be possible to construct an "end" value.
- *
- * Iteration order is undefined.
- *
- * Modifying the table invalidates iterators.  upb_{str,int}table_done() is
- * guaranteed to work even on an invalidated iterator, as long as the table it
- * is iterating over has not been freed.  Calling next() or accessing data from
- * an invalidated iterator yields unspecified elements from the table, but it is
- * guaranteed not to crash and to return real table elements (except when done()
- * is true). */
-
-/* upb_strtable_iter **********************************************************/
-
-/*   upb_strtable_iter i;
- *   upb_strtable_begin(&i, t);
- *   for(; !upb_strtable_done(&i); upb_strtable_next(&i)) {
- *     const char *key = upb_strtable_iter_key(&i);
- *     const upb_value val = upb_strtable_iter_value(&i);
- *     // ...
- *   }
- */
-
-typedef struct {
-  const upb_strtable* t;
-  size_t index;
-} upb_strtable_iter;
-
-void upb_strtable_begin(upb_strtable_iter* i, const upb_strtable* t);
-void upb_strtable_next(upb_strtable_iter* i);
-bool upb_strtable_done(const upb_strtable_iter* i);
-upb_StringView upb_strtable_iter_key(const upb_strtable_iter* i);
-upb_value upb_strtable_iter_value(const upb_strtable_iter* i);
-void upb_strtable_iter_setdone(upb_strtable_iter* i);
-bool upb_strtable_iter_isequal(const upb_strtable_iter* i1,
-                               const upb_strtable_iter* i2);
-
-/* upb_inttable_iter **********************************************************/
-
-/*   upb_inttable_iter i;
- *   upb_inttable_begin(&i, t);
- *   for(; !upb_inttable_done(&i); upb_inttable_next(&i)) {
- *     uintptr_t key = upb_inttable_iter_key(&i);
- *     upb_value val = upb_inttable_iter_value(&i);
- *     // ...
- *   }
- */
-
-typedef struct {
-  const upb_inttable* t;
-  size_t index;
-  bool array_part;
-} upb_inttable_iter;
-
-UPB_INLINE const upb_tabent* str_tabent(const upb_strtable_iter* i) {
-  return &i->t->t.entries[i->index];
-}
-
-void upb_inttable_begin(upb_inttable_iter* i, const upb_inttable* t);
-void upb_inttable_next(upb_inttable_iter* i);
-bool upb_inttable_done(const upb_inttable_iter* i);
-uintptr_t upb_inttable_iter_key(const upb_inttable_iter* i);
-upb_value upb_inttable_iter_value(const upb_inttable_iter* i);
-void upb_inttable_iter_setdone(upb_inttable_iter* i);
-bool upb_inttable_iter_isequal(const upb_inttable_iter* i1,
-                               const upb_inttable_iter* i2);
-
-uint32_t _upb_Hash(const void* p, size_t n, uint64_t seed);
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-
-#endif /* UPB_TABLE_H_ */
-
-/* Must be last. */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** upb_*Int* conversion routines ********************************************/
-
-UPB_INLINE int32_t _upb_Int32_FromI(int v) { return (int32_t)v; }
-
-UPB_INLINE int64_t _upb_Int64_FromLL(long long v) { return (int64_t)v; }
-
-UPB_INLINE uint32_t _upb_UInt32_FromU(unsigned v) { return (uint32_t)v; }
-
-UPB_INLINE uint64_t _upb_UInt64_FromULL(unsigned long long v) {
-  return (uint64_t)v;
-}
-
-/** upb_MiniTable *************************************************************/
-
-/* upb_MiniTable represents the memory layout of a given upb_MessageDef.  The
- * members are public so generated code can initialize them, but users MUST NOT
- * read or write any of its members. */
-
-typedef struct {
-  uint32_t number;
-  uint16_t offset;
-  int16_t presence;       // If >0, hasbit_index.  If <0, ~oneof_index
-  uint16_t submsg_index;  // kUpb_NoSub if descriptortype != MESSAGE/GROUP/ENUM
-  uint8_t descriptortype;
-  uint8_t mode; /* upb_FieldMode | upb_LabelFlags |
-                   (upb_FieldRep << kUpb_FieldRep_Shift) */
-} upb_MiniTable_Field;
-
-#define kUpb_NoSub ((uint16_t)-1)
-
-typedef enum {
-  kUpb_FieldMode_Map = 0,
-  kUpb_FieldMode_Array = 1,
-  kUpb_FieldMode_Scalar = 2,
-} upb_FieldMode;
-
-// Mask to isolate the upb_FieldMode from field.mode.
-#define kUpb_FieldMode_Mask 3
-
-/* Extra flags on the mode field. */
-typedef enum {
-  kUpb_LabelFlags_IsPacked = 4,
-  kUpb_LabelFlags_IsExtension = 8,
-} upb_LabelFlags;
-
-// Note: we sort by this number when calculating layout order.
-typedef enum {
-  kUpb_FieldRep_1Byte = 0,
-  kUpb_FieldRep_4Byte = 1,
-  kUpb_FieldRep_StringView = 2,
-  kUpb_FieldRep_Pointer = 3,
-  kUpb_FieldRep_8Byte = 4,
-
-  kUpb_FieldRep_Shift = 5,  // Bit offset of the rep in upb_MiniTable_Field.mode
-  kUpb_FieldRep_Max = kUpb_FieldRep_8Byte,
-} upb_FieldRep;
-
-UPB_INLINE upb_FieldMode upb_FieldMode_Get(const upb_MiniTable_Field* field) {
-  return (upb_FieldMode)(field->mode & 3);
-}
-
-UPB_INLINE bool upb_IsRepeatedOrMap(const upb_MiniTable_Field* field) {
-  /* This works because upb_FieldMode has no value 3. */
-  return !(field->mode & kUpb_FieldMode_Scalar);
-}
-
-UPB_INLINE bool upb_IsSubMessage(const upb_MiniTable_Field* field) {
-  return field->descriptortype == kUpb_FieldType_Message ||
-         field->descriptortype == kUpb_FieldType_Group;
-}
-
-struct upb_Decoder;
-struct upb_MiniTable;
-
-typedef const char* _upb_FieldParser(struct upb_Decoder* d, const char* ptr,
-                                     upb_Message* msg, intptr_t table,
-                                     uint64_t hasbits, uint64_t data);
-
-typedef struct {
-  uint64_t field_data;
-  _upb_FieldParser* field_parser;
-} _upb_FastTable_Entry;
-
-typedef struct {
-  const int32_t* values;  // List of values <0 or >63
-  uint64_t mask;          // Bits are set for acceptable value 0 <= x < 64
-  int value_count;
-} upb_MiniTable_Enum;
-
-typedef union {
-  const struct upb_MiniTable* submsg;
-  const upb_MiniTable_Enum* subenum;
-} upb_MiniTable_Sub;
-
-typedef enum {
-  kUpb_ExtMode_NonExtendable = 0,  // Non-extendable message.
-  kUpb_ExtMode_Extendable = 1,     // Normal extendable message.
-  kUpb_ExtMode_IsMessageSet = 2,   // MessageSet message.
-  kUpb_ExtMode_IsMessageSet_ITEM =
-      3,  // MessageSet item (temporary only, see decode.c)
-
-  // During table building we steal a bit to indicate that the message is a map
-  // entry.  *Only* used during table building!
-  kUpb_ExtMode_IsMapEntry = 4,
-} upb_ExtMode;
-
-/* MessageSet wire format is:
- *   message MessageSet {
- *     repeated group Item = 1 {
- *       required int32 type_id = 2;
- *       required bytes message = 3;
- *     }
- *   }
- */
-typedef enum {
-  _UPB_MSGSET_ITEM = 1,
-  _UPB_MSGSET_TYPEID = 2,
-  _UPB_MSGSET_MESSAGE = 3,
-} upb_msgext_fieldnum;
-
-struct upb_MiniTable {
-  const upb_MiniTable_Sub* subs;
-  const upb_MiniTable_Field* fields;
-  /* Must be aligned to sizeof(void*).  Doesn't include internal members like
-   * unknown fields, extension dict, pointer to msglayout, etc. */
-  uint16_t size;
-  uint16_t field_count;
-  uint8_t ext;  // upb_ExtMode, declared as uint8_t so sizeof(ext) == 1
-  uint8_t dense_below;
-  uint8_t table_mask;
-  uint8_t required_count;  // Required fields have the lowest hasbits.
-  /* To statically initialize the tables of variable length, we need a flexible
-   * array member, and we need to compile in gnu99 mode (constant initialization
-   * of flexible array members is a GNU extension, not in C99 unfortunately. */
-  _upb_FastTable_Entry fasttable[];
-};
-
-typedef struct {
-  upb_MiniTable_Field field;
-  const upb_MiniTable* extendee;
-  upb_MiniTable_Sub sub; /* NULL unless submessage or proto2 enum */
-} upb_MiniTable_Extension;
-
-typedef struct {
-  const upb_MiniTable** msgs;
-  const upb_MiniTable_Enum** enums;
-  const upb_MiniTable_Extension** exts;
-  int msg_count;
-  int enum_count;
-  int ext_count;
-} upb_MiniTable_File;
-
-// Computes a bitmask in which the |l->required_count| lowest bits are set,
-// except that we skip the lowest bit (because upb never uses hasbit 0).
-//
-// Sample output:
-//    requiredmask(1) => 0b10 (0x2)
-//    requiredmask(5) => 0b111110 (0x3e)
-UPB_INLINE uint64_t upb_MiniTable_requiredmask(const upb_MiniTable* l) {
-  int n = l->required_count;
-  assert(0 < n && n <= 63);
-  return ((1ULL << n) - 1) << 1;
-}
-
-/** upb_ExtensionRegistry *****************************************************/
-
-/* Adds the given extension info for message type |l| and field number |num|
- * into the registry. Returns false if this message type and field number were
- * already in the map, or if memory allocation fails. */
-bool _upb_extreg_add(upb_ExtensionRegistry* r,
-                     const upb_MiniTable_Extension** e, size_t count);
-
-/* Looks up the extension (if any) defined for message type |l| and field
- * number |num|.  If an extension was found, copies the field info into |*ext|
- * and returns true. Otherwise returns false. */
-const upb_MiniTable_Extension* _upb_extreg_get(const upb_ExtensionRegistry* r,
-                                               const upb_MiniTable* l,
-                                               uint32_t num);
-
-/** upb_Message ***************************************************************/
-
-/* Internal members of a upb_Message that track unknown fields and/or
- * extensions. We can change this without breaking binary compatibility.  We put
- * these before the user's data.  The user's upb_Message* points after the
- * upb_Message_Internal. */
-
-typedef struct {
-  /* Total size of this structure, including the data that follows.
-   * Must be aligned to 8, which is alignof(upb_Message_Extension) */
-  uint32_t size;
-
-  /* Offsets relative to the beginning of this structure.
-   *
-   * Unknown data grows forward from the beginning to unknown_end.
-   * Extension data grows backward from size to ext_begin.
-   * When the two meet, we're out of data and have to realloc.
-   *
-   * If we imagine that the final member of this struct is:
-   *   char data[size - overhead];  // overhead =
-   * sizeof(upb_Message_InternalData)
-   *
-   * Then we have:
-   *   unknown data: data[0 .. (unknown_end - overhead)]
-   *   extensions data: data[(ext_begin - overhead) .. (size - overhead)] */
-  uint32_t unknown_end;
-  uint32_t ext_begin;
-  /* Data follows, as if there were an array:
-   *   char data[size - sizeof(upb_Message_InternalData)]; */
-} upb_Message_InternalData;
-
-typedef struct {
-  upb_Message_InternalData* internal;
-  /* Message data follows. */
-} upb_Message_Internal;
-
-/* Maps upb_CType -> memory size. */
-extern char _upb_CTypeo_size[12];
-
-UPB_INLINE size_t upb_msg_sizeof(const upb_MiniTable* l) {
-  return l->size + sizeof(upb_Message_Internal);
-}
-
-UPB_INLINE upb_Message* _upb_Message_New_inl(const upb_MiniTable* l,
-                                             upb_Arena* a) {
-  size_t size = upb_msg_sizeof(l);
-  void* mem = upb_Arena_Malloc(a, size + sizeof(upb_Message_Internal));
-  upb_Message* msg;
-  if (UPB_UNLIKELY(!mem)) return NULL;
-  msg = UPB_PTR_AT(mem, sizeof(upb_Message_Internal), upb_Message);
-  memset(mem, 0, size);
-  return msg;
-}
-
-/* Creates a new messages with the given layout on the given arena. */
-upb_Message* _upb_Message_New(const upb_MiniTable* l, upb_Arena* a);
-
-UPB_INLINE upb_Message_Internal* upb_Message_Getinternal(upb_Message* msg) {
-  ptrdiff_t size = sizeof(upb_Message_Internal);
-  return (upb_Message_Internal*)((char*)msg - size);
-}
-
-/* Clears the given message. */
-void _upb_Message_Clear(upb_Message* msg, const upb_MiniTable* l);
-
-/* Discards the unknown fields for this message only. */
-void _upb_Message_DiscardUnknown_shallow(upb_Message* msg);
-
-/* Adds unknown data (serialized protobuf data) to the given message.  The data
- * is copied into the message instance. */
-bool _upb_Message_AddUnknown(upb_Message* msg, const char* data, size_t len,
-                             upb_Arena* arena);
-
-/** upb_Message_Extension *****************************************************/
-
-/* The internal representation of an extension is self-describing: it contains
- * enough information that we can serialize it to binary format without needing
- * to look it up in a upb_ExtensionRegistry.
- *
- * This representation allocates 16 bytes to data on 64-bit platforms.  This is
- * rather wasteful for scalars (in the extreme case of bool, it wastes 15
- * bytes). We accept this because we expect messages to be the most common
- * extension type. */
-typedef struct {
-  const upb_MiniTable_Extension* ext;
-  union {
-    upb_StringView str;
-    void* ptr;
-    char scalar_data[8];
-  } data;
-} upb_Message_Extension;
-
-/* Adds the given extension data to the given message. |ext| is copied into the
- * message instance. This logically replaces any previously-added extension with
- * this number */
-upb_Message_Extension* _upb_Message_GetOrCreateExtension(
-    upb_Message* msg, const upb_MiniTable_Extension* ext, upb_Arena* arena);
-
-/* Returns an array of extensions for this message. Note: the array is
- * ordered in reverse relative to the order of creation. */
-const upb_Message_Extension* _upb_Message_Getexts(const upb_Message* msg,
-                                                  size_t* count);
-
-/* Returns an extension for the given field number, or NULL if no extension
- * exists for this field number. */
-const upb_Message_Extension* _upb_Message_Getext(
-    const upb_Message* msg, const upb_MiniTable_Extension* ext);
-
-void _upb_Message_Clearext(upb_Message* msg,
-                           const upb_MiniTable_Extension* ext);
-
-void _upb_Message_Clearext(upb_Message* msg,
-                           const upb_MiniTable_Extension* ext);
-
-/** Hasbit access *************************************************************/
-
-UPB_INLINE bool _upb_hasbit(const upb_Message* msg, size_t idx) {
-  return (*UPB_PTR_AT(msg, idx / 8, const char) & (1 << (idx % 8))) != 0;
-}
-
-UPB_INLINE void _upb_sethas(const upb_Message* msg, size_t idx) {
-  (*UPB_PTR_AT(msg, idx / 8, char)) |= (char)(1 << (idx % 8));
-}
-
-UPB_INLINE void _upb_clearhas(const upb_Message* msg, size_t idx) {
-  (*UPB_PTR_AT(msg, idx / 8, char)) &= (char)(~(1 << (idx % 8)));
-}
-
-UPB_INLINE size_t _upb_Message_Hasidx(const upb_MiniTable_Field* f) {
-  UPB_ASSERT(f->presence > 0);
-  return f->presence;
-}
-
-UPB_INLINE bool _upb_hasbit_field(const upb_Message* msg,
-                                  const upb_MiniTable_Field* f) {
-  return _upb_hasbit(msg, _upb_Message_Hasidx(f));
-}
-
-UPB_INLINE void _upb_sethas_field(const upb_Message* msg,
-                                  const upb_MiniTable_Field* f) {
-  _upb_sethas(msg, _upb_Message_Hasidx(f));
-}
-
-UPB_INLINE void _upb_clearhas_field(const upb_Message* msg,
-                                    const upb_MiniTable_Field* f) {
-  _upb_clearhas(msg, _upb_Message_Hasidx(f));
-}
-
-/** Oneof case access *********************************************************/
-
-UPB_INLINE uint32_t* _upb_oneofcase(upb_Message* msg, size_t case_ofs) {
-  return UPB_PTR_AT(msg, case_ofs, uint32_t);
-}
-
-UPB_INLINE uint32_t _upb_getoneofcase(const void* msg, size_t case_ofs) {
-  return *UPB_PTR_AT(msg, case_ofs, uint32_t);
-}
-
-UPB_INLINE size_t _upb_oneofcase_ofs(const upb_MiniTable_Field* f) {
-  UPB_ASSERT(f->presence < 0);
-  return ~(ptrdiff_t)f->presence;
-}
-
-UPB_INLINE uint32_t* _upb_oneofcase_field(upb_Message* msg,
-                                          const upb_MiniTable_Field* f) {
-  return _upb_oneofcase(msg, _upb_oneofcase_ofs(f));
-}
-
-UPB_INLINE uint32_t _upb_getoneofcase_field(const upb_Message* msg,
-                                            const upb_MiniTable_Field* f) {
-  return _upb_getoneofcase(msg, _upb_oneofcase_ofs(f));
-}
-
-UPB_INLINE bool _upb_has_submsg_nohasbit(const upb_Message* msg, size_t ofs) {
-  return *UPB_PTR_AT(msg, ofs, const upb_Message*) != NULL;
-}
-
-/** upb_Array *****************************************************************/
-
-/* Our internal representation for repeated fields.  */
-typedef struct {
-  uintptr_t data; /* Tagged ptr: low 3 bits of ptr are lg2(elem size). */
-  size_t len;     /* Measured in elements. */
-  size_t size;    /* Measured in elements. */
-  uint64_t junk;
-} upb_Array;
-
-UPB_INLINE const void* _upb_array_constptr(const upb_Array* arr) {
-  UPB_ASSERT((arr->data & 7) <= 4);
-  return (void*)(arr->data & ~(uintptr_t)7);
-}
-
-UPB_INLINE uintptr_t _upb_array_tagptr(void* ptr, int elem_size_lg2) {
-  UPB_ASSERT(elem_size_lg2 <= 4);
-  return (uintptr_t)ptr | elem_size_lg2;
-}
-
-UPB_INLINE void* _upb_array_ptr(upb_Array* arr) {
-  return (void*)_upb_array_constptr(arr);
-}
-
-UPB_INLINE uintptr_t _upb_tag_arrptr(void* ptr, int elem_size_lg2) {
-  UPB_ASSERT(elem_size_lg2 <= 4);
-  UPB_ASSERT(((uintptr_t)ptr & 7) == 0);
-  return (uintptr_t)ptr | (unsigned)elem_size_lg2;
-}
-
-UPB_INLINE upb_Array* _upb_Array_New(upb_Arena* a, size_t init_size,
-                                     int elem_size_lg2) {
-  const size_t arr_size = UPB_ALIGN_UP(sizeof(upb_Array), UPB_MALLOC_ALIGN);
-  const size_t bytes = arr_size + (init_size << elem_size_lg2);
-  upb_Array* arr = (upb_Array*)upb_Arena_Malloc(a, bytes);
-  if (!arr) return NULL;
-  arr->data = _upb_tag_arrptr(UPB_PTR_AT(arr, arr_size, void), elem_size_lg2);
-  arr->len = 0;
-  arr->size = init_size;
-  return arr;
-}
-
-/* Resizes the capacity of the array to be at least min_size. */
-bool _upb_array_realloc(upb_Array* arr, size_t min_size, upb_Arena* arena);
-
-/* Fallback functions for when the accessors require a resize. */
-void* _upb_Array_Resize_fallback(upb_Array** arr_ptr, size_t size,
-                                 int elem_size_lg2, upb_Arena* arena);
-bool _upb_Array_Append_fallback(upb_Array** arr_ptr, const void* value,
-                                int elem_size_lg2, upb_Arena* arena);
-
-UPB_INLINE bool _upb_array_reserve(upb_Array* arr, size_t size,
-                                   upb_Arena* arena) {
-  if (arr->size < size) return _upb_array_realloc(arr, size, arena);
-  return true;
-}
-
-UPB_INLINE bool _upb_Array_Resize(upb_Array* arr, size_t size,
-                                  upb_Arena* arena) {
-  if (!_upb_array_reserve(arr, size, arena)) return false;
-  arr->len = size;
-  return true;
-}
-
-UPB_INLINE void _upb_array_detach(const void* msg, size_t ofs) {
-  *UPB_PTR_AT(msg, ofs, upb_Array*) = NULL;
-}
-
-UPB_INLINE const void* _upb_array_accessor(const void* msg, size_t ofs,
-                                           size_t* size) {
-  const upb_Array* arr = *UPB_PTR_AT(msg, ofs, const upb_Array*);
-  if (arr) {
-    if (size) *size = arr->len;
-    return _upb_array_constptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-
-UPB_INLINE void* _upb_array_mutable_accessor(void* msg, size_t ofs,
-                                             size_t* size) {
-  upb_Array* arr = *UPB_PTR_AT(msg, ofs, upb_Array*);
-  if (arr) {
-    if (size) *size = arr->len;
-    return _upb_array_ptr(arr);
-  } else {
-    if (size) *size = 0;
-    return NULL;
-  }
-}
-
-UPB_INLINE void* _upb_Array_Resize_accessor2(void* msg, size_t ofs, size_t size,
-                                             int elem_size_lg2,
-                                             upb_Arena* arena) {
-  upb_Array** arr_ptr = UPB_PTR_AT(msg, ofs, upb_Array*);
-  upb_Array* arr = *arr_ptr;
-  if (!arr || arr->size < size) {
-    return _upb_Array_Resize_fallback(arr_ptr, size, elem_size_lg2, arena);
-  }
-  arr->len = size;
-  return _upb_array_ptr(arr);
-}
-
-UPB_INLINE bool _upb_Array_Append_accessor2(void* msg, size_t ofs,
-                                            int elem_size_lg2,
-                                            const void* value,
-                                            upb_Arena* arena) {
-  upb_Array** arr_ptr = UPB_PTR_AT(msg, ofs, upb_Array*);
-  size_t elem_size = 1 << elem_size_lg2;
-  upb_Array* arr = *arr_ptr;
-  void* ptr;
-  if (!arr || arr->len == arr->size) {
-    return _upb_Array_Append_fallback(arr_ptr, value, elem_size_lg2, arena);
-  }
-  ptr = _upb_array_ptr(arr);
-  memcpy(UPB_PTR_AT(ptr, arr->len * elem_size, char), value, elem_size);
-  arr->len++;
-  return true;
-}
-
-/* Used by old generated code, remove once all code has been regenerated. */
-UPB_INLINE int _upb_sizelg2(upb_CType type) {
-  switch (type) {
-    case kUpb_CType_Bool:
-      return 0;
-    case kUpb_CType_Float:
-    case kUpb_CType_Int32:
-    case kUpb_CType_UInt32:
-    case kUpb_CType_Enum:
-      return 2;
-    case kUpb_CType_Message:
-      return UPB_SIZE(2, 3);
-    case kUpb_CType_Double:
-    case kUpb_CType_Int64:
-    case kUpb_CType_UInt64:
-      return 3;
-    case kUpb_CType_String:
-    case kUpb_CType_Bytes:
-      return UPB_SIZE(3, 4);
-  }
-  UPB_UNREACHABLE();
-}
-UPB_INLINE void* _upb_Array_Resize_accessor(void* msg, size_t ofs, size_t size,
-                                            upb_CType type, upb_Arena* arena) {
-  return _upb_Array_Resize_accessor2(msg, ofs, size, _upb_sizelg2(type), arena);
-}
-UPB_INLINE bool _upb_Array_Append_accessor(void* msg, size_t ofs,
-                                           size_t elem_size, upb_CType type,
-                                           const void* value,
-                                           upb_Arena* arena) {
-  (void)elem_size;
-  return _upb_Array_Append_accessor2(msg, ofs, _upb_sizelg2(type), value,
-                                     arena);
-}
-
-/** upb_Map *******************************************************************/
-
-/* Right now we use strmaps for everything.  We'll likely want to use
- * integer-specific maps for integer-keyed maps.*/
-typedef struct {
-  /* Size of key and val, based on the map type.  Strings are represented as '0'
-   * because they must be handled specially. */
-  char key_size;
-  char val_size;
-
-  upb_strtable table;
-} upb_Map;
-
-/* Map entries aren't actually stored, they are only used during parsing.  For
- * parsing, it helps a lot if all map entry messages have the same layout.
- * The compiler and def.c must ensure that all map entries have this layout. */
-typedef struct {
-  upb_Message_Internal internal;
-  union {
-    upb_StringView str; /* For str/bytes. */
-    upb_value val;      /* For all other types. */
-  } k;
-  union {
-    upb_StringView str; /* For str/bytes. */
-    upb_value val;      /* For all other types. */
-  } v;
-} upb_MapEntry;
-
-/* Creates a new map on the given arena with this key/value type. */
-upb_Map* _upb_Map_New(upb_Arena* a, size_t key_size, size_t value_size);
-
-/* Converting between internal table representation and user values.
- *
- * _upb_map_tokey() and _upb_map_fromkey() are inverses.
- * _upb_map_tovalue() and _upb_map_fromvalue() are inverses.
- *
- * These functions account for the fact that strings are treated differently
- * from other types when stored in a map.
- */
-
-UPB_INLINE upb_StringView _upb_map_tokey(const void* key, size_t size) {
-  if (size == UPB_MAPTYPE_STRING) {
-    return *(upb_StringView*)key;
-  } else {
-    return upb_StringView_FromDataAndSize((const char*)key, size);
-  }
-}
-
-UPB_INLINE void _upb_map_fromkey(upb_StringView key, void* out, size_t size) {
-  if (size == UPB_MAPTYPE_STRING) {
-    memcpy(out, &key, sizeof(key));
-  } else {
-    memcpy(out, key.data, size);
-  }
-}
-
-UPB_INLINE bool _upb_map_tovalue(const void* val, size_t size,
-                                 upb_value* msgval, upb_Arena* a) {
-  if (size == UPB_MAPTYPE_STRING) {
-    upb_StringView* strp = (upb_StringView*)upb_Arena_Malloc(a, sizeof(*strp));
-    if (!strp) return false;
-    *strp = *(upb_StringView*)val;
-    *msgval = upb_value_ptr(strp);
-  } else {
-    memcpy(msgval, val, size);
-  }
-  return true;
-}
-
-UPB_INLINE void _upb_map_fromvalue(upb_value val, void* out, size_t size) {
-  if (size == UPB_MAPTYPE_STRING) {
-    const upb_StringView* strp = (const upb_StringView*)upb_value_getptr(val);
-    memcpy(out, strp, sizeof(upb_StringView));
-  } else {
-    memcpy(out, &val, size);
-  }
-}
-
-/* Map operations, shared by reflection and generated code. */
-
-UPB_INLINE size_t _upb_Map_Size(const upb_Map* map) {
-  return map->table.t.count;
-}
-
-UPB_INLINE bool _upb_Map_Get(const upb_Map* map, const void* key,
-                             size_t key_size, void* val, size_t val_size) {
-  upb_value tabval;
-  upb_StringView k = _upb_map_tokey(key, key_size);
-  bool ret = upb_strtable_lookup2(&map->table, k.data, k.size, &tabval);
-  if (ret && val) {
-    _upb_map_fromvalue(tabval, val, val_size);
-  }
-  return ret;
-}
-
-UPB_INLINE void* _upb_map_next(const upb_Map* map, size_t* iter) {
-  upb_strtable_iter it;
-  it.t = &map->table;
-  it.index = *iter;
-  upb_strtable_next(&it);
-  *iter = it.index;
-  if (upb_strtable_done(&it)) return NULL;
-  return (void*)str_tabent(&it);
-}
-
-typedef enum {
-  // LINT.IfChange
-  _kUpb_MapInsertStatus_Inserted = 0,
-  _kUpb_MapInsertStatus_Replaced = 1,
-  _kUpb_MapInsertStatus_OutOfMemory = 2,
-  // LINT.ThenChange(//depot/google3/third_party/upb/upb/collections.h)
-} _upb_MapInsertStatus;
-
-UPB_INLINE _upb_MapInsertStatus _upb_Map_Insert(upb_Map* map, const void* key,
-                                                size_t key_size, void* val,
-                                                size_t val_size, upb_Arena* a) {
-  upb_StringView strkey = _upb_map_tokey(key, key_size);
-  upb_value tabval = {0};
-  if (!_upb_map_tovalue(val, val_size, &tabval, a)) {
-    return _kUpb_MapInsertStatus_OutOfMemory;
-  }
-
-  /* TODO(haberman): add overwrite operation to minimize number of lookups. */
-  bool removed =
-      upb_strtable_remove2(&map->table, strkey.data, strkey.size, NULL);
-  if (!upb_strtable_insert(&map->table, strkey.data, strkey.size, tabval, a)) {
-    return _kUpb_MapInsertStatus_OutOfMemory;
-  }
-  return removed ? _kUpb_MapInsertStatus_Replaced
-                 : _kUpb_MapInsertStatus_Inserted;
-}
-
-UPB_INLINE bool _upb_Map_Delete(upb_Map* map, const void* key,
-                                size_t key_size) {
-  upb_StringView k = _upb_map_tokey(key, key_size);
-  return upb_strtable_remove2(&map->table, k.data, k.size, NULL);
-}
-
-UPB_INLINE void _upb_Map_Clear(upb_Map* map) {
-  upb_strtable_clear(&map->table);
-}
-
-/* Message map operations, these get the map from the message first. */
-
-UPB_INLINE size_t _upb_msg_map_size(const upb_Message* msg, size_t ofs) {
-  upb_Map* map = *UPB_PTR_AT(msg, ofs, upb_Map*);
-  return map ? _upb_Map_Size(map) : 0;
-}
-
-UPB_INLINE bool _upb_msg_map_get(const upb_Message* msg, size_t ofs,
-                                 const void* key, size_t key_size, void* val,
-                                 size_t val_size) {
-  upb_Map* map = *UPB_PTR_AT(msg, ofs, upb_Map*);
-  if (!map) return false;
-  return _upb_Map_Get(map, key, key_size, val, val_size);
-}
-
-UPB_INLINE void* _upb_msg_map_next(const upb_Message* msg, size_t ofs,
-                                   size_t* iter) {
-  upb_Map* map = *UPB_PTR_AT(msg, ofs, upb_Map*);
-  if (!map) return NULL;
-  return _upb_map_next(map, iter);
-}
-
-UPB_INLINE bool _upb_msg_map_set(upb_Message* msg, size_t ofs, const void* key,
-                                 size_t key_size, void* val, size_t val_size,
-                                 upb_Arena* arena) {
-  upb_Map** map = UPB_PTR_AT(msg, ofs, upb_Map*);
-  if (!*map) {
-    *map = _upb_Map_New(arena, key_size, val_size);
-  }
-  return _upb_Map_Insert(*map, key, key_size, val, val_size, arena) !=
-         _kUpb_MapInsertStatus_OutOfMemory;
-}
-
-UPB_INLINE bool _upb_msg_map_delete(upb_Message* msg, size_t ofs,
-                                    const void* key, size_t key_size) {
-  upb_Map* map = *UPB_PTR_AT(msg, ofs, upb_Map*);
-  if (!map) return false;
-  return _upb_Map_Delete(map, key, key_size);
-}
-
-UPB_INLINE void _upb_msg_map_clear(upb_Message* msg, size_t ofs) {
-  upb_Map* map = *UPB_PTR_AT(msg, ofs, upb_Map*);
-  if (!map) return;
-  _upb_Map_Clear(map);
-}
-
-/* Accessing map key/value from a pointer, used by generated code only. */
-
-UPB_INLINE void _upb_msg_map_key(const void* msg, void* key, size_t size) {
-  const upb_tabent* ent = (const upb_tabent*)msg;
-  uint32_t u32len;
-  upb_StringView k;
-  k.data = upb_tabstr(ent->key, &u32len);
-  k.size = u32len;
-  _upb_map_fromkey(k, key, size);
-}
-
-UPB_INLINE void _upb_msg_map_value(const void* msg, void* val, size_t size) {
-  const upb_tabent* ent = (const upb_tabent*)msg;
-  upb_value v = {ent->val.val};
-  _upb_map_fromvalue(v, val, size);
-}
-
-UPB_INLINE void _upb_msg_map_set_value(void* msg, const void* val,
-                                       size_t size) {
-  upb_tabent* ent = (upb_tabent*)msg;
-  /* This is like _upb_map_tovalue() except the entry already exists so we can
-   * reuse the allocated upb_StringView for string fields. */
-  if (size == UPB_MAPTYPE_STRING) {
-    upb_StringView* strp = (upb_StringView*)(uintptr_t)ent->val.val;
-    memcpy(strp, val, sizeof(*strp));
-  } else {
-    memcpy(&ent->val.val, val, size);
-  }
-}
-
-/** _upb_mapsorter ************************************************************/
-
-/* _upb_mapsorter sorts maps and provides ordered iteration over the entries.
- * Since maps can be recursive (map values can be messages which contain other
- * maps). _upb_mapsorter can contain a stack of maps. */
-
-typedef struct {
-  upb_tabent const** entries;
-  int size;
-  int cap;
-} _upb_mapsorter;
-
-typedef struct {
-  int start;
-  int pos;
-  int end;
-} _upb_sortedmap;
-
-UPB_INLINE void _upb_mapsorter_init(_upb_mapsorter* s) {
-  s->entries = NULL;
-  s->size = 0;
-  s->cap = 0;
-}
-
-UPB_INLINE void _upb_mapsorter_destroy(_upb_mapsorter* s) {
-  if (s->entries) free(s->entries);
-}
-
-bool _upb_mapsorter_pushmap(_upb_mapsorter* s, upb_FieldType key_type,
-                            const upb_Map* map, _upb_sortedmap* sorted);
-
-UPB_INLINE void _upb_mapsorter_popmap(_upb_mapsorter* s,
-                                      _upb_sortedmap* sorted) {
-  s->size = sorted->start;
-}
-
-UPB_INLINE bool _upb_sortedmap_next(_upb_mapsorter* s, const upb_Map* map,
-                                    _upb_sortedmap* sorted, upb_MapEntry* ent) {
-  if (sorted->pos == sorted->end) return false;
-  const upb_tabent* tabent = s->entries[sorted->pos++];
-  upb_StringView key = upb_tabstrview(tabent->key);
-  _upb_map_fromkey(key, &ent->k, map->key_size);
-  upb_value val = {tabent->val.val};
-  _upb_map_fromvalue(val, &ent->v, map->val_size);
-  return true;
-}
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-
-#endif /* UPB_MSG_INT_H_ */
-
-/** upb/decode.h ************************************************************/
-/*
- * upb_decode: parsing into a upb_Message using a upb_MiniTable.
- */
-
-#ifndef UPB_DECODE_H_
-#define UPB_DECODE_H_
-
-
-/* Must be last. */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-enum {
-  /* If set, strings will alias the input buffer instead of copying into the
-   * arena. */
-  kUpb_DecodeOption_AliasString = 1,
-
-  /* If set, the parse will return failure if any message is missing any
-   * required fields when the message data ends.  The parse will still continue,
-   * and the failure will only be reported at the end.
-   *
-   * IMPORTANT CAVEATS:
-   *
-   * 1. This can throw a false positive failure if an incomplete message is seen
-   *    on the wire but is later completed when the sub-message occurs again.
-   *    For this reason, a second pass is required to verify a failure, to be
-   *    truly robust.
-   *
-   * 2. This can return a false success if you are decoding into a message that
-   *    already has some sub-message fields present.  If the sub-message does
-   *    not occur in the binary payload, we will never visit it and discover the
-   *    incomplete sub-message.  For this reason, this check is only useful for
-   *    implemting ParseFromString() semantics.  For MergeFromString(), a
-   *    post-parse validation step will always be necessary. */
-  kUpb_DecodeOption_CheckRequired = 2,
-};
-
-#define UPB_DECODE_MAXDEPTH(depth) ((depth) << 16)
-
-typedef enum {
-  kUpb_DecodeStatus_Ok = 0,
-  kUpb_DecodeStatus_Malformed = 1,         // Wire format was corrupt
-  kUpb_DecodeStatus_OutOfMemory = 2,       // Arena alloc failed
-  kUpb_DecodeStatus_BadUtf8 = 3,           // String field had bad UTF-8
-  kUpb_DecodeStatus_MaxDepthExceeded = 4,  // Exceeded UPB_DECODE_MAXDEPTH
-
-  // kUpb_DecodeOption_CheckRequired failed (see above), but the parse otherwise
-  // succeeded.
-  kUpb_DecodeStatus_MissingRequired = 5,
-} upb_DecodeStatus;
-
-upb_DecodeStatus upb_Decode(const char* buf, size_t size, upb_Message* msg,
-                            const upb_MiniTable* l,
-                            const upb_ExtensionRegistry* extreg, int options,
-                            upb_Arena* arena);
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-
-#endif /* UPB_DECODE_H_ */
-
-/** upb/decode_fast.h ************************************************************/
-// These are the specialized field parser functions for the fast parser.
-// Generated tables will refer to these by name.
-//
-// The function names are encoded with names like:
-//
-//   //  123 4
-//   upb_pss_1bt();   // Parse singular string, 1 byte tag.
-//
-// In position 1:
-//   - 'p' for parse, most function use this
-//   - 'c' for copy, for when we are copying strings instead of aliasing
-//
-// In position 2 (cardinality):
-//   - 's' for singular, with or without hasbit
-//   - 'o' for oneof
-//   - 'r' for non-packed repeated
-//   - 'p' for packed repeated
-//
-// In position 3 (type):
-//   - 'b1' for bool
-//   - 'v4' for 4-byte varint
-//   - 'v8' for 8-byte varint
-//   - 'z4' for zig-zag-encoded 4-byte varint
-//   - 'z8' for zig-zag-encoded 8-byte varint
-//   - 'f4' for 4-byte fixed
-//   - 'f8' for 8-byte fixed
-//   - 'm' for sub-message
-//   - 's' for string (validate UTF-8)
-//   - 'b' for bytes
-//
-// In position 4 (tag length):
-//   - '1' for one-byte tags (field numbers 1-15)
-//   - '2' for two-byte tags (field numbers 16-2048)
-
-#ifndef UPB_DECODE_FAST_H_
-#define UPB_DECODE_FAST_H_
-
-
-struct upb_Decoder;
-
-// The fallback, generic parsing function that can handle any field type.
-// This just uses the regular (non-fast) parser to parse a single field.
-const char* fastdecode_generic(struct upb_Decoder* d, const char* ptr,
-                               upb_Message* msg, intptr_t table,
-                               uint64_t hasbits, uint64_t data);
-
-#define UPB_PARSE_PARAMS                                                    \
-  struct upb_Decoder *d, const char *ptr, upb_Message *msg, intptr_t table, \
-      uint64_t hasbits, uint64_t data
-
-/* primitive fields ***********************************************************/
-
-#define F(card, type, valbytes, tagbytes) \
-  const char* upb_p##card##type##valbytes##_##tagbytes##bt(UPB_PARSE_PARAMS);
-
-#define TYPES(card, tagbytes) \
-  F(card, b, 1, tagbytes)     \
-  F(card, v, 4, tagbytes)     \
-  F(card, v, 8, tagbytes)     \
-  F(card, z, 4, tagbytes)     \
-  F(card, z, 8, tagbytes)     \
-  F(card, f, 4, tagbytes)     \
-  F(card, f, 8, tagbytes)
-
-#define TAGBYTES(card) \
-  TYPES(card, 1)       \
-  TYPES(card, 2)
-
-TAGBYTES(s)
-TAGBYTES(o)
-TAGBYTES(r)
-TAGBYTES(p)
-
-#undef F
-#undef TYPES
-#undef TAGBYTES
-
-/* string fields **************************************************************/
-
-#define F(card, tagbytes, type)                                     \
-  const char* upb_p##card##type##_##tagbytes##bt(UPB_PARSE_PARAMS); \
-  const char* upb_c##card##type##_##tagbytes##bt(UPB_PARSE_PARAMS);
-
-#define UTF8(card, tagbytes) \
-  F(card, tagbytes, s)       \
-  F(card, tagbytes, b)
-
-#define TAGBYTES(card) \
-  UTF8(card, 1)        \
-  UTF8(card, 2)
-
-TAGBYTES(s)
-TAGBYTES(o)
-TAGBYTES(r)
-
-#undef F
-#undef TAGBYTES
-
-/* sub-message fields *********************************************************/
-
-#define F(card, tagbytes, size_ceil, ceil_arg) \
-  const char* upb_p##card##m_##tagbytes##bt_max##size_ceil##b(UPB_PARSE_PARAMS);
-
-#define SIZES(card, tagbytes) \
-  F(card, tagbytes, 64, 64)   \
-  F(card, tagbytes, 128, 128) \
-  F(card, tagbytes, 192, 192) \
-  F(card, tagbytes, 256, 256) \
-  F(card, tagbytes, max, -1)
-
-#define TAGBYTES(card) \
-  SIZES(card, 1)       \
-  SIZES(card, 2)
-
-TAGBYTES(s)
-TAGBYTES(o)
-TAGBYTES(r)
-
-#undef TAGBYTES
-#undef SIZES
-#undef F
-
-#undef UPB_PARSE_PARAMS
-
-#endif /* UPB_DECODE_FAST_H_ */
-
-/** upb/encode.h ************************************************************/
-/*
- * upb_Encode: parsing into a upb_Message using a upb_MiniTable.
- */
-
-#ifndef UPB_ENCODE_H_
-#define UPB_ENCODE_H_
-
-
-/* Must be last. */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-enum {
-  /* If set, the results of serializing will be deterministic across all
-   * instances of this binary. There are no guarantees across different
-   * binary builds.
-   *
-   * If your proto contains maps, the encoder will need to malloc()/free()
-   * memory during encode. */
-  kUpb_Encode_Deterministic = 1,
-
-  /* When set, unknown fields are not printed. */
-  kUpb_Encode_SkipUnknown = 2,
-
-  /* When set, the encode will fail if any required fields are missing. */
-  kUpb_Encode_CheckRequired = 4,
-};
-
-#define UPB_ENCODE_MAXDEPTH(depth) ((depth) << 16)
-
-char* upb_Encode(const void* msg, const upb_MiniTable* l, int options,
-                 upb_Arena* arena, size_t* size);
-
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#endif /* UPB_ENCODE_H_ */
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct google_protobuf_FileDescriptorSet;
-struct google_protobuf_FileDescriptorProto;
-struct google_protobuf_DescriptorProto;
-struct google_protobuf_DescriptorProto_ExtensionRange;
-struct google_protobuf_DescriptorProto_ReservedRange;
-struct google_protobuf_ExtensionRangeOptions;
-struct google_protobuf_FieldDescriptorProto;
-struct google_protobuf_OneofDescriptorProto;
-struct google_protobuf_EnumDescriptorProto;
-struct google_protobuf_EnumDescriptorProto_EnumReservedRange;
-struct google_protobuf_EnumValueDescriptorProto;
-struct google_protobuf_ServiceDescriptorProto;
-struct google_protobuf_MethodDescriptorProto;
-struct google_protobuf_FileOptions;
-struct google_protobuf_MessageOptions;
-struct google_protobuf_FieldOptions;
-struct google_protobuf_OneofOptions;
-struct google_protobuf_EnumOptions;
-struct google_protobuf_EnumValueOptions;
-struct google_protobuf_ServiceOptions;
-struct google_protobuf_MethodOptions;
-struct google_protobuf_UninterpretedOption;
-struct google_protobuf_UninterpretedOption_NamePart;
-struct google_protobuf_SourceCodeInfo;
-struct google_protobuf_SourceCodeInfo_Location;
-struct google_protobuf_GeneratedCodeInfo;
-struct google_protobuf_GeneratedCodeInfo_Annotation;
-typedef struct google_protobuf_FileDescriptorSet google_protobuf_FileDescriptorSet;
-typedef struct google_protobuf_FileDescriptorProto google_protobuf_FileDescriptorProto;
-typedef struct google_protobuf_DescriptorProto google_protobuf_DescriptorProto;
-typedef struct google_protobuf_DescriptorProto_ExtensionRange google_protobuf_DescriptorProto_ExtensionRange;
-typedef struct google_protobuf_DescriptorProto_ReservedRange google_protobuf_DescriptorProto_ReservedRange;
-typedef struct google_protobuf_ExtensionRangeOptions google_protobuf_ExtensionRangeOptions;
-typedef struct google_protobuf_FieldDescriptorProto google_protobuf_FieldDescriptorProto;
-typedef struct google_protobuf_OneofDescriptorProto google_protobuf_OneofDescriptorProto;
-typedef struct google_protobuf_EnumDescriptorProto google_protobuf_EnumDescriptorProto;
-typedef struct google_protobuf_EnumDescriptorProto_EnumReservedRange google_protobuf_EnumDescriptorProto_EnumReservedRange;
-typedef struct google_protobuf_EnumValueDescriptorProto google_protobuf_EnumValueDescriptorProto;
-typedef struct google_protobuf_ServiceDescriptorProto google_protobuf_ServiceDescriptorProto;
-typedef struct google_protobuf_MethodDescriptorProto google_protobuf_MethodDescriptorProto;
-typedef struct google_protobuf_FileOptions google_protobuf_FileOptions;
-typedef struct google_protobuf_MessageOptions google_protobuf_MessageOptions;
-typedef struct google_protobuf_FieldOptions google_protobuf_FieldOptions;
-typedef struct google_protobuf_OneofOptions google_protobuf_OneofOptions;
-typedef struct google_protobuf_EnumOptions google_protobuf_EnumOptions;
-typedef struct google_protobuf_EnumValueOptions google_protobuf_EnumValueOptions;
-typedef struct google_protobuf_ServiceOptions google_protobuf_ServiceOptions;
-typedef struct google_protobuf_MethodOptions google_protobuf_MethodOptions;
-typedef struct google_protobuf_UninterpretedOption google_protobuf_UninterpretedOption;
-typedef struct google_protobuf_UninterpretedOption_NamePart google_protobuf_UninterpretedOption_NamePart;
-typedef struct google_protobuf_SourceCodeInfo google_protobuf_SourceCodeInfo;
-typedef struct google_protobuf_SourceCodeInfo_Location google_protobuf_SourceCodeInfo_Location;
-typedef struct google_protobuf_GeneratedCodeInfo google_protobuf_GeneratedCodeInfo;
-typedef struct google_protobuf_GeneratedCodeInfo_Annotation google_protobuf_GeneratedCodeInfo_Annotation;
-extern const upb_MiniTable google_protobuf_FileDescriptorSet_msginit;
-extern const upb_MiniTable google_protobuf_FileDescriptorProto_msginit;
-extern const upb_MiniTable google_protobuf_DescriptorProto_msginit;
-extern const upb_MiniTable google_protobuf_DescriptorProto_ExtensionRange_msginit;
-extern const upb_MiniTable google_protobuf_DescriptorProto_ReservedRange_msginit;
-extern const upb_MiniTable google_protobuf_ExtensionRangeOptions_msginit;
-extern const upb_MiniTable google_protobuf_FieldDescriptorProto_msginit;
-extern const upb_MiniTable google_protobuf_OneofDescriptorProto_msginit;
-extern const upb_MiniTable google_protobuf_EnumDescriptorProto_msginit;
-extern const upb_MiniTable google_protobuf_EnumDescriptorProto_EnumReservedRange_msginit;
-extern const upb_MiniTable google_protobuf_EnumValueDescriptorProto_msginit;
-extern const upb_MiniTable google_protobuf_ServiceDescriptorProto_msginit;
-extern const upb_MiniTable google_protobuf_MethodDescriptorProto_msginit;
-extern const upb_MiniTable google_protobuf_FileOptions_msginit;
-extern const upb_MiniTable google_protobuf_MessageOptions_msginit;
-extern const upb_MiniTable google_protobuf_FieldOptions_msginit;
-extern const upb_MiniTable google_protobuf_OneofOptions_msginit;
-extern const upb_MiniTable google_protobuf_EnumOptions_msginit;
-extern const upb_MiniTable google_protobuf_EnumValueOptions_msginit;
-extern const upb_MiniTable google_protobuf_ServiceOptions_msginit;
-extern const upb_MiniTable google_protobuf_MethodOptions_msginit;
-extern const upb_MiniTable google_protobuf_UninterpretedOption_msginit;
-extern const upb_MiniTable google_protobuf_UninterpretedOption_NamePart_msginit;
-extern const upb_MiniTable google_protobuf_SourceCodeInfo_msginit;
-extern const upb_MiniTable google_protobuf_SourceCodeInfo_Location_msginit;
-extern const upb_MiniTable google_protobuf_GeneratedCodeInfo_msginit;
-extern const upb_MiniTable google_protobuf_GeneratedCodeInfo_Annotation_msginit;
-
-typedef enum {
-  google_protobuf_FieldDescriptorProto_LABEL_OPTIONAL = 1,
-  google_protobuf_FieldDescriptorProto_LABEL_REQUIRED = 2,
-  google_protobuf_FieldDescriptorProto_LABEL_REPEATED = 3
-} google_protobuf_FieldDescriptorProto_Label;
-
-typedef enum {
-  google_protobuf_FieldDescriptorProto_TYPE_DOUBLE = 1,
-  google_protobuf_FieldDescriptorProto_TYPE_FLOAT = 2,
-  google_protobuf_FieldDescriptorProto_TYPE_INT64 = 3,
-  google_protobuf_FieldDescriptorProto_TYPE_UINT64 = 4,
-  google_protobuf_FieldDescriptorProto_TYPE_INT32 = 5,
-  google_protobuf_FieldDescriptorProto_TYPE_FIXED64 = 6,
-  google_protobuf_FieldDescriptorProto_TYPE_FIXED32 = 7,
-  google_protobuf_FieldDescriptorProto_TYPE_BOOL = 8,
-  google_protobuf_FieldDescriptorProto_TYPE_STRING = 9,
-  google_protobuf_FieldDescriptorProto_TYPE_GROUP = 10,
-  google_protobuf_FieldDescriptorProto_TYPE_MESSAGE = 11,
-  google_protobuf_FieldDescriptorProto_TYPE_BYTES = 12,
-  google_protobuf_FieldDescriptorProto_TYPE_UINT32 = 13,
-  google_protobuf_FieldDescriptorProto_TYPE_ENUM = 14,
-  google_protobuf_FieldDescriptorProto_TYPE_SFIXED32 = 15,
-  google_protobuf_FieldDescriptorProto_TYPE_SFIXED64 = 16,
-  google_protobuf_FieldDescriptorProto_TYPE_SINT32 = 17,
-  google_protobuf_FieldDescriptorProto_TYPE_SINT64 = 18
-} google_protobuf_FieldDescriptorProto_Type;
-
-typedef enum {
-  google_protobuf_FieldOptions_STRING = 0,
-  google_protobuf_FieldOptions_CORD = 1,
-  google_protobuf_FieldOptions_STRING_PIECE = 2
-} google_protobuf_FieldOptions_CType;
-
-typedef enum {
-  google_protobuf_FieldOptions_JS_NORMAL = 0,
-  google_protobuf_FieldOptions_JS_STRING = 1,
-  google_protobuf_FieldOptions_JS_NUMBER = 2
-} google_protobuf_FieldOptions_JSType;
-
-typedef enum {
-  google_protobuf_FileOptions_SPEED = 1,
-  google_protobuf_FileOptions_CODE_SIZE = 2,
-  google_protobuf_FileOptions_LITE_RUNTIME = 3
-} google_protobuf_FileOptions_OptimizeMode;
-
-typedef enum {
-  google_protobuf_MethodOptions_IDEMPOTENCY_UNKNOWN = 0,
-  google_protobuf_MethodOptions_NO_SIDE_EFFECTS = 1,
-  google_protobuf_MethodOptions_IDEMPOTENT = 2
-} google_protobuf_MethodOptions_IdempotencyLevel;
-
-
-extern const upb_MiniTable_Enum google_protobuf_FieldDescriptorProto_Label_enuminit;
-extern const upb_MiniTable_Enum google_protobuf_FieldDescriptorProto_Type_enuminit;
-extern const upb_MiniTable_Enum google_protobuf_FieldOptions_CType_enuminit;
-extern const upb_MiniTable_Enum google_protobuf_FieldOptions_JSType_enuminit;
-extern const upb_MiniTable_Enum google_protobuf_FileOptions_OptimizeMode_enuminit;
-extern const upb_MiniTable_Enum google_protobuf_MethodOptions_IdempotencyLevel_enuminit;
-
-/* google.protobuf.FileDescriptorSet */
-
-UPB_INLINE google_protobuf_FileDescriptorSet* google_protobuf_FileDescriptorSet_new(upb_Arena* arena) {
-  return (google_protobuf_FileDescriptorSet*)_upb_Message_New(&google_protobuf_FileDescriptorSet_msginit, arena);
-}
-UPB_INLINE google_protobuf_FileDescriptorSet* google_protobuf_FileDescriptorSet_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_FileDescriptorSet* ret = google_protobuf_FileDescriptorSet_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_FileDescriptorSet_msginit, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_FileDescriptorSet* google_protobuf_FileDescriptorSet_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_FileDescriptorSet* ret = google_protobuf_FileDescriptorSet_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_FileDescriptorSet_msginit, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_FileDescriptorSet_serialize(const google_protobuf_FileDescriptorSet* msg, upb_Arena* arena, size_t* len) {
-  return upb_Encode(msg, &google_protobuf_FileDescriptorSet_msginit, 0, arena, len);
-}
-UPB_INLINE char* google_protobuf_FileDescriptorSet_serialize_ex(const google_protobuf_FileDescriptorSet* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  return upb_Encode(msg, &google_protobuf_FileDescriptorSet_msginit, options, arena, len);
-}
-UPB_INLINE bool google_protobuf_FileDescriptorSet_has_file(const google_protobuf_FileDescriptorSet* msg) {
-  return _upb_has_submsg_nohasbit(msg, UPB_SIZE(0, 0));
-}
-UPB_INLINE void google_protobuf_FileDescriptorSet_clear_file(const google_protobuf_FileDescriptorSet* msg) {
-  _upb_array_detach(msg, UPB_SIZE(0, 0));
-}
-UPB_INLINE const google_protobuf_FileDescriptorProto* const* google_protobuf_FileDescriptorSet_file(const google_protobuf_FileDescriptorSet* msg, size_t* len) {
-  return (const google_protobuf_FileDescriptorProto* const*)_upb_array_accessor(msg, UPB_SIZE(0, 0), len);
-}
-
-UPB_INLINE google_protobuf_FileDescriptorProto** google_protobuf_FileDescriptorSet_mutable_file(google_protobuf_FileDescriptorSet* msg, size_t* len) {
-  return (google_protobuf_FileDescriptorProto**)_upb_array_mutable_accessor(msg, UPB_SIZE(0, 0), len);
-}
-UPB_INLINE google_protobuf_FileDescriptorProto** google_protobuf_FileDescriptorSet_resize_file(google_protobuf_FileDescriptorSet* msg, size_t len, upb_Arena* arena) {
-  return (google_protobuf_FileDescriptorProto**)_upb_Array_Resize_accessor2(msg, UPB_SIZE(0, 0), len, UPB_SIZE(2, 3), arena);
-}
-UPB_INLINE struct google_protobuf_FileDescriptorProto* google_protobuf_FileDescriptorSet_add_file(google_protobuf_FileDescriptorSet* msg, upb_Arena* arena) {
-  struct google_protobuf_FileDescriptorProto* sub = (struct google_protobuf_FileDescriptorProto*)_upb_Message_New(&google_protobuf_FileDescriptorProto_msginit, arena);
-  bool ok = _upb_Array_Append_accessor2(msg, UPB_SIZE(0, 0), UPB_SIZE(2, 3), &sub, arena);
-  if (!ok) return NULL;
-  return sub;
-}
-
-/* google.protobuf.FileDescriptorProto */
-
-UPB_INLINE google_protobuf_FileDescriptorProto* google_protobuf_FileDescriptorProto_new(upb_Arena* arena) {
-  return (google_protobuf_FileDescriptorProto*)_upb_Message_New(&google_protobuf_FileDescriptorProto_msginit, arena);
-}
-UPB_INLINE google_protobuf_FileDescriptorProto* google_protobuf_FileDescriptorProto_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_FileDescriptorProto* ret = google_protobuf_FileDescriptorProto_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_FileDescriptorProto_msginit, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_FileDescriptorProto* google_protobuf_FileDescriptorProto_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_FileDescriptorProto* ret = google_protobuf_FileDescriptorProto_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_FileDescriptorProto_msginit, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_FileDescriptorProto_serialize(const google_protobuf_FileDescriptorProto* msg, upb_Arena* arena, size_t* len) {
-  return upb_Encode(msg, &google_protobuf_FileDescriptorProto_msginit, 0, arena, len);
-}
-UPB_INLINE char* google_protobuf_FileDescriptorProto_serialize_ex(const google_protobuf_FileDescriptorProto* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  return upb_Encode(msg, &google_protobuf_FileDescriptorProto_msginit, options, arena, len);
-}
-UPB_INLINE bool google_protobuf_FileDescriptorProto_has_name(const google_protobuf_FileDescriptorProto* msg) {
-  return _upb_hasbit(msg, 1);
-}
-UPB_INLINE void google_protobuf_FileDescriptorProto_clear_name(const google_protobuf_FileDescriptorProto* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_StringView) = upb_StringView_FromDataAndSize(NULL, 0);
-  _upb_clearhas(msg, 1);
-}
-UPB_INLINE upb_StringView google_protobuf_FileDescriptorProto_name(const google_protobuf_FileDescriptorProto* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_StringView);
-}
-UPB_INLINE bool google_protobuf_FileDescriptorProto_has_package(const google_protobuf_FileDescriptorProto* msg) {
-  return _upb_hasbit(msg, 2);
-}
-UPB_INLINE void google_protobuf_FileDescriptorProto_clear_package(const google_protobuf_FileDescriptorProto* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(12, 24), upb_StringView) = upb_StringView_FromDataAndSize(NULL, 0);
-  _upb_clearhas(msg, 2);
-}
-UPB_INLINE upb_StringView google_protobuf_FileDescriptorProto_package(const google_protobuf_FileDescriptorProto* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(12, 24), upb_StringView);
-}
-UPB_INLINE void google_protobuf_FileDescriptorProto_clear_dependency(const google_protobuf_FileDescriptorProto* msg) {
-  _upb_array_detach(msg, UPB_SIZE(20, 40));
-}
-UPB_INLINE upb_StringView const* google_protobuf_FileDescriptorProto_dependency(const google_protobuf_FileDescriptorProto* msg, size_t* len) {
-  return (upb_StringView const*)_upb_array_accessor(msg, UPB_SIZE(20, 40), len);
-}
-UPB_INLINE bool google_protobuf_FileDescriptorProto_has_message_type(const google_protobuf_FileDescriptorProto* msg) {
-  return _upb_has_submsg_nohasbit(msg, UPB_SIZE(24, 48));
-}
-UPB_INLINE void google_protobuf_FileDescriptorProto_clear_message_type(const google_protobuf_FileDescriptorProto* msg) {
-  _upb_array_detach(msg, UPB_SIZE(24, 48));
-}
-UPB_INLINE const google_protobuf_DescriptorProto* const* google_protobuf_FileDescriptorProto_message_type(const google_protobuf_FileDescriptorProto* msg, size_t* len) {
-  return (const google_protobuf_DescriptorProto* const*)_upb_array_accessor(msg, UPB_SIZE(24, 48), len);
-}
-UPB_INLINE bool google_protobuf_FileDescriptorProto_has_enum_type(const google_protobuf_FileDescriptorProto* msg) {
-  return _upb_has_submsg_nohasbit(msg, UPB_SIZE(28, 56));
-}
-UPB_INLINE void google_protobuf_FileDescriptorProto_clear_enum_type(const google_protobuf_FileDescriptorProto* msg) {
-  _upb_array_detach(msg, UPB_SIZE(28, 56));
-}
-UPB_INLINE const google_protobuf_EnumDescriptorProto* const* google_protobuf_FileDescriptorProto_enum_type(const google_protobuf_FileDescriptorProto* msg, size_t* len) {
-  return (const google_protobuf_EnumDescriptorProto* const*)_upb_array_accessor(msg, UPB_SIZE(28, 56), len);
-}
-UPB_INLINE bool google_protobuf_FileDescriptorProto_has_service(const google_protobuf_FileDescriptorProto* msg) {
-  return _upb_has_submsg_nohasbit(msg, UPB_SIZE(32, 64));
-}
-UPB_INLINE void google_protobuf_FileDescriptorProto_clear_service(const google_protobuf_FileDescriptorProto* msg) {
-  _upb_array_detach(msg, UPB_SIZE(32, 64));
-}
-UPB_INLINE const google_protobuf_ServiceDescriptorProto* const* google_protobuf_FileDescriptorProto_service(const google_protobuf_FileDescriptorProto* msg, size_t* len) {
-  return (const google_protobuf_ServiceDescriptorProto* const*)_upb_array_accessor(msg, UPB_SIZE(32, 64), len);
-}
-UPB_INLINE bool google_protobuf_FileDescriptorProto_has_extension(const google_protobuf_FileDescriptorProto* msg) {
-  return _upb_has_submsg_nohasbit(msg, UPB_SIZE(36, 72));
-}
-UPB_INLINE void google_protobuf_FileDescriptorProto_clear_extension(const google_protobuf_FileDescriptorProto* msg) {
-  _upb_array_detach(msg, UPB_SIZE(36, 72));
-}
-UPB_INLINE const google_protobuf_FieldDescriptorProto* const* google_protobuf_FileDescriptorProto_extension(const google_protobuf_FileDescriptorProto* msg, size_t* len) {
-  return (const google_protobuf_FieldDescriptorProto* const*)_upb_array_accessor(msg, UPB_SIZE(36, 72), len);
-}
-UPB_INLINE bool google_protobuf_FileDescriptorProto_has_options(const google_protobuf_FileDescriptorProto* msg) {
-  return _upb_hasbit(msg, 3);
-}
-UPB_INLINE void google_protobuf_FileDescriptorProto_clear_options(const google_protobuf_FileDescriptorProto* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(40, 80), const upb_Message*) = NULL;
-}
-UPB_INLINE const google_protobuf_FileOptions* google_protobuf_FileDescriptorProto_options(const google_protobuf_FileDescriptorProto* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(40, 80), const google_protobuf_FileOptions*);
-}
-UPB_INLINE bool google_protobuf_FileDescriptorProto_has_source_code_info(const google_protobuf_FileDescriptorProto* msg) {
-  return _upb_hasbit(msg, 4);
-}
-UPB_INLINE void google_protobuf_FileDescriptorProto_clear_source_code_info(const google_protobuf_FileDescriptorProto* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(44, 88), const upb_Message*) = NULL;
-}
-UPB_INLINE const google_protobuf_SourceCodeInfo* google_protobuf_FileDescriptorProto_source_code_info(const google_protobuf_FileDescriptorProto* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(44, 88), const google_protobuf_SourceCodeInfo*);
-}
-UPB_INLINE void google_protobuf_FileDescriptorProto_clear_public_dependency(const google_protobuf_FileDescriptorProto* msg) {
-  _upb_array_detach(msg, UPB_SIZE(48, 96));
-}
-UPB_INLINE int32_t const* google_protobuf_FileDescriptorProto_public_dependency(const google_protobuf_FileDescriptorProto* msg, size_t* len) {
-  return (int32_t const*)_upb_array_accessor(msg, UPB_SIZE(48, 96), len);
-}
-UPB_INLINE void google_protobuf_FileDescriptorProto_clear_weak_dependency(const google_protobuf_FileDescriptorProto* msg) {
-  _upb_array_detach(msg, UPB_SIZE(52, 104));
-}
-UPB_INLINE int32_t const* google_protobuf_FileDescriptorProto_weak_dependency(const google_protobuf_FileDescriptorProto* msg, size_t* len) {
-  return (int32_t const*)_upb_array_accessor(msg, UPB_SIZE(52, 104), len);
-}
-UPB_INLINE bool google_protobuf_FileDescriptorProto_has_syntax(const google_protobuf_FileDescriptorProto* msg) {
-  return _upb_hasbit(msg, 5);
-}
-UPB_INLINE void google_protobuf_FileDescriptorProto_clear_syntax(const google_protobuf_FileDescriptorProto* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(56, 112), upb_StringView) = upb_StringView_FromDataAndSize(NULL, 0);
-  _upb_clearhas(msg, 5);
-}
-UPB_INLINE upb_StringView google_protobuf_FileDescriptorProto_syntax(const google_protobuf_FileDescriptorProto* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(56, 112), upb_StringView);
-}
-
-UPB_INLINE void google_protobuf_FileDescriptorProto_set_name(google_protobuf_FileDescriptorProto *msg, upb_StringView value) {
-  _upb_sethas(msg, 1);
-  *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_StringView) = value;
-}
-UPB_INLINE void google_protobuf_FileDescriptorProto_set_package(google_protobuf_FileDescriptorProto *msg, upb_StringView value) {
-  _upb_sethas(msg, 2);
-  *UPB_PTR_AT(msg, UPB_SIZE(12, 24), upb_StringView) = value;
-}
-UPB_INLINE upb_StringView* google_protobuf_FileDescriptorProto_mutable_dependency(google_protobuf_FileDescriptorProto* msg, size_t* len) {
-  return (upb_StringView*)_upb_array_mutable_accessor(msg, UPB_SIZE(20, 40), len);
-}
-UPB_INLINE upb_StringView* google_protobuf_FileDescriptorProto_resize_dependency(google_protobuf_FileDescriptorProto* msg, size_t len, upb_Arena* arena) {
-  return (upb_StringView*)_upb_Array_Resize_accessor2(msg, UPB_SIZE(20, 40), len, UPB_SIZE(3, 4), arena);
-}
-UPB_INLINE bool google_protobuf_FileDescriptorProto_add_dependency(google_protobuf_FileDescriptorProto* msg, upb_StringView val, upb_Arena* arena) {
-  return _upb_Array_Append_accessor2(msg, UPB_SIZE(20, 40), UPB_SIZE(3, 4), &val, arena);
-}
-UPB_INLINE google_protobuf_DescriptorProto** google_protobuf_FileDescriptorProto_mutable_message_type(google_protobuf_FileDescriptorProto* msg, size_t* len) {
-  return (google_protobuf_DescriptorProto**)_upb_array_mutable_accessor(msg, UPB_SIZE(24, 48), len);
-}
-UPB_INLINE google_protobuf_DescriptorProto** google_protobuf_FileDescriptorProto_resize_message_type(google_protobuf_FileDescriptorProto* msg, size_t len, upb_Arena* arena) {
-  return (google_protobuf_DescriptorProto**)_upb_Array_Resize_accessor2(msg, UPB_SIZE(24, 48), len, UPB_SIZE(2, 3), arena);
-}
-UPB_INLINE struct google_protobuf_DescriptorProto* google_protobuf_FileDescriptorProto_add_message_type(google_protobuf_FileDescriptorProto* msg, upb_Arena* arena) {
-  struct google_protobuf_DescriptorProto* sub = (struct google_protobuf_DescriptorProto*)_upb_Message_New(&google_protobuf_DescriptorProto_msginit, arena);
-  bool ok = _upb_Array_Append_accessor2(msg, UPB_SIZE(24, 48), UPB_SIZE(2, 3), &sub, arena);
-  if (!ok) return NULL;
-  return sub;
-}
-UPB_INLINE google_protobuf_EnumDescriptorProto** google_protobuf_FileDescriptorProto_mutable_enum_type(google_protobuf_FileDescriptorProto* msg, size_t* len) {
-  return (google_protobuf_EnumDescriptorProto**)_upb_array_mutable_accessor(msg, UPB_SIZE(28, 56), len);
-}
-UPB_INLINE google_protobuf_EnumDescriptorProto** google_protobuf_FileDescriptorProto_resize_enum_type(google_protobuf_FileDescriptorProto* msg, size_t len, upb_Arena* arena) {
-  return (google_protobuf_EnumDescriptorProto**)_upb_Array_Resize_accessor2(msg, UPB_SIZE(28, 56), len, UPB_SIZE(2, 3), arena);
-}
-UPB_INLINE struct google_protobuf_EnumDescriptorProto* google_protobuf_FileDescriptorProto_add_enum_type(google_protobuf_FileDescriptorProto* msg, upb_Arena* arena) {
-  struct google_protobuf_EnumDescriptorProto* sub = (struct google_protobuf_EnumDescriptorProto*)_upb_Message_New(&google_protobuf_EnumDescriptorProto_msginit, arena);
-  bool ok = _upb_Array_Append_accessor2(msg, UPB_SIZE(28, 56), UPB_SIZE(2, 3), &sub, arena);
-  if (!ok) return NULL;
-  return sub;
-}
-UPB_INLINE google_protobuf_ServiceDescriptorProto** google_protobuf_FileDescriptorProto_mutable_service(google_protobuf_FileDescriptorProto* msg, size_t* len) {
-  return (google_protobuf_ServiceDescriptorProto**)_upb_array_mutable_accessor(msg, UPB_SIZE(32, 64), len);
-}
-UPB_INLINE google_protobuf_ServiceDescriptorProto** google_protobuf_FileDescriptorProto_resize_service(google_protobuf_FileDescriptorProto* msg, size_t len, upb_Arena* arena) {
-  return (google_protobuf_ServiceDescriptorProto**)_upb_Array_Resize_accessor2(msg, UPB_SIZE(32, 64), len, UPB_SIZE(2, 3), arena);
-}
-UPB_INLINE struct google_protobuf_ServiceDescriptorProto* google_protobuf_FileDescriptorProto_add_service(google_protobuf_FileDescriptorProto* msg, upb_Arena* arena) {
-  struct google_protobuf_ServiceDescriptorProto* sub = (struct google_protobuf_ServiceDescriptorProto*)_upb_Message_New(&google_protobuf_ServiceDescriptorProto_msginit, arena);
-  bool ok = _upb_Array_Append_accessor2(msg, UPB_SIZE(32, 64), UPB_SIZE(2, 3), &sub, arena);
-  if (!ok) return NULL;
-  return sub;
-}
-UPB_INLINE google_protobuf_FieldDescriptorProto** google_protobuf_FileDescriptorProto_mutable_extension(google_protobuf_FileDescriptorProto* msg, size_t* len) {
-  return (google_protobuf_FieldDescriptorProto**)_upb_array_mutable_accessor(msg, UPB_SIZE(36, 72), len);
-}
-UPB_INLINE google_protobuf_FieldDescriptorProto** google_protobuf_FileDescriptorProto_resize_extension(google_protobuf_FileDescriptorProto* msg, size_t len, upb_Arena* arena) {
-  return (google_protobuf_FieldDescriptorProto**)_upb_Array_Resize_accessor2(msg, UPB_SIZE(36, 72), len, UPB_SIZE(2, 3), arena);
-}
-UPB_INLINE struct google_protobuf_FieldDescriptorProto* google_protobuf_FileDescriptorProto_add_extension(google_protobuf_FileDescriptorProto* msg, upb_Arena* arena) {
-  struct google_protobuf_FieldDescriptorProto* sub = (struct google_protobuf_FieldDescriptorProto*)_upb_Message_New(&google_protobuf_FieldDescriptorProto_msginit, arena);
-  bool ok = _upb_Array_Append_accessor2(msg, UPB_SIZE(36, 72), UPB_SIZE(2, 3), &sub, arena);
-  if (!ok) return NULL;
-  return sub;
-}
-UPB_INLINE void google_protobuf_FileDescriptorProto_set_options(google_protobuf_FileDescriptorProto *msg, google_protobuf_FileOptions* value) {
-  _upb_sethas(msg, 3);
-  *UPB_PTR_AT(msg, UPB_SIZE(40, 80), google_protobuf_FileOptions*) = value;
-}
-UPB_INLINE struct google_protobuf_FileOptions* google_protobuf_FileDescriptorProto_mutable_options(google_protobuf_FileDescriptorProto* msg, upb_Arena* arena) {
-  struct google_protobuf_FileOptions* sub = (struct google_protobuf_FileOptions*)google_protobuf_FileDescriptorProto_options(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_FileOptions*)_upb_Message_New(&google_protobuf_FileOptions_msginit, arena);
-    if (!sub) return NULL;
-    google_protobuf_FileDescriptorProto_set_options(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void google_protobuf_FileDescriptorProto_set_source_code_info(google_protobuf_FileDescriptorProto *msg, google_protobuf_SourceCodeInfo* value) {
-  _upb_sethas(msg, 4);
-  *UPB_PTR_AT(msg, UPB_SIZE(44, 88), google_protobuf_SourceCodeInfo*) = value;
-}
-UPB_INLINE struct google_protobuf_SourceCodeInfo* google_protobuf_FileDescriptorProto_mutable_source_code_info(google_protobuf_FileDescriptorProto* msg, upb_Arena* arena) {
-  struct google_protobuf_SourceCodeInfo* sub = (struct google_protobuf_SourceCodeInfo*)google_protobuf_FileDescriptorProto_source_code_info(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_SourceCodeInfo*)_upb_Message_New(&google_protobuf_SourceCodeInfo_msginit, arena);
-    if (!sub) return NULL;
-    google_protobuf_FileDescriptorProto_set_source_code_info(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE int32_t* google_protobuf_FileDescriptorProto_mutable_public_dependency(google_protobuf_FileDescriptorProto* msg, size_t* len) {
-  return (int32_t*)_upb_array_mutable_accessor(msg, UPB_SIZE(48, 96), len);
-}
-UPB_INLINE int32_t* google_protobuf_FileDescriptorProto_resize_public_dependency(google_protobuf_FileDescriptorProto* msg, size_t len, upb_Arena* arena) {
-  return (int32_t*)_upb_Array_Resize_accessor2(msg, UPB_SIZE(48, 96), len, 2, arena);
-}
-UPB_INLINE bool google_protobuf_FileDescriptorProto_add_public_dependency(google_protobuf_FileDescriptorProto* msg, int32_t val, upb_Arena* arena) {
-  return _upb_Array_Append_accessor2(msg, UPB_SIZE(48, 96), 2, &val, arena);
-}
-UPB_INLINE int32_t* google_protobuf_FileDescriptorProto_mutable_weak_dependency(google_protobuf_FileDescriptorProto* msg, size_t* len) {
-  return (int32_t*)_upb_array_mutable_accessor(msg, UPB_SIZE(52, 104), len);
-}
-UPB_INLINE int32_t* google_protobuf_FileDescriptorProto_resize_weak_dependency(google_protobuf_FileDescriptorProto* msg, size_t len, upb_Arena* arena) {
-  return (int32_t*)_upb_Array_Resize_accessor2(msg, UPB_SIZE(52, 104), len, 2, arena);
-}
-UPB_INLINE bool google_protobuf_FileDescriptorProto_add_weak_dependency(google_protobuf_FileDescriptorProto* msg, int32_t val, upb_Arena* arena) {
-  return _upb_Array_Append_accessor2(msg, UPB_SIZE(52, 104), 2, &val, arena);
-}
-UPB_INLINE void google_protobuf_FileDescriptorProto_set_syntax(google_protobuf_FileDescriptorProto *msg, upb_StringView value) {
-  _upb_sethas(msg, 5);
-  *UPB_PTR_AT(msg, UPB_SIZE(56, 112), upb_StringView) = value;
-}
-
-/* google.protobuf.DescriptorProto */
-
-UPB_INLINE google_protobuf_DescriptorProto* google_protobuf_DescriptorProto_new(upb_Arena* arena) {
-  return (google_protobuf_DescriptorProto*)_upb_Message_New(&google_protobuf_DescriptorProto_msginit, arena);
-}
-UPB_INLINE google_protobuf_DescriptorProto* google_protobuf_DescriptorProto_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_DescriptorProto* ret = google_protobuf_DescriptorProto_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_DescriptorProto_msginit, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_DescriptorProto* google_protobuf_DescriptorProto_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_DescriptorProto* ret = google_protobuf_DescriptorProto_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_DescriptorProto_msginit, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_DescriptorProto_serialize(const google_protobuf_DescriptorProto* msg, upb_Arena* arena, size_t* len) {
-  return upb_Encode(msg, &google_protobuf_DescriptorProto_msginit, 0, arena, len);
-}
-UPB_INLINE char* google_protobuf_DescriptorProto_serialize_ex(const google_protobuf_DescriptorProto* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  return upb_Encode(msg, &google_protobuf_DescriptorProto_msginit, options, arena, len);
-}
-UPB_INLINE bool google_protobuf_DescriptorProto_has_name(const google_protobuf_DescriptorProto* msg) {
-  return _upb_hasbit(msg, 1);
-}
-UPB_INLINE void google_protobuf_DescriptorProto_clear_name(const google_protobuf_DescriptorProto* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_StringView) = upb_StringView_FromDataAndSize(NULL, 0);
-  _upb_clearhas(msg, 1);
-}
-UPB_INLINE upb_StringView google_protobuf_DescriptorProto_name(const google_protobuf_DescriptorProto* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_StringView);
-}
-UPB_INLINE bool google_protobuf_DescriptorProto_has_field(const google_protobuf_DescriptorProto* msg) {
-  return _upb_has_submsg_nohasbit(msg, UPB_SIZE(12, 24));
-}
-UPB_INLINE void google_protobuf_DescriptorProto_clear_field(const google_protobuf_DescriptorProto* msg) {
-  _upb_array_detach(msg, UPB_SIZE(12, 24));
-}
-UPB_INLINE const google_protobuf_FieldDescriptorProto* const* google_protobuf_DescriptorProto_field(const google_protobuf_DescriptorProto* msg, size_t* len) {
-  return (const google_protobuf_FieldDescriptorProto* const*)_upb_array_accessor(msg, UPB_SIZE(12, 24), len);
-}
-UPB_INLINE bool google_protobuf_DescriptorProto_has_nested_type(const google_protobuf_DescriptorProto* msg) {
-  return _upb_has_submsg_nohasbit(msg, UPB_SIZE(16, 32));
-}
-UPB_INLINE void google_protobuf_DescriptorProto_clear_nested_type(const google_protobuf_DescriptorProto* msg) {
-  _upb_array_detach(msg, UPB_SIZE(16, 32));
-}
-UPB_INLINE const google_protobuf_DescriptorProto* const* google_protobuf_DescriptorProto_nested_type(const google_protobuf_DescriptorProto* msg, size_t* len) {
-  return (const google_protobuf_DescriptorProto* const*)_upb_array_accessor(msg, UPB_SIZE(16, 32), len);
-}
-UPB_INLINE bool google_protobuf_DescriptorProto_has_enum_type(const google_protobuf_DescriptorProto* msg) {
-  return _upb_has_submsg_nohasbit(msg, UPB_SIZE(20, 40));
-}
-UPB_INLINE void google_protobuf_DescriptorProto_clear_enum_type(const google_protobuf_DescriptorProto* msg) {
-  _upb_array_detach(msg, UPB_SIZE(20, 40));
-}
-UPB_INLINE const google_protobuf_EnumDescriptorProto* const* google_protobuf_DescriptorProto_enum_type(const google_protobuf_DescriptorProto* msg, size_t* len) {
-  return (const google_protobuf_EnumDescriptorProto* const*)_upb_array_accessor(msg, UPB_SIZE(20, 40), len);
-}
-UPB_INLINE bool google_protobuf_DescriptorProto_has_extension_range(const google_protobuf_DescriptorProto* msg) {
-  return _upb_has_submsg_nohasbit(msg, UPB_SIZE(24, 48));
-}
-UPB_INLINE void google_protobuf_DescriptorProto_clear_extension_range(const google_protobuf_DescriptorProto* msg) {
-  _upb_array_detach(msg, UPB_SIZE(24, 48));
-}
-UPB_INLINE const google_protobuf_DescriptorProto_ExtensionRange* const* google_protobuf_DescriptorProto_extension_range(const google_protobuf_DescriptorProto* msg, size_t* len) {
-  return (const google_protobuf_DescriptorProto_ExtensionRange* const*)_upb_array_accessor(msg, UPB_SIZE(24, 48), len);
-}
-UPB_INLINE bool google_protobuf_DescriptorProto_has_extension(const google_protobuf_DescriptorProto* msg) {
-  return _upb_has_submsg_nohasbit(msg, UPB_SIZE(28, 56));
-}
-UPB_INLINE void google_protobuf_DescriptorProto_clear_extension(const google_protobuf_DescriptorProto* msg) {
-  _upb_array_detach(msg, UPB_SIZE(28, 56));
-}
-UPB_INLINE const google_protobuf_FieldDescriptorProto* const* google_protobuf_DescriptorProto_extension(const google_protobuf_DescriptorProto* msg, size_t* len) {
-  return (const google_protobuf_FieldDescriptorProto* const*)_upb_array_accessor(msg, UPB_SIZE(28, 56), len);
-}
-UPB_INLINE bool google_protobuf_DescriptorProto_has_options(const google_protobuf_DescriptorProto* msg) {
-  return _upb_hasbit(msg, 2);
-}
-UPB_INLINE void google_protobuf_DescriptorProto_clear_options(const google_protobuf_DescriptorProto* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(32, 64), const upb_Message*) = NULL;
-}
-UPB_INLINE const google_protobuf_MessageOptions* google_protobuf_DescriptorProto_options(const google_protobuf_DescriptorProto* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(32, 64), const google_protobuf_MessageOptions*);
-}
-UPB_INLINE bool google_protobuf_DescriptorProto_has_oneof_decl(const google_protobuf_DescriptorProto* msg) {
-  return _upb_has_submsg_nohasbit(msg, UPB_SIZE(36, 72));
-}
-UPB_INLINE void google_protobuf_DescriptorProto_clear_oneof_decl(const google_protobuf_DescriptorProto* msg) {
-  _upb_array_detach(msg, UPB_SIZE(36, 72));
-}
-UPB_INLINE const google_protobuf_OneofDescriptorProto* const* google_protobuf_DescriptorProto_oneof_decl(const google_protobuf_DescriptorProto* msg, size_t* len) {
-  return (const google_protobuf_OneofDescriptorProto* const*)_upb_array_accessor(msg, UPB_SIZE(36, 72), len);
-}
-UPB_INLINE bool google_protobuf_DescriptorProto_has_reserved_range(const google_protobuf_DescriptorProto* msg) {
-  return _upb_has_submsg_nohasbit(msg, UPB_SIZE(40, 80));
-}
-UPB_INLINE void google_protobuf_DescriptorProto_clear_reserved_range(const google_protobuf_DescriptorProto* msg) {
-  _upb_array_detach(msg, UPB_SIZE(40, 80));
-}
-UPB_INLINE const google_protobuf_DescriptorProto_ReservedRange* const* google_protobuf_DescriptorProto_reserved_range(const google_protobuf_DescriptorProto* msg, size_t* len) {
-  return (const google_protobuf_DescriptorProto_ReservedRange* const*)_upb_array_accessor(msg, UPB_SIZE(40, 80), len);
-}
-UPB_INLINE void google_protobuf_DescriptorProto_clear_reserved_name(const google_protobuf_DescriptorProto* msg) {
-  _upb_array_detach(msg, UPB_SIZE(44, 88));
-}
-UPB_INLINE upb_StringView const* google_protobuf_DescriptorProto_reserved_name(const google_protobuf_DescriptorProto* msg, size_t* len) {
-  return (upb_StringView const*)_upb_array_accessor(msg, UPB_SIZE(44, 88), len);
-}
-
-UPB_INLINE void google_protobuf_DescriptorProto_set_name(google_protobuf_DescriptorProto *msg, upb_StringView value) {
-  _upb_sethas(msg, 1);
-  *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_StringView) = value;
-}
-UPB_INLINE google_protobuf_FieldDescriptorProto** google_protobuf_DescriptorProto_mutable_field(google_protobuf_DescriptorProto* msg, size_t* len) {
-  return (google_protobuf_FieldDescriptorProto**)_upb_array_mutable_accessor(msg, UPB_SIZE(12, 24), len);
-}
-UPB_INLINE google_protobuf_FieldDescriptorProto** google_protobuf_DescriptorProto_resize_field(google_protobuf_DescriptorProto* msg, size_t len, upb_Arena* arena) {
-  return (google_protobuf_FieldDescriptorProto**)_upb_Array_Resize_accessor2(msg, UPB_SIZE(12, 24), len, UPB_SIZE(2, 3), arena);
-}
-UPB_INLINE struct google_protobuf_FieldDescriptorProto* google_protobuf_DescriptorProto_add_field(google_protobuf_DescriptorProto* msg, upb_Arena* arena) {
-  struct google_protobuf_FieldDescriptorProto* sub = (struct google_protobuf_FieldDescriptorProto*)_upb_Message_New(&google_protobuf_FieldDescriptorProto_msginit, arena);
-  bool ok = _upb_Array_Append_accessor2(msg, UPB_SIZE(12, 24), UPB_SIZE(2, 3), &sub, arena);
-  if (!ok) return NULL;
-  return sub;
-}
-UPB_INLINE google_protobuf_DescriptorProto** google_protobuf_DescriptorProto_mutable_nested_type(google_protobuf_DescriptorProto* msg, size_t* len) {
-  return (google_protobuf_DescriptorProto**)_upb_array_mutable_accessor(msg, UPB_SIZE(16, 32), len);
-}
-UPB_INLINE google_protobuf_DescriptorProto** google_protobuf_DescriptorProto_resize_nested_type(google_protobuf_DescriptorProto* msg, size_t len, upb_Arena* arena) {
-  return (google_protobuf_DescriptorProto**)_upb_Array_Resize_accessor2(msg, UPB_SIZE(16, 32), len, UPB_SIZE(2, 3), arena);
-}
-UPB_INLINE struct google_protobuf_DescriptorProto* google_protobuf_DescriptorProto_add_nested_type(google_protobuf_DescriptorProto* msg, upb_Arena* arena) {
-  struct google_protobuf_DescriptorProto* sub = (struct google_protobuf_DescriptorProto*)_upb_Message_New(&google_protobuf_DescriptorProto_msginit, arena);
-  bool ok = _upb_Array_Append_accessor2(msg, UPB_SIZE(16, 32), UPB_SIZE(2, 3), &sub, arena);
-  if (!ok) return NULL;
-  return sub;
-}
-UPB_INLINE google_protobuf_EnumDescriptorProto** google_protobuf_DescriptorProto_mutable_enum_type(google_protobuf_DescriptorProto* msg, size_t* len) {
-  return (google_protobuf_EnumDescriptorProto**)_upb_array_mutable_accessor(msg, UPB_SIZE(20, 40), len);
-}
-UPB_INLINE google_protobuf_EnumDescriptorProto** google_protobuf_DescriptorProto_resize_enum_type(google_protobuf_DescriptorProto* msg, size_t len, upb_Arena* arena) {
-  return (google_protobuf_EnumDescriptorProto**)_upb_Array_Resize_accessor2(msg, UPB_SIZE(20, 40), len, UPB_SIZE(2, 3), arena);
-}
-UPB_INLINE struct google_protobuf_EnumDescriptorProto* google_protobuf_DescriptorProto_add_enum_type(google_protobuf_DescriptorProto* msg, upb_Arena* arena) {
-  struct google_protobuf_EnumDescriptorProto* sub = (struct google_protobuf_EnumDescriptorProto*)_upb_Message_New(&google_protobuf_EnumDescriptorProto_msginit, arena);
-  bool ok = _upb_Array_Append_accessor2(msg, UPB_SIZE(20, 40), UPB_SIZE(2, 3), &sub, arena);
-  if (!ok) return NULL;
-  return sub;
-}
-UPB_INLINE google_protobuf_DescriptorProto_ExtensionRange** google_protobuf_DescriptorProto_mutable_extension_range(google_protobuf_DescriptorProto* msg, size_t* len) {
-  return (google_protobuf_DescriptorProto_ExtensionRange**)_upb_array_mutable_accessor(msg, UPB_SIZE(24, 48), len);
-}
-UPB_INLINE google_protobuf_DescriptorProto_ExtensionRange** google_protobuf_DescriptorProto_resize_extension_range(google_protobuf_DescriptorProto* msg, size_t len, upb_Arena* arena) {
-  return (google_protobuf_DescriptorProto_ExtensionRange**)_upb_Array_Resize_accessor2(msg, UPB_SIZE(24, 48), len, UPB_SIZE(2, 3), arena);
-}
-UPB_INLINE struct google_protobuf_DescriptorProto_ExtensionRange* google_protobuf_DescriptorProto_add_extension_range(google_protobuf_DescriptorProto* msg, upb_Arena* arena) {
-  struct google_protobuf_DescriptorProto_ExtensionRange* sub = (struct google_protobuf_DescriptorProto_ExtensionRange*)_upb_Message_New(&google_protobuf_DescriptorProto_ExtensionRange_msginit, arena);
-  bool ok = _upb_Array_Append_accessor2(msg, UPB_SIZE(24, 48), UPB_SIZE(2, 3), &sub, arena);
-  if (!ok) return NULL;
-  return sub;
-}
-UPB_INLINE google_protobuf_FieldDescriptorProto** google_protobuf_DescriptorProto_mutable_extension(google_protobuf_DescriptorProto* msg, size_t* len) {
-  return (google_protobuf_FieldDescriptorProto**)_upb_array_mutable_accessor(msg, UPB_SIZE(28, 56), len);
-}
-UPB_INLINE google_protobuf_FieldDescriptorProto** google_protobuf_DescriptorProto_resize_extension(google_protobuf_DescriptorProto* msg, size_t len, upb_Arena* arena) {
-  return (google_protobuf_FieldDescriptorProto**)_upb_Array_Resize_accessor2(msg, UPB_SIZE(28, 56), len, UPB_SIZE(2, 3), arena);
-}
-UPB_INLINE struct google_protobuf_FieldDescriptorProto* google_protobuf_DescriptorProto_add_extension(google_protobuf_DescriptorProto* msg, upb_Arena* arena) {
-  struct google_protobuf_FieldDescriptorProto* sub = (struct google_protobuf_FieldDescriptorProto*)_upb_Message_New(&google_protobuf_FieldDescriptorProto_msginit, arena);
-  bool ok = _upb_Array_Append_accessor2(msg, UPB_SIZE(28, 56), UPB_SIZE(2, 3), &sub, arena);
-  if (!ok) return NULL;
-  return sub;
-}
-UPB_INLINE void google_protobuf_DescriptorProto_set_options(google_protobuf_DescriptorProto *msg, google_protobuf_MessageOptions* value) {
-  _upb_sethas(msg, 2);
-  *UPB_PTR_AT(msg, UPB_SIZE(32, 64), google_protobuf_MessageOptions*) = value;
-}
-UPB_INLINE struct google_protobuf_MessageOptions* google_protobuf_DescriptorProto_mutable_options(google_protobuf_DescriptorProto* msg, upb_Arena* arena) {
-  struct google_protobuf_MessageOptions* sub = (struct google_protobuf_MessageOptions*)google_protobuf_DescriptorProto_options(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_MessageOptions*)_upb_Message_New(&google_protobuf_MessageOptions_msginit, arena);
-    if (!sub) return NULL;
-    google_protobuf_DescriptorProto_set_options(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE google_protobuf_OneofDescriptorProto** google_protobuf_DescriptorProto_mutable_oneof_decl(google_protobuf_DescriptorProto* msg, size_t* len) {
-  return (google_protobuf_OneofDescriptorProto**)_upb_array_mutable_accessor(msg, UPB_SIZE(36, 72), len);
-}
-UPB_INLINE google_protobuf_OneofDescriptorProto** google_protobuf_DescriptorProto_resize_oneof_decl(google_protobuf_DescriptorProto* msg, size_t len, upb_Arena* arena) {
-  return (google_protobuf_OneofDescriptorProto**)_upb_Array_Resize_accessor2(msg, UPB_SIZE(36, 72), len, UPB_SIZE(2, 3), arena);
-}
-UPB_INLINE struct google_protobuf_OneofDescriptorProto* google_protobuf_DescriptorProto_add_oneof_decl(google_protobuf_DescriptorProto* msg, upb_Arena* arena) {
-  struct google_protobuf_OneofDescriptorProto* sub = (struct google_protobuf_OneofDescriptorProto*)_upb_Message_New(&google_protobuf_OneofDescriptorProto_msginit, arena);
-  bool ok = _upb_Array_Append_accessor2(msg, UPB_SIZE(36, 72), UPB_SIZE(2, 3), &sub, arena);
-  if (!ok) return NULL;
-  return sub;
-}
-UPB_INLINE google_protobuf_DescriptorProto_ReservedRange** google_protobuf_DescriptorProto_mutable_reserved_range(google_protobuf_DescriptorProto* msg, size_t* len) {
-  return (google_protobuf_DescriptorProto_ReservedRange**)_upb_array_mutable_accessor(msg, UPB_SIZE(40, 80), len);
-}
-UPB_INLINE google_protobuf_DescriptorProto_ReservedRange** google_protobuf_DescriptorProto_resize_reserved_range(google_protobuf_DescriptorProto* msg, size_t len, upb_Arena* arena) {
-  return (google_protobuf_DescriptorProto_ReservedRange**)_upb_Array_Resize_accessor2(msg, UPB_SIZE(40, 80), len, UPB_SIZE(2, 3), arena);
-}
-UPB_INLINE struct google_protobuf_DescriptorProto_ReservedRange* google_protobuf_DescriptorProto_add_reserved_range(google_protobuf_DescriptorProto* msg, upb_Arena* arena) {
-  struct google_protobuf_DescriptorProto_ReservedRange* sub = (struct google_protobuf_DescriptorProto_ReservedRange*)_upb_Message_New(&google_protobuf_DescriptorProto_ReservedRange_msginit, arena);
-  bool ok = _upb_Array_Append_accessor2(msg, UPB_SIZE(40, 80), UPB_SIZE(2, 3), &sub, arena);
-  if (!ok) return NULL;
-  return sub;
-}
-UPB_INLINE upb_StringView* google_protobuf_DescriptorProto_mutable_reserved_name(google_protobuf_DescriptorProto* msg, size_t* len) {
-  return (upb_StringView*)_upb_array_mutable_accessor(msg, UPB_SIZE(44, 88), len);
-}
-UPB_INLINE upb_StringView* google_protobuf_DescriptorProto_resize_reserved_name(google_protobuf_DescriptorProto* msg, size_t len, upb_Arena* arena) {
-  return (upb_StringView*)_upb_Array_Resize_accessor2(msg, UPB_SIZE(44, 88), len, UPB_SIZE(3, 4), arena);
-}
-UPB_INLINE bool google_protobuf_DescriptorProto_add_reserved_name(google_protobuf_DescriptorProto* msg, upb_StringView val, upb_Arena* arena) {
-  return _upb_Array_Append_accessor2(msg, UPB_SIZE(44, 88), UPB_SIZE(3, 4), &val, arena);
-}
-
-/* google.protobuf.DescriptorProto.ExtensionRange */
-
-UPB_INLINE google_protobuf_DescriptorProto_ExtensionRange* google_protobuf_DescriptorProto_ExtensionRange_new(upb_Arena* arena) {
-  return (google_protobuf_DescriptorProto_ExtensionRange*)_upb_Message_New(&google_protobuf_DescriptorProto_ExtensionRange_msginit, arena);
-}
-UPB_INLINE google_protobuf_DescriptorProto_ExtensionRange* google_protobuf_DescriptorProto_ExtensionRange_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_DescriptorProto_ExtensionRange* ret = google_protobuf_DescriptorProto_ExtensionRange_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_DescriptorProto_ExtensionRange_msginit, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_DescriptorProto_ExtensionRange* google_protobuf_DescriptorProto_ExtensionRange_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_DescriptorProto_ExtensionRange* ret = google_protobuf_DescriptorProto_ExtensionRange_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_DescriptorProto_ExtensionRange_msginit, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_DescriptorProto_ExtensionRange_serialize(const google_protobuf_DescriptorProto_ExtensionRange* msg, upb_Arena* arena, size_t* len) {
-  return upb_Encode(msg, &google_protobuf_DescriptorProto_ExtensionRange_msginit, 0, arena, len);
-}
-UPB_INLINE char* google_protobuf_DescriptorProto_ExtensionRange_serialize_ex(const google_protobuf_DescriptorProto_ExtensionRange* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  return upb_Encode(msg, &google_protobuf_DescriptorProto_ExtensionRange_msginit, options, arena, len);
-}
-UPB_INLINE bool google_protobuf_DescriptorProto_ExtensionRange_has_start(const google_protobuf_DescriptorProto_ExtensionRange* msg) {
-  return _upb_hasbit(msg, 1);
-}
-UPB_INLINE void google_protobuf_DescriptorProto_ExtensionRange_clear_start(const google_protobuf_DescriptorProto_ExtensionRange* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(4, 4), int32_t) = 0;
-  _upb_clearhas(msg, 1);
-}
-UPB_INLINE int32_t google_protobuf_DescriptorProto_ExtensionRange_start(const google_protobuf_DescriptorProto_ExtensionRange* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(4, 4), int32_t);
-}
-UPB_INLINE bool google_protobuf_DescriptorProto_ExtensionRange_has_end(const google_protobuf_DescriptorProto_ExtensionRange* msg) {
-  return _upb_hasbit(msg, 2);
-}
-UPB_INLINE void google_protobuf_DescriptorProto_ExtensionRange_clear_end(const google_protobuf_DescriptorProto_ExtensionRange* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(8, 8), int32_t) = 0;
-  _upb_clearhas(msg, 2);
-}
-UPB_INLINE int32_t google_protobuf_DescriptorProto_ExtensionRange_end(const google_protobuf_DescriptorProto_ExtensionRange* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(8, 8), int32_t);
-}
-UPB_INLINE bool google_protobuf_DescriptorProto_ExtensionRange_has_options(const google_protobuf_DescriptorProto_ExtensionRange* msg) {
-  return _upb_hasbit(msg, 3);
-}
-UPB_INLINE void google_protobuf_DescriptorProto_ExtensionRange_clear_options(const google_protobuf_DescriptorProto_ExtensionRange* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(12, 16), const upb_Message*) = NULL;
-}
-UPB_INLINE const google_protobuf_ExtensionRangeOptions* google_protobuf_DescriptorProto_ExtensionRange_options(const google_protobuf_DescriptorProto_ExtensionRange* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(12, 16), const google_protobuf_ExtensionRangeOptions*);
-}
-
-UPB_INLINE void google_protobuf_DescriptorProto_ExtensionRange_set_start(google_protobuf_DescriptorProto_ExtensionRange *msg, int32_t value) {
-  _upb_sethas(msg, 1);
-  *UPB_PTR_AT(msg, UPB_SIZE(4, 4), int32_t) = value;
-}
-UPB_INLINE void google_protobuf_DescriptorProto_ExtensionRange_set_end(google_protobuf_DescriptorProto_ExtensionRange *msg, int32_t value) {
-  _upb_sethas(msg, 2);
-  *UPB_PTR_AT(msg, UPB_SIZE(8, 8), int32_t) = value;
-}
-UPB_INLINE void google_protobuf_DescriptorProto_ExtensionRange_set_options(google_protobuf_DescriptorProto_ExtensionRange *msg, google_protobuf_ExtensionRangeOptions* value) {
-  _upb_sethas(msg, 3);
-  *UPB_PTR_AT(msg, UPB_SIZE(12, 16), google_protobuf_ExtensionRangeOptions*) = value;
-}
-UPB_INLINE struct google_protobuf_ExtensionRangeOptions* google_protobuf_DescriptorProto_ExtensionRange_mutable_options(google_protobuf_DescriptorProto_ExtensionRange* msg, upb_Arena* arena) {
-  struct google_protobuf_ExtensionRangeOptions* sub = (struct google_protobuf_ExtensionRangeOptions*)google_protobuf_DescriptorProto_ExtensionRange_options(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_ExtensionRangeOptions*)_upb_Message_New(&google_protobuf_ExtensionRangeOptions_msginit, arena);
-    if (!sub) return NULL;
-    google_protobuf_DescriptorProto_ExtensionRange_set_options(msg, sub);
-  }
-  return sub;
-}
-
-/* google.protobuf.DescriptorProto.ReservedRange */
-
-UPB_INLINE google_protobuf_DescriptorProto_ReservedRange* google_protobuf_DescriptorProto_ReservedRange_new(upb_Arena* arena) {
-  return (google_protobuf_DescriptorProto_ReservedRange*)_upb_Message_New(&google_protobuf_DescriptorProto_ReservedRange_msginit, arena);
-}
-UPB_INLINE google_protobuf_DescriptorProto_ReservedRange* google_protobuf_DescriptorProto_ReservedRange_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_DescriptorProto_ReservedRange* ret = google_protobuf_DescriptorProto_ReservedRange_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_DescriptorProto_ReservedRange_msginit, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_DescriptorProto_ReservedRange* google_protobuf_DescriptorProto_ReservedRange_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_DescriptorProto_ReservedRange* ret = google_protobuf_DescriptorProto_ReservedRange_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_DescriptorProto_ReservedRange_msginit, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_DescriptorProto_ReservedRange_serialize(const google_protobuf_DescriptorProto_ReservedRange* msg, upb_Arena* arena, size_t* len) {
-  return upb_Encode(msg, &google_protobuf_DescriptorProto_ReservedRange_msginit, 0, arena, len);
-}
-UPB_INLINE char* google_protobuf_DescriptorProto_ReservedRange_serialize_ex(const google_protobuf_DescriptorProto_ReservedRange* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  return upb_Encode(msg, &google_protobuf_DescriptorProto_ReservedRange_msginit, options, arena, len);
-}
-UPB_INLINE bool google_protobuf_DescriptorProto_ReservedRange_has_start(const google_protobuf_DescriptorProto_ReservedRange* msg) {
-  return _upb_hasbit(msg, 1);
-}
-UPB_INLINE void google_protobuf_DescriptorProto_ReservedRange_clear_start(const google_protobuf_DescriptorProto_ReservedRange* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(4, 4), int32_t) = 0;
-  _upb_clearhas(msg, 1);
-}
-UPB_INLINE int32_t google_protobuf_DescriptorProto_ReservedRange_start(const google_protobuf_DescriptorProto_ReservedRange* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(4, 4), int32_t);
-}
-UPB_INLINE bool google_protobuf_DescriptorProto_ReservedRange_has_end(const google_protobuf_DescriptorProto_ReservedRange* msg) {
-  return _upb_hasbit(msg, 2);
-}
-UPB_INLINE void google_protobuf_DescriptorProto_ReservedRange_clear_end(const google_protobuf_DescriptorProto_ReservedRange* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(8, 8), int32_t) = 0;
-  _upb_clearhas(msg, 2);
-}
-UPB_INLINE int32_t google_protobuf_DescriptorProto_ReservedRange_end(const google_protobuf_DescriptorProto_ReservedRange* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(8, 8), int32_t);
-}
-
-UPB_INLINE void google_protobuf_DescriptorProto_ReservedRange_set_start(google_protobuf_DescriptorProto_ReservedRange *msg, int32_t value) {
-  _upb_sethas(msg, 1);
-  *UPB_PTR_AT(msg, UPB_SIZE(4, 4), int32_t) = value;
-}
-UPB_INLINE void google_protobuf_DescriptorProto_ReservedRange_set_end(google_protobuf_DescriptorProto_ReservedRange *msg, int32_t value) {
-  _upb_sethas(msg, 2);
-  *UPB_PTR_AT(msg, UPB_SIZE(8, 8), int32_t) = value;
-}
-
-/* google.protobuf.ExtensionRangeOptions */
-
-UPB_INLINE google_protobuf_ExtensionRangeOptions* google_protobuf_ExtensionRangeOptions_new(upb_Arena* arena) {
-  return (google_protobuf_ExtensionRangeOptions*)_upb_Message_New(&google_protobuf_ExtensionRangeOptions_msginit, arena);
-}
-UPB_INLINE google_protobuf_ExtensionRangeOptions* google_protobuf_ExtensionRangeOptions_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_ExtensionRangeOptions* ret = google_protobuf_ExtensionRangeOptions_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_ExtensionRangeOptions_msginit, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_ExtensionRangeOptions* google_protobuf_ExtensionRangeOptions_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_ExtensionRangeOptions* ret = google_protobuf_ExtensionRangeOptions_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_ExtensionRangeOptions_msginit, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_ExtensionRangeOptions_serialize(const google_protobuf_ExtensionRangeOptions* msg, upb_Arena* arena, size_t* len) {
-  return upb_Encode(msg, &google_protobuf_ExtensionRangeOptions_msginit, 0, arena, len);
-}
-UPB_INLINE char* google_protobuf_ExtensionRangeOptions_serialize_ex(const google_protobuf_ExtensionRangeOptions* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  return upb_Encode(msg, &google_protobuf_ExtensionRangeOptions_msginit, options, arena, len);
-}
-UPB_INLINE bool google_protobuf_ExtensionRangeOptions_has_uninterpreted_option(const google_protobuf_ExtensionRangeOptions* msg) {
-  return _upb_has_submsg_nohasbit(msg, UPB_SIZE(0, 0));
-}
-UPB_INLINE void google_protobuf_ExtensionRangeOptions_clear_uninterpreted_option(const google_protobuf_ExtensionRangeOptions* msg) {
-  _upb_array_detach(msg, UPB_SIZE(0, 0));
-}
-UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_ExtensionRangeOptions_uninterpreted_option(const google_protobuf_ExtensionRangeOptions* msg, size_t* len) {
-  return (const google_protobuf_UninterpretedOption* const*)_upb_array_accessor(msg, UPB_SIZE(0, 0), len);
-}
-
-UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_ExtensionRangeOptions_mutable_uninterpreted_option(google_protobuf_ExtensionRangeOptions* msg, size_t* len) {
-  return (google_protobuf_UninterpretedOption**)_upb_array_mutable_accessor(msg, UPB_SIZE(0, 0), len);
-}
-UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_ExtensionRangeOptions_resize_uninterpreted_option(google_protobuf_ExtensionRangeOptions* msg, size_t len, upb_Arena* arena) {
-  return (google_protobuf_UninterpretedOption**)_upb_Array_Resize_accessor2(msg, UPB_SIZE(0, 0), len, UPB_SIZE(2, 3), arena);
-}
-UPB_INLINE struct google_protobuf_UninterpretedOption* google_protobuf_ExtensionRangeOptions_add_uninterpreted_option(google_protobuf_ExtensionRangeOptions* msg, upb_Arena* arena) {
-  struct google_protobuf_UninterpretedOption* sub = (struct google_protobuf_UninterpretedOption*)_upb_Message_New(&google_protobuf_UninterpretedOption_msginit, arena);
-  bool ok = _upb_Array_Append_accessor2(msg, UPB_SIZE(0, 0), UPB_SIZE(2, 3), &sub, arena);
-  if (!ok) return NULL;
-  return sub;
-}
-
-/* google.protobuf.FieldDescriptorProto */
-
-UPB_INLINE google_protobuf_FieldDescriptorProto* google_protobuf_FieldDescriptorProto_new(upb_Arena* arena) {
-  return (google_protobuf_FieldDescriptorProto*)_upb_Message_New(&google_protobuf_FieldDescriptorProto_msginit, arena);
-}
-UPB_INLINE google_protobuf_FieldDescriptorProto* google_protobuf_FieldDescriptorProto_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_FieldDescriptorProto* ret = google_protobuf_FieldDescriptorProto_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_FieldDescriptorProto_msginit, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_FieldDescriptorProto* google_protobuf_FieldDescriptorProto_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_FieldDescriptorProto* ret = google_protobuf_FieldDescriptorProto_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_FieldDescriptorProto_msginit, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_FieldDescriptorProto_serialize(const google_protobuf_FieldDescriptorProto* msg, upb_Arena* arena, size_t* len) {
-  return upb_Encode(msg, &google_protobuf_FieldDescriptorProto_msginit, 0, arena, len);
-}
-UPB_INLINE char* google_protobuf_FieldDescriptorProto_serialize_ex(const google_protobuf_FieldDescriptorProto* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  return upb_Encode(msg, &google_protobuf_FieldDescriptorProto_msginit, options, arena, len);
-}
-UPB_INLINE bool google_protobuf_FieldDescriptorProto_has_name(const google_protobuf_FieldDescriptorProto* msg) {
-  return _upb_hasbit(msg, 1);
-}
-UPB_INLINE void google_protobuf_FieldDescriptorProto_clear_name(const google_protobuf_FieldDescriptorProto* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(24, 24), upb_StringView) = upb_StringView_FromDataAndSize(NULL, 0);
-  _upb_clearhas(msg, 1);
-}
-UPB_INLINE upb_StringView google_protobuf_FieldDescriptorProto_name(const google_protobuf_FieldDescriptorProto* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(24, 24), upb_StringView);
-}
-UPB_INLINE bool google_protobuf_FieldDescriptorProto_has_extendee(const google_protobuf_FieldDescriptorProto* msg) {
-  return _upb_hasbit(msg, 2);
-}
-UPB_INLINE void google_protobuf_FieldDescriptorProto_clear_extendee(const google_protobuf_FieldDescriptorProto* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(32, 40), upb_StringView) = upb_StringView_FromDataAndSize(NULL, 0);
-  _upb_clearhas(msg, 2);
-}
-UPB_INLINE upb_StringView google_protobuf_FieldDescriptorProto_extendee(const google_protobuf_FieldDescriptorProto* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(32, 40), upb_StringView);
-}
-UPB_INLINE bool google_protobuf_FieldDescriptorProto_has_number(const google_protobuf_FieldDescriptorProto* msg) {
-  return _upb_hasbit(msg, 3);
-}
-UPB_INLINE void google_protobuf_FieldDescriptorProto_clear_number(const google_protobuf_FieldDescriptorProto* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(4, 4), int32_t) = 0;
-  _upb_clearhas(msg, 3);
-}
-UPB_INLINE int32_t google_protobuf_FieldDescriptorProto_number(const google_protobuf_FieldDescriptorProto* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(4, 4), int32_t);
-}
-UPB_INLINE bool google_protobuf_FieldDescriptorProto_has_label(const google_protobuf_FieldDescriptorProto* msg) {
-  return _upb_hasbit(msg, 4);
-}
-UPB_INLINE void google_protobuf_FieldDescriptorProto_clear_label(const google_protobuf_FieldDescriptorProto* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(8, 8), int32_t) = 0;
-  _upb_clearhas(msg, 4);
-}
-UPB_INLINE int32_t google_protobuf_FieldDescriptorProto_label(const google_protobuf_FieldDescriptorProto* msg) {
-  return google_protobuf_FieldDescriptorProto_has_label(msg) ? *UPB_PTR_AT(msg, UPB_SIZE(8, 8), int32_t) : 1;
-}
-UPB_INLINE bool google_protobuf_FieldDescriptorProto_has_type(const google_protobuf_FieldDescriptorProto* msg) {
-  return _upb_hasbit(msg, 5);
-}
-UPB_INLINE void google_protobuf_FieldDescriptorProto_clear_type(const google_protobuf_FieldDescriptorProto* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(12, 12), int32_t) = 0;
-  _upb_clearhas(msg, 5);
-}
-UPB_INLINE int32_t google_protobuf_FieldDescriptorProto_type(const google_protobuf_FieldDescriptorProto* msg) {
-  return google_protobuf_FieldDescriptorProto_has_type(msg) ? *UPB_PTR_AT(msg, UPB_SIZE(12, 12), int32_t) : 1;
-}
-UPB_INLINE bool google_protobuf_FieldDescriptorProto_has_type_name(const google_protobuf_FieldDescriptorProto* msg) {
-  return _upb_hasbit(msg, 6);
-}
-UPB_INLINE void google_protobuf_FieldDescriptorProto_clear_type_name(const google_protobuf_FieldDescriptorProto* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(40, 56), upb_StringView) = upb_StringView_FromDataAndSize(NULL, 0);
-  _upb_clearhas(msg, 6);
-}
-UPB_INLINE upb_StringView google_protobuf_FieldDescriptorProto_type_name(const google_protobuf_FieldDescriptorProto* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(40, 56), upb_StringView);
-}
-UPB_INLINE bool google_protobuf_FieldDescriptorProto_has_default_value(const google_protobuf_FieldDescriptorProto* msg) {
-  return _upb_hasbit(msg, 7);
-}
-UPB_INLINE void google_protobuf_FieldDescriptorProto_clear_default_value(const google_protobuf_FieldDescriptorProto* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(48, 72), upb_StringView) = upb_StringView_FromDataAndSize(NULL, 0);
-  _upb_clearhas(msg, 7);
-}
-UPB_INLINE upb_StringView google_protobuf_FieldDescriptorProto_default_value(const google_protobuf_FieldDescriptorProto* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(48, 72), upb_StringView);
-}
-UPB_INLINE bool google_protobuf_FieldDescriptorProto_has_options(const google_protobuf_FieldDescriptorProto* msg) {
-  return _upb_hasbit(msg, 8);
-}
-UPB_INLINE void google_protobuf_FieldDescriptorProto_clear_options(const google_protobuf_FieldDescriptorProto* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(56, 88), const upb_Message*) = NULL;
-}
-UPB_INLINE const google_protobuf_FieldOptions* google_protobuf_FieldDescriptorProto_options(const google_protobuf_FieldDescriptorProto* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(56, 88), const google_protobuf_FieldOptions*);
-}
-UPB_INLINE bool google_protobuf_FieldDescriptorProto_has_oneof_index(const google_protobuf_FieldDescriptorProto* msg) {
-  return _upb_hasbit(msg, 9);
-}
-UPB_INLINE void google_protobuf_FieldDescriptorProto_clear_oneof_index(const google_protobuf_FieldDescriptorProto* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(16, 16), int32_t) = 0;
-  _upb_clearhas(msg, 9);
-}
-UPB_INLINE int32_t google_protobuf_FieldDescriptorProto_oneof_index(const google_protobuf_FieldDescriptorProto* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(16, 16), int32_t);
-}
-UPB_INLINE bool google_protobuf_FieldDescriptorProto_has_json_name(const google_protobuf_FieldDescriptorProto* msg) {
-  return _upb_hasbit(msg, 10);
-}
-UPB_INLINE void google_protobuf_FieldDescriptorProto_clear_json_name(const google_protobuf_FieldDescriptorProto* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(60, 96), upb_StringView) = upb_StringView_FromDataAndSize(NULL, 0);
-  _upb_clearhas(msg, 10);
-}
-UPB_INLINE upb_StringView google_protobuf_FieldDescriptorProto_json_name(const google_protobuf_FieldDescriptorProto* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(60, 96), upb_StringView);
-}
-UPB_INLINE bool google_protobuf_FieldDescriptorProto_has_proto3_optional(const google_protobuf_FieldDescriptorProto* msg) {
-  return _upb_hasbit(msg, 11);
-}
-UPB_INLINE void google_protobuf_FieldDescriptorProto_clear_proto3_optional(const google_protobuf_FieldDescriptorProto* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(20, 20), bool) = 0;
-  _upb_clearhas(msg, 11);
-}
-UPB_INLINE bool google_protobuf_FieldDescriptorProto_proto3_optional(const google_protobuf_FieldDescriptorProto* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(20, 20), bool);
-}
-
-UPB_INLINE void google_protobuf_FieldDescriptorProto_set_name(google_protobuf_FieldDescriptorProto *msg, upb_StringView value) {
-  _upb_sethas(msg, 1);
-  *UPB_PTR_AT(msg, UPB_SIZE(24, 24), upb_StringView) = value;
-}
-UPB_INLINE void google_protobuf_FieldDescriptorProto_set_extendee(google_protobuf_FieldDescriptorProto *msg, upb_StringView value) {
-  _upb_sethas(msg, 2);
-  *UPB_PTR_AT(msg, UPB_SIZE(32, 40), upb_StringView) = value;
-}
-UPB_INLINE void google_protobuf_FieldDescriptorProto_set_number(google_protobuf_FieldDescriptorProto *msg, int32_t value) {
-  _upb_sethas(msg, 3);
-  *UPB_PTR_AT(msg, UPB_SIZE(4, 4), int32_t) = value;
-}
-UPB_INLINE void google_protobuf_FieldDescriptorProto_set_label(google_protobuf_FieldDescriptorProto *msg, int32_t value) {
-  _upb_sethas(msg, 4);
-  *UPB_PTR_AT(msg, UPB_SIZE(8, 8), int32_t) = value;
-}
-UPB_INLINE void google_protobuf_FieldDescriptorProto_set_type(google_protobuf_FieldDescriptorProto *msg, int32_t value) {
-  _upb_sethas(msg, 5);
-  *UPB_PTR_AT(msg, UPB_SIZE(12, 12), int32_t) = value;
-}
-UPB_INLINE void google_protobuf_FieldDescriptorProto_set_type_name(google_protobuf_FieldDescriptorProto *msg, upb_StringView value) {
-  _upb_sethas(msg, 6);
-  *UPB_PTR_AT(msg, UPB_SIZE(40, 56), upb_StringView) = value;
-}
-UPB_INLINE void google_protobuf_FieldDescriptorProto_set_default_value(google_protobuf_FieldDescriptorProto *msg, upb_StringView value) {
-  _upb_sethas(msg, 7);
-  *UPB_PTR_AT(msg, UPB_SIZE(48, 72), upb_StringView) = value;
-}
-UPB_INLINE void google_protobuf_FieldDescriptorProto_set_options(google_protobuf_FieldDescriptorProto *msg, google_protobuf_FieldOptions* value) {
-  _upb_sethas(msg, 8);
-  *UPB_PTR_AT(msg, UPB_SIZE(56, 88), google_protobuf_FieldOptions*) = value;
-}
-UPB_INLINE struct google_protobuf_FieldOptions* google_protobuf_FieldDescriptorProto_mutable_options(google_protobuf_FieldDescriptorProto* msg, upb_Arena* arena) {
-  struct google_protobuf_FieldOptions* sub = (struct google_protobuf_FieldOptions*)google_protobuf_FieldDescriptorProto_options(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_FieldOptions*)_upb_Message_New(&google_protobuf_FieldOptions_msginit, arena);
-    if (!sub) return NULL;
-    google_protobuf_FieldDescriptorProto_set_options(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void google_protobuf_FieldDescriptorProto_set_oneof_index(google_protobuf_FieldDescriptorProto *msg, int32_t value) {
-  _upb_sethas(msg, 9);
-  *UPB_PTR_AT(msg, UPB_SIZE(16, 16), int32_t) = value;
-}
-UPB_INLINE void google_protobuf_FieldDescriptorProto_set_json_name(google_protobuf_FieldDescriptorProto *msg, upb_StringView value) {
-  _upb_sethas(msg, 10);
-  *UPB_PTR_AT(msg, UPB_SIZE(60, 96), upb_StringView) = value;
-}
-UPB_INLINE void google_protobuf_FieldDescriptorProto_set_proto3_optional(google_protobuf_FieldDescriptorProto *msg, bool value) {
-  _upb_sethas(msg, 11);
-  *UPB_PTR_AT(msg, UPB_SIZE(20, 20), bool) = value;
-}
-
-/* google.protobuf.OneofDescriptorProto */
-
-UPB_INLINE google_protobuf_OneofDescriptorProto* google_protobuf_OneofDescriptorProto_new(upb_Arena* arena) {
-  return (google_protobuf_OneofDescriptorProto*)_upb_Message_New(&google_protobuf_OneofDescriptorProto_msginit, arena);
-}
-UPB_INLINE google_protobuf_OneofDescriptorProto* google_protobuf_OneofDescriptorProto_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_OneofDescriptorProto* ret = google_protobuf_OneofDescriptorProto_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_OneofDescriptorProto_msginit, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_OneofDescriptorProto* google_protobuf_OneofDescriptorProto_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_OneofDescriptorProto* ret = google_protobuf_OneofDescriptorProto_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_OneofDescriptorProto_msginit, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_OneofDescriptorProto_serialize(const google_protobuf_OneofDescriptorProto* msg, upb_Arena* arena, size_t* len) {
-  return upb_Encode(msg, &google_protobuf_OneofDescriptorProto_msginit, 0, arena, len);
-}
-UPB_INLINE char* google_protobuf_OneofDescriptorProto_serialize_ex(const google_protobuf_OneofDescriptorProto* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  return upb_Encode(msg, &google_protobuf_OneofDescriptorProto_msginit, options, arena, len);
-}
-UPB_INLINE bool google_protobuf_OneofDescriptorProto_has_name(const google_protobuf_OneofDescriptorProto* msg) {
-  return _upb_hasbit(msg, 1);
-}
-UPB_INLINE void google_protobuf_OneofDescriptorProto_clear_name(const google_protobuf_OneofDescriptorProto* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_StringView) = upb_StringView_FromDataAndSize(NULL, 0);
-  _upb_clearhas(msg, 1);
-}
-UPB_INLINE upb_StringView google_protobuf_OneofDescriptorProto_name(const google_protobuf_OneofDescriptorProto* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_StringView);
-}
-UPB_INLINE bool google_protobuf_OneofDescriptorProto_has_options(const google_protobuf_OneofDescriptorProto* msg) {
-  return _upb_hasbit(msg, 2);
-}
-UPB_INLINE void google_protobuf_OneofDescriptorProto_clear_options(const google_protobuf_OneofDescriptorProto* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(12, 24), const upb_Message*) = NULL;
-}
-UPB_INLINE const google_protobuf_OneofOptions* google_protobuf_OneofDescriptorProto_options(const google_protobuf_OneofDescriptorProto* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(12, 24), const google_protobuf_OneofOptions*);
-}
-
-UPB_INLINE void google_protobuf_OneofDescriptorProto_set_name(google_protobuf_OneofDescriptorProto *msg, upb_StringView value) {
-  _upb_sethas(msg, 1);
-  *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_StringView) = value;
-}
-UPB_INLINE void google_protobuf_OneofDescriptorProto_set_options(google_protobuf_OneofDescriptorProto *msg, google_protobuf_OneofOptions* value) {
-  _upb_sethas(msg, 2);
-  *UPB_PTR_AT(msg, UPB_SIZE(12, 24), google_protobuf_OneofOptions*) = value;
-}
-UPB_INLINE struct google_protobuf_OneofOptions* google_protobuf_OneofDescriptorProto_mutable_options(google_protobuf_OneofDescriptorProto* msg, upb_Arena* arena) {
-  struct google_protobuf_OneofOptions* sub = (struct google_protobuf_OneofOptions*)google_protobuf_OneofDescriptorProto_options(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_OneofOptions*)_upb_Message_New(&google_protobuf_OneofOptions_msginit, arena);
-    if (!sub) return NULL;
-    google_protobuf_OneofDescriptorProto_set_options(msg, sub);
-  }
-  return sub;
-}
-
-/* google.protobuf.EnumDescriptorProto */
-
-UPB_INLINE google_protobuf_EnumDescriptorProto* google_protobuf_EnumDescriptorProto_new(upb_Arena* arena) {
-  return (google_protobuf_EnumDescriptorProto*)_upb_Message_New(&google_protobuf_EnumDescriptorProto_msginit, arena);
-}
-UPB_INLINE google_protobuf_EnumDescriptorProto* google_protobuf_EnumDescriptorProto_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_EnumDescriptorProto* ret = google_protobuf_EnumDescriptorProto_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_EnumDescriptorProto_msginit, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_EnumDescriptorProto* google_protobuf_EnumDescriptorProto_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_EnumDescriptorProto* ret = google_protobuf_EnumDescriptorProto_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_EnumDescriptorProto_msginit, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_EnumDescriptorProto_serialize(const google_protobuf_EnumDescriptorProto* msg, upb_Arena* arena, size_t* len) {
-  return upb_Encode(msg, &google_protobuf_EnumDescriptorProto_msginit, 0, arena, len);
-}
-UPB_INLINE char* google_protobuf_EnumDescriptorProto_serialize_ex(const google_protobuf_EnumDescriptorProto* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  return upb_Encode(msg, &google_protobuf_EnumDescriptorProto_msginit, options, arena, len);
-}
-UPB_INLINE bool google_protobuf_EnumDescriptorProto_has_name(const google_protobuf_EnumDescriptorProto* msg) {
-  return _upb_hasbit(msg, 1);
-}
-UPB_INLINE void google_protobuf_EnumDescriptorProto_clear_name(const google_protobuf_EnumDescriptorProto* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_StringView) = upb_StringView_FromDataAndSize(NULL, 0);
-  _upb_clearhas(msg, 1);
-}
-UPB_INLINE upb_StringView google_protobuf_EnumDescriptorProto_name(const google_protobuf_EnumDescriptorProto* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_StringView);
-}
-UPB_INLINE bool google_protobuf_EnumDescriptorProto_has_value(const google_protobuf_EnumDescriptorProto* msg) {
-  return _upb_has_submsg_nohasbit(msg, UPB_SIZE(12, 24));
-}
-UPB_INLINE void google_protobuf_EnumDescriptorProto_clear_value(const google_protobuf_EnumDescriptorProto* msg) {
-  _upb_array_detach(msg, UPB_SIZE(12, 24));
-}
-UPB_INLINE const google_protobuf_EnumValueDescriptorProto* const* google_protobuf_EnumDescriptorProto_value(const google_protobuf_EnumDescriptorProto* msg, size_t* len) {
-  return (const google_protobuf_EnumValueDescriptorProto* const*)_upb_array_accessor(msg, UPB_SIZE(12, 24), len);
-}
-UPB_INLINE bool google_protobuf_EnumDescriptorProto_has_options(const google_protobuf_EnumDescriptorProto* msg) {
-  return _upb_hasbit(msg, 2);
-}
-UPB_INLINE void google_protobuf_EnumDescriptorProto_clear_options(const google_protobuf_EnumDescriptorProto* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(16, 32), const upb_Message*) = NULL;
-}
-UPB_INLINE const google_protobuf_EnumOptions* google_protobuf_EnumDescriptorProto_options(const google_protobuf_EnumDescriptorProto* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(16, 32), const google_protobuf_EnumOptions*);
-}
-UPB_INLINE bool google_protobuf_EnumDescriptorProto_has_reserved_range(const google_protobuf_EnumDescriptorProto* msg) {
-  return _upb_has_submsg_nohasbit(msg, UPB_SIZE(20, 40));
-}
-UPB_INLINE void google_protobuf_EnumDescriptorProto_clear_reserved_range(const google_protobuf_EnumDescriptorProto* msg) {
-  _upb_array_detach(msg, UPB_SIZE(20, 40));
-}
-UPB_INLINE const google_protobuf_EnumDescriptorProto_EnumReservedRange* const* google_protobuf_EnumDescriptorProto_reserved_range(const google_protobuf_EnumDescriptorProto* msg, size_t* len) {
-  return (const google_protobuf_EnumDescriptorProto_EnumReservedRange* const*)_upb_array_accessor(msg, UPB_SIZE(20, 40), len);
-}
-UPB_INLINE void google_protobuf_EnumDescriptorProto_clear_reserved_name(const google_protobuf_EnumDescriptorProto* msg) {
-  _upb_array_detach(msg, UPB_SIZE(24, 48));
-}
-UPB_INLINE upb_StringView const* google_protobuf_EnumDescriptorProto_reserved_name(const google_protobuf_EnumDescriptorProto* msg, size_t* len) {
-  return (upb_StringView const*)_upb_array_accessor(msg, UPB_SIZE(24, 48), len);
-}
-
-UPB_INLINE void google_protobuf_EnumDescriptorProto_set_name(google_protobuf_EnumDescriptorProto *msg, upb_StringView value) {
-  _upb_sethas(msg, 1);
-  *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_StringView) = value;
-}
-UPB_INLINE google_protobuf_EnumValueDescriptorProto** google_protobuf_EnumDescriptorProto_mutable_value(google_protobuf_EnumDescriptorProto* msg, size_t* len) {
-  return (google_protobuf_EnumValueDescriptorProto**)_upb_array_mutable_accessor(msg, UPB_SIZE(12, 24), len);
-}
-UPB_INLINE google_protobuf_EnumValueDescriptorProto** google_protobuf_EnumDescriptorProto_resize_value(google_protobuf_EnumDescriptorProto* msg, size_t len, upb_Arena* arena) {
-  return (google_protobuf_EnumValueDescriptorProto**)_upb_Array_Resize_accessor2(msg, UPB_SIZE(12, 24), len, UPB_SIZE(2, 3), arena);
-}
-UPB_INLINE struct google_protobuf_EnumValueDescriptorProto* google_protobuf_EnumDescriptorProto_add_value(google_protobuf_EnumDescriptorProto* msg, upb_Arena* arena) {
-  struct google_protobuf_EnumValueDescriptorProto* sub = (struct google_protobuf_EnumValueDescriptorProto*)_upb_Message_New(&google_protobuf_EnumValueDescriptorProto_msginit, arena);
-  bool ok = _upb_Array_Append_accessor2(msg, UPB_SIZE(12, 24), UPB_SIZE(2, 3), &sub, arena);
-  if (!ok) return NULL;
-  return sub;
-}
-UPB_INLINE void google_protobuf_EnumDescriptorProto_set_options(google_protobuf_EnumDescriptorProto *msg, google_protobuf_EnumOptions* value) {
-  _upb_sethas(msg, 2);
-  *UPB_PTR_AT(msg, UPB_SIZE(16, 32), google_protobuf_EnumOptions*) = value;
-}
-UPB_INLINE struct google_protobuf_EnumOptions* google_protobuf_EnumDescriptorProto_mutable_options(google_protobuf_EnumDescriptorProto* msg, upb_Arena* arena) {
-  struct google_protobuf_EnumOptions* sub = (struct google_protobuf_EnumOptions*)google_protobuf_EnumDescriptorProto_options(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_EnumOptions*)_upb_Message_New(&google_protobuf_EnumOptions_msginit, arena);
-    if (!sub) return NULL;
-    google_protobuf_EnumDescriptorProto_set_options(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE google_protobuf_EnumDescriptorProto_EnumReservedRange** google_protobuf_EnumDescriptorProto_mutable_reserved_range(google_protobuf_EnumDescriptorProto* msg, size_t* len) {
-  return (google_protobuf_EnumDescriptorProto_EnumReservedRange**)_upb_array_mutable_accessor(msg, UPB_SIZE(20, 40), len);
-}
-UPB_INLINE google_protobuf_EnumDescriptorProto_EnumReservedRange** google_protobuf_EnumDescriptorProto_resize_reserved_range(google_protobuf_EnumDescriptorProto* msg, size_t len, upb_Arena* arena) {
-  return (google_protobuf_EnumDescriptorProto_EnumReservedRange**)_upb_Array_Resize_accessor2(msg, UPB_SIZE(20, 40), len, UPB_SIZE(2, 3), arena);
-}
-UPB_INLINE struct google_protobuf_EnumDescriptorProto_EnumReservedRange* google_protobuf_EnumDescriptorProto_add_reserved_range(google_protobuf_EnumDescriptorProto* msg, upb_Arena* arena) {
-  struct google_protobuf_EnumDescriptorProto_EnumReservedRange* sub = (struct google_protobuf_EnumDescriptorProto_EnumReservedRange*)_upb_Message_New(&google_protobuf_EnumDescriptorProto_EnumReservedRange_msginit, arena);
-  bool ok = _upb_Array_Append_accessor2(msg, UPB_SIZE(20, 40), UPB_SIZE(2, 3), &sub, arena);
-  if (!ok) return NULL;
-  return sub;
-}
-UPB_INLINE upb_StringView* google_protobuf_EnumDescriptorProto_mutable_reserved_name(google_protobuf_EnumDescriptorProto* msg, size_t* len) {
-  return (upb_StringView*)_upb_array_mutable_accessor(msg, UPB_SIZE(24, 48), len);
-}
-UPB_INLINE upb_StringView* google_protobuf_EnumDescriptorProto_resize_reserved_name(google_protobuf_EnumDescriptorProto* msg, size_t len, upb_Arena* arena) {
-  return (upb_StringView*)_upb_Array_Resize_accessor2(msg, UPB_SIZE(24, 48), len, UPB_SIZE(3, 4), arena);
-}
-UPB_INLINE bool google_protobuf_EnumDescriptorProto_add_reserved_name(google_protobuf_EnumDescriptorProto* msg, upb_StringView val, upb_Arena* arena) {
-  return _upb_Array_Append_accessor2(msg, UPB_SIZE(24, 48), UPB_SIZE(3, 4), &val, arena);
-}
-
-/* google.protobuf.EnumDescriptorProto.EnumReservedRange */
-
-UPB_INLINE google_protobuf_EnumDescriptorProto_EnumReservedRange* google_protobuf_EnumDescriptorProto_EnumReservedRange_new(upb_Arena* arena) {
-  return (google_protobuf_EnumDescriptorProto_EnumReservedRange*)_upb_Message_New(&google_protobuf_EnumDescriptorProto_EnumReservedRange_msginit, arena);
-}
-UPB_INLINE google_protobuf_EnumDescriptorProto_EnumReservedRange* google_protobuf_EnumDescriptorProto_EnumReservedRange_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_EnumDescriptorProto_EnumReservedRange* ret = google_protobuf_EnumDescriptorProto_EnumReservedRange_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_EnumDescriptorProto_EnumReservedRange_msginit, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_EnumDescriptorProto_EnumReservedRange* google_protobuf_EnumDescriptorProto_EnumReservedRange_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_EnumDescriptorProto_EnumReservedRange* ret = google_protobuf_EnumDescriptorProto_EnumReservedRange_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_EnumDescriptorProto_EnumReservedRange_msginit, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_EnumDescriptorProto_EnumReservedRange_serialize(const google_protobuf_EnumDescriptorProto_EnumReservedRange* msg, upb_Arena* arena, size_t* len) {
-  return upb_Encode(msg, &google_protobuf_EnumDescriptorProto_EnumReservedRange_msginit, 0, arena, len);
-}
-UPB_INLINE char* google_protobuf_EnumDescriptorProto_EnumReservedRange_serialize_ex(const google_protobuf_EnumDescriptorProto_EnumReservedRange* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  return upb_Encode(msg, &google_protobuf_EnumDescriptorProto_EnumReservedRange_msginit, options, arena, len);
-}
-UPB_INLINE bool google_protobuf_EnumDescriptorProto_EnumReservedRange_has_start(const google_protobuf_EnumDescriptorProto_EnumReservedRange* msg) {
-  return _upb_hasbit(msg, 1);
-}
-UPB_INLINE void google_protobuf_EnumDescriptorProto_EnumReservedRange_clear_start(const google_protobuf_EnumDescriptorProto_EnumReservedRange* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(4, 4), int32_t) = 0;
-  _upb_clearhas(msg, 1);
-}
-UPB_INLINE int32_t google_protobuf_EnumDescriptorProto_EnumReservedRange_start(const google_protobuf_EnumDescriptorProto_EnumReservedRange* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(4, 4), int32_t);
-}
-UPB_INLINE bool google_protobuf_EnumDescriptorProto_EnumReservedRange_has_end(const google_protobuf_EnumDescriptorProto_EnumReservedRange* msg) {
-  return _upb_hasbit(msg, 2);
-}
-UPB_INLINE void google_protobuf_EnumDescriptorProto_EnumReservedRange_clear_end(const google_protobuf_EnumDescriptorProto_EnumReservedRange* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(8, 8), int32_t) = 0;
-  _upb_clearhas(msg, 2);
-}
-UPB_INLINE int32_t google_protobuf_EnumDescriptorProto_EnumReservedRange_end(const google_protobuf_EnumDescriptorProto_EnumReservedRange* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(8, 8), int32_t);
-}
-
-UPB_INLINE void google_protobuf_EnumDescriptorProto_EnumReservedRange_set_start(google_protobuf_EnumDescriptorProto_EnumReservedRange *msg, int32_t value) {
-  _upb_sethas(msg, 1);
-  *UPB_PTR_AT(msg, UPB_SIZE(4, 4), int32_t) = value;
-}
-UPB_INLINE void google_protobuf_EnumDescriptorProto_EnumReservedRange_set_end(google_protobuf_EnumDescriptorProto_EnumReservedRange *msg, int32_t value) {
-  _upb_sethas(msg, 2);
-  *UPB_PTR_AT(msg, UPB_SIZE(8, 8), int32_t) = value;
-}
-
-/* google.protobuf.EnumValueDescriptorProto */
-
-UPB_INLINE google_protobuf_EnumValueDescriptorProto* google_protobuf_EnumValueDescriptorProto_new(upb_Arena* arena) {
-  return (google_protobuf_EnumValueDescriptorProto*)_upb_Message_New(&google_protobuf_EnumValueDescriptorProto_msginit, arena);
-}
-UPB_INLINE google_protobuf_EnumValueDescriptorProto* google_protobuf_EnumValueDescriptorProto_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_EnumValueDescriptorProto* ret = google_protobuf_EnumValueDescriptorProto_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_EnumValueDescriptorProto_msginit, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_EnumValueDescriptorProto* google_protobuf_EnumValueDescriptorProto_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_EnumValueDescriptorProto* ret = google_protobuf_EnumValueDescriptorProto_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_EnumValueDescriptorProto_msginit, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_EnumValueDescriptorProto_serialize(const google_protobuf_EnumValueDescriptorProto* msg, upb_Arena* arena, size_t* len) {
-  return upb_Encode(msg, &google_protobuf_EnumValueDescriptorProto_msginit, 0, arena, len);
-}
-UPB_INLINE char* google_protobuf_EnumValueDescriptorProto_serialize_ex(const google_protobuf_EnumValueDescriptorProto* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  return upb_Encode(msg, &google_protobuf_EnumValueDescriptorProto_msginit, options, arena, len);
-}
-UPB_INLINE bool google_protobuf_EnumValueDescriptorProto_has_name(const google_protobuf_EnumValueDescriptorProto* msg) {
-  return _upb_hasbit(msg, 1);
-}
-UPB_INLINE void google_protobuf_EnumValueDescriptorProto_clear_name(const google_protobuf_EnumValueDescriptorProto* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(8, 8), upb_StringView) = upb_StringView_FromDataAndSize(NULL, 0);
-  _upb_clearhas(msg, 1);
-}
-UPB_INLINE upb_StringView google_protobuf_EnumValueDescriptorProto_name(const google_protobuf_EnumValueDescriptorProto* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(8, 8), upb_StringView);
-}
-UPB_INLINE bool google_protobuf_EnumValueDescriptorProto_has_number(const google_protobuf_EnumValueDescriptorProto* msg) {
-  return _upb_hasbit(msg, 2);
-}
-UPB_INLINE void google_protobuf_EnumValueDescriptorProto_clear_number(const google_protobuf_EnumValueDescriptorProto* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(4, 4), int32_t) = 0;
-  _upb_clearhas(msg, 2);
-}
-UPB_INLINE int32_t google_protobuf_EnumValueDescriptorProto_number(const google_protobuf_EnumValueDescriptorProto* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(4, 4), int32_t);
-}
-UPB_INLINE bool google_protobuf_EnumValueDescriptorProto_has_options(const google_protobuf_EnumValueDescriptorProto* msg) {
-  return _upb_hasbit(msg, 3);
-}
-UPB_INLINE void google_protobuf_EnumValueDescriptorProto_clear_options(const google_protobuf_EnumValueDescriptorProto* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(16, 24), const upb_Message*) = NULL;
-}
-UPB_INLINE const google_protobuf_EnumValueOptions* google_protobuf_EnumValueDescriptorProto_options(const google_protobuf_EnumValueDescriptorProto* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(16, 24), const google_protobuf_EnumValueOptions*);
-}
-
-UPB_INLINE void google_protobuf_EnumValueDescriptorProto_set_name(google_protobuf_EnumValueDescriptorProto *msg, upb_StringView value) {
-  _upb_sethas(msg, 1);
-  *UPB_PTR_AT(msg, UPB_SIZE(8, 8), upb_StringView) = value;
-}
-UPB_INLINE void google_protobuf_EnumValueDescriptorProto_set_number(google_protobuf_EnumValueDescriptorProto *msg, int32_t value) {
-  _upb_sethas(msg, 2);
-  *UPB_PTR_AT(msg, UPB_SIZE(4, 4), int32_t) = value;
-}
-UPB_INLINE void google_protobuf_EnumValueDescriptorProto_set_options(google_protobuf_EnumValueDescriptorProto *msg, google_protobuf_EnumValueOptions* value) {
-  _upb_sethas(msg, 3);
-  *UPB_PTR_AT(msg, UPB_SIZE(16, 24), google_protobuf_EnumValueOptions*) = value;
-}
-UPB_INLINE struct google_protobuf_EnumValueOptions* google_protobuf_EnumValueDescriptorProto_mutable_options(google_protobuf_EnumValueDescriptorProto* msg, upb_Arena* arena) {
-  struct google_protobuf_EnumValueOptions* sub = (struct google_protobuf_EnumValueOptions*)google_protobuf_EnumValueDescriptorProto_options(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_EnumValueOptions*)_upb_Message_New(&google_protobuf_EnumValueOptions_msginit, arena);
-    if (!sub) return NULL;
-    google_protobuf_EnumValueDescriptorProto_set_options(msg, sub);
-  }
-  return sub;
-}
-
-/* google.protobuf.ServiceDescriptorProto */
-
-UPB_INLINE google_protobuf_ServiceDescriptorProto* google_protobuf_ServiceDescriptorProto_new(upb_Arena* arena) {
-  return (google_protobuf_ServiceDescriptorProto*)_upb_Message_New(&google_protobuf_ServiceDescriptorProto_msginit, arena);
-}
-UPB_INLINE google_protobuf_ServiceDescriptorProto* google_protobuf_ServiceDescriptorProto_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_ServiceDescriptorProto* ret = google_protobuf_ServiceDescriptorProto_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_ServiceDescriptorProto_msginit, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_ServiceDescriptorProto* google_protobuf_ServiceDescriptorProto_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_ServiceDescriptorProto* ret = google_protobuf_ServiceDescriptorProto_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_ServiceDescriptorProto_msginit, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_ServiceDescriptorProto_serialize(const google_protobuf_ServiceDescriptorProto* msg, upb_Arena* arena, size_t* len) {
-  return upb_Encode(msg, &google_protobuf_ServiceDescriptorProto_msginit, 0, arena, len);
-}
-UPB_INLINE char* google_protobuf_ServiceDescriptorProto_serialize_ex(const google_protobuf_ServiceDescriptorProto* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  return upb_Encode(msg, &google_protobuf_ServiceDescriptorProto_msginit, options, arena, len);
-}
-UPB_INLINE bool google_protobuf_ServiceDescriptorProto_has_name(const google_protobuf_ServiceDescriptorProto* msg) {
-  return _upb_hasbit(msg, 1);
-}
-UPB_INLINE void google_protobuf_ServiceDescriptorProto_clear_name(const google_protobuf_ServiceDescriptorProto* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_StringView) = upb_StringView_FromDataAndSize(NULL, 0);
-  _upb_clearhas(msg, 1);
-}
-UPB_INLINE upb_StringView google_protobuf_ServiceDescriptorProto_name(const google_protobuf_ServiceDescriptorProto* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_StringView);
-}
-UPB_INLINE bool google_protobuf_ServiceDescriptorProto_has_method(const google_protobuf_ServiceDescriptorProto* msg) {
-  return _upb_has_submsg_nohasbit(msg, UPB_SIZE(12, 24));
-}
-UPB_INLINE void google_protobuf_ServiceDescriptorProto_clear_method(const google_protobuf_ServiceDescriptorProto* msg) {
-  _upb_array_detach(msg, UPB_SIZE(12, 24));
-}
-UPB_INLINE const google_protobuf_MethodDescriptorProto* const* google_protobuf_ServiceDescriptorProto_method(const google_protobuf_ServiceDescriptorProto* msg, size_t* len) {
-  return (const google_protobuf_MethodDescriptorProto* const*)_upb_array_accessor(msg, UPB_SIZE(12, 24), len);
-}
-UPB_INLINE bool google_protobuf_ServiceDescriptorProto_has_options(const google_protobuf_ServiceDescriptorProto* msg) {
-  return _upb_hasbit(msg, 2);
-}
-UPB_INLINE void google_protobuf_ServiceDescriptorProto_clear_options(const google_protobuf_ServiceDescriptorProto* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(16, 32), const upb_Message*) = NULL;
-}
-UPB_INLINE const google_protobuf_ServiceOptions* google_protobuf_ServiceDescriptorProto_options(const google_protobuf_ServiceDescriptorProto* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(16, 32), const google_protobuf_ServiceOptions*);
-}
-
-UPB_INLINE void google_protobuf_ServiceDescriptorProto_set_name(google_protobuf_ServiceDescriptorProto *msg, upb_StringView value) {
-  _upb_sethas(msg, 1);
-  *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_StringView) = value;
-}
-UPB_INLINE google_protobuf_MethodDescriptorProto** google_protobuf_ServiceDescriptorProto_mutable_method(google_protobuf_ServiceDescriptorProto* msg, size_t* len) {
-  return (google_protobuf_MethodDescriptorProto**)_upb_array_mutable_accessor(msg, UPB_SIZE(12, 24), len);
-}
-UPB_INLINE google_protobuf_MethodDescriptorProto** google_protobuf_ServiceDescriptorProto_resize_method(google_protobuf_ServiceDescriptorProto* msg, size_t len, upb_Arena* arena) {
-  return (google_protobuf_MethodDescriptorProto**)_upb_Array_Resize_accessor2(msg, UPB_SIZE(12, 24), len, UPB_SIZE(2, 3), arena);
-}
-UPB_INLINE struct google_protobuf_MethodDescriptorProto* google_protobuf_ServiceDescriptorProto_add_method(google_protobuf_ServiceDescriptorProto* msg, upb_Arena* arena) {
-  struct google_protobuf_MethodDescriptorProto* sub = (struct google_protobuf_MethodDescriptorProto*)_upb_Message_New(&google_protobuf_MethodDescriptorProto_msginit, arena);
-  bool ok = _upb_Array_Append_accessor2(msg, UPB_SIZE(12, 24), UPB_SIZE(2, 3), &sub, arena);
-  if (!ok) return NULL;
-  return sub;
-}
-UPB_INLINE void google_protobuf_ServiceDescriptorProto_set_options(google_protobuf_ServiceDescriptorProto *msg, google_protobuf_ServiceOptions* value) {
-  _upb_sethas(msg, 2);
-  *UPB_PTR_AT(msg, UPB_SIZE(16, 32), google_protobuf_ServiceOptions*) = value;
-}
-UPB_INLINE struct google_protobuf_ServiceOptions* google_protobuf_ServiceDescriptorProto_mutable_options(google_protobuf_ServiceDescriptorProto* msg, upb_Arena* arena) {
-  struct google_protobuf_ServiceOptions* sub = (struct google_protobuf_ServiceOptions*)google_protobuf_ServiceDescriptorProto_options(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_ServiceOptions*)_upb_Message_New(&google_protobuf_ServiceOptions_msginit, arena);
-    if (!sub) return NULL;
-    google_protobuf_ServiceDescriptorProto_set_options(msg, sub);
-  }
-  return sub;
-}
-
-/* google.protobuf.MethodDescriptorProto */
-
-UPB_INLINE google_protobuf_MethodDescriptorProto* google_protobuf_MethodDescriptorProto_new(upb_Arena* arena) {
-  return (google_protobuf_MethodDescriptorProto*)_upb_Message_New(&google_protobuf_MethodDescriptorProto_msginit, arena);
-}
-UPB_INLINE google_protobuf_MethodDescriptorProto* google_protobuf_MethodDescriptorProto_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_MethodDescriptorProto* ret = google_protobuf_MethodDescriptorProto_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_MethodDescriptorProto_msginit, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_MethodDescriptorProto* google_protobuf_MethodDescriptorProto_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_MethodDescriptorProto* ret = google_protobuf_MethodDescriptorProto_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_MethodDescriptorProto_msginit, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_MethodDescriptorProto_serialize(const google_protobuf_MethodDescriptorProto* msg, upb_Arena* arena, size_t* len) {
-  return upb_Encode(msg, &google_protobuf_MethodDescriptorProto_msginit, 0, arena, len);
-}
-UPB_INLINE char* google_protobuf_MethodDescriptorProto_serialize_ex(const google_protobuf_MethodDescriptorProto* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  return upb_Encode(msg, &google_protobuf_MethodDescriptorProto_msginit, options, arena, len);
-}
-UPB_INLINE bool google_protobuf_MethodDescriptorProto_has_name(const google_protobuf_MethodDescriptorProto* msg) {
-  return _upb_hasbit(msg, 1);
-}
-UPB_INLINE void google_protobuf_MethodDescriptorProto_clear_name(const google_protobuf_MethodDescriptorProto* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_StringView) = upb_StringView_FromDataAndSize(NULL, 0);
-  _upb_clearhas(msg, 1);
-}
-UPB_INLINE upb_StringView google_protobuf_MethodDescriptorProto_name(const google_protobuf_MethodDescriptorProto* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_StringView);
-}
-UPB_INLINE bool google_protobuf_MethodDescriptorProto_has_input_type(const google_protobuf_MethodDescriptorProto* msg) {
-  return _upb_hasbit(msg, 2);
-}
-UPB_INLINE void google_protobuf_MethodDescriptorProto_clear_input_type(const google_protobuf_MethodDescriptorProto* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(12, 24), upb_StringView) = upb_StringView_FromDataAndSize(NULL, 0);
-  _upb_clearhas(msg, 2);
-}
-UPB_INLINE upb_StringView google_protobuf_MethodDescriptorProto_input_type(const google_protobuf_MethodDescriptorProto* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(12, 24), upb_StringView);
-}
-UPB_INLINE bool google_protobuf_MethodDescriptorProto_has_output_type(const google_protobuf_MethodDescriptorProto* msg) {
-  return _upb_hasbit(msg, 3);
-}
-UPB_INLINE void google_protobuf_MethodDescriptorProto_clear_output_type(const google_protobuf_MethodDescriptorProto* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(20, 40), upb_StringView) = upb_StringView_FromDataAndSize(NULL, 0);
-  _upb_clearhas(msg, 3);
-}
-UPB_INLINE upb_StringView google_protobuf_MethodDescriptorProto_output_type(const google_protobuf_MethodDescriptorProto* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(20, 40), upb_StringView);
-}
-UPB_INLINE bool google_protobuf_MethodDescriptorProto_has_options(const google_protobuf_MethodDescriptorProto* msg) {
-  return _upb_hasbit(msg, 4);
-}
-UPB_INLINE void google_protobuf_MethodDescriptorProto_clear_options(const google_protobuf_MethodDescriptorProto* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(28, 56), const upb_Message*) = NULL;
-}
-UPB_INLINE const google_protobuf_MethodOptions* google_protobuf_MethodDescriptorProto_options(const google_protobuf_MethodDescriptorProto* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(28, 56), const google_protobuf_MethodOptions*);
-}
-UPB_INLINE bool google_protobuf_MethodDescriptorProto_has_client_streaming(const google_protobuf_MethodDescriptorProto* msg) {
-  return _upb_hasbit(msg, 5);
-}
-UPB_INLINE void google_protobuf_MethodDescriptorProto_clear_client_streaming(const google_protobuf_MethodDescriptorProto* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(1, 1), bool) = 0;
-  _upb_clearhas(msg, 5);
-}
-UPB_INLINE bool google_protobuf_MethodDescriptorProto_client_streaming(const google_protobuf_MethodDescriptorProto* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(1, 1), bool);
-}
-UPB_INLINE bool google_protobuf_MethodDescriptorProto_has_server_streaming(const google_protobuf_MethodDescriptorProto* msg) {
-  return _upb_hasbit(msg, 6);
-}
-UPB_INLINE void google_protobuf_MethodDescriptorProto_clear_server_streaming(const google_protobuf_MethodDescriptorProto* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(2, 2), bool) = 0;
-  _upb_clearhas(msg, 6);
-}
-UPB_INLINE bool google_protobuf_MethodDescriptorProto_server_streaming(const google_protobuf_MethodDescriptorProto* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(2, 2), bool);
-}
-
-UPB_INLINE void google_protobuf_MethodDescriptorProto_set_name(google_protobuf_MethodDescriptorProto *msg, upb_StringView value) {
-  _upb_sethas(msg, 1);
-  *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_StringView) = value;
-}
-UPB_INLINE void google_protobuf_MethodDescriptorProto_set_input_type(google_protobuf_MethodDescriptorProto *msg, upb_StringView value) {
-  _upb_sethas(msg, 2);
-  *UPB_PTR_AT(msg, UPB_SIZE(12, 24), upb_StringView) = value;
-}
-UPB_INLINE void google_protobuf_MethodDescriptorProto_set_output_type(google_protobuf_MethodDescriptorProto *msg, upb_StringView value) {
-  _upb_sethas(msg, 3);
-  *UPB_PTR_AT(msg, UPB_SIZE(20, 40), upb_StringView) = value;
-}
-UPB_INLINE void google_protobuf_MethodDescriptorProto_set_options(google_protobuf_MethodDescriptorProto *msg, google_protobuf_MethodOptions* value) {
-  _upb_sethas(msg, 4);
-  *UPB_PTR_AT(msg, UPB_SIZE(28, 56), google_protobuf_MethodOptions*) = value;
-}
-UPB_INLINE struct google_protobuf_MethodOptions* google_protobuf_MethodDescriptorProto_mutable_options(google_protobuf_MethodDescriptorProto* msg, upb_Arena* arena) {
-  struct google_protobuf_MethodOptions* sub = (struct google_protobuf_MethodOptions*)google_protobuf_MethodDescriptorProto_options(msg);
-  if (sub == NULL) {
-    sub = (struct google_protobuf_MethodOptions*)_upb_Message_New(&google_protobuf_MethodOptions_msginit, arena);
-    if (!sub) return NULL;
-    google_protobuf_MethodDescriptorProto_set_options(msg, sub);
-  }
-  return sub;
-}
-UPB_INLINE void google_protobuf_MethodDescriptorProto_set_client_streaming(google_protobuf_MethodDescriptorProto *msg, bool value) {
-  _upb_sethas(msg, 5);
-  *UPB_PTR_AT(msg, UPB_SIZE(1, 1), bool) = value;
-}
-UPB_INLINE void google_protobuf_MethodDescriptorProto_set_server_streaming(google_protobuf_MethodDescriptorProto *msg, bool value) {
-  _upb_sethas(msg, 6);
-  *UPB_PTR_AT(msg, UPB_SIZE(2, 2), bool) = value;
-}
-
-/* google.protobuf.FileOptions */
-
-UPB_INLINE google_protobuf_FileOptions* google_protobuf_FileOptions_new(upb_Arena* arena) {
-  return (google_protobuf_FileOptions*)_upb_Message_New(&google_protobuf_FileOptions_msginit, arena);
-}
-UPB_INLINE google_protobuf_FileOptions* google_protobuf_FileOptions_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_FileOptions* ret = google_protobuf_FileOptions_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_FileOptions_msginit, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_FileOptions* google_protobuf_FileOptions_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_FileOptions* ret = google_protobuf_FileOptions_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_FileOptions_msginit, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_FileOptions_serialize(const google_protobuf_FileOptions* msg, upb_Arena* arena, size_t* len) {
-  return upb_Encode(msg, &google_protobuf_FileOptions_msginit, 0, arena, len);
-}
-UPB_INLINE char* google_protobuf_FileOptions_serialize_ex(const google_protobuf_FileOptions* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  return upb_Encode(msg, &google_protobuf_FileOptions_msginit, options, arena, len);
-}
-UPB_INLINE bool google_protobuf_FileOptions_has_java_package(const google_protobuf_FileOptions* msg) {
-  return _upb_hasbit(msg, 1);
-}
-UPB_INLINE void google_protobuf_FileOptions_clear_java_package(const google_protobuf_FileOptions* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(20, 24), upb_StringView) = upb_StringView_FromDataAndSize(NULL, 0);
-  _upb_clearhas(msg, 1);
-}
-UPB_INLINE upb_StringView google_protobuf_FileOptions_java_package(const google_protobuf_FileOptions* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(20, 24), upb_StringView);
-}
-UPB_INLINE bool google_protobuf_FileOptions_has_java_outer_classname(const google_protobuf_FileOptions* msg) {
-  return _upb_hasbit(msg, 2);
-}
-UPB_INLINE void google_protobuf_FileOptions_clear_java_outer_classname(const google_protobuf_FileOptions* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(28, 40), upb_StringView) = upb_StringView_FromDataAndSize(NULL, 0);
-  _upb_clearhas(msg, 2);
-}
-UPB_INLINE upb_StringView google_protobuf_FileOptions_java_outer_classname(const google_protobuf_FileOptions* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(28, 40), upb_StringView);
-}
-UPB_INLINE bool google_protobuf_FileOptions_has_optimize_for(const google_protobuf_FileOptions* msg) {
-  return _upb_hasbit(msg, 3);
-}
-UPB_INLINE void google_protobuf_FileOptions_clear_optimize_for(const google_protobuf_FileOptions* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(4, 4), int32_t) = 0;
-  _upb_clearhas(msg, 3);
-}
-UPB_INLINE int32_t google_protobuf_FileOptions_optimize_for(const google_protobuf_FileOptions* msg) {
-  return google_protobuf_FileOptions_has_optimize_for(msg) ? *UPB_PTR_AT(msg, UPB_SIZE(4, 4), int32_t) : 1;
-}
-UPB_INLINE bool google_protobuf_FileOptions_has_java_multiple_files(const google_protobuf_FileOptions* msg) {
-  return _upb_hasbit(msg, 4);
-}
-UPB_INLINE void google_protobuf_FileOptions_clear_java_multiple_files(const google_protobuf_FileOptions* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(8, 8), bool) = 0;
-  _upb_clearhas(msg, 4);
-}
-UPB_INLINE bool google_protobuf_FileOptions_java_multiple_files(const google_protobuf_FileOptions* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(8, 8), bool);
-}
-UPB_INLINE bool google_protobuf_FileOptions_has_go_package(const google_protobuf_FileOptions* msg) {
-  return _upb_hasbit(msg, 5);
-}
-UPB_INLINE void google_protobuf_FileOptions_clear_go_package(const google_protobuf_FileOptions* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(36, 56), upb_StringView) = upb_StringView_FromDataAndSize(NULL, 0);
-  _upb_clearhas(msg, 5);
-}
-UPB_INLINE upb_StringView google_protobuf_FileOptions_go_package(const google_protobuf_FileOptions* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(36, 56), upb_StringView);
-}
-UPB_INLINE bool google_protobuf_FileOptions_has_cc_generic_services(const google_protobuf_FileOptions* msg) {
-  return _upb_hasbit(msg, 6);
-}
-UPB_INLINE void google_protobuf_FileOptions_clear_cc_generic_services(const google_protobuf_FileOptions* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(9, 9), bool) = 0;
-  _upb_clearhas(msg, 6);
-}
-UPB_INLINE bool google_protobuf_FileOptions_cc_generic_services(const google_protobuf_FileOptions* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(9, 9), bool);
-}
-UPB_INLINE bool google_protobuf_FileOptions_has_java_generic_services(const google_protobuf_FileOptions* msg) {
-  return _upb_hasbit(msg, 7);
-}
-UPB_INLINE void google_protobuf_FileOptions_clear_java_generic_services(const google_protobuf_FileOptions* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(10, 10), bool) = 0;
-  _upb_clearhas(msg, 7);
-}
-UPB_INLINE bool google_protobuf_FileOptions_java_generic_services(const google_protobuf_FileOptions* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(10, 10), bool);
-}
-UPB_INLINE bool google_protobuf_FileOptions_has_py_generic_services(const google_protobuf_FileOptions* msg) {
-  return _upb_hasbit(msg, 8);
-}
-UPB_INLINE void google_protobuf_FileOptions_clear_py_generic_services(const google_protobuf_FileOptions* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(11, 11), bool) = 0;
-  _upb_clearhas(msg, 8);
-}
-UPB_INLINE bool google_protobuf_FileOptions_py_generic_services(const google_protobuf_FileOptions* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(11, 11), bool);
-}
-UPB_INLINE bool google_protobuf_FileOptions_has_java_generate_equals_and_hash(const google_protobuf_FileOptions* msg) {
-  return _upb_hasbit(msg, 9);
-}
-UPB_INLINE void google_protobuf_FileOptions_clear_java_generate_equals_and_hash(const google_protobuf_FileOptions* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(12, 12), bool) = 0;
-  _upb_clearhas(msg, 9);
-}
-UPB_INLINE bool google_protobuf_FileOptions_java_generate_equals_and_hash(const google_protobuf_FileOptions* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(12, 12), bool);
-}
-UPB_INLINE bool google_protobuf_FileOptions_has_deprecated(const google_protobuf_FileOptions* msg) {
-  return _upb_hasbit(msg, 10);
-}
-UPB_INLINE void google_protobuf_FileOptions_clear_deprecated(const google_protobuf_FileOptions* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(13, 13), bool) = 0;
-  _upb_clearhas(msg, 10);
-}
-UPB_INLINE bool google_protobuf_FileOptions_deprecated(const google_protobuf_FileOptions* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(13, 13), bool);
-}
-UPB_INLINE bool google_protobuf_FileOptions_has_java_string_check_utf8(const google_protobuf_FileOptions* msg) {
-  return _upb_hasbit(msg, 11);
-}
-UPB_INLINE void google_protobuf_FileOptions_clear_java_string_check_utf8(const google_protobuf_FileOptions* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(14, 14), bool) = 0;
-  _upb_clearhas(msg, 11);
-}
-UPB_INLINE bool google_protobuf_FileOptions_java_string_check_utf8(const google_protobuf_FileOptions* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(14, 14), bool);
-}
-UPB_INLINE bool google_protobuf_FileOptions_has_cc_enable_arenas(const google_protobuf_FileOptions* msg) {
-  return _upb_hasbit(msg, 12);
-}
-UPB_INLINE void google_protobuf_FileOptions_clear_cc_enable_arenas(const google_protobuf_FileOptions* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(15, 15), bool) = 0;
-  _upb_clearhas(msg, 12);
-}
-UPB_INLINE bool google_protobuf_FileOptions_cc_enable_arenas(const google_protobuf_FileOptions* msg) {
-  return google_protobuf_FileOptions_has_cc_enable_arenas(msg) ? *UPB_PTR_AT(msg, UPB_SIZE(15, 15), bool) : true;
-}
-UPB_INLINE bool google_protobuf_FileOptions_has_objc_class_prefix(const google_protobuf_FileOptions* msg) {
-  return _upb_hasbit(msg, 13);
-}
-UPB_INLINE void google_protobuf_FileOptions_clear_objc_class_prefix(const google_protobuf_FileOptions* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(44, 72), upb_StringView) = upb_StringView_FromDataAndSize(NULL, 0);
-  _upb_clearhas(msg, 13);
-}
-UPB_INLINE upb_StringView google_protobuf_FileOptions_objc_class_prefix(const google_protobuf_FileOptions* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(44, 72), upb_StringView);
-}
-UPB_INLINE bool google_protobuf_FileOptions_has_csharp_namespace(const google_protobuf_FileOptions* msg) {
-  return _upb_hasbit(msg, 14);
-}
-UPB_INLINE void google_protobuf_FileOptions_clear_csharp_namespace(const google_protobuf_FileOptions* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(52, 88), upb_StringView) = upb_StringView_FromDataAndSize(NULL, 0);
-  _upb_clearhas(msg, 14);
-}
-UPB_INLINE upb_StringView google_protobuf_FileOptions_csharp_namespace(const google_protobuf_FileOptions* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(52, 88), upb_StringView);
-}
-UPB_INLINE bool google_protobuf_FileOptions_has_swift_prefix(const google_protobuf_FileOptions* msg) {
-  return _upb_hasbit(msg, 15);
-}
-UPB_INLINE void google_protobuf_FileOptions_clear_swift_prefix(const google_protobuf_FileOptions* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(60, 104), upb_StringView) = upb_StringView_FromDataAndSize(NULL, 0);
-  _upb_clearhas(msg, 15);
-}
-UPB_INLINE upb_StringView google_protobuf_FileOptions_swift_prefix(const google_protobuf_FileOptions* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(60, 104), upb_StringView);
-}
-UPB_INLINE bool google_protobuf_FileOptions_has_php_class_prefix(const google_protobuf_FileOptions* msg) {
-  return _upb_hasbit(msg, 16);
-}
-UPB_INLINE void google_protobuf_FileOptions_clear_php_class_prefix(const google_protobuf_FileOptions* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(68, 120), upb_StringView) = upb_StringView_FromDataAndSize(NULL, 0);
-  _upb_clearhas(msg, 16);
-}
-UPB_INLINE upb_StringView google_protobuf_FileOptions_php_class_prefix(const google_protobuf_FileOptions* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(68, 120), upb_StringView);
-}
-UPB_INLINE bool google_protobuf_FileOptions_has_php_namespace(const google_protobuf_FileOptions* msg) {
-  return _upb_hasbit(msg, 17);
-}
-UPB_INLINE void google_protobuf_FileOptions_clear_php_namespace(const google_protobuf_FileOptions* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(76, 136), upb_StringView) = upb_StringView_FromDataAndSize(NULL, 0);
-  _upb_clearhas(msg, 17);
-}
-UPB_INLINE upb_StringView google_protobuf_FileOptions_php_namespace(const google_protobuf_FileOptions* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(76, 136), upb_StringView);
-}
-UPB_INLINE bool google_protobuf_FileOptions_has_php_generic_services(const google_protobuf_FileOptions* msg) {
-  return _upb_hasbit(msg, 18);
-}
-UPB_INLINE void google_protobuf_FileOptions_clear_php_generic_services(const google_protobuf_FileOptions* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(16, 16), bool) = 0;
-  _upb_clearhas(msg, 18);
-}
-UPB_INLINE bool google_protobuf_FileOptions_php_generic_services(const google_protobuf_FileOptions* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(16, 16), bool);
-}
-UPB_INLINE bool google_protobuf_FileOptions_has_php_metadata_namespace(const google_protobuf_FileOptions* msg) {
-  return _upb_hasbit(msg, 19);
-}
-UPB_INLINE void google_protobuf_FileOptions_clear_php_metadata_namespace(const google_protobuf_FileOptions* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(84, 152), upb_StringView) = upb_StringView_FromDataAndSize(NULL, 0);
-  _upb_clearhas(msg, 19);
-}
-UPB_INLINE upb_StringView google_protobuf_FileOptions_php_metadata_namespace(const google_protobuf_FileOptions* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(84, 152), upb_StringView);
-}
-UPB_INLINE bool google_protobuf_FileOptions_has_ruby_package(const google_protobuf_FileOptions* msg) {
-  return _upb_hasbit(msg, 20);
-}
-UPB_INLINE void google_protobuf_FileOptions_clear_ruby_package(const google_protobuf_FileOptions* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(92, 168), upb_StringView) = upb_StringView_FromDataAndSize(NULL, 0);
-  _upb_clearhas(msg, 20);
-}
-UPB_INLINE upb_StringView google_protobuf_FileOptions_ruby_package(const google_protobuf_FileOptions* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(92, 168), upb_StringView);
-}
-UPB_INLINE bool google_protobuf_FileOptions_has_uninterpreted_option(const google_protobuf_FileOptions* msg) {
-  return _upb_has_submsg_nohasbit(msg, UPB_SIZE(100, 184));
-}
-UPB_INLINE void google_protobuf_FileOptions_clear_uninterpreted_option(const google_protobuf_FileOptions* msg) {
-  _upb_array_detach(msg, UPB_SIZE(100, 184));
-}
-UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_FileOptions_uninterpreted_option(const google_protobuf_FileOptions* msg, size_t* len) {
-  return (const google_protobuf_UninterpretedOption* const*)_upb_array_accessor(msg, UPB_SIZE(100, 184), len);
-}
-
-UPB_INLINE void google_protobuf_FileOptions_set_java_package(google_protobuf_FileOptions *msg, upb_StringView value) {
-  _upb_sethas(msg, 1);
-  *UPB_PTR_AT(msg, UPB_SIZE(20, 24), upb_StringView) = value;
-}
-UPB_INLINE void google_protobuf_FileOptions_set_java_outer_classname(google_protobuf_FileOptions *msg, upb_StringView value) {
-  _upb_sethas(msg, 2);
-  *UPB_PTR_AT(msg, UPB_SIZE(28, 40), upb_StringView) = value;
-}
-UPB_INLINE void google_protobuf_FileOptions_set_optimize_for(google_protobuf_FileOptions *msg, int32_t value) {
-  _upb_sethas(msg, 3);
-  *UPB_PTR_AT(msg, UPB_SIZE(4, 4), int32_t) = value;
-}
-UPB_INLINE void google_protobuf_FileOptions_set_java_multiple_files(google_protobuf_FileOptions *msg, bool value) {
-  _upb_sethas(msg, 4);
-  *UPB_PTR_AT(msg, UPB_SIZE(8, 8), bool) = value;
-}
-UPB_INLINE void google_protobuf_FileOptions_set_go_package(google_protobuf_FileOptions *msg, upb_StringView value) {
-  _upb_sethas(msg, 5);
-  *UPB_PTR_AT(msg, UPB_SIZE(36, 56), upb_StringView) = value;
-}
-UPB_INLINE void google_protobuf_FileOptions_set_cc_generic_services(google_protobuf_FileOptions *msg, bool value) {
-  _upb_sethas(msg, 6);
-  *UPB_PTR_AT(msg, UPB_SIZE(9, 9), bool) = value;
-}
-UPB_INLINE void google_protobuf_FileOptions_set_java_generic_services(google_protobuf_FileOptions *msg, bool value) {
-  _upb_sethas(msg, 7);
-  *UPB_PTR_AT(msg, UPB_SIZE(10, 10), bool) = value;
-}
-UPB_INLINE void google_protobuf_FileOptions_set_py_generic_services(google_protobuf_FileOptions *msg, bool value) {
-  _upb_sethas(msg, 8);
-  *UPB_PTR_AT(msg, UPB_SIZE(11, 11), bool) = value;
-}
-UPB_INLINE void google_protobuf_FileOptions_set_java_generate_equals_and_hash(google_protobuf_FileOptions *msg, bool value) {
-  _upb_sethas(msg, 9);
-  *UPB_PTR_AT(msg, UPB_SIZE(12, 12), bool) = value;
-}
-UPB_INLINE void google_protobuf_FileOptions_set_deprecated(google_protobuf_FileOptions *msg, bool value) {
-  _upb_sethas(msg, 10);
-  *UPB_PTR_AT(msg, UPB_SIZE(13, 13), bool) = value;
-}
-UPB_INLINE void google_protobuf_FileOptions_set_java_string_check_utf8(google_protobuf_FileOptions *msg, bool value) {
-  _upb_sethas(msg, 11);
-  *UPB_PTR_AT(msg, UPB_SIZE(14, 14), bool) = value;
-}
-UPB_INLINE void google_protobuf_FileOptions_set_cc_enable_arenas(google_protobuf_FileOptions *msg, bool value) {
-  _upb_sethas(msg, 12);
-  *UPB_PTR_AT(msg, UPB_SIZE(15, 15), bool) = value;
-}
-UPB_INLINE void google_protobuf_FileOptions_set_objc_class_prefix(google_protobuf_FileOptions *msg, upb_StringView value) {
-  _upb_sethas(msg, 13);
-  *UPB_PTR_AT(msg, UPB_SIZE(44, 72), upb_StringView) = value;
-}
-UPB_INLINE void google_protobuf_FileOptions_set_csharp_namespace(google_protobuf_FileOptions *msg, upb_StringView value) {
-  _upb_sethas(msg, 14);
-  *UPB_PTR_AT(msg, UPB_SIZE(52, 88), upb_StringView) = value;
-}
-UPB_INLINE void google_protobuf_FileOptions_set_swift_prefix(google_protobuf_FileOptions *msg, upb_StringView value) {
-  _upb_sethas(msg, 15);
-  *UPB_PTR_AT(msg, UPB_SIZE(60, 104), upb_StringView) = value;
-}
-UPB_INLINE void google_protobuf_FileOptions_set_php_class_prefix(google_protobuf_FileOptions *msg, upb_StringView value) {
-  _upb_sethas(msg, 16);
-  *UPB_PTR_AT(msg, UPB_SIZE(68, 120), upb_StringView) = value;
-}
-UPB_INLINE void google_protobuf_FileOptions_set_php_namespace(google_protobuf_FileOptions *msg, upb_StringView value) {
-  _upb_sethas(msg, 17);
-  *UPB_PTR_AT(msg, UPB_SIZE(76, 136), upb_StringView) = value;
-}
-UPB_INLINE void google_protobuf_FileOptions_set_php_generic_services(google_protobuf_FileOptions *msg, bool value) {
-  _upb_sethas(msg, 18);
-  *UPB_PTR_AT(msg, UPB_SIZE(16, 16), bool) = value;
-}
-UPB_INLINE void google_protobuf_FileOptions_set_php_metadata_namespace(google_protobuf_FileOptions *msg, upb_StringView value) {
-  _upb_sethas(msg, 19);
-  *UPB_PTR_AT(msg, UPB_SIZE(84, 152), upb_StringView) = value;
-}
-UPB_INLINE void google_protobuf_FileOptions_set_ruby_package(google_protobuf_FileOptions *msg, upb_StringView value) {
-  _upb_sethas(msg, 20);
-  *UPB_PTR_AT(msg, UPB_SIZE(92, 168), upb_StringView) = value;
-}
-UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_FileOptions_mutable_uninterpreted_option(google_protobuf_FileOptions* msg, size_t* len) {
-  return (google_protobuf_UninterpretedOption**)_upb_array_mutable_accessor(msg, UPB_SIZE(100, 184), len);
-}
-UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_FileOptions_resize_uninterpreted_option(google_protobuf_FileOptions* msg, size_t len, upb_Arena* arena) {
-  return (google_protobuf_UninterpretedOption**)_upb_Array_Resize_accessor2(msg, UPB_SIZE(100, 184), len, UPB_SIZE(2, 3), arena);
-}
-UPB_INLINE struct google_protobuf_UninterpretedOption* google_protobuf_FileOptions_add_uninterpreted_option(google_protobuf_FileOptions* msg, upb_Arena* arena) {
-  struct google_protobuf_UninterpretedOption* sub = (struct google_protobuf_UninterpretedOption*)_upb_Message_New(&google_protobuf_UninterpretedOption_msginit, arena);
-  bool ok = _upb_Array_Append_accessor2(msg, UPB_SIZE(100, 184), UPB_SIZE(2, 3), &sub, arena);
-  if (!ok) return NULL;
-  return sub;
-}
-
-/* google.protobuf.MessageOptions */
-
-UPB_INLINE google_protobuf_MessageOptions* google_protobuf_MessageOptions_new(upb_Arena* arena) {
-  return (google_protobuf_MessageOptions*)_upb_Message_New(&google_protobuf_MessageOptions_msginit, arena);
-}
-UPB_INLINE google_protobuf_MessageOptions* google_protobuf_MessageOptions_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_MessageOptions* ret = google_protobuf_MessageOptions_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_MessageOptions_msginit, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_MessageOptions* google_protobuf_MessageOptions_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_MessageOptions* ret = google_protobuf_MessageOptions_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_MessageOptions_msginit, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_MessageOptions_serialize(const google_protobuf_MessageOptions* msg, upb_Arena* arena, size_t* len) {
-  return upb_Encode(msg, &google_protobuf_MessageOptions_msginit, 0, arena, len);
-}
-UPB_INLINE char* google_protobuf_MessageOptions_serialize_ex(const google_protobuf_MessageOptions* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  return upb_Encode(msg, &google_protobuf_MessageOptions_msginit, options, arena, len);
-}
-UPB_INLINE bool google_protobuf_MessageOptions_has_message_set_wire_format(const google_protobuf_MessageOptions* msg) {
-  return _upb_hasbit(msg, 1);
-}
-UPB_INLINE void google_protobuf_MessageOptions_clear_message_set_wire_format(const google_protobuf_MessageOptions* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(1, 1), bool) = 0;
-  _upb_clearhas(msg, 1);
-}
-UPB_INLINE bool google_protobuf_MessageOptions_message_set_wire_format(const google_protobuf_MessageOptions* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(1, 1), bool);
-}
-UPB_INLINE bool google_protobuf_MessageOptions_has_no_standard_descriptor_accessor(const google_protobuf_MessageOptions* msg) {
-  return _upb_hasbit(msg, 2);
-}
-UPB_INLINE void google_protobuf_MessageOptions_clear_no_standard_descriptor_accessor(const google_protobuf_MessageOptions* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(2, 2), bool) = 0;
-  _upb_clearhas(msg, 2);
-}
-UPB_INLINE bool google_protobuf_MessageOptions_no_standard_descriptor_accessor(const google_protobuf_MessageOptions* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(2, 2), bool);
-}
-UPB_INLINE bool google_protobuf_MessageOptions_has_deprecated(const google_protobuf_MessageOptions* msg) {
-  return _upb_hasbit(msg, 3);
-}
-UPB_INLINE void google_protobuf_MessageOptions_clear_deprecated(const google_protobuf_MessageOptions* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(3, 3), bool) = 0;
-  _upb_clearhas(msg, 3);
-}
-UPB_INLINE bool google_protobuf_MessageOptions_deprecated(const google_protobuf_MessageOptions* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(3, 3), bool);
-}
-UPB_INLINE bool google_protobuf_MessageOptions_has_map_entry(const google_protobuf_MessageOptions* msg) {
-  return _upb_hasbit(msg, 4);
-}
-UPB_INLINE void google_protobuf_MessageOptions_clear_map_entry(const google_protobuf_MessageOptions* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(4, 4), bool) = 0;
-  _upb_clearhas(msg, 4);
-}
-UPB_INLINE bool google_protobuf_MessageOptions_map_entry(const google_protobuf_MessageOptions* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(4, 4), bool);
-}
-UPB_INLINE bool google_protobuf_MessageOptions_has_uninterpreted_option(const google_protobuf_MessageOptions* msg) {
-  return _upb_has_submsg_nohasbit(msg, UPB_SIZE(8, 8));
-}
-UPB_INLINE void google_protobuf_MessageOptions_clear_uninterpreted_option(const google_protobuf_MessageOptions* msg) {
-  _upb_array_detach(msg, UPB_SIZE(8, 8));
-}
-UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_MessageOptions_uninterpreted_option(const google_protobuf_MessageOptions* msg, size_t* len) {
-  return (const google_protobuf_UninterpretedOption* const*)_upb_array_accessor(msg, UPB_SIZE(8, 8), len);
-}
-
-UPB_INLINE void google_protobuf_MessageOptions_set_message_set_wire_format(google_protobuf_MessageOptions *msg, bool value) {
-  _upb_sethas(msg, 1);
-  *UPB_PTR_AT(msg, UPB_SIZE(1, 1), bool) = value;
-}
-UPB_INLINE void google_protobuf_MessageOptions_set_no_standard_descriptor_accessor(google_protobuf_MessageOptions *msg, bool value) {
-  _upb_sethas(msg, 2);
-  *UPB_PTR_AT(msg, UPB_SIZE(2, 2), bool) = value;
-}
-UPB_INLINE void google_protobuf_MessageOptions_set_deprecated(google_protobuf_MessageOptions *msg, bool value) {
-  _upb_sethas(msg, 3);
-  *UPB_PTR_AT(msg, UPB_SIZE(3, 3), bool) = value;
-}
-UPB_INLINE void google_protobuf_MessageOptions_set_map_entry(google_protobuf_MessageOptions *msg, bool value) {
-  _upb_sethas(msg, 4);
-  *UPB_PTR_AT(msg, UPB_SIZE(4, 4), bool) = value;
-}
-UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_MessageOptions_mutable_uninterpreted_option(google_protobuf_MessageOptions* msg, size_t* len) {
-  return (google_protobuf_UninterpretedOption**)_upb_array_mutable_accessor(msg, UPB_SIZE(8, 8), len);
-}
-UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_MessageOptions_resize_uninterpreted_option(google_protobuf_MessageOptions* msg, size_t len, upb_Arena* arena) {
-  return (google_protobuf_UninterpretedOption**)_upb_Array_Resize_accessor2(msg, UPB_SIZE(8, 8), len, UPB_SIZE(2, 3), arena);
-}
-UPB_INLINE struct google_protobuf_UninterpretedOption* google_protobuf_MessageOptions_add_uninterpreted_option(google_protobuf_MessageOptions* msg, upb_Arena* arena) {
-  struct google_protobuf_UninterpretedOption* sub = (struct google_protobuf_UninterpretedOption*)_upb_Message_New(&google_protobuf_UninterpretedOption_msginit, arena);
-  bool ok = _upb_Array_Append_accessor2(msg, UPB_SIZE(8, 8), UPB_SIZE(2, 3), &sub, arena);
-  if (!ok) return NULL;
-  return sub;
-}
-
-/* google.protobuf.FieldOptions */
-
-UPB_INLINE google_protobuf_FieldOptions* google_protobuf_FieldOptions_new(upb_Arena* arena) {
-  return (google_protobuf_FieldOptions*)_upb_Message_New(&google_protobuf_FieldOptions_msginit, arena);
-}
-UPB_INLINE google_protobuf_FieldOptions* google_protobuf_FieldOptions_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_FieldOptions* ret = google_protobuf_FieldOptions_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_FieldOptions_msginit, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_FieldOptions* google_protobuf_FieldOptions_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_FieldOptions* ret = google_protobuf_FieldOptions_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_FieldOptions_msginit, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_FieldOptions_serialize(const google_protobuf_FieldOptions* msg, upb_Arena* arena, size_t* len) {
-  return upb_Encode(msg, &google_protobuf_FieldOptions_msginit, 0, arena, len);
-}
-UPB_INLINE char* google_protobuf_FieldOptions_serialize_ex(const google_protobuf_FieldOptions* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  return upb_Encode(msg, &google_protobuf_FieldOptions_msginit, options, arena, len);
-}
-UPB_INLINE bool google_protobuf_FieldOptions_has_ctype(const google_protobuf_FieldOptions* msg) {
-  return _upb_hasbit(msg, 1);
-}
-UPB_INLINE void google_protobuf_FieldOptions_clear_ctype(const google_protobuf_FieldOptions* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(4, 4), int32_t) = 0;
-  _upb_clearhas(msg, 1);
-}
-UPB_INLINE int32_t google_protobuf_FieldOptions_ctype(const google_protobuf_FieldOptions* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(4, 4), int32_t);
-}
-UPB_INLINE bool google_protobuf_FieldOptions_has_packed(const google_protobuf_FieldOptions* msg) {
-  return _upb_hasbit(msg, 2);
-}
-UPB_INLINE void google_protobuf_FieldOptions_clear_packed(const google_protobuf_FieldOptions* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(8, 8), bool) = 0;
-  _upb_clearhas(msg, 2);
-}
-UPB_INLINE bool google_protobuf_FieldOptions_packed(const google_protobuf_FieldOptions* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(8, 8), bool);
-}
-UPB_INLINE bool google_protobuf_FieldOptions_has_deprecated(const google_protobuf_FieldOptions* msg) {
-  return _upb_hasbit(msg, 3);
-}
-UPB_INLINE void google_protobuf_FieldOptions_clear_deprecated(const google_protobuf_FieldOptions* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(9, 9), bool) = 0;
-  _upb_clearhas(msg, 3);
-}
-UPB_INLINE bool google_protobuf_FieldOptions_deprecated(const google_protobuf_FieldOptions* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(9, 9), bool);
-}
-UPB_INLINE bool google_protobuf_FieldOptions_has_lazy(const google_protobuf_FieldOptions* msg) {
-  return _upb_hasbit(msg, 4);
-}
-UPB_INLINE void google_protobuf_FieldOptions_clear_lazy(const google_protobuf_FieldOptions* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(10, 10), bool) = 0;
-  _upb_clearhas(msg, 4);
-}
-UPB_INLINE bool google_protobuf_FieldOptions_lazy(const google_protobuf_FieldOptions* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(10, 10), bool);
-}
-UPB_INLINE bool google_protobuf_FieldOptions_has_jstype(const google_protobuf_FieldOptions* msg) {
-  return _upb_hasbit(msg, 5);
-}
-UPB_INLINE void google_protobuf_FieldOptions_clear_jstype(const google_protobuf_FieldOptions* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(12, 12), int32_t) = 0;
-  _upb_clearhas(msg, 5);
-}
-UPB_INLINE int32_t google_protobuf_FieldOptions_jstype(const google_protobuf_FieldOptions* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(12, 12), int32_t);
-}
-UPB_INLINE bool google_protobuf_FieldOptions_has_weak(const google_protobuf_FieldOptions* msg) {
-  return _upb_hasbit(msg, 6);
-}
-UPB_INLINE void google_protobuf_FieldOptions_clear_weak(const google_protobuf_FieldOptions* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(16, 16), bool) = 0;
-  _upb_clearhas(msg, 6);
-}
-UPB_INLINE bool google_protobuf_FieldOptions_weak(const google_protobuf_FieldOptions* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(16, 16), bool);
-}
-UPB_INLINE bool google_protobuf_FieldOptions_has_unverified_lazy(const google_protobuf_FieldOptions* msg) {
-  return _upb_hasbit(msg, 7);
-}
-UPB_INLINE void google_protobuf_FieldOptions_clear_unverified_lazy(const google_protobuf_FieldOptions* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(17, 17), bool) = 0;
-  _upb_clearhas(msg, 7);
-}
-UPB_INLINE bool google_protobuf_FieldOptions_unverified_lazy(const google_protobuf_FieldOptions* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(17, 17), bool);
-}
-UPB_INLINE bool google_protobuf_FieldOptions_has_uninterpreted_option(const google_protobuf_FieldOptions* msg) {
-  return _upb_has_submsg_nohasbit(msg, UPB_SIZE(20, 24));
-}
-UPB_INLINE void google_protobuf_FieldOptions_clear_uninterpreted_option(const google_protobuf_FieldOptions* msg) {
-  _upb_array_detach(msg, UPB_SIZE(20, 24));
-}
-UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_FieldOptions_uninterpreted_option(const google_protobuf_FieldOptions* msg, size_t* len) {
-  return (const google_protobuf_UninterpretedOption* const*)_upb_array_accessor(msg, UPB_SIZE(20, 24), len);
-}
-
-UPB_INLINE void google_protobuf_FieldOptions_set_ctype(google_protobuf_FieldOptions *msg, int32_t value) {
-  _upb_sethas(msg, 1);
-  *UPB_PTR_AT(msg, UPB_SIZE(4, 4), int32_t) = value;
-}
-UPB_INLINE void google_protobuf_FieldOptions_set_packed(google_protobuf_FieldOptions *msg, bool value) {
-  _upb_sethas(msg, 2);
-  *UPB_PTR_AT(msg, UPB_SIZE(8, 8), bool) = value;
-}
-UPB_INLINE void google_protobuf_FieldOptions_set_deprecated(google_protobuf_FieldOptions *msg, bool value) {
-  _upb_sethas(msg, 3);
-  *UPB_PTR_AT(msg, UPB_SIZE(9, 9), bool) = value;
-}
-UPB_INLINE void google_protobuf_FieldOptions_set_lazy(google_protobuf_FieldOptions *msg, bool value) {
-  _upb_sethas(msg, 4);
-  *UPB_PTR_AT(msg, UPB_SIZE(10, 10), bool) = value;
-}
-UPB_INLINE void google_protobuf_FieldOptions_set_jstype(google_protobuf_FieldOptions *msg, int32_t value) {
-  _upb_sethas(msg, 5);
-  *UPB_PTR_AT(msg, UPB_SIZE(12, 12), int32_t) = value;
-}
-UPB_INLINE void google_protobuf_FieldOptions_set_weak(google_protobuf_FieldOptions *msg, bool value) {
-  _upb_sethas(msg, 6);
-  *UPB_PTR_AT(msg, UPB_SIZE(16, 16), bool) = value;
-}
-UPB_INLINE void google_protobuf_FieldOptions_set_unverified_lazy(google_protobuf_FieldOptions *msg, bool value) {
-  _upb_sethas(msg, 7);
-  *UPB_PTR_AT(msg, UPB_SIZE(17, 17), bool) = value;
-}
-UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_FieldOptions_mutable_uninterpreted_option(google_protobuf_FieldOptions* msg, size_t* len) {
-  return (google_protobuf_UninterpretedOption**)_upb_array_mutable_accessor(msg, UPB_SIZE(20, 24), len);
-}
-UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_FieldOptions_resize_uninterpreted_option(google_protobuf_FieldOptions* msg, size_t len, upb_Arena* arena) {
-  return (google_protobuf_UninterpretedOption**)_upb_Array_Resize_accessor2(msg, UPB_SIZE(20, 24), len, UPB_SIZE(2, 3), arena);
-}
-UPB_INLINE struct google_protobuf_UninterpretedOption* google_protobuf_FieldOptions_add_uninterpreted_option(google_protobuf_FieldOptions* msg, upb_Arena* arena) {
-  struct google_protobuf_UninterpretedOption* sub = (struct google_protobuf_UninterpretedOption*)_upb_Message_New(&google_protobuf_UninterpretedOption_msginit, arena);
-  bool ok = _upb_Array_Append_accessor2(msg, UPB_SIZE(20, 24), UPB_SIZE(2, 3), &sub, arena);
-  if (!ok) return NULL;
-  return sub;
-}
-
-/* google.protobuf.OneofOptions */
-
-UPB_INLINE google_protobuf_OneofOptions* google_protobuf_OneofOptions_new(upb_Arena* arena) {
-  return (google_protobuf_OneofOptions*)_upb_Message_New(&google_protobuf_OneofOptions_msginit, arena);
-}
-UPB_INLINE google_protobuf_OneofOptions* google_protobuf_OneofOptions_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_OneofOptions* ret = google_protobuf_OneofOptions_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_OneofOptions_msginit, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_OneofOptions* google_protobuf_OneofOptions_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_OneofOptions* ret = google_protobuf_OneofOptions_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_OneofOptions_msginit, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_OneofOptions_serialize(const google_protobuf_OneofOptions* msg, upb_Arena* arena, size_t* len) {
-  return upb_Encode(msg, &google_protobuf_OneofOptions_msginit, 0, arena, len);
-}
-UPB_INLINE char* google_protobuf_OneofOptions_serialize_ex(const google_protobuf_OneofOptions* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  return upb_Encode(msg, &google_protobuf_OneofOptions_msginit, options, arena, len);
-}
-UPB_INLINE bool google_protobuf_OneofOptions_has_uninterpreted_option(const google_protobuf_OneofOptions* msg) {
-  return _upb_has_submsg_nohasbit(msg, UPB_SIZE(0, 0));
-}
-UPB_INLINE void google_protobuf_OneofOptions_clear_uninterpreted_option(const google_protobuf_OneofOptions* msg) {
-  _upb_array_detach(msg, UPB_SIZE(0, 0));
-}
-UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_OneofOptions_uninterpreted_option(const google_protobuf_OneofOptions* msg, size_t* len) {
-  return (const google_protobuf_UninterpretedOption* const*)_upb_array_accessor(msg, UPB_SIZE(0, 0), len);
-}
-
-UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_OneofOptions_mutable_uninterpreted_option(google_protobuf_OneofOptions* msg, size_t* len) {
-  return (google_protobuf_UninterpretedOption**)_upb_array_mutable_accessor(msg, UPB_SIZE(0, 0), len);
-}
-UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_OneofOptions_resize_uninterpreted_option(google_protobuf_OneofOptions* msg, size_t len, upb_Arena* arena) {
-  return (google_protobuf_UninterpretedOption**)_upb_Array_Resize_accessor2(msg, UPB_SIZE(0, 0), len, UPB_SIZE(2, 3), arena);
-}
-UPB_INLINE struct google_protobuf_UninterpretedOption* google_protobuf_OneofOptions_add_uninterpreted_option(google_protobuf_OneofOptions* msg, upb_Arena* arena) {
-  struct google_protobuf_UninterpretedOption* sub = (struct google_protobuf_UninterpretedOption*)_upb_Message_New(&google_protobuf_UninterpretedOption_msginit, arena);
-  bool ok = _upb_Array_Append_accessor2(msg, UPB_SIZE(0, 0), UPB_SIZE(2, 3), &sub, arena);
-  if (!ok) return NULL;
-  return sub;
-}
-
-/* google.protobuf.EnumOptions */
-
-UPB_INLINE google_protobuf_EnumOptions* google_protobuf_EnumOptions_new(upb_Arena* arena) {
-  return (google_protobuf_EnumOptions*)_upb_Message_New(&google_protobuf_EnumOptions_msginit, arena);
-}
-UPB_INLINE google_protobuf_EnumOptions* google_protobuf_EnumOptions_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_EnumOptions* ret = google_protobuf_EnumOptions_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_EnumOptions_msginit, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_EnumOptions* google_protobuf_EnumOptions_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_EnumOptions* ret = google_protobuf_EnumOptions_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_EnumOptions_msginit, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_EnumOptions_serialize(const google_protobuf_EnumOptions* msg, upb_Arena* arena, size_t* len) {
-  return upb_Encode(msg, &google_protobuf_EnumOptions_msginit, 0, arena, len);
-}
-UPB_INLINE char* google_protobuf_EnumOptions_serialize_ex(const google_protobuf_EnumOptions* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  return upb_Encode(msg, &google_protobuf_EnumOptions_msginit, options, arena, len);
-}
-UPB_INLINE bool google_protobuf_EnumOptions_has_allow_alias(const google_protobuf_EnumOptions* msg) {
-  return _upb_hasbit(msg, 1);
-}
-UPB_INLINE void google_protobuf_EnumOptions_clear_allow_alias(const google_protobuf_EnumOptions* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(1, 1), bool) = 0;
-  _upb_clearhas(msg, 1);
-}
-UPB_INLINE bool google_protobuf_EnumOptions_allow_alias(const google_protobuf_EnumOptions* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(1, 1), bool);
-}
-UPB_INLINE bool google_protobuf_EnumOptions_has_deprecated(const google_protobuf_EnumOptions* msg) {
-  return _upb_hasbit(msg, 2);
-}
-UPB_INLINE void google_protobuf_EnumOptions_clear_deprecated(const google_protobuf_EnumOptions* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(2, 2), bool) = 0;
-  _upb_clearhas(msg, 2);
-}
-UPB_INLINE bool google_protobuf_EnumOptions_deprecated(const google_protobuf_EnumOptions* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(2, 2), bool);
-}
-UPB_INLINE bool google_protobuf_EnumOptions_has_uninterpreted_option(const google_protobuf_EnumOptions* msg) {
-  return _upb_has_submsg_nohasbit(msg, UPB_SIZE(4, 8));
-}
-UPB_INLINE void google_protobuf_EnumOptions_clear_uninterpreted_option(const google_protobuf_EnumOptions* msg) {
-  _upb_array_detach(msg, UPB_SIZE(4, 8));
-}
-UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_EnumOptions_uninterpreted_option(const google_protobuf_EnumOptions* msg, size_t* len) {
-  return (const google_protobuf_UninterpretedOption* const*)_upb_array_accessor(msg, UPB_SIZE(4, 8), len);
-}
-
-UPB_INLINE void google_protobuf_EnumOptions_set_allow_alias(google_protobuf_EnumOptions *msg, bool value) {
-  _upb_sethas(msg, 1);
-  *UPB_PTR_AT(msg, UPB_SIZE(1, 1), bool) = value;
-}
-UPB_INLINE void google_protobuf_EnumOptions_set_deprecated(google_protobuf_EnumOptions *msg, bool value) {
-  _upb_sethas(msg, 2);
-  *UPB_PTR_AT(msg, UPB_SIZE(2, 2), bool) = value;
-}
-UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_EnumOptions_mutable_uninterpreted_option(google_protobuf_EnumOptions* msg, size_t* len) {
-  return (google_protobuf_UninterpretedOption**)_upb_array_mutable_accessor(msg, UPB_SIZE(4, 8), len);
-}
-UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_EnumOptions_resize_uninterpreted_option(google_protobuf_EnumOptions* msg, size_t len, upb_Arena* arena) {
-  return (google_protobuf_UninterpretedOption**)_upb_Array_Resize_accessor2(msg, UPB_SIZE(4, 8), len, UPB_SIZE(2, 3), arena);
-}
-UPB_INLINE struct google_protobuf_UninterpretedOption* google_protobuf_EnumOptions_add_uninterpreted_option(google_protobuf_EnumOptions* msg, upb_Arena* arena) {
-  struct google_protobuf_UninterpretedOption* sub = (struct google_protobuf_UninterpretedOption*)_upb_Message_New(&google_protobuf_UninterpretedOption_msginit, arena);
-  bool ok = _upb_Array_Append_accessor2(msg, UPB_SIZE(4, 8), UPB_SIZE(2, 3), &sub, arena);
-  if (!ok) return NULL;
-  return sub;
-}
-
-/* google.protobuf.EnumValueOptions */
-
-UPB_INLINE google_protobuf_EnumValueOptions* google_protobuf_EnumValueOptions_new(upb_Arena* arena) {
-  return (google_protobuf_EnumValueOptions*)_upb_Message_New(&google_protobuf_EnumValueOptions_msginit, arena);
-}
-UPB_INLINE google_protobuf_EnumValueOptions* google_protobuf_EnumValueOptions_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_EnumValueOptions* ret = google_protobuf_EnumValueOptions_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_EnumValueOptions_msginit, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_EnumValueOptions* google_protobuf_EnumValueOptions_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_EnumValueOptions* ret = google_protobuf_EnumValueOptions_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_EnumValueOptions_msginit, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_EnumValueOptions_serialize(const google_protobuf_EnumValueOptions* msg, upb_Arena* arena, size_t* len) {
-  return upb_Encode(msg, &google_protobuf_EnumValueOptions_msginit, 0, arena, len);
-}
-UPB_INLINE char* google_protobuf_EnumValueOptions_serialize_ex(const google_protobuf_EnumValueOptions* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  return upb_Encode(msg, &google_protobuf_EnumValueOptions_msginit, options, arena, len);
-}
-UPB_INLINE bool google_protobuf_EnumValueOptions_has_deprecated(const google_protobuf_EnumValueOptions* msg) {
-  return _upb_hasbit(msg, 1);
-}
-UPB_INLINE void google_protobuf_EnumValueOptions_clear_deprecated(const google_protobuf_EnumValueOptions* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(1, 1), bool) = 0;
-  _upb_clearhas(msg, 1);
-}
-UPB_INLINE bool google_protobuf_EnumValueOptions_deprecated(const google_protobuf_EnumValueOptions* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(1, 1), bool);
-}
-UPB_INLINE bool google_protobuf_EnumValueOptions_has_uninterpreted_option(const google_protobuf_EnumValueOptions* msg) {
-  return _upb_has_submsg_nohasbit(msg, UPB_SIZE(4, 8));
-}
-UPB_INLINE void google_protobuf_EnumValueOptions_clear_uninterpreted_option(const google_protobuf_EnumValueOptions* msg) {
-  _upb_array_detach(msg, UPB_SIZE(4, 8));
-}
-UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_EnumValueOptions_uninterpreted_option(const google_protobuf_EnumValueOptions* msg, size_t* len) {
-  return (const google_protobuf_UninterpretedOption* const*)_upb_array_accessor(msg, UPB_SIZE(4, 8), len);
-}
-
-UPB_INLINE void google_protobuf_EnumValueOptions_set_deprecated(google_protobuf_EnumValueOptions *msg, bool value) {
-  _upb_sethas(msg, 1);
-  *UPB_PTR_AT(msg, UPB_SIZE(1, 1), bool) = value;
-}
-UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_EnumValueOptions_mutable_uninterpreted_option(google_protobuf_EnumValueOptions* msg, size_t* len) {
-  return (google_protobuf_UninterpretedOption**)_upb_array_mutable_accessor(msg, UPB_SIZE(4, 8), len);
-}
-UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_EnumValueOptions_resize_uninterpreted_option(google_protobuf_EnumValueOptions* msg, size_t len, upb_Arena* arena) {
-  return (google_protobuf_UninterpretedOption**)_upb_Array_Resize_accessor2(msg, UPB_SIZE(4, 8), len, UPB_SIZE(2, 3), arena);
-}
-UPB_INLINE struct google_protobuf_UninterpretedOption* google_protobuf_EnumValueOptions_add_uninterpreted_option(google_protobuf_EnumValueOptions* msg, upb_Arena* arena) {
-  struct google_protobuf_UninterpretedOption* sub = (struct google_protobuf_UninterpretedOption*)_upb_Message_New(&google_protobuf_UninterpretedOption_msginit, arena);
-  bool ok = _upb_Array_Append_accessor2(msg, UPB_SIZE(4, 8), UPB_SIZE(2, 3), &sub, arena);
-  if (!ok) return NULL;
-  return sub;
-}
-
-/* google.protobuf.ServiceOptions */
-
-UPB_INLINE google_protobuf_ServiceOptions* google_protobuf_ServiceOptions_new(upb_Arena* arena) {
-  return (google_protobuf_ServiceOptions*)_upb_Message_New(&google_protobuf_ServiceOptions_msginit, arena);
-}
-UPB_INLINE google_protobuf_ServiceOptions* google_protobuf_ServiceOptions_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_ServiceOptions* ret = google_protobuf_ServiceOptions_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_ServiceOptions_msginit, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_ServiceOptions* google_protobuf_ServiceOptions_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_ServiceOptions* ret = google_protobuf_ServiceOptions_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_ServiceOptions_msginit, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_ServiceOptions_serialize(const google_protobuf_ServiceOptions* msg, upb_Arena* arena, size_t* len) {
-  return upb_Encode(msg, &google_protobuf_ServiceOptions_msginit, 0, arena, len);
-}
-UPB_INLINE char* google_protobuf_ServiceOptions_serialize_ex(const google_protobuf_ServiceOptions* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  return upb_Encode(msg, &google_protobuf_ServiceOptions_msginit, options, arena, len);
-}
-UPB_INLINE bool google_protobuf_ServiceOptions_has_deprecated(const google_protobuf_ServiceOptions* msg) {
-  return _upb_hasbit(msg, 1);
-}
-UPB_INLINE void google_protobuf_ServiceOptions_clear_deprecated(const google_protobuf_ServiceOptions* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(1, 1), bool) = 0;
-  _upb_clearhas(msg, 1);
-}
-UPB_INLINE bool google_protobuf_ServiceOptions_deprecated(const google_protobuf_ServiceOptions* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(1, 1), bool);
-}
-UPB_INLINE bool google_protobuf_ServiceOptions_has_uninterpreted_option(const google_protobuf_ServiceOptions* msg) {
-  return _upb_has_submsg_nohasbit(msg, UPB_SIZE(4, 8));
-}
-UPB_INLINE void google_protobuf_ServiceOptions_clear_uninterpreted_option(const google_protobuf_ServiceOptions* msg) {
-  _upb_array_detach(msg, UPB_SIZE(4, 8));
-}
-UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_ServiceOptions_uninterpreted_option(const google_protobuf_ServiceOptions* msg, size_t* len) {
-  return (const google_protobuf_UninterpretedOption* const*)_upb_array_accessor(msg, UPB_SIZE(4, 8), len);
-}
-
-UPB_INLINE void google_protobuf_ServiceOptions_set_deprecated(google_protobuf_ServiceOptions *msg, bool value) {
-  _upb_sethas(msg, 1);
-  *UPB_PTR_AT(msg, UPB_SIZE(1, 1), bool) = value;
-}
-UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_ServiceOptions_mutable_uninterpreted_option(google_protobuf_ServiceOptions* msg, size_t* len) {
-  return (google_protobuf_UninterpretedOption**)_upb_array_mutable_accessor(msg, UPB_SIZE(4, 8), len);
-}
-UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_ServiceOptions_resize_uninterpreted_option(google_protobuf_ServiceOptions* msg, size_t len, upb_Arena* arena) {
-  return (google_protobuf_UninterpretedOption**)_upb_Array_Resize_accessor2(msg, UPB_SIZE(4, 8), len, UPB_SIZE(2, 3), arena);
-}
-UPB_INLINE struct google_protobuf_UninterpretedOption* google_protobuf_ServiceOptions_add_uninterpreted_option(google_protobuf_ServiceOptions* msg, upb_Arena* arena) {
-  struct google_protobuf_UninterpretedOption* sub = (struct google_protobuf_UninterpretedOption*)_upb_Message_New(&google_protobuf_UninterpretedOption_msginit, arena);
-  bool ok = _upb_Array_Append_accessor2(msg, UPB_SIZE(4, 8), UPB_SIZE(2, 3), &sub, arena);
-  if (!ok) return NULL;
-  return sub;
-}
-
-/* google.protobuf.MethodOptions */
-
-UPB_INLINE google_protobuf_MethodOptions* google_protobuf_MethodOptions_new(upb_Arena* arena) {
-  return (google_protobuf_MethodOptions*)_upb_Message_New(&google_protobuf_MethodOptions_msginit, arena);
-}
-UPB_INLINE google_protobuf_MethodOptions* google_protobuf_MethodOptions_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_MethodOptions* ret = google_protobuf_MethodOptions_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_MethodOptions_msginit, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_MethodOptions* google_protobuf_MethodOptions_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_MethodOptions* ret = google_protobuf_MethodOptions_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_MethodOptions_msginit, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_MethodOptions_serialize(const google_protobuf_MethodOptions* msg, upb_Arena* arena, size_t* len) {
-  return upb_Encode(msg, &google_protobuf_MethodOptions_msginit, 0, arena, len);
-}
-UPB_INLINE char* google_protobuf_MethodOptions_serialize_ex(const google_protobuf_MethodOptions* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  return upb_Encode(msg, &google_protobuf_MethodOptions_msginit, options, arena, len);
-}
-UPB_INLINE bool google_protobuf_MethodOptions_has_deprecated(const google_protobuf_MethodOptions* msg) {
-  return _upb_hasbit(msg, 1);
-}
-UPB_INLINE void google_protobuf_MethodOptions_clear_deprecated(const google_protobuf_MethodOptions* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(1, 1), bool) = 0;
-  _upb_clearhas(msg, 1);
-}
-UPB_INLINE bool google_protobuf_MethodOptions_deprecated(const google_protobuf_MethodOptions* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(1, 1), bool);
-}
-UPB_INLINE bool google_protobuf_MethodOptions_has_idempotency_level(const google_protobuf_MethodOptions* msg) {
-  return _upb_hasbit(msg, 2);
-}
-UPB_INLINE void google_protobuf_MethodOptions_clear_idempotency_level(const google_protobuf_MethodOptions* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(4, 4), int32_t) = 0;
-  _upb_clearhas(msg, 2);
-}
-UPB_INLINE int32_t google_protobuf_MethodOptions_idempotency_level(const google_protobuf_MethodOptions* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(4, 4), int32_t);
-}
-UPB_INLINE bool google_protobuf_MethodOptions_has_uninterpreted_option(const google_protobuf_MethodOptions* msg) {
-  return _upb_has_submsg_nohasbit(msg, UPB_SIZE(8, 8));
-}
-UPB_INLINE void google_protobuf_MethodOptions_clear_uninterpreted_option(const google_protobuf_MethodOptions* msg) {
-  _upb_array_detach(msg, UPB_SIZE(8, 8));
-}
-UPB_INLINE const google_protobuf_UninterpretedOption* const* google_protobuf_MethodOptions_uninterpreted_option(const google_protobuf_MethodOptions* msg, size_t* len) {
-  return (const google_protobuf_UninterpretedOption* const*)_upb_array_accessor(msg, UPB_SIZE(8, 8), len);
-}
-
-UPB_INLINE void google_protobuf_MethodOptions_set_deprecated(google_protobuf_MethodOptions *msg, bool value) {
-  _upb_sethas(msg, 1);
-  *UPB_PTR_AT(msg, UPB_SIZE(1, 1), bool) = value;
-}
-UPB_INLINE void google_protobuf_MethodOptions_set_idempotency_level(google_protobuf_MethodOptions *msg, int32_t value) {
-  _upb_sethas(msg, 2);
-  *UPB_PTR_AT(msg, UPB_SIZE(4, 4), int32_t) = value;
-}
-UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_MethodOptions_mutable_uninterpreted_option(google_protobuf_MethodOptions* msg, size_t* len) {
-  return (google_protobuf_UninterpretedOption**)_upb_array_mutable_accessor(msg, UPB_SIZE(8, 8), len);
-}
-UPB_INLINE google_protobuf_UninterpretedOption** google_protobuf_MethodOptions_resize_uninterpreted_option(google_protobuf_MethodOptions* msg, size_t len, upb_Arena* arena) {
-  return (google_protobuf_UninterpretedOption**)_upb_Array_Resize_accessor2(msg, UPB_SIZE(8, 8), len, UPB_SIZE(2, 3), arena);
-}
-UPB_INLINE struct google_protobuf_UninterpretedOption* google_protobuf_MethodOptions_add_uninterpreted_option(google_protobuf_MethodOptions* msg, upb_Arena* arena) {
-  struct google_protobuf_UninterpretedOption* sub = (struct google_protobuf_UninterpretedOption*)_upb_Message_New(&google_protobuf_UninterpretedOption_msginit, arena);
-  bool ok = _upb_Array_Append_accessor2(msg, UPB_SIZE(8, 8), UPB_SIZE(2, 3), &sub, arena);
-  if (!ok) return NULL;
-  return sub;
-}
-
-/* google.protobuf.UninterpretedOption */
-
-UPB_INLINE google_protobuf_UninterpretedOption* google_protobuf_UninterpretedOption_new(upb_Arena* arena) {
-  return (google_protobuf_UninterpretedOption*)_upb_Message_New(&google_protobuf_UninterpretedOption_msginit, arena);
-}
-UPB_INLINE google_protobuf_UninterpretedOption* google_protobuf_UninterpretedOption_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_UninterpretedOption* ret = google_protobuf_UninterpretedOption_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_UninterpretedOption_msginit, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_UninterpretedOption* google_protobuf_UninterpretedOption_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_UninterpretedOption* ret = google_protobuf_UninterpretedOption_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_UninterpretedOption_msginit, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_UninterpretedOption_serialize(const google_protobuf_UninterpretedOption* msg, upb_Arena* arena, size_t* len) {
-  return upb_Encode(msg, &google_protobuf_UninterpretedOption_msginit, 0, arena, len);
-}
-UPB_INLINE char* google_protobuf_UninterpretedOption_serialize_ex(const google_protobuf_UninterpretedOption* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  return upb_Encode(msg, &google_protobuf_UninterpretedOption_msginit, options, arena, len);
-}
-UPB_INLINE bool google_protobuf_UninterpretedOption_has_name(const google_protobuf_UninterpretedOption* msg) {
-  return _upb_has_submsg_nohasbit(msg, UPB_SIZE(4, 8));
-}
-UPB_INLINE void google_protobuf_UninterpretedOption_clear_name(const google_protobuf_UninterpretedOption* msg) {
-  _upb_array_detach(msg, UPB_SIZE(4, 8));
-}
-UPB_INLINE const google_protobuf_UninterpretedOption_NamePart* const* google_protobuf_UninterpretedOption_name(const google_protobuf_UninterpretedOption* msg, size_t* len) {
-  return (const google_protobuf_UninterpretedOption_NamePart* const*)_upb_array_accessor(msg, UPB_SIZE(4, 8), len);
-}
-UPB_INLINE bool google_protobuf_UninterpretedOption_has_identifier_value(const google_protobuf_UninterpretedOption* msg) {
-  return _upb_hasbit(msg, 1);
-}
-UPB_INLINE void google_protobuf_UninterpretedOption_clear_identifier_value(const google_protobuf_UninterpretedOption* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(8, 16), upb_StringView) = upb_StringView_FromDataAndSize(NULL, 0);
-  _upb_clearhas(msg, 1);
-}
-UPB_INLINE upb_StringView google_protobuf_UninterpretedOption_identifier_value(const google_protobuf_UninterpretedOption* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(8, 16), upb_StringView);
-}
-UPB_INLINE bool google_protobuf_UninterpretedOption_has_positive_int_value(const google_protobuf_UninterpretedOption* msg) {
-  return _upb_hasbit(msg, 2);
-}
-UPB_INLINE void google_protobuf_UninterpretedOption_clear_positive_int_value(const google_protobuf_UninterpretedOption* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(32, 64), uint64_t) = 0;
-  _upb_clearhas(msg, 2);
-}
-UPB_INLINE uint64_t google_protobuf_UninterpretedOption_positive_int_value(const google_protobuf_UninterpretedOption* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(32, 64), uint64_t);
-}
-UPB_INLINE bool google_protobuf_UninterpretedOption_has_negative_int_value(const google_protobuf_UninterpretedOption* msg) {
-  return _upb_hasbit(msg, 3);
-}
-UPB_INLINE void google_protobuf_UninterpretedOption_clear_negative_int_value(const google_protobuf_UninterpretedOption* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(40, 72), int64_t) = 0;
-  _upb_clearhas(msg, 3);
-}
-UPB_INLINE int64_t google_protobuf_UninterpretedOption_negative_int_value(const google_protobuf_UninterpretedOption* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(40, 72), int64_t);
-}
-UPB_INLINE bool google_protobuf_UninterpretedOption_has_double_value(const google_protobuf_UninterpretedOption* msg) {
-  return _upb_hasbit(msg, 4);
-}
-UPB_INLINE void google_protobuf_UninterpretedOption_clear_double_value(const google_protobuf_UninterpretedOption* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(48, 80), double) = 0;
-  _upb_clearhas(msg, 4);
-}
-UPB_INLINE double google_protobuf_UninterpretedOption_double_value(const google_protobuf_UninterpretedOption* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(48, 80), double);
-}
-UPB_INLINE bool google_protobuf_UninterpretedOption_has_string_value(const google_protobuf_UninterpretedOption* msg) {
-  return _upb_hasbit(msg, 5);
-}
-UPB_INLINE void google_protobuf_UninterpretedOption_clear_string_value(const google_protobuf_UninterpretedOption* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(16, 32), upb_StringView) = upb_StringView_FromDataAndSize(NULL, 0);
-  _upb_clearhas(msg, 5);
-}
-UPB_INLINE upb_StringView google_protobuf_UninterpretedOption_string_value(const google_protobuf_UninterpretedOption* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(16, 32), upb_StringView);
-}
-UPB_INLINE bool google_protobuf_UninterpretedOption_has_aggregate_value(const google_protobuf_UninterpretedOption* msg) {
-  return _upb_hasbit(msg, 6);
-}
-UPB_INLINE void google_protobuf_UninterpretedOption_clear_aggregate_value(const google_protobuf_UninterpretedOption* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(24, 48), upb_StringView) = upb_StringView_FromDataAndSize(NULL, 0);
-  _upb_clearhas(msg, 6);
-}
-UPB_INLINE upb_StringView google_protobuf_UninterpretedOption_aggregate_value(const google_protobuf_UninterpretedOption* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(24, 48), upb_StringView);
-}
-
-UPB_INLINE google_protobuf_UninterpretedOption_NamePart** google_protobuf_UninterpretedOption_mutable_name(google_protobuf_UninterpretedOption* msg, size_t* len) {
-  return (google_protobuf_UninterpretedOption_NamePart**)_upb_array_mutable_accessor(msg, UPB_SIZE(4, 8), len);
-}
-UPB_INLINE google_protobuf_UninterpretedOption_NamePart** google_protobuf_UninterpretedOption_resize_name(google_protobuf_UninterpretedOption* msg, size_t len, upb_Arena* arena) {
-  return (google_protobuf_UninterpretedOption_NamePart**)_upb_Array_Resize_accessor2(msg, UPB_SIZE(4, 8), len, UPB_SIZE(2, 3), arena);
-}
-UPB_INLINE struct google_protobuf_UninterpretedOption_NamePart* google_protobuf_UninterpretedOption_add_name(google_protobuf_UninterpretedOption* msg, upb_Arena* arena) {
-  struct google_protobuf_UninterpretedOption_NamePart* sub = (struct google_protobuf_UninterpretedOption_NamePart*)_upb_Message_New(&google_protobuf_UninterpretedOption_NamePart_msginit, arena);
-  bool ok = _upb_Array_Append_accessor2(msg, UPB_SIZE(4, 8), UPB_SIZE(2, 3), &sub, arena);
-  if (!ok) return NULL;
-  return sub;
-}
-UPB_INLINE void google_protobuf_UninterpretedOption_set_identifier_value(google_protobuf_UninterpretedOption *msg, upb_StringView value) {
-  _upb_sethas(msg, 1);
-  *UPB_PTR_AT(msg, UPB_SIZE(8, 16), upb_StringView) = value;
-}
-UPB_INLINE void google_protobuf_UninterpretedOption_set_positive_int_value(google_protobuf_UninterpretedOption *msg, uint64_t value) {
-  _upb_sethas(msg, 2);
-  *UPB_PTR_AT(msg, UPB_SIZE(32, 64), uint64_t) = value;
-}
-UPB_INLINE void google_protobuf_UninterpretedOption_set_negative_int_value(google_protobuf_UninterpretedOption *msg, int64_t value) {
-  _upb_sethas(msg, 3);
-  *UPB_PTR_AT(msg, UPB_SIZE(40, 72), int64_t) = value;
-}
-UPB_INLINE void google_protobuf_UninterpretedOption_set_double_value(google_protobuf_UninterpretedOption *msg, double value) {
-  _upb_sethas(msg, 4);
-  *UPB_PTR_AT(msg, UPB_SIZE(48, 80), double) = value;
-}
-UPB_INLINE void google_protobuf_UninterpretedOption_set_string_value(google_protobuf_UninterpretedOption *msg, upb_StringView value) {
-  _upb_sethas(msg, 5);
-  *UPB_PTR_AT(msg, UPB_SIZE(16, 32), upb_StringView) = value;
-}
-UPB_INLINE void google_protobuf_UninterpretedOption_set_aggregate_value(google_protobuf_UninterpretedOption *msg, upb_StringView value) {
-  _upb_sethas(msg, 6);
-  *UPB_PTR_AT(msg, UPB_SIZE(24, 48), upb_StringView) = value;
-}
-
-/* google.protobuf.UninterpretedOption.NamePart */
-
-UPB_INLINE google_protobuf_UninterpretedOption_NamePart* google_protobuf_UninterpretedOption_NamePart_new(upb_Arena* arena) {
-  return (google_protobuf_UninterpretedOption_NamePart*)_upb_Message_New(&google_protobuf_UninterpretedOption_NamePart_msginit, arena);
-}
-UPB_INLINE google_protobuf_UninterpretedOption_NamePart* google_protobuf_UninterpretedOption_NamePart_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_UninterpretedOption_NamePart* ret = google_protobuf_UninterpretedOption_NamePart_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_UninterpretedOption_NamePart_msginit, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_UninterpretedOption_NamePart* google_protobuf_UninterpretedOption_NamePart_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_UninterpretedOption_NamePart* ret = google_protobuf_UninterpretedOption_NamePart_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_UninterpretedOption_NamePart_msginit, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_UninterpretedOption_NamePart_serialize(const google_protobuf_UninterpretedOption_NamePart* msg, upb_Arena* arena, size_t* len) {
-  return upb_Encode(msg, &google_protobuf_UninterpretedOption_NamePart_msginit, 0, arena, len);
-}
-UPB_INLINE char* google_protobuf_UninterpretedOption_NamePart_serialize_ex(const google_protobuf_UninterpretedOption_NamePart* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  return upb_Encode(msg, &google_protobuf_UninterpretedOption_NamePart_msginit, options, arena, len);
-}
-UPB_INLINE bool google_protobuf_UninterpretedOption_NamePart_has_name_part(const google_protobuf_UninterpretedOption_NamePart* msg) {
-  return _upb_hasbit(msg, 1);
-}
-UPB_INLINE void google_protobuf_UninterpretedOption_NamePart_clear_name_part(const google_protobuf_UninterpretedOption_NamePart* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_StringView) = upb_StringView_FromDataAndSize(NULL, 0);
-  _upb_clearhas(msg, 1);
-}
-UPB_INLINE upb_StringView google_protobuf_UninterpretedOption_NamePart_name_part(const google_protobuf_UninterpretedOption_NamePart* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_StringView);
-}
-UPB_INLINE bool google_protobuf_UninterpretedOption_NamePart_has_is_extension(const google_protobuf_UninterpretedOption_NamePart* msg) {
-  return _upb_hasbit(msg, 2);
-}
-UPB_INLINE void google_protobuf_UninterpretedOption_NamePart_clear_is_extension(const google_protobuf_UninterpretedOption_NamePart* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(1, 1), bool) = 0;
-  _upb_clearhas(msg, 2);
-}
-UPB_INLINE bool google_protobuf_UninterpretedOption_NamePart_is_extension(const google_protobuf_UninterpretedOption_NamePart* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(1, 1), bool);
-}
-
-UPB_INLINE void google_protobuf_UninterpretedOption_NamePart_set_name_part(google_protobuf_UninterpretedOption_NamePart *msg, upb_StringView value) {
-  _upb_sethas(msg, 1);
-  *UPB_PTR_AT(msg, UPB_SIZE(4, 8), upb_StringView) = value;
-}
-UPB_INLINE void google_protobuf_UninterpretedOption_NamePart_set_is_extension(google_protobuf_UninterpretedOption_NamePart *msg, bool value) {
-  _upb_sethas(msg, 2);
-  *UPB_PTR_AT(msg, UPB_SIZE(1, 1), bool) = value;
-}
-
-/* google.protobuf.SourceCodeInfo */
-
-UPB_INLINE google_protobuf_SourceCodeInfo* google_protobuf_SourceCodeInfo_new(upb_Arena* arena) {
-  return (google_protobuf_SourceCodeInfo*)_upb_Message_New(&google_protobuf_SourceCodeInfo_msginit, arena);
-}
-UPB_INLINE google_protobuf_SourceCodeInfo* google_protobuf_SourceCodeInfo_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_SourceCodeInfo* ret = google_protobuf_SourceCodeInfo_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_SourceCodeInfo_msginit, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_SourceCodeInfo* google_protobuf_SourceCodeInfo_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_SourceCodeInfo* ret = google_protobuf_SourceCodeInfo_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_SourceCodeInfo_msginit, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_SourceCodeInfo_serialize(const google_protobuf_SourceCodeInfo* msg, upb_Arena* arena, size_t* len) {
-  return upb_Encode(msg, &google_protobuf_SourceCodeInfo_msginit, 0, arena, len);
-}
-UPB_INLINE char* google_protobuf_SourceCodeInfo_serialize_ex(const google_protobuf_SourceCodeInfo* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  return upb_Encode(msg, &google_protobuf_SourceCodeInfo_msginit, options, arena, len);
-}
-UPB_INLINE bool google_protobuf_SourceCodeInfo_has_location(const google_protobuf_SourceCodeInfo* msg) {
-  return _upb_has_submsg_nohasbit(msg, UPB_SIZE(0, 0));
-}
-UPB_INLINE void google_protobuf_SourceCodeInfo_clear_location(const google_protobuf_SourceCodeInfo* msg) {
-  _upb_array_detach(msg, UPB_SIZE(0, 0));
-}
-UPB_INLINE const google_protobuf_SourceCodeInfo_Location* const* google_protobuf_SourceCodeInfo_location(const google_protobuf_SourceCodeInfo* msg, size_t* len) {
-  return (const google_protobuf_SourceCodeInfo_Location* const*)_upb_array_accessor(msg, UPB_SIZE(0, 0), len);
-}
-
-UPB_INLINE google_protobuf_SourceCodeInfo_Location** google_protobuf_SourceCodeInfo_mutable_location(google_protobuf_SourceCodeInfo* msg, size_t* len) {
-  return (google_protobuf_SourceCodeInfo_Location**)_upb_array_mutable_accessor(msg, UPB_SIZE(0, 0), len);
-}
-UPB_INLINE google_protobuf_SourceCodeInfo_Location** google_protobuf_SourceCodeInfo_resize_location(google_protobuf_SourceCodeInfo* msg, size_t len, upb_Arena* arena) {
-  return (google_protobuf_SourceCodeInfo_Location**)_upb_Array_Resize_accessor2(msg, UPB_SIZE(0, 0), len, UPB_SIZE(2, 3), arena);
-}
-UPB_INLINE struct google_protobuf_SourceCodeInfo_Location* google_protobuf_SourceCodeInfo_add_location(google_protobuf_SourceCodeInfo* msg, upb_Arena* arena) {
-  struct google_protobuf_SourceCodeInfo_Location* sub = (struct google_protobuf_SourceCodeInfo_Location*)_upb_Message_New(&google_protobuf_SourceCodeInfo_Location_msginit, arena);
-  bool ok = _upb_Array_Append_accessor2(msg, UPB_SIZE(0, 0), UPB_SIZE(2, 3), &sub, arena);
-  if (!ok) return NULL;
-  return sub;
-}
-
-/* google.protobuf.SourceCodeInfo.Location */
-
-UPB_INLINE google_protobuf_SourceCodeInfo_Location* google_protobuf_SourceCodeInfo_Location_new(upb_Arena* arena) {
-  return (google_protobuf_SourceCodeInfo_Location*)_upb_Message_New(&google_protobuf_SourceCodeInfo_Location_msginit, arena);
-}
-UPB_INLINE google_protobuf_SourceCodeInfo_Location* google_protobuf_SourceCodeInfo_Location_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_SourceCodeInfo_Location* ret = google_protobuf_SourceCodeInfo_Location_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_SourceCodeInfo_Location_msginit, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_SourceCodeInfo_Location* google_protobuf_SourceCodeInfo_Location_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_SourceCodeInfo_Location* ret = google_protobuf_SourceCodeInfo_Location_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_SourceCodeInfo_Location_msginit, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_SourceCodeInfo_Location_serialize(const google_protobuf_SourceCodeInfo_Location* msg, upb_Arena* arena, size_t* len) {
-  return upb_Encode(msg, &google_protobuf_SourceCodeInfo_Location_msginit, 0, arena, len);
-}
-UPB_INLINE char* google_protobuf_SourceCodeInfo_Location_serialize_ex(const google_protobuf_SourceCodeInfo_Location* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  return upb_Encode(msg, &google_protobuf_SourceCodeInfo_Location_msginit, options, arena, len);
-}
-UPB_INLINE void google_protobuf_SourceCodeInfo_Location_clear_path(const google_protobuf_SourceCodeInfo_Location* msg) {
-  _upb_array_detach(msg, UPB_SIZE(4, 8));
-}
-UPB_INLINE int32_t const* google_protobuf_SourceCodeInfo_Location_path(const google_protobuf_SourceCodeInfo_Location* msg, size_t* len) {
-  return (int32_t const*)_upb_array_accessor(msg, UPB_SIZE(4, 8), len);
-}
-UPB_INLINE void google_protobuf_SourceCodeInfo_Location_clear_span(const google_protobuf_SourceCodeInfo_Location* msg) {
-  _upb_array_detach(msg, UPB_SIZE(8, 16));
-}
-UPB_INLINE int32_t const* google_protobuf_SourceCodeInfo_Location_span(const google_protobuf_SourceCodeInfo_Location* msg, size_t* len) {
-  return (int32_t const*)_upb_array_accessor(msg, UPB_SIZE(8, 16), len);
-}
-UPB_INLINE bool google_protobuf_SourceCodeInfo_Location_has_leading_comments(const google_protobuf_SourceCodeInfo_Location* msg) {
-  return _upb_hasbit(msg, 1);
-}
-UPB_INLINE void google_protobuf_SourceCodeInfo_Location_clear_leading_comments(const google_protobuf_SourceCodeInfo_Location* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(12, 24), upb_StringView) = upb_StringView_FromDataAndSize(NULL, 0);
-  _upb_clearhas(msg, 1);
-}
-UPB_INLINE upb_StringView google_protobuf_SourceCodeInfo_Location_leading_comments(const google_protobuf_SourceCodeInfo_Location* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(12, 24), upb_StringView);
-}
-UPB_INLINE bool google_protobuf_SourceCodeInfo_Location_has_trailing_comments(const google_protobuf_SourceCodeInfo_Location* msg) {
-  return _upb_hasbit(msg, 2);
-}
-UPB_INLINE void google_protobuf_SourceCodeInfo_Location_clear_trailing_comments(const google_protobuf_SourceCodeInfo_Location* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(20, 40), upb_StringView) = upb_StringView_FromDataAndSize(NULL, 0);
-  _upb_clearhas(msg, 2);
-}
-UPB_INLINE upb_StringView google_protobuf_SourceCodeInfo_Location_trailing_comments(const google_protobuf_SourceCodeInfo_Location* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(20, 40), upb_StringView);
-}
-UPB_INLINE void google_protobuf_SourceCodeInfo_Location_clear_leading_detached_comments(const google_protobuf_SourceCodeInfo_Location* msg) {
-  _upb_array_detach(msg, UPB_SIZE(28, 56));
-}
-UPB_INLINE upb_StringView const* google_protobuf_SourceCodeInfo_Location_leading_detached_comments(const google_protobuf_SourceCodeInfo_Location* msg, size_t* len) {
-  return (upb_StringView const*)_upb_array_accessor(msg, UPB_SIZE(28, 56), len);
-}
-
-UPB_INLINE int32_t* google_protobuf_SourceCodeInfo_Location_mutable_path(google_protobuf_SourceCodeInfo_Location* msg, size_t* len) {
-  return (int32_t*)_upb_array_mutable_accessor(msg, UPB_SIZE(4, 8), len);
-}
-UPB_INLINE int32_t* google_protobuf_SourceCodeInfo_Location_resize_path(google_protobuf_SourceCodeInfo_Location* msg, size_t len, upb_Arena* arena) {
-  return (int32_t*)_upb_Array_Resize_accessor2(msg, UPB_SIZE(4, 8), len, 2, arena);
-}
-UPB_INLINE bool google_protobuf_SourceCodeInfo_Location_add_path(google_protobuf_SourceCodeInfo_Location* msg, int32_t val, upb_Arena* arena) {
-  return _upb_Array_Append_accessor2(msg, UPB_SIZE(4, 8), 2, &val, arena);
-}
-UPB_INLINE int32_t* google_protobuf_SourceCodeInfo_Location_mutable_span(google_protobuf_SourceCodeInfo_Location* msg, size_t* len) {
-  return (int32_t*)_upb_array_mutable_accessor(msg, UPB_SIZE(8, 16), len);
-}
-UPB_INLINE int32_t* google_protobuf_SourceCodeInfo_Location_resize_span(google_protobuf_SourceCodeInfo_Location* msg, size_t len, upb_Arena* arena) {
-  return (int32_t*)_upb_Array_Resize_accessor2(msg, UPB_SIZE(8, 16), len, 2, arena);
-}
-UPB_INLINE bool google_protobuf_SourceCodeInfo_Location_add_span(google_protobuf_SourceCodeInfo_Location* msg, int32_t val, upb_Arena* arena) {
-  return _upb_Array_Append_accessor2(msg, UPB_SIZE(8, 16), 2, &val, arena);
-}
-UPB_INLINE void google_protobuf_SourceCodeInfo_Location_set_leading_comments(google_protobuf_SourceCodeInfo_Location *msg, upb_StringView value) {
-  _upb_sethas(msg, 1);
-  *UPB_PTR_AT(msg, UPB_SIZE(12, 24), upb_StringView) = value;
-}
-UPB_INLINE void google_protobuf_SourceCodeInfo_Location_set_trailing_comments(google_protobuf_SourceCodeInfo_Location *msg, upb_StringView value) {
-  _upb_sethas(msg, 2);
-  *UPB_PTR_AT(msg, UPB_SIZE(20, 40), upb_StringView) = value;
-}
-UPB_INLINE upb_StringView* google_protobuf_SourceCodeInfo_Location_mutable_leading_detached_comments(google_protobuf_SourceCodeInfo_Location* msg, size_t* len) {
-  return (upb_StringView*)_upb_array_mutable_accessor(msg, UPB_SIZE(28, 56), len);
-}
-UPB_INLINE upb_StringView* google_protobuf_SourceCodeInfo_Location_resize_leading_detached_comments(google_protobuf_SourceCodeInfo_Location* msg, size_t len, upb_Arena* arena) {
-  return (upb_StringView*)_upb_Array_Resize_accessor2(msg, UPB_SIZE(28, 56), len, UPB_SIZE(3, 4), arena);
-}
-UPB_INLINE bool google_protobuf_SourceCodeInfo_Location_add_leading_detached_comments(google_protobuf_SourceCodeInfo_Location* msg, upb_StringView val, upb_Arena* arena) {
-  return _upb_Array_Append_accessor2(msg, UPB_SIZE(28, 56), UPB_SIZE(3, 4), &val, arena);
-}
-
-/* google.protobuf.GeneratedCodeInfo */
-
-UPB_INLINE google_protobuf_GeneratedCodeInfo* google_protobuf_GeneratedCodeInfo_new(upb_Arena* arena) {
-  return (google_protobuf_GeneratedCodeInfo*)_upb_Message_New(&google_protobuf_GeneratedCodeInfo_msginit, arena);
-}
-UPB_INLINE google_protobuf_GeneratedCodeInfo* google_protobuf_GeneratedCodeInfo_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_GeneratedCodeInfo* ret = google_protobuf_GeneratedCodeInfo_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_GeneratedCodeInfo_msginit, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_GeneratedCodeInfo* google_protobuf_GeneratedCodeInfo_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_GeneratedCodeInfo* ret = google_protobuf_GeneratedCodeInfo_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_GeneratedCodeInfo_msginit, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_GeneratedCodeInfo_serialize(const google_protobuf_GeneratedCodeInfo* msg, upb_Arena* arena, size_t* len) {
-  return upb_Encode(msg, &google_protobuf_GeneratedCodeInfo_msginit, 0, arena, len);
-}
-UPB_INLINE char* google_protobuf_GeneratedCodeInfo_serialize_ex(const google_protobuf_GeneratedCodeInfo* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  return upb_Encode(msg, &google_protobuf_GeneratedCodeInfo_msginit, options, arena, len);
-}
-UPB_INLINE bool google_protobuf_GeneratedCodeInfo_has_annotation(const google_protobuf_GeneratedCodeInfo* msg) {
-  return _upb_has_submsg_nohasbit(msg, UPB_SIZE(0, 0));
-}
-UPB_INLINE void google_protobuf_GeneratedCodeInfo_clear_annotation(const google_protobuf_GeneratedCodeInfo* msg) {
-  _upb_array_detach(msg, UPB_SIZE(0, 0));
-}
-UPB_INLINE const google_protobuf_GeneratedCodeInfo_Annotation* const* google_protobuf_GeneratedCodeInfo_annotation(const google_protobuf_GeneratedCodeInfo* msg, size_t* len) {
-  return (const google_protobuf_GeneratedCodeInfo_Annotation* const*)_upb_array_accessor(msg, UPB_SIZE(0, 0), len);
-}
-
-UPB_INLINE google_protobuf_GeneratedCodeInfo_Annotation** google_protobuf_GeneratedCodeInfo_mutable_annotation(google_protobuf_GeneratedCodeInfo* msg, size_t* len) {
-  return (google_protobuf_GeneratedCodeInfo_Annotation**)_upb_array_mutable_accessor(msg, UPB_SIZE(0, 0), len);
-}
-UPB_INLINE google_protobuf_GeneratedCodeInfo_Annotation** google_protobuf_GeneratedCodeInfo_resize_annotation(google_protobuf_GeneratedCodeInfo* msg, size_t len, upb_Arena* arena) {
-  return (google_protobuf_GeneratedCodeInfo_Annotation**)_upb_Array_Resize_accessor2(msg, UPB_SIZE(0, 0), len, UPB_SIZE(2, 3), arena);
-}
-UPB_INLINE struct google_protobuf_GeneratedCodeInfo_Annotation* google_protobuf_GeneratedCodeInfo_add_annotation(google_protobuf_GeneratedCodeInfo* msg, upb_Arena* arena) {
-  struct google_protobuf_GeneratedCodeInfo_Annotation* sub = (struct google_protobuf_GeneratedCodeInfo_Annotation*)_upb_Message_New(&google_protobuf_GeneratedCodeInfo_Annotation_msginit, arena);
-  bool ok = _upb_Array_Append_accessor2(msg, UPB_SIZE(0, 0), UPB_SIZE(2, 3), &sub, arena);
-  if (!ok) return NULL;
-  return sub;
-}
-
-/* google.protobuf.GeneratedCodeInfo.Annotation */
-
-UPB_INLINE google_protobuf_GeneratedCodeInfo_Annotation* google_protobuf_GeneratedCodeInfo_Annotation_new(upb_Arena* arena) {
-  return (google_protobuf_GeneratedCodeInfo_Annotation*)_upb_Message_New(&google_protobuf_GeneratedCodeInfo_Annotation_msginit, arena);
-}
-UPB_INLINE google_protobuf_GeneratedCodeInfo_Annotation* google_protobuf_GeneratedCodeInfo_Annotation_parse(const char* buf, size_t size, upb_Arena* arena) {
-  google_protobuf_GeneratedCodeInfo_Annotation* ret = google_protobuf_GeneratedCodeInfo_Annotation_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_GeneratedCodeInfo_Annotation_msginit, NULL, 0, arena) != kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE google_protobuf_GeneratedCodeInfo_Annotation* google_protobuf_GeneratedCodeInfo_Annotation_parse_ex(const char* buf, size_t size,
-                           const upb_ExtensionRegistry* extreg,
-                           int options, upb_Arena* arena) {
-  google_protobuf_GeneratedCodeInfo_Annotation* ret = google_protobuf_GeneratedCodeInfo_Annotation_new(arena);
-  if (!ret) return NULL;
-  if (upb_Decode(buf, size, ret, &google_protobuf_GeneratedCodeInfo_Annotation_msginit, extreg, options, arena) !=
-      kUpb_DecodeStatus_Ok) {
-    return NULL;
-  }
-  return ret;
-}
-UPB_INLINE char* google_protobuf_GeneratedCodeInfo_Annotation_serialize(const google_protobuf_GeneratedCodeInfo_Annotation* msg, upb_Arena* arena, size_t* len) {
-  return upb_Encode(msg, &google_protobuf_GeneratedCodeInfo_Annotation_msginit, 0, arena, len);
-}
-UPB_INLINE char* google_protobuf_GeneratedCodeInfo_Annotation_serialize_ex(const google_protobuf_GeneratedCodeInfo_Annotation* msg, int options,
-                                 upb_Arena* arena, size_t* len) {
-  return upb_Encode(msg, &google_protobuf_GeneratedCodeInfo_Annotation_msginit, options, arena, len);
-}
-UPB_INLINE void google_protobuf_GeneratedCodeInfo_Annotation_clear_path(const google_protobuf_GeneratedCodeInfo_Annotation* msg) {
-  _upb_array_detach(msg, UPB_SIZE(12, 16));
-}
-UPB_INLINE int32_t const* google_protobuf_GeneratedCodeInfo_Annotation_path(const google_protobuf_GeneratedCodeInfo_Annotation* msg, size_t* len) {
-  return (int32_t const*)_upb_array_accessor(msg, UPB_SIZE(12, 16), len);
-}
-UPB_INLINE bool google_protobuf_GeneratedCodeInfo_Annotation_has_source_file(const google_protobuf_GeneratedCodeInfo_Annotation* msg) {
-  return _upb_hasbit(msg, 1);
-}
-UPB_INLINE void google_protobuf_GeneratedCodeInfo_Annotation_clear_source_file(const google_protobuf_GeneratedCodeInfo_Annotation* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(16, 24), upb_StringView) = upb_StringView_FromDataAndSize(NULL, 0);
-  _upb_clearhas(msg, 1);
-}
-UPB_INLINE upb_StringView google_protobuf_GeneratedCodeInfo_Annotation_source_file(const google_protobuf_GeneratedCodeInfo_Annotation* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(16, 24), upb_StringView);
-}
-UPB_INLINE bool google_protobuf_GeneratedCodeInfo_Annotation_has_begin(const google_protobuf_GeneratedCodeInfo_Annotation* msg) {
-  return _upb_hasbit(msg, 2);
-}
-UPB_INLINE void google_protobuf_GeneratedCodeInfo_Annotation_clear_begin(const google_protobuf_GeneratedCodeInfo_Annotation* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(4, 4), int32_t) = 0;
-  _upb_clearhas(msg, 2);
-}
-UPB_INLINE int32_t google_protobuf_GeneratedCodeInfo_Annotation_begin(const google_protobuf_GeneratedCodeInfo_Annotation* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(4, 4), int32_t);
-}
-UPB_INLINE bool google_protobuf_GeneratedCodeInfo_Annotation_has_end(const google_protobuf_GeneratedCodeInfo_Annotation* msg) {
-  return _upb_hasbit(msg, 3);
-}
-UPB_INLINE void google_protobuf_GeneratedCodeInfo_Annotation_clear_end(const google_protobuf_GeneratedCodeInfo_Annotation* msg) {
-  *UPB_PTR_AT(msg, UPB_SIZE(8, 8), int32_t) = 0;
-  _upb_clearhas(msg, 3);
-}
-UPB_INLINE int32_t google_protobuf_GeneratedCodeInfo_Annotation_end(const google_protobuf_GeneratedCodeInfo_Annotation* msg) {
-  return *UPB_PTR_AT(msg, UPB_SIZE(8, 8), int32_t);
-}
-
-UPB_INLINE int32_t* google_protobuf_GeneratedCodeInfo_Annotation_mutable_path(google_protobuf_GeneratedCodeInfo_Annotation* msg, size_t* len) {
-  return (int32_t*)_upb_array_mutable_accessor(msg, UPB_SIZE(12, 16), len);
-}
-UPB_INLINE int32_t* google_protobuf_GeneratedCodeInfo_Annotation_resize_path(google_protobuf_GeneratedCodeInfo_Annotation* msg, size_t len, upb_Arena* arena) {
-  return (int32_t*)_upb_Array_Resize_accessor2(msg, UPB_SIZE(12, 16), len, 2, arena);
-}
-UPB_INLINE bool google_protobuf_GeneratedCodeInfo_Annotation_add_path(google_protobuf_GeneratedCodeInfo_Annotation* msg, int32_t val, upb_Arena* arena) {
-  return _upb_Array_Append_accessor2(msg, UPB_SIZE(12, 16), 2, &val, arena);
-}
-UPB_INLINE void google_protobuf_GeneratedCodeInfo_Annotation_set_source_file(google_protobuf_GeneratedCodeInfo_Annotation *msg, upb_StringView value) {
-  _upb_sethas(msg, 1);
-  *UPB_PTR_AT(msg, UPB_SIZE(16, 24), upb_StringView) = value;
-}
-UPB_INLINE void google_protobuf_GeneratedCodeInfo_Annotation_set_begin(google_protobuf_GeneratedCodeInfo_Annotation *msg, int32_t value) {
-  _upb_sethas(msg, 2);
-  *UPB_PTR_AT(msg, UPB_SIZE(4, 4), int32_t) = value;
-}
-UPB_INLINE void google_protobuf_GeneratedCodeInfo_Annotation_set_end(google_protobuf_GeneratedCodeInfo_Annotation *msg, int32_t value) {
-  _upb_sethas(msg, 3);
-  *UPB_PTR_AT(msg, UPB_SIZE(8, 8), int32_t) = value;
-}
-
-extern const upb_MiniTable_File google_protobuf_descriptor_proto_upb_file_layout;
-
-/* Max size 32 is google.protobuf.FileOptions */
-/* Max size 64 is google.protobuf.FileOptions */
-#define _UPB_MAXOPT_SIZE UPB_SIZE(104, 192)
-
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
-
-#endif  /* GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H_ */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef union {
-  bool bool_val;
-  float float_val;
-  double double_val;
-  int32_t int32_val;
-  int64_t int64_val;
-  uint32_t uint32_val;
-  uint64_t uint64_val;
-  const upb_Map* map_val;
-  const upb_Message* msg_val;
-  const upb_Array* array_val;
-  upb_StringView str_val;
-} upb_MessageValue;
-
-typedef union {
-  upb_Map* map;
-  upb_Message* msg;
-  upb_Array* array;
-} upb_MutableMessageValue;
-
-/** upb_Array *****************************************************************/
-
-/* Creates a new array on the given arena that holds elements of this type. */
-upb_Array* upb_Array_New(upb_Arena* a, upb_CType type);
-
-/* Returns the size of the array. */
-size_t upb_Array_Size(const upb_Array* arr);
-
-/* Returns the given element, which must be within the array's current size. */
-upb_MessageValue upb_Array_Get(const upb_Array* arr, size_t i);
-
-/* Sets the given element, which must be within the array's current size. */
-void upb_Array_Set(upb_Array* arr, size_t i, upb_MessageValue val);
-
-/* Appends an element to the array.  Returns false on allocation failure. */
-bool upb_Array_Append(upb_Array* array, upb_MessageValue val, upb_Arena* arena);
-
-/* Moves elements within the array using memmove(). Like memmove(), the source
- * and destination elements may be overlapping. */
-void upb_Array_Move(upb_Array* array, size_t dst_idx, size_t src_idx,
-                    size_t count);
-
-/* Inserts one or more empty elements into the array.  Existing elements are
- * shifted right.  The new elements have undefined state and must be set with
- * `upb_Array_Set()`.
- * REQUIRES: `i <= upb_Array_Size(arr)` */
-bool upb_Array_Insert(upb_Array* array, size_t i, size_t count,
-                      upb_Arena* arena);
-
-/* Deletes one or more elements from the array.  Existing elements are shifted
- * left.
- * REQUIRES: `i + count <= upb_Array_Size(arr)` */
-void upb_Array_Delete(upb_Array* array, size_t i, size_t count);
-
-/* Changes the size of a vector.  New elements are initialized to empty/0.
- * Returns false on allocation failure. */
-bool upb_Array_Resize(upb_Array* array, size_t size, upb_Arena* arena);
-
-/** upb_Map *******************************************************************/
-
-/* Creates a new map on the given arena with the given key/value size. */
-upb_Map* upb_Map_New(upb_Arena* a, upb_CType key_type, upb_CType value_type);
-
-/* Returns the number of entries in the map. */
-size_t upb_Map_Size(const upb_Map* map);
-
-/* Stores a value for the given key into |*val| (or the zero value if the key is
- * not present).  Returns whether the key was present.  The |val| pointer may be
- * NULL, in which case the function tests whether the given key is present.  */
-bool upb_Map_Get(const upb_Map* map, upb_MessageValue key,
-                 upb_MessageValue* val);
-
-/* Removes all entries in the map. */
-void upb_Map_Clear(upb_Map* map);
-
-typedef enum {
-  // LINT.IfChange
-  kUpb_MapInsertStatus_Inserted = 0,
-  kUpb_MapInsertStatus_Replaced = 1,
-  kUpb_MapInsertStatus_OutOfMemory = 2,
-  // LINT.ThenChange(//depot/google3/third_party/upb/upb/msg_internal.h)
-} upb_MapInsertStatus;
-
-/* Sets the given key to the given value, returning whether the key was inserted
- * or replaced.  If the key was inserted, then any existing iterators will be
- * invalidated. */
-upb_MapInsertStatus upb_Map_Insert(upb_Map* map, upb_MessageValue key,
-                                   upb_MessageValue val, upb_Arena* arena);
-
-/* Sets the given key to the given value.  Returns false if memory allocation
- * failed. If the key is newly inserted, then any existing iterators will be
- * invalidated. */
-UPB_INLINE bool upb_Map_Set(upb_Map* map, upb_MessageValue key,
-                            upb_MessageValue val, upb_Arena* arena) {
-  return upb_Map_Insert(map, key, val, arena) !=
-         kUpb_MapInsertStatus_OutOfMemory;
-}
-
-/* Deletes this key from the table.  Returns true if the key was present. */
-bool upb_Map_Delete(upb_Map* map, upb_MessageValue key);
-
-/* Map iteration:
- *
- * size_t iter = kUpb_Map_Begin;
- * while (upb_MapIterator_Next(map, &iter)) {
- *   upb_MessageValue key = upb_MapIterator_Key(map, iter);
- *   upb_MessageValue val = upb_MapIterator_Value(map, iter);
- *
- *   // If mutating is desired.
- *   upb_MapIterator_SetValue(map, iter, value2);
- * }
- */
-
-/* Advances to the next entry.  Returns false if no more entries are present. */
-bool upb_MapIterator_Next(const upb_Map* map, size_t* iter);
-
-/* Returns true if the iterator still points to a valid entry, or false if the
- * iterator is past the last element. It is an error to call this function with
- * kUpb_Map_Begin (you must call next() at least once first). */
-bool upb_MapIterator_Done(const upb_Map* map, size_t iter);
-
-/* Returns the key and value for this entry of the map. */
-upb_MessageValue upb_MapIterator_Key(const upb_Map* map, size_t iter);
-upb_MessageValue upb_MapIterator_Value(const upb_Map* map, size_t iter);
-
-/* Sets the value for this entry.  The iterator must not be done, and the
- * iterator must not have been initialized const. */
-void upb_MapIterator_SetValue(upb_Map* map, size_t iter,
-                              upb_MessageValue value);
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-
-#endif /* UPB_COLLECTIONS_H_ */
-
-/** upb/decode_internal.h ************************************************************/
-/*
- * Internal implementation details of the decoder that are shared between
- * decode.c and decode_fast.c.
- */
-
-#ifndef UPB_DECODE_INT_H_
-#define UPB_DECODE_INT_H_
-
-#include <setjmp.h>
-
-#include "third_party/utf8_range/utf8_range.h"
-
-/** upb/upb_internal.h ************************************************************/
-#ifndef UPB_INT_H_
-#define UPB_INT_H_
-
-
-struct mem_block;
-typedef struct mem_block mem_block;
-
-struct upb_Arena {
-  _upb_ArenaHead head;
-  /* Stores cleanup metadata for this arena.
-   * - a pointer to the current cleanup counter.
-   * - a boolean indicating if there is an unowned initial block.  */
-  uintptr_t cleanup_metadata;
-
-  /* Allocator to allocate arena blocks.  We are responsible for freeing these
-   * when we are destroyed. */
-  upb_alloc* block_alloc;
-  uint32_t last_size;
-
-  /* When multiple arenas are fused together, each arena points to a parent
-   * arena (root points to itself). The root tracks how many live arenas
-   * reference it. */
-  uint32_t refcount; /* Only used when a->parent == a */
-  struct upb_Arena* parent;
-
-  /* Linked list of blocks to free/cleanup. */
-  mem_block *freelist, *freelist_tail;
-};
-
-// Encodes a float or double that is round-trippable, but as short as possible.
-// These routines are not fully optimal (not guaranteed to be shortest), but are
-// short-ish and match the implementation that has been used in protobuf since
-// the beginning.
-//
-// The given buffer size must be at least kUpb_RoundTripBufferSize.
-enum { kUpb_RoundTripBufferSize = 32 };
-void _upb_EncodeRoundTripDouble(double val, char* buf, size_t size);
-void _upb_EncodeRoundTripFloat(float val, char* buf, size_t size);
-
-#endif /* UPB_INT_H_ */
-
-/* Must be last. */
-
-#define DECODE_NOGROUP (uint32_t) - 1
-
-typedef struct upb_Decoder {
-  const char* end;          /* Can read up to 16 bytes slop beyond this. */
-  const char* limit_ptr;    /* = end + UPB_MIN(limit, 0) */
-  upb_Message* unknown_msg; /* Used for preserving unknown data. */
-  const char* unknown; /* Start of unknown data, preserve at buffer flip. */
-  const upb_ExtensionRegistry*
-      extreg;         /* For looking up extensions during the parse. */
-  int limit;          /* Submessage limit relative to end. */
-  int depth;          /* Tracks recursion depth to bound stack usage. */
-  uint32_t end_group; /* field number of END_GROUP tag, else DECODE_NOGROUP */
-  uint16_t options;
-  bool missing_required;
-  char patch[32];
-  upb_Arena arena;
-  jmp_buf err;
-
-#ifndef NDEBUG
-  const char* debug_tagstart;
-  const char* debug_valstart;
-#endif
-} upb_Decoder;
-
-/* Error function that will abort decoding with longjmp(). We can't declare this
- * UPB_NORETURN, even though it is appropriate, because if we do then compilers
- * will "helpfully" refuse to tailcall to it
- * (see: https://stackoverflow.com/a/55657013), which will defeat a major goal
- * of our optimizations. That is also why we must declare it in a separate file,
- * otherwise the compiler will see that it calls longjmp() and deduce that it is
- * noreturn. */
-const char* fastdecode_err(upb_Decoder* d, int status);
-
-extern const uint8_t upb_utf8_offsets[];
-
-UPB_INLINE
-bool decode_verifyutf8_inl(const char* ptr, int len) {
-  const char* end = ptr + len;
-
-  // Check 8 bytes at a time for any non-ASCII char.
-  while (end - ptr >= 8) {
-    uint64_t data;
-    memcpy(&data, ptr, 8);
-    if (data & 0x8080808080808080) goto non_ascii;
-    ptr += 8;
-  }
-
-  // Check one byte at a time for non-ASCII.
-  while (ptr < end) {
-    if (*ptr & 0x80) goto non_ascii;
-    ptr++;
-  }
-
-  return true;
-
-non_ascii:
-  return utf8_range2((const unsigned char*)ptr, end - ptr) == 0;
-}
-
-const char* decode_checkrequired(upb_Decoder* d, const char* ptr,
-                                 const upb_Message* msg,
-                                 const upb_MiniTable* l);
-
-/* x86-64 pointers always have the high 16 bits matching. So we can shift
- * left 8 and right 8 without loss of information. */
-UPB_INLINE intptr_t decode_totable(const upb_MiniTable* tablep) {
-  return ((intptr_t)tablep << 8) | tablep->table_mask;
-}
-
-UPB_INLINE const upb_MiniTable* decode_totablep(intptr_t table) {
-  return (const upb_MiniTable*)(table >> 8);
-}
-
-UPB_INLINE
-const char* decode_isdonefallback_inl(upb_Decoder* d, const char* ptr,
-                                      int overrun, int* status) {
-  if (overrun < d->limit) {
-    /* Need to copy remaining data into patch buffer. */
-    UPB_ASSERT(overrun < 16);
-    if (d->unknown) {
-      if (!_upb_Message_AddUnknown(d->unknown_msg, d->unknown, ptr - d->unknown,
-                                   &d->arena)) {
-        *status = kUpb_DecodeStatus_OutOfMemory;
-        return NULL;
-      }
-      d->unknown = &d->patch[0] + overrun;
-    }
-    memset(d->patch + 16, 0, 16);
-    memcpy(d->patch, d->end, 16);
-    ptr = &d->patch[0] + overrun;
-    d->end = &d->patch[16];
-    d->limit -= 16;
-    d->limit_ptr = d->end + d->limit;
-    d->options &= ~kUpb_DecodeOption_AliasString;
-    UPB_ASSERT(ptr < d->limit_ptr);
-    return ptr;
-  } else {
-    *status = kUpb_DecodeStatus_Malformed;
-    return NULL;
-  }
-}
-
-const char* decode_isdonefallback(upb_Decoder* d, const char* ptr, int overrun);
-
-UPB_INLINE
-bool decode_isdone(upb_Decoder* d, const char** ptr) {
-  int overrun = *ptr - d->end;
-  if (UPB_LIKELY(*ptr < d->limit_ptr)) {
-    return false;
-  } else if (UPB_LIKELY(overrun == d->limit)) {
-    return true;
-  } else {
-    *ptr = decode_isdonefallback(d, *ptr, overrun);
-    return false;
-  }
-}
-
-#if UPB_FASTTABLE
-UPB_INLINE
-const char* fastdecode_tagdispatch(upb_Decoder* d, const char* ptr,
-                                   upb_Message* msg, intptr_t table,
-                                   uint64_t hasbits, uint64_t tag) {
-  const upb_MiniTable* table_p = decode_totablep(table);
-  uint8_t mask = table;
-  uint64_t data;
-  size_t idx = tag & mask;
-  UPB_ASSUME((idx & 7) == 0);
-  idx >>= 3;
-  data = table_p->fasttable[idx].field_data ^ tag;
-  UPB_MUSTTAIL return table_p->fasttable[idx].field_parser(d, ptr, msg, table,
-                                                           hasbits, data);
-}
-#endif
-
-UPB_INLINE uint32_t fastdecode_loadtag(const char* ptr) {
-  uint16_t tag;
-  memcpy(&tag, ptr, 2);
-  return tag;
-}
-
-UPB_INLINE void decode_checklimit(upb_Decoder* d) {
-  UPB_ASSERT(d->limit_ptr == d->end + UPB_MIN(0, d->limit));
-}
-
-UPB_INLINE int decode_pushlimit(upb_Decoder* d, const char* ptr, int size) {
-  int limit = size + (int)(ptr - d->end);
-  int delta = d->limit - limit;
-  decode_checklimit(d);
-  d->limit = limit;
-  d->limit_ptr = d->end + UPB_MIN(0, limit);
-  decode_checklimit(d);
-  return delta;
-}
-
-UPB_INLINE void decode_poplimit(upb_Decoder* d, const char* ptr,
-                                int saved_delta) {
-  UPB_ASSERT(ptr - d->end == d->limit);
-  decode_checklimit(d);
-  d->limit += saved_delta;
-  d->limit_ptr = d->end + UPB_MIN(0, d->limit);
-  decode_checklimit(d);
-}
-
-
-#endif /* UPB_DECODE_INT_H_ */
-
-/** upb/json_decode.h ************************************************************/
-#ifndef UPB_JSONDECODE_H_
-#define UPB_JSONDECODE_H_
-
-
-/** upb/def.h ************************************************************/
-#ifndef UPB_DEF_H_
-#define UPB_DEF_H_
-
-
-/* Must be last. */
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-struct upb_EnumDef;
-typedef struct upb_EnumDef upb_EnumDef;
-struct upb_EnumValueDef;
-typedef struct upb_EnumValueDef upb_EnumValueDef;
-struct upb_ExtensionRange;
-typedef struct upb_ExtensionRange upb_ExtensionRange;
-struct upb_FieldDef;
-typedef struct upb_FieldDef upb_FieldDef;
-struct upb_FileDef;
-typedef struct upb_FileDef upb_FileDef;
-struct upb_MethodDef;
-typedef struct upb_MethodDef upb_MethodDef;
-struct upb_MessageDef;
-typedef struct upb_MessageDef upb_MessageDef;
-struct upb_OneofDef;
-typedef struct upb_OneofDef upb_OneofDef;
-struct upb_ServiceDef;
-typedef struct upb_ServiceDef upb_ServiceDef;
-struct upb_streamdef;
-typedef struct upb_streamdef upb_streamdef;
-struct upb_DefPool;
-typedef struct upb_DefPool upb_DefPool;
-typedef struct upb_EnumReservedRange upb_EnumReservedRange;
-typedef struct upb_MessageReservedRange upb_MessageReservedRange;
-typedef struct symtab_addctx symtab_addctx;
-
-typedef enum { kUpb_Syntax_Proto2 = 2, kUpb_Syntax_Proto3 = 3 } upb_Syntax;
-
-/* All the different kind of well known type messages. For simplicity of check,
- * number wrappers and string wrappers are grouped together. Make sure the
- * order and merber of these groups are not changed.
- */
-typedef enum {
-  kUpb_WellKnown_Unspecified,
-  kUpb_WellKnown_Any,
-  kUpb_WellKnown_FieldMask,
-  kUpb_WellKnown_Duration,
-  kUpb_WellKnown_Timestamp,
-  /* number wrappers */
-  kUpb_WellKnown_DoubleValue,
-  kUpb_WellKnown_FloatValue,
-  kUpb_WellKnown_Int64Value,
-  kUpb_WellKnown_UInt64Value,
-  kUpb_WellKnown_Int32Value,
-  kUpb_WellKnown_UInt32Value,
-  /* string wrappers */
-  kUpb_WellKnown_StringValue,
-  kUpb_WellKnown_BytesValue,
-  kUpb_WellKnown_BoolValue,
-  kUpb_WellKnown_Value,
-  kUpb_WellKnown_ListValue,
-  kUpb_WellKnown_Struct
-} upb_WellKnown;
-
-/* upb_FieldDef ***************************************************************/
-
-/* Maximum field number allowed for FieldDefs.  This is an inherent limit of the
- * protobuf wire format. */
-#define kUpb_MaxFieldNumber ((1 << 29) - 1)
-
-const google_protobuf_FieldOptions* upb_FieldDef_Options(const upb_FieldDef* f);
-bool upb_FieldDef_HasOptions(const upb_FieldDef* f);
-const char* upb_FieldDef_FullName(const upb_FieldDef* f);
-upb_CType upb_FieldDef_CType(const upb_FieldDef* f);
-upb_FieldType upb_FieldDef_Type(const upb_FieldDef* f);
-upb_Label upb_FieldDef_Label(const upb_FieldDef* f);
-uint32_t upb_FieldDef_Number(const upb_FieldDef* f);
-const char* upb_FieldDef_Name(const upb_FieldDef* f);
-const char* upb_FieldDef_JsonName(const upb_FieldDef* f);
-bool upb_FieldDef_HasJsonName(const upb_FieldDef* f);
-bool upb_FieldDef_IsExtension(const upb_FieldDef* f);
-bool upb_FieldDef_IsPacked(const upb_FieldDef* f);
-const upb_FileDef* upb_FieldDef_File(const upb_FieldDef* f);
-const upb_MessageDef* upb_FieldDef_ContainingType(const upb_FieldDef* f);
-const upb_MessageDef* upb_FieldDef_ExtensionScope(const upb_FieldDef* f);
-const upb_OneofDef* upb_FieldDef_ContainingOneof(const upb_FieldDef* f);
-const upb_OneofDef* upb_FieldDef_RealContainingOneof(const upb_FieldDef* f);
-uint32_t upb_FieldDef_Index(const upb_FieldDef* f);
-bool upb_FieldDef_IsSubMessage(const upb_FieldDef* f);
-bool upb_FieldDef_IsString(const upb_FieldDef* f);
-bool upb_FieldDef_IsRepeated(const upb_FieldDef* f);
-bool upb_FieldDef_IsPrimitive(const upb_FieldDef* f);
-bool upb_FieldDef_IsMap(const upb_FieldDef* f);
-bool upb_FieldDef_HasDefault(const upb_FieldDef* f);
-bool upb_FieldDef_HasSubDef(const upb_FieldDef* f);
-bool upb_FieldDef_HasPresence(const upb_FieldDef* f);
-const upb_MessageDef* upb_FieldDef_MessageSubDef(const upb_FieldDef* f);
-const upb_EnumDef* upb_FieldDef_EnumSubDef(const upb_FieldDef* f);
-const upb_MiniTable_Field* upb_FieldDef_MiniTable(const upb_FieldDef* f);
-const upb_MiniTable_Extension* _upb_FieldDef_ExtensionMiniTable(
-    const upb_FieldDef* f);
-bool _upb_FieldDef_IsProto3Optional(const upb_FieldDef* f);
-
-/* upb_OneofDef ***************************************************************/
-
-const google_protobuf_OneofOptions* upb_OneofDef_Options(const upb_OneofDef* o);
-bool upb_OneofDef_HasOptions(const upb_OneofDef* o);
-const char* upb_OneofDef_Name(const upb_OneofDef* o);
-const upb_MessageDef* upb_OneofDef_ContainingType(const upb_OneofDef* o);
-uint32_t upb_OneofDef_Index(const upb_OneofDef* o);
-bool upb_OneofDef_IsSynthetic(const upb_OneofDef* o);
-int upb_OneofDef_FieldCount(const upb_OneofDef* o);
-const upb_FieldDef* upb_OneofDef_Field(const upb_OneofDef* o, int i);
-
-/* Oneof lookups:
- * - ntof:  look up a field by name.
- * - ntofz: look up a field by name (as a null-terminated string).
- * - itof:  look up a field by number. */
-const upb_FieldDef* upb_OneofDef_LookupNameWithSize(const upb_OneofDef* o,
-                                                    const char* name,
-                                                    size_t length);
-UPB_INLINE const upb_FieldDef* upb_OneofDef_LookupName(const upb_OneofDef* o,
-                                                       const char* name) {
-  return upb_OneofDef_LookupNameWithSize(o, name, strlen(name));
-}
-const upb_FieldDef* upb_OneofDef_LookupNumber(const upb_OneofDef* o,
-                                              uint32_t num);
-
-/* upb_MessageDef *************************************************************/
-
-/* Well-known field tag numbers for map-entry messages. */
-#define kUpb_MapEntry_KeyFieldNumber 1
-#define kUpb_MapEntry_ValueFieldNumber 2
-
-/* Well-known field tag numbers for Any messages. */
-#define kUpb_Any_TypeFieldNumber 1
-#define kUpb_Any_ValueFieldNumber 2
-
-/* Well-known field tag numbers for duration messages. */
-#define kUpb_Duration_SecondsFieldNumber 1
-#define kUpb_Duration_NanosFieldNumber 2
-
-/* Well-known field tag numbers for timestamp messages. */
-#define kUpb_Timestamp_SecondsFieldNumber 1
-#define kUpb_Timestamp_NanosFieldNumber 2
-
-const google_protobuf_MessageOptions* upb_MessageDef_Options(
-    const upb_MessageDef* m);
-bool upb_MessageDef_HasOptions(const upb_MessageDef* m);
-const char* upb_MessageDef_FullName(const upb_MessageDef* m);
-const upb_FileDef* upb_MessageDef_File(const upb_MessageDef* m);
-const upb_MessageDef* upb_MessageDef_ContainingType(const upb_MessageDef* m);
-const char* upb_MessageDef_Name(const upb_MessageDef* m);
-upb_Syntax upb_MessageDef_Syntax(const upb_MessageDef* m);
-upb_WellKnown upb_MessageDef_WellKnownType(const upb_MessageDef* m);
-int upb_MessageDef_ExtensionRangeCount(const upb_MessageDef* m);
-int upb_MessageDef_FieldCount(const upb_MessageDef* m);
-int upb_MessageDef_OneofCount(const upb_MessageDef* m);
-const upb_ExtensionRange* upb_MessageDef_ExtensionRange(const upb_MessageDef* m,
-                                                        int i);
-const upb_FieldDef* upb_MessageDef_Field(const upb_MessageDef* m, int i);
-const upb_OneofDef* upb_MessageDef_Oneof(const upb_MessageDef* m, int i);
-const upb_FieldDef* upb_MessageDef_FindFieldByNumber(const upb_MessageDef* m,
-                                                     uint32_t i);
-const upb_FieldDef* upb_MessageDef_FindFieldByNameWithSize(
-    const upb_MessageDef* m, const char* name, size_t len);
-const upb_OneofDef* upb_MessageDef_FindOneofByNameWithSize(
-    const upb_MessageDef* m, const char* name, size_t len);
-const upb_MiniTable* upb_MessageDef_MiniTable(const upb_MessageDef* m);
-
-UPB_INLINE const upb_OneofDef* upb_MessageDef_FindOneofByName(
-    const upb_MessageDef* m, const char* name) {
-  return upb_MessageDef_FindOneofByNameWithSize(m, name, strlen(name));
-}
-
-UPB_INLINE const upb_FieldDef* upb_MessageDef_FindFieldByName(
-    const upb_MessageDef* m, const char* name) {
-  return upb_MessageDef_FindFieldByNameWithSize(m, name, strlen(name));
-}
-
-UPB_INLINE bool upb_MessageDef_IsMapEntry(const upb_MessageDef* m) {
-  return google_protobuf_MessageOptions_map_entry(upb_MessageDef_Options(m));
-}
-
-UPB_INLINE bool upb_MessageDef_IsMessageSet(const upb_MessageDef* m) {
-  return google_protobuf_MessageOptions_message_set_wire_format(
-      upb_MessageDef_Options(m));
-}
-
-/* Nested entities. */
-int upb_MessageDef_NestedMessageCount(const upb_MessageDef* m);
-int upb_MessageDef_NestedEnumCount(const upb_MessageDef* m);
-int upb_MessageDef_NestedExtensionCount(const upb_MessageDef* m);
-const upb_MessageDef* upb_MessageDef_NestedMessage(const upb_MessageDef* m,
-                                                   int i);
-const upb_EnumDef* upb_MessageDef_NestedEnum(const upb_MessageDef* m, int i);
-const upb_FieldDef* upb_MessageDef_NestedExtension(const upb_MessageDef* m,
-                                                   int i);
-
-/* Lookup of either field or oneof by name.  Returns whether either was found.
- * If the return is true, then the found def will be set, and the non-found
- * one set to NULL. */
-bool upb_MessageDef_FindByNameWithSize(const upb_MessageDef* m,
-                                       const char* name, size_t len,
-                                       const upb_FieldDef** f,
-                                       const upb_OneofDef** o);
-
-UPB_INLINE bool upb_MessageDef_FindByName(const upb_MessageDef* m,
-                                          const char* name,
-                                          const upb_FieldDef** f,
-                                          const upb_OneofDef** o) {
-  return upb_MessageDef_FindByNameWithSize(m, name, strlen(name), f, o);
-}
-
-/* Returns a field by either JSON name or regular proto name. */
-const upb_FieldDef* upb_MessageDef_FindByJsonNameWithSize(
-    const upb_MessageDef* m, const char* name, size_t len);
-UPB_INLINE const upb_FieldDef* upb_MessageDef_FindByJsonName(
-    const upb_MessageDef* m, const char* name) {
-  return upb_MessageDef_FindByJsonNameWithSize(m, name, strlen(name));
-}
-
-upb_StringView upb_MessageDef_ReservedName(const upb_MessageDef* m, int i);
-int upb_MessageDef_ReservedNameCount(const upb_MessageDef* m);
-
-const upb_MessageReservedRange* upb_MessageDef_ReservedRange(
-    const upb_MessageDef* m, int i);
-int upb_MessageDef_ReservedRangeCount(const upb_MessageDef* m);
-
-int32_t upb_MessageReservedRange_Start(const upb_MessageReservedRange* r);
-int32_t upb_MessageReservedRange_End(const upb_MessageReservedRange* r);
-
-/* upb_ExtensionRange *********************************************************/
-
-const google_protobuf_ExtensionRangeOptions* upb_ExtensionRange_Options(
-    const upb_ExtensionRange* r);
-bool upb_ExtensionRange_HasOptions(const upb_ExtensionRange* r);
-int32_t upb_ExtensionRange_Start(const upb_ExtensionRange* r);
-int32_t upb_ExtensionRange_End(const upb_ExtensionRange* r);
-
-/* upb_EnumDef ****************************************************************/
-
-const google_protobuf_EnumOptions* upb_EnumDef_Options(const upb_EnumDef* e);
-bool upb_EnumDef_HasOptions(const upb_EnumDef* e);
-const char* upb_EnumDef_FullName(const upb_EnumDef* e);
-const char* upb_EnumDef_Name(const upb_EnumDef* e);
-const upb_FileDef* upb_EnumDef_File(const upb_EnumDef* e);
-const upb_MessageDef* upb_EnumDef_ContainingType(const upb_EnumDef* e);
-int32_t upb_EnumDef_Default(const upb_EnumDef* e);
-int upb_EnumDef_ValueCount(const upb_EnumDef* e);
-const upb_EnumValueDef* upb_EnumDef_Value(const upb_EnumDef* e, int i);
-
-const upb_EnumValueDef* upb_EnumDef_FindValueByNameWithSize(
-    const upb_EnumDef* e, const char* name, size_t len);
-const upb_EnumValueDef* upb_EnumDef_FindValueByNumber(const upb_EnumDef* e,
-                                                      int32_t num);
-bool upb_EnumDef_CheckNumber(const upb_EnumDef* e, int32_t num);
-
-// Convenience wrapper.
-UPB_INLINE const upb_EnumValueDef* upb_EnumDef_FindValueByName(
-    const upb_EnumDef* e, const char* name) {
-  return upb_EnumDef_FindValueByNameWithSize(e, name, strlen(name));
-}
-
-upb_StringView upb_EnumDef_ReservedName(const upb_EnumDef* e, int i);
-int upb_EnumDef_ReservedNameCount(const upb_EnumDef* e);
-
-const upb_EnumReservedRange* upb_EnumDef_ReservedRange(const upb_EnumDef* e,
-                                                       int i);
-int upb_EnumDef_ReservedRangeCount(const upb_EnumDef* e);
-
-int32_t upb_EnumReservedRange_Start(const upb_EnumReservedRange* r);
-int32_t upb_EnumReservedRange_End(const upb_EnumReservedRange* r);
-
-/* upb_EnumValueDef ***********************************************************/
-
-const google_protobuf_EnumValueOptions* upb_EnumValueDef_Options(
-    const upb_EnumValueDef* e);
-bool upb_EnumValueDef_HasOptions(const upb_EnumValueDef* e);
-const char* upb_EnumValueDef_FullName(const upb_EnumValueDef* e);
-const char* upb_EnumValueDef_Name(const upb_EnumValueDef* e);
-int32_t upb_EnumValueDef_Number(const upb_EnumValueDef* e);
-uint32_t upb_EnumValueDef_Index(const upb_EnumValueDef* e);
-const upb_EnumDef* upb_EnumValueDef_Enum(const upb_EnumValueDef* e);
-
-/* upb_FileDef ****************************************************************/
-
-const google_protobuf_FileOptions* upb_FileDef_Options(const upb_FileDef* f);
-bool upb_FileDef_HasOptions(const upb_FileDef* f);
-const char* upb_FileDef_Name(const upb_FileDef* f);
-const char* upb_FileDef_Package(const upb_FileDef* f);
-upb_Syntax upb_FileDef_Syntax(const upb_FileDef* f);
-int upb_FileDef_DependencyCount(const upb_FileDef* f);
-int upb_FileDef_PublicDependencyCount(const upb_FileDef* f);
-int upb_FileDef_WeakDependencyCount(const upb_FileDef* f);
-int upb_FileDef_TopLevelMessageCount(const upb_FileDef* f);
-int upb_FileDef_TopLevelEnumCount(const upb_FileDef* f);
-int upb_FileDef_TopLevelExtensionCount(const upb_FileDef* f);
-int upb_FileDef_ServiceCount(const upb_FileDef* f);
-const upb_FileDef* upb_FileDef_Dependency(const upb_FileDef* f, int i);
-const upb_FileDef* upb_FileDef_PublicDependency(const upb_FileDef* f, int i);
-const upb_FileDef* upb_FileDef_WeakDependency(const upb_FileDef* f, int i);
-const upb_MessageDef* upb_FileDef_TopLevelMessage(const upb_FileDef* f, int i);
-const upb_EnumDef* upb_FileDef_TopLevelEnum(const upb_FileDef* f, int i);
-const upb_FieldDef* upb_FileDef_TopLevelExtension(const upb_FileDef* f, int i);
-const upb_ServiceDef* upb_FileDef_Service(const upb_FileDef* f, int i);
-const upb_DefPool* upb_FileDef_Pool(const upb_FileDef* f);
-const int32_t* _upb_FileDef_PublicDependencyIndexes(const upb_FileDef* f);
-const int32_t* _upb_FileDef_WeakDependencyIndexes(const upb_FileDef* f);
-
-/* upb_MethodDef **************************************************************/
-
-const google_protobuf_MethodOptions* upb_MethodDef_Options(
-    const upb_MethodDef* m);
-bool upb_MethodDef_HasOptions(const upb_MethodDef* m);
-const char* upb_MethodDef_FullName(const upb_MethodDef* m);
-int upb_MethodDef_Index(const upb_MethodDef* m);
-const char* upb_MethodDef_Name(const upb_MethodDef* m);
-const upb_ServiceDef* upb_MethodDef_Service(const upb_MethodDef* m);
-const upb_MessageDef* upb_MethodDef_InputType(const upb_MethodDef* m);
-const upb_MessageDef* upb_MethodDef_OutputType(const upb_MethodDef* m);
-bool upb_MethodDef_ClientStreaming(const upb_MethodDef* m);
-bool upb_MethodDef_ServerStreaming(const upb_MethodDef* m);
-
-/* upb_ServiceDef *************************************************************/
-
-const google_protobuf_ServiceOptions* upb_ServiceDef_Options(
-    const upb_ServiceDef* s);
-bool upb_ServiceDef_HasOptions(const upb_ServiceDef* s);
-const char* upb_ServiceDef_FullName(const upb_ServiceDef* s);
-const char* upb_ServiceDef_Name(const upb_ServiceDef* s);
-int upb_ServiceDef_Index(const upb_ServiceDef* s);
-const upb_FileDef* upb_ServiceDef_File(const upb_ServiceDef* s);
-int upb_ServiceDef_MethodCount(const upb_ServiceDef* s);
-const upb_MethodDef* upb_ServiceDef_Method(const upb_ServiceDef* s, int i);
-const upb_MethodDef* upb_ServiceDef_FindMethodByName(const upb_ServiceDef* s,
-                                                     const char* name);
-
-/* upb_DefPool ****************************************************************/
-
-upb_DefPool* upb_DefPool_New(void);
-void upb_DefPool_Free(upb_DefPool* s);
-const upb_MessageDef* upb_DefPool_FindMessageByName(const upb_DefPool* s,
-                                                    const char* sym);
-const upb_MessageDef* upb_DefPool_FindMessageByNameWithSize(
-    const upb_DefPool* s, const char* sym, size_t len);
-const upb_EnumDef* upb_DefPool_FindEnumByName(const upb_DefPool* s,
-                                              const char* sym);
-const upb_EnumValueDef* upb_DefPool_FindEnumByNameval(const upb_DefPool* s,
-                                                      const char* sym);
-const upb_FieldDef* upb_DefPool_FindExtensionByName(const upb_DefPool* s,
-                                                    const char* sym);
-const upb_FieldDef* upb_DefPool_FindExtensionByNameWithSize(
-    const upb_DefPool* s, const char* sym, size_t len);
-const upb_FileDef* upb_DefPool_FindFileByName(const upb_DefPool* s,
-                                              const char* name);
-const upb_ServiceDef* upb_DefPool_FindServiceByName(const upb_DefPool* s,
-                                                    const char* name);
-const upb_ServiceDef* upb_DefPool_FindServiceByNameWithSize(
-    const upb_DefPool* s, const char* name, size_t size);
-const upb_FileDef* upb_DefPool_FindFileContainingSymbol(const upb_DefPool* s,
-                                                        const char* name);
-const upb_FileDef* upb_DefPool_FindFileByNameWithSize(const upb_DefPool* s,
-                                                      const char* name,
-                                                      size_t len);
-const upb_FileDef* upb_DefPool_AddFile(
-    upb_DefPool* s, const google_protobuf_FileDescriptorProto* file,
-    upb_Status* status);
-size_t _upb_DefPool_BytesLoaded(const upb_DefPool* s);
-upb_Arena* _upb_DefPool_Arena(const upb_DefPool* s);
-const upb_FieldDef* _upb_DefPool_FindExtensionByMiniTable(
-    const upb_DefPool* s, const upb_MiniTable_Extension* ext);
-const upb_FieldDef* upb_DefPool_FindExtensionByNumber(const upb_DefPool* s,
-                                                      const upb_MessageDef* m,
-                                                      int32_t fieldnum);
-const upb_ExtensionRegistry* upb_DefPool_ExtensionRegistry(
-    const upb_DefPool* s);
-const upb_FieldDef** upb_DefPool_GetAllExtensions(const upb_DefPool* s,
-                                                  const upb_MessageDef* m,
-                                                  size_t* count);
-
-/* For generated code only: loads a generated descriptor. */
-typedef struct _upb_DefPool_Init {
-  struct _upb_DefPool_Init** deps; /* Dependencies of this file. */
-  const upb_MiniTable_File* layout;
-  const char* filename;
-  upb_StringView descriptor; /* Serialized descriptor. */
-} _upb_DefPool_Init;
-
-// Should only be directly called by tests.  This variant lets us suppress
-// the use of compiled-in tables, forcing a rebuild of the tables at runtime.
-bool _upb_DefPool_LoadDefInitEx(upb_DefPool* s, const _upb_DefPool_Init* init,
-                                bool rebuild_minitable);
-
-UPB_INLINE bool _upb_DefPool_LoadDefInit(upb_DefPool* s,
-                                         const _upb_DefPool_Init* init) {
-  return _upb_DefPool_LoadDefInitEx(s, init, false);
-}
-
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif /* __cplusplus */
-
-#endif /* UPB_DEF_H_ */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-enum { upb_JsonDecode_IgnoreUnknown = 1 };
-
-bool upb_JsonDecode(const char* buf, size_t size, upb_Message* msg,
-                    const upb_MessageDef* m, const upb_DefPool* symtab,
-                    int options, upb_Arena* arena, upb_Status* status);
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#endif /* UPB_JSONDECODE_H_ */
-
-/** upb/reflection.h ************************************************************/
-#ifndef UPB_REFLECTION_H_
-#define UPB_REFLECTION_H_
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-upb_MessageValue upb_FieldDef_Default(const upb_FieldDef* f);
-
-/** upb_Message
- * *******************************************************************/
-
-/* Creates a new message of the given type in the given arena. */
-upb_Message* upb_Message_New(const upb_MessageDef* m, upb_Arena* a);
-
-/* Returns the value associated with this field. */
-upb_MessageValue upb_Message_Get(const upb_Message* msg, const upb_FieldDef* f);
-
-/* Returns a mutable pointer to a map, array, or submessage value.  If the given
- * arena is non-NULL this will construct a new object if it was not previously
- * present.  May not be called for primitive fields. */
-upb_MutableMessageValue upb_Message_Mutable(upb_Message* msg,
-                                            const upb_FieldDef* f,
-                                            upb_Arena* a);
-
-/* May only be called for fields where upb_FieldDef_HasPresence(f) == true. */
-bool upb_Message_Has(const upb_Message* msg, const upb_FieldDef* f);
-
-/* Returns the field that is set in the oneof, or NULL if none are set. */
-const upb_FieldDef* upb_Message_WhichOneof(const upb_Message* msg,
-                                           const upb_OneofDef* o);
-
-/* Sets the given field to the given value.  For a msg/array/map/string, the
- * caller must ensure that the target data outlives |msg| (by living either in
- * the same arena or a different arena that outlives it).
- *
- * Returns false if allocation fails. */
-bool upb_Message_Set(upb_Message* msg, const upb_FieldDef* f,
-                     upb_MessageValue val, upb_Arena* a);
-
-/* Clears any field presence and sets the value back to its default. */
-void upb_Message_ClearField(upb_Message* msg, const upb_FieldDef* f);
-
-/* Clear all data and unknown fields. */
-void upb_Message_Clear(upb_Message* msg, const upb_MessageDef* m);
-
-/* Iterate over present fields.
- *
- * size_t iter = kUpb_Message_Begin;
- * const upb_FieldDef *f;
- * upb_MessageValue val;
- * while (upb_Message_Next(msg, m, ext_pool, &f, &val, &iter)) {
- *   process_field(f, val);
- * }
- *
- * If ext_pool is NULL, no extensions will be returned.  If the given symtab
- * returns extensions that don't match what is in this message, those extensions
- * will be skipped.
- */
-
-#define kUpb_Message_Begin -1
-bool upb_Message_Next(const upb_Message* msg, const upb_MessageDef* m,
-                      const upb_DefPool* ext_pool, const upb_FieldDef** f,
-                      upb_MessageValue* val, size_t* iter);
-
-/* Clears all unknown field data from this message and all submessages. */
-bool upb_Message_DiscardUnknown(upb_Message* msg, const upb_MessageDef* m,
-                                int maxdepth);
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-
-#endif /* UPB_REFLECTION_H_ */
-
-/** upb/json_encode.h ************************************************************/
-#ifndef UPB_JSONENCODE_H_
-#define UPB_JSONENCODE_H_
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-enum {
-  /* When set, emits 0/default values.  TODO(haberman): proto3 only? */
-  upb_JsonEncode_EmitDefaults = 1,
-
-  /* When set, use normal (snake_caes) field names instead of JSON (camelCase)
-     names. */
-  upb_JsonEncode_UseProtoNames = 2
-};
-
-/* Encodes the given |msg| to JSON format.  The message's reflection is given in
- * |m|.  The symtab in |symtab| is used to find extensions (if NULL, extensions
- * will not be printed).
- *
- * Output is placed in the given buffer, and always NULL-terminated.  The output
- * size (excluding NULL) is returned.  This means that a return value >= |size|
- * implies that the output was truncated.  (These are the same semantics as
- * snprintf()). */
-size_t upb_JsonEncode(const upb_Message* msg, const upb_MessageDef* m,
-                      const upb_DefPool* ext_pool, int options, char* buf,
-                      size_t size, upb_Status* status);
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#endif /* UPB_JSONENCODE_H_ */
-
-/** upb/internal/vsnprintf_compat.h ************************************************************/
-#ifndef UPB_INTERNAL_VSNPRINTF_COMPAT_H_
-#define UPB_INTERNAL_VSNPRINTF_COMPAT_H_
-
-#include <stdio.h>
-
-// Must be last.
-
-UPB_INLINE int _upb_vsnprintf(char* buf, size_t size, const char* fmt,
-                              va_list ap) {
-#if defined(__MINGW64__) || defined(__MINGW32__) || defined(_MSC_VER)
-  // The msvc runtime has a non-conforming vsnprintf() that requires the
-  // following compatibility code to become conformant.
-  int n = -1;
-  if (size != 0) n = _vsnprintf_s(buf, size, _TRUNCATE, fmt, ap);
-  if (n == -1) n = _vscprintf(fmt, ap);
-  return n;
-#else
-  return vsnprintf(buf, size, fmt, ap);
-#endif
-}
-
-
-#endif  // UPB_INTERNAL_VSNPRINTF_COMPAT_H_
-
-/** upb/mini_table.h ************************************************************/
-#ifndef UPB_MINI_TABLE_H_
-#define UPB_MINI_TABLE_H_
-
-
-// Must be last.
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-const upb_MiniTable_Field* upb_MiniTable_FindFieldByNumber(
-    const upb_MiniTable* table, uint32_t number);
-
-UPB_INLINE const upb_MiniTable* upb_MiniTable_GetSubMessageTable(
-    const upb_MiniTable* mini_table, const upb_MiniTable_Field* field) {
-  return mini_table->subs[field->submsg_index].submsg;
-}
-
-UPB_INLINE bool upb_MiniTable_Enum_CheckValue(const upb_MiniTable_Enum* e,
-                                              int32_t val) {
-  uint32_t uval = (uint32_t)val;
-  if (uval < 64) return e->mask & (1ULL << uval);
-  // OPT: binary search long lists?
-  int n = e->value_count;
-  for (int i = 0; i < n; i++) {
-    if (e->values[i] == val) return true;
-  }
-  return false;
-}
-
-/** upb_MtDataEncoder *********************************************************/
-
-// Functions to encode a string in a format that can be loaded by
-// upb_MiniTable_Build().
-
-typedef enum {
-  kUpb_MessageModifier_ValidateUtf8 = 1 << 0,
-  kUpb_MessageModifier_DefaultIsPacked = 1 << 1,
-  kUpb_MessageModifier_IsExtendable = 1 << 2,
-} kUpb_MessageModifier;
-
-typedef enum {
-  kUpb_FieldModifier_IsRepeated = 1 << 0,
-  kUpb_FieldModifier_IsPacked = 1 << 1,
-  kUpb_FieldModifier_IsClosedEnum = 1 << 2,
-  kUpb_FieldModifier_IsProto3Singular = 1 << 3,
-  kUpb_FieldModifier_IsRequired = 1 << 4,
-} kUpb_FieldModifier;
-
-typedef struct {
-  char* end;  // Limit of the buffer passed as a parameter.
-  // Aliased to internal-only members in .cc.
-  char internal[32];
-} upb_MtDataEncoder;
-
-// If the input buffer has at least this many bytes available, the encoder call
-// is guaranteed to succeed (as long as field number order is maintained).
-#define kUpb_MtDataEncoder_MinSize 16
-
-// Encodes field/oneof information for a given message.  The sequence of calls
-// should look like:
-//
-//   upb_MtDataEncoder e;
-//   char buf[256];
-//   char* ptr = buf;
-//   e.end = ptr + sizeof(buf);
-//   ptr = upb_MtDataEncoder_StartMessage(&e, ptr);
-//   // Fields *must* be in field number order.
-//   ptr = upb_MtDataEncoder_PutField(&e, ptr, ...);
-//   ptr = upb_MtDataEncoder_PutField(&e, ptr, ...);
-//   ptr = upb_MtDataEncoder_PutField(&e, ptr, ...);
-//
-//   // If oneofs are present.  Oneofs must be encoded after regular fields.
-//   ptr = upb_MiniTable_StartOneof(&e, ptr)
-//   ptr = upb_MiniTable_PutOneofField(&e, ptr, ...);
-//   ptr = upb_MiniTable_PutOneofField(&e, ptr, ...);
-//
-//   ptr = upb_MiniTable_StartOneof(&e, ptr);
-//   ptr = upb_MiniTable_PutOneofField(&e, ptr, ...);
-//   ptr = upb_MiniTable_PutOneofField(&e, ptr, ...);
-//
-// Oneofs must be encoded after all regular fields.
-char* upb_MtDataEncoder_StartMessage(upb_MtDataEncoder* e, char* ptr,
-                                     uint64_t msg_mod);
-char* upb_MtDataEncoder_PutField(upb_MtDataEncoder* e, char* ptr,
-                                 upb_FieldType type, uint32_t field_num,
-                                 uint64_t field_mod);
-char* upb_MtDataEncoder_StartOneof(upb_MtDataEncoder* e, char* ptr);
-char* upb_MtDataEncoder_PutOneofField(upb_MtDataEncoder* e, char* ptr,
-                                      uint32_t field_num);
-
-// Encodes the set of values for a given enum.  The values must be given in
-// order (after casting to uint32_t), and repeats are not allowed.
-void upb_MtDataEncoder_StartEnum(upb_MtDataEncoder* e);
-char* upb_MtDataEncoder_PutEnumValue(upb_MtDataEncoder* e, char* ptr,
-                                     uint32_t val);
-char* upb_MtDataEncoder_EndEnum(upb_MtDataEncoder* e, char* ptr);
-
-/** upb_MiniTable *************************************************************/
-
-typedef enum {
-  kUpb_MiniTablePlatform_32Bit,
-  kUpb_MiniTablePlatform_64Bit,
-  kUpb_MiniTablePlatform_Native =
-      UPB_SIZE(kUpb_MiniTablePlatform_32Bit, kUpb_MiniTablePlatform_64Bit),
-} upb_MiniTablePlatform;
-
-// Builds a mini table from the data encoded in the buffer [data, len]. If any
-// errors occur, returns NULL and sets a status message. In the success case,
-// the caller must call upb_MiniTable_SetSub*() for all message or proto2 enum
-// fields to link the table to the appropriate sub-tables.
-upb_MiniTable* upb_MiniTable_Build(const char* data, size_t len,
-                                   upb_MiniTablePlatform platform,
-                                   upb_Arena* arena, upb_Status* status);
-void upb_MiniTable_SetSubMessage(upb_MiniTable* table,
-                                 upb_MiniTable_Field* field,
-                                 const upb_MiniTable* sub);
-void upb_MiniTable_SetSubEnum(upb_MiniTable* table, upb_MiniTable_Field* field,
-                              const upb_MiniTable_Enum* sub);
-
-bool upb_MiniTable_BuildExtension(const char* data, size_t len,
-                                  upb_MiniTable_Extension* ext,
-                                  upb_MiniTable_Sub sub, upb_Status* status);
-
-// Special-case functions for MessageSet layout and map entries.
-upb_MiniTable* upb_MiniTable_BuildMessageSet(upb_MiniTablePlatform platform,
-                                             upb_Arena* arena);
-upb_MiniTable* upb_MiniTable_BuildMapEntry(upb_FieldType key_type,
-                                           upb_FieldType value_type,
-                                           bool value_is_proto3_enum,
-                                           upb_MiniTablePlatform platform,
-                                           upb_Arena* arena);
-
-upb_MiniTable_Enum* upb_MiniTable_BuildEnum(const char* data, size_t len,
-                                            upb_Arena* arena,
-                                            upb_Status* status);
-
-// Like upb_MiniTable_Build(), but the user provides a buffer of layout data so
-// it can be reused from call to call, avoiding repeated realloc()/free().
-//
-// The caller owns `*buf` both before and after the call, and must free() it
-// when it is no longer in use.  The function will realloc() `*buf` as
-// necessary, updating `*size` accordingly.
-upb_MiniTable* upb_MiniTable_BuildWithBuf(const char* data, size_t len,
-                                          upb_MiniTablePlatform platform,
-                                          upb_Arena* arena, void** buf,
-                                          size_t* buf_size, upb_Status* status);
-
-// For testing only.
-char upb_ToBase92(int8_t ch);
-char upb_FromBase92(uint8_t ch);
-bool upb_IsTypePackable(upb_FieldType type);
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-
-#endif /* UPB_MINI_TABLE_H_ */
-
-/** upb/port_undef.inc ************************************************************/
-/* See port_def.inc.  This should #undef all macros #defined there. */
-
-#undef UPB_SIZE
-#undef UPB_PTR_AT
-#undef UPB_READ_ONEOF
-#undef UPB_WRITE_ONEOF
-#undef UPB_MAPTYPE_STRING
-#undef UPB_INLINE
-#undef UPB_ALIGN_UP
-#undef UPB_ALIGN_DOWN
-#undef UPB_ALIGN_MALLOC
-#undef UPB_ALIGN_OF
-#undef UPB_MALLOC_ALIGN
-#undef UPB_LIKELY
-#undef UPB_UNLIKELY
-#undef UPB_FORCEINLINE
-#undef UPB_NOINLINE
-#undef UPB_NORETURN
-#undef UPB_PRINTF
-#undef UPB_MAX
-#undef UPB_MIN
-#undef UPB_UNUSED
-#undef UPB_ASSUME
-#undef UPB_ASSERT
-#undef UPB_UNREACHABLE
-#undef UPB_SETJMP
-#undef UPB_LONGJMP
-#undef UPB_PTRADD
-#undef UPB_MUSTTAIL
-#undef UPB_FASTTABLE_SUPPORTED
-#undef UPB_FASTTABLE
-#undef UPB_FASTTABLE_INIT
-#undef UPB_POISON_MEMORY_REGION
-#undef UPB_UNPOISON_MEMORY_REGION
-#undef UPB_ASAN
-#undef UPB_TREAT_PROTO2_ENUMS_LIKE_PROTO3
diff --git a/libs/protobuf/ruby/ext/google/protobuf_c/wrap_memcpy.c b/libs/protobuf/ruby/ext/google/protobuf_c/wrap_memcpy.c
deleted file mode 100644
index 6bbd4ba..0000000
--- a/libs/protobuf/ruby/ext/google/protobuf_c/wrap_memcpy.c
+++ /dev/null
@@ -1,52 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2017 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <string.h>
-
-// On x86-64 Linux with glibc, we link against the 2.2.5 version of memcpy so
-// that we avoid depending on the 2.14 version of the symbol. This way,
-// distributions that are using pre-2.14 versions of glibc can successfully use
-// the gem we distribute
-// (https://github.com/protocolbuffers/protobuf/issues/2783).
-//
-// This wrapper is enabled by passing the linker flags -Wl,-wrap,memcpy in
-// extconf.rb.
-#ifdef __linux__
-#if defined(__x86_64__) && defined(__GNU_LIBRARY__)
-__asm__(".symver memcpy,memcpy@GLIBC_2.2.5");
-void *__wrap_memcpy(void *dest, const void *src, size_t n) {
-  return memcpy(dest, src, n);
-}
-#else
-void *__wrap_memcpy(void *dest, const void *src, size_t n) {
-  return memmove(dest, src, n);
-}
-#endif
-#endif
diff --git a/libs/protobuf/ruby/google-protobuf.gemspec b/libs/protobuf/ruby/google-protobuf.gemspec
deleted file mode 100644
index a925fdc..0000000
--- a/libs/protobuf/ruby/google-protobuf.gemspec
+++ /dev/null
@@ -1,27 +0,0 @@
-Gem::Specification.new do |s|
-  s.name        = "google-protobuf"
-  s.version     = "3.21.12"
-  git_tag       = "v#{s.version.to_s.sub('.rc.', '-rc')}" # Converts X.Y.Z.rc.N to vX.Y.Z-rcN, used for the git tag
-  s.licenses    = ["BSD-3-Clause"]
-  s.summary     = "Protocol Buffers"
-  s.description = "Protocol Buffers are Google's data interchange format."
-  s.homepage    = "https://developers.google.com/protocol-buffers"
-  s.authors     = ["Protobuf Authors"]
-  s.email       = "protobuf@googlegroups.com"
-  s.metadata    = { "source_code_uri" => "https://github.com/protocolbuffers/protobuf/tree/#{git_tag}/ruby" }
-  s.require_paths = ["lib"]
-  s.files       = Dir.glob('lib/**/*.rb')
-  if RUBY_PLATFORM == "java"
-    s.platform  = "java"
-    s.files     += ["lib/google/protobuf_java.jar"]
-  else
-    s.files     += Dir.glob('ext/**/*')
-    s.extensions= ["ext/google/protobuf_c/extconf.rb"]
-    s.add_development_dependency "rake-compiler-dock", "= 1.2.1"  end
-  s.test_files  = ["tests/basic.rb",
-                  "tests/stress.rb",
-                  "tests/generated_code_test.rb"]
-  s.required_ruby_version = '>= 2.3'
-  s.add_development_dependency "rake-compiler", "~> 1.1.0"
-  s.add_development_dependency "test-unit", '~> 3.0', '>= 3.0.9'
-end
diff --git a/libs/protobuf/ruby/lib/google/protobuf.rb b/libs/protobuf/ruby/lib/google/protobuf.rb
deleted file mode 100644
index b7a6711..0000000
--- a/libs/protobuf/ruby/lib/google/protobuf.rb
+++ /dev/null
@@ -1,79 +0,0 @@
-# Protocol Buffers - Google's data interchange format
-# Copyright 2008 Google Inc.  All rights reserved.
-# https://developers.google.com/protocol-buffers/
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# require mixins before we hook them into the java & c code
-require 'google/protobuf/message_exts'
-
-# We define these before requiring the platform-specific modules.
-# That way the module init can grab references to these.
-module Google
-  module Protobuf
-    class Error < StandardError; end
-    class ParseError < Error; end
-    class TypeError < ::TypeError; end
-  end
-end
-
-if RUBY_PLATFORM == "java"
-  require 'json'
-  require 'google/protobuf_java'
-else
-  begin
-    require "google/#{RUBY_VERSION.sub(/\.\d+$/, '')}/protobuf_c"
-  rescue LoadError
-    require 'google/protobuf_c'
-  end
-
-end
-
-require 'google/protobuf/descriptor_dsl'
-require 'google/protobuf/repeated_field'
-
-module Google
-  module Protobuf
-
-    def self.encode(msg, options = {})
-      msg.to_proto(options)
-    end
-
-    def self.encode_json(msg, options = {})
-      msg.to_json(options)
-    end
-
-    def self.decode(klass, proto, options = {})
-      klass.decode(proto, options)
-    end
-
-    def self.decode_json(klass, json, options = {})
-      klass.decode_json(json, options)
-    end
-
-  end
-end
diff --git a/libs/protobuf/ruby/lib/google/protobuf/descriptor_dsl.rb b/libs/protobuf/ruby/lib/google/protobuf/descriptor_dsl.rb
deleted file mode 100644
index 7349b6d..0000000
--- a/libs/protobuf/ruby/lib/google/protobuf/descriptor_dsl.rb
+++ /dev/null
@@ -1,465 +0,0 @@
-#!/usr/bin/ruby
-#
-# Code that implements the DSL for defining proto messages.
-
-# Suppress warning: loading in progress, circular require considered harmful.
-# This circular require is intentional to avoid missing dependency.
-begin
-  old_verbose, $VERBOSE = $VERBOSE, nil
-  require 'google/protobuf/descriptor_pb'
-ensure
-  $VERBOSE = old_verbose
-end
-
-module Google
-  module Protobuf
-    module Internal
-      class AtomicCounter
-        def initialize
-          @n = 0
-          @mu = Mutex.new
-        end
-
-        def get_and_increment
-          n = @n
-          @mu.synchronize {
-            @n += 1
-          }
-          return n
-        end
-      end
-
-      class Builder
-        @@file_number = AtomicCounter.new
-
-        def initialize(pool)
-          @pool = pool
-          @default_file = nil  # Constructed lazily
-        end
-
-        def add_file(name, options={}, &block)
-          builder = FileBuilder.new(@pool, name, options)
-          builder.instance_eval(&block)
-          internal_add_file(builder)
-        end
-
-        def add_message(name, &block)
-          internal_default_file.add_message(name, &block)
-        end
-
-        def add_enum(name, &block)
-          internal_default_file.add_enum(name, &block)
-        end
-
-        # ---- Internal methods, not part of the DSL ----
-
-        def build
-          if @default_file
-            internal_add_file(@default_file)
-          end
-        end
-
-        private def internal_add_file(file_builder)
-          proto = file_builder.build
-          serialized = Google::Protobuf::FileDescriptorProto.encode(proto)
-          @pool.add_serialized_file(serialized)
-        end
-
-        private def internal_default_file
-          number = @@file_number.get_and_increment
-          filename = "ruby_default_file#{number}.proto"
-          @default_file ||= FileBuilder.new(@pool, filename)
-        end
-      end
-
-      class FileBuilder
-        def initialize(pool, name, options={})
-          @pool = pool
-          @file_proto = Google::Protobuf::FileDescriptorProto.new(
-            name: name,
-            syntax: options.fetch(:syntax, "proto3")
-          )
-        end
-
-        def add_message(name, &block)
-          builder = MessageBuilder.new(name, self, @file_proto)
-          builder.instance_eval(&block)
-          builder.internal_add_synthetic_oneofs
-        end
-
-        def add_enum(name, &block)
-          EnumBuilder.new(name, @file_proto).instance_eval(&block)
-        end
-
-        # ---- Internal methods, not part of the DSL ----
-
-        # These methods fix up the file descriptor to account for differences
-        # between the DSL and FileDescriptorProto.
-
-        # The DSL can omit a package name; here we infer what the package is if
-        # was not specified.
-        def infer_package(names)
-          # Package is longest common prefix ending in '.', if any.
-          if not names.empty?
-            min, max = names.minmax
-            last_common_dot = nil
-            min.size.times { |i|
-              if min[i] != max[i] then break end
-              if min[i] == "." then last_common_dot = i end
-            }
-            if last_common_dot
-              return min.slice(0, last_common_dot)
-            end
-          end
-
-          nil
-        end
-
-        def rewrite_enum_default(field)
-          if field.type != :TYPE_ENUM or !field.has_default_value? or !field.has_type_name?
-            return
-          end
-
-          value = field.default_value
-          type_name = field.type_name
-
-          if value.empty? or value[0].ord < "0".ord or value[0].ord > "9".ord
-            return
-          end
-
-          if type_name.empty? || type_name[0] != "."
-            return
-          end
-
-          type_name = type_name[1..-1]
-          as_int = Integer(value) rescue return
-
-          enum_desc = @pool.lookup(type_name)
-          if enum_desc.is_a?(Google::Protobuf::EnumDescriptor)
-            # Enum was defined in a previous file.
-            name = enum_desc.lookup_value(as_int)
-            if name
-              # Update the default value in the proto.
-              field.default_value = name
-            end
-          else
-            # See if enum was defined in this file.
-            @file_proto.enum_type.each { |enum_proto|
-              if enum_proto.name == type_name
-                enum_proto.value.each { |enum_value_proto|
-                  if enum_value_proto.number == as_int
-                    # Update the default value in the proto.
-                    field.default_value = enum_value_proto.name
-                    return
-                  end
-                }
-                # We found the right enum, but no value matched.
-                return
-              end
-            }
-          end
-        end
-
-        # Historically we allowed enum defaults to be specified as a number.
-        # In retrospect this was a mistake as descriptors require defaults to
-        # be specified as a label. This can make a difference if multiple
-        # labels have the same number.
-        #
-        # Here we do a pass over all enum defaults and rewrite numeric defaults
-        # by looking up their labels.  This is complicated by the fact that the
-        # enum definition can live in either the symtab or the file_proto.
-        #
-        # We take advantage of the fact that this is called *before* enums or
-        # messages are nested in other messages, so we only have to iterate
-        # one level deep.
-        def rewrite_enum_defaults
-          @file_proto.message_type.each { |msg|
-            msg.field.each { |field|
-              rewrite_enum_default(field)
-            }
-          }
-        end
-
-        # We have to do some relatively complicated logic here for backward
-        # compatibility.
-        #
-        # In descriptor.proto, messages are nested inside other messages if that is
-        # what the original .proto file looks like.  For example, suppose we have this
-        # foo.proto:
-        #
-        # package foo;
-        # message Bar {
-        #   message Baz {}
-        # }
-        #
-        # The descriptor for this must look like this:
-        #
-        # file {
-        #   name: "test.proto"
-        #   package: "foo"
-        #   message_type {
-        #     name: "Bar"
-        #     nested_type {
-        #       name: "Baz"
-        #     }
-        #   }
-        # }
-        #
-        # However, the Ruby generated code has always generated messages in a flat,
-        # non-nested way:
-        #
-        # Google::Protobuf::DescriptorPool.generated_pool.build do
-        #   add_message "foo.Bar" do
-        #   end
-        #   add_message "foo.Bar.Baz" do
-        #   end
-        # end
-        #
-        # Here we need to do a translation where we turn this generated code into the
-        # above descriptor.  We need to infer that "foo" is the package name, and not
-        # a message itself. */
-
-        def split_parent_name(msg_or_enum)
-          name = msg_or_enum.name
-          idx = name.rindex(?.)
-          if idx
-            return name[0...idx], name[idx+1..-1]
-          else
-            return nil, name
-          end
-        end
-
-        def get_parent_msg(msgs_by_name, name, parent_name)
-          parent_msg = msgs_by_name[parent_name]
-          if parent_msg.nil?
-            raise "To define name #{name}, there must be a message named #{parent_name} to enclose it"
-          end
-          return parent_msg
-        end
-
-        def fix_nesting
-          # Calculate and update package.
-          msgs_by_name = @file_proto.message_type.map { |msg| [msg.name, msg] }.to_h
-          enum_names = @file_proto.enum_type.map { |enum_proto| enum_proto.name }
-
-          package = infer_package(msgs_by_name.keys + enum_names)
-          if package
-            @file_proto.package = package
-          end
-
-          # Update nesting based on package.
-          final_msgs = Google::Protobuf::RepeatedField.new(:message, Google::Protobuf::DescriptorProto)
-          final_enums = Google::Protobuf::RepeatedField.new(:message, Google::Protobuf::EnumDescriptorProto)
-
-          # Note: We don't iterate over msgs_by_name.values because we want to
-          # preserve order as listed in the DSL.
-          @file_proto.message_type.each { |msg|
-            parent_name, msg.name = split_parent_name(msg)
-            if parent_name == package
-              final_msgs << msg
-            else
-              get_parent_msg(msgs_by_name, msg.name, parent_name).nested_type << msg
-            end
-          }
-
-          @file_proto.enum_type.each { |enum|
-            parent_name, enum.name = split_parent_name(enum)
-            if parent_name == package
-              final_enums << enum
-            else
-              get_parent_msg(msgs_by_name, enum.name, parent_name).enum_type << enum
-            end
-          }
-
-          @file_proto.message_type = final_msgs
-          @file_proto.enum_type = final_enums
-        end
-
-        def internal_file_proto
-          @file_proto
-        end
-
-        def build
-          rewrite_enum_defaults
-          fix_nesting
-          return @file_proto
-        end
-      end
-
-      class MessageBuilder
-        def initialize(name, file_builder, file_proto)
-          @file_builder = file_builder
-          @msg_proto = Google::Protobuf::DescriptorProto.new(
-            :name => name
-          )
-          file_proto.message_type << @msg_proto
-        end
-
-        def optional(name, type, number, type_class=nil, options=nil)
-          internal_add_field(:LABEL_OPTIONAL, name, type, number, type_class, options)
-        end
-
-        def proto3_optional(name, type, number, type_class=nil, options=nil)
-          internal_add_field(:LABEL_OPTIONAL, name, type, number, type_class, options,
-                             proto3_optional: true)
-        end
-
-        def required(name, type, number, type_class=nil, options=nil)
-          internal_add_field(:LABEL_REQUIRED, name, type, number, type_class, options)
-        end
-
-        def repeated(name, type, number, type_class = nil, options=nil)
-          internal_add_field(:LABEL_REPEATED, name, type, number, type_class, options)
-        end
-
-        def oneof(name, &block)
-          OneofBuilder.new(name, self).instance_eval(&block)
-        end
-
-        # Defines a new map field on this message type with the given key and
-        # value types, tag number, and type class (for message and enum value
-        # types). The key type must be :int32/:uint32/:int64/:uint64, :bool, or
-        # :string. The value type type must be a Ruby symbol (as accepted by
-        # FieldDescriptor#type=) and the type_class must be a string, if
-        # present (as accepted by FieldDescriptor#submsg_name=).
-        def map(name, key_type, value_type, number, value_type_class = nil)
-          if key_type == :float or key_type == :double or key_type == :enum or
-             key_type == :message
-            raise ArgError, "Not an acceptable key type: " + key_type
-          end
-          entry_name = "#{@msg_proto.name}_MapEntry_#{name}"
-
-          @file_builder.add_message entry_name do
-            optional :key, key_type, 1
-            optional :value, value_type, 2, value_type_class
-          end
-          options = @file_builder.internal_file_proto.message_type.last.options ||= MessageOptions.new
-          options.map_entry = true
-          repeated name, :message, number, entry_name
-        end
-
-        # ---- Internal methods, not part of the DSL ----
-
-        def internal_add_synthetic_oneofs
-          # We have to build a set of all names, to ensure that synthetic oneofs
-          # are not creating conflicts
-          names = {}
-          @msg_proto.field.each { |field| names[field.name] = true }
-          @msg_proto.oneof_decl.each { |oneof| names[oneof.name] = true }
-
-          @msg_proto.field.each { |field|
-            if field.proto3_optional
-              # Prepend '_' until we are no longer conflicting.
-              oneof_name = field.name
-              while names[oneof_name]
-                oneof_name = "_" + oneof_name
-              end
-              names[oneof_name] = true
-              field.oneof_index = @msg_proto.oneof_decl.size
-              @msg_proto.oneof_decl << Google::Protobuf::OneofDescriptorProto.new(
-                name: oneof_name
-              )
-            end
-          }
-        end
-
-        def internal_add_field(label, name, type, number, type_class, options,
-                               oneof_index: nil, proto3_optional: false)
-          # Allow passing either:
-          # - (name, type, number, options) or
-          # - (name, type, number, type_class, options)
-          if options.nil? and type_class.instance_of?(Hash)
-            options = type_class;
-            type_class = nil;
-          end
-
-          field_proto = Google::Protobuf::FieldDescriptorProto.new(
-            :label => label,
-            :name => name,
-            :type => ("TYPE_" + type.to_s.upcase).to_sym,
-            :number => number
-          )
-
-          if type_class
-            # Make it an absolute type name by prepending a dot.
-            field_proto.type_name = "." + type_class
-          end
-
-          if oneof_index
-            field_proto.oneof_index = oneof_index
-          end
-
-          if proto3_optional
-            field_proto.proto3_optional = true
-          end
-
-          if options
-            if options.key?(:default)
-              default = options[:default]
-              if !default.instance_of?(String)
-                # Call #to_s since all defaults are strings in the descriptor.
-                default = default.to_s
-              end
-              # XXX: we should be C-escaping bytes defaults.
-              field_proto.default_value = default.dup.force_encoding("UTF-8")
-            end
-            if options.key?(:json_name)
-              field_proto.json_name = options[:json_name]
-            end
-          end
-
-          @msg_proto.field << field_proto
-        end
-
-        def internal_msg_proto
-          @msg_proto
-        end
-      end
-
-      class OneofBuilder
-        def initialize(name, msg_builder)
-          @msg_builder = msg_builder
-          oneof_proto = Google::Protobuf::OneofDescriptorProto.new(
-            :name => name
-          )
-          msg_proto = msg_builder.internal_msg_proto
-          @oneof_index = msg_proto.oneof_decl.size
-          msg_proto.oneof_decl << oneof_proto
-        end
-
-        def optional(name, type, number, type_class=nil, options=nil)
-          @msg_builder.internal_add_field(
-              :LABEL_OPTIONAL, name, type, number, type_class, options,
-              oneof_index: @oneof_index)
-        end
-      end
-
-      class EnumBuilder
-        def initialize(name, file_proto)
-          @enum_proto = Google::Protobuf::EnumDescriptorProto.new(
-            :name => name
-          )
-          file_proto.enum_type << @enum_proto
-        end
-
-        def value(name, number)
-          enum_value_proto = Google::Protobuf::EnumValueDescriptorProto.new(
-            name: name,
-            number: number
-          )
-          @enum_proto.value << enum_value_proto
-        end
-      end
-
-    end
-
-    # Re-open the class (the rest of the class is implemented in C)
-    class DescriptorPool
-      def build(&block)
-        builder = Internal::Builder.new(self)
-        builder.instance_eval(&block)
-        builder.build
-      end
-    end
-  end
-end
diff --git a/libs/protobuf/ruby/lib/google/protobuf/message_exts.rb b/libs/protobuf/ruby/lib/google/protobuf/message_exts.rb
deleted file mode 100644
index 6608521..0000000
--- a/libs/protobuf/ruby/lib/google/protobuf/message_exts.rb
+++ /dev/null
@@ -1,53 +0,0 @@
-# Protocol Buffers - Google's data interchange format
-# Copyright 2008 Google Inc.  All rights reserved.
-# https://developers.google.com/protocol-buffers/
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-module Google
-  module Protobuf
-    module MessageExts
-
-      #this is only called in jruby; mri loades the ClassMethods differently
-      def self.included(klass)
-        klass.extend(ClassMethods)
-      end
-
-      module ClassMethods
-      end
-
-      def to_json(options = {})
-        self.class.encode_json(self, options)
-      end
-
-      def to_proto(options = {})
-        self.class.encode(self, options)
-      end
-
-    end
-  end
-end
diff --git a/libs/protobuf/ruby/lib/google/protobuf/repeated_field.rb b/libs/protobuf/ruby/lib/google/protobuf/repeated_field.rb
deleted file mode 100644
index 13b9300..0000000
--- a/libs/protobuf/ruby/lib/google/protobuf/repeated_field.rb
+++ /dev/null
@@ -1,201 +0,0 @@
-# Protocol Buffers - Google's data interchange format
-# Copyright 2008 Google Inc.  All rights reserved.
-# https://developers.google.com/protocol-buffers/
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-require 'forwardable'
-
-#
-# This class makes RepeatedField act (almost-) like a Ruby Array.
-# It has convenience methods that extend the core C or Java based
-# methods.
-#
-# This is a best-effort to mirror Array behavior.  Two comments:
-#  1) patches always welcome :)
-#  2) if performance is an issue, feel free to rewrite the method
-#     in jruby and C.  The source code has plenty of examples
-#
-# KNOWN ISSUES
-#   - #[]= doesn't allow less used approaches such as `arr[1, 2] = 'fizz'`
-#   - #concat should return the orig array
-#   - #push should accept multiple arguments and push them all at the same time
-#
-module Google
-  module Protobuf
-    class RepeatedField
-      extend Forwardable
-
-      # methods defined in C or Java:
-      #   +
-      #   [], at
-      #   []=
-      #   concat
-      #   clear
-      #   dup, clone
-      #   each
-      #   push, <<
-      #   replace
-      #   length, size
-      #   ==
-      #   to_ary, to_a
-      #   also all enumerable
-      #
-      # NOTE:  using delegators rather than method_missing to make the
-      #        relationship explicit instead of implicit
-      def_delegators :to_ary,
-        :&, :*, :-, :'<=>',
-        :assoc, :bsearch, :bsearch_index, :combination, :compact, :count,
-        :cycle, :dig, :drop, :drop_while, :eql?, :fetch, :find_index, :flatten,
-        :include?, :index, :inspect, :join,
-        :pack, :permutation, :product, :pretty_print, :pretty_print_cycle,
-        :rassoc, :repeated_combination, :repeated_permutation, :reverse,
-        :rindex, :rotate, :sample, :shuffle, :shelljoin,
-        :to_s, :transpose, :uniq, :|
-
-
-      def first(n=nil)
-        if n.nil?
-          return self[0]
-        elsif n < 0
-          raise ArgumentError, "negative array size"
-        else
-          return self[0...n]
-        end
-      end
-
-
-      def last(n=nil)
-        if n.nil?
-          return self[-1]
-        elsif n < 0
-          raise ArgumentError, "negative array size"
-        else
-          start = [self.size-n, 0].max
-          return self[start...self.size]
-        end
-      end
-
-
-      def pop(n=nil)
-        if n
-          results = []
-          n.times{ results << pop_one }
-          return results
-        else
-          return pop_one
-        end
-      end
-
-
-      def empty?
-        self.size == 0
-      end
-
-      # array aliases into enumerable
-      alias_method :each_index, :each_with_index
-      alias_method :slice, :[]
-      alias_method :values_at, :select
-      alias_method :map, :collect
-
-
-      class << self
-        def define_array_wrapper_method(method_name)
-          define_method(method_name) do |*args, &block|
-            arr = self.to_a
-            result = arr.send(method_name, *args)
-            self.replace(arr)
-            return result if result
-            return block ? block.call : result
-          end
-        end
-        private :define_array_wrapper_method
-
-
-        def define_array_wrapper_with_result_method(method_name)
-          define_method(method_name) do |*args, &block|
-            # result can be an Enumerator, Array, or nil
-            # Enumerator can sometimes be returned if a block is an optional argument and it is not passed in
-            # nil usually specifies that no change was made
-            result = self.to_a.send(method_name, *args, &block)
-            if result
-              new_arr = result.to_a
-              self.replace(new_arr)
-              if result.is_a?(Enumerator)
-                # generate a fresh enum; rewinding the exiting one, in Ruby 2.2, will
-                # reset the enum with the same length, but all the #next calls will
-                # return nil
-                result = new_arr.to_enum
-                # generate a wrapper enum so any changes which occur by a chained
-                # enum can be captured
-                ie = ProxyingEnumerator.new(self, result)
-                result = ie.to_enum
-              end
-            end
-            result
-          end
-        end
-        private :define_array_wrapper_with_result_method
-      end
-
-
-      %w(delete delete_at shift slice! unshift).each do |method_name|
-        define_array_wrapper_method(method_name)
-      end
-
-
-      %w(collect! compact! delete_if fill flatten! insert reverse!
-        rotate! select! shuffle! sort! sort_by! uniq!).each do |method_name|
-        define_array_wrapper_with_result_method(method_name)
-      end
-      alias_method :keep_if, :select!
-      alias_method :map!, :collect!
-      alias_method :reject!, :delete_if
-
-
-      # propagates changes made by user of enumerator back to the original repeated field.
-      # This only applies in cases where the calling function which created the enumerator,
-      # such as #sort!, modifies itself rather than a new array, such as #sort
-      class ProxyingEnumerator < Struct.new(:repeated_field, :external_enumerator)
-        def each(*args, &block)
-          results = []
-          external_enumerator.each_with_index do |val, i|
-            result = yield(val)
-            results << result
-            #nil means no change occurred from yield; usually occurs when #to_a is called
-            if result
-              repeated_field[i] = result if result != val
-            end
-          end
-          results
-        end
-      end
-
-
-    end
-  end
-end
diff --git a/libs/protobuf/ruby/lib/google/protobuf/well_known_types.rb b/libs/protobuf/ruby/lib/google/protobuf/well_known_types.rb
deleted file mode 100755
index 2d06ca2..0000000
--- a/libs/protobuf/ruby/lib/google/protobuf/well_known_types.rb
+++ /dev/null
@@ -1,240 +0,0 @@
-#!/usr/bin/ruby
-# Protocol Buffers - Google's data interchange format
-# Copyright 2008 Google Inc.  All rights reserved.
-# https://developers.google.com/protocol-buffers/
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-require 'google/protobuf/any_pb'
-require 'google/protobuf/duration_pb'
-require 'google/protobuf/field_mask_pb'
-require 'google/protobuf/struct_pb'
-require 'google/protobuf/timestamp_pb'
-
-module Google
-  module Protobuf
-
-    Any.class_eval do
-      def self.pack(msg, type_url_prefix='type.googleapis.com/')
-        any = self.new
-        any.pack(msg, type_url_prefix)
-        any
-      end
-
-      def pack(msg, type_url_prefix='type.googleapis.com/')
-        if type_url_prefix.empty? or type_url_prefix[-1] != '/' then
-          self.type_url = "#{type_url_prefix}/#{msg.class.descriptor.name}"
-        else
-          self.type_url = "#{type_url_prefix}#{msg.class.descriptor.name}"
-        end
-        self.value = msg.to_proto
-      end
-
-      def unpack(klass)
-        if self.is(klass) then
-          klass.decode(self.value)
-        else
-          nil
-        end
-      end
-
-      def type_name
-        return self.type_url.split("/")[-1]
-      end
-
-      def is(klass)
-        return self.type_name == klass.descriptor.name
-      end
-    end
-
-    Timestamp.class_eval do
-      if RUBY_VERSION < "2.5"
-        def to_time
-          Time.at(self.to_f)
-        end
-      else
-        def to_time
-          Time.at(seconds, nanos, :nanosecond)
-        end
-      end
-
-      def self.from_time(time)
-        new.from_time(time)
-      end
-
-      def from_time(time)
-        self.seconds = time.to_i
-        self.nanos = time.nsec
-        self
-      end
-
-      def to_i
-        self.seconds
-      end
-
-      def to_f
-        self.seconds + (self.nanos.quo(1_000_000_000))
-      end
-    end
-
-    Duration.class_eval do
-      def to_f
-        self.seconds + (self.nanos.to_f / 1_000_000_000)
-      end
-    end
-
-    class UnexpectedStructType < Google::Protobuf::Error; end
-
-    Value.class_eval do
-      def to_ruby(recursive = false)
-        case self.kind
-        when :struct_value
-          if recursive
-            self.struct_value.to_h
-          else
-            self.struct_value
-          end
-        when :list_value
-          if recursive
-            self.list_value.to_a
-          else
-            self.list_value
-          end
-        when :null_value
-          nil
-        when :number_value
-          self.number_value
-        when :string_value
-          self.string_value
-        when :bool_value
-          self.bool_value
-        else
-          raise UnexpectedStructType
-        end
-      end
-
-      def self.from_ruby(value)
-        self.new.from_ruby(value)
-      end
-
-      def from_ruby(value)
-        case value
-        when NilClass
-          self.null_value = :NULL_VALUE
-        when Numeric
-          self.number_value = value
-        when String
-          self.string_value = value
-        when TrueClass
-          self.bool_value = true
-        when FalseClass
-          self.bool_value = false
-        when Struct
-          self.struct_value = value
-        when Hash
-          self.struct_value = Struct.from_hash(value)
-        when ListValue
-          self.list_value = value
-        when Array
-          self.list_value = ListValue.from_a(value)
-        else
-          raise UnexpectedStructType
-        end
-
-        self
-      end
-    end
-
-    Struct.class_eval do
-      def [](key)
-        self.fields[key].to_ruby
-      rescue NoMethodError
-        nil
-      end
-
-      def []=(key, value)
-        unless key.is_a?(String)
-          raise UnexpectedStructType, "Struct keys must be strings."
-        end
-        self.fields[key] ||= Google::Protobuf::Value.new
-        self.fields[key].from_ruby(value)
-      end
-
-      def to_h
-        ret = {}
-        self.fields.each { |key, val| ret[key] = val.to_ruby(true) }
-        ret
-      end
-
-      def self.from_hash(hash)
-        ret = Struct.new
-        hash.each { |key, val| ret[key] = val }
-        ret
-      end
-
-      def has_key?(key)
-        self.fields.has_key?(key)
-      end
-    end
-
-    ListValue.class_eval do
-      include Enumerable
-
-      def length
-        self.values.length
-      end
-
-      def [](index)
-        self.values[index].to_ruby
-      end
-
-      def []=(index, value)
-        self.values[index].from_ruby(value)
-      end
-
-      def <<(value)
-        wrapper = Google::Protobuf::Value.new
-        wrapper.from_ruby(value)
-        self.values << wrapper
-      end
-
-      def each
-        self.values.each { |x| yield(x.to_ruby) }
-      end
-
-      def to_a
-        self.values.map { |x| x.to_ruby(true) }
-      end
-
-      def self.from_a(arr)
-        ret = ListValue.new
-        arr.each { |val| ret << val }
-        ret
-      end
-    end
-  end
-end
diff --git a/libs/protobuf/ruby/pom.xml b/libs/protobuf/ruby/pom.xml
deleted file mode 100644
index 68dadac..0000000
--- a/libs/protobuf/ruby/pom.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-      <groupId>com.google</groupId>
-      <artifactId>google</artifactId>
-      <version>1</version>
-    </parent>
-
-    <groupId>com.google.protobuf.jruby</groupId>
-    <artifactId>protobuf-jruby</artifactId>
-    <version>3.21.12</version>
-    <name>Protocol Buffer JRuby native extension</name>
-    <description>
-      Protocol Buffers are a way of encoding structured data in an efficient yet
-      extensible format.
-    </description>
-    <inceptionYear>2014</inceptionYear>
-    <url>https://developers.google.com/protocol-buffers/</url>
-    <licenses>
-      <license>
-        <name>BSD-3-Clause</name>
-        <url>https://opensource.org/licenses/BSD-3-Clause</url>
-        <distribution>repo</distribution>
-      </license>
-    </licenses>
-    <scm>
-      <url>https://github.com/protocolbuffers/protobuf</url>
-      <connection>
-        scm:git:https://github.com/protocolbuffers/protobuf.git
-      </connection>
-    </scm>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <ruby.sources>lib/google</ruby.sources>
-        <jar.finalName>protobuf_java</jar.finalName>
-    </properties>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <version>3.3.0</version>
-                <configuration>
-                    <finalName>${jar.finalName}</finalName>
-                    <outputDirectory>${ruby.sources}</outputDirectory>
-                    <appendAssemblyId>false</appendAssemblyId>
-                    <descriptorRefs>
-                        <descriptorRef>jar-with-dependencies</descriptorRef>
-                    </descriptorRefs>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>make-assembly</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-compiler-plugin</artifactId>
-              <version>3.8.1</version>
-              <configuration>
-                <source>1.8</source>
-                <target>1.8</target>
-              </configuration>
-            </plugin>
-        </plugins>
-    </build>
-    <dependencies>
-        <!-- Ordering of dependencies matters to update_version.py -->
-        <dependency>
-          <groupId>com.google.protobuf</groupId>
-          <artifactId>protobuf-java-util</artifactId>
-          <version>3.21.12</version>
-        </dependency>
-        <dependency>
-            <groupId>org.jruby</groupId>
-            <artifactId>jruby-complete</artifactId>
-            <version>9.2.20.1</version>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/libs/protobuf/ruby/src/main/java/com/google/protobuf/jruby/RubyDescriptor.java b/libs/protobuf/ruby/src/main/java/com/google/protobuf/jruby/RubyDescriptor.java
deleted file mode 100644
index b809253..0000000
--- a/libs/protobuf/ruby/src/main/java/com/google/protobuf/jruby/RubyDescriptor.java
+++ /dev/null
@@ -1,231 +0,0 @@
-/*
- * Protocol Buffers - Google's data interchange format
- * Copyright 2014 Google Inc.  All rights reserved.
- * https://developers.google.com/protocol-buffers/
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package com.google.protobuf.jruby;
-
-import com.google.protobuf.Descriptors.Descriptor;
-import com.google.protobuf.Descriptors.FieldDescriptor;
-import com.google.protobuf.Descriptors.OneofDescriptor;
-import java.util.HashMap;
-import java.util.Map;
-import org.jruby.*;
-import org.jruby.anno.JRubyClass;
-import org.jruby.anno.JRubyMethod;
-import org.jruby.runtime.Block;
-import org.jruby.runtime.Helpers;
-import org.jruby.runtime.ObjectAllocator;
-import org.jruby.runtime.ThreadContext;
-import org.jruby.runtime.builtin.IRubyObject;
-
-@JRubyClass(name = "Descriptor", include = "Enumerable")
-public class RubyDescriptor extends RubyObject {
-  public static void createRubyDescriptor(Ruby runtime) {
-    RubyModule protobuf = runtime.getClassFromPath("Google::Protobuf");
-    RubyClass cDescriptor =
-        protobuf.defineClassUnder(
-            "Descriptor",
-            runtime.getObject(),
-            new ObjectAllocator() {
-              @Override
-              public IRubyObject allocate(Ruby runtime, RubyClass klazz) {
-                return new RubyDescriptor(runtime, klazz);
-              }
-            });
-    cDescriptor.includeModule(runtime.getEnumerable());
-    cDescriptor.defineAnnotatedMethods(RubyDescriptor.class);
-    cFieldDescriptor = (RubyClass) runtime.getClassFromPath("Google::Protobuf::FieldDescriptor");
-    cOneofDescriptor = (RubyClass) runtime.getClassFromPath("Google::Protobuf::OneofDescriptor");
-  }
-
-  public RubyDescriptor(Ruby runtime, RubyClass klazz) {
-    super(runtime, klazz);
-  }
-
-  /*
-   * call-seq:
-   *     Descriptor.name => name
-   *
-   * Returns the name of this message type as a fully-qualified string (e.g.,
-   * My.Package.MessageType).
-   */
-  @JRubyMethod(name = "name")
-  public IRubyObject getName(ThreadContext context) {
-    return name;
-  }
-
-  /*
-   * call-seq:
-   *     Descriptor.lookup(name) => FieldDescriptor
-   *
-   * Returns the field descriptor for the field with the given name, if present,
-   * or nil if none.
-   */
-  @JRubyMethod
-  public IRubyObject lookup(ThreadContext context, IRubyObject fieldName) {
-    return Helpers.nullToNil(fieldDescriptors.get(fieldName), context.nil);
-  }
-
-  /*
-   * call-seq:
-   *     Descriptor.msgclass => message_klass
-   *
-   * Returns the Ruby class created for this message type. Valid only once the
-   * message type has been added to a pool.
-   */
-  @JRubyMethod
-  public IRubyObject msgclass(ThreadContext context) {
-    return klazz;
-  }
-
-  /*
-   * call-seq:
-   *     Descriptor.each(&block)
-   *
-   * Iterates over fields in this message type, yielding to the block on each one.
-   */
-  @JRubyMethod
-  public IRubyObject each(ThreadContext context, Block block) {
-    for (Map.Entry<IRubyObject, RubyFieldDescriptor> entry : fieldDescriptors.entrySet()) {
-      block.yield(context, entry.getValue());
-    }
-    return context.nil;
-  }
-
-  /*
-   * call-seq:
-   *    Descriptor.file_descriptor
-   *
-   * Returns the FileDescriptor object this message belongs to.
-   */
-  @JRubyMethod(name = "file_descriptor")
-  public IRubyObject getFileDescriptor(ThreadContext context) {
-    return RubyFileDescriptor.getRubyFileDescriptor(context, descriptor);
-  }
-
-  /*
-   * call-seq:
-   *     Descriptor.each_oneof(&block) => nil
-   *
-   * Invokes the given block for each oneof in this message type, passing the
-   * corresponding OneofDescriptor.
-   */
-  @JRubyMethod(name = "each_oneof")
-  public IRubyObject eachOneof(ThreadContext context, Block block) {
-    for (RubyOneofDescriptor oneofDescriptor : oneofDescriptors.values()) {
-      block.yieldSpecific(context, oneofDescriptor);
-    }
-    return context.nil;
-  }
-
-  /*
-   * call-seq:
-   *     Descriptor.lookup_oneof(name) => OneofDescriptor
-   *
-   * Returns the oneof descriptor for the oneof with the given name, if present,
-   * or nil if none.
-   */
-  @JRubyMethod(name = "lookup_oneof")
-  public IRubyObject lookupOneof(ThreadContext context, IRubyObject name) {
-    return Helpers.nullToNil(oneofDescriptors.get(Utils.symToString(name)), context.nil);
-  }
-
-  protected FieldDescriptor getField(String name) {
-    return descriptor.findFieldByName(name);
-  }
-
-  protected void setDescriptor(
-      ThreadContext context, Descriptor descriptor, RubyDescriptorPool pool) {
-    Ruby runtime = context.runtime;
-    Map<FieldDescriptor, RubyFieldDescriptor> cache = new HashMap();
-    this.descriptor = descriptor;
-
-    // Populate the field caches
-    fieldDescriptors = new HashMap<IRubyObject, RubyFieldDescriptor>();
-    oneofDescriptors = new HashMap<IRubyObject, RubyOneofDescriptor>();
-
-    for (FieldDescriptor fieldDescriptor : descriptor.getFields()) {
-      RubyFieldDescriptor fd =
-          (RubyFieldDescriptor) cFieldDescriptor.newInstance(context, Block.NULL_BLOCK);
-      fd.setDescriptor(context, fieldDescriptor, pool);
-      fieldDescriptors.put(runtime.newString(fieldDescriptor.getName()), fd);
-      cache.put(fieldDescriptor, fd);
-    }
-
-    for (OneofDescriptor oneofDescriptor : descriptor.getRealOneofs()) {
-      RubyOneofDescriptor ood =
-          (RubyOneofDescriptor) cOneofDescriptor.newInstance(context, Block.NULL_BLOCK);
-      ood.setDescriptor(context, oneofDescriptor, cache);
-      oneofDescriptors.put(runtime.newString(oneofDescriptor.getName()), ood);
-    }
-
-    // Make sure our class is built
-    this.klazz = buildClassFromDescriptor(context);
-  }
-
-  protected void setName(IRubyObject name) {
-    this.name = name;
-  }
-
-  private RubyClass buildClassFromDescriptor(ThreadContext context) {
-    Ruby runtime = context.runtime;
-
-    ObjectAllocator allocator =
-        new ObjectAllocator() {
-          @Override
-          public IRubyObject allocate(Ruby runtime, RubyClass klazz) {
-            return new RubyMessage(runtime, klazz, descriptor);
-          }
-        };
-
-    // rb_define_class_id
-    RubyClass klass = RubyClass.newClass(runtime, runtime.getObject());
-    klass.setAllocator(allocator);
-    klass.makeMetaClass(runtime.getObject().getMetaClass());
-    klass.inherit(runtime.getObject());
-    RubyModule messageExts = runtime.getClassFromPath("Google::Protobuf::MessageExts");
-    klass.include(new IRubyObject[] {messageExts});
-    klass.instance_variable_set(runtime.newString(Utils.DESCRIPTOR_INSTANCE_VAR), this);
-    klass.defineAnnotatedMethods(RubyMessage.class);
-    // Workaround for https://github.com/jruby/jruby/issues/7154
-    klass.searchMethod("respond_to?").setIsBuiltin(false);
-    return klass;
-  }
-
-  private static RubyClass cFieldDescriptor;
-  private static RubyClass cOneofDescriptor;
-
-  private Descriptor descriptor;
-  private IRubyObject name;
-  private Map<IRubyObject, RubyFieldDescriptor> fieldDescriptors;
-  private Map<IRubyObject, RubyOneofDescriptor> oneofDescriptors;
-  private RubyClass klazz;
-}
diff --git a/libs/protobuf/ruby/src/main/java/com/google/protobuf/jruby/RubyDescriptorPool.java b/libs/protobuf/ruby/src/main/java/com/google/protobuf/jruby/RubyDescriptorPool.java
deleted file mode 100644
index d65b412..0000000
--- a/libs/protobuf/ruby/src/main/java/com/google/protobuf/jruby/RubyDescriptorPool.java
+++ /dev/null
@@ -1,195 +0,0 @@
-/*
- * Protocol Buffers - Google's data interchange format
- * Copyright 2014 Google Inc.  All rights reserved.
- * https://developers.google.com/protocol-buffers/
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package com.google.protobuf.jruby;
-
-import com.google.protobuf.DescriptorProtos.FileDescriptorProto;
-import com.google.protobuf.Descriptors.Descriptor;
-import com.google.protobuf.Descriptors.DescriptorValidationException;
-import com.google.protobuf.Descriptors.EnumDescriptor;
-import com.google.protobuf.Descriptors.FileDescriptor;
-import com.google.protobuf.InvalidProtocolBufferException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import org.jruby.*;
-import org.jruby.anno.JRubyClass;
-import org.jruby.anno.JRubyMethod;
-import org.jruby.exceptions.RaiseException;
-import org.jruby.runtime.*;
-import org.jruby.runtime.builtin.IRubyObject;
-
-@JRubyClass(name = "DescriptorPool")
-public class RubyDescriptorPool extends RubyObject {
-  public static void createRubyDescriptorPool(Ruby runtime) {
-    RubyModule protobuf = runtime.getClassFromPath("Google::Protobuf");
-    RubyClass cDescriptorPool =
-        protobuf.defineClassUnder(
-            "DescriptorPool",
-            runtime.getObject(),
-            new ObjectAllocator() {
-              @Override
-              public IRubyObject allocate(Ruby runtime, RubyClass klazz) {
-                return new RubyDescriptorPool(runtime, klazz);
-              }
-            });
-
-    cDescriptorPool.defineAnnotatedMethods(RubyDescriptorPool.class);
-    descriptorPool =
-        (RubyDescriptorPool)
-            cDescriptorPool.newInstance(runtime.getCurrentContext(), Block.NULL_BLOCK);
-    cDescriptor = (RubyClass) runtime.getClassFromPath("Google::Protobuf::Descriptor");
-    cEnumDescriptor = (RubyClass) runtime.getClassFromPath("Google::Protobuf::EnumDescriptor");
-  }
-
-  public RubyDescriptorPool(Ruby runtime, RubyClass klazz) {
-    super(runtime, klazz);
-    this.fileDescriptors = new ArrayList<>();
-    this.symtab = new HashMap<IRubyObject, IRubyObject>();
-  }
-
-  @JRubyMethod
-  public IRubyObject build(ThreadContext context, Block block) {
-    RubyClass cBuilder =
-        (RubyClass) context.runtime.getClassFromPath("Google::Protobuf::Internal::Builder");
-    RubyBasicObject ctx = (RubyBasicObject) cBuilder.newInstance(context, this, Block.NULL_BLOCK);
-    ctx.instance_eval(context, block);
-    ctx.callMethod(context, "build"); // Needs to be called to support the deprecated syntax
-    return context.nil;
-  }
-
-  /*
-   * call-seq:
-   *     DescriptorPool.lookup(name) => descriptor
-   *
-   * Finds a Descriptor or EnumDescriptor by name and returns it, or nil if none
-   * exists with the given name.
-   *
-   * This currently lazy loads the ruby descriptor objects as they are requested.
-   * This allows us to leave the heavy lifting to the java library
-   */
-  @JRubyMethod
-  public IRubyObject lookup(ThreadContext context, IRubyObject name) {
-    return Helpers.nullToNil(symtab.get(name), context.nil);
-  }
-
-  /*
-   * call-seq:
-   *     DescriptorPool.generated_pool => descriptor_pool
-   *
-   * Class method that returns the global DescriptorPool. This is a singleton into
-   * which generated-code message and enum types are registered. The user may also
-   * register types in this pool for convenience so that they do not have to hold
-   * a reference to a private pool instance.
-   */
-  @JRubyMethod(meta = true, name = "generated_pool")
-  public static IRubyObject generatedPool(ThreadContext context, IRubyObject recv) {
-    return descriptorPool;
-  }
-
-  @JRubyMethod(required = 1)
-  public IRubyObject add_serialized_file(ThreadContext context, IRubyObject data) {
-    byte[] bin = data.convertToString().getBytes();
-    try {
-      FileDescriptorProto.Builder builder = FileDescriptorProto.newBuilder().mergeFrom(bin);
-      registerFileDescriptor(context, builder);
-    } catch (InvalidProtocolBufferException e) {
-      throw RaiseException.from(
-          context.runtime,
-          (RubyClass) context.runtime.getClassFromPath("Google::Protobuf::ParseError"),
-          e.getMessage());
-    }
-    return context.nil;
-  }
-
-  protected void registerFileDescriptor(
-      ThreadContext context, FileDescriptorProto.Builder builder) {
-    final FileDescriptor fd;
-    try {
-      fd = FileDescriptor.buildFrom(builder.build(), existingFileDescriptors());
-    } catch (DescriptorValidationException e) {
-      throw context.runtime.newRuntimeError(e.getMessage());
-    }
-
-    String packageName = fd.getPackage();
-    if (!packageName.isEmpty()) {
-      packageName = packageName + ".";
-    }
-
-    // Need to make sure enums are registered first in case anything references them
-    for (EnumDescriptor ed : fd.getEnumTypes()) registerEnumDescriptor(context, ed, packageName);
-    for (Descriptor message : fd.getMessageTypes())
-      registerDescriptor(context, message, packageName);
-
-    // Mark this as a loaded file
-    fileDescriptors.add(fd);
-  }
-
-  private void registerDescriptor(ThreadContext context, Descriptor descriptor, String parentPath) {
-    String fullName = parentPath + descriptor.getName();
-    String fullPath = fullName + ".";
-    RubyString name = context.runtime.newString(fullName);
-
-    RubyDescriptor des = (RubyDescriptor) cDescriptor.newInstance(context, Block.NULL_BLOCK);
-    des.setName(name);
-    des.setDescriptor(context, descriptor, this);
-    symtab.put(name, des);
-
-    // Need to make sure enums are registered first in case anything references them
-    for (EnumDescriptor ed : descriptor.getEnumTypes())
-      registerEnumDescriptor(context, ed, fullPath);
-    for (Descriptor message : descriptor.getNestedTypes())
-      registerDescriptor(context, message, fullPath);
-  }
-
-  private void registerEnumDescriptor(
-      ThreadContext context, EnumDescriptor descriptor, String parentPath) {
-    RubyString name = context.runtime.newString(parentPath + descriptor.getName());
-    RubyEnumDescriptor des =
-        (RubyEnumDescriptor) cEnumDescriptor.newInstance(context, Block.NULL_BLOCK);
-    des.setName(name);
-    des.setDescriptor(context, descriptor);
-    symtab.put(name, des);
-  }
-
-  private FileDescriptor[] existingFileDescriptors() {
-    return fileDescriptors.toArray(new FileDescriptor[fileDescriptors.size()]);
-  }
-
-  private static RubyClass cDescriptor;
-  private static RubyClass cEnumDescriptor;
-  private static RubyDescriptorPool descriptorPool;
-
-  private List<FileDescriptor> fileDescriptors;
-  private Map<IRubyObject, IRubyObject> symtab;
-}
diff --git a/libs/protobuf/ruby/src/main/java/com/google/protobuf/jruby/RubyEnum.java b/libs/protobuf/ruby/src/main/java/com/google/protobuf/jruby/RubyEnum.java
deleted file mode 100644
index 95d961e..0000000
--- a/libs/protobuf/ruby/src/main/java/com/google/protobuf/jruby/RubyEnum.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Protocol Buffers - Google's data interchange format
- * Copyright 2014 Google Inc.  All rights reserved.
- * https://developers.google.com/protocol-buffers/
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package com.google.protobuf.jruby;
-
-import org.jruby.RubyModule;
-import org.jruby.anno.JRubyMethod;
-import org.jruby.runtime.ThreadContext;
-import org.jruby.runtime.builtin.IRubyObject;
-
-public class RubyEnum {
-  /*
-   * call-seq:
-   *     Enum.lookup(number) => name
-   *
-   * This module method, provided on each generated enum module, looks up an enum
-   * value by number and returns its name as a Ruby symbol, or nil if not found.
-   */
-  @JRubyMethod(meta = true)
-  public static IRubyObject lookup(ThreadContext context, IRubyObject recv, IRubyObject number) {
-    RubyEnumDescriptor rubyEnumDescriptor = (RubyEnumDescriptor) getDescriptor(context, recv);
-    return rubyEnumDescriptor.numberToName(context, number);
-  }
-
-  /*
-   * call-seq:
-   *     Enum.resolve(name) => number
-   *
-   * This module method, provided on each generated enum module, looks up an enum
-   * value by name (as a Ruby symbol) and returns its name, or nil if not found.
-   */
-  @JRubyMethod(meta = true)
-  public static IRubyObject resolve(ThreadContext context, IRubyObject recv, IRubyObject name) {
-    RubyEnumDescriptor rubyEnumDescriptor = (RubyEnumDescriptor) getDescriptor(context, recv);
-    return rubyEnumDescriptor.nameToNumber(context, name);
-  }
-
-  /*
-   * call-seq:
-   *     Enum.descriptor
-   *
-   * This module method, provided on each generated enum module, returns the
-   * EnumDescriptor corresponding to this enum type.
-   */
-  @JRubyMethod(meta = true, name = "descriptor")
-  public static IRubyObject getDescriptor(ThreadContext context, IRubyObject recv) {
-    return ((RubyModule) recv).getInstanceVariable(Utils.DESCRIPTOR_INSTANCE_VAR);
-  }
-}
diff --git a/libs/protobuf/ruby/src/main/java/com/google/protobuf/jruby/RubyEnumDescriptor.java b/libs/protobuf/ruby/src/main/java/com/google/protobuf/jruby/RubyEnumDescriptor.java
deleted file mode 100644
index 0eb7c93..0000000
--- a/libs/protobuf/ruby/src/main/java/com/google/protobuf/jruby/RubyEnumDescriptor.java
+++ /dev/null
@@ -1,213 +0,0 @@
-/*
- * Protocol Buffers - Google's data interchange format
- * Copyright 2014 Google Inc.  All rights reserved.
- * https://developers.google.com/protocol-buffers/
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package com.google.protobuf.jruby;
-
-import com.google.protobuf.DescriptorProtos.EnumDescriptorProto;
-import com.google.protobuf.Descriptors.EnumDescriptor;
-import com.google.protobuf.Descriptors.EnumValueDescriptor;
-import com.google.protobuf.Descriptors.FileDescriptor;
-import org.jruby.Ruby;
-import org.jruby.RubyClass;
-import org.jruby.RubyModule;
-import org.jruby.RubyNumeric;
-import org.jruby.RubyObject;
-import org.jruby.anno.JRubyClass;
-import org.jruby.anno.JRubyMethod;
-import org.jruby.runtime.Block;
-import org.jruby.runtime.ObjectAllocator;
-import org.jruby.runtime.ThreadContext;
-import org.jruby.runtime.builtin.IRubyObject;
-
-@JRubyClass(name = "EnumDescriptor", include = "Enumerable")
-public class RubyEnumDescriptor extends RubyObject {
-  public static void createRubyEnumDescriptor(Ruby runtime) {
-    RubyModule mProtobuf = runtime.getClassFromPath("Google::Protobuf");
-    RubyClass cEnumDescriptor =
-        mProtobuf.defineClassUnder(
-            "EnumDescriptor",
-            runtime.getObject(),
-            new ObjectAllocator() {
-              @Override
-              public IRubyObject allocate(Ruby runtime, RubyClass klazz) {
-                return new RubyEnumDescriptor(runtime, klazz);
-              }
-            });
-    cEnumDescriptor.includeModule(runtime.getEnumerable());
-    cEnumDescriptor.defineAnnotatedMethods(RubyEnumDescriptor.class);
-  }
-
-  public RubyEnumDescriptor(Ruby runtime, RubyClass klazz) {
-    super(runtime, klazz);
-  }
-
-  /*
-   * call-seq:
-   *     EnumDescriptor.name => name
-   *
-   * Returns the name of this enum type.
-   */
-  @JRubyMethod(name = "name")
-  public IRubyObject getName(ThreadContext context) {
-    return this.name;
-  }
-
-  /*
-   * call-seq:
-   *     EnumDescriptor.each(&block)
-   *
-   * Iterates over key => value mappings in this enum's definition, yielding to
-   * the block with (key, value) arguments for each one.
-   */
-  @JRubyMethod
-  public IRubyObject each(ThreadContext context, Block block) {
-    Ruby runtime = context.runtime;
-    for (EnumValueDescriptor enumValueDescriptor : descriptor.getValues()) {
-      block.yield(
-          context,
-          runtime.newArray(
-              runtime.newSymbol(enumValueDescriptor.getName()),
-              runtime.newFixnum(enumValueDescriptor.getNumber())));
-    }
-    return context.nil;
-  }
-
-  /*
-   * call-seq:
-   *     EnumDescriptor.enummodule => module
-   *
-   * Returns the Ruby module corresponding to this enum type. Cannot be called
-   * until the enum descriptor has been added to a pool.
-   */
-  @JRubyMethod
-  public IRubyObject enummodule(ThreadContext context) {
-    return module;
-  }
-
-  /*
-   * call-seq:
-   *    EnumDescriptor.file_descriptor
-   *
-   * Returns the FileDescriptor object this enum belongs to.
-   */
-  @JRubyMethod(name = "file_descriptor")
-  public IRubyObject getFileDescriptor(ThreadContext context) {
-    return RubyFileDescriptor.getRubyFileDescriptor(context, descriptor);
-  }
-
-  public boolean isValidValue(ThreadContext context, IRubyObject value) {
-    EnumValueDescriptor enumValue;
-
-    if (Utils.isRubyNum(value)) {
-      enumValue = descriptor.findValueByNumberCreatingIfUnknown(RubyNumeric.num2int(value));
-    } else {
-      enumValue = descriptor.findValueByName(value.asJavaString());
-    }
-
-    return enumValue != null;
-  }
-
-  protected IRubyObject nameToNumber(ThreadContext context, IRubyObject name) {
-    EnumValueDescriptor value = descriptor.findValueByName(name.asJavaString());
-    return value == null ? context.nil : context.runtime.newFixnum(value.getNumber());
-  }
-
-  protected IRubyObject numberToName(ThreadContext context, IRubyObject number) {
-    EnumValueDescriptor value = descriptor.findValueByNumber(RubyNumeric.num2int(number));
-    return value == null ? context.nil : context.runtime.newSymbol(value.getName());
-  }
-
-  protected void setDescriptor(ThreadContext context, EnumDescriptor descriptor) {
-    this.descriptor = descriptor;
-    this.module = buildModuleFromDescriptor(context);
-  }
-
-  protected void setName(IRubyObject name) {
-    this.name = name;
-  }
-
-  private RubyModule buildModuleFromDescriptor(ThreadContext context) {
-    Ruby runtime = context.runtime;
-
-    RubyModule enumModule = RubyModule.newModule(runtime);
-    boolean defaultValueRequiredButNotFound =
-        descriptor.getFile().getSyntax() == FileDescriptor.Syntax.PROTO3;
-    for (EnumValueDescriptor value : descriptor.getValues()) {
-      String name = fixEnumConstantName(value.getName());
-      // Make sure it's a valid constant name before trying to create it
-      int ch = name.codePointAt(0);
-      if (Character.isUpperCase(ch)) {
-        enumModule.defineConstant(name, runtime.newFixnum(value.getNumber()));
-      } else {
-        runtime
-            .getWarnings()
-            .warn(
-                "Enum value "
-                    + name
-                    + " does not start with an uppercase letter as is required for Ruby"
-                    + " constants.");
-      }
-      if (value.getNumber() == 0) {
-        defaultValueRequiredButNotFound = false;
-      }
-    }
-
-    if (defaultValueRequiredButNotFound) {
-      throw Utils.createTypeError(
-          context, "Enum definition " + name + " does not contain a value for '0'");
-    }
-    enumModule.instance_variable_set(runtime.newString(Utils.DESCRIPTOR_INSTANCE_VAR), this);
-    enumModule.defineAnnotatedMethods(RubyEnum.class);
-    return enumModule;
-  }
-
-  private static String fixEnumConstantName(String name) {
-    if (name != null && name.length() > 0) {
-      int ch = name.codePointAt(0);
-      if (ch >= 'a' && ch <= 'z') {
-        // Protobuf enums can start with lowercase letters, while Ruby's constant should
-        // always start with uppercase letters. We tolerate this case by capitalizing
-        // the first character if possible.
-        return new StringBuilder()
-                .appendCodePoint(Character.toUpperCase(ch))
-                .append(name.substring(1))
-                .toString();
-      }
-    }
-    return name;
-  }
-
-  private EnumDescriptor descriptor;
-  private EnumDescriptorProto.Builder builder;
-  private IRubyObject name;
-  private RubyModule module;
-}
diff --git a/libs/protobuf/ruby/src/main/java/com/google/protobuf/jruby/RubyFieldDescriptor.java b/libs/protobuf/ruby/src/main/java/com/google/protobuf/jruby/RubyFieldDescriptor.java
deleted file mode 100644
index bc1fe0c..0000000
--- a/libs/protobuf/ruby/src/main/java/com/google/protobuf/jruby/RubyFieldDescriptor.java
+++ /dev/null
@@ -1,279 +0,0 @@
-/*
- * Protocol Buffers - Google's data interchange format
- * Copyright 2014 Google Inc.  All rights reserved.
- * https://developers.google.com/protocol-buffers/
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package com.google.protobuf.jruby;
-
-import com.google.protobuf.Descriptors.FieldDescriptor;
-import com.google.protobuf.Descriptors.FileDescriptor;
-import org.jruby.*;
-import org.jruby.anno.JRubyClass;
-import org.jruby.anno.JRubyMethod;
-import org.jruby.runtime.ObjectAllocator;
-import org.jruby.runtime.ThreadContext;
-import org.jruby.runtime.builtin.IRubyObject;
-
-@JRubyClass(name = "FieldDescriptor")
-public class RubyFieldDescriptor extends RubyObject {
-  public static void createRubyFieldDescriptor(Ruby runtime) {
-    RubyModule mProtobuf = runtime.getClassFromPath("Google::Protobuf");
-    RubyClass cFieldDescriptor =
-        mProtobuf.defineClassUnder(
-            "FieldDescriptor",
-            runtime.getObject(),
-            new ObjectAllocator() {
-              @Override
-              public IRubyObject allocate(Ruby runtime, RubyClass klazz) {
-                return new RubyFieldDescriptor(runtime, klazz);
-              }
-            });
-    cFieldDescriptor.defineAnnotatedMethods(RubyFieldDescriptor.class);
-  }
-
-  public RubyFieldDescriptor(Ruby runtime, RubyClass klazz) {
-    super(runtime, klazz);
-  }
-
-  /*
-   * call-seq:
-   *     FieldDescriptor.default => default
-   *
-   * Returns this field's default, as a Ruby object, or nil if not yet set.
-   */
-  // VALUE FieldDescriptor_default(VALUE _self) {
-  //   DEFINE_SELF(FieldDescriptor, self, _self);
-  //   return layout_get_default(self->fielddef);
-  // }
-
-  /*
-   * call-seq:
-   *     FieldDescriptor.label => label
-   *
-   * Returns this field's label (i.e., plurality), as a Ruby symbol.
-   *
-   * Valid field labels are:
-   *     :optional, :repeated
-   */
-  @JRubyMethod(name = "label")
-  public IRubyObject getLabel(ThreadContext context) {
-    if (label == null) {
-      calculateLabel(context);
-    }
-    return label;
-  }
-
-  /*
-   * call-seq:
-   *     FieldDescriptor.name => name
-   *
-   * Returns the name of this field as a Ruby String, or nil if it is not set.
-   */
-  @JRubyMethod(name = "name")
-  public IRubyObject getName(ThreadContext context) {
-    return this.name;
-  }
-
-  /*
-   * call-seq:
-   *     FieldDescriptor.subtype => message_or_enum_descriptor
-   *
-   * Returns the message or enum descriptor corresponding to this field's type if
-   * it is a message or enum field, respectively, or nil otherwise. Cannot be
-   * called *until* the containing message type is added to a pool (and thus
-   * resolved).
-   */
-  @JRubyMethod(name = "subtype")
-  public IRubyObject getSubtype(ThreadContext context) {
-    if (subtype == null) {
-      calculateSubtype(context);
-    }
-    return subtype;
-  }
-
-  /*
-   * call-seq:
-   *     FieldDescriptor.type => type
-   *
-   * Returns this field's type, as a Ruby symbol, or nil if not yet set.
-   *
-   * Valid field types are:
-   *     :int32, :int64, :uint32, :uint64, :float, :double, :bool, :string,
-   *     :bytes, :message.
-   */
-  @JRubyMethod(name = "type")
-  public IRubyObject getType(ThreadContext context) {
-    return Utils.fieldTypeToRuby(context, descriptor.getType());
-  }
-
-  /*
-   * call-seq:
-   *     FieldDescriptor.number => number
-   *
-   * Returns the tag number for this field.
-   */
-  @JRubyMethod(name = "number")
-  public IRubyObject getNumber(ThreadContext context) {
-    return this.number;
-  }
-
-  /*
-   * call-seq:
-   *     FieldDescriptor.submsg_name => submsg_name
-   *
-   * Returns the name of the message or enum type corresponding to this field, if
-   * it is a message or enum field (respectively), or nil otherwise. This type
-   * name will be resolved within the context of the pool to which the containing
-   * message type is added.
-   */
-  // VALUE FieldDescriptor_submsg_name(VALUE _self) {
-  //   DEFINE_SELF(FieldDescriptor, self, _self);
-  //   switch (upb_fielddef_type(self->fielddef)) {
-  //     case UPB_TYPE_ENUM:
-  //       return rb_str_new2(
-  //           upb_enumdef_fullname(upb_fielddef_enumsubdef(self->fielddef)));
-  //     case UPB_TYPE_MESSAGE:
-  //       return rb_str_new2(
-  //           upb_msgdef_fullname(upb_fielddef_msgsubdef(self->fielddef)));
-  //     default:
-  //       return Qnil;
-  //   }
-  // }
-  /*
-   * call-seq:
-   *     FieldDescriptor.submsg_name = submsg_name
-   *
-   * Sets the name of the message or enum type corresponding to this field, if it
-   * is a message or enum field (respectively). This type name will be resolved
-   * within the context of the pool to which the containing message type is added.
-   * Cannot be called on field that are not of message or enum type, or on fields
-   * that are part of a message type already added to a pool.
-   */
-  // @JRubyMethod(name = "submsg_name=")
-  // public IRubyObject setSubmsgName(ThreadContext context, IRubyObject name) {
-  //     this.builder.setTypeName("." + Utils.escapeIdentifier(name.asJavaString()));
-  //     return context.runtime.getNil();
-  // }
-
-  /*
-   * call-seq:
-   *     FieldDescriptor.clear(message)
-   *
-   * Clears the field from the message if it's set.
-   */
-  @JRubyMethod(name = "clear")
-  public IRubyObject clearValue(ThreadContext context, IRubyObject message) {
-    return ((RubyMessage) message).clearField(context, descriptor);
-  }
-
-  /*
-   * call-seq:
-   *     FieldDescriptor.get(message) => value
-   *
-   * Returns the value set for this field on the given message. Raises an
-   * exception if message is of the wrong type.
-   */
-  @JRubyMethod(name = "get")
-  public IRubyObject getValue(ThreadContext context, IRubyObject message) {
-    return ((RubyMessage) message).getField(context, descriptor);
-  }
-
-  /*
-   * call-seq:
-   *     FieldDescriptor.has?(message) => boolean
-   *
-   * Returns whether the value is set on the given message. Raises an
-   * exception when calling for fields that do not have presence.
-   */
-  @JRubyMethod(name = "has?")
-  public IRubyObject has(ThreadContext context, IRubyObject message) {
-    return ((RubyMessage) message).hasField(context, descriptor);
-  }
-
-  /*
-   * call-seq:
-   *     FieldDescriptor.set(message, value)
-   *
-   * Sets the value corresponding to this field to the given value on the given
-   * message. Raises an exception if message is of the wrong type. Performs the
-   * ordinary type-checks for field setting.
-   */
-  @JRubyMethod(name = "set")
-  public IRubyObject setValue(ThreadContext context, IRubyObject message, IRubyObject value) {
-    ((RubyMessage) message).setField(context, descriptor, value);
-    return context.nil;
-  }
-
-  protected void setDescriptor(
-      ThreadContext context, FieldDescriptor descriptor, RubyDescriptorPool pool) {
-    if (descriptor.isRequired()
-        && descriptor.getFile().getSyntax() == FileDescriptor.Syntax.PROTO3) {
-      throw Utils.createTypeError(
-          context,
-          descriptor.getName()
-              + " is labeled required but required fields are unsupported in proto3");
-    }
-    this.descriptor = descriptor;
-    this.name = context.runtime.newString(descriptor.getName());
-    this.pool = pool;
-  }
-
-  private void calculateLabel(ThreadContext context) {
-    if (descriptor.isRepeated()) {
-      this.label = context.runtime.newSymbol("repeated");
-    } else if (descriptor.isOptional()) {
-      this.label = context.runtime.newSymbol("optional");
-    } else {
-      this.label = context.nil;
-    }
-  }
-
-  private void calculateSubtype(ThreadContext context) {
-    FieldDescriptor.Type fdType = descriptor.getType();
-    if (fdType == FieldDescriptor.Type.MESSAGE) {
-      RubyString messageName = context.runtime.newString(descriptor.getMessageType().getFullName());
-      this.subtype = pool.lookup(context, messageName);
-    } else if (fdType == FieldDescriptor.Type.ENUM) {
-      RubyString enumName = context.runtime.newString(descriptor.getEnumType().getFullName());
-      this.subtype = pool.lookup(context, enumName);
-    } else {
-      this.subtype = context.nil;
-    }
-  }
-
-  private static final String DOT = ".";
-
-  private FieldDescriptor descriptor;
-  private IRubyObject name;
-  private IRubyObject label;
-  private IRubyObject number;
-  private IRubyObject subtype;
-  private RubyDescriptorPool pool;
-}
diff --git a/libs/protobuf/ruby/src/main/java/com/google/protobuf/jruby/RubyFileDescriptor.java b/libs/protobuf/ruby/src/main/java/com/google/protobuf/jruby/RubyFileDescriptor.java
deleted file mode 100644
index 972510b..0000000
--- a/libs/protobuf/ruby/src/main/java/com/google/protobuf/jruby/RubyFileDescriptor.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Protocol Buffers - Google's data interchange format
- * Copyright 2014 Google Inc.  All rights reserved.
- * https://developers.google.com/protocol-buffers/
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package com.google.protobuf.jruby;
-
-import com.google.protobuf.Descriptors.FileDescriptor;
-import com.google.protobuf.Descriptors.FileDescriptor.Syntax.*;
-import com.google.protobuf.Descriptors.GenericDescriptor;
-import org.jruby.*;
-import org.jruby.anno.JRubyClass;
-import org.jruby.anno.JRubyMethod;
-import org.jruby.runtime.Block;
-import org.jruby.runtime.ObjectAllocator;
-import org.jruby.runtime.ThreadContext;
-import org.jruby.runtime.builtin.IRubyObject;
-
-@JRubyClass(name = "FileDescriptor")
-public class RubyFileDescriptor extends RubyObject {
-  public static void createRubyFileDescriptor(Ruby runtime) {
-    RubyModule mProtobuf = runtime.getClassFromPath("Google::Protobuf");
-    cFileDescriptor =
-        mProtobuf.defineClassUnder(
-            "FileDescriptor",
-            runtime.getObject(),
-            new ObjectAllocator() {
-              @Override
-              public IRubyObject allocate(Ruby runtime, RubyClass klazz) {
-                return new RubyFileDescriptor(runtime, klazz);
-              }
-            });
-    cFileDescriptor.defineAnnotatedMethods(RubyFileDescriptor.class);
-  }
-
-  public static RubyFileDescriptor getRubyFileDescriptor(
-      ThreadContext context, GenericDescriptor descriptor) {
-    RubyFileDescriptor rfd =
-        (RubyFileDescriptor) cFileDescriptor.newInstance(context, Block.NULL_BLOCK);
-    rfd.fileDescriptor = descriptor.getFile();
-    return rfd;
-  }
-
-  public RubyFileDescriptor(Ruby runtime, RubyClass klazz) {
-    super(runtime, klazz);
-  }
-
-  /*
-   * call-seq:
-   *     FileDescriptor.name => name
-   *
-   * Returns the name of the file.
-   */
-  @JRubyMethod(name = "name")
-  public IRubyObject getName(ThreadContext context) {
-    String name = fileDescriptor.getName();
-    return name == null ? context.nil : context.runtime.newString(name);
-  }
-
-  /*
-   * call-seq:
-   *     FileDescriptor.syntax => syntax
-   *
-   * Returns this file descriptors syntax.
-   *
-   * Valid syntax versions are:
-   *     :proto2 or :proto3.
-   */
-  @JRubyMethod(name = "syntax")
-  public IRubyObject getSyntax(ThreadContext context) {
-    switch (fileDescriptor.getSyntax()) {
-      case PROTO2:
-        return context.runtime.newSymbol("proto2");
-      case PROTO3:
-        return context.runtime.newSymbol("proto3");
-      default:
-        return context.nil;
-    }
-  }
-
-  private static RubyClass cFileDescriptor;
-
-  private FileDescriptor fileDescriptor;
-}
diff --git a/libs/protobuf/ruby/src/main/java/com/google/protobuf/jruby/RubyMap.java b/libs/protobuf/ruby/src/main/java/com/google/protobuf/jruby/RubyMap.java
deleted file mode 100644
index 8727b13..0000000
--- a/libs/protobuf/ruby/src/main/java/com/google/protobuf/jruby/RubyMap.java
+++ /dev/null
@@ -1,487 +0,0 @@
-/*
- * Protocol Buffers - Google's data interchange format
- * Copyright 2014 Google Inc.  All rights reserved.
- * https://developers.google.com/protocol-buffers/
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package com.google.protobuf.jruby;
-
-import com.google.protobuf.Descriptors.FieldDescriptor;
-import com.google.protobuf.DynamicMessage;
-import java.nio.ByteBuffer;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import org.jruby.*;
-import org.jruby.anno.JRubyClass;
-import org.jruby.anno.JRubyMethod;
-import org.jruby.runtime.Block;
-import org.jruby.runtime.Helpers;
-import org.jruby.runtime.ObjectAllocator;
-import org.jruby.runtime.ThreadContext;
-import org.jruby.runtime.builtin.IRubyObject;
-
-@JRubyClass(name = "Map", include = "Enumerable")
-public class RubyMap extends RubyObject {
-  public static void createRubyMap(Ruby runtime) {
-    RubyModule protobuf = runtime.getClassFromPath("Google::Protobuf");
-    RubyClass cMap =
-        protobuf.defineClassUnder(
-            "Map",
-            runtime.getObject(),
-            new ObjectAllocator() {
-              @Override
-              public IRubyObject allocate(Ruby ruby, RubyClass rubyClass) {
-                return new RubyMap(ruby, rubyClass);
-              }
-            });
-    cMap.includeModule(runtime.getEnumerable());
-    cMap.defineAnnotatedMethods(RubyMap.class);
-  }
-
-  public RubyMap(Ruby ruby, RubyClass rubyClass) {
-    super(ruby, rubyClass);
-  }
-
-  /*
-   * call-seq:
-   *     Map.new(key_type, value_type, value_typeclass = nil, init_hashmap = {})
-   *     => new map
-   *
-   * Allocates a new Map container. This constructor may be called with 2, 3, or 4
-   * arguments. The first two arguments are always present and are symbols (taking
-   * on the same values as field-type symbols in message descriptors) that
-   * indicate the type of the map key and value fields.
-   *
-   * The supported key types are: :int32, :int64, :uint32, :uint64, :fixed32,
-   * :fixed64, :sfixed32, :sfixed64, :sint32, :sint64, :bool, :string, :bytes.
-   *
-   * The supported value types are: :int32, :int64, :uint32, :uint64, :fixed32,
-   * :fixed64, :sfixed32, :sfixed64, :sint32, :sint64, :bool, :string, :bytes,
-   * :enum, :message.
-   *
-   * The third argument, value_typeclass, must be present if value_type is :enum
-   * or :message. As in RepeatedField#new, this argument must be a message class
-   * (for :message) or enum module (for :enum).
-   *
-   * The last argument, if present, provides initial content for map. Note that
-   * this may be an ordinary Ruby hashmap or another Map instance with identical
-   * key and value types. Also note that this argument may be present whether or
-   * not value_typeclass is present (and it is unambiguously separate from
-   * value_typeclass because value_typeclass's presence is strictly determined by
-   * value_type). The contents of this initial hashmap or Map instance are
-   * shallow-copied into the new Map: the original map is unmodified, but
-   * references to underlying objects will be shared if the value type is a
-   * message type.
-   */
-  @JRubyMethod(required = 2, optional = 2)
-  public IRubyObject initialize(ThreadContext context, IRubyObject[] args) {
-    this.table = new HashMap<IRubyObject, IRubyObject>();
-    this.keyType = Utils.rubyToFieldType(args[0]);
-    this.valueType = Utils.rubyToFieldType(args[1]);
-
-    switch (keyType) {
-      case STRING:
-      case BYTES:
-        this.keyTypeIsString = true;
-        break;
-      case INT32:
-      case INT64:
-      case SINT32:
-      case SINT64:
-      case UINT32:
-      case UINT64:
-      case FIXED32:
-      case FIXED64:
-      case SFIXED32:
-      case SFIXED64:
-      case BOOL:
-        // These are OK.
-        break;
-      default:
-        throw context.runtime.newArgumentError("Invalid key type for map.");
-    }
-
-    int initValueArg = 2;
-    if (needTypeclass(this.valueType) && args.length > 2) {
-      this.valueTypeClass = args[2];
-      Utils.validateTypeClass(context, this.valueType, this.valueTypeClass);
-      initValueArg = 3;
-    } else {
-      this.valueTypeClass = context.runtime.getNilClass();
-    }
-
-    if (args.length > initValueArg) {
-      mergeIntoSelf(context, args[initValueArg]);
-    }
-    return this;
-  }
-
-  /*
-   * call-seq:
-   *     Map.[]=(key, value) => value
-   *
-   * Inserts or overwrites the value at the given key with the given new value.
-   * Throws an exception if the key type is incorrect. Returns the new value that
-   * was just inserted.
-   */
-  @JRubyMethod(name = "[]=")
-  public IRubyObject indexSet(ThreadContext context, IRubyObject key, IRubyObject value) {
-    checkFrozen();
-
-    /*
-     * String types for keys return a different error than
-     * other types for keys, so deal with them specifically first
-     */
-    if (keyTypeIsString && !(key instanceof RubySymbol || key instanceof RubyString)) {
-      throw Utils.createTypeError(context, "Expected string for map key");
-    }
-    key = Utils.checkType(context, keyType, "key", key, (RubyModule) valueTypeClass);
-    value = Utils.checkType(context, valueType, "value", value, (RubyModule) valueTypeClass);
-    IRubyObject symbol;
-    if (valueType == FieldDescriptor.Type.ENUM
-        && Utils.isRubyNum(value)
-        && !(symbol = RubyEnum.lookup(context, valueTypeClass, value)).isNil()) {
-      value = symbol;
-    }
-    this.table.put(key, value);
-    return value;
-  }
-
-  /*
-   * call-seq:
-   *     Map.[](key) => value
-   *
-   * Accesses the element at the given key. Throws an exception if the key type is
-   * incorrect. Returns nil when the key is not present in the map.
-   */
-  @JRubyMethod(name = "[]")
-  public IRubyObject index(ThreadContext context, IRubyObject key) {
-    key = Utils.symToString(key);
-    return Helpers.nullToNil(table.get(key), context.nil);
-  }
-
-  /*
-   * call-seq:
-   *     Map.==(other) => boolean
-   *
-   * Compares this map to another. Maps are equal if they have identical key sets,
-   * and for each key, the values in both maps compare equal. Elements are
-   * compared as per normal Ruby semantics, by calling their :== methods (or
-   * performing a more efficient comparison for primitive types).
-   *
-   * Maps with dissimilar key types or value types/typeclasses are never equal,
-   * even if value comparison (for example, between integers and floats) would
-   * have otherwise indicated that every element has equal value.
-   */
-  @JRubyMethod(name = "==")
-  public IRubyObject eq(ThreadContext context, IRubyObject _other) {
-    if (_other instanceof RubyHash) return singleLevelHash(context).op_equal(context, _other);
-    RubyMap other = (RubyMap) _other;
-    if (this == other) return context.runtime.getTrue();
-    if (!typeCompatible(other) || this.table.size() != other.table.size())
-      return context.runtime.getFalse();
-    for (IRubyObject key : table.keySet()) {
-      if (!other.table.containsKey(key)) return context.runtime.getFalse();
-      if (!other.table.get(key).equals(table.get(key))) return context.runtime.getFalse();
-    }
-    return context.runtime.getTrue();
-  }
-
-  /*
-   * call-seq:
-   *     Map.inspect => string
-   *
-   * Returns a string representing this map's elements. It will be formatted as
-   * "{key => value, key => value, ...}", with each key and value string
-   * representation computed by its own #inspect method.
-   */
-  @JRubyMethod
-  public IRubyObject inspect() {
-    return singleLevelHash(getRuntime().getCurrentContext()).inspect();
-  }
-
-  /*
-   * call-seq:
-   *     Map.hash => hash_value
-   *
-   * Returns a hash value based on this map's contents.
-   */
-  @JRubyMethod
-  public IRubyObject hash(ThreadContext context) {
-    try {
-      MessageDigest digest = MessageDigest.getInstance("SHA-256");
-      for (IRubyObject key : table.keySet()) {
-        digest.update((byte) key.hashCode());
-        digest.update((byte) table.get(key).hashCode());
-      }
-      return context.runtime.newFixnum(ByteBuffer.wrap(digest.digest()).getLong());
-    } catch (NoSuchAlgorithmException ignore) {
-      return context.runtime.newFixnum(System.identityHashCode(table));
-    }
-  }
-
-  /*
-   * call-seq:
-   *     Map.keys => [list_of_keys]
-   *
-   * Returns the list of keys contained in the map, in unspecified order.
-   */
-  @JRubyMethod
-  public IRubyObject keys(ThreadContext context) {
-    return RubyArray.newArray(context.runtime, table.keySet());
-  }
-
-  /*
-   * call-seq:
-   *     Map.values => [list_of_values]
-   *
-   * Returns the list of values contained in the map, in unspecified order.
-   */
-  @JRubyMethod
-  public IRubyObject values(ThreadContext context) {
-    return RubyArray.newArray(context.runtime, table.values());
-  }
-
-  /*
-   * call-seq:
-   *     Map.clear
-   *
-   * Removes all entries from the map.
-   */
-  @JRubyMethod
-  public IRubyObject clear(ThreadContext context) {
-    checkFrozen();
-    table.clear();
-    return context.nil;
-  }
-
-  /*
-   * call-seq:
-   *     Map.each(&block)
-   *
-   * Invokes &block on each |key, value| pair in the map, in unspecified order.
-   * Note that Map also includes Enumerable; map thus acts like a normal Ruby
-   * sequence.
-   */
-  @JRubyMethod
-  public IRubyObject each(ThreadContext context, Block block) {
-    for (IRubyObject key : table.keySet()) {
-      block.yieldSpecific(context, key, table.get(key));
-    }
-    return context.nil;
-  }
-
-  /*
-   * call-seq:
-   *     Map.delete(key) => old_value
-   *
-   * Deletes the value at the given key, if any, returning either the old value or
-   * nil if none was present. Throws an exception if the key is of the wrong type.
-   */
-  @JRubyMethod
-  public IRubyObject delete(ThreadContext context, IRubyObject key) {
-    checkFrozen();
-    return table.remove(key);
-  }
-
-  /*
-   * call-seq:
-   *     Map.has_key?(key) => bool
-   *
-   * Returns true if the given key is present in the map. Throws an exception if
-   * the key has the wrong type.
-   */
-  @JRubyMethod(name = "has_key?")
-  public IRubyObject hasKey(ThreadContext context, IRubyObject key) {
-    return this.table.containsKey(key) ? context.runtime.getTrue() : context.runtime.getFalse();
-  }
-
-  /*
-   * call-seq:
-   *     Map.length
-   *
-   * Returns the number of entries (key-value pairs) in the map.
-   */
-  @JRubyMethod(name = {"length", "size"})
-  public IRubyObject length(ThreadContext context) {
-    return context.runtime.newFixnum(this.table.size());
-  }
-
-  /*
-   * call-seq:
-   *     Map.dup => new_map
-   *
-   * Duplicates this map with a shallow copy. References to all non-primitive
-   * element objects (e.g., submessages) are shared.
-   */
-  @JRubyMethod
-  public IRubyObject dup(ThreadContext context) {
-    RubyMap newMap = newThisType(context);
-    for (Map.Entry<IRubyObject, IRubyObject> entry : table.entrySet()) {
-      newMap.table.put(entry.getKey(), entry.getValue());
-    }
-    return newMap;
-  }
-
-  @JRubyMethod(name = "to_h")
-  public RubyHash toHash(ThreadContext context) {
-    Map<IRubyObject, IRubyObject> mapForHash = new HashMap();
-
-    table.forEach(
-        (key, value) -> {
-          if (!value.isNil()) {
-            if (value.respondsTo("to_h")) {
-              value = Helpers.invoke(context, value, "to_h");
-            } else if (value.respondsTo("to_a")) {
-              value = Helpers.invoke(context, value, "to_a");
-            }
-            mapForHash.put(key, value);
-          }
-        });
-
-    return RubyHash.newHash(context.runtime, mapForHash, context.nil);
-  }
-
-  // Used by Google::Protobuf.deep_copy but not exposed directly.
-  protected IRubyObject deepCopy(ThreadContext context) {
-    RubyMap newMap = newThisType(context);
-    switch (valueType) {
-      case MESSAGE:
-        for (IRubyObject key : table.keySet()) {
-          RubyMessage message = (RubyMessage) table.get(key);
-          newMap.table.put(key.dup(), message.deepCopy(context));
-        }
-        break;
-      default:
-        for (IRubyObject key : table.keySet()) {
-          newMap.table.put(key.dup(), table.get(key).dup());
-        }
-    }
-    return newMap;
-  }
-
-  protected List<DynamicMessage> build(
-      ThreadContext context, RubyDescriptor descriptor, int depth, int recursionLimit) {
-    List<DynamicMessage> list = new ArrayList<DynamicMessage>();
-    RubyClass rubyClass = (RubyClass) descriptor.msgclass(context);
-    FieldDescriptor keyField = descriptor.getField("key");
-    FieldDescriptor valueField = descriptor.getField("value");
-    for (IRubyObject key : table.keySet()) {
-      RubyMessage mapMessage = (RubyMessage) rubyClass.newInstance(context, Block.NULL_BLOCK);
-      mapMessage.setField(context, keyField, key);
-      mapMessage.setField(context, valueField, table.get(key));
-      list.add(mapMessage.build(context, depth + 1, recursionLimit));
-    }
-    return list;
-  }
-
-  protected RubyMap mergeIntoSelf(final ThreadContext context, IRubyObject hashmap) {
-    if (hashmap instanceof RubyHash) {
-      ((RubyHash) hashmap)
-          .visitAll(
-              context,
-              new RubyHash.Visitor() {
-                @Override
-                public void visit(IRubyObject key, IRubyObject val) {
-                  if (val instanceof RubyHash && !valueTypeClass.isNil()) {
-                    val = ((RubyClass) valueTypeClass).newInstance(context, val, Block.NULL_BLOCK);
-                  }
-                  indexSet(context, key, val);
-                }
-              },
-              null);
-    } else if (hashmap instanceof RubyMap) {
-      RubyMap other = (RubyMap) hashmap;
-      if (!typeCompatible(other)) {
-        throw Utils.createTypeError(context, "Attempt to merge Map with mismatching types");
-      }
-    } else {
-      throw Utils.createTypeError(context, "Unknown type merging into Map");
-    }
-    return this;
-  }
-
-  protected boolean typeCompatible(RubyMap other) {
-    return this.keyType == other.keyType
-        && this.valueType == other.valueType
-        && this.valueTypeClass == other.valueTypeClass;
-  }
-
-  private RubyMap newThisType(ThreadContext context) {
-    RubyMap newMap;
-    if (needTypeclass(valueType)) {
-      newMap =
-          (RubyMap)
-              metaClass.newInstance(
-                  context,
-                  Utils.fieldTypeToRuby(context, keyType),
-                  Utils.fieldTypeToRuby(context, valueType),
-                  valueTypeClass,
-                  Block.NULL_BLOCK);
-    } else {
-      newMap =
-          (RubyMap)
-              metaClass.newInstance(
-                  context,
-                  Utils.fieldTypeToRuby(context, keyType),
-                  Utils.fieldTypeToRuby(context, valueType),
-                  Block.NULL_BLOCK);
-    }
-    newMap.table = new HashMap<IRubyObject, IRubyObject>();
-    return newMap;
-  }
-
-  /*
-   * toHash calls toHash on values, for some camparisons we only need
-   * a hash with the original objects still as values
-   */
-  private RubyHash singleLevelHash(ThreadContext context) {
-    return RubyHash.newHash(context.runtime, table, context.nil);
-  }
-
-  private boolean needTypeclass(FieldDescriptor.Type type) {
-    switch (type) {
-      case MESSAGE:
-      case ENUM:
-        return true;
-      default:
-        return false;
-    }
-  }
-
-  private FieldDescriptor.Type keyType;
-  private FieldDescriptor.Type valueType;
-  private IRubyObject valueTypeClass;
-  private Map<IRubyObject, IRubyObject> table;
-  private boolean keyTypeIsString = false;
-}
diff --git a/libs/protobuf/ruby/src/main/java/com/google/protobuf/jruby/RubyMessage.java b/libs/protobuf/ruby/src/main/java/com/google/protobuf/jruby/RubyMessage.java
deleted file mode 100644
index 301b957..0000000
--- a/libs/protobuf/ruby/src/main/java/com/google/protobuf/jruby/RubyMessage.java
+++ /dev/null
@@ -1,1464 +0,0 @@
-/*
- * Protocol Buffers - Google's data interchange format
- * Copyright 2014 Google Inc.  All rights reserved.
- * https://developers.google.com/protocol-buffers/
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package com.google.protobuf.jruby;
-
-import com.google.protobuf.ByteString;
-import com.google.protobuf.CodedInputStream;
-import com.google.protobuf.Descriptors.Descriptor;
-import com.google.protobuf.Descriptors.EnumDescriptor;
-import com.google.protobuf.Descriptors.EnumValueDescriptor;
-import com.google.protobuf.Descriptors.FieldDescriptor;
-import com.google.protobuf.Descriptors.FileDescriptor;
-import com.google.protobuf.Descriptors.OneofDescriptor;
-import com.google.protobuf.DynamicMessage;
-import com.google.protobuf.InvalidProtocolBufferException;
-import com.google.protobuf.Message;
-import com.google.protobuf.UnknownFieldSet;
-import com.google.protobuf.util.JsonFormat;
-import java.nio.ByteBuffer;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import org.jruby.*;
-import org.jruby.anno.JRubyMethod;
-import org.jruby.exceptions.RaiseException;
-import org.jruby.runtime.Block;
-import org.jruby.runtime.Helpers;
-import org.jruby.runtime.ThreadContext;
-import org.jruby.runtime.builtin.IRubyObject;
-import org.jruby.util.ByteList;
-
-public class RubyMessage extends RubyObject {
-  private final String DEFAULT_VALUE = "google.protobuf.FieldDescriptorProto.default_value";
-  private final String TYPE = "type";
-
-  public RubyMessage(Ruby runtime, RubyClass klazz, Descriptor descriptor) {
-    super(runtime, klazz);
-
-    this.descriptor = descriptor;
-    this.cRepeatedField = (RubyClass) runtime.getClassFromPath("Google::Protobuf::RepeatedField");
-    this.cMap = (RubyClass) runtime.getClassFromPath("Google::Protobuf::Map");
-    this.builder = DynamicMessage.newBuilder(descriptor);
-    this.fields = new HashMap<FieldDescriptor, IRubyObject>();
-    this.oneofCases = new HashMap<OneofDescriptor, FieldDescriptor>();
-    this.proto3 = descriptor.getFile().getSyntax() == FileDescriptor.Syntax.PROTO3;
-  }
-
-  /*
-   * call-seq:
-   *     Message.new(kwargs) => new_message
-   *
-   * Creates a new instance of the given message class. Keyword arguments may be
-   * provided with keywords corresponding to field names.
-   *
-   * Note that no literal Message class exists. Only concrete classes per message
-   * type exist, as provided by the #msgclass method on Descriptors after they
-   * have been added to a pool. The method definitions described here on the
-   * Message class are provided on each concrete message class.
-   */
-  @JRubyMethod(optional = 1)
-  public IRubyObject initialize(final ThreadContext context, IRubyObject[] args) {
-    final Ruby runtime = context.runtime;
-    if (args.length == 1) {
-      if (!(args[0] instanceof RubyHash)) {
-        throw runtime.newArgumentError("expected Hash arguments.");
-      }
-      RubyHash hash = args[0].convertToHash();
-      hash.visitAll(
-          context,
-          new RubyHash.Visitor() {
-            @Override
-            public void visit(IRubyObject key, IRubyObject value) {
-              if (!(key instanceof RubySymbol) && !(key instanceof RubyString)) {
-                throw Utils.createTypeError(
-                    context, "Expected string or symbols as hash keys in initialization map.");
-              }
-              final FieldDescriptor fieldDescriptor =
-                  findField(context, key, ignoreUnknownFieldsOnInit);
-
-              if (value == null || value.isNil()) return;
-
-              if (fieldDescriptor.isMapField()) {
-                if (!(value instanceof RubyHash))
-                  throw runtime.newArgumentError(
-                      "Expected Hash object as initializer value for map field '"
-                          + key.asJavaString()
-                          + "' (given "
-                          + value.getMetaClass()
-                          + ").");
-
-                final RubyMap map = newMapForField(context, fieldDescriptor);
-                map.mergeIntoSelf(context, value);
-                fields.put(fieldDescriptor, map);
-              } else if (fieldDescriptor.isRepeated()) {
-                if (!(value instanceof RubyArray))
-                  throw runtime.newArgumentError(
-                      "Expected array as initializer value for repeated field '"
-                          + key.asJavaString()
-                          + "' (given "
-                          + value.getMetaClass()
-                          + ").");
-                fields.put(fieldDescriptor, rubyToRepeatedField(context, fieldDescriptor, value));
-              } else {
-                OneofDescriptor oneof = fieldDescriptor.getContainingOneof();
-                if (oneof != null) {
-                  oneofCases.put(oneof, fieldDescriptor);
-                }
-
-                if (value instanceof RubyHash
-                    && fieldDescriptor.getType() == FieldDescriptor.Type.MESSAGE) {
-                  RubyDescriptor descriptor =
-                      (RubyDescriptor) getDescriptorForField(context, fieldDescriptor);
-                  RubyClass typeClass = (RubyClass) descriptor.msgclass(context);
-                  value = (IRubyObject) typeClass.newInstance(context, value, Block.NULL_BLOCK);
-                  fields.put(fieldDescriptor, value);
-                } else {
-                  indexSet(context, key, value);
-                }
-              }
-            }
-          },
-          null);
-    }
-    return this;
-  }
-
-  /*
-   * call-seq:
-   *     Message.[]=(index, value)
-   *
-   * Sets a field's value by field name. The provided field name should be a
-   * string.
-   */
-  @JRubyMethod(name = "[]=")
-  public IRubyObject indexSet(ThreadContext context, IRubyObject fieldName, IRubyObject value) {
-    FieldDescriptor fieldDescriptor = findField(context, fieldName);
-    return setFieldInternal(context, fieldDescriptor, value);
-  }
-
-  /*
-   * call-seq:
-   *     Message.[](index) => value
-   *
-   * Accesses a field's value by field name. The provided field name should be a
-   * string.
-   */
-  @JRubyMethod(name = "[]")
-  public IRubyObject index(ThreadContext context, IRubyObject fieldName) {
-    FieldDescriptor fieldDescriptor = findField(context, fieldName);
-    return getFieldInternal(context, fieldDescriptor);
-  }
-
-  /*
-   * call-seq:
-   *     Message.inspect => string
-   *
-   * Returns a human-readable string representing this message. It will be
-   * formatted as "<MessageType: field1: value1, field2: value2, ...>". Each
-   * field's value is represented according to its own #inspect method.
-   */
-  @JRubyMethod(name = {"inspect", "to_s"})
-  public IRubyObject inspect() {
-    ThreadContext context = getRuntime().getCurrentContext();
-    String cname = metaClass.getName();
-    String colon = ": ";
-    String comma = ", ";
-    StringBuilder sb = new StringBuilder("<");
-    boolean addComma = false;
-
-    sb.append(cname).append(colon);
-
-    for (FieldDescriptor fd : descriptor.getFields()) {
-      if (fd.hasPresence() && !fields.containsKey(fd)) {
-        continue;
-      }
-      if (addComma) {
-        sb.append(comma);
-      } else {
-        addComma = true;
-      }
-
-      sb.append(fd.getName()).append(colon);
-
-      IRubyObject value = getFieldInternal(context, fd);
-      if (value instanceof RubyBoolean) {
-        // Booleans don't implement internal "inspect" methods so have to call handle them manually
-        sb.append(value.isTrue() ? "true" : "false");
-      } else {
-        sb.append(value.inspect());
-      }
-    }
-    sb.append(">");
-
-    return context.runtime.newString(sb.toString());
-  }
-
-  /*
-   * call-seq:
-   *     Message.hash => hash_value
-   *
-   * Returns a hash value that represents this message's field values.
-   */
-  @JRubyMethod
-  public IRubyObject hash(ThreadContext context) {
-    try {
-      MessageDigest digest = MessageDigest.getInstance("SHA-256");
-      for (FieldDescriptor fd : descriptor.getFields()) {
-        digest.update((byte) getFieldInternal(context, fd).hashCode());
-      }
-      return context.runtime.newFixnum(ByteBuffer.wrap(digest.digest()).getLong());
-    } catch (NoSuchAlgorithmException ignore) {
-      return context.runtime.newFixnum(System.identityHashCode(this));
-    }
-  }
-
-  /*
-   * call-seq:
-   *     Message.==(other) => boolean
-   *
-   * Performs a deep comparison of this message with another. Messages are equal
-   * if they have the same type and if each field is equal according to the :==
-   * method's semantics (a more efficient comparison may actually be done if the
-   * field is of a primitive type).
-   */
-  @JRubyMethod(name = {"==", "eql?"})
-  public IRubyObject eq(ThreadContext context, IRubyObject other) {
-    Ruby runtime = context.runtime;
-    if (!(other instanceof RubyMessage)) return runtime.getFalse();
-    RubyMessage message = (RubyMessage) other;
-    if (descriptor != message.descriptor) {
-      return runtime.getFalse();
-    }
-
-    for (FieldDescriptor fdef : descriptor.getFields()) {
-      IRubyObject thisVal = getFieldInternal(context, fdef);
-      IRubyObject thatVal = message.getFieldInternal(context, fdef);
-      IRubyObject ret = thisVal.callMethod(context, "==", thatVal);
-      if (!ret.isTrue()) {
-        return runtime.getFalse();
-      }
-    }
-    return runtime.getTrue();
-  }
-
-  /*
-   * call-seq:
-   *     Message.respond_to?(method_name, search_private_and_protected) => boolean
-   *
-   *  Parallels method_missing, returning true when this object implements a method with the given
-   *  method_name.
-   */
-  @JRubyMethod(name = "respond_to?", required = 1, optional = 1)
-  public IRubyObject respondTo(ThreadContext context, IRubyObject[] args) {
-    String methodName = args[0].asJavaString();
-    if (descriptor.findFieldByName(methodName) != null) {
-      return context.runtime.getTrue();
-    }
-    RubyDescriptor rubyDescriptor = (RubyDescriptor) getDescriptor(context, metaClass);
-    IRubyObject oneofDescriptor = rubyDescriptor.lookupOneof(context, args[0]);
-    if (!oneofDescriptor.isNil()) {
-      return context.runtime.getTrue();
-    }
-    if (methodName.startsWith(CLEAR_PREFIX)) {
-      String strippedMethodName = methodName.substring(6);
-      oneofDescriptor =
-          rubyDescriptor.lookupOneof(context, context.runtime.newSymbol(strippedMethodName));
-      if (!oneofDescriptor.isNil()) {
-        return context.runtime.getTrue();
-      }
-
-      if (descriptor.findFieldByName(strippedMethodName) != null) {
-        return context.runtime.getTrue();
-      }
-    }
-    if (methodName.startsWith(HAS_PREFIX) && methodName.endsWith(QUESTION_MARK)) {
-      String strippedMethodName = methodName.substring(4, methodName.length() - 1);
-      FieldDescriptor fieldDescriptor = descriptor.findFieldByName(strippedMethodName);
-      if (fieldDescriptor != null
-          && (!proto3
-              || fieldDescriptor.getContainingOneof() == null
-              || fieldDescriptor.getContainingOneof().isSynthetic())
-          && fieldDescriptor.hasPresence()) {
-        return context.runtime.getTrue();
-      }
-      oneofDescriptor =
-          rubyDescriptor.lookupOneof(
-              context, RubyString.newString(context.runtime, strippedMethodName));
-      if (!oneofDescriptor.isNil()) {
-        return context.runtime.getTrue();
-      }
-    }
-    if (methodName.endsWith(AS_VALUE_SUFFIX)) {
-      FieldDescriptor fieldDescriptor =
-          descriptor.findFieldByName(methodName.substring(0, methodName.length() - 9));
-      if (fieldDescriptor != null && isWrappable(fieldDescriptor)) {
-        return context.runtime.getTrue();
-      }
-    }
-    if (methodName.endsWith(CONST_SUFFIX)) {
-      FieldDescriptor fieldDescriptor =
-          descriptor.findFieldByName(methodName.substring(0, methodName.length() - 6));
-      if (fieldDescriptor != null) {
-        if (fieldDescriptor.getType() == FieldDescriptor.Type.ENUM) {
-          return context.runtime.getTrue();
-        }
-      }
-    }
-    if (methodName.endsWith(Utils.EQUAL_SIGN)) {
-      String strippedMethodName = methodName.substring(0, methodName.length() - 1);
-      FieldDescriptor fieldDescriptor = descriptor.findFieldByName(strippedMethodName);
-      if (fieldDescriptor != null) {
-        return context.runtime.getTrue();
-      }
-      if (strippedMethodName.endsWith(AS_VALUE_SUFFIX)) {
-        strippedMethodName = methodName.substring(0, strippedMethodName.length() - 9);
-        fieldDescriptor = descriptor.findFieldByName(strippedMethodName);
-        if (fieldDescriptor != null && isWrappable(fieldDescriptor)) {
-          return context.runtime.getTrue();
-        }
-      }
-    }
-    boolean includePrivate = false;
-    if (args.length == 2) {
-      includePrivate = context.runtime.getTrue().equals(args[1]);
-    }
-    return metaClass.respondsToMethod(methodName, includePrivate)
-        ? context.runtime.getTrue()
-        : context.runtime.getFalse();
-  }
-
-  /*
-   * call-seq:
-   *     Message.method_missing(*args)
-   *
-   * Provides accessors and setters and methods to clear and check for presence of
-   * message fields according to their field names.
-   *
-   * For any field whose name does not conflict with a built-in method, an
-   * accessor is provided with the same name as the field, and a setter is
-   * provided with the name of the field plus the '=' suffix. Thus, given a
-   * message instance 'msg' with field 'foo', the following code is valid:
-   *
-   *     msg.foo = 42
-   *     puts msg.foo
-   *
-   * This method also provides read-only accessors for oneofs. If a oneof exists
-   * with name 'my_oneof', then msg.my_oneof will return a Ruby symbol equal to
-   * the name of the field in that oneof that is currently set, or nil if none.
-   *
-   * It also provides methods of the form 'clear_fieldname' to clear the value
-   * of the field 'fieldname'. For basic data types, this will set the default
-   * value of the field.
-   *
-   * Additionally, it provides methods of the form 'has_fieldname?', which returns
-   * true if the field 'fieldname' is set in the message object, else false. For
-   * 'proto3' syntax, calling this for a basic type field will result in an error.
-   */
-  @JRubyMethod(name = "method_missing", rest = true)
-  public IRubyObject methodMissing(ThreadContext context, IRubyObject[] args) {
-    Ruby runtime = context.runtime;
-    String methodName = args[0].asJavaString();
-    RubyDescriptor rubyDescriptor = (RubyDescriptor) getDescriptor(context, metaClass);
-
-    if (args.length == 1) {
-      // If we find a Oneof return it's name (use lookupOneof because it has an index)
-      IRubyObject oneofDescriptor = rubyDescriptor.lookupOneof(context, args[0]);
-
-      if (!oneofDescriptor.isNil()) {
-        RubyOneofDescriptor rubyOneofDescriptor = (RubyOneofDescriptor) oneofDescriptor;
-        OneofDescriptor ood = rubyOneofDescriptor.getDescriptor();
-
-        // Check to see if we set this through ruby
-        FieldDescriptor fieldDescriptor = oneofCases.get(ood);
-
-        if (fieldDescriptor == null) {
-          // See if we set this from decoding a message
-          fieldDescriptor = builder.getOneofFieldDescriptor(ood);
-
-          if (fieldDescriptor == null) {
-            return context.nil;
-          } else {
-            // Cache it so we don't need to do multiple checks next time
-            oneofCases.put(ood, fieldDescriptor);
-            return runtime.newSymbol(fieldDescriptor.getName());
-          }
-        } else {
-          return runtime.newSymbol(fieldDescriptor.getName());
-        }
-      }
-
-      // If we find a field return its value
-      FieldDescriptor fieldDescriptor = descriptor.findFieldByName(methodName);
-
-      if (fieldDescriptor != null) {
-        return getFieldInternal(context, fieldDescriptor);
-      }
-
-      if (methodName.startsWith(CLEAR_PREFIX)) {
-        methodName = methodName.substring(6);
-        oneofDescriptor = rubyDescriptor.lookupOneof(context, runtime.newSymbol(methodName));
-        if (!oneofDescriptor.isNil()) {
-          fieldDescriptor = oneofCases.get(((RubyOneofDescriptor) oneofDescriptor).getDescriptor());
-          if (fieldDescriptor == null) {
-            // Clearing an already cleared oneof; return here to avoid NoMethodError.
-            return context.nil;
-          }
-        }
-
-        if (fieldDescriptor == null) {
-          fieldDescriptor = descriptor.findFieldByName(methodName);
-        }
-
-        if (fieldDescriptor != null) {
-          return clearFieldInternal(context, fieldDescriptor);
-        }
-
-      } else if (methodName.startsWith(HAS_PREFIX) && methodName.endsWith(QUESTION_MARK)) {
-        methodName =
-            methodName.substring(
-                4, methodName.length() - 1); // Trim "has_" and "?" off the field name
-        oneofDescriptor = rubyDescriptor.lookupOneof(context, runtime.newSymbol(methodName));
-        if (!oneofDescriptor.isNil()) {
-          RubyOneofDescriptor rubyOneofDescriptor = (RubyOneofDescriptor) oneofDescriptor;
-          return oneofCases.containsKey(rubyOneofDescriptor.getDescriptor())
-              ? runtime.getTrue()
-              : runtime.getFalse();
-        }
-
-        fieldDescriptor = descriptor.findFieldByName(methodName);
-
-        if (fieldDescriptor != null
-            && (!proto3
-                || fieldDescriptor.getContainingOneof() == null
-                || fieldDescriptor.getContainingOneof().isSynthetic())
-            && fieldDescriptor.hasPresence()) {
-          return fields.containsKey(fieldDescriptor) ? runtime.getTrue() : runtime.getFalse();
-        }
-
-      } else if (methodName.endsWith(AS_VALUE_SUFFIX)) {
-        methodName = methodName.substring(0, methodName.length() - 9);
-        fieldDescriptor = descriptor.findFieldByName(methodName);
-
-        if (fieldDescriptor != null && isWrappable(fieldDescriptor)) {
-          IRubyObject value = getFieldInternal(context, fieldDescriptor);
-
-          if (!value.isNil() && value instanceof RubyMessage) {
-            return ((RubyMessage) value).index(context, runtime.newString("value"));
-          }
-
-          return value;
-        }
-
-      } else if (methodName.endsWith(CONST_SUFFIX)) {
-        methodName = methodName.substring(0, methodName.length() - 6);
-        fieldDescriptor = descriptor.findFieldByName(methodName);
-        if (fieldDescriptor != null && fieldDescriptor.getType() == FieldDescriptor.Type.ENUM) {
-          IRubyObject enumValue = getFieldInternal(context, fieldDescriptor);
-
-          if (!enumValue.isNil()) {
-            EnumDescriptor enumDescriptor = fieldDescriptor.getEnumType();
-            if (enumValue instanceof RubyRepeatedField) {
-              RubyArray values = (RubyArray) ((RubyRepeatedField) enumValue).toArray(context);
-              RubyArray retValues = runtime.newArray(values.getLength());
-              for (int i = 0; i < values.getLength(); i++) {
-                String val = values.eltInternal(i).toString();
-                retValues.store(
-                    (long) i, runtime.newFixnum(enumDescriptor.findValueByName(val).getNumber()));
-              }
-              return retValues;
-            }
-
-            return runtime.newFixnum(
-                enumDescriptor.findValueByName(enumValue.asJavaString()).getNumber());
-          }
-        }
-      }
-
-    } else if (args.length == 2 && methodName.endsWith(Utils.EQUAL_SIGN)) {
-
-      methodName = methodName.substring(0, methodName.length() - 1); // Trim equals sign
-      FieldDescriptor fieldDescriptor = descriptor.findFieldByName(methodName);
-      if (fieldDescriptor != null) {
-        return setFieldInternal(context, fieldDescriptor, args[1]);
-      }
-
-      IRubyObject oneofDescriptor =
-          rubyDescriptor.lookupOneof(context, RubyString.newString(context.runtime, methodName));
-      if (!oneofDescriptor.isNil()) {
-        throw runtime.newRuntimeError("Oneof accessors are read-only.");
-      }
-
-      if (methodName.endsWith(AS_VALUE_SUFFIX)) {
-        methodName = methodName.substring(0, methodName.length() - 9);
-
-        fieldDescriptor = descriptor.findFieldByName(methodName);
-
-        if (fieldDescriptor != null && isWrappable(fieldDescriptor)) {
-          if (args[1].isNil()) {
-            return setFieldInternal(context, fieldDescriptor, args[1]);
-          }
-
-          RubyClass typeClass =
-              (RubyClass)
-                  ((RubyDescriptor) getDescriptorForField(context, fieldDescriptor))
-                      .msgclass(context);
-          RubyMessage msg = (RubyMessage) typeClass.newInstance(context, Block.NULL_BLOCK);
-          msg.indexSet(context, runtime.newString("value"), args[1]);
-          return setFieldInternal(context, fieldDescriptor, msg);
-        }
-      }
-    }
-
-    return Helpers.invokeSuper(context, this, metaClass, "method_missing", args, Block.NULL_BLOCK);
-  }
-
-  /**
-   * call-seq: Message.dup => new_message Performs a shallow copy of this message and returns the
-   * new copy.
-   */
-  @JRubyMethod
-  public IRubyObject dup(ThreadContext context) {
-    RubyMessage dup = (RubyMessage) metaClass.newInstance(context, Block.NULL_BLOCK);
-    for (FieldDescriptor fieldDescriptor : this.descriptor.getFields()) {
-      if (fieldDescriptor.isRepeated()) {
-        dup.fields.put(fieldDescriptor, this.getRepeatedField(context, fieldDescriptor));
-      } else if (fields.containsKey(fieldDescriptor)) {
-        dup.setFieldInternal(context, fieldDescriptor, fields.get(fieldDescriptor));
-      } else if (this.builder.hasField(fieldDescriptor)) {
-        dup.fields.put(
-            fieldDescriptor,
-            wrapField(context, fieldDescriptor, this.builder.getField(fieldDescriptor)));
-      }
-    }
-    return dup;
-  }
-
-  /*
-   * call-seq:
-   *     Message.descriptor => descriptor
-   *
-   * Class method that returns the Descriptor instance corresponding to this
-   * message class's type.
-   */
-  @JRubyMethod(name = "descriptor", meta = true)
-  public static IRubyObject getDescriptor(ThreadContext context, IRubyObject recv) {
-    return ((RubyClass) recv).getInstanceVariable(Utils.DESCRIPTOR_INSTANCE_VAR);
-  }
-
-  /*
-   * call-seq:
-   *     MessageClass.encode(msg, options = {}) => bytes
-   *
-   * Encodes the given message object to its serialized form in protocol buffers
-   * wire format.
-   * @param options [Hash] options for the encoder
-   *  recursion_limit: set to maximum encoding depth for message (default is 64)
-   */
-  @JRubyMethod(required = 1, optional = 1, meta = true)
-  public static IRubyObject encode(ThreadContext context, IRubyObject recv, IRubyObject[] args) {
-    if (recv != args[0].getMetaClass()) {
-      throw context.runtime.newArgumentError(
-          "Tried to encode a " + args[0].getMetaClass() + " message with " + recv);
-    }
-    RubyMessage message = (RubyMessage) args[0];
-    int recursionLimitInt = SINK_MAXIMUM_NESTING;
-
-    if (args.length > 1) {
-      RubyHash options = (RubyHash) args[1];
-      IRubyObject recursionLimit = options.fastARef(context.runtime.newSymbol("recursion_limit"));
-
-      if (recursionLimit != null) {
-        recursionLimitInt = ((RubyNumeric) recursionLimit).getIntValue();
-      }
-    }
-    return context.runtime.newString(
-        new ByteList(message.build(context, 0, recursionLimitInt).toByteArray()));
-  }
-
-  /*
-   * call-seq:
-   *     MessageClass.decode(data, options = {}) => message
-   *
-   * Decodes the given data (as a string containing bytes in protocol buffers wire
-   * format) under the interpretation given by this message class's definition
-   * and returns a message object with the corresponding field values.
-   * @param options [Hash] options for the decoder
-   *  recursion_limit: set to maximum decoding depth for message (default is 100)
-   */
-  @JRubyMethod(required = 1, optional = 1, meta = true)
-  public static IRubyObject decode(ThreadContext context, IRubyObject recv, IRubyObject[] args) {
-    IRubyObject data = args[0];
-    byte[] bin = data.convertToString().getBytes();
-    CodedInputStream input = CodedInputStream.newInstance(bin);
-    RubyMessage ret = (RubyMessage) ((RubyClass) recv).newInstance(context, Block.NULL_BLOCK);
-
-    if (args.length == 2) {
-      if (!(args[1] instanceof RubyHash)) {
-        throw context.runtime.newArgumentError("Expected hash arguments.");
-      }
-
-      IRubyObject recursionLimit =
-          ((RubyHash) args[1]).fastARef(context.runtime.newSymbol("recursion_limit"));
-      if (recursionLimit != null) {
-        input.setRecursionLimit(((RubyNumeric) recursionLimit).getIntValue());
-      }
-    }
-
-    try {
-      ret.builder.mergeFrom(input);
-    } catch (Exception e) {
-      throw RaiseException.from(
-          context.runtime,
-          (RubyClass) context.runtime.getClassFromPath("Google::Protobuf::ParseError"),
-          e.getMessage());
-    }
-
-    if (!ret.proto3) {
-      // Need to reset unknown values in repeated enum fields
-      ret.builder
-          .getUnknownFields()
-          .asMap()
-          .forEach(
-              (i, values) -> {
-                FieldDescriptor fd = ret.builder.getDescriptorForType().findFieldByNumber(i);
-                if (fd != null && fd.isRepeated() && fd.getType() == FieldDescriptor.Type.ENUM) {
-                  EnumDescriptor ed = fd.getEnumType();
-                  values
-                      .getVarintList()
-                      .forEach(
-                          value -> {
-                            ret.builder.addRepeatedField(
-                                fd, ed.findValueByNumberCreatingIfUnknown(value.intValue()));
-                          });
-                }
-              });
-    }
-
-    return ret;
-  }
-
-  /*
-   * call-seq:
-   *     MessageClass.encode_json(msg, options = {}) => json_string
-   *
-   * Encodes the given message object into its serialized JSON representation.
-   * @param options [Hash] options for the decoder
-   *  preserve_proto_fieldnames: set true to use original fieldnames (default is to camelCase)
-   *  emit_defaults: set true to emit 0/false values (default is to omit them)
-   */
-  @JRubyMethod(name = "encode_json", required = 1, optional = 1, meta = true)
-  public static IRubyObject encodeJson(
-      ThreadContext context, IRubyObject recv, IRubyObject[] args) {
-    Ruby runtime = context.runtime;
-    RubyMessage message = (RubyMessage) args[0];
-    JsonFormat.Printer printer = JsonFormat.printer().omittingInsignificantWhitespace();
-    String result;
-
-    if (args.length > 1) {
-      RubyHash options;
-      if (args[1] instanceof RubyHash) {
-        options = (RubyHash) args[1];
-      } else if (args[1].respondsTo("to_h")) {
-        options = (RubyHash) args[1].callMethod(context, "to_h");
-      } else {
-        throw runtime.newArgumentError("Expected hash arguments.");
-      }
-
-      IRubyObject emitDefaults = options.fastARef(runtime.newSymbol("emit_defaults"));
-      IRubyObject preserveNames = options.fastARef(runtime.newSymbol("preserve_proto_fieldnames"));
-
-      if (emitDefaults != null && emitDefaults.isTrue()) {
-        printer = printer.includingDefaultValueFields();
-      }
-
-      if (preserveNames != null && preserveNames.isTrue()) {
-        printer = printer.preservingProtoFieldNames();
-      }
-    }
-    printer =
-        printer.usingTypeRegistry(
-            JsonFormat.TypeRegistry.newBuilder().add(message.descriptor).build());
-
-    try {
-      result = printer.print(message.build(context, 0, SINK_MAXIMUM_NESTING));
-    } catch (InvalidProtocolBufferException e) {
-      throw runtime.newRuntimeError(e.getMessage());
-    } catch (IllegalArgumentException e) {
-      throw createParseError(context, e.getMessage());
-    }
-
-    return runtime.newString(result);
-  }
-
-  /*
-   * call-seq:
-   *     MessageClass.decode_json(data, options = {}) => message
-   *
-   * Decodes the given data (as a string containing bytes in protocol buffers wire
-   * format) under the interpretation given by this message class's definition
-   * and returns a message object with the corresponding field values.
-   *
-   *  @param options [Hash] options for the decoder
-   *   ignore_unknown_fields: set true to ignore unknown fields (default is to
-   *   raise an error)
-   */
-  @JRubyMethod(name = "decode_json", required = 1, optional = 1, meta = true)
-  public static IRubyObject decodeJson(
-      ThreadContext context, IRubyObject recv, IRubyObject[] args) {
-    Ruby runtime = context.runtime;
-    boolean ignoreUnknownFields = false;
-    IRubyObject data = args[0];
-    JsonFormat.Parser parser = JsonFormat.parser();
-
-    if (args.length == 2) {
-      if (!(args[1] instanceof RubyHash)) {
-        throw runtime.newArgumentError("Expected hash arguments.");
-      }
-
-      IRubyObject ignoreSetting =
-          ((RubyHash) args[1]).fastARef(runtime.newSymbol("ignore_unknown_fields"));
-      if (ignoreSetting != null && ignoreSetting.isTrue()) {
-        parser = parser.ignoringUnknownFields();
-      }
-    }
-
-    if (!(data instanceof RubyString)) {
-      throw runtime.newArgumentError("Expected string for JSON data.");
-    }
-
-    RubyMessage ret = (RubyMessage) ((RubyClass) recv).newInstance(context, Block.NULL_BLOCK);
-    parser =
-        parser.usingTypeRegistry(JsonFormat.TypeRegistry.newBuilder().add(ret.descriptor).build());
-
-    try {
-      parser.merge(data.asJavaString(), ret.builder);
-    } catch (InvalidProtocolBufferException e) {
-      throw createParseError(context, e.getMessage().replace("Cannot find", "No such"));
-    }
-
-    if (isWrapper(ret.descriptor)) {
-      throw runtime.newRuntimeError(
-          "Parsing a wrapper type from JSON at the top level does not work.");
-    }
-
-    return ret;
-  }
-
-  @JRubyMethod(name = "to_h")
-  public IRubyObject toHash(ThreadContext context) {
-    Ruby runtime = context.runtime;
-    RubyHash ret = RubyHash.newHash(runtime);
-    for (FieldDescriptor fdef : this.descriptor.getFields()) {
-      IRubyObject value = getFieldInternal(context, fdef, proto3);
-
-      if (!value.isNil()) {
-        if (fdef.isRepeated() && !fdef.isMapField()) {
-          if (!proto3 && ((RubyRepeatedField) value).size() == 0)
-            continue; // Don't output empty repeated fields for proto2
-          if (fdef.getType() != FieldDescriptor.Type.MESSAGE) {
-            value = Helpers.invoke(context, value, "to_a");
-          } else {
-            RubyArray ary = value.convertToArray();
-            for (int i = 0; i < ary.size(); i++) {
-              IRubyObject submsg = Helpers.invoke(context, ary.eltInternal(i), "to_h");
-              ary.eltInternalSet(i, submsg);
-            }
-
-            value = ary.to_ary();
-          }
-        } else if (value.respondsTo("to_h")) {
-          value = Helpers.invoke(context, value, "to_h");
-        } else if (value.respondsTo("to_a")) {
-          value = Helpers.invoke(context, value, "to_a");
-        }
-      }
-      if (proto3 || !value.isNil()) {
-        ret.fastASet(runtime.newSymbol(fdef.getName()), value);
-      }
-    }
-    return ret;
-  }
-
-  protected DynamicMessage build(ThreadContext context, int depth, int recursionLimit) {
-    if (depth >= recursionLimit) {
-      throw context.runtime.newRuntimeError("Recursion limit exceeded during encoding.");
-    }
-
-    RubySymbol typeBytesSymbol = RubySymbol.newSymbol(context.runtime, "TYPE_BYTES");
-
-    // Handle the typical case where the fields.keySet contain the fieldDescriptors
-    for (FieldDescriptor fieldDescriptor : fields.keySet()) {
-      IRubyObject value = fields.get(fieldDescriptor);
-
-      if (value instanceof RubyMap) {
-        builder.clearField(fieldDescriptor);
-        RubyDescriptor mapDescriptor =
-            (RubyDescriptor) getDescriptorForField(context, fieldDescriptor);
-        for (DynamicMessage kv :
-            ((RubyMap) value).build(context, mapDescriptor, depth, recursionLimit)) {
-          builder.addRepeatedField(fieldDescriptor, kv);
-        }
-
-      } else if (value instanceof RubyRepeatedField) {
-        RubyRepeatedField repeatedField = (RubyRepeatedField) value;
-
-        builder.clearField(fieldDescriptor);
-        for (int i = 0; i < repeatedField.size(); i++) {
-          Object item =
-              convert(
-                  context,
-                  fieldDescriptor,
-                  repeatedField.get(i),
-                  depth,
-                  recursionLimit,
-                  /*isDefaultValueForBytes*/ false);
-          builder.addRepeatedField(fieldDescriptor, item);
-        }
-
-      } else if (!value.isNil()) {
-        /**
-         * Detect the special case where default_value strings are provided for byte fields. If so,
-         * disable normal string encoding behavior within convert. For a more detailed explanation
-         * of other possible workarounds, see the comments above {@code
-         * com.google.protobuf.Internal#stringDefaultValue() stringDefaultValue}.
-         */
-        boolean isDefaultStringForBytes = false;
-        if (DEFAULT_VALUE.equals(fieldDescriptor.getFullName())) {
-          FieldDescriptor enumFieldDescriptorForType =
-              this.builder.getDescriptorForType().findFieldByName(TYPE);
-          if (typeBytesSymbol.equals(fields.get(enumFieldDescriptorForType))) {
-            isDefaultStringForBytes = true;
-          }
-        }
-        builder.setField(
-            fieldDescriptor,
-            convert(
-                context, fieldDescriptor, value, depth, recursionLimit, isDefaultStringForBytes));
-      }
-    }
-
-    // Handle cases where {@code fields} doesn't contain the value until after getFieldInternal
-    // is called - typical of a deserialized message. Skip non-maps and descriptors that already
-    // have an entry in {@code fields}.
-    for (FieldDescriptor fieldDescriptor : descriptor.getFields()) {
-      if (!fieldDescriptor.isMapField()) {
-        continue;
-      }
-      IRubyObject value = fields.get(fieldDescriptor);
-      if (value != null) {
-        continue;
-      }
-      value = getFieldInternal(context, fieldDescriptor);
-      if (value instanceof RubyMap) {
-        builder.clearField(fieldDescriptor);
-        RubyDescriptor mapDescriptor =
-            (RubyDescriptor) getDescriptorForField(context, fieldDescriptor);
-        for (DynamicMessage kv :
-            ((RubyMap) value).build(context, mapDescriptor, depth, recursionLimit)) {
-          builder.addRepeatedField(fieldDescriptor, kv);
-        }
-      }
-    }
-    return builder.build();
-  }
-
-  // Internal use only, called by Google::Protobuf.deep_copy
-  protected IRubyObject deepCopy(ThreadContext context) {
-    RubyMessage copy = (RubyMessage) metaClass.newInstance(context, Block.NULL_BLOCK);
-    for (FieldDescriptor fdef : descriptor.getFields()) {
-      if (fdef.isRepeated()) {
-        copy.fields.put(fdef, this.getRepeatedField(context, fdef).deepCopy(context));
-      } else if (fields.containsKey(fdef)) {
-        copy.setFieldInternal(context, fdef, fields.get(fdef));
-      } else if (builder.hasField(fdef)) {
-        copy.fields.put(fdef, wrapField(context, fdef, builder.getField(fdef)));
-      }
-    }
-    return copy;
-  }
-
-  protected IRubyObject clearField(ThreadContext context, FieldDescriptor fieldDescriptor) {
-    validateMessageType(context, fieldDescriptor, "clear");
-    return clearFieldInternal(context, fieldDescriptor);
-  }
-
-  protected void discardUnknownFields(ThreadContext context) {
-    discardUnknownFields(context, builder);
-  }
-
-  protected IRubyObject getField(ThreadContext context, FieldDescriptor fieldDescriptor) {
-    validateMessageType(context, fieldDescriptor, "get");
-    return getFieldInternal(context, fieldDescriptor);
-  }
-
-  protected IRubyObject hasField(ThreadContext context, FieldDescriptor fieldDescriptor) {
-    validateMessageType(context, fieldDescriptor, "has?");
-    if (!fieldDescriptor.hasPresence()) {
-      throw context.runtime.newArgumentError("does not track presence");
-    }
-    return fields.containsKey(fieldDescriptor)
-        ? context.runtime.getTrue()
-        : context.runtime.getFalse();
-  }
-
-  protected IRubyObject setField(
-      ThreadContext context, FieldDescriptor fieldDescriptor, IRubyObject value) {
-    validateMessageType(context, fieldDescriptor, "set");
-    return setFieldInternal(context, fieldDescriptor, value);
-  }
-
-  private RubyRepeatedField getRepeatedField(
-      ThreadContext context, FieldDescriptor fieldDescriptor) {
-    if (fields.containsKey(fieldDescriptor)) {
-      return (RubyRepeatedField) fields.get(fieldDescriptor);
-    }
-    int count = this.builder.getRepeatedFieldCount(fieldDescriptor);
-    RubyRepeatedField ret = repeatedFieldForFieldDescriptor(context, fieldDescriptor);
-    for (int i = 0; i < count; i++) {
-      ret.push(
-          context,
-          new IRubyObject[] {
-            wrapField(context, fieldDescriptor, this.builder.getRepeatedField(fieldDescriptor, i))
-          });
-    }
-    fields.put(fieldDescriptor, ret);
-    return ret;
-  }
-
-  private IRubyObject buildFrom(ThreadContext context, DynamicMessage dynamicMessage) {
-    this.builder.mergeFrom(dynamicMessage);
-    return this;
-  }
-
-  private IRubyObject clearFieldInternal(ThreadContext context, FieldDescriptor fieldDescriptor) {
-    OneofDescriptor ood = fieldDescriptor.getContainingOneof();
-    if (ood != null) oneofCases.remove(ood);
-    fields.remove(fieldDescriptor);
-    builder.clearField(fieldDescriptor);
-    return context.nil;
-  }
-
-  private void discardUnknownFields(ThreadContext context, Message.Builder messageBuilder) {
-    messageBuilder.setUnknownFields(UnknownFieldSet.getDefaultInstance());
-    messageBuilder
-        .getAllFields()
-        .forEach(
-            (fd, value) -> {
-              if (fd.getType() == FieldDescriptor.Type.MESSAGE) {
-                if (fd.isRepeated()) {
-                  messageBuilder.clearField(fd);
-                  ((List) value)
-                      .forEach(
-                          (val) -> {
-                            Message.Builder submessageBuilder = ((DynamicMessage) val).toBuilder();
-                            discardUnknownFields(context, submessageBuilder);
-                            messageBuilder.addRepeatedField(fd, submessageBuilder.build());
-                          });
-                } else {
-                  Message.Builder submessageBuilder = ((DynamicMessage) value).toBuilder();
-                  discardUnknownFields(context, submessageBuilder);
-                  messageBuilder.setField(fd, submessageBuilder.build());
-                }
-              }
-            });
-  }
-
-  private FieldDescriptor findField(ThreadContext context, IRubyObject fieldName) {
-    return findField(context, fieldName, false);
-  }
-
-  private FieldDescriptor findField(
-      ThreadContext context, IRubyObject fieldName, boolean ignoreUnknownField) {
-    String nameStr = fieldName.asJavaString();
-    FieldDescriptor ret = this.descriptor.findFieldByName(nameStr);
-    if (ret == null && !ignoreUnknownField) {
-      throw context.runtime.newArgumentError("field " + fieldName.asJavaString() + " is not found");
-    }
-    return ret;
-  }
-
-  // convert a ruby object to protobuf type, skip type check since it is checked on the way in
-  private Object convert(
-      ThreadContext context,
-      FieldDescriptor fieldDescriptor,
-      IRubyObject value,
-      int depth,
-      int recursionLimit,
-      boolean isDefaultStringForBytes) {
-    Object val = null;
-    switch (fieldDescriptor.getType()) {
-      case INT32:
-      case SFIXED32:
-      case SINT32:
-        val = RubyNumeric.num2int(value);
-        break;
-      case INT64:
-      case SFIXED64:
-      case SINT64:
-        val = RubyNumeric.num2long(value);
-        break;
-      case FIXED32:
-      case UINT32:
-        val = Utils.num2uint(value);
-        break;
-      case FIXED64:
-      case UINT64:
-        val = Utils.num2ulong(context.runtime, value);
-        break;
-      case FLOAT:
-        val = (float) RubyNumeric.num2dbl(value);
-        break;
-      case DOUBLE:
-        val = (double) RubyNumeric.num2dbl(value);
-        break;
-      case BOOL:
-        val = value.isTrue();
-        break;
-      case BYTES:
-        val = ByteString.copyFrom(((RubyString) value).getBytes());
-        break;
-      case STRING:
-        if (isDefaultStringForBytes) {
-          val = ((RubyString) value).getByteList().toString();
-        } else {
-          val = value.asJavaString();
-        }
-        break;
-      case MESSAGE:
-        val = ((RubyMessage) value).build(context, depth + 1, recursionLimit);
-        break;
-      case ENUM:
-        EnumDescriptor enumDescriptor = fieldDescriptor.getEnumType();
-        if (Utils.isRubyNum(value)) {
-          val = enumDescriptor.findValueByNumberCreatingIfUnknown(RubyNumeric.num2int(value));
-        } else {
-          val = enumDescriptor.findValueByName(value.asJavaString());
-        }
-        break;
-      default:
-        break;
-    }
-
-    return val;
-  }
-
-  private static RaiseException createParseError(ThreadContext context, String message) {
-    if (parseErrorClass == null) {
-      parseErrorClass =
-          (RubyClass) context.runtime.getClassFromPath("Google::Protobuf::ParseError");
-    }
-    return RaiseException.from(context.runtime, parseErrorClass, message);
-  }
-
-  private IRubyObject wrapField(
-      ThreadContext context, FieldDescriptor fieldDescriptor, Object value) {
-    return wrapField(context, fieldDescriptor, value, false);
-  }
-
-  private IRubyObject wrapField(
-      ThreadContext context, FieldDescriptor fieldDescriptor, Object value, boolean encodeBytes) {
-    if (value == null) {
-      return context.runtime.getNil();
-    }
-    Ruby runtime = context.runtime;
-
-    switch (fieldDescriptor.getType()) {
-      case INT32:
-      case INT64:
-      case FIXED32:
-      case SINT32:
-      case FIXED64:
-      case SINT64:
-      case SFIXED64:
-      case SFIXED32:
-      case UINT32:
-      case UINT64:
-      case FLOAT:
-      case DOUBLE:
-      case BOOL:
-      case BYTES:
-      case STRING:
-        return Utils.wrapPrimaryValue(context, fieldDescriptor.getType(), value, encodeBytes);
-      case MESSAGE:
-        RubyClass typeClass =
-            (RubyClass)
-                ((RubyDescriptor) getDescriptorForField(context, fieldDescriptor))
-                    .msgclass(context);
-        RubyMessage msg = (RubyMessage) typeClass.newInstance(context, Block.NULL_BLOCK);
-        return msg.buildFrom(context, (DynamicMessage) value);
-      case ENUM:
-        EnumValueDescriptor enumValueDescriptor = (EnumValueDescriptor) value;
-        if (enumValueDescriptor.getIndex() == -1) { // UNKNOWN ENUM VALUE
-          return runtime.newFixnum(enumValueDescriptor.getNumber());
-        }
-        return runtime.newSymbol(enumValueDescriptor.getName());
-      default:
-        return runtime.newString(value.toString());
-    }
-  }
-
-  private RubyRepeatedField repeatedFieldForFieldDescriptor(
-      ThreadContext context, FieldDescriptor fieldDescriptor) {
-    IRubyObject typeClass = context.runtime.getNilClass();
-    IRubyObject descriptor = getDescriptorForField(context, fieldDescriptor);
-    FieldDescriptor.Type type = fieldDescriptor.getType();
-
-    if (type == FieldDescriptor.Type.MESSAGE) {
-      typeClass = ((RubyDescriptor) descriptor).msgclass(context);
-
-    } else if (type == FieldDescriptor.Type.ENUM) {
-      typeClass = ((RubyEnumDescriptor) descriptor).enummodule(context);
-    }
-
-    RubyRepeatedField field =
-        new RubyRepeatedField(context.runtime, cRepeatedField, type, typeClass);
-    field.setName(fieldDescriptor.getName());
-
-    return field;
-  }
-
-  private IRubyObject getFieldInternal(ThreadContext context, FieldDescriptor fieldDescriptor) {
-    return getFieldInternal(context, fieldDescriptor, true);
-  }
-
-  private IRubyObject getFieldInternal(
-      ThreadContext context, FieldDescriptor fieldDescriptor, boolean returnDefaults) {
-    OneofDescriptor oneofDescriptor = fieldDescriptor.getContainingOneof();
-    if (oneofDescriptor != null) {
-      if (oneofCases.get(oneofDescriptor) == fieldDescriptor) {
-        IRubyObject value = fields.get(fieldDescriptor);
-        if (value == null) {
-          FieldDescriptor oneofCase = builder.getOneofFieldDescriptor(oneofDescriptor);
-          if (oneofCase != null) {
-            Object builderValue = builder.getField(oneofCase);
-            if (builderValue != null) {
-              boolean encodeBytes =
-                  oneofCase.hasDefaultValue() && builderValue.equals(oneofCase.getDefaultValue());
-              value = wrapField(context, oneofCase, builderValue, encodeBytes);
-            }
-          }
-          if (value == null) {
-            return context.nil;
-          } else {
-            return value;
-          }
-        } else {
-          return value;
-        }
-      } else {
-        FieldDescriptor oneofCase = builder.getOneofFieldDescriptor(oneofDescriptor);
-        if (oneofCase != fieldDescriptor) {
-          if (fieldDescriptor.getType() == FieldDescriptor.Type.MESSAGE || !returnDefaults) {
-            return context.nil;
-          } else {
-            return wrapField(context, fieldDescriptor, fieldDescriptor.getDefaultValue(), true);
-          }
-        }
-        if (returnDefaults || builder.hasField(fieldDescriptor)) {
-          Object rawValue = builder.getField(oneofCase);
-          boolean encodeBytes =
-              oneofCase.hasDefaultValue() && rawValue.equals(oneofCase.getDefaultValue());
-          IRubyObject value = wrapField(context, oneofCase, rawValue, encodeBytes);
-          fields.put(fieldDescriptor, value);
-          return value;
-        } else {
-          return context.nil;
-        }
-      }
-    }
-
-    if (fieldDescriptor.isMapField()) {
-      RubyMap map = (RubyMap) fields.get(fieldDescriptor);
-      if (map == null) {
-        map = newMapForField(context, fieldDescriptor);
-        int mapSize = this.builder.getRepeatedFieldCount(fieldDescriptor);
-        FieldDescriptor keyField = fieldDescriptor.getMessageType().findFieldByNumber(1);
-        FieldDescriptor valueField = fieldDescriptor.getMessageType().findFieldByNumber(2);
-        RubyDescriptor kvDescriptor =
-            (RubyDescriptor) getDescriptorForField(context, fieldDescriptor);
-        RubyClass kvClass = (RubyClass) kvDescriptor.msgclass(context);
-        for (int i = 0; i < mapSize; i++) {
-          RubyMessage kvMessage = (RubyMessage) kvClass.newInstance(context, Block.NULL_BLOCK);
-          DynamicMessage message =
-              (DynamicMessage) this.builder.getRepeatedField(fieldDescriptor, i);
-          kvMessage.buildFrom(context, message);
-          map.indexSet(
-              context,
-              kvMessage.getField(context, keyField),
-              kvMessage.getField(context, valueField));
-        }
-        fields.put(fieldDescriptor, map);
-      }
-      return map;
-    }
-
-    if (fieldDescriptor.isRepeated()) {
-      return getRepeatedField(context, fieldDescriptor);
-    }
-
-    if (fieldDescriptor.getType() != FieldDescriptor.Type.MESSAGE
-        || builder.hasField(fieldDescriptor)
-        || fields.containsKey(fieldDescriptor)) {
-      if (fields.containsKey(fieldDescriptor)) {
-        return fields.get(fieldDescriptor);
-      } else if (returnDefaults || builder.hasField(fieldDescriptor)) {
-        Object rawValue = builder.getField(fieldDescriptor);
-        boolean encodeBytes =
-            fieldDescriptor.hasDefaultValue() && rawValue.equals(fieldDescriptor.getDefaultValue());
-        IRubyObject value = wrapField(context, fieldDescriptor, rawValue, encodeBytes);
-        if (builder.hasField(fieldDescriptor)) {
-          fields.put(fieldDescriptor, value);
-        }
-        return value;
-      }
-    }
-    return context.nil;
-  }
-
-  private IRubyObject setFieldInternal(
-      ThreadContext context, FieldDescriptor fieldDescriptor, IRubyObject value) {
-    testFrozen("can't modify frozen " + getMetaClass());
-
-    if (fieldDescriptor.isMapField()) {
-      if (!(value instanceof RubyMap)) {
-        throw Utils.createTypeError(context, "Expected Map instance");
-      }
-      RubyMap thisMap = (RubyMap) getFieldInternal(context, fieldDescriptor);
-      thisMap.mergeIntoSelf(context, value);
-
-    } else if (fieldDescriptor.isRepeated()) {
-      if (value instanceof RubyRepeatedField) {
-        fields.put(fieldDescriptor, value);
-      } else {
-        throw Utils.createTypeError(context, "Expected repeated field array");
-      }
-
-    } else {
-      boolean addValue = true;
-      FieldDescriptor.Type fieldType = fieldDescriptor.getType();
-      OneofDescriptor oneofDescriptor = fieldDescriptor.getContainingOneof();
-
-      // Determine the typeclass, if any
-      IRubyObject typeClass = context.runtime.getObject();
-      if (fieldType == FieldDescriptor.Type.MESSAGE) {
-        typeClass =
-            ((RubyDescriptor) getDescriptorForField(context, fieldDescriptor)).msgclass(context);
-        if (value.isNil()) {
-          addValue = false;
-        }
-      } else if (fieldType == FieldDescriptor.Type.ENUM) {
-        typeClass =
-            ((RubyEnumDescriptor) getDescriptorForField(context, fieldDescriptor))
-                .enummodule(context);
-        value = enumToSymbol(context, fieldDescriptor.getEnumType(), value);
-      }
-
-      if (oneofDescriptor != null) {
-        FieldDescriptor oneofCase = oneofCases.get(oneofDescriptor);
-
-        // Remove the existing field if we are setting a different field in the Oneof
-        if (oneofCase != null && oneofCase != fieldDescriptor) {
-          fields.remove(oneofCase);
-        }
-
-        // Keep track of what Oneofs are set
-        if (value.isNil()) {
-          oneofCases.remove(oneofDescriptor);
-          if (!oneofDescriptor.isSynthetic()) {
-            addValue = false;
-          }
-        } else {
-          oneofCases.put(oneofDescriptor, fieldDescriptor);
-        }
-      }
-
-      if (addValue) {
-        value =
-            Utils.checkType(
-                context, fieldType, fieldDescriptor.getName(), value, (RubyModule) typeClass);
-        fields.put(fieldDescriptor, value);
-      } else {
-        fields.remove(fieldDescriptor);
-      }
-    }
-    return context.nil;
-  }
-
-  private IRubyObject getDescriptorForField(
-      ThreadContext context, FieldDescriptor fieldDescriptor) {
-    RubyDescriptor thisRbDescriptor = (RubyDescriptor) getDescriptor(context, metaClass);
-    RubyFieldDescriptor fd =
-        (RubyFieldDescriptor)
-            thisRbDescriptor.lookup(context, context.runtime.newString(fieldDescriptor.getName()));
-    return fd.getSubtype(context);
-  }
-
-  private IRubyObject enumToSymbol(
-      ThreadContext context, EnumDescriptor enumDescriptor, IRubyObject value) {
-    if (value instanceof RubySymbol) {
-      return (RubySymbol) value;
-    } else if (Utils.isRubyNum(value)) {
-      EnumValueDescriptor enumValue =
-          enumDescriptor.findValueByNumberCreatingIfUnknown(RubyNumeric.num2int(value));
-      if (enumValue.getIndex() != -1) {
-        return context.runtime.newSymbol(enumValue.getName());
-      } else {
-        return value;
-      }
-    } else if (value instanceof RubyString) {
-      return ((RubyString) value).intern();
-    }
-
-    return context.runtime.newSymbol("UNKNOWN");
-  }
-
-  private RubyRepeatedField rubyToRepeatedField(
-      ThreadContext context, FieldDescriptor fieldDescriptor, IRubyObject value) {
-    RubyArray arr = value.convertToArray();
-    RubyRepeatedField repeatedField = repeatedFieldForFieldDescriptor(context, fieldDescriptor);
-    IRubyObject[] values = new IRubyObject[arr.size()];
-    FieldDescriptor.Type fieldType = fieldDescriptor.getType();
-
-    RubyModule typeClass = null;
-    if (fieldType == FieldDescriptor.Type.MESSAGE) {
-      RubyDescriptor descriptor = (RubyDescriptor) getDescriptorForField(context, fieldDescriptor);
-      typeClass = (RubyModule) descriptor.msgclass(context);
-    } else if (fieldType == FieldDescriptor.Type.ENUM) {
-      RubyEnumDescriptor enumDescriptor =
-          (RubyEnumDescriptor) getDescriptorForField(context, fieldDescriptor);
-      typeClass = (RubyModule) enumDescriptor.enummodule(context);
-    }
-
-    for (int i = 0; i < arr.size(); i++) {
-      IRubyObject item = arr.eltInternal(i);
-      if (item.isNil()) {
-        throw Utils.createTypeError(context, "nil message not allowed here.");
-      }
-      if (item instanceof RubyHash && typeClass != null) {
-        values[i] = ((RubyClass) typeClass).newInstance(context, item, Block.NULL_BLOCK);
-      } else {
-        if (fieldType == FieldDescriptor.Type.ENUM) {
-          item = enumToSymbol(context, fieldDescriptor.getEnumType(), item);
-        }
-
-        values[i] = item;
-      }
-    }
-    repeatedField.push(context, values);
-
-    return repeatedField;
-  }
-
-  private RubyMap newMapForField(ThreadContext context, FieldDescriptor fieldDescriptor) {
-    RubyDescriptor mapDescriptor = (RubyDescriptor) getDescriptorForField(context, fieldDescriptor);
-    FieldDescriptor keyField = fieldDescriptor.getMessageType().findFieldByNumber(1);
-    FieldDescriptor valueField = fieldDescriptor.getMessageType().findFieldByNumber(2);
-    IRubyObject keyType = RubySymbol.newSymbol(context.runtime, keyField.getType().name());
-    IRubyObject valueType = RubySymbol.newSymbol(context.runtime, valueField.getType().name());
-
-    if (valueField.getType() == FieldDescriptor.Type.MESSAGE) {
-      RubyFieldDescriptor rubyFieldDescriptor =
-          (RubyFieldDescriptor) mapDescriptor.lookup(context, context.runtime.newString("value"));
-      RubyDescriptor rubyDescriptor = (RubyDescriptor) rubyFieldDescriptor.getSubtype(context);
-      return (RubyMap)
-          cMap.newInstance(
-              context, keyType, valueType, rubyDescriptor.msgclass(context), Block.NULL_BLOCK);
-
-    } else if (valueField.getType() == FieldDescriptor.Type.ENUM) {
-      RubyFieldDescriptor rubyFieldDescriptor =
-          (RubyFieldDescriptor) mapDescriptor.lookup(context, context.runtime.newString("value"));
-      RubyEnumDescriptor rubyEnumDescriptor =
-          (RubyEnumDescriptor) rubyFieldDescriptor.getSubtype(context);
-      return (RubyMap)
-          cMap.newInstance(
-              context,
-              keyType,
-              valueType,
-              rubyEnumDescriptor.enummodule(context),
-              Block.NULL_BLOCK);
-
-    } else {
-      return (RubyMap) cMap.newInstance(context, keyType, valueType, Block.NULL_BLOCK);
-    }
-  }
-
-  private boolean isWrappable(FieldDescriptor fieldDescriptor) {
-    if (fieldDescriptor.getType() != FieldDescriptor.Type.MESSAGE) return false;
-
-    return isWrapper(fieldDescriptor.getMessageType());
-  }
-
-  private static boolean isWrapper(Descriptor messageDescriptor) {
-    switch (messageDescriptor.getFullName()) {
-      case "google.protobuf.DoubleValue":
-      case "google.protobuf.FloatValue":
-      case "google.protobuf.Int64Value":
-      case "google.protobuf.UInt64Value":
-      case "google.protobuf.Int32Value":
-      case "google.protobuf.UInt32Value":
-      case "google.protobuf.BoolValue":
-      case "google.protobuf.StringValue":
-      case "google.protobuf.BytesValue":
-        return true;
-      default:
-        return false;
-    }
-  }
-
-  private void validateMessageType(
-      ThreadContext context, FieldDescriptor fieldDescriptor, String methodName) {
-    if (descriptor != fieldDescriptor.getContainingType()) {
-      throw Utils.createTypeError(context, methodName + " method called on wrong message type");
-    }
-  }
-
-  private static RubyClass parseErrorClass;
-
-  private static final String AS_VALUE_SUFFIX = "_as_value";
-  private static final String CLEAR_PREFIX = "clear_";
-  private static final String CONST_SUFFIX = "_const";
-  private static final String HAS_PREFIX = "has_";
-  private static final String QUESTION_MARK = "?";
-  private static final int SINK_MAXIMUM_NESTING = 64;
-
-  private Descriptor descriptor;
-  private DynamicMessage.Builder builder;
-  private Map<FieldDescriptor, IRubyObject> fields;
-  private Map<OneofDescriptor, FieldDescriptor> oneofCases;
-  private RubyClass cRepeatedField;
-  private RubyClass cMap;
-  private boolean ignoreUnknownFieldsOnInit = false;
-  private boolean proto3;
-}
diff --git a/libs/protobuf/ruby/src/main/java/com/google/protobuf/jruby/RubyOneofDescriptor.java b/libs/protobuf/ruby/src/main/java/com/google/protobuf/jruby/RubyOneofDescriptor.java
deleted file mode 100644
index 5ade98b..0000000
--- a/libs/protobuf/ruby/src/main/java/com/google/protobuf/jruby/RubyOneofDescriptor.java
+++ /dev/null
@@ -1,92 +0,0 @@
-package com.google.protobuf.jruby;
-
-import com.google.protobuf.Descriptors.FieldDescriptor;
-import com.google.protobuf.Descriptors.OneofDescriptor;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import org.jruby.Ruby;
-import org.jruby.RubyClass;
-import org.jruby.RubyModule;
-import org.jruby.RubyObject;
-import org.jruby.anno.JRubyClass;
-import org.jruby.anno.JRubyMethod;
-import org.jruby.runtime.Block;
-import org.jruby.runtime.ObjectAllocator;
-import org.jruby.runtime.ThreadContext;
-import org.jruby.runtime.builtin.IRubyObject;
-
-@JRubyClass(name = "OneofDescriptor", include = "Enumerable")
-public class RubyOneofDescriptor extends RubyObject {
-
-  public static void createRubyOneofDescriptor(Ruby runtime) {
-    RubyModule protobuf = runtime.getClassFromPath("Google::Protobuf");
-    RubyClass cRubyOneofDescriptor =
-        protobuf.defineClassUnder(
-            "OneofDescriptor",
-            runtime.getObject(),
-            new ObjectAllocator() {
-              @Override
-              public IRubyObject allocate(Ruby ruby, RubyClass rubyClass) {
-                return new RubyOneofDescriptor(ruby, rubyClass);
-              }
-            });
-    cRubyOneofDescriptor.defineAnnotatedMethods(RubyOneofDescriptor.class);
-    cRubyOneofDescriptor.includeModule(runtime.getEnumerable());
-  }
-
-  public RubyOneofDescriptor(Ruby ruby, RubyClass rubyClass) {
-    super(ruby, rubyClass);
-    fields = new ArrayList<RubyFieldDescriptor>();
-  }
-
-  /*
-   * call-seq:
-   *     OneofDescriptor.name => name
-   *
-   * Returns the name of this oneof.
-   */
-  @JRubyMethod(name = "name")
-  public IRubyObject getName(ThreadContext context) {
-    return name;
-  }
-
-  /*
-   * call-seq:
-   *     OneofDescriptor.each(&block) => nil
-   *
-   * Iterates through fields in this oneof, yielding to the block on each one.
-   */
-  @JRubyMethod
-  public IRubyObject each(ThreadContext context, Block block) {
-    for (RubyFieldDescriptor field : fields) {
-      block.yieldSpecific(context, field);
-    }
-    return context.nil;
-  }
-
-  protected Collection<RubyFieldDescriptor> getFields() {
-    return fields;
-  }
-
-  protected OneofDescriptor getDescriptor() {
-    return descriptor;
-  }
-
-  protected void setDescriptor(
-      ThreadContext context,
-      OneofDescriptor descriptor,
-      Map<FieldDescriptor, RubyFieldDescriptor> fieldCache) {
-    this.descriptor = descriptor;
-    this.name = context.runtime.newString(descriptor.getName());
-
-    for (FieldDescriptor fd : descriptor.getFields()) {
-      fields.add(fieldCache.get(fd));
-    }
-  }
-
-  private IRubyObject name;
-  private List<RubyFieldDescriptor> fields;
-  private OneofDescriptor descriptor;
-}
diff --git a/libs/protobuf/ruby/src/main/java/com/google/protobuf/jruby/RubyProtobuf.java b/libs/protobuf/ruby/src/main/java/com/google/protobuf/jruby/RubyProtobuf.java
deleted file mode 100644
index 8d132be..0000000
--- a/libs/protobuf/ruby/src/main/java/com/google/protobuf/jruby/RubyProtobuf.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Protocol Buffers - Google's data interchange format
- * Copyright 2014 Google Inc.  All rights reserved.
- * https://developers.google.com/protocol-buffers/
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package com.google.protobuf.jruby;
-
-import org.jruby.Ruby;
-import org.jruby.RubyModule;
-import org.jruby.anno.JRubyMethod;
-import org.jruby.anno.JRubyModule;
-import org.jruby.runtime.ThreadContext;
-import org.jruby.runtime.builtin.IRubyObject;
-
-@JRubyModule(name = "Protobuf")
-public class RubyProtobuf {
-
-  public static void createProtobuf(Ruby runtime) {
-    RubyModule mGoogle = runtime.getModule("Google");
-    RubyModule mProtobuf = mGoogle.defineModuleUnder("Protobuf");
-    mProtobuf.defineAnnotatedMethods(RubyProtobuf.class);
-    RubyModule mInternal = mProtobuf.defineModuleUnder("Internal");
-  }
-
-  /*
-   * call-seq:
-   *     Google::Protobuf.deep_copy(obj) => copy_of_obj
-   *
-   * Performs a deep copy of either a RepeatedField instance or a message object,
-   * recursively copying its members.
-   */
-  @JRubyMethod(name = "deep_copy", meta = true)
-  public static IRubyObject deepCopy(ThreadContext context, IRubyObject self, IRubyObject message) {
-    if (message instanceof RubyMessage) {
-      return ((RubyMessage) message).deepCopy(context);
-    } else if (message instanceof RubyRepeatedField) {
-      return ((RubyRepeatedField) message).deepCopy(context);
-    } else {
-      return ((RubyMap) message).deepCopy(context);
-    }
-  }
-
-  /*
-   * call-seq:
-   *     Google::Protobuf.discard_unknown(msg)
-   *
-   * Discard unknown fields in the given message object and recursively discard
-   * unknown fields in submessages.
-   */
-  @JRubyMethod(name = "discard_unknown", meta = true)
-  public static IRubyObject discardUnknown(
-      ThreadContext context, IRubyObject self, IRubyObject message) {
-    ((RubyMessage) message).discardUnknownFields(context);
-    return context.nil;
-  }
-}
diff --git a/libs/protobuf/ruby/src/main/java/com/google/protobuf/jruby/RubyRepeatedField.java b/libs/protobuf/ruby/src/main/java/com/google/protobuf/jruby/RubyRepeatedField.java
deleted file mode 100644
index 77842d1..0000000
--- a/libs/protobuf/ruby/src/main/java/com/google/protobuf/jruby/RubyRepeatedField.java
+++ /dev/null
@@ -1,432 +0,0 @@
-/*
- * Protocol Buffers - Google's data interchange format
- * Copyright 2014 Google Inc.  All rights reserved.
- * https://developers.google.com/protocol-buffers/
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package com.google.protobuf.jruby;
-
-import com.google.protobuf.Descriptors.FieldDescriptor;
-import org.jruby.*;
-import org.jruby.anno.JRubyClass;
-import org.jruby.anno.JRubyMethod;
-import org.jruby.runtime.Block;
-import org.jruby.runtime.ObjectAllocator;
-import org.jruby.runtime.ThreadContext;
-import org.jruby.runtime.builtin.IRubyObject;
-
-@JRubyClass(name = "RepeatedClass", include = "Enumerable")
-public class RubyRepeatedField extends RubyObject {
-  public static void createRubyRepeatedField(Ruby runtime) {
-    RubyModule mProtobuf = runtime.getClassFromPath("Google::Protobuf");
-    RubyClass cRepeatedField =
-        mProtobuf.defineClassUnder(
-            "RepeatedField",
-            runtime.getObject(),
-            new ObjectAllocator() {
-              @Override
-              public IRubyObject allocate(Ruby runtime, RubyClass klazz) {
-                return new RubyRepeatedField(runtime, klazz);
-              }
-            });
-    cRepeatedField.defineAnnotatedMethods(RubyRepeatedField.class);
-    cRepeatedField.includeModule(runtime.getEnumerable());
-  }
-
-  public RubyRepeatedField(Ruby runtime, RubyClass klazz) {
-    super(runtime, klazz);
-  }
-
-  public RubyRepeatedField(
-      Ruby runtime, RubyClass klazz, FieldDescriptor.Type fieldType, IRubyObject typeClass) {
-    this(runtime, klazz);
-    this.fieldType = fieldType;
-    this.storage = runtime.newArray();
-    this.typeClass = typeClass;
-  }
-
-  @JRubyMethod(required = 1, optional = 2)
-  public IRubyObject initialize(ThreadContext context, IRubyObject[] args) {
-    Ruby runtime = context.runtime;
-    this.storage = runtime.newArray();
-    IRubyObject ary = null;
-    if (!(args[0] instanceof RubySymbol)) {
-      throw runtime.newArgumentError("Expected Symbol for type name");
-    }
-    this.fieldType = Utils.rubyToFieldType(args[0]);
-    if (fieldType == FieldDescriptor.Type.MESSAGE || fieldType == FieldDescriptor.Type.ENUM) {
-      if (args.length < 2)
-        throw runtime.newArgumentError("Expected at least 2 arguments for message/enum");
-      typeClass = args[1];
-      if (args.length > 2) ary = args[2];
-      Utils.validateTypeClass(context, fieldType, typeClass);
-    } else {
-      if (args.length > 2) throw runtime.newArgumentError("Too many arguments: expected 1 or 2");
-      if (args.length > 1) ary = args[1];
-    }
-    if (ary != null) {
-      RubyArray arr = ary.convertToArray();
-      for (int i = 0; i < arr.size(); i++) {
-        this.storage.add(arr.eltInternal(i));
-      }
-    }
-    return this;
-  }
-
-  /*
-   * call-seq:
-   *     RepeatedField.[]=(index, value)
-   *
-   * Sets the element at the given index. On out-of-bounds assignments, extends
-   * the array and fills the hole (if any) with default values.
-   */
-  @JRubyMethod(name = "[]=")
-  public IRubyObject indexSet(ThreadContext context, IRubyObject index, IRubyObject value) {
-    int arrIndex = normalizeArrayIndex(index);
-    value = Utils.checkType(context, fieldType, name, value, (RubyModule) typeClass);
-    IRubyObject defaultValue = defaultValue(context);
-    for (int i = this.storage.size(); i < arrIndex; i++) {
-      this.storage.set(i, defaultValue);
-    }
-    this.storage.set(arrIndex, value);
-    return context.runtime.getNil();
-  }
-
-  /*
-   * call-seq:
-   *     RepeatedField.[](index) => value
-   *
-   * Accesses the element at the given index. Returns nil on out-of-bounds
-   */
-  @JRubyMethod(
-      required = 1,
-      optional = 1,
-      name = {"at", "[]"})
-  public IRubyObject index(ThreadContext context, IRubyObject[] args) {
-    if (args.length == 1) {
-      IRubyObject arg = args[0];
-      if (Utils.isRubyNum(arg)) {
-        /* standard case */
-        int arrIndex = normalizeArrayIndex(arg);
-        if (arrIndex < 0 || arrIndex >= this.storage.size()) {
-          return context.runtime.getNil();
-        }
-        return this.storage.eltInternal(arrIndex);
-      } else if (arg instanceof RubyRange) {
-        RubyRange range = ((RubyRange) arg);
-
-        int first = normalizeArrayIndex(range.first(context));
-        int last = normalizeArrayIndex(range.last(context));
-
-        if (last - first < 0) {
-          return context.runtime.newEmptyArray();
-        }
-
-        return this.storage.subseq(first, last - first + (range.isExcludeEnd() ? 0 : 1));
-      }
-    }
-    /* assume 2 arguments */
-    int beg = RubyNumeric.num2int(args[0]);
-    int len = RubyNumeric.num2int(args[1]);
-    if (beg < 0) {
-      beg += this.storage.size();
-    }
-    if (beg >= this.storage.size()) {
-      return context.runtime.getNil();
-    }
-    return this.storage.subseq(beg, len);
-  }
-
-  /*
-   * call-seq:
-   *     RepeatedField.push(value)
-   *
-   * Adds a new element to the repeated field.
-   */
-  @JRubyMethod(
-      name = {"push", "<<"},
-      required = 1,
-      rest = true)
-  public IRubyObject push(ThreadContext context, IRubyObject[] args) {
-    for (int i = 0; i < args.length; i++) {
-      IRubyObject val = args[i];
-      if (fieldType != FieldDescriptor.Type.MESSAGE || !val.isNil()) {
-        val = Utils.checkType(context, fieldType, name, val, (RubyModule) typeClass);
-      }
-      storage.add(val);
-    }
-
-    return this;
-  }
-
-  /*
-   * private Ruby method used by RepeatedField.pop
-   */
-  @JRubyMethod(visibility = org.jruby.runtime.Visibility.PRIVATE)
-  public IRubyObject pop_one(ThreadContext context) {
-    IRubyObject ret = this.storage.last();
-    this.storage.remove(ret);
-    return ret;
-  }
-
-  /*
-   * call-seq:
-   *     RepeatedField.replace(list)
-   *
-   * Replaces the contents of the repeated field with the given list of elements.
-   */
-  @JRubyMethod
-  public IRubyObject replace(ThreadContext context, IRubyObject list) {
-    RubyArray arr = (RubyArray) list;
-    checkArrayElementType(context, arr);
-    this.storage = arr;
-    return this;
-  }
-
-  /*
-   * call-seq:
-   *     RepeatedField.clear
-   *
-   * Clears (removes all elements from) this repeated field.
-   */
-  @JRubyMethod
-  public IRubyObject clear(ThreadContext context) {
-    this.storage.clear();
-    return this;
-  }
-
-  /*
-   * call-seq:
-   *     RepeatedField.length
-   *
-   * Returns the length of this repeated field.
-   */
-  @JRubyMethod(name = {"length", "size"})
-  public IRubyObject length(ThreadContext context) {
-    return context.runtime.newFixnum(this.storage.size());
-  }
-
-  /*
-   * call-seq:
-   *     RepeatedField.+(other) => repeated field
-   *
-   * Returns a new repeated field that contains the concatenated list of this
-   * repeated field's elements and other's elements. The other (second) list may
-   * be either another repeated field or a Ruby array.
-   */
-  @JRubyMethod(name = {"+"})
-  public IRubyObject plus(ThreadContext context, IRubyObject list) {
-    RubyRepeatedField dup = (RubyRepeatedField) dup(context);
-    if (list instanceof RubyArray) {
-      checkArrayElementType(context, (RubyArray) list);
-      dup.storage.addAll((RubyArray) list);
-    } else {
-      RubyRepeatedField repeatedField = (RubyRepeatedField) list;
-      if (!fieldType.equals(repeatedField.fieldType)
-          || (typeClass != null && !typeClass.equals(repeatedField.typeClass)))
-        throw context.runtime.newArgumentError(
-            "Attempt to append RepeatedField with different element type.");
-      dup.storage.addAll((RubyArray) repeatedField.toArray(context));
-    }
-    return dup;
-  }
-
-  /*
-   * call-seq:
-   *     RepeatedField.concat(other) => self
-   *
-   * concats the passed in array to self.  Returns a Ruby array.
-   */
-  @JRubyMethod
-  public IRubyObject concat(ThreadContext context, IRubyObject list) {
-    if (list instanceof RubyArray) {
-      checkArrayElementType(context, (RubyArray) list);
-      this.storage.addAll((RubyArray) list);
-    } else {
-      RubyRepeatedField repeatedField = (RubyRepeatedField) list;
-      if (!fieldType.equals(repeatedField.fieldType)
-          || (typeClass != null && !typeClass.equals(repeatedField.typeClass)))
-        throw context.runtime.newArgumentError(
-            "Attempt to append RepeatedField with different element type.");
-      this.storage.addAll((RubyArray) repeatedField.toArray(context));
-    }
-    return this;
-  }
-
-  /*
-   * call-seq:
-   *     RepeatedField.hash => hash_value
-   *
-   * Returns a hash value computed from this repeated field's elements.
-   */
-  @JRubyMethod
-  public IRubyObject hash(ThreadContext context) {
-    int hashCode = this.storage.hashCode();
-    return context.runtime.newFixnum(hashCode);
-  }
-
-  /*
-   * call-seq:
-   *     RepeatedField.==(other) => boolean
-   *
-   * Compares this repeated field to another. Repeated fields are equal if their
-   * element types are equal, their lengths are equal, and each element is equal.
-   * Elements are compared as per normal Ruby semantics, by calling their :==
-   * methods (or performing a more efficient comparison for primitive types).
-   */
-  @JRubyMethod(name = "==")
-  public IRubyObject eq(ThreadContext context, IRubyObject other) {
-    return this.toArray(context).op_equal(context, other);
-  }
-
-  /*
-   * call-seq:
-   *     RepeatedField.each(&block)
-   *
-   * Invokes the block once for each element of the repeated field. RepeatedField
-   * also includes Enumerable; combined with this method, the repeated field thus
-   * acts like an ordinary Ruby sequence.
-   */
-  @JRubyMethod
-  public IRubyObject each(ThreadContext context, Block block) {
-    this.storage.each(context, block);
-    return this;
-  }
-
-  @JRubyMethod(name = {"to_ary", "to_a"})
-  public IRubyObject toArray(ThreadContext context) {
-    return this.storage;
-  }
-
-  /*
-   * call-seq:
-   *     RepeatedField.dup => repeated_field
-   *
-   * Duplicates this repeated field with a shallow copy. References to all
-   * non-primitive element objects (e.g., submessages) are shared.
-   */
-  @JRubyMethod
-  public IRubyObject dup(ThreadContext context) {
-    RubyRepeatedField dup = new RubyRepeatedField(context.runtime, metaClass, fieldType, typeClass);
-    dup.push(context, storage.toJavaArray());
-    return dup;
-  }
-
-  @JRubyMethod
-  public IRubyObject inspect() {
-    return storage.inspect();
-  }
-
-  // Java API
-  protected IRubyObject get(int index) {
-    return this.storage.eltInternal(index);
-  }
-
-  protected RubyRepeatedField deepCopy(ThreadContext context) {
-    RubyRepeatedField copy =
-        new RubyRepeatedField(context.runtime, metaClass, fieldType, typeClass);
-    for (int i = 0; i < size(); i++) {
-      IRubyObject value = storage.eltInternal(i);
-      if (fieldType == FieldDescriptor.Type.MESSAGE) {
-        copy.storage.add(((RubyMessage) value).deepCopy(context));
-      } else {
-        copy.storage.add(value);
-      }
-    }
-    return copy;
-  }
-
-  protected void setName(String name) {
-    this.name = name;
-  }
-
-  protected int size() {
-    return this.storage.size();
-  }
-
-  private IRubyObject defaultValue(ThreadContext context) {
-    SentinelOuterClass.Sentinel sentinel = SentinelOuterClass.Sentinel.getDefaultInstance();
-    Object value;
-    switch (fieldType) {
-      case INT32:
-        value = sentinel.getDefaultInt32();
-        break;
-      case INT64:
-        value = sentinel.getDefaultInt64();
-        break;
-      case UINT32:
-        value = sentinel.getDefaultUnit32();
-        break;
-      case UINT64:
-        value = sentinel.getDefaultUint64();
-        break;
-      case FLOAT:
-        value = sentinel.getDefaultFloat();
-        break;
-      case DOUBLE:
-        value = sentinel.getDefaultDouble();
-        break;
-      case BOOL:
-        value = sentinel.getDefaultBool();
-        break;
-      case BYTES:
-        value = sentinel.getDefaultBytes();
-        break;
-      case STRING:
-        value = sentinel.getDefaultString();
-        break;
-      case ENUM:
-        IRubyObject defaultEnumLoc = context.runtime.newFixnum(0);
-        return RubyEnum.lookup(context, typeClass, defaultEnumLoc);
-      default:
-        return context.runtime.getNil();
-    }
-    return Utils.wrapPrimaryValue(context, fieldType, value);
-  }
-
-  private void checkArrayElementType(ThreadContext context, RubyArray arr) {
-    for (int i = 0; i < arr.getLength(); i++) {
-      Utils.checkType(context, fieldType, name, arr.eltInternal(i), (RubyModule) typeClass);
-    }
-  }
-
-  private int normalizeArrayIndex(IRubyObject index) {
-    int arrIndex = RubyNumeric.num2int(index);
-    int arrSize = this.storage.size();
-    if (arrIndex < 0 && arrSize > 0) {
-      arrIndex = arrSize + arrIndex;
-    }
-    return arrIndex;
-  }
-
-  private FieldDescriptor.Type fieldType;
-  private IRubyObject typeClass;
-  private RubyArray storage;
-  private String name;
-}
diff --git a/libs/protobuf/ruby/src/main/java/com/google/protobuf/jruby/SentinelOuterClass.java b/libs/protobuf/ruby/src/main/java/com/google/protobuf/jruby/SentinelOuterClass.java
deleted file mode 100644
index 3c56cf8..0000000
--- a/libs/protobuf/ruby/src/main/java/com/google/protobuf/jruby/SentinelOuterClass.java
+++ /dev/null
@@ -1,693 +0,0 @@
-/*
- * Protocol Buffers - Google's data interchange format
- * Copyright 2014 Google Inc.  All rights reserved.
- * https://developers.google.com/protocol-buffers/
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: sentinel.proto
-
-package com.google.protobuf.jruby;
-
-public final class SentinelOuterClass {
-  private SentinelOuterClass() {}
-
-  public static void registerAllExtensions(com.google.protobuf.ExtensionRegistry registry) {}
-
-  public interface SentinelOrBuilder
-      extends
-      // @@protoc_insertion_point(interface_extends:com.google.protobuf.jruby.Sentinel)
-      com.google.protobuf.MessageOrBuilder {
-
-    /** <code>optional int32 default_int32 = 1;</code> */
-    int getDefaultInt32();
-
-    /** <code>optional int64 default_int64 = 2;</code> */
-    long getDefaultInt64();
-
-    /** <code>optional uint32 default_unit32 = 3;</code> */
-    int getDefaultUnit32();
-
-    /** <code>optional uint64 default_uint64 = 4;</code> */
-    long getDefaultUint64();
-
-    /** <code>optional string default_string = 5;</code> */
-    java.lang.String getDefaultString();
-    /** <code>optional string default_string = 5;</code> */
-    com.google.protobuf.ByteString getDefaultStringBytes();
-
-    /** <code>optional bool default_bool = 6;</code> */
-    boolean getDefaultBool();
-
-    /** <code>optional float default_float = 7;</code> */
-    float getDefaultFloat();
-
-    /** <code>optional double default_double = 8;</code> */
-    double getDefaultDouble();
-
-    /** <code>optional bytes default_bytes = 9;</code> */
-    com.google.protobuf.ByteString getDefaultBytes();
-  }
-  /** Protobuf type {@code com.google.protobuf.jruby.Sentinel} */
-  public static final class Sentinel extends com.google.protobuf.GeneratedMessage
-      implements
-      // @@protoc_insertion_point(message_implements:com.google.protobuf.jruby.Sentinel)
-      SentinelOrBuilder {
-    // Use Sentinel.newBuilder() to construct.
-    private Sentinel(com.google.protobuf.GeneratedMessage.Builder builder) {
-      super(builder);
-    }
-
-    private Sentinel() {
-      defaultInt32_ = 0;
-      defaultInt64_ = 0L;
-      defaultUnit32_ = 0;
-      defaultUint64_ = 0L;
-      defaultString_ = "";
-      defaultBool_ = false;
-      defaultFloat_ = 0F;
-      defaultDouble_ = 0D;
-      defaultBytes_ = com.google.protobuf.ByteString.EMPTY;
-    }
-
-    @java.lang.Override
-    public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
-      return com.google.protobuf.UnknownFieldSet.getDefaultInstance();
-    }
-
-    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-      return com.google.protobuf.jruby.SentinelOuterClass
-          .internal_static_com_google_protobuf_jruby_Sentinel_descriptor;
-    }
-
-    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
-        internalGetFieldAccessorTable() {
-      return com.google.protobuf.jruby.SentinelOuterClass
-          .internal_static_com_google_protobuf_jruby_Sentinel_fieldAccessorTable
-          .ensureFieldAccessorsInitialized(
-              com.google.protobuf.jruby.SentinelOuterClass.Sentinel.class,
-              com.google.protobuf.jruby.SentinelOuterClass.Sentinel.Builder.class);
-    }
-
-    public static final com.google.protobuf.Parser<Sentinel> PARSER =
-        new com.google.protobuf.AbstractParser<Sentinel>() {
-          public Sentinel parsePartialFrom(
-              com.google.protobuf.CodedInputStream input,
-              com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-              throws com.google.protobuf.InvalidProtocolBufferException {
-            Builder builder = newBuilder();
-            try {
-              builder.mergeFrom(input, extensionRegistry);
-            } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-              throw e.setUnfinishedMessage(builder.buildPartial());
-            } catch (java.io.IOException e) {
-              throw new com.google.protobuf.InvalidProtocolBufferException(e.getMessage())
-                  .setUnfinishedMessage(builder.buildPartial());
-            }
-            return builder.buildPartial();
-          }
-        };
-
-    @java.lang.Override
-    public com.google.protobuf.Parser<Sentinel> getParserForType() {
-      return PARSER;
-    }
-
-    public static final int DEFAULT_INT32_FIELD_NUMBER = 1;
-    private int defaultInt32_;
-    /** <code>optional int32 default_int32 = 1;</code> */
-    public int getDefaultInt32() {
-      return defaultInt32_;
-    }
-
-    public static final int DEFAULT_INT64_FIELD_NUMBER = 2;
-    private long defaultInt64_;
-    /** <code>optional int64 default_int64 = 2;</code> */
-    public long getDefaultInt64() {
-      return defaultInt64_;
-    }
-
-    public static final int DEFAULT_UNIT32_FIELD_NUMBER = 3;
-    private int defaultUnit32_;
-    /** <code>optional uint32 default_unit32 = 3;</code> */
-    public int getDefaultUnit32() {
-      return defaultUnit32_;
-    }
-
-    public static final int DEFAULT_UINT64_FIELD_NUMBER = 4;
-    private long defaultUint64_;
-    /** <code>optional uint64 default_uint64 = 4;</code> */
-    public long getDefaultUint64() {
-      return defaultUint64_;
-    }
-
-    public static final int DEFAULT_STRING_FIELD_NUMBER = 5;
-    private java.lang.Object defaultString_;
-    /** <code>optional string default_string = 5;</code> */
-    public java.lang.String getDefaultString() {
-      java.lang.Object ref = defaultString_;
-      if (ref instanceof java.lang.String) {
-        return (java.lang.String) ref;
-      } else {
-        com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
-        if (bs.isValidUtf8()) {
-          defaultString_ = s;
-        }
-        return s;
-      }
-    }
-    /** <code>optional string default_string = 5;</code> */
-    public com.google.protobuf.ByteString getDefaultStringBytes() {
-      java.lang.Object ref = defaultString_;
-      if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b =
-            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
-        defaultString_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
-    }
-
-    public static final int DEFAULT_BOOL_FIELD_NUMBER = 6;
-    private boolean defaultBool_;
-    /** <code>optional bool default_bool = 6;</code> */
-    public boolean getDefaultBool() {
-      return defaultBool_;
-    }
-
-    public static final int DEFAULT_FLOAT_FIELD_NUMBER = 7;
-    private float defaultFloat_;
-    /** <code>optional float default_float = 7;</code> */
-    public float getDefaultFloat() {
-      return defaultFloat_;
-    }
-
-    public static final int DEFAULT_DOUBLE_FIELD_NUMBER = 8;
-    private double defaultDouble_;
-    /** <code>optional double default_double = 8;</code> */
-    public double getDefaultDouble() {
-      return defaultDouble_;
-    }
-
-    public static final int DEFAULT_BYTES_FIELD_NUMBER = 9;
-    private com.google.protobuf.ByteString defaultBytes_;
-    /** <code>optional bytes default_bytes = 9;</code> */
-    public com.google.protobuf.ByteString getDefaultBytes() {
-      return defaultBytes_;
-    }
-
-    public static com.google.protobuf.jruby.SentinelOuterClass.Sentinel parseFrom(
-        com.google.protobuf.ByteString data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-
-    public static com.google.protobuf.jruby.SentinelOuterClass.Sentinel parseFrom(
-        com.google.protobuf.ByteString data,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-
-    public static com.google.protobuf.jruby.SentinelOuterClass.Sentinel parseFrom(byte[] data)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data);
-    }
-
-    public static com.google.protobuf.jruby.SentinelOuterClass.Sentinel parseFrom(
-        byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws com.google.protobuf.InvalidProtocolBufferException {
-      return PARSER.parseFrom(data, extensionRegistry);
-    }
-
-    public static com.google.protobuf.jruby.SentinelOuterClass.Sentinel parseFrom(
-        java.io.InputStream input) throws java.io.IOException {
-      return PARSER.parseFrom(input);
-    }
-
-    public static com.google.protobuf.jruby.SentinelOuterClass.Sentinel parseFrom(
-        java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
-    }
-
-    public static com.google.protobuf.jruby.SentinelOuterClass.Sentinel parseDelimitedFrom(
-        java.io.InputStream input) throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input);
-    }
-
-    public static com.google.protobuf.jruby.SentinelOuterClass.Sentinel parseDelimitedFrom(
-        java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return PARSER.parseDelimitedFrom(input, extensionRegistry);
-    }
-
-    public static com.google.protobuf.jruby.SentinelOuterClass.Sentinel parseFrom(
-        com.google.protobuf.CodedInputStream input) throws java.io.IOException {
-      return PARSER.parseFrom(input);
-    }
-
-    public static com.google.protobuf.jruby.SentinelOuterClass.Sentinel parseFrom(
-        com.google.protobuf.CodedInputStream input,
-        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-        throws java.io.IOException {
-      return PARSER.parseFrom(input, extensionRegistry);
-    }
-
-    public static Builder newBuilder() {
-      return new Builder();
-    }
-
-    public Builder newBuilderForType() {
-      return newBuilder();
-    }
-
-    public static Builder newBuilder(
-        com.google.protobuf.jruby.SentinelOuterClass.Sentinel prototype) {
-      return newBuilder().mergeFrom(prototype);
-    }
-
-    public Builder toBuilder() {
-      return newBuilder(this);
-    }
-
-    @java.lang.Override
-    protected Builder newBuilderForType(com.google.protobuf.GeneratedMessage.BuilderParent parent) {
-      Builder builder = new Builder(parent);
-      return builder;
-    }
-    /** Protobuf type {@code com.google.protobuf.jruby.Sentinel} */
-    public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder<Builder>
-        implements
-        // @@protoc_insertion_point(builder_implements:com.google.protobuf.jruby.Sentinel)
-        com.google.protobuf.jruby.SentinelOuterClass.SentinelOrBuilder {
-      public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
-        return com.google.protobuf.jruby.SentinelOuterClass
-            .internal_static_com_google_protobuf_jruby_Sentinel_descriptor;
-      }
-
-      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
-          internalGetFieldAccessorTable() {
-        return com.google.protobuf.jruby.SentinelOuterClass
-            .internal_static_com_google_protobuf_jruby_Sentinel_fieldAccessorTable
-            .ensureFieldAccessorsInitialized(
-                com.google.protobuf.jruby.SentinelOuterClass.Sentinel.class,
-                com.google.protobuf.jruby.SentinelOuterClass.Sentinel.Builder.class);
-      }
-
-      // Construct using com.google.protobuf.jruby.SentinelOuterClass.Sentinel.newBuilder()
-      private Builder() {
-        maybeForceBuilderInitialization();
-      }
-
-      private Builder(com.google.protobuf.GeneratedMessage.BuilderParent parent) {
-        super(parent);
-        maybeForceBuilderInitialization();
-      }
-
-      private void maybeForceBuilderInitialization() {
-        if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {}
-      }
-
-      public Builder clear() {
-        super.clear();
-        defaultInt32_ = 0;
-
-        defaultInt64_ = 0L;
-
-        defaultUnit32_ = 0;
-
-        defaultUint64_ = 0L;
-
-        defaultString_ = "";
-
-        defaultBool_ = false;
-
-        defaultFloat_ = 0F;
-
-        defaultDouble_ = 0D;
-
-        defaultBytes_ = com.google.protobuf.ByteString.EMPTY;
-
-        return this;
-      }
-
-      public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
-        return com.google.protobuf.jruby.SentinelOuterClass
-            .internal_static_com_google_protobuf_jruby_Sentinel_descriptor;
-      }
-
-      public com.google.protobuf.jruby.SentinelOuterClass.Sentinel getDefaultInstanceForType() {
-        return com.google.protobuf.jruby.SentinelOuterClass.Sentinel.getDefaultInstance();
-      }
-
-      public com.google.protobuf.jruby.SentinelOuterClass.Sentinel build() {
-        com.google.protobuf.jruby.SentinelOuterClass.Sentinel result = buildPartial();
-        if (!result.isInitialized()) {
-          throw newUninitializedMessageException(result);
-        }
-        return result;
-      }
-
-      public com.google.protobuf.jruby.SentinelOuterClass.Sentinel buildPartial() {
-        com.google.protobuf.jruby.SentinelOuterClass.Sentinel result =
-            new com.google.protobuf.jruby.SentinelOuterClass.Sentinel(this);
-        result.defaultInt32_ = defaultInt32_;
-        result.defaultInt64_ = defaultInt64_;
-        result.defaultUnit32_ = defaultUnit32_;
-        result.defaultUint64_ = defaultUint64_;
-        result.defaultString_ = defaultString_;
-        result.defaultBool_ = defaultBool_;
-        result.defaultFloat_ = defaultFloat_;
-        result.defaultDouble_ = defaultDouble_;
-        result.defaultBytes_ = defaultBytes_;
-        onBuilt();
-        return result;
-      }
-
-      private int defaultInt32_;
-      /** <code>optional int32 default_int32 = 1;</code> */
-      public int getDefaultInt32() {
-        return defaultInt32_;
-      }
-      /** <code>optional int32 default_int32 = 1;</code> */
-      public Builder setDefaultInt32(int value) {
-
-        defaultInt32_ = value;
-        onChanged();
-        return this;
-      }
-      /** <code>optional int32 default_int32 = 1;</code> */
-      public Builder clearDefaultInt32() {
-
-        defaultInt32_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private long defaultInt64_;
-      /** <code>optional int64 default_int64 = 2;</code> */
-      public long getDefaultInt64() {
-        return defaultInt64_;
-      }
-      /** <code>optional int64 default_int64 = 2;</code> */
-      public Builder setDefaultInt64(long value) {
-
-        defaultInt64_ = value;
-        onChanged();
-        return this;
-      }
-      /** <code>optional int64 default_int64 = 2;</code> */
-      public Builder clearDefaultInt64() {
-
-        defaultInt64_ = 0L;
-        onChanged();
-        return this;
-      }
-
-      private int defaultUnit32_;
-      /** <code>optional uint32 default_unit32 = 3;</code> */
-      public int getDefaultUnit32() {
-        return defaultUnit32_;
-      }
-      /** <code>optional uint32 default_unit32 = 3;</code> */
-      public Builder setDefaultUnit32(int value) {
-
-        defaultUnit32_ = value;
-        onChanged();
-        return this;
-      }
-      /** <code>optional uint32 default_unit32 = 3;</code> */
-      public Builder clearDefaultUnit32() {
-
-        defaultUnit32_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private long defaultUint64_;
-      /** <code>optional uint64 default_uint64 = 4;</code> */
-      public long getDefaultUint64() {
-        return defaultUint64_;
-      }
-      /** <code>optional uint64 default_uint64 = 4;</code> */
-      public Builder setDefaultUint64(long value) {
-
-        defaultUint64_ = value;
-        onChanged();
-        return this;
-      }
-      /** <code>optional uint64 default_uint64 = 4;</code> */
-      public Builder clearDefaultUint64() {
-
-        defaultUint64_ = 0L;
-        onChanged();
-        return this;
-      }
-
-      private java.lang.Object defaultString_ = "";
-      /** <code>optional string default_string = 5;</code> */
-      public java.lang.String getDefaultString() {
-        java.lang.Object ref = defaultString_;
-        if (!(ref instanceof java.lang.String)) {
-          com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
-          java.lang.String s = bs.toStringUtf8();
-          if (bs.isValidUtf8()) {
-            defaultString_ = s;
-          }
-          return s;
-        } else {
-          return (java.lang.String) ref;
-        }
-      }
-      /** <code>optional string default_string = 5;</code> */
-      public com.google.protobuf.ByteString getDefaultStringBytes() {
-        java.lang.Object ref = defaultString_;
-        if (ref instanceof String) {
-          com.google.protobuf.ByteString b =
-              com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
-          defaultString_ = b;
-          return b;
-        } else {
-          return (com.google.protobuf.ByteString) ref;
-        }
-      }
-      /** <code>optional string default_string = 5;</code> */
-      public Builder setDefaultString(java.lang.String value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-
-        defaultString_ = value;
-        onChanged();
-        return this;
-      }
-      /** <code>optional string default_string = 5;</code> */
-      public Builder clearDefaultString() {
-
-        defaultString_ = getDefaultInstance().getDefaultString();
-        onChanged();
-        return this;
-      }
-      /** <code>optional string default_string = 5;</code> */
-      public Builder setDefaultStringBytes(com.google.protobuf.ByteString value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-
-        defaultString_ = value;
-        onChanged();
-        return this;
-      }
-
-      private boolean defaultBool_;
-      /** <code>optional bool default_bool = 6;</code> */
-      public boolean getDefaultBool() {
-        return defaultBool_;
-      }
-      /** <code>optional bool default_bool = 6;</code> */
-      public Builder setDefaultBool(boolean value) {
-
-        defaultBool_ = value;
-        onChanged();
-        return this;
-      }
-      /** <code>optional bool default_bool = 6;</code> */
-      public Builder clearDefaultBool() {
-
-        defaultBool_ = false;
-        onChanged();
-        return this;
-      }
-
-      private float defaultFloat_;
-      /** <code>optional float default_float = 7;</code> */
-      public float getDefaultFloat() {
-        return defaultFloat_;
-      }
-      /** <code>optional float default_float = 7;</code> */
-      public Builder setDefaultFloat(float value) {
-
-        defaultFloat_ = value;
-        onChanged();
-        return this;
-      }
-      /** <code>optional float default_float = 7;</code> */
-      public Builder clearDefaultFloat() {
-
-        defaultFloat_ = 0F;
-        onChanged();
-        return this;
-      }
-
-      private double defaultDouble_;
-      /** <code>optional double default_double = 8;</code> */
-      public double getDefaultDouble() {
-        return defaultDouble_;
-      }
-      /** <code>optional double default_double = 8;</code> */
-      public Builder setDefaultDouble(double value) {
-
-        defaultDouble_ = value;
-        onChanged();
-        return this;
-      }
-      /** <code>optional double default_double = 8;</code> */
-      public Builder clearDefaultDouble() {
-
-        defaultDouble_ = 0D;
-        onChanged();
-        return this;
-      }
-
-      private com.google.protobuf.ByteString defaultBytes_ = com.google.protobuf.ByteString.EMPTY;
-      /** <code>optional bytes default_bytes = 9;</code> */
-      public com.google.protobuf.ByteString getDefaultBytes() {
-        return defaultBytes_;
-      }
-      /** <code>optional bytes default_bytes = 9;</code> */
-      public Builder setDefaultBytes(com.google.protobuf.ByteString value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-
-        defaultBytes_ = value;
-        onChanged();
-        return this;
-      }
-      /** <code>optional bytes default_bytes = 9;</code> */
-      public Builder clearDefaultBytes() {
-
-        defaultBytes_ = getDefaultInstance().getDefaultBytes();
-        onChanged();
-        return this;
-      }
-
-      public final Builder setUnknownFields(
-          final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
-      }
-
-      public final Builder mergeUnknownFields(
-          final com.google.protobuf.UnknownFieldSet unknownFields) {
-        return this;
-      }
-
-      // @@protoc_insertion_point(builder_scope:com.google.protobuf.jruby.Sentinel)
-    }
-
-    // @@protoc_insertion_point(class_scope:com.google.protobuf.jruby.Sentinel)
-    private static final com.google.protobuf.jruby.SentinelOuterClass.Sentinel defaultInstance;
-
-    static {
-      defaultInstance = new com.google.protobuf.jruby.SentinelOuterClass.Sentinel();
-    }
-
-    public static com.google.protobuf.jruby.SentinelOuterClass.Sentinel getDefaultInstance() {
-      return defaultInstance;
-    }
-
-    public com.google.protobuf.jruby.SentinelOuterClass.Sentinel getDefaultInstanceForType() {
-      return defaultInstance;
-    }
-  }
-
-  private static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_com_google_protobuf_jruby_Sentinel_descriptor;
-  private static com.google.protobuf.GeneratedMessage.FieldAccessorTable
-      internal_static_com_google_protobuf_jruby_Sentinel_fieldAccessorTable;
-
-  public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
-    return descriptor;
-  }
-
-  private static com.google.protobuf.Descriptors.FileDescriptor descriptor;
-
-  static {
-    java.lang.String[] descriptorData = {
-      "\n\016sentinel.proto\022\031com.google.protobuf.jr"
-          + "uby\"\334\001\n\010Sentinel\022\025\n\rdefault_int32\030\001 \001(\005\022"
-          + "\025\n\rdefault_int64\030\002 \001(\003\022\026\n\016default_unit32"
-          + "\030\003 \001(\r\022\026\n\016default_uint64\030\004 \001(\004\022\026\n\016defaul"
-          + "t_string\030\005 \001(\t\022\024\n\014default_bool\030\006 \001(\010\022\025\n\r"
-          + "default_float\030\007 \001(\002\022\026\n\016default_double\030\010 "
-          + "\001(\001\022\025\n\rdefault_bytes\030\t \001(\014B\002H\002b\006proto3"
-    };
-    com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
-        new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
-          public com.google.protobuf.ExtensionRegistry assignDescriptors(
-              com.google.protobuf.Descriptors.FileDescriptor root) {
-            descriptor = root;
-            return null;
-          }
-        };
-    com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
-        descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] {}, assigner);
-    internal_static_com_google_protobuf_jruby_Sentinel_descriptor =
-        getDescriptor().getMessageTypes().get(0);
-    internal_static_com_google_protobuf_jruby_Sentinel_fieldAccessorTable =
-        new com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-            internal_static_com_google_protobuf_jruby_Sentinel_descriptor,
-            new java.lang.String[] {
-              "DefaultInt32",
-              "DefaultInt64",
-              "DefaultUnit32",
-              "DefaultUint64",
-              "DefaultString",
-              "DefaultBool",
-              "DefaultFloat",
-              "DefaultDouble",
-              "DefaultBytes",
-            });
-  }
-
-  // @@protoc_insertion_point(outer_class_scope)
-}
diff --git a/libs/protobuf/ruby/src/main/java/com/google/protobuf/jruby/Utils.java b/libs/protobuf/ruby/src/main/java/com/google/protobuf/jruby/Utils.java
deleted file mode 100644
index 65de683..0000000
--- a/libs/protobuf/ruby/src/main/java/com/google/protobuf/jruby/Utils.java
+++ /dev/null
@@ -1,407 +0,0 @@
-/*
- * Protocol Buffers - Google's data interchange format
- * Copyright 2014 Google Inc.  All rights reserved.
- * https://developers.google.com/protocol-buffers/
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package com.google.protobuf.jruby;
-
-import com.google.protobuf.ByteString;
-import com.google.protobuf.DescriptorProtos.FieldDescriptorProto;
-import com.google.protobuf.Descriptors.FieldDescriptor;
-import java.math.BigInteger;
-import org.jcodings.specific.ASCIIEncoding;
-import org.jruby.*;
-import org.jruby.exceptions.RaiseException;
-import org.jruby.ext.bigdecimal.RubyBigDecimal;
-import org.jruby.runtime.Block;
-import org.jruby.runtime.Helpers;
-import org.jruby.runtime.ThreadContext;
-import org.jruby.runtime.builtin.IRubyObject;
-
-public class Utils {
-  public static FieldDescriptor.Type rubyToFieldType(IRubyObject typeClass) {
-    return FieldDescriptor.Type.valueOf(typeClass.asJavaString().toUpperCase());
-  }
-
-  public static IRubyObject fieldTypeToRuby(ThreadContext context, FieldDescriptor.Type type) {
-    return fieldTypeToRuby(context, type.name());
-  }
-
-  public static IRubyObject fieldTypeToRuby(ThreadContext context, FieldDescriptorProto.Type type) {
-    return fieldTypeToRuby(context, type.name());
-  }
-
-  private static IRubyObject fieldTypeToRuby(ThreadContext context, String typeName) {
-
-    return context.runtime.newSymbol(typeName.replace("TYPE_", "").toLowerCase());
-  }
-
-  public static IRubyObject checkType(
-      ThreadContext context,
-      FieldDescriptor.Type fieldType,
-      String fieldName,
-      IRubyObject value,
-      RubyModule typeClass) {
-    Ruby runtime = context.runtime;
-
-    switch (fieldType) {
-      case SFIXED32:
-      case SFIXED64:
-      case FIXED64:
-      case SINT64:
-      case SINT32:
-      case FIXED32:
-      case INT32:
-      case INT64:
-      case UINT32:
-      case UINT64:
-        if (!isRubyNum(value))
-          throw createExpectedTypeError(context, "number", "integral", fieldName, value);
-
-        if (value instanceof RubyFloat) {
-          double doubleVal = RubyNumeric.num2dbl(value);
-          if (Math.floor(doubleVal) != doubleVal) {
-            throw runtime.newRangeError(
-                "Non-integral floating point value assigned to integer field '"
-                    + fieldName
-                    + "' (given "
-                    + value.getMetaClass()
-                    + ").");
-          }
-        }
-        if (fieldType == FieldDescriptor.Type.UINT32
-            || fieldType == FieldDescriptor.Type.UINT64
-            || fieldType == FieldDescriptor.Type.FIXED32
-            || fieldType == FieldDescriptor.Type.FIXED64) {
-          if (((RubyNumeric) value).isNegative()) {
-            throw runtime.newRangeError(
-                "Assigning negative value to unsigned integer field '"
-                    + fieldName
-                    + "' (given "
-                    + value.getMetaClass()
-                    + ").");
-          }
-        }
-
-        switch (fieldType) {
-          case INT32:
-            RubyNumeric.num2int(value);
-            break;
-          case UINT32:
-          case FIXED32:
-            num2uint(value);
-            break;
-          case UINT64:
-          case FIXED64:
-            num2ulong(context.runtime, value);
-            break;
-          default:
-            RubyNumeric.num2long(value);
-            break;
-        }
-        break;
-      case FLOAT:
-        if (!isRubyNum(value))
-          throw createExpectedTypeError(context, "number", "float", fieldName, value);
-        break;
-      case DOUBLE:
-        if (!isRubyNum(value))
-          throw createExpectedTypeError(context, "number", "double", fieldName, value);
-        break;
-      case BOOL:
-        if (!(value instanceof RubyBoolean))
-          throw createInvalidTypeError(context, "boolean", fieldName, value);
-        break;
-      case BYTES:
-        value = validateAndEncodeString(context, "bytes", fieldName, value, "Encoding::ASCII_8BIT");
-        break;
-      case STRING:
-        value =
-            validateAndEncodeString(
-                context, "string", fieldName, symToString(value), "Encoding::UTF_8");
-        break;
-      case MESSAGE:
-        if (value.getMetaClass() != typeClass) {
-          // See if we can convert the value before flagging it as invalid
-          String className = typeClass.getName();
-
-          if (className.equals("Google::Protobuf::Timestamp") && value instanceof RubyTime) {
-            RubyTime rt = (RubyTime) value;
-            RubyHash timestampArgs =
-                Helpers.constructHash(
-                    runtime,
-                    runtime.newString("nanos"),
-                    rt.nsec(),
-                    false,
-                    runtime.newString("seconds"),
-                    rt.to_i(),
-                    false);
-            return ((RubyClass) typeClass).newInstance(context, timestampArgs, Block.NULL_BLOCK);
-
-          } else if (className.equals("Google::Protobuf::Duration")
-              && value instanceof RubyNumeric) {
-            IRubyObject seconds;
-            if (value instanceof RubyFloat) {
-              seconds = ((RubyFloat) value).truncate(context);
-            } else if (value instanceof RubyRational) {
-              seconds = ((RubyRational) value).to_i(context);
-            } else if (value instanceof RubyBigDecimal) {
-              seconds = ((RubyBigDecimal) value).to_int(context);
-            } else {
-              seconds = ((RubyInteger) value).to_i();
-            }
-
-            IRubyObject nanos = ((RubyNumeric) value).remainder(context, RubyFixnum.one(runtime));
-            if (nanos instanceof RubyFloat) {
-              nanos = ((RubyFloat) nanos).op_mul(context, 1000000000);
-            } else if (nanos instanceof RubyRational) {
-              nanos = ((RubyRational) nanos).op_mul(context, runtime.newFixnum(1000000000));
-            } else if (nanos instanceof RubyBigDecimal) {
-              nanos = ((RubyBigDecimal) nanos).op_mul(context, runtime.newFixnum(1000000000));
-            } else {
-              nanos = ((RubyInteger) nanos).op_mul(context, 1000000000);
-            }
-
-            RubyHash durationArgs =
-                Helpers.constructHash(
-                    runtime,
-                    runtime.newString("nanos"),
-                    ((RubyNumeric) nanos).round(context),
-                    false,
-                    runtime.newString("seconds"),
-                    seconds,
-                    false);
-            return ((RubyClass) typeClass).newInstance(context, durationArgs, Block.NULL_BLOCK);
-          }
-
-          // Not able to convert so flag as invalid
-          throw createTypeError(
-              context,
-              "Invalid type "
-                  + value.getMetaClass()
-                  + " to assign to submessage field '"
-                  + fieldName
-                  + "'.");
-        }
-
-        break;
-      case ENUM:
-        boolean isValid =
-            ((RubyEnumDescriptor) typeClass.getInstanceVariable(DESCRIPTOR_INSTANCE_VAR))
-                .isValidValue(context, value);
-        if (!isValid) {
-          throw runtime.newRangeError("Unknown symbol value for enum field '" + fieldName + "'.");
-        }
-        break;
-      default:
-        break;
-    }
-    return value;
-  }
-
-  public static IRubyObject wrapPrimaryValue(
-      ThreadContext context, FieldDescriptor.Type fieldType, Object value) {
-    return wrapPrimaryValue(context, fieldType, value, false);
-  }
-
-  public static IRubyObject wrapPrimaryValue(
-      ThreadContext context, FieldDescriptor.Type fieldType, Object value, boolean encodeBytes) {
-    Ruby runtime = context.runtime;
-    switch (fieldType) {
-      case INT32:
-      case SFIXED32:
-      case SINT32:
-        return runtime.newFixnum((Integer) value);
-      case SFIXED64:
-      case SINT64:
-      case INT64:
-        return runtime.newFixnum((Long) value);
-      case FIXED32:
-      case UINT32:
-        return runtime.newFixnum(((Integer) value) & (-1l >>> 32));
-      case FIXED64:
-      case UINT64:
-        long ret = (Long) value;
-        return ret >= 0
-            ? runtime.newFixnum(ret)
-            : RubyBignum.newBignum(runtime, UINT64_COMPLEMENTARY.add(new BigInteger(ret + "")));
-      case FLOAT:
-        return runtime.newFloat((Float) value);
-      case DOUBLE:
-        return runtime.newFloat((Double) value);
-      case BOOL:
-        return (Boolean) value ? runtime.getTrue() : runtime.getFalse();
-      case BYTES:
-        {
-          IRubyObject wrapped =
-              encodeBytes
-                  ? RubyString.newString(
-                      runtime, ((ByteString) value).toStringUtf8(), ASCIIEncoding.INSTANCE)
-                  : RubyString.newString(runtime, ((ByteString) value).toByteArray());
-          wrapped.setFrozen(true);
-          return wrapped;
-        }
-      case STRING:
-        {
-          IRubyObject wrapped = runtime.newString(value.toString());
-          wrapped.setFrozen(true);
-          return wrapped;
-        }
-      default:
-        return runtime.getNil();
-    }
-  }
-
-  public static int num2uint(IRubyObject value) {
-    long longVal = RubyNumeric.num2long(value);
-    if (longVal > UINT_MAX)
-      throw value
-          .getRuntime()
-          .newRangeError("Integer " + longVal + " too big to convert to 'unsigned int'");
-    long num = longVal;
-    if (num > Integer.MAX_VALUE || num < Integer.MIN_VALUE)
-      // encode to UINT32
-      num = (-longVal ^ (-1l >>> 32)) + 1;
-    RubyNumeric.checkInt(value, num);
-    return (int) num;
-  }
-
-  public static long num2ulong(Ruby runtime, IRubyObject value) {
-    if (value instanceof RubyFloat) {
-      RubyBignum bignum = RubyBignum.newBignum(runtime, ((RubyFloat) value).getDoubleValue());
-      return RubyBignum.big2ulong(bignum);
-    } else if (value instanceof RubyBignum) {
-      return RubyBignum.big2ulong((RubyBignum) value);
-    } else {
-      return RubyNumeric.num2long(value);
-    }
-  }
-
-  /*
-   * Helper to make it easier to support symbols being passed instead of strings
-   */
-  public static IRubyObject symToString(IRubyObject sym) {
-    if (sym instanceof RubySymbol) {
-      return ((RubySymbol) sym).id2name();
-    }
-    return sym;
-  }
-
-  public static void checkNameAvailability(ThreadContext context, String name) {
-    if (context.runtime.getObject().getConstantAt(name) != null)
-      throw context.runtime.newNameError(name + " is already defined", name);
-  }
-
-  public static boolean isMapEntry(FieldDescriptor fieldDescriptor) {
-    return fieldDescriptor.getType() == FieldDescriptor.Type.MESSAGE
-        && fieldDescriptor.isRepeated()
-        && fieldDescriptor.getMessageType().getOptions().getMapEntry();
-  }
-
-  public static RaiseException createTypeError(ThreadContext context, String message) {
-    if (cTypeError == null) {
-      cTypeError = (RubyClass) context.runtime.getClassFromPath("Google::Protobuf::TypeError");
-    }
-    return RaiseException.from(context.runtime, cTypeError, message);
-  }
-
-  public static RaiseException createExpectedTypeError(
-      ThreadContext context, String type, String fieldType, String fieldName, IRubyObject value) {
-    return createTypeError(
-        context,
-        String.format(
-            EXPECTED_TYPE_ERROR_FORMAT, type, fieldType, fieldName, value.getMetaClass()));
-  }
-
-  public static RaiseException createInvalidTypeError(
-      ThreadContext context, String fieldType, String fieldName, IRubyObject value) {
-    return createTypeError(
-        context,
-        String.format(INVALID_TYPE_ERROR_FORMAT, fieldType, fieldName, value.getMetaClass()));
-  }
-
-  protected static boolean isRubyNum(Object value) {
-    return value instanceof RubyFixnum || value instanceof RubyFloat || value instanceof RubyBignum;
-  }
-
-  protected static void validateTypeClass(
-      ThreadContext context, FieldDescriptor.Type type, IRubyObject value) {
-    Ruby runtime = context.runtime;
-    if (!(value instanceof RubyModule)) {
-      throw runtime.newArgumentError("TypeClass has incorrect type");
-    }
-    RubyModule klass = (RubyModule) value;
-    IRubyObject descriptor = klass.getInstanceVariable(DESCRIPTOR_INSTANCE_VAR);
-    if (descriptor.isNil()) {
-      throw runtime.newArgumentError(
-          "Type class has no descriptor. Please pass a "
-              + "class or enum as returned by the DescriptorPool.");
-    }
-    if (type == FieldDescriptor.Type.MESSAGE) {
-      if (!(descriptor instanceof RubyDescriptor)) {
-        throw runtime.newArgumentError("Descriptor has an incorrect type");
-      }
-    } else if (type == FieldDescriptor.Type.ENUM) {
-      if (!(descriptor instanceof RubyEnumDescriptor)) {
-        throw runtime.newArgumentError("Descriptor has an incorrect type");
-      }
-    }
-  }
-
-  private static IRubyObject validateAndEncodeString(
-      ThreadContext context,
-      String fieldType,
-      String fieldName,
-      IRubyObject value,
-      String encoding) {
-    if (!(value instanceof RubyString))
-      throw createInvalidTypeError(context, fieldType, fieldName, value);
-
-    value = ((RubyString) value).encode(context, context.runtime.evalScriptlet(encoding));
-    value.setFrozen(true);
-    return value;
-  }
-
-  public static final String DESCRIPTOR_INSTANCE_VAR = "@descriptor";
-
-  public static final String EQUAL_SIGN = "=";
-
-  private static final BigInteger UINT64_COMPLEMENTARY =
-      new BigInteger("18446744073709551616"); // Math.pow(2, 64)
-
-  private static final String EXPECTED_TYPE_ERROR_FORMAT =
-      "Expected %s type for %s field '%s' (given %s).";
-  private static final String INVALID_TYPE_ERROR_FORMAT =
-      "Invalid argument for %s field '%s' (given %s).";
-
-  private static final long UINT_MAX = 0xffffffffl;
-
-  private static RubyClass cTypeError;
-}
diff --git a/libs/protobuf/ruby/src/main/java/google/ProtobufJavaService.java b/libs/protobuf/ruby/src/main/java/google/ProtobufJavaService.java
deleted file mode 100644
index 00d60a1..0000000
--- a/libs/protobuf/ruby/src/main/java/google/ProtobufJavaService.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Protocol Buffers - Google's data interchange format
- * Copyright 2014 Google Inc.  All rights reserved.
- * https://developers.google.com/protocol-buffers/
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package google;
-
-import com.google.protobuf.jruby.*;
-import java.io.IOException;
-import org.jruby.Ruby;
-import org.jruby.runtime.load.BasicLibraryService;
-
-public class ProtobufJavaService implements BasicLibraryService {
-  @Override
-  public boolean basicLoad(Ruby ruby) throws IOException {
-    ruby.defineModule("Google");
-
-    /*
-     * The order these happen in is important because we
-     * save a static reference to some classes and they
-     * need to exist before we try to save a reference to them
-     */
-    RubyProtobuf.createProtobuf(ruby);
-    RubyFileDescriptor.createRubyFileDescriptor(ruby);
-    RubyEnumDescriptor.createRubyEnumDescriptor(ruby);
-    RubyRepeatedField.createRubyRepeatedField(ruby);
-    RubyFieldDescriptor.createRubyFieldDescriptor(ruby);
-    RubyMap.createRubyMap(ruby);
-    RubyOneofDescriptor.createRubyOneofDescriptor(ruby);
-    RubyDescriptor.createRubyDescriptor(ruby);
-    RubyDescriptorPool.createRubyDescriptorPool(ruby);
-    return true;
-  }
-}
diff --git a/libs/protobuf/ruby/src/main/sentinel.proto b/libs/protobuf/ruby/src/main/sentinel.proto
deleted file mode 100644
index 722041b..0000000
--- a/libs/protobuf/ruby/src/main/sentinel.proto
+++ /dev/null
@@ -1,15 +0,0 @@
-syntax = "proto3";
-package com.google.protobuf.jruby;
-option optimize_for = CODE_SIZE;
-
-message Sentinel {
-  int32 default_int32 = 1;
-  int64 default_int64 = 2;
-  uint32 default_unit32 = 3;
-  uint64 default_uint64 = 4;
-  string default_string = 5;
-  bool default_bool = 6;
-  float default_float = 7;
-  double default_double = 8;
-  bytes default_bytes = 9;
-}
diff --git a/libs/protobuf/ruby/tests/basic.rb b/libs/protobuf/ruby/tests/basic.rb
deleted file mode 100755
index 5b781b7..0000000
--- a/libs/protobuf/ruby/tests/basic.rb
+++ /dev/null
@@ -1,739 +0,0 @@
-#!/usr/bin/ruby
-
-# basic_test_pb.rb is in the same directory as this test.
-$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__)))
-
-require 'basic_test_pb'
-require 'common_tests'
-require 'google/protobuf'
-require 'json'
-require 'test/unit'
-
-# ------------- generated code --------------
-
-module BasicTest
-  pool = Google::Protobuf::DescriptorPool.new
-  pool.build do
-    add_message "BadFieldNames" do
-      optional :dup, :int32, 1
-      optional :class, :int32, 2
-    end
-  end
-
-  BadFieldNames = pool.lookup("BadFieldNames").msgclass
-
-# ------------ test cases ---------------
-
-  class MessageContainerTest < Test::Unit::TestCase
-    # Required by CommonTests module to resolve proto3 proto classes used in tests.
-    def proto_module
-      ::BasicTest
-    end
-    include CommonTests
-
-    def test_issue_8311_crash
-      Google::Protobuf::DescriptorPool.generated_pool.build do
-        add_file("inner.proto", :syntax => :proto3) do
-          add_message "Inner" do
-            # Removing either of these fixes the segfault.
-            optional :foo, :string, 1
-            optional :bar, :string, 2
-          end
-        end
-      end
-
-      Google::Protobuf::DescriptorPool.generated_pool.build do
-        add_file("outer.proto", :syntax => :proto3) do
-          add_message "Outer" do
-            repeated :inners, :message, 1, "Inner"
-          end
-        end
-      end
-
-      outer = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("Outer").msgclass
-
-      outer.new(
-          inners: []
-      )['inners'].to_s
-
-      assert_raise Google::Protobuf::TypeError do
-        outer.new(
-            inners: [nil]
-        ).to_s
-      end
-    end
-
-    def test_issue_8559_crash
-      msg = TestMessage.new
-      msg.repeated_int32 = ::Google::Protobuf::RepeatedField.new(:int32, [1, 2, 3])
-
-      # https://github.com/jruby/jruby/issues/6818 was fixed in JRuby 9.3.0.0
-      if cruby_or_jruby_9_3_or_higher?
-        GC.start(full_mark: true, immediate_sweep: true)
-      end
-      TestMessage.encode(msg)
-    end
-
-    def test_issue_9440
-      msg = HelloRequest.new
-      msg.id = 8
-      assert_equal 8, msg.id
-      msg.version = '1'
-      assert_equal 8, msg.id
-    end
-
-    def test_issue_9507
-      pool = Google::Protobuf::DescriptorPool.new
-      pool.build do
-        add_message "NpeMessage" do
-          optional :type, :enum, 1, "TestEnum"
-          optional :other, :string, 2
-        end
-        add_enum "TestEnum" do
-          value :Something, 0
-        end
-      end
-
-      msgclass = pool.lookup("NpeMessage").msgclass
-
-      m = msgclass.new(
-        other: "foo"      # must be set, but can be blank
-      )
-
-      begin
-        encoded = msgclass.encode(m)
-      rescue java.lang.NullPointerException
-        flunk "NPE rescued"
-      end
-      decoded = msgclass.decode(encoded)
-      decoded.inspect
-      decoded.to_proto
-    end
-
-    def test_has_field
-      m = TestSingularFields.new
-      assert !m.has_singular_msg?
-      m.singular_msg = TestMessage2.new
-      assert m.has_singular_msg?
-      assert TestSingularFields.descriptor.lookup('singular_msg').has?(m)
-
-      m = OneofMessage.new
-      assert !m.has_my_oneof?
-      m.a = "foo"
-      assert m.has_my_oneof?
-      assert_raise NoMethodError do
-        m.has_a?
-      end
-      assert_true OneofMessage.descriptor.lookup('a').has?(m)
-
-      m = TestSingularFields.new
-      assert_raise NoMethodError do
-        m.has_singular_int32?
-      end
-      assert_raise ArgumentError do
-        TestSingularFields.descriptor.lookup('singular_int32').has?(m)
-      end
-
-      assert_raise NoMethodError do
-        m.has_singular_string?
-      end
-      assert_raise ArgumentError do
-        TestSingularFields.descriptor.lookup('singular_string').has?(m)
-      end
-
-      assert_raise NoMethodError do
-        m.has_singular_bool?
-      end
-      assert_raise ArgumentError do
-        TestSingularFields.descriptor.lookup('singular_bool').has?(m)
-      end
-
-      m = TestMessage.new
-      assert_raise NoMethodError do
-        m.has_repeated_msg?
-      end
-      assert_raise ArgumentError do
-        TestMessage.descriptor.lookup('repeated_msg').has?(m)
-      end
-    end
-
-    def test_no_presence
-      m = TestSingularFields.new
-
-      # Explicitly setting to zero does not cause anything to be serialized.
-      m.singular_int32 = 0
-      assert_equal "", TestSingularFields.encode(m)
-
-      # Explicitly setting to a non-zero value *does* cause serialization.
-      m.singular_int32 = 1
-      assert_not_equal "", TestSingularFields.encode(m)
-
-      m.singular_int32 = 0
-      assert_equal "", TestSingularFields.encode(m)
-    end
-
-    def test_set_clear_defaults
-      m = TestSingularFields.new
-
-      m.singular_int32 = -42
-      assert_equal( -42, m.singular_int32 )
-      m.clear_singular_int32
-      assert_equal 0, m.singular_int32
-
-      m.singular_int32 = 50
-      assert_equal 50, m.singular_int32
-      TestSingularFields.descriptor.lookup('singular_int32').clear(m)
-      assert_equal 0, m.singular_int32
-
-      m.singular_string = "foo bar"
-      assert_equal "foo bar", m.singular_string
-      m.clear_singular_string
-      assert_equal "", m.singular_string
-
-      m.singular_string = "foo"
-      assert_equal "foo", m.singular_string
-      TestSingularFields.descriptor.lookup('singular_string').clear(m)
-      assert_equal "", m.singular_string
-
-      m.singular_msg = TestMessage2.new(:foo => 42)
-      assert_equal TestMessage2.new(:foo => 42), m.singular_msg
-      assert m.has_singular_msg?
-      m.clear_singular_msg
-      assert_equal nil, m.singular_msg
-      assert !m.has_singular_msg?
-
-      m.singular_msg = TestMessage2.new(:foo => 42)
-      assert_equal TestMessage2.new(:foo => 42), m.singular_msg
-      TestSingularFields.descriptor.lookup('singular_msg').clear(m)
-      assert_equal nil, m.singular_msg
-    end
-
-    def test_import_proto2
-      m = TestMessage.new
-      assert !m.has_optional_proto2_submessage?
-      m.optional_proto2_submessage = ::FooBar::Proto2::TestImportedMessage.new
-      assert m.has_optional_proto2_submessage?
-      assert TestMessage.descriptor.lookup('optional_proto2_submessage').has?(m)
-
-      m.clear_optional_proto2_submessage
-      assert !m.has_optional_proto2_submessage?
-    end
-
-    def test_clear_repeated_fields
-      m = TestMessage.new
-
-      m.repeated_int32.push(1)
-      assert_equal [1], m.repeated_int32
-      m.clear_repeated_int32
-      assert_equal [], m.repeated_int32
-
-      m.repeated_int32.push(1)
-      assert_equal [1], m.repeated_int32
-      TestMessage.descriptor.lookup('repeated_int32').clear(m)
-      assert_equal [], m.repeated_int32
-
-      m = OneofMessage.new
-      m.a = "foo"
-      assert_equal "foo", m.a
-      assert m.has_my_oneof?
-      assert_equal :a, m.my_oneof
-      m.clear_a
-      assert !m.has_my_oneof?
-
-      m.a = "foobar"
-      assert m.has_my_oneof?
-      m.clear_my_oneof
-      assert !m.has_my_oneof?
-
-      m.a = "bar"
-      assert_equal "bar", m.a
-      assert m.has_my_oneof?
-      OneofMessage.descriptor.lookup('a').clear(m)
-      assert !m.has_my_oneof?
-    end
-
-    def test_initialization_map_errors
-      e = assert_raise ArgumentError do
-        TestMessage.new(:hello => "world")
-      end
-      assert_match(/hello/, e.message)
-
-      e = assert_raise ArgumentError do
-        MapMessage.new(:map_string_int32 => "hello")
-      end
-      assert_equal e.message, "Expected Hash object as initializer value for map field 'map_string_int32' (given String)."
-
-      e = assert_raise ArgumentError do
-        TestMessage.new(:repeated_uint32 => "hello")
-      end
-      assert_equal e.message, "Expected array as initializer value for repeated field 'repeated_uint32' (given String)."
-    end
-
-    def test_map_field
-      m = MapMessage.new
-      assert m.map_string_int32 == {}
-      assert m.map_string_msg == {}
-
-      m = MapMessage.new(
-        :map_string_int32 => {"a" => 1, "b" => 2},
-        :map_string_msg => {"a" => TestMessage2.new(:foo => 1),
-                            "b" => TestMessage2.new(:foo => 2)},
-        :map_string_enum => {"a" => :A, "b" => :B})
-      assert m.map_string_int32.keys.sort == ["a", "b"]
-      assert m.map_string_int32["a"] == 1
-      assert m.map_string_msg["b"].foo == 2
-      assert m.map_string_enum["a"] == :A
-
-      m.map_string_int32["c"] = 3
-      assert m.map_string_int32["c"] == 3
-      m.map_string_msg["c"] = TestMessage2.new(:foo => 3)
-      assert m.map_string_msg["c"] == TestMessage2.new(:foo => 3)
-      m.map_string_msg.delete("b")
-      m.map_string_msg.delete("c")
-      assert m.map_string_msg == { "a" => TestMessage2.new(:foo => 1) }
-
-      assert_raise Google::Protobuf::TypeError do
-        m.map_string_msg["e"] = TestMessage.new # wrong value type
-      end
-      # ensure nothing was added by the above
-      assert m.map_string_msg == { "a" => TestMessage2.new(:foo => 1) }
-
-      m.map_string_int32 = Google::Protobuf::Map.new(:string, :int32)
-      assert_raise Google::Protobuf::TypeError do
-        m.map_string_int32 = Google::Protobuf::Map.new(:string, :int64)
-      end
-      assert_raise Google::Protobuf::TypeError do
-        m.map_string_int32 = {}
-      end
-
-      assert_raise Google::Protobuf::TypeError do
-        m = MapMessage.new(:map_string_int32 => { 1 => "I am not a number" })
-      end
-    end
-
-    def test_map_field_with_symbol
-      m = MapMessage.new
-      assert m.map_string_int32 == {}
-      assert m.map_string_msg == {}
-
-      m = MapMessage.new(
-        :map_string_int32 => {a: 1, "b" => 2},
-        :map_string_msg => {a: TestMessage2.new(:foo => 1),
-                            b: TestMessage2.new(:foo => 10)})
-      assert_equal 1, m.map_string_int32[:a]
-      assert_equal 2, m.map_string_int32[:b]
-      assert_equal 10, m.map_string_msg[:b].foo
-    end
-
-    def test_map_inspect
-      m = MapMessage.new(
-        :map_string_int32 => {"a" => 1, "b" => 2},
-        :map_string_msg => {"a" => TestMessage2.new(:foo => 1),
-                            "b" => TestMessage2.new(:foo => 2)},
-        :map_string_enum => {"a" => :A, "b" => :B})
-
-      # JRuby doesn't keep consistent ordering so check for either version
-      expected_a = "<BasicTest::MapMessage: map_string_int32: {\"b\"=>2, \"a\"=>1}, map_string_msg: {\"b\"=><BasicTest::TestMessage2: foo: 2>, \"a\"=><BasicTest::TestMessage2: foo: 1>}, map_string_enum: {\"b\"=>:B, \"a\"=>:A}>"
-      expected_b = "<BasicTest::MapMessage: map_string_int32: {\"a\"=>1, \"b\"=>2}, map_string_msg: {\"a\"=><BasicTest::TestMessage2: foo: 1>, \"b\"=><BasicTest::TestMessage2: foo: 2>}, map_string_enum: {\"a\"=>:A, \"b\"=>:B}>"
-      inspect_result = m.inspect
-      assert expected_a == inspect_result || expected_b == inspect_result, "Incorrect inspect result: #{inspect_result}"
-    end
-
-    def test_map_corruption
-      # This pattern led to a crash in a previous version of upb/protobuf.
-      m = MapMessage.new(map_string_int32: { "aaa" => 1 })
-      m.map_string_int32['podid'] = 2
-      m.map_string_int32['aaa'] = 3
-    end
-
-    def test_map_wrappers
-      run_asserts = ->(m) {
-        assert_equal 2.0, m.map_double[0].value
-        assert_equal 4.0, m.map_float[0].value
-        assert_equal 3, m.map_int32[0].value
-        assert_equal 4, m.map_int64[0].value
-        assert_equal 5, m.map_uint32[0].value
-        assert_equal 6, m.map_uint64[0].value
-        assert_equal true, m.map_bool[0].value
-        assert_equal 'str', m.map_string[0].value
-        assert_equal 'fun', m.map_bytes[0].value
-      }
-
-      m = proto_module::Wrapper.new(
-        map_double: {0 => Google::Protobuf::DoubleValue.new(value: 2.0)},
-        map_float: {0 => Google::Protobuf::FloatValue.new(value: 4.0)},
-        map_int32: {0 => Google::Protobuf::Int32Value.new(value: 3)},
-        map_int64: {0 => Google::Protobuf::Int64Value.new(value: 4)},
-        map_uint32: {0 => Google::Protobuf::UInt32Value.new(value: 5)},
-        map_uint64: {0 => Google::Protobuf::UInt64Value.new(value: 6)},
-        map_bool: {0 => Google::Protobuf::BoolValue.new(value: true)},
-        map_string: {0 => Google::Protobuf::StringValue.new(value: 'str')},
-        map_bytes: {0 => Google::Protobuf::BytesValue.new(value: 'fun')},
-      )
-
-      run_asserts.call(m)
-      serialized = proto_module::Wrapper::encode(m)
-      m2 = proto_module::Wrapper::decode(serialized)
-      run_asserts.call(m2)
-
-      # Test the case where we are serializing directly from the parsed form
-      # (before anything lazy is materialized).
-      m3 = proto_module::Wrapper::decode(serialized)
-      serialized2 = proto_module::Wrapper::encode(m3)
-      m4 = proto_module::Wrapper::decode(serialized2)
-      run_asserts.call(m4)
-
-      # Test that the lazy form compares equal to the expanded form.
-      m5 = proto_module::Wrapper::decode(serialized2)
-      assert_equal m5, m
-    end
-
-    def test_map_wrappers_with_default_values
-      run_asserts = ->(m) {
-        assert_equal 0.0, m.map_double[0].value
-        assert_equal 0.0, m.map_float[0].value
-        assert_equal 0, m.map_int32[0].value
-        assert_equal 0, m.map_int64[0].value
-        assert_equal 0, m.map_uint32[0].value
-        assert_equal 0, m.map_uint64[0].value
-        assert_equal false, m.map_bool[0].value
-        assert_equal '', m.map_string[0].value
-        assert_equal '', m.map_bytes[0].value
-      }
-
-      m = proto_module::Wrapper.new(
-        map_double: {0 => Google::Protobuf::DoubleValue.new(value: 0.0)},
-        map_float: {0 => Google::Protobuf::FloatValue.new(value: 0.0)},
-        map_int32: {0 => Google::Protobuf::Int32Value.new(value: 0)},
-        map_int64: {0 => Google::Protobuf::Int64Value.new(value: 0)},
-        map_uint32: {0 => Google::Protobuf::UInt32Value.new(value: 0)},
-        map_uint64: {0 => Google::Protobuf::UInt64Value.new(value: 0)},
-        map_bool: {0 => Google::Protobuf::BoolValue.new(value: false)},
-        map_string: {0 => Google::Protobuf::StringValue.new(value: '')},
-        map_bytes: {0 => Google::Protobuf::BytesValue.new(value: '')},
-      )
-
-      run_asserts.call(m)
-      serialized = proto_module::Wrapper::encode(m)
-      m2 = proto_module::Wrapper::decode(serialized)
-      run_asserts.call(m2)
-
-      # Test the case where we are serializing directly from the parsed form
-      # (before anything lazy is materialized).
-      m3 = proto_module::Wrapper::decode(serialized)
-      serialized2 = proto_module::Wrapper::encode(m3)
-      m4 = proto_module::Wrapper::decode(serialized2)
-      run_asserts.call(m4)
-
-      # Test that the lazy form compares equal to the expanded form.
-      m5 = proto_module::Wrapper::decode(serialized2)
-      assert_equal m5, m
-    end
-
-    def test_map_wrappers_with_no_value
-      run_asserts = ->(m) {
-        assert_equal 0.0, m.map_double[0].value
-        assert_equal 0.0, m.map_float[0].value
-        assert_equal 0, m.map_int32[0].value
-        assert_equal 0, m.map_int64[0].value
-        assert_equal 0, m.map_uint32[0].value
-        assert_equal 0, m.map_uint64[0].value
-        assert_equal false, m.map_bool[0].value
-        assert_equal '', m.map_string[0].value
-        assert_equal '', m.map_bytes[0].value
-      }
-
-      m = proto_module::Wrapper.new(
-        map_double: {0 => Google::Protobuf::DoubleValue.new()},
-        map_float: {0 => Google::Protobuf::FloatValue.new()},
-        map_int32: {0 => Google::Protobuf::Int32Value.new()},
-        map_int64: {0 => Google::Protobuf::Int64Value.new()},
-        map_uint32: {0 => Google::Protobuf::UInt32Value.new()},
-        map_uint64: {0 => Google::Protobuf::UInt64Value.new()},
-        map_bool: {0 => Google::Protobuf::BoolValue.new()},
-        map_string: {0 => Google::Protobuf::StringValue.new()},
-        map_bytes: {0 => Google::Protobuf::BytesValue.new()},
-      )
-      run_asserts.call(m)
-
-      serialized = proto_module::Wrapper::encode(m)
-      m2 = proto_module::Wrapper::decode(serialized)
-      run_asserts.call(m2)
-
-      # Test the case where we are serializing directly from the parsed form
-      # (before anything lazy is materialized).
-      m3 = proto_module::Wrapper::decode(serialized)
-      serialized2 = proto_module::Wrapper::encode(m3)
-      m4 = proto_module::Wrapper::decode(serialized2)
-      run_asserts.call(m4)
-    end
-
-    def test_concurrent_decoding
-      o = Outer.new
-      o.items[0] = Inner.new
-      raw = Outer.encode(o)
-
-      thds = 2.times.map do
-        Thread.new do
-          100000.times do
-            assert_equal o, Outer.decode(raw)
-          end
-        end
-      end
-      thds.map(&:join)
-    end
-
-    def test_map_encode_decode
-      m = MapMessage.new(
-        :map_string_int32 => {"a" => 1, "b" => 2},
-        :map_string_msg => {"a" => TestMessage2.new(:foo => 1),
-                            "b" => TestMessage2.new(:foo => 2)},
-        :map_string_enum => {"a" => :A, "b" => :B})
-      m2 = MapMessage.decode(MapMessage.encode(m))
-      assert m == m2
-
-      m3 = MapMessageWireEquiv.decode(MapMessage.encode(m))
-      assert m3.map_string_int32.length == 2
-
-      kv = {}
-      m3.map_string_int32.map { |msg| kv[msg.key] = msg.value }
-      assert kv == {"a" => 1, "b" => 2}
-
-      kv = {}
-      m3.map_string_msg.map { |msg| kv[msg.key] = msg.value }
-      assert kv == {"a" => TestMessage2.new(:foo => 1),
-                    "b" => TestMessage2.new(:foo => 2)}
-    end
-
-    def test_protobuf_decode_json_ignore_unknown_fields
-      m = TestMessage.decode_json({
-        optional_string: "foo",
-        not_in_message: "some_value"
-      }.to_json, { ignore_unknown_fields: true })
-
-      assert_equal m.optional_string, "foo"
-      e = assert_raise Google::Protobuf::ParseError do
-        TestMessage.decode_json({ not_in_message: "some_value" }.to_json)
-      end
-      assert_match(/No such field: not_in_message/, e.message)
-    end
-
-    #def test_json_quoted_string
-    #  m = TestMessage.decode_json(%q(
-    #    "optionalInt64": "1",,
-    #  }))
-    #  puts(m)
-    #  assert_equal 1, m.optional_int32
-    #end
-
-    def test_to_h
-      m = TestMessage.new(:optional_bool => true, :optional_double => -10.100001, :optional_string => 'foo', :repeated_string => ['bar1', 'bar2'], :repeated_msg => [TestMessage2.new(:foo => 100)])
-      expected_result = {
-        :optional_bool=>true,
-        :optional_bytes=>"",
-        :optional_double=>-10.100001,
-        :optional_enum=>:Default,
-        :optional_float=>0.0,
-        :optional_int32=>0,
-        :optional_int64=>0,
-        :optional_msg=>nil,
-        :optional_msg2=>nil,
-        :optional_proto2_submessage=>nil,
-        :optional_string=>"foo",
-        :optional_uint32=>0,
-        :optional_uint64=>0,
-        :repeated_bool=>[],
-        :repeated_bytes=>[],
-        :repeated_double=>[],
-        :repeated_enum=>[],
-        :repeated_float=>[],
-        :repeated_int32=>[],
-        :repeated_int64=>[],
-        :repeated_msg=>[{:foo => 100}],
-        :repeated_string=>["bar1", "bar2"],
-        :repeated_uint32=>[],
-        :repeated_uint64=>[]
-      }
-      assert_equal expected_result, m.to_h
-
-      m = MapMessage.new(
-        :map_string_int32 => {"a" => 1, "b" => 2},
-        :map_string_msg => {"a" => TestMessage2.new(:foo => 1),
-                            "b" => TestMessage2.new(:foo => 2)},
-        :map_string_enum => {"a" => :A, "b" => :B})
-      expected_result = {
-        :map_string_int32 => {"a" => 1, "b" => 2},
-        :map_string_msg => {"a" => {:foo => 1}, "b" => {:foo => 2}},
-        :map_string_enum => {"a" => :A, "b" => :B}
-      }
-      assert_equal expected_result, m.to_h
-    end
-
-
-    def test_json_maps
-      m = MapMessage.new(:map_string_int32 => {"a" => 1})
-      expected = {mapStringInt32: {a: 1}, mapStringMsg: {}, mapStringEnum: {}}
-      expected_preserve = {map_string_int32: {a: 1}, map_string_msg: {}, map_string_enum: {}}
-      assert_equal JSON.parse(MapMessage.encode_json(m, :emit_defaults=>true), :symbolize_names => true), expected
-
-      json = MapMessage.encode_json(m, :preserve_proto_fieldnames => true, :emit_defaults=>true)
-      assert_equal JSON.parse(json, :symbolize_names => true), expected_preserve
-
-      m2 = MapMessage.decode_json(MapMessage.encode_json(m))
-      assert_equal m, m2
-    end
-
-    def test_json_maps_emit_defaults_submsg
-      m = MapMessage.new(:map_string_msg => {"a" => TestMessage2.new(foo: 0)})
-      expected = {mapStringInt32: {}, mapStringMsg: {a: {foo: 0}}, mapStringEnum: {}}
-
-      actual = MapMessage.encode_json(m, :emit_defaults => true)
-
-      assert_equal JSON.parse(actual, :symbolize_names => true), expected
-    end
-
-    def test_json_emit_defaults_submsg
-      m = TestSingularFields.new(singular_msg: proto_module::TestMessage2.new)
-
-      expected = {
-        singularInt32: 0,
-        singularInt64: "0",
-        singularUint32: 0,
-        singularUint64: "0",
-        singularBool: false,
-        singularFloat: 0,
-        singularDouble: 0,
-        singularString: "",
-        singularBytes: "",
-        singularMsg: {},
-        singularEnum: "Default",
-      }
-
-      actual = proto_module::TestMessage.encode_json(m, :emit_defaults => true)
-
-      assert_equal expected, JSON.parse(actual, :symbolize_names => true)
-    end
-
-    def test_respond_to
-      msg = MapMessage.new
-      assert msg.respond_to?(:map_string_int32)
-      assert !msg.respond_to?(:bacon)
-    end
-
-    def test_file_descriptor
-      file_descriptor = TestMessage.descriptor.file_descriptor
-      assert nil != file_descriptor
-      assert_equal "tests/basic_test.proto", file_descriptor.name
-      assert_equal :proto3, file_descriptor.syntax
-
-      file_descriptor = TestEnum.descriptor.file_descriptor
-      assert nil != file_descriptor
-      assert_equal "tests/basic_test.proto", file_descriptor.name
-      assert_equal :proto3, file_descriptor.syntax
-    end
-
-    # Ruby 2.5 changed to raise FrozenError instead of RuntimeError
-    FrozenErrorType = Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.5') ? RuntimeError : FrozenError
-
-    def test_map_freeze
-      m = proto_module::MapMessage.new
-      m.map_string_int32['a'] = 5
-      m.map_string_msg['b'] = proto_module::TestMessage2.new
-
-      m.map_string_int32.freeze
-      m.map_string_msg.freeze
-
-      assert m.map_string_int32.frozen?
-      assert m.map_string_msg.frozen?
-
-      assert_raise(FrozenErrorType) { m.map_string_int32['foo'] = 1 }
-      assert_raise(FrozenErrorType) { m.map_string_msg['bar'] = proto_module::TestMessage2.new }
-      assert_raise(FrozenErrorType) { m.map_string_int32.delete('a') }
-      assert_raise(FrozenErrorType) { m.map_string_int32.clear }
-    end
-
-    def test_map_length
-      m = proto_module::MapMessage.new
-      assert_equal 0, m.map_string_int32.length
-      assert_equal 0, m.map_string_msg.length
-      assert_equal 0, m.map_string_int32.size
-      assert_equal 0, m.map_string_msg.size
-
-      m.map_string_int32['a'] = 1
-      m.map_string_int32['b'] = 2
-      m.map_string_msg['a'] = proto_module::TestMessage2.new
-      assert_equal 2, m.map_string_int32.length
-      assert_equal 1, m.map_string_msg.length
-      assert_equal 2, m.map_string_int32.size
-      assert_equal 1, m.map_string_msg.size
-    end
-
-    def test_string_with_singleton_class_enabled
-      str = 'foobar'
-      # NOTE: Accessing a singleton class of an object changes its low level class representation
-      #       as far as the C API's CLASS_OF() method concerned, exposing the issue
-      str.singleton_class
-      m = proto_module::TestMessage.new(
-        optional_string: str,
-        optional_bytes: str
-      )
-
-      assert_equal str, m.optional_string
-      assert_equal str, m.optional_bytes
-    end
-
-    def test_utf8
-      m = proto_module::TestMessage.new(
-        optional_string: "µpb",
-      )
-      m2 = proto_module::TestMessage.decode(proto_module::TestMessage.encode(m))
-      assert_equal m2, m
-    end
-
-    def test_map_fields_respond_to? # regression test for issue 9202
-      msg = proto_module::MapMessage.new
-      assert msg.respond_to?(:map_string_int32=)
-      msg.map_string_int32 = Google::Protobuf::Map.new(:string, :int32)
-      assert msg.respond_to?(:map_string_int32)
-      assert_equal( Google::Protobuf::Map.new(:string, :int32), msg.map_string_int32 )
-      assert msg.respond_to?(:clear_map_string_int32)
-      msg.clear_map_string_int32
-
-      assert !msg.respond_to?(:has_map_string_int32?)
-      assert_raise NoMethodError do
-        msg.has_map_string_int32?
-      end
-      assert !msg.respond_to?(:map_string_int32_as_value)
-      assert_raise NoMethodError do
-        msg.map_string_int32_as_value
-      end
-      assert !msg.respond_to?(:map_string_int32_as_value=)
-      assert_raise NoMethodError do
-        msg.map_string_int32_as_value = :boom
-      end
-    end
-  end
-
-  def test_oneof_fields_respond_to? # regression test for issue 9202
-    msg = proto_module::OneofMessage.new
-    # `has_` prefix + "?" suffix actions should only work for oneofs fields.
-    assert msg.has_my_oneof?
-    assert msg.respond_to? :has_my_oneof?
-    assert !msg.respond_to?( :has_a? )
-    assert_raise NoMethodError do
-      msg.has_a?
-    end
-    assert !msg.respond_to?( :has_b? )
-    assert_raise NoMethodError do
-      msg.has_b?
-    end
-    assert !msg.respond_to?( :has_c? )
-    assert_raise NoMethodError do
-      msg.has_c?
-    end
-    assert !msg.respond_to?( :has_d? )
-    assert_raise NoMethodError do
-      msg.has_d?
-    end
-  end
-end
diff --git a/libs/protobuf/ruby/tests/basic_proto2.rb b/libs/protobuf/ruby/tests/basic_proto2.rb
deleted file mode 100755
index 5391c30..0000000
--- a/libs/protobuf/ruby/tests/basic_proto2.rb
+++ /dev/null
@@ -1,274 +0,0 @@
-#!/usr/bin/ruby
-
-# basic_test_pb.rb is in the same directory as this test.
-$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__)))
-
-require 'basic_test_proto2_pb'
-require 'common_tests'
-require 'google/protobuf'
-require 'json'
-require 'test/unit'
-
-# ------------- generated code --------------
-
-module BasicTestProto2
-  pool = Google::Protobuf::DescriptorPool.new
-  pool.build do
-    add_file "test_proto2.proto", syntax: :proto2 do
-      add_message "BadFieldNames" do
-        optional :dup, :int32, 1
-        optional :class, :int32, 2
-      end
-    end
-  end
-
-  BadFieldNames = pool.lookup("BadFieldNames").msgclass
-
-# ------------ test cases ---------------
-
-  class MessageContainerTest < Test::Unit::TestCase
-    # Required by CommonTests module to resolve proto2 proto classes used in tests.
-    def proto_module
-      ::BasicTestProto2
-    end
-    include CommonTests
-
-    def test_has_field
-      m = TestMessage.new
-      assert !m.has_optional_int32?
-      assert !TestMessage.descriptor.lookup('optional_int32').has?(m)
-      assert !m.has_optional_int64?
-      assert !TestMessage.descriptor.lookup('optional_int64').has?(m)
-      assert !m.has_optional_uint32?
-      assert !TestMessage.descriptor.lookup('optional_uint32').has?(m)
-      assert !m.has_optional_uint64?
-      assert !TestMessage.descriptor.lookup('optional_uint64').has?(m)
-      assert !m.has_optional_bool?
-      assert !TestMessage.descriptor.lookup('optional_bool').has?(m)
-      assert !m.has_optional_float?
-      assert !TestMessage.descriptor.lookup('optional_float').has?(m)
-      assert !m.has_optional_double?
-      assert !TestMessage.descriptor.lookup('optional_double').has?(m)
-      assert !m.has_optional_string?
-      assert !TestMessage.descriptor.lookup('optional_string').has?(m)
-      assert !m.has_optional_bytes?
-      assert !TestMessage.descriptor.lookup('optional_bytes').has?(m)
-      assert !m.has_optional_enum?
-      assert !TestMessage.descriptor.lookup('optional_enum').has?(m)
-
-      m = TestMessage.new(:optional_int32 => nil)
-      assert !m.has_optional_int32?
-
-      assert_raise NoMethodError do
-        m.has_repeated_msg?
-      end
-      assert_raise ArgumentError do
-        TestMessage.descriptor.lookup('repeated_msg').has?(m)
-      end
-
-      m.optional_msg = TestMessage2.new
-      assert m.has_optional_msg?
-      assert TestMessage.descriptor.lookup('optional_msg').has?(m)
-
-      m = OneofMessage.new
-      assert !m.has_my_oneof?
-      m.a = "foo"
-      assert m.has_my_oneof?
-      assert_equal :a, m.my_oneof
-      assert m.has_a?
-      assert OneofMessage.descriptor.lookup('a').has?(m)
-      assert_equal "foo", m.a
-      assert !m.has_b?
-      assert !OneofMessage.descriptor.lookup('b').has?(m)
-      assert !m.has_c?
-      assert !OneofMessage.descriptor.lookup('c').has?(m)
-      assert !m.has_d?
-      assert !OneofMessage.descriptor.lookup('d').has?(m)
-
-      m = OneofMessage.new
-      m.b = 100
-      assert m.has_b?
-      assert_equal 100, m.b
-      assert m.has_my_oneof?
-      assert !m.has_a?
-      assert !m.has_c?
-      assert !m.has_d?
-
-      m = OneofMessage.new
-      m.c = TestMessage2.new
-      assert m.has_c?
-      assert_equal TestMessage2.new, m.c
-      assert m.has_my_oneof?
-      assert !m.has_a?
-      assert !m.has_b?
-      assert !m.has_d?
-
-      m = OneofMessage.new
-      m.d = :A
-      assert m.has_d?
-      assert_equal :A, m.d
-      assert m.has_my_oneof?
-      assert !m.has_a?
-      assert !m.has_b?
-      assert !m.has_c?
-    end
-
-    def test_defined_defaults
-      m = TestMessageDefaults.new
-      assert_equal 1, m.optional_int32
-      assert_equal 2, m.optional_int64
-      assert_equal 3, m.optional_uint32
-      assert_equal 4, m.optional_uint64
-      assert_equal true, m.optional_bool
-      assert_equal 6.0, m.optional_float
-      assert_equal 7.0, m.optional_double
-      assert_equal "Default Str", m.optional_string
-      assert_equal "\xCF\xA5s\xBD\xBA\xE6fubar".force_encoding("ASCII-8BIT"), m.optional_bytes
-      assert_equal :B2, m.optional_enum
-
-      assert !m.has_optional_int32?
-      assert !m.has_optional_int64?
-      assert !m.has_optional_uint32?
-      assert !m.has_optional_uint64?
-      assert !m.has_optional_bool?
-      assert !m.has_optional_float?
-      assert !m.has_optional_double?
-      assert !m.has_optional_string?
-      assert !m.has_optional_bytes?
-      assert !m.has_optional_enum?
-    end
-
-    def test_set_clear_defaults
-      m = TestMessageDefaults.new
-
-      m.optional_int32 = -42
-      assert_equal( -42, m.optional_int32 )
-      assert m.has_optional_int32?
-      m.clear_optional_int32
-      assert_equal 1, m.optional_int32
-      assert !m.has_optional_int32?
-
-      m.optional_string = "foo bar"
-      assert_equal "foo bar", m.optional_string
-      assert m.has_optional_string?
-      m.clear_optional_string
-      assert_equal "Default Str", m.optional_string
-      assert !m.has_optional_string?
-
-      m.optional_msg = TestMessage2.new(:foo => 42)
-      assert_equal TestMessage2.new(:foo => 42), m.optional_msg
-      assert m.has_optional_msg?
-
-      m.clear_optional_msg
-      assert_equal nil, m.optional_msg
-      assert !m.has_optional_msg?
-
-      m.optional_msg = TestMessage2.new(:foo => 42)
-      assert_equal TestMessage2.new(:foo => 42), m.optional_msg
-      assert TestMessageDefaults.descriptor.lookup('optional_msg').has?(m)
-
-      TestMessageDefaults.descriptor.lookup('optional_msg').clear(m)
-      assert_equal nil, m.optional_msg
-      assert !TestMessageDefaults.descriptor.lookup('optional_msg').has?(m)
-
-      m = TestMessage.new
-      m.repeated_int32.push(1)
-      assert_equal [1], m.repeated_int32
-      m.clear_repeated_int32
-      assert_equal [], m.repeated_int32
-
-      m = OneofMessage.new
-      m.a = "foo"
-      assert_equal "foo", m.a
-      assert m.has_a?
-      m.clear_a
-      assert !m.has_a?
-
-      m = OneofMessage.new
-      m.a = "foobar"
-      assert m.has_my_oneof?
-      m.clear_my_oneof
-      assert !m.has_my_oneof?
-
-      m = OneofMessage.new
-      m.a = "bar"
-      assert_equal "bar", m.a
-      assert m.has_my_oneof?
-      OneofMessage.descriptor.lookup('a').clear(m)
-      assert !m.has_my_oneof?
-    end
-
-    def test_assign_nil
-      m = TestMessageDefaults.new
-      m.optional_msg = TestMessage2.new(:foo => 42)
-
-      assert_equal TestMessage2.new(:foo => 42), m.optional_msg
-      assert m.has_optional_msg?
-      m.optional_msg = nil
-      assert_equal nil, m.optional_msg
-      assert !m.has_optional_msg?
-    end
-
-    def test_initialization_map_errors
-      e = assert_raise ArgumentError do
-        TestMessage.new(:hello => "world")
-      end
-      assert_match(/hello/, e.message)
-
-      e = assert_raise ArgumentError do
-        TestMessage.new(:repeated_uint32 => "hello")
-      end
-      assert_equal e.message, "Expected array as initializer value for repeated field 'repeated_uint32' (given String)."
-    end
-
-
-    def test_to_h
-      m = TestMessage.new(:optional_bool => true, :optional_double => -10.100001, :optional_string => 'foo', :repeated_string => ['bar1', 'bar2'])
-      expected_result = {
-        :optional_bool=>true,
-        :optional_double=>-10.100001,
-        :optional_string=>"foo",
-        :repeated_string=>["bar1", "bar2"],
-      }
-      assert_equal expected_result, m.to_h
-
-      m = OneofMessage.new(:a => "foo")
-      expected_result = {:a => "foo"}
-      assert_equal expected_result, m.to_h
-    end
-
-    def test_respond_to
-      # This test fails with JRuby 1.7.23, likely because of an old JRuby bug.
-      return if RUBY_PLATFORM == "java"
-      msg = TestMessage.new
-      assert !msg.respond_to?(:bacon)
-    end
-
-    def test_file_descriptor
-      file_descriptor = TestMessage.descriptor.file_descriptor
-      assert nil != file_descriptor
-      assert_equal "tests/basic_test_proto2.proto", file_descriptor.name
-      assert_equal :proto2, file_descriptor.syntax
-
-      file_descriptor = TestEnum.descriptor.file_descriptor
-      assert nil != file_descriptor
-      assert_equal "tests/basic_test_proto2.proto", file_descriptor.name
-      assert_equal :proto2, file_descriptor.syntax
-    end
-
-    def test_oneof_fields_respond_to? # regression test for issue 9202
-      msg = proto_module::OneofMessage.new(a: "foo")
-      # `has_` prefix + "?" suffix actions should only work for oneofs fields.
-      assert msg.respond_to? :has_my_oneof?
-      assert msg.has_my_oneof?
-      assert msg.respond_to? :has_a?
-      assert msg.has_a?
-      assert msg.respond_to? :has_b?
-      assert !msg.has_b?
-      assert msg.respond_to? :has_c?
-      assert !msg.has_c?
-      assert msg.respond_to? :has_d?
-      assert !msg.has_d?
-    end
-  end
-end
diff --git a/libs/protobuf/ruby/tests/basic_test.proto b/libs/protobuf/ruby/tests/basic_test.proto
deleted file mode 100644
index d480d48..0000000
--- a/libs/protobuf/ruby/tests/basic_test.proto
+++ /dev/null
@@ -1,253 +0,0 @@
-syntax = "proto3";
-
-package basic_test;
-
-import "google/protobuf/wrappers.proto";
-import "google/protobuf/timestamp.proto";
-import "google/protobuf/duration.proto";
-import "google/protobuf/struct.proto";
-import "test_import_proto2.proto";
-
-message Foo {
-  Bar bar = 1;
-  repeated Baz baz = 2;
-}
-
-message Bar {
-  string msg = 1;
-}
-
-message Baz {
-  string msg = 1;
-}
-
-message TestMessage {
-  optional int32 optional_int32 = 1;
-  optional int64 optional_int64 = 2;
-  optional uint32 optional_uint32 = 3;
-  optional uint64 optional_uint64 = 4;
-  optional bool optional_bool = 5;
-  optional float optional_float = 6;
-  optional double optional_double = 7;
-  optional string optional_string = 8;
-  optional bytes optional_bytes = 9;
-  optional TestMessage2 optional_msg = 10;
-  optional TestEnum optional_enum = 11;
-  optional foo_bar.proto2.TestImportedMessage optional_proto2_submessage = 24;
-
-  repeated int32 repeated_int32 = 12;
-  repeated int64 repeated_int64 = 13;
-  repeated uint32 repeated_uint32 = 14;
-  repeated uint64 repeated_uint64 = 15;
-  repeated bool repeated_bool = 16;
-  repeated float repeated_float = 17;
-  repeated double repeated_double = 18;
-  repeated string repeated_string = 19;
-  repeated bytes repeated_bytes = 20;
-  repeated TestMessage2 repeated_msg = 21;
-  repeated TestEnum repeated_enum = 22;
-
-  optional TestSingularFields optional_msg2 = 23;
-}
-
-message TestSingularFields {
-  int32 singular_int32 = 1;
-  int64 singular_int64 = 2;
-  uint32 singular_uint32 = 3;
-  uint64 singular_uint64 = 4;
-  bool singular_bool = 5;
-  float singular_float = 6;
-  double singular_double = 7;
-  string singular_string = 8;
-  bytes singular_bytes = 9;
-  TestMessage2 singular_msg = 10;
-  TestEnum singular_enum = 11;
-}
-
-message TestMessage2 {
-  optional int32 foo = 1;
-}
-
-enum TestEnum {
-  Default = 0;
-  A = 1;
-  B = 2;
-  C = 3;
-  v0 = 4;
-}
-
-message TestEmbeddedMessageParent {
-  TestEmbeddedMessageChild child_msg = 1;
-  int32 number = 2;
-
-  repeated TestEmbeddedMessageChild repeated_msg = 3;
-  repeated int32 repeated_number = 4;
-}
-
-message TestEmbeddedMessageChild {
-  TestMessage sub_child = 1;
-}
-
-message Recursive1 {
-  Recursive2 foo = 1;
-}
-
-message Recursive2 {
-  Recursive1 foo = 1;
-}
-
-message MapMessage {
-  map<string, int32> map_string_int32 = 1;
-  map<string, TestMessage2> map_string_msg = 2;
-  map<string, TestEnum> map_string_enum = 3;
-}
-
-message MapMessageWireEquiv {
-  repeated MapMessageWireEquiv_entry1 map_string_int32 = 1;
-  repeated MapMessageWireEquiv_entry2 map_string_msg = 2;
-}
-
-message MapMessageWireEquiv_entry1 {
-  string key = 1;
-  int32 value = 2;
-}
-
-message MapMessageWireEquiv_entry2 {
-  string key = 1;
-  TestMessage2 value = 2;
-}
-
-message OneofMessage {
-  oneof my_oneof {
-    string a = 1;
-    int32 b = 2;
-    TestMessage2 c = 3;
-    TestEnum d = 4;
-  }
-}
-
-message Outer {
-  map<int32, Inner> items = 1;
-}
-
-message Inner {
-}
-
-message Wrapper {
-  google.protobuf.DoubleValue double = 1;
-  google.protobuf.FloatValue float = 2;
-  google.protobuf.Int32Value int32 = 3;
-  google.protobuf.Int64Value int64 = 4;
-  google.protobuf.UInt32Value uint32 = 5;
-  google.protobuf.UInt64Value uint64 = 6;
-  google.protobuf.BoolValue bool = 7;
-  google.protobuf.StringValue string = 8;
-  google.protobuf.BytesValue bytes = 9;
-  string real_string = 100;
-  oneof a_oneof {
-    string string_in_oneof = 10;
-  }
-
-  // Repeated wrappers don't make sense, but we still need to make sure they
-  // work and don't crash.
-  repeated google.protobuf.DoubleValue repeated_double = 11;
-  repeated google.protobuf.FloatValue repeated_float = 12;
-  repeated google.protobuf.Int32Value repeated_int32 = 13;
-  repeated google.protobuf.Int64Value repeated_int64 = 14;
-  repeated google.protobuf.UInt32Value repeated_uint32 = 15;
-  repeated google.protobuf.UInt64Value repeated_uint64 = 16;
-  repeated google.protobuf.BoolValue repeated_bool = 17;
-  repeated google.protobuf.StringValue repeated_string = 18;
-  repeated google.protobuf.BytesValue repeated_bytes = 19;
-
-  // Wrappers as map keys don't make sense, but we still need to make sure they
-  // work and don't crash.
-  map<int32, google.protobuf.DoubleValue> map_double = 21;
-  map<int32, google.protobuf.FloatValue> map_float = 22;
-  map<int32, google.protobuf.Int32Value> map_int32 = 23;
-  map<int32, google.protobuf.Int64Value> map_int64 = 24;
-  map<int32, google.protobuf.UInt32Value> map_uint32 = 25;
-  map<int32, google.protobuf.UInt64Value> map_uint64 = 26;
-  map<int32, google.protobuf.BoolValue> map_bool = 27;
-  map<int32, google.protobuf.StringValue> map_string = 28;
-  map<int32, google.protobuf.BytesValue> map_bytes = 29;
-
-  // Wrappers in oneofs don't make sense, but we still need to make sure they
-  // work and don't crash.
-  oneof wrapper_oneof {
-    google.protobuf.DoubleValue oneof_double = 31;
-    google.protobuf.FloatValue oneof_float = 32;
-    google.protobuf.Int32Value oneof_int32 = 33;
-    google.protobuf.Int64Value oneof_int64 = 34;
-    google.protobuf.UInt32Value oneof_uint32 = 35;
-    google.protobuf.UInt64Value oneof_uint64 = 36;
-    google.protobuf.BoolValue oneof_bool = 37;
-    google.protobuf.StringValue oneof_string = 38;
-    google.protobuf.BytesValue oneof_bytes = 39;
-    string oneof_plain_string = 101;
-  }
-}
-
-message TimeMessage {
-  google.protobuf.Timestamp timestamp = 1;
-  google.protobuf.Duration duration = 2;
-}
-
-message Enumer {
-  TestEnum optional_enum = 1;
-  repeated TestEnum repeated_enum = 2;
-  string a_const = 3;
-  oneof a_oneof {
-    string str = 10;
-    TestEnum const = 11;
-  }
-}
-
-message MyRepeatedStruct {
-  repeated MyStruct structs = 1;
-}
-
-message MyStruct {
-  string string = 1;
-  google.protobuf.Struct struct = 2;
-}
-
-message WithJsonName {
-  optional int32 foo_bar = 1 [json_name="jsonFooBar"];
-  repeated WithJsonName baz = 2 [json_name="jsonBaz"];
-}
-
-message HelloRequest {
-  optional uint32 id = 1;
-  optional uint32 random_name_a0 = 2;
-  optional uint32 random_name_a1 = 3;
-  optional uint32 random_name_a2 = 4;
-  optional uint32 random_name_a3 = 5;
-  optional uint32 random_name_a4 = 6;
-  optional uint32 random_name_a5 = 7;
-  optional uint32 random_name_a6 = 8;
-  optional uint32 random_name_a7 = 9;
-  optional uint32 random_name_a8 = 10;
-  optional uint32 random_name_a9 = 11;
-  optional uint32 random_name_b0 = 12;
-  optional uint32 random_name_b1 = 13;
-  optional uint32 random_name_b2 = 14;
-  optional uint32 random_name_b3 = 15;
-  optional uint32 random_name_b4 = 16;
-  optional uint32 random_name_b5 = 17;
-  optional uint32 random_name_b6 = 18;
-  optional uint32 random_name_b7 = 19;
-  optional uint32 random_name_b8 = 20;
-  optional uint32 random_name_b9 = 21;
-  optional uint32 random_name_c0 = 22;
-  optional uint32 random_name_c1 = 23;
-  optional uint32 random_name_c2 = 24;
-  optional uint32 random_name_c3 = 25;
-  optional uint32 random_name_c4 = 26;
-  optional uint32 random_name_c5 = 27;
-  optional uint32 random_name_c6 = 28;
-  optional uint32 random_name_c7 = 29;
-  optional uint32 random_name_c8 = 30;
-  optional uint32 random_name_c9 = 31;
-  optional string version = 32;
-}
diff --git a/libs/protobuf/ruby/tests/basic_test_proto2.proto b/libs/protobuf/ruby/tests/basic_test_proto2.proto
deleted file mode 100644
index ac705ed..0000000
--- a/libs/protobuf/ruby/tests/basic_test_proto2.proto
+++ /dev/null
@@ -1,190 +0,0 @@
-syntax = "proto2";
-
-package basic_test_proto2;
-
-import "google/protobuf/wrappers.proto";
-import "google/protobuf/timestamp.proto";
-import "google/protobuf/duration.proto";
-import "google/protobuf/struct.proto";
-
-message Foo {
-  optional Bar bar = 1;
-  repeated Baz baz = 2;
-}
-
-message Bar {
-  optional string msg = 1;
-}
-
-message Baz {
-  optional string msg = 1;
-}
-
-message TestMessage {
-  optional int32 optional_int32 = 1;
-  optional int64 optional_int64 = 2;
-  optional uint32 optional_uint32 = 3;
-  optional uint64 optional_uint64 = 4;
-  optional bool optional_bool = 5;
-  optional float optional_float = 6;
-  optional double optional_double = 7;
-  optional string optional_string = 8;
-  optional bytes optional_bytes = 9;
-  optional TestMessage2 optional_msg = 10;
-  optional TestEnum optional_enum = 11;
-
-  repeated int32 repeated_int32 = 12;
-  repeated int64 repeated_int64 = 13;
-  repeated uint32 repeated_uint32 = 14;
-  repeated uint64 repeated_uint64 = 15;
-  repeated bool repeated_bool = 16;
-  repeated float repeated_float = 17;
-  repeated double repeated_double = 18;
-  repeated string repeated_string = 19;
-  repeated bytes repeated_bytes = 20;
-  repeated TestMessage2 repeated_msg = 21;
-  repeated TestEnum repeated_enum = 22;
-}
-
-message TestMessage2 {
-  optional int32 foo = 1;
-}
-
-message TestMessageDefaults {
-  optional int32 optional_int32 = 1 [default = 1];
-  optional int64 optional_int64 = 2 [default = 2];
-  optional uint32 optional_uint32 = 3 [default = 3];
-  optional uint64 optional_uint64 = 4 [default = 4];
-  optional bool optional_bool = 5 [default = true];
-  optional float optional_float = 6 [default = 6];
-  optional double optional_double = 7 [default = 7];
-  optional string optional_string = 8 [default = "Default Str"];
-  optional bytes optional_bytes = 9 [default = "\xCF\xA5s\xBD\xBA\xE6fubar"];
-  optional TestMessage2 optional_msg = 10;
-  optional TestNonZeroEnum optional_enum = 11 [default = B2];
-}
-
-enum TestEnum {
-  Default = 0;
-  A = 1;
-  B = 2;
-  C = 3;
-  v0 = 4;
-}
-
-enum TestNonZeroEnum {
-  A2 = 1;
-  B2 = 2;
-  C2 = 3;
-}
-
-message TestEmbeddedMessageParent {
-  optional TestEmbeddedMessageChild child_msg = 1;
-  optional int32 number = 2;
-
-  repeated TestEmbeddedMessageChild repeated_msg = 3;
-  repeated int32 repeated_number = 4;
-}
-
-message TestEmbeddedMessageChild {
-  optional TestMessage sub_child = 1;
-}
-
-message Recursive1 {
-  optional Recursive2 foo = 1;
-}
-
-message Recursive2 {
-  optional Recursive1 foo = 1;
-}
-
-message MapMessageWireEquiv {
-  repeated MapMessageWireEquiv_entry1 map_string_int32 = 1;
-  repeated MapMessageWireEquiv_entry2 map_string_msg = 2;
-}
-
-message MapMessageWireEquiv_entry1 {
-  optional string key = 1;
-  optional int32 value = 2;
-}
-
-message MapMessageWireEquiv_entry2 {
-  optional string key = 1;
-  optional TestMessage2 value = 2;
-}
-
-message OneofMessage {
-  oneof my_oneof {
-    string a = 1;
-    int32 b = 2;
-    TestMessage2 c = 3;
-    TestEnum d = 4;
-  }
-}
-
-message Wrapper {
-  optional google.protobuf.DoubleValue double = 1;
-  optional google.protobuf.FloatValue float = 2;
-  optional google.protobuf.Int32Value int32 = 3;
-  optional google.protobuf.Int64Value int64 = 4;
-  optional google.protobuf.UInt32Value uint32 = 5;
-  optional google.protobuf.UInt64Value uint64 = 6;
-  optional google.protobuf.BoolValue bool = 7;
-  optional google.protobuf.StringValue string = 8;
-  optional google.protobuf.BytesValue bytes = 9;
-  optional string real_string = 100;
-  oneof a_oneof {
-    string string_in_oneof = 10;
-  }
-
-  // Repeated wrappers don't really make sense, but we still need to make sure
-  // they work and don't crash.
-  repeated google.protobuf.DoubleValue repeated_double = 11;
-  repeated google.protobuf.FloatValue repeated_float = 12;
-  repeated google.protobuf.Int32Value repeated_int32 = 13;
-  repeated google.protobuf.Int64Value repeated_int64 = 14;
-  repeated google.protobuf.UInt32Value repeated_uint32 = 15;
-  repeated google.protobuf.UInt64Value repeated_uint64 = 16;
-  repeated google.protobuf.BoolValue repeated_bool = 17;
-  repeated google.protobuf.StringValue repeated_string = 18;
-  repeated google.protobuf.BytesValue repeated_bytes = 19;
-
-  // Wrappers in oneofs don't make sense, but we still need to make sure they
-  // work and don't crash.
-  oneof wrapper_oneof {
-    google.protobuf.DoubleValue oneof_double = 31;
-    google.protobuf.FloatValue oneof_float = 32;
-    google.protobuf.Int32Value oneof_int32 = 33;
-    google.protobuf.Int64Value oneof_int64 = 34;
-    google.protobuf.UInt32Value oneof_uint32 = 35;
-    google.protobuf.UInt64Value oneof_uint64 = 36;
-    google.protobuf.BoolValue oneof_bool = 37;
-    google.protobuf.StringValue oneof_string = 38;
-    google.protobuf.BytesValue oneof_bytes = 39;
-    string oneof_plain_string = 101;
-  }
-}
-
-message TimeMessage {
-  optional google.protobuf.Timestamp timestamp = 1;
-  optional google.protobuf.Duration duration = 2;
-}
-
-message Enumer {
-  optional TestEnum optional_enum = 11;
-  repeated TestEnum repeated_enum = 22;
-  optional string a_const = 3;
-  oneof a_oneof {
-    string str = 100;
-    TestEnum const = 101;
-  }
-}
-
-message MyRepeatedStruct {
-  repeated MyStruct structs = 1;
-}
-
-message MyStruct {
-  optional string string = 1;
-  optional google.protobuf.Struct struct = 2;
-}
diff --git a/libs/protobuf/ruby/tests/common_tests.rb b/libs/protobuf/ruby/tests/common_tests.rb
deleted file mode 100644
index 9288425..0000000
--- a/libs/protobuf/ruby/tests/common_tests.rb
+++ /dev/null
@@ -1,1988 +0,0 @@
-require 'google/protobuf/wrappers_pb.rb'
-
-# Defines tests which are common between proto2 and proto3 syntax.
-#
-# Requires that the proto messages are exactly the same in proto2 and proto3 syntax
-# and that the including class should define a 'proto_module' method which returns
-# the enclosing module of the proto message classes.
-
-require 'bigdecimal'
-
-module CommonTests
-  # Ruby 2.5 changed to raise FrozenError instead of RuntimeError
-  FrozenErrorType = Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.5') ? RuntimeError : FrozenError
-
-  def test_defaults
-    m = proto_module::TestMessage.new
-    assert m.optional_int32 == 0
-    assert m.optional_int64 == 0
-    assert m.optional_uint32 == 0
-    assert m.optional_uint64 == 0
-    assert m.optional_bool == false
-    assert m.optional_float == 0.0
-    assert m.optional_double == 0.0
-    assert m.optional_string == ""
-    assert m.optional_bytes == ""
-    assert m.optional_msg == nil
-    assert m.optional_enum == :Default
-  end
-
-  def test_setters
-    m = proto_module::TestMessage.new
-    m.optional_int32 = -42
-    assert m.optional_int32 == -42
-    m.optional_int64 = -0x1_0000_0000
-    assert m.optional_int64 == -0x1_0000_0000
-    m.optional_uint32 = 0x9000_0000
-    assert m.optional_uint32 == 0x9000_0000
-    m.optional_uint64 = 0x9000_0000_0000_0000
-    assert m.optional_uint64 == 0x9000_0000_0000_0000
-    m.optional_bool = true
-    assert m.optional_bool == true
-    m.optional_float = 0.5
-    assert m.optional_float == 0.5
-    m.optional_double = 0.5
-    assert m.optional_double == 0.5
-    m.optional_string = "hello"
-    assert m.optional_string == "hello"
-    m.optional_string = :hello
-    assert m.optional_string == "hello"
-    m.optional_bytes = "world".encode!('ASCII-8BIT')
-    assert m.optional_bytes == "world"
-    m.optional_msg = proto_module::TestMessage2.new(:foo => 42)
-    assert m.optional_msg == proto_module::TestMessage2.new(:foo => 42)
-    m.optional_msg = nil
-    assert m.optional_msg == nil
-    m.optional_enum = :C
-    assert m.optional_enum == :C
-    m.optional_enum = 'C'
-    assert m.optional_enum == :C
-  end
-
-  def test_ctor_args
-    m = proto_module::TestMessage.new(:optional_int32 => -42,
-                                      :optional_msg => proto_module::TestMessage2.new,
-                                      :optional_enum => :C,
-                                      :repeated_string => ["hello", "there", "world"])
-    assert m.optional_int32 == -42
-    assert m.optional_msg.class == proto_module::TestMessage2
-    assert m.repeated_string.length == 3
-    assert m.optional_enum == :C
-    assert m.repeated_string[0] == "hello"
-    assert m.repeated_string[1] == "there"
-    assert m.repeated_string[2] == "world"
-  end
-
-  def test_ctor_string_symbol_args
-    m = proto_module::TestMessage.new(:optional_enum => 'C', :repeated_enum => ['A', 'B'])
-    assert_equal :C, m.optional_enum
-    assert_equal [:A, :B], m.repeated_enum
-
-    m = proto_module::TestMessage.new(:optional_string => :foo, :repeated_string => [:foo, :bar])
-    assert_equal 'foo', m.optional_string
-    assert_equal ['foo', 'bar'], m.repeated_string
-  end
-
-  def test_ctor_nil_args
-    m = proto_module::TestMessage.new(:optional_enum => nil, :optional_int32 => nil, :optional_string => nil, :optional_msg => nil)
-
-    assert_equal :Default, m.optional_enum
-    assert_equal 0, m.optional_int32
-    assert_equal "", m.optional_string
-    assert_nil m.optional_msg
-  end
-
-  def test_embeddedmsg_hash_init
-    m = proto_module::TestEmbeddedMessageParent.new(
-      :child_msg => {sub_child: {optional_int32: 1}},
-      :number => 2,
-      :repeated_msg => [{sub_child: {optional_int32: 3}}],
-      :repeated_number => [10, 20, 30])
-
-    assert_equal 2, m.number
-    assert_equal [10, 20, 30], m.repeated_number
-
-    assert_not_nil m.child_msg
-    assert_not_nil m.child_msg.sub_child
-    assert_equal m.child_msg.sub_child.optional_int32, 1
-
-    assert_not_nil m.repeated_msg
-    assert_equal 1, m.repeated_msg.length
-    assert_equal 3, m.repeated_msg.first.sub_child.optional_int32
-  end
-
-  def test_inspect_eq_to_s
-    m = proto_module::TestMessage.new(
-      :optional_int32 => -42,
-      :optional_enum => :A,
-      :optional_msg => proto_module::TestMessage2.new(foo: 0),
-      :repeated_string => ["hello", "there", "world"])
-    expected = "<#{proto_module}::TestMessage: optional_int32: -42, optional_msg: <#{proto_module}::TestMessage2: foo: 0>, optional_enum: :A, repeated_int32: [], repeated_int64: [], repeated_uint32: [], repeated_uint64: [], repeated_bool: [], repeated_float: [], repeated_double: [], repeated_string: [\"hello\", \"there\", \"world\"], repeated_bytes: [], repeated_msg: [], repeated_enum: []>"
-    assert_equal expected, m.inspect
-    assert_equal expected, m.to_s
-
-    m = proto_module::OneofMessage.new(:b => -42)
-    expected = "<#{proto_module}::OneofMessage: b: -42>"
-    assert_equal expected, m.inspect
-    assert_equal expected, m.to_s
-  end
-
-  def test_hash
-    m1 = proto_module::TestMessage.new(:optional_int32 => 42)
-    m2 = proto_module::TestMessage.new(:optional_int32 => 102, repeated_string: ['please', 'work', 'ok?'])
-    m3 = proto_module::TestMessage.new(:optional_int32 => 102, repeated_string: ['please', 'work', 'ok?'])
-    assert m1.hash != 0
-    assert m2.hash != 0
-    assert m3.hash != 0
-    # relying on the randomness here -- if hash function changes and we are
-    # unlucky enough to get a collision, then change the values above.
-    assert m1.hash != m2.hash
-    assert_equal m2.hash, m3.hash
-  end
-
-  def test_unknown_field_errors
-    e = assert_raise NoMethodError do
-      proto_module::TestMessage.new.hello
-    end
-    assert_match(/hello/, e.message)
-
-    e = assert_raise NoMethodError do
-      proto_module::TestMessage.new.hello = "world"
-    end
-    assert_match(/hello/, e.message)
-  end
-
-  def test_type_errors
-    m = proto_module::TestMessage.new
-    e = assert_raise Google::Protobuf::TypeError do
-      m.optional_int32 = "hello"
-    end
-
-    # Google::Protobuf::TypeError should inherit from TypeError for backwards compatibility
-    # TODO: This can be removed when we can safely migrate to Google::Protobuf::TypeError
-    assert e.is_a?(::TypeError)
-
-    assert_raise Google::Protobuf::TypeError do
-      m.optional_string = 42
-    end
-    assert_raise Google::Protobuf::TypeError do
-      m.optional_string = nil
-    end
-    assert_raise Google::Protobuf::TypeError do
-      m.optional_bool = 42
-    end
-    assert_raise Google::Protobuf::TypeError do
-      m.optional_msg = proto_module::TestMessage.new  # expects TestMessage2
-    end
-
-    assert_raise Google::Protobuf::TypeError do
-      m.repeated_int32 = []  # needs RepeatedField
-    end
-
-    assert_raise Google::Protobuf::TypeError do
-      m.repeated_int32.push "hello"
-    end
-
-    assert_raise Google::Protobuf::TypeError do
-      m.repeated_msg.push proto_module::TestMessage.new
-    end
-  end
-
-  def test_string_encoding
-    m = proto_module::TestMessage.new
-
-    # Assigning a normal (ASCII or UTF8) string to a bytes field, or
-    # ASCII-8BIT to a string field will convert to the proper encoding.
-    m.optional_bytes = "Test string ASCII".encode!('ASCII')
-    assert m.optional_bytes.frozen?
-    assert_equal Encoding::ASCII_8BIT, m.optional_bytes.encoding
-    assert_equal "Test string ASCII", m.optional_bytes
-
-    assert_raise Encoding::UndefinedConversionError do
-      m.optional_bytes = "Test string UTF-8 \u0100".encode!('UTF-8')
-    end
-
-    assert_raise Encoding::UndefinedConversionError do
-      m.optional_string = ["FFFF"].pack('H*')
-    end
-
-    # "Ordinary" use case.
-    m.optional_bytes = ["FFFF"].pack('H*')
-    m.optional_string = "\u0100"
-
-    # strings are immutable so we can't do this, but serialize should catch it.
-    m.optional_string = "asdf".encode!('UTF-8')
-    assert_raise(FrozenErrorType) { m.optional_string.encode!('ASCII-8BIT') }
-  end
-
-  def test_rptfield_int32
-    l = Google::Protobuf::RepeatedField.new(:int32)
-    assert l.count == 0
-    l = Google::Protobuf::RepeatedField.new(:int32, [1, 2, 3])
-    assert l.count == 3
-    assert_equal [1, 2, 3], l
-    assert_equal l, [1, 2, 3]
-    l.push 4
-    assert l == [1, 2, 3, 4]
-    dst_list = []
-    l.each { |val| dst_list.push val }
-    assert dst_list == [1, 2, 3, 4]
-    assert l.to_a == [1, 2, 3, 4]
-    assert l[0] == 1
-    assert l[3] == 4
-    l[0] = 5
-    assert l == [5, 2, 3, 4]
-
-    l2 = l.dup
-    assert l == l2
-    assert l.object_id != l2.object_id
-    l2.push 6
-    assert l.count == 4
-    assert l2.count == 5
-
-    assert l.inspect == '[5, 2, 3, 4]'
-
-    l.concat([7, 8, 9])
-    assert l == [5, 2, 3, 4, 7, 8, 9]
-    assert l.pop == 9
-    assert l == [5, 2, 3, 4, 7, 8]
-
-    assert_raise Google::Protobuf::TypeError do
-      m = proto_module::TestMessage.new
-      l.push m
-    end
-
-    m = proto_module::TestMessage.new
-    m.repeated_int32 = l
-    assert m.repeated_int32 == [5, 2, 3, 4, 7, 8]
-    assert m.repeated_int32.object_id == l.object_id
-    l.push 42
-    assert m.repeated_int32.pop == 42
-
-    l3 = l + l.dup
-    assert l3.count == l.count * 2
-    l.count.times do |i|
-      assert l3[i] == l[i]
-      assert l3[l.count + i] == l[i]
-    end
-
-    l.clear
-    assert l.count == 0
-    l += [1, 2, 3, 4]
-    l.replace([5, 6, 7, 8])
-    assert l == [5, 6, 7, 8]
-
-    l4 = Google::Protobuf::RepeatedField.new(:int32)
-    l4[5] = 42
-    assert l4 == [0, 0, 0, 0, 0, 42]
-
-    l4 << 100
-    assert l4 == [0, 0, 0, 0, 0, 42, 100]
-    l4 << 101 << 102
-    assert l4 == [0, 0, 0, 0, 0, 42, 100, 101, 102]
-  end
-
-  def test_parent_rptfield
-    #make sure we set the RepeatedField and can add to it
-    m = proto_module::TestMessage.new
-    assert m.repeated_string == []
-    m.repeated_string << 'ok'
-    m.repeated_string.push('ok2')
-    assert m.repeated_string == ['ok', 'ok2']
-    m.repeated_string += ['ok3']
-    assert m.repeated_string == ['ok', 'ok2', 'ok3']
-  end
-
-  def test_rptfield_msg
-    l = Google::Protobuf::RepeatedField.new(:message, proto_module::TestMessage)
-    l.push proto_module::TestMessage.new
-    assert l.count == 1
-    assert_raise Google::Protobuf::TypeError do
-      l.push proto_module::TestMessage2.new
-    end
-    assert_raise Google::Protobuf::TypeError do
-      l.push 42
-    end
-
-    l2 = l.dup
-    assert l2[0] == l[0]
-    assert l2[0].object_id == l[0].object_id
-
-    l2 = Google::Protobuf.deep_copy(l)
-    assert l2[0] == l[0]
-    assert l2[0].object_id != l[0].object_id
-
-    l3 = l + l2
-    assert l3.count == 2
-    assert l3[0] == l[0]
-    assert l3[1] == l2[0]
-    l3[0].optional_int32 = 1000
-    assert l[0].optional_int32 == 1000
-
-    new_msg = proto_module::TestMessage.new(:optional_int32 => 200)
-    l4 = l + [new_msg]
-    assert l4.count == 2
-    new_msg.optional_int32 = 1000
-    assert l4[1].optional_int32 == 1000
-  end
-
-  def test_rptfield_enum
-    l = Google::Protobuf::RepeatedField.new(:enum, proto_module::TestEnum)
-    l.push :A
-    l.push :B
-    l.push :C
-    l.push :v0
-    assert l.count == 4
-    assert_raise RangeError do
-      l.push :D
-    end
-    assert l[0] == :A
-    assert l[3] == :v0
-
-    l.push 5
-    assert l[4] == 5
-  end
-
-  def test_rptfield_initialize
-    assert_raise ArgumentError do
-      Google::Protobuf::RepeatedField.new
-    end
-    assert_raise ArgumentError do
-      Google::Protobuf::RepeatedField.new(:message)
-    end
-    assert_raise ArgumentError do
-      Google::Protobuf::RepeatedField.new([1, 2, 3])
-    end
-    assert_raise ArgumentError do
-      Google::Protobuf::RepeatedField.new(:message, [proto_module::TestMessage2.new])
-    end
-  end
-
-  def test_rptfield_array_ducktyping
-    l = Google::Protobuf::RepeatedField.new(:int32)
-    length_methods = %w(count length size)
-    length_methods.each do |lm|
-      assert l.send(lm)  == 0
-    end
-    # out of bounds returns a nil
-    assert l[0] == nil
-    assert l[1] == nil
-    assert l[-1] == nil
-    l.push 4
-    length_methods.each do |lm|
-      assert l.send(lm) == 1
-    end
-    assert l[0] == 4
-    assert l[1] == nil
-    assert l[-1] == 4
-    assert l[-2] == nil
-
-    l.push 2
-    length_methods.each do |lm|
-      assert l.send(lm) == 2
-    end
-    assert l[0] == 4
-    assert l[1] == 2
-    assert l[2] == nil
-    assert l[-1] == 2
-    assert l[-2] == 4
-    assert l[-3] == nil
-
-    #adding out of scope will backfill with empty objects
-  end
-
-  def test_map_basic
-    # allowed key types:
-    # :int32, :int64, :uint32, :uint64, :bool, :string, :bytes.
-
-    m = Google::Protobuf::Map.new(:string, :int32)
-    m["asdf"] = 1
-    assert m["asdf"] == 1
-    m["jkl;"] = 42
-    assert m == { "jkl;" => 42, "asdf" => 1 }
-    assert m.has_key?("asdf")
-    assert !m.has_key?("qwerty")
-    assert m.length == 2
-
-    m2 = m.dup
-    assert_equal m, m2
-    assert m.hash != 0
-    assert_equal m.hash, m2.hash
-
-    collected = {}
-    m.each { |k,v| collected[v] = k }
-    assert collected == { 42 => "jkl;", 1 => "asdf" }
-
-    assert m.delete("asdf") == 1
-    assert !m.has_key?("asdf")
-    assert m["asdf"] == nil
-    assert !m.has_key?("asdf")
-
-    # We only assert on inspect value when there is one map entry because the
-    # order in which elements appear is unspecified (depends on the internal
-    # hash function). We don't want a brittle test.
-    assert m.inspect == "{\"jkl;\"=>42}"
-
-    assert m.keys == ["jkl;"]
-    assert m.values == [42]
-
-    m.clear
-    assert m.length == 0
-    assert m == {}
-
-    assert_raise Google::Protobuf::TypeError do
-      m[1] = 1
-    end
-    assert_raise RangeError do
-      m["asdf"] = 0x1_0000_0000
-    end
-  end
-
-  def test_b_8385
-    m1 = Google::Protobuf::Map.new(:string, :string)
-    m2 = Google::Protobuf::Map.new(:string, :string)
-
-    assert_equal m1, m2
-
-    m1["counter"] = "a"
-    m2["counter"] = "aa"
-
-    assert_not_equal m1, m2
-  end
-
-  def test_map_ctor
-    m = Google::Protobuf::Map.new(:string, :int32,
-                                  {"a" => 1, "b" => 2, "c" => 3})
-    assert m == {"a" => 1, "c" => 3, "b" => 2}
-  end
-
-  def test_map_keytypes
-    m = Google::Protobuf::Map.new(:int32, :int32)
-    m[1] = 42
-    m[-1] = 42
-    assert_raise RangeError do
-      m[0x8000_0000] = 1
-    end
-    assert_raise Google::Protobuf::TypeError do
-      m["asdf"] = 1
-    end
-
-    m = Google::Protobuf::Map.new(:int64, :int32)
-    m[0x1000_0000_0000_0000] = 1
-    assert_raise RangeError do
-      m[0x1_0000_0000_0000_0000] = 1
-    end
-    assert_raise Google::Protobuf::TypeError do
-      m["asdf"] = 1
-    end
-
-    m = Google::Protobuf::Map.new(:uint32, :int32)
-    m[0x8000_0000] = 1
-    assert_raise RangeError do
-      m[0x1_0000_0000] = 1
-    end
-    assert_raise RangeError do
-      m[-1] = 1
-    end
-
-    m = Google::Protobuf::Map.new(:uint64, :int32)
-    m[0x8000_0000_0000_0000] = 1
-    assert_raise RangeError do
-      m[0x1_0000_0000_0000_0000] = 1
-    end
-    assert_raise RangeError do
-      m[-1] = 1
-    end
-
-    m = Google::Protobuf::Map.new(:bool, :int32)
-    m[true] = 1
-    m[false] = 2
-    assert_raise Google::Protobuf::TypeError do
-      m[1] = 1
-    end
-    assert_raise Google::Protobuf::TypeError do
-      m["asdf"] = 1
-    end
-
-    m = Google::Protobuf::Map.new(:string, :int32)
-    m["asdf"] = 1
-    assert_raise Google::Protobuf::TypeError do
-      m[1] = 1
-    end
-    assert_raise Encoding::UndefinedConversionError do
-      bytestring = ["FFFF"].pack("H*")
-      m[bytestring] = 1
-    end
-
-    m = Google::Protobuf::Map.new(:bytes, :int32)
-    bytestring = ["FFFF"].pack("H*")
-    m[bytestring] = 1
-    # Allowed -- we will automatically convert to ASCII-8BIT.
-    m["asdf"] = 1
-    assert_raise Google::Protobuf::TypeError do
-      m[1] = 1
-    end
-  end
-
-  def test_map_msg_enum_valuetypes
-    m = Google::Protobuf::Map.new(:string, :message, proto_module::TestMessage)
-    m["asdf"] = proto_module::TestMessage.new
-    assert_raise Google::Protobuf::TypeError do
-      m["jkl;"] = proto_module::TestMessage2.new
-    end
-
-    m = Google::Protobuf::Map.new(
-      :string, :message, proto_module::TestMessage,
-      { "a" => proto_module::TestMessage.new(:optional_int32 => 42),
-        "b" => proto_module::TestMessage.new(:optional_int32 => 84) })
-    assert m.length == 2
-    assert m.values.map{|msg| msg.optional_int32}.sort == [42, 84]
-
-    m = Google::Protobuf::Map.new(:string, :enum, proto_module::TestEnum,
-                                  { "x" => :A, "y" => :B, "z" => :C })
-    assert m.length == 3
-    assert m["z"] == :C
-    m["z"] = 2
-    assert m["z"] == :B
-    m["z"] = 5
-    assert m["z"] == 5
-    assert_raise RangeError do
-      m["z"] = :Z
-    end
-    assert_raise RangeError do
-      m["z"] = "z"
-    end
-  end
-
-  def test_map_dup_deep_copy
-    m = Google::Protobuf::Map.new(
-      :string, :message, proto_module::TestMessage,
-      { "a" => proto_module::TestMessage.new(:optional_int32 => 42),
-        "b" => proto_module::TestMessage.new(:optional_int32 => 84) })
-
-    m2 = m.dup
-    assert m.to_h == m2.to_h
-    assert m == m2
-    assert m.object_id != m2.object_id
-    assert m["a"].object_id == m2["a"].object_id
-    assert m["b"].object_id == m2["b"].object_id
-
-    m2 = Google::Protobuf.deep_copy(m)
-    assert m == m2
-    assert m.object_id != m2.object_id
-    assert m["a"].object_id != m2["a"].object_id
-    assert m["b"].object_id != m2["b"].object_id
-  end
-
-  def test_oneof_descriptors
-    d = proto_module::OneofMessage.descriptor
-    o = d.lookup_oneof("my_oneof")
-    assert o != nil
-    assert o.class == Google::Protobuf::OneofDescriptor
-    assert o.name == "my_oneof"
-    oneof_count = 0
-    d.each_oneof{ |oneof|
-      oneof_count += 1
-      assert oneof == o
-    }
-    assert oneof_count == 1
-    assert o.count == 4
-    field_names = o.map{|f| f.name}.sort
-    assert field_names == ["a", "b", "c", "d"]
-  end
-
-  def test_oneof
-    d = proto_module::OneofMessage.new
-    assert d.a == ""
-    assert d.b == 0
-    assert d.c == nil
-    assert d.d == :Default
-    assert d.my_oneof == nil
-
-    d.a = "hi"
-    assert d.a == "hi"
-    assert d.b == 0
-    assert d.c == nil
-    assert d.d == :Default
-    assert d.my_oneof == :a
-
-    d.b = 42
-    assert d.a == ""
-    assert d.b == 42
-    assert d.c == nil
-    assert d.d == :Default
-    assert d.my_oneof == :b
-
-    d.c = proto_module::TestMessage2.new(:foo => 100)
-    assert d.a == ""
-    assert d.b == 0
-    assert d.c.foo == 100
-    assert d.d == :Default
-    assert d.my_oneof == :c
-
-    d.d = :C
-    assert d.a == ""
-    assert d.b == 0
-    assert d.c == nil
-    assert d.d == :C
-    assert d.my_oneof == :d
-
-    d2 = proto_module::OneofMessage.decode(proto_module::OneofMessage.encode(d))
-    assert d2 == d
-
-    encoded_field_a = proto_module::OneofMessage.encode(proto_module::OneofMessage.new(:a => "string"))
-    encoded_field_b = proto_module::OneofMessage.encode(proto_module::OneofMessage.new(:b => 1000))
-    encoded_field_c = proto_module::OneofMessage.encode(
-      proto_module::OneofMessage.new(:c => proto_module::TestMessage2.new(:foo => 1)))
-    encoded_field_d = proto_module::OneofMessage.encode(proto_module::OneofMessage.new(:d => :B))
-
-    d3 = proto_module::OneofMessage.decode(
-      encoded_field_c + encoded_field_a + encoded_field_b + encoded_field_d)
-    assert d3.a == ""
-    assert d3.b == 0
-    assert d3.c == nil
-    assert d3.d == :B
-
-    d4 = proto_module::OneofMessage.decode(
-      encoded_field_c + encoded_field_a + encoded_field_b + encoded_field_d +
-      encoded_field_c)
-    assert d4.a == ""
-    assert d4.b == 0
-    assert d4.c.foo == 1
-    assert d4.d == :Default
-
-    d5 = proto_module::OneofMessage.new(:a => "hello")
-    assert d5.a == "hello"
-    d5.a = nil
-    assert d5.a == ""
-    assert proto_module::OneofMessage.encode(d5) == ''
-    assert d5.my_oneof == nil
-  end
-
-  def test_enum_field
-    m = proto_module::TestMessage.new
-    assert m.optional_enum == :Default
-    m.optional_enum = :A
-    assert m.optional_enum == :A
-    assert_raise RangeError do
-      m.optional_enum = :ASDF
-    end
-    m.optional_enum = 1
-    assert m.optional_enum == :A
-    m.optional_enum = 100
-    assert m.optional_enum == 100
-  end
-
-  def test_dup
-    m = proto_module::TestMessage.new
-    m.optional_string = "hello"
-    m.optional_int32 = 42
-    tm1 = proto_module::TestMessage2.new(:foo => 100)
-    tm2 = proto_module::TestMessage2.new(:foo => 200)
-    m.repeated_msg.push tm1
-    assert m.repeated_msg[-1] == tm1
-    m.repeated_msg.push tm2
-    assert m.repeated_msg[-1] == tm2
-    m2 = m.dup
-    assert m == m2
-    m.optional_int32 += 1
-    assert m != m2
-    assert m.repeated_msg[0] == m2.repeated_msg[0]
-    assert m.repeated_msg[0].object_id == m2.repeated_msg[0].object_id
-  end
-
-  def test_deep_copy
-    m = proto_module::TestMessage.new(:optional_int32 => 42,
-                                      :repeated_msg => [proto_module::TestMessage2.new(:foo => 100)])
-    m2 = Google::Protobuf.deep_copy(m)
-    assert m == m2
-    assert m.repeated_msg == m2.repeated_msg
-    assert m.repeated_msg.object_id != m2.repeated_msg.object_id
-    assert m.repeated_msg[0].object_id != m2.repeated_msg[0].object_id
-  end
-
-  def test_message_eq
-    m = proto_module::TestMessage.new(:optional_int32 => 42,
-                                      :repeated_int32 => [1, 2, 3])
-    m2 = proto_module::TestMessage.new(:optional_int32 => 43,
-                                       :repeated_int32 => [1, 2, 3])
-    assert m != m2
-    assert_not_equal proto_module::TestMessage.new, proto_module::TestMessage2.new
-  end
-
-  def test_enum_lookup
-    assert proto_module::TestEnum::A == 1
-    assert proto_module::TestEnum::B == 2
-    assert proto_module::TestEnum::C == 3
-    assert proto_module::TestEnum::V0 == 4
-
-    assert proto_module::TestEnum::lookup(1) == :A
-    assert proto_module::TestEnum::lookup(2) == :B
-    assert proto_module::TestEnum::lookup(3) == :C
-    assert proto_module::TestEnum::lookup(4) == :v0
-
-    assert proto_module::TestEnum::resolve(:A) == 1
-    assert proto_module::TestEnum::resolve(:B) == 2
-    assert proto_module::TestEnum::resolve(:C) == 3
-    assert proto_module::TestEnum::resolve(:v0) == 4
-  end
-
-  def test_enum_const_get_helpers
-    m = proto_module::TestMessage.new
-    assert_equal proto_module::TestEnum::Default, m.optional_enum_const
-    assert_equal proto_module::TestEnum.const_get(:Default), m.optional_enum_const
-
-    m = proto_module::TestMessage.new({optional_enum: proto_module::TestEnum::A})
-    assert_equal proto_module::TestEnum::A, m.optional_enum_const
-    assert_equal proto_module::TestEnum.const_get(:A), m.optional_enum_const
-
-    m = proto_module::TestMessage.new({optional_enum: proto_module::TestEnum::B})
-    assert_equal proto_module::TestEnum::B, m.optional_enum_const
-    assert_equal proto_module::TestEnum.const_get(:B), m.optional_enum_const
-
-    m = proto_module::TestMessage.new({optional_enum: proto_module::TestEnum::C})
-    assert_equal proto_module::TestEnum::C, m.optional_enum_const
-    assert_equal proto_module::TestEnum.const_get(:C), m.optional_enum_const
-
-    m = proto_module::TestMessage2.new({foo: 2})
-    assert_equal 2, m.foo
-    assert_raise(NoMethodError) { m.foo_ }
-    assert_raise(NoMethodError) { m.foo_X }
-    assert_raise(NoMethodError) { m.foo_XX }
-    assert_raise(NoMethodError) { m.foo_XXX }
-    assert_raise(NoMethodError) { m.foo_XXXX }
-    assert_raise(NoMethodError) { m.foo_XXXXX }
-    assert_raise(NoMethodError) { m.foo_XXXXXX }
-
-    m = proto_module::Enumer.new({optional_enum: :B})
-    assert_equal :B, m.optional_enum
-    assert_raise(NoMethodError) { m.optional_enum_ }
-    assert_raise(NoMethodError) { m.optional_enum_X }
-    assert_raise(NoMethodError) { m.optional_enum_XX }
-    assert_raise(NoMethodError) { m.optional_enum_XXX }
-    assert_raise(NoMethodError) { m.optional_enum_XXXX }
-    assert_raise(NoMethodError) { m.optional_enum_XXXXX }
-    assert_raise(NoMethodError) { m.optional_enum_XXXXXX }
-  end
-
-  def test_enum_getter
-    m = proto_module::Enumer.new(:optional_enum => :B, :repeated_enum => [:A, :C])
-
-    assert_equal :B, m.optional_enum
-    assert_equal 2, m.optional_enum_const
-    assert_equal proto_module::TestEnum::B, m.optional_enum_const
-    assert_equal [:A, :C], m.repeated_enum
-    assert_equal [1, 3], m.repeated_enum_const
-    assert_equal [proto_module::TestEnum::A, proto_module::TestEnum::C], m.repeated_enum_const
-  end
-
-  def test_enum_getter_oneof
-    m = proto_module::Enumer.new(:const => :C)
-
-    assert_equal :C, m.const
-    assert_equal 3, m.const_const
-    assert_equal proto_module::TestEnum::C, m.const_const
-  end
-
-  def test_enum_getter_only_enums
-    m = proto_module::Enumer.new(:optional_enum => :B, :a_const => 'thing')
-
-    assert_equal 'thing', m.a_const
-    assert_equal :B, m.optional_enum
-
-    assert_raise(NoMethodError) { m.a }
-    assert_raise(NoMethodError) { m.a_const_const }
-  end
-
-  def test_repeated_push
-    m = proto_module::TestMessage.new
-
-    m.repeated_string += ['one']
-    m.repeated_string += %w[two three]
-    assert_equal %w[one two three], m.repeated_string
-
-    m.repeated_string.push( *['four', 'five'] )
-    assert_equal %w[one two three four five], m.repeated_string
-
-    m.repeated_string.push 'six', 'seven'
-    assert_equal %w[one two three four five six seven], m.repeated_string
-
-    m = proto_module::TestMessage.new
-
-    m.repeated_msg += [proto_module::TestMessage2.new(:foo => 1), proto_module::TestMessage2.new(:foo => 2)]
-    m.repeated_msg += [proto_module::TestMessage2.new(:foo => 3)]
-    m.repeated_msg.push proto_module::TestMessage2.new(:foo => 4), proto_module::TestMessage2.new(:foo => 5)
-    assert_equal [1, 2, 3, 4, 5], m.repeated_msg.map {|x| x.foo}
-  end
-
-  def test_parse_serialize
-    m = proto_module::TestMessage.new(:optional_int32 => 42,
-                                      :optional_string => "hello world",
-                                      :optional_enum => :B,
-                                      :repeated_string => ["a", "b", "c"],
-                                      :repeated_int32 => [42, 43, 44],
-                                      :repeated_enum => [:A, :B, :C],
-                                      :repeated_msg => [proto_module::TestMessage2.new(:foo => 1),
-                                                        proto_module::TestMessage2.new(:foo => 2)])
-    if proto_module == ::BasicTest
-      # For proto3 we can add an unknown enum value safely.
-      m.repeated_enum << 100
-    end
-
-    data = proto_module::TestMessage.encode m
-    m2 = proto_module::TestMessage.decode data
-
-    assert_equal m, m2
-
-    data = Google::Protobuf.encode m
-    m2 = Google::Protobuf.decode(proto_module::TestMessage, data)
-    assert m == m2
-  end
-
-  def test_encode_decode_helpers
-    m = proto_module::TestMessage.new(:optional_string => 'foo', :repeated_string => ['bar1', 'bar2'])
-    assert_equal 'foo', m.optional_string
-    assert_equal ['bar1', 'bar2'], m.repeated_string
-
-    json = m.to_json
-    m2 = proto_module::TestMessage.decode_json(json)
-    assert_equal 'foo', m2.optional_string
-    assert_equal ['bar1', 'bar2'], m2.repeated_string
-    if RUBY_PLATFORM != "java"
-      assert m2.optional_string.frozen?
-      assert m2.repeated_string[0].frozen?
-    end
-
-    proto = m.to_proto
-    m2 = proto_module::TestMessage.decode(proto)
-    assert_equal 'foo', m2.optional_string
-    assert_equal ['bar1', 'bar2'], m2.repeated_string
-  end
-
-  def test_protobuf_encode_decode_helpers
-    m = proto_module::TestMessage.new(:optional_string => 'foo', :repeated_string => ['bar1', 'bar2'])
-    encoded_msg = Google::Protobuf.encode(m)
-    assert_equal m.to_proto, encoded_msg
-
-    decoded_msg = Google::Protobuf.decode(proto_module::TestMessage, encoded_msg)
-    assert_equal proto_module::TestMessage.decode(m.to_proto), decoded_msg
-  end
-
-  def test_protobuf_encode_decode_json_helpers
-    m = proto_module::TestMessage.new(:optional_string => 'foo', :repeated_string => ['bar1', 'bar2'])
-    encoded_msg = Google::Protobuf.encode_json(m)
-    assert_equal m.to_json, encoded_msg
-
-    decoded_msg = Google::Protobuf.decode_json(proto_module::TestMessage, encoded_msg)
-    assert_equal proto_module::TestMessage.decode_json(m.to_json), decoded_msg
-
-    assert_equal [m].to_json, Google::Protobuf.encode_json([m])
-    assert_equal proto_module::TestMessage.decode_json([m.to_json].first), decoded_msg
-  end
-
-  def test_def_errors
-    s = Google::Protobuf::DescriptorPool.new
-    assert_raise Google::Protobuf::TypeError do
-      s.build do
-        # enum with no default (integer value 0)
-        add_enum "MyEnum" do
-          value :A, 1
-        end
-      end
-    end
-    assert_raise Google::Protobuf::TypeError do
-      s.build do
-        # message with required field (unsupported in proto3)
-        add_message "MyMessage" do
-          required :foo, :int32, 1
-        end
-      end
-    end
-  end
-
-  def test_corecursive
-    # just be sure that we can instantiate types with corecursive field-type
-    # references.
-    m = proto_module::Recursive1.new(:foo => proto_module::Recursive2.new(:foo => proto_module::Recursive1.new))
-    assert proto_module::Recursive1.descriptor.lookup("foo").subtype ==
-           proto_module::Recursive2.descriptor
-    assert proto_module::Recursive2.descriptor.lookup("foo").subtype ==
-           proto_module::Recursive1.descriptor
-
-    serialized = proto_module::Recursive1.encode(m)
-    m2 = proto_module::Recursive1.decode(serialized)
-    assert m == m2
-  end
-
-  def test_serialize_cycle
-    m = proto_module::Recursive1.new(:foo => proto_module::Recursive2.new)
-    m.foo.foo = m
-    assert_raise RuntimeError do
-      proto_module::Recursive1.encode(m)
-    end
-  end
-
-  def test_bad_field_names
-    m = proto_module::BadFieldNames.new(:dup => 1, :class => 2)
-    m2 = m.dup
-    assert m == m2
-    assert m['dup'] == 1
-    assert m['class'] == 2
-    m['dup'] = 3
-    assert m['dup'] == 3
-  end
-
-  def test_int_ranges
-    m = proto_module::TestMessage.new
-
-    m.optional_int32 = 0
-    m.optional_int32 = -0x8000_0000
-    m.optional_int32 = +0x7fff_ffff
-    m.optional_int32 = 1.0
-    m.optional_int32 = -1.0
-    m.optional_int32 = 2e9
-    assert_raise RangeError do
-      m.optional_int32 = -0x8000_0001
-    end
-    assert_raise RangeError do
-      m.optional_int32 = +0x8000_0000
-    end
-    assert_raise RangeError do
-      m.optional_int32 = +0x1000_0000_0000_0000_0000_0000 # force Bignum
-    end
-    assert_raise RangeError do
-      m.optional_int32 = 1e12
-    end
-    assert_raise RangeError do
-      m.optional_int32 = 1.5
-    end
-
-    m.optional_uint32 = 0
-    m.optional_uint32 = +0xffff_ffff
-    m.optional_uint32 = 1.0
-    m.optional_uint32 = 4e9
-    assert_raise RangeError do
-      m.optional_uint32 = -1
-    end
-    assert_raise RangeError do
-      m.optional_uint32 = -1.5
-    end
-    assert_raise RangeError do
-      m.optional_uint32 = -1.5e12
-    end
-    assert_raise RangeError do
-      m.optional_uint32 = -0x1000_0000_0000_0000
-    end
-    assert_raise RangeError do
-      m.optional_uint32 = +0x1_0000_0000
-    end
-    assert_raise RangeError do
-      m.optional_uint32 = +0x1000_0000_0000_0000_0000_0000 # force Bignum
-    end
-    assert_raise RangeError do
-      m.optional_uint32 = 1e12
-    end
-    assert_raise RangeError do
-      m.optional_uint32 = 1.5
-    end
-
-    m.optional_int64 = 0
-    m.optional_int64 = -0x8000_0000_0000_0000
-    m.optional_int64 = +0x7fff_ffff_ffff_ffff
-    m.optional_int64 = 1.0
-    m.optional_int64 = -1.0
-    m.optional_int64 = 8e18
-    m.optional_int64 = -8e18
-    assert_raise RangeError do
-      m.optional_int64 = -0x8000_0000_0000_0001
-    end
-    assert_raise RangeError do
-      m.optional_int64 = +0x8000_0000_0000_0000
-    end
-    assert_raise RangeError do
-      m.optional_int64 = +0x1000_0000_0000_0000_0000_0000 # force Bignum
-    end
-    assert_raise RangeError do
-      m.optional_int64 = 1e50
-    end
-    assert_raise RangeError do
-      m.optional_int64 = 1.5
-    end
-
-    m.optional_uint64 = 0
-    m.optional_uint64 = +0xffff_ffff_ffff_ffff
-    m.optional_uint64 = 1.0
-    m.optional_uint64 = 16e18
-    assert_raise RangeError do
-      m.optional_uint64 = -1
-    end
-    assert_raise RangeError do
-      m.optional_uint64 = -1.5
-    end
-    assert_raise RangeError do
-      m.optional_uint64 = -1.5e12
-    end
-    assert_raise RangeError do
-      m.optional_uint64 = -0x1_0000_0000_0000_0000
-    end
-    assert_raise RangeError do
-      m.optional_uint64 = +0x1_0000_0000_0000_0000
-    end
-    assert_raise RangeError do
-      m.optional_uint64 = +0x1000_0000_0000_0000_0000_0000 # force Bignum
-    end
-    assert_raise RangeError do
-      m.optional_uint64 = 1e50
-    end
-    assert_raise RangeError do
-      m.optional_uint64 = 1.5
-    end
-  end
-
-  def test_stress_test
-    m = proto_module::TestMessage.new
-    m.optional_int32 = 42
-    m.optional_int64 = 0x100000000
-    m.optional_string = "hello world"
-    10.times do m.repeated_msg.push proto_module::TestMessage2.new(:foo => 42) end
-    10.times do m.repeated_string.push "hello world" end
-
-    data = proto_module::TestMessage.encode(m)
-
-    10_000.times do
-      m = proto_module::TestMessage.decode(data)
-      data_new = proto_module::TestMessage.encode(m)
-      assert data_new == data
-      data = data_new
-    end
-  end
-
-  def test_reflection
-    m = proto_module::TestMessage.new(:optional_int32 => 1234)
-    msgdef = m.class.descriptor
-    assert msgdef.class == Google::Protobuf::Descriptor
-    assert msgdef.any? {|field| field.name == "optional_int32"}
-    optional_int32 = msgdef.lookup "optional_int32"
-    assert optional_int32.class == Google::Protobuf::FieldDescriptor
-    assert optional_int32 != nil
-    assert optional_int32.name == "optional_int32"
-    assert optional_int32.type == :int32
-    optional_int32.set(m, 5678)
-    assert m.optional_int32 == 5678
-    m.optional_int32 = 1000
-    assert optional_int32.get(m) == 1000
-
-    optional_msg = msgdef.lookup "optional_msg"
-    assert optional_msg.subtype == proto_module::TestMessage2.descriptor
-
-    optional_msg.set(m, optional_msg.subtype.msgclass.new)
-
-    assert msgdef.msgclass == proto_module::TestMessage
-
-    optional_enum = msgdef.lookup "optional_enum"
-    assert optional_enum.subtype == proto_module::TestEnum.descriptor
-    assert optional_enum.subtype.class == Google::Protobuf::EnumDescriptor
-    optional_enum.subtype.each do |k, v|
-      # set with integer, check resolution to symbolic name
-      optional_enum.set(m, v)
-      assert optional_enum.get(m) == k
-    end
-  end
-
-  def test_json
-    m = proto_module::TestMessage.new(:optional_int32 => 1234,
-                                      :optional_int64 => -0x1_0000_0000,
-                                      :optional_uint32 => 0x8000_0000,
-                                      :optional_uint64 => 0xffff_ffff_ffff_ffff,
-                                      :optional_bool => true,
-                                      :optional_float => 1.0,
-                                      :optional_double => -1e100,
-                                      :optional_string => "Test string",
-                                      :optional_bytes => ["FFFFFFFF"].pack('H*'),
-                                      :optional_msg => proto_module::TestMessage2.new(:foo => 42),
-                                      :repeated_int32 => [1, 2, 3, 4],
-                                      :repeated_string => ["a", "b", "c"],
-                                      :repeated_bool => [true, false, true, false],
-                                      :repeated_msg => [proto_module::TestMessage2.new(:foo => 1),
-                                                        proto_module::TestMessage2.new(:foo => 2)])
-
-    json_text = proto_module::TestMessage.encode_json(m)
-    m2 = proto_module::TestMessage.decode_json(json_text)
-    assert_equal m, m2
-
-    # Crash case from GitHub issue 283.
-    bar = proto_module::Bar.new(msg: "bar")
-    baz1 = proto_module::Baz.new(msg: "baz")
-    baz2 = proto_module::Baz.new(msg: "quux")
-    proto_module::Foo.encode_json(proto_module::Foo.new)
-    proto_module::Foo.encode_json(proto_module::Foo.new(bar: bar))
-    proto_module::Foo.encode_json(proto_module::Foo.new(bar: bar, baz: [baz1, baz2]))
-  end
-
-  def test_json_empty
-    assert proto_module::TestMessage.encode_json(proto_module::TestMessage.new) == '{}'
-  end
-
-  def test_json_emit_defaults
-    # TODO: Fix JSON in JRuby version.
-    return if RUBY_PLATFORM == "java"
-    m = proto_module::TestMessage.new
-
-    expected = {
-      repeatedInt32: [],
-      repeatedInt64: [],
-      repeatedUint32: [],
-      repeatedUint64: [],
-      repeatedBool: [],
-      repeatedFloat: [],
-      repeatedDouble: [],
-      repeatedString: [],
-      repeatedBytes: [],
-      repeatedMsg: [],
-      repeatedEnum: []
-    }
-
-    actual = proto_module::TestMessage.encode_json(m, :emit_defaults => true)
-
-    assert_equal expected, JSON.parse(actual, :symbolize_names => true)
-  end
-
-  def test_json_emit_defaults_submsg
-    # TODO: Fix JSON in JRuby version.
-    return if RUBY_PLATFORM == "java"
-    m = proto_module::TestMessage.new(optional_msg: proto_module::TestMessage2.new)
-
-    expected = {
-      optionalMsg: {},
-      repeatedInt32: [],
-      repeatedInt64: [],
-      repeatedUint32: [],
-      repeatedUint64: [],
-      repeatedBool: [],
-      repeatedFloat: [],
-      repeatedDouble: [],
-      repeatedString: [],
-      repeatedBytes: [],
-      repeatedMsg: [],
-      repeatedEnum: []
-    }
-
-    actual = proto_module::TestMessage.encode_json(m, :emit_defaults => true)
-
-    assert_equal expected, JSON.parse(actual, :symbolize_names => true)
-  end
-
-  def test_json_emit_defaults_repeated_submsg
-    # TODO: Fix JSON in JRuby version.
-    return if RUBY_PLATFORM == "java"
-    m = proto_module::TestMessage.new(repeated_msg: [proto_module::TestMessage2.new])
-
-    expected = {
-      repeatedInt32: [],
-      repeatedInt64: [],
-      repeatedUint32: [],
-      repeatedUint64: [],
-      repeatedBool: [],
-      repeatedFloat: [],
-      repeatedDouble: [],
-      repeatedString: [],
-      repeatedBytes: [],
-      repeatedMsg: [{}],
-      repeatedEnum: []
-    }
-
-    actual = proto_module::TestMessage.encode_json(m, :emit_defaults => true)
-
-    assert_equal expected, JSON.parse(actual, :symbolize_names => true)
-  end
-
-  def value_from_ruby(value)
-    ret = Google::Protobuf::Value.new
-    case value
-    when String
-      ret.string_value = value
-    when Google::Protobuf::Struct
-      ret.struct_value = value
-    when Hash
-      ret.struct_value = struct_from_ruby(value)
-    when Google::Protobuf::ListValue
-      ret.list_value = value
-    when Array
-      ret.list_value = list_from_ruby(value)
-    else
-      @log.error "Unknown type: #{value.class}"
-      raise Google::Protobuf::Error, "Unknown type: #{value.class}"
-    end
-    ret
-  end
-
-  def list_from_ruby(arr)
-    ret = Google::Protobuf::ListValue.new
-    arr.each do |v|
-      ret.values << value_from_ruby(v)
-    end
-    ret
-  end
-
-  def struct_from_ruby(hash)
-    ret = Google::Protobuf::Struct.new
-    hash.each do |k, v|
-      ret.fields[k] ||= value_from_ruby(v)
-    end
-    ret
-  end
-
-  def test_deep_json
-    # will not overflow
-    json = '{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":{"a":'\
-           '{"a":{"a":{"a":{"a":{}}}}}}}}}}}}}}}}'
-
-    struct = struct_from_ruby(JSON.parse(json))
-    assert_equal json, struct.to_json
-
-    encoded = proto_module::MyRepeatedStruct.encode(
-      proto_module::MyRepeatedStruct.new(structs: [proto_module::MyStruct.new(struct: struct)]))
-    assert_equal json, proto_module::MyRepeatedStruct.decode(encoded).structs[0].struct.to_json
-
-    # will overflow
-    json = '{"a":{"a":{"a":[{"a":{"a":[{"a":[{"a":{"a":[{"a":[{"a":'\
-           '{"a":[{"a":[{"a":{"a":{"a":[{"a":"a"}]}}}]}]}}]}]}}]}]}}]}}}'
-
-    struct = struct_from_ruby(JSON.parse(json))
-    assert_equal json, struct.to_json
-
-    assert_raise(RuntimeError, "Recursion limit exceeded during encoding") do
-      struct = Google::Protobuf::Struct.new
-      struct.fields["foobar"] = Google::Protobuf::Value.new(struct_value: struct)
-      Google::Protobuf::Struct.encode(struct)
-    end
-  end
-
-  def test_comparison_with_arbitrary_object
-    assert proto_module::TestMessage.new != nil
-  end
-
-  def test_wrappers_set_to_default
-    run_asserts = ->(m) {
-      assert_equal 0.0, m.double.value
-      assert_equal 0.0, m.float.value
-      assert_equal 0, m.int32.value
-      assert_equal 0, m.int64.value
-      assert_equal 0, m.uint32.value
-      assert_equal 0, m.uint64.value
-      assert_equal false, m.bool.value
-      assert_equal '', m.string.value
-      assert_equal '', m.bytes.value
-    }
-
-    m = proto_module::Wrapper.new(
-      double: Google::Protobuf::DoubleValue.new(value: 0.0),
-      float: Google::Protobuf::FloatValue.new(value: 0.0),
-      int32: Google::Protobuf::Int32Value.new(value: 0),
-      int64: Google::Protobuf::Int64Value.new(value: 0),
-      uint32: Google::Protobuf::UInt32Value.new(value: 0),
-      uint64: Google::Protobuf::UInt64Value.new(value: 0),
-      bool: Google::Protobuf::BoolValue.new(value: false),
-      string: Google::Protobuf::StringValue.new(value: ""),
-      bytes: Google::Protobuf::BytesValue.new(value: ''),
-    )
-
-    run_asserts.call(m)
-    m2 = proto_module::Wrapper.decode(m.to_proto)
-    run_asserts.call(m2)
-    m3 = proto_module::Wrapper.decode_json(m.to_json)
-    run_asserts.call(m3)
-  end
-
-  def test_wrapper_getters
-    run_asserts = ->(m) {
-      assert_equal 2.0, m.double_as_value
-      assert_equal 2.0, m.double.value
-      assert_equal 2.0, m.double_as_value
-
-      assert_equal 4.0, m.float_as_value
-      assert_equal 4.0, m.float.value
-      assert_equal 4.0, m.float_as_value
-
-      assert_equal 3, m.int32_as_value
-      assert_equal 3, m.int32.value
-      assert_equal 3, m.int32_as_value
-
-      assert_equal 4, m.int64_as_value
-      assert_equal 4, m.int64.value
-      assert_equal 4, m.int64_as_value
-
-      assert_equal 5, m.uint32_as_value
-      assert_equal 5, m.uint32.value
-      assert_equal 5, m.uint32_as_value
-
-      assert_equal 6, m.uint64_as_value
-      assert_equal 6, m.uint64.value
-      assert_equal 6, m.uint64_as_value
-
-      assert_equal true, m.bool_as_value
-      assert_equal true, m.bool.value
-      assert_equal true, m.bool_as_value
-
-      assert_equal "st\nr", m.string_as_value
-      assert_equal "st\nr", m.string.value
-      assert_equal "st\nr", m.string_as_value
-
-      assert_equal 'fun', m.bytes_as_value
-      assert_equal 'fun', m.bytes.value
-      assert_equal 'fun', m.bytes_as_value
-    }
-
-    m = proto_module::Wrapper.new(
-      double: Google::Protobuf::DoubleValue.new(value: 2.0),
-      float: Google::Protobuf::FloatValue.new(value: 4.0),
-      int32: Google::Protobuf::Int32Value.new(value: 3),
-      int64: Google::Protobuf::Int64Value.new(value: 4),
-      uint32: Google::Protobuf::UInt32Value.new(value: 5),
-      uint64: Google::Protobuf::UInt64Value.new(value: 6),
-      bool: Google::Protobuf::BoolValue.new(value: true),
-      string: Google::Protobuf::StringValue.new(value: "st\nr"),
-      bytes: Google::Protobuf::BytesValue.new(value: 'fun'),
-      real_string: '100'
-    )
-
-    run_asserts.call(m)
-    serialized = proto_module::Wrapper::encode(m)
-    m2 = proto_module::Wrapper::decode(serialized)
-    run_asserts.call(m2)
-
-    # Test the case where we are serializing directly from the parsed form
-    # (before anything lazy is materialized).
-    m3 = proto_module::Wrapper::decode(serialized)
-    serialized2 = proto_module::Wrapper::encode(m3)
-    m4 = proto_module::Wrapper::decode(serialized2)
-    run_asserts.call(m4)
-
-    # Test that the lazy form compares equal to the expanded form.
-    m5 = proto_module::Wrapper::decode(serialized2)
-    assert_equal m5, m
-
-    serialized_json = proto_module::Wrapper::encode_json(m)
-    m6 = proto_module::Wrapper::decode_json(serialized_json)
-    assert_equal m6, m
-  end
-
-  def test_repeated_wrappers
-    run_asserts = ->(m) {
-      assert_equal 2.0, m.repeated_double[0].value
-      assert_equal 4.0, m.repeated_float[0].value
-      assert_equal 3, m.repeated_int32[0].value
-      assert_equal 4, m.repeated_int64[0].value
-      assert_equal 5, m.repeated_uint32[0].value
-      assert_equal 6, m.repeated_uint64[0].value
-      assert_equal true, m.repeated_bool[0].value
-      assert_equal 'str', m.repeated_string[0].value
-      assert_equal 'fun', m.repeated_bytes[0].value
-    }
-
-    m = proto_module::Wrapper.new(
-      repeated_double: [Google::Protobuf::DoubleValue.new(value: 2.0)],
-      repeated_float: [Google::Protobuf::FloatValue.new(value: 4.0)],
-      repeated_int32: [Google::Protobuf::Int32Value.new(value: 3)],
-      repeated_int64: [Google::Protobuf::Int64Value.new(value: 4)],
-      repeated_uint32: [Google::Protobuf::UInt32Value.new(value: 5)],
-      repeated_uint64: [Google::Protobuf::UInt64Value.new(value: 6)],
-      repeated_bool: [Google::Protobuf::BoolValue.new(value: true)],
-      repeated_string: [Google::Protobuf::StringValue.new(value: 'str')],
-      repeated_bytes: [Google::Protobuf::BytesValue.new(value: 'fun')],
-    )
-
-    run_asserts.call(m)
-    serialized = proto_module::Wrapper::encode(m)
-    m2 = proto_module::Wrapper::decode(serialized)
-    run_asserts.call(m2)
-
-    # Test the case where we are serializing directly from the parsed form
-    # (before anything lazy is materialized).
-    m3 = proto_module::Wrapper::decode(serialized)
-    serialized2 = proto_module::Wrapper::encode(m3)
-    m4 = proto_module::Wrapper::decode(serialized2)
-    run_asserts.call(m4)
-
-    # Test that the lazy form compares equal to the expanded form.
-    m5 = proto_module::Wrapper::decode(serialized2)
-    assert_equal m5, m
-
-    # Test JSON.
-    serialized_json = proto_module::Wrapper::encode_json(m5)
-    m6 = proto_module::Wrapper::decode_json(serialized_json)
-    run_asserts.call(m6)
-    assert_equal m6, m
-  end
-
-  def test_oneof_wrappers
-    run_test = ->(m) {
-      serialized = proto_module::Wrapper::encode(m)
-      m2 = proto_module::Wrapper::decode(serialized)
-
-      # Encode directly from lazy form.
-      serialized2 = proto_module::Wrapper::encode(m2)
-
-      assert_equal m, m2
-      assert_equal serialized, serialized2
-
-      serialized_json = proto_module::Wrapper::encode_json(m)
-      m3 = proto_module::Wrapper::decode_json(serialized_json)
-      assert_equal m, m3
-    }
-
-    m = proto_module::Wrapper.new()
-
-    run_test.call(m)
-    m.oneof_double_as_value = 2.0
-    run_test.call(m)
-    m.oneof_float_as_value = 4.0
-    run_test.call(m)
-    m.oneof_int32_as_value = 3
-    run_test.call(m)
-    m.oneof_int64_as_value = 5
-    run_test.call(m)
-    m.oneof_uint32_as_value = 6
-    run_test.call(m)
-    m.oneof_uint64_as_value = 7
-    run_test.call(m)
-    m.oneof_string_as_value = 'str'
-    run_test.call(m)
-    m.oneof_bytes_as_value = 'fun'
-    run_test.call(m)
-  end
-
-  def test_top_level_wrappers
-    # We don't expect anyone to do this, but we should also make sure it does
-    # the right thing.
-    run_test = ->(klass, val) {
-      m = klass.new(value: val)
-      serialized = klass::encode(m)
-      m2 = klass::decode(serialized)
-
-      # Encode directly from lazy form.
-      serialized2 = klass::encode(m2)
-
-      assert_equal m, m2
-      assert_equal serialized, serialized2
-
-      serialized_json = klass::encode_json(m)
-
-      # This is nonsensical to do and does not work.  There is no good reason
-      # to parse a wrapper type directly.
-      assert_raise(RuntimeError) { klass::decode_json(serialized_json) }
-    }
-
-    run_test.call(Google::Protobuf::DoubleValue, 2.0)
-    run_test.call(Google::Protobuf::FloatValue, 4.0)
-    run_test.call(Google::Protobuf::Int32Value, 3)
-    run_test.call(Google::Protobuf::Int64Value, 4)
-    run_test.call(Google::Protobuf::UInt32Value, 5)
-    run_test.call(Google::Protobuf::UInt64Value, 6)
-    run_test.call(Google::Protobuf::BoolValue, true)
-    run_test.call(Google::Protobuf::StringValue, 'str')
-    run_test.call(Google::Protobuf::BytesValue, 'fun')
-  end
-
-  def test_wrapper_setters_as_value
-    run_asserts = ->(m) {
-      m.double_as_value = 4.8
-      assert_equal 4.8, m.double_as_value
-      assert_equal Google::Protobuf::DoubleValue.new(value: 4.8), m.double
-      m.float_as_value = 2.4
-      assert_in_delta 2.4, m.float_as_value
-      assert_in_delta Google::Protobuf::FloatValue.new(value: 2.4).value, m.float.value
-      m.int32_as_value = 5
-      assert_equal 5, m.int32_as_value
-      assert_equal Google::Protobuf::Int32Value.new(value: 5), m.int32
-      m.int64_as_value = 15
-      assert_equal 15, m.int64_as_value
-      assert_equal Google::Protobuf::Int64Value.new(value: 15), m.int64
-      m.uint32_as_value = 50
-      assert_equal 50, m.uint32_as_value
-      assert_equal Google::Protobuf::UInt32Value.new(value: 50), m.uint32
-      m.uint64_as_value = 500
-      assert_equal 500, m.uint64_as_value
-      assert_equal Google::Protobuf::UInt64Value.new(value: 500), m.uint64
-      m.bool_as_value = false
-      assert_equal false, m.bool_as_value
-      assert_equal Google::Protobuf::BoolValue.new(value: false), m.bool
-      m.string_as_value = 'xy'
-      assert_equal 'xy', m.string_as_value
-      assert_equal Google::Protobuf::StringValue.new(value: 'xy'), m.string
-      m.bytes_as_value = '123'
-      assert_equal '123', m.bytes_as_value
-      assert_equal Google::Protobuf::BytesValue.new(value: '123'), m.bytes
-
-      m.double_as_value = nil
-      assert_nil m.double
-      assert_nil m.double_as_value
-      m.float_as_value = nil
-      assert_nil m.float
-      assert_nil m.float_as_value
-      m.int32_as_value = nil
-      assert_nil m.int32
-      assert_nil m.int32_as_value
-      m.int64_as_value = nil
-      assert_nil m.int64
-      assert_nil m.int64_as_value
-      m.uint32_as_value = nil
-      assert_nil m.uint32
-      assert_nil m.uint32_as_value
-      m.uint64_as_value = nil
-      assert_nil m.uint64
-      assert_nil m.uint64_as_value
-      m.bool_as_value = nil
-      assert_nil m.bool
-      assert_nil m.bool_as_value
-      m.string_as_value = nil
-      assert_nil m.string
-      assert_nil m.string_as_value
-      m.bytes_as_value = nil
-      assert_nil m.bytes
-      assert_nil m.bytes_as_value
-    }
-
-    m2 = proto_module::Wrapper.new(
-      double: Google::Protobuf::DoubleValue.new(value: 2.0),
-      float: Google::Protobuf::FloatValue.new(value: 4.0),
-      int32: Google::Protobuf::Int32Value.new(value: 3),
-      int64: Google::Protobuf::Int64Value.new(value: 4),
-      uint32: Google::Protobuf::UInt32Value.new(value: 5),
-      uint64: Google::Protobuf::UInt64Value.new(value: 6),
-      bool: Google::Protobuf::BoolValue.new(value: true),
-      string: Google::Protobuf::StringValue.new(value: 'str'),
-      bytes: Google::Protobuf::BytesValue.new(value: 'fun'),
-      real_string: '100'
-    )
-
-    run_asserts.call(m2)
-
-    serialized = proto_module::Wrapper::encode(m2)
-    m3 = proto_module::Wrapper::decode(serialized)
-    run_asserts.call(m3)
-  end
-
-  def test_wrapper_setters
-    run_asserts = ->(m) {
-      m.double = Google::Protobuf::DoubleValue.new(value: 4.8)
-      assert_equal 4.8, m.double_as_value
-      assert_equal Google::Protobuf::DoubleValue.new(value: 4.8), m.double
-      m.float = Google::Protobuf::FloatValue.new(value: 2.4)
-      assert_in_delta 2.4, m.float_as_value
-      assert_in_delta Google::Protobuf::FloatValue.new(value: 2.4).value, m.float.value
-      m.int32 = Google::Protobuf::Int32Value.new(value: 5)
-      assert_equal 5, m.int32_as_value
-      assert_equal Google::Protobuf::Int32Value.new(value: 5), m.int32
-      m.int64 = Google::Protobuf::Int64Value.new(value: 15)
-      assert_equal 15, m.int64_as_value
-      assert_equal Google::Protobuf::Int64Value.new(value: 15), m.int64
-      m.uint32 = Google::Protobuf::UInt32Value.new(value: 50)
-      assert_equal 50, m.uint32_as_value
-      assert_equal Google::Protobuf::UInt32Value.new(value: 50), m.uint32
-      m.uint64 = Google::Protobuf::UInt64Value.new(value: 500)
-      assert_equal 500, m.uint64_as_value
-      assert_equal Google::Protobuf::UInt64Value.new(value: 500), m.uint64
-      m.bool = Google::Protobuf::BoolValue.new(value: false)
-      assert_equal false, m.bool_as_value
-      assert_equal Google::Protobuf::BoolValue.new(value: false), m.bool
-      m.string = Google::Protobuf::StringValue.new(value: 'xy')
-      assert_equal 'xy', m.string_as_value
-      assert_equal Google::Protobuf::StringValue.new(value: 'xy'), m.string
-      m.bytes = Google::Protobuf::BytesValue.new(value: '123')
-      assert_equal '123', m.bytes_as_value
-      assert_equal Google::Protobuf::BytesValue.new(value: '123'), m.bytes
-
-      m.double = nil
-      assert_nil m.double
-      assert_nil m.double_as_value
-      m.float = nil
-      assert_nil m.float
-      assert_nil m.float_as_value
-      m.int32 = nil
-      assert_nil m.int32
-      assert_nil m.int32_as_value
-      m.int64 = nil
-      assert_nil m.int64
-      assert_nil m.int64_as_value
-      m.uint32 = nil
-      assert_nil m.uint32
-      assert_nil m.uint32_as_value
-      m.uint64 = nil
-      assert_nil m.uint64
-      assert_nil m.uint64_as_value
-      m.bool = nil
-      assert_nil m.bool
-      assert_nil m.bool_as_value
-      m.string = nil
-      assert_nil m.string
-      assert_nil m.string_as_value
-      m.bytes = nil
-      assert_nil m.bytes
-      assert_nil m.bytes_as_value
-    }
-
-    m = proto_module::Wrapper.new
-    run_asserts.call(m)
-
-    m2 = proto_module::Wrapper.new(
-      double: Google::Protobuf::DoubleValue.new(value: 2.0),
-      float: Google::Protobuf::FloatValue.new(value: 4.0),
-      int32: Google::Protobuf::Int32Value.new(value: 3),
-      int64: Google::Protobuf::Int64Value.new(value: 4),
-      uint32: Google::Protobuf::UInt32Value.new(value: 5),
-      uint64: Google::Protobuf::UInt64Value.new(value: 6),
-      bool: Google::Protobuf::BoolValue.new(value: true),
-      string: Google::Protobuf::StringValue.new(value: 'str'),
-      bytes: Google::Protobuf::BytesValue.new(value: 'fun'),
-      real_string: '100'
-    )
-
-    run_asserts.call(m2)
-
-    serialized = proto_module::Wrapper::encode(m2)
-    m3 = proto_module::Wrapper::decode(serialized)
-    run_asserts.call(m3)
-  end
-
-  def test_wrappers_only
-    m = proto_module::Wrapper.new(real_string: 'hi', string_in_oneof: 'there')
-
-    assert_raise(NoMethodError) { m.real_string_as_value }
-    assert_raise(NoMethodError) { m.as_value }
-    assert_raise(NoMethodError) { m._as_value }
-    assert_raise(NoMethodError) { m.string_in_oneof_as_value }
-
-    m = proto_module::Wrapper.new
-    m.string_as_value = 'you'
-    assert_equal 'you', m.string.value
-    assert_equal 'you', m.string_as_value
-    assert_raise(NoMethodError) { m.string_ }
-    assert_raise(NoMethodError) { m.string_X }
-    assert_raise(NoMethodError) { m.string_XX }
-    assert_raise(NoMethodError) { m.string_XXX }
-    assert_raise(NoMethodError) { m.string_XXXX }
-    assert_raise(NoMethodError) { m.string_XXXXX }
-    assert_raise(NoMethodError) { m.string_XXXXXX }
-    assert_raise(NoMethodError) { m.string_XXXXXXX }
-    assert_raise(NoMethodError) { m.string_XXXXXXXX }
-    assert_raise(NoMethodError) { m.string_XXXXXXXXX }
-    assert_raise(NoMethodError) { m.string_XXXXXXXXXX }
-  end
-
-  def test_converts_time
-    m = proto_module::TimeMessage.new
-
-    m.timestamp = Google::Protobuf::Timestamp.new(seconds: 5, nanos: 6)
-    assert_kind_of Google::Protobuf::Timestamp, m.timestamp
-    assert_equal 5, m.timestamp.seconds
-    assert_equal 6, m.timestamp.nanos
-
-    m.timestamp = Time.at(9466, 123456.789)
-    assert_equal Google::Protobuf::Timestamp.new(seconds: 9466, nanos: 123456789), m.timestamp
-
-    m = proto_module::TimeMessage.new(timestamp: Time.at(1))
-    assert_equal Google::Protobuf::Timestamp.new(seconds: 1, nanos: 0), m.timestamp
-
-    assert_raise(Google::Protobuf::TypeError) { m.timestamp = 2 }
-    assert_raise(Google::Protobuf::TypeError) { m.timestamp = 2.4 }
-    assert_raise(Google::Protobuf::TypeError) { m.timestamp = '4' }
-    assert_raise(Google::Protobuf::TypeError) { m.timestamp = proto_module::TimeMessage.new }
-
-    def test_time(year, month, day)
-      str = ("\"%04d-%02d-%02dT00:00:00.000+00:00\"" % [year, month, day])
-      t = Google::Protobuf::Timestamp.decode_json(str)
-      time = Time.new(year, month, day, 0, 0, 0, "+00:00")
-      assert_equal t.seconds, time.to_i
-    end
-
-    (1970..2010).each do |year|
-      test_time(year, 2, 28)
-      test_time(year, 3, 01)
-    end
-  end
-
-  def test_converts_duration
-    m = proto_module::TimeMessage.new
-
-    m.duration = Google::Protobuf::Duration.new(seconds: 2, nanos: 22)
-    assert_kind_of Google::Protobuf::Duration, m.duration
-    assert_equal 2, m.duration.seconds
-    assert_equal 22, m.duration.nanos
-
-    m.duration = 10.5
-    assert_equal Google::Protobuf::Duration.new(seconds: 10, nanos: 500_000_000), m.duration
-
-    m.duration = 200
-    assert_equal Google::Protobuf::Duration.new(seconds: 200, nanos: 0), m.duration
-
-    m.duration = Rational(3, 2)
-    assert_equal Google::Protobuf::Duration.new(seconds: 1, nanos: 500_000_000), m.duration
-
-    m.duration = BigDecimal("5")
-    assert_equal Google::Protobuf::Duration.new(seconds: 5, nanos: 0), m.duration
-
-    m = proto_module::TimeMessage.new(duration: 1.1)
-    assert_equal Google::Protobuf::Duration.new(seconds: 1, nanos: 100_000_000), m.duration
-
-    m = proto_module::TimeMessage.new(duration: 123.321)
-    assert_equal Google::Protobuf::Duration.new(seconds: 123, nanos: 321_000_000), m.duration
-
-    m = proto_module::TimeMessage.new(duration: -123.321)
-    assert_equal Google::Protobuf::Duration.new(seconds: -123, nanos: -321_000_000), m.duration
-
-    assert_raise(Google::Protobuf::TypeError) { m.duration = '2' }
-    assert_raise(Google::Protobuf::TypeError) { m.duration = proto_module::TimeMessage.new }
-  end
-
-  def test_freeze
-    m = proto_module::TestMessage.new
-    m.optional_int32 = 10
-    m.freeze
-
-    frozen_error = assert_raise(FrozenErrorType) { m.optional_int32 = 20 }
-    assert_match "can't modify frozen #{proto_module}::TestMessage", frozen_error.message
-    assert_equal 10, m.optional_int32
-    assert_equal true, m.frozen?
-
-    assert_raise(FrozenErrorType) { m.optional_int64 = 2 }
-    assert_raise(FrozenErrorType) { m.optional_uint32 = 3 }
-    assert_raise(FrozenErrorType) { m.optional_uint64 = 4 }
-    assert_raise(FrozenErrorType) { m.optional_bool = true }
-    assert_raise(FrozenErrorType) { m.optional_float = 6.0 }
-    assert_raise(FrozenErrorType) { m.optional_double = 7.0 }
-    assert_raise(FrozenErrorType) { m.optional_string = '8' }
-    assert_raise(FrozenErrorType) { m.optional_bytes = nil }
-    assert_raise(FrozenErrorType) { m.optional_msg = proto_module::TestMessage2.new }
-    assert_raise(FrozenErrorType) { m.optional_enum = :A }
-    assert_raise(FrozenErrorType) { m.repeated_int32 = 1 }
-    assert_raise(FrozenErrorType) { m.repeated_int64 = 2 }
-    assert_raise(FrozenErrorType) { m.repeated_uint32 = 3 }
-    assert_raise(FrozenErrorType) { m.repeated_uint64 = 4 }
-    assert_raise(FrozenErrorType) { m.repeated_bool = true }
-    assert_raise(FrozenErrorType) { m.repeated_float = 6.0 }
-    assert_raise(FrozenErrorType) { m.repeated_double = 7.0 }
-    assert_raise(FrozenErrorType) { m.repeated_string = '8' }
-    assert_raise(FrozenErrorType) { m.repeated_bytes = nil }
-    assert_raise(FrozenErrorType) { m.repeated_msg = proto_module::TestMessage2.new }
-    assert_raise(FrozenErrorType) { m.repeated_enum = :A }
-  end
-
-  def test_eq
-    m1 = proto_module::TestMessage.new(:optional_string => 'foo', :repeated_string => ['bar1', 'bar2'])
-    m2 = proto_module::TestMessage.new(:optional_string => 'foo', :repeated_string => ['bar1', 'bar2'])
-
-    h = {}
-    h[m1] = :yes
-
-    assert m1 == m2
-    assert m1.eql?(m2)
-    assert m1.hash == m2.hash
-    assert h[m1] == :yes
-    assert h[m2] == :yes
-
-    m1.optional_int32 = 2
-
-    assert m1 != m2
-    assert !m1.eql?(m2)
-    assert m1.hash != m2.hash
-    assert_nil h[m2]
-  end
-
-  def cruby_or_jruby_9_3_or_higher?
-    # https://github.com/jruby/jruby/issues/6818 was fixed in JRuby 9.3.0.0
-    match = RUBY_PLATFORM == "java" &&
-      JRUBY_VERSION.match(/^(\d+)\.(\d+)\.\d+\.\d+$/)
-    match && (match[1].to_i > 9 || (match[1].to_i == 9 && match[2].to_i >= 3))
-  end
-
-  def test_object_gc
-    m = proto_module::TestMessage.new(optional_msg: proto_module::TestMessage2.new)
-    m.optional_msg
-    # https://github.com/jruby/jruby/issues/6818 was fixed in JRuby 9.3.0.0
-    GC.start(full_mark: true, immediate_sweep: true) if cruby_or_jruby_9_3_or_higher?
-    m.optional_msg.inspect
-  end
-
-  def test_object_gc_freeze
-    m = proto_module::TestMessage.new
-    m.repeated_float.freeze
-    # https://github.com/jruby/jruby/issues/6818 was fixed in JRuby 9.3.0.0
-    GC.start(full_mark: true) if cruby_or_jruby_9_3_or_higher?
-
-    # Make sure we remember that the object is frozen.
-    # The wrapper object contains this information, so we need to ensure that
-    # the previous GC did not collect it.
-    assert m.repeated_float.frozen?
-
-    # https://github.com/jruby/jruby/issues/6818 was fixed in JRuby 9.3.0.0
-    GC.start(full_mark: true, immediate_sweep: true) if cruby_or_jruby_9_3_or_higher?
-    assert m.repeated_float.frozen?
-  end
-
-  def test_optional_fields_respond_to? # regression test for issue 9202
-    msg = proto_module::TestMessage.new
-    assert msg.respond_to? :optional_int32=
-    msg.optional_int32 = 42
-
-    assert msg.respond_to? :optional_int32
-    assert_equal 42, msg.optional_int32
-
-    assert msg.respond_to? :clear_optional_int32
-    msg.clear_optional_int32
-    assert_equal 0, msg.optional_int32
-
-    assert msg.respond_to? :has_optional_int32?
-    assert !msg.has_optional_int32?
-
-    assert !msg.respond_to?( :optional_int32_as_value= )
-    assert_raise NoMethodError do
-      msg.optional_int32_as_value = 42
-    end
-
-    assert !msg.respond_to?( :optional_int32_as_value )
-    assert_raise NoMethodError do
-      msg.optional_int32_as_value
-    end
-
-    assert msg.respond_to? :optional_enum_const
-    assert_equal 0, msg.optional_enum_const
-
-    assert !msg.respond_to?( :foo )
-    assert_raise NoMethodError do
-      msg.foo
-    end
-
-    assert !msg.respond_to?( :foo_const )
-    assert_raise NoMethodError do
-      msg.foo_const
-    end
-
-    assert !msg.respond_to?( :optional_int32_const )
-    assert_raise NoMethodError do
-      msg.optional_int32_const
-    end
-  end
-
-  def test_oneof_fields_respond_to? # regression test for issue 9202
-    msg = proto_module::OneofMessage.new
-
-    # names of the elements of a oneof and the oneof itself are valid actions.
-    assert msg.respond_to? :my_oneof
-    assert_nil msg.my_oneof
-    assert msg.respond_to? :a
-    assert_equal "", msg.a
-    assert msg.respond_to? :b
-    assert_equal 0, msg.b
-    assert msg.respond_to? :c
-    assert_nil msg.c
-    assert msg.respond_to? :d
-    assert_equal :Default, msg.d
-
-    # `clear` prefix actions work on elements of a oneof and the oneof itself.
-    assert msg.respond_to? :clear_my_oneof
-    msg.clear_my_oneof
-    # Repeatedly clearing a oneof used to cause a NoMethodError under JRuby
-    msg.clear_my_oneof
-    assert msg.respond_to? :clear_a
-    msg.clear_a
-    assert msg.respond_to? :clear_b
-    msg.clear_b
-    assert msg.respond_to? :clear_c
-    msg.clear_c
-    assert msg.respond_to? :clear_d
-    msg.clear_d
-
-    # `=` suffix actions should work on elements of a oneof but not the oneof itself.
-    assert !msg.respond_to?( :my_oneof= )
-    error = assert_raise RuntimeError do
-      msg.my_oneof = nil
-    end
-    assert_equal "Oneof accessors are read-only.", error.message
-    assert msg.respond_to? :a=
-    msg.a = "foo"
-    assert msg.respond_to? :b=
-    msg.b = 42
-    assert msg.respond_to? :c=
-    msg.c = proto_module::TestMessage2.new
-    assert msg.respond_to? :d=
-    msg.d = :Default
-
-    # `has_` prefix + "?" suffix actions work for oneofs fields.
-    assert msg.respond_to? :has_my_oneof?
-    assert msg.has_my_oneof?
-
-    # `_as_value` suffix actions should only work for wrapped fields.
-    assert !msg.respond_to?( :my_oneof_as_value )
-    assert_raise NoMethodError do
-      msg.my_oneof_as_value
-    end
-    assert !msg.respond_to?( :a_as_value )
-    assert_raise NoMethodError do
-      msg.a_as_value
-    end
-    assert !msg.respond_to?( :b_as_value )
-    assert_raise NoMethodError do
-      msg.b_as_value
-    end
-    assert !msg.respond_to?( :c_as_value )
-    assert_raise NoMethodError do
-      msg.c_as_value
-    end
-    assert !msg.respond_to?( :d_as_value )
-    assert_raise NoMethodError do
-      msg.d_as_value
-    end
-
-    # `_as_value=` suffix actions should only work for wrapped fields.
-    assert !msg.respond_to?( :my_oneof_as_value= )
-    assert_raise NoMethodError do
-      msg.my_oneof_as_value = :boom
-    end
-    assert !msg.respond_to?( :a_as_value= )
-    assert_raise NoMethodError do
-      msg.a_as_value = ""
-    end
-    assert !msg.respond_to?( :b_as_value= )
-    assert_raise NoMethodError do
-      msg.b_as_value = 42
-    end
-    assert !msg.respond_to?( :c_as_value= )
-    assert_raise NoMethodError do
-      msg.c_as_value = proto_module::TestMessage2.new
-    end
-    assert !msg.respond_to?( :d_as_value= )
-    assert_raise NoMethodError do
-      msg.d_as_value = :Default
-    end
-
-    # `_const` suffix actions should only work for enum fields.
-    assert !msg.respond_to?( :my_oneof_const )
-    assert_raise NoMethodError do
-      msg.my_oneof_const
-    end
-    assert !msg.respond_to?( :a_const )
-    assert_raise NoMethodError do
-      msg.a_const
-    end
-    assert !msg.respond_to?( :b_const )
-    assert_raise NoMethodError do
-      msg.b_const
-    end
-    assert !msg.respond_to?( :c_const )
-    assert_raise NoMethodError do
-      msg.c_const
-    end
-    assert msg.respond_to? :d_const
-    assert_equal 0, msg.d_const
-  end
-
-  def test_wrapped_fields_respond_to? # regression test for issue 9202
-    msg = proto_module::Wrapper.new
-    assert msg.respond_to?( :double_as_value= )
-    msg.double_as_value = 42
-    assert msg.respond_to?( :double_as_value )
-    assert_equal 42, msg.double_as_value
-    assert_equal Google::Protobuf::DoubleValue.new(value: 42), msg.double
-  end
-end
diff --git a/libs/protobuf/ruby/tests/encode_decode_test.rb b/libs/protobuf/ruby/tests/encode_decode_test.rb
deleted file mode 100755
index df2cd36..0000000
--- a/libs/protobuf/ruby/tests/encode_decode_test.rb
+++ /dev/null
@@ -1,155 +0,0 @@
-#!/usr/bin/ruby
-
-# generated_code.rb is in the same directory as this test.
-$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__)))
-
-require 'generated_code_pb'
-require 'google/protobuf/well_known_types'
-require 'test/unit'
-
-def hex2bin(s)
-  s.scan(/../).map { |x| x.hex.chr }.join
-end
-
-class EncodeDecodeTest < Test::Unit::TestCase
-  def test_discard_unknown
-    # Test discard unknown in message.
-    unknown_msg = A::B::C::TestUnknown.new(:unknown_field => 1)
-    from = A::B::C::TestUnknown.encode(unknown_msg)
-    m = A::B::C::TestMessage.decode(from)
-    Google::Protobuf.discard_unknown(m)
-    to = A::B::C::TestMessage.encode(m)
-    assert_equal '', to
-
-    # Test discard unknown for singular message field.
-    unknown_msg = A::B::C::TestUnknown.new(
-            :optional_unknown =>
-            A::B::C::TestUnknown.new(:unknown_field => 1))
-    from = A::B::C::TestUnknown.encode(unknown_msg)
-    m = A::B::C::TestMessage.decode(from)
-    Google::Protobuf.discard_unknown(m)
-    to = A::B::C::TestMessage.encode(m.optional_msg)
-    assert_equal '', to
-
-    # Test discard unknown for repeated message field.
-    unknown_msg = A::B::C::TestUnknown.new(
-            :repeated_unknown =>
-            [A::B::C::TestUnknown.new(:unknown_field => 1)])
-    from = A::B::C::TestUnknown.encode(unknown_msg)
-    m = A::B::C::TestMessage.decode(from)
-    Google::Protobuf.discard_unknown(m)
-    to = A::B::C::TestMessage.encode(m.repeated_msg[0])
-    assert_equal '', to
-
-    # Test discard unknown for map value message field.
-    unknown_msg = A::B::C::TestUnknown.new(
-            :map_unknown =>
-            {"" => A::B::C::TestUnknown.new(:unknown_field => 1)})
-    from = A::B::C::TestUnknown.encode(unknown_msg)
-    m = A::B::C::TestMessage.decode(from)
-    Google::Protobuf.discard_unknown(m)
-    to = A::B::C::TestMessage.encode(m.map_string_msg[''])
-    assert_equal '', to
-
-    # Test discard unknown for oneof message field.
-    unknown_msg = A::B::C::TestUnknown.new(
-            :oneof_unknown =>
-            A::B::C::TestUnknown.new(:unknown_field => 1))
-    from = A::B::C::TestUnknown.encode(unknown_msg)
-    m = A::B::C::TestMessage.decode(from)
-    Google::Protobuf.discard_unknown(m)
-    to = A::B::C::TestMessage.encode(m.oneof_msg)
-    assert_equal '', to
-  end
-
-  def test_encode_json
-    msg = A::B::C::TestMessage.new({ optional_int32: 22 })
-    json = msg.to_json
-
-    to = A::B::C::TestMessage.decode_json(json)
-    assert_equal to.optional_int32, 22
-
-    msg = A::B::C::TestMessage.new({ optional_int32: 22 })
-    json = msg.to_json({ preserve_proto_fieldnames: true })
-
-    assert_match 'optional_int32', json
-
-    to = A::B::C::TestMessage.decode_json(json)
-    assert_equal 22, to.optional_int32
-
-    msg = A::B::C::TestMessage.new({ optional_int32: 22 })
-    json = A::B::C::TestMessage.encode_json(
-      msg,
-      { preserve_proto_fieldnames: true, emit_defaults: true }
-    )
-
-    assert_match 'optional_int32', json
-  end
-
-  def test_encode_wrong_msg
-    assert_raise ::ArgumentError do
-      m = A::B::C::TestMessage.new(
-          :optional_int32 => 1,
-      )
-      Google::Protobuf::Any.encode(m)
-    end
-  end
-
-  def test_json_name
-    msg = A::B::C::TestJsonName.new(:value => 42)
-    json = msg.to_json
-    assert_match json, "{\"CustomJsonName\":42}"
-  end
-
-  def test_decode_depth_limit
-    msg = A::B::C::TestMessage.new(
-      optional_msg: A::B::C::TestMessage.new(
-        optional_msg: A::B::C::TestMessage.new(
-          optional_msg: A::B::C::TestMessage.new(
-            optional_msg: A::B::C::TestMessage.new(
-              optional_msg: A::B::C::TestMessage.new(
-              )
-            )
-          )
-        )
-      )
-    )
-    msg_encoded = A::B::C::TestMessage.encode(msg)
-    msg_out = A::B::C::TestMessage.decode(msg_encoded)
-    assert_match msg.to_json, msg_out.to_json
-
-    assert_raise Google::Protobuf::ParseError do
-      A::B::C::TestMessage.decode(msg_encoded, { recursion_limit: 4 })
-    end
-
-    msg_out = A::B::C::TestMessage.decode(msg_encoded, { recursion_limit: 5 })
-    assert_match msg.to_json, msg_out.to_json
-  end
-
-  def test_encode_depth_limit
-    msg = A::B::C::TestMessage.new(
-      optional_msg: A::B::C::TestMessage.new(
-        optional_msg: A::B::C::TestMessage.new(
-          optional_msg: A::B::C::TestMessage.new(
-            optional_msg: A::B::C::TestMessage.new(
-              optional_msg: A::B::C::TestMessage.new(
-              )
-            )
-          )
-        )
-      )
-    )
-    msg_encoded = A::B::C::TestMessage.encode(msg)
-    msg_out = A::B::C::TestMessage.decode(msg_encoded)
-    assert_match msg.to_json, msg_out.to_json
-
-    assert_raise RuntimeError do
-      A::B::C::TestMessage.encode(msg, { recursion_limit: 5 })
-    end
-
-    msg_encoded = A::B::C::TestMessage.encode(msg, { recursion_limit: 6 })
-    msg_out = A::B::C::TestMessage.decode(msg_encoded)
-    assert_match msg.to_json, msg_out.to_json
-  end
-
-end
diff --git a/libs/protobuf/ruby/tests/gc_test.rb b/libs/protobuf/ruby/tests/gc_test.rb
deleted file mode 100755
index 5d48f46..0000000
--- a/libs/protobuf/ruby/tests/gc_test.rb
+++ /dev/null
@@ -1,109 +0,0 @@
-#!/usr/bin/ruby
-#
-# generated_code.rb is in the same directory as this test.
-$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__)))
-
-old_gc = GC.stress
-# Ruby 2.7.0 - 2.7.1 has a GC bug in its parser, so turn off stress for now
-# See https://bugs.ruby-lang.org/issues/16807
-GC.stress = 0x01 | 0x04 unless RUBY_VERSION.match?(/^2\.7\./)
-require 'generated_code_pb'
-require 'generated_code_proto2_pb'
-GC.stress = old_gc
-
-require 'test/unit'
-
-class GCTest < Test::Unit::TestCase
-  def get_msg_proto3
-    A::B::C::TestMessage.new(
-        :optional_int32 => 1,
-        :optional_int64 => 1,
-        :optional_uint32 => 1,
-        :optional_uint64 => 1,
-        :optional_bool => true,
-        :optional_double => 1.0,
-        :optional_float => 1.0,
-        :optional_string => "a",
-        :optional_bytes => "b",
-        :optional_enum => A::B::C::TestEnum::A,
-        :optional_msg => A::B::C::TestMessage.new(),
-        :repeated_int32 => [1],
-        :repeated_int64 => [1],
-        :repeated_uint32 => [1],
-        :repeated_uint64 => [1],
-        :repeated_bool => [true],
-        :repeated_double => [1.0],
-        :repeated_float => [1.0],
-        :repeated_string => ["a"],
-        :repeated_bytes => ["b"],
-        :repeated_enum => [A::B::C::TestEnum::A],
-        :repeated_msg => [A::B::C::TestMessage.new()],
-        :map_int32_string => {1 => "a"},
-        :map_int64_string => {1 => "a"},
-        :map_uint32_string => {1 => "a"},
-        :map_uint64_string => {1 => "a"},
-        :map_bool_string => {true => "a"},
-        :map_string_string => {"a" => "a"},
-        :map_string_msg => {"a" => A::B::C::TestMessage.new()},
-        :map_string_int32 => {"a" => 1},
-        :map_string_bool => {"a" => true},
-    )
-  end
-
-  def get_msg_proto2
-    A::B::Proto2::TestMessage.new(
-        :optional_int32 => 1,
-        :optional_int64 => 1,
-        :optional_uint32 => 1,
-        :optional_uint64 => 1,
-        :optional_bool => true,
-        :optional_double => 1.0,
-        :optional_float => 1.0,
-        :optional_string => "a",
-        :optional_bytes => "b",
-        :optional_enum => A::B::Proto2::TestEnum::A,
-        :optional_msg => A::B::Proto2::TestMessage.new(),
-        :repeated_int32 => [1],
-        :repeated_int64 => [1],
-        :repeated_uint32 => [1],
-        :repeated_uint64 => [1],
-        :repeated_bool => [true],
-        :repeated_double => [1.0],
-        :repeated_float => [1.0],
-        :repeated_string => ["a"],
-        :repeated_bytes => ["b"],
-        :repeated_enum => [A::B::Proto2::TestEnum::A],
-        :repeated_msg => [A::B::Proto2::TestMessage.new()],
-        :required_int32 => 1,
-        :required_int64 => 1,
-        :required_uint32 => 1,
-        :required_uint64 => 1,
-        :required_bool => true,
-        :required_double => 1.0,
-        :required_float => 1.0,
-        :required_string => "a",
-        :required_bytes => "b",
-        :required_enum => A::B::Proto2::TestEnum::A,
-        :required_msg => A::B::Proto2::TestMessage.new(),
-    )
-  end
-
-  def test_generated_msg
-    old_gc = GC.stress
-    GC.stress = 0x01 | 0x04
-    from = get_msg_proto3
-    data = A::B::C::TestMessage.encode(from)
-    to = A::B::C::TestMessage.decode(data)
-    # This doesn't work for proto2 on JRuby because there is a nested required message.
-    # A::B::Proto2::TestMessage has :required_msg which is of type:
-    # A::B::Proto2::TestMessage so there is no way to generate a valid
-    # message that doesn't exceed the depth limit
-    if !defined? JRUBY_VERSION
-        from = get_msg_proto2
-        data = A::B::Proto2::TestMessage.encode(from)
-        to = A::B::Proto2::TestMessage.decode(data)
-    end
-    GC.stress = old_gc
-    puts "passed"
-  end
-end
diff --git a/libs/protobuf/ruby/tests/generated_code.proto b/libs/protobuf/ruby/tests/generated_code.proto
deleted file mode 100644
index 5f017ba..0000000
--- a/libs/protobuf/ruby/tests/generated_code.proto
+++ /dev/null
@@ -1,91 +0,0 @@
-syntax = "proto3";
-
-package a.b.c;
-
-message TestMessage {
-  int32 optional_int32 = 1;
-  int64 optional_int64 = 2;
-  uint32 optional_uint32 = 3;
-  uint64 optional_uint64 = 4;
-  bool optional_bool = 5;
-  double optional_double = 6;
-  float optional_float = 7;
-  string optional_string = 8;
-  bytes optional_bytes = 9;
-  TestEnum optional_enum = 10;
-  TestMessage optional_msg = 11;
-
-  repeated int32 repeated_int32 = 21;
-  repeated int64 repeated_int64 = 22;
-  repeated uint32 repeated_uint32 = 23;
-  repeated uint64 repeated_uint64 = 24;
-  repeated bool repeated_bool = 25;
-  repeated double repeated_double = 26;
-  repeated float repeated_float = 27;
-  repeated string repeated_string = 28;
-  repeated bytes repeated_bytes = 29;
-  repeated TestEnum repeated_enum = 30;
-  repeated TestMessage repeated_msg = 31;
-
-  oneof my_oneof {
-    int32 oneof_int32 = 41;
-    int64 oneof_int64 = 42;
-    uint32 oneof_uint32 = 43;
-    uint64 oneof_uint64 = 44;
-    bool oneof_bool = 45;
-    double oneof_double = 46;
-    float oneof_float = 47;
-    string oneof_string = 48;
-    bytes oneof_bytes = 49;
-    TestEnum oneof_enum = 50;
-    TestMessage oneof_msg = 51;
-  }
-
-  map<int32, string> map_int32_string = 61;
-  map<int64, string> map_int64_string = 62;
-  map<uint32, string> map_uint32_string = 63;
-  map<uint64, string> map_uint64_string = 64;
-  map<bool, string> map_bool_string = 65;
-  map<string, string> map_string_string = 66;
-  map<string, TestMessage> map_string_msg = 67;
-  map<string, TestEnum> map_string_enum = 68;
-  map<string, int32> map_string_int32 = 69;
-  map<string, bool> map_string_bool = 70;
-
-  message NestedMessage {
-    int32 foo = 1;
-  }
-
-  NestedMessage nested_message = 80;
-
-  // Reserved for non-existing field test.
-  // int32 non_exist = 89;
-}
-
-enum TestEnum {
-  Default = 0;
-  A = 1;
-  B = 2;
-  C = 3;
-
-  v0 = 4;
-}
-
-message testLowercaseNested {
-  message lowercase{}
-}
-
-
-message TestUnknown {
-  TestUnknown optional_unknown = 11;
-  repeated TestUnknown repeated_unknown = 31;
-  oneof my_oneof {
-    TestUnknown oneof_unknown = 51;
-  }
-  map<string, TestUnknown> map_unknown = 67;
-  int32 unknown_field = 89;
-}
-
-message TestJsonName {
-  int32 value = 1 [json_name = "CustomJsonName"];
-}
diff --git a/libs/protobuf/ruby/tests/generated_code_proto2.proto b/libs/protobuf/ruby/tests/generated_code_proto2.proto
deleted file mode 100644
index 1a50b84..0000000
--- a/libs/protobuf/ruby/tests/generated_code_proto2.proto
+++ /dev/null
@@ -1,82 +0,0 @@
-syntax = "proto2";
-
-package a.b.proto2;
-
-message TestMessage {
-  optional int32 optional_int32 = 1;
-  optional int64 optional_int64 = 2;
-  optional uint32 optional_uint32 = 3;
-  optional uint64 optional_uint64 = 4;
-  optional bool optional_bool = 5;
-  optional double optional_double = 6;
-  optional float optional_float = 7;
-  optional string optional_string = 8;
-  optional bytes optional_bytes = 9;
-  optional TestEnum optional_enum = 10;
-  optional TestMessage optional_msg = 11;
-
-  repeated int32 repeated_int32 = 21;
-  repeated int64 repeated_int64 = 22;
-  repeated uint32 repeated_uint32 = 23;
-  repeated uint64 repeated_uint64 = 24;
-  repeated bool repeated_bool = 25;
-  repeated double repeated_double = 26;
-  repeated float repeated_float = 27;
-  repeated string repeated_string = 28;
-  repeated bytes repeated_bytes = 29;
-  repeated TestEnum repeated_enum = 30;
-  repeated TestMessage repeated_msg = 31;
-
-  required int32 required_int32 = 41;
-  required int64 required_int64 = 42;
-  required uint32 required_uint32 = 43;
-  required uint64 required_uint64 = 44;
-  required bool required_bool = 45;
-  required double required_double = 46;
-  required float required_float = 47;
-  required string required_string = 48;
-  required bytes required_bytes = 49;
-  required TestEnum required_enum = 50;
-  required TestMessage required_msg = 51;
-
-  oneof my_oneof {
-    int32 oneof_int32 = 61;
-    int64 oneof_int64 = 62;
-    uint32 oneof_uint32 = 63;
-    uint64 oneof_uint64 = 64;
-    bool oneof_bool = 65;
-    double oneof_double = 66;
-    float oneof_float = 67;
-    string oneof_string = 68;
-    bytes oneof_bytes = 69;
-    TestEnum oneof_enum = 70;
-    TestMessage oneof_msg = 71;
-  }
-
-  message NestedMessage {
-    optional int32 foo = 1;
-  }
-
-  optional NestedMessage nested_message = 80;
-
-  // Reserved for non-existing field test.
-  // int32 non_exist = 89;
-}
-
-enum TestEnum {
-  Default = 0;
-  A = 1;
-  B = 2;
-  C = 3;
-
-  v0 = 4;
-}
-
-message TestUnknown {
-  optional TestUnknown optional_unknown = 11;
-  repeated TestUnknown repeated_unknown = 31;
-  oneof my_oneof {
-    TestUnknown oneof_unknown = 51;
-  }
-  optional int32 unknown_field = 89;
-}
diff --git a/libs/protobuf/ruby/tests/generated_code_proto2_test.rb b/libs/protobuf/ruby/tests/generated_code_proto2_test.rb
deleted file mode 100755
index 302f945..0000000
--- a/libs/protobuf/ruby/tests/generated_code_proto2_test.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/usr/bin/ruby
-
-# generated_code.rb is in the same directory as this test.
-$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__)))
-
-require 'generated_code_proto2_pb'
-require 'test_import_proto2_pb'
-require 'test_ruby_package_proto2_pb'
-require 'test/unit'
-
-class GeneratedCodeProto2Test < Test::Unit::TestCase
-  def test_generated_msg
-    # just test that we can instantiate the message. The purpose of this test
-    # is to ensure that the output of the code generator is valid Ruby and
-    # successfully creates message definitions and classes, not to test every
-    # aspect of the extension (basic.rb is for that).
-    A::B::Proto2::TestMessage.new
-    FooBar::Proto2::TestImportedMessage.new
-    A::B::Proto2::TestRubyPackageMessage.new
-  end
-end
diff --git a/libs/protobuf/ruby/tests/generated_code_test.rb b/libs/protobuf/ruby/tests/generated_code_test.rb
deleted file mode 100755
index aed1cf8..0000000
--- a/libs/protobuf/ruby/tests/generated_code_test.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/ruby
-
-# generated_code.rb is in the same directory as this test.
-$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__)))
-
-require 'generated_code_pb'
-require 'test_import_pb'
-require 'test_ruby_package_pb'
-require 'test/unit'
-
-class GeneratedCodeTest < Test::Unit::TestCase
-  def test_generated_msg
-    # just test that we can instantiate the message. The purpose of this test
-    # is to ensure that the output of the code generator is valid Ruby and
-    # successfully creates message definitions and classes, not to test every
-    # aspect of the extension (basic.rb is for that).
-    A::B::C::TestMessage.new
-    A::B::C::TestMessage::NestedMessage.new
-    A::B::C::TestLowercaseNested::Lowercase.new
-    FooBar::TestImportedMessage.new
-    A::B::TestRubyPackageMessage.new
-  end
-end
diff --git a/libs/protobuf/ruby/tests/multi_level_nesting_test.proto b/libs/protobuf/ruby/tests/multi_level_nesting_test.proto
deleted file mode 100644
index 84c3fa4..0000000
--- a/libs/protobuf/ruby/tests/multi_level_nesting_test.proto
+++ /dev/null
@@ -1,19 +0,0 @@
-syntax = "proto3";
-
-message Function {
-  string name = 1;
-  repeated Function.Parameter parameters = 2;
-  string return_type = 3;
-
-  message Parameter {
-    string name = 1;
-    Function.Parameter.Value value = 2;
-
-    message Value {
-      oneof type {
-        string string = 1;
-        int64 integer = 2;
-      }
-    }
-  }
-}
diff --git a/libs/protobuf/ruby/tests/multi_level_nesting_test.rb b/libs/protobuf/ruby/tests/multi_level_nesting_test.rb
deleted file mode 100644
index 7e5d0ec..0000000
--- a/libs/protobuf/ruby/tests/multi_level_nesting_test.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/ruby
-
-# multi_level_nesting_test_pb.rb is in the same directory as this test.
-$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__)))
-
-require 'test/unit'
-require 'multi_level_nesting_test_pb'
-
-#
-# Provide tests for having messages nested 3 levels deep
-#
-class MultiLevelNestingTest < Test::Unit::TestCase
-
-  def test_levels_exist
-    assert ::Google::Protobuf::DescriptorPool.generated_pool.lookup("Function").msgclass
-    assert ::Google::Protobuf::DescriptorPool.generated_pool.lookup("Function.Parameter").msgclass
-    assert ::Google::Protobuf::DescriptorPool.generated_pool.lookup("Function.Parameter.Value").msgclass
-  end
-
-end
diff --git a/libs/protobuf/ruby/tests/repeated_field_test.rb b/libs/protobuf/ruby/tests/repeated_field_test.rb
deleted file mode 100755
index de96869..0000000
--- a/libs/protobuf/ruby/tests/repeated_field_test.rb
+++ /dev/null
@@ -1,709 +0,0 @@
-#!/usr/bin/ruby
-
-require 'google/protobuf'
-require 'test/unit'
-
-class RepeatedFieldTest < Test::Unit::TestCase
-
-  def test_acts_like_enumerator
-    m = TestMessage.new
-    (Enumerable.instance_methods - TestMessage.new.repeated_string.methods).each do |method_name|
-      assert m.repeated_string.respond_to?(method_name) == true, "does not respond to #{method_name}"
-    end
-  end
-
-  def test_acts_like_an_array
-    m = TestMessage.new
-    arr_methods = ([].methods - TestMessage.new.repeated_string.methods)
-    # jRuby additions to the Array class that we can ignore
-    arr_methods -= [ :indices, :iter_for_each, :iter_for_each_index,
-      :iter_for_each_with_index, :dimensions, :copy_data, :copy_data_simple,
-      :nitems, :iter_for_reverse_each, :indexes, :append, :prepend]
-    arr_methods -= [:union, :difference, :filter!]
-    arr_methods -= [:intersection, :deconstruct] # ruby 2.7 methods we can ignore
-    arr_methods -= [:intersect?] # ruby 3.1 methods we can ignore
-    arr_methods.each do |method_name|
-      assert m.repeated_string.respond_to?(method_name) == true, "does not respond to #{method_name}"
-    end
-  end
-
-  def test_first
-    m = TestMessage.new
-    repeated_field_names(TestMessage).each do |field_name|
-      assert_nil m.send(field_name).first
-      assert_equal [], m.send(field_name).first(0)
-      assert_equal [], m.send(field_name).first(1)
-    end
-
-    fill_test_msg(m)
-    assert_equal( -10, m.repeated_int32.first )
-    assert_equal( -1_000_000, m.repeated_int64.first )
-    assert_equal 10, m.repeated_uint32.first
-    assert_equal 1_000_000, m.repeated_uint64.first
-    assert_equal true, m.repeated_bool.first
-    assert_equal( -1.01,  m.repeated_float.first.round(2) )
-    assert_equal( -1.0000000000001, m.repeated_double.first )
-    assert_equal 'foo', m.repeated_string.first
-    assert_equal "bar".encode!('ASCII-8BIT'), m.repeated_bytes.first
-    assert_equal TestMessage2.new(:foo => 1), m.repeated_msg.first
-    assert_equal :A, m.repeated_enum.first
-
-    err = assert_raises(ArgumentError) do
-      m.repeated_int32.first(-1)
-    end
-    assert_equal "negative array size", err.message
-    assert_equal [], m.repeated_int32.first(0)
-    assert_equal [-10], m.repeated_int32.first(1)
-    assert_equal [-10, -11], m.repeated_int32.first(2)
-    assert_equal [-10, -11], m.repeated_int32.first(3)
-  end
-
-
-  def test_last
-    m = TestMessage.new
-    repeated_field_names(TestMessage).each do |field_name|
-      assert_nil m.send(field_name).first
-    end
-    fill_test_msg(m)
-    assert_equal( -11, m.repeated_int32.last )
-    assert_equal( -1_000_001, m.repeated_int64.last )
-    assert_equal 11, m.repeated_uint32.last
-    assert_equal 1_000_001, m.repeated_uint64.last
-    assert_equal false, m.repeated_bool.last
-    assert_equal( -1.02, m.repeated_float.last.round(2) )
-    assert_equal( -1.0000000000002, m.repeated_double.last )
-    assert_equal 'bar', m.repeated_string.last
-    assert_equal "foo".encode!('ASCII-8BIT'), m.repeated_bytes.last
-    assert_equal TestMessage2.new(:foo => 2), m.repeated_msg.last
-    assert_equal :B, m.repeated_enum.last
-
-    err = assert_raises(ArgumentError) do
-      m.repeated_int32.last(-1)
-    end
-    assert_equal "negative array size", err.message
-    assert_equal [], m.repeated_int32.last(0)
-    assert_equal [-11], m.repeated_int32.last(1)
-    assert_equal [-10, -11], m.repeated_int32.last(2)
-    assert_equal [-10, -11], m.repeated_int32.last(3)
-  end
-
-
-  def test_pop
-    m = TestMessage.new
-    repeated_field_names(TestMessage).each do |field_name|
-      assert_nil m.send(field_name).pop
-    end
-    fill_test_msg(m)
-
-    assert_equal( -11, m.repeated_int32.pop )
-    assert_equal( -10, m.repeated_int32.pop )
-    assert_equal( -1_000_001, m.repeated_int64.pop )
-    assert_equal( -1_000_000, m.repeated_int64.pop )
-    assert_equal 11, m.repeated_uint32.pop
-    assert_equal 10, m.repeated_uint32.pop
-    assert_equal 1_000_001, m.repeated_uint64.pop
-    assert_equal 1_000_000, m.repeated_uint64.pop
-    assert_equal false, m.repeated_bool.pop
-    assert_equal true, m.repeated_bool.pop
-    assert_equal( -1.02,  m.repeated_float.pop.round(2) )
-    assert_equal( -1.01,  m.repeated_float.pop.round(2) )
-    assert_equal( -1.0000000000002, m.repeated_double.pop )
-    assert_equal( -1.0000000000001, m.repeated_double.pop )
-    assert_equal 'bar', m.repeated_string.pop
-    assert_equal 'foo', m.repeated_string.pop
-    assert_equal "foo".encode!('ASCII-8BIT'), m.repeated_bytes.pop
-    assert_equal "bar".encode!('ASCII-8BIT'), m.repeated_bytes.pop
-    assert_equal TestMessage2.new(:foo => 2), m.repeated_msg.pop
-    assert_equal TestMessage2.new(:foo => 1), m.repeated_msg.pop
-    assert_equal :B, m.repeated_enum.pop
-    assert_equal :A, m.repeated_enum.pop
-    repeated_field_names(TestMessage).each do |field_name|
-      assert_nil m.send(field_name).pop
-    end
-
-    fill_test_msg(m)
-    assert_equal ['bar', 'foo'], m.repeated_string.pop(2)
-    assert_nil m.repeated_string.pop
-  end
-
-
-  def test_each
-    m = TestMessage.new
-    5.times{|i| m.repeated_string << 'string' }
-    count = 0
-    m.repeated_string.each do |val|
-      assert_equal 'string', val
-      count += 1
-    end
-    assert_equal 5, count
-    result = m.repeated_string.each{|val| val + '_junk'}
-    assert_equal ['string'] * 5, result
-  end
-
-
-  def test_empty?
-    m = TestMessage.new
-    assert_equal true, m.repeated_string.empty?
-    m.repeated_string << 'foo'
-    assert_equal false, m.repeated_string.empty?
-    m.repeated_string << 'bar'
-    assert_equal false, m.repeated_string.empty?
-  end
-
-  def test_reassign
-    m = TestMessage.new
-    m.repeated_msg = Google::Protobuf::RepeatedField.new(:message, TestMessage2, [TestMessage2.new(:foo => 1)])
-    assert_equal m.repeated_msg.first, TestMessage2.new(:foo => 1)
-  end
-
-  def test_array_accessor
-    m = TestMessage.new
-    reference_arr = %w(foo bar baz)
-    m.repeated_string += reference_arr.clone
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr[1]
-    end
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr[-2]
-    end
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr[20]
-    end
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr[1, 2]
-    end
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr[0..2]
-    end
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr[0..5]
-    end
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr[0..-1]
-    end
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr[0..-3]
-    end
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr[0...-1] # Exclusive range
-    end
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr[0...-3] # Exclusive range
-    end
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr[-2..-1]
-    end
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr[-5..-1]
-    end
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      # Infinite range; introduce in Ruby 2.7.
-      if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.7')
-        eval "arr[0..]"
-      end
-    end
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      # Beginless range; introduced in Ruby 2.7.
-      if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.7')
-        eval "arr[..-1]"
-      end
-    end
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      # Infinite range; introduce in Ruby 2.7.
-      if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.7')
-        eval "arr[0...]" # Exclusive range
-      end
-    end
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      # Beginless range; introduced in Ruby 2.7.
-      if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.7')
-        eval "arr[...-1]" # Exclusive range
-      end
-    end
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr[-1, 1]
-    end
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr[10, 12]
-    end
-  end
-
-  def test_array_settor
-    m = TestMessage.new
-    reference_arr = %w(foo bar baz)
-    m.repeated_string += reference_arr.clone
-
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr[1] = 'junk'
-    end
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr[-2] = 'snappy'
-    end
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr[3] = ''
-    end
-    # slight deviation; we are strongly typed, and nil is not allowed
-    # for string types;
-    m.repeated_string[5] = 'spacious'
-    assert_equal ["foo", "snappy", "baz", "", "", "spacious"], m.repeated_string
-
-    #make sure it sests the default types for other fields besides strings
-    %w(repeated_int32 repeated_int64 repeated_uint32 repeated_uint64).each do |field_name|
-      m.send(field_name)[3] = 10
-      assert_equal [0,0,0,10], m.send(field_name)
-    end
-    m.repeated_float[3] = 10.1
-    #wonky mri float handling
-    assert_equal [0,0,0], m.repeated_float.to_a[0..2]
-    assert_equal 10.1, m.repeated_float[3].round(1)
-    m.repeated_double[3] = 10.1
-    assert_equal [0,0,0,10.1], m.repeated_double
-    m.repeated_bool[3] = true
-    assert_equal [false, false, false, true], m.repeated_bool
-    m.repeated_bytes[3] = "bar".encode!('ASCII-8BIT')
-    assert_equal ['', '', '', "bar".encode!('ASCII-8BIT')], m.repeated_bytes
-    m.repeated_msg[3] = TestMessage2.new(:foo => 1)
-    assert_equal [nil, nil, nil, TestMessage2.new(:foo => 1)], m.repeated_msg
-    m.repeated_enum[3] = :A
-    assert_equal [:Default, :Default, :Default, :A], m.repeated_enum
-
-    # check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-    #   arr[20] = 'spacious'
-    # end
-    # TODO: accessor doesn't allow other ruby-like methods
-    # check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-    #   arr[1, 2] = 'fizz'
-    # end
-    # check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-    #   arr[0..2] = 'buzz'
-    # end
-  end
-
-  def test_push
-    m = TestMessage.new
-    reference_arr = %w[foo bar baz]
-    m.repeated_string += reference_arr.clone
-
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr.push('fizz')
-    end
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr << 'fizz'
-    end
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr.push('fizz', 'buzz')
-    end
-  end
-
-  def test_clear
-    m = TestMessage.new
-    reference_arr = %w(foo bar baz)
-    m.repeated_string += reference_arr.clone
-
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr.clear
-    end
-  end
-
-  def test_concat
-    m = TestMessage.new
-    reference_arr = %w(foo bar baz)
-    m.repeated_string += reference_arr.clone
-    m.repeated_string.concat(['fizz', 'buzz'])
-    assert_equal %w(foo bar baz fizz buzz), m.repeated_string
-    #TODO: concat should return the orig array
-    # check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-    #   arr.concat(['fizz', 'buzz'])
-    # end
-  end
-
-  def test_equal
-    m = TestMessage.new
-    reference_arr = %w(foo bar baz)
-    m.repeated_string += reference_arr.clone
-    assert_equal reference_arr, m.repeated_string
-    reference_arr << 'fizz'
-    assert_not_equal reference_arr, m.repeated_string
-    m.repeated_string << 'fizz'
-    assert_equal reference_arr, m.repeated_string
-  end
-
-  def test_hash
-    # just a sanity check
-    m = TestMessage.new
-    reference_arr = %w(foo bar baz)
-    m.repeated_string += reference_arr.clone
-    assert m.repeated_string.hash.is_a?(Integer)
-    hash = m.repeated_string.hash
-    assert_equal hash, m.repeated_string.hash
-    m.repeated_string << 'j'
-    assert_not_equal hash, m.repeated_string.hash
-  end
-
-  def test_plus
-    m = TestMessage.new
-    reference_arr = %w(foo bar baz)
-    m.repeated_string += reference_arr.clone
-
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr + ['fizz', 'buzz']
-    end
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr += ['fizz', 'buzz']
-    end
-  end
-
-  def test_replace
-    m = TestMessage.new
-    reference_arr = %w(foo bar baz)
-    m.repeated_string += reference_arr.clone
-
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr.replace(['fizz', 'buzz'])
-    end
-  end
-
-  def test_to_a
-    m = TestMessage.new
-    reference_arr = %w(foo bar baz)
-    m.repeated_string += reference_arr.clone
-
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr.to_a
-    end
-  end
-
-  def test_to_ary
-    m = TestMessage.new
-    reference_arr = %w(foo bar baz)
-    m.repeated_string += reference_arr.clone
-
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr.to_ary
-    end
-  end
-
-  # emulate Array behavior
-  ##########################
-
-  def test_collect!
-    m = TestMessage.new
-    reference_arr = %w(foo bar baz)
-    m.repeated_string += reference_arr.clone
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr.collect!{|x| x + "!" }
-    end
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr.collect!.with_index{|x, i| x[0...i] }
-    end
-  end
-
-  def test_delete
-    m = TestMessage.new
-    reference_arr = %w(foo bar baz)
-    m.repeated_string += reference_arr.clone
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr.delete('bar')
-    end
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr.delete('nope')
-    end
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr.delete('nope'){'within'}
-    end
-  end
-
-  def test_delete_at
-    m = TestMessage.new
-    reference_arr = %w(foo bar baz)
-    m.repeated_string += reference_arr.clone
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr.delete_at(2)
-    end
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr.delete_at(10)
-    end
-  end
-
-  def test_delete_if
-    m = TestMessage.new
-    reference_arr = %w(foo bar baz)
-    m.repeated_string += reference_arr.clone
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr.delete_if { |v| v == "bar" }
-    end
-  end
-
-  def test_fill
-    m = TestMessage.new
-    reference_arr = %w(foo bar baz)
-    m.repeated_string += reference_arr.clone
-
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr.fill("x")
-    end
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr.fill("z", 2, 2)
-    end
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr.fill("y", 0..1)
-    end
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr.fill { |i| (i*i).to_s }
-    end
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr.fill(-2) { |i| (i*i*i).to_s }
-    end
-  end
-
-  def test_flatten!
-    m = TestMessage.new
-    reference_arr = %w(foo bar baz)
-    m.repeated_string += reference_arr.clone
-
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr.flatten!
-    end
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr.flatten!(1)
-    end
-  end
-
-  def test_insert
-    m = TestMessage.new
-    reference_arr = %w(foo bar baz)
-    m.repeated_string += reference_arr.clone
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr.insert(2, 'fizz')
-    end
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr.insert(3, 'fizz', 'buzz', 'bazz')
-    end
-  end
-
-  def test_inspect
-    m = TestMessage.new
-    assert_equal '[]', m.repeated_string.inspect
-    m.repeated_string << 'foo'
-    assert_equal m.repeated_string.to_a.inspect, m.repeated_string.inspect
-    m.repeated_string << 'bar'
-    assert_equal m.repeated_string.to_a.inspect, m.repeated_string.inspect
-  end
-
-  def test_reverse!
-    m = TestMessage.new
-    reference_arr = %w(foo bar baz)
-    m.repeated_string += reference_arr.clone
-
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr.reverse!
-    end
-  end
-
-  def test_rotate!
-    m = TestMessage.new
-    reference_arr = %w(foo bar baz)
-    m.repeated_string += reference_arr.clone
-
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr.rotate!
-    end
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr.rotate!(2)
-    end
-  end
-
-  def test_select!
-    m = TestMessage.new
-    reference_arr = %w(foo bar baz)
-    m.repeated_string += reference_arr.clone
-
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr.select! { |v| v =~ /[aeiou]/ }
-    end
-  end
-
-  def test_shift
-    m = TestMessage.new
-    reference_arr = %w(foo bar baz)
-    m.repeated_string += reference_arr.clone
-
-    # should return an element
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr.shift
-    end
-    # should return an array
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr.shift(2)
-    end
-    # should return nil
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr.shift
-    end
-  end
-
-  def test_shuffle!
-    m = TestMessage.new
-    m.repeated_string += %w(foo bar baz)
-    result = m.repeated_string.shuffle!
-    assert_equal m.repeated_string, result
-  end
-
-  def test_slice!
-    m = TestMessage.new
-    reference_arr = %w(foo bar baz bar fizz buzz)
-    m.repeated_string += reference_arr.clone
-
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr.slice!(2)
-    end
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr.slice!(1,2)
-    end
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr.slice!(0..1)
-    end
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr.slice!(10)
-    end
-  end
-
-  def test_sort!
-    m = TestMessage.new
-    reference_arr = %w(foo bar baz)
-    m.repeated_string += reference_arr.clone
-
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr.sort!
-    end
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr.sort! { |x,y| y <=> x }
-    end
-  end
-
-  def test_sort_by!
-    m = TestMessage.new
-    reference_arr = %w(foo bar baz)
-    m.repeated_string += reference_arr.clone
-
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr.sort_by!
-    end
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr.sort_by!(&:hash)
-    end
-  end
-
-  def test_uniq!
-    m = TestMessage.new
-    reference_arr = %w(foo bar baz)
-    m.repeated_string += reference_arr.clone
-
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr.uniq!
-    end
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr.uniq!{|s| s[0] }
-    end
-  end
-
-  def test_unshift
-    m = TestMessage.new
-    reference_arr = %w(foo bar baz)
-    m.repeated_string += reference_arr.clone
-
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr.unshift('1')
-    end
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr.unshift('a', 'b')
-    end
-    check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
-      arr.unshift('')
-    end
-  end
-
-
-  ##### HELPER METHODS
-
-  def check_self_modifying_method(repeated_field, ref_array)
-    expected_result = yield(ref_array)
-    actual_result = yield(repeated_field)
-    if expected_result.is_a?(Enumerator)
-      assert_equal expected_result.to_a, actual_result.to_a
-    else
-      assert_equal expected_result, actual_result
-    end
-    assert_equal ref_array, repeated_field
-  end
-
-
-  def repeated_field_names(klass)
-    klass.descriptor.find_all{|f| f.label == :repeated}.map(&:name)
-  end
-
-
-  def fill_test_msg(test_msg)
-    test_msg.repeated_int32  += [-10, -11]
-    test_msg.repeated_int64  += [-1_000_000, -1_000_001]
-    test_msg.repeated_uint32 += [10, 11]
-    test_msg.repeated_uint64 += [1_000_000, 1_000_001]
-    test_msg.repeated_bool   += [true, false]
-    test_msg.repeated_float  += [-1.01, -1.02]
-    test_msg.repeated_double += [-1.0000000000001, -1.0000000000002]
-    test_msg.repeated_string += %w(foo bar)
-    test_msg.repeated_bytes  += ["bar".encode!('ASCII-8BIT'), "foo".encode!('ASCII-8BIT')]
-    test_msg.repeated_msg    << TestMessage2.new(:foo => 1)
-    test_msg.repeated_msg    << TestMessage2.new(:foo => 2)
-    test_msg.repeated_enum   << :A
-    test_msg.repeated_enum   << :B
-  end
-
-
-  pool = Google::Protobuf::DescriptorPool.new
-  pool.build do
-
-    add_message "TestMessage" do
-      optional :optional_int32,  :int32,        1
-      optional :optional_int64,  :int64,        2
-      optional :optional_uint32, :uint32,       3
-      optional :optional_uint64, :uint64,       4
-      optional :optional_bool,   :bool,         5
-      optional :optional_float,  :float,        6
-      optional :optional_double, :double,       7
-      optional :optional_string, :string,       8
-      optional :optional_bytes,  :bytes,        9
-      optional :optional_msg,    :message,      10, "TestMessage2"
-      optional :optional_enum,   :enum,         11, "TestEnum"
-
-      repeated :repeated_int32,  :int32,        12
-      repeated :repeated_int64,  :int64,        13
-      repeated :repeated_uint32, :uint32,       14
-      repeated :repeated_uint64, :uint64,       15
-      repeated :repeated_bool,   :bool,         16
-      repeated :repeated_float,  :float,        17
-      repeated :repeated_double, :double,       18
-      repeated :repeated_string, :string,       19
-      repeated :repeated_bytes,  :bytes,        20
-      repeated :repeated_msg,    :message,      21, "TestMessage2"
-      repeated :repeated_enum,   :enum,         22, "TestEnum"
-    end
-    add_message "TestMessage2" do
-      optional :foo, :int32, 1
-    end
-
-    add_enum "TestEnum" do
-      value :Default, 0
-      value :A, 1
-      value :B, 2
-      value :C, 3
-      value :v0, 4
-    end
-  end
-
-  TestMessage = pool.lookup("TestMessage").msgclass
-  TestMessage2 = pool.lookup("TestMessage2").msgclass
-  TestEnum = pool.lookup("TestEnum").enummodule
-
-
-end
diff --git a/libs/protobuf/ruby/tests/stress.rb b/libs/protobuf/ruby/tests/stress.rb
deleted file mode 100755
index 6a3f51d..0000000
--- a/libs/protobuf/ruby/tests/stress.rb
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/usr/bin/ruby
-
-require 'google/protobuf'
-require 'test/unit'
-
-module StressTest
-  pool = Google::Protobuf::DescriptorPool.new
-  pool.build do
-    add_message "TestMessage" do
-      optional :a,  :int32,        1
-      repeated :b,  :message,      2, "M"
-    end
-    add_message "M" do
-      optional :foo, :string, 1
-    end
-  end
-
-  TestMessage = pool.lookup("TestMessage").msgclass
-  M = pool.lookup("M").msgclass
-
-  class StressTest < Test::Unit::TestCase
-    def get_msg
-      TestMessage.new(:a => 1000,
-                      :b => [M.new(:foo => "hello"),
-                             M.new(:foo => "world")])
-    end
-    def test_stress
-      m = get_msg
-      data = TestMessage.encode(m)
-      100_000.times do
-        mnew = TestMessage.decode(data)
-        mnew = mnew.dup
-        assert_equal m.inspect, mnew.inspect
-        assert TestMessage.encode(mnew) == data
-      end
-    end
-  end
-end
diff --git a/libs/protobuf/ruby/tests/test_import.proto b/libs/protobuf/ruby/tests/test_import.proto
deleted file mode 100644
index 230484e..0000000
--- a/libs/protobuf/ruby/tests/test_import.proto
+++ /dev/null
@@ -1,5 +0,0 @@
-syntax = "proto3";
-
-package foo_bar;
-
-message TestImportedMessage {}
diff --git a/libs/protobuf/ruby/tests/test_import_proto2.proto b/libs/protobuf/ruby/tests/test_import_proto2.proto
deleted file mode 100644
index 8d2ef37..0000000
--- a/libs/protobuf/ruby/tests/test_import_proto2.proto
+++ /dev/null
@@ -1,5 +0,0 @@
-syntax = "proto2";
-
-package foo_bar.proto2;
-
-message TestImportedMessage {}
diff --git a/libs/protobuf/ruby/tests/test_ruby_package.proto b/libs/protobuf/ruby/tests/test_ruby_package.proto
deleted file mode 100644
index 54b7aca..0000000
--- a/libs/protobuf/ruby/tests/test_ruby_package.proto
+++ /dev/null
@@ -1,7 +0,0 @@
-syntax = "proto3";
-
-package foo_bar;
-
-option ruby_package = "A::B";
-
-message TestRubyPackageMessage {}
diff --git a/libs/protobuf/ruby/tests/test_ruby_package_proto2.proto b/libs/protobuf/ruby/tests/test_ruby_package_proto2.proto
deleted file mode 100644
index c55bde4..0000000
--- a/libs/protobuf/ruby/tests/test_ruby_package_proto2.proto
+++ /dev/null
@@ -1,7 +0,0 @@
-syntax = "proto2";
-
-package foo_bar_proto2;
-
-option ruby_package = "A::B::Proto2";
-
-message TestRubyPackageMessage {}
diff --git a/libs/protobuf/ruby/tests/type_errors.rb b/libs/protobuf/ruby/tests/type_errors.rb
deleted file mode 100755
index 6f6eb06..0000000
--- a/libs/protobuf/ruby/tests/type_errors.rb
+++ /dev/null
@@ -1,176 +0,0 @@
-#!/usr/bin/ruby
-
-# generated_code.rb is in the same directory as this test.
-$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__)))
-
-require 'test/unit'
-require 'google/protobuf/well_known_types'
-require 'generated_code_pb'
-
-class TestTypeErrors < Test::Unit::TestCase
-  # Ruby 2.4 unified Fixnum with Integer
-  IntegerType = Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.4') ? Fixnum : Integer
-
-  def test_bad_string
-    check_error Google::Protobuf::TypeError,
-                "Invalid argument for string field 'optional_string' (given #{IntegerType.name})." do
-      A::B::C::TestMessage.new(optional_string: 4)
-    end
-    check_error Google::Protobuf::TypeError,
-                "Invalid argument for string field 'oneof_string' (given #{IntegerType.name})." do
-      A::B::C::TestMessage.new(oneof_string: 4)
-    end
-    check_error ArgumentError,
-                "Expected array as initializer value for repeated field 'repeated_string' (given String)." do
-      A::B::C::TestMessage.new(repeated_string: '4')
-    end
-  end
-
-  def test_bad_float
-    check_error Google::Protobuf::TypeError,
-                "Expected number type for float field 'optional_float' (given TrueClass)." do
-      A::B::C::TestMessage.new(optional_float: true)
-    end
-    check_error Google::Protobuf::TypeError,
-                "Expected number type for float field 'oneof_float' (given TrueClass)." do
-      A::B::C::TestMessage.new(oneof_float: true)
-    end
-    check_error ArgumentError,
-                "Expected array as initializer value for repeated field 'repeated_float' (given String)." do
-      A::B::C::TestMessage.new(repeated_float: 'true')
-    end
-  end
-
-  def test_bad_double
-    check_error Google::Protobuf::TypeError,
-                "Expected number type for double field 'optional_double' (given Symbol)." do
-      A::B::C::TestMessage.new(optional_double: :double)
-    end
-    check_error Google::Protobuf::TypeError,
-                "Expected number type for double field 'oneof_double' (given Symbol)." do
-      A::B::C::TestMessage.new(oneof_double: :double)
-    end
-    check_error ArgumentError,
-                "Expected array as initializer value for repeated field 'repeated_double' (given FalseClass)." do
-      A::B::C::TestMessage.new(repeated_double: false)
-    end
-  end
-
-  def test_bad_bool
-    check_error Google::Protobuf::TypeError,
-                "Invalid argument for boolean field 'optional_bool' (given Float)." do
-      A::B::C::TestMessage.new(optional_bool: 4.4)
-    end
-    check_error Google::Protobuf::TypeError,
-                "Invalid argument for boolean field 'oneof_bool' (given Float)." do
-      A::B::C::TestMessage.new(oneof_bool: 4.4)
-    end
-    check_error ArgumentError,
-                "Expected array as initializer value for repeated field 'repeated_bool' (given String)." do
-      A::B::C::TestMessage.new(repeated_bool: 'hi')
-    end
-  end
-
-  def test_bad_int
-    check_error Google::Protobuf::TypeError,
-                "Expected number type for integral field 'optional_int32' (given String)." do
-      A::B::C::TestMessage.new(optional_int32: 'hi')
-    end
-    check_error RangeError,
-                "Non-integral floating point value assigned to integer field 'optional_int64' (given Float)." do
-      A::B::C::TestMessage.new(optional_int64: 2.4)
-    end
-    check_error Google::Protobuf::TypeError,
-                "Expected number type for integral field 'optional_uint32' (given Symbol)." do
-      A::B::C::TestMessage.new(optional_uint32: :thing)
-    end
-    check_error Google::Protobuf::TypeError,
-                "Expected number type for integral field 'optional_uint64' (given FalseClass)." do
-      A::B::C::TestMessage.new(optional_uint64: false)
-    end
-    check_error Google::Protobuf::TypeError,
-                "Expected number type for integral field 'oneof_int32' (given Symbol)." do
-      A::B::C::TestMessage.new(oneof_int32: :hi)
-    end
-    check_error RangeError,
-                "Non-integral floating point value assigned to integer field 'oneof_int64' (given Float)." do
-      A::B::C::TestMessage.new(oneof_int64: 2.4)
-    end
-    check_error Google::Protobuf::TypeError,
-                "Expected number type for integral field 'oneof_uint32' (given String)." do
-      A::B::C::TestMessage.new(oneof_uint32: 'x')
-    end
-    check_error RangeError,
-                "Non-integral floating point value assigned to integer field 'oneof_uint64' (given Float)." do
-      A::B::C::TestMessage.new(oneof_uint64: 1.1)
-    end
-    check_error ArgumentError,
-                "Expected array as initializer value for repeated field 'repeated_int32' (given Symbol)." do
-      A::B::C::TestMessage.new(repeated_int32: :hi)
-    end
-    check_error ArgumentError,
-                "Expected array as initializer value for repeated field 'repeated_int64' (given Float)." do
-      A::B::C::TestMessage.new(repeated_int64: 2.4)
-    end
-    check_error ArgumentError,
-                "Expected array as initializer value for repeated field 'repeated_uint32' (given String)." do
-      A::B::C::TestMessage.new(repeated_uint32: 'x')
-    end
-    check_error ArgumentError,
-                "Expected array as initializer value for repeated field 'repeated_uint64' (given Float)." do
-      A::B::C::TestMessage.new(repeated_uint64: 1.1)
-    end
-  end
-
-  def test_bad_enum
-    check_error RangeError,
-                "Unknown symbol value for enum field 'optional_enum'." do
-      A::B::C::TestMessage.new(optional_enum: 'enum')
-    end
-    check_error RangeError,
-                "Unknown symbol value for enum field 'oneof_enum'." do
-      A::B::C::TestMessage.new(oneof_enum: '')
-    end
-    check_error ArgumentError,
-                "Expected array as initializer value for repeated field 'repeated_enum' (given String)." do
-      A::B::C::TestMessage.new(repeated_enum: '')
-    end
-  end
-
-  def test_bad_bytes
-    check_error Google::Protobuf::TypeError,
-                "Invalid argument for bytes field 'optional_bytes' (given Float)." do
-      A::B::C::TestMessage.new(optional_bytes: 22.22)
-    end
-    check_error Google::Protobuf::TypeError,
-                "Invalid argument for bytes field 'oneof_bytes' (given Symbol)." do
-      A::B::C::TestMessage.new(oneof_bytes: :T22)
-    end
-    check_error ArgumentError,
-                "Expected array as initializer value for repeated field 'repeated_bytes' (given Symbol)." do
-      A::B::C::TestMessage.new(repeated_bytes: :T22)
-    end
-  end
-
-  def test_bad_msg
-    check_error Google::Protobuf::TypeError,
-                "Invalid type #{IntegerType.name} to assign to submessage field 'optional_msg'." do
-      A::B::C::TestMessage.new(optional_msg: 2)
-    end
-    check_error Google::Protobuf::TypeError,
-                "Invalid type String to assign to submessage field 'oneof_msg'." do
-      A::B::C::TestMessage.new(oneof_msg: '2')
-    end
-    check_error ArgumentError,
-                "Expected array as initializer value for repeated field 'repeated_msg' (given String)." do
-      A::B::C::TestMessage.new(repeated_msg: '2')
-    end
-  end
-
-  def check_error(type, message)
-    err = assert_raises type do
-      yield
-    end
-    assert_equal message, err.message
-  end
-end
diff --git a/libs/protobuf/ruby/tests/well_known_types_test.rb b/libs/protobuf/ruby/tests/well_known_types_test.rb
deleted file mode 100755
index fbdee38..0000000
--- a/libs/protobuf/ruby/tests/well_known_types_test.rb
+++ /dev/null
@@ -1,247 +0,0 @@
-#!/usr/bin/ruby
-
-require 'test/unit'
-require 'google/protobuf/well_known_types'
-
-class TestWellKnownTypes < Test::Unit::TestCase
-  def test_timestamp
-    ts = Google::Protobuf::Timestamp.new
-
-    assert_equal Time.at(0), ts.to_time
-
-    ts.seconds = 12345
-    assert_equal Time.at(12345), ts.to_time
-    assert_equal 12345, ts.to_i
-
-    # millisecond accuracy
-    time = Time.at(123456, 654321)
-    resp = ts.from_time(time)
-    assert_equal 123456, ts.seconds
-    assert_equal 654321000, ts.nanos
-    assert_equal time, ts.to_time
-    assert_equal resp, ts
-
-    # nanosecond accuracy
-    time = Time.at(123456, Rational(654321321, 1000))
-    resp = ts.from_time(time)
-    assert_equal 123456, ts.seconds
-    assert_equal 654321321, ts.nanos
-    assert_equal time, ts.to_time
-    assert_equal resp, ts
-
-    # Class based initialisation using from_time
-    time = Time.at(123456, Rational(654321321, 1000))
-    ts = Google::Protobuf::Timestamp.from_time(time)
-    assert_equal 123456, ts.seconds
-    assert_equal 654321321, ts.nanos
-    assert_equal time, ts.to_time
-
-      # Instance method returns the same value as class method
-    assert_equal Google::Protobuf::Timestamp.new.from_time(time),
-                 Google::Protobuf::Timestamp.from_time(time)
-  end
-
-  def test_duration
-    duration = Google::Protobuf::Duration.new(seconds: 123, nanos: 456)
-    assert_equal 123.000000456, duration.to_f
-  end
-
-  def test_struct
-    struct = Google::Protobuf::Struct.new
-
-    substruct = {
-      "subkey" => 999,
-      "subkey2" => false
-    }
-
-    sublist = ["abc", 123, {"deepkey" => "deepval"}]
-
-    struct["number"] = 12345
-    struct["boolean-true"] = true
-    struct["boolean-false"] = false
-    struct["null"] = nil
-    struct["string"] = "abcdef"
-    struct["substruct"] = substruct
-    struct["sublist"] = sublist
-
-    assert_equal 12345, struct["number"]
-    assert_equal true, struct["boolean-true"]
-    assert_equal false, struct["boolean-false"]
-    assert_equal nil, struct["null"]
-    assert_equal "abcdef", struct["string"]
-    assert_equal(Google::Protobuf::Struct.from_hash(substruct),
-                 struct["substruct"])
-    assert_equal(Google::Protobuf::ListValue.from_a(sublist),
-                 struct["sublist"])
-
-    assert_equal true, struct.has_key?("null")
-    assert_equal false, struct.has_key?("missing_key")
-
-    should_equal = {
-      "number" => 12345,
-      "boolean-true" => true,
-      "boolean-false" => false,
-      "null" => nil,
-      "string" => "abcdef",
-      "substruct" => {
-        "subkey" => 999,
-        "subkey2" => false
-      },
-      "sublist" => ["abc", 123, {"deepkey" => "deepval"}]
-    }
-
-    list = struct["sublist"]
-    list.is_a?(Google::Protobuf::ListValue)
-    assert_equal "abc", list[0]
-    assert_equal 123, list[1]
-    assert_equal({"deepkey" => "deepval"}, list[2].to_h)
-
-    # to_h returns a fully-flattened Ruby structure (Hash and Array).
-    assert_equal(should_equal, struct.to_h)
-
-    # Test that we can safely access a missing key
-    assert_equal(nil, struct["missing_key"])
-
-    # Test that we can assign Struct and ListValue directly.
-    struct["substruct"] = Google::Protobuf::Struct.from_hash(substruct)
-    struct["sublist"] = Google::Protobuf::ListValue.from_a(sublist)
-
-    assert_equal(should_equal, struct.to_h)
-
-    struct["sublist"] << nil
-    should_equal["sublist"] << nil
-
-    assert_equal(should_equal, struct.to_h)
-    assert_equal(should_equal["sublist"].length, struct["sublist"].length)
-
-    assert_raise Google::Protobuf::UnexpectedStructType do
-      struct[123] = 5
-    end
-
-    assert_raise Google::Protobuf::UnexpectedStructType do
-      struct[5] = Time.new
-    end
-
-    assert_raise Google::Protobuf::UnexpectedStructType do
-      struct[5] = [Time.new]
-    end
-
-    assert_raise Google::Protobuf::UnexpectedStructType do
-      struct[5] = {123 => 456}
-    end
-
-    assert_raise Google::Protobuf::UnexpectedStructType do
-      struct = Google::Protobuf::Struct.new
-      struct.fields["foo"] = Google::Protobuf::Value.new
-      # Tries to return a Ruby value for a Value class whose type
-      # hasn't been filled in.
-      struct["foo"]
-    end
-  end
-
-  def test_any
-    ts = Google::Protobuf::Timestamp.new(seconds: 12345, nanos: 6789)
-
-    any = Google::Protobuf::Any.new
-    any.pack(ts)
-
-    assert any.is(Google::Protobuf::Timestamp)
-    assert_equal ts, any.unpack(Google::Protobuf::Timestamp)
-
-    any = Google::Protobuf::Any.pack(ts)
-
-    assert any.is(Google::Protobuf::Timestamp)
-    assert_equal ts, any.unpack(Google::Protobuf::Timestamp)
-  end
-
-  def test_struct_init
-    s = Google::Protobuf::Struct.new(fields: {'a' => Google::Protobuf::Value.new({number_value: 4.4})})
-    assert_equal 4.4, s['a']
-
-    s = Google::Protobuf::Struct.new(fields: {'a' => {number_value: 2.2}})
-    assert_equal 2.2, s['a']
-
-    s = Google::Protobuf::Struct.new(fields: {a: {number_value: 1.1}})
-    assert_equal 1.1, s[:a]
-  end
-
-  def test_struct_nested_init
-    s = Google::Protobuf::Struct.new(
-      fields: {
-        'a' => {string_value: 'A'},
-        'b' => {struct_value: {
-          fields: {
-            'x' => {list_value: {values: [{number_value: 1.0}, {string_value: "ok"}]}},
-            'y' => {bool_value: true}}}
-        },
-        'c' => {struct_value: {}}
-      }
-    )
-    assert_equal 'A', s['a']
-    assert_equal 'A', s[:a]
-    expected_b_x = [Google::Protobuf::Value.new(number_value: 1.0), Google::Protobuf::Value.new(string_value: "ok")]
-    assert_equal expected_b_x, s['b']['x'].values
-    assert_equal expected_b_x, s[:b][:x].values
-    assert_equal expected_b_x, s['b'][:x].values
-    assert_equal expected_b_x, s[:b]['x'].values
-    assert_equal true, s['b']['y']
-    assert_equal true, s[:b][:y]
-    assert_equal true, s[:b]['y']
-    assert_equal true, s['b'][:y]
-    assert_equal Google::Protobuf::Struct.new, s['c']
-    assert_equal Google::Protobuf::Struct.new, s[:c]
-
-    s = Google::Protobuf::Struct.new(
-      fields: {
-        a: {string_value: 'Eh'},
-        b: {struct_value: {
-          fields: {
-            y: {bool_value: false}}}
-        }
-      }
-    )
-    assert_equal 'Eh', s['a']
-    assert_equal 'Eh', s[:a]
-    assert_equal false, s['b']['y']
-    assert_equal false, s[:b][:y]
-    assert_equal false, s['b'][:y]
-    assert_equal false, s[:b]['y']
-  end
-
-  def test_b8325
-    value_field = Google::Protobuf::ListValue.descriptor.lookup("values")
-    proto = Google::Protobuf::ListValue.new(
-        values: [Google::Protobuf::Value.new(string_value: "Hello")]
-    )
-    assert_equal '[<Google::Protobuf::Value: string_value: "Hello">]', value_field.get(proto).inspect
-  end
-
-  def test_from_ruby
-    pb = Google::Protobuf::Value.from_ruby(nil)
-    assert_equal pb.null_value, :NULL_VALUE
-
-    pb = Google::Protobuf::Value.from_ruby(1.23)
-    assert_equal pb.number_value, 1.23
-
-    pb = Google::Protobuf::Value.from_ruby('1.23')
-    assert_equal pb.string_value, '1.23'
-
-    pb = Google::Protobuf::Value.from_ruby(true)
-    assert_equal pb.bool_value, true
-
-    pb = Google::Protobuf::Value.from_ruby(false)
-    assert_equal pb.bool_value, false
-
-    pb = Google::Protobuf::Value.from_ruby(Google::Protobuf::Struct.from_hash({ 'a' => 1, 'b' => '2', 'c' => [1, 2, 3], 'd' => nil, 'e' => true }))
-    assert_equal pb.struct_value, Google::Protobuf::Struct.from_hash({ 'a' => 1, 'b' => '2', 'c' => [1, 2, 3], 'd' => nil, 'e' => true })
-
-    pb = Google::Protobuf::Value.from_ruby({ 'a' => 1, 'b' => '2', 'c' => [1, 2, 3], 'd' => nil, 'e' => true })
-    assert_equal pb.struct_value, Google::Protobuf::Struct.from_hash({ 'a' => 1, 'b' => '2', 'c' => [1, 2, 3], 'd' => nil, 'e' => true })
-
-    pb = Google::Protobuf::Value.from_ruby(Google::Protobuf::ListValue.from_a([1, 2, 3]))
-    assert_equal pb.list_value, Google::Protobuf::ListValue.from_a([1, 2, 3])
-
-    pb = Google::Protobuf::Value.from_ruby([1, 2, 3])
-    assert_equal pb.list_value, Google::Protobuf::ListValue.from_a([1, 2, 3])
-  end
-end
diff --git a/libs/protobuf/ruby/travis-test.sh b/libs/protobuf/ruby/travis-test.sh
deleted file mode 100755
index f7fa815..0000000
--- a/libs/protobuf/ruby/travis-test.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/usr/bin/env bash
-
-# Exit on any error.
-set -ex
-
-test_version() {
-  version=$1
-
-  RUBY_CONFORMANCE=test_ruby
-
-  if [[ $version == jruby-9* ]] ; then
-    bash --login -c \
-      "rvm install $version && rvm use $version && rvm get head && \
-       which ruby && \
-       git clean -f && \
-       gem install --no-document bundler && bundle && \
-       rake test && \
-       rake gc_test && \
-       cd ../conformance && make test_jruby && \
-       cd ../ruby/compatibility_tests/v3.0.0 && ./test.sh"
-  else
-    bash --login -c \
-      "rvm install $version && rvm use $version && \
-       which ruby && \
-       git clean -f && \
-       gem install --no-document bundler -v 1.17.3 && bundle && \
-       rake test && \
-       rake gc_test && \
-       cd ../conformance && make ${RUBY_CONFORMANCE} && \
-       cd ../ruby/compatibility_tests/v3.0.0 && \
-       cp -R ../../lib lib && ./test.sh"
-  fi
-}
-
-test_version $1
diff --git a/libs/protobuf/src/Makefile.am b/libs/protobuf/src/Makefile.am
deleted file mode 100644
index f48f7d4..0000000
--- a/libs/protobuf/src/Makefile.am
+++ /dev/null
@@ -1,918 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-if HAVE_ZLIB
-GZCHECKPROGRAMS = zcgzip zcgunzip
-GZHEADERS = google/protobuf/io/gzip_stream.h
-GZTESTS = google/protobuf/io/gzip_stream_unittest.sh
-ZLIB_DEF = -DHAVE_ZLIB=1
-else
-GZCHECKPROGRAMS =
-GZHEADERS =
-GZTESTS =
-ZLIB_DEF =
-endif
-
-if HAVE_PTHREAD
-PTHREAD_DEF = -DHAVE_PTHREAD=1
-else
-PTHREAD_DEF =
-endif
-
-PROTOBUF_VERSION = 32:12:0
-
-if GCC
-# Turn on all warnings except for sign comparison (we ignore sign comparison
-# in Google so our code base have tons of such warnings).
-NO_OPT_CXXFLAGS = $(PTHREAD_CFLAGS) $(PTHREAD_DEF) $(ZLIB_DEF) -Wall -Wno-sign-compare
-else
-NO_OPT_CXXFLAGS = $(PTHREAD_CFLAGS) $(PTHREAD_DEF) $(ZLIB_DEF)
-endif
-
-AM_CXXFLAGS = $(NO_OPT_CXXFLAGS) $(PROTOBUF_OPT_FLAG)
-
-AM_LDFLAGS = $(PTHREAD_CFLAGS) ${LIBLOG_LIBS}
-
-# If I say "dist_include_DATA", automake complains that $(includedir) is not
-# a "legitimate" directory for DATA.  Screw you, automake.
-protodir = $(includedir)
-
-# If you are adding new files here, also remember to change the build files for
-# all other languages, //protoc-artifacts/build-zip.sh and run
-# //update_file_list.sh for bazel.
-nobase_dist_proto_DATA =                \
-  google/protobuf/any.proto             \
-  google/protobuf/api.proto             \
-  google/protobuf/compiler/plugin.proto \
-  google/protobuf/descriptor.proto      \
-  google/protobuf/duration.proto        \
-  google/protobuf/empty.proto           \
-  google/protobuf/field_mask.proto      \
-  google/protobuf/source_context.proto  \
-  google/protobuf/struct.proto          \
-  google/protobuf/timestamp.proto       \
-  google/protobuf/type.proto            \
-  google/protobuf/wrappers.proto
-
-# Not sure why these don't get cleaned automatically.
-clean-local:
-	rm -f *.loT
-
-CLEANFILES = $(protoc_outputs) unittest_proto_middleman \
-             testzip.jar testzip.list testzip.proto testzip.zip \
-             no_warning_test.cc
-
-MAINTAINERCLEANFILES =   \
-  Makefile.in
-
-nobase_include_HEADERS =                                         \
-  google/protobuf/any.h                                          \
-  google/protobuf/any.pb.h                                       \
-  google/protobuf/api.pb.h                                       \
-  google/protobuf/arena.h                                        \
-  google/protobuf/arena_impl.h                                   \
-  google/protobuf/arenastring.h                                  \
-  google/protobuf/arenaz_sampler.h                               \
-  google/protobuf/compiler/code_generator.h                      \
-  google/protobuf/compiler/command_line_interface.h              \
-  google/protobuf/compiler/cpp/cpp_generator.h                   \
-  google/protobuf/compiler/cpp/file.h                            \
-  google/protobuf/compiler/cpp/generator.h                       \
-  google/protobuf/compiler/cpp/helpers.h                         \
-  google/protobuf/compiler/cpp/names.h                           \
-  google/protobuf/compiler/csharp/csharp_doc_comment.h           \
-  google/protobuf/compiler/csharp/csharp_generator.h             \
-  google/protobuf/compiler/csharp/csharp_names.h                 \
-  google/protobuf/compiler/csharp/csharp_options.h               \
-  google/protobuf/compiler/importer.h                            \
-  google/protobuf/compiler/java/generator.h                      \
-  google/protobuf/compiler/java/java_generator.h                 \
-  google/protobuf/compiler/java/kotlin_generator.h               \
-  google/protobuf/compiler/java/names.h                          \
-  google/protobuf/compiler/objectivec/objectivec_generator.h     \
-  google/protobuf/compiler/objectivec/objectivec_helpers.h       \
-  google/protobuf/compiler/parser.h                              \
-  google/protobuf/compiler/php/php_generator.h                   \
-  google/protobuf/compiler/plugin.h                              \
-  google/protobuf/compiler/plugin.pb.h                           \
-  google/protobuf/compiler/python/generator.h                    \
-  google/protobuf/compiler/python/pyi_generator.h                \
-  google/protobuf/compiler/python/python_generator.h             \
-  google/protobuf/compiler/ruby/ruby_generator.h                 \
-  google/protobuf/descriptor.h                                   \
-  google/protobuf/descriptor.pb.h                                \
-  google/protobuf/descriptor_database.h                          \
-  google/protobuf/duration.pb.h                                  \
-  google/protobuf/dynamic_message.h                              \
-  google/protobuf/empty.pb.h                                     \
-  google/protobuf/endian.h                                       \
-  google/protobuf/explicitly_constructed.h                       \
-  google/protobuf/extension_set.h                                \
-  google/protobuf/extension_set_inl.h                            \
-  google/protobuf/field_access_listener.h                        \
-  google/protobuf/field_mask.pb.h                                \
-  google/protobuf/generated_enum_reflection.h                    \
-  google/protobuf/generated_enum_util.h                          \
-  google/protobuf/generated_message_bases.h                      \
-  google/protobuf/generated_message_reflection.h                 \
-  google/protobuf/generated_message_tctable_decl.h               \
-  google/protobuf/generated_message_tctable_impl.h               \
-  google/protobuf/generated_message_util.h                       \
-  google/protobuf/has_bits.h                                     \
-  google/protobuf/implicit_weak_message.h                        \
-  google/protobuf/inlined_string_field.h                         \
-  google/protobuf/io/coded_stream.h                              \
-  $(GZHEADERS)                                                   \
-  google/protobuf/io/io_win32.h                                  \
-  google/protobuf/io/printer.h                                   \
-  google/protobuf/io/strtod.h                                    \
-  google/protobuf/io/tokenizer.h                                 \
-  google/protobuf/io/zero_copy_stream.h                          \
-  google/protobuf/io/zero_copy_stream_impl.h                     \
-  google/protobuf/io/zero_copy_stream_impl_lite.h                \
-  google/protobuf/map.h                                          \
-  google/protobuf/map_entry.h                                    \
-  google/protobuf/map_entry_lite.h                               \
-  google/protobuf/map_field.h                                    \
-  google/protobuf/map_field_inl.h                                \
-  google/protobuf/map_field_lite.h                               \
-  google/protobuf/map_type_handler.h                             \
-  google/protobuf/message.h                                      \
-  google/protobuf/message_lite.h                                 \
-  google/protobuf/metadata.h                                     \
-  google/protobuf/metadata_lite.h                                \
-  google/protobuf/parse_context.h                                \
-  google/protobuf/port.h                                         \
-  google/protobuf/port_def.inc                                   \
-  google/protobuf/port_undef.inc                                 \
-  google/protobuf/reflection.h                                   \
-  google/protobuf/reflection_internal.h                          \
-  google/protobuf/reflection_ops.h                               \
-  google/protobuf/repeated_field.h                               \
-  google/protobuf/repeated_ptr_field.h                           \
-  google/protobuf/service.h                                      \
-  google/protobuf/source_context.pb.h                            \
-  google/protobuf/struct.pb.h                                    \
-  google/protobuf/stubs/bytestream.h                             \
-  google/protobuf/stubs/callback.h                               \
-  google/protobuf/stubs/casts.h                                  \
-  google/protobuf/stubs/common.h                                 \
-  google/protobuf/stubs/hash.h                                   \
-  google/protobuf/stubs/logging.h                                \
-  google/protobuf/stubs/macros.h                                 \
-  google/protobuf/stubs/map_util.h                               \
-  google/protobuf/stubs/mutex.h                                  \
-  google/protobuf/stubs/once.h                                   \
-  google/protobuf/stubs/platform_macros.h                        \
-  google/protobuf/stubs/port.h                                   \
-  google/protobuf/stubs/status.h                                 \
-  google/protobuf/stubs/stl_util.h                               \
-  google/protobuf/stubs/stringpiece.h                            \
-  google/protobuf/stubs/strutil.h                                \
-  google/protobuf/stubs/template_util.h                          \
-  google/protobuf/text_format.h                                  \
-  google/protobuf/timestamp.pb.h                                 \
-  google/protobuf/type.pb.h                                      \
-  google/protobuf/unknown_field_set.h                            \
-  google/protobuf/util/delimited_message_util.h                  \
-  google/protobuf/util/field_comparator.h                        \
-  google/protobuf/util/field_mask_util.h                         \
-  google/protobuf/util/json_util.h                               \
-  google/protobuf/util/message_differencer.h                     \
-  google/protobuf/util/time_util.h                               \
-  google/protobuf/util/type_resolver.h                           \
-  google/protobuf/util/type_resolver_util.h                      \
-  google/protobuf/wire_format.h                                  \
-  google/protobuf/wire_format_lite.h                             \
-  google/protobuf/wrappers.pb.h
-
-lib_LTLIBRARIES = libprotobuf-lite.la libprotobuf.la libprotoc.la
-
-libprotobuf_lite_la_LIBADD = $(PTHREAD_LIBS) $(LIBATOMIC_LIBS)
-libprotobuf_lite_la_LDFLAGS = -version-info $(PROTOBUF_VERSION) -export-dynamic -no-undefined
-if HAVE_LD_VERSION_SCRIPT
-libprotobuf_lite_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libprotobuf-lite.map
-EXTRA_libprotobuf_lite_la_DEPENDENCIES = libprotobuf-lite.map
-endif
-libprotobuf_lite_la_SOURCES =                                  \
-  google/protobuf/any_lite.cc                                  \
-  google/protobuf/arena.cc                                     \
-  google/protobuf/arenastring.cc                               \
-  google/protobuf/arenaz_sampler.cc                            \
-  google/protobuf/extension_set.cc                             \
-  google/protobuf/generated_enum_util.cc                       \
-  google/protobuf/generated_message_tctable_lite.cc            \
-  google/protobuf/generated_message_util.cc                    \
-  google/protobuf/implicit_weak_message.cc                     \
-  google/protobuf/inlined_string_field.cc                      \
-  google/protobuf/io/coded_stream.cc                           \
-  google/protobuf/io/io_win32.cc                               \
-  google/protobuf/io/strtod.cc                                 \
-  google/protobuf/io/zero_copy_stream.cc                       \
-  google/protobuf/io/zero_copy_stream_impl.cc                  \
-  google/protobuf/io/zero_copy_stream_impl_lite.cc             \
-  google/protobuf/map.cc                                       \
-  google/protobuf/message_lite.cc                              \
-  google/protobuf/parse_context.cc                             \
-  google/protobuf/repeated_field.cc                            \
-  google/protobuf/repeated_ptr_field.cc                        \
-  google/protobuf/string_member_robber.h                       \
-  google/protobuf/stubs/bytestream.cc                          \
-  google/protobuf/stubs/common.cc                              \
-  google/protobuf/stubs/int128.cc                              \
-  google/protobuf/stubs/int128.h                               \
-  google/protobuf/stubs/mathutil.h                             \
-  google/protobuf/stubs/status.cc                              \
-  google/protobuf/stubs/status_macros.h                        \
-  google/protobuf/stubs/statusor.cc                            \
-  google/protobuf/stubs/statusor.h                             \
-  google/protobuf/stubs/stringpiece.cc                         \
-  google/protobuf/stubs/stringprintf.cc                        \
-  google/protobuf/stubs/stringprintf.h                         \
-  google/protobuf/stubs/structurally_valid.cc                  \
-  google/protobuf/stubs/strutil.cc                             \
-  google/protobuf/stubs/time.cc                                \
-  google/protobuf/stubs/time.h                                 \
-  google/protobuf/wire_format_lite.cc
-
-libprotobuf_la_LIBADD = $(PTHREAD_LIBS) $(LIBATOMIC_LIBS)
-libprotobuf_la_LDFLAGS = -version-info $(PROTOBUF_VERSION) -export-dynamic -no-undefined
-if HAVE_LD_VERSION_SCRIPT
-libprotobuf_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libprotobuf.map
-EXTRA_libprotobuf_la_DEPENDENCIES = libprotobuf.map
-endif
-libprotobuf_la_SOURCES =                                       \
-  $(libprotobuf_lite_la_SOURCES)                               \
-  google/protobuf/any.cc                                       \
-  google/protobuf/any.pb.cc                                    \
-  google/protobuf/api.pb.cc                                    \
-  google/protobuf/compiler/importer.cc                         \
-  google/protobuf/compiler/parser.cc                           \
-  google/protobuf/descriptor.cc                                \
-  google/protobuf/descriptor.pb.cc                             \
-  google/protobuf/descriptor_database.cc                       \
-  google/protobuf/duration.pb.cc                               \
-  google/protobuf/dynamic_message.cc                           \
-  google/protobuf/empty.pb.cc                                  \
-  google/protobuf/extension_set_heavy.cc                       \
-  google/protobuf/field_mask.pb.cc                             \
-  google/protobuf/generated_message_bases.cc                   \
-  google/protobuf/generated_message_reflection.cc              \
-  google/protobuf/generated_message_tctable_full.cc            \
-  google/protobuf/io/gzip_stream.cc                            \
-  google/protobuf/io/printer.cc                                \
-  google/protobuf/io/tokenizer.cc                              \
-  google/protobuf/map_field.cc                                 \
-  google/protobuf/message.cc                                   \
-  google/protobuf/reflection_ops.cc                            \
-  google/protobuf/service.cc                                   \
-  google/protobuf/source_context.pb.cc                         \
-  google/protobuf/struct.pb.cc                                 \
-  google/protobuf/stubs/substitute.cc                          \
-  google/protobuf/stubs/substitute.h                           \
-  google/protobuf/text_format.cc                               \
-  google/protobuf/timestamp.pb.cc                              \
-  google/protobuf/type.pb.cc                                   \
-  google/protobuf/unknown_field_set.cc                         \
-  google/protobuf/util/delimited_message_util.cc               \
-  google/protobuf/util/field_comparator.cc                     \
-  google/protobuf/util/field_mask_util.cc                      \
-  google/protobuf/util/internal/constants.h                    \
-  google/protobuf/util/internal/datapiece.cc                   \
-  google/protobuf/util/internal/datapiece.h                    \
-  google/protobuf/util/internal/default_value_objectwriter.cc  \
-  google/protobuf/util/internal/default_value_objectwriter.h   \
-  google/protobuf/util/internal/error_listener.cc              \
-  google/protobuf/util/internal/error_listener.h               \
-  google/protobuf/util/internal/expecting_objectwriter.h       \
-  google/protobuf/util/internal/field_mask_utility.cc          \
-  google/protobuf/util/internal/field_mask_utility.h           \
-  google/protobuf/util/internal/json_escaping.cc               \
-  google/protobuf/util/internal/json_escaping.h                \
-  google/protobuf/util/internal/json_objectwriter.cc           \
-  google/protobuf/util/internal/json_objectwriter.h            \
-  google/protobuf/util/internal/json_stream_parser.cc          \
-  google/protobuf/util/internal/json_stream_parser.h           \
-  google/protobuf/util/internal/location_tracker.h             \
-  google/protobuf/util/internal/mock_error_listener.h          \
-  google/protobuf/util/internal/object_location_tracker.h      \
-  google/protobuf/util/internal/object_source.h                \
-  google/protobuf/util/internal/object_writer.cc               \
-  google/protobuf/util/internal/object_writer.h                \
-  google/protobuf/util/internal/proto_writer.cc                \
-  google/protobuf/util/internal/proto_writer.h                 \
-  google/protobuf/util/internal/protostream_objectsource.cc    \
-  google/protobuf/util/internal/protostream_objectsource.h     \
-  google/protobuf/util/internal/protostream_objectwriter.cc    \
-  google/protobuf/util/internal/protostream_objectwriter.h     \
-  google/protobuf/util/internal/structured_objectwriter.h      \
-  google/protobuf/util/internal/type_info.cc                   \
-  google/protobuf/util/internal/type_info.h                    \
-  google/protobuf/util/internal/type_info_test_helper.h        \
-  google/protobuf/util/internal/utility.cc                     \
-  google/protobuf/util/internal/utility.h                      \
-  google/protobuf/util/json_util.cc                            \
-  google/protobuf/util/message_differencer.cc                  \
-  google/protobuf/util/time_util.cc                            \
-  google/protobuf/util/type_resolver_util.cc                   \
-  google/protobuf/wire_format.cc                               \
-  google/protobuf/wrappers.pb.cc
-
-nodist_libprotobuf_la_SOURCES = $(nodist_libprotobuf_lite_la_SOURCES)
-
-libprotoc_la_LIBADD = $(PTHREAD_LIBS) libprotobuf.la
-libprotoc_la_LDFLAGS = -version-info $(PROTOBUF_VERSION) -export-dynamic -no-undefined
-if HAVE_LD_VERSION_SCRIPT
-libprotoc_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libprotoc.map
-EXTRA_libprotoc_la_DEPENDENCIES = libprotoc.map
-endif
-libprotoc_la_SOURCES =                                         \
-  google/protobuf/compiler/code_generator.cc                   \
-  google/protobuf/compiler/command_line_interface.cc           \
-  google/protobuf/compiler/cpp/enum.cc                         \
-  google/protobuf/compiler/cpp/enum.h                          \
-  google/protobuf/compiler/cpp/enum_field.cc                   \
-  google/protobuf/compiler/cpp/enum_field.h                    \
-  google/protobuf/compiler/cpp/extension.cc                    \
-  google/protobuf/compiler/cpp/extension.h                     \
-  google/protobuf/compiler/cpp/field.cc                        \
-  google/protobuf/compiler/cpp/field.h                         \
-  google/protobuf/compiler/cpp/file.cc                         \
-  google/protobuf/compiler/cpp/generator.cc                    \
-  google/protobuf/compiler/cpp/helpers.cc                      \
-  google/protobuf/compiler/cpp/map_field.cc                    \
-  google/protobuf/compiler/cpp/map_field.h                     \
-  google/protobuf/compiler/cpp/message.cc                      \
-  google/protobuf/compiler/cpp/message.h                       \
-  google/protobuf/compiler/cpp/message_field.cc                \
-  google/protobuf/compiler/cpp/message_field.h                 \
-  google/protobuf/compiler/cpp/message_layout_helper.h         \
-  google/protobuf/compiler/cpp/options.h                       \
-  google/protobuf/compiler/cpp/padding_optimizer.cc            \
-  google/protobuf/compiler/cpp/padding_optimizer.h             \
-  google/protobuf/compiler/cpp/parse_function_generator.cc     \
-  google/protobuf/compiler/cpp/parse_function_generator.h      \
-  google/protobuf/compiler/cpp/primitive_field.cc              \
-  google/protobuf/compiler/cpp/primitive_field.h               \
-  google/protobuf/compiler/cpp/service.cc                      \
-  google/protobuf/compiler/cpp/service.h                       \
-  google/protobuf/compiler/cpp/string_field.cc                 \
-  google/protobuf/compiler/cpp/string_field.h                  \
-  google/protobuf/compiler/csharp/csharp_doc_comment.cc        \
-  google/protobuf/compiler/csharp/csharp_enum.cc               \
-  google/protobuf/compiler/csharp/csharp_enum.h                \
-  google/protobuf/compiler/csharp/csharp_enum_field.cc         \
-  google/protobuf/compiler/csharp/csharp_enum_field.h          \
-  google/protobuf/compiler/csharp/csharp_field_base.cc         \
-  google/protobuf/compiler/csharp/csharp_field_base.h          \
-  google/protobuf/compiler/csharp/csharp_generator.cc          \
-  google/protobuf/compiler/csharp/csharp_helpers.cc            \
-  google/protobuf/compiler/csharp/csharp_helpers.h             \
-  google/protobuf/compiler/csharp/csharp_map_field.cc          \
-  google/protobuf/compiler/csharp/csharp_map_field.h           \
-  google/protobuf/compiler/csharp/csharp_message.cc            \
-  google/protobuf/compiler/csharp/csharp_message.h             \
-  google/protobuf/compiler/csharp/csharp_message_field.cc      \
-  google/protobuf/compiler/csharp/csharp_message_field.h       \
-  google/protobuf/compiler/csharp/csharp_primitive_field.cc    \
-  google/protobuf/compiler/csharp/csharp_primitive_field.h     \
-  google/protobuf/compiler/csharp/csharp_reflection_class.cc   \
-  google/protobuf/compiler/csharp/csharp_reflection_class.h    \
-  google/protobuf/compiler/csharp/csharp_repeated_enum_field.cc \
-  google/protobuf/compiler/csharp/csharp_repeated_enum_field.h \
-  google/protobuf/compiler/csharp/csharp_repeated_message_field.cc \
-  google/protobuf/compiler/csharp/csharp_repeated_message_field.h \
-  google/protobuf/compiler/csharp/csharp_repeated_primitive_field.cc \
-  google/protobuf/compiler/csharp/csharp_repeated_primitive_field.h \
-  google/protobuf/compiler/csharp/csharp_source_generator_base.cc \
-  google/protobuf/compiler/csharp/csharp_source_generator_base.h \
-  google/protobuf/compiler/csharp/csharp_wrapper_field.cc      \
-  google/protobuf/compiler/csharp/csharp_wrapper_field.h       \
-  google/protobuf/compiler/java/context.cc                     \
-  google/protobuf/compiler/java/context.h                      \
-  google/protobuf/compiler/java/doc_comment.cc                 \
-  google/protobuf/compiler/java/doc_comment.h                  \
-  google/protobuf/compiler/java/enum.cc                        \
-  google/protobuf/compiler/java/enum.h                         \
-  google/protobuf/compiler/java/enum_field.cc                  \
-  google/protobuf/compiler/java/enum_field.h                   \
-  google/protobuf/compiler/java/enum_field_lite.cc             \
-  google/protobuf/compiler/java/enum_field_lite.h              \
-  google/protobuf/compiler/java/enum_lite.cc                   \
-  google/protobuf/compiler/java/enum_lite.h                    \
-  google/protobuf/compiler/java/extension.cc                   \
-  google/protobuf/compiler/java/extension.h                    \
-  google/protobuf/compiler/java/extension_lite.cc              \
-  google/protobuf/compiler/java/extension_lite.h               \
-  google/protobuf/compiler/java/field.cc                       \
-  google/protobuf/compiler/java/field.h                        \
-  google/protobuf/compiler/java/file.cc                        \
-  google/protobuf/compiler/java/file.h                         \
-  google/protobuf/compiler/java/generator.cc                   \
-  google/protobuf/compiler/java/generator_factory.cc           \
-  google/protobuf/compiler/java/generator_factory.h            \
-  google/protobuf/compiler/java/helpers.cc                     \
-  google/protobuf/compiler/java/helpers.h                      \
-  google/protobuf/compiler/java/kotlin_generator.cc            \
-  google/protobuf/compiler/java/map_field.cc                   \
-  google/protobuf/compiler/java/map_field.h                    \
-  google/protobuf/compiler/java/map_field_lite.cc              \
-  google/protobuf/compiler/java/map_field_lite.h               \
-  google/protobuf/compiler/java/message.cc                     \
-  google/protobuf/compiler/java/message.h                      \
-  google/protobuf/compiler/java/message_builder.cc             \
-  google/protobuf/compiler/java/message_builder.h              \
-  google/protobuf/compiler/java/message_builder_lite.cc        \
-  google/protobuf/compiler/java/message_builder_lite.h         \
-  google/protobuf/compiler/java/message_field.cc               \
-  google/protobuf/compiler/java/message_field.h                \
-  google/protobuf/compiler/java/message_field_lite.cc          \
-  google/protobuf/compiler/java/message_field_lite.h           \
-  google/protobuf/compiler/java/message_lite.cc                \
-  google/protobuf/compiler/java/message_lite.h                 \
-  google/protobuf/compiler/java/name_resolver.cc               \
-  google/protobuf/compiler/java/name_resolver.h                \
-  google/protobuf/compiler/java/options.h                      \
-  google/protobuf/compiler/java/primitive_field.cc             \
-  google/protobuf/compiler/java/primitive_field.h              \
-  google/protobuf/compiler/java/primitive_field_lite.cc        \
-  google/protobuf/compiler/java/primitive_field_lite.h         \
-  google/protobuf/compiler/java/service.cc                     \
-  google/protobuf/compiler/java/service.h                      \
-  google/protobuf/compiler/java/shared_code_generator.cc       \
-  google/protobuf/compiler/java/shared_code_generator.h        \
-  google/protobuf/compiler/java/string_field.cc                \
-  google/protobuf/compiler/java/string_field.h                 \
-  google/protobuf/compiler/java/string_field_lite.cc           \
-  google/protobuf/compiler/java/string_field_lite.h            \
-  google/protobuf/compiler/objectivec/objectivec_enum.cc       \
-  google/protobuf/compiler/objectivec/objectivec_enum.h        \
-  google/protobuf/compiler/objectivec/objectivec_enum_field.cc \
-  google/protobuf/compiler/objectivec/objectivec_enum_field.h  \
-  google/protobuf/compiler/objectivec/objectivec_extension.cc  \
-  google/protobuf/compiler/objectivec/objectivec_extension.h   \
-  google/protobuf/compiler/objectivec/objectivec_field.cc      \
-  google/protobuf/compiler/objectivec/objectivec_field.h       \
-  google/protobuf/compiler/objectivec/objectivec_file.cc       \
-  google/protobuf/compiler/objectivec/objectivec_file.h        \
-  google/protobuf/compiler/objectivec/objectivec_generator.cc  \
-  google/protobuf/compiler/objectivec/objectivec_helpers.cc    \
-  google/protobuf/compiler/objectivec/objectivec_map_field.cc  \
-  google/protobuf/compiler/objectivec/objectivec_map_field.h   \
-  google/protobuf/compiler/objectivec/objectivec_message.cc    \
-  google/protobuf/compiler/objectivec/objectivec_message.h     \
-  google/protobuf/compiler/objectivec/objectivec_message_field.cc \
-  google/protobuf/compiler/objectivec/objectivec_message_field.h \
-  google/protobuf/compiler/objectivec/objectivec_nsobject_methods.h \
-  google/protobuf/compiler/objectivec/objectivec_oneof.cc      \
-  google/protobuf/compiler/objectivec/objectivec_oneof.h       \
-  google/protobuf/compiler/objectivec/objectivec_primitive_field.cc \
-  google/protobuf/compiler/objectivec/objectivec_primitive_field.h \
-  google/protobuf/compiler/php/php_generator.cc                \
-  google/protobuf/compiler/plugin.cc                           \
-  google/protobuf/compiler/plugin.pb.cc                        \
-  google/protobuf/compiler/python/generator.cc                 \
-  google/protobuf/compiler/python/helpers.cc                   \
-  google/protobuf/compiler/python/helpers.h                    \
-  google/protobuf/compiler/python/pyi_generator.cc             \
-  google/protobuf/compiler/ruby/ruby_generator.cc              \
-  google/protobuf/compiler/scc.h                               \
-  google/protobuf/compiler/subprocess.cc                       \
-  google/protobuf/compiler/subprocess.h                        \
-  google/protobuf/compiler/zip_writer.cc                       \
-  google/protobuf/compiler/zip_writer.h
-
-bin_PROGRAMS = protoc
-protoc_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la
-protoc_SOURCES = google/protobuf/compiler/main.cc
-
-# Tests ==============================================================
-
-protoc_inputs =                                                   \
-  google/protobuf/any_test.proto                                  \
-  google/protobuf/compiler/cpp/test_bad_identifiers.proto         \
-  google/protobuf/compiler/cpp/test_large_enum_value.proto        \
-  google/protobuf/map_lite_unittest.proto                         \
-  google/protobuf/map_proto2_unittest.proto                       \
-  google/protobuf/map_unittest.proto                              \
-  google/protobuf/unittest.proto                                  \
-  google/protobuf/unittest_arena.proto                            \
-  google/protobuf/unittest_custom_options.proto                   \
-  google/protobuf/unittest_drop_unknown_fields.proto              \
-  google/protobuf/unittest_embed_optimize_for.proto               \
-  google/protobuf/unittest_empty.proto                            \
-  google/protobuf/unittest_enormous_descriptor.proto              \
-  google/protobuf/unittest_import.proto                           \
-  google/protobuf/unittest_import_lite.proto                      \
-  google/protobuf/unittest_import_public.proto                    \
-  google/protobuf/unittest_import_public_lite.proto               \
-  google/protobuf/unittest_lazy_dependencies.proto                \
-  google/protobuf/unittest_lazy_dependencies_custom_option.proto  \
-  google/protobuf/unittest_lazy_dependencies_enum.proto           \
-  google/protobuf/unittest_lite.proto                             \
-  google/protobuf/unittest_lite_imports_nonlite.proto             \
-  google/protobuf/unittest_mset.proto                             \
-  google/protobuf/unittest_mset_wire_format.proto                 \
-  google/protobuf/unittest_no_field_presence.proto                \
-  google/protobuf/unittest_no_generic_services.proto              \
-  google/protobuf/unittest_optimize_for.proto                     \
-  google/protobuf/unittest_preserve_unknown_enum.proto            \
-  google/protobuf/unittest_preserve_unknown_enum2.proto           \
-  google/protobuf/unittest_proto3.proto                           \
-  google/protobuf/unittest_proto3_arena.proto                     \
-  google/protobuf/unittest_proto3_arena_lite.proto                \
-  google/protobuf/unittest_proto3_lite.proto                      \
-  google/protobuf/unittest_proto3_optional.proto                  \
-  google/protobuf/unittest_well_known_types.proto                 \
-  google/protobuf/util/internal/testdata/anys.proto               \
-  google/protobuf/util/internal/testdata/books.proto              \
-  google/protobuf/util/internal/testdata/default_value.proto      \
-  google/protobuf/util/internal/testdata/default_value_test.proto \
-  google/protobuf/util/internal/testdata/field_mask.proto         \
-  google/protobuf/util/internal/testdata/maps.proto               \
-  google/protobuf/util/internal/testdata/oneofs.proto             \
-  google/protobuf/util/internal/testdata/proto3.proto             \
-  google/protobuf/util/internal/testdata/struct.proto             \
-  google/protobuf/util/internal/testdata/timestamp_duration.proto \
-  google/protobuf/util/internal/testdata/wrappers.proto           \
-  google/protobuf/util/json_format.proto                          \
-  google/protobuf/util/json_format_proto3.proto                   \
-  google/protobuf/util/message_differencer_unittest.proto
-
-EXTRA_DIST =                                                   \
-  $(protoc_inputs)                                             \
-  README.md                                                    \
-  google/protobuf/compiler/package_info.h                      \
-  google/protobuf/compiler/ruby/ruby_generated_code.proto      \
-  google/protobuf/compiler/ruby/ruby_generated_code_pb.rb      \
-  google/protobuf/compiler/ruby/ruby_generated_code_proto2.proto \
-  google/protobuf/compiler/ruby/ruby_generated_code_proto2_import.proto \
-  google/protobuf/compiler/ruby/ruby_generated_code_proto2_pb.rb \
-  google/protobuf/compiler/ruby/ruby_generated_pkg_explicit.proto \
-  google/protobuf/compiler/ruby/ruby_generated_pkg_explicit_legacy.proto \
-  google/protobuf/compiler/ruby/ruby_generated_pkg_explicit_legacy_pb.rb \
-  google/protobuf/compiler/ruby/ruby_generated_pkg_explicit_pb.rb \
-  google/protobuf/compiler/ruby/ruby_generated_pkg_implicit.proto \
-  google/protobuf/compiler/ruby/ruby_generated_pkg_implicit_pb.rb \
-  google/protobuf/compiler/zip_output_unittest.sh              \
-  google/protobuf/io/gzip_stream.h                             \
-  google/protobuf/io/gzip_stream_unittest.sh                   \
-  google/protobuf/io/package_info.h                            \
-  google/protobuf/package_info.h                               \
-  google/protobuf/test_messages_proto2.proto                   \
-  google/protobuf/test_messages_proto3.proto                   \
-  google/protobuf/testdata/bad_utf8_string                     \
-  google/protobuf/testdata/golden_message                      \
-  google/protobuf/testdata/golden_message_maps                 \
-  google/protobuf/testdata/golden_message_oneof_implemented    \
-  google/protobuf/testdata/golden_message_proto3               \
-  google/protobuf/testdata/golden_packed_fields_message        \
-  google/protobuf/testdata/map_test_data.txt                   \
-  google/protobuf/testdata/text_format_unittest_data.txt       \
-  google/protobuf/testdata/text_format_unittest_data_oneof_implemented.txt \
-  google/protobuf/testdata/text_format_unittest_data_pointy.txt \
-  google/protobuf/testdata/text_format_unittest_data_pointy_oneof.txt \
-  google/protobuf/testdata/text_format_unittest_extensions_data.txt \
-  google/protobuf/testdata/text_format_unittest_extensions_data_pointy.txt \
-  google/protobuf/util/package_info.h                          \
-  libprotobuf-lite.map                                         \
-  libprotobuf.map                                              \
-  libprotoc.map                                                \
-  solaris/libstdc++.la                                        
-
-protoc_lite_outputs =                                          \
-  google/protobuf/map_lite_unittest.pb.cc                      \
-  google/protobuf/map_lite_unittest.pb.h                       \
-  google/protobuf/unittest_import_lite.pb.cc                   \
-  google/protobuf/unittest_import_lite.pb.h                    \
-  google/protobuf/unittest_import_public_lite.pb.cc            \
-  google/protobuf/unittest_import_public_lite.pb.h             \
-  google/protobuf/unittest_lite.pb.cc                          \
-  google/protobuf/unittest_lite.pb.h
-
-protoc_outputs =                                                  \
-  $(protoc_lite_outputs)                                          \
-  google/protobuf/any_test.pb.cc                                  \
-  google/protobuf/any_test.pb.h                                   \
-  google/protobuf/compiler/cpp/test_bad_identifiers.pb.cc         \
-  google/protobuf/compiler/cpp/test_bad_identifiers.pb.h          \
-  google/protobuf/compiler/cpp/test_large_enum_value.pb.cc        \
-  google/protobuf/compiler/cpp/test_large_enum_value.pb.h         \
-  google/protobuf/map_proto2_unittest.pb.cc                       \
-  google/protobuf/map_proto2_unittest.pb.h                        \
-  google/protobuf/map_unittest.pb.cc                              \
-  google/protobuf/map_unittest.pb.h                               \
-  google/protobuf/unittest.pb.cc                                  \
-  google/protobuf/unittest.pb.h                                   \
-  google/protobuf/unittest_arena.pb.cc                            \
-  google/protobuf/unittest_arena.pb.h                             \
-  google/protobuf/unittest_custom_options.pb.cc                   \
-  google/protobuf/unittest_custom_options.pb.h                    \
-  google/protobuf/unittest_drop_unknown_fields.pb.cc              \
-  google/protobuf/unittest_drop_unknown_fields.pb.h               \
-  google/protobuf/unittest_embed_optimize_for.pb.cc               \
-  google/protobuf/unittest_embed_optimize_for.pb.h                \
-  google/protobuf/unittest_empty.pb.cc                            \
-  google/protobuf/unittest_empty.pb.h                             \
-  google/protobuf/unittest_enormous_descriptor.pb.cc              \
-  google/protobuf/unittest_enormous_descriptor.pb.h               \
-  google/protobuf/unittest_import.pb.cc                           \
-  google/protobuf/unittest_import.pb.h                            \
-  google/protobuf/unittest_import_public.pb.cc                    \
-  google/protobuf/unittest_import_public.pb.h                     \
-  google/protobuf/unittest_lazy_dependencies.pb.cc                \
-  google/protobuf/unittest_lazy_dependencies.pb.h                 \
-  google/protobuf/unittest_lazy_dependencies_custom_option.pb.cc  \
-  google/protobuf/unittest_lazy_dependencies_custom_option.pb.h   \
-  google/protobuf/unittest_lazy_dependencies_enum.pb.cc           \
-  google/protobuf/unittest_lazy_dependencies_enum.pb.h            \
-  google/protobuf/unittest_lite_imports_nonlite.pb.cc             \
-  google/protobuf/unittest_lite_imports_nonlite.pb.h              \
-  google/protobuf/unittest_mset.pb.cc                             \
-  google/protobuf/unittest_mset.pb.h                              \
-  google/protobuf/unittest_mset_wire_format.pb.cc                 \
-  google/protobuf/unittest_mset_wire_format.pb.h                  \
-  google/protobuf/unittest_no_field_presence.pb.cc                \
-  google/protobuf/unittest_no_field_presence.pb.h                 \
-  google/protobuf/unittest_no_generic_services.pb.cc              \
-  google/protobuf/unittest_no_generic_services.pb.h               \
-  google/protobuf/unittest_optimize_for.pb.cc                     \
-  google/protobuf/unittest_optimize_for.pb.h                      \
-  google/protobuf/unittest_preserve_unknown_enum.pb.cc            \
-  google/protobuf/unittest_preserve_unknown_enum.pb.h             \
-  google/protobuf/unittest_preserve_unknown_enum2.pb.cc           \
-  google/protobuf/unittest_preserve_unknown_enum2.pb.h            \
-  google/protobuf/unittest_proto3.pb.cc                           \
-  google/protobuf/unittest_proto3.pb.h                            \
-  google/protobuf/unittest_proto3_arena.pb.cc                     \
-  google/protobuf/unittest_proto3_arena.pb.h                      \
-  google/protobuf/unittest_proto3_arena_lite.pb.cc                \
-  google/protobuf/unittest_proto3_arena_lite.pb.h                 \
-  google/protobuf/unittest_proto3_lite.pb.cc                      \
-  google/protobuf/unittest_proto3_lite.pb.h                       \
-  google/protobuf/unittest_proto3_optional.pb.cc                  \
-  google/protobuf/unittest_proto3_optional.pb.h                   \
-  google/protobuf/unittest_well_known_types.pb.cc                 \
-  google/protobuf/unittest_well_known_types.pb.h                  \
-  google/protobuf/util/internal/testdata/anys.pb.cc               \
-  google/protobuf/util/internal/testdata/anys.pb.h                \
-  google/protobuf/util/internal/testdata/books.pb.cc              \
-  google/protobuf/util/internal/testdata/books.pb.h               \
-  google/protobuf/util/internal/testdata/default_value.pb.cc      \
-  google/protobuf/util/internal/testdata/default_value.pb.h       \
-  google/protobuf/util/internal/testdata/default_value_test.pb.cc \
-  google/protobuf/util/internal/testdata/default_value_test.pb.h  \
-  google/protobuf/util/internal/testdata/field_mask.pb.cc         \
-  google/protobuf/util/internal/testdata/field_mask.pb.h          \
-  google/protobuf/util/internal/testdata/maps.pb.cc               \
-  google/protobuf/util/internal/testdata/maps.pb.h                \
-  google/protobuf/util/internal/testdata/oneofs.pb.cc             \
-  google/protobuf/util/internal/testdata/oneofs.pb.h              \
-  google/protobuf/util/internal/testdata/proto3.pb.cc             \
-  google/protobuf/util/internal/testdata/proto3.pb.h              \
-  google/protobuf/util/internal/testdata/struct.pb.cc             \
-  google/protobuf/util/internal/testdata/struct.pb.h              \
-  google/protobuf/util/internal/testdata/timestamp_duration.pb.cc \
-  google/protobuf/util/internal/testdata/timestamp_duration.pb.h  \
-  google/protobuf/util/internal/testdata/wrappers.pb.cc           \
-  google/protobuf/util/internal/testdata/wrappers.pb.h            \
-  google/protobuf/util/json_format.pb.cc                          \
-  google/protobuf/util/json_format.pb.h                           \
-  google/protobuf/util/json_format_proto3.pb.cc                   \
-  google/protobuf/util/json_format_proto3.pb.h                    \
-  google/protobuf/util/message_differencer_unittest.pb.cc         \
-  google/protobuf/util/message_differencer_unittest.pb.h
-
-if USE_EXTERNAL_PROTOC
-
-unittest_proto_middleman: $(protoc_inputs)
-	$(PROTOC) -I$(srcdir) --cpp_out=. $^
-	touch unittest_proto_middleman
-
-else
-
-# We have to cd to $(srcdir) before executing protoc because $(protoc_inputs) is
-# relative to srcdir, which may not be the same as the current directory when
-# building out-of-tree.
-unittest_proto_middleman: protoc$(EXEEXT) $(protoc_inputs)
-	oldpwd=`pwd` && ( cd $(srcdir) && $$oldpwd/protoc$(EXEEXT) -I. --cpp_out=$$oldpwd $(protoc_inputs) --experimental_allow_proto3_optional )
-	touch unittest_proto_middleman
-
-endif
-
-$(protoc_outputs): unittest_proto_middleman
-
-COMMON_TEST_SOURCES =                                          \
-  $(COMMON_LITE_TEST_SOURCES)                                  \
-  google/protobuf/compiler/cpp/unittest.h                      \
-  google/protobuf/map_test_util.h                              \
-  google/protobuf/map_test_util.inc                            \
-  google/protobuf/reflection_tester.cc                         \
-  google/protobuf/reflection_tester.h                          \
-  google/protobuf/test_util.cc                                 \
-  google/protobuf/test_util.h                                  \
-  google/protobuf/test_util.inc                                \
-  google/protobuf/test_util2.h                                 \
-  google/protobuf/testing/file.cc                              \
-  google/protobuf/testing/file.h                               \
-  google/protobuf/testing/googletest.cc                        \
-  google/protobuf/testing/googletest.h
-
-GOOGLETEST_BUILD_DIR=../third_party/googletest/googletest
-GOOGLEMOCK_BUILD_DIR=../third_party/googletest/googlemock
-GOOGLETEST_SRC_DIR=$(srcdir)/../third_party/googletest/googletest
-GOOGLEMOCK_SRC_DIR=$(srcdir)/../third_party/googletest/googlemock
-check_PROGRAMS = protoc protobuf-test protobuf-lazy-descriptor-test \
-                 protobuf-lite-test test_plugin protobuf-lite-arena-test \
-                 no-warning-test $(GZCHECKPROGRAMS)
-protobuf_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \
-                      $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la     \
-                      $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la     \
-                      $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la
-protobuf_test_CPPFLAGS = -I$(GOOGLETEST_SRC_DIR)/include \
-                         -I$(GOOGLEMOCK_SRC_DIR)/include
-# Disable optimization for tests unless the user explicitly asked for it,
-# since test_util.cc takes forever to compile with optimization (with GCC).
-# See configure.ac for more info.
-protobuf_test_CXXFLAGS = $(NO_OPT_CXXFLAGS)
-protobuf_test_SOURCES =                                        \
-  $(COMMON_TEST_SOURCES)                                       \
-  google/protobuf/any_test.cc                                  \
-  google/protobuf/arena_unittest.cc                            \
-  google/protobuf/arenastring_unittest.cc                      \
-  google/protobuf/arenaz_sampler_test.cc                       \
-  google/protobuf/compiler/annotation_test_util.cc             \
-  google/protobuf/compiler/annotation_test_util.h              \
-  google/protobuf/compiler/command_line_interface_unittest.cc  \
-  google/protobuf/compiler/cpp/bootstrap_unittest.cc           \
-  google/protobuf/compiler/cpp/message_size_unittest.cc        \
-  google/protobuf/compiler/cpp/metadata_test.cc                \
-  google/protobuf/compiler/cpp/move_unittest.cc                \
-  google/protobuf/compiler/cpp/plugin_unittest.cc              \
-  google/protobuf/compiler/cpp/unittest.cc                     \
-  google/protobuf/compiler/cpp/unittest.inc                    \
-  google/protobuf/compiler/csharp/csharp_bootstrap_unittest.cc \
-  google/protobuf/compiler/csharp/csharp_generator_unittest.cc \
-  google/protobuf/compiler/importer_unittest.cc                \
-  google/protobuf/compiler/java/doc_comment_unittest.cc        \
-  google/protobuf/compiler/java/plugin_unittest.cc             \
-  google/protobuf/compiler/mock_code_generator.cc              \
-  google/protobuf/compiler/mock_code_generator.h               \
-  google/protobuf/compiler/objectivec/objectivec_helpers_unittest.cc \
-  google/protobuf/compiler/parser_unittest.cc                  \
-  google/protobuf/compiler/python/plugin_unittest.cc           \
-  google/protobuf/compiler/ruby/ruby_generator_unittest.cc     \
-  google/protobuf/descriptor_database_unittest.cc              \
-  google/protobuf/descriptor_unittest.cc                       \
-  google/protobuf/drop_unknown_fields_test.cc                  \
-  google/protobuf/dynamic_message_unittest.cc                  \
-  google/protobuf/extension_set_unittest.cc                    \
-  google/protobuf/generated_message_reflection_unittest.cc     \
-  google/protobuf/generated_message_tctable_lite_test.cc       \
-  google/protobuf/inlined_string_field_unittest.cc             \
-  google/protobuf/io/coded_stream_unittest.cc                  \
-  google/protobuf/io/io_win32_unittest.cc                      \
-  google/protobuf/io/printer_unittest.cc                       \
-  google/protobuf/io/tokenizer_unittest.cc                     \
-  google/protobuf/io/zero_copy_stream_unittest.cc              \
-  google/protobuf/map_field_test.cc                            \
-  google/protobuf/map_test.cc                                  \
-  google/protobuf/map_test.inc                                 \
-  google/protobuf/message_unittest.cc                          \
-  google/protobuf/message_unittest.inc                         \
-  google/protobuf/no_field_presence_test.cc                    \
-  google/protobuf/preserve_unknown_enum_test.cc                \
-  google/protobuf/proto3_arena_lite_unittest.cc                \
-  google/protobuf/proto3_arena_unittest.cc                     \
-  google/protobuf/proto3_lite_unittest.cc                      \
-  google/protobuf/proto3_lite_unittest.inc                     \
-  google/protobuf/reflection_ops_unittest.cc                   \
-  google/protobuf/repeated_field_reflection_unittest.cc        \
-  google/protobuf/repeated_field_unittest.cc                   \
-  google/protobuf/stubs/bytestream_unittest.cc                 \
-  google/protobuf/stubs/common_unittest.cc                     \
-  google/protobuf/stubs/int128_unittest.cc                     \
-  google/protobuf/stubs/status_test.cc                         \
-  google/protobuf/stubs/statusor_test.cc                       \
-  google/protobuf/stubs/stringpiece_unittest.cc                \
-  google/protobuf/stubs/stringprintf_unittest.cc               \
-  google/protobuf/stubs/structurally_valid_unittest.cc         \
-  google/protobuf/stubs/strutil_unittest.cc                    \
-  google/protobuf/stubs/template_util_unittest.cc              \
-  google/protobuf/stubs/time_test.cc                           \
-  google/protobuf/text_format_unittest.cc                      \
-  google/protobuf/unknown_field_set_unittest.cc                \
-  google/protobuf/util/delimited_message_util_test.cc          \
-  google/protobuf/util/field_comparator_test.cc                \
-  google/protobuf/util/field_mask_util_test.cc                 \
-  google/protobuf/util/internal/default_value_objectwriter_test.cc \
-  google/protobuf/util/internal/json_objectwriter_test.cc      \
-  google/protobuf/util/internal/json_stream_parser_test.cc     \
-  google/protobuf/util/internal/protostream_objectsource_test.cc \
-  google/protobuf/util/internal/protostream_objectwriter_test.cc \
-  google/protobuf/util/internal/type_info_test_helper.cc       \
-  google/protobuf/util/json_util_test.cc                       \
-  google/protobuf/util/message_differencer_unittest.cc         \
-  google/protobuf/util/time_util_test.cc                       \
-  google/protobuf/util/type_resolver_util_test.cc              \
-  google/protobuf/well_known_types_unittest.cc                 \
-  google/protobuf/wire_format_unittest.cc                      \
-  google/protobuf/wire_format_unittest.inc
-
-nodist_protobuf_test_SOURCES = $(protoc_outputs)
-$(am_protobuf_test_OBJECTS): unittest_proto_middleman
-
-# Run cpp_unittest again with PROTOBUF_TEST_NO_DESCRIPTORS defined.
-protobuf_lazy_descriptor_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la \
-                      libprotoc.la                                   \
-                      $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la        \
-                      $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la        \
-                      $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la
-protobuf_lazy_descriptor_test_CPPFLAGS = -I$(GOOGLEMOCK_SRC_DIR)/include \
-                                         -I$(GOOGLETEST_SRC_DIR)/include \
-                                         -DPROTOBUF_TEST_NO_DESCRIPTORS
-protobuf_lazy_descriptor_test_CXXFLAGS = $(NO_OPT_CXXFLAGS)
-protobuf_lazy_descriptor_test_SOURCES =                        \
-  google/protobuf/compiler/cpp/unittest.cc                     \
-  $(COMMON_TEST_SOURCES)
-nodist_protobuf_lazy_descriptor_test_SOURCES = $(protoc_outputs)
-$(am_protobuf_lazy_descriptor_test_OBJECTS): unittest_proto_middleman
-
-COMMON_LITE_TEST_SOURCES =                                             \
-  google/protobuf/arena_test_util.cc                                   \
-  google/protobuf/arena_test_util.h                                    \
-  google/protobuf/map_lite_test_util.cc                                \
-  google/protobuf/map_lite_test_util.h                                 \
-  google/protobuf/map_test_util_impl.h                                 \
-  google/protobuf/test_util_lite.cc                                    \
-  google/protobuf/test_util_lite.h
-
-# Build lite_unittest separately, since it doesn't use gtest. It can't
-# depend on gtest because our internal version of gtest depend on proto
-# full runtime and we want to make sure this test builds without full
-# runtime.
-protobuf_lite_test_LDADD = $(PTHREAD_LIBS) libprotobuf-lite.la     \
-                           $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la \
-                           $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la \
-                           $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la
-protobuf_lite_test_CPPFLAGS= -I$(GOOGLEMOCK_SRC_DIR)/include \
-                             -I$(GOOGLETEST_SRC_DIR)/include
-protobuf_lite_test_CXXFLAGS = $(NO_OPT_CXXFLAGS)
-protobuf_lite_test_SOURCES =                                           \
-  google/protobuf/lite_unittest.cc                                     \
-  $(COMMON_LITE_TEST_SOURCES)
-nodist_protobuf_lite_test_SOURCES = $(protoc_lite_outputs)
-$(am_protobuf_lite_test_OBJECTS): unittest_proto_middleman
-
-# lite_arena_unittest depends on gtest because teboring@ found that without
-# gtest when building the test internally our memory sanitizer doesn't detect
-# memory leaks (don't know why).
-protobuf_lite_arena_test_LDADD = $(PTHREAD_LIBS) libprotobuf-lite.la \
-                      $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la        \
-                      $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock.la        \
-                      $(GOOGLEMOCK_BUILD_DIR)/lib/libgmock_main.la
-protobuf_lite_arena_test_CPPFLAGS = -I$(GOOGLEMOCK_SRC_DIR)/include  \
-                                    -I$(GOOGLETEST_SRC_DIR)/include
-protobuf_lite_arena_test_CXXFLAGS = $(NO_OPT_CXXFLAGS)
-protobuf_lite_arena_test_SOURCES =       \
-  google/protobuf/lite_arena_unittest.cc \
-  $(COMMON_LITE_TEST_SOURCES)
-nodist_protobuf_lite_arena_test_SOURCES = $(protoc_lite_outputs)
-$(am_protobuf_lite_arena_test_OBJECTS): unittest_proto_middleman
-
-# Test plugin binary.
-test_plugin_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la \
-                    $(GOOGLETEST_BUILD_DIR)/lib/libgtest.la
-test_plugin_CPPFLAGS = -I$(GOOGLETEST_SRC_DIR)/include
-test_plugin_SOURCES =                                          \
-  google/protobuf/compiler/mock_code_generator.cc              \
-  google/protobuf/compiler/test_plugin.cc                      \
-  google/protobuf/testing/file.cc                              \
-  google/protobuf/testing/file.h
-
-if HAVE_ZLIB
-zcgzip_LDADD = $(PTHREAD_LIBS) libprotobuf.la
-zcgzip_SOURCES = google/protobuf/testing/zcgzip.cc
-
-zcgunzip_LDADD = $(PTHREAD_LIBS) libprotobuf.la
-zcgunzip_SOURCES = google/protobuf/testing/zcgunzip.cc
-endif
-
-# This test target is to ensure all our public header files and generated
-# code is free from warnings. We have to be more pedantic about these
-# files because they are compiled by users with different compiler flags.
-no_warning_test.cc:
-	echo "// Generated from Makefile.am" > no_warning_test.cc
-	for FILE in $(nobase_include_HEADERS); do \
-		case $$FILE in *.inc) continue;; esac; \
-		echo "#include <$${FILE}>" >> no_warning_test.cc; \
-	done
-	echo "int main(int, char**) { return 0; }" >> no_warning_test.cc
-
-no_warning_test_LDADD = $(PTHREAD_LIBS) libprotobuf.la libprotoc.la
-no_warning_test_CXXFLAGS = $(PTHREAD_CFLAGS) $(PTHREAD_DEF) $(ZLIB_DEF) \
-                           -Wall -Wextra -Werror -Wno-unused-parameter
-nodist_no_warning_test_SOURCES = no_warning_test.cc $(protoc_outputs)
-
-TESTS = protobuf-test protobuf-lazy-descriptor-test protobuf-lite-test \
-        google/protobuf/compiler/zip_output_unittest.sh $(GZTESTS)     \
-        protobuf-lite-arena-test no-warning-test
diff --git a/libs/protobuf/src/README.md b/libs/protobuf/src/README.md
deleted file mode 100644
index cf843d7..0000000
--- a/libs/protobuf/src/README.md
+++ /dev/null
@@ -1,234 +0,0 @@
-Protocol Buffers - Google's data interchange format
-===================================================
-
-Copyright 2008 Google Inc.
-
-https://developers.google.com/protocol-buffers/
-
-C++ Installation - Unix
------------------------
-
-To build protobuf from source, the following tools are needed:
-
-  * autoconf
-  * automake
-  * libtool
-  * make
-  * g++
-  * unzip
-
-On Ubuntu/Debian, you can install them with:
-
-    sudo apt-get install autoconf automake libtool curl make g++ unzip
-
-On other platforms, please use the corresponding package managing tool to
-install them before proceeding.
-
-To get the source, download one of the release .tar.gz or .zip packages in the
-release page:
-
-    https://github.com/protocolbuffers/protobuf/releases/latest
-
-For example: if you only need C++, download `protobuf-cpp-[VERSION].tar.gz`; if
-you need C++ and Java, download `protobuf-java-[VERSION].tar.gz` (every package
-contains C++ source already); if you need C++ and multiple other languages,
-download `protobuf-all-[VERSION].tar.gz`.
-
-You can also get the source by "git clone" our git repository. Make sure you
-have also cloned the submodules and generated the configure script (skip this
-if you are using a release .tar.gz or .zip package):
-
-    git clone https://github.com/protocolbuffers/protobuf.git
-    cd protobuf
-    git submodule update --init --recursive
-    ./autogen.sh
-
-To build and install the C++ Protocol Buffer runtime and the Protocol
-Buffer compiler (protoc) execute the following:
-
-
-     ./configure
-     make -j$(nproc) # $(nproc) ensures it uses all cores for compilation
-     make check
-     sudo make install
-     sudo ldconfig # refresh shared library cache.
-
-If "make check" fails, you can still install, but it is likely that
-some features of this library will not work correctly on your system.
-Proceed at your own risk.
-
-For advanced usage information on configure and make, please refer to the
-autoconf documentation:
-
-    http://www.gnu.org/software/autoconf/manual/autoconf.html#Running-configure-Scripts
-
-**Hint on install location**
-
-By default, the package will be installed to /usr/local.  However,
-on many platforms, /usr/local/lib is not part of LD_LIBRARY_PATH.
-You can add it, but it may be easier to just install to /usr
-instead.  To do this, invoke configure as follows:
-
-    ./configure --prefix=/usr
-
-If you already built the package with a different prefix, make sure
-to run "make clean" before building again.
-
-**Compiling dependent packages**
-
-To compile a package that uses Protocol Buffers, you need to pass
-various flags to your compiler and linker.  As of version 2.2.0,
-Protocol Buffers integrates with pkg-config to manage this.  If you
-have pkg-config installed, then you can invoke it to get a list of
-flags like so:
-
-
-    pkg-config --cflags protobuf         # print compiler flags
-    pkg-config --libs protobuf           # print linker flags
-    pkg-config --cflags --libs protobuf  # print both
-
-
-For example:
-
-    c++ my_program.cc my_proto.pb.cc `pkg-config --cflags --libs protobuf`
-
-Note that packages written prior to the 2.2.0 release of Protocol
-Buffers may not yet integrate with pkg-config to get flags, and may
-not pass the correct set of flags to correctly link against
-libprotobuf.  If the package in question uses autoconf, you can
-often fix the problem by invoking its configure script like:
-
-
-    configure CXXFLAGS="$(pkg-config --cflags protobuf)" \
-              LIBS="$(pkg-config --libs protobuf)"
-
-This will force it to use the correct flags.
-
-If you are writing an autoconf-based package that uses Protocol
-Buffers, you should probably use the PKG_CHECK_MODULES macro in your
-configure script like:
-
-    PKG_CHECK_MODULES([protobuf], [protobuf])
-
-See the pkg-config man page for more info.
-
-If you only want protobuf-lite, substitute "protobuf-lite" in place
-of "protobuf" in these examples.
-
-**Note for Mac users**
-
-For a Mac system, Unix tools are not available by default. You will first need
-to install Xcode from the Mac AppStore and then run the following command from
-a terminal:
-
-    sudo xcode-select --install
-
-To install Unix tools, you can install "port" following the instructions at
-https://www.macports.org . This will reside in /opt/local/bin/port for most
-Mac installations.
-
-    sudo /opt/local/bin/port install autoconf automake libtool
-
-Alternative for Homebrew users:
-
-    brew install autoconf automake libtool
-
-Then follow the Unix instructions above.
-
-**Note for cross-compiling**
-
-The makefiles normally invoke the protoc executable that they just
-built in order to build tests.  When cross-compiling, the protoc
-executable may not be executable on the host machine.  In this case,
-you must build a copy of protoc for the host machine first, then use
-the --with-protoc option to tell configure to use it instead.  For
-example:
-
-    ./configure --with-protoc=protoc
-
-This will use the installed protoc (found in your $PATH) instead of
-trying to execute the one built during the build process.  You can
-also use an executable that hasn't been installed.  For example, if
-you built the protobuf package for your host machine in ../host,
-you might do:
-
-    ./configure --with-protoc=../host/src/protoc
-
-Either way, you must make sure that the protoc executable you use
-has the same version as the protobuf source code you are trying to
-use it with.
-
-**Note for Solaris users**
-
-Solaris 10 x86 has a bug that will make linking fail, complaining
-about libstdc++.la being invalid.  We have included a work-around
-in this package.  To use the work-around, run configure as follows:
-
-    ./configure LDFLAGS=-L$PWD/src/solaris
-
-See src/solaris/libstdc++.la for more info on this bug.
-
-**Note for HP C++ Tru64 users**
-
-To compile invoke configure as follows:
-
-    ./configure CXXFLAGS="-O -std ansi -ieee -D__USE_STD_IOSTREAM"
-
-Also, you will need to use gmake instead of make.
-
-**Note for AIX users**
-
-Compile using the IBM xlC C++ compiler as follows:
-
-    ./configure CXX=xlC
-
-Also, you will need to use GNU `make` (`gmake`) instead of AIX `make`.
-
-C++ Installation - Windows
---------------------------
-
-If you only need the protoc binary, you can download it from the release
-page:
-
-    https://github.com/protocolbuffers/protobuf/releases/latest
-
-In the downloads section, download the zip file protoc-$VERSION-win32.zip.
-It contains the protoc binary as well as public proto files of protobuf
-library.
-
-Protobuf and its dependencies can be installed directly by using `vcpkg`:
-
-    >vcpkg install protobuf protobuf:x64-windows
-
-If zlib support is desired, you'll also need to install the zlib feature:
-
-    >vcpkg install protobuf[zlib] protobuf[zlib]:x64-windows
-
-See https://github.com/Microsoft/vcpkg for more information.
-
-To build from source using Microsoft Visual C++, see [cmake/README.md](../cmake/README.md).
-
-To build from source using Cygwin or MinGW, follow the Unix installation
-instructions, above.
-
-Binary Compatibility Warning
-----------------------------
-
-Due to the nature of C++, it is unlikely that any two versions of the
-Protocol Buffers C++ runtime libraries will have compatible ABIs.
-That is, if you linked an executable against an older version of
-libprotobuf, it is unlikely to work with a newer version without
-re-compiling.  This problem, when it occurs, will normally be detected
-immediately on startup of your app.  Still, you may want to consider
-using static linkage.  You can configure this package to install
-static libraries only using:
-
-    ./configure --disable-shared
-
-Usage
------
-
-The complete documentation for Protocol Buffers is available via the
-web at:
-
-https://developers.google.com/protocol-buffers/
diff --git a/libs/protobuf/src/google/protobuf/any.cc b/libs/protobuf/src/google/protobuf/any.cc
deleted file mode 100644
index 346fa19..0000000
--- a/libs/protobuf/src/google/protobuf/any.cc
+++ /dev/null
@@ -1,82 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <google/protobuf/any.h>
-
-#include <google/protobuf/arenastring.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/generated_message_util.h>
-#include <google/protobuf/message.h>
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-namespace internal {
-
-bool AnyMetadata::PackFrom(Arena* arena, const Message& message) {
-  return PackFrom(arena, message, kTypeGoogleApisComPrefix);
-}
-
-bool AnyMetadata::PackFrom(Arena* arena, const Message& message,
-                           StringPiece type_url_prefix) {
-  type_url_->Set(
-      GetTypeUrl(message.GetDescriptor()->full_name(), type_url_prefix), arena);
-  return message.SerializeToString(value_->Mutable(arena));
-}
-
-bool AnyMetadata::UnpackTo(Message* message) const {
-  if (!InternalIs(message->GetDescriptor()->full_name())) {
-    return false;
-  }
-  return message->ParseFromString(value_->Get());
-}
-
-bool GetAnyFieldDescriptors(const Message& message,
-                            const FieldDescriptor** type_url_field,
-                            const FieldDescriptor** value_field) {
-  const Descriptor* descriptor = message.GetDescriptor();
-  if (descriptor->full_name() != kAnyFullTypeName) {
-    return false;
-  }
-  *type_url_field = descriptor->FindFieldByNumber(1);
-  *value_field = descriptor->FindFieldByNumber(2);
-  return (*type_url_field != nullptr &&
-          (*type_url_field)->type() == FieldDescriptor::TYPE_STRING &&
-          *value_field != nullptr &&
-          (*value_field)->type() == FieldDescriptor::TYPE_BYTES);
-}
-
-}  // namespace internal
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
diff --git a/libs/protobuf/src/google/protobuf/any.h b/libs/protobuf/src/google/protobuf/any.h
deleted file mode 100644
index 92ea2bb..0000000
--- a/libs/protobuf/src/google/protobuf/any.h
+++ /dev/null
@@ -1,157 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef GOOGLE_PROTOBUF_ANY_H__
-#define GOOGLE_PROTOBUF_ANY_H__
-
-#include <string>
-
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/arenastring.h>
-#include <google/protobuf/message_lite.h>
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-
-class FieldDescriptor;
-class Message;
-
-namespace internal {
-
-extern const char kAnyFullTypeName[];          // "google.protobuf.Any".
-extern const char kTypeGoogleApisComPrefix[];  // "type.googleapis.com/".
-extern const char kTypeGoogleProdComPrefix[];  // "type.googleprod.com/".
-
-std::string GetTypeUrl(StringPiece message_name,
-                       StringPiece type_url_prefix);
-
-// Helper class used to implement google::protobuf::Any.
-class PROTOBUF_EXPORT AnyMetadata {
-  typedef ArenaStringPtr UrlType;
-  typedef ArenaStringPtr ValueType;
- public:
-  // AnyMetadata does not take ownership of "type_url" and "value".
-  constexpr AnyMetadata(UrlType* type_url, ValueType* value)
-      : type_url_(type_url), value_(value) {}
-
-  // Packs a message using the default type URL prefix: "type.googleapis.com".
-  // The resulted type URL will be "type.googleapis.com/<message_full_name>".
-  // Returns false if serializing the message failed.
-  template <typename T>
-  bool PackFrom(Arena* arena, const T& message) {
-    return InternalPackFrom(arena, message, kTypeGoogleApisComPrefix,
-                            T::FullMessageName());
-  }
-
-  bool PackFrom(Arena* arena, const Message& message);
-
-  // Packs a message using the given type URL prefix. The type URL will be
-  // constructed by concatenating the message type's full name to the prefix
-  // with an optional "/" separator if the prefix doesn't already end with "/".
-  // For example, both PackFrom(message, "type.googleapis.com") and
-  // PackFrom(message, "type.googleapis.com/") yield the same result type
-  // URL: "type.googleapis.com/<message_full_name>".
-  // Returns false if serializing the message failed.
-  template <typename T>
-  bool PackFrom(Arena* arena, const T& message,
-                StringPiece type_url_prefix) {
-    return InternalPackFrom(arena, message, type_url_prefix,
-                            T::FullMessageName());
-  }
-
-  bool PackFrom(Arena* arena, const Message& message,
-                StringPiece type_url_prefix);
-
-  // Unpacks the payload into the given message. Returns false if the message's
-  // type doesn't match the type specified in the type URL (i.e., the full
-  // name after the last "/" of the type URL doesn't match the message's actual
-  // full name) or parsing the payload has failed.
-  template <typename T>
-  bool UnpackTo(T* message) const {
-    return InternalUnpackTo(T::FullMessageName(), message);
-  }
-
-  bool UnpackTo(Message* message) const;
-
-  // Checks whether the type specified in the type URL matches the given type.
-  // A type is considered matching if its full name matches the full name after
-  // the last "/" in the type URL.
-  template <typename T>
-  bool Is() const {
-    return InternalIs(T::FullMessageName());
-  }
-
- private:
-  bool InternalPackFrom(Arena* arena, const MessageLite& message,
-                        StringPiece type_url_prefix,
-                        StringPiece type_name);
-  bool InternalUnpackTo(StringPiece type_name,
-                        MessageLite* message) const;
-  bool InternalIs(StringPiece type_name) const;
-
-  UrlType* type_url_;
-  ValueType* value_;
-
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(AnyMetadata);
-};
-
-// Get the proto type name from Any::type_url value. For example, passing
-// "type.googleapis.com/rpc.QueryOrigin" will return "rpc.QueryOrigin" in
-// *full_type_name. Returns false if the type_url does not have a "/"
-// in the type url separating the full type name.
-//
-// NOTE: this function is available publicly as a static method on the
-// generated message type: google::protobuf::Any::ParseAnyTypeUrl()
-bool ParseAnyTypeUrl(StringPiece type_url, std::string* full_type_name);
-
-// Get the proto type name and prefix from Any::type_url value. For example,
-// passing "type.googleapis.com/rpc.QueryOrigin" will return
-// "type.googleapis.com/" in *url_prefix and "rpc.QueryOrigin" in
-// *full_type_name. Returns false if the type_url does not have a "/" in the
-// type url separating the full type name.
-bool ParseAnyTypeUrl(StringPiece type_url, std::string* url_prefix,
-                     std::string* full_type_name);
-
-// See if message is of type google.protobuf.Any, if so, return the descriptors
-// for "type_url" and "value" fields.
-bool GetAnyFieldDescriptors(const Message& message,
-                            const FieldDescriptor** type_url_field,
-                            const FieldDescriptor** value_field);
-
-}  // namespace internal
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
-
-#endif  // GOOGLE_PROTOBUF_ANY_H__
diff --git a/libs/protobuf/src/google/protobuf/any.pb.cc b/libs/protobuf/src/google/protobuf/any.pb.cc
deleted file mode 100644
index c02f9eb..0000000
--- a/libs/protobuf/src/google/protobuf/any.pb.cc
+++ /dev/null
@@ -1,368 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/protobuf/any.proto
-
-#include <google/protobuf/any.pb.h>
-
-#include <algorithm>
-
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/extension_set.h>
-#include <google/protobuf/wire_format_lite.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/generated_message_reflection.h>
-#include <google/protobuf/reflection_ops.h>
-#include <google/protobuf/wire_format.h>
-// @@protoc_insertion_point(includes)
-#include <google/protobuf/port_def.inc>
-
-PROTOBUF_PRAGMA_INIT_SEG
-
-namespace _pb = ::PROTOBUF_NAMESPACE_ID;
-namespace _pbi = _pb::internal;
-
-#if defined(__llvm__)
-  #pragma clang diagnostic push
-  #pragma clang diagnostic ignored "-Wuninitialized"
-#endif  // __llvm__
-PROTOBUF_NAMESPACE_OPEN
-PROTOBUF_CONSTEXPR Any::Any(
-    ::_pbi::ConstantInitialized): _impl_{
-    /*decltype(_impl_.type_url_)*/{&::_pbi::fixed_address_empty_string, ::_pbi::ConstantInitialized{}}
-  , /*decltype(_impl_.value_)*/{&::_pbi::fixed_address_empty_string, ::_pbi::ConstantInitialized{}}
-  , /*decltype(_impl_._cached_size_)*/{}
-  , /*decltype(_impl_._any_metadata_)*/{&_impl_.type_url_, &_impl_.value_}} {}
-struct AnyDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR AnyDefaultTypeInternal()
-      : _instance(::_pbi::ConstantInitialized{}) {}
-  ~AnyDefaultTypeInternal() {}
-  union {
-    Any _instance;
-  };
-};
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 AnyDefaultTypeInternal _Any_default_instance_;
-PROTOBUF_NAMESPACE_CLOSE
-static ::_pb::Metadata file_level_metadata_google_2fprotobuf_2fany_2eproto[1];
-static constexpr ::_pb::EnumDescriptor const** file_level_enum_descriptors_google_2fprotobuf_2fany_2eproto = nullptr;
-static constexpr ::_pb::ServiceDescriptor const** file_level_service_descriptors_google_2fprotobuf_2fany_2eproto = nullptr;
-
-const uint32_t TableStruct_google_2fprotobuf_2fany_2eproto::offsets[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = {
-  ~0u,  // no _has_bits_
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Any, _internal_metadata_),
-  ~0u,  // no _extensions_
-  ~0u,  // no _oneof_case_
-  ~0u,  // no _weak_field_map_
-  ~0u,  // no _inlined_string_donated_
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Any, _impl_.type_url_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Any, _impl_.value_),
-};
-static const ::_pbi::MigrationSchema schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = {
-  { 0, -1, -1, sizeof(::PROTOBUF_NAMESPACE_ID::Any)},
-};
-
-static const ::_pb::Message* const file_default_instances[] = {
-  &::PROTOBUF_NAMESPACE_ID::_Any_default_instance_._instance,
-};
-
-const char descriptor_table_protodef_google_2fprotobuf_2fany_2eproto[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) =
-  "\n\031google/protobuf/any.proto\022\017google.prot"
-  "obuf\"&\n\003Any\022\020\n\010type_url\030\001 \001(\t\022\r\n\005value\030\002"
-  " \001(\014Bv\n\023com.google.protobufB\010AnyProtoP\001Z"
-  ",google.golang.org/protobuf/types/known/"
-  "anypb\242\002\003GPB\252\002\036Google.Protobuf.WellKnownT"
-  "ypesb\006proto3"
-  ;
-static ::_pbi::once_flag descriptor_table_google_2fprotobuf_2fany_2eproto_once;
-const ::_pbi::DescriptorTable descriptor_table_google_2fprotobuf_2fany_2eproto = {
-    false, false, 212, descriptor_table_protodef_google_2fprotobuf_2fany_2eproto,
-    "google/protobuf/any.proto",
-    &descriptor_table_google_2fprotobuf_2fany_2eproto_once, nullptr, 0, 1,
-    schemas, file_default_instances, TableStruct_google_2fprotobuf_2fany_2eproto::offsets,
-    file_level_metadata_google_2fprotobuf_2fany_2eproto, file_level_enum_descriptors_google_2fprotobuf_2fany_2eproto,
-    file_level_service_descriptors_google_2fprotobuf_2fany_2eproto,
-};
-PROTOBUF_ATTRIBUTE_WEAK const ::_pbi::DescriptorTable* descriptor_table_google_2fprotobuf_2fany_2eproto_getter() {
-  return &descriptor_table_google_2fprotobuf_2fany_2eproto;
-}
-
-// Force running AddDescriptors() at dynamic initialization time.
-PROTOBUF_ATTRIBUTE_INIT_PRIORITY2 static ::_pbi::AddDescriptorsRunner dynamic_init_dummy_google_2fprotobuf_2fany_2eproto(&descriptor_table_google_2fprotobuf_2fany_2eproto);
-PROTOBUF_NAMESPACE_OPEN
-
-// ===================================================================
-
-bool Any::GetAnyFieldDescriptors(
-    const ::PROTOBUF_NAMESPACE_ID::Message& message,
-    const ::PROTOBUF_NAMESPACE_ID::FieldDescriptor** type_url_field,
-    const ::PROTOBUF_NAMESPACE_ID::FieldDescriptor** value_field) {
-  return ::_pbi::GetAnyFieldDescriptors(
-      message, type_url_field, value_field);
-}
-bool Any::ParseAnyTypeUrl(
-    ::PROTOBUF_NAMESPACE_ID::ConstStringParam type_url,
-    std::string* full_type_name) {
-  return ::_pbi::ParseAnyTypeUrl(type_url, full_type_name);
-}
-
-class Any::_Internal {
- public:
-};
-
-Any::Any(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                         bool is_message_owned)
-  : ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned) {
-  SharedCtor(arena, is_message_owned);
-  // @@protoc_insertion_point(arena_constructor:google.protobuf.Any)
-}
-Any::Any(const Any& from)
-  : ::PROTOBUF_NAMESPACE_ID::Message() {
-  Any* const _this = this; (void)_this;
-  new (&_impl_) Impl_{
-      decltype(_impl_.type_url_){}
-    , decltype(_impl_.value_){}
-    , /*decltype(_impl_._cached_size_)*/{}
-    , /*decltype(_impl_._any_metadata_)*/{&_impl_.type_url_, &_impl_.value_}};
-
-  _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-  _impl_.type_url_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.type_url_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (!from._internal_type_url().empty()) {
-    _this->_impl_.type_url_.Set(from._internal_type_url(), 
-      _this->GetArenaForAllocation());
-  }
-  _impl_.value_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.value_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (!from._internal_value().empty()) {
-    _this->_impl_.value_.Set(from._internal_value(), 
-      _this->GetArenaForAllocation());
-  }
-  // @@protoc_insertion_point(copy_constructor:google.protobuf.Any)
-}
-
-inline void Any::SharedCtor(
-    ::_pb::Arena* arena, bool is_message_owned) {
-  (void)arena;
-  (void)is_message_owned;
-  new (&_impl_) Impl_{
-      decltype(_impl_.type_url_){}
-    , decltype(_impl_.value_){}
-    , /*decltype(_impl_._cached_size_)*/{}
-    , /*decltype(_impl_._any_metadata_)*/{&_impl_.type_url_, &_impl_.value_}
-  };
-  _impl_.type_url_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.type_url_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  _impl_.value_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.value_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-}
-
-Any::~Any() {
-  // @@protoc_insertion_point(destructor:google.protobuf.Any)
-  if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) {
-  (void)arena;
-    return;
-  }
-  SharedDtor();
-}
-
-inline void Any::SharedDtor() {
-  GOOGLE_DCHECK(GetArenaForAllocation() == nullptr);
-  _impl_.type_url_.Destroy();
-  _impl_.value_.Destroy();
-  _impl_._any_metadata_.~AnyMetadata();
-}
-
-void Any::SetCachedSize(int size) const {
-  _impl_._cached_size_.Set(size);
-}
-
-void Any::Clear() {
-// @@protoc_insertion_point(message_clear_start:google.protobuf.Any)
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.type_url_.ClearToEmpty();
-  _impl_.value_.ClearToEmpty();
-  _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>();
-}
-
-const char* Any::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) {
-#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure
-  while (!ctx->Done(&ptr)) {
-    uint32_t tag;
-    ptr = ::_pbi::ReadTag(ptr, &tag);
-    switch (tag >> 3) {
-      // string type_url = 1;
-      case 1:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 10)) {
-          auto str = _internal_mutable_type_url();
-          ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx);
-          CHK_(ptr);
-          CHK_(::_pbi::VerifyUTF8(str, "google.protobuf.Any.type_url"));
-        } else
-          goto handle_unusual;
-        continue;
-      // bytes value = 2;
-      case 2:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 18)) {
-          auto str = _internal_mutable_value();
-          ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx);
-          CHK_(ptr);
-        } else
-          goto handle_unusual;
-        continue;
-      default:
-        goto handle_unusual;
-    }  // switch
-  handle_unusual:
-    if ((tag == 0) || ((tag & 7) == 4)) {
-      CHK_(ptr);
-      ctx->SetLastTag(tag);
-      goto message_done;
-    }
-    ptr = UnknownFieldParse(
-        tag,
-        _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(),
-        ptr, ctx);
-    CHK_(ptr != nullptr);
-  }  // while
-message_done:
-  return ptr;
-failure:
-  ptr = nullptr;
-  goto message_done;
-#undef CHK_
-}
-
-uint8_t* Any::_InternalSerialize(
-    uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.Any)
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  // string type_url = 1;
-  if (!this->_internal_type_url().empty()) {
-    ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String(
-      this->_internal_type_url().data(), static_cast<int>(this->_internal_type_url().length()),
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE,
-      "google.protobuf.Any.type_url");
-    target = stream->WriteStringMaybeAliased(
-        1, this->_internal_type_url(), target);
-  }
-
-  // bytes value = 2;
-  if (!this->_internal_value().empty()) {
-    target = stream->WriteBytesMaybeAliased(
-        2, this->_internal_value(), target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-        _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.Any)
-  return target;
-}
-
-size_t Any::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:google.protobuf.Any)
-  size_t total_size = 0;
-
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // string type_url = 1;
-  if (!this->_internal_type_url().empty()) {
-    total_size += 1 +
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize(
-        this->_internal_type_url());
-  }
-
-  // bytes value = 2;
-  if (!this->_internal_value().empty()) {
-    total_size += 1 +
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::BytesSize(
-        this->_internal_value());
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData Any::_class_data_ = {
-    ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck,
-    Any::MergeImpl
-};
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*Any::GetClassData() const { return &_class_data_; }
-
-
-void Any::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) {
-  auto* const _this = static_cast<Any*>(&to_msg);
-  auto& from = static_cast<const Any&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.Any)
-  GOOGLE_DCHECK_NE(&from, _this);
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if (!from._internal_type_url().empty()) {
-    _this->_internal_set_type_url(from._internal_type_url());
-  }
-  if (!from._internal_value().empty()) {
-    _this->_internal_set_value(from._internal_value());
-  }
-  _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void Any::CopyFrom(const Any& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.Any)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool Any::IsInitialized() const {
-  return true;
-}
-
-void Any::InternalSwap(Any* other) {
-  using std::swap;
-  auto* lhs_arena = GetArenaForAllocation();
-  auto* rhs_arena = other->GetArenaForAllocation();
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::InternalSwap(
-      &_impl_.type_url_, lhs_arena,
-      &other->_impl_.type_url_, rhs_arena
-  );
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::InternalSwap(
-      &_impl_.value_, lhs_arena,
-      &other->_impl_.value_, rhs_arena
-  );
-}
-
-::PROTOBUF_NAMESPACE_ID::Metadata Any::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_google_2fprotobuf_2fany_2eproto_getter, &descriptor_table_google_2fprotobuf_2fany_2eproto_once,
-      file_level_metadata_google_2fprotobuf_2fany_2eproto[0]);
-}
-
-// @@protoc_insertion_point(namespace_scope)
-PROTOBUF_NAMESPACE_CLOSE
-PROTOBUF_NAMESPACE_OPEN
-template<> PROTOBUF_NOINLINE ::PROTOBUF_NAMESPACE_ID::Any*
-Arena::CreateMaybeMessage< ::PROTOBUF_NAMESPACE_ID::Any >(Arena* arena) {
-  return Arena::CreateMessageInternal< ::PROTOBUF_NAMESPACE_ID::Any >(arena);
-}
-PROTOBUF_NAMESPACE_CLOSE
-
-// @@protoc_insertion_point(global_scope)
-#if defined(__llvm__)
-  #pragma clang diagnostic pop
-#endif  // __llvm__
-#include <google/protobuf/port_undef.inc>
diff --git a/libs/protobuf/src/google/protobuf/any.pb.h b/libs/protobuf/src/google/protobuf/any.pb.h
deleted file mode 100644
index 2c06052..0000000
--- a/libs/protobuf/src/google/protobuf/any.pb.h
+++ /dev/null
@@ -1,384 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/protobuf/any.proto
-
-#ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fany_2eproto
-#define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fany_2eproto
-
-#include <limits>
-#include <string>
-
-#include <google/protobuf/port_def.inc>
-#if PROTOBUF_VERSION < 3021000
-#error This file was generated by a newer version of protoc which is
-#error incompatible with your Protocol Buffer headers. Please update
-#error your headers.
-#endif
-#if 3021012 < PROTOBUF_MIN_PROTOC_VERSION
-#error This file was generated by an older version of protoc which is
-#error incompatible with your Protocol Buffer headers. Please
-#error regenerate this file with a newer version of protoc.
-#endif
-
-#include <google/protobuf/port_undef.inc>
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/arena.h>
-#include <google/protobuf/arenastring.h>
-#include <google/protobuf/generated_message_util.h>
-#include <google/protobuf/metadata_lite.h>
-#include <google/protobuf/generated_message_reflection.h>
-#include <google/protobuf/message.h>
-#include <google/protobuf/repeated_field.h>  // IWYU pragma: export
-#include <google/protobuf/extension_set.h>  // IWYU pragma: export
-#include <google/protobuf/unknown_field_set.h>
-// @@protoc_insertion_point(includes)
-#include <google/protobuf/port_def.inc>
-#define PROTOBUF_INTERNAL_EXPORT_google_2fprotobuf_2fany_2eproto PROTOBUF_EXPORT
-PROTOBUF_NAMESPACE_OPEN
-namespace internal {
-class AnyMetadata;
-}  // namespace internal
-PROTOBUF_NAMESPACE_CLOSE
-
-// Internal implementation detail -- do not use these members.
-struct PROTOBUF_EXPORT TableStruct_google_2fprotobuf_2fany_2eproto {
-  static const uint32_t offsets[];
-};
-PROTOBUF_EXPORT extern const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable descriptor_table_google_2fprotobuf_2fany_2eproto;
-PROTOBUF_NAMESPACE_OPEN
-class Any;
-struct AnyDefaultTypeInternal;
-PROTOBUF_EXPORT extern AnyDefaultTypeInternal _Any_default_instance_;
-PROTOBUF_NAMESPACE_CLOSE
-PROTOBUF_NAMESPACE_OPEN
-template<> PROTOBUF_EXPORT ::PROTOBUF_NAMESPACE_ID::Any* Arena::CreateMaybeMessage<::PROTOBUF_NAMESPACE_ID::Any>(Arena*);
-PROTOBUF_NAMESPACE_CLOSE
-PROTOBUF_NAMESPACE_OPEN
-
-// ===================================================================
-
-class PROTOBUF_EXPORT Any final :
-    public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:google.protobuf.Any) */ {
- public:
-  inline Any() : Any(nullptr) {}
-  ~Any() override;
-  explicit PROTOBUF_CONSTEXPR Any(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
-
-  Any(const Any& from);
-  Any(Any&& from) noexcept
-    : Any() {
-    *this = ::std::move(from);
-  }
-
-  inline Any& operator=(const Any& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline Any& operator=(Any&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetOwningArena() == from.GetOwningArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetOwningArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const Any& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const Any* internal_default_instance() {
-    return reinterpret_cast<const Any*>(
-               &_Any_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    0;
-
-  // implements Any -----------------------------------------------
-
-  bool PackFrom(const ::PROTOBUF_NAMESPACE_ID::Message& message) {
-    GOOGLE_DCHECK_NE(&message, this);
-    return _impl_._any_metadata_.PackFrom(GetArena(), message);
-  }
-  bool PackFrom(const ::PROTOBUF_NAMESPACE_ID::Message& message,
-                ::PROTOBUF_NAMESPACE_ID::ConstStringParam type_url_prefix) {
-    GOOGLE_DCHECK_NE(&message, this);
-    return _impl_._any_metadata_.PackFrom(GetArena(), message, type_url_prefix);
-  }
-  bool UnpackTo(::PROTOBUF_NAMESPACE_ID::Message* message) const {
-    return _impl_._any_metadata_.UnpackTo(message);
-  }
-  static bool GetAnyFieldDescriptors(
-      const ::PROTOBUF_NAMESPACE_ID::Message& message,
-      const ::PROTOBUF_NAMESPACE_ID::FieldDescriptor** type_url_field,
-      const ::PROTOBUF_NAMESPACE_ID::FieldDescriptor** value_field);
-  template <typename T, class = typename std::enable_if<!std::is_convertible<T, const ::PROTOBUF_NAMESPACE_ID::Message&>::value>::type>
-  bool PackFrom(const T& message) {
-    return _impl_._any_metadata_.PackFrom<T>(GetArena(), message);
-  }
-  template <typename T, class = typename std::enable_if<!std::is_convertible<T, const ::PROTOBUF_NAMESPACE_ID::Message&>::value>::type>
-  bool PackFrom(const T& message,
-                ::PROTOBUF_NAMESPACE_ID::ConstStringParam type_url_prefix) {
-    return _impl_._any_metadata_.PackFrom<T>(GetArena(), message, type_url_prefix);}
-  template <typename T, class = typename std::enable_if<!std::is_convertible<T, const ::PROTOBUF_NAMESPACE_ID::Message&>::value>::type>
-  bool UnpackTo(T* message) const {
-    return _impl_._any_metadata_.UnpackTo<T>(message);
-  }
-  template<typename T> bool Is() const {
-    return _impl_._any_metadata_.Is<T>();
-  }
-  static bool ParseAnyTypeUrl(::PROTOBUF_NAMESPACE_ID::ConstStringParam type_url,
-                              std::string* full_type_name);
-  friend void swap(Any& a, Any& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(Any* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() != nullptr &&
-        GetOwningArena() == other->GetOwningArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() == other->GetOwningArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(Any* other) {
-    if (other == this) return;
-    GOOGLE_DCHECK(GetOwningArena() == other->GetOwningArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  Any* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<Any>(arena);
-  }
-  using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
-  void CopyFrom(const Any& from);
-  using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom( const Any& from) {
-    Any::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  uint8_t* _InternalSerialize(
-      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
-
-  private:
-  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
-  void SharedDtor();
-  void SetCachedSize(int size) const final;
-  void InternalSwap(Any* other);
-
-  private:
-  friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
-  static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
-    return "google.protobuf.Any";
-  }
-  protected:
-  explicit Any(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                       bool is_message_owned = false);
-  public:
-
-  static const ClassData _class_data_;
-  const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*GetClassData() const final;
-
-  ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kTypeUrlFieldNumber = 1,
-    kValueFieldNumber = 2,
-  };
-  // string type_url = 1;
-  void clear_type_url();
-  const std::string& type_url() const;
-  template <typename ArgT0 = const std::string&, typename... ArgT>
-  void set_type_url(ArgT0&& arg0, ArgT... args);
-  std::string* mutable_type_url();
-  PROTOBUF_NODISCARD std::string* release_type_url();
-  void set_allocated_type_url(std::string* type_url);
-  private:
-  const std::string& _internal_type_url() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_type_url(const std::string& value);
-  std::string* _internal_mutable_type_url();
-  public:
-
-  // bytes value = 2;
-  void clear_value();
-  const std::string& value() const;
-  template <typename ArgT0 = const std::string&, typename... ArgT>
-  void set_value(ArgT0&& arg0, ArgT... args);
-  std::string* mutable_value();
-  PROTOBUF_NODISCARD std::string* release_value();
-  void set_allocated_value(std::string* value);
-  private:
-  const std::string& _internal_value() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_value(const std::string& value);
-  std::string* _internal_mutable_value();
-  public:
-
-  // @@protoc_insertion_point(class_scope:google.protobuf.Any)
- private:
-  class _Internal;
-
-  template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
-  typedef void InternalArenaConstructable_;
-  typedef void DestructorSkippable_;
-  struct Impl_ {
-    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr type_url_;
-    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr value_;
-    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-    ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata _any_metadata_;
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_google_2fprotobuf_2fany_2eproto;
-};
-// ===================================================================
-
-
-// ===================================================================
-
-#ifdef __GNUC__
-  #pragma GCC diagnostic push
-  #pragma GCC diagnostic ignored "-Wstrict-aliasing"
-#endif  // __GNUC__
-// Any
-
-// string type_url = 1;
-inline void Any::clear_type_url() {
-  _impl_.type_url_.ClearToEmpty();
-}
-inline const std::string& Any::type_url() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.Any.type_url)
-  return _internal_type_url();
-}
-template <typename ArgT0, typename... ArgT>
-inline PROTOBUF_ALWAYS_INLINE
-void Any::set_type_url(ArgT0&& arg0, ArgT... args) {
- 
- _impl_.type_url_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
-  // @@protoc_insertion_point(field_set:google.protobuf.Any.type_url)
-}
-inline std::string* Any::mutable_type_url() {
-  std::string* _s = _internal_mutable_type_url();
-  // @@protoc_insertion_point(field_mutable:google.protobuf.Any.type_url)
-  return _s;
-}
-inline const std::string& Any::_internal_type_url() const {
-  return _impl_.type_url_.Get();
-}
-inline void Any::_internal_set_type_url(const std::string& value) {
-  
-  _impl_.type_url_.Set(value, GetArenaForAllocation());
-}
-inline std::string* Any::_internal_mutable_type_url() {
-  
-  return _impl_.type_url_.Mutable(GetArenaForAllocation());
-}
-inline std::string* Any::release_type_url() {
-  // @@protoc_insertion_point(field_release:google.protobuf.Any.type_url)
-  return _impl_.type_url_.Release();
-}
-inline void Any::set_allocated_type_url(std::string* type_url) {
-  if (type_url != nullptr) {
-    
-  } else {
-    
-  }
-  _impl_.type_url_.SetAllocated(type_url, GetArenaForAllocation());
-#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (_impl_.type_url_.IsDefault()) {
-    _impl_.type_url_.Set("", GetArenaForAllocation());
-  }
-#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:google.protobuf.Any.type_url)
-}
-
-// bytes value = 2;
-inline void Any::clear_value() {
-  _impl_.value_.ClearToEmpty();
-}
-inline const std::string& Any::value() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.Any.value)
-  return _internal_value();
-}
-template <typename ArgT0, typename... ArgT>
-inline PROTOBUF_ALWAYS_INLINE
-void Any::set_value(ArgT0&& arg0, ArgT... args) {
- 
- _impl_.value_.SetBytes(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
-  // @@protoc_insertion_point(field_set:google.protobuf.Any.value)
-}
-inline std::string* Any::mutable_value() {
-  std::string* _s = _internal_mutable_value();
-  // @@protoc_insertion_point(field_mutable:google.protobuf.Any.value)
-  return _s;
-}
-inline const std::string& Any::_internal_value() const {
-  return _impl_.value_.Get();
-}
-inline void Any::_internal_set_value(const std::string& value) {
-  
-  _impl_.value_.Set(value, GetArenaForAllocation());
-}
-inline std::string* Any::_internal_mutable_value() {
-  
-  return _impl_.value_.Mutable(GetArenaForAllocation());
-}
-inline std::string* Any::release_value() {
-  // @@protoc_insertion_point(field_release:google.protobuf.Any.value)
-  return _impl_.value_.Release();
-}
-inline void Any::set_allocated_value(std::string* value) {
-  if (value != nullptr) {
-    
-  } else {
-    
-  }
-  _impl_.value_.SetAllocated(value, GetArenaForAllocation());
-#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (_impl_.value_.IsDefault()) {
-    _impl_.value_.Set("", GetArenaForAllocation());
-  }
-#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:google.protobuf.Any.value)
-}
-
-#ifdef __GNUC__
-  #pragma GCC diagnostic pop
-#endif  // __GNUC__
-
-// @@protoc_insertion_point(namespace_scope)
-
-PROTOBUF_NAMESPACE_CLOSE
-
-// @@protoc_insertion_point(global_scope)
-
-#include <google/protobuf/port_undef.inc>
-#endif  // GOOGLE_PROTOBUF_INCLUDED_GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fany_2eproto
diff --git a/libs/protobuf/src/google/protobuf/any.proto b/libs/protobuf/src/google/protobuf/any.proto
deleted file mode 100644
index e2c2042..0000000
--- a/libs/protobuf/src/google/protobuf/any.proto
+++ /dev/null
@@ -1,158 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto3";
-
-package google.protobuf;
-
-option csharp_namespace = "Google.Protobuf.WellKnownTypes";
-option go_package = "google.golang.org/protobuf/types/known/anypb";
-option java_package = "com.google.protobuf";
-option java_outer_classname = "AnyProto";
-option java_multiple_files = true;
-option objc_class_prefix = "GPB";
-
-// `Any` contains an arbitrary serialized protocol buffer message along with a
-// URL that describes the type of the serialized message.
-//
-// Protobuf library provides support to pack/unpack Any values in the form
-// of utility functions or additional generated methods of the Any type.
-//
-// Example 1: Pack and unpack a message in C++.
-//
-//     Foo foo = ...;
-//     Any any;
-//     any.PackFrom(foo);
-//     ...
-//     if (any.UnpackTo(&foo)) {
-//       ...
-//     }
-//
-// Example 2: Pack and unpack a message in Java.
-//
-//     Foo foo = ...;
-//     Any any = Any.pack(foo);
-//     ...
-//     if (any.is(Foo.class)) {
-//       foo = any.unpack(Foo.class);
-//     }
-//
-// Example 3: Pack and unpack a message in Python.
-//
-//     foo = Foo(...)
-//     any = Any()
-//     any.Pack(foo)
-//     ...
-//     if any.Is(Foo.DESCRIPTOR):
-//       any.Unpack(foo)
-//       ...
-//
-// Example 4: Pack and unpack a message in Go
-//
-//      foo := &pb.Foo{...}
-//      any, err := anypb.New(foo)
-//      if err != nil {
-//        ...
-//      }
-//      ...
-//      foo := &pb.Foo{}
-//      if err := any.UnmarshalTo(foo); err != nil {
-//        ...
-//      }
-//
-// The pack methods provided by protobuf library will by default use
-// 'type.googleapis.com/full.type.name' as the type URL and the unpack
-// methods only use the fully qualified type name after the last '/'
-// in the type URL, for example "foo.bar.com/x/y.z" will yield type
-// name "y.z".
-//
-//
-// JSON
-//
-// The JSON representation of an `Any` value uses the regular
-// representation of the deserialized, embedded message, with an
-// additional field `@type` which contains the type URL. Example:
-//
-//     package google.profile;
-//     message Person {
-//       string first_name = 1;
-//       string last_name = 2;
-//     }
-//
-//     {
-//       "@type": "type.googleapis.com/google.profile.Person",
-//       "firstName": <string>,
-//       "lastName": <string>
-//     }
-//
-// If the embedded message type is well-known and has a custom JSON
-// representation, that representation will be embedded adding a field
-// `value` which holds the custom JSON in addition to the `@type`
-// field. Example (for message [google.protobuf.Duration][]):
-//
-//     {
-//       "@type": "type.googleapis.com/google.protobuf.Duration",
-//       "value": "1.212s"
-//     }
-//
-message Any {
-  // A URL/resource name that uniquely identifies the type of the serialized
-  // protocol buffer message. This string must contain at least
-  // one "/" character. The last segment of the URL's path must represent
-  // the fully qualified name of the type (as in
-  // `path/google.protobuf.Duration`). The name should be in a canonical form
-  // (e.g., leading "." is not accepted).
-  //
-  // In practice, teams usually precompile into the binary all types that they
-  // expect it to use in the context of Any. However, for URLs which use the
-  // scheme `http`, `https`, or no scheme, one can optionally set up a type
-  // server that maps type URLs to message definitions as follows:
-  //
-  // * If no scheme is provided, `https` is assumed.
-  // * An HTTP GET on the URL must yield a [google.protobuf.Type][]
-  //   value in binary format, or produce an error.
-  // * Applications are allowed to cache lookup results based on the
-  //   URL, or have them precompiled into a binary to avoid any
-  //   lookup. Therefore, binary compatibility needs to be preserved
-  //   on changes to types. (Use versioned type names to manage
-  //   breaking changes.)
-  //
-  // Note: this functionality is not currently available in the official
-  // protobuf release, and it is not used for type URLs beginning with
-  // type.googleapis.com.
-  //
-  // Schemes other than `http`, `https` (or the empty scheme) might be
-  // used with implementation specific semantics.
-  //
-  string type_url = 1;
-
-  // Must be a valid serialized protocol buffer of the above specified type.
-  bytes value = 2;
-}
diff --git a/libs/protobuf/src/google/protobuf/any_lite.cc b/libs/protobuf/src/google/protobuf/any_lite.cc
deleted file mode 100644
index f283a31..0000000
--- a/libs/protobuf/src/google/protobuf/any_lite.cc
+++ /dev/null
@@ -1,96 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <google/protobuf/io/zero_copy_stream_impl_lite.h>
-#include <google/protobuf/stubs/strutil.h>
-#include <google/protobuf/any.h>
-#include <google/protobuf/arenastring.h>
-#include <google/protobuf/generated_message_util.h>
-
-namespace google {
-namespace protobuf {
-namespace internal {
-
-std::string GetTypeUrl(StringPiece message_name,
-                       StringPiece type_url_prefix) {
-  if (!type_url_prefix.empty() &&
-      type_url_prefix[type_url_prefix.size() - 1] == '/') {
-    return StrCat(type_url_prefix, message_name);
-  } else {
-    return StrCat(type_url_prefix, "/", message_name);
-  }
-}
-
-const char kAnyFullTypeName[] = "google.protobuf.Any";
-const char kTypeGoogleApisComPrefix[] = "type.googleapis.com/";
-const char kTypeGoogleProdComPrefix[] = "type.googleprod.com/";
-
-bool AnyMetadata::InternalPackFrom(Arena* arena, const MessageLite& message,
-                                   StringPiece type_url_prefix,
-                                   StringPiece type_name) {
-  type_url_->Set(GetTypeUrl(type_name, type_url_prefix), arena);
-  return message.SerializeToString(value_->Mutable(arena));
-}
-
-bool AnyMetadata::InternalUnpackTo(StringPiece type_name,
-                                   MessageLite* message) const {
-  if (!InternalIs(type_name)) {
-    return false;
-  }
-  return message->ParseFromString(value_->Get());
-}
-
-bool AnyMetadata::InternalIs(StringPiece type_name) const {
-  StringPiece type_url = type_url_->Get();
-  return type_url.size() >= type_name.size() + 1 &&
-         type_url[type_url.size() - type_name.size() - 1] == '/' &&
-         HasSuffixString(type_url, type_name);
-}
-
-bool ParseAnyTypeUrl(StringPiece type_url, std::string* url_prefix,
-                     std::string* full_type_name) {
-  size_t pos = type_url.find_last_of('/');
-  if (pos == std::string::npos || pos + 1 == type_url.size()) {
-    return false;
-  }
-  if (url_prefix) {
-    *url_prefix = std::string(type_url.substr(0, pos + 1));
-  }
-  *full_type_name = std::string(type_url.substr(pos + 1));
-  return true;
-}
-
-bool ParseAnyTypeUrl(StringPiece type_url, std::string* full_type_name) {
-  return ParseAnyTypeUrl(type_url, nullptr, full_type_name);
-}
-
-}  // namespace internal
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/any_test.cc b/libs/protobuf/src/google/protobuf/any_test.cc
deleted file mode 100644
index a82afb2..0000000
--- a/libs/protobuf/src/google/protobuf/any_test.cc
+++ /dev/null
@@ -1,194 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <google/protobuf/any_test.pb.h>
-#include <google/protobuf/unittest.pb.h>
-#include <gtest/gtest.h>
-
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-namespace {
-
-TEST(AnyMetadataTest, ConstInit) {
-  PROTOBUF_CONSTINIT static internal::AnyMetadata metadata(nullptr, nullptr);
-  (void)metadata;
-}
-
-TEST(AnyTest, TestPackAndUnpack) {
-  protobuf_unittest::TestAny submessage;
-  submessage.set_int32_value(12345);
-  protobuf_unittest::TestAny message;
-  ASSERT_TRUE(message.mutable_any_value()->PackFrom(submessage));
-
-  std::string data = message.SerializeAsString();
-
-  ASSERT_TRUE(message.ParseFromString(data));
-  EXPECT_TRUE(message.has_any_value());
-  submessage.Clear();
-  ASSERT_TRUE(message.any_value().UnpackTo(&submessage));
-  EXPECT_EQ(12345, submessage.int32_value());
-}
-
-TEST(AnyTest, TestPackFromSerializationExceedsSizeLimit) {
-  protobuf_unittest::TestAny submessage;
-  submessage.mutable_text()->resize(INT_MAX, 'a');
-  protobuf_unittest::TestAny message;
-  EXPECT_FALSE(message.mutable_any_value()->PackFrom(submessage));
-}
-
-TEST(AnyTest, TestUnpackWithTypeMismatch) {
-  protobuf_unittest::TestAny payload;
-  payload.set_int32_value(13);
-  google::protobuf::Any any;
-  any.PackFrom(payload);
-
-  // Attempt to unpack into the wrong type.
-  protobuf_unittest::TestAllTypes dest;
-  EXPECT_FALSE(any.UnpackTo(&dest));
-}
-
-TEST(AnyTest, TestPackAndUnpackAny) {
-  // We can pack a Any message inside another Any message.
-  protobuf_unittest::TestAny submessage;
-  submessage.set_int32_value(12345);
-  google::protobuf::Any any;
-  any.PackFrom(submessage);
-  protobuf_unittest::TestAny message;
-  message.mutable_any_value()->PackFrom(any);
-
-  std::string data = message.SerializeAsString();
-
-  ASSERT_TRUE(message.ParseFromString(data));
-  EXPECT_TRUE(message.has_any_value());
-  any.Clear();
-  submessage.Clear();
-  ASSERT_TRUE(message.any_value().UnpackTo(&any));
-  ASSERT_TRUE(any.UnpackTo(&submessage));
-  EXPECT_EQ(12345, submessage.int32_value());
-}
-
-TEST(AnyTest, TestPackWithCustomTypeUrl) {
-  protobuf_unittest::TestAny submessage;
-  submessage.set_int32_value(12345);
-  google::protobuf::Any any;
-  // Pack with a custom type URL prefix.
-  any.PackFrom(submessage, "type.myservice.com");
-  EXPECT_EQ("type.myservice.com/protobuf_unittest.TestAny", any.type_url());
-  // Pack with a custom type URL prefix ending with '/'.
-  any.PackFrom(submessage, "type.myservice.com/");
-  EXPECT_EQ("type.myservice.com/protobuf_unittest.TestAny", any.type_url());
-  // Pack with an empty type URL prefix.
-  any.PackFrom(submessage, "");
-  EXPECT_EQ("/protobuf_unittest.TestAny", any.type_url());
-
-  // Test unpacking the type.
-  submessage.Clear();
-  EXPECT_TRUE(any.UnpackTo(&submessage));
-  EXPECT_EQ(12345, submessage.int32_value());
-}
-
-TEST(AnyTest, TestIs) {
-  protobuf_unittest::TestAny submessage;
-  submessage.set_int32_value(12345);
-  google::protobuf::Any any;
-  any.PackFrom(submessage);
-  ASSERT_TRUE(any.ParseFromString(any.SerializeAsString()));
-  EXPECT_TRUE(any.Is<protobuf_unittest::TestAny>());
-  EXPECT_FALSE(any.Is<google::protobuf::Any>());
-
-  protobuf_unittest::TestAny message;
-  message.mutable_any_value()->PackFrom(any);
-  ASSERT_TRUE(message.ParseFromString(message.SerializeAsString()));
-  EXPECT_FALSE(message.any_value().Is<protobuf_unittest::TestAny>());
-  EXPECT_TRUE(message.any_value().Is<google::protobuf::Any>());
-
-  any.set_type_url("/protobuf_unittest.TestAny");
-  EXPECT_TRUE(any.Is<protobuf_unittest::TestAny>());
-  // The type URL must contain at least one "/".
-  any.set_type_url("protobuf_unittest.TestAny");
-  EXPECT_FALSE(any.Is<protobuf_unittest::TestAny>());
-  // The type name after the slash must be fully qualified.
-  any.set_type_url("/TestAny");
-  EXPECT_FALSE(any.Is<protobuf_unittest::TestAny>());
-}
-
-TEST(AnyTest, MoveConstructor) {
-  protobuf_unittest::TestAny payload;
-  payload.set_int32_value(12345);
-
-  google::protobuf::Any src;
-  src.PackFrom(payload);
-
-  const char* type_url = src.type_url().data();
-
-  google::protobuf::Any dst(std::move(src));
-  EXPECT_EQ(type_url, dst.type_url().data());
-  payload.Clear();
-  ASSERT_TRUE(dst.UnpackTo(&payload));
-  EXPECT_EQ(12345, payload.int32_value());
-}
-
-TEST(AnyTest, MoveAssignment) {
-  protobuf_unittest::TestAny payload;
-  payload.set_int32_value(12345);
-
-  google::protobuf::Any src;
-  src.PackFrom(payload);
-
-  const char* type_url = src.type_url().data();
-
-  google::protobuf::Any dst;
-  dst = std::move(src);
-  EXPECT_EQ(type_url, dst.type_url().data());
-  payload.Clear();
-  ASSERT_TRUE(dst.UnpackTo(&payload));
-  EXPECT_EQ(12345, payload.int32_value());
-}
-
-#ifdef PROTOBUF_HAS_DEATH_TEST
-#ifndef NDEBUG
-TEST(AnyTest, PackSelfDeath) {
-  google::protobuf::Any any;
-  EXPECT_DEATH(any.PackFrom(any), "&message");
-  EXPECT_DEATH(any.PackFrom(any, ""), "&message");
-}
-#endif  // !NDEBUG
-#endif  // PROTOBUF_HAS_DEATH_TEST
-
-
-}  // namespace
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
diff --git a/libs/protobuf/src/google/protobuf/any_test.proto b/libs/protobuf/src/google/protobuf/any_test.proto
deleted file mode 100644
index 256035b..0000000
--- a/libs/protobuf/src/google/protobuf/any_test.proto
+++ /dev/null
@@ -1,44 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto3";
-
-package protobuf_unittest;
-
-import "google/protobuf/any.proto";
-
-option java_outer_classname = "TestAnyProto";
-
-message TestAny {
-  int32 int32_value = 1;
-  google.protobuf.Any any_value = 2;
-  repeated google.protobuf.Any repeated_any_value = 3;
-  string text = 4;
-}
diff --git a/libs/protobuf/src/google/protobuf/api.pb.cc b/libs/protobuf/src/google/protobuf/api.pb.cc
deleted file mode 100644
index 24b6049..0000000
--- a/libs/protobuf/src/google/protobuf/api.pb.cc
+++ /dev/null
@@ -1,1309 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/protobuf/api.proto
-
-#include <google/protobuf/api.pb.h>
-
-#include <algorithm>
-
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/extension_set.h>
-#include <google/protobuf/wire_format_lite.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/generated_message_reflection.h>
-#include <google/protobuf/reflection_ops.h>
-#include <google/protobuf/wire_format.h>
-// @@protoc_insertion_point(includes)
-#include <google/protobuf/port_def.inc>
-
-PROTOBUF_PRAGMA_INIT_SEG
-
-namespace _pb = ::PROTOBUF_NAMESPACE_ID;
-namespace _pbi = _pb::internal;
-
-PROTOBUF_NAMESPACE_OPEN
-PROTOBUF_CONSTEXPR Api::Api(
-    ::_pbi::ConstantInitialized): _impl_{
-    /*decltype(_impl_.methods_)*/{}
-  , /*decltype(_impl_.options_)*/{}
-  , /*decltype(_impl_.mixins_)*/{}
-  , /*decltype(_impl_.name_)*/{&::_pbi::fixed_address_empty_string, ::_pbi::ConstantInitialized{}}
-  , /*decltype(_impl_.version_)*/{&::_pbi::fixed_address_empty_string, ::_pbi::ConstantInitialized{}}
-  , /*decltype(_impl_.source_context_)*/nullptr
-  , /*decltype(_impl_.syntax_)*/0
-  , /*decltype(_impl_._cached_size_)*/{}} {}
-struct ApiDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR ApiDefaultTypeInternal()
-      : _instance(::_pbi::ConstantInitialized{}) {}
-  ~ApiDefaultTypeInternal() {}
-  union {
-    Api _instance;
-  };
-};
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 ApiDefaultTypeInternal _Api_default_instance_;
-PROTOBUF_CONSTEXPR Method::Method(
-    ::_pbi::ConstantInitialized): _impl_{
-    /*decltype(_impl_.options_)*/{}
-  , /*decltype(_impl_.name_)*/{&::_pbi::fixed_address_empty_string, ::_pbi::ConstantInitialized{}}
-  , /*decltype(_impl_.request_type_url_)*/{&::_pbi::fixed_address_empty_string, ::_pbi::ConstantInitialized{}}
-  , /*decltype(_impl_.response_type_url_)*/{&::_pbi::fixed_address_empty_string, ::_pbi::ConstantInitialized{}}
-  , /*decltype(_impl_.request_streaming_)*/false
-  , /*decltype(_impl_.response_streaming_)*/false
-  , /*decltype(_impl_.syntax_)*/0
-  , /*decltype(_impl_._cached_size_)*/{}} {}
-struct MethodDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR MethodDefaultTypeInternal()
-      : _instance(::_pbi::ConstantInitialized{}) {}
-  ~MethodDefaultTypeInternal() {}
-  union {
-    Method _instance;
-  };
-};
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 MethodDefaultTypeInternal _Method_default_instance_;
-PROTOBUF_CONSTEXPR Mixin::Mixin(
-    ::_pbi::ConstantInitialized): _impl_{
-    /*decltype(_impl_.name_)*/{&::_pbi::fixed_address_empty_string, ::_pbi::ConstantInitialized{}}
-  , /*decltype(_impl_.root_)*/{&::_pbi::fixed_address_empty_string, ::_pbi::ConstantInitialized{}}
-  , /*decltype(_impl_._cached_size_)*/{}} {}
-struct MixinDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR MixinDefaultTypeInternal()
-      : _instance(::_pbi::ConstantInitialized{}) {}
-  ~MixinDefaultTypeInternal() {}
-  union {
-    Mixin _instance;
-  };
-};
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 MixinDefaultTypeInternal _Mixin_default_instance_;
-PROTOBUF_NAMESPACE_CLOSE
-static ::_pb::Metadata file_level_metadata_google_2fprotobuf_2fapi_2eproto[3];
-static constexpr ::_pb::EnumDescriptor const** file_level_enum_descriptors_google_2fprotobuf_2fapi_2eproto = nullptr;
-static constexpr ::_pb::ServiceDescriptor const** file_level_service_descriptors_google_2fprotobuf_2fapi_2eproto = nullptr;
-
-const uint32_t TableStruct_google_2fprotobuf_2fapi_2eproto::offsets[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = {
-  ~0u,  // no _has_bits_
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Api, _internal_metadata_),
-  ~0u,  // no _extensions_
-  ~0u,  // no _oneof_case_
-  ~0u,  // no _weak_field_map_
-  ~0u,  // no _inlined_string_donated_
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Api, _impl_.name_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Api, _impl_.methods_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Api, _impl_.options_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Api, _impl_.version_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Api, _impl_.source_context_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Api, _impl_.mixins_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Api, _impl_.syntax_),
-  ~0u,  // no _has_bits_
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Method, _internal_metadata_),
-  ~0u,  // no _extensions_
-  ~0u,  // no _oneof_case_
-  ~0u,  // no _weak_field_map_
-  ~0u,  // no _inlined_string_donated_
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Method, _impl_.name_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Method, _impl_.request_type_url_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Method, _impl_.request_streaming_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Method, _impl_.response_type_url_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Method, _impl_.response_streaming_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Method, _impl_.options_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Method, _impl_.syntax_),
-  ~0u,  // no _has_bits_
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Mixin, _internal_metadata_),
-  ~0u,  // no _extensions_
-  ~0u,  // no _oneof_case_
-  ~0u,  // no _weak_field_map_
-  ~0u,  // no _inlined_string_donated_
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Mixin, _impl_.name_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Mixin, _impl_.root_),
-};
-static const ::_pbi::MigrationSchema schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = {
-  { 0, -1, -1, sizeof(::PROTOBUF_NAMESPACE_ID::Api)},
-  { 13, -1, -1, sizeof(::PROTOBUF_NAMESPACE_ID::Method)},
-  { 26, -1, -1, sizeof(::PROTOBUF_NAMESPACE_ID::Mixin)},
-};
-
-static const ::_pb::Message* const file_default_instances[] = {
-  &::PROTOBUF_NAMESPACE_ID::_Api_default_instance_._instance,
-  &::PROTOBUF_NAMESPACE_ID::_Method_default_instance_._instance,
-  &::PROTOBUF_NAMESPACE_ID::_Mixin_default_instance_._instance,
-};
-
-const char descriptor_table_protodef_google_2fprotobuf_2fapi_2eproto[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) =
-  "\n\031google/protobuf/api.proto\022\017google.prot"
-  "obuf\032$google/protobuf/source_context.pro"
-  "to\032\032google/protobuf/type.proto\"\201\002\n\003Api\022\014"
-  "\n\004name\030\001 \001(\t\022(\n\007methods\030\002 \003(\0132\027.google.p"
-  "rotobuf.Method\022(\n\007options\030\003 \003(\0132\027.google"
-  ".protobuf.Option\022\017\n\007version\030\004 \001(\t\0226\n\016sou"
-  "rce_context\030\005 \001(\0132\036.google.protobuf.Sour"
-  "ceContext\022&\n\006mixins\030\006 \003(\0132\026.google.proto"
-  "buf.Mixin\022\'\n\006syntax\030\007 \001(\0162\027.google.proto"
-  "buf.Syntax\"\325\001\n\006Method\022\014\n\004name\030\001 \001(\t\022\030\n\020r"
-  "equest_type_url\030\002 \001(\t\022\031\n\021request_streami"
-  "ng\030\003 \001(\010\022\031\n\021response_type_url\030\004 \001(\t\022\032\n\022r"
-  "esponse_streaming\030\005 \001(\010\022(\n\007options\030\006 \003(\013"
-  "2\027.google.protobuf.Option\022\'\n\006syntax\030\007 \001("
-  "\0162\027.google.protobuf.Syntax\"#\n\005Mixin\022\014\n\004n"
-  "ame\030\001 \001(\t\022\014\n\004root\030\002 \001(\tBv\n\023com.google.pr"
-  "otobufB\010ApiProtoP\001Z,google.golang.org/pr"
-  "otobuf/types/known/apipb\242\002\003GPB\252\002\036Google."
-  "Protobuf.WellKnownTypesb\006proto3"
-  ;
-static const ::_pbi::DescriptorTable* const descriptor_table_google_2fprotobuf_2fapi_2eproto_deps[2] = {
-  &::descriptor_table_google_2fprotobuf_2fsource_5fcontext_2eproto,
-  &::descriptor_table_google_2fprotobuf_2ftype_2eproto,
-};
-static ::_pbi::once_flag descriptor_table_google_2fprotobuf_2fapi_2eproto_once;
-const ::_pbi::DescriptorTable descriptor_table_google_2fprotobuf_2fapi_2eproto = {
-    false, false, 751, descriptor_table_protodef_google_2fprotobuf_2fapi_2eproto,
-    "google/protobuf/api.proto",
-    &descriptor_table_google_2fprotobuf_2fapi_2eproto_once, descriptor_table_google_2fprotobuf_2fapi_2eproto_deps, 2, 3,
-    schemas, file_default_instances, TableStruct_google_2fprotobuf_2fapi_2eproto::offsets,
-    file_level_metadata_google_2fprotobuf_2fapi_2eproto, file_level_enum_descriptors_google_2fprotobuf_2fapi_2eproto,
-    file_level_service_descriptors_google_2fprotobuf_2fapi_2eproto,
-};
-PROTOBUF_ATTRIBUTE_WEAK const ::_pbi::DescriptorTable* descriptor_table_google_2fprotobuf_2fapi_2eproto_getter() {
-  return &descriptor_table_google_2fprotobuf_2fapi_2eproto;
-}
-
-// Force running AddDescriptors() at dynamic initialization time.
-PROTOBUF_ATTRIBUTE_INIT_PRIORITY2 static ::_pbi::AddDescriptorsRunner dynamic_init_dummy_google_2fprotobuf_2fapi_2eproto(&descriptor_table_google_2fprotobuf_2fapi_2eproto);
-PROTOBUF_NAMESPACE_OPEN
-
-// ===================================================================
-
-class Api::_Internal {
- public:
-  static const ::PROTOBUF_NAMESPACE_ID::SourceContext& source_context(const Api* msg);
-};
-
-const ::PROTOBUF_NAMESPACE_ID::SourceContext&
-Api::_Internal::source_context(const Api* msg) {
-  return *msg->_impl_.source_context_;
-}
-void Api::clear_options() {
-  _impl_.options_.Clear();
-}
-void Api::clear_source_context() {
-  if (GetArenaForAllocation() == nullptr && _impl_.source_context_ != nullptr) {
-    delete _impl_.source_context_;
-  }
-  _impl_.source_context_ = nullptr;
-}
-Api::Api(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                         bool is_message_owned)
-  : ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned) {
-  SharedCtor(arena, is_message_owned);
-  // @@protoc_insertion_point(arena_constructor:google.protobuf.Api)
-}
-Api::Api(const Api& from)
-  : ::PROTOBUF_NAMESPACE_ID::Message() {
-  Api* const _this = this; (void)_this;
-  new (&_impl_) Impl_{
-      decltype(_impl_.methods_){from._impl_.methods_}
-    , decltype(_impl_.options_){from._impl_.options_}
-    , decltype(_impl_.mixins_){from._impl_.mixins_}
-    , decltype(_impl_.name_){}
-    , decltype(_impl_.version_){}
-    , decltype(_impl_.source_context_){nullptr}
-    , decltype(_impl_.syntax_){}
-    , /*decltype(_impl_._cached_size_)*/{}};
-
-  _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-  _impl_.name_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.name_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (!from._internal_name().empty()) {
-    _this->_impl_.name_.Set(from._internal_name(), 
-      _this->GetArenaForAllocation());
-  }
-  _impl_.version_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.version_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (!from._internal_version().empty()) {
-    _this->_impl_.version_.Set(from._internal_version(), 
-      _this->GetArenaForAllocation());
-  }
-  if (from._internal_has_source_context()) {
-    _this->_impl_.source_context_ = new ::PROTOBUF_NAMESPACE_ID::SourceContext(*from._impl_.source_context_);
-  }
-  _this->_impl_.syntax_ = from._impl_.syntax_;
-  // @@protoc_insertion_point(copy_constructor:google.protobuf.Api)
-}
-
-inline void Api::SharedCtor(
-    ::_pb::Arena* arena, bool is_message_owned) {
-  (void)arena;
-  (void)is_message_owned;
-  new (&_impl_) Impl_{
-      decltype(_impl_.methods_){arena}
-    , decltype(_impl_.options_){arena}
-    , decltype(_impl_.mixins_){arena}
-    , decltype(_impl_.name_){}
-    , decltype(_impl_.version_){}
-    , decltype(_impl_.source_context_){nullptr}
-    , decltype(_impl_.syntax_){0}
-    , /*decltype(_impl_._cached_size_)*/{}
-  };
-  _impl_.name_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.name_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  _impl_.version_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.version_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-}
-
-Api::~Api() {
-  // @@protoc_insertion_point(destructor:google.protobuf.Api)
-  if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) {
-  (void)arena;
-    return;
-  }
-  SharedDtor();
-}
-
-inline void Api::SharedDtor() {
-  GOOGLE_DCHECK(GetArenaForAllocation() == nullptr);
-  _impl_.methods_.~RepeatedPtrField();
-  _impl_.options_.~RepeatedPtrField();
-  _impl_.mixins_.~RepeatedPtrField();
-  _impl_.name_.Destroy();
-  _impl_.version_.Destroy();
-  if (this != internal_default_instance()) delete _impl_.source_context_;
-}
-
-void Api::SetCachedSize(int size) const {
-  _impl_._cached_size_.Set(size);
-}
-
-void Api::Clear() {
-// @@protoc_insertion_point(message_clear_start:google.protobuf.Api)
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.methods_.Clear();
-  _impl_.options_.Clear();
-  _impl_.mixins_.Clear();
-  _impl_.name_.ClearToEmpty();
-  _impl_.version_.ClearToEmpty();
-  if (GetArenaForAllocation() == nullptr && _impl_.source_context_ != nullptr) {
-    delete _impl_.source_context_;
-  }
-  _impl_.source_context_ = nullptr;
-  _impl_.syntax_ = 0;
-  _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>();
-}
-
-const char* Api::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) {
-#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure
-  while (!ctx->Done(&ptr)) {
-    uint32_t tag;
-    ptr = ::_pbi::ReadTag(ptr, &tag);
-    switch (tag >> 3) {
-      // string name = 1;
-      case 1:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 10)) {
-          auto str = _internal_mutable_name();
-          ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx);
-          CHK_(ptr);
-          CHK_(::_pbi::VerifyUTF8(str, "google.protobuf.Api.name"));
-        } else
-          goto handle_unusual;
-        continue;
-      // repeated .google.protobuf.Method methods = 2;
-      case 2:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 18)) {
-          ptr -= 1;
-          do {
-            ptr += 1;
-            ptr = ctx->ParseMessage(_internal_add_methods(), ptr);
-            CHK_(ptr);
-            if (!ctx->DataAvailable(ptr)) break;
-          } while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<18>(ptr));
-        } else
-          goto handle_unusual;
-        continue;
-      // repeated .google.protobuf.Option options = 3;
-      case 3:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 26)) {
-          ptr -= 1;
-          do {
-            ptr += 1;
-            ptr = ctx->ParseMessage(_internal_add_options(), ptr);
-            CHK_(ptr);
-            if (!ctx->DataAvailable(ptr)) break;
-          } while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<26>(ptr));
-        } else
-          goto handle_unusual;
-        continue;
-      // string version = 4;
-      case 4:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 34)) {
-          auto str = _internal_mutable_version();
-          ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx);
-          CHK_(ptr);
-          CHK_(::_pbi::VerifyUTF8(str, "google.protobuf.Api.version"));
-        } else
-          goto handle_unusual;
-        continue;
-      // .google.protobuf.SourceContext source_context = 5;
-      case 5:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 42)) {
-          ptr = ctx->ParseMessage(_internal_mutable_source_context(), ptr);
-          CHK_(ptr);
-        } else
-          goto handle_unusual;
-        continue;
-      // repeated .google.protobuf.Mixin mixins = 6;
-      case 6:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 50)) {
-          ptr -= 1;
-          do {
-            ptr += 1;
-            ptr = ctx->ParseMessage(_internal_add_mixins(), ptr);
-            CHK_(ptr);
-            if (!ctx->DataAvailable(ptr)) break;
-          } while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<50>(ptr));
-        } else
-          goto handle_unusual;
-        continue;
-      // .google.protobuf.Syntax syntax = 7;
-      case 7:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 56)) {
-          uint64_t val = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr);
-          CHK_(ptr);
-          _internal_set_syntax(static_cast<::PROTOBUF_NAMESPACE_ID::Syntax>(val));
-        } else
-          goto handle_unusual;
-        continue;
-      default:
-        goto handle_unusual;
-    }  // switch
-  handle_unusual:
-    if ((tag == 0) || ((tag & 7) == 4)) {
-      CHK_(ptr);
-      ctx->SetLastTag(tag);
-      goto message_done;
-    }
-    ptr = UnknownFieldParse(
-        tag,
-        _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(),
-        ptr, ctx);
-    CHK_(ptr != nullptr);
-  }  // while
-message_done:
-  return ptr;
-failure:
-  ptr = nullptr;
-  goto message_done;
-#undef CHK_
-}
-
-uint8_t* Api::_InternalSerialize(
-    uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.Api)
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  // string name = 1;
-  if (!this->_internal_name().empty()) {
-    ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String(
-      this->_internal_name().data(), static_cast<int>(this->_internal_name().length()),
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE,
-      "google.protobuf.Api.name");
-    target = stream->WriteStringMaybeAliased(
-        1, this->_internal_name(), target);
-  }
-
-  // repeated .google.protobuf.Method methods = 2;
-  for (unsigned i = 0,
-      n = static_cast<unsigned>(this->_internal_methods_size()); i < n; i++) {
-    const auto& repfield = this->_internal_methods(i);
-    target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
-        InternalWriteMessage(2, repfield, repfield.GetCachedSize(), target, stream);
-  }
-
-  // repeated .google.protobuf.Option options = 3;
-  for (unsigned i = 0,
-      n = static_cast<unsigned>(this->_internal_options_size()); i < n; i++) {
-    const auto& repfield = this->_internal_options(i);
-    target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
-        InternalWriteMessage(3, repfield, repfield.GetCachedSize(), target, stream);
-  }
-
-  // string version = 4;
-  if (!this->_internal_version().empty()) {
-    ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String(
-      this->_internal_version().data(), static_cast<int>(this->_internal_version().length()),
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE,
-      "google.protobuf.Api.version");
-    target = stream->WriteStringMaybeAliased(
-        4, this->_internal_version(), target);
-  }
-
-  // .google.protobuf.SourceContext source_context = 5;
-  if (this->_internal_has_source_context()) {
-    target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
-      InternalWriteMessage(5, _Internal::source_context(this),
-        _Internal::source_context(this).GetCachedSize(), target, stream);
-  }
-
-  // repeated .google.protobuf.Mixin mixins = 6;
-  for (unsigned i = 0,
-      n = static_cast<unsigned>(this->_internal_mixins_size()); i < n; i++) {
-    const auto& repfield = this->_internal_mixins(i);
-    target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
-        InternalWriteMessage(6, repfield, repfield.GetCachedSize(), target, stream);
-  }
-
-  // .google.protobuf.Syntax syntax = 7;
-  if (this->_internal_syntax() != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteEnumToArray(
-      7, this->_internal_syntax(), target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-        _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.Api)
-  return target;
-}
-
-size_t Api::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:google.protobuf.Api)
-  size_t total_size = 0;
-
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // repeated .google.protobuf.Method methods = 2;
-  total_size += 1UL * this->_internal_methods_size();
-  for (const auto& msg : this->_impl_.methods_) {
-    total_size +=
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(msg);
-  }
-
-  // repeated .google.protobuf.Option options = 3;
-  total_size += 1UL * this->_internal_options_size();
-  for (const auto& msg : this->_impl_.options_) {
-    total_size +=
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(msg);
-  }
-
-  // repeated .google.protobuf.Mixin mixins = 6;
-  total_size += 1UL * this->_internal_mixins_size();
-  for (const auto& msg : this->_impl_.mixins_) {
-    total_size +=
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(msg);
-  }
-
-  // string name = 1;
-  if (!this->_internal_name().empty()) {
-    total_size += 1 +
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize(
-        this->_internal_name());
-  }
-
-  // string version = 4;
-  if (!this->_internal_version().empty()) {
-    total_size += 1 +
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize(
-        this->_internal_version());
-  }
-
-  // .google.protobuf.SourceContext source_context = 5;
-  if (this->_internal_has_source_context()) {
-    total_size += 1 +
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(
-        *_impl_.source_context_);
-  }
-
-  // .google.protobuf.Syntax syntax = 7;
-  if (this->_internal_syntax() != 0) {
-    total_size += 1 +
-      ::_pbi::WireFormatLite::EnumSize(this->_internal_syntax());
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData Api::_class_data_ = {
-    ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck,
-    Api::MergeImpl
-};
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*Api::GetClassData() const { return &_class_data_; }
-
-
-void Api::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) {
-  auto* const _this = static_cast<Api*>(&to_msg);
-  auto& from = static_cast<const Api&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.Api)
-  GOOGLE_DCHECK_NE(&from, _this);
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  _this->_impl_.methods_.MergeFrom(from._impl_.methods_);
-  _this->_impl_.options_.MergeFrom(from._impl_.options_);
-  _this->_impl_.mixins_.MergeFrom(from._impl_.mixins_);
-  if (!from._internal_name().empty()) {
-    _this->_internal_set_name(from._internal_name());
-  }
-  if (!from._internal_version().empty()) {
-    _this->_internal_set_version(from._internal_version());
-  }
-  if (from._internal_has_source_context()) {
-    _this->_internal_mutable_source_context()->::PROTOBUF_NAMESPACE_ID::SourceContext::MergeFrom(
-        from._internal_source_context());
-  }
-  if (from._internal_syntax() != 0) {
-    _this->_internal_set_syntax(from._internal_syntax());
-  }
-  _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void Api::CopyFrom(const Api& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.Api)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool Api::IsInitialized() const {
-  return true;
-}
-
-void Api::InternalSwap(Api* other) {
-  using std::swap;
-  auto* lhs_arena = GetArenaForAllocation();
-  auto* rhs_arena = other->GetArenaForAllocation();
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  _impl_.methods_.InternalSwap(&other->_impl_.methods_);
-  _impl_.options_.InternalSwap(&other->_impl_.options_);
-  _impl_.mixins_.InternalSwap(&other->_impl_.mixins_);
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::InternalSwap(
-      &_impl_.name_, lhs_arena,
-      &other->_impl_.name_, rhs_arena
-  );
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::InternalSwap(
-      &_impl_.version_, lhs_arena,
-      &other->_impl_.version_, rhs_arena
-  );
-  ::PROTOBUF_NAMESPACE_ID::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(Api, _impl_.syntax_)
-      + sizeof(Api::_impl_.syntax_)
-      - PROTOBUF_FIELD_OFFSET(Api, _impl_.source_context_)>(
-          reinterpret_cast<char*>(&_impl_.source_context_),
-          reinterpret_cast<char*>(&other->_impl_.source_context_));
-}
-
-::PROTOBUF_NAMESPACE_ID::Metadata Api::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_google_2fprotobuf_2fapi_2eproto_getter, &descriptor_table_google_2fprotobuf_2fapi_2eproto_once,
-      file_level_metadata_google_2fprotobuf_2fapi_2eproto[0]);
-}
-
-// ===================================================================
-
-class Method::_Internal {
- public:
-};
-
-void Method::clear_options() {
-  _impl_.options_.Clear();
-}
-Method::Method(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                         bool is_message_owned)
-  : ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned) {
-  SharedCtor(arena, is_message_owned);
-  // @@protoc_insertion_point(arena_constructor:google.protobuf.Method)
-}
-Method::Method(const Method& from)
-  : ::PROTOBUF_NAMESPACE_ID::Message() {
-  Method* const _this = this; (void)_this;
-  new (&_impl_) Impl_{
-      decltype(_impl_.options_){from._impl_.options_}
-    , decltype(_impl_.name_){}
-    , decltype(_impl_.request_type_url_){}
-    , decltype(_impl_.response_type_url_){}
-    , decltype(_impl_.request_streaming_){}
-    , decltype(_impl_.response_streaming_){}
-    , decltype(_impl_.syntax_){}
-    , /*decltype(_impl_._cached_size_)*/{}};
-
-  _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-  _impl_.name_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.name_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (!from._internal_name().empty()) {
-    _this->_impl_.name_.Set(from._internal_name(), 
-      _this->GetArenaForAllocation());
-  }
-  _impl_.request_type_url_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.request_type_url_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (!from._internal_request_type_url().empty()) {
-    _this->_impl_.request_type_url_.Set(from._internal_request_type_url(), 
-      _this->GetArenaForAllocation());
-  }
-  _impl_.response_type_url_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.response_type_url_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (!from._internal_response_type_url().empty()) {
-    _this->_impl_.response_type_url_.Set(from._internal_response_type_url(), 
-      _this->GetArenaForAllocation());
-  }
-  ::memcpy(&_impl_.request_streaming_, &from._impl_.request_streaming_,
-    static_cast<size_t>(reinterpret_cast<char*>(&_impl_.syntax_) -
-    reinterpret_cast<char*>(&_impl_.request_streaming_)) + sizeof(_impl_.syntax_));
-  // @@protoc_insertion_point(copy_constructor:google.protobuf.Method)
-}
-
-inline void Method::SharedCtor(
-    ::_pb::Arena* arena, bool is_message_owned) {
-  (void)arena;
-  (void)is_message_owned;
-  new (&_impl_) Impl_{
-      decltype(_impl_.options_){arena}
-    , decltype(_impl_.name_){}
-    , decltype(_impl_.request_type_url_){}
-    , decltype(_impl_.response_type_url_){}
-    , decltype(_impl_.request_streaming_){false}
-    , decltype(_impl_.response_streaming_){false}
-    , decltype(_impl_.syntax_){0}
-    , /*decltype(_impl_._cached_size_)*/{}
-  };
-  _impl_.name_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.name_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  _impl_.request_type_url_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.request_type_url_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  _impl_.response_type_url_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.response_type_url_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-}
-
-Method::~Method() {
-  // @@protoc_insertion_point(destructor:google.protobuf.Method)
-  if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) {
-  (void)arena;
-    return;
-  }
-  SharedDtor();
-}
-
-inline void Method::SharedDtor() {
-  GOOGLE_DCHECK(GetArenaForAllocation() == nullptr);
-  _impl_.options_.~RepeatedPtrField();
-  _impl_.name_.Destroy();
-  _impl_.request_type_url_.Destroy();
-  _impl_.response_type_url_.Destroy();
-}
-
-void Method::SetCachedSize(int size) const {
-  _impl_._cached_size_.Set(size);
-}
-
-void Method::Clear() {
-// @@protoc_insertion_point(message_clear_start:google.protobuf.Method)
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.options_.Clear();
-  _impl_.name_.ClearToEmpty();
-  _impl_.request_type_url_.ClearToEmpty();
-  _impl_.response_type_url_.ClearToEmpty();
-  ::memset(&_impl_.request_streaming_, 0, static_cast<size_t>(
-      reinterpret_cast<char*>(&_impl_.syntax_) -
-      reinterpret_cast<char*>(&_impl_.request_streaming_)) + sizeof(_impl_.syntax_));
-  _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>();
-}
-
-const char* Method::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) {
-#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure
-  while (!ctx->Done(&ptr)) {
-    uint32_t tag;
-    ptr = ::_pbi::ReadTag(ptr, &tag);
-    switch (tag >> 3) {
-      // string name = 1;
-      case 1:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 10)) {
-          auto str = _internal_mutable_name();
-          ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx);
-          CHK_(ptr);
-          CHK_(::_pbi::VerifyUTF8(str, "google.protobuf.Method.name"));
-        } else
-          goto handle_unusual;
-        continue;
-      // string request_type_url = 2;
-      case 2:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 18)) {
-          auto str = _internal_mutable_request_type_url();
-          ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx);
-          CHK_(ptr);
-          CHK_(::_pbi::VerifyUTF8(str, "google.protobuf.Method.request_type_url"));
-        } else
-          goto handle_unusual;
-        continue;
-      // bool request_streaming = 3;
-      case 3:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 24)) {
-          _impl_.request_streaming_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr);
-          CHK_(ptr);
-        } else
-          goto handle_unusual;
-        continue;
-      // string response_type_url = 4;
-      case 4:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 34)) {
-          auto str = _internal_mutable_response_type_url();
-          ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx);
-          CHK_(ptr);
-          CHK_(::_pbi::VerifyUTF8(str, "google.protobuf.Method.response_type_url"));
-        } else
-          goto handle_unusual;
-        continue;
-      // bool response_streaming = 5;
-      case 5:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 40)) {
-          _impl_.response_streaming_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr);
-          CHK_(ptr);
-        } else
-          goto handle_unusual;
-        continue;
-      // repeated .google.protobuf.Option options = 6;
-      case 6:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 50)) {
-          ptr -= 1;
-          do {
-            ptr += 1;
-            ptr = ctx->ParseMessage(_internal_add_options(), ptr);
-            CHK_(ptr);
-            if (!ctx->DataAvailable(ptr)) break;
-          } while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<50>(ptr));
-        } else
-          goto handle_unusual;
-        continue;
-      // .google.protobuf.Syntax syntax = 7;
-      case 7:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 56)) {
-          uint64_t val = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr);
-          CHK_(ptr);
-          _internal_set_syntax(static_cast<::PROTOBUF_NAMESPACE_ID::Syntax>(val));
-        } else
-          goto handle_unusual;
-        continue;
-      default:
-        goto handle_unusual;
-    }  // switch
-  handle_unusual:
-    if ((tag == 0) || ((tag & 7) == 4)) {
-      CHK_(ptr);
-      ctx->SetLastTag(tag);
-      goto message_done;
-    }
-    ptr = UnknownFieldParse(
-        tag,
-        _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(),
-        ptr, ctx);
-    CHK_(ptr != nullptr);
-  }  // while
-message_done:
-  return ptr;
-failure:
-  ptr = nullptr;
-  goto message_done;
-#undef CHK_
-}
-
-uint8_t* Method::_InternalSerialize(
-    uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.Method)
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  // string name = 1;
-  if (!this->_internal_name().empty()) {
-    ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String(
-      this->_internal_name().data(), static_cast<int>(this->_internal_name().length()),
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE,
-      "google.protobuf.Method.name");
-    target = stream->WriteStringMaybeAliased(
-        1, this->_internal_name(), target);
-  }
-
-  // string request_type_url = 2;
-  if (!this->_internal_request_type_url().empty()) {
-    ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String(
-      this->_internal_request_type_url().data(), static_cast<int>(this->_internal_request_type_url().length()),
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE,
-      "google.protobuf.Method.request_type_url");
-    target = stream->WriteStringMaybeAliased(
-        2, this->_internal_request_type_url(), target);
-  }
-
-  // bool request_streaming = 3;
-  if (this->_internal_request_streaming() != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteBoolToArray(3, this->_internal_request_streaming(), target);
-  }
-
-  // string response_type_url = 4;
-  if (!this->_internal_response_type_url().empty()) {
-    ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String(
-      this->_internal_response_type_url().data(), static_cast<int>(this->_internal_response_type_url().length()),
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE,
-      "google.protobuf.Method.response_type_url");
-    target = stream->WriteStringMaybeAliased(
-        4, this->_internal_response_type_url(), target);
-  }
-
-  // bool response_streaming = 5;
-  if (this->_internal_response_streaming() != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteBoolToArray(5, this->_internal_response_streaming(), target);
-  }
-
-  // repeated .google.protobuf.Option options = 6;
-  for (unsigned i = 0,
-      n = static_cast<unsigned>(this->_internal_options_size()); i < n; i++) {
-    const auto& repfield = this->_internal_options(i);
-    target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
-        InternalWriteMessage(6, repfield, repfield.GetCachedSize(), target, stream);
-  }
-
-  // .google.protobuf.Syntax syntax = 7;
-  if (this->_internal_syntax() != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteEnumToArray(
-      7, this->_internal_syntax(), target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-        _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.Method)
-  return target;
-}
-
-size_t Method::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:google.protobuf.Method)
-  size_t total_size = 0;
-
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // repeated .google.protobuf.Option options = 6;
-  total_size += 1UL * this->_internal_options_size();
-  for (const auto& msg : this->_impl_.options_) {
-    total_size +=
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(msg);
-  }
-
-  // string name = 1;
-  if (!this->_internal_name().empty()) {
-    total_size += 1 +
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize(
-        this->_internal_name());
-  }
-
-  // string request_type_url = 2;
-  if (!this->_internal_request_type_url().empty()) {
-    total_size += 1 +
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize(
-        this->_internal_request_type_url());
-  }
-
-  // string response_type_url = 4;
-  if (!this->_internal_response_type_url().empty()) {
-    total_size += 1 +
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize(
-        this->_internal_response_type_url());
-  }
-
-  // bool request_streaming = 3;
-  if (this->_internal_request_streaming() != 0) {
-    total_size += 1 + 1;
-  }
-
-  // bool response_streaming = 5;
-  if (this->_internal_response_streaming() != 0) {
-    total_size += 1 + 1;
-  }
-
-  // .google.protobuf.Syntax syntax = 7;
-  if (this->_internal_syntax() != 0) {
-    total_size += 1 +
-      ::_pbi::WireFormatLite::EnumSize(this->_internal_syntax());
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData Method::_class_data_ = {
-    ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck,
-    Method::MergeImpl
-};
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*Method::GetClassData() const { return &_class_data_; }
-
-
-void Method::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) {
-  auto* const _this = static_cast<Method*>(&to_msg);
-  auto& from = static_cast<const Method&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.Method)
-  GOOGLE_DCHECK_NE(&from, _this);
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  _this->_impl_.options_.MergeFrom(from._impl_.options_);
-  if (!from._internal_name().empty()) {
-    _this->_internal_set_name(from._internal_name());
-  }
-  if (!from._internal_request_type_url().empty()) {
-    _this->_internal_set_request_type_url(from._internal_request_type_url());
-  }
-  if (!from._internal_response_type_url().empty()) {
-    _this->_internal_set_response_type_url(from._internal_response_type_url());
-  }
-  if (from._internal_request_streaming() != 0) {
-    _this->_internal_set_request_streaming(from._internal_request_streaming());
-  }
-  if (from._internal_response_streaming() != 0) {
-    _this->_internal_set_response_streaming(from._internal_response_streaming());
-  }
-  if (from._internal_syntax() != 0) {
-    _this->_internal_set_syntax(from._internal_syntax());
-  }
-  _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void Method::CopyFrom(const Method& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.Method)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool Method::IsInitialized() const {
-  return true;
-}
-
-void Method::InternalSwap(Method* other) {
-  using std::swap;
-  auto* lhs_arena = GetArenaForAllocation();
-  auto* rhs_arena = other->GetArenaForAllocation();
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  _impl_.options_.InternalSwap(&other->_impl_.options_);
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::InternalSwap(
-      &_impl_.name_, lhs_arena,
-      &other->_impl_.name_, rhs_arena
-  );
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::InternalSwap(
-      &_impl_.request_type_url_, lhs_arena,
-      &other->_impl_.request_type_url_, rhs_arena
-  );
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::InternalSwap(
-      &_impl_.response_type_url_, lhs_arena,
-      &other->_impl_.response_type_url_, rhs_arena
-  );
-  ::PROTOBUF_NAMESPACE_ID::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(Method, _impl_.syntax_)
-      + sizeof(Method::_impl_.syntax_)
-      - PROTOBUF_FIELD_OFFSET(Method, _impl_.request_streaming_)>(
-          reinterpret_cast<char*>(&_impl_.request_streaming_),
-          reinterpret_cast<char*>(&other->_impl_.request_streaming_));
-}
-
-::PROTOBUF_NAMESPACE_ID::Metadata Method::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_google_2fprotobuf_2fapi_2eproto_getter, &descriptor_table_google_2fprotobuf_2fapi_2eproto_once,
-      file_level_metadata_google_2fprotobuf_2fapi_2eproto[1]);
-}
-
-// ===================================================================
-
-class Mixin::_Internal {
- public:
-};
-
-Mixin::Mixin(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                         bool is_message_owned)
-  : ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned) {
-  SharedCtor(arena, is_message_owned);
-  // @@protoc_insertion_point(arena_constructor:google.protobuf.Mixin)
-}
-Mixin::Mixin(const Mixin& from)
-  : ::PROTOBUF_NAMESPACE_ID::Message() {
-  Mixin* const _this = this; (void)_this;
-  new (&_impl_) Impl_{
-      decltype(_impl_.name_){}
-    , decltype(_impl_.root_){}
-    , /*decltype(_impl_._cached_size_)*/{}};
-
-  _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-  _impl_.name_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.name_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (!from._internal_name().empty()) {
-    _this->_impl_.name_.Set(from._internal_name(), 
-      _this->GetArenaForAllocation());
-  }
-  _impl_.root_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.root_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (!from._internal_root().empty()) {
-    _this->_impl_.root_.Set(from._internal_root(), 
-      _this->GetArenaForAllocation());
-  }
-  // @@protoc_insertion_point(copy_constructor:google.protobuf.Mixin)
-}
-
-inline void Mixin::SharedCtor(
-    ::_pb::Arena* arena, bool is_message_owned) {
-  (void)arena;
-  (void)is_message_owned;
-  new (&_impl_) Impl_{
-      decltype(_impl_.name_){}
-    , decltype(_impl_.root_){}
-    , /*decltype(_impl_._cached_size_)*/{}
-  };
-  _impl_.name_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.name_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  _impl_.root_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.root_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-}
-
-Mixin::~Mixin() {
-  // @@protoc_insertion_point(destructor:google.protobuf.Mixin)
-  if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) {
-  (void)arena;
-    return;
-  }
-  SharedDtor();
-}
-
-inline void Mixin::SharedDtor() {
-  GOOGLE_DCHECK(GetArenaForAllocation() == nullptr);
-  _impl_.name_.Destroy();
-  _impl_.root_.Destroy();
-}
-
-void Mixin::SetCachedSize(int size) const {
-  _impl_._cached_size_.Set(size);
-}
-
-void Mixin::Clear() {
-// @@protoc_insertion_point(message_clear_start:google.protobuf.Mixin)
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.name_.ClearToEmpty();
-  _impl_.root_.ClearToEmpty();
-  _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>();
-}
-
-const char* Mixin::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) {
-#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure
-  while (!ctx->Done(&ptr)) {
-    uint32_t tag;
-    ptr = ::_pbi::ReadTag(ptr, &tag);
-    switch (tag >> 3) {
-      // string name = 1;
-      case 1:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 10)) {
-          auto str = _internal_mutable_name();
-          ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx);
-          CHK_(ptr);
-          CHK_(::_pbi::VerifyUTF8(str, "google.protobuf.Mixin.name"));
-        } else
-          goto handle_unusual;
-        continue;
-      // string root = 2;
-      case 2:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 18)) {
-          auto str = _internal_mutable_root();
-          ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx);
-          CHK_(ptr);
-          CHK_(::_pbi::VerifyUTF8(str, "google.protobuf.Mixin.root"));
-        } else
-          goto handle_unusual;
-        continue;
-      default:
-        goto handle_unusual;
-    }  // switch
-  handle_unusual:
-    if ((tag == 0) || ((tag & 7) == 4)) {
-      CHK_(ptr);
-      ctx->SetLastTag(tag);
-      goto message_done;
-    }
-    ptr = UnknownFieldParse(
-        tag,
-        _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(),
-        ptr, ctx);
-    CHK_(ptr != nullptr);
-  }  // while
-message_done:
-  return ptr;
-failure:
-  ptr = nullptr;
-  goto message_done;
-#undef CHK_
-}
-
-uint8_t* Mixin::_InternalSerialize(
-    uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.Mixin)
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  // string name = 1;
-  if (!this->_internal_name().empty()) {
-    ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String(
-      this->_internal_name().data(), static_cast<int>(this->_internal_name().length()),
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE,
-      "google.protobuf.Mixin.name");
-    target = stream->WriteStringMaybeAliased(
-        1, this->_internal_name(), target);
-  }
-
-  // string root = 2;
-  if (!this->_internal_root().empty()) {
-    ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String(
-      this->_internal_root().data(), static_cast<int>(this->_internal_root().length()),
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE,
-      "google.protobuf.Mixin.root");
-    target = stream->WriteStringMaybeAliased(
-        2, this->_internal_root(), target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-        _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.Mixin)
-  return target;
-}
-
-size_t Mixin::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:google.protobuf.Mixin)
-  size_t total_size = 0;
-
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // string name = 1;
-  if (!this->_internal_name().empty()) {
-    total_size += 1 +
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize(
-        this->_internal_name());
-  }
-
-  // string root = 2;
-  if (!this->_internal_root().empty()) {
-    total_size += 1 +
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize(
-        this->_internal_root());
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData Mixin::_class_data_ = {
-    ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck,
-    Mixin::MergeImpl
-};
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*Mixin::GetClassData() const { return &_class_data_; }
-
-
-void Mixin::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) {
-  auto* const _this = static_cast<Mixin*>(&to_msg);
-  auto& from = static_cast<const Mixin&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.Mixin)
-  GOOGLE_DCHECK_NE(&from, _this);
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if (!from._internal_name().empty()) {
-    _this->_internal_set_name(from._internal_name());
-  }
-  if (!from._internal_root().empty()) {
-    _this->_internal_set_root(from._internal_root());
-  }
-  _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void Mixin::CopyFrom(const Mixin& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.Mixin)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool Mixin::IsInitialized() const {
-  return true;
-}
-
-void Mixin::InternalSwap(Mixin* other) {
-  using std::swap;
-  auto* lhs_arena = GetArenaForAllocation();
-  auto* rhs_arena = other->GetArenaForAllocation();
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::InternalSwap(
-      &_impl_.name_, lhs_arena,
-      &other->_impl_.name_, rhs_arena
-  );
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::InternalSwap(
-      &_impl_.root_, lhs_arena,
-      &other->_impl_.root_, rhs_arena
-  );
-}
-
-::PROTOBUF_NAMESPACE_ID::Metadata Mixin::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_google_2fprotobuf_2fapi_2eproto_getter, &descriptor_table_google_2fprotobuf_2fapi_2eproto_once,
-      file_level_metadata_google_2fprotobuf_2fapi_2eproto[2]);
-}
-
-// @@protoc_insertion_point(namespace_scope)
-PROTOBUF_NAMESPACE_CLOSE
-PROTOBUF_NAMESPACE_OPEN
-template<> PROTOBUF_NOINLINE ::PROTOBUF_NAMESPACE_ID::Api*
-Arena::CreateMaybeMessage< ::PROTOBUF_NAMESPACE_ID::Api >(Arena* arena) {
-  return Arena::CreateMessageInternal< ::PROTOBUF_NAMESPACE_ID::Api >(arena);
-}
-template<> PROTOBUF_NOINLINE ::PROTOBUF_NAMESPACE_ID::Method*
-Arena::CreateMaybeMessage< ::PROTOBUF_NAMESPACE_ID::Method >(Arena* arena) {
-  return Arena::CreateMessageInternal< ::PROTOBUF_NAMESPACE_ID::Method >(arena);
-}
-template<> PROTOBUF_NOINLINE ::PROTOBUF_NAMESPACE_ID::Mixin*
-Arena::CreateMaybeMessage< ::PROTOBUF_NAMESPACE_ID::Mixin >(Arena* arena) {
-  return Arena::CreateMessageInternal< ::PROTOBUF_NAMESPACE_ID::Mixin >(arena);
-}
-PROTOBUF_NAMESPACE_CLOSE
-
-// @@protoc_insertion_point(global_scope)
-#include <google/protobuf/port_undef.inc>
diff --git a/libs/protobuf/src/google/protobuf/api.pb.h b/libs/protobuf/src/google/protobuf/api.pb.h
deleted file mode 100644
index 2c45489..0000000
--- a/libs/protobuf/src/google/protobuf/api.pb.h
+++ /dev/null
@@ -1,1437 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/protobuf/api.proto
-
-#ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fapi_2eproto
-#define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fapi_2eproto
-
-#include <limits>
-#include <string>
-
-#include <google/protobuf/port_def.inc>
-#if PROTOBUF_VERSION < 3021000
-#error This file was generated by a newer version of protoc which is
-#error incompatible with your Protocol Buffer headers. Please update
-#error your headers.
-#endif
-#if 3021012 < PROTOBUF_MIN_PROTOC_VERSION
-#error This file was generated by an older version of protoc which is
-#error incompatible with your Protocol Buffer headers. Please
-#error regenerate this file with a newer version of protoc.
-#endif
-
-#include <google/protobuf/port_undef.inc>
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/arena.h>
-#include <google/protobuf/arenastring.h>
-#include <google/protobuf/generated_message_util.h>
-#include <google/protobuf/metadata_lite.h>
-#include <google/protobuf/generated_message_reflection.h>
-#include <google/protobuf/message.h>
-#include <google/protobuf/repeated_field.h>  // IWYU pragma: export
-#include <google/protobuf/extension_set.h>  // IWYU pragma: export
-#include <google/protobuf/unknown_field_set.h>
-#include <google/protobuf/source_context.pb.h>
-#include <google/protobuf/type.pb.h>
-// @@protoc_insertion_point(includes)
-#include <google/protobuf/port_def.inc>
-#define PROTOBUF_INTERNAL_EXPORT_google_2fprotobuf_2fapi_2eproto PROTOBUF_EXPORT
-PROTOBUF_NAMESPACE_OPEN
-namespace internal {
-class AnyMetadata;
-}  // namespace internal
-PROTOBUF_NAMESPACE_CLOSE
-
-// Internal implementation detail -- do not use these members.
-struct PROTOBUF_EXPORT TableStruct_google_2fprotobuf_2fapi_2eproto {
-  static const uint32_t offsets[];
-};
-PROTOBUF_EXPORT extern const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable descriptor_table_google_2fprotobuf_2fapi_2eproto;
-PROTOBUF_NAMESPACE_OPEN
-class Api;
-struct ApiDefaultTypeInternal;
-PROTOBUF_EXPORT extern ApiDefaultTypeInternal _Api_default_instance_;
-class Method;
-struct MethodDefaultTypeInternal;
-PROTOBUF_EXPORT extern MethodDefaultTypeInternal _Method_default_instance_;
-class Mixin;
-struct MixinDefaultTypeInternal;
-PROTOBUF_EXPORT extern MixinDefaultTypeInternal _Mixin_default_instance_;
-PROTOBUF_NAMESPACE_CLOSE
-PROTOBUF_NAMESPACE_OPEN
-template<> PROTOBUF_EXPORT ::PROTOBUF_NAMESPACE_ID::Api* Arena::CreateMaybeMessage<::PROTOBUF_NAMESPACE_ID::Api>(Arena*);
-template<> PROTOBUF_EXPORT ::PROTOBUF_NAMESPACE_ID::Method* Arena::CreateMaybeMessage<::PROTOBUF_NAMESPACE_ID::Method>(Arena*);
-template<> PROTOBUF_EXPORT ::PROTOBUF_NAMESPACE_ID::Mixin* Arena::CreateMaybeMessage<::PROTOBUF_NAMESPACE_ID::Mixin>(Arena*);
-PROTOBUF_NAMESPACE_CLOSE
-PROTOBUF_NAMESPACE_OPEN
-
-// ===================================================================
-
-class PROTOBUF_EXPORT Api final :
-    public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:google.protobuf.Api) */ {
- public:
-  inline Api() : Api(nullptr) {}
-  ~Api() override;
-  explicit PROTOBUF_CONSTEXPR Api(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
-
-  Api(const Api& from);
-  Api(Api&& from) noexcept
-    : Api() {
-    *this = ::std::move(from);
-  }
-
-  inline Api& operator=(const Api& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline Api& operator=(Api&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetOwningArena() == from.GetOwningArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetOwningArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const Api& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const Api* internal_default_instance() {
-    return reinterpret_cast<const Api*>(
-               &_Api_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    0;
-
-  friend void swap(Api& a, Api& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(Api* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() != nullptr &&
-        GetOwningArena() == other->GetOwningArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() == other->GetOwningArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(Api* other) {
-    if (other == this) return;
-    GOOGLE_DCHECK(GetOwningArena() == other->GetOwningArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  Api* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<Api>(arena);
-  }
-  using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
-  void CopyFrom(const Api& from);
-  using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom( const Api& from) {
-    Api::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  uint8_t* _InternalSerialize(
-      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
-
-  private:
-  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
-  void SharedDtor();
-  void SetCachedSize(int size) const final;
-  void InternalSwap(Api* other);
-
-  private:
-  friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
-  static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
-    return "google.protobuf.Api";
-  }
-  protected:
-  explicit Api(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                       bool is_message_owned = false);
-  public:
-
-  static const ClassData _class_data_;
-  const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*GetClassData() const final;
-
-  ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kMethodsFieldNumber = 2,
-    kOptionsFieldNumber = 3,
-    kMixinsFieldNumber = 6,
-    kNameFieldNumber = 1,
-    kVersionFieldNumber = 4,
-    kSourceContextFieldNumber = 5,
-    kSyntaxFieldNumber = 7,
-  };
-  // repeated .google.protobuf.Method methods = 2;
-  int methods_size() const;
-  private:
-  int _internal_methods_size() const;
-  public:
-  void clear_methods();
-  ::PROTOBUF_NAMESPACE_ID::Method* mutable_methods(int index);
-  ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::Method >*
-      mutable_methods();
-  private:
-  const ::PROTOBUF_NAMESPACE_ID::Method& _internal_methods(int index) const;
-  ::PROTOBUF_NAMESPACE_ID::Method* _internal_add_methods();
-  public:
-  const ::PROTOBUF_NAMESPACE_ID::Method& methods(int index) const;
-  ::PROTOBUF_NAMESPACE_ID::Method* add_methods();
-  const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::Method >&
-      methods() const;
-
-  // repeated .google.protobuf.Option options = 3;
-  int options_size() const;
-  private:
-  int _internal_options_size() const;
-  public:
-  void clear_options();
-  ::PROTOBUF_NAMESPACE_ID::Option* mutable_options(int index);
-  ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::Option >*
-      mutable_options();
-  private:
-  const ::PROTOBUF_NAMESPACE_ID::Option& _internal_options(int index) const;
-  ::PROTOBUF_NAMESPACE_ID::Option* _internal_add_options();
-  public:
-  const ::PROTOBUF_NAMESPACE_ID::Option& options(int index) const;
-  ::PROTOBUF_NAMESPACE_ID::Option* add_options();
-  const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::Option >&
-      options() const;
-
-  // repeated .google.protobuf.Mixin mixins = 6;
-  int mixins_size() const;
-  private:
-  int _internal_mixins_size() const;
-  public:
-  void clear_mixins();
-  ::PROTOBUF_NAMESPACE_ID::Mixin* mutable_mixins(int index);
-  ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::Mixin >*
-      mutable_mixins();
-  private:
-  const ::PROTOBUF_NAMESPACE_ID::Mixin& _internal_mixins(int index) const;
-  ::PROTOBUF_NAMESPACE_ID::Mixin* _internal_add_mixins();
-  public:
-  const ::PROTOBUF_NAMESPACE_ID::Mixin& mixins(int index) const;
-  ::PROTOBUF_NAMESPACE_ID::Mixin* add_mixins();
-  const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::Mixin >&
-      mixins() const;
-
-  // string name = 1;
-  void clear_name();
-  const std::string& name() const;
-  template <typename ArgT0 = const std::string&, typename... ArgT>
-  void set_name(ArgT0&& arg0, ArgT... args);
-  std::string* mutable_name();
-  PROTOBUF_NODISCARD std::string* release_name();
-  void set_allocated_name(std::string* name);
-  private:
-  const std::string& _internal_name() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_name(const std::string& value);
-  std::string* _internal_mutable_name();
-  public:
-
-  // string version = 4;
-  void clear_version();
-  const std::string& version() const;
-  template <typename ArgT0 = const std::string&, typename... ArgT>
-  void set_version(ArgT0&& arg0, ArgT... args);
-  std::string* mutable_version();
-  PROTOBUF_NODISCARD std::string* release_version();
-  void set_allocated_version(std::string* version);
-  private:
-  const std::string& _internal_version() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_version(const std::string& value);
-  std::string* _internal_mutable_version();
-  public:
-
-  // .google.protobuf.SourceContext source_context = 5;
-  bool has_source_context() const;
-  private:
-  bool _internal_has_source_context() const;
-  public:
-  void clear_source_context();
-  const ::PROTOBUF_NAMESPACE_ID::SourceContext& source_context() const;
-  PROTOBUF_NODISCARD ::PROTOBUF_NAMESPACE_ID::SourceContext* release_source_context();
-  ::PROTOBUF_NAMESPACE_ID::SourceContext* mutable_source_context();
-  void set_allocated_source_context(::PROTOBUF_NAMESPACE_ID::SourceContext* source_context);
-  private:
-  const ::PROTOBUF_NAMESPACE_ID::SourceContext& _internal_source_context() const;
-  ::PROTOBUF_NAMESPACE_ID::SourceContext* _internal_mutable_source_context();
-  public:
-  void unsafe_arena_set_allocated_source_context(
-      ::PROTOBUF_NAMESPACE_ID::SourceContext* source_context);
-  ::PROTOBUF_NAMESPACE_ID::SourceContext* unsafe_arena_release_source_context();
-
-  // .google.protobuf.Syntax syntax = 7;
-  void clear_syntax();
-  ::PROTOBUF_NAMESPACE_ID::Syntax syntax() const;
-  void set_syntax(::PROTOBUF_NAMESPACE_ID::Syntax value);
-  private:
-  ::PROTOBUF_NAMESPACE_ID::Syntax _internal_syntax() const;
-  void _internal_set_syntax(::PROTOBUF_NAMESPACE_ID::Syntax value);
-  public:
-
-  // @@protoc_insertion_point(class_scope:google.protobuf.Api)
- private:
-  class _Internal;
-
-  template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
-  typedef void InternalArenaConstructable_;
-  typedef void DestructorSkippable_;
-  struct Impl_ {
-    ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::Method > methods_;
-    ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::Option > options_;
-    ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::Mixin > mixins_;
-    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr name_;
-    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr version_;
-    ::PROTOBUF_NAMESPACE_ID::SourceContext* source_context_;
-    int syntax_;
-    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_google_2fprotobuf_2fapi_2eproto;
-};
-// -------------------------------------------------------------------
-
-class PROTOBUF_EXPORT Method final :
-    public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:google.protobuf.Method) */ {
- public:
-  inline Method() : Method(nullptr) {}
-  ~Method() override;
-  explicit PROTOBUF_CONSTEXPR Method(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
-
-  Method(const Method& from);
-  Method(Method&& from) noexcept
-    : Method() {
-    *this = ::std::move(from);
-  }
-
-  inline Method& operator=(const Method& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline Method& operator=(Method&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetOwningArena() == from.GetOwningArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetOwningArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const Method& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const Method* internal_default_instance() {
-    return reinterpret_cast<const Method*>(
-               &_Method_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    1;
-
-  friend void swap(Method& a, Method& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(Method* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() != nullptr &&
-        GetOwningArena() == other->GetOwningArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() == other->GetOwningArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(Method* other) {
-    if (other == this) return;
-    GOOGLE_DCHECK(GetOwningArena() == other->GetOwningArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  Method* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<Method>(arena);
-  }
-  using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
-  void CopyFrom(const Method& from);
-  using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom( const Method& from) {
-    Method::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  uint8_t* _InternalSerialize(
-      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
-
-  private:
-  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
-  void SharedDtor();
-  void SetCachedSize(int size) const final;
-  void InternalSwap(Method* other);
-
-  private:
-  friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
-  static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
-    return "google.protobuf.Method";
-  }
-  protected:
-  explicit Method(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                       bool is_message_owned = false);
-  public:
-
-  static const ClassData _class_data_;
-  const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*GetClassData() const final;
-
-  ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kOptionsFieldNumber = 6,
-    kNameFieldNumber = 1,
-    kRequestTypeUrlFieldNumber = 2,
-    kResponseTypeUrlFieldNumber = 4,
-    kRequestStreamingFieldNumber = 3,
-    kResponseStreamingFieldNumber = 5,
-    kSyntaxFieldNumber = 7,
-  };
-  // repeated .google.protobuf.Option options = 6;
-  int options_size() const;
-  private:
-  int _internal_options_size() const;
-  public:
-  void clear_options();
-  ::PROTOBUF_NAMESPACE_ID::Option* mutable_options(int index);
-  ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::Option >*
-      mutable_options();
-  private:
-  const ::PROTOBUF_NAMESPACE_ID::Option& _internal_options(int index) const;
-  ::PROTOBUF_NAMESPACE_ID::Option* _internal_add_options();
-  public:
-  const ::PROTOBUF_NAMESPACE_ID::Option& options(int index) const;
-  ::PROTOBUF_NAMESPACE_ID::Option* add_options();
-  const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::Option >&
-      options() const;
-
-  // string name = 1;
-  void clear_name();
-  const std::string& name() const;
-  template <typename ArgT0 = const std::string&, typename... ArgT>
-  void set_name(ArgT0&& arg0, ArgT... args);
-  std::string* mutable_name();
-  PROTOBUF_NODISCARD std::string* release_name();
-  void set_allocated_name(std::string* name);
-  private:
-  const std::string& _internal_name() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_name(const std::string& value);
-  std::string* _internal_mutable_name();
-  public:
-
-  // string request_type_url = 2;
-  void clear_request_type_url();
-  const std::string& request_type_url() const;
-  template <typename ArgT0 = const std::string&, typename... ArgT>
-  void set_request_type_url(ArgT0&& arg0, ArgT... args);
-  std::string* mutable_request_type_url();
-  PROTOBUF_NODISCARD std::string* release_request_type_url();
-  void set_allocated_request_type_url(std::string* request_type_url);
-  private:
-  const std::string& _internal_request_type_url() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_request_type_url(const std::string& value);
-  std::string* _internal_mutable_request_type_url();
-  public:
-
-  // string response_type_url = 4;
-  void clear_response_type_url();
-  const std::string& response_type_url() const;
-  template <typename ArgT0 = const std::string&, typename... ArgT>
-  void set_response_type_url(ArgT0&& arg0, ArgT... args);
-  std::string* mutable_response_type_url();
-  PROTOBUF_NODISCARD std::string* release_response_type_url();
-  void set_allocated_response_type_url(std::string* response_type_url);
-  private:
-  const std::string& _internal_response_type_url() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_response_type_url(const std::string& value);
-  std::string* _internal_mutable_response_type_url();
-  public:
-
-  // bool request_streaming = 3;
-  void clear_request_streaming();
-  bool request_streaming() const;
-  void set_request_streaming(bool value);
-  private:
-  bool _internal_request_streaming() const;
-  void _internal_set_request_streaming(bool value);
-  public:
-
-  // bool response_streaming = 5;
-  void clear_response_streaming();
-  bool response_streaming() const;
-  void set_response_streaming(bool value);
-  private:
-  bool _internal_response_streaming() const;
-  void _internal_set_response_streaming(bool value);
-  public:
-
-  // .google.protobuf.Syntax syntax = 7;
-  void clear_syntax();
-  ::PROTOBUF_NAMESPACE_ID::Syntax syntax() const;
-  void set_syntax(::PROTOBUF_NAMESPACE_ID::Syntax value);
-  private:
-  ::PROTOBUF_NAMESPACE_ID::Syntax _internal_syntax() const;
-  void _internal_set_syntax(::PROTOBUF_NAMESPACE_ID::Syntax value);
-  public:
-
-  // @@protoc_insertion_point(class_scope:google.protobuf.Method)
- private:
-  class _Internal;
-
-  template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
-  typedef void InternalArenaConstructable_;
-  typedef void DestructorSkippable_;
-  struct Impl_ {
-    ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::Option > options_;
-    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr name_;
-    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr request_type_url_;
-    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr response_type_url_;
-    bool request_streaming_;
-    bool response_streaming_;
-    int syntax_;
-    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_google_2fprotobuf_2fapi_2eproto;
-};
-// -------------------------------------------------------------------
-
-class PROTOBUF_EXPORT Mixin final :
-    public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:google.protobuf.Mixin) */ {
- public:
-  inline Mixin() : Mixin(nullptr) {}
-  ~Mixin() override;
-  explicit PROTOBUF_CONSTEXPR Mixin(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
-
-  Mixin(const Mixin& from);
-  Mixin(Mixin&& from) noexcept
-    : Mixin() {
-    *this = ::std::move(from);
-  }
-
-  inline Mixin& operator=(const Mixin& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline Mixin& operator=(Mixin&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetOwningArena() == from.GetOwningArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetOwningArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const Mixin& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const Mixin* internal_default_instance() {
-    return reinterpret_cast<const Mixin*>(
-               &_Mixin_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    2;
-
-  friend void swap(Mixin& a, Mixin& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(Mixin* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() != nullptr &&
-        GetOwningArena() == other->GetOwningArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() == other->GetOwningArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(Mixin* other) {
-    if (other == this) return;
-    GOOGLE_DCHECK(GetOwningArena() == other->GetOwningArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  Mixin* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<Mixin>(arena);
-  }
-  using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
-  void CopyFrom(const Mixin& from);
-  using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom( const Mixin& from) {
-    Mixin::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  uint8_t* _InternalSerialize(
-      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
-
-  private:
-  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
-  void SharedDtor();
-  void SetCachedSize(int size) const final;
-  void InternalSwap(Mixin* other);
-
-  private:
-  friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
-  static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
-    return "google.protobuf.Mixin";
-  }
-  protected:
-  explicit Mixin(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                       bool is_message_owned = false);
-  public:
-
-  static const ClassData _class_data_;
-  const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*GetClassData() const final;
-
-  ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kNameFieldNumber = 1,
-    kRootFieldNumber = 2,
-  };
-  // string name = 1;
-  void clear_name();
-  const std::string& name() const;
-  template <typename ArgT0 = const std::string&, typename... ArgT>
-  void set_name(ArgT0&& arg0, ArgT... args);
-  std::string* mutable_name();
-  PROTOBUF_NODISCARD std::string* release_name();
-  void set_allocated_name(std::string* name);
-  private:
-  const std::string& _internal_name() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_name(const std::string& value);
-  std::string* _internal_mutable_name();
-  public:
-
-  // string root = 2;
-  void clear_root();
-  const std::string& root() const;
-  template <typename ArgT0 = const std::string&, typename... ArgT>
-  void set_root(ArgT0&& arg0, ArgT... args);
-  std::string* mutable_root();
-  PROTOBUF_NODISCARD std::string* release_root();
-  void set_allocated_root(std::string* root);
-  private:
-  const std::string& _internal_root() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_root(const std::string& value);
-  std::string* _internal_mutable_root();
-  public:
-
-  // @@protoc_insertion_point(class_scope:google.protobuf.Mixin)
- private:
-  class _Internal;
-
-  template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
-  typedef void InternalArenaConstructable_;
-  typedef void DestructorSkippable_;
-  struct Impl_ {
-    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr name_;
-    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr root_;
-    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_google_2fprotobuf_2fapi_2eproto;
-};
-// ===================================================================
-
-
-// ===================================================================
-
-#ifdef __GNUC__
-  #pragma GCC diagnostic push
-  #pragma GCC diagnostic ignored "-Wstrict-aliasing"
-#endif  // __GNUC__
-// Api
-
-// string name = 1;
-inline void Api::clear_name() {
-  _impl_.name_.ClearToEmpty();
-}
-inline const std::string& Api::name() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.Api.name)
-  return _internal_name();
-}
-template <typename ArgT0, typename... ArgT>
-inline PROTOBUF_ALWAYS_INLINE
-void Api::set_name(ArgT0&& arg0, ArgT... args) {
- 
- _impl_.name_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
-  // @@protoc_insertion_point(field_set:google.protobuf.Api.name)
-}
-inline std::string* Api::mutable_name() {
-  std::string* _s = _internal_mutable_name();
-  // @@protoc_insertion_point(field_mutable:google.protobuf.Api.name)
-  return _s;
-}
-inline const std::string& Api::_internal_name() const {
-  return _impl_.name_.Get();
-}
-inline void Api::_internal_set_name(const std::string& value) {
-  
-  _impl_.name_.Set(value, GetArenaForAllocation());
-}
-inline std::string* Api::_internal_mutable_name() {
-  
-  return _impl_.name_.Mutable(GetArenaForAllocation());
-}
-inline std::string* Api::release_name() {
-  // @@protoc_insertion_point(field_release:google.protobuf.Api.name)
-  return _impl_.name_.Release();
-}
-inline void Api::set_allocated_name(std::string* name) {
-  if (name != nullptr) {
-    
-  } else {
-    
-  }
-  _impl_.name_.SetAllocated(name, GetArenaForAllocation());
-#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (_impl_.name_.IsDefault()) {
-    _impl_.name_.Set("", GetArenaForAllocation());
-  }
-#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:google.protobuf.Api.name)
-}
-
-// repeated .google.protobuf.Method methods = 2;
-inline int Api::_internal_methods_size() const {
-  return _impl_.methods_.size();
-}
-inline int Api::methods_size() const {
-  return _internal_methods_size();
-}
-inline void Api::clear_methods() {
-  _impl_.methods_.Clear();
-}
-inline ::PROTOBUF_NAMESPACE_ID::Method* Api::mutable_methods(int index) {
-  // @@protoc_insertion_point(field_mutable:google.protobuf.Api.methods)
-  return _impl_.methods_.Mutable(index);
-}
-inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::Method >*
-Api::mutable_methods() {
-  // @@protoc_insertion_point(field_mutable_list:google.protobuf.Api.methods)
-  return &_impl_.methods_;
-}
-inline const ::PROTOBUF_NAMESPACE_ID::Method& Api::_internal_methods(int index) const {
-  return _impl_.methods_.Get(index);
-}
-inline const ::PROTOBUF_NAMESPACE_ID::Method& Api::methods(int index) const {
-  // @@protoc_insertion_point(field_get:google.protobuf.Api.methods)
-  return _internal_methods(index);
-}
-inline ::PROTOBUF_NAMESPACE_ID::Method* Api::_internal_add_methods() {
-  return _impl_.methods_.Add();
-}
-inline ::PROTOBUF_NAMESPACE_ID::Method* Api::add_methods() {
-  ::PROTOBUF_NAMESPACE_ID::Method* _add = _internal_add_methods();
-  // @@protoc_insertion_point(field_add:google.protobuf.Api.methods)
-  return _add;
-}
-inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::Method >&
-Api::methods() const {
-  // @@protoc_insertion_point(field_list:google.protobuf.Api.methods)
-  return _impl_.methods_;
-}
-
-// repeated .google.protobuf.Option options = 3;
-inline int Api::_internal_options_size() const {
-  return _impl_.options_.size();
-}
-inline int Api::options_size() const {
-  return _internal_options_size();
-}
-inline ::PROTOBUF_NAMESPACE_ID::Option* Api::mutable_options(int index) {
-  // @@protoc_insertion_point(field_mutable:google.protobuf.Api.options)
-  return _impl_.options_.Mutable(index);
-}
-inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::Option >*
-Api::mutable_options() {
-  // @@protoc_insertion_point(field_mutable_list:google.protobuf.Api.options)
-  return &_impl_.options_;
-}
-inline const ::PROTOBUF_NAMESPACE_ID::Option& Api::_internal_options(int index) const {
-  return _impl_.options_.Get(index);
-}
-inline const ::PROTOBUF_NAMESPACE_ID::Option& Api::options(int index) const {
-  // @@protoc_insertion_point(field_get:google.protobuf.Api.options)
-  return _internal_options(index);
-}
-inline ::PROTOBUF_NAMESPACE_ID::Option* Api::_internal_add_options() {
-  return _impl_.options_.Add();
-}
-inline ::PROTOBUF_NAMESPACE_ID::Option* Api::add_options() {
-  ::PROTOBUF_NAMESPACE_ID::Option* _add = _internal_add_options();
-  // @@protoc_insertion_point(field_add:google.protobuf.Api.options)
-  return _add;
-}
-inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::Option >&
-Api::options() const {
-  // @@protoc_insertion_point(field_list:google.protobuf.Api.options)
-  return _impl_.options_;
-}
-
-// string version = 4;
-inline void Api::clear_version() {
-  _impl_.version_.ClearToEmpty();
-}
-inline const std::string& Api::version() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.Api.version)
-  return _internal_version();
-}
-template <typename ArgT0, typename... ArgT>
-inline PROTOBUF_ALWAYS_INLINE
-void Api::set_version(ArgT0&& arg0, ArgT... args) {
- 
- _impl_.version_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
-  // @@protoc_insertion_point(field_set:google.protobuf.Api.version)
-}
-inline std::string* Api::mutable_version() {
-  std::string* _s = _internal_mutable_version();
-  // @@protoc_insertion_point(field_mutable:google.protobuf.Api.version)
-  return _s;
-}
-inline const std::string& Api::_internal_version() const {
-  return _impl_.version_.Get();
-}
-inline void Api::_internal_set_version(const std::string& value) {
-  
-  _impl_.version_.Set(value, GetArenaForAllocation());
-}
-inline std::string* Api::_internal_mutable_version() {
-  
-  return _impl_.version_.Mutable(GetArenaForAllocation());
-}
-inline std::string* Api::release_version() {
-  // @@protoc_insertion_point(field_release:google.protobuf.Api.version)
-  return _impl_.version_.Release();
-}
-inline void Api::set_allocated_version(std::string* version) {
-  if (version != nullptr) {
-    
-  } else {
-    
-  }
-  _impl_.version_.SetAllocated(version, GetArenaForAllocation());
-#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (_impl_.version_.IsDefault()) {
-    _impl_.version_.Set("", GetArenaForAllocation());
-  }
-#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:google.protobuf.Api.version)
-}
-
-// .google.protobuf.SourceContext source_context = 5;
-inline bool Api::_internal_has_source_context() const {
-  return this != internal_default_instance() && _impl_.source_context_ != nullptr;
-}
-inline bool Api::has_source_context() const {
-  return _internal_has_source_context();
-}
-inline const ::PROTOBUF_NAMESPACE_ID::SourceContext& Api::_internal_source_context() const {
-  const ::PROTOBUF_NAMESPACE_ID::SourceContext* p = _impl_.source_context_;
-  return p != nullptr ? *p : reinterpret_cast<const ::PROTOBUF_NAMESPACE_ID::SourceContext&>(
-      ::PROTOBUF_NAMESPACE_ID::_SourceContext_default_instance_);
-}
-inline const ::PROTOBUF_NAMESPACE_ID::SourceContext& Api::source_context() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.Api.source_context)
-  return _internal_source_context();
-}
-inline void Api::unsafe_arena_set_allocated_source_context(
-    ::PROTOBUF_NAMESPACE_ID::SourceContext* source_context) {
-  if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.source_context_);
-  }
-  _impl_.source_context_ = source_context;
-  if (source_context) {
-    
-  } else {
-    
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:google.protobuf.Api.source_context)
-}
-inline ::PROTOBUF_NAMESPACE_ID::SourceContext* Api::release_source_context() {
-  
-  ::PROTOBUF_NAMESPACE_ID::SourceContext* temp = _impl_.source_context_;
-  _impl_.source_context_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
-  temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
-  if (GetArenaForAllocation() == nullptr) { delete old; }
-#else  // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArenaForAllocation() != nullptr) {
-    temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return temp;
-}
-inline ::PROTOBUF_NAMESPACE_ID::SourceContext* Api::unsafe_arena_release_source_context() {
-  // @@protoc_insertion_point(field_release:google.protobuf.Api.source_context)
-  
-  ::PROTOBUF_NAMESPACE_ID::SourceContext* temp = _impl_.source_context_;
-  _impl_.source_context_ = nullptr;
-  return temp;
-}
-inline ::PROTOBUF_NAMESPACE_ID::SourceContext* Api::_internal_mutable_source_context() {
-  
-  if (_impl_.source_context_ == nullptr) {
-    auto* p = CreateMaybeMessage<::PROTOBUF_NAMESPACE_ID::SourceContext>(GetArenaForAllocation());
-    _impl_.source_context_ = p;
-  }
-  return _impl_.source_context_;
-}
-inline ::PROTOBUF_NAMESPACE_ID::SourceContext* Api::mutable_source_context() {
-  ::PROTOBUF_NAMESPACE_ID::SourceContext* _msg = _internal_mutable_source_context();
-  // @@protoc_insertion_point(field_mutable:google.protobuf.Api.source_context)
-  return _msg;
-}
-inline void Api::set_allocated_source_context(::PROTOBUF_NAMESPACE_ID::SourceContext* source_context) {
-  ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
-  if (message_arena == nullptr) {
-    delete reinterpret_cast< ::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.source_context_);
-  }
-  if (source_context) {
-    ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(
-                reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(source_context));
-    if (message_arena != submessage_arena) {
-      source_context = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
-          message_arena, source_context, submessage_arena);
-    }
-    
-  } else {
-    
-  }
-  _impl_.source_context_ = source_context;
-  // @@protoc_insertion_point(field_set_allocated:google.protobuf.Api.source_context)
-}
-
-// repeated .google.protobuf.Mixin mixins = 6;
-inline int Api::_internal_mixins_size() const {
-  return _impl_.mixins_.size();
-}
-inline int Api::mixins_size() const {
-  return _internal_mixins_size();
-}
-inline void Api::clear_mixins() {
-  _impl_.mixins_.Clear();
-}
-inline ::PROTOBUF_NAMESPACE_ID::Mixin* Api::mutable_mixins(int index) {
-  // @@protoc_insertion_point(field_mutable:google.protobuf.Api.mixins)
-  return _impl_.mixins_.Mutable(index);
-}
-inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::Mixin >*
-Api::mutable_mixins() {
-  // @@protoc_insertion_point(field_mutable_list:google.protobuf.Api.mixins)
-  return &_impl_.mixins_;
-}
-inline const ::PROTOBUF_NAMESPACE_ID::Mixin& Api::_internal_mixins(int index) const {
-  return _impl_.mixins_.Get(index);
-}
-inline const ::PROTOBUF_NAMESPACE_ID::Mixin& Api::mixins(int index) const {
-  // @@protoc_insertion_point(field_get:google.protobuf.Api.mixins)
-  return _internal_mixins(index);
-}
-inline ::PROTOBUF_NAMESPACE_ID::Mixin* Api::_internal_add_mixins() {
-  return _impl_.mixins_.Add();
-}
-inline ::PROTOBUF_NAMESPACE_ID::Mixin* Api::add_mixins() {
-  ::PROTOBUF_NAMESPACE_ID::Mixin* _add = _internal_add_mixins();
-  // @@protoc_insertion_point(field_add:google.protobuf.Api.mixins)
-  return _add;
-}
-inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::Mixin >&
-Api::mixins() const {
-  // @@protoc_insertion_point(field_list:google.protobuf.Api.mixins)
-  return _impl_.mixins_;
-}
-
-// .google.protobuf.Syntax syntax = 7;
-inline void Api::clear_syntax() {
-  _impl_.syntax_ = 0;
-}
-inline ::PROTOBUF_NAMESPACE_ID::Syntax Api::_internal_syntax() const {
-  return static_cast< ::PROTOBUF_NAMESPACE_ID::Syntax >(_impl_.syntax_);
-}
-inline ::PROTOBUF_NAMESPACE_ID::Syntax Api::syntax() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.Api.syntax)
-  return _internal_syntax();
-}
-inline void Api::_internal_set_syntax(::PROTOBUF_NAMESPACE_ID::Syntax value) {
-  
-  _impl_.syntax_ = value;
-}
-inline void Api::set_syntax(::PROTOBUF_NAMESPACE_ID::Syntax value) {
-  _internal_set_syntax(value);
-  // @@protoc_insertion_point(field_set:google.protobuf.Api.syntax)
-}
-
-// -------------------------------------------------------------------
-
-// Method
-
-// string name = 1;
-inline void Method::clear_name() {
-  _impl_.name_.ClearToEmpty();
-}
-inline const std::string& Method::name() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.Method.name)
-  return _internal_name();
-}
-template <typename ArgT0, typename... ArgT>
-inline PROTOBUF_ALWAYS_INLINE
-void Method::set_name(ArgT0&& arg0, ArgT... args) {
- 
- _impl_.name_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
-  // @@protoc_insertion_point(field_set:google.protobuf.Method.name)
-}
-inline std::string* Method::mutable_name() {
-  std::string* _s = _internal_mutable_name();
-  // @@protoc_insertion_point(field_mutable:google.protobuf.Method.name)
-  return _s;
-}
-inline const std::string& Method::_internal_name() const {
-  return _impl_.name_.Get();
-}
-inline void Method::_internal_set_name(const std::string& value) {
-  
-  _impl_.name_.Set(value, GetArenaForAllocation());
-}
-inline std::string* Method::_internal_mutable_name() {
-  
-  return _impl_.name_.Mutable(GetArenaForAllocation());
-}
-inline std::string* Method::release_name() {
-  // @@protoc_insertion_point(field_release:google.protobuf.Method.name)
-  return _impl_.name_.Release();
-}
-inline void Method::set_allocated_name(std::string* name) {
-  if (name != nullptr) {
-    
-  } else {
-    
-  }
-  _impl_.name_.SetAllocated(name, GetArenaForAllocation());
-#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (_impl_.name_.IsDefault()) {
-    _impl_.name_.Set("", GetArenaForAllocation());
-  }
-#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:google.protobuf.Method.name)
-}
-
-// string request_type_url = 2;
-inline void Method::clear_request_type_url() {
-  _impl_.request_type_url_.ClearToEmpty();
-}
-inline const std::string& Method::request_type_url() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.Method.request_type_url)
-  return _internal_request_type_url();
-}
-template <typename ArgT0, typename... ArgT>
-inline PROTOBUF_ALWAYS_INLINE
-void Method::set_request_type_url(ArgT0&& arg0, ArgT... args) {
- 
- _impl_.request_type_url_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
-  // @@protoc_insertion_point(field_set:google.protobuf.Method.request_type_url)
-}
-inline std::string* Method::mutable_request_type_url() {
-  std::string* _s = _internal_mutable_request_type_url();
-  // @@protoc_insertion_point(field_mutable:google.protobuf.Method.request_type_url)
-  return _s;
-}
-inline const std::string& Method::_internal_request_type_url() const {
-  return _impl_.request_type_url_.Get();
-}
-inline void Method::_internal_set_request_type_url(const std::string& value) {
-  
-  _impl_.request_type_url_.Set(value, GetArenaForAllocation());
-}
-inline std::string* Method::_internal_mutable_request_type_url() {
-  
-  return _impl_.request_type_url_.Mutable(GetArenaForAllocation());
-}
-inline std::string* Method::release_request_type_url() {
-  // @@protoc_insertion_point(field_release:google.protobuf.Method.request_type_url)
-  return _impl_.request_type_url_.Release();
-}
-inline void Method::set_allocated_request_type_url(std::string* request_type_url) {
-  if (request_type_url != nullptr) {
-    
-  } else {
-    
-  }
-  _impl_.request_type_url_.SetAllocated(request_type_url, GetArenaForAllocation());
-#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (_impl_.request_type_url_.IsDefault()) {
-    _impl_.request_type_url_.Set("", GetArenaForAllocation());
-  }
-#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:google.protobuf.Method.request_type_url)
-}
-
-// bool request_streaming = 3;
-inline void Method::clear_request_streaming() {
-  _impl_.request_streaming_ = false;
-}
-inline bool Method::_internal_request_streaming() const {
-  return _impl_.request_streaming_;
-}
-inline bool Method::request_streaming() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.Method.request_streaming)
-  return _internal_request_streaming();
-}
-inline void Method::_internal_set_request_streaming(bool value) {
-  
-  _impl_.request_streaming_ = value;
-}
-inline void Method::set_request_streaming(bool value) {
-  _internal_set_request_streaming(value);
-  // @@protoc_insertion_point(field_set:google.protobuf.Method.request_streaming)
-}
-
-// string response_type_url = 4;
-inline void Method::clear_response_type_url() {
-  _impl_.response_type_url_.ClearToEmpty();
-}
-inline const std::string& Method::response_type_url() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.Method.response_type_url)
-  return _internal_response_type_url();
-}
-template <typename ArgT0, typename... ArgT>
-inline PROTOBUF_ALWAYS_INLINE
-void Method::set_response_type_url(ArgT0&& arg0, ArgT... args) {
- 
- _impl_.response_type_url_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
-  // @@protoc_insertion_point(field_set:google.protobuf.Method.response_type_url)
-}
-inline std::string* Method::mutable_response_type_url() {
-  std::string* _s = _internal_mutable_response_type_url();
-  // @@protoc_insertion_point(field_mutable:google.protobuf.Method.response_type_url)
-  return _s;
-}
-inline const std::string& Method::_internal_response_type_url() const {
-  return _impl_.response_type_url_.Get();
-}
-inline void Method::_internal_set_response_type_url(const std::string& value) {
-  
-  _impl_.response_type_url_.Set(value, GetArenaForAllocation());
-}
-inline std::string* Method::_internal_mutable_response_type_url() {
-  
-  return _impl_.response_type_url_.Mutable(GetArenaForAllocation());
-}
-inline std::string* Method::release_response_type_url() {
-  // @@protoc_insertion_point(field_release:google.protobuf.Method.response_type_url)
-  return _impl_.response_type_url_.Release();
-}
-inline void Method::set_allocated_response_type_url(std::string* response_type_url) {
-  if (response_type_url != nullptr) {
-    
-  } else {
-    
-  }
-  _impl_.response_type_url_.SetAllocated(response_type_url, GetArenaForAllocation());
-#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (_impl_.response_type_url_.IsDefault()) {
-    _impl_.response_type_url_.Set("", GetArenaForAllocation());
-  }
-#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:google.protobuf.Method.response_type_url)
-}
-
-// bool response_streaming = 5;
-inline void Method::clear_response_streaming() {
-  _impl_.response_streaming_ = false;
-}
-inline bool Method::_internal_response_streaming() const {
-  return _impl_.response_streaming_;
-}
-inline bool Method::response_streaming() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.Method.response_streaming)
-  return _internal_response_streaming();
-}
-inline void Method::_internal_set_response_streaming(bool value) {
-  
-  _impl_.response_streaming_ = value;
-}
-inline void Method::set_response_streaming(bool value) {
-  _internal_set_response_streaming(value);
-  // @@protoc_insertion_point(field_set:google.protobuf.Method.response_streaming)
-}
-
-// repeated .google.protobuf.Option options = 6;
-inline int Method::_internal_options_size() const {
-  return _impl_.options_.size();
-}
-inline int Method::options_size() const {
-  return _internal_options_size();
-}
-inline ::PROTOBUF_NAMESPACE_ID::Option* Method::mutable_options(int index) {
-  // @@protoc_insertion_point(field_mutable:google.protobuf.Method.options)
-  return _impl_.options_.Mutable(index);
-}
-inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::Option >*
-Method::mutable_options() {
-  // @@protoc_insertion_point(field_mutable_list:google.protobuf.Method.options)
-  return &_impl_.options_;
-}
-inline const ::PROTOBUF_NAMESPACE_ID::Option& Method::_internal_options(int index) const {
-  return _impl_.options_.Get(index);
-}
-inline const ::PROTOBUF_NAMESPACE_ID::Option& Method::options(int index) const {
-  // @@protoc_insertion_point(field_get:google.protobuf.Method.options)
-  return _internal_options(index);
-}
-inline ::PROTOBUF_NAMESPACE_ID::Option* Method::_internal_add_options() {
-  return _impl_.options_.Add();
-}
-inline ::PROTOBUF_NAMESPACE_ID::Option* Method::add_options() {
-  ::PROTOBUF_NAMESPACE_ID::Option* _add = _internal_add_options();
-  // @@protoc_insertion_point(field_add:google.protobuf.Method.options)
-  return _add;
-}
-inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::Option >&
-Method::options() const {
-  // @@protoc_insertion_point(field_list:google.protobuf.Method.options)
-  return _impl_.options_;
-}
-
-// .google.protobuf.Syntax syntax = 7;
-inline void Method::clear_syntax() {
-  _impl_.syntax_ = 0;
-}
-inline ::PROTOBUF_NAMESPACE_ID::Syntax Method::_internal_syntax() const {
-  return static_cast< ::PROTOBUF_NAMESPACE_ID::Syntax >(_impl_.syntax_);
-}
-inline ::PROTOBUF_NAMESPACE_ID::Syntax Method::syntax() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.Method.syntax)
-  return _internal_syntax();
-}
-inline void Method::_internal_set_syntax(::PROTOBUF_NAMESPACE_ID::Syntax value) {
-  
-  _impl_.syntax_ = value;
-}
-inline void Method::set_syntax(::PROTOBUF_NAMESPACE_ID::Syntax value) {
-  _internal_set_syntax(value);
-  // @@protoc_insertion_point(field_set:google.protobuf.Method.syntax)
-}
-
-// -------------------------------------------------------------------
-
-// Mixin
-
-// string name = 1;
-inline void Mixin::clear_name() {
-  _impl_.name_.ClearToEmpty();
-}
-inline const std::string& Mixin::name() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.Mixin.name)
-  return _internal_name();
-}
-template <typename ArgT0, typename... ArgT>
-inline PROTOBUF_ALWAYS_INLINE
-void Mixin::set_name(ArgT0&& arg0, ArgT... args) {
- 
- _impl_.name_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
-  // @@protoc_insertion_point(field_set:google.protobuf.Mixin.name)
-}
-inline std::string* Mixin::mutable_name() {
-  std::string* _s = _internal_mutable_name();
-  // @@protoc_insertion_point(field_mutable:google.protobuf.Mixin.name)
-  return _s;
-}
-inline const std::string& Mixin::_internal_name() const {
-  return _impl_.name_.Get();
-}
-inline void Mixin::_internal_set_name(const std::string& value) {
-  
-  _impl_.name_.Set(value, GetArenaForAllocation());
-}
-inline std::string* Mixin::_internal_mutable_name() {
-  
-  return _impl_.name_.Mutable(GetArenaForAllocation());
-}
-inline std::string* Mixin::release_name() {
-  // @@protoc_insertion_point(field_release:google.protobuf.Mixin.name)
-  return _impl_.name_.Release();
-}
-inline void Mixin::set_allocated_name(std::string* name) {
-  if (name != nullptr) {
-    
-  } else {
-    
-  }
-  _impl_.name_.SetAllocated(name, GetArenaForAllocation());
-#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (_impl_.name_.IsDefault()) {
-    _impl_.name_.Set("", GetArenaForAllocation());
-  }
-#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:google.protobuf.Mixin.name)
-}
-
-// string root = 2;
-inline void Mixin::clear_root() {
-  _impl_.root_.ClearToEmpty();
-}
-inline const std::string& Mixin::root() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.Mixin.root)
-  return _internal_root();
-}
-template <typename ArgT0, typename... ArgT>
-inline PROTOBUF_ALWAYS_INLINE
-void Mixin::set_root(ArgT0&& arg0, ArgT... args) {
- 
- _impl_.root_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
-  // @@protoc_insertion_point(field_set:google.protobuf.Mixin.root)
-}
-inline std::string* Mixin::mutable_root() {
-  std::string* _s = _internal_mutable_root();
-  // @@protoc_insertion_point(field_mutable:google.protobuf.Mixin.root)
-  return _s;
-}
-inline const std::string& Mixin::_internal_root() const {
-  return _impl_.root_.Get();
-}
-inline void Mixin::_internal_set_root(const std::string& value) {
-  
-  _impl_.root_.Set(value, GetArenaForAllocation());
-}
-inline std::string* Mixin::_internal_mutable_root() {
-  
-  return _impl_.root_.Mutable(GetArenaForAllocation());
-}
-inline std::string* Mixin::release_root() {
-  // @@protoc_insertion_point(field_release:google.protobuf.Mixin.root)
-  return _impl_.root_.Release();
-}
-inline void Mixin::set_allocated_root(std::string* root) {
-  if (root != nullptr) {
-    
-  } else {
-    
-  }
-  _impl_.root_.SetAllocated(root, GetArenaForAllocation());
-#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (_impl_.root_.IsDefault()) {
-    _impl_.root_.Set("", GetArenaForAllocation());
-  }
-#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:google.protobuf.Mixin.root)
-}
-
-#ifdef __GNUC__
-  #pragma GCC diagnostic pop
-#endif  // __GNUC__
-// -------------------------------------------------------------------
-
-// -------------------------------------------------------------------
-
-
-// @@protoc_insertion_point(namespace_scope)
-
-PROTOBUF_NAMESPACE_CLOSE
-
-// @@protoc_insertion_point(global_scope)
-
-#include <google/protobuf/port_undef.inc>
-#endif  // GOOGLE_PROTOBUF_INCLUDED_GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fapi_2eproto
diff --git a/libs/protobuf/src/google/protobuf/api.proto b/libs/protobuf/src/google/protobuf/api.proto
deleted file mode 100644
index 3d598fc..0000000
--- a/libs/protobuf/src/google/protobuf/api.proto
+++ /dev/null
@@ -1,208 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto3";
-
-package google.protobuf;
-
-import "google/protobuf/source_context.proto";
-import "google/protobuf/type.proto";
-
-option csharp_namespace = "Google.Protobuf.WellKnownTypes";
-option java_package = "com.google.protobuf";
-option java_outer_classname = "ApiProto";
-option java_multiple_files = true;
-option objc_class_prefix = "GPB";
-option go_package = "google.golang.org/protobuf/types/known/apipb";
-
-// Api is a light-weight descriptor for an API Interface.
-//
-// Interfaces are also described as "protocol buffer services" in some contexts,
-// such as by the "service" keyword in a .proto file, but they are different
-// from API Services, which represent a concrete implementation of an interface
-// as opposed to simply a description of methods and bindings. They are also
-// sometimes simply referred to as "APIs" in other contexts, such as the name of
-// this message itself. See https://cloud.google.com/apis/design/glossary for
-// detailed terminology.
-message Api {
-  // The fully qualified name of this interface, including package name
-  // followed by the interface's simple name.
-  string name = 1;
-
-  // The methods of this interface, in unspecified order.
-  repeated Method methods = 2;
-
-  // Any metadata attached to the interface.
-  repeated Option options = 3;
-
-  // A version string for this interface. If specified, must have the form
-  // `major-version.minor-version`, as in `1.10`. If the minor version is
-  // omitted, it defaults to zero. If the entire version field is empty, the
-  // major version is derived from the package name, as outlined below. If the
-  // field is not empty, the version in the package name will be verified to be
-  // consistent with what is provided here.
-  //
-  // The versioning schema uses [semantic
-  // versioning](http://semver.org) where the major version number
-  // indicates a breaking change and the minor version an additive,
-  // non-breaking change. Both version numbers are signals to users
-  // what to expect from different versions, and should be carefully
-  // chosen based on the product plan.
-  //
-  // The major version is also reflected in the package name of the
-  // interface, which must end in `v<major-version>`, as in
-  // `google.feature.v1`. For major versions 0 and 1, the suffix can
-  // be omitted. Zero major versions must only be used for
-  // experimental, non-GA interfaces.
-  //
-  //
-  string version = 4;
-
-  // Source context for the protocol buffer service represented by this
-  // message.
-  SourceContext source_context = 5;
-
-  // Included interfaces. See [Mixin][].
-  repeated Mixin mixins = 6;
-
-  // The source syntax of the service.
-  Syntax syntax = 7;
-}
-
-// Method represents a method of an API interface.
-message Method {
-  // The simple name of this method.
-  string name = 1;
-
-  // A URL of the input message type.
-  string request_type_url = 2;
-
-  // If true, the request is streamed.
-  bool request_streaming = 3;
-
-  // The URL of the output message type.
-  string response_type_url = 4;
-
-  // If true, the response is streamed.
-  bool response_streaming = 5;
-
-  // Any metadata attached to the method.
-  repeated Option options = 6;
-
-  // The source syntax of this method.
-  Syntax syntax = 7;
-}
-
-// Declares an API Interface to be included in this interface. The including
-// interface must redeclare all the methods from the included interface, but
-// documentation and options are inherited as follows:
-//
-// - If after comment and whitespace stripping, the documentation
-//   string of the redeclared method is empty, it will be inherited
-//   from the original method.
-//
-// - Each annotation belonging to the service config (http,
-//   visibility) which is not set in the redeclared method will be
-//   inherited.
-//
-// - If an http annotation is inherited, the path pattern will be
-//   modified as follows. Any version prefix will be replaced by the
-//   version of the including interface plus the [root][] path if
-//   specified.
-//
-// Example of a simple mixin:
-//
-//     package google.acl.v1;
-//     service AccessControl {
-//       // Get the underlying ACL object.
-//       rpc GetAcl(GetAclRequest) returns (Acl) {
-//         option (google.api.http).get = "/v1/{resource=**}:getAcl";
-//       }
-//     }
-//
-//     package google.storage.v2;
-//     service Storage {
-//       rpc GetAcl(GetAclRequest) returns (Acl);
-//
-//       // Get a data record.
-//       rpc GetData(GetDataRequest) returns (Data) {
-//         option (google.api.http).get = "/v2/{resource=**}";
-//       }
-//     }
-//
-// Example of a mixin configuration:
-//
-//     apis:
-//     - name: google.storage.v2.Storage
-//       mixins:
-//       - name: google.acl.v1.AccessControl
-//
-// The mixin construct implies that all methods in `AccessControl` are
-// also declared with same name and request/response types in
-// `Storage`. A documentation generator or annotation processor will
-// see the effective `Storage.GetAcl` method after inheriting
-// documentation and annotations as follows:
-//
-//     service Storage {
-//       // Get the underlying ACL object.
-//       rpc GetAcl(GetAclRequest) returns (Acl) {
-//         option (google.api.http).get = "/v2/{resource=**}:getAcl";
-//       }
-//       ...
-//     }
-//
-// Note how the version in the path pattern changed from `v1` to `v2`.
-//
-// If the `root` field in the mixin is specified, it should be a
-// relative path under which inherited HTTP paths are placed. Example:
-//
-//     apis:
-//     - name: google.storage.v2.Storage
-//       mixins:
-//       - name: google.acl.v1.AccessControl
-//         root: acls
-//
-// This implies the following inherited HTTP annotation:
-//
-//     service Storage {
-//       // Get the underlying ACL object.
-//       rpc GetAcl(GetAclRequest) returns (Acl) {
-//         option (google.api.http).get = "/v2/acls/{resource=**}:getAcl";
-//       }
-//       ...
-//     }
-message Mixin {
-  // The fully qualified name of the interface which is included.
-  string name = 1;
-
-  // If non-empty specifies a path under which inherited HTTP paths
-  // are rooted.
-  string root = 2;
-}
diff --git a/libs/protobuf/src/google/protobuf/arena.cc b/libs/protobuf/src/google/protobuf/arena.cc
deleted file mode 100644
index 6ba508a..0000000
--- a/libs/protobuf/src/google/protobuf/arena.cc
+++ /dev/null
@@ -1,537 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <google/protobuf/arena.h>
-
-#include <algorithm>
-#include <atomic>
-#include <cstddef>
-#include <cstdint>
-#include <limits>
-#include <typeinfo>
-
-#include <google/protobuf/arena_impl.h>
-#include <google/protobuf/arenaz_sampler.h>
-#include <google/protobuf/port.h>
-
-#include <google/protobuf/stubs/mutex.h>
-#ifdef ADDRESS_SANITIZER
-#include <sanitizer/asan_interface.h>
-#endif  // ADDRESS_SANITIZER
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-namespace internal {
-
-static SerialArena::Memory AllocateMemory(const AllocationPolicy* policy_ptr,
-                                          size_t last_size, size_t min_bytes) {
-  AllocationPolicy policy;  // default policy
-  if (policy_ptr) policy = *policy_ptr;
-  size_t size;
-  if (last_size != 0) {
-    // Double the current block size, up to a limit.
-    auto max_size = policy.max_block_size;
-    size = std::min(2 * last_size, max_size);
-  } else {
-    size = policy.start_block_size;
-  }
-  // Verify that min_bytes + kBlockHeaderSize won't overflow.
-  GOOGLE_CHECK_LE(min_bytes,
-           std::numeric_limits<size_t>::max() - SerialArena::kBlockHeaderSize);
-  size = std::max(size, SerialArena::kBlockHeaderSize + min_bytes);
-
-  void* mem;
-  if (policy.block_alloc == nullptr) {
-    mem = ::operator new(size);
-  } else {
-    mem = policy.block_alloc(size);
-  }
-  return {mem, size};
-}
-
-class GetDeallocator {
- public:
-  GetDeallocator(const AllocationPolicy* policy, size_t* space_allocated)
-      : dealloc_(policy ? policy->block_dealloc : nullptr),
-        space_allocated_(space_allocated) {}
-
-  void operator()(SerialArena::Memory mem) const {
-#ifdef ADDRESS_SANITIZER
-    // This memory was provided by the underlying allocator as unpoisoned,
-    // so return it in an unpoisoned state.
-    ASAN_UNPOISON_MEMORY_REGION(mem.ptr, mem.size);
-#endif  // ADDRESS_SANITIZER
-    if (dealloc_) {
-      dealloc_(mem.ptr, mem.size);
-    } else {
-      internal::SizedDelete(mem.ptr, mem.size);
-    }
-    *space_allocated_ += mem.size;
-  }
-
- private:
-  void (*dealloc_)(void*, size_t);
-  size_t* space_allocated_;
-};
-
-SerialArena::SerialArena(Block* b, void* owner, ThreadSafeArenaStats* stats)
-    : space_allocated_(b->size) {
-  owner_ = owner;
-  head_ = b;
-  ptr_ = b->Pointer(kBlockHeaderSize + ThreadSafeArena::kSerialArenaSize);
-  limit_ = b->Pointer(b->size & static_cast<size_t>(-8));
-  arena_stats_ = stats;
-}
-
-SerialArena* SerialArena::New(Memory mem, void* owner,
-                              ThreadSafeArenaStats* stats) {
-  GOOGLE_DCHECK_LE(kBlockHeaderSize + ThreadSafeArena::kSerialArenaSize, mem.size);
-  ThreadSafeArenaStats::RecordAllocateStats(
-      stats, /*requested=*/mem.size, /*allocated=*/mem.size, /*wasted=*/0);
-  auto b = new (mem.ptr) Block{nullptr, mem.size};
-  return new (b->Pointer(kBlockHeaderSize)) SerialArena(b, owner, stats);
-}
-
-template <typename Deallocator>
-SerialArena::Memory SerialArena::Free(Deallocator deallocator) {
-  Block* b = head_;
-  Memory mem = {b, b->size};
-  while (b->next) {
-    b = b->next;  // We must first advance before deleting this block
-    deallocator(mem);
-    mem = {b, b->size};
-  }
-  return mem;
-}
-
-PROTOBUF_NOINLINE
-std::pair<void*, SerialArena::CleanupNode*>
-SerialArena::AllocateAlignedWithCleanupFallback(
-    size_t n, const AllocationPolicy* policy) {
-  AllocateNewBlock(n + kCleanupSize, policy);
-  return AllocateFromExistingWithCleanupFallback(n);
-}
-
-PROTOBUF_NOINLINE
-void* SerialArena::AllocateAlignedFallback(size_t n,
-                                           const AllocationPolicy* policy) {
-  AllocateNewBlock(n, policy);
-  return AllocateFromExisting(n);
-}
-
-void SerialArena::AllocateNewBlock(size_t n, const AllocationPolicy* policy) {
-  // Sync limit to block
-  head_->start = reinterpret_cast<CleanupNode*>(limit_);
-
-  // Record how much used in this block.
-  size_t used = ptr_ - head_->Pointer(kBlockHeaderSize);
-  size_t wasted = head_->size - used;
-  space_used_ += used;
-
-  // TODO(sbenza): Evaluate if pushing unused space into the cached blocks is a
-  // win. In preliminary testing showed increased memory savings as expected,
-  // but with a CPU regression. The regression might have been an artifact of
-  // the microbenchmark.
-
-  auto mem = AllocateMemory(policy, head_->size, n);
-  // We don't want to emit an expensive RMW instruction that requires
-  // exclusive access to a cacheline. Hence we write it in terms of a
-  // regular add.
-  auto relaxed = std::memory_order_relaxed;
-  space_allocated_.store(space_allocated_.load(relaxed) + mem.size, relaxed);
-  ThreadSafeArenaStats::RecordAllocateStats(arena_stats_, /*requested=*/n,
-                                            /*allocated=*/mem.size, wasted);
-  head_ = new (mem.ptr) Block{head_, mem.size};
-  ptr_ = head_->Pointer(kBlockHeaderSize);
-  limit_ = head_->Pointer(head_->size);
-
-#ifdef ADDRESS_SANITIZER
-  ASAN_POISON_MEMORY_REGION(ptr_, limit_ - ptr_);
-#endif  // ADDRESS_SANITIZER
-}
-
-uint64_t SerialArena::SpaceUsed() const {
-  uint64_t space_used = ptr_ - head_->Pointer(kBlockHeaderSize);
-  space_used += space_used_;
-  // Remove the overhead of the SerialArena itself.
-  space_used -= ThreadSafeArena::kSerialArenaSize;
-  return space_used;
-}
-
-void SerialArena::CleanupList() {
-  Block* b = head_;
-  b->start = reinterpret_cast<CleanupNode*>(limit_);
-  do {
-    auto* limit = reinterpret_cast<CleanupNode*>(
-        b->Pointer(b->size & static_cast<size_t>(-8)));
-    auto it = b->start;
-    auto num = limit - it;
-    if (num > 0) {
-      for (; it < limit; it++) {
-        it->cleanup(it->elem);
-      }
-    }
-    b = b->next;
-  } while (b);
-}
-
-
-ThreadSafeArena::CacheAlignedLifecycleIdGenerator
-    ThreadSafeArena::lifecycle_id_generator_;
-#if defined(GOOGLE_PROTOBUF_NO_THREADLOCAL)
-ThreadSafeArena::ThreadCache& ThreadSafeArena::thread_cache() {
-  static internal::ThreadLocalStorage<ThreadCache>* thread_cache_ =
-      new internal::ThreadLocalStorage<ThreadCache>();
-  return *thread_cache_->Get();
-}
-#elif defined(PROTOBUF_USE_DLLS)
-ThreadSafeArena::ThreadCache& ThreadSafeArena::thread_cache() {
-  static PROTOBUF_THREAD_LOCAL ThreadCache thread_cache_ = {
-      0, static_cast<LifecycleIdAtomic>(-1), nullptr};
-  return thread_cache_;
-}
-#else
-PROTOBUF_THREAD_LOCAL ThreadSafeArena::ThreadCache
-    ThreadSafeArena::thread_cache_ = {0, static_cast<LifecycleIdAtomic>(-1),
-                                      nullptr};
-#endif
-
-void ThreadSafeArena::InitializeFrom(void* mem, size_t size) {
-  GOOGLE_DCHECK_EQ(reinterpret_cast<uintptr_t>(mem) & 7, 0u);
-  GOOGLE_DCHECK(!AllocPolicy());  // Reset should call InitializeWithPolicy instead.
-  Init();
-
-  // Ignore initial block if it is too small.
-  if (mem != nullptr && size >= kBlockHeaderSize + kSerialArenaSize) {
-    alloc_policy_.set_is_user_owned_initial_block(true);
-    SetInitialBlock(mem, size);
-  }
-}
-
-void ThreadSafeArena::InitializeWithPolicy(void* mem, size_t size,
-                                           AllocationPolicy policy) {
-#ifndef NDEBUG
-  const uint64_t old_alloc_policy = alloc_policy_.get_raw();
-  // If there was a policy (e.g., in Reset()), make sure flags were preserved.
-#define GOOGLE_DCHECK_POLICY_FLAGS_() \
-  if (old_alloc_policy > 3)    \
-    GOOGLE_CHECK_EQ(old_alloc_policy & 3, alloc_policy_.get_raw() & 3)
-#else
-#define GOOGLE_DCHECK_POLICY_FLAGS_()
-#endif  // NDEBUG
-
-  if (policy.IsDefault()) {
-    // Legacy code doesn't use the API above, but provides the initial block
-    // through ArenaOptions. I suspect most do not touch the allocation
-    // policy parameters.
-    InitializeFrom(mem, size);
-    GOOGLE_DCHECK_POLICY_FLAGS_();
-    return;
-  }
-  GOOGLE_DCHECK_EQ(reinterpret_cast<uintptr_t>(mem) & 7, 0u);
-  Init();
-
-  // Ignore initial block if it is too small. We include an optional
-  // AllocationPolicy in this check, so that this can be allocated on the
-  // first block.
-  constexpr size_t kAPSize = internal::AlignUpTo8(sizeof(AllocationPolicy));
-  constexpr size_t kMinimumSize = kBlockHeaderSize + kSerialArenaSize + kAPSize;
-
-  // The value for alloc_policy_ stores whether or not allocations should be
-  // recorded.
-  alloc_policy_.set_should_record_allocs(
-      policy.metrics_collector != nullptr &&
-      policy.metrics_collector->RecordAllocs());
-  // Make sure we have an initial block to store the AllocationPolicy.
-  if (mem != nullptr && size >= kMinimumSize) {
-    alloc_policy_.set_is_user_owned_initial_block(true);
-  } else {
-    auto tmp = AllocateMemory(&policy, 0, kMinimumSize);
-    mem = tmp.ptr;
-    size = tmp.size;
-  }
-  SetInitialBlock(mem, size);
-
-  auto sa = threads_.load(std::memory_order_relaxed);
-  // We ensured enough space so this cannot fail.
-  void* p;
-  if (!sa || !sa->MaybeAllocateAligned(kAPSize, &p)) {
-    GOOGLE_LOG(FATAL) << "MaybeAllocateAligned cannot fail here.";
-    return;
-  }
-  new (p) AllocationPolicy{policy};
-  // Low bits store flags, so they mustn't be overwritten.
-  GOOGLE_DCHECK_EQ(0, reinterpret_cast<uintptr_t>(p) & 3);
-  alloc_policy_.set_policy(reinterpret_cast<AllocationPolicy*>(p));
-  GOOGLE_DCHECK_POLICY_FLAGS_();
-
-#undef GOOGLE_DCHECK_POLICY_FLAGS_
-}
-
-void ThreadSafeArena::Init() {
-#ifndef NDEBUG
-  const bool was_message_owned = IsMessageOwned();
-#endif  // NDEBUG
-  ThreadCache& tc = thread_cache();
-  auto id = tc.next_lifecycle_id;
-  // We increment lifecycle_id's by multiples of two so we can use bit 0 as
-  // a tag.
-  constexpr uint64_t kDelta = 2;
-  constexpr uint64_t kInc = ThreadCache::kPerThreadIds * kDelta;
-  if (PROTOBUF_PREDICT_FALSE((id & (kInc - 1)) == 0)) {
-    constexpr auto relaxed = std::memory_order_relaxed;
-    // On platforms that don't support uint64_t atomics we can certainly not
-    // afford to increment by large intervals and expect uniqueness due to
-    // wrapping, hence we only add by 1.
-    id = lifecycle_id_generator_.id.fetch_add(1, relaxed) * kInc;
-  }
-  tc.next_lifecycle_id = id + kDelta;
-  // Message ownership is stored in tag_and_id_, and is set in the constructor.
-  // This flag bit must be preserved, even across calls to Reset().
-  tag_and_id_ = id | (tag_and_id_ & kMessageOwnedArena);
-  hint_.store(nullptr, std::memory_order_relaxed);
-  threads_.store(nullptr, std::memory_order_relaxed);
-#ifndef NDEBUG
-  GOOGLE_CHECK_EQ(was_message_owned, IsMessageOwned());
-#endif  // NDEBUG
-  arena_stats_ = Sample();
-}
-
-void ThreadSafeArena::SetInitialBlock(void* mem, size_t size) {
-  SerialArena* serial = SerialArena::New({mem, size}, &thread_cache(),
-                                         arena_stats_.MutableStats());
-  serial->set_next(NULL);
-  threads_.store(serial, std::memory_order_relaxed);
-  CacheSerialArena(serial);
-}
-
-ThreadSafeArena::~ThreadSafeArena() {
-  // Have to do this in a first pass, because some of the destructors might
-  // refer to memory in other blocks.
-  CleanupList();
-
-  size_t space_allocated = 0;
-  auto mem = Free(&space_allocated);
-
-  // Policy is about to get deleted.
-  auto* p = alloc_policy_.get();
-  ArenaMetricsCollector* collector = p ? p->metrics_collector : nullptr;
-
-  if (alloc_policy_.is_user_owned_initial_block()) {
-#ifdef ADDRESS_SANITIZER
-    // Unpoison the initial block, now that it's going back to the user.
-    ASAN_UNPOISON_MEMORY_REGION(mem.ptr, mem.size);
-#endif  // ADDRESS_SANITIZER
-    space_allocated += mem.size;
-  } else {
-    GetDeallocator(alloc_policy_.get(), &space_allocated)(mem);
-  }
-
-  if (collector) collector->OnDestroy(space_allocated);
-}
-
-SerialArena::Memory ThreadSafeArena::Free(size_t* space_allocated) {
-  SerialArena::Memory mem = {nullptr, 0};
-  auto deallocator = GetDeallocator(alloc_policy_.get(), space_allocated);
-  PerSerialArena([deallocator, &mem](SerialArena* a) {
-    if (mem.ptr) deallocator(mem);
-    mem = a->Free(deallocator);
-  });
-  return mem;
-}
-
-uint64_t ThreadSafeArena::Reset() {
-  // Have to do this in a first pass, because some of the destructors might
-  // refer to memory in other blocks.
-  CleanupList();
-
-  // Discard all blocks except the special block (if present).
-  size_t space_allocated = 0;
-  auto mem = Free(&space_allocated);
-  arena_stats_.RecordReset();
-
-  AllocationPolicy* policy = alloc_policy_.get();
-  if (policy) {
-    auto saved_policy = *policy;
-    if (alloc_policy_.is_user_owned_initial_block()) {
-      space_allocated += mem.size;
-    } else {
-      GetDeallocator(alloc_policy_.get(), &space_allocated)(mem);
-      mem.ptr = nullptr;
-      mem.size = 0;
-    }
-    ArenaMetricsCollector* collector = saved_policy.metrics_collector;
-    if (collector) collector->OnReset(space_allocated);
-    InitializeWithPolicy(mem.ptr, mem.size, saved_policy);
-  } else {
-    GOOGLE_DCHECK(!alloc_policy_.should_record_allocs());
-    // Nullptr policy
-    if (alloc_policy_.is_user_owned_initial_block()) {
-      space_allocated += mem.size;
-      InitializeFrom(mem.ptr, mem.size);
-    } else {
-      GetDeallocator(alloc_policy_.get(), &space_allocated)(mem);
-      Init();
-    }
-  }
-
-  return space_allocated;
-}
-
-std::pair<void*, SerialArena::CleanupNode*>
-ThreadSafeArena::AllocateAlignedWithCleanup(size_t n,
-                                            const std::type_info* type) {
-  SerialArena* arena;
-  if (PROTOBUF_PREDICT_TRUE(!alloc_policy_.should_record_allocs() &&
-                            GetSerialArenaFast(&arena))) {
-    return arena->AllocateAlignedWithCleanup(n, alloc_policy_.get());
-  } else {
-    return AllocateAlignedWithCleanupFallback(n, type);
-  }
-}
-
-void ThreadSafeArena::AddCleanup(void* elem, void (*cleanup)(void*)) {
-  SerialArena* arena;
-  if (PROTOBUF_PREDICT_FALSE(!GetSerialArenaFast(&arena))) {
-    arena = GetSerialArenaFallback(&thread_cache());
-  }
-  arena->AddCleanup(elem, cleanup, AllocPolicy());
-}
-
-PROTOBUF_NOINLINE
-void* ThreadSafeArena::AllocateAlignedFallback(size_t n,
-                                               const std::type_info* type) {
-  if (alloc_policy_.should_record_allocs()) {
-    alloc_policy_.RecordAlloc(type, n);
-    SerialArena* arena;
-    if (PROTOBUF_PREDICT_TRUE(GetSerialArenaFast(&arena))) {
-      return arena->AllocateAligned(n, alloc_policy_.get());
-    }
-  }
-  return GetSerialArenaFallback(&thread_cache())
-      ->AllocateAligned(n, alloc_policy_.get());
-}
-
-PROTOBUF_NOINLINE
-std::pair<void*, SerialArena::CleanupNode*>
-ThreadSafeArena::AllocateAlignedWithCleanupFallback(
-    size_t n, const std::type_info* type) {
-  if (alloc_policy_.should_record_allocs()) {
-    alloc_policy_.RecordAlloc(type, n);
-    SerialArena* arena;
-    if (GetSerialArenaFast(&arena)) {
-      return arena->AllocateAlignedWithCleanup(n, alloc_policy_.get());
-    }
-  }
-  return GetSerialArenaFallback(&thread_cache())
-      ->AllocateAlignedWithCleanup(n, alloc_policy_.get());
-}
-
-uint64_t ThreadSafeArena::SpaceAllocated() const {
-  SerialArena* serial = threads_.load(std::memory_order_acquire);
-  uint64_t res = 0;
-  for (; serial; serial = serial->next()) {
-    res += serial->SpaceAllocated();
-  }
-  return res;
-}
-
-uint64_t ThreadSafeArena::SpaceUsed() const {
-  SerialArena* serial = threads_.load(std::memory_order_acquire);
-  uint64_t space_used = 0;
-  for (; serial; serial = serial->next()) {
-    space_used += serial->SpaceUsed();
-  }
-  return space_used - (alloc_policy_.get() ? sizeof(AllocationPolicy) : 0);
-}
-
-void ThreadSafeArena::CleanupList() {
-  PerSerialArena([](SerialArena* a) { a->CleanupList(); });
-}
-
-PROTOBUF_NOINLINE
-SerialArena* ThreadSafeArena::GetSerialArenaFallback(void* me) {
-  // Look for this SerialArena in our linked list.
-  SerialArena* serial = threads_.load(std::memory_order_acquire);
-  for (; serial; serial = serial->next()) {
-    if (serial->owner() == me) {
-      break;
-    }
-  }
-
-  if (!serial) {
-    // This thread doesn't have any SerialArena, which also means it doesn't
-    // have any blocks yet.  So we'll allocate its first block now.
-    serial = SerialArena::New(
-        AllocateMemory(alloc_policy_.get(), 0, kSerialArenaSize), me,
-        arena_stats_.MutableStats());
-
-    SerialArena* head = threads_.load(std::memory_order_relaxed);
-    do {
-      serial->set_next(head);
-    } while (!threads_.compare_exchange_weak(
-        head, serial, std::memory_order_release, std::memory_order_relaxed));
-  }
-
-  CacheSerialArena(serial);
-  return serial;
-}
-
-}  // namespace internal
-
-PROTOBUF_FUNC_ALIGN(32)
-void* Arena::AllocateAlignedNoHook(size_t n) {
-  return impl_.AllocateAligned(n, nullptr);
-}
-
-PROTOBUF_FUNC_ALIGN(32)
-void* Arena::AllocateAlignedWithHook(size_t n, const std::type_info* type) {
-  return impl_.AllocateAligned(n, type);
-}
-
-PROTOBUF_FUNC_ALIGN(32)
-void* Arena::AllocateAlignedWithHookForArray(size_t n,
-                                             const std::type_info* type) {
-  return impl_.AllocateAligned<internal::AllocationClient::kArray>(n, type);
-}
-
-PROTOBUF_FUNC_ALIGN(32)
-std::pair<void*, internal::SerialArena::CleanupNode*>
-Arena::AllocateAlignedWithCleanup(size_t n, const std::type_info* type) {
-  return impl_.AllocateAlignedWithCleanup(n, type);
-}
-
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
diff --git a/libs/protobuf/src/google/protobuf/arena.h b/libs/protobuf/src/google/protobuf/arena.h
deleted file mode 100644
index 3b5f16c..0000000
--- a/libs/protobuf/src/google/protobuf/arena.h
+++ /dev/null
@@ -1,851 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// This file defines an Arena allocator for better allocation performance.
-
-#ifndef GOOGLE_PROTOBUF_ARENA_H__
-#define GOOGLE_PROTOBUF_ARENA_H__
-
-
-#include <limits>
-#include <type_traits>
-#include <utility>
-#if defined(_MSC_VER) && !defined(_LIBCPP_STD_VER) && !_HAS_EXCEPTIONS
-// Work around bugs in MSVC <typeinfo> header when _HAS_EXCEPTIONS=0.
-#include <exception>
-#include <typeinfo>
-namespace std {
-using type_info = ::type_info;
-}
-#else
-#include <typeinfo>
-#endif
-
-#include <type_traits>
-#include <google/protobuf/arena_impl.h>
-#include <google/protobuf/port.h>
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-#ifdef SWIG
-#error "You cannot SWIG proto headers"
-#endif
-
-namespace google {
-namespace protobuf {
-
-struct ArenaOptions;  // defined below
-class Arena;    // defined below
-class Message;  // defined in message.h
-class MessageLite;
-template <typename Key, typename T>
-class Map;
-
-namespace arena_metrics {
-
-void EnableArenaMetrics(ArenaOptions* options);
-
-}  // namespace arena_metrics
-
-namespace TestUtil {
-class ReflectionTester;  // defined in test_util.h
-}  // namespace TestUtil
-
-namespace internal {
-
-struct ArenaTestPeer;        // defined in arena_test_util.h
-class InternalMetadata;      // defined in metadata_lite.h
-class LazyField;             // defined in lazy_field.h
-class EpsCopyInputStream;    // defined in parse_context.h
-class RepeatedPtrFieldBase;  // defined in repeated_ptr_field.h
-
-template <typename Type>
-class GenericTypeHandler;  // defined in repeated_field.h
-
-inline PROTOBUF_ALWAYS_INLINE
-void* AlignTo(void* ptr, size_t align) {
-  return reinterpret_cast<void*>(
-      (reinterpret_cast<uintptr_t>(ptr) + align - 1) & (~align + 1));
-}
-
-// Templated cleanup methods.
-template <typename T>
-void arena_destruct_object(void* object) {
-  reinterpret_cast<T*>(object)->~T();
-}
-
-template <bool destructor_skippable, typename T>
-struct ObjectDestructor {
-  constexpr static void (*destructor)(void*) = &arena_destruct_object<T>;
-};
-
-template <typename T>
-struct ObjectDestructor<true, T> {
-  constexpr static void (*destructor)(void*) = nullptr;
-};
-
-template <typename T>
-void arena_delete_object(void* object) {
-  delete reinterpret_cast<T*>(object);
-}
-}  // namespace internal
-
-// ArenaOptions provides optional additional parameters to arena construction
-// that control its block-allocation behavior.
-struct ArenaOptions {
-  // This defines the size of the first block requested from the system malloc.
-  // Subsequent block sizes will increase in a geometric series up to a maximum.
-  size_t start_block_size;
-
-  // This defines the maximum block size requested from system malloc (unless an
-  // individual arena allocation request occurs with a size larger than this
-  // maximum). Requested block sizes increase up to this value, then remain
-  // here.
-  size_t max_block_size;
-
-  // An initial block of memory for the arena to use, or NULL for none. If
-  // provided, the block must live at least as long as the arena itself. The
-  // creator of the Arena retains ownership of the block after the Arena is
-  // destroyed.
-  char* initial_block;
-
-  // The size of the initial block, if provided.
-  size_t initial_block_size;
-
-  // A function pointer to an alloc method that returns memory blocks of size
-  // requested. By default, it contains a ptr to the malloc function.
-  //
-  // NOTE: block_alloc and dealloc functions are expected to behave like
-  // malloc and free, including Asan poisoning.
-  void* (*block_alloc)(size_t);
-  // A function pointer to a dealloc method that takes ownership of the blocks
-  // from the arena. By default, it contains a ptr to a wrapper function that
-  // calls free.
-  void (*block_dealloc)(void*, size_t);
-
-  ArenaOptions()
-      : start_block_size(internal::AllocationPolicy::kDefaultStartBlockSize),
-        max_block_size(internal::AllocationPolicy::kDefaultMaxBlockSize),
-        initial_block(NULL),
-        initial_block_size(0),
-        block_alloc(nullptr),
-        block_dealloc(nullptr),
-        make_metrics_collector(nullptr) {}
-
- private:
-  // If make_metrics_collector is not nullptr, it will be called at Arena init
-  // time. It may return a pointer to a collector instance that will be notified
-  // of interesting events related to the arena.
-  internal::ArenaMetricsCollector* (*make_metrics_collector)();
-
-  internal::ArenaMetricsCollector* MetricsCollector() const {
-    return make_metrics_collector ? (*make_metrics_collector)() : nullptr;
-  }
-
-  internal::AllocationPolicy AllocationPolicy() const {
-    internal::AllocationPolicy res;
-    res.start_block_size = start_block_size;
-    res.max_block_size = max_block_size;
-    res.block_alloc = block_alloc;
-    res.block_dealloc = block_dealloc;
-    res.metrics_collector = MetricsCollector();
-    return res;
-  }
-
-  friend void arena_metrics::EnableArenaMetrics(ArenaOptions*);
-
-  friend class Arena;
-  friend class ArenaOptionsTestFriend;
-};
-
-// Support for non-RTTI environments. (The metrics hooks API uses type
-// information.)
-#if PROTOBUF_RTTI
-#define RTTI_TYPE_ID(type) (&typeid(type))
-#else
-#define RTTI_TYPE_ID(type) (NULL)
-#endif
-
-// Arena allocator. Arena allocation replaces ordinary (heap-based) allocation
-// with new/delete, and improves performance by aggregating allocations into
-// larger blocks and freeing allocations all at once. Protocol messages are
-// allocated on an arena by using Arena::CreateMessage<T>(Arena*), below, and
-// are automatically freed when the arena is destroyed.
-//
-// This is a thread-safe implementation: multiple threads may allocate from the
-// arena concurrently. Destruction is not thread-safe and the destructing
-// thread must synchronize with users of the arena first.
-//
-// An arena provides two allocation interfaces: CreateMessage<T>, which works
-// for arena-enabled proto2 message types as well as other types that satisfy
-// the appropriate protocol (described below), and Create<T>, which works for
-// any arbitrary type T. CreateMessage<T> is better when the type T supports it,
-// because this interface (i) passes the arena pointer to the created object so
-// that its sub-objects and internal allocations can use the arena too, and (ii)
-// elides the object's destructor call when possible. Create<T> does not place
-// any special requirements on the type T, and will invoke the object's
-// destructor when the arena is destroyed.
-//
-// The arena message allocation protocol, required by
-// CreateMessage<T>(Arena* arena, Args&&... args), is as follows:
-//
-// - The type T must have (at least) two constructors: a constructor callable
-//   with `args` (without `arena`), called when a T is allocated on the heap;
-//   and a constructor callable with `Arena* arena, Args&&... args`, called when
-//   a T is allocated on an arena. If the second constructor is called with a
-//   NULL arena pointer, it must be equivalent to invoking the first
-//   (`args`-only) constructor.
-//
-// - The type T must have a particular type trait: a nested type
-//   |InternalArenaConstructable_|. This is usually a typedef to |void|. If no
-//   such type trait exists, then the instantiation CreateMessage<T> will fail
-//   to compile.
-//
-// - The type T *may* have the type trait |DestructorSkippable_|. If this type
-//   trait is present in the type, then its destructor will not be called if and
-//   only if it was passed a non-NULL arena pointer. If this type trait is not
-//   present on the type, then its destructor is always called when the
-//   containing arena is destroyed.
-//
-// This protocol is implemented by all arena-enabled proto2 message classes as
-// well as protobuf container types like RepeatedPtrField and Map. The protocol
-// is internal to protobuf and is not guaranteed to be stable. Non-proto types
-// should not rely on this protocol.
-class PROTOBUF_EXPORT PROTOBUF_ALIGNAS(8) Arena final {
- public:
-  // Default constructor with sensible default options, tuned for average
-  // use-cases.
-  inline Arena() : impl_() {}
-
-  // Construct an arena with default options, except for the supplied
-  // initial block. It is more efficient to use this constructor
-  // instead of passing ArenaOptions if the only configuration needed
-  // by the caller is supplying an initial block.
-  inline Arena(char* initial_block, size_t initial_block_size)
-      : impl_(initial_block, initial_block_size) {}
-
-  // Arena constructor taking custom options. See ArenaOptions above for
-  // descriptions of the options available.
-  explicit Arena(const ArenaOptions& options)
-      : impl_(options.initial_block, options.initial_block_size,
-              options.AllocationPolicy()) {}
-
-  // Block overhead.  Use this as a guide for how much to over-allocate the
-  // initial block if you want an allocation of size N to fit inside it.
-  //
-  // WARNING: if you allocate multiple objects, it is difficult to guarantee
-  // that a series of allocations will fit in the initial block, especially if
-  // Arena changes its alignment guarantees in the future!
-  static const size_t kBlockOverhead =
-      internal::ThreadSafeArena::kBlockHeaderSize +
-      internal::ThreadSafeArena::kSerialArenaSize;
-
-  inline ~Arena() {}
-
-  // TODO(protobuf-team): Fix callers to use constructor and delete this method.
-  void Init(const ArenaOptions&) {}
-
-  // API to create proto2 message objects on the arena. If the arena passed in
-  // is NULL, then a heap allocated object is returned. Type T must be a message
-  // defined in a .proto file with cc_enable_arenas set to true, otherwise a
-  // compilation error will occur.
-  //
-  // RepeatedField and RepeatedPtrField may also be instantiated directly on an
-  // arena with this method.
-  //
-  // This function also accepts any type T that satisfies the arena message
-  // allocation protocol, documented above.
-  template <typename T, typename... Args>
-  PROTOBUF_ALWAYS_INLINE static T* CreateMessage(Arena* arena, Args&&... args) {
-    static_assert(
-        InternalHelper<T>::is_arena_constructable::value,
-        "CreateMessage can only construct types that are ArenaConstructable");
-    // We must delegate to CreateMaybeMessage() and NOT CreateMessageInternal()
-    // because protobuf generated classes specialize CreateMaybeMessage() and we
-    // need to use that specialization for code size reasons.
-    return Arena::CreateMaybeMessage<T>(arena, static_cast<Args&&>(args)...);
-  }
-
-  // API to create any objects on the arena. Note that only the object will
-  // be created on the arena; the underlying ptrs (in case of a proto2 message)
-  // will be still heap allocated. Proto messages should usually be allocated
-  // with CreateMessage<T>() instead.
-  //
-  // Note that even if T satisfies the arena message construction protocol
-  // (InternalArenaConstructable_ trait and optional DestructorSkippable_
-  // trait), as described above, this function does not follow the protocol;
-  // instead, it treats T as a black-box type, just as if it did not have these
-  // traits. Specifically, T's constructor arguments will always be only those
-  // passed to Create<T>() -- no additional arena pointer is implicitly added.
-  // Furthermore, the destructor will always be called at arena destruction time
-  // (unless the destructor is trivial). Hence, from T's point of view, it is as
-  // if the object were allocated on the heap (except that the underlying memory
-  // is obtained from the arena).
-  template <typename T, typename... Args>
-  PROTOBUF_NDEBUG_INLINE static T* Create(Arena* arena, Args&&... args) {
-    return CreateInternal<T>(arena, std::is_convertible<T*, MessageLite*>(),
-                             static_cast<Args&&>(args)...);
-  }
-
-  // Allocates memory with the specific size and alignment.
-  void* AllocateAligned(size_t size, size_t align = 8) {
-    if (align <= 8) {
-      return AllocateAlignedNoHook(internal::AlignUpTo8(size));
-    } else {
-      // We are wasting space by over allocating align - 8 bytes. Compared
-      // to a dedicated function that takes current alignment in consideration.
-      // Such a scheme would only waste (align - 8)/2 bytes on average, but
-      // requires a dedicated function in the outline arena allocation
-      // functions. Possibly re-evaluate tradeoffs later.
-      return internal::AlignTo(AllocateAlignedNoHook(size + align - 8), align);
-    }
-  }
-
-  // Create an array of object type T on the arena *without* invoking the
-  // constructor of T. If `arena` is null, then the return value should be freed
-  // with `delete[] x;` (or `::operator delete[](x);`).
-  // To ensure safe uses, this function checks at compile time
-  // (when compiled as C++11) that T is trivially default-constructible and
-  // trivially destructible.
-  template <typename T>
-  PROTOBUF_NDEBUG_INLINE static T* CreateArray(Arena* arena,
-                                               size_t num_elements) {
-    static_assert(std::is_trivial<T>::value,
-                  "CreateArray requires a trivially constructible type");
-    static_assert(std::is_trivially_destructible<T>::value,
-                  "CreateArray requires a trivially destructible type");
-    GOOGLE_CHECK_LE(num_elements, std::numeric_limits<size_t>::max() / sizeof(T))
-        << "Requested size is too large to fit into size_t.";
-    if (arena == NULL) {
-      return static_cast<T*>(::operator new[](num_elements * sizeof(T)));
-    } else {
-      return arena->CreateInternalRawArray<T>(num_elements);
-    }
-  }
-
-  // The following are routines are for monitoring. They will approximate the
-  // total sum allocated and used memory, but the exact value is an
-  // implementation deal. For instance allocated space depends on growth
-  // policies. Do not use these in unit tests.
-  // Returns the total space allocated by the arena, which is the sum of the
-  // sizes of the underlying blocks.
-  uint64_t SpaceAllocated() const { return impl_.SpaceAllocated(); }
-  // Returns the total space used by the arena. Similar to SpaceAllocated but
-  // does not include free space and block overhead. The total space returned
-  // may not include space used by other threads executing concurrently with
-  // the call to this method.
-  uint64_t SpaceUsed() const { return impl_.SpaceUsed(); }
-
-  // Frees all storage allocated by this arena after calling destructors
-  // registered with OwnDestructor() and freeing objects registered with Own().
-  // Any objects allocated on this arena are unusable after this call. It also
-  // returns the total space used by the arena which is the sums of the sizes
-  // of the allocated blocks. This method is not thread-safe.
-  uint64_t Reset() { return impl_.Reset(); }
-
-  // Adds |object| to a list of heap-allocated objects to be freed with |delete|
-  // when the arena is destroyed or reset.
-  template <typename T>
-  PROTOBUF_ALWAYS_INLINE void Own(T* object) {
-    OwnInternal(object, std::is_convertible<T*, MessageLite*>());
-  }
-
-  // Adds |object| to a list of objects whose destructors will be manually
-  // called when the arena is destroyed or reset. This differs from Own() in
-  // that it does not free the underlying memory with |delete|; hence, it is
-  // normally only used for objects that are placement-newed into
-  // arena-allocated memory.
-  template <typename T>
-  PROTOBUF_ALWAYS_INLINE void OwnDestructor(T* object) {
-    if (object != NULL) {
-      impl_.AddCleanup(object, &internal::arena_destruct_object<T>);
-    }
-  }
-
-  // Adds a custom member function on an object to the list of destructors that
-  // will be manually called when the arena is destroyed or reset. This differs
-  // from OwnDestructor() in that any member function may be specified, not only
-  // the class destructor.
-  PROTOBUF_ALWAYS_INLINE void OwnCustomDestructor(void* object,
-                                                  void (*destruct)(void*)) {
-    impl_.AddCleanup(object, destruct);
-  }
-
-  // Retrieves the arena associated with |value| if |value| is an arena-capable
-  // message, or NULL otherwise. If possible, the call resolves at compile time.
-  // Note that we can often devirtualize calls to `value->GetArena()` so usually
-  // calling this method is unnecessary.
-  template <typename T>
-  PROTOBUF_ALWAYS_INLINE static Arena* GetArena(const T* value) {
-    return GetArenaInternal(value);
-  }
-
-  template <typename T>
-  class InternalHelper {
-   private:
-    // Provides access to protected GetOwningArena to generated messages.
-    static Arena* GetOwningArena(const T* p) { return p->GetOwningArena(); }
-
-    static void InternalSwap(T* a, T* b) { a->InternalSwap(b); }
-
-    static Arena* GetArenaForAllocationInternal(
-        const T* p, std::true_type /*is_derived_from<MessageLite>*/) {
-      return p->GetArenaForAllocation();
-    }
-
-    static Arena* GetArenaForAllocationInternal(
-        const T* p, std::false_type /*is_derived_from<MessageLite>*/) {
-      return GetArenaForAllocationForNonMessage(
-          p, typename is_arena_constructable::type());
-    }
-
-    static Arena* GetArenaForAllocationForNonMessage(
-        const T* p, std::true_type /*is_arena_constructible*/) {
-      return p->GetArena();
-    }
-
-    static Arena* GetArenaForAllocationForNonMessage(
-        const T* p, std::false_type /*is_arena_constructible*/) {
-      return GetArenaForAllocationForNonMessageNonArenaConstructible(
-          p, typename has_get_arena::type());
-    }
-
-    static Arena* GetArenaForAllocationForNonMessageNonArenaConstructible(
-        const T* p, std::true_type /*has_get_arena*/) {
-      return p->GetArena();
-    }
-
-    static Arena* GetArenaForAllocationForNonMessageNonArenaConstructible(
-        const T* /* p */, std::false_type /*has_get_arena*/) {
-      return nullptr;
-    }
-
-    template <typename U>
-    static char DestructorSkippable(const typename U::DestructorSkippable_*);
-    template <typename U>
-    static double DestructorSkippable(...);
-
-    typedef std::integral_constant<
-        bool, sizeof(DestructorSkippable<T>(static_cast<const T*>(0))) ==
-                      sizeof(char) ||
-                  std::is_trivially_destructible<T>::value>
-        is_destructor_skippable;
-
-    template <typename U>
-    static char ArenaConstructable(
-        const typename U::InternalArenaConstructable_*);
-    template <typename U>
-    static double ArenaConstructable(...);
-
-    typedef std::integral_constant<bool, sizeof(ArenaConstructable<T>(
-                                             static_cast<const T*>(0))) ==
-                                             sizeof(char)>
-        is_arena_constructable;
-
-    template <typename U,
-              typename std::enable_if<
-                  std::is_same<Arena*, decltype(std::declval<const U>()
-                                                    .GetArena())>::value,
-                  int>::type = 0>
-    static char HasGetArena(decltype(&U::GetArena));
-    template <typename U>
-    static double HasGetArena(...);
-
-    typedef std::integral_constant<bool, sizeof(HasGetArena<T>(nullptr)) ==
-                                             sizeof(char)>
-        has_get_arena;
-
-    template <typename... Args>
-    static T* Construct(void* ptr, Args&&... args) {
-      return new (ptr) T(static_cast<Args&&>(args)...);
-    }
-
-    static inline PROTOBUF_ALWAYS_INLINE T* New() {
-      return new T(nullptr);
-    }
-
-    static Arena* GetArena(const T* p) { return p->GetArena(); }
-
-    friend class Arena;
-    friend class TestUtil::ReflectionTester;
-  };
-
-  // Provides access to protected GetOwningArena to generated messages.  For
-  // internal use only.
-  template <typename T>
-  static Arena* InternalGetOwningArena(const T* p) {
-    return InternalHelper<T>::GetOwningArena(p);
-  }
-
-  // Provides access to protected GetArenaForAllocation to generated messages.
-  // For internal use only.
-  template <typename T>
-  static Arena* InternalGetArenaForAllocation(const T* p) {
-    return InternalHelper<T>::GetArenaForAllocationInternal(
-        p, std::is_convertible<T*, MessageLite*>());
-  }
-
-  // Creates message-owned arena.  For internal use only.
-  static Arena* InternalCreateMessageOwnedArena() {
-    return new Arena(internal::MessageOwned{});
-  }
-
-  // Checks whether this arena is message-owned.  For internal use only.
-  bool InternalIsMessageOwnedArena() { return IsMessageOwned(); }
-
-  // Helper typetraits that indicates support for arenas in a type T at compile
-  // time. This is public only to allow construction of higher-level templated
-  // utilities.
-  //
-  // is_arena_constructable<T>::value is true if the message type T has arena
-  // support enabled, and false otherwise.
-  //
-  // is_destructor_skippable<T>::value is true if the message type T has told
-  // the arena that it is safe to skip the destructor, and false otherwise.
-  //
-  // This is inside Arena because only Arena has the friend relationships
-  // necessary to see the underlying generated code traits.
-  template <typename T>
-  struct is_arena_constructable : InternalHelper<T>::is_arena_constructable {};
-  template <typename T>
-  struct is_destructor_skippable : InternalHelper<T>::is_destructor_skippable {
-  };
-
- private:
-  internal::ThreadSafeArena impl_;
-
-  template <typename T>
-  struct has_get_arena : InternalHelper<T>::has_get_arena {};
-
-  // Constructor solely used by message-owned arena.
-  inline Arena(internal::MessageOwned) : impl_(internal::MessageOwned{}) {}
-
-  // Checks whether this arena is message-owned.
-  PROTOBUF_ALWAYS_INLINE bool IsMessageOwned() const {
-    return impl_.IsMessageOwned();
-  }
-
-  void ReturnArrayMemory(void* p, size_t size) {
-    impl_.ReturnArrayMemory(p, size);
-  }
-
-  template <typename T, typename... Args>
-  PROTOBUF_NDEBUG_INLINE static T* CreateMessageInternal(Arena* arena,
-                                                         Args&&... args) {
-    static_assert(
-        InternalHelper<T>::is_arena_constructable::value,
-        "CreateMessage can only construct types that are ArenaConstructable");
-    if (arena == NULL) {
-      return new T(nullptr, static_cast<Args&&>(args)...);
-    } else {
-      return arena->DoCreateMessage<T>(static_cast<Args&&>(args)...);
-    }
-  }
-
-  // This specialization for no arguments is necessary, because its behavior is
-  // slightly different.  When the arena pointer is nullptr, it calls T()
-  // instead of T(nullptr).
-  template <typename T>
-  PROTOBUF_NDEBUG_INLINE static T* CreateMessageInternal(Arena* arena) {
-    static_assert(
-        InternalHelper<T>::is_arena_constructable::value,
-        "CreateMessage can only construct types that are ArenaConstructable");
-    if (arena == NULL) {
-      // Generated arena constructor T(Arena*) is protected. Call via
-      // InternalHelper.
-      return InternalHelper<T>::New();
-    } else {
-      return arena->DoCreateMessage<T>();
-    }
-  }
-
-  // Allocate and also optionally call collector with the allocated type info
-  // when allocation recording is enabled.
-  PROTOBUF_NDEBUG_INLINE void* AllocateInternal(size_t size, size_t align,
-                                                void (*destructor)(void*),
-                                                const std::type_info* type) {
-    // Monitor allocation if needed.
-    if (destructor == nullptr) {
-      return AllocateAlignedWithHook(size, align, type);
-    } else {
-      if (align <= 8) {
-        auto res = AllocateAlignedWithCleanup(internal::AlignUpTo8(size), type);
-        res.second->elem = res.first;
-        res.second->cleanup = destructor;
-        return res.first;
-      } else {
-        auto res = AllocateAlignedWithCleanup(size + align - 8, type);
-        auto ptr = internal::AlignTo(res.first, align);
-        res.second->elem = ptr;
-        res.second->cleanup = destructor;
-        return ptr;
-      }
-    }
-  }
-
-  // CreateMessage<T> requires that T supports arenas, but this private method
-  // works whether or not T supports arenas. These are not exposed to user code
-  // as it can cause confusing API usages, and end up having double free in
-  // user code. These are used only internally from LazyField and Repeated
-  // fields, since they are designed to work in all mode combinations.
-  template <typename Msg, typename... Args>
-  PROTOBUF_ALWAYS_INLINE static Msg* DoCreateMaybeMessage(Arena* arena,
-                                                          std::true_type,
-                                                          Args&&... args) {
-    return CreateMessageInternal<Msg>(arena, std::forward<Args>(args)...);
-  }
-
-  template <typename T, typename... Args>
-  PROTOBUF_ALWAYS_INLINE static T* DoCreateMaybeMessage(Arena* arena,
-                                                        std::false_type,
-                                                        Args&&... args) {
-    return Create<T>(arena, std::forward<Args>(args)...);
-  }
-
-  template <typename T, typename... Args>
-  PROTOBUF_ALWAYS_INLINE static T* CreateMaybeMessage(Arena* arena,
-                                                      Args&&... args) {
-    return DoCreateMaybeMessage<T>(arena, is_arena_constructable<T>(),
-                                   std::forward<Args>(args)...);
-  }
-
-  // Just allocate the required size for the given type assuming the
-  // type has a trivial constructor.
-  template <typename T>
-  PROTOBUF_NDEBUG_INLINE T* CreateInternalRawArray(size_t num_elements) {
-    GOOGLE_CHECK_LE(num_elements, std::numeric_limits<size_t>::max() / sizeof(T))
-        << "Requested size is too large to fit into size_t.";
-    // We count on compiler to realize that if sizeof(T) is a multiple of
-    // 8 AlignUpTo can be elided.
-    const size_t n = sizeof(T) * num_elements;
-    return static_cast<T*>(
-        AllocateAlignedWithHookForArray(n, alignof(T), RTTI_TYPE_ID(T)));
-  }
-
-  template <typename T, typename... Args>
-  PROTOBUF_NDEBUG_INLINE T* DoCreateMessage(Args&&... args) {
-    return InternalHelper<T>::Construct(
-        AllocateInternal(sizeof(T), alignof(T),
-                         internal::ObjectDestructor<
-                             InternalHelper<T>::is_destructor_skippable::value,
-                             T>::destructor,
-                         RTTI_TYPE_ID(T)),
-        this, std::forward<Args>(args)...);
-  }
-
-  // CreateInArenaStorage is used to implement map field. Without it,
-  // Map need to call generated message's protected arena constructor,
-  // which needs to declare Map as friend of generated message.
-  template <typename T, typename... Args>
-  static void CreateInArenaStorage(T* ptr, Arena* arena, Args&&... args) {
-    CreateInArenaStorageInternal(ptr, arena,
-                                 typename is_arena_constructable<T>::type(),
-                                 std::forward<Args>(args)...);
-    if (arena != nullptr) {
-      RegisterDestructorInternal(
-          ptr, arena,
-          typename InternalHelper<T>::is_destructor_skippable::type());
-    }
-  }
-
-  template <typename T, typename... Args>
-  static void CreateInArenaStorageInternal(T* ptr, Arena* arena,
-                                           std::true_type, Args&&... args) {
-    InternalHelper<T>::Construct(ptr, arena, std::forward<Args>(args)...);
-  }
-  template <typename T, typename... Args>
-  static void CreateInArenaStorageInternal(T* ptr, Arena* /* arena */,
-                                           std::false_type, Args&&... args) {
-    new (ptr) T(std::forward<Args>(args)...);
-  }
-
-  template <typename T>
-  static void RegisterDestructorInternal(T* /* ptr */, Arena* /* arena */,
-                                         std::true_type) {}
-  template <typename T>
-  static void RegisterDestructorInternal(T* ptr, Arena* arena,
-                                         std::false_type) {
-    arena->OwnDestructor(ptr);
-  }
-
-  // These implement Create(). The second parameter has type 'true_type' if T is
-  // a subtype of Message and 'false_type' otherwise.
-  template <typename T, typename... Args>
-  PROTOBUF_ALWAYS_INLINE static T* CreateInternal(Arena* arena, std::true_type,
-                                                  Args&&... args) {
-    if (arena == nullptr) {
-      return new T(std::forward<Args>(args)...);
-    } else {
-      auto destructor =
-          internal::ObjectDestructor<std::is_trivially_destructible<T>::value,
-                                     T>::destructor;
-      T* result =
-          new (arena->AllocateInternal(sizeof(T), alignof(T), destructor,
-                                       RTTI_TYPE_ID(T)))
-          T(std::forward<Args>(args)...);
-      return result;
-    }
-  }
-  template <typename T, typename... Args>
-  PROTOBUF_ALWAYS_INLINE static T* CreateInternal(Arena* arena, std::false_type,
-                                                  Args&&... args) {
-    if (arena == nullptr) {
-      return new T(std::forward<Args>(args)...);
-    } else {
-      auto destructor =
-          internal::ObjectDestructor<std::is_trivially_destructible<T>::value,
-                                     T>::destructor;
-      return new (arena->AllocateInternal(sizeof(T), alignof(T), destructor,
-                                          RTTI_TYPE_ID(T)))
-          T(std::forward<Args>(args)...);
-    }
-  }
-
-  // These implement Own(), which registers an object for deletion (destructor
-  // call and operator delete()). The second parameter has type 'true_type' if T
-  // is a subtype of Message and 'false_type' otherwise. Collapsing
-  // all template instantiations to one for generic Message reduces code size,
-  // using the virtual destructor instead.
-  template <typename T>
-  PROTOBUF_ALWAYS_INLINE void OwnInternal(T* object, std::true_type) {
-    if (object != NULL) {
-      impl_.AddCleanup(object, &internal::arena_delete_object<MessageLite>);
-    }
-  }
-  template <typename T>
-  PROTOBUF_ALWAYS_INLINE void OwnInternal(T* object, std::false_type) {
-    if (object != NULL) {
-      impl_.AddCleanup(object, &internal::arena_delete_object<T>);
-    }
-  }
-
-  // Implementation for GetArena(). Only message objects with
-  // InternalArenaConstructable_ tags can be associated with an arena, and such
-  // objects must implement a GetArena() method.
-  template <typename T, typename std::enable_if<
-                            is_arena_constructable<T>::value, int>::type = 0>
-  PROTOBUF_ALWAYS_INLINE static Arena* GetArenaInternal(const T* value) {
-    return InternalHelper<T>::GetArena(value);
-  }
-  template <typename T,
-            typename std::enable_if<!is_arena_constructable<T>::value &&
-                                        has_get_arena<T>::value,
-                                    int>::type = 0>
-  PROTOBUF_ALWAYS_INLINE static Arena* GetArenaInternal(const T* value) {
-    return value->GetArena();
-  }
-  template <typename T,
-            typename std::enable_if<!is_arena_constructable<T>::value &&
-                                        !has_get_arena<T>::value,
-                                    int>::type = 0>
-  PROTOBUF_ALWAYS_INLINE static Arena* GetArenaInternal(const T* value) {
-    (void)value;
-    return nullptr;
-  }
-
-  template <typename T>
-  PROTOBUF_ALWAYS_INLINE static Arena* GetOwningArena(const T* value) {
-    return GetOwningArenaInternal(
-        value, std::is_convertible<T*, MessageLite*>());
-  }
-
-  // Implementation for GetOwningArena(). All and only message objects have
-  // GetOwningArena() method.
-  template <typename T>
-  PROTOBUF_ALWAYS_INLINE static Arena* GetOwningArenaInternal(
-      const T* value, std::true_type) {
-    return InternalHelper<T>::GetOwningArena(value);
-  }
-  template <typename T>
-  PROTOBUF_ALWAYS_INLINE static Arena* GetOwningArenaInternal(
-      const T* /* value */, std::false_type) {
-    return nullptr;
-  }
-
-  void* AllocateAlignedWithHookForArray(size_t n, size_t align,
-                                        const std::type_info* type) {
-    if (align <= 8) {
-      return AllocateAlignedWithHookForArray(internal::AlignUpTo8(n), type);
-    } else {
-      // We are wasting space by over allocating align - 8 bytes. Compared
-      // to a dedicated function that takes current alignment in consideration.
-      // Such a scheme would only waste (align - 8)/2 bytes on average, but
-      // requires a dedicated function in the outline arena allocation
-      // functions. Possibly re-evaluate tradeoffs later.
-      return internal::AlignTo(
-          AllocateAlignedWithHookForArray(n + align - 8, type), align);
-    }
-  }
-
-  void* AllocateAlignedWithHook(size_t n, size_t align,
-                                const std::type_info* type) {
-    if (align <= 8) {
-      return AllocateAlignedWithHook(internal::AlignUpTo8(n), type);
-    } else {
-      // We are wasting space by over allocating align - 8 bytes. Compared
-      // to a dedicated function that takes current alignment in consideration.
-      // Such a scheme would only waste (align - 8)/2 bytes on average, but
-      // requires a dedicated function in the outline arena allocation
-      // functions. Possibly re-evaluate tradeoffs later.
-      return internal::AlignTo(AllocateAlignedWithHook(n + align - 8, type),
-                               align);
-    }
-  }
-
-  void* AllocateAlignedNoHook(size_t n);
-  void* AllocateAlignedWithHook(size_t n, const std::type_info* type);
-  void* AllocateAlignedWithHookForArray(size_t n, const std::type_info* type);
-  std::pair<void*, internal::SerialArena::CleanupNode*>
-  AllocateAlignedWithCleanup(size_t n, const std::type_info* type);
-
-  template <typename Type>
-  friend class internal::GenericTypeHandler;
-  friend class internal::InternalMetadata;  // For user_arena().
-  friend class internal::LazyField;        // For CreateMaybeMessage.
-  friend class internal::EpsCopyInputStream;  // For parser performance
-  friend class MessageLite;
-  template <typename Key, typename T>
-  friend class Map;
-  template <typename>
-  friend class RepeatedField;                   // For ReturnArrayMemory
-  friend class internal::RepeatedPtrFieldBase;  // For ReturnArrayMemory
-  friend struct internal::ArenaTestPeer;
-};
-
-// Defined above for supporting environments without RTTI.
-#undef RTTI_TYPE_ID
-
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
-
-#endif  // GOOGLE_PROTOBUF_ARENA_H__
diff --git a/libs/protobuf/src/google/protobuf/arena_impl.h b/libs/protobuf/src/google/protobuf/arena_impl.h
deleted file mode 100644
index 7672768..0000000
--- a/libs/protobuf/src/google/protobuf/arena_impl.h
+++ /dev/null
@@ -1,686 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// This file defines an Arena allocator for better allocation performance.
-
-#ifndef GOOGLE_PROTOBUF_ARENA_IMPL_H__
-#define GOOGLE_PROTOBUF_ARENA_IMPL_H__
-
-#include <atomic>
-#include <limits>
-#include <typeinfo>
-
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/stubs/logging.h>
-#include <google/protobuf/stubs/port.h>
-
-#ifdef ADDRESS_SANITIZER
-#include <sanitizer/asan_interface.h>
-#endif  // ADDRESS_SANITIZER
-
-#include <google/protobuf/arenaz_sampler.h>
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-
-namespace google {
-namespace protobuf {
-namespace internal {
-
-// To prevent sharing cache lines between threads
-#ifdef __cpp_aligned_new
-enum { kCacheAlignment = 64 };
-#else
-enum { kCacheAlignment = alignof(max_align_t) };  // do the best we can
-#endif
-
-inline constexpr size_t AlignUpTo8(size_t n) {
-  // Align n to next multiple of 8 (from Hacker's Delight, Chapter 3.)
-  return (n + 7) & static_cast<size_t>(-8);
-}
-
-using LifecycleIdAtomic = uint64_t;
-
-// MetricsCollector collects stats for a particular arena.
-class PROTOBUF_EXPORT ArenaMetricsCollector {
- public:
-  ArenaMetricsCollector(bool record_allocs) : record_allocs_(record_allocs) {}
-
-  // Invoked when the arena is about to be destroyed. This method will
-  // typically finalize any metric collection and delete the collector.
-  // space_allocated is the space used by the arena.
-  virtual void OnDestroy(uint64_t space_allocated) = 0;
-
-  // OnReset() is called when the associated arena is reset.
-  // space_allocated is the space used by the arena just before the reset.
-  virtual void OnReset(uint64_t space_allocated) = 0;
-
-  // OnAlloc is called when an allocation happens.
-  // type_info is promised to be static - its lifetime extends to
-  // match program's lifetime (It is given by typeid operator).
-  // Note: typeid(void) will be passed as allocated_type every time we
-  // intentionally want to avoid monitoring an allocation. (i.e. internal
-  // allocations for managing the arena)
-  virtual void OnAlloc(const std::type_info* allocated_type,
-                       uint64_t alloc_size) = 0;
-
-  // Does OnAlloc() need to be called?  If false, metric collection overhead
-  // will be reduced since we will not do extra work per allocation.
-  bool RecordAllocs() { return record_allocs_; }
-
- protected:
-  // This class is destructed by the call to OnDestroy().
-  ~ArenaMetricsCollector() = default;
-  const bool record_allocs_;
-};
-
-struct AllocationPolicy {
-  static constexpr size_t kDefaultStartBlockSize = 256;
-  static constexpr size_t kDefaultMaxBlockSize = 8192;
-
-  size_t start_block_size = kDefaultStartBlockSize;
-  size_t max_block_size = kDefaultMaxBlockSize;
-  void* (*block_alloc)(size_t) = nullptr;
-  void (*block_dealloc)(void*, size_t) = nullptr;
-  ArenaMetricsCollector* metrics_collector = nullptr;
-
-  bool IsDefault() const {
-    return start_block_size == kDefaultMaxBlockSize &&
-           max_block_size == kDefaultMaxBlockSize && block_alloc == nullptr &&
-           block_dealloc == nullptr && metrics_collector == nullptr;
-  }
-};
-
-// Tagged pointer to an AllocationPolicy.
-class TaggedAllocationPolicyPtr {
- public:
-  constexpr TaggedAllocationPolicyPtr() : policy_(0) {}
-
-  explicit TaggedAllocationPolicyPtr(AllocationPolicy* policy)
-      : policy_(reinterpret_cast<uintptr_t>(policy)) {}
-
-  void set_policy(AllocationPolicy* policy) {
-    auto bits = policy_ & kTagsMask;
-    policy_ = reinterpret_cast<uintptr_t>(policy) | bits;
-  }
-
-  AllocationPolicy* get() {
-    return reinterpret_cast<AllocationPolicy*>(policy_ & kPtrMask);
-  }
-  const AllocationPolicy* get() const {
-    return reinterpret_cast<const AllocationPolicy*>(policy_ & kPtrMask);
-  }
-
-  AllocationPolicy& operator*() { return *get(); }
-  const AllocationPolicy& operator*() const { return *get(); }
-
-  AllocationPolicy* operator->() { return get(); }
-  const AllocationPolicy* operator->() const { return get(); }
-
-  bool is_user_owned_initial_block() const {
-    return static_cast<bool>(get_mask<kUserOwnedInitialBlock>());
-  }
-  void set_is_user_owned_initial_block(bool v) {
-    set_mask<kUserOwnedInitialBlock>(v);
-  }
-
-  bool should_record_allocs() const {
-    return static_cast<bool>(get_mask<kRecordAllocs>());
-  }
-  void set_should_record_allocs(bool v) { set_mask<kRecordAllocs>(v); }
-
-  uintptr_t get_raw() const { return policy_; }
-
-  inline void RecordAlloc(const std::type_info* allocated_type,
-                          size_t n) const {
-    get()->metrics_collector->OnAlloc(allocated_type, n);
-  }
-
- private:
-  enum : uintptr_t {
-    kUserOwnedInitialBlock = 1,
-    kRecordAllocs = 2,
-  };
-
-  static constexpr uintptr_t kTagsMask = 7;
-  static constexpr uintptr_t kPtrMask = ~kTagsMask;
-
-  template <uintptr_t kMask>
-  uintptr_t get_mask() const {
-    return policy_ & kMask;
-  }
-  template <uintptr_t kMask>
-  void set_mask(bool v) {
-    if (v) {
-      policy_ |= kMask;
-    } else {
-      policy_ &= ~kMask;
-    }
-  }
-  uintptr_t policy_;
-};
-
-enum class AllocationClient { kDefault, kArray };
-
-// A simple arena allocator. Calls to allocate functions must be properly
-// serialized by the caller, hence this class cannot be used as a general
-// purpose allocator in a multi-threaded program. It serves as a building block
-// for ThreadSafeArena, which provides a thread-safe arena allocator.
-//
-// This class manages
-// 1) Arena bump allocation + owning memory blocks.
-// 2) Maintaining a cleanup list.
-// It delagetes the actual memory allocation back to ThreadSafeArena, which
-// contains the information on block growth policy and backing memory allocation
-// used.
-class PROTOBUF_EXPORT SerialArena {
- public:
-  struct Memory {
-    void* ptr;
-    size_t size;
-  };
-
-  // Node contains the ptr of the object to be cleaned up and the associated
-  // cleanup function ptr.
-  struct CleanupNode {
-    void* elem;              // Pointer to the object to be cleaned up.
-    void (*cleanup)(void*);  // Function pointer to the destructor or deleter.
-  };
-
-  void CleanupList();
-  uint64_t SpaceAllocated() const {
-    return space_allocated_.load(std::memory_order_relaxed);
-  }
-  uint64_t SpaceUsed() const;
-
-  bool HasSpace(size_t n) const {
-    return n <= static_cast<size_t>(limit_ - ptr_);
-  }
-
-  // See comments on `cached_blocks_` member for details.
-  PROTOBUF_ALWAYS_INLINE void* TryAllocateFromCachedBlock(size_t size) {
-    if (PROTOBUF_PREDICT_FALSE(size < 16)) return nullptr;
-    // We round up to the next larger block in case the memory doesn't match
-    // the pattern we are looking for.
-    const size_t index = Bits::Log2FloorNonZero64(size - 1) - 3;
-
-    if (index >= cached_block_length_) return nullptr;
-    auto& cached_head = cached_blocks_[index];
-    if (cached_head == nullptr) return nullptr;
-
-    void* ret = cached_head;
-#ifdef ADDRESS_SANITIZER
-    ASAN_UNPOISON_MEMORY_REGION(ret, size);
-#endif  // ADDRESS_SANITIZER
-    cached_head = cached_head->next;
-    return ret;
-  }
-
-  // In kArray mode we look through cached blocks.
-  // We do not do this by default because most non-array allocations will not
-  // have the right size and will fail to find an appropriate cached block.
-  //
-  // TODO(sbenza): Evaluate if we should use cached blocks for message types of
-  // the right size. We can statically know if the allocation size can benefit
-  // from it.
-  template <AllocationClient alloc_client = AllocationClient::kDefault>
-  void* AllocateAligned(size_t n, const AllocationPolicy* policy) {
-    GOOGLE_DCHECK_EQ(internal::AlignUpTo8(n), n);  // Must be already aligned.
-    GOOGLE_DCHECK_GE(limit_, ptr_);
-
-    if (alloc_client == AllocationClient::kArray) {
-      if (void* res = TryAllocateFromCachedBlock(n)) {
-        return res;
-      }
-    }
-
-    if (PROTOBUF_PREDICT_FALSE(!HasSpace(n))) {
-      return AllocateAlignedFallback(n, policy);
-    }
-    return AllocateFromExisting(n);
-  }
-
- private:
-  void* AllocateFromExisting(size_t n) {
-    void* ret = ptr_;
-    ptr_ += n;
-#ifdef ADDRESS_SANITIZER
-    ASAN_UNPOISON_MEMORY_REGION(ret, n);
-#endif  // ADDRESS_SANITIZER
-    return ret;
-  }
-
-  // See comments on `cached_blocks_` member for details.
-  void ReturnArrayMemory(void* p, size_t size) {
-    // We only need to check for 32-bit platforms.
-    // In 64-bit platforms the minimum allocation size from Repeated*Field will
-    // be 16 guaranteed.
-    if (sizeof(void*) < 8) {
-      if (PROTOBUF_PREDICT_FALSE(size < 16)) return;
-    } else {
-      GOOGLE_DCHECK(size >= 16);
-    }
-
-    // We round down to the next smaller block in case the memory doesn't match
-    // the pattern we are looking for. eg, someone might have called Reserve()
-    // on the repeated field.
-    const size_t index = Bits::Log2FloorNonZero64(size) - 4;
-
-    if (PROTOBUF_PREDICT_FALSE(index >= cached_block_length_)) {
-      // We can't put this object on the freelist so make this object the
-      // freelist. It is guaranteed it is larger than the one we have, and
-      // large enough to hold another allocation of `size`.
-      CachedBlock** new_list = static_cast<CachedBlock**>(p);
-      size_t new_size = size / sizeof(CachedBlock*);
-
-      std::copy(cached_blocks_, cached_blocks_ + cached_block_length_,
-                new_list);
-      std::fill(new_list + cached_block_length_, new_list + new_size, nullptr);
-      cached_blocks_ = new_list;
-      // Make the size fit in uint8_t. This is the power of two, so we don't
-      // need anything larger.
-      cached_block_length_ =
-          static_cast<uint8_t>(std::min(size_t{64}, new_size));
-
-      return;
-    }
-
-    auto& cached_head = cached_blocks_[index];
-    auto* new_node = static_cast<CachedBlock*>(p);
-    new_node->next = cached_head;
-    cached_head = new_node;
-#ifdef ADDRESS_SANITIZER
-    ASAN_POISON_MEMORY_REGION(p, size);
-#endif  // ADDRESS_SANITIZER
-  }
-
- public:
-  // Allocate space if the current region provides enough space.
-  bool MaybeAllocateAligned(size_t n, void** out) {
-    GOOGLE_DCHECK_EQ(internal::AlignUpTo8(n), n);  // Must be already aligned.
-    GOOGLE_DCHECK_GE(limit_, ptr_);
-    if (PROTOBUF_PREDICT_FALSE(!HasSpace(n))) return false;
-    *out = AllocateFromExisting(n);
-    return true;
-  }
-
-  std::pair<void*, CleanupNode*> AllocateAlignedWithCleanup(
-      size_t n, const AllocationPolicy* policy) {
-    GOOGLE_DCHECK_EQ(internal::AlignUpTo8(n), n);  // Must be already aligned.
-    if (PROTOBUF_PREDICT_FALSE(!HasSpace(n + kCleanupSize))) {
-      return AllocateAlignedWithCleanupFallback(n, policy);
-    }
-    return AllocateFromExistingWithCleanupFallback(n);
-  }
-
- private:
-  std::pair<void*, CleanupNode*> AllocateFromExistingWithCleanupFallback(
-      size_t n) {
-    void* ret = ptr_;
-    ptr_ += n;
-    limit_ -= kCleanupSize;
-#ifdef ADDRESS_SANITIZER
-    ASAN_UNPOISON_MEMORY_REGION(ret, n);
-    ASAN_UNPOISON_MEMORY_REGION(limit_, kCleanupSize);
-#endif  // ADDRESS_SANITIZER
-    return CreatePair(ret, reinterpret_cast<CleanupNode*>(limit_));
-  }
-
- public:
-  void AddCleanup(void* elem, void (*cleanup)(void*),
-                  const AllocationPolicy* policy) {
-    auto res = AllocateAlignedWithCleanup(0, policy);
-    res.second->elem = elem;
-    res.second->cleanup = cleanup;
-  }
-
-  void* owner() const { return owner_; }
-  SerialArena* next() const { return next_; }
-  void set_next(SerialArena* next) { next_ = next; }
-
- private:
-  friend class ThreadSafeArena;
-  friend class ArenaBenchmark;
-
-  // Creates a new SerialArena inside mem using the remaining memory as for
-  // future allocations.
-  static SerialArena* New(SerialArena::Memory mem, void* owner,
-                          ThreadSafeArenaStats* stats);
-  // Free SerialArena returning the memory passed in to New
-  template <typename Deallocator>
-  Memory Free(Deallocator deallocator);
-
-  // Blocks are variable length malloc-ed objects.  The following structure
-  // describes the common header for all blocks.
-  struct Block {
-    Block(Block* next, size_t size) : next(next), size(size), start(nullptr) {}
-
-    char* Pointer(size_t n) {
-      GOOGLE_DCHECK(n <= size);
-      return reinterpret_cast<char*>(this) + n;
-    }
-
-    Block* const next;
-    const size_t size;
-    CleanupNode* start;
-    // data follows
-  };
-
-  void* owner_;            // &ThreadCache of this thread;
-  Block* head_;            // Head of linked list of blocks.
-  SerialArena* next_;      // Next SerialArena in this linked list.
-  size_t space_used_ = 0;  // Necessary for metrics.
-  std::atomic<size_t> space_allocated_;
-
-  // Next pointer to allocate from.  Always 8-byte aligned.  Points inside
-  // head_ (and head_->pos will always be non-canonical).  We keep these
-  // here to reduce indirection.
-  char* ptr_;
-  // Limiting address up to which memory can be allocated from the head block.
-  char* limit_;
-  // For holding sampling information.  The pointer is owned by the
-  // ThreadSafeArena that holds this serial arena.
-  ThreadSafeArenaStats* arena_stats_;
-
-  // Repeated*Field and Arena play together to reduce memory consumption by
-  // reusing blocks. Currently, natural growth of the repeated field types makes
-  // them allocate blocks of size `8 + 2^N, N>=3`.
-  // When the repeated field grows returns the previous block and we put it in
-  // this free list.
-  // `cached_blocks_[i]` points to the free list for blocks of size `8+2^(i+3)`.
-  // The array of freelists is grown when needed in `ReturnArrayMemory()`.
-  struct CachedBlock {
-    // Simple linked list.
-    CachedBlock* next;
-  };
-  uint8_t cached_block_length_ = 0;
-  CachedBlock** cached_blocks_ = nullptr;
-
-  // Constructor is private as only New() should be used.
-  inline SerialArena(Block* b, void* owner, ThreadSafeArenaStats* stats);
-  void* AllocateAlignedFallback(size_t n, const AllocationPolicy* policy);
-  std::pair<void*, CleanupNode*> AllocateAlignedWithCleanupFallback(
-      size_t n, const AllocationPolicy* policy);
-  void AllocateNewBlock(size_t n, const AllocationPolicy* policy);
-
-  std::pair<void*, CleanupNode*> CreatePair(void* ptr, CleanupNode* node) {
-    return {ptr, node};
-  }
-
- public:
-  static constexpr size_t kBlockHeaderSize = AlignUpTo8(sizeof(Block));
-  static constexpr size_t kCleanupSize = AlignUpTo8(sizeof(CleanupNode));
-};
-
-// Tag type used to invoke the constructor of message-owned arena.
-// Only message-owned arenas use this constructor for creation.
-// Such constructors are internal implementation details of the library.
-struct MessageOwned {
-  explicit MessageOwned() = default;
-};
-
-// This class provides the core Arena memory allocation library. Different
-// implementations only need to implement the public interface below.
-// Arena is not a template type as that would only be useful if all protos
-// in turn would be templates, which will/cannot happen. However separating
-// the memory allocation part from the cruft of the API users expect we can
-// use #ifdef the select the best implementation based on hardware / OS.
-class PROTOBUF_EXPORT ThreadSafeArena {
- public:
-  ThreadSafeArena() { Init(); }
-
-  // Constructor solely used by message-owned arena.
-  ThreadSafeArena(internal::MessageOwned) : tag_and_id_(kMessageOwnedArena) {
-    Init();
-  }
-
-  ThreadSafeArena(char* mem, size_t size) { InitializeFrom(mem, size); }
-
-  explicit ThreadSafeArena(void* mem, size_t size,
-                           const AllocationPolicy& policy) {
-    InitializeWithPolicy(mem, size, policy);
-  }
-
-  // Destructor deletes all owned heap allocated objects, and destructs objects
-  // that have non-trivial destructors, except for proto2 message objects whose
-  // destructors can be skipped. Also, frees all blocks except the initial block
-  // if it was passed in.
-  ~ThreadSafeArena();
-
-  uint64_t Reset();
-
-  uint64_t SpaceAllocated() const;
-  uint64_t SpaceUsed() const;
-
-  template <AllocationClient alloc_client = AllocationClient::kDefault>
-  void* AllocateAligned(size_t n, const std::type_info* type) {
-    SerialArena* arena;
-    if (PROTOBUF_PREDICT_TRUE(!alloc_policy_.should_record_allocs() &&
-                              GetSerialArenaFast(&arena))) {
-      return arena->AllocateAligned<alloc_client>(n, AllocPolicy());
-    } else {
-      return AllocateAlignedFallback(n, type);
-    }
-  }
-
-  void ReturnArrayMemory(void* p, size_t size) {
-    SerialArena* arena;
-    if (PROTOBUF_PREDICT_TRUE(GetSerialArenaFast(&arena))) {
-      arena->ReturnArrayMemory(p, size);
-    }
-  }
-
-  // This function allocates n bytes if the common happy case is true and
-  // returns true. Otherwise does nothing and returns false. This strange
-  // semantics is necessary to allow callers to program functions that only
-  // have fallback function calls in tail position. This substantially improves
-  // code for the happy path.
-  PROTOBUF_NDEBUG_INLINE bool MaybeAllocateAligned(size_t n, void** out) {
-    SerialArena* arena;
-    if (PROTOBUF_PREDICT_TRUE(!alloc_policy_.should_record_allocs() &&
-                              GetSerialArenaFromThreadCache(&arena))) {
-      return arena->MaybeAllocateAligned(n, out);
-    }
-    return false;
-  }
-
-  std::pair<void*, SerialArena::CleanupNode*> AllocateAlignedWithCleanup(
-      size_t n, const std::type_info* type);
-
-  // Add object pointer and cleanup function pointer to the list.
-  void AddCleanup(void* elem, void (*cleanup)(void*));
-
-  // Checks whether this arena is message-owned.
-  PROTOBUF_ALWAYS_INLINE bool IsMessageOwned() const {
-    return tag_and_id_ & kMessageOwnedArena;
-  }
-
- private:
-  // Unique for each arena. Changes on Reset().
-  uint64_t tag_and_id_ = 0;
-  // The LSB of tag_and_id_ indicates if the arena is message-owned.
-  enum : uint64_t { kMessageOwnedArena = 1 };
-
-  TaggedAllocationPolicyPtr alloc_policy_;  // Tagged pointer to AllocPolicy.
-
-  static_assert(std::is_trivially_destructible<SerialArena>{},
-                "SerialArena needs to be trivially destructible.");
-  // Pointer to a linked list of SerialArena.
-  std::atomic<SerialArena*> threads_;
-  std::atomic<SerialArena*> hint_;  // Fast thread-local block access
-
-  const AllocationPolicy* AllocPolicy() const { return alloc_policy_.get(); }
-  void InitializeFrom(void* mem, size_t size);
-  void InitializeWithPolicy(void* mem, size_t size, AllocationPolicy policy);
-  void* AllocateAlignedFallback(size_t n, const std::type_info* type);
-  std::pair<void*, SerialArena::CleanupNode*>
-  AllocateAlignedWithCleanupFallback(size_t n, const std::type_info* type);
-
-  void Init();
-  void SetInitialBlock(void* mem, size_t size);
-
-  // Delete or Destruct all objects owned by the arena.
-  void CleanupList();
-
-  inline uint64_t LifeCycleId() const {
-    return tag_and_id_ & ~kMessageOwnedArena;
-  }
-
-  inline void CacheSerialArena(SerialArena* serial) {
-    thread_cache().last_serial_arena = serial;
-    thread_cache().last_lifecycle_id_seen = tag_and_id_;
-    // TODO(haberman): evaluate whether we would gain efficiency by getting rid
-    // of hint_.  It's the only write we do to ThreadSafeArena in the allocation
-    // path, which will dirty the cache line.
-
-    hint_.store(serial, std::memory_order_release);
-  }
-
-  PROTOBUF_NDEBUG_INLINE bool GetSerialArenaFast(SerialArena** arena) {
-    if (GetSerialArenaFromThreadCache(arena)) return true;
-
-    // Check whether we own the last accessed SerialArena on this arena.  This
-    // fast path optimizes the case where a single thread uses multiple arenas.
-    ThreadCache* tc = &thread_cache();
-    SerialArena* serial = hint_.load(std::memory_order_acquire);
-    if (PROTOBUF_PREDICT_TRUE(serial != nullptr && serial->owner() == tc)) {
-      *arena = serial;
-      return true;
-    }
-    return false;
-  }
-
-  PROTOBUF_NDEBUG_INLINE bool GetSerialArenaFromThreadCache(
-      SerialArena** arena) {
-    // If this thread already owns a block in this arena then try to use that.
-    // This fast path optimizes the case where multiple threads allocate from
-    // the same arena.
-    ThreadCache* tc = &thread_cache();
-    if (PROTOBUF_PREDICT_TRUE(tc->last_lifecycle_id_seen == tag_and_id_)) {
-      *arena = tc->last_serial_arena;
-      return true;
-    }
-    return false;
-  }
-  SerialArena* GetSerialArenaFallback(void* me);
-
-  template <typename Functor>
-  void PerSerialArena(Functor fn) {
-    // By omitting an Acquire barrier we ensure that any user code that doesn't
-    // properly synchronize Reset() or the destructor will throw a TSAN warning.
-    SerialArena* serial = threads_.load(std::memory_order_relaxed);
-
-    for (; serial; serial = serial->next()) fn(serial);
-  }
-
-  // Releases all memory except the first block which it returns. The first
-  // block might be owned by the user and thus need some extra checks before
-  // deleting.
-  SerialArena::Memory Free(size_t* space_allocated);
-
-#ifdef _MSC_VER
-#pragma warning(disable : 4324)
-#endif
-  struct alignas(kCacheAlignment) ThreadCache {
-#if defined(GOOGLE_PROTOBUF_NO_THREADLOCAL)
-    // If we are using the ThreadLocalStorage class to store the ThreadCache,
-    // then the ThreadCache's default constructor has to be responsible for
-    // initializing it.
-    ThreadCache()
-        : next_lifecycle_id(0),
-          last_lifecycle_id_seen(-1),
-          last_serial_arena(nullptr) {}
-#endif
-
-    // Number of per-thread lifecycle IDs to reserve. Must be power of two.
-    // To reduce contention on a global atomic, each thread reserves a batch of
-    // IDs.  The following number is calculated based on a stress test with
-    // ~6500 threads all frequently allocating a new arena.
-    static constexpr size_t kPerThreadIds = 256;
-    // Next lifecycle ID available to this thread. We need to reserve a new
-    // batch, if `next_lifecycle_id & (kPerThreadIds - 1) == 0`.
-    uint64_t next_lifecycle_id;
-    // The ThreadCache is considered valid as long as this matches the
-    // lifecycle_id of the arena being used.
-    uint64_t last_lifecycle_id_seen;
-    SerialArena* last_serial_arena;
-  };
-
-  // Lifecycle_id can be highly contended variable in a situation of lots of
-  // arena creation. Make sure that other global variables are not sharing the
-  // cacheline.
-#ifdef _MSC_VER
-#pragma warning(disable : 4324)
-#endif
-  struct alignas(kCacheAlignment) CacheAlignedLifecycleIdGenerator {
-    std::atomic<LifecycleIdAtomic> id;
-  };
-  static CacheAlignedLifecycleIdGenerator lifecycle_id_generator_;
-#if defined(GOOGLE_PROTOBUF_NO_THREADLOCAL)
-  // iOS does not support __thread keyword so we use a custom thread local
-  // storage class we implemented.
-  static ThreadCache& thread_cache();
-#elif defined(PROTOBUF_USE_DLLS)
-  // Thread local variables cannot be exposed through DLL interface but we can
-  // wrap them in static functions.
-  static ThreadCache& thread_cache();
-#else
-  static PROTOBUF_THREAD_LOCAL ThreadCache thread_cache_;
-  static ThreadCache& thread_cache() { return thread_cache_; }
-#endif
-
-  ThreadSafeArenaStatsHandle arena_stats_;
-
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(ThreadSafeArena);
-  // All protos have pointers back to the arena hence Arena must have
-  // pointer stability.
-  ThreadSafeArena(ThreadSafeArena&&) = delete;
-  ThreadSafeArena& operator=(ThreadSafeArena&&) = delete;
-
- public:
-  // kBlockHeaderSize is sizeof(Block), aligned up to the nearest multiple of 8
-  // to protect the invariant that pos is always at a multiple of 8.
-  static constexpr size_t kBlockHeaderSize = SerialArena::kBlockHeaderSize;
-  static constexpr size_t kSerialArenaSize =
-      (sizeof(SerialArena) + 7) & static_cast<size_t>(-8);
-  static_assert(kBlockHeaderSize % 8 == 0,
-                "kBlockHeaderSize must be a multiple of 8.");
-  static_assert(kSerialArenaSize % 8 == 0,
-                "kSerialArenaSize must be a multiple of 8.");
-};
-
-}  // namespace internal
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
-
-#endif  // GOOGLE_PROTOBUF_ARENA_IMPL_H__
diff --git a/libs/protobuf/src/google/protobuf/arena_test_util.cc b/libs/protobuf/src/google/protobuf/arena_test_util.cc
deleted file mode 100644
index 2cb5075..0000000
--- a/libs/protobuf/src/google/protobuf/arena_test_util.cc
+++ /dev/null
@@ -1,51 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <google/protobuf/arena_test_util.h>
-
-#include <google/protobuf/stubs/logging.h>
-#include <google/protobuf/stubs/common.h>
-
-
-#define EXPECT_EQ GOOGLE_CHECK_EQ
-
-namespace google {
-namespace protobuf {
-namespace internal {
-
-NoHeapChecker::~NoHeapChecker() {
-  capture_alloc.Unhook();
-  EXPECT_EQ(0, capture_alloc.alloc_count());
-  EXPECT_EQ(0, capture_alloc.free_count());
-}
-
-}  // namespace internal
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/arena_test_util.h b/libs/protobuf/src/google/protobuf/arena_test_util.h
deleted file mode 100644
index 6e42d4b..0000000
--- a/libs/protobuf/src/google/protobuf/arena_test_util.h
+++ /dev/null
@@ -1,132 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef GOOGLE_PROTOBUF_ARENA_TEST_UTIL_H__
-#define GOOGLE_PROTOBUF_ARENA_TEST_UTIL_H__
-
-#include <google/protobuf/stubs/logging.h>
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/arena.h>
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/io/zero_copy_stream_impl_lite.h>
-
-namespace google {
-namespace protobuf {
-
-template <typename T, bool use_arena>
-void TestParseCorruptedString(const T& message) {
-  int success_count = 0;
-  std::string s;
-  {
-    // Map order is not deterministic. To make the test deterministic we want
-    // to serialize the proto deterministically.
-    io::StringOutputStream output(&s);
-    io::CodedOutputStream out(&output);
-    out.SetSerializationDeterministic(true);
-    message.SerializePartialToCodedStream(&out);
-  }
-  const int kMaxIters = 900;
-  const int stride = s.size() <= kMaxIters ? 1 : s.size() / kMaxIters;
-  const int start = stride == 1 || use_arena ? 0 : (stride + 1) / 2;
-  for (int i = start; i < s.size(); i += stride) {
-    for (int c = 1 + (i % 17); c < 256; c += 2 * c + (i & 3)) {
-      s[i] ^= c;
-      Arena arena;
-      T* message = Arena::CreateMessage<T>(use_arena ? &arena : nullptr);
-      if (message->ParseFromString(s)) {
-        ++success_count;
-      }
-      if (!use_arena) {
-        delete message;
-      }
-      s[i] ^= c;  // Restore s to its original state.
-    }
-  }
-  // This next line is a low bar.  But getting through the test without crashing
-  // due to use-after-free or other bugs is a big part of what we're checking.
-  GOOGLE_CHECK_GT(success_count, 0);
-}
-
-namespace internal {
-
-struct ArenaTestPeer {
-  static void ReturnArrayMemory(Arena* arena, void* p, size_t size) {
-    arena->ReturnArrayMemory(p, size);
-  }
-};
-
-class NoHeapChecker {
- public:
-  NoHeapChecker() { capture_alloc.Hook(); }
-  ~NoHeapChecker();
-
- private:
-  class NewDeleteCapture {
-   public:
-    // TODO(xiaofeng): Implement this for opensource protobuf.
-    void Hook() {}
-    void Unhook() {}
-    int alloc_count() { return 0; }
-    int free_count() { return 0; }
-  } capture_alloc;
-};
-
-// Owns the internal T only if it's not owned by an arena.
-// T needs to be arena constructible and destructor skippable.
-template <typename T>
-class ArenaHolder {
- public:
-  explicit ArenaHolder(Arena* arena)
-      : field_(Arena::CreateMessage<T>(arena)),
-        owned_by_arena_(arena != nullptr) {
-    GOOGLE_DCHECK(google::protobuf::Arena::is_arena_constructable<T>::value);
-    GOOGLE_DCHECK(google::protobuf::Arena::is_destructor_skippable<T>::value);
-  }
-
-  ~ArenaHolder() {
-    if (!owned_by_arena_) {
-      delete field_;
-    }
-  }
-
-  T* get() { return field_; }
-  T* operator->() { return field_; }
-  T& operator*() { return *field_; }
-
- private:
-  T* field_;
-  bool owned_by_arena_;
-};
-
-}  // namespace internal
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // GOOGLE_PROTOBUF_ARENA_TEST_UTIL_H__
diff --git a/libs/protobuf/src/google/protobuf/arena_unittest.cc b/libs/protobuf/src/google/protobuf/arena_unittest.cc
deleted file mode 100644
index 7539b4b..0000000
--- a/libs/protobuf/src/google/protobuf/arena_unittest.cc
+++ /dev/null
@@ -1,1634 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <google/protobuf/arena.h>
-
-#include <algorithm>
-#include <cstddef>
-#include <cstring>
-#include <memory>
-#include <string>
-#include <type_traits>
-#include <typeinfo>
-#include <vector>
-
-#include <google/protobuf/stubs/logging.h>
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/unittest.pb.h>
-#include <google/protobuf/unittest_arena.pb.h>
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
-#include <google/protobuf/stubs/strutil.h>
-#include <google/protobuf/arena_test_util.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/extension_set.h>
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/io/zero_copy_stream_impl_lite.h>
-#include <google/protobuf/message.h>
-#include <google/protobuf/message_lite.h>
-#include <google/protobuf/repeated_field.h>
-#include <google/protobuf/test_util.h>
-#include <google/protobuf/unknown_field_set.h>
-#include <google/protobuf/wire_format_lite.h>
-
-
-// Must be included last
-#include <google/protobuf/port_def.inc>
-
-using proto2_arena_unittest::ArenaMessage;
-using protobuf_unittest::ForeignMessage;
-using protobuf_unittest::TestAllExtensions;
-using protobuf_unittest::TestAllTypes;
-using protobuf_unittest::TestEmptyMessage;
-using protobuf_unittest::TestOneof2;
-
-namespace google {
-namespace protobuf {
-
-class Notifier {
- public:
-  Notifier() : count_(0) {}
-  void Notify() { count_++; }
-  int GetCount() { return count_; }
-
- private:
-  int count_;
-};
-
-class SimpleDataType {
- public:
-  SimpleDataType() : notifier_(NULL) {}
-  void SetNotifier(Notifier* notifier) { notifier_ = notifier; }
-  virtual ~SimpleDataType() {
-    if (notifier_ != NULL) {
-      notifier_->Notify();
-    }
-  };
-
- private:
-  Notifier* notifier_;
-};
-
-// A simple class that does not allow copying and so cannot be used as a
-// parameter type without "const &".
-class PleaseDontCopyMe {
- public:
-  explicit PleaseDontCopyMe(int value) : value_(value) {}
-
-  int value() const { return value_; }
-
- private:
-  int value_;
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(PleaseDontCopyMe);
-};
-
-// A class that takes four different types as constructor arguments.
-class MustBeConstructedWithOneThroughFour {
- public:
-  MustBeConstructedWithOneThroughFour(int one, const char* two,
-                                      const std::string& three,
-                                      const PleaseDontCopyMe* four)
-      : one_(one), two_(two), three_(three), four_(four) {}
-
-  int one_;
-  const char* const two_;
-  std::string three_;
-  const PleaseDontCopyMe* four_;
-
- private:
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(MustBeConstructedWithOneThroughFour);
-};
-
-// A class that takes eight different types as constructor arguments.
-class MustBeConstructedWithOneThroughEight {
- public:
-  MustBeConstructedWithOneThroughEight(int one, const char* two,
-                                       const std::string& three,
-                                       const PleaseDontCopyMe* four, int five,
-                                       const char* six,
-                                       const std::string& seven,
-                                       const std::string& eight)
-      : one_(one),
-        two_(two),
-        three_(three),
-        four_(four),
-        five_(five),
-        six_(six),
-        seven_(seven),
-        eight_(eight) {}
-
-  int one_;
-  const char* const two_;
-  std::string three_;
-  const PleaseDontCopyMe* four_;
-  int five_;
-  const char* const six_;
-  std::string seven_;
-  std::string eight_;
-
- private:
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(MustBeConstructedWithOneThroughEight);
-};
-
-TEST(ArenaTest, ArenaConstructable) {
-  EXPECT_TRUE(Arena::is_arena_constructable<TestAllTypes>::type::value);
-  EXPECT_TRUE(Arena::is_arena_constructable<const TestAllTypes>::type::value);
-  EXPECT_FALSE(Arena::is_arena_constructable<Arena>::type::value);
-}
-
-TEST(ArenaTest, DestructorSkippable) {
-  EXPECT_TRUE(Arena::is_destructor_skippable<TestAllTypes>::type::value);
-  EXPECT_TRUE(Arena::is_destructor_skippable<const TestAllTypes>::type::value);
-  EXPECT_FALSE(Arena::is_destructor_skippable<Arena>::type::value);
-}
-
-TEST(ArenaTest, BasicCreate) {
-  Arena arena;
-  EXPECT_TRUE(Arena::Create<int32_t>(&arena) != NULL);
-  EXPECT_TRUE(Arena::Create<int64_t>(&arena) != NULL);
-  EXPECT_TRUE(Arena::Create<float>(&arena) != NULL);
-  EXPECT_TRUE(Arena::Create<double>(&arena) != NULL);
-  EXPECT_TRUE(Arena::Create<std::string>(&arena) != NULL);
-  arena.Own(new int32_t);
-  arena.Own(new int64_t);
-  arena.Own(new float);
-  arena.Own(new double);
-  arena.Own(new std::string);
-  arena.Own<int>(NULL);
-  Notifier notifier;
-  SimpleDataType* data = Arena::Create<SimpleDataType>(&arena);
-  data->SetNotifier(&notifier);
-  data = new SimpleDataType;
-  data->SetNotifier(&notifier);
-  arena.Own(data);
-  arena.Reset();
-  EXPECT_EQ(2, notifier.GetCount());
-}
-
-TEST(ArenaTest, CreateAndConstCopy) {
-  Arena arena;
-  const std::string s("foo");
-  const std::string* s_copy = Arena::Create<std::string>(&arena, s);
-  EXPECT_TRUE(s_copy != NULL);
-  EXPECT_EQ("foo", s);
-  EXPECT_EQ("foo", *s_copy);
-}
-
-TEST(ArenaTest, CreateAndNonConstCopy) {
-  Arena arena;
-  std::string s("foo");
-  const std::string* s_copy = Arena::Create<std::string>(&arena, s);
-  EXPECT_TRUE(s_copy != NULL);
-  EXPECT_EQ("foo", s);
-  EXPECT_EQ("foo", *s_copy);
-}
-
-TEST(ArenaTest, CreateAndMove) {
-  Arena arena;
-  std::string s("foo");
-  const std::string* s_move = Arena::Create<std::string>(&arena, std::move(s));
-  EXPECT_TRUE(s_move != NULL);
-  EXPECT_TRUE(s.empty());  // NOLINT
-  EXPECT_EQ("foo", *s_move);
-}
-
-TEST(ArenaTest, CreateWithFourConstructorArguments) {
-  Arena arena;
-  const std::string three("3");
-  const PleaseDontCopyMe four(4);
-  const MustBeConstructedWithOneThroughFour* new_object =
-      Arena::Create<MustBeConstructedWithOneThroughFour>(&arena, 1, "2", three,
-                                                         &four);
-  EXPECT_TRUE(new_object != NULL);
-  ASSERT_EQ(1, new_object->one_);
-  ASSERT_STREQ("2", new_object->two_);
-  ASSERT_EQ("3", new_object->three_);
-  ASSERT_EQ(4, new_object->four_->value());
-}
-
-TEST(ArenaTest, CreateWithEightConstructorArguments) {
-  Arena arena;
-  const std::string three("3");
-  const PleaseDontCopyMe four(4);
-  const std::string seven("7");
-  const std::string eight("8");
-  const MustBeConstructedWithOneThroughEight* new_object =
-      Arena::Create<MustBeConstructedWithOneThroughEight>(
-          &arena, 1, "2", three, &four, 5, "6", seven, eight);
-  EXPECT_TRUE(new_object != NULL);
-  ASSERT_EQ(1, new_object->one_);
-  ASSERT_STREQ("2", new_object->two_);
-  ASSERT_EQ("3", new_object->three_);
-  ASSERT_EQ(4, new_object->four_->value());
-  ASSERT_EQ(5, new_object->five_);
-  ASSERT_STREQ("6", new_object->six_);
-  ASSERT_EQ("7", new_object->seven_);
-  ASSERT_EQ("8", new_object->eight_);
-}
-
-class PleaseMoveMe {
- public:
-  explicit PleaseMoveMe(const std::string& value) : value_(value) {}
-  PleaseMoveMe(PleaseMoveMe&&) = default;
-  PleaseMoveMe(const PleaseMoveMe&) = delete;
-
-  const std::string& value() const { return value_; }
-
- private:
-  std::string value_;
-};
-
-TEST(ArenaTest, CreateWithMoveArguments) {
-  Arena arena;
-  PleaseMoveMe one("1");
-  const PleaseMoveMe* new_object =
-      Arena::Create<PleaseMoveMe>(&arena, std::move(one));
-  EXPECT_TRUE(new_object);
-  ASSERT_EQ("1", new_object->value());
-}
-
-TEST(ArenaTest, InitialBlockTooSmall) {
-  // Construct a small blocks of memory to be used by the arena allocator; then,
-  // allocate an object which will not fit in the initial block.
-  for (int size = 0; size <= Arena::kBlockOverhead + 32; size++) {
-    std::vector<char> arena_block(size);
-    ArenaOptions options;
-    options.initial_block = arena_block.data();
-    options.initial_block_size = arena_block.size();
-
-    // Try sometimes with non-default block sizes so that we exercise paths
-    // with and without ArenaImpl::Options.
-    if ((size % 2) != 0) {
-      options.start_block_size += 8;
-    }
-
-    Arena arena(options);
-
-    char* p = Arena::CreateArray<char>(&arena, 96);
-    uintptr_t allocation = reinterpret_cast<uintptr_t>(p);
-
-    // Ensure that the arena allocator did not return memory pointing into the
-    // initial block of memory.
-    uintptr_t arena_start = reinterpret_cast<uintptr_t>(arena_block.data());
-    uintptr_t arena_end = arena_start + arena_block.size();
-    EXPECT_FALSE(allocation >= arena_start && allocation < arena_end);
-
-    // Write to the memory we allocated; this should (but is not guaranteed to)
-    // trigger a check for heap corruption if the object was allocated from the
-    // initially-provided block.
-    memset(p, '\0', 96);
-  }
-}
-
-TEST(ArenaTest, Parsing) {
-  TestAllTypes original;
-  TestUtil::SetAllFields(&original);
-
-  // Test memory leak.
-  Arena arena;
-  TestAllTypes* arena_message = Arena::CreateMessage<TestAllTypes>(&arena);
-  arena_message->ParseFromString(original.SerializeAsString());
-  TestUtil::ExpectAllFieldsSet(*arena_message);
-
-  // Test that string fields have nul terminator bytes (earlier bug).
-  EXPECT_EQ(strlen(original.optional_string().c_str()),
-            strlen(arena_message->optional_string().c_str()));
-}
-
-TEST(ArenaTest, UnknownFields) {
-  TestAllTypes original;
-  TestUtil::SetAllFields(&original);
-
-  // Test basic parsing into (populating) and reading out of unknown fields on
-  // an arena.
-  Arena arena;
-  TestEmptyMessage* arena_message =
-      Arena::CreateMessage<TestEmptyMessage>(&arena);
-  arena_message->ParseFromString(original.SerializeAsString());
-
-  TestAllTypes copied;
-  copied.ParseFromString(arena_message->SerializeAsString());
-  TestUtil::ExpectAllFieldsSet(copied);
-
-  // Exercise UFS manual manipulation (setters).
-  arena_message = Arena::CreateMessage<TestEmptyMessage>(&arena);
-  arena_message->mutable_unknown_fields()->AddVarint(
-      TestAllTypes::kOptionalInt32FieldNumber, 42);
-  copied.Clear();
-  copied.ParseFromString(arena_message->SerializeAsString());
-  EXPECT_TRUE(copied.has_optional_int32());
-  EXPECT_EQ(42, copied.optional_int32());
-
-  // Exercise UFS swap path.
-  TestEmptyMessage* arena_message_2 =
-      Arena::CreateMessage<TestEmptyMessage>(&arena);
-  arena_message_2->Swap(arena_message);
-  copied.Clear();
-  copied.ParseFromString(arena_message_2->SerializeAsString());
-  EXPECT_TRUE(copied.has_optional_int32());
-  EXPECT_EQ(42, copied.optional_int32());
-
-  // Test field manipulation.
-  TestEmptyMessage* arena_message_3 =
-      Arena::CreateMessage<TestEmptyMessage>(&arena);
-  arena_message_3->mutable_unknown_fields()->AddVarint(1000, 42);
-  arena_message_3->mutable_unknown_fields()->AddFixed32(1001, 42);
-  arena_message_3->mutable_unknown_fields()->AddFixed64(1002, 42);
-  arena_message_3->mutable_unknown_fields()->AddLengthDelimited(1003);
-  arena_message_3->mutable_unknown_fields()->DeleteSubrange(0, 2);
-  arena_message_3->mutable_unknown_fields()->DeleteByNumber(1002);
-  arena_message_3->mutable_unknown_fields()->DeleteByNumber(1003);
-  EXPECT_TRUE(arena_message_3->unknown_fields().empty());
-}
-
-TEST(ArenaTest, Swap) {
-  Arena arena1;
-  Arena arena2;
-  TestAllTypes* arena1_message;
-  TestAllTypes* arena2_message;
-
-  // Case 1: Swap(), no UFS on either message, both messages on different
-  // arenas. Arena pointers should remain the same after swap.
-  arena1_message = Arena::CreateMessage<TestAllTypes>(&arena1);
-  arena2_message = Arena::CreateMessage<TestAllTypes>(&arena2);
-  arena1_message->Swap(arena2_message);
-  EXPECT_EQ(&arena1, arena1_message->GetArena());
-  EXPECT_EQ(&arena2, arena2_message->GetArena());
-
-  // Case 2: Swap(), UFS on one message, both messages on different arenas.
-  arena1_message = Arena::CreateMessage<TestAllTypes>(&arena1);
-  arena2_message = Arena::CreateMessage<TestAllTypes>(&arena2);
-  arena1_message->mutable_unknown_fields()->AddVarint(1, 42);
-  arena1_message->Swap(arena2_message);
-  EXPECT_EQ(&arena1, arena1_message->GetArena());
-  EXPECT_EQ(&arena2, arena2_message->GetArena());
-  EXPECT_EQ(0, arena1_message->unknown_fields().field_count());
-  EXPECT_EQ(1, arena2_message->unknown_fields().field_count());
-  EXPECT_EQ(42, arena2_message->unknown_fields().field(0).varint());
-
-  // Case 3: Swap(), UFS on both messages, both messages on different arenas.
-  arena1_message = Arena::CreateMessage<TestAllTypes>(&arena1);
-  arena2_message = Arena::CreateMessage<TestAllTypes>(&arena2);
-  arena1_message->mutable_unknown_fields()->AddVarint(1, 42);
-  arena2_message->mutable_unknown_fields()->AddVarint(2, 84);
-  arena1_message->Swap(arena2_message);
-  EXPECT_EQ(&arena1, arena1_message->GetArena());
-  EXPECT_EQ(&arena2, arena2_message->GetArena());
-  EXPECT_EQ(1, arena1_message->unknown_fields().field_count());
-  EXPECT_EQ(1, arena2_message->unknown_fields().field_count());
-  EXPECT_EQ(84, arena1_message->unknown_fields().field(0).varint());
-  EXPECT_EQ(42, arena2_message->unknown_fields().field(0).varint());
-}
-
-TEST(ArenaTest, ReflectionSwapFields) {
-  Arena arena1;
-  Arena arena2;
-  TestAllTypes* arena1_message;
-  TestAllTypes* arena2_message;
-
-  // Case 1: messages on different arenas, only one message is set.
-  arena1_message = Arena::CreateMessage<TestAllTypes>(&arena1);
-  arena2_message = Arena::CreateMessage<TestAllTypes>(&arena2);
-  TestUtil::SetAllFields(arena1_message);
-  const Reflection* reflection = arena1_message->GetReflection();
-  std::vector<const FieldDescriptor*> fields;
-  reflection->ListFields(*arena1_message, &fields);
-  reflection->SwapFields(arena1_message, arena2_message, fields);
-  EXPECT_EQ(&arena1, arena1_message->GetArena());
-  EXPECT_EQ(&arena2, arena2_message->GetArena());
-  std::string output;
-  arena1_message->SerializeToString(&output);
-  EXPECT_EQ(0, output.size());
-  TestUtil::ExpectAllFieldsSet(*arena2_message);
-  reflection->SwapFields(arena1_message, arena2_message, fields);
-  arena2_message->SerializeToString(&output);
-  EXPECT_EQ(0, output.size());
-  TestUtil::ExpectAllFieldsSet(*arena1_message);
-
-  // Case 2: messages on different arenas, both messages are set.
-  arena1_message = Arena::CreateMessage<TestAllTypes>(&arena1);
-  arena2_message = Arena::CreateMessage<TestAllTypes>(&arena2);
-  TestUtil::SetAllFields(arena1_message);
-  TestUtil::SetAllFields(arena2_message);
-  reflection->SwapFields(arena1_message, arena2_message, fields);
-  EXPECT_EQ(&arena1, arena1_message->GetArena());
-  EXPECT_EQ(&arena2, arena2_message->GetArena());
-  TestUtil::ExpectAllFieldsSet(*arena1_message);
-  TestUtil::ExpectAllFieldsSet(*arena2_message);
-
-  // Case 3: messages on different arenas with different lifetimes.
-  arena1_message = Arena::CreateMessage<TestAllTypes>(&arena1);
-  {
-    Arena arena3;
-    TestAllTypes* arena3_message = Arena::CreateMessage<TestAllTypes>(&arena3);
-    TestUtil::SetAllFields(arena3_message);
-    reflection->SwapFields(arena1_message, arena3_message, fields);
-  }
-  TestUtil::ExpectAllFieldsSet(*arena1_message);
-
-  // Case 4: one message on arena, the other on heap.
-  arena1_message = Arena::CreateMessage<TestAllTypes>(&arena1);
-  TestAllTypes message;
-  TestUtil::SetAllFields(arena1_message);
-  reflection->SwapFields(arena1_message, &message, fields);
-  EXPECT_EQ(&arena1, arena1_message->GetArena());
-  EXPECT_EQ(nullptr, message.GetArena());
-  arena1_message->SerializeToString(&output);
-  EXPECT_EQ(0, output.size());
-  TestUtil::ExpectAllFieldsSet(message);
-}
-
-TEST(ArenaTest, SetAllocatedMessage) {
-  Arena arena;
-  TestAllTypes* arena_message = Arena::CreateMessage<TestAllTypes>(&arena);
-  TestAllTypes::NestedMessage* nested = new TestAllTypes::NestedMessage;
-  nested->set_bb(118);
-  arena_message->set_allocated_optional_nested_message(nested);
-  EXPECT_EQ(118, arena_message->optional_nested_message().bb());
-}
-
-TEST(ArenaTest, ReleaseMessage) {
-  Arena arena;
-  TestAllTypes* arena_message = Arena::CreateMessage<TestAllTypes>(&arena);
-  arena_message->mutable_optional_nested_message()->set_bb(118);
-  std::unique_ptr<TestAllTypes::NestedMessage> nested(
-      arena_message->release_optional_nested_message());
-  EXPECT_EQ(118, nested->bb());
-
-  TestAllTypes::NestedMessage* released_null =
-      arena_message->release_optional_nested_message();
-  EXPECT_EQ(NULL, released_null);
-}
-
-TEST(ArenaTest, SetAllocatedString) {
-  Arena arena;
-  TestAllTypes* arena_message = Arena::CreateMessage<TestAllTypes>(&arena);
-  std::string* allocated_str = new std::string("hello");
-  arena_message->set_allocated_optional_string(allocated_str);
-  EXPECT_EQ("hello", arena_message->optional_string());
-}
-
-TEST(ArenaTest, ReleaseString) {
-  Arena arena;
-  TestAllTypes* arena_message = Arena::CreateMessage<TestAllTypes>(&arena);
-  arena_message->set_optional_string("hello");
-  std::unique_ptr<std::string> released_str(
-      arena_message->release_optional_string());
-  EXPECT_EQ("hello", *released_str);
-
-  // Test default value.
-}
-
-
-TEST(ArenaTest, SwapBetweenArenasWithAllFieldsSet) {
-  Arena arena1;
-  TestAllTypes* arena1_message = Arena::CreateMessage<TestAllTypes>(&arena1);
-  {
-    Arena arena2;
-    TestAllTypes* arena2_message = Arena::CreateMessage<TestAllTypes>(&arena2);
-    TestUtil::SetAllFields(arena2_message);
-    arena2_message->Swap(arena1_message);
-    std::string output;
-    arena2_message->SerializeToString(&output);
-    EXPECT_EQ(0, output.size());
-  }
-  TestUtil::ExpectAllFieldsSet(*arena1_message);
-}
-
-TEST(ArenaTest, SwapBetweenArenaAndNonArenaWithAllFieldsSet) {
-  TestAllTypes non_arena_message;
-  TestUtil::SetAllFields(&non_arena_message);
-  {
-    Arena arena2;
-    TestAllTypes* arena2_message = Arena::CreateMessage<TestAllTypes>(&arena2);
-    TestUtil::SetAllFields(arena2_message);
-    arena2_message->Swap(&non_arena_message);
-    TestUtil::ExpectAllFieldsSet(*arena2_message);
-    TestUtil::ExpectAllFieldsSet(non_arena_message);
-  }
-}
-
-TEST(ArenaTest, UnsafeArenaSwap) {
-  Arena shared_arena;
-  TestAllTypes* message1 = Arena::CreateMessage<TestAllTypes>(&shared_arena);
-  TestAllTypes* message2 = Arena::CreateMessage<TestAllTypes>(&shared_arena);
-  TestUtil::SetAllFields(message1);
-  message1->UnsafeArenaSwap(message2);
-  TestUtil::ExpectAllFieldsSet(*message2);
-}
-
-TEST(ArenaTest, GetOwningArena) {
-  Arena arena;
-  auto* m1 = Arena::CreateMessage<TestAllTypes>(&arena);
-  EXPECT_EQ(Arena::InternalGetOwningArena(m1), &arena);
-  EXPECT_EQ(&arena, Arena::InternalGetOwningArena(
-                        m1->mutable_repeated_foreign_message()));
-  EXPECT_EQ(&arena,
-            Arena::InternalGetOwningArena(m1->mutable_repeated_int32()));
-}
-
-TEST(ArenaTest, SwapBetweenArenasUsingReflection) {
-  Arena arena1;
-  TestAllTypes* arena1_message = Arena::CreateMessage<TestAllTypes>(&arena1);
-  {
-    Arena arena2;
-    TestAllTypes* arena2_message = Arena::CreateMessage<TestAllTypes>(&arena2);
-    TestUtil::SetAllFields(arena2_message);
-    const Reflection* r = arena2_message->GetReflection();
-    r->Swap(arena1_message, arena2_message);
-    std::string output;
-    arena2_message->SerializeToString(&output);
-    EXPECT_EQ(0, output.size());
-  }
-  TestUtil::ExpectAllFieldsSet(*arena1_message);
-}
-
-TEST(ArenaTest, SwapBetweenArenaAndNonArenaUsingReflection) {
-  TestAllTypes non_arena_message;
-  TestUtil::SetAllFields(&non_arena_message);
-  {
-    Arena arena2;
-    TestAllTypes* arena2_message = Arena::CreateMessage<TestAllTypes>(&arena2);
-    TestUtil::SetAllFields(arena2_message);
-    const Reflection* r = arena2_message->GetReflection();
-    r->Swap(&non_arena_message, arena2_message);
-    TestUtil::ExpectAllFieldsSet(*arena2_message);
-    TestUtil::ExpectAllFieldsSet(non_arena_message);
-  }
-}
-
-TEST(ArenaTest, ReleaseFromArenaMessageMakesCopy) {
-  TestAllTypes::NestedMessage* nested_msg = NULL;
-  std::string* nested_string = NULL;
-  {
-    Arena arena;
-    TestAllTypes* arena_message = Arena::CreateMessage<TestAllTypes>(&arena);
-    arena_message->mutable_optional_nested_message()->set_bb(42);
-    *arena_message->mutable_optional_string() = "Hello";
-    nested_msg = arena_message->release_optional_nested_message();
-    nested_string = arena_message->release_optional_string();
-  }
-  EXPECT_EQ(42, nested_msg->bb());
-  EXPECT_EQ("Hello", *nested_string);
-  delete nested_msg;
-  delete nested_string;
-}
-
-#if PROTOBUF_RTTI
-TEST(ArenaTest, ReleaseFromArenaMessageUsingReflectionMakesCopy) {
-  TestAllTypes::NestedMessage* nested_msg = NULL;
-  // Note: no string: reflection API only supports releasing submessages.
-  {
-    Arena arena;
-    TestAllTypes* arena_message = Arena::CreateMessage<TestAllTypes>(&arena);
-    arena_message->mutable_optional_nested_message()->set_bb(42);
-    const Reflection* r = arena_message->GetReflection();
-    const FieldDescriptor* f = arena_message->GetDescriptor()->FindFieldByName(
-        "optional_nested_message");
-    nested_msg = static_cast<TestAllTypes::NestedMessage*>(
-        r->ReleaseMessage(arena_message, f));
-  }
-  EXPECT_EQ(42, nested_msg->bb());
-  delete nested_msg;
-}
-#endif  // PROTOBUF_RTTI
-
-TEST(ArenaTest, SetAllocatedAcrossArenas) {
-  Arena arena1;
-  TestAllTypes* arena1_message = Arena::CreateMessage<TestAllTypes>(&arena1);
-  TestAllTypes::NestedMessage* heap_submessage =
-      new TestAllTypes::NestedMessage();
-  heap_submessage->set_bb(42);
-  arena1_message->set_allocated_optional_nested_message(heap_submessage);
-  // Should keep same object and add to arena's Own()-list.
-  EXPECT_EQ(heap_submessage, arena1_message->mutable_optional_nested_message());
-  {
-    Arena arena2;
-    TestAllTypes::NestedMessage* arena2_submessage =
-        Arena::CreateMessage<TestAllTypes::NestedMessage>(&arena2);
-    arena2_submessage->set_bb(42);
-#ifdef PROTOBUF_HAS_DEATH_TEST
-    EXPECT_DEBUG_DEATH(arena1_message->set_allocated_optional_nested_message(
-                           arena2_submessage),
-                       "submessage_arena");
-#endif
-    EXPECT_NE(arena2_submessage,
-              arena1_message->mutable_optional_nested_message());
-  }
-
-  TestAllTypes::NestedMessage* arena1_submessage =
-      Arena::CreateMessage<TestAllTypes::NestedMessage>(&arena1);
-  arena1_submessage->set_bb(42);
-  TestAllTypes* heap_message = new TestAllTypes;
-#ifdef PROTOBUF_HAS_DEATH_TEST
-  EXPECT_DEBUG_DEATH(
-      heap_message->set_allocated_optional_nested_message(arena1_submessage),
-      "submessage_arena");
-#endif
-  EXPECT_NE(arena1_submessage, heap_message->mutable_optional_nested_message());
-  delete heap_message;
-}
-
-TEST(ArenaTest, UnsafeArenaSetAllocatedAcrossArenas) {
-  Arena arena1;
-  TestAllTypes* arena1_message = Arena::CreateMessage<TestAllTypes>(&arena1);
-  {
-    Arena arena2;
-    TestAllTypes::NestedMessage* arena2_submessage =
-        Arena::CreateMessage<TestAllTypes::NestedMessage>(&arena2);
-    arena2_submessage->set_bb(42);
-    arena1_message->unsafe_arena_set_allocated_optional_nested_message(
-        arena2_submessage);
-    EXPECT_EQ(arena2_submessage,
-              arena1_message->mutable_optional_nested_message());
-    EXPECT_EQ(arena2_submessage,
-              arena1_message->unsafe_arena_release_optional_nested_message());
-  }
-
-  TestAllTypes::NestedMessage* arena1_submessage =
-      Arena::CreateMessage<TestAllTypes::NestedMessage>(&arena1);
-  arena1_submessage->set_bb(42);
-  TestAllTypes* heap_message = new TestAllTypes;
-  heap_message->unsafe_arena_set_allocated_optional_nested_message(
-      arena1_submessage);
-  EXPECT_EQ(arena1_submessage, heap_message->mutable_optional_nested_message());
-  EXPECT_EQ(arena1_submessage,
-            heap_message->unsafe_arena_release_optional_nested_message());
-  delete heap_message;
-}
-
-TEST(ArenaTest, SetAllocatedAcrossArenasWithReflection) {
-  // Same as above, with reflection.
-  Arena arena1;
-  TestAllTypes* arena1_message = Arena::CreateMessage<TestAllTypes>(&arena1);
-  const Reflection* r = arena1_message->GetReflection();
-  const Descriptor* d = arena1_message->GetDescriptor();
-  const FieldDescriptor* msg_field =
-      d->FindFieldByName("optional_nested_message");
-  TestAllTypes::NestedMessage* heap_submessage =
-      new TestAllTypes::NestedMessage();
-  heap_submessage->set_bb(42);
-  r->SetAllocatedMessage(arena1_message, heap_submessage, msg_field);
-  // Should keep same object and add to arena's Own()-list.
-  EXPECT_EQ(heap_submessage, arena1_message->mutable_optional_nested_message());
-  {
-    Arena arena2;
-    TestAllTypes::NestedMessage* arena2_submessage =
-        Arena::CreateMessage<TestAllTypes::NestedMessage>(&arena2);
-    arena2_submessage->set_bb(42);
-#ifdef PROTOBUF_HAS_DEATH_TEST
-    EXPECT_DEBUG_DEATH(
-        r->SetAllocatedMessage(arena1_message, arena2_submessage, msg_field),
-        "GetOwningArena");
-#endif
-    EXPECT_NE(arena2_submessage,
-              arena1_message->mutable_optional_nested_message());
-  }
-
-  TestAllTypes::NestedMessage* arena1_submessage =
-      Arena::CreateMessage<TestAllTypes::NestedMessage>(&arena1);
-  arena1_submessage->set_bb(42);
-  TestAllTypes* heap_message = new TestAllTypes;
-#ifdef PROTOBUF_HAS_DEATH_TEST
-  EXPECT_DEBUG_DEATH(
-      r->SetAllocatedMessage(heap_message, arena1_submessage, msg_field),
-      "GetOwningArena");
-#endif
-  EXPECT_NE(arena1_submessage, heap_message->mutable_optional_nested_message());
-  delete heap_message;
-}
-
-TEST(ArenaTest, UnsafeArenaSetAllocatedAcrossArenasWithReflection) {
-  // Same as above, with reflection.
-  Arena arena1;
-  TestAllTypes* arena1_message = Arena::CreateMessage<TestAllTypes>(&arena1);
-  const Reflection* r = arena1_message->GetReflection();
-  const Descriptor* d = arena1_message->GetDescriptor();
-  const FieldDescriptor* msg_field =
-      d->FindFieldByName("optional_nested_message");
-  {
-    Arena arena2;
-    TestAllTypes::NestedMessage* arena2_submessage =
-        Arena::CreateMessage<TestAllTypes::NestedMessage>(&arena2);
-    arena2_submessage->set_bb(42);
-    r->UnsafeArenaSetAllocatedMessage(arena1_message, arena2_submessage,
-                                      msg_field);
-    EXPECT_EQ(arena2_submessage,
-              arena1_message->mutable_optional_nested_message());
-    EXPECT_EQ(arena2_submessage,
-              arena1_message->unsafe_arena_release_optional_nested_message());
-  }
-
-  TestAllTypes::NestedMessage* arena1_submessage =
-      Arena::CreateMessage<TestAllTypes::NestedMessage>(&arena1);
-  arena1_submessage->set_bb(42);
-  TestAllTypes* heap_message = new TestAllTypes;
-  r->UnsafeArenaSetAllocatedMessage(heap_message, arena1_submessage, msg_field);
-  EXPECT_EQ(arena1_submessage, heap_message->mutable_optional_nested_message());
-  EXPECT_EQ(arena1_submessage,
-            heap_message->unsafe_arena_release_optional_nested_message());
-  delete heap_message;
-}
-
-TEST(ArenaTest, AddAllocatedWithReflection) {
-  Arena arena1;
-  ArenaMessage* arena1_message = Arena::CreateMessage<ArenaMessage>(&arena1);
-  const Reflection* r = arena1_message->GetReflection();
-  const Descriptor* d = arena1_message->GetDescriptor();
-  // Message with cc_enable_arenas = true;
-  const FieldDescriptor* fd = d->FindFieldByName("repeated_nested_message");
-  r->AddMessage(arena1_message, fd);
-  r->AddMessage(arena1_message, fd);
-  r->AddMessage(arena1_message, fd);
-  EXPECT_EQ(3, r->FieldSize(*arena1_message, fd));
-}
-
-TEST(ArenaTest, RepeatedPtrFieldAddClearedTest) {
-#ifndef PROTOBUF_FUTURE_BREAKING_CHANGES
-  {
-    RepeatedPtrField<TestAllTypes> repeated_field;
-    EXPECT_TRUE(repeated_field.empty());
-    EXPECT_EQ(0, repeated_field.size());
-    // Ownership is passed to repeated_field.
-    TestAllTypes* cleared = new TestAllTypes();
-    repeated_field.AddCleared(cleared);
-    EXPECT_TRUE(repeated_field.empty());
-    EXPECT_EQ(0, repeated_field.size());
-  }
-#endif  // !PROTOBUF_FUTURE_BREAKING_CHANGES
-  {
-    RepeatedPtrField<TestAllTypes> repeated_field;
-    EXPECT_TRUE(repeated_field.empty());
-    EXPECT_EQ(0, repeated_field.size());
-    // Ownership is passed to repeated_field.
-    TestAllTypes* cleared = new TestAllTypes();
-    repeated_field.AddAllocated(cleared);
-    EXPECT_FALSE(repeated_field.empty());
-    EXPECT_EQ(1, repeated_field.size());
-  }
-}
-
-TEST(ArenaTest, AddAllocatedToRepeatedField) {
-  // Heap->arena case.
-  Arena arena1;
-  TestAllTypes* arena1_message = Arena::CreateMessage<TestAllTypes>(&arena1);
-  for (int i = 0; i < 10; i++) {
-    TestAllTypes::NestedMessage* heap_submessage =
-        new TestAllTypes::NestedMessage();
-    heap_submessage->set_bb(42);
-    arena1_message->mutable_repeated_nested_message()->AddAllocated(
-        heap_submessage);
-    // Should not copy object -- will use arena_->Own().
-    EXPECT_EQ(heap_submessage, &arena1_message->repeated_nested_message(i));
-    EXPECT_EQ(42, arena1_message->repeated_nested_message(i).bb());
-  }
-
-  // Arena1->Arena2 case.
-  arena1_message->Clear();
-  for (int i = 0; i < 10; i++) {
-    Arena arena2;
-    TestAllTypes::NestedMessage* arena2_submessage =
-        Arena::CreateMessage<TestAllTypes::NestedMessage>(&arena2);
-    arena2_submessage->set_bb(42);
-#ifdef PROTOBUF_HAS_DEATH_TEST
-    EXPECT_DEBUG_DEATH(
-        arena1_message->mutable_repeated_nested_message()->AddAllocated(
-            arena2_submessage),
-        "value_arena");
-#endif
-    // Should not receive object.
-    EXPECT_TRUE(arena1_message->repeated_nested_message().empty());
-  }
-
-  // Arena->heap case.
-  TestAllTypes* heap_message = new TestAllTypes;
-  for (int i = 0; i < 10; i++) {
-    Arena arena2;
-    TestAllTypes::NestedMessage* arena2_submessage =
-        Arena::CreateMessage<TestAllTypes::NestedMessage>(&arena2);
-    arena2_submessage->set_bb(42);
-#ifdef PROTOBUF_HAS_DEATH_TEST
-    EXPECT_DEBUG_DEATH(
-        heap_message->mutable_repeated_nested_message()->AddAllocated(
-            arena2_submessage),
-        "value_arena");
-#endif
-    // Should not receive object.
-    EXPECT_TRUE(heap_message->repeated_nested_message().empty());
-  }
-  delete heap_message;
-
-  // Heap->arena case for strings (which are not arena-allocated).
-  arena1_message->Clear();
-  for (int i = 0; i < 10; i++) {
-    std::string* s = new std::string("Test");
-    arena1_message->mutable_repeated_string()->AddAllocated(s);
-    // Should not copy.
-    EXPECT_EQ(s, &arena1_message->repeated_string(i));
-    EXPECT_EQ("Test", arena1_message->repeated_string(i));
-  }
-}
-
-TEST(ArenaTest, UnsafeArenaAddAllocatedToRepeatedField) {
-  // Heap->arena case.
-  Arena arena1;
-  TestAllTypes* arena1_message = Arena::CreateMessage<TestAllTypes>(&arena1);
-  {
-    auto* heap_submessage = new TestAllTypes::NestedMessage;
-    arena1_message->mutable_repeated_nested_message()->UnsafeArenaAddAllocated(
-        heap_submessage);
-    // Should not copy object.
-    EXPECT_EQ(heap_submessage, &arena1_message->repeated_nested_message(0));
-    EXPECT_EQ(heap_submessage, arena1_message->mutable_repeated_nested_message()
-                                   ->UnsafeArenaReleaseLast());
-    delete heap_submessage;
-  }
-
-  // Arena1->Arena2 case.
-  arena1_message->Clear();
-  {
-    Arena arena2;
-    TestAllTypes::NestedMessage* arena2_submessage =
-        Arena::CreateMessage<TestAllTypes::NestedMessage>(&arena2);
-    arena2_submessage->set_bb(42);
-    arena1_message->mutable_repeated_nested_message()->UnsafeArenaAddAllocated(
-        arena2_submessage);
-    // Should own object.
-    EXPECT_EQ(arena2_submessage, &arena1_message->repeated_nested_message(0));
-    EXPECT_EQ(arena2_submessage,
-              arena1_message->mutable_repeated_nested_message()
-                  ->UnsafeArenaReleaseLast());
-  }
-
-  // Arena->heap case.
-  TestAllTypes* heap_message = new TestAllTypes;
-  {
-    Arena arena2;
-    TestAllTypes::NestedMessage* arena2_submessage =
-        Arena::CreateMessage<TestAllTypes::NestedMessage>(&arena2);
-    arena2_submessage->set_bb(42);
-    heap_message->mutable_repeated_nested_message()->UnsafeArenaAddAllocated(
-        arena2_submessage);
-    // Should own object.
-    EXPECT_EQ(arena2_submessage, &heap_message->repeated_nested_message(0));
-    EXPECT_EQ(arena2_submessage, heap_message->mutable_repeated_nested_message()
-                                     ->UnsafeArenaReleaseLast());
-  }
-  delete heap_message;
-
-  // Heap->arena case for strings (which are not arena-allocated).
-  arena1_message->Clear();
-  {
-    std::string* s = new std::string("Test");
-    arena1_message->mutable_repeated_string()->UnsafeArenaAddAllocated(s);
-    // Should not copy.
-    EXPECT_EQ(s, &arena1_message->repeated_string(0));
-    EXPECT_EQ("Test", arena1_message->repeated_string(0));
-    delete arena1_message->mutable_repeated_string()->UnsafeArenaReleaseLast();
-  }
-}
-
-TEST(ArenaTest, AddAllocatedToRepeatedFieldViaReflection) {
-  // Heap->arena case.
-  Arena arena1;
-  TestAllTypes* arena1_message = Arena::CreateMessage<TestAllTypes>(&arena1);
-  const Reflection* r = arena1_message->GetReflection();
-  const Descriptor* d = arena1_message->GetDescriptor();
-  const FieldDescriptor* fd = d->FindFieldByName("repeated_nested_message");
-  for (int i = 0; i < 10; i++) {
-    TestAllTypes::NestedMessage* heap_submessage =
-        new TestAllTypes::NestedMessage;
-    heap_submessage->set_bb(42);
-    r->AddAllocatedMessage(arena1_message, fd, heap_submessage);
-    // Should not copy object -- will use arena_->Own().
-    EXPECT_EQ(heap_submessage, &arena1_message->repeated_nested_message(i));
-    EXPECT_EQ(42, arena1_message->repeated_nested_message(i).bb());
-  }
-
-  // Arena1->Arena2 case.
-  arena1_message->Clear();
-  for (int i = 0; i < 10; i++) {
-    Arena arena2;
-    TestAllTypes::NestedMessage* arena2_submessage =
-        Arena::CreateMessage<TestAllTypes::NestedMessage>(&arena2);
-    arena2_submessage->set_bb(42);
-#ifdef PROTOBUF_HAS_DEATH_TEST
-    EXPECT_DEBUG_DEATH(
-        r->AddAllocatedMessage(arena1_message, fd, arena2_submessage),
-        "value_arena");
-#endif
-    // Should not receive object.
-    EXPECT_TRUE(arena1_message->repeated_nested_message().empty());
-  }
-
-  // Arena->heap case.
-  TestAllTypes* heap_message = new TestAllTypes;
-  for (int i = 0; i < 10; i++) {
-    Arena arena2;
-    TestAllTypes::NestedMessage* arena2_submessage =
-        Arena::CreateMessage<TestAllTypes::NestedMessage>(&arena2);
-    arena2_submessage->set_bb(42);
-#ifdef PROTOBUF_HAS_DEATH_TEST
-    EXPECT_DEBUG_DEATH(
-        r->AddAllocatedMessage(heap_message, fd, arena2_submessage),
-        "value_arena");
-#endif
-    // Should not receive object.
-    EXPECT_TRUE(heap_message->repeated_nested_message().empty());
-  }
-  delete heap_message;
-}
-
-TEST(ArenaTest, ReleaseLastRepeatedField) {
-  // Release from arena-allocated repeated field and ensure that returned object
-  // is heap-allocated.
-  Arena arena;
-  TestAllTypes* arena_message = Arena::CreateMessage<TestAllTypes>(&arena);
-  for (int i = 0; i < 10; i++) {
-    TestAllTypes::NestedMessage* nested =
-        Arena::CreateMessage<TestAllTypes::NestedMessage>(&arena);
-    nested->set_bb(42);
-    arena_message->mutable_repeated_nested_message()->AddAllocated(nested);
-  }
-
-  for (int i = 0; i < 10; i++) {
-    const TestAllTypes::NestedMessage* orig_submessage =
-        &arena_message->repeated_nested_message(10 - 1 - i);  // last element
-    TestAllTypes::NestedMessage* released =
-        arena_message->mutable_repeated_nested_message()->ReleaseLast();
-    EXPECT_NE(released, orig_submessage);
-    EXPECT_EQ(42, released->bb());
-    delete released;
-  }
-
-  // Test UnsafeArenaReleaseLast().
-  for (int i = 0; i < 10; i++) {
-    TestAllTypes::NestedMessage* nested =
-        Arena::CreateMessage<TestAllTypes::NestedMessage>(&arena);
-    nested->set_bb(42);
-    arena_message->mutable_repeated_nested_message()->AddAllocated(nested);
-  }
-
-  for (int i = 0; i < 10; i++) {
-    const TestAllTypes::NestedMessage* orig_submessage =
-        &arena_message->repeated_nested_message(10 - 1 - i);  // last element
-    TestAllTypes::NestedMessage* released =
-        arena_message->mutable_repeated_nested_message()
-            ->UnsafeArenaReleaseLast();
-    EXPECT_EQ(released, orig_submessage);
-    EXPECT_EQ(42, released->bb());
-    // no delete -- |released| is on the arena.
-  }
-
-  // Test string case as well. ReleaseLast() in this case must copy the
-  // string, even though it was originally heap-allocated and its pointer
-  // was simply appended to the repeated field's internal vector, because the
-  // string was placed on the arena's destructor list and cannot be removed
-  // from that list (so the arena permanently owns the original instance).
-  arena_message->Clear();
-  for (int i = 0; i < 10; i++) {
-    std::string* s = new std::string("Test");
-    arena_message->mutable_repeated_string()->AddAllocated(s);
-  }
-  for (int i = 0; i < 10; i++) {
-    const std::string* orig_element =
-        &arena_message->repeated_string(10 - 1 - i);
-    std::string* released =
-        arena_message->mutable_repeated_string()->ReleaseLast();
-    EXPECT_NE(released, orig_element);
-    EXPECT_EQ("Test", *released);
-    delete released;
-  }
-}
-
-TEST(ArenaTest, UnsafeArenaAddAllocated) {
-  Arena arena;
-  TestAllTypes* message = Arena::CreateMessage<TestAllTypes>(&arena);
-  for (int i = 0; i < 10; i++) {
-    std::string* arena_string = Arena::Create<std::string>(&arena);
-    message->mutable_repeated_string()->UnsafeArenaAddAllocated(arena_string);
-    EXPECT_EQ(arena_string, message->mutable_repeated_string(i));
-  }
-}
-
-TEST(ArenaTest, OneofMerge) {
-  Arena arena;
-  TestAllTypes* message0 = Arena::CreateMessage<TestAllTypes>(&arena);
-  TestAllTypes* message1 = Arena::CreateMessage<TestAllTypes>(&arena);
-
-  message0->set_oneof_string("x");
-  ASSERT_TRUE(message0->has_oneof_string());
-  message1->set_oneof_string("y");
-  ASSERT_TRUE(message1->has_oneof_string());
-  EXPECT_EQ("x", message0->oneof_string());
-  EXPECT_EQ("y", message1->oneof_string());
-  message0->MergeFrom(*message1);
-  EXPECT_EQ("y", message0->oneof_string());
-  EXPECT_EQ("y", message1->oneof_string());
-}
-
-TEST(ArenaTest, ArenaOneofReflection) {
-  Arena arena;
-  TestAllTypes* message = Arena::CreateMessage<TestAllTypes>(&arena);
-  const Descriptor* desc = message->GetDescriptor();
-  const Reflection* refl = message->GetReflection();
-
-  const FieldDescriptor* string_field = desc->FindFieldByName("oneof_string");
-  const FieldDescriptor* msg_field =
-      desc->FindFieldByName("oneof_nested_message");
-  const OneofDescriptor* oneof = desc->FindOneofByName("oneof_field");
-
-  refl->SetString(message, string_field, "Test value");
-  EXPECT_TRUE(refl->HasOneof(*message, oneof));
-  refl->ClearOneof(message, oneof);
-  EXPECT_FALSE(refl->HasOneof(*message, oneof));
-
-  Message* submsg = refl->MutableMessage(message, msg_field);
-  EXPECT_TRUE(refl->HasOneof(*message, oneof));
-  refl->ClearOneof(message, oneof);
-  EXPECT_FALSE(refl->HasOneof(*message, oneof));
-  refl->MutableMessage(message, msg_field);
-  EXPECT_TRUE(refl->HasOneof(*message, oneof));
-  submsg = refl->ReleaseMessage(message, msg_field);
-  EXPECT_FALSE(refl->HasOneof(*message, oneof));
-  EXPECT_TRUE(submsg->GetArena() == NULL);
-  delete submsg;
-}
-
-void TestSwapRepeatedField(Arena* arena1, Arena* arena2) {
-  // Test "safe" (copying) semantics for direct Swap() on RepeatedPtrField
-  // between arenas.
-  RepeatedPtrField<TestAllTypes> field1(arena1);
-  RepeatedPtrField<TestAllTypes> field2(arena2);
-  for (int i = 0; i < 10; i++) {
-    TestAllTypes* t = Arena::CreateMessage<TestAllTypes>(arena1);
-    t->set_optional_string("field1");
-    t->set_optional_int32(i);
-    if (arena1 != NULL) {
-      field1.UnsafeArenaAddAllocated(t);
-    } else {
-      field1.AddAllocated(t);
-    }
-  }
-  for (int i = 0; i < 5; i++) {
-    TestAllTypes* t = Arena::CreateMessage<TestAllTypes>(arena2);
-    t->set_optional_string("field2");
-    t->set_optional_int32(i);
-    if (arena2 != NULL) {
-      field2.UnsafeArenaAddAllocated(t);
-    } else {
-      field2.AddAllocated(t);
-    }
-  }
-  field1.Swap(&field2);
-  EXPECT_EQ(5, field1.size());
-  EXPECT_EQ(10, field2.size());
-  EXPECT_TRUE(std::string("field1") == field2.Get(0).optional_string());
-  EXPECT_TRUE(std::string("field2") == field1.Get(0).optional_string());
-  // Ensure that fields retained their original order:
-  for (int i = 0; i < field1.size(); i++) {
-    EXPECT_EQ(i, field1.Get(i).optional_int32());
-  }
-  for (int i = 0; i < field2.size(); i++) {
-    EXPECT_EQ(i, field2.Get(i).optional_int32());
-  }
-}
-
-TEST(ArenaTest, SwapRepeatedField) {
-  Arena arena;
-  TestSwapRepeatedField(&arena, &arena);
-}
-
-TEST(ArenaTest, SwapRepeatedFieldWithDifferentArenas) {
-  Arena arena1;
-  Arena arena2;
-  TestSwapRepeatedField(&arena1, &arena2);
-}
-
-TEST(ArenaTest, SwapRepeatedFieldWithNoArenaOnRightHandSide) {
-  Arena arena;
-  TestSwapRepeatedField(&arena, NULL);
-}
-
-TEST(ArenaTest, SwapRepeatedFieldWithNoArenaOnLeftHandSide) {
-  Arena arena;
-  TestSwapRepeatedField(NULL, &arena);
-}
-
-TEST(ArenaTest, ExtensionsOnArena) {
-  Arena arena;
-  // Ensure no leaks.
-  TestAllExtensions* message_ext =
-      Arena::CreateMessage<TestAllExtensions>(&arena);
-  message_ext->SetExtension(protobuf_unittest::optional_int32_extension, 42);
-  message_ext->SetExtension(protobuf_unittest::optional_string_extension,
-                            std::string("test"));
-  message_ext
-      ->MutableExtension(protobuf_unittest::optional_nested_message_extension)
-      ->set_bb(42);
-}
-
-TEST(ArenaTest, RepeatedFieldOnArena) {
-  // Preallocate an initial arena block to avoid mallocs during hooked region.
-  std::vector<char> arena_block(1024 * 1024);
-  Arena arena(arena_block.data(), arena_block.size());
-
-  {
-    internal::NoHeapChecker no_heap;
-
-    // Fill some repeated fields on the arena to test for leaks. Also verify no
-    // memory allocations.
-    RepeatedField<int32_t> repeated_int32(&arena);
-    RepeatedPtrField<TestAllTypes> repeated_message(&arena);
-    for (int i = 0; i < 100; i++) {
-      repeated_int32.Add(42);
-      repeated_message.Add()->set_optional_int32(42);
-      EXPECT_EQ(&arena, repeated_message.Get(0).GetArena());
-      const TestAllTypes* msg_in_repeated_field = &repeated_message.Get(0);
-      TestAllTypes* msg = repeated_message.UnsafeArenaReleaseLast();
-      EXPECT_EQ(msg_in_repeated_field, msg);
-    }
-
-    // UnsafeArenaExtractSubrange (i) should not leak and (ii) should return
-    // on-arena pointers.
-    for (int i = 0; i < 10; i++) {
-      repeated_message.Add()->set_optional_int32(42);
-    }
-    TestAllTypes* extracted_messages[5];
-    repeated_message.UnsafeArenaExtractSubrange(0, 5, extracted_messages);
-    EXPECT_EQ(&arena, repeated_message.Get(0).GetArena());
-    EXPECT_EQ(5, repeated_message.size());
-  }
-
-  // Now, outside the scope of the NoHeapChecker, test ExtractSubrange's copying
-  // semantics.
-  {
-    RepeatedPtrField<TestAllTypes> repeated_message(&arena);
-    for (int i = 0; i < 100; i++) {
-      repeated_message.Add()->set_optional_int32(42);
-    }
-
-    TestAllTypes* extracted_messages[5];
-    // ExtractSubrange should copy to the heap.
-    repeated_message.ExtractSubrange(0, 5, extracted_messages);
-    EXPECT_EQ(NULL, extracted_messages[0]->GetArena());
-    // We need to free the heap-allocated messages to prevent a leak.
-    for (int i = 0; i < 5; i++) {
-      delete extracted_messages[i];
-      extracted_messages[i] = NULL;
-    }
-  }
-
-  // Now check that we can create RepeatedFields/RepeatedPtrFields themselves on
-  // the arena. They have the necessary type traits so that they can behave like
-  // messages in this way. This is useful for higher-level generic templated
-  // code that may allocate messages or repeated fields of messages on an arena.
-  {
-    RepeatedPtrField<TestAllTypes>* repeated_ptr_on_arena =
-        Arena::CreateMessage<RepeatedPtrField<TestAllTypes> >(&arena);
-    for (int i = 0; i < 10; i++) {
-      // Add some elements and let the leak-checker ensure that everything is
-      // freed.
-      repeated_ptr_on_arena->Add();
-    }
-
-    RepeatedField<int>* repeated_int_on_arena =
-        Arena::CreateMessage<RepeatedField<int> >(&arena);
-    for (int i = 0; i < 100; i++) {
-      repeated_int_on_arena->Add(i);
-    }
-
-  }
-
-  arena.Reset();
-}
-
-
-#if PROTOBUF_RTTI
-TEST(ArenaTest, MutableMessageReflection) {
-  Arena arena;
-  TestAllTypes* message = Arena::CreateMessage<TestAllTypes>(&arena);
-  const Reflection* r = message->GetReflection();
-  const Descriptor* d = message->GetDescriptor();
-  const FieldDescriptor* field = d->FindFieldByName("optional_nested_message");
-  TestAllTypes::NestedMessage* submessage =
-      static_cast<TestAllTypes::NestedMessage*>(
-          r->MutableMessage(message, field));
-  TestAllTypes::NestedMessage* submessage_expected =
-      message->mutable_optional_nested_message();
-
-  EXPECT_EQ(submessage_expected, submessage);
-  EXPECT_EQ(&arena, submessage->GetArena());
-
-  const FieldDescriptor* oneof_field =
-      d->FindFieldByName("oneof_nested_message");
-  submessage = static_cast<TestAllTypes::NestedMessage*>(
-      r->MutableMessage(message, oneof_field));
-  submessage_expected = message->mutable_oneof_nested_message();
-
-  EXPECT_EQ(submessage_expected, submessage);
-  EXPECT_EQ(&arena, submessage->GetArena());
-}
-#endif  // PROTOBUF_RTTI
-
-
-void FillArenaAwareFields(TestAllTypes* message) {
-  std::string test_string = "hello world";
-  message->set_optional_int32(42);
-  message->set_optional_string(test_string);
-  message->set_optional_bytes(test_string);
-  message->mutable_optional_nested_message()->set_bb(42);
-
-  message->set_oneof_uint32(42);
-  message->mutable_oneof_nested_message()->set_bb(42);
-  message->set_oneof_string(test_string);
-  message->set_oneof_bytes(test_string);
-
-  message->add_repeated_int32(42);
-  // No repeated string: not yet arena-aware.
-  message->add_repeated_nested_message()->set_bb(42);
-  message->mutable_optional_lazy_message()->set_bb(42);
-}
-
-// Test: no allocations occur on heap while touching all supported field types.
-TEST(ArenaTest, NoHeapAllocationsTest) {
-  // Allocate a large initial block to avoid mallocs during hooked test.
-  std::vector<char> arena_block(128 * 1024);
-  ArenaOptions options;
-  options.initial_block = &arena_block[0];
-  options.initial_block_size = arena_block.size();
-  Arena arena(options);
-
-  {
-
-    TestAllTypes* message = Arena::CreateMessage<TestAllTypes>(&arena);
-    FillArenaAwareFields(message);
-  }
-
-  arena.Reset();
-}
-
-TEST(ArenaTest, ParseCorruptedString) {
-  TestAllTypes message;
-  TestUtil::SetAllFields(&message);
-  TestParseCorruptedString<TestAllTypes, true>(message);
-  TestParseCorruptedString<TestAllTypes, false>(message);
-}
-
-#if PROTOBUF_RTTI
-// Test construction on an arena via generic MessageLite interface. We should be
-// able to successfully deserialize on the arena without incurring heap
-// allocations, i.e., everything should still be arena-allocation-aware.
-TEST(ArenaTest, MessageLiteOnArena) {
-  std::vector<char> arena_block(128 * 1024);
-  ArenaOptions options;
-  options.initial_block = &arena_block[0];
-  options.initial_block_size = arena_block.size();
-  Arena arena(options);
-  const MessageLite* prototype = &TestAllTypes::default_instance();
-
-  TestAllTypes initial_message;
-  FillArenaAwareFields(&initial_message);
-  std::string serialized;
-  initial_message.SerializeToString(&serialized);
-
-  {
-
-    MessageLite* generic_message = prototype->New(&arena);
-    EXPECT_TRUE(generic_message != NULL);
-    EXPECT_EQ(&arena, generic_message->GetArena());
-    EXPECT_TRUE(generic_message->ParseFromString(serialized));
-    TestAllTypes* deserialized = static_cast<TestAllTypes*>(generic_message);
-    EXPECT_EQ(42, deserialized->optional_int32());
-  }
-
-  arena.Reset();
-}
-#endif  // PROTOBUF_RTTI
-
-// RepeatedField should support non-POD types, and invoke constructors and
-// destructors appropriately, because it's used this way by lots of other code
-// (even if this was not its original intent).
-TEST(ArenaTest, RepeatedFieldWithNonPODType) {
-  {
-    RepeatedField<std::string> field_on_heap;
-    for (int i = 0; i < 100; i++) {
-      *field_on_heap.Add() = "test string long enough to exceed inline buffer";
-    }
-  }
-  {
-    Arena arena;
-    RepeatedField<std::string> field_on_arena(&arena);
-    for (int i = 0; i < 100; i++) {
-      *field_on_arena.Add() = "test string long enough to exceed inline buffer";
-    }
-  }
-}
-
-// Align n to next multiple of 8
-uint64_t Align8(uint64_t n) { return (n + 7) & -8; }
-
-TEST(ArenaTest, SpaceAllocated_and_Used) {
-  Arena arena_1;
-  EXPECT_EQ(0, arena_1.SpaceAllocated());
-  EXPECT_EQ(0, arena_1.SpaceUsed());
-  EXPECT_EQ(0, arena_1.Reset());
-  Arena::CreateArray<char>(&arena_1, 320);
-  // Arena will allocate slightly more than 320 for the block headers.
-  EXPECT_LE(320, arena_1.SpaceAllocated());
-  EXPECT_EQ(Align8(320), arena_1.SpaceUsed());
-  EXPECT_LE(320, arena_1.Reset());
-
-  // Test with initial block.
-  std::vector<char> arena_block(1024);
-  ArenaOptions options;
-  options.start_block_size = 256;
-  options.max_block_size = 8192;
-  options.initial_block = &arena_block[0];
-  options.initial_block_size = arena_block.size();
-  Arena arena_2(options);
-  EXPECT_EQ(1024, arena_2.SpaceAllocated());
-  EXPECT_EQ(0, arena_2.SpaceUsed());
-  EXPECT_EQ(1024, arena_2.Reset());
-  Arena::CreateArray<char>(&arena_2, 55);
-  EXPECT_EQ(1024, arena_2.SpaceAllocated());
-  EXPECT_EQ(Align8(55), arena_2.SpaceUsed());
-  EXPECT_EQ(1024, arena_2.Reset());
-}
-
-TEST(ArenaTest, BlockSizeDoubling) {
-  Arena arena;
-  EXPECT_EQ(0, arena.SpaceUsed());
-  EXPECT_EQ(0, arena.SpaceAllocated());
-
-  // Allocate something to get initial block size.
-  Arena::CreateArray<char>(&arena, 1);
-  auto first_block_size = arena.SpaceAllocated();
-
-  // Keep allocating until space used increases.
-  while (arena.SpaceAllocated() == first_block_size) {
-    Arena::CreateArray<char>(&arena, 1);
-  }
-  ASSERT_GT(arena.SpaceAllocated(), first_block_size);
-  auto second_block_size = (arena.SpaceAllocated() - first_block_size);
-
-  EXPECT_EQ(second_block_size, 2*first_block_size);
-}
-
-TEST(ArenaTest, Alignment) {
-  Arena arena;
-  for (int i = 0; i < 200; i++) {
-    void* p = Arena::CreateArray<char>(&arena, i);
-    GOOGLE_CHECK_EQ(reinterpret_cast<uintptr_t>(p) % 8, 0) << i << ": " << p;
-  }
-}
-
-TEST(ArenaTest, BlockSizeSmallerThanAllocation) {
-  for (size_t i = 0; i <= 8; ++i) {
-    ArenaOptions opt;
-    opt.start_block_size = opt.max_block_size = i;
-    Arena arena(opt);
-
-    *Arena::Create<int64_t>(&arena) = 42;
-    EXPECT_GE(arena.SpaceAllocated(), 8);
-    EXPECT_EQ(8, arena.SpaceUsed());
-
-    *Arena::Create<int64_t>(&arena) = 42;
-    EXPECT_GE(arena.SpaceAllocated(), 16);
-    EXPECT_EQ(16, arena.SpaceUsed());
-  }
-}
-
-TEST(ArenaTest, GetArenaShouldReturnTheArenaForArenaAllocatedMessages) {
-  Arena arena;
-  ArenaMessage* message = Arena::CreateMessage<ArenaMessage>(&arena);
-  const ArenaMessage* const_pointer_to_message = message;
-  EXPECT_EQ(&arena, Arena::GetArena(message));
-  EXPECT_EQ(&arena, Arena::GetArena(const_pointer_to_message));
-
-  // Test that the Message* / MessageLite* specialization SFINAE works.
-  const Message* const_pointer_to_message_type = message;
-  EXPECT_EQ(&arena, Arena::GetArena(const_pointer_to_message_type));
-  const MessageLite* const_pointer_to_message_lite_type = message;
-  EXPECT_EQ(&arena, Arena::GetArena(const_pointer_to_message_lite_type));
-}
-
-TEST(ArenaTest, GetArenaShouldReturnNullForNonArenaAllocatedMessages) {
-  ArenaMessage message;
-  const ArenaMessage* const_pointer_to_message = &message;
-  EXPECT_EQ(NULL, Arena::GetArena(&message));
-  EXPECT_EQ(NULL, Arena::GetArena(const_pointer_to_message));
-}
-
-TEST(ArenaTest, GetArenaShouldReturnNullForNonArenaCompatibleTypes) {
-  // Test that GetArena returns nullptr for types that have a GetArena method
-  // that doesn't return Arena*.
-  struct {
-    int GetArena() const { return 0; }
-  } has_get_arena_method_wrong_return_type;
-  EXPECT_EQ(nullptr, Arena::GetArena(&has_get_arena_method_wrong_return_type));
-
-  // Test that GetArena returns nullptr for types that have a GetArena alias.
-  struct {
-    using GetArena = Arena*;
-    GetArena unused;
-  } has_get_arena_alias;
-  EXPECT_EQ(nullptr, Arena::GetArena(&has_get_arena_alias));
-
-  // Test that GetArena returns nullptr for types that have a GetArena data
-  // member.
-  struct {
-    Arena GetArena;
-  } has_get_arena_data_member;
-  EXPECT_EQ(nullptr, Arena::GetArena(&has_get_arena_data_member));
-}
-
-TEST(ArenaTest, AddCleanup) {
-  Arena arena;
-  for (int i = 0; i < 100; i++) {
-    arena.Own(new int);
-  }
-}
-
-TEST(ArenaTest, SpaceReuseForArraysSizeChecks) {
-  // Limit to 1<<20 to avoid using too much memory on the test.
-  for (int i = 0; i < 20; ++i) {
-    SCOPED_TRACE(i);
-    Arena arena;
-    std::vector<void*> pointers;
-
-    const size_t size = 16 << i;
-
-    for (int j = 0; j < 10; ++j) {
-      pointers.push_back(Arena::CreateArray<char>(&arena, size));
-    }
-
-    for (void* p : pointers) {
-      internal::ArenaTestPeer::ReturnArrayMemory(&arena, p, size);
-    }
-
-    std::vector<void*> second_pointers;
-    for (int j = 9; j != 0; --j) {
-      second_pointers.push_back(Arena::CreateArray<char>(&arena, size));
-    }
-
-    // The arena will give us back the pointers we returned, except the first
-    // one. That one becomes part of the freelist data structure.
-    ASSERT_THAT(second_pointers,
-                testing::UnorderedElementsAreArray(
-                    std::vector<void*>(pointers.begin() + 1, pointers.end())));
-  }
-}
-
-TEST(ArenaTest, SpaceReusePoisonsAndUnpoisonsMemory) {
-#ifdef ADDRESS_SANITIZER
-  char buf[1024]{};
-  {
-    Arena arena(buf, sizeof(buf));
-    std::vector<void*> pointers;
-    for (int i = 0; i < 100; ++i) {
-      pointers.push_back(Arena::CreateArray<char>(&arena, 16));
-    }
-    for (void* p : pointers) {
-      internal::ArenaTestPeer::ReturnArrayMemory(&arena, p, 16);
-      // The first one is not poisoned because it becomes the freelist.
-      if (p != pointers[0]) EXPECT_TRUE(__asan_address_is_poisoned(p));
-    }
-
-    bool found_poison = false;
-    for (char& c : buf) {
-      if (__asan_address_is_poisoned(&c)) {
-        found_poison = true;
-        break;
-      }
-    }
-    EXPECT_TRUE(found_poison);
-  }
-
-  // Should not be poisoned after destruction.
-  for (char& c : buf) {
-    ASSERT_FALSE(__asan_address_is_poisoned(&c));
-  }
-
-#else   // ADDRESS_SANITIZER
-  GTEST_SKIP();
-#endif  // ADDRESS_SANITIZER
-}
-
-namespace {
-uint32_t hooks_num_init = 0;
-uint32_t hooks_num_allocations = 0;
-uint32_t hooks_num_reset = 0;
-uint32_t hooks_num_destruct = 0;
-
-void ClearHookCounts() {
-  hooks_num_init = 0;
-  hooks_num_allocations = 0;
-  hooks_num_reset = 0;
-  hooks_num_destruct = 0;
-}
-}  // namespace
-
-// A helper utility class that handles arena callbacks.
-class ArenaOptionsTestFriend final : public internal::ArenaMetricsCollector {
- public:
-  static internal::ArenaMetricsCollector* NewWithAllocs() {
-    return new ArenaOptionsTestFriend(true);
-  }
-
-  static internal::ArenaMetricsCollector* NewWithoutAllocs() {
-    return new ArenaOptionsTestFriend(false);
-  }
-
-  static void Enable(ArenaOptions* options) {
-    ClearHookCounts();
-    options->make_metrics_collector = &ArenaOptionsTestFriend::NewWithAllocs;
-  }
-
-  static void EnableWithoutAllocs(ArenaOptions* options) {
-    ClearHookCounts();
-    options->make_metrics_collector = &ArenaOptionsTestFriend::NewWithoutAllocs;
-  }
-
-  explicit ArenaOptionsTestFriend(bool record_allocs)
-      : ArenaMetricsCollector(record_allocs) {
-    ++hooks_num_init;
-  }
-  void OnDestroy(uint64_t space_allocated) override {
-    ++hooks_num_destruct;
-    delete this;
-  }
-  void OnReset(uint64_t space_allocated) override { ++hooks_num_reset; }
-  void OnAlloc(const std::type_info* allocated_type,
-               uint64_t alloc_size) override {
-    ++hooks_num_allocations;
-  }
-};
-
-// Test the hooks are correctly called.
-TEST(ArenaTest, ArenaHooksSanity) {
-  ArenaOptions options;
-  ArenaOptionsTestFriend::Enable(&options);
-
-  // Scope for defining the arena
-  {
-    Arena arena(options);
-    EXPECT_EQ(1, hooks_num_init);
-    EXPECT_EQ(0, hooks_num_allocations);
-    Arena::Create<uint64_t>(&arena);
-    if (std::is_trivially_destructible<uint64_t>::value) {
-      EXPECT_EQ(1, hooks_num_allocations);
-    } else {
-      EXPECT_EQ(2, hooks_num_allocations);
-    }
-    arena.Reset();
-    arena.Reset();
-    EXPECT_EQ(2, hooks_num_reset);
-  }
-  EXPECT_EQ(2, hooks_num_reset);
-  EXPECT_EQ(1, hooks_num_destruct);
-}
-
-// Test that allocation hooks are not called when we don't need them.
-TEST(ArenaTest, ArenaHooksWhenAllocationsNotNeeded) {
-  ArenaOptions options;
-  ArenaOptionsTestFriend::EnableWithoutAllocs(&options);
-
-  Arena arena(options);
-  EXPECT_EQ(0, hooks_num_allocations);
-  Arena::Create<uint64_t>(&arena);
-  EXPECT_EQ(0, hooks_num_allocations);
-}
-
-
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
diff --git a/libs/protobuf/src/google/protobuf/arenastring.cc b/libs/protobuf/src/google/protobuf/arenastring.cc
deleted file mode 100644
index af0c9df..0000000
--- a/libs/protobuf/src/google/protobuf/arenastring.cc
+++ /dev/null
@@ -1,267 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <google/protobuf/arenastring.h>
-
-#include <cstddef>
-#include <google/protobuf/stubs/logging.h>
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/stubs/mutex.h>
-#include <google/protobuf/stubs/strutil.h>
-#include <google/protobuf/message_lite.h>
-#include <google/protobuf/parse_context.h>
-#include <google/protobuf/stubs/stl_util.h>
-
-// clang-format off
-#include <google/protobuf/port_def.inc>
-// clang-format on
-
-namespace google {
-namespace protobuf {
-namespace internal {
-
-namespace  {
-
-// TaggedStringPtr::Flags uses the lower 2 bits as tags.
-// Enforce that allocated data aligns to at least 4 bytes, and that
-// the alignment of the global const string value does as well.
-// The alignment guaranteed by `new std::string` depends on both:
-// - new align = __STDCPP_DEFAULT_NEW_ALIGNMENT__ / max_align_t
-// - alignof(std::string)
-#ifdef __STDCPP_DEFAULT_NEW_ALIGNMENT__
-constexpr size_t kNewAlign = __STDCPP_DEFAULT_NEW_ALIGNMENT__;
-#elif (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) < 40900
-constexpr size_t kNewAlign = alignof(::max_align_t);
-#else
-constexpr size_t kNewAlign = alignof(std::max_align_t);
-#endif
-constexpr size_t kStringAlign = alignof(std::string);
-
-static_assert((kStringAlign > kNewAlign ? kStringAlign : kNewAlign) >= 4, "");
-static_assert(alignof(ExplicitlyConstructedArenaString) >= 4, "");
-
-}  // namespace
-
-const std::string& LazyString::Init() const {
-  static WrappedMutex mu{GOOGLE_PROTOBUF_LINKER_INITIALIZED};
-  mu.Lock();
-  const std::string* res = inited_.load(std::memory_order_acquire);
-  if (res == nullptr) {
-    auto init_value = init_value_;
-    res = ::new (static_cast<void*>(string_buf_))
-        std::string(init_value.ptr, init_value.size);
-    inited_.store(res, std::memory_order_release);
-  }
-  mu.Unlock();
-  return *res;
-}
-
-namespace {
-
-
-#if defined(NDEBUG) || !GOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL
-
-class ScopedCheckPtrInvariants {
- public:
-  explicit ScopedCheckPtrInvariants(const TaggedStringPtr*) {}
-};
-
-#endif  // NDEBUG || !GOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL
-
-// Creates a heap allocated std::string value.
-inline TaggedStringPtr CreateString(ConstStringParam value) {
-  TaggedStringPtr res;
-  res.SetAllocated(new std::string(value.data(), value.length()));
-  return res;
-}
-
-#if !GOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL
-
-// Creates an arena allocated std::string value.
-TaggedStringPtr CreateArenaString(Arena& arena, ConstStringParam s) {
-  TaggedStringPtr res;
-  res.SetMutableArena(Arena::Create<std::string>(&arena, s.data(), s.length()));
-  return res;
-}
-
-#endif  // !GOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL
-
-}  // namespace
-
-void ArenaStringPtr::Set(ConstStringParam value, Arena* arena) {
-  ScopedCheckPtrInvariants check(&tagged_ptr_);
-  if (IsDefault()) {
-    // If we're not on an arena, skip straight to a true string to avoid
-    // possible copy cost later.
-    tagged_ptr_ = arena != nullptr ? CreateArenaString(*arena, value)
-                                   : CreateString(value);
-  } else {
-    UnsafeMutablePointer()->assign(value.data(), value.length());
-  }
-}
-
-void ArenaStringPtr::Set(std::string&& value, Arena* arena) {
-  ScopedCheckPtrInvariants check(&tagged_ptr_);
-  if (IsDefault()) {
-    NewString(arena, std::move(value));
-  } else if (IsFixedSizeArena()) {
-    std::string* current = tagged_ptr_.Get();
-    auto* s = new (current) std::string(std::move(value));
-    arena->OwnDestructor(s);
-    tagged_ptr_.SetMutableArena(s);
-  } else /* !IsFixedSizeArena() */ {
-    *UnsafeMutablePointer() = std::move(value);
-  }
-}
-
-std::string* ArenaStringPtr::Mutable(Arena* arena) {
-  ScopedCheckPtrInvariants check(&tagged_ptr_);
-  if (tagged_ptr_.IsMutable()) {
-    return tagged_ptr_.Get();
-  } else {
-    return MutableSlow(arena);
-  }
-}
-
-std::string* ArenaStringPtr::Mutable(const LazyString& default_value,
-                                     Arena* arena) {
-  ScopedCheckPtrInvariants check(&tagged_ptr_);
-  if (tagged_ptr_.IsMutable()) {
-    return tagged_ptr_.Get();
-  } else {
-    return MutableSlow(arena, default_value);
-  }
-}
-
-std::string* ArenaStringPtr::MutableNoCopy(Arena* arena) {
-  ScopedCheckPtrInvariants check(&tagged_ptr_);
-  if (tagged_ptr_.IsMutable()) {
-    return tagged_ptr_.Get();
-  } else {
-    GOOGLE_DCHECK(IsDefault());
-    // Allocate empty. The contents are not relevant.
-    return NewString(arena);
-  }
-}
-
-template <typename... Lazy>
-std::string* ArenaStringPtr::MutableSlow(::google::protobuf::Arena* arena,
-                                         const Lazy&... lazy_default) {
-  GOOGLE_DCHECK(IsDefault());
-
-  // For empty defaults, this ends up calling the default constructor which is
-  // more efficient than a copy construction from
-  // GetEmptyStringAlreadyInited().
-  return NewString(arena, lazy_default.get()...);
-}
-
-std::string* ArenaStringPtr::Release() {
-  ScopedCheckPtrInvariants check(&tagged_ptr_);
-  if (IsDefault()) return nullptr;
-
-  std::string* released = tagged_ptr_.Get();
-  if (tagged_ptr_.IsArena()) {
-    released = tagged_ptr_.IsMutable() ? new std::string(std::move(*released))
-                                       : new std::string(*released);
-  }
-  InitDefault();
-  return released;
-}
-
-void ArenaStringPtr::SetAllocated(std::string* value, Arena* arena) {
-  ScopedCheckPtrInvariants check(&tagged_ptr_);
-  // Release what we have first.
-  Destroy();
-
-  if (value == nullptr) {
-    InitDefault();
-  } else {
-#ifndef NDEBUG
-    // On debug builds, copy the string so the address differs.  delete will
-    // fail if value was a stack-allocated temporary/etc., which would have
-    // failed when arena ran its cleanup list.
-    std::string* new_value = new std::string(std::move(*value));
-    delete value;
-    value = new_value;
-#endif  // !NDEBUG
-    InitAllocated(value, arena);
-  }
-}
-
-void ArenaStringPtr::Destroy() {
-  delete tagged_ptr_.GetIfAllocated();
-}
-
-void ArenaStringPtr::ClearToEmpty() {
-  ScopedCheckPtrInvariants check(&tagged_ptr_);
-  if (IsDefault()) {
-    // Already set to default -- do nothing.
-  } else {
-    // Unconditionally mask away the tag.
-    //
-    // UpdateArenaString uses assign when capacity is larger than the new
-    // value, which is trivially true in the donated string case.
-    // const_cast<std::string*>(PtrValue<std::string>())->clear();
-    tagged_ptr_.Get()->clear();
-  }
-}
-
-void ArenaStringPtr::ClearToDefault(const LazyString& default_value,
-                                    ::google::protobuf::Arena* arena) {
-  ScopedCheckPtrInvariants check(&tagged_ptr_);
-  (void)arena;
-  if (IsDefault()) {
-    // Already set to default -- do nothing.
-  } else {
-    UnsafeMutablePointer()->assign(default_value.get());
-  }
-}
-
-const char* EpsCopyInputStream::ReadArenaString(const char* ptr,
-                                                ArenaStringPtr* s,
-                                                Arena* arena) {
-  ScopedCheckPtrInvariants check(&s->tagged_ptr_);
-  GOOGLE_DCHECK(arena != nullptr);
-
-  int size = ReadSize(&ptr);
-  if (!ptr) return nullptr;
-
-  auto* str = s->NewString(arena);
-  ptr = ReadString(ptr, size, str);
-  GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
-  return ptr;
-}
-
-}  // namespace internal
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
diff --git a/libs/protobuf/src/google/protobuf/arenastring.h b/libs/protobuf/src/google/protobuf/arenastring.h
deleted file mode 100644
index 6bc8395..0000000
--- a/libs/protobuf/src/google/protobuf/arenastring.h
+++ /dev/null
@@ -1,480 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef GOOGLE_PROTOBUF_ARENASTRING_H__
-#define GOOGLE_PROTOBUF_ARENASTRING_H__
-
-#include <algorithm>
-#include <string>
-#include <type_traits>
-#include <utility>
-
-#include <google/protobuf/stubs/logging.h>
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/arena.h>
-#include <google/protobuf/port.h>
-#include <google/protobuf/explicitly_constructed.h>
-
-// must be last:
-#include <google/protobuf/port_def.inc>
-
-#ifdef SWIG
-#error "You cannot SWIG proto headers"
-#endif
-
-
-namespace google {
-namespace protobuf {
-namespace internal {
-class EpsCopyInputStream;
-
-class SwapFieldHelper;
-
-// Declared in message_lite.h
-PROTOBUF_EXPORT extern ExplicitlyConstructedArenaString
-    fixed_address_empty_string;
-
-// Lazy string instance to support string fields with non-empty default.
-// These are initialized on the first call to .get().
-class PROTOBUF_EXPORT LazyString {
- public:
-  // We explicitly make LazyString an aggregate so that MSVC can do constant
-  // initialization on it without marking it `constexpr`.
-  // We do not want to use `constexpr` because it makes it harder to have extern
-  // storage for it and causes library bloat.
-  struct InitValue {
-    const char* ptr;
-    size_t size;
-  };
-  // We keep a union of the initialization value and the std::string to save on
-  // space. We don't need the string array after Init() is done.
-  union {
-    mutable InitValue init_value_;
-    alignas(std::string) mutable char string_buf_[sizeof(std::string)];
-  };
-  mutable std::atomic<const std::string*> inited_;
-
-  const std::string& get() const {
-    // This check generates less code than a call-once invocation.
-    auto* res = inited_.load(std::memory_order_acquire);
-    if (PROTOBUF_PREDICT_FALSE(res == nullptr)) return Init();
-    return *res;
-  }
-
- private:
-  // Initialize the string in `string_buf_`, update `inited_` and return it.
-  // We return it here to avoid having to read it again in the inlined code.
-  const std::string& Init() const;
-};
-
-class TaggedStringPtr {
- public:
-  // Bit flags qualifying string properties. We can use 2 bits as
-  // ptr_ is guaranteed and enforced to be aligned on 4 byte boundaries.
-  enum Flags {
-    kArenaBit = 0x1,      // ptr is arena allocated
-    kMutableBit = 0x2,    // ptr contents are fully mutable
-    kMask = 0x3           // Bit mask
-  };
-
-  // Composed logical types
-  enum Type {
-    // Default strings are immutable and never owned.
-    kDefault = 0,
-
-    // Allocated strings are mutable and (as the name implies) owned.
-    // A heap allocated string must be deleted.
-    kAllocated = kMutableBit,
-
-    // Mutable arena strings are strings where the string instance is owned
-    // by the arena, but the string contents itself are owned by the string
-    // instance. Mutable arena string instances need to be destroyed which is
-    // typically done through a cleanup action added to the arena owning it.
-    kMutableArena = kArenaBit | kMutableBit,
-
-    // Fixed size arena strings are strings where both the string instance and
-    // the string contents are fully owned by the arena. Fixed size arena
-    // strings are a platform and c++ library specific customization. Fixed
-    // size arena strings are immutable, with the exception of custom internal
-    // updates to the content that fit inside the existing capacity.
-    // Fixed size arena strings must never be deleted or destroyed.
-    kFixedSizeArena = kArenaBit,
-  };
-
-  TaggedStringPtr() = default;
-  explicit constexpr TaggedStringPtr(ExplicitlyConstructedArenaString* ptr)
-      : ptr_(ptr) {}
-
-  // Sets the value to `p`, tagging the value as being a 'default' value.
-  // See documentation for kDefault for more info.
-  inline const std::string* SetDefault(const std::string* p) {
-    return TagAs(kDefault, const_cast<std::string*>(p));
-  }
-
-  // Sets the value to `p`, tagging the value as a heap allocated value.
-  // Allocated strings are mutable and (as the name implies) owned.
-  // `p` must not be null
-  inline std::string* SetAllocated(std::string* p) {
-    return TagAs(kAllocated, p);
-  }
-
-  // Sets the value to `p`, tagging the value as a fixed size arena string.
-  // See documentation for kFixedSizeArena for more info.
-  // `p` must not be null
-  inline std::string* SetFixedSizeArena(std::string* p) {
-    return TagAs(kFixedSizeArena, p);
-  }
-
-  // Sets the value to `p`, tagging the value as a mutable arena string.
-  // See documentation for kMutableArena for more info.
-  // `p` must not be null
-  inline std::string* SetMutableArena(std::string* p) {
-    return TagAs(kMutableArena, p);
-  }
-
-  // Returns true if the contents of the current string are fully mutable.
-  inline bool IsMutable() const { return as_int() & kMutableBit; }
-
-  // Returns true if the current string is an immutable default value.
-  inline bool IsDefault() const { return (as_int() & kMask) == kDefault; }
-
-  // If the current string is a heap-allocated mutable value, returns a pointer
-  // to it.  Returns nullptr otherwise.
-  inline std::string *GetIfAllocated() const {
-    auto allocated = as_int() ^ kAllocated;
-    if (allocated & kMask) return nullptr;
-
-    auto ptr = reinterpret_cast<std::string*>(allocated);
-    PROTOBUF_ASSUME(ptr != nullptr);
-    return ptr;
-  }
-
-  // Returns true if the current string is an arena allocated value.
-  // This means it's either a mutable or fixed size arena string.
-  inline bool IsArena() const { return as_int() & kArenaBit; }
-
-  // Returns true if the current string is a fixed size arena allocated value.
-  inline bool IsFixedSizeArena() const {
-    return (as_int() & kMask) == kFixedSizeArena;
-  }
-
-  // Returns the contained string pointer.
-  inline std::string* Get() const {
-    return reinterpret_cast<std::string*>(as_int() & ~kMask);
-  }
-
-  // Returns true if the contained pointer is null, indicating some error.
-  // The Null value is only used during parsing for temporary values.
-  // A persisted ArenaStringPtr value is never null.
-  inline bool IsNull() { return ptr_ == nullptr; }
-
- private:
-  static inline void assert_aligned(const void* p) {
-    GOOGLE_DCHECK_EQ(reinterpret_cast<uintptr_t>(p) & kMask, 0UL);
-  }
-
-  inline std::string* TagAs(Type type, std::string* p) {
-    GOOGLE_DCHECK(p != nullptr);
-    assert_aligned(p);
-    ptr_ = reinterpret_cast<void*>(reinterpret_cast<uintptr_t>(p) | type);
-    return p;
-  }
-
-  uintptr_t as_int() const { return reinterpret_cast<uintptr_t>(ptr_); }
-  void* ptr_;
-};
-
-static_assert(std::is_trivial<TaggedStringPtr>::value,
-              "TaggedStringPtr must be trivial");
-
-// This class encapsulates a pointer to a std::string with or without arena
-// owned contents, tagged by the bottom bits of the string pointer. It is a
-// high-level wrapper that almost directly corresponds to the interface required
-// by string fields in generated code. It replaces the old std::string* pointer
-// in such cases.
-//
-// The string pointer is tagged to be either a default, externally owned value,
-// a mutable heap allocated value, or an arena allocated value. The object uses
-// a single global instance of an empty string that is used as the initial
-// default value. Fields that have empty default values directly use this global
-// default. Fields that have non empty default values are supported through
-// lazily initialized default values managed by the LazyString class.
-//
-// Generated code and reflection code both ensure that ptr_ is never null.
-// Because ArenaStringPtr is used in oneof unions, its constructor is a NOP and
-// the field is always manually initialized via method calls.
-//
-// See TaggedStringPtr for more information about the types of string values
-// being held, and the mutable and ownership invariants for each type.
-struct PROTOBUF_EXPORT ArenaStringPtr {
-  ArenaStringPtr() = default;
-  constexpr ArenaStringPtr(ExplicitlyConstructedArenaString* default_value,
-                           ConstantInitialized)
-      : tagged_ptr_(default_value) {}
-
-  // Called from generated code / reflection runtime only. Resets value to point
-  // to a default string pointer, with the semantics that this ArenaStringPtr
-  // does not own the pointed-to memory. Disregards initial value of ptr_ (so
-  // this is the *ONLY* safe method to call after construction or when
-  // reinitializing after becoming the active field in a oneof union).
-  inline void InitDefault();
-
-  // Similar to `InitDefault` except that it allows the default value to be
-  // initialized to an externally owned string. This method is called from
-  // parsing code. `str` must not be null and outlive this instance.
-  inline void InitExternal(const std::string* str);
-
-  // Called from generated code / reflection runtime only. Resets the value of
-  // this instances to the heap allocated value in `str`. `str` must not be
-  // null. Invokes `arena->Own(str)` to transfer ownership into the arena if
-  // `arena` is not null, else, `str` will be owned by ArenaStringPtr. This
-  // function should only be used to initialize a ArenaStringPtr or on an
-  // instance known to not carry any heap allocated value.
-  inline void InitAllocated(std::string* str, Arena* arena);
-
-  void Set(ConstStringParam value, Arena* arena);
-  void Set(std::string&& value, Arena* arena);
-  void Set(const char* s, Arena* arena);
-  void Set(const char* s, size_t n, Arena* arena);
-
-  void SetBytes(ConstStringParam value, Arena* arena);
-  void SetBytes(std::string&& value, Arena* arena);
-  void SetBytes(const char* s, Arena* arena);
-  void SetBytes(const void* p, size_t n, Arena* arena);
-
-  template <typename RefWrappedType>
-  void Set(std::reference_wrapper<RefWrappedType> const_string_ref,
-           ::google::protobuf::Arena* arena) {
-    Set(const_string_ref.get(), arena);
-  }
-
-  // Returns a mutable std::string reference.
-  // The version accepting a `LazyString` value is used in the generated code to
-  // initialize mutable copies for fields with a non-empty default where the
-  // default value is lazily initialized.
-  std::string* Mutable(Arena* arena);
-  std::string* Mutable(const LazyString& default_value, Arena* arena);
-
-  // Gets a mutable pointer with unspecified contents.
-  // This function is identical to Mutable(), except it is optimized for the
-  // case where the caller is not interested in the current contents. For
-  // example, if the current field is not mutable, it will re-initialize the
-  // value with an empty string rather than a (non-empty) default value.
-  // Likewise, if the current value is a fixed size arena string with contents,
-  // it will be initialized into an empty mutable arena string.
-  std::string* MutableNoCopy(Arena* arena);
-
-  // Basic accessors.
-  PROTOBUF_NDEBUG_INLINE const std::string& Get() const {
-    // Unconditionally mask away the tag.
-    return *tagged_ptr_.Get();
-  }
-
-  // Returns a pointer to the stored contents for this instance.
-  // This method is for internal debugging and tracking purposes only.
-  PROTOBUF_NDEBUG_INLINE const std::string* UnsafeGetPointer() const
-      PROTOBUF_RETURNS_NONNULL {
-    return tagged_ptr_.Get();
-  }
-
-  // Release returns a std::string* instance that is heap-allocated and is not
-  // Own()'d by any arena. If the field is not set, this returns nullptr. The
-  // caller retains ownership. Clears this field back to the default state.
-  // Used to implement release_<field>() methods on generated classes.
-  PROTOBUF_NODISCARD std::string* Release();
-
-  // Takes a std::string that is heap-allocated, and takes ownership. The
-  // std::string's destructor is registered with the arena. Used to implement
-  // set_allocated_<field> in generated classes.
-  void SetAllocated(std::string* value, Arena* arena);
-
-  // Frees storage (if not on an arena).
-  void Destroy();
-
-  // Clears content, but keeps allocated std::string, to avoid the overhead of
-  // heap operations. After this returns, the content (as seen by the user) will
-  // always be the empty std::string. Assumes that |default_value| is an empty
-  // std::string.
-  void ClearToEmpty();
-
-  // Clears content, assuming that the current value is not the empty
-  // string default.
-  void ClearNonDefaultToEmpty();
-
-  // Clears content, but keeps allocated std::string if arena != nullptr, to
-  // avoid the overhead of heap operations. After this returns, the content
-  // (as seen by the user) will always be equal to |default_value|.
-  void ClearToDefault(const LazyString& default_value, ::google::protobuf::Arena* arena);
-
-  // Swaps internal pointers. Arena-safety semantics: this is guarded by the
-  // logic in Swap()/UnsafeArenaSwap() at the message level, so this method is
-  // 'unsafe' if called directly.
-  inline PROTOBUF_NDEBUG_INLINE static void InternalSwap(ArenaStringPtr* rhs,
-                                                         Arena* rhs_arena,
-                                                         ArenaStringPtr* lhs,
-                                                         Arena* lhs_arena);
-
-  // Internal setter used only at parse time to directly set a donated string
-  // value.
-  void UnsafeSetTaggedPointer(TaggedStringPtr value) { tagged_ptr_ = value; }
-  // Generated code only! An optimization, in certain cases the generated
-  // code is certain we can obtain a std::string with no default checks and
-  // tag tests.
-  std::string* UnsafeMutablePointer() PROTOBUF_RETURNS_NONNULL;
-
-  // Returns true if this instances holds an immutable default value.
-  inline bool IsDefault() const { return tagged_ptr_.IsDefault(); }
-
- private:
-  template <typename... Args>
-  inline std::string* NewString(Arena* arena, Args&&... args) {
-    if (arena == nullptr) {
-      auto* s = new std::string(std::forward<Args>(args)...);
-      return tagged_ptr_.SetAllocated(s);
-    } else {
-      auto* s = Arena::Create<std::string>(arena, std::forward<Args>(args)...);
-      return tagged_ptr_.SetMutableArena(s);
-    }
-  }
-
-  TaggedStringPtr tagged_ptr_;
-
-  bool IsFixedSizeArena() const { return false; }
-
-  // Swaps tagged pointer without debug hardening. This is to allow python
-  // protobuf to maintain pointer stability even in DEBUG builds.
-  inline PROTOBUF_NDEBUG_INLINE static void UnsafeShallowSwap(
-      ArenaStringPtr* rhs, ArenaStringPtr* lhs) {
-    std::swap(lhs->tagged_ptr_, rhs->tagged_ptr_);
-  }
-
-  friend class ::google::protobuf::internal::SwapFieldHelper;
-  friend class TcParser;
-
-  // Slow paths.
-
-  // MutableSlow requires that !IsString() || IsDefault
-  // Variadic to support 0 args for empty default and 1 arg for LazyString.
-  template <typename... Lazy>
-  std::string* MutableSlow(::google::protobuf::Arena* arena, const Lazy&... lazy_default);
-
-  friend class EpsCopyInputStream;
-};
-
-inline void ArenaStringPtr::InitDefault() {
-  tagged_ptr_ = TaggedStringPtr(&fixed_address_empty_string);
-}
-
-inline void ArenaStringPtr::InitExternal(const std::string* str) {
-  tagged_ptr_.SetDefault(str);
-}
-
-inline void ArenaStringPtr::InitAllocated(std::string* str, Arena* arena) {
-  if (arena != nullptr) {
-    tagged_ptr_.SetMutableArena(str);
-    arena->Own(str);
-  } else {
-    tagged_ptr_.SetAllocated(str);
-  }
-}
-
-inline void ArenaStringPtr::Set(const char* s, Arena* arena) {
-  Set(ConstStringParam{s}, arena);
-}
-
-inline void ArenaStringPtr::Set(const char* s, size_t n, Arena* arena) {
-  Set(ConstStringParam{s, n}, arena);
-}
-
-inline void ArenaStringPtr::SetBytes(ConstStringParam value, Arena* arena) {
-  Set(value, arena);
-}
-
-inline void ArenaStringPtr::SetBytes(std::string&& value, Arena* arena) {
-  Set(std::move(value), arena);
-}
-
-inline void ArenaStringPtr::SetBytes(const char* s, Arena* arena) {
-  Set(s, arena);
-}
-
-inline void ArenaStringPtr::SetBytes(const void* p, size_t n, Arena* arena) {
-  Set(ConstStringParam{static_cast<const char*>(p), n}, arena);
-}
-
-// Make sure rhs_arena allocated rhs, and lhs_arena allocated lhs.
-inline PROTOBUF_NDEBUG_INLINE void ArenaStringPtr::InternalSwap(  //
-    ArenaStringPtr* rhs, Arena* rhs_arena,                        //
-    ArenaStringPtr* lhs, Arena* lhs_arena) {
-  // Silence unused variable warnings in release buildls.
-  (void)rhs_arena;
-  (void)lhs_arena;
-  std::swap(lhs->tagged_ptr_, rhs->tagged_ptr_);
-#ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-  auto force_realloc = [](ArenaStringPtr* p, Arena* arena) {
-    if (p->IsDefault()) return;
-    std::string* old_value = p->tagged_ptr_.Get();
-    std::string* new_value =
-        p->IsFixedSizeArena()
-            ? Arena::Create<std::string>(arena, *old_value)
-            : Arena::Create<std::string>(arena, std::move(*old_value));
-    if (arena == nullptr) {
-      delete old_value;
-      p->tagged_ptr_.SetAllocated(new_value);
-    } else {
-      p->tagged_ptr_.SetMutableArena(new_value);
-    }
-  };
-  // Because, at this point, tagged_ptr_ has been swapped, arena should also be
-  // swapped.
-  force_realloc(lhs, rhs_arena);
-  force_realloc(rhs, lhs_arena);
-#endif  // PROTOBUF_FORCE_COPY_IN_SWAP
-}
-
-inline void ArenaStringPtr::ClearNonDefaultToEmpty() {
-  // Unconditionally mask away the tag.
-  tagged_ptr_.Get()->clear();
-}
-
-inline std::string* ArenaStringPtr::UnsafeMutablePointer() {
-  GOOGLE_DCHECK(tagged_ptr_.IsMutable());
-  GOOGLE_DCHECK(tagged_ptr_.Get() != nullptr);
-  return tagged_ptr_.Get();
-}
-
-
-}  // namespace internal
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
-
-#endif  // GOOGLE_PROTOBUF_ARENASTRING_H__
diff --git a/libs/protobuf/src/google/protobuf/arenastring_unittest.cc b/libs/protobuf/src/google/protobuf/arenastring_unittest.cc
deleted file mode 100644
index 0e5ea9b..0000000
--- a/libs/protobuf/src/google/protobuf/arenastring_unittest.cc
+++ /dev/null
@@ -1,154 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <google/protobuf/arenastring.h>
-
-#include <algorithm>
-#include <cstdlib>
-#include <memory>
-#include <string>
-#include <utility>
-#include <vector>
-
-#include <google/protobuf/stubs/logging.h>
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/io/zero_copy_stream_impl.h>
-#include <google/protobuf/generated_message_util.h>
-#include <google/protobuf/message_lite.h>
-#include <gtest/gtest.h>
-#include <google/protobuf/stubs/strutil.h>
-
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-
-using internal::ArenaStringPtr;
-
-const internal::LazyString nonempty_default{{{"default", 7}}, {nullptr}};
-const std::string* empty_default = &internal::GetEmptyString();
-
-class SingleArena : public testing::TestWithParam<bool> {
- public:
-  std::unique_ptr<Arena> GetArena() {
-    if (this->GetParam()) return nullptr;
-    return std::unique_ptr<Arena>(new Arena());
-  }
-};
-
-INSTANTIATE_TEST_SUITE_P(ArenaString, SingleArena, testing::Bool());
-
-TEST_P(SingleArena, GetSet) {
-  auto arena = GetArena();
-  ArenaStringPtr field;
-  field.InitDefault();
-  EXPECT_EQ("", field.Get());
-  field.Set("Test short", arena.get());
-  EXPECT_EQ("Test short", field.Get());
-  field.Set("Test long long long long value", arena.get());
-  EXPECT_EQ("Test long long long long value", field.Get());
-  field.Set("", arena.get());
-  field.Destroy();
-}
-
-TEST_P(SingleArena, MutableAccessor) {
-  auto arena = GetArena();
-  ArenaStringPtr field;
-  field.InitDefault();
-
-  std::string* mut = field.Mutable(arena.get());
-  EXPECT_EQ(mut, field.Mutable(arena.get()));
-  EXPECT_EQ(mut, &field.Get());
-  EXPECT_NE(empty_default, mut);
-  EXPECT_EQ("", *mut);
-  *mut = "Test long long long long value";  // ensure string allocates storage
-  EXPECT_EQ("Test long long long long value", field.Get());
-  field.Destroy();
-}
-
-TEST_P(SingleArena, NullDefault) {
-  auto arena = GetArena();
-
-  ArenaStringPtr field;
-  field.InitDefault();
-  std::string* mut = field.Mutable(nonempty_default, arena.get());
-  EXPECT_EQ(mut, field.Mutable(nonempty_default, arena.get()));
-  EXPECT_EQ(mut, &field.Get());
-  EXPECT_NE(nullptr, mut);
-  EXPECT_EQ("default", *mut);
-  *mut = "Test long long long long value";  // ensure string allocates storage
-  EXPECT_EQ("Test long long long long value", field.Get());
-  field.Destroy();
-}
-
-class DualArena : public testing::TestWithParam<std::tuple<bool, bool>> {
- public:
-  std::unique_ptr<Arena> GetLhsArena() {
-    if (std::get<0>(this->GetParam())) return nullptr;
-    return std::unique_ptr<Arena>(new Arena());
-  }
-  std::unique_ptr<Arena> GetRhsArena() {
-    if (std::get<1>(this->GetParam())) return nullptr;
-    return std::unique_ptr<Arena>(new Arena());
-  }
-};
-
-INSTANTIATE_TEST_SUITE_P(ArenaString, DualArena,
-                         testing::Combine(testing::Bool(), testing::Bool()));
-
-TEST_P(DualArena, Swap) {
-  auto lhs_arena = GetLhsArena();
-  ArenaStringPtr lhs;
-  lhs.InitDefault();
-  ArenaStringPtr rhs;
-  rhs.InitDefault();
-
-  {
-    auto rhs_arena = GetRhsArena();
-    lhs.Set("lhs value that has some heft", lhs_arena.get());
-    rhs.Set("rhs value that has some heft", rhs_arena.get());
-    ArenaStringPtr::InternalSwap(&lhs, lhs_arena.get(),  //
-                                 &rhs, rhs_arena.get());
-    EXPECT_EQ("rhs value that has some heft", lhs.Get());
-    EXPECT_EQ("lhs value that has some heft", rhs.Get());
-    lhs.Destroy();
-  }
-  EXPECT_EQ("lhs value that has some heft", rhs.Get());
-  rhs.Destroy();
-}
-
-
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
diff --git a/libs/protobuf/src/google/protobuf/arenaz_sampler.cc b/libs/protobuf/src/google/protobuf/arenaz_sampler.cc
deleted file mode 100644
index 0eac693..0000000
--- a/libs/protobuf/src/google/protobuf/arenaz_sampler.cc
+++ /dev/null
@@ -1,177 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <google/protobuf/arenaz_sampler.h>
-
-#include <atomic>
-#include <cstdint>
-#include <limits>
-
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-namespace internal {
-
-ThreadSafeArenazSampler& GlobalThreadSafeArenazSampler() {
-  static auto* sampler = new ThreadSafeArenazSampler();
-  return *sampler;
-}
-
-void UnsampleSlow(ThreadSafeArenaStats* info) {
-  GlobalThreadSafeArenazSampler().Unregister(info);
-}
-
-#if defined(PROTOBUF_ARENAZ_SAMPLE)
-namespace {
-
-PROTOBUF_CONSTINIT std::atomic<bool> g_arenaz_enabled{true};
-PROTOBUF_CONSTINIT std::atomic<int32_t> g_arenaz_sample_parameter{1 << 10};
-PROTOBUF_THREAD_LOCAL absl::profiling_internal::ExponentialBiased
-    g_exponential_biased_generator;
-
-}  // namespace
-
-PROTOBUF_THREAD_LOCAL int64_t global_next_sample = 1LL << 10;
-
-ThreadSafeArenaStats::ThreadSafeArenaStats() { PrepareForSampling(); }
-ThreadSafeArenaStats::~ThreadSafeArenaStats() = default;
-
-void ThreadSafeArenaStats::PrepareForSampling() {
-  num_allocations.store(0, std::memory_order_relaxed);
-  num_resets.store(0, std::memory_order_relaxed);
-  bytes_requested.store(0, std::memory_order_relaxed);
-  bytes_allocated.store(0, std::memory_order_relaxed);
-  bytes_wasted.store(0, std::memory_order_relaxed);
-  max_bytes_allocated.store(0, std::memory_order_relaxed);
-  thread_ids.store(0, std::memory_order_relaxed);
-  // The inliner makes hardcoded skip_count difficult (especially when combined
-  // with LTO).  We use the ability to exclude stacks by regex when encoding
-  // instead.
-  depth = absl::GetStackTrace(stack, kMaxStackDepth, /* skip_count= */ 0);
-}
-
-void RecordResetSlow(ThreadSafeArenaStats* info) {
-  const size_t max_bytes =
-      info->max_bytes_allocated.load(std::memory_order_relaxed);
-  const size_t allocated_bytes =
-      info->bytes_allocated.load(std::memory_order_relaxed);
-  if (max_bytes < allocated_bytes) {
-    info->max_bytes_allocated.store(allocated_bytes);
-  }
-  info->bytes_requested.store(0, std::memory_order_relaxed);
-  info->bytes_allocated.store(0, std::memory_order_relaxed);
-  info->bytes_wasted.fetch_add(0, std::memory_order_relaxed);
-  info->num_allocations.fetch_add(0, std::memory_order_relaxed);
-  info->num_resets.fetch_add(1, std::memory_order_relaxed);
-}
-
-void RecordAllocateSlow(ThreadSafeArenaStats* info, size_t requested,
-                        size_t allocated, size_t wasted) {
-  info->bytes_requested.fetch_add(requested, std::memory_order_relaxed);
-  info->bytes_allocated.fetch_add(allocated, std::memory_order_relaxed);
-  info->bytes_wasted.fetch_add(wasted, std::memory_order_relaxed);
-  info->num_allocations.fetch_add(1, std::memory_order_relaxed);
-  const uint64_t tid = (1ULL << (GetCachedTID() % 63));
-  const uint64_t thread_ids = info->thread_ids.load(std::memory_order_relaxed);
-  if (!(thread_ids & tid)) {
-    info->thread_ids.store(thread_ids | tid, std::memory_order_relaxed);
-  }
-}
-
-ThreadSafeArenaStats* SampleSlow(int64_t* next_sample) {
-  bool first = *next_sample < 0;
-  *next_sample = g_exponential_biased_generator.GetStride(
-      g_arenaz_sample_parameter.load(std::memory_order_relaxed));
-  // Small values of interval are equivalent to just sampling next time.
-  ABSL_ASSERT(*next_sample >= 1);
-
-  // g_arenaz_enabled can be dynamically flipped, we need to set a threshold low
-  // enough that we will start sampling in a reasonable time, so we just use the
-  // default sampling rate.
-  if (!g_arenaz_enabled.load(std::memory_order_relaxed)) return nullptr;
-  // We will only be negative on our first count, so we should just retry in
-  // that case.
-  if (first) {
-    if (PROTOBUF_PREDICT_TRUE(--*next_sample > 0)) return nullptr;
-    return SampleSlow(next_sample);
-  }
-
-  return GlobalThreadSafeArenazSampler().Register();
-}
-
-void SetThreadSafeArenazEnabled(bool enabled) {
-  g_arenaz_enabled.store(enabled, std::memory_order_release);
-}
-
-void SetThreadSafeArenazSampleParameter(int32_t rate) {
-  if (rate > 0) {
-    g_arenaz_sample_parameter.store(rate, std::memory_order_release);
-  } else {
-    ABSL_RAW_LOG(ERROR, "Invalid thread safe arenaz sample rate: %lld",
-                 static_cast<long long>(rate));  // NOLINT(runtime/int)
-  }
-}
-
-void SetThreadSafeArenazMaxSamples(int32_t max) {
-  if (max > 0) {
-    GlobalThreadSafeArenazSampler().SetMaxSamples(max);
-  } else {
-    ABSL_RAW_LOG(ERROR, "Invalid thread safe arenaz max samples: %lld",
-                 static_cast<long long>(max));  // NOLINT(runtime/int)
-  }
-}
-
-void SetThreadSafeArenazGlobalNextSample(int64_t next_sample) {
-  if (next_sample >= 0) {
-    global_next_sample = next_sample;
-  } else {
-    ABSL_RAW_LOG(ERROR, "Invalid thread safe arenaz next sample: %lld",
-                 static_cast<long long>(next_sample));  // NOLINT(runtime/int)
-  }
-}
-
-#else
-ThreadSafeArenaStats* SampleSlow(int64_t* next_sample) {
-  *next_sample = std::numeric_limits<int64_t>::max();
-  return nullptr;
-}
-
-void SetThreadSafeArenazEnabled(bool enabled) {}
-void SetThreadSafeArenazSampleParameter(int32_t rate) {}
-void SetThreadSafeArenazMaxSamples(int32_t max) {}
-void SetThreadSafeArenazGlobalNextSample(int64_t next_sample) {}
-#endif  // defined(PROTOBUF_ARENAZ_SAMPLE)
-
-}  // namespace internal
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/arenaz_sampler.h b/libs/protobuf/src/google/protobuf/arenaz_sampler.h
deleted file mode 100644
index b04b0cc..0000000
--- a/libs/protobuf/src/google/protobuf/arenaz_sampler.h
+++ /dev/null
@@ -1,207 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef GOOGLE_PROTOBUF_SRC_GOOGLE_PROTOBUF_ARENAZ_SAMPLER_H__
-#define GOOGLE_PROTOBUF_SRC_GOOGLE_PROTOBUF_ARENAZ_SAMPLER_H__
-
-#include <atomic>
-#include <cstddef>
-#include <cstdint>
-
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-namespace internal {
-
-#if defined(PROTOBUF_ARENAZ_SAMPLE)
-struct ThreadSafeArenaStats;
-void RecordResetSlow(ThreadSafeArenaStats* info);
-void RecordAllocateSlow(ThreadSafeArenaStats* info, size_t requested,
-                        size_t allocated, size_t wasted);
-// Stores information about a sampled thread safe arena.  All mutations to this
-// *must* be made through `Record*` functions below.  All reads from this *must*
-// only occur in the callback to `ThreadSafeArenazSampler::Iterate`.
-struct ThreadSafeArenaStats
-    : public absl::profiling_internal::Sample<ThreadSafeArenaStats> {
-  // Constructs the object but does not fill in any fields.
-  ThreadSafeArenaStats();
-  ~ThreadSafeArenaStats();
-
-  // Puts the object into a clean state, fills in the logically `const` members,
-  // blocking for any readers that are currently sampling the object.
-  void PrepareForSampling() ABSL_EXCLUSIVE_LOCKS_REQUIRED(init_mu);
-
-  // These fields are mutated by the various Record* APIs and need to be
-  // thread-safe.
-  std::atomic<int> num_allocations;
-  std::atomic<int> num_resets;
-  std::atomic<size_t> bytes_requested;
-  std::atomic<size_t> bytes_allocated;
-  std::atomic<size_t> bytes_wasted;
-  // Records the largest size an arena ever had.  Maintained across resets.
-  std::atomic<size_t> max_bytes_allocated;
-  // Bit i when set to 1 indicates that a thread with tid % 63 = i accessed the
-  // underlying arena.  The field is maintained across resets.
-  std::atomic<uint64_t> thread_ids;
-
-  // All of the fields below are set by `PrepareForSampling`, they must not
-  // be mutated in `Record*` functions.  They are logically `const` in that
-  // sense. These are guarded by init_mu, but that is not externalized to
-  // clients, who can only read them during
-  // `ThreadSafeArenazSampler::Iterate` which will hold the lock.
-  static constexpr int kMaxStackDepth = 64;
-  int32_t depth;
-  void* stack[kMaxStackDepth];
-  static void RecordAllocateStats(ThreadSafeArenaStats* info, size_t requested,
-                                  size_t allocated, size_t wasted) {
-    if (PROTOBUF_PREDICT_TRUE(info == nullptr)) return;
-    RecordAllocateSlow(info, requested, allocated, wasted);
-  }
-};
-
-ThreadSafeArenaStats* SampleSlow(int64_t* next_sample);
-void UnsampleSlow(ThreadSafeArenaStats* info);
-
-class ThreadSafeArenaStatsHandle {
- public:
-  explicit ThreadSafeArenaStatsHandle() = default;
-  explicit ThreadSafeArenaStatsHandle(ThreadSafeArenaStats* info)
-      : info_(info) {}
-
-  ~ThreadSafeArenaStatsHandle() {
-    if (PROTOBUF_PREDICT_TRUE(info_ == nullptr)) return;
-    UnsampleSlow(info_);
-  }
-
-  ThreadSafeArenaStatsHandle(ThreadSafeArenaStatsHandle&& other) noexcept
-      : info_(absl::exchange(other.info_, nullptr)) {}
-
-  ThreadSafeArenaStatsHandle& operator=(
-      ThreadSafeArenaStatsHandle&& other) noexcept {
-    if (PROTOBUF_PREDICT_FALSE(info_ != nullptr)) {
-      UnsampleSlow(info_);
-    }
-    info_ = absl::exchange(other.info_, nullptr);
-    return *this;
-  }
-
-  void RecordReset() {
-    if (PROTOBUF_PREDICT_TRUE(info_ == nullptr)) return;
-    RecordResetSlow(info_);
-  }
-
-  ThreadSafeArenaStats* MutableStats() { return info_; }
-
-  friend void swap(ThreadSafeArenaStatsHandle& lhs,
-                   ThreadSafeArenaStatsHandle& rhs) {
-    std::swap(lhs.info_, rhs.info_);
-  }
-
-  friend class ThreadSafeArenaStatsHandlePeer;
-
- private:
-  ThreadSafeArenaStats* info_ = nullptr;
-};
-
-using ThreadSafeArenazSampler =
-    ::absl::profiling_internal::SampleRecorder<ThreadSafeArenaStats>;
-
-extern PROTOBUF_THREAD_LOCAL int64_t global_next_sample;
-
-// Returns an RAII sampling handle that manages registration and unregistation
-// with the global sampler.
-inline ThreadSafeArenaStatsHandle Sample() {
-  if (PROTOBUF_PREDICT_TRUE(--global_next_sample > 0)) {
-    return ThreadSafeArenaStatsHandle(nullptr);
-  }
-  return ThreadSafeArenaStatsHandle(SampleSlow(&global_next_sample));
-}
-
-#else
-struct ThreadSafeArenaStats {
-  static void RecordAllocateStats(ThreadSafeArenaStats*, size_t /*requested*/,
-                                  size_t /*allocated*/, size_t /*wasted*/) {}
-};
-
-ThreadSafeArenaStats* SampleSlow(int64_t* next_sample);
-void UnsampleSlow(ThreadSafeArenaStats* info);
-
-class ThreadSafeArenaStatsHandle {
- public:
-  explicit ThreadSafeArenaStatsHandle() = default;
-  explicit ThreadSafeArenaStatsHandle(ThreadSafeArenaStats*) {}
-
-  void RecordReset() {}
-
-  ThreadSafeArenaStats* MutableStats() { return nullptr; }
-
-  friend void swap(ThreadSafeArenaStatsHandle&, ThreadSafeArenaStatsHandle&) {}
-
- private:
-  friend class ThreadSafeArenaStatsHandlePeer;
-};
-
-class ThreadSafeArenazSampler {
- public:
-  void Unregister(ThreadSafeArenaStats*) {}
-  void SetMaxSamples(int32_t) {}
-};
-
-// Returns an RAII sampling handle that manages registration and unregistation
-// with the global sampler.
-inline ThreadSafeArenaStatsHandle Sample() {
-  return ThreadSafeArenaStatsHandle(nullptr);
-}
-#endif  // defined(PROTOBUF_ARENAZ_SAMPLE)
-
-// Returns a global Sampler.
-ThreadSafeArenazSampler& GlobalThreadSafeArenazSampler();
-
-// Enables or disables sampling for thread safe arenas.
-void SetThreadSafeArenazEnabled(bool enabled);
-
-// Sets the rate at which thread safe arena will be sampled.
-void SetThreadSafeArenazSampleParameter(int32_t rate);
-
-// Sets a soft max for the number of samples that will be kept.
-void SetThreadSafeArenazMaxSamples(int32_t max);
-
-// Sets the current value for when arenas should be next sampled.
-void SetThreadSafeArenazGlobalNextSample(int64_t next_sample);
-
-}  // namespace internal
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
-#endif  // GOOGLE_PROTOBUF_SRC_PROTOBUF_ARENAZ_SAMPLER_H__
diff --git a/libs/protobuf/src/google/protobuf/arenaz_sampler_test.cc b/libs/protobuf/src/google/protobuf/arenaz_sampler_test.cc
deleted file mode 100644
index 1bfec54..0000000
--- a/libs/protobuf/src/google/protobuf/arenaz_sampler_test.cc
+++ /dev/null
@@ -1,382 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <google/protobuf/arenaz_sampler.h>
-
-#include <memory>
-#include <random>
-#include <vector>
-
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
-#include <google/protobuf/stubs/strutil.h>
-
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-namespace internal {
-#if defined(PROTOBUF_ARENAZ_SAMPLE)
-class ThreadSafeArenaStatsHandlePeer {
- public:
-  static bool IsSampled(const ThreadSafeArenaStatsHandle& h) {
-    return h.info_ != nullptr;
-  }
-
-  static ThreadSafeArenaStats* GetInfo(ThreadSafeArenaStatsHandle* h) {
-    return h->info_;
-  }
-};
-std::vector<size_t> GetBytesAllocated(ThreadSafeArenazSampler* s) {
-  std::vector<size_t> res;
-  s->Iterate([&](const ThreadSafeArenaStats& info) {
-    res.push_back(info.bytes_allocated.load(std::memory_order_acquire));
-  });
-  return res;
-}
-
-ThreadSafeArenaStats* Register(ThreadSafeArenazSampler* s, size_t size) {
-  auto* info = s->Register();
-  assert(info != nullptr);
-  info->bytes_allocated.store(size);
-  return info;
-}
-
-#endif  // defined(PROTOBUF_ARENAZ_SAMPLE)
-
-namespace {
-
-#if defined(PROTOBUF_ARENAZ_SAMPLE)
-
-TEST(ThreadSafeArenaStatsTest, PrepareForSampling) {
-  ThreadSafeArenaStats info;
-  MutexLock l(&info.init_mu);
-  info.PrepareForSampling();
-
-  EXPECT_EQ(info.num_allocations.load(), 0);
-  EXPECT_EQ(info.num_resets.load(), 0);
-  EXPECT_EQ(info.bytes_requested.load(), 0);
-  EXPECT_EQ(info.bytes_allocated.load(), 0);
-  EXPECT_EQ(info.bytes_wasted.load(), 0);
-  EXPECT_EQ(info.max_bytes_allocated.load(), 0);
-
-  info.num_allocations.store(1, std::memory_order_relaxed);
-  info.num_resets.store(1, std::memory_order_relaxed);
-  info.bytes_requested.store(1, std::memory_order_relaxed);
-  info.bytes_allocated.store(1, std::memory_order_relaxed);
-  info.bytes_wasted.store(1, std::memory_order_relaxed);
-  info.max_bytes_allocated.store(1, std::memory_order_relaxed);
-
-  info.PrepareForSampling();
-  EXPECT_EQ(info.num_allocations.load(), 0);
-  EXPECT_EQ(info.num_resets.load(), 0);
-  EXPECT_EQ(info.bytes_requested.load(), 0);
-  EXPECT_EQ(info.bytes_allocated.load(), 0);
-  EXPECT_EQ(info.bytes_wasted.load(), 0);
-  EXPECT_EQ(info.max_bytes_allocated.load(), 0);
-}
-
-TEST(ThreadSafeArenaStatsTest, RecordAllocateSlow) {
-  ThreadSafeArenaStats info;
-  MutexLock l(&info.init_mu);
-  info.PrepareForSampling();
-  RecordAllocateSlow(&info, /*requested=*/100, /*allocated=*/128, /*wasted=*/0);
-  EXPECT_EQ(info.num_allocations.load(), 1);
-  EXPECT_EQ(info.num_resets.load(), 0);
-  EXPECT_EQ(info.bytes_requested.load(), 100);
-  EXPECT_EQ(info.bytes_allocated.load(), 128);
-  EXPECT_EQ(info.bytes_wasted.load(), 0);
-  EXPECT_EQ(info.max_bytes_allocated.load(), 0);
-  RecordAllocateSlow(&info, /*requested=*/100, /*allocated=*/256,
-                     /*wasted=*/28);
-  EXPECT_EQ(info.num_allocations.load(), 2);
-  EXPECT_EQ(info.num_resets.load(), 0);
-  EXPECT_EQ(info.bytes_requested.load(), 200);
-  EXPECT_EQ(info.bytes_allocated.load(), 384);
-  EXPECT_EQ(info.bytes_wasted.load(), 28);
-  EXPECT_EQ(info.max_bytes_allocated.load(), 0);
-}
-
-TEST(ThreadSafeArenaStatsTest, RecordResetSlow) {
-  ThreadSafeArenaStats info;
-  MutexLock l(&info.init_mu);
-  info.PrepareForSampling();
-  EXPECT_EQ(info.num_resets.load(), 0);
-  EXPECT_EQ(info.bytes_allocated.load(), 0);
-  RecordAllocateSlow(&info, /*requested=*/100, /*allocated=*/128, /*wasted=*/0);
-  EXPECT_EQ(info.num_resets.load(), 0);
-  EXPECT_EQ(info.bytes_allocated.load(), 128);
-  RecordResetSlow(&info);
-  EXPECT_EQ(info.num_resets.load(), 1);
-  EXPECT_EQ(info.bytes_allocated.load(), 0);
-}
-
-TEST(ThreadSafeArenazSamplerTest, SmallSampleParameter) {
-  SetThreadSafeArenazEnabled(true);
-  SetThreadSafeArenazSampleParameter(100);
-
-  for (int i = 0; i < 1000; ++i) {
-    int64_t next_sample = 0;
-    ThreadSafeArenaStats* sample = SampleSlow(&next_sample);
-    EXPECT_GT(next_sample, 0);
-    EXPECT_NE(sample, nullptr);
-    UnsampleSlow(sample);
-  }
-}
-
-TEST(ThreadSafeArenazSamplerTest, LargeSampleParameter) {
-  SetThreadSafeArenazEnabled(true);
-  SetThreadSafeArenazSampleParameter(std::numeric_limits<int32_t>::max());
-
-  for (int i = 0; i < 1000; ++i) {
-    int64_t next_sample = 0;
-    ThreadSafeArenaStats* sample = SampleSlow(&next_sample);
-    EXPECT_GT(next_sample, 0);
-    EXPECT_NE(sample, nullptr);
-    UnsampleSlow(sample);
-  }
-}
-
-TEST(ThreadSafeArenazSamplerTest, Sample) {
-  SetThreadSafeArenazEnabled(true);
-  SetThreadSafeArenazSampleParameter(100);
-  SetThreadSafeArenazGlobalNextSample(0);
-  int64_t num_sampled = 0;
-  int64_t total = 0;
-  double sample_rate = 0.0;
-  for (int i = 0; i < 1000000; ++i) {
-    ThreadSafeArenaStatsHandle h = Sample();
-    ++total;
-    if (ThreadSafeArenaStatsHandlePeer::IsSampled(h)) {
-      ++num_sampled;
-    }
-    sample_rate = static_cast<double>(num_sampled) / total;
-    if (0.005 < sample_rate && sample_rate < 0.015) break;
-  }
-  EXPECT_NEAR(sample_rate, 0.01, 0.005);
-}
-
-TEST(ThreadSafeArenazSamplerTest, Handle) {
-  auto& sampler = GlobalThreadSafeArenazSampler();
-  ThreadSafeArenaStatsHandle h(sampler.Register());
-  auto* info = ThreadSafeArenaStatsHandlePeer::GetInfo(&h);
-  info->bytes_allocated.store(0x12345678, std::memory_order_relaxed);
-
-  bool found = false;
-  sampler.Iterate([&](const ThreadSafeArenaStats& h) {
-    if (&h == info) {
-      EXPECT_EQ(h.bytes_allocated.load(), 0x12345678);
-      found = true;
-    }
-  });
-  EXPECT_TRUE(found);
-
-  h = ThreadSafeArenaStatsHandle();
-  found = false;
-  sampler.Iterate([&](const ThreadSafeArenaStats& h) {
-    if (&h == info) {
-      // this will only happen if some other thread has resurrected the info
-      // the old handle was using.
-      if (h.bytes_allocated.load() == 0x12345678) {
-        found = true;
-      }
-    }
-  });
-  EXPECT_FALSE(found);
-}
-
-TEST(ThreadSafeArenazSamplerTest, Registration) {
-  ThreadSafeArenazSampler sampler;
-  auto* info1 = Register(&sampler, 1);
-  EXPECT_THAT(GetBytesAllocated(&sampler), UnorderedElementsAre(1));
-
-  auto* info2 = Register(&sampler, 2);
-  EXPECT_THAT(GetBytesAllocated(&sampler), UnorderedElementsAre(1, 2));
-  info1->bytes_allocated.store(3);
-  EXPECT_THAT(GetBytesAllocated(&sampler), UnorderedElementsAre(3, 2));
-
-  sampler.Unregister(info1);
-  sampler.Unregister(info2);
-}
-
-TEST(ThreadSafeArenazSamplerTest, Unregistration) {
-  ThreadSafeArenazSampler sampler;
-  std::vector<ThreadSafeArenaStats*> infos;
-  for (size_t i = 0; i < 3; ++i) {
-    infos.push_back(Register(&sampler, i));
-  }
-  EXPECT_THAT(GetBytesAllocated(&sampler), UnorderedElementsAre(0, 1, 2));
-
-  sampler.Unregister(infos[1]);
-  EXPECT_THAT(GetBytesAllocated(&sampler), UnorderedElementsAre(0, 2));
-
-  infos.push_back(Register(&sampler, 3));
-  infos.push_back(Register(&sampler, 4));
-  EXPECT_THAT(GetBytesAllocated(&sampler), UnorderedElementsAre(0, 2, 3, 4));
-  sampler.Unregister(infos[3]);
-  EXPECT_THAT(GetBytesAllocated(&sampler), UnorderedElementsAre(0, 2, 4));
-
-  sampler.Unregister(infos[0]);
-  sampler.Unregister(infos[2]);
-  sampler.Unregister(infos[4]);
-  EXPECT_THAT(GetBytesAllocated(&sampler), IsEmpty());
-}
-
-TEST(ThreadSafeArenazSamplerTest, MultiThreaded) {
-  ThreadSafeArenazSampler sampler;
-  absl::Notification stop;
-  ThreadPool pool(10);
-
-  for (int i = 0; i < 10; ++i) {
-    pool.Schedule([&sampler, &stop]() {
-      std::random_device rd;
-      std::mt19937 gen(rd());
-
-      std::vector<ThreadSafeArenaStats*> infoz;
-      while (!stop.HasBeenNotified()) {
-        if (infoz.empty()) {
-          infoz.push_back(sampler.Register());
-        }
-        switch (std::uniform_int_distribution<>(0, 1)(gen)) {
-          case 0: {
-            infoz.push_back(sampler.Register());
-            break;
-          }
-          case 1: {
-            size_t p =
-                std::uniform_int_distribution<>(0, infoz.size() - 1)(gen);
-            ThreadSafeArenaStats* info = infoz[p];
-            infoz[p] = infoz.back();
-            infoz.pop_back();
-            sampler.Unregister(info);
-            break;
-          }
-        }
-      }
-    });
-  }
-  // The threads will hammer away.  Give it a little bit of time for tsan to
-  // spot errors.
-  absl::SleepFor(absl::Seconds(3));
-  stop.Notify();
-}
-
-TEST(ThreadSafeArenazSamplerTest, Callback) {
-  ThreadSafeArenazSampler sampler;
-
-  auto* info1 = Register(&sampler, 1);
-  auto* info2 = Register(&sampler, 2);
-
-  static const ThreadSafeArenaStats* expected;
-
-  auto callback = [](const ThreadSafeArenaStats& info) {
-    // We can't use `info` outside of this callback because the object will be
-    // disposed as soon as we return from here.
-    EXPECT_EQ(&info, expected);
-  };
-
-  // Set the callback.
-  EXPECT_EQ(sampler.SetDisposeCallback(callback), nullptr);
-  expected = info1;
-  sampler.Unregister(info1);
-
-  // Unset the callback.
-  EXPECT_EQ(callback, sampler.SetDisposeCallback(nullptr));
-  expected = nullptr;  // no more calls.
-  sampler.Unregister(info2);
-}
-
-class ThreadSafeArenazSamplerTestThread : public Thread {
- protected:
-  void Run() override {
-    google::protobuf::ArenaSafeUniquePtr<
-        protobuf_test_messages::proto2::TestAllTypesProto2>
-        message = google::protobuf::MakeArenaSafeUnique<
-            protobuf_test_messages::proto2::TestAllTypesProto2>(arena_);
-    GOOGLE_CHECK(message != nullptr);
-    // Signal that a message on the arena has been created.  This should create
-    // a SerialArena for this thread.
-    if (barrier_->Block()) {
-      delete barrier_;
-    }
-  }
-
- public:
-  ThreadSafeArenazSamplerTestThread(const thread::Options& options,
-                                    StringPiece name,
-                                    google::protobuf::Arena* arena,
-                                    absl::Barrier* barrier)
-      : Thread(options, name), arena_(arena), barrier_(barrier) {}
-
- private:
-  google::protobuf::Arena* arena_;
-  absl::Barrier* barrier_;
-};
-
-TEST(ThreadSafeArenazSamplerTest, MultiThread) {
-  SetThreadSafeArenazEnabled(true);
-  // Setting 1 as the parameter value means one in every two arenas would be
-  // sampled, on average.
-  SetThreadSafeArenazSampleParameter(1);
-  SetThreadSafeArenazGlobalNextSample(0);
-  auto& sampler = GlobalThreadSafeArenazSampler();
-  int count = 0;
-  for (int i = 0; i < 10; ++i) {
-    const int kNumThreads = 10;
-    absl::Barrier* barrier = new absl::Barrier(kNumThreads + 1);
-    google::protobuf::Arena arena;
-    thread::Options options;
-    options.set_joinable(true);
-    std::vector<std::unique_ptr<ThreadSafeArenazSamplerTestThread>> threads;
-    for (int i = 0; i < kNumThreads; i++) {
-      auto t = std::make_unique<ThreadSafeArenazSamplerTestThread>(
-          options, StrCat("thread", i), &arena, barrier);
-      t->Start();
-      threads.push_back(std::move(t));
-    }
-    // Wait till each thread has created a message on the arena.
-    if (barrier->Block()) {
-      delete barrier;
-    }
-    sampler.Iterate([&](const ThreadSafeArenaStats& h) { ++count; });
-    for (int i = 0; i < kNumThreads; i++) {
-      threads[i]->Join();
-    }
-  }
-  EXPECT_GT(count, 0);
-}
-#endif  // defined(PROTOBUF_ARENAZ_SAMPLE)
-
-}  // namespace
-}  // namespace internal
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/compiler/annotation_test_util.cc b/libs/protobuf/src/google/protobuf/compiler/annotation_test_util.cc
deleted file mode 100644
index f0815c5..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/annotation_test_util.cc
+++ /dev/null
@@ -1,167 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <google/protobuf/compiler/annotation_test_util.h>
-
-#include <cstdint>
-#include <memory>
-
-#include <google/protobuf/testing/file.h>
-#include <google/protobuf/testing/file.h>
-#include <google/protobuf/compiler/code_generator.h>
-#include <google/protobuf/compiler/command_line_interface.h>
-#include <google/protobuf/io/printer.h>
-#include <google/protobuf/io/zero_copy_stream.h>
-#include <google/protobuf/io/zero_copy_stream_impl_lite.h>
-#include <google/protobuf/descriptor.pb.h>
-#include <google/protobuf/testing/googletest.h>
-#include <gtest/gtest.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace annotation_test_util {
-namespace {
-
-// A CodeGenerator that captures the FileDescriptor it's passed as a
-// FileDescriptorProto.
-class DescriptorCapturingGenerator : public CodeGenerator {
- public:
-  // Does not own file; file must outlive the Generator.
-  explicit DescriptorCapturingGenerator(FileDescriptorProto* file)
-      : file_(file) {}
-
-  bool Generate(const FileDescriptor* file, const std::string& parameter,
-                GeneratorContext* context, std::string* error) const override {
-    file->CopyTo(file_);
-    return true;
-  }
-
- private:
-  FileDescriptorProto* file_;
-};
-}  // namespace
-
-void AddFile(const std::string& filename, const std::string& data) {
-  GOOGLE_CHECK_OK(File::SetContents(TestTempDir() + "/" + filename, data,
-                             true));
-}
-
-bool RunProtoCompiler(const std::string& filename,
-                      const std::string& plugin_specific_args,
-                      CommandLineInterface* cli, FileDescriptorProto* file) {
-  cli->SetInputsAreProtoPathRelative(true);
-
-  DescriptorCapturingGenerator capturing_generator(file);
-  cli->RegisterGenerator("--capture_out", &capturing_generator, "");
-
-  std::string proto_path = "-I" + TestTempDir();
-  std::string capture_out = "--capture_out=" + TestTempDir();
-
-  const char* argv[] = {"protoc", proto_path.c_str(),
-                        plugin_specific_args.c_str(), capture_out.c_str(),
-                        filename.c_str()};
-
-  return cli->Run(5, argv) == 0;
-}
-
-bool DecodeMetadata(const std::string& path, GeneratedCodeInfo* info) {
-  std::string data;
-  GOOGLE_CHECK_OK(File::GetContents(path, &data, true));
-  io::ArrayInputStream input(data.data(), data.size());
-  return info->ParseFromZeroCopyStream(&input);
-}
-
-void FindAnnotationsOnPath(
-    const GeneratedCodeInfo& info, const std::string& source_file,
-    const std::vector<int>& path,
-    std::vector<const GeneratedCodeInfo::Annotation*>* annotations) {
-  for (int i = 0; i < info.annotation_size(); ++i) {
-    const GeneratedCodeInfo::Annotation* annotation = &info.annotation(i);
-    if (annotation->source_file() != source_file ||
-        annotation->path_size() != path.size()) {
-      continue;
-    }
-    int node = 0;
-    for (; node < path.size(); ++node) {
-      if (annotation->path(node) != path[node]) {
-        break;
-      }
-    }
-    if (node == path.size()) {
-      annotations->push_back(annotation);
-    }
-  }
-}
-
-const GeneratedCodeInfo::Annotation* FindAnnotationOnPath(
-    const GeneratedCodeInfo& info, const std::string& source_file,
-    const std::vector<int>& path) {
-  std::vector<const GeneratedCodeInfo::Annotation*> annotations;
-  FindAnnotationsOnPath(info, source_file, path, &annotations);
-  if (annotations.empty()) {
-    return nullptr;
-  }
-  return annotations[0];
-}
-
-bool AtLeastOneAnnotationMatchesSubstring(
-    const std::string& file_content,
-    const std::vector<const GeneratedCodeInfo::Annotation*>& annotations,
-    const std::string& expected_text) {
-  for (std::vector<const GeneratedCodeInfo::Annotation*>::const_iterator
-           i = annotations.begin(),
-           e = annotations.end();
-       i != e; ++i) {
-    const GeneratedCodeInfo::Annotation* annotation = *i;
-    uint32_t begin = annotation->begin();
-    uint32_t end = annotation->end();
-    if (end < begin || end > file_content.size()) {
-      return false;
-    }
-    if (file_content.substr(begin, end - begin) == expected_text) {
-      return true;
-    }
-  }
-  return false;
-}
-
-bool AnnotationMatchesSubstring(const std::string& file_content,
-                                const GeneratedCodeInfo::Annotation* annotation,
-                                const std::string& expected_text) {
-  std::vector<const GeneratedCodeInfo::Annotation*> annotations;
-  annotations.push_back(annotation);
-  return AtLeastOneAnnotationMatchesSubstring(file_content, annotations,
-                                              expected_text);
-}
-}  // namespace annotation_test_util
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/compiler/annotation_test_util.h b/libs/protobuf/src/google/protobuf/compiler/annotation_test_util.h
deleted file mode 100644
index b7c6ddd..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/annotation_test_util.h
+++ /dev/null
@@ -1,115 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef GOOGLE_PROTOBUF_COMPILER_ANNOTATION_TEST_UTIL_H__
-#define GOOGLE_PROTOBUF_COMPILER_ANNOTATION_TEST_UTIL_H__
-
-#include <google/protobuf/descriptor.pb.h>
-#include <google/protobuf/testing/googletest.h>
-#include <gtest/gtest.h>
-
-// Utilities that assist in writing tests for generator annotations.
-// See java/internal/annotation_unittest.cc for an example.
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace annotation_test_util {
-
-// Struct that contains the file generated from a .proto file and its
-// GeneratedCodeInfo. For example, the Java generator will fill this struct
-// (for some 'foo.proto') with:
-//   file_path = "Foo.java"
-//   file_content = content of Foo.java
-//   file_info = parsed content of Foo.java.pb.meta
-struct ExpectedOutput {
-  std::string file_path;
-  std::string file_content;
-  GeneratedCodeInfo file_info;
-  explicit ExpectedOutput(const std::string& file_path)
-      : file_path(file_path) {}
-};
-
-// Creates a file with name `filename` and content `data` in temp test
-// directory.
-void AddFile(const std::string& filename, const std::string& data);
-
-// Runs proto compiler. Captures proto file structure in FileDescriptorProto.
-// Files will be generated in TestTempDir() folder. Callers of this
-// function must read generated files themselves.
-//
-// filename: source .proto file used to generate code.
-// plugin_specific_args: command line arguments specific to current generator.
-//     For Java, this value might be "--java_out=annotate_code:test_temp_dir"
-// cli: instance of command line interface to run generator. See Java's
-//     annotation_unittest.cc for an example of how to initialize it.
-// file: output parameter, will be set to the descriptor of the proto file
-//     specified in filename.
-bool RunProtoCompiler(const std::string& filename,
-                      const std::string& plugin_specific_args,
-                      CommandLineInterface* cli, FileDescriptorProto* file);
-
-bool DecodeMetadata(const std::string& path, GeneratedCodeInfo* info);
-
-// Finds all of the Annotations for a given source file and path.
-// See Location.path in https://github.com/protocolbuffers/protobuf/blob/main/src/google/protobuf/descriptor.proto for
-// explanation of what path vector is.
-void FindAnnotationsOnPath(
-    const GeneratedCodeInfo& info, const std::string& source_file,
-    const std::vector<int>& path,
-    std::vector<const GeneratedCodeInfo::Annotation*>* annotations);
-
-// Finds the Annotation for a given source file and path (or returns null if it
-// couldn't). If there are several annotations for given path, returns the first
-// one. See Location.path in
-// https://github.com/protocolbuffers/protobuf/blob/main/src/google/protobuf/descriptor.proto for explanation of what path
-// vector is.
-const GeneratedCodeInfo::Annotation* FindAnnotationOnPath(
-    const GeneratedCodeInfo& info, const std::string& source_file,
-    const std::vector<int>& path);
-
-// Returns true if at least one of the provided annotations covers a given
-// substring in file_content.
-bool AtLeastOneAnnotationMatchesSubstring(
-    const std::string& file_content,
-    const std::vector<const GeneratedCodeInfo::Annotation*>& annotations,
-    const std::string& expected_text);
-
-// Returns true if the provided annotation covers a given substring in
-// file_content.
-bool AnnotationMatchesSubstring(const std::string& file_content,
-                                const GeneratedCodeInfo::Annotation* annotation,
-                                const std::string& expected_text);
-
-}  // namespace annotation_test_util
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // GOOGLE_PROTOBUF_COMPILER_ANNOTATION_TEST_UTIL_H__
diff --git a/libs/protobuf/src/google/protobuf/compiler/code_generator.cc b/libs/protobuf/src/google/protobuf/compiler/code_generator.cc
deleted file mode 100644
index dc9d450..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/code_generator.cc
+++ /dev/null
@@ -1,137 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-
-#include <google/protobuf/compiler/code_generator.h>
-
-#include <google/protobuf/stubs/logging.h>
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/compiler/plugin.pb.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/stubs/strutil.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-
-CodeGenerator::~CodeGenerator() {}
-
-bool CodeGenerator::GenerateAll(const std::vector<const FileDescriptor*>& files,
-                                const std::string& parameter,
-                                GeneratorContext* generator_context,
-                                std::string* error) const {
-  // Default implementation is just to call the per file method, and prefix any
-  // error string with the file to provide context.
-  bool succeeded = true;
-  for (int i = 0; i < files.size(); i++) {
-    const FileDescriptor* file = files[i];
-    succeeded = Generate(file, parameter, generator_context, error);
-    if (!succeeded && error && error->empty()) {
-      *error =
-          "Code generator returned false but provided no error "
-          "description.";
-    }
-    if (error && !error->empty()) {
-      *error = file->name() + ": " + *error;
-      break;
-    }
-    if (!succeeded) {
-      break;
-    }
-  }
-  return succeeded;
-}
-
-GeneratorContext::~GeneratorContext() {}
-
-io::ZeroCopyOutputStream* GeneratorContext::OpenForAppend(
-    const std::string& filename) {
-  return nullptr;
-}
-
-io::ZeroCopyOutputStream* GeneratorContext::OpenForInsert(
-    const std::string& filename, const std::string& insertion_point) {
-  GOOGLE_LOG(FATAL) << "This GeneratorContext does not support insertion.";
-  return nullptr;  // make compiler happy
-}
-
-io::ZeroCopyOutputStream* GeneratorContext::OpenForInsertWithGeneratedCodeInfo(
-    const std::string& filename, const std::string& insertion_point,
-    const google::protobuf::GeneratedCodeInfo& /*info*/) {
-  return OpenForInsert(filename, insertion_point);
-}
-
-void GeneratorContext::ListParsedFiles(
-    std::vector<const FileDescriptor*>* output) {
-  GOOGLE_LOG(FATAL) << "This GeneratorContext does not support ListParsedFiles";
-}
-
-void GeneratorContext::GetCompilerVersion(Version* version) const {
-  version->set_major(GOOGLE_PROTOBUF_VERSION / 1000000);
-  version->set_minor(GOOGLE_PROTOBUF_VERSION / 1000 % 1000);
-  version->set_patch(GOOGLE_PROTOBUF_VERSION % 1000);
-  version->set_suffix(GOOGLE_PROTOBUF_VERSION_SUFFIX);
-}
-
-// Parses a set of comma-delimited name/value pairs.
-void ParseGeneratorParameter(
-    const std::string& text,
-    std::vector<std::pair<std::string, std::string> >* output) {
-  std::vector<std::string> parts = Split(text, ",", true);
-
-  for (int i = 0; i < parts.size(); i++) {
-    std::string::size_type equals_pos = parts[i].find_first_of('=');
-    std::pair<std::string, std::string> value;
-    if (equals_pos == std::string::npos) {
-      value.first = parts[i];
-      value.second = "";
-    } else {
-      value.first = parts[i].substr(0, equals_pos);
-      value.second = parts[i].substr(equals_pos + 1);
-    }
-    output->push_back(value);
-  }
-}
-
-// Strips ".proto" or ".protodevel" from the end of a filename.
-std::string StripProto(const std::string& filename) {
-  if (HasSuffixString(filename, ".protodevel")) {
-    return StripSuffixString(filename, ".protodevel");
-  } else {
-    return StripSuffixString(filename, ".proto");
-  }
-}
-
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/compiler/code_generator.h b/libs/protobuf/src/google/protobuf/compiler/code_generator.h
deleted file mode 100644
index 9c0b115..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/code_generator.h
+++ /dev/null
@@ -1,207 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-//
-// Defines the abstract interface implemented by each of the language-specific
-// code generators.
-
-#ifndef GOOGLE_PROTOBUF_COMPILER_CODE_GENERATOR_H__
-#define GOOGLE_PROTOBUF_COMPILER_CODE_GENERATOR_H__
-
-#include <string>
-#include <utility>
-#include <vector>
-#include <google/protobuf/stubs/common.h>
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-
-namespace io {
-class ZeroCopyOutputStream;
-}
-class FileDescriptor;
-class GeneratedCodeInfo;
-
-namespace compiler {
-class AccessInfoMap;
-
-class Version;
-
-// Defined in this file.
-class CodeGenerator;
-class GeneratorContext;
-
-// The abstract interface to a class which generates code implementing a
-// particular proto file in a particular language.  A number of these may
-// be registered with CommandLineInterface to support various languages.
-class PROTOC_EXPORT CodeGenerator {
- public:
-  inline CodeGenerator() {}
-  virtual ~CodeGenerator();
-
-  // Generates code for the given proto file, generating one or more files in
-  // the given output directory.
-  //
-  // A parameter to be passed to the generator can be specified on the command
-  // line. This is intended to be used to pass generator specific parameters.
-  // It is empty if no parameter was given. ParseGeneratorParameter (below),
-  // can be used to accept multiple parameters within the single parameter
-  // command line flag.
-  //
-  // Returns true if successful.  Otherwise, sets *error to a description of
-  // the problem (e.g. "invalid parameter") and returns false.
-  virtual bool Generate(const FileDescriptor* file,
-                        const std::string& parameter,
-                        GeneratorContext* generator_context,
-                        std::string* error) const = 0;
-
-  // Generates code for all given proto files.
-  //
-  // WARNING: The canonical code generator design produces one or two output
-  // files per input .proto file, and we do not wish to encourage alternate
-  // designs.
-  //
-  // A parameter is given as passed on the command line, as in |Generate()|
-  // above.
-  //
-  // Returns true if successful.  Otherwise, sets *error to a description of
-  // the problem (e.g. "invalid parameter") and returns false.
-  virtual bool GenerateAll(const std::vector<const FileDescriptor*>& files,
-                           const std::string& parameter,
-                           GeneratorContext* generator_context,
-                           std::string* error) const;
-
-  // This must be kept in sync with plugin.proto. See that file for
-  // documentation on each value.
-  enum Feature {
-    FEATURE_PROTO3_OPTIONAL = 1,
-  };
-
-  // Implement this to indicate what features this code generator supports.
-  //
-  // This must be a bitwise OR of values from the Feature enum above (or zero).
-  virtual uint64_t GetSupportedFeatures() const { return 0; }
-
-  // This is no longer used, but this class is part of the opensource protobuf
-  // library, so it has to remain to keep vtables the same for the current
-  // version of the library. When protobufs does a api breaking change, the
-  // method can be removed.
-  virtual bool HasGenerateAll() const { return true; }
-
- private:
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(CodeGenerator);
-};
-
-// CodeGenerators generate one or more files in a given directory.  This
-// abstract interface represents the directory to which the CodeGenerator is
-// to write and other information about the context in which the Generator
-// runs.
-class PROTOC_EXPORT GeneratorContext {
- public:
-  inline GeneratorContext() {
-  }
-  virtual ~GeneratorContext();
-
-  // Opens the given file, truncating it if it exists, and returns a
-  // ZeroCopyOutputStream that writes to the file.  The caller takes ownership
-  // of the returned object.  This method never fails (a dummy stream will be
-  // returned instead).
-  //
-  // The filename given should be relative to the root of the source tree.
-  // E.g. the C++ generator, when generating code for "foo/bar.proto", will
-  // generate the files "foo/bar.pb.h" and "foo/bar.pb.cc"; note that
-  // "foo/" is included in these filenames.  The filename is not allowed to
-  // contain "." or ".." components.
-  virtual io::ZeroCopyOutputStream* Open(const std::string& filename) = 0;
-
-  // Similar to Open() but the output will be appended to the file if exists
-  virtual io::ZeroCopyOutputStream* OpenForAppend(const std::string& filename);
-
-  // Creates a ZeroCopyOutputStream which will insert code into the given file
-  // at the given insertion point.  See plugin.proto (plugin.pb.h) for more
-  // information on insertion points.  The default implementation
-  // assert-fails -- it exists only for backwards-compatibility.
-  //
-  // WARNING:  This feature is currently EXPERIMENTAL and is subject to change.
-  virtual io::ZeroCopyOutputStream* OpenForInsert(
-      const std::string& filename, const std::string& insertion_point);
-
-  // Similar to OpenForInsert, but if `info` is non-empty, will open (or create)
-  // filename.pb.meta and insert info at the appropriate place with the
-  // necessary shifts. The default implementation ignores `info`.
-  //
-  // WARNING:  This feature will be REMOVED in the near future.
-  virtual io::ZeroCopyOutputStream* OpenForInsertWithGeneratedCodeInfo(
-      const std::string& filename, const std::string& insertion_point,
-      const google::protobuf::GeneratedCodeInfo& info);
-
-  // Returns a vector of FileDescriptors for all the files being compiled
-  // in this run.  Useful for languages, such as Go, that treat files
-  // differently when compiled as a set rather than individually.
-  virtual void ListParsedFiles(std::vector<const FileDescriptor*>* output);
-
-  // Retrieves the version number of the protocol compiler associated with
-  // this GeneratorContext.
-  virtual void GetCompilerVersion(Version* version) const;
-
-
- private:
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(GeneratorContext);
-};
-
-// The type GeneratorContext was once called OutputDirectory. This typedef
-// provides backward compatibility.
-typedef GeneratorContext OutputDirectory;
-
-// Several code generators treat the parameter argument as holding a
-// list of options separated by commas.  This helper function parses
-// a set of comma-delimited name/value pairs: e.g.,
-//   "foo=bar,baz,moo=corge"
-// parses to the pairs:
-//   ("foo", "bar"), ("baz", ""), ("moo", "corge")
-PROTOC_EXPORT void ParseGeneratorParameter(
-    const std::string&, std::vector<std::pair<std::string, std::string> >*);
-
-// Strips ".proto" or ".protodevel" from the end of a filename.
-PROTOC_EXPORT std::string StripProto(const std::string& filename);
-
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
-
-#endif  // GOOGLE_PROTOBUF_COMPILER_CODE_GENERATOR_H__
diff --git a/libs/protobuf/src/google/protobuf/compiler/command_line_interface.cc b/libs/protobuf/src/google/protobuf/compiler/command_line_interface.cc
deleted file mode 100644
index 5e9a2c4..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/command_line_interface.cc
+++ /dev/null
@@ -1,2622 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-
-#include <google/protobuf/compiler/command_line_interface.h>
-
-#include <google/protobuf/stubs/platform_macros.h>
-
-#include <stdio.h>
-#include <sys/types.h>
-#ifdef major
-#undef major
-#endif
-#ifdef minor
-#undef minor
-#endif
-#include <fcntl.h>
-#include <sys/stat.h>
-#ifndef _MSC_VER
-#include <unistd.h>
-#endif
-#include <ctype.h>
-#include <errno.h>
-
-#include <fstream>
-#include <iostream>
-
-#include <limits.h>  // For PATH_MAX
-
-#include <memory>
-
-#if defined(__APPLE__)
-#include <mach-o/dyld.h>
-#elif defined(__FreeBSD__)
-#include <sys/sysctl.h>
-#endif
-
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/stubs/logging.h>
-#include <google/protobuf/compiler/subprocess.h>
-#include <google/protobuf/compiler/plugin.pb.h>
-#include <google/protobuf/stubs/strutil.h>
-#include <google/protobuf/stubs/stringprintf.h>
-#include <google/protobuf/stubs/substitute.h>
-#include <google/protobuf/compiler/code_generator.h>
-#include <google/protobuf/compiler/importer.h>
-#include <google/protobuf/compiler/zip_writer.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/dynamic_message.h>
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/io/io_win32.h>
-#include <google/protobuf/io/printer.h>
-#include <google/protobuf/io/zero_copy_stream_impl.h>
-#include <google/protobuf/text_format.h>
-#include <google/protobuf/stubs/map_util.h>
-#include <google/protobuf/stubs/stl_util.h>
-
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-
-#ifndef O_BINARY
-#ifdef _O_BINARY
-#define O_BINARY _O_BINARY
-#else
-#define O_BINARY 0  // If this isn't defined, the platform doesn't need it.
-#endif
-#endif
-
-namespace {
-#if defined(_WIN32)
-// DO NOT include <io.h>, instead create functions in io_win32.{h,cc} and import
-// them like we do below.
-using google::protobuf::io::win32::access;
-using google::protobuf::io::win32::close;
-using google::protobuf::io::win32::mkdir;
-using google::protobuf::io::win32::open;
-using google::protobuf::io::win32::setmode;
-using google::protobuf::io::win32::write;
-#endif
-
-static const char* kDefaultDirectDependenciesViolationMsg =
-    "File is imported but not declared in --direct_dependencies: %s";
-
-// Returns true if the text looks like a Windows-style absolute path, starting
-// with a drive letter.  Example:  "C:\foo".  TODO(kenton):  Share this with
-// copy in importer.cc?
-static bool IsWindowsAbsolutePath(const std::string& text) {
-#if defined(_WIN32) || defined(__CYGWIN__)
-  return text.size() >= 3 && text[1] == ':' && isalpha(text[0]) &&
-         (text[2] == '/' || text[2] == '\\') && text.find_last_of(':') == 1;
-#else
-  return false;
-#endif
-}
-
-void SetFdToTextMode(int fd) {
-#ifdef _WIN32
-  if (setmode(fd, _O_TEXT) == -1) {
-    // This should never happen, I think.
-    GOOGLE_LOG(WARNING) << "setmode(" << fd << ", _O_TEXT): " << strerror(errno);
-  }
-#endif
-  // (Text and binary are the same on non-Windows platforms.)
-}
-
-void SetFdToBinaryMode(int fd) {
-#ifdef _WIN32
-  if (setmode(fd, _O_BINARY) == -1) {
-    // This should never happen, I think.
-    GOOGLE_LOG(WARNING) << "setmode(" << fd << ", _O_BINARY): " << strerror(errno);
-  }
-#endif
-  // (Text and binary are the same on non-Windows platforms.)
-}
-
-void AddTrailingSlash(std::string* path) {
-  if (!path->empty() && path->at(path->size() - 1) != '/') {
-    path->push_back('/');
-  }
-}
-
-bool VerifyDirectoryExists(const std::string& path) {
-  if (path.empty()) return true;
-
-  if (access(path.c_str(), F_OK) == -1) {
-    std::cerr << path << ": " << strerror(errno) << std::endl;
-    return false;
-  } else {
-    return true;
-  }
-}
-
-// Try to create the parent directory of the given file, creating the parent's
-// parent if necessary, and so on.  The full file name is actually
-// (prefix + filename), but we assume |prefix| already exists and only create
-// directories listed in |filename|.
-bool TryCreateParentDirectory(const std::string& prefix,
-                              const std::string& filename) {
-  // Recursively create parent directories to the output file.
-  // On Windows, both '/' and '\' are valid path separators.
-  std::vector<std::string> parts =
-      Split(filename, "/\\", true);
-  std::string path_so_far = prefix;
-  for (int i = 0; i < parts.size() - 1; i++) {
-    path_so_far += parts[i];
-    if (mkdir(path_so_far.c_str(), 0777) != 0) {
-      if (errno != EEXIST) {
-        std::cerr << filename << ": while trying to create directory "
-                  << path_so_far << ": " << strerror(errno) << std::endl;
-        return false;
-      }
-    }
-    path_so_far += '/';
-  }
-
-  return true;
-}
-
-// Get the absolute path of this protoc binary.
-bool GetProtocAbsolutePath(std::string* path) {
-#ifdef _WIN32
-  char buffer[MAX_PATH];
-  int len = GetModuleFileNameA(nullptr, buffer, MAX_PATH);
-#elif defined(__APPLE__)
-  char buffer[PATH_MAX];
-  int len = 0;
-
-  char dirtybuffer[PATH_MAX];
-  uint32_t size = sizeof(dirtybuffer);
-  if (_NSGetExecutablePath(dirtybuffer, &size) == 0) {
-    realpath(dirtybuffer, buffer);
-    len = strlen(buffer);
-  }
-#elif defined(__FreeBSD__)
-  char buffer[PATH_MAX];
-  size_t len = PATH_MAX;
-  int mib[4] = {CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1};
-  if (sysctl(mib, 4, &buffer, &len, nullptr, 0) != 0) {
-    len = 0;
-  }
-#else
-  char buffer[PATH_MAX];
-  int len = readlink("/proc/self/exe", buffer, PATH_MAX);
-#endif
-  if (len > 0) {
-    path->assign(buffer, len);
-    return true;
-  } else {
-    return false;
-  }
-}
-
-// Whether a path is where google/protobuf/descriptor.proto and other well-known
-// type protos are installed.
-bool IsInstalledProtoPath(const std::string& path) {
-  // Checking the descriptor.proto file should be good enough.
-  std::string file_path = path + "/google/protobuf/descriptor.proto";
-  return access(file_path.c_str(), F_OK) != -1;
-}
-
-// Add the paths where google/protobuf/descriptor.proto and other well-known
-// type protos are installed.
-void AddDefaultProtoPaths(
-    std::vector<std::pair<std::string, std::string>>* paths) {
-  // TODO(xiaofeng): The code currently only checks relative paths of where
-  // the protoc binary is installed. We probably should make it handle more
-  // cases than that.
-  std::string path;
-  if (!GetProtocAbsolutePath(&path)) {
-    return;
-  }
-  // Strip the binary name.
-  size_t pos = path.find_last_of("/\\");
-  if (pos == std::string::npos || pos == 0) {
-    return;
-  }
-  path = path.substr(0, pos);
-  // Check the binary's directory.
-  if (IsInstalledProtoPath(path)) {
-    paths->push_back(std::pair<std::string, std::string>("", path));
-    return;
-  }
-  // Check if there is an include subdirectory.
-  if (IsInstalledProtoPath(path + "/include")) {
-    paths->push_back(
-        std::pair<std::string, std::string>("", path + "/include"));
-    return;
-  }
-  // Check if the upper level directory has an "include" subdirectory.
-  pos = path.find_last_of("/\\");
-  if (pos == std::string::npos || pos == 0) {
-    return;
-  }
-  path = path.substr(0, pos);
-  if (IsInstalledProtoPath(path + "/include")) {
-    paths->push_back(
-        std::pair<std::string, std::string>("", path + "/include"));
-    return;
-  }
-}
-
-std::string PluginName(const std::string& plugin_prefix,
-                       const std::string& directive) {
-  // Assuming the directive starts with "--" and ends with "_out" or "_opt",
-  // strip the "--" and "_out/_opt" and add the plugin prefix.
-  return plugin_prefix + "gen-" + directive.substr(2, directive.size() - 6);
-}
-
-}  // namespace
-
-// A MultiFileErrorCollector that prints errors to stderr.
-class CommandLineInterface::ErrorPrinter
-    : public MultiFileErrorCollector,
-      public io::ErrorCollector,
-      public DescriptorPool::ErrorCollector {
- public:
-  ErrorPrinter(ErrorFormat format, DiskSourceTree* tree = nullptr)
-      : format_(format),
-        tree_(tree),
-        found_errors_(false),
-        found_warnings_(false) {}
-  ~ErrorPrinter() override {}
-
-  // implements MultiFileErrorCollector ------------------------------
-  void AddError(const std::string& filename, int line, int column,
-                const std::string& message) override {
-    found_errors_ = true;
-    AddErrorOrWarning(filename, line, column, message, "error", std::cerr);
-  }
-
-  void AddWarning(const std::string& filename, int line, int column,
-                  const std::string& message) override {
-    found_warnings_ = true;
-    AddErrorOrWarning(filename, line, column, message, "warning", std::clog);
-  }
-
-  // implements io::ErrorCollector -----------------------------------
-  void AddError(int line, int column, const std::string& message) override {
-    AddError("input", line, column, message);
-  }
-
-  void AddWarning(int line, int column, const std::string& message) override {
-    AddErrorOrWarning("input", line, column, message, "warning", std::clog);
-  }
-
-  // implements DescriptorPool::ErrorCollector-------------------------
-  void AddError(const std::string& filename, const std::string& element_name,
-                const Message* descriptor, ErrorLocation location,
-                const std::string& message) override {
-    AddErrorOrWarning(filename, -1, -1, message, "error", std::cerr);
-  }
-
-  void AddWarning(const std::string& filename, const std::string& element_name,
-                  const Message* descriptor, ErrorLocation location,
-                  const std::string& message) override {
-    AddErrorOrWarning(filename, -1, -1, message, "warning", std::clog);
-  }
-
-  bool FoundErrors() const { return found_errors_; }
-
-  bool FoundWarnings() const { return found_warnings_; }
-
- private:
-  void AddErrorOrWarning(const std::string& filename, int line, int column,
-                         const std::string& message, const std::string& type,
-                         std::ostream& out) {
-    // Print full path when running under MSVS
-    std::string dfile;
-    if (format_ == CommandLineInterface::ERROR_FORMAT_MSVS &&
-        tree_ != nullptr && tree_->VirtualFileToDiskFile(filename, &dfile)) {
-      out << dfile;
-    } else {
-      out << filename;
-    }
-
-    // Users typically expect 1-based line/column numbers, so we add 1
-    // to each here.
-    if (line != -1) {
-      // Allow for both GCC- and Visual-Studio-compatible output.
-      switch (format_) {
-        case CommandLineInterface::ERROR_FORMAT_GCC:
-          out << ":" << (line + 1) << ":" << (column + 1);
-          break;
-        case CommandLineInterface::ERROR_FORMAT_MSVS:
-          out << "(" << (line + 1) << ") : " << type
-              << " in column=" << (column + 1);
-          break;
-      }
-    }
-
-    if (type == "warning") {
-      out << ": warning: " << message << std::endl;
-    } else {
-      out << ": " << message << std::endl;
-    }
-  }
-
-  const ErrorFormat format_;
-  DiskSourceTree* tree_;
-  bool found_errors_;
-  bool found_warnings_;
-};
-
-// -------------------------------------------------------------------
-
-// A GeneratorContext implementation that buffers files in memory, then dumps
-// them all to disk on demand.
-class CommandLineInterface::GeneratorContextImpl : public GeneratorContext {
- public:
-  GeneratorContextImpl(const std::vector<const FileDescriptor*>& parsed_files);
-
-  // Write all files in the directory to disk at the given output location,
-  // which must end in a '/'.
-  bool WriteAllToDisk(const std::string& prefix);
-
-  // Write the contents of this directory to a ZIP-format archive with the
-  // given name.
-  bool WriteAllToZip(const std::string& filename);
-
-  // Add a boilerplate META-INF/MANIFEST.MF file as required by the Java JAR
-  // format, unless one has already been written.
-  void AddJarManifest();
-
-  // Get name of all output files.
-  void GetOutputFilenames(std::vector<std::string>* output_filenames);
-
-  // implements GeneratorContext --------------------------------------
-  io::ZeroCopyOutputStream* Open(const std::string& filename) override;
-  io::ZeroCopyOutputStream* OpenForAppend(const std::string& filename) override;
-  io::ZeroCopyOutputStream* OpenForInsert(
-      const std::string& filename, const std::string& insertion_point) override;
-  io::ZeroCopyOutputStream* OpenForInsertWithGeneratedCodeInfo(
-      const std::string& filename, const std::string& insertion_point,
-      const google::protobuf::GeneratedCodeInfo& info) override;
-  void ListParsedFiles(std::vector<const FileDescriptor*>* output) override {
-    *output = parsed_files_;
-  }
-
- private:
-  friend class MemoryOutputStream;
-
-  // The files_ field maps from path keys to file content values. It's a map
-  // instead of an unordered_map so that files are written in order (good when
-  // writing zips).
-  std::map<std::string, std::string> files_;
-  const std::vector<const FileDescriptor*>& parsed_files_;
-  bool had_error_;
-};
-
-class CommandLineInterface::MemoryOutputStream
-    : public io::ZeroCopyOutputStream {
- public:
-  MemoryOutputStream(GeneratorContextImpl* directory,
-                     const std::string& filename, bool append_mode);
-  MemoryOutputStream(GeneratorContextImpl* directory,
-                     const std::string& filename,
-                     const std::string& insertion_point);
-  MemoryOutputStream(GeneratorContextImpl* directory,
-                     const std::string& filename,
-                     const std::string& insertion_point,
-                     const google::protobuf::GeneratedCodeInfo& info);
-  ~MemoryOutputStream() override;
-
-  // implements ZeroCopyOutputStream ---------------------------------
-  bool Next(void** data, int* size) override {
-    return inner_->Next(data, size);
-  }
-  void BackUp(int count) override { inner_->BackUp(count); }
-  int64_t ByteCount() const override { return inner_->ByteCount(); }
-
- private:
-  // Checks to see if "filename_.pb.meta" exists in directory_; if so, fixes the
-  // offsets in that GeneratedCodeInfo record to reflect bytes inserted in
-  // filename_ at original offset insertion_offset with length insertion_length.
-  // Also adds in the data from info_to_insert_ with updated offsets governed by
-  // insertion_offset and indent_length. We assume that insertions will not
-  // occur within any given annotated span of text. insertion_content must end
-  // with an endline.
-  void UpdateMetadata(const std::string& insertion_content,
-                      size_t insertion_offset, size_t insertion_length,
-                      size_t indent_length);
-
-  // Inserts info_to_insert_ into target_info, assuming that the relevant
-  // insertion was made at insertion_offset in file_content with the given
-  // indent_length. insertion_content must end with an endline.
-  void InsertShiftedInfo(const std::string& insertion_content,
-                         size_t insertion_offset, size_t indent_length,
-                         google::protobuf::GeneratedCodeInfo& target_info);
-
-  // Where to insert the string when it's done.
-  GeneratorContextImpl* directory_;
-  std::string filename_;
-  std::string insertion_point_;
-
-  // The string we're building.
-  std::string data_;
-
-  // Whether we should append the output stream to the existing file.
-  bool append_mode_;
-
-  // StringOutputStream writing to data_.
-  std::unique_ptr<io::StringOutputStream> inner_;
-
-  // The GeneratedCodeInfo to insert at the insertion point.
-  google::protobuf::GeneratedCodeInfo info_to_insert_;
-};
-
-// -------------------------------------------------------------------
-
-CommandLineInterface::GeneratorContextImpl::GeneratorContextImpl(
-    const std::vector<const FileDescriptor*>& parsed_files)
-    : parsed_files_(parsed_files), had_error_(false) {}
-
-bool CommandLineInterface::GeneratorContextImpl::WriteAllToDisk(
-    const std::string& prefix) {
-  if (had_error_) {
-    return false;
-  }
-
-  if (!VerifyDirectoryExists(prefix)) {
-    return false;
-  }
-
-  for (const auto& pair : files_) {
-    const std::string& relative_filename = pair.first;
-    const char* data = pair.second.data();
-    int size = pair.second.size();
-
-    if (!TryCreateParentDirectory(prefix, relative_filename)) {
-      return false;
-    }
-    std::string filename = prefix + relative_filename;
-
-    // Create the output file.
-    int file_descriptor;
-    do {
-      file_descriptor =
-          open(filename.c_str(), O_WRONLY | O_CREAT | O_TRUNC | O_BINARY, 0666);
-    } while (file_descriptor < 0 && errno == EINTR);
-
-    if (file_descriptor < 0) {
-      int error = errno;
-      std::cerr << filename << ": " << strerror(error);
-      return false;
-    }
-
-    // Write the file.
-    while (size > 0) {
-      int write_result;
-      do {
-        write_result = write(file_descriptor, data, size);
-      } while (write_result < 0 && errno == EINTR);
-
-      if (write_result <= 0) {
-        // Write error.
-
-        // FIXME(kenton):  According to the man page, if write() returns zero,
-        //   there was no error; write() simply did not write anything.  It's
-        //   unclear under what circumstances this might happen, but presumably
-        //   errno won't be set in this case.  I am confused as to how such an
-        //   event should be handled.  For now I'm treating it as an error,
-        //   since retrying seems like it could lead to an infinite loop.  I
-        //   suspect this never actually happens anyway.
-
-        if (write_result < 0) {
-          int error = errno;
-          std::cerr << filename << ": write: " << strerror(error);
-        } else {
-          std::cerr << filename << ": write() returned zero?" << std::endl;
-        }
-        return false;
-      }
-
-      data += write_result;
-      size -= write_result;
-    }
-
-    if (close(file_descriptor) != 0) {
-      int error = errno;
-      std::cerr << filename << ": close: " << strerror(error);
-      return false;
-    }
-  }
-
-  return true;
-}
-
-bool CommandLineInterface::GeneratorContextImpl::WriteAllToZip(
-    const std::string& filename) {
-  if (had_error_) {
-    return false;
-  }
-
-  // Create the output file.
-  int file_descriptor;
-  do {
-    file_descriptor =
-        open(filename.c_str(), O_WRONLY | O_CREAT | O_TRUNC | O_BINARY, 0666);
-  } while (file_descriptor < 0 && errno == EINTR);
-
-  if (file_descriptor < 0) {
-    int error = errno;
-    std::cerr << filename << ": " << strerror(error);
-    return false;
-  }
-
-  // Create the ZipWriter
-  io::FileOutputStream stream(file_descriptor);
-  ZipWriter zip_writer(&stream);
-
-  for (const auto& pair : files_) {
-    zip_writer.Write(pair.first, pair.second);
-  }
-
-  zip_writer.WriteDirectory();
-
-  if (stream.GetErrno() != 0) {
-    std::cerr << filename << ": " << strerror(stream.GetErrno()) << std::endl;
-    return false;
-  }
-
-  if (!stream.Close()) {
-    std::cerr << filename << ": " << strerror(stream.GetErrno()) << std::endl;
-    return false;
-  }
-
-  return true;
-}
-
-void CommandLineInterface::GeneratorContextImpl::AddJarManifest() {
-  auto pair = files_.insert({"META-INF/MANIFEST.MF", ""});
-  if (pair.second) {
-    pair.first->second =
-        "Manifest-Version: 1.0\n"
-        "Created-By: 1.6.0 (protoc)\n"
-        "\n";
-  }
-}
-
-void CommandLineInterface::GeneratorContextImpl::GetOutputFilenames(
-    std::vector<std::string>* output_filenames) {
-  for (const auto& pair : files_) {
-    output_filenames->push_back(pair.first);
-  }
-}
-
-io::ZeroCopyOutputStream* CommandLineInterface::GeneratorContextImpl::Open(
-    const std::string& filename) {
-  return new MemoryOutputStream(this, filename, false);
-}
-
-io::ZeroCopyOutputStream*
-CommandLineInterface::GeneratorContextImpl::OpenForAppend(
-    const std::string& filename) {
-  return new MemoryOutputStream(this, filename, true);
-}
-
-io::ZeroCopyOutputStream*
-CommandLineInterface::GeneratorContextImpl::OpenForInsert(
-    const std::string& filename, const std::string& insertion_point) {
-  return new MemoryOutputStream(this, filename, insertion_point);
-}
-
-io::ZeroCopyOutputStream*
-CommandLineInterface::GeneratorContextImpl::OpenForInsertWithGeneratedCodeInfo(
-    const std::string& filename, const std::string& insertion_point,
-    const google::protobuf::GeneratedCodeInfo& info) {
-  return new MemoryOutputStream(this, filename, insertion_point, info);
-}
-
-// -------------------------------------------------------------------
-
-CommandLineInterface::MemoryOutputStream::MemoryOutputStream(
-    GeneratorContextImpl* directory, const std::string& filename,
-    bool append_mode)
-    : directory_(directory),
-      filename_(filename),
-      append_mode_(append_mode),
-      inner_(new io::StringOutputStream(&data_)) {}
-
-CommandLineInterface::MemoryOutputStream::MemoryOutputStream(
-    GeneratorContextImpl* directory, const std::string& filename,
-    const std::string& insertion_point)
-    : directory_(directory),
-      filename_(filename),
-      insertion_point_(insertion_point),
-      inner_(new io::StringOutputStream(&data_)) {}
-
-CommandLineInterface::MemoryOutputStream::MemoryOutputStream(
-    GeneratorContextImpl* directory, const std::string& filename,
-    const std::string& insertion_point, const google::protobuf::GeneratedCodeInfo& info)
-    : directory_(directory),
-      filename_(filename),
-      insertion_point_(insertion_point),
-      inner_(new io::StringOutputStream(&data_)),
-      info_to_insert_(info) {}
-
-void CommandLineInterface::MemoryOutputStream::InsertShiftedInfo(
-    const std::string& insertion_content, size_t insertion_offset,
-    size_t indent_length, google::protobuf::GeneratedCodeInfo& target_info) {
-  // Keep track of how much extra data was added for indents before the
-  // current annotation being inserted. `pos` and `source_annotation.begin()`
-  // are offsets in `insertion_content`. `insertion_offset` is updated so that
-  // it can be added to an annotation's `begin` field to reflect that
-  // annotation's updated location after `insertion_content` was inserted into
-  // the target file.
-  size_t pos = 0;
-  insertion_offset += indent_length;
-  for (const auto& source_annotation : info_to_insert_.annotation()) {
-    GeneratedCodeInfo::Annotation* annotation = target_info.add_annotation();
-    int inner_indent = 0;
-    // insertion_content is guaranteed to end in an endline. This last endline
-    // has no effect on indentation.
-    for (; pos < source_annotation.end() && pos < insertion_content.size() - 1;
-         ++pos) {
-      if (insertion_content[pos] == '\n') {
-        if (pos >= source_annotation.begin()) {
-          // The beginning of the annotation is at insertion_offset, but the end
-          // can still move further in the target file.
-          inner_indent += indent_length;
-        } else {
-          insertion_offset += indent_length;
-        }
-      }
-    }
-    *annotation = source_annotation;
-    annotation->set_begin(annotation->begin() + insertion_offset);
-    insertion_offset += inner_indent;
-    annotation->set_end(annotation->end() + insertion_offset);
-  }
-}
-
-void CommandLineInterface::MemoryOutputStream::UpdateMetadata(
-    const std::string& insertion_content, size_t insertion_offset,
-    size_t insertion_length, size_t indent_length) {
-  auto it = directory_->files_.find(filename_ + ".pb.meta");
-  if (it == directory_->files_.end() && info_to_insert_.annotation().empty()) {
-    // No metadata was recorded for this file.
-    return;
-  }
-  GeneratedCodeInfo metadata;
-  bool is_text_format = false;
-  std::string* encoded_data = nullptr;
-  if (it != directory_->files_.end()) {
-    encoded_data = &it->second;
-    // Try to decode a GeneratedCodeInfo proto from the .pb.meta file. It may be
-    // in wire or text format. Keep the same format when the data is written out
-    // later.
-    if (!metadata.ParseFromString(*encoded_data)) {
-      if (!TextFormat::ParseFromString(*encoded_data, &metadata)) {
-        // The metadata is invalid.
-        std::cerr
-            << filename_
-            << ".pb.meta: Could not parse metadata as wire or text format."
-            << std::endl;
-        return;
-      }
-      // Generators that use the public plugin interface emit text-format
-      // metadata (because in the public plugin protocol, file content must be
-      // UTF8-encoded strings).
-      is_text_format = true;
-    }
-  } else {
-    // Create a new file to store the new metadata in info_to_insert_.
-    encoded_data =
-        &directory_->files_.insert({filename_ + ".pb.meta", ""}).first->second;
-  }
-  GeneratedCodeInfo new_metadata;
-  bool crossed_offset = false;
-  size_t to_add = 0;
-  for (const auto& source_annotation : metadata.annotation()) {
-    // The first time an annotation at or after the insertion point is found,
-    // insert the new metadata from info_to_insert_. Shift all annotations
-    // after the new metadata by the length of the text that was inserted
-    // (including any additional indent length).
-    if (source_annotation.begin() >= insertion_offset && !crossed_offset) {
-      crossed_offset = true;
-      InsertShiftedInfo(insertion_content, insertion_offset, indent_length,
-                        new_metadata);
-      to_add += insertion_length;
-    }
-    GeneratedCodeInfo::Annotation* annotation = new_metadata.add_annotation();
-    *annotation = source_annotation;
-    annotation->set_begin(annotation->begin() + to_add);
-    annotation->set_end(annotation->end() + to_add);
-  }
-  // If there were never any annotations at or after the insertion point,
-  // make sure to still insert the new metadata from info_to_insert_.
-  if (!crossed_offset) {
-    InsertShiftedInfo(insertion_content, insertion_offset, indent_length,
-                      new_metadata);
-  }
-  if (is_text_format) {
-    TextFormat::PrintToString(new_metadata, encoded_data);
-  } else {
-    new_metadata.SerializeToString(encoded_data);
-  }
-}
-
-CommandLineInterface::MemoryOutputStream::~MemoryOutputStream() {
-  // Make sure all data has been written.
-  inner_.reset();
-
-  // Insert into the directory.
-  auto pair = directory_->files_.insert({filename_, ""});
-  auto it = pair.first;
-  bool already_present = !pair.second;
-
-  if (insertion_point_.empty()) {
-    // This was just a regular Open().
-    if (already_present) {
-      if (append_mode_) {
-        it->second.append(data_);
-      } else {
-        std::cerr << filename_ << ": Tried to write the same file twice."
-                  << std::endl;
-        directory_->had_error_ = true;
-      }
-      return;
-    }
-
-    it->second.swap(data_);
-  } else {
-    // This was an OpenForInsert().
-
-    // If the data doesn't end with a clean line break, add one.
-    if (!data_.empty() && data_[data_.size() - 1] != '\n') {
-      data_.push_back('\n');
-    }
-
-    // Find the file we are going to insert into.
-    if (!already_present) {
-      std::cerr << filename_
-                << ": Tried to insert into file that doesn't exist."
-                << std::endl;
-      directory_->had_error_ = true;
-      return;
-    }
-    std::string* target = &it->second;
-
-    // Find the insertion point.
-    std::string magic_string =
-        strings::Substitute("@@protoc_insertion_point($0)", insertion_point_);
-    std::string::size_type pos = target->find(magic_string);
-
-    if (pos == std::string::npos) {
-      std::cerr << filename_ << ": insertion point \"" << insertion_point_
-                << "\" not found." << std::endl;
-      directory_->had_error_ = true;
-      return;
-    }
-
-    if ((pos > 3) && (target->substr(pos - 3, 2) == "/*")) {
-      // Support for inline "/* @@protoc_insertion_point() */"
-      pos = pos - 3;
-    } else {
-      // Seek backwards to the beginning of the line, which is where we will
-      // insert the data.  Note that this has the effect of pushing the
-      // insertion point down, so the data is inserted before it.  This is
-      // intentional because it means that multiple insertions at the same point
-      // will end up in the expected order in the final output.
-      pos = target->find_last_of('\n', pos);
-      if (pos == std::string::npos) {
-        // Insertion point is on the first line.
-        pos = 0;
-      } else {
-        // Advance to character after '\n'.
-        ++pos;
-      }
-    }
-
-    // Extract indent.
-    std::string indent_(*target, pos,
-                        target->find_first_not_of(" \t", pos) - pos);
-
-    if (indent_.empty()) {
-      // No indent.  This makes things easier.
-      target->insert(pos, data_);
-      UpdateMetadata(data_, pos, data_.size(), 0);
-    } else {
-      // Calculate how much space we need.
-      int indent_size = 0;
-      for (int i = 0; i < data_.size(); i++) {
-        if (data_[i] == '\n') indent_size += indent_.size();
-      }
-
-      // Make a hole for it.
-      target->insert(pos, data_.size() + indent_size, '\0');
-
-      // Now copy in the data.
-      std::string::size_type data_pos = 0;
-      char* target_ptr = ::google::protobuf::string_as_array(target) + pos;
-      while (data_pos < data_.size()) {
-        // Copy indent.
-        memcpy(target_ptr, indent_.data(), indent_.size());
-        target_ptr += indent_.size();
-
-        // Copy line from data_.
-        // We already guaranteed that data_ ends with a newline (above), so this
-        // search can't fail.
-        std::string::size_type line_length =
-            data_.find_first_of('\n', data_pos) + 1 - data_pos;
-        memcpy(target_ptr, data_.data() + data_pos, line_length);
-        target_ptr += line_length;
-        data_pos += line_length;
-      }
-      UpdateMetadata(data_, pos, data_.size() + indent_size, indent_.size());
-
-      GOOGLE_CHECK_EQ(target_ptr,
-               ::google::protobuf::string_as_array(target) + pos + data_.size() + indent_size);
-    }
-  }
-}
-
-// ===================================================================
-
-#if defined(_WIN32) && !defined(__CYGWIN__)
-const char* const CommandLineInterface::kPathSeparator = ";";
-#else
-const char* const CommandLineInterface::kPathSeparator = ":";
-#endif
-
-CommandLineInterface::CommandLineInterface()
-    : direct_dependencies_violation_msg_(
-          kDefaultDirectDependenciesViolationMsg) {}
-
-CommandLineInterface::~CommandLineInterface() {}
-
-void CommandLineInterface::RegisterGenerator(const std::string& flag_name,
-                                             CodeGenerator* generator,
-                                             const std::string& help_text) {
-  GeneratorInfo info;
-  info.flag_name = flag_name;
-  info.generator = generator;
-  info.help_text = help_text;
-  generators_by_flag_name_[flag_name] = info;
-}
-
-void CommandLineInterface::RegisterGenerator(
-    const std::string& flag_name, const std::string& option_flag_name,
-    CodeGenerator* generator, const std::string& help_text) {
-  GeneratorInfo info;
-  info.flag_name = flag_name;
-  info.option_flag_name = option_flag_name;
-  info.generator = generator;
-  info.help_text = help_text;
-  generators_by_flag_name_[flag_name] = info;
-  generators_by_option_name_[option_flag_name] = info;
-}
-
-void CommandLineInterface::AllowPlugins(const std::string& exe_name_prefix) {
-  plugin_prefix_ = exe_name_prefix;
-}
-
-namespace {
-
-bool ContainsProto3Optional(const Descriptor* desc) {
-  for (int i = 0; i < desc->field_count(); i++) {
-    if (desc->field(i)->has_optional_keyword()) {
-      return true;
-    }
-  }
-  for (int i = 0; i < desc->nested_type_count(); i++) {
-    if (ContainsProto3Optional(desc->nested_type(i))) {
-      return true;
-    }
-  }
-  return false;
-}
-
-bool ContainsProto3Optional(const FileDescriptor* file) {
-  if (file->syntax() == FileDescriptor::SYNTAX_PROTO3) {
-    for (int i = 0; i < file->message_type_count(); i++) {
-      if (ContainsProto3Optional(file->message_type(i))) {
-        return true;
-      }
-    }
-  }
-  return false;
-}
-
-}  // namespace
-
-namespace {
-std::unique_ptr<SimpleDescriptorDatabase>
-PopulateSingleSimpleDescriptorDatabase(const std::string& descriptor_set_name);
-}
-
-int CommandLineInterface::Run(int argc, const char* const argv[]) {
-  Clear();
-  switch (ParseArguments(argc, argv)) {
-    case PARSE_ARGUMENT_DONE_AND_EXIT:
-      return 0;
-    case PARSE_ARGUMENT_FAIL:
-      return 1;
-    case PARSE_ARGUMENT_DONE_AND_CONTINUE:
-      break;
-  }
-
-  std::vector<const FileDescriptor*> parsed_files;
-  std::unique_ptr<DiskSourceTree> disk_source_tree;
-  std::unique_ptr<ErrorPrinter> error_collector;
-  std::unique_ptr<DescriptorPool> descriptor_pool;
-
-  // The SimpleDescriptorDatabases here are the constituents of the
-  // MergedDescriptorDatabase descriptor_set_in_database, so this vector is for
-  // managing their lifetimes. Its scope should match descriptor_set_in_database
-  std::vector<std::unique_ptr<SimpleDescriptorDatabase>>
-      databases_per_descriptor_set;
-  std::unique_ptr<MergedDescriptorDatabase> descriptor_set_in_database;
-
-  std::unique_ptr<SourceTreeDescriptorDatabase> source_tree_database;
-
-  // Any --descriptor_set_in FileDescriptorSet objects will be used as a
-  // fallback to input_files on command line, so create that db first.
-  if (!descriptor_set_in_names_.empty()) {
-    for (const std::string& name : descriptor_set_in_names_) {
-      std::unique_ptr<SimpleDescriptorDatabase> database_for_descriptor_set =
-          PopulateSingleSimpleDescriptorDatabase(name);
-      if (!database_for_descriptor_set) {
-        return EXIT_FAILURE;
-      }
-      databases_per_descriptor_set.push_back(
-          std::move(database_for_descriptor_set));
-    }
-
-    std::vector<DescriptorDatabase*> raw_databases_per_descriptor_set;
-    raw_databases_per_descriptor_set.reserve(
-        databases_per_descriptor_set.size());
-    for (const std::unique_ptr<SimpleDescriptorDatabase>& db :
-         databases_per_descriptor_set) {
-      raw_databases_per_descriptor_set.push_back(db.get());
-    }
-    descriptor_set_in_database.reset(
-        new MergedDescriptorDatabase(raw_databases_per_descriptor_set));
-  }
-
-  if (proto_path_.empty()) {
-    // If there are no --proto_path flags, then just look in the specified
-    // --descriptor_set_in files.  But first, verify that the input files are
-    // there.
-    if (!VerifyInputFilesInDescriptors(descriptor_set_in_database.get())) {
-      return 1;
-    }
-
-    error_collector.reset(new ErrorPrinter(error_format_));
-    descriptor_pool.reset(new DescriptorPool(descriptor_set_in_database.get(),
-                                             error_collector.get()));
-  } else {
-    disk_source_tree.reset(new DiskSourceTree());
-    if (!InitializeDiskSourceTree(disk_source_tree.get(),
-                                  descriptor_set_in_database.get())) {
-      return 1;
-    }
-
-    error_collector.reset(
-        new ErrorPrinter(error_format_, disk_source_tree.get()));
-
-    source_tree_database.reset(new SourceTreeDescriptorDatabase(
-        disk_source_tree.get(), descriptor_set_in_database.get()));
-    source_tree_database->RecordErrorsTo(error_collector.get());
-
-    descriptor_pool.reset(new DescriptorPool(
-        source_tree_database.get(),
-        source_tree_database->GetValidationErrorCollector()));
-  }
-
-  descriptor_pool->EnforceWeakDependencies(true);
-  if (!ParseInputFiles(descriptor_pool.get(), disk_source_tree.get(),
-                       &parsed_files)) {
-    return 1;
-  }
-
-
-  // We construct a separate GeneratorContext for each output location.  Note
-  // that two code generators may output to the same location, in which case
-  // they should share a single GeneratorContext so that OpenForInsert() works.
-  GeneratorContextMap output_directories;
-
-  // Generate output.
-  if (mode_ == MODE_COMPILE) {
-    for (int i = 0; i < output_directives_.size(); i++) {
-      std::string output_location = output_directives_[i].output_location;
-      if (!HasSuffixString(output_location, ".zip") &&
-          !HasSuffixString(output_location, ".jar") &&
-          !HasSuffixString(output_location, ".srcjar")) {
-        AddTrailingSlash(&output_location);
-      }
-
-      auto& generator = output_directories[output_location];
-
-      if (!generator) {
-        // First time we've seen this output location.
-        generator.reset(new GeneratorContextImpl(parsed_files));
-      }
-
-      if (!GenerateOutput(parsed_files, output_directives_[i],
-                          generator.get())) {
-        return 1;
-      }
-    }
-  }
-
-  // Write all output to disk.
-  for (const auto& pair : output_directories) {
-    const std::string& location = pair.first;
-    GeneratorContextImpl* directory = pair.second.get();
-    if (HasSuffixString(location, "/")) {
-      if (!directory->WriteAllToDisk(location)) {
-        return 1;
-      }
-    } else {
-      if (HasSuffixString(location, ".jar")) {
-        directory->AddJarManifest();
-      }
-
-      if (!directory->WriteAllToZip(location)) {
-        return 1;
-      }
-    }
-  }
-
-  if (!dependency_out_name_.empty()) {
-    GOOGLE_DCHECK(disk_source_tree.get());
-    if (!GenerateDependencyManifestFile(parsed_files, output_directories,
-                                        disk_source_tree.get())) {
-      return 1;
-    }
-  }
-
-  if (!descriptor_set_out_name_.empty()) {
-    if (!WriteDescriptorSet(parsed_files)) {
-      return 1;
-    }
-  }
-
-  if (mode_ == MODE_ENCODE || mode_ == MODE_DECODE) {
-    if (codec_type_.empty()) {
-      // HACK:  Define an EmptyMessage type to use for decoding.
-      DescriptorPool pool;
-      FileDescriptorProto file;
-      file.set_name("empty_message.proto");
-      file.add_message_type()->set_name("EmptyMessage");
-      GOOGLE_CHECK(pool.BuildFile(file) != nullptr);
-      codec_type_ = "EmptyMessage";
-      if (!EncodeOrDecode(&pool)) {
-        return 1;
-      }
-    } else {
-      if (!EncodeOrDecode(descriptor_pool.get())) {
-        return 1;
-      }
-    }
-  }
-
-  if (error_collector->FoundErrors() ||
-      (fatal_warnings_ && error_collector->FoundWarnings())) {
-    return 1;
-  }
-
-  if (mode_ == MODE_PRINT) {
-    switch (print_mode_) {
-      case PRINT_FREE_FIELDS:
-        for (int i = 0; i < parsed_files.size(); ++i) {
-          const FileDescriptor* fd = parsed_files[i];
-          for (int j = 0; j < fd->message_type_count(); ++j) {
-            PrintFreeFieldNumbers(fd->message_type(j));
-          }
-        }
-        break;
-      case PRINT_NONE:
-        GOOGLE_LOG(ERROR) << "If the code reaches here, it usually means a bug of "
-                      "flag parsing in the CommandLineInterface.";
-        return 1;
-
-        // Do not add a default case.
-    }
-  }
-
-  return 0;
-}
-
-bool CommandLineInterface::InitializeDiskSourceTree(
-    DiskSourceTree* source_tree, DescriptorDatabase* fallback_database) {
-  AddDefaultProtoPaths(&proto_path_);
-
-  // Set up the source tree.
-  for (int i = 0; i < proto_path_.size(); i++) {
-    source_tree->MapPath(proto_path_[i].first, proto_path_[i].second);
-  }
-
-  // Map input files to virtual paths if possible.
-  if (!MakeInputsBeProtoPathRelative(source_tree, fallback_database)) {
-    return false;
-  }
-
-  return true;
-}
-
-namespace {
-std::unique_ptr<SimpleDescriptorDatabase>
-PopulateSingleSimpleDescriptorDatabase(const std::string& descriptor_set_name) {
-  int fd;
-  do {
-    fd = open(descriptor_set_name.c_str(), O_RDONLY | O_BINARY);
-  } while (fd < 0 && errno == EINTR);
-  if (fd < 0) {
-    std::cerr << descriptor_set_name << ": " << strerror(ENOENT) << std::endl;
-    return nullptr;
-  }
-
-  FileDescriptorSet file_descriptor_set;
-  bool parsed = file_descriptor_set.ParseFromFileDescriptor(fd);
-  if (close(fd) != 0) {
-    std::cerr << descriptor_set_name << ": close: " << strerror(errno)
-              << std::endl;
-    return nullptr;
-  }
-
-  if (!parsed) {
-    std::cerr << descriptor_set_name << ": Unable to parse." << std::endl;
-    return nullptr;
-  }
-
-  std::unique_ptr<SimpleDescriptorDatabase> database{
-      new SimpleDescriptorDatabase()};
-
-  for (int j = 0; j < file_descriptor_set.file_size(); j++) {
-    FileDescriptorProto previously_added_file_descriptor_proto;
-    if (database->FindFileByName(file_descriptor_set.file(j).name(),
-                                 &previously_added_file_descriptor_proto)) {
-      // already present - skip
-      continue;
-    }
-    if (!database->Add(file_descriptor_set.file(j))) {
-      return nullptr;
-    }
-  }
-  return database;
-}
-
-}  // namespace
-
-
-bool CommandLineInterface::VerifyInputFilesInDescriptors(
-    DescriptorDatabase* database) {
-  for (const auto& input_file : input_files_) {
-    FileDescriptorProto file_descriptor;
-    if (!database->FindFileByName(input_file, &file_descriptor)) {
-      std::cerr << "Could not find file in descriptor database: " << input_file
-                << ": " << strerror(ENOENT) << std::endl;
-      return false;
-    }
-
-    // Enforce --disallow_services.
-    if (disallow_services_ && file_descriptor.service_size() > 0) {
-      std::cerr << file_descriptor.name()
-                << ": This file contains services, but "
-                   "--disallow_services was used."
-                << std::endl;
-      return false;
-    }
-
-  }
-  return true;
-}
-
-bool CommandLineInterface::ParseInputFiles(
-    DescriptorPool* descriptor_pool, DiskSourceTree* source_tree,
-    std::vector<const FileDescriptor*>* parsed_files) {
-
-  if (!proto_path_.empty()) {
-    // Track unused imports in all source files that were loaded from the
-    // filesystem. We do not track unused imports for files loaded from
-    // descriptor sets as they may be programmatically generated in which case
-    // exerting this level of rigor is less desirable. We're also making the
-    // assumption that the initial parse of the proto from the filesystem
-    // was rigorous in checking unused imports and that the descriptor set
-    // being parsed was produced then and that it was subsequent mutations
-    // of that descriptor set that left unused imports.
-    //
-    // Note that relying on proto_path exclusively is limited in that we may
-    // be loading descriptors from both the filesystem and descriptor sets
-    // depending on the invocation. At least for invocations that are
-    // exclusively reading from descriptor sets, we can eliminate this failure
-    // condition.
-    for (const auto& input_file : input_files_) {
-      descriptor_pool->AddUnusedImportTrackFile(input_file);
-    }
-  }
-
-  bool result = true;
-  // Parse each file.
-  for (const auto& input_file : input_files_) {
-    // Import the file.
-    const FileDescriptor* parsed_file =
-        descriptor_pool->FindFileByName(input_file);
-    if (parsed_file == nullptr) {
-      result = false;
-      break;
-    }
-    parsed_files->push_back(parsed_file);
-
-    // Enforce --disallow_services.
-    if (disallow_services_ && parsed_file->service_count() > 0) {
-      std::cerr << parsed_file->name()
-                << ": This file contains services, but "
-                   "--disallow_services was used."
-                << std::endl;
-      result = false;
-      break;
-    }
-
-
-    // Enforce --direct_dependencies
-    if (direct_dependencies_explicitly_set_) {
-      bool indirect_imports = false;
-      for (int i = 0; i < parsed_file->dependency_count(); i++) {
-        if (direct_dependencies_.find(parsed_file->dependency(i)->name()) ==
-            direct_dependencies_.end()) {
-          indirect_imports = true;
-          std::cerr << parsed_file->name() << ": "
-                    << StringReplace(direct_dependencies_violation_msg_, "%s",
-                                     parsed_file->dependency(i)->name(),
-                                     true /* replace_all */)
-                    << std::endl;
-        }
-      }
-      if (indirect_imports) {
-        result = false;
-        break;
-      }
-    }
-  }
-  descriptor_pool->ClearUnusedImportTrackFiles();
-  return result;
-}
-
-void CommandLineInterface::Clear() {
-  // Clear all members that are set by Run().  Note that we must not clear
-  // members which are set by other methods before Run() is called.
-  executable_name_.clear();
-  proto_path_.clear();
-  input_files_.clear();
-  direct_dependencies_.clear();
-  direct_dependencies_violation_msg_ = kDefaultDirectDependenciesViolationMsg;
-  output_directives_.clear();
-  codec_type_.clear();
-  descriptor_set_in_names_.clear();
-  descriptor_set_out_name_.clear();
-  dependency_out_name_.clear();
-
-
-  mode_ = MODE_COMPILE;
-  print_mode_ = PRINT_NONE;
-  imports_in_descriptor_set_ = false;
-  source_info_in_descriptor_set_ = false;
-  disallow_services_ = false;
-  direct_dependencies_explicitly_set_ = false;
-  deterministic_output_ = false;
-}
-
-bool CommandLineInterface::MakeProtoProtoPathRelative(
-    DiskSourceTree* source_tree, std::string* proto,
-    DescriptorDatabase* fallback_database) {
-  // If it's in the fallback db, don't report non-existent file errors.
-  FileDescriptorProto fallback_file;
-  bool in_fallback_database =
-      fallback_database != nullptr &&
-      fallback_database->FindFileByName(*proto, &fallback_file);
-
-  // If the input file path is not a physical file path, it must be a virtual
-  // path.
-  if (access(proto->c_str(), F_OK) < 0) {
-    std::string disk_file;
-    if (source_tree->VirtualFileToDiskFile(*proto, &disk_file) ||
-        in_fallback_database) {
-      return true;
-    } else {
-      std::cerr << "Could not make proto path relative: " << *proto << ": "
-                << strerror(ENOENT) << std::endl;
-      return false;
-    }
-  }
-
-  std::string virtual_file, shadowing_disk_file;
-  switch (source_tree->DiskFileToVirtualFile(*proto, &virtual_file,
-                                             &shadowing_disk_file)) {
-    case DiskSourceTree::SUCCESS:
-      *proto = virtual_file;
-      break;
-    case DiskSourceTree::SHADOWED:
-      std::cerr << *proto << ": Input is shadowed in the --proto_path by \""
-                << shadowing_disk_file
-                << "\".  Either use the latter file as your input or reorder "
-                   "the --proto_path so that the former file's location "
-                   "comes first."
-                << std::endl;
-      return false;
-    case DiskSourceTree::CANNOT_OPEN: {
-      if (in_fallback_database) {
-        return true;
-      }
-      std::string error_str = source_tree->GetLastErrorMessage().empty()
-                                  ? strerror(errno)
-                                  : source_tree->GetLastErrorMessage();
-      std::cerr << "Could not map to virtual file: " << *proto << ": "
-                << error_str << std::endl;
-      return false;
-    }
-    case DiskSourceTree::NO_MAPPING: {
-      // Try to interpret the path as a virtual path.
-      std::string disk_file;
-      if (source_tree->VirtualFileToDiskFile(*proto, &disk_file) ||
-          in_fallback_database) {
-        return true;
-      } else {
-        // The input file path can't be mapped to any --proto_path and it also
-        // can't be interpreted as a virtual path.
-        std::cerr
-            << *proto
-            << ": File does not reside within any path "
-               "specified using --proto_path (or -I).  You must specify a "
-               "--proto_path which encompasses this file.  Note that the "
-               "proto_path must be an exact prefix of the .proto file "
-               "names -- protoc is too dumb to figure out when two paths "
-               "(e.g. absolute and relative) are equivalent (it's harder "
-               "than you think)."
-            << std::endl;
-        return false;
-      }
-    }
-  }
-  return true;
-}
-
-bool CommandLineInterface::MakeInputsBeProtoPathRelative(
-    DiskSourceTree* source_tree, DescriptorDatabase* fallback_database) {
-  for (auto& input_file : input_files_) {
-    if (!MakeProtoProtoPathRelative(source_tree, &input_file,
-                                    fallback_database)) {
-      return false;
-    }
-  }
-
-  return true;
-}
-
-
-bool CommandLineInterface::ExpandArgumentFile(
-    const std::string& file, std::vector<std::string>* arguments) {
-  // The argument file is searched in the working directory only. We don't
-  // use the proto import path here.
-  std::ifstream file_stream(file.c_str());
-  if (!file_stream.is_open()) {
-    return false;
-  }
-  std::string argument;
-  // We don't support any kind of shell expansion right now.
-  while (std::getline(file_stream, argument)) {
-    arguments->push_back(argument);
-  }
-  return true;
-}
-
-CommandLineInterface::ParseArgumentStatus CommandLineInterface::ParseArguments(
-    int argc, const char* const argv[]) {
-  executable_name_ = argv[0];
-
-  std::vector<std::string> arguments;
-  for (int i = 1; i < argc; ++i) {
-    if (argv[i][0] == '@') {
-      if (!ExpandArgumentFile(argv[i] + 1, &arguments)) {
-        std::cerr << "Failed to open argument file: " << (argv[i] + 1)
-                  << std::endl;
-        return PARSE_ARGUMENT_FAIL;
-      }
-      continue;
-    }
-    arguments.push_back(argv[i]);
-  }
-
-  // if no arguments are given, show help
-  if (arguments.empty()) {
-    PrintHelpText();
-    return PARSE_ARGUMENT_DONE_AND_EXIT;  // Exit without running compiler.
-  }
-
-  // Iterate through all arguments and parse them.
-  for (int i = 0; i < arguments.size(); ++i) {
-    std::string name, value;
-
-    if (ParseArgument(arguments[i].c_str(), &name, &value)) {
-      // Returned true => Use the next argument as the flag value.
-      if (i + 1 == arguments.size() || arguments[i + 1][0] == '-') {
-        std::cerr << "Missing value for flag: " << name << std::endl;
-        if (name == "--decode") {
-          std::cerr << "To decode an unknown message, use --decode_raw."
-                    << std::endl;
-        }
-        return PARSE_ARGUMENT_FAIL;
-      } else {
-        ++i;
-        value = arguments[i];
-      }
-    }
-
-    ParseArgumentStatus status = InterpretArgument(name, value);
-    if (status != PARSE_ARGUMENT_DONE_AND_CONTINUE) return status;
-  }
-
-  // Make sure each plugin option has a matching plugin output.
-  bool foundUnknownPluginOption = false;
-  for (std::map<std::string, std::string>::const_iterator i =
-           plugin_parameters_.begin();
-       i != plugin_parameters_.end(); ++i) {
-    if (plugins_.find(i->first) != plugins_.end()) {
-      continue;
-    }
-    bool foundImplicitPlugin = false;
-    for (std::vector<OutputDirective>::const_iterator j =
-             output_directives_.begin();
-         j != output_directives_.end(); ++j) {
-      if (j->generator == nullptr) {
-        std::string plugin_name = PluginName(plugin_prefix_, j->name);
-        if (plugin_name == i->first) {
-          foundImplicitPlugin = true;
-          break;
-        }
-      }
-    }
-    if (!foundImplicitPlugin) {
-      std::cerr << "Unknown flag: "
-                // strip prefix + "gen-" and add back "_opt"
-                << "--" + i->first.substr(plugin_prefix_.size() + 4) + "_opt"
-                << std::endl;
-      foundUnknownPluginOption = true;
-    }
-  }
-  if (foundUnknownPluginOption) {
-    return PARSE_ARGUMENT_FAIL;
-  }
-
-  // The --proto_path & --descriptor_set_in flags both specify places to look
-  // for proto files. If neither were given, use the current working directory.
-  if (proto_path_.empty() && descriptor_set_in_names_.empty()) {
-    // Don't use make_pair as the old/default standard library on Solaris
-    // doesn't support it without explicit template parameters, which are
-    // incompatible with C++0x's make_pair.
-    proto_path_.push_back(std::pair<std::string, std::string>("", "."));
-  }
-
-  // Check error cases that span multiple flag values.
-  bool missing_proto_definitions = false;
-  switch (mode_) {
-    case MODE_COMPILE:
-      missing_proto_definitions = input_files_.empty();
-      break;
-    case MODE_DECODE:
-      // Handle --decode_raw separately, since it requires that no proto
-      // definitions are specified.
-      if (codec_type_.empty()) {
-        if (!input_files_.empty() || !descriptor_set_in_names_.empty()) {
-          std::cerr
-              << "When using --decode_raw, no input files should be given."
-              << std::endl;
-          return PARSE_ARGUMENT_FAIL;
-        }
-        missing_proto_definitions = false;
-        break;  // only for --decode_raw
-      }
-      // --decode (not raw) is handled the same way as the rest of the modes.
-      PROTOBUF_FALLTHROUGH_INTENDED;
-    case MODE_ENCODE:
-    case MODE_PRINT:
-      missing_proto_definitions =
-          input_files_.empty() && descriptor_set_in_names_.empty();
-      break;
-    default:
-      GOOGLE_LOG(FATAL) << "Unexpected mode: " << mode_;
-  }
-  if (missing_proto_definitions) {
-    std::cerr << "Missing input file." << std::endl;
-    return PARSE_ARGUMENT_FAIL;
-  }
-  if (mode_ == MODE_COMPILE && output_directives_.empty() &&
-      descriptor_set_out_name_.empty()) {
-    std::cerr << "Missing output directives." << std::endl;
-    return PARSE_ARGUMENT_FAIL;
-  }
-  if (mode_ != MODE_COMPILE && !dependency_out_name_.empty()) {
-    std::cerr << "Can only use --dependency_out=FILE when generating code."
-              << std::endl;
-    return PARSE_ARGUMENT_FAIL;
-  }
-  if (mode_ != MODE_ENCODE && deterministic_output_) {
-    std::cerr << "Can only use --deterministic_output with --encode."
-              << std::endl;
-    return PARSE_ARGUMENT_FAIL;
-  }
-  if (!dependency_out_name_.empty() && input_files_.size() > 1) {
-    std::cerr
-        << "Can only process one input file when using --dependency_out=FILE."
-        << std::endl;
-    return PARSE_ARGUMENT_FAIL;
-  }
-  if (imports_in_descriptor_set_ && descriptor_set_out_name_.empty()) {
-    std::cerr << "--include_imports only makes sense when combined with "
-                 "--descriptor_set_out."
-              << std::endl;
-  }
-  if (source_info_in_descriptor_set_ && descriptor_set_out_name_.empty()) {
-    std::cerr << "--include_source_info only makes sense when combined with "
-                 "--descriptor_set_out."
-              << std::endl;
-  }
-
-  return PARSE_ARGUMENT_DONE_AND_CONTINUE;
-}
-
-bool CommandLineInterface::ParseArgument(const char* arg, std::string* name,
-                                         std::string* value) {
-  bool parsed_value = false;
-
-  if (arg[0] != '-') {
-    // Not a flag.
-    name->clear();
-    parsed_value = true;
-    *value = arg;
-  } else if (arg[1] == '-') {
-    // Two dashes:  Multi-character name, with '=' separating name and
-    //   value.
-    const char* equals_pos = strchr(arg, '=');
-    if (equals_pos != nullptr) {
-      *name = std::string(arg, equals_pos - arg);
-      *value = equals_pos + 1;
-      parsed_value = true;
-    } else {
-      *name = arg;
-    }
-  } else {
-    // One dash:  One-character name, all subsequent characters are the
-    //   value.
-    if (arg[1] == '\0') {
-      // arg is just "-".  We treat this as an input file, except that at
-      // present this will just lead to a "file not found" error.
-      name->clear();
-      *value = arg;
-      parsed_value = true;
-    } else {
-      *name = std::string(arg, 2);
-      *value = arg + 2;
-      parsed_value = !value->empty();
-    }
-  }
-
-  // Need to return true iff the next arg should be used as the value for this
-  // one, false otherwise.
-
-  if (parsed_value) {
-    // We already parsed a value for this flag.
-    return false;
-  }
-
-  if (*name == "-h" || *name == "--help" || *name == "--disallow_services" ||
-      *name == "--include_imports" || *name == "--include_source_info" ||
-      *name == "--version" || *name == "--decode_raw" ||
-      *name == "--print_free_field_numbers" ||
-      *name == "--experimental_allow_proto3_optional" ||
-      *name == "--deterministic_output" || *name == "--fatal_warnings") {
-    // HACK:  These are the only flags that don't take a value.
-    //   They probably should not be hard-coded like this but for now it's
-    //   not worth doing better.
-    return false;
-  }
-
-  // Next argument is the flag value.
-  return true;
-}
-
-CommandLineInterface::ParseArgumentStatus
-CommandLineInterface::InterpretArgument(const std::string& name,
-                                        const std::string& value) {
-  if (name.empty()) {
-    // Not a flag.  Just a filename.
-    if (value.empty()) {
-      std::cerr
-          << "You seem to have passed an empty string as one of the "
-             "arguments to "
-          << executable_name_
-          << ".  This is actually "
-             "sort of hard to do.  Congrats.  Unfortunately it is not valid "
-             "input so the program is going to die now."
-          << std::endl;
-      return PARSE_ARGUMENT_FAIL;
-    }
-
-#if defined(_WIN32)
-    // On Windows, the shell (typically cmd.exe) does not expand wildcards in
-    // file names (e.g. foo\*.proto), so we do it ourselves.
-    switch (google::protobuf::io::win32::ExpandWildcards(
-        value, [this](const std::string& path) {
-          this->input_files_.push_back(path);
-        })) {
-      case google::protobuf::io::win32::ExpandWildcardsResult::kSuccess:
-        break;
-      case google::protobuf::io::win32::ExpandWildcardsResult::
-          kErrorNoMatchingFile:
-        // Path does not exist, is not a file, or it's longer than MAX_PATH and
-        // long path handling is disabled.
-        std::cerr << "Invalid file name pattern or missing input file \""
-                  << value << "\"" << std::endl;
-        return PARSE_ARGUMENT_FAIL;
-      default:
-        std::cerr << "Cannot convert path \"" << value
-                  << "\" to or from Windows style" << std::endl;
-        return PARSE_ARGUMENT_FAIL;
-    }
-#else   // not _WIN32
-    // On other platforms than Windows (e.g. Linux, Mac OS) the shell (typically
-    // Bash) expands wildcards.
-    input_files_.push_back(value);
-#endif  // _WIN32
-
-  } else if (name == "-I" || name == "--proto_path") {
-    // Java's -classpath (and some other languages) delimits path components
-    // with colons.  Let's accept that syntax too just to make things more
-    // intuitive.
-    std::vector<std::string> parts = Split(
-        value, CommandLineInterface::kPathSeparator,
-        true);
-
-    for (int i = 0; i < parts.size(); i++) {
-      std::string virtual_path;
-      std::string disk_path;
-
-      std::string::size_type equals_pos = parts[i].find_first_of('=');
-      if (equals_pos == std::string::npos) {
-        virtual_path = "";
-        disk_path = parts[i];
-      } else {
-        virtual_path = parts[i].substr(0, equals_pos);
-        disk_path = parts[i].substr(equals_pos + 1);
-      }
-
-      if (disk_path.empty()) {
-        std::cerr
-            << "--proto_path passed empty directory name.  (Use \".\" for "
-               "current directory.)"
-            << std::endl;
-        return PARSE_ARGUMENT_FAIL;
-      }
-
-      // Make sure disk path exists, warn otherwise.
-      if (access(disk_path.c_str(), F_OK) < 0) {
-        // Try the original path; it may have just happened to have a '=' in it.
-        if (access(parts[i].c_str(), F_OK) < 0) {
-          std::cerr << disk_path << ": warning: directory does not exist."
-                    << std::endl;
-        } else {
-          virtual_path = "";
-          disk_path = parts[i];
-        }
-      }
-
-      // Don't use make_pair as the old/default standard library on Solaris
-      // doesn't support it without explicit template parameters, which are
-      // incompatible with C++0x's make_pair.
-      proto_path_.push_back(
-          std::pair<std::string, std::string>(virtual_path, disk_path));
-    }
-
-  } else if (name == "--direct_dependencies") {
-    if (direct_dependencies_explicitly_set_) {
-      std::cerr << name
-                << " may only be passed once. To specify multiple "
-                   "direct dependencies, pass them all as a single "
-                   "parameter separated by ':'."
-                << std::endl;
-      return PARSE_ARGUMENT_FAIL;
-    }
-
-    direct_dependencies_explicitly_set_ = true;
-    std::vector<std::string> direct =
-        Split(value, ":", true);
-    GOOGLE_DCHECK(direct_dependencies_.empty());
-    direct_dependencies_.insert(direct.begin(), direct.end());
-
-  } else if (name == "--direct_dependencies_violation_msg") {
-    direct_dependencies_violation_msg_ = value;
-
-  } else if (name == "--descriptor_set_in") {
-    if (!descriptor_set_in_names_.empty()) {
-      std::cerr << name
-                << " may only be passed once. To specify multiple "
-                   "descriptor sets, pass them all as a single "
-                   "parameter separated by '"
-                << CommandLineInterface::kPathSeparator << "'." << std::endl;
-      return PARSE_ARGUMENT_FAIL;
-    }
-    if (value.empty()) {
-      std::cerr << name << " requires a non-empty value." << std::endl;
-      return PARSE_ARGUMENT_FAIL;
-    }
-    if (!dependency_out_name_.empty()) {
-      std::cerr << name << " cannot be used with --dependency_out."
-                << std::endl;
-      return PARSE_ARGUMENT_FAIL;
-    }
-
-    descriptor_set_in_names_ = Split(
-        value, CommandLineInterface::kPathSeparator,
-        true);
-
-  } else if (name == "-o" || name == "--descriptor_set_out") {
-    if (!descriptor_set_out_name_.empty()) {
-      std::cerr << name << " may only be passed once." << std::endl;
-      return PARSE_ARGUMENT_FAIL;
-    }
-    if (value.empty()) {
-      std::cerr << name << " requires a non-empty value." << std::endl;
-      return PARSE_ARGUMENT_FAIL;
-    }
-    if (mode_ != MODE_COMPILE) {
-      std::cerr
-          << "Cannot use --encode or --decode and generate descriptors at the "
-             "same time."
-          << std::endl;
-      return PARSE_ARGUMENT_FAIL;
-    }
-    descriptor_set_out_name_ = value;
-
-  } else if (name == "--dependency_out") {
-    if (!dependency_out_name_.empty()) {
-      std::cerr << name << " may only be passed once." << std::endl;
-      return PARSE_ARGUMENT_FAIL;
-    }
-    if (value.empty()) {
-      std::cerr << name << " requires a non-empty value." << std::endl;
-      return PARSE_ARGUMENT_FAIL;
-    }
-    if (!descriptor_set_in_names_.empty()) {
-      std::cerr << name << " cannot be used with --descriptor_set_in."
-                << std::endl;
-      return PARSE_ARGUMENT_FAIL;
-    }
-    dependency_out_name_ = value;
-
-  } else if (name == "--include_imports") {
-    if (imports_in_descriptor_set_) {
-      std::cerr << name << " may only be passed once." << std::endl;
-      return PARSE_ARGUMENT_FAIL;
-    }
-    imports_in_descriptor_set_ = true;
-
-  } else if (name == "--include_source_info") {
-    if (source_info_in_descriptor_set_) {
-      std::cerr << name << " may only be passed once." << std::endl;
-      return PARSE_ARGUMENT_FAIL;
-    }
-    source_info_in_descriptor_set_ = true;
-
-  } else if (name == "-h" || name == "--help") {
-    PrintHelpText();
-    return PARSE_ARGUMENT_DONE_AND_EXIT;  // Exit without running compiler.
-
-  } else if (name == "--version") {
-    if (!version_info_.empty()) {
-      std::cout << version_info_ << std::endl;
-    }
-    std::cout << "libprotoc " << internal::VersionString(PROTOBUF_VERSION)
-              << PROTOBUF_VERSION_SUFFIX << std::endl;
-    return PARSE_ARGUMENT_DONE_AND_EXIT;  // Exit without running compiler.
-
-  } else if (name == "--disallow_services") {
-    disallow_services_ = true;
-
-
-  } else if (name == "--experimental_allow_proto3_optional") {
-    // Flag is no longer observed, but we allow it for backward compat.
-  } else if (name == "--encode" || name == "--decode" ||
-             name == "--decode_raw") {
-    if (mode_ != MODE_COMPILE) {
-      std::cerr << "Only one of --encode and --decode can be specified."
-                << std::endl;
-      return PARSE_ARGUMENT_FAIL;
-    }
-    if (!output_directives_.empty() || !descriptor_set_out_name_.empty()) {
-      std::cerr << "Cannot use " << name
-                << " and generate code or descriptors at the same time."
-                << std::endl;
-      return PARSE_ARGUMENT_FAIL;
-    }
-
-    mode_ = (name == "--encode") ? MODE_ENCODE : MODE_DECODE;
-
-    if (value.empty() && name != "--decode_raw") {
-      std::cerr << "Type name for " << name << " cannot be blank." << std::endl;
-      if (name == "--decode") {
-        std::cerr << "To decode an unknown message, use --decode_raw."
-                  << std::endl;
-      }
-      return PARSE_ARGUMENT_FAIL;
-    } else if (!value.empty() && name == "--decode_raw") {
-      std::cerr << "--decode_raw does not take a parameter." << std::endl;
-      return PARSE_ARGUMENT_FAIL;
-    }
-
-    codec_type_ = value;
-
-  } else if (name == "--deterministic_output") {
-    deterministic_output_ = true;
-
-  } else if (name == "--error_format") {
-    if (value == "gcc") {
-      error_format_ = ERROR_FORMAT_GCC;
-    } else if (value == "msvs") {
-      error_format_ = ERROR_FORMAT_MSVS;
-    } else {
-      std::cerr << "Unknown error format: " << value << std::endl;
-      return PARSE_ARGUMENT_FAIL;
-    }
-
-  } else if (name == "--fatal_warnings") {
-    if (fatal_warnings_) {
-      std::cerr << name << " may only be passed once." << std::endl;
-      return PARSE_ARGUMENT_FAIL;
-    }
-    fatal_warnings_ = true;
-  } else if (name == "--plugin") {
-    if (plugin_prefix_.empty()) {
-      std::cerr << "This compiler does not support plugins." << std::endl;
-      return PARSE_ARGUMENT_FAIL;
-    }
-
-    std::string plugin_name;
-    std::string path;
-
-    std::string::size_type equals_pos = value.find_first_of('=');
-    if (equals_pos == std::string::npos) {
-      // Use the basename of the file.
-      std::string::size_type slash_pos = value.find_last_of('/');
-      if (slash_pos == std::string::npos) {
-        plugin_name = value;
-      } else {
-        plugin_name = value.substr(slash_pos + 1);
-      }
-      path = value;
-    } else {
-      plugin_name = value.substr(0, equals_pos);
-      path = value.substr(equals_pos + 1);
-    }
-
-    plugins_[plugin_name] = path;
-
-  } else if (name == "--print_free_field_numbers") {
-    if (mode_ != MODE_COMPILE) {
-      std::cerr << "Cannot use " << name
-                << " and use --encode, --decode or print "
-                << "other info at the same time." << std::endl;
-      return PARSE_ARGUMENT_FAIL;
-    }
-    if (!output_directives_.empty() || !descriptor_set_out_name_.empty()) {
-      std::cerr << "Cannot use " << name
-                << " and generate code or descriptors at the same time."
-                << std::endl;
-      return PARSE_ARGUMENT_FAIL;
-    }
-    mode_ = MODE_PRINT;
-    print_mode_ = PRINT_FREE_FIELDS;
-  } else {
-    // Some other flag.  Look it up in the generators list.
-    const GeneratorInfo* generator_info =
-        FindOrNull(generators_by_flag_name_, name);
-    if (generator_info == nullptr &&
-        (plugin_prefix_.empty() || !HasSuffixString(name, "_out"))) {
-      // Check if it's a generator option flag.
-      generator_info = FindOrNull(generators_by_option_name_, name);
-      if (generator_info != nullptr) {
-        std::string* parameters =
-            &generator_parameters_[generator_info->flag_name];
-        if (!parameters->empty()) {
-          parameters->append(",");
-        }
-        parameters->append(value);
-      } else if (HasPrefixString(name, "--") && HasSuffixString(name, "_opt")) {
-        std::string* parameters =
-            &plugin_parameters_[PluginName(plugin_prefix_, name)];
-        if (!parameters->empty()) {
-          parameters->append(",");
-        }
-        parameters->append(value);
-      } else {
-        std::cerr << "Unknown flag: " << name << std::endl;
-        return PARSE_ARGUMENT_FAIL;
-      }
-    } else {
-      // It's an output flag.  Add it to the output directives.
-      if (mode_ != MODE_COMPILE) {
-        std::cerr << "Cannot use --encode, --decode or print .proto info and "
-                     "generate code at the same time."
-                  << std::endl;
-        return PARSE_ARGUMENT_FAIL;
-      }
-
-      OutputDirective directive;
-      directive.name = name;
-      if (generator_info == nullptr) {
-        directive.generator = nullptr;
-      } else {
-        directive.generator = generator_info->generator;
-      }
-
-      // Split value at ':' to separate the generator parameter from the
-      // filename.  However, avoid doing this if the colon is part of a valid
-      // Windows-style absolute path.
-      std::string::size_type colon_pos = value.find_first_of(':');
-      if (colon_pos == std::string::npos || IsWindowsAbsolutePath(value)) {
-        directive.output_location = value;
-      } else {
-        directive.parameter = value.substr(0, colon_pos);
-        directive.output_location = value.substr(colon_pos + 1);
-      }
-
-      output_directives_.push_back(directive);
-    }
-  }
-
-  return PARSE_ARGUMENT_DONE_AND_CONTINUE;
-}
-
-void CommandLineInterface::PrintHelpText() {
-  // Sorry for indentation here; line wrapping would be uglier.
-  std::cout << "Usage: " << executable_name_ << " [OPTION] PROTO_FILES";
-  std::cout << R"(
-Parse PROTO_FILES and generate output based on the options given:
-  -IPATH, --proto_path=PATH   Specify the directory in which to search for
-                              imports.  May be specified multiple times;
-                              directories will be searched in order.  If not
-                              given, the current working directory is used.
-                              If not found in any of the these directories,
-                              the --descriptor_set_in descriptors will be
-                              checked for required proto file.
-  --version                   Show version info and exit.
-  -h, --help                  Show this text and exit.
-  --encode=MESSAGE_TYPE       Read a text-format message of the given type
-                              from standard input and write it in binary
-                              to standard output.  The message type must
-                              be defined in PROTO_FILES or their imports.
-  --deterministic_output      When using --encode, ensure map fields are
-                              deterministically ordered. Note that this order
-                              is not canonical, and changes across builds or
-                              releases of protoc.
-  --decode=MESSAGE_TYPE       Read a binary message of the given type from
-                              standard input and write it in text format
-                              to standard output.  The message type must
-                              be defined in PROTO_FILES or their imports.
-  --decode_raw                Read an arbitrary protocol message from
-                              standard input and write the raw tag/value
-                              pairs in text format to standard output.  No
-                              PROTO_FILES should be given when using this
-                              flag.
-  --descriptor_set_in=FILES   Specifies a delimited list of FILES
-                              each containing a FileDescriptorSet (a
-                              protocol buffer defined in descriptor.proto).
-                              The FileDescriptor for each of the PROTO_FILES
-                              provided will be loaded from these
-                              FileDescriptorSets. If a FileDescriptor
-                              appears multiple times, the first occurrence
-                              will be used.
-  -oFILE,                     Writes a FileDescriptorSet (a protocol buffer,
-    --descriptor_set_out=FILE defined in descriptor.proto) containing all of
-                              the input files to FILE.
-  --include_imports           When using --descriptor_set_out, also include
-                              all dependencies of the input files in the
-                              set, so that the set is self-contained.
-  --include_source_info       When using --descriptor_set_out, do not strip
-                              SourceCodeInfo from the FileDescriptorProto.
-                              This results in vastly larger descriptors that
-                              include information about the original
-                              location of each decl in the source file as
-                              well as surrounding comments.
-  --dependency_out=FILE       Write a dependency output file in the format
-                              expected by make. This writes the transitive
-                              set of input file paths to FILE
-  --error_format=FORMAT       Set the format in which to print errors.
-                              FORMAT may be 'gcc' (the default) or 'msvs'
-                              (Microsoft Visual Studio format).
-  --fatal_warnings            Make warnings be fatal (similar to -Werr in
-                              gcc). This flag will make protoc return
-                              with a non-zero exit code if any warnings
-                              are generated.
-  --print_free_field_numbers  Print the free field numbers of the messages
-                              defined in the given proto files. Groups share
-                              the same field number space with the parent
-                              message. Extension ranges are counted as
-                              occupied fields numbers.)";
-  if (!plugin_prefix_.empty()) {
-    std::cout << R"(
-  --plugin=EXECUTABLE         Specifies a plugin executable to use.
-                              Normally, protoc searches the PATH for
-                              plugins, but you may specify additional
-                              executables not in the path using this flag.
-                              Additionally, EXECUTABLE may be of the form
-                              NAME=PATH, in which case the given plugin name
-                              is mapped to the given executable even if
-                              the executable's own name differs.)";
-  }
-
-  for (GeneratorMap::iterator iter = generators_by_flag_name_.begin();
-       iter != generators_by_flag_name_.end(); ++iter) {
-    // FIXME(kenton):  If the text is long enough it will wrap, which is ugly,
-    //   but fixing this nicely (e.g. splitting on spaces) is probably more
-    //   trouble than it's worth.
-    std::cout << std::endl
-              << "  " << iter->first << "=OUT_DIR "
-              << std::string(19 - iter->first.size(),
-                             ' ')  // Spaces for alignment.
-              << iter->second.help_text;
-  }
-  std::cout << R"(
-  @<filename>                 Read options and filenames from file. If a
-                              relative file path is specified, the file
-                              will be searched in the working directory.
-                              The --proto_path option will not affect how
-                              this argument file is searched. Content of
-                              the file will be expanded in the position of
-                              @<filename> as in the argument list. Note
-                              that shell expansion is not applied to the
-                              content of the file (i.e., you cannot use
-                              quotes, wildcards, escapes, commands, etc.).
-                              Each line corresponds to a single argument,
-                              even if it contains spaces.)";
-  std::cout << std::endl;
-}
-
-bool CommandLineInterface::EnforceProto3OptionalSupport(
-    const std::string& codegen_name, uint64_t supported_features,
-    const std::vector<const FileDescriptor*>& parsed_files) const {
-  bool supports_proto3_optional =
-      supported_features & CodeGenerator::FEATURE_PROTO3_OPTIONAL;
-  if (!supports_proto3_optional) {
-    for (const auto fd : parsed_files) {
-      if (ContainsProto3Optional(fd)) {
-        std::cerr << fd->name()
-                  << ": is a proto3 file that contains optional fields, but "
-                     "code generator "
-                  << codegen_name
-                  << " hasn't been updated to support optional fields in "
-                     "proto3. Please ask the owner of this code generator to "
-                     "support proto3 optional.";
-        return false;
-      }
-    }
-  }
-  return true;
-}
-
-bool CommandLineInterface::GenerateOutput(
-    const std::vector<const FileDescriptor*>& parsed_files,
-    const OutputDirective& output_directive,
-    GeneratorContext* generator_context) {
-  // Call the generator.
-  std::string error;
-  if (output_directive.generator == nullptr) {
-    // This is a plugin.
-    GOOGLE_CHECK(HasPrefixString(output_directive.name, "--") &&
-          HasSuffixString(output_directive.name, "_out"))
-        << "Bad name for plugin generator: " << output_directive.name;
-
-    std::string plugin_name = PluginName(plugin_prefix_, output_directive.name);
-    std::string parameters = output_directive.parameter;
-    if (!plugin_parameters_[plugin_name].empty()) {
-      if (!parameters.empty()) {
-        parameters.append(",");
-      }
-      parameters.append(plugin_parameters_[plugin_name]);
-    }
-    if (!GeneratePluginOutput(parsed_files, plugin_name, parameters,
-                              generator_context, &error)) {
-      std::cerr << output_directive.name << ": " << error << std::endl;
-      return false;
-    }
-  } else {
-    // Regular generator.
-    std::string parameters = output_directive.parameter;
-    if (!generator_parameters_[output_directive.name].empty()) {
-      if (!parameters.empty()) {
-        parameters.append(",");
-      }
-      parameters.append(generator_parameters_[output_directive.name]);
-    }
-    if (!EnforceProto3OptionalSupport(
-            output_directive.name,
-            output_directive.generator->GetSupportedFeatures(), parsed_files)) {
-      return false;
-    }
-
-    if (!output_directive.generator->GenerateAll(parsed_files, parameters,
-                                                 generator_context, &error)) {
-      // Generator returned an error.
-      std::cerr << output_directive.name << ": " << error << std::endl;
-      return false;
-    }
-  }
-
-  return true;
-}
-
-bool CommandLineInterface::GenerateDependencyManifestFile(
-    const std::vector<const FileDescriptor*>& parsed_files,
-    const GeneratorContextMap& output_directories,
-    DiskSourceTree* source_tree) {
-  FileDescriptorSet file_set;
-
-  std::set<const FileDescriptor*> already_seen;
-  for (int i = 0; i < parsed_files.size(); i++) {
-    GetTransitiveDependencies(parsed_files[i], false, false, &already_seen,
-                              file_set.mutable_file());
-  }
-
-  std::vector<std::string> output_filenames;
-  for (const auto& pair : output_directories) {
-    const std::string& location = pair.first;
-    GeneratorContextImpl* directory = pair.second.get();
-    std::vector<std::string> relative_output_filenames;
-    directory->GetOutputFilenames(&relative_output_filenames);
-    for (int i = 0; i < relative_output_filenames.size(); i++) {
-      std::string output_filename = location + relative_output_filenames[i];
-      if (output_filename.compare(0, 2, "./") == 0) {
-        output_filename = output_filename.substr(2);
-      }
-      output_filenames.push_back(output_filename);
-    }
-  }
-
-  if (!descriptor_set_out_name_.empty()) {
-    output_filenames.push_back(descriptor_set_out_name_);
-  }
-
-  int fd;
-  do {
-    fd = open(dependency_out_name_.c_str(),
-              O_WRONLY | O_CREAT | O_TRUNC | O_BINARY, 0666);
-  } while (fd < 0 && errno == EINTR);
-
-  if (fd < 0) {
-    perror(dependency_out_name_.c_str());
-    return false;
-  }
-
-  io::FileOutputStream out(fd);
-  io::Printer printer(&out, '$');
-
-  for (int i = 0; i < output_filenames.size(); i++) {
-    printer.Print(output_filenames[i].c_str());
-    if (i == output_filenames.size() - 1) {
-      printer.Print(":");
-    } else {
-      printer.Print(" \\\n");
-    }
-  }
-
-  for (int i = 0; i < file_set.file_size(); i++) {
-    const FileDescriptorProto& file = file_set.file(i);
-    const std::string& virtual_file = file.name();
-    std::string disk_file;
-    if (source_tree &&
-        source_tree->VirtualFileToDiskFile(virtual_file, &disk_file)) {
-      printer.Print(" $disk_file$", "disk_file", disk_file);
-      if (i < file_set.file_size() - 1) printer.Print("\\\n");
-    } else {
-      std::cerr << "Unable to identify path for file " << virtual_file
-                << std::endl;
-      return false;
-    }
-  }
-
-  return true;
-}
-
-bool CommandLineInterface::GeneratePluginOutput(
-    const std::vector<const FileDescriptor*>& parsed_files,
-    const std::string& plugin_name, const std::string& parameter,
-    GeneratorContext* generator_context, std::string* error) {
-  CodeGeneratorRequest request;
-  CodeGeneratorResponse response;
-  std::string processed_parameter = parameter;
-
-
-  // Build the request.
-  if (!processed_parameter.empty()) {
-    request.set_parameter(processed_parameter);
-  }
-
-
-  std::set<const FileDescriptor*> already_seen;
-  for (int i = 0; i < parsed_files.size(); i++) {
-    request.add_file_to_generate(parsed_files[i]->name());
-    GetTransitiveDependencies(parsed_files[i],
-                              true,  // Include json_name for plugins.
-                              true,  // Include source code info.
-                              &already_seen, request.mutable_proto_file());
-  }
-
-  google::protobuf::compiler::Version* version =
-      request.mutable_compiler_version();
-  version->set_major(PROTOBUF_VERSION / 1000000);
-  version->set_minor(PROTOBUF_VERSION / 1000 % 1000);
-  version->set_patch(PROTOBUF_VERSION % 1000);
-  version->set_suffix(PROTOBUF_VERSION_SUFFIX);
-
-  // Invoke the plugin.
-  Subprocess subprocess;
-
-  if (plugins_.count(plugin_name) > 0) {
-    subprocess.Start(plugins_[plugin_name], Subprocess::EXACT_NAME);
-  } else {
-    subprocess.Start(plugin_name, Subprocess::SEARCH_PATH);
-  }
-
-  std::string communicate_error;
-  if (!subprocess.Communicate(request, &response, &communicate_error)) {
-    *error = strings::Substitute("$0: $1", plugin_name, communicate_error);
-    return false;
-  }
-
-  // Write the files.  We do this even if there was a generator error in order
-  // to match the behavior of a compiled-in generator.
-  std::unique_ptr<io::ZeroCopyOutputStream> current_output;
-  for (int i = 0; i < response.file_size(); i++) {
-    const CodeGeneratorResponse::File& output_file = response.file(i);
-
-    if (!output_file.insertion_point().empty()) {
-      std::string filename = output_file.name();
-      // Open a file for insert.
-      // We reset current_output to nullptr first so that the old file is closed
-      // before the new one is opened.
-      current_output.reset();
-      current_output.reset(
-          generator_context->OpenForInsertWithGeneratedCodeInfo(
-              filename, output_file.insertion_point(),
-              output_file.generated_code_info()));
-    } else if (!output_file.name().empty()) {
-      // Starting a new file.  Open it.
-      // We reset current_output to nullptr first so that the old file is closed
-      // before the new one is opened.
-      current_output.reset();
-      current_output.reset(generator_context->Open(output_file.name()));
-    } else if (current_output == nullptr) {
-      *error = strings::Substitute(
-          "$0: First file chunk returned by plugin did not specify a file "
-          "name.",
-          plugin_name);
-      return false;
-    }
-
-    // Use CodedOutputStream for convenience; otherwise we'd need to provide
-    // our own buffer-copying loop.
-    io::CodedOutputStream writer(current_output.get());
-    writer.WriteString(output_file.content());
-  }
-
-  // Check for errors.
-  if (!response.error().empty()) {
-    // Generator returned an error.
-    *error = response.error();
-    return false;
-  } else if (!EnforceProto3OptionalSupport(
-                 plugin_name, response.supported_features(), parsed_files)) {
-    return false;
-  }
-
-  return true;
-}
-
-bool CommandLineInterface::EncodeOrDecode(const DescriptorPool* pool) {
-  // Look up the type.
-  const Descriptor* type = pool->FindMessageTypeByName(codec_type_);
-  if (type == nullptr) {
-    std::cerr << "Type not defined: " << codec_type_ << std::endl;
-    return false;
-  }
-
-  DynamicMessageFactory dynamic_factory(pool);
-  std::unique_ptr<Message> message(dynamic_factory.GetPrototype(type)->New());
-
-  if (mode_ == MODE_ENCODE) {
-    SetFdToTextMode(STDIN_FILENO);
-    SetFdToBinaryMode(STDOUT_FILENO);
-  } else {
-    SetFdToBinaryMode(STDIN_FILENO);
-    SetFdToTextMode(STDOUT_FILENO);
-  }
-
-  io::FileInputStream in(STDIN_FILENO);
-  io::FileOutputStream out(STDOUT_FILENO);
-
-  if (mode_ == MODE_ENCODE) {
-    // Input is text.
-    ErrorPrinter error_collector(error_format_);
-    TextFormat::Parser parser;
-    parser.RecordErrorsTo(&error_collector);
-    parser.AllowPartialMessage(true);
-
-    if (!parser.Parse(&in, message.get())) {
-      std::cerr << "Failed to parse input." << std::endl;
-      return false;
-    }
-  } else {
-    // Input is binary.
-    if (!message->ParsePartialFromZeroCopyStream(&in)) {
-      std::cerr << "Failed to parse input." << std::endl;
-      return false;
-    }
-  }
-
-  if (!message->IsInitialized()) {
-    std::cerr << "warning:  Input message is missing required fields:  "
-              << message->InitializationErrorString() << std::endl;
-  }
-
-  if (mode_ == MODE_ENCODE) {
-    // Output is binary.
-    io::CodedOutputStream coded_out(&out);
-    coded_out.SetSerializationDeterministic(deterministic_output_);
-    if (!message->SerializePartialToCodedStream(&coded_out)) {
-      std::cerr << "output: I/O error." << std::endl;
-      return false;
-    }
-  } else {
-    // Output is text.
-    if (!TextFormat::Print(*message, &out)) {
-      std::cerr << "output: I/O error." << std::endl;
-      return false;
-    }
-  }
-
-  return true;
-}
-
-bool CommandLineInterface::WriteDescriptorSet(
-    const std::vector<const FileDescriptor*>& parsed_files) {
-  FileDescriptorSet file_set;
-
-  std::set<const FileDescriptor*> already_seen;
-  if (!imports_in_descriptor_set_) {
-    // Since we don't want to output transitive dependencies, but we do want
-    // things to be in dependency order, add all dependencies that aren't in
-    // parsed_files to already_seen.  This will short circuit the recursion
-    // in GetTransitiveDependencies.
-    std::set<const FileDescriptor*> to_output;
-    to_output.insert(parsed_files.begin(), parsed_files.end());
-    for (int i = 0; i < parsed_files.size(); i++) {
-      const FileDescriptor* file = parsed_files[i];
-      for (int j = 0; j < file->dependency_count(); j++) {
-        const FileDescriptor* dependency = file->dependency(j);
-        // if the dependency isn't in parsed files, mark it as already seen
-        if (to_output.find(dependency) == to_output.end()) {
-          already_seen.insert(dependency);
-        }
-      }
-    }
-  }
-  for (int i = 0; i < parsed_files.size(); i++) {
-    GetTransitiveDependencies(parsed_files[i],
-                              true,  // Include json_name
-                              source_info_in_descriptor_set_, &already_seen,
-                              file_set.mutable_file());
-  }
-
-  int fd;
-  do {
-    fd = open(descriptor_set_out_name_.c_str(),
-              O_WRONLY | O_CREAT | O_TRUNC | O_BINARY, 0666);
-  } while (fd < 0 && errno == EINTR);
-
-  if (fd < 0) {
-    perror(descriptor_set_out_name_.c_str());
-    return false;
-  }
-
-  io::FileOutputStream out(fd);
-
-  {
-    io::CodedOutputStream coded_out(&out);
-    // Determinism is useful here because build outputs are sometimes checked
-    // into version control.
-    coded_out.SetSerializationDeterministic(true);
-    if (!file_set.SerializeToCodedStream(&coded_out)) {
-      std::cerr << descriptor_set_out_name_ << ": " << strerror(out.GetErrno())
-                << std::endl;
-      out.Close();
-      return false;
-    }
-  }
-
-  if (!out.Close()) {
-    std::cerr << descriptor_set_out_name_ << ": " << strerror(out.GetErrno())
-              << std::endl;
-    return false;
-  }
-
-  return true;
-}
-
-void CommandLineInterface::GetTransitiveDependencies(
-    const FileDescriptor* file, bool include_json_name,
-    bool include_source_code_info,
-    std::set<const FileDescriptor*>* already_seen,
-    RepeatedPtrField<FileDescriptorProto>* output) {
-  if (!already_seen->insert(file).second) {
-    // Already saw this file.  Skip.
-    return;
-  }
-
-  // Add all dependencies.
-  for (int i = 0; i < file->dependency_count(); i++) {
-    GetTransitiveDependencies(file->dependency(i), include_json_name,
-                              include_source_code_info, already_seen, output);
-  }
-
-  // Add this file.
-  FileDescriptorProto* new_descriptor = output->Add();
-  file->CopyTo(new_descriptor);
-  if (include_json_name) {
-    file->CopyJsonNameTo(new_descriptor);
-  }
-  if (include_source_code_info) {
-    file->CopySourceCodeInfoTo(new_descriptor);
-  }
-}
-
-namespace {
-
-// Utility function for PrintFreeFieldNumbers.
-// Stores occupied ranges into the ranges parameter, and next level of sub
-// message types into the nested_messages parameter.  The FieldRange is left
-// inclusive, right exclusive. i.e. [a, b).
-//
-// Nested Messages:
-// Note that it only stores the nested message type, iff the nested type is
-// either a direct child of the given descriptor, or the nested type is a
-// descendant of the given descriptor and all the nodes between the
-// nested type and the given descriptor are group types. e.g.
-//
-// message Foo {
-//   message Bar {
-//     message NestedBar {}
-//   }
-//   group Baz = 1 {
-//     group NestedBazGroup = 2 {
-//       message Quz {
-//         message NestedQuz {}
-//       }
-//     }
-//     message NestedBaz {}
-//   }
-// }
-//
-// In this case, Bar, Quz and NestedBaz will be added into the nested types.
-// Since free field numbers of group types will not be printed, this makes sure
-// the nested message types in groups will not be dropped. The nested_messages
-// parameter will contain the direct children (when groups are ignored in the
-// tree) of the given descriptor for the caller to traverse. The declaration
-// order of the nested messages is also preserved.
-typedef std::pair<int, int> FieldRange;
-void GatherOccupiedFieldRanges(
-    const Descriptor* descriptor, std::set<FieldRange>* ranges,
-    std::vector<const Descriptor*>* nested_messages) {
-  std::set<const Descriptor*> groups;
-  for (int i = 0; i < descriptor->field_count(); ++i) {
-    const FieldDescriptor* fd = descriptor->field(i);
-    ranges->insert(FieldRange(fd->number(), fd->number() + 1));
-    if (fd->type() == FieldDescriptor::TYPE_GROUP) {
-      groups.insert(fd->message_type());
-    }
-  }
-  for (int i = 0; i < descriptor->extension_range_count(); ++i) {
-    ranges->insert(FieldRange(descriptor->extension_range(i)->start,
-                              descriptor->extension_range(i)->end));
-  }
-  for (int i = 0; i < descriptor->reserved_range_count(); ++i) {
-    ranges->insert(FieldRange(descriptor->reserved_range(i)->start,
-                              descriptor->reserved_range(i)->end));
-  }
-  // Handle the nested messages/groups in declaration order to make it
-  // post-order strict.
-  for (int i = 0; i < descriptor->nested_type_count(); ++i) {
-    const Descriptor* nested_desc = descriptor->nested_type(i);
-    if (groups.find(nested_desc) != groups.end()) {
-      GatherOccupiedFieldRanges(nested_desc, ranges, nested_messages);
-    } else {
-      nested_messages->push_back(nested_desc);
-    }
-  }
-}
-
-// Utility function for PrintFreeFieldNumbers.
-// Actually prints the formatted free field numbers for given message name and
-// occupied ranges.
-void FormatFreeFieldNumbers(const std::string& name,
-                            const std::set<FieldRange>& ranges) {
-  std::string output;
-  StringAppendF(&output, "%-35s free:", name.c_str());
-  int next_free_number = 1;
-  for (std::set<FieldRange>::const_iterator i = ranges.begin();
-       i != ranges.end(); ++i) {
-    // This happens when groups re-use parent field numbers, in which
-    // case we skip the FieldRange entirely.
-    if (next_free_number >= i->second) continue;
-
-    if (next_free_number < i->first) {
-      if (next_free_number + 1 == i->first) {
-        // Singleton
-        StringAppendF(&output, " %d", next_free_number);
-      } else {
-        // Range
-        StringAppendF(&output, " %d-%d", next_free_number,
-                              i->first - 1);
-      }
-    }
-    next_free_number = i->second;
-  }
-  if (next_free_number <= FieldDescriptor::kMaxNumber) {
-    StringAppendF(&output, " %d-INF", next_free_number);
-  }
-  std::cout << output << std::endl;
-}
-
-}  // namespace
-
-void CommandLineInterface::PrintFreeFieldNumbers(const Descriptor* descriptor) {
-  std::set<FieldRange> ranges;
-  std::vector<const Descriptor*> nested_messages;
-  GatherOccupiedFieldRanges(descriptor, &ranges, &nested_messages);
-
-  for (int i = 0; i < nested_messages.size(); ++i) {
-    PrintFreeFieldNumbers(nested_messages[i]);
-  }
-  FormatFreeFieldNumbers(descriptor->full_name(), ranges);
-}
-
-
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/compiler/command_line_interface.h b/libs/protobuf/src/google/protobuf/compiler/command_line_interface.h
deleted file mode 100644
index e842550..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/command_line_interface.h
+++ /dev/null
@@ -1,464 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-//
-// Implements the Protocol Compiler front-end such that it may be reused by
-// custom compilers written to support other languages.
-
-#ifndef GOOGLE_PROTOBUF_COMPILER_COMMAND_LINE_INTERFACE_H__
-#define GOOGLE_PROTOBUF_COMPILER_COMMAND_LINE_INTERFACE_H__
-
-#include <cstdint>
-#include <map>
-#include <memory>
-#include <set>
-#include <string>
-#include <unordered_map>
-#include <unordered_set>
-#include <utility>
-#include <vector>
-
-#include <google/protobuf/stubs/common.h>
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-
-class Descriptor;           // descriptor.h
-class DescriptorDatabase;   // descriptor_database.h
-class DescriptorPool;       // descriptor.h
-class FileDescriptor;       // descriptor.h
-class FileDescriptorSet;    // descriptor.h
-class FileDescriptorProto;  // descriptor.pb.h
-template <typename T>
-class RepeatedPtrField;          // repeated_field.h
-class SimpleDescriptorDatabase;  // descriptor_database.h
-
-namespace compiler {
-
-class CodeGenerator;     // code_generator.h
-class GeneratorContext;  // code_generator.h
-class DiskSourceTree;    // importer.h
-
-// This class implements the command-line interface to the protocol compiler.
-// It is designed to make it very easy to create a custom protocol compiler
-// supporting the languages of your choice.  For example, if you wanted to
-// create a custom protocol compiler binary which includes both the regular
-// C++ support plus support for your own custom output "Foo", you would
-// write a class "FooGenerator" which implements the CodeGenerator interface,
-// then write a main() procedure like this:
-//
-//   int main(int argc, char* argv[]) {
-//     google::protobuf::compiler::CommandLineInterface cli;
-//
-//     // Support generation of C++ source and headers.
-//     google::protobuf::compiler::cpp::CppGenerator cpp_generator;
-//     cli.RegisterGenerator("--cpp_out", &cpp_generator,
-//       "Generate C++ source and header.");
-//
-//     // Support generation of Foo code.
-//     FooGenerator foo_generator;
-//     cli.RegisterGenerator("--foo_out", &foo_generator,
-//       "Generate Foo file.");
-//
-//     return cli.Run(argc, argv);
-//   }
-//
-// The compiler is invoked with syntax like:
-//   protoc --cpp_out=outdir --foo_out=outdir --proto_path=src src/foo.proto
-//
-// The .proto file to compile can be specified on the command line using either
-// its physical file path, or a virtual path relative to a directory specified
-// in --proto_path. For example, for src/foo.proto, the following two protoc
-// invocations work the same way:
-//   1. protoc --proto_path=src src/foo.proto (physical file path)
-//   2. protoc --proto_path=src foo.proto (virtual path relative to src)
-//
-// If a file path can be interpreted both as a physical file path and as a
-// relative virtual path, the physical file path takes precedence.
-//
-// For a full description of the command-line syntax, invoke it with --help.
-class PROTOC_EXPORT CommandLineInterface {
- public:
-  static const char* const kPathSeparator;
-
-  CommandLineInterface();
-  ~CommandLineInterface();
-
-  // Register a code generator for a language.
-  //
-  // Parameters:
-  // * flag_name: The command-line flag used to specify an output file of
-  //   this type.  The name must start with a '-'.  If the name is longer
-  //   than one letter, it must start with two '-'s.
-  // * generator: The CodeGenerator which will be called to generate files
-  //   of this type.
-  // * help_text: Text describing this flag in the --help output.
-  //
-  // Some generators accept extra parameters.  You can specify this parameter
-  // on the command-line by placing it before the output directory, separated
-  // by a colon:
-  //   protoc --foo_out=enable_bar:outdir
-  // The text before the colon is passed to CodeGenerator::Generate() as the
-  // "parameter".
-  void RegisterGenerator(const std::string& flag_name, CodeGenerator* generator,
-                         const std::string& help_text);
-
-  // Register a code generator for a language.
-  // Besides flag_name you can specify another option_flag_name that could be
-  // used to pass extra parameters to the registered code generator.
-  // Suppose you have registered a generator by calling:
-  //   command_line_interface.RegisterGenerator("--foo_out", "--foo_opt", ...)
-  // Then you could invoke the compiler with a command like:
-  //   protoc --foo_out=enable_bar:outdir --foo_opt=enable_baz
-  // This will pass "enable_bar,enable_baz" as the parameter to the generator.
-  void RegisterGenerator(const std::string& flag_name,
-                         const std::string& option_flag_name,
-                         CodeGenerator* generator,
-                         const std::string& help_text);
-
-  // Enables "plugins".  In this mode, if a command-line flag ends with "_out"
-  // but does not match any registered generator, the compiler will attempt to
-  // find a "plugin" to implement the generator.  Plugins are just executables.
-  // They should live somewhere in the PATH.
-  //
-  // The compiler determines the executable name to search for by concatenating
-  // exe_name_prefix with the unrecognized flag name, removing "_out".  So, for
-  // example, if exe_name_prefix is "protoc-" and you pass the flag --foo_out,
-  // the compiler will try to run the program "protoc-gen-foo".
-  //
-  // The plugin program should implement the following usage:
-  //   plugin [--out=OUTDIR] [--parameter=PARAMETER] PROTO_FILES < DESCRIPTORS
-  // --out indicates the output directory (as passed to the --foo_out
-  // parameter); if omitted, the current directory should be used.  --parameter
-  // gives the generator parameter, if any was provided (see below).  The
-  // PROTO_FILES list the .proto files which were given on the compiler
-  // command-line; these are the files for which the plugin is expected to
-  // generate output code.  Finally, DESCRIPTORS is an encoded FileDescriptorSet
-  // (as defined in descriptor.proto).  This is piped to the plugin's stdin.
-  // The set will include descriptors for all the files listed in PROTO_FILES as
-  // well as all files that they import.  The plugin MUST NOT attempt to read
-  // the PROTO_FILES directly -- it must use the FileDescriptorSet.
-  //
-  // The plugin should generate whatever files are necessary, as code generators
-  // normally do.  It should write the names of all files it generates to
-  // stdout.  The names should be relative to the output directory, NOT absolute
-  // names or relative to the current directory.  If any errors occur, error
-  // messages should be written to stderr.  If an error is fatal, the plugin
-  // should exit with a non-zero exit code.
-  //
-  // Plugins can have generator parameters similar to normal built-in
-  // generators. Extra generator parameters can be passed in via a matching
-  // "_opt" parameter. For example:
-  //   protoc --plug_out=enable_bar:outdir --plug_opt=enable_baz
-  // This will pass "enable_bar,enable_baz" as the parameter to the plugin.
-  //
-  void AllowPlugins(const std::string& exe_name_prefix);
-
-  // Run the Protocol Compiler with the given command-line parameters.
-  // Returns the error code which should be returned by main().
-  //
-  // It may not be safe to call Run() in a multi-threaded environment because
-  // it calls strerror().  I'm not sure why you'd want to do this anyway.
-  int Run(int argc, const char* const argv[]);
-
-  // DEPRECATED. Calling this method has no effect. Protocol compiler now
-  // always try to find the .proto file relative to the current directory
-  // first and if the file is not found, it will then treat the input path
-  // as a virtual path.
-  void SetInputsAreProtoPathRelative(bool /* enable */) {}
-
-  // Provides some text which will be printed when the --version flag is
-  // used.  The version of libprotoc will also be printed on the next line
-  // after this text.
-  void SetVersionInfo(const std::string& text) { version_info_ = text; }
-
-
- private:
-  // -----------------------------------------------------------------
-
-  class ErrorPrinter;
-  class GeneratorContextImpl;
-  class MemoryOutputStream;
-  typedef std::unordered_map<std::string, std::unique_ptr<GeneratorContextImpl>>
-      GeneratorContextMap;
-
-  // Clear state from previous Run().
-  void Clear();
-
-  // Remaps the proto file so that it is relative to one of the directories
-  // in proto_path_.  Returns false if an error occurred.
-  bool MakeProtoProtoPathRelative(DiskSourceTree* source_tree,
-                                  std::string* proto,
-                                  DescriptorDatabase* fallback_database);
-
-  // Remaps each file in input_files_ so that it is relative to one of the
-  // directories in proto_path_.  Returns false if an error occurred.
-  bool MakeInputsBeProtoPathRelative(DiskSourceTree* source_tree,
-                                     DescriptorDatabase* fallback_database);
-
-  // Fails if these files use proto3 optional and the code generator doesn't
-  // support it. This is a permanent check.
-  bool EnforceProto3OptionalSupport(
-      const std::string& codegen_name, uint64_t supported_features,
-      const std::vector<const FileDescriptor*>& parsed_files) const;
-
-
-  // Return status for ParseArguments() and InterpretArgument().
-  enum ParseArgumentStatus {
-    PARSE_ARGUMENT_DONE_AND_CONTINUE,
-    PARSE_ARGUMENT_DONE_AND_EXIT,
-    PARSE_ARGUMENT_FAIL
-  };
-
-  // Parse all command-line arguments.
-  ParseArgumentStatus ParseArguments(int argc, const char* const argv[]);
-
-  // Read an argument file and append the file's content to the list of
-  // arguments. Return false if the file cannot be read.
-  bool ExpandArgumentFile(const std::string& file,
-                          std::vector<std::string>* arguments);
-
-  // Parses a command-line argument into a name/value pair.  Returns
-  // true if the next argument in the argv should be used as the value,
-  // false otherwise.
-  //
-  // Examples:
-  //   "-Isrc/protos" ->
-  //     name = "-I", value = "src/protos"
-  //   "--cpp_out=src/foo.pb2.cc" ->
-  //     name = "--cpp_out", value = "src/foo.pb2.cc"
-  //   "foo.proto" ->
-  //     name = "", value = "foo.proto"
-  bool ParseArgument(const char* arg, std::string* name, std::string* value);
-
-  // Interprets arguments parsed with ParseArgument.
-  ParseArgumentStatus InterpretArgument(const std::string& name,
-                                        const std::string& value);
-
-  // Print the --help text to stderr.
-  void PrintHelpText();
-
-  // Loads proto_path_ into the provided source_tree.
-  bool InitializeDiskSourceTree(DiskSourceTree* source_tree,
-                                DescriptorDatabase* fallback_database);
-
-  // Verify that all the input files exist in the given database.
-  bool VerifyInputFilesInDescriptors(DescriptorDatabase* fallback_database);
-
-  // Parses input_files_ into parsed_files
-  bool ParseInputFiles(DescriptorPool* descriptor_pool,
-                       DiskSourceTree* source_tree,
-                       std::vector<const FileDescriptor*>* parsed_files);
-
-  // Generate the given output file from the given input.
-  struct OutputDirective;  // see below
-  bool GenerateOutput(const std::vector<const FileDescriptor*>& parsed_files,
-                      const OutputDirective& output_directive,
-                      GeneratorContext* generator_context);
-  bool GeneratePluginOutput(
-      const std::vector<const FileDescriptor*>& parsed_files,
-      const std::string& plugin_name, const std::string& parameter,
-      GeneratorContext* generator_context, std::string* error);
-
-  // Implements --encode and --decode.
-  bool EncodeOrDecode(const DescriptorPool* pool);
-
-  // Implements the --descriptor_set_out option.
-  bool WriteDescriptorSet(
-      const std::vector<const FileDescriptor*>& parsed_files);
-
-  // Implements the --dependency_out option
-  bool GenerateDependencyManifestFile(
-      const std::vector<const FileDescriptor*>& parsed_files,
-      const GeneratorContextMap& output_directories,
-      DiskSourceTree* source_tree);
-
-  // Get all transitive dependencies of the given file (including the file
-  // itself), adding them to the given list of FileDescriptorProtos.  The
-  // protos will be ordered such that every file is listed before any file that
-  // depends on it, so that you can call DescriptorPool::BuildFile() on them
-  // in order.  Any files in *already_seen will not be added, and each file
-  // added will be inserted into *already_seen.  If include_source_code_info is
-  // true then include the source code information in the FileDescriptorProtos.
-  // If include_json_name is true, populate the json_name field of
-  // FieldDescriptorProto for all fields.
-  static void GetTransitiveDependencies(
-      const FileDescriptor* file, bool include_json_name,
-      bool include_source_code_info,
-      std::set<const FileDescriptor*>* already_seen,
-      RepeatedPtrField<FileDescriptorProto>* output);
-
-  // Implements the --print_free_field_numbers. This function prints free field
-  // numbers into stdout for the message and it's nested message types in
-  // post-order, i.e. nested types first. Printed range are left-right
-  // inclusive, i.e. [a, b].
-  //
-  // Groups:
-  // For historical reasons, groups are considered to share the same
-  // field number space with the parent message, thus it will not print free
-  // field numbers for groups. The field numbers used in the groups are
-  // excluded in the free field numbers of the parent message.
-  //
-  // Extension Ranges:
-  // Extension ranges are considered ocuppied field numbers and they will not be
-  // listed as free numbers in the output.
-  void PrintFreeFieldNumbers(const Descriptor* descriptor);
-
-  // -----------------------------------------------------------------
-
-  // The name of the executable as invoked (i.e. argv[0]).
-  std::string executable_name_;
-
-  // Version info set with SetVersionInfo().
-  std::string version_info_;
-
-  // Registered generators.
-  struct GeneratorInfo {
-    std::string flag_name;
-    std::string option_flag_name;
-    CodeGenerator* generator;
-    std::string help_text;
-  };
-  typedef std::map<std::string, GeneratorInfo> GeneratorMap;
-  GeneratorMap generators_by_flag_name_;
-  GeneratorMap generators_by_option_name_;
-  // A map from generator names to the parameters specified using the option
-  // flag. For example, if the user invokes the compiler with:
-  //   protoc --foo_out=outputdir --foo_opt=enable_bar ...
-  // Then there will be an entry ("--foo_out", "enable_bar") in this map.
-  std::map<std::string, std::string> generator_parameters_;
-  // Similar to generator_parameters_, but stores the parameters for plugins.
-  std::map<std::string, std::string> plugin_parameters_;
-
-  // See AllowPlugins().  If this is empty, plugins aren't allowed.
-  std::string plugin_prefix_;
-
-  // Maps specific plugin names to files.  When executing a plugin, this map
-  // is searched first to find the plugin executable.  If not found here, the
-  // PATH (or other OS-specific search strategy) is searched.
-  std::map<std::string, std::string> plugins_;
-
-  // Stuff parsed from command line.
-  enum Mode {
-    MODE_COMPILE,  // Normal mode:  parse .proto files and compile them.
-    MODE_ENCODE,   // --encode:  read text from stdin, write binary to stdout.
-    MODE_DECODE,   // --decode:  read binary from stdin, write text to stdout.
-    MODE_PRINT,    // Print mode: print info of the given .proto files and exit.
-  };
-
-  Mode mode_ = MODE_COMPILE;
-
-  enum PrintMode {
-    PRINT_NONE,         // Not in MODE_PRINT
-    PRINT_FREE_FIELDS,  // --print_free_fields
-  };
-
-  PrintMode print_mode_ = PRINT_NONE;
-
-  enum ErrorFormat {
-    ERROR_FORMAT_GCC,  // GCC error output format (default).
-    ERROR_FORMAT_MSVS  // Visual Studio output (--error_format=msvs).
-  };
-
-  ErrorFormat error_format_ = ERROR_FORMAT_GCC;
-
-  // True if we should treat warnings as errors that fail the compilation.
-  bool fatal_warnings_ = false;
-
-  std::vector<std::pair<std::string, std::string> >
-      proto_path_;                        // Search path for proto files.
-  std::vector<std::string> input_files_;  // Names of the input proto files.
-
-  // Names of proto files which are allowed to be imported. Used by build
-  // systems to enforce depend-on-what-you-import.
-  std::set<std::string> direct_dependencies_;
-  bool direct_dependencies_explicitly_set_ = false;
-
-  // If there's a violation of depend-on-what-you-import, this string will be
-  // presented to the user. "%s" will be replaced with the violating import.
-  std::string direct_dependencies_violation_msg_;
-
-  // output_directives_ lists all the files we are supposed to output and what
-  // generator to use for each.
-  struct OutputDirective {
-    std::string name;          // E.g. "--foo_out"
-    CodeGenerator* generator;  // NULL for plugins
-    std::string parameter;
-    std::string output_location;
-  };
-  std::vector<OutputDirective> output_directives_;
-
-  // When using --encode or --decode, this names the type we are encoding or
-  // decoding.  (Empty string indicates --decode_raw.)
-  std::string codec_type_;
-
-  // If --descriptor_set_in was given, these are filenames containing
-  // parsed FileDescriptorSets to be used for loading protos.  Otherwise, empty.
-  std::vector<std::string> descriptor_set_in_names_;
-
-  // If --descriptor_set_out was given, this is the filename to which the
-  // FileDescriptorSet should be written.  Otherwise, empty.
-  std::string descriptor_set_out_name_;
-
-  // If --dependency_out was given, this is the path to the file where the
-  // dependency file will be written. Otherwise, empty.
-  std::string dependency_out_name_;
-
-  // True if --include_imports was given, meaning that we should
-  // write all transitive dependencies to the DescriptorSet.  Otherwise, only
-  // the .proto files listed on the command-line are added.
-  bool imports_in_descriptor_set_;
-
-  // True if --include_source_info was given, meaning that we should not strip
-  // SourceCodeInfo from the DescriptorSet.
-  bool source_info_in_descriptor_set_ = false;
-
-  // Was the --disallow_services flag used?
-  bool disallow_services_ = false;
-
-  // When using --encode, this will be passed to SetSerializationDeterministic.
-  bool deterministic_output_ = false;
-
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(CommandLineInterface);
-};
-
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
-
-#endif  // GOOGLE_PROTOBUF_COMPILER_COMMAND_LINE_INTERFACE_H__
diff --git a/libs/protobuf/src/google/protobuf/compiler/command_line_interface_unittest.cc b/libs/protobuf/src/google/protobuf/compiler/command_line_interface_unittest.cc
deleted file mode 100644
index f48135e..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/command_line_interface_unittest.cc
+++ /dev/null
@@ -1,2787 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-
-#include <fcntl.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-
-#include <cstdint>
-
-#ifndef _MSC_VER
-#include <unistd.h>
-#endif
-#include <memory>
-#include <string>
-#include <vector>
-
-#include <google/protobuf/stubs/stringprintf.h>
-#include <google/protobuf/testing/file.h>
-#include <google/protobuf/testing/file.h>
-#include <google/protobuf/testing/file.h>
-#include <google/protobuf/any.pb.h>
-#include <google/protobuf/test_util2.h>
-#include <google/protobuf/unittest.pb.h>
-#include <google/protobuf/unittest_custom_options.pb.h>
-#include <google/protobuf/descriptor.pb.h>
-#include <google/protobuf/testing/googletest.h>
-#include <gtest/gtest.h>
-#include <google/protobuf/stubs/strutil.h>
-#include <google/protobuf/stubs/substitute.h>
-#include <google/protobuf/compiler/code_generator.h>
-#include <google/protobuf/compiler/command_line_interface.h>
-#include <google/protobuf/compiler/mock_code_generator.h>
-#include <google/protobuf/compiler/subprocess.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/io/io_win32.h>
-#include <google/protobuf/io/printer.h>
-#include <google/protobuf/io/zero_copy_stream.h>
-
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-
-#if defined(_WIN32)
-// DO NOT include <io.h>, instead create functions in io_win32.{h,cc} and import
-// them like we do below.
-using google::protobuf::io::win32::access;
-using google::protobuf::io::win32::close;
-using google::protobuf::io::win32::dup;
-using google::protobuf::io::win32::dup2;
-using google::protobuf::io::win32::open;
-using google::protobuf::io::win32::write;
-#endif
-
-// Disable the whole test when we use tcmalloc for "draconian" heap checks, in
-// which case tcmalloc will print warnings that fail the plugin tests.
-#if !GOOGLE_PROTOBUF_HEAP_CHECK_DRACONIAN
-
-
-namespace {
-
-bool FileExists(const std::string& path) {
-  return File::Exists(path);
-}
-
-class CommandLineInterfaceTest : public testing::Test {
- protected:
-  void SetUp() override;
-  void TearDown() override;
-
-  // Runs the CommandLineInterface with the given command line.  The
-  // command is automatically split on spaces, and the string "$tmpdir"
-  // is replaced with TestTempDir().
-  void Run(const std::string& command);
-  void RunWithArgs(std::vector<std::string> args);
-
-  // -----------------------------------------------------------------
-  // Methods to set up the test (called before Run()).
-
-  class NullCodeGenerator;
-
-  // Normally plugins are allowed for all tests.  Call this to explicitly
-  // disable them.
-  void DisallowPlugins() { disallow_plugins_ = true; }
-
-  // Create a temp file within temp_directory_ with the given name.
-  // The containing directory is also created if necessary.
-  void CreateTempFile(const std::string& name, const std::string& contents);
-
-  // Create a subdirectory within temp_directory_.
-  void CreateTempDir(const std::string& name);
-
-#ifdef PROTOBUF_OPENSOURCE
-  // Change working directory to temp directory.
-  void SwitchToTempDirectory() {
-    File::ChangeWorkingDirectory(temp_directory_);
-  }
-#else  // !PROTOBUF_OPENSOURCE
-  // TODO(teboring): Figure out how to change and get working directory in
-  // google3.
-#endif  // !PROTOBUF_OPENSOURCE
-
-  // -----------------------------------------------------------------
-  // Methods to check the test results (called after Run()).
-
-  // Checks that no text was written to stderr during Run(), and Run()
-  // returned 0.
-  void ExpectNoErrors();
-
-  // Checks that Run() returned non-zero and the stderr output is exactly
-  // the text given.  expected_test may contain references to "$tmpdir",
-  // which will be replaced by the temporary directory path.
-  void ExpectErrorText(const std::string& expected_text);
-
-  // Checks that Run() returned non-zero and the stderr contains the given
-  // substring.
-  void ExpectErrorSubstring(const std::string& expected_substring);
-
-  // Checks that Run() returned zero and the stderr contains the given
-  // substring.
-  void ExpectWarningSubstring(const std::string& expected_substring);
-
-  // Checks that the captured stdout is the same as the expected_text.
-  void ExpectCapturedStdout(const std::string& expected_text);
-
-  // Checks that Run() returned zero and the stdout contains the given
-  // substring.
-  void ExpectCapturedStdoutSubstringWithZeroReturnCode(
-      const std::string& expected_substring);
-
-  // Checks that Run() returned zero and the stderr contains the given
-  // substring.
-  void ExpectCapturedStderrSubstringWithZeroReturnCode(
-      const std::string& expected_substring);
-
-#if defined(_WIN32) && !defined(__CYGWIN__)
-  // Returns true if ExpectErrorSubstring(expected_substring) would pass, but
-  // does not fail otherwise.
-  bool HasAlternateErrorSubstring(const std::string& expected_substring);
-#endif  // _WIN32 && !__CYGWIN__
-
-  // Checks that MockCodeGenerator::Generate() was called in the given
-  // context (or the generator in test_plugin.cc, which produces the same
-  // output).  That is, this tests if the generator with the given name
-  // was called with the given parameter and proto file and produced the
-  // given output file.  This is checked by reading the output file and
-  // checking that it contains the content that MockCodeGenerator would
-  // generate given these inputs.  message_name is the name of the first
-  // message that appeared in the proto file; this is just to make extra
-  // sure that the correct file was parsed.
-  void ExpectGenerated(const std::string& generator_name,
-                       const std::string& parameter,
-                       const std::string& proto_name,
-                       const std::string& message_name);
-  void ExpectGenerated(const std::string& generator_name,
-                       const std::string& parameter,
-                       const std::string& proto_name,
-                       const std::string& message_name,
-                       const std::string& output_directory);
-  void ExpectGeneratedWithMultipleInputs(const std::string& generator_name,
-                                         const std::string& all_proto_names,
-                                         const std::string& proto_name,
-                                         const std::string& message_name);
-  void ExpectGeneratedWithInsertions(const std::string& generator_name,
-                                     const std::string& parameter,
-                                     const std::string& insertions,
-                                     const std::string& proto_name,
-                                     const std::string& message_name);
-  void CheckGeneratedAnnotations(const std::string& name,
-                                 const std::string& file);
-
-#if defined(_WIN32)
-  void ExpectNullCodeGeneratorCalled(const std::string& parameter);
-#endif  // _WIN32
-
-
-  void ReadDescriptorSet(const std::string& filename,
-                         FileDescriptorSet* descriptor_set);
-
-  void WriteDescriptorSet(const std::string& filename,
-                          const FileDescriptorSet* descriptor_set);
-
-  void ExpectFileContent(const std::string& filename,
-                         const std::string& content);
-
-  // The default code generators support all features. Use this to create a
-  // code generator that omits the given feature(s).
-  void CreateGeneratorWithMissingFeatures(const std::string& name,
-                                          const std::string& description,
-                                          uint64_t features) {
-    MockCodeGenerator* generator = new MockCodeGenerator(name);
-    generator->SuppressFeatures(features);
-    mock_generators_to_delete_.push_back(generator);
-    cli_.RegisterGenerator(name, generator, description);
-  }
-
- private:
-  // The object we are testing.
-  CommandLineInterface cli_;
-
-  // Was DisallowPlugins() called?
-  bool disallow_plugins_;
-
-  // We create a directory within TestTempDir() in order to add extra
-  // protection against accidentally deleting user files (since we recursively
-  // delete this directory during the test).  This is the full path of that
-  // directory.
-  std::string temp_directory_;
-
-  // The result of Run().
-  int return_code_;
-
-  // The captured stderr output.
-  std::string error_text_;
-
-  // The captured stdout.
-  std::string captured_stdout_;
-
-  // Pointers which need to be deleted later.
-  std::vector<CodeGenerator*> mock_generators_to_delete_;
-
-  NullCodeGenerator* null_generator_;
-};
-
-class CommandLineInterfaceTest::NullCodeGenerator : public CodeGenerator {
- public:
-  NullCodeGenerator() : called_(false) {}
-  ~NullCodeGenerator() override {}
-
-  mutable bool called_;
-  mutable std::string parameter_;
-
-  // implements CodeGenerator ----------------------------------------
-  bool Generate(const FileDescriptor* file, const std::string& parameter,
-                GeneratorContext* context, std::string* error) const override {
-    called_ = true;
-    parameter_ = parameter;
-    return true;
-  }
-};
-
-// ===================================================================
-
-void CommandLineInterfaceTest::SetUp() {
-  temp_directory_ = TestTempDir() + "/proto2_cli_test_temp";
-
-  // If the temp directory already exists, it must be left over from a
-  // previous run.  Delete it.
-  if (FileExists(temp_directory_)) {
-    File::DeleteRecursively(temp_directory_, NULL, NULL);
-  }
-
-  // Create the temp directory.
-  GOOGLE_CHECK_OK(File::CreateDir(temp_directory_, 0777));
-
-  // Register generators.
-  CodeGenerator* generator = new MockCodeGenerator("test_generator");
-  mock_generators_to_delete_.push_back(generator);
-  cli_.RegisterGenerator("--test_out", "--test_opt", generator, "Test output.");
-  cli_.RegisterGenerator("-t", generator, "Test output.");
-
-  generator = new MockCodeGenerator("alt_generator");
-  mock_generators_to_delete_.push_back(generator);
-  cli_.RegisterGenerator("--alt_out", generator, "Alt output.");
-
-  generator = null_generator_ = new NullCodeGenerator();
-  mock_generators_to_delete_.push_back(generator);
-  cli_.RegisterGenerator("--null_out", generator, "Null output.");
-
-
-  disallow_plugins_ = false;
-}
-
-void CommandLineInterfaceTest::TearDown() {
-  // Delete the temp directory.
-  if (FileExists(temp_directory_)) {
-    File::DeleteRecursively(temp_directory_, NULL, NULL);
-  }
-
-  // Delete all the MockCodeGenerators.
-  for (int i = 0; i < mock_generators_to_delete_.size(); i++) {
-    delete mock_generators_to_delete_[i];
-  }
-  mock_generators_to_delete_.clear();
-}
-
-void CommandLineInterfaceTest::Run(const std::string& command) {
-  RunWithArgs(Split(command, " ", true));
-}
-
-void CommandLineInterfaceTest::RunWithArgs(std::vector<std::string> args) {
-  if (!disallow_plugins_) {
-    cli_.AllowPlugins("prefix-");
-    std::string plugin_path;
-#ifdef GOOGLE_PROTOBUF_TEST_PLUGIN_PATH
-    plugin_path = GOOGLE_PROTOBUF_TEST_PLUGIN_PATH;
-#else
-    const char* possible_paths[] = {
-        // When building with shared libraries, libtool hides the real
-        // executable
-        // in .libs and puts a fake wrapper in the current directory.
-        // Unfortunately, due to an apparent bug on Cygwin/MinGW, if one program
-        // wrapped in this way (e.g. protobuf-tests.exe) tries to execute
-        // another
-        // program wrapped in this way (e.g. test_plugin.exe), the latter fails
-        // with error code 127 and no explanation message.  Presumably the
-        // problem
-        // is that the wrapper for protobuf-tests.exe set some environment
-        // variables that confuse the wrapper for test_plugin.exe.  Luckily, it
-        // turns out that if we simply invoke the wrapped test_plugin.exe
-        // directly, it works -- I guess the environment variables set by the
-        // protobuf-tests.exe wrapper happen to be correct for it too.  So we do
-        // that.
-        ".libs/test_plugin.exe",  // Win32 w/autotool (Cygwin / MinGW)
-        "test_plugin.exe",        // Other Win32 (MSVC)
-        "test_plugin",            // Unix
-    };
-    for (int i = 0; i < GOOGLE_ARRAYSIZE(possible_paths); i++) {
-      if (access(possible_paths[i], F_OK) == 0) {
-        plugin_path = possible_paths[i];
-        break;
-      }
-    }
-#endif
-
-    if (plugin_path.empty()) {
-      GOOGLE_LOG(ERROR)
-          << "Plugin executable not found.  Plugin tests are likely to fail.";
-    } else {
-      args.push_back("--plugin=prefix-gen-plug=" + plugin_path);
-    }
-  }
-
-  std::unique_ptr<const char*[]> argv(new const char*[args.size()]);
-
-  for (int i = 0; i < args.size(); i++) {
-    args[i] = StringReplace(args[i], "$tmpdir", temp_directory_, true);
-    argv[i] = args[i].c_str();
-  }
-
-  // TODO(jieluo): Cygwin doesn't work well if we try to capture stderr and
-  // stdout at the same time. Need to figure out why and add this capture back
-  // for Cygwin.
-#if !defined(__CYGWIN__)
-  CaptureTestStdout();
-#endif
-  CaptureTestStderr();
-
-  return_code_ = cli_.Run(args.size(), argv.get());
-
-  error_text_ = GetCapturedTestStderr();
-#if !defined(__CYGWIN__)
-  captured_stdout_ = GetCapturedTestStdout();
-#endif
-}
-
-// -------------------------------------------------------------------
-
-void CommandLineInterfaceTest::CreateTempFile(const std::string& name,
-                                              const std::string& contents) {
-  // Create parent directory, if necessary.
-  std::string::size_type slash_pos = name.find_last_of('/');
-  if (slash_pos != std::string::npos) {
-    std::string dir = name.substr(0, slash_pos);
-    if (!FileExists(temp_directory_ + "/" + dir)) {
-      GOOGLE_CHECK_OK(File::RecursivelyCreateDir(temp_directory_ + "/" + dir,
-                                          0777));
-    }
-  }
-
-  // Write file.
-  std::string full_name = temp_directory_ + "/" + name;
-  GOOGLE_CHECK_OK(File::SetContents(
-      full_name, StringReplace(contents, "$tmpdir", temp_directory_, true),
-      true));
-}
-
-void CommandLineInterfaceTest::CreateTempDir(const std::string& name) {
-  GOOGLE_CHECK_OK(File::RecursivelyCreateDir(temp_directory_ + "/" + name,
-                                      0777));
-}
-
-// -------------------------------------------------------------------
-
-void CommandLineInterfaceTest::ExpectNoErrors() {
-  EXPECT_EQ(0, return_code_);
-  EXPECT_EQ("", error_text_);
-}
-
-void CommandLineInterfaceTest::ExpectErrorText(
-    const std::string& expected_text) {
-  EXPECT_NE(0, return_code_);
-  EXPECT_EQ(StringReplace(expected_text, "$tmpdir", temp_directory_, true),
-            error_text_);
-}
-
-void CommandLineInterfaceTest::ExpectErrorSubstring(
-    const std::string& expected_substring) {
-  EXPECT_NE(0, return_code_);
-  EXPECT_PRED_FORMAT2(testing::IsSubstring, expected_substring, error_text_);
-}
-
-void CommandLineInterfaceTest::ExpectWarningSubstring(
-    const std::string& expected_substring) {
-  EXPECT_PRED_FORMAT2(testing::IsSubstring, expected_substring, error_text_);
-  EXPECT_EQ(0, return_code_);
-}
-
-#if defined(_WIN32) && !defined(__CYGWIN__)
-bool CommandLineInterfaceTest::HasAlternateErrorSubstring(
-    const std::string& expected_substring) {
-  EXPECT_NE(0, return_code_);
-  return error_text_.find(expected_substring) != std::string::npos;
-}
-#endif  // _WIN32 && !__CYGWIN__
-
-void CommandLineInterfaceTest::ExpectGenerated(
-    const std::string& generator_name, const std::string& parameter,
-    const std::string& proto_name, const std::string& message_name) {
-  MockCodeGenerator::ExpectGenerated(generator_name, parameter, "", proto_name,
-                                     message_name, proto_name, temp_directory_);
-}
-
-void CommandLineInterfaceTest::ExpectGenerated(
-    const std::string& generator_name, const std::string& parameter,
-    const std::string& proto_name, const std::string& message_name,
-    const std::string& output_directory) {
-  MockCodeGenerator::ExpectGenerated(generator_name, parameter, "", proto_name,
-                                     message_name, proto_name,
-                                     temp_directory_ + "/" + output_directory);
-}
-
-void CommandLineInterfaceTest::ExpectGeneratedWithMultipleInputs(
-    const std::string& generator_name, const std::string& all_proto_names,
-    const std::string& proto_name, const std::string& message_name) {
-  MockCodeGenerator::ExpectGenerated(generator_name, "", "", proto_name,
-                                     message_name, all_proto_names,
-                                     temp_directory_);
-}
-
-void CommandLineInterfaceTest::ExpectGeneratedWithInsertions(
-    const std::string& generator_name, const std::string& parameter,
-    const std::string& insertions, const std::string& proto_name,
-    const std::string& message_name) {
-  MockCodeGenerator::ExpectGenerated(generator_name, parameter, insertions,
-                                     proto_name, message_name, proto_name,
-                                     temp_directory_);
-}
-
-void CommandLineInterfaceTest::CheckGeneratedAnnotations(
-    const std::string& name, const std::string& file) {
-  MockCodeGenerator::CheckGeneratedAnnotations(name, file, temp_directory_);
-}
-
-#if defined(_WIN32)
-void CommandLineInterfaceTest::ExpectNullCodeGeneratorCalled(
-    const std::string& parameter) {
-  EXPECT_TRUE(null_generator_->called_);
-  EXPECT_EQ(parameter, null_generator_->parameter_);
-}
-#endif  // _WIN32
-
-
-void CommandLineInterfaceTest::ReadDescriptorSet(
-    const std::string& filename, FileDescriptorSet* descriptor_set) {
-  std::string path = temp_directory_ + "/" + filename;
-  std::string file_contents;
-  GOOGLE_CHECK_OK(File::GetContents(path, &file_contents, true));
-
-  if (!descriptor_set->ParseFromString(file_contents)) {
-    FAIL() << "Could not parse file contents: " << path;
-  }
-}
-
-void CommandLineInterfaceTest::WriteDescriptorSet(
-    const std::string& filename, const FileDescriptorSet* descriptor_set) {
-  std::string binary_proto;
-  GOOGLE_CHECK(descriptor_set->SerializeToString(&binary_proto));
-  CreateTempFile(filename, binary_proto);
-}
-
-void CommandLineInterfaceTest::ExpectCapturedStdout(
-    const std::string& expected_text) {
-  EXPECT_EQ(expected_text, captured_stdout_);
-}
-
-void CommandLineInterfaceTest::ExpectCapturedStdoutSubstringWithZeroReturnCode(
-    const std::string& expected_substring) {
-  EXPECT_EQ(0, return_code_);
-  EXPECT_PRED_FORMAT2(testing::IsSubstring, expected_substring,
-                      captured_stdout_);
-}
-
-void CommandLineInterfaceTest::ExpectCapturedStderrSubstringWithZeroReturnCode(
-    const std::string& expected_substring) {
-  EXPECT_EQ(0, return_code_);
-  EXPECT_PRED_FORMAT2(testing::IsSubstring, expected_substring, error_text_);
-}
-
-void CommandLineInterfaceTest::ExpectFileContent(const std::string& filename,
-                                                 const std::string& content) {
-  std::string path = temp_directory_ + "/" + filename;
-  std::string file_contents;
-  GOOGLE_CHECK_OK(File::GetContents(path, &file_contents, true));
-
-  EXPECT_EQ(StringReplace(content, "$tmpdir", temp_directory_, true),
-            file_contents);
-}
-
-// ===================================================================
-
-TEST_F(CommandLineInterfaceTest, BasicOutput) {
-  // Test that the common case works.
-
-  CreateTempFile("foo.proto",
-                 "syntax = \"proto2\";\n"
-                 "message Foo {}\n");
-
-  Run("protocol_compiler --test_out=$tmpdir "
-      "--proto_path=$tmpdir foo.proto");
-
-  ExpectNoErrors();
-  ExpectGenerated("test_generator", "", "foo.proto", "Foo");
-}
-
-TEST_F(CommandLineInterfaceTest, BasicOutput_DescriptorSetIn) {
-  // Test that the common case works.
-  FileDescriptorSet file_descriptor_set;
-  FileDescriptorProto* file_descriptor_proto = file_descriptor_set.add_file();
-  file_descriptor_proto->set_name("foo.proto");
-  file_descriptor_proto->add_message_type()->set_name("Foo");
-
-  WriteDescriptorSet("foo.bin", &file_descriptor_set);
-
-  Run("protocol_compiler --test_out=$tmpdir "
-      "--descriptor_set_in=$tmpdir/foo.bin foo.proto");
-
-  ExpectNoErrors();
-  ExpectGenerated("test_generator", "", "foo.proto", "Foo");
-}
-
-TEST_F(CommandLineInterfaceTest, BasicPlugin) {
-  // Test that basic plugins work.
-
-  CreateTempFile("foo.proto",
-                 "syntax = \"proto2\";\n"
-                 "message Foo {}\n");
-
-  Run("protocol_compiler --plug_out=$tmpdir "
-      "--proto_path=$tmpdir foo.proto");
-
-  ExpectNoErrors();
-  ExpectGenerated("test_plugin", "", "foo.proto", "Foo");
-}
-
-TEST_F(CommandLineInterfaceTest, BasicPlugin_DescriptorSetIn) {
-  // Test that basic plugins work.
-
-  FileDescriptorSet file_descriptor_set;
-  FileDescriptorProto* file_descriptor_proto = file_descriptor_set.add_file();
-  file_descriptor_proto->set_name("foo.proto");
-  file_descriptor_proto->add_message_type()->set_name("Foo");
-
-  WriteDescriptorSet("foo.bin", &file_descriptor_set);
-
-  Run("protocol_compiler --plug_out=$tmpdir "
-      "--descriptor_set_in=$tmpdir/foo.bin foo.proto");
-
-  ExpectNoErrors();
-  ExpectGenerated("test_plugin", "", "foo.proto", "Foo");
-}
-
-TEST_F(CommandLineInterfaceTest, GeneratorAndPlugin) {
-  // Invoke a generator and a plugin at the same time.
-
-  CreateTempFile("foo.proto",
-                 "syntax = \"proto2\";\n"
-                 "message Foo {}\n");
-
-  Run("protocol_compiler --test_out=$tmpdir --plug_out=$tmpdir "
-      "--proto_path=$tmpdir foo.proto");
-
-  ExpectNoErrors();
-  ExpectGenerated("test_generator", "", "foo.proto", "Foo");
-  ExpectGenerated("test_plugin", "", "foo.proto", "Foo");
-}
-
-TEST_F(CommandLineInterfaceTest, GeneratorAndPlugin_DescriptorSetIn) {
-  // Invoke a generator and a plugin at the same time.
-
-  FileDescriptorSet file_descriptor_set;
-  FileDescriptorProto* file_descriptor_proto = file_descriptor_set.add_file();
-  file_descriptor_proto->set_name("foo.proto");
-  file_descriptor_proto->add_message_type()->set_name("Foo");
-
-  WriteDescriptorSet("foo.bin", &file_descriptor_set);
-
-  Run("protocol_compiler --test_out=$tmpdir --plug_out=$tmpdir "
-      "--descriptor_set_in=$tmpdir/foo.bin foo.proto");
-
-  ExpectNoErrors();
-  ExpectGenerated("test_generator", "", "foo.proto", "Foo");
-  ExpectGenerated("test_plugin", "", "foo.proto", "Foo");
-}
-
-TEST_F(CommandLineInterfaceTest, MultipleInputs) {
-  // Test parsing multiple input files.
-
-  CreateTempFile("foo.proto",
-                 "syntax = \"proto2\";\n"
-                 "message Foo {}\n");
-  CreateTempFile("bar.proto",
-                 "syntax = \"proto2\";\n"
-                 "message Bar {}\n");
-
-  Run("protocol_compiler --test_out=$tmpdir --plug_out=$tmpdir "
-      "--proto_path=$tmpdir foo.proto bar.proto");
-
-  ExpectNoErrors();
-  ExpectGeneratedWithMultipleInputs("test_generator", "foo.proto,bar.proto",
-                                    "foo.proto", "Foo");
-  ExpectGeneratedWithMultipleInputs("test_generator", "foo.proto,bar.proto",
-                                    "bar.proto", "Bar");
-  ExpectGeneratedWithMultipleInputs("test_plugin", "foo.proto,bar.proto",
-                                    "foo.proto", "Foo");
-  ExpectGeneratedWithMultipleInputs("test_plugin", "foo.proto,bar.proto",
-                                    "bar.proto", "Bar");
-}
-
-TEST_F(CommandLineInterfaceTest, MultipleInputs_DescriptorSetIn) {
-  // Test parsing multiple input files.
-  FileDescriptorSet file_descriptor_set;
-
-  FileDescriptorProto* file_descriptor_proto = file_descriptor_set.add_file();
-  file_descriptor_proto->set_name("foo.proto");
-  file_descriptor_proto->add_message_type()->set_name("Foo");
-
-  file_descriptor_proto = file_descriptor_set.add_file();
-  file_descriptor_proto->set_name("bar.proto");
-  file_descriptor_proto->add_message_type()->set_name("Bar");
-
-  WriteDescriptorSet("foo.bin", &file_descriptor_set);
-
-  Run("protocol_compiler --test_out=$tmpdir --plug_out=$tmpdir "
-      "--descriptor_set_in=$tmpdir/foo.bin foo.proto bar.proto");
-
-  ExpectNoErrors();
-  ExpectGeneratedWithMultipleInputs("test_generator", "foo.proto,bar.proto",
-                                    "foo.proto", "Foo");
-  ExpectGeneratedWithMultipleInputs("test_generator", "foo.proto,bar.proto",
-                                    "bar.proto", "Bar");
-  ExpectGeneratedWithMultipleInputs("test_plugin", "foo.proto,bar.proto",
-                                    "foo.proto", "Foo");
-  ExpectGeneratedWithMultipleInputs("test_plugin", "foo.proto,bar.proto",
-                                    "bar.proto", "Bar");
-}
-
-TEST_F(CommandLineInterfaceTest, MultipleInputs_UnusedImport_DescriptorSetIn) {
-  // Test unused import warning is not raised when descriptor_set_in is called
-  // and custom options are in unknown field instead of uninterpreted_options.
-  FileDescriptorSet file_descriptor_set;
-
-  const FileDescriptor* descriptor_file =
-      FileDescriptorProto::descriptor()->file();
-  descriptor_file->CopyTo(file_descriptor_set.add_file());
-
-  FileDescriptorProto& any_proto = *file_descriptor_set.add_file();
-  google::protobuf::Any::descriptor()->file()->CopyTo(&any_proto);
-
-  const FileDescriptor* custom_file =
-      protobuf_unittest::AggregateMessage::descriptor()->file();
-  FileDescriptorProto* file_descriptor_proto = file_descriptor_set.add_file();
-  custom_file->CopyTo(file_descriptor_proto);
-  file_descriptor_proto->set_name("custom_options.proto");
-  // Add a custom message option.
-  FieldDescriptorProto* extension_option =
-      file_descriptor_proto->add_extension();
-  extension_option->set_name("unknown_option");
-  extension_option->set_extendee(".google.protobuf.MessageOptions");
-  extension_option->set_number(1111);
-  extension_option->set_label(FieldDescriptorProto::LABEL_OPTIONAL);
-  extension_option->set_type(FieldDescriptorProto::TYPE_INT64);
-
-  file_descriptor_proto = file_descriptor_set.add_file();
-  file_descriptor_proto->set_name("import_custom_unknown_options.proto");
-  file_descriptor_proto->add_dependency("custom_options.proto");
-  // Add custom message option to unknown field. This custom option is
-  // not known in generated pool, thus option will be in unknown fields.
-  file_descriptor_proto->add_message_type()->set_name("Bar");
-  file_descriptor_proto->mutable_message_type(0)
-      ->mutable_options()
-      ->mutable_unknown_fields()
-      ->AddVarint(1111, 2222);
-
-  WriteDescriptorSet("foo.bin", &file_descriptor_set);
-
-  Run("protocol_compiler --test_out=$tmpdir --plug_out=$tmpdir "
-      "--descriptor_set_in=$tmpdir/foo.bin "
-      "import_custom_unknown_options.proto");
-
-  // TODO(jieluo): Fix this test. This test case only happens when
-  // CommandLineInterface::Run() is used instead of invoke protoc combined
-  // with descriptor_set_in, and same custom options are defined in both
-  // generated pool and descriptor_set_in. There's no such uages for now but
-  // still need to be fixed.
-  /*
-  file_descriptor_proto = file_descriptor_set.add_file();
-  file_descriptor_proto->set_name("import_custom_extension_options.proto");
-  file_descriptor_proto->add_dependency("custom_options.proto");
-  // Add custom message option to unknown field. This custom option is
-  // also defined in generated pool, thus option will be in extensions.
-  file_descriptor_proto->add_message_type()->set_name("Foo");
-  file_descriptor_proto->mutable_message_type(0)
-      ->mutable_options()
-      ->mutable_unknown_fields()
-      ->AddVarint(protobuf_unittest::message_opt1.number(), 2222);
-
-  WriteDescriptorSet("foo.bin", &file_descriptor_set);
-
-  Run("protocol_compiler --test_out=$tmpdir --plug_out=$tmpdir "
-      "--descriptor_set_in=$tmpdir/foo.bin import_custom_unknown_options.proto "
-      "import_custom_extension_options.proto");
-  */
-
-  ExpectNoErrors();
-}
-
-TEST_F(CommandLineInterfaceTest, MultipleInputsWithImport) {
-  // Test parsing multiple input files with an import of a separate file.
-
-  CreateTempFile("foo.proto",
-                 "syntax = \"proto2\";\n"
-                 "message Foo {}\n");
-  CreateTempFile("bar.proto",
-                 "syntax = \"proto2\";\n"
-                 "import \"baz.proto\";\n"
-                 "message Bar {\n"
-                 "  optional Baz a = 1;\n"
-                 "}\n");
-  CreateTempFile("baz.proto",
-                 "syntax = \"proto2\";\n"
-                 "message Baz {}\n");
-
-  Run("protocol_compiler --test_out=$tmpdir --plug_out=$tmpdir "
-      "--proto_path=$tmpdir foo.proto bar.proto");
-
-  ExpectNoErrors();
-  ExpectGeneratedWithMultipleInputs("test_generator", "foo.proto,bar.proto",
-                                    "foo.proto", "Foo");
-  ExpectGeneratedWithMultipleInputs("test_generator", "foo.proto,bar.proto",
-                                    "bar.proto", "Bar");
-  ExpectGeneratedWithMultipleInputs("test_plugin", "foo.proto,bar.proto",
-                                    "foo.proto", "Foo");
-  ExpectGeneratedWithMultipleInputs("test_plugin", "foo.proto,bar.proto",
-                                    "bar.proto", "Bar");
-}
-
-TEST_F(CommandLineInterfaceTest, MultipleInputsWithImport_DescriptorSetIn) {
-  // Test parsing multiple input files with an import of a separate file.
-  FileDescriptorSet file_descriptor_set;
-
-  FileDescriptorProto* file_descriptor_proto = file_descriptor_set.add_file();
-  file_descriptor_proto->set_name("foo.proto");
-  file_descriptor_proto->add_message_type()->set_name("Foo");
-
-  file_descriptor_proto = file_descriptor_set.add_file();
-  file_descriptor_proto->set_name("bar.proto");
-  file_descriptor_proto->add_dependency("baz.proto");
-  DescriptorProto* message = file_descriptor_proto->add_message_type();
-  message->set_name("Bar");
-  FieldDescriptorProto* field = message->add_field();
-  field->set_type_name("Baz");
-  field->set_name("a");
-  field->set_number(1);
-
-  WriteDescriptorSet("foo_and_bar.bin", &file_descriptor_set);
-
-  file_descriptor_set.clear_file();
-  file_descriptor_proto = file_descriptor_set.add_file();
-  file_descriptor_proto->set_name("baz.proto");
-  file_descriptor_proto->add_message_type()->set_name("Baz");
-
-  file_descriptor_proto = file_descriptor_set.add_file();
-  file_descriptor_proto->set_name("bat.proto");
-  file_descriptor_proto->add_dependency("baz.proto");
-  message = file_descriptor_proto->add_message_type();
-  message->set_name("Bat");
-  field = message->add_field();
-  field->set_type_name("Baz");
-  field->set_name("a");
-  field->set_number(1);
-
-  WriteDescriptorSet("baz_and_bat.bin", &file_descriptor_set);
-  Run(strings::Substitute(
-      "protocol_compiler --test_out=$$tmpdir --plug_out=$$tmpdir "
-      "--descriptor_set_in=$0 foo.proto bar.proto",
-      std::string("$tmpdir/foo_and_bar.bin") +
-          CommandLineInterface::kPathSeparator + "$tmpdir/baz_and_bat.bin"));
-
-  ExpectNoErrors();
-  ExpectGeneratedWithMultipleInputs("test_generator", "foo.proto,bar.proto",
-                                    "foo.proto", "Foo");
-  ExpectGeneratedWithMultipleInputs("test_generator", "foo.proto,bar.proto",
-                                    "bar.proto", "Bar");
-  ExpectGeneratedWithMultipleInputs("test_plugin", "foo.proto,bar.proto",
-                                    "foo.proto", "Foo");
-  ExpectGeneratedWithMultipleInputs("test_plugin", "foo.proto,bar.proto",
-                                    "bar.proto", "Bar");
-
-  Run(strings::Substitute(
-      "protocol_compiler --test_out=$$tmpdir --plug_out=$$tmpdir "
-      "--descriptor_set_in=$0 baz.proto bat.proto",
-      std::string("$tmpdir/foo_and_bar.bin") +
-          CommandLineInterface::kPathSeparator + "$tmpdir/baz_and_bat.bin"));
-
-  ExpectNoErrors();
-  ExpectGeneratedWithMultipleInputs("test_generator", "baz.proto,bat.proto",
-                                    "baz.proto", "Baz");
-  ExpectGeneratedWithMultipleInputs("test_generator", "baz.proto,bat.proto",
-                                    "bat.proto", "Bat");
-  ExpectGeneratedWithMultipleInputs("test_plugin", "baz.proto,bat.proto",
-                                    "baz.proto", "Baz");
-  ExpectGeneratedWithMultipleInputs("test_plugin", "baz.proto,bat.proto",
-                                    "bat.proto", "Bat");
-}
-
-TEST_F(CommandLineInterfaceTest,
-       MultipleInputsWithImport_DescriptorSetIn_DuplicateFileDescriptor) {
-  // Test parsing multiple input files with an import of a separate file.
-  FileDescriptorSet file_descriptor_set;
-
-  FileDescriptorProto foo_file_descriptor_proto;
-  foo_file_descriptor_proto.set_name("foo.proto");
-  foo_file_descriptor_proto.add_message_type()->set_name("Foo");
-
-  file_descriptor_set.add_file()->CopyFrom(foo_file_descriptor_proto);
-
-  FileDescriptorProto* file_descriptor_proto = file_descriptor_set.add_file();
-  file_descriptor_proto->set_name("bar.proto");
-  file_descriptor_proto->add_dependency("baz.proto");
-  file_descriptor_proto->add_dependency("foo.proto");
-  DescriptorProto* message = file_descriptor_proto->add_message_type();
-  message->set_name("Bar");
-  FieldDescriptorProto* field = message->add_field();
-  field->set_type_name("Baz");
-  field->set_name("a");
-  field->set_number(1);
-  field = message->add_field();
-  field->set_type_name("Foo");
-  field->set_name("f");
-  field->set_number(2);
-  WriteDescriptorSet("foo_and_bar.bin", &file_descriptor_set);
-
-  file_descriptor_set.clear_file();
-  file_descriptor_set.add_file()->CopyFrom(foo_file_descriptor_proto);
-
-  file_descriptor_proto = file_descriptor_set.add_file();
-  file_descriptor_proto->set_name("baz.proto");
-  file_descriptor_proto->add_dependency("foo.proto");
-  message = file_descriptor_proto->add_message_type();
-  message->set_name("Baz");
-  field = message->add_field();
-  field->set_type_name("Foo");
-  field->set_name("f");
-  field->set_number(1);
-  WriteDescriptorSet("foo_and_baz.bin", &file_descriptor_set);
-
-  Run(strings::Substitute(
-      "protocol_compiler --test_out=$$tmpdir --plug_out=$$tmpdir "
-      "--descriptor_set_in=$0 bar.proto",
-      std::string("$tmpdir/foo_and_bar.bin") +
-          CommandLineInterface::kPathSeparator + "$tmpdir/foo_and_baz.bin"));
-
-  ExpectNoErrors();
-  ExpectGenerated("test_generator", "", "bar.proto", "Bar");
-  ExpectGenerated("test_plugin", "", "bar.proto", "Bar");
-}
-
-TEST_F(CommandLineInterfaceTest,
-       MultipleInputsWithImport_DescriptorSetIn_MissingImport) {
-  // Test parsing multiple input files with an import of a separate file.
-  FileDescriptorSet file_descriptor_set;
-
-  FileDescriptorProto* file_descriptor_proto = file_descriptor_set.add_file();
-  file_descriptor_proto->set_name("foo.proto");
-  file_descriptor_proto->add_message_type()->set_name("Foo");
-
-  file_descriptor_proto = file_descriptor_set.add_file();
-  file_descriptor_proto->set_name("bar.proto");
-  file_descriptor_proto->add_dependency("baz.proto");
-  DescriptorProto* message = file_descriptor_proto->add_message_type();
-  message->set_name("Bar");
-  FieldDescriptorProto* field = message->add_field();
-  field->set_type_name("Baz");
-  field->set_name("a");
-  field->set_number(1);
-
-  WriteDescriptorSet("foo_and_bar.bin", &file_descriptor_set);
-
-  file_descriptor_set.clear_file();
-  file_descriptor_proto = file_descriptor_set.add_file();
-  file_descriptor_proto->set_name("baz.proto");
-  file_descriptor_proto->add_message_type()->set_name("Baz");
-
-  WriteDescriptorSet("baz.bin", &file_descriptor_set);
-  Run("protocol_compiler --test_out=$tmpdir --plug_out=$tmpdir "
-      "--descriptor_set_in=$tmpdir/foo_and_bar.bin "
-      "foo.proto bar.proto");
-  ExpectErrorSubstring(
-      "bar.proto: Import \"baz.proto\" was not found or had errors.");
-  ExpectErrorSubstring("bar.proto: \"Baz\" is not defined.");
-}
-
-TEST_F(CommandLineInterfaceTest,
-       InputsOnlyFromDescriptorSetIn_UnusedImportIsNotReported) {
-  FileDescriptorSet file_descriptor_set;
-
-  FileDescriptorProto* file_descriptor_proto = file_descriptor_set.add_file();
-  file_descriptor_proto->set_name("unused.proto");
-  file_descriptor_proto->add_message_type()->set_name("Unused");
-
-  file_descriptor_proto = file_descriptor_set.add_file();
-  file_descriptor_proto->set_name("bar.proto");
-  file_descriptor_proto->add_dependency("unused.proto");
-  file_descriptor_proto->add_message_type()->set_name("Bar");
-
-  WriteDescriptorSet("unused_and_bar.bin", &file_descriptor_set);
-
-  Run("protocol_compiler --test_out=$tmpdir --plug_out=$tmpdir "
-      "--descriptor_set_in=$tmpdir/unused_and_bar.bin unused.proto bar.proto");
-  ExpectNoErrors();
-}
-
-TEST_F(CommandLineInterfaceTest,
-       InputsFromDescriptorSetInAndFileSystem_UnusedImportIsReported) {
-  FileDescriptorSet file_descriptor_set;
-
-  FileDescriptorProto* file_descriptor_proto = file_descriptor_set.add_file();
-  file_descriptor_proto->set_name("unused.proto");
-  file_descriptor_proto->add_message_type()->set_name("Unused");
-
-  file_descriptor_proto = file_descriptor_set.add_file();
-  file_descriptor_proto->set_name("bar.proto");
-  file_descriptor_proto->add_dependency("unused.proto");
-  file_descriptor_proto->add_message_type()->set_name("Bar");
-
-  WriteDescriptorSet("unused_and_bar.bin", &file_descriptor_set);
-
-  CreateTempFile("foo.proto",
-                 "syntax = \"proto2\";\n"
-                 "import \"bar.proto\";\n"
-                 "message Foo {\n"
-                 "  optional Bar bar = 1;\n"
-                 "}\n");
-
-  Run("protocol_compiler --test_out=$tmpdir --plug_out=$tmpdir "
-      "--descriptor_set_in=$tmpdir/unused_and_bar.bin "
-      "--proto_path=$tmpdir unused.proto bar.proto foo.proto");
-  // Reporting unused imports here is unfair, since it's unactionable. Notice
-  // the lack of a line number.
-  // TODO(b/144853061): If the file with unused import is from the descriptor
-  // set and not from the file system, suppress the warning.
-  ExpectWarningSubstring("bar.proto: warning: Import unused.proto is unused.");
-}
-
-TEST_F(CommandLineInterfaceTest,
-       OnlyReportsUnusedImportsForFilesBeingGenerated) {
-  CreateTempFile("unused.proto",
-                 "syntax = \"proto2\";\n"
-                 "message Unused {}\n");
-  CreateTempFile("bar.proto",
-                 "syntax = \"proto2\";\n"
-                 "import \"unused.proto\";\n"
-                 "message Bar {}\n");
-  CreateTempFile("foo.proto",
-                 "syntax = \"proto2\";\n"
-                 "import \"bar.proto\";\n"
-                 "message Foo {\n"
-                 "  optional Bar bar = 1;\n"
-                 "}\n");
-
-  Run("protocol_compiler --test_out=$tmpdir "
-      "--proto_path=$tmpdir foo.proto");
-  ExpectNoErrors();
-}
-
-TEST_F(CommandLineInterfaceTest, ReportsTransitiveMisingImports_LeafFirst) {
-  CreateTempFile("unused.proto",
-                 "syntax = \"proto2\";\n"
-                 "message Unused {}\n");
-  CreateTempFile("bar.proto",
-                 "syntax = \"proto2\";\n"
-                 "import \"unused.proto\";\n"
-                 "message Bar {}\n");
-  CreateTempFile("foo.proto",
-                 "syntax = \"proto2\";\n"
-                 "import \"bar.proto\";\n"
-                 "message Foo {\n"
-                 "  optional Bar bar = 1;\n"
-                 "}\n");
-
-  Run("protocol_compiler --test_out=$tmpdir "
-      "--proto_path=$tmpdir bar.proto foo.proto");
-  ExpectWarningSubstring(
-      "bar.proto:2:1: warning: Import unused.proto is unused.");
-}
-
-TEST_F(CommandLineInterfaceTest, ReportsTransitiveMisingImports_LeafLast) {
-  CreateTempFile("unused.proto",
-                 "syntax = \"proto2\";\n"
-                 "message Unused {}\n");
-  CreateTempFile("bar.proto",
-                 "syntax = \"proto2\";\n"
-                 "import \"unused.proto\";\n"
-                 "message Bar {}\n");
-  CreateTempFile("foo.proto",
-                 "syntax = \"proto2\";\n"
-                 "import \"bar.proto\";\n"
-                 "message Foo {\n"
-                 "  optional Bar bar = 1;\n"
-                 "}\n");
-
-  Run("protocol_compiler --test_out=$tmpdir "
-      "--proto_path=$tmpdir foo.proto bar.proto");
-  ExpectWarningSubstring(
-      "bar.proto:2:1: warning: Import unused.proto is unused.");
-}
-TEST_F(CommandLineInterfaceTest, CreateDirectory) {
-  // Test that when we output to a sub-directory, it is created.
-
-  CreateTempFile("bar/baz/foo.proto",
-                 "syntax = \"proto2\";\n"
-                 "message Foo {}\n");
-  CreateTempDir("out");
-  CreateTempDir("plugout");
-
-  Run("protocol_compiler --test_out=$tmpdir/out --plug_out=$tmpdir/plugout "
-      "--proto_path=$tmpdir bar/baz/foo.proto");
-
-  ExpectNoErrors();
-  ExpectGenerated("test_generator", "", "bar/baz/foo.proto", "Foo", "out");
-  ExpectGenerated("test_plugin", "", "bar/baz/foo.proto", "Foo", "plugout");
-}
-
-TEST_F(CommandLineInterfaceTest, GeneratorParameters) {
-  // Test that generator parameters are correctly parsed from the command line.
-
-  CreateTempFile("foo.proto",
-                 "syntax = \"proto2\";\n"
-                 "message Foo {}\n");
-
-  Run("protocol_compiler --test_out=TestParameter:$tmpdir "
-      "--plug_out=TestPluginParameter:$tmpdir "
-      "--proto_path=$tmpdir foo.proto");
-
-  ExpectNoErrors();
-  ExpectGenerated("test_generator", "TestParameter", "foo.proto", "Foo");
-  ExpectGenerated("test_plugin", "TestPluginParameter", "foo.proto", "Foo");
-}
-
-TEST_F(CommandLineInterfaceTest, ExtraGeneratorParameters) {
-  // Test that generator parameters specified with the option flag are
-  // correctly passed to the code generator.
-
-  CreateTempFile("foo.proto",
-                 "syntax = \"proto2\";\n"
-                 "message Foo {}\n");
-  // Create the "a" and "b" sub-directories.
-  CreateTempDir("a");
-  CreateTempDir("b");
-
-  Run("protocol_compiler "
-      "--test_opt=foo1 "
-      "--test_out=bar:$tmpdir/a "
-      "--test_opt=foo2 "
-      "--test_out=baz:$tmpdir/b "
-      "--test_opt=foo3 "
-      "--proto_path=$tmpdir foo.proto");
-
-  ExpectNoErrors();
-  ExpectGenerated("test_generator", "bar,foo1,foo2,foo3", "foo.proto", "Foo",
-                  "a");
-  ExpectGenerated("test_generator", "baz,foo1,foo2,foo3", "foo.proto", "Foo",
-                  "b");
-}
-
-TEST_F(CommandLineInterfaceTest, ExtraPluginParameters) {
-  // Test that generator parameters specified with the option flag are
-  // correctly passed to the code generator.
-
-  CreateTempFile("foo.proto",
-                 "syntax = \"proto2\";\n"
-                 "message Foo {}\n");
-  // Create the "a" and "b" sub-directories.
-  CreateTempDir("a");
-  CreateTempDir("b");
-
-  Run("protocol_compiler "
-      "--plug_opt=foo1 "
-      "--plug_out=bar:$tmpdir/a "
-      "--plug_opt=foo2 "
-      "--plug_out=baz:$tmpdir/b "
-      "--plug_opt=foo3 "
-      "--proto_path=$tmpdir foo.proto");
-
-  ExpectNoErrors();
-  ExpectGenerated("test_plugin", "bar,foo1,foo2,foo3", "foo.proto", "Foo", "a");
-  ExpectGenerated("test_plugin", "baz,foo1,foo2,foo3", "foo.proto", "Foo", "b");
-}
-
-TEST_F(CommandLineInterfaceTest, UnrecognizedExtraParameters) {
-  CreateTempFile("foo.proto",
-                 "syntax = \"proto2\";\n"
-                 "message Foo {}\n");
-
-  Run("protocol_compiler --plug_out=TestParameter:$tmpdir "
-      "--unknown_plug_a_opt=Foo "
-      "--unknown_plug_b_opt=Bar "
-      "--proto_path=$tmpdir foo.proto");
-
-  ExpectErrorSubstring("Unknown flag: --unknown_plug_a_opt");
-  ExpectErrorSubstring("Unknown flag: --unknown_plug_b_opt");
-}
-
-TEST_F(CommandLineInterfaceTest, ExtraPluginParametersForOutParameters) {
-  // This doesn't rely on the plugin having been registered and instead that
-  // the existence of --[name]_out is enough to make the --[name]_opt valid.
-  // However, running out of process plugins found via the search path (i.e. -
-  // not pre registered with --plugin) isn't support in this test suite, so we
-  // list the options pre/post the _out directive, and then include _opt that
-  // will be unknown, and confirm the failure output is about the expected
-  // unknown directive, which means the other were accepted.
-  // NOTE: UnrecognizedExtraParameters confirms that if two unknown _opt
-  // directives appear, they both are reported.
-
-  CreateTempFile("foo.proto",
-                 "syntax = \"proto2\";\n"
-                 "message Foo {}\n");
-
-  Run("protocol_compiler --plug_out=TestParameter:$tmpdir "
-      "--xyz_opt=foo=bar --xyz_out=$tmpdir "
-      "--abc_out=$tmpdir --abc_opt=foo=bar "
-      "--unknown_plug_opt=Foo "
-      "--proto_path=$tmpdir foo.proto");
-
-  ExpectErrorText("Unknown flag: --unknown_plug_opt\n");
-}
-
-TEST_F(CommandLineInterfaceTest, Insert) {
-  // Test running a generator that inserts code into another's output.
-
-  CreateTempFile("foo.proto",
-                 "syntax = \"proto2\";\n"
-                 "message Foo {}\n");
-
-  Run("protocol_compiler "
-      "--test_out=TestParameter:$tmpdir "
-      "--plug_out=TestPluginParameter:$tmpdir "
-      "--test_out=insert=test_generator,test_plugin:$tmpdir "
-      "--plug_out=insert=test_generator,test_plugin:$tmpdir "
-      "--proto_path=$tmpdir foo.proto");
-
-  ExpectNoErrors();
-  ExpectGeneratedWithInsertions("test_generator", "TestParameter",
-                                "test_generator,test_plugin", "foo.proto",
-                                "Foo");
-  ExpectGeneratedWithInsertions("test_plugin", "TestPluginParameter",
-                                "test_generator,test_plugin", "foo.proto",
-                                "Foo");
-}
-
-TEST_F(CommandLineInterfaceTest, InsertWithAnnotationFixup) {
-  // Check that annotation spans are updated after insertions.
-
-  CreateTempFile("foo.proto",
-                 "syntax = \"proto2\";\n"
-                 "message MockCodeGenerator_Annotate {}\n");
-
-  Run("protocol_compiler "
-      "--test_out=TestParameter:$tmpdir "
-      "--plug_out=TestPluginParameter:$tmpdir "
-      "--test_out=insert_endlines=test_generator,test_plugin:$tmpdir "
-      "--plug_out=insert_endlines=test_generator,test_plugin:$tmpdir "
-      "--proto_path=$tmpdir foo.proto");
-
-  ExpectNoErrors();
-  CheckGeneratedAnnotations("test_generator", "foo.proto");
-  CheckGeneratedAnnotations("test_plugin", "foo.proto");
-}
-
-#if defined(_WIN32)
-
-TEST_F(CommandLineInterfaceTest, WindowsOutputPath) {
-  // Test that the output path can be a Windows-style path.
-
-  CreateTempFile("foo.proto", "syntax = \"proto2\";\n");
-
-  Run("protocol_compiler --null_out=C:\\ "
-      "--proto_path=$tmpdir foo.proto");
-
-  ExpectNoErrors();
-  ExpectNullCodeGeneratorCalled("");
-}
-
-TEST_F(CommandLineInterfaceTest, WindowsOutputPathAndParameter) {
-  // Test that we can have a windows-style output path and a parameter.
-
-  CreateTempFile("foo.proto", "syntax = \"proto2\";\n");
-
-  Run("protocol_compiler --null_out=bar:C:\\ "
-      "--proto_path=$tmpdir foo.proto");
-
-  ExpectNoErrors();
-  ExpectNullCodeGeneratorCalled("bar");
-}
-
-TEST_F(CommandLineInterfaceTest, TrailingBackslash) {
-  // Test that the directories can end in backslashes.  Some users claim this
-  // doesn't work on their system.
-
-  CreateTempFile("foo.proto",
-                 "syntax = \"proto2\";\n"
-                 "message Foo {}\n");
-
-  Run("protocol_compiler --test_out=$tmpdir\\ "
-      "--proto_path=$tmpdir\\ foo.proto");
-
-  ExpectNoErrors();
-  ExpectGenerated("test_generator", "", "foo.proto", "Foo");
-}
-
-TEST_F(CommandLineInterfaceTest, Win32ErrorMessage) {
-  EXPECT_EQ("The system cannot find the file specified.\r\n",
-            Subprocess::Win32ErrorMessage(ERROR_FILE_NOT_FOUND));
-}
-
-#endif  // defined(_WIN32) || defined(__CYGWIN__)
-
-TEST_F(CommandLineInterfaceTest, PathLookup) {
-  // Test that specifying multiple directories in the proto search path works.
-
-  CreateTempFile("b/bar.proto",
-                 "syntax = \"proto2\";\n"
-                 "message Bar {}\n");
-  CreateTempFile("a/foo.proto",
-                 "syntax = \"proto2\";\n"
-                 "import \"bar.proto\";\n"
-                 "message Foo {\n"
-                 "  optional Bar a = 1;\n"
-                 "}\n");
-  CreateTempFile("b/foo.proto", "this should not be parsed\n");
-
-  Run("protocol_compiler --test_out=$tmpdir "
-      "--proto_path=$tmpdir/a --proto_path=$tmpdir/b foo.proto");
-
-  ExpectNoErrors();
-  ExpectGenerated("test_generator", "", "foo.proto", "Foo");
-}
-
-TEST_F(CommandLineInterfaceTest, ColonDelimitedPath) {
-  // Same as PathLookup, but we provide the proto_path in a single flag.
-
-  CreateTempFile("b/bar.proto",
-                 "syntax = \"proto2\";\n"
-                 "message Bar {}\n");
-  CreateTempFile("a/foo.proto",
-                 "syntax = \"proto2\";\n"
-                 "import \"bar.proto\";\n"
-                 "message Foo {\n"
-                 "  optional Bar a = 1;\n"
-                 "}\n");
-  CreateTempFile("b/foo.proto", "this should not be parsed\n");
-
-  Run(strings::Substitute(
-      "protocol_compiler --test_out=$$tmpdir --proto_path=$0 foo.proto",
-      std::string("$tmpdir/a") + CommandLineInterface::kPathSeparator +
-          "$tmpdir/b"));
-
-  ExpectNoErrors();
-  ExpectGenerated("test_generator", "", "foo.proto", "Foo");
-}
-
-TEST_F(CommandLineInterfaceTest, NonRootMapping) {
-  // Test setting up a search path mapping a directory to a non-root location.
-
-  CreateTempFile("foo.proto",
-                 "syntax = \"proto2\";\n"
-                 "message Foo {}\n");
-
-  Run("protocol_compiler --test_out=$tmpdir "
-      "--proto_path=bar=$tmpdir bar/foo.proto");
-
-  ExpectNoErrors();
-  ExpectGenerated("test_generator", "", "bar/foo.proto", "Foo");
-}
-
-TEST_F(CommandLineInterfaceTest, PathWithEqualsSign) {
-  // Test setting up a search path which happens to have '=' in it.
-
-  CreateTempDir("with=sign");
-  CreateTempFile("with=sign/foo.proto",
-                 "syntax = \"proto2\";\n"
-                 "message Foo {}\n");
-
-  Run("protocol_compiler --test_out=$tmpdir "
-      "--proto_path=$tmpdir/with=sign foo.proto");
-
-  ExpectNoErrors();
-  ExpectGenerated("test_generator", "", "foo.proto", "Foo");
-}
-
-TEST_F(CommandLineInterfaceTest, MultipleGenerators) {
-  // Test that we can have multiple generators and use both in one invocation,
-  // each with a different output directory.
-
-  CreateTempFile("foo.proto",
-                 "syntax = \"proto2\";\n"
-                 "message Foo {}\n");
-  // Create the "a" and "b" sub-directories.
-  CreateTempDir("a");
-  CreateTempDir("b");
-
-  Run("protocol_compiler "
-      "--test_out=$tmpdir/a "
-      "--alt_out=$tmpdir/b "
-      "--proto_path=$tmpdir foo.proto");
-
-  ExpectNoErrors();
-  ExpectGenerated("test_generator", "", "foo.proto", "Foo", "a");
-  ExpectGenerated("alt_generator", "", "foo.proto", "Foo", "b");
-}
-
-TEST_F(CommandLineInterfaceTest, DisallowServicesNoServices) {
-  // Test that --disallow_services doesn't cause a problem when there are no
-  // services.
-
-  CreateTempFile("foo.proto",
-                 "syntax = \"proto2\";\n"
-                 "message Foo {}\n");
-
-  Run("protocol_compiler --disallow_services --test_out=$tmpdir "
-      "--proto_path=$tmpdir foo.proto");
-
-  ExpectNoErrors();
-  ExpectGenerated("test_generator", "", "foo.proto", "Foo");
-}
-
-TEST_F(CommandLineInterfaceTest, DisallowServicesHasService) {
-  // Test that --disallow_services produces an error when there are services.
-
-  CreateTempFile("foo.proto",
-                 "syntax = \"proto2\";\n"
-                 "message Foo {}\n"
-                 "service Bar {}\n");
-
-  Run("protocol_compiler --disallow_services --test_out=$tmpdir "
-      "--proto_path=$tmpdir foo.proto");
-
-  ExpectErrorSubstring("foo.proto: This file contains services");
-}
-
-TEST_F(CommandLineInterfaceTest, AllowServicesHasService) {
-  // Test that services work fine as long as --disallow_services is not used.
-
-  CreateTempFile("foo.proto",
-                 "syntax = \"proto2\";\n"
-                 "message Foo {}\n"
-                 "service Bar {}\n");
-
-  Run("protocol_compiler --test_out=$tmpdir "
-      "--proto_path=$tmpdir foo.proto");
-
-  ExpectNoErrors();
-  ExpectGenerated("test_generator", "", "foo.proto", "Foo");
-}
-
-
-TEST_F(CommandLineInterfaceTest, DirectDependencies_Missing_EmptyList) {
-  CreateTempFile("foo.proto",
-                 "syntax = \"proto2\";\n"
-                 "import \"bar.proto\";\n"
-                 "message Foo { optional Bar bar = 1; }");
-  CreateTempFile("bar.proto",
-                 "syntax = \"proto2\";\n"
-                 "message Bar { optional string text = 1; }");
-
-  Run("protocol_compiler --test_out=$tmpdir --proto_path=$tmpdir "
-      "--direct_dependencies= foo.proto");
-
-  ExpectErrorText(
-      "foo.proto: File is imported but not declared in --direct_dependencies: "
-      "bar.proto\n");
-}
-
-TEST_F(CommandLineInterfaceTest, DirectDependencies_Missing) {
-  CreateTempFile("foo.proto",
-                 "syntax = \"proto2\";\n"
-                 "import \"bar.proto\";\n"
-                 "import \"bla.proto\";\n"
-                 "message Foo { optional Bar bar = 1; optional Bla bla = 2; }");
-  CreateTempFile("bar.proto",
-                 "syntax = \"proto2\";\n"
-                 "message Bar { optional string text = 1; }");
-  CreateTempFile("bla.proto",
-                 "syntax = \"proto2\";\n"
-                 "message Bla { optional int64 number = 1; }");
-
-  Run("protocol_compiler --test_out=$tmpdir --proto_path=$tmpdir "
-      "--direct_dependencies=bla.proto foo.proto");
-
-  ExpectErrorText(
-      "foo.proto: File is imported but not declared in --direct_dependencies: "
-      "bar.proto\n");
-}
-
-TEST_F(CommandLineInterfaceTest, DirectDependencies_NoViolation) {
-  CreateTempFile("foo.proto",
-                 "syntax = \"proto2\";\n"
-                 "import \"bar.proto\";\n"
-                 "message Foo { optional Bar bar = 1; }");
-  CreateTempFile("bar.proto",
-                 "syntax = \"proto2\";\n"
-                 "message Bar { optional string text = 1; }");
-
-  Run("protocol_compiler --test_out=$tmpdir --proto_path=$tmpdir "
-      "--direct_dependencies=bar.proto foo.proto");
-
-  ExpectNoErrors();
-}
-
-TEST_F(CommandLineInterfaceTest, DirectDependencies_NoViolation_MultiImports) {
-  CreateTempFile("foo.proto",
-                 "syntax = \"proto2\";\n"
-                 "import \"bar.proto\";\n"
-                 "import \"bla.proto\";\n"
-                 "message Foo { optional Bar bar = 1; optional Bla bla = 2; }");
-  CreateTempFile("bar.proto",
-                 "syntax = \"proto2\";\n"
-                 "message Bar { optional string text = 1; }");
-  CreateTempFile("bla.proto",
-                 "syntax = \"proto2\";\n"
-                 "message Bla { optional int64 number = 1; }");
-
-  Run("protocol_compiler --test_out=$tmpdir --proto_path=$tmpdir "
-      "--direct_dependencies=bar.proto:bla.proto foo.proto");
-
-  ExpectNoErrors();
-}
-
-TEST_F(CommandLineInterfaceTest, DirectDependencies_ProvidedMultipleTimes) {
-  CreateTempFile("foo.proto", "syntax = \"proto2\";\n");
-
-  Run("protocol_compiler --test_out=$tmpdir --proto_path=$tmpdir "
-      "--direct_dependencies=bar.proto --direct_dependencies=bla.proto "
-      "foo.proto");
-
-  ExpectErrorText(
-      "--direct_dependencies may only be passed once. To specify multiple "
-      "direct dependencies, pass them all as a single parameter separated by "
-      "':'.\n");
-}
-
-TEST_F(CommandLineInterfaceTest, DirectDependencies_CustomErrorMessage) {
-  CreateTempFile("foo.proto",
-                 "syntax = \"proto2\";\n"
-                 "import \"bar.proto\";\n"
-                 "message Foo { optional Bar bar = 1; }");
-  CreateTempFile("bar.proto",
-                 "syntax = \"proto2\";\n"
-                 "message Bar { optional string text = 1; }");
-
-  std::vector<std::string> commands;
-  commands.push_back("protocol_compiler");
-  commands.push_back("--test_out=$tmpdir");
-  commands.push_back("--proto_path=$tmpdir");
-  commands.push_back("--direct_dependencies=");
-  commands.push_back("--direct_dependencies_violation_msg=Bla \"%s\" Bla");
-  commands.push_back("foo.proto");
-  RunWithArgs(commands);
-
-  ExpectErrorText("foo.proto: Bla \"bar.proto\" Bla\n");
-}
-
-TEST_F(CommandLineInterfaceTest, CwdRelativeInputs) {
-  // Test that we can accept working-directory-relative input files.
-
-  CreateTempFile("foo.proto",
-                 "syntax = \"proto2\";\n"
-                 "message Foo {}\n");
-
-  Run("protocol_compiler --test_out=$tmpdir "
-      "--proto_path=$tmpdir $tmpdir/foo.proto");
-
-  ExpectNoErrors();
-  ExpectGenerated("test_generator", "", "foo.proto", "Foo");
-}
-
-TEST_F(CommandLineInterfaceTest, WriteDescriptorSet) {
-  CreateTempFile("foo.proto",
-                 "syntax = \"proto2\";\n"
-                 "message Foo {}\n");
-  CreateTempFile("bar.proto",
-                 "syntax = \"proto2\";\n"
-                 "import \"foo.proto\";\n"
-                 "message Bar {\n"
-                 "  optional Foo foo = 1;\n"
-                 "}\n");
-
-  Run("protocol_compiler --descriptor_set_out=$tmpdir/descriptor_set "
-      "--proto_path=$tmpdir bar.proto");
-
-  ExpectNoErrors();
-
-  FileDescriptorSet descriptor_set;
-  ReadDescriptorSet("descriptor_set", &descriptor_set);
-  if (HasFatalFailure()) return;
-  EXPECT_EQ(1, descriptor_set.file_size());
-  EXPECT_EQ("bar.proto", descriptor_set.file(0).name());
-  // Descriptor set should not have source code info.
-  EXPECT_FALSE(descriptor_set.file(0).has_source_code_info());
-  // Descriptor set should have json_name.
-  EXPECT_EQ("Bar", descriptor_set.file(0).message_type(0).name());
-  EXPECT_EQ("foo", descriptor_set.file(0).message_type(0).field(0).name());
-  EXPECT_TRUE(descriptor_set.file(0).message_type(0).field(0).has_json_name());
-}
-
-TEST_F(CommandLineInterfaceTest, WriteDescriptorSetWithDuplicates) {
-  CreateTempFile("foo.proto",
-                 "syntax = \"proto2\";\n"
-                 "message Foo {}\n");
-  CreateTempFile("bar.proto",
-                 "syntax = \"proto2\";\n"
-                 "import \"foo.proto\";\n"
-                 "message Bar {\n"
-                 "  optional Foo foo = 1;\n"
-                 "}\n");
-  CreateTempFile("baz.proto",
-                 "syntax = \"proto2\";\n"
-                 "import \"foo.proto\";\n"
-                 "message Baz {\n"
-                 "  optional Foo foo = 1;\n"
-                 "}\n");
-
-  Run("protocol_compiler --descriptor_set_out=$tmpdir/descriptor_set "
-      "--proto_path=$tmpdir bar.proto foo.proto bar.proto baz.proto");
-
-  ExpectNoErrors();
-
-  FileDescriptorSet descriptor_set;
-  ReadDescriptorSet("descriptor_set", &descriptor_set);
-  if (HasFatalFailure()) return;
-  EXPECT_EQ(3, descriptor_set.file_size());
-  // foo should come first since the output is in dependency order.
-  // since bar and baz are unordered, they should be in command line order.
-  EXPECT_EQ("foo.proto", descriptor_set.file(0).name());
-  EXPECT_EQ("bar.proto", descriptor_set.file(1).name());
-  EXPECT_EQ("baz.proto", descriptor_set.file(2).name());
-  // Descriptor set should not have source code info.
-  EXPECT_FALSE(descriptor_set.file(0).has_source_code_info());
-  // Descriptor set should have json_name.
-  EXPECT_EQ("Bar", descriptor_set.file(1).message_type(0).name());
-  EXPECT_EQ("foo", descriptor_set.file(1).message_type(0).field(0).name());
-  EXPECT_TRUE(descriptor_set.file(1).message_type(0).field(0).has_json_name());
-}
-
-TEST_F(CommandLineInterfaceTest, WriteDescriptorSetWithSourceInfo) {
-  CreateTempFile("foo.proto",
-                 "syntax = \"proto2\";\n"
-                 "message Foo {}\n");
-  CreateTempFile("bar.proto",
-                 "syntax = \"proto2\";\n"
-                 "import \"foo.proto\";\n"
-                 "message Bar {\n"
-                 "  optional Foo foo = 1;\n"
-                 "}\n");
-
-  Run("protocol_compiler --descriptor_set_out=$tmpdir/descriptor_set "
-      "--include_source_info --proto_path=$tmpdir bar.proto");
-
-  ExpectNoErrors();
-
-  FileDescriptorSet descriptor_set;
-  ReadDescriptorSet("descriptor_set", &descriptor_set);
-  if (HasFatalFailure()) return;
-  EXPECT_EQ(1, descriptor_set.file_size());
-  EXPECT_EQ("bar.proto", descriptor_set.file(0).name());
-  // Source code info included.
-  EXPECT_TRUE(descriptor_set.file(0).has_source_code_info());
-}
-
-TEST_F(CommandLineInterfaceTest, WriteTransitiveDescriptorSet) {
-  CreateTempFile("foo.proto",
-                 "syntax = \"proto2\";\n"
-                 "message Foo {}\n");
-  CreateTempFile("bar.proto",
-                 "syntax = \"proto2\";\n"
-                 "import \"foo.proto\";\n"
-                 "message Bar {\n"
-                 "  optional Foo foo = 1;\n"
-                 "}\n");
-
-  Run("protocol_compiler --descriptor_set_out=$tmpdir/descriptor_set "
-      "--include_imports --proto_path=$tmpdir bar.proto");
-
-  ExpectNoErrors();
-
-  FileDescriptorSet descriptor_set;
-  ReadDescriptorSet("descriptor_set", &descriptor_set);
-  if (HasFatalFailure()) return;
-  EXPECT_EQ(2, descriptor_set.file_size());
-  if (descriptor_set.file(0).name() == "bar.proto") {
-    std::swap(descriptor_set.mutable_file()->mutable_data()[0],
-              descriptor_set.mutable_file()->mutable_data()[1]);
-  }
-  EXPECT_EQ("foo.proto", descriptor_set.file(0).name());
-  EXPECT_EQ("bar.proto", descriptor_set.file(1).name());
-  // Descriptor set should not have source code info.
-  EXPECT_FALSE(descriptor_set.file(0).has_source_code_info());
-  EXPECT_FALSE(descriptor_set.file(1).has_source_code_info());
-}
-
-TEST_F(CommandLineInterfaceTest, WriteTransitiveDescriptorSetWithSourceInfo) {
-  CreateTempFile("foo.proto",
-                 "syntax = \"proto2\";\n"
-                 "message Foo {}\n");
-  CreateTempFile("bar.proto",
-                 "syntax = \"proto2\";\n"
-                 "import \"foo.proto\";\n"
-                 "message Bar {\n"
-                 "  optional Foo foo = 1;\n"
-                 "}\n");
-
-  Run("protocol_compiler --descriptor_set_out=$tmpdir/descriptor_set "
-      "--include_imports --include_source_info --proto_path=$tmpdir bar.proto");
-
-  ExpectNoErrors();
-
-  FileDescriptorSet descriptor_set;
-  ReadDescriptorSet("descriptor_set", &descriptor_set);
-  if (HasFatalFailure()) return;
-  EXPECT_EQ(2, descriptor_set.file_size());
-  if (descriptor_set.file(0).name() == "bar.proto") {
-    std::swap(descriptor_set.mutable_file()->mutable_data()[0],
-              descriptor_set.mutable_file()->mutable_data()[1]);
-  }
-  EXPECT_EQ("foo.proto", descriptor_set.file(0).name());
-  EXPECT_EQ("bar.proto", descriptor_set.file(1).name());
-  // Source code info included.
-  EXPECT_TRUE(descriptor_set.file(0).has_source_code_info());
-  EXPECT_TRUE(descriptor_set.file(1).has_source_code_info());
-}
-
-#ifdef _WIN32
-// TODO(teboring): Figure out how to write test on windows.
-#else
-TEST_F(CommandLineInterfaceTest, WriteDependencyManifestFileGivenTwoInputs) {
-  CreateTempFile("foo.proto",
-                 "syntax = \"proto2\";\n"
-                 "message Foo {}\n");
-  CreateTempFile("bar.proto",
-                 "syntax = \"proto2\";\n"
-                 "import \"foo.proto\";\n"
-                 "message Bar {\n"
-                 "  optional Foo foo = 1;\n"
-                 "}\n");
-
-  Run("protocol_compiler --dependency_out=$tmpdir/manifest "
-      "--test_out=$tmpdir --proto_path=$tmpdir bar.proto foo.proto");
-
-  ExpectErrorText(
-      "Can only process one input file when using --dependency_out=FILE.\n");
-}
-
-#ifdef PROTOBUF_OPENSOURCE
-TEST_F(CommandLineInterfaceTest, WriteDependencyManifestFile) {
-  CreateTempFile("foo.proto",
-                 "syntax = \"proto2\";\n"
-                 "message Foo {}\n");
-  CreateTempFile("bar.proto",
-                 "syntax = \"proto2\";\n"
-                 "import \"foo.proto\";\n"
-                 "message Bar {\n"
-                 "  optional Foo foo = 1;\n"
-                 "}\n");
-
-  std::string current_working_directory = getcwd(nullptr, 0);
-  SwitchToTempDirectory();
-
-  Run("protocol_compiler --dependency_out=manifest --test_out=. "
-      "bar.proto");
-
-  ExpectNoErrors();
-
-  ExpectFileContent("manifest",
-                    "bar.proto.MockCodeGenerator.test_generator: "
-                    "foo.proto\\\n bar.proto");
-
-  File::ChangeWorkingDirectory(current_working_directory);
-}
-#else  // !PROTOBUF_OPENSOURCE
-// TODO(teboring): Figure out how to change and get working directory in
-// google3.
-#endif  // !PROTOBUF_OPENSOURCE
-
-TEST_F(CommandLineInterfaceTest, WriteDependencyManifestFileForAbsolutePath) {
-  CreateTempFile("foo.proto",
-                 "syntax = \"proto2\";\n"
-                 "message Foo {}\n");
-  CreateTempFile("bar.proto",
-                 "syntax = \"proto2\";\n"
-                 "import \"foo.proto\";\n"
-                 "message Bar {\n"
-                 "  optional Foo foo = 1;\n"
-                 "}\n");
-
-  Run("protocol_compiler --dependency_out=$tmpdir/manifest "
-      "--test_out=$tmpdir --proto_path=$tmpdir bar.proto");
-
-  ExpectNoErrors();
-
-  ExpectFileContent("manifest",
-                    "$tmpdir/bar.proto.MockCodeGenerator.test_generator: "
-                    "$tmpdir/foo.proto\\\n $tmpdir/bar.proto");
-}
-
-TEST_F(CommandLineInterfaceTest,
-       WriteDependencyManifestFileWithDescriptorSetOut) {
-  CreateTempFile("foo.proto",
-                 "syntax = \"proto2\";\n"
-                 "message Foo {}\n");
-  CreateTempFile("bar.proto",
-                 "syntax = \"proto2\";\n"
-                 "import \"foo.proto\";\n"
-                 "message Bar {\n"
-                 "  optional Foo foo = 1;\n"
-                 "}\n");
-
-  Run("protocol_compiler --dependency_out=$tmpdir/manifest "
-      "--descriptor_set_out=$tmpdir/bar.pb --proto_path=$tmpdir bar.proto");
-
-  ExpectNoErrors();
-
-  ExpectFileContent("manifest",
-                    "$tmpdir/bar.pb: "
-                    "$tmpdir/foo.proto\\\n $tmpdir/bar.proto");
-}
-#endif  // !_WIN32
-
-TEST_F(CommandLineInterfaceTest, TestArgumentFile) {
-  // Test parsing multiple input files using an argument file.
-
-  CreateTempFile("foo.proto",
-                 "syntax = \"proto2\";\n"
-                 "message Foo {}\n");
-  CreateTempFile("bar.proto",
-                 "syntax = \"proto2\";\n"
-                 "message Bar {}\n");
-  CreateTempFile("arguments.txt",
-                 "--test_out=$tmpdir\n"
-                 "--plug_out=$tmpdir\n"
-                 "--proto_path=$tmpdir\n"
-                 "--direct_dependencies_violation_msg=%s is not imported\n"
-                 "foo.proto\n"
-                 "bar.proto");
-
-  Run("protocol_compiler @$tmpdir/arguments.txt");
-
-  ExpectNoErrors();
-  ExpectGeneratedWithMultipleInputs("test_generator", "foo.proto,bar.proto",
-                                    "foo.proto", "Foo");
-  ExpectGeneratedWithMultipleInputs("test_generator", "foo.proto,bar.proto",
-                                    "bar.proto", "Bar");
-  ExpectGeneratedWithMultipleInputs("test_plugin", "foo.proto,bar.proto",
-                                    "foo.proto", "Foo");
-  ExpectGeneratedWithMultipleInputs("test_plugin", "foo.proto,bar.proto",
-                                    "bar.proto", "Bar");
-}
-
-
-// -------------------------------------------------------------------
-
-TEST_F(CommandLineInterfaceTest, ParseErrors) {
-  // Test that parse errors are reported.
-
-  CreateTempFile("foo.proto",
-                 "syntax = \"proto2\";\n"
-                 "badsyntax\n");
-
-  Run("protocol_compiler --test_out=$tmpdir "
-      "--proto_path=$tmpdir foo.proto");
-
-  ExpectErrorText(
-      "foo.proto:2:1: Expected top-level statement (e.g. \"message\").\n");
-}
-
-TEST_F(CommandLineInterfaceTest, ParseErrors_DescriptorSetIn) {
-  // Test that parse errors are reported.
-  CreateTempFile("foo.bin", "not a FileDescriptorSet");
-
-  Run("protocol_compiler --test_out=$tmpdir "
-      "--descriptor_set_in=$tmpdir/foo.bin foo.proto");
-
-  ExpectErrorText("$tmpdir/foo.bin: Unable to parse.\n");
-}
-
-TEST_F(CommandLineInterfaceTest, ParseErrorsMultipleFiles) {
-  // Test that parse errors are reported from multiple files.
-
-  // We set up files such that foo.proto actually depends on bar.proto in
-  // two ways:  Directly and through baz.proto.  bar.proto's errors should
-  // only be reported once.
-  CreateTempFile("bar.proto",
-                 "syntax = \"proto2\";\n"
-                 "badsyntax\n");
-  CreateTempFile("baz.proto",
-                 "syntax = \"proto2\";\n"
-                 "import \"bar.proto\";\n");
-  CreateTempFile("foo.proto",
-                 "syntax = \"proto2\";\n"
-                 "import \"bar.proto\";\n"
-                 "import \"baz.proto\";\n");
-
-  Run("protocol_compiler --test_out=$tmpdir "
-      "--proto_path=$tmpdir foo.proto");
-
-  ExpectErrorText(
-      "bar.proto:2:1: Expected top-level statement (e.g. \"message\").\n"
-      "baz.proto:2:1: Import \"bar.proto\" was not found or had errors.\n"
-      "foo.proto:2:1: Import \"bar.proto\" was not found or had errors.\n"
-      "foo.proto:3:1: Import \"baz.proto\" was not found or had errors.\n");
-}
-
-TEST_F(CommandLineInterfaceTest, RecursiveImportFails) {
-  // Create a proto file that imports itself.
-  CreateTempFile("foo.proto",
-                 "syntax = \"proto2\";\n"
-                 "import \"foo.proto\";\n");
-
-  Run("protocol_compiler --test_out=$tmpdir "
-      "--proto_path=$tmpdir foo.proto");
-
-  ExpectErrorSubstring(
-      "foo.proto:2:1: File recursively imports itself: "
-      "foo.proto -> foo.proto\n");
-}
-
-TEST_F(CommandLineInterfaceTest, InputNotFoundError) {
-  // Test what happens if the input file is not found.
-
-  Run("protocol_compiler --test_out=$tmpdir "
-      "--proto_path=$tmpdir foo.proto");
-
-  ExpectErrorText(
-      "Could not make proto path relative: foo.proto: No such file or "
-      "directory\n");
-}
-
-TEST_F(CommandLineInterfaceTest, InputNotFoundError_DescriptorSetIn) {
-  // Test what happens if the input file is not found.
-
-  Run("protocol_compiler --test_out=$tmpdir "
-      "--descriptor_set_in=$tmpdir/foo.bin foo.proto");
-
-  ExpectErrorText("$tmpdir/foo.bin: No such file or directory\n");
-}
-
-TEST_F(CommandLineInterfaceTest, CwdRelativeInputNotFoundError) {
-  // Test what happens when a working-directory-relative input file is not
-  // found.
-
-  Run("protocol_compiler --test_out=$tmpdir "
-      "--proto_path=$tmpdir $tmpdir/foo.proto");
-
-  ExpectErrorText(
-      "Could not make proto path relative: $tmpdir/foo.proto: No such file or "
-      "directory\n");
-}
-
-TEST_F(CommandLineInterfaceTest, CwdRelativeInputNotMappedError) {
-  // Test what happens when a working-directory-relative input file is not
-  // mapped to a virtual path.
-
-  CreateTempFile("foo.proto",
-                 "syntax = \"proto2\";\n"
-                 "message Foo {}\n");
-
-  // Create a directory called "bar" so that we can point --proto_path at it.
-  CreateTempFile("bar/dummy", "");
-
-  Run("protocol_compiler --test_out=$tmpdir "
-      "--proto_path=$tmpdir/bar $tmpdir/foo.proto");
-
-  ExpectErrorText(
-      "$tmpdir/foo.proto: File does not reside within any path "
-      "specified using --proto_path (or -I).  You must specify a "
-      "--proto_path which encompasses this file.  Note that the "
-      "proto_path must be an exact prefix of the .proto file "
-      "names -- protoc is too dumb to figure out when two paths "
-      "(e.g. absolute and relative) are equivalent (it's harder "
-      "than you think).\n");
-}
-
-TEST_F(CommandLineInterfaceTest, CwdRelativeInputNotFoundAndNotMappedError) {
-  // Check what happens if the input file is not found *and* is not mapped
-  // in the proto_path.
-
-  // Create a directory called "bar" so that we can point --proto_path at it.
-  CreateTempFile("bar/dummy", "");
-
-  Run("protocol_compiler --test_out=$tmpdir "
-      "--proto_path=$tmpdir/bar $tmpdir/foo.proto");
-
-  ExpectErrorText(
-      "Could not make proto path relative: $tmpdir/foo.proto: No such file or "
-      "directory\n");
-}
-
-TEST_F(CommandLineInterfaceTest, CwdRelativeInputShadowedError) {
-  // Test what happens when a working-directory-relative input file is shadowed
-  // by another file in the virtual path.
-
-  CreateTempFile("foo/foo.proto",
-                 "syntax = \"proto2\";\n"
-                 "message Foo {}\n");
-  CreateTempFile("bar/foo.proto",
-                 "syntax = \"proto2\";\n"
-                 "message Bar {}\n");
-
-  Run("protocol_compiler --test_out=$tmpdir "
-      "--proto_path=$tmpdir/foo --proto_path=$tmpdir/bar "
-      "$tmpdir/bar/foo.proto");
-
-  ExpectErrorText(
-      "$tmpdir/bar/foo.proto: Input is shadowed in the --proto_path "
-      "by \"$tmpdir/foo/foo.proto\".  Either use the latter "
-      "file as your input or reorder the --proto_path so that the "
-      "former file's location comes first.\n");
-}
-
-TEST_F(CommandLineInterfaceTest, ProtoPathNotFoundError) {
-  // Test what happens if the input file is not found.
-
-  Run("protocol_compiler --test_out=$tmpdir "
-      "--proto_path=$tmpdir/foo foo.proto");
-
-  ExpectErrorText(
-      "$tmpdir/foo: warning: directory does not exist.\n"
-      "Could not make proto path relative: foo.proto: No such file or "
-      "directory\n");
-}
-
-TEST_F(CommandLineInterfaceTest, ProtoPathAndDescriptorSetIn) {
-  Run("protocol_compiler --test_out=$tmpdir "
-      "--proto_path=$tmpdir --descriptor_set_in=$tmpdir/foo.bin foo.proto");
-  ExpectErrorText("$tmpdir/foo.bin: No such file or directory\n");
-
-  Run("protocol_compiler --test_out=$tmpdir "
-      "--descriptor_set_in=$tmpdir/foo.bin --proto_path=$tmpdir foo.proto");
-  ExpectErrorText("$tmpdir/foo.bin: No such file or directory\n");
-}
-
-TEST_F(CommandLineInterfaceTest, ProtoPathAndDescriptorSetIn_CompileFiles) {
-  // Test what happens if a proto is in a --descriptor_set_in and also exists
-  // on disk.
-  FileDescriptorSet file_descriptor_set;
-
-  // NOTE: This file desc SHOULD be different from the one created as a temp
-  //       to make it easier to test that the file was output instead of the
-  //       contents of the --descriptor_set_in file.
-  FileDescriptorProto* file_descriptor_proto = file_descriptor_set.add_file();
-  file_descriptor_proto->set_name("foo.proto");
-  file_descriptor_proto->add_message_type()->set_name("Foo");
-
-  WriteDescriptorSet("foo.bin", &file_descriptor_set);
-
-  CreateTempFile("foo.proto",
-                 "syntax = \"proto2\";\n"
-                 "message FooBar { required string foo_message = 1; }\n");
-
-  Run("protocol_compiler --descriptor_set_out=$tmpdir/descriptor_set "
-      "--descriptor_set_in=$tmpdir/foo.bin "
-      "--include_source_info "
-      "--proto_path=$tmpdir foo.proto");
-
-  ExpectNoErrors();
-
-  FileDescriptorSet descriptor_set;
-  ReadDescriptorSet("descriptor_set", &descriptor_set);
-
-  EXPECT_EQ(1, descriptor_set.file_size());
-  EXPECT_EQ("foo.proto", descriptor_set.file(0).name());
-  // Descriptor set SHOULD have source code info.
-  EXPECT_TRUE(descriptor_set.file(0).has_source_code_info());
-
-  EXPECT_EQ("FooBar", descriptor_set.file(0).message_type(0).name());
-  EXPECT_EQ("foo_message",
-            descriptor_set.file(0).message_type(0).field(0).name());
-}
-
-TEST_F(CommandLineInterfaceTest, ProtoPathAndDependencyOut) {
-  Run("protocol_compiler --test_out=$tmpdir "
-      "--dependency_out=$tmpdir/manifest "
-      "--descriptor_set_in=$tmpdir/foo.bin foo.proto");
-  ExpectErrorText(
-      "--descriptor_set_in cannot be used with --dependency_out.\n");
-
-  Run("protocol_compiler --test_out=$tmpdir "
-      "--descriptor_set_in=$tmpdir/foo.bin "
-      "--dependency_out=$tmpdir/manifest foo.proto");
-  ExpectErrorText(
-      "--dependency_out cannot be used with --descriptor_set_in.\n");
-}
-
-TEST_F(CommandLineInterfaceTest, MissingInputError) {
-  // Test that we get an error if no inputs are given.
-
-  Run("protocol_compiler --test_out=$tmpdir "
-      "--proto_path=$tmpdir");
-
-  ExpectErrorText("Missing input file.\n");
-}
-
-TEST_F(CommandLineInterfaceTest, MissingOutputError) {
-  CreateTempFile("foo.proto",
-                 "syntax = \"proto2\";\n"
-                 "message Foo {}\n");
-
-  Run("protocol_compiler --proto_path=$tmpdir foo.proto");
-
-  ExpectErrorText("Missing output directives.\n");
-}
-
-TEST_F(CommandLineInterfaceTest, OutputWriteError) {
-  CreateTempFile("foo.proto",
-                 "syntax = \"proto2\";\n"
-                 "message Foo {}\n");
-
-  std::string output_file =
-      MockCodeGenerator::GetOutputFileName("test_generator", "foo.proto");
-
-  // Create a directory blocking our output location.
-  CreateTempDir(output_file);
-
-  Run("protocol_compiler --test_out=$tmpdir "
-      "--proto_path=$tmpdir foo.proto");
-
-  // MockCodeGenerator no longer detects an error because we actually write to
-  // an in-memory location first, then dump to disk at the end.  This is no
-  // big deal.
-  //   ExpectErrorSubstring("MockCodeGenerator detected write error.");
-
-#if defined(_WIN32) && !defined(__CYGWIN__)
-  // Windows with MSVCRT.dll produces EPERM instead of EISDIR.
-  if (HasAlternateErrorSubstring(output_file + ": Permission denied")) {
-    return;
-  }
-#endif
-
-  ExpectErrorSubstring(output_file + ": Is a directory");
-}
-
-TEST_F(CommandLineInterfaceTest, PluginOutputWriteError) {
-  CreateTempFile("foo.proto",
-                 "syntax = \"proto2\";\n"
-                 "message Foo {}\n");
-
-  std::string output_file =
-      MockCodeGenerator::GetOutputFileName("test_plugin", "foo.proto");
-
-  // Create a directory blocking our output location.
-  CreateTempDir(output_file);
-
-  Run("protocol_compiler --plug_out=$tmpdir "
-      "--proto_path=$tmpdir foo.proto");
-
-#if defined(_WIN32) && !defined(__CYGWIN__)
-  // Windows with MSVCRT.dll produces EPERM instead of EISDIR.
-  if (HasAlternateErrorSubstring(output_file + ": Permission denied")) {
-    return;
-  }
-#endif
-
-  ExpectErrorSubstring(output_file + ": Is a directory");
-}
-
-TEST_F(CommandLineInterfaceTest, OutputDirectoryNotFoundError) {
-  CreateTempFile("foo.proto",
-                 "syntax = \"proto2\";\n"
-                 "message Foo {}\n");
-
-  Run("protocol_compiler --test_out=$tmpdir/nosuchdir "
-      "--proto_path=$tmpdir foo.proto");
-
-  ExpectErrorSubstring("nosuchdir/: No such file or directory");
-}
-
-TEST_F(CommandLineInterfaceTest, PluginOutputDirectoryNotFoundError) {
-  CreateTempFile("foo.proto",
-                 "syntax = \"proto2\";\n"
-                 "message Foo {}\n");
-
-  Run("protocol_compiler --plug_out=$tmpdir/nosuchdir "
-      "--proto_path=$tmpdir foo.proto");
-
-  ExpectErrorSubstring("nosuchdir/: No such file or directory");
-}
-
-TEST_F(CommandLineInterfaceTest, OutputDirectoryIsFileError) {
-  CreateTempFile("foo.proto",
-                 "syntax = \"proto2\";\n"
-                 "message Foo {}\n");
-
-  Run("protocol_compiler --test_out=$tmpdir/foo.proto "
-      "--proto_path=$tmpdir foo.proto");
-
-#if defined(_WIN32) && !defined(__CYGWIN__)
-  // Windows with MSVCRT.dll produces EINVAL instead of ENOTDIR.
-  if (HasAlternateErrorSubstring("foo.proto/: Invalid argument")) {
-    return;
-  }
-#endif
-
-  ExpectErrorSubstring("foo.proto/: Not a directory");
-}
-
-TEST_F(CommandLineInterfaceTest, GeneratorError) {
-  CreateTempFile("foo.proto",
-                 "syntax = \"proto2\";\n"
-                 "message MockCodeGenerator_Error {}\n");
-
-  Run("protocol_compiler --test_out=$tmpdir "
-      "--proto_path=$tmpdir foo.proto");
-
-  ExpectErrorSubstring(
-      "--test_out: foo.proto: Saw message type MockCodeGenerator_Error.");
-}
-
-TEST_F(CommandLineInterfaceTest, GeneratorPluginError) {
-  // Test a generator plugin that returns an error.
-
-  CreateTempFile("foo.proto",
-                 "syntax = \"proto2\";\n"
-                 "message MockCodeGenerator_Error {}\n");
-
-  Run("protocol_compiler --plug_out=TestParameter:$tmpdir "
-      "--proto_path=$tmpdir foo.proto");
-
-  ExpectErrorSubstring(
-      "--plug_out: foo.proto: Saw message type MockCodeGenerator_Error.");
-}
-
-TEST_F(CommandLineInterfaceTest, GeneratorPluginFail) {
-  // Test a generator plugin that exits with an error code.
-
-  CreateTempFile("foo.proto",
-                 "syntax = \"proto2\";\n"
-                 "message MockCodeGenerator_Exit {}\n");
-
-  Run("protocol_compiler --plug_out=TestParameter:$tmpdir "
-      "--proto_path=$tmpdir foo.proto");
-
-  ExpectErrorSubstring("Saw message type MockCodeGenerator_Exit.");
-  ExpectErrorSubstring(
-      "--plug_out: prefix-gen-plug: Plugin failed with status code 123.");
-}
-
-TEST_F(CommandLineInterfaceTest, GeneratorPluginCrash) {
-  // Test a generator plugin that crashes.
-
-  CreateTempFile("foo.proto",
-                 "syntax = \"proto2\";\n"
-                 "message MockCodeGenerator_Abort {}\n");
-
-  Run("protocol_compiler --plug_out=TestParameter:$tmpdir "
-      "--proto_path=$tmpdir foo.proto");
-
-  ExpectErrorSubstring("Saw message type MockCodeGenerator_Abort.");
-
-#ifdef _WIN32
-  // Windows doesn't have signals.  It looks like abort()ing causes the process
-  // to exit with status code 3, but let's not depend on the exact number here.
-  ExpectErrorSubstring(
-      "--plug_out: prefix-gen-plug: Plugin failed with status code");
-#else
-  // Don't depend on the exact signal number.
-  ExpectErrorSubstring("--plug_out: prefix-gen-plug: Plugin killed by signal");
-#endif
-}
-
-TEST_F(CommandLineInterfaceTest, PluginReceivesSourceCodeInfo) {
-  CreateTempFile("foo.proto",
-                 "syntax = \"proto2\";\n"
-                 "message MockCodeGenerator_HasSourceCodeInfo {}\n");
-
-  Run("protocol_compiler --plug_out=$tmpdir --proto_path=$tmpdir foo.proto");
-
-  ExpectErrorSubstring(
-      "Saw message type MockCodeGenerator_HasSourceCodeInfo: 1.");
-}
-
-TEST_F(CommandLineInterfaceTest, PluginReceivesJsonName) {
-  CreateTempFile("foo.proto",
-                 "syntax = \"proto2\";\n"
-                 "message MockCodeGenerator_HasJsonName {\n"
-                 "  optional int32 value = 1;\n"
-                 "}\n");
-
-  Run("protocol_compiler --plug_out=$tmpdir --proto_path=$tmpdir foo.proto");
-
-  ExpectErrorSubstring("Saw json_name: 1");
-}
-
-TEST_F(CommandLineInterfaceTest, PluginReceivesCompilerVersion) {
-  CreateTempFile("foo.proto",
-                 "syntax = \"proto2\";\n"
-                 "message MockCodeGenerator_ShowVersionNumber {\n"
-                 "  optional int32 value = 1;\n"
-                 "}\n");
-
-  Run("protocol_compiler --plug_out=$tmpdir --proto_path=$tmpdir foo.proto");
-
-  ExpectErrorSubstring(StringPrintf("Saw compiler_version: %d %s",
-                                    GOOGLE_PROTOBUF_VERSION,
-                                    GOOGLE_PROTOBUF_VERSION_SUFFIX));
-}
-
-TEST_F(CommandLineInterfaceTest, GeneratorPluginNotFound) {
-  // Test what happens if the plugin isn't found.
-
-  CreateTempFile("error.proto",
-                 "syntax = \"proto2\";\n"
-                 "message Foo {}\n");
-
-  Run("protocol_compiler --badplug_out=TestParameter:$tmpdir "
-      "--plugin=prefix-gen-badplug=no_such_file "
-      "--proto_path=$tmpdir error.proto");
-
-#ifdef _WIN32
-  ExpectErrorSubstring("--badplug_out: prefix-gen-badplug: " +
-                       Subprocess::Win32ErrorMessage(ERROR_FILE_NOT_FOUND));
-#else
-  // Error written to stdout by child process after exec() fails.
-  ExpectErrorSubstring("no_such_file: program not found or is not executable");
-
-  ExpectErrorSubstring(
-      "Please specify a program using absolute path or make sure "
-      "the program is available in your PATH system variable");
-
-  // Error written by parent process when child fails.
-  ExpectErrorSubstring(
-      "--badplug_out: prefix-gen-badplug: Plugin failed with status code 1.");
-#endif
-}
-
-TEST_F(CommandLineInterfaceTest, GeneratorPluginNotAllowed) {
-  // Test what happens if plugins aren't allowed.
-
-  CreateTempFile("error.proto",
-                 "syntax = \"proto2\";\n"
-                 "message Foo {}\n");
-
-  DisallowPlugins();
-  Run("protocol_compiler --plug_out=TestParameter:$tmpdir "
-      "--proto_path=$tmpdir error.proto");
-
-  ExpectErrorSubstring("Unknown flag: --plug_out");
-}
-
-TEST_F(CommandLineInterfaceTest, HelpText) {
-  Run("test_exec_name --help");
-
-  ExpectCapturedStdoutSubstringWithZeroReturnCode("Usage: test_exec_name ");
-  ExpectCapturedStdoutSubstringWithZeroReturnCode("--test_out=OUT_DIR");
-  ExpectCapturedStdoutSubstringWithZeroReturnCode("Test output.");
-  ExpectCapturedStdoutSubstringWithZeroReturnCode("--alt_out=OUT_DIR");
-  ExpectCapturedStdoutSubstringWithZeroReturnCode("Alt output.");
-}
-
-TEST_F(CommandLineInterfaceTest, GccFormatErrors) {
-  // Test --error_format=gcc (which is the default, but we want to verify
-  // that it can be set explicitly).
-
-  CreateTempFile("foo.proto",
-                 "syntax = \"proto2\";\n"
-                 "badsyntax\n");
-
-  Run("protocol_compiler --test_out=$tmpdir "
-      "--proto_path=$tmpdir --error_format=gcc foo.proto");
-
-  ExpectErrorText(
-      "foo.proto:2:1: Expected top-level statement (e.g. \"message\").\n");
-}
-
-TEST_F(CommandLineInterfaceTest, MsvsFormatErrors) {
-  // Test --error_format=msvs
-
-  CreateTempFile("foo.proto",
-                 "syntax = \"proto2\";\n"
-                 "badsyntax\n");
-
-  Run("protocol_compiler --test_out=$tmpdir "
-      "--proto_path=$tmpdir --error_format=msvs foo.proto");
-
-  ExpectErrorText(
-      "$tmpdir/foo.proto(2) : error in column=1: Expected top-level statement "
-      "(e.g. \"message\").\n");
-}
-
-TEST_F(CommandLineInterfaceTest, InvalidErrorFormat) {
-  // Test invalid --error_format
-
-  CreateTempFile("foo.proto",
-                 "syntax = \"proto2\";\n"
-                 "badsyntax\n");
-
-  Run("protocol_compiler --test_out=$tmpdir "
-      "--proto_path=$tmpdir --error_format=invalid foo.proto");
-
-  ExpectErrorText("Unknown error format: invalid\n");
-}
-
-TEST_F(CommandLineInterfaceTest, Warnings) {
-  // Test --fatal_warnings.
-
-  CreateTempFile("foo.proto",
-                 "syntax = \"proto2\";\n"
-                 "import \"bar.proto\";\n");
-  CreateTempFile("bar.proto", "syntax = \"proto2\";\n");
-
-  Run("protocol_compiler --test_out=$tmpdir "
-      "--proto_path=$tmpdir foo.proto");
-  ExpectCapturedStderrSubstringWithZeroReturnCode(
-      "foo.proto:2:1: warning: Import bar.proto is unused.");
-
-  Run("protocol_compiler --test_out=$tmpdir --fatal_warnings "
-      "--proto_path=$tmpdir foo.proto");
-  ExpectErrorSubstring("foo.proto:2:1: warning: Import bar.proto is unused.");
-}
-
-// -------------------------------------------------------------------
-// Flag parsing tests
-
-TEST_F(CommandLineInterfaceTest, ParseSingleCharacterFlag) {
-  // Test that a single-character flag works.
-
-  CreateTempFile("foo.proto",
-                 "syntax = \"proto2\";\n"
-                 "message Foo {}\n");
-
-  Run("protocol_compiler -t$tmpdir "
-      "--proto_path=$tmpdir foo.proto");
-
-  ExpectNoErrors();
-  ExpectGenerated("test_generator", "", "foo.proto", "Foo");
-}
-
-TEST_F(CommandLineInterfaceTest, ParseSpaceDelimitedValue) {
-  // Test that separating the flag value with a space works.
-
-  CreateTempFile("foo.proto",
-                 "syntax = \"proto2\";\n"
-                 "message Foo {}\n");
-
-  Run("protocol_compiler --test_out $tmpdir "
-      "--proto_path=$tmpdir foo.proto");
-
-  ExpectNoErrors();
-  ExpectGenerated("test_generator", "", "foo.proto", "Foo");
-}
-
-TEST_F(CommandLineInterfaceTest, ParseSingleCharacterSpaceDelimitedValue) {
-  // Test that separating the flag value with a space works for
-  // single-character flags.
-
-  CreateTempFile("foo.proto",
-                 "syntax = \"proto2\";\n"
-                 "message Foo {}\n");
-
-  Run("protocol_compiler -t $tmpdir "
-      "--proto_path=$tmpdir foo.proto");
-
-  ExpectNoErrors();
-  ExpectGenerated("test_generator", "", "foo.proto", "Foo");
-}
-
-TEST_F(CommandLineInterfaceTest, MissingValueError) {
-  // Test that we get an error if a flag is missing its value.
-
-  Run("protocol_compiler --test_out --proto_path=$tmpdir foo.proto");
-
-  ExpectErrorText("Missing value for flag: --test_out\n");
-}
-
-TEST_F(CommandLineInterfaceTest, MissingValueAtEndError) {
-  // Test that we get an error if the last argument is a flag requiring a
-  // value.
-
-  Run("protocol_compiler --test_out");
-
-  ExpectErrorText("Missing value for flag: --test_out\n");
-}
-
-TEST_F(CommandLineInterfaceTest, Proto3OptionalDisallowedNoCodegenSupport) {
-  CreateTempFile("google/foo.proto",
-                 "syntax = \"proto3\";\n"
-                 "message Foo {\n"
-                 "  optional int32 i = 1;\n"
-                 "}\n");
-
-  CreateGeneratorWithMissingFeatures("--no_proto3_optional_out",
-                                     "Doesn't support proto3 optional",
-                                     CodeGenerator::FEATURE_PROTO3_OPTIONAL);
-
-  Run("protocol_compiler --experimental_allow_proto3_optional "
-      "--proto_path=$tmpdir google/foo.proto --no_proto3_optional_out=$tmpdir");
-
-  ExpectErrorSubstring(
-      "code generator --no_proto3_optional_out hasn't been updated to support "
-      "optional fields in proto3");
-}
-
-TEST_F(CommandLineInterfaceTest, Proto3OptionalAllowWithFlag) {
-  CreateTempFile("google/foo.proto",
-                 "syntax = \"proto3\";\n"
-                 "message Foo {\n"
-                 "  optional int32 i = 1;\n"
-                 "}\n");
-
-  Run("protocol_compiler --experimental_allow_proto3_optional "
-      "--proto_path=$tmpdir google/foo.proto --test_out=$tmpdir");
-  ExpectNoErrors();
-}
-
-TEST_F(CommandLineInterfaceTest, PrintFreeFieldNumbers) {
-  CreateTempFile("foo.proto",
-                 "syntax = \"proto2\";\n"
-                 "package foo;\n"
-                 "message Foo {\n"
-                 "  optional int32 a = 2;\n"
-                 "  optional string b = 4;\n"
-                 "  optional string c = 5;\n"
-                 "  optional int64 d = 8;\n"
-                 "  optional double e = 10;\n"
-                 "}\n");
-  CreateTempFile("bar.proto",
-                 "syntax = \"proto2\";\n"
-                 "message Bar {\n"
-                 "  optional int32 a = 2;\n"
-                 "  extensions 4 to 5;\n"
-                 "  optional int64 d = 8;\n"
-                 "  extensions 10;\n"
-                 "}\n");
-  CreateTempFile("baz.proto",
-                 "syntax = \"proto2\";\n"
-                 "message Baz {\n"
-                 "  optional int32 a = 2;\n"
-                 "  optional int64 d = 8;\n"
-                 "  extensions 15 to max;\n"  // unordered.
-                 "  extensions 13;\n"
-                 "  extensions 10 to 12;\n"
-                 "  extensions 5;\n"
-                 "  extensions 4;\n"
-                 "}\n");
-  CreateTempFile(
-      "quz.proto",
-      "syntax = \"proto2\";\n"
-      "message Quz {\n"
-      "  message Foo {}\n"  // nested message
-      "  optional int32 a = 2;\n"
-      "  optional group C = 4 {\n"
-      "    optional int32 d = 5;\n"
-      "  }\n"
-      "  extensions 8 to 10;\n"
-      "  optional group E = 11 {\n"
-      "    optional int32 f = 9;\n"    // explicitly reuse extension range 8-10
-      "    optional group G = 15 {\n"  // nested group
-      "      message Foo {}\n"         // nested message inside nested group
-      "    }\n"
-      "  }\n"
-      "}\n");
-
-  Run("protocol_compiler --print_free_field_numbers --proto_path=$tmpdir "
-      "foo.proto bar.proto baz.proto quz.proto");
-
-  ExpectNoErrors();
-
-  // TODO(jieluo): Cygwin doesn't work well if we try to capture stderr and
-  // stdout at the same time. Need to figure out why and add this test back
-  // for Cygwin.
-#if !defined(__CYGWIN__)
-  ExpectCapturedStdout(
-      "foo.Foo                             free: 1 3 6-7 9 11-INF\n"
-      "Bar                                 free: 1 3 6-7 9 11-INF\n"
-      "Baz                                 free: 1 3 6-7 9 14\n"
-      "Quz.Foo                             free: 1-INF\n"
-      "Quz.E.G.Foo                         free: 1-INF\n"
-      "Quz                                 free: 1 3 6-7 12-14 16-INF\n");
-#endif
-}
-
-// ===================================================================
-
-// Test for --encode and --decode.  Note that it would be easier to do this
-// test as a shell script, but we'd like to be able to run the test on
-// platforms that don't have a Bourne-compatible shell available (especially
-// Windows/MSVC).
-
-enum EncodeDecodeTestMode { PROTO_PATH, DESCRIPTOR_SET_IN };
-
-class EncodeDecodeTest : public testing::TestWithParam<EncodeDecodeTestMode> {
- protected:
-  void SetUp() override {
-    WriteUnittestProtoDescriptorSet();
-    duped_stdin_ = dup(STDIN_FILENO);
-  }
-
-  void TearDown() override {
-    dup2(duped_stdin_, STDIN_FILENO);
-    close(duped_stdin_);
-  }
-
-  void RedirectStdinFromText(const std::string& input) {
-    std::string filename = TestTempDir() + "/test_stdin";
-    GOOGLE_CHECK_OK(File::SetContents(filename, input, true));
-    GOOGLE_CHECK(RedirectStdinFromFile(filename));
-  }
-
-  bool RedirectStdinFromFile(const std::string& filename) {
-    int fd = open(filename.c_str(), O_RDONLY);
-    if (fd < 0) return false;
-    dup2(fd, STDIN_FILENO);
-    close(fd);
-    return true;
-  }
-
-  // Remove '\r' characters from text.
-  std::string StripCR(const std::string& text) {
-    std::string result;
-
-    for (int i = 0; i < text.size(); i++) {
-      if (text[i] != '\r') {
-        result.push_back(text[i]);
-      }
-    }
-
-    return result;
-  }
-
-  enum Type { TEXT, BINARY };
-  enum ReturnCode { SUCCESS, ERROR };
-
-  bool Run(const std::string& command, bool specify_proto_files = true) {
-    std::vector<std::string> args;
-    args.push_back("protoc");
-    for (StringPiece split_piece :
-         Split(command, " ", true)) {
-      args.push_back(std::string(split_piece));
-    }
-    if (specify_proto_files) {
-      switch (GetParam()) {
-        case PROTO_PATH:
-          args.push_back("--proto_path=" + TestUtil::TestSourceDir());
-          break;
-        case DESCRIPTOR_SET_IN:
-          args.push_back(StrCat("--descriptor_set_in=",
-                                      unittest_proto_descriptor_set_filename_));
-          break;
-        default:
-          ADD_FAILURE() << "unexpected EncodeDecodeTestMode: " << GetParam();
-      }
-    }
-
-    std::unique_ptr<const char*[]> argv(new const char*[args.size()]);
-    for (int i = 0; i < args.size(); i++) {
-      argv[i] = args[i].c_str();
-    }
-
-    CommandLineInterface cli;
-
-    CaptureTestStdout();
-    CaptureTestStderr();
-
-    int result = cli.Run(args.size(), argv.get());
-
-    captured_stdout_ = GetCapturedTestStdout();
-    captured_stderr_ = GetCapturedTestStderr();
-
-    return result == 0;
-  }
-
-  void ExpectStdoutMatchesBinaryFile(const std::string& filename) {
-    std::string expected_output;
-    GOOGLE_CHECK_OK(File::GetContents(filename, &expected_output, true));
-
-    // Don't use EXPECT_EQ because we don't want to print raw binary data to
-    // stdout on failure.
-    EXPECT_TRUE(captured_stdout_ == expected_output);
-  }
-
-  void ExpectStdoutMatchesTextFile(const std::string& filename) {
-    std::string expected_output;
-    GOOGLE_CHECK_OK(File::GetContents(filename, &expected_output, true));
-
-    ExpectStdoutMatchesText(expected_output);
-  }
-
-  void ExpectStdoutMatchesText(const std::string& expected_text) {
-    EXPECT_EQ(StripCR(expected_text), StripCR(captured_stdout_));
-  }
-
-  void ExpectStderrMatchesText(const std::string& expected_text) {
-    EXPECT_EQ(StripCR(expected_text), StripCR(captured_stderr_));
-  }
-
-  void ExpectStderrContainsText(const std::string& expected_text) {
-    EXPECT_NE(StripCR(captured_stderr_).find(StripCR(expected_text)),
-              std::string::npos);
-  }
-
- private:
-  void WriteUnittestProtoDescriptorSet() {
-    unittest_proto_descriptor_set_filename_ =
-        TestTempDir() + "/unittest_proto_descriptor_set.bin";
-    FileDescriptorSet file_descriptor_set;
-    protobuf_unittest::TestAllTypes test_all_types;
-    test_all_types.descriptor()->file()->CopyTo(file_descriptor_set.add_file());
-
-    protobuf_unittest_import::ImportMessage import_message;
-    import_message.descriptor()->file()->CopyTo(file_descriptor_set.add_file());
-
-    protobuf_unittest_import::PublicImportMessage public_import_message;
-    public_import_message.descriptor()->file()->CopyTo(
-        file_descriptor_set.add_file());
-    GOOGLE_DCHECK(file_descriptor_set.IsInitialized());
-
-    std::string binary_proto;
-    GOOGLE_CHECK(file_descriptor_set.SerializeToString(&binary_proto));
-    GOOGLE_CHECK_OK(File::SetContents(unittest_proto_descriptor_set_filename_,
-                               binary_proto, true));
-  }
-
-  int duped_stdin_;
-  std::string captured_stdout_;
-  std::string captured_stderr_;
-  std::string unittest_proto_descriptor_set_filename_;
-};
-
-TEST_P(EncodeDecodeTest, Encode) {
-  RedirectStdinFromFile(TestUtil::GetTestDataPath(
-      "net/proto2/internal/"
-      "testdata/text_format_unittest_data_oneof_implemented.txt"));
-  std::string args;
-  if (GetParam() != DESCRIPTOR_SET_IN) {
-    args.append(
-        TestUtil::MaybeTranslatePath("net/proto2/internal/unittest.proto"));
-  }
-  EXPECT_TRUE(Run(args + " --encode=protobuf_unittest.TestAllTypes"));
-  ExpectStdoutMatchesBinaryFile(TestUtil::GetTestDataPath(
-      "net/proto2/internal/testdata/golden_message_oneof_implemented"));
-  ExpectStderrMatchesText("");
-}
-
-TEST_P(EncodeDecodeTest, Decode) {
-  RedirectStdinFromFile(TestUtil::GetTestDataPath(
-      "net/proto2/internal/testdata/golden_message_oneof_implemented"));
-  EXPECT_TRUE(
-      Run(TestUtil::MaybeTranslatePath("net/proto2/internal/unittest.proto") +
-          " --decode=protobuf_unittest.TestAllTypes"));
-  ExpectStdoutMatchesTextFile(TestUtil::GetTestDataPath(
-      "net/proto2/internal/"
-      "testdata/text_format_unittest_data_oneof_implemented.txt"));
-  ExpectStderrMatchesText("");
-}
-
-TEST_P(EncodeDecodeTest, Partial) {
-  RedirectStdinFromText("");
-  EXPECT_TRUE(
-      Run(TestUtil::MaybeTranslatePath("net/proto2/internal/unittest.proto") +
-          " --encode=protobuf_unittest.TestRequired"));
-  ExpectStdoutMatchesText("");
-  ExpectStderrMatchesText(
-      "warning:  Input message is missing required fields:  a, b, c\n");
-}
-
-TEST_P(EncodeDecodeTest, DecodeRaw) {
-  protobuf_unittest::TestAllTypes message;
-  message.set_optional_int32(123);
-  message.set_optional_string("foo");
-  std::string data;
-  message.SerializeToString(&data);
-
-  RedirectStdinFromText(data);
-  EXPECT_TRUE(Run("--decode_raw", /*specify_proto_files=*/false));
-  ExpectStdoutMatchesText(
-      "1: 123\n"
-      "14: \"foo\"\n");
-  ExpectStderrMatchesText("");
-}
-
-TEST_P(EncodeDecodeTest, UnknownType) {
-  EXPECT_FALSE(
-      Run(TestUtil::MaybeTranslatePath("net/proto2/internal/unittest.proto") +
-          " --encode=NoSuchType"));
-  ExpectStdoutMatchesText("");
-  ExpectStderrMatchesText("Type not defined: NoSuchType\n");
-}
-
-TEST_P(EncodeDecodeTest, ProtoParseError) {
-  EXPECT_FALSE(
-      Run("net/proto2/internal/no_such_file.proto "
-          "--encode=NoSuchType"));
-  ExpectStdoutMatchesText("");
-  ExpectStderrContainsText(
-      "net/proto2/internal/no_such_file.proto: No such file or directory\n");
-}
-
-TEST_P(EncodeDecodeTest, EncodeDeterministicOutput) {
-  RedirectStdinFromFile(TestUtil::GetTestDataPath(
-      "net/proto2/internal/"
-      "testdata/text_format_unittest_data_oneof_implemented.txt"));
-  std::string args;
-  if (GetParam() != DESCRIPTOR_SET_IN) {
-    args.append(
-        TestUtil::MaybeTranslatePath("net/proto2/internal/unittest.proto"));
-  }
-  EXPECT_TRUE(Run(
-      args + " --encode=protobuf_unittest.TestAllTypes --deterministic_output"));
-  ExpectStdoutMatchesBinaryFile(TestUtil::GetTestDataPath(
-      "net/proto2/internal/testdata/golden_message_oneof_implemented"));
-  ExpectStderrMatchesText("");
-}
-
-TEST_P(EncodeDecodeTest, DecodeDeterministicOutput) {
-  RedirectStdinFromFile(TestUtil::GetTestDataPath(
-      "net/proto2/internal/testdata/golden_message_oneof_implemented"));
-  EXPECT_FALSE(
-      Run(TestUtil::MaybeTranslatePath("net/proto2/internal/unittest.proto") +
-          " --decode=protobuf_unittest.TestAllTypes --deterministic_output"));
-  ExpectStderrMatchesText(
-      "Can only use --deterministic_output with --encode.\n");
-}
-
-INSTANTIATE_TEST_SUITE_P(FileDescriptorSetSource, EncodeDecodeTest,
-                         testing::Values(PROTO_PATH, DESCRIPTOR_SET_IN));
-}  // anonymous namespace
-
-#endif  // !GOOGLE_PROTOBUF_HEAP_CHECK_DRACONIAN
-
-#include <google/protobuf/port_undef.inc>
-
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/compiler/cpp/bootstrap_unittest.cc b/libs/protobuf/src/google/protobuf/compiler/cpp/bootstrap_unittest.cc
deleted file mode 100644
index 2619e60..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/cpp/bootstrap_unittest.cc
+++ /dev/null
@@ -1,195 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-//
-// This test insures that net/proto2/proto/descriptor.pb.{h,cc} match exactly
-// what would be generated by the protocol compiler.  These files are not
-// generated automatically at build time because they are compiled into the
-// protocol compiler itself.  So, if they were auto-generated, you'd have a
-// chicken-and-egg problem.
-//
-// If this test fails, run the script
-// "generate_descriptor_proto.sh" and add
-// descriptor.pb.{h,cc} to your changelist.
-
-#include <map>
-
-#include <google/protobuf/testing/file.h>
-#include <google/protobuf/testing/file.h>
-#include <google/protobuf/compiler/cpp/generator.h>
-#include <google/protobuf/compiler/importer.h>
-#include <google/protobuf/test_util2.h>
-#include <google/protobuf/io/zero_copy_stream_impl.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/stubs/strutil.h>
-#include <google/protobuf/testing/googletest.h>
-#include <gtest/gtest.h>
-#include <google/protobuf/stubs/substitute.h>
-#include <google/protobuf/compiler/cpp/helpers.h>
-#include <google/protobuf/stubs/map_util.h>
-#include <google/protobuf/stubs/stl_util.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace cpp {
-
-namespace {
-
-class MockErrorCollector : public MultiFileErrorCollector {
- public:
-  MockErrorCollector() {}
-  ~MockErrorCollector() override {}
-
-  std::string text_;
-
-  // implements ErrorCollector ---------------------------------------
-  void AddError(const std::string& filename, int line, int column,
-                const std::string& message) override {
-    strings::SubstituteAndAppend(&text_, "$0:$1:$2: $3\n", filename, line, column,
-                              message);
-  }
-};
-
-class MockGeneratorContext : public GeneratorContext {
- public:
-  void ExpectFileMatches(const std::string& virtual_filename,
-                         const std::string& physical_filename) {
-    auto it = files_.find(virtual_filename);
-    ASSERT_TRUE(it != files_.end())
-        << "Generator failed to generate file: " << virtual_filename;
-
-    std::string expected_contents = *it->second;
-    std::string actual_contents;
-    GOOGLE_CHECK_OK(
-        File::GetContents(TestUtil::TestSourceDir() + "/" + physical_filename,
-                          &actual_contents, true))
-        << physical_filename;
-    CleanStringLineEndings(&actual_contents, false);
-
-#ifdef WRITE_FILES  // Define to debug mismatched files.
-    GOOGLE_CHECK_OK(File::SetContents("/tmp/expected.cc", expected_contents,
-                               true));
-    GOOGLE_CHECK_OK(
-        File::SetContents("/tmp/actual.cc", actual_contents, true));
-#endif
-
-    ASSERT_EQ(expected_contents, actual_contents)
-        << physical_filename
-        << " needs to be regenerated.  Please run "
-           "generate_descriptor_proto.sh. "
-           "Then add this file to your CL.";
-  }
-
-  // implements GeneratorContext --------------------------------------
-
-  io::ZeroCopyOutputStream* Open(const std::string& filename) override {
-    auto& map_slot = files_[filename];
-    map_slot.reset(new std::string);
-    return new io::StringOutputStream(map_slot.get());
-  }
-
- private:
-  std::map<std::string, std::unique_ptr<std::string>> files_;
-};
-
-const char kDescriptorParameter[] = "dllexport_decl=PROTOBUF_EXPORT";
-const char kPluginParameter[] = "dllexport_decl=PROTOC_EXPORT";
-
-
-const char* test_protos[][2] = {
-    {"google/protobuf/descriptor", kDescriptorParameter},
-    {"google/protobuf/compiler/plugin", kPluginParameter},
-};
-
-TEST(BootstrapTest, GeneratedFilesMatch) {
-  // We need a mapping from the actual file to virtual and actual path
-  // of the data to compare to.
-  std::map<std::string, std::string> vpath_map;
-  std::map<std::string, std::string> rpath_map;
-  rpath_map["third_party/protobuf/test_messages_proto2"] =
-      "net/proto2/z_generated_example/test_messages_proto2";
-  rpath_map["third_party/protobuf/test_messages_proto3"] =
-      "net/proto2/z_generated_example/test_messages_proto3";
-  rpath_map["net/proto2/internal/proto2_weak"] =
-      "net/proto2/z_generated_example/proto2_weak";
-
-  DiskSourceTree source_tree;
-  source_tree.MapPath("", TestUtil::TestSourceDir());
-
-  for (auto file_parameter : test_protos) {
-    MockErrorCollector error_collector;
-    Importer importer(&source_tree, &error_collector);
-    const FileDescriptor* file =
-        importer.Import(file_parameter[0] + std::string(".proto"));
-    ASSERT_TRUE(file != nullptr)
-        << "Can't import file " << file_parameter[0] + std::string(".proto")
-        << "\n";
-    EXPECT_EQ("", error_collector.text_);
-    CppGenerator generator;
-    MockGeneratorContext context;
-#ifdef GOOGLE_PROTOBUF_RUNTIME_INCLUDE_BASE
-    generator.set_opensource_runtime(true);
-    generator.set_runtime_include_base(GOOGLE_PROTOBUF_RUNTIME_INCLUDE_BASE);
-#endif
-    std::string error;
-    ASSERT_TRUE(generator.Generate(file, file_parameter[1], &context, &error));
-
-    std::string vpath =
-        FindWithDefault(vpath_map, file_parameter[0], file_parameter[0]);
-    std::string rpath =
-        FindWithDefault(rpath_map, file_parameter[0], file_parameter[0]);
-    context.ExpectFileMatches(vpath + ".pb.cc", rpath + ".pb.cc");
-    context.ExpectFileMatches(vpath + ".pb.h", rpath + ".pb.h");
-  }
-}
-
-// test Generate in cpp_generator.cc
-TEST(BootstrapTest, OptionNotExist) {
-  cpp::CppGenerator generator;
-  DescriptorPool pool;
-  GeneratorContext* generator_context = nullptr;
-  std::string parameter = "aaa";
-  std::string error;
-  ASSERT_FALSE(generator.Generate(
-      pool.FindFileByName("google/protobuf/descriptor.proto"), parameter,
-      generator_context, &error));
-  EXPECT_EQ(error, "Unknown generator option: " + parameter);
-}
-
-}  // namespace
-
-}  // namespace cpp
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/compiler/cpp/cpp_generator.h b/libs/protobuf/src/google/protobuf/compiler/cpp/cpp_generator.h
deleted file mode 100644
index 1716ab2..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/cpp/cpp_generator.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef GOOGLE_PROTOBUF_COMPILER_CPP_CPP_GENERATOR_H_
-#define GOOGLE_PROTOBUF_COMPILER_CPP_CPP_GENERATOR_H_
-
-#include <google/protobuf/compiler/cpp/generator.h>
-
-#endif  // GOOGLE_PROTOBUF_COMPILER_CPP_CPP_GENERATOR_H_
diff --git a/libs/protobuf/src/google/protobuf/compiler/cpp/enum.cc b/libs/protobuf/src/google/protobuf/compiler/cpp/enum.cc
deleted file mode 100644
index 8124369..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/cpp/enum.cc
+++ /dev/null
@@ -1,438 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-
-#include <google/protobuf/compiler/cpp/enum.h>
-
-#include <cstdint>
-#include <limits>
-#include <map>
-
-#include <google/protobuf/io/printer.h>
-#include <google/protobuf/stubs/strutil.h>
-#include <google/protobuf/compiler/cpp/helpers.h>
-#include <google/protobuf/compiler/cpp/names.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace cpp {
-
-namespace {
-// The GOOGLE_ARRAYSIZE constant is the max enum value plus 1. If the max enum value
-// is kint32max, GOOGLE_ARRAYSIZE will overflow. In such cases we should omit the
-// generation of the GOOGLE_ARRAYSIZE constant.
-bool ShouldGenerateArraySize(const EnumDescriptor* descriptor) {
-  int32_t max_value = descriptor->value(0)->number();
-  for (int i = 0; i < descriptor->value_count(); i++) {
-    if (descriptor->value(i)->number() > max_value) {
-      max_value = descriptor->value(i)->number();
-    }
-  }
-  return max_value != std::numeric_limits<int32_t>::max();
-}
-
-// Returns the number of unique numeric enum values. This is less than
-// descriptor->value_count() when there are aliased values.
-int CountUniqueValues(const EnumDescriptor* descriptor) {
-  std::set<int> values;
-  for (int i = 0; i < descriptor->value_count(); ++i) {
-    values.insert(descriptor->value(i)->number());
-  }
-  return values.size();
-}
-
-}  // namespace
-
-EnumGenerator::EnumGenerator(const EnumDescriptor* descriptor,
-                             const std::map<std::string, std::string>& vars,
-                             const Options& options)
-    : descriptor_(descriptor),
-      classname_(ClassName(descriptor, false)),
-      options_(options),
-      generate_array_size_(ShouldGenerateArraySize(descriptor)),
-      variables_(vars) {
-  variables_["classname"] = classname_;
-  variables_["classtype"] = QualifiedClassName(descriptor_, options);
-  variables_["short_name"] = descriptor_->name();
-  variables_["nested_name"] = descriptor_->name();
-  variables_["resolved_name"] = ResolveKeyword(descriptor_->name());
-  variables_["prefix"] =
-      (descriptor_->containing_type() == nullptr) ? "" : classname_ + "_";
-}
-
-EnumGenerator::~EnumGenerator() {}
-
-void EnumGenerator::GenerateDefinition(io::Printer* printer) {
-  Formatter format(printer, variables_);
-  format("enum ${1$$classname$$}$ : int {\n", descriptor_);
-  format.Indent();
-
-  const EnumValueDescriptor* min_value = descriptor_->value(0);
-  const EnumValueDescriptor* max_value = descriptor_->value(0);
-
-  for (int i = 0; i < descriptor_->value_count(); i++) {
-    auto format_value = format;
-    format_value.Set("name", EnumValueName(descriptor_->value(i)));
-    // In C++, an value of -2147483648 gets interpreted as the negative of
-    // 2147483648, and since 2147483648 can't fit in an integer, this produces a
-    // compiler warning.  This works around that issue.
-    format_value.Set("number", Int32ToString(descriptor_->value(i)->number()));
-    format_value.Set("deprecation",
-                     DeprecatedAttribute(options_, descriptor_->value(i)));
-
-    if (i > 0) format_value(",\n");
-    format_value("${1$$prefix$$name$$}$ $deprecation$= $number$",
-                 descriptor_->value(i));
-
-    if (descriptor_->value(i)->number() < min_value->number()) {
-      min_value = descriptor_->value(i);
-    }
-    if (descriptor_->value(i)->number() > max_value->number()) {
-      max_value = descriptor_->value(i);
-    }
-  }
-
-  if (descriptor_->file()->syntax() == FileDescriptor::SYNTAX_PROTO3) {
-    // For new enum semantics: generate min and max sentinel values equal to
-    // INT32_MIN and INT32_MAX
-    if (descriptor_->value_count() > 0) format(",\n");
-    format(
-        "$classname$_$prefix$INT_MIN_SENTINEL_DO_NOT_USE_ = "
-        "std::numeric_limits<$int32$>::min(),\n"
-        "$classname$_$prefix$INT_MAX_SENTINEL_DO_NOT_USE_ = "
-        "std::numeric_limits<$int32$>::max()");
-  }
-
-  format.Outdent();
-  format("\n};\n");
-
-  format(
-      "$dllexport_decl $bool $classname$_IsValid(int value);\n"
-      "constexpr $classname$ ${1$$prefix$$short_name$_MIN$}$ = "
-      "$prefix$$2$;\n"
-      "constexpr $classname$ ${1$$prefix$$short_name$_MAX$}$ = "
-      "$prefix$$3$;\n",
-      descriptor_, EnumValueName(min_value), EnumValueName(max_value));
-
-  if (generate_array_size_) {
-    format(
-        "constexpr int ${1$$prefix$$short_name$_ARRAYSIZE$}$ = "
-        "$prefix$$short_name$_MAX + 1;\n\n",
-        descriptor_);
-  }
-
-  if (HasDescriptorMethods(descriptor_->file(), options_)) {
-    format(
-        "$dllexport_decl $const ::$proto_ns$::EnumDescriptor* "
-        "$classname$_descriptor();\n");
-  }
-
-  // The _Name and _Parse functions. The lite implementation is table-based, so
-  // we make sure to keep the tables hidden in the .cc file.
-  if (!HasDescriptorMethods(descriptor_->file(), options_)) {
-    format("const std::string& $classname$_Name($classname$ value);\n");
-  }
-  // The _Name() function accepts the enum type itself but also any integral
-  // type.
-  format(
-      "template<typename T>\n"
-      "inline const std::string& $classname$_Name(T enum_t_value) {\n"
-      "  static_assert(::std::is_same<T, $classname$>::value ||\n"
-      "    ::std::is_integral<T>::value,\n"
-      "    \"Incorrect type passed to function $classname$_Name.\");\n");
-  if (HasDescriptorMethods(descriptor_->file(), options_)) {
-    format(
-        "  return ::$proto_ns$::internal::NameOfEnum(\n"
-        "    $classname$_descriptor(), enum_t_value);\n");
-  } else {
-    format(
-        "  return $classname$_Name(static_cast<$classname$>(enum_t_value));\n");
-  }
-  format("}\n");
-
-  if (HasDescriptorMethods(descriptor_->file(), options_)) {
-    format(
-        "inline bool $classname$_Parse(\n"
-        "    ::PROTOBUF_NAMESPACE_ID::ConstStringParam name, $classname$* "
-        "value) "
-        "{\n"
-        "  return ::$proto_ns$::internal::ParseNamedEnum<$classname$>(\n"
-        "    $classname$_descriptor(), name, value);\n"
-        "}\n");
-  } else {
-    format(
-        "bool $classname$_Parse(\n"
-        "    ::PROTOBUF_NAMESPACE_ID::ConstStringParam name, $classname$* "
-        "value);\n");
-  }
-}
-
-void EnumGenerator::GenerateGetEnumDescriptorSpecializations(
-    io::Printer* printer) {
-  Formatter format(printer, variables_);
-  format(
-      "template <> struct is_proto_enum< $classtype$> : ::std::true_type "
-      "{};\n");
-  if (HasDescriptorMethods(descriptor_->file(), options_)) {
-    format(
-        "template <>\n"
-        "inline const EnumDescriptor* GetEnumDescriptor< $classtype$>() {\n"
-        "  return $classtype$_descriptor();\n"
-        "}\n");
-  }
-}
-
-void EnumGenerator::GenerateSymbolImports(io::Printer* printer) const {
-  Formatter format(printer, variables_);
-  format("typedef $classname$ $resolved_name$;\n");
-
-  for (int j = 0; j < descriptor_->value_count(); j++) {
-    std::string deprecated_attr =
-        DeprecatedAttribute(options_, descriptor_->value(j));
-    format(
-        "$1$static constexpr $resolved_name$ ${2$$3$$}$ =\n"
-        "  $classname$_$3$;\n",
-        deprecated_attr, descriptor_->value(j),
-        EnumValueName(descriptor_->value(j)));
-  }
-
-  format(
-      "static inline bool $nested_name$_IsValid(int value) {\n"
-      "  return $classname$_IsValid(value);\n"
-      "}\n"
-      "static constexpr $resolved_name$ ${1$$nested_name$_MIN$}$ =\n"
-      "  $classname$_$nested_name$_MIN;\n"
-      "static constexpr $resolved_name$ ${1$$nested_name$_MAX$}$ =\n"
-      "  $classname$_$nested_name$_MAX;\n",
-      descriptor_);
-  if (generate_array_size_) {
-    format(
-        "static constexpr int ${1$$nested_name$_ARRAYSIZE$}$ =\n"
-        "  $classname$_$nested_name$_ARRAYSIZE;\n",
-        descriptor_);
-  }
-
-  if (HasDescriptorMethods(descriptor_->file(), options_)) {
-    format(
-        "static inline const ::$proto_ns$::EnumDescriptor*\n"
-        "$nested_name$_descriptor() {\n"
-        "  return $classname$_descriptor();\n"
-        "}\n");
-  }
-
-  format(
-      "template<typename T>\n"
-      "static inline const std::string& $nested_name$_Name(T enum_t_value) {\n"
-      "  static_assert(::std::is_same<T, $resolved_name$>::value ||\n"
-      "    ::std::is_integral<T>::value,\n"
-      "    \"Incorrect type passed to function $nested_name$_Name.\");\n"
-      "  return $classname$_Name(enum_t_value);\n"
-      "}\n");
-  format(
-      "static inline bool "
-      "$nested_name$_Parse(::PROTOBUF_NAMESPACE_ID::ConstStringParam name,\n"
-      "    $resolved_name$* value) {\n"
-      "  return $classname$_Parse(name, value);\n"
-      "}\n");
-}
-
-void EnumGenerator::GenerateMethods(int idx, io::Printer* printer) {
-  Formatter format(printer, variables_);
-  if (HasDescriptorMethods(descriptor_->file(), options_)) {
-    format(
-        "const ::$proto_ns$::EnumDescriptor* $classname$_descriptor() {\n"
-        "  ::$proto_ns$::internal::AssignDescriptors(&$desc_table$);\n"
-        "  return $file_level_enum_descriptors$[$1$];\n"
-        "}\n",
-        idx);
-  }
-
-  format(
-      "bool $classname$_IsValid(int value) {\n"
-      "  switch (value) {\n");
-
-  // Multiple values may have the same number.  Make sure we only cover
-  // each number once by first constructing a set containing all valid
-  // numbers, then printing a case statement for each element.
-
-  std::set<int> numbers;
-  for (int j = 0; j < descriptor_->value_count(); j++) {
-    const EnumValueDescriptor* value = descriptor_->value(j);
-    numbers.insert(value->number());
-  }
-
-  for (std::set<int>::iterator iter = numbers.begin(); iter != numbers.end();
-       ++iter) {
-    format("    case $1$:\n", Int32ToString(*iter));
-  }
-
-  format(
-      "      return true;\n"
-      "    default:\n"
-      "      return false;\n"
-      "  }\n"
-      "}\n"
-      "\n");
-
-  if (!HasDescriptorMethods(descriptor_->file(), options_)) {
-    // In lite mode (where descriptors are unavailable), we generate separate
-    // tables for mapping between enum names and numbers. The _entries table
-    // contains the bulk of the data and is sorted by name, while
-    // _entries_by_number is sorted by number and just contains pointers into
-    // _entries. The two tables allow mapping from name to number and number to
-    // name, both in time logarithmic in the number of enum entries. This could
-    // probably be made faster, but for now the tables are intended to be simple
-    // and compact.
-    //
-    // Enums with allow_alias = true support multiple entries with the same
-    // numerical value. In cases where there are multiple names for the same
-    // number, we treat the first name appearing in the .proto file as the
-    // canonical one.
-    std::map<std::string, int> name_to_number;
-    std::map<int, std::string> number_to_canonical_name;
-    for (int i = 0; i < descriptor_->value_count(); i++) {
-      const EnumValueDescriptor* value = descriptor_->value(i);
-      name_to_number.emplace(value->name(), value->number());
-      // The same number may appear with multiple names, so we use emplace() to
-      // let the first name win.
-      number_to_canonical_name.emplace(value->number(), value->name());
-    }
-
-    format(
-        "static ::$proto_ns$::internal::ExplicitlyConstructed<std::string> "
-        "$classname$_strings[$1$] = {};\n\n",
-        CountUniqueValues(descriptor_));
-
-    // We concatenate all the names for a given enum into one big string
-    // literal. If instead we store an array of string literals, the linker
-    // seems to put all enum strings for a given .proto file in the same
-    // section, which hinders its ability to strip out unused strings.
-    format("static const char $classname$_names[] =");
-    for (const auto& p : name_to_number) {
-      format("\n  \"$1$\"", p.first);
-    }
-    format(";\n\n");
-
-    format(
-        "static const ::$proto_ns$::internal::EnumEntry $classname$_entries[] "
-        "= {\n");
-    int i = 0;
-    std::map<int, int> number_to_index;
-    int data_index = 0;
-    for (const auto& p : name_to_number) {
-      format("  { {$classname$_names + $1$, $2$}, $3$ },\n", data_index,
-             p.first.size(), p.second);
-      if (number_to_canonical_name[p.second] == p.first) {
-        number_to_index.emplace(p.second, i);
-      }
-      ++i;
-      data_index += p.first.size();
-    }
-
-    format(
-        "};\n"
-        "\n"
-        "static const int $classname$_entries_by_number[] = {\n");
-    for (const auto& p : number_to_index) {
-      format("  $1$, // $2$ -> $3$\n", p.second, p.first,
-             number_to_canonical_name[p.first]);
-    }
-    format(
-        "};\n"
-        "\n");
-
-    format(
-        "const std::string& $classname$_Name(\n"
-        "    $classname$ value) {\n"
-        "  static const bool dummy =\n"
-        "      ::$proto_ns$::internal::InitializeEnumStrings(\n"
-        "          $classname$_entries,\n"
-        "          $classname$_entries_by_number,\n"
-        "          $1$, $classname$_strings);\n"
-        "  (void) dummy;\n"
-        "  int idx = ::$proto_ns$::internal::LookUpEnumName(\n"
-        "      $classname$_entries,\n"
-        "      $classname$_entries_by_number,\n"
-        "      $1$, value);\n"
-        "  return idx == -1 ? ::$proto_ns$::internal::GetEmptyString() :\n"
-        "                     $classname$_strings[idx].get();\n"
-        "}\n",
-        CountUniqueValues(descriptor_));
-    format(
-        "bool $classname$_Parse(\n"
-        "    ::PROTOBUF_NAMESPACE_ID::ConstStringParam name, $classname$* "
-        "value) "
-        "{\n"
-        "  int int_value;\n"
-        "  bool success = ::$proto_ns$::internal::LookUpEnumValue(\n"
-        "      $classname$_entries, $1$, name, &int_value);\n"
-        "  if (success) {\n"
-        "    *value = static_cast<$classname$>(int_value);\n"
-        "  }\n"
-        "  return success;\n"
-        "}\n",
-        descriptor_->value_count());
-  }
-
-  if (descriptor_->containing_type() != nullptr) {
-    std::string parent = ClassName(descriptor_->containing_type(), false);
-    // Before C++17, we must define the static constants which were
-    // declared in the header, to give the linker a place to put them.
-    // But MSVC++ pre-2015 and post-2017 (version 15.5+) insists that we not.
-    format(
-        "#if (__cplusplus < 201703) && "
-        "(!defined(_MSC_VER) || (_MSC_VER >= 1900 && _MSC_VER < 1912))\n");
-
-    for (int i = 0; i < descriptor_->value_count(); i++) {
-      format("constexpr $classname$ $1$::$2$;\n", parent,
-             EnumValueName(descriptor_->value(i)));
-    }
-    format(
-        "constexpr $classname$ $1$::$nested_name$_MIN;\n"
-        "constexpr $classname$ $1$::$nested_name$_MAX;\n",
-        parent);
-    if (generate_array_size_) {
-      format("constexpr int $1$::$nested_name$_ARRAYSIZE;\n", parent);
-    }
-
-    format(
-        "#endif  // (__cplusplus < 201703) && "
-        "(!defined(_MSC_VER) || (_MSC_VER >= 1900 && _MSC_VER < 1912))\n");
-  }
-}
-
-}  // namespace cpp
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/compiler/cpp/enum.h b/libs/protobuf/src/google/protobuf/compiler/cpp/enum.h
deleted file mode 100644
index 610d4fc..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/cpp/enum.h
+++ /dev/null
@@ -1,106 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-
-#ifndef GOOGLE_PROTOBUF_COMPILER_CPP_ENUM_H__
-#define GOOGLE_PROTOBUF_COMPILER_CPP_ENUM_H__
-
-#include <map>
-#include <set>
-#include <string>
-
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/compiler/cpp/options.h>
-
-namespace google {
-namespace protobuf {
-namespace io {
-class Printer;  // printer.h
-}
-}  // namespace protobuf
-}  // namespace google
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace cpp {
-
-class EnumGenerator {
- public:
-  // See generator.cc for the meaning of dllexport_decl.
-  EnumGenerator(const EnumDescriptor* descriptor,
-                const std::map<std::string, std::string>& vars,
-                const Options& options);
-  ~EnumGenerator();
-
-  // Generate header code defining the enum.  This code should be placed
-  // within the enum's package namespace, but NOT within any class, even for
-  // nested enums.
-  void GenerateDefinition(io::Printer* printer);
-
-  // Generate specialization of GetEnumDescriptor<MyEnum>().
-  // Precondition: in ::google::protobuf namespace.
-  void GenerateGetEnumDescriptorSpecializations(io::Printer* printer);
-
-  // For enums nested within a message, generate code to import all the enum's
-  // symbols (e.g. the enum type name, all its values, etc.) into the class's
-  // namespace.  This should be placed inside the class definition in the
-  // header.
-  void GenerateSymbolImports(io::Printer* printer) const;
-
-  // Source file stuff.
-
-  // Generate non-inline methods related to the enum, such as IsValidValue().
-  // Goes in the .cc file. EnumDescriptors are stored in an array, idx is
-  // the index in this array that corresponds with this enum.
-  void GenerateMethods(int idx, io::Printer* printer);
-
- private:
-  const EnumDescriptor* descriptor_;
-  const std::string classname_;
-  const Options& options_;
-  // whether to generate the *_ARRAYSIZE constant.
-  const bool generate_array_size_;
-
-  std::map<std::string, std::string> variables_;
-
-  friend class FileGenerator;
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(EnumGenerator);
-};
-
-}  // namespace cpp
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // GOOGLE_PROTOBUF_COMPILER_CPP_ENUM_H__
diff --git a/libs/protobuf/src/google/protobuf/compiler/cpp/enum_field.cc b/libs/protobuf/src/google/protobuf/compiler/cpp/enum_field.cc
deleted file mode 100644
index 8ffb699..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/cpp/enum_field.cc
+++ /dev/null
@@ -1,451 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-
-#include <google/protobuf/compiler/cpp/enum_field.h>
-
-#include <google/protobuf/io/printer.h>
-#include <google/protobuf/wire_format.h>
-#include <google/protobuf/stubs/strutil.h>
-#include <google/protobuf/compiler/cpp/field.h>
-#include <google/protobuf/compiler/cpp/helpers.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace cpp {
-
-namespace {
-
-void SetEnumVariables(const FieldDescriptor* descriptor,
-                      std::map<std::string, std::string>* variables,
-                      const Options& options) {
-  SetCommonFieldVariables(descriptor, variables, options);
-  const EnumValueDescriptor* default_value = descriptor->default_value_enum();
-  (*variables)["type"] = QualifiedClassName(descriptor->enum_type(), options);
-  (*variables)["default"] = Int32ToString(default_value->number());
-  (*variables)["full_name"] = descriptor->full_name();
-  (*variables)["cached_byte_size_name"] = MakeVarintCachedSizeName(descriptor);
-  bool cold = ShouldSplit(descriptor, options);
-  (*variables)["cached_byte_size_field"] =
-      MakeVarintCachedSizeFieldName(descriptor, cold);
-}
-
-}  // namespace
-
-// ===================================================================
-
-EnumFieldGenerator::EnumFieldGenerator(const FieldDescriptor* descriptor,
-                                       const Options& options)
-    : FieldGenerator(descriptor, options) {
-  SetEnumVariables(descriptor, &variables_, options);
-}
-
-EnumFieldGenerator::~EnumFieldGenerator() {}
-
-void EnumFieldGenerator::GeneratePrivateMembers(io::Printer* printer) const {
-  Formatter format(printer, variables_);
-  format("int $name$_;\n");
-}
-
-void EnumFieldGenerator::GenerateAccessorDeclarations(
-    io::Printer* printer) const {
-  Formatter format(printer, variables_);
-  format(
-      "$deprecated_attr$$type$ ${1$$name$$}$() const;\n"
-      "$deprecated_attr$void ${1$set_$name$$}$($type$ value);\n"
-      "private:\n"
-      "$type$ ${1$_internal_$name$$}$() const;\n"
-      "void ${1$_internal_set_$name$$}$($type$ value);\n"
-      "public:\n",
-      descriptor_);
-}
-
-void EnumFieldGenerator::GenerateInlineAccessorDefinitions(
-    io::Printer* printer) const {
-  Formatter format(printer, variables_);
-  format(
-      "inline $type$ $classname$::_internal_$name$() const {\n"
-      "  return static_cast< $type$ >($field$);\n"
-      "}\n"
-      "inline $type$ $classname$::$name$() const {\n"
-      "$annotate_get$"
-      "  // @@protoc_insertion_point(field_get:$full_name$)\n"
-      "  return _internal_$name$();\n"
-      "}\n"
-      "inline void $classname$::_internal_set_$name$($type$ value) {\n");
-  if (!HasPreservingUnknownEnumSemantics(descriptor_)) {
-    format("  assert($type$_IsValid(value));\n");
-  }
-  format(
-      "  $set_hasbit$\n"
-      "  $field$ = value;\n"
-      "}\n"
-      "inline void $classname$::set_$name$($type$ value) {\n"
-      "$maybe_prepare_split_message$"
-      "  _internal_set_$name$(value);\n"
-      "$annotate_set$"
-      "  // @@protoc_insertion_point(field_set:$full_name$)\n"
-      "}\n");
-}
-
-void EnumFieldGenerator::GenerateClearingCode(io::Printer* printer) const {
-  Formatter format(printer, variables_);
-  format("$field$ = $default$;\n");
-}
-
-void EnumFieldGenerator::GenerateMergingCode(io::Printer* printer) const {
-  Formatter format(printer, variables_);
-  format("_this->_internal_set_$name$(from._internal_$name$());\n");
-}
-
-void EnumFieldGenerator::GenerateSwappingCode(io::Printer* printer) const {
-  Formatter format(printer, variables_);
-  format("swap($field$, other->$field$);\n");
-}
-
-void EnumFieldGenerator::GenerateCopyConstructorCode(
-    io::Printer* printer) const {
-  Formatter format(printer, variables_);
-  format("_this->$field$ = from.$field$;\n");
-}
-
-void EnumFieldGenerator::GenerateSerializeWithCachedSizesToArray(
-    io::Printer* printer) const {
-  Formatter format(printer, variables_);
-  format(
-      "target = stream->EnsureSpace(target);\n"
-      "target = ::_pbi::WireFormatLite::WriteEnumToArray(\n"
-      "  $number$, this->_internal_$name$(), target);\n");
-}
-
-void EnumFieldGenerator::GenerateByteSize(io::Printer* printer) const {
-  Formatter format(printer, variables_);
-  format(
-      "total_size += $tag_size$ +\n"
-      "  ::_pbi::WireFormatLite::EnumSize(this->_internal_$name$());\n");
-}
-
-void EnumFieldGenerator::GenerateConstexprAggregateInitializer(
-    io::Printer* printer) const {
-  Formatter format(printer, variables_);
-  format("/*decltype($field$)*/$default$");
-}
-
-void EnumFieldGenerator::GenerateAggregateInitializer(
-    io::Printer* printer) const {
-  Formatter format(printer, variables_);
-  if (ShouldSplit(descriptor_, options_)) {
-    format("decltype(Impl_::Split::$name$_){$default$}");
-    return;
-  }
-  format("decltype($field$){$default$}");
-}
-
-void EnumFieldGenerator::GenerateCopyAggregateInitializer(
-    io::Printer* printer) const {
-  Formatter format(printer, variables_);
-  format("decltype($field$){}");
-}
-
-// ===================================================================
-
-EnumOneofFieldGenerator::EnumOneofFieldGenerator(
-    const FieldDescriptor* descriptor, const Options& options)
-    : EnumFieldGenerator(descriptor, options) {
-  SetCommonOneofFieldVariables(descriptor, &variables_);
-}
-
-EnumOneofFieldGenerator::~EnumOneofFieldGenerator() {}
-
-void EnumOneofFieldGenerator::GenerateInlineAccessorDefinitions(
-    io::Printer* printer) const {
-  Formatter format(printer, variables_);
-  format(
-      "inline $type$ $classname$::_internal_$name$() const {\n"
-      "  if (_internal_has_$name$()) {\n"
-      "    return static_cast< $type$ >($field$);\n"
-      "  }\n"
-      "  return static_cast< $type$ >($default$);\n"
-      "}\n"
-      "inline $type$ $classname$::$name$() const {\n"
-      "$annotate_get$"
-      "  // @@protoc_insertion_point(field_get:$full_name$)\n"
-      "  return _internal_$name$();\n"
-      "}\n"
-      "inline void $classname$::_internal_set_$name$($type$ value) {\n");
-  if (!HasPreservingUnknownEnumSemantics(descriptor_)) {
-    format("  assert($type$_IsValid(value));\n");
-  }
-  format(
-      "  if (!_internal_has_$name$()) {\n"
-      "    clear_$oneof_name$();\n"
-      "    set_has_$name$();\n"
-      "  }\n"
-      "  $field$ = value;\n"
-      "}\n"
-      "inline void $classname$::set_$name$($type$ value) {\n"
-      "  _internal_set_$name$(value);\n"
-      "$annotate_set$"
-      "  // @@protoc_insertion_point(field_set:$full_name$)\n"
-      "}\n");
-}
-
-void EnumOneofFieldGenerator::GenerateClearingCode(io::Printer* printer) const {
-  Formatter format(printer, variables_);
-  format("$field$ = $default$;\n");
-}
-
-void EnumOneofFieldGenerator::GenerateSwappingCode(io::Printer* printer) const {
-  // Don't print any swapping code. Swapping the union will swap this field.
-}
-
-void EnumOneofFieldGenerator::GenerateConstructorCode(
-    io::Printer* printer) const {
-  Formatter format(printer, variables_);
-  format("$ns$::_$classname$_default_instance_.$field$ = $default$;\n");
-}
-
-// ===================================================================
-
-RepeatedEnumFieldGenerator::RepeatedEnumFieldGenerator(
-    const FieldDescriptor* descriptor, const Options& options)
-    : FieldGenerator(descriptor, options) {
-  SetEnumVariables(descriptor, &variables_, options);
-}
-
-RepeatedEnumFieldGenerator::~RepeatedEnumFieldGenerator() {}
-
-void RepeatedEnumFieldGenerator::GeneratePrivateMembers(
-    io::Printer* printer) const {
-  Formatter format(printer, variables_);
-  format("::$proto_ns$::RepeatedField<int> $name$_;\n");
-  if (descriptor_->is_packed() &&
-      HasGeneratedMethods(descriptor_->file(), options_)) {
-    format("mutable std::atomic<int> $cached_byte_size_name$;\n");
-  }
-}
-
-void RepeatedEnumFieldGenerator::GenerateAccessorDeclarations(
-    io::Printer* printer) const {
-  Formatter format(printer, variables_);
-  format(
-      "private:\n"
-      "$type$ ${1$_internal_$name$$}$(int index) const;\n"
-      "void ${1$_internal_add_$name$$}$($type$ value);\n"
-      "::$proto_ns$::RepeatedField<int>* "
-      "${1$_internal_mutable_$name$$}$();\n"
-      "public:\n"
-      "$deprecated_attr$$type$ ${1$$name$$}$(int index) const;\n"
-      "$deprecated_attr$void ${1$set_$name$$}$(int index, $type$ value);\n"
-      "$deprecated_attr$void ${1$add_$name$$}$($type$ value);\n"
-      "$deprecated_attr$const ::$proto_ns$::RepeatedField<int>& "
-      "${1$$name$$}$() const;\n"
-      "$deprecated_attr$::$proto_ns$::RepeatedField<int>* "
-      "${1$mutable_$name$$}$();\n",
-      descriptor_);
-}
-
-void RepeatedEnumFieldGenerator::GenerateInlineAccessorDefinitions(
-    io::Printer* printer) const {
-  Formatter format(printer, variables_);
-  format(
-      "inline $type$ $classname$::_internal_$name$(int index) const {\n"
-      "  return static_cast< $type$ >($field$.Get(index));\n"
-      "}\n"
-      "inline $type$ $classname$::$name$(int index) const {\n"
-      "$annotate_get$"
-      "  // @@protoc_insertion_point(field_get:$full_name$)\n"
-      "  return _internal_$name$(index);\n"
-      "}\n"
-      "inline void $classname$::set_$name$(int index, $type$ value) {\n");
-  if (!HasPreservingUnknownEnumSemantics(descriptor_)) {
-    format("  assert($type$_IsValid(value));\n");
-  }
-  format(
-      "  $field$.Set(index, value);\n"
-      "$annotate_set$"
-      "  // @@protoc_insertion_point(field_set:$full_name$)\n"
-      "}\n"
-      "inline void $classname$::_internal_add_$name$($type$ value) {\n");
-  if (!HasPreservingUnknownEnumSemantics(descriptor_)) {
-    format("  assert($type$_IsValid(value));\n");
-  }
-  format(
-      "  $field$.Add(value);\n"
-      "}\n"
-      "inline void $classname$::add_$name$($type$ value) {\n"
-      "  _internal_add_$name$(value);\n"
-      "$annotate_add$"
-      "  // @@protoc_insertion_point(field_add:$full_name$)\n"
-      "}\n"
-      "inline const ::$proto_ns$::RepeatedField<int>&\n"
-      "$classname$::$name$() const {\n"
-      "$annotate_list$"
-      "  // @@protoc_insertion_point(field_list:$full_name$)\n"
-      "  return $field$;\n"
-      "}\n"
-      "inline ::$proto_ns$::RepeatedField<int>*\n"
-      "$classname$::_internal_mutable_$name$() {\n"
-      "  return &$field$;\n"
-      "}\n"
-      "inline ::$proto_ns$::RepeatedField<int>*\n"
-      "$classname$::mutable_$name$() {\n"
-      "$annotate_mutable_list$"
-      "  // @@protoc_insertion_point(field_mutable_list:$full_name$)\n"
-      "  return _internal_mutable_$name$();\n"
-      "}\n");
-}
-
-void RepeatedEnumFieldGenerator::GenerateClearingCode(
-    io::Printer* printer) const {
-  Formatter format(printer, variables_);
-  format("$field$.Clear();\n");
-}
-
-void RepeatedEnumFieldGenerator::GenerateMergingCode(
-    io::Printer* printer) const {
-  Formatter format(printer, variables_);
-  format("_this->$field$.MergeFrom(from.$field$);\n");
-}
-
-void RepeatedEnumFieldGenerator::GenerateSwappingCode(
-    io::Printer* printer) const {
-  Formatter format(printer, variables_);
-  format("$field$.InternalSwap(&other->$field$);\n");
-}
-
-void RepeatedEnumFieldGenerator::GenerateConstructorCode(
-    io::Printer* printer) const {
-  // Not needed for repeated fields.
-}
-
-void RepeatedEnumFieldGenerator::GenerateDestructorCode(
-    io::Printer* printer) const {
-  Formatter format(printer, variables_);
-  format("$field$.~RepeatedField();\n");
-}
-
-void RepeatedEnumFieldGenerator::GenerateSerializeWithCachedSizesToArray(
-    io::Printer* printer) const {
-  Formatter format(printer, variables_);
-  if (descriptor_->is_packed()) {
-    // Write the tag and the size.
-    format(
-        "{\n"
-        "  int byte_size = "
-        "$cached_byte_size_field$.load(std::memory_order_relaxed);\n"
-        "  if (byte_size > 0) {\n"
-        "    target = stream->WriteEnumPacked(\n"
-        "        $number$, $field$, byte_size, target);\n"
-        "  }\n"
-        "}\n");
-  } else {
-    format(
-        "for (int i = 0, n = this->_internal_$name$_size(); i < n; i++) {\n"
-        "  target = stream->EnsureSpace(target);\n"
-        "  target = ::_pbi::WireFormatLite::WriteEnumToArray(\n"
-        "      $number$, this->_internal_$name$(i), target);\n"
-        "}\n");
-  }
-}
-
-void RepeatedEnumFieldGenerator::GenerateByteSize(io::Printer* printer) const {
-  Formatter format(printer, variables_);
-  format(
-      "{\n"
-      "  size_t data_size = 0;\n"
-      "  unsigned int count = static_cast<unsigned "
-      "int>(this->_internal_$name$_size());");
-  format.Indent();
-  format(
-      "for (unsigned int i = 0; i < count; i++) {\n"
-      "  data_size += ::_pbi::WireFormatLite::EnumSize(\n"
-      "    this->_internal_$name$(static_cast<int>(i)));\n"
-      "}\n");
-
-  if (descriptor_->is_packed()) {
-    format(
-        "if (data_size > 0) {\n"
-        "  total_size += $tag_size$ +\n"
-        "    "
-        "::_pbi::WireFormatLite::Int32Size(static_cast<$int32$>(data_size));\n"
-        "}\n"
-        "int cached_size = ::_pbi::ToCachedSize(data_size);\n"
-        "$cached_byte_size_field$.store(cached_size,\n"
-        "                                std::memory_order_relaxed);\n"
-        "total_size += data_size;\n");
-  } else {
-    format("total_size += ($tag_size$UL * count) + data_size;\n");
-  }
-  format.Outdent();
-  format("}\n");
-}
-
-void RepeatedEnumFieldGenerator::GenerateConstexprAggregateInitializer(
-    io::Printer* printer) const {
-  Formatter format(printer, variables_);
-  format("/*decltype($field$)*/{}");
-  if (descriptor_->is_packed() &&
-      HasGeneratedMethods(descriptor_->file(), options_)) {
-    format("\n, /*decltype($cached_byte_size_field$)*/{0}");
-  }
-}
-
-void RepeatedEnumFieldGenerator::GenerateAggregateInitializer(
-    io::Printer* printer) const {
-  Formatter format(printer, variables_);
-  format("decltype($field$){arena}");
-  if (descriptor_->is_packed() &&
-      HasGeneratedMethods(descriptor_->file(), options_)) {
-    // std::atomic has no copy constructor, which prevents explicit aggregate
-    // initialization pre-C++17.
-    format("\n, /*decltype($cached_byte_size_field$)*/{0}");
-  }
-}
-
-void RepeatedEnumFieldGenerator::GenerateCopyAggregateInitializer(
-    io::Printer* printer) const {
-  Formatter format(printer, variables_);
-  format("decltype($field$){from.$field$}");
-  if (descriptor_->is_packed() &&
-      HasGeneratedMethods(descriptor_->file(), options_)) {
-    // std::atomic has no copy constructor.
-    format("\n, /*decltype($cached_byte_size_field$)*/{0}");
-  }
-}
-
-}  // namespace cpp
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/compiler/cpp/enum_field.h b/libs/protobuf/src/google/protobuf/compiler/cpp/enum_field.h
deleted file mode 100644
index 61bae85..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/cpp/enum_field.h
+++ /dev/null
@@ -1,125 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-
-#ifndef GOOGLE_PROTOBUF_COMPILER_CPP_ENUM_FIELD_H__
-#define GOOGLE_PROTOBUF_COMPILER_CPP_ENUM_FIELD_H__
-
-#include <map>
-#include <string>
-
-#include <google/protobuf/compiler/cpp/field.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace cpp {
-
-class EnumFieldGenerator : public FieldGenerator {
- public:
-  EnumFieldGenerator(const FieldDescriptor* descriptor, const Options& options);
-  ~EnumFieldGenerator() override;
-
-  // implements FieldGenerator ---------------------------------------
-  void GeneratePrivateMembers(io::Printer* printer) const override;
-  void GenerateAccessorDeclarations(io::Printer* printer) const override;
-  void GenerateInlineAccessorDefinitions(io::Printer* printer) const override;
-  void GenerateClearingCode(io::Printer* printer) const override;
-  void GenerateMergingCode(io::Printer* printer) const override;
-  void GenerateSwappingCode(io::Printer* printer) const override;
-  void GenerateConstructorCode(io::Printer* printer) const override {}
-  void GenerateCopyConstructorCode(io::Printer* printer) const override;
-  void GenerateSerializeWithCachedSizesToArray(
-      io::Printer* printer) const override;
-  void GenerateByteSize(io::Printer* printer) const override;
-  void GenerateConstexprAggregateInitializer(
-      io::Printer* printer) const override;
-  void GenerateAggregateInitializer(io::Printer* printer) const override;
-  void GenerateCopyAggregateInitializer(io::Printer* printer) const override;
-
- private:
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(EnumFieldGenerator);
-};
-
-class EnumOneofFieldGenerator : public EnumFieldGenerator {
- public:
-  EnumOneofFieldGenerator(const FieldDescriptor* descriptor,
-                          const Options& options);
-  ~EnumOneofFieldGenerator() override;
-
-  // implements FieldGenerator ---------------------------------------
-  void GenerateInlineAccessorDefinitions(io::Printer* printer) const override;
-  void GenerateClearingCode(io::Printer* printer) const override;
-  void GenerateSwappingCode(io::Printer* printer) const override;
-  void GenerateConstructorCode(io::Printer* printer) const override;
-
- private:
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(EnumOneofFieldGenerator);
-};
-
-class RepeatedEnumFieldGenerator : public FieldGenerator {
- public:
-  RepeatedEnumFieldGenerator(const FieldDescriptor* descriptor,
-                             const Options& options);
-  ~RepeatedEnumFieldGenerator() override;
-
-  // implements FieldGenerator ---------------------------------------
-  void GeneratePrivateMembers(io::Printer* printer) const override;
-  void GenerateAccessorDeclarations(io::Printer* printer) const override;
-  void GenerateInlineAccessorDefinitions(io::Printer* printer) const override;
-  void GenerateClearingCode(io::Printer* printer) const override;
-  void GenerateMergingCode(io::Printer* printer) const override;
-  void GenerateSwappingCode(io::Printer* printer) const override;
-  void GenerateConstructorCode(io::Printer* printer) const override;
-  void GenerateCopyConstructorCode(io::Printer*  /*printer*/) const override {
-    GOOGLE_CHECK(!ShouldSplit(descriptor_, options_));
-  }
-  void GenerateDestructorCode(io::Printer* printer) const override;
-  void GenerateSerializeWithCachedSizesToArray(
-      io::Printer* printer) const override;
-  void GenerateByteSize(io::Printer* printer) const override;
-  void GenerateConstexprAggregateInitializer(
-      io::Printer* printer) const override;
-  void GenerateAggregateInitializer(io::Printer* printer) const override;
-  void GenerateCopyAggregateInitializer(io::Printer* printer) const override;
-
- private:
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(RepeatedEnumFieldGenerator);
-};
-
-}  // namespace cpp
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // GOOGLE_PROTOBUF_COMPILER_CPP_ENUM_FIELD_H__
diff --git a/libs/protobuf/src/google/protobuf/compiler/cpp/extension.cc b/libs/protobuf/src/google/protobuf/compiler/cpp/extension.cc
deleted file mode 100644
index 950ed9e..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/cpp/extension.cc
+++ /dev/null
@@ -1,193 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-
-#include <google/protobuf/compiler/cpp/extension.h>
-
-#include <map>
-
-#include <google/protobuf/io/printer.h>
-#include <google/protobuf/stubs/strutil.h>
-#include <google/protobuf/compiler/cpp/helpers.h>
-#include <google/protobuf/descriptor.pb.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace cpp {
-
-ExtensionGenerator::ExtensionGenerator(const FieldDescriptor* descriptor,
-                                       const Options& options,
-                                       MessageSCCAnalyzer* scc_analyzer)
-    : descriptor_(descriptor), options_(options), scc_analyzer_(scc_analyzer) {
-  // Construct type_traits_.
-  if (descriptor_->is_repeated()) {
-    type_traits_ = "Repeated";
-  }
-
-  switch (descriptor_->cpp_type()) {
-    case FieldDescriptor::CPPTYPE_ENUM:
-      type_traits_.append("EnumTypeTraits< ");
-      type_traits_.append(ClassName(descriptor_->enum_type(), true));
-      type_traits_.append(", ");
-      type_traits_.append(ClassName(descriptor_->enum_type(), true));
-      type_traits_.append("_IsValid>");
-      break;
-    case FieldDescriptor::CPPTYPE_STRING:
-      type_traits_.append("StringTypeTraits");
-      break;
-    case FieldDescriptor::CPPTYPE_MESSAGE:
-      type_traits_.append("MessageTypeTraits< ");
-      type_traits_.append(ClassName(descriptor_->message_type(), true));
-      type_traits_.append(" >");
-      break;
-    default:
-      type_traits_.append("PrimitiveTypeTraits< ");
-      type_traits_.append(PrimitiveTypeName(options_, descriptor_->cpp_type()));
-      type_traits_.append(" >");
-      break;
-  }
-  SetCommonVars(options, &variables_);
-  SetCommonMessageDataVariables(descriptor_->containing_type(), &variables_);
-  variables_["extendee"] =
-      QualifiedClassName(descriptor_->containing_type(), options_);
-  variables_["type_traits"] = type_traits_;
-  std::string name = descriptor_->name();
-  variables_["name"] = ResolveKeyword(name);
-  variables_["constant_name"] = FieldConstantName(descriptor_);
-  variables_["field_type"] =
-      StrCat(static_cast<int>(descriptor_->type()));
-  variables_["packed"] = descriptor_->is_packed() ? "true" : "false";
-
-  std::string scope =
-      IsScoped() ? ClassName(descriptor_->extension_scope(), false) + "::" : "";
-  variables_["scope"] = scope;
-  variables_["scoped_name"] = ExtensionName(descriptor_);
-  variables_["number"] = StrCat(descriptor_->number());
-
-  bool add_verify_fn =
-      // Only verify msgs.
-      descriptor_->cpp_type() == FieldDescriptor::CPPTYPE_MESSAGE &&
-      // Options say to verify.
-      ShouldVerify(descriptor_->message_type(), options_, scc_analyzer_) &&
-      ShouldVerify(descriptor_->containing_type(), options_, scc_analyzer_);
-
-  variables_["verify_fn"] =
-      add_verify_fn
-          ? StrCat("&", FieldMessageTypeName(descriptor_, options_),
-                         "::InternalVerify")
-          : "nullptr";
-}
-
-ExtensionGenerator::~ExtensionGenerator() {}
-
-bool ExtensionGenerator::IsScoped() const {
-  return descriptor_->extension_scope() != nullptr;
-}
-
-void ExtensionGenerator::GenerateDeclaration(io::Printer* printer) const {
-  Formatter format(printer, variables_);
-
-  // If this is a class member, it needs to be declared "static".  Otherwise,
-  // it needs to be "extern".  In the latter case, it also needs the DLL
-  // export/import specifier.
-  std::string qualifier;
-  if (!IsScoped()) {
-    qualifier = "extern";
-    if (!options_.dllexport_decl.empty()) {
-      qualifier = options_.dllexport_decl + " " + qualifier;
-    }
-  } else {
-    qualifier = "static";
-  }
-
-  format(
-      "static const int $constant_name$ = $number$;\n"
-      "$1$ ::$proto_ns$::internal::ExtensionIdentifier< $extendee$,\n"
-      "    ::$proto_ns$::internal::$type_traits$, $field_type$, $packed$ >\n"
-      "  ${2$$name$$}$;\n",
-      qualifier, descriptor_);
-}
-
-void ExtensionGenerator::GenerateDefinition(io::Printer* printer) {
-  // If we are building for lite with implicit weak fields, we want to skip over
-  // any custom options (i.e. extensions of messages from descriptor.proto).
-  // This prevents the creation of any unnecessary linker references to the
-  // descriptor messages.
-  if (options_.lite_implicit_weak_fields &&
-      descriptor_->containing_type()->file()->name() ==
-          "net/proto2/proto/descriptor.proto") {
-    return;
-  }
-
-  Formatter format(printer, variables_);
-  std::string default_str;
-  // If this is a class member, it needs to be declared in its class scope.
-  if (descriptor_->cpp_type() == FieldDescriptor::CPPTYPE_STRING) {
-    // We need to declare a global string which will contain the default value.
-    // We cannot declare it at class scope because that would require exposing
-    // it in the header which would be annoying for other reasons.  So we
-    // replace :: with _ in the name and declare it as a global.
-    default_str =
-        StringReplace(variables_["scoped_name"], "::", "_", true) + "_default";
-    format("const std::string $1$($2$);\n", default_str,
-           DefaultValue(options_, descriptor_));
-  } else if (descriptor_->message_type()) {
-    // We have to initialize the default instance for extensions at registration
-    // time.
-    default_str =
-        FieldMessageTypeName(descriptor_, options_) + "::default_instance()";
-  } else {
-    default_str = DefaultValue(options_, descriptor_);
-  }
-
-  // Likewise, class members need to declare the field constant variable.
-  if (IsScoped()) {
-    format(
-        "#if !defined(_MSC_VER) || (_MSC_VER >= 1900 && _MSC_VER < 1912)\n"
-        "const int $scope$$constant_name$;\n"
-        "#endif\n");
-  }
-
-  format(
-      "PROTOBUF_ATTRIBUTE_INIT_PRIORITY2 "
-      "::$proto_ns$::internal::ExtensionIdentifier< $extendee$,\n"
-      "    ::$proto_ns$::internal::$type_traits$, $field_type$, $packed$>\n"
-      "  $scoped_name$($constant_name$, $1$, $verify_fn$);\n",
-      default_str);
-}
-
-}  // namespace cpp
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/compiler/cpp/extension.h b/libs/protobuf/src/google/protobuf/compiler/cpp/extension.h
deleted file mode 100644
index 282931f..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/cpp/extension.h
+++ /dev/null
@@ -1,95 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-
-#ifndef GOOGLE_PROTOBUF_COMPILER_CPP_EXTENSION_H__
-#define GOOGLE_PROTOBUF_COMPILER_CPP_EXTENSION_H__
-
-#include <map>
-#include <string>
-
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/compiler/cpp/options.h>
-
-namespace google {
-namespace protobuf {
-class FieldDescriptor;  // descriptor.h
-namespace io {
-class Printer;  // printer.h
-}
-}  // namespace protobuf
-}  // namespace google
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace cpp {
-
-class MessageSCCAnalyzer;
-
-// Generates code for an extension, which may be within the scope of some
-// message or may be at file scope.  This is much simpler than FieldGenerator
-// since extensions are just simple identifiers with interesting types.
-class ExtensionGenerator {
- public:
-  // See generator.cc for the meaning of dllexport_decl.
-  explicit ExtensionGenerator(const FieldDescriptor* descriptor,
-                              const Options& options,
-                              MessageSCCAnalyzer* scc_analyzer);
-  ~ExtensionGenerator();
-
-  // Header stuff.
-  void GenerateDeclaration(io::Printer* printer) const;
-
-  // Source file stuff.
-  void GenerateDefinition(io::Printer* printer);
-
-  bool IsScoped() const;
-
- private:
-  const FieldDescriptor* descriptor_;
-  std::string type_traits_;
-  Options options_;
-  MessageSCCAnalyzer* scc_analyzer_;
-
-  std::map<std::string, std::string> variables_;
-
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(ExtensionGenerator);
-};
-
-}  // namespace cpp
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // GOOGLE_PROTOBUF_COMPILER_CPP_MESSAGE_H__
diff --git a/libs/protobuf/src/google/protobuf/compiler/cpp/field.cc b/libs/protobuf/src/google/protobuf/compiler/cpp/field.cc
deleted file mode 100644
index 90d2084..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/cpp/field.cc
+++ /dev/null
@@ -1,421 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-
-#include <google/protobuf/compiler/cpp/field.h>
-
-#include <cstdint>
-#include <memory>
-#include <string>
-
-#include <google/protobuf/stubs/strutil.h>
-#include <google/protobuf/stubs/substitute.h>
-#include <google/protobuf/compiler/cpp/helpers.h>
-#include <google/protobuf/compiler/cpp/primitive_field.h>
-#include <google/protobuf/compiler/cpp/string_field.h>
-#include <google/protobuf/stubs/logging.h>
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/io/printer.h>
-#include <google/protobuf/wire_format.h>
-#include <google/protobuf/compiler/cpp/enum_field.h>
-#include <google/protobuf/compiler/cpp/map_field.h>
-#include <google/protobuf/compiler/cpp/message_field.h>
-#include <google/protobuf/descriptor.pb.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace cpp {
-
-using internal::WireFormat;
-
-namespace {
-
-void MaySetAnnotationVariable(const Options& options,
-                              StringPiece annotation_name,
-                              StringPiece substitute_template_prefix,
-                              StringPiece prepared_template,
-                              int field_index, StringPiece access_type,
-                              std::map<std::string, std::string>* variables) {
-  if (options.field_listener_options.forbidden_field_listener_events.count(
-          std::string(annotation_name)))
-    return;
-  (*variables)[StrCat("annotate_", annotation_name)] = strings::Substitute(
-      StrCat(substitute_template_prefix, prepared_template, ");\n"),
-      field_index, access_type);
-}
-
-std::string GenerateTemplateForOneofString(const FieldDescriptor* descriptor,
-                                           StringPiece proto_ns,
-                                           StringPiece field_member) {
-  std::string field_name = google::protobuf::compiler::cpp::FieldName(descriptor);
-  std::string field_pointer =
-      descriptor->options().ctype() == google::protobuf::FieldOptions::STRING
-          ? "$0.UnsafeGetPointer()"
-          : "$0";
-
-  if (descriptor->default_value_string().empty()) {
-    return strings::Substitute(StrCat("_internal_has_", field_name, "() ? ",
-                                         field_pointer, ": nullptr"),
-                            field_member);
-  }
-
-  if (descriptor->options().ctype() == google::protobuf::FieldOptions::STRING_PIECE) {
-    return strings::Substitute(StrCat("_internal_has_", field_name, "() ? ",
-                                         field_pointer, ": nullptr"),
-                            field_member);
-  }
-
-  std::string default_value_pointer =
-      descriptor->options().ctype() == google::protobuf::FieldOptions::STRING
-          ? "&$1.get()"
-          : "&$1";
-  return strings::Substitute(
-      StrCat("_internal_has_", field_name, "() ? ", field_pointer, " : ",
-                   default_value_pointer),
-      field_member, MakeDefaultFieldName(descriptor));
-}
-
-std::string GenerateTemplateForSingleString(const FieldDescriptor* descriptor,
-                                            StringPiece field_member) {
-  if (descriptor->default_value_string().empty()) {
-    return StrCat("&", field_member);
-  }
-
-  if (descriptor->options().ctype() == google::protobuf::FieldOptions::STRING) {
-    return strings::Substitute(
-        "$0.IsDefault() ? &$1.get() : $0.UnsafeGetPointer()", field_member,
-        MakeDefaultFieldName(descriptor));
-  }
-
-  return StrCat("&", field_member);
-}
-
-}  // namespace
-
-void AddAccessorAnnotations(const FieldDescriptor* descriptor,
-                            const Options& options,
-                            std::map<std::string, std::string>* variables) {
-  // Can be expanded to include more specific calls, for example, for arena or
-  // clear calls.
-  static constexpr const char* kAccessorsAnnotations[] = {
-      "annotate_add",     "annotate_get",         "annotate_has",
-      "annotate_list",    "annotate_mutable",     "annotate_mutable_list",
-      "annotate_release", "annotate_set",         "annotate_size",
-      "annotate_clear",   "annotate_add_mutable",
-  };
-  for (size_t i = 0; i < GOOGLE_ARRAYSIZE(kAccessorsAnnotations); ++i) {
-    (*variables)[kAccessorsAnnotations[i]] = "";
-  }
-  if (options.annotate_accessor) {
-    for (size_t i = 0; i < GOOGLE_ARRAYSIZE(kAccessorsAnnotations); ++i) {
-      (*variables)[kAccessorsAnnotations[i]] = StrCat(
-          "  ", FieldName(descriptor), "_AccessedNoStrip = true;\n");
-    }
-  }
-  if (!options.field_listener_options.inject_field_listener_events) {
-    return;
-  }
-  if (descriptor->file()->options().optimize_for() ==
-      google::protobuf::FileOptions::LITE_RUNTIME) {
-    return;
-  }
-  std::string field_member = (*variables)["field"];
-  const google::protobuf::OneofDescriptor* oneof_member =
-      descriptor->real_containing_oneof();
-  const std::string proto_ns = (*variables)["proto_ns"];
-  const std::string substitute_template_prefix =
-      StrCat("  ", (*variables)["tracker"], ".$1<$0>(this, ");
-  std::string prepared_template;
-
-  // Flat template is needed if the prepared one is introspecting the values
-  // inside the returned values, for example, for repeated fields and maps.
-  std::string prepared_flat_template;
-  std::string prepared_add_template;
-  // TODO(b/190614678): Support fields with type Message or Map.
-  if (descriptor->is_repeated() && !descriptor->is_map()) {
-    if (descriptor->type() != FieldDescriptor::TYPE_MESSAGE &&
-        descriptor->type() != FieldDescriptor::TYPE_GROUP) {
-      prepared_template = strings::Substitute("&$0.Get(index)", field_member);
-      prepared_add_template =
-          strings::Substitute("&$0.Get($0.size() - 1)", field_member);
-    } else {
-      prepared_template = "nullptr";
-      prepared_add_template = "nullptr";
-    }
-  } else if (descriptor->is_map()) {
-    prepared_template = "nullptr";
-  } else if (descriptor->type() == FieldDescriptor::TYPE_MESSAGE &&
-             !IsExplicitLazy(descriptor)) {
-    prepared_template = "nullptr";
-  } else if (descriptor->cpp_type() == FieldDescriptor::CPPTYPE_STRING) {
-    if (oneof_member) {
-      prepared_template = GenerateTemplateForOneofString(
-          descriptor, (*variables)["proto_ns"], field_member);
-    } else {
-      prepared_template =
-          GenerateTemplateForSingleString(descriptor, field_member);
-    }
-  } else {
-    prepared_template = StrCat("&", field_member);
-  }
-  if (descriptor->is_repeated() && !descriptor->is_map() &&
-      descriptor->type() != FieldDescriptor::TYPE_MESSAGE &&
-      descriptor->type() != FieldDescriptor::TYPE_GROUP) {
-    prepared_flat_template = StrCat("&", field_member);
-  } else {
-    prepared_flat_template = prepared_template;
-  }
-
-  MaySetAnnotationVariable(options, "get", substitute_template_prefix,
-                           prepared_template, descriptor->index(), "OnGet",
-                           variables);
-  MaySetAnnotationVariable(options, "set", substitute_template_prefix,
-                           prepared_template, descriptor->index(), "OnSet",
-                           variables);
-  MaySetAnnotationVariable(options, "has", substitute_template_prefix,
-                           prepared_template, descriptor->index(), "OnHas",
-                           variables);
-  MaySetAnnotationVariable(options, "mutable", substitute_template_prefix,
-                           prepared_template, descriptor->index(), "OnMutable",
-                           variables);
-  MaySetAnnotationVariable(options, "release", substitute_template_prefix,
-                           prepared_template, descriptor->index(), "OnRelease",
-                           variables);
-  MaySetAnnotationVariable(options, "clear", substitute_template_prefix,
-                           prepared_flat_template, descriptor->index(),
-                           "OnClear", variables);
-  MaySetAnnotationVariable(options, "size", substitute_template_prefix,
-                           prepared_flat_template, descriptor->index(),
-                           "OnSize", variables);
-  MaySetAnnotationVariable(options, "list", substitute_template_prefix,
-                           prepared_flat_template, descriptor->index(),
-                           "OnList", variables);
-  MaySetAnnotationVariable(options, "mutable_list", substitute_template_prefix,
-                           prepared_flat_template, descriptor->index(),
-                           "OnMutableList", variables);
-  MaySetAnnotationVariable(options, "add", substitute_template_prefix,
-                           prepared_add_template, descriptor->index(), "OnAdd",
-                           variables);
-  MaySetAnnotationVariable(options, "add_mutable", substitute_template_prefix,
-                           prepared_add_template, descriptor->index(),
-                           "OnAddMutable", variables);
-}
-
-void SetCommonFieldVariables(const FieldDescriptor* descriptor,
-                             std::map<std::string, std::string>* variables,
-                             const Options& options) {
-  SetCommonVars(options, variables);
-  SetCommonMessageDataVariables(descriptor->containing_type(), variables);
-
-  (*variables)["ns"] = Namespace(descriptor, options);
-  (*variables)["name"] = FieldName(descriptor);
-  (*variables)["index"] = StrCat(descriptor->index());
-  (*variables)["number"] = StrCat(descriptor->number());
-  (*variables)["classname"] = ClassName(FieldScope(descriptor), false);
-  (*variables)["declared_type"] = DeclaredTypeMethodName(descriptor->type());
-  bool split = ShouldSplit(descriptor, options);
-  (*variables)["field"] = FieldMemberName(descriptor, split);
-
-  (*variables)["tag_size"] = StrCat(
-      WireFormat::TagSize(descriptor->number(), descriptor->type()));
-  (*variables)["deprecated_attr"] = DeprecatedAttribute(options, descriptor);
-
-  (*variables)["set_hasbit"] = "";
-  (*variables)["clear_hasbit"] = "";
-  (*variables)["maybe_prepare_split_message"] =
-      split ? "  PrepareSplitMessageForWrite();\n" : "";
-
-  AddAccessorAnnotations(descriptor, options, variables);
-
-  // These variables are placeholders to pick out the beginning and ends of
-  // identifiers for annotations (when doing so with existing variables would
-  // be ambiguous or impossible). They should never be set to anything but the
-  // empty string.
-  (*variables)["{"] = "";
-  (*variables)["}"] = "";
-}
-
-void FieldGenerator::SetHasBitIndex(int32_t has_bit_index) {
-  if (!HasHasbit(descriptor_)) {
-    GOOGLE_CHECK_EQ(has_bit_index, -1);
-    return;
-  }
-  variables_["set_hasbit"] = StrCat(
-      variables_["has_bits"], "[", has_bit_index / 32, "] |= 0x",
-      strings::Hex(1u << (has_bit_index % 32), strings::ZERO_PAD_8), "u;");
-  variables_["clear_hasbit"] = StrCat(
-      variables_["has_bits"], "[", has_bit_index / 32, "] &= ~0x",
-      strings::Hex(1u << (has_bit_index % 32), strings::ZERO_PAD_8), "u;");
-}
-
-void FieldGenerator::SetInlinedStringIndex(int32_t inlined_string_index) {
-  if (!IsStringInlined(descriptor_, options_)) {
-    GOOGLE_CHECK_EQ(inlined_string_index, -1);
-    return;
-  }
-  // The first bit is the tracking bit for on demand registering ArenaDtor.
-  GOOGLE_CHECK_GT(inlined_string_index, 0)
-      << "_inlined_string_donated_'s bit 0 is reserved for arena dtor tracking";
-  variables_["inlined_string_donated"] = StrCat(
-      "(", variables_["inlined_string_donated_array"], "[",
-      inlined_string_index / 32, "] & 0x",
-      strings::Hex(1u << (inlined_string_index % 32), strings::ZERO_PAD_8),
-      "u) != 0;");
-  variables_["donating_states_word"] =
-      StrCat(variables_["inlined_string_donated_array"], "[",
-                   inlined_string_index / 32, "]");
-  variables_["mask_for_undonate"] = StrCat(
-      "~0x", strings::Hex(1u << (inlined_string_index % 32), strings::ZERO_PAD_8),
-      "u");
-}
-
-void FieldGenerator::GenerateAggregateInitializer(io::Printer* printer) const {
-  Formatter format(printer, variables_);
-  if (ShouldSplit(descriptor_, options_)) {
-    format("decltype(Impl_::Split::$name$_){arena}");
-    return;
-  }
-  format("decltype($field$){arena}");
-}
-
-void FieldGenerator::GenerateConstexprAggregateInitializer(
-    io::Printer* printer) const {
-  Formatter format(printer, variables_);
-  format("/*decltype($field$)*/{}");
-}
-
-void FieldGenerator::GenerateCopyAggregateInitializer(
-    io::Printer* printer) const {
-  Formatter format(printer, variables_);
-  format("decltype($field$){from.$field$}");
-}
-
-void FieldGenerator::GenerateCopyConstructorCode(io::Printer* printer) const {
-  if (ShouldSplit(descriptor_, options_)) {
-    // There is no copy constructor for the `Split` struct, so we need to copy
-    // the value here.
-    Formatter format(printer, variables_);
-    format("$field$ = from.$field$;\n");
-  }
-}
-
-void SetCommonOneofFieldVariables(
-    const FieldDescriptor* descriptor,
-    std::map<std::string, std::string>* variables) {
-  const std::string prefix = descriptor->containing_oneof()->name() + "_.";
-  (*variables)["oneof_name"] = descriptor->containing_oneof()->name();
-}
-
-FieldGenerator::~FieldGenerator() {}
-
-FieldGeneratorMap::FieldGeneratorMap(const Descriptor* descriptor,
-                                     const Options& options,
-                                     MessageSCCAnalyzer* scc_analyzer)
-    : descriptor_(descriptor), field_generators_(descriptor->field_count()) {
-  // Construct all the FieldGenerators.
-  for (int i = 0; i < descriptor->field_count(); i++) {
-    field_generators_[i].reset(
-        MakeGenerator(descriptor->field(i), options, scc_analyzer));
-  }
-}
-
-FieldGenerator* FieldGeneratorMap::MakeGoogleInternalGenerator(
-    const FieldDescriptor* field, const Options& options,
-    MessageSCCAnalyzer* scc_analyzer) {
-
-  return nullptr;
-}
-
-FieldGenerator* FieldGeneratorMap::MakeGenerator(
-    const FieldDescriptor* field, const Options& options,
-    MessageSCCAnalyzer* scc_analyzer) {
-  FieldGenerator* generator =
-      MakeGoogleInternalGenerator(field, options, scc_analyzer);
-  if (generator) {
-    return generator;
-  }
-
-  if (field->is_repeated()) {
-    switch (field->cpp_type()) {
-      case FieldDescriptor::CPPTYPE_MESSAGE:
-        if (field->is_map()) {
-          return new MapFieldGenerator(field, options, scc_analyzer);
-        } else {
-          return new RepeatedMessageFieldGenerator(field, options,
-                                                   scc_analyzer);
-        }
-      case FieldDescriptor::CPPTYPE_STRING:
-        return new RepeatedStringFieldGenerator(field, options);
-      case FieldDescriptor::CPPTYPE_ENUM:
-        return new RepeatedEnumFieldGenerator(field, options);
-      default:
-        return new RepeatedPrimitiveFieldGenerator(field, options);
-    }
-  } else if (field->real_containing_oneof()) {
-    switch (field->cpp_type()) {
-      case FieldDescriptor::CPPTYPE_MESSAGE:
-        return new MessageOneofFieldGenerator(field, options, scc_analyzer);
-      case FieldDescriptor::CPPTYPE_STRING:
-        return new StringOneofFieldGenerator(field, options);
-      case FieldDescriptor::CPPTYPE_ENUM:
-        return new EnumOneofFieldGenerator(field, options);
-      default:
-        return new PrimitiveOneofFieldGenerator(field, options);
-    }
-  } else {
-    switch (field->cpp_type()) {
-      case FieldDescriptor::CPPTYPE_MESSAGE:
-        return new MessageFieldGenerator(field, options, scc_analyzer);
-      case FieldDescriptor::CPPTYPE_STRING:
-        return new StringFieldGenerator(field, options);
-      case FieldDescriptor::CPPTYPE_ENUM:
-        return new EnumFieldGenerator(field, options);
-      default:
-        return new PrimitiveFieldGenerator(field, options);
-    }
-  }
-}
-
-FieldGeneratorMap::~FieldGeneratorMap() {}
-
-const FieldGenerator& FieldGeneratorMap::get(
-    const FieldDescriptor* field) const {
-  GOOGLE_CHECK_EQ(field->containing_type(), descriptor_);
-  return *field_generators_[field->index()];
-}
-
-}  // namespace cpp
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/compiler/cpp/field.h b/libs/protobuf/src/google/protobuf/compiler/cpp/field.h
deleted file mode 100644
index dd2a51a..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/cpp/field.h
+++ /dev/null
@@ -1,270 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-
-#ifndef GOOGLE_PROTOBUF_COMPILER_CPP_FIELD_H__
-#define GOOGLE_PROTOBUF_COMPILER_CPP_FIELD_H__
-
-#include <cstdint>
-#include <map>
-#include <memory>
-#include <string>
-
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/compiler/cpp/helpers.h>
-#include <google/protobuf/compiler/cpp/options.h>
-
-namespace google {
-namespace protobuf {
-namespace io {
-class Printer;  // printer.h
-}
-}  // namespace protobuf
-}  // namespace google
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace cpp {
-
-// Helper function: set variables in the map that are the same for all
-// field code generators.
-// ['name', 'index', 'number', 'classname', 'declared_type', 'tag_size',
-// 'deprecation'].
-void SetCommonFieldVariables(const FieldDescriptor* descriptor,
-                             std::map<std::string, std::string>* variables,
-                             const Options& options);
-
-void SetCommonOneofFieldVariables(
-    const FieldDescriptor* descriptor,
-    std::map<std::string, std::string>* variables);
-
-class FieldGenerator {
- public:
-  explicit FieldGenerator(const FieldDescriptor* descriptor,
-                          const Options& options)
-      : descriptor_(descriptor), options_(options) {}
-  virtual ~FieldGenerator();
-  virtual void GenerateSerializeWithCachedSizes(
-      io::Printer* printer) const final{};
-  // Generate lines of code declaring members fields of the message class
-  // needed to represent this field.  These are placed inside the message
-  // class.
-  virtual void GeneratePrivateMembers(io::Printer* printer) const = 0;
-
-  // Generate static default variable for this field. These are placed inside
-  // the message class. Most field types don't need this, so the default
-  // implementation is empty.
-  virtual void GenerateStaticMembers(io::Printer* /*printer*/) const {}
-
-  // Generate prototypes for all of the accessor functions related to this
-  // field.  These are placed inside the class definition.
-  virtual void GenerateAccessorDeclarations(io::Printer* printer) const = 0;
-
-  // Generate inline definitions of accessor functions for this field.
-  // These are placed inside the header after all class definitions.
-  virtual void GenerateInlineAccessorDefinitions(
-      io::Printer* printer) const = 0;
-
-  // Generate definitions of accessors that aren't inlined.  These are
-  // placed somewhere in the .cc file.
-  // Most field types don't need this, so the default implementation is empty.
-  virtual void GenerateNonInlineAccessorDefinitions(
-      io::Printer* /*printer*/) const {}
-
-  // Generate declarations of accessors that are for internal purposes only.
-  // Most field types don't need this, so the default implementation is empty.
-  virtual void GenerateInternalAccessorDefinitions(
-      io::Printer* /*printer*/) const {}
-
-  // Generate definitions of accessors that are for internal purposes only.
-  // Most field types don't need this, so the default implementation is empty.
-  virtual void GenerateInternalAccessorDeclarations(
-      io::Printer* /*printer*/) const {}
-
-  // Generate lines of code (statements, not declarations) which clear the
-  // field.  This is used to define the clear_$name$() method
-  virtual void GenerateClearingCode(io::Printer* printer) const = 0;
-
-  // Generate lines of code (statements, not declarations) which clear the
-  // field as part of the Clear() method for the whole message.  For message
-  // types which have field presence bits, MessageGenerator::GenerateClear
-  // will have already checked the presence bits.
-  //
-  // Since most field types can re-use GenerateClearingCode, this method is
-  // not pure virtual.
-  virtual void GenerateMessageClearingCode(io::Printer* printer) const {
-    GenerateClearingCode(printer);
-  }
-
-  // Generate lines of code (statements, not declarations) which merges the
-  // contents of the field from the current message to the target message,
-  // which is stored in the generated code variable "from".
-  // This is used to fill in the MergeFrom method for the whole message.
-  // Details of this usage can be found in message.cc under the
-  // GenerateMergeFrom method.
-  virtual void GenerateMergingCode(io::Printer* printer) const = 0;
-
-  // Generates a copy constructor
-  virtual void GenerateCopyConstructorCode(io::Printer* printer) const;
-
-  // Generate lines of code (statements, not declarations) which swaps
-  // this field and the corresponding field of another message, which
-  // is stored in the generated code variable "other". This is used to
-  // define the Swap method. Details of usage can be found in
-  // message.cc under the GenerateSwap method.
-  virtual void GenerateSwappingCode(io::Printer* printer) const = 0;
-
-  // Generate initialization code for private members declared by
-  // GeneratePrivateMembers(). These go into the message class's SharedCtor()
-  // method, invoked by each of the generated constructors.
-  virtual void GenerateConstructorCode(io::Printer* printer) const = 0;
-
-  // Generate initialization code for private members in the cold struct.
-  virtual void GenerateCreateSplitMessageCode(io::Printer* printer) const {}
-
-  // Generate any code that needs to go in the class's SharedDtor() method,
-  // invoked by the destructor.
-  // Most field types don't need this, so the default implementation is empty.
-  virtual void GenerateDestructorCode(io::Printer* /*printer*/) const {}
-
-  // Generate a manual destructor invocation for use when the message is on an
-  // arena. The code that this method generates will be executed inside a
-  // shared-for-the-whole-message-class method registered with
-  // OwnDestructor().
-  virtual void GenerateArenaDestructorCode(io::Printer* printer) const {
-    GOOGLE_CHECK(NeedsArenaDestructor() == ArenaDtorNeeds::kNone)
-        << descriptor_->cpp_type_name();
-  }
-
-  // Generate initialization code for private members declared by
-  // GeneratePrivateMembers(). These go into the SharedCtor's
-  // aggregate initialization of the _impl_ struct and must follow the syntax
-  // (e.g. `decltype($field$){$default$}`). Does not include `:` or `,`
-  // separators.  Default values should be specified here when possible.
-  //
-  // Note: We use `decltype($field$)` for both explicit construction and the
-  // fact that it's self-documenting.  Pre-C++17, copy elision isn't guaranteed
-  // in aggregate initialization so a valid copy/move constructor must exist
-  // (even though it's not used).  Because of this, we need to comment out the
-  // decltype and fallback to implicit construction.
-  virtual void GenerateAggregateInitializer(io::Printer* printer) const;
-
-  // Generate constinit initialization code for private members declared by
-  // GeneratePrivateMembers(). These go into the constexpr constructor's
-  // aggregate initialization of the _impl_ struct and must follow the syntax
-  // (e.g. `/*decltype($field$)*/{}`, see above). Does not
-  // include `:` or `,` separators.
-  virtual void GenerateConstexprAggregateInitializer(
-      io::Printer* printer) const;
-
-  // Generate copy initialization code for private members declared by
-  // GeneratePrivateMembers(). These go into the copy constructor's
-  // aggregate initialization of the _impl_ struct and must follow the syntax
-  // (e.g. `decltype($field$){from.$field$}`, see above). Does not
-  // include `:` or `,` separators.
-  virtual void GenerateCopyAggregateInitializer(io::Printer* printer) const;
-
-  // Generate lines to serialize this field directly to the array "target",
-  // which are placed within the message's SerializeWithCachedSizesToArray()
-  // method. This must also advance "target" past the written bytes.
-  virtual void GenerateSerializeWithCachedSizesToArray(
-      io::Printer* printer) const = 0;
-
-  // Generate lines to compute the serialized size of this field, which
-  // are placed in the message's ByteSize() method.
-  virtual void GenerateByteSize(io::Printer* printer) const = 0;
-
-  // Generates lines to call IsInitialized() for eligible message fields. Non
-  // message fields won't need to override this function.
-  virtual void GenerateIsInitialized(io::Printer* printer) const {}
-
-  virtual bool IsInlined() const { return false; }
-
-  virtual ArenaDtorNeeds NeedsArenaDestructor() const {
-    return ArenaDtorNeeds::kNone;
-  }
-
-  void SetHasBitIndex(int32_t has_bit_index);
-  void SetInlinedStringIndex(int32_t inlined_string_index);
-
- protected:
-  const FieldDescriptor* descriptor_;
-  const Options& options_;
-  std::map<std::string, std::string> variables_;
-
- private:
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(FieldGenerator);
-};
-
-// Convenience class which constructs FieldGenerators for a Descriptor.
-class FieldGeneratorMap {
- public:
-  FieldGeneratorMap(const Descriptor* descriptor, const Options& options,
-                    MessageSCCAnalyzer* scc_analyzer);
-  ~FieldGeneratorMap();
-
-  const FieldGenerator& get(const FieldDescriptor* field) const;
-
-  void SetHasBitIndices(const std::vector<int>& has_bit_indices_) {
-    for (int i = 0; i < descriptor_->field_count(); ++i) {
-      field_generators_[i]->SetHasBitIndex(has_bit_indices_[i]);
-    }
-  }
-
-  void SetInlinedStringIndices(const std::vector<int>& inlined_string_indices) {
-    for (int i = 0; i < descriptor_->field_count(); ++i) {
-      field_generators_[i]->SetInlinedStringIndex(inlined_string_indices[i]);
-    }
-  }
-
- private:
-  const Descriptor* descriptor_;
-  std::vector<std::unique_ptr<FieldGenerator>> field_generators_;
-
-  static FieldGenerator* MakeGoogleInternalGenerator(
-      const FieldDescriptor* field, const Options& options,
-      MessageSCCAnalyzer* scc_analyzer);
-  static FieldGenerator* MakeGenerator(const FieldDescriptor* field,
-                                       const Options& options,
-                                       MessageSCCAnalyzer* scc_analyzer);
-
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(FieldGeneratorMap);
-};
-
-}  // namespace cpp
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // GOOGLE_PROTOBUF_COMPILER_CPP_FIELD_H__
diff --git a/libs/protobuf/src/google/protobuf/compiler/cpp/file.cc b/libs/protobuf/src/google/protobuf/compiler/cpp/file.cc
deleted file mode 100644
index 838e0ab..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/cpp/file.cc
+++ /dev/null
@@ -1,1382 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-
-#include <google/protobuf/compiler/cpp/file.h>
-
-#include <iostream>
-#include <map>
-#include <memory>
-#include <set>
-#include <unordered_map>
-#include <unordered_set>
-#include <vector>
-
-#include <google/protobuf/compiler/scc.h>
-#include <google/protobuf/io/printer.h>
-#include <google/protobuf/stubs/strutil.h>
-#include <google/protobuf/compiler/cpp/enum.h>
-#include <google/protobuf/compiler/cpp/extension.h>
-#include <google/protobuf/compiler/cpp/field.h>
-#include <google/protobuf/compiler/cpp/helpers.h>
-#include <google/protobuf/compiler/cpp/message.h>
-#include <google/protobuf/compiler/cpp/service.h>
-#include <google/protobuf/descriptor.pb.h>
-
-// Must be last.
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace cpp {
-
-namespace {
-
-// When we forward-declare things, we want to create a sorted order so our
-// output is deterministic and minimizes namespace changes.
-template <class T>
-std::string GetSortKey(const T& val) {
-  return val.full_name();
-}
-
-template <>
-std::string GetSortKey<FileDescriptor>(const FileDescriptor& val) {
-  return val.name();
-}
-
-template <class T>
-bool CompareSortKeys(const T* a, const T* b) {
-  return GetSortKey(*a) < GetSortKey(*b);
-}
-
-template <class T>
-std::vector<const T*> Sorted(const std::unordered_set<const T*>& vals) {
-  std::vector<const T*> sorted(vals.begin(), vals.end());
-  std::sort(sorted.begin(), sorted.end(), CompareSortKeys<T>);
-  return sorted;
-}
-
-// TODO(b/203101078): remove pragmas that suppresses uninitialized warnings when
-// clang bug is fixed.
-inline void MuteWuninitialized(Formatter& format) {
-  format(
-      "#if defined(__llvm__)\n"
-      "  #pragma clang diagnostic push\n"
-      "  #pragma clang diagnostic ignored \"-Wuninitialized\"\n"
-      "#endif  // __llvm__\n");
-}
-
-inline void UnmuteWuninitialized(Formatter& format) {
-  format(
-      "#if defined(__llvm__)\n"
-      "  #pragma clang diagnostic pop\n"
-      "#endif  // __llvm__\n");
-}
-
-}  // namespace
-
-FileGenerator::FileGenerator(const FileDescriptor* file, const Options& options)
-    : file_(file), options_(options), scc_analyzer_(options) {
-  // These variables are the same on a file level
-  SetCommonVars(options, &variables_);
-  variables_["dllexport_decl"] = options.dllexport_decl;
-  variables_["tablename"] = UniqueName("TableStruct", file_, options_);
-  variables_["file_level_metadata"] =
-      UniqueName("file_level_metadata", file_, options_);
-  variables_["desc_table"] = DescriptorTableName(file_, options_);
-  variables_["file_level_enum_descriptors"] =
-      UniqueName("file_level_enum_descriptors", file_, options_);
-  variables_["file_level_service_descriptors"] =
-      UniqueName("file_level_service_descriptors", file_, options_);
-  variables_["filename"] = file_->name();
-  variables_["package_ns"] = Namespace(file_, options);
-
-  std::vector<const Descriptor*> msgs = FlattenMessagesInFile(file);
-  for (int i = 0; i < msgs.size(); i++) {
-    // Deleted in destructor
-    MessageGenerator* msg_gen =
-        new MessageGenerator(msgs[i], variables_, i, options, &scc_analyzer_);
-    message_generators_.emplace_back(msg_gen);
-    msg_gen->AddGenerators(&enum_generators_, &extension_generators_);
-  }
-
-  for (int i = 0; i < file->enum_type_count(); i++) {
-    enum_generators_.emplace_back(
-        new EnumGenerator(file->enum_type(i), variables_, options));
-  }
-
-  for (int i = 0; i < file->service_count(); i++) {
-    service_generators_.emplace_back(
-        new ServiceGenerator(file->service(i), variables_, options));
-  }
-  if (HasGenericServices(file_, options_)) {
-    for (int i = 0; i < service_generators_.size(); i++) {
-      service_generators_[i]->index_in_metadata_ = i;
-    }
-  }
-  for (int i = 0; i < file->extension_count(); i++) {
-    extension_generators_.emplace_back(
-        new ExtensionGenerator(file->extension(i), options, &scc_analyzer_));
-  }
-  for (int i = 0; i < file->weak_dependency_count(); ++i) {
-    weak_deps_.insert(file->weak_dependency(i));
-  }
-}
-
-FileGenerator::~FileGenerator() = default;
-
-void FileGenerator::GenerateMacroUndefs(io::Printer* printer) {
-  Formatter format(printer, variables_);
-  // Only do this for protobuf's own types. There are some google3 protos using
-  // macros as field names and the generated code compiles after the macro
-  // expansion. Undefing these macros actually breaks such code.
-  if (file_->name() != "net/proto2/compiler/proto/plugin.proto" &&
-      file_->name() != "google/protobuf/compiler/plugin.proto") {
-    return;
-  }
-  std::vector<std::string> names_to_undef;
-  std::vector<const FieldDescriptor*> fields;
-  ListAllFields(file_, &fields);
-  for (int i = 0; i < fields.size(); i++) {
-    const std::string& name = fields[i]->name();
-    static const char* kMacroNames[] = {"major", "minor"};
-    for (int j = 0; j < GOOGLE_ARRAYSIZE(kMacroNames); ++j) {
-      if (name == kMacroNames[j]) {
-        names_to_undef.push_back(name);
-        break;
-      }
-    }
-  }
-  for (int i = 0; i < names_to_undef.size(); ++i) {
-    format(
-        "#ifdef $1$\n"
-        "#undef $1$\n"
-        "#endif\n",
-        names_to_undef[i]);
-  }
-}
-
-void FileGenerator::GenerateHeader(io::Printer* printer) {
-  Formatter format(printer, variables_);
-
-  // port_def.inc must be included after all other includes.
-  IncludeFile("net/proto2/public/port_def.inc", printer);
-  format("#define $1$$ dllexport_decl$\n", FileDllExport(file_, options_));
-  GenerateMacroUndefs(printer);
-
-  // For Any support with lite protos, we need to friend AnyMetadata, so we
-  // forward-declare it here.
-  format(
-      "PROTOBUF_NAMESPACE_OPEN\n"
-      "namespace internal {\n"
-      "class AnyMetadata;\n"
-      "}  // namespace internal\n"
-      "PROTOBUF_NAMESPACE_CLOSE\n");
-
-  GenerateGlobalStateFunctionDeclarations(printer);
-
-  GenerateForwardDeclarations(printer);
-
-  {
-    NamespaceOpener ns(Namespace(file_, options_), format);
-
-    format("\n");
-
-    GenerateEnumDefinitions(printer);
-
-    format(kThickSeparator);
-    format("\n");
-
-    GenerateMessageDefinitions(printer);
-
-    format("\n");
-    format(kThickSeparator);
-    format("\n");
-
-    GenerateServiceDefinitions(printer);
-
-    GenerateExtensionIdentifiers(printer);
-
-    format("\n");
-    format(kThickSeparator);
-    format("\n");
-
-    GenerateInlineFunctionDefinitions(printer);
-
-    format(
-        "\n"
-        "// @@protoc_insertion_point(namespace_scope)\n"
-        "\n");
-  }
-
-  // We need to specialize some templates in the ::google::protobuf namespace:
-  GenerateProto2NamespaceEnumSpecializations(printer);
-
-  format(
-      "\n"
-      "// @@protoc_insertion_point(global_scope)\n"
-      "\n");
-  IncludeFile("net/proto2/public/port_undef.inc", printer);
-}
-
-void FileGenerator::GenerateProtoHeader(io::Printer* printer,
-                                        const std::string& info_path) {
-  Formatter format(printer, variables_);
-  if (!options_.proto_h) {
-    return;
-  }
-
-  GenerateTopHeaderGuard(printer, false);
-
-  if (!options_.opensource_runtime) {
-    format(
-        "#ifdef SWIG\n"
-        "#error \"Do not SWIG-wrap protobufs.\"\n"
-        "#endif  // SWIG\n"
-        "\n");
-  }
-
-  if (IsBootstrapProto(options_, file_)) {
-    format("// IWYU pragma: private, include \"$1$.proto.h\"\n\n",
-           StripProto(file_->name()));
-  }
-
-  GenerateLibraryIncludes(printer);
-
-  for (int i = 0; i < file_->public_dependency_count(); i++) {
-    const FileDescriptor* dep = file_->public_dependency(i);
-    format("#include \"$1$.proto.h\"\n", StripProto(dep->name()));
-  }
-
-  format("// @@protoc_insertion_point(includes)\n");
-
-  GenerateMetadataPragma(printer, info_path);
-
-  GenerateHeader(printer);
-
-  GenerateBottomHeaderGuard(printer, false);
-}
-
-void FileGenerator::GeneratePBHeader(io::Printer* printer,
-                                     const std::string& info_path) {
-  Formatter format(printer, variables_);
-  GenerateTopHeaderGuard(printer, true);
-
-  if (options_.proto_h) {
-    std::string target_basename = StripProto(file_->name());
-    if (!options_.opensource_runtime) {
-      GetBootstrapBasename(options_, target_basename, &target_basename);
-    }
-    format("#include \"$1$.proto.h\"  // IWYU pragma: export\n",
-           target_basename);
-  } else {
-    GenerateLibraryIncludes(printer);
-  }
-
-  if (options_.transitive_pb_h) {
-    GenerateDependencyIncludes(printer);
-  }
-
-  // This is unfortunately necessary for some plugins. I don't see why we
-  // need two of the same insertion points.
-  // TODO(gerbens) remove this.
-  format("// @@protoc_insertion_point(includes)\n");
-
-  GenerateMetadataPragma(printer, info_path);
-
-  if (!options_.proto_h) {
-    GenerateHeader(printer);
-  } else {
-    {
-      NamespaceOpener ns(Namespace(file_, options_), format);
-      format(
-          "\n"
-          "// @@protoc_insertion_point(namespace_scope)\n");
-    }
-    format(
-        "\n"
-        "// @@protoc_insertion_point(global_scope)\n"
-        "\n");
-  }
-
-  GenerateBottomHeaderGuard(printer, true);
-}
-
-void FileGenerator::DoIncludeFile(const std::string& google3_name,
-                                  bool do_export, io::Printer* printer) {
-  Formatter format(printer, variables_);
-  const std::string prefix = "net/proto2/";
-  GOOGLE_CHECK(google3_name.find(prefix) == 0) << google3_name;
-
-  if (options_.opensource_runtime) {
-    std::string path = google3_name.substr(prefix.size());
-
-    path = StringReplace(path, "internal/", "", false);
-    path = StringReplace(path, "proto/", "", false);
-    path = StringReplace(path, "public/", "", false);
-    if (options_.runtime_include_base.empty()) {
-      format("#include <google/protobuf/$1$>", path);
-    } else {
-      format("#include \"$1$google/protobuf/$2$\"",
-             options_.runtime_include_base, path);
-    }
-  } else {
-    std::string path = google3_name;
-    // The bootstrapped proto generated code needs to use the
-    // third_party/protobuf header paths to avoid circular dependencies.
-    if (options_.bootstrap) {
-      path = StringReplace(google3_name, "net/proto2/public",
-                           "third_party/protobuf", false);
-    }
-    format("#include \"$1$\"", path);
-  }
-
-  if (do_export) {
-    format("  // IWYU pragma: export");
-  }
-
-  format("\n");
-}
-
-std::string FileGenerator::CreateHeaderInclude(const std::string& basename,
-                                               const FileDescriptor* file) {
-  bool use_system_include = false;
-  std::string name = basename;
-
-  if (options_.opensource_runtime) {
-    if (IsWellKnownMessage(file)) {
-      if (options_.runtime_include_base.empty()) {
-        use_system_include = true;
-      } else {
-        name = options_.runtime_include_base + basename;
-      }
-    }
-  }
-
-  std::string left = "\"";
-  std::string right = "\"";
-  if (use_system_include) {
-    left = "<";
-    right = ">";
-  }
-  return left + name + right;
-}
-
-void FileGenerator::GenerateSourceIncludes(io::Printer* printer) {
-  Formatter format(printer, variables_);
-  std::string target_basename = StripProto(file_->name());
-  if (!options_.opensource_runtime) {
-    GetBootstrapBasename(options_, target_basename, &target_basename);
-  }
-  target_basename += options_.proto_h ? ".proto.h" : ".pb.h";
-  format(
-      "// Generated by the protocol buffer compiler.  DO NOT EDIT!\n"
-      "// source: $filename$\n"
-      "\n"
-      "#include $1$\n"
-      "\n"
-      "#include <algorithm>\n"  // for swap()
-      "\n",
-      CreateHeaderInclude(target_basename, file_));
-
-  IncludeFile("net/proto2/io/public/coded_stream.h", printer);
-  // TODO(gerbens) This is to include parse_context.h, we need a better way
-  IncludeFile("net/proto2/public/extension_set.h", printer);
-  IncludeFile("net/proto2/public/wire_format_lite.h", printer);
-
-  // Unknown fields implementation in lite mode uses StringOutputStream
-  if (!UseUnknownFieldSet(file_, options_) && !message_generators_.empty()) {
-    IncludeFile("net/proto2/io/public/zero_copy_stream_impl_lite.h", printer);
-  }
-
-  if (HasDescriptorMethods(file_, options_)) {
-    IncludeFile("net/proto2/public/descriptor.h", printer);
-    IncludeFile("net/proto2/public/generated_message_reflection.h", printer);
-    IncludeFile("net/proto2/public/reflection_ops.h", printer);
-    IncludeFile("net/proto2/public/wire_format.h", printer);
-  }
-
-  if (HasGeneratedMethods(file_, options_) &&
-      options_.tctable_mode != Options::kTCTableNever) {
-    IncludeFile("net/proto2/public/generated_message_tctable_impl.h", printer);
-  }
-
-  if (options_.proto_h) {
-    // Use the smaller .proto.h files.
-    for (int i = 0; i < file_->dependency_count(); i++) {
-      const FileDescriptor* dep = file_->dependency(i);
-      // Do not import weak deps.
-      if (!options_.opensource_runtime && IsDepWeak(dep)) continue;
-      std::string basename = StripProto(dep->name());
-      if (IsBootstrapProto(options_, file_)) {
-        GetBootstrapBasename(options_, basename, &basename);
-      }
-      format("#include \"$1$.proto.h\"\n", basename);
-    }
-  }
-  if (HasCordFields(file_, options_)) {
-    format(
-        "#include \"third_party/absl/strings/internal/string_constant.h\"\n");
-  }
-
-  format("// @@protoc_insertion_point(includes)\n");
-  IncludeFile("net/proto2/public/port_def.inc", printer);
-}
-
-void FileGenerator::GenerateSourcePrelude(io::Printer* printer) {
-  Formatter format(printer, variables_);
-
-  // For MSVC builds, we use #pragma init_seg to move the initialization of our
-  // libraries to happen before the user code.
-  // This worksaround the fact that MSVC does not do constant initializers when
-  // required by the standard.
-  format("\nPROTOBUF_PRAGMA_INIT_SEG\n");
-
-  // Generate convenience aliases.
-  format(
-      "\n"
-      "namespace _pb = ::$1$;\n"
-      "namespace _pbi = _pb::internal;\n",
-      ProtobufNamespace(options_));
-  if (HasGeneratedMethods(file_, options_) &&
-      options_.tctable_mode != Options::kTCTableNever) {
-    format("namespace _fl = _pbi::field_layout;\n");
-  }
-  format("\n");
-}
-
-void FileGenerator::GenerateSourceDefaultInstance(int idx,
-                                                  io::Printer* printer) {
-  Formatter format(printer, variables_);
-  MessageGenerator* generator = message_generators_[idx].get();
-  // Generate the split instance first because it's needed in the constexpr
-  // constructor.
-  if (ShouldSplit(generator->descriptor_, options_)) {
-    // Use a union to disable the destructor of the _instance member.
-    // We can constant initialize, but the object will still have a non-trivial
-    // destructor that we need to elide.
-    format(
-        "struct $1$ {\n"
-        "  PROTOBUF_CONSTEXPR $1$()\n"
-        "      : _instance{",
-        DefaultInstanceType(generator->descriptor_, options_,
-                            /*split=*/true));
-    generator->GenerateInitDefaultSplitInstance(printer);
-    format(
-        "} {}\n"
-        "  ~$1$() {}\n"
-        "  union {\n"
-        "    $2$ _instance;\n"
-        "  };\n"
-        "};\n",
-        DefaultInstanceType(generator->descriptor_, options_, /*split=*/true),
-        StrCat(generator->classname_, "::Impl_::Split"));
-    // NO_DESTROY is not necessary for correctness. The empty destructor is
-    // enough. However, the empty destructor fails to be elided in some
-    // configurations (like non-opt or with certain sanitizers). NO_DESTROY is
-    // there just to improve performance and binary size in these builds.
-    format(
-        "PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT "
-        "PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 $1$ $2$;\n",
-        DefaultInstanceType(generator->descriptor_, options_, /*split=*/true),
-        DefaultInstanceName(generator->descriptor_, options_, /*split=*/true));
-  }
-
-  generator->GenerateConstexprConstructor(printer);
-  format(
-      "struct $1$ {\n"
-      "  PROTOBUF_CONSTEXPR $1$()\n"
-      "      : _instance(::_pbi::ConstantInitialized{}) {}\n"
-      "  ~$1$() {}\n"
-      "  union {\n"
-      "    $2$ _instance;\n"
-      "  };\n"
-      "};\n",
-      DefaultInstanceType(generator->descriptor_, options_),
-      generator->classname_);
-  format(
-      "PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT "
-      "PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 $1$ $2$;\n",
-      DefaultInstanceType(generator->descriptor_, options_),
-      DefaultInstanceName(generator->descriptor_, options_));
-
-  for (int i = 0; i < generator->descriptor_->field_count(); i++) {
-    const FieldDescriptor* field = generator->descriptor_->field(i);
-    if (IsStringInlined(field, options_)) {
-      // Force the initialization of the inlined string in the default instance.
-      format(
-          "PROTOBUF_ATTRIBUTE_INIT_PRIORITY2 std::true_type "
-          "$1$::Impl_::_init_inline_$2$_ = "
-          "($3$._instance.$4$.Init(), std::true_type{});\n",
-          ClassName(generator->descriptor_), FieldName(field),
-          DefaultInstanceName(generator->descriptor_, options_),
-          FieldMemberName(field, ShouldSplit(field, options_)));
-    }
-  }
-
-  if (options_.lite_implicit_weak_fields) {
-    format(
-        "PROTOBUF_CONSTINIT const void* $1$ =\n"
-        "    &$2$;\n",
-        DefaultInstancePtr(generator->descriptor_, options_),
-        DefaultInstanceName(generator->descriptor_, options_));
-  }
-}
-
-// A list of things defined in one .pb.cc file that we need to reference from
-// another .pb.cc file.
-struct FileGenerator::CrossFileReferences {
-  // Populated if we are referencing from messages or files.
-  std::unordered_set<const Descriptor*> weak_default_instances;
-
-  // Only if we are referencing from files.
-  std::unordered_set<const FileDescriptor*> strong_reflection_files;
-  std::unordered_set<const FileDescriptor*> weak_reflection_files;
-};
-
-void FileGenerator::GetCrossFileReferencesForField(const FieldDescriptor* field,
-                                                   CrossFileReferences* refs) {
-  const Descriptor* msg = field->message_type();
-  if (msg == nullptr) return;
-
-  if (IsImplicitWeakField(field, options_, &scc_analyzer_) ||
-      IsWeak(field, options_)) {
-    refs->weak_default_instances.insert(msg);
-  }
-}
-
-void FileGenerator::GetCrossFileReferencesForFile(const FileDescriptor* file,
-                                                  CrossFileReferences* refs) {
-  ForEachField(file, [this, refs](const FieldDescriptor* field) {
-    GetCrossFileReferencesForField(field, refs);
-  });
-
-  if (!HasDescriptorMethods(file, options_)) return;
-
-  for (int i = 0; i < file->dependency_count(); i++) {
-    const FileDescriptor* dep = file->dependency(i);
-    if (IsDepWeak(dep)) {
-      refs->weak_reflection_files.insert(dep);
-    } else {
-      refs->strong_reflection_files.insert(dep);
-    }
-  }
-}
-
-// Generates references to variables defined in other files.
-void FileGenerator::GenerateInternalForwardDeclarations(
-    const CrossFileReferences& refs, io::Printer* printer) {
-  Formatter format(printer, variables_);
-
-  {
-    NamespaceOpener ns(format);
-    for (auto instance : Sorted(refs.weak_default_instances)) {
-      ns.ChangeTo(Namespace(instance, options_));
-      if (options_.lite_implicit_weak_fields) {
-        format(
-            "PROTOBUF_CONSTINIT __attribute__((weak)) const void* $1$ =\n"
-            "    &::_pbi::implicit_weak_message_default_instance;\n",
-            DefaultInstancePtr(instance, options_));
-      } else {
-        format("extern __attribute__((weak)) $1$ $2$;\n",
-               DefaultInstanceType(instance, options_),
-               DefaultInstanceName(instance, options_));
-      }
-    }
-  }
-
-  for (auto file : Sorted(refs.weak_reflection_files)) {
-    format(
-        "extern __attribute__((weak)) const ::_pbi::DescriptorTable $1$;\n",
-        DescriptorTableName(file, options_));
-  }
-}
-
-void FileGenerator::GenerateSourceForMessage(int idx, io::Printer* printer) {
-  Formatter format(printer, variables_);
-  GenerateSourceIncludes(printer);
-  GenerateSourcePrelude(printer);
-
-  if (IsAnyMessage(file_, options_)) MuteWuninitialized(format);
-
-  CrossFileReferences refs;
-  ForEachField(message_generators_[idx]->descriptor_,
-               [this, &refs](const FieldDescriptor* field) {
-                 GetCrossFileReferencesForField(field, &refs);
-               });
-  GenerateInternalForwardDeclarations(refs, printer);
-
-  {  // package namespace
-    NamespaceOpener ns(Namespace(file_, options_), format);
-
-    // Define default instances
-    GenerateSourceDefaultInstance(idx, printer);
-
-    // Generate classes.
-    format("\n");
-    message_generators_[idx]->GenerateClassMethods(printer);
-
-    format(
-        "\n"
-        "// @@protoc_insertion_point(namespace_scope)\n");
-  }  // end package namespace
-
-  {
-    NamespaceOpener proto_ns(ProtobufNamespace(options_), format);
-    message_generators_[idx]->GenerateSourceInProto2Namespace(printer);
-  }
-
-  if (IsAnyMessage(file_, options_)) UnmuteWuninitialized(format);
-
-  format(
-      "\n"
-      "// @@protoc_insertion_point(global_scope)\n");
-}
-
-void FileGenerator::GenerateSourceForExtension(int idx, io::Printer* printer) {
-  Formatter format(printer, variables_);
-  GenerateSourceIncludes(printer);
-  GenerateSourcePrelude(printer);
-  NamespaceOpener ns(Namespace(file_, options_), format);
-  extension_generators_[idx]->GenerateDefinition(printer);
-}
-
-void FileGenerator::GenerateGlobalSource(io::Printer* printer) {
-  Formatter format(printer, variables_);
-  GenerateSourceIncludes(printer);
-  GenerateSourcePrelude(printer);
-
-  {
-    // Define the code to initialize reflection. This code uses a global
-    // constructor to register reflection data with the runtime pre-main.
-    if (HasDescriptorMethods(file_, options_)) {
-      GenerateReflectionInitializationCode(printer);
-    }
-  }
-
-  NamespaceOpener ns(Namespace(file_, options_), format);
-
-  // Generate enums.
-  for (int i = 0; i < enum_generators_.size(); i++) {
-    enum_generators_[i]->GenerateMethods(i, printer);
-  }
-}
-
-void FileGenerator::GenerateSource(io::Printer* printer) {
-  Formatter format(printer, variables_);
-  GenerateSourceIncludes(printer);
-  GenerateSourcePrelude(printer);
-  CrossFileReferences refs;
-  GetCrossFileReferencesForFile(file_, &refs);
-  GenerateInternalForwardDeclarations(refs, printer);
-
-  if (IsAnyMessage(file_, options_)) MuteWuninitialized(format);
-
-  {
-    NamespaceOpener ns(Namespace(file_, options_), format);
-
-    // Define default instances
-    for (int i = 0; i < message_generators_.size(); i++) {
-      GenerateSourceDefaultInstance(i, printer);
-    }
-  }
-
-  {
-    if (HasDescriptorMethods(file_, options_)) {
-      // Define the code to initialize reflection. This code uses a global
-      // constructor to register reflection data with the runtime pre-main.
-      GenerateReflectionInitializationCode(printer);
-    }
-  }
-
-  {
-    NamespaceOpener ns(Namespace(file_, options_), format);
-
-    // Actually implement the protos
-
-    // Generate enums.
-    for (int i = 0; i < enum_generators_.size(); i++) {
-      enum_generators_[i]->GenerateMethods(i, printer);
-    }
-
-    // Generate classes.
-    for (int i = 0; i < message_generators_.size(); i++) {
-      format("\n");
-      format(kThickSeparator);
-      format("\n");
-      message_generators_[i]->GenerateClassMethods(printer);
-    }
-
-    if (HasGenericServices(file_, options_)) {
-      // Generate services.
-      for (int i = 0; i < service_generators_.size(); i++) {
-        if (i == 0) format("\n");
-        format(kThickSeparator);
-        format("\n");
-        service_generators_[i]->GenerateImplementation(printer);
-      }
-    }
-
-    // Define extensions.
-    for (int i = 0; i < extension_generators_.size(); i++) {
-      extension_generators_[i]->GenerateDefinition(printer);
-    }
-
-    format(
-        "\n"
-        "// @@protoc_insertion_point(namespace_scope)\n");
-  }
-
-  {
-    NamespaceOpener proto_ns(ProtobufNamespace(options_), format);
-    for (int i = 0; i < message_generators_.size(); i++) {
-      message_generators_[i]->GenerateSourceInProto2Namespace(printer);
-    }
-  }
-
-  format(
-      "\n"
-      "// @@protoc_insertion_point(global_scope)\n");
-
-  if (IsAnyMessage(file_, options_)) UnmuteWuninitialized(format);
-
-  IncludeFile("net/proto2/public/port_undef.inc", printer);
-}
-
-void FileGenerator::GenerateReflectionInitializationCode(io::Printer* printer) {
-  Formatter format(printer, variables_);
-
-  if (!message_generators_.empty()) {
-    format("static ::_pb::Metadata $file_level_metadata$[$1$];\n",
-           message_generators_.size());
-  }
-  if (!enum_generators_.empty()) {
-    format(
-        "static const ::_pb::EnumDescriptor* "
-        "$file_level_enum_descriptors$[$1$];\n",
-        enum_generators_.size());
-  } else {
-    format(
-        "static "
-        "constexpr ::_pb::EnumDescriptor const** "
-        "$file_level_enum_descriptors$ = nullptr;\n");
-  }
-  if (HasGenericServices(file_, options_) && file_->service_count() > 0) {
-    format(
-        "static "
-        "const ::_pb::ServiceDescriptor* "
-        "$file_level_service_descriptors$[$1$];\n",
-        file_->service_count());
-  } else {
-    format(
-        "static "
-        "constexpr ::_pb::ServiceDescriptor const** "
-        "$file_level_service_descriptors$ = nullptr;\n");
-  }
-
-  if (!message_generators_.empty()) {
-    format(
-        "\n"
-        "const $uint32$ $tablename$::offsets[] "
-        "PROTOBUF_SECTION_VARIABLE(protodesc_cold) = {\n");
-    format.Indent();
-    std::vector<std::pair<size_t, size_t> > pairs;
-    pairs.reserve(message_generators_.size());
-    for (int i = 0; i < message_generators_.size(); i++) {
-      pairs.push_back(message_generators_[i]->GenerateOffsets(printer));
-    }
-    format.Outdent();
-    format(
-        "};\n"
-        "static const ::_pbi::MigrationSchema schemas[] "
-        "PROTOBUF_SECTION_VARIABLE(protodesc_cold) = {\n");
-    format.Indent();
-    {
-      int offset = 0;
-      for (int i = 0; i < message_generators_.size(); i++) {
-        message_generators_[i]->GenerateSchema(printer, offset,
-                                               pairs[i].second);
-        offset += pairs[i].first;
-      }
-    }
-    format.Outdent();
-    format(
-        "};\n"
-        "\nstatic const ::_pb::Message* const file_default_instances[] = {\n");
-    format.Indent();
-    for (int i = 0; i < message_generators_.size(); i++) {
-      const Descriptor* descriptor = message_generators_[i]->descriptor_;
-      format("&$1$::_$2$_default_instance_._instance,\n",
-             Namespace(descriptor, options_),  // 1
-             ClassName(descriptor));           // 2
-    }
-    format.Outdent();
-    format(
-        "};\n"
-        "\n");
-  } else {
-    // we still need these symbols to exist
-    format(
-        // MSVC doesn't like empty arrays, so we add a dummy.
-        "const $uint32$ $tablename$::offsets[1] = {};\n"
-        "static constexpr ::_pbi::MigrationSchema* schemas = nullptr;\n"
-        "static constexpr ::_pb::Message* const* "
-        "file_default_instances = nullptr;\n"
-        "\n");
-  }
-
-  // ---------------------------------------------------------------
-
-  // Embed the descriptor.  We simply serialize the entire
-  // FileDescriptorProto/ and embed it as a string literal, which is parsed and
-  // built into real descriptors at initialization time.
-  const std::string protodef_name =
-      UniqueName("descriptor_table_protodef", file_, options_);
-  format("const char $1$[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) =\n",
-         protodef_name);
-  format.Indent();
-  FileDescriptorProto file_proto;
-  file_->CopyTo(&file_proto);
-  std::string file_data;
-  file_proto.SerializeToString(&file_data);
-
-  {
-    if (file_data.size() > 65535) {
-      // Workaround for MSVC: "Error C1091: compiler limit: string exceeds
-      // 65535 bytes in length". Declare a static array of chars rather than
-      // use a string literal. Only write 25 bytes per line.
-      static const int kBytesPerLine = 25;
-      format("{ ");
-      for (int i = 0; i < file_data.size();) {
-        for (int j = 0; j < kBytesPerLine && i < file_data.size(); ++i, ++j) {
-          format("'$1$', ", CEscape(file_data.substr(i, 1)));
-        }
-        format("\n");
-      }
-      format("'\\0' }");  // null-terminate
-    } else {
-      // Only write 40 bytes per line.
-      static const int kBytesPerLine = 40;
-      for (int i = 0; i < file_data.size(); i += kBytesPerLine) {
-        format(
-            "\"$1$\"\n",
-            EscapeTrigraphs(CEscape(file_data.substr(i, kBytesPerLine))));
-      }
-    }
-    format(";\n");
-  }
-  format.Outdent();
-
-  CrossFileReferences refs;
-  GetCrossFileReferencesForFile(file_, &refs);
-  int num_deps =
-      refs.strong_reflection_files.size() + refs.weak_reflection_files.size();
-
-  // Build array of DescriptorTable deps.
-  if (num_deps > 0) {
-    format(
-        "static const ::_pbi::DescriptorTable* const "
-        "$desc_table$_deps[$1$] = {\n",
-        num_deps);
-
-    for (auto dep : Sorted(refs.strong_reflection_files)) {
-      format("  &::$1$,\n", DescriptorTableName(dep, options_));
-    }
-    for (auto dep : Sorted(refs.weak_reflection_files)) {
-      format("  &::$1$,\n", DescriptorTableName(dep, options_));
-    }
-
-    format("};\n");
-  }
-
-  // The DescriptorTable itself.
-  // Should be "bool eager = NeedsEagerDescriptorAssignment(file_, options_);"
-  // however this might cause a tsan failure in superroot b/148382879,
-  // so disable for now.
-  bool eager = false;
-  format(
-      "static ::_pbi::once_flag $desc_table$_once;\n"
-      "const ::_pbi::DescriptorTable $desc_table$ = {\n"
-      "    false, $1$, $2$, $3$,\n"
-      "    \"$filename$\",\n"
-      "    &$desc_table$_once, $4$, $5$, $6$,\n"
-      "    schemas, file_default_instances, $tablename$::offsets,\n"
-      "    $7$, $file_level_enum_descriptors$,\n"
-      "    $file_level_service_descriptors$,\n"
-      "};\n"
-      // This function exists to be marked as weak.
-      // It can significantly speed up compilation by breaking up LLVM's SCC in
-      // the .pb.cc translation units. Large translation units see a reduction
-      // of more than 35% of walltime for optimized builds.
-      // Without the weak attribute all the messages in the file, including all
-      // the vtables and everything they use become part of the same SCC through
-      // a cycle like:
-      // GetMetadata -> descriptor table -> default instances ->
-      //   vtables -> GetMetadata
-      // By adding a weak function here we break the connection from the
-      // individual vtables back into the descriptor table.
-      "PROTOBUF_ATTRIBUTE_WEAK const ::_pbi::DescriptorTable* "
-      "$desc_table$_getter() {\n"
-      "  return &$desc_table$;\n"
-      "}\n"
-      "\n",
-      eager ? "true" : "false", file_data.size(), protodef_name,
-      num_deps == 0 ? "nullptr" : variables_["desc_table"] + "_deps", num_deps,
-      message_generators_.size(),
-      message_generators_.empty() ? "nullptr"
-                                  : variables_["file_level_metadata"]);
-
-  // For descriptor.proto we want to avoid doing any dynamic initialization,
-  // because in some situations that would otherwise pull in a lot of
-  // unnecessary code that can't be stripped by --gc-sections. Descriptor
-  // initialization will still be performed lazily when it's needed.
-  if (file_->name() != "net/proto2/proto/descriptor.proto") {
-    format(
-        "// Force running AddDescriptors() at dynamic initialization time.\n"
-        "PROTOBUF_ATTRIBUTE_INIT_PRIORITY2 "
-        "static ::_pbi::AddDescriptorsRunner $1$(&$desc_table$);\n",
-        UniqueName("dynamic_init_dummy", file_, options_));
-  }
-}
-
-class FileGenerator::ForwardDeclarations {
- public:
-  void AddMessage(const Descriptor* d) { classes_[ClassName(d)] = d; }
-  void AddEnum(const EnumDescriptor* d) { enums_[ClassName(d)] = d; }
-  void AddSplit(const Descriptor* d) { splits_[ClassName(d)] = d; }
-
-  void Print(const Formatter& format, const Options& options) const {
-    for (const auto& p : enums_) {
-      const std::string& enumname = p.first;
-      const EnumDescriptor* enum_desc = p.second;
-      format(
-          "enum ${1$$2$$}$ : int;\n"
-          "bool $2$_IsValid(int value);\n",
-          enum_desc, enumname);
-    }
-    for (const auto& p : classes_) {
-      const std::string& classname = p.first;
-      const Descriptor* class_desc = p.second;
-      format(
-          "class ${1$$2$$}$;\n"
-          "struct $3$;\n"
-          "$dllexport_decl $extern $3$ $4$;\n",
-          class_desc, classname, DefaultInstanceType(class_desc, options),
-          DefaultInstanceName(class_desc, options));
-    }
-    for (const auto& p : splits_) {
-      const Descriptor* class_desc = p.second;
-      format(
-          "struct $1$;\n"
-          "$dllexport_decl $extern $1$ $2$;\n",
-          DefaultInstanceType(class_desc, options, /*split=*/true),
-          DefaultInstanceName(class_desc, options, /*split=*/true));
-    }
-  }
-
-  void PrintTopLevelDecl(const Formatter& format,
-                         const Options& options) const {
-    for (const auto& pair : classes_) {
-      format(
-          "template<> $dllexport_decl $"
-          "$1$* Arena::CreateMaybeMessage<$1$>(Arena*);\n",
-          QualifiedClassName(pair.second, options));
-    }
-  }
-
- private:
-  std::map<std::string, const Descriptor*> classes_;
-  std::map<std::string, const EnumDescriptor*> enums_;
-  std::map<std::string, const Descriptor*> splits_;
-};
-
-static void PublicImportDFS(const FileDescriptor* fd,
-                            std::unordered_set<const FileDescriptor*>* fd_set) {
-  for (int i = 0; i < fd->public_dependency_count(); i++) {
-    const FileDescriptor* dep = fd->public_dependency(i);
-    if (fd_set->insert(dep).second) PublicImportDFS(dep, fd_set);
-  }
-}
-
-void FileGenerator::GenerateForwardDeclarations(io::Printer* printer) {
-  Formatter format(printer, variables_);
-  std::vector<const Descriptor*> classes;
-  std::vector<const EnumDescriptor*> enums;
-
-  FlattenMessagesInFile(file_, &classes);  // All messages need forward decls.
-
-  if (options_.proto_h) {  // proto.h needs extra forward declarations.
-    // All classes / enums referred to as field members
-    std::vector<const FieldDescriptor*> fields;
-    ListAllFields(file_, &fields);
-    for (int i = 0; i < fields.size(); i++) {
-      classes.push_back(fields[i]->containing_type());
-      classes.push_back(fields[i]->message_type());
-      enums.push_back(fields[i]->enum_type());
-    }
-    ListAllTypesForServices(file_, &classes);
-  }
-
-  // Calculate the set of files whose definitions we get through include.
-  // No need to forward declare types that are defined in these.
-  std::unordered_set<const FileDescriptor*> public_set;
-  PublicImportDFS(file_, &public_set);
-
-  std::map<std::string, ForwardDeclarations> decls;
-  for (int i = 0; i < classes.size(); i++) {
-    const Descriptor* d = classes[i];
-    if (d && !public_set.count(d->file()))
-      decls[Namespace(d, options_)].AddMessage(d);
-  }
-  for (int i = 0; i < enums.size(); i++) {
-    const EnumDescriptor* d = enums[i];
-    if (d && !public_set.count(d->file()))
-      decls[Namespace(d, options_)].AddEnum(d);
-  }
-  for (const auto& mg : message_generators_) {
-    const Descriptor* d = mg->descriptor_;
-    if ((d != nullptr) && (public_set.count(d->file()) == 0u) &&
-        ShouldSplit(mg->descriptor_, options_))
-      decls[Namespace(d, options_)].AddSplit(d);
-  }
-
-  {
-    NamespaceOpener ns(format);
-    for (const auto& pair : decls) {
-      ns.ChangeTo(pair.first);
-      pair.second.Print(format, options_);
-    }
-  }
-  format("PROTOBUF_NAMESPACE_OPEN\n");
-  for (const auto& pair : decls) {
-    pair.second.PrintTopLevelDecl(format, options_);
-  }
-  format("PROTOBUF_NAMESPACE_CLOSE\n");
-}
-
-void FileGenerator::GenerateTopHeaderGuard(io::Printer* printer, bool pb_h) {
-  Formatter format(printer, variables_);
-  // Generate top of header.
-  format(
-      "// Generated by the protocol buffer compiler.  DO NOT EDIT!\n"
-      "// source: $filename$\n"
-      "\n"
-      "#ifndef $1$\n"
-      "#define $1$\n"
-      "\n"
-      "#include <limits>\n"
-      "#include <string>\n",
-      IncludeGuard(file_, pb_h, options_));
-  if (!options_.opensource_runtime && !enum_generators_.empty()) {
-    // Add header to provide std::is_integral for safe Enum_Name() function.
-    format("#include <type_traits>\n");
-  }
-  format("\n");
-}
-
-void FileGenerator::GenerateBottomHeaderGuard(io::Printer* printer, bool pb_h) {
-  Formatter format(printer, variables_);
-  format("#endif  // $GOOGLE_PROTOBUF$_INCLUDED_$1$\n",
-         IncludeGuard(file_, pb_h, options_));
-}
-
-void FileGenerator::GenerateLibraryIncludes(io::Printer* printer) {
-  Formatter format(printer, variables_);
-  if (UsingImplicitWeakFields(file_, options_)) {
-    IncludeFile("net/proto2/public/implicit_weak_message.h", printer);
-  }
-  if (HasWeakFields(file_, options_)) {
-    GOOGLE_CHECK(!options_.opensource_runtime);
-    IncludeFile("net/proto2/public/weak_field_map.h", printer);
-  }
-  if (HasLazyFields(file_, options_, &scc_analyzer_)) {
-    GOOGLE_CHECK(!options_.opensource_runtime);
-    IncludeFile("net/proto2/public/lazy_field.h", printer);
-  }
-  if (ShouldVerify(file_, options_, &scc_analyzer_)) {
-    IncludeFile("net/proto2/public/wire_format_verify.h", printer);
-  }
-
-  if (options_.opensource_runtime) {
-    // Verify the protobuf library header version is compatible with the protoc
-    // version before going any further.
-    IncludeFile("net/proto2/public/port_def.inc", printer);
-    format(
-        "#if PROTOBUF_VERSION < $1$\n"
-        "#error This file was generated by a newer version of protoc which is\n"
-        "#error incompatible with your Protocol Buffer headers. Please update\n"
-        "#error your headers.\n"
-        "#endif\n"
-        "#if $2$ < PROTOBUF_MIN_PROTOC_VERSION\n"
-        "#error This file was generated by an older version of protoc which "
-        "is\n"
-        "#error incompatible with your Protocol Buffer headers. Please\n"
-        "#error regenerate this file with a newer version of protoc.\n"
-        "#endif\n"
-        "\n",
-        PROTOBUF_MIN_HEADER_VERSION_FOR_PROTOC,  // 1
-        PROTOBUF_VERSION);                       // 2
-    IncludeFile("net/proto2/public/port_undef.inc", printer);
-  }
-
-  // OK, it's now safe to #include other files.
-  IncludeFile("net/proto2/io/public/coded_stream.h", printer);
-  IncludeFile("net/proto2/public/arena.h", printer);
-  IncludeFile("net/proto2/public/arenastring.h", printer);
-  if ((options_.force_inline_string || options_.profile_driven_inline_string) &&
-      !options_.opensource_runtime) {
-    IncludeFile("net/proto2/public/inlined_string_field.h", printer);
-  }
-  if (HasSimpleBaseClasses(file_, options_)) {
-    IncludeFile("net/proto2/public/generated_message_bases.h", printer);
-  }
-  if (HasGeneratedMethods(file_, options_) &&
-      options_.tctable_mode != Options::kTCTableNever) {
-    IncludeFile("net/proto2/public/generated_message_tctable_decl.h", printer);
-  }
-  IncludeFile("net/proto2/public/generated_message_util.h", printer);
-  IncludeFile("net/proto2/public/metadata_lite.h", printer);
-
-  if (HasDescriptorMethods(file_, options_)) {
-    IncludeFile("net/proto2/public/generated_message_reflection.h", printer);
-  }
-
-  if (!message_generators_.empty()) {
-    if (HasDescriptorMethods(file_, options_)) {
-      IncludeFile("net/proto2/public/message.h", printer);
-    } else {
-      IncludeFile("net/proto2/public/message_lite.h", printer);
-    }
-  }
-  if (options_.opensource_runtime) {
-    // Open-source relies on unconditional includes of these.
-    IncludeFileAndExport("net/proto2/public/repeated_field.h", printer);
-    IncludeFileAndExport("net/proto2/public/extension_set.h", printer);
-  } else {
-    // Google3 includes these files only when they are necessary.
-    if (HasExtensionsOrExtendableMessage(file_)) {
-      IncludeFileAndExport("net/proto2/public/extension_set.h", printer);
-    }
-    if (HasRepeatedFields(file_)) {
-      IncludeFileAndExport("net/proto2/public/repeated_field.h", printer);
-    }
-    if (HasStringPieceFields(file_, options_)) {
-      IncludeFile("net/proto2/public/string_piece_field_support.h", printer);
-    }
-    if (HasCordFields(file_, options_)) {
-      format("#include \"third_party/absl/strings/cord.h\"\n");
-    }
-  }
-  if (HasMapFields(file_)) {
-    IncludeFileAndExport("net/proto2/public/map.h", printer);
-    if (HasDescriptorMethods(file_, options_)) {
-      IncludeFile("net/proto2/public/map_entry.h", printer);
-      IncludeFile("net/proto2/public/map_field_inl.h", printer);
-    } else {
-      IncludeFile("net/proto2/public/map_entry_lite.h", printer);
-      IncludeFile("net/proto2/public/map_field_lite.h", printer);
-    }
-  }
-
-  if (HasEnumDefinitions(file_)) {
-    if (HasDescriptorMethods(file_, options_)) {
-      IncludeFile("net/proto2/public/generated_enum_reflection.h", printer);
-    } else {
-      IncludeFile("net/proto2/public/generated_enum_util.h", printer);
-    }
-  }
-
-  if (HasGenericServices(file_, options_)) {
-    IncludeFile("net/proto2/public/service.h", printer);
-  }
-
-  if (UseUnknownFieldSet(file_, options_) && !message_generators_.empty()) {
-    IncludeFile("net/proto2/public/unknown_field_set.h", printer);
-  }
-}
-
-void FileGenerator::GenerateMetadataPragma(io::Printer* printer,
-                                           const std::string& info_path) {
-  Formatter format(printer, variables_);
-  if (!info_path.empty() && !options_.annotation_pragma_name.empty() &&
-      !options_.annotation_guard_name.empty()) {
-    format.Set("guard", options_.annotation_guard_name);
-    format.Set("pragma", options_.annotation_pragma_name);
-    format.Set("info_path", info_path);
-    format(
-        "#ifdef $guard$\n"
-        "#pragma $pragma$ \"$info_path$\"\n"
-        "#endif  // $guard$\n");
-  }
-}
-
-void FileGenerator::GenerateDependencyIncludes(io::Printer* printer) {
-  Formatter format(printer, variables_);
-  for (int i = 0; i < file_->dependency_count(); i++) {
-    std::string basename = StripProto(file_->dependency(i)->name());
-
-    // Do not import weak deps.
-    if (IsDepWeak(file_->dependency(i))) continue;
-
-    if (IsBootstrapProto(options_, file_)) {
-      GetBootstrapBasename(options_, basename, &basename);
-    }
-
-    format("#include $1$\n",
-           CreateHeaderInclude(basename + ".pb.h", file_->dependency(i)));
-  }
-}
-
-void FileGenerator::GenerateGlobalStateFunctionDeclarations(
-    io::Printer* printer) {
-  Formatter format(printer, variables_);
-  // Forward-declare the DescriptorTable because this is referenced by .pb.cc
-  // files depending on this file.
-  //
-  // The TableStruct is also outputted in weak_message_field.cc, because the
-  // weak fields must refer to table struct but cannot include the header.
-  // Also it annotates extra weak attributes.
-  // TODO(gerbens) make sure this situation is handled better.
-  format(
-      "\n"
-      "// Internal implementation detail -- do not use these members.\n"
-      "struct $dllexport_decl $$tablename$ {\n"
-      "  static const $uint32$ offsets[];\n"
-      "};\n");
-  if (HasDescriptorMethods(file_, options_)) {
-    format(
-        "$dllexport_decl $extern const ::$proto_ns$::internal::DescriptorTable "
-        "$desc_table$;\n");
-  }
-}
-
-void FileGenerator::GenerateMessageDefinitions(io::Printer* printer) {
-  Formatter format(printer, variables_);
-  // Generate class definitions.
-  for (int i = 0; i < message_generators_.size(); i++) {
-    if (i > 0) {
-      format("\n");
-      format(kThinSeparator);
-      format("\n");
-    }
-    message_generators_[i]->GenerateClassDefinition(printer);
-  }
-}
-
-void FileGenerator::GenerateEnumDefinitions(io::Printer* printer) {
-  // Generate enum definitions.
-  for (int i = 0; i < enum_generators_.size(); i++) {
-    enum_generators_[i]->GenerateDefinition(printer);
-  }
-}
-
-void FileGenerator::GenerateServiceDefinitions(io::Printer* printer) {
-  Formatter format(printer, variables_);
-  if (HasGenericServices(file_, options_)) {
-    // Generate service definitions.
-    for (int i = 0; i < service_generators_.size(); i++) {
-      if (i > 0) {
-        format("\n");
-        format(kThinSeparator);
-        format("\n");
-      }
-      service_generators_[i]->GenerateDeclarations(printer);
-    }
-
-    format("\n");
-    format(kThickSeparator);
-    format("\n");
-  }
-}
-
-void FileGenerator::GenerateExtensionIdentifiers(io::Printer* printer) {
-  // Declare extension identifiers. These are in global scope and so only
-  // the global scope extensions.
-  for (auto& extension_generator : extension_generators_) {
-    if (extension_generator->IsScoped()) continue;
-    extension_generator->GenerateDeclaration(printer);
-  }
-}
-
-void FileGenerator::GenerateInlineFunctionDefinitions(io::Printer* printer) {
-  Formatter format(printer, variables_);
-  // TODO(gerbens) remove pragmas when gcc is no longer used. Current version
-  // of gcc fires a bogus error when compiled with strict-aliasing.
-  format(
-      "#ifdef __GNUC__\n"
-      "  #pragma GCC diagnostic push\n"
-      "  #pragma GCC diagnostic ignored \"-Wstrict-aliasing\"\n"
-      "#endif  // __GNUC__\n");
-  // Generate class inline methods.
-  for (int i = 0; i < message_generators_.size(); i++) {
-    if (i > 0) {
-      format(kThinSeparator);
-      format("\n");
-    }
-    message_generators_[i]->GenerateInlineMethods(printer);
-  }
-  format(
-      "#ifdef __GNUC__\n"
-      "  #pragma GCC diagnostic pop\n"
-      "#endif  // __GNUC__\n");
-
-  for (int i = 0; i < message_generators_.size(); i++) {
-    if (i > 0) {
-      format(kThinSeparator);
-      format("\n");
-    }
-  }
-}
-
-void FileGenerator::GenerateProto2NamespaceEnumSpecializations(
-    io::Printer* printer) {
-  Formatter format(printer, variables_);
-  // Emit GetEnumDescriptor specializations into google::protobuf namespace:
-  if (HasEnumDefinitions(file_)) {
-    format("\n");
-    {
-      NamespaceOpener proto_ns(ProtobufNamespace(options_), format);
-      format("\n");
-      for (int i = 0; i < enum_generators_.size(); i++) {
-        enum_generators_[i]->GenerateGetEnumDescriptorSpecializations(printer);
-      }
-      format("\n");
-    }
-  }
-}
-
-}  // namespace cpp
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/compiler/cpp/file.h b/libs/protobuf/src/google/protobuf/compiler/cpp/file.h
deleted file mode 100644
index ca05361..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/cpp/file.h
+++ /dev/null
@@ -1,209 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-
-#ifndef GOOGLE_PROTOBUF_COMPILER_CPP_FILE_H__
-#define GOOGLE_PROTOBUF_COMPILER_CPP_FILE_H__
-
-#include <algorithm>
-#include <memory>
-#include <set>
-#include <string>
-#include <vector>
-
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/compiler/cpp/field.h>
-#include <google/protobuf/compiler/cpp/helpers.h>
-#include <google/protobuf/compiler/scc.h>
-#include <google/protobuf/compiler/cpp/options.h>
-
-namespace google {
-namespace protobuf {
-class FileDescriptor;  // descriptor.h
-namespace io {
-class Printer;  // printer.h
-}
-}  // namespace protobuf
-}  // namespace google
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace cpp {
-
-class EnumGenerator;       // enum.h
-class MessageGenerator;    // message.h
-class ServiceGenerator;    // service.h
-class ExtensionGenerator;  // extension.h
-
-class FileGenerator {
- public:
-  // See generator.cc for the meaning of dllexport_decl.
-  FileGenerator(const FileDescriptor* file, const Options& options);
-  ~FileGenerator();
-
-  // Shared code between the two header generators below.
-  void GenerateHeader(io::Printer* printer);
-
-  // info_path, if non-empty, should be the path (relative to printer's
-  // output) to the metadata file describing this proto header.
-  void GenerateProtoHeader(io::Printer* printer, const std::string& info_path);
-  // info_path, if non-empty, should be the path (relative to printer's
-  // output) to the metadata file describing this PB header.
-  void GeneratePBHeader(io::Printer* printer, const std::string& info_path);
-  void GenerateSource(io::Printer* printer);
-
-  // The following member functions are used when the lite_implicit_weak_fields
-  // option is set. In this mode the code is organized a bit differently to
-  // promote better linker stripping of unused code. In particular, we generate
-  // one .cc file per message, one .cc file per extension, and a main pb.cc file
-  // containing everything else.
-
-  int NumMessages() const { return message_generators_.size(); }
-  int NumExtensions() const { return extension_generators_.size(); }
-  // Generates the source file for one message.
-  void GenerateSourceForMessage(int idx, io::Printer* printer);
-  // Generates the source file for one extension.
-  void GenerateSourceForExtension(int idx, io::Printer* printer);
-  // Generates a source file containing everything except messages and
-  // extensions.
-  void GenerateGlobalSource(io::Printer* printer);
-
- private:
-  // Internal type used by GenerateForwardDeclarations (defined in file.cc).
-  class ForwardDeclarations;
-  struct CrossFileReferences;
-
-  void IncludeFile(const std::string& google3_name, io::Printer* printer) {
-    DoIncludeFile(google3_name, false, printer);
-  }
-  void IncludeFileAndExport(const std::string& google3_name,
-                            io::Printer* printer) {
-    DoIncludeFile(google3_name, true, printer);
-  }
-  void DoIncludeFile(const std::string& google3_name, bool do_export,
-                     io::Printer* printer);
-
-  std::string CreateHeaderInclude(const std::string& basename,
-                                  const FileDescriptor* file);
-  void GetCrossFileReferencesForField(const FieldDescriptor* field,
-                                      CrossFileReferences* refs);
-  void GetCrossFileReferencesForFile(const FileDescriptor* file,
-                                     CrossFileReferences* refs);
-  void GenerateInternalForwardDeclarations(const CrossFileReferences& refs,
-                                           io::Printer* printer);
-  void GenerateSourceIncludes(io::Printer* printer);
-  void GenerateSourcePrelude(io::Printer* printer);
-  void GenerateSourceDefaultInstance(int idx, io::Printer* printer);
-
-  void GenerateInitForSCC(const SCC* scc, const CrossFileReferences& refs,
-                          io::Printer* printer);
-  void GenerateReflectionInitializationCode(io::Printer* printer);
-
-  // For other imports, generates their forward-declarations.
-  void GenerateForwardDeclarations(io::Printer* printer);
-
-  // Generates top or bottom of a header file.
-  void GenerateTopHeaderGuard(io::Printer* printer, bool pb_h);
-  void GenerateBottomHeaderGuard(io::Printer* printer, bool pb_h);
-
-  // Generates #include directives.
-  void GenerateLibraryIncludes(io::Printer* printer);
-  void GenerateDependencyIncludes(io::Printer* printer);
-
-  // Generate a pragma to pull in metadata using the given info_path (if
-  // non-empty). info_path should be relative to printer's output.
-  void GenerateMetadataPragma(io::Printer* printer,
-                              const std::string& info_path);
-
-  // Generates a couple of different pieces before definitions:
-  void GenerateGlobalStateFunctionDeclarations(io::Printer* printer);
-
-  // Generates types for classes.
-  void GenerateMessageDefinitions(io::Printer* printer);
-
-  void GenerateEnumDefinitions(io::Printer* printer);
-
-  // Generates generic service definitions.
-  void GenerateServiceDefinitions(io::Printer* printer);
-
-  // Generates extension identifiers.
-  void GenerateExtensionIdentifiers(io::Printer* printer);
-
-  // Generates inline function definitions.
-  void GenerateInlineFunctionDefinitions(io::Printer* printer);
-
-  void GenerateProto2NamespaceEnumSpecializations(io::Printer* printer);
-
-  // Sometimes the names we use in a .proto file happen to be defined as
-  // macros on some platforms (e.g., macro/minor used in plugin.proto are
-  // defined as macros in sys/types.h on FreeBSD and a few other platforms).
-  // To make the generated code compile on these platforms, we either have to
-  // undef the macro for these few platforms, or rename the field name for all
-  // platforms. Since these names are part of protobuf public API, renaming is
-  // generally a breaking change so we prefer the #undef approach.
-  void GenerateMacroUndefs(io::Printer* printer);
-
-  bool IsDepWeak(const FileDescriptor* dep) const {
-    if (weak_deps_.count(dep) != 0) {
-      GOOGLE_CHECK(!options_.opensource_runtime);
-      return true;
-    }
-    return false;
-  }
-
-  std::set<const FileDescriptor*> weak_deps_;
-
-  const FileDescriptor* file_;
-  const Options options_;
-
-  MessageSCCAnalyzer scc_analyzer_;
-
-  std::map<std::string, std::string> variables_;
-
-  // Contains the post-order walk of all the messages (and child messages) in
-  // this file. If you need a pre-order walk just reverse iterate.
-  std::vector<std::unique_ptr<MessageGenerator>> message_generators_;
-  std::vector<std::unique_ptr<EnumGenerator>> enum_generators_;
-  std::vector<std::unique_ptr<ServiceGenerator>> service_generators_;
-  std::vector<std::unique_ptr<ExtensionGenerator>> extension_generators_;
-
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(FileGenerator);
-};
-
-}  // namespace cpp
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // GOOGLE_PROTOBUF_COMPILER_CPP_FILE_H__
diff --git a/libs/protobuf/src/google/protobuf/compiler/cpp/generator.cc b/libs/protobuf/src/google/protobuf/compiler/cpp/generator.cc
deleted file mode 100644
index 63a2bce..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/cpp/generator.cc
+++ /dev/null
@@ -1,279 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-
-#include <google/protobuf/compiler/cpp/generator.h>
-
-#include <memory>
-#include <string>
-#include <utility>
-#include <vector>
-
-#include <google/protobuf/stubs/strutil.h>
-#include <google/protobuf/io/printer.h>
-#include <google/protobuf/io/zero_copy_stream.h>
-#include <google/protobuf/compiler/cpp/file.h>
-#include <google/protobuf/compiler/cpp/helpers.h>
-#include <google/protobuf/descriptor.pb.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace cpp {
-
-CppGenerator::CppGenerator() {}
-CppGenerator::~CppGenerator() {}
-
-namespace {
-std::string NumberedCcFileName(const std::string& basename, int number) {
-  return StrCat(basename, ".out/", number, ".cc");
-}
-}  // namespace
-
-bool CppGenerator::Generate(const FileDescriptor* file,
-                            const std::string& parameter,
-                            GeneratorContext* generator_context,
-                            std::string* error) const {
-  std::vector<std::pair<std::string, std::string> > options;
-  ParseGeneratorParameter(parameter, &options);
-
-  // -----------------------------------------------------------------
-  // parse generator options
-
-  // If the dllexport_decl option is passed to the compiler, we need to write
-  // it in front of every symbol that should be exported if this .proto is
-  // compiled into a Windows DLL.  E.g., if the user invokes the protocol
-  // compiler as:
-  //   protoc --cpp_out=dllexport_decl=FOO_EXPORT:outdir foo.proto
-  // then we'll define classes like this:
-  //   class FOO_EXPORT Foo {
-  //     ...
-  //   }
-  // FOO_EXPORT is a macro which should expand to __declspec(dllexport) or
-  // __declspec(dllimport) depending on what is being compiled.
-  //
-  // If the proto_h option is passed to the compiler, we will generate all
-  // classes and enums so that they can be forward-declared from files that
-  // need them from imports.
-  //
-  // If the lite option is passed to the compiler, we will generate the
-  // current files and all transitive dependencies using the LITE runtime.
-  Options file_options;
-
-  file_options.opensource_runtime = opensource_runtime_;
-  file_options.runtime_include_base = runtime_include_base_;
-
-  for (int i = 0; i < options.size(); i++) {
-    if (options[i].first == "dllexport_decl") {
-      file_options.dllexport_decl = options[i].second;
-    } else if (options[i].first == "safe_boundary_check") {
-      file_options.safe_boundary_check = true;
-    } else if (options[i].first == "annotate_headers") {
-      file_options.annotate_headers = true;
-    } else if (options[i].first == "annotation_pragma_name") {
-      file_options.annotation_pragma_name = options[i].second;
-    } else if (options[i].first == "annotation_guard_name") {
-      file_options.annotation_guard_name = options[i].second;
-    } else if (options[i].first == "speed") {
-      file_options.enforce_mode = EnforceOptimizeMode::kSpeed;
-    } else if (options[i].first == "code_size") {
-      file_options.enforce_mode = EnforceOptimizeMode::kCodeSize;
-    } else if (options[i].first == "lite") {
-      file_options.enforce_mode = EnforceOptimizeMode::kLiteRuntime;
-    } else if (options[i].first == "lite_implicit_weak_fields") {
-      file_options.enforce_mode = EnforceOptimizeMode::kLiteRuntime;
-      file_options.lite_implicit_weak_fields = true;
-      if (!options[i].second.empty()) {
-        file_options.num_cc_files =
-            strto32(options[i].second.c_str(), nullptr, 10);
-      }
-    } else if (options[i].first == "proto_h") {
-      file_options.proto_h = true;
-    } else if (options[i].first == "annotate_accessor") {
-      file_options.annotate_accessor = true;
-    } else if (options[i].first == "inject_field_listener_events") {
-      file_options.field_listener_options.inject_field_listener_events = true;
-    } else if (options[i].first == "forbidden_field_listener_events") {
-      std::size_t pos = 0;
-      do {
-        std::size_t next_pos = options[i].second.find_first_of("+", pos);
-        if (next_pos == std::string::npos) {
-          next_pos = options[i].second.size();
-        }
-        if (next_pos > pos)
-          file_options.field_listener_options.forbidden_field_listener_events
-              .insert(options[i].second.substr(pos, next_pos - pos));
-        pos = next_pos + 1;
-      } while (pos < options[i].second.size());
-    } else if (options[i].first == "verified_lazy") {
-      file_options.unverified_lazy = false;
-    } else if (options[i].first == "unverified_lazy_message_sets") {
-      file_options.unverified_lazy_message_sets = true;
-    } else if (options[i].first == "message_owned_arena_trial") {
-      file_options.message_owned_arena_trial = true;
-    } else if (options[i].first == "force_eagerly_verified_lazy") {
-      file_options.force_eagerly_verified_lazy = true;
-    } else if (options[i].first == "experimental_tail_call_table_mode") {
-      if (options[i].second == "never") {
-        file_options.tctable_mode = Options::kTCTableNever;
-      } else if (options[i].second == "guarded") {
-        file_options.tctable_mode = Options::kTCTableGuarded;
-      } else if (options[i].second == "always") {
-        file_options.tctable_mode = Options::kTCTableAlways;
-      } else {
-        *error = "Unknown value for experimental_tail_call_table_mode: " +
-                 options[i].second;
-        return false;
-      }
-    } else {
-      *error = "Unknown generator option: " + options[i].first;
-      return false;
-    }
-  }
-
-  // The safe_boundary_check option controls behavior for Google-internal
-  // protobuf APIs.
-  if (file_options.safe_boundary_check && file_options.opensource_runtime) {
-    *error =
-        "The safe_boundary_check option is not supported outside of Google.";
-    return false;
-  }
-
-  // -----------------------------------------------------------------
-
-
-  std::string basename = StripProto(file->name());
-
-  if (MaybeBootstrap(file_options, generator_context, file_options.bootstrap,
-                     &basename)) {
-    return true;
-  }
-
-  FileGenerator file_generator(file, file_options);
-
-  // Generate header(s).
-  if (file_options.proto_h) {
-    std::unique_ptr<io::ZeroCopyOutputStream> output(
-        generator_context->Open(basename + ".proto.h"));
-    GeneratedCodeInfo annotations;
-    io::AnnotationProtoCollector<GeneratedCodeInfo> annotation_collector(
-        &annotations);
-    std::string info_path = basename + ".proto.h.meta";
-    io::Printer printer(
-        output.get(), '$',
-        file_options.annotate_headers ? &annotation_collector : nullptr);
-    file_generator.GenerateProtoHeader(
-        &printer, file_options.annotate_headers ? info_path : "");
-    if (file_options.annotate_headers) {
-      std::unique_ptr<io::ZeroCopyOutputStream> info_output(
-          generator_context->Open(info_path));
-      annotations.SerializeToZeroCopyStream(info_output.get());
-    }
-  }
-
-  {
-    std::unique_ptr<io::ZeroCopyOutputStream> output(
-        generator_context->Open(basename + ".pb.h"));
-    GeneratedCodeInfo annotations;
-    io::AnnotationProtoCollector<GeneratedCodeInfo> annotation_collector(
-        &annotations);
-    std::string info_path = basename + ".pb.h.meta";
-    io::Printer printer(
-        output.get(), '$',
-        file_options.annotate_headers ? &annotation_collector : nullptr);
-    file_generator.GeneratePBHeader(
-        &printer, file_options.annotate_headers ? info_path : "");
-    if (file_options.annotate_headers) {
-      std::unique_ptr<io::ZeroCopyOutputStream> info_output(
-          generator_context->Open(info_path));
-      annotations.SerializeToZeroCopyStream(info_output.get());
-    }
-  }
-
-  // Generate cc file(s).
-  if (UsingImplicitWeakFields(file, file_options)) {
-    {
-      // This is the global .cc file, containing
-      // enum/services/tables/reflection
-      std::unique_ptr<io::ZeroCopyOutputStream> output(
-          generator_context->Open(basename + ".pb.cc"));
-      io::Printer printer(output.get(), '$');
-      file_generator.GenerateGlobalSource(&printer);
-    }
-
-    int num_cc_files =
-        file_generator.NumMessages() + file_generator.NumExtensions();
-
-    // If we're using implicit weak fields then we allow the user to
-    // optionally specify how many files to generate, not counting the global
-    // pb.cc file. If we have more files than messages, then some files will
-    // be generated as empty placeholders.
-    if (file_options.num_cc_files > 0) {
-      GOOGLE_CHECK_LE(num_cc_files, file_options.num_cc_files)
-          << "There must be at least as many numbered .cc files as messages "
-             "and extensions.";
-      num_cc_files = file_options.num_cc_files;
-    }
-    int cc_file_number = 0;
-    for (int i = 0; i < file_generator.NumMessages(); i++) {
-      std::unique_ptr<io::ZeroCopyOutputStream> output(generator_context->Open(
-          NumberedCcFileName(basename, cc_file_number++)));
-      io::Printer printer(output.get(), '$');
-      file_generator.GenerateSourceForMessage(i, &printer);
-    }
-    for (int i = 0; i < file_generator.NumExtensions(); i++) {
-      std::unique_ptr<io::ZeroCopyOutputStream> output(generator_context->Open(
-          NumberedCcFileName(basename, cc_file_number++)));
-      io::Printer printer(output.get(), '$');
-      file_generator.GenerateSourceForExtension(i, &printer);
-    }
-    // Create empty placeholder files if necessary to match the expected number
-    // of files.
-    for (; cc_file_number < num_cc_files; ++cc_file_number) {
-      std::unique_ptr<io::ZeroCopyOutputStream> output(generator_context->Open(
-          NumberedCcFileName(basename, cc_file_number)));
-    }
-  } else {
-    std::unique_ptr<io::ZeroCopyOutputStream> output(
-        generator_context->Open(basename + ".pb.cc"));
-    io::Printer printer(output.get(), '$');
-    file_generator.GenerateSource(&printer);
-  }
-
-  return true;
-}
-
-}  // namespace cpp
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/compiler/cpp/generator.h b/libs/protobuf/src/google/protobuf/compiler/cpp/generator.h
deleted file mode 100644
index 1a374b9..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/cpp/generator.h
+++ /dev/null
@@ -1,107 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-//
-// Generates C++ code for a given .proto file.
-
-#ifndef GOOGLE_PROTOBUF_COMPILER_CPP_GENERATOR_H__
-#define GOOGLE_PROTOBUF_COMPILER_CPP_GENERATOR_H__
-
-#include <string>
-#include <google/protobuf/compiler/code_generator.h>
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace cpp {
-
-// CodeGenerator implementation which generates a C++ source file and
-// header.  If you create your own protocol compiler binary and you want
-// it to support C++ output, you can do so by registering an instance of this
-// CodeGenerator with the CommandLineInterface in your main() function.
-class PROTOC_EXPORT CppGenerator : public CodeGenerator {
- public:
-  CppGenerator();
-  ~CppGenerator() override;
-
-  enum class Runtime {
-    kGoogle3,     // Use the internal google3 runtime.
-    kOpensource,  // Use the open-source runtime.
-
-    // Use the open-source runtime with google3 #include paths.  We make these
-    // absolute to avoid ambiguity, so the runtime will be #included like:
-    //   #include "third_party/protobuf/.../google/protobuf/message.h"
-    kOpensourceGoogle3
-  };
-
-  void set_opensource_runtime(bool opensource) {
-    opensource_runtime_ = opensource;
-  }
-
-  // If set to a non-empty string, generated code will do:
-  //   #include "<BASE>/google/protobuf/message.h"
-  // instead of:
-  //   #include <google/protobuf/message.h>
-  // This has no effect if opensource_runtime = false.
-  void set_runtime_include_base(const std::string& base) {
-    runtime_include_base_ = base;
-  }
-
-  // implements CodeGenerator ----------------------------------------
-  bool Generate(const FileDescriptor* file, const std::string& parameter,
-                GeneratorContext* generator_context,
-                std::string* error) const override;
-
-  uint64_t GetSupportedFeatures() const override {
-    // We don't fully support this yet, but this is needed to unblock the tests,
-    // and we will have full support before the experimental flag is removed.
-    return FEATURE_PROTO3_OPTIONAL;
-  }
-
- private:
-  bool opensource_runtime_ = true;
-  std::string runtime_include_base_;
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(CppGenerator);
-};
-
-}  // namespace cpp
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
-
-#endif  // GOOGLE_PROTOBUF_COMPILER_CPP_GENERATOR_H__
diff --git a/libs/protobuf/src/google/protobuf/compiler/cpp/helpers.cc b/libs/protobuf/src/google/protobuf/compiler/cpp/helpers.cc
deleted file mode 100644
index 4b7c5c9..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/cpp/helpers.cc
+++ /dev/null
@@ -1,1599 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-
-#include <google/protobuf/compiler/cpp/helpers.h>
-
-#include <cstdint>
-#include <functional>
-#include <limits>
-#include <map>
-#include <memory>
-#include <queue>
-#include <unordered_set>
-#include <vector>
-
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/stubs/logging.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/compiler/cpp/names.h>
-#include <google/protobuf/compiler/cpp/options.h>
-#include <google/protobuf/descriptor.pb.h>
-#include <google/protobuf/compiler/scc.h>
-#include <google/protobuf/io/printer.h>
-#include <google/protobuf/io/zero_copy_stream.h>
-#include <google/protobuf/dynamic_message.h>
-#include <google/protobuf/wire_format.h>
-#include <google/protobuf/wire_format_lite.h>
-#include <google/protobuf/stubs/strutil.h>
-#include <google/protobuf/stubs/substitute.h>
-#include <google/protobuf/stubs/hash.h>
-
-// Must be last.
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace cpp {
-
-namespace {
-
-static const char kAnyMessageName[] = "Any";
-static const char kAnyProtoFile[] = "google/protobuf/any.proto";
-
-std::string DotsToColons(const std::string& name) {
-  return StringReplace(name, ".", "::", true);
-}
-
-static const char* const kKeywordList[] = {  //
-    "NULL",
-    "alignas",
-    "alignof",
-    "and",
-    "and_eq",
-    "asm",
-    "auto",
-    "bitand",
-    "bitor",
-    "bool",
-    "break",
-    "case",
-    "catch",
-    "char",
-    "class",
-    "compl",
-    "const",
-    "constexpr",
-    "const_cast",
-    "continue",
-    "decltype",
-    "default",
-    "delete",
-    "do",
-    "double",
-    "dynamic_cast",
-    "else",
-    "enum",
-    "explicit",
-    "export",
-    "extern",
-    "false",
-    "float",
-    "for",
-    "friend",
-    "goto",
-    "if",
-    "inline",
-    "int",
-    "long",
-    "mutable",
-    "namespace",
-    "new",
-    "noexcept",
-    "not",
-    "not_eq",
-    "nullptr",
-    "operator",
-    "or",
-    "or_eq",
-    "private",
-    "protected",
-    "public",
-    "register",
-    "reinterpret_cast",
-    "return",
-    "short",
-    "signed",
-    "sizeof",
-    "static",
-    "static_assert",
-    "static_cast",
-    "struct",
-    "switch",
-    "template",
-    "this",
-    "thread_local",
-    "throw",
-    "true",
-    "try",
-    "typedef",
-    "typeid",
-    "typename",
-    "union",
-    "unsigned",
-    "using",
-    "virtual",
-    "void",
-    "volatile",
-    "wchar_t",
-    "while",
-    "xor",
-    "xor_eq"};
-
-static std::unordered_set<std::string>* MakeKeywordsMap() {
-  auto* result = new std::unordered_set<std::string>();
-  for (const auto keyword : kKeywordList) {
-    result->emplace(keyword);
-  }
-  return result;
-}
-
-static std::unordered_set<std::string>& kKeywords = *MakeKeywordsMap();
-
-std::string IntTypeName(const Options& options, const std::string& type) {
-  return type + "_t";
-}
-
-void SetIntVar(const Options& options, const std::string& type,
-               std::map<std::string, std::string>* variables) {
-  (*variables)[type] = IntTypeName(options, type);
-}
-
-// Returns true if the message can potentially allocate memory for its field.
-// This is used to determine if message-owned arena will be useful.
-bool AllocExpected(const Descriptor* descriptor) {
-  return false;
-}
-
-// Describes different approaches to detect non-canonical int32 encoding. Only
-// kNever or kAlways is eligible for *simple* verification methods.
-enum class VerifyInt32Type {
-  kCustom,  // Only check if field number matches.
-  kNever,   // Do not check.
-  kAlways,  // Always check.
-};
-
-inline VerifySimpleType VerifyInt32TypeToVerifyCustom(VerifyInt32Type t) {
-  static VerifySimpleType kCustomTypes[] = {
-      VerifySimpleType::kCustom, VerifySimpleType::kCustomInt32Never,
-      VerifySimpleType::kCustomInt32Always};
-  return kCustomTypes[static_cast<int32_t>(t) -
-                      static_cast<int32_t>(VerifyInt32Type::kCustom)];
-}
-
-}  // namespace
-
-bool IsLazy(const FieldDescriptor* field, const Options& options,
-            MessageSCCAnalyzer* scc_analyzer) {
-  return IsLazilyVerifiedLazy(field, options) ||
-         IsEagerlyVerifiedLazy(field, options, scc_analyzer);
-}
-
-// Returns true if "field" is a message field that is backed by LazyField per
-// profile (go/pdlazy).
-inline bool IsEagerlyVerifiedLazyByProfile(const FieldDescriptor* field,
-                                           const Options& options,
-                                           MessageSCCAnalyzer* scc_analyzer) {
-  return false;
-}
-
-bool IsEagerlyVerifiedLazy(const FieldDescriptor* field, const Options& options,
-                           MessageSCCAnalyzer* scc_analyzer) {
-  return false;
-}
-
-bool IsLazilyVerifiedLazy(const FieldDescriptor* field,
-                          const Options& options) {
-  return false;
-}
-
-void SetCommonVars(const Options& options,
-                   std::map<std::string, std::string>* variables) {
-  (*variables)["proto_ns"] = ProtobufNamespace(options);
-
-  // Warning: there is some clever naming/splitting here to avoid extract script
-  // rewrites.  The names of these variables must not be things that the extract
-  // script will rewrite.  That's why we use "CHK" (for example) instead of
-  // "GOOGLE_CHECK".
-  if (options.opensource_runtime) {
-    (*variables)["GOOGLE_PROTOBUF"] = "GOOGLE_PROTOBUF";
-    (*variables)["CHK"] = "GOOGLE_CHECK";
-    (*variables)["DCHK"] = "GOOGLE_DCHECK";
-  } else {
-    // These values are things the extract script would rewrite if we did not
-    // split them.  It might not strictly matter since we don't generate google3
-    // code in open-source.  But it's good to prevent surprising things from
-    // happening.
-    (*variables)["GOOGLE_PROTOBUF"] =
-        "GOOGLE3"
-        "_PROTOBUF";
-    (*variables)["CHK"] =
-        "CH"
-        "ECK";
-    (*variables)["DCHK"] =
-        "DCH"
-        "ECK";
-  }
-
-  SetIntVar(options, "int8", variables);
-  SetIntVar(options, "uint8", variables);
-  SetIntVar(options, "uint32", variables);
-  SetIntVar(options, "uint64", variables);
-  SetIntVar(options, "int32", variables);
-  SetIntVar(options, "int64", variables);
-  (*variables)["string"] = "std::string";
-}
-
-void SetCommonMessageDataVariables(
-    const Descriptor* descriptor,
-    std::map<std::string, std::string>* variables) {
-  std::string prefix = IsMapEntryMessage(descriptor) ? "" : "_impl_.";
-  (*variables)["any_metadata"] = prefix + "_any_metadata_";
-  (*variables)["cached_size"] = prefix + "_cached_size_";
-  (*variables)["extensions"] = prefix + "_extensions_";
-  (*variables)["has_bits"] = prefix + "_has_bits_";
-  (*variables)["inlined_string_donated_array"] =
-      prefix + "_inlined_string_donated_";
-  (*variables)["oneof_case"] = prefix + "_oneof_case_";
-  (*variables)["tracker"] = "Impl_::_tracker_";
-  (*variables)["weak_field_map"] = prefix + "_weak_field_map_";
-  (*variables)["split"] = prefix + "_split_";
-  (*variables)["cached_split_ptr"] = "cached_split_ptr";
-}
-
-void SetUnknownFieldsVariable(const Descriptor* descriptor,
-                              const Options& options,
-                              std::map<std::string, std::string>* variables) {
-  std::string proto_ns = ProtobufNamespace(options);
-  std::string unknown_fields_type;
-  if (UseUnknownFieldSet(descriptor->file(), options)) {
-    unknown_fields_type = "::" + proto_ns + "::UnknownFieldSet";
-    (*variables)["unknown_fields"] =
-        "_internal_metadata_.unknown_fields<" + unknown_fields_type + ">(" +
-        unknown_fields_type + "::default_instance)";
-  } else {
-    unknown_fields_type =
-        PrimitiveTypeName(options, FieldDescriptor::CPPTYPE_STRING);
-    (*variables)["unknown_fields"] = "_internal_metadata_.unknown_fields<" +
-                                     unknown_fields_type + ">(::" + proto_ns +
-                                     "::internal::GetEmptyString)";
-  }
-  (*variables)["unknown_fields_type"] = unknown_fields_type;
-  (*variables)["have_unknown_fields"] =
-      "_internal_metadata_.have_unknown_fields()";
-  (*variables)["mutable_unknown_fields"] =
-      "_internal_metadata_.mutable_unknown_fields<" + unknown_fields_type +
-      ">()";
-}
-
-std::string UnderscoresToCamelCase(const std::string& input,
-                                   bool cap_next_letter) {
-  std::string result;
-  // Note:  I distrust ctype.h due to locales.
-  for (int i = 0; i < input.size(); i++) {
-    if ('a' <= input[i] && input[i] <= 'z') {
-      if (cap_next_letter) {
-        result += input[i] + ('A' - 'a');
-      } else {
-        result += input[i];
-      }
-      cap_next_letter = false;
-    } else if ('A' <= input[i] && input[i] <= 'Z') {
-      // Capital letters are left as-is.
-      result += input[i];
-      cap_next_letter = false;
-    } else if ('0' <= input[i] && input[i] <= '9') {
-      result += input[i];
-      cap_next_letter = true;
-    } else {
-      cap_next_letter = true;
-    }
-  }
-  return result;
-}
-
-const char kThickSeparator[] =
-    "// ===================================================================\n";
-const char kThinSeparator[] =
-    "// -------------------------------------------------------------------\n";
-
-bool CanInitializeByZeroing(const FieldDescriptor* field) {
-  if (field->is_repeated() || field->is_extension()) return false;
-  switch (field->cpp_type()) {
-    case FieldDescriptor::CPPTYPE_ENUM:
-      return field->default_value_enum()->number() == 0;
-    case FieldDescriptor::CPPTYPE_INT32:
-      return field->default_value_int32() == 0;
-    case FieldDescriptor::CPPTYPE_INT64:
-      return field->default_value_int64() == 0;
-    case FieldDescriptor::CPPTYPE_UINT32:
-      return field->default_value_uint32() == 0;
-    case FieldDescriptor::CPPTYPE_UINT64:
-      return field->default_value_uint64() == 0;
-    case FieldDescriptor::CPPTYPE_FLOAT:
-      return field->default_value_float() == 0;
-    case FieldDescriptor::CPPTYPE_DOUBLE:
-      return field->default_value_double() == 0;
-    case FieldDescriptor::CPPTYPE_BOOL:
-      return field->default_value_bool() == false;
-    default:
-      return false;
-  }
-}
-
-std::string ClassName(const Descriptor* descriptor) {
-  const Descriptor* parent = descriptor->containing_type();
-  std::string res;
-  if (parent) res += ClassName(parent) + "_";
-  res += descriptor->name();
-  if (IsMapEntryMessage(descriptor)) res += "_DoNotUse";
-  return ResolveKeyword(res);
-}
-
-std::string ClassName(const EnumDescriptor* enum_descriptor) {
-  if (enum_descriptor->containing_type() == nullptr) {
-    return ResolveKeyword(enum_descriptor->name());
-  } else {
-    return ClassName(enum_descriptor->containing_type()) + "_" +
-           enum_descriptor->name();
-  }
-}
-
-std::string QualifiedClassName(const Descriptor* d, const Options& options) {
-  return QualifiedFileLevelSymbol(d->file(), ClassName(d), options);
-}
-
-std::string QualifiedClassName(const EnumDescriptor* d,
-                               const Options& options) {
-  return QualifiedFileLevelSymbol(d->file(), ClassName(d), options);
-}
-
-std::string QualifiedClassName(const Descriptor* d) {
-  return QualifiedClassName(d, Options());
-}
-
-std::string QualifiedClassName(const EnumDescriptor* d) {
-  return QualifiedClassName(d, Options());
-}
-
-std::string ExtensionName(const FieldDescriptor* d) {
-  if (const Descriptor* scope = d->extension_scope())
-    return StrCat(ClassName(scope), "::", ResolveKeyword(d->name()));
-  return ResolveKeyword(d->name());
-}
-
-std::string QualifiedExtensionName(const FieldDescriptor* d,
-                                   const Options& options) {
-  GOOGLE_DCHECK(d->is_extension());
-  return QualifiedFileLevelSymbol(d->file(), ExtensionName(d), options);
-}
-
-std::string QualifiedExtensionName(const FieldDescriptor* d) {
-  return QualifiedExtensionName(d, Options());
-}
-
-std::string Namespace(const std::string& package) {
-  if (package.empty()) return "";
-  return "::" + DotsToColons(package);
-}
-
-std::string Namespace(const FileDescriptor* d, const Options& options) {
-  std::string ret = Namespace(d->package());
-  if (IsWellKnownMessage(d) && options.opensource_runtime) {
-    // Written with string concatenation to prevent rewriting of
-    // ::google::protobuf.
-    ret = StringReplace(ret,
-                        "::google::"
-                        "protobuf",
-                        "::PROTOBUF_NAMESPACE_ID", false);
-  }
-  return ret;
-}
-
-std::string Namespace(const Descriptor* d, const Options& options) {
-  return Namespace(d->file(), options);
-}
-
-std::string Namespace(const FieldDescriptor* d, const Options& options) {
-  return Namespace(d->file(), options);
-}
-
-std::string Namespace(const EnumDescriptor* d, const Options& options) {
-  return Namespace(d->file(), options);
-}
-
-std::string DefaultInstanceType(const Descriptor* descriptor,
-                                const Options& /*options*/, bool split) {
-  return ClassName(descriptor) + (split ? "__Impl_Split" : "") +
-         "DefaultTypeInternal";
-}
-
-std::string DefaultInstanceName(const Descriptor* descriptor,
-                                const Options& /*options*/, bool split) {
-  return "_" + ClassName(descriptor, false) + (split ? "__Impl_Split" : "") +
-         "_default_instance_";
-}
-
-std::string DefaultInstancePtr(const Descriptor* descriptor,
-                               const Options& options, bool split) {
-  return DefaultInstanceName(descriptor, options, split) + "ptr_";
-}
-
-std::string QualifiedDefaultInstanceName(const Descriptor* descriptor,
-                                         const Options& options, bool split) {
-  return QualifiedFileLevelSymbol(
-      descriptor->file(), DefaultInstanceName(descriptor, options, split),
-      options);
-}
-
-std::string QualifiedDefaultInstancePtr(const Descriptor* descriptor,
-                                        const Options& options, bool split) {
-  return QualifiedDefaultInstanceName(descriptor, options, split) + "ptr_";
-}
-
-std::string DescriptorTableName(const FileDescriptor* file,
-                                const Options& options) {
-  return UniqueName("descriptor_table", file, options);
-}
-
-std::string FileDllExport(const FileDescriptor* file, const Options& options) {
-  return UniqueName("PROTOBUF_INTERNAL_EXPORT", file, options);
-}
-
-std::string SuperClassName(const Descriptor* descriptor,
-                           const Options& options) {
-  if (!HasDescriptorMethods(descriptor->file(), options)) {
-    return "::" + ProtobufNamespace(options) + "::MessageLite";
-  }
-  auto simple_base = SimpleBaseClass(descriptor, options);
-  if (simple_base.empty()) {
-    return "::" + ProtobufNamespace(options) + "::Message";
-  }
-  return "::" + ProtobufNamespace(options) + "::internal::" + simple_base;
-}
-
-std::string ResolveKeyword(const std::string& name) {
-  if (kKeywords.count(name) > 0) {
-    return name + "_";
-  }
-  return name;
-}
-
-std::string FieldName(const FieldDescriptor* field) {
-  std::string result = field->name();
-  LowerString(&result);
-  if (kKeywords.count(result) > 0) {
-    result.append("_");
-  }
-  return result;
-}
-
-std::string FieldMemberName(const FieldDescriptor* field, bool split) {
-  StringPiece prefix =
-      IsMapEntryMessage(field->containing_type()) ? "" : "_impl_.";
-  StringPiece split_prefix = split ? "_split_->" : "";
-  if (field->real_containing_oneof() == nullptr) {
-    return StrCat(prefix, split_prefix, FieldName(field), "_");
-  }
-  // Oneof fields are never split.
-  GOOGLE_CHECK(!split);
-  return StrCat(prefix, field->containing_oneof()->name(), "_.",
-                      FieldName(field), "_");
-}
-
-std::string OneofCaseConstantName(const FieldDescriptor* field) {
-  GOOGLE_DCHECK(field->containing_oneof());
-  std::string field_name = UnderscoresToCamelCase(field->name(), true);
-  return "k" + field_name;
-}
-
-std::string QualifiedOneofCaseConstantName(const FieldDescriptor* field) {
-  GOOGLE_DCHECK(field->containing_oneof());
-  const std::string qualification =
-      QualifiedClassName(field->containing_type());
-  return StrCat(qualification, "::", OneofCaseConstantName(field));
-}
-
-std::string EnumValueName(const EnumValueDescriptor* enum_value) {
-  std::string result = enum_value->name();
-  if (kKeywords.count(result) > 0) {
-    result.append("_");
-  }
-  return result;
-}
-
-int EstimateAlignmentSize(const FieldDescriptor* field) {
-  if (field == nullptr) return 0;
-  if (field->is_repeated()) return 8;
-  switch (field->cpp_type()) {
-    case FieldDescriptor::CPPTYPE_BOOL:
-      return 1;
-
-    case FieldDescriptor::CPPTYPE_INT32:
-    case FieldDescriptor::CPPTYPE_UINT32:
-    case FieldDescriptor::CPPTYPE_ENUM:
-    case FieldDescriptor::CPPTYPE_FLOAT:
-      return 4;
-
-    case FieldDescriptor::CPPTYPE_INT64:
-    case FieldDescriptor::CPPTYPE_UINT64:
-    case FieldDescriptor::CPPTYPE_DOUBLE:
-    case FieldDescriptor::CPPTYPE_STRING:
-    case FieldDescriptor::CPPTYPE_MESSAGE:
-      return 8;
-  }
-  GOOGLE_LOG(FATAL) << "Can't get here.";
-  return -1;  // Make compiler happy.
-}
-
-std::string FieldConstantName(const FieldDescriptor* field) {
-  std::string field_name = UnderscoresToCamelCase(field->name(), true);
-  std::string result = "k" + field_name + "FieldNumber";
-
-  if (!field->is_extension() &&
-      field->containing_type()->FindFieldByCamelcaseName(
-          field->camelcase_name()) != field) {
-    // This field's camelcase name is not unique.  As a hack, add the field
-    // number to the constant name.  This makes the constant rather useless,
-    // but what can we do?
-    result += "_" + StrCat(field->number());
-  }
-
-  return result;
-}
-
-std::string FieldMessageTypeName(const FieldDescriptor* field,
-                                 const Options& options) {
-  // Note:  The Google-internal version of Protocol Buffers uses this function
-  //   as a hook point for hacks to support legacy code.
-  return QualifiedClassName(field->message_type(), options);
-}
-
-std::string StripProto(const std::string& filename) {
-  /*
-   * TODO(github/georgthegreat) remove this proxy method
-   * once Google's internal codebase will become ready
-   */
-  return compiler::StripProto(filename);
-}
-
-const char* PrimitiveTypeName(FieldDescriptor::CppType type) {
-  switch (type) {
-    case FieldDescriptor::CPPTYPE_INT32:
-      return "int32_t";
-    case FieldDescriptor::CPPTYPE_INT64:
-      return "int64_t";
-    case FieldDescriptor::CPPTYPE_UINT32:
-      return "uint32_t";
-    case FieldDescriptor::CPPTYPE_UINT64:
-      return "uint64_t";
-    case FieldDescriptor::CPPTYPE_DOUBLE:
-      return "double";
-    case FieldDescriptor::CPPTYPE_FLOAT:
-      return "float";
-    case FieldDescriptor::CPPTYPE_BOOL:
-      return "bool";
-    case FieldDescriptor::CPPTYPE_ENUM:
-      return "int";
-    case FieldDescriptor::CPPTYPE_STRING:
-      return "std::string";
-    case FieldDescriptor::CPPTYPE_MESSAGE:
-      return nullptr;
-
-      // No default because we want the compiler to complain if any new
-      // CppTypes are added.
-  }
-
-  GOOGLE_LOG(FATAL) << "Can't get here.";
-  return nullptr;
-}
-
-std::string PrimitiveTypeName(const Options& options,
-                              FieldDescriptor::CppType type) {
-  switch (type) {
-    case FieldDescriptor::CPPTYPE_INT32:
-      return IntTypeName(options, "int32");
-    case FieldDescriptor::CPPTYPE_INT64:
-      return IntTypeName(options, "int64");
-    case FieldDescriptor::CPPTYPE_UINT32:
-      return IntTypeName(options, "uint32");
-    case FieldDescriptor::CPPTYPE_UINT64:
-      return IntTypeName(options, "uint64");
-    case FieldDescriptor::CPPTYPE_DOUBLE:
-      return "double";
-    case FieldDescriptor::CPPTYPE_FLOAT:
-      return "float";
-    case FieldDescriptor::CPPTYPE_BOOL:
-      return "bool";
-    case FieldDescriptor::CPPTYPE_ENUM:
-      return "int";
-    case FieldDescriptor::CPPTYPE_STRING:
-      return "std::string";
-    case FieldDescriptor::CPPTYPE_MESSAGE:
-      return "";
-
-      // No default because we want the compiler to complain if any new
-      // CppTypes are added.
-  }
-
-  GOOGLE_LOG(FATAL) << "Can't get here.";
-  return "";
-}
-
-const char* DeclaredTypeMethodName(FieldDescriptor::Type type) {
-  switch (type) {
-    case FieldDescriptor::TYPE_INT32:
-      return "Int32";
-    case FieldDescriptor::TYPE_INT64:
-      return "Int64";
-    case FieldDescriptor::TYPE_UINT32:
-      return "UInt32";
-    case FieldDescriptor::TYPE_UINT64:
-      return "UInt64";
-    case FieldDescriptor::TYPE_SINT32:
-      return "SInt32";
-    case FieldDescriptor::TYPE_SINT64:
-      return "SInt64";
-    case FieldDescriptor::TYPE_FIXED32:
-      return "Fixed32";
-    case FieldDescriptor::TYPE_FIXED64:
-      return "Fixed64";
-    case FieldDescriptor::TYPE_SFIXED32:
-      return "SFixed32";
-    case FieldDescriptor::TYPE_SFIXED64:
-      return "SFixed64";
-    case FieldDescriptor::TYPE_FLOAT:
-      return "Float";
-    case FieldDescriptor::TYPE_DOUBLE:
-      return "Double";
-
-    case FieldDescriptor::TYPE_BOOL:
-      return "Bool";
-    case FieldDescriptor::TYPE_ENUM:
-      return "Enum";
-
-    case FieldDescriptor::TYPE_STRING:
-      return "String";
-    case FieldDescriptor::TYPE_BYTES:
-      return "Bytes";
-    case FieldDescriptor::TYPE_GROUP:
-      return "Group";
-    case FieldDescriptor::TYPE_MESSAGE:
-      return "Message";
-
-      // No default because we want the compiler to complain if any new
-      // types are added.
-  }
-  GOOGLE_LOG(FATAL) << "Can't get here.";
-  return "";
-}
-
-std::string Int32ToString(int number) {
-  if (number == std::numeric_limits<int32_t>::min()) {
-    // This needs to be special-cased, see explanation here:
-    // https://gcc.gnu.org/bugzilla/show_bug.cgi?id=52661
-    return StrCat(number + 1, " - 1");
-  } else {
-    return StrCat(number);
-  }
-}
-
-static std::string Int64ToString(int64_t number) {
-  if (number == std::numeric_limits<int64_t>::min()) {
-    // This needs to be special-cased, see explanation here:
-    // https://gcc.gnu.org/bugzilla/show_bug.cgi?id=52661
-    return StrCat("int64_t{", number + 1, "} - 1");
-  }
-  return StrCat("int64_t{", number, "}");
-}
-
-static std::string UInt64ToString(uint64_t number) {
-  return StrCat("uint64_t{", number, "u}");
-}
-
-std::string DefaultValue(const FieldDescriptor* field) {
-  return DefaultValue(Options(), field);
-}
-
-std::string DefaultValue(const Options& options, const FieldDescriptor* field) {
-  switch (field->cpp_type()) {
-    case FieldDescriptor::CPPTYPE_INT32:
-      return Int32ToString(field->default_value_int32());
-    case FieldDescriptor::CPPTYPE_UINT32:
-      return StrCat(field->default_value_uint32()) + "u";
-    case FieldDescriptor::CPPTYPE_INT64:
-      return Int64ToString(field->default_value_int64());
-    case FieldDescriptor::CPPTYPE_UINT64:
-      return UInt64ToString(field->default_value_uint64());
-    case FieldDescriptor::CPPTYPE_DOUBLE: {
-      double value = field->default_value_double();
-      if (value == std::numeric_limits<double>::infinity()) {
-        return "std::numeric_limits<double>::infinity()";
-      } else if (value == -std::numeric_limits<double>::infinity()) {
-        return "-std::numeric_limits<double>::infinity()";
-      } else if (value != value) {
-        return "std::numeric_limits<double>::quiet_NaN()";
-      } else {
-        return SimpleDtoa(value);
-      }
-    }
-    case FieldDescriptor::CPPTYPE_FLOAT: {
-      float value = field->default_value_float();
-      if (value == std::numeric_limits<float>::infinity()) {
-        return "std::numeric_limits<float>::infinity()";
-      } else if (value == -std::numeric_limits<float>::infinity()) {
-        return "-std::numeric_limits<float>::infinity()";
-      } else if (value != value) {
-        return "std::numeric_limits<float>::quiet_NaN()";
-      } else {
-        std::string float_value = SimpleFtoa(value);
-        // If floating point value contains a period (.) or an exponent
-        // (either E or e), then append suffix 'f' to make it a float
-        // literal.
-        if (float_value.find_first_of(".eE") != std::string::npos) {
-          float_value.push_back('f');
-        }
-        return float_value;
-      }
-    }
-    case FieldDescriptor::CPPTYPE_BOOL:
-      return field->default_value_bool() ? "true" : "false";
-    case FieldDescriptor::CPPTYPE_ENUM:
-      // Lazy:  Generate a static_cast because we don't have a helper function
-      //   that constructs the full name of an enum value.
-      return strings::Substitute(
-          "static_cast< $0 >($1)", ClassName(field->enum_type(), true),
-          Int32ToString(field->default_value_enum()->number()));
-    case FieldDescriptor::CPPTYPE_STRING:
-      return "\"" +
-             EscapeTrigraphs(CEscape(field->default_value_string())) +
-             "\"";
-    case FieldDescriptor::CPPTYPE_MESSAGE:
-      return "*" + FieldMessageTypeName(field, options) +
-             "::internal_default_instance()";
-  }
-  // Can't actually get here; make compiler happy.  (We could add a default
-  // case above but then we wouldn't get the nice compiler warning when a
-  // new type is added.)
-  GOOGLE_LOG(FATAL) << "Can't get here.";
-  return "";
-}
-
-// Convert a file name into a valid identifier.
-std::string FilenameIdentifier(const std::string& filename) {
-  std::string result;
-  for (int i = 0; i < filename.size(); i++) {
-    if (ascii_isalnum(filename[i])) {
-      result.push_back(filename[i]);
-    } else {
-      // Not alphanumeric.  To avoid any possibility of name conflicts we
-      // use the hex code for the character.
-      StrAppend(&result, "_",
-                      strings::Hex(static_cast<uint8_t>(filename[i])));
-    }
-  }
-  return result;
-}
-
-std::string UniqueName(const std::string& name, const std::string& filename,
-                       const Options& options) {
-  return name + "_" + FilenameIdentifier(filename);
-}
-
-// Return the qualified C++ name for a file level symbol.
-std::string QualifiedFileLevelSymbol(const FileDescriptor* file,
-                                     const std::string& name,
-                                     const Options& options) {
-  if (file->package().empty()) {
-    return StrCat("::", name);
-  }
-  return StrCat(Namespace(file, options), "::", name);
-}
-
-// Escape C++ trigraphs by escaping question marks to \?
-std::string EscapeTrigraphs(const std::string& to_escape) {
-  return StringReplace(to_escape, "?", "\\?", true);
-}
-
-// Escaped function name to eliminate naming conflict.
-std::string SafeFunctionName(const Descriptor* descriptor,
-                             const FieldDescriptor* field,
-                             const std::string& prefix) {
-  // Do not use FieldName() since it will escape keywords.
-  std::string name = field->name();
-  LowerString(&name);
-  std::string function_name = prefix + name;
-  if (descriptor->FindFieldByName(function_name)) {
-    // Single underscore will also make it conflicting with the private data
-    // member. We use double underscore to escape function names.
-    function_name.append("__");
-  } else if (kKeywords.count(name) > 0) {
-    // If the field name is a keyword, we append the underscore back to keep it
-    // consistent with other function names.
-    function_name.append("_");
-  }
-  return function_name;
-}
-
-bool IsStringInlined(const FieldDescriptor* descriptor,
-                     const Options& options) {
-  (void)descriptor;
-  (void)options;
-  return false;
-}
-
-static bool HasLazyFields(const Descriptor* descriptor, const Options& options,
-                          MessageSCCAnalyzer* scc_analyzer) {
-  for (int field_idx = 0; field_idx < descriptor->field_count(); field_idx++) {
-    if (IsLazy(descriptor->field(field_idx), options, scc_analyzer)) {
-      return true;
-    }
-  }
-  for (int idx = 0; idx < descriptor->extension_count(); idx++) {
-    if (IsLazy(descriptor->extension(idx), options, scc_analyzer)) {
-      return true;
-    }
-  }
-  for (int idx = 0; idx < descriptor->nested_type_count(); idx++) {
-    if (HasLazyFields(descriptor->nested_type(idx), options, scc_analyzer)) {
-      return true;
-    }
-  }
-  return false;
-}
-
-// Does the given FileDescriptor use lazy fields?
-bool HasLazyFields(const FileDescriptor* file, const Options& options,
-                   MessageSCCAnalyzer* scc_analyzer) {
-  for (int i = 0; i < file->message_type_count(); i++) {
-    const Descriptor* descriptor(file->message_type(i));
-    if (HasLazyFields(descriptor, options, scc_analyzer)) {
-      return true;
-    }
-  }
-  for (int field_idx = 0; field_idx < file->extension_count(); field_idx++) {
-    if (IsLazy(file->extension(field_idx), options, scc_analyzer)) {
-      return true;
-    }
-  }
-  return false;
-}
-
-bool ShouldSplit(const Descriptor*, const Options&) { return false; }
-bool ShouldSplit(const FieldDescriptor*, const Options&) { return false; }
-
-static bool HasRepeatedFields(const Descriptor* descriptor) {
-  for (int i = 0; i < descriptor->field_count(); ++i) {
-    if (descriptor->field(i)->label() == FieldDescriptor::LABEL_REPEATED) {
-      return true;
-    }
-  }
-  for (int i = 0; i < descriptor->nested_type_count(); ++i) {
-    if (HasRepeatedFields(descriptor->nested_type(i))) return true;
-  }
-  return false;
-}
-
-bool HasRepeatedFields(const FileDescriptor* file) {
-  for (int i = 0; i < file->message_type_count(); ++i) {
-    if (HasRepeatedFields(file->message_type(i))) return true;
-  }
-  return false;
-}
-
-static bool IsStringPieceField(const FieldDescriptor* field,
-                               const Options& options) {
-  return field->cpp_type() == FieldDescriptor::CPPTYPE_STRING &&
-         EffectiveStringCType(field, options) == FieldOptions::STRING_PIECE;
-}
-
-static bool HasStringPieceFields(const Descriptor* descriptor,
-                                 const Options& options) {
-  for (int i = 0; i < descriptor->field_count(); ++i) {
-    if (IsStringPieceField(descriptor->field(i), options)) return true;
-  }
-  for (int i = 0; i < descriptor->nested_type_count(); ++i) {
-    if (HasStringPieceFields(descriptor->nested_type(i), options)) return true;
-  }
-  return false;
-}
-
-bool HasStringPieceFields(const FileDescriptor* file, const Options& options) {
-  for (int i = 0; i < file->message_type_count(); ++i) {
-    if (HasStringPieceFields(file->message_type(i), options)) return true;
-  }
-  return false;
-}
-
-static bool IsCordField(const FieldDescriptor* field, const Options& options) {
-  return field->cpp_type() == FieldDescriptor::CPPTYPE_STRING &&
-         EffectiveStringCType(field, options) == FieldOptions::CORD;
-}
-
-static bool HasCordFields(const Descriptor* descriptor,
-                          const Options& options) {
-  for (int i = 0; i < descriptor->field_count(); ++i) {
-    if (IsCordField(descriptor->field(i), options)) return true;
-  }
-  for (int i = 0; i < descriptor->nested_type_count(); ++i) {
-    if (HasCordFields(descriptor->nested_type(i), options)) return true;
-  }
-  return false;
-}
-
-bool HasCordFields(const FileDescriptor* file, const Options& options) {
-  for (int i = 0; i < file->message_type_count(); ++i) {
-    if (HasCordFields(file->message_type(i), options)) return true;
-  }
-  return false;
-}
-
-static bool HasExtensionsOrExtendableMessage(const Descriptor* descriptor) {
-  if (descriptor->extension_range_count() > 0) return true;
-  if (descriptor->extension_count() > 0) return true;
-  for (int i = 0; i < descriptor->nested_type_count(); ++i) {
-    if (HasExtensionsOrExtendableMessage(descriptor->nested_type(i))) {
-      return true;
-    }
-  }
-  return false;
-}
-
-bool HasExtensionsOrExtendableMessage(const FileDescriptor* file) {
-  if (file->extension_count() > 0) return true;
-  for (int i = 0; i < file->message_type_count(); ++i) {
-    if (HasExtensionsOrExtendableMessage(file->message_type(i))) return true;
-  }
-  return false;
-}
-
-static bool HasMapFields(const Descriptor* descriptor) {
-  for (int i = 0; i < descriptor->field_count(); ++i) {
-    if (descriptor->field(i)->is_map()) {
-      return true;
-    }
-  }
-  for (int i = 0; i < descriptor->nested_type_count(); ++i) {
-    if (HasMapFields(descriptor->nested_type(i))) return true;
-  }
-  return false;
-}
-
-bool HasMapFields(const FileDescriptor* file) {
-  for (int i = 0; i < file->message_type_count(); ++i) {
-    if (HasMapFields(file->message_type(i))) return true;
-  }
-  return false;
-}
-
-static bool HasEnumDefinitions(const Descriptor* message_type) {
-  if (message_type->enum_type_count() > 0) return true;
-  for (int i = 0; i < message_type->nested_type_count(); ++i) {
-    if (HasEnumDefinitions(message_type->nested_type(i))) return true;
-  }
-  return false;
-}
-
-bool HasEnumDefinitions(const FileDescriptor* file) {
-  if (file->enum_type_count() > 0) return true;
-  for (int i = 0; i < file->message_type_count(); ++i) {
-    if (HasEnumDefinitions(file->message_type(i))) return true;
-  }
-  return false;
-}
-
-bool ShouldVerify(const Descriptor* descriptor, const Options& options,
-                  MessageSCCAnalyzer* scc_analyzer) {
-  (void)descriptor;
-  (void)options;
-  (void)scc_analyzer;
-  return false;
-}
-
-bool ShouldVerify(const FileDescriptor* file, const Options& options,
-                  MessageSCCAnalyzer* scc_analyzer) {
-  (void)file;
-  (void)options;
-  (void)scc_analyzer;
-  return false;
-}
-
-bool IsUtf8String(const FieldDescriptor* field) {
-  return IsProto3(field->file()) &&
-      field->type() == FieldDescriptor::TYPE_STRING;
-}
-
-VerifySimpleType ShouldVerifySimple(const Descriptor* descriptor) {
-  (void)descriptor;
-  return VerifySimpleType::kCustom;
-}
-
-bool IsStringOrMessage(const FieldDescriptor* field) {
-  switch (field->cpp_type()) {
-    case FieldDescriptor::CPPTYPE_INT32:
-    case FieldDescriptor::CPPTYPE_INT64:
-    case FieldDescriptor::CPPTYPE_UINT32:
-    case FieldDescriptor::CPPTYPE_UINT64:
-    case FieldDescriptor::CPPTYPE_DOUBLE:
-    case FieldDescriptor::CPPTYPE_FLOAT:
-    case FieldDescriptor::CPPTYPE_BOOL:
-    case FieldDescriptor::CPPTYPE_ENUM:
-      return false;
-    case FieldDescriptor::CPPTYPE_STRING:
-    case FieldDescriptor::CPPTYPE_MESSAGE:
-      return true;
-  }
-
-  GOOGLE_LOG(FATAL) << "Can't get here.";
-  return false;
-}
-
-FieldOptions::CType EffectiveStringCType(const FieldDescriptor* field,
-                                         const Options& options) {
-  GOOGLE_DCHECK(field->cpp_type() == FieldDescriptor::CPPTYPE_STRING);
-  if (options.opensource_runtime) {
-    // Open-source protobuf release only supports STRING ctype.
-    return FieldOptions::STRING;
-  } else {
-    // Google-internal supports all ctypes.
-    return field->options().ctype();
-  }
-}
-
-bool IsAnyMessage(const FileDescriptor* descriptor, const Options& options) {
-  return descriptor->name() == kAnyProtoFile;
-}
-
-bool IsAnyMessage(const Descriptor* descriptor, const Options& options) {
-  return descriptor->name() == kAnyMessageName &&
-         IsAnyMessage(descriptor->file(), options);
-}
-
-bool IsWellKnownMessage(const FileDescriptor* file) {
-  static const std::unordered_set<std::string> well_known_files{
-      "google/protobuf/any.proto",
-      "google/protobuf/api.proto",
-      "google/protobuf/compiler/plugin.proto",
-      "google/protobuf/descriptor.proto",
-      "google/protobuf/duration.proto",
-      "google/protobuf/empty.proto",
-      "google/protobuf/field_mask.proto",
-      "google/protobuf/source_context.proto",
-      "google/protobuf/struct.proto",
-      "google/protobuf/timestamp.proto",
-      "google/protobuf/type.proto",
-      "google/protobuf/wrappers.proto",
-  };
-  return well_known_files.find(file->name()) != well_known_files.end();
-}
-
-static bool FieldEnforceUtf8(const FieldDescriptor* field,
-                             const Options& options) {
-  return true;
-}
-
-static bool FileUtf8Verification(const FileDescriptor* file,
-                                 const Options& options) {
-  return true;
-}
-
-// Which level of UTF-8 enforcemant is placed on this file.
-Utf8CheckMode GetUtf8CheckMode(const FieldDescriptor* field,
-                               const Options& options) {
-  if (field->file()->syntax() == FileDescriptor::SYNTAX_PROTO3 &&
-      FieldEnforceUtf8(field, options)) {
-    return Utf8CheckMode::kStrict;
-  } else if (GetOptimizeFor(field->file(), options) !=
-                 FileOptions::LITE_RUNTIME &&
-             FileUtf8Verification(field->file(), options)) {
-    return Utf8CheckMode::kVerify;
-  } else {
-    return Utf8CheckMode::kNone;
-  }
-}
-
-static void GenerateUtf8CheckCode(const FieldDescriptor* field,
-                                  const Options& options, bool for_parse,
-                                  const char* parameters,
-                                  const char* strict_function,
-                                  const char* verify_function,
-                                  const Formatter& format) {
-  switch (GetUtf8CheckMode(field, options)) {
-    case Utf8CheckMode::kStrict: {
-      if (for_parse) {
-        format("DO_(");
-      }
-      format("::$proto_ns$::internal::WireFormatLite::$1$(\n", strict_function);
-      format.Indent();
-      format(parameters);
-      if (for_parse) {
-        format("::$proto_ns$::internal::WireFormatLite::PARSE,\n");
-      } else {
-        format("::$proto_ns$::internal::WireFormatLite::SERIALIZE,\n");
-      }
-      format("\"$1$\")", field->full_name());
-      if (for_parse) {
-        format(")");
-      }
-      format(";\n");
-      format.Outdent();
-      break;
-    }
-    case Utf8CheckMode::kVerify: {
-      format("::$proto_ns$::internal::WireFormat::$1$(\n", verify_function);
-      format.Indent();
-      format(parameters);
-      if (for_parse) {
-        format("::$proto_ns$::internal::WireFormat::PARSE,\n");
-      } else {
-        format("::$proto_ns$::internal::WireFormat::SERIALIZE,\n");
-      }
-      format("\"$1$\");\n", field->full_name());
-      format.Outdent();
-      break;
-    }
-    case Utf8CheckMode::kNone:
-      break;
-  }
-}
-
-void GenerateUtf8CheckCodeForString(const FieldDescriptor* field,
-                                    const Options& options, bool for_parse,
-                                    const char* parameters,
-                                    const Formatter& format) {
-  GenerateUtf8CheckCode(field, options, for_parse, parameters,
-                        "VerifyUtf8String", "VerifyUTF8StringNamedField",
-                        format);
-}
-
-void GenerateUtf8CheckCodeForCord(const FieldDescriptor* field,
-                                  const Options& options, bool for_parse,
-                                  const char* parameters,
-                                  const Formatter& format) {
-  GenerateUtf8CheckCode(field, options, for_parse, parameters, "VerifyUtf8Cord",
-                        "VerifyUTF8CordNamedField", format);
-}
-
-void FlattenMessagesInFile(const FileDescriptor* file,
-                           std::vector<const Descriptor*>* result) {
-  for (int i = 0; i < file->message_type_count(); i++) {
-    ForEachMessage(file->message_type(i), [&](const Descriptor* descriptor) {
-      result->push_back(descriptor);
-    });
-  }
-}
-
-bool HasWeakFields(const Descriptor* descriptor, const Options& options) {
-  for (int i = 0; i < descriptor->field_count(); i++) {
-    if (IsWeak(descriptor->field(i), options)) return true;
-  }
-  return false;
-}
-
-bool HasWeakFields(const FileDescriptor* file, const Options& options) {
-  for (int i = 0; i < file->message_type_count(); ++i) {
-    if (HasWeakFields(file->message_type(i), options)) return true;
-  }
-  return false;
-}
-
-bool UsingImplicitWeakFields(const FileDescriptor* file,
-                             const Options& options) {
-  return options.lite_implicit_weak_fields &&
-         GetOptimizeFor(file, options) == FileOptions::LITE_RUNTIME;
-}
-
-bool IsImplicitWeakField(const FieldDescriptor* field, const Options& options,
-                         MessageSCCAnalyzer* scc_analyzer) {
-  return UsingImplicitWeakFields(field->file(), options) &&
-         field->type() == FieldDescriptor::TYPE_MESSAGE &&
-         !field->is_required() && !field->is_map() && !field->is_extension() &&
-         !IsWellKnownMessage(field->message_type()->file()) &&
-         field->message_type()->file()->name() !=
-             "net/proto2/proto/descriptor.proto" &&
-         // We do not support implicit weak fields between messages in the same
-         // strongly-connected component.
-         scc_analyzer->GetSCC(field->containing_type()) !=
-             scc_analyzer->GetSCC(field->message_type());
-}
-
-MessageAnalysis MessageSCCAnalyzer::GetSCCAnalysis(const SCC* scc) {
-  if (analysis_cache_.count(scc)) return analysis_cache_[scc];
-  MessageAnalysis result;
-  if (UsingImplicitWeakFields(scc->GetFile(), options_)) {
-    result.contains_weak = true;
-  }
-  for (int i = 0; i < scc->descriptors.size(); i++) {
-    const Descriptor* descriptor = scc->descriptors[i];
-    if (descriptor->extension_range_count() > 0) {
-      result.contains_extension = true;
-    }
-    for (int j = 0; j < descriptor->field_count(); j++) {
-      const FieldDescriptor* field = descriptor->field(j);
-      if (field->is_required()) {
-        result.contains_required = true;
-      }
-      if (field->options().weak()) {
-        result.contains_weak = true;
-      }
-      switch (field->type()) {
-        case FieldDescriptor::TYPE_STRING:
-        case FieldDescriptor::TYPE_BYTES: {
-          if (field->options().ctype() == FieldOptions::CORD) {
-            result.contains_cord = true;
-          }
-          break;
-        }
-        case FieldDescriptor::TYPE_GROUP:
-        case FieldDescriptor::TYPE_MESSAGE: {
-          const SCC* child = analyzer_.GetSCC(field->message_type());
-          if (child != scc) {
-            MessageAnalysis analysis = GetSCCAnalysis(child);
-            result.contains_cord |= analysis.contains_cord;
-            result.contains_extension |= analysis.contains_extension;
-            if (!ShouldIgnoreRequiredFieldCheck(field, options_)) {
-              result.contains_required |= analysis.contains_required;
-            }
-            result.contains_weak |= analysis.contains_weak;
-          } else {
-            // This field points back into the same SCC hence the messages
-            // in the SCC are recursive. Note if SCC contains more than two
-            // nodes it has to be recursive, however this test also works for
-            // a single node that is recursive.
-            result.is_recursive = true;
-          }
-          break;
-        }
-        default:
-          break;
-      }
-    }
-  }
-  // We deliberately only insert the result here. After we contracted the SCC
-  // in the graph, the graph should be a DAG. Hence we shouldn't need to mark
-  // nodes visited as we can never return to them. By inserting them here
-  // we will go in an infinite loop if the SCC is not correct.
-  return analysis_cache_[scc] = result;
-}
-
-void ListAllFields(const Descriptor* d,
-                   std::vector<const FieldDescriptor*>* fields) {
-  // Collect sub messages
-  for (int i = 0; i < d->nested_type_count(); i++) {
-    ListAllFields(d->nested_type(i), fields);
-  }
-  // Collect message level extensions.
-  for (int i = 0; i < d->extension_count(); i++) {
-    fields->push_back(d->extension(i));
-  }
-  // Add types of fields necessary
-  for (int i = 0; i < d->field_count(); i++) {
-    fields->push_back(d->field(i));
-  }
-}
-
-void ListAllFields(const FileDescriptor* d,
-                   std::vector<const FieldDescriptor*>* fields) {
-  // Collect file level message.
-  for (int i = 0; i < d->message_type_count(); i++) {
-    ListAllFields(d->message_type(i), fields);
-  }
-  // Collect message level extensions.
-  for (int i = 0; i < d->extension_count(); i++) {
-    fields->push_back(d->extension(i));
-  }
-}
-
-void ListAllTypesForServices(const FileDescriptor* fd,
-                             std::vector<const Descriptor*>* types) {
-  for (int i = 0; i < fd->service_count(); i++) {
-    const ServiceDescriptor* sd = fd->service(i);
-    for (int j = 0; j < sd->method_count(); j++) {
-      const MethodDescriptor* method = sd->method(j);
-      types->push_back(method->input_type());
-      types->push_back(method->output_type());
-    }
-  }
-}
-
-bool GetBootstrapBasename(const Options& options, const std::string& basename,
-                          std::string* bootstrap_basename) {
-  if (options.opensource_runtime) {
-    return false;
-  }
-
-  std::unordered_map<std::string, std::string> bootstrap_mapping{
-      {"net/proto2/proto/descriptor",
-       "third_party/protobuf/descriptor"},
-      {"net/proto2/compiler/proto/plugin",
-       "net/proto2/compiler/proto/plugin"},
-      {"net/proto2/compiler/proto/profile",
-       "net/proto2/compiler/proto/profile_bootstrap"},
-  };
-  auto iter = bootstrap_mapping.find(basename);
-  if (iter == bootstrap_mapping.end()) {
-    *bootstrap_basename = basename;
-    return false;
-  } else {
-    *bootstrap_basename = iter->second;
-    return true;
-  }
-}
-
-bool IsBootstrapProto(const Options& options, const FileDescriptor* file) {
-  std::string my_name = StripProto(file->name());
-  return GetBootstrapBasename(options, my_name, &my_name);
-}
-
-bool MaybeBootstrap(const Options& options, GeneratorContext* generator_context,
-                    bool bootstrap_flag, std::string* basename) {
-  std::string bootstrap_basename;
-  if (!GetBootstrapBasename(options, *basename, &bootstrap_basename)) {
-    return false;
-  }
-
-  if (bootstrap_flag) {
-    // Adjust basename, but don't abort code generation.
-    *basename = bootstrap_basename;
-    return false;
-  } else {
-    const std::string& forward_to_basename = bootstrap_basename;
-
-    // Generate forwarding headers and empty .pb.cc.
-    {
-      std::unique_ptr<io::ZeroCopyOutputStream> output(
-          generator_context->Open(*basename + ".pb.h"));
-      io::Printer printer(output.get(), '$', nullptr);
-      printer.Print(
-          "#ifndef PROTOBUF_INCLUDED_$filename_identifier$_FORWARD_PB_H\n"
-          "#define PROTOBUF_INCLUDED_$filename_identifier$_FORWARD_PB_H\n"
-          "#include \"$forward_to_basename$.pb.h\"  // IWYU pragma: export\n"
-          "#endif  // PROTOBUF_INCLUDED_$filename_identifier$_FORWARD_PB_H\n",
-          "forward_to_basename", forward_to_basename, "filename_identifier",
-          FilenameIdentifier(*basename));
-
-      if (!options.opensource_runtime) {
-        // HACK HACK HACK, tech debt from the deeps of proto1 and SWIG
-        // protocoltype is SWIG'ed and we need to forward
-        if (*basename == "net/proto/protocoltype") {
-          printer.Print(
-              "#ifdef SWIG\n"
-              "%include \"$forward_to_basename$.pb.h\"\n"
-              "#endif  // SWIG\n",
-              "forward_to_basename", forward_to_basename);
-        }
-      }
-    }
-
-    {
-      std::unique_ptr<io::ZeroCopyOutputStream> output(
-          generator_context->Open(*basename + ".proto.h"));
-      io::Printer printer(output.get(), '$', nullptr);
-      printer.Print(
-          "#ifndef PROTOBUF_INCLUDED_$filename_identifier$_FORWARD_PROTO_H\n"
-          "#define PROTOBUF_INCLUDED_$filename_identifier$_FORWARD_PROTO_H\n"
-          "#include \"$forward_to_basename$.proto.h\"  // IWYU pragma: "
-          "export\n"
-          "#endif  // "
-          "PROTOBUF_INCLUDED_$filename_identifier$_FORWARD_PROTO_H\n",
-          "forward_to_basename", forward_to_basename, "filename_identifier",
-          FilenameIdentifier(*basename));
-    }
-
-    {
-      std::unique_ptr<io::ZeroCopyOutputStream> output(
-          generator_context->Open(*basename + ".pb.cc"));
-      io::Printer printer(output.get(), '$', nullptr);
-      printer.Print("\n");
-    }
-
-    {
-      std::unique_ptr<io::ZeroCopyOutputStream> output(
-          generator_context->Open(*basename + ".pb.h.meta"));
-    }
-
-    {
-      std::unique_ptr<io::ZeroCopyOutputStream> output(
-          generator_context->Open(*basename + ".proto.h.meta"));
-    }
-
-    // Abort code generation.
-    return true;
-  }
-}
-
-static bool HasExtensionFromFile(const Message& msg, const FileDescriptor* file,
-                                 const Options& options,
-                                 bool* has_opt_codesize_extension) {
-  std::vector<const FieldDescriptor*> fields;
-  auto reflection = msg.GetReflection();
-  reflection->ListFields(msg, &fields);
-  for (auto field : fields) {
-    const auto* field_msg = field->message_type();
-    if (field_msg == nullptr) {
-      // It so happens that enums Is_Valid are still generated so enums work.
-      // Only messages have potential problems.
-      continue;
-    }
-    // If this option has an extension set AND that extension is defined in the
-    // same file we have bootstrap problem.
-    if (field->is_extension()) {
-      const auto* msg_extension_file = field->message_type()->file();
-      if (msg_extension_file == file) return true;
-      if (has_opt_codesize_extension &&
-          GetOptimizeFor(msg_extension_file, options) ==
-              FileOptions::CODE_SIZE) {
-        *has_opt_codesize_extension = true;
-      }
-    }
-    // Recurse in this field to see if there is a problem in there
-    if (field->is_repeated()) {
-      for (int i = 0; i < reflection->FieldSize(msg, field); i++) {
-        if (HasExtensionFromFile(reflection->GetRepeatedMessage(msg, field, i),
-                                 file, options, has_opt_codesize_extension)) {
-          return true;
-        }
-      }
-    } else {
-      if (HasExtensionFromFile(reflection->GetMessage(msg, field), file,
-                               options, has_opt_codesize_extension)) {
-        return true;
-      }
-    }
-  }
-  return false;
-}
-
-static bool HasBootstrapProblem(const FileDescriptor* file,
-                                const Options& options,
-                                bool* has_opt_codesize_extension) {
-  static auto& cache = *new std::unordered_map<const FileDescriptor*, bool>;
-  auto it = cache.find(file);
-  if (it != cache.end()) return it->second;
-  // In order to build the data structures for the reflective parse, it needs
-  // to parse the serialized descriptor describing all the messages defined in
-  // this file. Obviously this presents a bootstrap problem for descriptor
-  // messages.
-  if (file->name() == "net/proto2/proto/descriptor.proto" ||
-      file->name() == "google/protobuf/descriptor.proto") {
-    return true;
-  }
-  // Unfortunately we're not done yet. The descriptor option messages allow
-  // for extensions. So we need to be able to parse these extensions in order
-  // to parse the file descriptor for a file that has custom options. This is a
-  // problem when these custom options extensions are defined in the same file.
-  FileDescriptorProto linkedin_fd_proto;
-  const DescriptorPool* pool = file->pool();
-  const Descriptor* fd_proto_descriptor =
-      pool->FindMessageTypeByName(linkedin_fd_proto.GetTypeName());
-  // Not all pools have descriptor.proto in them. In these cases there for sure
-  // are no custom options.
-  if (fd_proto_descriptor == nullptr) return false;
-
-  // It's easier to inspect file as a proto, because we can use reflection on
-  // the proto to iterate over all content.
-  file->CopyTo(&linkedin_fd_proto);
-
-  // linkedin_fd_proto is a generated proto linked in the proto compiler. As
-  // such it doesn't know the extensions that are potentially present in the
-  // descriptor pool constructed from the protos that are being compiled. These
-  // custom options are therefore in the unknown fields.
-  // By building the corresponding FileDescriptorProto in the pool constructed
-  // by the protos that are being compiled, ie. file's pool, the unknown fields
-  // are converted to extensions.
-  DynamicMessageFactory factory(pool);
-  Message* fd_proto = factory.GetPrototype(fd_proto_descriptor)->New();
-  fd_proto->ParseFromString(linkedin_fd_proto.SerializeAsString());
-
-  bool& res = cache[file];
-  res = HasExtensionFromFile(*fd_proto, file, options,
-                             has_opt_codesize_extension);
-  delete fd_proto;
-  return res;
-}
-
-FileOptions_OptimizeMode GetOptimizeFor(const FileDescriptor* file,
-                                        const Options& options,
-                                        bool* has_opt_codesize_extension) {
-  if (has_opt_codesize_extension) *has_opt_codesize_extension = false;
-  switch (options.enforce_mode) {
-    case EnforceOptimizeMode::kSpeed:
-      return FileOptions::SPEED;
-    case EnforceOptimizeMode::kLiteRuntime:
-      return FileOptions::LITE_RUNTIME;
-    case EnforceOptimizeMode::kCodeSize:
-      if (file->options().optimize_for() == FileOptions::LITE_RUNTIME) {
-        return FileOptions::LITE_RUNTIME;
-      }
-      if (HasBootstrapProblem(file, options, has_opt_codesize_extension)) {
-        return FileOptions::SPEED;
-      }
-      return FileOptions::CODE_SIZE;
-    case EnforceOptimizeMode::kNoEnforcement:
-      if (file->options().optimize_for() == FileOptions::CODE_SIZE) {
-        if (HasBootstrapProblem(file, options, has_opt_codesize_extension)) {
-          GOOGLE_LOG(WARNING) << "Proto states optimize_for = CODE_SIZE, but we "
-                          "cannot honor that because it contains custom option "
-                          "extensions defined in the same proto.";
-          return FileOptions::SPEED;
-        }
-      }
-      return file->options().optimize_for();
-  }
-
-  GOOGLE_LOG(FATAL) << "Unknown optimization enforcement requested.";
-  // The phony return below serves to silence a warning from GCC 8.
-  return FileOptions::SPEED;
-}
-
-inline bool IsMessageOwnedArenaEligible(const Descriptor* desc,
-                                        const Options& options) {
-  return GetOptimizeFor(desc->file(), options) != FileOptions::LITE_RUNTIME &&
-         !options.bootstrap && !options.opensource_runtime &&
-         AllocExpected(desc);
-}
-
-bool EnableMessageOwnedArena(const Descriptor* desc, const Options& options) {
-  (void)desc;
-  (void)options;
-  return false;
-}
-
-bool EnableMessageOwnedArenaTrial(const Descriptor* desc,
-                                  const Options& options) {
-  return false;
-}
-
-bool HasMessageFieldOrExtension(const Descriptor* desc) {
-  if (desc->extension_range_count() > 0) return true;
-  for (const auto* f : FieldRange(desc)) {
-    if (f->cpp_type() == FieldDescriptor::CPPTYPE_MESSAGE) return true;
-  }
-  return false;
-}
-
-}  // namespace cpp
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/compiler/cpp/helpers.h b/libs/protobuf/src/google/protobuf/compiler/cpp/helpers.h
deleted file mode 100644
index d8dcda7..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/cpp/helpers.h
+++ /dev/null
@@ -1,1064 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-
-#ifndef GOOGLE_PROTOBUF_COMPILER_CPP_HELPERS_H__
-#define GOOGLE_PROTOBUF_COMPILER_CPP_HELPERS_H__
-
-#include <algorithm>
-#include <cstdint>
-#include <iterator>
-#include <map>
-#include <string>
-
-#include <google/protobuf/compiler/scc.h>
-#include <google/protobuf/compiler/code_generator.h>
-#include <google/protobuf/compiler/cpp/names.h>
-#include <google/protobuf/compiler/cpp/options.h>
-#include <google/protobuf/descriptor.pb.h>
-#include <google/protobuf/io/printer.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/port.h>
-#include <google/protobuf/stubs/strutil.h>
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace cpp {
-
-enum class ArenaDtorNeeds { kNone = 0, kOnDemand = 1, kRequired = 2 };
-
-inline std::string ProtobufNamespace(const Options& /* options */) {
-  return "PROTOBUF_NAMESPACE_ID";
-}
-
-inline std::string MacroPrefix(const Options& /* options */) {
-  return "GOOGLE_PROTOBUF";
-}
-
-inline std::string DeprecatedAttribute(const Options& /* options */,
-                                       const FieldDescriptor* d) {
-  return d->options().deprecated() ? "PROTOBUF_DEPRECATED " : "";
-}
-
-inline std::string DeprecatedAttribute(const Options& /* options */,
-                                       const EnumValueDescriptor* d) {
-  return d->options().deprecated() ? "PROTOBUF_DEPRECATED_ENUM " : "";
-}
-
-// Commonly-used separator comments.  Thick is a line of '=', thin is a line
-// of '-'.
-extern const char kThickSeparator[];
-extern const char kThinSeparator[];
-
-void SetCommonVars(const Options& options,
-                   std::map<std::string, std::string>* variables);
-
-// Variables to access message data from the message scope.
-void SetCommonMessageDataVariables(
-    const Descriptor* descriptor,
-    std::map<std::string, std::string>* variables);
-
-void SetUnknownFieldsVariable(const Descriptor* descriptor,
-                              const Options& options,
-                              std::map<std::string, std::string>* variables);
-
-bool GetBootstrapBasename(const Options& options, const std::string& basename,
-                          std::string* bootstrap_basename);
-bool MaybeBootstrap(const Options& options, GeneratorContext* generator_context,
-                    bool bootstrap_flag, std::string* basename);
-bool IsBootstrapProto(const Options& options, const FileDescriptor* file);
-
-// Name space of the proto file. This namespace is such that the string
-// "<namespace>::some_name" is the correct fully qualified namespace.
-// This means if the package is empty the namespace is "", and otherwise
-// the namespace is "::foo::bar::...::baz" without trailing semi-colons.
-std::string Namespace(const FileDescriptor* d, const Options& options);
-std::string Namespace(const Descriptor* d, const Options& options);
-std::string Namespace(const FieldDescriptor* d, const Options& options);
-std::string Namespace(const EnumDescriptor* d, const Options& options);
-
-// Returns true if it's safe to reset "field" to zero.
-bool CanInitializeByZeroing(const FieldDescriptor* field);
-
-std::string ClassName(const Descriptor* descriptor);
-std::string ClassName(const EnumDescriptor* enum_descriptor);
-
-std::string QualifiedClassName(const Descriptor* d, const Options& options);
-std::string QualifiedClassName(const EnumDescriptor* d, const Options& options);
-
-std::string QualifiedClassName(const Descriptor* d);
-std::string QualifiedClassName(const EnumDescriptor* d);
-
-// DEPRECATED just use ClassName or QualifiedClassName, a boolean is very
-// unreadable at the callsite.
-// Returns the non-nested type name for the given type.  If "qualified" is
-// true, prefix the type with the full namespace.  For example, if you had:
-//   package foo.bar;
-//   message Baz { message Moo {} }
-// Then the qualified ClassName for Moo would be:
-//   ::foo::bar::Baz_Moo
-// While the non-qualified version would be:
-//   Baz_Moo
-inline std::string ClassName(const Descriptor* descriptor, bool qualified) {
-  return qualified ? QualifiedClassName(descriptor, Options())
-                   : ClassName(descriptor);
-}
-
-inline std::string ClassName(const EnumDescriptor* descriptor, bool qualified) {
-  return qualified ? QualifiedClassName(descriptor, Options())
-                   : ClassName(descriptor);
-}
-
-// Returns the extension name prefixed with the class name if nested but without
-// the package name.
-std::string ExtensionName(const FieldDescriptor* d);
-
-std::string QualifiedExtensionName(const FieldDescriptor* d,
-                                   const Options& options);
-std::string QualifiedExtensionName(const FieldDescriptor* d);
-
-// Type name of default instance.
-std::string DefaultInstanceType(const Descriptor* descriptor,
-                                const Options& options, bool split = false);
-
-// Non-qualified name of the default_instance of this message.
-std::string DefaultInstanceName(const Descriptor* descriptor,
-                                const Options& options, bool split = false);
-
-// Non-qualified name of the default instance pointer. This is used only for
-// implicit weak fields, where we need an extra indirection.
-std::string DefaultInstancePtr(const Descriptor* descriptor,
-                               const Options& options, bool split = false);
-
-// Fully qualified name of the default_instance of this message.
-std::string QualifiedDefaultInstanceName(const Descriptor* descriptor,
-                                         const Options& options,
-                                         bool split = false);
-
-// Fully qualified name of the default instance pointer.
-std::string QualifiedDefaultInstancePtr(const Descriptor* descriptor,
-                                        const Options& options,
-                                        bool split = false);
-
-// DescriptorTable variable name.
-std::string DescriptorTableName(const FileDescriptor* file,
-                                const Options& options);
-
-// When declaring symbol externs from another file, this macro will supply the
-// dllexport needed for the target file, if any.
-std::string FileDllExport(const FileDescriptor* file, const Options& options);
-
-// Name of the base class: google::protobuf::Message or google::protobuf::MessageLite.
-std::string SuperClassName(const Descriptor* descriptor,
-                           const Options& options);
-
-// Adds an underscore if necessary to prevent conflicting with a keyword.
-std::string ResolveKeyword(const std::string& name);
-
-// Get the (unqualified) name that should be used for this field in C++ code.
-// The name is coerced to lower-case to emulate proto1 behavior.  People
-// should be using lowercase-with-underscores style for proto field names
-// anyway, so normally this just returns field->name().
-std::string FieldName(const FieldDescriptor* field);
-
-// Returns the (unqualified) private member name for this field in C++ code.
-std::string FieldMemberName(const FieldDescriptor* field, bool split);
-
-// Returns an estimate of the compiler's alignment for the field.  This
-// can't guarantee to be correct because the generated code could be compiled on
-// different systems with different alignment rules.  The estimates below assume
-// 64-bit pointers.
-int EstimateAlignmentSize(const FieldDescriptor* field);
-
-// Get the unqualified name that should be used for a field's field
-// number constant.
-std::string FieldConstantName(const FieldDescriptor* field);
-
-// Returns the scope where the field was defined (for extensions, this is
-// different from the message type to which the field applies).
-inline const Descriptor* FieldScope(const FieldDescriptor* field) {
-  return field->is_extension() ? field->extension_scope()
-                               : field->containing_type();
-}
-
-// Returns the fully-qualified type name field->message_type().  Usually this
-// is just ClassName(field->message_type(), true);
-std::string FieldMessageTypeName(const FieldDescriptor* field,
-                                 const Options& options);
-
-// Get the C++ type name for a primitive type (e.g. "double", "::google::protobuf::int32", etc.).
-const char* PrimitiveTypeName(FieldDescriptor::CppType type);
-std::string PrimitiveTypeName(const Options& options,
-                              FieldDescriptor::CppType type);
-
-// Get the declared type name in CamelCase format, as is used e.g. for the
-// methods of WireFormat.  For example, TYPE_INT32 becomes "Int32".
-const char* DeclaredTypeMethodName(FieldDescriptor::Type type);
-
-// Return the code that evaluates to the number when compiled.
-std::string Int32ToString(int number);
-
-// Get code that evaluates to the field's default value.
-std::string DefaultValue(const Options& options, const FieldDescriptor* field);
-
-// Compatibility function for callers outside proto2.
-std::string DefaultValue(const FieldDescriptor* field);
-
-// Convert a file name into a valid identifier.
-std::string FilenameIdentifier(const std::string& filename);
-
-// For each .proto file generates a unique name. To prevent collisions of
-// symbols in the global namespace
-std::string UniqueName(const std::string& name, const std::string& filename,
-                       const Options& options);
-inline std::string UniqueName(const std::string& name, const FileDescriptor* d,
-                              const Options& options) {
-  return UniqueName(name, d->name(), options);
-}
-inline std::string UniqueName(const std::string& name, const Descriptor* d,
-                              const Options& options) {
-  return UniqueName(name, d->file(), options);
-}
-inline std::string UniqueName(const std::string& name, const EnumDescriptor* d,
-                              const Options& options) {
-  return UniqueName(name, d->file(), options);
-}
-inline std::string UniqueName(const std::string& name,
-                              const ServiceDescriptor* d,
-                              const Options& options) {
-  return UniqueName(name, d->file(), options);
-}
-
-// Versions for call sites that only support the internal runtime (like proto1
-// support).
-inline Options InternalRuntimeOptions() {
-  Options options;
-  options.opensource_runtime = false;
-  return options;
-}
-inline std::string UniqueName(const std::string& name,
-                              const std::string& filename) {
-  return UniqueName(name, filename, InternalRuntimeOptions());
-}
-inline std::string UniqueName(const std::string& name,
-                              const FileDescriptor* d) {
-  return UniqueName(name, d->name(), InternalRuntimeOptions());
-}
-inline std::string UniqueName(const std::string& name, const Descriptor* d) {
-  return UniqueName(name, d->file(), InternalRuntimeOptions());
-}
-inline std::string UniqueName(const std::string& name,
-                              const EnumDescriptor* d) {
-  return UniqueName(name, d->file(), InternalRuntimeOptions());
-}
-inline std::string UniqueName(const std::string& name,
-                              const ServiceDescriptor* d) {
-  return UniqueName(name, d->file(), InternalRuntimeOptions());
-}
-
-// Return the qualified C++ name for a file level symbol.
-std::string QualifiedFileLevelSymbol(const FileDescriptor* file,
-                                     const std::string& name,
-                                     const Options& options);
-
-// Escape C++ trigraphs by escaping question marks to \?
-std::string EscapeTrigraphs(const std::string& to_escape);
-
-// Escaped function name to eliminate naming conflict.
-std::string SafeFunctionName(const Descriptor* descriptor,
-                             const FieldDescriptor* field,
-                             const std::string& prefix);
-
-// Returns true if generated messages have public unknown fields accessors
-inline bool PublicUnknownFieldsAccessors(const Descriptor* message) {
-  return message->file()->syntax() != FileDescriptor::SYNTAX_PROTO3;
-}
-
-// Returns the optimize mode for <file>, respecting <options.enforce_lite>.
-FileOptions_OptimizeMode GetOptimizeFor(const FileDescriptor* file,
-                                        const Options& options);
-
-// Determines whether unknown fields will be stored in an UnknownFieldSet or
-// a string.
-inline bool UseUnknownFieldSet(const FileDescriptor* file,
-                               const Options& options) {
-  return GetOptimizeFor(file, options) != FileOptions::LITE_RUNTIME;
-}
-
-inline bool IsWeak(const FieldDescriptor* field, const Options& options) {
-  if (field->options().weak()) {
-    GOOGLE_CHECK(!options.opensource_runtime);
-    return true;
-  }
-  return false;
-}
-
-bool IsStringInlined(const FieldDescriptor* descriptor, const Options& options);
-
-// For a string field, returns the effective ctype.  If the actual ctype is
-// not supported, returns the default of STRING.
-FieldOptions::CType EffectiveStringCType(const FieldDescriptor* field,
-                                         const Options& options);
-
-inline bool IsCord(const FieldDescriptor* field, const Options& options) {
-  return field->cpp_type() == FieldDescriptor::CPPTYPE_STRING &&
-         EffectiveStringCType(field, options) == FieldOptions::CORD;
-}
-
-inline bool IsString(const FieldDescriptor* field, const Options& options) {
-  return field->cpp_type() == FieldDescriptor::CPPTYPE_STRING &&
-         EffectiveStringCType(field, options) == FieldOptions::STRING;
-}
-
-inline bool IsStringPiece(const FieldDescriptor* field,
-                          const Options& options) {
-  return field->cpp_type() == FieldDescriptor::CPPTYPE_STRING &&
-         EffectiveStringCType(field, options) == FieldOptions::STRING_PIECE;
-}
-
-class MessageSCCAnalyzer;
-
-// Does the given FileDescriptor use lazy fields?
-bool HasLazyFields(const FileDescriptor* file, const Options& options,
-                   MessageSCCAnalyzer* scc_analyzer);
-
-// Is the given field a supported lazy field?
-bool IsLazy(const FieldDescriptor* field, const Options& options,
-            MessageSCCAnalyzer* scc_analyzer);
-
-// Is this an explicit (non-profile driven) lazy field, as denoted by
-// lazy/unverified_lazy in the descriptor?
-inline bool IsExplicitLazy(const FieldDescriptor* field) {
-  return field->options().lazy() || field->options().unverified_lazy();
-}
-
-bool IsEagerlyVerifiedLazy(const FieldDescriptor* field, const Options& options,
-                           MessageSCCAnalyzer* scc_analyzer);
-
-bool IsLazilyVerifiedLazy(const FieldDescriptor* field, const Options& options);
-
-// Is the given message being split (go/pdsplit)?
-bool ShouldSplit(const Descriptor* desc, const Options& options);
-
-// Is the given field being split out?
-bool ShouldSplit(const FieldDescriptor* field, const Options& options);
-
-inline bool IsFieldUsed(const FieldDescriptor* /* field */,
-                        const Options& /* options */) {
-  return true;
-}
-
-// Returns true if "field" is stripped.
-inline bool IsFieldStripped(const FieldDescriptor* /*field*/,
-                            const Options& /*options*/) {
-  return false;
-}
-
-// Does the file contain any definitions that need extension_set.h?
-bool HasExtensionsOrExtendableMessage(const FileDescriptor* file);
-
-// Does the file have any repeated fields, necessitating the file to include
-// repeated_field.h? This does not include repeated extensions, since those are
-// all stored internally in an ExtensionSet, not a separate RepeatedField*.
-bool HasRepeatedFields(const FileDescriptor* file);
-
-// Does the file have any string/bytes fields with ctype=STRING_PIECE? This
-// does not include extensions, since ctype is ignored for extensions.
-bool HasStringPieceFields(const FileDescriptor* file, const Options& options);
-
-// Does the file have any string/bytes fields with ctype=CORD? This does not
-// include extensions, since ctype is ignored for extensions.
-bool HasCordFields(const FileDescriptor* file, const Options& options);
-
-// Does the file have any map fields, necessitating the file to include
-// map_field_inl.h and map.h.
-bool HasMapFields(const FileDescriptor* file);
-
-// Does this file have any enum type definitions?
-bool HasEnumDefinitions(const FileDescriptor* file);
-
-// Does this file have generated parsing, serialization, and other
-// standard methods for which reflection-based fallback implementations exist?
-inline bool HasGeneratedMethods(const FileDescriptor* file,
-                                const Options& options) {
-  return GetOptimizeFor(file, options) != FileOptions::CODE_SIZE;
-}
-
-// Do message classes in this file have descriptor and reflection methods?
-inline bool HasDescriptorMethods(const FileDescriptor* file,
-                                 const Options& options) {
-  return GetOptimizeFor(file, options) != FileOptions::LITE_RUNTIME;
-}
-
-// Should we generate generic services for this file?
-inline bool HasGenericServices(const FileDescriptor* file,
-                               const Options& options) {
-  return file->service_count() > 0 &&
-         GetOptimizeFor(file, options) != FileOptions::LITE_RUNTIME &&
-         file->options().cc_generic_services();
-}
-
-inline bool IsProto2MessageSet(const Descriptor* descriptor,
-                               const Options& options) {
-  return !options.opensource_runtime &&
-         options.enforce_mode != EnforceOptimizeMode::kLiteRuntime &&
-         !options.lite_implicit_weak_fields &&
-         descriptor->options().message_set_wire_format() &&
-         descriptor->full_name() == "google.protobuf.bridge.MessageSet";
-}
-
-inline bool IsMapEntryMessage(const Descriptor* descriptor) {
-  return descriptor->options().map_entry();
-}
-
-// Returns true if the field's CPPTYPE is string or message.
-bool IsStringOrMessage(const FieldDescriptor* field);
-
-std::string UnderscoresToCamelCase(const std::string& input,
-                                   bool cap_next_letter);
-
-inline bool IsProto3(const FileDescriptor* file) {
-  return file->syntax() == FileDescriptor::SYNTAX_PROTO3;
-}
-
-inline bool HasHasbit(const FieldDescriptor* field) {
-  // This predicate includes proto3 message fields only if they have "optional".
-  //   Foo submsg1 = 1;           // HasHasbit() == false
-  //   optional Foo submsg2 = 2;  // HasHasbit() == true
-  // This is slightly odd, as adding "optional" to a singular proto3 field does
-  // not change the semantics or API. However whenever any field in a message
-  // has a hasbit, it forces reflection to include hasbit offsets for *all*
-  // fields, even if almost all of them are set to -1 (no hasbit). So to avoid
-  // causing a sudden size regression for ~all proto3 messages, we give proto3
-  // message fields a hasbit only if "optional" is present. If the user is
-  // explicitly writing "optional", it is likely they are writing it on
-  // primitive fields also.
-  return (field->has_optional_keyword() || field->is_required()) &&
-         !field->options().weak();
-}
-
-// Returns true if 'enum' semantics are such that unknown values are preserved
-// in the enum field itself, rather than going to the UnknownFieldSet.
-inline bool HasPreservingUnknownEnumSemantics(const FieldDescriptor* field) {
-  return field->file()->syntax() == FileDescriptor::SYNTAX_PROTO3;
-}
-
-inline bool IsCrossFileMessage(const FieldDescriptor* field) {
-  return field->type() == FieldDescriptor::TYPE_MESSAGE &&
-         field->message_type()->file() != field->file();
-}
-
-inline std::string MakeDefaultName(const FieldDescriptor* field) {
-  return StrCat("_i_give_permission_to_break_this_code_default_",
-                      FieldName(field), "_");
-}
-
-// Semantically distinct from MakeDefaultName in that it gives the C++ code
-// referencing a default field from the message scope, rather than just the
-// variable name.
-// For example, declarations of default variables should always use just
-// MakeDefaultName to produce code like:
-//   Type _i_give_permission_to_break_this_code_default_field_;
-//
-// Code that references these should use MakeDefaultFieldName, in case the field
-// exists at some nested level like:
-//   internal_container_._i_give_permission_to_break_this_code_default_field_;
-inline std::string MakeDefaultFieldName(const FieldDescriptor* field) {
-  return StrCat("Impl_::", MakeDefaultName(field));
-}
-
-inline std::string MakeVarintCachedSizeName(const FieldDescriptor* field) {
-  return StrCat("_", FieldName(field), "_cached_byte_size_");
-}
-
-// Semantically distinct from MakeVarintCachedSizeName in that it gives the C++
-// code referencing the object from the message scope, rather than just the
-// variable name.
-// For example, declarations of default variables should always use just
-// MakeVarintCachedSizeName to produce code like:
-//   Type _field_cached_byte_size_;
-//
-// Code that references these variables should use
-// MakeVarintCachedSizeFieldName, in case the field exists at some nested level
-// like:
-//   internal_container_._field_cached_byte_size_;
-inline std::string MakeVarintCachedSizeFieldName(const FieldDescriptor* field,
-                                                 bool split) {
-  return StrCat("_impl_.", split ? "_split_->" : "", "_",
-                      FieldName(field), "_cached_byte_size_");
-}
-
-// Note: A lot of libraries detect Any protos based on Descriptor::full_name()
-// while the two functions below use FileDescriptor::name(). In a sane world the
-// two approaches should be equivalent. But if you are dealing with descriptors
-// from untrusted sources, you might need to match semantics across libraries.
-bool IsAnyMessage(const FileDescriptor* descriptor, const Options& options);
-bool IsAnyMessage(const Descriptor* descriptor, const Options& options);
-
-bool IsWellKnownMessage(const FileDescriptor* descriptor);
-
-inline std::string IncludeGuard(const FileDescriptor* file, bool pb_h,
-                                const Options& options) {
-  // If we are generating a .pb.h file and the proto_h option is enabled, then
-  // the .pb.h gets an extra suffix.
-  std::string filename_identifier = FilenameIdentifier(
-      file->name() + (pb_h && options.proto_h ? ".pb.h" : ""));
-
-  if (IsWellKnownMessage(file)) {
-    // For well-known messages we need third_party/protobuf and net/proto2 to
-    // have distinct include guards, because some source files include both and
-    // both need to be defined (the third_party copies will be in the
-    // google::protobuf_opensource namespace).
-    return MacroPrefix(options) + "_INCLUDED_" + filename_identifier;
-  } else {
-    // Ideally this case would use distinct include guards for opensource and
-    // google3 protos also.  (The behavior of "first #included wins" is not
-    // ideal).  But unfortunately some legacy code includes both and depends on
-    // the identical include guards to avoid compile errors.
-    //
-    // We should clean this up so that this case can be removed.
-    return "GOOGLE_PROTOBUF_INCLUDED_" + filename_identifier;
-  }
-}
-
-// Returns the OptimizeMode for this file, furthermore it updates a status
-// bool if has_opt_codesize_extension is non-null. If this status bool is true
-// it means this file contains an extension that itself is defined as
-// optimized_for = CODE_SIZE.
-FileOptions_OptimizeMode GetOptimizeFor(const FileDescriptor* file,
-                                        const Options& options,
-                                        bool* has_opt_codesize_extension);
-inline FileOptions_OptimizeMode GetOptimizeFor(const FileDescriptor* file,
-                                               const Options& options) {
-  return GetOptimizeFor(file, options, nullptr);
-}
-inline bool NeedsEagerDescriptorAssignment(const FileDescriptor* file,
-                                           const Options& options) {
-  bool has_opt_codesize_extension;
-  if (GetOptimizeFor(file, options, &has_opt_codesize_extension) ==
-          FileOptions::CODE_SIZE &&
-      has_opt_codesize_extension) {
-    // If this filedescriptor contains an extension from another file which
-    // is optimized_for = CODE_SIZE. We need to be careful in the ordering so
-    // we eagerly build the descriptors in the dependencies before building
-    // the descriptors of this file.
-    return true;
-  } else {
-    // If we have a generated code based parser we never need eager
-    // initialization of descriptors of our deps.
-    return false;
-  }
-}
-
-// This orders the messages in a .pb.cc as it's outputted by file.cc
-void FlattenMessagesInFile(const FileDescriptor* file,
-                           std::vector<const Descriptor*>* result);
-inline std::vector<const Descriptor*> FlattenMessagesInFile(
-    const FileDescriptor* file) {
-  std::vector<const Descriptor*> result;
-  FlattenMessagesInFile(file, &result);
-  return result;
-}
-
-template <typename F>
-void ForEachMessage(const Descriptor* descriptor, F&& func) {
-  for (int i = 0; i < descriptor->nested_type_count(); i++)
-    ForEachMessage(descriptor->nested_type(i), std::forward<F&&>(func));
-  func(descriptor);
-}
-
-template <typename F>
-void ForEachMessage(const FileDescriptor* descriptor, F&& func) {
-  for (int i = 0; i < descriptor->message_type_count(); i++)
-    ForEachMessage(descriptor->message_type(i), std::forward<F&&>(func));
-}
-
-bool HasWeakFields(const Descriptor* desc, const Options& options);
-bool HasWeakFields(const FileDescriptor* desc, const Options& options);
-
-// Returns true if the "required" restriction check should be ignored for the
-// given field.
-inline static bool ShouldIgnoreRequiredFieldCheck(const FieldDescriptor* field,
-                                                  const Options& options) {
-  // Do not check "required" for lazily verified lazy fields.
-  return IsLazilyVerifiedLazy(field, options);
-}
-
-struct MessageAnalysis {
-  bool is_recursive = false;
-  bool contains_cord = false;
-  bool contains_extension = false;
-  bool contains_required = false;
-  bool contains_weak = false;  // Implicit weak as well.
-};
-
-// This class is used in FileGenerator, to ensure linear instead of
-// quadratic performance, if we do this per message we would get O(V*(V+E)).
-// Logically this is just only used in message.cc, but in the header for
-// FileGenerator to help share it.
-class PROTOC_EXPORT MessageSCCAnalyzer {
- public:
-  explicit MessageSCCAnalyzer(const Options& options) : options_(options) {}
-
-  MessageAnalysis GetSCCAnalysis(const SCC* scc);
-
-  bool HasRequiredFields(const Descriptor* descriptor) {
-    MessageAnalysis result = GetSCCAnalysis(GetSCC(descriptor));
-    return result.contains_required || result.contains_extension;
-  }
-  bool HasWeakField(const Descriptor* descriptor) {
-    MessageAnalysis result = GetSCCAnalysis(GetSCC(descriptor));
-    return result.contains_weak;
-  }
-  const SCC* GetSCC(const Descriptor* descriptor) {
-    return analyzer_.GetSCC(descriptor);
-  }
-
- private:
-  struct DepsGenerator {
-    std::vector<const Descriptor*> operator()(const Descriptor* desc) const {
-      std::vector<const Descriptor*> deps;
-      for (int i = 0; i < desc->field_count(); i++) {
-        if (desc->field(i)->message_type()) {
-          deps.push_back(desc->field(i)->message_type());
-        }
-      }
-      return deps;
-    }
-  };
-  SCCAnalyzer<DepsGenerator> analyzer_;
-  Options options_;
-  std::map<const SCC*, MessageAnalysis> analysis_cache_;
-};
-
-void ListAllFields(const Descriptor* d,
-                   std::vector<const FieldDescriptor*>* fields);
-void ListAllFields(const FileDescriptor* d,
-                   std::vector<const FieldDescriptor*>* fields);
-
-template <class T>
-void ForEachField(const Descriptor* d, T&& func) {
-  for (int i = 0; i < d->nested_type_count(); i++) {
-    ForEachField(d->nested_type(i), std::forward<T&&>(func));
-  }
-  for (int i = 0; i < d->extension_count(); i++) {
-    func(d->extension(i));
-  }
-  for (int i = 0; i < d->field_count(); i++) {
-    func(d->field(i));
-  }
-}
-
-template <class T>
-void ForEachField(const FileDescriptor* d, T&& func) {
-  for (int i = 0; i < d->message_type_count(); i++) {
-    ForEachField(d->message_type(i), std::forward<T&&>(func));
-  }
-  for (int i = 0; i < d->extension_count(); i++) {
-    func(d->extension(i));
-  }
-}
-
-void ListAllTypesForServices(const FileDescriptor* fd,
-                             std::vector<const Descriptor*>* types);
-
-// Indicates whether we should use implicit weak fields for this file.
-bool UsingImplicitWeakFields(const FileDescriptor* file,
-                             const Options& options);
-
-// Indicates whether to treat this field as implicitly weak.
-bool IsImplicitWeakField(const FieldDescriptor* field, const Options& options,
-                         MessageSCCAnalyzer* scc_analyzer);
-
-inline bool HasSimpleBaseClass(const Descriptor* desc, const Options& options) {
-  if (!HasDescriptorMethods(desc->file(), options)) return false;
-  if (desc->extension_range_count() != 0) return false;
-  if (desc->field_count() == 0) return true;
-  // TODO(jorg): Support additional common message types with only one
-  // or two fields
-  return false;
-}
-
-inline bool HasSimpleBaseClasses(const FileDescriptor* file,
-                                 const Options& options) {
-  bool v = false;
-  ForEachMessage(file, [&v, &options](const Descriptor* desc) {
-    v |= HasSimpleBaseClass(desc, options);
-  });
-  return v;
-}
-
-inline std::string SimpleBaseClass(const Descriptor* desc,
-                                   const Options& options) {
-  if (!HasDescriptorMethods(desc->file(), options)) return "";
-  if (desc->extension_range_count() != 0) return "";
-  if (desc->field_count() == 0) {
-    return "ZeroFieldsBase";
-  }
-  // TODO(jorg): Support additional common message types with only one
-  // or two fields
-  return "";
-}
-
-// Returns true if this message has a _tracker_ field.
-inline bool HasTracker(const Descriptor* desc, const Options& options) {
-  return options.field_listener_options.inject_field_listener_events &&
-         desc->file()->options().optimize_for() !=
-             google::protobuf::FileOptions::LITE_RUNTIME;
-}
-
-// Returns true if this message needs an Impl_ struct for it's data.
-inline bool HasImplData(const Descriptor* desc, const Options& options) {
-  return !HasSimpleBaseClass(desc, options);
-}
-
-// Formatter is a functor class which acts as a closure around printer and
-// the variable map. It's much like printer->Print except it supports both named
-// variables that are substituted using a key value map and direct arguments. In
-// the format string $1$, $2$, etc... are substituted for the first, second, ...
-// direct argument respectively in the format call, it accepts both strings and
-// integers. The implementation verifies all arguments are used and are "first"
-// used in order of appearance in the argument list. For example,
-//
-// Format("return array[$1$];", 3) -> "return array[3];"
-// Format("array[$2$] = $1$;", "Bla", 3) -> FATAL error (wrong order)
-// Format("array[$1$] = $2$;", 3, "Bla") -> "array[3] = Bla;"
-//
-// The arguments can be used more than once like
-//
-// Format("array[$1$] = $2$;  // Index = $1$", 3, "Bla") ->
-//        "array[3] = Bla;  // Index = 3"
-//
-// If you use more arguments use the following style to help the reader,
-//
-// Format("int $1$() {\n"
-//        "  array[$2$] = $3$;\n"
-//        "  return $4$;"
-//        "}\n",
-//        funname, // 1
-//        idx,  // 2
-//        varname,  // 3
-//        retval);  // 4
-//
-// but consider using named variables. Named variables like $foo$, with some
-// identifier foo, are looked up in the map. One additional feature is that
-// spaces are accepted between the '$' delimiters, $ foo$ will
-// substitute to " bar" if foo stands for "bar", but in case it's empty
-// will substitute to "". Hence, for example,
-//
-// Format(vars, "$dllexport $void fun();") -> "void fun();"
-//                                            "__declspec(export) void fun();"
-//
-// which is convenient to prevent double, leading or trailing spaces.
-class PROTOC_EXPORT Formatter {
- public:
-  explicit Formatter(io::Printer* printer) : printer_(printer) {}
-  Formatter(io::Printer* printer,
-            const std::map<std::string, std::string>& vars)
-      : printer_(printer), vars_(vars) {}
-
-  template <typename T>
-  void Set(const std::string& key, const T& value) {
-    vars_[key] = ToString(value);
-  }
-
-  void AddMap(const std::map<std::string, std::string>& vars) {
-    for (const auto& keyval : vars) vars_[keyval.first] = keyval.second;
-  }
-
-  template <typename... Args>
-  void operator()(const char* format, const Args&... args) const {
-    printer_->FormatInternal({ToString(args)...}, vars_, format);
-  }
-
-  void Indent() const { printer_->Indent(); }
-  void Outdent() const { printer_->Outdent(); }
-  io::Printer* printer() const { return printer_; }
-
-  class PROTOC_EXPORT ScopedIndenter {
-   public:
-    explicit ScopedIndenter(Formatter* format) : format_(format) {
-      format_->Indent();
-    }
-    ~ScopedIndenter() { format_->Outdent(); }
-
-   private:
-    Formatter* format_;
-  };
-
-  PROTOBUF_NODISCARD ScopedIndenter ScopedIndent() {
-    return ScopedIndenter(this);
-  }
-  template <typename... Args>
-  PROTOBUF_NODISCARD ScopedIndenter ScopedIndent(const char* format,
-                                                 const Args&&... args) {
-    (*this)(format, static_cast<Args&&>(args)...);
-    return ScopedIndenter(this);
-  }
-
-  class PROTOC_EXPORT SaveState {
-   public:
-    explicit SaveState(Formatter* format)
-        : format_(format), vars_(format->vars_) {}
-    ~SaveState() { format_->vars_.swap(vars_); }
-
-   private:
-    Formatter* format_;
-    std::map<std::string, std::string> vars_;
-  };
-
- private:
-  io::Printer* printer_;
-  std::map<std::string, std::string> vars_;
-
-  // Convenience overloads to accept different types as arguments.
-  static std::string ToString(const std::string& s) { return s; }
-  template <typename I, typename = typename std::enable_if<
-                            std::is_integral<I>::value>::type>
-  static std::string ToString(I x) {
-    return StrCat(x);
-  }
-  static std::string ToString(strings::Hex x) { return StrCat(x); }
-  static std::string ToString(const FieldDescriptor* d) { return Payload(d); }
-  static std::string ToString(const Descriptor* d) { return Payload(d); }
-  static std::string ToString(const EnumDescriptor* d) { return Payload(d); }
-  static std::string ToString(const EnumValueDescriptor* d) {
-    return Payload(d);
-  }
-  static std::string ToString(const OneofDescriptor* d) { return Payload(d); }
-
-  template <typename Descriptor>
-  static std::string Payload(const Descriptor* descriptor) {
-    std::vector<int> path;
-    descriptor->GetLocationPath(&path);
-    GeneratedCodeInfo::Annotation annotation;
-    for (int index : path) {
-      annotation.add_path(index);
-    }
-    annotation.set_source_file(descriptor->file()->name());
-    return annotation.SerializeAsString();
-  }
-};
-
-template <class T>
-void PrintFieldComment(const Formatter& format, const T* field) {
-  // Print the field's (or oneof's) proto-syntax definition as a comment.
-  // We don't want to print group bodies so we cut off after the first
-  // line.
-  DebugStringOptions options;
-  options.elide_group_body = true;
-  options.elide_oneof_body = true;
-  std::string def = field->DebugStringWithOptions(options);
-  format("// $1$\n", def.substr(0, def.find_first_of('\n')));
-}
-
-class PROTOC_EXPORT NamespaceOpener {
- public:
-  explicit NamespaceOpener(const Formatter& format)
-      : printer_(format.printer()) {}
-  NamespaceOpener(const std::string& name, const Formatter& format)
-      : NamespaceOpener(format) {
-    ChangeTo(name);
-  }
-  ~NamespaceOpener() { ChangeTo(""); }
-
-  void ChangeTo(const std::string& name) {
-    std::vector<std::string> new_stack_ =
-        Split(name, "::", true);
-    size_t len = std::min(name_stack_.size(), new_stack_.size());
-    size_t common_idx = 0;
-    while (common_idx < len) {
-      if (name_stack_[common_idx] != new_stack_[common_idx]) break;
-      common_idx++;
-    }
-    for (auto it = name_stack_.crbegin();
-         it != name_stack_.crend() - common_idx; ++it) {
-      if (*it == "PROTOBUF_NAMESPACE_ID") {
-        printer_->Print("PROTOBUF_NAMESPACE_CLOSE\n");
-      } else {
-        printer_->Print("}  // namespace $ns$\n", "ns", *it);
-      }
-    }
-    name_stack_.swap(new_stack_);
-    for (size_t i = common_idx; i < name_stack_.size(); ++i) {
-      if (name_stack_[i] == "PROTOBUF_NAMESPACE_ID") {
-        printer_->Print("PROTOBUF_NAMESPACE_OPEN\n");
-      } else {
-        printer_->Print("namespace $ns$ {\n", "ns", name_stack_[i]);
-      }
-    }
-  }
-
- private:
-  io::Printer* printer_;
-  std::vector<std::string> name_stack_;
-};
-
-enum class Utf8CheckMode {
-  kStrict = 0,  // Parsing will fail if non UTF-8 data is in string fields.
-  kVerify = 1,  // Only log an error but parsing will succeed.
-  kNone = 2,    // No UTF-8 check.
-};
-
-Utf8CheckMode GetUtf8CheckMode(const FieldDescriptor* field,
-                               const Options& options);
-
-void GenerateUtf8CheckCodeForString(const FieldDescriptor* field,
-                                    const Options& options, bool for_parse,
-                                    const char* parameters,
-                                    const Formatter& format);
-
-void GenerateUtf8CheckCodeForCord(const FieldDescriptor* field,
-                                  const Options& options, bool for_parse,
-                                  const char* parameters,
-                                  const Formatter& format);
-
-template <typename T>
-struct FieldRangeImpl {
-  struct Iterator {
-    using iterator_category = std::forward_iterator_tag;
-    using value_type = const FieldDescriptor*;
-    using difference_type = int;
-
-    value_type operator*() { return descriptor->field(idx); }
-
-    friend bool operator==(const Iterator& a, const Iterator& b) {
-      GOOGLE_DCHECK(a.descriptor == b.descriptor);
-      return a.idx == b.idx;
-    }
-    friend bool operator!=(const Iterator& a, const Iterator& b) {
-      return !(a == b);
-    }
-
-    Iterator& operator++() {
-      idx++;
-      return *this;
-    }
-
-    int idx;
-    const T* descriptor;
-  };
-
-  Iterator begin() const { return {0, descriptor}; }
-  Iterator end() const { return {descriptor->field_count(), descriptor}; }
-
-  const T* descriptor;
-};
-
-template <typename T>
-FieldRangeImpl<T> FieldRange(const T* desc) {
-  return {desc};
-}
-
-struct OneOfRangeImpl {
-  struct Iterator {
-    using iterator_category = std::forward_iterator_tag;
-    using value_type = const OneofDescriptor*;
-    using difference_type = int;
-
-    value_type operator*() { return descriptor->oneof_decl(idx); }
-
-    friend bool operator==(const Iterator& a, const Iterator& b) {
-      GOOGLE_DCHECK(a.descriptor == b.descriptor);
-      return a.idx == b.idx;
-    }
-    friend bool operator!=(const Iterator& a, const Iterator& b) {
-      return !(a == b);
-    }
-
-    Iterator& operator++() {
-      idx++;
-      return *this;
-    }
-
-    int idx;
-    const Descriptor* descriptor;
-  };
-
-  Iterator begin() const { return {0, descriptor}; }
-  Iterator end() const {
-    return {descriptor->real_oneof_decl_count(), descriptor};
-  }
-
-  const Descriptor* descriptor;
-};
-
-inline OneOfRangeImpl OneOfRange(const Descriptor* desc) { return {desc}; }
-
-PROTOC_EXPORT std::string StripProto(const std::string& filename);
-
-bool EnableMessageOwnedArena(const Descriptor* desc, const Options& options);
-
-bool EnableMessageOwnedArenaTrial(const Descriptor* desc,
-                                  const Options& options);
-
-bool ShouldVerify(const Descriptor* descriptor, const Options& options,
-                  MessageSCCAnalyzer* scc_analyzer);
-bool ShouldVerify(const FileDescriptor* file, const Options& options,
-                  MessageSCCAnalyzer* scc_analyzer);
-
-// Indicates whether to use predefined verify methods for a given message. If a
-// message is "simple" and needs no special verification per field (e.g. message
-// field, repeated packed, UTF8 string, etc.), we can use either VerifySimple or
-// VerifySimpleAlwaysCheckInt32 methods as all verification can be done based on
-// the wire type.
-//
-// Otherwise, we need "custom" verify methods tailored to a message to pass
-// which field needs a special verification; i.e. InternalVerify.
-enum class VerifySimpleType {
-  kSimpleInt32Never,   // Use VerifySimple
-  kSimpleInt32Always,  // Use VerifySimpleAlwaysCheckInt32
-  kCustom,             // Use InternalVerify and check only for int32
-  kCustomInt32Never,   // Use InternalVerify but never check for int32
-  kCustomInt32Always,  // Use InternalVerify and always check for int32
-};
-
-// Returns VerifySimpleType if messages can be verified by predefined methods.
-VerifySimpleType ShouldVerifySimple(const Descriptor* descriptor);
-
-bool IsUtf8String(const FieldDescriptor* field);
-
-bool HasMessageFieldOrExtension(const Descriptor* desc);
-
-}  // namespace cpp
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
-
-#endif  // GOOGLE_PROTOBUF_COMPILER_CPP_HELPERS_H__
diff --git a/libs/protobuf/src/google/protobuf/compiler/cpp/map_field.cc b/libs/protobuf/src/google/protobuf/compiler/cpp/map_field.cc
deleted file mode 100644
index 3a55ef5..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/cpp/map_field.cc
+++ /dev/null
@@ -1,338 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <google/protobuf/compiler/cpp/map_field.h>
-
-#include <google/protobuf/io/printer.h>
-#include <google/protobuf/wire_format.h>
-#include <google/protobuf/stubs/strutil.h>
-#include <google/protobuf/compiler/cpp/helpers.h>
-
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace cpp {
-
-bool IsProto3Field(const FieldDescriptor* field_descriptor) {
-  const FileDescriptor* file_descriptor = field_descriptor->file();
-  return file_descriptor->syntax() == FileDescriptor::SYNTAX_PROTO3;
-}
-
-void SetMessageVariables(const FieldDescriptor* descriptor,
-                         std::map<std::string, std::string>* variables,
-                         const Options& options) {
-  SetCommonFieldVariables(descriptor, variables, options);
-  (*variables)["type"] = ClassName(descriptor->message_type(), false);
-  (*variables)["full_name"] = descriptor->full_name();
-
-  const FieldDescriptor* key = descriptor->message_type()->map_key();
-  const FieldDescriptor* val = descriptor->message_type()->map_value();
-  (*variables)["key_cpp"] = PrimitiveTypeName(options, key->cpp_type());
-  switch (val->cpp_type()) {
-    case FieldDescriptor::CPPTYPE_MESSAGE:
-      (*variables)["val_cpp"] = FieldMessageTypeName(val, options);
-      break;
-    case FieldDescriptor::CPPTYPE_ENUM:
-      (*variables)["val_cpp"] = ClassName(val->enum_type(), true);
-      break;
-    default:
-      (*variables)["val_cpp"] = PrimitiveTypeName(options, val->cpp_type());
-  }
-  (*variables)["key_wire_type"] =
-      "TYPE_" + ToUpper(DeclaredTypeMethodName(key->type()));
-  (*variables)["val_wire_type"] =
-      "TYPE_" + ToUpper(DeclaredTypeMethodName(val->type()));
-  (*variables)["map_classname"] = ClassName(descriptor->message_type(), false);
-  (*variables)["number"] = StrCat(descriptor->number());
-  (*variables)["tag"] = StrCat(internal::WireFormat::MakeTag(descriptor));
-
-  if (HasDescriptorMethods(descriptor->file(), options)) {
-    (*variables)["lite"] = "";
-  } else {
-    (*variables)["lite"] = "Lite";
-  }
-}
-
-MapFieldGenerator::MapFieldGenerator(const FieldDescriptor* descriptor,
-                                     const Options& options,
-                                     MessageSCCAnalyzer* scc_analyzer)
-    : FieldGenerator(descriptor, options),
-      has_required_fields_(
-          scc_analyzer->HasRequiredFields(descriptor->message_type())) {
-  SetMessageVariables(descriptor, &variables_, options);
-}
-
-MapFieldGenerator::~MapFieldGenerator() {}
-
-void MapFieldGenerator::GeneratePrivateMembers(io::Printer* printer) const {
-  Formatter format(printer, variables_);
-  format(
-      "::$proto_ns$::internal::MapField$lite$<\n"
-      "    $map_classname$,\n"
-      "    $key_cpp$, $val_cpp$,\n"
-      "    ::$proto_ns$::internal::WireFormatLite::$key_wire_type$,\n"
-      "    ::$proto_ns$::internal::WireFormatLite::$val_wire_type$> "
-      "$name$_;\n");
-}
-
-void MapFieldGenerator::GenerateAccessorDeclarations(
-    io::Printer* printer) const {
-  Formatter format(printer, variables_);
-  format(
-      "private:\n"
-      "const ::$proto_ns$::Map< $key_cpp$, $val_cpp$ >&\n"
-      "    ${1$_internal_$name$$}$() const;\n"
-      "::$proto_ns$::Map< $key_cpp$, $val_cpp$ >*\n"
-      "    ${1$_internal_mutable_$name$$}$();\n"
-      "public:\n"
-      "$deprecated_attr$const ::$proto_ns$::Map< $key_cpp$, $val_cpp$ >&\n"
-      "    ${1$$name$$}$() const;\n"
-      "$deprecated_attr$::$proto_ns$::Map< $key_cpp$, $val_cpp$ >*\n"
-      "    ${1$mutable_$name$$}$();\n",
-      descriptor_);
-}
-
-void MapFieldGenerator::GenerateInlineAccessorDefinitions(
-    io::Printer* printer) const {
-  Formatter format(printer, variables_);
-  format(
-      "inline const ::$proto_ns$::Map< $key_cpp$, $val_cpp$ >&\n"
-      "$classname$::_internal_$name$() const {\n"
-      "  return $field$.GetMap();\n"
-      "}\n"
-      "inline const ::$proto_ns$::Map< $key_cpp$, $val_cpp$ >&\n"
-      "$classname$::$name$() const {\n"
-      "$annotate_get$"
-      "  // @@protoc_insertion_point(field_map:$full_name$)\n"
-      "  return _internal_$name$();\n"
-      "}\n"
-      "inline ::$proto_ns$::Map< $key_cpp$, $val_cpp$ >*\n"
-      "$classname$::_internal_mutable_$name$() {\n"
-      "$maybe_prepare_split_message$"
-      "  return $field$.MutableMap();\n"
-      "}\n"
-      "inline ::$proto_ns$::Map< $key_cpp$, $val_cpp$ >*\n"
-      "$classname$::mutable_$name$() {\n"
-      "$annotate_mutable$"
-      "  // @@protoc_insertion_point(field_mutable_map:$full_name$)\n"
-      "  return _internal_mutable_$name$();\n"
-      "}\n");
-}
-
-void MapFieldGenerator::GenerateClearingCode(io::Printer* printer) const {
-  Formatter format(printer, variables_);
-  format("$field$.Clear();\n");
-}
-
-void MapFieldGenerator::GenerateMergingCode(io::Printer* printer) const {
-  Formatter format(printer, variables_);
-  format("_this->$field$.MergeFrom(from.$field$);\n");
-}
-
-void MapFieldGenerator::GenerateSwappingCode(io::Printer* printer) const {
-  Formatter format(printer, variables_);
-  format("$field$.InternalSwap(&other->$field$);\n");
-}
-
-void MapFieldGenerator::GenerateCopyConstructorCode(
-    io::Printer* printer) const {
-  GenerateConstructorCode(printer);
-  GenerateMergingCode(printer);
-}
-
-static void GenerateSerializationLoop(Formatter& format, bool string_key,
-                                      bool string_value,
-                                      bool is_deterministic) {
-  if (is_deterministic) {
-    format(
-        "for (const auto& entry : "
-        "::_pbi::MapSorter$1$<MapType>(map_field)) {\n",
-        (string_key ? "Ptr" : "Flat"));
-  } else {
-    format("for (const auto& entry : map_field) {\n");
-  }
-  {
-    auto loop_scope = format.ScopedIndent();
-    format(
-        "target = WireHelper::InternalSerialize($number$, "
-        "entry.first, entry.second, target, stream);\n");
-
-    if (string_key || string_value) {
-      format("check_utf8(entry);\n");
-    }
-  }
-  format("}\n");
-}
-
-void MapFieldGenerator::GenerateSerializeWithCachedSizesToArray(
-    io::Printer* printer) const {
-  Formatter format(printer, variables_);
-  format("if (!this->_internal_$name$().empty()) {\n");
-  format.Indent();
-  const FieldDescriptor* key_field = descriptor_->message_type()->map_key();
-  const FieldDescriptor* value_field = descriptor_->message_type()->map_value();
-  const bool string_key = key_field->type() == FieldDescriptor::TYPE_STRING;
-  const bool string_value = value_field->type() == FieldDescriptor::TYPE_STRING;
-
-  format(
-      "using MapType = ::_pb::Map<$key_cpp$, $val_cpp$>;\n"
-      "using WireHelper = $map_classname$::Funcs;\n"
-      "const auto& map_field = this->_internal_$name$();\n");
-  bool utf8_check = string_key || string_value;
-  if (utf8_check) {
-    format("auto check_utf8 = [](const MapType::value_type& entry) {\n");
-    {
-      auto check_scope = format.ScopedIndent();
-      // p may be unused when GetUtf8CheckMode evaluates to kNone,
-      // thus disabling the validation.
-      format("(void)entry;\n");
-      if (string_key) {
-        GenerateUtf8CheckCodeForString(
-            key_field, options_, false,
-            "entry.first.data(), static_cast<int>(entry.first.length()),\n",
-            format);
-      }
-      if (string_value) {
-        GenerateUtf8CheckCodeForString(
-            value_field, options_, false,
-            "entry.second.data(), static_cast<int>(entry.second.length()),\n",
-            format);
-      }
-    }
-    format("};\n");
-  }
-
-  format(
-      "\n"
-      "if (stream->IsSerializationDeterministic() && "
-      "map_field.size() > 1) {\n");
-  {
-    auto deterministic_scope = format.ScopedIndent();
-    GenerateSerializationLoop(format, string_key, string_value, true);
-  }
-  format("} else {\n");
-  {
-    auto map_order_scope = format.ScopedIndent();
-    GenerateSerializationLoop(format, string_key, string_value, false);
-  }
-  format("}\n");
-  format.Outdent();
-  format("}\n");
-}
-
-void MapFieldGenerator::GenerateByteSize(io::Printer* printer) const {
-  Formatter format(printer, variables_);
-  format(
-      "total_size += $tag_size$ *\n"
-      "    "
-      "::$proto_ns$::internal::FromIntSize(this->_internal_$name$_size());\n"
-      "for (::$proto_ns$::Map< $key_cpp$, $val_cpp$ >::const_iterator\n"
-      "    it = this->_internal_$name$().begin();\n"
-      "    it != this->_internal_$name$().end(); ++it) {\n"
-      "  total_size += $map_classname$::Funcs::ByteSizeLong(it->first, "
-      "it->second);\n"
-      "}\n");
-}
-
-void MapFieldGenerator::GenerateIsInitialized(io::Printer* printer) const {
-  if (!has_required_fields_) return;
-
-  Formatter format(printer, variables_);
-  format(
-      "if (!::$proto_ns$::internal::AllAreInitialized($field$)) return "
-      "false;\n");
-}
-
-void MapFieldGenerator::GenerateConstexprAggregateInitializer(
-    io::Printer* printer) const {
-  Formatter format(printer, variables_);
-  if (HasDescriptorMethods(descriptor_->file(), options_)) {
-    format("/*decltype($field$)*/{::_pbi::ConstantInitialized()}");
-  } else {
-    format("/*decltype($field$)*/{}");
-  }
-}
-
-void MapFieldGenerator::GenerateCopyAggregateInitializer(
-    io::Printer* printer) const {
-  Formatter format(printer, variables_);
-  // MapField has no move constructor, which prevents explicit aggregate
-  // initialization pre-C++17.
-  format("/*decltype($field$)*/{}");
-}
-
-void MapFieldGenerator::GenerateAggregateInitializer(
-    io::Printer* printer) const {
-  Formatter format(printer, variables_);
-  if (ShouldSplit(descriptor_, options_)) {
-    format(
-        "/*decltype($classname$::Split::$name$_)*/"
-        "{::_pbi::ArenaInitialized(), arena}");
-    return;
-  }
-  // MapField has no move constructor.
-  format("/*decltype($field$)*/{::_pbi::ArenaInitialized(), arena}");
-}
-
-void MapFieldGenerator::GenerateDestructorCode(io::Printer* printer) const {
-  GOOGLE_CHECK(!IsFieldStripped(descriptor_, options_));
-
-  Formatter format(printer, variables_);
-  if (ShouldSplit(descriptor_, options_)) {
-    format("$cached_split_ptr$->$name$_.Destruct();\n");
-    format("$cached_split_ptr$->$name$_.~MapField$lite$();\n");
-    return;
-  }
-  format("$field$.Destruct();\n");
-  format("$field$.~MapField$lite$();\n");
-}
-
-void MapFieldGenerator::GenerateArenaDestructorCode(
-    io::Printer* printer) const {
-  if (NeedsArenaDestructor() == ArenaDtorNeeds::kNone) {
-    return;
-  }
-
-  Formatter format(printer, variables_);
-  // _this is the object being destructed (we are inside a static method here).
-  format("_this->$field$.Destruct();\n");
-}
-
-ArenaDtorNeeds MapFieldGenerator::NeedsArenaDestructor() const {
-  return HasDescriptorMethods(descriptor_->file(), options_)
-             ? ArenaDtorNeeds::kRequired
-             : ArenaDtorNeeds::kNone;
-}
-
-}  // namespace cpp
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/compiler/cpp/map_field.h b/libs/protobuf/src/google/protobuf/compiler/cpp/map_field.h
deleted file mode 100644
index 678a128..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/cpp/map_field.h
+++ /dev/null
@@ -1,83 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef GOOGLE_PROTOBUF_COMPILER_CPP_MAP_FIELD_H__
-#define GOOGLE_PROTOBUF_COMPILER_CPP_MAP_FIELD_H__
-
-#include <map>
-#include <string>
-
-#include <google/protobuf/compiler/cpp/helpers.h>
-#include <google/protobuf/compiler/cpp/message_field.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace cpp {
-
-class MapFieldGenerator : public FieldGenerator {
- public:
-  MapFieldGenerator(const FieldDescriptor* descriptor, const Options& options,
-                    MessageSCCAnalyzer* scc_analyzer);
-  ~MapFieldGenerator() override;
-
-  // implements FieldGenerator ---------------------------------------
-  void GeneratePrivateMembers(io::Printer* printer) const override;
-  void GenerateAccessorDeclarations(io::Printer* printer) const override;
-  void GenerateInlineAccessorDefinitions(io::Printer* printer) const override;
-  void GenerateClearingCode(io::Printer* printer) const override;
-  void GenerateMergingCode(io::Printer* printer) const override;
-  void GenerateSwappingCode(io::Printer* printer) const override;
-  void GenerateConstructorCode(io::Printer* printer) const override {}
-  void GenerateCopyConstructorCode(io::Printer* printer) const override;
-  void GenerateSerializeWithCachedSizesToArray(
-      io::Printer* printer) const override;
-  void GenerateByteSize(io::Printer* printer) const override;
-  void GenerateIsInitialized(io::Printer* printer) const override;
-  void GenerateConstexprAggregateInitializer(
-      io::Printer* printer) const override;
-  void GenerateCopyAggregateInitializer(io::Printer* printer) const override;
-  void GenerateAggregateInitializer(io::Printer* printer) const override;
-  void GenerateDestructorCode(io::Printer* printer) const override;
-  void GenerateArenaDestructorCode(io::Printer* printer) const override;
-  ArenaDtorNeeds NeedsArenaDestructor() const override;
-
- private:
-  const bool has_required_fields_;
-
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(MapFieldGenerator);
-};
-
-}  // namespace cpp
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // GOOGLE_PROTOBUF_COMPILER_CPP_MAP_FIELD_H__
diff --git a/libs/protobuf/src/google/protobuf/compiler/cpp/message.cc b/libs/protobuf/src/google/protobuf/compiler/cpp/message.cc
deleted file mode 100644
index 69069da..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/cpp/message.cc
+++ /dev/null
@@ -1,4446 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-
-#include <google/protobuf/compiler/cpp/message.h>
-
-#include <algorithm>
-#include <cstdint>
-#include <functional>
-#include <map>
-#include <memory>
-#include <unordered_map>
-#include <utility>
-#include <vector>
-
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/io/printer.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/generated_message_util.h>
-#include <google/protobuf/map_entry_lite.h>
-#include <google/protobuf/wire_format.h>
-#include <google/protobuf/stubs/strutil.h>
-#include <google/protobuf/stubs/stringprintf.h>
-#include <google/protobuf/stubs/substitute.h>
-#include <google/protobuf/compiler/cpp/enum.h>
-#include <google/protobuf/compiler/cpp/extension.h>
-#include <google/protobuf/compiler/cpp/field.h>
-#include <google/protobuf/compiler/cpp/helpers.h>
-#include <google/protobuf/compiler/cpp/padding_optimizer.h>
-#include <google/protobuf/compiler/cpp/parse_function_generator.h>
-#include <google/protobuf/descriptor.pb.h>
-#include <google/protobuf/stubs/hash.h>
-
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace cpp {
-
-using internal::WireFormat;
-using internal::WireFormatLite;
-
-namespace {
-
-static constexpr int kNoHasbit = -1;
-
-// Create an expression that evaluates to
-//  "for all i, (_has_bits_[i] & masks[i]) == masks[i]"
-// masks is allowed to be shorter than _has_bits_, but at least one element of
-// masks must be non-zero.
-std::string ConditionalToCheckBitmasks(
-    const std::vector<uint32_t>& masks, bool return_success = true,
-    StringPiece has_bits_var = "_impl_._has_bits_") {
-  std::vector<std::string> parts;
-  for (int i = 0; i < masks.size(); i++) {
-    if (masks[i] == 0) continue;
-    std::string m = StrCat("0x", strings::Hex(masks[i], strings::ZERO_PAD_8));
-    // Each xor evaluates to 0 if the expected bits are present.
-    parts.push_back(
-        StrCat("((", has_bits_var, "[", i, "] & ", m, ") ^ ", m, ")"));
-  }
-  GOOGLE_CHECK(!parts.empty());
-  // If we have multiple parts, each expected to be 0, then bitwise-or them.
-  std::string result =
-      parts.size() == 1
-          ? parts[0]
-          : StrCat("(", Join(parts, "\n       | "), ")");
-  return result + (return_success ? " == 0" : " != 0");
-}
-
-void PrintPresenceCheck(const Formatter& format, const FieldDescriptor* field,
-                        const std::vector<int>& has_bit_indices,
-                        io::Printer* printer, int* cached_has_word_index) {
-  if (!field->options().weak()) {
-    int has_bit_index = has_bit_indices[field->index()];
-    if (*cached_has_word_index != (has_bit_index / 32)) {
-      *cached_has_word_index = (has_bit_index / 32);
-      format("cached_has_bits = $has_bits$[$1$];\n", *cached_has_word_index);
-    }
-    const std::string mask =
-        StrCat(strings::Hex(1u << (has_bit_index % 32), strings::ZERO_PAD_8));
-    format("if (cached_has_bits & 0x$1$u) {\n", mask);
-  } else {
-    format("if (has_$1$()) {\n", FieldName(field));
-  }
-  format.Indent();
-}
-
-struct FieldOrderingByNumber {
-  inline bool operator()(const FieldDescriptor* a,
-                         const FieldDescriptor* b) const {
-    return a->number() < b->number();
-  }
-};
-
-// Sort the fields of the given Descriptor by number into a new[]'d array
-// and return it.
-std::vector<const FieldDescriptor*> SortFieldsByNumber(
-    const Descriptor* descriptor) {
-  std::vector<const FieldDescriptor*> fields(descriptor->field_count());
-  for (int i = 0; i < descriptor->field_count(); i++) {
-    fields[i] = descriptor->field(i);
-  }
-  std::sort(fields.begin(), fields.end(), FieldOrderingByNumber());
-  return fields;
-}
-
-// Functor for sorting extension ranges by their "start" field number.
-struct ExtensionRangeSorter {
-  bool operator()(const Descriptor::ExtensionRange* left,
-                  const Descriptor::ExtensionRange* right) const {
-    return left->start < right->start;
-  }
-};
-
-bool IsPOD(const FieldDescriptor* field) {
-  if (field->is_repeated() || field->is_extension()) return false;
-  switch (field->cpp_type()) {
-    case FieldDescriptor::CPPTYPE_ENUM:
-    case FieldDescriptor::CPPTYPE_INT32:
-    case FieldDescriptor::CPPTYPE_INT64:
-    case FieldDescriptor::CPPTYPE_UINT32:
-    case FieldDescriptor::CPPTYPE_UINT64:
-    case FieldDescriptor::CPPTYPE_FLOAT:
-    case FieldDescriptor::CPPTYPE_DOUBLE:
-    case FieldDescriptor::CPPTYPE_BOOL:
-      return true;
-    case FieldDescriptor::CPPTYPE_STRING:
-      return false;
-    default:
-      return false;
-  }
-}
-
-// Helper for the code that emits the SharedCtor() and InternalSwap() methods.
-// Anything that is a POD or a "normal" message (represented by a pointer) can
-// be manipulated as raw bytes.
-bool CanBeManipulatedAsRawBytes(const FieldDescriptor* field,
-                                const Options& options,
-                                MessageSCCAnalyzer* scc_analyzer) {
-  bool ret = CanInitializeByZeroing(field);
-
-  // Non-repeated, non-lazy message fields are simply raw pointers, so we can
-  // swap them or use memset to initialize these in SharedCtor. We cannot use
-  // this in Clear, as we need to potentially delete the existing value.
-  ret =
-      ret || (!field->is_repeated() && !IsLazy(field, options, scc_analyzer) &&
-              field->cpp_type() == FieldDescriptor::CPPTYPE_MESSAGE);
-  return ret;
-}
-
-bool StrContains(const std::string& haystack, const std::string& needle) {
-  return haystack.find(needle) != std::string::npos;
-}
-
-// Finds runs of fields for which `predicate` is true.
-// RunMap maps from fields that start each run to the number of fields in that
-// run.  This is optimized for the common case that there are very few runs in
-// a message and that most of the eligible fields appear together.
-using RunMap = std::unordered_map<const FieldDescriptor*, size_t>;
-RunMap FindRuns(const std::vector<const FieldDescriptor*>& fields,
-                const std::function<bool(const FieldDescriptor*)>& predicate) {
-  RunMap runs;
-  const FieldDescriptor* last_start = nullptr;
-
-  for (auto field : fields) {
-    if (predicate(field)) {
-      if (last_start == nullptr) {
-        last_start = field;
-      }
-
-      runs[last_start]++;
-    } else {
-      last_start = nullptr;
-    }
-  }
-  return runs;
-}
-
-// Emits an if-statement with a condition that evaluates to true if |field| is
-// considered non-default (will be sent over the wire), for message types
-// without true field presence. Should only be called if
-// !HasHasbit(field).
-bool EmitFieldNonDefaultCondition(io::Printer* printer,
-                                  const std::string& prefix,
-                                  const FieldDescriptor* field) {
-  GOOGLE_CHECK(!HasHasbit(field));
-  Formatter format(printer);
-  format.Set("prefix", prefix);
-  format.Set("name", FieldName(field));
-  // Merge and serialize semantics: primitive fields are merged/serialized only
-  // if non-zero (numeric) or non-empty (string).
-  if (!field->is_repeated() && !field->containing_oneof()) {
-    if (field->cpp_type() == FieldDescriptor::CPPTYPE_STRING) {
-      format("if (!$prefix$_internal_$name$().empty()) {\n");
-    } else if (field->cpp_type() == FieldDescriptor::CPPTYPE_MESSAGE) {
-      // Message fields still have has_$name$() methods.
-      format("if ($prefix$_internal_has_$name$()) {\n");
-    } else if (field->cpp_type() == FieldDescriptor::CPPTYPE_FLOAT) {
-      format(
-          "static_assert(sizeof(uint32_t) == sizeof(float), \"Code assumes "
-          "uint32_t and float are the same size.\");\n"
-          "float tmp_$name$ = $prefix$_internal_$name$();\n"
-          "uint32_t raw_$name$;\n"
-          "memcpy(&raw_$name$, &tmp_$name$, sizeof(tmp_$name$));\n"
-          "if (raw_$name$ != 0) {\n");
-    } else if (field->cpp_type() == FieldDescriptor::CPPTYPE_DOUBLE) {
-      format(
-          "static_assert(sizeof(uint64_t) == sizeof(double), \"Code assumes "
-          "uint64_t and double are the same size.\");\n"
-          "double tmp_$name$ = $prefix$_internal_$name$();\n"
-          "uint64_t raw_$name$;\n"
-          "memcpy(&raw_$name$, &tmp_$name$, sizeof(tmp_$name$));\n"
-          "if (raw_$name$ != 0) {\n");
-    } else {
-      format("if ($prefix$_internal_$name$() != 0) {\n");
-    }
-    format.Indent();
-    return true;
-  } else if (field->real_containing_oneof()) {
-    format("if (_internal_has_$name$()) {\n");
-    format.Indent();
-    return true;
-  }
-  return false;
-}
-
-// Does the given field have a has_$name$() method?
-bool HasHasMethod(const FieldDescriptor* field) {
-  if (!IsProto3(field->file())) {
-    // In proto1/proto2, every field has a has_$name$() method.
-    return true;
-  }
-  // For message types without true field presence, only fields with a message
-  // type or inside an one-of have a has_$name$() method.
-  return field->cpp_type() == FieldDescriptor::CPPTYPE_MESSAGE ||
-         field->has_optional_keyword() || field->real_containing_oneof();
-}
-
-// Collects map entry message type information.
-void CollectMapInfo(const Options& options, const Descriptor* descriptor,
-                    std::map<std::string, std::string>* variables) {
-  GOOGLE_CHECK(IsMapEntryMessage(descriptor));
-  std::map<std::string, std::string>& vars = *variables;
-  const FieldDescriptor* key = descriptor->map_key();
-  const FieldDescriptor* val = descriptor->map_value();
-  vars["key_cpp"] = PrimitiveTypeName(options, key->cpp_type());
-  switch (val->cpp_type()) {
-    case FieldDescriptor::CPPTYPE_MESSAGE:
-      vars["val_cpp"] = FieldMessageTypeName(val, options);
-      break;
-    case FieldDescriptor::CPPTYPE_ENUM:
-      vars["val_cpp"] = ClassName(val->enum_type(), true);
-      break;
-    default:
-      vars["val_cpp"] = PrimitiveTypeName(options, val->cpp_type());
-  }
-  vars["key_wire_type"] =
-      "TYPE_" + ToUpper(DeclaredTypeMethodName(key->type()));
-  vars["val_wire_type"] =
-      "TYPE_" + ToUpper(DeclaredTypeMethodName(val->type()));
-}
-
-// Does the given field have a private (internal helper only) has_$name$()
-// method?
-bool HasPrivateHasMethod(const FieldDescriptor* field) {
-  // Only for oneofs in message types with no field presence. has_$name$(),
-  // based on the oneof case, is still useful internally for generated code.
-  return IsProto3(field->file()) && field->real_containing_oneof();
-}
-
-// TODO(ckennelly):  Cull these exclusions if/when these protos do not have
-// their methods overridden by subclasses.
-
-bool ShouldMarkClassAsFinal(const Descriptor* descriptor,
-                            const Options& options) {
-  return true;
-}
-
-
-// Returns true to make the message serialize in order, decided by the following
-// factors in the order of precedence.
-// --options().message_set_wire_format() == true
-// --the message is in the allowlist (true)
-// --GOOGLE_PROTOBUF_SHUFFLE_SERIALIZE is defined (false)
-// --a ranage of message names that are allowed to stay in order (true)
-bool ShouldSerializeInOrder(const Descriptor* descriptor,
-                            const Options& options) {
-  return true;
-}
-
-bool IsCrossFileMapField(const FieldDescriptor* field) {
-  if (!field->is_map()) {
-    return false;
-  }
-
-  const Descriptor* d = field->message_type();
-  const FieldDescriptor* value = d->FindFieldByNumber(2);
-
-  return IsCrossFileMessage(value);
-}
-
-bool IsCrossFileMaybeMap(const FieldDescriptor* field) {
-  if (IsCrossFileMapField(field)) {
-    return true;
-  }
-
-  return IsCrossFileMessage(field);
-}
-
-bool IsRequired(const std::vector<const FieldDescriptor*>& v) {
-  return v.front()->is_required();
-}
-
-bool HasNonSplitOptionalString(const Descriptor* desc, const Options& options) {
-  for (const auto* field : FieldRange(desc)) {
-    if (IsString(field, options) && !field->is_repeated() &&
-        !field->real_containing_oneof() && !ShouldSplit(field, options)) {
-      return true;
-    }
-  }
-  return false;
-}
-
-// Collects neighboring fields based on a given criteria (equivalent predicate).
-template <typename Predicate>
-std::vector<std::vector<const FieldDescriptor*>> CollectFields(
-    const std::vector<const FieldDescriptor*>& fields,
-    const Predicate& equivalent) {
-  std::vector<std::vector<const FieldDescriptor*>> chunks;
-  for (auto field : fields) {
-    if (chunks.empty() || !equivalent(chunks.back().back(), field)) {
-      chunks.emplace_back();
-    }
-    chunks.back().push_back(field);
-  }
-  return chunks;
-}
-
-// Returns a bit mask based on has_bit index of "fields" that are typically on
-// the same chunk. It is used in a group presence check where _has_bits_ is
-// masked to tell if any thing in "fields" is present.
-uint32_t GenChunkMask(const std::vector<const FieldDescriptor*>& fields,
-                      const std::vector<int>& has_bit_indices) {
-  GOOGLE_CHECK(!fields.empty());
-  int first_index_offset = has_bit_indices[fields.front()->index()] / 32;
-  uint32_t chunk_mask = 0;
-  for (auto field : fields) {
-    // "index" defines where in the _has_bits_ the field appears.
-    int index = has_bit_indices[field->index()];
-    GOOGLE_CHECK_EQ(first_index_offset, index / 32);
-    chunk_mask |= static_cast<uint32_t>(1) << (index % 32);
-  }
-  GOOGLE_CHECK_NE(0, chunk_mask);
-  return chunk_mask;
-}
-
-// Return the number of bits set in n, a non-negative integer.
-static int popcnt(uint32_t n) {
-  int result = 0;
-  while (n != 0) {
-    result += (n & 1);
-    n = n / 2;
-  }
-  return result;
-}
-
-// For a run of cold chunks, opens and closes an external if statement that
-// checks multiple has_bits words to skip bulk of cold fields.
-class ColdChunkSkipper {
- public:
-  ColdChunkSkipper(
-      const Descriptor* descriptor, const Options& options,
-      const std::vector<std::vector<const FieldDescriptor*>>& chunks,
-      const std::vector<int>& has_bit_indices, const double cold_threshold)
-      : chunks_(chunks),
-        has_bit_indices_(has_bit_indices),
-        access_info_map_(options.access_info_map),
-        cold_threshold_(cold_threshold) {
-    SetCommonVars(options, &variables_);
-    SetCommonMessageDataVariables(descriptor, &variables_);
-  }
-
-  // May open an external if check for a batch of cold fields. "from" is the
-  // prefix to _has_bits_ to allow MergeFrom to use "from._has_bits_".
-  // Otherwise, it should be "".
-  void OnStartChunk(int chunk, int cached_has_word_index,
-                    const std::string& from, io::Printer* printer);
-  bool OnEndChunk(int chunk, io::Printer* printer);
-
- private:
-  bool IsColdChunk(int chunk);
-
-  int HasbitWord(int chunk, int offset) {
-    return has_bit_indices_[chunks_[chunk][offset]->index()] / 32;
-  }
-
-  const std::vector<std::vector<const FieldDescriptor*>>& chunks_;
-  const std::vector<int>& has_bit_indices_;
-  const AccessInfoMap* access_info_map_;
-  const double cold_threshold_;
-  std::map<std::string, std::string> variables_;
-  int limit_chunk_ = -1;
-};
-
-// Tuning parameters for ColdChunkSkipper.
-const double kColdRatio = 0.005;
-
-bool ColdChunkSkipper::IsColdChunk(int chunk) {
-  // Mark this variable as used until it is actually used
-  (void)cold_threshold_;
-  return false;
-}
-
-
-void ColdChunkSkipper::OnStartChunk(int chunk, int cached_has_word_index,
-                                    const std::string& from,
-                                    io::Printer* printer) {
-  Formatter format(printer, variables_);
-  if (!access_info_map_) {
-    return;
-  } else if (chunk < limit_chunk_) {
-    // We are already inside a run of cold chunks.
-    return;
-  } else if (!IsColdChunk(chunk)) {
-    // We can't start a run of cold chunks.
-    return;
-  }
-
-  // Find the end of consecutive cold chunks.
-  limit_chunk_ = chunk;
-  while (limit_chunk_ < chunks_.size() && IsColdChunk(limit_chunk_)) {
-    limit_chunk_++;
-  }
-
-  if (limit_chunk_ <= chunk + 1) {
-    // Require at least two chunks to emit external has_bit checks.
-    limit_chunk_ = -1;
-    return;
-  }
-
-  // Emit has_bit check for each has_bit_dword index.
-  format("if (PROTOBUF_PREDICT_FALSE(");
-  int first_word = HasbitWord(chunk, 0);
-  while (chunk < limit_chunk_) {
-    uint32_t mask = 0;
-    int this_word = HasbitWord(chunk, 0);
-    // Generate mask for chunks on the same word.
-    for (; chunk < limit_chunk_ && HasbitWord(chunk, 0) == this_word; chunk++) {
-      for (auto field : chunks_[chunk]) {
-        int hasbit_index = has_bit_indices_[field->index()];
-        // Fields on a chunk must be in the same word.
-        GOOGLE_CHECK_EQ(this_word, hasbit_index / 32);
-        mask |= 1 << (hasbit_index % 32);
-      }
-    }
-
-    if (this_word != first_word) {
-      format(" ||\n    ");
-    }
-    format.Set("mask", strings::Hex(mask, strings::ZERO_PAD_8));
-    if (this_word == cached_has_word_index) {
-      format("(cached_has_bits & 0x$mask$u) != 0");
-    } else {
-      format("($1$_impl_._has_bits_[$2$] & 0x$mask$u) != 0", from, this_word);
-    }
-  }
-  format(")) {\n");
-  format.Indent();
-}
-
-bool ColdChunkSkipper::OnEndChunk(int chunk, io::Printer* printer) {
-  Formatter format(printer, variables_);
-  if (chunk != limit_chunk_ - 1) {
-    return false;
-  }
-  format.Outdent();
-  format("}\n");
-  return true;
-}
-
-void MaySetAnnotationVariable(const Options& options,
-                              StringPiece annotation_name,
-                              StringPiece injector_template_prefix,
-                              StringPiece injector_template_suffix,
-                              std::map<std::string, std::string>* variables) {
-  if (options.field_listener_options.forbidden_field_listener_events.count(
-          std::string(annotation_name)))
-    return;
-  (*variables)[StrCat("annotate_", annotation_name)] = strings::Substitute(
-      StrCat(injector_template_prefix, injector_template_suffix),
-      (*variables)["classtype"]);
-}
-
-void GenerateExtensionAnnotations(
-    const Descriptor* descriptor, const Options& options,
-    std::map<std::string, std::string>* variables) {
-  const std::map<std::string, std::string> accessor_annotations_to_hooks = {
-      {"annotate_extension_has", "OnHasExtension"},
-      {"annotate_extension_clear", "OnClearExtension"},
-      {"annotate_extension_repeated_size", "OnExtensionSize"},
-      {"annotate_extension_get", "OnGetExtension"},
-      {"annotate_extension_mutable", "OnMutableExtension"},
-      {"annotate_extension_set", "OnSetExtension"},
-      {"annotate_extension_release", "OnReleaseExtension"},
-      {"annotate_repeated_extension_get", "OnGetExtension"},
-      {"annotate_repeated_extension_mutable", "OnMutableExtension"},
-      {"annotate_repeated_extension_set", "OnSetExtension"},
-      {"annotate_repeated_extension_add", "OnAddExtension"},
-      {"annotate_repeated_extension_add_mutable", "OnAddMutableExtension"},
-      {"annotate_repeated_extension_list", "OnListExtension"},
-      {"annotate_repeated_extension_list_mutable", "OnMutableListExtension"},
-  };
-  for (const auto& annotation : accessor_annotations_to_hooks) {
-    (*variables)[annotation.first] = "";
-  }
-  if (!HasTracker(descriptor, options)) {
-    return;
-  }
-  StringPiece tracker = (*variables)["tracker"];
-  StringPiece extensions = (*variables)["extensions"];
-  for (const auto& annotation : accessor_annotations_to_hooks) {
-    const std::string& annotation_name = annotation.first;
-    const std::string& listener_call = annotation.second;
-    if (!StrContains(annotation_name, "repeated") &&
-        !StrContains(annotation_name, "size") &&
-        !StrContains(annotation_name, "clear")) {
-      // Primitive fields accessors.
-      // "Has" is here as users calling "has" on a repeated field is a mistake.
-      (*variables)[annotation_name] = StrCat(
-          "  ", tracker, ".", listener_call,
-          "(this, id.number(), _proto_TypeTraits::GetPtr(id.number(), ",
-          extensions, ", id.default_value_ref()));");
-    } else if (StrContains(annotation_name, "repeated") &&
-               !StrContains(annotation_name, "list") &&
-               !StrContains(annotation_name, "size")) {
-      // Repeated index accessors.
-      std::string str_index = "index";
-      if (StrContains(annotation_name, "add")) {
-        str_index = StrCat(extensions, ".ExtensionSize(id.number()) - 1");
-      }
-      (*variables)[annotation_name] =
-          StrCat("  ", tracker, ".", listener_call,
-                       "(this, id.number(), "
-                       "_proto_TypeTraits::GetPtr(id.number(), ",
-                       extensions, ", ", str_index, "));");
-    } else if (StrContains(annotation_name, "list") ||
-               StrContains(annotation_name, "size")) {
-      // Repeated full accessors.
-      (*variables)[annotation_name] = StrCat(
-          "  ", tracker, ".", listener_call,
-          "(this, id.number(), _proto_TypeTraits::GetRepeatedPtr(id.number(), ",
-          extensions, "));");
-    } else {
-      // Generic accessors such as "clear".
-      // TODO(b/190614678): Generalize clear from both repeated and non repeated
-      // calls, currently their underlying memory interfaces are very different.
-      // Or think of removing clear callback as no usages are needed and no
-      // memory exist after calling clear().
-    }
-  }
-}
-
-}  // anonymous namespace
-
-// ===================================================================
-
-MessageGenerator::MessageGenerator(
-    const Descriptor* descriptor,
-    const std::map<std::string, std::string>& vars, int index_in_file_messages,
-    const Options& options, MessageSCCAnalyzer* scc_analyzer)
-    : descriptor_(descriptor),
-      index_in_file_messages_(index_in_file_messages),
-      classname_(ClassName(descriptor, false)),
-      options_(options),
-      field_generators_(descriptor, options, scc_analyzer),
-      max_has_bit_index_(0),
-      max_inlined_string_index_(0),
-      num_weak_fields_(0),
-      scc_analyzer_(scc_analyzer),
-      variables_(vars) {
-  if (!message_layout_helper_) {
-    message_layout_helper_.reset(new PaddingOptimizer());
-  }
-  SetCommonMessageDataVariables(descriptor, &variables_);
-
-  // Variables that apply to this class
-  variables_["classname"] = classname_;
-  variables_["classtype"] = QualifiedClassName(descriptor_, options);
-  variables_["full_name"] = descriptor_->full_name();
-  variables_["superclass"] = SuperClassName(descriptor_, options_);
-  variables_["annotate_serialize"] = "";
-  variables_["annotate_deserialize"] = "";
-  variables_["annotate_reflection"] = "";
-  variables_["annotate_bytesize"] = "";
-  variables_["annotate_mergefrom"] = "";
-
-  if (HasTracker(descriptor_, options_)) {
-    const std::string injector_template =
-        StrCat("  ", variables_["tracker"], ".");
-
-    MaySetAnnotationVariable(options, "serialize", injector_template,
-                             "OnSerialize(this);\n", &variables_);
-    MaySetAnnotationVariable(options, "deserialize", injector_template,
-                             "OnDeserialize(this);\n", &variables_);
-    // TODO(danilak): Ideally annotate_reflection should not exist and we need
-    // to annotate all reflective calls on our own, however, as this is a cause
-    // for side effects, i.e. reading values dynamically, we want the users know
-    // that dynamic access can happen.
-    MaySetAnnotationVariable(options, "reflection", injector_template,
-                             "OnGetMetadata();\n", &variables_);
-    MaySetAnnotationVariable(options, "bytesize", injector_template,
-                             "OnByteSize(this);\n", &variables_);
-    MaySetAnnotationVariable(options, "mergefrom", injector_template,
-                             "OnMergeFrom(_this, &from);\n", &variables_);
-  }
-
-  GenerateExtensionAnnotations(descriptor_, options_, &variables_);
-
-  SetUnknownFieldsVariable(descriptor_, options_, &variables_);
-
-  // Compute optimized field order to be used for layout and initialization
-  // purposes.
-  for (auto field : FieldRange(descriptor_)) {
-    if (IsFieldStripped(field, options_)) {
-      continue;
-    }
-
-    if (IsWeak(field, options_)) {
-      num_weak_fields_++;
-    } else if (!field->real_containing_oneof()) {
-      optimized_order_.push_back(field);
-    }
-  }
-
-  message_layout_helper_->OptimizeLayout(&optimized_order_, options_,
-                                         scc_analyzer_);
-
-  // This message has hasbits iff one or more fields need one.
-  for (auto field : optimized_order_) {
-    if (HasHasbit(field)) {
-      if (has_bit_indices_.empty()) {
-        has_bit_indices_.resize(descriptor_->field_count(), kNoHasbit);
-      }
-      has_bit_indices_[field->index()] = max_has_bit_index_++;
-    }
-    if (IsStringInlined(field, options_)) {
-      if (inlined_string_indices_.empty()) {
-        inlined_string_indices_.resize(descriptor_->field_count(), kNoHasbit);
-        // The bitset[0] is for arena dtor tracking. Donating states start from
-        // bitset[1];
-        max_inlined_string_index_++;
-      }
-      inlined_string_indices_[field->index()] = max_inlined_string_index_++;
-    }
-  }
-
-  if (!has_bit_indices_.empty()) {
-    field_generators_.SetHasBitIndices(has_bit_indices_);
-  }
-
-  if (!inlined_string_indices_.empty()) {
-    field_generators_.SetInlinedStringIndices(inlined_string_indices_);
-  }
-
-  num_required_fields_ = 0;
-  for (int i = 0; i < descriptor->field_count(); i++) {
-    if (descriptor->field(i)->is_required()) {
-      ++num_required_fields_;
-    }
-  }
-
-  parse_function_generator_.reset(new ParseFunctionGenerator(
-      descriptor_, max_has_bit_index_, has_bit_indices_,
-      inlined_string_indices_, options_, scc_analyzer_, variables_));
-}
-
-MessageGenerator::~MessageGenerator() = default;
-
-size_t MessageGenerator::HasBitsSize() const {
-  return (max_has_bit_index_ + 31) / 32;
-}
-
-size_t MessageGenerator::InlinedStringDonatedSize() const {
-  return (max_inlined_string_index_ + 31) / 32;
-}
-
-int MessageGenerator::HasBitIndex(const FieldDescriptor* field) const {
-  return has_bit_indices_.empty() ? kNoHasbit
-                                  : has_bit_indices_[field->index()];
-}
-
-int MessageGenerator::HasByteIndex(const FieldDescriptor* field) const {
-  int hasbit = HasBitIndex(field);
-  return hasbit == kNoHasbit ? kNoHasbit : hasbit / 8;
-}
-
-int MessageGenerator::HasWordIndex(const FieldDescriptor* field) const {
-  int hasbit = HasBitIndex(field);
-  return hasbit == kNoHasbit ? kNoHasbit : hasbit / 32;
-}
-
-void MessageGenerator::AddGenerators(
-    std::vector<std::unique_ptr<EnumGenerator>>* enum_generators,
-    std::vector<std::unique_ptr<ExtensionGenerator>>* extension_generators) {
-  for (int i = 0; i < descriptor_->enum_type_count(); i++) {
-    enum_generators->emplace_back(
-        new EnumGenerator(descriptor_->enum_type(i), variables_, options_));
-    enum_generators_.push_back(enum_generators->back().get());
-  }
-  for (int i = 0; i < descriptor_->extension_count(); i++) {
-    extension_generators->emplace_back(new ExtensionGenerator(
-        descriptor_->extension(i), options_, scc_analyzer_));
-    extension_generators_.push_back(extension_generators->back().get());
-  }
-}
-
-void MessageGenerator::GenerateFieldAccessorDeclarations(io::Printer* printer) {
-  Formatter format(printer, variables_);
-  // optimized_fields_ does not contain fields where
-  //    field->real_containing_oneof()
-  // so we need to iterate over those as well.
-  //
-  // We place the non-oneof fields in optimized_order_, as that controls the
-  // order of the _has_bits_ entries and we want GDB's pretty printers to be
-  // able to infer these indices from the k[FIELDNAME]FieldNumber order.
-  std::vector<const FieldDescriptor*> ordered_fields;
-  ordered_fields.reserve(descriptor_->field_count());
-
-  ordered_fields.insert(ordered_fields.begin(), optimized_order_.begin(),
-                        optimized_order_.end());
-  for (auto field : FieldRange(descriptor_)) {
-    if (!field->real_containing_oneof() && !field->options().weak() &&
-        !IsFieldStripped(field, options_)) {
-      continue;
-    }
-    ordered_fields.push_back(field);
-  }
-
-  if (!ordered_fields.empty()) {
-    format("enum : int {\n");
-    for (auto field : ordered_fields) {
-      Formatter::SaveState save(&format);
-
-      std::map<std::string, std::string> vars;
-      SetCommonFieldVariables(field, &vars, options_);
-      format.AddMap(vars);
-      format("  ${1$$2$$}$ = $number$,\n", field, FieldConstantName(field));
-    }
-    format("};\n");
-  }
-  for (auto field : ordered_fields) {
-    PrintFieldComment(format, field);
-
-    Formatter::SaveState save(&format);
-
-    std::map<std::string, std::string> vars;
-    SetCommonFieldVariables(field, &vars, options_);
-    format.AddMap(vars);
-
-    if (field->is_repeated()) {
-      format("$deprecated_attr$int ${1$$name$_size$}$() const$2$\n", field,
-             !IsFieldStripped(field, options_) ? ";" : " {__builtin_trap();}");
-      if (!IsFieldStripped(field, options_)) {
-        format(
-            "private:\n"
-            "int ${1$_internal_$name$_size$}$() const;\n"
-            "public:\n",
-            field);
-      }
-    } else if (HasHasMethod(field)) {
-      format("$deprecated_attr$bool ${1$has_$name$$}$() const$2$\n", field,
-             !IsFieldStripped(field, options_) ? ";" : " {__builtin_trap();}");
-      if (!IsFieldStripped(field, options_)) {
-        format(
-            "private:\n"
-            "bool _internal_has_$name$() const;\n"
-            "public:\n");
-      }
-    } else if (HasPrivateHasMethod(field)) {
-      if (!IsFieldStripped(field, options_)) {
-        format(
-            "private:\n"
-            "bool ${1$_internal_has_$name$$}$() const;\n"
-            "public:\n",
-            field);
-      }
-    }
-    format("$deprecated_attr$void ${1$clear_$name$$}$()$2$\n", field,
-           !IsFieldStripped(field, options_) ? ";" : "{__builtin_trap();}");
-
-    // Generate type-specific accessor declarations.
-    field_generators_.get(field).GenerateAccessorDeclarations(printer);
-
-    format("\n");
-  }
-
-  if (descriptor_->extension_range_count() > 0) {
-    // Generate accessors for extensions.
-    // We use "_proto_TypeTraits" as a type name below because "TypeTraits"
-    // causes problems if the class has a nested message or enum type with that
-    // name and "_TypeTraits" is technically reserved for the C++ library since
-    // it starts with an underscore followed by a capital letter.
-    //
-    // For similar reason, we use "_field_type" and "_is_packed" as parameter
-    // names below, so that "field_type" and "is_packed" can be used as field
-    // names.
-    format(R"(
-template <typename _proto_TypeTraits,
-          ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-          bool _is_packed>
-inline bool HasExtension(
-    const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-        $classname$, _proto_TypeTraits, _field_type, _is_packed>& id) const {
-$annotate_extension_has$
-  return $extensions$.Has(id.number());
-}
-
-template <typename _proto_TypeTraits,
-          ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-          bool _is_packed>
-inline void ClearExtension(
-    const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-        $classname$, _proto_TypeTraits, _field_type, _is_packed>& id) {
-  $extensions$.ClearExtension(id.number());
-$annotate_extension_clear$
-}
-
-template <typename _proto_TypeTraits,
-          ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-          bool _is_packed>
-inline int ExtensionSize(
-    const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-        $classname$, _proto_TypeTraits, _field_type, _is_packed>& id) const {
-$annotate_extension_repeated_size$
-  return $extensions$.ExtensionSize(id.number());
-}
-
-template <typename _proto_TypeTraits,
-          ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-          bool _is_packed>
-inline typename _proto_TypeTraits::Singular::ConstType GetExtension(
-    const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-        $classname$, _proto_TypeTraits, _field_type, _is_packed>& id) const {
-$annotate_extension_get$
-  return _proto_TypeTraits::Get(id.number(), $extensions$,
-                                id.default_value());
-}
-
-template <typename _proto_TypeTraits,
-          ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-          bool _is_packed>
-inline typename _proto_TypeTraits::Singular::MutableType MutableExtension(
-    const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-        $classname$, _proto_TypeTraits, _field_type, _is_packed>& id) {
-$annotate_extension_mutable$
-  return _proto_TypeTraits::Mutable(id.number(), _field_type,
-                                    &$extensions$);
-}
-
-template <typename _proto_TypeTraits,
-          ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-          bool _is_packed>
-inline void SetExtension(
-    const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-        $classname$, _proto_TypeTraits, _field_type, _is_packed>& id,
-    typename _proto_TypeTraits::Singular::ConstType value) {
-  _proto_TypeTraits::Set(id.number(), _field_type, value, &$extensions$);
-$annotate_extension_set$
-}
-
-template <typename _proto_TypeTraits,
-          ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-          bool _is_packed>
-inline void SetAllocatedExtension(
-    const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-        $classname$, _proto_TypeTraits, _field_type, _is_packed>& id,
-    typename _proto_TypeTraits::Singular::MutableType value) {
-  _proto_TypeTraits::SetAllocated(id.number(), _field_type, value,
-                                  &$extensions$);
-$annotate_extension_set$
-}
-template <typename _proto_TypeTraits,
-          ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-          bool _is_packed>
-inline void UnsafeArenaSetAllocatedExtension(
-    const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-        $classname$, _proto_TypeTraits, _field_type, _is_packed>& id,
-    typename _proto_TypeTraits::Singular::MutableType value) {
-  _proto_TypeTraits::UnsafeArenaSetAllocated(id.number(), _field_type,
-                                             value, &$extensions$);
-$annotate_extension_set$
-}
-template <typename _proto_TypeTraits,
-          ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-          bool _is_packed>
-PROTOBUF_NODISCARD inline
-    typename _proto_TypeTraits::Singular::MutableType
-    ReleaseExtension(
-        const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-            $classname$, _proto_TypeTraits, _field_type, _is_packed>& id) {
-$annotate_extension_release$
-  return _proto_TypeTraits::Release(id.number(), _field_type,
-                                    &$extensions$);
-}
-template <typename _proto_TypeTraits,
-          ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-          bool _is_packed>
-inline typename _proto_TypeTraits::Singular::MutableType
-UnsafeArenaReleaseExtension(
-    const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-        $classname$, _proto_TypeTraits, _field_type, _is_packed>& id) {
-$annotate_extension_release$
-  return _proto_TypeTraits::UnsafeArenaRelease(id.number(), _field_type,
-                                               &$extensions$);
-}
-
-template <typename _proto_TypeTraits,
-          ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-          bool _is_packed>
-inline typename _proto_TypeTraits::Repeated::ConstType GetExtension(
-    const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-        $classname$, _proto_TypeTraits, _field_type, _is_packed>& id,
-    int index) const {
-$annotate_repeated_extension_get$
-  return _proto_TypeTraits::Get(id.number(), $extensions$, index);
-}
-
-template <typename _proto_TypeTraits,
-          ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-          bool _is_packed>
-inline typename _proto_TypeTraits::Repeated::MutableType MutableExtension(
-    const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-        $classname$, _proto_TypeTraits, _field_type, _is_packed>& id,
-    int index) {
-$annotate_repeated_extension_mutable$
-  return _proto_TypeTraits::Mutable(id.number(), index, &$extensions$);
-}
-
-template <typename _proto_TypeTraits,
-          ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-          bool _is_packed>
-inline void SetExtension(
-    const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-        $classname$, _proto_TypeTraits, _field_type, _is_packed>& id,
-    int index, typename _proto_TypeTraits::Repeated::ConstType value) {
-  _proto_TypeTraits::Set(id.number(), index, value, &$extensions$);
-$annotate_repeated_extension_set$
-}
-
-template <typename _proto_TypeTraits,
-          ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-          bool _is_packed>
-inline typename _proto_TypeTraits::Repeated::MutableType AddExtension(
-    const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-        $classname$, _proto_TypeTraits, _field_type, _is_packed>& id) {
-  typename _proto_TypeTraits::Repeated::MutableType to_add =
-      _proto_TypeTraits::Add(id.number(), _field_type, &$extensions$);
-$annotate_repeated_extension_add_mutable$
-  return to_add;
-}
-
-template <typename _proto_TypeTraits,
-          ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-          bool _is_packed>
-inline void AddExtension(
-    const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-        $classname$, _proto_TypeTraits, _field_type, _is_packed>& id,
-    typename _proto_TypeTraits::Repeated::ConstType value) {
-  _proto_TypeTraits::Add(id.number(), _field_type, _is_packed, value,
-                         &$extensions$);
-$annotate_repeated_extension_add$
-}
-
-template <typename _proto_TypeTraits,
-          ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-          bool _is_packed>
-inline const typename _proto_TypeTraits::Repeated::RepeatedFieldType&
-GetRepeatedExtension(
-    const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-        $classname$, _proto_TypeTraits, _field_type, _is_packed>& id) const {
-$annotate_repeated_extension_list$
-  return _proto_TypeTraits::GetRepeated(id.number(), $extensions$);
-}
-
-template <typename _proto_TypeTraits,
-          ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-          bool _is_packed>
-inline typename _proto_TypeTraits::Repeated::RepeatedFieldType*
-MutableRepeatedExtension(
-    const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-        $classname$, _proto_TypeTraits, _field_type, _is_packed>& id) {
-$annotate_repeated_extension_list_mutable$
-  return _proto_TypeTraits::MutableRepeated(id.number(), _field_type,
-                                            _is_packed, &$extensions$);
-}
-
-)");
-    // Generate MessageSet specific APIs for proto2 MessageSet.
-    // For testing purposes we don't check for bridge.MessageSet, so
-    // we don't use IsProto2MessageSet
-    if (descriptor_->options().message_set_wire_format() &&
-        !options_.opensource_runtime && !options_.lite_implicit_weak_fields) {
-      // Special-case MessageSet
-      format("GOOGLE_PROTOBUF_EXTENSION_MESSAGE_SET_ACCESSORS($classname$)\n");
-    }
-  }
-
-  for (auto oneof : OneOfRange(descriptor_)) {
-    Formatter::SaveState saver(&format);
-    format.Set("oneof_name", oneof->name());
-    format.Set("camel_oneof_name", UnderscoresToCamelCase(oneof->name(), true));
-    format(
-        "void ${1$clear_$oneof_name$$}$();\n"
-        "$camel_oneof_name$Case $oneof_name$_case() const;\n",
-        oneof);
-  }
-}
-
-void MessageGenerator::GenerateSingularFieldHasBits(
-    const FieldDescriptor* field, Formatter format) {
-  if (IsFieldStripped(field, options_)) {
-    format(
-        "inline bool $classname$::has_$name$() const { "
-        "__builtin_trap(); }\n");
-    return;
-  }
-  if (field->options().weak()) {
-    format(
-        "inline bool $classname$::has_$name$() const {\n"
-        "$annotate_has$"
-        "  return $weak_field_map$.Has($number$);\n"
-        "}\n");
-    return;
-  }
-  if (HasHasbit(field)) {
-    int has_bit_index = HasBitIndex(field);
-    GOOGLE_CHECK_NE(has_bit_index, kNoHasbit);
-
-    format.Set("has_array_index", has_bit_index / 32);
-    format.Set("has_mask",
-               strings::Hex(1u << (has_bit_index % 32), strings::ZERO_PAD_8));
-    format(
-        "inline bool $classname$::_internal_has_$name$() const {\n"
-        "  bool value = "
-        "($has_bits$[$has_array_index$] & 0x$has_mask$u) != 0;\n");
-
-    if (field->cpp_type() == FieldDescriptor::CPPTYPE_MESSAGE &&
-        !IsLazy(field, options_, scc_analyzer_)) {
-      // We maintain the invariant that for a submessage x, has_x() returning
-      // true implies that x_ is not null. By giving this information to the
-      // compiler, we allow it to eliminate unnecessary null checks later on.
-      format("  PROTOBUF_ASSUME(!value || $field$ != nullptr);\n");
-    }
-
-    format(
-        "  return value;\n"
-        "}\n"
-        "inline bool $classname$::has_$name$() const {\n"
-        "$annotate_has$"
-        "  return _internal_has_$name$();\n"
-        "}\n");
-  } else if (field->cpp_type() == FieldDescriptor::CPPTYPE_MESSAGE) {
-    // Message fields have a has_$name$() method.
-    if (IsLazy(field, options_, scc_analyzer_)) {
-      format(
-          "inline bool $classname$::_internal_has_$name$() const {\n"
-          "  return !$field$.IsCleared();\n"
-          "}\n");
-    } else {
-      format(
-          "inline bool $classname$::_internal_has_$name$() const {\n"
-          "  return this != internal_default_instance() "
-          "&& $field$ != nullptr;\n"
-          "}\n");
-    }
-    format(
-        "inline bool $classname$::has_$name$() const {\n"
-        "$annotate_has$"
-        "  return _internal_has_$name$();\n"
-        "}\n");
-  }
-}
-
-void MessageGenerator::GenerateOneofHasBits(io::Printer* printer) {
-  Formatter format(printer, variables_);
-  for (auto oneof : OneOfRange(descriptor_)) {
-    format.Set("oneof_name", oneof->name());
-    format.Set("oneof_index", oneof->index());
-    format.Set("cap_oneof_name", ToUpper(oneof->name()));
-    format(
-        "inline bool $classname$::has_$oneof_name$() const {\n"
-        "  return $oneof_name$_case() != $cap_oneof_name$_NOT_SET;\n"
-        "}\n"
-        "inline void $classname$::clear_has_$oneof_name$() {\n"
-        "  $oneof_case$[$oneof_index$] = $cap_oneof_name$_NOT_SET;\n"
-        "}\n");
-  }
-}
-
-void MessageGenerator::GenerateOneofMemberHasBits(const FieldDescriptor* field,
-                                                  const Formatter& format) {
-  if (IsFieldStripped(field, options_)) {
-    if (HasHasMethod(field)) {
-      format(
-          "inline bool $classname$::has_$name$() const { "
-          "__builtin_trap(); }\n");
-    }
-    format(
-        "inline void $classname$::set_has_$name$() { __builtin_trap(); "
-        "}\n");
-    return;
-  }
-  // Singular field in a oneof
-  // N.B.: Without field presence, we do not use has-bits or generate
-  // has_$name$() methods, but oneofs still have set_has_$name$().
-  // Oneofs also have has_$name$() but only as a private helper
-  // method, so that generated code is slightly cleaner (vs.  comparing
-  // _oneof_case_[index] against a constant everywhere).
-  //
-  // If has_$name$() is private, there is no need to add an internal accessor.
-  // Only annotate public accessors.
-  if (HasHasMethod(field)) {
-    format(
-        "inline bool $classname$::_internal_has_$name$() const {\n"
-        "  return $oneof_name$_case() == k$field_name$;\n"
-        "}\n"
-        "inline bool $classname$::has_$name$() const {\n"
-        "$annotate_has$"
-        "  return _internal_has_$name$();\n"
-        "}\n");
-  } else if (HasPrivateHasMethod(field)) {
-    format(
-        "inline bool $classname$::_internal_has_$name$() const {\n"
-        "  return $oneof_name$_case() == k$field_name$;\n"
-        "}\n");
-  }
-  // set_has_$name$() for oneof fields is always private; hence should not be
-  // annotated.
-  format(
-      "inline void $classname$::set_has_$name$() {\n"
-      "  $oneof_case$[$oneof_index$] = k$field_name$;\n"
-      "}\n");
-}
-
-void MessageGenerator::GenerateFieldClear(const FieldDescriptor* field,
-                                          bool is_inline, Formatter format) {
-  if (IsFieldStripped(field, options_)) {
-    format("void $classname$::clear_$name$() { __builtin_trap(); }\n");
-    return;
-  }
-
-  // Generate clear_$name$().
-  if (is_inline) {
-    format("inline ");
-  }
-  format("void $classname$::clear_$name$() {\n");
-
-  format.Indent();
-
-  if (field->real_containing_oneof()) {
-    // Clear this field only if it is the active field in this oneof,
-    // otherwise ignore
-    format("if (_internal_has_$name$()) {\n");
-    format.Indent();
-    field_generators_.get(field).GenerateClearingCode(format.printer());
-    format("clear_has_$oneof_name$();\n");
-    format.Outdent();
-    format("}\n");
-  } else {
-    if (ShouldSplit(field, options_)) {
-      format("if (IsSplitMessageDefault()) return;\n");
-    }
-    field_generators_.get(field).GenerateClearingCode(format.printer());
-    if (HasHasbit(field)) {
-      int has_bit_index = HasBitIndex(field);
-      format.Set("has_array_index", has_bit_index / 32);
-      format.Set("has_mask",
-                 strings::Hex(1u << (has_bit_index % 32), strings::ZERO_PAD_8));
-      format("$has_bits$[$has_array_index$] &= ~0x$has_mask$u;\n");
-    }
-  }
-  format("$annotate_clear$");
-  format.Outdent();
-  format("}\n");
-}
-
-void MessageGenerator::GenerateFieldAccessorDefinitions(io::Printer* printer) {
-  Formatter format(printer, variables_);
-  format("// $classname$\n\n");
-
-  for (auto field : FieldRange(descriptor_)) {
-    PrintFieldComment(format, field);
-
-    if (IsFieldStripped(field, options_)) {
-      continue;
-    }
-
-    std::map<std::string, std::string> vars;
-    SetCommonFieldVariables(field, &vars, options_);
-
-    Formatter::SaveState saver(&format);
-    format.AddMap(vars);
-
-    // Generate has_$name$() or $name$_size().
-    if (field->is_repeated()) {
-      if (IsFieldStripped(field, options_)) {
-        format(
-            "inline int $classname$::$name$_size() const { "
-            "__builtin_trap(); }\n");
-      } else {
-        format(
-            "inline int $classname$::_internal_$name$_size() const {\n"
-            "  return $field$$1$.size();\n"
-            "}\n"
-            "inline int $classname$::$name$_size() const {\n"
-            "$annotate_size$"
-            "  return _internal_$name$_size();\n"
-            "}\n",
-            IsImplicitWeakField(field, options_, scc_analyzer_) &&
-                    field->message_type()
-                ? ".weak"
-                : "");
-      }
-    } else if (field->real_containing_oneof()) {
-      format.Set("field_name", UnderscoresToCamelCase(field->name(), true));
-      format.Set("oneof_name", field->containing_oneof()->name());
-      format.Set("oneof_index",
-                 StrCat(field->containing_oneof()->index()));
-      GenerateOneofMemberHasBits(field, format);
-    } else {
-      // Singular field.
-      GenerateSingularFieldHasBits(field, format);
-    }
-
-    if (!IsCrossFileMaybeMap(field)) {
-      GenerateFieldClear(field, true, format);
-    }
-
-    // Generate type-specific accessors.
-    if (!IsFieldStripped(field, options_)) {
-      field_generators_.get(field).GenerateInlineAccessorDefinitions(printer);
-    }
-
-    format("\n");
-  }
-
-  // Generate has_$name$() and clear_has_$name$() functions for oneofs.
-  GenerateOneofHasBits(printer);
-}
-
-void MessageGenerator::GenerateClassDefinition(io::Printer* printer) {
-  Formatter format(printer, variables_);
-  format.Set("class_final",
-             ShouldMarkClassAsFinal(descriptor_, options_) ? "final" : "");
-
-  if (IsMapEntryMessage(descriptor_)) {
-    std::map<std::string, std::string> vars;
-    CollectMapInfo(options_, descriptor_, &vars);
-    vars["lite"] =
-        HasDescriptorMethods(descriptor_->file(), options_) ? "" : "Lite";
-    format.AddMap(vars);
-    format(
-        "class $classname$ : public "
-        "::$proto_ns$::internal::MapEntry$lite$<$classname$, \n"
-        "    $key_cpp$, $val_cpp$,\n"
-        "    ::$proto_ns$::internal::WireFormatLite::$key_wire_type$,\n"
-        "    ::$proto_ns$::internal::WireFormatLite::$val_wire_type$> {\n"
-        "public:\n"
-        "  typedef ::$proto_ns$::internal::MapEntry$lite$<$classname$, \n"
-        "    $key_cpp$, $val_cpp$,\n"
-        "    ::$proto_ns$::internal::WireFormatLite::$key_wire_type$,\n"
-        "    ::$proto_ns$::internal::WireFormatLite::$val_wire_type$> "
-        "SuperType;\n"
-        "  $classname$();\n"
-        "  explicit PROTOBUF_CONSTEXPR $classname$(\n"
-        "      ::$proto_ns$::internal::ConstantInitialized);\n"
-        "  explicit $classname$(::$proto_ns$::Arena* arena);\n"
-        "  void MergeFrom(const $classname$& other);\n"
-        "  static const $classname$* internal_default_instance() { return "
-        "reinterpret_cast<const "
-        "$classname$*>(&_$classname$_default_instance_); }\n");
-    auto utf8_check = GetUtf8CheckMode(descriptor_->field(0), options_);
-    if (descriptor_->field(0)->type() == FieldDescriptor::TYPE_STRING &&
-        utf8_check != Utf8CheckMode::kNone) {
-      if (utf8_check == Utf8CheckMode::kStrict) {
-        format(
-            "  static bool ValidateKey(std::string* s) {\n"
-            "    return ::$proto_ns$::internal::WireFormatLite::"
-            "VerifyUtf8String(s->data(), static_cast<int>(s->size()), "
-            "::$proto_ns$::internal::WireFormatLite::PARSE, \"$1$\");\n"
-            " }\n",
-            descriptor_->field(0)->full_name());
-      } else {
-        GOOGLE_CHECK(utf8_check == Utf8CheckMode::kVerify);
-        format(
-            "  static bool ValidateKey(std::string* s) {\n"
-            "#ifndef NDEBUG\n"
-            "    ::$proto_ns$::internal::WireFormatLite::VerifyUtf8String(\n"
-            "       s->data(), static_cast<int>(s->size()), "
-            "::$proto_ns$::internal::"
-            "WireFormatLite::PARSE, \"$1$\");\n"
-            "#else\n"
-            "    (void) s;\n"
-            "#endif\n"
-            "    return true;\n"
-            " }\n",
-            descriptor_->field(0)->full_name());
-      }
-    } else {
-      format("  static bool ValidateKey(void*) { return true; }\n");
-    }
-    if (descriptor_->field(1)->type() == FieldDescriptor::TYPE_STRING &&
-        utf8_check != Utf8CheckMode::kNone) {
-      if (utf8_check == Utf8CheckMode::kStrict) {
-        format(
-            "  static bool ValidateValue(std::string* s) {\n"
-            "    return ::$proto_ns$::internal::WireFormatLite::"
-            "VerifyUtf8String(s->data(), static_cast<int>(s->size()), "
-            "::$proto_ns$::internal::WireFormatLite::PARSE, \"$1$\");\n"
-            " }\n",
-            descriptor_->field(1)->full_name());
-      } else {
-        GOOGLE_CHECK(utf8_check == Utf8CheckMode::kVerify);
-        format(
-            "  static bool ValidateValue(std::string* s) {\n"
-            "#ifndef NDEBUG\n"
-            "    ::$proto_ns$::internal::WireFormatLite::VerifyUtf8String(\n"
-            "       s->data(), static_cast<int>(s->size()), "
-            "::$proto_ns$::internal::"
-            "WireFormatLite::PARSE, \"$1$\");\n"
-            "#else\n"
-            "    (void) s;\n"
-            "#endif\n"
-            "    return true;\n"
-            " }\n",
-            descriptor_->field(1)->full_name());
-      }
-    } else {
-      format("  static bool ValidateValue(void*) { return true; }\n");
-    }
-    if (HasDescriptorMethods(descriptor_->file(), options_)) {
-      format(
-          "  using ::$proto_ns$::Message::MergeFrom;\n"
-          ""
-          "  ::$proto_ns$::Metadata GetMetadata() const final;\n");
-    }
-    format(
-        "  friend struct ::$tablename$;\n"
-        "};\n");
-    return;
-  }
-
-  format(
-      "class $dllexport_decl $${1$$classname$$}$$ class_final$ :\n"
-      "    public $superclass$ /* @@protoc_insertion_point("
-      "class_definition:$full_name$) */ {\n",
-      descriptor_);
-  format(" public:\n");
-  format.Indent();
-
-  if (EnableMessageOwnedArena(descriptor_, options_)) {
-    format(
-        "inline $classname$() : $classname$("
-        "::$proto_ns$::Arena::InternalCreateMessageOwnedArena(), true) {}\n");
-  } else if (EnableMessageOwnedArenaTrial(descriptor_, options_)) {
-    format(
-        "inline $classname$() : $classname$(InMoaTrial() ? "
-        "::$proto_ns$::Arena::InternalCreateMessageOwnedArena() : nullptr, "
-        "InMoaTrial()) {}\n");
-  } else {
-    format("inline $classname$() : $classname$(nullptr) {}\n");
-  }
-  if (!HasSimpleBaseClass(descriptor_, options_)) {
-    format("~$classname$() override;\n");
-  }
-  format(
-      "explicit PROTOBUF_CONSTEXPR "
-      "$classname$(::$proto_ns$::internal::ConstantInitialized);\n"
-      "\n"
-      "$classname$(const $classname$& from);\n"
-      "$classname$($classname$&& from) noexcept\n"
-      "  : $classname$() {\n"
-      "  *this = ::std::move(from);\n"
-      "}\n"
-      "\n"
-      "inline $classname$& operator=(const $classname$& from) {\n"
-      "  CopyFrom(from);\n"
-      "  return *this;\n"
-      "}\n"
-      "inline $classname$& operator=($classname$&& from) noexcept {\n"
-      "  if (this == &from) return *this;\n"
-      "  if (GetOwningArena() == from.GetOwningArena()\n"
-      "#ifdef PROTOBUF_FORCE_COPY_IN_MOVE\n"
-      "      && GetOwningArena() != nullptr\n"
-      "#endif  // !PROTOBUF_FORCE_COPY_IN_MOVE\n"
-      "  ) {\n"
-      "    InternalSwap(&from);\n"
-      "  } else {\n"
-      "    CopyFrom(from);\n"
-      "  }\n"
-      "  return *this;\n"
-      "}\n"
-      "\n");
-
-  if (PublicUnknownFieldsAccessors(descriptor_)) {
-    format(
-        "inline const $unknown_fields_type$& unknown_fields() const {\n"
-        "  return $unknown_fields$;\n"
-        "}\n"
-        "inline $unknown_fields_type$* mutable_unknown_fields() {\n"
-        "  return $mutable_unknown_fields$;\n"
-        "}\n"
-        "\n");
-  }
-
-  // Only generate this member if it's not disabled.
-  if (HasDescriptorMethods(descriptor_->file(), options_) &&
-      !descriptor_->options().no_standard_descriptor_accessor()) {
-    format(
-        "static const ::$proto_ns$::Descriptor* descriptor() {\n"
-        "  return GetDescriptor();\n"
-        "}\n");
-  }
-
-  if (HasDescriptorMethods(descriptor_->file(), options_)) {
-    // These shadow non-static methods of the same names in Message.  We
-    // redefine them here because calls directly on the generated class can be
-    // statically analyzed -- we know what descriptor types are being requested.
-    // It also avoids a vtable dispatch.
-    //
-    // We would eventually like to eliminate the methods in Message, and having
-    // this separate also lets us track calls to the base class methods
-    // separately.
-    format(
-        "static const ::$proto_ns$::Descriptor* GetDescriptor() {\n"
-        "  return default_instance().GetMetadata().descriptor;\n"
-        "}\n"
-        "static const ::$proto_ns$::Reflection* GetReflection() {\n"
-        "  return default_instance().GetMetadata().reflection;\n"
-        "}\n");
-  }
-
-  format(
-      "static const $classname$& default_instance() {\n"
-      "  return *internal_default_instance();\n"
-      "}\n");
-
-  // Generate enum values for every field in oneofs. One list is generated for
-  // each oneof with an additional *_NOT_SET value.
-  for (auto oneof : OneOfRange(descriptor_)) {
-    format("enum $1$Case {\n", UnderscoresToCamelCase(oneof->name(), true));
-    format.Indent();
-    for (auto field : FieldRange(oneof)) {
-      format("$1$ = $2$,\n", OneofCaseConstantName(field),  // 1
-             field->number());                              // 2
-    }
-    format("$1$_NOT_SET = 0,\n", ToUpper(oneof->name()));
-    format.Outdent();
-    format(
-        "};\n"
-        "\n");
-  }
-
-  // TODO(gerbens) make this private, while still granting other protos access.
-  format(
-      "static inline const $classname$* internal_default_instance() {\n"
-      "  return reinterpret_cast<const $classname$*>(\n"
-      "             &_$classname$_default_instance_);\n"
-      "}\n"
-      "static constexpr int kIndexInFileMessages =\n"
-      "  $1$;\n"
-      "\n",
-      index_in_file_messages_);
-
-  if (IsAnyMessage(descriptor_, options_)) {
-    format(
-        "// implements Any -----------------------------------------------\n"
-        "\n");
-    if (HasDescriptorMethods(descriptor_->file(), options_)) {
-      format(
-          "bool PackFrom(const ::$proto_ns$::Message& message) {\n"
-          "  $DCHK$_NE(&message, this);\n"
-          "  return $any_metadata$.PackFrom(GetArena(), message);\n"
-          "}\n"
-          "bool PackFrom(const ::$proto_ns$::Message& message,\n"
-          "              ::PROTOBUF_NAMESPACE_ID::ConstStringParam "
-          "type_url_prefix) {\n"
-          "  $DCHK$_NE(&message, this);\n"
-          "  return $any_metadata$.PackFrom(GetArena(), message, "
-          "type_url_prefix);\n"
-          "}\n"
-          "bool UnpackTo(::$proto_ns$::Message* message) const {\n"
-          "  return $any_metadata$.UnpackTo(message);\n"
-          "}\n"
-          "static bool GetAnyFieldDescriptors(\n"
-          "    const ::$proto_ns$::Message& message,\n"
-          "    const ::$proto_ns$::FieldDescriptor** type_url_field,\n"
-          "    const ::$proto_ns$::FieldDescriptor** value_field);\n"
-          "template <typename T, class = typename std::enable_if<"
-          "!std::is_convertible<T, const ::$proto_ns$::Message&>"
-          "::value>::type>\n"
-          "bool PackFrom(const T& message) {\n"
-          "  return $any_metadata$.PackFrom<T>(GetArena(), message);\n"
-          "}\n"
-          "template <typename T, class = typename std::enable_if<"
-          "!std::is_convertible<T, const ::$proto_ns$::Message&>"
-          "::value>::type>\n"
-          "bool PackFrom(const T& message,\n"
-          "              ::PROTOBUF_NAMESPACE_ID::ConstStringParam "
-          "type_url_prefix) {\n"
-          "  return $any_metadata$.PackFrom<T>(GetArena(), message, "
-          "type_url_prefix);"
-          "}\n"
-          "template <typename T, class = typename std::enable_if<"
-          "!std::is_convertible<T, const ::$proto_ns$::Message&>"
-          "::value>::type>\n"
-          "bool UnpackTo(T* message) const {\n"
-          "  return $any_metadata$.UnpackTo<T>(message);\n"
-          "}\n");
-    } else {
-      format(
-          "template <typename T>\n"
-          "bool PackFrom(const T& message) {\n"
-          "  return $any_metadata$.PackFrom(GetArena(), message);\n"
-          "}\n"
-          "template <typename T>\n"
-          "bool PackFrom(const T& message,\n"
-          "              ::PROTOBUF_NAMESPACE_ID::ConstStringParam "
-          "type_url_prefix) {\n"
-          "  return $any_metadata$.PackFrom(GetArena(), message, "
-          "type_url_prefix);\n"
-          "}\n"
-          "template <typename T>\n"
-          "bool UnpackTo(T* message) const {\n"
-          "  return $any_metadata$.UnpackTo(message);\n"
-          "}\n");
-    }
-    format(
-        "template<typename T> bool Is() const {\n"
-        "  return $any_metadata$.Is<T>();\n"
-        "}\n"
-        "static bool ParseAnyTypeUrl(::PROTOBUF_NAMESPACE_ID::ConstStringParam "
-        "type_url,\n"
-        "                            std::string* full_type_name);\n");
-  }
-
-  format(
-      "friend void swap($classname$& a, $classname$& b) {\n"
-      "  a.Swap(&b);\n"
-      "}\n"
-      "inline void Swap($classname$* other) {\n"
-      "  if (other == this) return;\n"
-      "#ifdef PROTOBUF_FORCE_COPY_IN_SWAP\n"
-      "  if (GetOwningArena() != nullptr &&\n"
-      "      GetOwningArena() == other->GetOwningArena()) {\n "
-      "#else  // PROTOBUF_FORCE_COPY_IN_SWAP\n"
-      "  if (GetOwningArena() == other->GetOwningArena()) {\n"
-      "#endif  // !PROTOBUF_FORCE_COPY_IN_SWAP\n"
-      "    InternalSwap(other);\n"
-      "  } else {\n"
-      "    ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);\n"
-      "  }\n"
-      "}\n"
-      "void UnsafeArenaSwap($classname$* other) {\n"
-      "  if (other == this) return;\n"
-      "  $DCHK$(GetOwningArena() == other->GetOwningArena());\n"
-      "  InternalSwap(other);\n"
-      "}\n");
-
-  format(
-      "\n"
-      "// implements Message ----------------------------------------------\n"
-      "\n"
-      "$classname$* New(::$proto_ns$::Arena* arena = nullptr) const final {\n"
-      "  return CreateMaybeMessage<$classname$>(arena);\n"
-      "}\n");
-
-  // For instances that derive from Message (rather than MessageLite), some
-  // methods are virtual and should be marked as final.
-  format.Set("full_final", HasDescriptorMethods(descriptor_->file(), options_)
-                               ? "final"
-                               : "");
-
-  if (HasGeneratedMethods(descriptor_->file(), options_)) {
-    if (HasDescriptorMethods(descriptor_->file(), options_)) {
-      if (!HasSimpleBaseClass(descriptor_, options_)) {
-        format(
-            // Use Message's built-in MergeFrom and CopyFrom when the passed-in
-            // argument is a generic Message instance, and only define the
-            // custom MergeFrom and CopyFrom instances when the source of the
-            // merge/copy is known to be the same class as the destination.
-            "using $superclass$::CopyFrom;\n"
-            "void CopyFrom(const $classname$& from);\n"
-            ""
-            "using $superclass$::MergeFrom;\n"
-            "void MergeFrom("
-            " const $classname$& from) {\n"
-            "  $classname$::MergeImpl(*this, from);\n"
-            "}\n"
-            "private:\n"
-            "static void MergeImpl(::$proto_ns$::Message& to_msg, const "
-            "::$proto_ns$::Message& from_msg);\n"
-            "public:\n");
-      } else {
-        format(
-            "using $superclass$::CopyFrom;\n"
-            "inline void CopyFrom(const $classname$& from) {\n"
-            "  $superclass$::CopyImpl(*this, from);\n"
-            "}\n"
-            ""
-            "using $superclass$::MergeFrom;\n"
-            "void MergeFrom(const $classname$& from) {\n"
-            "  $superclass$::MergeImpl(*this, from);\n"
-            "}\n"
-            "public:\n");
-      }
-    } else {
-      format(
-          "void CheckTypeAndMergeFrom(const ::$proto_ns$::MessageLite& from)"
-          "  final;\n"
-          "void CopyFrom(const $classname$& from);\n"
-          "void MergeFrom(const $classname$& from);\n");
-    }
-
-    if (!HasSimpleBaseClass(descriptor_, options_)) {
-      format(
-          "PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;\n"
-          "bool IsInitialized() const final;\n"
-          "\n"
-          "size_t ByteSizeLong() const final;\n");
-
-      parse_function_generator_->GenerateMethodDecls(printer);
-
-      format(
-          "$uint8$* _InternalSerialize(\n"
-          "    $uint8$* target, ::$proto_ns$::io::EpsCopyOutputStream* stream) "
-          "const final;\n");
-    }
-  }
-
-  if (options_.field_listener_options.inject_field_listener_events) {
-    format("static constexpr int _kInternalFieldNumber = $1$;\n",
-           descriptor_->field_count());
-  }
-
-  if (!HasSimpleBaseClass(descriptor_, options_)) {
-    format(
-        "int GetCachedSize() const final { return "
-        "$cached_size$.Get(); }"
-        "\n\nprivate:\n"
-        "void SharedCtor(::$proto_ns$::Arena* arena, bool is_message_owned);\n"
-        "void SharedDtor();\n"
-        "void SetCachedSize(int size) const$ full_final$;\n"
-        "void InternalSwap($classname$* other);\n");
-  }
-
-  format(
-      // Friend AnyMetadata so that it can call this FullMessageName() method.
-      "\nprivate:\n"
-      "friend class ::$proto_ns$::internal::AnyMetadata;\n"
-      "static $1$ FullMessageName() {\n"
-      "  return \"$full_name$\";\n"
-      "}\n",
-      options_.opensource_runtime ? "::PROTOBUF_NAMESPACE_ID::StringPiece"
-                                  : "::StringPiece");
-
-  format(
-      // TODO(gerbens) Make this private! Currently people are deriving from
-      // protos to give access to this constructor, breaking the invariants
-      // we rely on.
-      "protected:\n"
-      "explicit $classname$(::$proto_ns$::Arena* arena,\n"
-      "                     bool is_message_owned = false);\n");
-
-  switch (NeedsArenaDestructor()) {
-    case ArenaDtorNeeds::kOnDemand:
-      format(
-          "private:\n"
-          "static void ArenaDtor(void* object);\n"
-          "inline void OnDemandRegisterArenaDtor(::$proto_ns$::Arena* arena) "
-          "override {\n"
-          "  if (arena == nullptr || ($inlined_string_donated_array$[0] & "
-          "0x1u) "
-          "== "
-          "0) {\n"
-          "   return;\n"
-          "  }\n"
-          "  $inlined_string_donated_array$[0] &= 0xFFFFFFFEu;\n"
-          "  arena->OwnCustomDestructor(this, &$classname$::ArenaDtor);\n"
-          "}\n");
-      break;
-    case ArenaDtorNeeds::kRequired:
-      format(
-          "private:\n"
-          "static void ArenaDtor(void* object);\n");
-      break;
-    case ArenaDtorNeeds::kNone:
-      break;
-  }
-
-  format(
-      "public:\n"
-      "\n");
-
-  if (HasDescriptorMethods(descriptor_->file(), options_)) {
-    if (HasGeneratedMethods(descriptor_->file(), options_)) {
-      format(
-          "static const ClassData _class_data_;\n"
-          "const ::$proto_ns$::Message::ClassData*"
-          "GetClassData() const final;\n"
-          "\n");
-    }
-    format(
-        "::$proto_ns$::Metadata GetMetadata() const final;\n"
-        "\n");
-  } else {
-    format(
-        "std::string GetTypeName() const final;\n"
-        "\n");
-  }
-
-  if (ShouldSplit(descriptor_, options_)) {
-    format(
-        "private:\n"
-        "inline bool IsSplitMessageDefault() const {\n"
-        "  return $split$ == reinterpret_cast<Impl_::Split*>(&$1$);\n"
-        "}\n"
-        "PROTOBUF_NOINLINE void PrepareSplitMessageForWrite();\n"
-        "public:\n",
-        DefaultInstanceName(descriptor_, options_, /*split=*/true));
-  }
-
-  format(
-      "// nested types ----------------------------------------------------\n"
-      "\n");
-
-  // Import all nested message classes into this class's scope with typedefs.
-  for (int i = 0; i < descriptor_->nested_type_count(); i++) {
-    const Descriptor* nested_type = descriptor_->nested_type(i);
-    if (!IsMapEntryMessage(nested_type)) {
-      format.Set("nested_full_name", ClassName(nested_type, false));
-      format.Set("nested_name", ResolveKeyword(nested_type->name()));
-      format("typedef ${1$$nested_full_name$$}$ ${1$$nested_name$$}$;\n",
-             nested_type);
-    }
-  }
-
-  if (descriptor_->nested_type_count() > 0) {
-    format("\n");
-  }
-
-  // Import all nested enums and their values into this class's scope with
-  // typedefs and constants.
-  for (int i = 0; i < descriptor_->enum_type_count(); i++) {
-    enum_generators_[i]->GenerateSymbolImports(printer);
-    format("\n");
-  }
-
-  format(
-      "// accessors -------------------------------------------------------\n"
-      "\n");
-
-  // Generate accessor methods for all fields.
-  GenerateFieldAccessorDeclarations(printer);
-
-  // Declare extension identifiers.
-  for (int i = 0; i < descriptor_->extension_count(); i++) {
-    extension_generators_[i]->GenerateDeclaration(printer);
-  }
-
-
-  format("// @@protoc_insertion_point(class_scope:$full_name$)\n");
-
-  // Generate private members.
-  format.Outdent();
-  format(" private:\n");
-  format.Indent();
-  // TODO(seongkim): Remove hack to track field access and remove this class.
-  format("class _Internal;\n");
-
-  for (auto field : FieldRange(descriptor_)) {
-    // set_has_***() generated in all oneofs.
-    if (!field->is_repeated() && !field->options().weak() &&
-        field->real_containing_oneof()) {
-      format("void set_has_$1$();\n", FieldName(field));
-    }
-  }
-  format("\n");
-
-  // Generate oneof function declarations
-  for (auto oneof : OneOfRange(descriptor_)) {
-    format(
-        "inline bool has_$1$() const;\n"
-        "inline void clear_has_$1$();\n\n",
-        oneof->name());
-  }
-
-  if (HasGeneratedMethods(descriptor_->file(), options_) &&
-      !descriptor_->options().message_set_wire_format() &&
-      num_required_fields_ > 1) {
-    format(
-        "// helper for ByteSizeLong()\n"
-        "size_t RequiredFieldsByteSizeFallback() const;\n\n");
-  }
-
-  if (HasGeneratedMethods(descriptor_->file(), options_)) {
-    parse_function_generator_->GenerateDataDecls(printer);
-  }
-
-  // Prepare decls for _cached_size_ and _has_bits_.  Their position in the
-  // output will be determined later.
-
-  bool need_to_emit_cached_size = !HasSimpleBaseClass(descriptor_, options_);
-  const std::string cached_size_decl =
-      "mutable ::$proto_ns$::internal::CachedSize _cached_size_;\n";
-
-  const size_t sizeof_has_bits = HasBitsSize();
-  const std::string has_bits_decl =
-      sizeof_has_bits == 0 ? ""
-                           : StrCat("::$proto_ns$::internal::HasBits<",
-                                          sizeof_has_bits, "> _has_bits_;\n");
-
-  format(
-      "template <typename T> friend class "
-      "::$proto_ns$::Arena::InternalHelper;\n"
-      "typedef void InternalArenaConstructable_;\n"
-      "typedef void DestructorSkippable_;\n");
-
-  // To minimize padding, data members are divided into three sections:
-  // (1) members assumed to align to 8 bytes
-  // (2) members corresponding to message fields, re-ordered to optimize
-  //     alignment.
-  // (3) members assumed to align to 4 bytes.
-
-  format("struct Impl_ {\n");
-  format.Indent();
-
-  // Members assumed to align to 8 bytes:
-
-  if (descriptor_->extension_range_count() > 0) {
-    format(
-        "::$proto_ns$::internal::ExtensionSet _extensions_;\n"
-        "\n");
-  }
-
-  if (HasTracker(descriptor_, options_)) {
-    format("static ::$proto_ns$::AccessListener<$1$> _tracker_;\n",
-           ClassName(descriptor_));
-  }
-
-  // Generate _inlined_string_donated_ for inlined string type.
-  // TODO(congliu): To avoid affecting the locality of `_has_bits_`, should this
-  // be below or above `_has_bits_`?
-  if (!inlined_string_indices_.empty()) {
-    format("::$proto_ns$::internal::HasBits<$1$> _inlined_string_donated_;\n",
-           InlinedStringDonatedSize());
-  }
-
-  if (!has_bit_indices_.empty()) {
-    // _has_bits_ is frequently accessed, so to reduce code size and improve
-    // speed, it should be close to the start of the object. Placing
-    // _cached_size_ together with _has_bits_ improves cache locality despite
-    // potential alignment padding.
-    format(has_bits_decl.c_str());
-    if (need_to_emit_cached_size) {
-      format(cached_size_decl.c_str());
-      need_to_emit_cached_size = false;
-    }
-  }
-
-  // Field members:
-
-  // Emit some private and static members
-  for (auto field : optimized_order_) {
-    const FieldGenerator& generator = field_generators_.get(field);
-    generator.GenerateStaticMembers(printer);
-    if (!ShouldSplit(field, options_)) {
-      generator.GeneratePrivateMembers(printer);
-    }
-  }
-  if (ShouldSplit(descriptor_, options_)) {
-    format("struct Split {\n");
-    format.Indent();
-    for (auto field : optimized_order_) {
-      if (!ShouldSplit(field, options_)) continue;
-      const FieldGenerator& generator = field_generators_.get(field);
-      generator.GeneratePrivateMembers(printer);
-    }
-    format.Outdent();
-    format(
-        "  typedef void InternalArenaConstructable_;\n"
-        "  typedef void DestructorSkippable_;\n"
-        "};\n"
-        "Split* _split_;\n");
-  }
-
-  // For each oneof generate a union
-  for (auto oneof : OneOfRange(descriptor_)) {
-    std::string camel_oneof_name = UnderscoresToCamelCase(oneof->name(), true);
-    format("union $1$Union {\n", camel_oneof_name);
-    format.Indent();
-    format(
-        // explicit empty constructor is needed when union contains
-        // ArenaStringPtr members for string fields.
-        "constexpr $1$Union() : _constinit_{} {}\n"
-        "  ::$proto_ns$::internal::ConstantInitialized _constinit_;\n",
-        camel_oneof_name);
-    for (auto field : FieldRange(oneof)) {
-      if (!IsFieldStripped(field, options_)) {
-        field_generators_.get(field).GeneratePrivateMembers(printer);
-      }
-    }
-    format.Outdent();
-    format("} $1$_;\n", oneof->name());
-    for (auto field : FieldRange(oneof)) {
-      if (!IsFieldStripped(field, options_)) {
-        field_generators_.get(field).GenerateStaticMembers(printer);
-      }
-    }
-  }
-
-  // Members assumed to align to 4 bytes:
-
-  if (need_to_emit_cached_size) {
-    format(cached_size_decl.c_str());
-    need_to_emit_cached_size = false;
-  }
-
-  // Generate _oneof_case_.
-  if (descriptor_->real_oneof_decl_count() > 0) {
-    format(
-        "$uint32$ _oneof_case_[$1$];\n"
-        "\n",
-        descriptor_->real_oneof_decl_count());
-  }
-
-  if (num_weak_fields_) {
-    format("::$proto_ns$::internal::WeakFieldMap _weak_field_map_;\n");
-  }
-  // Generate _any_metadata_ for the Any type.
-  if (IsAnyMessage(descriptor_, options_)) {
-    format("::$proto_ns$::internal::AnyMetadata _any_metadata_;\n");
-  }
-
-  format.Outdent();
-  format("};\n");
-
-  // Only create the _impl_ field if it contains data.
-  if (HasImplData(descriptor_, options_)) {
-    format("union { Impl_ _impl_; };\n");
-  }
-
-  if (ShouldSplit(descriptor_, options_)) {
-    format(
-        "static Impl_::Split* CreateSplitMessage("
-        "::$proto_ns$::Arena* arena);\n");
-    format("friend struct $1$;\n",
-           DefaultInstanceType(descriptor_, options_, /*split=*/true));
-  }
-
-  // The TableStruct struct needs access to the private parts, in order to
-  // construct the offsets of all members.
-  format("friend struct ::$tablename$;\n");
-
-  format.Outdent();
-  format("};");
-  GOOGLE_DCHECK(!need_to_emit_cached_size);
-}  // NOLINT(readability/fn_size)
-
-void MessageGenerator::GenerateInlineMethods(io::Printer* printer) {
-  if (IsMapEntryMessage(descriptor_)) return;
-  GenerateFieldAccessorDefinitions(printer);
-
-  // Generate oneof_case() functions.
-  for (auto oneof : OneOfRange(descriptor_)) {
-    Formatter format(printer, variables_);
-    format.Set("camel_oneof_name", UnderscoresToCamelCase(oneof->name(), true));
-    format.Set("oneof_name", oneof->name());
-    format.Set("oneof_index", oneof->index());
-    format(
-        "inline $classname$::$camel_oneof_name$Case $classname$::"
-        "${1$$oneof_name$_case$}$() const {\n"
-        "  return $classname$::$camel_oneof_name$Case("
-        "$oneof_case$[$oneof_index$]);\n"
-        "}\n",
-        oneof);
-  }
-}
-
-void MessageGenerator::GenerateSchema(io::Printer* printer, int offset,
-                                      int has_offset) {
-  Formatter format(printer, variables_);
-  has_offset = !has_bit_indices_.empty() || IsMapEntryMessage(descriptor_)
-                   ? offset + has_offset
-                   : -1;
-  int inlined_string_indices_offset;
-  if (inlined_string_indices_.empty()) {
-    inlined_string_indices_offset = -1;
-  } else {
-    GOOGLE_DCHECK_NE(has_offset, -1);
-    GOOGLE_DCHECK(!IsMapEntryMessage(descriptor_));
-    inlined_string_indices_offset = has_offset + has_bit_indices_.size();
-  }
-
-  format("{ $1$, $2$, $3$, sizeof($classtype$)},\n", offset, has_offset,
-         inlined_string_indices_offset);
-}
-
-void MessageGenerator::GenerateClassMethods(io::Printer* printer) {
-  Formatter format(printer, variables_);
-  if (IsMapEntryMessage(descriptor_)) {
-    format(
-        "$classname$::$classname$() {}\n"
-        "$classname$::$classname$(::$proto_ns$::Arena* arena)\n"
-        "    : SuperType(arena) {}\n"
-        "void $classname$::MergeFrom(const $classname$& other) {\n"
-        "  MergeFromInternal(other);\n"
-        "}\n");
-    if (HasDescriptorMethods(descriptor_->file(), options_)) {
-      if (!descriptor_->options().map_entry()) {
-        format(
-            "::$proto_ns$::Metadata $classname$::GetMetadata() const {\n"
-            "$annotate_reflection$"
-            "  return ::_pbi::AssignDescriptors(\n"
-            "      &$desc_table$_getter, &$desc_table$_once,\n"
-            "      $file_level_metadata$[$1$]);\n"
-            "}\n",
-            index_in_file_messages_);
-      } else {
-        format(
-            "::$proto_ns$::Metadata $classname$::GetMetadata() const {\n"
-            "  return ::_pbi::AssignDescriptors(\n"
-            "      &$desc_table$_getter, &$desc_table$_once,\n"
-            "      $file_level_metadata$[$1$]);\n"
-            "}\n",
-            index_in_file_messages_);
-      }
-    }
-    return;
-  }
-
-  if (IsAnyMessage(descriptor_, options_)) {
-    if (HasDescriptorMethods(descriptor_->file(), options_)) {
-      format(
-          "bool $classname$::GetAnyFieldDescriptors(\n"
-          "    const ::$proto_ns$::Message& message,\n"
-          "    const ::$proto_ns$::FieldDescriptor** type_url_field,\n"
-          "    const ::$proto_ns$::FieldDescriptor** value_field) {\n"
-          "  return ::_pbi::GetAnyFieldDescriptors(\n"
-          "      message, type_url_field, value_field);\n"
-          "}\n");
-    }
-    format(
-        "bool $classname$::ParseAnyTypeUrl(\n"
-        "    ::PROTOBUF_NAMESPACE_ID::ConstStringParam type_url,\n"
-        "    std::string* full_type_name) {\n"
-        "  return ::_pbi::ParseAnyTypeUrl(type_url, full_type_name);\n"
-        "}\n"
-        "\n");
-  }
-
-  format(
-      "class $classname$::_Internal {\n"
-      " public:\n");
-  format.Indent();
-  if (!has_bit_indices_.empty()) {
-    format(
-        "using HasBits = "
-        "decltype(std::declval<$classname$>().$has_bits$);\n");
-  }
-  for (auto field : FieldRange(descriptor_)) {
-    field_generators_.get(field).GenerateInternalAccessorDeclarations(printer);
-    if (IsFieldStripped(field, options_)) {
-      continue;
-    }
-    if (HasHasbit(field)) {
-      int has_bit_index = HasBitIndex(field);
-      GOOGLE_CHECK_NE(has_bit_index, kNoHasbit) << field->full_name();
-      format(
-          "static void set_has_$1$(HasBits* has_bits) {\n"
-          "  (*has_bits)[$2$] |= $3$u;\n"
-          "}\n",
-          FieldName(field), has_bit_index / 32, (1u << (has_bit_index % 32)));
-    }
-  }
-  if (num_required_fields_ > 0) {
-    const std::vector<uint32_t> masks_for_has_bits = RequiredFieldsBitMask();
-    format(
-        "static bool MissingRequiredFields(const HasBits& has_bits) "
-        "{\n"
-        "  return $1$;\n"
-        "}\n",
-        ConditionalToCheckBitmasks(masks_for_has_bits, false, "has_bits"));
-  }
-
-  format.Outdent();
-  format("};\n\n");
-  for (auto field : FieldRange(descriptor_)) {
-    if (!IsFieldStripped(field, options_)) {
-      field_generators_.get(field).GenerateInternalAccessorDefinitions(
-          printer);
-    }
-  }
-
-  // Generate non-inline field definitions.
-  for (auto field : FieldRange(descriptor_)) {
-    if (IsFieldStripped(field, options_)) {
-      continue;
-    }
-    field_generators_.get(field).GenerateNonInlineAccessorDefinitions(printer);
-    if (IsCrossFileMaybeMap(field)) {
-      Formatter::SaveState saver(&format);
-      std::map<std::string, std::string> vars;
-      SetCommonFieldVariables(field, &vars, options_);
-      if (field->real_containing_oneof()) {
-        SetCommonOneofFieldVariables(field, &vars);
-      }
-      format.AddMap(vars);
-      GenerateFieldClear(field, false, format);
-    }
-  }
-
-  GenerateStructors(printer);
-  format("\n");
-
-  if (descriptor_->real_oneof_decl_count() > 0) {
-    GenerateOneofClear(printer);
-    format("\n");
-  }
-
-  if (HasGeneratedMethods(descriptor_->file(), options_)) {
-    GenerateClear(printer);
-    format("\n");
-
-    if (!HasSimpleBaseClass(descriptor_, options_)) {
-      parse_function_generator_->GenerateMethodImpls(printer);
-      format("\n");
-
-      parse_function_generator_->GenerateDataDefinitions(printer);
-    }
-
-    GenerateSerializeWithCachedSizesToArray(printer);
-    format("\n");
-
-    GenerateByteSize(printer);
-    format("\n");
-
-    GenerateMergeFrom(printer);
-    format("\n");
-
-    GenerateClassSpecificMergeImpl(printer);
-    format("\n");
-
-    GenerateCopyFrom(printer);
-    format("\n");
-
-    GenerateIsInitialized(printer);
-    format("\n");
-  }
-
-  if (ShouldSplit(descriptor_, options_)) {
-    format(
-        "void $classname$::PrepareSplitMessageForWrite() {\n"
-        "  if (IsSplitMessageDefault()) {\n"
-        "    $split$ = CreateSplitMessage(GetArenaForAllocation());\n"
-        "  }\n"
-        "}\n");
-  }
-
-  GenerateVerify(printer);
-
-  GenerateSwap(printer);
-  format("\n");
-
-  if (HasDescriptorMethods(descriptor_->file(), options_)) {
-    if (!descriptor_->options().map_entry()) {
-      format(
-          "::$proto_ns$::Metadata $classname$::GetMetadata() const {\n"
-          "$annotate_reflection$"
-          "  return ::_pbi::AssignDescriptors(\n"
-          "      &$desc_table$_getter, &$desc_table$_once,\n"
-          "      $file_level_metadata$[$1$]);\n"
-          "}\n",
-          index_in_file_messages_);
-    } else {
-      format(
-          "::$proto_ns$::Metadata $classname$::GetMetadata() const {\n"
-          "  return ::_pbi::AssignDescriptors(\n"
-          "      &$desc_table$_getter, &$desc_table$_once,\n"
-          "      $file_level_metadata$[$1$]);\n"
-          "}\n",
-          index_in_file_messages_);
-    }
-  } else {
-    format(
-        "std::string $classname$::GetTypeName() const {\n"
-        "  return \"$full_name$\";\n"
-        "}\n"
-        "\n");
-  }
-
-  if (HasTracker(descriptor_, options_)) {
-    format(
-        "::$proto_ns$::AccessListener<$classtype$> "
-        "$1$::$tracker$(&FullMessageName);\n",
-        ClassName(descriptor_));
-  }
-}
-
-std::pair<size_t, size_t> MessageGenerator::GenerateOffsets(
-    io::Printer* printer) {
-  Formatter format(printer, variables_);
-
-  if (!has_bit_indices_.empty() || IsMapEntryMessage(descriptor_)) {
-    format("PROTOBUF_FIELD_OFFSET($classtype$, $has_bits$),\n");
-  } else {
-    format("~0u,  // no _has_bits_\n");
-  }
-  format("PROTOBUF_FIELD_OFFSET($classtype$, _internal_metadata_),\n");
-  if (descriptor_->extension_range_count() > 0) {
-    format("PROTOBUF_FIELD_OFFSET($classtype$, $extensions$),\n");
-  } else {
-    format("~0u,  // no _extensions_\n");
-  }
-  if (descriptor_->real_oneof_decl_count() > 0) {
-    format("PROTOBUF_FIELD_OFFSET($classtype$, $oneof_case$[0]),\n");
-  } else {
-    format("~0u,  // no _oneof_case_\n");
-  }
-  if (num_weak_fields_ > 0) {
-    format("PROTOBUF_FIELD_OFFSET($classtype$, $weak_field_map$),\n");
-  } else {
-    format("~0u,  // no _weak_field_map_\n");
-  }
-  if (!inlined_string_indices_.empty()) {
-    format(
-        "PROTOBUF_FIELD_OFFSET($classtype$, "
-        "$inlined_string_donated_array$),\n");
-  } else {
-    format("~0u,  // no _inlined_string_donated_\n");
-  }
-  const int kNumGenericOffsets = 6;  // the number of fixed offsets above
-  const size_t offsets = kNumGenericOffsets + descriptor_->field_count() +
-                         descriptor_->real_oneof_decl_count();
-  size_t entries = offsets;
-  for (auto field : FieldRange(descriptor_)) {
-    if (IsFieldStripped(field, options_)) {
-      format("~0u,  // stripped\n");
-      continue;
-    }
-    // TODO(sbenza): We should not have an entry in the offset table for fields
-    // that do not use them.
-    if (field->options().weak() || field->real_containing_oneof()) {
-      // Mark the field to prevent unintentional access through reflection.
-      // Don't use the top bit because that is for unused fields.
-      format("::_pbi::kInvalidFieldOffsetTag");
-    } else {
-      format("PROTOBUF_FIELD_OFFSET($classtype$$1$, $2$)",
-             ShouldSplit(field, options_) ? "::Impl_::Split" : "",
-             ShouldSplit(field, options_)
-                 ? FieldName(field) + "_"
-                 : FieldMemberName(field, /*cold=*/false));
-    }
-
-    // Some information about a field is in the pdproto profile. The profile is
-    // only available at compile time. So we embed such information in the
-    // offset of the field, so that the information is available when
-    // reflectively accessing the field at run time.
-    //
-    // Embed whether the field is eagerly verified lazy or inlined string to the
-    // LSB of the offset.
-    if (IsEagerlyVerifiedLazy(field, options_, scc_analyzer_)) {
-      format(" | 0x1u  // eagerly verified lazy\n");
-    } else if (IsStringInlined(field, options_)) {
-      format(" | 0x1u  // inlined\n");
-    }
-    format(",\n");
-  }
-
-  int count = 0;
-  for (auto oneof : OneOfRange(descriptor_)) {
-    format("PROTOBUF_FIELD_OFFSET($classtype$, _impl_.$1$_),\n", oneof->name());
-    count++;
-  }
-  GOOGLE_CHECK_EQ(count, descriptor_->real_oneof_decl_count());
-
-  if (IsMapEntryMessage(descriptor_)) {
-    entries += 2;
-    format(
-        "0,\n"
-        "1,\n");
-  } else if (!has_bit_indices_.empty()) {
-    entries += has_bit_indices_.size();
-    for (int i = 0; i < has_bit_indices_.size(); i++) {
-      const std::string index =
-          has_bit_indices_[i] >= 0 ? StrCat(has_bit_indices_[i]) : "~0u";
-      format("$1$,\n", index);
-    }
-  }
-  if (!inlined_string_indices_.empty()) {
-    entries += inlined_string_indices_.size();
-    for (int inlined_string_index : inlined_string_indices_) {
-      const std::string index =
-          inlined_string_index >= 0
-              ? StrCat(inlined_string_index, ",  // inlined_string_index")
-              : "~0u,";
-      format("$1$\n", index);
-    }
-  }
-
-  return std::make_pair(entries, offsets);
-}
-
-void MessageGenerator::GenerateSharedConstructorCode(io::Printer* printer) {
-  if (HasSimpleBaseClass(descriptor_, options_)) return;
-  Formatter format(printer, variables_);
-
-  format(
-      "inline void $classname$::SharedCtor(\n"
-      "    ::_pb::Arena* arena, bool is_message_owned) {\n"
-      "  (void)arena;\n"
-      "  (void)is_message_owned;\n");
-
-  format.Indent();
-  // Impl_ _impl_.
-  format("new (&_impl_) Impl_{");
-  format.Indent();
-  const char* field_sep = " ";
-  const auto put_sep = [&] {
-    format("\n$1$ ", field_sep);
-    field_sep = ",";
-  };
-
-  // Note: any fields without move/copy constructors can't be explicitly
-  // aggregate initialized pre-C++17.
-  if (descriptor_->extension_range_count() > 0) {
-    put_sep();
-    format("/*decltype($extensions$)*/{::_pbi::ArenaInitialized(), arena}");
-  }
-  if (!inlined_string_indices_.empty()) {
-    put_sep();
-    format("decltype($inlined_string_donated_array$){}");
-  }
-  bool need_to_emit_cached_size = !HasSimpleBaseClass(descriptor_, options_);
-  if (!has_bit_indices_.empty()) {
-    put_sep();
-    format("decltype($has_bits$){}");
-    if (need_to_emit_cached_size) {
-      put_sep();
-      format("/*decltype($cached_size$)*/{}");
-      need_to_emit_cached_size = false;
-    }
-  }
-
-  // Initialize member variables with arena constructor.
-  for (auto field : optimized_order_) {
-    GOOGLE_DCHECK(!IsFieldStripped(field, options_));
-    if (ShouldSplit(field, options_)) {
-      continue;
-    }
-    put_sep();
-    field_generators_.get(field).GenerateAggregateInitializer(printer);
-  }
-  if (ShouldSplit(descriptor_, options_)) {
-    put_sep();
-    format("decltype($split$){reinterpret_cast<Impl_::Split*>(&$1$)}",
-           DefaultInstanceName(descriptor_, options_, /*split=*/true));
-  }
-  for (auto oneof : OneOfRange(descriptor_)) {
-    put_sep();
-    format("decltype(_impl_.$1$_){}", oneof->name());
-  }
-
-  if (need_to_emit_cached_size) {
-    put_sep();
-    format("/*decltype($cached_size$)*/{}");
-  }
-
-  if (descriptor_->real_oneof_decl_count() != 0) {
-    put_sep();
-    format("/*decltype($oneof_case$)*/{}");
-  }
-  if (num_weak_fields_ > 0) {
-    put_sep();
-    format("decltype($weak_field_map$){arena}");
-  }
-  if (IsAnyMessage(descriptor_, options_)) {
-    put_sep();
-    // AnyMetadata has no move constructor.
-    format("/*decltype($any_metadata$)*/{&_impl_.type_url_, &_impl_.value_}");
-  }
-
-  format.Outdent();
-  format("\n};\n");
-
-  if (!inlined_string_indices_.empty()) {
-    // Donate inline string fields.
-    format.Indent();
-    // The last bit is the tracking bit for registering ArenaDtor. The bit is 1
-    // means ArenaDtor is not registered on construction, and on demand register
-    // is needed.
-    format("if (arena != nullptr) {\n");
-    if (NeedsArenaDestructor() == ArenaDtorNeeds::kOnDemand) {
-      format(
-          "  if (!is_message_owned) {\n"
-          "    $inlined_string_donated_array$[0] = ~0u;\n"
-          "  } else {\n"
-          // We should not register ArenaDtor for MOA.
-          "    $inlined_string_donated_array$[0] = 0xFFFFFFFEu;\n"
-          "  }\n");
-    } else {
-      format("  $inlined_string_donated_array$[0] = 0xFFFFFFFEu;\n");
-    }
-    for (size_t i = 1; i < InlinedStringDonatedSize(); ++i) {
-      format("  $inlined_string_donated_array$[$1$] = ~0u;\n", i);
-    }
-    format("}\n");
-    format.Outdent();
-  }
-
-  for (const FieldDescriptor* field : optimized_order_) {
-    if (ShouldSplit(field, options_)) {
-      continue;
-    }
-    field_generators_.get(field).GenerateConstructorCode(printer);
-  }
-
-  for (auto oneof : OneOfRange(descriptor_)) {
-    format("clear_has_$1$();\n", oneof->name());
-  }
-
-  format.Outdent();
-  format("}\n\n");
-}
-
-void MessageGenerator::GenerateCreateSplitMessage(io::Printer* printer) {
-  Formatter format(printer, variables_);
-  format(
-      "$classname$::Impl_::Split* "
-      "$classname$::CreateSplitMessage(::$proto_ns$::Arena* arena) {\n");
-  format.Indent();
-  const char* field_sep = " ";
-  const auto put_sep = [&] {
-    format("\n$1$ ", field_sep);
-    field_sep = ",";
-  };
-  format(
-      "const size_t size = sizeof(Impl_::Split);\n"
-      "void* chunk = (arena == nullptr) ?\n"
-      "  ::operator new(size) :\n"
-      "  arena->AllocateAligned(size, alignof(Impl_::Split));\n"
-      "Impl_::Split* ptr = reinterpret_cast<Impl_::Split*>(chunk);\n"
-      "new (ptr) Impl_::Split{");
-  format.Indent();
-  for (const FieldDescriptor* field : optimized_order_) {
-    GOOGLE_DCHECK(!IsFieldStripped(field, options_));
-    if (ShouldSplit(field, options_)) {
-      put_sep();
-      field_generators_.get(field).GenerateAggregateInitializer(printer);
-    }
-  }
-  format.Outdent();
-  format("};\n");
-  for (const FieldDescriptor* field : optimized_order_) {
-    GOOGLE_DCHECK(!IsFieldStripped(field, options_));
-    if (ShouldSplit(field, options_)) {
-      field_generators_.get(field).GenerateCreateSplitMessageCode(printer);
-    }
-  }
-  format("return ptr;\n");
-  format.Outdent();
-  format("}\n");
-}
-
-void MessageGenerator::GenerateInitDefaultSplitInstance(io::Printer* printer) {
-  if (!ShouldSplit(descriptor_, options_)) return;
-
-  Formatter format(printer, variables_);
-  const char* field_sep = " ";
-  const auto put_sep = [&] {
-    format("\n$1$ ", field_sep);
-    field_sep = ",";
-  };
-  for (const auto* field : optimized_order_) {
-    if (ShouldSplit(field, options_)) {
-      put_sep();
-      field_generators_.get(field).GenerateConstexprAggregateInitializer(
-          printer);
-    }
-  }
-}
-
-void MessageGenerator::GenerateSharedDestructorCode(io::Printer* printer) {
-  if (HasSimpleBaseClass(descriptor_, options_)) return;
-  Formatter format(printer, variables_);
-
-  format("inline void $classname$::SharedDtor() {\n");
-  format.Indent();
-  format("$DCHK$(GetArenaForAllocation() == nullptr);\n");
-
-  if (descriptor_->extension_range_count() > 0) {
-    format("$extensions$.~ExtensionSet();\n");
-  }
-
-  // Write the destructors for each field except oneof members.
-  // optimized_order_ does not contain oneof fields.
-  for (auto field : optimized_order_) {
-    if (ShouldSplit(field, options_)) {
-      continue;
-    }
-    field_generators_.get(field).GenerateDestructorCode(printer);
-  }
-  if (ShouldSplit(descriptor_, options_)) {
-    format("if (!IsSplitMessageDefault()) {\n");
-    format.Indent();
-    format("auto* $cached_split_ptr$ = $split$;\n");
-    for (auto field : optimized_order_) {
-      if (ShouldSplit(field, options_)) {
-        field_generators_.get(field).GenerateDestructorCode(printer);
-      }
-    }
-    format("delete $cached_split_ptr$;\n");
-    format.Outdent();
-    format("}\n");
-  }
-
-  // Generate code to destruct oneofs. Clearing should do the work.
-  for (auto oneof : OneOfRange(descriptor_)) {
-    format(
-        "if (has_$1$()) {\n"
-        "  clear_$1$();\n"
-        "}\n",
-        oneof->name());
-  }
-
-  if (num_weak_fields_) {
-    format("$weak_field_map$.ClearAll();\n");
-  }
-
-  if (IsAnyMessage(descriptor_, options_)) {
-    format("$any_metadata$.~AnyMetadata();\n");
-  }
-
-  format.Outdent();
-  format(
-      "}\n"
-      "\n");
-}
-
-ArenaDtorNeeds MessageGenerator::NeedsArenaDestructor() const {
-  if (HasSimpleBaseClass(descriptor_, options_)) return ArenaDtorNeeds::kNone;
-  ArenaDtorNeeds needs = ArenaDtorNeeds::kNone;
-  for (const auto* field : FieldRange(descriptor_)) {
-    if (IsFieldStripped(field, options_)) continue;
-    needs =
-        std::max(needs, field_generators_.get(field).NeedsArenaDestructor());
-  }
-  return needs;
-}
-
-void MessageGenerator::GenerateArenaDestructorCode(io::Printer* printer) {
-  GOOGLE_CHECK(NeedsArenaDestructor() > ArenaDtorNeeds::kNone);
-
-  Formatter format(printer, variables_);
-
-  // Generate the ArenaDtor() method. Track whether any fields actually produced
-  // code that needs to be called.
-  format("void $classname$::ArenaDtor(void* object) {\n");
-  format.Indent();
-
-  // This code is placed inside a static method, rather than an ordinary one,
-  // since that simplifies Arena's destructor list (ordinary function pointers
-  // rather than member function pointers). _this is the object being
-  // destructed.
-  format("$classname$* _this = reinterpret_cast< $classname$* >(object);\n");
-
-  // Process non-oneof fields first.
-  for (auto field : optimized_order_) {
-    if (IsFieldStripped(field, options_) || ShouldSplit(field, options_))
-      continue;
-    const FieldGenerator& fg = field_generators_.get(field);
-    fg.GenerateArenaDestructorCode(printer);
-  }
-  if (ShouldSplit(descriptor_, options_)) {
-    format("if (!_this->IsSplitMessageDefault()) {\n");
-    format.Indent();
-    for (auto field : optimized_order_) {
-      if (IsFieldStripped(field, options_) || !ShouldSplit(field, options_))
-        continue;
-      const FieldGenerator& fg = field_generators_.get(field);
-      fg.GenerateArenaDestructorCode(printer);
-    }
-    format.Outdent();
-    format("}\n");
-  }
-
-  // Process oneof fields.
-  for (auto oneof : OneOfRange(descriptor_)) {
-    for (auto field : FieldRange(oneof)) {
-      if (IsFieldStripped(field, options_)) continue;
-      field_generators_.get(field).GenerateArenaDestructorCode(printer);
-    }
-  }
-
-  format.Outdent();
-  format("}\n");
-}
-
-void MessageGenerator::GenerateConstexprConstructor(io::Printer* printer) {
-  Formatter format(printer, variables_);
-
-  if (IsMapEntryMessage(descriptor_) || !HasImplData(descriptor_, options_)) {
-    format(
-        "PROTOBUF_CONSTEXPR $classname$::$classname$(\n"
-        "    ::_pbi::ConstantInitialized) {}\n");
-    return;
-  }
-
-  format(
-      "PROTOBUF_CONSTEXPR $classname$::$classname$(\n"
-      "    ::_pbi::ConstantInitialized)");
-
-  bool need_to_emit_cached_size = !HasSimpleBaseClass(descriptor_, options_);
-  format(": _impl_{");
-  format.Indent();
-  const char* field_sep = " ";
-  const auto put_sep = [&] {
-    format("\n$1$ ", field_sep);
-    field_sep = ",";
-  };
-  if (descriptor_->extension_range_count() > 0) {
-    put_sep();
-    format("/*decltype($extensions$)*/{}");
-  }
-  if (!inlined_string_indices_.empty()) {
-    put_sep();
-    format("/*decltype($inlined_string_donated_array$)*/{}");
-  }
-  if (!has_bit_indices_.empty()) {
-    put_sep();
-    format("/*decltype($has_bits$)*/{}");
-    if (need_to_emit_cached_size) {
-      put_sep();
-      format("/*decltype($cached_size$)*/{}");
-      need_to_emit_cached_size = false;
-    }
-  }
-  for (auto field : optimized_order_) {
-    if (ShouldSplit(field, options_)) {
-      continue;
-    }
-    put_sep();
-    field_generators_.get(field).GenerateConstexprAggregateInitializer(
-        printer);
-  }
-  if (ShouldSplit(descriptor_, options_)) {
-    put_sep();
-    format("/*decltype($split$)*/&$1$._instance",
-           DefaultInstanceName(descriptor_, options_, /*split=*/true));
-  }
-
-  for (auto oneof : OneOfRange(descriptor_)) {
-    put_sep();
-    format("/*decltype(_impl_.$1$_)*/{}", oneof->name());
-  }
-
-  if (need_to_emit_cached_size) {
-    put_sep();
-    format("/*decltype($cached_size$)*/{}");
-  }
-
-  if (descriptor_->real_oneof_decl_count() != 0) {
-    put_sep();
-    format("/*decltype($oneof_case$)*/{}");
-  }
-
-  if (num_weak_fields_) {
-    put_sep();
-    format("/*decltype($weak_field_map$)*/{}");
-  }
-
-  if (IsAnyMessage(descriptor_, options_)) {
-    put_sep();
-    format(
-        "/*decltype($any_metadata$)*/{&_impl_.type_url_, "
-        "&_impl_.value_}");
-  }
-
-  format.Outdent();
-  format("} {}\n");
-}
-
-void MessageGenerator::GenerateCopyConstructorBody(io::Printer* printer) const {
-  Formatter format(printer, variables_);
-
-  const RunMap runs =
-      FindRuns(optimized_order_, [this](const FieldDescriptor* field) {
-        return IsPOD(field) && !ShouldSplit(field, options_);
-      });
-
-  std::string pod_template =
-      "::memcpy(&$first$, &from.$first$,\n"
-      "  static_cast<size_t>(reinterpret_cast<char*>(&$last$) -\n"
-      "  reinterpret_cast<char*>(&$first$)) + sizeof($last$));\n";
-
-  if (ShouldSplit(descriptor_, options_)) {
-    format("if (!from.IsSplitMessageDefault()) {\n");
-    format.Indent();
-    format("_this->PrepareSplitMessageForWrite();\n");
-    for (auto field : optimized_order_) {
-      if (ShouldSplit(field, options_)) {
-        field_generators_.get(field).GenerateCopyConstructorCode(printer);
-      }
-    }
-    format.Outdent();
-    format("}\n");
-  }
-
-  for (size_t i = 0; i < optimized_order_.size(); ++i) {
-    const FieldDescriptor* field = optimized_order_[i];
-    if (ShouldSplit(field, options_)) {
-      continue;
-    }
-    const auto it = runs.find(field);
-
-    // We only apply the memset technique to runs of more than one field, as
-    // assignment is better than memset for generated code clarity.
-    if (it != runs.end() && it->second > 1) {
-      // Use a memset, then skip run_length fields.
-      const size_t run_length = it->second;
-      const std::string first_field_name =
-          FieldMemberName(field, /*cold=*/false);
-      const std::string last_field_name =
-          FieldMemberName(optimized_order_[i + run_length - 1], /*cold=*/false);
-
-      format.Set("first", first_field_name);
-      format.Set("last", last_field_name);
-
-      format(pod_template.c_str());
-
-      i += run_length - 1;
-      // ++i at the top of the loop.
-    } else {
-      field_generators_.get(field).GenerateCopyConstructorCode(printer);
-    }
-  }
-}
-
-void MessageGenerator::GenerateStructors(io::Printer* printer) {
-  Formatter format(printer, variables_);
-
-  format(
-      "$classname$::$classname$(::$proto_ns$::Arena* arena,\n"
-      "                         bool is_message_owned)\n"
-      "  : $1$(arena, is_message_owned) {\n",
-      SuperClassName(descriptor_, options_));
-
-  if (!HasSimpleBaseClass(descriptor_, options_)) {
-    format("  SharedCtor(arena, is_message_owned);\n");
-    if (NeedsArenaDestructor() == ArenaDtorNeeds::kRequired) {
-      format(
-          "  if (arena != nullptr && !is_message_owned) {\n"
-          "    arena->OwnCustomDestructor(this, &$classname$::ArenaDtor);\n"
-          "  }\n");
-    }
-  }
-  format(
-      "  // @@protoc_insertion_point(arena_constructor:$full_name$)\n"
-      "}\n");
-
-  std::map<std::string, std::string> vars;
-  SetUnknownFieldsVariable(descriptor_, options_, &vars);
-  format.AddMap(vars);
-
-  // Generate the copy constructor.
-  if (UsingImplicitWeakFields(descriptor_->file(), options_)) {
-    // If we are in lite mode and using implicit weak fields, we generate a
-    // one-liner copy constructor that delegates to MergeFrom. This saves some
-    // code size and also cuts down on the complexity of implicit weak fields.
-    // We might eventually want to do this for all lite protos.
-    format(
-        "$classname$::$classname$(const $classname$& from)\n"
-        "  : $classname$() {\n"
-        "  MergeFrom(from);\n"
-        "}\n");
-  } else {
-    format(
-        "$classname$::$classname$(const $classname$& from)\n"
-        "  : $superclass$() {\n");
-    format.Indent();
-    format("$classname$* const _this = this; (void)_this;\n");
-
-    if (HasImplData(descriptor_, options_)) {
-      const char* field_sep = " ";
-      const auto put_sep = [&] {
-        format("\n$1$ ", field_sep);
-        field_sep = ",";
-      };
-
-      format("new (&_impl_) Impl_{");
-      format.Indent();
-
-      if (descriptor_->extension_range_count() > 0) {
-        put_sep();
-        format("/*decltype($extensions$)*/{}");
-      }
-      if (!inlined_string_indices_.empty()) {
-        // Do not copy inlined_string_donated_, because this is not an arena
-        // constructor.
-        put_sep();
-        format("decltype($inlined_string_donated_array$){}");
-      }
-      bool need_to_emit_cached_size =
-          !HasSimpleBaseClass(descriptor_, options_);
-      if (!has_bit_indices_.empty()) {
-        put_sep();
-        format("decltype($has_bits$){from.$has_bits$}");
-        if (need_to_emit_cached_size) {
-          put_sep();
-          format("/*decltype($cached_size$)*/{}");
-          need_to_emit_cached_size = false;
-        }
-      }
-
-      // Initialize member variables with arena constructor.
-      for (auto field : optimized_order_) {
-        if (ShouldSplit(field, options_)) {
-          continue;
-        }
-        put_sep();
-        field_generators_.get(field).GenerateCopyAggregateInitializer(printer);
-      }
-      if (ShouldSplit(descriptor_, options_)) {
-        put_sep();
-        format("decltype($split$){reinterpret_cast<Impl_::Split*>(&$1$)}",
-               DefaultInstanceName(descriptor_, options_, /*split=*/true));
-      }
-      for (auto oneof : OneOfRange(descriptor_)) {
-        put_sep();
-        format("decltype(_impl_.$1$_){}", oneof->name());
-      }
-
-      if (need_to_emit_cached_size) {
-        put_sep();
-        format("/*decltype($cached_size$)*/{}");
-      }
-
-      if (descriptor_->real_oneof_decl_count() != 0) {
-        put_sep();
-        format("/*decltype($oneof_case$)*/{}");
-      }
-      if (num_weak_fields_ > 0) {
-        put_sep();
-        format("decltype($weak_field_map$){from.$weak_field_map$}");
-      }
-      if (IsAnyMessage(descriptor_, options_)) {
-        put_sep();
-        format(
-            "/*decltype($any_metadata$)*/{&_impl_.type_url_, &_impl_.value_}");
-      }
-      format.Outdent();
-      format("};\n\n");
-    }
-
-    format(
-        "_internal_metadata_.MergeFrom<$unknown_fields_type$>(from._internal_"
-        "metadata_);\n");
-
-    if (descriptor_->extension_range_count() > 0) {
-      format(
-          "$extensions$.MergeFrom(internal_default_instance(), "
-          "from.$extensions$);\n");
-    }
-
-    GenerateCopyConstructorBody(printer);
-
-    // Copy oneof fields. Oneof field requires oneof case check.
-    for (auto oneof : OneOfRange(descriptor_)) {
-      format(
-          "clear_has_$1$();\n"
-          "switch (from.$1$_case()) {\n",
-          oneof->name());
-      format.Indent();
-      for (auto field : FieldRange(oneof)) {
-        format("case k$1$: {\n", UnderscoresToCamelCase(field->name(), true));
-        format.Indent();
-        if (!IsFieldStripped(field, options_)) {
-          field_generators_.get(field).GenerateMergingCode(printer);
-        }
-        format("break;\n");
-        format.Outdent();
-        format("}\n");
-      }
-      format(
-          "case $1$_NOT_SET: {\n"
-          "  break;\n"
-          "}\n",
-          ToUpper(oneof->name()));
-      format.Outdent();
-      format("}\n");
-    }
-
-    format.Outdent();
-    format(
-        "  // @@protoc_insertion_point(copy_constructor:$full_name$)\n"
-        "}\n"
-        "\n");
-  }
-
-  // Generate the shared constructor code.
-  GenerateSharedConstructorCode(printer);
-
-  if (ShouldSplit(descriptor_, options_)) {
-    GenerateCreateSplitMessage(printer);
-  }
-
-  // Generate the destructor.
-  if (!HasSimpleBaseClass(descriptor_, options_)) {
-    format(
-        "$classname$::~$classname$() {\n"
-        "  // @@protoc_insertion_point(destructor:$full_name$)\n");
-    format(
-        "  if (auto *arena = "
-        "_internal_metadata_.DeleteReturnArena<$unknown_fields_type$>()) {\n"
-        "  (void)arena;\n");
-    if (NeedsArenaDestructor() > ArenaDtorNeeds::kNone) {
-      format("    ArenaDtor(this);\n");
-    }
-    format(
-        "    return;\n"
-        "  }\n");
-    format(
-        "  SharedDtor();\n"
-        "}\n"
-        "\n");
-  } else {
-    // For messages using simple base classes, having no destructor
-    // allows our vtable to share the same destructor as every other
-    // message with a simple base class.  This works only as long as
-    // we have no fields needing destruction, of course.  (No strings
-    // or extensions)
-  }
-
-  // Generate the shared destructor code.
-  GenerateSharedDestructorCode(printer);
-
-  // Generate the arena-specific destructor code.
-  if (NeedsArenaDestructor() > ArenaDtorNeeds::kNone) {
-    GenerateArenaDestructorCode(printer);
-  }
-
-  if (!HasSimpleBaseClass(descriptor_, options_)) {
-    // Generate SetCachedSize.
-    format(
-        "void $classname$::SetCachedSize(int size) const {\n"
-        "  $cached_size$.Set(size);\n"
-        "}\n");
-  }
-}
-
-void MessageGenerator::GenerateSourceInProto2Namespace(io::Printer* printer) {
-  Formatter format(printer, variables_);
-  format(
-      "template<> "
-      "PROTOBUF_NOINLINE $classtype$*\n"
-      "Arena::CreateMaybeMessage< $classtype$ >(Arena* arena) {\n"
-      "  return Arena::CreateMessageInternal< $classtype$ >(arena);\n"
-      "}\n");
-}
-
-void MessageGenerator::GenerateClear(io::Printer* printer) {
-  if (HasSimpleBaseClass(descriptor_, options_)) return;
-  Formatter format(printer, variables_);
-
-  // The maximum number of bytes we will memset to zero without checking their
-  // hasbit to see if a zero-init is necessary.
-  const int kMaxUnconditionalPrimitiveBytesClear = 4;
-
-  format(
-      "void $classname$::Clear() {\n"
-      "// @@protoc_insertion_point(message_clear_start:$full_name$)\n");
-  format.Indent();
-
-  format(
-      // TODO(jwb): It would be better to avoid emitting this if it is not used,
-      // rather than emitting a workaround for the resulting warning.
-      "$uint32$ cached_has_bits = 0;\n"
-      "// Prevent compiler warnings about cached_has_bits being unused\n"
-      "(void) cached_has_bits;\n\n");
-
-  if (descriptor_->extension_range_count() > 0) {
-    format("$extensions$.Clear();\n");
-  }
-
-  // Collect fields into chunks. Each chunk may have an if() condition that
-  // checks all hasbits in the chunk and skips it if none are set.
-  int zero_init_bytes = 0;
-  for (const auto& field : optimized_order_) {
-    if (CanInitializeByZeroing(field)) {
-      zero_init_bytes += EstimateAlignmentSize(field);
-    }
-  }
-  bool merge_zero_init = zero_init_bytes > kMaxUnconditionalPrimitiveBytesClear;
-  int chunk_count = 0;
-
-  std::vector<std::vector<const FieldDescriptor*>> chunks = CollectFields(
-      optimized_order_,
-      [&](const FieldDescriptor* a, const FieldDescriptor* b) -> bool {
-        chunk_count++;
-        // This predicate guarantees that there is only a single zero-init
-        // (memset) per chunk, and if present it will be at the beginning.
-        bool same = HasByteIndex(a) == HasByteIndex(b) &&
-                    a->is_repeated() == b->is_repeated() &&
-                    ShouldSplit(a, options_) == ShouldSplit(b, options_) &&
-                    (CanInitializeByZeroing(a) == CanInitializeByZeroing(b) ||
-                     (CanInitializeByZeroing(a) &&
-                      (chunk_count == 1 || merge_zero_init)));
-        if (!same) chunk_count = 0;
-        return same;
-      });
-
-  ColdChunkSkipper cold_skipper(descriptor_, options_, chunks, has_bit_indices_,
-                                kColdRatio);
-  int cached_has_word_index = -1;
-
-  for (int chunk_index = 0; chunk_index < chunks.size(); chunk_index++) {
-    std::vector<const FieldDescriptor*>& chunk = chunks[chunk_index];
-    cold_skipper.OnStartChunk(chunk_index, cached_has_word_index, "", printer);
-
-    const FieldDescriptor* memset_start = nullptr;
-    const FieldDescriptor* memset_end = nullptr;
-    bool saw_non_zero_init = false;
-    bool chunk_is_cold = !chunk.empty() && ShouldSplit(chunk.front(), options_);
-    for (const auto& field : chunk) {
-      if (CanInitializeByZeroing(field)) {
-        GOOGLE_CHECK(!saw_non_zero_init);
-        if (!memset_start) memset_start = field;
-        memset_end = field;
-      } else {
-        saw_non_zero_init = true;
-      }
-    }
-
-    // Whether we wrap this chunk in:
-    //   if (cached_has_bits & <chunk hasbits) { /* chunk. */ }
-    // We can omit the if() for chunk size 1, or if our fields do not have
-    // hasbits. I don't understand the rationale for the last part of the
-    // condition, but it matches the old logic.
-    const bool have_outer_if = HasBitIndex(chunk.front()) != kNoHasbit &&
-                               chunk.size() > 1 &&
-                               (memset_end != chunk.back() || merge_zero_init);
-
-    if (have_outer_if) {
-      // Emit an if() that will let us skip the whole chunk if none are set.
-      uint32_t chunk_mask = GenChunkMask(chunk, has_bit_indices_);
-      std::string chunk_mask_str =
-          StrCat(strings::Hex(chunk_mask, strings::ZERO_PAD_8));
-
-      // Check (up to) 8 has_bits at a time if we have more than one field in
-      // this chunk.  Due to field layout ordering, we may check
-      // _has_bits_[last_chunk * 8 / 32] multiple times.
-      GOOGLE_DCHECK_LE(2, popcnt(chunk_mask));
-      GOOGLE_DCHECK_GE(8, popcnt(chunk_mask));
-
-      if (cached_has_word_index != HasWordIndex(chunk.front())) {
-        cached_has_word_index = HasWordIndex(chunk.front());
-        format("cached_has_bits = $has_bits$[$1$];\n", cached_has_word_index);
-      }
-      format("if (cached_has_bits & 0x$1$u) {\n", chunk_mask_str);
-      format.Indent();
-    }
-
-    if (chunk_is_cold) {
-      format("if (!IsSplitMessageDefault()) {\n");
-      format.Indent();
-    }
-
-    if (memset_start) {
-      if (memset_start == memset_end) {
-        // For clarity, do not memset a single field.
-        field_generators_.get(memset_start)
-            .GenerateMessageClearingCode(printer);
-      } else {
-        GOOGLE_CHECK_EQ(chunk_is_cold, ShouldSplit(memset_start, options_));
-        GOOGLE_CHECK_EQ(chunk_is_cold, ShouldSplit(memset_end, options_));
-        format(
-            "::memset(&$1$, 0, static_cast<size_t>(\n"
-            "    reinterpret_cast<char*>(&$2$) -\n"
-            "    reinterpret_cast<char*>(&$1$)) + sizeof($2$));\n",
-            FieldMemberName(memset_start, chunk_is_cold),
-            FieldMemberName(memset_end, chunk_is_cold));
-      }
-    }
-
-    // Clear all non-zero-initializable fields in the chunk.
-    for (const auto& field : chunk) {
-      if (CanInitializeByZeroing(field)) continue;
-      // It's faster to just overwrite primitive types, but we should only
-      // clear strings and messages if they were set.
-      //
-      // TODO(kenton):  Let the CppFieldGenerator decide this somehow.
-      bool have_enclosing_if =
-          HasBitIndex(field) != kNoHasbit &&
-          (field->cpp_type() == FieldDescriptor::CPPTYPE_MESSAGE ||
-           field->cpp_type() == FieldDescriptor::CPPTYPE_STRING);
-
-      if (have_enclosing_if) {
-        PrintPresenceCheck(format, field, has_bit_indices_, printer,
-                           &cached_has_word_index);
-      }
-
-      field_generators_.get(field).GenerateMessageClearingCode(printer);
-
-      if (have_enclosing_if) {
-        format.Outdent();
-        format("}\n");
-      }
-    }
-
-    if (chunk_is_cold) {
-      format.Outdent();
-      format("}\n");
-    }
-
-    if (have_outer_if) {
-      format.Outdent();
-      format("}\n");
-    }
-
-    if (cold_skipper.OnEndChunk(chunk_index, printer)) {
-      // Reset here as it may have been updated in just closed if statement.
-      cached_has_word_index = -1;
-    }
-  }
-
-  // Step 4: Unions.
-  for (auto oneof : OneOfRange(descriptor_)) {
-    format("clear_$1$();\n", oneof->name());
-  }
-
-  if (num_weak_fields_) {
-    format("$weak_field_map$.ClearAll();\n");
-  }
-
-  // We don't clear donated status.
-
-  if (!has_bit_indices_.empty()) {
-    // Step 5: Everything else.
-    format("$has_bits$.Clear();\n");
-  }
-
-  std::map<std::string, std::string> vars;
-  SetUnknownFieldsVariable(descriptor_, options_, &vars);
-  format.AddMap(vars);
-  format("_internal_metadata_.Clear<$unknown_fields_type$>();\n");
-
-  format.Outdent();
-  format("}\n");
-}
-
-void MessageGenerator::GenerateOneofClear(io::Printer* printer) {
-  // Generated function clears the active field and union case (e.g. foo_case_).
-  int i = 0;
-  for (auto oneof : OneOfRange(descriptor_)) {
-    Formatter format(printer, variables_);
-    format.Set("oneofname", oneof->name());
-
-    format(
-        "void $classname$::clear_$oneofname$() {\n"
-        "// @@protoc_insertion_point(one_of_clear_start:$full_name$)\n");
-    format.Indent();
-    format("switch ($oneofname$_case()) {\n");
-    format.Indent();
-    for (auto field : FieldRange(oneof)) {
-      format("case k$1$: {\n", UnderscoresToCamelCase(field->name(), true));
-      format.Indent();
-      // We clear only allocated objects in oneofs
-      if (!IsStringOrMessage(field) || IsFieldStripped(field, options_)) {
-        format("// No need to clear\n");
-      } else {
-        field_generators_.get(field).GenerateClearingCode(printer);
-      }
-      format("break;\n");
-      format.Outdent();
-      format("}\n");
-    }
-    format(
-        "case $1$_NOT_SET: {\n"
-        "  break;\n"
-        "}\n",
-        ToUpper(oneof->name()));
-    format.Outdent();
-    format(
-        "}\n"
-        "$oneof_case$[$1$] = $2$_NOT_SET;\n",
-        i, ToUpper(oneof->name()));
-    format.Outdent();
-    format(
-        "}\n"
-        "\n");
-    i++;
-  }
-}
-
-void MessageGenerator::GenerateSwap(io::Printer* printer) {
-  if (HasSimpleBaseClass(descriptor_, options_)) return;
-  Formatter format(printer, variables_);
-
-  format("void $classname$::InternalSwap($classname$* other) {\n");
-  format.Indent();
-  format("using std::swap;\n");
-
-  if (HasGeneratedMethods(descriptor_->file(), options_)) {
-    if (descriptor_->extension_range_count() > 0) {
-      format(
-          "$extensions$.InternalSwap(&other->$extensions$);"
-          "\n");
-    }
-
-    std::map<std::string, std::string> vars;
-    SetUnknownFieldsVariable(descriptor_, options_, &vars);
-    format.AddMap(vars);
-    if (HasNonSplitOptionalString(descriptor_, options_)) {
-      format(
-          "auto* lhs_arena = GetArenaForAllocation();\n"
-          "auto* rhs_arena = other->GetArenaForAllocation();\n");
-    }
-    format("_internal_metadata_.InternalSwap(&other->_internal_metadata_);\n");
-
-    if (!has_bit_indices_.empty()) {
-      for (int i = 0; i < HasBitsSize(); ++i) {
-        format("swap($has_bits$[$1$], other->$has_bits$[$1$]);\n", i);
-      }
-    }
-
-    // If possible, we swap several fields at once, including padding.
-    const RunMap runs =
-        FindRuns(optimized_order_, [this](const FieldDescriptor* field) {
-          return !ShouldSplit(field, options_) &&
-                 CanBeManipulatedAsRawBytes(field, options_, scc_analyzer_);
-        });
-
-    for (size_t i = 0; i < optimized_order_.size(); ++i) {
-      const FieldDescriptor* field = optimized_order_[i];
-      if (ShouldSplit(field, options_)) {
-        continue;
-      }
-      const auto it = runs.find(field);
-
-      // We only apply the memswap technique to runs of more than one field, as
-      // `swap(field_, other.field_)` is better than
-      // `memswap<...>(&field_, &other.field_)` for generated code readability.
-      if (it != runs.end() && it->second > 1) {
-        // Use a memswap, then skip run_length fields.
-        const size_t run_length = it->second;
-        const std::string first_field_name =
-            FieldMemberName(field, /*cold=*/false);
-        const std::string last_field_name = FieldMemberName(
-            optimized_order_[i + run_length - 1], /*cold=*/false);
-
-        format.Set("first", first_field_name);
-        format.Set("last", last_field_name);
-
-        format(
-            "::PROTOBUF_NAMESPACE_ID::internal::memswap<\n"
-            "    PROTOBUF_FIELD_OFFSET($classname$, $last$)\n"
-            "    + sizeof($classname$::$last$)\n"
-            "    - PROTOBUF_FIELD_OFFSET($classname$, $first$)>(\n"
-            "        reinterpret_cast<char*>(&$first$),\n"
-            "        reinterpret_cast<char*>(&other->$first$));\n");
-
-        i += run_length - 1;
-        // ++i at the top of the loop.
-      } else {
-        field_generators_.get(field).GenerateSwappingCode(printer);
-      }
-    }
-    if (ShouldSplit(descriptor_, options_)) {
-      format("swap($split$, other->$split$);\n");
-    }
-
-    for (auto oneof : OneOfRange(descriptor_)) {
-      format("swap(_impl_.$1$_, other->_impl_.$1$_);\n", oneof->name());
-    }
-
-    for (int i = 0; i < descriptor_->real_oneof_decl_count(); i++) {
-      format("swap($oneof_case$[$1$], other->$oneof_case$[$1$]);\n", i);
-    }
-
-    if (num_weak_fields_) {
-      format(
-          "$weak_field_map$.UnsafeArenaSwap(&other->$weak_field_map$)"
-          ";\n");
-    }
-
-    if (!inlined_string_indices_.empty()) {
-      for (size_t i = 0; i < InlinedStringDonatedSize(); ++i) {
-        format(
-            "swap($inlined_string_donated_array$[$1$], "
-            "other->$inlined_string_donated_array$[$1$]);\n",
-            i);
-      }
-    }
-  } else {
-    format("GetReflection()->Swap(this, other);");
-  }
-
-  format.Outdent();
-  format("}\n");
-}
-
-void MessageGenerator::GenerateMergeFrom(io::Printer* printer) {
-  Formatter format(printer, variables_);
-  if (!HasSimpleBaseClass(descriptor_, options_)) {
-    if (HasDescriptorMethods(descriptor_->file(), options_)) {
-      // We don't override the generalized MergeFrom (aka that which
-      // takes in the Message base class as a parameter); instead we just
-      // let the base Message::MergeFrom take care of it.  The base MergeFrom
-      // knows how to quickly confirm the types exactly match, and if so, will
-      // use GetClassData() to retrieve the address of MergeImpl, which calls
-      // the fast MergeFrom overload.  Most callers avoid all this by passing
-      // a "from" message that is the same type as the message being merged
-      // into, rather than a generic Message.
-
-      format(
-          "const ::$proto_ns$::Message::ClassData "
-          "$classname$::_class_data_ = {\n"
-          "    ::$proto_ns$::Message::CopyWithSourceCheck,\n"
-          "    $classname$::MergeImpl\n"
-          "};\n"
-          "const ::$proto_ns$::Message::ClassData*"
-          "$classname$::GetClassData() const { return &_class_data_; }\n"
-          "\n");
-    } else {
-      // Generate CheckTypeAndMergeFrom().
-      format(
-          "void $classname$::CheckTypeAndMergeFrom(\n"
-          "    const ::$proto_ns$::MessageLite& from) {\n"
-          "  MergeFrom(*::_pbi::DownCast<const $classname$*>(\n"
-          "      &from));\n"
-          "}\n");
-    }
-  } else {
-    // In the simple case, we just define ClassData that vectors back to the
-    // simple implementation of Copy and Merge.
-    format(
-        "const ::$proto_ns$::Message::ClassData "
-        "$classname$::_class_data_ = {\n"
-        "    $superclass$::CopyImpl,\n"
-        "    $superclass$::MergeImpl,\n"
-        "};\n"
-        "const ::$proto_ns$::Message::ClassData*"
-        "$classname$::GetClassData() const { return &_class_data_; }\n"
-        "\n"
-        "\n");
-  }
-}
-
-void MessageGenerator::GenerateClassSpecificMergeImpl(io::Printer* printer) {
-  if (HasSimpleBaseClass(descriptor_, options_)) return;
-  // Generate the class-specific MergeFrom, which avoids the GOOGLE_CHECK and cast.
-  Formatter format(printer, variables_);
-  if (!HasDescriptorMethods(descriptor_->file(), options_)) {
-    // For messages that don't inherit from Message, just implement MergeFrom
-    // directly.
-    format(
-        "void $classname$::MergeFrom(const $classname$& from) {\n"
-        "  $classname$* const _this = this;\n");
-  } else {
-    format(
-        "void $classname$::MergeImpl(::$proto_ns$::Message& to_msg, const "
-        "::$proto_ns$::Message& from_msg) {\n"
-        "  auto* const _this = static_cast<$classname$*>(&to_msg);\n"
-        "  auto& from = static_cast<const $classname$&>(from_msg);\n");
-  }
-  format.Indent();
-  format(
-      "$annotate_mergefrom$"
-      "// @@protoc_insertion_point(class_specific_merge_from_start:"
-      "$full_name$)\n");
-  format("$DCHK$_NE(&from, _this);\n");
-
-  format(
-      "$uint32$ cached_has_bits = 0;\n"
-      "(void) cached_has_bits;\n\n");
-
-  if (ShouldSplit(descriptor_, options_)) {
-    format(
-        "if (!from.IsSplitMessageDefault()) {\n"
-        "  _this->PrepareSplitMessageForWrite();\n"
-        "}\n");
-  }
-
-  std::vector<std::vector<const FieldDescriptor*>> chunks = CollectFields(
-      optimized_order_,
-      [&](const FieldDescriptor* a, const FieldDescriptor* b) -> bool {
-        return HasByteIndex(a) == HasByteIndex(b) &&
-               ShouldSplit(a, options_) == ShouldSplit(b, options_);
-      });
-
-  ColdChunkSkipper cold_skipper(descriptor_, options_, chunks, has_bit_indices_,
-                                kColdRatio);
-
-  // cached_has_word_index maintains that:
-  //   cached_has_bits = from._has_bits_[cached_has_word_index]
-  // for cached_has_word_index >= 0
-  int cached_has_word_index = -1;
-
-  for (int chunk_index = 0; chunk_index < chunks.size(); chunk_index++) {
-    const std::vector<const FieldDescriptor*>& chunk = chunks[chunk_index];
-    bool have_outer_if =
-        chunk.size() > 1 && HasByteIndex(chunk.front()) != kNoHasbit;
-    cold_skipper.OnStartChunk(chunk_index, cached_has_word_index, "from.",
-                              printer);
-
-    if (have_outer_if) {
-      // Emit an if() that will let us skip the whole chunk if none are set.
-      uint32_t chunk_mask = GenChunkMask(chunk, has_bit_indices_);
-      std::string chunk_mask_str =
-          StrCat(strings::Hex(chunk_mask, strings::ZERO_PAD_8));
-
-      // Check (up to) 8 has_bits at a time if we have more than one field in
-      // this chunk.  Due to field layout ordering, we may check
-      // _has_bits_[last_chunk * 8 / 32] multiple times.
-      GOOGLE_DCHECK_LE(2, popcnt(chunk_mask));
-      GOOGLE_DCHECK_GE(8, popcnt(chunk_mask));
-
-      if (cached_has_word_index != HasWordIndex(chunk.front())) {
-        cached_has_word_index = HasWordIndex(chunk.front());
-        format("cached_has_bits = from.$has_bits$[$1$];\n",
-               cached_has_word_index);
-      }
-
-      format("if (cached_has_bits & 0x$1$u) {\n", chunk_mask_str);
-      format.Indent();
-    }
-
-    // Go back and emit merging code for each of the fields we processed.
-    bool deferred_has_bit_changes = false;
-    for (const auto field : chunk) {
-      const FieldGenerator& generator = field_generators_.get(field);
-
-      if (field->is_repeated()) {
-        generator.GenerateMergingCode(printer);
-      } else if (field->is_optional() && !HasHasbit(field)) {
-        // Merge semantics without true field presence: primitive fields are
-        // merged only if non-zero (numeric) or non-empty (string).
-        bool have_enclosing_if =
-            EmitFieldNonDefaultCondition(printer, "from.", field);
-        generator.GenerateMergingCode(printer);
-        if (have_enclosing_if) {
-          format.Outdent();
-          format("}\n");
-        }
-      } else if (field->options().weak() ||
-                 cached_has_word_index != HasWordIndex(field)) {
-        // Check hasbit, not using cached bits.
-        GOOGLE_CHECK(HasHasbit(field));
-        format("if (from._internal_has_$1$()) {\n", FieldName(field));
-        format.Indent();
-        generator.GenerateMergingCode(printer);
-        format.Outdent();
-        format("}\n");
-      } else {
-        // Check hasbit, using cached bits.
-        GOOGLE_CHECK(HasHasbit(field));
-        int has_bit_index = has_bit_indices_[field->index()];
-        const std::string mask = StrCat(
-            strings::Hex(1u << (has_bit_index % 32), strings::ZERO_PAD_8));
-        format("if (cached_has_bits & 0x$1$u) {\n", mask);
-        format.Indent();
-
-        if (have_outer_if && IsPOD(field)) {
-          // Defer hasbit modification until the end of chunk.
-          // This can reduce the number of loads/stores by up to 7 per 8 fields.
-          deferred_has_bit_changes = true;
-          generator.GenerateCopyConstructorCode(printer);
-        } else {
-          generator.GenerateMergingCode(printer);
-        }
-
-        format.Outdent();
-        format("}\n");
-      }
-    }
-
-    if (have_outer_if) {
-      if (deferred_has_bit_changes) {
-        // Flush the has bits for the primitives we deferred.
-        GOOGLE_CHECK_LE(0, cached_has_word_index);
-        format("_this->$has_bits$[$1$] |= cached_has_bits;\n",
-               cached_has_word_index);
-      }
-
-      format.Outdent();
-      format("}\n");
-    }
-
-    if (cold_skipper.OnEndChunk(chunk_index, printer)) {
-      // Reset here as it may have been updated in just closed if statement.
-      cached_has_word_index = -1;
-    }
-  }
-
-  // Merge oneof fields. Oneof field requires oneof case check.
-  for (auto oneof : OneOfRange(descriptor_)) {
-    format("switch (from.$1$_case()) {\n", oneof->name());
-    format.Indent();
-    for (auto field : FieldRange(oneof)) {
-      format("case k$1$: {\n", UnderscoresToCamelCase(field->name(), true));
-      format.Indent();
-      if (!IsFieldStripped(field, options_)) {
-        field_generators_.get(field).GenerateMergingCode(printer);
-      }
-      format("break;\n");
-      format.Outdent();
-      format("}\n");
-    }
-    format(
-        "case $1$_NOT_SET: {\n"
-        "  break;\n"
-        "}\n",
-        ToUpper(oneof->name()));
-    format.Outdent();
-    format("}\n");
-  }
-  if (num_weak_fields_) {
-    format(
-        "_this->$weak_field_map$.MergeFrom(from.$weak_field_map$);"
-        "\n");
-  }
-
-  // Merging of extensions and unknown fields is done last, to maximize
-  // the opportunity for tail calls.
-  if (descriptor_->extension_range_count() > 0) {
-    format(
-        "_this->$extensions$.MergeFrom(internal_default_instance(), "
-        "from.$extensions$);\n");
-  }
-
-  format(
-      "_this->_internal_metadata_.MergeFrom<$unknown_fields_type$>(from._"
-      "internal_"
-      "metadata_);\n");
-
-  format.Outdent();
-  format("}\n");
-}
-
-void MessageGenerator::GenerateCopyFrom(io::Printer* printer) {
-  if (HasSimpleBaseClass(descriptor_, options_)) return;
-  Formatter format(printer, variables_);
-  if (HasDescriptorMethods(descriptor_->file(), options_)) {
-    // We don't override the generalized CopyFrom (aka that which
-    // takes in the Message base class as a parameter); instead we just
-    // let the base Message::CopyFrom take care of it.  The base MergeFrom
-    // knows how to quickly confirm the types exactly match, and if so, will
-    // use GetClassData() to get the address of Message::CopyWithSourceCheck,
-    // which calls Clear() and then MergeFrom(), as well as making sure that
-    // clearing the destination message doesn't alter the source, when in debug
-    // builds. Most callers avoid this by passing a "from" message that is the
-    // same type as the message being merged into, rather than a generic
-    // Message.
-  }
-
-  // Generate the class-specific CopyFrom.
-  format(
-      "void $classname$::CopyFrom(const $classname$& from) {\n"
-      "// @@protoc_insertion_point(class_specific_copy_from_start:"
-      "$full_name$)\n");
-  format.Indent();
-
-  format("if (&from == this) return;\n");
-
-  if (!options_.opensource_runtime && HasMessageFieldOrExtension(descriptor_)) {
-    // This check is disabled in the opensource release because we're
-    // concerned that many users do not define NDEBUG in their release builds.
-    // It is also disabled if a message has neither message fields nor
-    // extensions, as it's impossible to copy from its descendant.
-    //
-    // Note that FailIfCopyFromDescendant is implemented by reflection and not
-    // available for lite runtime. In that case, check if the size of the source
-    // has changed after Clear.
-    format("#ifndef NDEBUG\n");
-    if (HasDescriptorMethods(descriptor_->file(), options_)) {
-      format("FailIfCopyFromDescendant(*this, from);\n");
-    } else {
-      format("size_t from_size = from.ByteSizeLong();\n");
-    }
-    format(
-        "#endif\n"
-        "Clear();\n");
-    if (!HasDescriptorMethods(descriptor_->file(), options_)) {
-      format(
-          "#ifndef NDEBUG\n"
-          "$CHK$_EQ(from_size, from.ByteSizeLong())\n"
-          "  << \"Source of CopyFrom changed when clearing target.  Either \"\n"
-          "     \"source is a nested message in target (not allowed), or \"\n"
-          "     \"another thread is modifying the source.\";\n"
-          "#endif\n");
-    }
-  } else {
-    format("Clear();\n");
-  }
-  format("MergeFrom(from);\n");
-
-  format.Outdent();
-  format("}\n");
-}
-
-void MessageGenerator::GenerateVerify(io::Printer* printer) {
-}
-
-void MessageGenerator::GenerateSerializeOneofFields(
-    io::Printer* printer, const std::vector<const FieldDescriptor*>& fields) {
-  Formatter format(printer, variables_);
-  GOOGLE_CHECK(!fields.empty());
-  if (fields.size() == 1) {
-    GenerateSerializeOneField(printer, fields[0], -1);
-    return;
-  }
-  // We have multiple mutually exclusive choices.  Emit a switch statement.
-  const OneofDescriptor* oneof = fields[0]->containing_oneof();
-  format("switch ($1$_case()) {\n", oneof->name());
-  format.Indent();
-  for (auto field : fields) {
-    format("case k$1$: {\n", UnderscoresToCamelCase(field->name(), true));
-    format.Indent();
-    field_generators_.get(field).GenerateSerializeWithCachedSizesToArray(
-        printer);
-    format("break;\n");
-    format.Outdent();
-    format("}\n");
-  }
-  format.Outdent();
-  // Doing nothing is an option.
-  format(
-      "  default: ;\n"
-      "}\n");
-}
-
-void MessageGenerator::GenerateSerializeOneField(io::Printer* printer,
-                                                 const FieldDescriptor* field,
-                                                 int cached_has_bits_index) {
-  Formatter format(printer, variables_);
-  if (!field->options().weak()) {
-    // For weakfields, PrintFieldComment is called during iteration.
-    PrintFieldComment(format, field);
-  }
-
-  bool have_enclosing_if = false;
-  if (field->options().weak()) {
-  } else if (HasHasbit(field)) {
-    // Attempt to use the state of cached_has_bits, if possible.
-    int has_bit_index = HasBitIndex(field);
-    if (cached_has_bits_index == has_bit_index / 32) {
-      const std::string mask =
-          StrCat(strings::Hex(1u << (has_bit_index % 32), strings::ZERO_PAD_8));
-
-      format("if (cached_has_bits & 0x$1$u) {\n", mask);
-    } else {
-      format("if (_internal_has_$1$()) {\n", FieldName(field));
-    }
-
-    format.Indent();
-    have_enclosing_if = true;
-  } else if (field->is_optional() && !HasHasbit(field)) {
-    have_enclosing_if = EmitFieldNonDefaultCondition(printer, "this->", field);
-  }
-
-  field_generators_.get(field).GenerateSerializeWithCachedSizesToArray(printer);
-
-  if (have_enclosing_if) {
-    format.Outdent();
-    format("}\n");
-  }
-  format("\n");
-}
-
-void MessageGenerator::GenerateSerializeOneExtensionRange(
-    io::Printer* printer, const Descriptor::ExtensionRange* range) {
-  std::map<std::string, std::string> vars = variables_;
-  vars["start"] = StrCat(range->start);
-  vars["end"] = StrCat(range->end);
-  Formatter format(printer, vars);
-  format("// Extension range [$start$, $end$)\n");
-  format(
-      "target = $extensions$._InternalSerialize(\n"
-      "internal_default_instance(), $start$, $end$, target, stream);\n\n");
-}
-
-void MessageGenerator::GenerateSerializeWithCachedSizesToArray(
-    io::Printer* printer) {
-  if (HasSimpleBaseClass(descriptor_, options_)) return;
-  Formatter format(printer, variables_);
-  if (descriptor_->options().message_set_wire_format()) {
-    // Special-case MessageSet.
-    format(
-        "$uint8$* $classname$::_InternalSerialize(\n"
-        "    $uint8$* target, ::$proto_ns$::io::EpsCopyOutputStream* stream) "
-        "const {\n"
-        "$annotate_serialize$"
-        "  target = $extensions$."
-        "InternalSerializeMessageSetWithCachedSizesToArray(\n"  //
-        "internal_default_instance(), target, stream);\n");
-    std::map<std::string, std::string> vars;
-    SetUnknownFieldsVariable(descriptor_, options_, &vars);
-    format.AddMap(vars);
-    format(
-        "  target = ::_pbi::"
-        "InternalSerializeUnknownMessageSetItemsToArray(\n"
-        "               $unknown_fields$, target, stream);\n");
-    format(
-        "  return target;\n"
-        "}\n");
-    return;
-  }
-
-  format(
-      "$uint8$* $classname$::_InternalSerialize(\n"
-      "    $uint8$* target, ::$proto_ns$::io::EpsCopyOutputStream* stream) "
-      "const {\n"
-      "$annotate_serialize$");
-  format.Indent();
-
-  format("// @@protoc_insertion_point(serialize_to_array_start:$full_name$)\n");
-
-  if (!ShouldSerializeInOrder(descriptor_, options_)) {
-    format.Outdent();
-    format("#ifdef NDEBUG\n");
-    format.Indent();
-  }
-
-  GenerateSerializeWithCachedSizesBody(printer);
-
-  if (!ShouldSerializeInOrder(descriptor_, options_)) {
-    format.Outdent();
-    format("#else  // NDEBUG\n");
-    format.Indent();
-
-    GenerateSerializeWithCachedSizesBodyShuffled(printer);
-
-    format.Outdent();
-    format("#endif  // !NDEBUG\n");
-    format.Indent();
-  }
-
-  format("// @@protoc_insertion_point(serialize_to_array_end:$full_name$)\n");
-
-  format.Outdent();
-  format(
-      "  return target;\n"
-      "}\n");
-}
-
-void MessageGenerator::GenerateSerializeWithCachedSizesBody(
-    io::Printer* printer) {
-  if (HasSimpleBaseClass(descriptor_, options_)) return;
-  Formatter format(printer, variables_);
-  // If there are multiple fields in a row from the same oneof then we
-  // coalesce them and emit a switch statement.  This is more efficient
-  // because it lets the C++ compiler know this is a "at most one can happen"
-  // situation. If we emitted "if (has_x()) ...; if (has_y()) ..." the C++
-  // compiler's emitted code might check has_y() even when has_x() is true.
-  class LazySerializerEmitter {
-   public:
-    LazySerializerEmitter(MessageGenerator* mg, io::Printer* printer)
-        : mg_(mg),
-          format_(printer),
-          eager_(IsProto3(mg->descriptor_->file())),
-          cached_has_bit_index_(kNoHasbit) {}
-
-    ~LazySerializerEmitter() { Flush(); }
-
-    // If conditions allow, try to accumulate a run of fields from the same
-    // oneof, and handle them at the next Flush().
-    void Emit(const FieldDescriptor* field) {
-      if (eager_ || MustFlush(field)) {
-        Flush();
-      }
-      if (!field->real_containing_oneof()) {
-        // TODO(ckennelly): Defer non-oneof fields similarly to oneof fields.
-
-        if (!field->options().weak() && !field->is_repeated() && !eager_) {
-          // We speculatively load the entire _has_bits_[index] contents, even
-          // if it is for only one field.  Deferring non-oneof emitting would
-          // allow us to determine whether this is going to be useful.
-          int has_bit_index = mg_->has_bit_indices_[field->index()];
-          if (cached_has_bit_index_ != has_bit_index / 32) {
-            // Reload.
-            int new_index = has_bit_index / 32;
-
-            format_("cached_has_bits = _impl_._has_bits_[$1$];\n", new_index);
-
-            cached_has_bit_index_ = new_index;
-          }
-        }
-
-        mg_->GenerateSerializeOneField(format_.printer(), field,
-                                       cached_has_bit_index_);
-      } else {
-        v_.push_back(field);
-      }
-    }
-
-    void EmitIfNotNull(const FieldDescriptor* field) {
-      if (field != nullptr) {
-        Emit(field);
-      }
-    }
-
-    void Flush() {
-      if (!v_.empty()) {
-        mg_->GenerateSerializeOneofFields(format_.printer(), v_);
-        v_.clear();
-      }
-    }
-
-   private:
-    // If we have multiple fields in v_ then they all must be from the same
-    // oneof.  Would adding field to v_ break that invariant?
-    bool MustFlush(const FieldDescriptor* field) {
-      return !v_.empty() &&
-             v_[0]->containing_oneof() != field->containing_oneof();
-    }
-
-    MessageGenerator* mg_;
-    Formatter format_;
-    const bool eager_;
-    std::vector<const FieldDescriptor*> v_;
-
-    // cached_has_bit_index_ maintains that:
-    //   cached_has_bits = from._has_bits_[cached_has_bit_index_]
-    // for cached_has_bit_index_ >= 0
-    int cached_has_bit_index_;
-  };
-
-  class LazyExtensionRangeEmitter {
-   public:
-    LazyExtensionRangeEmitter(MessageGenerator* mg, io::Printer* printer)
-        : mg_(mg), format_(printer) {}
-
-    void AddToRange(const Descriptor::ExtensionRange* range) {
-      if (!has_current_range_) {
-        current_combined_range_ = *range;
-        has_current_range_ = true;
-      } else {
-        current_combined_range_.start =
-            std::min(current_combined_range_.start, range->start);
-        current_combined_range_.end =
-            std::max(current_combined_range_.end, range->end);
-      }
-    }
-
-    void Flush() {
-      if (has_current_range_) {
-        mg_->GenerateSerializeOneExtensionRange(format_.printer(),
-                                                &current_combined_range_);
-      }
-      has_current_range_ = false;
-    }
-
-   private:
-    MessageGenerator* mg_;
-    Formatter format_;
-    bool has_current_range_ = false;
-    Descriptor::ExtensionRange current_combined_range_;
-  };
-
-  // We need to track the largest weak field, because weak fields are serialized
-  // differently than normal fields.  The WeakFieldMap::FieldWriter will
-  // serialize all weak fields that are ordinally between the last serialized
-  // weak field and the current field.  In order to guarantee that all weak
-  // fields are serialized, we need to make sure to emit the code to serialize
-  // the largest weak field present at some point.
-  class LargestWeakFieldHolder {
-   public:
-    const FieldDescriptor* Release() {
-      const FieldDescriptor* result = field_;
-      field_ = nullptr;
-      return result;
-    }
-    void ReplaceIfLarger(const FieldDescriptor* field) {
-      if (field_ == nullptr || field_->number() < field->number()) {
-        field_ = field;
-      }
-    }
-
-   private:
-    const FieldDescriptor* field_ = nullptr;
-  };
-
-  std::vector<const FieldDescriptor*> ordered_fields =
-      SortFieldsByNumber(descriptor_);
-
-  std::vector<const Descriptor::ExtensionRange*> sorted_extensions;
-  sorted_extensions.reserve(descriptor_->extension_range_count());
-  for (int i = 0; i < descriptor_->extension_range_count(); ++i) {
-    sorted_extensions.push_back(descriptor_->extension_range(i));
-  }
-  std::sort(sorted_extensions.begin(), sorted_extensions.end(),
-            ExtensionRangeSorter());
-  if (num_weak_fields_) {
-    format(
-        "::_pbi::WeakFieldMap::FieldWriter field_writer("
-        "$weak_field_map$);\n");
-  }
-
-  format(
-      "$uint32$ cached_has_bits = 0;\n"
-      "(void) cached_has_bits;\n\n");
-
-  // Merge the fields and the extension ranges, both sorted by field number.
-  {
-    LazySerializerEmitter e(this, printer);
-    LazyExtensionRangeEmitter re(this, printer);
-    LargestWeakFieldHolder largest_weak_field;
-    int i, j;
-    for (i = 0, j = 0;
-         i < ordered_fields.size() || j < sorted_extensions.size();) {
-      if ((j == sorted_extensions.size()) ||
-          (i < descriptor_->field_count() &&
-           ordered_fields[i]->number() < sorted_extensions[j]->start)) {
-        const FieldDescriptor* field = ordered_fields[i++];
-        if (IsFieldStripped(field, options_)) {
-          continue;
-        }
-        re.Flush();
-        if (field->options().weak()) {
-          largest_weak_field.ReplaceIfLarger(field);
-          PrintFieldComment(format, field);
-        } else {
-          e.EmitIfNotNull(largest_weak_field.Release());
-          e.Emit(field);
-        }
-      } else {
-        e.EmitIfNotNull(largest_weak_field.Release());
-        e.Flush();
-        re.AddToRange(sorted_extensions[j++]);
-      }
-    }
-    re.Flush();
-    e.EmitIfNotNull(largest_weak_field.Release());
-  }
-
-  std::map<std::string, std::string> vars;
-  SetUnknownFieldsVariable(descriptor_, options_, &vars);
-  format.AddMap(vars);
-  format("if (PROTOBUF_PREDICT_FALSE($have_unknown_fields$)) {\n");
-  format.Indent();
-  if (UseUnknownFieldSet(descriptor_->file(), options_)) {
-    format(
-        "target = "
-        "::_pbi::WireFormat::"
-        "InternalSerializeUnknownFieldsToArray(\n"
-        "    $unknown_fields$, target, stream);\n");
-  } else {
-    format(
-        "target = stream->WriteRaw($unknown_fields$.data(),\n"
-        "    static_cast<int>($unknown_fields$.size()), target);\n");
-  }
-  format.Outdent();
-  format("}\n");
-}
-
-void MessageGenerator::GenerateSerializeWithCachedSizesBodyShuffled(
-    io::Printer* printer) {
-  Formatter format(printer, variables_);
-
-  std::vector<const FieldDescriptor*> ordered_fields =
-      SortFieldsByNumber(descriptor_);
-  ordered_fields.erase(
-      std::remove_if(ordered_fields.begin(), ordered_fields.end(),
-                     [this](const FieldDescriptor* f) {
-                       return !IsFieldUsed(f, options_);
-                     }),
-      ordered_fields.end());
-
-  std::vector<const Descriptor::ExtensionRange*> sorted_extensions;
-  sorted_extensions.reserve(descriptor_->extension_range_count());
-  for (int i = 0; i < descriptor_->extension_range_count(); ++i) {
-    sorted_extensions.push_back(descriptor_->extension_range(i));
-  }
-  std::sort(sorted_extensions.begin(), sorted_extensions.end(),
-            ExtensionRangeSorter());
-
-  int num_fields = ordered_fields.size() + sorted_extensions.size();
-  constexpr int kLargePrime = 1000003;
-  GOOGLE_CHECK_LT(num_fields, kLargePrime)
-      << "Prime offset must be greater than the number of fields to ensure "
-         "those are coprime.";
-
-  if (num_weak_fields_) {
-    format(
-        "::_pbi::WeakFieldMap::FieldWriter field_writer("
-        "$weak_field_map$);\n");
-  }
-
-  format("for (int i = $1$; i >= 0; i-- ) {\n", num_fields - 1);
-
-  format.Indent();
-  format("switch(i) {\n");
-  format.Indent();
-
-  int index = 0;
-  for (const auto* f : ordered_fields) {
-    format("case $1$: {\n", index++);
-    format.Indent();
-
-    GenerateSerializeOneField(printer, f, -1);
-
-    format("break;\n");
-    format.Outdent();
-    format("}\n");
-  }
-
-  for (const auto* r : sorted_extensions) {
-    format("case $1$: {\n", index++);
-    format.Indent();
-
-    GenerateSerializeOneExtensionRange(printer, r);
-
-    format("break;\n");
-    format.Outdent();
-    format("}\n");
-  }
-
-  format(
-      "default: {\n"
-      "  $DCHK$(false) << \"Unexpected index: \" << i;\n"
-      "}\n");
-  format.Outdent();
-  format("}\n");
-
-  format.Outdent();
-  format("}\n");
-
-  std::map<std::string, std::string> vars;
-  SetUnknownFieldsVariable(descriptor_, options_, &vars);
-  format.AddMap(vars);
-  format("if (PROTOBUF_PREDICT_FALSE($have_unknown_fields$)) {\n");
-  format.Indent();
-  if (UseUnknownFieldSet(descriptor_->file(), options_)) {
-    format(
-        "target = "
-        "::_pbi::WireFormat::"
-        "InternalSerializeUnknownFieldsToArray(\n"
-        "    $unknown_fields$, target, stream);\n");
-  } else {
-    format(
-        "target = stream->WriteRaw($unknown_fields$.data(),\n"
-        "    static_cast<int>($unknown_fields$.size()), target);\n");
-  }
-  format.Outdent();
-  format("}\n");
-}
-
-std::vector<uint32_t> MessageGenerator::RequiredFieldsBitMask() const {
-  const int array_size = HasBitsSize();
-  std::vector<uint32_t> masks(array_size, 0);
-
-  for (auto field : FieldRange(descriptor_)) {
-    if (!field->is_required()) {
-      continue;
-    }
-
-    const int has_bit_index = has_bit_indices_[field->index()];
-    masks[has_bit_index / 32] |= static_cast<uint32_t>(1)
-                                 << (has_bit_index % 32);
-  }
-  return masks;
-}
-
-void MessageGenerator::GenerateByteSize(io::Printer* printer) {
-  if (HasSimpleBaseClass(descriptor_, options_)) return;
-  Formatter format(printer, variables_);
-
-  if (descriptor_->options().message_set_wire_format()) {
-    // Special-case MessageSet.
-    std::map<std::string, std::string> vars;
-    SetUnknownFieldsVariable(descriptor_, options_, &vars);
-    format.AddMap(vars);
-    format(
-        "size_t $classname$::ByteSizeLong() const {\n"
-        "$annotate_bytesize$"
-        "// @@protoc_insertion_point(message_set_byte_size_start:$full_name$)\n"
-        "  size_t total_size = $extensions$.MessageSetByteSize();\n"
-        "  if ($have_unknown_fields$) {\n"
-        "    total_size += ::_pbi::\n"
-        "        ComputeUnknownMessageSetItemsSize($unknown_fields$);\n"
-        "  }\n"
-        "  int cached_size = "
-        "::_pbi::ToCachedSize(total_size);\n"
-        "  SetCachedSize(cached_size);\n"
-        "  return total_size;\n"
-        "}\n");
-    return;
-  }
-
-  if (num_required_fields_ > 1) {
-    // Emit a function (rarely used, we hope) that handles the required fields
-    // by checking for each one individually.
-    format(
-        "size_t $classname$::RequiredFieldsByteSizeFallback() const {\n"
-        "// @@protoc_insertion_point(required_fields_byte_size_fallback_start:"
-        "$full_name$)\n");
-    format.Indent();
-    format("size_t total_size = 0;\n");
-    for (auto field : optimized_order_) {
-      if (field->is_required()) {
-        format(
-            "\n"
-            "if (_internal_has_$1$()) {\n",
-            FieldName(field));
-        format.Indent();
-        PrintFieldComment(format, field);
-        field_generators_.get(field).GenerateByteSize(printer);
-        format.Outdent();
-        format("}\n");
-      }
-    }
-    format(
-        "\n"
-        "return total_size;\n");
-    format.Outdent();
-    format("}\n");
-  }
-
-  format(
-      "size_t $classname$::ByteSizeLong() const {\n"
-      "$annotate_bytesize$"
-      "// @@protoc_insertion_point(message_byte_size_start:$full_name$)\n");
-  format.Indent();
-  format(
-      "size_t total_size = 0;\n"
-      "\n");
-
-  if (descriptor_->extension_range_count() > 0) {
-    format(
-        "total_size += $extensions$.ByteSize();\n"
-        "\n");
-  }
-
-  std::map<std::string, std::string> vars;
-  SetUnknownFieldsVariable(descriptor_, options_, &vars);
-  format.AddMap(vars);
-
-  // Handle required fields (if any).  We expect all of them to be
-  // present, so emit one conditional that checks for that.  If they are all
-  // present then the fast path executes; otherwise the slow path executes.
-  if (num_required_fields_ > 1) {
-    // The fast path works if all required fields are present.
-    const std::vector<uint32_t> masks_for_has_bits = RequiredFieldsBitMask();
-    format("if ($1$) {  // All required fields are present.\n",
-           ConditionalToCheckBitmasks(masks_for_has_bits));
-    format.Indent();
-    // Oneof fields cannot be required, so optimized_order_ contains all of the
-    // fields that we need to potentially emit.
-    for (auto field : optimized_order_) {
-      if (!field->is_required()) continue;
-      PrintFieldComment(format, field);
-      field_generators_.get(field).GenerateByteSize(printer);
-      format("\n");
-    }
-    format.Outdent();
-    format(
-        "} else {\n"  // the slow path
-        "  total_size += RequiredFieldsByteSizeFallback();\n"
-        "}\n");
-  } else {
-    // num_required_fields_ <= 1: no need to be tricky
-    for (auto field : optimized_order_) {
-      if (!field->is_required()) continue;
-      PrintFieldComment(format, field);
-      format("if (_internal_has_$1$()) {\n", FieldName(field));
-      format.Indent();
-      field_generators_.get(field).GenerateByteSize(printer);
-      format.Outdent();
-      format("}\n");
-    }
-  }
-
-  std::vector<std::vector<const FieldDescriptor*>> chunks = CollectFields(
-      optimized_order_,
-      [&](const FieldDescriptor* a, const FieldDescriptor* b) -> bool {
-        return a->label() == b->label() && HasByteIndex(a) == HasByteIndex(b) &&
-               ShouldSplit(a, options_) == ShouldSplit(b, options_);
-      });
-
-  // Remove chunks with required fields.
-  chunks.erase(std::remove_if(chunks.begin(), chunks.end(), IsRequired),
-               chunks.end());
-
-  ColdChunkSkipper cold_skipper(descriptor_, options_, chunks, has_bit_indices_,
-                                kColdRatio);
-  int cached_has_word_index = -1;
-
-  format(
-      "$uint32$ cached_has_bits = 0;\n"
-      "// Prevent compiler warnings about cached_has_bits being unused\n"
-      "(void) cached_has_bits;\n\n");
-
-  for (int chunk_index = 0; chunk_index < chunks.size(); chunk_index++) {
-    const std::vector<const FieldDescriptor*>& chunk = chunks[chunk_index];
-    const bool have_outer_if =
-        chunk.size() > 1 && HasWordIndex(chunk[0]) != kNoHasbit;
-    cold_skipper.OnStartChunk(chunk_index, cached_has_word_index, "", printer);
-
-    if (have_outer_if) {
-      // Emit an if() that will let us skip the whole chunk if none are set.
-      uint32_t chunk_mask = GenChunkMask(chunk, has_bit_indices_);
-      std::string chunk_mask_str =
-          StrCat(strings::Hex(chunk_mask, strings::ZERO_PAD_8));
-
-      // Check (up to) 8 has_bits at a time if we have more than one field in
-      // this chunk.  Due to field layout ordering, we may check
-      // _has_bits_[last_chunk * 8 / 32] multiple times.
-      GOOGLE_DCHECK_LE(2, popcnt(chunk_mask));
-      GOOGLE_DCHECK_GE(8, popcnt(chunk_mask));
-
-      if (cached_has_word_index != HasWordIndex(chunk.front())) {
-        cached_has_word_index = HasWordIndex(chunk.front());
-        format("cached_has_bits = $has_bits$[$1$];\n", cached_has_word_index);
-      }
-      format("if (cached_has_bits & 0x$1$u) {\n", chunk_mask_str);
-      format.Indent();
-    }
-
-    // Go back and emit checks for each of the fields we processed.
-    for (int j = 0; j < chunk.size(); j++) {
-      const FieldDescriptor* field = chunk[j];
-      const FieldGenerator& generator = field_generators_.get(field);
-      bool have_enclosing_if = false;
-      bool need_extra_newline = false;
-
-      PrintFieldComment(format, field);
-
-      if (field->is_repeated()) {
-        // No presence check is required.
-        need_extra_newline = true;
-      } else if (HasHasbit(field)) {
-        PrintPresenceCheck(format, field, has_bit_indices_, printer,
-                           &cached_has_word_index);
-        have_enclosing_if = true;
-      } else {
-        // Without field presence: field is serialized only if it has a
-        // non-default value.
-        have_enclosing_if =
-            EmitFieldNonDefaultCondition(printer, "this->", field);
-      }
-
-      generator.GenerateByteSize(printer);
-
-      if (have_enclosing_if) {
-        format.Outdent();
-        format(
-            "}\n"
-            "\n");
-      }
-      if (need_extra_newline) {
-        format("\n");
-      }
-    }
-
-    if (have_outer_if) {
-      format.Outdent();
-      format("}\n");
-    }
-
-    if (cold_skipper.OnEndChunk(chunk_index, printer)) {
-      // Reset here as it may have been updated in just closed if statement.
-      cached_has_word_index = -1;
-    }
-  }
-
-  // Fields inside a oneof don't use _has_bits_ so we count them in a separate
-  // pass.
-  for (auto oneof : OneOfRange(descriptor_)) {
-    format("switch ($1$_case()) {\n", oneof->name());
-    format.Indent();
-    for (auto field : FieldRange(oneof)) {
-      PrintFieldComment(format, field);
-      format("case k$1$: {\n", UnderscoresToCamelCase(field->name(), true));
-      format.Indent();
-      if (!IsFieldStripped(field, options_)) {
-        field_generators_.get(field).GenerateByteSize(printer);
-      }
-      format("break;\n");
-      format.Outdent();
-      format("}\n");
-    }
-    format(
-        "case $1$_NOT_SET: {\n"
-        "  break;\n"
-        "}\n",
-        ToUpper(oneof->name()));
-    format.Outdent();
-    format("}\n");
-  }
-
-  if (num_weak_fields_) {
-    // TagSize + MessageSize
-    format("total_size += $weak_field_map$.ByteSizeLong();\n");
-  }
-
-  if (UseUnknownFieldSet(descriptor_->file(), options_)) {
-    // We go out of our way to put the computation of the uncommon path of
-    // unknown fields in tail position. This allows for better code generation
-    // of this function for simple protos.
-    format(
-        "return MaybeComputeUnknownFieldsSize(total_size, &$cached_size$);\n");
-  } else {
-    format("if (PROTOBUF_PREDICT_FALSE($have_unknown_fields$)) {\n");
-    format("  total_size += $unknown_fields$.size();\n");
-    format("}\n");
-
-    // We update _cached_size_ even though this is a const method.  Because
-    // const methods might be called concurrently this needs to be atomic
-    // operations or the program is undefined.  In practice, since any
-    // concurrent writes will be writing the exact same value, normal writes
-    // will work on all common processors. We use a dedicated wrapper class to
-    // abstract away the underlying atomic. This makes it easier on platforms
-    // where even relaxed memory order might have perf impact to replace it with
-    // ordinary loads and stores.
-    format(
-        "int cached_size = ::_pbi::ToCachedSize(total_size);\n"
-        "SetCachedSize(cached_size);\n"
-        "return total_size;\n");
-  }
-
-  format.Outdent();
-  format("}\n");
-}
-
-void MessageGenerator::GenerateIsInitialized(io::Printer* printer) {
-  if (HasSimpleBaseClass(descriptor_, options_)) return;
-  Formatter format(printer, variables_);
-  format("bool $classname$::IsInitialized() const {\n");
-  format.Indent();
-
-  if (descriptor_->extension_range_count() > 0) {
-    format(
-        "if (!$extensions$.IsInitialized()) {\n"
-        "  return false;\n"
-        "}\n\n");
-  }
-
-  if (num_required_fields_ > 0) {
-    format(
-        "if (_Internal::MissingRequiredFields($has_bits$))"
-        " return false;\n");
-  }
-
-  // Now check that all non-oneof embedded messages are initialized.
-  for (auto field : optimized_order_) {
-    field_generators_.get(field).GenerateIsInitialized(printer);
-  }
-  if (num_weak_fields_) {
-    // For Weak fields.
-    format("if (!$weak_field_map$.IsInitialized()) return false;\n");
-  }
-  // Go through the oneof fields, emitting a switch if any might have required
-  // fields.
-  for (auto oneof : OneOfRange(descriptor_)) {
-    bool has_required_fields = false;
-    for (auto field : FieldRange(oneof)) {
-      if (field->cpp_type() == FieldDescriptor::CPPTYPE_MESSAGE &&
-          !ShouldIgnoreRequiredFieldCheck(field, options_) &&
-          scc_analyzer_->HasRequiredFields(field->message_type())) {
-        has_required_fields = true;
-        break;
-      }
-    }
-
-    if (!has_required_fields) {
-      continue;
-    }
-
-    format("switch ($1$_case()) {\n", oneof->name());
-    format.Indent();
-    for (auto field : FieldRange(oneof)) {
-      format("case k$1$: {\n", UnderscoresToCamelCase(field->name(), true));
-      format.Indent();
-      if (!IsFieldStripped(field, options_)) {
-        field_generators_.get(field).GenerateIsInitialized(printer);
-      }
-      format("break;\n");
-      format.Outdent();
-      format("}\n");
-    }
-    format(
-        "case $1$_NOT_SET: {\n"
-        "  break;\n"
-        "}\n",
-        ToUpper(oneof->name()));
-    format.Outdent();
-    format("}\n");
-  }
-
-  format.Outdent();
-  format(
-      "  return true;\n"
-      "}\n");
-}
-
-}  // namespace cpp
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
diff --git a/libs/protobuf/src/google/protobuf/compiler/cpp/message.h b/libs/protobuf/src/google/protobuf/compiler/cpp/message.h
deleted file mode 100644
index 5bdfcb3..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/cpp/message.h
+++ /dev/null
@@ -1,232 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-
-#ifndef GOOGLE_PROTOBUF_COMPILER_CPP_MESSAGE_H__
-#define GOOGLE_PROTOBUF_COMPILER_CPP_MESSAGE_H__
-
-#include <cstdint>
-#include <memory>
-#include <set>
-#include <string>
-
-#include <google/protobuf/compiler/cpp/field.h>
-#include <google/protobuf/compiler/cpp/helpers.h>
-#include <google/protobuf/compiler/cpp/message_layout_helper.h>
-#include <google/protobuf/compiler/cpp/options.h>
-#include <google/protobuf/compiler/cpp/parse_function_generator.h>
-
-namespace google {
-namespace protobuf {
-namespace io {
-class Printer;  // printer.h
-}
-}  // namespace protobuf
-}  // namespace google
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace cpp {
-
-class EnumGenerator;       // enum.h
-class ExtensionGenerator;  // extension.h
-
-class MessageGenerator {
- public:
-  // See generator.cc for the meaning of dllexport_decl.
-  MessageGenerator(const Descriptor* descriptor,
-                   const std::map<std::string, std::string>& vars,
-                   int index_in_file_messages, const Options& options,
-                   MessageSCCAnalyzer* scc_analyzer);
-  ~MessageGenerator();
-
-  // Append the two types of nested generators to the corresponding vector.
-  void AddGenerators(
-      std::vector<std::unique_ptr<EnumGenerator>>* enum_generators,
-      std::vector<std::unique_ptr<ExtensionGenerator>>* extension_generators);
-
-  // Generate definitions for this class and all its nested types.
-  void GenerateClassDefinition(io::Printer* printer);
-
-  // Generate definitions of inline methods (placed at the end of the header
-  // file).
-  void GenerateInlineMethods(io::Printer* printer);
-
-  // Source file stuff.
-
-  // Generate all non-inline methods for this class.
-  void GenerateClassMethods(io::Printer* printer);
-
-  // Generate source file code that should go outside any namespace.
-  void GenerateSourceInProto2Namespace(io::Printer* printer);
-
- private:
-  // Generate declarations and definitions of accessors for fields.
-  void GenerateFieldAccessorDeclarations(io::Printer* printer);
-  void GenerateFieldAccessorDefinitions(io::Printer* printer);
-
-  // Generate the field offsets array.  Returns the a pair of the total number
-  // of entries generated and the index of the first has_bit entry.
-  std::pair<size_t, size_t> GenerateOffsets(io::Printer* printer);
-  void GenerateSchema(io::Printer* printer, int offset, int has_offset);
-
-  // Generate constructors and destructor.
-  void GenerateStructors(io::Printer* printer);
-
-  // The compiler typically generates multiple copies of each constructor and
-  // destructor: http://gcc.gnu.org/bugs.html#nonbugs_cxx
-  // Placing common code in a separate method reduces the generated code size.
-  //
-  // Generate the shared constructor code.
-  void GenerateSharedConstructorCode(io::Printer* printer);
-  // Generate the shared destructor code.
-  void GenerateSharedDestructorCode(io::Printer* printer);
-  // Generate the arena-specific destructor code.
-  void GenerateArenaDestructorCode(io::Printer* printer);
-
-  // Generate the constexpr constructor for constant initialization of the
-  // default instance.
-  void GenerateConstexprConstructor(io::Printer* printer);
-
-  void GenerateCreateSplitMessage(io::Printer* printer);
-  void GenerateInitDefaultSplitInstance(io::Printer* printer);
-
-  // Generate standard Message methods.
-  void GenerateClear(io::Printer* printer);
-  void GenerateOneofClear(io::Printer* printer);
-  void GenerateVerify(io::Printer* printer);
-  void GenerateSerializeWithCachedSizes(io::Printer* printer);
-  void GenerateSerializeWithCachedSizesToArray(io::Printer* printer);
-  void GenerateSerializeWithCachedSizesBody(io::Printer* printer);
-  void GenerateSerializeWithCachedSizesBodyShuffled(io::Printer* printer);
-  void GenerateByteSize(io::Printer* printer);
-  void GenerateMergeFrom(io::Printer* printer);
-  void GenerateClassSpecificMergeImpl(io::Printer* printer);
-  void GenerateCopyFrom(io::Printer* printer);
-  void GenerateSwap(io::Printer* printer);
-  void GenerateIsInitialized(io::Printer* printer);
-
-  // Helpers for GenerateSerializeWithCachedSizes().
-  //
-  // cached_has_bit_index maintains that:
-  //   cached_has_bits = _has_bits_[cached_has_bit_index]
-  // for cached_has_bit_index >= 0
-  void GenerateSerializeOneField(io::Printer* printer,
-                                 const FieldDescriptor* field,
-                                 int cached_has_bits_index);
-  // Generate a switch statement to serialize 2+ fields from the same oneof.
-  // Or, if fields.size() == 1, just call GenerateSerializeOneField().
-  void GenerateSerializeOneofFields(
-      io::Printer* printer, const std::vector<const FieldDescriptor*>& fields);
-  void GenerateSerializeOneExtensionRange(
-      io::Printer* printer, const Descriptor::ExtensionRange* range);
-
-  // Generates has_foo() functions and variables for singular field has-bits.
-  void GenerateSingularFieldHasBits(const FieldDescriptor* field,
-                                    Formatter format);
-  // Generates has_foo() functions and variables for oneof field has-bits.
-  void GenerateOneofHasBits(io::Printer* printer);
-  // Generates has_foo_bar() functions for oneof members.
-  void GenerateOneofMemberHasBits(const FieldDescriptor* field,
-                                  const Formatter& format);
-  // Generates the clear_foo() method for a field.
-  void GenerateFieldClear(const FieldDescriptor* field, bool is_inline,
-                          Formatter format);
-
-  // Generates the body of the message's copy constructor.
-  void GenerateCopyConstructorBody(io::Printer* printer) const;
-
-  // Returns the level that this message needs ArenaDtor. If the message has
-  // a field that is not arena-exclusive, it needs an ArenaDtor
-  // (go/proto-destructor).
-  //
-  // - Returning kNone means we don't need to generate ArenaDtor.
-  // - Returning kOnDemand means we need to generate ArenaDtor, but don't need
-  //   to register ArenaDtor at construction. Such as when the message's
-  //   ArenaDtor code is only for destructing inlined string.
-  // - Returning kRequired means we meed to generate ArenaDtor and register it
-  //   at construction.
-  ArenaDtorNeeds NeedsArenaDestructor() const;
-
-  size_t HasBitsSize() const;
-  size_t InlinedStringDonatedSize() const;
-  int HasBitIndex(const FieldDescriptor* a) const;
-  int HasByteIndex(const FieldDescriptor* a) const;
-  int HasWordIndex(const FieldDescriptor* a) const;
-  bool SameHasByte(const FieldDescriptor* a, const FieldDescriptor* b) const;
-  std::vector<uint32_t> RequiredFieldsBitMask() const;
-
-  const Descriptor* descriptor_;
-  int index_in_file_messages_;
-  std::string classname_;
-  Options options_;
-  FieldGeneratorMap field_generators_;
-  // optimized_order_ is the order we layout the message's fields in the
-  // class. This is reused to initialize the fields in-order for cache
-  // efficiency.
-  //
-  // optimized_order_ excludes oneof fields and weak fields.
-  std::vector<const FieldDescriptor*> optimized_order_;
-  std::vector<int> has_bit_indices_;
-  int max_has_bit_index_;
-
-  // A map from field index to inlined_string index. For non-inlined-string
-  // fields, the element is -1. If there is no inlined string in the message,
-  // this is empty.
-  std::vector<int> inlined_string_indices_;
-  // The count of inlined_string fields in the message.
-  int max_inlined_string_index_;
-
-  std::vector<const EnumGenerator*> enum_generators_;
-  std::vector<const ExtensionGenerator*> extension_generators_;
-  int num_required_fields_;
-  int num_weak_fields_;
-
-  std::unique_ptr<MessageLayoutHelper> message_layout_helper_;
-  std::unique_ptr<ParseFunctionGenerator> parse_function_generator_;
-
-  MessageSCCAnalyzer* scc_analyzer_;
-
-  std::map<std::string, std::string> variables_;
-
-  friend class FileGenerator;
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(MessageGenerator);
-};
-
-}  // namespace cpp
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // GOOGLE_PROTOBUF_COMPILER_CPP_MESSAGE_H__
diff --git a/libs/protobuf/src/google/protobuf/compiler/cpp/message_field.cc b/libs/protobuf/src/google/protobuf/compiler/cpp/message_field.cc
deleted file mode 100644
index 7e87a07..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/cpp/message_field.cc
+++ /dev/null
@@ -1,958 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-
-#include <google/protobuf/compiler/cpp/message_field.h>
-
-#include <google/protobuf/io/printer.h>
-#include <google/protobuf/compiler/cpp/field.h>
-#include <google/protobuf/compiler/cpp/helpers.h>
-
-#include <google/protobuf/stubs/strutil.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace cpp {
-
-namespace {
-std::string ReinterpretCast(const std::string& type,
-                            const std::string& expression,
-                            bool implicit_weak_field) {
-  if (implicit_weak_field) {
-    return "reinterpret_cast< " + type + " >(" + expression + ")";
-  } else {
-    return expression;
-  }
-}
-
-void SetMessageVariables(const FieldDescriptor* descriptor,
-                         const Options& options, bool implicit_weak,
-                         std::map<std::string, std::string>* variables) {
-  SetCommonFieldVariables(descriptor, variables, options);
-  (*variables)["type"] = FieldMessageTypeName(descriptor, options);
-  (*variables)["casted_member"] = ReinterpretCast(
-      (*variables)["type"] + "*", (*variables)["field"], implicit_weak);
-  (*variables)["casted_member_const"] =
-      ReinterpretCast("const " + (*variables)["type"] + "&",
-                      "*" + (*variables)["field"], implicit_weak);
-  (*variables)["type_default_instance"] =
-      QualifiedDefaultInstanceName(descriptor->message_type(), options);
-  (*variables)["type_default_instance_ptr"] = ReinterpretCast(
-      "const ::PROTOBUF_NAMESPACE_ID::MessageLite*",
-      QualifiedDefaultInstancePtr(descriptor->message_type(), options),
-      implicit_weak);
-  (*variables)["type_reference_function"] =
-      implicit_weak ? ("  ::" + (*variables)["proto_ns"] +
-                       "::internal::StrongReference(reinterpret_cast<const " +
-                       (*variables)["type"] + "&>(\n" +
-                       (*variables)["type_default_instance"] + "));\n")
-                    : "";
-  // NOTE: Escaped here to unblock proto1->proto2 migration.
-  // TODO(liujisi): Extend this to apply for other conflicting methods.
-  (*variables)["release_name"] =
-      SafeFunctionName(descriptor->containing_type(), descriptor, "release_");
-  (*variables)["full_name"] = descriptor->full_name();
-}
-
-}  // namespace
-
-// ===================================================================
-
-MessageFieldGenerator::MessageFieldGenerator(const FieldDescriptor* descriptor,
-                                             const Options& options,
-                                             MessageSCCAnalyzer* scc_analyzer)
-    : FieldGenerator(descriptor, options),
-      implicit_weak_field_(
-          IsImplicitWeakField(descriptor, options, scc_analyzer)),
-      has_required_fields_(
-          scc_analyzer->HasRequiredFields(descriptor->message_type())) {
-  SetMessageVariables(descriptor, options, implicit_weak_field_, &variables_);
-}
-
-MessageFieldGenerator::~MessageFieldGenerator() {}
-
-void MessageFieldGenerator::GeneratePrivateMembers(io::Printer* printer) const {
-  Formatter format(printer, variables_);
-  if (implicit_weak_field_) {
-    format("::$proto_ns$::MessageLite* $name$_;\n");
-  } else {
-    format("$type$* $name$_;\n");
-  }
-}
-
-void MessageFieldGenerator::GenerateAccessorDeclarations(
-    io::Printer* printer) const {
-  Formatter format(printer, variables_);
-  if (IsFieldStripped(descriptor_, options_)) {
-    format(
-        "$deprecated_attr$const $type$& ${1$$name$$}$() const { "
-        "__builtin_trap(); }\n"
-        "PROTOBUF_NODISCARD $deprecated_attr$$type$* "
-        "${1$$release_name$$}$() { "
-        "__builtin_trap(); }\n"
-        "$deprecated_attr$$type$* ${1$mutable_$name$$}$() { "
-        "__builtin_trap(); }\n"
-        "$deprecated_attr$void ${1$set_allocated_$name$$}$"
-        "($type$* $name$) { __builtin_trap(); }\n"
-        "$deprecated_attr$void "
-        "${1$unsafe_arena_set_allocated_$name$$}$(\n"
-        "    $type$* $name$) { __builtin_trap(); }\n"
-        "$deprecated_attr$$type$* ${1$unsafe_arena_release_$name$$}$() { "
-        "__builtin_trap(); }\n",
-        descriptor_);
-    return;
-  }
-  format(
-      "$deprecated_attr$const $type$& ${1$$name$$}$() const;\n"
-      "PROTOBUF_NODISCARD $deprecated_attr$$type$* "
-      "${1$$release_name$$}$();\n"
-      "$deprecated_attr$$type$* ${1$mutable_$name$$}$();\n"
-      "$deprecated_attr$void ${1$set_allocated_$name$$}$"
-      "($type$* $name$);\n",
-      descriptor_);
-  if (!IsFieldStripped(descriptor_, options_)) {
-    format(
-        "private:\n"
-        "const $type$& ${1$_internal_$name$$}$() const;\n"
-        "$type$* ${1$_internal_mutable_$name$$}$();\n"
-        "public:\n",
-        descriptor_);
-  }
-  format(
-      "$deprecated_attr$void "
-      "${1$unsafe_arena_set_allocated_$name$$}$(\n"
-      "    $type$* $name$);\n"
-      "$deprecated_attr$$type$* ${1$unsafe_arena_release_$name$$}$();\n",
-      descriptor_);
-}
-
-void MessageFieldGenerator::GenerateNonInlineAccessorDefinitions(
-    io::Printer* printer) const {}
-
-void MessageFieldGenerator::GenerateInlineAccessorDefinitions(
-    io::Printer* printer) const {
-  Formatter format(printer, variables_);
-  format(
-      "inline const $type$& $classname$::_internal_$name$() const {\n"
-      "$type_reference_function$"
-      "  const $type$* p = $casted_member$;\n"
-      "  return p != nullptr ? *p : reinterpret_cast<const $type$&>(\n"
-      "      $type_default_instance$);\n"
-      "}\n"
-      "inline const $type$& $classname$::$name$() const {\n"
-      "$annotate_get$"
-      "  // @@protoc_insertion_point(field_get:$full_name$)\n"
-      "  return _internal_$name$();\n"
-      "}\n");
-
-  format(
-      "inline void $classname$::unsafe_arena_set_allocated_$name$(\n"
-      "    $type$* $name$) {\n"
-      "$maybe_prepare_split_message$"
-      // If we're not on an arena, free whatever we were holding before.
-      // (If we are on arena, we can just forget the earlier pointer.)
-      "  if (GetArenaForAllocation() == nullptr) {\n"
-      "    delete reinterpret_cast<::$proto_ns$::MessageLite*>($field$);\n"
-      "  }\n");
-  if (implicit_weak_field_) {
-    format(
-        "  $field$ = reinterpret_cast<::$proto_ns$::MessageLite*>($name$);\n");
-  } else {
-    format("  $field$ = $name$;\n");
-  }
-  format(
-      "  if ($name$) {\n"
-      "    $set_hasbit$\n"
-      "  } else {\n"
-      "    $clear_hasbit$\n"
-      "  }\n"
-      "$annotate_set$"
-      "  // @@protoc_insertion_point(field_unsafe_arena_set_allocated"
-      ":$full_name$)\n"
-      "}\n");
-  format(
-      "inline $type$* $classname$::$release_name$() {\n"
-      "$type_reference_function$"
-      "$annotate_release$"
-      "$maybe_prepare_split_message$"
-      "  $clear_hasbit$\n"
-      "  $type$* temp = $casted_member$;\n"
-      "  $field$ = nullptr;\n"
-      "#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE\n"
-      "  auto* old =  reinterpret_cast<::$proto_ns$::MessageLite*>(temp);\n"
-      "  temp = ::$proto_ns$::internal::DuplicateIfNonNull(temp);\n"
-      "  if (GetArenaForAllocation() == nullptr) { delete old; }\n"
-      "#else  // PROTOBUF_FORCE_COPY_IN_RELEASE\n"
-      "  if (GetArenaForAllocation() != nullptr) {\n"
-      "    temp = ::$proto_ns$::internal::DuplicateIfNonNull(temp);\n"
-      "  }\n"
-      "#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE\n"
-      "  return temp;\n"
-      "}\n"
-      "inline $type$* $classname$::unsafe_arena_release_$name$() {\n"
-      "$annotate_release$"
-      "  // @@protoc_insertion_point(field_release:$full_name$)\n"
-      "$type_reference_function$"
-      "$maybe_prepare_split_message$"
-      "  $clear_hasbit$\n"
-      "  $type$* temp = $casted_member$;\n"
-      "  $field$ = nullptr;\n"
-      "  return temp;\n"
-      "}\n");
-
-  format(
-      "inline $type$* $classname$::_internal_mutable_$name$() {\n"
-      "$type_reference_function$"
-      "  $set_hasbit$\n"
-      "  if ($field$ == nullptr) {\n"
-      "    auto* p = CreateMaybeMessage<$type$>(GetArenaForAllocation());\n");
-  if (implicit_weak_field_) {
-    format("    $field$ = reinterpret_cast<::$proto_ns$::MessageLite*>(p);\n");
-  } else {
-    format("    $field$ = p;\n");
-  }
-  format(
-      "  }\n"
-      "  return $casted_member$;\n"
-      "}\n"
-      "inline $type$* $classname$::mutable_$name$() {\n"
-      // TODO(b/122856539): add tests to make sure all write accessors are able
-      // to prepare split message allocation.
-      "$maybe_prepare_split_message$"
-      "  $type$* _msg = _internal_mutable_$name$();\n"
-      "$annotate_mutable$"
-      "  // @@protoc_insertion_point(field_mutable:$full_name$)\n"
-      "  return _msg;\n"
-      "}\n");
-
-  // We handle the most common case inline, and delegate less common cases to
-  // the slow fallback function.
-  format(
-      "inline void $classname$::set_allocated_$name$($type$* $name$) {\n"
-      "  ::$proto_ns$::Arena* message_arena = GetArenaForAllocation();\n");
-  format(
-      "$maybe_prepare_split_message$"
-      "  if (message_arena == nullptr) {\n");
-  if (IsCrossFileMessage(descriptor_)) {
-    format(
-        "    delete reinterpret_cast< ::$proto_ns$::MessageLite*>($field$);\n");
-  } else {
-    format("    delete $field$;\n");
-  }
-  format(
-      "  }\n"
-      "  if ($name$) {\n");
-  if (IsCrossFileMessage(descriptor_)) {
-    // We have to read the arena through the virtual method, because the type
-    // isn't defined in this file.
-    format(
-        "    ::$proto_ns$::Arena* submessage_arena =\n"
-        "        ::$proto_ns$::Arena::InternalGetOwningArena(\n"
-        "                reinterpret_cast<::$proto_ns$::MessageLite*>("
-        "$name$));\n");
-  } else {
-    format(
-        "    ::$proto_ns$::Arena* submessage_arena =\n"
-        "        ::$proto_ns$::Arena::InternalGetOwningArena("
-        "$name$);\n");
-  }
-  format(
-      "    if (message_arena != submessage_arena) {\n"
-      "      $name$ = ::$proto_ns$::internal::GetOwnedMessage(\n"
-      "          message_arena, $name$, submessage_arena);\n"
-      "    }\n"
-      "    $set_hasbit$\n"
-      "  } else {\n"
-      "    $clear_hasbit$\n"
-      "  }\n");
-  if (implicit_weak_field_) {
-    format("  $field$ = reinterpret_cast<MessageLite*>($name$);\n");
-  } else {
-    format("  $field$ = $name$;\n");
-  }
-  format(
-      "$annotate_set$"
-      "  // @@protoc_insertion_point(field_set_allocated:$full_name$)\n"
-      "}\n");
-}
-
-void MessageFieldGenerator::GenerateInternalAccessorDeclarations(
-    io::Printer* printer) const {
-  Formatter format(printer, variables_);
-  if (implicit_weak_field_) {
-    format(
-        "static const ::$proto_ns$::MessageLite& $name$("
-        "const $classname$* msg);\n"
-        "static ::$proto_ns$::MessageLite* mutable_$name$("
-        "$classname$* msg);\n");
-  } else {
-    format("static const $type$& $name$(const $classname$* msg);\n");
-  }
-}
-
-void MessageFieldGenerator::GenerateInternalAccessorDefinitions(
-    io::Printer* printer) const {
-  // In theory, these accessors could be inline in _Internal. However, in
-  // practice, the linker is then not able to throw them out making implicit
-  // weak dependencies not work at all.
-  Formatter format(printer, variables_);
-  if (implicit_weak_field_) {
-    // These private accessors are used by MergeFrom and
-    // MergePartialFromCodedStream, and their purpose is to provide access to
-    // the field without creating a strong dependency on the message type.
-    format(
-        "const ::$proto_ns$::MessageLite& $classname$::_Internal::$name$(\n"
-        "    const $classname$* msg) {\n"
-        "  if (msg->$field$ != nullptr) {\n"
-        "    return *msg->$field$;\n"
-        "  } else {\n"
-        "    return *$type_default_instance_ptr$;\n"
-        "  }\n"
-        "}\n");
-    format(
-        "::$proto_ns$::MessageLite*\n"
-        "$classname$::_Internal::mutable_$name$($classname$* msg) {\n");
-    if (HasHasbit(descriptor_)) {
-      format("  msg->$set_hasbit$\n");
-    }
-    if (descriptor_->real_containing_oneof() == nullptr) {
-      format("  if (msg->$field$ == nullptr) {\n");
-    } else {
-      format(
-          "  if (!msg->_internal_has_$name$()) {\n"
-          "    msg->clear_$oneof_name$();\n"
-          "    msg->set_has_$name$();\n");
-    }
-    format(
-        "    msg->$field$ = $type_default_instance_ptr$->New(\n"
-        "        msg->GetArenaForAllocation());\n"
-        "  }\n"
-        "  return msg->$field$;\n"
-        "}\n");
-  } else {
-    // This inline accessor directly returns member field and is used in
-    // Serialize such that AFDO profile correctly captures access information to
-    // message fields under serialize.
-    format(
-        "const $type$&\n"
-        "$classname$::_Internal::$name$(const $classname$* msg) {\n"
-        "  return *msg->$field$;\n"
-        "}\n");
-  }
-}
-
-void MessageFieldGenerator::GenerateClearingCode(io::Printer* printer) const {
-  GOOGLE_CHECK(!IsFieldStripped(descriptor_, options_));
-
-  Formatter format(printer, variables_);
-  if (!HasHasbit(descriptor_)) {
-    // If we don't have has-bits, message presence is indicated only by ptr !=
-    // nullptr. Thus on clear, we need to delete the object.
-    format(
-        "if (GetArenaForAllocation() == nullptr && $field$ != nullptr) {\n"
-        "  delete $field$;\n"
-        "}\n"
-        "$field$ = nullptr;\n");
-  } else {
-    format("if ($field$ != nullptr) $field$->Clear();\n");
-  }
-}
-
-void MessageFieldGenerator::GenerateMessageClearingCode(
-    io::Printer* printer) const {
-  GOOGLE_CHECK(!IsFieldStripped(descriptor_, options_));
-
-  Formatter format(printer, variables_);
-  if (!HasHasbit(descriptor_)) {
-    // If we don't have has-bits, message presence is indicated only by ptr !=
-    // nullptr. Thus on clear, we need to delete the object.
-    format(
-        "if (GetArenaForAllocation() == nullptr && $field$ != nullptr) {\n"
-        "  delete $field$;\n"
-        "}\n"
-        "$field$ = nullptr;\n");
-  } else {
-    format(
-        "$DCHK$($field$ != nullptr);\n"
-        "$field$->Clear();\n");
-  }
-}
-
-void MessageFieldGenerator::GenerateMergingCode(io::Printer* printer) const {
-  GOOGLE_CHECK(!IsFieldStripped(descriptor_, options_));
-
-  Formatter format(printer, variables_);
-  if (implicit_weak_field_) {
-    format(
-        "_Internal::mutable_$name$(_this)->CheckTypeAndMergeFrom(\n"
-        "    _Internal::$name$(&from));\n");
-  } else {
-    format(
-        "_this->_internal_mutable_$name$()->$type$::MergeFrom(\n"
-        "    from._internal_$name$());\n");
-  }
-}
-
-void MessageFieldGenerator::GenerateSwappingCode(io::Printer* printer) const {
-  GOOGLE_CHECK(!IsFieldStripped(descriptor_, options_));
-
-  Formatter format(printer, variables_);
-  format("swap($field$, other->$field$);\n");
-}
-
-void MessageFieldGenerator::GenerateDestructorCode(io::Printer* printer) const {
-  GOOGLE_CHECK(!IsFieldStripped(descriptor_, options_));
-
-  Formatter format(printer, variables_);
-  if (options_.opensource_runtime) {
-    // TODO(gerbens) Remove this when we don't need to destruct default
-    // instances.  In google3 a default instance will never get deleted so we
-    // don't need to worry about that but in opensource protobuf default
-    // instances are deleted in shutdown process and we need to take special
-    // care when handling them.
-    format("if (this != internal_default_instance()) ");
-  }
-  if (ShouldSplit(descriptor_, options_)) {
-    format("delete $cached_split_ptr$->$name$_;\n");
-    return;
-  }
-  format("delete $field$;\n");
-}
-
-void MessageFieldGenerator::GenerateCopyConstructorCode(
-    io::Printer* printer) const {
-  GOOGLE_CHECK(!IsFieldStripped(descriptor_, options_));
-
-  Formatter format(printer, variables_);
-  format(
-      "if (from._internal_has_$name$()) {\n"
-      "  _this->$field$ = new $type$(*from.$field$);\n"
-      "}\n");
-}
-
-void MessageFieldGenerator::GenerateSerializeWithCachedSizesToArray(
-    io::Printer* printer) const {
-  GOOGLE_CHECK(!IsFieldStripped(descriptor_, options_));
-
-  Formatter format(printer, variables_);
-  if (descriptor_->type() == FieldDescriptor::TYPE_MESSAGE) {
-    format(
-        "target = ::$proto_ns$::internal::WireFormatLite::\n"
-        "  InternalWrite$declared_type$($number$, _Internal::$name$(this),\n"
-        "    _Internal::$name$(this).GetCachedSize(), target, stream);\n");
-  } else {
-    format(
-        "target = stream->EnsureSpace(target);\n"
-        "target = ::$proto_ns$::internal::WireFormatLite::\n"
-        "  InternalWrite$declared_type$(\n"
-        "    $number$, _Internal::$name$(this), target, stream);\n");
-  }
-}
-
-void MessageFieldGenerator::GenerateByteSize(io::Printer* printer) const {
-  GOOGLE_CHECK(!IsFieldStripped(descriptor_, options_));
-
-  Formatter format(printer, variables_);
-  format(
-      "total_size += $tag_size$ +\n"
-      "  ::$proto_ns$::internal::WireFormatLite::$declared_type$Size(\n"
-      "    *$field$);\n");
-}
-
-void MessageFieldGenerator::GenerateIsInitialized(io::Printer* printer) const {
-  GOOGLE_CHECK(!IsFieldStripped(descriptor_, options_));
-
-  if (!has_required_fields_) return;
-
-  Formatter format(printer, variables_);
-  format(
-      "if (_internal_has_$name$()) {\n"
-      "  if (!$field$->IsInitialized()) return false;\n"
-      "}\n");
-}
-
-void MessageFieldGenerator::GenerateConstexprAggregateInitializer(
-    io::Printer* printer) const {
-  Formatter format(printer, variables_);
-  format("/*decltype($field$)*/nullptr");
-}
-
-void MessageFieldGenerator::GenerateCopyAggregateInitializer(
-    io::Printer* printer) const {
-  Formatter format(printer, variables_);
-  format("decltype($field$){nullptr}");
-}
-
-void MessageFieldGenerator::GenerateAggregateInitializer(
-    io::Printer* printer) const {
-  Formatter format(printer, variables_);
-  if (ShouldSplit(descriptor_, options_)) {
-    format("decltype(Impl_::Split::$name$_){nullptr}");
-    return;
-  }
-  format("decltype($field$){nullptr}");
-}
-
-// ===================================================================
-
-MessageOneofFieldGenerator::MessageOneofFieldGenerator(
-    const FieldDescriptor* descriptor, const Options& options,
-    MessageSCCAnalyzer* scc_analyzer)
-    : MessageFieldGenerator(descriptor, options, scc_analyzer) {
-  SetCommonOneofFieldVariables(descriptor, &variables_);
-}
-
-MessageOneofFieldGenerator::~MessageOneofFieldGenerator() {}
-
-void MessageOneofFieldGenerator::GenerateNonInlineAccessorDefinitions(
-    io::Printer* printer) const {
-  Formatter format(printer, variables_);
-  format(
-      "void $classname$::set_allocated_$name$($type$* $name$) {\n"
-      "  ::$proto_ns$::Arena* message_arena = GetArenaForAllocation();\n"
-      "  clear_$oneof_name$();\n"
-      "  if ($name$) {\n");
-  if (descriptor_->file() != descriptor_->message_type()->file()) {
-    // We have to read the arena through the virtual method, because the type
-    // isn't defined in this file.
-    format(
-        "    ::$proto_ns$::Arena* submessage_arena =\n"
-        "        ::$proto_ns$::Arena::InternalGetOwningArena(\n"
-        "                reinterpret_cast<::$proto_ns$::MessageLite*>("
-        "$name$));\n");
-  } else {
-    format(
-        "    ::$proto_ns$::Arena* submessage_arena =\n"
-        "      ::$proto_ns$::Arena::InternalGetOwningArena($name$);\n");
-  }
-  format(
-      "    if (message_arena != submessage_arena) {\n"
-      "      $name$ = ::$proto_ns$::internal::GetOwnedMessage(\n"
-      "          message_arena, $name$, submessage_arena);\n"
-      "    }\n"
-      "    set_has_$name$();\n"
-      "    $field$ = $name$;\n"
-      "  }\n"
-      "$annotate_set$"
-      "  // @@protoc_insertion_point(field_set_allocated:$full_name$)\n"
-      "}\n");
-}
-
-void MessageOneofFieldGenerator::GenerateInlineAccessorDefinitions(
-    io::Printer* printer) const {
-  Formatter format(printer, variables_);
-  format(
-      "inline $type$* $classname$::$release_name$() {\n"
-      "$annotate_release$"
-      "  // @@protoc_insertion_point(field_release:$full_name$)\n"
-      "$type_reference_function$"
-      "  if (_internal_has_$name$()) {\n"
-      "    clear_has_$oneof_name$();\n"
-      "    $type$* temp = $casted_member$;\n"
-      "    if (GetArenaForAllocation() != nullptr) {\n"
-      "      temp = ::$proto_ns$::internal::DuplicateIfNonNull(temp);\n"
-      "    }\n"
-      "    $field$ = nullptr;\n"
-      "    return temp;\n"
-      "  } else {\n"
-      "    return nullptr;\n"
-      "  }\n"
-      "}\n");
-
-  format(
-      "inline const $type$& $classname$::_internal_$name$() const {\n"
-      "$type_reference_function$"
-      "  return _internal_has_$name$()\n"
-      "      ? $casted_member_const$\n"
-      "      : reinterpret_cast< $type$&>($type_default_instance$);\n"
-      "}\n"
-      "inline const $type$& $classname$::$name$() const {\n"
-      "$annotate_get$"
-      "  // @@protoc_insertion_point(field_get:$full_name$)\n"
-      "  return _internal_$name$();\n"
-      "}\n"
-      "inline $type$* $classname$::unsafe_arena_release_$name$() {\n"
-      "$annotate_release$"
-      "  // @@protoc_insertion_point(field_unsafe_arena_release"
-      ":$full_name$)\n"
-      "$type_reference_function$"
-      "  if (_internal_has_$name$()) {\n"
-      "    clear_has_$oneof_name$();\n"
-      "    $type$* temp = $casted_member$;\n"
-      "    $field$ = nullptr;\n"
-      "    return temp;\n"
-      "  } else {\n"
-      "    return nullptr;\n"
-      "  }\n"
-      "}\n"
-      "inline void $classname$::unsafe_arena_set_allocated_$name$"
-      "($type$* $name$) {\n"
-      // We rely on the oneof clear method to free the earlier contents of
-      // this oneof. We can directly use the pointer we're given to set the
-      // new value.
-      "  clear_$oneof_name$();\n"
-      "  if ($name$) {\n"
-      "    set_has_$name$();\n");
-  if (implicit_weak_field_) {
-    format(
-        "    $field$ = "
-        "reinterpret_cast<::$proto_ns$::MessageLite*>($name$);\n");
-  } else {
-    format("    $field$ = $name$;\n");
-  }
-  format(
-      "  }\n"
-      "$annotate_set$"
-      "  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:"
-      "$full_name$)\n"
-      "}\n"
-      "inline $type$* $classname$::_internal_mutable_$name$() {\n"
-      "$type_reference_function$"
-      "  if (!_internal_has_$name$()) {\n"
-      "    clear_$oneof_name$();\n"
-      "    set_has_$name$();\n");
-  if (implicit_weak_field_) {
-    format(
-        "    $field$ = "
-        "reinterpret_cast<::$proto_ns$::MessageLite*>(CreateMaybeMessage< "
-        "$type$ >(GetArenaForAllocation()));\n");
-  } else {
-    format(
-        "    $field$ = CreateMaybeMessage< $type$ "
-        ">(GetArenaForAllocation());\n");
-  }
-  format(
-      "  }\n"
-      "  return $casted_member$;\n"
-      "}\n"
-      "inline $type$* $classname$::mutable_$name$() {\n"
-      "  $type$* _msg = _internal_mutable_$name$();\n"
-      "$annotate_mutable$"
-      "  // @@protoc_insertion_point(field_mutable:$full_name$)\n"
-      "  return _msg;\n"
-      "}\n");
-}
-
-void MessageOneofFieldGenerator::GenerateClearingCode(
-    io::Printer* printer) const {
-  GOOGLE_CHECK(!IsFieldStripped(descriptor_, options_));
-
-  Formatter format(printer, variables_);
-  format(
-      "if (GetArenaForAllocation() == nullptr) {\n"
-      "  delete $field$;\n"
-      "}\n");
-}
-
-void MessageOneofFieldGenerator::GenerateMessageClearingCode(
-    io::Printer* printer) const {
-  GenerateClearingCode(printer);
-}
-
-void MessageOneofFieldGenerator::GenerateSwappingCode(
-    io::Printer* printer) const {
-  // Don't print any swapping code. Swapping the union will swap this field.
-}
-
-void MessageOneofFieldGenerator::GenerateDestructorCode(
-    io::Printer* printer) const {
-  // We inherit from MessageFieldGenerator, so we need to override the default
-  // behavior.
-}
-
-void MessageOneofFieldGenerator::GenerateConstructorCode(
-    io::Printer* printer) const {
-  // Don't print any constructor code. The field is in a union. We allocate
-  // space only when this field is used.
-}
-
-void MessageOneofFieldGenerator::GenerateIsInitialized(
-    io::Printer* printer) const {
-  if (!has_required_fields_) return;
-
-  Formatter format(printer, variables_);
-  format(
-      "if (_internal_has_$name$()) {\n"
-      "  if (!$field$->IsInitialized()) return false;\n"
-      "}\n");
-}
-
-// ===================================================================
-
-RepeatedMessageFieldGenerator::RepeatedMessageFieldGenerator(
-    const FieldDescriptor* descriptor, const Options& options,
-    MessageSCCAnalyzer* scc_analyzer)
-    : FieldGenerator(descriptor, options),
-      implicit_weak_field_(
-          IsImplicitWeakField(descriptor, options, scc_analyzer)),
-      has_required_fields_(
-          scc_analyzer->HasRequiredFields(descriptor->message_type())) {
-  SetMessageVariables(descriptor, options, implicit_weak_field_, &variables_);
-}
-
-RepeatedMessageFieldGenerator::~RepeatedMessageFieldGenerator() {}
-
-void RepeatedMessageFieldGenerator::GeneratePrivateMembers(
-    io::Printer* printer) const {
-  Formatter format(printer, variables_);
-  if (implicit_weak_field_) {
-    format("::$proto_ns$::WeakRepeatedPtrField< $type$ > $name$_;\n");
-  } else {
-    format("::$proto_ns$::RepeatedPtrField< $type$ > $name$_;\n");
-  }
-}
-
-void RepeatedMessageFieldGenerator::GenerateAccessorDeclarations(
-    io::Printer* printer) const {
-  Formatter format(printer, variables_);
-  if (IsFieldStripped(descriptor_, options_)) {
-    format(
-        "$deprecated_attr$$type$* ${1$mutable_$name$$}$(int index) { "
-        "__builtin_trap(); }\n"
-        "$deprecated_attr$::$proto_ns$::RepeatedPtrField< $type$ >*\n"
-        "    ${1$mutable_$name$$}$() { __builtin_trap(); }\n"
-        "$deprecated_attr$const $type$& ${1$$name$$}$(int index) const { "
-        "__builtin_trap(); }\n"
-        "$deprecated_attr$$type$* ${1$add_$name$$}$() { "
-        "__builtin_trap(); }\n"
-        "$deprecated_attr$const ::$proto_ns$::RepeatedPtrField< $type$ >&\n"
-        "    ${1$$name$$}$() const { __builtin_trap(); }\n",
-        descriptor_);
-    return;
-  }
-  format(
-      "$deprecated_attr$$type$* ${1$mutable_$name$$}$(int index);\n"
-      "$deprecated_attr$::$proto_ns$::RepeatedPtrField< $type$ >*\n"
-      "    ${1$mutable_$name$$}$();\n",
-      descriptor_);
-  if (!IsFieldStripped(descriptor_, options_)) {
-    format(
-        "private:\n"
-        "const $type$& ${1$_internal_$name$$}$(int index) const;\n"
-        "$type$* ${1$_internal_add_$name$$}$();\n"
-        "public:\n",
-        descriptor_);
-  }
-  format(
-      "$deprecated_attr$const $type$& ${1$$name$$}$(int index) const;\n"
-      "$deprecated_attr$$type$* ${1$add_$name$$}$();\n"
-      "$deprecated_attr$const ::$proto_ns$::RepeatedPtrField< $type$ >&\n"
-      "    ${1$$name$$}$() const;\n",
-      descriptor_);
-}
-
-void RepeatedMessageFieldGenerator::GenerateInlineAccessorDefinitions(
-    io::Printer* printer) const {
-  Formatter format(printer, variables_);
-  format.Set("weak", implicit_weak_field_ ? ".weak" : "");
-
-  format(
-      "inline $type$* $classname$::mutable_$name$(int index) {\n"
-      "$annotate_mutable$"
-      // TODO(dlj): move insertion points
-      "  // @@protoc_insertion_point(field_mutable:$full_name$)\n"
-      "$type_reference_function$"
-      "  return $field$$weak$.Mutable(index);\n"
-      "}\n"
-      "inline ::$proto_ns$::RepeatedPtrField< $type$ >*\n"
-      "$classname$::mutable_$name$() {\n"
-      "$annotate_mutable_list$"
-      "  // @@protoc_insertion_point(field_mutable_list:$full_name$)\n"
-      "$type_reference_function$"
-      "  return &$field$$weak$;\n"
-      "}\n");
-
-  if (options_.safe_boundary_check) {
-    format(
-        "inline const $type$& $classname$::_internal_$name$(int index) const "
-        "{\n"
-        "  return $field$$weak$.InternalCheckedGet(index,\n"
-        "      reinterpret_cast<const $type$&>($type_default_instance$));\n"
-        "}\n");
-  } else {
-    format(
-        "inline const $type$& $classname$::_internal_$name$(int index) const "
-        "{\n"
-        "$type_reference_function$"
-        "  return $field$$weak$.Get(index);\n"
-        "}\n");
-  }
-
-  format(
-      "inline const $type$& $classname$::$name$(int index) const {\n"
-      "$annotate_get$"
-      "  // @@protoc_insertion_point(field_get:$full_name$)\n"
-      "  return _internal_$name$(index);\n"
-      "}\n"
-      "inline $type$* $classname$::_internal_add_$name$() {\n"
-      "  return $field$$weak$.Add();\n"
-      "}\n"
-      "inline $type$* $classname$::add_$name$() {\n"
-      "  $type$* _add = _internal_add_$name$();\n"
-      "$annotate_add_mutable$"
-      "  // @@protoc_insertion_point(field_add:$full_name$)\n"
-      "  return _add;\n"
-      "}\n");
-
-  format(
-      "inline const ::$proto_ns$::RepeatedPtrField< $type$ >&\n"
-      "$classname$::$name$() const {\n"
-      "$annotate_list$"
-      "  // @@protoc_insertion_point(field_list:$full_name$)\n"
-      "$type_reference_function$"
-      "  return $field$$weak$;\n"
-      "}\n");
-}
-
-void RepeatedMessageFieldGenerator::GenerateClearingCode(
-    io::Printer* printer) const {
-  GOOGLE_CHECK(!IsFieldStripped(descriptor_, options_));
-
-  Formatter format(printer, variables_);
-  format("$field$.Clear();\n");
-}
-
-void RepeatedMessageFieldGenerator::GenerateMergingCode(
-    io::Printer* printer) const {
-  GOOGLE_CHECK(!IsFieldStripped(descriptor_, options_));
-
-  Formatter format(printer, variables_);
-  format("_this->$field$.MergeFrom(from.$field$);\n");
-}
-
-void RepeatedMessageFieldGenerator::GenerateSwappingCode(
-    io::Printer* printer) const {
-  GOOGLE_CHECK(!IsFieldStripped(descriptor_, options_));
-
-  Formatter format(printer, variables_);
-  format("$field$.InternalSwap(&other->$field$);\n");
-}
-
-void RepeatedMessageFieldGenerator::GenerateConstructorCode(
-    io::Printer* printer) const {
-  // Not needed for repeated fields.
-}
-
-void RepeatedMessageFieldGenerator::GenerateDestructorCode(
-    io::Printer* printer) const {
-  GOOGLE_CHECK(!IsFieldStripped(descriptor_, options_));
-
-  Formatter format(printer, variables_);
-  if (implicit_weak_field_) {
-    format("$field$.~WeakRepeatedPtrField();\n");
-  } else {
-    format("$field$.~RepeatedPtrField();\n");
-  }
-}
-
-void RepeatedMessageFieldGenerator::GenerateSerializeWithCachedSizesToArray(
-    io::Printer* printer) const {
-  GOOGLE_CHECK(!IsFieldStripped(descriptor_, options_));
-
-  Formatter format(printer, variables_);
-  if (implicit_weak_field_) {
-    format(
-        "for (auto it = this->$field$.pointer_begin(),\n"
-        "          end = this->$field$.pointer_end(); it < end; ++it) {\n");
-    if (descriptor_->type() == FieldDescriptor::TYPE_MESSAGE) {
-      format(
-          "  target = ::$proto_ns$::internal::WireFormatLite::\n"
-          "    InternalWrite$declared_type$($number$, "
-          "**it, (**it).GetCachedSize(), target, stream);\n");
-    } else {
-      format(
-          "  target = stream->EnsureSpace(target);\n"
-          "  target = ::$proto_ns$::internal::WireFormatLite::\n"
-          "    InternalWrite$declared_type$($number$, **it, target, "
-          "stream);\n");
-    }
-    format("}\n");
-  } else {
-    format(
-        "for (unsigned i = 0,\n"
-        "    n = static_cast<unsigned>(this->_internal_$name$_size());"
-        " i < n; i++) {\n");
-    if (descriptor_->type() == FieldDescriptor::TYPE_MESSAGE) {
-      format(
-          "  const auto& repfield = this->_internal_$name$(i);\n"
-          "  target = ::$proto_ns$::internal::WireFormatLite::\n"
-          "      InternalWrite$declared_type$($number$, "
-          "repfield, repfield.GetCachedSize(), target, stream);\n"
-          "}\n");
-    } else {
-      format(
-          "  target = stream->EnsureSpace(target);\n"
-          "  target = ::$proto_ns$::internal::WireFormatLite::\n"
-          "    InternalWrite$declared_type$($number$, "
-          "this->_internal_$name$(i), target, stream);\n"
-          "}\n");
-    }
-  }
-}
-
-void RepeatedMessageFieldGenerator::GenerateByteSize(
-    io::Printer* printer) const {
-  GOOGLE_CHECK(!IsFieldStripped(descriptor_, options_));
-
-  Formatter format(printer, variables_);
-  format(
-      "total_size += $tag_size$UL * this->_internal_$name$_size();\n"
-      "for (const auto& msg : this->$field$) {\n"
-      "  total_size +=\n"
-      "    ::$proto_ns$::internal::WireFormatLite::$declared_type$Size(msg);\n"
-      "}\n");
-}
-
-void RepeatedMessageFieldGenerator::GenerateIsInitialized(
-    io::Printer* printer) const {
-  GOOGLE_CHECK(!IsFieldStripped(descriptor_, options_));
-
-  if (!has_required_fields_) return;
-
-  Formatter format(printer, variables_);
-  if (implicit_weak_field_) {
-    format(
-        "if (!::$proto_ns$::internal::AllAreInitializedWeak($field$.weak))\n"
-        "  return false;\n");
-  } else {
-    format(
-        "if (!::$proto_ns$::internal::AllAreInitialized($field$))\n"
-        "  return false;\n");
-  }
-}
-
-}  // namespace cpp
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/compiler/cpp/message_field.h b/libs/protobuf/src/google/protobuf/compiler/cpp/message_field.h
deleted file mode 100644
index 70c42c0..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/cpp/message_field.h
+++ /dev/null
@@ -1,148 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-
-#ifndef GOOGLE_PROTOBUF_COMPILER_CPP_MESSAGE_FIELD_H__
-#define GOOGLE_PROTOBUF_COMPILER_CPP_MESSAGE_FIELD_H__
-
-#include <map>
-#include <string>
-
-#include <google/protobuf/compiler/cpp/field.h>
-#include <google/protobuf/compiler/cpp/helpers.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace cpp {
-
-class MessageFieldGenerator : public FieldGenerator {
- public:
-  MessageFieldGenerator(const FieldDescriptor* descriptor,
-                        const Options& options,
-                        MessageSCCAnalyzer* scc_analyzer);
-  ~MessageFieldGenerator() override;
-
-  // implements FieldGenerator ---------------------------------------
-  void GeneratePrivateMembers(io::Printer* printer) const override;
-  void GenerateAccessorDeclarations(io::Printer* printer) const override;
-  void GenerateInlineAccessorDefinitions(io::Printer* printer) const override;
-  void GenerateNonInlineAccessorDefinitions(
-      io::Printer* printer) const override;
-  void GenerateInternalAccessorDeclarations(
-      io::Printer* printer) const override;
-  void GenerateInternalAccessorDefinitions(io::Printer* printer) const override;
-  void GenerateClearingCode(io::Printer* printer) const override;
-  void GenerateMessageClearingCode(io::Printer* printer) const override;
-  void GenerateMergingCode(io::Printer* printer) const override;
-  void GenerateSwappingCode(io::Printer* printer) const override;
-  void GenerateDestructorCode(io::Printer* printer) const override;
-  void GenerateConstructorCode(io::Printer* printer) const override {}
-  void GenerateCopyConstructorCode(io::Printer* printer) const override;
-  void GenerateSerializeWithCachedSizesToArray(
-      io::Printer* printer) const override;
-  void GenerateByteSize(io::Printer* printer) const override;
-  void GenerateIsInitialized(io::Printer* printer) const override;
-  void GenerateConstexprAggregateInitializer(
-      io::Printer* printer) const override;
-  void GenerateAggregateInitializer(io::Printer* printer) const override;
-  void GenerateCopyAggregateInitializer(io::Printer* printer) const override;
-
- protected:
-  const bool implicit_weak_field_;
-  const bool has_required_fields_;
-
- private:
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(MessageFieldGenerator);
-};
-
-class MessageOneofFieldGenerator : public MessageFieldGenerator {
- public:
-  MessageOneofFieldGenerator(const FieldDescriptor* descriptor,
-                             const Options& options,
-                             MessageSCCAnalyzer* scc_analyzer);
-  ~MessageOneofFieldGenerator() override;
-
-  // implements FieldGenerator ---------------------------------------
-  void GenerateInlineAccessorDefinitions(io::Printer* printer) const override;
-  void GenerateNonInlineAccessorDefinitions(
-      io::Printer* printer) const override;
-  void GenerateClearingCode(io::Printer* printer) const override;
-
-  // MessageFieldGenerator, from which we inherit, overrides this so we need to
-  // override it as well.
-  void GenerateMessageClearingCode(io::Printer* printer) const override;
-  void GenerateSwappingCode(io::Printer* printer) const override;
-  void GenerateDestructorCode(io::Printer* printer) const override;
-  void GenerateConstructorCode(io::Printer* printer) const override;
-  void GenerateIsInitialized(io::Printer* printer) const override;
-
- private:
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(MessageOneofFieldGenerator);
-};
-
-class RepeatedMessageFieldGenerator : public FieldGenerator {
- public:
-  RepeatedMessageFieldGenerator(const FieldDescriptor* descriptor,
-                                const Options& options,
-                                MessageSCCAnalyzer* scc_analyzer);
-  ~RepeatedMessageFieldGenerator() override;
-
-  // implements FieldGenerator ---------------------------------------
-  void GeneratePrivateMembers(io::Printer* printer) const override;
-  void GenerateAccessorDeclarations(io::Printer* printer) const override;
-  void GenerateInlineAccessorDefinitions(io::Printer* printer) const override;
-  void GenerateClearingCode(io::Printer* printer) const override;
-  void GenerateMergingCode(io::Printer* printer) const override;
-  void GenerateSwappingCode(io::Printer* printer) const override;
-  void GenerateConstructorCode(io::Printer* printer) const override;
-  void GenerateCopyConstructorCode(io::Printer* printer) const override {}
-  void GenerateDestructorCode(io::Printer* printer) const override;
-  void GenerateSerializeWithCachedSizesToArray(
-      io::Printer* printer) const override;
-  void GenerateByteSize(io::Printer* printer) const override;
-  void GenerateIsInitialized(io::Printer* printer) const override;
-
- private:
-  const bool implicit_weak_field_;
-  const bool has_required_fields_;
-
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(RepeatedMessageFieldGenerator);
-};
-
-}  // namespace cpp
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // GOOGLE_PROTOBUF_COMPILER_CPP_MESSAGE_FIELD_H__
diff --git a/libs/protobuf/src/google/protobuf/compiler/cpp/message_layout_helper.h b/libs/protobuf/src/google/protobuf/compiler/cpp/message_layout_helper.h
deleted file mode 100644
index a8813a1..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/cpp/message_layout_helper.h
+++ /dev/null
@@ -1,64 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: seongkim@google.com (Seong Beom Kim)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-
-#ifndef GOOGLE_PROTOBUF_COMPILER_CPP_MESSAGE_LAYOUT_HELPER_H__
-#define GOOGLE_PROTOBUF_COMPILER_CPP_MESSAGE_LAYOUT_HELPER_H__
-
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/compiler/cpp/options.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace cpp {
-
-class MessageSCCAnalyzer;
-
-// Provides an abstract interface to optimize message layout
-// by rearranging the fields of a message.
-class MessageLayoutHelper {
- public:
-  virtual ~MessageLayoutHelper() {}
-
-  virtual void OptimizeLayout(std::vector<const FieldDescriptor*>* fields,
-                              const Options& options,
-                              MessageSCCAnalyzer* scc_analyzer) = 0;
-};
-
-}  // namespace cpp
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // GOOGLE_PROTOBUF_COMPILER_CPP_MESSAGE_LAYOUT_HELPER_H__
diff --git a/libs/protobuf/src/google/protobuf/compiler/cpp/message_size_unittest.cc b/libs/protobuf/src/google/protobuf/compiler/cpp/message_size_unittest.cc
deleted file mode 100644
index 761988b..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/cpp/message_size_unittest.cc
+++ /dev/null
@@ -1,272 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <google/protobuf/unittest.pb.h>
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
-#include <google/protobuf/descriptor.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace cpp {
-
-// Can't use an anonymous namespace here due to brokenness of Tru64 compiler.
-namespace cpp_unittest {
-
-
-#if !defined(GOOGLE_CHECK_MESSAGE_SIZE)
-#define GOOGLE_CHECK_MESSAGE_SIZE(t, expected)
-#endif
-
-// Mock structures to lock down the size of messages in a platform-independent
-// way.  The commented sizes only apply when build with clang x86_64.
-struct MockMessageBase {
-  virtual ~MockMessageBase() = default;  // 8 bytes vtable
-  void* internal_metadata;               // 8 bytes
-};
-GOOGLE_CHECK_MESSAGE_SIZE(MockMessageBase, 16);
-
-struct MockZeroFieldsBase : public MockMessageBase {
-  int cached_size;  // 4 bytes
-  // + 4 bytes padding
-};
-GOOGLE_CHECK_MESSAGE_SIZE(MockZeroFieldsBase, 24);
-
-struct MockExtensionSet {
-  void* arena;       // 8 bytes
-  int16_t capacity;  // 4 bytes
-  int16_t size;      // 4 bytes
-  void* data;        // 8 bytes
-};
-GOOGLE_CHECK_MESSAGE_SIZE(MockExtensionSet, 24);
-
-struct MockRepeatedPtrField {
-  void* arena;       // 8 bytes
-  int current_size;  // 4 bytes
-  int total_size;    // 4 bytes
-  void* data;        // 8 bytes
-};
-GOOGLE_CHECK_MESSAGE_SIZE(MockRepeatedPtrField, 24);
-
-struct MockRepeatedField {
-  int current_size;  // 4 bytes
-  int total_size;    // 4 bytes
-  void* data;        // 8 bytes
-};
-GOOGLE_CHECK_MESSAGE_SIZE(MockRepeatedField, 16);
-
-TEST(GeneratedMessageTest, MockSizes) {
-  // Consistency checks -- if these fail, the tests below will definitely fail.
-  GOOGLE_CHECK_EQ(sizeof(MessageLite), sizeof(MockMessageBase));
-  GOOGLE_CHECK_EQ(sizeof(Message), sizeof(MockMessageBase));
-  GOOGLE_CHECK_EQ(sizeof(internal::ZeroFieldsBase), sizeof(MockZeroFieldsBase));
-  GOOGLE_CHECK_EQ(sizeof(internal::ExtensionSet), sizeof(MockExtensionSet));
-  GOOGLE_CHECK_EQ(sizeof(RepeatedPtrField<std::string>), sizeof(MockRepeatedPtrField));
-  GOOGLE_CHECK_EQ(sizeof(RepeatedField<int>), sizeof(MockRepeatedField));
-}
-
-TEST(GeneratedMessageTest, EmptyMessageSize) {
-  EXPECT_EQ(sizeof(protobuf_unittest::TestEmptyMessage),
-            sizeof(MockZeroFieldsBase));
-}
-
-TEST(GeneratedMessageTest, ReservedSize) {
-  EXPECT_EQ(sizeof(protobuf_unittest::TestReservedFields),
-            sizeof(MockZeroFieldsBase));
-}
-
-TEST(GeneratedMessageTest, EmptyMessageWithExtensionsSize) {
-  struct MockGenerated : public MockMessageBase {  // 16 bytes
-    MockExtensionSet extensions;                   // 24 bytes
-    int cached_size;                               // 4 bytes
-    // + 4 bytes of padding
-  };
-  GOOGLE_CHECK_MESSAGE_SIZE(MockGenerated, 48);
-  EXPECT_EQ(sizeof(protobuf_unittest::TestEmptyMessageWithExtensions),
-            sizeof(MockGenerated));
-}
-
-TEST(GeneratedMessageTest, RecursiveMessageSize) {
-  struct MockGenerated : public MockMessageBase {  // 16 bytes
-    int has_bits[1];                               // 4 bytes
-    int cached_size;                               // 4 bytes
-    void* a;                                       // 8 bytes
-    int32_t i;                                     // 4 bytes
-    // + 4 bytes padding
-  };
-  GOOGLE_CHECK_MESSAGE_SIZE(MockGenerated, 40);
-  EXPECT_EQ(sizeof(protobuf_unittest::TestRecursiveMessage),
-            sizeof(MockGenerated));
-}
-
-TEST(GeneratedMessageTest, OneStringSize) {
-  struct MockGenerated : public MockMessageBase {  // 16 bytes
-    int has_bits[1];                               // 4 bytes
-    int cached_size;                               // 4 bytes
-    void* data;                                    // 8 bytes
-  };
-  GOOGLE_CHECK_MESSAGE_SIZE(MockGenerated, 32);
-  EXPECT_EQ(sizeof(protobuf_unittest::OneString), sizeof(MockGenerated));
-}
-
-TEST(GeneratedMessageTest, MoreStringSize) {
-  struct MockGenerated : public MockMessageBase {  // 16 bytes
-    int has_bits[1];                               // 4 bytes
-    int cached_size;                               // 4 bytes
-    MockRepeatedPtrField data;                     // 24 bytes
-  };
-  GOOGLE_CHECK_MESSAGE_SIZE(MockGenerated, 48);
-  EXPECT_EQ(sizeof(protobuf_unittest::MoreString), sizeof(MockGenerated));
-}
-
-TEST(GeneratedMessageTest, Int32MessageSize) {
-  struct MockGenerated : public MockMessageBase {  // 16 bytes
-    int has_bits[1];                               // 4 bytes
-    int cached_size;                               // 4 bytes
-    int32_t data;                                  // 4 bytes
-    // + 4 bytes padding
-  };
-  GOOGLE_CHECK_MESSAGE_SIZE(MockGenerated, 32);
-  EXPECT_EQ(sizeof(protobuf_unittest::Int32Message), sizeof(MockGenerated));
-}
-
-TEST(GeneratedMessageTest, Int64MessageSize) {
-  struct MockGenerated : public MockMessageBase {  // 16 bytes
-    int has_bits[1];                               // 4 bytes
-    int cached_size;                               // 4 bytes
-    int64_t data;                                  // 8 bytes
-  };
-  GOOGLE_CHECK_MESSAGE_SIZE(MockGenerated, 32);
-  EXPECT_EQ(sizeof(protobuf_unittest::Int64Message), sizeof(MockGenerated));
-}
-
-TEST(GeneratedMessageTest, BoolMessageSize) {
-  struct MockGenerated : public MockMessageBase {  // 16 bytes
-    int has_bits[1];                               // 4 bytes
-    int cached_size;                               // 4 bytes
-    bool data;                                     // 1 byte
-    // + 3 bytes padding
-  };
-  GOOGLE_CHECK_MESSAGE_SIZE(MockGenerated, 32);
-  EXPECT_EQ(sizeof(protobuf_unittest::BoolMessage), sizeof(MockGenerated));
-}
-
-TEST(GeneratedMessageTest, OneofSize) {
-  struct MockGenerated : public MockMessageBase {  // 16 bytes
-    void* foo;                                     // 8 bytes
-    int cached_size;                               // 4 bytes
-    uint32_t oneof_case[1];                        // 4 bytes
-  };
-  GOOGLE_CHECK_MESSAGE_SIZE(MockGenerated, 32);
-  EXPECT_EQ(sizeof(protobuf_unittest::TestOneof), sizeof(MockGenerated));
-}
-
-TEST(GeneratedMessageTest, Oneof2Size) {
-  struct MockGenerated : public MockMessageBase {  // 16 bytes
-    int has_bits[1];                               // 4 bytes
-    int cached_size;                               // 4 bytes
-    void* baz_string;                              // 8 bytes
-    int32_t baz_int;                               // 4 bytes
-                                                   // + 4 bytes padding
-    void* foo;                                     // 8 bytes
-    void* bar;                                     // 8 bytes
-    uint32_t oneof_case[2];                        // 8 bytes
-  };
-  GOOGLE_CHECK_MESSAGE_SIZE(MockGenerated, 64);
-  EXPECT_EQ(sizeof(protobuf_unittest::TestOneof2), sizeof(MockGenerated));
-}
-
-TEST(GeneratedMessageTest, FieldOrderingsSize) {
-  struct MockGenerated : public MockMessageBase {  // 16 bytes
-    int has_bits[1];                               // 4 bytes
-    int cached_size;                               // 4 bytes
-    MockExtensionSet extensions;                   // 24 bytes
-    void* my_string;                               // 8 bytes
-    void* optional_nested_message;                 // 8 bytes
-    int64_t my_int;                                // 8 bytes
-    float my_float;                                // 4 bytes
-    // + 4 bytes of padding
-  };
-  GOOGLE_CHECK_MESSAGE_SIZE(MockGenerated, 80);
-  EXPECT_EQ(sizeof(protobuf_unittest::TestFieldOrderings), sizeof(MockGenerated));
-}
-
-TEST(GeneratedMessageTest, TestMessageSize) {
-  // We expect the message to contain (not in this order):
-  struct MockGenerated : public MockMessageBase {  // 16 bytes
-    int has_bits[1];                               // 4 bytes
-    int cached_size;                               // 4 bytes
-    void* m4;                                      // 8 bytes
-    int64_t m2;                                    // 8 bytes
-    bool m1;                                       // 1 bytes
-    bool m3;                                       // 1 bytes
-                                                   // + 2 bytes padding
-    int m5;                                        // 4 bytes
-    int64_t m6;                                    // 8 bytes
-  };
-  GOOGLE_CHECK_MESSAGE_SIZE(MockGenerated, 56);
-  EXPECT_EQ(sizeof(protobuf_unittest::TestMessageSize), sizeof(MockGenerated));
-}
-
-TEST(GeneratedMessageTest, PackedTypesSize) {
-  struct MockGenerated : public MockMessageBase {  // 16 bytes
-    MockRepeatedField packed_int32;                // 16 bytes
-    int packed_int32_cached_byte_size;             // 4 bytes + 4 bytes padding
-    MockRepeatedField packed_int64;                // 16 bytes
-    int packed_int64_cached_byte_size;             // 4 bytes + 4 bytes padding
-    MockRepeatedField packed_uint32;               // 16 bytes
-    int packed_uint32_cached_byte_size;            // 4 bytes + 4 bytes padding
-    MockRepeatedField packed_uint64;               // 16 bytes
-    int packed_uint64_cached_byte_size;            // 4 bytes + 4 bytes padding
-    MockRepeatedField packed_sint32;               // 16 bytes
-    int packed_sint32_cached_byte_size;            // 4 bytes + 4 bytes padding
-    MockRepeatedField packed_sint64;               // 16 bytes
-    int packed_sint64_cached_byte_size;            // 4 bytes + 4 bytes padding
-    MockRepeatedField packed_fixed32;              // 16 bytes
-    MockRepeatedField packed_fixed64;              // 16 bytes
-    MockRepeatedField packed_sfixed32;             // 16 bytes
-    MockRepeatedField packed_sfixed64;             // 16 bytes
-    MockRepeatedField packed_float;                // 16 bytes
-    MockRepeatedField packed_double;               // 16 bytes
-    MockRepeatedField packed_bool;                 // 16 bytes
-    MockRepeatedField packed_enum;                 // 16 bytes
-    int packed_enum_cached_byte_size;              // 4 bytes
-    int cached_size;                               // 4 bytes
-  };
-  GOOGLE_CHECK_MESSAGE_SIZE(MockGenerated, 16 * 15 + 8 * 6 + 8);
-  EXPECT_EQ(sizeof(protobuf_unittest::TestPackedTypes), sizeof(MockGenerated));
-}
-
-}  // namespace cpp_unittest
-}  // namespace cpp
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/compiler/cpp/metadata_test.cc b/libs/protobuf/src/google/protobuf/compiler/cpp/metadata_test.cc
deleted file mode 100644
index 1ffd357..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/cpp/metadata_test.cc
+++ /dev/null
@@ -1,161 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <memory>
-
-#include <google/protobuf/testing/file.h>
-#include <google/protobuf/testing/file.h>
-#include <google/protobuf/compiler/cpp/generator.h>
-#include <google/protobuf/compiler/command_line_interface.h>
-#include <google/protobuf/descriptor.pb.h>
-#include <google/protobuf/testing/googletest.h>
-#include <gtest/gtest.h>
-#include <google/protobuf/compiler/annotation_test_util.h>
-#include <google/protobuf/compiler/cpp/helpers.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace cpp {
-
-namespace atu = annotation_test_util;
-
-namespace {
-
-class CppMetadataTest : public ::testing::Test {
- public:
-  // Tries to capture a FileDescriptorProto, GeneratedCodeInfo, and output
-  // code from the previously added file with name `filename`. Returns true on
-  // success. If pb_h is non-null, expects a .pb.h and a .pb.h.meta (copied to
-  // pb_h and pb_h_info respecfively); similarly for proto_h and proto_h_info.
-  bool CaptureMetadata(const std::string& filename, FileDescriptorProto* file,
-                       std::string* pb_h, GeneratedCodeInfo* pb_h_info,
-                       std::string* proto_h, GeneratedCodeInfo* proto_h_info,
-                       std::string* pb_cc) {
-    CommandLineInterface cli;
-    CppGenerator cpp_generator;
-    cli.RegisterGenerator("--cpp_out", &cpp_generator, "");
-    std::string cpp_out =
-        "--cpp_out=annotate_headers=true,"
-        "annotation_pragma_name=pragma_name,"
-        "annotation_guard_name=guard_name:" +
-        TestTempDir();
-
-    const bool result = atu::RunProtoCompiler(filename, cpp_out, &cli, file);
-
-    if (!result) {
-      return result;
-    }
-
-    std::string output_base = TestTempDir() + "/" + StripProto(filename);
-
-    if (pb_cc != nullptr) {
-      GOOGLE_CHECK_OK(
-          File::GetContents(output_base + ".pb.cc", pb_cc, true));
-    }
-
-    if (pb_h != nullptr && pb_h_info != nullptr) {
-      GOOGLE_CHECK_OK(
-          File::GetContents(output_base + ".pb.h", pb_h, true));
-      if (!atu::DecodeMetadata(output_base + ".pb.h.meta", pb_h_info)) {
-        return false;
-      }
-    }
-
-    if (proto_h != nullptr && proto_h_info != nullptr) {
-      GOOGLE_CHECK_OK(File::GetContents(output_base + ".proto.h", proto_h,
-                                 true));
-      if (!atu::DecodeMetadata(output_base + ".proto.h.meta", proto_h_info)) {
-        return false;
-      }
-    }
-
-    return true;
-  }
-};
-
-const char kSmallTestFile[] =
-    "syntax = \"proto2\";\n"
-    "package foo;\n"
-    "enum Enum { VALUE = 0; }\n"
-    "message Message { }\n";
-
-TEST_F(CppMetadataTest, CapturesEnumNames) {
-  FileDescriptorProto file;
-  GeneratedCodeInfo info;
-  std::string pb_h;
-  atu::AddFile("test.proto", kSmallTestFile);
-  EXPECT_TRUE(CaptureMetadata("test.proto", &file, &pb_h, &info, nullptr,
-                              nullptr, nullptr));
-  EXPECT_EQ("Enum", file.enum_type(0).name());
-  std::vector<int> enum_path;
-  enum_path.push_back(FileDescriptorProto::kEnumTypeFieldNumber);
-  enum_path.push_back(0);
-  const GeneratedCodeInfo::Annotation* enum_annotation =
-      atu::FindAnnotationOnPath(info, "test.proto", enum_path);
-  EXPECT_TRUE(nullptr != enum_annotation);
-  EXPECT_TRUE(atu::AnnotationMatchesSubstring(pb_h, enum_annotation, "Enum"));
-}
-
-TEST_F(CppMetadataTest, AddsPragma) {
-  FileDescriptorProto file;
-  GeneratedCodeInfo info;
-  std::string pb_h;
-  atu::AddFile("test.proto", kSmallTestFile);
-  EXPECT_TRUE(CaptureMetadata("test.proto", &file, &pb_h, &info, nullptr,
-                              nullptr, nullptr));
-  EXPECT_TRUE(pb_h.find("#ifdef guard_name") != std::string::npos);
-  EXPECT_TRUE(pb_h.find("#pragma pragma_name \"test.pb.h.meta\"") !=
-              std::string::npos);
-}
-
-TEST_F(CppMetadataTest, CapturesMessageNames) {
-  FileDescriptorProto file;
-  GeneratedCodeInfo info;
-  std::string pb_h;
-  atu::AddFile("test.proto", kSmallTestFile);
-  EXPECT_TRUE(CaptureMetadata("test.proto", &file, &pb_h, &info, nullptr,
-                              nullptr, nullptr));
-  EXPECT_EQ("Message", file.message_type(0).name());
-  std::vector<int> message_path;
-  message_path.push_back(FileDescriptorProto::kMessageTypeFieldNumber);
-  message_path.push_back(0);
-  const GeneratedCodeInfo::Annotation* message_annotation =
-      atu::FindAnnotationOnPath(info, "test.proto", message_path);
-  EXPECT_TRUE(nullptr != message_annotation);
-  EXPECT_TRUE(
-      atu::AnnotationMatchesSubstring(pb_h, message_annotation, "Message"));
-}
-
-}  // namespace
-}  // namespace cpp
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/compiler/cpp/move_unittest.cc b/libs/protobuf/src/google/protobuf/compiler/cpp/move_unittest.cc
deleted file mode 100644
index eb7cd1c..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/cpp/move_unittest.cc
+++ /dev/null
@@ -1,169 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/test_util.h>
-#include <google/protobuf/unittest.pb.h>
-#include <gtest/gtest.h>
-
-#if LANG_CXX11
-#include <type_traits>
-#endif
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace cpp {
-
-// Can't use an anonymous namespace here due to brokenness of Tru64 compiler.
-namespace cpp_unittest {
-
-// Moves are enabled only when compiling with a C++11 compiler or newer.
-#if LANG_CXX11
-
-TEST(MovableMessageTest, MoveConstructor) {
-  protobuf_unittest::TestAllTypes message1;
-  TestUtil::SetAllFields(&message1);
-  const auto* nested = &message1.optional_nested_message();
-
-  protobuf_unittest::TestAllTypes message2(std::move(message1));
-  TestUtil::ExpectAllFieldsSet(message2);
-
-  // Check if the optional_nested_message was actually moved (and not just
-  // copied).
-  EXPECT_EQ(nested, &message2.optional_nested_message());
-  EXPECT_NE(nested, &message1.optional_nested_message());
-}
-
-TEST(MovableMessageTest, MoveAssignmentOperator) {
-  protobuf_unittest::TestAllTypes message1;
-  TestUtil::SetAllFields(&message1);
-  const auto* nested = &message1.optional_nested_message();
-
-  protobuf_unittest::TestAllTypes message2;
-  message2 = std::move(message1);
-  TestUtil::ExpectAllFieldsSet(message2);
-
-  // Check if the optional_nested_message was actually moved (and not just
-  // copied).
-  EXPECT_EQ(nested, &message2.optional_nested_message());
-  EXPECT_NE(nested, &message1.optional_nested_message());
-}
-
-TEST(MovableMessageTest, SelfMoveAssignment) {
-  // The `self` reference is necessary to defeat -Wself-move.
-  protobuf_unittest::TestAllTypes message, &self = message;
-  TestUtil::SetAllFields(&message);
-  message = std::move(self);
-  TestUtil::ExpectAllFieldsSet(message);
-}
-
-TEST(MovableMessageTest, MoveSameArena) {
-  Arena arena;
-
-  auto* message1_on_arena =
-      Arena::CreateMessage<protobuf_unittest::TestAllTypes>(&arena);
-  TestUtil::SetAllFields(message1_on_arena);
-  const auto* nested = &message1_on_arena->optional_nested_message();
-
-  auto* message2_on_arena =
-      Arena::CreateMessage<protobuf_unittest::TestAllTypes>(&arena);
-
-  // Moving messages on the same arena should lead to swapped pointers.
-  *message2_on_arena = std::move(*message1_on_arena);
-  EXPECT_EQ(nested, &message2_on_arena->optional_nested_message());
-}
-
-TEST(MovableMessageTest, MoveDifferentArenas) {
-  Arena arena1, arena2;
-
-  auto* message1_on_arena =
-      Arena::CreateMessage<protobuf_unittest::TestAllTypes>(&arena1);
-  TestUtil::SetAllFields(message1_on_arena);
-  const auto* nested = &message1_on_arena->optional_nested_message();
-
-  auto* message2_on_arena =
-      Arena::CreateMessage<protobuf_unittest::TestAllTypes>(&arena2);
-
-  // Moving messages on two different arenas should lead to a copy.
-  *message2_on_arena = std::move(*message1_on_arena);
-  EXPECT_NE(nested, &message2_on_arena->optional_nested_message());
-  TestUtil::ExpectAllFieldsSet(*message1_on_arena);
-  TestUtil::ExpectAllFieldsSet(*message2_on_arena);
-}
-
-TEST(MovableMessageTest, MoveFromArena) {
-  Arena arena;
-
-  auto* message1_on_arena =
-      Arena::CreateMessage<protobuf_unittest::TestAllTypes>(&arena);
-  TestUtil::SetAllFields(message1_on_arena);
-  const auto* nested = &message1_on_arena->optional_nested_message();
-
-  protobuf_unittest::TestAllTypes message2;
-
-  // Moving from a message on the arena should lead to a copy.
-  message2 = std::move(*message1_on_arena);
-  EXPECT_NE(nested, &message2.optional_nested_message());
-  TestUtil::ExpectAllFieldsSet(*message1_on_arena);
-  TestUtil::ExpectAllFieldsSet(message2);
-}
-
-TEST(MovableMessageTest, MoveToArena) {
-  Arena arena;
-
-  protobuf_unittest::TestAllTypes message1;
-  TestUtil::SetAllFields(&message1);
-  const auto* nested = &message1.optional_nested_message();
-
-  auto* message2_on_arena =
-      Arena::CreateMessage<protobuf_unittest::TestAllTypes>(&arena);
-
-  // Moving to a message on the arena should lead to a copy.
-  *message2_on_arena = std::move(message1);
-  EXPECT_NE(nested, &message2_on_arena->optional_nested_message());
-  TestUtil::ExpectAllFieldsSet(message1);
-  TestUtil::ExpectAllFieldsSet(*message2_on_arena);
-}
-
-TEST(MovableMessageTest, Noexcept) {
-  EXPECT_TRUE(
-      std::is_nothrow_move_constructible<protobuf_unittest::TestAllTypes>());
-  EXPECT_TRUE(std::is_nothrow_move_assignable<protobuf_unittest::TestAllTypes>());
-}
-
-#endif  // LANG_CXX11
-
-}  // namespace cpp_unittest
-
-}  // namespace cpp
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/compiler/cpp/names.h b/libs/protobuf/src/google/protobuf/compiler/cpp/names.h
deleted file mode 100644
index 7404ac5..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/cpp/names.h
+++ /dev/null
@@ -1,97 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef GOOGLE_PROTOBUF_COMPILER_CPP_NAMES_H__
-#define GOOGLE_PROTOBUF_COMPILER_CPP_NAMES_H__
-
-#include <string>
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-
-class Descriptor;
-class EnumDescriptor;
-class EnumValueDescriptor;
-class FieldDescriptor;
-
-namespace compiler {
-namespace cpp {
-
-// Returns the unqualified C++ name.
-//
-// For example, if you had:
-//   package foo.bar;
-//   message Baz { message Moo {} }
-// Then the non-qualified version would be:
-//   Baz_Moo
-std::string ClassName(const Descriptor* descriptor);
-std::string ClassName(const EnumDescriptor* enum_descriptor);
-
-// Returns the fully qualified C++ name.
-//
-// For example, if you had:
-//   package foo.bar;
-//   message Baz { message Moo {} }
-// Then the qualified ClassName for Moo would be:
-//   ::foo::bar::Baz_Moo
-std::string QualifiedClassName(const Descriptor* d);
-std::string QualifiedClassName(const EnumDescriptor* d);
-std::string QualifiedExtensionName(const FieldDescriptor* d);
-
-// Get the (unqualified) name that should be used for this field in C++ code.
-// The name is coerced to lower-case to emulate proto1 behavior.  People
-// should be using lowercase-with-underscores style for proto field names
-// anyway, so normally this just returns field->name().
-std::string FieldName(const FieldDescriptor* field);
-
-// Requires that this field is in a oneof. Returns the (unqualified) case
-// constant for this field.
-std::string OneofCaseConstantName(const FieldDescriptor* field);
-// Returns the quafilied case constant for this field.
-std::string QualifiedOneofCaseConstantName(const FieldDescriptor* field);
-
-// Get the (unqualified) name that should be used for this enum value in C++
-// code.
-std::string EnumValueName(const EnumValueDescriptor* enum_value);
-
-// Strips ".proto" or ".protodevel" from the end of a filename.
-PROTOC_EXPORT std::string StripProto(const std::string& filename);
-
-}  // namespace cpp
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
-
-#endif  // GOOGLE_PROTOBUF_COMPILER_CPP_NAMES_H__
diff --git a/libs/protobuf/src/google/protobuf/compiler/cpp/options.h b/libs/protobuf/src/google/protobuf/compiler/cpp/options.h
deleted file mode 100644
index 5d935e9..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/cpp/options.h
+++ /dev/null
@@ -1,101 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: rennie@google.com (Jeffrey Rennie)
-
-#ifndef GOOGLE_PROTOBUF_COMPILER_CPP_OPTIONS_H__
-#define GOOGLE_PROTOBUF_COMPILER_CPP_OPTIONS_H__
-
-#include <set>
-#include <string>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-class AccessInfoMap;
-
-namespace cpp {
-
-enum class EnforceOptimizeMode {
-  kNoEnforcement,  // Use the runtime specified by the file specific options.
-  kSpeed,          // Full runtime with a generated code implementation.
-  kCodeSize,       // Full runtime with a reflective implementation.
-  kLiteRuntime,
-};
-
-struct FieldListenerOptions {
-  bool inject_field_listener_events = false;
-  std::set<std::string> forbidden_field_listener_events;
-};
-
-// Generator options (see generator.cc for a description of each):
-struct Options {
-  const AccessInfoMap* access_info_map = nullptr;
-  std::string dllexport_decl;
-  std::string runtime_include_base;
-  std::string annotation_pragma_name;
-  std::string annotation_guard_name;
-  FieldListenerOptions field_listener_options;
-  EnforceOptimizeMode enforce_mode = EnforceOptimizeMode::kNoEnforcement;
-  enum {
-    kTCTableNever,
-    kTCTableGuarded,
-    kTCTableAlways
-  } tctable_mode = kTCTableNever;
-  int num_cc_files = 0;
-  bool safe_boundary_check = false;
-  bool proto_h = false;
-  bool transitive_pb_h = true;
-  bool annotate_headers = false;
-  bool lite_implicit_weak_fields = false;
-  bool bootstrap = false;
-  bool opensource_runtime = false;
-  bool annotate_accessor = false;
-  bool unused_field_stripping = false;
-  bool unverified_lazy_message_sets = false;
-  bool unverified_lazy = false;
-  bool profile_driven_inline_string = true;
-  bool message_owned_arena_trial = false;
-  bool force_split = false;
-#ifdef PROTOBUF_STABLE_EXPERIMENTS
-  bool force_eagerly_verified_lazy = true;
-  bool force_inline_string = true;
-#else   // PROTOBUF_STABLE_EXPERIMENTS
-  bool force_eagerly_verified_lazy = false;
-  bool force_inline_string = false;
-#endif  // !PROTOBUF_STABLE_EXPERIMENTS
-};
-
-}  // namespace cpp
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // GOOGLE_PROTOBUF_COMPILER_CPP_OPTIONS_H__
diff --git a/libs/protobuf/src/google/protobuf/compiler/cpp/padding_optimizer.cc b/libs/protobuf/src/google/protobuf/compiler/cpp/padding_optimizer.cc
deleted file mode 100644
index 2091052..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/cpp/padding_optimizer.cc
+++ /dev/null
@@ -1,228 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <google/protobuf/compiler/cpp/padding_optimizer.h>
-
-#include <google/protobuf/compiler/cpp/helpers.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace cpp {
-
-namespace {
-
-// FieldGroup is just a helper for PaddingOptimizer below. It holds a vector of
-// fields that are grouped together because they have compatible alignment, and
-// a preferred location in the final field ordering.
-class FieldGroup {
- public:
-  FieldGroup() : preferred_location_(0) {}
-
-  // A group with a single field.
-  FieldGroup(double preferred_location, const FieldDescriptor* field)
-      : preferred_location_(preferred_location), fields_(1, field) {}
-
-  // Append the fields in 'other' to this group.
-  void Append(const FieldGroup& other) {
-    if (other.fields_.empty()) {
-      return;
-    }
-    // Preferred location is the average among all the fields, so we weight by
-    // the number of fields on each FieldGroup object.
-    preferred_location_ = (preferred_location_ * fields_.size() +
-                           (other.preferred_location_ * other.fields_.size())) /
-                          (fields_.size() + other.fields_.size());
-    fields_.insert(fields_.end(), other.fields_.begin(), other.fields_.end());
-  }
-
-  void SetPreferredLocation(double location) { preferred_location_ = location; }
-  const std::vector<const FieldDescriptor*>& fields() const { return fields_; }
-
-  // FieldGroup objects sort by their preferred location.
-  bool operator<(const FieldGroup& other) const {
-    return preferred_location_ < other.preferred_location_;
-  }
-
- private:
-  // "preferred_location_" is an estimate of where this group should go in the
-  // final list of fields.  We compute this by taking the average index of each
-  // field in this group in the original ordering of fields.  This is very
-  // approximate, but should put this group close to where its member fields
-  // originally went.
-  double preferred_location_;
-  std::vector<const FieldDescriptor*> fields_;
-  // We rely on the default copy constructor and operator= so this type can be
-  // used in a vector.
-};
-
-}  // namespace
-
-// Reorder 'fields' so that if the fields are output into a c++ class in the new
-// order, fields of similar family (see below) are together and within each
-// family, alignment padding is minimized.
-//
-// We try to do this while keeping each field as close as possible to its field
-// number order so that we don't reduce cache locality much for function that
-// access each field in order.  Originally, OptimizePadding used declaration
-// order for its decisions, but generated code minus the serializer/parsers uses
-// the output of OptimizePadding as well (stored in
-// MessageGenerator::optimized_order_).  Since the serializers use field number
-// order, we use that as a tie-breaker.
-//
-// We classify each field into a particular "family" of fields, that we perform
-// the same operation on in our generated functions.
-//
-// REPEATED is placed first, as the C++ compiler automatically initializes
-// these fields in layout order.
-//
-// STRING is grouped next, as our Clear/SharedCtor/SharedDtor walks it and
-// calls ArenaStringPtr::Destroy on each.
-//
-// LAZY_MESSAGE is grouped next, as it interferes with the ability to memset
-// non-repeated fields otherwise.
-//
-// MESSAGE is grouped next, as our Clear/SharedDtor code walks it and calls
-// delete on each.  We initialize these fields with a NULL pointer (see
-// MessageFieldGenerator::GenerateConstructorCode), which allows them to be
-// memset.
-//
-// ZERO_INITIALIZABLE is memset in Clear/SharedCtor
-//
-// OTHER these fields are initialized one-by-one.
-void PaddingOptimizer::OptimizeLayout(
-    std::vector<const FieldDescriptor*>* fields, const Options& options,
-    MessageSCCAnalyzer* scc_analyzer) {
-  // The sorted numeric order of Family determines the declaration order in the
-  // memory layout.
-  enum Family {
-    REPEATED = 0,
-    STRING = 1,
-    // Laying out LAZY_MESSAGE before MESSAGE allows a single memset to zero
-    // MESSAGE and ZERO_INITIALIZABLE fields together.
-    LAZY_MESSAGE = 2,
-    MESSAGE = 3,
-    ZERO_INITIALIZABLE = 4,
-    OTHER = 5,
-    kMaxFamily
-  };
-
-  // First divide fields into those that align to 1 byte, 4 bytes or 8 bytes.
-  std::vector<FieldGroup> aligned_to_1[kMaxFamily];
-  std::vector<FieldGroup> aligned_to_4[kMaxFamily];
-  std::vector<FieldGroup> aligned_to_8[kMaxFamily];
-  for (int i = 0; i < fields->size(); ++i) {
-    const FieldDescriptor* field = (*fields)[i];
-
-    Family f = OTHER;
-    if (field->is_repeated()) {
-      f = REPEATED;
-    } else if (field->cpp_type() == FieldDescriptor::CPPTYPE_STRING) {
-      f = STRING;
-    } else if (field->cpp_type() == FieldDescriptor::CPPTYPE_MESSAGE) {
-      f = MESSAGE;
-      if (IsLazy(field, options, scc_analyzer)) {
-        f = LAZY_MESSAGE;
-      }
-    } else if (CanInitializeByZeroing(field)) {
-      f = ZERO_INITIALIZABLE;
-    }
-
-    const int j = field->number();
-    switch (EstimateAlignmentSize(field)) {
-      case 1:
-        aligned_to_1[f].push_back(FieldGroup(j, field));
-        break;
-      case 4:
-        aligned_to_4[f].push_back(FieldGroup(j, field));
-        break;
-      case 8:
-        aligned_to_8[f].push_back(FieldGroup(j, field));
-        break;
-      default:
-        GOOGLE_LOG(FATAL) << "Unknown alignment size " << EstimateAlignmentSize(field)
-                   << "for a field " << field->full_name() << ".";
-    }
-  }
-
-  // For each family, group fields to optimize padding.
-  for (int f = 0; f < kMaxFamily; f++) {
-    // Now group fields aligned to 1 byte into sets of 4, and treat those like a
-    // single field aligned to 4 bytes.
-    for (int i = 0; i < aligned_to_1[f].size(); i += 4) {
-      FieldGroup field_group;
-      for (int j = i; j < aligned_to_1[f].size() && j < i + 4; ++j) {
-        field_group.Append(aligned_to_1[f][j]);
-      }
-      aligned_to_4[f].push_back(field_group);
-    }
-    // Sort by preferred location to keep fields as close to their field number
-    // order as possible.  Using stable_sort ensures that the output is
-    // consistent across runs.
-    std::stable_sort(aligned_to_4[f].begin(), aligned_to_4[f].end());
-
-    // Now group fields aligned to 4 bytes (or the 4-field groups created above)
-    // into pairs, and treat those like a single field aligned to 8 bytes.
-    for (int i = 0; i < aligned_to_4[f].size(); i += 2) {
-      FieldGroup field_group;
-      for (int j = i; j < aligned_to_4[f].size() && j < i + 2; ++j) {
-        field_group.Append(aligned_to_4[f][j]);
-      }
-      if (i == aligned_to_4[f].size() - 1) {
-        if (f == OTHER) {
-          // Move incomplete 4-byte block to the beginning.  This is done to
-          // pair with the (possible) leftover blocks from the
-          // ZERO_INITIALIZABLE family.
-          field_group.SetPreferredLocation(-1);
-        } else {
-          // Move incomplete 4-byte block to the end.
-          field_group.SetPreferredLocation(double{FieldDescriptor::kMaxNumber});
-        }
-      }
-      aligned_to_8[f].push_back(field_group);
-    }
-    // Sort by preferred location.
-    std::stable_sort(aligned_to_8[f].begin(), aligned_to_8[f].end());
-  }
-
-  // Now pull out all the FieldDescriptors in order.
-  fields->clear();
-  for (int f = 0; f < kMaxFamily; ++f) {
-    for (int i = 0; i < aligned_to_8[f].size(); ++i) {
-      fields->insert(fields->end(), aligned_to_8[f][i].fields().begin(),
-                     aligned_to_8[f][i].fields().end());
-    }
-  }
-}
-
-}  // namespace cpp
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/compiler/cpp/padding_optimizer.h b/libs/protobuf/src/google/protobuf/compiler/cpp/padding_optimizer.h
deleted file mode 100644
index 9c76f38..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/cpp/padding_optimizer.h
+++ /dev/null
@@ -1,65 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: seongkim@google.com (Seong Beom Kim)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-
-#ifndef GOOGLE_PROTOBUF_COMPILER_CPP_PADDING_OPTIMIZER_H__
-#define GOOGLE_PROTOBUF_COMPILER_CPP_PADDING_OPTIMIZER_H__
-
-#include <google/protobuf/compiler/cpp/message_layout_helper.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace cpp {
-
-// Rearranges the fields of a message to minimize padding.
-// Fields are grouped by the type and the size.
-// For example, grouping four boolean fields and one int32
-// field results in zero padding overhead. See OptimizeLayout's
-// comment for details.
-class PaddingOptimizer : public MessageLayoutHelper {
- public:
-  PaddingOptimizer() {}
-  ~PaddingOptimizer() override {}
-
-  void OptimizeLayout(std::vector<const FieldDescriptor*>* fields,
-                      const Options& options,
-                      MessageSCCAnalyzer* scc_analyzer) override;
-};
-
-}  // namespace cpp
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // GOOGLE_PROTOBUF_COMPILER_CPP_PADDING_OPTIMIZER_H__
diff --git a/libs/protobuf/src/google/protobuf/compiler/cpp/parse_function_generator.cc b/libs/protobuf/src/google/protobuf/compiler/cpp/parse_function_generator.cc
deleted file mode 100644
index 0f1d767..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/cpp/parse_function_generator.cc
+++ /dev/null
@@ -1,1725 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <google/protobuf/compiler/cpp/parse_function_generator.h>
-
-#include <algorithm>
-#include <limits>
-#include <string>
-#include <utility>
-
-#include <google/protobuf/wire_format.h>
-#include <google/protobuf/compiler/cpp/helpers.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace cpp {
-
-namespace {
-using google::protobuf::internal::WireFormat;
-using google::protobuf::internal::WireFormatLite;
-
-std::vector<const FieldDescriptor*> GetOrderedFields(
-    const Descriptor* descriptor, const Options& options) {
-  std::vector<const FieldDescriptor*> ordered_fields;
-  for (auto field : FieldRange(descriptor)) {
-    if (!IsFieldStripped(field, options)) {
-      ordered_fields.push_back(field);
-    }
-  }
-  std::sort(ordered_fields.begin(), ordered_fields.end(),
-            [](const FieldDescriptor* a, const FieldDescriptor* b) {
-              return a->number() < b->number();
-            });
-  return ordered_fields;
-}
-
-bool HasInternalAccessors(const FieldOptions::CType ctype) {
-  return ctype == FieldOptions::STRING || ctype == FieldOptions::CORD;
-}
-
-int TagSize(uint32_t field_number) {
-  if (field_number < 16) return 1;
-  GOOGLE_CHECK_LT(field_number, (1 << 14))
-      << "coded tag for " << field_number << " too big for uint16_t";
-  return 2;
-}
-
-std::string FieldParseFunctionName(
-    const TailCallTableInfo::FieldEntryInfo& entry, const Options& options);
-
-bool IsFieldEligibleForFastParsing(
-    const TailCallTableInfo::FieldEntryInfo& entry, const Options& options,
-    MessageSCCAnalyzer* scc_analyzer) {
-  const auto* field = entry.field;
-  // Map, oneof, weak, and lazy fields are not handled on the fast path.
-  if (field->is_map() || field->real_containing_oneof() ||
-      field->options().weak() ||
-      IsImplicitWeakField(field, options, scc_analyzer) ||
-      IsLazy(field, options, scc_analyzer)) {
-    return false;
-  }
-
-  // We will check for a valid auxiliary index range later. However, we might
-  // want to change the value we check for inlined string fields.
-  int aux_idx = entry.aux_idx;
-
-  switch (field->type()) {
-    case FieldDescriptor::TYPE_ENUM:
-      // If enum values are not validated at parse time, then this field can be
-      // handled on the fast path like an int32.
-      if (HasPreservingUnknownEnumSemantics(field)) {
-        break;
-      }
-      if (field->is_repeated() && field->is_packed()) {
-        return false;
-      }
-      break;
-
-      // Some bytes fields can be handled on fast path.
-    case FieldDescriptor::TYPE_STRING:
-    case FieldDescriptor::TYPE_BYTES:
-      if (field->options().ctype() != FieldOptions::STRING) {
-        return false;
-      }
-      if (IsStringInlined(field, options)) {
-        GOOGLE_CHECK(!field->is_repeated());
-        // For inlined strings, the donation state index is stored in the
-        // `aux_idx` field of the fast parsing info. We need to check the range
-        // of that value instead of the auxiliary index.
-        aux_idx = entry.inlined_string_idx;
-      }
-      break;
-
-    default:
-      break;
-  }
-
-  if (HasHasbit(field)) {
-    // The tailcall parser can only update the first 32 hasbits. Fields with
-    // has-bits beyond the first 32 are handled by mini parsing/fallback.
-    GOOGLE_CHECK_GE(entry.hasbit_idx, 0) << field->DebugString();
-    if (entry.hasbit_idx >= 32) return false;
-  }
-
-  // If the field needs auxiliary data, then the aux index is needed. This
-  // must fit in a uint8_t.
-  if (aux_idx > std::numeric_limits<uint8_t>::max()) {
-    return false;
-  }
-
-  // The largest tag that can be read by the tailcall parser is two bytes
-  // when varint-coded. This allows 14 bits for the numeric tag value:
-  //   byte 0   byte 1
-  //   1nnnnttt 0nnnnnnn
-  //    ^^^^^^^  ^^^^^^^
-  if (field->number() >= 1 << 11) return false;
-
-  return true;
-}
-
-std::vector<TailCallTableInfo::FastFieldInfo> SplitFastFieldsForSize(
-    const std::vector<TailCallTableInfo::FieldEntryInfo>& field_entries,
-    int table_size_log2, const Options& options,
-    MessageSCCAnalyzer* scc_analyzer) {
-  std::vector<TailCallTableInfo::FastFieldInfo> result(1 << table_size_log2);
-  const uint32_t idx_mask = result.size() - 1;
-
-  for (const auto& entry : field_entries) {
-    if (!IsFieldEligibleForFastParsing(entry, options, scc_analyzer)) {
-      continue;
-    }
-
-    const auto* field = entry.field;
-    uint32_t tag = WireFormat::MakeTag(field);
-
-    // Construct the varint-coded tag. If it is more than 7 bits, we need to
-    // shift the high bits and add a continue bit.
-    if (uint32_t hibits = tag & 0xFFFFFF80) {
-      tag = tag + hibits + 128;  // tag = lobits + 2*hibits + 128
-    }
-
-    // The field index is determined by the low bits of the field number, where
-    // the table size determines the width of the mask. The largest table
-    // supported is 32 entries. The parse loop uses these bits directly, so that
-    // the dispatch does not require arithmetic:
-    //        byte 0   byte 1
-    //   tag: 1nnnnttt 0nnnnnnn
-    //        ^^^^^
-    //         idx (table_size_log2=5)
-    // This means that any field number that does not fit in the lower 4 bits
-    // will always have the top bit of its table index asserted.
-    const uint32_t fast_idx = (tag >> 3) & idx_mask;
-
-    TailCallTableInfo::FastFieldInfo& info = result[fast_idx];
-    if (info.field != nullptr) {
-      // This field entry is already filled.
-      continue;
-    }
-
-    // Fill in this field's entry:
-    GOOGLE_CHECK(info.func_name.empty()) << info.func_name;
-    info.func_name = FieldParseFunctionName(entry, options);
-    info.field = field;
-    info.coded_tag = tag;
-    // If this field does not have presence, then it can set an out-of-bounds
-    // bit (tailcall parsing uses a uint64_t for hasbits, but only stores 32).
-    info.hasbit_idx = HasHasbit(field) ? entry.hasbit_idx : 63;
-    if (IsStringInlined(field, options)) {
-      GOOGLE_CHECK(!field->is_repeated());
-      info.aux_idx = static_cast<uint8_t>(entry.inlined_string_idx);
-    } else {
-      info.aux_idx = static_cast<uint8_t>(entry.aux_idx);
-    }
-  }
-  return result;
-}
-
-// Filter out fields that will be handled by mini parsing.
-std::vector<const FieldDescriptor*> FilterMiniParsedFields(
-    const std::vector<const FieldDescriptor*>& fields, const Options& options,
-    MessageSCCAnalyzer* scc_analyzer) {
-  std::vector<const FieldDescriptor*> generated_fallback_fields;
-
-  for (const auto* field : fields) {
-    bool handled = false;
-    switch (field->type()) {
-      case FieldDescriptor::TYPE_DOUBLE:
-      case FieldDescriptor::TYPE_FLOAT:
-      case FieldDescriptor::TYPE_FIXED32:
-      case FieldDescriptor::TYPE_SFIXED32:
-      case FieldDescriptor::TYPE_FIXED64:
-      case FieldDescriptor::TYPE_SFIXED64:
-      case FieldDescriptor::TYPE_BOOL:
-      case FieldDescriptor::TYPE_UINT32:
-      case FieldDescriptor::TYPE_SINT32:
-      case FieldDescriptor::TYPE_INT32:
-      case FieldDescriptor::TYPE_UINT64:
-      case FieldDescriptor::TYPE_SINT64:
-      case FieldDescriptor::TYPE_INT64:
-        // These are handled by MiniParse, so we don't need any generated
-        // fallback code.
-        handled = true;
-        break;
-
-      case FieldDescriptor::TYPE_ENUM:
-        if (field->is_repeated() && !HasPreservingUnknownEnumSemantics(field)) {
-          // TODO(b/206890171): handle packed repeated closed enums
-          // Non-packed repeated can be handled using tables, but we still
-          // need to generate fallback code for all repeated enums in order to
-          // handle packed encoding. This is because of the lite/full split
-          // when handling invalid enum values in a packed field.
-          handled = false;
-        } else {
-          handled = true;
-        }
-        break;
-
-      case FieldDescriptor::TYPE_BYTES:
-      case FieldDescriptor::TYPE_STRING:
-        if (IsStringInlined(field, options)) {
-          // TODO(b/198211897): support InilnedStringField.
-          handled = false;
-        } else {
-          handled = true;
-        }
-        break;
-
-      case FieldDescriptor::TYPE_MESSAGE:
-      case FieldDescriptor::TYPE_GROUP:
-        // TODO(b/210762816): support remaining field types.
-        if (field->is_map() || IsWeak(field, options) ||
-            IsImplicitWeakField(field, options, scc_analyzer) ||
-            IsLazy(field, options, scc_analyzer)) {
-          handled = false;
-        } else {
-          handled = true;
-        }
-        break;
-
-      default:
-        handled = false;
-        break;
-    }
-    if (!handled) generated_fallback_fields.push_back(field);
-  }
-
-  return generated_fallback_fields;
-}
-
-}  // namespace
-
-TailCallTableInfo::TailCallTableInfo(
-    const Descriptor* descriptor, const Options& options,
-    const std::vector<const FieldDescriptor*>& ordered_fields,
-    const std::vector<int>& has_bit_indices,
-    const std::vector<int>& inlined_string_indices,
-    MessageSCCAnalyzer* scc_analyzer) {
-  int oneof_count = descriptor->real_oneof_decl_count();
-  // If this message has any oneof fields, store the case offset in the first
-  // auxiliary entry.
-  if (oneof_count > 0) {
-    GOOGLE_LOG_IF(DFATAL, ordered_fields.empty())
-        << "Invalid message: " << descriptor->full_name() << " has "
-        << oneof_count << " oneof declarations, but no fields";
-    aux_entries.push_back(StrCat("_fl::Offset{offsetof(",
-                                       ClassName(descriptor),
-                                       ", _impl_._oneof_case_)}"));
-  }
-
-  // If this message has any inlined string fields, store the donation state
-  // offset in the second auxiliary entry.
-  if (!inlined_string_indices.empty()) {
-    aux_entries.resize(2);  // pad if necessary
-    aux_entries[1] =
-        StrCat("_fl::Offset{offsetof(", ClassName(descriptor),
-                     ", _impl_._inlined_string_donated_)}");
-  }
-
-  // Fill in mini table entries.
-  for (const FieldDescriptor* field : ordered_fields) {
-    field_entries.push_back(
-        {field, (HasHasbit(field) ? has_bit_indices[field->index()] : -1)});
-    auto& entry = field_entries.back();
-
-    if (field->type() == FieldDescriptor::TYPE_MESSAGE ||
-        field->type() == FieldDescriptor::TYPE_GROUP) {
-      // Message-typed fields have a FieldAux with the default instance pointer.
-      if (field->is_map()) {
-        // TODO(b/205904770): generate aux entries for maps
-      } else if (IsWeak(field, options)) {
-        // Don't generate anything for weak fields. They are handled by the
-        // generated fallback.
-      } else if (IsImplicitWeakField(field, options, scc_analyzer)) {
-        // Implicit weak fields don't need to store a default instance pointer.
-      } else if (IsLazy(field, options, scc_analyzer)) {
-        // Lazy fields are handled by the generated fallback function.
-      } else {
-        field_entries.back().aux_idx = aux_entries.size();
-        const Descriptor* field_type = field->message_type();
-        aux_entries.push_back(StrCat(
-            "reinterpret_cast<const ", QualifiedClassName(field_type, options),
-            "*>(&", QualifiedDefaultInstanceName(field_type, options), ")"));
-      }
-    } else if (field->type() == FieldDescriptor::TYPE_ENUM &&
-               !HasPreservingUnknownEnumSemantics(field)) {
-      // Enum fields which preserve unknown values (proto3 behavior) are
-      // effectively int32 fields with respect to parsing -- i.e., the value
-      // does not need to be validated at parse time.
-      //
-      // Enum fields which do not preserve unknown values (proto2 behavior) use
-      // a FieldAux to store validation information. If the enum values are
-      // sequential (and within a range we can represent), then the FieldAux
-      // entry represents the range using the minimum value (which must fit in
-      // an int16_t) and count (a uint16_t). Otherwise, the entry holds a
-      // pointer to the generated Name_IsValid function.
-
-      entry.aux_idx = aux_entries.size();
-      const EnumDescriptor* enum_type = field->enum_type();
-      GOOGLE_CHECK_GT(enum_type->value_count(), 0) << enum_type->DebugString();
-
-      // Check if the enum values are a single, contiguous range.
-      std::vector<int> enum_values;
-      for (int i = 0, N = enum_type->value_count(); i < N; ++i) {
-        enum_values.push_back(enum_type->value(i)->number());
-      }
-      auto values_begin = enum_values.begin();
-      auto values_end = enum_values.end();
-      std::sort(values_begin, values_end);
-      enum_values.erase(std::unique(values_begin, values_end), values_end);
-
-      if (enum_values.back() - enum_values[0] == enum_values.size() - 1 &&
-          enum_values[0] >= std::numeric_limits<int16_t>::min() &&
-          enum_values[0] <= std::numeric_limits<int16_t>::max() &&
-          enum_values.size() <= std::numeric_limits<uint16_t>::max()) {
-        entry.is_enum_range = true;
-        aux_entries.push_back(
-            StrCat(enum_values[0], ", ", enum_values.size()));
-      } else {
-        entry.is_enum_range = false;
-        aux_entries.push_back(
-            StrCat(QualifiedClassName(enum_type, options), "_IsValid"));
-      }
-    } else if ((field->type() == FieldDescriptor::TYPE_STRING ||
-                field->type() == FieldDescriptor::TYPE_BYTES) &&
-               IsStringInlined(field, options)) {
-      GOOGLE_CHECK(!field->is_repeated());
-      // Inlined strings have an extra marker to represent their donation state.
-      int idx = inlined_string_indices[field->index()];
-      // For mini parsing, the donation state index is stored as an `offset`
-      // auxiliary entry.
-      entry.aux_idx = aux_entries.size();
-      aux_entries.push_back(StrCat("_fl::Offset{", idx, "}"));
-      // For fast table parsing, the donation state index is stored instead of
-      // the aux_idx (this will limit the range to 8 bits).
-      entry.inlined_string_idx = idx;
-    }
-  }
-
-  // Choose the smallest fast table that covers the maximum number of fields.
-  table_size_log2 = 0;  // fallback value
-  int num_fast_fields = -1;
-  for (int try_size_log2 : {0, 1, 2, 3, 4, 5}) {
-    size_t try_size = 1 << try_size_log2;
-    auto split_fields = SplitFastFieldsForSize(field_entries, try_size_log2,
-                                               options, scc_analyzer);
-    GOOGLE_CHECK_EQ(split_fields.size(), try_size);
-    int try_num_fast_fields = 0;
-    for (const auto& info : split_fields) {
-      if (info.field != nullptr) ++try_num_fast_fields;
-    }
-    // Use this size if (and only if) it covers more fields.
-    if (try_num_fast_fields > num_fast_fields) {
-      fast_path_fields = std::move(split_fields);
-      table_size_log2 = try_size_log2;
-      num_fast_fields = try_num_fast_fields;
-    }
-    // The largest table we allow has the same number of entries as the message
-    // has fields, rounded up to the next power of 2 (e.g., a message with 5
-    // fields can have a fast table of size 8). A larger table *might* cover
-    // more fields in certain cases, but a larger table in that case would have
-    // mostly empty entries; so, we cap the size to avoid pathologically sparse
-    // tables.
-    if (try_size > ordered_fields.size()) {
-      break;
-    }
-  }
-
-  // Filter out fields that are handled by MiniParse. We don't need to generate
-  // a fallback for these, which saves code size.
-  fallback_fields = FilterMiniParsedFields(ordered_fields, options,
-                                           scc_analyzer);
-
-  // If there are no fallback fields, and at most one extension range, the
-  // parser can use a generic fallback function. Otherwise, a message-specific
-  // fallback routine is needed.
-  use_generated_fallback =
-      !fallback_fields.empty() || descriptor->extension_range_count() > 1;
-}
-
-ParseFunctionGenerator::ParseFunctionGenerator(
-    const Descriptor* descriptor, int max_has_bit_index,
-    const std::vector<int>& has_bit_indices,
-    const std::vector<int>& inlined_string_indices, const Options& options,
-    MessageSCCAnalyzer* scc_analyzer,
-    const std::map<std::string, std::string>& vars)
-    : descriptor_(descriptor),
-      scc_analyzer_(scc_analyzer),
-      options_(options),
-      variables_(vars),
-      inlined_string_indices_(inlined_string_indices),
-      ordered_fields_(GetOrderedFields(descriptor_, options_)),
-      num_hasbits_(max_has_bit_index) {
-  if (should_generate_tctable()) {
-    tc_table_info_.reset(new TailCallTableInfo(
-        descriptor_, options_, ordered_fields_, has_bit_indices,
-        inlined_string_indices, scc_analyzer));
-  }
-  SetCommonVars(options_, &variables_);
-  SetCommonMessageDataVariables(descriptor_, &variables_);
-  SetUnknownFieldsVariable(descriptor_, options_, &variables_);
-  variables_["classname"] = ClassName(descriptor, false);
-}
-
-void ParseFunctionGenerator::GenerateMethodDecls(io::Printer* printer) {
-  Formatter format(printer, variables_);
-  if (should_generate_tctable()) {
-    format.Outdent();
-    if (should_generate_guarded_tctable()) {
-      format("#ifdef PROTOBUF_TAIL_CALL_TABLE_PARSER_ENABLED\n");
-    }
-    format(
-        " private:\n"
-        "  static const char* Tct_ParseFallback(PROTOBUF_TC_PARAM_DECL);\n"
-        " public:\n");
-    if (should_generate_guarded_tctable()) {
-      format("#endif\n");
-    }
-    format.Indent();
-  }
-  format(
-      "const char* _InternalParse(const char* ptr, "
-      "::$proto_ns$::internal::ParseContext* ctx) final;\n");
-}
-
-void ParseFunctionGenerator::GenerateMethodImpls(io::Printer* printer) {
-  Formatter format(printer, variables_);
-  bool need_parse_function = true;
-  if (descriptor_->options().message_set_wire_format()) {
-    // Special-case MessageSet.
-    need_parse_function = false;
-    format(
-        "const char* $classname$::_InternalParse(const char* ptr,\n"
-        "                  ::_pbi::ParseContext* ctx) {\n"
-        "$annotate_deserialize$");
-    if (!options_.unverified_lazy_message_sets &&
-        ShouldVerify(descriptor_, options_, scc_analyzer_)) {
-      format(
-          "  ctx->set_lazy_eager_verify_func(&$classname$::InternalVerify);\n");
-    }
-    format(
-        "  return $extensions$.ParseMessageSet(ptr, \n"
-        "      internal_default_instance(), &_internal_metadata_, ctx);\n"
-        "}\n");
-  }
-  if (!should_generate_tctable()) {
-    if (need_parse_function) {
-      GenerateLoopingParseFunction(format);
-    }
-    return;
-  }
-  if (should_generate_guarded_tctable()) {
-    format("#ifdef PROTOBUF_TAIL_CALL_TABLE_PARSER_ENABLED\n\n");
-  }
-  if (need_parse_function) {
-    GenerateTailcallParseFunction(format);
-  }
-  if (tc_table_info_->use_generated_fallback) {
-    GenerateTailcallFallbackFunction(format);
-  }
-  if (should_generate_guarded_tctable()) {
-    if (need_parse_function) {
-      format("\n#else  // PROTOBUF_TAIL_CALL_TABLE_PARSER_ENABLED\n\n");
-      GenerateLoopingParseFunction(format);
-    }
-    format("\n#endif  // PROTOBUF_TAIL_CALL_TABLE_PARSER_ENABLED\n");
-  }
-}
-
-bool ParseFunctionGenerator::should_generate_tctable() const {
-  if (options_.tctable_mode == Options::kTCTableNever) {
-    return false;
-  }
-  return true;
-}
-
-void ParseFunctionGenerator::GenerateTailcallParseFunction(Formatter& format) {
-  GOOGLE_CHECK(should_generate_tctable());
-
-  // Generate an `_InternalParse` that starts the tail-calling loop.
-  format(
-      "const char* $classname$::_InternalParse(\n"
-      "    const char* ptr, ::_pbi::ParseContext* ctx) {\n"
-      "$annotate_deserialize$"
-      "  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, "
-      "&_table_.header);\n");
-  format(
-      "  return ptr;\n"
-      "}\n\n");
-}
-
-void ParseFunctionGenerator::GenerateTailcallFallbackFunction(
-    Formatter& format) {
-  GOOGLE_CHECK(should_generate_tctable());
-  format(
-      "const char* $classname$::Tct_ParseFallback(PROTOBUF_TC_PARAM_DECL) {\n"
-      "#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) return nullptr\n");
-  format.Indent();
-  format("auto* typed_msg = static_cast<$classname$*>(msg);\n");
-
-  if (num_hasbits_ > 0) {
-    // Sync hasbits
-    format("typed_msg->_impl_._has_bits_[0] = hasbits;\n");
-  }
-  format("uint32_t tag = data.tag();\n");
-
-  format.Set("msg", "typed_msg->");
-  format.Set("this", "typed_msg");
-  format.Set("has_bits", "typed_msg->_impl_._has_bits_");
-  format.Set("next_tag", "goto next_tag");
-  GenerateParseIterationBody(format, descriptor_,
-                             tc_table_info_->fallback_fields);
-
-  format.Outdent();
-  format(
-      "next_tag:\n"
-      "message_done:\n"
-      "  return ptr;\n"
-      "#undef CHK_\n"
-      "}\n");
-}
-
-struct SkipEntry16 {
-  uint16_t skipmap;
-  uint16_t field_entry_offset;
-};
-struct SkipEntryBlock {
-  uint32_t first_fnum;
-  std::vector<SkipEntry16> entries;
-};
-struct NumToEntryTable {
-  uint32_t skipmap32;  // for fields #1 - #32
-  std::vector<SkipEntryBlock> blocks;
-  // Compute the number of uint16_t required to represent this table.
-  int size16() const {
-    int size = 2;  // for the termination field#
-    for (const auto& block : blocks) {
-      // 2 for the field#, 1 for a count of skip entries, 2 for each entry.
-      size += 3 + block.entries.size() * 2;
-    }
-    return size;
-  }
-};
-
-static NumToEntryTable MakeNumToEntryTable(
-    const std::vector<const FieldDescriptor*>& field_descriptors);
-
-void ParseFunctionGenerator::GenerateDataDecls(io::Printer* printer) {
-  if (!should_generate_tctable()) {
-    return;
-  }
-  Formatter format(printer, variables_);
-  if (should_generate_guarded_tctable()) {
-    format.Outdent();
-    format("#ifdef PROTOBUF_TAIL_CALL_TABLE_PARSER_ENABLED\n");
-    format.Indent();
-  }
-  auto field_num_to_entry_table = MakeNumToEntryTable(ordered_fields_);
-  format(
-      "static const ::$proto_ns$::internal::"
-      "TcParseTable<$1$, $2$, $3$, $4$, $5$> _table_;\n",
-      tc_table_info_->table_size_log2, ordered_fields_.size(),
-      tc_table_info_->aux_entries.size(), CalculateFieldNamesSize(),
-      field_num_to_entry_table.size16());
-  if (should_generate_guarded_tctable()) {
-    format.Outdent();
-    format("#endif  // PROTOBUF_TAIL_CALL_TABLE_PARSER_ENABLED\n");
-    format.Indent();
-  }
-}
-
-void ParseFunctionGenerator::GenerateDataDefinitions(io::Printer* printer) {
-  if (!should_generate_tctable()) {
-    return;
-  }
-  Formatter format(printer, variables_);
-  if (should_generate_guarded_tctable()) {
-    format("#ifdef PROTOBUF_TAIL_CALL_TABLE_PARSER_ENABLED\n");
-  }
-  GenerateTailCallTable(format);
-  if (should_generate_guarded_tctable()) {
-    format("#endif  // PROTOBUF_TAIL_CALL_TABLE_PARSER_ENABLED\n");
-  }
-}
-
-void ParseFunctionGenerator::GenerateLoopingParseFunction(Formatter& format) {
-  format(
-      "const char* $classname$::_InternalParse(const char* ptr, "
-      "::_pbi::ParseContext* ctx) {\n"
-      "$annotate_deserialize$"
-      "#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure\n");
-  format.Indent();
-  format.Set("msg", "");
-  format.Set("this", "this");
-  int hasbits_size = 0;
-  if (num_hasbits_ > 0) {
-    hasbits_size = (num_hasbits_ + 31) / 32;
-  }
-  // For now only optimize small hasbits.
-  if (hasbits_size != 1) hasbits_size = 0;
-  if (hasbits_size) {
-    format("_Internal::HasBits has_bits{};\n");
-    format.Set("has_bits", "has_bits");
-  } else {
-    format.Set("has_bits", "_impl_._has_bits_");
-  }
-  format.Set("next_tag", "continue");
-  format("while (!ctx->Done(&ptr)) {\n");
-  format.Indent();
-
-  format(
-      "uint32_t tag;\n"
-      "ptr = ::_pbi::ReadTag(ptr, &tag);\n");
-  GenerateParseIterationBody(format, descriptor_, ordered_fields_);
-
-  format.Outdent();
-  format("}  // while\n");
-
-  format.Outdent();
-  format("message_done:\n");
-  if (hasbits_size) format("  _impl_._has_bits_.Or(has_bits);\n");
-
-  format(
-      "  return ptr;\n"
-      "failure:\n"
-      "  ptr = nullptr;\n"
-      "  goto message_done;\n"
-      "#undef CHK_\n"
-      "}\n");
-}
-
-static NumToEntryTable MakeNumToEntryTable(
-    const std::vector<const FieldDescriptor*>& field_descriptors) {
-  NumToEntryTable num_to_entry_table;
-  num_to_entry_table.skipmap32 = static_cast<uint32_t>(-1);
-
-  // skip_entry_block is the current block of SkipEntries that we're
-  // appending to.  cur_block_first_fnum is the number of the first
-  // field represented by the block.
-  uint16_t field_entry_index = 0;
-  uint16_t N = field_descriptors.size();
-  // First, handle field numbers 1-32, which affect only the initial
-  // skipmap32 and don't generate additional skip-entry blocks.
-  for (; field_entry_index != N; ++field_entry_index) {
-    auto* field_descriptor = field_descriptors[field_entry_index];
-    if (field_descriptor->number() > 32) break;
-    auto skipmap32_index = field_descriptor->number() - 1;
-    num_to_entry_table.skipmap32 -= 1 << skipmap32_index;
-  }
-  // If all the field numbers were less than or equal to 32, we will have
-  // no further entries to process, and we are already done.
-  if (field_entry_index == N) return num_to_entry_table;
-
-  SkipEntryBlock* block = nullptr;
-  bool start_new_block = true;
-  // To determine sparseness, track the field number corresponding to
-  // the start of the most recent skip entry.
-  uint32_t last_skip_entry_start = 0;
-  for (; field_entry_index != N; ++field_entry_index) {
-    auto* field_descriptor = field_descriptors[field_entry_index];
-    uint32_t fnum = field_descriptor->number();
-    GOOGLE_CHECK_GT(fnum, last_skip_entry_start);
-    if (start_new_block == false) {
-      // If the next field number is within 15 of the last_skip_entry_start, we
-      // continue writing just to that entry.  If it's between 16 and 31 more,
-      // then we just extend the current block by one. If it's more than 31
-      // more, we have to add empty skip entries in order to continue using the
-      // existing block.  Obviously it's just 32 more, it doesn't make sense to
-      // start a whole new block, since new blocks mean having to write out
-      // their starting field number, which is 32 bits, as well as the size of
-      // the additional block, which is 16... while an empty SkipEntry16 only
-      // costs 32 bits.  So if it was 48 more, it's a slight space win; we save
-      // 16 bits, but probably at the cost of slower run time.  We're choosing
-      // 96 for now.
-      if (fnum - last_skip_entry_start > 96) start_new_block = true;
-    }
-    if (start_new_block) {
-      num_to_entry_table.blocks.push_back(SkipEntryBlock{fnum});
-      block = &num_to_entry_table.blocks.back();
-      start_new_block = false;
-    }
-
-    auto skip_entry_num = (fnum - block->first_fnum) / 16;
-    auto skip_entry_index = (fnum - block->first_fnum) % 16;
-    while (skip_entry_num >= block->entries.size())
-      block->entries.push_back({0xFFFF, field_entry_index});
-    block->entries[skip_entry_num].skipmap -= 1 << (skip_entry_index);
-
-    last_skip_entry_start = fnum - skip_entry_index;
-  }
-  return num_to_entry_table;
-}
-
-void ParseFunctionGenerator::GenerateTailCallTable(Formatter& format) {
-  GOOGLE_CHECK(should_generate_tctable());
-  // All entries without a fast-path parsing function need a fallback.
-  std::string fallback;
-  if (tc_table_info_->use_generated_fallback) {
-    fallback = ClassName(descriptor_) + "::Tct_ParseFallback";
-  } else {
-    fallback = "::_pbi::TcParser::GenericFallback";
-    if (GetOptimizeFor(descriptor_->file(), options_) ==
-        FileOptions::LITE_RUNTIME) {
-      fallback += "Lite";
-    }
-  }
-
-  // For simplicity and speed, the table is not covering all proto
-  // configurations. This model uses a fallback to cover all situations that
-  // the table can't accommodate, together with unknown fields or extensions.
-  // These are number of fields over 32, fields with 3 or more tag bytes,
-  // maps, weak fields, lazy, more than 1 extension range. In the cases
-  // the table is sufficient we can use a generic routine, that just handles
-  // unknown fields and potentially an extension range.
-  auto field_num_to_entry_table = MakeNumToEntryTable(ordered_fields_);
-  format(
-      "PROTOBUF_ATTRIBUTE_INIT_PRIORITY1\n"
-      "const ::_pbi::TcParseTable<$1$, $2$, $3$, $4$, $5$> "
-      "$classname$::_table_ = "
-      "{\n",
-      tc_table_info_->table_size_log2, ordered_fields_.size(),
-      tc_table_info_->aux_entries.size(), CalculateFieldNamesSize(),
-      field_num_to_entry_table.size16());
-  {
-    auto table_scope = format.ScopedIndent();
-    format("{\n");
-    {
-      auto header_scope = format.ScopedIndent();
-      if (num_hasbits_ > 0 || IsMapEntryMessage(descriptor_)) {
-        format("PROTOBUF_FIELD_OFFSET($classname$, _impl_._has_bits_),\n");
-      } else {
-        format("0,  // no _has_bits_\n");
-      }
-      if (descriptor_->extension_range_count() == 1) {
-        format(
-            "PROTOBUF_FIELD_OFFSET($classname$, $extensions$),\n"
-            "$1$, $2$,  // extension_range_{low,high}\n",
-            descriptor_->extension_range(0)->start,
-            descriptor_->extension_range(0)->end);
-      } else {
-        format("0, 0, 0,  // no _extensions_\n");
-      }
-      format("$1$, $2$,  // max_field_number, fast_idx_mask\n",
-             (ordered_fields_.empty() ? 0 : ordered_fields_.back()->number()),
-             (((1 << tc_table_info_->table_size_log2) - 1) << 3));
-      format(
-          "offsetof(decltype(_table_), field_lookup_table),\n"
-          "$1$,  // skipmap\n",
-          field_num_to_entry_table.skipmap32);
-      if (ordered_fields_.empty()) {
-        format(
-            "offsetof(decltype(_table_), field_names),  // no field_entries\n");
-      } else {
-        format("offsetof(decltype(_table_), field_entries),\n");
-      }
-
-      format(
-          "$1$,  // num_field_entries\n"
-          "$2$,  // num_aux_entries\n",
-          ordered_fields_.size(), tc_table_info_->aux_entries.size());
-      if (tc_table_info_->aux_entries.empty()) {
-        format(
-            "offsetof(decltype(_table_), field_names),  // no aux_entries\n");
-      } else {
-        format("offsetof(decltype(_table_), aux_entries),\n");
-      }
-      format(
-          "&$1$._instance,\n"
-          "$2$,  // fallback\n"
-          "",
-          DefaultInstanceName(descriptor_, options_), fallback);
-    }
-    format("}, {{\n");
-    {
-      // fast_entries[]
-      auto fast_scope = format.ScopedIndent();
-      GenerateFastFieldEntries(format);
-    }
-    format("}}, {{\n");
-    {
-      // field_lookup_table[]
-      auto field_lookup_scope = format.ScopedIndent();
-      int line_entries = 0;
-      for (int i = 0, N = field_num_to_entry_table.blocks.size(); i < N; ++i) {
-        SkipEntryBlock& entry_block = field_num_to_entry_table.blocks[i];
-        format("$1$, $2$, $3$,\n", entry_block.first_fnum & 65535,
-               entry_block.first_fnum / 65536, entry_block.entries.size());
-        for (auto se16 : entry_block.entries) {
-          if (line_entries == 0) {
-            format("$1$, $2$,", se16.skipmap, se16.field_entry_offset);
-            ++line_entries;
-          } else if (line_entries < 5) {
-            format(" $1$, $2$,", se16.skipmap, se16.field_entry_offset);
-            ++line_entries;
-          } else {
-            format(" $1$, $2$,\n", se16.skipmap, se16.field_entry_offset);
-            line_entries = 0;
-          }
-        }
-      }
-      if (line_entries) format("\n");
-      format("65535, 65535\n");
-    }
-    if (ordered_fields_.empty()) {
-      GOOGLE_LOG_IF(DFATAL, !tc_table_info_->aux_entries.empty())
-          << "Invalid message: " << descriptor_->full_name() << " has "
-          << tc_table_info_->aux_entries.size()
-          << " auxiliary field entries, but no fields";
-      format(
-          "}},\n"
-          "// no field_entries, or aux_entries\n"
-          "{{\n");
-    } else {
-      format("}}, {{\n");
-      {
-        // field_entries[]
-        auto field_scope = format.ScopedIndent();
-        GenerateFieldEntries(format);
-      }
-      if (tc_table_info_->aux_entries.empty()) {
-        format(
-            "}},\n"
-            "// no aux_entries\n"
-            "{{\n");
-      } else {
-        format("}}, {{\n");
-        {
-          // aux_entries[]
-          auto aux_scope = format.ScopedIndent();
-          for (const std::string& aux_entry : tc_table_info_->aux_entries) {
-            format("{$1$},\n", aux_entry);
-          }
-        }
-        format("}}, {{\n");
-      }
-    }  // ordered_fields_.empty()
-    {
-      // field_names[]
-      auto field_name_scope = format.ScopedIndent();
-      GenerateFieldNames(format);
-    }
-    format("}},\n");
-  }
-  format("};\n\n");  // _table_
-}
-
-void ParseFunctionGenerator::GenerateFastFieldEntries(Formatter& format) {
-  for (const auto& info : tc_table_info_->fast_path_fields) {
-    if (info.field != nullptr) {
-      PrintFieldComment(format, info.field);
-    }
-    if (info.func_name.empty()) {
-      format("{::_pbi::TcParser::MiniParse, {}},\n");
-    } else {
-      bool cold = ShouldSplit(info.field, options_);
-      format(
-          "{$1$,\n"
-          " {$2$, $3$, $4$, PROTOBUF_FIELD_OFFSET($classname$$5$, $6$)}},\n",
-          info.func_name, info.coded_tag, info.hasbit_idx, info.aux_idx,
-          cold ? "::Impl_::Split" : "",
-          cold ? FieldName(info.field) + "_"
-               : FieldMemberName(info.field, /*cold=*/false));
-    }
-  }
-}
-
-static void FormatFieldKind(Formatter& format,
-                            const TailCallTableInfo::FieldEntryInfo& entry,
-                            const Options& options,
-                            MessageSCCAnalyzer* scc_analyzer) {
-  const FieldDescriptor* field = entry.field;
-  // Spell the field kind in proto language declaration order, starting with
-  // cardinality:
-  format("(::_fl::kFc");
-  if (HasHasbit(field)) {
-    format("Optional");
-  } else if (field->is_repeated()) {
-    format("Repeated");
-  } else if (field->real_containing_oneof()) {
-    format("Oneof");
-  } else {
-    format("Singular");
-  }
-
-  // The rest of the type uses convenience aliases:
-  format(" | ::_fl::k");
-  if (field->is_repeated() && field->is_packed()) {
-    format("Packed");
-  }
-  switch (field->type()) {
-    case FieldDescriptor::TYPE_DOUBLE:
-      format("Double");
-      break;
-    case FieldDescriptor::TYPE_FLOAT:
-      format("Float");
-      break;
-    case FieldDescriptor::TYPE_FIXED32:
-      format("Fixed32");
-      break;
-    case FieldDescriptor::TYPE_SFIXED32:
-      format("SFixed32");
-      break;
-    case FieldDescriptor::TYPE_FIXED64:
-      format("Fixed64");
-      break;
-    case FieldDescriptor::TYPE_SFIXED64:
-      format("SFixed64");
-      break;
-    case FieldDescriptor::TYPE_BOOL:
-      format("Bool");
-      break;
-    case FieldDescriptor::TYPE_ENUM:
-      if (HasPreservingUnknownEnumSemantics(field)) {
-        // No validation is required.
-        format("OpenEnum");
-      } else if (entry.is_enum_range) {
-        // Validation is done by range check (start/length in FieldAux).
-        format("EnumRange");
-      } else {
-        // Validation uses the generated _IsValid function.
-        format("Enum");
-      }
-      break;
-    case FieldDescriptor::TYPE_UINT32:
-      format("UInt32");
-      break;
-    case FieldDescriptor::TYPE_SINT32:
-      format("SInt32");
-      break;
-    case FieldDescriptor::TYPE_INT32:
-      format("Int32");
-      break;
-    case FieldDescriptor::TYPE_UINT64:
-      format("UInt64");
-      break;
-    case FieldDescriptor::TYPE_SINT64:
-      format("SInt64");
-      break;
-    case FieldDescriptor::TYPE_INT64:
-      format("Int64");
-      break;
-
-    case FieldDescriptor::TYPE_BYTES:
-      format("Bytes");
-      break;
-    case FieldDescriptor::TYPE_STRING: {
-      auto mode = GetUtf8CheckMode(field, options);
-      switch (mode) {
-        case Utf8CheckMode::kStrict:
-          format("Utf8String");
-          break;
-        case Utf8CheckMode::kVerify:
-          format("RawString");
-          break;
-        case Utf8CheckMode::kNone:
-          // Treat LITE_RUNTIME strings as bytes.
-          format("Bytes");
-          break;
-        default:
-          GOOGLE_LOG(FATAL) << "Invalid Utf8CheckMode (" << static_cast<int>(mode)
-                     << ") for " << field->DebugString();
-      }
-      break;
-    }
-
-    case FieldDescriptor::TYPE_GROUP:
-      format("Message | ::_fl::kRepGroup");
-      break;
-    case FieldDescriptor::TYPE_MESSAGE:
-      if (field->is_map()) {
-        format("Map");
-      } else {
-        format("Message");
-        if (IsLazy(field, options, scc_analyzer)) {
-          format(" | ::_fl::kRepLazy");
-        } else if (IsImplicitWeakField(field, options, scc_analyzer)) {
-          format(" | ::_fl::kRepIWeak");
-        }
-      }
-      break;
-  }
-
-  // Fill in extra information about string and bytes field representations.
-  if (field->type() == FieldDescriptor::TYPE_BYTES ||
-      field->type() == FieldDescriptor::TYPE_STRING) {
-    if (field->is_repeated()) {
-      format(" | ::_fl::kRepSString");
-    } else {
-      format(" | ::_fl::kRepAString");
-    }
-  }
-
-  format(")");
-}
-
-void ParseFunctionGenerator::GenerateFieldEntries(Formatter& format) {
-  for (const auto& entry : tc_table_info_->field_entries) {
-    const FieldDescriptor* field = entry.field;
-    PrintFieldComment(format, field);
-    format("{");
-    if (IsWeak(field, options_)) {
-      // Weak fields are handled by the generated fallback function.
-      // (These are handled by legacy Google-internal logic.)
-      format("/* weak */ 0, 0, 0, 0");
-    } else {
-      const OneofDescriptor* oneof = field->real_containing_oneof();
-      bool cold = ShouldSplit(field, options_);
-      format("PROTOBUF_FIELD_OFFSET($classname$$1$, $2$), $3$, $4$,\n ",
-             cold ? "::Impl_::Split" : "",
-             cold ? FieldName(field) + "_"
-                  : FieldMemberName(field, /*cold=*/false),
-             (oneof ? oneof->index() : entry.hasbit_idx), entry.aux_idx);
-      FormatFieldKind(format, entry, options_, scc_analyzer_);
-    }
-    format("},\n");
-  }
-}
-
-static constexpr int kMaxNameLength = 255;
-
-int ParseFunctionGenerator::CalculateFieldNamesSize() const {
-  // The full name of the message appears first.
-  int size = std::min(static_cast<int>(descriptor_->full_name().size()),
-                      kMaxNameLength);
-  int lengths_size = 1;
-  for (const auto& entry : tc_table_info_->field_entries) {
-    const FieldDescriptor* field = entry.field;
-    GOOGLE_CHECK_LE(field->name().size(), kMaxNameLength);
-    size += field->name().size();
-    lengths_size += 1;
-  }
-  // align to an 8-byte boundary
-  lengths_size = (lengths_size + 7) & -8;
-  return size + lengths_size + 1;
-}
-
-static void FormatOctal(Formatter& format, int size) {
-  int octal_size = ((size >> 6) & 3) * 100 +  //
-                   ((size >> 3) & 7) * 10 +   //
-                   ((size >> 0) & 7);
-  format("\\$1$", octal_size);
-}
-
-void ParseFunctionGenerator::GenerateFieldNames(Formatter& format) {
-  // First, we output the size of each string, as an unsigned byte. The first
-  // string is the message name.
-  int count = 1;
-  format("\"");
-  FormatOctal(format,
-              std::min(static_cast<int>(descriptor_->full_name().size()), 255));
-  for (const auto& entry : tc_table_info_->field_entries) {
-    FormatOctal(format, entry.field->name().size());
-    ++count;
-  }
-  while (count & 7) {  // align to an 8-byte boundary
-    format("\\0");
-    ++count;
-  }
-  format("\"\n");
-  // The message name is stored at the beginning of the string
-  std::string message_name = descriptor_->full_name();
-  if (message_name.size() > kMaxNameLength) {
-    static constexpr int kNameHalfLength = (kMaxNameLength - 3) / 2;
-    message_name = StrCat(
-        message_name.substr(0, kNameHalfLength), "...",
-        message_name.substr(message_name.size() - kNameHalfLength));
-  }
-  format("\"$1$\"\n", message_name);
-  // Then we output the actual field names
-  for (const auto& entry : tc_table_info_->field_entries) {
-    const FieldDescriptor* field = entry.field;
-    format("\"$1$\"\n", field->name());
-  }
-}
-
-void ParseFunctionGenerator::GenerateArenaString(Formatter& format,
-                                                 const FieldDescriptor* field) {
-  if (HasHasbit(field)) {
-    format("_Internal::set_has_$1$(&$has_bits$);\n", FieldName(field));
-  }
-  format(
-      "if (arena != nullptr) {\n"
-      "  ptr = ctx->ReadArenaString(ptr, &$msg$$field$, arena");
-  if (IsStringInlined(field, options_)) {
-    GOOGLE_DCHECK(!inlined_string_indices_.empty());
-    int inlined_string_index = inlined_string_indices_[field->index()];
-    GOOGLE_DCHECK_GT(inlined_string_index, 0);
-    format(", &$msg$$inlined_string_donated_array$[0], $1$, $this$",
-           inlined_string_index);
-  } else {
-    GOOGLE_DCHECK(field->default_value_string().empty());
-  }
-  format(
-      ");\n"
-      "} else {\n"
-      "  ptr = ::_pbi::InlineGreedyStringParser("
-      "$msg$$field$.MutableNoCopy(nullptr), ptr, ctx);\n"
-      "}\n"
-      "const std::string* str = &$msg$$field$.Get(); (void)str;\n");
-}
-
-void ParseFunctionGenerator::GenerateStrings(Formatter& format,
-                                             const FieldDescriptor* field,
-                                             bool check_utf8) {
-  FieldOptions::CType ctype = FieldOptions::STRING;
-  if (!options_.opensource_runtime) {
-    // Open source doesn't support other ctypes;
-    ctype = field->options().ctype();
-  }
-  if (!field->is_repeated() && !options_.opensource_runtime &&
-      GetOptimizeFor(field->file(), options_) != FileOptions::LITE_RUNTIME &&
-      // For now only use arena string for strings with empty defaults.
-      field->default_value_string().empty() &&
-      !field->real_containing_oneof() && ctype == FieldOptions::STRING) {
-    GenerateArenaString(format, field);
-  } else {
-    std::string parser_name;
-    switch (ctype) {
-      case FieldOptions::STRING:
-        parser_name = "GreedyStringParser";
-        break;
-      case FieldOptions::CORD:
-        parser_name = "CordParser";
-        break;
-      case FieldOptions::STRING_PIECE:
-        parser_name = "StringPieceParser";
-        break;
-    }
-    format(
-        "auto str = $msg$$1$$2$_$name$();\n"
-        "ptr = ::_pbi::Inline$3$(str, ptr, ctx);\n",
-        HasInternalAccessors(ctype) ? "_internal_" : "",
-        field->is_repeated() && !field->is_packable() ? "add" : "mutable",
-        parser_name);
-  }
-  // It is intentionally placed before VerifyUTF8 because it doesn't make sense
-  // to verify UTF8 when we already know parsing failed.
-  format("CHK_(ptr);\n");
-  if (!check_utf8) return;  // return if this is a bytes field
-  auto level = GetUtf8CheckMode(field, options_);
-  switch (level) {
-    case Utf8CheckMode::kNone:
-      return;
-    case Utf8CheckMode::kVerify:
-      format("#ifndef NDEBUG\n");
-      break;
-    case Utf8CheckMode::kStrict:
-      format("CHK_(");
-      break;
-  }
-  std::string field_name;
-  field_name = "nullptr";
-  if (HasDescriptorMethods(field->file(), options_)) {
-    field_name = StrCat("\"", field->full_name(), "\"");
-  }
-  format("::_pbi::VerifyUTF8(str, $1$)", field_name);
-  switch (level) {
-    case Utf8CheckMode::kNone:
-      return;
-    case Utf8CheckMode::kVerify:
-      format(
-          ";\n"
-          "#endif  // !NDEBUG\n");
-      break;
-    case Utf8CheckMode::kStrict:
-      format(");\n");
-      break;
-  }
-}
-
-void ParseFunctionGenerator::GenerateLengthDelim(Formatter& format,
-                                                 const FieldDescriptor* field) {
-  if (field->is_packable()) {
-    if (field->type() == FieldDescriptor::TYPE_ENUM &&
-        !HasPreservingUnknownEnumSemantics(field)) {
-      std::string enum_type = QualifiedClassName(field->enum_type(), options_);
-      format(
-          "ptr = "
-          "::$proto_ns$::internal::Packed$1$Parser<$unknown_fields_type$>("
-          "$msg$_internal_mutable_$name$(), ptr, ctx, $2$_IsValid, "
-          "&$msg$_internal_metadata_, $3$);\n",
-          DeclaredTypeMethodName(field->type()), enum_type, field->number());
-    } else {
-      format(
-          "ptr = ::$proto_ns$::internal::Packed$1$Parser("
-          "$msg$_internal_mutable_$name$(), ptr, ctx);\n",
-          DeclaredTypeMethodName(field->type()));
-    }
-    format("CHK_(ptr);\n");
-  } else {
-    auto field_type = field->type();
-    switch (field_type) {
-      case FieldDescriptor::TYPE_STRING:
-        GenerateStrings(format, field, true /* utf8 */);
-        break;
-      case FieldDescriptor::TYPE_BYTES:
-        GenerateStrings(format, field, false /* utf8 */);
-        break;
-      case FieldDescriptor::TYPE_MESSAGE: {
-        if (field->is_map()) {
-          const FieldDescriptor* val = field->message_type()->map_value();
-          GOOGLE_CHECK(val);
-          if (val->type() == FieldDescriptor::TYPE_ENUM &&
-              !HasPreservingUnknownEnumSemantics(field)) {
-            format(
-                "auto object = "
-                "::$proto_ns$::internal::InitEnumParseWrapper<"
-                "$unknown_fields_type$>(&$msg$$field$, $1$_IsValid, "
-                "$2$, &$msg$_internal_metadata_);\n"
-                "ptr = ctx->ParseMessage(&object, ptr);\n",
-                QualifiedClassName(val->enum_type(), options_),
-                field->number());
-          } else {
-            format("ptr = ctx->ParseMessage(&$msg$$field$, ptr);\n");
-          }
-        } else if (IsLazy(field, options_, scc_analyzer_)) {
-          bool eager_verify =
-              IsEagerlyVerifiedLazy(field, options_, scc_analyzer_);
-          if (ShouldVerify(descriptor_, options_, scc_analyzer_)) {
-            format(
-                "ctx->set_lazy_eager_verify_func($1$);\n",
-                eager_verify
-                    ? StrCat("&", ClassName(field->message_type(), true),
-                                   "::InternalVerify")
-                    : "nullptr");
-          }
-          if (field->real_containing_oneof()) {
-            format(
-                "if (!$msg$_internal_has_$name$()) {\n"
-                "  $msg$clear_$1$();\n"
-                "  $msg$$field$ = ::$proto_ns$::Arena::CreateMessage<\n"
-                "      ::$proto_ns$::internal::LazyField>("
-                "$msg$GetArenaForAllocation());\n"
-                "  $msg$set_has_$name$();\n"
-                "}\n"
-                "auto* lazy_field = $msg$$field$;\n",
-                field->containing_oneof()->name());
-          } else if (HasHasbit(field)) {
-            format(
-                "_Internal::set_has_$name$(&$has_bits$);\n"
-                "auto* lazy_field = &$msg$$field$;\n");
-          } else {
-            format("auto* lazy_field = &$msg$$field$;\n");
-          }
-          format(
-              "::$proto_ns$::internal::LazyFieldParseHelper<\n"
-              "  ::$proto_ns$::internal::LazyField> parse_helper(\n"
-              "    $1$::default_instance(),\n"
-              "    $msg$GetArenaForAllocation(),\n"
-              "    ::google::protobuf::internal::LazyVerifyOption::$2$,\n"
-              "    lazy_field);\n"
-              "ptr = ctx->ParseMessage(&parse_helper, ptr);\n",
-              FieldMessageTypeName(field, options_),
-              eager_verify ? "kEager" : "kLazy");
-          if (ShouldVerify(descriptor_, options_, scc_analyzer_) &&
-              eager_verify) {
-            format("ctx->set_lazy_eager_verify_func(nullptr);\n");
-          }
-        } else if (IsImplicitWeakField(field, options_, scc_analyzer_)) {
-          if (!field->is_repeated()) {
-            format(
-                "ptr = ctx->ParseMessage(_Internal::mutable_$name$($this$), "
-                "ptr);\n");
-          } else {
-            format(
-                "ptr = ctx->ParseMessage($msg$$field$.AddWeak("
-                "reinterpret_cast<const ::$proto_ns$::MessageLite*>($1$ptr_)"
-                "), ptr);\n",
-                QualifiedDefaultInstanceName(field->message_type(), options_));
-          }
-        } else if (IsWeak(field, options_)) {
-          format(
-              "{\n"
-              "  auto* default_ = &reinterpret_cast<const Message&>($1$);\n"
-              "  ptr = ctx->ParseMessage($msg$$weak_field_map$.MutableMessage("
-              "$2$, default_), ptr);\n"
-              "}\n",
-              QualifiedDefaultInstanceName(field->message_type(), options_),
-              field->number());
-        } else {
-          format(
-              "ptr = ctx->ParseMessage($msg$_internal_$mutable_field$(), "
-              "ptr);\n");
-        }
-        format("CHK_(ptr);\n");
-        break;
-      }
-      default:
-        GOOGLE_LOG(FATAL) << "Illegal combination for length delimited wiretype "
-                   << " filed type is " << field->type();
-    }
-  }
-}
-
-static bool ShouldRepeat(const FieldDescriptor* descriptor,
-                         WireFormatLite::WireType wiretype) {
-  constexpr int kMaxTwoByteFieldNumber = 16 * 128;
-  return descriptor->number() < kMaxTwoByteFieldNumber &&
-         descriptor->is_repeated() &&
-         (!descriptor->is_packable() ||
-          wiretype != WireFormatLite::WIRETYPE_LENGTH_DELIMITED);
-}
-
-void ParseFunctionGenerator::GenerateFieldBody(
-    Formatter& format, WireFormatLite::WireType wiretype,
-    const FieldDescriptor* field) {
-  Formatter::SaveState formatter_state(&format);
-  format.AddMap(
-      {{"name", FieldName(field)},
-       {"primitive_type", PrimitiveTypeName(options_, field->cpp_type())}});
-  if (field->is_repeated()) {
-    format.AddMap({{"put_field", StrCat("add_", FieldName(field))},
-                   {"mutable_field", StrCat("add_", FieldName(field))}});
-  } else {
-    format.AddMap(
-        {{"put_field", StrCat("set_", FieldName(field))},
-         {"mutable_field", StrCat("mutable_", FieldName(field))}});
-  }
-  uint32_t tag = WireFormatLite::MakeTag(field->number(), wiretype);
-  switch (wiretype) {
-    case WireFormatLite::WIRETYPE_VARINT: {
-      std::string type = PrimitiveTypeName(options_, field->cpp_type());
-      if (field->type() == FieldDescriptor::TYPE_ENUM) {
-        format.Set("enum_type",
-                   QualifiedClassName(field->enum_type(), options_));
-        format(
-            "$uint64$ val = ::$proto_ns$::internal::ReadVarint64(&ptr);\n"
-            "CHK_(ptr);\n");
-        if (!HasPreservingUnknownEnumSemantics(field)) {
-          format("if (PROTOBUF_PREDICT_TRUE($enum_type$_IsValid(val))) {\n");
-          format.Indent();
-        }
-        format("$msg$_internal_$put_field$(static_cast<$enum_type$>(val));\n");
-        if (!HasPreservingUnknownEnumSemantics(field)) {
-          format.Outdent();
-          format(
-              "} else {\n"
-              "  ::$proto_ns$::internal::WriteVarint("
-              "$1$, val, $msg$mutable_unknown_fields());\n"
-              "}\n",
-              field->number());
-        }
-      } else {
-        std::string size = (field->type() == FieldDescriptor::TYPE_INT32 ||
-                            field->type() == FieldDescriptor::TYPE_SINT32 ||
-                            field->type() == FieldDescriptor::TYPE_UINT32)
-                               ? "32"
-                               : "64";
-        std::string zigzag;
-        if ((field->type() == FieldDescriptor::TYPE_SINT32 ||
-             field->type() == FieldDescriptor::TYPE_SINT64)) {
-          zigzag = "ZigZag";
-        }
-        if (field->is_repeated() || field->real_containing_oneof()) {
-          format(
-              "$msg$_internal_$put_field$("
-              "::$proto_ns$::internal::ReadVarint$1$$2$(&ptr));\n"
-              "CHK_(ptr);\n",
-              zigzag, size);
-        } else {
-          if (HasHasbit(field)) {
-            format("_Internal::set_has_$name$(&$has_bits$);\n");
-          }
-          format(
-              "$msg$$field$ = ::$proto_ns$::internal::ReadVarint$1$$2$(&ptr);\n"
-              "CHK_(ptr);\n",
-              zigzag, size);
-        }
-      }
-      break;
-    }
-    case WireFormatLite::WIRETYPE_FIXED32:
-    case WireFormatLite::WIRETYPE_FIXED64: {
-      if (field->is_repeated() || field->real_containing_oneof()) {
-        format(
-            "$msg$_internal_$put_field$("
-            "::$proto_ns$::internal::UnalignedLoad<$primitive_type$>(ptr));\n"
-            "ptr += sizeof($primitive_type$);\n");
-      } else {
-        if (HasHasbit(field)) {
-          format("_Internal::set_has_$name$(&$has_bits$);\n");
-        }
-        format(
-            "$msg$$field$ = "
-            "::$proto_ns$::internal::UnalignedLoad<$primitive_type$>(ptr);\n"
-            "ptr += sizeof($primitive_type$);\n");
-      }
-      break;
-    }
-    case WireFormatLite::WIRETYPE_LENGTH_DELIMITED: {
-      GenerateLengthDelim(format, field);
-      break;
-    }
-    case WireFormatLite::WIRETYPE_START_GROUP: {
-      format(
-          "ptr = ctx->ParseGroup($msg$_internal_$mutable_field$(), ptr, $1$);\n"
-          "CHK_(ptr);\n",
-          tag);
-      break;
-    }
-    case WireFormatLite::WIRETYPE_END_GROUP: {
-      GOOGLE_LOG(FATAL) << "Can't have end group field\n";
-      break;
-    }
-  }  // switch (wire_type)
-}
-
-// Returns the tag for this field and in case of repeated packable fields,
-// sets a fallback tag in fallback_tag_ptr.
-static uint32_t ExpectedTag(const FieldDescriptor* field,
-                            uint32_t* fallback_tag_ptr) {
-  uint32_t expected_tag;
-  if (field->is_packable()) {
-    auto expected_wiretype = WireFormat::WireTypeForFieldType(field->type());
-    expected_tag = WireFormatLite::MakeTag(field->number(), expected_wiretype);
-    GOOGLE_CHECK(expected_wiretype != WireFormatLite::WIRETYPE_LENGTH_DELIMITED);
-    auto fallback_wiretype = WireFormatLite::WIRETYPE_LENGTH_DELIMITED;
-    uint32_t fallback_tag =
-        WireFormatLite::MakeTag(field->number(), fallback_wiretype);
-
-    if (field->is_packed()) std::swap(expected_tag, fallback_tag);
-    *fallback_tag_ptr = fallback_tag;
-  } else {
-    auto expected_wiretype = WireFormat::WireTypeForField(field);
-    expected_tag = WireFormatLite::MakeTag(field->number(), expected_wiretype);
-  }
-  return expected_tag;
-}
-
-// These variables are used by the generated parse iteration, and must already
-// be defined in the generated code:
-// - `const char* ptr`: the input buffer.
-// - `ParseContext* ctx`: the associated context for `ptr`.
-// - implicit `this`: i.e., we must be in a non-static member function.
-//
-// The macro `CHK_(x)` must be defined. It should return an error condition if
-// the macro parameter is false.
-//
-// Whenever an END_GROUP tag was read, or tag 0 was read, the generated code
-// branches to the label `message_done`.
-//
-// These formatter variables are used:
-// - `next_tag`: a single statement to begin parsing the next tag.
-//
-// At the end of the generated code, the enclosing function should proceed to
-// parse the next tag in the stream.
-void ParseFunctionGenerator::GenerateParseIterationBody(
-    Formatter& format, const Descriptor* descriptor,
-    const std::vector<const FieldDescriptor*>& fields) {
-  if (!fields.empty()) {
-    GenerateFieldSwitch(format, fields);
-    // Each field `case` only considers field number. Field numbers that are
-    // not defined in the message, or tags with an incompatible wire type, are
-    // considered "unusual" cases. They will be handled by the logic below.
-    format.Outdent();
-    format("handle_unusual:\n");
-    format.Indent();
-  }
-
-  // Unusual/extension/unknown case:
-  format(
-      "if ((tag == 0) || ((tag & 7) == 4)) {\n"
-      "  CHK_(ptr);\n"
-      "  ctx->SetLastTag(tag);\n"
-      "  goto message_done;\n"
-      "}\n");
-  if (IsMapEntryMessage(descriptor)) {
-    format("$next_tag$;\n");
-  } else {
-    if (descriptor->extension_range_count() > 0) {
-      format("if (");
-      for (int i = 0; i < descriptor->extension_range_count(); i++) {
-        const Descriptor::ExtensionRange* range =
-            descriptor->extension_range(i);
-        if (i > 0) format(" ||\n    ");
-
-        uint32_t start_tag = WireFormatLite::MakeTag(
-            range->start, static_cast<WireFormatLite::WireType>(0));
-        uint32_t end_tag = WireFormatLite::MakeTag(
-            range->end, static_cast<WireFormatLite::WireType>(0));
-
-        if (range->end > FieldDescriptor::kMaxNumber) {
-          format("($1$u <= tag)", start_tag);
-        } else {
-          format("($1$u <= tag && tag < $2$u)", start_tag, end_tag);
-        }
-      }
-      format(
-          ") {\n"
-          "  ptr = $msg$$extensions$.ParseField(tag, ptr, "
-          "internal_default_instance(), &$msg$_internal_metadata_, ctx);\n"
-          "  CHK_(ptr != nullptr);\n"
-          "  $next_tag$;\n"
-          "}\n");
-    }
-    format(
-        "ptr = UnknownFieldParse(\n"
-        "    tag,\n"
-        "    $msg$_internal_metadata_.mutable_unknown_fields<"
-        "$unknown_fields_type$>(),\n"
-        "    ptr, ctx);\n"
-        "CHK_(ptr != nullptr);\n");
-  }
-}
-
-void ParseFunctionGenerator::GenerateFieldSwitch(
-    Formatter& format, const std::vector<const FieldDescriptor*>& fields) {
-  format("switch (tag >> 3) {\n");
-  format.Indent();
-
-  for (const auto* field : fields) {
-    bool cold = ShouldSplit(field, options_);
-    format.Set("field", FieldMemberName(field, cold));
-    PrintFieldComment(format, field);
-    format("case $1$:\n", field->number());
-    format.Indent();
-    uint32_t fallback_tag = 0;
-    uint32_t expected_tag = ExpectedTag(field, &fallback_tag);
-    format("if (PROTOBUF_PREDICT_TRUE(static_cast<$uint8$>(tag) == $1$)) {\n",
-           expected_tag & 0xFF);
-    format.Indent();
-    if (cold) {
-      format("$msg$PrepareSplitMessageForWrite();\n");
-    }
-    auto wiretype = WireFormatLite::GetTagWireType(expected_tag);
-    uint32_t tag = WireFormatLite::MakeTag(field->number(), wiretype);
-    int tag_size = io::CodedOutputStream::VarintSize32(tag);
-    bool is_repeat = ShouldRepeat(field, wiretype);
-    if (is_repeat) {
-      format(
-          "ptr -= $1$;\n"
-          "do {\n"
-          "  ptr += $1$;\n",
-          tag_size);
-      format.Indent();
-    }
-    GenerateFieldBody(format, wiretype, field);
-    if (is_repeat) {
-      format.Outdent();
-      format(
-          "  if (!ctx->DataAvailable(ptr)) break;\n"
-          "} while (::$proto_ns$::internal::ExpectTag<$1$>(ptr));\n",
-          tag);
-    }
-    format.Outdent();
-    if (fallback_tag) {
-      format("} else if (static_cast<$uint8$>(tag) == $1$) {\n",
-             fallback_tag & 0xFF);
-      format.Indent();
-      GenerateFieldBody(format, WireFormatLite::GetTagWireType(fallback_tag),
-                        field);
-      format.Outdent();
-    }
-    format(
-        "} else\n"
-        "  goto handle_unusual;\n"
-        "$next_tag$;\n");
-    format.Outdent();
-  }  // for loop over ordered fields
-
-  format(
-      "default:\n"
-      "  goto handle_unusual;\n");
-  format.Outdent();
-  format("}  // switch\n");
-}
-
-namespace {
-
-std::string FieldParseFunctionName(
-    const TailCallTableInfo::FieldEntryInfo& entry, const Options& options) {
-  const FieldDescriptor* field = entry.field;
-  std::string name = "::_pbi::TcParser::Fast";
-
-  switch (field->type()) {
-    case FieldDescriptor::TYPE_FIXED32:
-    case FieldDescriptor::TYPE_SFIXED32:
-    case FieldDescriptor::TYPE_FLOAT:
-      name.append("F32");
-      break;
-
-    case FieldDescriptor::TYPE_FIXED64:
-    case FieldDescriptor::TYPE_SFIXED64:
-    case FieldDescriptor::TYPE_DOUBLE:
-      name.append("F64");
-      break;
-
-    case FieldDescriptor::TYPE_BOOL:
-      name.append("V8");
-      break;
-    case FieldDescriptor::TYPE_INT32:
-    case FieldDescriptor::TYPE_UINT32:
-      name.append("V32");
-      break;
-    case FieldDescriptor::TYPE_INT64:
-    case FieldDescriptor::TYPE_UINT64:
-      name.append("V64");
-      break;
-
-    case FieldDescriptor::TYPE_ENUM:
-      if (HasPreservingUnknownEnumSemantics(field)) {
-        name.append("V32");
-        break;
-      }
-      if (field->is_repeated() && field->is_packed()) {
-        GOOGLE_LOG(DFATAL) << "Enum validation not handled: " << field->DebugString();
-        return "";
-      }
-      name.append(entry.is_enum_range ? "Er" : "Ev");
-      break;
-
-    case FieldDescriptor::TYPE_SINT32:
-      name.append("Z32");
-      break;
-    case FieldDescriptor::TYPE_SINT64:
-      name.append("Z64");
-      break;
-
-    case FieldDescriptor::TYPE_BYTES:
-      name.append("B");
-      if (IsStringInlined(field, options)) {
-        name.append("i");
-      }
-      break;
-    case FieldDescriptor::TYPE_STRING:
-      switch (GetUtf8CheckMode(field, options)) {
-        case Utf8CheckMode::kNone:
-          name.append("B");
-          break;
-        case Utf8CheckMode::kVerify:
-          name.append("S");
-          break;
-        case Utf8CheckMode::kStrict:
-          name.append("U");
-          break;
-        default:
-          GOOGLE_LOG(DFATAL) << "Mode not handled: "
-                      << static_cast<int>(GetUtf8CheckMode(field, options));
-          return "";
-      }
-      if (IsStringInlined(field, options)) {
-        name.append("i");
-      }
-      break;
-
-    case FieldDescriptor::TYPE_MESSAGE:
-      name.append("M");
-      break;
-    case FieldDescriptor::TYPE_GROUP:
-      name.append("G");
-      break;
-
-    default:
-      GOOGLE_LOG(DFATAL) << "Type not handled: " << field->DebugString();
-      return "";
-  }
-
-  // The field implementation functions are prefixed by cardinality:
-  //   `S` for optional or implicit fields.
-  //   `R` for non-packed repeated.
-  //   `P` for packed repeated.
-  name.append(field->is_packed()               ? "P"
-              : field->is_repeated()           ? "R"
-              : field->real_containing_oneof() ? "O"
-                                               : "S");
-
-  // Append the tag length. Fast parsing only handles 1- or 2-byte tags.
-  name.append(TagSize(field->number()) == 1 ? "1" : "2");
-
-  return name;
-}
-
-}  // namespace
-
-}  // namespace cpp
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/compiler/cpp/parse_function_generator.h b/libs/protobuf/src/google/protobuf/compiler/cpp/parse_function_generator.h
deleted file mode 100644
index 542a15a..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/cpp/parse_function_generator.h
+++ /dev/null
@@ -1,180 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef GOOGLE_PROTOBUF_COMPILER_CPP_PARSE_FUNCTION_GENERATOR_H__
-#define GOOGLE_PROTOBUF_COMPILER_CPP_PARSE_FUNCTION_GENERATOR_H__
-
-#include <map>
-#include <string>
-#include <vector>
-
-#include <google/protobuf/io/printer.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/wire_format_lite.h>
-#include <google/protobuf/compiler/cpp/helpers.h>
-#include <google/protobuf/compiler/cpp/options.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace cpp {
-
-// Helper class for generating tailcall parsing functions.
-struct TailCallTableInfo {
-  TailCallTableInfo(const Descriptor* descriptor, const Options& options,
-                    const std::vector<const FieldDescriptor*>& ordered_fields,
-                    const std::vector<int>& has_bit_indices,
-                    const std::vector<int>& inlined_string_indices,
-                    MessageSCCAnalyzer* scc_analyzer);
-
-  // Fields parsed by the table fast-path.
-  struct FastFieldInfo {
-    std::string func_name;
-    const FieldDescriptor* field;
-    uint16_t coded_tag;
-    uint8_t hasbit_idx;
-    uint8_t aux_idx;
-  };
-  std::vector<FastFieldInfo> fast_path_fields;
-
-  // Fields parsed by mini parsing routines.
-  struct FieldEntryInfo {
-    const FieldDescriptor* field;
-    int hasbit_idx;
-    int inlined_string_idx;
-    uint16_t aux_idx;
-    // True for enums entirely covered by the start/length fields of FieldAux:
-    bool is_enum_range;
-  };
-  std::vector<FieldEntryInfo> field_entries;
-  std::vector<std::string> aux_entries;
-
-  // Fields parsed by generated fallback function.
-  std::vector<const FieldDescriptor*> fallback_fields;
-
-  // Table size.
-  int table_size_log2;
-  // Mask for has-bits of required fields.
-  uint32_t has_hasbits_required_mask;
-  // True if a generated fallback function is required instead of generic.
-  bool use_generated_fallback;
-};
-
-// ParseFunctionGenerator generates the _InternalParse function for a message
-// (and any associated supporting members).
-class ParseFunctionGenerator {
- public:
-  ParseFunctionGenerator(const Descriptor* descriptor, int max_has_bit_index,
-                         const std::vector<int>& has_bit_indices,
-                         const std::vector<int>& inlined_string_indices,
-                         const Options& options,
-                         MessageSCCAnalyzer* scc_analyzer,
-                         const std::map<std::string, std::string>& vars);
-
-  // Emits class-level method declarations to `printer`:
-  void GenerateMethodDecls(io::Printer* printer);
-
-  // Emits out-of-class method implementation definitions to `printer`:
-  void GenerateMethodImpls(io::Printer* printer);
-
-  // Emits class-level data member declarations to `printer`:
-  void GenerateDataDecls(io::Printer* printer);
-
-  // Emits out-of-class data member definitions to `printer`:
-  void GenerateDataDefinitions(io::Printer* printer);
-
- private:
-  // Returns true if tailcall table code should be generated.
-  bool should_generate_tctable() const;
-
-  // Returns true if tailcall table code should be generated, but inside an
-  // #ifdef guard.
-  bool should_generate_guarded_tctable() const {
-    return should_generate_tctable() &&
-           options_.tctable_mode == Options::kTCTableGuarded;
-  }
-
-  // Generates a tail-calling `_InternalParse` function.
-  void GenerateTailcallParseFunction(Formatter& format);
-
-  // Generates a fallback function for tailcall table-based parsing.
-  void GenerateTailcallFallbackFunction(Formatter& format);
-
-  // Generates a looping `_InternalParse` function.
-  void GenerateLoopingParseFunction(Formatter& format);
-
-  // Generates the tail-call table definition.
-  void GenerateTailCallTable(Formatter& format);
-  void GenerateFastFieldEntries(Formatter& format);
-  void GenerateFieldEntries(Formatter& format);
-  int CalculateFieldNamesSize() const;
-  void GenerateFieldNames(Formatter& format);
-
-  // Generates parsing code for an `ArenaString` field.
-  void GenerateArenaString(Formatter& format, const FieldDescriptor* field);
-
-  // Generates parsing code for a string-typed field.
-  void GenerateStrings(Formatter& format, const FieldDescriptor* field,
-                       bool check_utf8);
-
-  // Generates parsing code for a length-delimited field (strings, messages,
-  // etc.).
-  void GenerateLengthDelim(Formatter& format, const FieldDescriptor* field);
-
-  // Generates the parsing code for a known field.
-  void GenerateFieldBody(Formatter& format,
-                         google::protobuf::internal::WireFormatLite::WireType wiretype,
-                         const FieldDescriptor* field);
-
-  // Generates code to parse the next field from the input stream.
-  void GenerateParseIterationBody(
-      Formatter& format, const Descriptor* descriptor,
-      const std::vector<const FieldDescriptor*>& fields);
-
-  // Generates a `switch` statement to parse each of `fields`.
-  void GenerateFieldSwitch(Formatter& format,
-                           const std::vector<const FieldDescriptor*>& fields);
-
-  const Descriptor* descriptor_;
-  MessageSCCAnalyzer* scc_analyzer_;
-  const Options& options_;
-  std::map<std::string, std::string> variables_;
-  std::unique_ptr<TailCallTableInfo> tc_table_info_;
-  std::vector<int> inlined_string_indices_;
-  const std::vector<const FieldDescriptor*> ordered_fields_;
-  int num_hasbits_;
-};
-
-}  // namespace cpp
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // GOOGLE_PROTOBUF_COMPILER_CPP_PARSE_FUNCTION_GENERATOR_H__
diff --git a/libs/protobuf/src/google/protobuf/compiler/cpp/plugin_unittest.cc b/libs/protobuf/src/google/protobuf/compiler/cpp/plugin_unittest.cc
deleted file mode 100644
index f023dcf..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/cpp/plugin_unittest.cc
+++ /dev/null
@@ -1,235 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//
-// TODO(kenton):  Share code with the versions of this test in other languages?
-//   It seemed like parameterizing it would add more complexity than it is
-//   worth.
-
-#include <memory>
-
-#include <google/protobuf/testing/file.h>
-#include <google/protobuf/testing/file.h>
-#include <google/protobuf/compiler/cpp/generator.h>
-#include <google/protobuf/compiler/command_line_interface.h>
-#include <google/protobuf/io/printer.h>
-#include <google/protobuf/io/zero_copy_stream.h>
-#include <google/protobuf/testing/googletest.h>
-#include <gtest/gtest.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace cpp {
-namespace {
-
-class TestGenerator : public CodeGenerator {
- public:
-  TestGenerator() {}
-  ~TestGenerator() override {}
-
-  bool Generate(const FileDescriptor* file, const std::string& parameter,
-                GeneratorContext* context, std::string* error) const override {
-    TryInsert("test.pb.h", "includes", context);
-    TryInsert("test.pb.h", "namespace_scope", context);
-    TryInsert("test.pb.h", "global_scope", context);
-    TryInsert("test.pb.h", "class_scope:foo.Bar", context);
-    TryInsert("test.pb.h", "class_scope:foo.Bar.Baz", context);
-
-    TryInsert("test.pb.cc", "includes", context);
-    TryInsert("test.pb.cc", "namespace_scope", context);
-    TryInsert("test.pb.cc", "global_scope", context);
-
-    // Check field accessors for an optional int32:
-    TryInsert("test.pb.h", "field_get:foo.Bar.optInt", context);
-    TryInsert("test.pb.h", "field_set:foo.Bar.optInt", context);
-
-    // Check field accessors for a repeated int32:
-    TryInsert("test.pb.h", "field_get:foo.Bar.repeatedInt", context);
-    TryInsert("test.pb.h", "field_set:foo.Bar.repeatedInt", context);
-
-    // Check field accessors for a required string:
-    TryInsert("test.pb.h", "field_get:foo.Bar.requiredString", context);
-    TryInsert("test.pb.h", "field_set:foo.Bar.requiredString", context);
-    TryInsert("test.pb.h", "field_mutable:foo.Bar.requiredString", context);
-    TryInsert("test.pb.h", "field_set_allocated:foo.Bar.requiredString",
-              context);
-
-    // Check field accessors for a repeated string:
-    TryInsert("test.pb.h", "field_get:foo.Bar.repeatedString", context);
-    TryInsert("test.pb.h", "field_set:foo.Bar.repeatedString", context);
-    TryInsert("test.pb.h", "field_set_char:foo.Bar.repeatedString", context);
-    TryInsert("test.pb.h", "field_set_pointer:foo.Bar.repeatedString", context);
-    TryInsert("test.pb.h", "field_mutable:foo.Bar.repeatedString", context);
-    TryInsert("test.pb.h", "field_set_char:foo.Bar.repeatedString", context);
-    TryInsert("test.pb.h", "field_set_pointer:foo.Bar.repeatedString", context);
-
-    // Check field accessors for an int inside oneof{}:
-    TryInsert("test.pb.h", "field_get:foo.Bar.oneOfInt", context);
-    TryInsert("test.pb.h", "field_set:foo.Bar.oneOfInt", context);
-
-    // Check field accessors for a string inside oneof{}:
-    TryInsert("test.pb.h", "field_get:foo.Bar.oneOfString", context);
-    TryInsert("test.pb.h", "field_set:foo.Bar.oneOfString", context);
-    TryInsert("test.pb.h", "field_mutable:foo.Bar.oneOfString", context);
-    TryInsert("test.pb.h", "field_set_allocated:foo.Bar.oneOfString", context);
-
-    // Check field accessors for an optional message:
-    TryInsert("test.pb.h", "field_get:foo.Bar.optMessage", context);
-    TryInsert("test.pb.h", "field_mutable:foo.Bar.optMessage", context);
-    TryInsert("test.pb.h", "field_set_allocated:foo.Bar.optMessage", context);
-
-    // Check field accessors for a repeated message:
-    TryInsert("test.pb.h", "field_add:foo.Bar.repeatedMessage", context);
-    TryInsert("test.pb.h", "field_get:foo.Bar.repeatedMessage", context);
-    TryInsert("test.pb.h", "field_list:foo.Bar.repeatedMessage", context);
-    TryInsert("test.pb.h", "field_mutable:foo.Bar.repeatedMessage", context);
-    TryInsert("test.pb.h", "field_mutable_list:foo.Bar.repeatedMessage",
-              context);
-
-    // Check field accessors for a message inside oneof{}:
-    TryInsert("test.pb.h", "field_get:foo.Bar.oneOfMessage", context);
-    TryInsert("test.pb.h", "field_mutable:foo.Bar.oneOfMessage", context);
-    TryInsert("test.pb.cc", "field_set_allocated:foo.Bar.oneOfMessage",
-              context);
-
-    // Check field accessors for an optional enum:
-    TryInsert("test.pb.h", "field_get:foo.Bar.optEnum", context);
-    TryInsert("test.pb.h", "field_set:foo.Bar.optEnum", context);
-
-    // Check field accessors for a repeated enum:
-    TryInsert("test.pb.h", "field_get:foo.Bar.repeatedEnum", context);
-    TryInsert("test.pb.h", "field_set:foo.Bar.repeatedEnum", context);
-    TryInsert("test.pb.h", "field_add:foo.Bar.repeatedEnum", context);
-    TryInsert("test.pb.h", "field_list:foo.Bar.repeatedEnum", context);
-    TryInsert("test.pb.h", "field_mutable_list:foo.Bar.repeatedEnum", context);
-
-    // Check field accessors for an enum inside oneof{}:
-    TryInsert("test.pb.h", "field_get:foo.Bar.oneOfEnum", context);
-    TryInsert("test.pb.h", "field_set:foo.Bar.oneOfEnum", context);
-
-    // Check field accessors for a required cord:
-    TryInsert("test.pb.h", "field_get:foo.Bar.requiredCord", context);
-    TryInsert("test.pb.h", "field_set:foo.Bar.requiredCord", context);
-    TryInsert("test.pb.h", "field_mutable:foo.Bar.requiredCord", context);
-
-    // Check field accessors for a repeated cord:
-    TryInsert("test.pb.h", "field_get:foo.Bar.repeatedCord", context);
-    TryInsert("test.pb.h", "field_set:foo.Bar.repeatedCord", context);
-    TryInsert("test.pb.h", "field_add:foo.Bar.repeatedCord", context);
-    TryInsert("test.pb.h", "field_list:foo.Bar.repeatedCord", context);
-    TryInsert("test.pb.h", "field_mutable:foo.Bar.repeatedCord", context);
-    TryInsert("test.pb.h", "field_mutable_list:foo.Bar.repeatedCord", context);
-
-    // Check field accessors for a cord inside oneof{}:
-    TryInsert("test.pb.h", "field_get:foo.Bar.oneOfCord", context);
-    TryInsert("test.pb.h", "field_set:foo.Bar.oneOfCord", context);
-    TryInsert("test.pb.h", "field_mutable:foo.Bar.oneOfCord", context);
-
-    return true;
-  }
-
-  void TryInsert(const std::string& filename,
-                 const std::string& insertion_point,
-                 GeneratorContext* context) const {
-    std::unique_ptr<io::ZeroCopyOutputStream> output(
-        context->OpenForInsert(filename, insertion_point));
-    io::Printer printer(output.get(), '$');
-    printer.Print("// inserted $name$\n", "name", insertion_point);
-  }
-};
-
-// This test verifies that all the expected insertion points exist.  It does
-// not verify that they are correctly-placed; that would require actually
-// compiling the output which is a bit more than I care to do for this test.
-TEST(CppPluginTest, PluginTest) {
-  GOOGLE_CHECK_OK(File::SetContents(TestTempDir() + "/test.proto",
-                             "syntax = \"proto2\";\n"
-                             "package foo;\n"
-                             "\n"
-                             "enum Thud { VALUE = 0; }\n"
-                             "\n"
-                             "message Bar {\n"
-                             "  message Baz {}\n"
-                             "  optional int32 optInt = 1;\n"
-                             "  repeated int32 repeatedInt = 2;\n"
-                             "\n"
-                             "  required string requiredString = 3;\n"
-                             "  repeated string repeatedString = 4;\n"
-                             "\n"
-                             "  optional Baz optMessage = 6;\n"
-                             "  repeated Baz repeatedMessage = 7;\n"
-                             "\n"
-                             "  optional Thud optEnum = 8;\n"
-                             "  repeated Thud repeatedEnum = 9;\n"
-                             "\n"
-                             "  required string requiredCord = 10 [\n"
-                             "    ctype = CORD\n"
-                             "  ];\n"
-                             "  repeated string repeatedCord = 11 [\n"
-                             "    ctype = CORD\n"
-                             "  ];\n"
-                             "\n"
-                             "  oneof Moo {\n"
-                             "    int64 oneOfInt = 20;\n"
-                             "    string oneOfString = 21;\n"
-                             "    Baz oneOfMessage = 22;\n"
-                             "    Thud oneOfEnum = 23;"
-                             "    string oneOfCord = 24 [\n"
-                             "      ctype = CORD\n"
-                             "    ];\n"
-                             "  }\n"
-                             "}\n",
-                             true));
-
-  CommandLineInterface cli;
-  cli.SetInputsAreProtoPathRelative(true);
-
-  CppGenerator cpp_generator;
-  TestGenerator test_generator;
-  cli.RegisterGenerator("--cpp_out", &cpp_generator, "");
-  cli.RegisterGenerator("--test_out", &test_generator, "");
-
-  std::string proto_path = "-I" + TestTempDir();
-  std::string cpp_out = "--cpp_out=" + TestTempDir();
-  std::string test_out = "--test_out=" + TestTempDir();
-
-  const char* argv[] = {"protoc", proto_path.c_str(), cpp_out.c_str(),
-                        test_out.c_str(), "test.proto"};
-
-  EXPECT_EQ(0, cli.Run(5, argv));
-}
-
-}  // namespace
-}  // namespace cpp
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/compiler/cpp/primitive_field.cc b/libs/protobuf/src/google/protobuf/compiler/cpp/primitive_field.cc
deleted file mode 100644
index 6c92ede..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/cpp/primitive_field.cc
+++ /dev/null
@@ -1,539 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-
-#include <google/protobuf/compiler/cpp/primitive_field.h>
-
-#include <google/protobuf/io/printer.h>
-#include <google/protobuf/wire_format.h>
-#include <google/protobuf/stubs/strutil.h>
-#include <google/protobuf/compiler/cpp/helpers.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace cpp {
-
-using internal::WireFormatLite;
-
-namespace {
-
-// For encodings with fixed sizes, returns that size in bytes.  Otherwise
-// returns -1.
-int FixedSize(FieldDescriptor::Type type) {
-  switch (type) {
-    case FieldDescriptor::TYPE_INT32:
-      return -1;
-    case FieldDescriptor::TYPE_INT64:
-      return -1;
-    case FieldDescriptor::TYPE_UINT32:
-      return -1;
-    case FieldDescriptor::TYPE_UINT64:
-      return -1;
-    case FieldDescriptor::TYPE_SINT32:
-      return -1;
-    case FieldDescriptor::TYPE_SINT64:
-      return -1;
-    case FieldDescriptor::TYPE_FIXED32:
-      return WireFormatLite::kFixed32Size;
-    case FieldDescriptor::TYPE_FIXED64:
-      return WireFormatLite::kFixed64Size;
-    case FieldDescriptor::TYPE_SFIXED32:
-      return WireFormatLite::kSFixed32Size;
-    case FieldDescriptor::TYPE_SFIXED64:
-      return WireFormatLite::kSFixed64Size;
-    case FieldDescriptor::TYPE_FLOAT:
-      return WireFormatLite::kFloatSize;
-    case FieldDescriptor::TYPE_DOUBLE:
-      return WireFormatLite::kDoubleSize;
-
-    case FieldDescriptor::TYPE_BOOL:
-      return WireFormatLite::kBoolSize;
-    case FieldDescriptor::TYPE_ENUM:
-      return -1;
-
-    case FieldDescriptor::TYPE_STRING:
-      return -1;
-    case FieldDescriptor::TYPE_BYTES:
-      return -1;
-    case FieldDescriptor::TYPE_GROUP:
-      return -1;
-    case FieldDescriptor::TYPE_MESSAGE:
-      return -1;
-
-      // No default because we want the compiler to complain if any new
-      // types are added.
-  }
-  GOOGLE_LOG(FATAL) << "Can't get here.";
-  return -1;
-}
-
-void SetPrimitiveVariables(const FieldDescriptor* descriptor,
-                           std::map<std::string, std::string>* variables,
-                           const Options& options) {
-  SetCommonFieldVariables(descriptor, variables, options);
-  (*variables)["type"] = PrimitiveTypeName(options, descriptor->cpp_type());
-  (*variables)["default"] = DefaultValue(options, descriptor);
-  (*variables)["cached_byte_size_name"] = MakeVarintCachedSizeName(descriptor);
-  bool cold = ShouldSplit(descriptor, options);
-  (*variables)["cached_byte_size_field"] =
-      MakeVarintCachedSizeFieldName(descriptor, cold);
-  (*variables)["tag"] = StrCat(internal::WireFormat::MakeTag(descriptor));
-  int fixed_size = FixedSize(descriptor->type());
-  if (fixed_size != -1) {
-    (*variables)["fixed_size"] = StrCat(fixed_size);
-  }
-  (*variables)["wire_format_field_type"] = FieldDescriptorProto_Type_Name(
-      static_cast<FieldDescriptorProto_Type>(descriptor->type()));
-  (*variables)["full_name"] = descriptor->full_name();
-}
-
-}  // namespace
-
-// ===================================================================
-
-PrimitiveFieldGenerator::PrimitiveFieldGenerator(
-    const FieldDescriptor* descriptor, const Options& options)
-    : FieldGenerator(descriptor, options) {
-  SetPrimitiveVariables(descriptor, &variables_, options);
-}
-
-PrimitiveFieldGenerator::~PrimitiveFieldGenerator() {}
-
-void PrimitiveFieldGenerator::GeneratePrivateMembers(
-    io::Printer* printer) const {
-  Formatter format(printer, variables_);
-  format("$type$ $name$_;\n");
-}
-
-void PrimitiveFieldGenerator::GenerateAccessorDeclarations(
-    io::Printer* printer) const {
-  Formatter format(printer, variables_);
-  format(
-      "$deprecated_attr$$type$ ${1$$name$$}$() const;\n"
-      "$deprecated_attr$void ${1$set_$name$$}$($type$ value);\n"
-      "private:\n"
-      "$type$ ${1$_internal_$name$$}$() const;\n"
-      "void ${1$_internal_set_$name$$}$($type$ value);\n"
-      "public:\n",
-      descriptor_);
-}
-
-void PrimitiveFieldGenerator::GenerateInlineAccessorDefinitions(
-    io::Printer* printer) const {
-  Formatter format(printer, variables_);
-  format(
-      "inline $type$ $classname$::_internal_$name$() const {\n"
-      "  return $field$;\n"
-      "}\n"
-      "inline $type$ $classname$::$name$() const {\n"
-      "$annotate_get$"
-      "  // @@protoc_insertion_point(field_get:$full_name$)\n"
-      "  return _internal_$name$();\n"
-      "}\n"
-      "inline void $classname$::_internal_set_$name$($type$ value) {\n"
-      "  $set_hasbit$\n"
-      "  $field$ = value;\n"
-      "}\n"
-      "inline void $classname$::set_$name$($type$ value) {\n"
-      "$maybe_prepare_split_message$"
-      "  _internal_set_$name$(value);\n"
-      "$annotate_set$"
-      "  // @@protoc_insertion_point(field_set:$full_name$)\n"
-      "}\n");
-}
-
-void PrimitiveFieldGenerator::GenerateClearingCode(io::Printer* printer) const {
-  Formatter format(printer, variables_);
-  format("$field$ = $default$;\n");
-}
-
-void PrimitiveFieldGenerator::GenerateMergingCode(io::Printer* printer) const {
-  Formatter format(printer, variables_);
-  format("_this->_internal_set_$name$(from._internal_$name$());\n");
-}
-
-void PrimitiveFieldGenerator::GenerateSwappingCode(io::Printer* printer) const {
-  Formatter format(printer, variables_);
-  format("swap($field$, other->$field$);\n");
-}
-
-void PrimitiveFieldGenerator::GenerateCopyConstructorCode(
-    io::Printer* printer) const {
-  Formatter format(printer, variables_);
-  format("_this->$field$ = from.$field$;\n");
-}
-
-void PrimitiveFieldGenerator::GenerateSerializeWithCachedSizesToArray(
-    io::Printer* printer) const {
-  Formatter format(printer, variables_);
-  format(
-      "target = stream->EnsureSpace(target);\n"
-      "target = "
-      "::_pbi::WireFormatLite::Write$declared_type$ToArray("
-      "$number$, this->_internal_$name$(), target);\n");
-}
-
-void PrimitiveFieldGenerator::GenerateByteSize(io::Printer* printer) const {
-  Formatter format(printer, variables_);
-  int fixed_size = FixedSize(descriptor_->type());
-  if (fixed_size == -1) {
-    if (internal::WireFormat::TagSize(descriptor_->number(),
-                                      descriptor_->type()) == 1) {
-      // Adding one is very common and it turns out it can be done for
-      // free inside of WireFormatLite, so we can save an instruction here.
-      format(
-          "total_size += ::_pbi::WireFormatLite::"
-          "$declared_type$SizePlusOne(this->_internal_$name$());\n");
-    } else {
-      format(
-          "total_size += $tag_size$ +\n"
-          "  ::_pbi::WireFormatLite::$declared_type$Size(\n"
-          "    this->_internal_$name$());\n");
-    }
-  } else {
-    format("total_size += $tag_size$ + $fixed_size$;\n");
-  }
-}
-
-void PrimitiveFieldGenerator::GenerateConstexprAggregateInitializer(
-    io::Printer* printer) const {
-  Formatter format(printer, variables_);
-  format("/*decltype($field$)*/$default$");
-}
-
-void PrimitiveFieldGenerator::GenerateAggregateInitializer(
-    io::Printer* printer) const {
-  Formatter format(printer, variables_);
-  if (ShouldSplit(descriptor_, options_)) {
-    format("decltype(Impl_::Split::$name$_){$default$}");
-    return;
-  }
-  format("decltype($field$){$default$}");
-}
-
-void PrimitiveFieldGenerator::GenerateCopyAggregateInitializer(
-    io::Printer* printer) const {
-  Formatter format(printer, variables_);
-  format("decltype($field$){}");
-}
-
-// ===================================================================
-
-PrimitiveOneofFieldGenerator::PrimitiveOneofFieldGenerator(
-    const FieldDescriptor* descriptor, const Options& options)
-    : PrimitiveFieldGenerator(descriptor, options) {
-  SetCommonOneofFieldVariables(descriptor, &variables_);
-}
-
-PrimitiveOneofFieldGenerator::~PrimitiveOneofFieldGenerator() {}
-
-void PrimitiveOneofFieldGenerator::GenerateInlineAccessorDefinitions(
-    io::Printer* printer) const {
-  Formatter format(printer, variables_);
-  format(
-      "inline $type$ $classname$::_internal_$name$() const {\n"
-      "  if (_internal_has_$name$()) {\n"
-      "    return $field$;\n"
-      "  }\n"
-      "  return $default$;\n"
-      "}\n"
-      "inline void $classname$::_internal_set_$name$($type$ value) {\n"
-      "  if (!_internal_has_$name$()) {\n"
-      "    clear_$oneof_name$();\n"
-      "    set_has_$name$();\n"
-      "  }\n"
-      "  $field$ = value;\n"
-      "}\n"
-      "inline $type$ $classname$::$name$() const {\n"
-      "$annotate_get$"
-      "  // @@protoc_insertion_point(field_get:$full_name$)\n"
-      "  return _internal_$name$();\n"
-      "}\n"
-      "inline void $classname$::set_$name$($type$ value) {\n"
-      "  _internal_set_$name$(value);\n"
-      "$annotate_set$"
-      "  // @@protoc_insertion_point(field_set:$full_name$)\n"
-      "}\n");
-}
-
-void PrimitiveOneofFieldGenerator::GenerateClearingCode(
-    io::Printer* printer) const {
-  Formatter format(printer, variables_);
-  format("$field$ = $default$;\n");
-}
-
-void PrimitiveOneofFieldGenerator::GenerateSwappingCode(
-    io::Printer* printer) const {
-  // Don't print any swapping code. Swapping the union will swap this field.
-}
-
-void PrimitiveOneofFieldGenerator::GenerateConstructorCode(
-    io::Printer* printer) const {
-  Formatter format(printer, variables_);
-  format("$ns$::_$classname$_default_instance_.$field$ = $default$;\n");
-}
-
-// ===================================================================
-
-RepeatedPrimitiveFieldGenerator::RepeatedPrimitiveFieldGenerator(
-    const FieldDescriptor* descriptor, const Options& options)
-    : FieldGenerator(descriptor, options) {
-  SetPrimitiveVariables(descriptor, &variables_, options);
-
-  if (descriptor->is_packed()) {
-    variables_["packed_reader"] = "ReadPackedPrimitive";
-    variables_["repeated_reader"] = "ReadRepeatedPrimitiveNoInline";
-  } else {
-    variables_["packed_reader"] = "ReadPackedPrimitiveNoInline";
-    variables_["repeated_reader"] = "ReadRepeatedPrimitive";
-  }
-}
-
-RepeatedPrimitiveFieldGenerator::~RepeatedPrimitiveFieldGenerator() {}
-
-void RepeatedPrimitiveFieldGenerator::GeneratePrivateMembers(
-    io::Printer* printer) const {
-  Formatter format(printer, variables_);
-  format("::$proto_ns$::RepeatedField< $type$ > $name$_;\n");
-  if (descriptor_->is_packed() && FixedSize(descriptor_->type()) == -1 &&
-      HasGeneratedMethods(descriptor_->file(), options_)) {
-    format("mutable std::atomic<int> $cached_byte_size_name$;\n");
-  }
-}
-
-void RepeatedPrimitiveFieldGenerator::GenerateAccessorDeclarations(
-    io::Printer* printer) const {
-  Formatter format(printer, variables_);
-  format(
-      "private:\n"
-      "$type$ ${1$_internal_$name$$}$(int index) const;\n"
-      "const ::$proto_ns$::RepeatedField< $type$ >&\n"
-      "    ${1$_internal_$name$$}$() const;\n"
-      "void ${1$_internal_add_$name$$}$($type$ value);\n"
-      "::$proto_ns$::RepeatedField< $type$ >*\n"
-      "    ${1$_internal_mutable_$name$$}$();\n"
-      "public:\n"
-      "$deprecated_attr$$type$ ${1$$name$$}$(int index) const;\n"
-      "$deprecated_attr$void ${1$set_$name$$}$(int index, $type$ value);\n"
-      "$deprecated_attr$void ${1$add_$name$$}$($type$ value);\n"
-      "$deprecated_attr$const ::$proto_ns$::RepeatedField< $type$ >&\n"
-      "    ${1$$name$$}$() const;\n"
-      "$deprecated_attr$::$proto_ns$::RepeatedField< $type$ >*\n"
-      "    ${1$mutable_$name$$}$();\n",
-      descriptor_);
-}
-
-void RepeatedPrimitiveFieldGenerator::GenerateInlineAccessorDefinitions(
-    io::Printer* printer) const {
-  Formatter format(printer, variables_);
-  format(
-      "inline $type$ $classname$::_internal_$name$(int index) const {\n"
-      "  return $field$.Get(index);\n"
-      "}\n"
-      "inline $type$ $classname$::$name$(int index) const {\n"
-      "$annotate_get$"
-      "  // @@protoc_insertion_point(field_get:$full_name$)\n"
-      "  return _internal_$name$(index);\n"
-      "}\n"
-      "inline void $classname$::set_$name$(int index, $type$ value) {\n"
-      "$annotate_set$"
-      "  $field$.Set(index, value);\n"
-      "  // @@protoc_insertion_point(field_set:$full_name$)\n"
-      "}\n"
-      "inline void $classname$::_internal_add_$name$($type$ value) {\n"
-      "  $field$.Add(value);\n"
-      "}\n"
-      "inline void $classname$::add_$name$($type$ value) {\n"
-      "  _internal_add_$name$(value);\n"
-      "$annotate_add$"
-      "  // @@protoc_insertion_point(field_add:$full_name$)\n"
-      "}\n"
-      "inline const ::$proto_ns$::RepeatedField< $type$ >&\n"
-      "$classname$::_internal_$name$() const {\n"
-      "  return $field$;\n"
-      "}\n"
-      "inline const ::$proto_ns$::RepeatedField< $type$ >&\n"
-      "$classname$::$name$() const {\n"
-      "$annotate_list$"
-      "  // @@protoc_insertion_point(field_list:$full_name$)\n"
-      "  return _internal_$name$();\n"
-      "}\n"
-      "inline ::$proto_ns$::RepeatedField< $type$ >*\n"
-      "$classname$::_internal_mutable_$name$() {\n"
-      "  return &$field$;\n"
-      "}\n"
-      "inline ::$proto_ns$::RepeatedField< $type$ >*\n"
-      "$classname$::mutable_$name$() {\n"
-      "$annotate_mutable_list$"
-      "  // @@protoc_insertion_point(field_mutable_list:$full_name$)\n"
-      "  return _internal_mutable_$name$();\n"
-      "}\n");
-}
-
-void RepeatedPrimitiveFieldGenerator::GenerateClearingCode(
-    io::Printer* printer) const {
-  Formatter format(printer, variables_);
-  format("$field$.Clear();\n");
-}
-
-void RepeatedPrimitiveFieldGenerator::GenerateMergingCode(
-    io::Printer* printer) const {
-  Formatter format(printer, variables_);
-  format("_this->$field$.MergeFrom(from.$field$);\n");
-}
-
-void RepeatedPrimitiveFieldGenerator::GenerateSwappingCode(
-    io::Printer* printer) const {
-  Formatter format(printer, variables_);
-  format("$field$.InternalSwap(&other->$field$);\n");
-}
-
-void RepeatedPrimitiveFieldGenerator::GenerateDestructorCode(
-    io::Printer* printer) const {
-  Formatter format(printer, variables_);
-  format("$field$.~RepeatedField();\n");
-}
-
-void RepeatedPrimitiveFieldGenerator::GenerateSerializeWithCachedSizesToArray(
-    io::Printer* printer) const {
-  Formatter format(printer, variables_);
-  if (descriptor_->is_packed()) {
-    if (FixedSize(descriptor_->type()) == -1) {
-      format(
-          "{\n"
-          "  int byte_size = "
-          "$cached_byte_size_field$.load(std::memory_order_relaxed);\n"
-          "  if (byte_size > 0) {\n"
-          "    target = stream->Write$declared_type$Packed(\n"
-          "        $number$, _internal_$name$(), byte_size, target);\n"
-          "  }\n"
-          "}\n");
-    } else {
-      format(
-          "if (this->_internal_$name$_size() > 0) {\n"
-          "  target = stream->WriteFixedPacked($number$, _internal_$name$(), "
-          "target);\n"
-          "}\n");
-    }
-  } else {
-    format(
-        "for (int i = 0, n = this->_internal_$name$_size(); i < n; i++) {\n"
-        "  target = stream->EnsureSpace(target);\n"
-        "  target = ::_pbi::WireFormatLite::"
-        "Write$declared_type$ToArray($number$, this->_internal_$name$(i), "
-        "target);\n"
-        "}\n");
-  }
-}
-
-void RepeatedPrimitiveFieldGenerator::GenerateByteSize(
-    io::Printer* printer) const {
-  Formatter format(printer, variables_);
-  format("{\n");
-  format.Indent();
-  int fixed_size = FixedSize(descriptor_->type());
-  if (fixed_size == -1) {
-    format(
-        "size_t data_size = ::_pbi::WireFormatLite::\n"
-        "  $declared_type$Size(this->$field$);\n");
-  } else {
-    format(
-        "unsigned int count = static_cast<unsigned "
-        "int>(this->_internal_$name$_size());\n"
-        "size_t data_size = $fixed_size$UL * count;\n");
-  }
-
-  if (descriptor_->is_packed()) {
-    format(
-        "if (data_size > 0) {\n"
-        "  total_size += $tag_size$ +\n"
-        "    "
-        "::_pbi::WireFormatLite::Int32Size(static_cast<$int32$>(data_size));\n"
-        "}\n");
-    if (FixedSize(descriptor_->type()) == -1) {
-      format(
-          "int cached_size = ::_pbi::ToCachedSize(data_size);\n"
-          "$cached_byte_size_field$.store(cached_size,\n"
-          "                                std::memory_order_relaxed);\n");
-    }
-    format("total_size += data_size;\n");
-  } else {
-    format(
-        "total_size += $tag_size$ *\n"
-        "              "
-        "::_pbi::FromIntSize(this->_internal_$name$_size());\n"
-        "total_size += data_size;\n");
-  }
-  format.Outdent();
-  format("}\n");
-}
-
-void RepeatedPrimitiveFieldGenerator::GenerateConstexprAggregateInitializer(
-    io::Printer* printer) const {
-  Formatter format(printer, variables_);
-  format("/*decltype($field$)*/{}");
-  if (descriptor_->is_packed() && FixedSize(descriptor_->type()) == -1 &&
-      HasGeneratedMethods(descriptor_->file(), options_)) {
-    format("\n, /*decltype($cached_byte_size_field$)*/{0}");
-  }
-}
-
-void RepeatedPrimitiveFieldGenerator::GenerateAggregateInitializer(
-    io::Printer* printer) const {
-  Formatter format(printer, variables_);
-  format("decltype($field$){arena}");
-  if (descriptor_->is_packed() && FixedSize(descriptor_->type()) == -1 &&
-      HasGeneratedMethods(descriptor_->file(), options_)) {
-    // std::atomic has no move constructor, which prevents explicit aggregate
-    // initialization pre-C++17.
-    format("\n, /*decltype($cached_byte_size_field$)*/{0}");
-  }
-}
-
-void RepeatedPrimitiveFieldGenerator::GenerateCopyAggregateInitializer(
-    io::Printer* printer) const {
-
-  Formatter format(printer, variables_);
-  format("decltype($field$){from.$field$}");
-  if (descriptor_->is_packed() && FixedSize(descriptor_->type()) == -1 &&
-      HasGeneratedMethods(descriptor_->file(), options_)) {
-    // std::atomic has no move constructor.
-    format("\n, /*decltype($cached_byte_size_field$)*/{0}");
-  }
-}
-
-}  // namespace cpp
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/compiler/cpp/primitive_field.h b/libs/protobuf/src/google/protobuf/compiler/cpp/primitive_field.h
deleted file mode 100644
index bb8a08a..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/cpp/primitive_field.h
+++ /dev/null
@@ -1,126 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-
-#ifndef GOOGLE_PROTOBUF_COMPILER_CPP_PRIMITIVE_FIELD_H__
-#define GOOGLE_PROTOBUF_COMPILER_CPP_PRIMITIVE_FIELD_H__
-
-#include <map>
-#include <string>
-
-#include <google/protobuf/compiler/cpp/field.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace cpp {
-
-class PrimitiveFieldGenerator : public FieldGenerator {
- public:
-  PrimitiveFieldGenerator(const FieldDescriptor* descriptor,
-                          const Options& options);
-  ~PrimitiveFieldGenerator() override;
-
-  // implements FieldGenerator ---------------------------------------
-  void GeneratePrivateMembers(io::Printer* printer) const override;
-  void GenerateAccessorDeclarations(io::Printer* printer) const override;
-  void GenerateInlineAccessorDefinitions(io::Printer* printer) const override;
-  void GenerateClearingCode(io::Printer* printer) const override;
-  void GenerateMergingCode(io::Printer* printer) const override;
-  void GenerateSwappingCode(io::Printer* printer) const override;
-  void GenerateConstructorCode(io::Printer* printer) const override {}
-  void GenerateCopyConstructorCode(io::Printer* printer) const override;
-  void GenerateSerializeWithCachedSizesToArray(
-      io::Printer* printer) const override;
-  void GenerateByteSize(io::Printer* printer) const override;
-  void GenerateConstexprAggregateInitializer(
-      io::Printer* printer) const override;
-  void GenerateAggregateInitializer(io::Printer* printer) const override;
-  void GenerateCopyAggregateInitializer(io::Printer* printer) const override;
-
- private:
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(PrimitiveFieldGenerator);
-};
-
-class PrimitiveOneofFieldGenerator : public PrimitiveFieldGenerator {
- public:
-  PrimitiveOneofFieldGenerator(const FieldDescriptor* descriptor,
-                               const Options& options);
-  ~PrimitiveOneofFieldGenerator() override;
-
-  // implements FieldGenerator ---------------------------------------
-  void GenerateInlineAccessorDefinitions(io::Printer* printer) const override;
-  void GenerateClearingCode(io::Printer* printer) const override;
-  void GenerateSwappingCode(io::Printer* printer) const override;
-  void GenerateConstructorCode(io::Printer* printer) const override;
-
- private:
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(PrimitiveOneofFieldGenerator);
-};
-
-class RepeatedPrimitiveFieldGenerator : public FieldGenerator {
- public:
-  RepeatedPrimitiveFieldGenerator(const FieldDescriptor* descriptor,
-                                  const Options& options);
-  ~RepeatedPrimitiveFieldGenerator() override;
-
-  // implements FieldGenerator ---------------------------------------
-  void GeneratePrivateMembers(io::Printer* printer) const override;
-  void GenerateAccessorDeclarations(io::Printer* printer) const override;
-  void GenerateInlineAccessorDefinitions(io::Printer* printer) const override;
-  void GenerateClearingCode(io::Printer* printer) const override;
-  void GenerateMergingCode(io::Printer* printer) const override;
-  void GenerateSwappingCode(io::Printer* printer) const override;
-  void GenerateConstructorCode(io::Printer* printer) const override {}
-  void GenerateCopyConstructorCode(io::Printer*  /*printer*/) const override {
-    GOOGLE_CHECK(!ShouldSplit(descriptor_, options_));
-  }
-  void GenerateDestructorCode(io::Printer* printer) const override;
-  void GenerateSerializeWithCachedSizesToArray(
-      io::Printer* printer) const override;
-  void GenerateByteSize(io::Printer* printer) const override;
-  void GenerateConstexprAggregateInitializer(
-      io::Printer* printer) const override;
-  void GenerateAggregateInitializer(io::Printer* printer) const override;
-  void GenerateCopyAggregateInitializer(io::Printer* printer) const override;
-
- private:
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(RepeatedPrimitiveFieldGenerator);
-};
-
-}  // namespace cpp
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // GOOGLE_PROTOBUF_COMPILER_CPP_PRIMITIVE_FIELD_H__
diff --git a/libs/protobuf/src/google/protobuf/compiler/cpp/service.cc b/libs/protobuf/src/google/protobuf/compiler/cpp/service.cc
deleted file mode 100644
index 7a0d480..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/cpp/service.cc
+++ /dev/null
@@ -1,328 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-
-#include <google/protobuf/compiler/cpp/service.h>
-
-#include <google/protobuf/io/printer.h>
-#include <google/protobuf/stubs/strutil.h>
-#include <google/protobuf/compiler/cpp/helpers.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace cpp {
-
-namespace {
-
-void InitMethodVariables(const MethodDescriptor* method, const Options& options,
-                         Formatter* format) {
-  format->Set("name", method->name());
-  format->Set("input_type", QualifiedClassName(method->input_type(), options));
-  format->Set("output_type",
-              QualifiedClassName(method->output_type(), options));
-}
-
-}  // namespace
-
-ServiceGenerator::ServiceGenerator(
-    const ServiceDescriptor* descriptor,
-    const std::map<std::string, std::string>& vars, const Options& options)
-    : descriptor_(descriptor), vars_(vars), options_(options) {
-  vars_["classname"] = descriptor_->name();
-  vars_["full_name"] = descriptor_->full_name();
-}
-
-ServiceGenerator::~ServiceGenerator() {}
-
-void ServiceGenerator::GenerateDeclarations(io::Printer* printer) {
-  Formatter format(printer, vars_);
-  // Forward-declare the stub type.
-  format(
-      "class $classname$_Stub;\n"
-      "\n");
-
-  GenerateInterface(printer);
-  GenerateStubDefinition(printer);
-}
-
-void ServiceGenerator::GenerateInterface(io::Printer* printer) {
-  Formatter format(printer, vars_);
-  format(
-      "class $dllexport_decl $$classname$ : public ::$proto_ns$::Service {\n"
-      " protected:\n"
-      "  // This class should be treated as an abstract interface.\n"
-      "  inline $classname$() {};\n"
-      " public:\n"
-      "  virtual ~$classname$();\n");
-  printer->Indent();
-
-  format(
-      "\n"
-      "typedef $classname$_Stub Stub;\n"
-      "\n"
-      "static const ::$proto_ns$::ServiceDescriptor* descriptor();\n"
-      "\n");
-
-  GenerateMethodSignatures(VIRTUAL, printer);
-
-  format(
-      "\n"
-      "// implements Service ----------------------------------------------\n"
-      "\n"
-      "const ::$proto_ns$::ServiceDescriptor* GetDescriptor();\n"
-      "void CallMethod(const ::$proto_ns$::MethodDescriptor* method,\n"
-      "                ::$proto_ns$::RpcController* controller,\n"
-      "                const ::$proto_ns$::Message* request,\n"
-      "                ::$proto_ns$::Message* response,\n"
-      "                ::google::protobuf::Closure* done);\n"
-      "const ::$proto_ns$::Message& GetRequestPrototype(\n"
-      "  const ::$proto_ns$::MethodDescriptor* method) const;\n"
-      "const ::$proto_ns$::Message& GetResponsePrototype(\n"
-      "  const ::$proto_ns$::MethodDescriptor* method) const;\n");
-
-  printer->Outdent();
-  format(
-      "\n"
-      " private:\n"
-      "  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS($classname$);\n"
-      "};\n"
-      "\n");
-}
-
-void ServiceGenerator::GenerateStubDefinition(io::Printer* printer) {
-  Formatter format(printer, vars_);
-  format(
-      "class $dllexport_decl $$classname$_Stub : public $classname$ {\n"
-      " public:\n");
-
-  printer->Indent();
-
-  format(
-      "$classname$_Stub(::$proto_ns$::RpcChannel* channel);\n"
-      "$classname$_Stub(::$proto_ns$::RpcChannel* channel,\n"
-      "                 ::$proto_ns$::Service::ChannelOwnership ownership);\n"
-      "~$classname$_Stub();\n"
-      "\n"
-      "inline ::$proto_ns$::RpcChannel* channel() { return channel_; }\n"
-      "\n"
-      "// implements $classname$ ------------------------------------------\n"
-      "\n");
-
-  GenerateMethodSignatures(NON_VIRTUAL, printer);
-
-  printer->Outdent();
-  format(
-      " private:\n"
-      "  ::$proto_ns$::RpcChannel* channel_;\n"
-      "  bool owns_channel_;\n"
-      "  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS($classname$_Stub);\n"
-      "};\n"
-      "\n");
-}
-
-void ServiceGenerator::GenerateMethodSignatures(VirtualOrNon virtual_or_non,
-                                                io::Printer* printer) {
-  for (int i = 0; i < descriptor_->method_count(); i++) {
-    const MethodDescriptor* method = descriptor_->method(i);
-    Formatter format(printer, vars_);
-    InitMethodVariables(method, options_, &format);
-    format.Set("virtual", virtual_or_non == VIRTUAL ? "virtual " : "");
-    format(
-        "$virtual$void $name$(::$proto_ns$::RpcController* controller,\n"
-        "                     const $input_type$* request,\n"
-        "                     $output_type$* response,\n"
-        "                     ::google::protobuf::Closure* done);\n");
-  }
-}
-
-// ===================================================================
-
-void ServiceGenerator::GenerateImplementation(io::Printer* printer) {
-  Formatter format(printer, vars_);
-  format(
-      "$classname$::~$classname$() {}\n"
-      "\n"
-      "const ::$proto_ns$::ServiceDescriptor* $classname$::descriptor() {\n"
-      "  "
-      "::$proto_ns$::internal::AssignDescriptors(&$desc_table$);\n"
-      "  return $file_level_service_descriptors$[$1$];\n"
-      "}\n"
-      "\n"
-      "const ::$proto_ns$::ServiceDescriptor* $classname$::GetDescriptor() {\n"
-      "  return descriptor();\n"
-      "}\n"
-      "\n",
-      index_in_metadata_);
-
-  // Generate methods of the interface.
-  GenerateNotImplementedMethods(printer);
-  GenerateCallMethod(printer);
-  GenerateGetPrototype(REQUEST, printer);
-  GenerateGetPrototype(RESPONSE, printer);
-
-  // Generate stub implementation.
-  format(
-      "$classname$_Stub::$classname$_Stub(::$proto_ns$::RpcChannel* channel)\n"
-      "  : channel_(channel), owns_channel_(false) {}\n"
-      "$classname$_Stub::$classname$_Stub(\n"
-      "    ::$proto_ns$::RpcChannel* channel,\n"
-      "    ::$proto_ns$::Service::ChannelOwnership ownership)\n"
-      "  : channel_(channel),\n"
-      "    owns_channel_(ownership == "
-      "::$proto_ns$::Service::STUB_OWNS_CHANNEL) "
-      "{}\n"
-      "$classname$_Stub::~$classname$_Stub() {\n"
-      "  if (owns_channel_) delete channel_;\n"
-      "}\n"
-      "\n");
-
-  GenerateStubMethods(printer);
-}
-
-void ServiceGenerator::GenerateNotImplementedMethods(io::Printer* printer) {
-  for (int i = 0; i < descriptor_->method_count(); i++) {
-    const MethodDescriptor* method = descriptor_->method(i);
-    Formatter format(printer, vars_);
-    InitMethodVariables(method, options_, &format);
-    format(
-        "void $classname$::$name$(::$proto_ns$::RpcController* controller,\n"
-        "                         const $input_type$*,\n"
-        "                         $output_type$*,\n"
-        "                         ::google::protobuf::Closure* done) {\n"
-        "  controller->SetFailed(\"Method $name$() not implemented.\");\n"
-        "  done->Run();\n"
-        "}\n"
-        "\n");
-  }
-}
-
-void ServiceGenerator::GenerateCallMethod(io::Printer* printer) {
-  Formatter format(printer, vars_);
-  format(
-      "void $classname$::CallMethod(const ::$proto_ns$::MethodDescriptor* "
-      "method,\n"
-      "                             ::$proto_ns$::RpcController* controller,\n"
-      "                             const ::$proto_ns$::Message* request,\n"
-      "                             ::$proto_ns$::Message* response,\n"
-      "                             ::google::protobuf::Closure* done) {\n"
-      "  GOOGLE_DCHECK_EQ(method->service(), $file_level_service_descriptors$[$1$]);\n"
-      "  switch(method->index()) {\n",
-      index_in_metadata_);
-
-  for (int i = 0; i < descriptor_->method_count(); i++) {
-    const MethodDescriptor* method = descriptor_->method(i);
-    Formatter format_method(printer, vars_);
-    InitMethodVariables(method, options_, &format_method);
-
-    // Note:  down_cast does not work here because it only works on pointers,
-    //   not references.
-    format_method(
-        "    case $1$:\n"
-        "      $name$(controller,\n"
-        "             ::$proto_ns$::internal::DownCast<const $input_type$*>(\n"
-        "                 request),\n"
-        "             ::$proto_ns$::internal::DownCast<$output_type$*>(\n"
-        "                 response),\n"
-        "             done);\n"
-        "      break;\n",
-        i);
-  }
-
-  format(
-      "    default:\n"
-      "      GOOGLE_LOG(FATAL) << \"Bad method index; this should never happen.\";\n"
-      "      break;\n"
-      "  }\n"
-      "}\n"
-      "\n");
-}
-
-void ServiceGenerator::GenerateGetPrototype(RequestOrResponse which,
-                                            io::Printer* printer) {
-  Formatter format(printer, vars_);
-  if (which == REQUEST) {
-    format("const ::$proto_ns$::Message& $classname$::GetRequestPrototype(\n");
-  } else {
-    format("const ::$proto_ns$::Message& $classname$::GetResponsePrototype(\n");
-  }
-
-  format(
-      "    const ::$proto_ns$::MethodDescriptor* method) const {\n"
-      "  GOOGLE_DCHECK_EQ(method->service(), descriptor());\n"
-      "  switch(method->index()) {\n");
-
-  for (int i = 0; i < descriptor_->method_count(); i++) {
-    const MethodDescriptor* method = descriptor_->method(i);
-    const Descriptor* type =
-        (which == REQUEST) ? method->input_type() : method->output_type();
-
-    format(
-        "    case $1$:\n"
-        "      return $2$::default_instance();\n",
-        i, QualifiedClassName(type, options_));
-  }
-
-  format(
-      "    default:\n"
-      "      GOOGLE_LOG(FATAL) << \"Bad method index; this should never happen.\";\n"
-      "      return *::$proto_ns$::MessageFactory::generated_factory()\n"
-      "          ->GetPrototype(method->$1$_type());\n"
-      "  }\n"
-      "}\n"
-      "\n",
-      which == REQUEST ? "input" : "output");
-}
-
-void ServiceGenerator::GenerateStubMethods(io::Printer* printer) {
-  for (int i = 0; i < descriptor_->method_count(); i++) {
-    const MethodDescriptor* method = descriptor_->method(i);
-    Formatter format(printer, vars_);
-    InitMethodVariables(method, options_, &format);
-    format(
-        "void $classname$_Stub::$name$(::$proto_ns$::RpcController* "
-        "controller,\n"
-        "                              const $input_type$* request,\n"
-        "                              $output_type$* response,\n"
-        "                              ::google::protobuf::Closure* done) {\n"
-        "  channel_->CallMethod(descriptor()->method($1$),\n"
-        "                       controller, request, response, done);\n"
-        "}\n",
-        i);
-  }
-}
-
-}  // namespace cpp
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/compiler/cpp/service.h b/libs/protobuf/src/google/protobuf/compiler/cpp/service.h
deleted file mode 100644
index b3bd2d7..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/cpp/service.h
+++ /dev/null
@@ -1,123 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-
-#ifndef GOOGLE_PROTOBUF_COMPILER_CPP_SERVICE_H__
-#define GOOGLE_PROTOBUF_COMPILER_CPP_SERVICE_H__
-
-#include <map>
-#include <string>
-
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/compiler/cpp/options.h>
-
-namespace google {
-namespace protobuf {
-namespace io {
-class Printer;  // printer.h
-}
-}  // namespace protobuf
-}  // namespace google
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace cpp {
-
-class ServiceGenerator {
- public:
-  // See generator.cc for the meaning of dllexport_decl.
-  explicit ServiceGenerator(const ServiceDescriptor* descriptor,
-                            const std::map<std::string, std::string>& vars,
-                            const Options& options);
-  ~ServiceGenerator();
-
-  // Header stuff.
-
-  // Generate the class definitions for the service's interface and the
-  // stub implementation.
-  void GenerateDeclarations(io::Printer* printer);
-
-  // Source file stuff.
-
-  // Generate implementations of everything declared by
-  // GenerateDeclarations().
-  void GenerateImplementation(io::Printer* printer);
-
- private:
-  enum RequestOrResponse { REQUEST, RESPONSE };
-  enum VirtualOrNon { VIRTUAL, NON_VIRTUAL };
-
-  // Header stuff.
-
-  // Generate the service abstract interface.
-  void GenerateInterface(io::Printer* printer);
-
-  // Generate the stub class definition.
-  void GenerateStubDefinition(io::Printer* printer);
-
-  // Prints signatures for all methods in the
-  void GenerateMethodSignatures(VirtualOrNon virtual_or_non,
-                                io::Printer* printer);
-
-  // Source file stuff.
-
-  // Generate the default implementations of the service methods, which
-  // produce a "not implemented" error.
-  void GenerateNotImplementedMethods(io::Printer* printer);
-
-  // Generate the CallMethod() method of the service.
-  void GenerateCallMethod(io::Printer* printer);
-
-  // Generate the Get{Request,Response}Prototype() methods.
-  void GenerateGetPrototype(RequestOrResponse which, io::Printer* printer);
-
-  // Generate the stub's implementations of the service methods.
-  void GenerateStubMethods(io::Printer* printer);
-
-  const ServiceDescriptor* descriptor_;
-  std::map<std::string, std::string> vars_;
-  const Options& options_;
-
-  int index_in_metadata_;
-
-  friend class FileGenerator;
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(ServiceGenerator);
-};
-
-}  // namespace cpp
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // GOOGLE_PROTOBUF_COMPILER_CPP_SERVICE_H__
diff --git a/libs/protobuf/src/google/protobuf/compiler/cpp/string_field.cc b/libs/protobuf/src/google/protobuf/compiler/cpp/string_field.cc
deleted file mode 100644
index 9e7c96d..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/cpp/string_field.cc
+++ /dev/null
@@ -1,957 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-
-#include <google/protobuf/compiler/cpp/string_field.h>
-
-#include <google/protobuf/io/printer.h>
-#include <google/protobuf/stubs/strutil.h>
-#include <google/protobuf/compiler/cpp/helpers.h>
-#include <google/protobuf/descriptor.pb.h>
-
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace cpp {
-
-namespace {
-
-void SetStringVariables(const FieldDescriptor* descriptor,
-                        std::map<std::string, std::string>* variables,
-                        const Options& options) {
-  SetCommonFieldVariables(descriptor, variables, options);
-
-  const std::string kNS = "::" + (*variables)["proto_ns"] + "::internal::";
-  const std::string kArenaStringPtr = kNS + "ArenaStringPtr";
-
-  (*variables)["default"] = DefaultValue(options, descriptor);
-  (*variables)["default_length"] =
-      StrCat(descriptor->default_value_string().length());
-  (*variables)["default_variable_name"] = MakeDefaultName(descriptor);
-  (*variables)["default_variable_field"] = MakeDefaultFieldName(descriptor);
-
-  if (descriptor->default_value_string().empty()) {
-    (*variables)["default_string"] = kNS + "GetEmptyStringAlreadyInited()";
-    (*variables)["default_value"] = "&" + (*variables)["default_string"];
-    (*variables)["lazy_variable_args"] = "";
-  } else {
-    (*variables)["lazy_variable"] =
-        StrCat(QualifiedClassName(descriptor->containing_type(), options),
-                     "::", MakeDefaultFieldName(descriptor));
-
-    (*variables)["default_string"] = (*variables)["lazy_variable"] + ".get()";
-    (*variables)["default_value"] = "nullptr";
-    (*variables)["lazy_variable_args"] = (*variables)["lazy_variable"] + ", ";
-  }
-
-  (*variables)["pointer_type"] =
-      descriptor->type() == FieldDescriptor::TYPE_BYTES ? "void" : "char";
-  (*variables)["setter"] =
-      descriptor->type() == FieldDescriptor::TYPE_BYTES ? "SetBytes" : "Set";
-  (*variables)["null_check"] = (*variables)["DCHK"] + "(value != nullptr);\n";
-  // NOTE: Escaped here to unblock proto1->proto2 migration.
-  // TODO(liujisi): Extend this to apply for other conflicting methods.
-  (*variables)["release_name"] =
-      SafeFunctionName(descriptor->containing_type(), descriptor, "release_");
-  (*variables)["full_name"] = descriptor->full_name();
-
-  if (options.opensource_runtime) {
-    (*variables)["string_piece"] = "::std::string";
-  } else {
-    (*variables)["string_piece"] = "::StringPiece";
-  }
-}
-
-}  // namespace
-
-// ===================================================================
-
-StringFieldGenerator::StringFieldGenerator(const FieldDescriptor* descriptor,
-                                           const Options& options)
-    : FieldGenerator(descriptor, options),
-      inlined_(IsStringInlined(descriptor, options)) {
-  SetStringVariables(descriptor, &variables_, options);
-}
-
-StringFieldGenerator::~StringFieldGenerator() {}
-
-void StringFieldGenerator::GeneratePrivateMembers(io::Printer* printer) const {
-  Formatter format(printer, variables_);
-  if (!inlined_) {
-    format("::$proto_ns$::internal::ArenaStringPtr $name$_;\n");
-  } else {
-    // Skips the automatic destruction; rather calls it explicitly if
-    // allocating arena is null. This is required to support message-owned
-    // arena (go/path-to-arenas) where a root proto is destroyed but
-    // InlinedStringField may have arena-allocated memory.
-    format("::$proto_ns$::internal::InlinedStringField $name$_;\n");
-  }
-}
-
-void StringFieldGenerator::GenerateStaticMembers(io::Printer* printer) const {
-  Formatter format(printer, variables_);
-  if (!descriptor_->default_value_string().empty()) {
-    format(
-        "static const ::$proto_ns$::internal::LazyString"
-        " $default_variable_name$;\n");
-  }
-  if (inlined_) {
-    // `_init_inline_xxx` is used for initializing default instances.
-    format("static std::true_type _init_inline_$name$_;\n");
-  }
-}
-
-void StringFieldGenerator::GenerateAccessorDeclarations(
-    io::Printer* printer) const {
-  Formatter format(printer, variables_);
-  // If we're using StringFieldGenerator for a field with a ctype, it's
-  // because that ctype isn't actually implemented.  In particular, this is
-  // true of ctype=CORD and ctype=STRING_PIECE in the open source release.
-  // We aren't releasing Cord because it has too many Google-specific
-  // dependencies and we aren't releasing StringPiece because it's hardly
-  // useful outside of Google and because it would get confusing to have
-  // multiple instances of the StringPiece class in different libraries (PCRE
-  // already includes it for their C++ bindings, which came from Google).
-  //
-  // In any case, we make all the accessors private while still actually
-  // using a string to represent the field internally.  This way, we can
-  // guarantee that if we do ever implement the ctype, it won't break any
-  // existing users who might be -- for whatever reason -- already using .proto
-  // files that applied the ctype.  The field can still be accessed via the
-  // reflection interface since the reflection interface is independent of
-  // the string's underlying representation.
-
-  bool unknown_ctype = descriptor_->options().ctype() !=
-                       EffectiveStringCType(descriptor_, options_);
-
-  if (unknown_ctype) {
-    format.Outdent();
-    format(
-        " private:\n"
-        "  // Hidden due to unknown ctype option.\n");
-    format.Indent();
-  }
-
-  format(
-      "$deprecated_attr$const std::string& ${1$$name$$}$() const;\n"
-      "template <typename ArgT0 = const std::string&, typename... ArgT>\n"
-      "$deprecated_attr$void ${1$set_$name$$}$(ArgT0&& arg0, ArgT... args);\n",
-      descriptor_);
-  format(
-      "$deprecated_attr$std::string* ${1$mutable_$name$$}$();\n"
-      "PROTOBUF_NODISCARD $deprecated_attr$std::string* "
-      "${1$$release_name$$}$();\n"
-      "$deprecated_attr$void ${1$set_allocated_$name$$}$(std::string* "
-      "$name$);\n",
-      descriptor_);
-  format(
-      "private:\n"
-      "const std::string& _internal_$name$() const;\n"
-      "inline PROTOBUF_ALWAYS_INLINE void "
-      "_internal_set_$name$(const std::string& value);\n"
-      "std::string* _internal_mutable_$name$();\n");
-  if (inlined_) {
-    format(
-        "inline PROTOBUF_ALWAYS_INLINE bool _internal_$name$_donated() "
-        "const;\n");
-  }
-  format("public:\n");
-
-  if (unknown_ctype) {
-    format.Outdent();
-    format(" public:\n");
-    format.Indent();
-  }
-}
-
-void StringFieldGenerator::GenerateInlineAccessorDefinitions(
-    io::Printer* printer) const {
-  Formatter format(printer, variables_);
-  format(
-      "inline const std::string& $classname$::$name$() const {\n"
-      "$annotate_get$"
-      "  // @@protoc_insertion_point(field_get:$full_name$)\n");
-  if (!descriptor_->default_value_string().empty()) {
-    format(
-        "  if ($field$.IsDefault()) return "
-        "$default_variable_field$.get();\n");
-  }
-  format(
-      "  return _internal_$name$();\n"
-      "}\n");
-  if (!inlined_) {
-    format(
-        "template <typename ArgT0, typename... ArgT>\n"
-        "inline PROTOBUF_ALWAYS_INLINE\n"
-        "void $classname$::set_$name$(ArgT0&& arg0, ArgT... args) {\n"
-        "$maybe_prepare_split_message$"
-        " $set_hasbit$\n"
-        " $field$.$setter$(static_cast<ArgT0 &&>(arg0),"
-        " args..., GetArenaForAllocation());\n"
-        "$annotate_set$"
-        "  // @@protoc_insertion_point(field_set:$full_name$)\n"
-        "}\n");
-  } else {
-    format(
-        "template <typename ArgT0, typename... ArgT>\n"
-        "inline PROTOBUF_ALWAYS_INLINE\n"
-        "void $classname$::set_$name$(ArgT0&& arg0, ArgT... args) {\n"
-        "$maybe_prepare_split_message$"
-        " $set_hasbit$\n"
-        " $field$.$setter$(static_cast<ArgT0 &&>(arg0),"
-        " args..., GetArenaForAllocation(), _internal_$name$_donated(), "
-        "&$donating_states_word$, $mask_for_undonate$, this);\n"
-        "$annotate_set$"
-        "  // @@protoc_insertion_point(field_set:$full_name$)\n"
-        "}\n"
-        "inline bool $classname$::_internal_$name$_donated() const {\n"
-        "  bool value = $inlined_string_donated$\n"
-        "  return value;\n"
-        "}\n");
-  }
-  format(
-      "inline std::string* $classname$::mutable_$name$() {\n"
-      "$maybe_prepare_split_message$"
-      "  std::string* _s = _internal_mutable_$name$();\n"
-      "$annotate_mutable$"
-      "  // @@protoc_insertion_point(field_mutable:$full_name$)\n"
-      "  return _s;\n"
-      "}\n"
-      "inline const std::string& $classname$::_internal_$name$() const {\n"
-      "  return $field$.Get();\n"
-      "}\n"
-      "inline void $classname$::_internal_set_$name$(const std::string& "
-      "value) {\n"
-      "  $set_hasbit$\n");
-  if (!inlined_) {
-    format(
-        "  $field$.Set(value, GetArenaForAllocation());\n"
-        "}\n");
-  } else {
-    format(
-        "  $field$.Set(value, GetArenaForAllocation(),\n"
-        "    _internal_$name$_donated(), &$donating_states_word$, "
-        "$mask_for_undonate$, this);\n"
-        "}\n");
-  }
-  format(
-      "inline std::string* $classname$::_internal_mutable_$name$() {\n"
-      "  $set_hasbit$\n");
-  if (!inlined_) {
-    format(
-        "  return $field$.Mutable($lazy_variable_args$"
-        "GetArenaForAllocation());\n"
-        "}\n");
-  } else {
-    format(
-        "  return $field$.Mutable($lazy_variable_args$"
-        "GetArenaForAllocation(), _internal_$name$_donated(), "
-        "&$donating_states_word$, $mask_for_undonate$, this);\n"
-        "}\n");
-  }
-  format(
-      "inline std::string* $classname$::$release_name$() {\n"
-      "$annotate_release$"
-      "$maybe_prepare_split_message$"
-      "  // @@protoc_insertion_point(field_release:$full_name$)\n");
-
-  if (HasHasbit(descriptor_)) {
-    format(
-        "  if (!_internal_has_$name$()) {\n"
-        "    return nullptr;\n"
-        "  }\n"
-        "  $clear_hasbit$\n");
-    if (!inlined_) {
-      format("  auto* p = $field$.Release();\n");
-      if (descriptor_->default_value_string().empty()) {
-        format(
-            "#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING\n"
-            "  if ($field$.IsDefault()) {\n"
-            "    $field$.Set(\"\", GetArenaForAllocation());\n"
-            "  }\n"
-            "#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING\n");
-      }
-      format("  return p;\n");
-    } else {
-      format(
-          "  return $field$.Release(GetArenaForAllocation(), "
-          "_internal_$name$_donated());\n");
-    }
-  } else {
-    format("  return $field$.Release();\n");
-  }
-
-  format(
-      "}\n"
-      "inline void $classname$::set_allocated_$name$(std::string* $name$) {\n"
-      "$maybe_prepare_split_message$"
-      "  if ($name$ != nullptr) {\n"
-      "    $set_hasbit$\n"
-      "  } else {\n"
-      "    $clear_hasbit$\n"
-      "  }\n");
-  if (!inlined_) {
-    format("  $field$.SetAllocated($name$, GetArenaForAllocation());\n");
-    if (descriptor_->default_value_string().empty()) {
-      format(
-          "#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING\n"
-          "  if ($field$.IsDefault()) {\n"
-          "    $field$.Set(\"\", GetArenaForAllocation());\n"
-          "  }\n"
-          "#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING\n");
-    }
-  } else {
-    // Currently, string fields with default value can't be inlined.
-    format(
-        "    $field$.SetAllocated(nullptr, $name$, GetArenaForAllocation(), "
-        "_internal_$name$_donated(), &$donating_states_word$, "
-        "$mask_for_undonate$, this);\n");
-  }
-  format(
-      "$annotate_set$"
-      "  // @@protoc_insertion_point(field_set_allocated:$full_name$)\n"
-      "}\n");
-}
-
-void StringFieldGenerator::GenerateNonInlineAccessorDefinitions(
-    io::Printer* printer) const {
-  Formatter format(printer, variables_);
-  if (!descriptor_->default_value_string().empty()) {
-    format(
-        "const ::$proto_ns$::internal::LazyString "
-        "$classname$::$default_variable_field$"
-        "{{{$default$, $default_length$}}, {nullptr}};\n");
-  }
-}
-
-void StringFieldGenerator::GenerateClearingCode(io::Printer* printer) const {
-  Formatter format(printer, variables_);
-  if (descriptor_->default_value_string().empty()) {
-    format("$field$.ClearToEmpty();\n");
-  } else {
-    GOOGLE_DCHECK(!inlined_);
-    format(
-        "$field$.ClearToDefault($lazy_variable$, GetArenaForAllocation());\n");
-  }
-}
-
-void StringFieldGenerator::GenerateMessageClearingCode(
-    io::Printer* printer) const {
-  Formatter format(printer, variables_);
-  // Two-dimension specialization here: supporting arenas, field presence, or
-  // not, and default value is the empty string or not. Complexity here ensures
-  // the minimal number of branches / amount of extraneous code at runtime
-  // (given that the below methods are inlined one-liners)!
-
-  // If we have a hasbit, then the Clear() method of the protocol buffer
-  // will have checked that this field is set.  If so, we can avoid redundant
-  // checks against the default variable.
-  const bool must_be_present = HasHasbit(descriptor_);
-
-  if (inlined_ && must_be_present) {
-    // Calling mutable_$name$() gives us a string reference and sets the has bit
-    // for $name$ (in proto2).  We may get here when the string field is inlined
-    // but the string's contents have not been changed by the user, so we cannot
-    // make an assertion about the contents of the string and could never make
-    // an assertion about the string instance.
-    //
-    // For non-inlined strings, we distinguish from non-default by comparing
-    // instances, rather than contents.
-    format("$DCHK$(!$field$.IsDefault());\n");
-  }
-
-  if (descriptor_->default_value_string().empty()) {
-    if (must_be_present) {
-      format("$field$.ClearNonDefaultToEmpty();\n");
-    } else {
-      format("$field$.ClearToEmpty();\n");
-    }
-  } else {
-    // Clear to a non-empty default is more involved, as we try to use the
-    // Arena if one is present and may need to reallocate the string.
-    format(
-        "$field$.ClearToDefault($lazy_variable$, GetArenaForAllocation());\n ");
-  }
-}
-
-void StringFieldGenerator::GenerateMergingCode(io::Printer* printer) const {
-  Formatter format(printer, variables_);
-  // TODO(gpike): improve this
-  format("_this->_internal_set_$name$(from._internal_$name$());\n");
-}
-
-void StringFieldGenerator::GenerateSwappingCode(io::Printer* printer) const {
-  Formatter format(printer, variables_);
-  if (!inlined_) {
-    format(
-        "::$proto_ns$::internal::ArenaStringPtr::InternalSwap(\n"
-        "    &$field$, lhs_arena,\n"
-        "    &other->$field$, rhs_arena\n"
-        ");\n");
-  } else {
-    format(
-        "::$proto_ns$::internal::InlinedStringField::InternalSwap(\n"
-        "  &$field$, lhs_arena, "
-        "($inlined_string_donated_array$[0] & 0x1u) == 0, this,\n"
-        "  &other->$field$, rhs_arena, "
-        "(other->$inlined_string_donated_array$[0] & 0x1u) == 0, other);\n");
-  }
-}
-
-void StringFieldGenerator::GenerateConstructorCode(io::Printer* printer) const {
-  Formatter format(printer, variables_);
-  if (inlined_ && descriptor_->default_value_string().empty()) {
-    return;
-  }
-  GOOGLE_DCHECK(!inlined_);
-  format("$field$.InitDefault();\n");
-  if (IsString(descriptor_, options_) &&
-      descriptor_->default_value_string().empty()) {
-    format(
-        "#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING\n"
-        "  $field$.Set(\"\", GetArenaForAllocation());\n"
-        "#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING\n");
-  }
-}
-
-void StringFieldGenerator::GenerateCreateSplitMessageCode(
-    io::Printer* printer) const {
-  GOOGLE_CHECK(ShouldSplit(descriptor_, options_));
-  GOOGLE_CHECK(!inlined_);
-  Formatter format(printer, variables_);
-  format("ptr->$name$_.InitDefault();\n");
-  if (IsString(descriptor_, options_) &&
-      descriptor_->default_value_string().empty()) {
-    format(
-        "#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING\n"
-        "  ptr->$name$_.Set(\"\", GetArenaForAllocation());\n"
-        "#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING\n");
-  }
-}
-
-void StringFieldGenerator::GenerateCopyConstructorCode(
-    io::Printer* printer) const {
-  Formatter format(printer, variables_);
-  GenerateConstructorCode(printer);
-  if (inlined_) {
-    format("new (&_this->$field$) ::_pbi::InlinedStringField();\n");
-  }
-
-  if (HasHasbit(descriptor_)) {
-    format("if (from._internal_has_$name$()) {\n");
-  } else {
-    format("if (!from._internal_$name$().empty()) {\n");
-  }
-
-  format.Indent();
-
-  if (!inlined_) {
-    format(
-        "_this->$field$.Set(from._internal_$name$(), \n"
-        "  _this->GetArenaForAllocation());\n");
-  } else {
-    format(
-        "_this->$field$.Set(from._internal_$name$(),\n"
-        "  _this->GetArenaForAllocation(), _this->_internal_$name$_donated(), "
-        "&_this->$donating_states_word$, $mask_for_undonate$, _this);\n");
-  }
-
-  format.Outdent();
-  format("}\n");
-}
-
-void StringFieldGenerator::GenerateDestructorCode(io::Printer* printer) const {
-  Formatter format(printer, variables_);
-  if (!inlined_) {
-    if (ShouldSplit(descriptor_, options_)) {
-      format("$cached_split_ptr$->$name$_.Destroy();\n");
-      return;
-    }
-    format("$field$.Destroy();\n");
-    return;
-  }
-  // Explicitly calls ~InlinedStringField as its automatic call is disabled.
-  // Destructor has been implicitly skipped as a union, and even the
-  // message-owned arena is enabled, arena could still be missing for
-  // Arena::CreateMessage(nullptr).
-  GOOGLE_DCHECK(!ShouldSplit(descriptor_, options_));
-  format("$field$.~InlinedStringField();\n");
-}
-
-ArenaDtorNeeds StringFieldGenerator::NeedsArenaDestructor() const {
-  return inlined_ ? ArenaDtorNeeds::kOnDemand : ArenaDtorNeeds::kNone;
-}
-
-void StringFieldGenerator::GenerateArenaDestructorCode(
-    io::Printer* printer) const {
-  if (!inlined_) return;
-  Formatter format(printer, variables_);
-  // _this is the object being destructed (we are inside a static method here).
-  format(
-      "if (!_this->_internal_$name$_donated()) {\n"
-      "  _this->$field$.~InlinedStringField();\n"
-      "}\n");
-}
-
-void StringFieldGenerator::GenerateSerializeWithCachedSizesToArray(
-    io::Printer* printer) const {
-  Formatter format(printer, variables_);
-  if (descriptor_->type() == FieldDescriptor::TYPE_STRING) {
-    GenerateUtf8CheckCodeForString(
-        descriptor_, options_, false,
-        "this->_internal_$name$().data(), "
-        "static_cast<int>(this->_internal_$name$().length()),\n",
-        format);
-  }
-  format(
-      "target = stream->Write$declared_type$MaybeAliased(\n"
-      "    $number$, this->_internal_$name$(), target);\n");
-}
-
-void StringFieldGenerator::GenerateByteSize(io::Printer* printer) const {
-  Formatter format(printer, variables_);
-  format(
-      "total_size += $tag_size$ +\n"
-      "  ::$proto_ns$::internal::WireFormatLite::$declared_type$Size(\n"
-      "    this->_internal_$name$());\n");
-}
-
-void StringFieldGenerator::GenerateConstexprAggregateInitializer(
-    io::Printer* printer) const {
-  Formatter format(printer, variables_);
-  if (inlined_) {
-    format("/*decltype($field$)*/{nullptr, false}");
-    return;
-  }
-  if (descriptor_->default_value_string().empty()) {
-    format(
-        "/*decltype($field$)*/{&::_pbi::fixed_address_empty_string, "
-        "::_pbi::ConstantInitialized{}}");
-  } else {
-    format("/*decltype($field$)*/{nullptr, ::_pbi::ConstantInitialized{}}");
-  }
-}
-
-void StringFieldGenerator::GenerateAggregateInitializer(
-    io::Printer* printer) const {
-  Formatter format(printer, variables_);
-  if (ShouldSplit(descriptor_, options_)) {
-    GOOGLE_CHECK(!inlined_);
-    format("decltype(Impl_::Split::$name$_){}");
-    return;
-  }
-  if (!inlined_) {
-    format("decltype($field$){}");
-  } else {
-    format("decltype($field$)(arena)");
-  }
-}
-
-void StringFieldGenerator::GenerateCopyAggregateInitializer(
-    io::Printer* printer) const {
-  Formatter format(printer, variables_);
-  format("decltype($field$){}");
-}
-
-// ===================================================================
-
-StringOneofFieldGenerator::StringOneofFieldGenerator(
-    const FieldDescriptor* descriptor, const Options& options)
-    : StringFieldGenerator(descriptor, options) {
-  SetCommonOneofFieldVariables(descriptor, &variables_);
-  variables_["field_name"] = UnderscoresToCamelCase(descriptor->name(), true);
-  variables_["oneof_index"] =
-      StrCat(descriptor->containing_oneof()->index());
-}
-
-StringOneofFieldGenerator::~StringOneofFieldGenerator() {}
-
-void StringOneofFieldGenerator::GenerateInlineAccessorDefinitions(
-    io::Printer* printer) const {
-  Formatter format(printer, variables_);
-  format(
-      "inline const std::string& $classname$::$name$() const {\n"
-      "$annotate_get$"
-      "  // @@protoc_insertion_point(field_get:$full_name$)\n"
-      "  return _internal_$name$();\n"
-      "}\n"
-      "template <typename ArgT0, typename... ArgT>\n"
-      "inline void $classname$::set_$name$(ArgT0&& arg0, ArgT... args) {\n"
-      "  if (!_internal_has_$name$()) {\n"
-      "    clear_$oneof_name$();\n"
-      "    set_has_$name$();\n"
-      "    $field$.InitDefault();\n"
-      "  }\n"
-      "  $field$.$setter$("
-      " static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());\n"
-      "$annotate_set$"
-      "  // @@protoc_insertion_point(field_set:$full_name$)\n"
-      "}\n"
-      "inline std::string* $classname$::mutable_$name$() {\n"
-      "  std::string* _s = _internal_mutable_$name$();\n"
-      "$annotate_mutable$"
-      "  // @@protoc_insertion_point(field_mutable:$full_name$)\n"
-      "  return _s;\n"
-      "}\n"
-      "inline const std::string& $classname$::_internal_$name$() const {\n"
-      "  if (_internal_has_$name$()) {\n"
-      "    return $field$.Get();\n"
-      "  }\n"
-      "  return $default_string$;\n"
-      "}\n"
-      "inline void $classname$::_internal_set_$name$(const std::string& "
-      "value) {\n"
-      "  if (!_internal_has_$name$()) {\n"
-      "    clear_$oneof_name$();\n"
-      "    set_has_$name$();\n"
-      "    $field$.InitDefault();\n"
-      "  }\n"
-      "  $field$.Set(value, GetArenaForAllocation());\n"
-      "}\n");
-  format(
-      "inline std::string* $classname$::_internal_mutable_$name$() {\n"
-      "  if (!_internal_has_$name$()) {\n"
-      "    clear_$oneof_name$();\n"
-      "    set_has_$name$();\n"
-      "    $field$.InitDefault();\n"
-      "  }\n"
-      "  return $field$.Mutable($lazy_variable_args$"
-      "      GetArenaForAllocation());\n"
-      "}\n"
-      "inline std::string* $classname$::$release_name$() {\n"
-      "$annotate_release$"
-      "  // @@protoc_insertion_point(field_release:$full_name$)\n"
-      "  if (_internal_has_$name$()) {\n"
-      "    clear_has_$oneof_name$();\n"
-      "    return $field$.Release();\n"
-      "  } else {\n"
-      "    return nullptr;\n"
-      "  }\n"
-      "}\n"
-      "inline void $classname$::set_allocated_$name$(std::string* $name$) {\n"
-      "  if (has_$oneof_name$()) {\n"
-      "    clear_$oneof_name$();\n"
-      "  }\n"
-      "  if ($name$ != nullptr) {\n"
-      "    set_has_$name$();\n"
-      "    $field$.InitAllocated($name$, GetArenaForAllocation());\n"
-      "  }\n"
-      "$annotate_set$"
-      "  // @@protoc_insertion_point(field_set_allocated:$full_name$)\n"
-      "}\n");
-}
-
-void StringOneofFieldGenerator::GenerateClearingCode(
-    io::Printer* printer) const {
-  Formatter format(printer, variables_);
-  format("$field$.Destroy();\n");
-}
-
-void StringOneofFieldGenerator::GenerateMessageClearingCode(
-    io::Printer* printer) const {
-  return GenerateClearingCode(printer);
-}
-
-void StringOneofFieldGenerator::GenerateSwappingCode(
-    io::Printer* printer) const {
-  // Don't print any swapping code. Swapping the union will swap this field.
-}
-
-void StringOneofFieldGenerator::GenerateConstructorCode(
-    io::Printer* printer) const {
-  // Nothing required here.
-}
-
-// ===================================================================
-
-RepeatedStringFieldGenerator::RepeatedStringFieldGenerator(
-    const FieldDescriptor* descriptor, const Options& options)
-    : FieldGenerator(descriptor, options) {
-  SetStringVariables(descriptor, &variables_, options);
-}
-
-RepeatedStringFieldGenerator::~RepeatedStringFieldGenerator() {}
-
-void RepeatedStringFieldGenerator::GeneratePrivateMembers(
-    io::Printer* printer) const {
-  Formatter format(printer, variables_);
-  format("::$proto_ns$::RepeatedPtrField<std::string> $name$_;\n");
-}
-
-void RepeatedStringFieldGenerator::GenerateAccessorDeclarations(
-    io::Printer* printer) const {
-  Formatter format(printer, variables_);
-  // See comment above about unknown ctypes.
-  bool unknown_ctype = descriptor_->options().ctype() !=
-                       EffectiveStringCType(descriptor_, options_);
-
-  if (unknown_ctype) {
-    format.Outdent();
-    format(
-        " private:\n"
-        "  // Hidden due to unknown ctype option.\n");
-    format.Indent();
-  }
-
-  format(
-      "$deprecated_attr$const std::string& ${1$$name$$}$(int index) const;\n"
-      "$deprecated_attr$std::string* ${1$mutable_$name$$}$(int index);\n"
-      "$deprecated_attr$void ${1$set_$name$$}$(int index, const "
-      "std::string& value);\n"
-      "$deprecated_attr$void ${1$set_$name$$}$(int index, std::string&& "
-      "value);\n"
-      "$deprecated_attr$void ${1$set_$name$$}$(int index, const "
-      "char* value);\n",
-      descriptor_);
-  if (!options_.opensource_runtime) {
-    format(
-        "$deprecated_attr$void ${1$set_$name$$}$(int index, "
-        "StringPiece value);\n",
-        descriptor_);
-  }
-  format(
-      "$deprecated_attr$void ${1$set_$name$$}$("
-      "int index, const $pointer_type$* value, size_t size);\n"
-      "$deprecated_attr$std::string* ${1$add_$name$$}$();\n"
-      "$deprecated_attr$void ${1$add_$name$$}$(const std::string& value);\n"
-      "$deprecated_attr$void ${1$add_$name$$}$(std::string&& value);\n"
-      "$deprecated_attr$void ${1$add_$name$$}$(const char* value);\n",
-      descriptor_);
-  if (!options_.opensource_runtime) {
-    format(
-        "$deprecated_attr$void ${1$add_$name$$}$(StringPiece value);\n",
-        descriptor_);
-  }
-  format(
-      "$deprecated_attr$void ${1$add_$name$$}$(const $pointer_type$* "
-      "value, size_t size)"
-      ";\n"
-      "$deprecated_attr$const ::$proto_ns$::RepeatedPtrField<std::string>& "
-      "${1$$name$$}$() "
-      "const;\n"
-      "$deprecated_attr$::$proto_ns$::RepeatedPtrField<std::string>* "
-      "${1$mutable_$name$$}$()"
-      ";\n"
-      "private:\n"
-      "const std::string& ${1$_internal_$name$$}$(int index) const;\n"
-      "std::string* _internal_add_$name$();\n"
-      "public:\n",
-      descriptor_);
-
-  if (unknown_ctype) {
-    format.Outdent();
-    format(" public:\n");
-    format.Indent();
-  }
-}
-
-void RepeatedStringFieldGenerator::GenerateInlineAccessorDefinitions(
-    io::Printer* printer) const {
-  Formatter format(printer, variables_);
-  format(
-      "inline std::string* $classname$::add_$name$() {\n"
-      "  std::string* _s = _internal_add_$name$();\n"
-      "$annotate_add_mutable$"
-      "  // @@protoc_insertion_point(field_add_mutable:$full_name$)\n"
-      "  return _s;\n"
-      "}\n");
-  if (options_.safe_boundary_check) {
-    format(
-        "inline const std::string& $classname$::_internal_$name$(int index) "
-        "const {\n"
-        "  return $field$.InternalCheckedGet(\n"
-        "      index, ::$proto_ns$::internal::GetEmptyStringAlreadyInited());\n"
-        "}\n");
-  } else {
-    format(
-        "inline const std::string& $classname$::_internal_$name$(int index) "
-        "const {\n"
-        "  return $field$.Get(index);\n"
-        "}\n");
-  }
-  format(
-      "inline const std::string& $classname$::$name$(int index) const {\n"
-      "$annotate_get$"
-      "  // @@protoc_insertion_point(field_get:$full_name$)\n"
-      "  return _internal_$name$(index);\n"
-      "}\n"
-      "inline std::string* $classname$::mutable_$name$(int index) {\n"
-      "$annotate_mutable$"
-      "  // @@protoc_insertion_point(field_mutable:$full_name$)\n"
-      "  return $field$.Mutable(index);\n"
-      "}\n"
-      "inline void $classname$::set_$name$(int index, const std::string& "
-      "value) "
-      "{\n"
-      "  $field$.Mutable(index)->assign(value);\n"
-      "$annotate_set$"
-      "  // @@protoc_insertion_point(field_set:$full_name$)\n"
-      "}\n"
-      "inline void $classname$::set_$name$(int index, std::string&& value) {\n"
-      "  $field$.Mutable(index)->assign(std::move(value));\n"
-      "$annotate_set$"
-      "  // @@protoc_insertion_point(field_set:$full_name$)\n"
-      "}\n"
-      "inline void $classname$::set_$name$(int index, const char* value) {\n"
-      "  $null_check$"
-      "  $field$.Mutable(index)->assign(value);\n"
-      "$annotate_set$"
-      "  // @@protoc_insertion_point(field_set_char:$full_name$)\n"
-      "}\n");
-  if (!options_.opensource_runtime) {
-    format(
-        "inline void "
-        "$classname$::set_$name$(int index, StringPiece value) {\n"
-        "  $field$.Mutable(index)->assign(value.data(), value.size());\n"
-        "$annotate_set$"
-        "  // @@protoc_insertion_point(field_set_string_piece:$full_name$)\n"
-        "}\n");
-  }
-  format(
-      "inline void "
-      "$classname$::set_$name$"
-      "(int index, const $pointer_type$* value, size_t size) {\n"
-      "  $field$.Mutable(index)->assign(\n"
-      "    reinterpret_cast<const char*>(value), size);\n"
-      "$annotate_set$"
-      "  // @@protoc_insertion_point(field_set_pointer:$full_name$)\n"
-      "}\n"
-      "inline std::string* $classname$::_internal_add_$name$() {\n"
-      "  return $field$.Add();\n"
-      "}\n"
-      "inline void $classname$::add_$name$(const std::string& value) {\n"
-      "  $field$.Add()->assign(value);\n"
-      "$annotate_add$"
-      "  // @@protoc_insertion_point(field_add:$full_name$)\n"
-      "}\n"
-      "inline void $classname$::add_$name$(std::string&& value) {\n"
-      "  $field$.Add(std::move(value));\n"
-      "$annotate_add$"
-      "  // @@protoc_insertion_point(field_add:$full_name$)\n"
-      "}\n"
-      "inline void $classname$::add_$name$(const char* value) {\n"
-      "  $null_check$"
-      "  $field$.Add()->assign(value);\n"
-      "$annotate_add$"
-      "  // @@protoc_insertion_point(field_add_char:$full_name$)\n"
-      "}\n");
-  if (!options_.opensource_runtime) {
-    format(
-        "inline void $classname$::add_$name$(StringPiece value) {\n"
-        "  $field$.Add()->assign(value.data(), value.size());\n"
-        "$annotate_add$"
-        "  // @@protoc_insertion_point(field_add_string_piece:$full_name$)\n"
-        "}\n");
-  }
-  format(
-      "inline void "
-      "$classname$::add_$name$(const $pointer_type$* value, size_t size) {\n"
-      "  $field$.Add()->assign(reinterpret_cast<const char*>(value), size);\n"
-      "$annotate_add$"
-      "  // @@protoc_insertion_point(field_add_pointer:$full_name$)\n"
-      "}\n"
-      "inline const ::$proto_ns$::RepeatedPtrField<std::string>&\n"
-      "$classname$::$name$() const {\n"
-      "$annotate_list$"
-      "  // @@protoc_insertion_point(field_list:$full_name$)\n"
-      "  return $field$;\n"
-      "}\n"
-      "inline ::$proto_ns$::RepeatedPtrField<std::string>*\n"
-      "$classname$::mutable_$name$() {\n"
-      "$annotate_mutable_list$"
-      "  // @@protoc_insertion_point(field_mutable_list:$full_name$)\n"
-      "  return &$field$;\n"
-      "}\n");
-}
-
-void RepeatedStringFieldGenerator::GenerateClearingCode(
-    io::Printer* printer) const {
-  Formatter format(printer, variables_);
-  format("$field$.Clear();\n");
-}
-
-void RepeatedStringFieldGenerator::GenerateMergingCode(
-    io::Printer* printer) const {
-  Formatter format(printer, variables_);
-  format("_this->$field$.MergeFrom(from.$field$);\n");
-}
-
-void RepeatedStringFieldGenerator::GenerateSwappingCode(
-    io::Printer* printer) const {
-  Formatter format(printer, variables_);
-  format("$field$.InternalSwap(&other->$field$);\n");
-}
-
-void RepeatedStringFieldGenerator::GenerateDestructorCode(
-    io::Printer* printer) const {
-  Formatter format(printer, variables_);
-  format("$field$.~RepeatedPtrField();\n");
-}
-
-void RepeatedStringFieldGenerator::GenerateSerializeWithCachedSizesToArray(
-    io::Printer* printer) const {
-  Formatter format(printer, variables_);
-  format(
-      "for (int i = 0, n = this->_internal_$name$_size(); i < n; i++) {\n"
-      "  const auto& s = this->_internal_$name$(i);\n");
-  // format("for (const std::string& s : this->$name$()) {\n");
-  format.Indent();
-  if (descriptor_->type() == FieldDescriptor::TYPE_STRING) {
-    GenerateUtf8CheckCodeForString(descriptor_, options_, false,
-                                   "s.data(), static_cast<int>(s.length()),\n",
-                                   format);
-  }
-  format.Outdent();
-  format(
-      "  target = stream->Write$declared_type$($number$, s, target);\n"
-      "}\n");
-}
-
-void RepeatedStringFieldGenerator::GenerateByteSize(
-    io::Printer* printer) const {
-  Formatter format(printer, variables_);
-  format(
-      "total_size += $tag_size$ *\n"
-      "    ::$proto_ns$::internal::FromIntSize($field$.size());\n"
-      "for (int i = 0, n = $field$.size(); i < n; i++) {\n"
-      "  total_size += "
-      "::$proto_ns$::internal::WireFormatLite::$declared_type$Size(\n"
-      "    $field$.Get(i));\n"
-      "}\n");
-}
-
-}  // namespace cpp
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/compiler/cpp/string_field.h b/libs/protobuf/src/google/protobuf/compiler/cpp/string_field.h
deleted file mode 100644
index db5f18b..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/cpp/string_field.h
+++ /dev/null
@@ -1,136 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-
-#ifndef GOOGLE_PROTOBUF_COMPILER_CPP_STRING_FIELD_H__
-#define GOOGLE_PROTOBUF_COMPILER_CPP_STRING_FIELD_H__
-
-#include <map>
-#include <string>
-
-#include <google/protobuf/compiler/cpp/field.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace cpp {
-
-class StringFieldGenerator : public FieldGenerator {
- public:
-  StringFieldGenerator(const FieldDescriptor* descriptor,
-                       const Options& options);
-  ~StringFieldGenerator() override;
-
-  // implements FieldGenerator ---------------------------------------
-  void GeneratePrivateMembers(io::Printer* printer) const override;
-  void GenerateStaticMembers(io::Printer* printer) const override;
-  void GenerateAccessorDeclarations(io::Printer* printer) const override;
-  void GenerateInlineAccessorDefinitions(io::Printer* printer) const override;
-  void GenerateNonInlineAccessorDefinitions(
-      io::Printer* printer) const override;
-  void GenerateClearingCode(io::Printer* printer) const override;
-  void GenerateMessageClearingCode(io::Printer* printer) const override;
-  void GenerateMergingCode(io::Printer* printer) const override;
-  void GenerateSwappingCode(io::Printer* printer) const override;
-  void GenerateConstructorCode(io::Printer* printer) const override;
-  void GenerateCreateSplitMessageCode(io::Printer* printer) const override;
-  void GenerateCopyConstructorCode(io::Printer* printer) const override;
-  void GenerateDestructorCode(io::Printer* printer) const override;
-  void GenerateArenaDestructorCode(io::Printer* printer) const override;
-  void GenerateSerializeWithCachedSizesToArray(
-      io::Printer* printer) const override;
-  void GenerateByteSize(io::Printer* printer) const override;
-  void GenerateConstexprAggregateInitializer(
-      io::Printer* printer) const override;
-  void GenerateAggregateInitializer(io::Printer* printer) const override;
-  void GenerateCopyAggregateInitializer(io::Printer* printer) const override;
-  bool IsInlined() const override { return inlined_; }
-  ArenaDtorNeeds NeedsArenaDestructor() const override;
-
- private:
-  bool inlined_;
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(StringFieldGenerator);
-};
-
-class StringOneofFieldGenerator : public StringFieldGenerator {
- public:
-  StringOneofFieldGenerator(const FieldDescriptor* descriptor,
-                            const Options& options);
-  ~StringOneofFieldGenerator() override;
-
-  // implements FieldGenerator ---------------------------------------
-  void GenerateInlineAccessorDefinitions(io::Printer* printer) const override;
-  void GenerateClearingCode(io::Printer* printer) const override;
-
-  // StringFieldGenerator, from which we inherit, overrides this so we need to
-  // override it as well.
-  void GenerateMessageClearingCode(io::Printer* printer) const override;
-  void GenerateSwappingCode(io::Printer* printer) const override;
-  void GenerateConstructorCode(io::Printer* printer) const override;
-
- private:
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(StringOneofFieldGenerator);
-};
-
-class RepeatedStringFieldGenerator : public FieldGenerator {
- public:
-  RepeatedStringFieldGenerator(const FieldDescriptor* descriptor,
-                               const Options& options);
-  ~RepeatedStringFieldGenerator() override;
-
-  // implements FieldGenerator ---------------------------------------
-  void GeneratePrivateMembers(io::Printer* printer) const override;
-  void GenerateAccessorDeclarations(io::Printer* printer) const override;
-  void GenerateInlineAccessorDefinitions(io::Printer* printer) const override;
-  void GenerateClearingCode(io::Printer* printer) const override;
-  void GenerateMergingCode(io::Printer* printer) const override;
-  void GenerateSwappingCode(io::Printer* printer) const override;
-  void GenerateConstructorCode(io::Printer* printer) const override {}
-  void GenerateCopyConstructorCode(io::Printer*  /*printer*/) const override {
-    GOOGLE_CHECK(!ShouldSplit(descriptor_, options_));
-  }
-  void GenerateDestructorCode(io::Printer* printer) const override;
-  void GenerateSerializeWithCachedSizesToArray(
-      io::Printer* printer) const override;
-  void GenerateByteSize(io::Printer* printer) const override;
-
- private:
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(RepeatedStringFieldGenerator);
-};
-
-}  // namespace cpp
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // GOOGLE_PROTOBUF_COMPILER_CPP_STRING_FIELD_H__
diff --git a/libs/protobuf/src/google/protobuf/compiler/cpp/test_bad_identifiers.proto b/libs/protobuf/src/google/protobuf/compiler/cpp/test_bad_identifiers.proto
deleted file mode 100644
index 466a841..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/cpp/test_bad_identifiers.proto
+++ /dev/null
@@ -1,184 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-//
-// This file tests that various identifiers work as field and type names even
-// though the same identifiers are used internally by the C++ code generator.
-
-// LINT: LEGACY_NAMES
-
-syntax = "proto2";
-
-// Some generic_services option(s) added automatically.
-// See:  http://go/proto2-generic-services-default
-option cc_generic_services = true;  // auto-added
-
-// We don't put this in a package within proto2 because we need to make sure
-// that the generated code doesn't depend on being in the proto2 namespace.
-package protobuf_unittest;
-
-// Test that fields can have names like "input" and "i" which are also used
-// internally by the code generator for local variables.
-message TestConflictingSymbolNames {
-  message BuildDescriptors {}
-  message TypeTraits {}
-
-  optional int32 input = 1;
-  optional int32 output = 2;
-  optional string length = 3;
-  repeated int32 i = 4;
-  repeated string new_element = 5 [ctype = STRING_PIECE];
-  optional int32 total_size = 6;
-  optional int32 tag = 7;
-
-  enum TestEnum { FOO = 0; }
-  message Data1 {
-    repeated int32 data = 1;
-  }
-  message Data2 {
-    repeated TestEnum data = 1;
-  }
-  message Data3 {
-    repeated string data = 1;
-  }
-  message Data4 {
-    repeated Data4 data = 1;
-  }
-  message Data5 {
-    repeated string data = 1 [ctype = STRING_PIECE];
-  }
-  message Data6 {
-    repeated string data = 1 [ctype = CORD];
-  }
-
-  optional int32 source = 8;
-  optional int32 value = 9;
-  optional int32 file = 10;
-  optional int32 from = 11;
-  optional int32 handle_uninterpreted = 12;
-  repeated int32 index = 13;
-  optional int32 controller = 14;
-  optional int32 already_here = 15;
-
-  optional uint32 uint32 = 16;
-  optional uint64 uint64 = 17;
-  optional string string = 18;
-  optional int32 memset = 19;
-  optional int32 int32 = 20;
-  optional int64 int64 = 21;
-
-  optional uint32 cached_size = 22;
-  optional uint32 extensions = 23;
-  optional uint32 bit = 24;
-  optional uint32 bits = 25;
-  optional uint32 offsets = 26;
-  optional uint32 reflection = 27;
-
-  message Cord {}
-  optional string some_cord = 28 [ctype = CORD];
-
-  message StringPiece {}
-  optional string some_string_piece = 29 [ctype = STRING_PIECE];
-
-  // Some keywords.
-  optional uint32 int = 30;
-  optional uint32 friend = 31;
-  optional uint32 class = 37;
-  optional uint32 typedecl = 39;
-  optional uint32 auto = 40;
-
-  // The generator used to #define a macro called "DO" inside the .cc file.
-  message DO {}
-  optional DO do = 32;
-
-  // Some template parameter names for extensions.
-  optional int32 field_type = 33;
-  optional bool is_packed = 34;
-
-  // test conflicting release_$name$. "length" and "do" field in this message
-  // must remain string or message fields to make the test valid.
-  optional string release_length = 35;
-  // A more extreme case, the field name "do" here is a keyword, which will be
-  // escaped to "do_" already. Test there is no conflict even with escaped field
-  // names.
-  optional DO release_do = 36;
-
-  // For clashing local variables in Serialize and ByteSize calculation.
-  optional string target = 38;
-
-  extensions 1000 to max;  // NO_PROTO3
-}
-
-message TestConflictingSymbolNamesExtension {                      // NO_PROTO3
-  extend TestConflictingSymbolNames {                              // NO_PROTO3
-    repeated int32 repeated_int32_ext = 20423638 [packed = true];  // NO_PROTO3
-  }                                                                // NO_PROTO3
-}  // NO_PROTO3
-
-message TestConflictingEnumNames {  // NO_PROTO3
-  enum while {                      // NO_PROTO3
-    default = 0;                    // NO_PROTO3
-    and = 1;                        // NO_PROTO3
-    class = 2;                      // NO_PROTO3
-    int = 3;                        // NO_PROTO3
-    typedef = 4;                    // NO_PROTO3
-    XOR = 5;                        // NO_PROTO3
-  }                                 // NO_PROTO3
-
-  optional while conflicting_enum = 1;  // NO_PROTO3
-}  // NO_PROTO3
-
-enum bool {      // NO_PROTO3
-  default = 0;   // NO_PROTO3
-  NOT_EQ = 1;    // NO_PROTO3
-  volatile = 2;  // NO_PROTO3
-  return = 3;    // NO_PROTO3
-}  // NO_PROTO3
-
-message DummyMessage {}
-
-message NULL {
-  optional int32 int = 1;
-}
-
-extend TestConflictingSymbolNames {  // NO_PROTO3
-  optional int32 void = 314253;      // NO_PROTO3
-}  // NO_PROTO3
-
-// Message names that could conflict.
-message Shutdown {}
-message TableStruct {}
-
-service TestConflictingMethodNames {
-  rpc Closure(DummyMessage) returns (DummyMessage);
-}
diff --git a/libs/protobuf/src/google/protobuf/compiler/cpp/test_large_enum_value.proto b/libs/protobuf/src/google/protobuf/compiler/cpp/test_large_enum_value.proto
deleted file mode 100644
index cb6ca1b..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/cpp/test_large_enum_value.proto
+++ /dev/null
@@ -1,43 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Test that proto2 compiler can generate valid code when the enum value
-// is INT_MAX. Note that this is a compile-only test and this proto is not
-// referenced in any C++ code.
-syntax = "proto2";
-
-package protobuf_unittest;
-
-message TestLargeEnumValue {
-  enum EnumWithLargeValue {
-    VALUE_1 = 1;
-    VALUE_MAX = 0x7fffffff;
-  }
-}
diff --git a/libs/protobuf/src/google/protobuf/compiler/cpp/unittest.cc b/libs/protobuf/src/google/protobuf/compiler/cpp/unittest.cc
deleted file mode 100644
index e2730d7..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/cpp/unittest.cc
+++ /dev/null
@@ -1,133 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-//
-// To test the code generator, we actually use it to generate code for
-// net/proto2/internal/unittest.proto, then test that.  This means that we
-// are actually testing the parser and other parts of the system at the same
-// time, and that problems in the generator may show up as compile-time errors
-// rather than unittest failures, which may be surprising.  However, testing
-// the output of the C++ generator directly would be very hard.  We can't very
-// well just check it against golden files since those files would have to be
-// updated for any small change; such a test would be very brittle and probably
-// not very helpful.  What we really want to test is that the code compiles
-// correctly and produces the interfaces we expect, which is why this test
-// is written this way.
-
-#include <google/protobuf/compiler/cpp/unittest.h>
-
-#include <google/protobuf/unittest.pb.h>
-#include <google/protobuf/unittest_embed_optimize_for.pb.h>
-#include <google/protobuf/unittest_optimize_for.pb.h>
-#include <google/protobuf/test_util.h>
-
-#define MESSAGE_TEST_NAME MessageTest
-#define GENERATED_DESCRIPTOR_TEST_NAME GeneratedDescriptorTest
-#define GENERATED_MESSAGE_TEST_NAME GeneratedMessageTest
-#define GENERATED_ENUM_TEST_NAME GeneratedEnumTest
-#define GENERATED_SERVICE_TEST_NAME GeneratedServiceTest
-#define HELPERS_TEST_NAME HelpersTest
-#define DESCRIPTOR_INIT_TEST_NAME DescriptorInitializationTest
-
-#define UNITTEST_PROTO_PATH "net/proto2/internal/unittest.proto"
-#define UNITTEST ::protobuf_unittest
-#define UNITTEST_IMPORT ::protobuf_unittest_import
-
-// Must include after the above macros.
-#include <google/protobuf/compiler/cpp/unittest.inc>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace cpp {
-
-// Can't use an anonymous namespace here due to brokenness of Tru64 compiler.
-namespace cpp_unittest {
-
-namespace protobuf_unittest = ::protobuf_unittest;
-
-TEST(GENERATED_MESSAGE_TEST_NAME, TestConflictingSymbolNames) {
-  // test_bad_identifiers.proto successfully compiled, then it works.  The
-  // following is just a token usage to insure that the code is, in fact,
-  // being compiled and linked.
-
-  protobuf_unittest::TestConflictingSymbolNames message;
-  message.set_uint32(1);
-  EXPECT_EQ(3, message.ByteSizeLong());
-
-  message.set_friend_(5);
-  EXPECT_EQ(5, message.friend_());
-
-  message.set_class_(6);
-  EXPECT_EQ(6, message.class_());
-
-  // Instantiate extension template functions to test conflicting template
-  // parameter names.
-  typedef protobuf_unittest::TestConflictingSymbolNamesExtension ExtensionMessage;
-  message.AddExtension(ExtensionMessage::repeated_int32_ext, 123);
-  EXPECT_EQ(123, message.GetExtension(ExtensionMessage::repeated_int32_ext, 0));
-}
-
-TEST(GENERATED_MESSAGE_TEST_NAME, TestConflictingEnumNames) {
-  protobuf_unittest::TestConflictingEnumNames message;
-  message.set_conflicting_enum(
-      protobuf_unittest::TestConflictingEnumNames_while_and_);
-  EXPECT_EQ(1, message.conflicting_enum());
-  message.set_conflicting_enum(
-      protobuf_unittest::TestConflictingEnumNames_while_XOR);
-  EXPECT_EQ(5, message.conflicting_enum());
-
-  protobuf_unittest::bool_ conflicting_enum;
-  conflicting_enum = protobuf_unittest::NOT_EQ;
-  EXPECT_EQ(1, conflicting_enum);
-  conflicting_enum = protobuf_unittest::return_;
-  EXPECT_EQ(3, conflicting_enum);
-}
-
-TEST(GENERATED_MESSAGE_TEST_NAME, TestConflictingMessageNames) {
-  protobuf_unittest::NULL_ message;
-  message.set_int_(123);
-  EXPECT_EQ(message.int_(), 123);
-}
-
-TEST(GENERATED_MESSAGE_TEST_NAME, TestConflictingExtension) {
-  protobuf_unittest::TestConflictingSymbolNames message;
-  message.SetExtension(protobuf_unittest::void_, 123);
-  EXPECT_EQ(123, message.GetExtension(protobuf_unittest::void_));
-}
-
-}  // namespace cpp_unittest
-}  // namespace cpp
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/compiler/cpp/unittest.h b/libs/protobuf/src/google/protobuf/compiler/cpp/unittest.h
deleted file mode 100644
index c5dc767..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/cpp/unittest.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// This header declares the namespace google::protobuf::protobuf_unittest in order to expose
-// any problems with the generated class names. We use this header to ensure
-// unittest.cc will declare the namespace prior to other includes, while obeying
-// normal include ordering.
-//
-// When generating a class name of "foo.Bar" we must ensure we prefix the class
-// name with "::", in case the namespace google::protobuf::foo exists. We intentionally
-// trigger that case here by declaring google::protobuf::protobuf_unittest.
-//
-// See ClassName in helpers.h for more details.
-
-#ifndef GOOGLE_PROTOBUF_COMPILER_CPP_UNITTEST_H__
-#define GOOGLE_PROTOBUF_COMPILER_CPP_UNITTEST_H__
-
-namespace google {
-namespace protobuf {
-namespace protobuf_unittest {}
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // GOOGLE_PROTOBUF_COMPILER_CPP_UNITTEST_H__
diff --git a/libs/protobuf/src/google/protobuf/compiler/cpp/unittest.inc b/libs/protobuf/src/google/protobuf/compiler/cpp/unittest.inc
deleted file mode 100644
index 0b47176..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/cpp/unittest.inc
+++ /dev/null
@@ -1,2226 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-//
-// To test the code generator, we actually use it to generate code for
-// net/proto2/internal/unittest.proto, then test that.  This means that we
-// are actually testing the parser and other parts of the system at the same
-// time, and that problems in the generator may show up as compile-time errors
-// rather than unittest failures, which may be surprising.  However, testing
-// the output of the C++ generator directly would be very hard.  We can't very
-// well just check it against golden files since those files would have to be
-// updated for any small change; such a test would be very brittle and probably
-// not very helpful.  What we really want to test is that the code compiles
-// correctly and produces the interfaces we expect, which is why this test
-// is written this way.
-
-#include <cstdint>
-#include <limits>
-#include <memory>
-#include <vector>
-
-#include <google/protobuf/compiler/cpp/unittest.h>
-#include <google/protobuf/stubs/strutil.h>
-#ifndef _MSC_VER
-// We exclude this large proto because it's too large for
-// visual studio to compile (report internal errors).
-#include <google/protobuf/unittest_enormous_descriptor.pb.h>
-#endif
-#include <google/protobuf/compiler/cpp/helpers.h>
-#include <google/protobuf/compiler/cpp/test_bad_identifiers.pb.h>
-#include <google/protobuf/unittest_no_generic_services.pb.h>
-#include <google/protobuf/descriptor.pb.h>
-#include <google/protobuf/arena.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/dynamic_message.h>
-#include <google/protobuf/compiler/scc.h>
-#include <google/protobuf/compiler/importer.h>
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/io/zero_copy_stream_impl.h>
-#include <google/protobuf/test_util2.h>
-
-#include <google/protobuf/stubs/callback.h>
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/stubs/logging.h>
-#include <google/protobuf/testing/googletest.h>
-#include <gtest/gtest.h>
-#include <google/protobuf/stubs/casts.h>
-#include <google/protobuf/stubs/substitute.h>
-#include <google/protobuf/stubs/stl_util.h>
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace cpp {
-
-// Can't use an anonymous namespace here due to brokenness of Tru64 compiler.
-namespace cpp_unittest {
-
-
-void DoNothing() {}
-
-class MockErrorCollector : public MultiFileErrorCollector {
- public:
-  MockErrorCollector() {}
-  ~MockErrorCollector() override {}
-
-  std::string text_;
-
-  // implements ErrorCollector ---------------------------------------
-  void AddError(const std::string& filename, int line, int column,
-                const std::string& message) override {
-    strings::SubstituteAndAppend(&text_, "$0:$1:$2: $3\n", filename, line, column,
-                              message);
-  }
-};
-
-#ifndef PROTOBUF_TEST_NO_DESCRIPTORS
-
-// Test that generated code has proper descriptors:
-// Parse a descriptor directly (using google::protobuf::compiler::Importer) and
-// compare it to the one that was produced by generated code.
-TEST(GENERATED_DESCRIPTOR_TEST_NAME, IdenticalDescriptors) {
-  const FileDescriptor* generated_descriptor =
-    UNITTEST::TestAllTypes::descriptor()->file();
-
-  // Set up the Importer.
-  MockErrorCollector error_collector;
-  DiskSourceTree source_tree;
-  source_tree.MapPath("", TestUtil::TestSourceDir());
-  Importer importer(&source_tree, &error_collector);
-
-  // Import (parse) unittest.proto.
-  const FileDescriptor* parsed_descriptor =
-      importer.Import(TestUtil::MaybeTranslatePath(UNITTEST_PROTO_PATH));
-  EXPECT_EQ("", error_collector.text_);
-  ASSERT_TRUE(parsed_descriptor != nullptr);
-
-  // Test that descriptors are generated correctly by converting them to
-  // FileDescriptorProtos and comparing.
-  FileDescriptorProto generated_descriptor_proto, parsed_descriptor_proto;
-  generated_descriptor->CopyTo(&generated_descriptor_proto);
-  parsed_descriptor->CopyTo(&parsed_descriptor_proto);
-
-  EXPECT_EQ(parsed_descriptor_proto.DebugString(),
-            generated_descriptor_proto.DebugString());
-}
-
-#ifndef _MSC_VER
-// Test that generated code has proper descriptors:
-// Touch a descriptor generated from an enormous message to validate special
-// handling for descriptors exceeding the C++ standard's recommended minimum
-// limit for string literal size
-TEST(GENERATED_DESCRIPTOR_TEST_NAME, EnormousDescriptor) {
-  const Descriptor* generated_descriptor =
-    ::protobuf_unittest::TestEnormousDescriptor::descriptor();
-
-  EXPECT_TRUE(generated_descriptor != nullptr);
-}
-#endif
-
-#endif  // !PROTOBUF_TEST_NO_DESCRIPTORS
-
-// ===================================================================
-
-TEST(GENERATED_MESSAGE_TEST_NAME, Defaults) {
-  // Check that all default values are set correctly in the initial message.
-  UNITTEST::TestAllTypes message;
-
-  TestUtil::ExpectClear(message);
-
-  // Messages should return pointers to default instances until first use.
-  // (This is not checked by ExpectClear() since it is not actually true after
-  // the fields have been set and then cleared.)
-  EXPECT_EQ(&UNITTEST::TestAllTypes::OptionalGroup::default_instance(),
-            &message.optionalgroup());
-  EXPECT_EQ(&UNITTEST::TestAllTypes::NestedMessage::default_instance(),
-            &message.optional_nested_message());
-  EXPECT_EQ(&UNITTEST::ForeignMessage::default_instance(),
-            &message.optional_foreign_message());
-  EXPECT_EQ(&UNITTEST_IMPORT::ImportMessage::default_instance(),
-            &message.optional_import_message());
-}
-
-TEST(GENERATED_MESSAGE_TEST_NAME, FloatingPointDefaults) {
-  const UNITTEST::TestExtremeDefaultValues& extreme_default =
-      UNITTEST::TestExtremeDefaultValues::default_instance();
-
-  EXPECT_EQ(0.0f, extreme_default.zero_float());
-  EXPECT_EQ(1.0f, extreme_default.one_float());
-  EXPECT_EQ(1.5f, extreme_default.small_float());
-  EXPECT_EQ(-1.0f, extreme_default.negative_one_float());
-  EXPECT_EQ(-1.5f, extreme_default.negative_float());
-  EXPECT_EQ(2.0e8f, extreme_default.large_float());
-  EXPECT_EQ(-8e-28f, extreme_default.small_negative_float());
-  EXPECT_EQ(std::numeric_limits<double>::infinity(),
-            extreme_default.inf_double());
-  EXPECT_EQ(-std::numeric_limits<double>::infinity(),
-            extreme_default.neg_inf_double());
-  EXPECT_TRUE(extreme_default.nan_double() != extreme_default.nan_double());
-  EXPECT_EQ(std::numeric_limits<float>::infinity(),
-            extreme_default.inf_float());
-  EXPECT_EQ(-std::numeric_limits<float>::infinity(),
-            extreme_default.neg_inf_float());
-  EXPECT_TRUE(extreme_default.nan_float() != extreme_default.nan_float());
-}
-
-TEST(GENERATED_MESSAGE_TEST_NAME, Trigraph) {
-  const UNITTEST::TestExtremeDefaultValues& extreme_default =
-      UNITTEST::TestExtremeDefaultValues::default_instance();
-
-  EXPECT_EQ("? ? ?? ?? ??? ?\?/ ?\?-", extreme_default.cpp_trigraph());
-}
-
-TEST(GENERATED_MESSAGE_TEST_NAME, ExtremeSmallIntegerDefault) {
-  const UNITTEST::TestExtremeDefaultValues& extreme_default =
-      UNITTEST::TestExtremeDefaultValues::default_instance();
-  EXPECT_EQ(std::numeric_limits<int32_t>::min(),
-            extreme_default.really_small_int32());
-  EXPECT_EQ(std::numeric_limits<int64_t>::min(),
-            extreme_default.really_small_int64());
-}
-
-TEST(GENERATED_MESSAGE_TEST_NAME, Accessors) {
-  // Set every field to a unique value then go back and check all those
-  // values.
-  UNITTEST::TestAllTypes message;
-
-  TestUtil::SetAllFields(&message);
-  TestUtil::ExpectAllFieldsSet(message);
-
-  TestUtil::ModifyRepeatedFields(&message);
-  TestUtil::ExpectRepeatedFieldsModified(message);
-}
-
-TEST(GENERATED_MESSAGE_TEST_NAME, MutableStringDefault) {
-  // mutable_foo() for a string should return a string initialized to its
-  // default value.
-  UNITTEST::TestAllTypes message;
-
-  EXPECT_EQ("hello", *message.mutable_default_string());
-
-  // Note that the first time we call mutable_foo(), we get a newly-allocated
-  // string, but if we clear it and call it again, we get the same object again.
-  // We should verify that it has its default value in both cases.
-  message.set_default_string("blah");
-  message.Clear();
-
-  EXPECT_EQ("hello", *message.mutable_default_string());
-}
-
-TEST(GENERATED_MESSAGE_TEST_NAME, StringDefaults) {
-  UNITTEST::TestExtremeDefaultValues message;
-  // Check if '\000' can be used in default string value.
-  EXPECT_EQ(std::string("hel\000lo", 6), message.string_with_zero());
-  EXPECT_EQ(std::string("wor\000ld", 6), message.bytes_with_zero());
-}
-
-TEST(GENERATED_MESSAGE_TEST_NAME, ReleaseString) {
-  // Check that release_foo() starts out nullptr, and gives us a value
-  // that we can delete after it's been set.
-  UNITTEST::TestAllTypes message;
-
-  EXPECT_EQ(nullptr, message.release_default_string());
-  EXPECT_FALSE(message.has_default_string());
-  EXPECT_EQ("hello", message.default_string());
-
-  message.set_default_string("blah");
-  EXPECT_TRUE(message.has_default_string());
-  std::unique_ptr<std::string> str(message.release_default_string());
-  EXPECT_FALSE(message.has_default_string());
-  ASSERT_TRUE(str != nullptr);
-  EXPECT_EQ("blah", *str);
-
-  EXPECT_EQ(nullptr, message.release_default_string());
-  EXPECT_FALSE(message.has_default_string());
-  EXPECT_EQ("hello", message.default_string());
-}
-
-TEST(GENERATED_MESSAGE_TEST_NAME, ReleaseMessage) {
-  // Check that release_foo() starts out nullptr, and gives us a value
-  // that we can delete after it's been set.
-  UNITTEST::TestAllTypes message;
-
-  EXPECT_EQ(nullptr, message.release_optional_nested_message());
-  EXPECT_FALSE(message.has_optional_nested_message());
-
-  message.mutable_optional_nested_message()->set_bb(1);
-  std::unique_ptr<UNITTEST::TestAllTypes::NestedMessage> nest(
-      message.release_optional_nested_message());
-  EXPECT_FALSE(message.has_optional_nested_message());
-  ASSERT_TRUE(nest != nullptr);
-  EXPECT_EQ(1, nest->bb());
-
-  EXPECT_EQ(nullptr, message.release_optional_nested_message());
-  EXPECT_FALSE(message.has_optional_nested_message());
-}
-
-TEST(GENERATED_MESSAGE_TEST_NAME, SetAllocatedString) {
-  // Check that set_allocated_foo() works for strings.
-  UNITTEST::TestAllTypes message;
-
-  EXPECT_FALSE(message.has_optional_string());
-  const std::string kHello("hello");
-  message.set_optional_string(kHello);
-  EXPECT_TRUE(message.has_optional_string());
-
-  message.set_allocated_optional_string(nullptr);
-  EXPECT_FALSE(message.has_optional_string());
-  EXPECT_EQ("", message.optional_string());
-
-  message.set_allocated_optional_string(new std::string(kHello));
-  EXPECT_TRUE(message.has_optional_string());
-  EXPECT_EQ(kHello, message.optional_string());
-}
-
-TEST(GENERATED_MESSAGE_TEST_NAME, SetAllocatedMessage) {
-  // Check that set_allocated_foo() can be called in all cases.
-  UNITTEST::TestAllTypes message;
-
-  EXPECT_FALSE(message.has_optional_nested_message());
-
-  message.mutable_optional_nested_message()->set_bb(1);
-  EXPECT_TRUE(message.has_optional_nested_message());
-
-  message.set_allocated_optional_nested_message(nullptr);
-  EXPECT_FALSE(message.has_optional_nested_message());
-  EXPECT_EQ(&UNITTEST::TestAllTypes::NestedMessage::default_instance(),
-            &message.optional_nested_message());
-
-  message.mutable_optional_nested_message()->set_bb(1);
-  UNITTEST::TestAllTypes::NestedMessage* nest =
-      message.release_optional_nested_message();
-  ASSERT_TRUE(nest != nullptr);
-  EXPECT_FALSE(message.has_optional_nested_message());
-
-  message.set_allocated_optional_nested_message(nest);
-  EXPECT_TRUE(message.has_optional_nested_message());
-  EXPECT_EQ(1, message.optional_nested_message().bb());
-}
-
-TEST(GENERATED_MESSAGE_TEST_NAME, Clear) {
-  // Set every field to a unique value, clear the message, then check that
-  // it is cleared.
-  UNITTEST::TestAllTypes message;
-
-  TestUtil::SetAllFields(&message);
-  message.Clear();
-  TestUtil::ExpectClear(message);
-}
-
-TEST(GENERATED_MESSAGE_TEST_NAME, EmbeddedNullsInBytesCharStar) {
-  UNITTEST::TestAllTypes message;
-
-  const char* value = "\0lalala\0\0";
-  message.set_optional_bytes(value, 9);
-  ASSERT_EQ(9, message.optional_bytes().size());
-  EXPECT_EQ(0, memcmp(value, message.optional_bytes().data(), 9));
-
-  message.add_repeated_bytes(value, 9);
-  ASSERT_EQ(9, message.repeated_bytes(0).size());
-  EXPECT_EQ(0, memcmp(value, message.repeated_bytes(0).data(), 9));
-}
-
-TEST(GENERATED_MESSAGE_TEST_NAME, ClearOneField) {
-  // Set every field to a unique value, then clear one value and insure that
-  // only that one value is cleared.
-  UNITTEST::TestAllTypes message;
-
-  TestUtil::SetAllFields(&message);
-  int64_t original_value = message.optional_int64();
-
-  // Clear the field and make sure it shows up as cleared.
-  message.clear_optional_int64();
-  EXPECT_FALSE(message.has_optional_int64());
-  EXPECT_EQ(0, message.optional_int64());
-
-  // Other adjacent fields should not be cleared.
-  EXPECT_TRUE(message.has_optional_int32());
-  EXPECT_TRUE(message.has_optional_uint32());
-
-  // Make sure if we set it again, then all fields are set.
-  message.set_optional_int64(original_value);
-  TestUtil::ExpectAllFieldsSet(message);
-}
-
-TEST(GENERATED_MESSAGE_TEST_NAME, StringCharStarLength) {
-  // Verify that we can use a char*,length to set one of the string fields.
-  UNITTEST::TestAllTypes message;
-  message.set_optional_string("abcdef", 3);
-  EXPECT_EQ("abc", message.optional_string());
-
-  // Verify that we can use a char*,length to add to a repeated string field.
-  message.add_repeated_string("abcdef", 3);
-  EXPECT_EQ(1, message.repeated_string_size());
-  EXPECT_EQ("abc", message.repeated_string(0));
-
-  // Verify that we can use a char*,length to set a repeated string field.
-  message.set_repeated_string(0, "wxyz", 2);
-  EXPECT_EQ("wx", message.repeated_string(0));
-}
-
-
-#if !defined(PROTOBUF_TEST_NO_DESCRIPTORS) || defined(NDEBUG)
-TEST(GENERATED_MESSAGE_TEST_NAME, CopyFrom) {
-  UNITTEST::TestAllTypes message1, message2;
-
-  TestUtil::SetAllFields(&message1);
-  message2.CopyFrom(message1);
-  TestUtil::ExpectAllFieldsSet(message2);
-
-  // Copying from self should be a no-op.
-  message2.CopyFrom(message2);
-  TestUtil::ExpectAllFieldsSet(message2);
-}
-
-TEST(GENERATED_MESSAGE_TEST_NAME, CopyAssignmentOperator) {
-  UNITTEST::TestAllTypes message1;
-  TestUtil::SetAllFields(&message1);
-
-  UNITTEST::TestAllTypes message2;
-  message2 = message1;
-  TestUtil::ExpectAllFieldsSet(message2);
-
-  // Make sure that self-assignment does something sane.
-  message2.operator=(message2);
-  TestUtil::ExpectAllFieldsSet(message2);
-}
-#endif  // !PROTOBUF_TEST_NO_DESCRIPTORS || NDEBUG
-
-
-TEST(GENERATED_MESSAGE_TEST_NAME, SwapWithEmpty) {
-  UNITTEST::TestAllTypes message1, message2;
-  TestUtil::SetAllFields(&message1);
-
-  TestUtil::ExpectAllFieldsSet(message1);
-  TestUtil::ExpectClear(message2);
-  message1.Swap(&message2);
-  TestUtil::ExpectAllFieldsSet(message2);
-  TestUtil::ExpectClear(message1);
-}
-
-TEST(GENERATED_MESSAGE_TEST_NAME, SwapWithSelf) {
-  UNITTEST::TestAllTypes message;
-  TestUtil::SetAllFields(&message);
-  TestUtil::ExpectAllFieldsSet(message);
-  message.Swap(&message);
-  TestUtil::ExpectAllFieldsSet(message);
-}
-
-TEST(GENERATED_MESSAGE_TEST_NAME, SwapWithOther) {
-  UNITTEST::TestAllTypes message1, message2;
-
-  message1.set_optional_int32(123);
-  message1.set_optional_string("abc");
-  message1.mutable_optional_nested_message()->set_bb(1);
-  message1.set_optional_nested_enum(UNITTEST::TestAllTypes::FOO);
-  message1.add_repeated_int32(1);
-  message1.add_repeated_int32(2);
-  message1.add_repeated_string("a");
-  message1.add_repeated_string("b");
-  message1.add_repeated_nested_message()->set_bb(7);
-  message1.add_repeated_nested_message()->set_bb(8);
-  message1.add_repeated_nested_enum(UNITTEST::TestAllTypes::FOO);
-  message1.add_repeated_nested_enum(UNITTEST::TestAllTypes::BAR);
-
-  message2.set_optional_int32(456);
-  message2.set_optional_string("def");
-  message2.mutable_optional_nested_message()->set_bb(2);
-  message2.set_optional_nested_enum(UNITTEST::TestAllTypes::BAR);
-  message2.add_repeated_int32(3);
-  message2.add_repeated_string("c");
-  message2.add_repeated_nested_message()->set_bb(9);
-  message2.add_repeated_nested_enum(UNITTEST::TestAllTypes::BAZ);
-
-  message1.Swap(&message2);
-
-  EXPECT_EQ(456, message1.optional_int32());
-  EXPECT_EQ("def", message1.optional_string());
-  EXPECT_EQ(2, message1.optional_nested_message().bb());
-  EXPECT_EQ(UNITTEST::TestAllTypes::BAR, message1.optional_nested_enum());
-  ASSERT_EQ(1, message1.repeated_int32_size());
-  EXPECT_EQ(3, message1.repeated_int32(0));
-  ASSERT_EQ(1, message1.repeated_string_size());
-  EXPECT_EQ("c", message1.repeated_string(0));
-  ASSERT_EQ(1, message1.repeated_nested_message_size());
-  EXPECT_EQ(9, message1.repeated_nested_message(0).bb());
-  ASSERT_EQ(1, message1.repeated_nested_enum_size());
-  EXPECT_EQ(UNITTEST::TestAllTypes::BAZ, message1.repeated_nested_enum(0));
-
-  EXPECT_EQ(123, message2.optional_int32());
-  EXPECT_EQ("abc", message2.optional_string());
-  EXPECT_EQ(1, message2.optional_nested_message().bb());
-  EXPECT_EQ(UNITTEST::TestAllTypes::FOO, message2.optional_nested_enum());
-  ASSERT_EQ(2, message2.repeated_int32_size());
-  EXPECT_EQ(1, message2.repeated_int32(0));
-  EXPECT_EQ(2, message2.repeated_int32(1));
-  ASSERT_EQ(2, message2.repeated_string_size());
-  EXPECT_EQ("a", message2.repeated_string(0));
-  EXPECT_EQ("b", message2.repeated_string(1));
-  ASSERT_EQ(2, message2.repeated_nested_message_size());
-  EXPECT_EQ(7, message2.repeated_nested_message(0).bb());
-  EXPECT_EQ(8, message2.repeated_nested_message(1).bb());
-  ASSERT_EQ(2, message2.repeated_nested_enum_size());
-  EXPECT_EQ(UNITTEST::TestAllTypes::FOO, message2.repeated_nested_enum(0));
-  EXPECT_EQ(UNITTEST::TestAllTypes::BAR, message2.repeated_nested_enum(1));
-}
-
-TEST(GENERATED_MESSAGE_TEST_NAME, ADLSwap) {
-  UNITTEST::TestAllTypes message1, message2;
-  TestUtil::SetAllFields(&message1);
-
-  // Note the address of one of the repeated fields, to verify it was swapped
-  // rather than copied.
-  const int32_t* addr = &message1.repeated_int32().Get(0);
-#ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-  const int32_t value = *addr;
-#endif
-
-  using std::swap;
-  swap(message1, message2);
-
-  TestUtil::ExpectAllFieldsSet(message2);
-  TestUtil::ExpectClear(message1);
-
-#ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-  EXPECT_NE(addr, &message2.repeated_int32().Get(0));
-  EXPECT_EQ(value, message2.repeated_int32().Get(0));
-#else
-  EXPECT_EQ(addr, &message2.repeated_int32().Get(0));
-#endif
-}
-
-TEST(GENERATED_MESSAGE_TEST_NAME, CopyConstructor) {
-  // All set.
-  {
-    UNITTEST::TestAllTypes message1;
-    TestUtil::SetAllFields(&message1);
-
-    UNITTEST::TestAllTypes message2(message1);
-    TestUtil::ExpectAllFieldsSet(message2);
-  }
-
-  // None set.
-  {
-    UNITTEST::TestAllTypes message1;
-    // NOLINTNEXTLINE(performance-unnecessary-copy-initialization)
-    UNITTEST::TestAllTypes message2(message1);
-
-    EXPECT_FALSE(message1.has_optional_string());
-    EXPECT_FALSE(message2.has_optional_string());
-    EXPECT_EQ(message1.optional_string(), message2.optional_string());
-
-    EXPECT_FALSE(message1.has_optional_bytes());
-    EXPECT_FALSE(message2.has_optional_bytes());
-    EXPECT_EQ(message1.optional_bytes(), message2.optional_bytes());
-
-    EXPECT_FALSE(message1.has_optional_nested_message());
-    EXPECT_FALSE(message2.has_optional_nested_message());
-    EXPECT_EQ(&message1.optional_nested_message(),
-              &message2.optional_nested_message());
-
-    EXPECT_FALSE(message1.has_optional_foreign_message());
-    EXPECT_FALSE(message2.has_optional_foreign_message());
-    EXPECT_EQ(&message1.optional_foreign_message(),
-              &message2.optional_foreign_message());
-
-    EXPECT_FALSE(message1.has_optional_import_message());
-    EXPECT_FALSE(message2.has_optional_import_message());
-    EXPECT_EQ(&message1.optional_import_message(),
-              &message2.optional_import_message());
-
-    EXPECT_FALSE(message1.has_optional_public_import_message());
-    EXPECT_FALSE(message2.has_optional_public_import_message());
-    EXPECT_EQ(&message1.optional_public_import_message(),
-              &message2.optional_public_import_message());
-
-    EXPECT_FALSE(message1.has_optional_lazy_message());
-    EXPECT_FALSE(message2.has_optional_lazy_message());
-    EXPECT_EQ(&message1.optional_lazy_message(),
-              &message2.optional_lazy_message());
-  }
-}
-
-TEST(GENERATED_MESSAGE_TEST_NAME, CopyConstructorWithArenas) {
-  Arena arena;
-  UNITTEST::TestAllTypes* message1 =
-      Arena::CreateMessage<UNITTEST::TestAllTypes>(&arena);
-  TestUtil::SetAllFields(message1);
-
-  UNITTEST::TestAllTypes message2_stack(*message1);
-  TestUtil::ExpectAllFieldsSet(message2_stack);
-
-  std::unique_ptr<UNITTEST::TestAllTypes> message2_heap(
-      new UNITTEST::TestAllTypes(*message1));
-  TestUtil::ExpectAllFieldsSet(*message2_heap);
-
-  arena.Reset();
-
-  // Verify that the copies are still intact.
-  TestUtil::ExpectAllFieldsSet(message2_stack);
-  TestUtil::ExpectAllFieldsSet(*message2_heap);
-}
-
-#ifndef PROTOBUF_TEST_NO_DESCRIPTORS
-TEST(GENERATED_MESSAGE_TEST_NAME, UpcastCopyFrom) {
-  // Test the CopyFrom method that takes in the generic const Message&
-  // parameter.
-  UNITTEST::TestAllTypes message1, message2;
-
-  TestUtil::SetAllFields(&message1);
-
-  const Message* source = implicit_cast<const Message*>(&message1);
-  message2.CopyFrom(*source);
-
-  TestUtil::ExpectAllFieldsSet(message2);
-}
-
-TEST(GENERATED_MESSAGE_TEST_NAME, DynamicMessageCopyFrom) {
-  // Test copying from a DynamicMessage, which must fall back to using
-  // reflection.
-  UNITTEST::TestAllTypes message2;
-
-  // Construct a new version of the dynamic message via the factory.
-  DynamicMessageFactory factory;
-  std::unique_ptr<Message> message1;
-  message1.reset(factory.GetPrototype(
-                     UNITTEST::TestAllTypes::descriptor())->New());
-
-  TestUtil::ReflectionTester reflection_tester(
-    UNITTEST::TestAllTypes::descriptor());
-  reflection_tester.SetAllFieldsViaReflection(message1.get());
-
-  message2.CopyFrom(*message1);
-
-  TestUtil::ExpectAllFieldsSet(message2);
-}
-
-#endif  // !PROTOBUF_TEST_NO_DESCRIPTORS
-
-TEST(GENERATED_MESSAGE_TEST_NAME, NonEmptyMergeFrom) {
-  // Test merging with a non-empty message. Code is a modified form
-  // of that found in net/proto2/internal/reflection_ops_unittest.cc.
-  UNITTEST::TestAllTypes message1, message2;
-
-  TestUtil::SetAllFields(&message1);
-
-  // This field will test merging into an empty spot.
-  message2.set_optional_int32(message1.optional_int32());
-  message1.clear_optional_int32();
-
-  // This tests overwriting.
-  message2.set_optional_string(message1.optional_string());
-  message1.set_optional_string("something else");
-
-  // This tests concatenating.
-  message2.add_repeated_int32(message1.repeated_int32(1));
-  int32_t i = message1.repeated_int32(0);
-  message1.clear_repeated_int32();
-  message1.add_repeated_int32(i);
-
-  message1.MergeFrom(message2);
-
-  TestUtil::ExpectAllFieldsSet(message1);
-}
-
-
-// Test the generated SerializeWithCachedSizesToArray(),
-TEST(GENERATED_MESSAGE_TEST_NAME, SerializationToArray) {
-  UNITTEST::TestAllTypes message1, message2;
-  std::string data;
-  TestUtil::SetAllFields(&message1);
-  int size = message1.ByteSizeLong();
-  data.resize(size);
-  uint8_t* start = reinterpret_cast<uint8_t*>(::google::protobuf::string_as_array(&data));
-  uint8_t* end = message1.SerializeWithCachedSizesToArray(start);
-  EXPECT_EQ(size, end - start);
-  EXPECT_TRUE(message2.ParseFromString(data));
-  TestUtil::ExpectAllFieldsSet(message2);
-
-}
-
-TEST(GENERATED_MESSAGE_TEST_NAME, PackedFieldsSerializationToArray) {
-  UNITTEST::TestPackedTypes packed_message1, packed_message2;
-  std::string packed_data;
-  TestUtil::SetPackedFields(&packed_message1);
-  int packed_size = packed_message1.ByteSizeLong();
-  packed_data.resize(packed_size);
-  uint8_t* start =
-      reinterpret_cast<uint8_t*>(::google::protobuf::string_as_array(&packed_data));
-  uint8_t* end = packed_message1.SerializeWithCachedSizesToArray(start);
-  EXPECT_EQ(packed_size, end - start);
-  EXPECT_TRUE(packed_message2.ParseFromString(packed_data));
-  TestUtil::ExpectPackedFieldsSet(packed_message2);
-}
-
-// Test the generated SerializeWithCachedSizes() by forcing the buffer to write
-// one byte at a time.
-TEST(GENERATED_MESSAGE_TEST_NAME, SerializationToStream) {
-  UNITTEST::TestAllTypes message1, message2;
-  TestUtil::SetAllFields(&message1);
-  int size = message1.ByteSizeLong();
-  std::string data;
-  data.resize(size);
-  {
-    // Allow the output stream to buffer only one byte at a time.
-    io::ArrayOutputStream array_stream(::google::protobuf::string_as_array(&data), size, 1);
-    io::CodedOutputStream output_stream(&array_stream);
-    message1.SerializeWithCachedSizes(&output_stream);
-    EXPECT_FALSE(output_stream.HadError());
-    EXPECT_EQ(size, output_stream.ByteCount());
-  }
-  EXPECT_TRUE(message2.ParseFromString(data));
-  TestUtil::ExpectAllFieldsSet(message2);
-
-}
-
-TEST(GENERATED_MESSAGE_TEST_NAME, PackedFieldsSerializationToStream) {
-  UNITTEST::TestPackedTypes message1, message2;
-  TestUtil::SetPackedFields(&message1);
-  int size = message1.ByteSizeLong();
-  std::string data;
-  data.resize(size);
-  {
-    // Allow the output stream to buffer only one byte at a time.
-    io::ArrayOutputStream array_stream(::google::protobuf::string_as_array(&data), size, 1);
-    io::CodedOutputStream output_stream(&array_stream);
-    message1.SerializeWithCachedSizes(&output_stream);
-    EXPECT_FALSE(output_stream.HadError());
-    EXPECT_EQ(size, output_stream.ByteCount());
-  }
-  EXPECT_TRUE(message2.ParseFromString(data));
-  TestUtil::ExpectPackedFieldsSet(message2);
-}
-
-
-TEST(GENERATED_MESSAGE_TEST_NAME, Required) {
-  // Test that IsInitialized() returns false if required fields are missing.
-  UNITTEST::TestRequired message;
-
-  EXPECT_FALSE(message.IsInitialized());
-  message.set_a(1);
-  EXPECT_FALSE(message.IsInitialized());
-  message.set_b(2);
-  EXPECT_FALSE(message.IsInitialized());
-  message.set_c(3);
-  EXPECT_TRUE(message.IsInitialized());
-}
-
-TEST(GENERATED_MESSAGE_TEST_NAME, RequiredForeign) {
-  // Test that IsInitialized() returns false if required fields in nested
-  // messages are missing.
-  UNITTEST::TestRequiredForeign message;
-
-  EXPECT_TRUE(message.IsInitialized());
-
-  message.mutable_optional_message();
-  EXPECT_FALSE(message.IsInitialized());
-
-  message.mutable_optional_message()->set_a(1);
-  message.mutable_optional_message()->set_b(2);
-  message.mutable_optional_message()->set_c(3);
-  EXPECT_TRUE(message.IsInitialized());
-
-  message.add_repeated_message();
-  EXPECT_FALSE(message.IsInitialized());
-
-  message.mutable_repeated_message(0)->set_a(1);
-  message.mutable_repeated_message(0)->set_b(2);
-  message.mutable_repeated_message(0)->set_c(3);
-  EXPECT_TRUE(message.IsInitialized());
-}
-
-TEST(GENERATED_MESSAGE_TEST_NAME, ForeignNested) {
-  // Test that TestAllTypes::NestedMessage can be embedded directly into
-  // another message.
-  UNITTEST::TestForeignNested message;
-
-  // If this compiles and runs without crashing, it must work.  We have
-  // nothing more to test.
-  UNITTEST::TestAllTypes::NestedMessage* nested =
-    message.mutable_foreign_nested();
-  nested->set_bb(1);
-}
-
-TEST(GENERATED_MESSAGE_TEST_NAME, ReallyLargeTagNumber) {
-  // Test that really large tag numbers don't break anything.
-  UNITTEST::TestReallyLargeTagNumber message1, message2;
-  std::string data;
-
-  // For the most part, if this compiles and runs then we're probably good.
-  // (The most likely cause for failure would be if something were attempting
-  // to allocate a lookup table of some sort using tag numbers as the index.)
-  // We'll try serializing just for fun.
-  message1.set_a(1234);
-  message1.set_bb(5678);
-  message1.SerializeToString(&data);
-  EXPECT_TRUE(message2.ParseFromString(data));
-  EXPECT_EQ(1234, message2.a());
-  EXPECT_EQ(5678, message2.bb());
-}
-
-TEST(GENERATED_MESSAGE_TEST_NAME, MutualRecursion) {
-  // Test that mutually-recursive message types work.
-  UNITTEST::TestMutualRecursionA message;
-  UNITTEST::TestMutualRecursionA* nested = message.mutable_bb()->mutable_a();
-  UNITTEST::TestMutualRecursionA* nested2 = nested->mutable_bb()->mutable_a();
-
-  // Again, if the above compiles and runs, that's all we really have to
-  // test, but just for run we'll check that the system didn't somehow come
-  // up with a pointer loop...
-  EXPECT_NE(&message, nested);
-  EXPECT_NE(&message, nested2);
-  EXPECT_NE(nested, nested2);
-}
-
-TEST(GENERATED_MESSAGE_TEST_NAME, CamelCaseFieldNames) {
-  // This test is mainly checking that the following compiles, which verifies
-  // that the field names were coerced to lower-case.
-  //
-  // Protocol buffers standard style is to use lowercase-with-underscores for
-  // field names.  Some old proto1 .protos unfortunately used camel-case field
-  // names.  In proto1, these names were forced to lower-case.  So, we do the
-  // same thing in proto2.
-
-  UNITTEST::TestCamelCaseFieldNames message;
-
-  message.set_primitivefield(2);
-  message.set_stringfield("foo");
-  message.set_enumfield(UNITTEST::FOREIGN_FOO);
-  message.mutable_messagefield()->set_c(6);
-
-  message.add_repeatedprimitivefield(8);
-  message.add_repeatedstringfield("moo");
-  message.add_repeatedenumfield(UNITTEST::FOREIGN_BAR);
-  message.add_repeatedmessagefield()->set_c(15);
-
-  EXPECT_EQ(2, message.primitivefield());
-  EXPECT_EQ("foo", message.stringfield());
-  EXPECT_EQ(UNITTEST::FOREIGN_FOO, message.enumfield());
-  EXPECT_EQ(6, message.messagefield().c());
-
-  EXPECT_EQ(8, message.repeatedprimitivefield(0));
-  EXPECT_EQ("moo", message.repeatedstringfield(0));
-  EXPECT_EQ(UNITTEST::FOREIGN_BAR, message.repeatedenumfield(0));
-  EXPECT_EQ(15, message.repeatedmessagefield(0).c());
-}
-
-#ifndef PROTOBUF_TEST_NO_DESCRIPTORS
-
-TEST(GENERATED_MESSAGE_TEST_NAME, TestOptimizedForSize) {
-  // We rely on the tests in reflection_ops_unittest and wire_format_unittest
-  // to really test that reflection-based methods work.  Here we are mostly
-  // just making sure that TestOptimizedForSize actually builds and seems to
-  // function.
-
-  UNITTEST::TestOptimizedForSize message, message2;
-  message.set_i(1);
-  message.mutable_msg()->set_c(2);
-  message2.CopyFrom(message);
-  EXPECT_EQ(1, message2.i());
-  EXPECT_EQ(2, message2.msg().c());
-}
-
-TEST(GENERATED_MESSAGE_TEST_NAME, TestEmbedOptimizedForSize) {
-  // Verifies that something optimized for speed can contain something optimized
-  // for size.
-
-  UNITTEST::TestEmbedOptimizedForSize message, message2;
-  message.mutable_optional_message()->set_i(1);
-  message.add_repeated_message()->mutable_msg()->set_c(2);
-  std::string data;
-  message.SerializeToString(&data);
-  ASSERT_TRUE(message2.ParseFromString(data));
-  EXPECT_EQ(1, message2.optional_message().i());
-  EXPECT_EQ(2, message2.repeated_message(0).msg().c());
-}
-
-TEST(GENERATED_MESSAGE_TEST_NAME, TestSpaceUsed) {
-  // Allocate explicitly on the heap to prevent arena creation.
-  std::unique_ptr<UNITTEST::TestAllTypes> message1(
-    Arena::CreateMessage<UNITTEST::TestAllTypes>(nullptr));
-  // sizeof provides a lower bound on SpaceUsedLong().
-  EXPECT_LE(sizeof(UNITTEST::TestAllTypes), message1->SpaceUsedLong());
-  const size_t empty_message_size = message1->SpaceUsedLong();
-
-  // Setting primitive types shouldn't affect the space used.
-  message1->set_optional_int32(123);
-  message1->set_optional_int64(12345);
-  message1->set_optional_uint32(123);
-  message1->set_optional_uint64(12345);
-  EXPECT_EQ(empty_message_size, message1->SpaceUsedLong());
-
-  // On some STL implementations, setting the string to a small value should
-  // only increase SpaceUsedLong() by the size of a string object, though this
-  // is not true everywhere.
-  message1->set_optional_string("abc");
-  EXPECT_LE(empty_message_size + message1->optional_string().size(),
-            message1->SpaceUsedLong());
-
-  // Setting a string to a value larger than the string object itself should
-  // increase SpaceUsedLong(), because it cannot store the value internally.
-  message1->set_optional_string(std::string(sizeof(std::string) + 1, 'x'));
-  int min_expected_increase = message1->optional_string().capacity();
-  EXPECT_LE(empty_message_size + min_expected_increase,
-            message1->SpaceUsedLong());
-
-  size_t previous_size = message1->SpaceUsedLong();
-  // Adding an optional message should increase the size by the size of the
-  // nested message type. NestedMessage is simple enough (1 int field) that it
-  // is equal to sizeof(NestedMessage)
-  message1->mutable_optional_nested_message();
-  ASSERT_EQ(sizeof(UNITTEST::TestAllTypes::NestedMessage),
-            message1->optional_nested_message().SpaceUsedLong());
-  EXPECT_EQ(previous_size +
-            sizeof(UNITTEST::TestAllTypes::NestedMessage),
-            message1->SpaceUsedLong());
-}
-
-TEST(GENERATED_MESSAGE_TEST_NAME, TestOneofSpaceUsed) {
-  // Allocate explicitly on the heap to prevent arena creation.
-  std::unique_ptr<UNITTEST::TestOneof2> message1(
-    Arena::CreateMessage<UNITTEST::TestOneof2>(nullptr));
-  EXPECT_LE(sizeof(UNITTEST::TestOneof2), message1->SpaceUsedLong());
-
-  const size_t empty_message_size = message1->SpaceUsedLong();
-  // Setting primitive types shouldn't affect the space used.
-  message1->set_foo_int(123);
-  message1->set_bar_int(12345);
-  EXPECT_EQ(empty_message_size, message1->SpaceUsedLong());
-
-  // Setting a string in oneof to a small value should only increase
-  // SpaceUsedLong() by the size of a string object.
-  message1->set_foo_string("abc");
-  EXPECT_LE(empty_message_size + sizeof(std::string), message1->SpaceUsedLong());
-
-  // Setting a string in oneof to a value larger than the string object itself
-  // should increase SpaceUsedLong(), because it cannot store the value
-  // internally.
-  message1->set_foo_string(std::string(sizeof(std::string) + 1, 'x'));
-  int min_expected_increase =
-      message1->foo_string().capacity() + sizeof(std::string);
-  EXPECT_LE(empty_message_size + min_expected_increase,
-            message1->SpaceUsedLong());
-
-  // Setting a message in oneof should delete the other fields and increase the
-  // size by the size of the nested message type. NestedMessage is simple enough
-  // that it is equal to sizeof(NestedMessage). It may be backed by LazyField,
-  // increasing space used by LazyField and backing Cord.
-  message1->mutable_foo_message();
-  ASSERT_EQ(sizeof(UNITTEST::TestOneof2::NestedMessage),
-            message1->foo_message().SpaceUsedLong());
-  EXPECT_LE(empty_message_size + sizeof(UNITTEST::TestOneof2::NestedMessage),
-            message1->SpaceUsedLong());
-}
-
-#endif  // !PROTOBUF_TEST_NO_DESCRIPTORS
-
-TEST(GENERATED_MESSAGE_TEST_NAME, FieldConstantValues) {
-  UNITTEST::TestRequired message;
-  EXPECT_EQ(UNITTEST::TestAllTypes_NestedMessage::kBbFieldNumber, 1);
-  EXPECT_EQ(UNITTEST::TestAllTypes::kOptionalInt32FieldNumber, 1);
-  EXPECT_EQ(UNITTEST::TestAllTypes::kOptionalgroupFieldNumber, 16);
-  EXPECT_EQ(UNITTEST::TestAllTypes::kOptionalNestedMessageFieldNumber, 18);
-  EXPECT_EQ(UNITTEST::TestAllTypes::kOptionalNestedEnumFieldNumber, 21);
-  EXPECT_EQ(UNITTEST::TestAllTypes::kRepeatedInt32FieldNumber, 31);
-  EXPECT_EQ(UNITTEST::TestAllTypes::kRepeatedgroupFieldNumber, 46);
-  EXPECT_EQ(UNITTEST::TestAllTypes::kRepeatedNestedMessageFieldNumber, 48);
-  EXPECT_EQ(UNITTEST::TestAllTypes::kRepeatedNestedEnumFieldNumber, 51);
-}
-
-TEST(GENERATED_MESSAGE_TEST_NAME, ExtensionConstantValues) {
-  EXPECT_EQ(UNITTEST::TestRequired::kSingleFieldNumber, 1000);
-  EXPECT_EQ(UNITTEST::TestRequired::kMultiFieldNumber, 1001);
-  EXPECT_EQ(UNITTEST::kOptionalInt32ExtensionFieldNumber, 1);
-  EXPECT_EQ(UNITTEST::kOptionalgroupExtensionFieldNumber, 16);
-  EXPECT_EQ(UNITTEST::kOptionalNestedMessageExtensionFieldNumber, 18);
-  EXPECT_EQ(UNITTEST::kOptionalNestedEnumExtensionFieldNumber, 21);
-  EXPECT_EQ(UNITTEST::kRepeatedInt32ExtensionFieldNumber, 31);
-  EXPECT_EQ(UNITTEST::kRepeatedgroupExtensionFieldNumber, 46);
-  EXPECT_EQ(UNITTEST::kRepeatedNestedMessageExtensionFieldNumber, 48);
-  EXPECT_EQ(UNITTEST::kRepeatedNestedEnumExtensionFieldNumber, 51);
-}
-
-TEST(GENERATED_MESSAGE_TEST_NAME, ParseFromTruncated) {
-  const std::string long_string = std::string(128, 'q');
-  FileDescriptorProto p;
-  p.add_extension()->set_name(long_string);
-  const std::string msg = p.SerializeAsString();
-  int successful_count = 0;
-  for (int i = 0; i <= msg.size(); i++) {
-    if (p.ParseFromArray(msg.c_str(), i)) {
-      ++successful_count;
-    }
-  }
-  // We don't really care about how often we succeeded.
-  // As long as we didn't crash, we're happy.
-  EXPECT_GE(successful_count, 1);
-}
-
-// ===================================================================
-
-TEST(GENERATED_ENUM_TEST_NAME, EnumValuesAsSwitchCases) {
-  // Test that our nested enum values can be used as switch cases.  This test
-  // doesn't actually do anything, the proof that it works is that it
-  // compiles.
-  int i =0;
-  UNITTEST::TestAllTypes::NestedEnum a = UNITTEST::TestAllTypes::BAR;
-  switch (a) {
-    case UNITTEST::TestAllTypes::FOO:
-      i = 1;
-      break;
-    case UNITTEST::TestAllTypes::BAR:
-      i = 2;
-      break;
-    case UNITTEST::TestAllTypes::BAZ:
-      i = 3;
-      break;
-    case UNITTEST::TestAllTypes::NEG:
-      i = -1;
-      break;
-    // no default case:  We want to make sure the compiler recognizes that
-    //   all cases are covered.  (GCC warns if you do not cover all cases of
-    //   an enum in a switch.)
-  }
-
-  // Token check just for fun.
-  EXPECT_EQ(2, i);
-}
-
-TEST(GENERATED_ENUM_TEST_NAME, IsValidValue) {
-  // Test enum IsValidValue.
-  EXPECT_TRUE(UNITTEST::TestAllTypes::NestedEnum_IsValid(1));
-  EXPECT_TRUE(UNITTEST::TestAllTypes::NestedEnum_IsValid(2));
-  EXPECT_TRUE(UNITTEST::TestAllTypes::NestedEnum_IsValid(3));
-
-  EXPECT_FALSE(UNITTEST::TestAllTypes::NestedEnum_IsValid(0));
-  EXPECT_FALSE(UNITTEST::TestAllTypes::NestedEnum_IsValid(4));
-
-  // Make sure it also works when there are dups.
-  EXPECT_TRUE(UNITTEST::TestEnumWithDupValue_IsValid(1));
-  EXPECT_TRUE(UNITTEST::TestEnumWithDupValue_IsValid(2));
-  EXPECT_TRUE(UNITTEST::TestEnumWithDupValue_IsValid(3));
-
-  EXPECT_FALSE(UNITTEST::TestEnumWithDupValue_IsValid(0));
-  EXPECT_FALSE(UNITTEST::TestEnumWithDupValue_IsValid(4));
-}
-
-TEST(GENERATED_ENUM_TEST_NAME, MinAndMax) {
-  EXPECT_EQ(UNITTEST::TestAllTypes::NEG,
-            UNITTEST::TestAllTypes::NestedEnum_MIN);
-  EXPECT_EQ(UNITTEST::TestAllTypes::BAZ,
-            UNITTEST::TestAllTypes::NestedEnum_MAX);
-  EXPECT_EQ(4, UNITTEST::TestAllTypes::NestedEnum_ARRAYSIZE);
-
-  EXPECT_EQ(UNITTEST::FOREIGN_FOO, UNITTEST::ForeignEnum_MIN);
-  EXPECT_EQ(UNITTEST::FOREIGN_BAZ, UNITTEST::ForeignEnum_MAX);
-  EXPECT_EQ(7, UNITTEST::ForeignEnum_ARRAYSIZE);
-
-  EXPECT_EQ(1, UNITTEST::TestEnumWithDupValue_MIN);
-  EXPECT_EQ(3, UNITTEST::TestEnumWithDupValue_MAX);
-  EXPECT_EQ(4, UNITTEST::TestEnumWithDupValue_ARRAYSIZE);
-
-  EXPECT_EQ(UNITTEST::SPARSE_E, UNITTEST::TestSparseEnum_MIN);
-  EXPECT_EQ(UNITTEST::SPARSE_C, UNITTEST::TestSparseEnum_MAX);
-  EXPECT_EQ(12589235, UNITTEST::TestSparseEnum_ARRAYSIZE);
-
-  // Make sure we can take the address of _MIN, _MAX and _ARRAYSIZE.
-  EXPECT_NE(nullptr, &UNITTEST::TestAllTypes::NestedEnum_MIN);
-  EXPECT_NE(nullptr, &UNITTEST::TestAllTypes::NestedEnum_MAX);
-  EXPECT_NE(nullptr, &UNITTEST::TestAllTypes::NestedEnum_ARRAYSIZE);
-
-  EXPECT_NE(nullptr, &UNITTEST::ForeignEnum_MIN);
-  EXPECT_NE(nullptr, &UNITTEST::ForeignEnum_MAX);
-  EXPECT_NE(nullptr, &UNITTEST::ForeignEnum_ARRAYSIZE);
-
-  // Make sure we can use _MIN and _MAX as switch cases.
-  switch (UNITTEST::SPARSE_A) {
-    case UNITTEST::TestSparseEnum_MIN:
-    case UNITTEST::TestSparseEnum_MAX:
-      break;
-    default:
-      break;
-  }
-}
-
-#ifndef PROTOBUF_TEST_NO_DESCRIPTORS
-
-TEST(GENERATED_ENUM_TEST_NAME, Name) {
-  // "Names" in the presence of dup values map to the first alias.
-  EXPECT_EQ("FOO1", UNITTEST::TestEnumWithDupValue_Name(UNITTEST::FOO1));
-  EXPECT_EQ("FOO1", UNITTEST::TestEnumWithDupValue_Name(UNITTEST::FOO2));
-
-  EXPECT_EQ("SPARSE_A", UNITTEST::TestSparseEnum_Name(UNITTEST::SPARSE_A));
-  EXPECT_EQ("SPARSE_B", UNITTEST::TestSparseEnum_Name(UNITTEST::SPARSE_B));
-  EXPECT_EQ("SPARSE_C", UNITTEST::TestSparseEnum_Name(UNITTEST::SPARSE_C));
-  EXPECT_EQ("SPARSE_D", UNITTEST::TestSparseEnum_Name(UNITTEST::SPARSE_D));
-  EXPECT_EQ("SPARSE_E", UNITTEST::TestSparseEnum_Name(UNITTEST::SPARSE_E));
-  EXPECT_EQ("SPARSE_F", UNITTEST::TestSparseEnum_Name(UNITTEST::SPARSE_F));
-  EXPECT_EQ("SPARSE_G", UNITTEST::TestSparseEnum_Name(UNITTEST::SPARSE_G));
-}
-
-TEST(GENERATED_ENUM_TEST_NAME, Parse) {
-  UNITTEST::TestEnumWithDupValue dup_value = UNITTEST::FOO1;
-  EXPECT_TRUE(UNITTEST::TestEnumWithDupValue_Parse("FOO1", &dup_value));
-  EXPECT_EQ(UNITTEST::FOO1, dup_value);
-  EXPECT_TRUE(UNITTEST::TestEnumWithDupValue_Parse("FOO2", &dup_value));
-  EXPECT_EQ(UNITTEST::FOO2, dup_value);
-  EXPECT_FALSE(UNITTEST::TestEnumWithDupValue_Parse("FOO", &dup_value));
-}
-
-TEST(GENERATED_ENUM_TEST_NAME, GetEnumDescriptor) {
-  EXPECT_EQ(UNITTEST::TestAllTypes::NestedEnum_descriptor(),
-            GetEnumDescriptor<UNITTEST::TestAllTypes::NestedEnum>());
-  EXPECT_EQ(UNITTEST::ForeignEnum_descriptor(),
-            GetEnumDescriptor<UNITTEST::ForeignEnum>());
-  EXPECT_EQ(UNITTEST::TestEnumWithDupValue_descriptor(),
-            GetEnumDescriptor<UNITTEST::TestEnumWithDupValue>());
-  EXPECT_EQ(UNITTEST::TestSparseEnum_descriptor(),
-            GetEnumDescriptor<UNITTEST::TestSparseEnum>());
-}
-
-enum NonProtoEnum {
-  kFoo = 1,
-};
-
-TEST(GENERATED_ENUM_TEST_NAME, IsProtoEnumTypeTrait) {
-  EXPECT_TRUE(is_proto_enum<UNITTEST::TestAllTypes::NestedEnum>::value);
-  EXPECT_TRUE(is_proto_enum<UNITTEST::ForeignEnum>::value);
-  EXPECT_TRUE(is_proto_enum<UNITTEST::TestEnumWithDupValue>::value);
-  EXPECT_TRUE(is_proto_enum<UNITTEST::TestSparseEnum>::value);
-
-  EXPECT_FALSE(is_proto_enum<int>::value);
-  EXPECT_FALSE(is_proto_enum<NonProtoEnum>::value);
-}
-
-#endif  // PROTOBUF_TEST_NO_DESCRIPTORS
-
-// ===================================================================
-
-#ifndef PROTOBUF_TEST_NO_DESCRIPTORS
-
-// Support code for testing services.
-class GENERATED_SERVICE_TEST_NAME : public testing::Test {
- protected:
-  class MockTestService : public UNITTEST::TestService {
-   public:
-    MockTestService()
-        : called_(false),
-          method_(""),
-          controller_(nullptr),
-          request_(nullptr),
-          response_(nullptr),
-          done_(nullptr) {}
-
-    ~MockTestService() override {}
-
-    void Reset() { called_ = false; }
-
-    // implements TestService ----------------------------------------
-
-    void Foo(RpcController* controller, const UNITTEST::FooRequest* request,
-             UNITTEST::FooResponse* response, Closure* done) override {
-      ASSERT_FALSE(called_);
-      called_ = true;
-      method_ = "Foo";
-      controller_ = controller;
-      request_ = request;
-      response_ = response;
-      done_ = done;
-    }
-
-    void Bar(RpcController* controller, const UNITTEST::BarRequest* request,
-             UNITTEST::BarResponse* response, Closure* done) override {
-      ASSERT_FALSE(called_);
-      called_ = true;
-      method_ = "Bar";
-      controller_ = controller;
-      request_ = request;
-      response_ = response;
-      done_ = done;
-    }
-
-    // ---------------------------------------------------------------
-
-    bool called_;
-    std::string method_;
-    RpcController* controller_;
-    const Message* request_;
-    Message* response_;
-    Closure* done_;
-  };
-
-  class MockRpcChannel : public RpcChannel {
-   public:
-    MockRpcChannel()
-        : called_(false),
-          method_(nullptr),
-          controller_(nullptr),
-          request_(nullptr),
-          response_(nullptr),
-          done_(nullptr),
-          destroyed_(nullptr) {}
-
-    ~MockRpcChannel() override {
-      if (destroyed_ != nullptr) *destroyed_ = true;
-    }
-
-    void Reset() { called_ = false; }
-
-    // implements TestService ----------------------------------------
-
-    void CallMethod(const MethodDescriptor* method, RpcController* controller,
-                    const Message* request, Message* response,
-                    Closure* done) override {
-      ASSERT_FALSE(called_);
-      called_ = true;
-      method_ = method;
-      controller_ = controller;
-      request_ = request;
-      response_ = response;
-      done_ = done;
-    }
-
-    // ---------------------------------------------------------------
-
-    bool called_;
-    const MethodDescriptor* method_;
-    RpcController* controller_;
-    const Message* request_;
-    Message* response_;
-    Closure* done_;
-    bool* destroyed_;
-  };
-
-  class MockController : public RpcController {
-   public:
-    void Reset() override {
-      ADD_FAILURE() << "Reset() not expected during this test.";
-    }
-    bool Failed() const override {
-      ADD_FAILURE() << "Failed() not expected during this test.";
-      return false;
-    }
-    std::string ErrorText() const override {
-      ADD_FAILURE() << "ErrorText() not expected during this test.";
-      return "";
-    }
-    void StartCancel() override {
-      ADD_FAILURE() << "StartCancel() not expected during this test.";
-    }
-    void SetFailed(const std::string& reason) override {
-      ADD_FAILURE() << "SetFailed() not expected during this test.";
-    }
-    bool IsCanceled() const override {
-      ADD_FAILURE() << "IsCanceled() not expected during this test.";
-      return false;
-    }
-    void NotifyOnCancel(Closure* callback) override {
-      ADD_FAILURE() << "NotifyOnCancel() not expected during this test.";
-    }
-  };
-
-  GENERATED_SERVICE_TEST_NAME()
-    : descriptor_(UNITTEST::TestService::descriptor()),
-      foo_(descriptor_->FindMethodByName("Foo")),
-      bar_(descriptor_->FindMethodByName("Bar")),
-      stub_(&mock_channel_),
-      done_(::google::protobuf::NewPermanentCallback(&DoNothing)) {}
-
-  void SetUp() override {
-    ASSERT_TRUE(foo_ != nullptr);
-    ASSERT_TRUE(bar_ != nullptr);
-  }
-
-  const ServiceDescriptor* descriptor_;
-  const MethodDescriptor* foo_;
-  const MethodDescriptor* bar_;
-
-  MockTestService mock_service_;
-  MockController mock_controller_;
-
-  MockRpcChannel mock_channel_;
-  UNITTEST::TestService::Stub stub_;
-
-  // Just so we don't have to re-define these with every test.
-  UNITTEST::FooRequest foo_request_;
-  UNITTEST::FooResponse foo_response_;
-  UNITTEST::BarRequest bar_request_;
-  UNITTEST::BarResponse bar_response_;
-  std::unique_ptr<Closure> done_;
-};
-
-TEST_F(GENERATED_SERVICE_TEST_NAME, GetDescriptor) {
-  // Test that GetDescriptor() works.
-
-  EXPECT_EQ(descriptor_, mock_service_.GetDescriptor());
-}
-
-TEST_F(GENERATED_SERVICE_TEST_NAME, GetChannel) {
-  EXPECT_EQ(&mock_channel_, stub_.channel());
-}
-
-TEST_F(GENERATED_SERVICE_TEST_NAME, OwnsChannel) {
-  MockRpcChannel* channel = new MockRpcChannel;
-  bool destroyed = false;
-  channel->destroyed_ = &destroyed;
-
-  {
-    UNITTEST::TestService::Stub owning_stub(channel,
-                                            Service::STUB_OWNS_CHANNEL);
-    EXPECT_FALSE(destroyed);
-  }
-
-  EXPECT_TRUE(destroyed);
-}
-
-TEST_F(GENERATED_SERVICE_TEST_NAME, CallMethod) {
-  // Test that CallMethod() works.
-
-  // Call Foo() via CallMethod().
-  mock_service_.CallMethod(foo_, &mock_controller_,
-                           &foo_request_, &foo_response_, done_.get());
-
-  ASSERT_TRUE(mock_service_.called_);
-
-  EXPECT_EQ("Foo"            , mock_service_.method_    );
-  EXPECT_EQ(&mock_controller_, mock_service_.controller_);
-  EXPECT_EQ(&foo_request_    , mock_service_.request_   );
-  EXPECT_EQ(&foo_response_   , mock_service_.response_  );
-  EXPECT_EQ(done_.get()      , mock_service_.done_      );
-
-  // Try again, but call Bar() instead.
-  mock_service_.Reset();
-  mock_service_.CallMethod(bar_, &mock_controller_,
-                           &bar_request_, &bar_response_, done_.get());
-
-  ASSERT_TRUE(mock_service_.called_);
-  EXPECT_EQ("Bar", mock_service_.method_);
-}
-
-TEST_F(GENERATED_SERVICE_TEST_NAME, CallMethodTypeFailure) {
-  // Verify death if we call Foo() with Bar's message types.
-
-#ifdef PROTOBUF_HAS_DEATH_TEST  // death tests do not work on Windows yet
-  EXPECT_DEBUG_DEATH(
-    mock_service_.CallMethod(foo_, &mock_controller_,
-                             &foo_request_, &bar_response_, done_.get()),
-    "dynamic_cast");
-
-  mock_service_.Reset();
-  EXPECT_DEBUG_DEATH(
-    mock_service_.CallMethod(foo_, &mock_controller_,
-                             &bar_request_, &foo_response_, done_.get()),
-    "dynamic_cast");
-#endif  // PROTOBUF_HAS_DEATH_TEST
-}
-
-TEST_F(GENERATED_SERVICE_TEST_NAME, GetPrototypes) {
-  // Test Get{Request,Response}Prototype() methods.
-
-  EXPECT_EQ(&UNITTEST::FooRequest::default_instance(),
-            &mock_service_.GetRequestPrototype(foo_));
-  EXPECT_EQ(&UNITTEST::BarRequest::default_instance(),
-            &mock_service_.GetRequestPrototype(bar_));
-
-  EXPECT_EQ(&UNITTEST::FooResponse::default_instance(),
-            &mock_service_.GetResponsePrototype(foo_));
-  EXPECT_EQ(&UNITTEST::BarResponse::default_instance(),
-            &mock_service_.GetResponsePrototype(bar_));
-}
-
-TEST_F(GENERATED_SERVICE_TEST_NAME, Stub) {
-  // Test that the stub class works.
-
-  // Call Foo() via the stub.
-  stub_.Foo(&mock_controller_, &foo_request_, &foo_response_, done_.get());
-
-  ASSERT_TRUE(mock_channel_.called_);
-
-  EXPECT_EQ(foo_             , mock_channel_.method_    );
-  EXPECT_EQ(&mock_controller_, mock_channel_.controller_);
-  EXPECT_EQ(&foo_request_    , mock_channel_.request_   );
-  EXPECT_EQ(&foo_response_   , mock_channel_.response_  );
-  EXPECT_EQ(done_.get()      , mock_channel_.done_      );
-
-  // Call Bar() via the stub.
-  mock_channel_.Reset();
-  stub_.Bar(&mock_controller_, &bar_request_, &bar_response_, done_.get());
-
-  ASSERT_TRUE(mock_channel_.called_);
-  EXPECT_EQ(bar_, mock_channel_.method_);
-}
-
-TEST_F(GENERATED_SERVICE_TEST_NAME, NotImplemented) {
-  // Test that failing to implement a method of a service causes it to fail
-  // with a "not implemented" error message.
-
-  // A service which doesn't implement any methods.
-  class UnimplementedService : public UNITTEST::TestService {
-   public:
-    UnimplementedService() {}
-  };
-
-  UnimplementedService unimplemented_service;
-
-  // And a controller which expects to get a "not implemented" error.
-  class ExpectUnimplementedController : public MockController {
-   public:
-    ExpectUnimplementedController() : called_(false) {}
-
-    void SetFailed(const std::string& reason) override {
-      EXPECT_FALSE(called_);
-      called_ = true;
-      EXPECT_EQ("Method Foo() not implemented.", reason);
-    }
-
-    bool called_;
-  };
-
-  ExpectUnimplementedController controller;
-
-  // Call Foo.
-  unimplemented_service.Foo(&controller, &foo_request_, &foo_response_,
-                            done_.get());
-
-  EXPECT_TRUE(controller.called_);
-}
-
-// ===================================================================
-
-class OneofTest : public testing::Test {
- protected:
-  void SetUp() override {}
-
-  void ExpectEnumCasesWork(const UNITTEST::TestOneof2 &message) {
-    switch (message.foo_case()) {
-      case UNITTEST::TestOneof2::kFooInt:
-        EXPECT_TRUE(message.has_foo_int());
-        break;
-      case UNITTEST::TestOneof2::kFooString:
-        EXPECT_TRUE(message.has_foo_string());
-        break;
-      case UNITTEST::TestOneof2::kFooCord:
-        EXPECT_TRUE(message.has_foo_cord());
-        break;
-      case UNITTEST::TestOneof2::kFooStringPiece:
-        EXPECT_TRUE(message.has_foo_string_piece());
-        break;
-      case UNITTEST::TestOneof2::kFooBytes:
-        EXPECT_TRUE(message.has_foo_bytes());
-        break;
-      case UNITTEST::TestOneof2::kFooEnum:
-        EXPECT_TRUE(message.has_foo_enum());
-        break;
-      case UNITTEST::TestOneof2::kFooMessage:
-        EXPECT_TRUE(message.has_foo_message());
-        break;
-      case UNITTEST::TestOneof2::kFoogroup:
-        EXPECT_TRUE(message.has_foogroup());
-        break;
-      case UNITTEST::TestOneof2::kFooLazyMessage:
-        EXPECT_TRUE(message.has_foo_lazy_message());
-        break;
-      case UNITTEST::TestOneof2::FOO_NOT_SET:
-        break;
-    }
-  }
-};
-
-TEST_F(OneofTest, SettingOneFieldClearsOthers) {
-  UNITTEST::TestOneof2 message;
-
-  message.set_foo_int(123);
-  EXPECT_TRUE(message.has_foo_int());
-  TestUtil::ExpectAtMostOneFieldSetInOneof(message);
-
-  message.set_foo_string("foo");
-  EXPECT_TRUE(message.has_foo_string());
-  TestUtil::ExpectAtMostOneFieldSetInOneof(message);
-
-
-  message.set_foo_bytes("moo");
-  EXPECT_TRUE(message.has_foo_bytes());
-  TestUtil::ExpectAtMostOneFieldSetInOneof(message);
-
-  message.set_foo_enum(UNITTEST::TestOneof2::FOO);
-  EXPECT_TRUE(message.has_foo_enum());
-  TestUtil::ExpectAtMostOneFieldSetInOneof(message);
-
-  message.mutable_foo_message()->set_moo_int(234);
-  EXPECT_TRUE(message.has_foo_message());
-  TestUtil::ExpectAtMostOneFieldSetInOneof(message);
-
-  message.mutable_foogroup()->set_a(345);
-  EXPECT_TRUE(message.has_foogroup());
-  TestUtil::ExpectAtMostOneFieldSetInOneof(message);
-
-
-  // we repeat this because we didn't test if this properly clears other fields
-  // at the beginning.
-  message.set_foo_int(123);
-  EXPECT_TRUE(message.has_foo_int());
-  TestUtil::ExpectAtMostOneFieldSetInOneof(message);
-}
-
-TEST_F(OneofTest, EnumCases) {
-  UNITTEST::TestOneof2 message;
-
-  message.set_foo_int(123);
-  ExpectEnumCasesWork(message);
-  message.set_foo_string("foo");
-  ExpectEnumCasesWork(message);
-  message.set_foo_bytes("moo");
-  ExpectEnumCasesWork(message);
-  message.set_foo_enum(UNITTEST::TestOneof2::FOO);
-  ExpectEnumCasesWork(message);
-  message.mutable_foo_message()->set_moo_int(234);
-  ExpectEnumCasesWork(message);
-  message.mutable_foogroup()->set_a(345);
-  ExpectEnumCasesWork(message);
-}
-
-TEST_F(OneofTest, PrimitiveType) {
-  UNITTEST::TestOneof2 message;
-  // Unset field returns default value
-  EXPECT_EQ(message.foo_int(), 0);
-
-  message.set_foo_int(123);
-  EXPECT_TRUE(message.has_foo_int());
-  EXPECT_EQ(message.foo_int(), 123);
-  message.clear_foo_int();
-  EXPECT_FALSE(message.has_foo_int());
-}
-
-TEST_F(OneofTest, EnumType) {
-  UNITTEST::TestOneof2 message;
-  // Unset field returns default value
-  EXPECT_EQ(message.foo_enum(), 1);
-
-  message.set_foo_enum(UNITTEST::TestOneof2::FOO);
-  EXPECT_TRUE(message.has_foo_enum());
-  EXPECT_EQ(message.foo_enum(), UNITTEST::TestOneof2::FOO);
-  message.clear_foo_enum();
-  EXPECT_FALSE(message.has_foo_enum());
-}
-
-TEST_F(OneofTest, SetString) {
-  // Check that setting a string field in various ways works
-  UNITTEST::TestOneof2 message;
-
-  // Unset field returns default value
-  EXPECT_EQ(message.foo_string(), "");
-
-  message.set_foo_string("foo");
-  EXPECT_TRUE(message.has_foo_string());
-  EXPECT_EQ(message.foo_string(), "foo");
-  message.clear_foo_string();
-  EXPECT_FALSE(message.has_foo_string());
-
-  message.set_foo_string(std::string("bar"));
-  EXPECT_TRUE(message.has_foo_string());
-  EXPECT_EQ(message.foo_string(), "bar");
-  message.clear_foo_string();
-  EXPECT_FALSE(message.has_foo_string());
-
-
-  message.set_foo_string("moo", 3);
-  EXPECT_TRUE(message.has_foo_string());
-  EXPECT_EQ(message.foo_string(), "moo");
-  message.clear_foo_string();
-  EXPECT_FALSE(message.has_foo_string());
-
-  message.mutable_foo_string()->assign("mooo");
-  EXPECT_TRUE(message.has_foo_string());
-  EXPECT_EQ(message.foo_string(), "mooo");
-  message.clear_foo_string();
-  EXPECT_FALSE(message.has_foo_string());
-
-  message.set_foo_string("corge");
-  EXPECT_TRUE(message.has_foo_string());
-  EXPECT_EQ(message.foo_string(), "corge");
-  message.clear_foo_string();
-  EXPECT_FALSE(message.has_foo_string());
-}
-
-TEST_F(OneofTest, ReleaseString) {
-  // Check that release_foo() starts out nullptr, and gives us a value
-  // that we can delete after it's been set.
-  UNITTEST::TestOneof2 message;
-
-  EXPECT_EQ(nullptr, message.release_foo_string());
-  EXPECT_FALSE(message.has_foo_string());
-
-  message.set_foo_string("blah");
-  EXPECT_TRUE(message.has_foo_string());
-  std::unique_ptr<std::string> str(message.release_foo_string());
-  EXPECT_FALSE(message.has_foo_string());
-  ASSERT_TRUE(str != nullptr);
-  EXPECT_EQ("blah", *str);
-
-  EXPECT_EQ(nullptr, message.release_foo_string());
-  EXPECT_FALSE(message.has_foo_string());
-}
-
-TEST_F(OneofTest, SetAllocatedString) {
-  // Check that set_allocated_foo() works for strings.
-  UNITTEST::TestOneof2 message;
-
-  EXPECT_FALSE(message.has_foo_string());
-  const std::string kHello("hello");
-  message.set_foo_string(kHello);
-  EXPECT_TRUE(message.has_foo_string());
-
-  message.set_allocated_foo_string(nullptr);
-  EXPECT_FALSE(message.has_foo_string());
-  EXPECT_EQ("", message.foo_string());
-
-  message.set_allocated_foo_string(new std::string(kHello));
-  EXPECT_TRUE(message.has_foo_string());
-  EXPECT_EQ(kHello, message.foo_string());
-}
-
-TEST_F(OneofTest, ArenaSetAllocatedString) {
-  // Check that set_allocated_foo() works for strings.
-  Arena arena;
-  UNITTEST::TestOneof2* message =
-      Arena::CreateMessage<UNITTEST::TestOneof2>(&arena);
-
-  EXPECT_FALSE(message->has_foo_string());
-  const std::string kHello("hello");
-  message->set_foo_string(kHello);
-  EXPECT_TRUE(message->has_foo_string());
-
-  message->set_allocated_foo_string(nullptr);
-  EXPECT_FALSE(message->has_foo_string());
-  EXPECT_EQ("", message->foo_string());
-
-  message->set_allocated_foo_string(new std::string(kHello));
-  EXPECT_TRUE(message->has_foo_string());
-  EXPECT_EQ(kHello, message->foo_string());
-}
-
-
-TEST_F(OneofTest, SetMessage) {
-  // Check that setting a message field works
-  UNITTEST::TestOneof2 message;
-
-  // Unset field returns default instance
-  EXPECT_EQ(&message.foo_message(),
-            &UNITTEST::TestOneof2_NestedMessage::default_instance());
-  EXPECT_EQ(message.foo_message().moo_int(), 0);
-
-  message.mutable_foo_message()->set_moo_int(234);
-  EXPECT_TRUE(message.has_foo_message());
-  EXPECT_EQ(message.foo_message().moo_int(), 234);
-  message.clear_foo_message();
-  EXPECT_FALSE(message.has_foo_message());
-}
-
-TEST_F(OneofTest, ReleaseMessage) {
-  // Check that release_foo() starts out nullptr, and gives us a value
-  // that we can delete after it's been set.
-  UNITTEST::TestOneof2 message;
-
-  EXPECT_EQ(nullptr, message.release_foo_message());
-  EXPECT_FALSE(message.has_foo_message());
-
-  message.mutable_foo_message()->set_moo_int(1);
-  EXPECT_TRUE(message.has_foo_message());
-  std::unique_ptr<UNITTEST::TestOneof2_NestedMessage> mes(
-      message.release_foo_message());
-  EXPECT_FALSE(message.has_foo_message());
-  ASSERT_TRUE(mes != nullptr);
-  EXPECT_EQ(1, mes->moo_int());
-
-  EXPECT_EQ(nullptr, message.release_foo_message());
-  EXPECT_FALSE(message.has_foo_message());
-}
-
-TEST_F(OneofTest, SetAllocatedMessage) {
-  // Check that set_allocated_foo() works for messages.
-  UNITTEST::TestOneof2 message;
-
-  EXPECT_FALSE(message.has_foo_message());
-
-  message.mutable_foo_message()->set_moo_int(1);
-  EXPECT_TRUE(message.has_foo_message());
-
-  message.set_allocated_foo_message(nullptr);
-  EXPECT_FALSE(message.has_foo_message());
-  EXPECT_EQ(&message.foo_message(),
-            &UNITTEST::TestOneof2_NestedMessage::default_instance());
-
-  message.mutable_foo_message()->set_moo_int(1);
-  UNITTEST::TestOneof2_NestedMessage* mes = message.release_foo_message();
-  ASSERT_TRUE(mes != nullptr);
-  EXPECT_FALSE(message.has_foo_message());
-
-  message.set_allocated_foo_message(mes);
-  EXPECT_TRUE(message.has_foo_message());
-  EXPECT_EQ(1, message.foo_message().moo_int());
-}
-
-
-TEST_F(OneofTest, Clear) {
-  UNITTEST::TestOneof2 message;
-
-  message.set_foo_int(1);
-  EXPECT_TRUE(message.has_foo_int());
-  message.clear_foo_int();
-  EXPECT_FALSE(message.has_foo_int());
-}
-
-TEST_F(OneofTest, Defaults) {
-  UNITTEST::TestOneof2 message;
-
-  EXPECT_FALSE(message.has_foo_int());
-  EXPECT_EQ(message.foo_int(), 0);
-
-  EXPECT_FALSE(message.has_foo_string());
-  EXPECT_EQ(message.foo_string(), "");
-
-
-  EXPECT_FALSE(message.has_foo_bytes());
-  EXPECT_EQ(message.foo_bytes(), "");
-
-  EXPECT_FALSE(message.has_foo_enum());
-  EXPECT_EQ(message.foo_enum(), 1);
-
-  EXPECT_FALSE(message.has_foo_message());
-  EXPECT_EQ(message.foo_message().moo_int(), 0);
-
-  EXPECT_FALSE(message.has_foogroup());
-  EXPECT_EQ(message.foogroup().a(), 0);
-
-
-  EXPECT_FALSE(message.has_bar_int());
-  EXPECT_EQ(message.bar_int(), 5);
-
-  EXPECT_FALSE(message.has_bar_string());
-  EXPECT_EQ(message.bar_string(), "STRING");
-
-
-  EXPECT_FALSE(message.has_bar_bytes());
-  EXPECT_EQ(message.bar_bytes(), "BYTES");
-
-  EXPECT_FALSE(message.has_bar_enum());
-  EXPECT_EQ(message.bar_enum(), 2);
-}
-
-TEST_F(OneofTest, SwapWithEmpty) {
-  UNITTEST::TestOneof2 message1, message2;
-  message1.set_foo_string("FOO");
-  EXPECT_TRUE(message1.has_foo_string());
-  message1.Swap(&message2);
-  EXPECT_FALSE(message1.has_foo_string());
-  EXPECT_TRUE(message2.has_foo_string());
-  EXPECT_EQ(message2.foo_string(), "FOO");
-}
-
-TEST_F(OneofTest, SwapWithSelf) {
-  UNITTEST::TestOneof2 message;
-  message.set_foo_string("FOO");
-  EXPECT_TRUE(message.has_foo_string());
-  message.Swap(&message);
-  EXPECT_TRUE(message.has_foo_string());
-  EXPECT_EQ(message.foo_string(), "FOO");
-}
-
-TEST_F(OneofTest, SwapBothHasFields) {
-  UNITTEST::TestOneof2 message1, message2;
-
-  message1.set_foo_string("FOO");
-  EXPECT_TRUE(message1.has_foo_string());
-  message2.mutable_foo_message()->set_moo_int(1);
-  EXPECT_TRUE(message2.has_foo_message());
-
-  message1.Swap(&message2);
-  EXPECT_FALSE(message1.has_foo_string());
-  EXPECT_FALSE(message2.has_foo_message());
-  EXPECT_TRUE(message1.has_foo_message());
-  EXPECT_EQ(message1.foo_message().moo_int(), 1);
-  EXPECT_TRUE(message2.has_foo_string());
-  EXPECT_EQ(message2.foo_string(), "FOO");
-}
-
-TEST_F(OneofTest, CopyConstructor) {
-  UNITTEST::TestOneof2 message1;
-  message1.set_foo_bytes("FOO");
-
-  UNITTEST::TestOneof2 message2(message1);
-  EXPECT_TRUE(message2.has_foo_bytes());
-  EXPECT_EQ(message2.foo_bytes(), "FOO");
-}
-
-TEST_F(OneofTest, CopyFrom) {
-  UNITTEST::TestOneof2 message1, message2;
-  message1.set_foo_enum(UNITTEST::TestOneof2::BAR);
-  EXPECT_TRUE(message1.has_foo_enum());
-
-  message2.CopyFrom(message1);
-  EXPECT_TRUE(message2.has_foo_enum());
-  EXPECT_EQ(message2.foo_enum(), UNITTEST::TestOneof2::BAR);
-
-  // Copying from self should be a no-op.
-  message2.CopyFrom(message2);
-  EXPECT_TRUE(message2.has_foo_enum());
-  EXPECT_EQ(message2.foo_enum(), UNITTEST::TestOneof2::BAR);
-}
-
-TEST_F(OneofTest, CopyAssignmentOperator) {
-  UNITTEST::TestOneof2 message1;
-  message1.mutable_foo_message()->set_moo_int(123);
-  EXPECT_TRUE(message1.has_foo_message());
-
-  UNITTEST::TestOneof2 message2;
-  message2 = message1;
-  EXPECT_EQ(message2.foo_message().moo_int(), 123);
-
-  // Make sure that self-assignment does something sane.
-  message2 = *&message2;  // Avoid -Wself-assign.
-  EXPECT_EQ(message2.foo_message().moo_int(), 123);
-}
-
-TEST_F(OneofTest, UpcastCopyFrom) {
-  // Test the CopyFrom method that takes in the generic const Message&
-  // parameter.
-  UNITTEST::TestOneof2 message1, message2;
-  message1.mutable_foogroup()->set_a(123);
-  EXPECT_TRUE(message1.has_foogroup());
-
-  const Message* source = implicit_cast<const Message*>(&message1);
-  message2.CopyFrom(*source);
-
-  EXPECT_TRUE(message2.has_foogroup());
-  EXPECT_EQ(message2.foogroup().a(), 123);
-}
-
-// Test the generated SerializeWithCachedSizesToArray(),
-// This indirectly tests MergePartialFromCodedStream()
-// We have to test each field type separately because we cannot set them at the
-// same time
-TEST_F(OneofTest, SerializationToArray) {
-  // Primitive type
-  {
-    UNITTEST::TestOneof2 message1, message2;
-std::string data;
-message1.set_foo_int(123);
-int size = message1.ByteSizeLong();
-data.resize(size);
-uint8_t* start = reinterpret_cast<uint8_t*>(::google::protobuf::string_as_array(&data));
-uint8_t* end = message1.SerializeWithCachedSizesToArray(start);
-EXPECT_EQ(size, end - start);
-EXPECT_TRUE(message2.ParseFromString(data));
-EXPECT_EQ(message2.foo_int(), 123);
-  }
-
-  // String
-  {
-    UNITTEST::TestOneof2 message1, message2;
-    std::string data;
-    message1.set_foo_string("foo");
-    int size = message1.ByteSizeLong();
-    data.resize(size);
-    uint8_t* start = reinterpret_cast<uint8_t*>(::google::protobuf::string_as_array(&data));
-    uint8_t* end = message1.SerializeWithCachedSizesToArray(start);
-    EXPECT_EQ(size, end - start);
-    EXPECT_TRUE(message2.ParseFromString(data));
-    EXPECT_EQ(message2.foo_string(), "foo");
-  }
-
-
-  // Bytes
-  {
-    UNITTEST::TestOneof2 message1, message2;
-    std::string data;
-    message1.set_foo_bytes("moo");
-    int size = message1.ByteSizeLong();
-    data.resize(size);
-    uint8_t* start = reinterpret_cast<uint8_t*>(::google::protobuf::string_as_array(&data));
-    uint8_t* end = message1.SerializeWithCachedSizesToArray(start);
-    EXPECT_EQ(size, end - start);
-    EXPECT_TRUE(message2.ParseFromString(data));
-    EXPECT_EQ(message2.foo_bytes(), "moo");
-  }
-
-  // Enum
-  {
-    UNITTEST::TestOneof2 message1, message2;
-    std::string data;
-    message1.set_foo_enum(UNITTEST::TestOneof2::FOO);
-    int size = message1.ByteSizeLong();
-    data.resize(size);
-    uint8_t* start = reinterpret_cast<uint8_t*>(::google::protobuf::string_as_array(&data));
-    uint8_t* end = message1.SerializeWithCachedSizesToArray(start);
-    EXPECT_EQ(size, end - start);
-    EXPECT_TRUE(message2.ParseFromString(data));
-    EXPECT_EQ(message2.foo_enum(), UNITTEST::TestOneof2::FOO);
-  }
-
-  // Message
-  {
-    UNITTEST::TestOneof2 message1, message2;
-    std::string data;
-    message1.mutable_foo_message()->set_moo_int(234);
-    int size = message1.ByteSizeLong();
-    data.resize(size);
-    uint8_t* start = reinterpret_cast<uint8_t*>(::google::protobuf::string_as_array(&data));
-    uint8_t* end = message1.SerializeWithCachedSizesToArray(start);
-    EXPECT_EQ(size, end - start);
-    EXPECT_TRUE(message2.ParseFromString(data));
-    EXPECT_EQ(message2.foo_message().moo_int(), 234);
-  }
-
-  // Group
-  {
-    UNITTEST::TestOneof2 message1, message2;
-    std::string data;
-    message1.mutable_foogroup()->set_a(345);
-    int size = message1.ByteSizeLong();
-    data.resize(size);
-    uint8_t* start = reinterpret_cast<uint8_t*>(::google::protobuf::string_as_array(&data));
-    uint8_t* end = message1.SerializeWithCachedSizesToArray(start);
-    EXPECT_EQ(size, end - start);
-    EXPECT_TRUE(message2.ParseFromString(data));
-    EXPECT_EQ(message2.foogroup().a(), 345);
-  }
-
-}
-
-// Test the generated SerializeWithCachedSizes() by forcing the buffer to write
-// one byte at a time.
-// This indirectly tests MergePartialFromCodedStream()
-// We have to test each field type separately because we cannot set them at the
-// same time
-TEST_F(OneofTest, SerializationToStream) {
-  // Primitive type
-  {
-    UNITTEST::TestOneof2 message1, message2;
-std::string data;
-message1.set_foo_int(123);
-int size = message1.ByteSizeLong();
-data.resize(size);
-
-{
-  // Allow the output stream to buffer only one byte at a time.
-  io::ArrayOutputStream array_stream(::google::protobuf::string_as_array(&data), size, 1);
-  io::CodedOutputStream output_stream(&array_stream);
-  message1.SerializeWithCachedSizes(&output_stream);
-  EXPECT_FALSE(output_stream.HadError());
-  EXPECT_EQ(size, output_stream.ByteCount());
-}
-
-    EXPECT_TRUE(message2.ParseFromString(data));
-    EXPECT_EQ(message2.foo_int(), 123);
-  }
-
-  // String
-  {
-    UNITTEST::TestOneof2 message1, message2;
-    std::string data;
-    message1.set_foo_string("foo");
-    int size = message1.ByteSizeLong();
-    data.resize(size);
-
-    {
-      // Allow the output stream to buffer only one byte at a time.
-      io::ArrayOutputStream array_stream(::google::protobuf::string_as_array(&data), size, 1);
-      io::CodedOutputStream output_stream(&array_stream);
-      message1.SerializeWithCachedSizes(&output_stream);
-      EXPECT_FALSE(output_stream.HadError());
-      EXPECT_EQ(size, output_stream.ByteCount());
-    }
-
-    EXPECT_TRUE(message2.ParseFromString(data));
-    EXPECT_EQ(message2.foo_string(), "foo");
-  }
-
-
-  // Bytes
-  {
-    UNITTEST::TestOneof2 message1, message2;
-    std::string data;
-    message1.set_foo_bytes("moo");
-    int size = message1.ByteSizeLong();
-    data.resize(size);
-
-    {
-      // Allow the output stream to buffer only one byte at a time.
-      io::ArrayOutputStream array_stream(::google::protobuf::string_as_array(&data), size, 1);
-      io::CodedOutputStream output_stream(&array_stream);
-      message1.SerializeWithCachedSizes(&output_stream);
-      EXPECT_FALSE(output_stream.HadError());
-      EXPECT_EQ(size, output_stream.ByteCount());
-    }
-
-    EXPECT_TRUE(message2.ParseFromString(data));
-    EXPECT_EQ(message2.foo_bytes(), "moo");
-  }
-
-  // Enum
-  {
-    UNITTEST::TestOneof2 message1, message2;
-    std::string data;
-    message1.set_foo_enum(UNITTEST::TestOneof2::FOO);
-    int size = message1.ByteSizeLong();
-    data.resize(size);
-
-    {
-      // Allow the output stream to buffer only one byte at a time.
-      io::ArrayOutputStream array_stream(::google::protobuf::string_as_array(&data), size, 1);
-      io::CodedOutputStream output_stream(&array_stream);
-      message1.SerializeWithCachedSizes(&output_stream);
-      EXPECT_FALSE(output_stream.HadError());
-      EXPECT_EQ(size, output_stream.ByteCount());
-    }
-
-    EXPECT_TRUE(message2.ParseFromString(data));
-    EXPECT_EQ(message2.foo_enum(), UNITTEST::TestOneof2::FOO);
-  }
-
-  // Message
-  {
-    UNITTEST::TestOneof2 message1, message2;
-    std::string data;
-    message1.mutable_foo_message()->set_moo_int(234);
-    int size = message1.ByteSizeLong();
-    data.resize(size);
-
-    {
-      // Allow the output stream to buffer only one byte at a time.
-      io::ArrayOutputStream array_stream(::google::protobuf::string_as_array(&data), size, 1);
-      io::CodedOutputStream output_stream(&array_stream);
-      message1.SerializeWithCachedSizes(&output_stream);
-      EXPECT_FALSE(output_stream.HadError());
-      EXPECT_EQ(size, output_stream.ByteCount());
-    }
-
-    EXPECT_TRUE(message2.ParseFromString(data));
-    EXPECT_EQ(message2.foo_message().moo_int(), 234);
-  }
-
-  // Group
-  {
-    UNITTEST::TestOneof2 message1, message2;
-    std::string data;
-    message1.mutable_foogroup()->set_a(345);
-    int size = message1.ByteSizeLong();
-    data.resize(size);
-
-    {
-      // Allow the output stream to buffer only one byte at a time.
-      io::ArrayOutputStream array_stream(::google::protobuf::string_as_array(&data), size, 1);
-      io::CodedOutputStream output_stream(&array_stream);
-      message1.SerializeWithCachedSizes(&output_stream);
-      EXPECT_FALSE(output_stream.HadError());
-      EXPECT_EQ(size, output_stream.ByteCount());
-    }
-
-    EXPECT_TRUE(message2.ParseFromString(data));
-    EXPECT_EQ(message2.foogroup().a(), 345);
-  }
-
-}
-
-TEST_F(OneofTest, MergeFrom) {
-  UNITTEST::TestOneof2 message1, message2;
-
-  message1.set_foo_int(123);
-  message2.MergeFrom(message1);
-  TestUtil::ExpectAtMostOneFieldSetInOneof(message2);
-  EXPECT_TRUE(message2.has_foo_int());
-  EXPECT_EQ(message2.foo_int(), 123);
-
-  message1.set_foo_string("foo");
-  message2.MergeFrom(message1);
-  TestUtil::ExpectAtMostOneFieldSetInOneof(message2);
-  EXPECT_TRUE(message2.has_foo_string());
-  EXPECT_EQ(message2.foo_string(), "foo");
-
-
-  message1.set_foo_bytes("moo");
-  message2.MergeFrom(message1);
-  TestUtil::ExpectAtMostOneFieldSetInOneof(message2);
-  EXPECT_TRUE(message2.has_foo_bytes());
-  EXPECT_EQ(message2.foo_bytes(), "moo");
-
-  message1.set_foo_enum(UNITTEST::TestOneof2::FOO);
-  message2.MergeFrom(message1);
-  TestUtil::ExpectAtMostOneFieldSetInOneof(message2);
-  EXPECT_TRUE(message2.has_foo_enum());
-  EXPECT_EQ(message2.foo_enum(), UNITTEST::TestOneof2::FOO);
-
-  message1.mutable_foo_message()->set_moo_int(234);
-  message2.MergeFrom(message1);
-  TestUtil::ExpectAtMostOneFieldSetInOneof(message2);
-  EXPECT_TRUE(message2.has_foo_message());
-  EXPECT_EQ(message2.foo_message().moo_int(), 234);
-
-  message1.mutable_foogroup()->set_a(345);
-  message2.MergeFrom(message1);
-  TestUtil::ExpectAtMostOneFieldSetInOneof(message2);
-  EXPECT_TRUE(message2.has_foogroup());
-  EXPECT_EQ(message2.foogroup().a(), 345);
-
-}
-
-TEST(HELPERS_TEST_NAME, TestSCC) {
-  UNITTEST::TestMutualRecursionA a;
-  MessageSCCAnalyzer scc_analyzer((Options()));
-  const SCC* scc = scc_analyzer.GetSCC(a.GetDescriptor());
-  std::vector<std::string> names;
-  names.reserve(scc->descriptors.size());
-  for (int i = 0; i < scc->descriptors.size(); i++) {
-    names.push_back(scc->descriptors[i]->full_name());
-  }
-  std::string package = a.GetDescriptor()->file()->package();
-  ASSERT_EQ(names.size(), 4);
-  std::sort(names.begin(), names.end());
-  EXPECT_EQ(names[0], package + ".TestMutualRecursionA");
-  EXPECT_EQ(names[1], package + ".TestMutualRecursionA.SubGroup");
-  EXPECT_EQ(names[2], package + ".TestMutualRecursionA.SubMessage");
-  EXPECT_EQ(names[3], package + ".TestMutualRecursionB");
-
-  MessageAnalysis result = scc_analyzer.GetSCCAnalysis(scc);
-  EXPECT_EQ(result.is_recursive, true);
-  EXPECT_EQ(result.contains_required, false);
-  EXPECT_EQ(result.contains_cord, true);  // TestAllTypes
-  EXPECT_EQ(result.contains_extension, false);  // TestAllTypes
-}
-
-TEST(HELPERS_TEST_NAME, TestSCCAnalysis) {
-  {
-    UNITTEST::TestRecursiveMessage msg;
-    MessageSCCAnalyzer scc_analyzer((Options()));
-    const SCC* scc = scc_analyzer.GetSCC(msg.GetDescriptor());
-    MessageAnalysis result = scc_analyzer.GetSCCAnalysis(scc);
-    EXPECT_EQ(result.is_recursive, true);
-    EXPECT_EQ(result.contains_required, false);
-    EXPECT_EQ(result.contains_cord, false);
-    EXPECT_EQ(result.contains_extension, false);
-  }
-  {
-    UNITTEST::TestAllExtensions msg;
-    MessageSCCAnalyzer scc_analyzer((Options()));
-    const SCC* scc = scc_analyzer.GetSCC(msg.GetDescriptor());
-    MessageAnalysis result = scc_analyzer.GetSCCAnalysis(scc);
-    EXPECT_EQ(result.is_recursive, false);
-    EXPECT_EQ(result.contains_required, false);
-    EXPECT_EQ(result.contains_cord, false);
-    EXPECT_EQ(result.contains_extension, true);
-  }
-  {
-    UNITTEST::TestRequired msg;
-    MessageSCCAnalyzer scc_analyzer((Options()));
-    const SCC* scc = scc_analyzer.GetSCC(msg.GetDescriptor());
-    MessageAnalysis result = scc_analyzer.GetSCCAnalysis(scc);
-    EXPECT_EQ(result.is_recursive, false);
-    EXPECT_EQ(result.contains_required, true);
-    EXPECT_EQ(result.contains_cord, false);
-    EXPECT_EQ(result.contains_extension, false);
-  }
-}
-
-}  // namespace cpp_unittest
-}  // namespace cpp
-}  // namespace compiler
-
-namespace no_generic_services_test {
-  // Verify that no class called "TestService" was defined in
-  // unittest_no_generic_services.pb.h by defining a different type by the same
-  // name.  If such a service was generated, this will not compile.
-  struct TestService {
-    int i;
-  };
-}
-
-namespace compiler {
-namespace cpp {
-namespace cpp_unittest {
-
-TEST_F(GENERATED_SERVICE_TEST_NAME, NoGenericServices) {
-  // Verify that non-services in unittest_no_generic_services.proto were
-  // generated.
-  ::protobuf_unittest::no_generic_services_test::TestMessage message;
-  message.set_a(1);
-  message.SetExtension(
-      ::protobuf_unittest::no_generic_services_test::test_extension, 123);
-  ::protobuf_unittest::no_generic_services_test::TestEnum e =
-      ::protobuf_unittest::no_generic_services_test::FOO;
-  EXPECT_EQ(e, 1);
-
-  // Verify that a ServiceDescriptor is generated for the service even if the
-  // class itself is not.
-  const FileDescriptor* file =
-      ::google::protobuf::unittest::no_generic_services_test::TestMessage::descriptor()
-          ->file();
-
-  ASSERT_EQ(1, file->service_count());
-  EXPECT_EQ("TestService", file->service(0)->name());
-  ASSERT_EQ(1, file->service(0)->method_count());
-  EXPECT_EQ("Foo", file->service(0)->method(0)->name());
-}
-
-#endif  // !PROTOBUF_TEST_NO_DESCRIPTORS
-
-// ===================================================================
-
-// This test must run last.  It verifies that descriptors were or were not
-// initialized depending on whether PROTOBUF_TEST_NO_DESCRIPTORS was defined.
-// When this is defined, we skip all tests which are expected to trigger
-// descriptor initialization.  This verifies that everything else still works
-// if descriptors are not initialized.
-TEST(DESCRIPTOR_INIT_TEST_NAME, Initialized) {
-#ifdef PROTOBUF_TEST_NO_DESCRIPTORS
-  bool should_have_descriptors = false;
-#else
-  bool should_have_descriptors = true;
-#endif
-
-  EXPECT_EQ(should_have_descriptors,
-            DescriptorPool::generated_pool()->InternalIsFileLoaded(
-                TestUtil::MaybeTranslatePath(UNITTEST_PROTO_PATH)));
-}
-
-}  // namespace cpp_unittest
-
-}  // namespace cpp
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
diff --git a/libs/protobuf/src/google/protobuf/compiler/csharp/csharp_bootstrap_unittest.cc b/libs/protobuf/src/google/protobuf/compiler/csharp/csharp_bootstrap_unittest.cc
deleted file mode 100644
index 84aacca..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/csharp/csharp_bootstrap_unittest.cc
+++ /dev/null
@@ -1,195 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// This test insures that
-// csharp/src/Google.Protobuf/Reflection/Descriptor.cs  match exactly
-// what would be generated by the protocol compiler.  The file is not
-// generated automatically at build time.
-//
-// If this test fails, run the script
-// "generate_descriptor_proto.sh" and add the changed files under
-// csharp/src/ to your changelist.
-
-#include <map>
-
-#include <google/protobuf/compiler/csharp/csharp_generator.h>
-#include <google/protobuf/compiler/importer.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/io/zero_copy_stream_impl.h>
-#include <google/protobuf/stubs/map_util.h>
-#include <google/protobuf/stubs/stl_util.h>
-#include <google/protobuf/stubs/strutil.h>
-#include <google/protobuf/stubs/substitute.h>
-
-#include <google/protobuf/testing/file.h>
-#include <google/protobuf/testing/file.h>
-#include <google/protobuf/testing/googletest.h>
-#include <gtest/gtest.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace csharp {
-
-namespace {
-
-class MockErrorCollector : public MultiFileErrorCollector {
- public:
-  MockErrorCollector() {}
-  ~MockErrorCollector() {}
-
-  std::string text_;
-
-  // implements ErrorCollector ---------------------------------------
-  void AddError(const std::string& filename, int line, int column,
-                const std::string& message) {
-    strings::SubstituteAndAppend(&text_, "$0:$1:$2: $3\n",
-                                 filename, line, column, message);
-  }
-};
-
-class MockGeneratorContext : public GeneratorContext {
- public:
-  void ExpectFileMatches(const std::string& virtual_filename,
-                         const std::string& physical_filename) {
-    auto it = files_.find(virtual_filename);
-    ASSERT_TRUE(it != files_.end())
-      << "Generator failed to generate file: " << virtual_filename;
-    std::string expected_contents = *it->second;
-
-    std::string actual_contents;
-    GOOGLE_CHECK_OK(
-        File::GetContentsAsText(TestSourceDir() + "/" + physical_filename,
-                          &actual_contents, true))
-        << "Unable to get " << physical_filename;
-    EXPECT_TRUE(actual_contents == expected_contents)
-      << physical_filename << " needs to be regenerated.  Please run "
-         "generate_descriptor_proto.sh. Then add this file "
-         "to your CL.";
-  }
-
-  // implements GeneratorContext --------------------------------------
-
-  virtual io::ZeroCopyOutputStream* Open(const std::string& filename) {
-    auto& map_slot = files_[filename];
-    map_slot.reset(new std::string);
-    return new io::StringOutputStream(map_slot.get());
-  }
-
- private:
-  std::map<std::string, std::unique_ptr<std::string>> files_;
-};
-
-class GenerateAndTest {
- public:
-  GenerateAndTest() {}
-  void Run(const FileDescriptor* proto_file, std::string file1,
-           std::string file2) {
-    ASSERT_TRUE(proto_file != NULL) << TestSourceDir();
-    ASSERT_TRUE(generator_.Generate(proto_file, parameter_,
-                                    &context_, &error_));
-    context_.ExpectFileMatches(file1, file2);
-  }
-  void SetParameter(std::string parameter) {
-    parameter_ = parameter;
-  }
-
- private:
-  Generator generator_;
-  MockGeneratorContext context_;
-  std::string error_;
-  std::string parameter_;
-};
-
-TEST(CsharpBootstrapTest, GeneratedCsharpDescriptorMatches) {
-  // Skip this whole test if the csharp directory doesn't exist (i.e., a C++11
-  // only distribution).
-  std::string descriptor_file_name =
-      "../csharp/src/Google.Protobuf/Reflection/Descriptor.cs";
-  if (!File::Exists(TestSourceDir() + "/" + descriptor_file_name)) {
-    return;
-  }
-
-  MockErrorCollector error_collector;
-  DiskSourceTree source_tree;
-  Importer importer(&source_tree, &error_collector);
-  GenerateAndTest generate_test;
-
-  generate_test.SetParameter("base_namespace=Google.Protobuf");
-  source_tree.MapPath("", TestSourceDir());
-  generate_test.Run(importer.Import("google/protobuf/descriptor.proto"),
-                    "Reflection/Descriptor.cs",
-                    "../csharp/src/Google.Protobuf/Reflection/Descriptor.cs");
-  generate_test.Run(importer.Import("google/protobuf/any.proto"),
-                    "WellKnownTypes/Any.cs",
-                    "../csharp/src/Google.Protobuf/WellKnownTypes/Any.cs");
-  generate_test.Run(importer.Import("google/protobuf/api.proto"),
-                    "WellKnownTypes/Api.cs",
-                    "../csharp/src/Google.Protobuf/WellKnownTypes/Api.cs");
-  generate_test.Run(importer.Import("google/protobuf/duration.proto"),
-                    "WellKnownTypes/Duration.cs",
-                    "../csharp/src/Google.Protobuf/WellKnownTypes/Duration.cs");
-  generate_test.Run(importer.Import("google/protobuf/empty.proto"),
-                    "WellKnownTypes/Empty.cs",
-                    "../csharp/src/Google.Protobuf/WellKnownTypes/Empty.cs");
-  generate_test.Run(importer.Import("google/protobuf/field_mask.proto"),
-                    "WellKnownTypes/FieldMask.cs",
-                    "../csharp/src/Google.Protobuf/WellKnownTypes/FieldMask.cs");
-  generate_test.Run(importer.Import("google/protobuf/source_context.proto"),
-                    "WellKnownTypes/SourceContext.cs",
-                    "../csharp/src/Google.Protobuf/WellKnownTypes/SourceContext.cs");
-  generate_test.Run(importer.Import("google/protobuf/struct.proto"),
-                    "WellKnownTypes/Struct.cs",
-                    "../csharp/src/Google.Protobuf/WellKnownTypes/Struct.cs");
-  generate_test.Run(importer.Import("google/protobuf/timestamp.proto"),
-                    "WellKnownTypes/Timestamp.cs",
-                    "../csharp/src/Google.Protobuf/WellKnownTypes/Timestamp.cs");
-  generate_test.Run(importer.Import("google/protobuf/type.proto"),
-                    "WellKnownTypes/Type.cs",
-                    "../csharp/src/Google.Protobuf/WellKnownTypes/Type.cs");
-  generate_test.Run(importer.Import("google/protobuf/wrappers.proto"),
-                    "WellKnownTypes/Wrappers.cs",
-                    "../csharp/src/Google.Protobuf/WellKnownTypes/Wrappers.cs");
-
-  generate_test.SetParameter("");
-  source_tree.MapPath("", TestSourceDir() + "/../conformance");
-  generate_test.Run(importer.Import("conformance.proto"),
-                    "Conformance.cs",
-                    "../csharp/src/Google.Protobuf.Conformance/Conformance.cs");
-
-  EXPECT_EQ("", error_collector.text_);
-}
-
-}  // namespace
-
-}  // namespace csharp
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/compiler/csharp/csharp_doc_comment.cc b/libs/protobuf/src/google/protobuf/compiler/csharp/csharp_doc_comment.cc
deleted file mode 100644
index 225d6dc..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/csharp/csharp_doc_comment.cc
+++ /dev/null
@@ -1,116 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-#include <google/protobuf/compiler/csharp/csharp_doc_comment.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/io/printer.h>
-#include <google/protobuf/stubs/strutil.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace csharp {
-
-// Functions to create C# XML documentation comments.
-// Currently this only includes documentation comments containing text specified as comments
-// in the .proto file; documentation comments generated just from field/message/enum/proto names
-// is inlined in the relevant code. If more control is required, that code can be moved here.
-
-void WriteDocCommentBodyImpl(io::Printer* printer, SourceLocation location) {
-    std::string comments = location.leading_comments.empty() ?
-        location.trailing_comments : location.leading_comments;
-    if (comments.empty()) {
-        return;
-    }
-    // XML escaping... no need for apostrophes etc as the whole text is going to be a child
-    // node of a summary element, not part of an attribute.
-    comments = StringReplace(comments, "&", "&amp;", true);
-    comments = StringReplace(comments, "<", "&lt;", true);
-    std::vector<std::string> lines;
-    lines = Split(comments, "\n", false);
-    // TODO: We really should work out which part to put in the summary and which to put in the remarks...
-    // but that needs to be part of a bigger effort to understand the markdown better anyway.
-    printer->Print("/// <summary>\n");
-    bool last_was_empty = false;
-    // We squash multiple blank lines down to one, and remove any trailing blank lines. We need
-    // to preserve the blank lines themselves, as this is relevant in the markdown.
-    // Note that we can't remove leading or trailing whitespace as *that's* relevant in markdown too.
-    // (We don't skip "just whitespace" lines, either.)
-    for (std::vector<std::string>::iterator it = lines.begin();
-         it != lines.end(); ++it) {
-      std::string line = *it;
-      if (line.empty()) {
-        last_was_empty = true;
-      } else {
-        if (last_was_empty) {
-          printer->Print("///\n");
-        }
-        last_was_empty = false;
-        printer->Print("///$line$\n", "line", *it);
-      }
-    }
-    printer->Print("/// </summary>\n");
-}
-
-template <typename DescriptorType>
-static void WriteDocCommentBody(
-    io::Printer* printer, const DescriptorType* descriptor) {
-    SourceLocation location;
-    if (descriptor->GetSourceLocation(&location)) {
-        WriteDocCommentBodyImpl(printer, location);
-    }
-}
-
-void WriteMessageDocComment(io::Printer* printer, const Descriptor* message) {
-    WriteDocCommentBody(printer, message);
-}
-
-void WritePropertyDocComment(io::Printer* printer, const FieldDescriptor* field) {
-    WriteDocCommentBody(printer, field);
-}
-
-void WriteEnumDocComment(io::Printer* printer, const EnumDescriptor* enumDescriptor) {
-    WriteDocCommentBody(printer, enumDescriptor);
-}
-void WriteEnumValueDocComment(io::Printer* printer, const EnumValueDescriptor* value) {
-    WriteDocCommentBody(printer, value);
-}
-
-void WriteMethodDocComment(io::Printer* printer, const MethodDescriptor* method) {
-    WriteDocCommentBody(printer, method);
-}
-
-}  // namespace csharp
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/compiler/csharp/csharp_doc_comment.h b/libs/protobuf/src/google/protobuf/compiler/csharp/csharp_doc_comment.h
deleted file mode 100644
index 75eb0ea..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/csharp/csharp_doc_comment.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-#ifndef GOOGLE_PROTOBUF_COMPILER_CSHARP_DOC_COMMENT_H__
-#define GOOGLE_PROTOBUF_COMPILER_CSHARP_DOC_COMMENT_H__
-
-#include <google/protobuf/io/printer.h>
-#include <google/protobuf/descriptor.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace csharp {
-    void WriteMessageDocComment(io::Printer* printer, const Descriptor* message);
-    void WritePropertyDocComment(io::Printer* printer, const FieldDescriptor* field);
-    void WriteEnumDocComment(io::Printer* printer, const EnumDescriptor* enumDescriptor);
-    void WriteEnumValueDocComment(io::Printer* printer, const EnumValueDescriptor* value);
-    void WriteMethodDocComment(io::Printer* printer, const MethodDescriptor* method);
-}  // namespace csharp
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-#endif  // GOOGLE_PROTOBUF_COMPILER_CSHARP_DOC_COMMENT_H__
diff --git a/libs/protobuf/src/google/protobuf/compiler/csharp/csharp_enum.cc b/libs/protobuf/src/google/protobuf/compiler/csharp/csharp_enum.cc
deleted file mode 100644
index 73679ca..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/csharp/csharp_enum.cc
+++ /dev/null
@@ -1,99 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <sstream>
-
-#include <google/protobuf/compiler/code_generator.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/descriptor.pb.h>
-#include <google/protobuf/io/printer.h>
-#include <google/protobuf/io/zero_copy_stream.h>
-#include <google/protobuf/stubs/strutil.h>
-
-#include <google/protobuf/compiler/csharp/csharp_doc_comment.h>
-#include <google/protobuf/compiler/csharp/csharp_enum.h>
-#include <google/protobuf/compiler/csharp/csharp_helpers.h>
-#include <google/protobuf/compiler/csharp/csharp_options.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace csharp {
-
-EnumGenerator::EnumGenerator(const EnumDescriptor* descriptor, const Options* options) :
-    SourceGeneratorBase(options),
-    descriptor_(descriptor) {
-}
-
-EnumGenerator::~EnumGenerator() {
-}
-
-void EnumGenerator::Generate(io::Printer* printer) {
-  WriteEnumDocComment(printer, descriptor_);
-  printer->Print("$access_level$ enum $name$ {\n",
-                 "access_level", class_access_level(),
-                 "name", descriptor_->name());
-  printer->Indent();
-  std::set<std::string> used_names;
-  std::set<int> used_number;
-  for (int i = 0; i < descriptor_->value_count(); i++) {
-      WriteEnumValueDocComment(printer, descriptor_->value(i));
-      std::string original_name = descriptor_->value(i)->name();
-      std::string name =
-          GetEnumValueName(descriptor_->name(), descriptor_->value(i)->name());
-      // Make sure we don't get any duplicate names due to prefix removal.
-      while (!used_names.insert(name).second) {
-        // It's possible we'll end up giving this warning multiple times, but that's better than not at all.
-        GOOGLE_LOG(WARNING) << "Duplicate enum value " << name << " (originally " << original_name
-          << ") in " << descriptor_->name() << "; adding underscore to distinguish";
-        name += "_";
-      }
-      int number = descriptor_->value(i)->number();
-      if (!used_number.insert(number).second) {
-          printer->Print("[pbr::OriginalName(\"$original_name$\", PreferredAlias = false)] $name$ = $number$,\n",
-             "original_name", original_name,
-             "name", name,
-             "number", StrCat(number));
-      } else {
-          printer->Print("[pbr::OriginalName(\"$original_name$\")] $name$ = $number$,\n",
-             "original_name", original_name,
-             "name", name,
-             "number", StrCat(number));
-      }
-  }
-  printer->Outdent();
-  printer->Print("}\n");
-  printer->Print("\n");
-}
-
-}  // namespace csharp
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/compiler/csharp/csharp_enum.h b/libs/protobuf/src/google/protobuf/compiler/csharp/csharp_enum.h
deleted file mode 100644
index e409c2e..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/csharp/csharp_enum.h
+++ /dev/null
@@ -1,66 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef GOOGLE_PROTOBUF_COMPILER_CSHARP_ENUM_H__
-#define GOOGLE_PROTOBUF_COMPILER_CSHARP_ENUM_H__
-
-#include <string>
-
-#include <google/protobuf/compiler/code_generator.h>
-#include <google/protobuf/compiler/csharp/csharp_source_generator_base.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/io/printer.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace csharp {
-
-class EnumGenerator : public SourceGeneratorBase {
- public:
-  EnumGenerator(const EnumDescriptor* descriptor, const Options* options);
-  ~EnumGenerator();
-
-  EnumGenerator(const EnumGenerator&) = delete;
-  EnumGenerator& operator=(const EnumGenerator&) = delete;
-
-  void Generate(io::Printer* printer);
-
- private:
-  const EnumDescriptor* descriptor_;
-};
-
-}  // namespace csharp
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // GOOGLE_PROTOBUF_COMPILER_CSHARP_ENUM_H__
-
diff --git a/libs/protobuf/src/google/protobuf/compiler/csharp/csharp_enum_field.cc b/libs/protobuf/src/google/protobuf/compiler/csharp/csharp_enum_field.cc
deleted file mode 100644
index 55fb60c..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/csharp/csharp_enum_field.cc
+++ /dev/null
@@ -1,135 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <sstream>
-
-#include <google/protobuf/compiler/code_generator.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/descriptor.pb.h>
-#include <google/protobuf/io/printer.h>
-#include <google/protobuf/io/zero_copy_stream.h>
-
-#include <google/protobuf/compiler/csharp/csharp_doc_comment.h>
-#include <google/protobuf/compiler/csharp/csharp_helpers.h>
-#include <google/protobuf/compiler/csharp/csharp_options.h>
-#include <google/protobuf/compiler/csharp/csharp_enum_field.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace csharp {
-
-EnumFieldGenerator::EnumFieldGenerator(const FieldDescriptor* descriptor,
-                                       int presenceIndex, const Options *options)
-    : PrimitiveFieldGenerator(descriptor, presenceIndex, options) {
-}
-
-EnumFieldGenerator::~EnumFieldGenerator() {
-}
-
-void EnumFieldGenerator::GenerateParsingCode(io::Printer* printer) {
-  printer->Print(variables_,
-    "$property_name$ = ($type_name$) input.ReadEnum();\n");
-}
-
-void EnumFieldGenerator::GenerateSerializationCode(io::Printer* printer) {
-  printer->Print(variables_,
-    "if ($has_property_check$) {\n"
-    "  output.WriteRawTag($tag_bytes$);\n"
-    "  output.WriteEnum((int) $property_name$);\n"
-    "}\n");
-}
-
-void EnumFieldGenerator::GenerateSerializedSizeCode(io::Printer* printer) {
-  printer->Print(
-    variables_,
-    "if ($has_property_check$) {\n"
-      "  size += $tag_size$ + pb::CodedOutputStream.ComputeEnumSize((int) $property_name$);\n"
-    "}\n");
-}
-
-void EnumFieldGenerator::GenerateCodecCode(io::Printer* printer) {
-  printer->Print(
-      variables_,
-      "pb::FieldCodec.ForEnum($tag$, x => (int) x, x => ($type_name$) x, $default_value$)");
-}
-
-void EnumFieldGenerator::GenerateExtensionCode(io::Printer* printer) {
-  WritePropertyDocComment(printer, descriptor_);
-  AddDeprecatedFlag(printer);
-  printer->Print(
-    variables_,
-    "$access_level$ static readonly pb::Extension<$extended_type$, $type_name$> $property_name$ =\n"
-    "  new pb::Extension<$extended_type$, $type_name$>($number$, ");
-  GenerateCodecCode(printer);
-  printer->Print(");\n");
-}
-
-EnumOneofFieldGenerator::EnumOneofFieldGenerator(
-    const FieldDescriptor* descriptor, int presenceIndex, const Options *options)
-  : PrimitiveOneofFieldGenerator(descriptor, presenceIndex, options) {
-}
-
-EnumOneofFieldGenerator::~EnumOneofFieldGenerator() {
-}
-
-void EnumOneofFieldGenerator::GenerateMergingCode(io::Printer* printer) {
-  printer->Print(variables_, "$property_name$ = other.$property_name$;\n");
-}
-
-void EnumOneofFieldGenerator::GenerateParsingCode(io::Printer* printer) {
-  // TODO(jonskeet): What about if we read the default value?
-  printer->Print(
-    variables_,
-    "$oneof_name$_ = input.ReadEnum();\n"
-    "$oneof_name$Case_ = $oneof_property_name$OneofCase.$oneof_case_name$;\n");
-}
-
-void EnumOneofFieldGenerator::GenerateSerializationCode(io::Printer* printer) {
-  printer->Print(
-    variables_,
-    "if ($has_property_check$) {\n"
-    "  output.WriteRawTag($tag_bytes$);\n"
-    "  output.WriteEnum((int) $property_name$);\n"
-    "}\n");
-}
-
-void EnumOneofFieldGenerator::GenerateSerializedSizeCode(io::Printer* printer) {
-  printer->Print(
-    variables_,
-    "if ($has_property_check$) {\n"
-    "  size += $tag_size$ + pb::CodedOutputStream.ComputeEnumSize((int) $property_name$);\n"
-    "}\n");
-}
-
-}  // namespace csharp
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/compiler/csharp/csharp_enum_field.h b/libs/protobuf/src/google/protobuf/compiler/csharp/csharp_enum_field.h
deleted file mode 100644
index 0c6b023..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/csharp/csharp_enum_field.h
+++ /dev/null
@@ -1,81 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef GOOGLE_PROTOBUF_COMPILER_CSHARP_ENUM_FIELD_H__
-#define GOOGLE_PROTOBUF_COMPILER_CSHARP_ENUM_FIELD_H__
-
-#include <google/protobuf/compiler/code_generator.h>
-#include <google/protobuf/compiler/csharp/csharp_primitive_field.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace csharp {
-
-class EnumFieldGenerator : public PrimitiveFieldGenerator {
- public:
-  EnumFieldGenerator(const FieldDescriptor* descriptor,
-                     int presenceIndex,
-                     const Options *options);
-  ~EnumFieldGenerator();
-
-  EnumFieldGenerator(const EnumFieldGenerator&) = delete;
-  EnumFieldGenerator& operator=(const EnumFieldGenerator&) = delete;
-
-  virtual void GenerateCodecCode(io::Printer* printer) override;
-  virtual void GenerateParsingCode(io::Printer* printer) override;
-  virtual void GenerateSerializationCode(io::Printer* printer) override;
-  virtual void GenerateSerializedSizeCode(io::Printer* printer) override;
-  virtual void GenerateExtensionCode(io::Printer* printer) override;
-};
-
-class EnumOneofFieldGenerator : public PrimitiveOneofFieldGenerator {
- public:
-  EnumOneofFieldGenerator(const FieldDescriptor* descriptor,
-                          int presenceIndex,
-                          const Options *options);
-  ~EnumOneofFieldGenerator();
-
-  EnumOneofFieldGenerator(const EnumOneofFieldGenerator&) = delete;
-  EnumOneofFieldGenerator& operator=(const EnumOneofFieldGenerator&) = delete;
-
-  virtual void GenerateMergingCode(io::Printer* printer) override;
-  virtual void GenerateParsingCode(io::Printer* printer) override;
-  virtual void GenerateSerializationCode(io::Printer* printer) override;
-  virtual void GenerateSerializedSizeCode(io::Printer* printer) override;
-};
-
-}  // namespace csharp
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // GOOGLE_PROTOBUF_COMPILER_CSHARP_ENUM_FIELD_H__
-
diff --git a/libs/protobuf/src/google/protobuf/compiler/csharp/csharp_field_base.cc b/libs/protobuf/src/google/protobuf/compiler/csharp/csharp_field_base.cc
deleted file mode 100644
index 17847e3..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/csharp/csharp_field_base.cc
+++ /dev/null
@@ -1,464 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <cmath>
-#include <limits>
-#include <sstream>
-
-#include <google/protobuf/compiler/code_generator.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/descriptor.pb.h>
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/io/printer.h>
-#include <google/protobuf/io/zero_copy_stream.h>
-#include <google/protobuf/stubs/strutil.h>
-#include <google/protobuf/wire_format.h>
-
-#include <google/protobuf/compiler/csharp/csharp_field_base.h>
-#include <google/protobuf/compiler/csharp/csharp_helpers.h>
-#include <google/protobuf/compiler/csharp/csharp_names.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace csharp {
-
-void FieldGeneratorBase::SetCommonFieldVariables(
-    std::map<std::string, std::string>* variables) {
-  // Note: this will be valid even though the tag emitted for packed and unpacked versions of
-  // repeated fields varies by wire format. The wire format is encoded in the bottom 3 bits, which
-  // never effects the tag size.
-  int tag_size = internal::WireFormat::TagSize(descriptor_->number(), descriptor_->type());
-  int part_tag_size = tag_size;
-  if (descriptor_->type() == FieldDescriptor::TYPE_GROUP) {
-    part_tag_size /= 2;
-  }
-  uint tag = internal::WireFormat::MakeTag(descriptor_);
-  uint8_t tag_array[5];
-  io::CodedOutputStream::WriteTagToArray(tag, tag_array);
-  std::string tag_bytes = StrCat(tag_array[0]);
-  for (int i = 1; i < part_tag_size; i++) {
-    tag_bytes += ", " + StrCat(tag_array[i]);
-  }
-
-  (*variables)["tag"] = StrCat(tag);
-  (*variables)["tag_size"] = StrCat(tag_size);
-  (*variables)["tag_bytes"] = tag_bytes;
-
-  if (descriptor_->type() == FieldDescriptor::Type::TYPE_GROUP) {
-    tag = internal::WireFormatLite::MakeTag(
-        descriptor_->number(),
-        internal::WireFormatLite::WIRETYPE_END_GROUP);
-    io::CodedOutputStream::WriteTagToArray(tag, tag_array);
-    tag_bytes = StrCat(tag_array[0]);
-    for (int i = 1; i < part_tag_size; i++) {
-        tag_bytes += ", " + StrCat(tag_array[i]);
-    }
-
-    variables_["end_tag"] = StrCat(tag);
-    variables_["end_tag_bytes"] = tag_bytes;
-  }
-
-  (*variables)["access_level"] = "public";
-
-  (*variables)["property_name"] = property_name();
-  (*variables)["type_name"] = type_name();
-  (*variables)["extended_type"] = GetClassName(descriptor_->containing_type());
-  (*variables)["name"] = name();
-  (*variables)["descriptor_name"] = descriptor_->name();
-  (*variables)["default_value"] = default_value();
-  (*variables)["capitalized_type_name"] = capitalized_type_name();
-  (*variables)["number"] = number();
-  if (has_default_value() && !SupportsPresenceApi(descriptor_)) {
-    (*variables)["name_def_message"] =
-      (*variables)["name"] + "_ = " + (*variables)["default_value"];
-  } else {
-    (*variables)["name_def_message"] = (*variables)["name"] + "_";
-  }
-  if (SupportsPresenceApi(descriptor_)) {
-    (*variables)["has_property_check"] = "Has" + (*variables)["property_name"];
-    (*variables)["other_has_property_check"] = "other.Has" + (*variables)["property_name"];
-    (*variables)["has_not_property_check"] = "!" + (*variables)["has_property_check"];
-    (*variables)["other_has_not_property_check"] = "!" + (*variables)["other_has_property_check"];
-    if (presenceIndex_ != -1) {
-      std::string hasBitsNumber = StrCat(presenceIndex_ / 32);
-      std::string hasBitsMask = StrCat(1 << (presenceIndex_ % 32));
-      (*variables)["has_field_check"] = "(_hasBits" + hasBitsNumber + " & " + hasBitsMask + ") != 0";
-      (*variables)["set_has_field"] = "_hasBits" + hasBitsNumber + " |= " + hasBitsMask;
-      (*variables)["clear_has_field"] = "_hasBits" + hasBitsNumber + " &= ~" + hasBitsMask;
-    }
-  } else {
-    (*variables)["has_property_check"] =
-      (*variables)["property_name"] + " != " + (*variables)["default_value"];
-    (*variables)["other_has_property_check"] = "other." +
-      (*variables)["property_name"] + " != " + (*variables)["default_value"];
-  }
-}
-
-void FieldGeneratorBase::SetCommonOneofFieldVariables(
-    std::map<std::string, std::string>* variables) {
-  (*variables)["oneof_name"] = oneof_name();
-  if (SupportsPresenceApi(descriptor_)) {
-    (*variables)["has_property_check"] = "Has" + property_name();
-  } else {
-    (*variables)["has_property_check"] =
-      oneof_name() + "Case_ == " + oneof_property_name() +
-      "OneofCase." + oneof_case_name();
-  }
-  (*variables)["oneof_case_name"] = oneof_case_name();
-  (*variables)["oneof_property_name"] = oneof_property_name();
-}
-
-FieldGeneratorBase::FieldGeneratorBase(const FieldDescriptor* descriptor,
-                                       int presenceIndex, const Options* options)
-    : SourceGeneratorBase(options),
-      descriptor_(descriptor),
-      presenceIndex_(presenceIndex) {
-  SetCommonFieldVariables(&variables_);
-}
-
-FieldGeneratorBase::~FieldGeneratorBase() {
-}
-
-void FieldGeneratorBase::GenerateFreezingCode(io::Printer* printer) {
-  // No-op: only message fields and repeated fields need
-  // special handling for freezing, so default to not generating any code.
-}
-
-void FieldGeneratorBase::GenerateCodecCode(io::Printer* printer) {
-    // No-op: expect this to be overridden by appropriate types.
-    // Could fail if we get called here though...
-}
-
-void FieldGeneratorBase::GenerateExtensionCode(io::Printer* printer) {
-  // No-op: only message fields, enum fields, primitives, 
-  // and repeated fields need this default is to not generate any code
-}
-
-void FieldGeneratorBase::GenerateParsingCode(io::Printer* printer, bool use_parse_context) {
-  // for some field types the value of "use_parse_context" doesn't matter,
-  // so we fallback to the default implementation.
-  GenerateParsingCode(printer);
-}
-
-void FieldGeneratorBase::GenerateSerializationCode(io::Printer* printer, bool use_write_context) {
-  // for some field types the value of "use_write_context" doesn't matter,
-  // so we fallback to the default implementation.
-  GenerateSerializationCode(printer);
-}
-
-void FieldGeneratorBase::AddDeprecatedFlag(io::Printer* printer) {
-  if (descriptor_->options().deprecated()) {
-    printer->Print("[global::System.ObsoleteAttribute]\n");
-  } else if (descriptor_->type() == FieldDescriptor::TYPE_MESSAGE &&
-           descriptor_->message_type()->options().deprecated()) {
-    printer->Print("[global::System.ObsoleteAttribute]\n");
-  }
-}
-
-void FieldGeneratorBase::AddPublicMemberAttributes(io::Printer* printer) {
-  AddDeprecatedFlag(printer);
-  WriteGeneratedCodeAttributes(printer);
-}
-
-std::string FieldGeneratorBase::oneof_case_name() {
-  return GetOneofCaseName(descriptor_);
-}
-
-std::string FieldGeneratorBase::oneof_property_name() {
-  return UnderscoresToCamelCase(descriptor_->containing_oneof()->name(), true);
-}
-
-std::string FieldGeneratorBase::oneof_name() {
-  return UnderscoresToCamelCase(descriptor_->containing_oneof()->name(), false);
-}
-
-std::string FieldGeneratorBase::property_name() {
-  return GetPropertyName(descriptor_);
-}
-
-std::string FieldGeneratorBase::name() {
-  return UnderscoresToCamelCase(GetFieldName(descriptor_), false);
-}
-
-std::string FieldGeneratorBase::type_name() {
-  return type_name(descriptor_);
-}
-
-std::string FieldGeneratorBase::type_name(const FieldDescriptor* descriptor) {
-  switch (descriptor->type()) {
-    case FieldDescriptor::TYPE_ENUM:
-      return GetClassName(descriptor->enum_type());
-    case FieldDescriptor::TYPE_MESSAGE:
-    case FieldDescriptor::TYPE_GROUP:
-      if (IsWrapperType(descriptor)) {
-        const FieldDescriptor* wrapped_field =
-            descriptor->message_type()->field(0);
-        std::string wrapped_field_type_name = type_name(wrapped_field);
-        // String and ByteString go to the same type; other wrapped types
-        // go to the nullable equivalent.
-        if (wrapped_field->type() == FieldDescriptor::TYPE_STRING ||
-            wrapped_field->type() == FieldDescriptor::TYPE_BYTES) {
-          return wrapped_field_type_name;
-        } else {
-          return wrapped_field_type_name + "?";
-        }
-      }
-      return GetClassName(descriptor->message_type());
-    case FieldDescriptor::TYPE_DOUBLE:
-      return "double";
-    case FieldDescriptor::TYPE_FLOAT:
-      return "float";
-    case FieldDescriptor::TYPE_INT64:
-      return "long";
-    case FieldDescriptor::TYPE_UINT64:
-      return "ulong";
-    case FieldDescriptor::TYPE_INT32:
-      return "int";
-    case FieldDescriptor::TYPE_FIXED64:
-      return "ulong";
-    case FieldDescriptor::TYPE_FIXED32:
-      return "uint";
-    case FieldDescriptor::TYPE_BOOL:
-      return "bool";
-    case FieldDescriptor::TYPE_STRING:
-      return "string";
-    case FieldDescriptor::TYPE_BYTES:
-      return "pb::ByteString";
-    case FieldDescriptor::TYPE_UINT32:
-      return "uint";
-    case FieldDescriptor::TYPE_SFIXED32:
-      return "int";
-    case FieldDescriptor::TYPE_SFIXED64:
-      return "long";
-    case FieldDescriptor::TYPE_SINT32:
-      return "int";
-    case FieldDescriptor::TYPE_SINT64:
-      return "long";
-    default:
-      GOOGLE_LOG(FATAL)<< "Unknown field type.";
-      return "";
-  }
-}
-
-bool FieldGeneratorBase::has_default_value() {
-  switch (descriptor_->type()) {
-    case FieldDescriptor::TYPE_ENUM:
-    case FieldDescriptor::TYPE_MESSAGE:
-    case FieldDescriptor::TYPE_GROUP:
-      return true;
-    case FieldDescriptor::TYPE_DOUBLE:
-      return descriptor_->default_value_double() != 0.0;
-    case FieldDescriptor::TYPE_FLOAT:
-      return descriptor_->default_value_float() != 0.0;
-    case FieldDescriptor::TYPE_INT64:
-      return descriptor_->default_value_int64() != 0L;
-    case FieldDescriptor::TYPE_UINT64:
-      return descriptor_->default_value_uint64() != 0L;
-    case FieldDescriptor::TYPE_INT32:
-      return descriptor_->default_value_int32() != 0;
-    case FieldDescriptor::TYPE_FIXED64:
-      return descriptor_->default_value_uint64() != 0L;
-    case FieldDescriptor::TYPE_FIXED32:
-      return descriptor_->default_value_uint32() != 0;
-    case FieldDescriptor::TYPE_BOOL:
-      return descriptor_->default_value_bool();
-    case FieldDescriptor::TYPE_STRING:
-      return true;
-    case FieldDescriptor::TYPE_BYTES:
-      return true;
-    case FieldDescriptor::TYPE_UINT32:
-      return descriptor_->default_value_uint32() != 0;
-    case FieldDescriptor::TYPE_SFIXED32:
-      return descriptor_->default_value_int32() != 0;
-    case FieldDescriptor::TYPE_SFIXED64:
-      return descriptor_->default_value_int64() != 0L;
-    case FieldDescriptor::TYPE_SINT32:
-      return descriptor_->default_value_int32() != 0;
-    case FieldDescriptor::TYPE_SINT64:
-      return descriptor_->default_value_int64() != 0L;
-    default:
-      GOOGLE_LOG(FATAL)<< "Unknown field type.";
-      return true;
-  }
-}
-
-bool AllPrintableAscii(const std::string& text) {
-  for(int i = 0; i < text.size(); i++) {
-    if (text[i] < 0x20 || text[i] > 0x7e) {
-      return false;
-    }
-  }
-  return true;
-}
-
-std::string FieldGeneratorBase::GetStringDefaultValueInternal(const FieldDescriptor* descriptor) {
-    if (descriptor->default_value_string().empty())
-        return "\"\"";
-    else
-      return "global::System.Text.Encoding.UTF8.GetString(global::System."
-             "Convert.FromBase64String(\"" +
-             StringToBase64(descriptor->default_value_string()) + "\"), 0, " + StrCat(descriptor->default_value_string().length()) + ")";
-}
-
-std::string FieldGeneratorBase::GetBytesDefaultValueInternal(const FieldDescriptor* descriptor) {
-    if (descriptor->default_value_string().empty())
-        return "pb::ByteString.Empty";
-    else
-        return "pb::ByteString.FromBase64(\"" + StringToBase64(descriptor->default_value_string()) + "\")";
-}
-
-std::string FieldGeneratorBase::default_value() {
-    return default_value(descriptor_);
-}
-
-std::string FieldGeneratorBase::default_value(const FieldDescriptor* descriptor) {
-  switch (descriptor->type()) {
-    case FieldDescriptor::TYPE_ENUM:
-      return GetClassName(descriptor->default_value_enum()->type()) + "." +
-        GetEnumValueName(descriptor->default_value_enum()->type()->name(), descriptor->default_value_enum()->name());
-    case FieldDescriptor::TYPE_MESSAGE:
-    case FieldDescriptor::TYPE_GROUP:
-      if (IsWrapperType(descriptor)) {
-        const FieldDescriptor* wrapped_field = descriptor->message_type()->field(0);
-        return default_value(wrapped_field);
-      } else {
-        return "null";
-      }
-    case FieldDescriptor::TYPE_DOUBLE: {
-      double value = descriptor->default_value_double();
-      if (value == std::numeric_limits<double>::infinity()) {
-        return "double.PositiveInfinity";
-      } else if (value == -std::numeric_limits<double>::infinity()) {
-        return "double.NegativeInfinity";
-      } else if (std::isnan(value)) {
-        return "double.NaN";
-      }
-      return StrCat(value) + "D";
-    }
-    case FieldDescriptor::TYPE_FLOAT: {
-      float value = descriptor->default_value_float();
-      if (value == std::numeric_limits<float>::infinity()) {
-        return "float.PositiveInfinity";
-      } else if (value == -std::numeric_limits<float>::infinity()) {
-        return "float.NegativeInfinity";
-      } else if (std::isnan(value)) {
-        return "float.NaN";
-      }
-      return StrCat(value) + "F";
-    }
-    case FieldDescriptor::TYPE_INT64:
-      return StrCat(descriptor->default_value_int64()) + "L";
-    case FieldDescriptor::TYPE_UINT64:
-      return StrCat(descriptor->default_value_uint64()) + "UL";
-    case FieldDescriptor::TYPE_INT32:
-      return StrCat(descriptor->default_value_int32());
-    case FieldDescriptor::TYPE_FIXED64:
-      return StrCat(descriptor->default_value_uint64()) + "UL";
-    case FieldDescriptor::TYPE_FIXED32:
-      return StrCat(descriptor->default_value_uint32());
-    case FieldDescriptor::TYPE_BOOL:
-      if (descriptor->default_value_bool()) {
-        return "true";
-      } else {
-        return "false";
-      }
-    case FieldDescriptor::TYPE_STRING:
-      return GetStringDefaultValueInternal(descriptor);
-    case FieldDescriptor::TYPE_BYTES:
-      return GetBytesDefaultValueInternal(descriptor);
-    case FieldDescriptor::TYPE_UINT32:
-      return StrCat(descriptor->default_value_uint32());
-    case FieldDescriptor::TYPE_SFIXED32:
-      return StrCat(descriptor->default_value_int32());
-    case FieldDescriptor::TYPE_SFIXED64:
-      return StrCat(descriptor->default_value_int64()) + "L";
-    case FieldDescriptor::TYPE_SINT32:
-      return StrCat(descriptor->default_value_int32());
-    case FieldDescriptor::TYPE_SINT64:
-      return StrCat(descriptor->default_value_int64()) + "L";
-    default:
-      GOOGLE_LOG(FATAL)<< "Unknown field type.";
-      return "";
-  }
-}
-
-std::string FieldGeneratorBase::number() {
-  return StrCat(descriptor_->number());
-}
-
-std::string FieldGeneratorBase::capitalized_type_name() {
-  switch (descriptor_->type()) {
-    case FieldDescriptor::TYPE_ENUM:
-      return "Enum";
-    case FieldDescriptor::TYPE_MESSAGE:
-      return "Message";
-    case FieldDescriptor::TYPE_GROUP:
-      return "Group";
-    case FieldDescriptor::TYPE_DOUBLE:
-      return "Double";
-    case FieldDescriptor::TYPE_FLOAT:
-      return "Float";
-    case FieldDescriptor::TYPE_INT64:
-      return "Int64";
-    case FieldDescriptor::TYPE_UINT64:
-      return "UInt64";
-    case FieldDescriptor::TYPE_INT32:
-      return "Int32";
-    case FieldDescriptor::TYPE_FIXED64:
-      return "Fixed64";
-    case FieldDescriptor::TYPE_FIXED32:
-      return "Fixed32";
-    case FieldDescriptor::TYPE_BOOL:
-      return "Bool";
-    case FieldDescriptor::TYPE_STRING:
-      return "String";
-    case FieldDescriptor::TYPE_BYTES:
-      return "Bytes";
-    case FieldDescriptor::TYPE_UINT32:
-      return "UInt32";
-    case FieldDescriptor::TYPE_SFIXED32:
-      return "SFixed32";
-    case FieldDescriptor::TYPE_SFIXED64:
-      return "SFixed64";
-    case FieldDescriptor::TYPE_SINT32:
-      return "SInt32";
-    case FieldDescriptor::TYPE_SINT64:
-      return "SInt64";
-    default:
-      GOOGLE_LOG(FATAL)<< "Unknown field type.";
-      return "";
-  }
-}
-
-}  // namespace csharp
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/compiler/csharp/csharp_field_base.h b/libs/protobuf/src/google/protobuf/compiler/csharp/csharp_field_base.h
deleted file mode 100644
index c7b7469..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/csharp/csharp_field_base.h
+++ /dev/null
@@ -1,112 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef GOOGLE_PROTOBUF_COMPILER_CSHARP_FIELD_BASE_H__
-#define GOOGLE_PROTOBUF_COMPILER_CSHARP_FIELD_BASE_H__
-
-#include <string>
-#include <google/protobuf/stubs/strutil.h>
-
-#include <google/protobuf/compiler/code_generator.h>
-#include <google/protobuf/compiler/csharp/csharp_source_generator_base.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/io/printer.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace csharp {
-
-class FieldGeneratorBase : public SourceGeneratorBase {
- public:
-  FieldGeneratorBase(const FieldDescriptor* descriptor,
-                     int presenceIndex,
-                     const Options* options);
-  ~FieldGeneratorBase();
-
-  FieldGeneratorBase(const FieldGeneratorBase&) = delete;
-  FieldGeneratorBase& operator=(const FieldGeneratorBase&) = delete;
-
-  virtual void GenerateCloningCode(io::Printer* printer) = 0;
-  virtual void GenerateFreezingCode(io::Printer* printer);
-  virtual void GenerateCodecCode(io::Printer* printer);
-  virtual void GenerateExtensionCode(io::Printer* printer);
-  virtual void GenerateMembers(io::Printer* printer) = 0;
-  virtual void GenerateMergingCode(io::Printer* printer) = 0;
-  virtual void GenerateParsingCode(io::Printer* printer) = 0;
-  virtual void GenerateParsingCode(io::Printer* printer, bool use_parse_context);
-  virtual void GenerateSerializationCode(io::Printer* printer) = 0;
-  virtual void GenerateSerializationCode(io::Printer* printer, bool use_write_context);
-  virtual void GenerateSerializedSizeCode(io::Printer* printer) = 0;
-
-  virtual void WriteHash(io::Printer* printer) = 0;
-  virtual void WriteEquals(io::Printer* printer) = 0;
-  // Currently unused, as we use reflection to generate JSON
-  virtual void WriteToString(io::Printer* printer) = 0;
-
- protected:
-  const FieldDescriptor* descriptor_;
-  const int presenceIndex_;
-  std::map<std::string, std::string> variables_;
-
-  void AddDeprecatedFlag(io::Printer* printer);
-  void AddNullCheck(io::Printer* printer);
-  void AddNullCheck(io::Printer* printer, const std::string& name);
-
-  void AddPublicMemberAttributes(io::Printer* printer);
-  void SetCommonOneofFieldVariables(
-      std::map<std::string, std::string>* variables);
-
-  std::string oneof_property_name();
-  std::string oneof_case_name(); 
-  std::string oneof_name();
-  std::string property_name();
-  std::string name();
-  std::string type_name();
-  std::string type_name(const FieldDescriptor* descriptor);
-  bool has_default_value();
-  std::string default_value();
-  std::string default_value(const FieldDescriptor* descriptor);
-  std::string number();
-  std::string capitalized_type_name();
-
- private:
-  void SetCommonFieldVariables(std::map<std::string, std::string>* variables);
-  std::string GetStringDefaultValueInternal(const FieldDescriptor* descriptor);
-  std::string GetBytesDefaultValueInternal(const FieldDescriptor* descriptor);
-};
-
-}  // namespace csharp
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // GOOGLE_PROTOBUF_COMPILER_CSHARP_FIELD_BASE_H__
-
diff --git a/libs/protobuf/src/google/protobuf/compiler/csharp/csharp_generator.cc b/libs/protobuf/src/google/protobuf/compiler/csharp/csharp_generator.cc
deleted file mode 100644
index 5ce0651..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/csharp/csharp_generator.cc
+++ /dev/null
@@ -1,112 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <sstream>
-
-#include <google/protobuf/compiler/code_generator.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/descriptor.pb.h>
-#include <google/protobuf/io/printer.h>
-#include <google/protobuf/io/zero_copy_stream.h>
-#include <google/protobuf/stubs/strutil.h>
-
-#include <google/protobuf/compiler/csharp/csharp_generator.h>
-#include <google/protobuf/compiler/csharp/csharp_helpers.h>
-#include <google/protobuf/compiler/csharp/csharp_names.h>
-#include <google/protobuf/compiler/csharp/csharp_options.h>
-#include <google/protobuf/compiler/csharp/csharp_reflection_class.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace csharp {
-
-Generator::Generator() {}
-Generator::~Generator() {}
-
-uint64_t Generator::GetSupportedFeatures() const {
-  return CodeGenerator::Feature::FEATURE_PROTO3_OPTIONAL;
-}
-
-void GenerateFile(const FileDescriptor* file, io::Printer* printer,
-                  const Options* options) {
-  ReflectionClassGenerator reflectionClassGenerator(file, options);
-  reflectionClassGenerator.Generate(printer);
-}
-
-bool Generator::Generate(const FileDescriptor* file,
-                         const std::string& parameter,
-                         GeneratorContext* generator_context,
-                         std::string* error) const {
-  std::vector<std::pair<std::string, std::string> > options;
-  ParseGeneratorParameter(parameter, &options);
-
-  struct Options cli_options;
-
-  for (int i = 0; i < options.size(); i++) {
-    if (options[i].first == "file_extension") {
-      cli_options.file_extension = options[i].second;
-    } else if (options[i].first == "base_namespace") {
-      cli_options.base_namespace = options[i].second;
-      cli_options.base_namespace_specified = true;
-    } else if (options[i].first == "internal_access") {
-      cli_options.internal_access = true;
-    } else if (options[i].first == "serializable") {
-      cli_options.serializable = true;
-    } else {
-      *error = "Unknown generator option: " + options[i].first;
-      return false;
-    }
-  }
-
-  std::string filename_error = "";
-  std::string filename = GetOutputFile(file,
-      cli_options.file_extension,
-      cli_options.base_namespace_specified,
-      cli_options.base_namespace,
-      &filename_error);
-
-  if (filename.empty()) {
-    *error = filename_error;
-    return false;
-  }
-  std::unique_ptr<io::ZeroCopyOutputStream> output(
-      generator_context->Open(filename));
-  io::Printer printer(output.get(), '$');
-
-  GenerateFile(file, &printer, &cli_options);
-
-  return true;
-}
-
-}  // namespace csharp
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/compiler/csharp/csharp_generator.h b/libs/protobuf/src/google/protobuf/compiler/csharp/csharp_generator.h
deleted file mode 100644
index f41f9b8..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/csharp/csharp_generator.h
+++ /dev/null
@@ -1,70 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Generates C# code for a given .proto file.
-
-#ifndef GOOGLE_PROTOBUF_COMPILER_CSHARP_GENERATOR_H__
-#define GOOGLE_PROTOBUF_COMPILER_CSHARP_GENERATOR_H__
-
-#include <string>
-
-#include <google/protobuf/compiler/code_generator.h>
-
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace csharp {
-
-// CodeGenerator implementation which generates a C# source file and
-// header.  If you create your own protocol compiler binary and you want
-// it to support C# output, you can do so by registering an instance of this
-// CodeGenerator with the CommandLineInterface in your main() function.
-class PROTOC_EXPORT Generator : public CodeGenerator {
- public:
-  Generator();
-  ~Generator();
-  bool Generate(
-    const FileDescriptor* file,
-    const std::string& parameter,
-    GeneratorContext* generator_context,
-    std::string* error) const override;
-  uint64_t GetSupportedFeatures() const override;
-};
-
-}  // namespace csharp
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
-
-#endif  // GOOGLE_PROTOBUF_COMPILER_CSHARP_GENERATOR_H__
diff --git a/libs/protobuf/src/google/protobuf/compiler/csharp/csharp_generator_unittest.cc b/libs/protobuf/src/google/protobuf/compiler/csharp/csharp_generator_unittest.cc
deleted file mode 100644
index e21eff1..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/csharp/csharp_generator_unittest.cc
+++ /dev/null
@@ -1,81 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2014 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <memory>
-
-#include <google/protobuf/any.pb.h>
-#include <google/protobuf/compiler/command_line_interface.h>
-#include <google/protobuf/compiler/csharp/csharp_helpers.h>
-#include <google/protobuf/descriptor.pb.h>
-#include <google/protobuf/io/zero_copy_stream.h>
-#include <google/protobuf/io/printer.h>
-
-#include <gtest/gtest.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace csharp {
-namespace {
-
-TEST(CSharpEnumValue, PascalCasedPrefixStripping) {
-  EXPECT_EQ("Bar", GetEnumValueName("Foo", "BAR"));
-  EXPECT_EQ("BarBaz", GetEnumValueName("Foo", "BAR_BAZ"));
-  EXPECT_EQ("Bar", GetEnumValueName("Foo", "FOO_BAR"));
-  EXPECT_EQ("Bar", GetEnumValueName("Foo", "FOO__BAR"));
-  EXPECT_EQ("BarBaz", GetEnumValueName("Foo", "FOO_BAR_BAZ"));
-  EXPECT_EQ("BarBaz", GetEnumValueName("Foo", "Foo_BarBaz"));
-  EXPECT_EQ("Bar", GetEnumValueName("FO_O", "FOO_BAR"));
-  EXPECT_EQ("Bar", GetEnumValueName("FOO", "F_O_O_BAR"));
-  EXPECT_EQ("Bar", GetEnumValueName("Foo", "BAR"));
-  EXPECT_EQ("BarBaz", GetEnumValueName("Foo", "BAR_BAZ"));
-  EXPECT_EQ("Foo", GetEnumValueName("Foo", "FOO"));
-  EXPECT_EQ("Foo", GetEnumValueName("Foo", "FOO___"));
-  // Identifiers can't start with digits
-  EXPECT_EQ("_2Bar", GetEnumValueName("Foo", "FOO_2_BAR"));
-  EXPECT_EQ("_2", GetEnumValueName("Foo", "FOO___2"));
-}
-
-TEST(DescriptorProtoHelpers, IsDescriptorProto) {
-  EXPECT_TRUE(IsDescriptorProto(DescriptorProto::descriptor()->file()));
-  EXPECT_FALSE(IsDescriptorProto(google::protobuf::Any::descriptor()->file()));
-}
-
-TEST(DescriptorProtoHelpers, IsDescriptorOptionMessage) {
-  EXPECT_TRUE(IsDescriptorOptionMessage(FileOptions::descriptor()));
-  EXPECT_FALSE(IsDescriptorOptionMessage(google::protobuf::Any::descriptor()));
-  EXPECT_FALSE(IsDescriptorOptionMessage(DescriptorProto::descriptor()));
-}
-
-}  // namespace
-}  // namespace csharp
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/compiler/csharp/csharp_helpers.cc b/libs/protobuf/src/google/protobuf/compiler/csharp/csharp_helpers.cc
deleted file mode 100644
index 73ca868..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/csharp/csharp_helpers.cc
+++ /dev/null
@@ -1,599 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-
-#include <algorithm>
-#include <limits>
-#include <vector>
-#include <sstream>
-
-#include <google/protobuf/compiler/csharp/csharp_helpers.h>
-#include <google/protobuf/compiler/csharp/csharp_names.h>
-#include <google/protobuf/descriptor.pb.h>
-#include <google/protobuf/io/printer.h>
-#include <google/protobuf/wire_format.h>
-#include <google/protobuf/stubs/strutil.h>
-
-#include <google/protobuf/compiler/csharp/csharp_field_base.h>
-#include <google/protobuf/compiler/csharp/csharp_enum_field.h>
-#include <google/protobuf/compiler/csharp/csharp_map_field.h>
-#include <google/protobuf/compiler/csharp/csharp_message_field.h>
-#include <google/protobuf/compiler/csharp/csharp_options.h>
-#include <google/protobuf/compiler/csharp/csharp_primitive_field.h>
-#include <google/protobuf/compiler/csharp/csharp_repeated_enum_field.h>
-#include <google/protobuf/compiler/csharp/csharp_repeated_message_field.h>
-#include <google/protobuf/compiler/csharp/csharp_repeated_primitive_field.h>
-#include <google/protobuf/compiler/csharp/csharp_wrapper_field.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace csharp {
-
-CSharpType GetCSharpType(FieldDescriptor::Type type) {
-  switch (type) {
-    case FieldDescriptor::TYPE_INT32:
-      return CSHARPTYPE_INT32;
-    case FieldDescriptor::TYPE_INT64:
-      return CSHARPTYPE_INT64;
-    case FieldDescriptor::TYPE_UINT32:
-      return CSHARPTYPE_UINT32;
-    case FieldDescriptor::TYPE_UINT64:
-      return CSHARPTYPE_UINT32;
-    case FieldDescriptor::TYPE_SINT32:
-      return CSHARPTYPE_INT32;
-    case FieldDescriptor::TYPE_SINT64:
-      return CSHARPTYPE_INT64;
-    case FieldDescriptor::TYPE_FIXED32:
-      return CSHARPTYPE_UINT32;
-    case FieldDescriptor::TYPE_FIXED64:
-      return CSHARPTYPE_UINT64;
-    case FieldDescriptor::TYPE_SFIXED32:
-      return CSHARPTYPE_INT32;
-    case FieldDescriptor::TYPE_SFIXED64:
-      return CSHARPTYPE_INT64;
-    case FieldDescriptor::TYPE_FLOAT:
-      return CSHARPTYPE_FLOAT;
-    case FieldDescriptor::TYPE_DOUBLE:
-      return CSHARPTYPE_DOUBLE;
-    case FieldDescriptor::TYPE_BOOL:
-      return CSHARPTYPE_BOOL;
-    case FieldDescriptor::TYPE_ENUM:
-      return CSHARPTYPE_ENUM;
-    case FieldDescriptor::TYPE_STRING:
-      return CSHARPTYPE_STRING;
-    case FieldDescriptor::TYPE_BYTES:
-      return CSHARPTYPE_BYTESTRING;
-    case FieldDescriptor::TYPE_GROUP:
-      return CSHARPTYPE_MESSAGE;
-    case FieldDescriptor::TYPE_MESSAGE:
-      return CSHARPTYPE_MESSAGE;
-
-      // No default because we want the compiler to complain if any new
-      // types are added.
-  }
-  GOOGLE_LOG(FATAL)<< "Can't get here.";
-  return (CSharpType) -1;
-}
-
-std::string StripDotProto(const std::string& proto_file) {
-  int lastindex = proto_file.find_last_of(".");
-  return proto_file.substr(0, lastindex);
-}
-
-std::string GetFileNamespace(const FileDescriptor* descriptor) {
-  if (descriptor->options().has_csharp_namespace()) {
-    return descriptor->options().csharp_namespace();
-  }
-  return UnderscoresToCamelCase(descriptor->package(), true, true);
-}
-
-// Returns the Pascal-cased last part of the proto file. For example,
-// input of "google/protobuf/foo_bar.proto" would result in "FooBar".
-std::string GetFileNameBase(const FileDescriptor* descriptor) {
-    std::string proto_file = descriptor->name();
-    int lastslash = proto_file.find_last_of("/");
-    std::string base = proto_file.substr(lastslash + 1);
-    return UnderscoresToPascalCase(StripDotProto(base));
-}
-
-std::string GetReflectionClassUnqualifiedName(const FileDescriptor* descriptor) {
-  // TODO: Detect collisions with existing messages,
-  // and append an underscore if necessary.
-  return GetFileNameBase(descriptor) + "Reflection";
-}
-
-std::string GetExtensionClassUnqualifiedName(const FileDescriptor* descriptor) {
-  // TODO: Detect collisions with existing messages,
-  // and append an underscore if necessary.
-  return GetFileNameBase(descriptor) + "Extensions";
-}
-
-// TODO(jtattermusch): can we reuse a utility function?
-std::string UnderscoresToCamelCase(const std::string& input,
-                                   bool cap_next_letter,
-                                   bool preserve_period) {
-  std::string result;
-  // Note:  I distrust ctype.h due to locales.
-  for (int i = 0; i < input.size(); i++) {
-    if ('a' <= input[i] && input[i] <= 'z') {
-      if (cap_next_letter) {
-        result += input[i] + ('A' - 'a');
-      } else {
-        result += input[i];
-      }
-      cap_next_letter = false;
-    } else if ('A' <= input[i] && input[i] <= 'Z') {
-      if (i == 0 && !cap_next_letter) {
-        // Force first letter to lower-case unless explicitly told to
-        // capitalize it.
-        result += input[i] + ('a' - 'A');
-      } else {
-        // Capital letters after the first are left as-is.
-        result += input[i];
-      }
-      cap_next_letter = false;
-    } else if ('0' <= input[i] && input[i] <= '9') {
-      result += input[i];
-      cap_next_letter = true;
-    } else {
-      cap_next_letter = true;
-      if (input[i] == '.' && preserve_period) {
-        result += '.';
-      }
-    }
-  }
-  // Add a trailing "_" if the name should be altered.
-  if (input.size() > 0 && input[input.size() - 1] == '#') {
-    result += '_';
-  }
-  return result;
-}
-
-std::string UnderscoresToPascalCase(const std::string& input) {
-  return UnderscoresToCamelCase(input, true);
-}
-
-// Convert a string which is expected to be SHOUTY_CASE (but may not be *precisely* shouty)
-// into a PascalCase string. Precise rules implemented:
-
-// Previous input character      Current character         Case
-// Any                           Non-alphanumeric          Skipped
-// None - first char of input    Alphanumeric              Upper
-// Non-letter (e.g. _ or 1)      Alphanumeric              Upper
-// Numeric                       Alphanumeric              Upper
-// Lower letter                  Alphanumeric              Same as current
-// Upper letter                  Alphanumeric              Lower
-std::string ShoutyToPascalCase(const std::string& input) {
-  std::string result;
-  // Simple way of implementing "always start with upper"
-  char previous = '_';
-  for (int i = 0; i < input.size(); i++) {
-    char current = input[i];
-    if (!ascii_isalnum(current)) {
-      previous = current;
-      continue;
-    }
-    if (!ascii_isalnum(previous)) {
-      result += ascii_toupper(current);
-    } else if (ascii_isdigit(previous)) {
-      result += ascii_toupper(current);
-    } else if (ascii_islower(previous)) {
-      result += current;
-    } else {
-      result += ascii_tolower(current);
-    }
-    previous = current;
-  }
-  return result;
-}
-
-// Attempt to remove a prefix from a value, ignoring casing and skipping underscores.
-// (foo, foo_bar) => bar - underscore after prefix is skipped
-// (FOO, foo_bar) => bar - casing is ignored
-// (foo_bar, foobarbaz) => baz - underscore in prefix is ignored
-// (foobar, foo_barbaz) => baz - underscore in value is ignored
-// (foo, bar) => bar - prefix isn't matched; return original value
-std::string TryRemovePrefix(const std::string& prefix, const std::string& value) {
-  // First normalize to a lower-case no-underscores prefix to match against
-  std::string prefix_to_match = "";
-  for (size_t i = 0; i < prefix.size(); i++) {
-    if (prefix[i] != '_') {
-      prefix_to_match += ascii_tolower(prefix[i]);
-    }
-  }
-
-  // This keeps track of how much of value we've consumed
-  size_t prefix_index, value_index;
-  for (prefix_index = 0, value_index = 0;
-      prefix_index < prefix_to_match.size() && value_index < value.size();
-      value_index++) {
-    // Skip over underscores in the value
-    if (value[value_index] == '_') {
-      continue;
-    }
-    if (ascii_tolower(value[value_index]) != prefix_to_match[prefix_index++]) {
-      // Failed to match the prefix - bail out early.
-      return value;
-    }
-  }
-
-  // If we didn't finish looking through the prefix, we can't strip it.
-  if (prefix_index < prefix_to_match.size()) {
-    return value;
-  }
-
-  // Step over any underscores after the prefix
-  while (value_index < value.size() && value[value_index] == '_') {
-    value_index++;
-  }
-
-  // If there's nothing left (e.g. it was a prefix with only underscores afterwards), don't strip.
-  if (value_index == value.size()) {
-    return value;
-  }
-
-  return value.substr(value_index);
-}
-
-// Format the enum value name in a pleasant way for C#:
-// - Strip the enum name as a prefix if possible
-// - Convert to PascalCase.
-// For example, an enum called Color with a value of COLOR_BLUE should
-// result in an enum value in C# called just Blue
-std::string GetEnumValueName(const std::string& enum_name, const std::string& enum_value_name) {
-  std::string stripped = TryRemovePrefix(enum_name, enum_value_name);
-  std::string result = ShoutyToPascalCase(stripped);
-  // Just in case we have an enum name of FOO and a value of FOO_2... make sure the returned
-  // string is a valid identifier.
-  if (ascii_isdigit(result[0])) {
-    result = "_" + result;
-  }
-  return result;
-}
-
-uint GetGroupEndTag(const Descriptor* descriptor) {
-  const Descriptor* containing_type = descriptor->containing_type();
-  if (containing_type != NULL) {
-    const FieldDescriptor* field;
-    for (int i = 0; i < containing_type->field_count(); i++) {
-      field = containing_type->field(i);
-      if (field->type() == FieldDescriptor::Type::TYPE_GROUP &&
-          field->message_type() == descriptor) {
-        return internal::WireFormatLite::MakeTag(
-            field->number(), internal::WireFormatLite::WIRETYPE_END_GROUP);
-      }
-    }
-    for (int i = 0; i < containing_type->extension_count(); i++) {
-      field = containing_type->extension(i);
-      if (field->type() == FieldDescriptor::Type::TYPE_GROUP &&
-          field->message_type() == descriptor) {
-        return internal::WireFormatLite::MakeTag(
-            field->number(), internal::WireFormatLite::WIRETYPE_END_GROUP);
-      }
-    }
-  } else {
-    const FileDescriptor* containing_file = descriptor->file();
-    if (containing_file != NULL) {
-      const FieldDescriptor* field;
-      for (int i = 0; i < containing_file->extension_count(); i++) {
-        field = containing_file->extension(i);
-        if (field->type() == FieldDescriptor::Type::TYPE_GROUP &&
-            field->message_type() == descriptor) {
-          return internal::WireFormatLite::MakeTag(
-              field->number(), internal::WireFormatLite::WIRETYPE_END_GROUP);
-        }
-      }
-    }
-  }
-
-  return 0;
-}
-
-std::string ToCSharpName(const std::string& name, const FileDescriptor* file) {
-  std::string result = GetFileNamespace(file);
-  if (!result.empty()) {
-    result += '.';
-  }
-  std::string classname;
-  if (file->package().empty()) {
-    classname = name;
-  } else {
-    // Strip the proto package from full_name since we've replaced it with
-    // the C# namespace.
-    classname = name.substr(file->package().size() + 1);
-  }
-  result += StringReplace(classname, ".", ".Types.", true);
-  return "global::" + result;
-}
-
-std::string GetReflectionClassName(const FileDescriptor* descriptor) {
-  std::string result = GetFileNamespace(descriptor);
-  if (!result.empty()) {
-    result += '.';
-  }
-  result += GetReflectionClassUnqualifiedName(descriptor);
-  return "global::" + result;
-}
-
-std::string GetFullExtensionName(const FieldDescriptor* descriptor) {
-  if (descriptor->extension_scope()) {
-    return GetClassName(descriptor->extension_scope()) + ".Extensions." + GetPropertyName(descriptor);
-  }
-  else {
-    return GetExtensionClassUnqualifiedName(descriptor->file())  + "." + GetPropertyName(descriptor);
-  }
-}
-
-std::string GetClassName(const Descriptor* descriptor) {
-  return ToCSharpName(descriptor->full_name(), descriptor->file());
-}
-
-std::string GetClassName(const EnumDescriptor* descriptor) {
-  return ToCSharpName(descriptor->full_name(), descriptor->file());
-}
-
-// Groups are hacky:  The name of the field is just the lower-cased name
-// of the group type.  In C#, though, we would like to retain the original
-// capitalization of the type name.
-std::string GetFieldName(const FieldDescriptor* descriptor) {
-  if (descriptor->type() == FieldDescriptor::TYPE_GROUP) {
-    return descriptor->message_type()->name();
-  } else {
-    return descriptor->name();
-  }
-}
-
-std::string GetFieldConstantName(const FieldDescriptor* field) {
-  return GetPropertyName(field) + "FieldNumber";
-}
-
-std::string GetPropertyName(const FieldDescriptor* descriptor) {
-  // TODO(jtattermusch): consider introducing csharp_property_name field option
-  std::string property_name = UnderscoresToPascalCase(GetFieldName(descriptor));
-  // Avoid either our own type name or reserved names. Note that not all names
-  // are reserved - a field called to_string, write_to etc would still cause a problem.
-  // There are various ways of ending up with naming collisions, but we try to avoid obvious
-  // ones.
-  if (property_name == descriptor->containing_type()->name()
-      || property_name == "Types"
-      || property_name == "Descriptor") {
-    property_name += "_";
-  }
-  return property_name;
-}
-
-std::string GetOneofCaseName(const FieldDescriptor* descriptor) {
-  // The name in a oneof case enum is the same as for the property, but as we always have a "None"
-  // value as well, we need to reserve that by appending an underscore.
-  std::string property_name = GetPropertyName(descriptor);
-  return property_name == "None" ? "None_" : property_name;
-}
-
-std::string GetOutputFile(const FileDescriptor* descriptor,
-                          const std::string file_extension,
-                          const bool generate_directories,
-                          const std::string base_namespace,
-                          std::string* error) {
-  std::string relative_filename = GetFileNameBase(descriptor) + file_extension;
-  if (!generate_directories) {
-    return relative_filename;
-  }
-  std::string ns = GetFileNamespace(descriptor);
-  std::string namespace_suffix = ns;
-  if (!base_namespace.empty()) {
-    // Check that the base_namespace is either equal to or a leading part of
-    // the file namespace. This isn't just a simple prefix; "Foo.B" shouldn't
-    // be regarded as a prefix of "Foo.Bar". The simplest option is to add "."
-    // to both.
-    std::string extended_ns = ns + ".";
-    if (extended_ns.find(base_namespace + ".") != 0) {
-      *error = "Namespace " + ns + " is not a prefix namespace of base namespace " + base_namespace;
-      return ""; // This will be ignored, because we've set an error.
-    }
-    namespace_suffix = ns.substr(base_namespace.length());
-    if (namespace_suffix.find(".") == 0) {
-      namespace_suffix = namespace_suffix.substr(1);
-    }
-  }
-
-  std::string namespace_dir = StringReplace(namespace_suffix, ".", "/", true);
-  if (!namespace_dir.empty()) {
-    namespace_dir += "/";
-  }
-  return namespace_dir + relative_filename;
-}
-
-// TODO: c&p from Java protoc plugin
-// For encodings with fixed sizes, returns that size in bytes.  Otherwise
-// returns -1.
-int GetFixedSize(FieldDescriptor::Type type) {
-  switch (type) {
-    case FieldDescriptor::TYPE_INT32   : return -1;
-    case FieldDescriptor::TYPE_INT64   : return -1;
-    case FieldDescriptor::TYPE_UINT32  : return -1;
-    case FieldDescriptor::TYPE_UINT64  : return -1;
-    case FieldDescriptor::TYPE_SINT32  : return -1;
-    case FieldDescriptor::TYPE_SINT64  : return -1;
-    case FieldDescriptor::TYPE_FIXED32 : return internal::WireFormatLite::kFixed32Size;
-    case FieldDescriptor::TYPE_FIXED64 : return internal::WireFormatLite::kFixed64Size;
-    case FieldDescriptor::TYPE_SFIXED32: return internal::WireFormatLite::kSFixed32Size;
-    case FieldDescriptor::TYPE_SFIXED64: return internal::WireFormatLite::kSFixed64Size;
-    case FieldDescriptor::TYPE_FLOAT   : return internal::WireFormatLite::kFloatSize;
-    case FieldDescriptor::TYPE_DOUBLE  : return internal::WireFormatLite::kDoubleSize;
-
-    case FieldDescriptor::TYPE_BOOL    : return internal::WireFormatLite::kBoolSize;
-    case FieldDescriptor::TYPE_ENUM    : return -1;
-
-    case FieldDescriptor::TYPE_STRING  : return -1;
-    case FieldDescriptor::TYPE_BYTES   : return -1;
-    case FieldDescriptor::TYPE_GROUP   : return -1;
-    case FieldDescriptor::TYPE_MESSAGE : return -1;
-
-    // No default because we want the compiler to complain if any new
-    // types are added.
-  }
-  GOOGLE_LOG(FATAL) << "Can't get here.";
-  return -1;
-}
-
-static const char base64_chars[] =
-    "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-
-std::string StringToBase64(const std::string& input) {
-  std::string result;
-  size_t remaining = input.size();
-  const unsigned char *src = (const unsigned char*) input.c_str();
-  while (remaining > 2) {
-    result += base64_chars[src[0] >> 2];
-    result += base64_chars[((src[0] & 0x3) << 4) | (src[1] >> 4)];
-    result += base64_chars[((src[1] & 0xf) << 2) | (src[2] >> 6)];
-    result += base64_chars[src[2] & 0x3f];
-    remaining -= 3;
-    src += 3;
-  }
-  switch (remaining) {
-    case 2:
-      result += base64_chars[src[0] >> 2];
-      result += base64_chars[((src[0] & 0x3) << 4) | (src[1] >> 4)];
-      result += base64_chars[(src[1] & 0xf) << 2];
-      result += '=';
-      src += 2;
-      break;
-    case 1:
-      result += base64_chars[src[0] >> 2];
-      result += base64_chars[((src[0] & 0x3) << 4)];
-      result += '=';
-      result += '=';
-      src += 1;
-      break;
-  }
-  return result;
-}
-
-std::string FileDescriptorToBase64(const FileDescriptor* descriptor) {
-  std::string fdp_bytes;
-  FileDescriptorProto fdp;
-  descriptor->CopyTo(&fdp);
-  fdp.SerializeToString(&fdp_bytes);
-  return StringToBase64(fdp_bytes);
-}
-
-FieldGeneratorBase* CreateFieldGenerator(const FieldDescriptor* descriptor,
-                                         int presenceIndex,
-                                         const Options* options) {
-  switch (descriptor->type()) {
-    case FieldDescriptor::TYPE_GROUP:
-    case FieldDescriptor::TYPE_MESSAGE:
-      if (descriptor->is_repeated()) {
-        if (descriptor->is_map()) {
-          return new MapFieldGenerator(descriptor, presenceIndex, options);
-        } else {
-          return new RepeatedMessageFieldGenerator(descriptor, presenceIndex, options);
-        }
-      } else {
-        if (IsWrapperType(descriptor)) {
-          if (descriptor->real_containing_oneof()) {
-            return new WrapperOneofFieldGenerator(descriptor, presenceIndex, options);
-          } else {
-            return new WrapperFieldGenerator(descriptor, presenceIndex, options);
-          }
-        } else {
-          if (descriptor->real_containing_oneof()) {
-            return new MessageOneofFieldGenerator(descriptor, presenceIndex, options);
-          } else {
-            return new MessageFieldGenerator(descriptor, presenceIndex, options);
-          }
-        }
-      }
-    case FieldDescriptor::TYPE_ENUM:
-      if (descriptor->is_repeated()) {
-        return new RepeatedEnumFieldGenerator(descriptor, presenceIndex, options);
-      } else {
-        if (descriptor->real_containing_oneof()) {
-          return new EnumOneofFieldGenerator(descriptor, presenceIndex, options);
-        } else {
-          return new EnumFieldGenerator(descriptor, presenceIndex, options);
-        }
-      }
-    default:
-      if (descriptor->is_repeated()) {
-        return new RepeatedPrimitiveFieldGenerator(descriptor, presenceIndex, options);
-      } else {
-        if (descriptor->real_containing_oneof()) {
-          return new PrimitiveOneofFieldGenerator(descriptor, presenceIndex, options);
-        } else {
-          return new PrimitiveFieldGenerator(descriptor, presenceIndex, options);
-        }
-      }
-  }
-}
-
-bool IsNullable(const FieldDescriptor* descriptor) {
-  if (descriptor->is_repeated()) {
-    return true;
-  }
-
-  switch (descriptor->type()) {
-    case FieldDescriptor::TYPE_ENUM:
-    case FieldDescriptor::TYPE_DOUBLE:
-    case FieldDescriptor::TYPE_FLOAT:
-    case FieldDescriptor::TYPE_INT64:
-    case FieldDescriptor::TYPE_UINT64:
-    case FieldDescriptor::TYPE_INT32:
-    case FieldDescriptor::TYPE_FIXED64:
-    case FieldDescriptor::TYPE_FIXED32:
-    case FieldDescriptor::TYPE_BOOL:
-    case FieldDescriptor::TYPE_UINT32:
-    case FieldDescriptor::TYPE_SFIXED32:
-    case FieldDescriptor::TYPE_SFIXED64:
-    case FieldDescriptor::TYPE_SINT32:
-    case FieldDescriptor::TYPE_SINT64:
-      return false;
-
-    case FieldDescriptor::TYPE_MESSAGE:
-    case FieldDescriptor::TYPE_GROUP:
-    case FieldDescriptor::TYPE_STRING:
-    case FieldDescriptor::TYPE_BYTES:
-      return true;
-
-    default:
-      GOOGLE_LOG(FATAL) << "Unknown field type.";
-      return true;
-  }
-}
-
-}  // namespace csharp
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/compiler/csharp/csharp_helpers.h b/libs/protobuf/src/google/protobuf/compiler/csharp/csharp_helpers.h
deleted file mode 100644
index 836bd5d..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/csharp/csharp_helpers.h
+++ /dev/null
@@ -1,198 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-
-#ifndef GOOGLE_PROTOBUF_COMPILER_CSHARP_HELPERS_H__
-#define GOOGLE_PROTOBUF_COMPILER_CSHARP_HELPERS_H__
-
-#include <string>
-#include <google/protobuf/port.h>
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/descriptor.pb.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/compiler/code_generator.h>
-#include <google/protobuf/io/printer.h>
-
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace csharp {
-
-struct Options;
-class FieldGeneratorBase;
-
-// TODO: start using this enum.
-enum CSharpType {
-  CSHARPTYPE_INT32 = 1,
-  CSHARPTYPE_INT64 = 2,
-  CSHARPTYPE_UINT32 = 3,
-  CSHARPTYPE_UINT64 = 4,
-  CSHARPTYPE_FLOAT = 5,
-  CSHARPTYPE_DOUBLE = 6,
-  CSHARPTYPE_BOOL = 7,
-  CSHARPTYPE_STRING = 8,
-  CSHARPTYPE_BYTESTRING = 9,
-  CSHARPTYPE_MESSAGE = 10,
-  CSHARPTYPE_ENUM = 11,
-  MAX_CSHARPTYPE = 11
-};
-
-// Converts field type to corresponding C# type.
-CSharpType GetCSharpType(FieldDescriptor::Type type);
-
-std::string StripDotProto(const std::string& proto_file);
-
-// Gets unqualified name of the reflection class
-std::string GetReflectionClassUnqualifiedName(const FileDescriptor* descriptor);
-// Gets unqualified name of the extension class
-std::string GetExtensionClassUnqualifiedName(const FileDescriptor* descriptor);
-
-std::string GetClassName(const EnumDescriptor* descriptor);
-
-std::string GetFieldName(const FieldDescriptor* descriptor);
-
-std::string GetFieldConstantName(const FieldDescriptor* field);
-
-std::string GetPropertyName(const FieldDescriptor* descriptor);
-
-std::string GetOneofCaseName(const FieldDescriptor* descriptor);
-
-int GetFixedSize(FieldDescriptor::Type type);
-
-std::string UnderscoresToCamelCase(const std::string& input,
-                                   bool cap_next_letter,
-                                   bool preserve_period);
-
-inline std::string UnderscoresToCamelCase(const std::string& input, bool cap_next_letter) {
-  return UnderscoresToCamelCase(input, cap_next_letter, false);
-}
-
-std::string UnderscoresToPascalCase(const std::string& input);
-
-// Note that we wouldn't normally want to export this (we're not expecting
-// it to be used outside libprotoc itself) but this exposes it for testing.
-std::string PROTOC_EXPORT GetEnumValueName(const std::string& enum_name,
-                                           const std::string& enum_value_name);
-
-// TODO(jtattermusch): perhaps we could move this to strutil
-std::string StringToBase64(const std::string& input);
-
-std::string FileDescriptorToBase64(const FileDescriptor* descriptor);
-
-FieldGeneratorBase* CreateFieldGenerator(const FieldDescriptor* descriptor,
-                                         int presenceIndex,
-                                         const Options* options);
-
-std::string GetFullExtensionName(const FieldDescriptor* descriptor);
-
-bool IsNullable(const FieldDescriptor* descriptor);
-
-// Determines whether the given message is a map entry message,
-// i.e. one implicitly created by protoc due to a map<key, value> field.
-inline bool IsMapEntryMessage(const Descriptor* descriptor) {
-  return descriptor->options().map_entry();
-}
-
-// Checks if this descriptor is for a group and gets its end tag or 0 if it's not a group
-uint GetGroupEndTag(const Descriptor* descriptor);
-
-// Determines whether we're generating code for the proto representation of
-// descriptors etc, for use in the runtime. This is the only type which is
-// allowed to use proto2 syntax, and it generates internal classes.
-inline bool IsDescriptorProto(const FileDescriptor* descriptor) {
-  return descriptor->name() == "google/protobuf/descriptor.proto" ||
-         descriptor->name() == "net/proto2/proto/descriptor.proto";
-}
-
-// Determines whether the given message is an options message within descriptor.proto.
-inline bool IsDescriptorOptionMessage(const Descriptor* descriptor) {
-  if (!IsDescriptorProto(descriptor->file())) {
-    return false;
-  }
-  const std::string name = descriptor->name();
-  return name == "FileOptions" ||
-      name == "MessageOptions" ||
-      name == "FieldOptions" ||
-      name == "OneofOptions" ||
-      name == "EnumOptions" ||
-      name == "EnumValueOptions" ||
-      name == "ServiceOptions" ||
-      name == "MethodOptions";
-}
-
-inline bool IsWrapperType(const FieldDescriptor* descriptor) {
-  return descriptor->type() == FieldDescriptor::TYPE_MESSAGE &&
-      descriptor->message_type()->file()->name() == "google/protobuf/wrappers.proto";
-}
-
-inline bool IsProto2(const FileDescriptor* descriptor) {
-  return descriptor->syntax() == FileDescriptor::SYNTAX_PROTO2;
-}
-
-inline bool SupportsPresenceApi(const FieldDescriptor* descriptor) {
-  // Unlike most languages, we don't generate Has/Clear members for message
-  // types, because they can always be set to null in C#. They're not really
-  // needed for oneof fields in proto2 either, as everything can be done via
-  // oneof case, but we follow the convention from other languages. Proto3
-  // oneof fields never have Has/Clear members - but will also never have
-  // the explicit optional keyword either.
-  //
-  // None of the built-in helpers (descriptor->has_presence() etc) describe
-  // quite the behavior we want, so the rules are explicit below.
-
-  if (descriptor->is_repeated() ||
-      descriptor->type() == FieldDescriptor::TYPE_MESSAGE) {
-    return false;
-  }
-  // has_optional_keyword() has more complex rules for proto2, but that
-  // doesn't matter given the first part of this condition.
-  return IsProto2(descriptor->file()) || descriptor->has_optional_keyword();
-}
-
-inline bool RequiresPresenceBit(const FieldDescriptor* descriptor) {
-  return SupportsPresenceApi(descriptor) &&
-    !IsNullable(descriptor) &&
-    !descriptor->is_extension() &&
-    !descriptor->real_containing_oneof();
-}
-
-}  // namespace csharp
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
-
-#endif  // GOOGLE_PROTOBUF_COMPILER_CSHARP_HELPERS_H__
diff --git a/libs/protobuf/src/google/protobuf/compiler/csharp/csharp_map_field.cc b/libs/protobuf/src/google/protobuf/compiler/csharp/csharp_map_field.cc
deleted file mode 100644
index a13b995..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/csharp/csharp_map_field.cc
+++ /dev/null
@@ -1,152 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <sstream>
-
-#include <google/protobuf/compiler/code_generator.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/descriptor.pb.h>
-#include <google/protobuf/io/printer.h>
-#include <google/protobuf/io/zero_copy_stream.h>
-#include <google/protobuf/stubs/strutil.h>
-
-#include <google/protobuf/compiler/csharp/csharp_doc_comment.h>
-#include <google/protobuf/compiler/csharp/csharp_helpers.h>
-#include <google/protobuf/compiler/csharp/csharp_map_field.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace csharp {
-
-MapFieldGenerator::MapFieldGenerator(const FieldDescriptor* descriptor,
-                                     int presenceIndex,
-                                     const Options* options)
-    : FieldGeneratorBase(descriptor, presenceIndex, options) {
-}
-
-MapFieldGenerator::~MapFieldGenerator() {
-}
-
-void MapFieldGenerator::GenerateMembers(io::Printer* printer) {
-  const FieldDescriptor* key_descriptor =
-      descriptor_->message_type()->map_key();
-  const FieldDescriptor* value_descriptor =
-      descriptor_->message_type()->map_value();
-  variables_["key_type_name"] = type_name(key_descriptor);
-  variables_["value_type_name"] = type_name(value_descriptor);
-  std::unique_ptr<FieldGeneratorBase> key_generator(
-      CreateFieldGenerator(key_descriptor, 1, this->options()));
-  std::unique_ptr<FieldGeneratorBase> value_generator(
-      CreateFieldGenerator(value_descriptor, 2, this->options()));
-
-  printer->Print(
-    variables_,
-    "private static readonly pbc::MapField<$key_type_name$, $value_type_name$>.Codec _map_$name$_codec\n"
-    "    = new pbc::MapField<$key_type_name$, $value_type_name$>.Codec(");
-  key_generator->GenerateCodecCode(printer);
-  printer->Print(", ");
-  value_generator->GenerateCodecCode(printer);
-  printer->Print(
-    variables_,
-    ", $tag$);\n"
-    "private readonly pbc::MapField<$key_type_name$, $value_type_name$> $name$_ = new pbc::MapField<$key_type_name$, $value_type_name$>();\n");
-  WritePropertyDocComment(printer, descriptor_);
-  AddPublicMemberAttributes(printer);
-  printer->Print(
-    variables_,
-    "$access_level$ pbc::MapField<$key_type_name$, $value_type_name$> $property_name$ {\n"
-    "  get { return $name$_; }\n"
-    "}\n");
-}
-
-void MapFieldGenerator::GenerateMergingCode(io::Printer* printer) {
-  printer->Print(
-      variables_,
-      "$name$_.Add(other.$name$_);\n");
-}
-
-void MapFieldGenerator::GenerateParsingCode(io::Printer* printer) {
-  GenerateParsingCode(printer, true);
-}
-
-void MapFieldGenerator::GenerateParsingCode(io::Printer* printer, bool use_parse_context) {
-  printer->Print(
-    variables_,
-    use_parse_context
-    ? "$name$_.AddEntriesFrom(ref input, _map_$name$_codec);\n"
-    : "$name$_.AddEntriesFrom(input, _map_$name$_codec);\n");
-}
-
-void MapFieldGenerator::GenerateSerializationCode(io::Printer* printer) {
-  GenerateSerializationCode(printer, true);
-}
-
-void MapFieldGenerator::GenerateSerializationCode(io::Printer* printer, bool use_write_context) {
-  printer->Print(
-    variables_,
-    use_write_context
-    ? "$name$_.WriteTo(ref output, _map_$name$_codec);\n"
-    : "$name$_.WriteTo(output, _map_$name$_codec);\n");
-}
-
-void MapFieldGenerator::GenerateSerializedSizeCode(io::Printer* printer) {
-  printer->Print(
-    variables_,
-    "size += $name$_.CalculateSize(_map_$name$_codec);\n");
-}
-
-void MapFieldGenerator::WriteHash(io::Printer* printer) {
-  printer->Print(
-    variables_,
-    "hash ^= $property_name$.GetHashCode();\n");
-}
-void MapFieldGenerator::WriteEquals(io::Printer* printer) {
-  printer->Print(
-    variables_,
-    "if (!$property_name$.Equals(other.$property_name$)) return false;\n");
-}
-
-void MapFieldGenerator::WriteToString(io::Printer* printer) {
-    // TODO: If we ever actually use ToString, we'll need to impleme this...
-}
-
-void MapFieldGenerator::GenerateCloningCode(io::Printer* printer) {
-  printer->Print(variables_,
-    "$name$_ = other.$name$_.Clone();\n");
-}
-
-void MapFieldGenerator::GenerateFreezingCode(io::Printer* printer) {
-}
-
-}  // namespace csharp
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/compiler/csharp/csharp_map_field.h b/libs/protobuf/src/google/protobuf/compiler/csharp/csharp_map_field.h
deleted file mode 100644
index 23b3619..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/csharp/csharp_map_field.h
+++ /dev/null
@@ -1,73 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef GOOGLE_PROTOBUF_COMPILER_CSHARP_MAP_FIELD_H__
-#define GOOGLE_PROTOBUF_COMPILER_CSHARP_MAP_FIELD_H__
-
-#include <google/protobuf/compiler/code_generator.h>
-#include <google/protobuf/compiler/csharp/csharp_field_base.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace csharp {
-
-class MapFieldGenerator : public FieldGeneratorBase {
- public:
-  MapFieldGenerator(const FieldDescriptor* descriptor,
-                    int presenceIndex,
-                    const Options* options);
-  ~MapFieldGenerator();
-
-  MapFieldGenerator(const MapFieldGenerator&) = delete;
-  MapFieldGenerator& operator=(const MapFieldGenerator&) = delete;
-
-  virtual void GenerateCloningCode(io::Printer* printer) override;
-  virtual void GenerateFreezingCode(io::Printer* printer) override;
-  virtual void GenerateMembers(io::Printer* printer) override;
-  virtual void GenerateMergingCode(io::Printer* printer) override;
-  virtual void GenerateParsingCode(io::Printer* printer) override;
-  virtual void GenerateParsingCode(io::Printer* printer, bool use_parse_context) override;
-  virtual void GenerateSerializationCode(io::Printer* printer) override;
-  virtual void GenerateSerializationCode(io::Printer* printer, bool use_write_context) override;
-  virtual void GenerateSerializedSizeCode(io::Printer* printer) override;
-
-  virtual void WriteHash(io::Printer* printer) override;
-  virtual void WriteEquals(io::Printer* printer) override;
-  virtual void WriteToString(io::Printer* printer) override;
-};
-
-}  // namespace csharp
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // GOOGLE_PROTOBUF_COMPILER_CSHARP_MAP_FIELD_H__
-
diff --git a/libs/protobuf/src/google/protobuf/compiler/csharp/csharp_message.cc b/libs/protobuf/src/google/protobuf/compiler/csharp/csharp_message.cc
deleted file mode 100644
index a119bdd..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/csharp/csharp_message.cc
+++ /dev/null
@@ -1,779 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <sstream>
-#include <algorithm>
-#include <map>
-
-#include <google/protobuf/compiler/code_generator.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/descriptor.pb.h>
-#include <google/protobuf/io/printer.h>
-#include <google/protobuf/io/zero_copy_stream.h>
-#include <google/protobuf/stubs/strutil.h>
-#include <google/protobuf/wire_format.h>
-#include <google/protobuf/wire_format_lite.h>
-
-#include <google/protobuf/compiler/csharp/csharp_options.h>
-#include <google/protobuf/compiler/csharp/csharp_doc_comment.h>
-#include <google/protobuf/compiler/csharp/csharp_enum.h>
-#include <google/protobuf/compiler/csharp/csharp_field_base.h>
-#include <google/protobuf/compiler/csharp/csharp_helpers.h>
-#include <google/protobuf/compiler/csharp/csharp_message.h>
-#include <google/protobuf/compiler/csharp/csharp_names.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace csharp {
-
-bool CompareFieldNumbers(const FieldDescriptor* d1, const FieldDescriptor* d2) {
-  return d1->number() < d2->number();
-}
-
-MessageGenerator::MessageGenerator(const Descriptor* descriptor,
-                                   const Options* options)
-    : SourceGeneratorBase(options),
-      descriptor_(descriptor),
-      has_bit_field_count_(0),
-      end_tag_(GetGroupEndTag(descriptor)),
-      has_extension_ranges_(descriptor->extension_range_count() > 0) {
-  // fields by number
-  for (int i = 0; i < descriptor_->field_count(); i++) {
-    fields_by_number_.push_back(descriptor_->field(i));
-  }
-  std::sort(fields_by_number_.begin(), fields_by_number_.end(),
-            CompareFieldNumbers);
-
-  int presence_bit_count = 0;
-  for (int i = 0; i < descriptor_->field_count(); i++) {
-    const FieldDescriptor* field = descriptor_->field(i);
-    if (RequiresPresenceBit(field)) {
-      presence_bit_count++;
-      if (has_bit_field_count_ == 0 || (presence_bit_count % 32) == 0) {
-        has_bit_field_count_++;
-      }
-    }
-  }
-}
-
-MessageGenerator::~MessageGenerator() {
-}
-
-std::string MessageGenerator::class_name() {
-  return descriptor_->name();
-}
-
-std::string MessageGenerator::full_class_name() {
-  return GetClassName(descriptor_);
-}
-
-const std::vector<const FieldDescriptor*>& MessageGenerator::fields_by_number() {
-  return fields_by_number_;
-}
-
-void MessageGenerator::AddDeprecatedFlag(io::Printer* printer) {
-  if (descriptor_->options().deprecated()) {
-    printer->Print("[global::System.ObsoleteAttribute]\n");
-  }
-}
-
-void MessageGenerator::AddSerializableAttribute(io::Printer* printer) {
-  if (this->options()->serializable) {
-    printer->Print("[global::System.SerializableAttribute]\n");
-  }
-}
-
-void MessageGenerator::Generate(io::Printer* printer) {
-  std::map<std::string, std::string> vars;
-  vars["class_name"] = class_name();
-  vars["access_level"] = class_access_level();
-
-  WriteMessageDocComment(printer, descriptor_);
-  AddDeprecatedFlag(printer);
-  AddSerializableAttribute(printer);
-
-  printer->Print(
-    vars,
-    "$access_level$ sealed partial class $class_name$ : ");
-
-  if (has_extension_ranges_) {
-    printer->Print(vars, "pb::IExtendableMessage<$class_name$>\n");
-  }
-  else {
-    printer->Print(vars, "pb::IMessage<$class_name$>\n");
-  }
-  printer->Print("#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE\n");
-  printer->Print("    , pb::IBufferMessage\n");
-  printer->Print("#endif\n");
-  printer->Print("{\n");
-  printer->Indent();
-
-  // All static fields and properties
-  printer->Print(
-      vars,
-      "private static readonly pb::MessageParser<$class_name$> _parser = new pb::MessageParser<$class_name$>(() => new $class_name$());\n");
-
-  printer->Print(
-      "private pb::UnknownFieldSet _unknownFields;\n");
-
-  if (has_extension_ranges_) {
-    if (IsDescriptorProto(descriptor_->file())) {
-      printer->Print(vars, "internal pb::ExtensionSet<$class_name$> _extensions;\n"); // CustomOptions compatibility
-    } else {
-      printer->Print(vars, "private pb::ExtensionSet<$class_name$> _extensions;\n");
-    }
-
-    // a read-only property for fast
-    // retrieval of the set in IsInitialized
-    printer->Print(vars,
-                   "private pb::ExtensionSet<$class_name$> _Extensions { get { "
-                   "return _extensions; } }\n");
-  }
-
-  for (int i = 0; i < has_bit_field_count_; i++) {
-    // don't use arrays since all arrays are heap allocated, saving allocations
-    // use ints instead of bytes since bytes lack bitwise operators, saving casts
-    printer->Print("private int _hasBits$i$;\n", "i", StrCat(i));
-  }
-
-  WriteGeneratedCodeAttributes(printer);
-
-  printer->Print(
-      vars,
-      "public static pb::MessageParser<$class_name$> Parser { get { return _parser; } }\n\n");
-
-  // Access the message descriptor via the relevant file descriptor or containing message descriptor.
-  if (!descriptor_->containing_type()) {
-    vars["descriptor_accessor"] = GetReflectionClassName(descriptor_->file())
-        + ".Descriptor.MessageTypes[" + StrCat(descriptor_->index()) + "]";
-  } else {
-    vars["descriptor_accessor"] = GetClassName(descriptor_->containing_type())
-        + ".Descriptor.NestedTypes[" + StrCat(descriptor_->index()) + "]";
-  }
-
-  WriteGeneratedCodeAttributes(printer);
-  printer->Print(
-    vars,
-    "public static pbr::MessageDescriptor Descriptor {\n"
-    "  get { return $descriptor_accessor$; }\n"
-    "}\n"
-    "\n");
-  WriteGeneratedCodeAttributes(printer);
-  printer->Print(
-    vars,
-    "pbr::MessageDescriptor pb::IMessage.Descriptor {\n"
-    "  get { return Descriptor; }\n"
-    "}\n"
-    "\n");
-
-  // Parameterless constructor and partial OnConstruction method.
-  WriteGeneratedCodeAttributes(printer);
-  printer->Print(
-    vars,
-    "public $class_name$() {\n"
-    "  OnConstruction();\n"
-    "}\n\n"
-    "partial void OnConstruction();\n\n");
-
-  GenerateCloningCode(printer);
-  GenerateFreezingCode(printer);
-
-  // Fields/properties
-  for (int i = 0; i < descriptor_->field_count(); i++) {
-    const FieldDescriptor* fieldDescriptor = descriptor_->field(i);
-
-    // Rats: we lose the debug comment here :(
-    printer->Print(
-      "/// <summary>Field number for the \"$field_name$\" field.</summary>\n"
-      "public const int $field_constant_name$ = $index$;\n",
-      "field_name", fieldDescriptor->name(),
-      "field_constant_name", GetFieldConstantName(fieldDescriptor),
-      "index", StrCat(fieldDescriptor->number()));
-    std::unique_ptr<FieldGeneratorBase> generator(
-        CreateFieldGeneratorInternal(fieldDescriptor));
-    generator->GenerateMembers(printer);
-    printer->Print("\n");
-  }
-
-  // oneof properties (for real oneofs, which come before synthetic ones)
-  for (int i = 0; i < descriptor_->real_oneof_decl_count(); i++) {
-    const OneofDescriptor* oneof = descriptor_->oneof_decl(i);
-    vars["name"] = UnderscoresToCamelCase(oneof->name(), false);
-    vars["property_name"] = UnderscoresToCamelCase(oneof->name(), true);
-    vars["original_name"] = oneof->name();
-    printer->Print(
-      vars,
-      "private object $name$_;\n"
-      "/// <summary>Enum of possible cases for the \"$original_name$\" oneof.</summary>\n"
-      "public enum $property_name$OneofCase {\n");
-    printer->Indent();
-    printer->Print("None = 0,\n");
-    for (int j = 0; j < oneof->field_count(); j++) {
-      const FieldDescriptor* field = oneof->field(j);
-      printer->Print("$oneof_case_name$ = $index$,\n",
-                     "oneof_case_name", GetOneofCaseName(field),
-                     "index", StrCat(field->number()));
-    }
-    printer->Outdent();
-    printer->Print("}\n");
-    // TODO: Should we put the oneof .proto comments here?
-    // It's unclear exactly where they should go.
-    printer->Print(
-      vars,
-      "private $property_name$OneofCase $name$Case_ = $property_name$OneofCase.None;\n");
-    WriteGeneratedCodeAttributes(printer);
-    printer->Print(
-      vars,
-      "public $property_name$OneofCase $property_name$Case {\n"
-      "  get { return $name$Case_; }\n"
-      "}\n\n");
-    WriteGeneratedCodeAttributes(printer);
-    printer->Print(
-      vars,
-      "public void Clear$property_name$() {\n"
-      "  $name$Case_ = $property_name$OneofCase.None;\n"
-      "  $name$_ = null;\n"
-      "}\n\n");
-  }
-
-  // Standard methods
-  GenerateFrameworkMethods(printer);
-  GenerateMessageSerializationMethods(printer);
-  GenerateMergingMethods(printer);
-
-  if (has_extension_ranges_) {
-    printer->Print(
-        vars,
-        "public TValue GetExtension<TValue>(pb::Extension<$class_name$, "
-        "TValue> extension) {\n"
-        "  return pb::ExtensionSet.Get(ref _extensions, extension);\n"
-        "}\n"
-        "public pbc::RepeatedField<TValue> "
-        "GetExtension<TValue>(pb::RepeatedExtension<$class_name$, TValue> "
-        "extension) {\n"
-        "  return pb::ExtensionSet.Get(ref _extensions, extension);\n"
-        "}\n"
-        "public pbc::RepeatedField<TValue> "
-        "GetOrInitializeExtension<TValue>(pb::RepeatedExtension<$class_name$, "
-        "TValue> extension) {\n"
-        "  return pb::ExtensionSet.GetOrInitialize(ref _extensions, "
-        "extension);\n"
-        "}\n"
-        "public void SetExtension<TValue>(pb::Extension<$class_name$, TValue> "
-        "extension, TValue value) {\n"
-        "  pb::ExtensionSet.Set(ref _extensions, extension, value);\n"
-        "}\n"
-        "public bool HasExtension<TValue>(pb::Extension<$class_name$, TValue> "
-        "extension) {\n"
-        "  return pb::ExtensionSet.Has(ref _extensions, extension);\n"
-        "}\n"
-        "public void ClearExtension<TValue>(pb::Extension<$class_name$, "
-        "TValue> extension) {\n"
-        "  pb::ExtensionSet.Clear(ref _extensions, extension);\n"
-        "}\n"
-        "public void "
-        "ClearExtension<TValue>(pb::RepeatedExtension<$class_name$, TValue> "
-        "extension) {\n"
-        "  pb::ExtensionSet.Clear(ref _extensions, extension);\n"
-        "}\n\n");
-  }
-
-  // Nested messages and enums
-  if (HasNestedGeneratedTypes()) {
-    printer->Print(
-      vars,
-      "#region Nested types\n"
-      "/// <summary>Container for nested types declared in the $class_name$ message type.</summary>\n");
-    WriteGeneratedCodeAttributes(printer);
-    printer->Print("public static partial class Types {\n");
-    printer->Indent();
-    for (int i = 0; i < descriptor_->enum_type_count(); i++) {
-      EnumGenerator enumGenerator(descriptor_->enum_type(i), this->options());
-      enumGenerator.Generate(printer);
-    }
-    for (int i = 0; i < descriptor_->nested_type_count(); i++) {
-      // Don't generate nested types for maps...
-      if (!IsMapEntryMessage(descriptor_->nested_type(i))) {
-        MessageGenerator messageGenerator(
-            descriptor_->nested_type(i), this->options());
-        messageGenerator.Generate(printer);
-      }
-    }
-    printer->Outdent();
-    printer->Print("}\n"
-                   "#endregion\n"
-                   "\n");
-  }
-
-  if (descriptor_->extension_count() > 0) {
-    printer->Print(
-      vars,
-      "#region Extensions\n"
-      "/// <summary>Container for extensions for other messages declared in the $class_name$ message type.</summary>\n");
-    WriteGeneratedCodeAttributes(printer);
-    printer->Print("public static partial class Extensions {\n");
-    printer->Indent();
-    for (int i = 0; i < descriptor_->extension_count(); i++) {
-      std::unique_ptr<FieldGeneratorBase> generator(
-        CreateFieldGeneratorInternal(descriptor_->extension(i)));
-      generator->GenerateExtensionCode(printer);
-    }
-    printer->Outdent();
-    printer->Print(
-      "}\n"
-      "#endregion\n"
-      "\n");
-  }
-
-  printer->Outdent();
-  printer->Print("}\n");
-  printer->Print("\n");
-}
-
-// Helper to work out whether we need to generate a class to hold nested types/enums.
-// Only tricky because we don't want to generate map entry types.
-bool MessageGenerator::HasNestedGeneratedTypes()
-{
-  if (descriptor_->enum_type_count() > 0) {
-    return true;
-  }
-  for (int i = 0; i < descriptor_->nested_type_count(); i++) {
-    if (!IsMapEntryMessage(descriptor_->nested_type(i))) {
-      return true;
-    }
-  }
-  return false;
-}
-
-void MessageGenerator::GenerateCloningCode(io::Printer* printer) {
-  std::map<std::string, std::string> vars;
-  WriteGeneratedCodeAttributes(printer);
-  vars["class_name"] = class_name();
-    printer->Print(
-    vars,
-    "public $class_name$($class_name$ other) : this() {\n");
-  printer->Indent();
-  for (int i = 0; i < has_bit_field_count_; i++) {
-    printer->Print("_hasBits$i$ = other._hasBits$i$;\n", "i", StrCat(i));
-  }
-  // Clone non-oneof fields first (treating optional proto3 fields as non-oneof)
-  for (int i = 0; i < descriptor_->field_count(); i++) {
-    const FieldDescriptor* field = descriptor_->field(i);
-    if (field->real_containing_oneof()) {
-      continue;
-    }
-    std::unique_ptr<FieldGeneratorBase> generator(CreateFieldGeneratorInternal(field));
-    generator->GenerateCloningCode(printer);
-  }
-  // Clone just the right field for each real oneof
-  for (int i = 0; i < descriptor_->real_oneof_decl_count(); ++i) {
-    const OneofDescriptor* oneof = descriptor_->oneof_decl(i);
-    vars["name"] = UnderscoresToCamelCase(oneof->name(), false);
-    vars["property_name"] = UnderscoresToCamelCase(oneof->name(), true);
-    printer->Print(vars, "switch (other.$property_name$Case) {\n");
-    printer->Indent();
-    for (int j = 0; j < oneof->field_count(); j++) {
-      const FieldDescriptor* field = oneof->field(j);
-      std::unique_ptr<FieldGeneratorBase> generator(CreateFieldGeneratorInternal(field));
-      vars["oneof_case_name"] = GetOneofCaseName(field);
-      printer->Print(
-          vars,
-          "case $property_name$OneofCase.$oneof_case_name$:\n");
-      printer->Indent();
-      generator->GenerateCloningCode(printer);
-      printer->Print("break;\n");
-      printer->Outdent();
-    }
-    printer->Outdent();
-    printer->Print("}\n\n");
-  }
-  // Clone unknown fields
-  printer->Print(
-      "_unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);\n");
-  if (has_extension_ranges_) {
-    printer->Print(
-        "_extensions = pb::ExtensionSet.Clone(other._extensions);\n");
-  }
-
-  printer->Outdent();
-  printer->Print("}\n\n");
-
-  WriteGeneratedCodeAttributes(printer);
-  printer->Print(
-    vars,
-    "public $class_name$ Clone() {\n"
-    "  return new $class_name$(this);\n"
-    "}\n\n");
-}
-
-void MessageGenerator::GenerateFreezingCode(io::Printer* printer) {
-}
-
-void MessageGenerator::GenerateFrameworkMethods(io::Printer* printer) {
-    std::map<std::string, std::string> vars;
-    vars["class_name"] = class_name();
-
-    // Equality
-    WriteGeneratedCodeAttributes(printer);
-    printer->Print(
-        vars,
-        "public override bool Equals(object other) {\n"
-        "  return Equals(other as $class_name$);\n"
-        "}\n\n");
-    WriteGeneratedCodeAttributes(printer);
-    printer->Print(
-        vars,
-        "public bool Equals($class_name$ other) {\n"
-        "  if (ReferenceEquals(other, null)) {\n"
-        "    return false;\n"
-        "  }\n"
-        "  if (ReferenceEquals(other, this)) {\n"
-        "    return true;\n"
-        "  }\n");
-    printer->Indent();
-    for (int i = 0; i < descriptor_->field_count(); i++) {
-      std::unique_ptr<FieldGeneratorBase> generator(
-            CreateFieldGeneratorInternal(descriptor_->field(i)));
-        generator->WriteEquals(printer);
-    }
-    for (int i = 0; i < descriptor_->real_oneof_decl_count(); i++) {
-      printer->Print("if ($property_name$Case != other.$property_name$Case) return false;\n",
-          "property_name", UnderscoresToCamelCase(descriptor_->oneof_decl(i)->name(), true));
-    }
-    if (has_extension_ranges_) {
-      printer->Print(
-          "if (!Equals(_extensions, other._extensions)) {\n"
-          "  return false;\n"
-          "}\n");
-    }
-    printer->Outdent();
-    printer->Print(
-        "  return Equals(_unknownFields, other._unknownFields);\n"
-        "}\n\n");
-
-    // GetHashCode
-    // Start with a non-zero value to easily distinguish between null and "empty" messages.
-    WriteGeneratedCodeAttributes(printer);
-    printer->Print(
-        "public override int GetHashCode() {\n"
-        "  int hash = 1;\n");
-    printer->Indent();
-    for (int i = 0; i < descriptor_->field_count(); i++) {
-      std::unique_ptr<FieldGeneratorBase> generator(
-            CreateFieldGeneratorInternal(descriptor_->field(i)));
-        generator->WriteHash(printer);
-    }
-    for (int i = 0; i < descriptor_->real_oneof_decl_count(); i++) {
-      printer->Print("hash ^= (int) $name$Case_;\n",
-          "name", UnderscoresToCamelCase(descriptor_->oneof_decl(i)->name(), false));
-    }
-    if (has_extension_ranges_) {
-      printer->Print(
-        "if (_extensions != null) {\n"
-        "  hash ^= _extensions.GetHashCode();\n"
-        "}\n");
-    }
-    printer->Print(
-        "if (_unknownFields != null) {\n"
-        "  hash ^= _unknownFields.GetHashCode();\n"
-        "}\n"
-        "return hash;\n");
-    printer->Outdent();
-    printer->Print("}\n\n");
-
-    WriteGeneratedCodeAttributes(printer);
-    printer->Print(
-        "public override string ToString() {\n"
-        "  return pb::JsonFormatter.ToDiagnosticString(this);\n"
-        "}\n\n");
-}
-
-void MessageGenerator::GenerateMessageSerializationMethods(io::Printer* printer) {
-  WriteGeneratedCodeAttributes(printer);
-  printer->Print(
-      "public void WriteTo(pb::CodedOutputStream output) {\n");
-  printer->Print("#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE\n");
-  printer->Indent();
-  printer->Print("output.WriteRawMessage(this);\n");
-  printer->Outdent();
-  printer->Print("#else\n");
-  printer->Indent();
-  GenerateWriteToBody(printer, false);
-  printer->Outdent();
-  printer->Print("#endif\n");
-  printer->Print("}\n\n");
-
-  printer->Print("#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE\n");
-  WriteGeneratedCodeAttributes(printer);
-  printer->Print("void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {\n");
-  printer->Indent();
-  GenerateWriteToBody(printer, true);
-  printer->Outdent();
-  printer->Print("}\n");
-  printer->Print("#endif\n\n");
-
-  WriteGeneratedCodeAttributes(printer);
-  printer->Print(
-    "public int CalculateSize() {\n");
-  printer->Indent();
-  printer->Print("int size = 0;\n");
-  for (int i = 0; i < descriptor_->field_count(); i++) {
-    std::unique_ptr<FieldGeneratorBase> generator(
-        CreateFieldGeneratorInternal(descriptor_->field(i)));
-    generator->GenerateSerializedSizeCode(printer);
-  }
-
-  if (has_extension_ranges_) {
-    printer->Print(
-      "if (_extensions != null) {\n"
-      "  size += _extensions.CalculateSize();\n"
-      "}\n");
-  }
-
-  printer->Print(
-    "if (_unknownFields != null) {\n"
-    "  size += _unknownFields.CalculateSize();\n"
-    "}\n");
-
-  printer->Print("return size;\n");
-  printer->Outdent();
-  printer->Print("}\n\n");
-}
-
-void MessageGenerator::GenerateWriteToBody(io::Printer* printer, bool use_write_context) {
-  // Serialize all the fields
-  for (int i = 0; i < fields_by_number().size(); i++) {
-    std::unique_ptr<FieldGeneratorBase> generator(
-      CreateFieldGeneratorInternal(fields_by_number()[i]));
-    generator->GenerateSerializationCode(printer, use_write_context);
-  }
-
-  if (has_extension_ranges_) {
-    // Serialize extensions
-    printer->Print(
-      use_write_context
-      ? "if (_extensions != null) {\n"
-        "  _extensions.WriteTo(ref output);\n"
-        "}\n"
-      : "if (_extensions != null) {\n"
-        "  _extensions.WriteTo(output);\n"
-        "}\n");
-  }
-
-  // Serialize unknown fields
-  printer->Print(
-    use_write_context
-    ? "if (_unknownFields != null) {\n"
-      "  _unknownFields.WriteTo(ref output);\n"
-      "}\n"
-    : "if (_unknownFields != null) {\n"
-      "  _unknownFields.WriteTo(output);\n"
-      "}\n");
-
-  // TODO(jonskeet): Memoize size of frozen messages?
-}
-
-void MessageGenerator::GenerateMergingMethods(io::Printer* printer) {
-  // Note:  These are separate from GenerateMessageSerializationMethods()
-  //   because they need to be generated even for messages that are optimized
-  //   for code size.
-  std::map<std::string, std::string> vars;
-  vars["class_name"] = class_name();
-
-  WriteGeneratedCodeAttributes(printer);
-  printer->Print(
-    vars,
-    "public void MergeFrom($class_name$ other) {\n");
-  printer->Indent();
-  printer->Print(
-    "if (other == null) {\n"
-    "  return;\n"
-    "}\n");
-  // Merge non-oneof fields, treating optional proto3 fields as normal fields
-  for (int i = 0; i < descriptor_->field_count(); i++) {
-    const FieldDescriptor* field = descriptor_->field(i);
-    if (field->real_containing_oneof()) {
-      continue;
-    }
-    std::unique_ptr<FieldGeneratorBase> generator(CreateFieldGeneratorInternal(field));
-    generator->GenerateMergingCode(printer);
-  }
-  // Merge oneof fields (for non-synthetic oneofs)
-  for (int i = 0; i < descriptor_->real_oneof_decl_count(); ++i) {
-    const OneofDescriptor* oneof = descriptor_->oneof_decl(i);
-    vars["name"] = UnderscoresToCamelCase(oneof->name(), false);
-    vars["property_name"] = UnderscoresToCamelCase(oneof->name(), true);
-    printer->Print(vars, "switch (other.$property_name$Case) {\n");
-    printer->Indent();
-    for (int j = 0; j < oneof->field_count(); j++) {
-      const FieldDescriptor* field = oneof->field(j);
-      vars["oneof_case_name"] = GetOneofCaseName(field);
-      printer->Print(
-        vars,
-        "case $property_name$OneofCase.$oneof_case_name$:\n");
-      printer->Indent();
-      std::unique_ptr<FieldGeneratorBase> generator(CreateFieldGeneratorInternal(field));
-      generator->GenerateMergingCode(printer);
-      printer->Print("break;\n");
-      printer->Outdent();
-    }
-    printer->Outdent();
-    printer->Print("}\n\n");
-  }
-  // Merge extensions
-  if (has_extension_ranges_) {
-    printer->Print("pb::ExtensionSet.MergeFrom(ref _extensions, other._extensions);\n");
-  }
-
-  // Merge unknown fields.
-  printer->Print(
-      "_unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);\n");
-
-  printer->Outdent();
-  printer->Print("}\n\n");
-
-  WriteGeneratedCodeAttributes(printer);
-  printer->Print("public void MergeFrom(pb::CodedInputStream input) {\n");
-  printer->Print("#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE\n");
-  printer->Indent();
-  printer->Print("input.ReadRawMessage(this);\n");
-  printer->Outdent();
-  printer->Print("#else\n");
-  printer->Indent();
-  GenerateMainParseLoop(printer, false);
-  printer->Outdent();
-  printer->Print("#endif\n");
-  printer->Print("}\n\n");
-
-  printer->Print("#if !GOOGLE_PROTOBUF_REFSTRUCT_COMPATIBILITY_MODE\n");
-  WriteGeneratedCodeAttributes(printer);
-  printer->Print("void pb::IBufferMessage.InternalMergeFrom(ref pb::ParseContext input) {\n");
-  printer->Indent();
-  GenerateMainParseLoop(printer, true);
-  printer->Outdent();
-  printer->Print("}\n"); // method
-  printer->Print("#endif\n\n");
-
-}
-
-void MessageGenerator::GenerateMainParseLoop(io::Printer* printer, bool use_parse_context) {
-  std::map<std::string, std::string> vars;
-  vars["maybe_ref_input"] = use_parse_context ? "ref input" : "input";
-
-  printer->Print(
-    "uint tag;\n"
-    "while ((tag = input.ReadTag()) != 0) {\n"
-    "  switch(tag) {\n");
-  printer->Indent();
-  printer->Indent();
-  if (end_tag_ != 0) {
-    printer->Print(
-        "case $end_tag$:\n"
-        "  return;\n",
-        "end_tag", StrCat(end_tag_));
-  }
-  if (has_extension_ranges_) {
-    printer->Print(vars,
-      "default:\n"
-      "  if (!pb::ExtensionSet.TryMergeFieldFrom(ref _extensions, $maybe_ref_input$)) {\n"
-      "    _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, $maybe_ref_input$);\n"
-      "  }\n"
-      "  break;\n");
-  } else {
-    printer->Print(vars,
-      "default:\n"
-      "  _unknownFields = pb::UnknownFieldSet.MergeFieldFrom(_unknownFields, $maybe_ref_input$);\n"
-      "  break;\n");
-  }
-  for (int i = 0; i < fields_by_number().size(); i++) {
-    const FieldDescriptor* field = fields_by_number()[i];
-    internal::WireFormatLite::WireType wt =
-        internal::WireFormat::WireTypeForFieldType(field->type());
-    uint32_t tag = internal::WireFormatLite::MakeTag(field->number(), wt);
-    // Handle both packed and unpacked repeated fields with the same Read*Array call;
-    // the two generated cases are the packed and unpacked tags.
-    // TODO(jonskeet): Check that is_packable is equivalent to
-    // is_repeated && wt in { VARINT, FIXED32, FIXED64 }.
-    // It looks like it is...
-    if (field->is_packable()) {
-      printer->Print(
-        "case $packed_tag$:\n",
-        "packed_tag",
-        StrCat(
-            internal::WireFormatLite::MakeTag(
-                field->number(),
-                internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED)));
-    }
-
-    printer->Print("case $tag$: {\n", "tag", StrCat(tag));
-    printer->Indent();
-    std::unique_ptr<FieldGeneratorBase> generator(
-        CreateFieldGeneratorInternal(field));
-    generator->GenerateParsingCode(printer, use_parse_context);
-    printer->Print("break;\n");
-    printer->Outdent();
-    printer->Print("}\n");
-  }
-  printer->Outdent();
-  printer->Print("}\n"); // switch
-  printer->Outdent();
-  printer->Print("}\n"); // while
-}
-
-// it's a waste of space to track presence for all values, so we only track them if they're not nullable
-int MessageGenerator::GetPresenceIndex(const FieldDescriptor* descriptor) {
-  if (!RequiresPresenceBit(descriptor)) {
-    return -1;
-  }
-
-  int index = 0;
-  for (int i = 0; i < fields_by_number().size(); i++) {
-    const FieldDescriptor* field = fields_by_number()[i];
-    if (field == descriptor) {
-      return index;
-    }
-    if (RequiresPresenceBit(field)) {
-      index++;
-    }
-  }
-  GOOGLE_LOG(DFATAL)<< "Could not find presence index for field " << descriptor->name();
-  return -1;
-}
-
-FieldGeneratorBase* MessageGenerator::CreateFieldGeneratorInternal(
-    const FieldDescriptor* descriptor) {
-  return CreateFieldGenerator(descriptor, GetPresenceIndex(descriptor), this->options());
-}
-
-}  // namespace csharp
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/compiler/csharp/csharp_message.h b/libs/protobuf/src/google/protobuf/compiler/csharp/csharp_message.h
deleted file mode 100644
index d02767e..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/csharp/csharp_message.h
+++ /dev/null
@@ -1,94 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef GOOGLE_PROTOBUF_COMPILER_CSHARP_MESSAGE_H__
-#define GOOGLE_PROTOBUF_COMPILER_CSHARP_MESSAGE_H__
-
-#include <string>
-#include <vector>
-
-#include <google/protobuf/compiler/code_generator.h>
-#include <google/protobuf/compiler/csharp/csharp_source_generator_base.h>
-#include <google/protobuf/compiler/csharp/csharp_helpers.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace csharp {
-
-class FieldGeneratorBase;
-
-class MessageGenerator : public SourceGeneratorBase {
- public:
-  MessageGenerator(const Descriptor* descriptor, const Options* options);
-  ~MessageGenerator();
-
-  MessageGenerator(const MessageGenerator&) = delete;
-  MessageGenerator& operator=(const MessageGenerator&) = delete;
-
-  void GenerateCloningCode(io::Printer* printer);
-  void GenerateFreezingCode(io::Printer* printer);
-  void GenerateFrameworkMethods(io::Printer* printer);
-  void Generate(io::Printer* printer);
-
- private:
-  const Descriptor* descriptor_;
-  std::vector<const FieldDescriptor*> fields_by_number_;
-  int has_bit_field_count_;
-  uint end_tag_;
-  bool has_extension_ranges_;
-
-  void GenerateMessageSerializationMethods(io::Printer* printer);
-  void GenerateWriteToBody(io::Printer* printer, bool use_write_context);
-  void GenerateMergingMethods(io::Printer* printer);
-  void GenerateMainParseLoop(io::Printer* printer, bool use_parse_context);
-
-  int GetPresenceIndex(const FieldDescriptor* descriptor);
-  FieldGeneratorBase* CreateFieldGeneratorInternal(
-      const FieldDescriptor* descriptor);
-
-  bool HasNestedGeneratedTypes();
-
-  void AddDeprecatedFlag(io::Printer* printer);
-  void AddSerializableAttribute(io::Printer* printer);
-
-  std::string class_name();
-  std::string full_class_name();
-
-  // field descriptors sorted by number
-  const std::vector<const FieldDescriptor*>& fields_by_number();
-};
-
-}  // namespace csharp
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // GOOGLE_PROTOBUF_COMPILER_CSHARP_MESSAGE_H__
diff --git a/libs/protobuf/src/google/protobuf/compiler/csharp/csharp_message_field.cc b/libs/protobuf/src/google/protobuf/compiler/csharp/csharp_message_field.cc
deleted file mode 100644
index 487d01d..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/csharp/csharp_message_field.cc
+++ /dev/null
@@ -1,293 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <sstream>
-
-#include <google/protobuf/compiler/code_generator.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/descriptor.pb.h>
-#include <google/protobuf/io/printer.h>
-#include <google/protobuf/io/zero_copy_stream.h>
-#include <google/protobuf/stubs/strutil.h>
-#include <google/protobuf/wire_format.h>
-#include <google/protobuf/wire_format_lite.h>
-
-#include <google/protobuf/compiler/csharp/csharp_doc_comment.h>
-#include <google/protobuf/compiler/csharp/csharp_helpers.h>
-#include <google/protobuf/compiler/csharp/csharp_message_field.h>
-#include <google/protobuf/compiler/csharp/csharp_options.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace csharp {
-
-MessageFieldGenerator::MessageFieldGenerator(const FieldDescriptor* descriptor,
-                                             int presenceIndex,
-                                             const Options *options)
-    : FieldGeneratorBase(descriptor, presenceIndex, options) {
-  if (!SupportsPresenceApi(descriptor_)) {
-    variables_["has_property_check"] = name() + "_ != null";
-    variables_["has_not_property_check"] = name() + "_ == null";
-  }
-}
-
-MessageFieldGenerator::~MessageFieldGenerator() {
-
-}
-
-void MessageFieldGenerator::GenerateMembers(io::Printer* printer) {
-  printer->Print(
-    variables_,
-    "private $type_name$ $name$_;\n");
-  WritePropertyDocComment(printer, descriptor_);
-  AddPublicMemberAttributes(printer);
-  printer->Print(
-    variables_,
-    "$access_level$ $type_name$ $property_name$ {\n"
-    "  get { return $name$_; }\n"
-    "  set {\n"
-    "    $name$_ = value;\n"
-    "  }\n"
-    "}\n");
-  if (SupportsPresenceApi(descriptor_)) {
-    printer->Print(
-      variables_,
-      "/// <summary>Gets whether the $descriptor_name$ field is set</summary>\n");
-    AddPublicMemberAttributes(printer);
-    printer->Print(
-      variables_,
-      "$access_level$ bool Has$property_name$ {\n"
-      "  get { return $name$_ != null; }\n"
-      "}\n");
-    printer->Print(
-      variables_,
-      "/// <summary>Clears the value of the $descriptor_name$ field</summary>\n");
-    AddPublicMemberAttributes(printer);
-    printer->Print(
-      variables_,
-      "$access_level$ void Clear$property_name$() {\n"
-      "  $name$_ = null;\n"
-      "}\n");
-  }
-}
-
-void MessageFieldGenerator::GenerateMergingCode(io::Printer* printer) {
-  printer->Print(
-    variables_,
-    "if (other.$has_property_check$) {\n"
-    "  if ($has_not_property_check$) {\n"
-    "    $property_name$ = new $type_name$();\n"
-    "  }\n"
-    "  $property_name$.MergeFrom(other.$property_name$);\n"
-    "}\n");
-}
-
-void MessageFieldGenerator::GenerateParsingCode(io::Printer* printer) {
-  printer->Print(
-    variables_,
-    "if ($has_not_property_check$) {\n"
-    "  $property_name$ = new $type_name$();\n"
-    "}\n");
-  if (descriptor_->type() == FieldDescriptor::Type::TYPE_MESSAGE) {
-    printer->Print(variables_, "input.ReadMessage($property_name$);\n");
-  } else {
-    printer->Print(variables_, "input.ReadGroup($property_name$);\n");
-  }
-}
-
-void MessageFieldGenerator::GenerateSerializationCode(io::Printer* printer) {
-  if (descriptor_->type() == FieldDescriptor::Type::TYPE_MESSAGE) {
-    printer->Print(
-      variables_,
-      "if ($has_property_check$) {\n"
-      "  output.WriteRawTag($tag_bytes$);\n"
-      "  output.WriteMessage($property_name$);\n"
-      "}\n");
-  } else {
-    printer->Print(
-      variables_,
-      "if ($has_property_check$) {\n"
-      "  output.WriteRawTag($tag_bytes$);\n"
-      "  output.WriteGroup($property_name$);\n"
-      "  output.WriteRawTag($end_tag_bytes$);\n"
-      "}\n");
-  }
-}
-
-void MessageFieldGenerator::GenerateSerializedSizeCode(io::Printer* printer) {
-  if (descriptor_->type() == FieldDescriptor::Type::TYPE_MESSAGE) {
-    printer->Print(
-      variables_,
-      "if ($has_property_check$) {\n"
-      "  size += $tag_size$ + pb::CodedOutputStream.ComputeMessageSize($property_name$);\n"
-      "}\n");
-  } else {
-    printer->Print(
-      variables_,
-      "if ($has_property_check$) {\n"
-      "  size += $tag_size$ + pb::CodedOutputStream.ComputeGroupSize($property_name$);\n"
-      "}\n");
-  }
-}
-
-void MessageFieldGenerator::WriteHash(io::Printer* printer) {
-  printer->Print(
-    variables_,
-    "if ($has_property_check$) hash ^= $property_name$.GetHashCode();\n");
-}
-void MessageFieldGenerator::WriteEquals(io::Printer* printer) {
-  printer->Print(
-    variables_,
-    "if (!object.Equals($property_name$, other.$property_name$)) return false;\n");
-}
-void MessageFieldGenerator::WriteToString(io::Printer* printer) {
-  variables_["field_name"] = GetFieldName(descriptor_);
-  printer->Print(
-    variables_,
-    "PrintField(\"$field_name$\", has$property_name$, $name$_, writer);\n");
-}
-void MessageFieldGenerator::GenerateExtensionCode(io::Printer* printer) {
-  WritePropertyDocComment(printer, descriptor_);
-  AddDeprecatedFlag(printer);
-  printer->Print(
-    variables_,
-    "$access_level$ static readonly pb::Extension<$extended_type$, $type_name$> $property_name$ =\n"
-    "  new pb::Extension<$extended_type$, $type_name$>($number$, ");
-  GenerateCodecCode(printer);
-  printer->Print(");\n");
-}
-void MessageFieldGenerator::GenerateCloningCode(io::Printer* printer) {
-  printer->Print(variables_,
-    "$name$_ = other.$has_property_check$ ? other.$name$_.Clone() : null;\n");
-}
-
-void MessageFieldGenerator::GenerateFreezingCode(io::Printer* printer) {
-}
-
-void MessageFieldGenerator::GenerateCodecCode(io::Printer* printer) {
-  if (descriptor_->type() == FieldDescriptor::Type::TYPE_MESSAGE) {
-    printer->Print(
-      variables_,
-      "pb::FieldCodec.ForMessage($tag$, $type_name$.Parser)");
-  } else {
-    printer->Print(
-      variables_,
-      "pb::FieldCodec.ForGroup($tag$, $end_tag$, $type_name$.Parser)");
-  }
-}
-
-MessageOneofFieldGenerator::MessageOneofFieldGenerator(
-    const FieldDescriptor* descriptor,
-	  int presenceIndex,
-    const Options *options)
-    : MessageFieldGenerator(descriptor, presenceIndex, options) {
-  SetCommonOneofFieldVariables(&variables_);
-}
-
-MessageOneofFieldGenerator::~MessageOneofFieldGenerator() {
-
-}
-
-void MessageOneofFieldGenerator::GenerateMembers(io::Printer* printer) {
-  WritePropertyDocComment(printer, descriptor_);
-  AddPublicMemberAttributes(printer);
-  printer->Print(
-    variables_,
-    "$access_level$ $type_name$ $property_name$ {\n"
-    "  get { return $has_property_check$ ? ($type_name$) $oneof_name$_ : null; }\n"
-    "  set {\n"
-    "    $oneof_name$_ = value;\n"
-    "    $oneof_name$Case_ = value == null ? $oneof_property_name$OneofCase.None : $oneof_property_name$OneofCase.$oneof_case_name$;\n"
-    "  }\n"
-    "}\n");
-  if (SupportsPresenceApi(descriptor_)) {
-    printer->Print(
-      variables_,
-      "/// <summary>Gets whether the \"$descriptor_name$\" field is set</summary>\n");
-    AddPublicMemberAttributes(printer);
-    printer->Print(
-      variables_,
-      "$access_level$ bool Has$property_name$ {\n"
-      "  get { return $oneof_name$Case_ == $oneof_property_name$OneofCase.$oneof_case_name$; }\n"
-      "}\n");
-    printer->Print(
-      variables_,
-      "/// <summary> Clears the value of the oneof if it's currently set to \"$descriptor_name$\" </summary>\n");
-    AddPublicMemberAttributes(printer);
-    printer->Print(
-      variables_,
-      "$access_level$ void Clear$property_name$() {\n"
-      "  if ($has_property_check$) {\n"
-      "    Clear$oneof_property_name$();\n"
-      "  }\n"
-      "}\n");
-  }
-}
-
-void MessageOneofFieldGenerator::GenerateMergingCode(io::Printer* printer) {
-  printer->Print(variables_,
-    "if ($property_name$ == null) {\n"
-    "  $property_name$ = new $type_name$();\n"
-    "}\n"
-    "$property_name$.MergeFrom(other.$property_name$);\n");
-}
-
-void MessageOneofFieldGenerator::GenerateParsingCode(io::Printer* printer) {
-  // TODO(jonskeet): We may be able to do better than this
-  printer->Print(
-    variables_,
-    "$type_name$ subBuilder = new $type_name$();\n"
-    "if ($has_property_check$) {\n"
-    "  subBuilder.MergeFrom($property_name$);\n"
-    "}\n");
-  if (descriptor_->type() == FieldDescriptor::Type::TYPE_MESSAGE) {
-    printer->Print("input.ReadMessage(subBuilder);\n");
-  } else {
-    printer->Print("input.ReadGroup(subBuilder);\n");
-  }
-  printer->Print(variables_, "$property_name$ = subBuilder;\n");
-}
-
-void MessageOneofFieldGenerator::WriteToString(io::Printer* printer) {
-  printer->Print(
-    variables_,
-    "PrintField(\"$descriptor_name$\", $has_property_check$, $oneof_name$_, writer);\n");
-}
-
-void MessageOneofFieldGenerator::GenerateCloningCode(io::Printer* printer) {
-  printer->Print(variables_,
-    "$property_name$ = other.$property_name$.Clone();\n");
-}
-
-}  // namespace csharp
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/compiler/csharp/csharp_message_field.h b/libs/protobuf/src/google/protobuf/compiler/csharp/csharp_message_field.h
deleted file mode 100644
index e76dfd2..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/csharp/csharp_message_field.h
+++ /dev/null
@@ -1,91 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef GOOGLE_PROTOBUF_COMPILER_CSHARP_MESSAGE_FIELD_H__
-#define GOOGLE_PROTOBUF_COMPILER_CSHARP_MESSAGE_FIELD_H__
-
-#include <google/protobuf/compiler/code_generator.h>
-#include <google/protobuf/compiler/csharp/csharp_field_base.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace csharp {
-
-class MessageFieldGenerator : public FieldGeneratorBase {
- public:
-  MessageFieldGenerator(const FieldDescriptor* descriptor,
-                        int presenceIndex,
-                        const Options *options);
-  ~MessageFieldGenerator();
-
-  MessageFieldGenerator(const MessageFieldGenerator&) = delete;
-  MessageFieldGenerator& operator=(const MessageFieldGenerator&) = delete;
-
-  virtual void GenerateCodecCode(io::Printer* printer) override;
-  virtual void GenerateCloningCode(io::Printer* printer) override;
-  virtual void GenerateFreezingCode(io::Printer* printer) override;
-  virtual void GenerateMembers(io::Printer* printer) override;
-  virtual void GenerateMergingCode(io::Printer* printer) override;
-  virtual void GenerateParsingCode(io::Printer* printer) override;
-  virtual void GenerateSerializationCode(io::Printer* printer) override;
-  virtual void GenerateSerializedSizeCode(io::Printer* printer) override;
-  virtual void GenerateExtensionCode(io::Printer* printer) override;
-
-  virtual void WriteHash(io::Printer* printer) override;
-  virtual void WriteEquals(io::Printer* printer) override;
-  virtual void WriteToString(io::Printer* printer) override;
-};
-
-class MessageOneofFieldGenerator : public MessageFieldGenerator {
- public:
-  MessageOneofFieldGenerator(const FieldDescriptor* descriptor,
-                             int presenceIndex,
-                             const Options *options);
-  ~MessageOneofFieldGenerator();
-
-  MessageOneofFieldGenerator(const MessageOneofFieldGenerator&) = delete;
-  MessageOneofFieldGenerator& operator=(const MessageOneofFieldGenerator&) =
-      delete;
-
-  virtual void GenerateCloningCode(io::Printer* printer) override;
-  virtual void GenerateMembers(io::Printer* printer) override;
-  virtual void GenerateMergingCode(io::Printer* printer) override;
-  virtual void WriteToString(io::Printer* printer) override;
-  virtual void GenerateParsingCode(io::Printer* printer) override;
-};
-
-}  // namespace csharp
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // GOOGLE_PROTOBUF_COMPILER_CSHARP_MESSAGE_FIELD_H__
-
diff --git a/libs/protobuf/src/google/protobuf/compiler/csharp/csharp_names.h b/libs/protobuf/src/google/protobuf/compiler/csharp/csharp_names.h
deleted file mode 100644
index 67e53b6..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/csharp/csharp_names.h
+++ /dev/null
@@ -1,109 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-//
-// Provides a mechanism for mapping a descriptor to the
-// fully-qualified name of the corresponding C# class.
-
-#ifndef GOOGLE_PROTOBUF_COMPILER_CSHARP_NAMES_H__
-#define GOOGLE_PROTOBUF_COMPILER_CSHARP_NAMES_H__
-
-#include <string>
-#include <google/protobuf/port.h>
-#include <google/protobuf/stubs/common.h>
-
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-
-class Descriptor;
-class EnumDescriptor;
-class FileDescriptor;
-class ServiceDescriptor;
-
-namespace compiler {
-namespace csharp {
-
-// Requires:
-//   descriptor != NULL
-//
-// Returns:
-//   The namespace to use for given file descriptor.
-std::string PROTOC_EXPORT GetFileNamespace(const FileDescriptor* descriptor);
-
-// Requires:
-//   descriptor != NULL
-//
-// Returns:
-//   The fully-qualified C# class name.
-std::string PROTOC_EXPORT GetClassName(const Descriptor* descriptor);
-
-// Requires:
-//   descriptor != NULL
-//
-// Returns:
-//   The fully-qualified name of the C# class that provides
-//   access to the file descriptor. Proto compiler generates
-//   such class for each .proto file processed.
-std::string PROTOC_EXPORT
-GetReflectionClassName(const FileDescriptor* descriptor);
-
-// Generates output file name for given file descriptor. If generate_directories
-// is true, the output file will be put under directory corresponding to file's
-// namespace. base_namespace can be used to strip some of the top level
-// directories. E.g. for file with namespace "Bar.Foo" and base_namespace="Bar",
-// the resulting file will be put under directory "Foo" (and not "Bar/Foo").
-//
-// Requires:
-//   descriptor != NULL
-//   error != NULL
-//
-//  Returns:
-//    The file name to use as output file for given file descriptor. In case
-//    of failure, this function will return empty string and error parameter
-//    will contain the error message.
-std::string PROTOC_EXPORT GetOutputFile(const FileDescriptor* descriptor,
-                                        const std::string file_extension,
-                                        const bool generate_directories,
-                                        const std::string base_namespace,
-                                        std::string* error);
-
-}  // namespace csharp
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
-
-#endif  // GOOGLE_PROTOBUF_COMPILER_CSHARP_NAMES_H__
diff --git a/libs/protobuf/src/google/protobuf/compiler/csharp/csharp_options.h b/libs/protobuf/src/google/protobuf/compiler/csharp/csharp_options.h
deleted file mode 100644
index 42ff6d8..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/csharp/csharp_options.h
+++ /dev/null
@@ -1,81 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef GOOGLE_PROTOBUF_COMPILER_CSHARP_OPTIONS_H__
-#define GOOGLE_PROTOBUF_COMPILER_CSHARP_OPTIONS_H__
-
-#include <string>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace csharp {
-
-// Generator options (used by csharp_generator.cc):
-struct Options {
-  Options() :
-      file_extension(".cs"),
-      base_namespace(""),
-      base_namespace_specified(false),
-      internal_access(false),
-      serializable(false) {
-  }
-  // Extension of the generated file. Defaults to ".cs"
-  std::string file_extension;
-  // Base namespace to use to create directory hierarchy. Defaults to "".
-  // This option allows the simple creation of a conventional C# file layout,
-  // where directories are created relative to a project-specific base
-  // namespace. For example, in a project with a base namespace of PetShop, a
-  // proto of user.proto with a C# namespace of PetShop.Model.Shared would
-  // generate Model/Shared/User.cs underneath the specified --csharp_out
-  // directory.
-  //
-  // If no base namespace is specified, all files are generated in the
-  // --csharp_out directory, with no subdirectories created automatically.
-  std::string base_namespace;
-  // Whether the base namespace has been explicitly specified by the user.
-  // This is required as the base namespace can be explicitly set to the empty
-  // string, meaning "create a full directory hierarchy, starting from the first
-  // segment of the namespace."
-  bool base_namespace_specified;
-  // Whether the generated classes should have accessibility level of "internal".
-  // Defaults to false that generates "public" classes.
-  bool internal_access;
-  // Whether the generated classes should have a global::System.Serializable attribute added
-  // Defaults to false
-  bool serializable;
-};
-
-}  // namespace csharp
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // GOOGLE_PROTOBUF_COMPILER_CSHARP_OPTIONS_H__
diff --git a/libs/protobuf/src/google/protobuf/compiler/csharp/csharp_primitive_field.cc b/libs/protobuf/src/google/protobuf/compiler/csharp/csharp_primitive_field.cc
deleted file mode 100644
index e7d5116..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/csharp/csharp_primitive_field.cc
+++ /dev/null
@@ -1,349 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <sstream>
-
-#include <google/protobuf/compiler/code_generator.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/descriptor.pb.h>
-#include <google/protobuf/io/printer.h>
-#include <google/protobuf/io/zero_copy_stream.h>
-#include <google/protobuf/stubs/strutil.h>
-
-#include <google/protobuf/compiler/csharp/csharp_doc_comment.h>
-#include <google/protobuf/compiler/csharp/csharp_helpers.h>
-#include <google/protobuf/compiler/csharp/csharp_options.h>
-#include <google/protobuf/compiler/csharp/csharp_primitive_field.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace csharp {
-
-PrimitiveFieldGenerator::PrimitiveFieldGenerator(
-    const FieldDescriptor* descriptor, int presenceIndex, const Options *options)
-    : FieldGeneratorBase(descriptor, presenceIndex, options) {
-  // TODO(jonskeet): Make this cleaner...
-  is_value_type = descriptor->type() != FieldDescriptor::TYPE_STRING
-      && descriptor->type() != FieldDescriptor::TYPE_BYTES;
-  if (!is_value_type && !SupportsPresenceApi(descriptor_)) {
-    variables_["has_property_check"] = variables_["property_name"] + ".Length != 0";
-    variables_["other_has_property_check"] = "other." + variables_["property_name"] + ".Length != 0";
-  }
-}
-
-PrimitiveFieldGenerator::~PrimitiveFieldGenerator() {
-}
-
-void PrimitiveFieldGenerator::GenerateMembers(io::Printer* printer) {
-  
-  // Note: in multiple places, this code assumes that all fields
-  // that support presence are either nullable, or use a presence field bit.
-  // Fields which are oneof members are not generated here; they're generated in PrimitiveOneofFieldGenerator below.
-  // Extensions are not generated here either.
-
-
-  // Proto2 allows different default values to be specified. These are retained
-  // via static fields. They don't particularly need to be, but we don't need
-  // to change that. In Proto3 the default value we don't generate these
-  // fields, just using the literal instead.
-  if (IsProto2(descriptor_->file())) {
-    // Note: "private readonly static" isn't as idiomatic as
-    // "private static readonly", but changing this now would create a lot of
-    // churn in generated code with near-to-zero benefit.
-    printer->Print(
-      variables_,
-      "private readonly static $type_name$ $property_name$DefaultValue = $default_value$;\n\n");
-    variables_["default_value_access"] =
-      variables_["property_name"] + "DefaultValue";
-  } else {
-    variables_["default_value_access"] = variables_["default_value"];
-  }
-
-  // Declare the field itself.
-  printer->Print(
-    variables_,
-    "private $type_name$ $name_def_message$;\n");
-
-  WritePropertyDocComment(printer, descriptor_);
-  AddPublicMemberAttributes(printer);
-
-  // Most of the work is done in the property:
-  // Declare the property itself (the same for all options)
-  printer->Print(variables_, "$access_level$ $type_name$ $property_name$ {\n");
-
-  // Specify the "getter", which may need to check for a presence field.
-  if (SupportsPresenceApi(descriptor_)) {
-    if (IsNullable(descriptor_)) {
-      printer->Print(
-        variables_,
-        "  get { return $name$_ ?? $default_value_access$; }\n");
-    } else {
-      printer->Print(
-        variables_,
-        // Note: it's possible that this could be rewritten as a
-        // conditional ?: expression, but there's no significant benefit
-        // to changing it.
-        "  get { if ($has_field_check$) { return $name$_; } else { return $default_value_access$; } }\n");
-    }
-  } else {
-    printer->Print(
-      variables_,
-      "  get { return $name$_; }\n");
-  }
-
-  // Specify the "setter", which may need to set a field bit as well as the
-  // value.
-  printer->Print("  set {\n");
-  if (presenceIndex_ != -1) {
-    printer->Print(
-      variables_,
-      "    $set_has_field$;\n");
-  }
-  if (is_value_type) {
-    printer->Print(
-      variables_,
-      "    $name$_ = value;\n");
-  } else {
-    printer->Print(
-      variables_,
-      "    $name$_ = pb::ProtoPreconditions.CheckNotNull(value, \"value\");\n");
-  }
-  printer->Print(
-    "  }\n"
-    "}\n");
-
-  // The "HasFoo" property, where required.
-  if (SupportsPresenceApi(descriptor_)) {
-    printer->Print(variables_,
-      "/// <summary>Gets whether the \"$descriptor_name$\" field is set</summary>\n");
-    AddPublicMemberAttributes(printer);
-    printer->Print(
-      variables_,
-      "$access_level$ bool Has$property_name$ {\n"
-      "  get { return ");
-    if (IsNullable(descriptor_)) {
-      printer->Print(
-        variables_,
-        "$name$_ != null; }\n}\n");
-    } else {
-      printer->Print(
-        variables_,
-        "$has_field_check$; }\n}\n");
-    }
-  }
-
-  // The "ClearFoo" method, where required.
-  if (SupportsPresenceApi(descriptor_)) {
-    printer->Print(variables_,
-      "/// <summary>Clears the value of the \"$descriptor_name$\" field</summary>\n");
-    AddPublicMemberAttributes(printer);
-    printer->Print(
-      variables_,
-      "$access_level$ void Clear$property_name$() {\n");
-    if (IsNullable(descriptor_)) {
-      printer->Print(variables_, "  $name$_ = null;\n");
-    } else {
-      printer->Print(variables_, "  $clear_has_field$;\n");
-    }
-    printer->Print("}\n");
-  }
-}
-
-void PrimitiveFieldGenerator::GenerateMergingCode(io::Printer* printer) {
-  printer->Print(
-    variables_,
-    "if ($other_has_property_check$) {\n"
-    "  $property_name$ = other.$property_name$;\n"
-    "}\n");
-}
-
-void PrimitiveFieldGenerator::GenerateParsingCode(io::Printer* printer) {
-  // Note: invoke the property setter rather than writing straight to the field,
-  // so that we can normalize "null to empty" for strings and bytes.
-  printer->Print(
-    variables_,
-    "$property_name$ = input.Read$capitalized_type_name$();\n");
-}
-
-void PrimitiveFieldGenerator::GenerateSerializationCode(io::Printer* printer) {
-  printer->Print(
-    variables_,
-    "if ($has_property_check$) {\n"
-    "  output.WriteRawTag($tag_bytes$);\n"
-    "  output.Write$capitalized_type_name$($property_name$);\n"
-    "}\n");
-}
-
-void PrimitiveFieldGenerator::GenerateSerializedSizeCode(io::Printer* printer) {
-  printer->Print(
-    variables_,
-    "if ($has_property_check$) {\n");
-  printer->Indent();
-  int fixedSize = GetFixedSize(descriptor_->type());
-  if (fixedSize == -1) {
-    printer->Print(
-      variables_,
-      "size += $tag_size$ + pb::CodedOutputStream.Compute$capitalized_type_name$Size($property_name$);\n");
-  } else {
-    printer->Print(
-      "size += $tag_size$ + $fixed_size$;\n",
-      "fixed_size", StrCat(fixedSize),
-      "tag_size", variables_["tag_size"]);
-  }
-  printer->Outdent();
-  printer->Print("}\n");
-}
-
-void PrimitiveFieldGenerator::WriteHash(io::Printer* printer) {
-  const char *text = "if ($has_property_check$) hash ^= $property_name$.GetHashCode();\n";
-  if (descriptor_->type() == FieldDescriptor::TYPE_FLOAT) {
-    text = "if ($has_property_check$) hash ^= pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.GetHashCode($property_name$);\n";
-  } else if (descriptor_->type() == FieldDescriptor::TYPE_DOUBLE) {
-    text = "if ($has_property_check$) hash ^= pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.GetHashCode($property_name$);\n";
-  }
-	printer->Print(variables_, text);
-}
-void PrimitiveFieldGenerator::WriteEquals(io::Printer* printer) {
-  const char *text = "if ($property_name$ != other.$property_name$) return false;\n";
-  if (descriptor_->type() == FieldDescriptor::TYPE_FLOAT) {
-    text = "if (!pbc::ProtobufEqualityComparers.BitwiseSingleEqualityComparer.Equals($property_name$, other.$property_name$)) return false;\n";
-  } else if (descriptor_->type() == FieldDescriptor::TYPE_DOUBLE) {
-    text = "if (!pbc::ProtobufEqualityComparers.BitwiseDoubleEqualityComparer.Equals($property_name$, other.$property_name$)) return false;\n";
-  }
-  printer->Print(variables_, text);
-}
-void PrimitiveFieldGenerator::WriteToString(io::Printer* printer) {
-  printer->Print(
-    variables_,
-    "PrintField(\"$descriptor_name$\", $has_property_check$, $property_name$, writer);\n");
-}
-
-void PrimitiveFieldGenerator::GenerateCloningCode(io::Printer* printer) {
-  printer->Print(variables_,
-    "$name$_ = other.$name$_;\n");
-}
-
-void PrimitiveFieldGenerator::GenerateCodecCode(io::Printer* printer) {
-  printer->Print(
-    variables_,
-    "pb::FieldCodec.For$capitalized_type_name$($tag$, $default_value$)");
-}
-
-void PrimitiveFieldGenerator::GenerateExtensionCode(io::Printer* printer) {
-  WritePropertyDocComment(printer, descriptor_);
-  AddDeprecatedFlag(printer);
-  printer->Print(
-    variables_,
-    "$access_level$ static readonly pb::Extension<$extended_type$, $type_name$> $property_name$ =\n"
-    "  new pb::Extension<$extended_type$, $type_name$>($number$, ");
-  GenerateCodecCode(printer);
-  printer->Print(");\n");
-}
-
-PrimitiveOneofFieldGenerator::PrimitiveOneofFieldGenerator(
-    const FieldDescriptor* descriptor, int presenceIndex, const Options *options)
-    : PrimitiveFieldGenerator(descriptor, presenceIndex, options) {
-  SetCommonOneofFieldVariables(&variables_);
-}
-
-PrimitiveOneofFieldGenerator::~PrimitiveOneofFieldGenerator() {
-}
-
-void PrimitiveOneofFieldGenerator::GenerateMembers(io::Printer* printer) {
-  WritePropertyDocComment(printer, descriptor_);
-  AddPublicMemberAttributes(printer);
-  printer->Print(
-    variables_,
-    "$access_level$ $type_name$ $property_name$ {\n"
-    "  get { return $has_property_check$ ? ($type_name$) $oneof_name$_ : $default_value$; }\n"
-    "  set {\n");
-  if (is_value_type) {
-    printer->Print(
-      variables_,
-      "    $oneof_name$_ = value;\n");
-  } else {
-    printer->Print(
-      variables_,
-      "    $oneof_name$_ = pb::ProtoPreconditions.CheckNotNull(value, \"value\");\n");
-  }
-  printer->Print(
-    variables_,
-    "    $oneof_name$Case_ = $oneof_property_name$OneofCase.$oneof_case_name$;\n"
-    "  }\n"
-    "}\n");
-  if (SupportsPresenceApi(descriptor_)) {
-    printer->Print(
-      variables_,
-      "/// <summary>Gets whether the \"$descriptor_name$\" field is set</summary>\n");
-    AddPublicMemberAttributes(printer);
-    printer->Print(
-      variables_,
-      "$access_level$ bool Has$property_name$ {\n"
-      "  get { return $oneof_name$Case_ == $oneof_property_name$OneofCase.$oneof_case_name$; }\n"
-      "}\n");
-    printer->Print(
-      variables_,
-      "/// <summary> Clears the value of the oneof if it's currently set to \"$descriptor_name$\" </summary>\n");
-    AddPublicMemberAttributes(printer);
-    printer->Print(
-      variables_,
-      "$access_level$ void Clear$property_name$() {\n"
-      "  if ($has_property_check$) {\n"
-      "    Clear$oneof_property_name$();\n"
-      "  }\n"
-      "}\n");
-  }
-}
-
-void PrimitiveOneofFieldGenerator::GenerateMergingCode(io::Printer* printer) {
-  printer->Print(variables_, "$property_name$ = other.$property_name$;\n");
-}
-
-void PrimitiveOneofFieldGenerator::WriteToString(io::Printer* printer) {
-  printer->Print(variables_,
-    "PrintField(\"$descriptor_name$\", $has_property_check$, $oneof_name$_, writer);\n");
-}
-
-void PrimitiveOneofFieldGenerator::GenerateParsingCode(io::Printer* printer) {
-    printer->Print(
-      variables_,
-      "$property_name$ = input.Read$capitalized_type_name$();\n");
-}
-
-void PrimitiveOneofFieldGenerator::GenerateCloningCode(io::Printer* printer) {
-  printer->Print(variables_,
-    "$property_name$ = other.$property_name$;\n");
-}
-
-}  // namespace csharp
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/compiler/csharp/csharp_primitive_field.h b/libs/protobuf/src/google/protobuf/compiler/csharp/csharp_primitive_field.h
deleted file mode 100644
index 6d495d5..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/csharp/csharp_primitive_field.h
+++ /dev/null
@@ -1,95 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef GOOGLE_PROTOBUF_COMPILER_CSHARP_PRIMITIVE_FIELD_H__
-#define GOOGLE_PROTOBUF_COMPILER_CSHARP_PRIMITIVE_FIELD_H__
-
-#include <google/protobuf/compiler/code_generator.h>
-#include <google/protobuf/compiler/csharp/csharp_field_base.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace csharp {
-
-struct Options;
-
-class PrimitiveFieldGenerator : public FieldGeneratorBase {
- public:
-  PrimitiveFieldGenerator(const FieldDescriptor* descriptor,
-                          int presenceIndex,
-                          const Options *options);
-  ~PrimitiveFieldGenerator();
-
-  PrimitiveFieldGenerator(const PrimitiveFieldGenerator&) = delete;
-  PrimitiveFieldGenerator& operator=(const PrimitiveFieldGenerator&) = delete;
-
-  virtual void GenerateCodecCode(io::Printer* printer) override;
-  virtual void GenerateCloningCode(io::Printer* printer) override;
-  virtual void GenerateMembers(io::Printer* printer) override;
-  virtual void GenerateMergingCode(io::Printer* printer) override;
-  virtual void GenerateParsingCode(io::Printer* printer) override;
-  virtual void GenerateSerializationCode(io::Printer* printer) override;
-  virtual void GenerateSerializedSizeCode(io::Printer* printer) override;
-  virtual void GenerateExtensionCode(io::Printer* printer) override;
-
-  virtual void WriteHash(io::Printer* printer) override;
-  virtual void WriteEquals(io::Printer* printer) override;
-  virtual void WriteToString(io::Printer* printer) override;
-
- protected:
-  bool is_value_type;
-};
-
-class PrimitiveOneofFieldGenerator : public PrimitiveFieldGenerator {
- public:
-  PrimitiveOneofFieldGenerator(const FieldDescriptor* descriptor,
-                               int presenceIndex,
-                               const Options *options);
-  ~PrimitiveOneofFieldGenerator();
-
-  PrimitiveOneofFieldGenerator(const PrimitiveOneofFieldGenerator&) = delete;
-  PrimitiveOneofFieldGenerator& operator=(const PrimitiveOneofFieldGenerator&) =
-      delete;
-
-  virtual void GenerateCloningCode(io::Printer* printer) override;
-  virtual void GenerateMembers(io::Printer* printer) override;
-  virtual void GenerateMergingCode(io::Printer* printer) override;
-  virtual void WriteToString(io::Printer* printer) override;
-  virtual void GenerateParsingCode(io::Printer* printer) override;
-};
-
-}  // namespace csharp
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // GOOGLE_PROTOBUF_COMPILER_CSHARP_PRIMITIVE_FIELD_H__
-
diff --git a/libs/protobuf/src/google/protobuf/compiler/csharp/csharp_reflection_class.cc b/libs/protobuf/src/google/protobuf/compiler/csharp/csharp_reflection_class.cc
deleted file mode 100644
index d9ab4b4..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/csharp/csharp_reflection_class.cc
+++ /dev/null
@@ -1,330 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <sstream>
-
-#include <google/protobuf/compiler/code_generator.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/descriptor.pb.h>
-#include <google/protobuf/io/printer.h>
-#include <google/protobuf/io/zero_copy_stream.h>
-#include <google/protobuf/stubs/strutil.h>
-
-
-#include <google/protobuf/compiler/csharp/csharp_enum.h>
-#include <google/protobuf/compiler/csharp/csharp_helpers.h>
-#include <google/protobuf/compiler/csharp/csharp_field_base.h>
-#include <google/protobuf/compiler/csharp/csharp_message.h>
-#include <google/protobuf/compiler/csharp/csharp_names.h>
-#include <google/protobuf/compiler/csharp/csharp_options.h>
-#include <google/protobuf/compiler/csharp/csharp_reflection_class.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace csharp {
-
-ReflectionClassGenerator::ReflectionClassGenerator(const FileDescriptor* file,
-                                                   const Options* options)
-    : SourceGeneratorBase(options),
-      file_(file) {
-  namespace_ = GetFileNamespace(file);
-  reflectionClassname_ = GetReflectionClassUnqualifiedName(file);
-  extensionClassname_ = GetExtensionClassUnqualifiedName(file);
-}
-
-ReflectionClassGenerator::~ReflectionClassGenerator() {
-}
-
-void ReflectionClassGenerator::Generate(io::Printer* printer) {
-  WriteIntroduction(printer);
-
-  WriteDescriptor(printer);
-  // Close the class declaration.
-  printer->Outdent();
-  printer->Print("}\n");
-
-  if (file_->extension_count() > 0) {
-    printer->Print(
-        "/// <summary>Holder for extension identifiers generated from the top "
-        "level of $file_name$</summary>\n"
-        "$access_level$ static partial class $class_name$ {\n",
-        "access_level", class_access_level(), "class_name", extensionClassname_,
-        "file_name", file_->name());
-    printer->Indent();
-    for (int i = 0; i < file_->extension_count(); i++) {
-        std::unique_ptr<FieldGeneratorBase> generator(
-          CreateFieldGenerator(file_->extension(i), -1, this->options()));
-        generator->GenerateExtensionCode(printer);
-    }
-    printer->Outdent();
-    printer->Print(
-    "}\n"
-    "\n");
-  }
-
-  // write children: Enums
-  if (file_->enum_type_count() > 0) {
-    printer->Print("#region Enums\n");
-    for (int i = 0; i < file_->enum_type_count(); i++) {
-      EnumGenerator enumGenerator(file_->enum_type(i), this->options());
-      enumGenerator.Generate(printer);
-    }
-    printer->Print("#endregion\n");
-    printer->Print("\n");
-  }
-
-  // write children: Messages
-  if (file_->message_type_count() > 0) {
-    printer->Print("#region Messages\n");
-    for (int i = 0; i < file_->message_type_count(); i++) {
-      MessageGenerator messageGenerator(file_->message_type(i), this->options());
-      messageGenerator.Generate(printer);
-    }
-    printer->Print("#endregion\n");
-    printer->Print("\n");
-  }
-
-  // TODO(jtattermusch): add insertion point for services.
-
-  if (!namespace_.empty()) {
-    printer->Outdent();
-    printer->Print("}\n");
-  }
-  printer->Print("\n");
-  printer->Print("#endregion Designer generated code\n");
-}
-
-void ReflectionClassGenerator::WriteIntroduction(io::Printer* printer) {
-  printer->Print(
-    "// <auto-generated>\n"
-    "//     Generated by the protocol buffer compiler.  DO NOT EDIT!\n"
-    "//     source: $file_name$\n"
-    "// </auto-generated>\n"
-    "#pragma warning disable 1591, 0612, 3021, 8981\n"
-    "#region Designer generated code\n"
-    "\n"
-    "using pb = global::Google.Protobuf;\n"
-    "using pbc = global::Google.Protobuf.Collections;\n"
-    "using pbr = global::Google.Protobuf.Reflection;\n"
-    "using scg = global::System.Collections.Generic;\n",
-    "file_name", file_->name());
-
-  if (!namespace_.empty()) {
-    printer->Print("namespace $namespace$ {\n", "namespace", namespace_);
-    printer->Indent();
-    printer->Print("\n");
-  }
-
-  printer->Print(
-    "/// <summary>Holder for reflection information generated from $file_name$</summary>\n"
-    "$access_level$ static partial class $reflection_class_name$ {\n"
-    "\n",
-    "file_name", file_->name(),
-    "access_level", class_access_level(),
-    "reflection_class_name", reflectionClassname_);
-  printer->Indent();
-}
-
-void ReflectionClassGenerator::WriteDescriptor(io::Printer* printer) {
-  printer->Print(
-    "#region Descriptor\n"
-    "/// <summary>File descriptor for $file_name$</summary>\n"
-    "public static pbr::FileDescriptor Descriptor {\n"
-    "  get { return descriptor; }\n"
-    "}\n"
-    "private static pbr::FileDescriptor descriptor;\n"
-    "\n"
-    "static $reflection_class_name$() {\n",
-    "file_name", file_->name(),
-    "reflection_class_name", reflectionClassname_);
-  printer->Indent();
-  printer->Print(
-    "byte[] descriptorData = global::System.Convert.FromBase64String(\n");
-  printer->Indent();
-  printer->Indent();
-  printer->Print("string.Concat(\n");
-  printer->Indent();
-
-  // TODO(jonskeet): Consider a C#-escaping format here instead of just Base64.
-  std::string base64 = FileDescriptorToBase64(file_);
-  while (base64.size() > 60) {
-    printer->Print("\"$base64$\",\n", "base64", base64.substr(0, 60));
-    base64 = base64.substr(60);
-  }
-  printer->Print("\"$base64$\"));\n", "base64", base64);
-  printer->Outdent();
-  printer->Outdent();
-  printer->Outdent();
-
-  // -----------------------------------------------------------------
-  // Invoke InternalBuildGeneratedFileFrom() to build the file.
-  printer->Print(
-      "descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,\n");
-  printer->Print("    new pbr::FileDescriptor[] { ");
-  for (int i = 0; i < file_->dependency_count(); i++) {
-      printer->Print(
-      "$full_reflection_class_name$.Descriptor, ",
-      "full_reflection_class_name",
-      GetReflectionClassName(file_->dependency(i)));
-  }
-  printer->Print("},\n"
-      "    new pbr::GeneratedClrTypeInfo(");
-  // Specify all the generated code information, recursively.
-  if (file_->enum_type_count() > 0) {
-      printer->Print("new[] {");
-      for (int i = 0; i < file_->enum_type_count(); i++) {
-          printer->Print("typeof($type_name$), ", "type_name", GetClassName(file_->enum_type(i)));
-      }
-      printer->Print("}, ");
-  }
-  else {
-      printer->Print("null, ");
-  }  
-  if (file_->extension_count() > 0) {
-    std::vector<std::string> extensions;
-    for (int i = 0; i < file_->extension_count(); i++) {
-      extensions.push_back(GetFullExtensionName(file_->extension(i)));
-    }
-    printer->Print("new pb::Extension[] { $extensions$ }, ", "extensions", Join(extensions, ", "));
-  }
-  else {
-    printer->Print("null, ");
-  }
-  if (file_->message_type_count() > 0) {
-      printer->Print("new pbr::GeneratedClrTypeInfo[] {\n");
-      printer->Indent();
-      printer->Indent();
-      printer->Indent();
-      for (int i = 0; i < file_->message_type_count(); i++) {
-          WriteGeneratedCodeInfo(file_->message_type(i), printer, i == file_->message_type_count() - 1);
-      }
-      printer->Outdent();
-      printer->Print("\n}));\n");
-      printer->Outdent();
-      printer->Outdent();
-  }
-  else {
-      printer->Print("null));\n");
-  }
-
-  printer->Outdent();
-  printer->Print("}\n");
-  printer->Print("#endregion\n\n");
-}
-
-// Write out the generated code for a particular message. This consists of the CLR type, property names
-// corresponding to fields, names corresponding to oneofs, nested enums, and nested types. Each array part
-// can be specified as null if it would be empty, to make the generated code somewhat simpler to read.
-// We write a line break at the end of each generated code info, so that in the final file we'll see all
-// the types, pre-ordered depth first, one per line. The indentation will be slightly unusual,
-// in that it will look like a single array when it's actually constructing a tree, but it'll be easy to
-// read even with multiple levels of nesting.
-// The "last" parameter indicates whether this message descriptor is the last one being printed in this immediate
-// context. It governs whether or not a trailing comma and newline is written after the constructor, effectively
-// just controlling the formatting in the generated code.
-void ReflectionClassGenerator::WriteGeneratedCodeInfo(const Descriptor* descriptor, io::Printer* printer, bool last) {
-  if (IsMapEntryMessage(descriptor)) {
-    printer->Print("null, ");
-    return;
-  }
-  // Generated message type
-  printer->Print("new pbr::GeneratedClrTypeInfo(typeof($type_name$), $type_name$.Parser, ", "type_name", GetClassName(descriptor));
-
-  // Fields
-  if (descriptor->field_count() > 0) {
-      std::vector<std::string> fields;
-      fields.reserve(descriptor->field_count());
-      for (int i = 0; i < descriptor->field_count(); i++) {
-          fields.push_back(GetPropertyName(descriptor->field(i)));
-      }
-      printer->Print("new[]{ \"$fields$\" }, ", "fields", Join(fields, "\", \""));
-  }
-  else {
-      printer->Print("null, ");
-  }
-
-  // Oneofs
-  if (descriptor->oneof_decl_count() > 0) {
-      std::vector<std::string> oneofs;
-      oneofs.reserve(descriptor->oneof_decl_count());
-      for (int i = 0; i < descriptor->oneof_decl_count(); i++) {
-          oneofs.push_back(UnderscoresToCamelCase(descriptor->oneof_decl(i)->name(), true));
-      }
-      printer->Print("new[]{ \"$oneofs$\" }, ", "oneofs", Join(oneofs, "\", \""));
-  }
-  else {
-      printer->Print("null, ");
-  }
-
-  // Nested enums
-  if (descriptor->enum_type_count() > 0) {
-      std::vector<std::string> enums;
-      enums.reserve(descriptor->enum_type_count());
-      for (int i = 0; i < descriptor->enum_type_count(); i++) {
-          enums.push_back(GetClassName(descriptor->enum_type(i)));
-      }
-      printer->Print("new[]{ typeof($enums$) }, ", "enums", Join(enums, "), typeof("));
-  }
-  else {
-      printer->Print("null, ");
-  }
-
-  // Extensions
-  if (descriptor->extension_count() > 0) {
-    std::vector<std::string> extensions;
-    for (int i = 0; i < descriptor->extension_count(); i++) {
-      extensions.push_back(GetFullExtensionName(descriptor->extension(i)));
-    }
-    printer->Print("new pb::Extension[] { $extensions$ }, ", "extensions", Join(extensions, ", "));
-  }
-  else {
-    printer->Print("null, ");
-  }
-
-  // Nested types
-  if (descriptor->nested_type_count() > 0) {
-      // Need to specify array type explicitly here, as all elements may be null.
-      printer->Print("new pbr::GeneratedClrTypeInfo[] { ");
-      for (int i = 0; i < descriptor->nested_type_count(); i++) {
-          WriteGeneratedCodeInfo(descriptor->nested_type(i), printer, i == descriptor->nested_type_count() - 1);
-      }
-      printer->Print("}");
-  }
-  else {
-      printer->Print("null");
-  }
-  printer->Print(last ? ")" : "),\n");
-}
-
-}  // namespace csharp
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/compiler/csharp/csharp_reflection_class.h b/libs/protobuf/src/google/protobuf/compiler/csharp/csharp_reflection_class.h
deleted file mode 100644
index 9554727..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/csharp/csharp_reflection_class.h
+++ /dev/null
@@ -1,75 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef GOOGLE_PROTOBUF_COMPILER_CSHARP_REFLECTION_CLASS_H__
-#define GOOGLE_PROTOBUF_COMPILER_CSHARP_REFLECTION_CLASS_H__
-
-#include <string>
-
-#include <google/protobuf/compiler/code_generator.h>
-#include <google/protobuf/compiler/csharp/csharp_source_generator_base.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/io/printer.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace csharp {
-
-class ReflectionClassGenerator : public SourceGeneratorBase {
- public:
-  ReflectionClassGenerator(const FileDescriptor* file, const Options* options);
-  ~ReflectionClassGenerator();
-
-  ReflectionClassGenerator(const ReflectionClassGenerator&) = delete;
-  ReflectionClassGenerator& operator=(const ReflectionClassGenerator&) = delete;
-
-  void Generate(io::Printer* printer);
-
- private:
-  const FileDescriptor* file_;
-
-  std::string namespace_;
-  std::string reflectionClassname_;
-  std::string extensionClassname_;
-
-  void WriteIntroduction(io::Printer* printer);
-  void WriteDescriptor(io::Printer* printer);
-  void WriteGeneratedCodeInfo(const Descriptor* descriptor,
-                              io::Printer* printer,
-                              bool last);
-};
-
-}  // namespace csharp
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // GOOGLE_PROTOBUF_COMPILER_CSHARP_REFLECTION_CLASS_H__
diff --git a/libs/protobuf/src/google/protobuf/compiler/csharp/csharp_repeated_enum_field.cc b/libs/protobuf/src/google/protobuf/compiler/csharp/csharp_repeated_enum_field.cc
deleted file mode 100644
index 04bc7bb..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/csharp/csharp_repeated_enum_field.cc
+++ /dev/null
@@ -1,148 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <sstream>
-
-#include <google/protobuf/compiler/code_generator.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/descriptor.pb.h>
-#include <google/protobuf/io/printer.h>
-#include <google/protobuf/io/zero_copy_stream.h>
-#include <google/protobuf/wire_format.h>
-
-#include <google/protobuf/compiler/csharp/csharp_doc_comment.h>
-#include <google/protobuf/compiler/csharp/csharp_helpers.h>
-#include <google/protobuf/compiler/csharp/csharp_repeated_enum_field.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace csharp {
-
-RepeatedEnumFieldGenerator::RepeatedEnumFieldGenerator(
-    const FieldDescriptor* descriptor, int presenceIndex, const Options *options)
-    : FieldGeneratorBase(descriptor, presenceIndex, options) {
-}
-
-RepeatedEnumFieldGenerator::~RepeatedEnumFieldGenerator() {
-
-}
-
-void RepeatedEnumFieldGenerator::GenerateMembers(io::Printer* printer) {
-  printer->Print(
-    variables_,
-    "private static readonly pb::FieldCodec<$type_name$> _repeated_$name$_codec\n"
-    "    = pb::FieldCodec.ForEnum($tag$, x => (int) x, x => ($type_name$) x);\n");
-  printer->Print(variables_,
-    "private readonly pbc::RepeatedField<$type_name$> $name$_ = new pbc::RepeatedField<$type_name$>();\n");
-  WritePropertyDocComment(printer, descriptor_);
-  AddPublicMemberAttributes(printer);
-  printer->Print(
-    variables_,
-    "$access_level$ pbc::RepeatedField<$type_name$> $property_name$ {\n"
-    "  get { return $name$_; }\n"
-    "}\n");
-}
-
-void RepeatedEnumFieldGenerator::GenerateMergingCode(io::Printer* printer) {
-  printer->Print(
-    variables_,
-    "$name$_.Add(other.$name$_);\n");
-}
-
-void RepeatedEnumFieldGenerator::GenerateParsingCode(io::Printer* printer) {
-  GenerateParsingCode(printer, true);
-}
-
-void RepeatedEnumFieldGenerator::GenerateParsingCode(io::Printer* printer, bool use_parse_context) {
-  printer->Print(
-    variables_,
-    use_parse_context
-    ? "$name$_.AddEntriesFrom(ref input, _repeated_$name$_codec);\n"
-    : "$name$_.AddEntriesFrom(input, _repeated_$name$_codec);\n");
-}
-
-void RepeatedEnumFieldGenerator::GenerateSerializationCode(io::Printer* printer) {
-  GenerateSerializationCode(printer, true);
-}
-
-void RepeatedEnumFieldGenerator::GenerateSerializationCode(io::Printer* printer, bool use_write_context) {
-  printer->Print(
-    variables_,
-    use_write_context
-    ? "$name$_.WriteTo(ref output, _repeated_$name$_codec);\n"
-    : "$name$_.WriteTo(output, _repeated_$name$_codec);\n");
-}
-
-void RepeatedEnumFieldGenerator::GenerateSerializedSizeCode(io::Printer* printer) {
-  printer->Print(
-    variables_,
-    "size += $name$_.CalculateSize(_repeated_$name$_codec);\n");
-}
-
-void RepeatedEnumFieldGenerator::WriteHash(io::Printer* printer) {
-  printer->Print(
-    variables_,
-    "hash ^= $name$_.GetHashCode();\n");
-}
-
-void RepeatedEnumFieldGenerator::WriteEquals(io::Printer* printer) {
-  printer->Print(
-    variables_,
-    "if(!$name$_.Equals(other.$name$_)) return false;\n");
-}
-
-void RepeatedEnumFieldGenerator::WriteToString(io::Printer* printer) {
-  printer->Print(variables_,
-    "PrintField(\"$descriptor_name$\", $name$_, writer);\n");
-}
-
-void RepeatedEnumFieldGenerator::GenerateCloningCode(io::Printer* printer) {
-  printer->Print(variables_,
-    "$name$_ = other.$name$_.Clone();\n");
-}
-
-void RepeatedEnumFieldGenerator::GenerateExtensionCode(io::Printer* printer) {
-  WritePropertyDocComment(printer, descriptor_);
-  AddDeprecatedFlag(printer);
-  printer->Print(
-    variables_,
-    "$access_level$ static readonly pb::RepeatedExtension<$extended_type$, $type_name$> $property_name$ =\n"
-    "  new pb::RepeatedExtension<$extended_type$, $type_name$>($number$, "
-    "pb::FieldCodec.ForEnum($tag$, x => (int) x, x => ($type_name$) x));\n");
-}
-
-void RepeatedEnumFieldGenerator::GenerateFreezingCode(io::Printer* printer) {
-}
-
-}  // namespace csharp
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/compiler/csharp/csharp_repeated_enum_field.h b/libs/protobuf/src/google/protobuf/compiler/csharp/csharp_repeated_enum_field.h
deleted file mode 100644
index 2379f38..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/csharp/csharp_repeated_enum_field.h
+++ /dev/null
@@ -1,77 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef GOOGLE_PROTOBUF_COMPILER_CSHARP_REPEATED_ENUM_FIELD_H__
-#define GOOGLE_PROTOBUF_COMPILER_CSHARP_REPEATED_ENUM_FIELD_H__
-
-#include <google/protobuf/compiler/code_generator.h>
-#include <google/protobuf/compiler/csharp/csharp_field_base.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace csharp {
-
-// TODO(jonskeet): Refactor repeated field support; all the implementations are
-// *really* similar. We should probably have a RepeatedFieldGeneratorBase.
-class RepeatedEnumFieldGenerator : public FieldGeneratorBase {
- public:
-  RepeatedEnumFieldGenerator(const FieldDescriptor* descriptor,
-                             int presenceIndex,
-                             const Options *options);
-  ~RepeatedEnumFieldGenerator();
-
-  RepeatedEnumFieldGenerator(const RepeatedEnumFieldGenerator&) = delete;
-  RepeatedEnumFieldGenerator& operator=(const RepeatedEnumFieldGenerator&) =
-      delete;
-
-  virtual void GenerateCloningCode(io::Printer* printer) override;
-  virtual void GenerateFreezingCode(io::Printer* printer) override;
-  virtual void GenerateMembers(io::Printer* printer) override;
-  virtual void GenerateMergingCode(io::Printer* printer) override;
-  virtual void GenerateParsingCode(io::Printer* printer) override;
-  virtual void GenerateParsingCode(io::Printer* printer, bool use_parse_context) override;
-  virtual void GenerateSerializationCode(io::Printer* printer) override;
-  virtual void GenerateSerializationCode(io::Printer* printer, bool use_write_context) override;
-  virtual void GenerateSerializedSizeCode(io::Printer* printer) override;
-  virtual void GenerateExtensionCode(io::Printer* printer) override;
-
-  virtual void WriteHash(io::Printer* printer) override;
-  virtual void WriteEquals(io::Printer* printer) override;
-  virtual void WriteToString(io::Printer* printer) override;
-};
-
-}  // namespace csharp
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // GOOGLE_PROTOBUF_COMPILER_CSHARP_REPEATED_ENUM_FIELD_H__
-
diff --git a/libs/protobuf/src/google/protobuf/compiler/csharp/csharp_repeated_message_field.cc b/libs/protobuf/src/google/protobuf/compiler/csharp/csharp_repeated_message_field.cc
deleted file mode 100644
index 8a93cd1..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/csharp/csharp_repeated_message_field.cc
+++ /dev/null
@@ -1,174 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <sstream>
-
-#include <google/protobuf/compiler/code_generator.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/descriptor.pb.h>
-#include <google/protobuf/io/printer.h>
-#include <google/protobuf/io/zero_copy_stream.h>
-
-#include <google/protobuf/compiler/csharp/csharp_doc_comment.h>
-#include <google/protobuf/compiler/csharp/csharp_helpers.h>
-#include <google/protobuf/compiler/csharp/csharp_repeated_message_field.h>
-#include <google/protobuf/compiler/csharp/csharp_message_field.h>
-#include <google/protobuf/compiler/csharp/csharp_wrapper_field.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace csharp {
-
-RepeatedMessageFieldGenerator::RepeatedMessageFieldGenerator(
-    const FieldDescriptor* descriptor, int presenceIndex, const Options *options)
-    : FieldGeneratorBase(descriptor, presenceIndex, options) {
-}
-
-RepeatedMessageFieldGenerator::~RepeatedMessageFieldGenerator() {
-
-}
-
-void RepeatedMessageFieldGenerator::GenerateMembers(io::Printer* printer) {
-  printer->Print(
-    variables_,
-    "private static readonly pb::FieldCodec<$type_name$> _repeated_$name$_codec\n"
-    "    = ");
-  // Don't want to duplicate the codec code here... maybe we should have a
-  // "create single field generator for this repeated field"
-  // function, but it doesn't seem worth it for just this.
-  if (IsWrapperType(descriptor_)) {
-    std::unique_ptr<FieldGeneratorBase> single_generator(
-      new WrapperFieldGenerator(descriptor_, presenceIndex_, this->options()));
-    single_generator->GenerateCodecCode(printer);
-  } else {
-    std::unique_ptr<FieldGeneratorBase> single_generator(
-      new MessageFieldGenerator(descriptor_, presenceIndex_, this->options()));
-    single_generator->GenerateCodecCode(printer);
-  }
-  printer->Print(";\n");
-  printer->Print(
-    variables_,
-    "private readonly pbc::RepeatedField<$type_name$> $name$_ = new pbc::RepeatedField<$type_name$>();\n");
-  WritePropertyDocComment(printer, descriptor_);
-  AddPublicMemberAttributes(printer);
-  printer->Print(
-    variables_,
-    "$access_level$ pbc::RepeatedField<$type_name$> $property_name$ {\n"
-    "  get { return $name$_; }\n"
-    "}\n");
-}
-
-void RepeatedMessageFieldGenerator::GenerateMergingCode(io::Printer* printer) {
-  printer->Print(
-    variables_,
-    "$name$_.Add(other.$name$_);\n");
-}
-
-void RepeatedMessageFieldGenerator::GenerateParsingCode(io::Printer* printer) {
-  GenerateParsingCode(printer, true);
-}
-
-void RepeatedMessageFieldGenerator::GenerateParsingCode(io::Printer* printer, bool use_parse_context) {
-  printer->Print(
-    variables_,
-    use_parse_context
-    ? "$name$_.AddEntriesFrom(ref input, _repeated_$name$_codec);\n"
-    : "$name$_.AddEntriesFrom(input, _repeated_$name$_codec);\n");
-}
-
-void RepeatedMessageFieldGenerator::GenerateSerializationCode(io::Printer* printer) {
-  GenerateSerializationCode(printer, true);
-}
-
-void RepeatedMessageFieldGenerator::GenerateSerializationCode(io::Printer* printer, bool use_write_context) {
-  printer->Print(
-    variables_,
-    use_write_context
-    ? "$name$_.WriteTo(ref output, _repeated_$name$_codec);\n"
-    : "$name$_.WriteTo(output, _repeated_$name$_codec);\n");
-}
-
-void RepeatedMessageFieldGenerator::GenerateSerializedSizeCode(io::Printer* printer) {
-  printer->Print(
-    variables_,
-    "size += $name$_.CalculateSize(_repeated_$name$_codec);\n");
-}
-
-void RepeatedMessageFieldGenerator::WriteHash(io::Printer* printer) {
-  printer->Print(
-    variables_,
-    "hash ^= $name$_.GetHashCode();\n");
-}
-
-void RepeatedMessageFieldGenerator::WriteEquals(io::Printer* printer) {
-  printer->Print(
-    variables_,
-    "if(!$name$_.Equals(other.$name$_)) return false;\n");
-}
-
-void RepeatedMessageFieldGenerator::WriteToString(io::Printer* printer) {
-  variables_["field_name"] = GetFieldName(descriptor_);
-  printer->Print(
-    variables_,
-    "PrintField(\"$field_name$\", $name$_, writer);\n");
-}
-
-void RepeatedMessageFieldGenerator::GenerateCloningCode(io::Printer* printer) {
-  printer->Print(variables_,
-    "$name$_ = other.$name$_.Clone();\n");
-}
-
-void RepeatedMessageFieldGenerator::GenerateFreezingCode(io::Printer* printer) {
-}
-
-void RepeatedMessageFieldGenerator::GenerateExtensionCode(io::Printer* printer) {
-  WritePropertyDocComment(printer, descriptor_);
-  AddDeprecatedFlag(printer);
-  printer->Print(
-    variables_,
-    "$access_level$ static readonly pb::RepeatedExtension<$extended_type$, $type_name$> $property_name$ =\n"
-    "  new pb::RepeatedExtension<$extended_type$, $type_name$>($number$, ");
-  if (IsWrapperType(descriptor_)) {
-    std::unique_ptr<FieldGeneratorBase> single_generator(
-      new WrapperFieldGenerator(descriptor_, -1, this->options()));
-    single_generator->GenerateCodecCode(printer);
-  } else {
-    std::unique_ptr<FieldGeneratorBase> single_generator(
-      new MessageFieldGenerator(descriptor_, -1, this->options()));
-    single_generator->GenerateCodecCode(printer);
-  }
-  printer->Print(");\n");
-}
-
-}  // namespace csharp
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/compiler/csharp/csharp_repeated_message_field.h b/libs/protobuf/src/google/protobuf/compiler/csharp/csharp_repeated_message_field.h
deleted file mode 100644
index 026efea..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/csharp/csharp_repeated_message_field.h
+++ /dev/null
@@ -1,77 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef GOOGLE_PROTOBUF_COMPILER_CSHARP_REPEATED_MESSAGE_FIELD_H__
-#define GOOGLE_PROTOBUF_COMPILER_CSHARP_REPEATED_MESSAGE_FIELD_H__
-
-#include <google/protobuf/compiler/code_generator.h>
-#include <google/protobuf/compiler/csharp/csharp_field_base.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace csharp {
-
-struct Options;
-
-class RepeatedMessageFieldGenerator : public FieldGeneratorBase {
- public:
-  RepeatedMessageFieldGenerator(const FieldDescriptor* descriptor,
-                                int presenceIndex,
-                                const Options *options);
-  ~RepeatedMessageFieldGenerator();
-
-  RepeatedMessageFieldGenerator(const RepeatedMessageFieldGenerator&) = delete;
-  RepeatedMessageFieldGenerator& operator=(
-      const RepeatedMessageFieldGenerator&) = delete;
-
-  virtual void GenerateCloningCode(io::Printer* printer) override;
-  virtual void GenerateFreezingCode(io::Printer* printer) override;
-  virtual void GenerateMembers(io::Printer* printer) override;
-  virtual void GenerateMergingCode(io::Printer* printer) override;
-  virtual void GenerateParsingCode(io::Printer* printer) override;
-  virtual void GenerateParsingCode(io::Printer* printer, bool use_parse_context) override;
-  virtual void GenerateSerializationCode(io::Printer* printer) override;
-  virtual void GenerateSerializationCode(io::Printer* printer, bool use_write_context) override;
-  virtual void GenerateSerializedSizeCode(io::Printer* printer) override;
-  virtual void GenerateExtensionCode(io::Printer* printer) override;
-
-  virtual void WriteHash(io::Printer* printer) override;
-  virtual void WriteEquals(io::Printer* printer) override;
-  virtual void WriteToString(io::Printer* printer) override;
-};
-
-}  // namespace csharp
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // GOOGLE_PROTOBUF_COMPILER_CSHARP_REPEATED_MESSAGE_FIELD_H__
-
diff --git a/libs/protobuf/src/google/protobuf/compiler/csharp/csharp_repeated_primitive_field.cc b/libs/protobuf/src/google/protobuf/compiler/csharp/csharp_repeated_primitive_field.cc
deleted file mode 100644
index 0eacf91..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/csharp/csharp_repeated_primitive_field.cc
+++ /dev/null
@@ -1,145 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <sstream>
-
-#include <google/protobuf/compiler/code_generator.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/descriptor.pb.h>
-#include <google/protobuf/io/printer.h>
-#include <google/protobuf/io/zero_copy_stream.h>
-#include <google/protobuf/wire_format.h>
-
-#include <google/protobuf/compiler/csharp/csharp_doc_comment.h>
-#include <google/protobuf/compiler/csharp/csharp_helpers.h>
-#include <google/protobuf/compiler/csharp/csharp_repeated_primitive_field.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace csharp {
-
-RepeatedPrimitiveFieldGenerator::RepeatedPrimitiveFieldGenerator(
-    const FieldDescriptor* descriptor, int presenceIndex, const Options *options)
-    : FieldGeneratorBase(descriptor, presenceIndex, options) {
-}
-
-RepeatedPrimitiveFieldGenerator::~RepeatedPrimitiveFieldGenerator() {
-
-}
-
-void RepeatedPrimitiveFieldGenerator::GenerateMembers(io::Printer* printer) {
-  printer->Print(
-    variables_,
-    "private static readonly pb::FieldCodec<$type_name$> _repeated_$name$_codec\n"
-    "    = pb::FieldCodec.For$capitalized_type_name$($tag$);\n");
-  printer->Print(variables_,
-    "private readonly pbc::RepeatedField<$type_name$> $name$_ = new pbc::RepeatedField<$type_name$>();\n");
-  WritePropertyDocComment(printer, descriptor_);
-  AddPublicMemberAttributes(printer);
-  printer->Print(
-    variables_,
-    "$access_level$ pbc::RepeatedField<$type_name$> $property_name$ {\n"
-    "  get { return $name$_; }\n"
-    "}\n");
-}
-
-void RepeatedPrimitiveFieldGenerator::GenerateMergingCode(io::Printer* printer) {
-  printer->Print(
-    variables_,
-    "$name$_.Add(other.$name$_);\n");
-}
-
-void RepeatedPrimitiveFieldGenerator::GenerateParsingCode(io::Printer* printer) {
-  GenerateParsingCode(printer, true);
-}
-
-void RepeatedPrimitiveFieldGenerator::GenerateParsingCode(io::Printer* printer, bool use_parse_context) {
-  printer->Print(
-    variables_,
-    use_parse_context
-    ? "$name$_.AddEntriesFrom(ref input, _repeated_$name$_codec);\n"
-    : "$name$_.AddEntriesFrom(input, _repeated_$name$_codec);\n");
-}
-
-void RepeatedPrimitiveFieldGenerator::GenerateSerializationCode(io::Printer* printer) {
-  GenerateSerializationCode(printer, true);
-}
-
-void RepeatedPrimitiveFieldGenerator::GenerateSerializationCode(io::Printer* printer, bool use_write_context) {
-  printer->Print(
-    variables_,
-    use_write_context
-    ? "$name$_.WriteTo(ref output, _repeated_$name$_codec);\n"
-    : "$name$_.WriteTo(output, _repeated_$name$_codec);\n");
-}
-
-void RepeatedPrimitiveFieldGenerator::GenerateSerializedSizeCode(io::Printer* printer) {
-  printer->Print(
-    variables_,
-    "size += $name$_.CalculateSize(_repeated_$name$_codec);\n");
-}
-
-void RepeatedPrimitiveFieldGenerator::WriteHash(io::Printer* printer) {
-  printer->Print(
-    variables_,
-    "hash ^= $name$_.GetHashCode();\n");
-}
-void RepeatedPrimitiveFieldGenerator::WriteEquals(io::Printer* printer) {
-  printer->Print(
-    variables_,
-    "if(!$name$_.Equals(other.$name$_)) return false;\n");
-}
-void RepeatedPrimitiveFieldGenerator::WriteToString(io::Printer* printer) {
-  printer->Print(variables_,
-    "PrintField(\"$descriptor_name$\", $name$_, writer);\n");
-}
-
-void RepeatedPrimitiveFieldGenerator::GenerateCloningCode(io::Printer* printer) {
-  printer->Print(variables_,
-    "$name$_ = other.$name$_.Clone();\n");
-}
-
-void RepeatedPrimitiveFieldGenerator::GenerateFreezingCode(io::Printer* printer) {
-}
-
-void RepeatedPrimitiveFieldGenerator::GenerateExtensionCode(io::Printer* printer) {
-  WritePropertyDocComment(printer, descriptor_);
-  AddDeprecatedFlag(printer);
-  printer->Print(
-    variables_,
-    "$access_level$ static readonly pb::RepeatedExtension<$extended_type$, $type_name$> $property_name$ =\n"
-    "  new pb::RepeatedExtension<$extended_type$, $type_name$>($number$, pb::FieldCodec.For$capitalized_type_name$($tag$));\n");
-}
-
-}  // namespace csharp
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/compiler/csharp/csharp_repeated_primitive_field.h b/libs/protobuf/src/google/protobuf/compiler/csharp/csharp_repeated_primitive_field.h
deleted file mode 100644
index bdd12a0..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/csharp/csharp_repeated_primitive_field.h
+++ /dev/null
@@ -1,73 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef GOOGLE_PROTOBUF_COMPILER_CSHARP_REPEATED_PRIMITIVE_FIELD_H__
-#define GOOGLE_PROTOBUF_COMPILER_CSHARP_REPEATED_PRIMITIVE_FIELD_H__
-
-#include <google/protobuf/compiler/code_generator.h>
-#include <google/protobuf/compiler/csharp/csharp_field_base.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace csharp {
-
-class RepeatedPrimitiveFieldGenerator : public FieldGeneratorBase {
- public:
-  RepeatedPrimitiveFieldGenerator(const FieldDescriptor* descriptor,
-                                  int presenceIndex, const Options* options);
-  ~RepeatedPrimitiveFieldGenerator();
-
-  RepeatedPrimitiveFieldGenerator(const RepeatedPrimitiveFieldGenerator&) = delete;
-  RepeatedPrimitiveFieldGenerator& operator=(const RepeatedPrimitiveFieldGenerator&) = delete;
-
-  virtual void GenerateCloningCode(io::Printer* printer) override;
-  virtual void GenerateFreezingCode(io::Printer* printer) override;
-  virtual void GenerateMembers(io::Printer* printer) override;
-  virtual void GenerateMergingCode(io::Printer* printer) override;
-  virtual void GenerateParsingCode(io::Printer* printer) override;
-  virtual void GenerateParsingCode(io::Printer* printer, bool use_parse_context) override;
-  virtual void GenerateSerializationCode(io::Printer* printer) override;
-  virtual void GenerateSerializationCode(io::Printer* printer, bool use_write_context) override;
-  virtual void GenerateSerializedSizeCode(io::Printer* printer) override;
-  virtual void GenerateExtensionCode(io::Printer* printer) override;
-
-  virtual void WriteHash(io::Printer* printer) override;
-  virtual void WriteEquals(io::Printer* printer) override;
-  virtual void WriteToString(io::Printer* printer) override;
-};
-
-}  // namespace csharp
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // GOOGLE_PROTOBUF_COMPILER_CSHARP_REPEATED_PRIMITIVE_FIELD_H__
-
diff --git a/libs/protobuf/src/google/protobuf/compiler/csharp/csharp_source_generator_base.cc b/libs/protobuf/src/google/protobuf/compiler/csharp/csharp_source_generator_base.cc
deleted file mode 100644
index 7157e6e..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/csharp/csharp_source_generator_base.cc
+++ /dev/null
@@ -1,75 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <sstream>
-
-#include <google/protobuf/compiler/code_generator.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/descriptor.pb.h>
-#include <google/protobuf/io/printer.h>
-#include <google/protobuf/io/zero_copy_stream.h>
-
-#include <google/protobuf/compiler/csharp/csharp_source_generator_base.h>
-#include <google/protobuf/compiler/csharp/csharp_helpers.h>
-#include <google/protobuf/compiler/csharp/csharp_names.h>
-#include <google/protobuf/compiler/csharp/csharp_options.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace csharp {
-
-SourceGeneratorBase::SourceGeneratorBase(
-    const Options *options) : options_(options) {
-}
-
-SourceGeneratorBase::~SourceGeneratorBase() {
-}
-
-void SourceGeneratorBase::WriteGeneratedCodeAttributes(io::Printer* printer) {
-  printer->Print("[global::System.Diagnostics.DebuggerNonUserCodeAttribute]\n");
-  // The second argument of the [GeneratedCode] attribute could be set to current protoc
-  // version, but that would cause excessive code churn in the pre-generated
-  // code in the repository every time the protobuf version number is updated.
-  printer->Print("[global::System.CodeDom.Compiler.GeneratedCode(\"protoc\", null)]\n");
-}
-
-std::string SourceGeneratorBase::class_access_level() {
-  return this->options()->internal_access ? "internal" : "public";
-}
-
-const Options* SourceGeneratorBase::options() {
-  return this->options_;
-}
-
-}  // namespace csharp
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/compiler/csharp/csharp_source_generator_base.h b/libs/protobuf/src/google/protobuf/compiler/csharp/csharp_source_generator_base.h
deleted file mode 100644
index 17a5269..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/csharp/csharp_source_generator_base.h
+++ /dev/null
@@ -1,71 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef GOOGLE_PROTOBUF_COMPILER_CSHARP_SOURCE_GENERATOR_BASE_H__
-#define GOOGLE_PROTOBUF_COMPILER_CSHARP_SOURCE_GENERATOR_BASE_H__
-
-#include <string>
-
-#include <google/protobuf/compiler/code_generator.h>
-#include <google/protobuf/io/printer.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace csharp {
-
-struct Options;
-
-class SourceGeneratorBase {
- protected:
-  SourceGeneratorBase(const Options* options);
-  virtual ~SourceGeneratorBase();
-
-  SourceGeneratorBase(const SourceGeneratorBase&) = delete;
-  SourceGeneratorBase& operator=(const SourceGeneratorBase&) = delete;
-
-  std::string class_access_level();
-  const Options* options();
-
-  // Write any attributes used to decorate generated function members (methods and properties).
-  // Should not be used to decorate types.
-  void WriteGeneratedCodeAttributes(io::Printer* printer);
-
- private:
-  const Options *options_;
-};
-
-}  // namespace csharp
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // GOOGLE_PROTOBUF_COMPILER_CSHARP_SOURCE_GENERATOR_BASE_H__
-
diff --git a/libs/protobuf/src/google/protobuf/compiler/csharp/csharp_wrapper_field.cc b/libs/protobuf/src/google/protobuf/compiler/csharp/csharp_wrapper_field.cc
deleted file mode 100644
index e638dd8..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/csharp/csharp_wrapper_field.cc
+++ /dev/null
@@ -1,308 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <sstream>
-
-#include <google/protobuf/compiler/code_generator.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/descriptor.pb.h>
-#include <google/protobuf/io/printer.h>
-#include <google/protobuf/io/zero_copy_stream.h>
-
-#include <google/protobuf/compiler/csharp/csharp_doc_comment.h>
-#include <google/protobuf/compiler/csharp/csharp_helpers.h>
-#include <google/protobuf/compiler/csharp/csharp_options.h>
-#include <google/protobuf/compiler/csharp/csharp_wrapper_field.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace csharp {
-
-WrapperFieldGenerator::WrapperFieldGenerator(const FieldDescriptor* descriptor,
-                                       int presenceIndex, const Options *options)
-    : FieldGeneratorBase(descriptor, presenceIndex, options) {
-  variables_["has_property_check"] = name() + "_ != null";
-  variables_["has_not_property_check"] = name() + "_ == null";
-  const FieldDescriptor* wrapped_field = descriptor->message_type()->field(0);
-  is_value_type = wrapped_field->type() != FieldDescriptor::TYPE_STRING &&
-      wrapped_field->type() != FieldDescriptor::TYPE_BYTES;
-  if (is_value_type) {
-    variables_["nonnullable_type_name"] = type_name(wrapped_field);
-  }
-}
-
-WrapperFieldGenerator::~WrapperFieldGenerator() {
-}
-
-void WrapperFieldGenerator::GenerateMembers(io::Printer* printer) {
-  printer->Print(
-        variables_,
-        "private static readonly pb::FieldCodec<$type_name$> _single_$name$_codec = ");
-  GenerateCodecCode(printer);
-  printer->Print(
-    variables_,
-    ";\n"
-    "private $type_name$ $name$_;\n");
-  WritePropertyDocComment(printer, descriptor_);
-  AddPublicMemberAttributes(printer);
-  printer->Print(
-    variables_,
-    "$access_level$ $type_name$ $property_name$ {\n"
-    "  get { return $name$_; }\n"
-    "  set {\n"
-    "    $name$_ = value;\n"
-    "  }\n"
-    "}\n\n");
-  if (SupportsPresenceApi(descriptor_)) {
-    printer->Print(
-      variables_,
-      "/// <summary>Gets whether the $descriptor_name$ field is set</summary>\n");
-    AddPublicMemberAttributes(printer);
-    printer->Print(
-      variables_,
-      "$access_level$ bool Has$property_name$ {\n"
-      "  get { return $name$_ != null; }\n"
-      "}\n\n");
-    printer->Print(
-      variables_,
-      "/// <summary>Clears the value of the $descriptor_name$ field</summary>\n");
-    AddPublicMemberAttributes(printer);
-    printer->Print(
-      variables_,
-      "$access_level$ void Clear$property_name$() {\n"
-      "  $name$_ = null;\n"
-      "}\n");
-  }
-}
-
-void WrapperFieldGenerator::GenerateMergingCode(io::Printer* printer) {
-  printer->Print(
-    variables_,
-    "if (other.$has_property_check$) {\n"
-    "  if ($has_not_property_check$ || other.$property_name$ != $default_value$) {\n"
-    "    $property_name$ = other.$property_name$;\n"
-    "  }\n"
-    "}\n");
-}
-
-void WrapperFieldGenerator::GenerateParsingCode(io::Printer* printer) {
-  GenerateParsingCode(printer, true);
-}
-
-void WrapperFieldGenerator::GenerateParsingCode(io::Printer* printer, bool use_parse_context) {
-  printer->Print(
-    variables_,
-    use_parse_context
-    ? "$type_name$ value = _single_$name$_codec.Read(ref input);\n"
-      "if ($has_not_property_check$ || value != $default_value$) {\n"
-      "  $property_name$ = value;\n"
-      "}\n"
-    : "$type_name$ value = _single_$name$_codec.Read(input);\n"
-      "if ($has_not_property_check$ || value != $default_value$) {\n"
-      "  $property_name$ = value;\n"
-      "}\n");
-}
-
-void WrapperFieldGenerator::GenerateSerializationCode(io::Printer* printer) {
-  GenerateSerializationCode(printer, true);
-}
-
-void WrapperFieldGenerator::GenerateSerializationCode(io::Printer* printer, bool use_write_context) {
-  printer->Print(
-    variables_,
-    use_write_context
-    ? "if ($has_property_check$) {\n"
-      "  _single_$name$_codec.WriteTagAndValue(ref output, $property_name$);\n"
-      "}\n"
-    : "if ($has_property_check$) {\n"
-      "  _single_$name$_codec.WriteTagAndValue(output, $property_name$);\n"
-      "}\n");
-}
-
-void WrapperFieldGenerator::GenerateSerializedSizeCode(io::Printer* printer) {
-  printer->Print(
-    variables_,
-    "if ($has_property_check$) {\n"
-    "  size += _single_$name$_codec.CalculateSizeWithTag($property_name$);\n"
-    "}\n");
-}
-
-void WrapperFieldGenerator::WriteHash(io::Printer* printer) {
-  const char *text = "if ($has_property_check$) hash ^= $property_name$.GetHashCode();\n";
-  if (descriptor_->message_type()->field(0)->type() == FieldDescriptor::TYPE_FLOAT) {
-    text = "if ($has_property_check$) hash ^= pbc::ProtobufEqualityComparers.BitwiseNullableSingleEqualityComparer.GetHashCode($property_name$);\n";
-  }
-  else if (descriptor_->message_type()->field(0)->type() == FieldDescriptor::TYPE_DOUBLE) {
-    text = "if ($has_property_check$) hash ^= pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.GetHashCode($property_name$);\n";
-  }
-  printer->Print(variables_, text);
-}
-
-void WrapperFieldGenerator::WriteEquals(io::Printer* printer) {
-  const char *text = "if ($property_name$ != other.$property_name$) return false;\n";
-  if (descriptor_->message_type()->field(0)->type() == FieldDescriptor::TYPE_FLOAT) {
-    text = "if (!pbc::ProtobufEqualityComparers.BitwiseNullableSingleEqualityComparer.Equals($property_name$, other.$property_name$)) return false;\n";
-  }
-  else if (descriptor_->message_type()->field(0)->type() == FieldDescriptor::TYPE_DOUBLE) {
-    text = "if (!pbc::ProtobufEqualityComparers.BitwiseNullableDoubleEqualityComparer.Equals($property_name$, other.$property_name$)) return false;\n";
-  }
-  printer->Print(variables_, text);
-}
-
-void WrapperFieldGenerator::WriteToString(io::Printer* printer) {
-  // TODO: Implement if we ever actually need it...
-}
-
-void WrapperFieldGenerator::GenerateCloningCode(io::Printer* printer) {
-  printer->Print(variables_,
-    "$property_name$ = other.$property_name$;\n");
-}
-
-void WrapperFieldGenerator::GenerateCodecCode(io::Printer* printer) {
-  if (is_value_type) {
-    printer->Print(
-      variables_,
-      "pb::FieldCodec.ForStructWrapper<$nonnullable_type_name$>($tag$)");
-  } else {
-    printer->Print(
-      variables_,
-      "pb::FieldCodec.ForClassWrapper<$type_name$>($tag$)");
-  }
-}
-
-void WrapperFieldGenerator::GenerateExtensionCode(io::Printer* printer) {
-  WritePropertyDocComment(printer, descriptor_);
-  AddDeprecatedFlag(printer);
-  printer->Print(
-    variables_,
-    "$access_level$ static readonly pb::Extension<$extended_type$, $type_name$> $property_name$ =\n"
-    "  new pb::Extension<$extended_type$, $type_name$>($number$, ");
-  GenerateCodecCode(printer);
-  printer->Print(");\n");
-}
-
-WrapperOneofFieldGenerator::WrapperOneofFieldGenerator(
-    const FieldDescriptor* descriptor, int presenceIndex, const Options *options)
-    : WrapperFieldGenerator(descriptor, presenceIndex, options) {
-    SetCommonOneofFieldVariables(&variables_);
-}
-
-WrapperOneofFieldGenerator::~WrapperOneofFieldGenerator() {
-}
-
-void WrapperOneofFieldGenerator::GenerateMembers(io::Printer* printer) {
-  // Note: deliberately _oneof_$name$_codec, not _$oneof_name$_codec... we have one codec per field.
-  printer->Print(
-        variables_,
-        "private static readonly pb::FieldCodec<$type_name$> _oneof_$name$_codec = ");
-  GenerateCodecCode(printer);
-  printer->Print(";\n");
-  WritePropertyDocComment(printer, descriptor_);
-  AddPublicMemberAttributes(printer);
-  printer->Print(
-    variables_,
-    "$access_level$ $type_name$ $property_name$ {\n"
-    "  get { return $has_property_check$ ? ($type_name$) $oneof_name$_ : ($type_name$) null; }\n"
-    "  set {\n"
-    "    $oneof_name$_ = value;\n"
-    "    $oneof_name$Case_ = value == null ? $oneof_property_name$OneofCase.None : $oneof_property_name$OneofCase.$oneof_case_name$;\n"
-    "  }\n"
-    "}\n");
-  if (SupportsPresenceApi(descriptor_)) {
-    printer->Print(
-      variables_,
-      "/// <summary>Gets whether the \"$descriptor_name$\" field is set</summary>\n");
-    AddPublicMemberAttributes(printer);
-    printer->Print(
-      variables_,
-      "$access_level$ bool Has$property_name$ {\n"
-      "  get { return $oneof_name$Case_ == $oneof_property_name$OneofCase.$oneof_case_name$; }\n"
-      "}\n");
-    printer->Print(
-      variables_,
-      "/// <summary> Clears the value of the oneof if it's currently set to \"$descriptor_name$\" </summary>\n");
-    AddPublicMemberAttributes(printer);
-    printer->Print(
-      variables_,
-      "$access_level$ void Clear$property_name$() {\n"
-      "  if ($has_property_check$) {\n"
-      "    Clear$oneof_property_name$();\n"
-      "  }\n"
-      "}\n");
-  }
-}
-
-void WrapperOneofFieldGenerator::GenerateMergingCode(io::Printer* printer) {
-  printer->Print(variables_, "$property_name$ = other.$property_name$;\n");
-}
-
-void WrapperOneofFieldGenerator::GenerateParsingCode(io::Printer* printer) {
-  GenerateParsingCode(printer, true);
-}
-
-void WrapperOneofFieldGenerator::GenerateParsingCode(io::Printer* printer, bool use_parse_context) {
-  printer->Print(
-    variables_,
-    use_parse_context
-    ? "$property_name$ = _oneof_$name$_codec.Read(ref input);\n"
-    : "$property_name$ = _oneof_$name$_codec.Read(input);\n");
-}
-
-void WrapperOneofFieldGenerator::GenerateSerializationCode(io::Printer* printer) {
-  GenerateSerializationCode(printer, true);
-}
-
-void WrapperOneofFieldGenerator::GenerateSerializationCode(io::Printer* printer, bool use_write_context) {
-  // TODO: I suspect this is wrong...
-  printer->Print(
-    variables_,
-    use_write_context
-    ? "if ($has_property_check$) {\n"
-      "  _oneof_$name$_codec.WriteTagAndValue(ref output, ($type_name$) $oneof_name$_);\n"
-      "}\n"
-    : "if ($has_property_check$) {\n"
-      "  _oneof_$name$_codec.WriteTagAndValue(output, ($type_name$) $oneof_name$_);\n"
-      "}\n");
-}
-
-void WrapperOneofFieldGenerator::GenerateSerializedSizeCode(io::Printer* printer) {
-  // TODO: I suspect this is wrong...
-  printer->Print(
-    variables_,
-    "if ($has_property_check$) {\n"
-    "  size += _oneof_$name$_codec.CalculateSizeWithTag($property_name$);\n"
-    "}\n");
-}
-
-}  // namespace csharp
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/compiler/csharp/csharp_wrapper_field.h b/libs/protobuf/src/google/protobuf/compiler/csharp/csharp_wrapper_field.h
deleted file mode 100644
index cc8a313..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/csharp/csharp_wrapper_field.h
+++ /dev/null
@@ -1,97 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef GOOGLE_PROTOBUF_COMPILER_CSHARP_WRAPPER_FIELD_H__
-#define GOOGLE_PROTOBUF_COMPILER_CSHARP_WRAPPER_FIELD_H__
-
-#include <google/protobuf/compiler/code_generator.h>
-#include <google/protobuf/compiler/csharp/csharp_field_base.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace csharp {
-
-struct Options;
-
-class WrapperFieldGenerator : public FieldGeneratorBase {
- public:
-  WrapperFieldGenerator(const FieldDescriptor* descriptor,
-                        int presenceIndex,
-                        const Options *options);
-  ~WrapperFieldGenerator();
-
-  WrapperFieldGenerator(const WrapperFieldGenerator&) = delete;
-  WrapperFieldGenerator& operator=(const WrapperFieldGenerator&) = delete;
-
-  virtual void GenerateCodecCode(io::Printer* printer) override;
-  virtual void GenerateCloningCode(io::Printer* printer) override;
-  virtual void GenerateMembers(io::Printer* printer) override;
-  virtual void GenerateMergingCode(io::Printer* printer) override;
-  virtual void GenerateParsingCode(io::Printer* printer) override;
-  virtual void GenerateParsingCode(io::Printer* printer, bool use_parse_context) override;
-  virtual void GenerateSerializationCode(io::Printer* printer) override;
-  virtual void GenerateSerializationCode(io::Printer* printer, bool use_write_context) override;
-  virtual void GenerateSerializedSizeCode(io::Printer* printer) override;
-  virtual void GenerateExtensionCode(io::Printer* printer) override;
-
-  virtual void WriteHash(io::Printer* printer) override;
-  virtual void WriteEquals(io::Printer* printer) override;
-  virtual void WriteToString(io::Printer* printer) override;
-
- private:
-  bool is_value_type; // True for int32 etc; false for bytes and string
-};
-
-class WrapperOneofFieldGenerator : public WrapperFieldGenerator {
- public:
-  WrapperOneofFieldGenerator(const FieldDescriptor* descriptor,
-                             int presenceIndex,
-                             const Options *options);
-  ~WrapperOneofFieldGenerator();
-
-  WrapperOneofFieldGenerator(const WrapperOneofFieldGenerator&) = delete;
-  WrapperOneofFieldGenerator& operator=(const WrapperOneofFieldGenerator&) = delete;
-
-  virtual void GenerateMembers(io::Printer* printer) override;
-  virtual void GenerateMergingCode(io::Printer* printer) override;
-  virtual void GenerateParsingCode(io::Printer* printer) override;
-  virtual void GenerateParsingCode(io::Printer* printer, bool use_parse_context) override;
-  virtual void GenerateSerializationCode(io::Printer* printer) override;
-  virtual void GenerateSerializationCode(io::Printer* printer, bool use_write_context) override;
-  virtual void GenerateSerializedSizeCode(io::Printer* printer) override;
-};
-
-}  // namespace csharp
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // GOOGLE_PROTOBUF_COMPILER_CSHARP_WRAPPER_FIELD_H__
diff --git a/libs/protobuf/src/google/protobuf/compiler/importer.cc b/libs/protobuf/src/google/protobuf/compiler/importer.cc
deleted file mode 100644
index f1e26f8..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/importer.cc
+++ /dev/null
@@ -1,524 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-
-#ifdef _MSC_VER
-#include <direct.h>
-#else
-#include <unistd.h>
-#endif
-#include <errno.h>
-#include <fcntl.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-
-#include <algorithm>
-#include <memory>
-
-#include <google/protobuf/compiler/importer.h>
-#include <google/protobuf/compiler/parser.h>
-#include <google/protobuf/io/tokenizer.h>
-#include <google/protobuf/io/zero_copy_stream_impl.h>
-#include <google/protobuf/stubs/strutil.h>
-#include <google/protobuf/io/io_win32.h>
-
-#ifdef _WIN32
-#include <ctype.h>
-#endif
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-
-#ifdef _WIN32
-// DO NOT include <io.h>, instead create functions in io_win32.{h,cc} and import
-// them like we do below.
-using google::protobuf::io::win32::access;
-using google::protobuf::io::win32::open;
-#endif
-
-// Returns true if the text looks like a Windows-style absolute path, starting
-// with a drive letter.  Example:  "C:\foo".  TODO(kenton):  Share this with
-// copy in command_line_interface.cc?
-static bool IsWindowsAbsolutePath(const std::string& text) {
-#if defined(_WIN32) || defined(__CYGWIN__)
-  return text.size() >= 3 && text[1] == ':' && isalpha(text[0]) &&
-         (text[2] == '/' || text[2] == '\\') && text.find_last_of(':') == 1;
-#else
-  return false;
-#endif
-}
-
-MultiFileErrorCollector::~MultiFileErrorCollector() {}
-
-// This class serves two purposes:
-// - It implements the ErrorCollector interface (used by Tokenizer and Parser)
-//   in terms of MultiFileErrorCollector, using a particular filename.
-// - It lets us check if any errors have occurred.
-class SourceTreeDescriptorDatabase::SingleFileErrorCollector
-    : public io::ErrorCollector {
- public:
-  SingleFileErrorCollector(const std::string& filename,
-                           MultiFileErrorCollector* multi_file_error_collector)
-      : filename_(filename),
-        multi_file_error_collector_(multi_file_error_collector),
-        had_errors_(false) {}
-  ~SingleFileErrorCollector() override {}
-
-  bool had_errors() { return had_errors_; }
-
-  // implements ErrorCollector ---------------------------------------
-  void AddError(int line, int column, const std::string& message) override {
-    if (multi_file_error_collector_ != nullptr) {
-      multi_file_error_collector_->AddError(filename_, line, column, message);
-    }
-    had_errors_ = true;
-  }
-
- private:
-  std::string filename_;
-  MultiFileErrorCollector* multi_file_error_collector_;
-  bool had_errors_;
-};
-
-// ===================================================================
-
-SourceTreeDescriptorDatabase::SourceTreeDescriptorDatabase(
-    SourceTree* source_tree)
-    : source_tree_(source_tree),
-      fallback_database_(nullptr),
-      error_collector_(nullptr),
-      using_validation_error_collector_(false),
-      validation_error_collector_(this) {}
-
-SourceTreeDescriptorDatabase::SourceTreeDescriptorDatabase(
-    SourceTree* source_tree, DescriptorDatabase* fallback_database)
-    : source_tree_(source_tree),
-      fallback_database_(fallback_database),
-      error_collector_(nullptr),
-      using_validation_error_collector_(false),
-      validation_error_collector_(this) {}
-
-SourceTreeDescriptorDatabase::~SourceTreeDescriptorDatabase() {}
-
-bool SourceTreeDescriptorDatabase::FindFileByName(const std::string& filename,
-                                                  FileDescriptorProto* output) {
-  std::unique_ptr<io::ZeroCopyInputStream> input(source_tree_->Open(filename));
-  if (input == nullptr) {
-    if (fallback_database_ != nullptr &&
-        fallback_database_->FindFileByName(filename, output)) {
-      return true;
-    }
-    if (error_collector_ != nullptr) {
-      error_collector_->AddError(filename, -1, 0,
-                                 source_tree_->GetLastErrorMessage());
-    }
-    return false;
-  }
-
-  // Set up the tokenizer and parser.
-  SingleFileErrorCollector file_error_collector(filename, error_collector_);
-  io::Tokenizer tokenizer(input.get(), &file_error_collector);
-
-  Parser parser;
-  if (error_collector_ != nullptr) {
-    parser.RecordErrorsTo(&file_error_collector);
-  }
-  if (using_validation_error_collector_) {
-    parser.RecordSourceLocationsTo(&source_locations_);
-  }
-
-  // Parse it.
-  output->set_name(filename);
-  return parser.Parse(&tokenizer, output) && !file_error_collector.had_errors();
-}
-
-bool SourceTreeDescriptorDatabase::FindFileContainingSymbol(
-    const std::string& symbol_name, FileDescriptorProto* output) {
-  return false;
-}
-
-bool SourceTreeDescriptorDatabase::FindFileContainingExtension(
-    const std::string& containing_type, int field_number,
-    FileDescriptorProto* output) {
-  return false;
-}
-
-// -------------------------------------------------------------------
-
-SourceTreeDescriptorDatabase::ValidationErrorCollector::
-    ValidationErrorCollector(SourceTreeDescriptorDatabase* owner)
-    : owner_(owner) {}
-
-SourceTreeDescriptorDatabase::ValidationErrorCollector::
-    ~ValidationErrorCollector() {}
-
-void SourceTreeDescriptorDatabase::ValidationErrorCollector::AddError(
-    const std::string& filename, const std::string& element_name,
-    const Message* descriptor, ErrorLocation location,
-    const std::string& message) {
-  if (owner_->error_collector_ == nullptr) return;
-
-  int line, column;
-  if (location == DescriptorPool::ErrorCollector::IMPORT) {
-    owner_->source_locations_.FindImport(descriptor, element_name, &line,
-                                         &column);
-  } else {
-    owner_->source_locations_.Find(descriptor, location, &line, &column);
-  }
-  owner_->error_collector_->AddError(filename, line, column, message);
-}
-
-void SourceTreeDescriptorDatabase::ValidationErrorCollector::AddWarning(
-    const std::string& filename, const std::string& element_name,
-    const Message* descriptor, ErrorLocation location,
-    const std::string& message) {
-  if (owner_->error_collector_ == nullptr) return;
-
-  int line, column;
-  if (location == DescriptorPool::ErrorCollector::IMPORT) {
-    owner_->source_locations_.FindImport(descriptor, element_name, &line,
-                                         &column);
-  } else {
-    owner_->source_locations_.Find(descriptor, location, &line, &column);
-  }
-  owner_->error_collector_->AddWarning(filename, line, column, message);
-}
-
-// ===================================================================
-
-Importer::Importer(SourceTree* source_tree,
-                   MultiFileErrorCollector* error_collector)
-    : database_(source_tree),
-      pool_(&database_, database_.GetValidationErrorCollector()) {
-  pool_.EnforceWeakDependencies(true);
-  database_.RecordErrorsTo(error_collector);
-}
-
-Importer::~Importer() {}
-
-const FileDescriptor* Importer::Import(const std::string& filename) {
-  return pool_.FindFileByName(filename);
-}
-
-void Importer::AddUnusedImportTrackFile(const std::string& file_name,
-                                        bool is_error) {
-  pool_.AddUnusedImportTrackFile(file_name, is_error);
-}
-
-void Importer::ClearUnusedImportTrackFiles() {
-  pool_.ClearUnusedImportTrackFiles();
-}
-
-
-// ===================================================================
-
-SourceTree::~SourceTree() {}
-
-std::string SourceTree::GetLastErrorMessage() { return "File not found."; }
-
-DiskSourceTree::DiskSourceTree() {}
-
-DiskSourceTree::~DiskSourceTree() {}
-
-static inline char LastChar(const std::string& str) {
-  return str[str.size() - 1];
-}
-
-// Given a path, returns an equivalent path with these changes:
-// - On Windows, any backslashes are replaced with forward slashes.
-// - Any instances of the directory "." are removed.
-// - Any consecutive '/'s are collapsed into a single slash.
-// Note that the resulting string may be empty.
-//
-// TODO(kenton):  It would be nice to handle "..", e.g. so that we can figure
-//   out that "foo/bar.proto" is inside "baz/../foo".  However, if baz is a
-//   symlink or doesn't exist, then things get complicated, and we can't
-//   actually determine this without investigating the filesystem, probably
-//   in non-portable ways.  So, we punt.
-//
-// TODO(kenton):  It would be nice to use realpath() here except that it
-//   resolves symbolic links.  This could cause problems if people place
-//   symbolic links in their source tree.  For example, if you executed:
-//     protoc --proto_path=foo foo/bar/baz.proto
-//   then if foo/bar is a symbolic link, foo/bar/baz.proto will canonicalize
-//   to a path which does not appear to be under foo, and thus the compiler
-//   will complain that baz.proto is not inside the --proto_path.
-static std::string CanonicalizePath(std::string path) {
-#ifdef _WIN32
-  // The Win32 API accepts forward slashes as a path delimiter even though
-  // backslashes are standard.  Let's avoid confusion and use only forward
-  // slashes.
-  if (HasPrefixString(path, "\\\\")) {
-    // Avoid converting two leading backslashes.
-    path = "\\\\" + StringReplace(path.substr(2), "\\", "/", true);
-  } else {
-    path = StringReplace(path, "\\", "/", true);
-  }
-#endif
-
-  std::vector<std::string> canonical_parts;
-  std::vector<std::string> parts = Split(
-      path, "/", true);  // Note:  Removes empty parts.
-  for (const std::string& part : parts) {
-    if (part == ".") {
-      // Ignore.
-    } else {
-      canonical_parts.push_back(part);
-    }
-  }
-  std::string result = Join(canonical_parts, "/");
-  if (!path.empty() && path[0] == '/') {
-    // Restore leading slash.
-    result = '/' + result;
-  }
-  if (!path.empty() && LastChar(path) == '/' && !result.empty() &&
-      LastChar(result) != '/') {
-    // Restore trailing slash.
-    result += '/';
-  }
-  return result;
-}
-
-static inline bool ContainsParentReference(const std::string& path) {
-  return path == ".." || HasPrefixString(path, "../") ||
-         HasSuffixString(path, "/..") || path.find("/../") != std::string::npos;
-}
-
-// Maps a file from an old location to a new one.  Typically, old_prefix is
-// a virtual path and new_prefix is its corresponding disk path.  Returns
-// false if the filename did not start with old_prefix, otherwise replaces
-// old_prefix with new_prefix and stores the result in *result.  Examples:
-//   string result;
-//   assert(ApplyMapping("foo/bar", "", "baz", &result));
-//   assert(result == "baz/foo/bar");
-//
-//   assert(ApplyMapping("foo/bar", "foo", "baz", &result));
-//   assert(result == "baz/bar");
-//
-//   assert(ApplyMapping("foo", "foo", "bar", &result));
-//   assert(result == "bar");
-//
-//   assert(!ApplyMapping("foo/bar", "baz", "qux", &result));
-//   assert(!ApplyMapping("foo/bar", "baz", "qux", &result));
-//   assert(!ApplyMapping("foobar", "foo", "baz", &result));
-static bool ApplyMapping(const std::string& filename,
-                         const std::string& old_prefix,
-                         const std::string& new_prefix, std::string* result) {
-  if (old_prefix.empty()) {
-    // old_prefix matches any relative path.
-    if (ContainsParentReference(filename)) {
-      // We do not allow the file name to use "..".
-      return false;
-    }
-    if (HasPrefixString(filename, "/") || IsWindowsAbsolutePath(filename)) {
-      // This is an absolute path, so it isn't matched by the empty string.
-      return false;
-    }
-    result->assign(new_prefix);
-    if (!result->empty()) result->push_back('/');
-    result->append(filename);
-    return true;
-  } else if (HasPrefixString(filename, old_prefix)) {
-    // old_prefix is a prefix of the filename.  Is it the whole filename?
-    if (filename.size() == old_prefix.size()) {
-      // Yep, it's an exact match.
-      *result = new_prefix;
-      return true;
-    } else {
-      // Not an exact match.  Is the next character a '/'?  Otherwise,
-      // this isn't actually a match at all.  E.g. the prefix "foo/bar"
-      // does not match the filename "foo/barbaz".
-      int after_prefix_start = -1;
-      if (filename[old_prefix.size()] == '/') {
-        after_prefix_start = old_prefix.size() + 1;
-      } else if (filename[old_prefix.size() - 1] == '/') {
-        // old_prefix is never empty, and canonicalized paths never have
-        // consecutive '/' characters.
-        after_prefix_start = old_prefix.size();
-      }
-      if (after_prefix_start != -1) {
-        // Yep.  So the prefixes are directories and the filename is a file
-        // inside them.
-        std::string after_prefix = filename.substr(after_prefix_start);
-        if (ContainsParentReference(after_prefix)) {
-          // We do not allow the file name to use "..".
-          return false;
-        }
-        result->assign(new_prefix);
-        if (!result->empty()) result->push_back('/');
-        result->append(after_prefix);
-        return true;
-      }
-    }
-  }
-
-  return false;
-}
-
-void DiskSourceTree::MapPath(const std::string& virtual_path,
-                             const std::string& disk_path) {
-  mappings_.push_back(Mapping(virtual_path, CanonicalizePath(disk_path)));
-}
-
-DiskSourceTree::DiskFileToVirtualFileResult
-DiskSourceTree::DiskFileToVirtualFile(const std::string& disk_file,
-                                      std::string* virtual_file,
-                                      std::string* shadowing_disk_file) {
-  int mapping_index = -1;
-  std::string canonical_disk_file = CanonicalizePath(disk_file);
-
-  for (int i = 0; i < mappings_.size(); i++) {
-    // Apply the mapping in reverse.
-    if (ApplyMapping(canonical_disk_file, mappings_[i].disk_path,
-                     mappings_[i].virtual_path, virtual_file)) {
-      // Success.
-      mapping_index = i;
-      break;
-    }
-  }
-
-  if (mapping_index == -1) {
-    return NO_MAPPING;
-  }
-
-  // Iterate through all mappings with higher precedence and verify that none
-  // of them map this file to some other existing file.
-  for (int i = 0; i < mapping_index; i++) {
-    if (ApplyMapping(*virtual_file, mappings_[i].virtual_path,
-                     mappings_[i].disk_path, shadowing_disk_file)) {
-      if (access(shadowing_disk_file->c_str(), F_OK) >= 0) {
-        // File exists.
-        return SHADOWED;
-      }
-    }
-  }
-  shadowing_disk_file->clear();
-
-  // Verify that we can open the file.  Note that this also has the side-effect
-  // of verifying that we are not canonicalizing away any non-existent
-  // directories.
-  std::unique_ptr<io::ZeroCopyInputStream> stream(OpenDiskFile(disk_file));
-  if (stream == nullptr) {
-    return CANNOT_OPEN;
-  }
-
-  return SUCCESS;
-}
-
-bool DiskSourceTree::VirtualFileToDiskFile(const std::string& virtual_file,
-                                           std::string* disk_file) {
-  std::unique_ptr<io::ZeroCopyInputStream> stream(
-      OpenVirtualFile(virtual_file, disk_file));
-  return stream != nullptr;
-}
-
-io::ZeroCopyInputStream* DiskSourceTree::Open(const std::string& filename) {
-  return OpenVirtualFile(filename, nullptr);
-}
-
-std::string DiskSourceTree::GetLastErrorMessage() {
-  return last_error_message_;
-}
-
-io::ZeroCopyInputStream* DiskSourceTree::OpenVirtualFile(
-    const std::string& virtual_file, std::string* disk_file) {
-  if (virtual_file != CanonicalizePath(virtual_file) ||
-      ContainsParentReference(virtual_file)) {
-    // We do not allow importing of paths containing things like ".." or
-    // consecutive slashes since the compiler expects files to be uniquely
-    // identified by file name.
-    last_error_message_ =
-        "Backslashes, consecutive slashes, \".\", or \"..\" "
-        "are not allowed in the virtual path";
-    return nullptr;
-  }
-
-  for (const auto& mapping : mappings_) {
-    std::string temp_disk_file;
-    if (ApplyMapping(virtual_file, mapping.virtual_path, mapping.disk_path,
-                     &temp_disk_file)) {
-      io::ZeroCopyInputStream* stream = OpenDiskFile(temp_disk_file);
-      if (stream != nullptr) {
-        if (disk_file != nullptr) {
-          *disk_file = temp_disk_file;
-        }
-        return stream;
-      }
-
-      if (errno == EACCES) {
-        // The file exists but is not readable.
-        last_error_message_ =
-            "Read access is denied for file: " + temp_disk_file;
-        return nullptr;
-      }
-    }
-  }
-  last_error_message_ = "File not found.";
-  return nullptr;
-}
-
-io::ZeroCopyInputStream* DiskSourceTree::OpenDiskFile(
-    const std::string& filename) {
-  struct stat sb;
-  int ret = 0;
-  do {
-    ret = stat(filename.c_str(), &sb);
-  } while (ret != 0 && errno == EINTR);
-#if defined(_WIN32)
-  if (ret == 0 && sb.st_mode & S_IFDIR) {
-    last_error_message_ = "Input file is a directory.";
-    return nullptr;
-  }
-#else
-  if (ret == 0 && S_ISDIR(sb.st_mode)) {
-    last_error_message_ = "Input file is a directory.";
-    return nullptr;
-  }
-#endif
-  int file_descriptor;
-  do {
-    file_descriptor = open(filename.c_str(), O_RDONLY);
-  } while (file_descriptor < 0 && errno == EINTR);
-  if (file_descriptor >= 0) {
-    io::FileInputStream* result = new io::FileInputStream(file_descriptor);
-    result->SetCloseOnDelete(true);
-    return result;
-  } else {
-    return nullptr;
-  }
-}
-
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/compiler/importer.h b/libs/protobuf/src/google/protobuf/compiler/importer.h
deleted file mode 100644
index 2fb88b9..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/importer.h
+++ /dev/null
@@ -1,338 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-//
-// This file is the public interface to the .proto file parser.
-
-#ifndef GOOGLE_PROTOBUF_COMPILER_IMPORTER_H__
-#define GOOGLE_PROTOBUF_COMPILER_IMPORTER_H__
-
-#include <set>
-#include <string>
-#include <utility>
-#include <vector>
-
-#include <google/protobuf/compiler/parser.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/descriptor_database.h>
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-
-namespace io {
-class ZeroCopyInputStream;
-}
-
-namespace compiler {
-
-// Defined in this file.
-class Importer;
-class MultiFileErrorCollector;
-class SourceTree;
-class DiskSourceTree;
-
-// TODO(kenton):  Move all SourceTree stuff to a separate file?
-
-// An implementation of DescriptorDatabase which loads files from a SourceTree
-// and parses them.
-//
-// Note:  This class is not thread-safe since it maintains a table of source
-//   code locations for error reporting.  However, when a DescriptorPool wraps
-//   a DescriptorDatabase, it uses mutex locking to make sure only one method
-//   of the database is called at a time, even if the DescriptorPool is used
-//   from multiple threads.  Therefore, there is only a problem if you create
-//   multiple DescriptorPools wrapping the same SourceTreeDescriptorDatabase
-//   and use them from multiple threads.
-//
-// Note:  This class does not implement FindFileContainingSymbol() or
-//   FindFileContainingExtension(); these will always return false.
-class PROTOBUF_EXPORT SourceTreeDescriptorDatabase : public DescriptorDatabase {
- public:
-  SourceTreeDescriptorDatabase(SourceTree* source_tree);
-
-  // If non-NULL, fallback_database will be checked if a file doesn't exist in
-  // the specified source_tree.
-  SourceTreeDescriptorDatabase(SourceTree* source_tree,
-                               DescriptorDatabase* fallback_database);
-  ~SourceTreeDescriptorDatabase() override;
-
-  // Instructs the SourceTreeDescriptorDatabase to report any parse errors
-  // to the given MultiFileErrorCollector.  This should be called before
-  // parsing.  error_collector must remain valid until either this method
-  // is called again or the SourceTreeDescriptorDatabase is destroyed.
-  void RecordErrorsTo(MultiFileErrorCollector* error_collector) {
-    error_collector_ = error_collector;
-  }
-
-  // Gets a DescriptorPool::ErrorCollector which records errors to the
-  // MultiFileErrorCollector specified with RecordErrorsTo().  This collector
-  // has the ability to determine exact line and column numbers of errors
-  // from the information given to it by the DescriptorPool.
-  DescriptorPool::ErrorCollector* GetValidationErrorCollector() {
-    using_validation_error_collector_ = true;
-    return &validation_error_collector_;
-  }
-
-  // implements DescriptorDatabase -----------------------------------
-  bool FindFileByName(const std::string& filename,
-                      FileDescriptorProto* output) override;
-  bool FindFileContainingSymbol(const std::string& symbol_name,
-                                FileDescriptorProto* output) override;
-  bool FindFileContainingExtension(const std::string& containing_type,
-                                   int field_number,
-                                   FileDescriptorProto* output) override;
-
- private:
-  class SingleFileErrorCollector;
-
-  SourceTree* source_tree_;
-  DescriptorDatabase* fallback_database_;
-  MultiFileErrorCollector* error_collector_;
-
-  class PROTOBUF_EXPORT ValidationErrorCollector
-      : public DescriptorPool::ErrorCollector {
-   public:
-    ValidationErrorCollector(SourceTreeDescriptorDatabase* owner);
-    ~ValidationErrorCollector() override;
-
-    // implements ErrorCollector ---------------------------------------
-    void AddError(const std::string& filename, const std::string& element_name,
-                  const Message* descriptor, ErrorLocation location,
-                  const std::string& message) override;
-
-    void AddWarning(const std::string& filename,
-                    const std::string& element_name, const Message* descriptor,
-                    ErrorLocation location,
-                    const std::string& message) override;
-
-   private:
-    SourceTreeDescriptorDatabase* owner_;
-  };
-  friend class ValidationErrorCollector;
-
-  bool using_validation_error_collector_;
-  SourceLocationTable source_locations_;
-  ValidationErrorCollector validation_error_collector_;
-};
-
-// Simple interface for parsing .proto files.  This wraps the process
-// of opening the file, parsing it with a Parser, recursively parsing all its
-// imports, and then cross-linking the results to produce a FileDescriptor.
-//
-// This is really just a thin wrapper around SourceTreeDescriptorDatabase.
-// You may find that SourceTreeDescriptorDatabase is more flexible.
-//
-// TODO(kenton):  I feel like this class is not well-named.
-class PROTOBUF_EXPORT Importer {
- public:
-  Importer(SourceTree* source_tree, MultiFileErrorCollector* error_collector);
-  ~Importer();
-
-  // Import the given file and build a FileDescriptor representing it.  If
-  // the file is already in the DescriptorPool, the existing FileDescriptor
-  // will be returned.  The FileDescriptor is property of the DescriptorPool,
-  // and will remain valid until it is destroyed.  If any errors occur, they
-  // will be reported using the error collector and Import() will return NULL.
-  //
-  // A particular Importer object will only report errors for a particular
-  // file once.  All future attempts to import the same file will return NULL
-  // without reporting any errors.  The idea is that you might want to import
-  // a lot of files without seeing the same errors over and over again.  If
-  // you want to see errors for the same files repeatedly, you can use a
-  // separate Importer object to import each one (but use the same
-  // DescriptorPool so that they can be cross-linked).
-  const FileDescriptor* Import(const std::string& filename);
-
-  // The DescriptorPool in which all imported FileDescriptors and their
-  // contents are stored.
-  inline const DescriptorPool* pool() const { return &pool_; }
-
-  void AddUnusedImportTrackFile(const std::string& file_name,
-                                bool is_error = false);
-  void ClearUnusedImportTrackFiles();
-
-
- private:
-  SourceTreeDescriptorDatabase database_;
-  DescriptorPool pool_;
-
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(Importer);
-};
-
-// If the importer encounters problems while trying to import the proto files,
-// it reports them to a MultiFileErrorCollector.
-class PROTOBUF_EXPORT MultiFileErrorCollector {
- public:
-  inline MultiFileErrorCollector() {}
-  virtual ~MultiFileErrorCollector();
-
-  // Line and column numbers are zero-based.  A line number of -1 indicates
-  // an error with the entire file (e.g. "not found").
-  virtual void AddError(const std::string& filename, int line, int column,
-                        const std::string& message) = 0;
-
-  virtual void AddWarning(const std::string& /* filename */, int /* line */,
-                          int /* column */, const std::string& /* message */) {}
-
- private:
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(MultiFileErrorCollector);
-};
-
-// Abstract interface which represents a directory tree containing proto files.
-// Used by the default implementation of Importer to resolve import statements
-// Most users will probably want to use the DiskSourceTree implementation,
-// below.
-class PROTOBUF_EXPORT SourceTree {
- public:
-  inline SourceTree() {}
-  virtual ~SourceTree();
-
-  // Open the given file and return a stream that reads it, or NULL if not
-  // found.  The caller takes ownership of the returned object.  The filename
-  // must be a path relative to the root of the source tree and must not
-  // contain "." or ".." components.
-  virtual io::ZeroCopyInputStream* Open(const std::string& filename) = 0;
-
-  // If Open() returns NULL, calling this method immediately will return an
-  // description of the error.
-  // Subclasses should implement this method and return a meaningful value for
-  // better error reporting.
-  // TODO(xiaofeng): change this to a pure virtual function.
-  virtual std::string GetLastErrorMessage();
-
- private:
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(SourceTree);
-};
-
-// An implementation of SourceTree which loads files from locations on disk.
-// Multiple mappings can be set up to map locations in the DiskSourceTree to
-// locations in the physical filesystem.
-class PROTOBUF_EXPORT DiskSourceTree : public SourceTree {
- public:
-  DiskSourceTree();
-  ~DiskSourceTree() override;
-
-  // Map a path on disk to a location in the SourceTree.  The path may be
-  // either a file or a directory.  If it is a directory, the entire tree
-  // under it will be mapped to the given virtual location.  To map a directory
-  // to the root of the source tree, pass an empty string for virtual_path.
-  //
-  // If multiple mapped paths apply when opening a file, they will be searched
-  // in order.  For example, if you do:
-  //   MapPath("bar", "foo/bar");
-  //   MapPath("", "baz");
-  // and then you do:
-  //   Open("bar/qux");
-  // the DiskSourceTree will first try to open foo/bar/qux, then baz/bar/qux,
-  // returning the first one that opens successfully.
-  //
-  // disk_path may be an absolute path or relative to the current directory,
-  // just like a path you'd pass to open().
-  void MapPath(const std::string& virtual_path, const std::string& disk_path);
-
-  // Return type for DiskFileToVirtualFile().
-  enum DiskFileToVirtualFileResult {
-    SUCCESS,
-    SHADOWED,
-    CANNOT_OPEN,
-    NO_MAPPING
-  };
-
-  // Given a path to a file on disk, find a virtual path mapping to that
-  // file.  The first mapping created with MapPath() whose disk_path contains
-  // the filename is used.  However, that virtual path may not actually be
-  // usable to open the given file.  Possible return values are:
-  // * SUCCESS: The mapping was found.  *virtual_file is filled in so that
-  //   calling Open(*virtual_file) will open the file named by disk_file.
-  // * SHADOWED: A mapping was found, but using Open() to open this virtual
-  //   path will end up returning some different file.  This is because some
-  //   other mapping with a higher precedence also matches this virtual path
-  //   and maps it to a different file that exists on disk.  *virtual_file
-  //   is filled in as it would be in the SUCCESS case.  *shadowing_disk_file
-  //   is filled in with the disk path of the file which would be opened if
-  //   you were to call Open(*virtual_file).
-  // * CANNOT_OPEN: The mapping was found and was not shadowed, but the
-  //   file specified cannot be opened.  When this value is returned,
-  //   errno will indicate the reason the file cannot be opened.  *virtual_file
-  //   will be set to the virtual path as in the SUCCESS case, even though
-  //   it is not useful.
-  // * NO_MAPPING: Indicates that no mapping was found which contains this
-  //   file.
-  DiskFileToVirtualFileResult DiskFileToVirtualFile(
-      const std::string& disk_file, std::string* virtual_file,
-      std::string* shadowing_disk_file);
-
-  // Given a virtual path, find the path to the file on disk.
-  // Return true and update disk_file with the on-disk path if the file exists.
-  // Return false and leave disk_file untouched if the file doesn't exist.
-  bool VirtualFileToDiskFile(const std::string& virtual_file,
-                             std::string* disk_file);
-
-  // implements SourceTree -------------------------------------------
-  io::ZeroCopyInputStream* Open(const std::string& filename) override;
-
-  std::string GetLastErrorMessage() override;
-
- private:
-  struct Mapping {
-    std::string virtual_path;
-    std::string disk_path;
-
-    inline Mapping(const std::string& virtual_path_param,
-                   const std::string& disk_path_param)
-        : virtual_path(virtual_path_param), disk_path(disk_path_param) {}
-  };
-  std::vector<Mapping> mappings_;
-  std::string last_error_message_;
-
-  // Like Open(), but returns the on-disk path in disk_file if disk_file is
-  // non-NULL and the file could be successfully opened.
-  io::ZeroCopyInputStream* OpenVirtualFile(const std::string& virtual_file,
-                                           std::string* disk_file);
-
-  // Like Open() but given the actual on-disk path.
-  io::ZeroCopyInputStream* OpenDiskFile(const std::string& filename);
-
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(DiskSourceTree);
-};
-
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
-
-#endif  // GOOGLE_PROTOBUF_COMPILER_IMPORTER_H__
diff --git a/libs/protobuf/src/google/protobuf/compiler/importer_unittest.cc b/libs/protobuf/src/google/protobuf/compiler/importer_unittest.cc
deleted file mode 100644
index d2810ad..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/importer_unittest.cc
+++ /dev/null
@@ -1,548 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-
-#include <google/protobuf/compiler/importer.h>
-
-#include <memory>
-#include <unordered_map>
-
-#include <google/protobuf/stubs/logging.h>
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/testing/file.h>
-#include <google/protobuf/testing/file.h>
-#include <google/protobuf/testing/file.h>
-#include <google/protobuf/io/zero_copy_stream_impl.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/testing/googletest.h>
-#include <gtest/gtest.h>
-#include <google/protobuf/stubs/substitute.h>
-#include <google/protobuf/stubs/map_util.h>
-#include <google/protobuf/stubs/strutil.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-
-namespace {
-
-bool FileExists(const std::string& path) {
-  return File::Exists(path);
-}
-
-#define EXPECT_SUBSTRING(needle, haystack) \
-  EXPECT_PRED_FORMAT2(testing::IsSubstring, (needle), (haystack))
-
-class MockErrorCollector : public MultiFileErrorCollector {
- public:
-  MockErrorCollector() {}
-  ~MockErrorCollector() override {}
-
-  std::string text_;
-  std::string warning_text_;
-
-  // implements ErrorCollector ---------------------------------------
-  void AddError(const std::string& filename, int line, int column,
-                const std::string& message) override {
-    strings::SubstituteAndAppend(&text_, "$0:$1:$2: $3\n", filename, line, column,
-                              message);
-  }
-
-  void AddWarning(const std::string& filename, int line, int column,
-                  const std::string& message) override {
-    strings::SubstituteAndAppend(&warning_text_, "$0:$1:$2: $3\n", filename, line,
-                              column, message);
-  }
-};
-
-// -------------------------------------------------------------------
-
-// A dummy implementation of SourceTree backed by a simple map.
-class MockSourceTree : public SourceTree {
- public:
-  MockSourceTree() {}
-  ~MockSourceTree() override {}
-
-  void AddFile(const std::string& name, const char* contents) {
-    files_[name] = contents;
-  }
-
-  // implements SourceTree -------------------------------------------
-  io::ZeroCopyInputStream* Open(const std::string& filename) override {
-    const char* contents = FindPtrOrNull(files_, filename);
-    if (contents == nullptr) {
-      return nullptr;
-    } else {
-      return new io::ArrayInputStream(contents, strlen(contents));
-    }
-  }
-
-  std::string GetLastErrorMessage() override { return "File not found."; }
-
- private:
-  std::unordered_map<std::string, const char*> files_;
-};
-
-// ===================================================================
-
-class ImporterTest : public testing::Test {
- protected:
-  ImporterTest() : importer_(&source_tree_, &error_collector_) {}
-
-  void AddFile(const std::string& filename, const char* text) {
-    source_tree_.AddFile(filename, text);
-  }
-
-  // Return the collected error text
-  std::string warning() const { return error_collector_.warning_text_; }
-
-  MockErrorCollector error_collector_;
-  MockSourceTree source_tree_;
-  Importer importer_;
-};
-
-TEST_F(ImporterTest, Import) {
-  // Test normal importing.
-  AddFile("foo.proto",
-          "syntax = \"proto2\";\n"
-          "message Foo {}\n");
-
-  const FileDescriptor* file = importer_.Import("foo.proto");
-  EXPECT_EQ("", error_collector_.text_);
-  ASSERT_TRUE(file != nullptr);
-
-  ASSERT_EQ(1, file->message_type_count());
-  EXPECT_EQ("Foo", file->message_type(0)->name());
-
-  // Importing again should return same object.
-  EXPECT_EQ(file, importer_.Import("foo.proto"));
-}
-
-TEST_F(ImporterTest, ImportNested) {
-  // Test that importing a file which imports another file works.
-  AddFile("foo.proto",
-          "syntax = \"proto2\";\n"
-          "import \"bar.proto\";\n"
-          "message Foo {\n"
-          "  optional Bar bar = 1;\n"
-          "}\n");
-  AddFile("bar.proto",
-          "syntax = \"proto2\";\n"
-          "message Bar {}\n");
-
-  // Note that both files are actually parsed by the first call to Import()
-  // here, since foo.proto imports bar.proto.  The second call just returns
-  // the same ProtoFile for bar.proto which was constructed while importing
-  // foo.proto.  We test that this is the case below by checking that bar
-  // is among foo's dependencies (by pointer).
-  const FileDescriptor* foo = importer_.Import("foo.proto");
-  const FileDescriptor* bar = importer_.Import("bar.proto");
-  EXPECT_EQ("", error_collector_.text_);
-  ASSERT_TRUE(foo != nullptr);
-  ASSERT_TRUE(bar != nullptr);
-
-  // Check that foo's dependency is the same object as bar.
-  ASSERT_EQ(1, foo->dependency_count());
-  EXPECT_EQ(bar, foo->dependency(0));
-
-  // Check that foo properly cross-links bar.
-  ASSERT_EQ(1, foo->message_type_count());
-  ASSERT_EQ(1, bar->message_type_count());
-  ASSERT_EQ(1, foo->message_type(0)->field_count());
-  ASSERT_EQ(FieldDescriptor::TYPE_MESSAGE,
-            foo->message_type(0)->field(0)->type());
-  EXPECT_EQ(bar->message_type(0),
-            foo->message_type(0)->field(0)->message_type());
-}
-
-TEST_F(ImporterTest, FileNotFound) {
-  // Error:  Parsing a file that doesn't exist.
-  EXPECT_TRUE(importer_.Import("foo.proto") == nullptr);
-  EXPECT_EQ("foo.proto:-1:0: File not found.\n", error_collector_.text_);
-}
-
-TEST_F(ImporterTest, ImportNotFound) {
-  // Error:  Importing a file that doesn't exist.
-  AddFile("foo.proto",
-          "syntax = \"proto2\";\n"
-          "import \"bar.proto\";\n");
-
-  EXPECT_TRUE(importer_.Import("foo.proto") == nullptr);
-  EXPECT_EQ(
-      "bar.proto:-1:0: File not found.\n"
-      "foo.proto:1:0: Import \"bar.proto\" was not found or had errors.\n",
-      error_collector_.text_);
-}
-
-TEST_F(ImporterTest, RecursiveImport) {
-  // Error:  Recursive import.
-  AddFile("recursive1.proto",
-          "syntax = \"proto2\";\n"
-          "\n"
-          "import \"recursive2.proto\";\n");
-  AddFile("recursive2.proto",
-          "syntax = \"proto2\";\n"
-          "import \"recursive1.proto\";\n");
-
-  EXPECT_TRUE(importer_.Import("recursive1.proto") == nullptr);
-  EXPECT_EQ(
-      "recursive1.proto:2:0: File recursively imports itself: "
-      "recursive1.proto "
-      "-> recursive2.proto -> recursive1.proto\n"
-      "recursive2.proto:1:0: Import \"recursive1.proto\" was not found "
-      "or had errors.\n"
-      "recursive1.proto:2:0: Import \"recursive2.proto\" was not found "
-      "or had errors.\n",
-      error_collector_.text_);
-}
-
-TEST_F(ImporterTest, RecursiveImportSelf) {
-  // Error:  Recursive import.
-  AddFile("recursive.proto",
-          "syntax = \"proto2\";\n"
-          "\n"
-          "import \"recursive.proto\";\n");
-
-  EXPECT_TRUE(importer_.Import("recursive.proto") == nullptr);
-  EXPECT_EQ(
-      "recursive.proto:2:0: File recursively imports itself: "
-      "recursive.proto -> recursive.proto\n",
-      error_collector_.text_);
-}
-
-TEST_F(ImporterTest, LiteRuntimeImport) {
-  // Error:  Recursive import.
-  AddFile("bar.proto",
-          "syntax = \"proto2\";\n"
-          "option optimize_for = LITE_RUNTIME;\n");
-  AddFile("foo.proto",
-          "syntax = \"proto2\";\n"
-          "import \"bar.proto\";\n");
-
-  EXPECT_TRUE(importer_.Import("foo.proto") == nullptr);
-  EXPECT_EQ(
-      "foo.proto:1:0: Files that do not use optimize_for = LITE_RUNTIME "
-      "cannot import files which do use this option.  This file is not "
-      "lite, but it imports \"bar.proto\" which is.\n",
-      error_collector_.text_);
-}
-
-
-// ===================================================================
-
-class DiskSourceTreeTest : public testing::Test {
- protected:
-  void SetUp() override {
-    dirnames_.push_back(TestTempDir() + "/test_proto2_import_path_1");
-    dirnames_.push_back(TestTempDir() + "/test_proto2_import_path_2");
-
-    for (int i = 0; i < dirnames_.size(); i++) {
-      if (FileExists(dirnames_[i])) {
-        File::DeleteRecursively(dirnames_[i], NULL, NULL);
-      }
-      GOOGLE_CHECK_OK(File::CreateDir(dirnames_[i], 0777));
-    }
-  }
-
-  void TearDown() override {
-    for (int i = 0; i < dirnames_.size(); i++) {
-      if (FileExists(dirnames_[i])) {
-        File::DeleteRecursively(dirnames_[i], NULL, NULL);
-      }
-    }
-  }
-
-  void AddFile(const std::string& filename, const char* contents) {
-    GOOGLE_CHECK_OK(File::SetContents(filename, contents, true));
-  }
-
-  void AddSubdir(const std::string& dirname) {
-    GOOGLE_CHECK_OK(File::CreateDir(dirname, 0777));
-  }
-
-  void ExpectFileContents(const std::string& filename,
-                          const char* expected_contents) {
-    std::unique_ptr<io::ZeroCopyInputStream> input(source_tree_.Open(filename));
-
-    ASSERT_FALSE(input == nullptr);
-
-    // Read all the data from the file.
-    std::string file_contents;
-    const void* data;
-    int size;
-    while (input->Next(&data, &size)) {
-      file_contents.append(reinterpret_cast<const char*>(data), size);
-    }
-
-    EXPECT_EQ(expected_contents, file_contents);
-  }
-
-  void ExpectCannotOpenFile(const std::string& filename,
-                            const std::string& error_message) {
-    std::unique_ptr<io::ZeroCopyInputStream> input(source_tree_.Open(filename));
-    EXPECT_TRUE(input == nullptr);
-    EXPECT_EQ(error_message, source_tree_.GetLastErrorMessage());
-  }
-
-  DiskSourceTree source_tree_;
-
-  // Paths of two on-disk directories to use during the test.
-  std::vector<std::string> dirnames_;
-};
-
-TEST_F(DiskSourceTreeTest, MapRoot) {
-  // Test opening a file in a directory that is mapped to the root of the
-  // source tree.
-  AddFile(dirnames_[0] + "/foo", "Hello World!");
-  source_tree_.MapPath("", dirnames_[0]);
-
-  ExpectFileContents("foo", "Hello World!");
-  ExpectCannotOpenFile("bar", "File not found.");
-}
-
-TEST_F(DiskSourceTreeTest, MapDirectory) {
-  // Test opening a file in a directory that is mapped to somewhere other
-  // than the root of the source tree.
-
-  AddFile(dirnames_[0] + "/foo", "Hello World!");
-  source_tree_.MapPath("baz", dirnames_[0]);
-
-  ExpectFileContents("baz/foo", "Hello World!");
-  ExpectCannotOpenFile("baz/bar", "File not found.");
-  ExpectCannotOpenFile("foo", "File not found.");
-  ExpectCannotOpenFile("bar", "File not found.");
-
-  // Non-canonical file names should not work.
-  ExpectCannotOpenFile("baz//foo",
-                       "Backslashes, consecutive slashes, \".\", or \"..\" are "
-                       "not allowed in the virtual path");
-  ExpectCannotOpenFile("baz/../baz/foo",
-                       "Backslashes, consecutive slashes, \".\", or \"..\" are "
-                       "not allowed in the virtual path");
-  ExpectCannotOpenFile("baz/./foo",
-                       "Backslashes, consecutive slashes, \".\", or \"..\" are "
-                       "not allowed in the virtual path");
-  ExpectCannotOpenFile("baz/foo/", "File not found.");
-}
-
-TEST_F(DiskSourceTreeTest, NoParent) {
-  // Test that we cannot open files in a parent of a mapped directory.
-
-  AddFile(dirnames_[0] + "/foo", "Hello World!");
-  AddSubdir(dirnames_[0] + "/bar");
-  AddFile(dirnames_[0] + "/bar/baz", "Blah.");
-  source_tree_.MapPath("", dirnames_[0] + "/bar");
-
-  ExpectFileContents("baz", "Blah.");
-  ExpectCannotOpenFile("../foo",
-                       "Backslashes, consecutive slashes, \".\", or \"..\" are "
-                       "not allowed in the virtual path");
-  ExpectCannotOpenFile("../bar/baz",
-                       "Backslashes, consecutive slashes, \".\", or \"..\" are "
-                       "not allowed in the virtual path");
-}
-
-TEST_F(DiskSourceTreeTest, MapFile) {
-  // Test opening a file that is mapped directly into the source tree.
-
-  AddFile(dirnames_[0] + "/foo", "Hello World!");
-  source_tree_.MapPath("foo", dirnames_[0] + "/foo");
-
-  ExpectFileContents("foo", "Hello World!");
-  ExpectCannotOpenFile("bar", "File not found.");
-}
-
-TEST_F(DiskSourceTreeTest, SearchMultipleDirectories) {
-  // Test mapping and searching multiple directories.
-
-  AddFile(dirnames_[0] + "/foo", "Hello World!");
-  AddFile(dirnames_[1] + "/foo", "This file should be hidden.");
-  AddFile(dirnames_[1] + "/bar", "Goodbye World!");
-  source_tree_.MapPath("", dirnames_[0]);
-  source_tree_.MapPath("", dirnames_[1]);
-
-  ExpectFileContents("foo", "Hello World!");
-  ExpectFileContents("bar", "Goodbye World!");
-  ExpectCannotOpenFile("baz", "File not found.");
-}
-
-TEST_F(DiskSourceTreeTest, OrderingTrumpsSpecificity) {
-  // Test that directories are always searched in order, even when a latter
-  // directory is more-specific than a former one.
-
-  // Create the "bar" directory so we can put a file in it.
-  GOOGLE_CHECK_OK(File::CreateDir(dirnames_[0] + "/bar", 0777));
-
-  // Add files and map paths.
-  AddFile(dirnames_[0] + "/bar/foo", "Hello World!");
-  AddFile(dirnames_[1] + "/foo", "This file should be hidden.");
-  source_tree_.MapPath("", dirnames_[0]);
-  source_tree_.MapPath("bar", dirnames_[1]);
-
-  // Check.
-  ExpectFileContents("bar/foo", "Hello World!");
-}
-
-TEST_F(DiskSourceTreeTest, DiskFileToVirtualFile) {
-  // Test DiskFileToVirtualFile.
-
-  AddFile(dirnames_[0] + "/foo", "Hello World!");
-  AddFile(dirnames_[1] + "/foo", "This file should be hidden.");
-  source_tree_.MapPath("bar", dirnames_[0]);
-  source_tree_.MapPath("bar", dirnames_[1]);
-
-  std::string virtual_file;
-  std::string shadowing_disk_file;
-
-  EXPECT_EQ(DiskSourceTree::NO_MAPPING,
-            source_tree_.DiskFileToVirtualFile("/foo", &virtual_file,
-                                               &shadowing_disk_file));
-
-  EXPECT_EQ(DiskSourceTree::SHADOWED,
-            source_tree_.DiskFileToVirtualFile(
-                dirnames_[1] + "/foo", &virtual_file, &shadowing_disk_file));
-  EXPECT_EQ("bar/foo", virtual_file);
-  EXPECT_EQ(dirnames_[0] + "/foo", shadowing_disk_file);
-
-  EXPECT_EQ(DiskSourceTree::CANNOT_OPEN,
-            source_tree_.DiskFileToVirtualFile(
-                dirnames_[1] + "/baz", &virtual_file, &shadowing_disk_file));
-  EXPECT_EQ("bar/baz", virtual_file);
-
-  EXPECT_EQ(DiskSourceTree::SUCCESS,
-            source_tree_.DiskFileToVirtualFile(
-                dirnames_[0] + "/foo", &virtual_file, &shadowing_disk_file));
-  EXPECT_EQ("bar/foo", virtual_file);
-}
-
-TEST_F(DiskSourceTreeTest, DiskFileToVirtualFileCanonicalization) {
-  // Test handling of "..", ".", etc. in DiskFileToVirtualFile().
-
-  source_tree_.MapPath("dir1", "..");
-  source_tree_.MapPath("dir2", "../../foo");
-  source_tree_.MapPath("dir3", "./foo/bar/.");
-  source_tree_.MapPath("dir4", ".");
-  source_tree_.MapPath("", "/qux");
-  source_tree_.MapPath("dir5", "/quux/");
-
-  std::string virtual_file;
-  std::string shadowing_disk_file;
-
-  // "../.." should not be considered to be under "..".
-  EXPECT_EQ(DiskSourceTree::NO_MAPPING,
-            source_tree_.DiskFileToVirtualFile("../../baz", &virtual_file,
-                                               &shadowing_disk_file));
-
-  // "/foo" is not mapped (it should not be misinterpreted as being under ".").
-  EXPECT_EQ(DiskSourceTree::NO_MAPPING,
-            source_tree_.DiskFileToVirtualFile("/foo", &virtual_file,
-                                               &shadowing_disk_file));
-
-#ifdef WIN32
-  // "C:\foo" is not mapped (it should not be misinterpreted as being under
-  // ".").
-  EXPECT_EQ(DiskSourceTree::NO_MAPPING,
-            source_tree_.DiskFileToVirtualFile("C:\\foo", &virtual_file,
-                                               &shadowing_disk_file));
-#endif  // WIN32
-
-  // But "../baz" should be.
-  EXPECT_EQ(DiskSourceTree::CANNOT_OPEN,
-            source_tree_.DiskFileToVirtualFile("../baz", &virtual_file,
-                                               &shadowing_disk_file));
-  EXPECT_EQ("dir1/baz", virtual_file);
-
-  // "../../foo/baz" is under "../../foo".
-  EXPECT_EQ(DiskSourceTree::CANNOT_OPEN,
-            source_tree_.DiskFileToVirtualFile("../../foo/baz", &virtual_file,
-                                               &shadowing_disk_file));
-  EXPECT_EQ("dir2/baz", virtual_file);
-
-  // "foo/./bar/baz" is under "./foo/bar/.".
-  EXPECT_EQ(DiskSourceTree::CANNOT_OPEN,
-            source_tree_.DiskFileToVirtualFile("foo/bar/baz", &virtual_file,
-                                               &shadowing_disk_file));
-  EXPECT_EQ("dir3/baz", virtual_file);
-
-  // "bar" is under ".".
-  EXPECT_EQ(DiskSourceTree::CANNOT_OPEN,
-            source_tree_.DiskFileToVirtualFile("bar", &virtual_file,
-                                               &shadowing_disk_file));
-  EXPECT_EQ("dir4/bar", virtual_file);
-
-  // "/qux/baz" is under "/qux".
-  EXPECT_EQ(DiskSourceTree::CANNOT_OPEN,
-            source_tree_.DiskFileToVirtualFile("/qux/baz", &virtual_file,
-                                               &shadowing_disk_file));
-  EXPECT_EQ("baz", virtual_file);
-
-  // "/quux/bar" is under "/quux".
-  EXPECT_EQ(DiskSourceTree::CANNOT_OPEN,
-            source_tree_.DiskFileToVirtualFile("/quux/bar", &virtual_file,
-                                               &shadowing_disk_file));
-  EXPECT_EQ("dir5/bar", virtual_file);
-}
-
-TEST_F(DiskSourceTreeTest, VirtualFileToDiskFile) {
-  // Test VirtualFileToDiskFile.
-
-  AddFile(dirnames_[0] + "/foo", "Hello World!");
-  AddFile(dirnames_[1] + "/foo", "This file should be hidden.");
-  AddFile(dirnames_[1] + "/quux", "This file should not be hidden.");
-  source_tree_.MapPath("bar", dirnames_[0]);
-  source_tree_.MapPath("bar", dirnames_[1]);
-
-  // Existent files, shadowed and non-shadowed case.
-  std::string disk_file;
-  EXPECT_TRUE(source_tree_.VirtualFileToDiskFile("bar/foo", &disk_file));
-  EXPECT_EQ(dirnames_[0] + "/foo", disk_file);
-  EXPECT_TRUE(source_tree_.VirtualFileToDiskFile("bar/quux", &disk_file));
-  EXPECT_EQ(dirnames_[1] + "/quux", disk_file);
-
-  // Nonexistent file in existent directory and vice versa.
-  std::string not_touched = "not touched";
-  EXPECT_FALSE(source_tree_.VirtualFileToDiskFile("bar/baz", &not_touched));
-  EXPECT_EQ("not touched", not_touched);
-  EXPECT_FALSE(source_tree_.VirtualFileToDiskFile("baz/foo", &not_touched));
-  EXPECT_EQ("not touched", not_touched);
-
-  // Accept NULL as output parameter.
-  EXPECT_TRUE(source_tree_.VirtualFileToDiskFile("bar/foo", nullptr));
-  EXPECT_FALSE(source_tree_.VirtualFileToDiskFile("baz/foo", nullptr));
-}
-
-}  // namespace
-
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/compiler/java/context.cc b/libs/protobuf/src/google/protobuf/compiler/java/context.cc
deleted file mode 100644
index cdc0d44..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/java/context.cc
+++ /dev/null
@@ -1,202 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <google/protobuf/compiler/java/context.h>
-
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/stubs/strutil.h>
-#include <google/protobuf/compiler/java/field.h>
-#include <google/protobuf/compiler/java/helpers.h>
-#include <google/protobuf/compiler/java/name_resolver.h>
-#include <google/protobuf/stubs/map_util.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace java {
-
-Context::Context(const FileDescriptor* file, const Options& options)
-    : name_resolver_(new ClassNameResolver), options_(options) {
-  InitializeFieldGeneratorInfo(file);
-}
-
-Context::~Context() {}
-
-ClassNameResolver* Context::GetNameResolver() const {
-  return name_resolver_.get();
-}
-
-namespace {
-// Whether two fields have conflicting accessors (assuming name1 and name2
-// are different). name1 and name2 are field1 and field2's camel-case name
-// respectively.
-bool IsConflicting(const FieldDescriptor* field1, const std::string& name1,
-                   const FieldDescriptor* field2, const std::string& name2,
-                   std::string* info) {
-  if (field1->is_repeated()) {
-    if (field2->is_repeated()) {
-      // Both fields are repeated.
-      return false;
-    } else {
-      // field1 is repeated, and field2 is not.
-      if (name1 + "Count" == name2) {
-        *info = "both repeated field \"" + field1->name() + "\" and singular " +
-                "field \"" + field2->name() + "\" generate the method \"" +
-                "get" + name1 + "Count()\"";
-        return true;
-      }
-      if (name1 + "List" == name2) {
-        *info = "both repeated field \"" + field1->name() + "\" and singular " +
-                "field \"" + field2->name() + "\" generate the method \"" +
-                "get" + name1 + "List()\"";
-        return true;
-      }
-      // Well, there are obviously many more conflicting cases, but it probably
-      // doesn't worth the effort to exhaust all of them because they rarely
-      // happen and as we are continuing adding new methods/changing existing
-      // methods the number of different conflicting cases will keep growing.
-      // We can just add more cases here when they are found in the real world.
-      return false;
-    }
-  } else {
-    if (field2->is_repeated()) {
-      return IsConflicting(field2, name2, field1, name1, info);
-    } else {
-      // None of the two fields are repeated.
-      return false;
-    }
-  }
-}
-}  // namespace
-
-void Context::InitializeFieldGeneratorInfo(const FileDescriptor* file) {
-  for (int i = 0; i < file->message_type_count(); ++i) {
-    InitializeFieldGeneratorInfoForMessage(file->message_type(i));
-  }
-}
-
-void Context::InitializeFieldGeneratorInfoForMessage(
-    const Descriptor* message) {
-  for (int i = 0; i < message->nested_type_count(); ++i) {
-    InitializeFieldGeneratorInfoForMessage(message->nested_type(i));
-  }
-  std::vector<const FieldDescriptor*> fields;
-  fields.reserve(message->field_count());
-  for (int i = 0; i < message->field_count(); ++i) {
-    fields.push_back(message->field(i));
-  }
-  InitializeFieldGeneratorInfoForFields(fields);
-
-  for (int i = 0; i < message->oneof_decl_count(); ++i) {
-    const OneofDescriptor* oneof = message->oneof_decl(i);
-    OneofGeneratorInfo info;
-    info.name = UnderscoresToCamelCase(oneof->name(), false);
-    info.capitalized_name = UnderscoresToCamelCase(oneof->name(), true);
-    oneof_generator_info_map_[oneof] = info;
-  }
-}
-
-void Context::InitializeFieldGeneratorInfoForFields(
-    const std::vector<const FieldDescriptor*>& fields) {
-  // Find out all fields that conflict with some other field in the same
-  // message.
-  std::vector<bool> is_conflict(fields.size());
-  std::vector<std::string> conflict_reason(fields.size());
-  for (int i = 0; i < fields.size(); ++i) {
-    const FieldDescriptor* field = fields[i];
-    const std::string& name = UnderscoresToCapitalizedCamelCase(field);
-    for (int j = i + 1; j < fields.size(); ++j) {
-      const FieldDescriptor* other = fields[j];
-      const std::string& other_name = UnderscoresToCapitalizedCamelCase(other);
-      if (name == other_name) {
-        is_conflict[i] = is_conflict[j] = true;
-        conflict_reason[i] = conflict_reason[j] =
-            "capitalized name of field \"" + field->name() +
-            "\" conflicts with field \"" + other->name() + "\"";
-      } else if (IsConflicting(field, name, other, other_name,
-                               &conflict_reason[j])) {
-        is_conflict[i] = is_conflict[j] = true;
-        conflict_reason[i] = conflict_reason[j];
-      }
-    }
-    if (is_conflict[i]) {
-      GOOGLE_LOG(WARNING) << "field \"" << field->full_name() << "\" is conflicting "
-                   << "with another field: " << conflict_reason[i];
-    }
-  }
-  for (int i = 0; i < fields.size(); ++i) {
-    const FieldDescriptor* field = fields[i];
-    FieldGeneratorInfo info;
-    info.name = CamelCaseFieldName(field);
-    info.capitalized_name = UnderscoresToCapitalizedCamelCase(field);
-    // For fields conflicting with some other fields, we append the field
-    // number to their field names in generated code to avoid conflicts.
-    if (is_conflict[i]) {
-      info.name += StrCat(field->number());
-      info.capitalized_name += StrCat(field->number());
-      info.disambiguated_reason = conflict_reason[i];
-    }
-    field_generator_info_map_[field] = info;
-  }
-}
-
-const FieldGeneratorInfo* Context::GetFieldGeneratorInfo(
-    const FieldDescriptor* field) const {
-  const FieldGeneratorInfo* result =
-      FindOrNull(field_generator_info_map_, field);
-  if (result == NULL) {
-    GOOGLE_LOG(FATAL) << "Can not find FieldGeneratorInfo for field: "
-               << field->full_name();
-  }
-  return result;
-}
-
-const OneofGeneratorInfo* Context::GetOneofGeneratorInfo(
-    const OneofDescriptor* oneof) const {
-  const OneofGeneratorInfo* result =
-      FindOrNull(oneof_generator_info_map_, oneof);
-  if (result == NULL) {
-    GOOGLE_LOG(FATAL) << "Can not find OneofGeneratorInfo for oneof: "
-               << oneof->name();
-  }
-  return result;
-}
-
-// Does this message class have generated parsing, serialization, and other
-// standard methods for which reflection-based fallback implementations exist?
-bool Context::HasGeneratedMethods(const Descriptor* descriptor) const {
-  return options_.enforce_lite ||
-         descriptor->file()->options().optimize_for() != FileOptions::CODE_SIZE;
-}
-
-}  // namespace java
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/compiler/java/context.h b/libs/protobuf/src/google/protobuf/compiler/java/context.h
deleted file mode 100644
index c224ab7..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/java/context.h
+++ /dev/null
@@ -1,113 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef GOOGLE_PROTOBUF_COMPILER_JAVA_CONTEXT_H__
-#define GOOGLE_PROTOBUF_COMPILER_JAVA_CONTEXT_H__
-
-#include <map>
-#include <memory>
-#include <vector>
-
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/compiler/java/options.h>
-
-namespace google {
-namespace protobuf {
-class FileDescriptor;
-class FieldDescriptor;
-class OneofDescriptor;
-class Descriptor;
-class EnumDescriptor;
-namespace compiler {
-namespace java {
-class ClassNameResolver;  // name_resolver.h
-}
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace java {
-
-struct FieldGeneratorInfo;
-struct OneofGeneratorInfo;
-// A context object holds the information that is shared among all code
-// generators.
-class Context {
- public:
-  Context(const FileDescriptor* file, const Options& options);
-  ~Context();
-
-  // Get the name resolver associated with this context. The resolver
-  // can be used to map descriptors to Java class names.
-  ClassNameResolver* GetNameResolver() const;
-
-  // Get the FieldGeneratorInfo for a given field.
-  const FieldGeneratorInfo* GetFieldGeneratorInfo(
-      const FieldDescriptor* field) const;
-
-  // Get the OneofGeneratorInfo for a given oneof.
-  const OneofGeneratorInfo* GetOneofGeneratorInfo(
-      const OneofDescriptor* oneof) const;
-
-  const Options& options() const { return options_; }
-
-  // Enforces all the files (including transitive dependencies) to use
-  // LiteRuntime.
-
-  bool EnforceLite() const { return options_.enforce_lite; }
-
-  // Does this message class have generated parsing, serialization, and other
-  // standard methods for which reflection-based fallback implementations exist?
-  bool HasGeneratedMethods(const Descriptor* descriptor) const;
-
- private:
-  void InitializeFieldGeneratorInfo(const FileDescriptor* file);
-  void InitializeFieldGeneratorInfoForMessage(const Descriptor* message);
-  void InitializeFieldGeneratorInfoForFields(
-      const std::vector<const FieldDescriptor*>& fields);
-
-  std::unique_ptr<ClassNameResolver> name_resolver_;
-  std::map<const FieldDescriptor*, FieldGeneratorInfo>
-      field_generator_info_map_;
-  std::map<const OneofDescriptor*, OneofGeneratorInfo>
-      oneof_generator_info_map_;
-  Options options_;
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(Context);
-};
-
-}  // namespace java
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // GOOGLE_PROTOBUF_COMPILER_JAVA_CONTEXT_H__
diff --git a/libs/protobuf/src/google/protobuf/compiler/java/doc_comment.cc b/libs/protobuf/src/google/protobuf/compiler/java/doc_comment.cc
deleted file mode 100644
index 066bff6..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/java/doc_comment.cc
+++ /dev/null
@@ -1,444 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-
-#include <google/protobuf/compiler/java/doc_comment.h>
-
-#include <vector>
-
-#include <google/protobuf/io/printer.h>
-#include <google/protobuf/stubs/strutil.h>
-#include <google/protobuf/descriptor.pb.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace java {
-
-std::string EscapeJavadoc(const std::string& input) {
-  std::string result;
-  result.reserve(input.size() * 2);
-
-  char prev = '*';
-
-  for (std::string::size_type i = 0; i < input.size(); i++) {
-    char c = input[i];
-    switch (c) {
-      case '*':
-        // Avoid "/*".
-        if (prev == '/') {
-          result.append("&#42;");
-        } else {
-          result.push_back(c);
-        }
-        break;
-      case '/':
-        // Avoid "*/".
-        if (prev == '*') {
-          result.append("&#47;");
-        } else {
-          result.push_back(c);
-        }
-        break;
-      case '@':
-        // '@' starts javadoc tags including the @deprecated tag, which will
-        // cause a compile-time error if inserted before a declaration that
-        // does not have a corresponding @Deprecated annotation.
-        result.append("&#64;");
-        break;
-      case '<':
-        // Avoid interpretation as HTML.
-        result.append("&lt;");
-        break;
-      case '>':
-        // Avoid interpretation as HTML.
-        result.append("&gt;");
-        break;
-      case '&':
-        // Avoid interpretation as HTML.
-        result.append("&amp;");
-        break;
-      case '\\':
-        // Java interprets Unicode escape sequences anywhere!
-        result.append("&#92;");
-        break;
-      default:
-        result.push_back(c);
-        break;
-    }
-
-    prev = c;
-  }
-
-  return result;
-}
-
-static void WriteDocCommentBodyForLocation(io::Printer* printer,
-                                           const SourceLocation& location) {
-  std::string comments = location.leading_comments.empty()
-                             ? location.trailing_comments
-                             : location.leading_comments;
-  if (!comments.empty()) {
-    // TODO(kenton):  Ideally we should parse the comment text as Markdown and
-    //   write it back as HTML, but this requires a Markdown parser.  For now
-    //   we just use <pre> to get fixed-width text formatting.
-
-    // If the comment itself contains block comment start or end markers,
-    // HTML-escape them so that they don't accidentally close the doc comment.
-    comments = EscapeJavadoc(comments);
-
-    std::vector<std::string> lines = Split(comments, "\n");
-    while (!lines.empty() && lines.back().empty()) {
-      lines.pop_back();
-    }
-
-    printer->Print(" * <pre>\n");
-    for (int i = 0; i < lines.size(); i++) {
-      // Most lines should start with a space.  Watch out for lines that start
-      // with a /, since putting that right after the leading asterisk will
-      // close the comment.
-      if (!lines[i].empty() && lines[i][0] == '/') {
-        printer->Print(" * $line$\n", "line", lines[i]);
-      } else {
-        printer->Print(" *$line$\n", "line", lines[i]);
-      }
-    }
-    printer->Print(
-        " * </pre>\n"
-        " *\n");
-  }
-}
-
-template <typename DescriptorType>
-static void WriteDocCommentBody(io::Printer* printer,
-                                const DescriptorType* descriptor) {
-  SourceLocation location;
-  if (descriptor->GetSourceLocation(&location)) {
-    WriteDocCommentBodyForLocation(printer, location);
-  }
-}
-
-static std::string FirstLineOf(const std::string& value) {
-  std::string result = value;
-
-  std::string::size_type pos = result.find_first_of('\n');
-  if (pos != std::string::npos) {
-    result.erase(pos);
-  }
-
-  // If line ends in an opening brace, make it "{ ... }" so it looks nice.
-  if (!result.empty() && result[result.size() - 1] == '{') {
-    result.append(" ... }");
-  }
-
-  return result;
-}
-
-void WriteMessageDocComment(io::Printer* printer, const Descriptor* message) {
-  printer->Print("/**\n");
-  WriteDocCommentBody(printer, message);
-  printer->Print(
-      " * Protobuf type {@code $fullname$}\n"
-      " */\n",
-      "fullname", EscapeJavadoc(message->full_name()));
-}
-
-void WriteFieldDocComment(io::Printer* printer, const FieldDescriptor* field) {
-  // We start the comment with the main body based on the comments from the
-  // .proto file (if present). We then continue with the field declaration,
-  // e.g.:
-  //   optional string foo = 5;
-  // And then we end with the javadoc tags if applicable.
-  // If the field is a group, the debug string might end with {.
-  printer->Print("/**\n");
-  WriteDocCommentBody(printer, field);
-  printer->Print(" * <code>$def$</code>\n", "def",
-                 EscapeJavadoc(FirstLineOf(field->DebugString())));
-  printer->Print(" */\n");
-}
-
-void WriteDeprecatedJavadoc(io::Printer* printer, const FieldDescriptor* field,
-                            const FieldAccessorType type) {
-  if (!field->options().deprecated()) {
-    return;
-  }
-
-  // Lite codegen does not annotate set & clear methods with @Deprecated.
-  if (field->file()->options().optimize_for() == FileOptions::LITE_RUNTIME &&
-      (type == SETTER || type == CLEARER)) {
-    return;
-  }
-
-  std::string startLine = "0";
-  SourceLocation location;
-  if (field->GetSourceLocation(&location)) {
-    startLine = std::to_string(location.start_line);
-  }
-
-  printer->Print(" * @deprecated $name$ is deprecated.\n", "name",
-                 field->full_name());
-  printer->Print(" *     See $file$;l=$line$\n", "file", field->file()->name(),
-                 "line", startLine);
-}
-
-void WriteFieldAccessorDocComment(io::Printer* printer,
-                                  const FieldDescriptor* field,
-                                  const FieldAccessorType type,
-                                  const bool builder) {
-  printer->Print("/**\n");
-  WriteDocCommentBody(printer, field);
-  printer->Print(" * <code>$def$</code>\n", "def",
-                 EscapeJavadoc(FirstLineOf(field->DebugString())));
-  WriteDeprecatedJavadoc(printer, field, type);
-  switch (type) {
-    case HAZZER:
-      printer->Print(" * @return Whether the $name$ field is set.\n", "name",
-                     field->camelcase_name());
-      break;
-    case GETTER:
-      printer->Print(" * @return The $name$.\n", "name",
-                     field->camelcase_name());
-      break;
-    case SETTER:
-      printer->Print(" * @param value The $name$ to set.\n", "name",
-                     field->camelcase_name());
-      break;
-    case CLEARER:
-      // Print nothing
-      break;
-    // Repeated
-    case LIST_COUNT:
-      printer->Print(" * @return The count of $name$.\n", "name",
-                     field->camelcase_name());
-      break;
-    case LIST_GETTER:
-      printer->Print(" * @return A list containing the $name$.\n", "name",
-                     field->camelcase_name());
-      break;
-    case LIST_INDEXED_GETTER:
-      printer->Print(" * @param index The index of the element to return.\n");
-      printer->Print(" * @return The $name$ at the given index.\n", "name",
-                     field->camelcase_name());
-      break;
-    case LIST_INDEXED_SETTER:
-      printer->Print(" * @param index The index to set the value at.\n");
-      printer->Print(" * @param value The $name$ to set.\n", "name",
-                     field->camelcase_name());
-      break;
-    case LIST_ADDER:
-      printer->Print(" * @param value The $name$ to add.\n", "name",
-                     field->camelcase_name());
-      break;
-    case LIST_MULTI_ADDER:
-      printer->Print(" * @param values The $name$ to add.\n", "name",
-                     field->camelcase_name());
-      break;
-  }
-  if (builder) {
-    printer->Print(" * @return This builder for chaining.\n");
-  }
-  printer->Print(" */\n");
-}
-
-void WriteFieldEnumValueAccessorDocComment(io::Printer* printer,
-                                           const FieldDescriptor* field,
-                                           const FieldAccessorType type,
-                                           const bool builder) {
-  printer->Print("/**\n");
-  WriteDocCommentBody(printer, field);
-  printer->Print(" * <code>$def$</code>\n", "def",
-                 EscapeJavadoc(FirstLineOf(field->DebugString())));
-  WriteDeprecatedJavadoc(printer, field, type);
-  switch (type) {
-    case HAZZER:
-      // Should never happen
-      break;
-    case GETTER:
-      printer->Print(
-          " * @return The enum numeric value on the wire for $name$.\n", "name",
-          field->camelcase_name());
-      break;
-    case SETTER:
-      printer->Print(
-          " * @param value The enum numeric value on the wire for $name$ to "
-          "set.\n",
-          "name", field->camelcase_name());
-      break;
-    case CLEARER:
-      // Print nothing
-      break;
-    // Repeated
-    case LIST_COUNT:
-      // Should never happen
-      break;
-    case LIST_GETTER:
-      printer->Print(
-          " * @return A list containing the enum numeric values on the wire "
-          "for $name$.\n",
-          "name", field->camelcase_name());
-      break;
-    case LIST_INDEXED_GETTER:
-      printer->Print(" * @param index The index of the value to return.\n");
-      printer->Print(
-          " * @return The enum numeric value on the wire of $name$ at the "
-          "given index.\n",
-          "name", field->camelcase_name());
-      break;
-    case LIST_INDEXED_SETTER:
-      printer->Print(" * @param index The index to set the value at.\n");
-      printer->Print(
-          " * @param value The enum numeric value on the wire for $name$ to "
-          "set.\n",
-          "name", field->camelcase_name());
-      break;
-    case LIST_ADDER:
-      printer->Print(
-          " * @param value The enum numeric value on the wire for $name$ to "
-          "add.\n",
-          "name", field->camelcase_name());
-      break;
-    case LIST_MULTI_ADDER:
-      printer->Print(
-          " * @param values The enum numeric values on the wire for $name$ to "
-          "add.\n",
-          "name", field->camelcase_name());
-      break;
-  }
-  if (builder) {
-    printer->Print(" * @return This builder for chaining.\n");
-  }
-  printer->Print(" */\n");
-}
-
-void WriteFieldStringBytesAccessorDocComment(io::Printer* printer,
-                                             const FieldDescriptor* field,
-                                             const FieldAccessorType type,
-                                             const bool builder) {
-  printer->Print("/**\n");
-  WriteDocCommentBody(printer, field);
-  printer->Print(" * <code>$def$</code>\n", "def",
-                 EscapeJavadoc(FirstLineOf(field->DebugString())));
-  WriteDeprecatedJavadoc(printer, field, type);
-  switch (type) {
-    case HAZZER:
-      // Should never happen
-      break;
-    case GETTER:
-      printer->Print(" * @return The bytes for $name$.\n", "name",
-                     field->camelcase_name());
-      break;
-    case SETTER:
-      printer->Print(" * @param value The bytes for $name$ to set.\n", "name",
-                     field->camelcase_name());
-      break;
-    case CLEARER:
-      // Print nothing
-      break;
-    // Repeated
-    case LIST_COUNT:
-      // Should never happen
-      break;
-    case LIST_GETTER:
-      printer->Print(" * @return A list containing the bytes for $name$.\n",
-                     "name", field->camelcase_name());
-      break;
-    case LIST_INDEXED_GETTER:
-      printer->Print(" * @param index The index of the value to return.\n");
-      printer->Print(" * @return The bytes of the $name$ at the given index.\n",
-                     "name", field->camelcase_name());
-      break;
-    case LIST_INDEXED_SETTER:
-      printer->Print(" * @param index The index to set the value at.\n");
-      printer->Print(" * @param value The bytes of the $name$ to set.\n",
-                     "name", field->camelcase_name());
-      break;
-    case LIST_ADDER:
-      printer->Print(" * @param value The bytes of the $name$ to add.\n",
-                     "name", field->camelcase_name());
-      break;
-    case LIST_MULTI_ADDER:
-      printer->Print(" * @param values The bytes of the $name$ to add.\n",
-                     "name", field->camelcase_name());
-      break;
-  }
-  if (builder) {
-    printer->Print(" * @return This builder for chaining.\n");
-  }
-  printer->Print(" */\n");
-}
-
-// Enum
-
-void WriteEnumDocComment(io::Printer* printer, const EnumDescriptor* enum_) {
-  printer->Print("/**\n");
-  WriteDocCommentBody(printer, enum_);
-  printer->Print(
-      " * Protobuf enum {@code $fullname$}\n"
-      " */\n",
-      "fullname", EscapeJavadoc(enum_->full_name()));
-}
-
-void WriteEnumValueDocComment(io::Printer* printer,
-                              const EnumValueDescriptor* value) {
-  printer->Print("/**\n");
-  WriteDocCommentBody(printer, value);
-  printer->Print(
-      " * <code>$def$</code>\n"
-      " */\n",
-      "def", EscapeJavadoc(FirstLineOf(value->DebugString())));
-}
-
-void WriteServiceDocComment(io::Printer* printer,
-                            const ServiceDescriptor* service) {
-  printer->Print("/**\n");
-  WriteDocCommentBody(printer, service);
-  printer->Print(
-      " * Protobuf service {@code $fullname$}\n"
-      " */\n",
-      "fullname", EscapeJavadoc(service->full_name()));
-}
-
-void WriteMethodDocComment(io::Printer* printer,
-                           const MethodDescriptor* method) {
-  printer->Print("/**\n");
-  WriteDocCommentBody(printer, method);
-  printer->Print(
-      " * <code>$def$</code>\n"
-      " */\n",
-      "def", EscapeJavadoc(FirstLineOf(method->DebugString())));
-}
-
-}  // namespace java
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/compiler/java/doc_comment.h b/libs/protobuf/src/google/protobuf/compiler/java/doc_comment.h
deleted file mode 100644
index 7f68778..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/java/doc_comment.h
+++ /dev/null
@@ -1,102 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-
-#ifndef GOOGLE_PROTOBUF_COMPILER_JAVA_DOC_COMMENT_H__
-#define GOOGLE_PROTOBUF_COMPILER_JAVA_DOC_COMMENT_H__
-
-#include <google/protobuf/descriptor.h>
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-namespace io {
-class Printer;  // printer.h
-}
-}  // namespace protobuf
-}  // namespace google
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace java {
-
-enum FieldAccessorType {
-  HAZZER,
-  GETTER,
-  SETTER,
-  CLEARER,
-  // Repeated
-  LIST_COUNT,
-  LIST_GETTER,
-  LIST_INDEXED_GETTER,
-  LIST_INDEXED_SETTER,
-  LIST_ADDER,
-  LIST_MULTI_ADDER
-};
-
-void WriteMessageDocComment(io::Printer* printer, const Descriptor* message);
-void WriteFieldDocComment(io::Printer* printer, const FieldDescriptor* field);
-void WriteFieldAccessorDocComment(io::Printer* printer,
-                                  const FieldDescriptor* field,
-                                  const FieldAccessorType type,
-                                  const bool builder = false);
-void WriteFieldEnumValueAccessorDocComment(io::Printer* printer,
-                                           const FieldDescriptor* field,
-                                           const FieldAccessorType type,
-                                           const bool builder = false);
-void WriteFieldStringBytesAccessorDocComment(io::Printer* printer,
-                                             const FieldDescriptor* field,
-                                             const FieldAccessorType type,
-                                             const bool builder = false);
-void WriteEnumDocComment(io::Printer* printer, const EnumDescriptor* enum_);
-void WriteEnumValueDocComment(io::Printer* printer,
-                              const EnumValueDescriptor* value);
-void WriteServiceDocComment(io::Printer* printer,
-                            const ServiceDescriptor* service);
-void WriteMethodDocComment(io::Printer* printer,
-                           const MethodDescriptor* method);
-
-// Exposed for testing only.
-PROTOC_EXPORT std::string EscapeJavadoc(const std::string& input);
-
-}  // namespace java
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
-
-#endif  // GOOGLE_PROTOBUF_COMPILER_JAVA_DOC_COMMENT_H__
diff --git a/libs/protobuf/src/google/protobuf/compiler/java/doc_comment_unittest.cc b/libs/protobuf/src/google/protobuf/compiler/java/doc_comment_unittest.cc
deleted file mode 100644
index 3fcdf07..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/java/doc_comment_unittest.cc
+++ /dev/null
@@ -1,56 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-
-#include <google/protobuf/compiler/java/doc_comment.h>
-
-#include <gtest/gtest.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace java {
-namespace {
-
-TEST(JavaDocCommentTest, Escaping) {
-  EXPECT_EQ("foo /&#42; bar *&#47; baz", EscapeJavadoc("foo /* bar */ baz"));
-  EXPECT_EQ("foo /&#42;&#47; baz", EscapeJavadoc("foo /*/ baz"));
-  EXPECT_EQ("{&#64;foo}", EscapeJavadoc("{@foo}"));
-  EXPECT_EQ("&lt;i&gt;&amp;&lt;/i&gt;", EscapeJavadoc("<i>&</i>"));
-  EXPECT_EQ("foo&#92;u1234bar", EscapeJavadoc("foo\\u1234bar"));
-  EXPECT_EQ("&#64;deprecated", EscapeJavadoc("@deprecated"));
-}
-
-}  // namespace
-}  // namespace java
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/compiler/java/enum.cc b/libs/protobuf/src/google/protobuf/compiler/java/enum.cc
deleted file mode 100644
index 0cab93c..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/java/enum.cc
+++ /dev/null
@@ -1,397 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-
-#include <google/protobuf/compiler/java/enum.h>
-
-#include <map>
-#include <string>
-
-#include <google/protobuf/io/printer.h>
-#include <google/protobuf/stubs/strutil.h>
-#include <google/protobuf/compiler/java/context.h>
-#include <google/protobuf/compiler/java/doc_comment.h>
-#include <google/protobuf/compiler/java/helpers.h>
-#include <google/protobuf/compiler/java/name_resolver.h>
-#include <google/protobuf/descriptor.pb.h>
-
-// Must be last.
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace java {
-
-EnumGenerator::EnumGenerator(const EnumDescriptor* descriptor,
-                             bool immutable_api, Context* context)
-    : descriptor_(descriptor),
-      immutable_api_(immutable_api),
-      context_(context),
-      name_resolver_(context->GetNameResolver()) {
-  for (int i = 0; i < descriptor_->value_count(); i++) {
-    const EnumValueDescriptor* value = descriptor_->value(i);
-    const EnumValueDescriptor* canonical_value =
-        descriptor_->FindValueByNumber(value->number());
-
-    if (value == canonical_value) {
-      canonical_values_.push_back(value);
-    } else {
-      Alias alias;
-      alias.value = value;
-      alias.canonical_value = canonical_value;
-      aliases_.push_back(alias);
-    }
-  }
-}
-
-EnumGenerator::~EnumGenerator() {}
-
-void EnumGenerator::Generate(io::Printer* printer) {
-  WriteEnumDocComment(printer, descriptor_);
-  MaybePrintGeneratedAnnotation(context_, printer, descriptor_, immutable_api_);
-  printer->Print(
-      "$deprecation$public enum $classname$\n"
-      "    implements com.google.protobuf.ProtocolMessageEnum {\n",
-      "classname", descriptor_->name(), "deprecation",
-      descriptor_->options().deprecated() ? "@java.lang.Deprecated " : "");
-  printer->Annotate("classname", descriptor_);
-  printer->Indent();
-
-  bool ordinal_is_index = true;
-  std::string index_text = "ordinal()";
-  for (int i = 0; i < canonical_values_.size(); i++) {
-    if (canonical_values_[i]->index() != i) {
-      ordinal_is_index = false;
-      index_text = "index";
-      break;
-    }
-  }
-
-  for (int i = 0; i < canonical_values_.size(); i++) {
-    std::map<std::string, std::string> vars;
-    vars["name"] = canonical_values_[i]->name();
-    vars["index"] = StrCat(canonical_values_[i]->index());
-    vars["number"] = StrCat(canonical_values_[i]->number());
-    WriteEnumValueDocComment(printer, canonical_values_[i]);
-    if (canonical_values_[i]->options().deprecated()) {
-      printer->Print("@java.lang.Deprecated\n");
-    }
-    if (ordinal_is_index) {
-      printer->Print(vars, "$name$($number$),\n");
-    } else {
-      printer->Print(vars, "$name$($index$, $number$),\n");
-    }
-    printer->Annotate("name", canonical_values_[i]);
-  }
-
-  if (SupportUnknownEnumValue(descriptor_->file())) {
-    if (ordinal_is_index) {
-      printer->Print("${$UNRECOGNIZED$}$(-1),\n", "{", "", "}", "");
-    } else {
-      printer->Print("${$UNRECOGNIZED$}$(-1, -1),\n", "{", "", "}", "");
-    }
-    printer->Annotate("{", "}", descriptor_);
-  }
-
-  printer->Print(
-      ";\n"
-      "\n");
-
-  // -----------------------------------------------------------------
-
-  for (int i = 0; i < aliases_.size(); i++) {
-    std::map<std::string, std::string> vars;
-    vars["classname"] = descriptor_->name();
-    vars["name"] = aliases_[i].value->name();
-    vars["canonical_name"] = aliases_[i].canonical_value->name();
-    WriteEnumValueDocComment(printer, aliases_[i].value);
-    printer->Print(
-        vars, "public static final $classname$ $name$ = $canonical_name$;\n");
-    printer->Annotate("name", aliases_[i].value);
-  }
-
-  for (int i = 0; i < descriptor_->value_count(); i++) {
-    std::map<std::string, std::string> vars;
-    vars["name"] = descriptor_->value(i)->name();
-    vars["number"] = StrCat(descriptor_->value(i)->number());
-    vars["{"] = "";
-    vars["}"] = "";
-    vars["deprecation"] = descriptor_->value(i)->options().deprecated()
-                              ? "@java.lang.Deprecated "
-                              : "";
-    WriteEnumValueDocComment(printer, descriptor_->value(i));
-    printer->Print(vars,
-                   "$deprecation$public static final int ${$$name$_VALUE$}$ = "
-                   "$number$;\n");
-    printer->Annotate("{", "}", descriptor_->value(i));
-  }
-  printer->Print("\n");
-
-  // -----------------------------------------------------------------
-
-  printer->Print(
-      "\n"
-      "public final int getNumber() {\n");
-  if (SupportUnknownEnumValue(descriptor_->file())) {
-    if (ordinal_is_index) {
-      printer->Print(
-          "  if (this == UNRECOGNIZED) {\n"
-          "    throw new java.lang.IllegalArgumentException(\n"
-          "        \"Can't get the number of an unknown enum value.\");\n"
-          "  }\n");
-    } else {
-      printer->Print(
-          "  if (index == -1) {\n"
-          "    throw new java.lang.IllegalArgumentException(\n"
-          "        \"Can't get the number of an unknown enum value.\");\n"
-          "  }\n");
-    }
-  }
-  printer->Print(
-      "  return value;\n"
-      "}\n"
-      "\n"
-      "/**\n"
-      " * @param value The numeric wire value of the corresponding enum "
-      "entry.\n"
-      " * @return The enum associated with the given numeric wire value.\n"
-      " * @deprecated Use {@link #forNumber(int)} instead.\n"
-      " */\n"
-      "@java.lang.Deprecated\n"
-      "public static $classname$ valueOf(int value) {\n"
-      "  return forNumber(value);\n"
-      "}\n"
-      "\n"
-      "/**\n"
-      " * @param value The numeric wire value of the corresponding enum "
-      "entry.\n"
-      " * @return The enum associated with the given numeric wire value.\n"
-      " */\n"
-      "public static $classname$ forNumber(int value) {\n"
-      "  switch (value) {\n",
-      "classname", descriptor_->name());
-  printer->Indent();
-  printer->Indent();
-
-  for (int i = 0; i < canonical_values_.size(); i++) {
-    printer->Print("case $number$: return $name$;\n", "name",
-                   canonical_values_[i]->name(), "number",
-                   StrCat(canonical_values_[i]->number()));
-  }
-
-  printer->Outdent();
-  printer->Outdent();
-  printer->Print(
-      "    default: return null;\n"
-      "  }\n"
-      "}\n"
-      "\n"
-      "public static com.google.protobuf.Internal.EnumLiteMap<$classname$>\n"
-      "    internalGetValueMap() {\n"
-      "  return internalValueMap;\n"
-      "}\n"
-      "private static final com.google.protobuf.Internal.EnumLiteMap<\n"
-      "    $classname$> internalValueMap =\n"
-      "      new com.google.protobuf.Internal.EnumLiteMap<$classname$>() {\n"
-      "        public $classname$ findValueByNumber(int number) {\n"
-      "          return $classname$.forNumber(number);\n"
-      "        }\n"
-      "      };\n"
-      "\n",
-      "classname", descriptor_->name());
-
-  // -----------------------------------------------------------------
-  // Reflection
-
-  if (HasDescriptorMethods(descriptor_, context_->EnforceLite())) {
-    printer->Print(
-        "public final com.google.protobuf.Descriptors.EnumValueDescriptor\n"
-        "    getValueDescriptor() {\n");
-    if (SupportUnknownEnumValue(descriptor_->file())) {
-      if (ordinal_is_index) {
-        printer->Print(
-            "  if (this == UNRECOGNIZED) {\n"
-            "    throw new java.lang.IllegalStateException(\n"
-            "        \"Can't get the descriptor of an unrecognized enum "
-            "value.\");\n"
-            "  }\n");
-      } else {
-        printer->Print(
-            "  if (index == -1) {\n"
-            "    throw new java.lang.IllegalStateException(\n"
-            "        \"Can't get the descriptor of an unrecognized enum "
-            "value.\");\n"
-            "  }\n");
-      }
-    }
-    printer->Print(
-        "  return getDescriptor().getValues().get($index_text$);\n"
-        "}\n"
-        "public final com.google.protobuf.Descriptors.EnumDescriptor\n"
-        "    getDescriptorForType() {\n"
-        "  return getDescriptor();\n"
-        "}\n"
-        "public static final com.google.protobuf.Descriptors.EnumDescriptor\n"
-        "    getDescriptor() {\n",
-        "index_text", index_text);
-
-    // TODO(kenton):  Cache statically?  Note that we can't access descriptors
-    //   at module init time because it wouldn't work with descriptor.proto, but
-    //   we can cache the value the first time getDescriptor() is called.
-    if (descriptor_->containing_type() == NULL) {
-      // The class generated for the File fully populates the descriptor with
-      // extensions in both the mutable and immutable cases. (In the mutable api
-      // this is accomplished by attempting to load the immutable outer class).
-      printer->Print(
-          "  return $file$.getDescriptor().getEnumTypes().get($index$);\n",
-          "file",
-          name_resolver_->GetClassName(descriptor_->file(), immutable_api_),
-          "index", StrCat(descriptor_->index()));
-    } else {
-      printer->Print(
-          "  return $parent$.$descriptor$.getEnumTypes().get($index$);\n",
-          "parent",
-          name_resolver_->GetClassName(descriptor_->containing_type(),
-                                       immutable_api_),
-          "descriptor",
-          descriptor_->containing_type()
-                  ->options()
-                  .no_standard_descriptor_accessor()
-              ? "getDefaultInstance().getDescriptorForType()"
-              : "getDescriptor()",
-          "index", StrCat(descriptor_->index()));
-    }
-
-    printer->Print(
-        "}\n"
-        "\n"
-        "private static final $classname$[] VALUES = ",
-        "classname", descriptor_->name());
-
-    if (CanUseEnumValues()) {
-      // If the constants we are going to output are exactly the ones we
-      // have declared in the Java enum in the same order, then we can use
-      // the values() method that the Java compiler automatically generates
-      // for every enum.
-      printer->Print("values();\n");
-    } else {
-      printer->Print("getStaticValuesArray();\n");
-      printer->Print("private static $classname$[] getStaticValuesArray() {\n",
-                     "classname", descriptor_->name());
-      printer->Indent();
-      printer->Print(
-          "return new $classname$[] {\n"
-          "  ",
-          "classname", descriptor_->name());
-      for (int i = 0; i < descriptor_->value_count(); i++) {
-        printer->Print("$name$, ", "name", descriptor_->value(i)->name());
-      }
-      printer->Print(
-          "\n"
-          "};\n");
-      printer->Outdent();
-      printer->Print("}");
-    }
-
-    printer->Print(
-        "\n"
-        "public static $classname$ valueOf(\n"
-        "    com.google.protobuf.Descriptors.EnumValueDescriptor desc) {\n"
-        "  if (desc.getType() != getDescriptor()) {\n"
-        "    throw new java.lang.IllegalArgumentException(\n"
-        "      \"EnumValueDescriptor is not for this type.\");\n"
-        "  }\n",
-        "classname", descriptor_->name());
-    if (SupportUnknownEnumValue(descriptor_->file())) {
-      printer->Print(
-          "  if (desc.getIndex() == -1) {\n"
-          "    return UNRECOGNIZED;\n"
-          "  }\n");
-    }
-    printer->Print(
-        "  return VALUES[desc.getIndex()];\n"
-        "}\n"
-        "\n");
-
-    if (!ordinal_is_index) {
-      printer->Print("private final int index;\n");
-    }
-  }
-
-  // -----------------------------------------------------------------
-
-  printer->Print("private final int value;\n\n");
-
-  if (ordinal_is_index) {
-    printer->Print("private $classname$(int value) {\n", "classname",
-                   descriptor_->name());
-  } else {
-    printer->Print("private $classname$(int index, int value) {\n", "classname",
-                   descriptor_->name());
-  }
-  if (HasDescriptorMethods(descriptor_, context_->EnforceLite()) &&
-      !ordinal_is_index) {
-    printer->Print("  this.index = index;\n");
-  }
-  printer->Print(
-      "  this.value = value;\n"
-      "}\n");
-
-  printer->Print(
-      "\n"
-      "// @@protoc_insertion_point(enum_scope:$full_name$)\n",
-      "full_name", descriptor_->full_name());
-
-  printer->Outdent();
-  printer->Print("}\n\n");
-}
-
-bool EnumGenerator::CanUseEnumValues() {
-  if (canonical_values_.size() != descriptor_->value_count()) {
-    return false;
-  }
-  for (int i = 0; i < descriptor_->value_count(); i++) {
-    if (descriptor_->value(i)->name() != canonical_values_[i]->name()) {
-      return false;
-    }
-  }
-  return true;
-}
-
-}  // namespace java
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
diff --git a/libs/protobuf/src/google/protobuf/compiler/java/enum.h b/libs/protobuf/src/google/protobuf/compiler/java/enum.h
deleted file mode 100644
index 0a2c363..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/java/enum.h
+++ /dev/null
@@ -1,100 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-
-#ifndef GOOGLE_PROTOBUF_COMPILER_JAVA_ENUM_H__
-#define GOOGLE_PROTOBUF_COMPILER_JAVA_ENUM_H__
-
-#include <string>
-#include <vector>
-#include <google/protobuf/descriptor.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace java {
-class Context;            // context.h
-class ClassNameResolver;  // name_resolver.h
-}  // namespace java
-}  // namespace compiler
-namespace io {
-class Printer;  // printer.h
-}
-}  // namespace protobuf
-}  // namespace google
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace java {
-
-class EnumGenerator {
- public:
-  EnumGenerator(const EnumDescriptor* descriptor, bool immutable_api,
-                Context* context);
-  ~EnumGenerator();
-
-  void Generate(io::Printer* printer);
-
- private:
-  const EnumDescriptor* descriptor_;
-
-  // The proto language allows multiple enum constants to have the same
-  // numeric value.  Java, however, does not allow multiple enum constants to
-  // be considered equivalent.  We treat the first defined constant for any
-  // given numeric value as "canonical" and the rest as aliases of that
-  // canonical value.
-  std::vector<const EnumValueDescriptor*> canonical_values_;
-
-  struct Alias {
-    const EnumValueDescriptor* value;
-    const EnumValueDescriptor* canonical_value;
-  };
-  std::vector<Alias> aliases_;
-
-  bool immutable_api_;
-
-  Context* context_;
-  ClassNameResolver* name_resolver_;
-
-  bool CanUseEnumValues();
-
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(EnumGenerator);
-};
-
-}  // namespace java
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // GOOGLE_PROTOBUF_COMPILER_JAVA_ENUM_H__
diff --git a/libs/protobuf/src/google/protobuf/compiler/java/enum_field.cc b/libs/protobuf/src/google/protobuf/compiler/java/enum_field.cc
deleted file mode 100644
index e64ee5b..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/java/enum_field.cc
+++ /dev/null
@@ -1,1150 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-
-#include "google/protobuf/compiler/java/enum_field.h"
-
-#include <cstdint>
-#include <map>
-#include <string>
-
-#include "google/protobuf/stubs/logging.h"
-#include "google/protobuf/stubs/common.h"
-#include "google/protobuf/io/printer.h"
-#include "google/protobuf/wire_format.h"
-#include "google/protobuf/stubs/strutil.h"
-#include "google/protobuf/compiler/java/context.h"
-#include "google/protobuf/compiler/java/doc_comment.h"
-#include "google/protobuf/compiler/java/helpers.h"
-#include "google/protobuf/compiler/java/name_resolver.h"
-
-// Must be last.
-#include "google/protobuf/port_def.inc"
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace java {
-
-namespace {
-
-void SetEnumVariables(
-    const FieldDescriptor* descriptor, int messageBitIndex, int builderBitIndex,
-    const FieldGeneratorInfo* info, ClassNameResolver* name_resolver,
-    std::map<std::string, std::string>* variables,
-    Context* context) {
-  SetCommonFieldVariables(descriptor, info, variables);
-
-  (*variables)["type"] =
-      name_resolver->GetImmutableClassName(descriptor->enum_type());
-  (*variables)["kt_type"] = (*variables)["type"];
-  (*variables)["mutable_type"] =
-      name_resolver->GetMutableClassName(descriptor->enum_type());
-  (*variables)["default"] = ImmutableDefaultValue(descriptor, name_resolver);
-  (*variables)["default_number"] =
-      StrCat(descriptor->default_value_enum()->number());
-  (*variables)["tag"] = StrCat(
-      static_cast<int32_t>(internal::WireFormat::MakeTag(descriptor)));
-  (*variables)["tag_size"] = StrCat(
-      internal::WireFormat::TagSize(descriptor->number(), GetType(descriptor)));
-  // TODO(birdo): Add @deprecated javadoc when generating javadoc is supported
-  // by the proto compiler
-  (*variables)["deprecation"] =
-      descriptor->options().deprecated() ? "@java.lang.Deprecated " : "";
-  variables->insert(
-      {"kt_deprecation",
-       descriptor->options().deprecated()
-           ? StrCat("@kotlin.Deprecated(message = \"Field ",
-                          (*variables)["name"], " is deprecated\") ")
-           : ""});
-  if (HasHasbit(descriptor)) {
-    // For singular messages and builders, one bit is used for the hasField bit.
-    (*variables)["get_has_field_bit_message"] = GenerateGetBit(messageBitIndex);
-    // Note that these have a trailing ";".
-    (*variables)["set_has_field_bit_message"] =
-        GenerateSetBit(messageBitIndex) + ";";
-    (*variables)["set_has_field_bit_to_local"] =
-        GenerateSetBitToLocal(messageBitIndex);
-    (*variables)["is_field_present_message"] = GenerateGetBit(messageBitIndex);
-  } else {
-    (*variables)["set_has_field_bit_message"] = "";
-    (*variables)["set_has_field_bit_to_local"] = "";
-    variables->insert({"is_field_present_message",
-                       StrCat((*variables)["name"], "_ != ",
-                                    (*variables)["default"], ".getNumber()")});
-  }
-
-  // For repeated builders, one bit is used for whether the array is immutable.
-  (*variables)["get_mutable_bit_builder"] = GenerateGetBit(builderBitIndex);
-  (*variables)["set_mutable_bit_builder"] = GenerateSetBit(builderBitIndex);
-  (*variables)["clear_mutable_bit_builder"] = GenerateClearBit(builderBitIndex);
-
-  (*variables)["get_has_field_bit_builder"] = GenerateGetBit(builderBitIndex);
-
-  // Note that these have a trailing ";".
-  (*variables)["set_has_field_bit_builder"] =
-      GenerateSetBit(builderBitIndex) + ";";
-  (*variables)["clear_has_field_bit_builder"] =
-      GenerateClearBit(builderBitIndex) + ";";
-  (*variables)["get_has_field_bit_from_local"] =
-      GenerateGetBitFromLocal(builderBitIndex);
-
-  if (SupportUnknownEnumValue(descriptor->file())) {
-    variables->insert(
-        {"unknown", StrCat((*variables)["type"], ".UNRECOGNIZED")});
-  } else {
-    variables->insert({"unknown", (*variables)["default"]});
-  }
-}
-
-}  // namespace
-
-// ===================================================================
-
-ImmutableEnumFieldGenerator::ImmutableEnumFieldGenerator(
-    const FieldDescriptor* descriptor, int messageBitIndex, int builderBitIndex,
-    Context* context)
-    : descriptor_(descriptor),
-      message_bit_index_(messageBitIndex),
-      builder_bit_index_(builderBitIndex),
-      name_resolver_(context->GetNameResolver()) {
-  SetEnumVariables(descriptor, messageBitIndex, builderBitIndex,
-                   context->GetFieldGeneratorInfo(descriptor), name_resolver_,
-                   &variables_, context);
-}
-
-ImmutableEnumFieldGenerator::~ImmutableEnumFieldGenerator() {}
-
-int ImmutableEnumFieldGenerator::GetMessageBitIndex() const {
-  return message_bit_index_;
-}
-
-int ImmutableEnumFieldGenerator::GetBuilderBitIndex() const {
-  return builder_bit_index_;
-}
-
-int ImmutableEnumFieldGenerator::GetNumBitsForMessage() const {
-  return HasHasbit(descriptor_) ? 1 : 0;
-}
-
-int ImmutableEnumFieldGenerator::GetNumBitsForBuilder() const { return 1; }
-
-void ImmutableEnumFieldGenerator::GenerateInterfaceMembers(
-    io::Printer* printer) const {
-  if (HasHazzer(descriptor_)) {
-    WriteFieldAccessorDocComment(printer, descriptor_, HAZZER);
-    printer->Print(variables_,
-                   "$deprecation$boolean has$capitalized_name$();\n");
-  }
-  if (SupportUnknownEnumValue(descriptor_->file())) {
-    WriteFieldEnumValueAccessorDocComment(printer, descriptor_, GETTER);
-    printer->Print(variables_,
-                   "$deprecation$int get$capitalized_name$Value();\n");
-  }
-  WriteFieldAccessorDocComment(printer, descriptor_, GETTER);
-  printer->Print(variables_, "$deprecation$$type$ get$capitalized_name$();\n");
-}
-
-void ImmutableEnumFieldGenerator::GenerateMembers(io::Printer* printer) const {
-  printer->Print(variables_, "private int $name$_ = $default_number$;\n");
-  PrintExtraFieldInfo(variables_, printer);
-  if (HasHazzer(descriptor_)) {
-    WriteFieldAccessorDocComment(printer, descriptor_, HAZZER);
-    printer->Print(variables_,
-                   "@java.lang.Override $deprecation$public boolean "
-                   "${$has$capitalized_name$$}$() {\n"
-                   "  return $get_has_field_bit_message$;\n"
-                   "}\n");
-    printer->Annotate("{", "}", descriptor_);
-  }
-  if (SupportUnknownEnumValue(descriptor_->file())) {
-    WriteFieldEnumValueAccessorDocComment(printer, descriptor_, GETTER);
-    printer->Print(variables_,
-                   "@java.lang.Override $deprecation$public int "
-                   "${$get$capitalized_name$Value$}$() {\n"
-                   "  return $name$_;\n"
-                   "}\n");
-    printer->Annotate("{", "}", descriptor_);
-  }
-  WriteFieldAccessorDocComment(printer, descriptor_, GETTER);
-  printer->Print(variables_,
-                 "@java.lang.Override $deprecation$public $type$ "
-                 "${$get$capitalized_name$$}$() {\n"
-                 "  $type$ result = $type$.forNumber($name$_);\n"
-                 "  return result == null ? $unknown$ : result;\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-}
-
-void ImmutableEnumFieldGenerator::GenerateBuilderMembers(
-    io::Printer* printer) const {
-  printer->Print(variables_, "private int $name$_ = $default_number$;\n");
-  if (HasHazzer(descriptor_)) {
-    WriteFieldAccessorDocComment(printer, descriptor_, HAZZER);
-    printer->Print(variables_,
-                   "@java.lang.Override $deprecation$public boolean "
-                   "${$has$capitalized_name$$}$() {\n"
-                   "  return $get_has_field_bit_builder$;\n"
-                   "}\n");
-    printer->Annotate("{", "}", descriptor_);
-  }
-  if (SupportUnknownEnumValue(descriptor_->file())) {
-    WriteFieldEnumValueAccessorDocComment(printer, descriptor_, GETTER);
-    printer->Print(variables_,
-                   "@java.lang.Override $deprecation$public int "
-                   "${$get$capitalized_name$Value$}$() {\n"
-                   "  return $name$_;\n"
-                   "}\n");
-    printer->Annotate("{", "}", descriptor_);
-    WriteFieldEnumValueAccessorDocComment(printer, descriptor_, SETTER,
-                                          /* builder */ true);
-    printer->Print(variables_,
-                   "$deprecation$public Builder "
-                   "${$set$capitalized_name$Value$}$(int value) {\n"
-                   "  $name$_ = value;\n"
-                   "  $set_has_field_bit_builder$\n"
-                   "  onChanged();\n"
-                   "  return this;\n"
-                   "}\n");
-    printer->Annotate("{", "}", descriptor_);
-  }
-  WriteFieldAccessorDocComment(printer, descriptor_, GETTER);
-  printer->Print(variables_,
-                 "@java.lang.Override\n"
-                 "$deprecation$public $type$ ${$get$capitalized_name$$}$() {\n"
-                 "  $type$ result = $type$.forNumber($name$_);\n"
-                 "  return result == null ? $unknown$ : result;\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-  WriteFieldAccessorDocComment(printer, descriptor_, SETTER,
-                               /* builder */ true);
-  printer->Print(variables_,
-                 "$deprecation$public Builder "
-                 "${$set$capitalized_name$$}$($type$ value) {\n"
-                 "  if (value == null) {\n"
-                 "    throw new NullPointerException();\n"
-                 "  }\n"
-                 "  $set_has_field_bit_builder$\n"
-                 "  $name$_ = value.getNumber();\n"
-                 "  onChanged();\n"
-                 "  return this;\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-  WriteFieldAccessorDocComment(printer, descriptor_, CLEARER,
-                               /* builder */ true);
-  printer->Print(
-      variables_,
-      "$deprecation$public Builder ${$clear$capitalized_name$$}$() {\n"
-      "  $clear_has_field_bit_builder$\n"
-      "  $name$_ = $default_number$;\n"
-      "  onChanged();\n"
-      "  return this;\n"
-      "}\n");
-  printer->Annotate("{", "}", descriptor_);
-}
-
-void ImmutableEnumFieldGenerator::GenerateKotlinDslMembers(
-    io::Printer* printer) const {
-  WriteFieldDocComment(printer, descriptor_);
-  printer->Print(variables_,
-                 "$kt_deprecation$public var $kt_name$: $kt_type$\n"
-                 "  @JvmName(\"${$get$kt_capitalized_name$$}$\")\n"
-                 "  get() = $kt_dsl_builder$.${$get$capitalized_name$$}$()\n"
-                 "  @JvmName(\"${$set$kt_capitalized_name$$}$\")\n"
-                 "  set(value) {\n"
-                 "    $kt_dsl_builder$.${$set$capitalized_name$$}$(value)\n"
-                 "  }\n");
-
-  WriteFieldAccessorDocComment(printer, descriptor_, CLEARER,
-                               /* builder */ false);
-  printer->Print(variables_,
-                 "public fun ${$clear$kt_capitalized_name$$}$() {\n"
-                 "  $kt_dsl_builder$.${$clear$capitalized_name$$}$()\n"
-                 "}\n");
-
-  if (HasHazzer(descriptor_)) {
-    WriteFieldAccessorDocComment(printer, descriptor_, HAZZER);
-    printer->Print(
-        variables_,
-        "public fun ${$has$kt_capitalized_name$$}$(): kotlin.Boolean {\n"
-        "  return $kt_dsl_builder$.${$has$capitalized_name$$}$()\n"
-        "}\n");
-  }
-}
-
-void ImmutableEnumFieldGenerator::GenerateFieldBuilderInitializationCode(
-    io::Printer* printer) const {
-  // noop for enums
-}
-
-void ImmutableEnumFieldGenerator::GenerateInitializationCode(
-    io::Printer* printer) const {
-  printer->Print(variables_, "$name$_ = $default_number$;\n");
-}
-
-void ImmutableEnumFieldGenerator::GenerateBuilderClearCode(
-    io::Printer* printer) const {
-  printer->Print(variables_, "$name$_ = $default_number$;\n");
-}
-
-void ImmutableEnumFieldGenerator::GenerateMergingCode(
-    io::Printer* printer) const {
-  if (HasHazzer(descriptor_)) {
-    printer->Print(variables_,
-                   "if (other.has$capitalized_name$()) {\n"
-                   "  set$capitalized_name$(other.get$capitalized_name$());\n"
-                   "}\n");
-  } else if (SupportUnknownEnumValue(descriptor_->file())) {
-    printer->Print(
-        variables_,
-        "if (other.$name$_ != $default_number$) {\n"
-        "  set$capitalized_name$Value(other.get$capitalized_name$Value());\n"
-        "}\n");
-  } else {
-    GOOGLE_LOG(FATAL) << "Can't reach here.";
-  }
-}
-
-void ImmutableEnumFieldGenerator::GenerateBuildingCode(
-    io::Printer* printer) const {
-  printer->Print(variables_,
-                 "if ($get_has_field_bit_from_local$) {\n"
-                 "  result.$name$_ = $name$_;\n");
-  if (GetNumBitsForMessage() > 0) {
-    printer->Print(variables_, "  $set_has_field_bit_to_local$;\n");
-  }
-  printer->Print("}\n");
-}
-
-void ImmutableEnumFieldGenerator::GenerateBuilderParsingCode(
-    io::Printer* printer) const {
-  if (SupportUnknownEnumValue(descriptor_->file())) {
-    printer->Print(variables_,
-                   "$name$_ = input.readEnum();\n"
-                   "$set_has_field_bit_builder$\n");
-  } else {
-    printer->Print(variables_,
-                   "int tmpRaw = input.readEnum();\n"
-                   "$type$ tmpValue =\n"
-                   "    $type$.forNumber(tmpRaw);\n"
-                   "if (tmpValue == null) {\n"
-                   "  mergeUnknownVarintField($number$, tmpRaw);\n"
-                   "} else {\n"
-                   "  $name$_ = tmpRaw;\n"
-                   "  $set_has_field_bit_builder$\n"
-                   "}\n");
-  }
-}
-
-void ImmutableEnumFieldGenerator::GenerateSerializationCode(
-    io::Printer* printer) const {
-  printer->Print(variables_,
-                 "if ($is_field_present_message$) {\n"
-                 "  output.writeEnum($number$, $name$_);\n"
-                 "}\n");
-}
-
-void ImmutableEnumFieldGenerator::GenerateSerializedSizeCode(
-    io::Printer* printer) const {
-  printer->Print(variables_,
-                 "if ($is_field_present_message$) {\n"
-                 "  size += com.google.protobuf.CodedOutputStream\n"
-                 "    .computeEnumSize($number$, $name$_);\n"
-                 "}\n");
-}
-
-void ImmutableEnumFieldGenerator::GenerateEqualsCode(
-    io::Printer* printer) const {
-  printer->Print(variables_, "if ($name$_ != other.$name$_) return false;\n");
-}
-
-void ImmutableEnumFieldGenerator::GenerateHashCode(io::Printer* printer) const {
-  printer->Print(variables_,
-                 "hash = (37 * hash) + $constant_name$;\n"
-                 "hash = (53 * hash) + $name$_;\n");
-}
-
-std::string ImmutableEnumFieldGenerator::GetBoxedType() const {
-  return name_resolver_->GetImmutableClassName(descriptor_->enum_type());
-}
-
-// ===================================================================
-
-ImmutableEnumOneofFieldGenerator::ImmutableEnumOneofFieldGenerator(
-    const FieldDescriptor* descriptor, int messageBitIndex, int builderBitIndex,
-    Context* context)
-    : ImmutableEnumFieldGenerator(descriptor, messageBitIndex, builderBitIndex,
-                                  context) {
-  const OneofGeneratorInfo* info =
-      context->GetOneofGeneratorInfo(descriptor->containing_oneof());
-  SetCommonOneofVariables(descriptor, info, &variables_);
-}
-
-ImmutableEnumOneofFieldGenerator::~ImmutableEnumOneofFieldGenerator() {}
-
-void ImmutableEnumOneofFieldGenerator::GenerateMembers(
-    io::Printer* printer) const {
-  PrintExtraFieldInfo(variables_, printer);
-  GOOGLE_DCHECK(HasHazzer(descriptor_));
-  WriteFieldAccessorDocComment(printer, descriptor_, HAZZER);
-  printer->Print(variables_,
-                 "$deprecation$public boolean ${$has$capitalized_name$$}$() {\n"
-                 "  return $has_oneof_case_message$;\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-
-  if (SupportUnknownEnumValue(descriptor_->file())) {
-    WriteFieldEnumValueAccessorDocComment(printer, descriptor_, GETTER);
-    printer->Print(
-        variables_,
-        "$deprecation$public int ${$get$capitalized_name$Value$}$() {\n"
-        "  if ($has_oneof_case_message$) {\n"
-        "    return (java.lang.Integer) $oneof_name$_;\n"
-        "  }\n"
-        "  return $default_number$;\n"
-        "}\n");
-    printer->Annotate("{", "}", descriptor_);
-  }
-  WriteFieldAccessorDocComment(printer, descriptor_, GETTER);
-  printer->Print(variables_,
-                 "$deprecation$public $type$ ${$get$capitalized_name$$}$() {\n"
-                 "  if ($has_oneof_case_message$) {\n"
-                 "    $type$ result = $type$.forNumber(\n"
-                 "        (java.lang.Integer) $oneof_name$_);\n"
-                 "    return result == null ? $unknown$ : result;\n"
-                 "  }\n"
-                 "  return $default$;\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-}
-
-void ImmutableEnumOneofFieldGenerator::GenerateBuilderMembers(
-    io::Printer* printer) const {
-  GOOGLE_DCHECK(HasHazzer(descriptor_));
-  WriteFieldAccessorDocComment(printer, descriptor_, HAZZER);
-  printer->Print(variables_,
-                 "@java.lang.Override\n"
-                 "$deprecation$public boolean ${$has$capitalized_name$$}$() {\n"
-                 "  return $has_oneof_case_message$;\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-
-  if (SupportUnknownEnumValue(descriptor_->file())) {
-    WriteFieldEnumValueAccessorDocComment(printer, descriptor_, GETTER);
-    printer->Print(
-        variables_,
-        "@java.lang.Override\n"
-        "$deprecation$public int ${$get$capitalized_name$Value$}$() {\n"
-        "  if ($has_oneof_case_message$) {\n"
-        "    return ((java.lang.Integer) $oneof_name$_).intValue();\n"
-        "  }\n"
-        "  return $default_number$;\n"
-        "}\n");
-    printer->Annotate("{", "}", descriptor_);
-    WriteFieldEnumValueAccessorDocComment(printer, descriptor_, SETTER,
-                                          /* builder */ true);
-    printer->Print(variables_,
-                   "$deprecation$public Builder "
-                   "${$set$capitalized_name$Value$}$(int value) {\n"
-                   "  $set_oneof_case_message$;\n"
-                   "  $oneof_name$_ = value;\n"
-                   "  onChanged();\n"
-                   "  return this;\n"
-                   "}\n");
-    printer->Annotate("{", "}", descriptor_);
-  }
-  WriteFieldAccessorDocComment(printer, descriptor_, GETTER);
-  printer->Print(variables_,
-                 "@java.lang.Override\n"
-                 "$deprecation$public $type$ ${$get$capitalized_name$$}$() {\n"
-                 "  if ($has_oneof_case_message$) {\n"
-                 "    $type$ result = $type$.forNumber(\n"
-                 "        (java.lang.Integer) $oneof_name$_);\n"
-                 "    return result == null ? $unknown$ : result;\n"
-                 "  }\n"
-                 "  return $default$;\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-
-  WriteFieldAccessorDocComment(printer, descriptor_, SETTER,
-                               /* builder */ true);
-  printer->Print(variables_,
-                 "$deprecation$public Builder "
-                 "${$set$capitalized_name$$}$($type$ value) {\n"
-                 "  if (value == null) {\n"
-                 "    throw new NullPointerException();\n"
-                 "  }\n"
-                 "  $set_oneof_case_message$;\n"
-                 "  $oneof_name$_ = value.getNumber();\n"
-                 "  onChanged();\n"
-                 "  return this;\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-
-  WriteFieldAccessorDocComment(printer, descriptor_, CLEARER,
-                               /* builder */ true);
-  printer->Print(
-      variables_,
-      "$deprecation$public Builder ${$clear$capitalized_name$$}$() {\n"
-      "  if ($has_oneof_case_message$) {\n"
-      "    $clear_oneof_case_message$;\n"
-      "    $oneof_name$_ = null;\n"
-      "    onChanged();\n"
-      "  }\n"
-      "  return this;\n"
-      "}\n");
-  printer->Annotate("{", "}", descriptor_);
-}
-
-void ImmutableEnumOneofFieldGenerator::GenerateBuilderClearCode(
-    io::Printer* printer) const {
-  // No-op: Enum fields in oneofs are correctly cleared by clearing the oneof
-}
-
-void ImmutableEnumOneofFieldGenerator::GenerateBuildingCode(
-    io::Printer* printer) const {
-  // No-Op: Handled by single statement for the oneof
-}
-
-void ImmutableEnumOneofFieldGenerator::GenerateMergingCode(
-    io::Printer* printer) const {
-  if (SupportUnknownEnumValue(descriptor_->file())) {
-    printer->Print(
-        variables_,
-        "set$capitalized_name$Value(other.get$capitalized_name$Value());\n");
-  } else {
-    printer->Print(variables_,
-                   "set$capitalized_name$(other.get$capitalized_name$());\n");
-  }
-}
-
-void ImmutableEnumOneofFieldGenerator::GenerateBuilderParsingCode(
-    io::Printer* printer) const {
-  if (SupportUnknownEnumValue(descriptor_->file())) {
-    printer->Print(variables_,
-                   "int rawValue = input.readEnum();\n"
-                   "$set_oneof_case_message$;\n"
-                   "$oneof_name$_ = rawValue;\n");
-  } else {
-    printer->Print(variables_,
-                   "int rawValue = input.readEnum();\n"
-                   "$type$ value =\n"
-                   "    $type$.forNumber(rawValue);\n"
-                   "if (value == null) {\n"
-                   "  mergeUnknownVarintField($number$, rawValue);\n"
-                   "} else {\n"
-                   "  $set_oneof_case_message$;\n"
-                   "  $oneof_name$_ = rawValue;\n"
-                   "}\n");
-  }
-}
-
-void ImmutableEnumOneofFieldGenerator::GenerateSerializationCode(
-    io::Printer* printer) const {
-  printer->Print(
-      variables_,
-      "if ($has_oneof_case_message$) {\n"
-      "  output.writeEnum($number$, ((java.lang.Integer) $oneof_name$_));\n"
-      "}\n");
-}
-
-void ImmutableEnumOneofFieldGenerator::GenerateSerializedSizeCode(
-    io::Printer* printer) const {
-  printer->Print(
-      variables_,
-      "if ($has_oneof_case_message$) {\n"
-      "  size += com.google.protobuf.CodedOutputStream\n"
-      "    .computeEnumSize($number$, ((java.lang.Integer) $oneof_name$_));\n"
-      "}\n");
-}
-
-void ImmutableEnumOneofFieldGenerator::GenerateEqualsCode(
-    io::Printer* printer) const {
-  if (SupportUnknownEnumValue(descriptor_->file())) {
-    printer->Print(
-        variables_,
-        "if (get$capitalized_name$Value()\n"
-        "    != other.get$capitalized_name$Value()) return false;\n");
-  } else {
-    printer->Print(
-        variables_,
-        "if (!get$capitalized_name$()\n"
-        "    .equals(other.get$capitalized_name$())) return false;\n");
-  }
-}
-
-void ImmutableEnumOneofFieldGenerator::GenerateHashCode(
-    io::Printer* printer) const {
-  if (SupportUnknownEnumValue(descriptor_->file())) {
-    printer->Print(variables_,
-                   "hash = (37 * hash) + $constant_name$;\n"
-                   "hash = (53 * hash) + get$capitalized_name$Value();\n");
-  } else {
-    printer->Print(
-        variables_,
-        "hash = (37 * hash) + $constant_name$;\n"
-        "hash = (53 * hash) + get$capitalized_name$().getNumber();\n");
-  }
-}
-
-// ===================================================================
-
-RepeatedImmutableEnumFieldGenerator::RepeatedImmutableEnumFieldGenerator(
-    const FieldDescriptor* descriptor, int messageBitIndex, int builderBitIndex,
-    Context* context)
-    : ImmutableEnumFieldGenerator(descriptor, messageBitIndex, builderBitIndex,
-                                  context) {}
-
-RepeatedImmutableEnumFieldGenerator::~RepeatedImmutableEnumFieldGenerator() {}
-
-int RepeatedImmutableEnumFieldGenerator::GetNumBitsForMessage() const {
-  return 0;
-}
-
-int RepeatedImmutableEnumFieldGenerator::GetNumBitsForBuilder() const {
-  return 1;
-}
-
-void RepeatedImmutableEnumFieldGenerator::GenerateInterfaceMembers(
-    io::Printer* printer) const {
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_GETTER);
-  printer->Print(
-      variables_,
-      "$deprecation$java.util.List<$type$> get$capitalized_name$List();\n");
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_COUNT);
-  printer->Print(variables_,
-                 "$deprecation$int get$capitalized_name$Count();\n");
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_INDEXED_GETTER);
-  printer->Print(variables_,
-                 "$deprecation$$type$ get$capitalized_name$(int index);\n");
-  if (SupportUnknownEnumValue(descriptor_->file())) {
-    WriteFieldEnumValueAccessorDocComment(printer, descriptor_, LIST_GETTER);
-    printer->Print(variables_,
-                   "$deprecation$java.util.List<java.lang.Integer>\n"
-                   "get$capitalized_name$ValueList();\n");
-    WriteFieldEnumValueAccessorDocComment(printer, descriptor_,
-                                          LIST_INDEXED_GETTER);
-    printer->Print(variables_,
-                   "$deprecation$int get$capitalized_name$Value(int index);\n");
-  }
-}
-
-void RepeatedImmutableEnumFieldGenerator::GenerateMembers(
-    io::Printer* printer) const {
-  printer->Print(
-      variables_,
-      "@SuppressWarnings(\"serial\")\n"
-      "private java.util.List<java.lang.Integer> $name$_;\n"
-      "private static final "
-      "com.google.protobuf.Internal.ListAdapter.Converter<\n"
-      "    java.lang.Integer, $type$> $name$_converter_ =\n"
-      "        new com.google.protobuf.Internal.ListAdapter.Converter<\n"
-      "            java.lang.Integer, $type$>() {\n"
-      "          public $type$ convert(java.lang.Integer from) {\n"
-      "            $type$ result = $type$.forNumber(from);\n"
-      "            return result == null ? $unknown$ : result;\n"
-      "          }\n"
-      "        };\n");
-  PrintExtraFieldInfo(variables_, printer);
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_GETTER);
-  printer->Print(
-      variables_,
-      "@java.lang.Override\n"
-      "$deprecation$public java.util.List<$type$> "
-      "${$get$capitalized_name$List$}$() {\n"
-      "  return new com.google.protobuf.Internal.ListAdapter<\n"
-      "      java.lang.Integer, $type$>($name$_, $name$_converter_);\n"
-      "}\n");
-  printer->Annotate("{", "}", descriptor_);
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_COUNT);
-  printer->Print(
-      variables_,
-      "@java.lang.Override\n"
-      "$deprecation$public int ${$get$capitalized_name$Count$}$() {\n"
-      "  return $name$_.size();\n"
-      "}\n");
-  printer->Annotate("{", "}", descriptor_);
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_INDEXED_GETTER);
-  printer->Print(
-      variables_,
-      "@java.lang.Override\n"
-      "$deprecation$public $type$ ${$get$capitalized_name$$}$(int index) {\n"
-      "  return $name$_converter_.convert($name$_.get(index));\n"
-      "}\n");
-  printer->Annotate("{", "}", descriptor_);
-  if (SupportUnknownEnumValue(descriptor_->file())) {
-    WriteFieldEnumValueAccessorDocComment(printer, descriptor_, LIST_GETTER);
-    printer->Print(variables_,
-                   "@java.lang.Override\n"
-                   "$deprecation$public java.util.List<java.lang.Integer>\n"
-                   "${$get$capitalized_name$ValueList$}$() {\n"
-                   "  return $name$_;\n"
-                   "}\n");
-    printer->Annotate("{", "}", descriptor_);
-    WriteFieldEnumValueAccessorDocComment(printer, descriptor_,
-                                          LIST_INDEXED_GETTER);
-    printer->Print(variables_,
-                   "@java.lang.Override\n"
-                   "$deprecation$public int "
-                   "${$get$capitalized_name$Value$}$(int index) {\n"
-                   "  return $name$_.get(index);\n"
-                   "}\n");
-    printer->Annotate("{", "}", descriptor_);
-  }
-
-  if (descriptor_->is_packed()) {
-    printer->Print(variables_, "private int $name$MemoizedSerializedSize;\n");
-  }
-}
-
-void RepeatedImmutableEnumFieldGenerator::GenerateBuilderMembers(
-    io::Printer* printer) const {
-  printer->Print(
-      variables_,
-      // One field is the list and the other field keeps track of whether the
-      // list is immutable. If it's immutable, the invariant is that it must
-      // either an instance of Collections.emptyList() or it's an ArrayList
-      // wrapped in a Collections.unmodifiableList() wrapper and nobody else has
-      // a reference to the underlying ArrayList. This invariant allows us to
-      // share instances of lists between protocol buffers avoiding expensive
-      // memory allocations. Note, immutable is a strong guarantee here -- not
-      // just that the list cannot be modified via the reference but that the
-      // list can never be modified.
-      "private java.util.List<java.lang.Integer> $name$_ =\n"
-      "  java.util.Collections.emptyList();\n"
-
-      "private void ensure$capitalized_name$IsMutable() {\n"
-      "  if (!$get_mutable_bit_builder$) {\n"
-      "    $name$_ = new java.util.ArrayList<java.lang.Integer>($name$_);\n"
-      "    $set_mutable_bit_builder$;\n"
-      "  }\n"
-      "}\n");
-
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_GETTER);
-  printer->Print(
-      variables_,
-      // Note:  We return an unmodifiable list because otherwise the caller
-      //   could hold on to the returned list and modify it after the message
-      //   has been built, thus mutating the message which is supposed to be
-      //   immutable.
-      "$deprecation$public java.util.List<$type$> "
-      "${$get$capitalized_name$List$}$() {\n"
-      "  return new com.google.protobuf.Internal.ListAdapter<\n"
-      "      java.lang.Integer, $type$>($name$_, $name$_converter_);\n"
-      "}\n");
-  printer->Annotate("{", "}", descriptor_);
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_COUNT);
-  printer->Print(
-      variables_,
-      "$deprecation$public int ${$get$capitalized_name$Count$}$() {\n"
-      "  return $name$_.size();\n"
-      "}\n");
-  printer->Annotate("{", "}", descriptor_);
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_INDEXED_GETTER);
-  printer->Print(
-      variables_,
-      "$deprecation$public $type$ ${$get$capitalized_name$$}$(int index) {\n"
-      "  return $name$_converter_.convert($name$_.get(index));\n"
-      "}\n");
-  printer->Annotate("{", "}", descriptor_);
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_INDEXED_SETTER,
-                               /* builder */ true);
-  printer->Print(variables_,
-                 "$deprecation$public Builder ${$set$capitalized_name$$}$(\n"
-                 "    int index, $type$ value) {\n"
-                 "  if (value == null) {\n"
-                 "    throw new NullPointerException();\n"
-                 "  }\n"
-                 "  ensure$capitalized_name$IsMutable();\n"
-                 "  $name$_.set(index, value.getNumber());\n"
-                 "  onChanged();\n"
-                 "  return this;\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_ADDER,
-                               /* builder */ true);
-  printer->Print(variables_,
-                 "$deprecation$public Builder "
-                 "${$add$capitalized_name$$}$($type$ value) {\n"
-                 "  if (value == null) {\n"
-                 "    throw new NullPointerException();\n"
-                 "  }\n"
-                 "  ensure$capitalized_name$IsMutable();\n"
-                 "  $name$_.add(value.getNumber());\n"
-                 "  onChanged();\n"
-                 "  return this;\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_MULTI_ADDER,
-                               /* builder */ true);
-  printer->Print(variables_,
-                 "$deprecation$public Builder ${$addAll$capitalized_name$$}$(\n"
-                 "    java.lang.Iterable<? extends $type$> values) {\n"
-                 "  ensure$capitalized_name$IsMutable();\n"
-                 "  for ($type$ value : values) {\n"
-                 "    $name$_.add(value.getNumber());\n"
-                 "  }\n"
-                 "  onChanged();\n"
-                 "  return this;\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-  WriteFieldAccessorDocComment(printer, descriptor_, CLEARER,
-                               /* builder */ true);
-  printer->Print(
-      variables_,
-      "$deprecation$public Builder ${$clear$capitalized_name$$}$() {\n"
-      "  $name$_ = java.util.Collections.emptyList();\n"
-      "  $clear_mutable_bit_builder$;\n"
-      "  onChanged();\n"
-      "  return this;\n"
-      "}\n");
-  printer->Annotate("{", "}", descriptor_);
-
-  if (SupportUnknownEnumValue(descriptor_->file())) {
-    WriteFieldEnumValueAccessorDocComment(printer, descriptor_, LIST_GETTER);
-    printer->Print(variables_,
-                   "$deprecation$public java.util.List<java.lang.Integer>\n"
-                   "${$get$capitalized_name$ValueList$}$() {\n"
-                   "  return java.util.Collections.unmodifiableList($name$_);\n"
-                   "}\n");
-    printer->Annotate("{", "}", descriptor_);
-    WriteFieldEnumValueAccessorDocComment(printer, descriptor_,
-                                          LIST_INDEXED_GETTER);
-    printer->Print(variables_,
-                   "$deprecation$public int "
-                   "${$get$capitalized_name$Value$}$(int index) {\n"
-                   "  return $name$_.get(index);\n"
-                   "}\n");
-    printer->Annotate("{", "}", descriptor_);
-    WriteFieldEnumValueAccessorDocComment(printer, descriptor_,
-                                          LIST_INDEXED_SETTER,
-                                          /* builder */ true);
-    printer->Print(
-        variables_,
-        "$deprecation$public Builder ${$set$capitalized_name$Value$}$(\n"
-        "    int index, int value) {\n"
-        "  ensure$capitalized_name$IsMutable();\n"
-        "  $name$_.set(index, value);\n"
-        "  onChanged();\n"
-        "  return this;\n"
-        "}\n");
-    printer->Annotate("{", "}", descriptor_);
-    WriteFieldEnumValueAccessorDocComment(printer, descriptor_, LIST_ADDER,
-                                          /* builder */ true);
-    printer->Print(variables_,
-                   "$deprecation$public Builder "
-                   "${$add$capitalized_name$Value$}$(int value) {\n"
-                   "  ensure$capitalized_name$IsMutable();\n"
-                   "  $name$_.add(value);\n"
-                   "  onChanged();\n"
-                   "  return this;\n"
-                   "}\n");
-    printer->Annotate("{", "}", descriptor_);
-    WriteFieldEnumValueAccessorDocComment(printer, descriptor_,
-                                          LIST_MULTI_ADDER, /* builder */ true);
-    printer->Print(
-        variables_,
-        "$deprecation$public Builder ${$addAll$capitalized_name$Value$}$(\n"
-        "    java.lang.Iterable<java.lang.Integer> values) {\n"
-        "  ensure$capitalized_name$IsMutable();\n"
-        "  for (int value : values) {\n"
-        "    $name$_.add(value);\n"
-        "  }\n"
-        "  onChanged();\n"
-        "  return this;\n"
-        "}\n");
-    printer->Annotate("{", "}", descriptor_);
-  }
-}
-
-void RepeatedImmutableEnumFieldGenerator::
-    GenerateFieldBuilderInitializationCode(io::Printer* printer) const {
-  // noop for enums
-}
-
-void RepeatedImmutableEnumFieldGenerator::GenerateInitializationCode(
-    io::Printer* printer) const {
-  printer->Print(variables_, "$name$_ = java.util.Collections.emptyList();\n");
-}
-
-void RepeatedImmutableEnumFieldGenerator::GenerateBuilderClearCode(
-    io::Printer* printer) const {
-  printer->Print(variables_,
-                 "$name$_ = java.util.Collections.emptyList();\n"
-                 "$clear_mutable_bit_builder$;\n");
-}
-
-void RepeatedImmutableEnumFieldGenerator::GenerateMergingCode(
-    io::Printer* printer) const {
-  // The code below does two optimizations:
-  //   1. If the other list is empty, there's nothing to do. This ensures we
-  //      don't allocate a new array if we already have an immutable one.
-  //   2. If the other list is non-empty and our current list is empty, we can
-  //      reuse the other list which is guaranteed to be immutable.
-  printer->Print(variables_,
-                 "if (!other.$name$_.isEmpty()) {\n"
-                 "  if ($name$_.isEmpty()) {\n"
-                 "    $name$_ = other.$name$_;\n"
-                 "    $clear_mutable_bit_builder$;\n"
-                 "  } else {\n"
-                 "    ensure$capitalized_name$IsMutable();\n"
-                 "    $name$_.addAll(other.$name$_);\n"
-                 "  }\n"
-                 "  onChanged();\n"
-                 "}\n");
-}
-
-void RepeatedImmutableEnumFieldGenerator::GenerateBuildingCode(
-    io::Printer* printer) const {
-  // The code below ensures that the result has an immutable list. If our
-  // list is immutable, we can just reuse it. If not, we make it immutable.
-  printer->Print(
-      variables_,
-      "if ($get_mutable_bit_builder$) {\n"
-      "  $name$_ = java.util.Collections.unmodifiableList($name$_);\n"
-      "  $clear_mutable_bit_builder$;\n"
-      "}\n"
-      "result.$name$_ = $name$_;\n");
-}
-
-void RepeatedImmutableEnumFieldGenerator::GenerateBuilderParsingCode(
-    io::Printer* printer) const {
-  // Read and store the enum
-  if (SupportUnknownEnumValue(descriptor_->file())) {
-    printer->Print(variables_,
-                   "int tmpRaw = input.readEnum();\n"
-                   "ensure$capitalized_name$IsMutable();\n"
-                   "$name$_.add(tmpRaw);\n");
-  } else {
-    printer->Print(variables_,
-                   "int tmpRaw = input.readEnum();\n"
-                   "$type$ tmpValue =\n"
-                   "    $type$.forNumber(tmpRaw);\n"
-                   "if (tmpValue == null) {\n"
-                   "  mergeUnknownVarintField($number$, tmpRaw);\n"
-                   "} else {\n"
-                   "  ensure$capitalized_name$IsMutable();\n"
-                   "  $name$_.add(tmpRaw);\n"
-                   "}\n");
-  }
-}
-
-void RepeatedImmutableEnumFieldGenerator::GenerateBuilderParsingCodeFromPacked(
-    io::Printer* printer) const {
-  // Wrap GenerateParsingCode's contents with a while loop.
-
-  printer->Print(variables_,
-                 "int length = input.readRawVarint32();\n"
-                 "int oldLimit = input.pushLimit(length);\n"
-                 "while(input.getBytesUntilLimit() > 0) {\n");
-  printer->Indent();
-
-  GenerateBuilderParsingCode(printer);
-
-  printer->Outdent();
-  printer->Print(variables_,
-                 "}\n"
-                 "input.popLimit(oldLimit);\n");
-}
-
-void RepeatedImmutableEnumFieldGenerator::GenerateSerializationCode(
-    io::Printer* printer) const {
-  if (descriptor_->is_packed()) {
-    printer->Print(variables_,
-                   "if (get$capitalized_name$List().size() > 0) {\n"
-                   "  output.writeUInt32NoTag($tag$);\n"
-                   "  output.writeUInt32NoTag($name$MemoizedSerializedSize);\n"
-                   "}\n"
-                   "for (int i = 0; i < $name$_.size(); i++) {\n"
-                   "  output.writeEnumNoTag($name$_.get(i));\n"
-                   "}\n");
-  } else {
-    printer->Print(variables_,
-                   "for (int i = 0; i < $name$_.size(); i++) {\n"
-                   "  output.writeEnum($number$, $name$_.get(i));\n"
-                   "}\n");
-  }
-}
-
-void RepeatedImmutableEnumFieldGenerator::GenerateSerializedSizeCode(
-    io::Printer* printer) const {
-  printer->Print(variables_,
-                 "{\n"
-                 "  int dataSize = 0;\n");
-  printer->Indent();
-
-  printer->Print(variables_,
-                 "for (int i = 0; i < $name$_.size(); i++) {\n"
-                 "  dataSize += com.google.protobuf.CodedOutputStream\n"
-                 "    .computeEnumSizeNoTag($name$_.get(i));\n"
-                 "}\n");
-  printer->Print("size += dataSize;\n");
-  if (descriptor_->is_packed()) {
-    printer->Print(variables_,
-                   "if (!get$capitalized_name$List().isEmpty()) {"
-                   "  size += $tag_size$;\n"
-                   "  size += com.google.protobuf.CodedOutputStream\n"
-                   "    .computeUInt32SizeNoTag(dataSize);\n"
-                   "}");
-  } else {
-    printer->Print(variables_, "size += $tag_size$ * $name$_.size();\n");
-  }
-
-  // cache the data size for packed fields.
-  if (descriptor_->is_packed()) {
-    printer->Print(variables_, "$name$MemoizedSerializedSize = dataSize;\n");
-  }
-
-  printer->Outdent();
-  printer->Print("}\n");
-}
-
-void RepeatedImmutableEnumFieldGenerator::GenerateEqualsCode(
-    io::Printer* printer) const {
-  printer->Print(variables_,
-                 "if (!$name$_.equals(other.$name$_)) return false;\n");
-}
-
-void RepeatedImmutableEnumFieldGenerator::GenerateHashCode(
-    io::Printer* printer) const {
-  printer->Print(variables_,
-                 "if (get$capitalized_name$Count() > 0) {\n"
-                 "  hash = (37 * hash) + $constant_name$;\n"
-                 "  hash = (53 * hash) + $name$_.hashCode();\n"
-                 "}\n");
-}
-
-void RepeatedImmutableEnumFieldGenerator::GenerateKotlinDslMembers(
-    io::Printer* printer) const {
-  printer->Print(
-      variables_,
-      "/**\n"
-      " * An uninstantiable, behaviorless type to represent the field in\n"
-      " * generics.\n"
-      " */\n"
-      "@kotlin.OptIn"
-      "(com.google.protobuf.kotlin.OnlyForUseByGeneratedProtoCode::class)\n"
-      "public class ${$$kt_capitalized_name$Proxy$}$ private constructor()"
-      " : com.google.protobuf.kotlin.DslProxy()\n");
-
-  WriteFieldDocComment(printer, descriptor_);
-  printer->Print(variables_,
-                 "$kt_deprecation$public val $kt_name$: "
-                 "com.google.protobuf.kotlin.DslList"
-                 "<$kt_type$, ${$$kt_capitalized_name$Proxy$}$>\n"
-                 "  @kotlin.jvm.JvmSynthetic\n"
-                 "  get() = com.google.protobuf.kotlin.DslList(\n"
-                 "    $kt_dsl_builder$.${$get$capitalized_name$List$}$()\n"
-                 "  )\n");
-
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_ADDER,
-                               /* builder */ false);
-  printer->Print(variables_,
-                 "@kotlin.jvm.JvmSynthetic\n"
-                 "@kotlin.jvm.JvmName(\"add$kt_capitalized_name$\")\n"
-                 "public fun com.google.protobuf.kotlin.DslList"
-                 "<$kt_type$, ${$$kt_capitalized_name$Proxy$}$>."
-                 "add(value: $kt_type$) {\n"
-                 "  $kt_dsl_builder$.${$add$capitalized_name$$}$(value)\n"
-                 "}");
-
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_ADDER,
-                               /* builder */ false);
-  printer->Print(variables_,
-                 "@kotlin.jvm.JvmSynthetic\n"
-                 "@kotlin.jvm.JvmName(\"plusAssign$kt_capitalized_name$\")\n"
-                 "@Suppress(\"NOTHING_TO_INLINE\")\n"
-                 "public inline operator fun com.google.protobuf.kotlin.DslList"
-                 "<$kt_type$, ${$$kt_capitalized_name$Proxy$}$>."
-                 "plusAssign(value: $kt_type$) {\n"
-                 "  add(value)\n"
-                 "}");
-
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_MULTI_ADDER,
-                               /* builder */ false);
-  printer->Print(variables_,
-                 "@kotlin.jvm.JvmSynthetic\n"
-                 "@kotlin.jvm.JvmName(\"addAll$kt_capitalized_name$\")\n"
-                 "public fun com.google.protobuf.kotlin.DslList"
-                 "<$kt_type$, ${$$kt_capitalized_name$Proxy$}$>."
-                 "addAll(values: kotlin.collections.Iterable<$kt_type$>) {\n"
-                 "  $kt_dsl_builder$.${$addAll$capitalized_name$$}$(values)\n"
-                 "}");
-
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_MULTI_ADDER,
-                               /* builder */ false);
-  printer->Print(
-      variables_,
-      "@kotlin.jvm.JvmSynthetic\n"
-      "@kotlin.jvm.JvmName(\"plusAssignAll$kt_capitalized_name$\")\n"
-      "@Suppress(\"NOTHING_TO_INLINE\")\n"
-      "public inline operator fun com.google.protobuf.kotlin.DslList"
-      "<$kt_type$, ${$$kt_capitalized_name$Proxy$}$>."
-      "plusAssign(values: kotlin.collections.Iterable<$kt_type$>) {\n"
-      "  addAll(values)\n"
-      "}");
-
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_INDEXED_SETTER,
-                               /* builder */ false);
-  printer->Print(
-      variables_,
-      "@kotlin.jvm.JvmSynthetic\n"
-      "@kotlin.jvm.JvmName(\"set$kt_capitalized_name$\")\n"
-      "public operator fun com.google.protobuf.kotlin.DslList"
-      "<$kt_type$, ${$$kt_capitalized_name$Proxy$}$>."
-      "set(index: kotlin.Int, value: $kt_type$) {\n"
-      "  $kt_dsl_builder$.${$set$capitalized_name$$}$(index, value)\n"
-      "}");
-
-  WriteFieldAccessorDocComment(printer, descriptor_, CLEARER,
-                               /* builder */ false);
-  printer->Print(variables_,
-                 "@kotlin.jvm.JvmSynthetic\n"
-                 "@kotlin.jvm.JvmName(\"clear$kt_capitalized_name$\")\n"
-                 "public fun com.google.protobuf.kotlin.DslList"
-                 "<$kt_type$, ${$$kt_capitalized_name$Proxy$}$>."
-                 "clear() {\n"
-                 "  $kt_dsl_builder$.${$clear$capitalized_name$$}$()\n"
-                 "}");
-}
-
-std::string RepeatedImmutableEnumFieldGenerator::GetBoxedType() const {
-  return name_resolver_->GetImmutableClassName(descriptor_->enum_type());
-}
-
-}  // namespace java
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#include "google/protobuf/port_undef.inc"
diff --git a/libs/protobuf/src/google/protobuf/compiler/java/enum_field.h b/libs/protobuf/src/google/protobuf/compiler/java/enum_field.h
deleted file mode 100644
index 8f0a5c3..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/java/enum_field.h
+++ /dev/null
@@ -1,164 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-
-#ifndef GOOGLE_PROTOBUF_COMPILER_JAVA_ENUM_FIELD_H__
-#define GOOGLE_PROTOBUF_COMPILER_JAVA_ENUM_FIELD_H__
-
-#include <map>
-#include <string>
-
-#include "google/protobuf/compiler/java/field.h"
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace java {
-class Context;            // context.h
-class ClassNameResolver;  // name_resolver.h
-}  // namespace java
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace java {
-
-class ImmutableEnumFieldGenerator : public ImmutableFieldGenerator {
- public:
-  explicit ImmutableEnumFieldGenerator(const FieldDescriptor* descriptor,
-                                       int messageBitIndex, int builderBitIndex,
-                                       Context* context);
-  ImmutableEnumFieldGenerator(const ImmutableEnumFieldGenerator&) = delete;
-  ImmutableEnumFieldGenerator& operator=(const ImmutableEnumFieldGenerator&) =
-      delete;
-  ~ImmutableEnumFieldGenerator() override;
-
-  // implements ImmutableFieldGenerator
-  // ---------------------------------------
-  int GetMessageBitIndex() const override;
-  int GetBuilderBitIndex() const override;
-  int GetNumBitsForMessage() const override;
-  int GetNumBitsForBuilder() const override;
-  void GenerateInterfaceMembers(io::Printer* printer) const override;
-  void GenerateMembers(io::Printer* printer) const override;
-  void GenerateBuilderMembers(io::Printer* printer) const override;
-  void GenerateInitializationCode(io::Printer* printer) const override;
-  void GenerateBuilderClearCode(io::Printer* printer) const override;
-  void GenerateBuilderParsingCode(io::Printer* printer) const override;
-  void GenerateMergingCode(io::Printer* printer) const override;
-  void GenerateBuildingCode(io::Printer* printer) const override;
-  void GenerateSerializationCode(io::Printer* printer) const override;
-  void GenerateSerializedSizeCode(io::Printer* printer) const override;
-  void GenerateFieldBuilderInitializationCode(
-      io::Printer* printer) const override;
-  void GenerateEqualsCode(io::Printer* printer) const override;
-  void GenerateHashCode(io::Printer* printer) const override;
-  void GenerateKotlinDslMembers(io::Printer* printer) const override;
-
-  std::string GetBoxedType() const override;
-
- protected:
-  const FieldDescriptor* descriptor_;
-  int message_bit_index_;
-  int builder_bit_index_;
-  std::map<std::string, std::string> variables_;
-  ClassNameResolver* name_resolver_;
-};
-
-class ImmutableEnumOneofFieldGenerator : public ImmutableEnumFieldGenerator {
- public:
-  ImmutableEnumOneofFieldGenerator(const FieldDescriptor* descriptor,
-                                   int messageBitIndex, int builderBitIndex,
-                                   Context* context);
-  ImmutableEnumOneofFieldGenerator(const ImmutableEnumOneofFieldGenerator&) =
-      delete;
-  ImmutableEnumOneofFieldGenerator& operator=(
-      const ImmutableEnumOneofFieldGenerator&) = delete;
-  ~ImmutableEnumOneofFieldGenerator() override;
-
-  void GenerateMembers(io::Printer* printer) const override;
-  void GenerateBuilderMembers(io::Printer* printer) const override;
-  void GenerateBuilderClearCode(io::Printer* printer) const override;
-  void GenerateMergingCode(io::Printer* printer) const override;
-  void GenerateBuildingCode(io::Printer* printer) const override;
-  void GenerateBuilderParsingCode(io::Printer* printer) const override;
-  void GenerateSerializationCode(io::Printer* printer) const override;
-  void GenerateSerializedSizeCode(io::Printer* printer) const override;
-  void GenerateEqualsCode(io::Printer* printer) const override;
-  void GenerateHashCode(io::Printer* printer) const override;
-};
-
-class RepeatedImmutableEnumFieldGenerator : public ImmutableEnumFieldGenerator {
- public:
-  explicit RepeatedImmutableEnumFieldGenerator(
-      const FieldDescriptor* descriptor, int messageBitIndex,
-      int builderBitIndex, Context* context);
-  RepeatedImmutableEnumFieldGenerator(
-      const RepeatedImmutableEnumFieldGenerator&) = delete;
-  RepeatedImmutableEnumFieldGenerator& operator=(
-      const RepeatedImmutableEnumFieldGenerator&) = delete;
-  ~RepeatedImmutableEnumFieldGenerator() override;
-
-  // implements ImmutableFieldGenerator ---------------------------------------
-  int GetNumBitsForMessage() const override;
-  int GetNumBitsForBuilder() const override;
-  void GenerateInterfaceMembers(io::Printer* printer) const override;
-  void GenerateMembers(io::Printer* printer) const override;
-  void GenerateBuilderMembers(io::Printer* printer) const override;
-  void GenerateInitializationCode(io::Printer* printer) const override;
-  void GenerateBuilderClearCode(io::Printer* printer) const override;
-  void GenerateMergingCode(io::Printer* printer) const override;
-  void GenerateBuildingCode(io::Printer* printer) const override;
-  void GenerateBuilderParsingCode(io::Printer* printer) const override;
-  void GenerateBuilderParsingCodeFromPacked(
-      io::Printer* printer) const override;
-  void GenerateSerializationCode(io::Printer* printer) const override;
-  void GenerateSerializedSizeCode(io::Printer* printer) const override;
-  void GenerateFieldBuilderInitializationCode(
-      io::Printer* printer) const override;
-  void GenerateEqualsCode(io::Printer* printer) const override;
-  void GenerateHashCode(io::Printer* printer) const override;
-  void GenerateKotlinDslMembers(io::Printer* printer) const override;
-
-  std::string GetBoxedType() const override;
-};
-
-}  // namespace java
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // GOOGLE_PROTOBUF_COMPILER_JAVA_ENUM_FIELD_H__
diff --git a/libs/protobuf/src/google/protobuf/compiler/java/enum_field_lite.cc b/libs/protobuf/src/google/protobuf/compiler/java/enum_field_lite.cc
deleted file mode 100644
index e80b938..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/java/enum_field_lite.cc
+++ /dev/null
@@ -1,923 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-
-#include <google/protobuf/compiler/java/enum_field_lite.h>
-
-#include <cstdint>
-#include <map>
-#include <string>
-
-#include <google/protobuf/stubs/logging.h>
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/io/printer.h>
-#include <google/protobuf/wire_format.h>
-#include <google/protobuf/stubs/strutil.h>
-#include <google/protobuf/compiler/java/context.h>
-#include <google/protobuf/compiler/java/doc_comment.h>
-#include <google/protobuf/compiler/java/helpers.h>
-#include <google/protobuf/compiler/java/name_resolver.h>
-
-// Must be last.
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace java {
-
-namespace {
-bool EnableExperimentalRuntimeForLite() {
-#ifdef PROTOBUF_EXPERIMENT
-  return PROTOBUF_EXPERIMENT;
-#else   // PROTOBUF_EXPERIMENT
-  return false;
-#endif  // !PROTOBUF_EXPERIMENT
-}
-
-void SetEnumVariables(const FieldDescriptor* descriptor, int messageBitIndex,
-                      int builderBitIndex, const FieldGeneratorInfo* info,
-                      ClassNameResolver* name_resolver,
-                      std::map<std::string, std::string>* variables) {
-  SetCommonFieldVariables(descriptor, info, variables);
-
-  (*variables)["type"] =
-      name_resolver->GetImmutableClassName(descriptor->enum_type());
-  (*variables)["kt_type"] = (*variables)["type"];
-  (*variables)["mutable_type"] =
-      name_resolver->GetMutableClassName(descriptor->enum_type());
-  (*variables)["default"] = ImmutableDefaultValue(descriptor, name_resolver);
-  (*variables)["default_number"] =
-      StrCat(descriptor->default_value_enum()->number());
-  (*variables)["tag"] = StrCat(
-      static_cast<int32_t>(internal::WireFormat::MakeTag(descriptor)));
-  (*variables)["tag_size"] = StrCat(
-      internal::WireFormat::TagSize(descriptor->number(), GetType(descriptor)));
-  // TODO(birdo): Add @deprecated javadoc when generating javadoc is supported
-  // by the proto compiler
-  (*variables)["deprecation"] =
-      descriptor->options().deprecated() ? "@java.lang.Deprecated " : "";
-  (*variables)["kt_deprecation"] =
-      descriptor->options().deprecated()
-          ? "@kotlin.Deprecated(message = \"Field " + (*variables)["name"] +
-                " is deprecated\") "
-          : "";
-  (*variables)["required"] = descriptor->is_required() ? "true" : "false";
-
-  if (HasHasbit(descriptor)) {
-    // For singular messages and builders, one bit is used for the hasField bit.
-    (*variables)["get_has_field_bit_message"] = GenerateGetBit(messageBitIndex);
-
-    // Note that these have a trailing ";".
-    (*variables)["set_has_field_bit_message"] =
-        GenerateSetBit(messageBitIndex) + ";";
-    (*variables)["clear_has_field_bit_message"] =
-        GenerateClearBit(messageBitIndex) + ";";
-
-    (*variables)["is_field_present_message"] = GenerateGetBit(messageBitIndex);
-  } else {
-    (*variables)["set_has_field_bit_message"] = "";
-    (*variables)["clear_has_field_bit_message"] = "";
-
-    (*variables)["is_field_present_message"] =
-        (*variables)["name"] + "_ != " + (*variables)["default"] +
-        ".getNumber()";
-  }
-
-  (*variables)["get_has_field_bit_from_local"] =
-      GenerateGetBitFromLocal(builderBitIndex);
-  (*variables)["set_has_field_bit_to_local"] =
-      GenerateSetBitToLocal(messageBitIndex);
-
-  if (SupportUnknownEnumValue(descriptor->file())) {
-    (*variables)["unknown"] = (*variables)["type"] + ".UNRECOGNIZED";
-  } else {
-    (*variables)["unknown"] = (*variables)["default"];
-  }
-
-  // We use `x.getClass()` as a null check because it generates less bytecode
-  // than an `if (x == null) { throw ... }` statement.
-  (*variables)["null_check"] = "value.getClass();\n";
-}
-
-}  // namespace
-
-// ===================================================================
-
-ImmutableEnumFieldLiteGenerator::ImmutableEnumFieldLiteGenerator(
-    const FieldDescriptor* descriptor, int messageBitIndex, Context* context)
-    : descriptor_(descriptor),
-      messageBitIndex_(messageBitIndex),
-      context_(context),
-      name_resolver_(context->GetNameResolver()) {
-  SetEnumVariables(descriptor, messageBitIndex, 0,
-                   context->GetFieldGeneratorInfo(descriptor), name_resolver_,
-                   &variables_);
-}
-
-ImmutableEnumFieldLiteGenerator::~ImmutableEnumFieldLiteGenerator() {}
-
-int ImmutableEnumFieldLiteGenerator::GetNumBitsForMessage() const {
-  return HasHasbit(descriptor_) ? 1 : 0;
-}
-
-void ImmutableEnumFieldLiteGenerator::GenerateInterfaceMembers(
-    io::Printer* printer) const {
-  if (HasHazzer(descriptor_)) {
-    WriteFieldAccessorDocComment(printer, descriptor_, HAZZER);
-    printer->Print(variables_,
-                   "$deprecation$boolean has$capitalized_name$();\n");
-  }
-  if (SupportUnknownEnumValue(descriptor_->file())) {
-    WriteFieldEnumValueAccessorDocComment(printer, descriptor_, GETTER);
-    printer->Print(variables_,
-                   "$deprecation$int get$capitalized_name$Value();\n");
-  }
-  WriteFieldAccessorDocComment(printer, descriptor_, GETTER);
-  printer->Print(variables_, "$deprecation$$type$ get$capitalized_name$();\n");
-}
-
-void ImmutableEnumFieldLiteGenerator::GenerateMembers(
-    io::Printer* printer) const {
-  printer->Print(variables_, "private int $name$_;\n");
-  PrintExtraFieldInfo(variables_, printer);
-  if (HasHazzer(descriptor_)) {
-    WriteFieldAccessorDocComment(printer, descriptor_, HAZZER);
-    printer->Print(
-        variables_,
-        "@java.lang.Override\n"
-        "$deprecation$public boolean ${$has$capitalized_name$$}$() {\n"
-        "  return $get_has_field_bit_message$;\n"
-        "}\n");
-    printer->Annotate("{", "}", descriptor_);
-  }
-  if (SupportUnknownEnumValue(descriptor_->file())) {
-    WriteFieldEnumValueAccessorDocComment(printer, descriptor_, GETTER);
-    printer->Print(
-        variables_,
-        "@java.lang.Override\n"
-        "$deprecation$public int ${$get$capitalized_name$Value$}$() {\n"
-        "  return $name$_;\n"
-        "}\n");
-    printer->Annotate("{", "}", descriptor_);
-  }
-  WriteFieldAccessorDocComment(printer, descriptor_, GETTER);
-  printer->Print(variables_,
-                 "@java.lang.Override\n"
-                 "$deprecation$public $type$ ${$get$capitalized_name$$}$() {\n"
-                 "  $type$ result = $type$.forNumber($name$_);\n"
-                 "  return result == null ? $unknown$ : result;\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-
-  // Generate private setters for the builder to proxy into.
-  if (SupportUnknownEnumValue(descriptor_->file())) {
-    WriteFieldEnumValueAccessorDocComment(printer, descriptor_, SETTER);
-    printer->Print(variables_,
-                   "private void set$capitalized_name$Value(int value) {\n"
-                   "  $set_has_field_bit_message$"
-                   "  $name$_ = value;\n"
-                   "}\n");
-  }
-  WriteFieldAccessorDocComment(printer, descriptor_, SETTER);
-  printer->Print(variables_,
-                 "private void set$capitalized_name$($type$ value) {\n"
-                 "  $name$_ = value.getNumber();\n"
-                 "  $set_has_field_bit_message$\n"
-                 "}\n");
-  WriteFieldAccessorDocComment(printer, descriptor_, CLEARER);
-  printer->Print(variables_,
-                 "private void clear$capitalized_name$() {\n"
-                 "  $clear_has_field_bit_message$\n"
-                 "  $name$_ = $default_number$;\n"
-                 "}\n");
-}
-
-void ImmutableEnumFieldLiteGenerator::GenerateBuilderMembers(
-    io::Printer* printer) const {
-  if (HasHazzer(descriptor_)) {
-    WriteFieldAccessorDocComment(printer, descriptor_, HAZZER);
-    printer->Print(
-        variables_,
-        "@java.lang.Override\n"
-        "$deprecation$public boolean ${$has$capitalized_name$$}$() {\n"
-        "  return instance.has$capitalized_name$();\n"
-        "}\n");
-    printer->Annotate("{", "}", descriptor_);
-  }
-  if (SupportUnknownEnumValue(descriptor_->file())) {
-    WriteFieldEnumValueAccessorDocComment(printer, descriptor_, GETTER);
-    printer->Print(
-        variables_,
-        "@java.lang.Override\n"
-        "$deprecation$public int ${$get$capitalized_name$Value$}$() {\n"
-        "  return instance.get$capitalized_name$Value();\n"
-        "}\n");
-    printer->Annotate("{", "}", descriptor_);
-    WriteFieldAccessorDocComment(printer, descriptor_, SETTER,
-                                 /* builder */ true);
-    printer->Print(variables_,
-                   "$deprecation$public Builder "
-                   "${$set$capitalized_name$Value$}$(int value) {\n"
-                   "  copyOnWrite();\n"
-                   "  instance.set$capitalized_name$Value(value);\n"
-                   "  return this;\n"
-                   "}\n");
-    printer->Annotate("{", "}", descriptor_);
-  }
-  WriteFieldAccessorDocComment(printer, descriptor_, GETTER);
-  printer->Print(variables_,
-                 "@java.lang.Override\n"
-                 "$deprecation$public $type$ ${$get$capitalized_name$$}$() {\n"
-                 "  return instance.get$capitalized_name$();\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-  WriteFieldEnumValueAccessorDocComment(printer, descriptor_, SETTER,
-                                        /* builder */ true);
-  printer->Print(variables_,
-                 "$deprecation$public Builder "
-                 "${$set$capitalized_name$$}$($type$ value) {\n"
-                 "  copyOnWrite();\n"
-                 "  instance.set$capitalized_name$(value);\n"
-                 "  return this;\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-  WriteFieldAccessorDocComment(printer, descriptor_, CLEARER,
-                               /* builder */ true);
-  printer->Print(
-      variables_,
-      "$deprecation$public Builder ${$clear$capitalized_name$$}$() {\n"
-      "  copyOnWrite();\n"
-      "  instance.clear$capitalized_name$();\n"
-      "  return this;\n"
-      "}\n");
-  printer->Annotate("{", "}", descriptor_);
-}
-
-void ImmutableEnumFieldLiteGenerator::GenerateKotlinDslMembers(
-    io::Printer* printer) const {
-  WriteFieldDocComment(printer, descriptor_);
-  printer->Print(variables_,
-                 "$kt_deprecation$public var $kt_name$: $kt_type$\n"
-                 "  @JvmName(\"${$get$kt_capitalized_name$$}$\")\n"
-                 "  get() = $kt_dsl_builder$.${$get$capitalized_name$$}$()\n"
-                 "  @JvmName(\"${$set$kt_capitalized_name$$}$\")\n"
-                 "  set(value) {\n"
-                 "    $kt_dsl_builder$.${$set$capitalized_name$$}$(value)\n"
-                 "  }\n");
-
-  WriteFieldAccessorDocComment(printer, descriptor_, CLEARER,
-                               /* builder */ false);
-  printer->Print(variables_,
-                 "public fun ${$clear$kt_capitalized_name$$}$() {\n"
-                 "  $kt_dsl_builder$.${$clear$capitalized_name$$}$()\n"
-                 "}\n");
-
-  if (HasHazzer(descriptor_)) {
-    WriteFieldAccessorDocComment(printer, descriptor_, HAZZER);
-    printer->Print(
-        variables_,
-        "public fun ${$has$kt_capitalized_name$$}$(): kotlin.Boolean {\n"
-        "  return $kt_dsl_builder$.${$has$capitalized_name$$}$()\n"
-        "}\n");
-  }
-}
-
-void ImmutableEnumFieldLiteGenerator::GenerateInitializationCode(
-    io::Printer* printer) const {
-  if (!IsDefaultValueJavaDefault(descriptor_)) {
-    printer->Print(variables_, "$name$_ = $default_number$;\n");
-  }
-}
-
-void ImmutableEnumFieldLiteGenerator::GenerateFieldInfo(
-    io::Printer* printer, std::vector<uint16_t>* output) const {
-  WriteIntToUtf16CharSequence(descriptor_->number(), output);
-  WriteIntToUtf16CharSequence(GetExperimentalJavaFieldType(descriptor_),
-                              output);
-  if (HasHasbit(descriptor_)) {
-    WriteIntToUtf16CharSequence(messageBitIndex_, output);
-  }
-  printer->Print(variables_, "\"$name$_\",\n");
-  if (!SupportUnknownEnumValue((descriptor_))) {
-    PrintEnumVerifierLogic(printer, descriptor_, variables_,
-                           /*var_name=*/"$type$",
-                           /*terminating_string=*/",\n",
-                           /*enforce_lite=*/context_->EnforceLite());
-  }
-}
-
-std::string ImmutableEnumFieldLiteGenerator::GetBoxedType() const {
-  return name_resolver_->GetImmutableClassName(descriptor_->enum_type());
-}
-
-// ===================================================================
-
-ImmutableEnumOneofFieldLiteGenerator::ImmutableEnumOneofFieldLiteGenerator(
-    const FieldDescriptor* descriptor, int messageBitIndex, Context* context)
-    : ImmutableEnumFieldLiteGenerator(descriptor, messageBitIndex, context) {
-  const OneofGeneratorInfo* info =
-      context->GetOneofGeneratorInfo(descriptor->containing_oneof());
-  SetCommonOneofVariables(descriptor, info, &variables_);
-}
-
-ImmutableEnumOneofFieldLiteGenerator::~ImmutableEnumOneofFieldLiteGenerator() {}
-
-void ImmutableEnumOneofFieldLiteGenerator::GenerateMembers(
-    io::Printer* printer) const {
-  PrintExtraFieldInfo(variables_, printer);
-  GOOGLE_DCHECK(HasHazzer(descriptor_));
-  WriteFieldAccessorDocComment(printer, descriptor_, HAZZER);
-  printer->Print(variables_,
-                 "@java.lang.Override\n"
-                 "$deprecation$public boolean ${$has$capitalized_name$$}$() {\n"
-                 "  return $has_oneof_case_message$;\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-
-  if (SupportUnknownEnumValue(descriptor_->file())) {
-    WriteFieldEnumValueAccessorDocComment(printer, descriptor_, GETTER);
-    printer->Print(
-        variables_,
-        "@java.lang.Override\n"
-        "$deprecation$public int ${$get$capitalized_name$Value$}$() {\n"
-        "  if ($has_oneof_case_message$) {\n"
-        "    return (java.lang.Integer) $oneof_name$_;\n"
-        "  }\n"
-        "  return $default_number$;\n"
-        "}\n");
-    printer->Annotate("{", "}", descriptor_);
-  }
-  WriteFieldAccessorDocComment(printer, descriptor_, GETTER);
-  printer->Print(variables_,
-                 "@java.lang.Override\n"
-                 "$deprecation$public $type$ ${$get$capitalized_name$$}$() {\n"
-                 "  if ($has_oneof_case_message$) {\n"
-                 "    $type$ result = $type$.forNumber((java.lang.Integer) "
-                 "$oneof_name$_);\n"
-                 "    return result == null ? $unknown$ : result;\n"
-                 "  }\n"
-                 "  return $default$;\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-
-  // Generate private setters for the builder to proxy into.
-  if (SupportUnknownEnumValue(descriptor_->file())) {
-    WriteFieldEnumValueAccessorDocComment(printer, descriptor_, SETTER);
-    printer->Print(variables_,
-                   "private void set$capitalized_name$Value(int value) {\n"
-                   "  $set_oneof_case_message$;\n"
-                   "  $oneof_name$_ = value;\n"
-                   "}\n");
-  }
-  WriteFieldAccessorDocComment(printer, descriptor_, SETTER);
-  printer->Print(variables_,
-                 "private void set$capitalized_name$($type$ value) {\n"
-                 "  $oneof_name$_ = value.getNumber();\n"
-                 "  $set_oneof_case_message$;\n"
-                 "}\n");
-  WriteFieldAccessorDocComment(printer, descriptor_, CLEARER);
-  printer->Print(variables_,
-                 "private void clear$capitalized_name$() {\n"
-                 "  if ($has_oneof_case_message$) {\n"
-                 "    $clear_oneof_case_message$;\n"
-                 "    $oneof_name$_ = null;\n"
-                 "  }\n"
-                 "}\n");
-}
-
-void ImmutableEnumOneofFieldLiteGenerator::GenerateFieldInfo(
-    io::Printer* printer, std::vector<uint16_t>* output) const {
-  WriteIntToUtf16CharSequence(descriptor_->number(), output);
-  WriteIntToUtf16CharSequence(GetExperimentalJavaFieldType(descriptor_),
-                              output);
-  WriteIntToUtf16CharSequence(descriptor_->containing_oneof()->index(), output);
-  if (!SupportUnknownEnumValue(descriptor_)) {
-    PrintEnumVerifierLogic(printer, descriptor_, variables_,
-                           /*var_name=*/"$type$",
-                           /*terminating_string=*/",\n",
-                           /*enforce_lite=*/context_->EnforceLite());
-  }
-}
-
-void ImmutableEnumOneofFieldLiteGenerator::GenerateBuilderMembers(
-    io::Printer* printer) const {
-  GOOGLE_DCHECK(HasHazzer(descriptor_));
-  WriteFieldAccessorDocComment(printer, descriptor_, HAZZER);
-  printer->Print(variables_,
-                 "@java.lang.Override\n"
-                 "$deprecation$public boolean ${$has$capitalized_name$$}$() {\n"
-                 "  return instance.has$capitalized_name$();\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-
-  if (SupportUnknownEnumValue(descriptor_->file())) {
-    WriteFieldEnumValueAccessorDocComment(printer, descriptor_, GETTER);
-    printer->Print(
-        variables_,
-        "@java.lang.Override\n"
-        "$deprecation$public int ${$get$capitalized_name$Value$}$() {\n"
-        "  return instance.get$capitalized_name$Value();\n"
-        "}\n");
-    printer->Annotate("{", "}", descriptor_);
-    WriteFieldEnumValueAccessorDocComment(printer, descriptor_, SETTER,
-                                          /* builder */ true);
-    printer->Print(variables_,
-                   "$deprecation$public Builder "
-                   "${$set$capitalized_name$Value$}$(int value) {\n"
-                   "  copyOnWrite();\n"
-                   "  instance.set$capitalized_name$Value(value);\n"
-                   "  return this;\n"
-                   "}\n");
-    printer->Annotate("{", "}", descriptor_);
-  }
-  WriteFieldAccessorDocComment(printer, descriptor_, GETTER);
-  printer->Print(variables_,
-                 "@java.lang.Override\n"
-                 "$deprecation$public $type$ ${$get$capitalized_name$$}$() {\n"
-                 "  return instance.get$capitalized_name$();\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-  WriteFieldAccessorDocComment(printer, descriptor_, SETTER,
-                               /* builder */ true);
-  printer->Print(variables_,
-                 "$deprecation$public Builder "
-                 "${$set$capitalized_name$$}$($type$ value) {\n"
-                 "  copyOnWrite();\n"
-                 "  instance.set$capitalized_name$(value);\n"
-                 "  return this;\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-  WriteFieldAccessorDocComment(printer, descriptor_, CLEARER,
-                               /* builder */ true);
-  printer->Print(
-      variables_,
-      "$deprecation$public Builder ${$clear$capitalized_name$$}$() {\n"
-      "  copyOnWrite();\n"
-      "  instance.clear$capitalized_name$();\n"
-      "  return this;\n"
-      "}\n");
-  printer->Annotate("{", "}", descriptor_);
-}
-
-// ===================================================================
-
-RepeatedImmutableEnumFieldLiteGenerator::
-    RepeatedImmutableEnumFieldLiteGenerator(const FieldDescriptor* descriptor,
-                                            int messageBitIndex,
-                                            Context* context)
-    : descriptor_(descriptor),
-      context_(context),
-      name_resolver_(context->GetNameResolver()) {
-  SetEnumVariables(descriptor, messageBitIndex, 0,
-                   context->GetFieldGeneratorInfo(descriptor), name_resolver_,
-                   &variables_);
-}
-
-RepeatedImmutableEnumFieldLiteGenerator::
-    ~RepeatedImmutableEnumFieldLiteGenerator() {}
-
-int RepeatedImmutableEnumFieldLiteGenerator::GetNumBitsForMessage() const {
-  return 0;
-}
-
-void RepeatedImmutableEnumFieldLiteGenerator::GenerateInterfaceMembers(
-    io::Printer* printer) const {
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_GETTER);
-  printer->Print(
-      variables_,
-      "$deprecation$java.util.List<$type$> get$capitalized_name$List();\n");
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_COUNT);
-  printer->Print(variables_,
-                 "$deprecation$int get$capitalized_name$Count();\n");
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_INDEXED_GETTER);
-  printer->Print(variables_,
-                 "$deprecation$$type$ get$capitalized_name$(int index);\n");
-  if (SupportUnknownEnumValue(descriptor_->file())) {
-    WriteFieldEnumValueAccessorDocComment(printer, descriptor_, LIST_GETTER);
-    printer->Print(variables_,
-                   "$deprecation$java.util.List<java.lang.Integer>\n"
-                   "get$capitalized_name$ValueList();\n");
-    WriteFieldEnumValueAccessorDocComment(printer, descriptor_,
-                                          LIST_INDEXED_GETTER);
-    printer->Print(variables_,
-                   "$deprecation$int get$capitalized_name$Value(int index);\n");
-  }
-}
-
-void RepeatedImmutableEnumFieldLiteGenerator::GenerateMembers(
-    io::Printer* printer) const {
-  printer->Print(
-      variables_,
-      "private com.google.protobuf.Internal.IntList $name$_;\n"
-      "private static final "
-      "com.google.protobuf.Internal.ListAdapter.Converter<\n"
-      "    java.lang.Integer, $type$> $name$_converter_ =\n"
-      "        new com.google.protobuf.Internal.ListAdapter.Converter<\n"
-      "            java.lang.Integer, $type$>() {\n"
-      "          @java.lang.Override\n"
-      "          public $type$ convert(java.lang.Integer from) {\n"
-      "            $type$ result = $type$.forNumber(from);\n"
-      "            return result == null ? $unknown$ : result;\n"
-      "          }\n"
-      "        };\n");
-  PrintExtraFieldInfo(variables_, printer);
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_GETTER);
-  printer->Print(
-      variables_,
-      "@java.lang.Override\n"
-      "$deprecation$public java.util.List<$type$> "
-      "${$get$capitalized_name$List$}$() {\n"
-      "  return new com.google.protobuf.Internal.ListAdapter<\n"
-      "      java.lang.Integer, $type$>($name$_, $name$_converter_);\n"
-      "}\n");
-  printer->Annotate("{", "}", descriptor_);
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_COUNT);
-  printer->Print(
-      variables_,
-      "@java.lang.Override\n"
-      "$deprecation$public int ${$get$capitalized_name$Count$}$() {\n"
-      "  return $name$_.size();\n"
-      "}\n");
-  printer->Annotate("{", "}", descriptor_);
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_INDEXED_GETTER);
-  printer->Print(
-      variables_,
-      // NB: Do not use the "$name$_converter_" field; the usage of generics
-      // (and requisite upcasts to Object) prevent optimizations.  Even
-      // without any optimizations, the below code is cheaper because it
-      // avoids boxing an int and a checkcast from the generics.
-      "@java.lang.Override\n"
-      "$deprecation$public $type$ ${$get$capitalized_name$$}$(int index) {\n"
-      "  $type$ result = $type$.forNumber($name$_.getInt(index));\n"
-      "  return result == null ? $unknown$ : result;\n"
-      "}\n");
-  printer->Annotate("{", "}", descriptor_);
-  if (SupportUnknownEnumValue(descriptor_->file())) {
-    WriteFieldEnumValueAccessorDocComment(printer, descriptor_, LIST_GETTER);
-    printer->Print(variables_,
-                   "@java.lang.Override\n"
-                   "$deprecation$public java.util.List<java.lang.Integer>\n"
-                   "${$get$capitalized_name$ValueList$}$() {\n"
-                   "  return $name$_;\n"
-                   "}\n");
-    printer->Annotate("{", "}", descriptor_);
-    WriteFieldEnumValueAccessorDocComment(printer, descriptor_,
-                                          LIST_INDEXED_GETTER);
-    printer->Print(variables_,
-                   "@java.lang.Override\n"
-                   "$deprecation$public int "
-                   "${$get$capitalized_name$Value$}$(int index) {\n"
-                   "  return $name$_.getInt(index);\n"
-                   "}\n");
-    printer->Annotate("{", "}", descriptor_);
-  }
-
-  if (!EnableExperimentalRuntimeForLite() && descriptor_->is_packed() &&
-      context_->HasGeneratedMethods(descriptor_->containing_type())) {
-    printer->Print(variables_, "private int $name$MemoizedSerializedSize;\n");
-  }
-
-  // Generate private setters for the builder to proxy into.
-  printer->Print(
-      variables_,
-      "private void ensure$capitalized_name$IsMutable() {\n"
-      // Use a temporary to avoid a redundant iget-object.
-      "  com.google.protobuf.Internal.IntList tmp = $name$_;\n"
-      "  if (!tmp.isModifiable()) {\n"
-      "    $name$_ =\n"
-      "        com.google.protobuf.GeneratedMessageLite.mutableCopy(tmp);\n"
-      "  }\n"
-      "}\n");
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_INDEXED_SETTER);
-  printer->Print(variables_,
-                 "private void set$capitalized_name$(\n"
-                 "    int index, $type$ value) {\n"
-                 "  $null_check$"
-                 "  ensure$capitalized_name$IsMutable();\n"
-                 "  $name$_.setInt(index, value.getNumber());\n"
-                 "}\n");
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_ADDER);
-  printer->Print(variables_,
-                 "private void add$capitalized_name$($type$ value) {\n"
-                 "  $null_check$"
-                 "  ensure$capitalized_name$IsMutable();\n"
-                 "  $name$_.addInt(value.getNumber());\n"
-                 "}\n");
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_MULTI_ADDER);
-  printer->Print(variables_,
-                 "private void addAll$capitalized_name$(\n"
-                 "    java.lang.Iterable<? extends $type$> values) {\n"
-                 "  ensure$capitalized_name$IsMutable();\n"
-                 "  for ($type$ value : values) {\n"
-                 "    $name$_.addInt(value.getNumber());\n"
-                 "  }\n"
-                 "}\n");
-  WriteFieldAccessorDocComment(printer, descriptor_, CLEARER);
-  printer->Print(variables_,
-                 "private void clear$capitalized_name$() {\n"
-                 "  $name$_ = emptyIntList();\n"
-                 "}\n");
-
-  if (SupportUnknownEnumValue(descriptor_->file())) {
-    WriteFieldEnumValueAccessorDocComment(printer, descriptor_, SETTER);
-    printer->Print(variables_,
-                   "private void set$capitalized_name$Value(\n"
-                   "    int index, int value) {\n"
-                   "  ensure$capitalized_name$IsMutable();\n"
-                   "  $name$_.setInt(index, value);\n"
-                   "}\n");
-    WriteFieldEnumValueAccessorDocComment(printer, descriptor_, LIST_ADDER);
-    printer->Print(variables_,
-                   "private void add$capitalized_name$Value(int value) {\n"
-                   "  ensure$capitalized_name$IsMutable();\n"
-                   "  $name$_.addInt(value);\n"
-                   "}\n");
-    WriteFieldEnumValueAccessorDocComment(printer, descriptor_,
-                                          LIST_MULTI_ADDER);
-    printer->Print(variables_,
-                   "private void addAll$capitalized_name$Value(\n"
-                   "    java.lang.Iterable<java.lang.Integer> values) {\n"
-                   "  ensure$capitalized_name$IsMutable();\n"
-                   "  for (int value : values) {\n"
-                   "    $name$_.addInt(value);\n"
-                   "  }\n"
-                   "}\n");
-  }
-}
-
-void RepeatedImmutableEnumFieldLiteGenerator::GenerateFieldInfo(
-    io::Printer* printer, std::vector<uint16_t>* output) const {
-  WriteIntToUtf16CharSequence(descriptor_->number(), output);
-  WriteIntToUtf16CharSequence(GetExperimentalJavaFieldType(descriptor_),
-                              output);
-  printer->Print(variables_, "\"$name$_\",\n");
-  if (!SupportUnknownEnumValue(descriptor_->file())) {
-    PrintEnumVerifierLogic(printer, descriptor_, variables_,
-                           /*var_name=*/"$type$",
-                           /*terminating_string=*/",\n",
-                           /*enforce_lite=*/context_->EnforceLite());
-  }
-}
-
-void RepeatedImmutableEnumFieldLiteGenerator::GenerateBuilderMembers(
-    io::Printer* printer) const {
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_GETTER);
-  printer->Print(variables_,
-                 "@java.lang.Override\n"
-                 "$deprecation$public java.util.List<$type$> "
-                 "${$get$capitalized_name$List$}$() {\n"
-                 "  return instance.get$capitalized_name$List();\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_COUNT);
-  printer->Print(
-      variables_,
-      "@java.lang.Override\n"
-      "$deprecation$public int ${$get$capitalized_name$Count$}$() {\n"
-      "  return instance.get$capitalized_name$Count();\n"
-      "}\n");
-  printer->Annotate("{", "}", descriptor_);
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_INDEXED_GETTER);
-  printer->Print(
-      variables_,
-      "@java.lang.Override\n"
-      "$deprecation$public $type$ ${$get$capitalized_name$$}$(int index) {\n"
-      "  return instance.get$capitalized_name$(index);\n"
-      "}\n");
-  printer->Annotate("{", "}", descriptor_);
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_INDEXED_SETTER,
-                               /* builder */ true);
-  printer->Print(variables_,
-                 "$deprecation$public Builder ${$set$capitalized_name$$}$(\n"
-                 "    int index, $type$ value) {\n"
-                 "  copyOnWrite();\n"
-                 "  instance.set$capitalized_name$(index, value);\n"
-                 "  return this;\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_ADDER,
-                               /* builder */ true);
-  printer->Print(variables_,
-                 "$deprecation$public Builder "
-                 "${$add$capitalized_name$$}$($type$ value) {\n"
-                 "  copyOnWrite();\n"
-                 "  instance.add$capitalized_name$(value);\n"
-                 "  return this;\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_MULTI_ADDER,
-                               /* builder */ true);
-  printer->Print(variables_,
-                 "$deprecation$public Builder ${$addAll$capitalized_name$$}$(\n"
-                 "    java.lang.Iterable<? extends $type$> values) {\n"
-                 "  copyOnWrite();\n"
-                 "  instance.addAll$capitalized_name$(values);"
-                 "  return this;\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-  WriteFieldAccessorDocComment(printer, descriptor_, CLEARER,
-                               /* builder */ true);
-  printer->Print(
-      variables_,
-      "$deprecation$public Builder ${$clear$capitalized_name$$}$() {\n"
-      "  copyOnWrite();\n"
-      "  instance.clear$capitalized_name$();\n"
-      "  return this;\n"
-      "}\n");
-  printer->Annotate("{", "}", descriptor_);
-
-  if (SupportUnknownEnumValue(descriptor_->file())) {
-    WriteFieldEnumValueAccessorDocComment(printer, descriptor_, LIST_GETTER);
-    printer->Print(variables_,
-                   "@java.lang.Override\n"
-                   "$deprecation$public java.util.List<java.lang.Integer>\n"
-                   "${$get$capitalized_name$ValueList$}$() {\n"
-                   "  return java.util.Collections.unmodifiableList(\n"
-                   "      instance.get$capitalized_name$ValueList());\n"
-                   "}\n");
-    printer->Annotate("{", "}", descriptor_);
-    WriteFieldEnumValueAccessorDocComment(printer, descriptor_,
-                                          LIST_INDEXED_GETTER);
-    printer->Print(variables_,
-                   "@java.lang.Override\n"
-                   "$deprecation$public int "
-                   "${$get$capitalized_name$Value$}$(int index) {\n"
-                   "  return instance.get$capitalized_name$Value(index);\n"
-                   "}\n");
-    printer->Annotate("{", "}", descriptor_);
-    WriteFieldEnumValueAccessorDocComment(printer, descriptor_,
-                                          LIST_INDEXED_SETTER,
-                                          /* builder */ true);
-    printer->Print(
-        variables_,
-        "$deprecation$public Builder ${$set$capitalized_name$Value$}$(\n"
-        "    int index, int value) {\n"
-        "  copyOnWrite();\n"
-        "  instance.set$capitalized_name$Value(index, value);\n"
-        "  return this;\n"
-        "}\n");
-    printer->Annotate("{", "}", descriptor_);
-    WriteFieldEnumValueAccessorDocComment(printer, descriptor_, LIST_ADDER,
-                                          /* builder */ true);
-    printer->Print(variables_,
-                   "$deprecation$public Builder "
-                   "${$add$capitalized_name$Value$}$(int value) {\n"
-                   "  instance.add$capitalized_name$Value(value);\n"
-                   "  return this;\n"
-                   "}\n");
-    printer->Annotate("{", "}", descriptor_);
-    WriteFieldEnumValueAccessorDocComment(printer, descriptor_,
-                                          LIST_MULTI_ADDER,
-                                          /* builder */ true);
-    printer->Print(
-        variables_,
-        "$deprecation$public Builder ${$addAll$capitalized_name$Value$}$(\n"
-        "    java.lang.Iterable<java.lang.Integer> values) {\n"
-        "  copyOnWrite();\n"
-        "  instance.addAll$capitalized_name$Value(values);\n"
-        "  return this;\n"
-        "}\n");
-    printer->Annotate("{", "}", descriptor_);
-  }
-}
-
-void RepeatedImmutableEnumFieldLiteGenerator::GenerateInitializationCode(
-    io::Printer* printer) const {
-  printer->Print(variables_, "$name$_ = emptyIntList();\n");
-}
-
-void RepeatedImmutableEnumFieldLiteGenerator::GenerateKotlinDslMembers(
-    io::Printer* printer) const {
-  printer->Print(
-      variables_,
-      "/**\n"
-      " * An uninstantiable, behaviorless type to represent the field in\n"
-      " * generics.\n"
-      " */\n"
-      "@kotlin.OptIn"
-      "(com.google.protobuf.kotlin.OnlyForUseByGeneratedProtoCode::class)\n"
-      "public class ${$$kt_capitalized_name$Proxy$}$ private constructor()"
-      " : com.google.protobuf.kotlin.DslProxy()\n");
-
-  WriteFieldDocComment(printer, descriptor_);
-  printer->Print(variables_,
-                 "$kt_deprecation$ public val $kt_name$: "
-                 "com.google.protobuf.kotlin.DslList"
-                 "<$kt_type$, ${$$kt_capitalized_name$Proxy$}$>\n"
-                 "  @kotlin.jvm.JvmSynthetic\n"
-                 "  get() = com.google.protobuf.kotlin.DslList(\n"
-                 "    $kt_dsl_builder$.${$get$capitalized_name$List$}$()\n"
-                 "  )\n");
-
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_ADDER,
-                               /* builder */ false);
-  printer->Print(variables_,
-                 "@kotlin.jvm.JvmSynthetic\n"
-                 "@kotlin.jvm.JvmName(\"add$kt_capitalized_name$\")\n"
-                 "public fun com.google.protobuf.kotlin.DslList"
-                 "<$kt_type$, ${$$kt_capitalized_name$Proxy$}$>."
-                 "add(value: $kt_type$) {\n"
-                 "  $kt_dsl_builder$.${$add$capitalized_name$$}$(value)\n"
-                 "}");
-
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_ADDER,
-                               /* builder */ false);
-  printer->Print(variables_,
-                 "@kotlin.jvm.JvmSynthetic\n"
-                 "@kotlin.jvm.JvmName(\"plusAssign$kt_capitalized_name$\")\n"
-                 "@Suppress(\"NOTHING_TO_INLINE\")\n"
-                 "public inline operator fun com.google.protobuf.kotlin.DslList"
-                 "<$kt_type$, ${$$kt_capitalized_name$Proxy$}$>."
-                 "plusAssign(value: $kt_type$) {\n"
-                 "  add(value)\n"
-                 "}");
-
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_MULTI_ADDER,
-                               /* builder */ false);
-  printer->Print(variables_,
-                 "@kotlin.jvm.JvmSynthetic\n"
-                 "@kotlin.jvm.JvmName(\"addAll$kt_capitalized_name$\")\n"
-                 "public fun com.google.protobuf.kotlin.DslList"
-                 "<$kt_type$, ${$$kt_capitalized_name$Proxy$}$>."
-                 "addAll(values: kotlin.collections.Iterable<$kt_type$>) {\n"
-                 "  $kt_dsl_builder$.${$addAll$capitalized_name$$}$(values)\n"
-                 "}");
-
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_MULTI_ADDER,
-                               /* builder */ false);
-  printer->Print(
-      variables_,
-      "@kotlin.jvm.JvmSynthetic\n"
-      "@kotlin.jvm.JvmName(\"plusAssignAll$kt_capitalized_name$\")\n"
-      "@Suppress(\"NOTHING_TO_INLINE\")\n"
-      "public inline operator fun com.google.protobuf.kotlin.DslList"
-      "<$kt_type$, ${$$kt_capitalized_name$Proxy$}$>."
-      "plusAssign(values: kotlin.collections.Iterable<$kt_type$>) {\n"
-      "  addAll(values)\n"
-      "}");
-
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_INDEXED_SETTER,
-                               /* builder */ false);
-  printer->Print(
-      variables_,
-      "@kotlin.jvm.JvmSynthetic\n"
-      "@kotlin.jvm.JvmName(\"set$kt_capitalized_name$\")\n"
-      "public operator fun com.google.protobuf.kotlin.DslList"
-      "<$kt_type$, ${$$kt_capitalized_name$Proxy$}$>."
-      "set(index: kotlin.Int, value: $kt_type$) {\n"
-      "  $kt_dsl_builder$.${$set$capitalized_name$$}$(index, value)\n"
-      "}");
-
-  WriteFieldAccessorDocComment(printer, descriptor_, CLEARER,
-                               /* builder */ false);
-  printer->Print(variables_,
-                 "@kotlin.jvm.JvmSynthetic\n"
-                 "@kotlin.jvm.JvmName(\"clear$kt_capitalized_name$\")\n"
-                 "public fun com.google.protobuf.kotlin.DslList"
-                 "<$kt_type$, ${$$kt_capitalized_name$Proxy$}$>."
-                 "clear() {\n"
-                 "  $kt_dsl_builder$.${$clear$capitalized_name$$}$()\n"
-                 "}");
-}
-
-std::string RepeatedImmutableEnumFieldLiteGenerator::GetBoxedType() const {
-  return name_resolver_->GetImmutableClassName(descriptor_->enum_type());
-}
-
-}  // namespace java
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
diff --git a/libs/protobuf/src/google/protobuf/compiler/java/enum_field_lite.h b/libs/protobuf/src/google/protobuf/compiler/java/enum_field_lite.h
deleted file mode 100644
index 492b268..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/java/enum_field_lite.h
+++ /dev/null
@@ -1,140 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-
-#ifndef GOOGLE_PROTOBUF_COMPILER_JAVA_ENUM_FIELD_LITE_H__
-#define GOOGLE_PROTOBUF_COMPILER_JAVA_ENUM_FIELD_LITE_H__
-
-#include <cstdint>
-#include <map>
-#include <string>
-
-#include <google/protobuf/compiler/java/field.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace java {
-class Context;            // context.h
-class ClassNameResolver;  // name_resolver.h
-}  // namespace java
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace java {
-
-class ImmutableEnumFieldLiteGenerator : public ImmutableFieldLiteGenerator {
- public:
-  explicit ImmutableEnumFieldLiteGenerator(const FieldDescriptor* descriptor,
-                                           int messageBitIndex,
-                                           Context* context);
-  ~ImmutableEnumFieldLiteGenerator() override;
-
-  // implements ImmutableFieldLiteGenerator
-  // ------------------------------------
-  int GetNumBitsForMessage() const override;
-  void GenerateInterfaceMembers(io::Printer* printer) const override;
-  void GenerateMembers(io::Printer* printer) const override;
-  void GenerateBuilderMembers(io::Printer* printer) const override;
-  void GenerateInitializationCode(io::Printer* printer) const override;
-  void GenerateFieldInfo(io::Printer* printer,
-                         std::vector<uint16_t>* output) const override;
-  void GenerateKotlinDslMembers(io::Printer* printer) const override;
-
-  std::string GetBoxedType() const override;
-
- protected:
-  const FieldDescriptor* descriptor_;
-  std::map<std::string, std::string> variables_;
-  const int messageBitIndex_;
-  Context* context_;
-  ClassNameResolver* name_resolver_;
-
- private:
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(ImmutableEnumFieldLiteGenerator);
-};
-
-class ImmutableEnumOneofFieldLiteGenerator
-    : public ImmutableEnumFieldLiteGenerator {
- public:
-  ImmutableEnumOneofFieldLiteGenerator(const FieldDescriptor* descriptor,
-                                       int messageBitIndex, Context* context);
-  ~ImmutableEnumOneofFieldLiteGenerator() override;
-
-  void GenerateMembers(io::Printer* printer) const override;
-  void GenerateBuilderMembers(io::Printer* printer) const override;
-  void GenerateFieldInfo(io::Printer* printer,
-                         std::vector<uint16_t>* output) const override;
-
- private:
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(ImmutableEnumOneofFieldLiteGenerator);
-};
-
-class RepeatedImmutableEnumFieldLiteGenerator
-    : public ImmutableFieldLiteGenerator {
- public:
-  explicit RepeatedImmutableEnumFieldLiteGenerator(
-      const FieldDescriptor* descriptor, int messageBitIndex, Context* context);
-  ~RepeatedImmutableEnumFieldLiteGenerator() override;
-
-  // implements ImmutableFieldLiteGenerator ------------------------------------
-  int GetNumBitsForMessage() const override;
-  void GenerateInterfaceMembers(io::Printer* printer) const override;
-  void GenerateMembers(io::Printer* printer) const override;
-  void GenerateBuilderMembers(io::Printer* printer) const override;
-  void GenerateInitializationCode(io::Printer* printer) const override;
-  void GenerateFieldInfo(io::Printer* printer,
-                         std::vector<uint16_t>* output) const override;
-  void GenerateKotlinDslMembers(io::Printer* printer) const override;
-
-  std::string GetBoxedType() const override;
-
- private:
-  const FieldDescriptor* descriptor_;
-  std::map<std::string, std::string> variables_;
-  Context* context_;
-  ClassNameResolver* name_resolver_;
-
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(RepeatedImmutableEnumFieldLiteGenerator);
-};
-
-}  // namespace java
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // GOOGLE_PROTOBUF_COMPILER_JAVA_ENUM_FIELD_LITE_H__
diff --git a/libs/protobuf/src/google/protobuf/compiler/java/enum_lite.cc b/libs/protobuf/src/google/protobuf/compiler/java/enum_lite.cc
deleted file mode 100644
index 4387090..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/java/enum_lite.cc
+++ /dev/null
@@ -1,236 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-
-#include <google/protobuf/compiler/java/enum_lite.h>
-
-#include <map>
-#include <string>
-
-#include <google/protobuf/io/printer.h>
-#include <google/protobuf/stubs/strutil.h>
-#include <google/protobuf/compiler/java/context.h>
-#include <google/protobuf/compiler/java/doc_comment.h>
-#include <google/protobuf/compiler/java/helpers.h>
-#include <google/protobuf/compiler/java/name_resolver.h>
-#include <google/protobuf/descriptor.pb.h>
-#include <google/protobuf/stubs/map_util.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace java {
-
-EnumLiteGenerator::EnumLiteGenerator(const EnumDescriptor* descriptor,
-                                     bool immutable_api, Context* context)
-    : descriptor_(descriptor),
-      immutable_api_(immutable_api),
-      context_(context),
-      name_resolver_(context->GetNameResolver()) {
-  for (int i = 0; i < descriptor_->value_count(); i++) {
-    const EnumValueDescriptor* value = descriptor_->value(i);
-    const EnumValueDescriptor* canonical_value =
-        descriptor_->FindValueByNumber(value->number());
-
-    if (value == canonical_value) {
-      canonical_values_.push_back(value);
-    } else {
-      Alias alias;
-      alias.value = value;
-      alias.canonical_value = canonical_value;
-      aliases_.push_back(alias);
-    }
-  }
-}
-
-EnumLiteGenerator::~EnumLiteGenerator() {}
-
-void EnumLiteGenerator::Generate(io::Printer* printer) {
-  WriteEnumDocComment(printer, descriptor_);
-  MaybePrintGeneratedAnnotation(context_, printer, descriptor_, immutable_api_);
-  printer->Print(
-      "$deprecation$public enum $classname$\n"
-      "    implements com.google.protobuf.Internal.EnumLite {\n",
-      "classname", descriptor_->name(), "deprecation",
-      descriptor_->options().deprecated() ? "@java.lang.Deprecated " : "");
-  printer->Annotate("classname", descriptor_);
-  printer->Indent();
-
-  for (int i = 0; i < canonical_values_.size(); i++) {
-    std::map<std::string, std::string> vars;
-    vars["name"] = canonical_values_[i]->name();
-    vars["number"] = StrCat(canonical_values_[i]->number());
-    WriteEnumValueDocComment(printer, canonical_values_[i]);
-    if (canonical_values_[i]->options().deprecated()) {
-      printer->Print("@java.lang.Deprecated\n");
-    }
-    printer->Print(vars, "$name$($number$),\n");
-    printer->Annotate("name", canonical_values_[i]);
-  }
-
-  if (SupportUnknownEnumValue(descriptor_->file())) {
-    printer->Print("${$UNRECOGNIZED$}$(-1),\n", "{", "", "}", "");
-    printer->Annotate("{", "}", descriptor_);
-  }
-
-  printer->Print(
-      ";\n"
-      "\n");
-
-  // -----------------------------------------------------------------
-
-  for (int i = 0; i < aliases_.size(); i++) {
-    std::map<std::string, std::string> vars;
-    vars["classname"] = descriptor_->name();
-    vars["name"] = aliases_[i].value->name();
-    vars["canonical_name"] = aliases_[i].canonical_value->name();
-    WriteEnumValueDocComment(printer, aliases_[i].value);
-    printer->Print(
-        vars, "public static final $classname$ $name$ = $canonical_name$;\n");
-    printer->Annotate("name", aliases_[i].value);
-  }
-
-  for (int i = 0; i < descriptor_->value_count(); i++) {
-    std::map<std::string, std::string> vars;
-    vars["name"] = descriptor_->value(i)->name();
-    vars["number"] = StrCat(descriptor_->value(i)->number());
-    vars["{"] = "";
-    vars["}"] = "";
-    vars["deprecation"] = descriptor_->value(i)->options().deprecated()
-                              ? "@java.lang.Deprecated "
-                              : "";
-    WriteEnumValueDocComment(printer, descriptor_->value(i));
-    printer->Print(vars,
-                   "$deprecation$public static final int ${$$name$_VALUE$}$ = "
-                   "$number$;\n");
-    printer->Annotate("{", "}", descriptor_->value(i));
-  }
-  printer->Print("\n");
-
-  // -----------------------------------------------------------------
-
-  printer->Print(
-      "\n"
-      "@java.lang.Override\n"
-      "public final int getNumber() {\n");
-  if (SupportUnknownEnumValue(descriptor_->file())) {
-    printer->Print(
-        "  if (this == UNRECOGNIZED) {\n"
-        "    throw new java.lang.IllegalArgumentException(\n"
-        "        \"Can't get the number of an unknown enum value.\");\n"
-        "  }\n");
-  }
-  printer->Print(
-      "  return value;\n"
-      "}\n"
-      "\n"
-      "/**\n"
-      " * @param value The number of the enum to look for.\n"
-      " * @return The enum associated with the given number.\n"
-      " * @deprecated Use {@link #forNumber(int)} instead.\n"
-      " */\n"
-      "@java.lang.Deprecated\n"
-      "public static $classname$ valueOf(int value) {\n"
-      "  return forNumber(value);\n"
-      "}\n"
-      "\n"
-      "public static $classname$ forNumber(int value) {\n"
-      "  switch (value) {\n",
-      "classname", descriptor_->name());
-  printer->Indent();
-  printer->Indent();
-
-  for (int i = 0; i < canonical_values_.size(); i++) {
-    printer->Print("case $number$: return $name$;\n", "name",
-                   canonical_values_[i]->name(), "number",
-                   StrCat(canonical_values_[i]->number()));
-  }
-
-  printer->Outdent();
-  printer->Outdent();
-  printer->Print(
-      "    default: return null;\n"
-      "  }\n"
-      "}\n"
-      "\n"
-      "public static com.google.protobuf.Internal.EnumLiteMap<$classname$>\n"
-      "    internalGetValueMap() {\n"
-      "  return internalValueMap;\n"
-      "}\n"
-      "private static final com.google.protobuf.Internal.EnumLiteMap<\n"
-      "    $classname$> internalValueMap =\n"
-      "      new com.google.protobuf.Internal.EnumLiteMap<$classname$>() {\n"
-      "        @java.lang.Override\n"
-      "        public $classname$ findValueByNumber(int number) {\n"
-      "          return $classname$.forNumber(number);\n"
-      "        }\n"
-      "      };\n"
-      "\n"
-      "public static com.google.protobuf.Internal.EnumVerifier \n"
-      "    internalGetVerifier() {\n"
-      "  return $classname$Verifier.INSTANCE;\n"
-      "}\n"
-      "\n"
-      "private static final class $classname$Verifier implements \n"
-      "     com.google.protobuf.Internal.EnumVerifier { \n"
-      "        static final com.google.protobuf.Internal.EnumVerifier "
-      "          INSTANCE = new $classname$Verifier();\n"
-      "        @java.lang.Override\n"
-      "        public boolean isInRange(int number) {\n"
-      "          return $classname$.forNumber(number) != null;\n"
-      "        }\n"
-      "      };\n"
-      "\n",
-      "classname", descriptor_->name());
-
-  printer->Print(
-      "private final int value;\n\n"
-      "private $classname$(int value) {\n",
-      "classname", descriptor_->name());
-  printer->Print(
-      "  this.value = value;\n"
-      "}\n");
-
-  printer->Print(
-      "\n"
-      "// @@protoc_insertion_point(enum_scope:$full_name$)\n",
-      "full_name", descriptor_->full_name());
-
-  printer->Outdent();
-  printer->Print("}\n\n");
-}
-
-}  // namespace java
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/compiler/java/enum_lite.h b/libs/protobuf/src/google/protobuf/compiler/java/enum_lite.h
deleted file mode 100644
index 50f3fe7..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/java/enum_lite.h
+++ /dev/null
@@ -1,98 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-
-#ifndef GOOGLE_PROTOBUF_COMPILER_JAVA_ENUM_LITE_H__
-#define GOOGLE_PROTOBUF_COMPILER_JAVA_ENUM_LITE_H__
-
-#include <string>
-#include <vector>
-#include <google/protobuf/descriptor.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace java {
-class Context;            // context.h
-class ClassNameResolver;  // name_resolver.h
-}  // namespace java
-}  // namespace compiler
-namespace io {
-class Printer;  // printer.h
-}
-}  // namespace protobuf
-}  // namespace google
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace java {
-
-class EnumLiteGenerator {
- public:
-  EnumLiteGenerator(const EnumDescriptor* descriptor, bool immutable_api,
-                    Context* context);
-  ~EnumLiteGenerator();
-
-  void Generate(io::Printer* printer);
-
- private:
-  const EnumDescriptor* descriptor_;
-
-  // The proto language allows multiple enum constants to have the same
-  // numeric value.  Java, however, does not allow multiple enum constants to
-  // be considered equivalent.  We treat the first defined constant for any
-  // given numeric value as "canonical" and the rest as aliases of that
-  // canonical value.
-  std::vector<const EnumValueDescriptor*> canonical_values_;
-
-  struct Alias {
-    const EnumValueDescriptor* value;
-    const EnumValueDescriptor* canonical_value;
-  };
-  std::vector<Alias> aliases_;
-
-  bool immutable_api_;
-
-  Context* context_;
-  ClassNameResolver* name_resolver_;
-
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(EnumLiteGenerator);
-};
-
-}  // namespace java
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // GOOGLE_PROTOBUF_COMPILER_JAVA_ENUM_LITE_H__
diff --git a/libs/protobuf/src/google/protobuf/compiler/java/extension.cc b/libs/protobuf/src/google/protobuf/compiler/java/extension.cc
deleted file mode 100644
index 8b93eb1..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/java/extension.cc
+++ /dev/null
@@ -1,177 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-
-#include <google/protobuf/compiler/java/extension.h>
-
-#include <google/protobuf/io/printer.h>
-#include <google/protobuf/stubs/strutil.h>
-#include <google/protobuf/compiler/java/context.h>
-#include <google/protobuf/compiler/java/doc_comment.h>
-#include <google/protobuf/compiler/java/helpers.h>
-#include <google/protobuf/compiler/java/name_resolver.h>
-
-// Must be last.
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace java {
-
-ImmutableExtensionGenerator::ImmutableExtensionGenerator(
-    const FieldDescriptor* descriptor, Context* context)
-    : descriptor_(descriptor), name_resolver_(context->GetNameResolver()) {
-  if (descriptor_->extension_scope() != NULL) {
-    scope_ =
-        name_resolver_->GetImmutableClassName(descriptor_->extension_scope());
-  } else {
-    scope_ = name_resolver_->GetImmutableClassName(descriptor_->file());
-  }
-}
-
-ImmutableExtensionGenerator::~ImmutableExtensionGenerator() {}
-
-// Initializes the vars referenced in the generated code templates.
-void ExtensionGenerator::InitTemplateVars(
-    const FieldDescriptor* descriptor, const std::string& scope, bool immutable,
-    ClassNameResolver* name_resolver,
-    std::map<std::string, std::string>* vars_pointer) {
-  std::map<std::string, std::string>& vars = *vars_pointer;
-  vars["scope"] = scope;
-  vars["name"] = UnderscoresToCamelCaseCheckReserved(descriptor);
-  vars["containing_type"] =
-      name_resolver->GetClassName(descriptor->containing_type(), immutable);
-  vars["number"] = StrCat(descriptor->number());
-  vars["constant_name"] = FieldConstantName(descriptor);
-  vars["index"] = StrCat(descriptor->index());
-  vars["default"] = descriptor->is_repeated()
-                        ? ""
-                        : DefaultValue(descriptor, immutable, name_resolver);
-  vars["type_constant"] = FieldTypeName(GetType(descriptor));
-  vars["packed"] = descriptor->is_packed() ? "true" : "false";
-  vars["enum_map"] = "null";
-  vars["prototype"] = "null";
-
-  JavaType java_type = GetJavaType(descriptor);
-  std::string singular_type;
-  switch (java_type) {
-    case JAVATYPE_MESSAGE:
-      singular_type =
-          name_resolver->GetClassName(descriptor->message_type(), immutable);
-      vars["prototype"] = singular_type + ".getDefaultInstance()";
-      break;
-    case JAVATYPE_ENUM:
-      singular_type =
-          name_resolver->GetClassName(descriptor->enum_type(), immutable);
-      vars["enum_map"] = singular_type + ".internalGetValueMap()";
-      break;
-    case JAVATYPE_STRING:
-      singular_type = "java.lang.String";
-      break;
-    case JAVATYPE_BYTES:
-      singular_type = immutable ? "com.google.protobuf.ByteString" : "byte[]";
-      break;
-    default:
-      singular_type = BoxedPrimitiveTypeName(java_type);
-      break;
-  }
-  vars["type"] = descriptor->is_repeated()
-                     ? "java.util.List<" + singular_type + ">"
-                     : singular_type;
-  vars["singular_type"] = singular_type;
-}
-
-void ImmutableExtensionGenerator::Generate(io::Printer* printer) {
-  std::map<std::string, std::string> vars;
-  const bool kUseImmutableNames = true;
-  InitTemplateVars(descriptor_, scope_, kUseImmutableNames, name_resolver_,
-                   &vars);
-  printer->Print(vars, "public static final int $constant_name$ = $number$;\n");
-
-  WriteFieldDocComment(printer, descriptor_);
-  if (descriptor_->extension_scope() == NULL) {
-    // Non-nested
-    printer->Print(
-        vars,
-        "public static final\n"
-        "  com.google.protobuf.GeneratedMessage.GeneratedExtension<\n"
-        "    $containing_type$,\n"
-        "    $type$> $name$ = com.google.protobuf.GeneratedMessage\n"
-        "        .newFileScopedGeneratedExtension(\n"
-        "      $singular_type$.class,\n"
-        "      $prototype$);\n");
-  } else {
-    // Nested
-    printer->Print(
-        vars,
-        "public static final\n"
-        "  com.google.protobuf.GeneratedMessage.GeneratedExtension<\n"
-        "    $containing_type$,\n"
-        "    $type$> $name$ = com.google.protobuf.GeneratedMessage\n"
-        "        .newMessageScopedGeneratedExtension(\n"
-        "      $scope$.getDefaultInstance(),\n"
-        "      $index$,\n"
-        "      $singular_type$.class,\n"
-        "      $prototype$);\n");
-  }
-  printer->Annotate("name", descriptor_);
-}
-
-int ImmutableExtensionGenerator::GenerateNonNestedInitializationCode(
-    io::Printer* printer) {
-  int bytecode_estimate = 0;
-  if (descriptor_->extension_scope() == NULL) {
-    // Only applies to non-nested extensions.
-    printer->Print(
-        "$name$.internalInit(descriptor.getExtensions().get($index$));\n",
-        "name", UnderscoresToCamelCaseCheckReserved(descriptor_), "index",
-        StrCat(descriptor_->index()));
-    bytecode_estimate += 21;
-  }
-  return bytecode_estimate;
-}
-
-int ImmutableExtensionGenerator::GenerateRegistrationCode(
-    io::Printer* printer) {
-  printer->Print("registry.add($scope$.$name$);\n", "scope", scope_, "name",
-                 UnderscoresToCamelCaseCheckReserved(descriptor_));
-  return 7;
-}
-
-}  // namespace java
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
diff --git a/libs/protobuf/src/google/protobuf/compiler/java/extension.h b/libs/protobuf/src/google/protobuf/compiler/java/extension.h
deleted file mode 100644
index 318cfa4..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/java/extension.h
+++ /dev/null
@@ -1,115 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-
-#ifndef GOOGLE_PROTOBUF_COMPILER_JAVA_EXTENSION_H__
-#define GOOGLE_PROTOBUF_COMPILER_JAVA_EXTENSION_H__
-
-#include <map>
-#include <string>
-
-#include <google/protobuf/stubs/common.h>
-
-namespace google {
-namespace protobuf {
-class FieldDescriptor;  // descriptor.h
-namespace compiler {
-namespace java {
-class Context;            // context.h
-class ClassNameResolver;  // name_resolver.h
-}  // namespace java
-}  // namespace compiler
-namespace io {
-class Printer;  // printer.h
-}
-}  // namespace protobuf
-}  // namespace google
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace java {
-
-// Generates code for an extension, which may be within the scope of some
-// message or may be at file scope.  This is much simpler than FieldGenerator
-// since extensions are just simple identifiers with interesting types.
-class ExtensionGenerator {
- public:
-  explicit ExtensionGenerator() {}
-  virtual ~ExtensionGenerator() {}
-
-  virtual void Generate(io::Printer* printer) = 0;
-
-  // Returns an estimate of the number of bytes the printed code will compile
-  // to
-  virtual int GenerateNonNestedInitializationCode(io::Printer* printer) = 0;
-
-  // Returns an estimate of the number of bytes the printed code will compile
-  // to
-  virtual int GenerateRegistrationCode(io::Printer* printer) = 0;
-
- protected:
-  static void InitTemplateVars(
-      const FieldDescriptor* descriptor, const std::string& scope,
-      bool immutable, ClassNameResolver* name_resolver,
-      std::map<std::string, std::string>* vars_pointer);
-
- private:
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(ExtensionGenerator);
-};
-
-class ImmutableExtensionGenerator : public ExtensionGenerator {
- public:
-  explicit ImmutableExtensionGenerator(const FieldDescriptor* descriptor,
-                                       Context* context);
-  ~ImmutableExtensionGenerator() override;
-
-  void Generate(io::Printer* printer) override;
-  int GenerateNonNestedInitializationCode(io::Printer* printer) override;
-  int GenerateRegistrationCode(io::Printer* printer) override;
-
- protected:
-  const FieldDescriptor* descriptor_;
-  ClassNameResolver* name_resolver_;
-  std::string scope_;
-
- private:
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(ImmutableExtensionGenerator);
-};
-
-}  // namespace java
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // GOOGLE_PROTOBUF_COMPILER_JAVA_EXTENSION_H__
diff --git a/libs/protobuf/src/google/protobuf/compiler/java/extension_lite.cc b/libs/protobuf/src/google/protobuf/compiler/java/extension_lite.cc
deleted file mode 100644
index bffb1d6..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/java/extension_lite.cc
+++ /dev/null
@@ -1,120 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <google/protobuf/compiler/java/extension_lite.h>
-
-#include <google/protobuf/io/printer.h>
-#include <google/protobuf/stubs/strutil.h>
-#include <google/protobuf/compiler/java/context.h>
-#include <google/protobuf/compiler/java/doc_comment.h>
-#include <google/protobuf/compiler/java/helpers.h>
-#include <google/protobuf/compiler/java/name_resolver.h>
-
-// Must be last.
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace java {
-
-ImmutableExtensionLiteGenerator::ImmutableExtensionLiteGenerator(
-    const FieldDescriptor* descriptor, Context* context)
-    : descriptor_(descriptor), name_resolver_(context->GetNameResolver()) {
-  if (descriptor_->extension_scope() != NULL) {
-    scope_ =
-        name_resolver_->GetImmutableClassName(descriptor_->extension_scope());
-  } else {
-    scope_ = name_resolver_->GetImmutableClassName(descriptor_->file());
-  }
-}
-
-ImmutableExtensionLiteGenerator::~ImmutableExtensionLiteGenerator() {}
-
-void ImmutableExtensionLiteGenerator::Generate(io::Printer* printer) {
-  std::map<std::string, std::string> vars;
-  const bool kUseImmutableNames = true;
-  InitTemplateVars(descriptor_, scope_, kUseImmutableNames, name_resolver_,
-                   &vars);
-  printer->Print(vars, "public static final int $constant_name$ = $number$;\n");
-
-  WriteFieldDocComment(printer, descriptor_);
-  if (descriptor_->is_repeated()) {
-    printer->Print(
-        vars,
-        "public static final\n"
-        "  com.google.protobuf.GeneratedMessageLite.GeneratedExtension<\n"
-        "    $containing_type$,\n"
-        "    $type$> $name$ = com.google.protobuf.GeneratedMessageLite\n"
-        "        .newRepeatedGeneratedExtension(\n"
-        "      $containing_type$.getDefaultInstance(),\n"
-        "      $prototype$,\n"
-        "      $enum_map$,\n"
-        "      $number$,\n"
-        "      com.google.protobuf.WireFormat.FieldType.$type_constant$,\n"
-        "      $packed$,\n"
-        "      $singular_type$.class);\n");
-  } else {
-    printer->Print(
-        vars,
-        "public static final\n"
-        "  com.google.protobuf.GeneratedMessageLite.GeneratedExtension<\n"
-        "    $containing_type$,\n"
-        "    $type$> $name$ = com.google.protobuf.GeneratedMessageLite\n"
-        "        .newSingularGeneratedExtension(\n"
-        "      $containing_type$.getDefaultInstance(),\n"
-        "      $default$,\n"
-        "      $prototype$,\n"
-        "      $enum_map$,\n"
-        "      $number$,\n"
-        "      com.google.protobuf.WireFormat.FieldType.$type_constant$,\n"
-        "      $singular_type$.class);\n");
-  }
-  printer->Annotate("name", descriptor_);
-}
-
-int ImmutableExtensionLiteGenerator::GenerateNonNestedInitializationCode(
-    io::Printer* printer) {
-  return 0;
-}
-
-int ImmutableExtensionLiteGenerator::GenerateRegistrationCode(
-    io::Printer* printer) {
-  printer->Print("registry.add($scope$.$name$);\n", "scope", scope_, "name",
-                 UnderscoresToCamelCaseCheckReserved(descriptor_));
-  return 7;
-}
-
-}  // namespace java
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
diff --git a/libs/protobuf/src/google/protobuf/compiler/java/extension_lite.h b/libs/protobuf/src/google/protobuf/compiler/java/extension_lite.h
deleted file mode 100644
index 264230c..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/java/extension_lite.h
+++ /dev/null
@@ -1,75 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef GOOGLE_PROTOBUF_COMPILER_JAVA_EXTENSION_LITE_H__
-#define GOOGLE_PROTOBUF_COMPILER_JAVA_EXTENSION_LITE_H__
-
-#include <map>
-#include <string>
-
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/compiler/java/extension.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace java {
-
-// Generates code for a lite extension, which may be within the scope of some
-// message or may be at file scope.  This is much simpler than FieldGenerator
-// since extensions are just simple identifiers with interesting types.
-class ImmutableExtensionLiteGenerator : public ExtensionGenerator {
- public:
-  explicit ImmutableExtensionLiteGenerator(const FieldDescriptor* descriptor,
-                                           Context* context);
-  ~ImmutableExtensionLiteGenerator() override;
-
-  void Generate(io::Printer* printer) override;
-
-  // Returns an estimate of the number of bytes the printed code will compile to
-  int GenerateNonNestedInitializationCode(io::Printer* printer) override;
-
-  // Returns an estimate of the number of bytes the printed code will compile to
-  int GenerateRegistrationCode(io::Printer* printer) override;
-
- private:
-  const FieldDescriptor* descriptor_;
-  ClassNameResolver* name_resolver_;
-  std::string scope_;
-
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(ImmutableExtensionLiteGenerator);
-};
-
-}  // namespace java
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // GOOGLE_PROTOBUF_COMPILER_JAVA_EXTENSION_LITE_H__
diff --git a/libs/protobuf/src/google/protobuf/compiler/java/field.cc b/libs/protobuf/src/google/protobuf/compiler/java/field.cc
deleted file mode 100644
index 3dd528f..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/java/field.cc
+++ /dev/null
@@ -1,312 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-
-#include <google/protobuf/compiler/java/field.h>
-
-#include <memory>
-
-#include <google/protobuf/stubs/logging.h>
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/io/printer.h>
-#include <google/protobuf/stubs/strutil.h>
-#include <google/protobuf/stubs/substitute.h>
-#include <google/protobuf/compiler/java/context.h>
-#include <google/protobuf/compiler/java/enum_field.h>
-#include <google/protobuf/compiler/java/enum_field_lite.h>
-#include <google/protobuf/compiler/java/helpers.h>
-#include <google/protobuf/compiler/java/map_field.h>
-#include <google/protobuf/compiler/java/map_field_lite.h>
-#include <google/protobuf/compiler/java/message_field.h>
-#include <google/protobuf/compiler/java/message_field_lite.h>
-#include <google/protobuf/compiler/java/primitive_field.h>
-#include <google/protobuf/compiler/java/primitive_field_lite.h>
-#include <google/protobuf/compiler/java/string_field.h>
-#include <google/protobuf/compiler/java/string_field_lite.h>
-
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace java {
-
-namespace {
-
-ImmutableFieldGenerator* MakeImmutableGenerator(const FieldDescriptor* field,
-                                                int messageBitIndex,
-                                                int builderBitIndex,
-                                                Context* context) {
-  if (field->is_repeated()) {
-    switch (GetJavaType(field)) {
-      case JAVATYPE_MESSAGE:
-        if (IsMapEntry(field->message_type())) {
-          return new ImmutableMapFieldGenerator(field, messageBitIndex,
-                                                builderBitIndex, context);
-        } else {
-          return new RepeatedImmutableMessageFieldGenerator(
-              field, messageBitIndex, builderBitIndex, context);
-        }
-      case JAVATYPE_ENUM:
-        return new RepeatedImmutableEnumFieldGenerator(
-            field, messageBitIndex, builderBitIndex, context);
-      case JAVATYPE_STRING:
-        return new RepeatedImmutableStringFieldGenerator(
-            field, messageBitIndex, builderBitIndex, context);
-      default:
-        return new RepeatedImmutablePrimitiveFieldGenerator(
-            field, messageBitIndex, builderBitIndex, context);
-    }
-  } else {
-    if (IsRealOneof(field)) {
-      switch (GetJavaType(field)) {
-        case JAVATYPE_MESSAGE:
-          return new ImmutableMessageOneofFieldGenerator(
-              field, messageBitIndex, builderBitIndex, context);
-        case JAVATYPE_ENUM:
-          return new ImmutableEnumOneofFieldGenerator(field, messageBitIndex,
-                                                      builderBitIndex, context);
-        case JAVATYPE_STRING:
-          return new ImmutableStringOneofFieldGenerator(
-              field, messageBitIndex, builderBitIndex, context);
-        default:
-          return new ImmutablePrimitiveOneofFieldGenerator(
-              field, messageBitIndex, builderBitIndex, context);
-      }
-    } else {
-      switch (GetJavaType(field)) {
-        case JAVATYPE_MESSAGE:
-          return new ImmutableMessageFieldGenerator(field, messageBitIndex,
-                                                    builderBitIndex, context);
-        case JAVATYPE_ENUM:
-          return new ImmutableEnumFieldGenerator(field, messageBitIndex,
-                                                 builderBitIndex, context);
-        case JAVATYPE_STRING:
-          return new ImmutableStringFieldGenerator(field, messageBitIndex,
-                                                   builderBitIndex, context);
-        default:
-          return new ImmutablePrimitiveFieldGenerator(field, messageBitIndex,
-                                                      builderBitIndex, context);
-      }
-    }
-  }
-}
-
-ImmutableFieldLiteGenerator* MakeImmutableLiteGenerator(
-    const FieldDescriptor* field, int messageBitIndex, Context* context) {
-  if (field->is_repeated()) {
-    switch (GetJavaType(field)) {
-      case JAVATYPE_MESSAGE:
-        if (IsMapEntry(field->message_type())) {
-          return new ImmutableMapFieldLiteGenerator(field, messageBitIndex,
-                                                    context);
-        } else {
-          return new RepeatedImmutableMessageFieldLiteGenerator(
-              field, messageBitIndex, context);
-        }
-      case JAVATYPE_ENUM:
-        return new RepeatedImmutableEnumFieldLiteGenerator(
-            field, messageBitIndex, context);
-      case JAVATYPE_STRING:
-        return new RepeatedImmutableStringFieldLiteGenerator(
-            field, messageBitIndex, context);
-      default:
-        return new RepeatedImmutablePrimitiveFieldLiteGenerator(
-            field, messageBitIndex, context);
-    }
-  } else {
-    if (IsRealOneof(field)) {
-      switch (GetJavaType(field)) {
-        case JAVATYPE_MESSAGE:
-          return new ImmutableMessageOneofFieldLiteGenerator(
-              field, messageBitIndex, context);
-        case JAVATYPE_ENUM:
-          return new ImmutableEnumOneofFieldLiteGenerator(
-              field, messageBitIndex, context);
-        case JAVATYPE_STRING:
-          return new ImmutableStringOneofFieldLiteGenerator(
-              field, messageBitIndex, context);
-        default:
-          return new ImmutablePrimitiveOneofFieldLiteGenerator(
-              field, messageBitIndex, context);
-      }
-    } else {
-      switch (GetJavaType(field)) {
-        case JAVATYPE_MESSAGE:
-          return new ImmutableMessageFieldLiteGenerator(field, messageBitIndex,
-                                                        context);
-        case JAVATYPE_ENUM:
-          return new ImmutableEnumFieldLiteGenerator(field, messageBitIndex,
-                                                     context);
-        case JAVATYPE_STRING:
-          return new ImmutableStringFieldLiteGenerator(field, messageBitIndex,
-                                                       context);
-        default:
-          return new ImmutablePrimitiveFieldLiteGenerator(
-              field, messageBitIndex, context);
-      }
-    }
-  }
-}
-
-
-static inline void ReportUnexpectedPackedFieldsCall(io::Printer* printer) {
-  // Reaching here indicates a bug. Cases are:
-  //   - This FieldGenerator should support packing,
-  //     but this method should be overridden.
-  //   - This FieldGenerator doesn't support packing, and this method
-  //     should never have been called.
-  GOOGLE_LOG(FATAL) << "GenerateBuilderParsingCodeFromPacked() "
-             << "called on field generator that does not support packing.";
-}
-
-}  // namespace
-
-ImmutableFieldGenerator::~ImmutableFieldGenerator() {}
-
-void ImmutableFieldGenerator::GenerateBuilderParsingCodeFromPacked(
-    io::Printer* printer) const {
-  ReportUnexpectedPackedFieldsCall(printer);
-}
-
-ImmutableFieldLiteGenerator::~ImmutableFieldLiteGenerator() {}
-
-// ===================================================================
-
-template <>
-FieldGeneratorMap<ImmutableFieldGenerator>::FieldGeneratorMap(
-    const Descriptor* descriptor, Context* context)
-    : descriptor_(descriptor), field_generators_(descriptor->field_count()) {
-  // Construct all the FieldGenerators and assign them bit indices for their
-  // bit fields.
-  int messageBitIndex = 0;
-  int builderBitIndex = 0;
-  for (int i = 0; i < descriptor->field_count(); i++) {
-    ImmutableFieldGenerator* generator = MakeImmutableGenerator(
-        descriptor->field(i), messageBitIndex, builderBitIndex, context);
-    field_generators_[i].reset(generator);
-    messageBitIndex += generator->GetNumBitsForMessage();
-    builderBitIndex += generator->GetNumBitsForBuilder();
-  }
-}
-
-template <>
-FieldGeneratorMap<ImmutableFieldGenerator>::~FieldGeneratorMap() {}
-
-template <>
-FieldGeneratorMap<ImmutableFieldLiteGenerator>::FieldGeneratorMap(
-    const Descriptor* descriptor, Context* context)
-    : descriptor_(descriptor), field_generators_(descriptor->field_count()) {
-  // Construct all the FieldGenerators and assign them bit indices for their
-  // bit fields.
-  int messageBitIndex = 0;
-  for (int i = 0; i < descriptor->field_count(); i++) {
-    ImmutableFieldLiteGenerator* generator = MakeImmutableLiteGenerator(
-        descriptor->field(i), messageBitIndex, context);
-    field_generators_[i].reset(generator);
-    messageBitIndex += generator->GetNumBitsForMessage();
-  }
-}
-
-template <>
-FieldGeneratorMap<ImmutableFieldLiteGenerator>::~FieldGeneratorMap() {}
-
-
-void SetCommonFieldVariables(const FieldDescriptor* descriptor,
-                             const FieldGeneratorInfo* info,
-                             std::map<std::string, std::string>* variables) {
-  (*variables)["field_name"] = descriptor->name();
-  (*variables)["name"] = info->name;
-  (*variables)["classname"] = descriptor->containing_type()->name();
-  (*variables)["capitalized_name"] = info->capitalized_name;
-  (*variables)["disambiguated_reason"] = info->disambiguated_reason;
-  (*variables)["constant_name"] = FieldConstantName(descriptor);
-  (*variables)["number"] = StrCat(descriptor->number());
-  (*variables)["kt_dsl_builder"] = "_builder";
-  // These variables are placeholders to pick out the beginning and ends of
-  // identifiers for annotations (when doing so with existing variables would
-  // be ambiguous or impossible). They should never be set to anything but the
-  // empty string.
-  (*variables)["{"] = "";
-  (*variables)["}"] = "";
-  (*variables)["kt_name"] =
-      IsForbiddenKotlin(info->name) ? info->name + "_" : info->name;
-  (*variables)["kt_capitalized_name"] = IsForbiddenKotlin(info->name)
-                                            ? info->capitalized_name + "_"
-                                            : info->capitalized_name;
-  if (!descriptor->is_repeated()) {
-    (*variables)["annotation_field_type"] = FieldTypeName(descriptor->type());
-  } else if (GetJavaType(descriptor) == JAVATYPE_MESSAGE &&
-             IsMapEntry(descriptor->message_type())) {
-    (*variables)["annotation_field_type"] =
-        std::string(FieldTypeName(descriptor->type())) + "MAP";
-  } else {
-    (*variables)["annotation_field_type"] =
-        std::string(FieldTypeName(descriptor->type())) + "_LIST";
-    if (descriptor->is_packed()) {
-      (*variables)["annotation_field_type"] =
-          (*variables)["annotation_field_type"] + "_PACKED";
-    }
-  }
-}
-
-void SetCommonOneofVariables(const FieldDescriptor* descriptor,
-                             const OneofGeneratorInfo* info,
-                             std::map<std::string, std::string>* variables) {
-  (*variables)["oneof_name"] = info->name;
-  (*variables)["oneof_capitalized_name"] = info->capitalized_name;
-  (*variables)["oneof_index"] =
-      StrCat(descriptor->containing_oneof()->index());
-  (*variables)["oneof_stored_type"] = GetOneofStoredType(descriptor);
-  (*variables)["set_oneof_case_message"] =
-      info->name + "Case_ = " + StrCat(descriptor->number());
-  (*variables)["clear_oneof_case_message"] = info->name + "Case_ = 0";
-  (*variables)["has_oneof_case_message"] =
-      info->name + "Case_ == " + StrCat(descriptor->number());
-}
-
-void PrintExtraFieldInfo(const std::map<std::string, std::string>& variables,
-                         io::Printer* printer) {
-  const std::map<std::string, std::string>::const_iterator it =
-      variables.find("disambiguated_reason");
-  if (it != variables.end() && !it->second.empty()) {
-    printer->Print(
-        variables,
-        "// An alternative name is used for field \"$field_name$\" because:\n"
-        "//     $disambiguated_reason$\n");
-  }
-}
-
-}  // namespace java
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/compiler/java/field.h b/libs/protobuf/src/google/protobuf/compiler/java/field.h
deleted file mode 100644
index 7f82316..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/java/field.h
+++ /dev/null
@@ -1,192 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-
-#ifndef GOOGLE_PROTOBUF_COMPILER_JAVA_FIELD_H__
-#define GOOGLE_PROTOBUF_COMPILER_JAVA_FIELD_H__
-
-#include <cstdint>
-#include <map>
-#include <memory>
-#include <string>
-
-#include <google/protobuf/stubs/logging.h>
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/descriptor.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace java {
-class Context;            // context.h
-class ClassNameResolver;  // name_resolver.h
-}  // namespace java
-}  // namespace compiler
-namespace io {
-class Printer;  // printer.h
-}
-}  // namespace protobuf
-}  // namespace google
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace java {
-
-class ImmutableFieldGenerator {
- public:
-  ImmutableFieldGenerator() {}
-  virtual ~ImmutableFieldGenerator();
-
-  virtual int GetMessageBitIndex() const = 0;
-  virtual int GetBuilderBitIndex() const = 0;
-  virtual int GetNumBitsForMessage() const = 0;
-  virtual int GetNumBitsForBuilder() const = 0;
-  virtual void GenerateInterfaceMembers(io::Printer* printer) const = 0;
-  virtual void GenerateMembers(io::Printer* printer) const = 0;
-  virtual void GenerateBuilderMembers(io::Printer* printer) const = 0;
-  virtual void GenerateInitializationCode(io::Printer* printer) const = 0;
-  virtual void GenerateBuilderClearCode(io::Printer* printer) const = 0;
-  virtual void GenerateMergingCode(io::Printer* printer) const = 0;
-  virtual void GenerateBuildingCode(io::Printer* printer) const = 0;
-  virtual void GenerateBuilderParsingCode(io::Printer* printer) const = 0;
-  virtual void GenerateBuilderParsingCodeFromPacked(io::Printer* printer) const;
-  virtual void GenerateSerializationCode(io::Printer* printer) const = 0;
-  virtual void GenerateSerializedSizeCode(io::Printer* printer) const = 0;
-  virtual void GenerateFieldBuilderInitializationCode(
-      io::Printer* printer) const = 0;
-  virtual void GenerateKotlinDslMembers(io::Printer* printer) const = 0;
-
-  virtual void GenerateEqualsCode(io::Printer* printer) const = 0;
-  virtual void GenerateHashCode(io::Printer* printer) const = 0;
-
-  virtual std::string GetBoxedType() const = 0;
-
- private:
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(ImmutableFieldGenerator);
-};
-
-class ImmutableFieldLiteGenerator {
- public:
-  ImmutableFieldLiteGenerator() {}
-  virtual ~ImmutableFieldLiteGenerator();
-
-  virtual int GetNumBitsForMessage() const = 0;
-  virtual void GenerateInterfaceMembers(io::Printer* printer) const = 0;
-  virtual void GenerateMembers(io::Printer* printer) const = 0;
-  virtual void GenerateBuilderMembers(io::Printer* printer) const = 0;
-  virtual void GenerateInitializationCode(io::Printer* printer) const = 0;
-  virtual void GenerateFieldInfo(io::Printer* printer,
-                                 std::vector<uint16_t>* output) const = 0;
-  virtual void GenerateKotlinDslMembers(io::Printer* printer) const = 0;
-
-  virtual std::string GetBoxedType() const = 0;
-
- private:
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(ImmutableFieldLiteGenerator);
-};
-
-
-// Convenience class which constructs FieldGenerators for a Descriptor.
-template <typename FieldGeneratorType>
-class FieldGeneratorMap {
- public:
-  explicit FieldGeneratorMap(const Descriptor* descriptor, Context* context);
-  ~FieldGeneratorMap();
-
-  const FieldGeneratorType& get(const FieldDescriptor* field) const;
-
- private:
-  const Descriptor* descriptor_;
-  std::vector<std::unique_ptr<FieldGeneratorType>> field_generators_;
-
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(FieldGeneratorMap);
-};
-
-template <typename FieldGeneratorType>
-inline const FieldGeneratorType& FieldGeneratorMap<FieldGeneratorType>::get(
-    const FieldDescriptor* field) const {
-  GOOGLE_CHECK_EQ(field->containing_type(), descriptor_);
-  return *field_generators_[field->index()];
-}
-
-// Instantiate template for mutable and immutable maps.
-template <>
-FieldGeneratorMap<ImmutableFieldGenerator>::FieldGeneratorMap(
-    const Descriptor* descriptor, Context* context);
-
-template <>
-FieldGeneratorMap<ImmutableFieldGenerator>::~FieldGeneratorMap();
-
-
-template <>
-FieldGeneratorMap<ImmutableFieldLiteGenerator>::FieldGeneratorMap(
-    const Descriptor* descriptor, Context* context);
-
-template <>
-FieldGeneratorMap<ImmutableFieldLiteGenerator>::~FieldGeneratorMap();
-
-
-// Field information used in FieldGenerators.
-struct FieldGeneratorInfo {
-  std::string name;
-  std::string capitalized_name;
-  std::string disambiguated_reason;
-};
-
-// Oneof information used in OneofFieldGenerators.
-struct OneofGeneratorInfo {
-  std::string name;
-  std::string capitalized_name;
-};
-
-// Set some common variables used in variable FieldGenerators.
-void SetCommonFieldVariables(const FieldDescriptor* descriptor,
-                             const FieldGeneratorInfo* info,
-                             std::map<std::string, std::string>* variables);
-
-// Set some common oneof variables used in OneofFieldGenerators.
-void SetCommonOneofVariables(const FieldDescriptor* descriptor,
-                             const OneofGeneratorInfo* info,
-                             std::map<std::string, std::string>* variables);
-
-// Print useful comments before a field's accessors.
-void PrintExtraFieldInfo(const std::map<std::string, std::string>& variables,
-                         io::Printer* printer);
-
-}  // namespace java
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // GOOGLE_PROTOBUF_COMPILER_JAVA_FIELD_H__
diff --git a/libs/protobuf/src/google/protobuf/compiler/java/file.cc b/libs/protobuf/src/google/protobuf/compiler/java/file.cc
deleted file mode 100644
index cf27703..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/java/file.cc
+++ /dev/null
@@ -1,739 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-
-#include <google/protobuf/compiler/java/file.h>
-
-#include <memory>
-#include <set>
-
-#include <google/protobuf/compiler/code_generator.h>
-#include <google/protobuf/io/printer.h>
-#include <google/protobuf/io/zero_copy_stream.h>
-#include <google/protobuf/dynamic_message.h>
-#include <google/protobuf/stubs/strutil.h>
-#include <google/protobuf/compiler/java/context.h>
-#include <google/protobuf/compiler/java/enum.h>
-#include <google/protobuf/compiler/java/enum_lite.h>
-#include <google/protobuf/compiler/java/extension.h>
-#include <google/protobuf/compiler/java/generator_factory.h>
-#include <google/protobuf/compiler/java/helpers.h>
-#include <google/protobuf/compiler/java/message.h>
-#include <google/protobuf/compiler/java/name_resolver.h>
-#include <google/protobuf/compiler/java/service.h>
-#include <google/protobuf/compiler/java/shared_code_generator.h>
-#include <google/protobuf/descriptor.pb.h>
-
-// Must be last.
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace java {
-
-namespace {
-
-struct FieldDescriptorCompare {
-  bool operator()(const FieldDescriptor* f1, const FieldDescriptor* f2) const {
-    if (f1 == NULL) {
-      return false;
-    }
-    if (f2 == NULL) {
-      return true;
-    }
-    return f1->full_name() < f2->full_name();
-  }
-};
-
-typedef std::set<const FieldDescriptor*, FieldDescriptorCompare>
-    FieldDescriptorSet;
-
-// Recursively searches the given message to collect extensions.
-// Returns true if all the extensions can be recognized. The extensions will be
-// appended in to the extensions parameter.
-// Returns false when there are unknown fields, in which case the data in the
-// extensions output parameter is not reliable and should be discarded.
-bool CollectExtensions(const Message& message, FieldDescriptorSet* extensions) {
-  const Reflection* reflection = message.GetReflection();
-
-  // There are unknown fields that could be extensions, thus this call fails.
-  if (reflection->GetUnknownFields(message).field_count() > 0) return false;
-
-  std::vector<const FieldDescriptor*> fields;
-  reflection->ListFields(message, &fields);
-
-  for (int i = 0; i < fields.size(); i++) {
-    if (fields[i]->is_extension()) {
-      extensions->insert(fields[i]);
-    }
-
-    if (GetJavaType(fields[i]) == JAVATYPE_MESSAGE) {
-      if (fields[i]->is_repeated()) {
-        int size = reflection->FieldSize(message, fields[i]);
-        for (int j = 0; j < size; j++) {
-          const Message& sub_message =
-              reflection->GetRepeatedMessage(message, fields[i], j);
-          if (!CollectExtensions(sub_message, extensions)) return false;
-        }
-      } else {
-        const Message& sub_message = reflection->GetMessage(message, fields[i]);
-        if (!CollectExtensions(sub_message, extensions)) return false;
-      }
-    }
-  }
-
-  return true;
-}
-
-// Finds all extensions in the given message and its sub-messages.  If the
-// message contains unknown fields (which could be extensions), then those
-// extensions are defined in alternate_pool.
-// The message will be converted to a DynamicMessage backed by alternate_pool
-// in order to handle this case.
-void CollectExtensions(const FileDescriptorProto& file_proto,
-                       const DescriptorPool& alternate_pool,
-                       FieldDescriptorSet* extensions,
-                       const std::string& file_data) {
-  if (!CollectExtensions(file_proto, extensions)) {
-    // There are unknown fields in the file_proto, which are probably
-    // extensions. We need to parse the data into a dynamic message based on the
-    // builder-pool to find out all extensions.
-    const Descriptor* file_proto_desc = alternate_pool.FindMessageTypeByName(
-        file_proto.GetDescriptor()->full_name());
-    GOOGLE_CHECK(file_proto_desc)
-        << "Find unknown fields in FileDescriptorProto when building "
-        << file_proto.name()
-        << ". It's likely that those fields are custom options, however, "
-           "descriptor.proto is not in the transitive dependencies. "
-           "This normally should not happen. Please report a bug.";
-    DynamicMessageFactory factory;
-    std::unique_ptr<Message> dynamic_file_proto(
-        factory.GetPrototype(file_proto_desc)->New());
-    GOOGLE_CHECK(dynamic_file_proto.get() != NULL);
-    GOOGLE_CHECK(dynamic_file_proto->ParseFromString(file_data));
-
-    // Collect the extensions again from the dynamic message. There should be no
-    // more unknown fields this time, i.e. all the custom options should be
-    // parsed as extensions now.
-    extensions->clear();
-    GOOGLE_CHECK(CollectExtensions(*dynamic_file_proto, extensions))
-        << "Find unknown fields in FileDescriptorProto when building "
-        << file_proto.name()
-        << ". It's likely that those fields are custom options, however, "
-           "those options cannot be recognized in the builder pool. "
-           "This normally should not happen. Please report a bug.";
-  }
-}
-
-// Our static initialization methods can become very, very large.
-// So large that if we aren't careful we end up blowing the JVM's
-// 64K bytes of bytecode/method. Fortunately, since these static
-// methods are executed only once near the beginning of a program,
-// there's usually plenty of stack space available and we can
-// extend our methods by simply chaining them to another method
-// with a tail call. This inserts the sequence call-next-method,
-// end this one, begin-next-method as needed.
-void MaybeRestartJavaMethod(io::Printer* printer, int* bytecode_estimate,
-                            int* method_num, const char* chain_statement,
-                            const char* method_decl) {
-  // The goal here is to stay under 64K bytes of jvm bytecode/method,
-  // since otherwise we hit a hardcoded limit in the jvm and javac will
-  // then fail with the error "code too large". This limit lets our
-  // estimates be off by a factor of two and still we're okay.
-  static const int bytesPerMethod = kMaxStaticSize;
-
-  if ((*bytecode_estimate) > bytesPerMethod) {
-    ++(*method_num);
-    printer->Print(chain_statement, "method_num", StrCat(*method_num));
-    printer->Outdent();
-    printer->Print("}\n");
-    printer->Print(method_decl, "method_num", StrCat(*method_num));
-    printer->Indent();
-    *bytecode_estimate = 0;
-  }
-}
-}  // namespace
-
-FileGenerator::FileGenerator(const FileDescriptor* file, const Options& options,
-                             bool immutable_api)
-    : file_(file),
-      java_package_(FileJavaPackage(file, immutable_api)),
-      message_generators_(file->message_type_count()),
-      extension_generators_(file->extension_count()),
-      context_(new Context(file, options)),
-      name_resolver_(context_->GetNameResolver()),
-      options_(options),
-      immutable_api_(immutable_api) {
-  classname_ = name_resolver_->GetFileClassName(file, immutable_api);
-  generator_factory_.reset(new ImmutableGeneratorFactory(context_.get()));
-  for (int i = 0; i < file_->message_type_count(); ++i) {
-    message_generators_[i].reset(
-        generator_factory_->NewMessageGenerator(file_->message_type(i)));
-  }
-  for (int i = 0; i < file_->extension_count(); ++i) {
-    extension_generators_[i].reset(
-        generator_factory_->NewExtensionGenerator(file_->extension(i)));
-  }
-}
-
-FileGenerator::~FileGenerator() {}
-
-bool FileGenerator::Validate(std::string* error) {
-  // Check that no class name matches the file's class name.  This is a common
-  // problem that leads to Java compile errors that can be hard to understand.
-  // It's especially bad when using the java_multiple_files, since we would
-  // end up overwriting the outer class with one of the inner ones.
-  if (name_resolver_->HasConflictingClassName(file_, classname_,
-                                              NameEquality::EXACT_EQUAL)) {
-    error->assign(file_->name());
-    error->append(
-        ": Cannot generate Java output because the file's outer class name, "
-        "\"");
-    error->append(classname_);
-    error->append(
-        "\", matches the name of one of the types declared inside it.  "
-        "Please either rename the type or use the java_outer_classname "
-        "option to specify a different outer class name for the .proto file.");
-    return false;
-  }
-  // Similar to the check above, but ignore the case this time. This is not a
-  // problem on Linux, but will lead to Java compile errors on Windows / Mac
-  // because filenames are case-insensitive on those platforms.
-  if (name_resolver_->HasConflictingClassName(
-          file_, classname_, NameEquality::EQUAL_IGNORE_CASE)) {
-    GOOGLE_LOG(WARNING)
-        << file_->name() << ": The file's outer class name, \"" << classname_
-        << "\", matches the name of one of the types declared inside it when "
-        << "case is ignored. This can cause compilation issues on Windows / "
-        << "MacOS. Please either rename the type or use the "
-        << "java_outer_classname option to specify a different outer class "
-        << "name for the .proto file to be safe.";
-  }
-
-  // Print a warning if optimize_for = LITE_RUNTIME is used.
-  if (file_->options().optimize_for() == FileOptions::LITE_RUNTIME &&
-      !options_.enforce_lite) {
-    GOOGLE_LOG(WARNING)
-        << "The optimize_for = LITE_RUNTIME option is no longer supported by "
-        << "protobuf Java code generator and is ignored--protoc will always "
-        << "generate full runtime code for Java. To use Java Lite runtime, "
-        << "users should use the Java Lite plugin instead. See:\n"
-        << "  "
-           "https://github.com/protocolbuffers/protobuf/blob/main/java/"
-           "lite.md";
-  }
-  return true;
-}
-
-void FileGenerator::Generate(io::Printer* printer) {
-  // We don't import anything because we refer to all classes by their
-  // fully-qualified names in the generated source.
-  printer->Print(
-      "// Generated by the protocol buffer compiler.  DO NOT EDIT!\n"
-      "// source: $filename$\n"
-      "\n",
-      "filename", file_->name());
-  if (!java_package_.empty()) {
-    printer->Print(
-        "package $package$;\n"
-        "\n",
-        "package", java_package_);
-  }
-  PrintGeneratedAnnotation(
-      printer, '$', options_.annotate_code ? classname_ + ".java.pb.meta" : "");
-
-  printer->Print(
-      "$deprecation$public final class $classname$ {\n"
-      "  private $ctor$() {}\n",
-      "deprecation",
-      file_->options().deprecated() ? "@java.lang.Deprecated " : "",
-      "classname", classname_, "ctor", classname_);
-  printer->Annotate("classname", file_->name());
-  printer->Indent();
-
-  // -----------------------------------------------------------------
-
-  printer->Print(
-      "public static void registerAllExtensions(\n"
-      "    com.google.protobuf.ExtensionRegistryLite registry) {\n");
-
-  printer->Indent();
-
-  for (int i = 0; i < file_->extension_count(); i++) {
-    extension_generators_[i]->GenerateRegistrationCode(printer);
-  }
-
-  for (int i = 0; i < file_->message_type_count(); i++) {
-    message_generators_[i]->GenerateExtensionRegistrationCode(printer);
-  }
-
-  printer->Outdent();
-  printer->Print("}\n");
-  if (HasDescriptorMethods(file_, context_->EnforceLite())) {
-    // Overload registerAllExtensions for the non-lite usage to
-    // redundantly maintain the original signature (this is
-    // redundant because ExtensionRegistryLite now invokes
-    // ExtensionRegistry in the non-lite usage). Intent is
-    // to remove this in the future.
-    printer->Print(
-        "\n"
-        "public static void registerAllExtensions(\n"
-        "    com.google.protobuf.ExtensionRegistry registry) {\n"
-        "  registerAllExtensions(\n"
-        "      (com.google.protobuf.ExtensionRegistryLite) registry);\n"
-        "}\n");
-  }
-
-  // -----------------------------------------------------------------
-
-  if (!MultipleJavaFiles(file_, immutable_api_)) {
-    for (int i = 0; i < file_->enum_type_count(); i++) {
-      if (HasDescriptorMethods(file_, context_->EnforceLite())) {
-        EnumGenerator(file_->enum_type(i), immutable_api_, context_.get())
-            .Generate(printer);
-      } else {
-        EnumLiteGenerator(file_->enum_type(i), immutable_api_, context_.get())
-            .Generate(printer);
-      }
-    }
-    for (int i = 0; i < file_->message_type_count(); i++) {
-      message_generators_[i]->GenerateInterface(printer);
-      message_generators_[i]->Generate(printer);
-    }
-    if (HasGenericServices(file_, context_->EnforceLite())) {
-      for (int i = 0; i < file_->service_count(); i++) {
-        std::unique_ptr<ServiceGenerator> generator(
-            generator_factory_->NewServiceGenerator(file_->service(i)));
-        generator->Generate(printer);
-      }
-    }
-  }
-
-  // Extensions must be generated in the outer class since they are values,
-  // not classes.
-  for (int i = 0; i < file_->extension_count(); i++) {
-    extension_generators_[i]->Generate(printer);
-  }
-
-  // Static variables. We'd like them to be final if possible, but due to
-  // the JVM's 64k size limit on static blocks, we have to initialize some
-  // of them in methods; thus they cannot be final.
-  int static_block_bytecode_estimate = 0;
-  for (int i = 0; i < file_->message_type_count(); i++) {
-    message_generators_[i]->GenerateStaticVariables(
-        printer, &static_block_bytecode_estimate);
-  }
-
-  printer->Print("\n");
-
-  if (HasDescriptorMethods(file_, context_->EnforceLite())) {
-    if (immutable_api_) {
-      GenerateDescriptorInitializationCodeForImmutable(printer);
-    } else {
-      GenerateDescriptorInitializationCodeForMutable(printer);
-    }
-  } else {
-    printer->Print("static {\n");
-    printer->Indent();
-    int bytecode_estimate = 0;
-    int method_num = 0;
-
-    for (int i = 0; i < file_->message_type_count(); i++) {
-      bytecode_estimate +=
-          message_generators_[i]->GenerateStaticVariableInitializers(printer);
-      MaybeRestartJavaMethod(
-          printer, &bytecode_estimate, &method_num,
-          "_clinit_autosplit_$method_num$();\n",
-          "private static void _clinit_autosplit_$method_num$() {\n");
-    }
-
-    printer->Outdent();
-    printer->Print("}\n");
-  }
-
-  printer->Print(
-      "\n"
-      "// @@protoc_insertion_point(outer_class_scope)\n");
-
-  printer->Outdent();
-  printer->Print("}\n");
-}
-
-void FileGenerator::GenerateDescriptorInitializationCodeForImmutable(
-    io::Printer* printer) {
-  printer->Print(
-      "public static com.google.protobuf.Descriptors.FileDescriptor\n"
-      "    getDescriptor() {\n"
-      "  return descriptor;\n"
-      "}\n"
-      "private static $final$ com.google.protobuf.Descriptors.FileDescriptor\n"
-      "    descriptor;\n"
-      "static {\n",
-      // TODO(dweis): Mark this as final.
-      "final", "");
-  printer->Indent();
-
-  SharedCodeGenerator shared_code_generator(file_, options_);
-  shared_code_generator.GenerateDescriptors(printer);
-
-  int bytecode_estimate = 0;
-  int method_num = 0;
-
-  for (int i = 0; i < file_->message_type_count(); i++) {
-    bytecode_estimate +=
-        message_generators_[i]->GenerateStaticVariableInitializers(printer);
-    MaybeRestartJavaMethod(
-        printer, &bytecode_estimate, &method_num,
-        "_clinit_autosplit_dinit_$method_num$();\n",
-        "private static void _clinit_autosplit_dinit_$method_num$() {\n");
-  }
-  for (int i = 0; i < file_->extension_count(); i++) {
-    bytecode_estimate +=
-        extension_generators_[i]->GenerateNonNestedInitializationCode(printer);
-    MaybeRestartJavaMethod(
-        printer, &bytecode_estimate, &method_num,
-        "_clinit_autosplit_dinit_$method_num$();\n",
-        "private static void _clinit_autosplit_dinit_$method_num$() {\n");
-  }
-
-  // Proto compiler builds a DescriptorPool, which holds all the descriptors to
-  // generate, when processing the ".proto" files. We call this DescriptorPool
-  // the parsed pool (a.k.a. file_->pool()).
-  //
-  // Note that when users try to extend the (.*)DescriptorProto in their
-  // ".proto" files, it does not affect the pre-built FileDescriptorProto class
-  // in proto compiler. When we put the descriptor data in the file_proto, those
-  // extensions become unknown fields.
-  //
-  // Now we need to find out all the extension value to the (.*)DescriptorProto
-  // in the file_proto message, and prepare an ExtensionRegistry to return.
-  //
-  // To find those extensions, we need to parse the data into a dynamic message
-  // of the FileDescriptor based on the builder-pool, then we can use
-  // reflections to find all extension fields
-  FileDescriptorProto file_proto;
-  file_->CopyTo(&file_proto);
-  std::string file_data;
-  file_proto.SerializeToString(&file_data);
-  FieldDescriptorSet extensions;
-  CollectExtensions(file_proto, *file_->pool(), &extensions, file_data);
-
-  if (extensions.size() > 0) {
-    // Must construct an ExtensionRegistry containing all existing extensions
-    // and use it to parse the descriptor data again to recognize extensions.
-    printer->Print(
-        "com.google.protobuf.ExtensionRegistry registry =\n"
-        "    com.google.protobuf.ExtensionRegistry.newInstance();\n");
-    FieldDescriptorSet::iterator it;
-    for (it = extensions.begin(); it != extensions.end(); it++) {
-      std::unique_ptr<ExtensionGenerator> generator(
-          generator_factory_->NewExtensionGenerator(*it));
-      bytecode_estimate += generator->GenerateRegistrationCode(printer);
-      MaybeRestartJavaMethod(
-          printer, &bytecode_estimate, &method_num,
-          "_clinit_autosplit_dinit_$method_num$(registry);\n",
-          "private static void _clinit_autosplit_dinit_$method_num$(\n"
-          "    com.google.protobuf.ExtensionRegistry registry) {\n");
-    }
-    printer->Print(
-        "com.google.protobuf.Descriptors.FileDescriptor\n"
-        "    .internalUpdateFileDescriptor(descriptor, registry);\n");
-  }
-
-  // Force descriptor initialization of all dependencies.
-  for (int i = 0; i < file_->dependency_count(); i++) {
-    if (ShouldIncludeDependency(file_->dependency(i), true)) {
-      std::string dependency =
-          name_resolver_->GetImmutableClassName(file_->dependency(i));
-      printer->Print("$dependency$.getDescriptor();\n", "dependency",
-                     dependency);
-    }
-  }
-
-  printer->Outdent();
-  printer->Print("}\n");
-}
-
-void FileGenerator::GenerateDescriptorInitializationCodeForMutable(
-    io::Printer* printer) {
-  printer->Print(
-      "public static com.google.protobuf.Descriptors.FileDescriptor\n"
-      "    getDescriptor() {\n"
-      "  return descriptor;\n"
-      "}\n"
-      "private static final com.google.protobuf.Descriptors.FileDescriptor\n"
-      "    descriptor;\n"
-      "static {\n");
-  printer->Indent();
-
-  printer->Print(
-      "descriptor = $immutable_package$.$descriptor_classname$.descriptor;\n",
-      "immutable_package", FileJavaPackage(file_, true), "descriptor_classname",
-      name_resolver_->GetDescriptorClassName(file_));
-
-  for (int i = 0; i < file_->message_type_count(); i++) {
-    message_generators_[i]->GenerateStaticVariableInitializers(printer);
-  }
-  for (int i = 0; i < file_->extension_count(); i++) {
-    extension_generators_[i]->GenerateNonNestedInitializationCode(printer);
-  }
-
-  // Check if custom options exist. If any, try to load immutable classes since
-  // custom options are only represented with immutable messages.
-  FileDescriptorProto file_proto;
-  file_->CopyTo(&file_proto);
-  std::string file_data;
-  file_proto.SerializeToString(&file_data);
-  FieldDescriptorSet extensions;
-  CollectExtensions(file_proto, *file_->pool(), &extensions, file_data);
-
-  if (extensions.size() > 0) {
-    // Try to load immutable messages' outer class. Its initialization code
-    // will take care of interpreting custom options.
-    printer->Print(
-        "try {\n"
-        // Note that we have to load the immutable class dynamically here as
-        // we want the mutable code to be independent from the immutable code
-        // at compile time. It is required to implement dual-compile for
-        // mutable and immutable API in blaze.
-        "  java.lang.Class<?> immutableClass = java.lang.Class.forName(\n"
-        "      \"$immutable_classname$\");\n"
-        "} catch (java.lang.ClassNotFoundException e) {\n",
-        "immutable_classname", name_resolver_->GetImmutableClassName(file_));
-    printer->Indent();
-
-    // The immutable class can not be found. We try our best to collect all
-    // custom option extensions to interpret the custom options.
-    printer->Print(
-        "com.google.protobuf.ExtensionRegistry registry =\n"
-        "    com.google.protobuf.ExtensionRegistry.newInstance();\n"
-        "com.google.protobuf.MessageLite defaultExtensionInstance = null;\n");
-    FieldDescriptorSet::iterator it;
-    for (it = extensions.begin(); it != extensions.end(); it++) {
-      const FieldDescriptor* field = *it;
-      std::string scope;
-      if (field->extension_scope() != NULL) {
-        scope = name_resolver_->GetMutableClassName(field->extension_scope()) +
-                ".getDescriptor()";
-      } else {
-        scope = FileJavaPackage(field->file(), true) + "." +
-                name_resolver_->GetDescriptorClassName(field->file()) +
-                ".descriptor";
-      }
-      if (field->cpp_type() == FieldDescriptor::CPPTYPE_MESSAGE) {
-        printer->Print(
-            "defaultExtensionInstance = com.google.protobuf.Internal\n"
-            "    .getDefaultInstance(\"$class$\");\n"
-            "if (defaultExtensionInstance != null) {\n"
-            "  registry.add(\n"
-            "      $scope$.getExtensions().get($index$),\n"
-            "      (com.google.protobuf.Message) defaultExtensionInstance);\n"
-            "}\n",
-            "scope", scope, "index", StrCat(field->index()), "class",
-            name_resolver_->GetImmutableClassName(field->message_type()));
-      } else {
-        printer->Print("registry.add($scope$.getExtensions().get($index$));\n",
-                       "scope", scope, "index", StrCat(field->index()));
-      }
-    }
-    printer->Print(
-        "com.google.protobuf.Descriptors.FileDescriptor\n"
-        "    .internalUpdateFileDescriptor(descriptor, registry);\n");
-
-    printer->Outdent();
-    printer->Print("}\n");
-  }
-
-  // Force descriptor initialization of all dependencies.
-  for (int i = 0; i < file_->dependency_count(); i++) {
-    if (ShouldIncludeDependency(file_->dependency(i), false)) {
-      std::string dependency =
-          name_resolver_->GetMutableClassName(file_->dependency(i));
-      printer->Print("$dependency$.getDescriptor();\n", "dependency",
-                     dependency);
-    }
-  }
-
-  printer->Outdent();
-  printer->Print("}\n");
-}
-
-template <typename GeneratorClass, typename DescriptorClass>
-static void GenerateSibling(
-    const std::string& package_dir, const std::string& java_package,
-    const DescriptorClass* descriptor, GeneratorContext* context,
-    std::vector<std::string>* file_list, bool annotate_code,
-    std::vector<std::string>* annotation_list, const std::string& name_suffix,
-    GeneratorClass* generator,
-    void (GeneratorClass::*pfn)(io::Printer* printer)) {
-  std::string filename =
-      package_dir + descriptor->name() + name_suffix + ".java";
-  file_list->push_back(filename);
-  std::string info_full_path = filename + ".pb.meta";
-  GeneratedCodeInfo annotations;
-  io::AnnotationProtoCollector<GeneratedCodeInfo> annotation_collector(
-      &annotations);
-
-  std::unique_ptr<io::ZeroCopyOutputStream> output(context->Open(filename));
-  io::Printer printer(output.get(), '$',
-                      annotate_code ? &annotation_collector : NULL);
-
-  printer.Print(
-      "// Generated by the protocol buffer compiler.  DO NOT EDIT!\n"
-      "// source: $filename$\n"
-      "\n",
-      "filename", descriptor->file()->name());
-  if (!java_package.empty()) {
-    printer.Print(
-        "package $package$;\n"
-        "\n",
-        "package", java_package);
-  }
-
-  (generator->*pfn)(&printer);
-
-  if (annotate_code) {
-    std::unique_ptr<io::ZeroCopyOutputStream> info_output(
-        context->Open(info_full_path));
-    annotations.SerializeToZeroCopyStream(info_output.get());
-    annotation_list->push_back(info_full_path);
-  }
-}
-
-void FileGenerator::GenerateSiblings(
-    const std::string& package_dir, GeneratorContext* context,
-    std::vector<std::string>* file_list,
-    std::vector<std::string>* annotation_list) {
-  if (MultipleJavaFiles(file_, immutable_api_)) {
-    for (int i = 0; i < file_->enum_type_count(); i++) {
-      if (HasDescriptorMethods(file_, context_->EnforceLite())) {
-        EnumGenerator generator(file_->enum_type(i), immutable_api_,
-                                context_.get());
-        GenerateSibling<EnumGenerator>(
-            package_dir, java_package_, file_->enum_type(i), context, file_list,
-            options_.annotate_code, annotation_list, "", &generator,
-            &EnumGenerator::Generate);
-      } else {
-        EnumLiteGenerator generator(file_->enum_type(i), immutable_api_,
-                                    context_.get());
-        GenerateSibling<EnumLiteGenerator>(
-            package_dir, java_package_, file_->enum_type(i), context, file_list,
-            options_.annotate_code, annotation_list, "", &generator,
-            &EnumLiteGenerator::Generate);
-      }
-    }
-    for (int i = 0; i < file_->message_type_count(); i++) {
-      if (immutable_api_) {
-        GenerateSibling<MessageGenerator>(
-            package_dir, java_package_, file_->message_type(i), context,
-            file_list, options_.annotate_code, annotation_list, "OrBuilder",
-            message_generators_[i].get(), &MessageGenerator::GenerateInterface);
-      }
-      GenerateSibling<MessageGenerator>(
-          package_dir, java_package_, file_->message_type(i), context,
-          file_list, options_.annotate_code, annotation_list, "",
-          message_generators_[i].get(), &MessageGenerator::Generate);
-    }
-    if (HasGenericServices(file_, context_->EnforceLite())) {
-      for (int i = 0; i < file_->service_count(); i++) {
-        std::unique_ptr<ServiceGenerator> generator(
-            generator_factory_->NewServiceGenerator(file_->service(i)));
-        GenerateSibling<ServiceGenerator>(
-            package_dir, java_package_, file_->service(i), context, file_list,
-            options_.annotate_code, annotation_list, "", generator.get(),
-            &ServiceGenerator::Generate);
-      }
-    }
-  }
-}
-
-std::string FileGenerator::GetKotlinClassname() {
-  return name_resolver_->GetFileClassName(file_, immutable_api_, true);
-}
-
-void FileGenerator::GenerateKotlinSiblings(
-    const std::string& package_dir, GeneratorContext* context,
-    std::vector<std::string>* file_list,
-    std::vector<std::string>* annotation_list) {
-  for (int i = 0; i < file_->message_type_count(); i++) {
-    const Descriptor* descriptor = file_->message_type(i);
-    MessageGenerator* generator = message_generators_[i].get();
-    auto open_file = [context](const std::string& filename) {
-      return std::unique_ptr<io::ZeroCopyOutputStream>(context->Open(filename));
-    };
-    std::string filename = package_dir + descriptor->name() + "Kt.kt";
-    file_list->push_back(filename);
-    std::string info_full_path = filename + ".pb.meta";
-    GeneratedCodeInfo annotations;
-    io::AnnotationProtoCollector<GeneratedCodeInfo> annotation_collector(
-        &annotations);
-    auto output = open_file(filename);
-    io::Printer printer(
-        output.get(), '$',
-        options_.annotate_code ? &annotation_collector : nullptr);
-
-    printer.Print(
-        "//Generated by the protocol buffer compiler. DO NOT EDIT!\n"
-        "// source: $filename$\n"
-        "\n",
-        "filename", descriptor->file()->name());
-    if (!java_package_.empty()) {
-      printer.Print(
-          "package $package$;\n"
-          "\n",
-          "package", java_package_);
-    }
-
-    generator->GenerateKotlinMembers(&printer);
-    generator->GenerateTopLevelKotlinMembers(&printer);
-
-    if (options_.annotate_code) {
-      auto info_output = open_file(info_full_path);
-      annotations.SerializeToZeroCopyStream(info_output.get());
-      annotation_list->push_back(info_full_path);
-    }
-  }
-}
-
-bool FileGenerator::ShouldIncludeDependency(const FileDescriptor* descriptor,
-                                            bool immutable_api) {
-  return true;
-}
-
-}  // namespace java
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
diff --git a/libs/protobuf/src/google/protobuf/compiler/java/file.h b/libs/protobuf/src/google/protobuf/compiler/java/file.h
deleted file mode 100644
index b2e0373..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/java/file.h
+++ /dev/null
@@ -1,126 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-
-#ifndef GOOGLE_PROTOBUF_COMPILER_JAVA_FILE_H__
-#define GOOGLE_PROTOBUF_COMPILER_JAVA_FILE_H__
-
-#include <memory>
-#include <string>
-#include <vector>
-
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/compiler/java/options.h>
-
-namespace google {
-namespace protobuf {
-class FileDescriptor;  // descriptor.h
-namespace io {
-class Printer;  // printer.h
-}
-namespace compiler {
-class GeneratorContext;  // code_generator.h
-namespace java {
-class Context;             // context.h
-class MessageGenerator;    // message.h
-class GeneratorFactory;    // generator_factory.h
-class ExtensionGenerator;  // extension.h
-class ClassNameResolver;   // name_resolver.h
-}  // namespace java
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace java {
-
-class FileGenerator {
- public:
-  FileGenerator(const FileDescriptor* file, const Options& options,
-                bool immutable_api = true);
-  ~FileGenerator();
-
-  // Checks for problems that would otherwise lead to cryptic compile errors.
-  // Returns true if there are no problems, or writes an error description to
-  // the given string and returns false otherwise.
-  bool Validate(std::string* error);
-
-  void Generate(io::Printer* printer);
-
-  std::string GetKotlinClassname();
-  void GenerateKotlinSiblings(const std::string& package_dir,
-                              GeneratorContext* generator_context,
-                              std::vector<std::string>* file_list,
-                              std::vector<std::string>* annotation_list);
-
-  // If we aren't putting everything into one file, this will write all the
-  // files other than the outer file (i.e. one for each message, enum, and
-  // service type).
-  void GenerateSiblings(const std::string& package_dir,
-                        GeneratorContext* generator_context,
-                        std::vector<std::string>* file_list,
-                        std::vector<std::string>* annotation_list);
-
-  const std::string& java_package() { return java_package_; }
-  const std::string& classname() { return classname_; }
-
- private:
-  void GenerateDescriptorInitializationCodeForImmutable(io::Printer* printer);
-  void GenerateDescriptorInitializationCodeForMutable(io::Printer* printer);
-
-  bool ShouldIncludeDependency(const FileDescriptor* descriptor,
-                               bool immutable_api_);
-
-  const FileDescriptor* file_;
-  std::string java_package_;
-  std::string classname_;
-
-  std::vector<std::unique_ptr<MessageGenerator>> message_generators_;
-  std::vector<std::unique_ptr<ExtensionGenerator>> extension_generators_;
-  std::unique_ptr<GeneratorFactory> generator_factory_;
-  std::unique_ptr<Context> context_;
-  ClassNameResolver* name_resolver_;
-  const Options options_;
-  bool immutable_api_;
-
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(FileGenerator);
-};
-
-}  // namespace java
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // GOOGLE_PROTOBUF_COMPILER_JAVA_FILE_H__
diff --git a/libs/protobuf/src/google/protobuf/compiler/java/generator.cc b/libs/protobuf/src/google/protobuf/compiler/java/generator.cc
deleted file mode 100644
index 85e3991..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/java/generator.cc
+++ /dev/null
@@ -1,212 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-
-#include <google/protobuf/compiler/java/generator.h>
-
-
-#include <memory>
-
-#include <google/protobuf/io/printer.h>
-#include <google/protobuf/io/zero_copy_stream.h>
-#include <google/protobuf/stubs/stringprintf.h>
-#include <google/protobuf/compiler/java/file.h>
-#include <google/protobuf/compiler/java/generator_factory.h>
-#include <google/protobuf/compiler/java/helpers.h>
-#include <google/protobuf/compiler/java/name_resolver.h>
-#include <google/protobuf/compiler/java/options.h>
-#include <google/protobuf/compiler/java/shared_code_generator.h>
-#include <google/protobuf/descriptor.pb.h>
-
-#include <google/protobuf/stubs/strutil.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace java {
-
-
-JavaGenerator::JavaGenerator() {}
-JavaGenerator::~JavaGenerator() {}
-
-uint64_t JavaGenerator::GetSupportedFeatures() const {
-  return CodeGenerator::Feature::FEATURE_PROTO3_OPTIONAL;
-}
-
-bool JavaGenerator::Generate(const FileDescriptor* file,
-                             const std::string& parameter,
-                             GeneratorContext* context,
-                             std::string* error) const {
-  // -----------------------------------------------------------------
-  // parse generator options
-
-  std::vector<std::pair<std::string, std::string> > options;
-  ParseGeneratorParameter(parameter, &options);
-  Options file_options;
-
-  for (int i = 0; i < options.size(); i++) {
-    if (options[i].first == "output_list_file") {
-      file_options.output_list_file = options[i].second;
-    } else if (options[i].first == "immutable") {
-      file_options.generate_immutable_code = true;
-    } else if (options[i].first == "mutable") {
-      file_options.generate_mutable_code = true;
-    } else if (options[i].first == "shared") {
-      file_options.generate_shared_code = true;
-    } else if (options[i].first == "lite") {
-      // Note: Java Lite does not guarantee API/ABI stability. We may choose to
-      // break existing API in order to boost performance / reduce code size.
-      file_options.enforce_lite = true;
-    } else if (options[i].first == "annotate_code") {
-      file_options.annotate_code = true;
-    } else if (options[i].first == "annotation_list_file") {
-      file_options.annotation_list_file = options[i].second;
-    } else {
-      *error = "Unknown generator option: " + options[i].first;
-      return false;
-    }
-  }
-
-  if (file_options.enforce_lite && file_options.generate_mutable_code) {
-    *error = "lite runtime generator option cannot be used with mutable API.";
-    return false;
-  }
-
-  // By default we generate immutable code and shared code for immutable API.
-  if (!file_options.generate_immutable_code &&
-      !file_options.generate_mutable_code &&
-      !file_options.generate_shared_code) {
-    file_options.generate_immutable_code = true;
-    file_options.generate_shared_code = true;
-  }
-
-  // -----------------------------------------------------------------
-
-
-  std::vector<std::string> all_files;
-  std::vector<std::string> all_annotations;
-
-
-  std::vector<FileGenerator*> file_generators;
-  if (file_options.generate_immutable_code) {
-    file_generators.push_back(new FileGenerator(file, file_options,
-                                                /* immutable = */ true));
-  }
-  if (file_options.generate_mutable_code) {
-    file_generators.push_back(new FileGenerator(file, file_options,
-                                                /* mutable = */ false));
-  }
-
-  for (int i = 0; i < file_generators.size(); ++i) {
-    if (!file_generators[i]->Validate(error)) {
-      for (int j = 0; j < file_generators.size(); ++j) {
-        delete file_generators[j];
-      }
-      return false;
-    }
-  }
-
-  for (int i = 0; i < file_generators.size(); ++i) {
-    FileGenerator* file_generator = file_generators[i];
-
-    std::string package_dir = JavaPackageToDir(file_generator->java_package());
-
-    std::string java_filename = package_dir;
-    java_filename += file_generator->classname();
-    java_filename += ".java";
-    all_files.push_back(java_filename);
-    std::string info_full_path = java_filename + ".pb.meta";
-    if (file_options.annotate_code) {
-      all_annotations.push_back(info_full_path);
-    }
-
-    // Generate main java file.
-    std::unique_ptr<io::ZeroCopyOutputStream> output(
-        context->Open(java_filename));
-    GeneratedCodeInfo annotations;
-    io::AnnotationProtoCollector<GeneratedCodeInfo> annotation_collector(
-        &annotations);
-    io::Printer printer(
-        output.get(), '$',
-        file_options.annotate_code ? &annotation_collector : NULL);
-
-    file_generator->Generate(&printer);
-
-    // Generate sibling files.
-    file_generator->GenerateSiblings(package_dir, context, &all_files,
-                                     &all_annotations);
-
-    if (file_options.annotate_code) {
-      std::unique_ptr<io::ZeroCopyOutputStream> info_output(
-          context->Open(info_full_path));
-      annotations.SerializeToZeroCopyStream(info_output.get());
-    }
-  }
-
-
-  for (int i = 0; i < file_generators.size(); ++i) {
-    delete file_generators[i];
-  }
-  file_generators.clear();
-
-  // Generate output list if requested.
-  if (!file_options.output_list_file.empty()) {
-    // Generate output list.  This is just a simple text file placed in a
-    // deterministic location which lists the .java files being generated.
-    std::unique_ptr<io::ZeroCopyOutputStream> srclist_raw_output(
-        context->Open(file_options.output_list_file));
-    io::Printer srclist_printer(srclist_raw_output.get(), '$');
-    for (int i = 0; i < all_files.size(); i++) {
-      srclist_printer.Print("$filename$\n", "filename", all_files[i]);
-    }
-  }
-
-  if (!file_options.annotation_list_file.empty()) {
-    // Generate output list.  This is just a simple text file placed in a
-    // deterministic location which lists the .java files being generated.
-    std::unique_ptr<io::ZeroCopyOutputStream> annotation_list_raw_output(
-        context->Open(file_options.annotation_list_file));
-    io::Printer annotation_list_printer(annotation_list_raw_output.get(), '$');
-    for (int i = 0; i < all_annotations.size(); i++) {
-      annotation_list_printer.Print("$filename$\n", "filename",
-                                    all_annotations[i]);
-    }
-  }
-
-  return true;
-}
-
-}  // namespace java
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/compiler/java/generator.h b/libs/protobuf/src/google/protobuf/compiler/java/generator.h
deleted file mode 100644
index bbc7170..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/java/generator.h
+++ /dev/null
@@ -1,77 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-//
-// Generates Java code for a given .proto file.
-
-#ifndef GOOGLE_PROTOBUF_COMPILER_JAVA_GENERATOR_H__
-#define GOOGLE_PROTOBUF_COMPILER_JAVA_GENERATOR_H__
-
-#include <string>
-#include <google/protobuf/compiler/code_generator.h>
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace java {
-
-// CodeGenerator implementation which generates Java code.  If you create your
-// own protocol compiler binary and you want it to support Java output, you
-// can do so by registering an instance of this CodeGenerator with the
-// CommandLineInterface in your main() function.
-class PROTOC_EXPORT JavaGenerator : public CodeGenerator {
- public:
-  JavaGenerator();
-  ~JavaGenerator() override;
-
-  // implements CodeGenerator ----------------------------------------
-  bool Generate(const FileDescriptor* file, const std::string& parameter,
-                GeneratorContext* context, std::string* error) const override;
-
-  uint64_t GetSupportedFeatures() const override;
-
- private:
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(JavaGenerator);
-};
-
-}  // namespace java
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
-
-#endif  // GOOGLE_PROTOBUF_COMPILER_JAVA_GENERATOR_H__
diff --git a/libs/protobuf/src/google/protobuf/compiler/java/generator_factory.cc b/libs/protobuf/src/google/protobuf/compiler/java/generator_factory.cc
deleted file mode 100644
index dd526ba..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/java/generator_factory.cc
+++ /dev/null
@@ -1,86 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: liujisi@google.com (Pherl Liu)
-
-#include <google/protobuf/compiler/java/generator_factory.h>
-
-#include <google/protobuf/compiler/java/context.h>
-#include <google/protobuf/compiler/java/enum_field.h>
-#include <google/protobuf/compiler/java/extension.h>
-#include <google/protobuf/compiler/java/extension_lite.h>
-#include <google/protobuf/compiler/java/field.h>
-#include <google/protobuf/compiler/java/helpers.h>
-#include <google/protobuf/compiler/java/message.h>
-#include <google/protobuf/compiler/java/message_lite.h>
-#include <google/protobuf/compiler/java/service.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace java {
-
-GeneratorFactory::GeneratorFactory() {}
-GeneratorFactory::~GeneratorFactory() {}
-
-// ===================================================================
-
-ImmutableGeneratorFactory::ImmutableGeneratorFactory(Context* context)
-    : context_(context) {}
-ImmutableGeneratorFactory::~ImmutableGeneratorFactory() {}
-
-MessageGenerator* ImmutableGeneratorFactory::NewMessageGenerator(
-    const Descriptor* descriptor) const {
-  if (HasDescriptorMethods(descriptor, context_->EnforceLite())) {
-    return new ImmutableMessageGenerator(descriptor, context_);
-  } else {
-    return new ImmutableMessageLiteGenerator(descriptor, context_);
-  }
-}
-
-ExtensionGenerator* ImmutableGeneratorFactory::NewExtensionGenerator(
-    const FieldDescriptor* descriptor) const {
-  if (HasDescriptorMethods(descriptor->file(), context_->EnforceLite())) {
-    return new ImmutableExtensionGenerator(descriptor, context_);
-  } else {
-    return new ImmutableExtensionLiteGenerator(descriptor, context_);
-  }
-}
-
-ServiceGenerator* ImmutableGeneratorFactory::NewServiceGenerator(
-    const ServiceDescriptor* descriptor) const {
-  return new ImmutableServiceGenerator(descriptor, context_);
-}
-
-
-}  // namespace java
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/compiler/java/generator_factory.h b/libs/protobuf/src/google/protobuf/compiler/java/generator_factory.h
deleted file mode 100644
index 807bca3..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/java/generator_factory.h
+++ /dev/null
@@ -1,103 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: liujisi@google.com (Pherl Liu)
-
-#ifndef GOOGLE_PROTOBUF_COMPILER_JAVA_GENERATOR_FACTORY_H__
-#define GOOGLE_PROTOBUF_COMPILER_JAVA_GENERATOR_FACTORY_H__
-
-#include <google/protobuf/stubs/common.h>
-
-namespace google {
-namespace protobuf {
-class FieldDescriptor;    // descriptor.h
-class Descriptor;         // descriptor.h
-class ServiceDescriptor;  // descriptor.h
-namespace compiler {
-namespace java {
-class MessageGenerator;    // message.h
-class ExtensionGenerator;  // extension.h
-class ServiceGenerator;    // service.h
-class Context;             // context.h
-}  // namespace java
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace java {
-
-class GeneratorFactory {
- public:
-  GeneratorFactory();
-  virtual ~GeneratorFactory();
-
-  virtual MessageGenerator* NewMessageGenerator(
-      const Descriptor* descriptor) const = 0;
-
-  virtual ExtensionGenerator* NewExtensionGenerator(
-      const FieldDescriptor* descriptor) const = 0;
-
-  virtual ServiceGenerator* NewServiceGenerator(
-      const ServiceDescriptor* descriptor) const = 0;
-
- private:
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(GeneratorFactory);
-};
-
-// Factory that creates generators for immutable-default messages.
-class ImmutableGeneratorFactory : public GeneratorFactory {
- public:
-  ImmutableGeneratorFactory(Context* context);
-  ~ImmutableGeneratorFactory() override;
-
-  MessageGenerator* NewMessageGenerator(
-      const Descriptor* descriptor) const override;
-
-  ExtensionGenerator* NewExtensionGenerator(
-      const FieldDescriptor* descriptor) const override;
-
-  ServiceGenerator* NewServiceGenerator(
-      const ServiceDescriptor* descriptor) const override;
-
- private:
-  Context* context_;
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(ImmutableGeneratorFactory);
-};
-
-
-}  // namespace java
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // GOOGLE_PROTOBUF_COMPILER_JAVA_GENERATOR_FACTORY_H__
diff --git a/libs/protobuf/src/google/protobuf/compiler/java/helpers.cc b/libs/protobuf/src/google/protobuf/compiler/java/helpers.cc
deleted file mode 100644
index 15ee8f5..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/java/helpers.cc
+++ /dev/null
@@ -1,1115 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-
-#include <google/protobuf/compiler/java/helpers.h>
-
-#include <algorithm>
-#include <cstdint>
-#include <limits>
-#include <unordered_set>
-#include <vector>
-
-#include <google/protobuf/wire_format.h>
-#include <google/protobuf/stubs/strutil.h>
-#include <google/protobuf/stubs/stringprintf.h>
-#include <google/protobuf/stubs/substitute.h>
-#include <google/protobuf/compiler/java/name_resolver.h>
-#include <google/protobuf/compiler/java/names.h>
-#include <google/protobuf/descriptor.pb.h>
-#include <google/protobuf/stubs/hash.h>  // for hash<T *>
-
-// Must be last.
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace java {
-
-using internal::WireFormat;
-using internal::WireFormatLite;
-
-const char kThickSeparator[] =
-    "// ===================================================================\n";
-const char kThinSeparator[] =
-    "// -------------------------------------------------------------------\n";
-
-namespace {
-
-const char* kDefaultPackage = "";
-
-// Names that should be avoided (in UpperCamelCase format).
-// Using them will cause the compiler to generate accessors whose names
-// collide with methods defined in base classes.
-// Keep this list in sync with specialFieldNames in
-// java/core/src/main/java/com/google/protobuf/DescriptorMessageInfoFactory.java
-const char* kForbiddenWordList[] = {
-    // java.lang.Object:
-    "Class",
-    // com.google.protobuf.MessageLiteOrBuilder:
-    "DefaultInstanceForType",
-    // com.google.protobuf.MessageLite:
-    "ParserForType",
-    "SerializedSize",
-    // com.google.protobuf.MessageOrBuilder:
-    "AllFields",
-    "DescriptorForType",
-    "InitializationErrorString",
-    "UnknownFields",
-    // obsolete. kept for backwards compatibility of generated code
-    "CachedSize",
-};
-
-const std::unordered_set<std::string>* kReservedNames =
-    new std::unordered_set<std::string>({
-        "abstract",   "assert",       "boolean",   "break",      "byte",
-        "case",       "catch",        "char",      "class",      "const",
-        "continue",   "default",      "do",        "double",     "else",
-        "enum",       "extends",      "final",     "finally",    "float",
-        "for",        "goto",         "if",        "implements", "import",
-        "instanceof", "int",          "interface", "long",       "native",
-        "new",        "package",      "private",   "protected",  "public",
-        "return",     "short",        "static",    "strictfp",   "super",
-        "switch",     "synchronized", "this",      "throw",      "throws",
-        "transient",  "try",          "void",      "volatile",   "while",
-    });
-
-bool IsForbidden(const std::string& field_name) {
-  for (int i = 0; i < GOOGLE_ARRAYSIZE(kForbiddenWordList); ++i) {
-    if (UnderscoresToCamelCase(field_name, true) == kForbiddenWordList[i]) {
-      return true;
-    }
-  }
-  return false;
-}
-
-std::string FieldName(const FieldDescriptor* field) {
-  std::string field_name;
-  // Groups are hacky:  The name of the field is just the lower-cased name
-  // of the group type.  In Java, though, we would like to retain the original
-  // capitalization of the type name.
-  if (GetType(field) == FieldDescriptor::TYPE_GROUP) {
-    field_name = field->message_type()->name();
-  } else {
-    field_name = field->name();
-  }
-  if (IsForbidden(field_name)) {
-    // Append a trailing "#" to indicate that the name should be decorated to
-    // avoid collision with other names.
-    field_name += "#";
-  }
-  return field_name;
-}
-
-
-}  // namespace
-
-void PrintGeneratedAnnotation(io::Printer* printer, char delimiter,
-                              const std::string& annotation_file) {
-  if (annotation_file.empty()) {
-    return;
-  }
-  std::string ptemplate =
-      "@javax.annotation.Generated(value=\"protoc\", comments=\"annotations:";
-  ptemplate.push_back(delimiter);
-  ptemplate.append("annotation_file");
-  ptemplate.push_back(delimiter);
-  ptemplate.append("\")\n");
-  printer->Print(ptemplate.c_str(), "annotation_file", annotation_file);
-}
-
-void PrintEnumVerifierLogic(io::Printer* printer,
-                            const FieldDescriptor* descriptor,
-                            const std::map<std::string, std::string>& variables,
-                            const char* var_name,
-                            const char* terminating_string, bool enforce_lite) {
-  std::string enum_verifier_string =
-      enforce_lite ? StrCat(var_name, ".internalGetVerifier()")
-                   : StrCat(
-                         "new com.google.protobuf.Internal.EnumVerifier() {\n"
-                         "        @java.lang.Override\n"
-                         "        public boolean isInRange(int number) {\n"
-                         "          return ",
-                         var_name,
-                         ".forNumber(number) != null;\n"
-                         "        }\n"
-                         "      }");
-  printer->Print(
-      variables,
-      StrCat(enum_verifier_string, terminating_string).c_str());
-}
-
-std::string UnderscoresToCamelCase(const std::string& input,
-                                   bool cap_next_letter) {
-  GOOGLE_CHECK(!input.empty());
-  std::string result;
-  // Note:  I distrust ctype.h due to locales.
-  for (int i = 0; i < input.size(); i++) {
-    if ('a' <= input[i] && input[i] <= 'z') {
-      if (cap_next_letter) {
-        result += input[i] + ('A' - 'a');
-      } else {
-        result += input[i];
-      }
-      cap_next_letter = false;
-    } else if ('A' <= input[i] && input[i] <= 'Z') {
-      if (i == 0 && !cap_next_letter) {
-        // Force first letter to lower-case unless explicitly told to
-        // capitalize it.
-        result += input[i] + ('a' - 'A');
-      } else {
-        // Capital letters after the first are left as-is.
-        result += input[i];
-      }
-      cap_next_letter = false;
-    } else if ('0' <= input[i] && input[i] <= '9') {
-      result += input[i];
-      cap_next_letter = true;
-    } else {
-      cap_next_letter = true;
-    }
-  }
-  // Add a trailing "_" if the name should be altered.
-  if (input[input.size() - 1] == '#') {
-    result += '_';
-  }
-  return result;
-}
-
-std::string ToCamelCase(const std::string& input, bool lower_first) {
-  bool capitalize_next = !lower_first;
-  std::string result;
-  result.reserve(input.size());
-
-  for (char i : input) {
-    if (i == '_') {
-      capitalize_next = true;
-    } else if (capitalize_next) {
-      result.push_back(ToUpperCh(i));
-      capitalize_next = false;
-    } else {
-      result.push_back(i);
-    }
-  }
-
-  // Lower-case the first letter.
-  if (lower_first && !result.empty()) {
-    result[0] = ToLowerCh(result[0]);
-  }
-
-  return result;
-}
-
-char ToUpperCh(char ch) {
-  return (ch >= 'a' && ch <= 'z') ? (ch - 'a' + 'A') : ch;
-}
-
-char ToLowerCh(char ch) {
-  return (ch >= 'A' && ch <= 'Z') ? (ch - 'A' + 'a') : ch;
-}
-
-std::string UnderscoresToCamelCase(const FieldDescriptor* field) {
-  return UnderscoresToCamelCase(FieldName(field), false);
-}
-
-std::string UnderscoresToCapitalizedCamelCase(const FieldDescriptor* field) {
-  return UnderscoresToCamelCase(FieldName(field), true);
-}
-
-std::string CapitalizedFieldName(const FieldDescriptor* field) {
-  return UnderscoresToCapitalizedCamelCase(field);
-}
-
-std::string UnderscoresToCamelCase(const MethodDescriptor* method) {
-  return UnderscoresToCamelCase(method->name(), false);
-}
-
-std::string UnderscoresToCamelCaseCheckReserved(const FieldDescriptor* field) {
-  std::string name = UnderscoresToCamelCase(field);
-  if (kReservedNames->find(name) != kReservedNames->end()) {
-    return name + "_";
-  }
-  return name;
-}
-
-// Names that should be avoided as field names in Kotlin.
-// All Kotlin hard keywords are in this list.
-const std::unordered_set<std::string>* kKotlinForbiddenNames =
-    new std::unordered_set<std::string>({
-        "as",    "as?",   "break", "class",  "continue",  "do",     "else",
-        "false", "for",   "fun",   "if",     "in",        "!in",    "interface",
-        "is",    "!is",   "null",  "object", "package",   "return", "super",
-        "this",  "throw", "true",  "try",    "typealias", "typeof", "val",
-        "var",   "when",  "while",
-    });
-
-bool IsForbiddenKotlin(const std::string& field_name) {
-  return kKotlinForbiddenNames->find(field_name) !=
-         kKotlinForbiddenNames->end();
-}
-
-std::string UniqueFileScopeIdentifier(const Descriptor* descriptor) {
-  return "static_" + StringReplace(descriptor->full_name(), ".", "_", true);
-}
-
-std::string CamelCaseFieldName(const FieldDescriptor* field) {
-  std::string fieldName = UnderscoresToCamelCase(field);
-  if ('0' <= fieldName[0] && fieldName[0] <= '9') {
-    return '_' + fieldName;
-  }
-  return fieldName;
-}
-
-std::string FileClassName(const FileDescriptor* file, bool immutable) {
-  ClassNameResolver name_resolver;
-  return name_resolver.GetFileClassName(file, immutable);
-}
-
-std::string FileJavaPackage(const FileDescriptor* file, bool immutable) {
-  std::string result;
-
-  if (file->options().has_java_package()) {
-    result = file->options().java_package();
-  } else {
-    result = kDefaultPackage;
-    if (!file->package().empty()) {
-      if (!result.empty()) result += '.';
-      result += file->package();
-    }
-  }
-
-  return result;
-}
-
-std::string FileJavaPackage(const FileDescriptor* file) {
-  return FileJavaPackage(file, true /* immutable */);
-}
-
-std::string JavaPackageToDir(std::string package_name) {
-  std::string package_dir = StringReplace(package_name, ".", "/", true);
-  if (!package_dir.empty()) package_dir += "/";
-  return package_dir;
-}
-
-std::string ClassName(const Descriptor* descriptor) {
-  ClassNameResolver name_resolver;
-  return name_resolver.GetClassName(descriptor, true);
-}
-
-std::string ClassName(const EnumDescriptor* descriptor) {
-  ClassNameResolver name_resolver;
-  return name_resolver.GetClassName(descriptor, true);
-}
-
-std::string ClassName(const ServiceDescriptor* descriptor) {
-  ClassNameResolver name_resolver;
-  return name_resolver.GetClassName(descriptor, true);
-}
-
-std::string ClassName(const FileDescriptor* descriptor) {
-  ClassNameResolver name_resolver;
-  return name_resolver.GetClassName(descriptor, true);
-}
-
-
-std::string ExtraMessageInterfaces(const Descriptor* descriptor) {
-  std::string interfaces = "// @@protoc_insertion_point(message_implements:" +
-                           descriptor->full_name() + ")";
-  return interfaces;
-}
-
-
-std::string ExtraBuilderInterfaces(const Descriptor* descriptor) {
-  std::string interfaces = "// @@protoc_insertion_point(builder_implements:" +
-                           descriptor->full_name() + ")";
-  return interfaces;
-}
-
-std::string ExtraMessageOrBuilderInterfaces(const Descriptor* descriptor) {
-  std::string interfaces = "// @@protoc_insertion_point(interface_extends:" +
-                           descriptor->full_name() + ")";
-  return interfaces;
-}
-
-std::string FieldConstantName(const FieldDescriptor* field) {
-  std::string name = field->name() + "_FIELD_NUMBER";
-  ToUpper(&name);
-  return name;
-}
-
-FieldDescriptor::Type GetType(const FieldDescriptor* field) {
-  return field->type();
-}
-
-JavaType GetJavaType(const FieldDescriptor* field) {
-  switch (GetType(field)) {
-    case FieldDescriptor::TYPE_INT32:
-    case FieldDescriptor::TYPE_UINT32:
-    case FieldDescriptor::TYPE_SINT32:
-    case FieldDescriptor::TYPE_FIXED32:
-    case FieldDescriptor::TYPE_SFIXED32:
-      return JAVATYPE_INT;
-
-    case FieldDescriptor::TYPE_INT64:
-    case FieldDescriptor::TYPE_UINT64:
-    case FieldDescriptor::TYPE_SINT64:
-    case FieldDescriptor::TYPE_FIXED64:
-    case FieldDescriptor::TYPE_SFIXED64:
-      return JAVATYPE_LONG;
-
-    case FieldDescriptor::TYPE_FLOAT:
-      return JAVATYPE_FLOAT;
-
-    case FieldDescriptor::TYPE_DOUBLE:
-      return JAVATYPE_DOUBLE;
-
-    case FieldDescriptor::TYPE_BOOL:
-      return JAVATYPE_BOOLEAN;
-
-    case FieldDescriptor::TYPE_STRING:
-      return JAVATYPE_STRING;
-
-    case FieldDescriptor::TYPE_BYTES:
-      return JAVATYPE_BYTES;
-
-    case FieldDescriptor::TYPE_ENUM:
-      return JAVATYPE_ENUM;
-
-    case FieldDescriptor::TYPE_GROUP:
-    case FieldDescriptor::TYPE_MESSAGE:
-      return JAVATYPE_MESSAGE;
-
-      // No default because we want the compiler to complain if any new
-      // types are added.
-  }
-
-  GOOGLE_LOG(FATAL) << "Can't get here.";
-  return JAVATYPE_INT;
-}
-
-const char* PrimitiveTypeName(JavaType type) {
-  switch (type) {
-    case JAVATYPE_INT:
-      return "int";
-    case JAVATYPE_LONG:
-      return "long";
-    case JAVATYPE_FLOAT:
-      return "float";
-    case JAVATYPE_DOUBLE:
-      return "double";
-    case JAVATYPE_BOOLEAN:
-      return "boolean";
-    case JAVATYPE_STRING:
-      return "java.lang.String";
-    case JAVATYPE_BYTES:
-      return "com.google.protobuf.ByteString";
-    case JAVATYPE_ENUM:
-      return NULL;
-    case JAVATYPE_MESSAGE:
-      return NULL;
-
-      // No default because we want the compiler to complain if any new
-      // JavaTypes are added.
-  }
-
-  GOOGLE_LOG(FATAL) << "Can't get here.";
-  return NULL;
-}
-
-const char* PrimitiveTypeName(const FieldDescriptor* descriptor) {
-  return PrimitiveTypeName(GetJavaType(descriptor));
-}
-
-const char* BoxedPrimitiveTypeName(JavaType type) {
-  switch (type) {
-    case JAVATYPE_INT:
-      return "java.lang.Integer";
-    case JAVATYPE_LONG:
-      return "java.lang.Long";
-    case JAVATYPE_FLOAT:
-      return "java.lang.Float";
-    case JAVATYPE_DOUBLE:
-      return "java.lang.Double";
-    case JAVATYPE_BOOLEAN:
-      return "java.lang.Boolean";
-    case JAVATYPE_STRING:
-      return "java.lang.String";
-    case JAVATYPE_BYTES:
-      return "com.google.protobuf.ByteString";
-    case JAVATYPE_ENUM:
-      return NULL;
-    case JAVATYPE_MESSAGE:
-      return NULL;
-
-      // No default because we want the compiler to complain if any new
-      // JavaTypes are added.
-  }
-
-  GOOGLE_LOG(FATAL) << "Can't get here.";
-  return NULL;
-}
-
-const char* BoxedPrimitiveTypeName(const FieldDescriptor* descriptor) {
-  return BoxedPrimitiveTypeName(GetJavaType(descriptor));
-}
-
-const char* KotlinTypeName(JavaType type) {
-  switch (type) {
-    case JAVATYPE_INT:
-      return "kotlin.Int";
-    case JAVATYPE_LONG:
-      return "kotlin.Long";
-    case JAVATYPE_FLOAT:
-      return "kotlin.Float";
-    case JAVATYPE_DOUBLE:
-      return "kotlin.Double";
-    case JAVATYPE_BOOLEAN:
-      return "kotlin.Boolean";
-    case JAVATYPE_STRING:
-      return "kotlin.String";
-    case JAVATYPE_BYTES:
-      return "com.google.protobuf.ByteString";
-    case JAVATYPE_ENUM:
-      return NULL;
-    case JAVATYPE_MESSAGE:
-      return NULL;
-
-      // No default because we want the compiler to complain if any new
-      // JavaTypes are added.
-  }
-
-  GOOGLE_LOG(FATAL) << "Can't get here.";
-  return NULL;
-}
-
-std::string GetOneofStoredType(const FieldDescriptor* field) {
-  const JavaType javaType = GetJavaType(field);
-  switch (javaType) {
-    case JAVATYPE_ENUM:
-      return "java.lang.Integer";
-    case JAVATYPE_MESSAGE:
-      return ClassName(field->message_type());
-    default:
-      return BoxedPrimitiveTypeName(javaType);
-  }
-}
-
-const char* FieldTypeName(FieldDescriptor::Type field_type) {
-  switch (field_type) {
-    case FieldDescriptor::TYPE_INT32:
-      return "INT32";
-    case FieldDescriptor::TYPE_UINT32:
-      return "UINT32";
-    case FieldDescriptor::TYPE_SINT32:
-      return "SINT32";
-    case FieldDescriptor::TYPE_FIXED32:
-      return "FIXED32";
-    case FieldDescriptor::TYPE_SFIXED32:
-      return "SFIXED32";
-    case FieldDescriptor::TYPE_INT64:
-      return "INT64";
-    case FieldDescriptor::TYPE_UINT64:
-      return "UINT64";
-    case FieldDescriptor::TYPE_SINT64:
-      return "SINT64";
-    case FieldDescriptor::TYPE_FIXED64:
-      return "FIXED64";
-    case FieldDescriptor::TYPE_SFIXED64:
-      return "SFIXED64";
-    case FieldDescriptor::TYPE_FLOAT:
-      return "FLOAT";
-    case FieldDescriptor::TYPE_DOUBLE:
-      return "DOUBLE";
-    case FieldDescriptor::TYPE_BOOL:
-      return "BOOL";
-    case FieldDescriptor::TYPE_STRING:
-      return "STRING";
-    case FieldDescriptor::TYPE_BYTES:
-      return "BYTES";
-    case FieldDescriptor::TYPE_ENUM:
-      return "ENUM";
-    case FieldDescriptor::TYPE_GROUP:
-      return "GROUP";
-    case FieldDescriptor::TYPE_MESSAGE:
-      return "MESSAGE";
-
-      // No default because we want the compiler to complain if any new
-      // types are added.
-  }
-
-  GOOGLE_LOG(FATAL) << "Can't get here.";
-  return NULL;
-}
-
-bool AllAscii(const std::string& text) {
-  for (int i = 0; i < text.size(); i++) {
-    if ((text[i] & 0x80) != 0) {
-      return false;
-    }
-  }
-  return true;
-}
-
-std::string DefaultValue(const FieldDescriptor* field, bool immutable,
-                         ClassNameResolver* name_resolver) {
-  // Switch on CppType since we need to know which default_value_* method
-  // of FieldDescriptor to call.
-  switch (field->cpp_type()) {
-    case FieldDescriptor::CPPTYPE_INT32:
-      return StrCat(field->default_value_int32());
-    case FieldDescriptor::CPPTYPE_UINT32:
-      // Need to print as a signed int since Java has no unsigned.
-      return StrCat(static_cast<int32_t>(field->default_value_uint32()));
-    case FieldDescriptor::CPPTYPE_INT64:
-      return StrCat(field->default_value_int64()) + "L";
-    case FieldDescriptor::CPPTYPE_UINT64:
-      return StrCat(static_cast<int64_t>(field->default_value_uint64())) +
-             "L";
-    case FieldDescriptor::CPPTYPE_DOUBLE: {
-      double value = field->default_value_double();
-      if (value == std::numeric_limits<double>::infinity()) {
-        return "Double.POSITIVE_INFINITY";
-      } else if (value == -std::numeric_limits<double>::infinity()) {
-        return "Double.NEGATIVE_INFINITY";
-      } else if (value != value) {
-        return "Double.NaN";
-      } else {
-        return SimpleDtoa(value) + "D";
-      }
-    }
-    case FieldDescriptor::CPPTYPE_FLOAT: {
-      float value = field->default_value_float();
-      if (value == std::numeric_limits<float>::infinity()) {
-        return "Float.POSITIVE_INFINITY";
-      } else if (value == -std::numeric_limits<float>::infinity()) {
-        return "Float.NEGATIVE_INFINITY";
-      } else if (value != value) {
-        return "Float.NaN";
-      } else {
-        return SimpleFtoa(value) + "F";
-      }
-    }
-    case FieldDescriptor::CPPTYPE_BOOL:
-      return field->default_value_bool() ? "true" : "false";
-    case FieldDescriptor::CPPTYPE_STRING:
-      if (GetType(field) == FieldDescriptor::TYPE_BYTES) {
-        if (field->has_default_value()) {
-          // See comments in Internal.java for gory details.
-          return strings::Substitute(
-              "com.google.protobuf.Internal.bytesDefaultValue(\"$0\")",
-              CEscape(field->default_value_string()));
-        } else {
-          return "com.google.protobuf.ByteString.EMPTY";
-        }
-      } else {
-        if (AllAscii(field->default_value_string())) {
-          // All chars are ASCII.  In this case CEscape() works fine.
-          return "\"" + CEscape(field->default_value_string()) + "\"";
-        } else {
-          // See comments in Internal.java for gory details.
-          return strings::Substitute(
-              "com.google.protobuf.Internal.stringDefaultValue(\"$0\")",
-              CEscape(field->default_value_string()));
-        }
-      }
-
-    case FieldDescriptor::CPPTYPE_ENUM:
-      return name_resolver->GetClassName(field->enum_type(), immutable) + "." +
-             field->default_value_enum()->name();
-
-    case FieldDescriptor::CPPTYPE_MESSAGE:
-      return name_resolver->GetClassName(field->message_type(), immutable) +
-             ".getDefaultInstance()";
-
-      // No default because we want the compiler to complain if any new
-      // types are added.
-  }
-
-  GOOGLE_LOG(FATAL) << "Can't get here.";
-  return "";
-}
-
-bool IsDefaultValueJavaDefault(const FieldDescriptor* field) {
-  // Switch on CppType since we need to know which default_value_* method
-  // of FieldDescriptor to call.
-  switch (field->cpp_type()) {
-    case FieldDescriptor::CPPTYPE_INT32:
-      return field->default_value_int32() == 0;
-    case FieldDescriptor::CPPTYPE_UINT32:
-      return field->default_value_uint32() == 0;
-    case FieldDescriptor::CPPTYPE_INT64:
-      return field->default_value_int64() == 0L;
-    case FieldDescriptor::CPPTYPE_UINT64:
-      return field->default_value_uint64() == 0L;
-    case FieldDescriptor::CPPTYPE_DOUBLE:
-      return field->default_value_double() == 0.0;
-    case FieldDescriptor::CPPTYPE_FLOAT:
-      return field->default_value_float() == 0.0;
-    case FieldDescriptor::CPPTYPE_BOOL:
-      return field->default_value_bool() == false;
-    case FieldDescriptor::CPPTYPE_ENUM:
-      return field->default_value_enum()->number() == 0;
-    case FieldDescriptor::CPPTYPE_STRING:
-    case FieldDescriptor::CPPTYPE_MESSAGE:
-      return false;
-
-      // No default because we want the compiler to complain if any new
-      // types are added.
-  }
-
-  GOOGLE_LOG(FATAL) << "Can't get here.";
-  return false;
-}
-
-bool IsByteStringWithCustomDefaultValue(const FieldDescriptor* field) {
-  return GetJavaType(field) == JAVATYPE_BYTES &&
-         field->default_value_string() != "";
-}
-
-const char* bit_masks[] = {
-    "0x00000001", "0x00000002", "0x00000004", "0x00000008",
-    "0x00000010", "0x00000020", "0x00000040", "0x00000080",
-
-    "0x00000100", "0x00000200", "0x00000400", "0x00000800",
-    "0x00001000", "0x00002000", "0x00004000", "0x00008000",
-
-    "0x00010000", "0x00020000", "0x00040000", "0x00080000",
-    "0x00100000", "0x00200000", "0x00400000", "0x00800000",
-
-    "0x01000000", "0x02000000", "0x04000000", "0x08000000",
-    "0x10000000", "0x20000000", "0x40000000", "0x80000000",
-};
-
-std::string GetBitFieldName(int index) {
-  std::string varName = "bitField";
-  varName += StrCat(index);
-  varName += "_";
-  return varName;
-}
-
-std::string GetBitFieldNameForBit(int bitIndex) {
-  return GetBitFieldName(bitIndex / 32);
-}
-
-namespace {
-
-std::string GenerateGetBitInternal(const std::string& prefix, int bitIndex) {
-  std::string varName = prefix + GetBitFieldNameForBit(bitIndex);
-  int bitInVarIndex = bitIndex % 32;
-
-  std::string mask = bit_masks[bitInVarIndex];
-  std::string result = "((" + varName + " & " + mask + ") != 0)";
-  return result;
-}
-
-std::string GenerateSetBitInternal(const std::string& prefix, int bitIndex) {
-  std::string varName = prefix + GetBitFieldNameForBit(bitIndex);
-  int bitInVarIndex = bitIndex % 32;
-
-  std::string mask = bit_masks[bitInVarIndex];
-  std::string result = varName + " |= " + mask;
-  return result;
-}
-
-}  // namespace
-
-std::string GenerateGetBit(int bitIndex) {
-  return GenerateGetBitInternal("", bitIndex);
-}
-
-std::string GenerateSetBit(int bitIndex) {
-  return GenerateSetBitInternal("", bitIndex);
-}
-
-std::string GenerateClearBit(int bitIndex) {
-  std::string varName = GetBitFieldNameForBit(bitIndex);
-  int bitInVarIndex = bitIndex % 32;
-
-  std::string mask = bit_masks[bitInVarIndex];
-  std::string result = varName + " = (" + varName + " & ~" + mask + ")";
-  return result;
-}
-
-std::string GenerateGetBitFromLocal(int bitIndex) {
-  return GenerateGetBitInternal("from_", bitIndex);
-}
-
-std::string GenerateSetBitToLocal(int bitIndex) {
-  return GenerateSetBitInternal("to_", bitIndex);
-}
-
-std::string GenerateGetBitMutableLocal(int bitIndex) {
-  return GenerateGetBitInternal("mutable_", bitIndex);
-}
-
-std::string GenerateSetBitMutableLocal(int bitIndex) {
-  return GenerateSetBitInternal("mutable_", bitIndex);
-}
-
-bool IsReferenceType(JavaType type) {
-  switch (type) {
-    case JAVATYPE_INT:
-      return false;
-    case JAVATYPE_LONG:
-      return false;
-    case JAVATYPE_FLOAT:
-      return false;
-    case JAVATYPE_DOUBLE:
-      return false;
-    case JAVATYPE_BOOLEAN:
-      return false;
-    case JAVATYPE_STRING:
-      return true;
-    case JAVATYPE_BYTES:
-      return true;
-    case JAVATYPE_ENUM:
-      return true;
-    case JAVATYPE_MESSAGE:
-      return true;
-
-      // No default because we want the compiler to complain if any new
-      // JavaTypes are added.
-  }
-
-  GOOGLE_LOG(FATAL) << "Can't get here.";
-  return false;
-}
-
-const char* GetCapitalizedType(const FieldDescriptor* field, bool immutable) {
-  switch (GetType(field)) {
-    case FieldDescriptor::TYPE_INT32:
-      return "Int32";
-    case FieldDescriptor::TYPE_UINT32:
-      return "UInt32";
-    case FieldDescriptor::TYPE_SINT32:
-      return "SInt32";
-    case FieldDescriptor::TYPE_FIXED32:
-      return "Fixed32";
-    case FieldDescriptor::TYPE_SFIXED32:
-      return "SFixed32";
-    case FieldDescriptor::TYPE_INT64:
-      return "Int64";
-    case FieldDescriptor::TYPE_UINT64:
-      return "UInt64";
-    case FieldDescriptor::TYPE_SINT64:
-      return "SInt64";
-    case FieldDescriptor::TYPE_FIXED64:
-      return "Fixed64";
-    case FieldDescriptor::TYPE_SFIXED64:
-      return "SFixed64";
-    case FieldDescriptor::TYPE_FLOAT:
-      return "Float";
-    case FieldDescriptor::TYPE_DOUBLE:
-      return "Double";
-    case FieldDescriptor::TYPE_BOOL:
-      return "Bool";
-    case FieldDescriptor::TYPE_STRING:
-      return "String";
-    case FieldDescriptor::TYPE_BYTES: {
-      return "Bytes";
-    }
-    case FieldDescriptor::TYPE_ENUM:
-      return "Enum";
-    case FieldDescriptor::TYPE_GROUP:
-      return "Group";
-    case FieldDescriptor::TYPE_MESSAGE:
-      return "Message";
-
-      // No default because we want the compiler to complain if any new
-      // types are added.
-  }
-
-  GOOGLE_LOG(FATAL) << "Can't get here.";
-  return NULL;
-}
-
-// For encodings with fixed sizes, returns that size in bytes.  Otherwise
-// returns -1.
-int FixedSize(FieldDescriptor::Type type) {
-  switch (type) {
-    case FieldDescriptor::TYPE_INT32:
-      return -1;
-    case FieldDescriptor::TYPE_INT64:
-      return -1;
-    case FieldDescriptor::TYPE_UINT32:
-      return -1;
-    case FieldDescriptor::TYPE_UINT64:
-      return -1;
-    case FieldDescriptor::TYPE_SINT32:
-      return -1;
-    case FieldDescriptor::TYPE_SINT64:
-      return -1;
-    case FieldDescriptor::TYPE_FIXED32:
-      return WireFormatLite::kFixed32Size;
-    case FieldDescriptor::TYPE_FIXED64:
-      return WireFormatLite::kFixed64Size;
-    case FieldDescriptor::TYPE_SFIXED32:
-      return WireFormatLite::kSFixed32Size;
-    case FieldDescriptor::TYPE_SFIXED64:
-      return WireFormatLite::kSFixed64Size;
-    case FieldDescriptor::TYPE_FLOAT:
-      return WireFormatLite::kFloatSize;
-    case FieldDescriptor::TYPE_DOUBLE:
-      return WireFormatLite::kDoubleSize;
-
-    case FieldDescriptor::TYPE_BOOL:
-      return WireFormatLite::kBoolSize;
-    case FieldDescriptor::TYPE_ENUM:
-      return -1;
-
-    case FieldDescriptor::TYPE_STRING:
-      return -1;
-    case FieldDescriptor::TYPE_BYTES:
-      return -1;
-    case FieldDescriptor::TYPE_GROUP:
-      return -1;
-    case FieldDescriptor::TYPE_MESSAGE:
-      return -1;
-
-      // No default because we want the compiler to complain if any new
-      // types are added.
-  }
-  GOOGLE_LOG(FATAL) << "Can't get here.";
-  return -1;
-}
-
-// Sort the fields of the given Descriptor by number into a new[]'d array
-// and return it. The caller should delete the returned array.
-const FieldDescriptor** SortFieldsByNumber(const Descriptor* descriptor) {
-  const FieldDescriptor** fields =
-      new const FieldDescriptor*[descriptor->field_count()];
-  for (int i = 0; i < descriptor->field_count(); i++) {
-    fields[i] = descriptor->field(i);
-  }
-  std::sort(fields, fields + descriptor->field_count(),
-            FieldOrderingByNumber());
-  return fields;
-}
-
-// Returns true if the message type has any required fields.  If it doesn't,
-// we can optimize out calls to its isInitialized() method.
-//
-// already_seen is used to avoid checking the same type multiple times
-// (and also to protect against recursion).
-bool HasRequiredFields(const Descriptor* type,
-                       std::unordered_set<const Descriptor*>* already_seen) {
-  if (already_seen->count(type) > 0) {
-    // The type is already in cache.  This means that either:
-    // a. The type has no required fields.
-    // b. We are in the midst of checking if the type has required fields,
-    //    somewhere up the stack.  In this case, we know that if the type
-    //    has any required fields, they'll be found when we return to it,
-    //    and the whole call to HasRequiredFields() will return true.
-    //    Therefore, we don't have to check if this type has required fields
-    //    here.
-    return false;
-  }
-  already_seen->insert(type);
-
-  // If the type has extensions, an extension with message type could contain
-  // required fields, so we have to be conservative and assume such an
-  // extension exists.
-  if (type->extension_range_count() > 0) return true;
-
-  for (int i = 0; i < type->field_count(); i++) {
-    const FieldDescriptor* field = type->field(i);
-    if (field->is_required()) {
-      return true;
-    }
-    if (GetJavaType(field) == JAVATYPE_MESSAGE) {
-      if (HasRequiredFields(field->message_type(), already_seen)) {
-        return true;
-      }
-    }
-  }
-
-  return false;
-}
-
-bool HasRequiredFields(const Descriptor* type) {
-  std::unordered_set<const Descriptor*> already_seen;
-  return HasRequiredFields(type, &already_seen);
-}
-
-bool HasRepeatedFields(const Descriptor* descriptor) {
-  for (int i = 0; i < descriptor->field_count(); ++i) {
-    const FieldDescriptor* field = descriptor->field(i);
-    if (field->is_repeated()) {
-      return true;
-    }
-  }
-  return false;
-}
-
-// Encode an unsigned 32-bit value into a sequence of UTF-16 characters.
-//
-// If the value is in [0x0000, 0xD7FF], we encode it with a single character
-// with the same numeric value.
-//
-// If the value is larger than 0xD7FF, we encode its lowest 13 bits into a
-// character in the range [0xE000, 0xFFFF] by combining these 13 bits with
-// 0xE000 using logic-or. Then we shift the value to the right by 13 bits, and
-// encode the remaining value by repeating this same process until we get to
-// a value in [0x0000, 0xD7FF] where we will encode it using a character with
-// the same numeric value.
-//
-// Note that we only use code points in [0x0000, 0xD7FF] and [0xE000, 0xFFFF].
-// There will be no surrogate pairs in the encoded character sequence.
-void WriteUInt32ToUtf16CharSequence(uint32_t number,
-                                    std::vector<uint16_t>* output) {
-  // For values in [0x0000, 0xD7FF], only use one char to encode it.
-  if (number < 0xD800) {
-    output->push_back(static_cast<uint16_t>(number));
-    return;
-  }
-  // Encode into multiple chars. All except the last char will be in the range
-  // [0xE000, 0xFFFF], and the last char will be in the range [0x0000, 0xD7FF].
-  // Note that we don't use any value in range [0xD800, 0xDFFF] because they
-  // have to come in pairs and the encoding is just more space-efficient w/o
-  // them.
-  while (number >= 0xD800) {
-    // [0xE000, 0xFFFF] can represent 13 bits of info.
-    output->push_back(static_cast<uint16_t>(0xE000 | (number & 0x1FFF)));
-    number >>= 13;
-  }
-  output->push_back(static_cast<uint16_t>(number));
-}
-
-int GetExperimentalJavaFieldTypeForSingular(const FieldDescriptor* field) {
-  // j/c/g/protobuf/FieldType.java lists field types in a slightly different
-  // order from FieldDescriptor::Type so we can't do a simple cast.
-  //
-  // TODO(xiaofeng): Make j/c/g/protobuf/FieldType.java follow the same order.
-  int result = field->type();
-  if (result == FieldDescriptor::TYPE_GROUP) {
-    return 17;
-  } else if (result < FieldDescriptor::TYPE_GROUP) {
-    return result - 1;
-  } else {
-    return result - 2;
-  }
-}
-
-int GetExperimentalJavaFieldTypeForRepeated(const FieldDescriptor* field) {
-  if (field->type() == FieldDescriptor::TYPE_GROUP) {
-    return 49;
-  } else {
-    return GetExperimentalJavaFieldTypeForSingular(field) + 18;
-  }
-}
-
-int GetExperimentalJavaFieldTypeForPacked(const FieldDescriptor* field) {
-  int result = field->type();
-  if (result < FieldDescriptor::TYPE_STRING) {
-    return result + 34;
-  } else if (result > FieldDescriptor::TYPE_BYTES) {
-    return result + 30;
-  } else {
-    GOOGLE_LOG(FATAL) << field->full_name() << " can't be packed.";
-    return 0;
-  }
-}
-
-int GetExperimentalJavaFieldType(const FieldDescriptor* field) {
-  static const int kMapFieldType = 50;
-  static const int kOneofFieldTypeOffset = 51;
-  static const int kRequiredBit = 0x100;
-  static const int kUtf8CheckBit = 0x200;
-  static const int kCheckInitialized = 0x400;
-  static const int kMapWithProto2EnumValue = 0x800;
-  static const int kHasHasBit = 0x1000;
-  int extra_bits = field->is_required() ? kRequiredBit : 0;
-  if (field->type() == FieldDescriptor::TYPE_STRING && CheckUtf8(field)) {
-    extra_bits |= kUtf8CheckBit;
-  }
-  if (field->is_required() || (GetJavaType(field) == JAVATYPE_MESSAGE &&
-                               HasRequiredFields(field->message_type()))) {
-    extra_bits |= kCheckInitialized;
-  }
-  if (HasHasbit(field)) {
-    extra_bits |= kHasHasBit;
-  }
-
-  if (field->is_map()) {
-    if (!SupportUnknownEnumValue(field)) {
-      const FieldDescriptor* value = field->message_type()->map_value();
-      if (GetJavaType(value) == JAVATYPE_ENUM) {
-        extra_bits |= kMapWithProto2EnumValue;
-      }
-    }
-    return kMapFieldType | extra_bits;
-  } else if (field->is_packed()) {
-    return GetExperimentalJavaFieldTypeForPacked(field);
-  } else if (field->is_repeated()) {
-    return GetExperimentalJavaFieldTypeForRepeated(field) | extra_bits;
-  } else if (IsRealOneof(field)) {
-    return (GetExperimentalJavaFieldTypeForSingular(field) +
-            kOneofFieldTypeOffset) |
-           extra_bits;
-  } else {
-    return GetExperimentalJavaFieldTypeForSingular(field) | extra_bits;
-  }
-}
-
-// Escape a UTF-16 character to be embedded in a Java string.
-void EscapeUtf16ToString(uint16_t code, std::string* output) {
-  if (code == '\t') {
-    output->append("\\t");
-  } else if (code == '\b') {
-    output->append("\\b");
-  } else if (code == '\n') {
-    output->append("\\n");
-  } else if (code == '\r') {
-    output->append("\\r");
-  } else if (code == '\f') {
-    output->append("\\f");
-  } else if (code == '\'') {
-    output->append("\\'");
-  } else if (code == '\"') {
-    output->append("\\\"");
-  } else if (code == '\\') {
-    output->append("\\\\");
-  } else if (code >= 0x20 && code <= 0x7f) {
-    output->push_back(static_cast<char>(code));
-  } else {
-    output->append(StringPrintf("\\u%04x", code));
-  }
-}
-
-}  // namespace java
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
diff --git a/libs/protobuf/src/google/protobuf/compiler/java/helpers.h b/libs/protobuf/src/google/protobuf/compiler/java/helpers.h
deleted file mode 100644
index 9f1a557..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/java/helpers.h
+++ /dev/null
@@ -1,474 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-
-#ifndef GOOGLE_PROTOBUF_COMPILER_JAVA_HELPERS_H__
-#define GOOGLE_PROTOBUF_COMPILER_JAVA_HELPERS_H__
-
-#include <cstdint>
-#include <string>
-
-#include <google/protobuf/io/printer.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/compiler/java/context.h>
-#include <google/protobuf/descriptor.pb.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace java {
-
-// Commonly-used separator comments.  Thick is a line of '=', thin is a line
-// of '-'.
-extern const char kThickSeparator[];
-extern const char kThinSeparator[];
-
-bool IsForbiddenKotlin(const std::string& field_name);
-
-// If annotation_file is non-empty, prints a javax.annotation.Generated
-// annotation to the given Printer. annotation_file will be referenced in the
-// annotation's comments field. delimiter should be the Printer's delimiter
-// character. annotation_file will be included verbatim into a Java literal
-// string, so it should not contain quotes or invalid Java escape sequences;
-// however, these are unlikely to appear in practice, as the value of
-// annotation_file should be generated from the filename of the source file
-// being annotated (which in turn must be a Java identifier plus ".java").
-void PrintGeneratedAnnotation(io::Printer* printer, char delimiter = '$',
-                              const std::string& annotation_file = "");
-
-// If a GeneratedMessageLite contains non-lite enums, then its verifier
-// must be instantiated inline, rather than retrieved from the enum class.
-void PrintEnumVerifierLogic(io::Printer* printer,
-                            const FieldDescriptor* descriptor,
-                            const std::map<std::string, std::string>& variables,
-                            const char* var_name,
-                            const char* terminating_string, bool enforce_lite);
-
-// Converts a name to camel-case. If cap_first_letter is true, capitalize the
-// first letter.
-std::string ToCamelCase(const std::string& input, bool lower_first);
-
-char ToUpperCh(char ch);
-char ToLowerCh(char ch);
-
-// Converts a name to camel-case. If cap_first_letter is true, capitalize the
-// first letter.
-std::string UnderscoresToCamelCase(const std::string& name,
-                                   bool cap_first_letter);
-// Converts the field's name to camel-case, e.g. "foo_bar_baz" becomes
-// "fooBarBaz" or "FooBarBaz", respectively.
-std::string UnderscoresToCamelCase(const FieldDescriptor* field);
-std::string UnderscoresToCapitalizedCamelCase(const FieldDescriptor* field);
-
-// Similar, but for method names.  (Typically, this merely has the effect
-// of lower-casing the first letter of the name.)
-std::string UnderscoresToCamelCase(const MethodDescriptor* method);
-
-// Same as UnderscoresToCamelCase, but checks for reserved keywords
-std::string UnderscoresToCamelCaseCheckReserved(const FieldDescriptor* field);
-
-// Similar to UnderscoresToCamelCase, but guarantees that the result is a
-// complete Java identifier by adding a _ if needed.
-std::string CamelCaseFieldName(const FieldDescriptor* field);
-
-// Get an identifier that uniquely identifies this type within the file.
-// This is used to declare static variables related to this type at the
-// outermost file scope.
-std::string UniqueFileScopeIdentifier(const Descriptor* descriptor);
-
-// Gets the unqualified class name for the file.  For each .proto file, there
-// will be one Java class containing all the immutable messages and another
-// Java class containing all the mutable messages.
-// TODO(xiaofeng): remove the default value after updating client code.
-std::string FileClassName(const FileDescriptor* file, bool immutable = true);
-
-// Returns the file's Java package name.
-std::string FileJavaPackage(const FileDescriptor* file, bool immutable);
-
-// Returns output directory for the given package name.
-std::string JavaPackageToDir(std::string package_name);
-
-// Comma-separate list of option-specified interfaces implemented by the
-// Message, to follow the "implements" declaration of the Message definition.
-std::string ExtraMessageInterfaces(const Descriptor* descriptor);
-// Comma-separate list of option-specified interfaces implemented by the
-// MutableMessage, to follow the "implements" declaration of the MutableMessage
-// definition.
-std::string ExtraMutableMessageInterfaces(const Descriptor* descriptor);
-// Comma-separate list of option-specified interfaces implemented by the
-// Builder, to follow the "implements" declaration of the Builder definition.
-std::string ExtraBuilderInterfaces(const Descriptor* descriptor);
-// Comma-separate list of option-specified interfaces extended by the
-// MessageOrBuilder, to follow the "extends" declaration of the
-// MessageOrBuilder definition.
-std::string ExtraMessageOrBuilderInterfaces(const Descriptor* descriptor);
-
-// Get the unqualified Java class name for mutable messages. i.e. without
-// package or outer classnames.
-inline std::string ShortMutableJavaClassName(const Descriptor* descriptor) {
-  return descriptor->name();
-}
-
-// Whether the given descriptor is for one of the core descriptor protos. We
-// cannot currently use the new runtime with core protos since there is a
-// bootstrapping problem with obtaining their descriptors.
-inline bool IsDescriptorProto(const Descriptor* descriptor) {
-  return descriptor->file()->name() == "net/proto2/proto/descriptor.proto" ||
-         descriptor->file()->name() == "google/protobuf/descriptor.proto";
-}
-
-// Returns the stored type string used by the experimental runtime for oneof
-// fields.
-std::string GetOneofStoredType(const FieldDescriptor* field);
-
-// We use either the proto1 enums if the enum is generated, otherwise fall back
-// to use integers.
-enum class Proto1EnumRepresentation {
-  kEnum,
-  kInteger,
-};
-
-// Returns which representation we should use.
-inline Proto1EnumRepresentation GetProto1EnumRepresentation(
-    const EnumDescriptor* descriptor) {
-  if (descriptor->containing_type() != nullptr) {
-    return Proto1EnumRepresentation::kEnum;
-  }
-  return Proto1EnumRepresentation::kInteger;
-}
-
-// Whether we should generate multiple java files for messages.
-inline bool MultipleJavaFiles(const FileDescriptor* descriptor,
-                              bool immutable) {
-  (void)immutable;
-  return descriptor->options().java_multiple_files();
-}
-
-
-// Returns true if `descriptor` will be written to its own .java file.
-// `immutable` should be set to true if we're generating for the immutable API.
-template <typename Descriptor>
-bool IsOwnFile(const Descriptor* descriptor, bool immutable) {
-  return descriptor->containing_type() == NULL &&
-         MultipleJavaFiles(descriptor->file(), immutable);
-}
-
-template <>
-inline bool IsOwnFile(const ServiceDescriptor* descriptor, bool immutable) {
-  return MultipleJavaFiles(descriptor->file(), immutable);
-}
-
-// If `descriptor` describes an object with its own .java file,
-// returns the name (relative to that .java file) of the file that stores
-// annotation data for that descriptor. `suffix` is usually empty, but may
-// (e.g.) be "OrBuilder" for some generated interfaces.
-template <typename Descriptor>
-std::string AnnotationFileName(const Descriptor* descriptor,
-                               const std::string& suffix) {
-  return descriptor->name() + suffix + ".java.pb.meta";
-}
-
-template <typename Descriptor>
-void MaybePrintGeneratedAnnotation(Context* context, io::Printer* printer,
-                                   Descriptor* descriptor, bool immutable,
-                                   const std::string& suffix = "") {
-  if (IsOwnFile(descriptor, immutable)) {
-    PrintGeneratedAnnotation(printer, '$',
-                             context->options().annotate_code
-                                 ? AnnotationFileName(descriptor, suffix)
-                                 : "");
-  }
-}
-
-// Get the unqualified name that should be used for a field's field
-// number constant.
-std::string FieldConstantName(const FieldDescriptor* field);
-
-// Returns the type of the FieldDescriptor.
-// This does nothing interesting for the open source release, but is used for
-// hacks that improve compatibility with version 1 protocol buffers at Google.
-FieldDescriptor::Type GetType(const FieldDescriptor* field);
-
-enum JavaType {
-  JAVATYPE_INT,
-  JAVATYPE_LONG,
-  JAVATYPE_FLOAT,
-  JAVATYPE_DOUBLE,
-  JAVATYPE_BOOLEAN,
-  JAVATYPE_STRING,
-  JAVATYPE_BYTES,
-  JAVATYPE_ENUM,
-  JAVATYPE_MESSAGE
-};
-
-JavaType GetJavaType(const FieldDescriptor* field);
-
-const char* PrimitiveTypeName(JavaType type);
-
-// Get the fully-qualified class name for a boxed primitive type, e.g.
-// "java.lang.Integer" for JAVATYPE_INT.  Returns NULL for enum and message
-// types.
-const char* BoxedPrimitiveTypeName(JavaType type);
-
-// Kotlin source does not distinguish between primitives and non-primitives,
-// but does use Kotlin-specific qualified types for them.
-const char* KotlinTypeName(JavaType type);
-
-// Get the name of the java enum constant representing this type. E.g.,
-// "INT32" for FieldDescriptor::TYPE_INT32. The enum constant's full
-// name is "com.google.protobuf.WireFormat.FieldType.INT32".
-const char* FieldTypeName(const FieldDescriptor::Type field_type);
-
-class ClassNameResolver;
-std::string DefaultValue(const FieldDescriptor* field, bool immutable,
-                         ClassNameResolver* name_resolver);
-inline std::string ImmutableDefaultValue(const FieldDescriptor* field,
-                                         ClassNameResolver* name_resolver) {
-  return DefaultValue(field, true, name_resolver);
-}
-bool IsDefaultValueJavaDefault(const FieldDescriptor* field);
-bool IsByteStringWithCustomDefaultValue(const FieldDescriptor* field);
-
-// Does this message class have descriptor and reflection methods?
-inline bool HasDescriptorMethods(const Descriptor* /* descriptor */,
-                                 bool enforce_lite) {
-  return !enforce_lite;
-}
-inline bool HasDescriptorMethods(const EnumDescriptor* /* descriptor */,
-                                 bool enforce_lite) {
-  return !enforce_lite;
-}
-inline bool HasDescriptorMethods(const FileDescriptor* /* descriptor */,
-                                 bool enforce_lite) {
-  return !enforce_lite;
-}
-
-// Should we generate generic services for this file?
-inline bool HasGenericServices(const FileDescriptor* file, bool enforce_lite) {
-  return file->service_count() > 0 &&
-         HasDescriptorMethods(file, enforce_lite) &&
-         file->options().java_generic_services();
-}
-
-// Methods for shared bitfields.
-
-// Gets the name of the shared bitfield for the given index.
-std::string GetBitFieldName(int index);
-
-// Gets the name of the shared bitfield for the given bit index.
-// Effectively, GetBitFieldName(bitIndex / 32)
-std::string GetBitFieldNameForBit(int bitIndex);
-
-// Generates the java code for the expression that returns the boolean value
-// of the bit of the shared bitfields for the given bit index.
-// Example: "((bitField1_ & 0x04) == 0x04)"
-std::string GenerateGetBit(int bitIndex);
-
-// Generates the java code for the expression that sets the bit of the shared
-// bitfields for the given bit index.
-// Example: "bitField1_ = (bitField1_ | 0x04)"
-std::string GenerateSetBit(int bitIndex);
-
-// Generates the java code for the expression that clears the bit of the shared
-// bitfields for the given bit index.
-// Example: "bitField1_ = (bitField1_ & ~0x04)"
-std::string GenerateClearBit(int bitIndex);
-
-// Does the same as GenerateGetBit but operates on the bit field on a local
-// variable. This is used by the builder to copy the value in the builder to
-// the message.
-// Example: "((from_bitField1_ & 0x04) == 0x04)"
-std::string GenerateGetBitFromLocal(int bitIndex);
-
-// Does the same as GenerateSetBit but operates on the bit field on a local
-// variable. This is used by the builder to copy the value in the builder to
-// the message.
-// Example: "to_bitField1_ = (to_bitField1_ | 0x04)"
-std::string GenerateSetBitToLocal(int bitIndex);
-
-// Does the same as GenerateGetBit but operates on the bit field on a local
-// variable. This is used by the parsing constructor to record if a repeated
-// field is mutable.
-// Example: "((mutable_bitField1_ & 0x04) == 0x04)"
-std::string GenerateGetBitMutableLocal(int bitIndex);
-
-// Does the same as GenerateSetBit but operates on the bit field on a local
-// variable. This is used by the parsing constructor to record if a repeated
-// field is mutable.
-// Example: "mutable_bitField1_ = (mutable_bitField1_ | 0x04)"
-std::string GenerateSetBitMutableLocal(int bitIndex);
-
-// Returns whether the JavaType is a reference type.
-bool IsReferenceType(JavaType type);
-
-// Returns the capitalized name for calling relative functions in
-// CodedInputStream
-const char* GetCapitalizedType(const FieldDescriptor* field, bool immutable);
-
-// For encodings with fixed sizes, returns that size in bytes.  Otherwise
-// returns -1.
-int FixedSize(FieldDescriptor::Type type);
-
-// Comparators used to sort fields in MessageGenerator
-struct FieldOrderingByNumber {
-  inline bool operator()(const FieldDescriptor* a,
-                         const FieldDescriptor* b) const {
-    return a->number() < b->number();
-  }
-};
-
-struct ExtensionRangeOrdering {
-  bool operator()(const Descriptor::ExtensionRange* a,
-                  const Descriptor::ExtensionRange* b) const {
-    return a->start < b->start;
-  }
-};
-
-// Sort the fields of the given Descriptor by number into a new[]'d array
-// and return it. The caller should delete the returned array.
-const FieldDescriptor** SortFieldsByNumber(const Descriptor* descriptor);
-
-// Does this message class have any packed fields?
-inline bool HasPackedFields(const Descriptor* descriptor) {
-  for (int i = 0; i < descriptor->field_count(); i++) {
-    if (descriptor->field(i)->is_packed()) {
-      return true;
-    }
-  }
-  return false;
-}
-
-// Check a message type and its sub-message types recursively to see if any of
-// them has a required field. Return true if a required field is found.
-bool HasRequiredFields(const Descriptor* descriptor);
-
-inline bool IsProto2(const FileDescriptor* descriptor) {
-  return descriptor->syntax() == FileDescriptor::SYNTAX_PROTO2;
-}
-
-inline bool IsRealOneof(const FieldDescriptor* descriptor) {
-  return descriptor->containing_oneof() &&
-         !descriptor->containing_oneof()->is_synthetic();
-}
-
-inline bool HasHazzer(const FieldDescriptor* descriptor) {
-  return !descriptor->is_repeated() &&
-         (descriptor->message_type() || descriptor->has_optional_keyword() ||
-          IsProto2(descriptor->file()) || IsRealOneof(descriptor));
-}
-
-inline bool HasHasbit(const FieldDescriptor* descriptor) {
-  // Note that currently message fields inside oneofs have hasbits. This is
-  // surprising, as the oneof case should avoid any need for a hasbit. But if
-  // you change this method to remove hasbits for oneofs, a few tests fail.
-  // TODO(b/124347790): remove hasbits for oneofs
-  return !descriptor->is_repeated() &&
-         (descriptor->has_optional_keyword() || IsProto2(descriptor->file()));
-}
-
-// Whether generate classes expose public PARSER instances.
-inline bool ExposePublicParser(const FileDescriptor* descriptor) {
-  // TODO(liujisi): Mark the PARSER private in 3.1.x releases.
-  return descriptor->syntax() == FileDescriptor::SYNTAX_PROTO2;
-}
-
-// Whether unknown enum values are kept (i.e., not stored in UnknownFieldSet
-// but in the message and can be queried using additional getters that return
-// ints.
-inline bool SupportUnknownEnumValue(const FileDescriptor* descriptor) {
-  return descriptor->syntax() == FileDescriptor::SYNTAX_PROTO3;
-}
-
-inline bool SupportUnknownEnumValue(const FieldDescriptor* field) {
-  return field->file()->syntax() == FileDescriptor::SYNTAX_PROTO3;
-}
-
-// Check whether a message has repeated fields.
-bool HasRepeatedFields(const Descriptor* descriptor);
-
-inline bool IsMapEntry(const Descriptor* descriptor) {
-  return descriptor->options().map_entry();
-}
-
-inline bool IsMapField(const FieldDescriptor* descriptor) {
-  return descriptor->is_map();
-}
-
-inline bool IsAnyMessage(const Descriptor* descriptor) {
-  return descriptor->full_name() == "google.protobuf.Any";
-}
-
-inline bool IsWrappersProtoFile(const FileDescriptor* descriptor) {
-  return descriptor->name() == "google/protobuf/wrappers.proto";
-}
-
-inline bool CheckUtf8(const FieldDescriptor* descriptor) {
-  return descriptor->file()->syntax() == FileDescriptor::SYNTAX_PROTO3 ||
-         descriptor->file()->options().java_string_check_utf8();
-}
-
-inline std::string GeneratedCodeVersionSuffix() {
-  return "V3";
-}
-
-void WriteUInt32ToUtf16CharSequence(uint32_t number,
-                                    std::vector<uint16_t>* output);
-
-inline void WriteIntToUtf16CharSequence(int value,
-                                        std::vector<uint16_t>* output) {
-  WriteUInt32ToUtf16CharSequence(static_cast<uint32_t>(value), output);
-}
-
-// Escape a UTF-16 character so it can be embedded in a Java string literal.
-void EscapeUtf16ToString(uint16_t code, std::string* output);
-
-// Only the lowest two bytes of the return value are used. The lowest byte
-// is the integer value of a j/c/g/protobuf/FieldType enum. For the other
-// byte:
-//    bit 0: whether the field is required.
-//    bit 1: whether the field requires UTF-8 validation.
-//    bit 2: whether the field needs isInitialized check.
-//    bit 3: whether the field is a map field with proto2 enum value.
-//    bits 4-7: unused
-int GetExperimentalJavaFieldType(const FieldDescriptor* field);
-
-// To get the total number of entries need to be built for experimental runtime
-// and the first field number that are not in the table part
-std::pair<int, int> GetTableDrivenNumberOfEntriesAndLookUpStartFieldNumber(
-    const FieldDescriptor** fields, int count);
-}  // namespace java
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // GOOGLE_PROTOBUF_COMPILER_JAVA_HELPERS_H__
diff --git a/libs/protobuf/src/google/protobuf/compiler/java/java_generator.h b/libs/protobuf/src/google/protobuf/compiler/java/java_generator.h
deleted file mode 100644
index 294b1bd..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/java/java_generator.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef GOOGLE_PROTOBUF_COMPILER_JAVA_JAVA_GENERATOR_H_
-#define GOOGLE_PROTOBUF_COMPILER_JAVA_JAVA_GENERATOR_H_
-
-#include <google/protobuf/compiler/java/generator.h>
-
-#endif  // GOOGLE_PROTOBUF_COMPILER_JAVA_JAVA_GENERATOR_H_
diff --git a/libs/protobuf/src/google/protobuf/compiler/java/kotlin_generator.cc b/libs/protobuf/src/google/protobuf/compiler/java/kotlin_generator.cc
deleted file mode 100644
index 1af548a..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/java/kotlin_generator.cc
+++ /dev/null
@@ -1,158 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <google/protobuf/compiler/java/kotlin_generator.h>
-
-#include <google/protobuf/compiler/code_generator.h>
-#include <google/protobuf/compiler/java/file.h>
-#include <google/protobuf/compiler/java/generator.h>
-#include <google/protobuf/compiler/java/helpers.h>
-#include <google/protobuf/compiler/java/options.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace java {
-
-KotlinGenerator::KotlinGenerator() {}
-KotlinGenerator::~KotlinGenerator() {}
-
-uint64_t KotlinGenerator::GetSupportedFeatures() const {
-  return CodeGenerator::Feature::FEATURE_PROTO3_OPTIONAL;
-}
-
-bool KotlinGenerator::Generate(const FileDescriptor* file,
-                               const std::string& parameter,
-                               GeneratorContext* context,
-                               std::string* error) const {
-  // -----------------------------------------------------------------
-  // parse generator options
-
-  std::vector<std::pair<std::string, std::string> > options;
-  ParseGeneratorParameter(parameter, &options);
-  Options file_options;
-
-  for (auto& option : options) {
-    if (option.first == "output_list_file") {
-      file_options.output_list_file = option.second;
-    } else if (option.first == "immutable") {
-      // Note: the option is considered always set regardless of the input.
-      file_options.generate_immutable_code = true;
-    } else if (option.first == "mutable") {
-      *error = "Mutable not supported by Kotlin generator";
-      return false;
-    } else if (option.first == "shared") {
-      // Note: the option is considered always set regardless of the input.
-      file_options.generate_shared_code = true;
-    } else if (option.first == "lite") {
-      file_options.enforce_lite = true;
-    } else if (option.first == "annotate_code") {
-      file_options.annotate_code = true;
-    } else if (option.first == "annotation_list_file") {
-      file_options.annotation_list_file = option.second;
-    } else {
-      *error = "Unknown generator option: " + option.first;
-      return false;
-    }
-  }
-
-  // We only support generation of immutable code so we do it.
-  file_options.generate_immutable_code = true;
-  file_options.generate_shared_code = true;
-
-  std::vector<std::string> all_files;
-  std::vector<std::string> all_annotations;
-
-  std::unique_ptr<FileGenerator> file_generator(
-        new FileGenerator(file, file_options, /* immutable_api = */ true));
-
-  if (!file_generator || !file_generator->Validate(error)) {
-    return false;
-  }
-
-  auto open_file = [context](const std::string& filename) {
-    return std::unique_ptr<io::ZeroCopyOutputStream>(context->Open(filename));
-  };
-  std::string package_dir = JavaPackageToDir(file_generator->java_package());
-  std::string kotlin_filename = package_dir;
-  kotlin_filename += file_generator->GetKotlinClassname();
-  kotlin_filename += ".kt";
-  all_files.push_back(kotlin_filename);
-  std::string info_full_path = kotlin_filename + ".pb.meta";
-  if (file_options.annotate_code) {
-    all_annotations.push_back(info_full_path);
-  }
-
-  // Generate main kotlin file.
-  auto output = open_file(kotlin_filename);
-  GeneratedCodeInfo annotations;
-  io::AnnotationProtoCollector<GeneratedCodeInfo> annotation_collector(
-      &annotations);
-  io::Printer printer(
-      output.get(), '$',
-      file_options.annotate_code ? &annotation_collector : nullptr);
-
-  file_generator->GenerateKotlinSiblings(package_dir, context, &all_files,
-                                         &all_annotations);
-
-  if (file_options.annotate_code) {
-    auto info_output = open_file(info_full_path);
-    annotations.SerializeToZeroCopyStream(info_output.get());
-  }
-
-  // Generate output list if requested.
-  if (!file_options.output_list_file.empty()) {
-    // Generate output list.  This is just a simple text file placed in a
-    // deterministic location which lists the .kt files being generated.
-    auto srclist_raw_output = open_file(file_options.output_list_file);
-    io::Printer srclist_printer(srclist_raw_output.get(), '$');
-    for (auto& all_file : all_files) {
-      srclist_printer.Print("$filename$\n", "filename", all_file);
-    }
-  }
-
-  if (!file_options.annotation_list_file.empty()) {
-    // Generate output list.  This is just a simple text file placed in a
-    // deterministic location which lists the .kt files being generated.
-    auto annotation_list_raw_output =
-        open_file(file_options.annotation_list_file);
-    io::Printer annotation_list_printer(annotation_list_raw_output.get(), '$');
-    for (auto& all_annotation : all_annotations) {
-      annotation_list_printer.Print("$filename$\n", "filename", all_annotation);
-    }
-  }
-
-  return true;
-}
-
-}  // namespace java
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/compiler/java/kotlin_generator.h b/libs/protobuf/src/google/protobuf/compiler/java/kotlin_generator.h
deleted file mode 100644
index ccd9688..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/java/kotlin_generator.h
+++ /dev/null
@@ -1,74 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Generates Kotlin code for a given .proto file.
-
-#ifndef GOOGLE_PROTOBUF_COMPILER_JAVA_KOTLIN_GENERATOR_H__
-#define GOOGLE_PROTOBUF_COMPILER_JAVA_KOTLIN_GENERATOR_H__
-
-#include <string>
-
-#include <google/protobuf/compiler/code_generator.h>
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace java {
-
-// CodeGenerator implementation which generates Kotlin code.  If you create your
-// own protocol compiler binary and you want it to support Kotlin output, you
-// can do so by registering an instance of this CodeGenerator with the
-// CommandLineInterface in your main() function.
-class PROTOC_EXPORT KotlinGenerator : public CodeGenerator {
- public:
-  KotlinGenerator();
-  ~KotlinGenerator() override;
-
-  // implements CodeGenerator ----------------------------------------
-  bool Generate(const FileDescriptor* file, const std::string& parameter,
-                GeneratorContext* context, std::string* error) const override;
-
-  uint64_t GetSupportedFeatures() const override;
-
- private:
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(KotlinGenerator);
-};
-
-}  // namespace java
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
-
-#endif  // GOOGLE_PROTOBUF_COMPILER_JAVA_KOTLIN_GENERATOR_H__
diff --git a/libs/protobuf/src/google/protobuf/compiler/java/map_field.cc b/libs/protobuf/src/google/protobuf/compiler/java/map_field.cc
deleted file mode 100644
index 777f107..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/java/map_field.cc
+++ /dev/null
@@ -1,923 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include "google/protobuf/compiler/java/map_field.h"
-
-#include "google/protobuf/io/printer.h"
-#include "google/protobuf/compiler/java/context.h"
-#include "google/protobuf/compiler/java/doc_comment.h"
-#include "google/protobuf/compiler/java/helpers.h"
-#include "google/protobuf/compiler/java/name_resolver.h"
-
-// Must be last.
-#include "google/protobuf/port_def.inc"
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace java {
-
-namespace {
-
-const FieldDescriptor* KeyField(const FieldDescriptor* descriptor) {
-  GOOGLE_CHECK_EQ(FieldDescriptor::TYPE_MESSAGE, descriptor->type());
-  const Descriptor* message = descriptor->message_type();
-  GOOGLE_CHECK(message->options().map_entry());
-  return message->map_key();
-}
-
-const FieldDescriptor* ValueField(const FieldDescriptor* descriptor) {
-  GOOGLE_CHECK_EQ(FieldDescriptor::TYPE_MESSAGE, descriptor->type());
-  const Descriptor* message = descriptor->message_type();
-  GOOGLE_CHECK(message->options().map_entry());
-  return message->map_value();
-}
-
-std::string TypeName(const FieldDescriptor* field,
-                     ClassNameResolver* name_resolver, bool boxed) {
-  if (GetJavaType(field) == JAVATYPE_MESSAGE) {
-    return name_resolver->GetImmutableClassName(field->message_type());
-  } else if (GetJavaType(field) == JAVATYPE_ENUM) {
-    return name_resolver->GetImmutableClassName(field->enum_type());
-  } else {
-    return boxed ? BoxedPrimitiveTypeName(GetJavaType(field))
-                 : PrimitiveTypeName(GetJavaType(field));
-  }
-}
-
-std::string KotlinTypeName(const FieldDescriptor* field,
-                           ClassNameResolver* name_resolver) {
-  if (GetJavaType(field) == JAVATYPE_MESSAGE) {
-    return name_resolver->GetImmutableClassName(field->message_type());
-  } else if (GetJavaType(field) == JAVATYPE_ENUM) {
-    return name_resolver->GetImmutableClassName(field->enum_type());
-  } else {
-    return KotlinTypeName(GetJavaType(field));
-  }
-}
-
-std::string WireType(const FieldDescriptor* field) {
-  return "com.google.protobuf.WireFormat.FieldType." +
-         std::string(FieldTypeName(field->type()));
-}
-
-void SetMessageVariables(
-    const FieldDescriptor* descriptor, int messageBitIndex, int builderBitIndex,
-    const FieldGeneratorInfo* info, Context* context,
-    std::map<std::string, std::string>* variables) {
-  SetCommonFieldVariables(descriptor, info, variables);
-  ClassNameResolver* name_resolver = context->GetNameResolver();
-
-  (*variables)["type"] =
-      name_resolver->GetImmutableClassName(descriptor->message_type());
-  const FieldDescriptor* key = KeyField(descriptor);
-  const FieldDescriptor* value = ValueField(descriptor);
-  const JavaType keyJavaType = GetJavaType(key);
-  const JavaType valueJavaType = GetJavaType(value);
-
-  std::string pass_through_nullness = "/* nullable */\n";
-
-  (*variables)["key_type"] = TypeName(key, name_resolver, false);
-  std::string boxed_key_type = TypeName(key, name_resolver, true);
-  (*variables)["boxed_key_type"] = boxed_key_type;
-  (*variables)["kt_key_type"] = KotlinTypeName(key, name_resolver);
-  (*variables)["kt_value_type"] = KotlinTypeName(value, name_resolver);
-  // Used for calling the serialization function.
-  (*variables)["short_key_type"] =
-      boxed_key_type.substr(boxed_key_type.rfind('.') + 1);
-  (*variables)["key_wire_type"] = WireType(key);
-  (*variables)["key_default_value"] = DefaultValue(key, true, name_resolver);
-  (*variables)["key_null_check"] =
-      IsReferenceType(keyJavaType)
-          ? "if (key == null) { throw new NullPointerException(\"map key\"); }"
-          : "";
-  (*variables)["value_null_check"] =
-      valueJavaType != JAVATYPE_ENUM && IsReferenceType(valueJavaType)
-          ? "if (value == null) { "
-            "throw new NullPointerException(\"map value\"); }"
-          : "";
-  if (valueJavaType == JAVATYPE_ENUM) {
-    // We store enums as Integers internally.
-    (*variables)["value_type"] = "int";
-    variables->insert(
-        {"value_type_pass_through_nullness", (*variables)["value_type"]});
-    (*variables)["boxed_value_type"] = "java.lang.Integer";
-    (*variables)["value_wire_type"] = WireType(value);
-    (*variables)["value_default_value"] =
-        DefaultValue(value, true, name_resolver) + ".getNumber()";
-
-    (*variables)["value_enum_type"] = TypeName(value, name_resolver, false);
-
-    variables->insert(
-        {"value_enum_type_pass_through_nullness",
-         StrCat(pass_through_nullness, (*variables)["value_enum_type"])});
-
-    if (SupportUnknownEnumValue(descriptor->file())) {
-      // Map unknown values to a special UNRECOGNIZED value if supported.
-      variables->insert(
-          {"unrecognized_value",
-           StrCat((*variables)["value_enum_type"], ".UNRECOGNIZED")});
-    } else {
-      // Map unknown values to the default value if we don't have UNRECOGNIZED.
-      (*variables)["unrecognized_value"] =
-          DefaultValue(value, true, name_resolver);
-    }
-  } else {
-    (*variables)["value_type"] = TypeName(value, name_resolver, false);
-
-    variables->insert(
-        {"value_type_pass_through_nullness",
-         StrCat(
-             (IsReferenceType(valueJavaType) ? pass_through_nullness : ""),
-             (*variables)["value_type"])});
-
-    (*variables)["boxed_value_type"] = TypeName(value, name_resolver, true);
-    (*variables)["value_wire_type"] = WireType(value);
-    (*variables)["value_default_value"] =
-        DefaultValue(value, true, name_resolver);
-  }
-  variables->insert(
-      {"type_parameters", StrCat((*variables)["boxed_key_type"], ", ",
-                                       (*variables)["boxed_value_type"])});
-  // TODO(birdo): Add @deprecated javadoc when generating javadoc is supported
-  // by the proto compiler
-  (*variables)["deprecation"] =
-      descriptor->options().deprecated() ? "@java.lang.Deprecated " : "";
-  variables->insert(
-      {"kt_deprecation",
-       descriptor->options().deprecated()
-           ? StrCat("@kotlin.Deprecated(message = \"Field ",
-                          (*variables)["name"], " is deprecated\") ")
-           : ""});
-  (*variables)["on_changed"] = "onChanged();";
-
-  variables->insert(
-      {"default_entry", StrCat((*variables)["capitalized_name"],
-                                     "DefaultEntryHolder.defaultEntry")});
-  variables->insert({"map_field_parameter", (*variables)["default_entry"]});
-  (*variables)["descriptor"] =
-      name_resolver->GetImmutableClassName(descriptor->file()) + ".internal_" +
-      UniqueFileScopeIdentifier(descriptor->message_type()) + "_descriptor, ";
-  (*variables)["ver"] = GeneratedCodeVersionSuffix();
-
-  (*variables)["get_has_field_bit_builder"] = GenerateGetBit(builderBitIndex);
-  (*variables)["get_has_field_bit_from_local"] =
-      GenerateGetBitFromLocal(builderBitIndex);
-  (*variables)["set_has_field_bit_builder"] =
-      GenerateSetBit(builderBitIndex) + ";";
-  (*variables)["clear_has_field_bit_builder"] =
-      GenerateClearBit(builderBitIndex) + ";";
-}
-
-}  // namespace
-
-ImmutableMapFieldGenerator::ImmutableMapFieldGenerator(
-    const FieldDescriptor* descriptor, int messageBitIndex, int builderBitIndex,
-    Context* context)
-    : descriptor_(descriptor),
-      message_bit_index_(messageBitIndex),
-      builder_bit_index_(builderBitIndex),
-      name_resolver_(context->GetNameResolver()),
-      context_(context) {
-  SetMessageVariables(descriptor, messageBitIndex, builderBitIndex,
-                      context->GetFieldGeneratorInfo(descriptor), context,
-                      &variables_);
-}
-
-ImmutableMapFieldGenerator::~ImmutableMapFieldGenerator() {}
-
-int ImmutableMapFieldGenerator::GetMessageBitIndex() const {
-  return message_bit_index_;
-}
-
-int ImmutableMapFieldGenerator::GetBuilderBitIndex() const {
-  return builder_bit_index_;
-}
-
-int ImmutableMapFieldGenerator::GetNumBitsForMessage() const { return 0; }
-
-int ImmutableMapFieldGenerator::GetNumBitsForBuilder() const { return 1; }
-
-void ImmutableMapFieldGenerator::GenerateInterfaceMembers(
-    io::Printer* printer) const {
-  WriteFieldDocComment(printer, descriptor_);
-  printer->Print(variables_,
-                 "$deprecation$int ${$get$capitalized_name$Count$}$();\n");
-  printer->Annotate("{", "}", descriptor_);
-  WriteFieldDocComment(printer, descriptor_);
-  printer->Print(variables_,
-                 "$deprecation$boolean ${$contains$capitalized_name$$}$(\n"
-                 "    $key_type$ key);\n");
-  printer->Annotate("{", "}", descriptor_);
-  if (GetJavaType(ValueField(descriptor_)) == JAVATYPE_ENUM) {
-    printer->Print(variables_,
-                   "/**\n"
-                   " * Use {@link #get$capitalized_name$Map()} instead.\n"
-                   " */\n"
-                   "@java.lang.Deprecated\n"
-                   "java.util.Map<$boxed_key_type$, $value_enum_type$>\n"
-                   "${$get$capitalized_name$$}$();\n");
-    printer->Annotate("{", "}", descriptor_);
-    WriteFieldDocComment(printer, descriptor_);
-    printer->Print(
-        variables_,
-        "$deprecation$java.util.Map<$boxed_key_type$, $value_enum_type$>\n"
-        "${$get$capitalized_name$Map$}$();\n");
-    printer->Annotate("{", "}", descriptor_);
-    WriteFieldDocComment(printer, descriptor_);
-    printer->Print(variables_,
-                   "$deprecation$$value_enum_type_pass_through_nullness$ "
-                   "${$get$capitalized_name$OrDefault$}$(\n"
-                   "    $key_type$ key,\n"
-                   "    $value_enum_type_pass_through_nullness$ "
-                   "        defaultValue);\n");
-    printer->Annotate("{", "}", descriptor_);
-    WriteFieldDocComment(printer, descriptor_);
-    printer->Print(
-        variables_,
-        "$deprecation$$value_enum_type$ ${$get$capitalized_name$OrThrow$}$(\n"
-        "    $key_type$ key);\n");
-    printer->Annotate("{", "}", descriptor_);
-    if (SupportUnknownEnumValue(descriptor_->file())) {
-      printer->Print(
-          variables_,
-          "/**\n"
-          " * Use {@link #get$capitalized_name$ValueMap()} instead.\n"
-          " */\n"
-          "@java.lang.Deprecated\n"
-          "java.util.Map<$type_parameters$>\n"
-          "${$get$capitalized_name$Value$}$();\n");
-      printer->Annotate("{", "}", descriptor_);
-      WriteFieldDocComment(printer, descriptor_);
-      printer->Print(variables_,
-                     "$deprecation$java.util.Map<$type_parameters$>\n"
-                     "${$get$capitalized_name$ValueMap$}$();\n");
-      printer->Annotate("{", "}", descriptor_);
-      WriteFieldDocComment(printer, descriptor_);
-      printer->Print(variables_,
-                     "$deprecation$$value_type_pass_through_nullness$ "
-                     "${$get$capitalized_name$ValueOrDefault$}$(\n"
-                     "    $key_type$ key,\n"
-                     "    $value_type_pass_through_nullness$ defaultValue);\n");
-      printer->Annotate("{", "}", descriptor_);
-      WriteFieldDocComment(printer, descriptor_);
-      printer->Print(
-          variables_,
-          "$deprecation$$value_type$ ${$get$capitalized_name$ValueOrThrow$}$(\n"
-          "    $key_type$ key);\n");
-      printer->Annotate("{", "}", descriptor_);
-    }
-  } else {
-    printer->Print(variables_,
-                   "/**\n"
-                   " * Use {@link #get$capitalized_name$Map()} instead.\n"
-                   " */\n"
-                   "@java.lang.Deprecated\n"
-                   "java.util.Map<$type_parameters$>\n"
-                   "${$get$capitalized_name$$}$();\n");
-    printer->Annotate("{", "}", descriptor_);
-    WriteFieldDocComment(printer, descriptor_);
-    printer->Print(variables_,
-                   "$deprecation$java.util.Map<$type_parameters$>\n"
-                   "${$get$capitalized_name$Map$}$();\n");
-    printer->Annotate("{", "}", descriptor_);
-    WriteFieldDocComment(printer, descriptor_);
-    printer->Print(variables_,
-                   "$deprecation$$value_type_pass_through_nullness$ "
-                   "${$get$capitalized_name$OrDefault$}$(\n"
-                   "    $key_type$ key,\n"
-                   "    $value_type_pass_through_nullness$ defaultValue);\n");
-    printer->Annotate("{", "}", descriptor_);
-    WriteFieldDocComment(printer, descriptor_);
-    printer->Print(
-        variables_,
-        "$deprecation$$value_type$ ${$get$capitalized_name$OrThrow$}$(\n"
-        "    $key_type$ key);\n");
-    printer->Annotate("{", "}", descriptor_);
-  }
-}
-
-void ImmutableMapFieldGenerator::GenerateMembers(io::Printer* printer) const {
-  printer->Print(
-      variables_,
-      "private static final class $capitalized_name$DefaultEntryHolder {\n"
-      "  static final com.google.protobuf.MapEntry<\n"
-      "      $type_parameters$> defaultEntry =\n"
-      "          com.google.protobuf.MapEntry\n"
-      "          .<$type_parameters$>newDefaultInstance(\n"
-      "              $descriptor$\n"
-      "              $key_wire_type$,\n"
-      "              $key_default_value$,\n"
-      "              $value_wire_type$,\n"
-      "              $value_default_value$);\n"
-      "}\n");
-  printer->Print(variables_,
-                 "@SuppressWarnings(\"serial\")\n"
-                 "private com.google.protobuf.MapField<\n"
-                 "    $type_parameters$> $name$_;\n"
-                 "private com.google.protobuf.MapField<$type_parameters$>\n"
-                 "internalGet$capitalized_name$() {\n"
-                 "  if ($name$_ == null) {\n"
-                 "    return com.google.protobuf.MapField.emptyMapField(\n"
-                 "        $map_field_parameter$);\n"
-                 "  }\n"
-                 "  return $name$_;\n"
-                 "}\n");
-  if (GetJavaType(ValueField(descriptor_)) == JAVATYPE_ENUM) {
-    printer->Print(
-        variables_,
-        "private static final\n"
-        "com.google.protobuf.Internal.MapAdapter.Converter<\n"
-        "    java.lang.Integer, $value_enum_type$> $name$ValueConverter =\n"
-        "        com.google.protobuf.Internal.MapAdapter.newEnumConverter(\n"
-        "            $value_enum_type$.internalGetValueMap(),\n"
-        "            $unrecognized_value$);\n");
-    printer->Print(
-        variables_,
-        "private static final java.util.Map<$boxed_key_type$, "
-        "$value_enum_type$>\n"
-        "internalGetAdapted$capitalized_name$Map(\n"
-        "    java.util.Map<$boxed_key_type$, $boxed_value_type$> map) {\n"
-        "  return new com.google.protobuf.Internal.MapAdapter<\n"
-        "      $boxed_key_type$, $value_enum_type$, java.lang.Integer>(\n"
-        "          map, $name$ValueConverter);\n"
-        "}\n");
-  }
-  GenerateMapGetters(printer);
-}
-
-void ImmutableMapFieldGenerator::GenerateBuilderMembers(
-    io::Printer* printer) const {
-  printer->Print(
-      variables_,
-      "private com.google.protobuf.MapField<\n"
-      "    $type_parameters$> $name$_;\n"
-      "$deprecation$private com.google.protobuf.MapField<$type_parameters$>\n"
-      "    internalGet$capitalized_name$() {\n"
-      "  if ($name$_ == null) {\n"
-      "    return com.google.protobuf.MapField.emptyMapField(\n"
-      "        $map_field_parameter$);\n"
-      "  }\n"
-      "  return $name$_;\n"
-      "}\n"
-      "$deprecation$private com.google.protobuf.MapField<$type_parameters$>\n"
-      "    internalGetMutable$capitalized_name$() {\n"
-      "  if ($name$_ == null) {\n"
-      "    $name$_ = com.google.protobuf.MapField.newMapField(\n"
-      "        $map_field_parameter$);\n"
-      "  }\n"
-      "  if (!$name$_.isMutable()) {\n"
-      "    $name$_ = $name$_.copy();\n"
-      "  }\n"
-      "  $set_has_field_bit_builder$\n"
-      "  $on_changed$\n"
-      "  return $name$_;\n"
-      "}\n");
-  GenerateMapGetters(printer);
-  printer->Print(
-      variables_,
-      "$deprecation$public Builder ${$clear$capitalized_name$$}$() {\n"
-      "  $clear_has_field_bit_builder$\n"
-      "  internalGetMutable$capitalized_name$().getMutableMap()\n"
-      "      .clear();\n"
-      "  return this;\n"
-      "}\n");
-  printer->Annotate("{", "}", descriptor_);
-
-  WriteFieldDocComment(printer, descriptor_);
-  printer->Print(variables_,
-                 "$deprecation$public Builder ${$remove$capitalized_name$$}$(\n"
-                 "    $key_type$ key) {\n"
-                 "  $key_null_check$\n"
-                 "  internalGetMutable$capitalized_name$().getMutableMap()\n"
-                 "      .remove(key);\n"
-                 "  return this;\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-
-  if (GetJavaType(ValueField(descriptor_)) == JAVATYPE_ENUM) {
-    printer->Print(
-        variables_,
-        "/**\n"
-        " * Use alternate mutation accessors instead.\n"
-        " */\n"
-        "@java.lang.Deprecated\n"
-        "public java.util.Map<$boxed_key_type$, $value_enum_type$>\n"
-        "    ${$getMutable$capitalized_name$$}$() {\n"
-        "  $set_has_field_bit_builder$\n"
-        "  return internalGetAdapted$capitalized_name$Map(\n"
-        "       internalGetMutable$capitalized_name$().getMutableMap());\n"
-        "}\n");
-    printer->Annotate("{", "}", descriptor_);
-    WriteFieldDocComment(printer, descriptor_);
-    printer->Print(variables_,
-                   "$deprecation$public Builder ${$put$capitalized_name$$}$(\n"
-                   "    $key_type$ key,\n"
-                   "    $value_enum_type$ value) {\n"
-                   "  $key_null_check$\n"
-                   "  $value_null_check$\n"
-                   "  internalGetMutable$capitalized_name$().getMutableMap()\n"
-                   "      .put(key, $name$ValueConverter.doBackward(value));\n"
-                   "  $set_has_field_bit_builder$\n"
-                   "  return this;\n"
-                   "}\n");
-    printer->Annotate("{", "}", descriptor_);
-
-    WriteFieldDocComment(printer, descriptor_);
-    printer->Print(
-        variables_,
-        "$deprecation$public Builder ${$putAll$capitalized_name$$}$(\n"
-        "    java.util.Map<$boxed_key_type$, $value_enum_type$> values) {\n"
-        "  internalGetAdapted$capitalized_name$Map(\n"
-        "      internalGetMutable$capitalized_name$().getMutableMap())\n"
-        "          .putAll(values);\n"
-        "  $set_has_field_bit_builder$\n"
-        "  return this;\n"
-        "}\n");
-    printer->Annotate("{", "}", descriptor_);
-
-    if (SupportUnknownEnumValue(descriptor_->file())) {
-      printer->Print(
-          variables_,
-          "/**\n"
-          " * Use alternate mutation accessors instead.\n"
-          " */\n"
-          "@java.lang.Deprecated\n"
-          "public java.util.Map<$boxed_key_type$, $boxed_value_type$>\n"
-          "${$getMutable$capitalized_name$Value$}$() {\n"
-          "  $set_has_field_bit_builder$\n"
-          "  return internalGetMutable$capitalized_name$().getMutableMap();\n"
-          "}\n");
-      printer->Annotate("{", "}", descriptor_);
-      WriteFieldDocComment(printer, descriptor_);
-      printer->Print(
-          variables_,
-          "$deprecation$public Builder ${$put$capitalized_name$Value$}$(\n"
-          "    $key_type$ key,\n"
-          "    $value_type$ value) {\n"
-          "  $key_null_check$\n"
-          "  $value_null_check$\n"
-          "  internalGetMutable$capitalized_name$().getMutableMap()\n"
-          "      .put(key, value);\n"
-          "  $set_has_field_bit_builder$\n"
-          "  return this;\n"
-          "}\n");
-      printer->Annotate("{", "}", descriptor_);
-
-      WriteFieldDocComment(printer, descriptor_);
-      printer->Print(
-          variables_,
-          "$deprecation$public Builder ${$putAll$capitalized_name$Value$}$(\n"
-          "    java.util.Map<$boxed_key_type$, $boxed_value_type$> values) {\n"
-          "  internalGetMutable$capitalized_name$().getMutableMap()\n"
-          "      .putAll(values);\n"
-          "  $set_has_field_bit_builder$\n"
-          "  return this;\n"
-          "}\n");
-      printer->Annotate("{", "}", descriptor_);
-    }
-  } else {
-    printer->Print(
-        variables_,
-        "/**\n"
-        " * Use alternate mutation accessors instead.\n"
-        " */\n"
-        "@java.lang.Deprecated\n"
-        "public java.util.Map<$type_parameters$>\n"
-        "    ${$getMutable$capitalized_name$$}$() {\n"
-        "  $set_has_field_bit_builder$\n"
-        "  return internalGetMutable$capitalized_name$().getMutableMap();\n"
-        "}\n");
-    printer->Annotate("{", "}", descriptor_);
-    WriteFieldDocComment(printer, descriptor_);
-    printer->Print(variables_,
-                   "$deprecation$public Builder ${$put$capitalized_name$$}$(\n"
-                   "    $key_type$ key,\n"
-                   "    $value_type$ value) {\n"
-                   "  $key_null_check$\n"
-                   "  $value_null_check$\n"
-                   "  internalGetMutable$capitalized_name$().getMutableMap()\n"
-                   "      .put(key, value);\n"
-                   "  $set_has_field_bit_builder$\n"
-                   "  return this;\n"
-                   "}\n");
-    printer->Annotate("{", "}", descriptor_);
-
-    WriteFieldDocComment(printer, descriptor_);
-    printer->Print(
-        variables_,
-        "$deprecation$public Builder ${$putAll$capitalized_name$$}$(\n"
-        "    java.util.Map<$type_parameters$> values) {\n"
-        "  internalGetMutable$capitalized_name$().getMutableMap()\n"
-        "      .putAll(values);\n"
-        "  $set_has_field_bit_builder$\n"
-        "  return this;\n"
-        "}\n");
-    printer->Annotate("{", "}", descriptor_);
-  }
-}
-
-void ImmutableMapFieldGenerator::GenerateMapGetters(
-    io::Printer* printer) const {
-  printer->Print(
-      variables_,
-      "$deprecation$public int ${$get$capitalized_name$Count$}$() {\n"
-      "  return internalGet$capitalized_name$().getMap().size();\n"
-      "}\n");
-  printer->Annotate("{", "}", descriptor_);
-
-  WriteFieldDocComment(printer, descriptor_);
-  printer->Print(
-      variables_,
-      "@java.lang.Override\n"
-      "$deprecation$public boolean ${$contains$capitalized_name$$}$(\n"
-      "    $key_type$ key) {\n"
-      "  $key_null_check$\n"
-      "  return internalGet$capitalized_name$().getMap().containsKey(key);\n"
-      "}\n");
-  printer->Annotate("{", "}", descriptor_);
-
-  if (GetJavaType(ValueField(descriptor_)) == JAVATYPE_ENUM) {
-    printer->Print(variables_,
-                   "/**\n"
-                   " * Use {@link #get$capitalized_name$Map()} instead.\n"
-                   " */\n"
-                   "@java.lang.Override\n"
-                   "@java.lang.Deprecated\n"
-                   "public java.util.Map<$boxed_key_type$, $value_enum_type$>\n"
-                   "${$get$capitalized_name$$}$() {\n"
-                   "  return get$capitalized_name$Map();\n"
-                   "}\n");
-    printer->Annotate("{", "}", descriptor_);
-    WriteFieldDocComment(printer, descriptor_);
-    printer->Print(variables_,
-                   "@java.lang.Override\n"
-                   "$deprecation$public java.util.Map<$boxed_key_type$, "
-                   "$value_enum_type$>\n"
-                   "${$get$capitalized_name$Map$}$() {\n"
-                   "  return internalGetAdapted$capitalized_name$Map(\n"
-                   "      internalGet$capitalized_name$().getMap());"
-                   "}\n");
-    printer->Annotate("{", "}", descriptor_);
-
-    WriteFieldDocComment(printer, descriptor_);
-    printer->Print(
-        variables_,
-        "@java.lang.Override\n"
-        "$deprecation$public $value_enum_type_pass_through_nullness$ "
-        "${$get$capitalized_name$OrDefault$}$(\n"
-        "    $key_type$ key,\n"
-        "    $value_enum_type_pass_through_nullness$ defaultValue) {\n"
-        "  $key_null_check$\n"
-        "  java.util.Map<$boxed_key_type$, $boxed_value_type$> map =\n"
-        "      internalGet$capitalized_name$().getMap();\n"
-        "  return map.containsKey(key)\n"
-        "         ? $name$ValueConverter.doForward(map.get(key))\n"
-        "         : defaultValue;\n"
-        "}\n");
-    printer->Annotate("{", "}", descriptor_);
-
-    WriteFieldDocComment(printer, descriptor_);
-    printer->Print(
-        variables_,
-        "@java.lang.Override\n"
-        "$deprecation$public $value_enum_type$ get$capitalized_name$OrThrow(\n"
-        "    $key_type$ key) {\n"
-        "  $key_null_check$\n"
-        "  java.util.Map<$boxed_key_type$, $boxed_value_type$> map =\n"
-        "      internalGet$capitalized_name$().getMap();\n"
-        "  if (!map.containsKey(key)) {\n"
-        "    throw new java.lang.IllegalArgumentException();\n"
-        "  }\n"
-        "  return $name$ValueConverter.doForward(map.get(key));\n"
-        "}\n");
-    printer->Annotate("{", "}", descriptor_);
-
-    if (SupportUnknownEnumValue(descriptor_->file())) {
-      printer->Print(
-          variables_,
-          "/**\n"
-          " * Use {@link #get$capitalized_name$ValueMap()} instead.\n"
-          " */\n"
-          "@java.lang.Override\n"
-          "@java.lang.Deprecated\n"
-          "public java.util.Map<$boxed_key_type$, $boxed_value_type$>\n"
-          "${$get$capitalized_name$Value$}$() {\n"
-          "  return get$capitalized_name$ValueMap();\n"
-          "}\n");
-      printer->Annotate("{", "}", descriptor_);
-      WriteFieldDocComment(printer, descriptor_);
-      printer->Print(variables_,
-                     "@java.lang.Override\n"
-                     "$deprecation$public java.util.Map<$boxed_key_type$, "
-                     "$boxed_value_type$>\n"
-                     "${$get$capitalized_name$ValueMap$}$() {\n"
-                     "  return internalGet$capitalized_name$().getMap();\n"
-                     "}\n");
-      printer->Annotate("{", "}", descriptor_);
-      WriteFieldDocComment(printer, descriptor_);
-      printer->Print(
-          variables_,
-          "@java.lang.Override\n"
-          "$deprecation$public $value_type_pass_through_nullness$ "
-          "${$get$capitalized_name$ValueOrDefault$}$(\n"
-          "    $key_type$ key,\n"
-          "    $value_type_pass_through_nullness$ defaultValue) {\n"
-          "  $key_null_check$\n"
-          "  java.util.Map<$boxed_key_type$, $boxed_value_type$> map =\n"
-          "      internalGet$capitalized_name$().getMap();\n"
-          "  return map.containsKey(key) ? map.get(key) : defaultValue;\n"
-          "}\n");
-      printer->Annotate("{", "}", descriptor_);
-      WriteFieldDocComment(printer, descriptor_);
-      printer->Print(
-          variables_,
-          "@java.lang.Override\n"
-          "$deprecation$public $value_type$ "
-          "${$get$capitalized_name$ValueOrThrow$}$(\n"
-          "    $key_type$ key) {\n"
-          "  $key_null_check$\n"
-          "  java.util.Map<$boxed_key_type$, $boxed_value_type$> map =\n"
-          "      internalGet$capitalized_name$().getMap();\n"
-          "  if (!map.containsKey(key)) {\n"
-          "    throw new java.lang.IllegalArgumentException();\n"
-          "  }\n"
-          "  return map.get(key);\n"
-          "}\n");
-      printer->Annotate("{", "}", descriptor_);
-    }
-  } else {
-    printer->Print(variables_,
-                   "/**\n"
-                   " * Use {@link #get$capitalized_name$Map()} instead.\n"
-                   " */\n"
-                   "@java.lang.Override\n"
-                   "@java.lang.Deprecated\n"
-                   "public java.util.Map<$type_parameters$> "
-                   "${$get$capitalized_name$$}$() {\n"
-                   "  return get$capitalized_name$Map();\n"
-                   "}\n");
-    printer->Annotate("{", "}", descriptor_);
-    WriteFieldDocComment(printer, descriptor_);
-    printer->Print(variables_,
-                   "@java.lang.Override\n"
-                   "$deprecation$public java.util.Map<$type_parameters$> "
-                   "${$get$capitalized_name$Map$}$() {\n"
-                   "  return internalGet$capitalized_name$().getMap();\n"
-                   "}\n");
-    printer->Annotate("{", "}", descriptor_);
-    WriteFieldDocComment(printer, descriptor_);
-    printer->Print(
-        variables_,
-        "@java.lang.Override\n"
-        "$deprecation$public $value_type_pass_through_nullness$ "
-        "${$get$capitalized_name$OrDefault$}$(\n"
-        "    $key_type$ key,\n"
-        "    $value_type_pass_through_nullness$ defaultValue) {\n"
-        "  $key_null_check$\n"
-        "  java.util.Map<$type_parameters$> map =\n"
-        "      internalGet$capitalized_name$().getMap();\n"
-        "  return map.containsKey(key) ? map.get(key) : defaultValue;\n"
-        "}\n");
-    printer->Annotate("{", "}", descriptor_);
-    WriteFieldDocComment(printer, descriptor_);
-    printer->Print(
-        variables_,
-        "@java.lang.Override\n"
-        "$deprecation$public $value_type$ ${$get$capitalized_name$OrThrow$}$(\n"
-        "    $key_type$ key) {\n"
-        "  $key_null_check$\n"
-        "  java.util.Map<$type_parameters$> map =\n"
-        "      internalGet$capitalized_name$().getMap();\n"
-        "  if (!map.containsKey(key)) {\n"
-        "    throw new java.lang.IllegalArgumentException();\n"
-        "  }\n"
-        "  return map.get(key);\n"
-        "}\n");
-    printer->Annotate("{", "}", descriptor_);
-  }
-}
-
-void ImmutableMapFieldGenerator::GenerateKotlinDslMembers(
-    io::Printer* printer) const {
-  printer->Print(
-      variables_,
-      "/**\n"
-      " * An uninstantiable, behaviorless type to represent the field in\n"
-      " * generics.\n"
-      " */\n"
-      "@kotlin.OptIn"
-      "(com.google.protobuf.kotlin.OnlyForUseByGeneratedProtoCode::class)\n"
-      "public class ${$$kt_capitalized_name$Proxy$}$ private constructor()"
-      " : com.google.protobuf.kotlin.DslProxy()\n");
-
-  WriteFieldDocComment(printer, descriptor_);
-  printer->Print(
-      variables_,
-      "$kt_deprecation$ public val $kt_name$: "
-      "com.google.protobuf.kotlin.DslMap"
-      "<$kt_key_type$, $kt_value_type$, ${$$kt_capitalized_name$Proxy$}$>\n"
-      "  @kotlin.jvm.JvmSynthetic\n"
-      "  @JvmName(\"get$kt_capitalized_name$Map\")\n"
-      "  get() = com.google.protobuf.kotlin.DslMap(\n"
-      "    $kt_dsl_builder$.${$get$capitalized_name$Map$}$()\n"
-      "  )\n");
-
-  WriteFieldDocComment(printer, descriptor_);
-  printer->Print(
-      variables_,
-      "@JvmName(\"put$kt_capitalized_name$\")\n"
-      "public fun com.google.protobuf.kotlin.DslMap"
-      "<$kt_key_type$, $kt_value_type$, ${$$kt_capitalized_name$Proxy$}$>\n"
-      "  .put(key: $kt_key_type$, value: $kt_value_type$) {\n"
-      "     $kt_dsl_builder$.${$put$capitalized_name$$}$(key, value)\n"
-      "   }\n");
-
-  WriteFieldDocComment(printer, descriptor_);
-  printer->Print(
-      variables_,
-      "@kotlin.jvm.JvmSynthetic\n"
-      "@JvmName(\"set$kt_capitalized_name$\")\n"
-      "@Suppress(\"NOTHING_TO_INLINE\")\n"
-      "public inline operator fun com.google.protobuf.kotlin.DslMap"
-      "<$kt_key_type$, $kt_value_type$, ${$$kt_capitalized_name$Proxy$}$>\n"
-      "  .set(key: $kt_key_type$, value: $kt_value_type$) {\n"
-      "     put(key, value)\n"
-      "   }\n");
-
-  WriteFieldDocComment(printer, descriptor_);
-  printer->Print(
-      variables_,
-      "@kotlin.jvm.JvmSynthetic\n"
-      "@JvmName(\"remove$kt_capitalized_name$\")\n"
-      "public fun com.google.protobuf.kotlin.DslMap"
-      "<$kt_key_type$, $kt_value_type$, ${$$kt_capitalized_name$Proxy$}$>\n"
-      "  .remove(key: $kt_key_type$) {\n"
-      "     $kt_dsl_builder$.${$remove$capitalized_name$$}$(key)\n"
-      "   }\n");
-
-  WriteFieldDocComment(printer, descriptor_);
-  printer->Print(
-      variables_,
-      "@kotlin.jvm.JvmSynthetic\n"
-      "@JvmName(\"putAll$kt_capitalized_name$\")\n"
-      "public fun com.google.protobuf.kotlin.DslMap"
-      "<$kt_key_type$, $kt_value_type$, ${$$kt_capitalized_name$Proxy$}$>\n"
-      "  .putAll(map: kotlin.collections.Map<$kt_key_type$, $kt_value_type$>) "
-      "{\n"
-      "     $kt_dsl_builder$.${$putAll$capitalized_name$$}$(map)\n"
-      "   }\n");
-
-  WriteFieldDocComment(printer, descriptor_);
-  printer->Print(
-      variables_,
-      "@kotlin.jvm.JvmSynthetic\n"
-      "@JvmName(\"clear$kt_capitalized_name$\")\n"
-      "public fun com.google.protobuf.kotlin.DslMap"
-      "<$kt_key_type$, $kt_value_type$, ${$$kt_capitalized_name$Proxy$}$>\n"
-      "  .clear() {\n"
-      "     $kt_dsl_builder$.${$clear$capitalized_name$$}$()\n"
-      "   }\n");
-}
-
-void ImmutableMapFieldGenerator::GenerateFieldBuilderInitializationCode(
-    io::Printer* printer) const {
-  // Nothing to initialize.
-}
-
-void ImmutableMapFieldGenerator::GenerateInitializationCode(
-    io::Printer* printer) const {
-  // Nothing to initialize.
-}
-
-void ImmutableMapFieldGenerator::GenerateBuilderClearCode(
-    io::Printer* printer) const {
-  // No need to clear the has-bit since we clear the bitField ints all at once.
-  printer->Print(variables_,
-                 "internalGetMutable$capitalized_name$().clear();\n");
-}
-
-void ImmutableMapFieldGenerator::GenerateMergingCode(
-    io::Printer* printer) const {
-  printer->Print(variables_,
-                 "internalGetMutable$capitalized_name$().mergeFrom(\n"
-                 "    other.internalGet$capitalized_name$());\n"
-                 "$set_has_field_bit_builder$\n");
-}
-
-void ImmutableMapFieldGenerator::GenerateBuildingCode(
-    io::Printer* printer) const {
-  printer->Print(variables_,
-                 "if ($get_has_field_bit_from_local$) {\n"
-                 "  result.$name$_ = internalGet$capitalized_name$();\n"
-                 "  result.$name$_.makeImmutable();\n"
-                 "}\n");
-}
-
-void ImmutableMapFieldGenerator::GenerateBuilderParsingCode(
-    io::Printer* printer) const {
-  if (!SupportUnknownEnumValue(descriptor_->file()) &&
-      GetJavaType(ValueField(descriptor_)) == JAVATYPE_ENUM) {
-    printer->Print(
-        variables_,
-        "com.google.protobuf.ByteString bytes = input.readBytes();\n"
-        "com.google.protobuf.MapEntry<$type_parameters$>\n"
-        "$name$__ = $default_entry$.getParserForType().parseFrom(bytes);\n"
-        "if ($value_enum_type$.forNumber($name$__.getValue()) == null) {\n"
-        "  mergeUnknownLengthDelimitedField($number$, bytes);\n"
-        "} else {\n"
-        "  internalGetMutable$capitalized_name$().getMutableMap().put(\n"
-        "      $name$__.getKey(), $name$__.getValue());\n"
-        "  $set_has_field_bit_builder$\n"
-        "}\n");
-  } else {
-    printer->Print(
-        variables_,
-        "com.google.protobuf.MapEntry<$type_parameters$>\n"
-        "$name$__ = input.readMessage(\n"
-        "    $default_entry$.getParserForType(), extensionRegistry);\n"
-        "internalGetMutable$capitalized_name$().getMutableMap().put(\n"
-        "    $name$__.getKey(), $name$__.getValue());\n"
-        "$set_has_field_bit_builder$\n");
-  }
-}
-void ImmutableMapFieldGenerator::GenerateSerializationCode(
-    io::Printer* printer) const {
-  printer->Print(variables_,
-                 "com.google.protobuf.GeneratedMessage$ver$\n"
-                 "  .serialize$short_key_type$MapTo(\n"
-                 "    output,\n"
-                 "    internalGet$capitalized_name$(),\n"
-                 "    $default_entry$,\n"
-                 "    $number$);\n");
-}
-
-void ImmutableMapFieldGenerator::GenerateSerializedSizeCode(
-    io::Printer* printer) const {
-  printer->Print(
-      variables_,
-      "for (java.util.Map.Entry<$type_parameters$> entry\n"
-      "     : internalGet$capitalized_name$().getMap().entrySet()) {\n"
-      "  com.google.protobuf.MapEntry<$type_parameters$>\n"
-      "  $name$__ = $default_entry$.newBuilderForType()\n"
-      "      .setKey(entry.getKey())\n"
-      "      .setValue(entry.getValue())\n"
-      "      .build();\n"
-      "  size += com.google.protobuf.CodedOutputStream\n"
-      "      .computeMessageSize($number$, $name$__);\n"
-      "}\n");
-}
-
-void ImmutableMapFieldGenerator::GenerateEqualsCode(
-    io::Printer* printer) const {
-  printer->Print(variables_,
-                 "if (!internalGet$capitalized_name$().equals(\n"
-                 "    other.internalGet$capitalized_name$())) return false;\n");
-}
-
-void ImmutableMapFieldGenerator::GenerateHashCode(io::Printer* printer) const {
-  printer->Print(
-      variables_,
-      "if (!internalGet$capitalized_name$().getMap().isEmpty()) {\n"
-      "  hash = (37 * hash) + $constant_name$;\n"
-      "  hash = (53 * hash) + internalGet$capitalized_name$().hashCode();\n"
-      "}\n");
-}
-
-std::string ImmutableMapFieldGenerator::GetBoxedType() const {
-  return name_resolver_->GetImmutableClassName(descriptor_->message_type());
-}
-
-}  // namespace java
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#include "google/protobuf/port_undef.inc"
diff --git a/libs/protobuf/src/google/protobuf/compiler/java/map_field.h b/libs/protobuf/src/google/protobuf/compiler/java/map_field.h
deleted file mode 100644
index d54a28b..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/java/map_field.h
+++ /dev/null
@@ -1,86 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef GOOGLE_PROTOBUF_COMPILER_JAVA_MAP_FIELD_H__
-#define GOOGLE_PROTOBUF_COMPILER_JAVA_MAP_FIELD_H__
-
-#include "google/protobuf/compiler/java/field.h"
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace java {
-
-class ImmutableMapFieldGenerator : public ImmutableFieldGenerator {
- public:
-  explicit ImmutableMapFieldGenerator(const FieldDescriptor* descriptor,
-                                      int messageBitIndex, int builderBitIndex,
-                                      Context* context);
-  ~ImmutableMapFieldGenerator() override;
-
-  // implements ImmutableFieldGenerator ---------------------------------------
-  int GetMessageBitIndex() const override;
-  int GetBuilderBitIndex() const override;
-  int GetNumBitsForMessage() const override;
-  int GetNumBitsForBuilder() const override;
-  void GenerateInterfaceMembers(io::Printer* printer) const override;
-  void GenerateMembers(io::Printer* printer) const override;
-  void GenerateBuilderMembers(io::Printer* printer) const override;
-  void GenerateInitializationCode(io::Printer* printer) const override;
-  void GenerateBuilderClearCode(io::Printer* printer) const override;
-  void GenerateMergingCode(io::Printer* printer) const override;
-  void GenerateBuildingCode(io::Printer* printer) const override;
-  void GenerateBuilderParsingCode(io::Printer* printer) const override;
-  void GenerateSerializationCode(io::Printer* printer) const override;
-  void GenerateSerializedSizeCode(io::Printer* printer) const override;
-  void GenerateFieldBuilderInitializationCode(
-      io::Printer* printer) const override;
-  void GenerateEqualsCode(io::Printer* printer) const override;
-  void GenerateHashCode(io::Printer* printer) const override;
-  void GenerateKotlinDslMembers(io::Printer* printer) const override;
-
-  std::string GetBoxedType() const override;
-
- private:
-  const FieldDescriptor* descriptor_;
-  int message_bit_index_;
-  int builder_bit_index_;
-  std::map<std::string, std::string> variables_;
-  ClassNameResolver* name_resolver_;
-  Context* context_;
-  void GenerateMapGetters(io::Printer* printer) const;
-};
-
-}  // namespace java
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // GOOGLE_PROTOBUF_COMPILER_JAVA_MAP_FIELD_H__
diff --git a/libs/protobuf/src/google/protobuf/compiler/java/map_field_lite.cc b/libs/protobuf/src/google/protobuf/compiler/java/map_field_lite.cc
deleted file mode 100644
index ed6f8f3..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/java/map_field_lite.cc
+++ /dev/null
@@ -1,927 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <google/protobuf/compiler/java/map_field_lite.h>
-
-#include <cstdint>
-
-#include <google/protobuf/io/printer.h>
-#include <google/protobuf/compiler/java/context.h>
-#include <google/protobuf/compiler/java/doc_comment.h>
-#include <google/protobuf/compiler/java/helpers.h>
-#include <google/protobuf/compiler/java/name_resolver.h>
-
-// Must be last.
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace java {
-
-namespace {
-
-const FieldDescriptor* KeyField(const FieldDescriptor* descriptor) {
-  GOOGLE_CHECK_EQ(FieldDescriptor::TYPE_MESSAGE, descriptor->type());
-  const Descriptor* message = descriptor->message_type();
-  GOOGLE_CHECK(message->options().map_entry());
-  return message->map_key();
-}
-
-const FieldDescriptor* ValueField(const FieldDescriptor* descriptor) {
-  GOOGLE_CHECK_EQ(FieldDescriptor::TYPE_MESSAGE, descriptor->type());
-  const Descriptor* message = descriptor->message_type();
-  GOOGLE_CHECK(message->options().map_entry());
-  return message->map_value();
-}
-
-std::string TypeName(const FieldDescriptor* field,
-                     ClassNameResolver* name_resolver, bool boxed) {
-  if (GetJavaType(field) == JAVATYPE_MESSAGE) {
-    return name_resolver->GetImmutableClassName(field->message_type());
-  } else if (GetJavaType(field) == JAVATYPE_ENUM) {
-    return name_resolver->GetImmutableClassName(field->enum_type());
-  } else {
-    return boxed ? BoxedPrimitiveTypeName(GetJavaType(field))
-                 : PrimitiveTypeName(GetJavaType(field));
-  }
-}
-
-std::string KotlinTypeName(const FieldDescriptor* field,
-                           ClassNameResolver* name_resolver) {
-  if (GetJavaType(field) == JAVATYPE_MESSAGE) {
-    return name_resolver->GetImmutableClassName(field->message_type());
-  } else if (GetJavaType(field) == JAVATYPE_ENUM) {
-    return name_resolver->GetImmutableClassName(field->enum_type());
-  } else {
-    return KotlinTypeName(GetJavaType(field));
-  }
-}
-
-std::string WireType(const FieldDescriptor* field) {
-  return "com.google.protobuf.WireFormat.FieldType." +
-         std::string(FieldTypeName(field->type()));
-}
-
-void SetMessageVariables(const FieldDescriptor* descriptor, int messageBitIndex,
-                         int builderBitIndex, const FieldGeneratorInfo* info,
-                         Context* context,
-                         std::map<std::string, std::string>* variables) {
-  SetCommonFieldVariables(descriptor, info, variables);
-
-  ClassNameResolver* name_resolver = context->GetNameResolver();
-  (*variables)["type"] =
-      name_resolver->GetImmutableClassName(descriptor->message_type());
-  const FieldDescriptor* key = KeyField(descriptor);
-  const FieldDescriptor* value = ValueField(descriptor);
-  const JavaType keyJavaType = GetJavaType(key);
-  const JavaType valueJavaType = GetJavaType(value);
-
-  std::string pass_through_nullness = "/* nullable */\n";
-
-  (*variables)["key_type"] = TypeName(key, name_resolver, false);
-  (*variables)["boxed_key_type"] = TypeName(key, name_resolver, true);
-  (*variables)["kt_key_type"] = KotlinTypeName(key, name_resolver);
-  (*variables)["kt_value_type"] = KotlinTypeName(value, name_resolver);
-  (*variables)["key_wire_type"] = WireType(key);
-  (*variables)["key_default_value"] = DefaultValue(key, true, name_resolver);
-  // We use `x.getClass()` as a null check because it generates less bytecode
-  // than an `if (x == null) { throw ... }` statement.
-  (*variables)["key_null_check"] =
-      IsReferenceType(keyJavaType)
-          ? "java.lang.Class<?> keyClass = key.getClass();"
-          : "";
-  (*variables)["value_null_check"] =
-      IsReferenceType(valueJavaType)
-          ? "java.lang.Class<?> valueClass = value.getClass();"
-          : "";
-
-  if (GetJavaType(value) == JAVATYPE_ENUM) {
-    // We store enums as Integers internally.
-    (*variables)["value_type"] = "int";
-    (*variables)["boxed_value_type"] = "java.lang.Integer";
-    (*variables)["value_wire_type"] = WireType(value);
-    (*variables)["value_default_value"] =
-        DefaultValue(value, true, name_resolver) + ".getNumber()";
-
-    (*variables)["value_enum_type"] = TypeName(value, name_resolver, false);
-
-    (*variables)["value_enum_type_pass_through_nullness"] =
-        pass_through_nullness + (*variables)["value_enum_type"];
-
-    if (SupportUnknownEnumValue(descriptor->file())) {
-      // Map unknown values to a special UNRECOGNIZED value if supported.
-      (*variables)["unrecognized_value"] =
-          (*variables)["value_enum_type"] + ".UNRECOGNIZED";
-    } else {
-      // Map unknown values to the default value if we don't have UNRECOGNIZED.
-      (*variables)["unrecognized_value"] =
-          DefaultValue(value, true, name_resolver);
-    }
-  } else {
-    (*variables)["value_type"] = TypeName(value, name_resolver, false);
-
-    (*variables)["value_type_pass_through_nullness"] =
-        (IsReferenceType(valueJavaType) ? pass_through_nullness : "") +
-        (*variables)["value_type"];
-
-    (*variables)["boxed_value_type"] = TypeName(value, name_resolver, true);
-    (*variables)["value_wire_type"] = WireType(value);
-    (*variables)["value_default_value"] =
-        DefaultValue(value, true, name_resolver);
-  }
-  (*variables)["type_parameters"] =
-      (*variables)["boxed_key_type"] + ", " + (*variables)["boxed_value_type"];
-  // TODO(birdo): Add @deprecated javadoc when generating javadoc is supported
-  // by the proto compiler
-  (*variables)["deprecation"] =
-      descriptor->options().deprecated() ? "@java.lang.Deprecated " : "";
-  (*variables)["kt_deprecation"] =
-      descriptor->options().deprecated()
-          ? "@kotlin.Deprecated(message = \"Field " + (*variables)["name"] +
-                " is deprecated\") "
-          : "";
-
-  (*variables)["default_entry"] =
-      (*variables)["capitalized_name"] + "DefaultEntryHolder.defaultEntry";
-}
-
-}  // namespace
-
-ImmutableMapFieldLiteGenerator::ImmutableMapFieldLiteGenerator(
-    const FieldDescriptor* descriptor, int messageBitIndex, Context* context)
-    : descriptor_(descriptor),
-      context_(context),
-      name_resolver_(context->GetNameResolver()) {
-  SetMessageVariables(descriptor, messageBitIndex, 0,
-                      context->GetFieldGeneratorInfo(descriptor), context,
-                      &variables_);
-}
-
-ImmutableMapFieldLiteGenerator::~ImmutableMapFieldLiteGenerator() {}
-
-int ImmutableMapFieldLiteGenerator::GetNumBitsForMessage() const { return 0; }
-
-void ImmutableMapFieldLiteGenerator::GenerateInterfaceMembers(
-    io::Printer* printer) const {
-  WriteFieldDocComment(printer, descriptor_);
-  printer->Print(variables_,
-                 "$deprecation$int ${$get$capitalized_name$Count$}$();\n");
-  printer->Annotate("{", "}", descriptor_);
-  WriteFieldDocComment(printer, descriptor_);
-  printer->Print(variables_,
-                 "$deprecation$boolean ${$contains$capitalized_name$$}$(\n"
-                 "    $key_type$ key);\n");
-  printer->Annotate("{", "}", descriptor_);
-  if (GetJavaType(ValueField(descriptor_)) == JAVATYPE_ENUM) {
-    printer->Print(variables_,
-                   "/**\n"
-                   " * Use {@link #get$capitalized_name$Map()} instead.\n"
-                   " */\n"
-                   "@java.lang.Deprecated\n"
-                   "java.util.Map<$boxed_key_type$, $value_enum_type$>\n"
-                   "${$get$capitalized_name$$}$();\n");
-    printer->Annotate("{", "}", descriptor_);
-    WriteFieldDocComment(printer, descriptor_);
-    printer->Print(
-        variables_,
-        "$deprecation$java.util.Map<$boxed_key_type$, $value_enum_type$>\n"
-        "${$get$capitalized_name$Map$}$();\n");
-    printer->Annotate("{", "}", descriptor_);
-    WriteFieldDocComment(printer, descriptor_);
-    printer->Print(variables_,
-                   "$deprecation$$value_enum_type_pass_through_nullness$ "
-                   "${$get$capitalized_name$OrDefault$}$(\n"
-                   "    $key_type$ key,\n"
-                   "    $value_enum_type_pass_through_nullness$ "
-                   "        defaultValue);\n");
-    printer->Annotate("{", "}", descriptor_);
-    WriteFieldDocComment(printer, descriptor_);
-    printer->Print(
-        variables_,
-        "$deprecation$$value_enum_type$ ${$get$capitalized_name$OrThrow$}$(\n"
-        "    $key_type$ key);\n");
-    printer->Annotate("{", "}", descriptor_);
-    if (SupportUnknownEnumValue(descriptor_->file())) {
-      printer->Print(
-          variables_,
-          "/**\n"
-          " * Use {@link #get$capitalized_name$ValueMap()} instead.\n"
-          " */\n"
-          "@java.lang.Deprecated\n"
-          "java.util.Map<$type_parameters$>\n"
-          "${$get$capitalized_name$Value$}$();\n");
-      printer->Annotate("{", "}", descriptor_);
-      WriteFieldDocComment(printer, descriptor_);
-      printer->Print(variables_,
-                     "$deprecation$java.util.Map<$type_parameters$>\n"
-                     "${$get$capitalized_name$ValueMap$}$();\n");
-      printer->Annotate("{", "}", descriptor_);
-      WriteFieldDocComment(printer, descriptor_);
-      printer->Print(variables_,
-                     "$deprecation$\n"
-                     "$value_type$ ${$get$capitalized_name$ValueOrDefault$}$(\n"
-                     "    $key_type$ key,\n"
-                     "    $value_type$ defaultValue);\n");
-      printer->Annotate("{", "}", descriptor_);
-      WriteFieldDocComment(printer, descriptor_);
-      printer->Print(variables_,
-                     "$deprecation$\n"
-                     "$value_type$ ${$get$capitalized_name$ValueOrThrow$}$(\n"
-                     "    $key_type$ key);\n");
-      printer->Annotate("{", "}", descriptor_);
-    }
-  } else {
-    printer->Print(variables_,
-                   "/**\n"
-                   " * Use {@link #get$capitalized_name$Map()} instead.\n"
-                   " */\n"
-                   "@java.lang.Deprecated\n"
-                   "java.util.Map<$type_parameters$>\n"
-                   "${$get$capitalized_name$$}$();\n");
-    printer->Annotate("{", "}", descriptor_);
-    WriteFieldDocComment(printer, descriptor_);
-    printer->Print(variables_,
-                   "$deprecation$java.util.Map<$type_parameters$>\n"
-                   "${$get$capitalized_name$Map$}$();\n");
-    printer->Annotate("{", "}", descriptor_);
-    WriteFieldDocComment(printer, descriptor_);
-    printer->Print(variables_,
-                   "$deprecation$\n"
-                   "$value_type_pass_through_nullness$ "
-                   "${$get$capitalized_name$OrDefault$}$(\n"
-                   "    $key_type$ key,\n"
-                   "    $value_type_pass_through_nullness$ defaultValue);\n");
-    printer->Annotate("{", "}", descriptor_);
-    WriteFieldDocComment(printer, descriptor_);
-    printer->Print(variables_,
-                   "$deprecation$\n"
-                   "$value_type$ ${$get$capitalized_name$OrThrow$}$(\n"
-                   "    $key_type$ key);\n");
-    printer->Annotate("{", "}", descriptor_);
-  }
-}
-
-void ImmutableMapFieldLiteGenerator::GenerateMembers(
-    io::Printer* printer) const {
-  printer->Print(
-      variables_,
-      "private static final class $capitalized_name$DefaultEntryHolder {\n"
-      "  static final com.google.protobuf.MapEntryLite<\n"
-      "      $type_parameters$> defaultEntry =\n"
-      "          com.google.protobuf.MapEntryLite\n"
-      "          .<$type_parameters$>newDefaultInstance(\n"
-      "              $key_wire_type$,\n"
-      "              $key_default_value$,\n"
-      "              $value_wire_type$,\n"
-      "              $value_default_value$);\n"
-      "}\n");
-  printer->Print(variables_,
-                 "private com.google.protobuf.MapFieldLite<\n"
-                 "    $type_parameters$> $name$_ =\n"
-                 "        com.google.protobuf.MapFieldLite.emptyMapField();\n"
-                 "private com.google.protobuf.MapFieldLite<$type_parameters$>\n"
-                 "internalGet$capitalized_name$() {\n"
-                 "  return $name$_;\n"
-                 "}\n"
-                 "private com.google.protobuf.MapFieldLite<$type_parameters$>\n"
-                 "internalGetMutable$capitalized_name$() {\n"
-                 "  if (!$name$_.isMutable()) {\n"
-                 "    $name$_ = $name$_.mutableCopy();\n"
-                 "  }\n"
-                 "  return $name$_;\n"
-                 "}\n");
-  printer->Print(variables_,
-                 "@java.lang.Override\n"
-                 "$deprecation$\n"
-                 "public int ${$get$capitalized_name$Count$}$() {\n"
-                 "  return internalGet$capitalized_name$().size();\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-  WriteFieldDocComment(printer, descriptor_);
-  printer->Print(variables_,
-                 "@java.lang.Override\n"
-                 "$deprecation$\n"
-                 "public boolean ${$contains$capitalized_name$$}$(\n"
-                 "    $key_type$ key) {\n"
-                 "  $key_null_check$\n"
-                 "  return internalGet$capitalized_name$().containsKey(key);\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-  if (GetJavaType(ValueField(descriptor_)) == JAVATYPE_ENUM) {
-    printer->Print(
-        variables_,
-        "private static final\n"
-        "com.google.protobuf.Internal.MapAdapter.Converter<\n"
-        "    java.lang.Integer, $value_enum_type$> $name$ValueConverter =\n"
-        "        com.google.protobuf.Internal.MapAdapter.newEnumConverter(\n"
-        "            $value_enum_type$.internalGetValueMap(),\n"
-        "            $unrecognized_value$);\n");
-    printer->Print(variables_,
-                   "/**\n"
-                   " * Use {@link #get$capitalized_name$Map()} instead.\n"
-                   " */\n"
-                   "@java.lang.Deprecated\n"
-                   "public java.util.Map<$boxed_key_type$, $value_enum_type$>\n"
-                   "${$get$capitalized_name$$}$() {\n"
-                   "  return get$capitalized_name$Map();\n"
-                   "}\n");
-    printer->Annotate("{", "}", descriptor_);
-    WriteFieldDocComment(printer, descriptor_);
-    printer->Print(
-        variables_,
-        "@java.lang.Override\n"
-        "$deprecation$\n"
-        "public java.util.Map<$boxed_key_type$, $value_enum_type$>\n"
-        "${$get$capitalized_name$Map$}$() {\n"
-        "  return java.util.Collections.unmodifiableMap(\n"
-        "      new com.google.protobuf.Internal.MapAdapter<\n"
-        "        $boxed_key_type$, $value_enum_type$, java.lang.Integer>(\n"
-        "            internalGet$capitalized_name$(),\n"
-        "            $name$ValueConverter));\n"
-        "}\n");
-    printer->Annotate("{", "}", descriptor_);
-    WriteFieldDocComment(printer, descriptor_);
-    printer->Print(
-        variables_,
-        "@java.lang.Override\n"
-        "$deprecation$\n"
-        "public $value_enum_type$ ${$get$capitalized_name$OrDefault$}$(\n"
-        "    $key_type$ key,\n"
-        "    $value_enum_type$ defaultValue) {\n"
-        "  $key_null_check$\n"
-        "  java.util.Map<$boxed_key_type$, $boxed_value_type$> map =\n"
-        "      internalGet$capitalized_name$();\n"
-        "  return map.containsKey(key)\n"
-        "         ? $name$ValueConverter.doForward(map.get(key))\n"
-        "         : defaultValue;\n"
-        "}\n");
-    printer->Annotate("{", "}", descriptor_);
-    WriteFieldDocComment(printer, descriptor_);
-    printer->Print(
-        variables_,
-        "@java.lang.Override\n"
-        "$deprecation$\n"
-        "public $value_enum_type$ ${$get$capitalized_name$OrThrow$}$(\n"
-        "    $key_type$ key) {\n"
-        "  $key_null_check$\n"
-        "  java.util.Map<$boxed_key_type$, $boxed_value_type$> map =\n"
-        "      internalGet$capitalized_name$();\n"
-        "  if (!map.containsKey(key)) {\n"
-        "    throw new java.lang.IllegalArgumentException();\n"
-        "  }\n"
-        "  return $name$ValueConverter.doForward(map.get(key));\n"
-        "}\n");
-    printer->Annotate("{", "}", descriptor_);
-    if (SupportUnknownEnumValue(descriptor_->file())) {
-      printer->Print(
-          variables_,
-          "/**\n"
-          " * Use {@link #get$capitalized_name$ValueMap()} instead.\n"
-          " */\n"
-          "@java.lang.Override\n"
-          "@java.lang.Deprecated\n"
-          "public java.util.Map<$boxed_key_type$, $boxed_value_type$>\n"
-          "${$get$capitalized_name$Value$}$() {\n"
-          "  return get$capitalized_name$ValueMap();\n"
-          "}\n");
-      printer->Annotate("{", "}", descriptor_);
-      WriteFieldDocComment(printer, descriptor_);
-      printer->Print(
-          variables_,
-          "@java.lang.Override\n"
-          "$deprecation$\n"
-          "public java.util.Map<$boxed_key_type$, $boxed_value_type$>\n"
-          "${$get$capitalized_name$ValueMap$}$() {\n"
-          "  return java.util.Collections.unmodifiableMap(\n"
-          "      internalGet$capitalized_name$());\n"
-          "}\n");
-      printer->Annotate("{", "}", descriptor_);
-      WriteFieldDocComment(printer, descriptor_);
-      printer->Print(
-          variables_,
-          "@java.lang.Override\n"
-          "$deprecation$\n"
-          "public $value_type$ ${$get$capitalized_name$ValueOrDefault$}$(\n"
-          "    $key_type$ key,\n"
-          "    $value_type$ defaultValue) {\n"
-          "  $key_null_check$\n"
-          "  java.util.Map<$boxed_key_type$, $boxed_value_type$> map =\n"
-          "      internalGet$capitalized_name$();\n"
-          "  return map.containsKey(key) ? map.get(key) : defaultValue;\n"
-          "}\n");
-      printer->Annotate("{", "}", descriptor_);
-      WriteFieldDocComment(printer, descriptor_);
-      printer->Print(
-          variables_,
-          "@java.lang.Override\n"
-          "$deprecation$\n"
-          "public $value_type$ ${$get$capitalized_name$ValueOrThrow$}$(\n"
-          "    $key_type$ key) {\n"
-          "  $key_null_check$\n"
-          "  java.util.Map<$boxed_key_type$, $boxed_value_type$> map =\n"
-          "      internalGet$capitalized_name$();\n"
-          "  if (!map.containsKey(key)) {\n"
-          "    throw new java.lang.IllegalArgumentException();\n"
-          "  }\n"
-          "  return map.get(key);\n"
-          "}\n");
-      printer->Annotate("{", "}", descriptor_);
-    }
-  } else {
-    printer->Print(variables_,
-                   "/**\n"
-                   " * Use {@link #get$capitalized_name$Map()} instead.\n"
-                   " */\n"
-                   "@java.lang.Override\n"
-                   "@java.lang.Deprecated\n"
-                   "public java.util.Map<$type_parameters$> "
-                   "${$get$capitalized_name$$}$() {\n"
-                   "  return get$capitalized_name$Map();\n"
-                   "}\n");
-    printer->Annotate("{", "}", descriptor_);
-    WriteFieldDocComment(printer, descriptor_);
-    printer->Print(variables_,
-                   "@java.lang.Override\n"
-                   "$deprecation$\n"
-                   "public java.util.Map<$type_parameters$> "
-                   "${$get$capitalized_name$Map$}$() {\n"
-                   "  return java.util.Collections.unmodifiableMap(\n"
-                   "      internalGet$capitalized_name$());\n"
-                   "}\n");
-    printer->Annotate("{", "}", descriptor_);
-    WriteFieldDocComment(printer, descriptor_);
-    printer->Print(
-        variables_,
-        "@java.lang.Override\n"
-        "$deprecation$\n"
-        "public $value_type$ ${$get$capitalized_name$OrDefault$}$(\n"
-        "    $key_type$ key,\n"
-        "    $value_type$ defaultValue) {\n"
-        "  $key_null_check$\n"
-        "  java.util.Map<$type_parameters$> map =\n"
-        "      internalGet$capitalized_name$();\n"
-        "  return map.containsKey(key) ? map.get(key) : defaultValue;\n"
-        "}\n");
-    printer->Annotate("{", "}", descriptor_);
-    WriteFieldDocComment(printer, descriptor_);
-    printer->Print(variables_,
-                   "@java.lang.Override\n"
-                   "$deprecation$\n"
-                   "public $value_type$ ${$get$capitalized_name$OrThrow$}$(\n"
-                   "    $key_type$ key) {\n"
-                   "  $key_null_check$\n"
-                   "  java.util.Map<$type_parameters$> map =\n"
-                   "      internalGet$capitalized_name$();\n"
-                   "  if (!map.containsKey(key)) {\n"
-                   "    throw new java.lang.IllegalArgumentException();\n"
-                   "  }\n"
-                   "  return map.get(key);\n"
-                   "}\n");
-    printer->Annotate("{", "}", descriptor_);
-  }
-
-  // Generate private setters for the builder to proxy into.
-  if (GetJavaType(ValueField(descriptor_)) == JAVATYPE_ENUM) {
-    WriteFieldDocComment(printer, descriptor_);
-    printer->Print(
-        variables_,
-        "private java.util.Map<$boxed_key_type$, $value_enum_type$>\n"
-        "getMutable$capitalized_name$Map() {\n"
-        "  return new com.google.protobuf.Internal.MapAdapter<\n"
-        "      $boxed_key_type$, $value_enum_type$, java.lang.Integer>(\n"
-        "          internalGetMutable$capitalized_name$(),\n"
-        "          $name$ValueConverter);\n"
-        "}\n");
-    if (SupportUnknownEnumValue(descriptor_->file())) {
-      WriteFieldDocComment(printer, descriptor_);
-      printer->Print(
-          variables_,
-          "private java.util.Map<$boxed_key_type$, $boxed_value_type$>\n"
-          "getMutable$capitalized_name$ValueMap() {\n"
-          "  return internalGetMutable$capitalized_name$();\n"
-          "}\n");
-    }
-  } else {
-    WriteFieldDocComment(printer, descriptor_);
-    printer->Print(variables_,
-                   "private java.util.Map<$type_parameters$>\n"
-                   "getMutable$capitalized_name$Map() {\n"
-                   "  return internalGetMutable$capitalized_name$();\n"
-                   "}\n");
-  }
-}
-
-void ImmutableMapFieldLiteGenerator::GenerateFieldInfo(
-    io::Printer* printer, std::vector<uint16_t>* output) const {
-  WriteIntToUtf16CharSequence(descriptor_->number(), output);
-  WriteIntToUtf16CharSequence(GetExperimentalJavaFieldType(descriptor_),
-                              output);
-  printer->Print(variables_,
-                 "\"$name$_\",\n"
-                 "$default_entry$,\n");
-  if (!SupportUnknownEnumValue(descriptor_) &&
-      GetJavaType(ValueField(descriptor_)) == JAVATYPE_ENUM) {
-    PrintEnumVerifierLogic(printer, ValueField(descriptor_), variables_,
-                           /*var_name=*/"$value_enum_type$",
-                           /*terminating_string=*/",\n",
-                           /*enforce_lite=*/context_->EnforceLite());
-  }
-}
-
-void ImmutableMapFieldLiteGenerator::GenerateBuilderMembers(
-    io::Printer* printer) const {
-  printer->Print(variables_,
-                 "@java.lang.Override\n"
-                 "$deprecation$\n"
-                 "public int ${$get$capitalized_name$Count$}$() {\n"
-                 "  return instance.get$capitalized_name$Map().size();\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-  WriteFieldDocComment(printer, descriptor_);
-  printer->Print(
-      variables_,
-      "@java.lang.Override\n"
-      "$deprecation$\n"
-      "public boolean ${$contains$capitalized_name$$}$(\n"
-      "    $key_type$ key) {\n"
-      "  $key_null_check$\n"
-      "  return instance.get$capitalized_name$Map().containsKey(key);\n"
-      "}\n");
-  printer->Annotate("{", "}", descriptor_);
-  printer->Print(variables_,
-                 "$deprecation$\n"
-                 "public Builder ${$clear$capitalized_name$$}$() {\n"
-                 "  copyOnWrite();\n"
-                 "  instance.getMutable$capitalized_name$Map().clear();\n"
-                 "  return this;\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-  WriteFieldDocComment(printer, descriptor_);
-  printer->Print(variables_,
-                 "$deprecation$\n"
-                 "public Builder ${$remove$capitalized_name$$}$(\n"
-                 "    $key_type$ key) {\n"
-                 "  $key_null_check$\n"
-                 "  copyOnWrite();\n"
-                 "  instance.getMutable$capitalized_name$Map().remove(key);\n"
-                 "  return this;\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-  if (GetJavaType(ValueField(descriptor_)) == JAVATYPE_ENUM) {
-    printer->Print(variables_,
-                   "/**\n"
-                   " * Use {@link #get$capitalized_name$Map()} instead.\n"
-                   " */\n"
-                   "@java.lang.Deprecated\n"
-                   "public java.util.Map<$boxed_key_type$, $value_enum_type$>\n"
-                   "${$get$capitalized_name$$}$() {\n"
-                   "  return get$capitalized_name$Map();\n"
-                   "}\n");
-    printer->Annotate("{", "}", descriptor_);
-    WriteFieldDocComment(printer, descriptor_);
-    printer->Print(variables_,
-                   "@java.lang.Override\n"
-                   "$deprecation$\n"
-                   "public java.util.Map<$boxed_key_type$, $value_enum_type$>\n"
-                   "${$get$capitalized_name$Map$}$() {\n"
-                   "  return java.util.Collections.unmodifiableMap(\n"
-                   "      instance.get$capitalized_name$Map());\n"
-                   "}\n");
-    printer->Annotate("{", "}", descriptor_);
-    WriteFieldDocComment(printer, descriptor_);
-    printer->Print(
-        variables_,
-        "@java.lang.Override\n"
-        "$deprecation$\n"
-        "public $value_enum_type_pass_through_nullness$ "
-        "${$get$capitalized_name$OrDefault$}$(\n"
-        "    $key_type$ key,\n"
-        "    $value_enum_type_pass_through_nullness$ defaultValue) {\n"
-        "  $key_null_check$\n"
-        "  java.util.Map<$boxed_key_type$, $value_enum_type$> map =\n"
-        "      instance.get$capitalized_name$Map();\n"
-        "  return map.containsKey(key)\n"
-        "         ? map.get(key)\n"
-        "         : defaultValue;\n"
-        "}\n");
-    printer->Annotate("{", "}", descriptor_);
-    WriteFieldDocComment(printer, descriptor_);
-    printer->Print(
-        variables_,
-        "@java.lang.Override\n"
-        "$deprecation$\n"
-        "public $value_enum_type$ ${$get$capitalized_name$OrThrow$}$(\n"
-        "    $key_type$ key) {\n"
-        "  $key_null_check$\n"
-        "  java.util.Map<$boxed_key_type$, $value_enum_type$> map =\n"
-        "      instance.get$capitalized_name$Map();\n"
-        "  if (!map.containsKey(key)) {\n"
-        "    throw new java.lang.IllegalArgumentException();\n"
-        "  }\n"
-        "  return map.get(key);\n"
-        "}\n");
-    printer->Annotate("{", "}", descriptor_);
-    WriteFieldDocComment(printer, descriptor_);
-    printer->Print(
-        variables_,
-        "$deprecation$public Builder ${$put$capitalized_name$$}$(\n"
-        "    $key_type$ key,\n"
-        "    $value_enum_type$ value) {\n"
-        "  $key_null_check$\n"
-        "  $value_null_check$\n"
-        "  copyOnWrite();\n"
-        "  instance.getMutable$capitalized_name$Map().put(key, value);\n"
-        "  return this;\n"
-        "}\n");
-    printer->Annotate("{", "}", descriptor_);
-    WriteFieldDocComment(printer, descriptor_);
-    printer->Print(
-        variables_,
-        "$deprecation$public Builder ${$putAll$capitalized_name$$}$(\n"
-        "    java.util.Map<$boxed_key_type$, $value_enum_type$> values) {\n"
-        "  copyOnWrite();\n"
-        "  instance.getMutable$capitalized_name$Map().putAll(values);\n"
-        "  return this;\n"
-        "}\n");
-    printer->Annotate("{", "}", descriptor_);
-    if (SupportUnknownEnumValue(descriptor_->file())) {
-      printer->Print(
-          variables_,
-          "/**\n"
-          " * Use {@link #get$capitalized_name$ValueMap()} instead.\n"
-          " */\n"
-          "@java.lang.Override\n"
-          "@java.lang.Deprecated\n"
-          "public java.util.Map<$boxed_key_type$, $boxed_value_type$>\n"
-          "${$get$capitalized_name$Value$}$() {\n"
-          "  return get$capitalized_name$ValueMap();\n"
-          "}\n");
-      printer->Annotate("{", "}", descriptor_);
-      WriteFieldDocComment(printer, descriptor_);
-      printer->Print(
-          variables_,
-          "@java.lang.Override\n"
-          "$deprecation$\n"
-          "public java.util.Map<$boxed_key_type$, $boxed_value_type$>\n"
-          "${$get$capitalized_name$ValueMap$}$() {\n"
-          "  return java.util.Collections.unmodifiableMap(\n"
-          "      instance.get$capitalized_name$ValueMap());\n"
-          "}\n");
-      printer->Annotate("{", "}", descriptor_);
-      WriteFieldDocComment(printer, descriptor_);
-      printer->Print(
-          variables_,
-          "@java.lang.Override\n"
-          "$deprecation$\n"
-          "public $value_type$ ${$get$capitalized_name$ValueOrDefault$}$(\n"
-          "    $key_type$ key,\n"
-          "    $value_type$ defaultValue) {\n"
-          "  $key_null_check$\n"
-          "  java.util.Map<$boxed_key_type$, $boxed_value_type$> map =\n"
-          "      instance.get$capitalized_name$ValueMap();\n"
-          "  return map.containsKey(key) ? map.get(key) : defaultValue;\n"
-          "}\n");
-      printer->Annotate("{", "}", descriptor_);
-      WriteFieldDocComment(printer, descriptor_);
-      printer->Print(
-          variables_,
-          "@java.lang.Override\n"
-          "$deprecation$\n"
-          "public $value_type$ ${$get$capitalized_name$ValueOrThrow$}$(\n"
-          "    $key_type$ key) {\n"
-          "  $key_null_check$\n"
-          "  java.util.Map<$boxed_key_type$, $boxed_value_type$> map =\n"
-          "      instance.get$capitalized_name$ValueMap();\n"
-          "  if (!map.containsKey(key)) {\n"
-          "    throw new java.lang.IllegalArgumentException();\n"
-          "  }\n"
-          "  return map.get(key);\n"
-          "}\n");
-      printer->Annotate("{", "}", descriptor_);
-      WriteFieldDocComment(printer, descriptor_);
-      printer->Print(
-          variables_,
-          "$deprecation$public Builder ${$put$capitalized_name$Value$}$(\n"
-          "    $key_type$ key,\n"
-          "    $value_type$ value) {\n"
-          "  $key_null_check$\n"
-          "  copyOnWrite();\n"
-          "  instance.getMutable$capitalized_name$ValueMap().put(key, value);\n"
-          "  return this;\n"
-          "}\n");
-      printer->Annotate("{", "}", descriptor_);
-      WriteFieldDocComment(printer, descriptor_);
-      printer->Print(
-          variables_,
-          "$deprecation$public Builder ${$putAll$capitalized_name$Value$}$(\n"
-          "    java.util.Map<$boxed_key_type$, $boxed_value_type$> values) {\n"
-          "  copyOnWrite();\n"
-          "  instance.getMutable$capitalized_name$ValueMap().putAll(values);\n"
-          "  return this;\n"
-          "}\n");
-      printer->Annotate("{", "}", descriptor_);
-    }
-  } else {
-    printer->Print(variables_,
-                   "/**\n"
-                   " * Use {@link #get$capitalized_name$Map()} instead.\n"
-                   " */\n"
-                   "@java.lang.Override\n"
-                   "@java.lang.Deprecated\n"
-                   "public java.util.Map<$type_parameters$> "
-                   "${$get$capitalized_name$$}$() {\n"
-                   "  return get$capitalized_name$Map();\n"
-                   "}\n");
-    printer->Annotate("{", "}", descriptor_);
-    WriteFieldDocComment(printer, descriptor_);
-    printer->Print(variables_,
-                   "@java.lang.Override\n"
-                   "$deprecation$"
-                   "public java.util.Map<$type_parameters$> "
-                   "${$get$capitalized_name$Map$}$() {\n"
-                   "  return java.util.Collections.unmodifiableMap(\n"
-                   "      instance.get$capitalized_name$Map());\n"
-                   "}\n");
-    printer->Annotate("{", "}", descriptor_);
-    WriteFieldDocComment(printer, descriptor_);
-    printer->Print(
-        variables_,
-        "@java.lang.Override\n"
-        "$deprecation$\n"
-        "public $value_type$ ${$get$capitalized_name$OrDefault$}$(\n"
-        "    $key_type$ key,\n"
-        "    $value_type$ defaultValue) {\n"
-        "  $key_null_check$\n"
-        "  java.util.Map<$type_parameters$> map =\n"
-        "      instance.get$capitalized_name$Map();\n"
-        "  return map.containsKey(key) ? map.get(key) : defaultValue;\n"
-        "}\n");
-    printer->Annotate("{", "}", descriptor_);
-    WriteFieldDocComment(printer, descriptor_);
-    printer->Print(variables_,
-                   "@java.lang.Override\n"
-                   "$deprecation$\n"
-                   "public $value_type$ ${$get$capitalized_name$OrThrow$}$(\n"
-                   "    $key_type$ key) {\n"
-                   "  $key_null_check$\n"
-                   "  java.util.Map<$type_parameters$> map =\n"
-                   "      instance.get$capitalized_name$Map();\n"
-                   "  if (!map.containsKey(key)) {\n"
-                   "    throw new java.lang.IllegalArgumentException();\n"
-                   "  }\n"
-                   "  return map.get(key);\n"
-                   "}\n");
-    printer->Annotate("{", "}", descriptor_);
-    WriteFieldDocComment(printer, descriptor_);
-    printer->Print(
-        variables_,
-        "$deprecation$"
-        "public Builder ${$put$capitalized_name$$}$(\n"
-        "    $key_type$ key,\n"
-        "    $value_type$ value) {\n"
-        "  $key_null_check$\n"
-        "  $value_null_check$\n"
-        "  copyOnWrite();\n"
-        "  instance.getMutable$capitalized_name$Map().put(key, value);\n"
-        "  return this;\n"
-        "}\n");
-    printer->Annotate("{", "}", descriptor_);
-    WriteFieldDocComment(printer, descriptor_);
-    printer->Print(
-        variables_,
-        "$deprecation$"
-        "public Builder ${$putAll$capitalized_name$$}$(\n"
-        "    java.util.Map<$type_parameters$> values) {\n"
-        "  copyOnWrite();\n"
-        "  instance.getMutable$capitalized_name$Map().putAll(values);\n"
-        "  return this;\n"
-        "}\n");
-    printer->Annotate("{", "}", descriptor_);
-  }
-}
-
-void ImmutableMapFieldLiteGenerator::GenerateKotlinDslMembers(
-    io::Printer* printer) const {
-  printer->Print(
-      variables_,
-      "/**\n"
-      " * An uninstantiable, behaviorless type to represent the field in\n"
-      " * generics.\n"
-      " */\n"
-      "@kotlin.OptIn"
-      "(com.google.protobuf.kotlin.OnlyForUseByGeneratedProtoCode::class)\n"
-      "public class ${$$kt_capitalized_name$Proxy$}$ private constructor()"
-      " : com.google.protobuf.kotlin.DslProxy()\n");
-
-  WriteFieldDocComment(printer, descriptor_);
-  printer->Print(
-      variables_,
-      "$kt_deprecation$ public val $kt_name$: "
-      "com.google.protobuf.kotlin.DslMap"
-      "<$kt_key_type$, $kt_value_type$, ${$$kt_capitalized_name$Proxy$}$>\n"
-      "  @kotlin.jvm.JvmSynthetic\n"
-      "  @JvmName(\"get$kt_capitalized_name$Map\")\n"
-      "  get() = com.google.protobuf.kotlin.DslMap(\n"
-      "    $kt_dsl_builder$.${$get$capitalized_name$Map$}$()\n"
-      "  )\n");
-
-  WriteFieldDocComment(printer, descriptor_);
-  printer->Print(
-      variables_,
-      "@JvmName(\"put$kt_capitalized_name$\")\n"
-      "public fun com.google.protobuf.kotlin.DslMap"
-      "<$kt_key_type$, $kt_value_type$, ${$$kt_capitalized_name$Proxy$}$>\n"
-      "  .put(key: $kt_key_type$, value: $kt_value_type$) {\n"
-      "     $kt_dsl_builder$.${$put$capitalized_name$$}$(key, value)\n"
-      "   }\n");
-
-  WriteFieldDocComment(printer, descriptor_);
-  printer->Print(
-      variables_,
-      "@kotlin.jvm.JvmSynthetic\n"
-      "@JvmName(\"set$kt_capitalized_name$\")\n"
-      "@Suppress(\"NOTHING_TO_INLINE\")\n"
-      "public inline operator fun com.google.protobuf.kotlin.DslMap"
-      "<$kt_key_type$, $kt_value_type$, ${$$kt_capitalized_name$Proxy$}$>\n"
-      "  .set(key: $kt_key_type$, value: $kt_value_type$) {\n"
-      "     put(key, value)\n"
-      "   }\n");
-
-  WriteFieldDocComment(printer, descriptor_);
-  printer->Print(
-      variables_,
-      "@kotlin.jvm.JvmSynthetic\n"
-      "@JvmName(\"remove$kt_capitalized_name$\")\n"
-      "public fun com.google.protobuf.kotlin.DslMap"
-      "<$kt_key_type$, $kt_value_type$, ${$$kt_capitalized_name$Proxy$}$>\n"
-      "  .remove(key: $kt_key_type$) {\n"
-      "     $kt_dsl_builder$.${$remove$capitalized_name$$}$(key)\n"
-      "   }\n");
-
-  WriteFieldDocComment(printer, descriptor_);
-  printer->Print(
-      variables_,
-      "@kotlin.jvm.JvmSynthetic\n"
-      "@JvmName(\"putAll$kt_capitalized_name$\")\n"
-      "public fun com.google.protobuf.kotlin.DslMap"
-      "<$kt_key_type$, $kt_value_type$, ${$$kt_capitalized_name$Proxy$}$>\n"
-      "  .putAll(map: kotlin.collections.Map<$kt_key_type$, $kt_value_type$>) "
-      "{\n"
-      "     $kt_dsl_builder$.${$putAll$capitalized_name$$}$(map)\n"
-      "   }\n");
-
-  WriteFieldDocComment(printer, descriptor_);
-  printer->Print(
-      variables_,
-      "@kotlin.jvm.JvmSynthetic\n"
-      "@JvmName(\"clear$kt_capitalized_name$\")\n"
-      "public fun com.google.protobuf.kotlin.DslMap"
-      "<$kt_key_type$, $kt_value_type$, ${$$kt_capitalized_name$Proxy$}$>\n"
-      "  .clear() {\n"
-      "     $kt_dsl_builder$.${$clear$capitalized_name$$}$()\n"
-      "   }\n");
-}
-
-void ImmutableMapFieldLiteGenerator::GenerateInitializationCode(
-    io::Printer* printer) const {
-  // Nothing to initialize.
-}
-
-std::string ImmutableMapFieldLiteGenerator::GetBoxedType() const {
-  return name_resolver_->GetImmutableClassName(descriptor_->message_type());
-}
-
-}  // namespace java
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
diff --git a/libs/protobuf/src/google/protobuf/compiler/java/map_field_lite.h b/libs/protobuf/src/google/protobuf/compiler/java/map_field_lite.h
deleted file mode 100644
index 964f098..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/java/map_field_lite.h
+++ /dev/null
@@ -1,74 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef GOOGLE_PROTOBUF_COMPILER_JAVA_MAP_FIELD_LITE_H__
-#define GOOGLE_PROTOBUF_COMPILER_JAVA_MAP_FIELD_LITE_H__
-
-#include <cstdint>
-
-#include <google/protobuf/compiler/java/field.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace java {
-
-class ImmutableMapFieldLiteGenerator : public ImmutableFieldLiteGenerator {
- public:
-  explicit ImmutableMapFieldLiteGenerator(const FieldDescriptor* descriptor,
-                                          int messageBitIndex,
-                                          Context* context);
-  ~ImmutableMapFieldLiteGenerator() override;
-
-  // implements ImmutableFieldLiteGenerator ------------------------------------
-  int GetNumBitsForMessage() const override;
-  void GenerateInterfaceMembers(io::Printer* printer) const override;
-  void GenerateMembers(io::Printer* printer) const override;
-  void GenerateBuilderMembers(io::Printer* printer) const override;
-  void GenerateInitializationCode(io::Printer* printer) const override;
-  void GenerateFieldInfo(io::Printer* printer,
-                         std::vector<uint16_t>* output) const override;
-  void GenerateKotlinDslMembers(io::Printer* printer) const override;
-
-  std::string GetBoxedType() const override;
-
- private:
-  const FieldDescriptor* descriptor_;
-  std::map<std::string, std::string> variables_;
-  Context* context_;
-  ClassNameResolver* name_resolver_;
-};
-
-}  // namespace java
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // GOOGLE_PROTOBUF_COMPILER_JAVA_MAP_FIELD_LITE_H__
diff --git a/libs/protobuf/src/google/protobuf/compiler/java/message.cc b/libs/protobuf/src/google/protobuf/compiler/java/message.cc
deleted file mode 100644
index a29d9a7..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/java/message.cc
+++ /dev/null
@@ -1,1603 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-
-#include <google/protobuf/compiler/java/message.h>
-
-#include <algorithm>
-#include <cstdint>
-#include <map>
-#include <memory>
-#include <vector>
-
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/io/printer.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/wire_format.h>
-#include <google/protobuf/stubs/strutil.h>
-#include <google/protobuf/stubs/substitute.h>
-#include <google/protobuf/compiler/java/context.h>
-#include <google/protobuf/compiler/java/doc_comment.h>
-#include <google/protobuf/compiler/java/enum.h>
-#include <google/protobuf/compiler/java/extension.h>
-#include <google/protobuf/compiler/java/generator_factory.h>
-#include <google/protobuf/compiler/java/helpers.h>
-#include <google/protobuf/compiler/java/message_builder.h>
-#include <google/protobuf/compiler/java/message_builder_lite.h>
-#include <google/protobuf/compiler/java/name_resolver.h>
-#include <google/protobuf/descriptor.pb.h>
-
-// Must be last.
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace java {
-
-using internal::WireFormat;
-using internal::WireFormatLite;
-
-namespace {
-std::string MapValueImmutableClassdName(const Descriptor* descriptor,
-                                        ClassNameResolver* name_resolver) {
-  const FieldDescriptor* value_field = descriptor->map_value();
-  GOOGLE_CHECK_EQ(FieldDescriptor::TYPE_MESSAGE, value_field->type());
-  return name_resolver->GetImmutableClassName(value_field->message_type());
-}
-}  // namespace
-
-// ===================================================================
-
-MessageGenerator::MessageGenerator(const Descriptor* descriptor)
-    : descriptor_(descriptor) {
-  for (int i = 0; i < descriptor_->field_count(); i++) {
-    if (IsRealOneof(descriptor_->field(i))) {
-      oneofs_.insert(descriptor_->field(i)->containing_oneof());
-    }
-  }
-}
-
-MessageGenerator::~MessageGenerator() {}
-
-// ===================================================================
-ImmutableMessageGenerator::ImmutableMessageGenerator(
-    const Descriptor* descriptor, Context* context)
-    : MessageGenerator(descriptor),
-      context_(context),
-      name_resolver_(context->GetNameResolver()),
-      field_generators_(descriptor, context_) {
-  GOOGLE_CHECK(HasDescriptorMethods(descriptor->file(), context->EnforceLite()))
-      << "Generator factory error: A non-lite message generator is used to "
-         "generate lite messages.";
-}
-
-ImmutableMessageGenerator::~ImmutableMessageGenerator() {}
-
-void ImmutableMessageGenerator::GenerateStaticVariables(
-    io::Printer* printer, int* bytecode_estimate) {
-  // Because descriptor.proto (com.google.protobuf.DescriptorProtos) is
-  // used in the construction of descriptors, we have a tricky bootstrapping
-  // problem.  To help control static initialization order, we make sure all
-  // descriptors and other static data that depends on them are members of
-  // the outermost class in the file.  This way, they will be initialized in
-  // a deterministic order.
-
-  std::map<std::string, std::string> vars;
-  vars["identifier"] = UniqueFileScopeIdentifier(descriptor_);
-  vars["index"] = StrCat(descriptor_->index());
-  vars["classname"] = name_resolver_->GetImmutableClassName(descriptor_);
-  if (descriptor_->containing_type() != NULL) {
-    vars["parent"] = UniqueFileScopeIdentifier(descriptor_->containing_type());
-  }
-  if (MultipleJavaFiles(descriptor_->file(), /* immutable = */ true)) {
-    // We can only make these package-private since the classes that use them
-    // are in separate files.
-    vars["private"] = "";
-  } else {
-    vars["private"] = "private ";
-  }
-  if (*bytecode_estimate <= kMaxStaticSize) {
-    vars["final"] = "final ";
-  } else {
-    vars["final"] = "";
-  }
-
-  // The descriptor for this type.
-  printer->Print(
-      vars,
-      // TODO(teboring): final needs to be added back. The way to fix it is to
-      // generate methods that can construct the types, and then still declare
-      // the types, and then init them in clinit with the new method calls.
-      "$private$static $final$com.google.protobuf.Descriptors.Descriptor\n"
-      "  internal_$identifier$_descriptor;\n");
-  *bytecode_estimate += 30;
-
-  // And the FieldAccessorTable.
-  GenerateFieldAccessorTable(printer, bytecode_estimate);
-
-  // Generate static members for all nested types.
-  for (int i = 0; i < descriptor_->nested_type_count(); i++) {
-    // TODO(kenton):  Reuse MessageGenerator objects?
-    ImmutableMessageGenerator(descriptor_->nested_type(i), context_)
-        .GenerateStaticVariables(printer, bytecode_estimate);
-  }
-}
-
-int ImmutableMessageGenerator::GenerateStaticVariableInitializers(
-    io::Printer* printer) {
-  int bytecode_estimate = 0;
-  std::map<std::string, std::string> vars;
-  vars["identifier"] = UniqueFileScopeIdentifier(descriptor_);
-  vars["index"] = StrCat(descriptor_->index());
-  vars["classname"] = name_resolver_->GetImmutableClassName(descriptor_);
-  if (descriptor_->containing_type() != NULL) {
-    vars["parent"] = UniqueFileScopeIdentifier(descriptor_->containing_type());
-  }
-
-  // The descriptor for this type.
-  if (descriptor_->containing_type() == NULL) {
-    printer->Print(vars,
-                   "internal_$identifier$_descriptor =\n"
-                   "  getDescriptor().getMessageTypes().get($index$);\n");
-    bytecode_estimate += 30;
-  } else {
-    printer->Print(
-        vars,
-        "internal_$identifier$_descriptor =\n"
-        "  internal_$parent$_descriptor.getNestedTypes().get($index$);\n");
-    bytecode_estimate += 30;
-  }
-
-  // And the FieldAccessorTable.
-  bytecode_estimate += GenerateFieldAccessorTableInitializer(printer);
-
-  // Generate static member initializers for all nested types.
-  for (int i = 0; i < descriptor_->nested_type_count(); i++) {
-    // TODO(kenton):  Reuse MessageGenerator objects?
-    bytecode_estimate +=
-        ImmutableMessageGenerator(descriptor_->nested_type(i), context_)
-            .GenerateStaticVariableInitializers(printer);
-  }
-  return bytecode_estimate;
-}
-
-void ImmutableMessageGenerator::GenerateFieldAccessorTable(
-    io::Printer* printer, int* bytecode_estimate) {
-  std::map<std::string, std::string> vars;
-  vars["identifier"] = UniqueFileScopeIdentifier(descriptor_);
-  if (MultipleJavaFiles(descriptor_->file(), /* immutable = */ true)) {
-    // We can only make these package-private since the classes that use them
-    // are in separate files.
-    vars["private"] = "";
-  } else {
-    vars["private"] = "private ";
-  }
-  if (*bytecode_estimate <= kMaxStaticSize) {
-    vars["final"] = "final ";
-  } else {
-    vars["final"] = "";
-  }
-  vars["ver"] = GeneratedCodeVersionSuffix();
-  printer->Print(
-      vars,
-      "$private$static $final$\n"
-      "  com.google.protobuf.GeneratedMessage$ver$.FieldAccessorTable\n"
-      "    internal_$identifier$_fieldAccessorTable;\n");
-
-  // The following bytecode_estimate calculation logic must stay in sync with
-  // the similar logic in the GenerateFieldAccessorTableInitializer method below
-  // to make sure that the generated static final fields are initialized  in the
-  // static initialization block directly.
-  //
-  // 6 bytes per field and oneof
-  *bytecode_estimate +=
-      10 + 6 * descriptor_->field_count() + 6 * descriptor_->oneof_decl_count();
-}
-
-int ImmutableMessageGenerator::GenerateFieldAccessorTableInitializer(
-    io::Printer* printer) {
-  int bytecode_estimate = 10;
-  printer->Print(
-      "internal_$identifier$_fieldAccessorTable = new\n"
-      "  com.google.protobuf.GeneratedMessage$ver$.FieldAccessorTable(\n"
-      "    internal_$identifier$_descriptor,\n"
-      "    new java.lang.String[] { ",
-      "identifier", UniqueFileScopeIdentifier(descriptor_), "ver",
-      GeneratedCodeVersionSuffix());
-  // All the bytecode_estimate calculation logic in this method must stay in
-  // sync with the similar logic in the GenerateFieldAccessorTable method
-  // above. See the corresponding comment in GenerateFieldAccessorTable for
-  // details.
-  for (int i = 0; i < descriptor_->field_count(); i++) {
-    const FieldDescriptor* field = descriptor_->field(i);
-    const FieldGeneratorInfo* info = context_->GetFieldGeneratorInfo(field);
-    bytecode_estimate += 6;
-    printer->Print("\"$field_name$\", ", "field_name", info->capitalized_name);
-  }
-  // We reproduce synthetic oneofs here since proto reflection needs these.
-  for (int i = 0; i < descriptor_->oneof_decl_count(); i++) {
-    const OneofDescriptor* oneof = descriptor_->oneof_decl(i);
-    const OneofGeneratorInfo* info = context_->GetOneofGeneratorInfo(oneof);
-    bytecode_estimate += 6;
-    printer->Print("\"$oneof_name$\", ", "oneof_name", info->capitalized_name);
-  }
-  printer->Print("});\n");
-  return bytecode_estimate;
-}
-
-// ===================================================================
-
-void ImmutableMessageGenerator::GenerateInterface(io::Printer* printer) {
-  MaybePrintGeneratedAnnotation(context_, printer, descriptor_,
-                                /* immutable = */ true, "OrBuilder");
-  if (descriptor_->extension_range_count() > 0) {
-    printer->Print(
-        "$deprecation$public interface ${$$classname$OrBuilder$}$ extends\n"
-        "    $extra_interfaces$\n"
-        "    com.google.protobuf.GeneratedMessage$ver$.\n"
-        "        ExtendableMessageOrBuilder<$classname$> {\n",
-        "deprecation",
-        descriptor_->options().deprecated() ? "@java.lang.Deprecated " : "",
-        "extra_interfaces", ExtraMessageOrBuilderInterfaces(descriptor_),
-        "classname", descriptor_->name(), "{", "", "}", "", "ver",
-        GeneratedCodeVersionSuffix());
-  } else {
-    printer->Print(
-        "$deprecation$public interface ${$$classname$OrBuilder$}$ extends\n"
-        "    $extra_interfaces$\n"
-        "    com.google.protobuf.MessageOrBuilder {\n",
-        "deprecation",
-        descriptor_->options().deprecated() ? "@java.lang.Deprecated " : "",
-        "extra_interfaces", ExtraMessageOrBuilderInterfaces(descriptor_),
-        "classname", descriptor_->name(), "{", "", "}", "");
-  }
-  printer->Annotate("{", "}", descriptor_);
-
-  printer->Indent();
-  for (int i = 0; i < descriptor_->field_count(); i++) {
-    printer->Print("\n");
-    field_generators_.get(descriptor_->field(i))
-        .GenerateInterfaceMembers(printer);
-  }
-  for (auto oneof : oneofs_) {
-    printer->Print(
-        "\n"
-        "public $classname$.$oneof_capitalized_name$Case "
-        "get$oneof_capitalized_name$Case();\n",
-        "oneof_capitalized_name",
-        context_->GetOneofGeneratorInfo(oneof)->capitalized_name, "classname",
-        context_->GetNameResolver()->GetImmutableClassName(descriptor_));
-  }
-  printer->Outdent();
-
-  printer->Print("}\n");
-}
-
-// ===================================================================
-
-void ImmutableMessageGenerator::Generate(io::Printer* printer) {
-  bool is_own_file = IsOwnFile(descriptor_, /* immutable = */ true);
-
-  std::map<std::string, std::string> variables;
-  variables["static"] = is_own_file ? "" : "static ";
-  variables["classname"] = descriptor_->name();
-  variables["extra_interfaces"] = ExtraMessageInterfaces(descriptor_);
-  variables["ver"] = GeneratedCodeVersionSuffix();
-  variables["deprecation"] =
-      descriptor_->options().deprecated() ? "@java.lang.Deprecated " : "";
-
-  WriteMessageDocComment(printer, descriptor_);
-  MaybePrintGeneratedAnnotation(context_, printer, descriptor_,
-                                /* immutable = */ true);
-  // The builder_type stores the super type name of the nested Builder class.
-  std::string builder_type;
-  if (descriptor_->extension_range_count() > 0) {
-    printer->Print(
-        variables,
-        "$deprecation$public $static$final class $classname$ extends\n");
-    printer->Annotate("classname", descriptor_);
-    printer->Print(
-        variables,
-        "    com.google.protobuf.GeneratedMessage$ver$.ExtendableMessage<\n"
-        "      $classname$> implements\n"
-        "    $extra_interfaces$\n"
-        "    $classname$OrBuilder {\n");
-    builder_type = strings::Substitute(
-        "com.google.protobuf.GeneratedMessage$1.ExtendableBuilder<$0, ?>",
-        name_resolver_->GetImmutableClassName(descriptor_),
-        GeneratedCodeVersionSuffix());
-  } else {
-    printer->Print(
-        variables,
-        "$deprecation$public $static$final class $classname$ extends\n");
-    printer->Annotate("classname", descriptor_);
-    printer->Print(variables,
-                   "    com.google.protobuf.GeneratedMessage$ver$ implements\n"
-                   "    $extra_interfaces$\n"
-                   "    $classname$OrBuilder {\n");
-    builder_type =
-        strings::Substitute("com.google.protobuf.GeneratedMessage$0.Builder<?>",
-                         GeneratedCodeVersionSuffix());
-  }
-  printer->Print("private static final long serialVersionUID = 0L;\n");
-
-  printer->Indent();
-  // Using builder_type, instead of Builder, prevents the Builder class from
-  // being loaded into PermGen space when the default instance is created.
-  // This optimizes the PermGen space usage for clients that do not modify
-  // messages.
-  printer->Print(
-      "// Use $classname$.newBuilder() to construct.\n"
-      "private $classname$($buildertype$ builder) {\n"
-      "  super(builder);\n"
-      "}\n",
-      "classname", descriptor_->name(), "buildertype", builder_type);
-  printer->Print("private $classname$() {\n", "classname", descriptor_->name());
-  printer->Indent();
-  GenerateInitializers(printer);
-  printer->Outdent();
-  printer->Print(
-      "}\n"
-      "\n");
-
-  printer->Print(variables,
-                 "@java.lang.Override\n"
-                 "@SuppressWarnings({\"unused\"})\n"
-                 "protected java.lang.Object newInstance(\n"
-                 "    UnusedPrivateParameter unused) {\n"
-                 "  return new $classname$();\n"
-                 "}\n"
-                 "\n");
-
-  // TODO(b/248149118): Remove this superfluous override.
-  printer->Print(
-      "@java.lang.Override\n"
-      "public final com.google.protobuf.UnknownFieldSet\n"
-      "getUnknownFields() {\n"
-      "  return this.unknownFields;\n"
-      "}\n");
-
-  GenerateDescriptorMethods(printer);
-
-  // Nested types
-  for (int i = 0; i < descriptor_->enum_type_count(); i++) {
-    EnumGenerator(descriptor_->enum_type(i), true, context_).Generate(printer);
-  }
-
-  for (int i = 0; i < descriptor_->nested_type_count(); i++) {
-    // Don't generate Java classes for map entry messages.
-    if (IsMapEntry(descriptor_->nested_type(i))) continue;
-    ImmutableMessageGenerator messageGenerator(descriptor_->nested_type(i),
-                                               context_);
-    messageGenerator.GenerateInterface(printer);
-    messageGenerator.Generate(printer);
-  }
-
-  // Integers for bit fields.
-  int totalBits = 0;
-  for (int i = 0; i < descriptor_->field_count(); i++) {
-    totalBits +=
-        field_generators_.get(descriptor_->field(i)).GetNumBitsForMessage();
-  }
-  int totalInts = (totalBits + 31) / 32;
-  for (int i = 0; i < totalInts; i++) {
-    printer->Print("private int $bit_field_name$;\n", "bit_field_name",
-                   GetBitFieldName(i));
-  }
-
-  // oneof
-  std::map<std::string, std::string> vars;
-  for (auto oneof : oneofs_) {
-    vars["oneof_name"] = context_->GetOneofGeneratorInfo(oneof)->name;
-    vars["oneof_capitalized_name"] =
-        context_->GetOneofGeneratorInfo(oneof)->capitalized_name;
-    vars["oneof_index"] = StrCat((oneof)->index());
-    // oneofCase_ and oneof_
-    printer->Print(vars,
-                   "private int $oneof_name$Case_ = 0;\n"
-                   "private java.lang.Object $oneof_name$_;\n");
-    // OneofCase enum
-    printer->Print(
-        vars,
-        "public enum $oneof_capitalized_name$Case\n"
-        // TODO(dweis): Remove EnumLite when we want to break compatibility with
-        // 3.x users
-        "    implements com.google.protobuf.Internal.EnumLite,\n"
-        "        com.google.protobuf.AbstractMessage.InternalOneOfEnum {\n");
-    printer->Indent();
-    for (int j = 0; j < (oneof)->field_count(); j++) {
-      const FieldDescriptor* field = (oneof)->field(j);
-      printer->Print(
-          "$deprecation$$field_name$($field_number$),\n", "deprecation",
-          field->options().deprecated() ? "@java.lang.Deprecated " : "",
-          "field_name", ToUpper(field->name()), "field_number",
-          StrCat(field->number()));
-    }
-    printer->Print("$cap_oneof_name$_NOT_SET(0);\n", "cap_oneof_name",
-                   ToUpper(vars["oneof_name"]));
-    printer->Print(vars,
-                   "private final int value;\n"
-                   "private $oneof_capitalized_name$Case(int value) {\n"
-                   "  this.value = value;\n"
-                   "}\n");
-    printer->Print(
-        vars,
-        "/**\n"
-        " * @param value The number of the enum to look for.\n"
-        " * @return The enum associated with the given number.\n"
-        " * @deprecated Use {@link #forNumber(int)} instead.\n"
-        " */\n"
-        "@java.lang.Deprecated\n"
-        "public static $oneof_capitalized_name$Case valueOf(int value) {\n"
-        "  return forNumber(value);\n"
-        "}\n"
-        "\n"
-        "public static $oneof_capitalized_name$Case forNumber(int value) {\n"
-        "  switch (value) {\n");
-    for (int j = 0; j < (oneof)->field_count(); j++) {
-      const FieldDescriptor* field = (oneof)->field(j);
-      printer->Print("    case $field_number$: return $field_name$;\n",
-                     "field_number", StrCat(field->number()),
-                     "field_name", ToUpper(field->name()));
-    }
-    printer->Print(
-        "    case 0: return $cap_oneof_name$_NOT_SET;\n"
-        "    default: return null;\n"
-        "  }\n"
-        "}\n"
-        "public int getNumber() {\n"
-        "  return this.value;\n"
-        "}\n",
-        "cap_oneof_name", ToUpper(vars["oneof_name"]));
-    printer->Outdent();
-    printer->Print("};\n\n");
-    // oneofCase()
-    printer->Print(vars,
-                   "public $oneof_capitalized_name$Case\n"
-                   "get$oneof_capitalized_name$Case() {\n"
-                   "  return $oneof_capitalized_name$Case.forNumber(\n"
-                   "      $oneof_name$Case_);\n"
-                   "}\n"
-                   "\n");
-  }
-
-  if (IsAnyMessage(descriptor_)) {
-    GenerateAnyMethods(printer);
-  }
-
-  // Fields
-  for (int i = 0; i < descriptor_->field_count(); i++) {
-    printer->Print("public static final int $constant_name$ = $number$;\n",
-                   "constant_name", FieldConstantName(descriptor_->field(i)),
-                   "number", StrCat(descriptor_->field(i)->number()));
-    printer->Annotate("constant_name", descriptor_->field(i));
-    field_generators_.get(descriptor_->field(i)).GenerateMembers(printer);
-    printer->Print("\n");
-  }
-
-  if (context_->HasGeneratedMethods(descriptor_)) {
-    GenerateIsInitialized(printer);
-    GenerateMessageSerializationMethods(printer);
-    GenerateEqualsAndHashCode(printer);
-  }
-
-
-  GenerateParseFromMethods(printer);
-  GenerateBuilder(printer);
-
-  printer->Print(
-      "\n"
-      "// @@protoc_insertion_point(class_scope:$full_name$)\n",
-      "full_name", descriptor_->full_name());
-
-  // Carefully initialize the default instance in such a way that it doesn't
-  // conflict with other initialization.
-  printer->Print("private static final $classname$ DEFAULT_INSTANCE;\n",
-                 "classname",
-                 name_resolver_->GetImmutableClassName(descriptor_));
-  printer->Print(
-      "static {\n"
-      "  DEFAULT_INSTANCE = new $classname$();\n"
-      "}\n"
-      "\n",
-      "classname", name_resolver_->GetImmutableClassName(descriptor_));
-
-  printer->Print(
-      "public static $classname$ getDefaultInstance() {\n"
-      "  return DEFAULT_INSTANCE;\n"
-      "}\n"
-      "\n",
-      "classname", name_resolver_->GetImmutableClassName(descriptor_));
-
-  // 'of' method for Wrappers
-  if (IsWrappersProtoFile(descriptor_->file())) {
-    printer->Print(
-        "public static $classname$ of($field_type$ value) {\n"
-        "  return newBuilder().setValue(value).build();\n"
-        "}\n"
-        "\n",
-        "classname", name_resolver_->GetImmutableClassName(descriptor_),
-        "field_type", PrimitiveTypeName(GetJavaType(descriptor_->field(0))));
-  }
-
-  GenerateParser(printer);
-
-  printer->Print(
-      "@java.lang.Override\n"
-      "public $classname$ getDefaultInstanceForType() {\n"
-      "  return DEFAULT_INSTANCE;\n"
-      "}\n"
-      "\n",
-      "classname", name_resolver_->GetImmutableClassName(descriptor_));
-
-  // Extensions must be declared after the DEFAULT_INSTANCE is initialized
-  // because the DEFAULT_INSTANCE is used by the extension to lazily retrieve
-  // the outer class's FileDescriptor.
-  for (int i = 0; i < descriptor_->extension_count(); i++) {
-    ImmutableExtensionGenerator(descriptor_->extension(i), context_)
-        .Generate(printer);
-  }
-
-  printer->Outdent();
-  printer->Print("}\n\n");
-}
-
-// ===================================================================
-
-void ImmutableMessageGenerator::GenerateMessageSerializationMethods(
-    io::Printer* printer) {
-  std::unique_ptr<const FieldDescriptor*[]> sorted_fields(
-      SortFieldsByNumber(descriptor_));
-
-  std::vector<const Descriptor::ExtensionRange*> sorted_extensions;
-  sorted_extensions.reserve(descriptor_->extension_range_count());
-  for (int i = 0; i < descriptor_->extension_range_count(); ++i) {
-    sorted_extensions.push_back(descriptor_->extension_range(i));
-  }
-  std::sort(sorted_extensions.begin(), sorted_extensions.end(),
-            ExtensionRangeOrdering());
-  printer->Print(
-      "@java.lang.Override\n"
-      "public void writeTo(com.google.protobuf.CodedOutputStream output)\n"
-      "                    throws java.io.IOException {\n");
-  printer->Indent();
-
-  if (HasPackedFields(descriptor_)) {
-    // writeTo(CodedOutputStream output) might be invoked without
-    // getSerializedSize() ever being called, but we need the memoized
-    // sizes in case this message has packed fields. Rather than emit checks
-    // for each packed field, just call getSerializedSize() up front. In most
-    // cases, getSerializedSize() will have already been called anyway by one
-    // of the wrapper writeTo() methods, making this call cheap.
-    printer->Print("getSerializedSize();\n");
-  }
-
-  if (descriptor_->extension_range_count() > 0) {
-    if (descriptor_->options().message_set_wire_format()) {
-      printer->Print(
-          "com.google.protobuf.GeneratedMessage$ver$\n"
-          "  .ExtendableMessage<$classname$>.ExtensionWriter\n"
-          "    extensionWriter = newMessageSetExtensionWriter();\n",
-          "classname", name_resolver_->GetImmutableClassName(descriptor_),
-          "ver", GeneratedCodeVersionSuffix());
-    } else {
-      printer->Print(
-          "com.google.protobuf.GeneratedMessage$ver$\n"
-          "  .ExtendableMessage<$classname$>.ExtensionWriter\n"
-          "    extensionWriter = newExtensionWriter();\n",
-          "classname", name_resolver_->GetImmutableClassName(descriptor_),
-          "ver", GeneratedCodeVersionSuffix());
-    }
-  }
-
-  // Merge the fields and the extension ranges, both sorted by field number.
-  for (int i = 0, j = 0;
-       i < descriptor_->field_count() || j < sorted_extensions.size();) {
-    if (i == descriptor_->field_count()) {
-      GenerateSerializeOneExtensionRange(printer, sorted_extensions[j++]);
-    } else if (j == sorted_extensions.size()) {
-      GenerateSerializeOneField(printer, sorted_fields[i++]);
-    } else if (sorted_fields[i]->number() < sorted_extensions[j]->start) {
-      GenerateSerializeOneField(printer, sorted_fields[i++]);
-    } else {
-      GenerateSerializeOneExtensionRange(printer, sorted_extensions[j++]);
-    }
-  }
-
-  if (descriptor_->options().message_set_wire_format()) {
-    printer->Print("getUnknownFields().writeAsMessageSetTo(output);\n");
-  } else {
-    printer->Print("getUnknownFields().writeTo(output);\n");
-  }
-
-  printer->Outdent();
-  printer->Print(
-      "}\n"
-      "\n"
-      "@java.lang.Override\n"
-      "public int getSerializedSize() {\n"
-      "  int size = memoizedSize;\n"
-      "  if (size != -1) return size;\n"
-      "\n");
-  printer->Indent();
-
-  printer->Print("size = 0;\n");
-
-  for (int i = 0; i < descriptor_->field_count(); i++) {
-    field_generators_.get(sorted_fields[i]).GenerateSerializedSizeCode(printer);
-  }
-
-  if (descriptor_->extension_range_count() > 0) {
-    if (descriptor_->options().message_set_wire_format()) {
-      printer->Print("size += extensionsSerializedSizeAsMessageSet();\n");
-    } else {
-      printer->Print("size += extensionsSerializedSize();\n");
-    }
-  }
-
-  if (descriptor_->options().message_set_wire_format()) {
-    printer->Print(
-        "size += getUnknownFields().getSerializedSizeAsMessageSet();\n");
-  } else {
-    printer->Print("size += getUnknownFields().getSerializedSize();\n");
-  }
-
-  printer->Print(
-      "memoizedSize = size;\n"
-      "return size;\n");
-
-  printer->Outdent();
-  printer->Print(
-      "}\n"
-      "\n");
-}
-
-void ImmutableMessageGenerator::GenerateParseFromMethods(io::Printer* printer) {
-  // Note:  These are separate from GenerateMessageSerializationMethods()
-  //   because they need to be generated even for messages that are optimized
-  //   for code size.
-  printer->Print(
-      "public static $classname$ parseFrom(\n"
-      "    java.nio.ByteBuffer data)\n"
-      "    throws com.google.protobuf.InvalidProtocolBufferException {\n"
-      "  return PARSER.parseFrom(data);\n"
-      "}\n"
-      "public static $classname$ parseFrom(\n"
-      "    java.nio.ByteBuffer data,\n"
-      "    com.google.protobuf.ExtensionRegistryLite extensionRegistry)\n"
-      "    throws com.google.protobuf.InvalidProtocolBufferException {\n"
-      "  return PARSER.parseFrom(data, extensionRegistry);\n"
-      "}\n"
-      "public static $classname$ parseFrom(\n"
-      "    com.google.protobuf.ByteString data)\n"
-      "    throws com.google.protobuf.InvalidProtocolBufferException {\n"
-      "  return PARSER.parseFrom(data);\n"
-      "}\n"
-      "public static $classname$ parseFrom(\n"
-      "    com.google.protobuf.ByteString data,\n"
-      "    com.google.protobuf.ExtensionRegistryLite extensionRegistry)\n"
-      "    throws com.google.protobuf.InvalidProtocolBufferException {\n"
-      "  return PARSER.parseFrom(data, extensionRegistry);\n"
-      "}\n"
-      "public static $classname$ parseFrom(byte[] data)\n"
-      "    throws com.google.protobuf.InvalidProtocolBufferException {\n"
-      "  return PARSER.parseFrom(data);\n"
-      "}\n"
-      "public static $classname$ parseFrom(\n"
-      "    byte[] data,\n"
-      "    com.google.protobuf.ExtensionRegistryLite extensionRegistry)\n"
-      "    throws com.google.protobuf.InvalidProtocolBufferException {\n"
-      "  return PARSER.parseFrom(data, extensionRegistry);\n"
-      "}\n"
-      "public static $classname$ parseFrom(java.io.InputStream input)\n"
-      "    throws java.io.IOException {\n"
-      "  return com.google.protobuf.GeneratedMessage$ver$\n"
-      "      .parseWithIOException(PARSER, input);\n"
-      "}\n"
-      "public static $classname$ parseFrom(\n"
-      "    java.io.InputStream input,\n"
-      "    com.google.protobuf.ExtensionRegistryLite extensionRegistry)\n"
-      "    throws java.io.IOException {\n"
-      "  return com.google.protobuf.GeneratedMessage$ver$\n"
-      "      .parseWithIOException(PARSER, input, extensionRegistry);\n"
-      "}\n"
-      "public static $classname$ parseDelimitedFrom(java.io.InputStream "
-      "input)\n"
-      "    throws java.io.IOException {\n"
-      "  return com.google.protobuf.GeneratedMessage$ver$\n"
-      "      .parseDelimitedWithIOException(PARSER, input);\n"
-      "}\n"
-      "public static $classname$ parseDelimitedFrom(\n"
-      "    java.io.InputStream input,\n"
-      "    com.google.protobuf.ExtensionRegistryLite extensionRegistry)\n"
-      "    throws java.io.IOException {\n"
-      "  return com.google.protobuf.GeneratedMessage$ver$\n"
-      "      .parseDelimitedWithIOException(PARSER, input, "
-      "extensionRegistry);\n"
-      "}\n"
-      "public static $classname$ parseFrom(\n"
-      "    com.google.protobuf.CodedInputStream input)\n"
-      "    throws java.io.IOException {\n"
-      "  return com.google.protobuf.GeneratedMessage$ver$\n"
-      "      .parseWithIOException(PARSER, input);\n"
-      "}\n"
-      "public static $classname$ parseFrom(\n"
-      "    com.google.protobuf.CodedInputStream input,\n"
-      "    com.google.protobuf.ExtensionRegistryLite extensionRegistry)\n"
-      "    throws java.io.IOException {\n"
-      "  return com.google.protobuf.GeneratedMessage$ver$\n"
-      "      .parseWithIOException(PARSER, input, extensionRegistry);\n"
-      "}\n"
-      "\n",
-      "classname", name_resolver_->GetImmutableClassName(descriptor_), "ver",
-      GeneratedCodeVersionSuffix());
-}
-
-void ImmutableMessageGenerator::GenerateSerializeOneField(
-    io::Printer* printer, const FieldDescriptor* field) {
-  field_generators_.get(field).GenerateSerializationCode(printer);
-}
-
-void ImmutableMessageGenerator::GenerateSerializeOneExtensionRange(
-    io::Printer* printer, const Descriptor::ExtensionRange* range) {
-  printer->Print("extensionWriter.writeUntil($end$, output);\n", "end",
-                 StrCat(range->end));
-}
-
-// ===================================================================
-
-void ImmutableMessageGenerator::GenerateBuilder(io::Printer* printer) {
-  // LITE_RUNTIME implements this at the GeneratedMessageLite level.
-  printer->Print(
-      "@java.lang.Override\n"
-      "public Builder newBuilderForType() { return newBuilder(); }\n");
-
-  printer->Print(
-      "public static Builder newBuilder() {\n"
-      "  return DEFAULT_INSTANCE.toBuilder();\n"
-      "}\n"
-      "public static Builder newBuilder($classname$ prototype) {\n"
-      "  return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);\n"
-      "}\n"
-      "@java.lang.Override\n"
-      "public Builder toBuilder() {\n"
-      "  return this == DEFAULT_INSTANCE\n"
-      "      ? new Builder() : new Builder().mergeFrom(this);\n"
-      "}\n"
-      "\n",
-      "classname", name_resolver_->GetImmutableClassName(descriptor_));
-
-  printer->Print(
-      "@java.lang.Override\n"
-      "protected Builder newBuilderForType(\n"
-      "    com.google.protobuf.GeneratedMessage$ver$.BuilderParent parent) {\n"
-      "  Builder builder = new Builder(parent);\n"
-      "  return builder;\n"
-      "}\n",
-      "ver", GeneratedCodeVersionSuffix());
-
-  MessageBuilderGenerator builderGenerator(descriptor_, context_);
-  builderGenerator.Generate(printer);
-}
-
-void ImmutableMessageGenerator::GenerateDescriptorMethods(
-    io::Printer* printer) {
-  if (!descriptor_->options().no_standard_descriptor_accessor()) {
-    printer->Print(
-        "public static final com.google.protobuf.Descriptors.Descriptor\n"
-        "    getDescriptor() {\n"
-        "  return $fileclass$.internal_$identifier$_descriptor;\n"
-        "}\n"
-        "\n",
-        "fileclass", name_resolver_->GetImmutableClassName(descriptor_->file()),
-        "identifier", UniqueFileScopeIdentifier(descriptor_));
-  }
-  std::vector<const FieldDescriptor*> map_fields;
-  for (int i = 0; i < descriptor_->field_count(); i++) {
-    const FieldDescriptor* field = descriptor_->field(i);
-    if (GetJavaType(field) == JAVATYPE_MESSAGE &&
-        IsMapEntry(field->message_type())) {
-      map_fields.push_back(field);
-    }
-  }
-  if (!map_fields.empty()) {
-    printer->Print(
-        "@SuppressWarnings({\"rawtypes\"})\n"
-        "@java.lang.Override\n"
-        "protected com.google.protobuf.MapField internalGetMapField(\n"
-        "    int number) {\n"
-        "  switch (number) {\n");
-    printer->Indent();
-    printer->Indent();
-    for (int i = 0; i < map_fields.size(); ++i) {
-      const FieldDescriptor* field = map_fields[i];
-      const FieldGeneratorInfo* info = context_->GetFieldGeneratorInfo(field);
-      printer->Print(
-          "case $number$:\n"
-          "  return internalGet$capitalized_name$();\n",
-          "number", StrCat(field->number()), "capitalized_name",
-          info->capitalized_name);
-    }
-    printer->Print(
-        "default:\n"
-        "  throw new RuntimeException(\n"
-        "      \"Invalid map field number: \" + number);\n");
-    printer->Outdent();
-    printer->Outdent();
-    printer->Print(
-        "  }\n"
-        "}\n");
-  }
-  printer->Print(
-      "@java.lang.Override\n"
-      "protected com.google.protobuf.GeneratedMessage$ver$.FieldAccessorTable\n"
-      "    internalGetFieldAccessorTable() {\n"
-      "  return $fileclass$.internal_$identifier$_fieldAccessorTable\n"
-      "      .ensureFieldAccessorsInitialized(\n"
-      "          $classname$.class, $classname$.Builder.class);\n"
-      "}\n"
-      "\n",
-      "classname", name_resolver_->GetImmutableClassName(descriptor_),
-      "fileclass", name_resolver_->GetImmutableClassName(descriptor_->file()),
-      "identifier", UniqueFileScopeIdentifier(descriptor_), "ver",
-      GeneratedCodeVersionSuffix());
-}
-
-// ===================================================================
-
-void ImmutableMessageGenerator::GenerateIsInitialized(io::Printer* printer) {
-  // Memoizes whether the protocol buffer is fully initialized (has all
-  // required fields). -1 means not yet computed. 0 means false and 1 means
-  // true.
-  printer->Print("private byte memoizedIsInitialized = -1;\n");
-  printer->Print(
-      "@java.lang.Override\n"
-      "public final boolean isInitialized() {\n");
-  printer->Indent();
-
-  // Don't directly compare to -1 to avoid an Android x86 JIT bug.
-  printer->Print(
-      "byte isInitialized = memoizedIsInitialized;\n"
-      "if (isInitialized == 1) return true;\n"
-      "if (isInitialized == 0) return false;\n"
-      "\n");
-
-  // Check that all required fields in this message are set.
-  // TODO(kenton):  We can optimize this when we switch to putting all the
-  //   "has" fields into a single bitfield.
-  for (int i = 0; i < descriptor_->field_count(); i++) {
-    const FieldDescriptor* field = descriptor_->field(i);
-    const FieldGeneratorInfo* info = context_->GetFieldGeneratorInfo(field);
-
-    if (field->is_required()) {
-      printer->Print(
-          "if (!has$name$()) {\n"
-          "  memoizedIsInitialized = 0;\n"
-          "  return false;\n"
-          "}\n",
-          "name", info->capitalized_name);
-    }
-  }
-
-  // Now check that all embedded messages are initialized.
-  for (int i = 0; i < descriptor_->field_count(); i++) {
-    const FieldDescriptor* field = descriptor_->field(i);
-    const FieldGeneratorInfo* info = context_->GetFieldGeneratorInfo(field);
-    if (GetJavaType(field) == JAVATYPE_MESSAGE &&
-        HasRequiredFields(field->message_type())) {
-      switch (field->label()) {
-        case FieldDescriptor::LABEL_REQUIRED:
-          printer->Print(
-              "if (!get$name$().isInitialized()) {\n"
-              "  memoizedIsInitialized = 0;\n"
-              "  return false;\n"
-              "}\n",
-              "type",
-              name_resolver_->GetImmutableClassName(field->message_type()),
-              "name", info->capitalized_name);
-          break;
-        case FieldDescriptor::LABEL_OPTIONAL:
-          printer->Print(
-              "if (has$name$()) {\n"
-              "  if (!get$name$().isInitialized()) {\n"
-              "    memoizedIsInitialized = 0;\n"
-              "    return false;\n"
-              "  }\n"
-              "}\n",
-              "name", info->capitalized_name);
-          break;
-        case FieldDescriptor::LABEL_REPEATED:
-          if (IsMapEntry(field->message_type())) {
-            printer->Print(
-                "for ($type$ item : get$name$Map().values()) {\n"
-                "  if (!item.isInitialized()) {\n"
-                "    memoizedIsInitialized = 0;\n"
-                "    return false;\n"
-                "  }\n"
-                "}\n",
-                "type",
-                MapValueImmutableClassdName(field->message_type(),
-                                            name_resolver_),
-                "name", info->capitalized_name);
-          } else {
-            printer->Print(
-                "for (int i = 0; i < get$name$Count(); i++) {\n"
-                "  if (!get$name$(i).isInitialized()) {\n"
-                "    memoizedIsInitialized = 0;\n"
-                "    return false;\n"
-                "  }\n"
-                "}\n",
-                "type",
-                name_resolver_->GetImmutableClassName(field->message_type()),
-                "name", info->capitalized_name);
-          }
-          break;
-      }
-    }
-  }
-
-  if (descriptor_->extension_range_count() > 0) {
-    printer->Print(
-        "if (!extensionsAreInitialized()) {\n"
-        "  memoizedIsInitialized = 0;\n"
-        "  return false;\n"
-        "}\n");
-  }
-
-  printer->Outdent();
-
-  printer->Print("  memoizedIsInitialized = 1;\n");
-
-  printer->Print(
-      "  return true;\n"
-      "}\n"
-      "\n");
-}
-
-// ===================================================================
-
-namespace {
-bool CheckHasBitsForEqualsAndHashCode(const FieldDescriptor* field) {
-  if (field->is_repeated()) {
-    return false;
-  }
-  if (HasHasbit(field)) {
-    return true;
-  }
-  return GetJavaType(field) == JAVATYPE_MESSAGE && !IsRealOneof(field);
-}
-}  // namespace
-
-void ImmutableMessageGenerator::GenerateEqualsAndHashCode(
-    io::Printer* printer) {
-  printer->Print(
-      "@java.lang.Override\n"
-      "public boolean equals(");
-  printer->Print("final java.lang.Object obj) {\n");
-  printer->Indent();
-  printer->Print(
-      "if (obj == this) {\n"
-      " return true;\n"
-      "}\n"
-      "if (!(obj instanceof $classname$)) {\n"
-      "  return super.equals(obj);\n"
-      "}\n"
-      "$classname$ other = ($classname$) obj;\n"
-      "\n",
-      "classname", name_resolver_->GetImmutableClassName(descriptor_));
-
-  for (int i = 0; i < descriptor_->field_count(); i++) {
-    const FieldDescriptor* field = descriptor_->field(i);
-    if (!IsRealOneof(field)) {
-      const FieldGeneratorInfo* info = context_->GetFieldGeneratorInfo(field);
-      bool check_has_bits = CheckHasBitsForEqualsAndHashCode(field);
-      if (check_has_bits) {
-        printer->Print(
-            "if (has$name$() != other.has$name$()) return false;\n"
-            "if (has$name$()) {\n",
-            "name", info->capitalized_name);
-        printer->Indent();
-      }
-      field_generators_.get(field).GenerateEqualsCode(printer);
-      if (check_has_bits) {
-        printer->Outdent();
-        printer->Print("}\n");
-      }
-    }
-  }
-
-  // Compare oneofs.
-  for (auto oneof : oneofs_) {
-    printer->Print(
-        "if (!get$oneof_capitalized_name$Case().equals("
-        "other.get$oneof_capitalized_name$Case())) return false;\n",
-        "oneof_capitalized_name",
-        context_->GetOneofGeneratorInfo(oneof)->capitalized_name);
-    printer->Print("switch ($oneof_name$Case_) {\n", "oneof_name",
-                   context_->GetOneofGeneratorInfo(oneof)->name);
-    printer->Indent();
-    for (int j = 0; j < (oneof)->field_count(); j++) {
-      const FieldDescriptor* field = (oneof)->field(j);
-      printer->Print("case $field_number$:\n", "field_number",
-                     StrCat(field->number()));
-      printer->Indent();
-      field_generators_.get(field).GenerateEqualsCode(printer);
-      printer->Print("break;\n");
-      printer->Outdent();
-    }
-    printer->Print(
-        "case 0:\n"
-        "default:\n");
-    printer->Outdent();
-    printer->Print("}\n");
-  }
-
-  // Always consider unknown fields for equality. This will sometimes return
-  // false for non-canonical ordering when running in LITE_RUNTIME but it's
-  // the best we can do.
-  printer->Print(
-      "if (!getUnknownFields().equals(other.getUnknownFields())) return "
-      "false;\n");
-  if (descriptor_->extension_range_count() > 0) {
-    printer->Print(
-        "if (!getExtensionFields().equals(other.getExtensionFields()))\n"
-        "  return false;\n");
-  }
-  printer->Print("return true;\n");
-  printer->Outdent();
-  printer->Print(
-      "}\n"
-      "\n");
-
-  printer->Print(
-      "@java.lang.Override\n"
-      "public int hashCode() {\n");
-  printer->Indent();
-  printer->Print("if (memoizedHashCode != 0) {\n");
-  printer->Indent();
-  printer->Print("return memoizedHashCode;\n");
-  printer->Outdent();
-  printer->Print(
-      "}\n"
-      "int hash = 41;\n");
-
-  // If we output a getDescriptor() method, use that as it is more efficient.
-  if (descriptor_->options().no_standard_descriptor_accessor()) {
-    printer->Print("hash = (19 * hash) + getDescriptorForType().hashCode();\n");
-  } else {
-    printer->Print("hash = (19 * hash) + getDescriptor().hashCode();\n");
-  }
-
-  // hashCode non-oneofs.
-  for (int i = 0; i < descriptor_->field_count(); i++) {
-    const FieldDescriptor* field = descriptor_->field(i);
-    if (!IsRealOneof(field)) {
-      const FieldGeneratorInfo* info = context_->GetFieldGeneratorInfo(field);
-      bool check_has_bits = CheckHasBitsForEqualsAndHashCode(field);
-      if (check_has_bits) {
-        printer->Print("if (has$name$()) {\n", "name", info->capitalized_name);
-        printer->Indent();
-      }
-      field_generators_.get(field).GenerateHashCode(printer);
-      if (check_has_bits) {
-        printer->Outdent();
-        printer->Print("}\n");
-      }
-    }
-  }
-
-  // hashCode oneofs.
-  for (auto oneof : oneofs_) {
-    printer->Print("switch ($oneof_name$Case_) {\n", "oneof_name",
-                   context_->GetOneofGeneratorInfo(oneof)->name);
-    printer->Indent();
-    for (int j = 0; j < (oneof)->field_count(); j++) {
-      const FieldDescriptor* field = (oneof)->field(j);
-      printer->Print("case $field_number$:\n", "field_number",
-                     StrCat(field->number()));
-      printer->Indent();
-      field_generators_.get(field).GenerateHashCode(printer);
-      printer->Print("break;\n");
-      printer->Outdent();
-    }
-    printer->Print(
-        "case 0:\n"
-        "default:\n");
-    printer->Outdent();
-    printer->Print("}\n");
-  }
-
-  if (descriptor_->extension_range_count() > 0) {
-    printer->Print("hash = hashFields(hash, getExtensionFields());\n");
-  }
-
-  printer->Print("hash = (29 * hash) + getUnknownFields().hashCode();\n");
-  printer->Print(
-      "memoizedHashCode = hash;\n"
-      "return hash;\n");
-  printer->Outdent();
-  printer->Print(
-      "}\n"
-      "\n");
-}
-
-// ===================================================================
-
-void ImmutableMessageGenerator::GenerateExtensionRegistrationCode(
-    io::Printer* printer) {
-  for (int i = 0; i < descriptor_->extension_count(); i++) {
-    ImmutableExtensionGenerator(descriptor_->extension(i), context_)
-        .GenerateRegistrationCode(printer);
-  }
-
-  for (int i = 0; i < descriptor_->nested_type_count(); i++) {
-    ImmutableMessageGenerator(descriptor_->nested_type(i), context_)
-        .GenerateExtensionRegistrationCode(printer);
-  }
-}
-
-// ===================================================================
-void ImmutableMessageGenerator::GenerateParser(io::Printer* printer) {
-  printer->Print(
-      "$visibility$ static final com.google.protobuf.Parser<$classname$>\n"
-      "    PARSER = new com.google.protobuf.AbstractParser<$classname$>() {\n"
-      "  @java.lang.Override\n"
-      "  public $classname$ parsePartialFrom(\n"
-      "      com.google.protobuf.CodedInputStream input,\n"
-      "      com.google.protobuf.ExtensionRegistryLite extensionRegistry)\n"
-      "      throws com.google.protobuf.InvalidProtocolBufferException {\n"
-      "    Builder builder = newBuilder();\n"
-      "    try {\n"
-      "      builder.mergeFrom(input, extensionRegistry);\n"
-      "    } catch (com.google.protobuf.InvalidProtocolBufferException e) {\n"
-      "      throw e.setUnfinishedMessage(builder.buildPartial());\n"
-      "    } catch (com.google.protobuf.UninitializedMessageException e) {\n"
-      "      throw "
-      "e.asInvalidProtocolBufferException().setUnfinishedMessage(builder."
-      "buildPartial());\n"
-      "    } catch (java.io.IOException e) {\n"
-      "      throw new com.google.protobuf.InvalidProtocolBufferException(e)\n"
-      "          .setUnfinishedMessage(builder.buildPartial());\n"
-      "    }\n"
-      "    return builder.buildPartial();\n"
-      "  }\n"
-      "};\n"
-      "\n"
-      "public static com.google.protobuf.Parser<$classname$> parser() {\n"
-      "  return PARSER;\n"
-      "}\n"
-      "\n"
-      "@java.lang.Override\n"
-      "public com.google.protobuf.Parser<$classname$> getParserForType() {\n"
-      "  return PARSER;\n"
-      "}\n"
-      "\n",
-      "visibility",
-      ExposePublicParser(descriptor_->file()) ? "@java.lang.Deprecated public"
-                                              : "private",
-      "classname", descriptor_->name());
-}
-
-// ===================================================================
-void ImmutableMessageGenerator::GenerateInitializers(io::Printer* printer) {
-  for (int i = 0; i < descriptor_->field_count(); i++) {
-    if (!IsRealOneof(descriptor_->field(i))) {
-      field_generators_.get(descriptor_->field(i))
-          .GenerateInitializationCode(printer);
-    }
-  }
-}
-
-// ===================================================================
-void ImmutableMessageGenerator::GenerateMutableCopy(io::Printer* printer) {
-  printer->Print(
-      "protected com.google.protobuf.MutableMessage\n"
-      "    internalMutableDefault() {\n"
-      "  return MutableDefaultLoader.get();\n"
-      "}\n"
-      "\n"
-      "private static final class MutableDefaultLoader {\n"
-      "  private static final java.lang.Object defaultOrRuntimeException;\n"
-      "  static {\n"
-      "    java.lang.Object local;\n"
-      "    try {\n"
-      "      local = internalMutableDefault(\"$mutable_name$\");\n"
-      "    } catch (java.lang.RuntimeException e) {\n"
-      "      local = e;\n"
-      "    }\n"
-      "    defaultOrRuntimeException = local;\n"
-      "  }\n"
-      "\n"
-      "  private MutableDefaultLoader() {}\n"
-      "\n"
-      "  public static com.google.protobuf.MutableMessage get() {\n"
-      "    if (defaultOrRuntimeException\n"
-      "         instanceof java.lang.RuntimeException) {\n"
-      "      throw (java.lang.RuntimeException) defaultOrRuntimeException;\n"
-      "    }\n"
-      "    return\n"
-      "        (com.google.protobuf.MutableMessage) "
-      "defaultOrRuntimeException;\n"
-      "  }\n"
-      "}\n",
-      "mutable_name", name_resolver_->GetJavaMutableClassName(descriptor_));
-}
-
-void ImmutableMessageGenerator::GenerateKotlinDsl(io::Printer* printer) const {
-  printer->Print(
-      "@kotlin.OptIn"
-      "(com.google.protobuf.kotlin.OnlyForUseByGeneratedProtoCode::class)\n"
-      "@com.google.protobuf.kotlin.ProtoDslMarker\n");
-  printer->Print(
-      "public class Dsl private constructor(\n"
-      "  private val _builder: $message$.Builder\n"
-      ") {\n"
-      "  public companion object {\n"
-      "    @kotlin.jvm.JvmSynthetic\n"
-      "    @kotlin.PublishedApi\n"
-      "    internal fun _create(builder: $message$.Builder): Dsl = "
-      "Dsl(builder)\n"
-      "  }\n"
-      "\n"
-      "  @kotlin.jvm.JvmSynthetic\n"
-      "  @kotlin.PublishedApi\n"
-      "  internal fun _build(): $message$ = _builder.build()\n",
-      "message", name_resolver_->GetClassName(descriptor_, true));
-
-  printer->Indent();
-
-  for (int i = 0; i < descriptor_->field_count(); i++) {
-    printer->Print("\n");
-    field_generators_.get(descriptor_->field(i))
-        .GenerateKotlinDslMembers(printer);
-  }
-
-  for (auto oneof : oneofs_) {
-    printer->Print(
-        "public val $oneof_name$Case: $message$.$oneof_capitalized_name$Case\n"
-        "  @JvmName(\"get$oneof_capitalized_name$Case\")\n"
-        "  get() = _builder.get$oneof_capitalized_name$Case()\n\n"
-        "public fun clear$oneof_capitalized_name$() {\n"
-        "  _builder.clear$oneof_capitalized_name$()\n"
-        "}\n",
-        "oneof_name", context_->GetOneofGeneratorInfo(oneof)->name,
-        "oneof_capitalized_name",
-        context_->GetOneofGeneratorInfo(oneof)->capitalized_name, "message",
-        name_resolver_->GetClassName(descriptor_, true));
-  }
-
-  if (descriptor_->extension_range_count() > 0) {
-    GenerateKotlinExtensions(printer);
-  }
-
-  printer->Outdent();
-  printer->Print("}\n");
-}
-
-void ImmutableMessageGenerator::GenerateKotlinMembers(
-    io::Printer* printer) const {
-  printer->Print(
-      "@kotlin.jvm.JvmName(\"-initialize$camelcase_name$\")\n"
-      "public inline fun $camelcase_name$(block: $message_kt$.Dsl.() -> "
-      "kotlin.Unit): "
-      "$message$ "
-      "=\n"
-      "  $message_kt$.Dsl._create($message$.newBuilder()).apply { block() "
-      "}._build()\n",
-      "camelcase_name", name_resolver_->GetKotlinFactoryName(descriptor_),
-      "message_kt", name_resolver_->GetKotlinExtensionsClassName(descriptor_),
-      "message", name_resolver_->GetClassName(descriptor_, true));
-
-  printer->Print("public object $name$Kt {\n", "name", descriptor_->name());
-  printer->Indent();
-  GenerateKotlinDsl(printer);
-  for (int i = 0; i < descriptor_->nested_type_count(); i++) {
-    if (IsMapEntry(descriptor_->nested_type(i))) continue;
-    ImmutableMessageGenerator(descriptor_->nested_type(i), context_)
-        .GenerateKotlinMembers(printer);
-  }
-  printer->Outdent();
-  printer->Print("}\n");
-}
-
-void ImmutableMessageGenerator::GenerateTopLevelKotlinMembers(
-    io::Printer* printer) const {
-  printer->Print(
-      "@kotlin.jvm.JvmSynthetic\n"
-      "public inline fun $message$.copy(block: $message_kt$.Dsl.() -> "
-      "kotlin.Unit): "
-      "$message$ =\n"
-      "  $message_kt$.Dsl._create(this.toBuilder()).apply { block() "
-      "}._build()\n\n",
-      "message", name_resolver_->GetClassName(descriptor_, true), "message_kt",
-      name_resolver_->GetKotlinExtensionsClassName(descriptor_));
-
-  for (int i = 0; i < descriptor_->nested_type_count(); i++) {
-    if (IsMapEntry(descriptor_->nested_type(i))) continue;
-    ImmutableMessageGenerator(descriptor_->nested_type(i), context_)
-        .GenerateTopLevelKotlinMembers(printer);
-  }
-
-  GenerateKotlinOrNull(printer);
-}
-
-void ImmutableMessageGenerator::GenerateKotlinOrNull(io::Printer* printer) const {
-  for (int i = 0; i < descriptor_->field_count(); i++) {
-    const FieldDescriptor* field = descriptor_->field(i);
-    if (field->has_presence() && GetJavaType(field) == JAVATYPE_MESSAGE) {
-      printer->Print(
-          "public val $full_classname$OrBuilder.$camelcase_name$OrNull: $full_name$?\n"
-          "  get() = if (has$name$()) get$name$() else null\n\n",
-          "full_classname", name_resolver_->GetClassName(descriptor_, true),
-          "camelcase_name", context_->GetFieldGeneratorInfo(field)->name,
-          "full_name",
-          name_resolver_->GetImmutableClassName(field->message_type()), "name",
-          context_->GetFieldGeneratorInfo(field)->capitalized_name);
-    }
-  }
-}
-
-void ImmutableMessageGenerator::GenerateKotlinExtensions(
-    io::Printer* printer) const {
-  std::string message_name = name_resolver_->GetClassName(descriptor_, true);
-
-  printer->Print(
-      "@Suppress(\"UNCHECKED_CAST\")\n"
-      "@kotlin.jvm.JvmSynthetic\n"
-      "public operator fun <T : kotlin.Any> get(extension: "
-      "com.google.protobuf.ExtensionLite<$message$, T>): T {\n"
-      "  return if (extension.isRepeated) {\n"
-      "    get(extension as com.google.protobuf.ExtensionLite<$message$, "
-      "List<*>>) as T\n"
-      "  } else {\n"
-      "    _builder.getExtension(extension)\n"
-      "  }\n"
-      "}\n\n",
-      "message", message_name);
-
-  printer->Print(
-      "@kotlin.jvm.JvmSynthetic\n"
-      "@kotlin.OptIn"
-      "(com.google.protobuf.kotlin.OnlyForUseByGeneratedProtoCode::class)\n"
-      "@kotlin.jvm.JvmName(\"-getRepeatedExtension\")\n"
-      "public operator fun <E : kotlin.Any> get(\n"
-      "  extension: com.google.protobuf.ExtensionLite<$message$, List<E>>\n"
-      "): com.google.protobuf.kotlin.ExtensionList<E, $message$> {\n"
-      "  return com.google.protobuf.kotlin.ExtensionList(extension, "
-      "_builder.getExtension(extension))\n"
-      "}\n\n",
-      "message", message_name);
-
-  printer->Print(
-      "@kotlin.jvm.JvmSynthetic\n"
-      "public operator fun contains(extension: "
-      "com.google.protobuf.ExtensionLite<$message$, *>): "
-      "Boolean {\n"
-      "  return _builder.hasExtension(extension)\n"
-      "}\n\n",
-      "message", message_name);
-
-  printer->Print(
-      "@kotlin.jvm.JvmSynthetic\n"
-      "public fun clear(extension: "
-      "com.google.protobuf.ExtensionLite<$message$, *>) "
-      "{\n"
-      "  _builder.clearExtension(extension)\n"
-      "}\n\n",
-      "message", message_name);
-
-  printer->Print(
-      "@kotlin.jvm.JvmSynthetic\n"
-      "@kotlin.PublishedApi\n"
-      "internal fun <T : kotlin.Any> setExtension(extension: "
-      "com.google.protobuf.ExtensionLite<$message$, T>, "
-      "value: T) {\n"
-      "  _builder.setExtension(extension, value)\n"
-      "}\n\n",
-      "message", message_name);
-
-  printer->Print(
-      "@kotlin.jvm.JvmSynthetic\n"
-      "@Suppress(\"NOTHING_TO_INLINE\")\n"
-      "public inline operator fun <T : Comparable<T>> set(\n"
-      "  extension: com.google.protobuf.ExtensionLite<$message$, T>,\n"
-      "  value: T\n"
-      ") {\n"
-      "  setExtension(extension, value)\n"
-      "}\n\n",
-      "message", message_name);
-
-  printer->Print(
-      "@kotlin.jvm.JvmSynthetic\n"
-      "@Suppress(\"NOTHING_TO_INLINE\")\n"
-      "public inline operator fun set(\n"
-      "  extension: com.google.protobuf.ExtensionLite<$message$, "
-      "com.google.protobuf.ByteString>,\n"
-      "  value: com.google.protobuf.ByteString\n"
-      ") {\n"
-      "  setExtension(extension, value)\n"
-      "}\n\n",
-      "message", message_name);
-
-  printer->Print(
-      "@kotlin.jvm.JvmSynthetic\n"
-      "@Suppress(\"NOTHING_TO_INLINE\")\n"
-      "inline operator fun <T : com.google.protobuf.MessageLite> set(\n"
-      "  extension: com.google.protobuf.ExtensionLite<$message$, T>,\n"
-      "  value: T\n"
-      ") {\n"
-      "  setExtension(extension, value)\n"
-      "}\n\n",
-      "message", message_name);
-
-  printer->Print(
-      "@kotlin.jvm.JvmSynthetic\n"
-      "public fun <E : kotlin.Any> com.google.protobuf.kotlin.ExtensionList<E, "
-      "$message$>.add(value: E) {\n"
-      "  _builder.addExtension(this.extension, value)\n"
-      "}\n\n",
-      "message", message_name);
-
-  printer->Print(
-      "@kotlin.jvm.JvmSynthetic\n"
-      "@Suppress(\"NOTHING_TO_INLINE\")\n"
-      "public inline operator fun <E : kotlin.Any> "
-      "com.google.protobuf.kotlin.ExtensionList<E, "
-      "$message$>.plusAssign"
-      "(value: E) {\n"
-      "  add(value)\n"
-      "}\n\n",
-      "message", message_name);
-
-  printer->Print(
-      "@kotlin.jvm.JvmSynthetic\n"
-      "public fun <E : kotlin.Any> com.google.protobuf.kotlin.ExtensionList<E, "
-      "$message$>.addAll(values: Iterable<E>) {\n"
-      "  for (value in values) {\n"
-      "    add(value)\n"
-      "  }\n"
-      "}\n\n",
-      "message", message_name);
-
-  printer->Print(
-      "@kotlin.jvm.JvmSynthetic\n"
-      "@Suppress(\"NOTHING_TO_INLINE\")\n"
-      "public inline operator fun <E : kotlin.Any> "
-      "com.google.protobuf.kotlin.ExtensionList<E, "
-      "$message$>.plusAssign(values: "
-      "Iterable<E>) {\n"
-      "  addAll(values)\n"
-      "}\n\n",
-      "message", message_name);
-
-  printer->Print(
-      "@kotlin.jvm.JvmSynthetic\n"
-      "public operator fun <E : kotlin.Any> "
-      "com.google.protobuf.kotlin.ExtensionList<E, "
-      "$message$>.set(index: Int, value: "
-      "E) {\n"
-      "  _builder.setExtension(this.extension, index, value)\n"
-      "}\n\n",
-      "message", message_name);
-
-  printer->Print(
-      "@kotlin.jvm.JvmSynthetic\n"
-      "@Suppress(\"NOTHING_TO_INLINE\")\n"
-      "public inline fun com.google.protobuf.kotlin.ExtensionList<*, "
-      "$message$>.clear() {\n"
-      "  clear(extension)\n"
-      "}\n\n",
-      "message", message_name);
-}
-
-void ImmutableMessageGenerator::GenerateAnyMethods(io::Printer* printer) {
-  printer->Print(
-      "private static String getTypeUrl(\n"
-      "    java.lang.String typeUrlPrefix,\n"
-      "    com.google.protobuf.Descriptors.Descriptor descriptor) {\n"
-      "  return typeUrlPrefix.endsWith(\"/\")\n"
-      "      ? typeUrlPrefix + descriptor.getFullName()\n"
-      "      : typeUrlPrefix + \"/\" + descriptor.getFullName();\n"
-      "}\n"
-      "\n"
-      "private static String getTypeNameFromTypeUrl(\n"
-      "    java.lang.String typeUrl) {\n"
-      "  int pos = typeUrl.lastIndexOf('/');\n"
-      "  return pos == -1 ? \"\" : typeUrl.substring(pos + 1);\n"
-      "}\n"
-      "\n"
-      "public static <T extends com.google.protobuf.Message> Any pack(\n"
-      "    T message) {\n"
-      "  return Any.newBuilder()\n"
-      "      .setTypeUrl(getTypeUrl(\"type.googleapis.com\",\n"
-      "                             message.getDescriptorForType()))\n"
-      "      .setValue(message.toByteString())\n"
-      "      .build();\n"
-      "}\n"
-      "\n"
-      "/**\n"
-      " * Packs a message using the given type URL prefix. The type URL will\n"
-      " * be constructed by concatenating the message type's full name to the\n"
-      " * prefix with an optional \"/\" separator if the prefix doesn't end\n"
-      " * with \"/\" already.\n"
-      " */\n"
-      "public static <T extends com.google.protobuf.Message> Any pack(\n"
-      "    T message, java.lang.String typeUrlPrefix) {\n"
-      "  return Any.newBuilder()\n"
-      "      .setTypeUrl(getTypeUrl(typeUrlPrefix,\n"
-      "                             message.getDescriptorForType()))\n"
-      "      .setValue(message.toByteString())\n"
-      "      .build();\n"
-      "}\n"
-      "\n"
-      "public <T extends com.google.protobuf.Message> boolean is(\n"
-      "    java.lang.Class<T> clazz) {\n"
-      "  T defaultInstance =\n"
-      "      com.google.protobuf.Internal.getDefaultInstance(clazz);\n"
-      "  return getTypeNameFromTypeUrl(getTypeUrl()).equals(\n"
-      "      defaultInstance.getDescriptorForType().getFullName());\n"
-      "}\n"
-      "\n"
-      "private volatile com.google.protobuf.Message cachedUnpackValue;\n"
-      "\n"
-      "@java.lang.SuppressWarnings(\"unchecked\")\n"
-      "public <T extends com.google.protobuf.Message> T unpack(\n"
-      "    java.lang.Class<T> clazz)\n"
-      "    throws com.google.protobuf.InvalidProtocolBufferException {\n"
-      "  boolean invalidClazz = false;\n"
-      "  if (cachedUnpackValue != null) {\n"
-      "    if (cachedUnpackValue.getClass() == clazz) {\n"
-      "      return (T) cachedUnpackValue;\n"
-      "    }\n"
-      "    invalidClazz = true;\n"
-      "  }\n"
-      "  if (invalidClazz || !is(clazz)) {\n"
-      "    throw new com.google.protobuf.InvalidProtocolBufferException(\n"
-      "        \"Type of the Any message does not match the given class.\");\n"
-      "  }\n"
-      "  T defaultInstance =\n"
-      "      com.google.protobuf.Internal.getDefaultInstance(clazz);\n"
-      "  T result = (T) defaultInstance.getParserForType()\n"
-      "      .parseFrom(getValue());\n"
-      "  cachedUnpackValue = result;\n"
-      "  return result;\n"
-      "}\n");
-}
-
-}  // namespace java
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
diff --git a/libs/protobuf/src/google/protobuf/compiler/java/message.h b/libs/protobuf/src/google/protobuf/compiler/java/message.h
deleted file mode 100644
index 2dbd0dd..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/java/message.h
+++ /dev/null
@@ -1,155 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-
-#ifndef GOOGLE_PROTOBUF_COMPILER_JAVA_MESSAGE_H__
-#define GOOGLE_PROTOBUF_COMPILER_JAVA_MESSAGE_H__
-
-#include <map>
-#include <string>
-
-#include <google/protobuf/compiler/java/field.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace java {
-class Context;            // context.h
-class ClassNameResolver;  // name_resolver.h
-}  // namespace java
-}  // namespace compiler
-namespace io {
-class Printer;  // printer.h
-}
-}  // namespace protobuf
-}  // namespace google
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace java {
-
-static const int kMaxStaticSize = 1 << 15;  // aka 32k
-
-class MessageGenerator {
- public:
-  explicit MessageGenerator(const Descriptor* descriptor);
-  virtual ~MessageGenerator();
-
-  // All static variables have to be declared at the top-level of the file
-  // so that we can control initialization order, which is important for
-  // DescriptorProto bootstrapping to work.
-  virtual void GenerateStaticVariables(io::Printer* printer,
-                                       int* bytecode_estimate) = 0;
-
-  // Output code which initializes the static variables generated by
-  // GenerateStaticVariables(). Returns an estimate of bytecode size.
-  virtual int GenerateStaticVariableInitializers(io::Printer* printer) = 0;
-
-  // Generate the class itself.
-  virtual void Generate(io::Printer* printer) = 0;
-
-  // Generates the base interface that both the class and its builder
-  // implement
-  virtual void GenerateInterface(io::Printer* printer) = 0;
-
-  // Generate code to register all contained extensions with an
-  // ExtensionRegistry.
-  virtual void GenerateExtensionRegistrationCode(io::Printer* printer) = 0;
-  virtual void GenerateKotlinDsl(io::Printer* printer) const = 0;
-  virtual void GenerateKotlinMembers(io::Printer* printer) const = 0;
-  virtual void GenerateTopLevelKotlinMembers(io::Printer* printer) const = 0;
-
- protected:
-  const Descriptor* descriptor_;
-  std::set<const OneofDescriptor*> oneofs_;
-
- private:
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(MessageGenerator);
-};
-
-class ImmutableMessageGenerator : public MessageGenerator {
- public:
-  ImmutableMessageGenerator(const Descriptor* descriptor, Context* context);
-  ~ImmutableMessageGenerator() override;
-
-  void Generate(io::Printer* printer) override;
-  void GenerateInterface(io::Printer* printer) override;
-  void GenerateExtensionRegistrationCode(io::Printer* printer) override;
-  void GenerateStaticVariables(io::Printer* printer,
-                               int* bytecode_estimate) override;
-
-  // Returns an estimate of the number of bytes the printed code will compile to
-  int GenerateStaticVariableInitializers(io::Printer* printer) override;
-  void GenerateKotlinDsl(io::Printer* printer) const override;
-  void GenerateKotlinMembers(io::Printer* printer) const override;
-  void GenerateTopLevelKotlinMembers(io::Printer* printer) const override;
-
- private:
-  void GenerateFieldAccessorTable(io::Printer* printer, int* bytecode_estimate);
-
-  // Returns an estimate of the number of bytes the printed code will compile to
-  int GenerateFieldAccessorTableInitializer(io::Printer* printer);
-
-  void GenerateMessageSerializationMethods(io::Printer* printer);
-  void GenerateParseFromMethods(io::Printer* printer);
-  void GenerateSerializeOneField(io::Printer* printer,
-                                 const FieldDescriptor* field);
-  void GenerateSerializeOneExtensionRange(
-      io::Printer* printer, const Descriptor::ExtensionRange* range);
-
-  void GenerateBuilder(io::Printer* printer);
-  void GenerateIsInitialized(io::Printer* printer);
-  void GenerateDescriptorMethods(io::Printer* printer);
-  void GenerateInitializers(io::Printer* printer);
-  void GenerateEqualsAndHashCode(io::Printer* printer);
-  void GenerateParser(io::Printer* printer);
-  void GenerateParsingConstructor(io::Printer* printer);
-  void GenerateMutableCopy(io::Printer* printer);
-  void GenerateKotlinExtensions(io::Printer* printer) const;
-  void GenerateKotlinOrNull(io::Printer* printer) const;
-  void GenerateAnyMethods(io::Printer* printer);
-
-  Context* context_;
-  ClassNameResolver* name_resolver_;
-  FieldGeneratorMap<ImmutableFieldGenerator> field_generators_;
-
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(ImmutableMessageGenerator);
-};
-
-}  // namespace java
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // GOOGLE_PROTOBUF_COMPILER_JAVA_MESSAGE_H__
diff --git a/libs/protobuf/src/google/protobuf/compiler/java/message_builder.cc b/libs/protobuf/src/google/protobuf/compiler/java/message_builder.cc
deleted file mode 100644
index 32ad668..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/java/message_builder.cc
+++ /dev/null
@@ -1,909 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: dweis@google.com (Daniel Weis)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-
-#include "google/protobuf/compiler/java/message_builder.h"
-
-#include <algorithm>
-#include <map>
-#include <memory>
-#include <set>
-#include <vector>
-
-#include "google/protobuf/io/coded_stream.h"
-#include "google/protobuf/io/printer.h"
-#include "google/protobuf/wire_format.h"
-#include "google/protobuf/stubs/strutil.h"
-#include "google/protobuf/stubs/substitute.h"
-#include "google/protobuf/compiler/java/context.h"
-#include "google/protobuf/compiler/java/doc_comment.h"
-#include "google/protobuf/compiler/java/enum.h"
-#include "google/protobuf/compiler/java/extension.h"
-#include "google/protobuf/compiler/java/generator_factory.h"
-#include "google/protobuf/compiler/java/helpers.h"
-#include "google/protobuf/compiler/java/name_resolver.h"
-#include "google/protobuf/descriptor.pb.h"
-
-// Must be last.
-#include "google/protobuf/port_def.inc"
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace java {
-
-using internal::WireFormat;
-using internal::WireFormatLite;
-
-namespace {
-std::string MapValueImmutableClassdName(const Descriptor* descriptor,
-                                        ClassNameResolver* name_resolver) {
-  const FieldDescriptor* value_field = descriptor->map_value();
-  GOOGLE_CHECK_EQ(FieldDescriptor::TYPE_MESSAGE, value_field->type());
-  return name_resolver->GetImmutableClassName(value_field->message_type());
-}
-}  // namespace
-
-MessageBuilderGenerator::MessageBuilderGenerator(const Descriptor* descriptor,
-                                                 Context* context)
-    : descriptor_(descriptor),
-      context_(context),
-      name_resolver_(context->GetNameResolver()),
-      field_generators_(descriptor, context_) {
-  GOOGLE_CHECK(HasDescriptorMethods(descriptor->file(), context->EnforceLite()))
-      << "Generator factory error: A non-lite message generator is used to "
-         "generate lite messages.";
-  for (int i = 0; i < descriptor_->field_count(); i++) {
-    if (IsRealOneof(descriptor_->field(i))) {
-      oneofs_.insert(descriptor_->field(i)->containing_oneof());
-    }
-  }
-}
-
-MessageBuilderGenerator::~MessageBuilderGenerator() {}
-
-void MessageBuilderGenerator::Generate(io::Printer* printer) {
-  WriteMessageDocComment(printer, descriptor_);
-  if (descriptor_->extension_range_count() > 0) {
-    printer->Print(
-        "public static final class Builder extends\n"
-        "    com.google.protobuf.GeneratedMessage$ver$.ExtendableBuilder<\n"
-        "      $classname$, Builder> implements\n"
-        "    $extra_interfaces$\n"
-        "    $classname$OrBuilder {\n",
-        "classname", name_resolver_->GetImmutableClassName(descriptor_),
-        "extra_interfaces", ExtraBuilderInterfaces(descriptor_), "ver",
-        GeneratedCodeVersionSuffix());
-  } else {
-    printer->Print(
-        "public static final class Builder extends\n"
-        "    com.google.protobuf.GeneratedMessage$ver$.Builder<Builder> "
-        "implements\n"
-        "    $extra_interfaces$\n"
-        "    $classname$OrBuilder {\n",
-        "classname", name_resolver_->GetImmutableClassName(descriptor_),
-        "extra_interfaces", ExtraBuilderInterfaces(descriptor_), "ver",
-        GeneratedCodeVersionSuffix());
-  }
-  printer->Indent();
-
-  GenerateDescriptorMethods(printer);
-  GenerateCommonBuilderMethods(printer);
-
-  if (context_->HasGeneratedMethods(descriptor_)) {
-    GenerateIsInitialized(printer);
-    GenerateBuilderParsingMethods(printer);
-  }
-
-  // oneof
-  std::map<std::string, std::string> vars;
-  for (auto oneof : oneofs_) {
-    vars["oneof_name"] = context_->GetOneofGeneratorInfo(oneof)->name;
-    vars["oneof_capitalized_name"] =
-        context_->GetOneofGeneratorInfo(oneof)->capitalized_name;
-    vars["oneof_index"] = StrCat(oneof->index());
-    // oneofCase_ and oneof_
-    printer->Print(vars,
-                   "private int $oneof_name$Case_ = 0;\n"
-                   "private java.lang.Object $oneof_name$_;\n");
-    // oneofCase() and clearOneof()
-    printer->Print(vars,
-                   "public $oneof_capitalized_name$Case\n"
-                   "    get$oneof_capitalized_name$Case() {\n"
-                   "  return $oneof_capitalized_name$Case.forNumber(\n"
-                   "      $oneof_name$Case_);\n"
-                   "}\n"
-                   "\n"
-                   "public Builder clear$oneof_capitalized_name$() {\n"
-                   "  $oneof_name$Case_ = 0;\n"
-                   "  $oneof_name$_ = null;\n"
-                   "  onChanged();\n"
-                   "  return this;\n"
-                   "}\n"
-                   "\n");
-  }
-
-  // Integers for bit fields.
-  int totalBits = 0;
-  for (int i = 0; i < descriptor_->field_count(); i++) {
-    totalBits +=
-        field_generators_.get(descriptor_->field(i)).GetNumBitsForBuilder();
-  }
-  int totalInts = (totalBits + 31) / 32;
-  for (int i = 0; i < totalInts; i++) {
-    printer->Print("private int $bit_field_name$;\n", "bit_field_name",
-                   GetBitFieldName(i));
-  }
-
-  for (int i = 0; i < descriptor_->field_count(); i++) {
-    printer->Print("\n");
-    field_generators_.get(descriptor_->field(i))
-        .GenerateBuilderMembers(printer);
-  }
-
-  // Override methods declared in GeneratedMessage to return the concrete
-  // generated type so callsites won't depend on GeneratedMessage. This
-  // is needed to keep binary compatibility when we change generated code
-  // to subclass a different GeneratedMessage class (e.g., in v3.0.0 release
-  // we changed all generated code to subclass GeneratedMessageV3).
-  printer->Print(
-      "@java.lang.Override\n"
-      "public final Builder setUnknownFields(\n"
-      "    final com.google.protobuf.UnknownFieldSet unknownFields) {\n"
-      "  return super.setUnknownFields(unknownFields);\n"
-      "}\n"
-      "\n"
-      "@java.lang.Override\n"
-      "public final Builder mergeUnknownFields(\n"
-      "    final com.google.protobuf.UnknownFieldSet unknownFields) {\n"
-      "  return super.mergeUnknownFields(unknownFields);\n"
-      "}\n"
-      "\n");
-
-  printer->Print(
-      "\n"
-      "// @@protoc_insertion_point(builder_scope:$full_name$)\n",
-      "full_name", descriptor_->full_name());
-
-  printer->Outdent();
-  printer->Print("}\n");
-}
-
-// ===================================================================
-
-void MessageBuilderGenerator::GenerateDescriptorMethods(io::Printer* printer) {
-  if (!descriptor_->options().no_standard_descriptor_accessor()) {
-    printer->Print(
-        "public static final com.google.protobuf.Descriptors.Descriptor\n"
-        "    getDescriptor() {\n"
-        "  return $fileclass$.internal_$identifier$_descriptor;\n"
-        "}\n"
-        "\n",
-        "fileclass", name_resolver_->GetImmutableClassName(descriptor_->file()),
-        "identifier", UniqueFileScopeIdentifier(descriptor_));
-  }
-  std::vector<const FieldDescriptor*> map_fields;
-  for (int i = 0; i < descriptor_->field_count(); i++) {
-    const FieldDescriptor* field = descriptor_->field(i);
-    if (GetJavaType(field) == JAVATYPE_MESSAGE &&
-        IsMapEntry(field->message_type())) {
-      map_fields.push_back(field);
-    }
-  }
-  if (!map_fields.empty()) {
-    printer->Print(
-        "@SuppressWarnings({\"rawtypes\"})\n"
-        "protected com.google.protobuf.MapField internalGetMapField(\n"
-        "    int number) {\n"
-        "  switch (number) {\n");
-    printer->Indent();
-    printer->Indent();
-    for (int i = 0; i < map_fields.size(); ++i) {
-      const FieldDescriptor* field = map_fields[i];
-      const FieldGeneratorInfo* info = context_->GetFieldGeneratorInfo(field);
-      printer->Print(
-          "case $number$:\n"
-          "  return internalGet$capitalized_name$();\n",
-          "number", StrCat(field->number()), "capitalized_name",
-          info->capitalized_name);
-    }
-    printer->Print(
-        "default:\n"
-        "  throw new RuntimeException(\n"
-        "      \"Invalid map field number: \" + number);\n");
-    printer->Outdent();
-    printer->Outdent();
-    printer->Print(
-        "  }\n"
-        "}\n");
-    printer->Print(
-        "@SuppressWarnings({\"rawtypes\"})\n"
-        "protected com.google.protobuf.MapField internalGetMutableMapField(\n"
-        "    int number) {\n"
-        "  switch (number) {\n");
-    printer->Indent();
-    printer->Indent();
-    for (int i = 0; i < map_fields.size(); ++i) {
-      const FieldDescriptor* field = map_fields[i];
-      const FieldGeneratorInfo* info = context_->GetFieldGeneratorInfo(field);
-      printer->Print(
-          "case $number$:\n"
-          "  return internalGetMutable$capitalized_name$();\n",
-          "number", StrCat(field->number()), "capitalized_name",
-          info->capitalized_name);
-    }
-    printer->Print(
-        "default:\n"
-        "  throw new RuntimeException(\n"
-        "      \"Invalid map field number: \" + number);\n");
-    printer->Outdent();
-    printer->Outdent();
-    printer->Print(
-        "  }\n"
-        "}\n");
-  }
-  printer->Print(
-      "@java.lang.Override\n"
-      "protected com.google.protobuf.GeneratedMessage$ver$.FieldAccessorTable\n"
-      "    internalGetFieldAccessorTable() {\n"
-      "  return $fileclass$.internal_$identifier$_fieldAccessorTable\n"
-      "      .ensureFieldAccessorsInitialized(\n"
-      "          $classname$.class, $classname$.Builder.class);\n"
-      "}\n"
-      "\n",
-      "classname", name_resolver_->GetImmutableClassName(descriptor_),
-      "fileclass", name_resolver_->GetImmutableClassName(descriptor_->file()),
-      "identifier", UniqueFileScopeIdentifier(descriptor_), "ver",
-      GeneratedCodeVersionSuffix());
-}
-
-// ===================================================================
-
-void MessageBuilderGenerator::GenerateCommonBuilderMethods(
-    io::Printer* printer) {
-  // Decide if we really need to have the "maybeForceBuilderInitialization()"
-  // method.
-  // TODO(b/249158148): Remove the need for this entirely
-  bool need_maybe_force_builder_init = false;
-  for (int i = 0; i < descriptor_->field_count(); i++) {
-    if (descriptor_->field(i)->message_type() != nullptr &&
-        !IsRealOneof(descriptor_->field(i)) &&
-        HasHasbit(descriptor_->field(i))) {
-      need_maybe_force_builder_init = true;
-      break;
-    }
-  }
-
-  const char* force_builder_init = need_maybe_force_builder_init
-                                       ? "  maybeForceBuilderInitialization();"
-                                       : "";
-
-  printer->Print(
-      "// Construct using $classname$.newBuilder()\n"
-      "private Builder() {\n"
-      "$force_builder_init$\n"
-      "}\n"
-      "\n",
-      "classname", name_resolver_->GetImmutableClassName(descriptor_),
-      "force_builder_init", force_builder_init);
-
-  printer->Print(
-      "private Builder(\n"
-      "    com.google.protobuf.GeneratedMessage$ver$.BuilderParent parent) {\n"
-      "  super(parent);\n"
-      "$force_builder_init$\n"
-      "}\n",
-      "classname", name_resolver_->GetImmutableClassName(descriptor_), "ver",
-      GeneratedCodeVersionSuffix(), "force_builder_init", force_builder_init);
-
-  if (need_maybe_force_builder_init) {
-    printer->Print(
-        "private void maybeForceBuilderInitialization() {\n"
-        "  if (com.google.protobuf.GeneratedMessage$ver$\n"
-        "          .alwaysUseFieldBuilders) {\n",
-        "ver", GeneratedCodeVersionSuffix());
-
-    printer->Indent();
-    printer->Indent();
-    for (int i = 0; i < descriptor_->field_count(); i++) {
-      if (!IsRealOneof(descriptor_->field(i))) {
-        field_generators_.get(descriptor_->field(i))
-            .GenerateFieldBuilderInitializationCode(printer);
-      }
-    }
-    printer->Outdent();
-    printer->Outdent();
-
-    printer->Print(
-        "  }\n"
-        "}\n");
-  }
-
-  printer->Print(
-      "@java.lang.Override\n"
-      "public Builder clear() {\n"
-      "  super.clear();\n");
-
-  printer->Indent();
-  int totalBuilderInts = (descriptor_->field_count() + 31) / 32;
-  for (int i = 0; i < totalBuilderInts; i++) {
-    printer->Print("$bit_field_name$ = 0;\n", "bit_field_name",
-                   GetBitFieldName(i));
-  }
-
-  for (int i = 0; i < descriptor_->field_count(); i++) {
-    field_generators_.get(descriptor_->field(i))
-        .GenerateBuilderClearCode(printer);
-  }
-
-  for (auto oneof : oneofs_) {
-    printer->Print(
-        "$oneof_name$Case_ = 0;\n"
-        "$oneof_name$_ = null;\n",
-        "oneof_name", context_->GetOneofGeneratorInfo(oneof)->name);
-  }
-
-  printer->Outdent();
-
-  printer->Print(
-      "  return this;\n"
-      "}\n"
-      "\n");
-
-  printer->Print(
-      "@java.lang.Override\n"
-      "public com.google.protobuf.Descriptors.Descriptor\n"
-      "    getDescriptorForType() {\n"
-      "  return $fileclass$.internal_$identifier$_descriptor;\n"
-      "}\n"
-      "\n",
-      "fileclass", name_resolver_->GetImmutableClassName(descriptor_->file()),
-      "identifier", UniqueFileScopeIdentifier(descriptor_));
-
-  // LITE runtime implements this in GeneratedMessageLite.
-  printer->Print(
-      "@java.lang.Override\n"
-      "public $classname$ getDefaultInstanceForType() {\n"
-      "  return $classname$.getDefaultInstance();\n"
-      "}\n"
-      "\n",
-      "classname", name_resolver_->GetImmutableClassName(descriptor_));
-
-  printer->Print(
-      "@java.lang.Override\n"
-      "public $classname$ build() {\n"
-      "  $classname$ result = buildPartial();\n"
-      "  if (!result.isInitialized()) {\n"
-      "    throw newUninitializedMessageException(result);\n"
-      "  }\n"
-      "  return result;\n"
-      "}\n"
-      "\n",
-      "classname", name_resolver_->GetImmutableClassName(descriptor_));
-
-  GenerateBuildPartial(printer);
-
-  // Override methods declared in GeneratedMessage to return the concrete
-  // generated type so callsites won't depend on GeneratedMessage. This
-  // is needed to keep binary compatibility when we change generated code
-  // to subclass a different GeneratedMessage class (e.g., in v3.0.0 release
-  // we changed all generated code to subclass GeneratedMessageV3).
-  printer->Print(
-      "@java.lang.Override\n"
-      "public Builder clone() {\n"
-      "  return super.clone();\n"
-      "}\n"
-      "@java.lang.Override\n"
-      "public Builder setField(\n"
-      "    com.google.protobuf.Descriptors.FieldDescriptor field,\n"
-      "    java.lang.Object value) {\n"
-      "  return super.setField(field, value);\n"
-      "}\n"
-      "@java.lang.Override\n"
-      "public Builder clearField(\n"
-      "    com.google.protobuf.Descriptors.FieldDescriptor field) {\n"
-      "  return super.clearField(field);\n"
-      "}\n"
-      "@java.lang.Override\n"
-      "public Builder clearOneof(\n"
-      "    com.google.protobuf.Descriptors.OneofDescriptor oneof) {\n"
-      "  return super.clearOneof(oneof);\n"
-      "}\n"
-      "@java.lang.Override\n"
-      "public Builder setRepeatedField(\n"
-      "    com.google.protobuf.Descriptors.FieldDescriptor field,\n"
-      "    int index, java.lang.Object value) {\n"
-      "  return super.setRepeatedField(field, index, value);\n"
-      "}\n"
-      "@java.lang.Override\n"
-      "public Builder addRepeatedField(\n"
-      "    com.google.protobuf.Descriptors.FieldDescriptor field,\n"
-      "    java.lang.Object value) {\n"
-      "  return super.addRepeatedField(field, value);\n"
-      "}\n");
-
-  if (descriptor_->extension_range_count() > 0) {
-    printer->Print(
-        "@java.lang.Override\n"
-        "public <Type> Builder setExtension(\n"
-        "    com.google.protobuf.GeneratedMessage.GeneratedExtension<\n"
-        "        $classname$, Type> extension,\n"
-        "    Type value) {\n"
-        "  return super.setExtension(extension, value);\n"
-        "}\n"
-        "@java.lang.Override\n"
-        "public <Type> Builder setExtension(\n"
-        "    com.google.protobuf.GeneratedMessage.GeneratedExtension<\n"
-        "        $classname$, java.util.List<Type>> extension,\n"
-        "    int index, Type value) {\n"
-        "  return super.setExtension(extension, index, value);\n"
-        "}\n"
-        "@java.lang.Override\n"
-        "public <Type> Builder addExtension(\n"
-        "    com.google.protobuf.GeneratedMessage.GeneratedExtension<\n"
-        "        $classname$, java.util.List<Type>> extension,\n"
-        "    Type value) {\n"
-        "  return super.addExtension(extension, value);\n"
-        "}\n"
-        "@java.lang.Override\n"
-        "public <Type> Builder clearExtension(\n"
-        "    com.google.protobuf.GeneratedMessage.GeneratedExtension<\n"
-        "        $classname$, ?> extension) {\n"
-        "  return super.clearExtension(extension);\n"
-        "}\n",
-        "classname", name_resolver_->GetImmutableClassName(descriptor_));
-  }
-
-  // -----------------------------------------------------------------
-
-  if (context_->HasGeneratedMethods(descriptor_)) {
-    printer->Print(
-        "@java.lang.Override\n"
-        "public Builder mergeFrom(com.google.protobuf.Message other) {\n"
-        "  if (other instanceof $classname$) {\n"
-        "    return mergeFrom(($classname$)other);\n"
-        "  } else {\n"
-        "    super.mergeFrom(other);\n"
-        "    return this;\n"
-        "  }\n"
-        "}\n"
-        "\n",
-        "classname", name_resolver_->GetImmutableClassName(descriptor_));
-
-    printer->Print(
-        "public Builder mergeFrom($classname$ other) {\n"
-        // Optimization:  If other is the default instance, we know none of its
-        //   fields are set so we can skip the merge.
-        "  if (other == $classname$.getDefaultInstance()) return this;\n",
-        "classname", name_resolver_->GetImmutableClassName(descriptor_));
-    printer->Indent();
-
-    for (int i = 0; i < descriptor_->field_count(); i++) {
-      if (!IsRealOneof(descriptor_->field(i))) {
-        field_generators_.get(descriptor_->field(i))
-            .GenerateMergingCode(printer);
-      }
-    }
-
-    // Merge oneof fields.
-    for (auto oneof : oneofs_) {
-      printer->Print("switch (other.get$oneof_capitalized_name$Case()) {\n",
-                     "oneof_capitalized_name",
-                     context_->GetOneofGeneratorInfo(oneof)->capitalized_name);
-      printer->Indent();
-      for (int j = 0; j < oneof->field_count(); j++) {
-        const FieldDescriptor* field = oneof->field(j);
-        printer->Print("case $field_name$: {\n", "field_name",
-                       ToUpper(field->name()));
-        printer->Indent();
-        field_generators_.get(field).GenerateMergingCode(printer);
-        printer->Print("break;\n");
-        printer->Outdent();
-        printer->Print("}\n");
-      }
-      printer->Print(
-          "case $cap_oneof_name$_NOT_SET: {\n"
-          "  break;\n"
-          "}\n",
-          "cap_oneof_name",
-          ToUpper(context_->GetOneofGeneratorInfo(oneof)->name));
-      printer->Outdent();
-      printer->Print("}\n");
-    }
-
-    printer->Outdent();
-
-    // if message type has extensions
-    if (descriptor_->extension_range_count() > 0) {
-      printer->Print("  this.mergeExtensionFields(other);\n");
-    }
-
-    printer->Print("  this.mergeUnknownFields(other.getUnknownFields());\n");
-
-    printer->Print("  onChanged();\n");
-
-    printer->Print(
-        "  return this;\n"
-        "}\n"
-        "\n");
-  }
-}
-
-void MessageBuilderGenerator::GenerateBuildPartial(io::Printer* printer) {
-  printer->Print(
-      "@java.lang.Override\n"
-      "public $classname$ buildPartial() {\n"
-      "  $classname$ result = new $classname$(this);\n",
-      "classname", name_resolver_->GetImmutableClassName(descriptor_));
-
-  printer->Indent();
-
-  // Handle the repeated fields first so that the "mutable bits" are cleared.
-  bool has_repeated_fields = false;
-  for (int i = 0; i < descriptor_->field_count(); ++i) {
-    if (descriptor_->field(i)->is_repeated() &&
-        !IsMapField(descriptor_->field(i))) {
-      has_repeated_fields = true;
-      printer->Print("buildPartialRepeatedFields(result);\n");
-      break;
-    }
-  }
-
-  // One buildPartial#() per from_bit_field
-  int totalBuilderInts = (descriptor_->field_count() + 31) / 32;
-  if (totalBuilderInts > 0) {
-    for (int i = 0; i < totalBuilderInts; ++i) {
-      printer->Print(
-          "if ($bit_field_name$ != 0) { buildPartial$piece$(result); }\n",
-          "bit_field_name", GetBitFieldName(i), "piece", StrCat(i));
-    }
-  }
-
-  if (!oneofs_.empty()) {
-    printer->Print("buildPartialOneofs(result);\n");
-  }
-
-  printer->Outdent();
-  printer->Print(
-      "  onBuilt();\n"
-      "  return result;\n"
-      "}\n"
-      "\n",
-      "classname", name_resolver_->GetImmutableClassName(descriptor_));
-
-  // Build Repeated Fields
-  if (has_repeated_fields) {
-    printer->Print(
-        "private void buildPartialRepeatedFields($classname$ result) {\n",
-        "classname", name_resolver_->GetImmutableClassName(descriptor_));
-    printer->Indent();
-    for (int i = 0; i < descriptor_->field_count(); ++i) {
-      if (descriptor_->field(i)->is_repeated() &&
-          !IsMapField(descriptor_->field(i))) {
-        const ImmutableFieldGenerator& field =
-            field_generators_.get(descriptor_->field(i));
-        field.GenerateBuildingCode(printer);
-      }
-    }
-    printer->Outdent();
-    printer->Print("}\n\n");
-  }
-
-  // Build non-oneof fields
-  int start_field = 0;
-  for (int i = 0; i < totalBuilderInts; i++) {
-    start_field = GenerateBuildPartialPiece(printer, i, start_field);
-  }
-
-  // Build Oneofs
-  if (!oneofs_.empty()) {
-    printer->Print("private void buildPartialOneofs($classname$ result) {\n",
-                   "classname",
-                   name_resolver_->GetImmutableClassName(descriptor_));
-    printer->Indent();
-    for (auto oneof : oneofs_) {
-      printer->Print(
-          "result.$oneof_name$Case_ = $oneof_name$Case_;\n"
-          "result.$oneof_name$_ = this.$oneof_name$_;\n",
-          "oneof_name", context_->GetOneofGeneratorInfo(oneof)->name);
-      for (int i = 0; i < oneof->field_count(); ++i) {
-        if (oneof->field(i)->message_type() != nullptr) {
-          const ImmutableFieldGenerator& field =
-              field_generators_.get(oneof->field(i));
-          field.GenerateBuildingCode(printer);
-        }
-      }
-    }
-    printer->Outdent();
-    printer->Print("}\n\n");
-  }
-}
-
-int MessageBuilderGenerator::GenerateBuildPartialPiece(io::Printer* printer,
-                                                       int piece,
-                                                       int first_field) {
-  printer->Print(
-      "private void buildPartial$piece$($classname$ result) {\n"
-      "  int from_$bit_field_name$ = $bit_field_name$;\n",
-      "classname", name_resolver_->GetImmutableClassName(descriptor_), "piece",
-      StrCat(piece), "bit_field_name", GetBitFieldName(piece));
-  printer->Indent();
-  std::set<int> declared_to_bitfields;
-
-  int bit = 0;
-  int next = first_field;
-  for (; bit < 32 && next < descriptor_->field_count(); ++next) {
-    const ImmutableFieldGenerator& field =
-        field_generators_.get(descriptor_->field(next));
-    bit += field.GetNumBitsForBuilder();
-
-    // Skip oneof fields that are handled separately
-    if (IsRealOneof(descriptor_->field(next))) {
-      continue;
-    }
-
-    // Skip repeated fields because they are currently handled
-    // in separate buildPartial sub-methods.
-    if (descriptor_->field(next)->is_repeated() &&
-        !IsMapField(descriptor_->field(next))) {
-      continue;
-    }
-    // Skip fields without presence bits in the builder
-    if (field.GetNumBitsForBuilder() == 0) {
-      continue;
-    }
-
-    // Track message bits if necessary
-    if (field.GetNumBitsForMessage() > 0) {
-      int to_bitfield = field.GetMessageBitIndex() / 32;
-      if (declared_to_bitfields.count(to_bitfield) == 0) {
-        printer->Print("int to_$bit_field_name$ = 0;\n", "bit_field_name",
-                       GetBitFieldName(to_bitfield));
-        declared_to_bitfields.insert(to_bitfield);
-      }
-    }
-
-    // Copy the field from the builder to the message
-    field.GenerateBuildingCode(printer);
-  }
-
-  // Copy the bit field results to the generated message
-  for (int to_bitfield : declared_to_bitfields) {
-    printer->Print("result.$bit_field_name$ |= to_$bit_field_name$;\n",
-                   "bit_field_name", GetBitFieldName(to_bitfield));
-  }
-
-  printer->Outdent();
-  printer->Print("}\n\n");
-
-  return next;
-}
-
-// ===================================================================
-
-void MessageBuilderGenerator::GenerateBuilderParsingMethods(
-    io::Printer* printer) {
-  printer->Print(
-      "@java.lang.Override\n"
-      "public Builder mergeFrom(\n"
-      "    com.google.protobuf.CodedInputStream input,\n"
-      "    com.google.protobuf.ExtensionRegistryLite extensionRegistry)\n"
-      "    throws java.io.IOException {\n"
-      "  if (extensionRegistry == null) {\n"
-      "    throw new java.lang.NullPointerException();\n"
-      "  }\n"
-      "  try {\n"
-      "    boolean done = false;\n"
-      "    while (!done) {\n"
-      "      int tag = input.readTag();\n"
-      "      switch (tag) {\n"
-      "        case 0:\n"  // zero signals EOF / limit reached
-      "          done = true;\n"
-      "          break;\n");
-  printer->Indent();  // method
-  printer->Indent();  // try
-  printer->Indent();  // while
-  printer->Indent();  // switch
-  GenerateBuilderFieldParsingCases(printer);
-  printer->Outdent();  // switch
-  printer->Outdent();  // while
-  printer->Outdent();  // try
-  printer->Outdent();  // method
-  printer->Print(
-      "        default: {\n"
-      "          if (!super.parseUnknownField(input, extensionRegistry, tag)) "
-      "{\n"
-      "            done = true; // was an endgroup tag\n"
-      "          }\n"
-      "          break;\n"
-      "        } // default:\n"
-      "      } // switch (tag)\n"
-      "    } // while (!done)\n"
-      "  } catch (com.google.protobuf.InvalidProtocolBufferException e) {\n"
-      "    throw e.unwrapIOException();\n"
-      "  } finally {\n"
-      "    onChanged();\n"
-      "  } // finally\n"
-      "  return this;\n"
-      "}\n");
-}
-
-void MessageBuilderGenerator::GenerateBuilderFieldParsingCases(
-    io::Printer* printer) {
-  std::unique_ptr<const FieldDescriptor*[]> sorted_fields(
-      SortFieldsByNumber(descriptor_));
-  for (int i = 0; i < descriptor_->field_count(); i++) {
-    const FieldDescriptor* field = sorted_fields[i];
-    GenerateBuilderFieldParsingCase(printer, field);
-    if (field->is_packable()) {
-      GenerateBuilderPackedFieldParsingCase(printer, field);
-    }
-  }
-}
-
-void MessageBuilderGenerator::GenerateBuilderFieldParsingCase(
-    io::Printer* printer, const FieldDescriptor* field) {
-  uint32_t tag = WireFormatLite::MakeTag(
-      field->number(), WireFormat::WireTypeForFieldType(field->type()));
-  std::string tagString = StrCat(static_cast<int32_t>(tag));
-  printer->Print("case $tag$: {\n", "tag", tagString);
-  printer->Indent();
-
-  field_generators_.get(field).GenerateBuilderParsingCode(printer);
-
-  printer->Outdent();
-  printer->Print(
-      "  break;\n"
-      "} // case $tag$\n",
-      "tag", tagString);
-}
-
-void MessageBuilderGenerator::GenerateBuilderPackedFieldParsingCase(
-    io::Printer* printer, const FieldDescriptor* field) {
-  // To make packed = true wire compatible, we generate parsing code from a
-  // packed version of this field regardless of field->options().packed().
-  uint32_t tag = WireFormatLite::MakeTag(
-      field->number(), WireFormatLite::WIRETYPE_LENGTH_DELIMITED);
-  std::string tagString = StrCat(static_cast<int32_t>(tag));
-  printer->Print("case $tag$: {\n", "tag", tagString);
-  printer->Indent();
-
-  field_generators_.get(field).GenerateBuilderParsingCodeFromPacked(printer);
-
-  printer->Outdent();
-  printer->Print(
-      "  break;\n"
-      "} // case $tag$\n",
-      "tag", tagString);
-}
-
-// ===================================================================
-
-void MessageBuilderGenerator::GenerateIsInitialized(io::Printer* printer) {
-  printer->Print(
-      "@java.lang.Override\n"
-      "public final boolean isInitialized() {\n");
-  printer->Indent();
-
-  // Check that all required fields in this message are set.
-  // TODO(kenton):  We can optimize this when we switch to putting all the
-  //   "has" fields into a single bitfield.
-  for (int i = 0; i < descriptor_->field_count(); i++) {
-    const FieldDescriptor* field = descriptor_->field(i);
-    const FieldGeneratorInfo* info = context_->GetFieldGeneratorInfo(field);
-
-    if (field->is_required()) {
-      printer->Print(
-          "if (!has$name$()) {\n"
-          "  return false;\n"
-          "}\n",
-          "name", info->capitalized_name);
-    }
-  }
-
-  // Now check that all embedded messages are initialized.
-  for (int i = 0; i < descriptor_->field_count(); i++) {
-    const FieldDescriptor* field = descriptor_->field(i);
-    const FieldGeneratorInfo* info = context_->GetFieldGeneratorInfo(field);
-    if (GetJavaType(field) == JAVATYPE_MESSAGE &&
-        HasRequiredFields(field->message_type())) {
-      switch (field->label()) {
-        case FieldDescriptor::LABEL_REQUIRED:
-          printer->Print(
-              "if (!get$name$().isInitialized()) {\n"
-              "  return false;\n"
-              "}\n",
-              "type",
-              name_resolver_->GetImmutableClassName(field->message_type()),
-              "name", info->capitalized_name);
-          break;
-        case FieldDescriptor::LABEL_OPTIONAL:
-          printer->Print(
-              "if (has$name$()) {\n"
-              "  if (!get$name$().isInitialized()) {\n"
-              "    return false;\n"
-              "  }\n"
-              "}\n",
-              "name", info->capitalized_name);
-          break;
-        case FieldDescriptor::LABEL_REPEATED:
-          if (IsMapEntry(field->message_type())) {
-            printer->Print(
-                "for ($type$ item : get$name$Map().values()) {\n"
-                "  if (!item.isInitialized()) {\n"
-                "    return false;\n"
-                "  }\n"
-                "}\n",
-                "type",
-                MapValueImmutableClassdName(field->message_type(),
-                                            name_resolver_),
-                "name", info->capitalized_name);
-          } else {
-            printer->Print(
-                "for (int i = 0; i < get$name$Count(); i++) {\n"
-                "  if (!get$name$(i).isInitialized()) {\n"
-                "    return false;\n"
-                "  }\n"
-                "}\n",
-                "type",
-                name_resolver_->GetImmutableClassName(field->message_type()),
-                "name", info->capitalized_name);
-          }
-          break;
-      }
-    }
-  }
-
-  if (descriptor_->extension_range_count() > 0) {
-    printer->Print(
-        "if (!extensionsAreInitialized()) {\n"
-        "  return false;\n"
-        "}\n");
-  }
-
-  printer->Outdent();
-
-  printer->Print(
-      "  return true;\n"
-      "}\n"
-      "\n");
-}
-
-// ===================================================================
-
-}  // namespace java
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#include "google/protobuf/port_undef.inc"
diff --git a/libs/protobuf/src/google/protobuf/compiler/java/message_builder.h b/libs/protobuf/src/google/protobuf/compiler/java/message_builder.h
deleted file mode 100644
index 4b1cc7e..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/java/message_builder.h
+++ /dev/null
@@ -1,100 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: dweis@google.com (Daniel Weis)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-
-#ifndef GOOGLE_PROTOBUF_COMPILER_JAVA_MESSAGE_BUILDER_H__
-#define GOOGLE_PROTOBUF_COMPILER_JAVA_MESSAGE_BUILDER_H__
-
-#include <map>
-#include <string>
-
-#include <google/protobuf/compiler/java/field.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace java {
-class Context;            // context.h
-class ClassNameResolver;  // name_resolver.h
-}  // namespace java
-}  // namespace compiler
-namespace io {
-class Printer;  // printer.h
-}
-}  // namespace protobuf
-}  // namespace google
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace java {
-
-class MessageBuilderGenerator {
- public:
-  explicit MessageBuilderGenerator(const Descriptor* descriptor,
-                                   Context* context);
-  virtual ~MessageBuilderGenerator();
-
-  virtual void Generate(io::Printer* printer);
-
- private:
-  void GenerateCommonBuilderMethods(io::Printer* printer);
-  void GenerateBuildPartial(io::Printer* printer);
-  int GenerateBuildPartialPiece(io::Printer* printer, int piece,
-                                int first_field);
-  int GenerateBuildPartialPieceWithoutPresence(io::Printer* printer, int piece,
-                                               int first_field);
-  void GenerateDescriptorMethods(io::Printer* printer);
-  void GenerateBuilderParsingMethods(io::Printer* printer);
-  void GenerateBuilderFieldParsingCases(io::Printer* printer);
-  void GenerateBuilderFieldParsingCase(io::Printer* printer,
-                                       const FieldDescriptor* field);
-  void GenerateBuilderPackedFieldParsingCase(io::Printer* printer,
-                                             const FieldDescriptor* field);
-  void GenerateIsInitialized(io::Printer* printer);
-
-  const Descriptor* descriptor_;
-  Context* context_;
-  ClassNameResolver* name_resolver_;
-  FieldGeneratorMap<ImmutableFieldGenerator> field_generators_;
-  std::set<const OneofDescriptor*> oneofs_;
-
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(MessageBuilderGenerator);
-};
-
-}  // namespace java
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // GOOGLE_PROTOBUF_COMPILER_JAVA_MESSAGE_BUILDER_H__
diff --git a/libs/protobuf/src/google/protobuf/compiler/java/message_builder_lite.cc b/libs/protobuf/src/google/protobuf/compiler/java/message_builder_lite.cc
deleted file mode 100644
index 526f949..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/java/message_builder_lite.cc
+++ /dev/null
@@ -1,156 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: dweis@google.com (Daniel Weis)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-
-#include <google/protobuf/compiler/java/message_builder_lite.h>
-
-#include <algorithm>
-#include <map>
-#include <memory>
-#include <vector>
-
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/io/printer.h>
-#include <google/protobuf/wire_format.h>
-#include <google/protobuf/stubs/strutil.h>
-#include <google/protobuf/stubs/substitute.h>
-#include <google/protobuf/compiler/java/context.h>
-#include <google/protobuf/compiler/java/doc_comment.h>
-#include <google/protobuf/compiler/java/enum.h>
-#include <google/protobuf/compiler/java/extension.h>
-#include <google/protobuf/compiler/java/generator_factory.h>
-#include <google/protobuf/compiler/java/helpers.h>
-#include <google/protobuf/compiler/java/name_resolver.h>
-#include <google/protobuf/descriptor.pb.h>
-
-// Must be last.
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace java {
-
-MessageBuilderLiteGenerator::MessageBuilderLiteGenerator(
-    const Descriptor* descriptor, Context* context)
-    : descriptor_(descriptor),
-      context_(context),
-      name_resolver_(context->GetNameResolver()),
-      field_generators_(descriptor, context_) {
-  GOOGLE_CHECK(!HasDescriptorMethods(descriptor->file(), context->EnforceLite()))
-      << "Generator factory error: A lite message generator is used to "
-         "generate non-lite messages.";
-  for (int i = 0; i < descriptor_->field_count(); i++) {
-    if (IsRealOneof(descriptor_->field(i))) {
-      oneofs_.insert(descriptor_->field(i)->containing_oneof());
-    }
-  }
-}
-
-MessageBuilderLiteGenerator::~MessageBuilderLiteGenerator() {}
-
-void MessageBuilderLiteGenerator::Generate(io::Printer* printer) {
-  WriteMessageDocComment(printer, descriptor_);
-  printer->Print(
-      "public static final class Builder extends\n"
-      "    com.google.protobuf.GeneratedMessageLite.$extendible$Builder<\n"
-      "      $classname$, Builder> implements\n"
-      "    $extra_interfaces$\n"
-      "    $classname$OrBuilder {\n",
-      "classname", name_resolver_->GetImmutableClassName(descriptor_),
-      "extra_interfaces", ExtraBuilderInterfaces(descriptor_), "extendible",
-      descriptor_->extension_range_count() > 0 ? "Extendable" : "");
-  printer->Indent();
-
-  GenerateCommonBuilderMethods(printer);
-
-  // oneof
-  std::map<std::string, std::string> vars;
-  for (auto oneof : oneofs_) {
-    vars["oneof_name"] = context_->GetOneofGeneratorInfo(oneof)->name;
-    vars["oneof_capitalized_name"] =
-        context_->GetOneofGeneratorInfo(oneof)->capitalized_name;
-    vars["oneof_index"] = StrCat(oneof->index());
-
-    // oneofCase() and clearOneof()
-    printer->Print(vars,
-                   "@java.lang.Override\n"
-                   "public $oneof_capitalized_name$Case\n"
-                   "    get$oneof_capitalized_name$Case() {\n"
-                   "  return instance.get$oneof_capitalized_name$Case();\n"
-                   "}\n"
-                   "\n"
-                   "public Builder clear$oneof_capitalized_name$() {\n"
-                   "  copyOnWrite();\n"
-                   "  instance.clear$oneof_capitalized_name$();\n"
-                   "  return this;\n"
-                   "}\n"
-                   "\n");
-  }
-
-  for (int i = 0; i < descriptor_->field_count(); i++) {
-    printer->Print("\n");
-    field_generators_.get(descriptor_->field(i))
-        .GenerateBuilderMembers(printer);
-  }
-
-  printer->Print(
-      "\n"
-      "// @@protoc_insertion_point(builder_scope:$full_name$)\n",
-      "full_name", descriptor_->full_name());
-
-  printer->Outdent();
-  printer->Print("}\n");
-}
-
-// ===================================================================
-
-void MessageBuilderLiteGenerator::GenerateCommonBuilderMethods(
-    io::Printer* printer) {
-  printer->Print(
-      "// Construct using $classname$.newBuilder()\n"
-      "private Builder() {\n"
-      "  super(DEFAULT_INSTANCE);\n"
-      "}\n"
-      "\n",
-      "classname", name_resolver_->GetImmutableClassName(descriptor_));
-}
-
-// ===================================================================
-
-}  // namespace java
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
diff --git a/libs/protobuf/src/google/protobuf/compiler/java/message_builder_lite.h b/libs/protobuf/src/google/protobuf/compiler/java/message_builder_lite.h
deleted file mode 100644
index 0d895fc..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/java/message_builder_lite.h
+++ /dev/null
@@ -1,87 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: dweis@google.com (Daniel Weis)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-
-#ifndef GOOGLE_PROTOBUF_COMPILER_JAVA_MESSAGE_BUILDER_LITE_H__
-#define GOOGLE_PROTOBUF_COMPILER_JAVA_MESSAGE_BUILDER_LITE_H__
-
-#include <map>
-#include <string>
-
-#include <google/protobuf/compiler/java/field.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace java {
-class Context;            // context.h
-class ClassNameResolver;  // name_resolver.h
-}  // namespace java
-}  // namespace compiler
-namespace io {
-class Printer;  // printer.h
-}
-}  // namespace protobuf
-}  // namespace google
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace java {
-
-class MessageBuilderLiteGenerator {
- public:
-  explicit MessageBuilderLiteGenerator(const Descriptor* descriptor,
-                                       Context* context);
-  virtual ~MessageBuilderLiteGenerator();
-
-  virtual void Generate(io::Printer* printer);
-
- private:
-  void GenerateCommonBuilderMethods(io::Printer* printer);
-
-  const Descriptor* descriptor_;
-  Context* context_;
-  ClassNameResolver* name_resolver_;
-  FieldGeneratorMap<ImmutableFieldLiteGenerator> field_generators_;
-  std::set<const OneofDescriptor*> oneofs_;
-
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(MessageBuilderLiteGenerator);
-};
-
-}  // namespace java
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // GOOGLE_PROTOBUF_COMPILER_JAVA_MESSAGE_BUILDER_LITE_H__
diff --git a/libs/protobuf/src/google/protobuf/compiler/java/message_field.cc b/libs/protobuf/src/google/protobuf/compiler/java/message_field.cc
deleted file mode 100644
index 5093be4..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/java/message_field.cc
+++ /dev/null
@@ -1,1452 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-
-#include "google/protobuf/compiler/java/message_field.h"
-
-#include <map>
-#include <string>
-
-#include "google/protobuf/io/printer.h"
-#include "google/protobuf/wire_format.h"
-#include "google/protobuf/stubs/strutil.h"
-#include "google/protobuf/compiler/java/context.h"
-#include "google/protobuf/compiler/java/doc_comment.h"
-#include "google/protobuf/compiler/java/helpers.h"
-#include "google/protobuf/compiler/java/name_resolver.h"
-
-// Must be last.
-#include "google/protobuf/port_def.inc"
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace java {
-
-
-namespace {
-
-void SetMessageVariables(
-    const FieldDescriptor* descriptor, int messageBitIndex, int builderBitIndex,
-    const FieldGeneratorInfo* info, ClassNameResolver* name_resolver,
-    std::map<std::string, std::string>* variables,
-    Context* context) {
-  SetCommonFieldVariables(descriptor, info, variables);
-
-  (*variables)["type"] =
-      name_resolver->GetImmutableClassName(descriptor->message_type());
-  (*variables)["kt_type"] = (*variables)["type"];
-  (*variables)["mutable_type"] =
-      name_resolver->GetMutableClassName(descriptor->message_type());
-  (*variables)["group_or_message"] =
-      (GetType(descriptor) == FieldDescriptor::TYPE_GROUP) ? "Group"
-                                                           : "Message";
-  // TODO(birdo): Add @deprecated javadoc when generating javadoc is supported
-  // by the proto compiler
-  (*variables)["deprecation"] =
-      descriptor->options().deprecated() ? "@java.lang.Deprecated " : "";
-  variables->insert(
-      {"kt_deprecation",
-       descriptor->options().deprecated()
-           ? StrCat("@kotlin.Deprecated(message = \"Field ",
-                          (*variables)["name"], " is deprecated\") ")
-           : ""});
-  (*variables)["on_changed"] = "onChanged();";
-  (*variables)["ver"] = GeneratedCodeVersionSuffix();
-  (*variables)["get_parser"] =
-      ExposePublicParser(descriptor->message_type()->file()) ? "PARSER"
-                                                             : "parser()";
-
-  if (HasHasbit(descriptor)) {
-    // For singular messages and builders, one bit is used for the hasField bit.
-    (*variables)["get_has_field_bit_message"] = GenerateGetBit(messageBitIndex);
-
-    // Note that these have a trailing ";".
-    (*variables)["set_has_field_bit_to_local"] =
-        GenerateSetBitToLocal(messageBitIndex);
-
-    (*variables)["is_field_present_message"] = GenerateGetBit(messageBitIndex);
-  } else {
-    (*variables)["set_has_field_bit_to_local"] = "";
-    variables->insert({"is_field_present_message",
-                       StrCat((*variables)["name"], "_ != null")});
-  }
-
-  // For repeated builders, one bit is used for whether the array is immutable.
-  (*variables)["get_mutable_bit_builder"] = GenerateGetBit(builderBitIndex);
-  (*variables)["set_mutable_bit_builder"] = GenerateSetBit(builderBitIndex);
-  (*variables)["clear_mutable_bit_builder"] = GenerateClearBit(builderBitIndex);
-
-  (*variables)["get_has_field_bit_builder"] = GenerateGetBit(builderBitIndex);
-  (*variables)["set_has_field_bit_builder"] =
-      GenerateSetBit(builderBitIndex) + ";";
-  (*variables)["clear_has_field_bit_builder"] =
-      GenerateClearBit(builderBitIndex) + ";";
-  (*variables)["get_has_field_bit_from_local"] =
-      GenerateGetBitFromLocal(builderBitIndex);
-}
-
-}  // namespace
-
-// ===================================================================
-
-ImmutableMessageFieldGenerator::ImmutableMessageFieldGenerator(
-    const FieldDescriptor* descriptor, int messageBitIndex, int builderBitIndex,
-    Context* context)
-    : descriptor_(descriptor),
-      message_bit_index_(messageBitIndex),
-      builder_bit_index_(builderBitIndex),
-      name_resolver_(context->GetNameResolver()),
-      context_(context) {
-  SetMessageVariables(descriptor, messageBitIndex, builderBitIndex,
-                      context->GetFieldGeneratorInfo(descriptor),
-                      name_resolver_, &variables_, context);
-}
-
-ImmutableMessageFieldGenerator::~ImmutableMessageFieldGenerator() {}
-
-int ImmutableMessageFieldGenerator::GetMessageBitIndex() const {
-  return message_bit_index_;
-}
-
-int ImmutableMessageFieldGenerator::GetBuilderBitIndex() const {
-  return builder_bit_index_;
-}
-
-int ImmutableMessageFieldGenerator::GetNumBitsForMessage() const {
-  return HasHasbit(descriptor_) ? 1 : 0;
-}
-
-int ImmutableMessageFieldGenerator::GetNumBitsForBuilder() const { return 1; }
-
-void ImmutableMessageFieldGenerator::GenerateInterfaceMembers(
-    io::Printer* printer) const {
-  // TODO(jonp): In the future, consider having a method specific to the
-  // interface so that builders can choose dynamically to either return a
-  // message or a nested builder, so that asking for the interface doesn't
-  // cause a message to ever be built.
-  WriteFieldAccessorDocComment(printer, descriptor_, HAZZER);
-  printer->Print(variables_, "$deprecation$boolean has$capitalized_name$();\n");
-  WriteFieldAccessorDocComment(printer, descriptor_, GETTER);
-  printer->Print(variables_, "$deprecation$$type$ get$capitalized_name$();\n");
-
-  WriteFieldDocComment(printer, descriptor_);
-  printer->Print(
-      variables_,
-      "$deprecation$$type$OrBuilder get$capitalized_name$OrBuilder();\n");
-}
-
-void ImmutableMessageFieldGenerator::GenerateMembers(
-    io::Printer* printer) const {
-  printer->Print(variables_, "private $type$ $name$_;\n");
-  PrintExtraFieldInfo(variables_, printer);
-
-  if (HasHasbit(descriptor_)) {
-    WriteFieldAccessorDocComment(printer, descriptor_, HAZZER);
-    printer->Print(
-        variables_,
-        "@java.lang.Override\n"
-        "$deprecation$public boolean ${$has$capitalized_name$$}$() {\n"
-        "  return $get_has_field_bit_message$;\n"
-        "}\n");
-    printer->Annotate("{", "}", descriptor_);
-  } else {
-    WriteFieldAccessorDocComment(printer, descriptor_, HAZZER);
-    printer->Print(
-        variables_,
-        "@java.lang.Override\n"
-        "$deprecation$public boolean ${$has$capitalized_name$$}$() {\n"
-        "  return $name$_ != null;\n"
-        "}\n");
-    printer->Annotate("{", "}", descriptor_);
-  }
-  WriteFieldAccessorDocComment(printer, descriptor_, GETTER);
-  printer->Print(
-      variables_,
-      "@java.lang.Override\n"
-      "$deprecation$public $type$ ${$get$capitalized_name$$}$() {\n"
-      "  return $name$_ == null ? $type$.getDefaultInstance() : $name$_;\n"
-      "}\n");
-  printer->Annotate("{", "}", descriptor_);
-
-  WriteFieldDocComment(printer, descriptor_);
-  printer->Print(
-      variables_,
-      "@java.lang.Override\n"
-      "$deprecation$public $type$OrBuilder "
-      "${$get$capitalized_name$OrBuilder$}$() {\n"
-      "  return $name$_ == null ? $type$.getDefaultInstance() : $name$_;\n"
-      "}\n");
-  printer->Annotate("{", "}", descriptor_);
-}
-
-void ImmutableMessageFieldGenerator::PrintNestedBuilderCondition(
-    io::Printer* printer, const char* regular_case,
-    const char* nested_builder_case) const {
-  printer->Print(variables_, "if ($name$Builder_ == null) {\n");
-  printer->Indent();
-  printer->Print(variables_, regular_case);
-  printer->Outdent();
-  printer->Print("} else {\n");
-  printer->Indent();
-  printer->Print(variables_, nested_builder_case);
-  printer->Outdent();
-  printer->Print("}\n");
-}
-
-void ImmutableMessageFieldGenerator::PrintNestedBuilderFunction(
-    io::Printer* printer, const char* method_prototype,
-    const char* regular_case, const char* nested_builder_case,
-    const char* trailing_code) const {
-  printer->Print(variables_, method_prototype);
-  printer->Annotate("{", "}", descriptor_);
-  printer->Print(" {\n");
-  printer->Indent();
-  PrintNestedBuilderCondition(printer, regular_case, nested_builder_case);
-  if (trailing_code != NULL) {
-    printer->Print(variables_, trailing_code);
-  }
-  printer->Outdent();
-  printer->Print("}\n");
-}
-
-void ImmutableMessageFieldGenerator::GenerateBuilderMembers(
-    io::Printer* printer) const {
-  // When using nested-builders, the code initially works just like the
-  // non-nested builder case. It only creates a nested builder lazily on
-  // demand and then forever delegates to it after creation.
-  printer->Print(variables_, "private $type$ $name$_;\n");
-
-  printer->Print(variables_,
-                 // If this builder is non-null, it is used and the other fields
-                 // are ignored.
-                 "private com.google.protobuf.SingleFieldBuilder$ver$<\n"
-                 "    $type$, $type$.Builder, $type$OrBuilder> $name$Builder_;"
-                 "\n");
-
-  // The comments above the methods below are based on a hypothetical
-  // field of type "Field" called "Field".
-
-  // boolean hasField()
-  WriteFieldAccessorDocComment(printer, descriptor_, HAZZER);
-  printer->Print(variables_,
-                 "$deprecation$public boolean ${$has$capitalized_name$$}$() {\n"
-                 "  return $get_has_field_bit_builder$;\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-
-  // Field getField()
-  WriteFieldAccessorDocComment(printer, descriptor_, GETTER);
-  PrintNestedBuilderFunction(
-      printer, "$deprecation$public $type$ ${$get$capitalized_name$$}$()",
-      "return $name$_ == null ? $type$.getDefaultInstance() : $name$_;\n",
-      "return $name$Builder_.getMessage();\n", NULL);
-
-  // Field.Builder setField(Field value)
-  WriteFieldDocComment(printer, descriptor_);
-  PrintNestedBuilderFunction(
-      printer,
-      "$deprecation$public Builder ${$set$capitalized_name$$}$($type$ value)",
-
-      "if (value == null) {\n"
-      "  throw new NullPointerException();\n"
-      "}\n"
-      "$name$_ = value;\n",
-
-      "$name$Builder_.setMessage(value);\n",
-
-      "$set_has_field_bit_builder$\n"
-      "$on_changed$\n"
-      "return this;\n");
-
-  // Field.Builder setField(Field.Builder builderForValue)
-  WriteFieldDocComment(printer, descriptor_);
-  PrintNestedBuilderFunction(
-      printer,
-      "$deprecation$public Builder ${$set$capitalized_name$$}$(\n"
-      "    $type$.Builder builderForValue)",
-
-      "$name$_ = builderForValue.build();\n",
-
-      "$name$Builder_.setMessage(builderForValue.build());\n",
-
-      "$set_has_field_bit_builder$\n"
-      "$on_changed$\n"
-      "return this;\n");
-
-  // Message.Builder mergeField(Field value)
-  WriteFieldDocComment(printer, descriptor_);
-  PrintNestedBuilderFunction(
-      printer,
-      "$deprecation$public Builder ${$merge$capitalized_name$$}$($type$ value)",
-      "if ($get_has_field_bit_builder$ &&\n"
-      "  $name$_ != null &&\n"
-      "  $name$_ != $type$.getDefaultInstance()) {\n"
-      "  get$capitalized_name$Builder().mergeFrom(value);\n"
-      "} else {\n"
-      "  $name$_ = value;\n"
-      "}\n",
-
-      "$name$Builder_.mergeFrom(value);\n",
-
-      "$set_has_field_bit_builder$\n"
-      "$on_changed$\n"
-      "return this;\n");
-
-  // Message.Builder clearField()
-  WriteFieldDocComment(printer, descriptor_);
-  printer->Print(variables_,
-                 "$deprecation$public Builder clear$capitalized_name$() {\n"
-                 "  $clear_has_field_bit_builder$\n"
-                 "  $name$_ = null;\n"
-                 "  if ($name$Builder_ != null) {\n"
-                 "    $name$Builder_.dispose();\n"
-                 "    $name$Builder_ = null;\n"
-                 "  }\n"
-                 "  $on_changed$\n"
-                 "  return this;\n"
-                 "}\n");
-
-  // Field.Builder getFieldBuilder()
-  WriteFieldDocComment(printer, descriptor_);
-  printer->Print(variables_,
-                 "$deprecation$public $type$.Builder "
-                 "${$get$capitalized_name$Builder$}$() {\n"
-                 "  $set_has_field_bit_builder$\n"
-                 "  $on_changed$\n"
-                 "  return get$capitalized_name$FieldBuilder().getBuilder();\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-
-  // FieldOrBuilder getFieldOrBuilder()
-  WriteFieldDocComment(printer, descriptor_);
-  printer->Print(variables_,
-                 "$deprecation$public $type$OrBuilder "
-                 "${$get$capitalized_name$OrBuilder$}$() {\n"
-                 "  if ($name$Builder_ != null) {\n"
-                 "    return $name$Builder_.getMessageOrBuilder();\n"
-                 "  } else {\n"
-                 "    return $name$_ == null ?\n"
-                 "        $type$.getDefaultInstance() : $name$_;\n"
-                 "  }\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-
-  // SingleFieldBuilder getFieldFieldBuilder
-  WriteFieldDocComment(printer, descriptor_);
-  printer->Print(
-      variables_,
-      "private com.google.protobuf.SingleFieldBuilder$ver$<\n"
-      "    $type$, $type$.Builder, $type$OrBuilder> \n"
-      "    get$capitalized_name$FieldBuilder() {\n"
-      "  if ($name$Builder_ == null) {\n"
-      "    $name$Builder_ = new com.google.protobuf.SingleFieldBuilder$ver$<\n"
-      "        $type$, $type$.Builder, $type$OrBuilder>(\n"
-      "            get$capitalized_name$(),\n"
-      "            getParentForChildren(),\n"
-      "            isClean());\n"
-      "    $name$_ = null;\n"
-      "  }\n"
-      "  return $name$Builder_;\n"
-      "}\n");
-}
-
-void ImmutableMessageFieldGenerator::GenerateKotlinDslMembers(
-    io::Printer* printer) const {
-  WriteFieldDocComment(printer, descriptor_);
-  printer->Print(variables_,
-                 "$kt_deprecation$public var $kt_name$: $kt_type$\n"
-                 "  @JvmName(\"${$get$kt_capitalized_name$$}$\")\n"
-                 "  get() = $kt_dsl_builder$.${$get$capitalized_name$$}$()\n"
-                 "  @JvmName(\"${$set$kt_capitalized_name$$}$\")\n"
-                 "  set(value) {\n"
-                 "    $kt_dsl_builder$.${$set$capitalized_name$$}$(value)\n"
-                 "  }\n");
-
-  WriteFieldAccessorDocComment(printer, descriptor_, CLEARER,
-                               /* builder */ false);
-  printer->Print(variables_,
-                 "public fun ${$clear$kt_capitalized_name$$}$() {\n"
-                 "  $kt_dsl_builder$.${$clear$capitalized_name$$}$()\n"
-                 "}\n");
-
-  WriteFieldAccessorDocComment(printer, descriptor_, HAZZER);
-  printer->Print(
-      variables_,
-      "public fun ${$has$kt_capitalized_name$$}$(): kotlin.Boolean {\n"
-      "  return $kt_dsl_builder$.${$has$capitalized_name$$}$()\n"
-      "}\n");
-
-  GenerateKotlinOrNull(printer);
-}
-
-void ImmutableMessageFieldGenerator::GenerateKotlinOrNull(io::Printer* printer) const {
-  if (descriptor_->has_optional_keyword()) {
-    printer->Print(variables_,
-                   "public val $classname$Kt.Dsl.$name$OrNull: $kt_type$?\n"
-                   "  get() = $kt_dsl_builder$.$name$OrNull\n");
-  }
-}
-
-void ImmutableMessageFieldGenerator::GenerateFieldBuilderInitializationCode(
-    io::Printer* printer) const {
-  printer->Print(variables_, "get$capitalized_name$FieldBuilder();\n");
-}
-
-void ImmutableMessageFieldGenerator::GenerateInitializationCode(
-    io::Printer* printer) const {}
-
-void ImmutableMessageFieldGenerator::GenerateBuilderClearCode(
-    io::Printer* printer) const {
-  // No need to clear the has-bit since we clear the bitField ints all at once.
-  printer->Print(variables_,
-                 "$name$_ = null;\n"
-                 "if ($name$Builder_ != null) {\n"
-                 "  $name$Builder_.dispose();\n"
-                 "  $name$Builder_ = null;\n"
-                 "}\n");
-}
-
-void ImmutableMessageFieldGenerator::GenerateMergingCode(
-    io::Printer* printer) const {
-  printer->Print(variables_,
-                 "if (other.has$capitalized_name$()) {\n"
-                 "  merge$capitalized_name$(other.get$capitalized_name$());\n"
-                 "}\n");
-}
-
-void ImmutableMessageFieldGenerator::GenerateBuildingCode(
-    io::Printer* printer) const {
-  printer->Print(variables_,
-                 "if ($get_has_field_bit_from_local$) {\n"
-                 "  result.$name$_ = $name$Builder_ == null\n"
-                 "      ? $name$_\n"
-                 "      : $name$Builder_.build();\n");
-  if (GetNumBitsForMessage() > 0) {
-    printer->Print(variables_, "  $set_has_field_bit_to_local$;\n");
-  }
-  printer->Print("}\n");
-}
-
-void ImmutableMessageFieldGenerator::GenerateBuilderParsingCode(
-    io::Printer* printer) const {
-  if (GetType(descriptor_) == FieldDescriptor::TYPE_GROUP) {
-    printer->Print(variables_,
-                   "input.readGroup($number$,\n"
-                   "    get$capitalized_name$FieldBuilder().getBuilder(),\n"
-                   "    extensionRegistry);\n"
-                   "$set_has_field_bit_builder$\n");
-  } else {
-    printer->Print(variables_,
-                   "input.readMessage(\n"
-                   "    get$capitalized_name$FieldBuilder().getBuilder(),\n"
-                   "    extensionRegistry);\n"
-                   "$set_has_field_bit_builder$\n");
-  }
-}
-
-void ImmutableMessageFieldGenerator::GenerateSerializationCode(
-    io::Printer* printer) const {
-  printer->Print(
-      variables_,
-      "if ($is_field_present_message$) {\n"
-      "  output.write$group_or_message$($number$, get$capitalized_name$());\n"
-      "}\n");
-}
-
-void ImmutableMessageFieldGenerator::GenerateSerializedSizeCode(
-    io::Printer* printer) const {
-  printer->Print(
-      variables_,
-      "if ($is_field_present_message$) {\n"
-      "  size += com.google.protobuf.CodedOutputStream\n"
-      "    .compute$group_or_message$Size($number$, get$capitalized_name$());\n"
-      "}\n");
-}
-
-void ImmutableMessageFieldGenerator::GenerateEqualsCode(
-    io::Printer* printer) const {
-  printer->Print(variables_,
-                 "if (!get$capitalized_name$()\n"
-                 "    .equals(other.get$capitalized_name$())) return false;\n");
-}
-
-void ImmutableMessageFieldGenerator::GenerateHashCode(
-    io::Printer* printer) const {
-  printer->Print(variables_,
-                 "hash = (37 * hash) + $constant_name$;\n"
-                 "hash = (53 * hash) + get$capitalized_name$().hashCode();\n");
-}
-
-std::string ImmutableMessageFieldGenerator::GetBoxedType() const {
-  return name_resolver_->GetImmutableClassName(descriptor_->message_type());
-}
-
-// ===================================================================
-
-ImmutableMessageOneofFieldGenerator::ImmutableMessageOneofFieldGenerator(
-    const FieldDescriptor* descriptor, int messageBitIndex, int builderBitIndex,
-    Context* context)
-    : ImmutableMessageFieldGenerator(descriptor, messageBitIndex,
-                                     builderBitIndex, context) {
-  const OneofGeneratorInfo* info =
-      context->GetOneofGeneratorInfo(descriptor->containing_oneof());
-  SetCommonOneofVariables(descriptor, info, &variables_);
-}
-
-ImmutableMessageOneofFieldGenerator::~ImmutableMessageOneofFieldGenerator() {}
-
-void ImmutableMessageOneofFieldGenerator::GenerateMembers(
-    io::Printer* printer) const {
-  PrintExtraFieldInfo(variables_, printer);
-  WriteFieldAccessorDocComment(printer, descriptor_, HAZZER);
-  printer->Print(variables_,
-                 "@java.lang.Override\n"
-                 "$deprecation$public boolean ${$has$capitalized_name$$}$() {\n"
-                 "  return $has_oneof_case_message$;\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-
-  WriteFieldAccessorDocComment(printer, descriptor_, GETTER);
-  printer->Print(variables_,
-                 "@java.lang.Override\n"
-                 "$deprecation$public $type$ ${$get$capitalized_name$$}$() {\n"
-                 "  if ($has_oneof_case_message$) {\n"
-                 "     return ($type$) $oneof_name$_;\n"
-                 "  }\n"
-                 "  return $type$.getDefaultInstance();\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-
-  WriteFieldDocComment(printer, descriptor_);
-  printer->Print(variables_,
-                 "@java.lang.Override\n"
-                 "$deprecation$public $type$OrBuilder "
-                 "${$get$capitalized_name$OrBuilder$}$() {\n"
-                 "  if ($has_oneof_case_message$) {\n"
-                 "     return ($type$) $oneof_name$_;\n"
-                 "  }\n"
-                 "  return $type$.getDefaultInstance();\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-}
-
-void ImmutableMessageOneofFieldGenerator::GenerateBuilderMembers(
-    io::Printer* printer) const {
-  // When using nested-builders, the code initially works just like the
-  // non-nested builder case. It only creates a nested builder lazily on
-  // demand and then forever delegates to it after creation.
-  printer->Print(variables_,
-                 // If this builder is non-null, it is used and the other fields
-                 // are ignored.
-                 "private com.google.protobuf.SingleFieldBuilder$ver$<\n"
-                 "    $type$, $type$.Builder, $type$OrBuilder> $name$Builder_;"
-                 "\n");
-
-  // The comments above the methods below are based on a hypothetical
-  // field of type "Field" called "Field".
-
-  // boolean hasField()
-  WriteFieldAccessorDocComment(printer, descriptor_, HAZZER);
-  printer->Print(variables_,
-                 "@java.lang.Override\n"
-                 "$deprecation$public boolean ${$has$capitalized_name$$}$() {\n"
-                 "  return $has_oneof_case_message$;\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-
-  // Field getField()
-  WriteFieldAccessorDocComment(printer, descriptor_, GETTER);
-  PrintNestedBuilderFunction(
-      printer,
-      "@java.lang.Override\n"
-      "$deprecation$public $type$ ${$get$capitalized_name$$}$()",
-
-      "if ($has_oneof_case_message$) {\n"
-      "  return ($type$) $oneof_name$_;\n"
-      "}\n"
-      "return $type$.getDefaultInstance();\n",
-
-      "if ($has_oneof_case_message$) {\n"
-      "  return $name$Builder_.getMessage();\n"
-      "}\n"
-      "return $type$.getDefaultInstance();\n",
-
-      NULL);
-
-  // Field.Builder setField(Field value)
-  WriteFieldDocComment(printer, descriptor_);
-  PrintNestedBuilderFunction(
-      printer,
-      "$deprecation$public Builder ${$set$capitalized_name$$}$($type$ value)",
-
-      "if (value == null) {\n"
-      "  throw new NullPointerException();\n"
-      "}\n"
-      "$oneof_name$_ = value;\n"
-      "$on_changed$\n",
-
-      "$name$Builder_.setMessage(value);\n",
-
-      "$set_oneof_case_message$;\n"
-      "return this;\n");
-
-  // Field.Builder setField(Field.Builder builderForValue)
-  WriteFieldDocComment(printer, descriptor_);
-  PrintNestedBuilderFunction(
-      printer,
-      "$deprecation$public Builder ${$set$capitalized_name$$}$(\n"
-      "    $type$.Builder builderForValue)",
-
-      "$oneof_name$_ = builderForValue.build();\n"
-      "$on_changed$\n",
-
-      "$name$Builder_.setMessage(builderForValue.build());\n",
-
-      "$set_oneof_case_message$;\n"
-      "return this;\n");
-
-  // Field.Builder mergeField(Field value)
-  WriteFieldDocComment(printer, descriptor_);
-  PrintNestedBuilderFunction(
-      printer,
-      "$deprecation$public Builder ${$merge$capitalized_name$$}$($type$ value)",
-
-      "if ($has_oneof_case_message$ &&\n"
-      "    $oneof_name$_ != $type$.getDefaultInstance()) {\n"
-      "  $oneof_name$_ = $type$.newBuilder(($type$) $oneof_name$_)\n"
-      "      .mergeFrom(value).buildPartial();\n"
-      "} else {\n"
-      "  $oneof_name$_ = value;\n"
-      "}\n"
-      "$on_changed$\n",
-
-      "if ($has_oneof_case_message$) {\n"
-      "  $name$Builder_.mergeFrom(value);\n"
-      "} else {\n"
-      "  $name$Builder_.setMessage(value);\n"
-      "}\n",
-
-      "$set_oneof_case_message$;\n"
-      "return this;\n");
-
-  // Field.Builder clearField()
-  WriteFieldDocComment(printer, descriptor_);
-  PrintNestedBuilderFunction(
-      printer, "$deprecation$public Builder ${$clear$capitalized_name$$}$()",
-
-      "if ($has_oneof_case_message$) {\n"
-      "  $clear_oneof_case_message$;\n"
-      "  $oneof_name$_ = null;\n"
-      "  $on_changed$\n"
-      "}\n",
-
-      "if ($has_oneof_case_message$) {\n"
-      "  $clear_oneof_case_message$;\n"
-      "  $oneof_name$_ = null;\n"
-      "}\n"
-      "$name$Builder_.clear();\n",
-
-      "return this;\n");
-
-  WriteFieldDocComment(printer, descriptor_);
-  printer->Print(variables_,
-                 "$deprecation$public $type$.Builder "
-                 "${$get$capitalized_name$Builder$}$() {\n"
-                 "  return get$capitalized_name$FieldBuilder().getBuilder();\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-  WriteFieldDocComment(printer, descriptor_);
-  printer->Print(
-      variables_,
-      "@java.lang.Override\n"
-      "$deprecation$public $type$OrBuilder "
-      "${$get$capitalized_name$OrBuilder$}$() {\n"
-      "  if (($has_oneof_case_message$) && ($name$Builder_ != null)) {\n"
-      "    return $name$Builder_.getMessageOrBuilder();\n"
-      "  } else {\n"
-      "    if ($has_oneof_case_message$) {\n"
-      "      return ($type$) $oneof_name$_;\n"
-      "    }\n"
-      "    return $type$.getDefaultInstance();\n"
-      "  }\n"
-      "}\n");
-  printer->Annotate("{", "}", descriptor_);
-  WriteFieldDocComment(printer, descriptor_);
-  printer->Print(
-      variables_,
-      "private com.google.protobuf.SingleFieldBuilder$ver$<\n"
-      "    $type$, $type$.Builder, $type$OrBuilder> \n"
-      "    ${$get$capitalized_name$FieldBuilder$}$() {\n"
-      "  if ($name$Builder_ == null) {\n"
-      "    if (!($has_oneof_case_message$)) {\n"
-      "      $oneof_name$_ = $type$.getDefaultInstance();\n"
-      "    }\n"
-      "    $name$Builder_ = new com.google.protobuf.SingleFieldBuilder$ver$<\n"
-      "        $type$, $type$.Builder, $type$OrBuilder>(\n"
-      "            ($type$) $oneof_name$_,\n"
-      "            getParentForChildren(),\n"
-      "            isClean());\n"
-      "    $oneof_name$_ = null;\n"
-      "  }\n"
-      "  $set_oneof_case_message$;\n"
-      "  $on_changed$\n"
-      "  return $name$Builder_;\n"
-      "}\n");
-  printer->Annotate("{", "}", descriptor_);
-}
-
-void ImmutableMessageOneofFieldGenerator::GenerateBuilderClearCode(
-    io::Printer* printer) const {
-  // Make sure the builder gets cleared.
-  printer->Print(variables_,
-                 "if ($name$Builder_ != null) {\n"
-                 "  $name$Builder_.clear();\n"
-                 "}\n");
-}
-
-void ImmutableMessageOneofFieldGenerator::GenerateBuildingCode(
-    io::Printer* printer) const {
-  printer->Print(variables_,
-                 "if ($has_oneof_case_message$ &&\n"
-                 "    $name$Builder_ != null) {\n"
-                 "  result.$oneof_name$_ = $name$Builder_.build();\n"
-                 "}\n");
-}
-
-void ImmutableMessageOneofFieldGenerator::GenerateMergingCode(
-    io::Printer* printer) const {
-  printer->Print(variables_,
-                 "merge$capitalized_name$(other.get$capitalized_name$());\n");
-}
-
-void ImmutableMessageOneofFieldGenerator::GenerateBuilderParsingCode(
-    io::Printer* printer) const {
-  if (GetType(descriptor_) == FieldDescriptor::TYPE_GROUP) {
-    printer->Print(variables_,
-                   "input.readGroup($number$,\n"
-                   "    get$capitalized_name$FieldBuilder().getBuilder(),\n"
-                   "    extensionRegistry);\n"
-                   "$set_oneof_case_message$;\n");
-  } else {
-    printer->Print(variables_,
-                   "input.readMessage(\n"
-                   "    get$capitalized_name$FieldBuilder().getBuilder(),\n"
-                   "    extensionRegistry);\n"
-                   "$set_oneof_case_message$;\n");
-  }
-}
-
-void ImmutableMessageOneofFieldGenerator::GenerateSerializationCode(
-    io::Printer* printer) const {
-  printer->Print(
-      variables_,
-      "if ($has_oneof_case_message$) {\n"
-      "  output.write$group_or_message$($number$, ($type$) $oneof_name$_);\n"
-      "}\n");
-}
-
-void ImmutableMessageOneofFieldGenerator::GenerateSerializedSizeCode(
-    io::Printer* printer) const {
-  printer->Print(
-      variables_,
-      "if ($has_oneof_case_message$) {\n"
-      "  size += com.google.protobuf.CodedOutputStream\n"
-      "    .compute$group_or_message$Size($number$, ($type$) $oneof_name$_);\n"
-      "}\n");
-}
-
-// ===================================================================
-
-RepeatedImmutableMessageFieldGenerator::RepeatedImmutableMessageFieldGenerator(
-    const FieldDescriptor* descriptor, int messageBitIndex, int builderBitIndex,
-    Context* context)
-    : ImmutableMessageFieldGenerator(descriptor, messageBitIndex,
-                                     builderBitIndex, context) {}
-
-RepeatedImmutableMessageFieldGenerator::
-    ~RepeatedImmutableMessageFieldGenerator() {}
-
-int RepeatedImmutableMessageFieldGenerator::GetNumBitsForMessage() const {
-  return 0;
-}
-
-int RepeatedImmutableMessageFieldGenerator::GetNumBitsForBuilder() const {
-  return 1;
-}
-
-void RepeatedImmutableMessageFieldGenerator::GenerateInterfaceMembers(
-    io::Printer* printer) const {
-  // TODO(jonp): In the future, consider having methods specific to the
-  // interface so that builders can choose dynamically to either return a
-  // message or a nested builder, so that asking for the interface doesn't
-  // cause a message to ever be built.
-  WriteFieldDocComment(printer, descriptor_);
-  printer->Print(variables_,
-                 "$deprecation$java.util.List<$type$> \n"
-                 "    get$capitalized_name$List();\n");
-  WriteFieldDocComment(printer, descriptor_);
-  printer->Print(variables_,
-                 "$deprecation$$type$ get$capitalized_name$(int index);\n");
-  WriteFieldDocComment(printer, descriptor_);
-  printer->Print(variables_,
-                 "$deprecation$int get$capitalized_name$Count();\n");
-
-  WriteFieldDocComment(printer, descriptor_);
-  printer->Print(variables_,
-                 "$deprecation$java.util.List<? extends $type$OrBuilder> \n"
-                 "    get$capitalized_name$OrBuilderList();\n");
-  WriteFieldDocComment(printer, descriptor_);
-  printer->Print(
-      variables_,
-      "$deprecation$$type$OrBuilder get$capitalized_name$OrBuilder(\n"
-      "    int index);\n");
-}
-
-void RepeatedImmutableMessageFieldGenerator::GenerateMembers(
-    io::Printer* printer) const {
-  printer->Print(variables_, "@SuppressWarnings(\"serial\")\n"
-                             "private java.util.List<$type$> $name$_;\n");
-  PrintExtraFieldInfo(variables_, printer);
-  WriteFieldDocComment(printer, descriptor_);
-  printer->Print(variables_,
-                 "@java.lang.Override\n"
-                 "$deprecation$public java.util.List<$type$> "
-                 "${$get$capitalized_name$List$}$() {\n"
-                 "  return $name$_;\n"  // note:  unmodifiable list
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-
-  // List<FieldOrBuilder> getFieldOrBuilderList()
-  WriteFieldDocComment(printer, descriptor_);
-  printer->Print(
-      variables_,
-      "@java.lang.Override\n"
-      "$deprecation$public java.util.List<? extends $type$OrBuilder> \n"
-      "    ${$get$capitalized_name$OrBuilderList$}$() {\n"
-      "  return $name$_;\n"
-      "}\n");
-  printer->Annotate("{", "}", descriptor_);
-
-  // int getFieldCount()
-  WriteFieldDocComment(printer, descriptor_);
-  printer->Print(
-      variables_,
-      "@java.lang.Override\n"
-      "$deprecation$public int ${$get$capitalized_name$Count$}$() {\n"
-      "  return $name$_.size();\n"
-      "}\n");
-  printer->Annotate("{", "}", descriptor_);
-
-  // Field getField(int index)
-  WriteFieldDocComment(printer, descriptor_);
-  printer->Print(
-      variables_,
-      "@java.lang.Override\n"
-      "$deprecation$public $type$ ${$get$capitalized_name$$}$(int index) {\n"
-      "  return $name$_.get(index);\n"
-      "}\n");
-  printer->Annotate("{", "}", descriptor_);
-
-  // FieldOrBuilder getFieldOrBuilder(int index)
-  WriteFieldDocComment(printer, descriptor_);
-  printer->Print(variables_,
-                 "@java.lang.Override\n"
-                 "$deprecation$public $type$OrBuilder "
-                 "${$get$capitalized_name$OrBuilder$}$(\n"
-                 "    int index) {\n"
-                 "  return $name$_.get(index);\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-}
-
-void RepeatedImmutableMessageFieldGenerator::PrintNestedBuilderCondition(
-    io::Printer* printer, const char* regular_case,
-    const char* nested_builder_case) const {
-  printer->Print(variables_, "if ($name$Builder_ == null) {\n");
-  printer->Indent();
-  printer->Print(variables_, regular_case);
-  printer->Outdent();
-  printer->Print("} else {\n");
-  printer->Indent();
-  printer->Print(variables_, nested_builder_case);
-  printer->Outdent();
-  printer->Print("}\n");
-}
-
-void RepeatedImmutableMessageFieldGenerator::PrintNestedBuilderFunction(
-    io::Printer* printer, const char* method_prototype,
-    const char* regular_case, const char* nested_builder_case,
-    const char* trailing_code) const {
-  printer->Print(variables_, method_prototype);
-  printer->Annotate("{", "}", descriptor_);
-  printer->Print(" {\n");
-  printer->Indent();
-  PrintNestedBuilderCondition(printer, regular_case, nested_builder_case);
-  if (trailing_code != NULL) {
-    printer->Print(variables_, trailing_code);
-  }
-  printer->Outdent();
-  printer->Print("}\n");
-}
-
-void RepeatedImmutableMessageFieldGenerator::GenerateBuilderMembers(
-    io::Printer* printer) const {
-  // When using nested-builders, the code initially works just like the
-  // non-nested builder case. It only creates a nested builder lazily on
-  // demand and then forever delegates to it after creation.
-
-  printer->Print(
-      variables_,
-      // Used when the builder is null.
-      // One field is the list and the other field keeps track of whether the
-      // list is immutable. If it's immutable, the invariant is that it must
-      // either an instance of Collections.emptyList() or it's an ArrayList
-      // wrapped in a Collections.unmodifiableList() wrapper and nobody else has
-      // a reference to the underlying ArrayList. This invariant allows us to
-      // share instances of lists between protocol buffers avoiding expensive
-      // memory allocations. Note, immutable is a strong guarantee here -- not
-      // just that the list cannot be modified via the reference but that the
-      // list can never be modified.
-      "private java.util.List<$type$> $name$_ =\n"
-      "  java.util.Collections.emptyList();\n"
-
-      "private void ensure$capitalized_name$IsMutable() {\n"
-      "  if (!$get_mutable_bit_builder$) {\n"
-      "    $name$_ = new java.util.ArrayList<$type$>($name$_);\n"
-      "    $set_mutable_bit_builder$;\n"
-      "   }\n"
-      "}\n"
-      "\n");
-
-  printer->Print(
-      variables_,
-      // If this builder is non-null, it is used and the other fields are
-      // ignored.
-      "private com.google.protobuf.RepeatedFieldBuilder$ver$<\n"
-      "    $type$, $type$.Builder, $type$OrBuilder> $name$Builder_;\n"
-      "\n");
-
-  // The comments above the methods below are based on a hypothetical
-  // repeated field of type "Field" called "RepeatedField".
-
-  // List<Field> getRepeatedFieldList()
-  WriteFieldDocComment(printer, descriptor_);
-  PrintNestedBuilderFunction(
-      printer,
-      "$deprecation$public java.util.List<$type$> "
-      "${$get$capitalized_name$List$}$()",
-
-      "return java.util.Collections.unmodifiableList($name$_);\n",
-      "return $name$Builder_.getMessageList();\n",
-
-      NULL);
-
-  // int getRepeatedFieldCount()
-  WriteFieldDocComment(printer, descriptor_);
-  PrintNestedBuilderFunction(
-      printer, "$deprecation$public int ${$get$capitalized_name$Count$}$()",
-
-      "return $name$_.size();\n", "return $name$Builder_.getCount();\n",
-
-      NULL);
-
-  // Field getRepeatedField(int index)
-  WriteFieldDocComment(printer, descriptor_);
-  PrintNestedBuilderFunction(
-      printer,
-      "$deprecation$public $type$ ${$get$capitalized_name$$}$(int index)",
-
-      "return $name$_.get(index);\n",
-
-      "return $name$Builder_.getMessage(index);\n",
-
-      NULL);
-
-  // Builder setRepeatedField(int index, Field value)
-  WriteFieldDocComment(printer, descriptor_);
-  PrintNestedBuilderFunction(
-      printer,
-      "$deprecation$public Builder ${$set$capitalized_name$$}$(\n"
-      "    int index, $type$ value)",
-      "if (value == null) {\n"
-      "  throw new NullPointerException();\n"
-      "}\n"
-      "ensure$capitalized_name$IsMutable();\n"
-      "$name$_.set(index, value);\n"
-      "$on_changed$\n",
-      "$name$Builder_.setMessage(index, value);\n", "return this;\n");
-
-  // Builder setRepeatedField(int index, Field.Builder builderForValue)
-  WriteFieldDocComment(printer, descriptor_);
-  PrintNestedBuilderFunction(
-      printer,
-      "$deprecation$public Builder ${$set$capitalized_name$$}$(\n"
-      "    int index, $type$.Builder builderForValue)",
-
-      "ensure$capitalized_name$IsMutable();\n"
-      "$name$_.set(index, builderForValue.build());\n"
-      "$on_changed$\n",
-
-      "$name$Builder_.setMessage(index, builderForValue.build());\n",
-
-      "return this;\n");
-
-  // Builder addRepeatedField(Field value)
-  WriteFieldDocComment(printer, descriptor_);
-  PrintNestedBuilderFunction(
-      printer,
-      "$deprecation$public Builder ${$add$capitalized_name$$}$($type$ value)",
-
-      "if (value == null) {\n"
-      "  throw new NullPointerException();\n"
-      "}\n"
-      "ensure$capitalized_name$IsMutable();\n"
-      "$name$_.add(value);\n"
-
-      "$on_changed$\n",
-
-      "$name$Builder_.addMessage(value);\n",
-
-      "return this;\n");
-
-  // Builder addRepeatedField(int index, Field value)
-  WriteFieldDocComment(printer, descriptor_);
-  PrintNestedBuilderFunction(
-      printer,
-      "$deprecation$public Builder ${$add$capitalized_name$$}$(\n"
-      "    int index, $type$ value)",
-
-      "if (value == null) {\n"
-      "  throw new NullPointerException();\n"
-      "}\n"
-      "ensure$capitalized_name$IsMutable();\n"
-      "$name$_.add(index, value);\n"
-      "$on_changed$\n",
-
-      "$name$Builder_.addMessage(index, value);\n",
-
-      "return this;\n");
-
-  // Builder addRepeatedField(Field.Builder builderForValue)
-  WriteFieldDocComment(printer, descriptor_);
-  PrintNestedBuilderFunction(
-      printer,
-      "$deprecation$public Builder ${$add$capitalized_name$$}$(\n"
-      "    $type$.Builder builderForValue)",
-
-      "ensure$capitalized_name$IsMutable();\n"
-      "$name$_.add(builderForValue.build());\n"
-      "$on_changed$\n",
-
-      "$name$Builder_.addMessage(builderForValue.build());\n",
-
-      "return this;\n");
-
-  // Builder addRepeatedField(int index, Field.Builder builderForValue)
-  WriteFieldDocComment(printer, descriptor_);
-  PrintNestedBuilderFunction(
-      printer,
-      "$deprecation$public Builder ${$add$capitalized_name$$}$(\n"
-      "    int index, $type$.Builder builderForValue)",
-
-      "ensure$capitalized_name$IsMutable();\n"
-      "$name$_.add(index, builderForValue.build());\n"
-      "$on_changed$\n",
-
-      "$name$Builder_.addMessage(index, builderForValue.build());\n",
-
-      "return this;\n");
-
-  // Builder addAllRepeatedField(Iterable<Field> values)
-  WriteFieldDocComment(printer, descriptor_);
-  PrintNestedBuilderFunction(
-      printer,
-      "$deprecation$public Builder ${$addAll$capitalized_name$$}$(\n"
-      "    java.lang.Iterable<? extends $type$> values)",
-
-      "ensure$capitalized_name$IsMutable();\n"
-      "com.google.protobuf.AbstractMessageLite.Builder.addAll(\n"
-      "    values, $name$_);\n"
-      "$on_changed$\n",
-
-      "$name$Builder_.addAllMessages(values);\n",
-
-      "return this;\n");
-
-  // Builder clearRepeatedField()
-  WriteFieldDocComment(printer, descriptor_);
-  PrintNestedBuilderFunction(
-      printer, "$deprecation$public Builder ${$clear$capitalized_name$$}$()",
-
-      "$name$_ = java.util.Collections.emptyList();\n"
-      "$clear_mutable_bit_builder$;\n"
-      "$on_changed$\n",
-
-      "$name$Builder_.clear();\n",
-
-      "return this;\n");
-
-  // Builder removeRepeatedField(int index)
-  WriteFieldDocComment(printer, descriptor_);
-  PrintNestedBuilderFunction(
-      printer,
-      "$deprecation$public Builder ${$remove$capitalized_name$$}$(int index)",
-
-      "ensure$capitalized_name$IsMutable();\n"
-      "$name$_.remove(index);\n"
-      "$on_changed$\n",
-
-      "$name$Builder_.remove(index);\n",
-
-      "return this;\n");
-
-  // Field.Builder getRepeatedFieldBuilder(int index)
-  WriteFieldDocComment(printer, descriptor_);
-  printer->Print(
-      variables_,
-      "$deprecation$public $type$.Builder ${$get$capitalized_name$Builder$}$(\n"
-      "    int index) {\n"
-      "  return get$capitalized_name$FieldBuilder().getBuilder(index);\n"
-      "}\n");
-  printer->Annotate("{", "}", descriptor_);
-
-  // FieldOrBuilder getRepeatedFieldOrBuilder(int index)
-  WriteFieldDocComment(printer, descriptor_);
-  printer->Print(variables_,
-                 "$deprecation$public $type$OrBuilder "
-                 "${$get$capitalized_name$OrBuilder$}$(\n"
-                 "    int index) {\n"
-                 "  if ($name$Builder_ == null) {\n"
-                 "    return $name$_.get(index);"
-                 "  } else {\n"
-                 "    return $name$Builder_.getMessageOrBuilder(index);\n"
-                 "  }\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-
-  // List<FieldOrBuilder> getRepeatedFieldOrBuilderList()
-  WriteFieldDocComment(printer, descriptor_);
-  printer->Print(
-      variables_,
-      "$deprecation$public java.util.List<? extends $type$OrBuilder> \n"
-      "     ${$get$capitalized_name$OrBuilderList$}$() {\n"
-      "  if ($name$Builder_ != null) {\n"
-      "    return $name$Builder_.getMessageOrBuilderList();\n"
-      "  } else {\n"
-      "    return java.util.Collections.unmodifiableList($name$_);\n"
-      "  }\n"
-      "}\n");
-  printer->Annotate("{", "}", descriptor_);
-
-  // Field.Builder addRepeatedField()
-  WriteFieldDocComment(printer, descriptor_);
-  printer->Print(variables_,
-                 "$deprecation$public $type$.Builder "
-                 "${$add$capitalized_name$Builder$}$() {\n"
-                 "  return get$capitalized_name$FieldBuilder().addBuilder(\n"
-                 "      $type$.getDefaultInstance());\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-
-  // Field.Builder addRepeatedFieldBuilder(int index)
-  WriteFieldDocComment(printer, descriptor_);
-  printer->Print(
-      variables_,
-      "$deprecation$public $type$.Builder ${$add$capitalized_name$Builder$}$(\n"
-      "    int index) {\n"
-      "  return get$capitalized_name$FieldBuilder().addBuilder(\n"
-      "      index, $type$.getDefaultInstance());\n"
-      "}\n");
-  printer->Annotate("{", "}", descriptor_);
-
-  // List<Field.Builder> getRepeatedFieldBuilderList()
-  WriteFieldDocComment(printer, descriptor_);
-  printer->Print(
-      variables_,
-      "$deprecation$public java.util.List<$type$.Builder> \n"
-      "     ${$get$capitalized_name$BuilderList$}$() {\n"
-      "  return get$capitalized_name$FieldBuilder().getBuilderList();\n"
-      "}\n"
-      "private com.google.protobuf.RepeatedFieldBuilder$ver$<\n"
-      "    $type$, $type$.Builder, $type$OrBuilder> \n"
-      "    get$capitalized_name$FieldBuilder() {\n"
-      "  if ($name$Builder_ == null) {\n"
-      "    $name$Builder_ = new "
-      "com.google.protobuf.RepeatedFieldBuilder$ver$<\n"
-      "        $type$, $type$.Builder, $type$OrBuilder>(\n"
-      "            $name$_,\n"
-      "            $get_mutable_bit_builder$,\n"
-      "            getParentForChildren(),\n"
-      "            isClean());\n"
-      "    $name$_ = null;\n"
-      "  }\n"
-      "  return $name$Builder_;\n"
-      "}\n");
-  printer->Annotate("{", "}", descriptor_);
-}
-
-void RepeatedImmutableMessageFieldGenerator::
-    GenerateFieldBuilderInitializationCode(io::Printer* printer) const {
-  printer->Print(variables_, "get$capitalized_name$FieldBuilder();\n");
-}
-
-void RepeatedImmutableMessageFieldGenerator::GenerateInitializationCode(
-    io::Printer* printer) const {
-  printer->Print(variables_, "$name$_ = java.util.Collections.emptyList();\n");
-}
-
-void RepeatedImmutableMessageFieldGenerator::GenerateBuilderClearCode(
-    io::Printer* printer) const {
-  PrintNestedBuilderCondition(printer,
-                              "$name$_ = java.util.Collections.emptyList();\n",
-
-                              "$name$_ = null;\n"
-                              "$name$Builder_.clear();\n");
-
-  printer->Print(variables_, "$clear_mutable_bit_builder$;\n");
-}
-
-void RepeatedImmutableMessageFieldGenerator::GenerateMergingCode(
-    io::Printer* printer) const {
-  // The code below does two optimizations (non-nested builder case):
-  //   1. If the other list is empty, there's nothing to do. This ensures we
-  //      don't allocate a new array if we already have an immutable one.
-  //   2. If the other list is non-empty and our current list is empty, we can
-  //      reuse the other list which is guaranteed to be immutable.
-  PrintNestedBuilderCondition(
-      printer,
-      "if (!other.$name$_.isEmpty()) {\n"
-      "  if ($name$_.isEmpty()) {\n"
-      "    $name$_ = other.$name$_;\n"
-      "    $clear_mutable_bit_builder$;\n"
-      "  } else {\n"
-      "    ensure$capitalized_name$IsMutable();\n"
-      "    $name$_.addAll(other.$name$_);\n"
-      "  }\n"
-      "  $on_changed$\n"
-      "}\n",
-
-      "if (!other.$name$_.isEmpty()) {\n"
-      "  if ($name$Builder_.isEmpty()) {\n"
-      "    $name$Builder_.dispose();\n"
-      "    $name$Builder_ = null;\n"
-      "    $name$_ = other.$name$_;\n"
-      "    $clear_mutable_bit_builder$;\n"
-      "    $name$Builder_ = \n"
-      "      com.google.protobuf.GeneratedMessage$ver$.alwaysUseFieldBuilders "
-      "?\n"
-      "         get$capitalized_name$FieldBuilder() : null;\n"
-      "  } else {\n"
-      "    $name$Builder_.addAllMessages(other.$name$_);\n"
-      "  }\n"
-      "}\n");
-}
-
-void RepeatedImmutableMessageFieldGenerator::GenerateBuildingCode(
-    io::Printer* printer) const {
-  // The code below (non-nested builder case) ensures that the result has an
-  // immutable list. If our list is immutable, we can just reuse it. If not,
-  // we make it immutable.
-  PrintNestedBuilderCondition(
-      printer,
-      "if ($get_mutable_bit_builder$) {\n"
-      "  $name$_ = java.util.Collections.unmodifiableList($name$_);\n"
-      "  $clear_mutable_bit_builder$;\n"
-      "}\n"
-      "result.$name$_ = $name$_;\n",
-
-      "result.$name$_ = $name$Builder_.build();\n");
-}
-
-void RepeatedImmutableMessageFieldGenerator::GenerateBuilderParsingCode(
-    io::Printer* printer) const {
-  if (GetType(descriptor_) == FieldDescriptor::TYPE_GROUP) {
-    printer->Print(variables_,
-                   "$type$ m =\n"
-                   "    input.readGroup($number$,\n"
-                   "        $type$.$get_parser$,\n"
-                   "        extensionRegistry);\n");
-  } else {
-    printer->Print(variables_,
-                   "$type$ m =\n"
-                   "    input.readMessage(\n"
-                   "        $type$.$get_parser$,\n"
-                   "        extensionRegistry);\n");
-  }
-  PrintNestedBuilderCondition(printer,
-                              "ensure$capitalized_name$IsMutable();\n"
-                              "$name$_.add(m);\n",
-                              "$name$Builder_.addMessage(m);\n");
-}
-
-void RepeatedImmutableMessageFieldGenerator::GenerateSerializationCode(
-    io::Printer* printer) const {
-  printer->Print(variables_,
-                 "for (int i = 0; i < $name$_.size(); i++) {\n"
-                 "  output.write$group_or_message$($number$, $name$_.get(i));\n"
-                 "}\n");
-}
-
-void RepeatedImmutableMessageFieldGenerator::GenerateSerializedSizeCode(
-    io::Printer* printer) const {
-  printer->Print(
-      variables_,
-      "for (int i = 0; i < $name$_.size(); i++) {\n"
-      "  size += com.google.protobuf.CodedOutputStream\n"
-      "    .compute$group_or_message$Size($number$, $name$_.get(i));\n"
-      "}\n");
-}
-
-void RepeatedImmutableMessageFieldGenerator::GenerateEqualsCode(
-    io::Printer* printer) const {
-  printer->Print(
-      variables_,
-      "if (!get$capitalized_name$List()\n"
-      "    .equals(other.get$capitalized_name$List())) return false;\n");
-}
-
-void RepeatedImmutableMessageFieldGenerator::GenerateHashCode(
-    io::Printer* printer) const {
-  printer->Print(
-      variables_,
-      "if (get$capitalized_name$Count() > 0) {\n"
-      "  hash = (37 * hash) + $constant_name$;\n"
-      "  hash = (53 * hash) + get$capitalized_name$List().hashCode();\n"
-      "}\n");
-}
-
-std::string RepeatedImmutableMessageFieldGenerator::GetBoxedType() const {
-  return name_resolver_->GetImmutableClassName(descriptor_->message_type());
-}
-
-void RepeatedImmutableMessageFieldGenerator::GenerateKotlinDslMembers(
-    io::Printer* printer) const {
-  printer->Print(
-      variables_,
-      "/**\n"
-      " * An uninstantiable, behaviorless type to represent the field in\n"
-      " * generics.\n"
-      " */\n"
-      "@kotlin.OptIn"
-      "(com.google.protobuf.kotlin.OnlyForUseByGeneratedProtoCode::class)\n"
-      "public class ${$$kt_capitalized_name$Proxy$}$ private constructor()"
-      " : com.google.protobuf.kotlin.DslProxy()\n");
-
-  WriteFieldDocComment(printer, descriptor_);
-  printer->Print(variables_,
-                 "$kt_deprecation$ public val $kt_name$: "
-                 "com.google.protobuf.kotlin.DslList"
-                 "<$kt_type$, ${$$kt_capitalized_name$Proxy$}$>\n"
-                 "  @kotlin.jvm.JvmSynthetic\n"
-                 "  get() = com.google.protobuf.kotlin.DslList(\n"
-                 "    $kt_dsl_builder$.${$get$capitalized_name$List$}$()\n"
-                 "  )\n");
-
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_ADDER,
-                               /* builder */ false);
-  printer->Print(variables_,
-                 "@kotlin.jvm.JvmSynthetic\n"
-                 "@kotlin.jvm.JvmName(\"add$kt_capitalized_name$\")\n"
-                 "public fun com.google.protobuf.kotlin.DslList"
-                 "<$kt_type$, ${$$kt_capitalized_name$Proxy$}$>."
-                 "add(value: $kt_type$) {\n"
-                 "  $kt_dsl_builder$.${$add$capitalized_name$$}$(value)\n"
-                 "}\n");
-
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_ADDER,
-                               /* builder */ false);
-  printer->Print(variables_,
-                 "@kotlin.jvm.JvmSynthetic\n"
-                 "@kotlin.jvm.JvmName(\"plusAssign$kt_capitalized_name$\")\n"
-                 "@Suppress(\"NOTHING_TO_INLINE\")\n"
-                 "public inline operator fun com.google.protobuf.kotlin.DslList"
-                 "<$kt_type$, ${$$kt_capitalized_name$Proxy$}$>."
-                 "plusAssign(value: $kt_type$) {\n"
-                 "  add(value)\n"
-                 "}\n");
-
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_MULTI_ADDER,
-                               /* builder */ false);
-  printer->Print(variables_,
-                 "@kotlin.jvm.JvmSynthetic\n"
-                 "@kotlin.jvm.JvmName(\"addAll$kt_capitalized_name$\")\n"
-                 "public fun com.google.protobuf.kotlin.DslList"
-                 "<$kt_type$, ${$$kt_capitalized_name$Proxy$}$>."
-                 "addAll(values: kotlin.collections.Iterable<$kt_type$>) {\n"
-                 "  $kt_dsl_builder$.${$addAll$capitalized_name$$}$(values)\n"
-                 "}\n");
-
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_MULTI_ADDER,
-                               /* builder */ false);
-  printer->Print(
-      variables_,
-      "@kotlin.jvm.JvmSynthetic\n"
-      "@kotlin.jvm.JvmName(\"plusAssignAll$kt_capitalized_name$\")\n"
-      "@Suppress(\"NOTHING_TO_INLINE\")\n"
-      "public inline operator fun com.google.protobuf.kotlin.DslList"
-      "<$kt_type$, ${$$kt_capitalized_name$Proxy$}$>."
-      "plusAssign(values: kotlin.collections.Iterable<$kt_type$>) {\n"
-      "  addAll(values)\n"
-      "}\n");
-
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_INDEXED_SETTER,
-                               /* builder */ false);
-  printer->Print(
-      variables_,
-      "@kotlin.jvm.JvmSynthetic\n"
-      "@kotlin.jvm.JvmName(\"set$kt_capitalized_name$\")\n"
-      "public operator fun com.google.protobuf.kotlin.DslList"
-      "<$kt_type$, ${$$kt_capitalized_name$Proxy$}$>."
-      "set(index: kotlin.Int, value: $kt_type$) {\n"
-      "  $kt_dsl_builder$.${$set$capitalized_name$$}$(index, value)\n"
-      "}\n");
-
-  WriteFieldAccessorDocComment(printer, descriptor_, CLEARER,
-                               /* builder */ false);
-  printer->Print(variables_,
-                 "@kotlin.jvm.JvmSynthetic\n"
-                 "@kotlin.jvm.JvmName(\"clear$kt_capitalized_name$\")\n"
-                 "public fun com.google.protobuf.kotlin.DslList"
-                 "<$kt_type$, ${$$kt_capitalized_name$Proxy$}$>."
-                 "clear() {\n"
-                 "  $kt_dsl_builder$.${$clear$capitalized_name$$}$()\n"
-                 "}\n\n");
-}
-
-}  // namespace java
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#include "google/protobuf/port_undef.inc"
diff --git a/libs/protobuf/src/google/protobuf/compiler/java/message_field.h b/libs/protobuf/src/google/protobuf/compiler/java/message_field.h
deleted file mode 100644
index f16062f..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/java/message_field.h
+++ /dev/null
@@ -1,187 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-
-#ifndef GOOGLE_PROTOBUF_COMPILER_JAVA_MESSAGE_FIELD_H__
-#define GOOGLE_PROTOBUF_COMPILER_JAVA_MESSAGE_FIELD_H__
-
-#include <map>
-#include <string>
-
-#include "google/protobuf/compiler/java/field.h"
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace java {
-class Context;            // context.h
-class ClassNameResolver;  // name_resolver.h
-}  // namespace java
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace java {
-
-class ImmutableMessageFieldGenerator : public ImmutableFieldGenerator {
- public:
-  explicit ImmutableMessageFieldGenerator(const FieldDescriptor* descriptor,
-                                          int messageBitIndex,
-                                          int builderBitIndex,
-                                          Context* context);
-  ImmutableMessageFieldGenerator(const ImmutableMessageFieldGenerator&) =
-      delete;
-  ImmutableMessageFieldGenerator& operator=(
-      const ImmutableMessageFieldGenerator&) = delete;
-  ~ImmutableMessageFieldGenerator() override;
-
-  // implements ImmutableFieldGenerator
-  // ---------------------------------------
-  int GetMessageBitIndex() const override;
-  int GetBuilderBitIndex() const override;
-  int GetNumBitsForMessage() const override;
-  int GetNumBitsForBuilder() const override;
-  void GenerateInterfaceMembers(io::Printer* printer) const override;
-  void GenerateMembers(io::Printer* printer) const override;
-  void GenerateBuilderMembers(io::Printer* printer) const override;
-  void GenerateInitializationCode(io::Printer* printer) const override;
-  void GenerateBuilderClearCode(io::Printer* printer) const override;
-  void GenerateMergingCode(io::Printer* printer) const override;
-  void GenerateBuildingCode(io::Printer* printer) const override;
-  void GenerateBuilderParsingCode(io::Printer* printer) const override;
-  void GenerateSerializationCode(io::Printer* printer) const override;
-  void GenerateSerializedSizeCode(io::Printer* printer) const override;
-  void GenerateFieldBuilderInitializationCode(
-      io::Printer* printer) const override;
-  void GenerateEqualsCode(io::Printer* printer) const override;
-  void GenerateHashCode(io::Printer* printer) const override;
-  void GenerateKotlinDslMembers(io::Printer* printer) const override;
-
-  std::string GetBoxedType() const override;
-
- protected:
-  const FieldDescriptor* descriptor_;
-  int message_bit_index_;
-  int builder_bit_index_;
-  std::map<std::string, std::string> variables_;
-  ClassNameResolver* name_resolver_;
-  Context* context_;
-
-  virtual void PrintNestedBuilderCondition(
-      io::Printer* printer, const char* regular_case,
-      const char* nested_builder_case) const;
-  virtual void PrintNestedBuilderFunction(io::Printer* printer,
-                                          const char* method_prototype,
-                                          const char* regular_case,
-                                          const char* nested_builder_case,
-                                          const char* trailing_code) const;
-
- private:
-  void GenerateKotlinOrNull(io::Printer* printer) const;
-};
-
-class ImmutableMessageOneofFieldGenerator
-    : public ImmutableMessageFieldGenerator {
- public:
-  ImmutableMessageOneofFieldGenerator(const FieldDescriptor* descriptor,
-                                      int messageBitIndex, int builderBitIndex,
-                                      Context* context);
-  ImmutableMessageOneofFieldGenerator(
-      const ImmutableMessageOneofFieldGenerator&) = delete;
-  ImmutableMessageOneofFieldGenerator& operator=(
-      const ImmutableMessageOneofFieldGenerator&) = delete;
-  ~ImmutableMessageOneofFieldGenerator() override;
-
-  void GenerateMembers(io::Printer* printer) const override;
-  void GenerateBuilderMembers(io::Printer* printer) const override;
-  void GenerateBuilderClearCode(io::Printer* printer) const override;
-  void GenerateBuildingCode(io::Printer* printer) const override;
-  void GenerateMergingCode(io::Printer* printer) const override;
-  void GenerateBuilderParsingCode(io::Printer* printer) const override;
-  void GenerateSerializationCode(io::Printer* printer) const override;
-  void GenerateSerializedSizeCode(io::Printer* printer) const override;
-};
-
-class RepeatedImmutableMessageFieldGenerator
-    : public ImmutableMessageFieldGenerator {
- public:
-  explicit RepeatedImmutableMessageFieldGenerator(
-      const FieldDescriptor* descriptor, int messageBitIndex,
-      int builderBitIndex, Context* context);
-  RepeatedImmutableMessageFieldGenerator(
-      const RepeatedImmutableMessageFieldGenerator&) = delete;
-  RepeatedImmutableMessageFieldGenerator& operator=(
-      const RepeatedImmutableMessageFieldGenerator&) = delete;
-  ~RepeatedImmutableMessageFieldGenerator() override;
-
-  // implements ImmutableFieldGenerator ---------------------------------------
-  int GetNumBitsForMessage() const override;
-  int GetNumBitsForBuilder() const override;
-  void GenerateInterfaceMembers(io::Printer* printer) const override;
-  void GenerateMembers(io::Printer* printer) const override;
-  void GenerateBuilderMembers(io::Printer* printer) const override;
-  void GenerateInitializationCode(io::Printer* printer) const override;
-  void GenerateBuilderClearCode(io::Printer* printer) const override;
-  void GenerateMergingCode(io::Printer* printer) const override;
-  void GenerateBuildingCode(io::Printer* printer) const override;
-  void GenerateBuilderParsingCode(io::Printer* printer) const override;
-  void GenerateSerializationCode(io::Printer* printer) const override;
-  void GenerateSerializedSizeCode(io::Printer* printer) const override;
-  void GenerateFieldBuilderInitializationCode(
-      io::Printer* printer) const override;
-  void GenerateEqualsCode(io::Printer* printer) const override;
-  void GenerateHashCode(io::Printer* printer) const override;
-  void GenerateKotlinDslMembers(io::Printer* printer) const override;
-
-  std::string GetBoxedType() const override;
-
- protected:
-  void PrintNestedBuilderCondition(
-      io::Printer* printer, const char* regular_case,
-      const char* nested_builder_case) const override;
-  void PrintNestedBuilderFunction(io::Printer* printer,
-                                  const char* method_prototype,
-                                  const char* regular_case,
-                                  const char* nested_builder_case,
-                                  const char* trailing_code) const override;
-};
-
-}  // namespace java
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // GOOGLE_PROTOBUF_COMPILER_JAVA_MESSAGE_FIELD_H__
diff --git a/libs/protobuf/src/google/protobuf/compiler/java/message_field_lite.cc b/libs/protobuf/src/google/protobuf/compiler/java/message_field_lite.cc
deleted file mode 100644
index da96790..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/java/message_field_lite.cc
+++ /dev/null
@@ -1,898 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-
-#include <google/protobuf/compiler/java/message_field_lite.h>
-
-#include <cstdint>
-#include <map>
-#include <string>
-
-#include <google/protobuf/io/printer.h>
-#include <google/protobuf/wire_format.h>
-#include <google/protobuf/stubs/strutil.h>
-#include <google/protobuf/compiler/java/context.h>
-#include <google/protobuf/compiler/java/doc_comment.h>
-#include <google/protobuf/compiler/java/helpers.h>
-#include <google/protobuf/compiler/java/name_resolver.h>
-
-// Must be last.
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace java {
-
-namespace {
-
-void SetMessageVariables(const FieldDescriptor* descriptor, int messageBitIndex,
-                         int builderBitIndex, const FieldGeneratorInfo* info,
-                         ClassNameResolver* name_resolver,
-                         std::map<std::string, std::string>* variables) {
-  SetCommonFieldVariables(descriptor, info, variables);
-
-  (*variables)["type"] =
-      name_resolver->GetImmutableClassName(descriptor->message_type());
-  (*variables)["kt_type"] = (*variables)["type"];
-  (*variables)["mutable_type"] =
-      name_resolver->GetMutableClassName(descriptor->message_type());
-  (*variables)["group_or_message"] =
-      (GetType(descriptor) == FieldDescriptor::TYPE_GROUP) ? "Group"
-                                                           : "Message";
-  // TODO(birdo): Add @deprecated javadoc when generating javadoc is supported
-  // by the proto compiler
-  (*variables)["deprecation"] =
-      descriptor->options().deprecated() ? "@java.lang.Deprecated " : "";
-  (*variables)["kt_deprecation"] =
-      descriptor->options().deprecated()
-          ? "@kotlin.Deprecated(message = \"Field " + (*variables)["name"] +
-                " is deprecated\") "
-          : "";
-  (*variables)["required"] = descriptor->is_required() ? "true" : "false";
-
-  if (HasHasbit(descriptor)) {
-    // For singular messages and builders, one bit is used for the hasField bit.
-    (*variables)["get_has_field_bit_message"] = GenerateGetBit(messageBitIndex);
-
-    // Note that these have a trailing ";".
-    (*variables)["set_has_field_bit_message"] =
-        GenerateSetBit(messageBitIndex) + ";";
-    (*variables)["clear_has_field_bit_message"] =
-        GenerateClearBit(messageBitIndex) + ";";
-
-    (*variables)["is_field_present_message"] = GenerateGetBit(messageBitIndex);
-  } else {
-    (*variables)["set_has_field_bit_message"] = "";
-    (*variables)["clear_has_field_bit_message"] = "";
-
-    (*variables)["is_field_present_message"] =
-        (*variables)["name"] + "_ != null";
-  }
-
-  (*variables)["get_has_field_bit_from_local"] =
-      GenerateGetBitFromLocal(builderBitIndex);
-  (*variables)["set_has_field_bit_to_local"] =
-      GenerateSetBitToLocal(messageBitIndex);
-
-  // We use `x.getClass()` as a null check because it generates less bytecode
-  // than an `if (x == null) { throw ... }` statement.
-  (*variables)["null_check"] = "value.getClass();\n";
-}
-
-}  // namespace
-
-// ===================================================================
-
-ImmutableMessageFieldLiteGenerator::ImmutableMessageFieldLiteGenerator(
-    const FieldDescriptor* descriptor, int messageBitIndex, Context* context)
-    : descriptor_(descriptor),
-      messageBitIndex_(messageBitIndex),
-      name_resolver_(context->GetNameResolver()) {
-  SetMessageVariables(descriptor, messageBitIndex, 0,
-                      context->GetFieldGeneratorInfo(descriptor),
-                      name_resolver_, &variables_);
-}
-
-ImmutableMessageFieldLiteGenerator::~ImmutableMessageFieldLiteGenerator() {}
-
-int ImmutableMessageFieldLiteGenerator::GetNumBitsForMessage() const {
-  // TODO(dweis): We don't need a has bit for messages as they have null
-  // sentinels and no user should be reflecting on this. We could save some
-  // bits by setting to 0 and updating the runtimes but this might come at a
-  // runtime performance cost since we can't memoize has-bit reads.
-  return HasHasbit(descriptor_) ? 1 : 0;
-}
-
-void ImmutableMessageFieldLiteGenerator::GenerateInterfaceMembers(
-    io::Printer* printer) const {
-  WriteFieldAccessorDocComment(printer, descriptor_, HAZZER);
-  printer->Print(variables_, "$deprecation$boolean has$capitalized_name$();\n");
-  WriteFieldAccessorDocComment(printer, descriptor_, GETTER);
-  printer->Print(variables_, "$deprecation$$type$ get$capitalized_name$();\n");
-}
-
-void ImmutableMessageFieldLiteGenerator::GenerateMembers(
-    io::Printer* printer) const {
-
-  printer->Print(variables_, "private $type$ $name$_;\n");
-  PrintExtraFieldInfo(variables_, printer);
-
-  if (HasHasbit(descriptor_)) {
-    WriteFieldDocComment(printer, descriptor_);
-    printer->Print(
-        variables_,
-        "@java.lang.Override\n"
-        "$deprecation$public boolean ${$has$capitalized_name$$}$() {\n"
-        "  return $get_has_field_bit_message$;\n"
-        "}\n");
-    printer->Annotate("{", "}", descriptor_);
-    WriteFieldDocComment(printer, descriptor_);
-    printer->Print(
-        variables_,
-        "@java.lang.Override\n"
-        "$deprecation$public $type$ ${$get$capitalized_name$$}$() {\n"
-        "  return $name$_ == null ? $type$.getDefaultInstance() : $name$_;\n"
-        "}\n");
-    printer->Annotate("{", "}", descriptor_);
-  } else {
-    WriteFieldDocComment(printer, descriptor_);
-    printer->Print(
-        variables_,
-        "@java.lang.Override\n"
-        "$deprecation$public boolean ${$has$capitalized_name$$}$() {\n"
-        "  return $name$_ != null;\n"
-        "}\n");
-    printer->Annotate("{", "}", descriptor_);
-    WriteFieldDocComment(printer, descriptor_);
-    printer->Print(
-        variables_,
-        "@java.lang.Override\n"
-        "$deprecation$public $type$ ${$get$capitalized_name$$}$() {\n"
-        "  return $name$_ == null ? $type$.getDefaultInstance() : $name$_;\n"
-        "}\n");
-    printer->Annotate("{", "}", descriptor_);
-  }
-
-  // Field.Builder setField(Field value)
-  WriteFieldDocComment(printer, descriptor_);
-  printer->Print(variables_,
-                 "private void set$capitalized_name$($type$ value) {\n"
-                 "  $null_check$"
-                 "  $name$_ = value;\n"
-                 "  $set_has_field_bit_message$\n"
-                 "  }\n");
-
-  // Field.Builder mergeField(Field value)
-  WriteFieldDocComment(printer, descriptor_);
-  printer->Print(
-      variables_,
-      "@java.lang.SuppressWarnings({\"ReferenceEquality\"})\n"
-      "private void merge$capitalized_name$($type$ value) {\n"
-      "  $null_check$"
-      "  if ($name$_ != null &&\n"
-      "      $name$_ != $type$.getDefaultInstance()) {\n"
-      "    $name$_ =\n"
-      "      $type$.newBuilder($name$_).mergeFrom(value).buildPartial();\n"
-      "  } else {\n"
-      "    $name$_ = value;\n"
-      "  }\n"
-      "  $set_has_field_bit_message$\n"
-      "}\n");
-
-  // Field.Builder clearField()
-  WriteFieldDocComment(printer, descriptor_);
-  printer->Print(variables_,
-                 "private void clear$capitalized_name$() {"
-                 "  $name$_ = null;\n"
-                 "  $clear_has_field_bit_message$\n"
-                 "}\n");
-}
-
-void ImmutableMessageFieldLiteGenerator::GenerateBuilderMembers(
-    io::Printer* printer) const {
-  // The comments above the methods below are based on a hypothetical
-  // field of type "Field" called "Field".
-
-  // boolean hasField()
-  WriteFieldDocComment(printer, descriptor_);
-  printer->Print(variables_,
-                 "@java.lang.Override\n"
-                 "$deprecation$public boolean ${$has$capitalized_name$$}$() {\n"
-                 "  return instance.has$capitalized_name$();\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-
-  // Field getField()
-  WriteFieldDocComment(printer, descriptor_);
-  printer->Print(variables_,
-                 "@java.lang.Override\n"
-                 "$deprecation$public $type$ ${$get$capitalized_name$$}$() {\n"
-                 "  return instance.get$capitalized_name$();\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-
-  // Field.Builder setField(Field value)
-  WriteFieldDocComment(printer, descriptor_);
-  printer->Print(variables_,
-                 "$deprecation$public Builder "
-                 "${$set$capitalized_name$$}$($type$ value) {\n"
-                 "  copyOnWrite();\n"
-                 "  instance.set$capitalized_name$(value);\n"
-                 "  return this;\n"
-                 "  }\n");
-  printer->Annotate("{", "}", descriptor_);
-
-  // Field.Builder setField(Field.Builder builderForValue)
-  WriteFieldDocComment(printer, descriptor_);
-  printer->Print(variables_,
-                 "$deprecation$public Builder ${$set$capitalized_name$$}$(\n"
-                 "    $type$.Builder builderForValue) {\n"
-                 "  copyOnWrite();\n"
-                 "  instance.set$capitalized_name$(builderForValue.build());\n"
-                 "  return this;\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-
-  // Field.Builder mergeField(Field value)
-  WriteFieldDocComment(printer, descriptor_);
-  printer->Print(variables_,
-                 "$deprecation$public Builder "
-                 "${$merge$capitalized_name$$}$($type$ value) {\n"
-                 "  copyOnWrite();\n"
-                 "  instance.merge$capitalized_name$(value);\n"
-                 "  return this;\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-
-  // Field.Builder clearField()
-  WriteFieldDocComment(printer, descriptor_);
-  printer->Print(variables_,
-                 "$deprecation$public Builder ${$clear$capitalized_name$$}$() {"
-                 "  copyOnWrite();\n"
-                 "  instance.clear$capitalized_name$();\n"
-                 "  return this;\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-}
-
-void ImmutableMessageFieldLiteGenerator::GenerateKotlinDslMembers(
-    io::Printer* printer) const {
-  WriteFieldDocComment(printer, descriptor_);
-  printer->Print(variables_,
-                 "$kt_deprecation$public var $kt_name$: $kt_type$\n"
-                 "  @JvmName(\"${$get$kt_capitalized_name$$}$\")\n"
-                 "  get() = $kt_dsl_builder$.${$get$capitalized_name$$}$()\n"
-                 "  @JvmName(\"${$set$kt_capitalized_name$$}$\")\n"
-                 "  set(value) {\n"
-                 "    $kt_dsl_builder$.${$set$capitalized_name$$}$(value)\n"
-                 "  }\n");
-
-  WriteFieldAccessorDocComment(printer, descriptor_, CLEARER,
-                               /* builder */ false);
-  printer->Print(variables_,
-                 "public fun ${$clear$kt_capitalized_name$$}$() {\n"
-                 "  $kt_dsl_builder$.${$clear$capitalized_name$$}$()\n"
-                 "}\n");
-
-  WriteFieldAccessorDocComment(printer, descriptor_, HAZZER);
-  printer->Print(
-      variables_,
-      "public fun ${$has$kt_capitalized_name$$}$(): kotlin.Boolean {\n"
-      "  return $kt_dsl_builder$.${$has$capitalized_name$$}$()\n"
-      "}\n");
-  GenerateKotlinOrNull(printer);
-}
-
-void ImmutableMessageFieldLiteGenerator::GenerateKotlinOrNull(io::Printer* printer) const {
-  if (descriptor_->has_optional_keyword()) {
-    printer->Print(variables_,
-                   "public val $classname$Kt.Dsl.$name$OrNull: $kt_type$?\n"
-                   "  get() = $kt_dsl_builder$.$name$OrNull\n");
-  }
-}
-
-void ImmutableMessageFieldLiteGenerator::GenerateFieldInfo(
-    io::Printer* printer, std::vector<uint16_t>* output) const {
-  WriteIntToUtf16CharSequence(descriptor_->number(), output);
-  WriteIntToUtf16CharSequence(GetExperimentalJavaFieldType(descriptor_),
-                              output);
-  if (HasHasbit(descriptor_)) {
-    WriteIntToUtf16CharSequence(messageBitIndex_, output);
-  }
-  printer->Print(variables_, "\"$name$_\",\n");
-}
-
-void ImmutableMessageFieldLiteGenerator::GenerateInitializationCode(
-    io::Printer* printer) const {}
-
-std::string ImmutableMessageFieldLiteGenerator::GetBoxedType() const {
-  return name_resolver_->GetImmutableClassName(descriptor_->message_type());
-}
-
-// ===================================================================
-
-ImmutableMessageOneofFieldLiteGenerator::
-    ImmutableMessageOneofFieldLiteGenerator(const FieldDescriptor* descriptor,
-                                            int messageBitIndex,
-                                            Context* context)
-    : ImmutableMessageFieldLiteGenerator(descriptor, messageBitIndex, context) {
-  const OneofGeneratorInfo* info =
-      context->GetOneofGeneratorInfo(descriptor->containing_oneof());
-  SetCommonOneofVariables(descriptor, info, &variables_);
-}
-
-ImmutableMessageOneofFieldLiteGenerator::
-    ~ImmutableMessageOneofFieldLiteGenerator() {}
-
-void ImmutableMessageOneofFieldLiteGenerator::GenerateMembers(
-    io::Printer* printer) const {
-  PrintExtraFieldInfo(variables_, printer);
-  WriteFieldDocComment(printer, descriptor_);
-  printer->Print(variables_,
-                 "@java.lang.Override\n"
-                 "$deprecation$public boolean ${$has$capitalized_name$$}$() {\n"
-                 "  return $has_oneof_case_message$;\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-  WriteFieldDocComment(printer, descriptor_);
-  printer->Print(variables_,
-                 "@java.lang.Override\n"
-                 "$deprecation$public $type$ ${$get$capitalized_name$$}$() {\n"
-                 "  if ($has_oneof_case_message$) {\n"
-                 "     return ($type$) $oneof_name$_;\n"
-                 "  }\n"
-                 "  return $type$.getDefaultInstance();\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-
-  // Field.Builder setField(Field value)
-  WriteFieldDocComment(printer, descriptor_);
-  printer->Print(variables_,
-                 "private void set$capitalized_name$($type$ value) {\n"
-                 "  $null_check$"
-                 "  $oneof_name$_ = value;\n"
-                 "  $set_oneof_case_message$;\n"
-                 "}\n");
-
-  // Field.Builder mergeField(Field value)
-  WriteFieldDocComment(printer, descriptor_);
-  printer->Print(
-      variables_,
-      "private void merge$capitalized_name$($type$ value) {\n"
-      "  $null_check$"
-      "  if ($has_oneof_case_message$ &&\n"
-      "      $oneof_name$_ != $type$.getDefaultInstance()) {\n"
-      "    $oneof_name$_ = $type$.newBuilder(($type$) $oneof_name$_)\n"
-      "        .mergeFrom(value).buildPartial();\n"
-      "  } else {\n"
-      "    $oneof_name$_ = value;\n"
-      "  }\n"
-      "  $set_oneof_case_message$;\n"
-      "}\n");
-
-  // Field.Builder clearField()
-  WriteFieldDocComment(printer, descriptor_);
-  printer->Print(variables_,
-                 "private void clear$capitalized_name$() {\n"
-                 "  if ($has_oneof_case_message$) {\n"
-                 "    $clear_oneof_case_message$;\n"
-                 "    $oneof_name$_ = null;\n"
-                 "  }\n"
-                 "}\n");
-}
-
-void ImmutableMessageOneofFieldLiteGenerator::GenerateFieldInfo(
-    io::Printer* printer, std::vector<uint16_t>* output) const {
-  WriteIntToUtf16CharSequence(descriptor_->number(), output);
-  WriteIntToUtf16CharSequence(GetExperimentalJavaFieldType(descriptor_),
-                              output);
-  WriteIntToUtf16CharSequence(descriptor_->containing_oneof()->index(), output);
-  printer->Print(variables_, "$oneof_stored_type$.class,\n");
-}
-
-void ImmutableMessageOneofFieldLiteGenerator::GenerateBuilderMembers(
-    io::Printer* printer) const {
-  // The comments above the methods below are based on a hypothetical
-  // field of type "Field" called "Field".
-
-  // boolean hasField()
-  WriteFieldDocComment(printer, descriptor_);
-  printer->Print(variables_,
-                 "@java.lang.Override\n"
-                 "$deprecation$public boolean ${$has$capitalized_name$$}$() {\n"
-                 "  return instance.has$capitalized_name$();\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-
-  // Field getField()
-  WriteFieldDocComment(printer, descriptor_);
-  printer->Print(variables_,
-                 "@java.lang.Override\n"
-                 "$deprecation$public $type$ ${$get$capitalized_name$$}$() {\n"
-                 "  return instance.get$capitalized_name$();\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-
-  // Field.Builder setField(Field value)
-  WriteFieldDocComment(printer, descriptor_);
-  printer->Print(variables_,
-                 "$deprecation$public Builder "
-                 "${$set$capitalized_name$$}$($type$ value) {\n"
-                 "  copyOnWrite();\n"
-                 "  instance.set$capitalized_name$(value);\n"
-                 "  return this;\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-
-  // Field.Builder setField(Field.Builder builderForValue)
-  WriteFieldDocComment(printer, descriptor_);
-  printer->Print(variables_,
-                 "$deprecation$public Builder ${$set$capitalized_name$$}$(\n"
-                 "    $type$.Builder builderForValue) {\n"
-                 "  copyOnWrite();\n"
-                 "  instance.set$capitalized_name$(builderForValue.build());\n"
-                 "  return this;\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-
-  // Field.Builder mergeField(Field value)
-  WriteFieldDocComment(printer, descriptor_);
-  printer->Print(variables_,
-                 "$deprecation$public Builder "
-                 "${$merge$capitalized_name$$}$($type$ value) {\n"
-                 "  copyOnWrite();\n"
-                 "  instance.merge$capitalized_name$(value);\n"
-                 "  return this;\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-
-  // Field.Builder clearField()
-  WriteFieldDocComment(printer, descriptor_);
-  printer->Print(
-      variables_,
-      "$deprecation$public Builder ${$clear$capitalized_name$$}$() {\n"
-      "  copyOnWrite();\n"
-      "  instance.clear$capitalized_name$();\n"
-      "  return this;\n"
-      "}\n");
-  printer->Annotate("{", "}", descriptor_);
-}
-
-// ===================================================================
-
-RepeatedImmutableMessageFieldLiteGenerator::
-    RepeatedImmutableMessageFieldLiteGenerator(
-        const FieldDescriptor* descriptor, int messageBitIndex,
-        Context* context)
-    : descriptor_(descriptor), name_resolver_(context->GetNameResolver()) {
-  SetMessageVariables(descriptor, messageBitIndex, 0,
-                      context->GetFieldGeneratorInfo(descriptor),
-                      name_resolver_, &variables_);
-}
-
-RepeatedImmutableMessageFieldLiteGenerator::
-    ~RepeatedImmutableMessageFieldLiteGenerator() {}
-
-int RepeatedImmutableMessageFieldLiteGenerator::GetNumBitsForMessage() const {
-  return 0;
-}
-
-void RepeatedImmutableMessageFieldLiteGenerator::GenerateInterfaceMembers(
-    io::Printer* printer) const {
-  // TODO(jonp): In the future, consider having methods specific to the
-  // interface so that builders can choose dynamically to either return a
-  // message or a nested builder, so that asking for the interface doesn't
-  // cause a message to ever be built.
-  WriteFieldDocComment(printer, descriptor_);
-  printer->Print(variables_,
-                 "$deprecation$java.util.List<$type$> \n"
-                 "    get$capitalized_name$List();\n");
-  WriteFieldDocComment(printer, descriptor_);
-  printer->Print(variables_,
-                 "$deprecation$$type$ get$capitalized_name$(int index);\n");
-  WriteFieldDocComment(printer, descriptor_);
-  printer->Print(variables_,
-                 "$deprecation$int get$capitalized_name$Count();\n");
-}
-
-void RepeatedImmutableMessageFieldLiteGenerator::GenerateMembers(
-    io::Printer* printer) const {
-  printer->Print(
-      variables_,
-      "private com.google.protobuf.Internal.ProtobufList<$type$> $name$_;\n");
-  PrintExtraFieldInfo(variables_, printer);
-  WriteFieldDocComment(printer, descriptor_);
-  printer->Print(variables_,
-                 "@java.lang.Override\n"
-                 "$deprecation$public java.util.List<$type$> "
-                 "${$get$capitalized_name$List$}$() {\n"
-                 "  return $name$_;\n"  // note:  unmodifiable list
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-  WriteFieldDocComment(printer, descriptor_);
-  printer->Print(
-      variables_,
-      "$deprecation$public java.util.List<? extends $type$OrBuilder> \n"
-      "    ${$get$capitalized_name$OrBuilderList$}$() {\n"
-      "  return $name$_;\n"
-      "}\n");
-  printer->Annotate("{", "}", descriptor_);
-  WriteFieldDocComment(printer, descriptor_);
-  printer->Print(
-      variables_,
-      "@java.lang.Override\n"
-      "$deprecation$public int ${$get$capitalized_name$Count$}$() {\n"
-      "  return $name$_.size();\n"
-      "}\n");
-  printer->Annotate("{", "}", descriptor_);
-  WriteFieldDocComment(printer, descriptor_);
-  printer->Print(
-      variables_,
-      "@java.lang.Override\n"
-      "$deprecation$public $type$ ${$get$capitalized_name$$}$(int index) {\n"
-      "  return $name$_.get(index);\n"
-      "}\n");
-  printer->Annotate("{", "}", descriptor_);
-  WriteFieldDocComment(printer, descriptor_);
-  printer->Print(variables_,
-                 "$deprecation$public $type$OrBuilder "
-                 "${$get$capitalized_name$OrBuilder$}$(\n"
-                 "    int index) {\n"
-                 "  return $name$_.get(index);\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-
-  printer->Print(
-      variables_,
-      "private void ensure$capitalized_name$IsMutable() {\n"
-      // Use a temporary to avoid a redundant iget-object.
-      "  com.google.protobuf.Internal.ProtobufList<$type$> tmp = $name$_;\n"
-      "  if (!tmp.isModifiable()) {\n"
-      "    $name$_ =\n"
-      "        com.google.protobuf.GeneratedMessageLite.mutableCopy(tmp);\n"
-      "   }\n"
-      "}\n"
-      "\n");
-
-  // Builder setRepeatedField(int index, Field value)
-  WriteFieldDocComment(printer, descriptor_);
-  printer->Print(variables_,
-                 "private void set$capitalized_name$(\n"
-                 "    int index, $type$ value) {\n"
-                 "  $null_check$"
-                 "  ensure$capitalized_name$IsMutable();\n"
-                 "  $name$_.set(index, value);\n"
-                 "}\n");
-
-  // Builder addRepeatedField(Field value)
-  WriteFieldDocComment(printer, descriptor_);
-  printer->Print(variables_,
-                 "private void add$capitalized_name$($type$ value) {\n"
-                 "  $null_check$"
-                 "  ensure$capitalized_name$IsMutable();\n"
-                 "  $name$_.add(value);\n"
-                 "}\n");
-
-  // Builder addRepeatedField(int index, Field value)
-  WriteFieldDocComment(printer, descriptor_);
-  printer->Print(variables_,
-                 "private void add$capitalized_name$(\n"
-                 "    int index, $type$ value) {\n"
-                 "  $null_check$"
-                 "  ensure$capitalized_name$IsMutable();\n"
-                 "  $name$_.add(index, value);\n"
-                 "}\n");
-
-  // Builder addAllRepeatedField(Iterable<Field> values)
-  WriteFieldDocComment(printer, descriptor_);
-  printer->Print(variables_,
-                 "private void addAll$capitalized_name$(\n"
-                 "    java.lang.Iterable<? extends $type$> values) {\n"
-                 "  ensure$capitalized_name$IsMutable();\n"
-                 "  com.google.protobuf.AbstractMessageLite.addAll(\n"
-                 "      values, $name$_);\n"
-                 "}\n");
-
-  // Builder clearAllRepeatedField()
-  WriteFieldDocComment(printer, descriptor_);
-  printer->Print(variables_,
-                 "private void clear$capitalized_name$() {\n"
-                 "  $name$_ = emptyProtobufList();\n"
-                 "}\n");
-
-  // Builder removeRepeatedField(int index)
-  WriteFieldDocComment(printer, descriptor_);
-  printer->Print(variables_,
-                 "private void remove$capitalized_name$(int index) {\n"
-                 "  ensure$capitalized_name$IsMutable();\n"
-                 "  $name$_.remove(index);\n"
-                 "}\n");
-}
-
-void RepeatedImmutableMessageFieldLiteGenerator::GenerateBuilderMembers(
-    io::Printer* printer) const {
-  // The comments above the methods below are based on a hypothetical
-  // repeated field of type "Field" called "RepeatedField".
-
-  // List<Field> getRepeatedFieldList()
-  WriteFieldDocComment(printer, descriptor_);
-  printer->Print(variables_,
-                 "@java.lang.Override\n"
-                 "$deprecation$public java.util.List<$type$> "
-                 "${$get$capitalized_name$List$}$() {\n"
-                 "  return java.util.Collections.unmodifiableList(\n"
-                 "      instance.get$capitalized_name$List());\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-
-  // int getRepeatedFieldCount()
-  WriteFieldDocComment(printer, descriptor_);
-  printer->Print(
-      variables_,
-      "@java.lang.Override\n"
-      "$deprecation$public int ${$get$capitalized_name$Count$}$() {\n"
-      "  return instance.get$capitalized_name$Count();\n"
-      "}");
-  printer->Annotate("{", "}", descriptor_);
-
-  // Field getRepeatedField(int index)
-  WriteFieldDocComment(printer, descriptor_);
-  printer->Print(
-      variables_,
-      "@java.lang.Override\n"
-      "$deprecation$public $type$ ${$get$capitalized_name$$}$(int index) {\n"
-      "  return instance.get$capitalized_name$(index);\n"
-      "}\n");
-  printer->Annotate("{", "}", descriptor_);
-
-  // Builder setRepeatedField(int index, Field value)
-  WriteFieldDocComment(printer, descriptor_);
-  printer->Print(variables_,
-                 "$deprecation$public Builder ${$set$capitalized_name$$}$(\n"
-                 "    int index, $type$ value) {\n"
-                 "  copyOnWrite();\n"
-                 "  instance.set$capitalized_name$(index, value);\n"
-                 "  return this;\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-
-  // Builder setRepeatedField(int index, Field.Builder builderForValue)
-  WriteFieldDocComment(printer, descriptor_);
-  printer->Print(variables_,
-                 "$deprecation$public Builder ${$set$capitalized_name$$}$(\n"
-                 "    int index, $type$.Builder builderForValue) {\n"
-                 "  copyOnWrite();\n"
-                 "  instance.set$capitalized_name$(index,\n"
-                 "      builderForValue.build());\n"
-                 "  return this;\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-
-  // Builder addRepeatedField(Field value)
-  WriteFieldDocComment(printer, descriptor_);
-  printer->Print(variables_,
-                 "$deprecation$public Builder "
-                 "${$add$capitalized_name$$}$($type$ value) {\n"
-                 "  copyOnWrite();\n"
-                 "  instance.add$capitalized_name$(value);\n"
-                 "  return this;\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-
-  // Builder addRepeatedField(int index, Field value)
-  WriteFieldDocComment(printer, descriptor_);
-  printer->Print(variables_,
-                 "$deprecation$public Builder ${$add$capitalized_name$$}$(\n"
-                 "    int index, $type$ value) {\n"
-                 "  copyOnWrite();\n"
-                 "  instance.add$capitalized_name$(index, value);\n"
-                 "  return this;\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-  // Builder addRepeatedField(Field.Builder builderForValue)
-  WriteFieldDocComment(printer, descriptor_);
-  printer->Print(variables_,
-                 "$deprecation$public Builder ${$add$capitalized_name$$}$(\n"
-                 "    $type$.Builder builderForValue) {\n"
-                 "  copyOnWrite();\n"
-                 "  instance.add$capitalized_name$(builderForValue.build());\n"
-                 "  return this;\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-
-  // Builder addRepeatedField(int index, Field.Builder builderForValue)
-  WriteFieldDocComment(printer, descriptor_);
-  printer->Print(variables_,
-                 "$deprecation$public Builder ${$add$capitalized_name$$}$(\n"
-                 "    int index, $type$.Builder builderForValue) {\n"
-                 "  copyOnWrite();\n"
-                 "  instance.add$capitalized_name$(index,\n"
-                 "      builderForValue.build());\n"
-                 "  return this;\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-
-  // Builder addAllRepeatedField(Iterable<Field> values)
-  WriteFieldDocComment(printer, descriptor_);
-  printer->Print(variables_,
-                 "$deprecation$public Builder ${$addAll$capitalized_name$$}$(\n"
-                 "    java.lang.Iterable<? extends $type$> values) {\n"
-                 "  copyOnWrite();\n"
-                 "  instance.addAll$capitalized_name$(values);\n"
-                 "  return this;\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-
-  // Builder clearAllRepeatedField()
-  WriteFieldDocComment(printer, descriptor_);
-  printer->Print(
-      variables_,
-      "$deprecation$public Builder ${$clear$capitalized_name$$}$() {\n"
-      "  copyOnWrite();\n"
-      "  instance.clear$capitalized_name$();\n"
-      "  return this;\n"
-      "}\n");
-  printer->Annotate("{", "}", descriptor_);
-
-  // Builder removeRepeatedField(int index)
-  WriteFieldDocComment(printer, descriptor_);
-  printer->Print(variables_,
-                 "$deprecation$public Builder "
-                 "${$remove$capitalized_name$$}$(int index) {\n"
-                 "  copyOnWrite();\n"
-                 "  instance.remove$capitalized_name$(index);\n"
-                 "  return this;\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-}
-
-void RepeatedImmutableMessageFieldLiteGenerator::GenerateFieldInfo(
-    io::Printer* printer, std::vector<uint16_t>* output) const {
-  WriteIntToUtf16CharSequence(descriptor_->number(), output);
-  WriteIntToUtf16CharSequence(GetExperimentalJavaFieldType(descriptor_),
-                              output);
-  printer->Print(variables_,
-                 "\"$name$_\",\n"
-                 "$type$.class,\n");
-}
-
-void RepeatedImmutableMessageFieldLiteGenerator::GenerateInitializationCode(
-    io::Printer* printer) const {
-  printer->Print(variables_, "$name$_ = emptyProtobufList();\n");
-}
-
-std::string RepeatedImmutableMessageFieldLiteGenerator::GetBoxedType() const {
-  return name_resolver_->GetImmutableClassName(descriptor_->message_type());
-}
-
-void RepeatedImmutableMessageFieldLiteGenerator::GenerateKotlinDslMembers(
-    io::Printer* printer) const {
-  printer->Print(
-      variables_,
-      "/**\n"
-      " * An uninstantiable, behaviorless type to represent the field in\n"
-      " * generics.\n"
-      " */\n"
-      "@kotlin.OptIn"
-      "(com.google.protobuf.kotlin.OnlyForUseByGeneratedProtoCode::class)\n"
-      "public class ${$$kt_capitalized_name$Proxy$}$ private constructor()"
-      " : com.google.protobuf.kotlin.DslProxy()\n");
-
-  WriteFieldDocComment(printer, descriptor_);
-  printer->Print(variables_,
-                 "$kt_deprecation$ public val $kt_name$: "
-                 "com.google.protobuf.kotlin.DslList"
-                 "<$kt_type$, ${$$kt_capitalized_name$Proxy$}$>\n"
-                 "  @kotlin.jvm.JvmSynthetic\n"
-                 "  get() = com.google.protobuf.kotlin.DslList(\n"
-                 "    $kt_dsl_builder$.${$get$capitalized_name$List$}$()\n"
-                 "  )\n");
-
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_ADDER,
-                               /* builder */ false);
-  printer->Print(variables_,
-                 "@kotlin.jvm.JvmSynthetic\n"
-                 "@kotlin.jvm.JvmName(\"add$kt_capitalized_name$\")\n"
-                 "public fun com.google.protobuf.kotlin.DslList"
-                 "<$kt_type$, ${$$kt_capitalized_name$Proxy$}$>."
-                 "add(value: $kt_type$) {\n"
-                 "  $kt_dsl_builder$.${$add$capitalized_name$$}$(value)\n"
-                 "}\n");
-
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_ADDER,
-                               /* builder */ false);
-  printer->Print(variables_,
-                 "@kotlin.jvm.JvmSynthetic\n"
-                 "@kotlin.jvm.JvmName(\"plusAssign$kt_capitalized_name$\")\n"
-                 "@Suppress(\"NOTHING_TO_INLINE\")\n"
-                 "public inline operator fun com.google.protobuf.kotlin.DslList"
-                 "<$kt_type$, ${$$kt_capitalized_name$Proxy$}$>."
-                 "plusAssign(value: $kt_type$) {\n"
-                 "  add(value)\n"
-                 "}\n");
-
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_MULTI_ADDER,
-                               /* builder */ false);
-  printer->Print(variables_,
-                 "@kotlin.jvm.JvmSynthetic\n"
-                 "@kotlin.jvm.JvmName(\"addAll$kt_capitalized_name$\")\n"
-                 "public fun com.google.protobuf.kotlin.DslList"
-                 "<$kt_type$, ${$$kt_capitalized_name$Proxy$}$>."
-                 "addAll(values: kotlin.collections.Iterable<$kt_type$>) {\n"
-                 "  $kt_dsl_builder$.${$addAll$capitalized_name$$}$(values)\n"
-                 "}\n");
-
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_MULTI_ADDER,
-                               /* builder */ false);
-  printer->Print(
-      variables_,
-      "@kotlin.jvm.JvmSynthetic\n"
-      "@kotlin.jvm.JvmName(\"plusAssignAll$kt_capitalized_name$\")\n"
-      "@Suppress(\"NOTHING_TO_INLINE\")\n"
-      "public inline operator fun com.google.protobuf.kotlin.DslList"
-      "<$kt_type$, ${$$kt_capitalized_name$Proxy$}$>."
-      "plusAssign(values: kotlin.collections.Iterable<$kt_type$>) {\n"
-      "  addAll(values)\n"
-      "}\n");
-
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_INDEXED_SETTER,
-                               /* builder */ false);
-  printer->Print(
-      variables_,
-      "@kotlin.jvm.JvmSynthetic\n"
-      "@kotlin.jvm.JvmName(\"set$kt_capitalized_name$\")\n"
-      "public operator fun com.google.protobuf.kotlin.DslList"
-      "<$kt_type$, ${$$kt_capitalized_name$Proxy$}$>."
-      "set(index: kotlin.Int, value: $kt_type$) {\n"
-      "  $kt_dsl_builder$.${$set$capitalized_name$$}$(index, value)\n"
-      "}\n");
-
-  WriteFieldAccessorDocComment(printer, descriptor_, CLEARER,
-                               /* builder */ false);
-  printer->Print(variables_,
-                 "@kotlin.jvm.JvmSynthetic\n"
-                 "@kotlin.jvm.JvmName(\"clear$kt_capitalized_name$\")\n"
-                 "public fun com.google.protobuf.kotlin.DslList"
-                 "<$kt_type$, ${$$kt_capitalized_name$Proxy$}$>."
-                 "clear() {\n"
-                 "  $kt_dsl_builder$.${$clear$capitalized_name$$}$()\n"
-                 "}\n");
-}
-
-}  // namespace java
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
diff --git a/libs/protobuf/src/google/protobuf/compiler/java/message_field_lite.h b/libs/protobuf/src/google/protobuf/compiler/java/message_field_lite.h
deleted file mode 100644
index 4253acc..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/java/message_field_lite.h
+++ /dev/null
@@ -1,141 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-
-#ifndef GOOGLE_PROTOBUF_COMPILER_JAVA_MESSAGE_FIELD_LITE_H__
-#define GOOGLE_PROTOBUF_COMPILER_JAVA_MESSAGE_FIELD_LITE_H__
-
-#include <cstdint>
-#include <map>
-#include <string>
-
-#include <google/protobuf/compiler/java/field.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace java {
-class Context;            // context.h
-class ClassNameResolver;  // name_resolver.h
-}  // namespace java
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace java {
-
-class ImmutableMessageFieldLiteGenerator : public ImmutableFieldLiteGenerator {
- public:
-  explicit ImmutableMessageFieldLiteGenerator(const FieldDescriptor* descriptor,
-                                              int messageBitIndex,
-                                              Context* context);
-  ~ImmutableMessageFieldLiteGenerator() override;
-
-  // implements ImmutableFieldLiteGenerator
-  // ------------------------------------
-  int GetNumBitsForMessage() const override;
-  void GenerateInterfaceMembers(io::Printer* printer) const override;
-  void GenerateMembers(io::Printer* printer) const override;
-  void GenerateBuilderMembers(io::Printer* printer) const override;
-  void GenerateInitializationCode(io::Printer* printer) const override;
-  void GenerateFieldInfo(io::Printer* printer,
-                         std::vector<uint16_t>* output) const override;
-  void GenerateKotlinDslMembers(io::Printer* printer) const override;
-
-  std::string GetBoxedType() const override;
-
- protected:
-  const FieldDescriptor* descriptor_;
-  std::map<std::string, std::string> variables_;
-  const int messageBitIndex_;
-  ClassNameResolver* name_resolver_;
-
- private:
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(ImmutableMessageFieldLiteGenerator);
-  void GenerateKotlinOrNull(io::Printer* printer) const;
-};
-
-class ImmutableMessageOneofFieldLiteGenerator
-    : public ImmutableMessageFieldLiteGenerator {
- public:
-  ImmutableMessageOneofFieldLiteGenerator(const FieldDescriptor* descriptor,
-                                          int messageBitIndex,
-                                          Context* context);
-  ~ImmutableMessageOneofFieldLiteGenerator() override;
-
-  void GenerateMembers(io::Printer* printer) const override;
-  void GenerateBuilderMembers(io::Printer* printer) const override;
-  void GenerateFieldInfo(io::Printer* printer,
-                         std::vector<uint16_t>* output) const override;
-
- private:
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(ImmutableMessageOneofFieldLiteGenerator);
-};
-
-class RepeatedImmutableMessageFieldLiteGenerator
-    : public ImmutableFieldLiteGenerator {
- public:
-  explicit RepeatedImmutableMessageFieldLiteGenerator(
-      const FieldDescriptor* descriptor, int messageBitIndex, Context* context);
-  ~RepeatedImmutableMessageFieldLiteGenerator() override;
-
-  // implements ImmutableFieldLiteGenerator ------------------------------------
-  int GetNumBitsForMessage() const override;
-  void GenerateInterfaceMembers(io::Printer* printer) const override;
-  void GenerateMembers(io::Printer* printer) const override;
-  void GenerateBuilderMembers(io::Printer* printer) const override;
-  void GenerateInitializationCode(io::Printer* printer) const override;
-  void GenerateFieldInfo(io::Printer* printer,
-                         std::vector<uint16_t>* output) const override;
-  void GenerateKotlinDslMembers(io::Printer* printer) const override;
-
-  std::string GetBoxedType() const override;
-
- protected:
-  const FieldDescriptor* descriptor_;
-  std::map<std::string, std::string> variables_;
-  ClassNameResolver* name_resolver_;
-
- private:
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(RepeatedImmutableMessageFieldLiteGenerator);
-};
-
-}  // namespace java
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // GOOGLE_PROTOBUF_COMPILER_JAVA_MESSAGE_FIELD_LITE_H__
diff --git a/libs/protobuf/src/google/protobuf/compiler/java/message_lite.cc b/libs/protobuf/src/google/protobuf/compiler/java/message_lite.cc
deleted file mode 100644
index 9a85734..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/java/message_lite.cc
+++ /dev/null
@@ -1,1003 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: dweis@google.com (Daniel Weis)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-
-#include <google/protobuf/compiler/java/message_lite.h>
-
-#include <algorithm>
-#include <cstdint>
-#include <map>
-#include <memory>
-#include <vector>
-
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/io/printer.h>
-#include <google/protobuf/wire_format.h>
-#include <google/protobuf/stubs/strutil.h>
-#include <google/protobuf/stubs/substitute.h>
-#include <google/protobuf/compiler/java/context.h>
-#include <google/protobuf/compiler/java/doc_comment.h>
-#include <google/protobuf/compiler/java/enum_lite.h>
-#include <google/protobuf/compiler/java/extension_lite.h>
-#include <google/protobuf/compiler/java/generator_factory.h>
-#include <google/protobuf/compiler/java/helpers.h>
-#include <google/protobuf/compiler/java/message_builder.h>
-#include <google/protobuf/compiler/java/message_builder_lite.h>
-#include <google/protobuf/compiler/java/name_resolver.h>
-#include <google/protobuf/descriptor.pb.h>
-
-// Must be last.
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace java {
-
-using internal::WireFormat;
-using internal::WireFormatLite;
-
-// ===================================================================
-ImmutableMessageLiteGenerator::ImmutableMessageLiteGenerator(
-    const Descriptor* descriptor, Context* context)
-    : MessageGenerator(descriptor),
-      context_(context),
-      name_resolver_(context->GetNameResolver()),
-      field_generators_(descriptor, context_) {
-  GOOGLE_CHECK(!HasDescriptorMethods(descriptor->file(), context->EnforceLite()))
-      << "Generator factory error: A lite message generator is used to "
-         "generate non-lite messages.";
-  for (int i = 0; i < descriptor_->field_count(); i++) {
-    if (IsRealOneof(descriptor_->field(i))) {
-      oneofs_.insert(descriptor_->field(i)->containing_oneof());
-    }
-  }
-}
-
-ImmutableMessageLiteGenerator::~ImmutableMessageLiteGenerator() {}
-
-void ImmutableMessageLiteGenerator::GenerateStaticVariables(
-    io::Printer* printer, int* bytecode_estimate) {
-  // Generate static members for all nested types.
-  for (int i = 0; i < descriptor_->nested_type_count(); i++) {
-    // TODO(kenton):  Reuse MessageGenerator objects?
-    ImmutableMessageLiteGenerator(descriptor_->nested_type(i), context_)
-        .GenerateStaticVariables(printer, bytecode_estimate);
-  }
-}
-
-int ImmutableMessageLiteGenerator::GenerateStaticVariableInitializers(
-    io::Printer* printer) {
-  int bytecode_estimate = 0;
-  // Generate static member initializers for all nested types.
-  for (int i = 0; i < descriptor_->nested_type_count(); i++) {
-    // TODO(kenton):  Reuse MessageGenerator objects?
-    bytecode_estimate +=
-        ImmutableMessageLiteGenerator(descriptor_->nested_type(i), context_)
-            .GenerateStaticVariableInitializers(printer);
-  }
-  return bytecode_estimate;
-}
-
-// ===================================================================
-
-void ImmutableMessageLiteGenerator::GenerateInterface(io::Printer* printer) {
-  MaybePrintGeneratedAnnotation(context_, printer, descriptor_,
-                                /* immutable = */ true, "OrBuilder");
-  if (descriptor_->extension_range_count() > 0) {
-    printer->Print(
-        "$deprecation$public interface ${$$classname$OrBuilder$}$ extends \n"
-        "    $extra_interfaces$\n"
-        "     com.google.protobuf.GeneratedMessageLite.\n"
-        "          ExtendableMessageOrBuilder<\n"
-        "              $classname$, $classname$.Builder> {\n",
-        "deprecation",
-        descriptor_->options().deprecated() ? "@java.lang.Deprecated " : "",
-        "extra_interfaces", ExtraMessageOrBuilderInterfaces(descriptor_),
-        "classname", descriptor_->name(), "{", "", "}", "");
-  } else {
-    printer->Print(
-        "$deprecation$public interface ${$$classname$OrBuilder$}$ extends\n"
-        "    $extra_interfaces$\n"
-        "    com.google.protobuf.MessageLiteOrBuilder {\n",
-        "deprecation",
-        descriptor_->options().deprecated() ? "@java.lang.Deprecated " : "",
-        "extra_interfaces", ExtraMessageOrBuilderInterfaces(descriptor_),
-        "classname", descriptor_->name(), "{", "", "}", "");
-  }
-  printer->Annotate("{", "}", descriptor_);
-
-  printer->Indent();
-  for (int i = 0; i < descriptor_->field_count(); i++) {
-    printer->Print("\n");
-    field_generators_.get(descriptor_->field(i))
-        .GenerateInterfaceMembers(printer);
-  }
-  for (auto oneof : oneofs_) {
-    printer->Print(
-        "\n"
-        "public $classname$.$oneof_capitalized_name$Case "
-        "get$oneof_capitalized_name$Case();\n",
-        "oneof_capitalized_name",
-        context_->GetOneofGeneratorInfo(oneof)->capitalized_name, "classname",
-        context_->GetNameResolver()->GetImmutableClassName(descriptor_));
-  }
-  printer->Outdent();
-
-  printer->Print("}\n");
-}
-
-// ===================================================================
-
-void ImmutableMessageLiteGenerator::Generate(io::Printer* printer) {
-  bool is_own_file = IsOwnFile(descriptor_, /* immutable = */ true);
-
-  std::map<std::string, std::string> variables;
-  variables["static"] = is_own_file ? " " : " static ";
-  variables["classname"] = descriptor_->name();
-  variables["extra_interfaces"] = ExtraMessageInterfaces(descriptor_);
-  variables["deprecation"] =
-      descriptor_->options().deprecated() ? "@java.lang.Deprecated " : "";
-
-  WriteMessageDocComment(printer, descriptor_);
-  MaybePrintGeneratedAnnotation(context_, printer, descriptor_,
-                                /* immutable = */ true);
-
-
-  // The builder_type stores the super type name of the nested Builder class.
-  std::string builder_type;
-  if (descriptor_->extension_range_count() > 0) {
-    printer->Print(
-        variables,
-        "$deprecation$public $static$final class $classname$ extends\n"
-        "    com.google.protobuf.GeneratedMessageLite.ExtendableMessage<\n"
-        "      $classname$, $classname$.Builder> implements\n"
-        "    $extra_interfaces$\n"
-        "    $classname$OrBuilder {\n");
-    builder_type = strings::Substitute(
-        "com.google.protobuf.GeneratedMessageLite.ExtendableBuilder<$0, ?>",
-        name_resolver_->GetImmutableClassName(descriptor_));
-  } else {
-    printer->Print(
-        variables,
-        "$deprecation$public $static$final class $classname$ extends\n"
-        "    com.google.protobuf.GeneratedMessageLite<\n"
-        "        $classname$, $classname$.Builder> implements\n"
-        "    $extra_interfaces$\n"
-        "    $classname$OrBuilder {\n");
-
-    builder_type = "com.google.protobuf.GeneratedMessageLite.Builder";
-  }
-  printer->Indent();
-
-  GenerateConstructor(printer);
-
-  // Nested types
-  for (int i = 0; i < descriptor_->enum_type_count(); i++) {
-    EnumLiteGenerator(descriptor_->enum_type(i), true, context_)
-        .Generate(printer);
-  }
-
-  for (int i = 0; i < descriptor_->nested_type_count(); i++) {
-    // Don't generate Java classes for map entry messages.
-    if (IsMapEntry(descriptor_->nested_type(i))) continue;
-    ImmutableMessageLiteGenerator messageGenerator(descriptor_->nested_type(i),
-                                                   context_);
-    messageGenerator.GenerateInterface(printer);
-    messageGenerator.Generate(printer);
-  }
-
-  // Integers for bit fields.
-  int totalBits = 0;
-  for (int i = 0; i < descriptor_->field_count(); i++) {
-    totalBits +=
-        field_generators_.get(descriptor_->field(i)).GetNumBitsForMessage();
-  }
-  int totalInts = (totalBits + 31) / 32;
-  for (int i = 0; i < totalInts; i++) {
-    printer->Print("private int $bit_field_name$;\n", "bit_field_name",
-                   GetBitFieldName(i));
-  }
-
-  // oneof
-  std::map<std::string, std::string> vars;
-  for (auto oneof : oneofs_) {
-    vars["oneof_name"] = context_->GetOneofGeneratorInfo(oneof)->name;
-    vars["oneof_capitalized_name"] =
-        context_->GetOneofGeneratorInfo(oneof)->capitalized_name;
-    vars["oneof_index"] = StrCat((oneof)->index());
-    // oneofCase_ and oneof_
-    printer->Print(vars,
-                   "private int $oneof_name$Case_ = 0;\n"
-                   "private java.lang.Object $oneof_name$_;\n");
-    // OneofCase enum
-    printer->Print(vars, "public enum $oneof_capitalized_name$Case {\n");
-    printer->Indent();
-    for (int j = 0; j < (oneof)->field_count(); j++) {
-      const FieldDescriptor* field = (oneof)->field(j);
-      printer->Print("$field_name$($field_number$),\n", "field_name",
-                     ToUpper(field->name()), "field_number",
-                     StrCat(field->number()));
-    }
-    printer->Print("$cap_oneof_name$_NOT_SET(0);\n", "cap_oneof_name",
-                   ToUpper(vars["oneof_name"]));
-    printer->Print(vars,
-                   "private final int value;\n"
-                   "private $oneof_capitalized_name$Case(int value) {\n"
-                   "  this.value = value;\n"
-                   "}\n");
-    printer->Print(
-        vars,
-        "/**\n"
-        " * @deprecated Use {@link #forNumber(int)} instead.\n"
-        " */\n"
-        "@java.lang.Deprecated\n"
-        "public static $oneof_capitalized_name$Case valueOf(int value) {\n"
-        "  return forNumber(value);\n"
-        "}\n"
-        "\n"
-        "public static $oneof_capitalized_name$Case forNumber(int value) {\n"
-        "  switch (value) {\n");
-    for (int j = 0; j < (oneof)->field_count(); j++) {
-      const FieldDescriptor* field = (oneof)->field(j);
-      printer->Print("    case $field_number$: return $field_name$;\n",
-                     "field_number", StrCat(field->number()),
-                     "field_name", ToUpper(field->name()));
-    }
-    printer->Print(
-        "    case 0: return $cap_oneof_name$_NOT_SET;\n"
-        "    default: return null;\n"
-        "  }\n"
-        "}\n"
-        // TODO(b/135620659): Rename this to "getFieldNumber" or something to
-        // disambiguate it from actual proto enums.
-        "public int getNumber() {\n"
-        "  return this.value;\n"
-        "}\n",
-        "cap_oneof_name", ToUpper(vars["oneof_name"]));
-    printer->Outdent();
-    printer->Print("};\n\n");
-    // oneofCase()
-    printer->Print(vars,
-                   "@java.lang.Override\n"
-                   "public $oneof_capitalized_name$Case\n"
-                   "get$oneof_capitalized_name$Case() {\n"
-                   "  return $oneof_capitalized_name$Case.forNumber(\n"
-                   "      $oneof_name$Case_);\n"
-                   "}\n"
-                   "\n"
-                   "private void clear$oneof_capitalized_name$() {\n"
-                   "  $oneof_name$Case_ = 0;\n"
-                   "  $oneof_name$_ = null;\n"
-                   "}\n"
-                   "\n");
-  }
-
-  // Fields
-  for (int i = 0; i < descriptor_->field_count(); i++) {
-    printer->Print("public static final int $constant_name$ = $number$;\n",
-                   "constant_name", FieldConstantName(descriptor_->field(i)),
-                   "number", StrCat(descriptor_->field(i)->number()));
-    field_generators_.get(descriptor_->field(i)).GenerateMembers(printer);
-    printer->Print("\n");
-  }
-
-  GenerateParseFromMethods(printer);
-  GenerateBuilder(printer);
-
-  if (HasRequiredFields(descriptor_)) {
-    // Memoizes whether the protocol buffer is fully initialized (has all
-    // required fields). 0 means false, 1 means true, and all other values
-    // mean not yet computed.
-    printer->Print("private byte memoizedIsInitialized = 2;\n");
-  }
-
-  printer->Print(
-      "@java.lang.Override\n"
-      "@java.lang.SuppressWarnings({\"unchecked\", \"fallthrough\"})\n"
-      "protected final java.lang.Object dynamicMethod(\n"
-      "    com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,\n"
-      "    java.lang.Object arg0, java.lang.Object arg1) {\n"
-      "  switch (method) {\n"
-      "    case NEW_MUTABLE_INSTANCE: {\n"
-      "      return new $classname$();\n"
-      "    }\n",
-      "classname", name_resolver_->GetImmutableClassName(descriptor_));
-
-  printer->Indent();
-  printer->Indent();
-
-  printer->Print("case NEW_BUILDER: {\n");
-
-  printer->Indent();
-  GenerateDynamicMethodNewBuilder(printer);
-  printer->Outdent();
-
-  printer->Print(
-      "}\n"
-      "case BUILD_MESSAGE_INFO: {\n");
-
-  printer->Indent();
-  GenerateDynamicMethodNewBuildMessageInfo(printer);
-  printer->Outdent();
-
-  printer->Print(
-      "}\n"
-      "// fall through\n"
-      "case GET_DEFAULT_INSTANCE: {\n"
-      "  return DEFAULT_INSTANCE;\n"
-      "}\n"
-      "case GET_PARSER: {\n"
-      // Generally one would use the lazy initialization holder pattern for
-      // manipulating static fields but that has exceptional cost on Android as
-      // it will generate an extra class for every message. Instead, use the
-      // double-check locking pattern which works just as well.
-      //
-      // The "parser" temporary mirrors the "PARSER" field to eliminate a read
-      // at the final return statement.
-      "  com.google.protobuf.Parser<$classname$> parser = PARSER;\n"
-      "  if (parser == null) {\n"
-      "    synchronized ($classname$.class) {\n"
-      "      parser = PARSER;\n"
-      "      if (parser == null) {\n"
-      "        parser =\n"
-      "            new DefaultInstanceBasedParser<$classname$>(\n"
-      "                DEFAULT_INSTANCE);\n"
-      "        PARSER = parser;\n"
-      "      }\n"
-      "    }\n"
-      "  }\n"
-      "  return parser;\n",
-      "classname", name_resolver_->GetImmutableClassName(descriptor_));
-
-  printer->Outdent();
-
-  if (HasRequiredFields(descriptor_)) {
-    printer->Print(
-        "}\n"
-        "case GET_MEMOIZED_IS_INITIALIZED: {\n"
-        "  return memoizedIsInitialized;\n"
-        "}\n"
-        "case SET_MEMOIZED_IS_INITIALIZED: {\n"
-        "  memoizedIsInitialized = (byte) (arg0 == null ? 0 : 1);\n"
-        "  return null;\n"
-        "}\n");
-  } else {
-    printer->Print(
-        "}\n"
-        "case GET_MEMOIZED_IS_INITIALIZED: {\n"
-        "  return (byte) 1;\n"
-        "}\n"
-        "case SET_MEMOIZED_IS_INITIALIZED: {\n"
-        "  return null;\n"
-        "}\n");
-  }
-
-  printer->Outdent();
-  printer->Print(
-      "  }\n"
-      "  throw new UnsupportedOperationException();\n"
-      "}\n"
-      "\n",
-      "classname", name_resolver_->GetImmutableClassName(descriptor_));
-
-  printer->Print(
-      "\n"
-      "// @@protoc_insertion_point(class_scope:$full_name$)\n",
-      "full_name", descriptor_->full_name());
-
-  // Carefully initialize the default instance in such a way that it doesn't
-  // conflict with other initialization.
-  printer->Print("private static final $classname$ DEFAULT_INSTANCE;\n",
-                 "classname",
-                 name_resolver_->GetImmutableClassName(descriptor_));
-
-  printer->Print(
-      "static {\n"
-      "  $classname$ defaultInstance = new $classname$();\n"
-      "  // New instances are implicitly immutable so no need to make\n"
-      "  // immutable.\n"
-      "  DEFAULT_INSTANCE = defaultInstance;\n"
-      // Register the default instance in a map. This map will be used by
-      // experimental runtime to lookup default instance given a class instance
-      // without using Java reflection.
-      "  com.google.protobuf.GeneratedMessageLite.registerDefaultInstance(\n"
-      "    $classname$.class, defaultInstance);\n"
-      "}\n"
-      "\n",
-      "classname", descriptor_->name());
-
-  printer->Print(
-      "public static $classname$ getDefaultInstance() {\n"
-      "  return DEFAULT_INSTANCE;\n"
-      "}\n"
-      "\n",
-      "classname", name_resolver_->GetImmutableClassName(descriptor_));
-
-  // 'of' method for Wrappers
-  if (IsWrappersProtoFile(descriptor_->file())) {
-    printer->Print(
-        "public static $classname$ of($field_type$ value) {\n"
-        "  return newBuilder().setValue(value).build();\n"
-        "}\n"
-        "\n",
-        "classname", name_resolver_->GetImmutableClassName(descriptor_),
-        "field_type", PrimitiveTypeName(GetJavaType(descriptor_->field(0))));
-  }
-
-  GenerateParser(printer);
-
-  // Extensions must be declared after the DEFAULT_INSTANCE is initialized
-  // because the DEFAULT_INSTANCE is used by the extension to lazily retrieve
-  // the outer class's FileDescriptor.
-  for (int i = 0; i < descriptor_->extension_count(); i++) {
-    ImmutableExtensionLiteGenerator(descriptor_->extension(i), context_)
-        .Generate(printer);
-  }
-
-  printer->Outdent();
-  printer->Print("}\n\n");
-}
-
-void ImmutableMessageLiteGenerator::GenerateDynamicMethodNewBuildMessageInfo(
-    io::Printer* printer) {
-  printer->Indent();
-
-  // Collect field info into a sequence of UTF-16 chars. It will be embedded
-  // as a Java string in the generated code.
-  std::vector<uint16_t> chars;
-
-  int flags = 0;
-  if (IsProto2(descriptor_->file())) {
-    flags |= 0x1;
-  }
-  if (descriptor_->options().message_set_wire_format()) {
-    flags |= 0x2;
-  }
-  WriteIntToUtf16CharSequence(flags, &chars);
-  WriteIntToUtf16CharSequence(descriptor_->field_count(), &chars);
-
-  if (descriptor_->field_count() == 0) {
-    printer->Print("java.lang.Object[] objects = null;");
-  } else {
-    // A single array of all fields (including oneof, oneofCase, hasBits).
-    printer->Print("java.lang.Object[] objects = new java.lang.Object[] {\n");
-    printer->Indent();
-
-    // Record the number of oneofs.
-    WriteIntToUtf16CharSequence(oneofs_.size(), &chars);
-    for (auto oneof : oneofs_) {
-      printer->Print(
-          "\"$oneof_name$_\",\n"
-          "\"$oneof_name$Case_\",\n",
-          "oneof_name", context_->GetOneofGeneratorInfo(oneof)->name);
-    }
-
-    // Integers for bit fields.
-    int total_bits = 0;
-    for (int i = 0; i < descriptor_->field_count(); i++) {
-      total_bits +=
-          field_generators_.get(descriptor_->field(i)).GetNumBitsForMessage();
-    }
-    int total_ints = (total_bits + 31) / 32;
-    for (int i = 0; i < total_ints; i++) {
-      printer->Print("\"$bit_field_name$\",\n", "bit_field_name",
-                     GetBitFieldName(i));
-    }
-    WriteIntToUtf16CharSequence(total_ints, &chars);
-
-    int map_count = 0;
-    int repeated_count = 0;
-    std::unique_ptr<const FieldDescriptor*[]> sorted_fields(
-        SortFieldsByNumber(descriptor_));
-    for (int i = 0; i < descriptor_->field_count(); i++) {
-      const FieldDescriptor* field = sorted_fields[i];
-      if (field->is_map()) {
-        map_count++;
-      } else if (field->is_repeated()) {
-        repeated_count++;
-      }
-    }
-
-    WriteIntToUtf16CharSequence(sorted_fields[0]->number(), &chars);
-    WriteIntToUtf16CharSequence(
-        sorted_fields[descriptor_->field_count() - 1]->number(), &chars);
-    WriteIntToUtf16CharSequence(descriptor_->field_count(), &chars);
-    WriteIntToUtf16CharSequence(map_count, &chars);
-    WriteIntToUtf16CharSequence(repeated_count, &chars);
-
-    std::vector<const FieldDescriptor*> fields_for_is_initialized_check;
-    for (int i = 0; i < descriptor_->field_count(); i++) {
-      if (descriptor_->field(i)->is_required() ||
-          (GetJavaType(descriptor_->field(i)) == JAVATYPE_MESSAGE &&
-           HasRequiredFields(descriptor_->field(i)->message_type()))) {
-        fields_for_is_initialized_check.push_back(descriptor_->field(i));
-      }
-    }
-    WriteIntToUtf16CharSequence(fields_for_is_initialized_check.size(), &chars);
-
-    for (int i = 0; i < descriptor_->field_count(); i++) {
-      const FieldDescriptor* field = sorted_fields[i];
-      field_generators_.get(field).GenerateFieldInfo(printer, &chars);
-    }
-    printer->Outdent();
-    printer->Print("};\n");
-  }
-
-  printer->Print("java.lang.String info =\n");
-  std::string line;
-  for (size_t i = 0; i < chars.size(); i++) {
-    uint16_t code = chars[i];
-    EscapeUtf16ToString(code, &line);
-    if (line.size() >= 80) {
-      printer->Print("    \"$string$\" +\n", "string", line);
-      line.clear();
-    }
-  }
-  printer->Print("    \"$string$\";\n", "string", line);
-
-  printer->Print("return newMessageInfo(DEFAULT_INSTANCE, info, objects);\n");
-  printer->Outdent();
-}
-
-// ===================================================================
-
-void ImmutableMessageLiteGenerator::GenerateParseFromMethods(
-    io::Printer* printer) {
-  printer->Print(
-      "public static $classname$ parseFrom(\n"
-      "    java.nio.ByteBuffer data)\n"
-      "    throws com.google.protobuf.InvalidProtocolBufferException {\n"
-      "  return com.google.protobuf.GeneratedMessageLite.parseFrom(\n"
-      "      DEFAULT_INSTANCE, data);\n"
-      "}\n"
-      "public static $classname$ parseFrom(\n"
-      "    java.nio.ByteBuffer data,\n"
-      "    com.google.protobuf.ExtensionRegistryLite extensionRegistry)\n"
-      "    throws com.google.protobuf.InvalidProtocolBufferException {\n"
-      "  return com.google.protobuf.GeneratedMessageLite.parseFrom(\n"
-      "      DEFAULT_INSTANCE, data, extensionRegistry);\n"
-      "}\n"
-      "public static $classname$ parseFrom(\n"
-      "    com.google.protobuf.ByteString data)\n"
-      "    throws com.google.protobuf.InvalidProtocolBufferException {\n"
-      "  return com.google.protobuf.GeneratedMessageLite.parseFrom(\n"
-      "      DEFAULT_INSTANCE, data);\n"
-      "}\n"
-      "public static $classname$ parseFrom(\n"
-      "    com.google.protobuf.ByteString data,\n"
-      "    com.google.protobuf.ExtensionRegistryLite extensionRegistry)\n"
-      "    throws com.google.protobuf.InvalidProtocolBufferException {\n"
-      "  return com.google.protobuf.GeneratedMessageLite.parseFrom(\n"
-      "      DEFAULT_INSTANCE, data, extensionRegistry);\n"
-      "}\n"
-      "public static $classname$ parseFrom(byte[] data)\n"
-      "    throws com.google.protobuf.InvalidProtocolBufferException {\n"
-      "  return com.google.protobuf.GeneratedMessageLite.parseFrom(\n"
-      "      DEFAULT_INSTANCE, data);\n"
-      "}\n"
-      "public static $classname$ parseFrom(\n"
-      "    byte[] data,\n"
-      "    com.google.protobuf.ExtensionRegistryLite extensionRegistry)\n"
-      "    throws com.google.protobuf.InvalidProtocolBufferException {\n"
-      "  return com.google.protobuf.GeneratedMessageLite.parseFrom(\n"
-      "      DEFAULT_INSTANCE, data, extensionRegistry);\n"
-      "}\n"
-      "public static $classname$ parseFrom(java.io.InputStream input)\n"
-      "    throws java.io.IOException {\n"
-      "  return com.google.protobuf.GeneratedMessageLite.parseFrom(\n"
-      "      DEFAULT_INSTANCE, input);\n"
-      "}\n"
-      "public static $classname$ parseFrom(\n"
-      "    java.io.InputStream input,\n"
-      "    com.google.protobuf.ExtensionRegistryLite extensionRegistry)\n"
-      "    throws java.io.IOException {\n"
-      "  return com.google.protobuf.GeneratedMessageLite.parseFrom(\n"
-      "      DEFAULT_INSTANCE, input, extensionRegistry);\n"
-      "}\n"
-      "public static $classname$ parseDelimitedFrom(java.io.InputStream "
-      "input)\n"
-      "    throws java.io.IOException {\n"
-      "  return parseDelimitedFrom(DEFAULT_INSTANCE, input);\n"
-      "}\n"
-      "public static $classname$ parseDelimitedFrom(\n"
-      "    java.io.InputStream input,\n"
-      "    com.google.protobuf.ExtensionRegistryLite extensionRegistry)\n"
-      "    throws java.io.IOException {\n"
-      "  return parseDelimitedFrom(DEFAULT_INSTANCE, input, "
-      "extensionRegistry);\n"
-      "}\n"
-      "public static $classname$ parseFrom(\n"
-      "    com.google.protobuf.CodedInputStream input)\n"
-      "    throws java.io.IOException {\n"
-      "  return com.google.protobuf.GeneratedMessageLite.parseFrom(\n"
-      "      DEFAULT_INSTANCE, input);\n"
-      "}\n"
-      "public static $classname$ parseFrom(\n"
-      "    com.google.protobuf.CodedInputStream input,\n"
-      "    com.google.protobuf.ExtensionRegistryLite extensionRegistry)\n"
-      "    throws java.io.IOException {\n"
-      "  return com.google.protobuf.GeneratedMessageLite.parseFrom(\n"
-      "      DEFAULT_INSTANCE, input, extensionRegistry);\n"
-      "}\n"
-      "\n",
-      "classname", name_resolver_->GetImmutableClassName(descriptor_));
-}
-
-// ===================================================================
-
-void ImmutableMessageLiteGenerator::GenerateBuilder(io::Printer* printer) {
-  printer->Print(
-      "public static Builder newBuilder() {\n"
-      "  return (Builder) DEFAULT_INSTANCE.createBuilder();\n"
-      "}\n"
-      "public static Builder newBuilder($classname$ prototype) {\n"
-      "  return (Builder) DEFAULT_INSTANCE.createBuilder(prototype);\n"
-      "}\n"
-      "\n",
-      "classname", name_resolver_->GetImmutableClassName(descriptor_));
-
-  MessageBuilderLiteGenerator builderGenerator(descriptor_, context_);
-  builderGenerator.Generate(printer);
-}
-
-// ===================================================================
-
-void ImmutableMessageLiteGenerator::GenerateDynamicMethodNewBuilder(
-    io::Printer* printer) {
-  printer->Print("return new Builder();\n");
-}
-
-// ===================================================================
-
-void ImmutableMessageLiteGenerator::GenerateExtensionRegistrationCode(
-    io::Printer* printer) {
-  for (int i = 0; i < descriptor_->extension_count(); i++) {
-    ImmutableExtensionLiteGenerator(descriptor_->extension(i), context_)
-        .GenerateRegistrationCode(printer);
-  }
-
-  for (int i = 0; i < descriptor_->nested_type_count(); i++) {
-    ImmutableMessageLiteGenerator(descriptor_->nested_type(i), context_)
-        .GenerateExtensionRegistrationCode(printer);
-  }
-}
-
-// ===================================================================
-void ImmutableMessageLiteGenerator::GenerateConstructor(io::Printer* printer) {
-  printer->Print("private $classname$() {\n", "classname", descriptor_->name());
-  printer->Indent();
-
-  // Initialize all fields to default.
-  GenerateInitializers(printer);
-
-  printer->Outdent();
-  printer->Print("}\n");
-}
-
-// ===================================================================
-void ImmutableMessageLiteGenerator::GenerateParser(io::Printer* printer) {
-  printer->Print(
-      "private static volatile com.google.protobuf.Parser<$classname$> "
-      "PARSER;\n"
-      "\n"
-      "public static com.google.protobuf.Parser<$classname$> parser() {\n"
-      "  return DEFAULT_INSTANCE.getParserForType();\n"
-      "}\n",
-      "classname", descriptor_->name());
-}
-
-// ===================================================================
-void ImmutableMessageLiteGenerator::GenerateInitializers(io::Printer* printer) {
-  for (int i = 0; i < descriptor_->field_count(); i++) {
-    if (!IsRealOneof(descriptor_->field(i))) {
-      field_generators_.get(descriptor_->field(i))
-          .GenerateInitializationCode(printer);
-    }
-  }
-}
-
-void ImmutableMessageLiteGenerator::GenerateKotlinDsl(
-    io::Printer* printer) const {
-  printer->Print(
-      "@kotlin.OptIn"
-      "(com.google.protobuf.kotlin.OnlyForUseByGeneratedProtoCode::class)\n"
-      "@com.google.protobuf.kotlin.ProtoDslMarker\n");
-  printer->Print(
-      "public class Dsl private constructor(\n"
-      "  private val _builder: $message$.Builder\n"
-      ") {\n"
-      "  public companion object {\n"
-      "    @kotlin.jvm.JvmSynthetic\n"
-      "    @kotlin.PublishedApi\n"
-      "    internal fun _create(builder: $message$.Builder): Dsl = "
-      "Dsl(builder)\n"
-      "  }\n"
-      "\n"
-      "  @kotlin.jvm.JvmSynthetic\n"
-      "  @kotlin.PublishedApi\n"
-      "  internal fun _build(): $message$ = _builder.build()\n",
-      "message", name_resolver_->GetClassName(descriptor_, true));
-
-  printer->Indent();
-
-  for (int i = 0; i < descriptor_->field_count(); i++) {
-    printer->Print("\n");
-    field_generators_.get(descriptor_->field(i))
-        .GenerateKotlinDslMembers(printer);
-  }
-
-  for (auto oneof : oneofs_) {
-    printer->Print(
-        "public val $oneof_name$Case: $message$.$oneof_capitalized_name$Case\n"
-        "  @JvmName(\"get$oneof_capitalized_name$Case\")\n"
-        "  get() = _builder.get$oneof_capitalized_name$Case()\n\n"
-        "public fun clear$oneof_capitalized_name$() {\n"
-        "  _builder.clear$oneof_capitalized_name$()\n"
-        "}\n",
-        "oneof_name", context_->GetOneofGeneratorInfo(oneof)->name,
-        "oneof_capitalized_name",
-        context_->GetOneofGeneratorInfo(oneof)->capitalized_name, "message",
-        name_resolver_->GetClassName(descriptor_, true));
-  }
-
-  if (descriptor_->extension_range_count() > 0) {
-    GenerateKotlinExtensions(printer);
-  }
-
-  printer->Outdent();
-  printer->Print("}\n");
-}
-
-void ImmutableMessageLiteGenerator::GenerateKotlinMembers(
-    io::Printer* printer) const {
-  printer->Print(
-      "@kotlin.jvm.JvmName(\"-initialize$camelcase_name$\")\n"
-      "public inline fun $camelcase_name$(block: $message_kt$.Dsl.() -> "
-      "kotlin.Unit): "
-      "$message$ =\n"
-      "  $message_kt$.Dsl._create($message$.newBuilder()).apply { block() "
-      "}._build()\n",
-      "camelcase_name", name_resolver_->GetKotlinFactoryName(descriptor_),
-      "message_kt", name_resolver_->GetKotlinExtensionsClassName(descriptor_),
-      "message", name_resolver_->GetClassName(descriptor_, true));
-
-  printer->Print("public object $name$Kt {\n", "name", descriptor_->name());
-  printer->Indent();
-  GenerateKotlinDsl(printer);
-  for (int i = 0; i < descriptor_->nested_type_count(); i++) {
-    if (IsMapEntry(descriptor_->nested_type(i))) continue;
-    ImmutableMessageLiteGenerator(descriptor_->nested_type(i), context_)
-        .GenerateKotlinMembers(printer);
-  }
-  printer->Outdent();
-  printer->Print("}\n");
-}
-
-void ImmutableMessageLiteGenerator::GenerateTopLevelKotlinMembers(
-    io::Printer* printer) const {
-  printer->Print(
-      "public inline fun $message$.copy(block: $message_kt$.Dsl.() -> "
-      "kotlin.Unit): "
-      "$message$ =\n"
-      "  $message_kt$.Dsl._create(this.toBuilder()).apply { block() "
-      "}._build()\n\n",
-      "message", name_resolver_->GetClassName(descriptor_, true), "message_kt",
-      name_resolver_->GetKotlinExtensionsClassName(descriptor_));
-
-  for (int i = 0; i < descriptor_->nested_type_count(); i++) {
-    if (IsMapEntry(descriptor_->nested_type(i))) continue;
-    ImmutableMessageLiteGenerator(descriptor_->nested_type(i), context_)
-        .GenerateTopLevelKotlinMembers(printer);
-  }
-
-  GenerateKotlinOrNull(printer);
-}
-
-void ImmutableMessageLiteGenerator::GenerateKotlinOrNull(io::Printer* printer) const {
-  // Generate getFieldOrNull getters for all optional message fields.
-  for (int i = 0; i < descriptor_->field_count(); i++) {
-    const FieldDescriptor* field = descriptor_->field(i);
-    if (field->has_presence() && GetJavaType(field) == JAVATYPE_MESSAGE) {
-      printer->Print(
-          "public val $full_classname$OrBuilder.$camelcase_name$OrNull: "
-          "$full_name$?\n"
-          "  get() = if (has$name$()) get$name$() else null\n\n",
-          "full_classname", name_resolver_->GetClassName(descriptor_, true),
-          "camelcase_name", context_->GetFieldGeneratorInfo(field)->name,
-          "full_name",
-          name_resolver_->GetImmutableClassName(field->message_type()), "name",
-          context_->GetFieldGeneratorInfo(field)->capitalized_name);
-    }
-  }
-}
-
-void ImmutableMessageLiteGenerator::GenerateKotlinExtensions(
-    io::Printer* printer) const {
-  std::string message_name = name_resolver_->GetClassName(descriptor_, true);
-
-  printer->Print(
-      "@Suppress(\"UNCHECKED_CAST\")\n"
-      "@kotlin.jvm.JvmSynthetic\n"
-      "public operator fun <T : kotlin.Any> get(extension: "
-      "com.google.protobuf.ExtensionLite<$message$, T>): T {\n"
-      "  return if (extension.isRepeated) {\n"
-      "    get(extension as com.google.protobuf.ExtensionLite<$message$, "
-      "List<*>>) as T\n"
-      "  } else {\n"
-      "    _builder.getExtension(extension)\n"
-      "  }\n"
-      "}\n\n",
-      "message", message_name);
-
-  printer->Print(
-      "@kotlin.jvm.JvmSynthetic\n"
-      "@kotlin.OptIn"
-      "(com.google.protobuf.kotlin.OnlyForUseByGeneratedProtoCode::class)\n"
-      "@kotlin.jvm.JvmName(\"-getRepeatedExtension\")\n"
-      "public operator fun <E : kotlin.Any> get(\n"
-      "  extension: com.google.protobuf.ExtensionLite<$message$, List<E>>\n"
-      "): com.google.protobuf.kotlin.ExtensionList<E, $message$> {\n"
-      "  return com.google.protobuf.kotlin.ExtensionList(extension, "
-      "_builder.getExtension(extension))\n"
-      "}\n\n",
-      "message", message_name);
-
-  printer->Print(
-      "@kotlin.jvm.JvmSynthetic\n"
-      "public operator fun contains(extension: "
-      "com.google.protobuf.ExtensionLite<$message$, *>): "
-      "Boolean {\n"
-      "  return _builder.hasExtension(extension)\n"
-      "}\n\n",
-      "message", message_name);
-
-  printer->Print(
-      "@kotlin.jvm.JvmSynthetic\n"
-      "public fun clear(extension: "
-      "com.google.protobuf.ExtensionLite<$message$, *>) "
-      "{\n"
-      "  _builder.clearExtension(extension)\n"
-      "}\n\n",
-      "message", message_name);
-
-  printer->Print(
-      "@kotlin.jvm.JvmSynthetic\n"
-      "@kotlin.PublishedApi\n"
-      "internal fun <T : kotlin.Any> setExtension(extension: "
-      "com.google.protobuf.ExtensionLite<$message$, T>, "
-      "value: T) {\n"
-      "  _builder.setExtension(extension, value)\n"
-      "}\n\n",
-      "message", message_name);
-
-  printer->Print(
-      "@kotlin.jvm.JvmSynthetic\n"
-      "@Suppress(\"NOTHING_TO_INLINE\")\n"
-      "public inline operator fun <T : Comparable<T>> set(\n"
-      "  extension: com.google.protobuf.ExtensionLite<$message$, T>,\n"
-      "  value: T\n"
-      ") {\n"
-      "  setExtension(extension, value)\n"
-      "}\n\n",
-      "message", message_name);
-
-  printer->Print(
-      "@kotlin.jvm.JvmSynthetic\n"
-      "@Suppress(\"NOTHING_TO_INLINE\")\n"
-      "public inline operator fun set(\n"
-      "  extension: com.google.protobuf.ExtensionLite<$message$, "
-      "com.google.protobuf.ByteString>,\n"
-      "  value: com.google.protobuf.ByteString\n"
-      ") {\n"
-      "  setExtension(extension, value)\n"
-      "}\n\n",
-      "message", message_name);
-
-  printer->Print(
-      "@kotlin.jvm.JvmSynthetic\n"
-      "@Suppress(\"NOTHING_TO_INLINE\")\n"
-      "public inline operator fun <T : com.google.protobuf.MessageLite> set(\n"
-      "  extension: com.google.protobuf.ExtensionLite<$message$, T>,\n"
-      "  value: T\n"
-      ") {\n"
-      "  setExtension(extension, value)\n"
-      "}\n\n",
-      "message", message_name);
-
-  printer->Print(
-      "@kotlin.jvm.JvmSynthetic\n"
-      "public fun<E : kotlin.Any> com.google.protobuf.kotlin.ExtensionList<E, "
-      "$message$>.add(value: E) {\n"
-      "  _builder.addExtension(this.extension, value)\n"
-      "}\n\n",
-      "message", message_name);
-
-  printer->Print(
-      "@kotlin.jvm.JvmSynthetic\n"
-      "@Suppress(\"NOTHING_TO_INLINE\")\n"
-      "public inline operator fun <E : kotlin.Any> "
-      "com.google.protobuf.kotlin.ExtensionList<E, "
-      "$message$>.plusAssign"
-      "(value: E) {\n"
-      "  add(value)\n"
-      "}\n\n",
-      "message", message_name);
-
-  printer->Print(
-      "@kotlin.jvm.JvmSynthetic\n"
-      "public fun<E : kotlin.Any> com.google.protobuf.kotlin.ExtensionList<E, "
-      "$message$>.addAll(values: Iterable<E>) {\n"
-      "  for (value in values) {\n"
-      "    add(value)\n"
-      "  }\n"
-      "}\n\n",
-      "message", message_name);
-
-  printer->Print(
-      "@kotlin.jvm.JvmSynthetic\n"
-      "@Suppress(\"NOTHING_TO_INLINE\")\n"
-      "public inline operator fun <E : kotlin.Any> "
-      "com.google.protobuf.kotlin.ExtensionList<E, "
-      "$message$>.plusAssign(values: "
-      "Iterable<E>) {\n"
-      "  addAll(values)\n"
-      "}\n\n",
-      "message", message_name);
-
-  printer->Print(
-      "@kotlin.jvm.JvmSynthetic\n"
-      "public operator fun <E : kotlin.Any> "
-      "com.google.protobuf.kotlin.ExtensionList<E, "
-      "$message$>.set(index: Int, value: "
-      "E) {\n"
-      "  _builder.setExtension(this.extension, index, value)\n"
-      "}\n\n",
-      "message", message_name);
-
-  printer->Print(
-      "@kotlin.jvm.JvmSynthetic\n"
-      "@Suppress(\"NOTHING_TO_INLINE\")\n"
-      "public inline fun com.google.protobuf.kotlin.ExtensionList<*, "
-      "$message$>.clear() {\n"
-      "  clear(extension)\n"
-      "}\n\n",
-      "message", message_name);
-}
-
-}  // namespace java
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
diff --git a/libs/protobuf/src/google/protobuf/compiler/java/message_lite.h b/libs/protobuf/src/google/protobuf/compiler/java/message_lite.h
deleted file mode 100644
index d1e4b68..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/java/message_lite.h
+++ /dev/null
@@ -1,85 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: dweis@google.com (Daniel Weis)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-
-#ifndef GOOGLE_PROTOBUF_COMPILER_JAVA_MESSAGE_LITE_H__
-#define GOOGLE_PROTOBUF_COMPILER_JAVA_MESSAGE_LITE_H__
-
-#include <google/protobuf/compiler/java/field.h>
-#include <google/protobuf/compiler/java/message.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace java {
-
-class ImmutableMessageLiteGenerator : public MessageGenerator {
- public:
-  ImmutableMessageLiteGenerator(const Descriptor* descriptor, Context* context);
-  ~ImmutableMessageLiteGenerator() override;
-
-  void Generate(io::Printer* printer) override;
-  void GenerateInterface(io::Printer* printer) override;
-  void GenerateExtensionRegistrationCode(io::Printer* printer) override;
-  void GenerateStaticVariables(io::Printer* printer,
-                               int* bytecode_estimate) override;
-  int GenerateStaticVariableInitializers(io::Printer* printer) override;
-  void GenerateKotlinDsl(io::Printer* printer) const override;
-  void GenerateKotlinMembers(io::Printer* printer) const override;
-  void GenerateTopLevelKotlinMembers(io::Printer* printer) const override;
-
- private:
-  void GenerateParseFromMethods(io::Printer* printer);
-
-  void GenerateBuilder(io::Printer* printer);
-  void GenerateDynamicMethodNewBuilder(io::Printer* printer);
-  void GenerateInitializers(io::Printer* printer);
-  void GenerateParser(io::Printer* printer);
-  void GenerateConstructor(io::Printer* printer);
-  void GenerateDynamicMethodNewBuildMessageInfo(io::Printer* printer);
-  void GenerateKotlinExtensions(io::Printer* printer) const;
-  void GenerateKotlinOrNull(io::Printer* printer) const;
-
-  Context* context_;
-  ClassNameResolver* name_resolver_;
-  FieldGeneratorMap<ImmutableFieldLiteGenerator> field_generators_;
-
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(ImmutableMessageLiteGenerator);
-};
-
-}  // namespace java
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // GOOGLE_PROTOBUF_COMPILER_JAVA_MESSAGE_LITE_H__
diff --git a/libs/protobuf/src/google/protobuf/compiler/java/name_resolver.cc b/libs/protobuf/src/google/protobuf/compiler/java/name_resolver.cc
deleted file mode 100644
index 06a637e..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/java/name_resolver.cc
+++ /dev/null
@@ -1,385 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <google/protobuf/compiler/java/name_resolver.h>
-
-#include <map>
-#include <string>
-
-#include <google/protobuf/compiler/code_generator.h>
-#include <google/protobuf/stubs/substitute.h>
-#include <google/protobuf/compiler/java/helpers.h>
-#include <google/protobuf/compiler/java/names.h>
-
-// Must be last.
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace java {
-
-namespace {
-// A suffix that will be appended to the file's outer class name if the name
-// conflicts with some other types defined in the file.
-const char* kOuterClassNameSuffix = "OuterClass";
-
-// Strip package name from a descriptor's full name.
-// For example:
-//   Full name   : foo.Bar.Baz
-//   Package name: foo
-//   After strip : Bar.Baz
-std::string StripPackageName(const std::string& full_name,
-                             const FileDescriptor* file) {
-  if (file->package().empty()) {
-    return full_name;
-  } else {
-    // Strip package name
-    return full_name.substr(file->package().size() + 1);
-  }
-}
-
-// Get the name of a message's Java class without package name prefix.
-std::string ClassNameWithoutPackage(const Descriptor* descriptor,
-                                    bool immutable) {
-  return StripPackageName(descriptor->full_name(), descriptor->file());
-}
-
-std::string ClassNameWithoutPackageKotlin(const Descriptor* descriptor) {
-  std::string result = descriptor->name();
-  const Descriptor* temp = descriptor->containing_type();
-
-  while (temp) {
-    result = temp->name() + "Kt." + result;
-    temp = temp->containing_type();
-  }
-  return result;
-}
-
-// Get the name of an enum's Java class without package name prefix.
-std::string ClassNameWithoutPackage(const EnumDescriptor* descriptor,
-                                    bool immutable) {
-  // Doesn't append "Mutable" for enum type's name.
-  const Descriptor* message_descriptor = descriptor->containing_type();
-  if (message_descriptor == NULL) {
-    return descriptor->name();
-  } else {
-    return ClassNameWithoutPackage(message_descriptor, immutable) + "." +
-           descriptor->name();
-  }
-}
-
-// Get the name of a service's Java class without package name prefix.
-std::string ClassNameWithoutPackage(const ServiceDescriptor* descriptor,
-                                    bool immutable) {
-  std::string full_name =
-      StripPackageName(descriptor->full_name(), descriptor->file());
-  // We don't allow nested service definitions.
-  GOOGLE_CHECK(full_name.find('.') == std::string::npos);
-  return full_name;
-}
-
-// Return true if a and b are equals (case insensitive).
-NameEquality CheckNameEquality(const std::string& a, const std::string& b) {
-  if (ToUpper(a) == ToUpper(b)) {
-    if (a == b) {
-      return NameEquality::EXACT_EQUAL;
-    }
-    return NameEquality::EQUAL_IGNORE_CASE;
-  }
-  return NameEquality::NO_MATCH;
-}
-
-// Check whether a given message or its nested types has the given class name.
-bool MessageHasConflictingClassName(const Descriptor* message,
-                                    const std::string& classname,
-                                    NameEquality equality_mode) {
-  if (CheckNameEquality(message->name(), classname) == equality_mode) {
-    return true;
-  }
-  for (int i = 0; i < message->nested_type_count(); ++i) {
-    if (MessageHasConflictingClassName(message->nested_type(i), classname,
-                                       equality_mode)) {
-      return true;
-    }
-  }
-  for (int i = 0; i < message->enum_type_count(); ++i) {
-    if (CheckNameEquality(message->enum_type(i)->name(), classname) ==
-        equality_mode) {
-      return true;
-    }
-  }
-  return false;
-}
-
-}  // namespace
-
-ClassNameResolver::ClassNameResolver() {}
-
-ClassNameResolver::~ClassNameResolver() {}
-
-std::string ClassNameResolver::GetFileDefaultImmutableClassName(
-    const FileDescriptor* file) {
-  std::string basename;
-  std::string::size_type last_slash = file->name().find_last_of('/');
-  if (last_slash == std::string::npos) {
-    basename = file->name();
-  } else {
-    basename = file->name().substr(last_slash + 1);
-  }
-  return UnderscoresToCamelCase(StripProto(basename), true);
-}
-
-std::string ClassNameResolver::GetFileImmutableClassName(
-    const FileDescriptor* file) {
-  std::string& class_name = file_immutable_outer_class_names_[file];
-  if (class_name.empty()) {
-    if (file->options().has_java_outer_classname()) {
-      class_name = file->options().java_outer_classname();
-    } else {
-      class_name = GetFileDefaultImmutableClassName(file);
-      if (HasConflictingClassName(file, class_name,
-                                  NameEquality::EXACT_EQUAL)) {
-        class_name += kOuterClassNameSuffix;
-      }
-    }
-  }
-  return class_name;
-}
-
-std::string ClassNameResolver::GetFileClassName(const FileDescriptor* file,
-                                                bool immutable) {
-  return GetFileClassName(file, immutable, false);
-}
-
-std::string ClassNameResolver::GetFileClassName(const FileDescriptor* file,
-                                                bool immutable, bool kotlin) {
-  if (kotlin) {
-    return GetFileImmutableClassName(file) + "Kt";
-  } else if (immutable) {
-    return GetFileImmutableClassName(file);
-  } else {
-    return "Mutable" + GetFileImmutableClassName(file);
-  }
-}
-
-// Check whether there is any type defined in the proto file that has
-// the given class name.
-bool ClassNameResolver::HasConflictingClassName(const FileDescriptor* file,
-                                                const std::string& classname,
-                                                NameEquality equality_mode) {
-  for (int i = 0; i < file->enum_type_count(); i++) {
-    if (CheckNameEquality(file->enum_type(i)->name(), classname) ==
-        equality_mode) {
-      return true;
-    }
-  }
-  for (int i = 0; i < file->service_count(); i++) {
-    if (CheckNameEquality(file->service(i)->name(), classname) ==
-        equality_mode) {
-      return true;
-    }
-  }
-  for (int i = 0; i < file->message_type_count(); i++) {
-    if (MessageHasConflictingClassName(file->message_type(i), classname,
-                                       equality_mode)) {
-      return true;
-    }
-  }
-  return false;
-}
-
-std::string ClassNameResolver::GetDescriptorClassName(
-    const FileDescriptor* descriptor) {
-  return GetFileImmutableClassName(descriptor);
-}
-
-std::string ClassNameResolver::GetClassName(const FileDescriptor* descriptor,
-                                            bool immutable) {
-  return GetClassName(descriptor, immutable, false);
-}
-
-std::string ClassNameResolver::GetClassName(const FileDescriptor* descriptor,
-                                            bool immutable, bool kotlin) {
-  std::string result = FileJavaPackage(descriptor, immutable);
-  if (!result.empty()) result += '.';
-  result += GetFileClassName(descriptor, immutable, kotlin);
-  return result;
-}
-
-// Get the full name of a Java class by prepending the Java package name
-// or outer class name.
-std::string ClassNameResolver::GetClassFullName(
-    const std::string& name_without_package, const FileDescriptor* file,
-    bool immutable, bool is_own_file) {
-  return GetClassFullName(name_without_package, file, immutable, is_own_file,
-                          false);
-}
-
-std::string ClassNameResolver::GetClassFullName(
-    const std::string& name_without_package, const FileDescriptor* file,
-    bool immutable, bool is_own_file, bool kotlin) {
-  std::string result;
-  if (is_own_file) {
-    result = FileJavaPackage(file, immutable);
-  } else {
-    result = GetClassName(file, immutable, kotlin);
-  }
-  if (!result.empty()) {
-    result += '.';
-  }
-  result += name_without_package;
-  if (kotlin) result += "Kt";
-  return result;
-}
-
-std::string ClassNameResolver::GetClassName(const Descriptor* descriptor,
-                                            bool immutable) {
-  return GetClassName(descriptor, immutable, false);
-}
-
-std::string ClassNameResolver::GetClassName(const Descriptor* descriptor,
-                                            bool immutable, bool kotlin) {
-  return GetClassFullName(
-      ClassNameWithoutPackage(descriptor, immutable), descriptor->file(),
-      immutable, MultipleJavaFiles(descriptor->file(), immutable), kotlin);
-}
-
-std::string ClassNameResolver::GetClassName(const EnumDescriptor* descriptor,
-                                            bool immutable) {
-  return GetClassName(descriptor, immutable, false);
-}
-
-std::string ClassNameResolver::GetClassName(const EnumDescriptor* descriptor,
-                                            bool immutable, bool kotlin) {
-  return GetClassFullName(
-      ClassNameWithoutPackage(descriptor, immutable), descriptor->file(),
-      immutable, MultipleJavaFiles(descriptor->file(), immutable), kotlin);
-}
-
-std::string ClassNameResolver::GetClassName(const ServiceDescriptor* descriptor,
-                                            bool immutable) {
-  return GetClassName(descriptor, immutable, false);
-}
-
-std::string ClassNameResolver::GetClassName(const ServiceDescriptor* descriptor,
-                                            bool immutable, bool kotlin) {
-  return GetClassFullName(ClassNameWithoutPackage(descriptor, immutable),
-                          descriptor->file(), immutable,
-                          IsOwnFile(descriptor, immutable), kotlin);
-}
-
-// Get the Java Class style full name of a message.
-std::string ClassNameResolver::GetJavaClassFullName(
-    const std::string& name_without_package, const FileDescriptor* file,
-    bool immutable) {
-  return GetJavaClassFullName(name_without_package, file, immutable, false);
-}
-
-std::string ClassNameResolver::GetJavaClassFullName(
-    const std::string& name_without_package, const FileDescriptor* file,
-    bool immutable, bool kotlin) {
-  std::string result;
-  if (MultipleJavaFiles(file, immutable)) {
-    result = FileJavaPackage(file, immutable);
-    if (!result.empty()) result += '.';
-  } else {
-    result = GetClassName(file, immutable, kotlin);
-    if (!result.empty()) result += '$';
-  }
-  result += StringReplace(name_without_package, ".", "$", true);
-  return result;
-}
-
-std::string ClassNameResolver::GetExtensionIdentifierName(
-    const FieldDescriptor* descriptor, bool immutable) {
-  return GetExtensionIdentifierName(descriptor, immutable, false);
-}
-
-std::string ClassNameResolver::GetExtensionIdentifierName(
-    const FieldDescriptor* descriptor, bool immutable, bool kotlin) {
-  return GetClassName(descriptor->containing_type(), immutable, kotlin) + "." +
-         descriptor->name();
-}
-
-std::string ClassNameResolver::GetKotlinFactoryName(
-    const Descriptor* descriptor) {
-  std::string name = ToCamelCase(descriptor->name(), /* lower_first = */ true);
-  return IsForbiddenKotlin(name) ? name + "_" : name;
-}
-
-std::string ClassNameResolver::GetJavaImmutableClassName(
-    const Descriptor* descriptor) {
-  return GetJavaClassFullName(ClassNameWithoutPackage(descriptor, true),
-                              descriptor->file(), true);
-}
-
-std::string ClassNameResolver::GetJavaImmutableClassName(
-    const EnumDescriptor* descriptor) {
-  return GetJavaClassFullName(ClassNameWithoutPackage(descriptor, true),
-                              descriptor->file(), true);
-}
-
-std::string ClassNameResolver::GetKotlinExtensionsClassName(
-    const Descriptor* descriptor) {
-  return GetClassFullName(ClassNameWithoutPackageKotlin(descriptor),
-                          descriptor->file(), true, true, true);
-}
-
-std::string ClassNameResolver::GetJavaMutableClassName(
-    const Descriptor* descriptor) {
-  return GetJavaClassFullName(ClassNameWithoutPackage(descriptor, false),
-                              descriptor->file(), false);
-}
-
-std::string ClassNameResolver::GetJavaMutableClassName(
-    const EnumDescriptor* descriptor) {
-  return GetJavaClassFullName(ClassNameWithoutPackage(descriptor, false),
-                              descriptor->file(), false);
-}
-
-std::string ClassNameResolver::GetDowngradedFileClassName(
-    const FileDescriptor* file) {
-  return "Downgraded" + GetFileClassName(file, false);
-}
-
-std::string ClassNameResolver::GetDowngradedClassName(
-    const Descriptor* descriptor) {
-  return FileJavaPackage(descriptor->file()) + "." +
-         GetDowngradedFileClassName(descriptor->file()) + "." +
-         ClassNameWithoutPackage(descriptor, false);
-}
-
-}  // namespace java
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
diff --git a/libs/protobuf/src/google/protobuf/compiler/java/name_resolver.h b/libs/protobuf/src/google/protobuf/compiler/java/name_resolver.h
deleted file mode 100644
index 103cace..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/java/name_resolver.h
+++ /dev/null
@@ -1,159 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef GOOGLE_PROTOBUF_COMPILER_JAVA_NAME_RESOLVER_H__
-#define GOOGLE_PROTOBUF_COMPILER_JAVA_NAME_RESOLVER_H__
-
-#include <map>
-#include <string>
-
-#include <google/protobuf/stubs/common.h>
-
-// Must be last.
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-class Descriptor;
-class EnumDescriptor;
-class FieldDescriptor;
-class FileDescriptor;
-class ServiceDescriptor;
-
-namespace compiler {
-namespace java {
-
-// Indicates how closely the two class names match.
-enum NameEquality { NO_MATCH, EXACT_EQUAL, EQUAL_IGNORE_CASE };
-
-// Used to get the Java class related names for a given descriptor. It caches
-// the results to avoid redundant calculation across multiple name queries.
-// Thread-safety note: This class is *not* thread-safe.
-class ClassNameResolver {
- public:
-  ClassNameResolver();
-  ~ClassNameResolver();
-
-  // Gets the unqualified outer class name for the file.
-  std::string GetFileClassName(const FileDescriptor* file, bool immutable);
-  std::string GetFileClassName(const FileDescriptor* file, bool immutable,
-                               bool kotlin);
-  // Gets the unqualified immutable outer class name of a file.
-  std::string GetFileImmutableClassName(const FileDescriptor* file);
-  // Gets the unqualified default immutable outer class name of a file
-  // (converted from the proto file's name).
-  std::string GetFileDefaultImmutableClassName(const FileDescriptor* file);
-
-  // Check whether there is any type defined in the proto file that has
-  // the given class name.
-  bool HasConflictingClassName(const FileDescriptor* file,
-                               const std::string& classname,
-                               NameEquality equality_mode);
-
-  // Gets the name of the outer class that holds descriptor information.
-  // Descriptors are shared between immutable messages and mutable messages.
-  // Since both of them are generated optionally, the descriptors need to be
-  // put in another common place.
-  std::string GetDescriptorClassName(const FileDescriptor* file);
-
-  // Gets the fully-qualified class name corresponding to the given descriptor.
-  std::string GetClassName(const Descriptor* descriptor, bool immutable);
-  std::string GetClassName(const Descriptor* descriptor, bool immutable,
-                           bool kotlin);
-  std::string GetClassName(const EnumDescriptor* descriptor, bool immutable);
-  std::string GetClassName(const EnumDescriptor* descriptor, bool immutable,
-                           bool kotlin);
-  std::string GetClassName(const ServiceDescriptor* descriptor, bool immutable);
-  std::string GetClassName(const ServiceDescriptor* descriptor, bool immutable,
-                           bool kotlin);
-  std::string GetClassName(const FileDescriptor* descriptor, bool immutable);
-  std::string GetClassName(const FileDescriptor* descriptor, bool immutable,
-                           bool kotlin);
-
-  template <class DescriptorType>
-  std::string GetImmutableClassName(const DescriptorType* descriptor) {
-    return GetClassName(descriptor, true);
-  }
-  template <class DescriptorType>
-  std::string GetMutableClassName(const DescriptorType* descriptor) {
-    return GetClassName(descriptor, false);
-  }
-
-  // Gets the fully qualified name of an extension identifier.
-  std::string GetExtensionIdentifierName(const FieldDescriptor* descriptor,
-                                         bool immutable);
-  std::string GetExtensionIdentifierName(const FieldDescriptor* descriptor,
-                                         bool immutable, bool kotlin);
-
-  // Gets the fully qualified name for generated classes in Java convention.
-  // Nested classes will be separated using '$' instead of '.'
-  // For example:
-  //   com.package.OuterClass$OuterMessage$InnerMessage
-  std::string GetJavaImmutableClassName(const Descriptor* descriptor);
-  std::string GetJavaImmutableClassName(const EnumDescriptor* descriptor);
-  std::string GetKotlinFactoryName(const Descriptor* descriptor);
-  std::string GetKotlinExtensionsClassName(const Descriptor* descriptor);
-  std::string GetJavaMutableClassName(const Descriptor* descriptor);
-  std::string GetJavaMutableClassName(const EnumDescriptor* descriptor);
-  // Gets the outer class and the actual class for downgraded mutable messages.
-  std::string GetDowngradedFileClassName(const FileDescriptor* file);
-  std::string GetDowngradedClassName(const Descriptor* descriptor);
-
-  // Get the full name of a Java class by prepending the Java package name
-  // or outer class name.
-  std::string GetClassFullName(const std::string& name_without_package,
-                               const FileDescriptor* file, bool immutable,
-                               bool is_own_file);
-  std::string GetClassFullName(const std::string& name_without_package,
-                               const FileDescriptor* file, bool immutable,
-                               bool is_own_file, bool kotlin);
-
- private:
-  // Get the Java Class style full name of a message.
-  std::string GetJavaClassFullName(const std::string& name_without_package,
-                                   const FileDescriptor* file, bool immutable);
-  std::string GetJavaClassFullName(const std::string& name_without_package,
-                                   const FileDescriptor* file, bool immutable,
-                                   bool kotlin);
-  // Caches the result to provide better performance.
-  std::map<const FileDescriptor*, std::string>
-      file_immutable_outer_class_names_;
-
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(ClassNameResolver);
-};
-
-}  // namespace java
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
-
-#endif  // GOOGLE_PROTOBUF_COMPILER_JAVA_NAME_RESOLVER_H__
diff --git a/libs/protobuf/src/google/protobuf/compiler/java/names.h b/libs/protobuf/src/google/protobuf/compiler/java/names.h
deleted file mode 100644
index 313ace4..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/java/names.h
+++ /dev/null
@@ -1,100 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-//
-// Provides a mechanism for mapping a descriptor to the
-// fully-qualified name of the corresponding Java class.
-
-#ifndef GOOGLE_PROTOBUF_COMPILER_JAVA_NAMES_H__
-#define GOOGLE_PROTOBUF_COMPILER_JAVA_NAMES_H__
-
-#include <string>
-
-namespace google {
-namespace protobuf {
-
-class Descriptor;
-class EnumDescriptor;
-class FileDescriptor;
-class FieldDescriptor;
-class ServiceDescriptor;
-
-namespace compiler {
-namespace java {
-
-// Requires:
-//   descriptor != NULL
-//
-// Returns:
-//   The fully-qualified Java class name.
-std::string ClassName(const Descriptor* descriptor);
-
-// Requires:
-//   descriptor != NULL
-//
-// Returns:
-//   The fully-qualified Java class name.
-std::string ClassName(const EnumDescriptor* descriptor);
-
-// Requires:
-//   descriptor != NULL
-//
-// Returns:
-//   The fully-qualified Java class name.
-std::string ClassName(const FileDescriptor* descriptor);
-
-// Requires:
-//   descriptor != NULL
-//
-// Returns:
-//   The fully-qualified Java class name.
-std::string ClassName(const ServiceDescriptor* descriptor);
-
-// Requires:
-//   descriptor != NULL
-//
-// Returns:
-//   Java package name.
-std::string FileJavaPackage(const FileDescriptor* descriptor);
-
-// Requires:
-//   descriptor != NULL
-// Returns:
-//   Capitalized camel case name field name.
-std::string CapitalizedFieldName(const FieldDescriptor* descriptor);
-
-}  // namespace java
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-#endif  // GOOGLE_PROTOBUF_COMPILER_JAVA_NAMES_H__
diff --git a/libs/protobuf/src/google/protobuf/compiler/java/options.h b/libs/protobuf/src/google/protobuf/compiler/java/options.h
deleted file mode 100644
index 6c29be1..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/java/options.h
+++ /dev/null
@@ -1,73 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef GOOGLE_PROTOBUF_COMPILER_JAVA_OPTIONS_H__
-#define GOOGLE_PROTOBUF_COMPILER_JAVA_OPTIONS_H__
-
-#include <string>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace java {
-
-// Generator options
-struct Options {
-  Options()
-      : generate_immutable_code(false),
-        generate_mutable_code(false),
-        generate_shared_code(false),
-        enforce_lite(false),
-        annotate_code(false) {
-  }
-
-  bool generate_immutable_code;
-  bool generate_mutable_code;
-  bool generate_shared_code;
-  // When set, the protoc will generate the current files and all the transitive
-  // dependencies as lite runtime.
-  bool enforce_lite;
-  // If true, we should build .meta files and emit @Generated annotations into
-  // generated code.
-  bool annotate_code;
-  // Name of a file where we will write a list of generated .meta file names,
-  // one per line.
-  std::string annotation_list_file;
-  // Name of a file where we will write a list of generated file names, one
-  // per line.
-  std::string output_list_file;
-};
-
-}  // namespace java
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // GOOGLE_PROTOBUF_COMPILER_JAVA_OPTIONS_H__
diff --git a/libs/protobuf/src/google/protobuf/compiler/java/plugin_unittest.cc b/libs/protobuf/src/google/protobuf/compiler/java/plugin_unittest.cc
deleted file mode 100644
index 8135f86..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/java/plugin_unittest.cc
+++ /dev/null
@@ -1,136 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-
-#include <memory>
-#include <string>
-
-#include <google/protobuf/testing/file.h>
-#include <google/protobuf/testing/file.h>
-#include <google/protobuf/compiler/java/generator.h>
-#include <google/protobuf/compiler/command_line_interface.h>
-#include <google/protobuf/io/printer.h>
-#include <google/protobuf/io/zero_copy_stream.h>
-#include <google/protobuf/stubs/strutil.h>
-#include <google/protobuf/testing/googletest.h>
-#include <gtest/gtest.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace java {
-namespace {
-
-class TestGenerator : public CodeGenerator {
- public:
-  TestGenerator() {}
-  ~TestGenerator() override {}
-
-  bool Generate(const FileDescriptor* file, const std::string& parameter,
-                GeneratorContext* context, std::string* error) const override {
-    std::string filename = "Test.java";
-    TryInsert(filename, "outer_class_scope", context);
-    TryInsert(filename, "class_scope:foo.Bar", context);
-    TryInsert(filename, "class_scope:foo.Bar.Baz", context);
-    TryInsert(filename, "builder_scope:foo.Bar", context);
-    TryInsert(filename, "builder_scope:foo.Bar.Baz", context);
-    TryInsert(filename, "enum_scope:foo.Qux", context);
-    return true;
-  }
-
-  void TryInsert(const std::string& filename,
-                 const std::string& insertion_point,
-                 GeneratorContext* context) const {
-    std::unique_ptr<io::ZeroCopyOutputStream> output(
-        context->OpenForInsert(filename, insertion_point));
-    io::Printer printer(output.get(), '$');
-    printer.Print("// inserted $name$\n", "name", insertion_point);
-  }
-};
-
-// This test verifies that all the expected insertion points exist.  It does
-// not verify that they are correctly-placed; that would require actually
-// compiling the output which is a bit more than I care to do for this test.
-TEST(JavaPluginTest, PluginTest) {
-  GOOGLE_CHECK_OK(File::SetContents(TestTempDir() + "/test.proto",
-                             "syntax = \"proto2\";\n"
-                             "package foo;\n"
-                             "option java_package = \"\";\n"
-                             "option java_outer_classname = \"Test\";\n"
-                             "message Bar {\n"
-                             "  message Baz {}\n"
-                             "}\n"
-                             "enum Qux { BLAH = 1; }\n",
-                             true));
-
-  CommandLineInterface cli;
-  cli.SetInputsAreProtoPathRelative(true);
-
-  JavaGenerator java_generator;
-  TestGenerator test_generator;
-  cli.RegisterGenerator("--java_out", &java_generator, "");
-  cli.RegisterGenerator("--test_out", &test_generator, "");
-
-  std::string proto_path = "-I" + TestTempDir();
-  std::string java_out = "--java_out=" + TestTempDir();
-  std::string test_out = "--test_out=" + TestTempDir();
-
-  const char* argv[] = {"protoc", proto_path.c_str(), java_out.c_str(),
-                        test_out.c_str(), "test.proto"};
-
-  EXPECT_EQ(0, cli.Run(5, argv));
-
-  // Loop over the lines of the generated code and verify that we find what we
-  // expect
-
-  std::string output;
-  GOOGLE_CHECK_OK(File::GetContents(TestTempDir() + "/Test.java", &output,
-                             true));
-  std::vector<std::string> lines = Split(output, "\n");
-  bool found_generated_annotation = false;
-  bool found_do_not_edit = false;
-  for (const auto& line : lines) {
-    if (line.find(" DO NOT EDIT!") != std::string::npos) {
-      found_do_not_edit = true;
-    }
-    if (line.find("@com.google.protobuf.Generated") != std::string::npos) {
-      found_generated_annotation = true;
-    }
-  }
-  EXPECT_TRUE(found_do_not_edit);
-  (void)found_generated_annotation;
-}
-
-}  // namespace
-}  // namespace java
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/compiler/java/primitive_field.cc b/libs/protobuf/src/google/protobuf/compiler/java/primitive_field.cc
deleted file mode 100644
index 2e3b8ea..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/java/primitive_field.cc
+++ /dev/null
@@ -1,1076 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-
-#include "google/protobuf/compiler/java/primitive_field.h"
-
-#include <cstdint>
-#include <map>
-#include <string>
-
-#include "google/protobuf/stubs/logging.h"
-#include "google/protobuf/stubs/common.h"
-#include "google/protobuf/io/printer.h"
-#include "google/protobuf/wire_format.h"
-#include "google/protobuf/stubs/strutil.h"
-#include "google/protobuf/compiler/java/context.h"
-#include "google/protobuf/compiler/java/doc_comment.h"
-#include "google/protobuf/compiler/java/helpers.h"
-#include "google/protobuf/compiler/java/name_resolver.h"
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace java {
-
-using internal::WireFormat;
-
-namespace {
-
-void SetPrimitiveVariables(
-    const FieldDescriptor* descriptor, int messageBitIndex, int builderBitIndex,
-    const FieldGeneratorInfo* info, ClassNameResolver* name_resolver,
-    std::map<std::string, std::string>* variables,
-    Context* context) {
-  SetCommonFieldVariables(descriptor, info, variables);
-  JavaType javaType = GetJavaType(descriptor);
-
-  (*variables)["type"] = PrimitiveTypeName(javaType);
-  (*variables)["boxed_type"] = BoxedPrimitiveTypeName(javaType);
-  (*variables)["kt_type"] = KotlinTypeName(javaType);
-  variables->insert({"field_type", (*variables)["type"]});
-
-  std::string name = (*variables)["name"];
-  if (javaType == JAVATYPE_BOOLEAN || javaType == JAVATYPE_DOUBLE ||
-      javaType == JAVATYPE_FLOAT || javaType == JAVATYPE_INT ||
-      javaType == JAVATYPE_LONG) {
-    std::string capitalized_type = UnderscoresToCamelCase(
-        PrimitiveTypeName(javaType), /*cap_first_letter=*/true);
-    (*variables)["field_list_type"] =
-        StrCat("com.google.protobuf.Internal.", capitalized_type, "List");
-    (*variables)["empty_list"] =
-        StrCat("empty", capitalized_type, "List()");
-    (*variables)["create_list"] =
-        StrCat("new", capitalized_type, "List()");
-    (*variables)["mutable_copy_list"] =
-        StrCat("mutableCopy(", name, "_)");
-    (*variables)["name_make_immutable"] =
-        StrCat(name, "_.makeImmutable()");
-    (*variables)["repeated_get"] =
-        StrCat(name, "_.get", capitalized_type);
-    (*variables)["repeated_add"] =
-        StrCat(name, "_.add", capitalized_type);
-    (*variables)["repeated_set"] =
-        StrCat(name, "_.set", capitalized_type);
-  } else {
-    std::string boxed_type = (*variables)["boxed_type"];
-    (*variables)["field_list_type"] =
-        StrCat("java.util.List<", boxed_type, ">");
-    (*variables)["create_list"] =
-        StrCat("new java.util.ArrayList<", boxed_type, ">()");
-    (*variables)["mutable_copy_list"] =
-        StrCat("new java.util.ArrayList<", boxed_type, ">(", name, "_)");
-    (*variables)["empty_list"] = "java.util.Collections.emptyList()";
-    (*variables)["name_make_immutable"] = StrCat(
-        name, "_ = java.util.Collections.unmodifiableList(", name, "_)");
-    (*variables)["repeated_get"] = StrCat(name, "_.get");
-    (*variables)["repeated_add"] = StrCat(name, "_.add");
-    (*variables)["repeated_set"] = StrCat(name, "_.set");
-  }
-
-  (*variables)["default"] = ImmutableDefaultValue(descriptor, name_resolver);
-  (*variables)["default_init"] =
-      IsDefaultValueJavaDefault(descriptor)
-          ? ""
-          : ("= " + ImmutableDefaultValue(descriptor, name_resolver));
-  (*variables)["capitalized_type"] =
-      GetCapitalizedType(descriptor, /* immutable = */ true);
-  (*variables)["tag"] =
-      StrCat(static_cast<int32_t>(WireFormat::MakeTag(descriptor)));
-  (*variables)["tag_size"] = StrCat(
-      WireFormat::TagSize(descriptor->number(), GetType(descriptor)));
-  if (IsReferenceType(GetJavaType(descriptor))) {
-    (*variables)["null_check"] =
-        "if (value == null) { throw new NullPointerException(); }";
-  } else {
-    (*variables)["null_check"] = "";
-  }
-  // TODO(birdo): Add @deprecated javadoc when generating javadoc is supported
-  // by the proto compiler
-  (*variables)["deprecation"] =
-      descriptor->options().deprecated() ? "@java.lang.Deprecated " : "";
-  (*variables)["kt_deprecation"] =
-      descriptor->options().deprecated()
-          ? StrCat("@kotlin.Deprecated(message = \"Field ", name,
-                         " is deprecated\") ")
-          : "";
-  int fixed_size = FixedSize(GetType(descriptor));
-  if (fixed_size != -1) {
-    (*variables)["fixed_size"] = StrCat(fixed_size);
-  }
-  (*variables)["on_changed"] = "onChanged();";
-
-  if (HasHasbit(descriptor)) {
-    // For singular messages and builders, one bit is used for the hasField bit.
-    (*variables)["get_has_field_bit_message"] = GenerateGetBit(messageBitIndex);
-    // Note that these have a trailing ";".
-    (*variables)["set_has_field_bit_to_local"] =
-        GenerateSetBitToLocal(messageBitIndex) + ";";
-    (*variables)["is_field_present_message"] = GenerateGetBit(messageBitIndex);
-  } else {
-    (*variables)["set_has_field_bit_to_local"] = "";
-    switch (descriptor->type()) {
-      case FieldDescriptor::TYPE_BYTES:
-        (*variables)["is_field_present_message"] =
-            StrCat("!", name, "_.isEmpty()");
-        break;
-      case FieldDescriptor::TYPE_FLOAT:
-        (*variables)["is_field_present_message"] =
-            StrCat("java.lang.Float.floatToRawIntBits(", name, "_) != 0");
-        break;
-      case FieldDescriptor::TYPE_DOUBLE:
-        (*variables)["is_field_present_message"] = StrCat(
-            "java.lang.Double.doubleToRawLongBits(", name, "_) != 0");
-        break;
-      default:
-        variables->insert(
-            {"is_field_present_message",
-             StrCat(name, "_ != ", (*variables)["default"])});
-        break;
-    }
-  }
-
-  // For repeated builders, one bit is used for whether the array is immutable.
-  (*variables)["get_mutable_bit_builder"] = GenerateGetBit(builderBitIndex);
-  (*variables)["set_mutable_bit_builder"] = GenerateSetBit(builderBitIndex);
-  (*variables)["clear_mutable_bit_builder"] = GenerateClearBit(builderBitIndex);
-
-  // Always track the presence of a field explicitly in the builder, regardless
-  // of syntax.
-  (*variables)["get_has_field_bit_builder"] = GenerateGetBit(builderBitIndex);
-  (*variables)["get_has_field_bit_from_local"] =
-      GenerateGetBitFromLocal(builderBitIndex);
-  (*variables)["set_has_field_bit_builder"] =
-      GenerateSetBit(builderBitIndex) + ";";
-  (*variables)["clear_has_field_bit_builder"] =
-      GenerateClearBit(builderBitIndex) + ";";
-}
-
-}  // namespace
-
-// ===================================================================
-
-ImmutablePrimitiveFieldGenerator::ImmutablePrimitiveFieldGenerator(
-    const FieldDescriptor* descriptor, int messageBitIndex, int builderBitIndex,
-    Context* context)
-    : descriptor_(descriptor),
-      message_bit_index_(messageBitIndex),
-      builder_bit_index_(builderBitIndex),
-      name_resolver_(context->GetNameResolver()) {
-  SetPrimitiveVariables(descriptor, messageBitIndex, builderBitIndex,
-                        context->GetFieldGeneratorInfo(descriptor),
-                        name_resolver_, &variables_, context);
-}
-
-ImmutablePrimitiveFieldGenerator::~ImmutablePrimitiveFieldGenerator() {}
-
-int ImmutablePrimitiveFieldGenerator::GetMessageBitIndex() const {
-  return message_bit_index_;
-}
-
-int ImmutablePrimitiveFieldGenerator::GetBuilderBitIndex() const {
-  return builder_bit_index_;
-}
-
-int ImmutablePrimitiveFieldGenerator::GetNumBitsForMessage() const {
-  return HasHasbit(descriptor_) ? 1 : 0;
-}
-
-int ImmutablePrimitiveFieldGenerator::GetNumBitsForBuilder() const { return 1; }
-
-void ImmutablePrimitiveFieldGenerator::GenerateInterfaceMembers(
-    io::Printer* printer) const {
-  if (HasHazzer(descriptor_)) {
-    WriteFieldAccessorDocComment(printer, descriptor_, HAZZER);
-    printer->Print(variables_,
-                   "$deprecation$boolean has$capitalized_name$();\n");
-  }
-  WriteFieldAccessorDocComment(printer, descriptor_, GETTER);
-  printer->Print(variables_, "$deprecation$$type$ get$capitalized_name$();\n");
-}
-
-void ImmutablePrimitiveFieldGenerator::GenerateMembers(
-    io::Printer* printer) const {
-  printer->Print(variables_, "private $field_type$ $name$_ = $default$;\n");
-  PrintExtraFieldInfo(variables_, printer);
-  if (HasHazzer(descriptor_)) {
-    WriteFieldAccessorDocComment(printer, descriptor_, HAZZER);
-    printer->Print(
-        variables_,
-        "@java.lang.Override\n"
-        "$deprecation$public boolean ${$has$capitalized_name$$}$() {\n"
-        "  return $get_has_field_bit_message$;\n"
-        "}\n");
-    printer->Annotate("{", "}", descriptor_);
-  }
-
-  WriteFieldAccessorDocComment(printer, descriptor_, GETTER);
-  printer->Print(variables_,
-                 "@java.lang.Override\n"
-                 "$deprecation$public $type$ ${$get$capitalized_name$$}$() {\n"
-                 "  return $name$_;\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-}
-
-void ImmutablePrimitiveFieldGenerator::GenerateBuilderMembers(
-    io::Printer* printer) const {
-  printer->Print(variables_, "private $field_type$ $name$_ $default_init$;\n");
-
-  if (HasHazzer(descriptor_)) {
-    WriteFieldAccessorDocComment(printer, descriptor_, HAZZER);
-    printer->Print(
-        variables_,
-        "@java.lang.Override\n"
-        "$deprecation$public boolean ${$has$capitalized_name$$}$() {\n"
-        "  return $get_has_field_bit_builder$;\n"
-        "}\n");
-    printer->Annotate("{", "}", descriptor_);
-  }
-
-  WriteFieldAccessorDocComment(printer, descriptor_, GETTER);
-  printer->Print(variables_,
-                 "@java.lang.Override\n"
-                 "$deprecation$public $type$ ${$get$capitalized_name$$}$() {\n"
-                 "  return $name$_;\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-
-  WriteFieldAccessorDocComment(printer, descriptor_, SETTER,
-                               /* builder */ true);
-  printer->Print(variables_,
-                 "$deprecation$public Builder "
-                 "${$set$capitalized_name$$}$($type$ value) {\n"
-                 "  $null_check$\n"
-                 "  $name$_ = value;\n"
-                 "  $set_has_field_bit_builder$\n"
-                 "  $on_changed$\n"
-                 "  return this;\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-
-  WriteFieldAccessorDocComment(printer, descriptor_, CLEARER,
-                               /* builder */ true);
-  printer->Print(
-      variables_,
-      "$deprecation$public Builder ${$clear$capitalized_name$$}$() {\n"
-      "  $clear_has_field_bit_builder$\n");
-  printer->Annotate("{", "}", descriptor_);
-  JavaType type = GetJavaType(descriptor_);
-  if (type == JAVATYPE_STRING || type == JAVATYPE_BYTES) {
-    // The default value is not a simple literal so we want to avoid executing
-    // it multiple times.  Instead, get the default out of the default instance.
-    printer->Print(
-        variables_,
-        "  $name$_ = getDefaultInstance().get$capitalized_name$();\n");
-  } else {
-    printer->Print(variables_, "  $name$_ = $default$;\n");
-  }
-  printer->Print(variables_,
-                 "  $on_changed$\n"
-                 "  return this;\n"
-                 "}\n");
-}
-
-void ImmutablePrimitiveFieldGenerator::GenerateKotlinDslMembers(
-    io::Printer* printer) const {
-  WriteFieldDocComment(printer, descriptor_);
-  printer->Print(variables_,
-                 "$kt_deprecation$public var $kt_name$: $kt_type$\n"
-                 "  @JvmName(\"${$get$kt_capitalized_name$$}$\")\n"
-                 "  get() = $kt_dsl_builder$.${$get$capitalized_name$$}$()\n"
-                 "  @JvmName(\"${$set$kt_capitalized_name$$}$\")\n"
-                 "  set(value) {\n"
-                 "    $kt_dsl_builder$.${$set$capitalized_name$$}$(value)\n"
-                 "  }\n");
-
-  WriteFieldAccessorDocComment(printer, descriptor_, CLEARER,
-                               /* builder */ false);
-  printer->Print(variables_,
-                 "public fun ${$clear$kt_capitalized_name$$}$() {\n"
-                 "  $kt_dsl_builder$.${$clear$capitalized_name$$}$()\n"
-                 "}\n");
-
-  if (HasHazzer(descriptor_)) {
-    WriteFieldAccessorDocComment(printer, descriptor_, HAZZER);
-    printer->Print(
-        variables_,
-        "public fun ${$has$kt_capitalized_name$$}$(): kotlin.Boolean {\n"
-        "  return $kt_dsl_builder$.${$has$capitalized_name$$}$()\n"
-        "}\n");
-  }
-}
-
-void ImmutablePrimitiveFieldGenerator::GenerateFieldBuilderInitializationCode(
-    io::Printer* printer) const {
-  // noop for primitives
-}
-
-void ImmutablePrimitiveFieldGenerator::GenerateInitializationCode(
-    io::Printer* printer) const {
-  if (!IsDefaultValueJavaDefault(descriptor_)) {
-    printer->Print(variables_, "$name$_ = $default$;\n");
-  }
-}
-
-void ImmutablePrimitiveFieldGenerator::GenerateBuilderClearCode(
-    io::Printer* printer) const {
-  // No need to clear the has-bit since we clear the bitField ints all at once.
-  printer->Print(variables_, "$name$_ = $default$;\n");
-}
-
-void ImmutablePrimitiveFieldGenerator::GenerateMergingCode(
-    io::Printer* printer) const {
-  if (HasHazzer(descriptor_)) {
-    printer->Print(variables_,
-                   "if (other.has$capitalized_name$()) {\n"
-                   "  set$capitalized_name$(other.get$capitalized_name$());\n"
-                   "}\n");
-  } else {
-    printer->Print(variables_,
-                   "if (other.get$capitalized_name$() != $default$) {\n"
-                   "  set$capitalized_name$(other.get$capitalized_name$());\n"
-                   "}\n");
-  }
-}
-
-void ImmutablePrimitiveFieldGenerator::GenerateBuildingCode(
-    io::Printer* printer) const {
-  printer->Print(variables_,
-                 "if ($get_has_field_bit_from_local$) {\n"
-                 "  result.$name$_ = $name$_;\n");
-  if (GetNumBitsForMessage() > 0) {
-    printer->Print(variables_, "  $set_has_field_bit_to_local$\n");
-  }
-  printer->Print("}\n");
-}
-
-void ImmutablePrimitiveFieldGenerator::GenerateBuilderParsingCode(
-    io::Printer* printer) const {
-  printer->Print(variables_,
-                 "$name$_ = input.read$capitalized_type$();\n"
-                 "$set_has_field_bit_builder$\n");
-}
-
-void ImmutablePrimitiveFieldGenerator::GenerateSerializationCode(
-    io::Printer* printer) const {
-  printer->Print(variables_,
-                 "if ($is_field_present_message$) {\n"
-                 "  output.write$capitalized_type$($number$, $name$_);\n"
-                 "}\n");
-}
-
-void ImmutablePrimitiveFieldGenerator::GenerateSerializedSizeCode(
-    io::Printer* printer) const {
-  printer->Print(variables_,
-                 "if ($is_field_present_message$) {\n"
-                 "  size += com.google.protobuf.CodedOutputStream\n"
-                 "    .compute$capitalized_type$Size($number$, $name$_);\n"
-                 "}\n");
-}
-
-void ImmutablePrimitiveFieldGenerator::GenerateEqualsCode(
-    io::Printer* printer) const {
-  switch (GetJavaType(descriptor_)) {
-    case JAVATYPE_INT:
-    case JAVATYPE_LONG:
-    case JAVATYPE_BOOLEAN:
-      printer->Print(variables_,
-                     "if (get$capitalized_name$()\n"
-                     "    != other.get$capitalized_name$()) return false;\n");
-      break;
-
-    case JAVATYPE_FLOAT:
-      printer->Print(
-          variables_,
-          "if (java.lang.Float.floatToIntBits(get$capitalized_name$())\n"
-          "    != java.lang.Float.floatToIntBits(\n"
-          "        other.get$capitalized_name$())) return false;\n");
-      break;
-
-    case JAVATYPE_DOUBLE:
-      printer->Print(
-          variables_,
-          "if (java.lang.Double.doubleToLongBits(get$capitalized_name$())\n"
-          "    != java.lang.Double.doubleToLongBits(\n"
-          "        other.get$capitalized_name$())) return false;\n");
-      break;
-
-    case JAVATYPE_STRING:
-    case JAVATYPE_BYTES:
-      printer->Print(
-          variables_,
-          "if (!get$capitalized_name$()\n"
-          "    .equals(other.get$capitalized_name$())) return false;\n");
-      break;
-
-    case JAVATYPE_ENUM:
-    case JAVATYPE_MESSAGE:
-    default:
-      GOOGLE_LOG(FATAL) << "Can't get here.";
-      break;
-  }
-}
-
-void ImmutablePrimitiveFieldGenerator::GenerateHashCode(
-    io::Printer* printer) const {
-  printer->Print(variables_, "hash = (37 * hash) + $constant_name$;\n");
-  switch (GetJavaType(descriptor_)) {
-    case JAVATYPE_INT:
-      printer->Print(variables_,
-                     "hash = (53 * hash) + get$capitalized_name$();\n");
-      break;
-
-    case JAVATYPE_LONG:
-      printer->Print(
-          variables_,
-          "hash = (53 * hash) + com.google.protobuf.Internal.hashLong(\n"
-          "    get$capitalized_name$());\n");
-      break;
-
-    case JAVATYPE_BOOLEAN:
-      printer->Print(
-          variables_,
-          "hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(\n"
-          "    get$capitalized_name$());\n");
-      break;
-
-    case JAVATYPE_FLOAT:
-      printer->Print(variables_,
-                     "hash = (53 * hash) + java.lang.Float.floatToIntBits(\n"
-                     "    get$capitalized_name$());\n");
-      break;
-
-    case JAVATYPE_DOUBLE:
-      printer->Print(
-          variables_,
-          "hash = (53 * hash) + com.google.protobuf.Internal.hashLong(\n"
-          "    java.lang.Double.doubleToLongBits(get$capitalized_name$()));\n");
-      break;
-
-    case JAVATYPE_STRING:
-    case JAVATYPE_BYTES:
-      printer->Print(
-          variables_,
-          "hash = (53 * hash) + get$capitalized_name$().hashCode();\n");
-      break;
-
-    case JAVATYPE_ENUM:
-    case JAVATYPE_MESSAGE:
-    default:
-      GOOGLE_LOG(FATAL) << "Can't get here.";
-      break;
-  }
-}
-
-std::string ImmutablePrimitiveFieldGenerator::GetBoxedType() const {
-  return BoxedPrimitiveTypeName(GetJavaType(descriptor_));
-}
-
-// ===================================================================
-
-ImmutablePrimitiveOneofFieldGenerator::ImmutablePrimitiveOneofFieldGenerator(
-    const FieldDescriptor* descriptor, int messageBitIndex, int builderBitIndex,
-    Context* context)
-    : ImmutablePrimitiveFieldGenerator(descriptor, messageBitIndex,
-                                       builderBitIndex, context) {
-  const OneofGeneratorInfo* info =
-      context->GetOneofGeneratorInfo(descriptor->containing_oneof());
-  SetCommonOneofVariables(descriptor, info, &variables_);
-}
-
-ImmutablePrimitiveOneofFieldGenerator::
-    ~ImmutablePrimitiveOneofFieldGenerator() {}
-
-void ImmutablePrimitiveOneofFieldGenerator::GenerateMembers(
-    io::Printer* printer) const {
-  PrintExtraFieldInfo(variables_, printer);
-  GOOGLE_DCHECK(HasHazzer(descriptor_));
-  WriteFieldAccessorDocComment(printer, descriptor_, HAZZER);
-  printer->Print(variables_,
-                 "@java.lang.Override\n"
-                 "$deprecation$public boolean ${$has$capitalized_name$$}$() {\n"
-                 "  return $has_oneof_case_message$;\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-
-  WriteFieldAccessorDocComment(printer, descriptor_, GETTER);
-  printer->Print(variables_,
-                 "@java.lang.Override\n"
-                 "$deprecation$public $type$ ${$get$capitalized_name$$}$() {\n"
-                 "  if ($has_oneof_case_message$) {\n"
-                 "    return ($boxed_type$) $oneof_name$_;\n"
-                 "  }\n"
-                 "  return $default$;\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-}
-
-void ImmutablePrimitiveOneofFieldGenerator::GenerateBuilderMembers(
-    io::Printer* printer) const {
-  GOOGLE_DCHECK(HasHazzer(descriptor_));
-  WriteFieldAccessorDocComment(printer, descriptor_, HAZZER);
-  printer->Print(variables_,
-                 "$deprecation$public boolean ${$has$capitalized_name$$}$() {\n"
-                 "  return $has_oneof_case_message$;\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-
-  WriteFieldAccessorDocComment(printer, descriptor_, GETTER);
-  printer->Print(variables_,
-                 "$deprecation$public $type$ ${$get$capitalized_name$$}$() {\n"
-                 "  if ($has_oneof_case_message$) {\n"
-                 "    return ($boxed_type$) $oneof_name$_;\n"
-                 "  }\n"
-                 "  return $default$;\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-
-  WriteFieldAccessorDocComment(printer, descriptor_, SETTER,
-                               /* builder */ true);
-  printer->Print(variables_,
-                 "$deprecation$public Builder "
-                 "${$set$capitalized_name$$}$($type$ value) {\n"
-                 "  $null_check$\n"
-                 "  $set_oneof_case_message$;\n"
-                 "  $oneof_name$_ = value;\n"
-                 "  $on_changed$\n"
-                 "  return this;\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-
-  WriteFieldAccessorDocComment(printer, descriptor_, CLEARER,
-                               /* builder */ true);
-  printer->Print(
-      variables_,
-      "$deprecation$public Builder ${$clear$capitalized_name$$}$() {\n"
-      "  if ($has_oneof_case_message$) {\n"
-      "    $clear_oneof_case_message$;\n"
-      "    $oneof_name$_ = null;\n"
-      "    $on_changed$\n"
-      "  }\n"
-      "  return this;\n"
-      "}\n");
-  printer->Annotate("{", "}", descriptor_);
-}
-
-void ImmutablePrimitiveOneofFieldGenerator::GenerateBuilderClearCode(
-    io::Printer* printer) const {
-  // No-Op: When a primitive field is in a oneof, clearing the oneof clears that
-  // field.
-}
-
-void ImmutablePrimitiveOneofFieldGenerator::GenerateBuildingCode(
-    io::Printer* printer) const {
-  // no-op
-}
-
-void ImmutablePrimitiveOneofFieldGenerator::GenerateMergingCode(
-    io::Printer* printer) const {
-  printer->Print(variables_,
-                 "set$capitalized_name$(other.get$capitalized_name$());\n");
-}
-
-void ImmutablePrimitiveOneofFieldGenerator::GenerateBuilderParsingCode(
-    io::Printer* printer) const {
-  printer->Print(variables_,
-                 "$oneof_name$_ = input.read$capitalized_type$();\n"
-                 "$set_oneof_case_message$;\n");
-}
-
-void ImmutablePrimitiveOneofFieldGenerator::GenerateSerializationCode(
-    io::Printer* printer) const {
-  printer->Print(variables_,
-                 "if ($has_oneof_case_message$) {\n"
-                 "  output.write$capitalized_type$(\n");
-  // $type$ and $boxed_type$ is the same for bytes fields so we don't need to
-  // do redundant casts.
-  if (GetJavaType(descriptor_) == JAVATYPE_BYTES) {
-    printer->Print(variables_, "      $number$, ($type$) $oneof_name$_);\n");
-  } else {
-    printer->Print(
-        variables_,
-        "      $number$, ($type$)(($boxed_type$) $oneof_name$_));\n");
-  }
-  printer->Print("}\n");
-}
-
-void ImmutablePrimitiveOneofFieldGenerator::GenerateSerializedSizeCode(
-    io::Printer* printer) const {
-  printer->Print(variables_,
-                 "if ($has_oneof_case_message$) {\n"
-                 "  size += com.google.protobuf.CodedOutputStream\n"
-                 "    .compute$capitalized_type$Size(\n");
-  // $type$ and $boxed_type$ is the same for bytes fields so we don't need to
-  // do redundant casts.
-  if (GetJavaType(descriptor_) == JAVATYPE_BYTES) {
-    printer->Print(variables_, "        $number$, ($type$) $oneof_name$_);\n");
-  } else {
-    printer->Print(
-        variables_,
-        "        $number$, ($type$)(($boxed_type$) $oneof_name$_));\n");
-  }
-  printer->Print("}\n");
-}
-
-// ===================================================================
-
-RepeatedImmutablePrimitiveFieldGenerator::
-    RepeatedImmutablePrimitiveFieldGenerator(const FieldDescriptor* descriptor,
-                                             int messageBitIndex,
-                                             int builderBitIndex,
-                                             Context* context)
-    : ImmutablePrimitiveFieldGenerator(descriptor, messageBitIndex,
-                                       builderBitIndex, context) {}
-
-RepeatedImmutablePrimitiveFieldGenerator::
-    ~RepeatedImmutablePrimitiveFieldGenerator() {}
-
-int RepeatedImmutablePrimitiveFieldGenerator::GetNumBitsForMessage() const {
-  return 0;
-}
-
-int RepeatedImmutablePrimitiveFieldGenerator::GetNumBitsForBuilder() const {
-  return 1;
-}
-
-void RepeatedImmutablePrimitiveFieldGenerator::GenerateInterfaceMembers(
-    io::Printer* printer) const {
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_GETTER);
-  printer->Print(variables_,
-                 "$deprecation$java.util.List<$boxed_type$> "
-                 "get$capitalized_name$List();\n");
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_COUNT);
-  printer->Print(variables_,
-                 "$deprecation$int get$capitalized_name$Count();\n");
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_INDEXED_GETTER);
-  printer->Print(variables_,
-                 "$deprecation$$type$ get$capitalized_name$(int index);\n");
-}
-
-void RepeatedImmutablePrimitiveFieldGenerator::GenerateMembers(
-    io::Printer* printer) const {
-  printer->Print(variables_, "@SuppressWarnings(\"serial\")\n"
-                             "private $field_list_type$ $name$_;\n");
-  PrintExtraFieldInfo(variables_, printer);
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_GETTER);
-  printer->Print(variables_,
-                 "@java.lang.Override\n"
-                 "$deprecation$public java.util.List<$boxed_type$>\n"
-                 "    ${$get$capitalized_name$List$}$() {\n"
-                 "  return $name$_;\n"  // note:  unmodifiable list
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_COUNT);
-  printer->Print(
-      variables_,
-      "$deprecation$public int ${$get$capitalized_name$Count$}$() {\n"
-      "  return $name$_.size();\n"
-      "}\n");
-  printer->Annotate("{", "}", descriptor_);
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_INDEXED_GETTER);
-  printer->Print(
-      variables_,
-      "$deprecation$public $type$ ${$get$capitalized_name$$}$(int index) {\n"
-      "  return $repeated_get$(index);\n"
-      "}\n");
-  printer->Annotate("{", "}", descriptor_);
-
-  if (descriptor_->is_packed()) {
-    printer->Print(variables_,
-                   "private int $name$MemoizedSerializedSize = -1;\n");
-  }
-}
-
-void RepeatedImmutablePrimitiveFieldGenerator::GenerateBuilderMembers(
-    io::Printer* printer) const {
-  // One field is the list and the bit field keeps track of whether the
-  // list is immutable. If it's immutable, the invariant is that it must
-  // either an instance of Collections.emptyList() or it's an ArrayList
-  // wrapped in a Collections.unmodifiableList() wrapper and nobody else has
-  // a reference to the underlying ArrayList. This invariant allows us to
-  // share instances of lists between protocol buffers avoiding expensive
-  // memory allocations. Note, immutable is a strong guarantee here -- not
-  // just that the list cannot be modified via the reference but that the
-  // list can never be modified.
-  printer->Print(variables_,
-                 "private $field_list_type$ $name$_ = $empty_list$;\n");
-
-  printer->Print(variables_,
-                 "private void ensure$capitalized_name$IsMutable() {\n"
-                 "  if (!$get_mutable_bit_builder$) {\n"
-                 "    $name$_ = $mutable_copy_list$;\n"
-                 "    $set_mutable_bit_builder$;\n"
-                 "  }\n"
-                 "}\n");
-
-  // Note:  We return an unmodifiable list because otherwise the caller
-  //   could hold on to the returned list and modify it after the message
-  //   has been built, thus mutating the message which is supposed to be
-  //   immutable.
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_GETTER);
-  printer->Print(
-      variables_,
-      "$deprecation$public java.util.List<$boxed_type$>\n"
-      "    ${$get$capitalized_name$List$}$() {\n"
-      "  return $get_mutable_bit_builder$ ?\n"
-      "           java.util.Collections.unmodifiableList($name$_) : $name$_;\n"
-      "}\n");
-  printer->Annotate("{", "}", descriptor_);
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_COUNT);
-  printer->Print(
-      variables_,
-      "$deprecation$public int ${$get$capitalized_name$Count$}$() {\n"
-      "  return $name$_.size();\n"
-      "}\n");
-  printer->Annotate("{", "}", descriptor_);
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_INDEXED_GETTER);
-  printer->Print(
-      variables_,
-      "$deprecation$public $type$ ${$get$capitalized_name$$}$(int index) {\n"
-      "  return $repeated_get$(index);\n"
-      "}\n");
-  printer->Annotate("{", "}", descriptor_);
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_INDEXED_SETTER,
-                               /* builder */ true);
-  printer->Print(variables_,
-                 "$deprecation$public Builder ${$set$capitalized_name$$}$(\n"
-                 "    int index, $type$ value) {\n"
-                 "  $null_check$\n"
-                 "  ensure$capitalized_name$IsMutable();\n"
-                 "  $repeated_set$(index, value);\n"
-                 "  $on_changed$\n"
-                 "  return this;\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_ADDER,
-                               /* builder */ true);
-  printer->Print(variables_,
-                 "$deprecation$public Builder "
-                 "${$add$capitalized_name$$}$($type$ value) {\n"
-                 "  $null_check$\n"
-                 "  ensure$capitalized_name$IsMutable();\n"
-                 "  $repeated_add$(value);\n"
-                 "  $on_changed$\n"
-                 "  return this;\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_MULTI_ADDER,
-                               /* builder */ true);
-  printer->Print(variables_,
-                 "$deprecation$public Builder ${$addAll$capitalized_name$$}$(\n"
-                 "    java.lang.Iterable<? extends $boxed_type$> values) {\n"
-                 "  ensure$capitalized_name$IsMutable();\n"
-                 "  com.google.protobuf.AbstractMessageLite.Builder.addAll(\n"
-                 "      values, $name$_);\n"
-                 "  $on_changed$\n"
-                 "  return this;\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-  WriteFieldAccessorDocComment(printer, descriptor_, CLEARER,
-                               /* builder */ true);
-  printer->Print(
-      variables_,
-      "$deprecation$public Builder ${$clear$capitalized_name$$}$() {\n"
-      "  $name$_ = $empty_list$;\n"
-      "  $clear_mutable_bit_builder$;\n"
-      "  $on_changed$\n"
-      "  return this;\n"
-      "}\n");
-  printer->Annotate("{", "}", descriptor_);
-}
-
-void RepeatedImmutablePrimitiveFieldGenerator::GenerateKotlinDslMembers(
-    io::Printer* printer) const {
-  printer->Print(
-      variables_,
-      "/**\n"
-      " * An uninstantiable, behaviorless type to represent the field in\n"
-      " * generics.\n"
-      " */\n"
-      "@kotlin.OptIn"
-      "(com.google.protobuf.kotlin.OnlyForUseByGeneratedProtoCode::class)\n"
-      "public class ${$$kt_capitalized_name$Proxy$}$ private constructor()"
-      " : com.google.protobuf.kotlin.DslProxy()\n");
-
-  WriteFieldDocComment(printer, descriptor_);
-  printer->Print(variables_,
-                 "$kt_deprecation$ public val $kt_name$: "
-                 "com.google.protobuf.kotlin.DslList"
-                 "<$kt_type$, ${$$kt_capitalized_name$Proxy$}$>\n"
-                 "  @kotlin.jvm.JvmSynthetic\n"
-                 "  get() = com.google.protobuf.kotlin.DslList(\n"
-                 "    $kt_dsl_builder$.${$get$capitalized_name$List$}$()\n"
-                 "  )\n");
-
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_ADDER,
-                               /* builder */ false);
-  printer->Print(variables_,
-                 "@kotlin.jvm.JvmSynthetic\n"
-                 "@kotlin.jvm.JvmName(\"add$kt_capitalized_name$\")\n"
-                 "public fun com.google.protobuf.kotlin.DslList"
-                 "<$kt_type$, ${$$kt_capitalized_name$Proxy$}$>."
-                 "add(value: $kt_type$) {\n"
-                 "  $kt_dsl_builder$.${$add$capitalized_name$$}$(value)\n"
-                 "}");
-
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_ADDER,
-                               /* builder */ false);
-  printer->Print(variables_,
-                 "@kotlin.jvm.JvmSynthetic\n"
-                 "@kotlin.jvm.JvmName(\"plusAssign$kt_capitalized_name$\")\n"
-                 "@Suppress(\"NOTHING_TO_INLINE\")\n"
-                 "public inline operator fun com.google.protobuf.kotlin.DslList"
-                 "<$kt_type$, ${$$kt_capitalized_name$Proxy$}$>."
-                 "plusAssign(value: $kt_type$) {\n"
-                 "  add(value)\n"
-                 "}");
-
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_MULTI_ADDER,
-                               /* builder */ false);
-  printer->Print(variables_,
-                 "@kotlin.jvm.JvmSynthetic\n"
-                 "@kotlin.jvm.JvmName(\"addAll$kt_capitalized_name$\")\n"
-                 "public fun com.google.protobuf.kotlin.DslList"
-                 "<$kt_type$, ${$$kt_capitalized_name$Proxy$}$>."
-                 "addAll(values: kotlin.collections.Iterable<$kt_type$>) {\n"
-                 "  $kt_dsl_builder$.${$addAll$capitalized_name$$}$(values)\n"
-                 "}");
-
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_MULTI_ADDER,
-                               /* builder */ false);
-  printer->Print(
-      variables_,
-      "@kotlin.jvm.JvmSynthetic\n"
-      "@kotlin.jvm.JvmName(\"plusAssignAll$kt_capitalized_name$\")\n"
-      "@Suppress(\"NOTHING_TO_INLINE\")\n"
-      "public inline operator fun com.google.protobuf.kotlin.DslList"
-      "<$kt_type$, ${$$kt_capitalized_name$Proxy$}$>."
-      "plusAssign(values: kotlin.collections.Iterable<$kt_type$>) {\n"
-      "  addAll(values)\n"
-      "}");
-
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_INDEXED_SETTER,
-                               /* builder */ false);
-  printer->Print(
-      variables_,
-      "@kotlin.jvm.JvmSynthetic\n"
-      "@kotlin.jvm.JvmName(\"set$kt_capitalized_name$\")\n"
-      "public operator fun com.google.protobuf.kotlin.DslList"
-      "<$kt_type$, ${$$kt_capitalized_name$Proxy$}$>."
-      "set(index: kotlin.Int, value: $kt_type$) {\n"
-      "  $kt_dsl_builder$.${$set$capitalized_name$$}$(index, value)\n"
-      "}");
-
-  WriteFieldAccessorDocComment(printer, descriptor_, CLEARER,
-                               /* builder */ false);
-  printer->Print(variables_,
-                 "@kotlin.jvm.JvmSynthetic\n"
-                 "@kotlin.jvm.JvmName(\"clear$kt_capitalized_name$\")\n"
-                 "public fun com.google.protobuf.kotlin.DslList"
-                 "<$kt_type$, ${$$kt_capitalized_name$Proxy$}$>."
-                 "clear() {\n"
-                 "  $kt_dsl_builder$.${$clear$capitalized_name$$}$()\n"
-                 "}");
-}
-
-void RepeatedImmutablePrimitiveFieldGenerator::
-    GenerateFieldBuilderInitializationCode(io::Printer* printer) const {
-  // noop for primitives
-}
-
-void RepeatedImmutablePrimitiveFieldGenerator::GenerateInitializationCode(
-    io::Printer* printer) const {
-  printer->Print(variables_, "$name$_ = $empty_list$;\n");
-}
-
-void RepeatedImmutablePrimitiveFieldGenerator::GenerateBuilderClearCode(
-    io::Printer* printer) const {
-  printer->Print(variables_, "$name$_ = $empty_list$;\n");
-}
-
-void RepeatedImmutablePrimitiveFieldGenerator::GenerateMergingCode(
-    io::Printer* printer) const {
-  // The code below does two optimizations:
-  //   1. If the other list is empty, there's nothing to do. This ensures we
-  //      don't allocate a new array if we already have an immutable one.
-  //   2. If the other list is non-empty and our current list is empty, we can
-  //      reuse the other list which is guaranteed to be immutable.
-  printer->Print(variables_,
-                 "if (!other.$name$_.isEmpty()) {\n"
-                 "  if ($name$_.isEmpty()) {\n"
-                 "    $name$_ = other.$name$_;\n"
-                 "    $clear_mutable_bit_builder$;\n"
-                 "  } else {\n"
-                 "    ensure$capitalized_name$IsMutable();\n"
-                 "    $name$_.addAll(other.$name$_);\n"
-                 "  }\n"
-                 "  $on_changed$\n"
-                 "}\n");
-}
-
-void RepeatedImmutablePrimitiveFieldGenerator::GenerateBuildingCode(
-    io::Printer* printer) const {
-  // The code below ensures that the result has an immutable list. If our
-  // list is immutable, we can just reuse it. If not, we make it immutable.
-  printer->Print(variables_,
-                 "if ($get_mutable_bit_builder$) {\n"
-                 "  $name_make_immutable$;\n"
-                 "  $clear_mutable_bit_builder$;\n"
-                 "}\n"
-                 "result.$name$_ = $name$_;\n");
-}
-
-void RepeatedImmutablePrimitiveFieldGenerator::GenerateBuilderParsingCode(
-    io::Printer* printer) const {
-  printer->Print(variables_,
-                 "$type$ v = input.read$capitalized_type$();\n"
-                 "ensure$capitalized_name$IsMutable();\n"
-                 "$repeated_add$(v);\n");
-}
-
-void RepeatedImmutablePrimitiveFieldGenerator::
-    GenerateBuilderParsingCodeFromPacked(io::Printer* printer) const {
-  printer->Print(variables_,
-                 "int length = input.readRawVarint32();\n"
-                 "int limit = input.pushLimit(length);\n"
-                 "ensure$capitalized_name$IsMutable();\n"
-                 "while (input.getBytesUntilLimit() > 0) {\n"
-                 "  $repeated_add$(input.read$capitalized_type$());\n"
-                 "}\n"
-                 "input.popLimit(limit);\n");
-}
-
-void RepeatedImmutablePrimitiveFieldGenerator::GenerateSerializationCode(
-    io::Printer* printer) const {
-  if (descriptor_->is_packed()) {
-    // We invoke getSerializedSize in writeTo for messages that have packed
-    // fields in ImmutableMessageGenerator::GenerateMessageSerializationMethods.
-    // That makes it safe to rely on the memoized size here.
-    printer->Print(variables_,
-                   "if (get$capitalized_name$List().size() > 0) {\n"
-                   "  output.writeUInt32NoTag($tag$);\n"
-                   "  output.writeUInt32NoTag($name$MemoizedSerializedSize);\n"
-                   "}\n"
-                   "for (int i = 0; i < $name$_.size(); i++) {\n"
-                   "  output.write$capitalized_type$NoTag($repeated_get$(i));\n"
-                   "}\n");
-  } else {
-    printer->Print(
-        variables_,
-        "for (int i = 0; i < $name$_.size(); i++) {\n"
-        "  output.write$capitalized_type$($number$, $repeated_get$(i));\n"
-        "}\n");
-  }
-}
-
-void RepeatedImmutablePrimitiveFieldGenerator::GenerateSerializedSizeCode(
-    io::Printer* printer) const {
-  printer->Print(variables_,
-                 "{\n"
-                 "  int dataSize = 0;\n");
-  printer->Indent();
-
-  if (FixedSize(GetType(descriptor_)) == -1) {
-    printer->Print(
-        variables_,
-        "for (int i = 0; i < $name$_.size(); i++) {\n"
-        "  dataSize += com.google.protobuf.CodedOutputStream\n"
-        "    .compute$capitalized_type$SizeNoTag($repeated_get$(i));\n"
-        "}\n");
-  } else {
-    printer->Print(
-        variables_,
-        "dataSize = $fixed_size$ * get$capitalized_name$List().size();\n");
-  }
-
-  printer->Print("size += dataSize;\n");
-
-  if (descriptor_->is_packed()) {
-    printer->Print(variables_,
-                   "if (!get$capitalized_name$List().isEmpty()) {\n"
-                   "  size += $tag_size$;\n"
-                   "  size += com.google.protobuf.CodedOutputStream\n"
-                   "      .computeInt32SizeNoTag(dataSize);\n"
-                   "}\n");
-  } else {
-    printer->Print(
-        variables_,
-        "size += $tag_size$ * get$capitalized_name$List().size();\n");
-  }
-
-  // cache the data size for packed fields.
-  if (descriptor_->is_packed()) {
-    printer->Print(variables_, "$name$MemoizedSerializedSize = dataSize;\n");
-  }
-
-  printer->Outdent();
-  printer->Print("}\n");
-}
-
-void RepeatedImmutablePrimitiveFieldGenerator::GenerateEqualsCode(
-    io::Printer* printer) const {
-  printer->Print(
-      variables_,
-      "if (!get$capitalized_name$List()\n"
-      "    .equals(other.get$capitalized_name$List())) return false;\n");
-}
-
-void RepeatedImmutablePrimitiveFieldGenerator::GenerateHashCode(
-    io::Printer* printer) const {
-  printer->Print(
-      variables_,
-      "if (get$capitalized_name$Count() > 0) {\n"
-      "  hash = (37 * hash) + $constant_name$;\n"
-      "  hash = (53 * hash) + get$capitalized_name$List().hashCode();\n"
-      "}\n");
-}
-
-std::string RepeatedImmutablePrimitiveFieldGenerator::GetBoxedType() const {
-  return BoxedPrimitiveTypeName(GetJavaType(descriptor_));
-}
-
-}  // namespace java
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/compiler/java/primitive_field.h b/libs/protobuf/src/google/protobuf/compiler/java/primitive_field.h
deleted file mode 100644
index 9d95655..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/java/primitive_field.h
+++ /dev/null
@@ -1,166 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-
-#ifndef GOOGLE_PROTOBUF_COMPILER_JAVA_PRIMITIVE_FIELD_H__
-#define GOOGLE_PROTOBUF_COMPILER_JAVA_PRIMITIVE_FIELD_H__
-
-#include <map>
-#include <string>
-
-#include "google/protobuf/compiler/java/field.h"
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace java {
-class Context;            // context.h
-class ClassNameResolver;  // name_resolver.h
-}  // namespace java
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace java {
-
-class ImmutablePrimitiveFieldGenerator : public ImmutableFieldGenerator {
- public:
-  explicit ImmutablePrimitiveFieldGenerator(const FieldDescriptor* descriptor,
-                                            int messageBitIndex,
-                                            int builderBitIndex,
-                                            Context* context);
-  ImmutablePrimitiveFieldGenerator(const ImmutablePrimitiveFieldGenerator&) =
-      delete;
-  ImmutablePrimitiveFieldGenerator& operator=(
-      const ImmutablePrimitiveFieldGenerator&) = delete;
-  ~ImmutablePrimitiveFieldGenerator() override;
-
-  // implements ImmutableFieldGenerator
-  // ---------------------------------------
-  int GetMessageBitIndex() const override;
-  int GetBuilderBitIndex() const override;
-  int GetNumBitsForMessage() const override;
-  int GetNumBitsForBuilder() const override;
-  void GenerateInterfaceMembers(io::Printer* printer) const override;
-  void GenerateMembers(io::Printer* printer) const override;
-  void GenerateBuilderMembers(io::Printer* printer) const override;
-  void GenerateInitializationCode(io::Printer* printer) const override;
-  void GenerateBuilderClearCode(io::Printer* printer) const override;
-  void GenerateMergingCode(io::Printer* printer) const override;
-  void GenerateBuildingCode(io::Printer* printer) const override;
-  void GenerateBuilderParsingCode(io::Printer* printer) const override;
-  void GenerateSerializationCode(io::Printer* printer) const override;
-  void GenerateSerializedSizeCode(io::Printer* printer) const override;
-  void GenerateFieldBuilderInitializationCode(
-      io::Printer* printer) const override;
-  void GenerateEqualsCode(io::Printer* printer) const override;
-  void GenerateHashCode(io::Printer* printer) const override;
-  void GenerateKotlinDslMembers(io::Printer* printer) const override;
-
-  std::string GetBoxedType() const override;
-
- protected:
-  const FieldDescriptor* descriptor_;
-  int message_bit_index_;
-  int builder_bit_index_;
-  std::map<std::string, std::string> variables_;
-  ClassNameResolver* name_resolver_;
-};
-
-class ImmutablePrimitiveOneofFieldGenerator
-    : public ImmutablePrimitiveFieldGenerator {
- public:
-  ImmutablePrimitiveOneofFieldGenerator(const FieldDescriptor* descriptor,
-                                        int messageBitIndex,
-                                        int builderBitIndex, Context* context);
-  ImmutablePrimitiveOneofFieldGenerator(
-      const ImmutablePrimitiveOneofFieldGenerator&) = delete;
-  ImmutablePrimitiveOneofFieldGenerator& operator=(
-      const ImmutablePrimitiveOneofFieldGenerator&) = delete;
-  ~ImmutablePrimitiveOneofFieldGenerator() override;
-
-  void GenerateMembers(io::Printer* printer) const override;
-  void GenerateBuilderMembers(io::Printer* printer) const override;
-  void GenerateBuilderClearCode(io::Printer* printer) const override;
-  void GenerateBuildingCode(io::Printer* printer) const override;
-  void GenerateMergingCode(io::Printer* printer) const override;
-  void GenerateBuilderParsingCode(io::Printer* printer) const override;
-  void GenerateSerializationCode(io::Printer* printer) const override;
-  void GenerateSerializedSizeCode(io::Printer* printer) const override;
-};
-
-class RepeatedImmutablePrimitiveFieldGenerator
-    : public ImmutablePrimitiveFieldGenerator {
- public:
-  explicit RepeatedImmutablePrimitiveFieldGenerator(
-      const FieldDescriptor* descriptor, int messageBitIndex,
-      int builderBitIndex, Context* context);
-  RepeatedImmutablePrimitiveFieldGenerator(
-      const RepeatedImmutablePrimitiveFieldGenerator&) = delete;
-  RepeatedImmutablePrimitiveFieldGenerator& operator=(
-      const RepeatedImmutablePrimitiveFieldGenerator&) = delete;
-  ~RepeatedImmutablePrimitiveFieldGenerator() override;
-
-  // implements ImmutableFieldGenerator ---------------------------------------
-  int GetNumBitsForMessage() const override;
-  int GetNumBitsForBuilder() const override;
-  void GenerateInterfaceMembers(io::Printer* printer) const override;
-  void GenerateMembers(io::Printer* printer) const override;
-  void GenerateBuilderMembers(io::Printer* printer) const override;
-  void GenerateInitializationCode(io::Printer* printer) const override;
-  void GenerateBuilderClearCode(io::Printer* printer) const override;
-  void GenerateMergingCode(io::Printer* printer) const override;
-  void GenerateBuildingCode(io::Printer* printer) const override;
-  void GenerateBuilderParsingCode(io::Printer* printer) const override;
-  void GenerateBuilderParsingCodeFromPacked(
-      io::Printer* printer) const override;
-  void GenerateSerializationCode(io::Printer* printer) const override;
-  void GenerateSerializedSizeCode(io::Printer* printer) const override;
-  void GenerateFieldBuilderInitializationCode(
-      io::Printer* printer) const override;
-  void GenerateEqualsCode(io::Printer* printer) const override;
-  void GenerateHashCode(io::Printer* printer) const override;
-  void GenerateKotlinDslMembers(io::Printer* printer) const override;
-
-  std::string GetBoxedType() const override;
-};
-
-}  // namespace java
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // GOOGLE_PROTOBUF_COMPILER_JAVA_PRIMITIVE_FIELD_H__
diff --git a/libs/protobuf/src/google/protobuf/compiler/java/primitive_field_lite.cc b/libs/protobuf/src/google/protobuf/compiler/java/primitive_field_lite.cc
deleted file mode 100644
index 28c23d5..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/java/primitive_field_lite.cc
+++ /dev/null
@@ -1,778 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-
-#include <google/protobuf/compiler/java/primitive_field_lite.h>
-
-#include <cstdint>
-#include <map>
-#include <string>
-
-#include <google/protobuf/stubs/logging.h>
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/io/printer.h>
-#include <google/protobuf/wire_format.h>
-#include <google/protobuf/stubs/strutil.h>
-#include <google/protobuf/compiler/java/context.h>
-#include <google/protobuf/compiler/java/doc_comment.h>
-#include <google/protobuf/compiler/java/helpers.h>
-#include <google/protobuf/compiler/java/name_resolver.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace java {
-
-using internal::WireFormat;
-using internal::WireFormatLite;
-
-namespace {
-bool EnableExperimentalRuntimeForLite() {
-#ifdef PROTOBUF_EXPERIMENT
-  return PROTOBUF_EXPERIMENT;
-#else   // PROTOBUF_EXPERIMENT
-  return false;
-#endif  // !PROTOBUF_EXPERIMENT
-}
-
-void SetPrimitiveVariables(const FieldDescriptor* descriptor,
-                           int messageBitIndex, int builderBitIndex,
-                           const FieldGeneratorInfo* info,
-                           ClassNameResolver* name_resolver,
-                           std::map<std::string, std::string>* variables) {
-  SetCommonFieldVariables(descriptor, info, variables);
-  JavaType javaType = GetJavaType(descriptor);
-  (*variables)["type"] = PrimitiveTypeName(javaType);
-  (*variables)["boxed_type"] = BoxedPrimitiveTypeName(javaType);
-  (*variables)["kt_type"] = KotlinTypeName(javaType);
-  (*variables)["field_type"] = (*variables)["type"];
-  (*variables)["default"] = ImmutableDefaultValue(descriptor, name_resolver);
-  (*variables)["capitalized_type"] =
-      GetCapitalizedType(descriptor, /* immutable = */ true);
-  (*variables)["tag"] =
-      StrCat(static_cast<int32_t>(WireFormat::MakeTag(descriptor)));
-  (*variables)["tag_size"] = StrCat(
-      WireFormat::TagSize(descriptor->number(), GetType(descriptor)));
-  (*variables)["required"] = descriptor->is_required() ? "true" : "false";
-
-  std::string capitalized_type = UnderscoresToCamelCase(
-      PrimitiveTypeName(javaType), true /* cap_next_letter */);
-  switch (javaType) {
-    case JAVATYPE_INT:
-    case JAVATYPE_LONG:
-    case JAVATYPE_FLOAT:
-    case JAVATYPE_DOUBLE:
-    case JAVATYPE_BOOLEAN:
-      (*variables)["field_list_type"] =
-          "com.google.protobuf.Internal." + capitalized_type + "List";
-      (*variables)["empty_list"] = "empty" + capitalized_type + "List()";
-      (*variables)["make_name_unmodifiable"] =
-          (*variables)["name"] + "_.makeImmutable()";
-      (*variables)["repeated_get"] =
-          (*variables)["name"] + "_.get" + capitalized_type;
-      (*variables)["repeated_add"] =
-          (*variables)["name"] + "_.add" + capitalized_type;
-      (*variables)["repeated_set"] =
-          (*variables)["name"] + "_.set" + capitalized_type;
-      (*variables)["visit_type"] = capitalized_type;
-      (*variables)["visit_type_list"] = "visit" + capitalized_type + "List";
-      break;
-    default:
-      (*variables)["field_list_type"] =
-          "com.google.protobuf.Internal.ProtobufList<" +
-          (*variables)["boxed_type"] + ">";
-      (*variables)["empty_list"] = "emptyProtobufList()";
-      (*variables)["make_name_unmodifiable"] =
-          (*variables)["name"] + "_.makeImmutable()";
-      (*variables)["repeated_get"] = (*variables)["name"] + "_.get";
-      (*variables)["repeated_add"] = (*variables)["name"] + "_.add";
-      (*variables)["repeated_set"] = (*variables)["name"] + "_.set";
-      (*variables)["visit_type"] = "ByteString";
-      (*variables)["visit_type_list"] = "visitList";
-  }
-
-  if (javaType == JAVATYPE_BYTES) {
-    (*variables)["bytes_default"] =
-        ToUpper((*variables)["name"]) + "_DEFAULT_VALUE";
-  }
-
-  if (IsReferenceType(javaType)) {
-    // We use `x.getClass()` as a null check because it generates less bytecode
-    // than an `if (x == null) { throw ... }` statement.
-    (*variables)["null_check"] =
-        "  java.lang.Class<?> valueClass = value.getClass();\n";
-  } else {
-    (*variables)["null_check"] = "";
-  }
-  // TODO(birdo): Add @deprecated javadoc when generating javadoc is supported
-  // by the proto compiler
-  (*variables)["deprecation"] =
-      descriptor->options().deprecated() ? "@java.lang.Deprecated " : "";
-  (*variables)["kt_deprecation"] =
-      descriptor->options().deprecated()
-          ? "@kotlin.Deprecated(message = \"Field " + (*variables)["name"] +
-                " is deprecated\") "
-          : "";
-  int fixed_size = FixedSize(GetType(descriptor));
-  if (fixed_size != -1) {
-    (*variables)["fixed_size"] = StrCat(fixed_size);
-  }
-
-  if (HasHasbit(descriptor)) {
-    // For singular messages and builders, one bit is used for the hasField bit.
-    (*variables)["get_has_field_bit_message"] = GenerateGetBit(messageBitIndex);
-
-    // Note that these have a trailing ";".
-    (*variables)["set_has_field_bit_message"] =
-        GenerateSetBit(messageBitIndex) + ";";
-    (*variables)["clear_has_field_bit_message"] =
-        GenerateClearBit(messageBitIndex) + ";";
-
-    (*variables)["is_field_present_message"] = GenerateGetBit(messageBitIndex);
-  } else {
-    (*variables)["set_has_field_bit_message"] = "";
-    (*variables)["clear_has_field_bit_message"] = "";
-
-    switch (descriptor->type()) {
-      case FieldDescriptor::TYPE_BYTES:
-        (*variables)["is_field_present_message"] =
-            "!" + (*variables)["name"] + "_.isEmpty()";
-        break;
-      case FieldDescriptor::TYPE_FLOAT:
-        (*variables)["is_field_present_message"] =
-            "java.lang.Float.floatToRawIntBits(" + (*variables)["name"] +
-            "_) != 0";
-        break;
-      case FieldDescriptor::TYPE_DOUBLE:
-        (*variables)["is_field_present_message"] =
-            "java.lang.Double.doubleToRawLongBits(" + (*variables)["name"] +
-            "_) != 0";
-        break;
-      default:
-        (*variables)["is_field_present_message"] =
-            (*variables)["name"] + "_ != " + (*variables)["default"];
-        break;
-    }
-  }
-
-  (*variables)["get_has_field_bit_from_local"] =
-      GenerateGetBitFromLocal(builderBitIndex);
-  (*variables)["set_has_field_bit_to_local"] =
-      GenerateSetBitToLocal(messageBitIndex);
-}
-
-}  // namespace
-
-// ===================================================================
-
-ImmutablePrimitiveFieldLiteGenerator::ImmutablePrimitiveFieldLiteGenerator(
-    const FieldDescriptor* descriptor, int messageBitIndex, Context* context)
-    : descriptor_(descriptor),
-      messageBitIndex_(messageBitIndex),
-      name_resolver_(context->GetNameResolver()) {
-  SetPrimitiveVariables(descriptor, messageBitIndex, 0,
-                        context->GetFieldGeneratorInfo(descriptor),
-                        name_resolver_, &variables_);
-}
-
-ImmutablePrimitiveFieldLiteGenerator::~ImmutablePrimitiveFieldLiteGenerator() {}
-
-int ImmutablePrimitiveFieldLiteGenerator::GetNumBitsForMessage() const {
-  return HasHasbit(descriptor_) ? 1 : 0;
-}
-
-void ImmutablePrimitiveFieldLiteGenerator::GenerateInterfaceMembers(
-    io::Printer* printer) const {
-  if (HasHazzer(descriptor_)) {
-    WriteFieldAccessorDocComment(printer, descriptor_, HAZZER);
-    printer->Print(variables_,
-                   "$deprecation$boolean has$capitalized_name$();\n");
-  }
-  WriteFieldAccessorDocComment(printer, descriptor_, GETTER);
-  printer->Print(variables_, "$deprecation$$type$ get$capitalized_name$();\n");
-}
-
-void ImmutablePrimitiveFieldLiteGenerator::GenerateMembers(
-    io::Printer* printer) const {
-  if (IsByteStringWithCustomDefaultValue(descriptor_)) {
-    // allocate this once statically since we know ByteStrings are immutable
-    // values that can be reused.
-    printer->Print(
-        variables_,
-        "private static final $field_type$ $bytes_default$ = $default$;\n");
-  }
-  printer->Print(variables_, "private $field_type$ $name$_;\n");
-  PrintExtraFieldInfo(variables_, printer);
-  if (HasHazzer(descriptor_)) {
-    WriteFieldAccessorDocComment(printer, descriptor_, HAZZER);
-    printer->Print(
-        variables_,
-        "@java.lang.Override\n"
-        "$deprecation$public boolean ${$has$capitalized_name$$}$() {\n"
-        "  return $get_has_field_bit_message$;\n"
-        "}\n");
-    printer->Annotate("{", "}", descriptor_);
-  }
-
-  WriteFieldAccessorDocComment(printer, descriptor_, GETTER);
-  printer->Print(variables_,
-                 "@java.lang.Override\n"
-                 "$deprecation$public $type$ ${$get$capitalized_name$$}$() {\n"
-                 "  return $name$_;\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-
-  WriteFieldAccessorDocComment(printer, descriptor_, SETTER);
-  printer->Print(variables_,
-                 "private void set$capitalized_name$($type$ value) {\n"
-                 "$null_check$"
-                 "  $set_has_field_bit_message$\n"
-                 "  $name$_ = value;\n"
-                 "}\n");
-
-  WriteFieldAccessorDocComment(printer, descriptor_, CLEARER);
-  printer->Print(variables_,
-                 "private void clear$capitalized_name$() {\n"
-                 "  $clear_has_field_bit_message$\n");
-  JavaType type = GetJavaType(descriptor_);
-  if (type == JAVATYPE_STRING || type == JAVATYPE_BYTES) {
-    // The default value is not a simple literal so we want to avoid executing
-    // it multiple times.  Instead, get the default out of the default instance.
-    printer->Print(
-        variables_,
-        "  $name$_ = getDefaultInstance().get$capitalized_name$();\n");
-  } else {
-    printer->Print(variables_, "  $name$_ = $default$;\n");
-  }
-  printer->Print(variables_, "}\n");
-}
-
-void ImmutablePrimitiveFieldLiteGenerator::GenerateBuilderMembers(
-    io::Printer* printer) const {
-  if (HasHazzer(descriptor_)) {
-    WriteFieldAccessorDocComment(printer, descriptor_, HAZZER);
-    printer->Print(
-        variables_,
-        "@java.lang.Override\n"
-        "$deprecation$public boolean ${$has$capitalized_name$$}$() {\n"
-        "  return instance.has$capitalized_name$();\n"
-        "}\n");
-    printer->Annotate("{", "}", descriptor_);
-  }
-
-  WriteFieldAccessorDocComment(printer, descriptor_, GETTER);
-  printer->Print(variables_,
-                 "@java.lang.Override\n"
-                 "$deprecation$public $type$ ${$get$capitalized_name$$}$() {\n"
-                 "  return instance.get$capitalized_name$();\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-
-  WriteFieldAccessorDocComment(printer, descriptor_, SETTER,
-                               /* builder */ true);
-  printer->Print(variables_,
-                 "$deprecation$public Builder "
-                 "${$set$capitalized_name$$}$($type$ value) {\n"
-                 "  copyOnWrite();\n"
-                 "  instance.set$capitalized_name$(value);\n"
-                 "  return this;\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-
-  WriteFieldAccessorDocComment(printer, descriptor_, CLEARER,
-                               /* builder */ true);
-  printer->Print(
-      variables_,
-      "$deprecation$public Builder ${$clear$capitalized_name$$}$() {\n"
-      "  copyOnWrite();\n"
-      "  instance.clear$capitalized_name$();\n"
-      "  return this;\n"
-      "}\n");
-  printer->Annotate("{", "}", descriptor_);
-}
-
-void ImmutablePrimitiveFieldLiteGenerator::GenerateKotlinDslMembers(
-    io::Printer* printer) const {
-  WriteFieldDocComment(printer, descriptor_);
-  printer->Print(variables_,
-                 "$kt_deprecation$public var $kt_name$: $kt_type$\n"
-                 "  @JvmName(\"${$get$kt_capitalized_name$$}$\")\n"
-                 "  get() = $kt_dsl_builder$.${$get$capitalized_name$$}$()\n"
-                 "  @JvmName(\"${$set$kt_capitalized_name$$}$\")\n"
-                 "  set(value) {\n"
-                 "    $kt_dsl_builder$.${$set$capitalized_name$$}$(value)\n"
-                 "  }\n");
-
-  WriteFieldAccessorDocComment(printer, descriptor_, CLEARER,
-                               /* builder */ false);
-  printer->Print(variables_,
-                 "public fun ${$clear$kt_capitalized_name$$}$() {\n"
-                 "  $kt_dsl_builder$.${$clear$capitalized_name$$}$()\n"
-                 "}\n");
-
-  if (HasHazzer(descriptor_)) {
-    WriteFieldAccessorDocComment(printer, descriptor_, HAZZER);
-    printer->Print(
-        variables_,
-        "public fun ${$has$kt_capitalized_name$$}$(): kotlin.Boolean {\n"
-        "  return $kt_dsl_builder$.${$has$capitalized_name$$}$()\n"
-        "}\n");
-  }
-}
-
-void ImmutablePrimitiveFieldLiteGenerator::GenerateFieldInfo(
-    io::Printer* printer, std::vector<uint16_t>* output) const {
-  WriteIntToUtf16CharSequence(descriptor_->number(), output);
-  WriteIntToUtf16CharSequence(GetExperimentalJavaFieldType(descriptor_),
-                              output);
-  if (HasHasbit(descriptor_)) {
-    WriteIntToUtf16CharSequence(messageBitIndex_, output);
-  }
-  printer->Print(variables_, "\"$name$_\",\n");
-}
-
-void ImmutablePrimitiveFieldLiteGenerator::GenerateInitializationCode(
-    io::Printer* printer) const {
-  if (IsByteStringWithCustomDefaultValue(descriptor_)) {
-    printer->Print(variables_, "$name$_ = $bytes_default$;\n");
-  } else if (!IsDefaultValueJavaDefault(descriptor_)) {
-    printer->Print(variables_, "$name$_ = $default$;\n");
-  }
-}
-
-std::string ImmutablePrimitiveFieldLiteGenerator::GetBoxedType() const {
-  return BoxedPrimitiveTypeName(GetJavaType(descriptor_));
-}
-
-// ===================================================================
-
-ImmutablePrimitiveOneofFieldLiteGenerator::
-    ImmutablePrimitiveOneofFieldLiteGenerator(const FieldDescriptor* descriptor,
-                                              int messageBitIndex,
-                                              Context* context)
-    : ImmutablePrimitiveFieldLiteGenerator(descriptor, messageBitIndex,
-                                           context) {
-  const OneofGeneratorInfo* info =
-      context->GetOneofGeneratorInfo(descriptor->containing_oneof());
-  SetCommonOneofVariables(descriptor, info, &variables_);
-}
-
-ImmutablePrimitiveOneofFieldLiteGenerator::
-    ~ImmutablePrimitiveOneofFieldLiteGenerator() {}
-
-void ImmutablePrimitiveOneofFieldLiteGenerator::GenerateMembers(
-    io::Printer* printer) const {
-  PrintExtraFieldInfo(variables_, printer);
-  GOOGLE_DCHECK(HasHazzer(descriptor_));
-  WriteFieldAccessorDocComment(printer, descriptor_, HAZZER);
-  printer->Print(variables_,
-                 "@java.lang.Override\n"
-                 "$deprecation$public boolean ${$has$capitalized_name$$}$() {\n"
-                 "  return $has_oneof_case_message$;\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-
-  WriteFieldAccessorDocComment(printer, descriptor_, GETTER);
-  printer->Print(variables_,
-                 "@java.lang.Override\n"
-                 "$deprecation$public $type$ ${$get$capitalized_name$$}$() {\n"
-                 "  if ($has_oneof_case_message$) {\n"
-                 "    return ($boxed_type$) $oneof_name$_;\n"
-                 "  }\n"
-                 "  return $default$;\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-
-  WriteFieldAccessorDocComment(printer, descriptor_, SETTER);
-  printer->Print(variables_,
-                 "private void set$capitalized_name$($type$ value) {\n"
-                 "$null_check$"
-                 "  $set_oneof_case_message$;\n"
-                 "  $oneof_name$_ = value;\n"
-                 "}\n");
-
-  WriteFieldAccessorDocComment(printer, descriptor_, CLEARER);
-  printer->Print(variables_,
-                 "private void clear$capitalized_name$() {\n"
-                 "  if ($has_oneof_case_message$) {\n"
-                 "    $clear_oneof_case_message$;\n"
-                 "    $oneof_name$_ = null;\n"
-                 "  }\n"
-                 "}\n");
-}
-
-void ImmutablePrimitiveOneofFieldLiteGenerator::GenerateFieldInfo(
-    io::Printer* printer, std::vector<uint16_t>* output) const {
-  WriteIntToUtf16CharSequence(descriptor_->number(), output);
-  WriteIntToUtf16CharSequence(GetExperimentalJavaFieldType(descriptor_),
-                              output);
-  WriteIntToUtf16CharSequence(descriptor_->containing_oneof()->index(), output);
-}
-
-void ImmutablePrimitiveOneofFieldLiteGenerator::GenerateBuilderMembers(
-    io::Printer* printer) const {
-  GOOGLE_DCHECK(HasHazzer(descriptor_));
-  WriteFieldAccessorDocComment(printer, descriptor_, HAZZER);
-  printer->Print(variables_,
-                 "@java.lang.Override\n"
-                 "$deprecation$public boolean ${$has$capitalized_name$$}$() {\n"
-                 "  return instance.has$capitalized_name$();\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-
-  WriteFieldAccessorDocComment(printer, descriptor_, GETTER);
-  printer->Print(variables_,
-                 "@java.lang.Override\n"
-                 "$deprecation$public $type$ ${$get$capitalized_name$$}$() {\n"
-                 "  return instance.get$capitalized_name$();\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-
-  WriteFieldAccessorDocComment(printer, descriptor_, SETTER,
-                               /* builder */ true);
-  printer->Print(variables_,
-                 "$deprecation$public Builder "
-                 "${$set$capitalized_name$$}$($type$ value) {\n"
-                 "  copyOnWrite();\n"
-                 "  instance.set$capitalized_name$(value);\n"
-                 "  return this;\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-
-  WriteFieldAccessorDocComment(printer, descriptor_, CLEARER,
-                               /* builder */ true);
-  printer->Print(
-      variables_,
-      "$deprecation$public Builder ${$clear$capitalized_name$$}$() {\n"
-      "  copyOnWrite();\n"
-      "  instance.clear$capitalized_name$();\n"
-      "  return this;\n"
-      "}\n");
-  printer->Annotate("{", "}", descriptor_);
-}
-
-// ===================================================================
-
-RepeatedImmutablePrimitiveFieldLiteGenerator::
-    RepeatedImmutablePrimitiveFieldLiteGenerator(
-        const FieldDescriptor* descriptor, int messageBitIndex,
-        Context* context)
-    : descriptor_(descriptor),
-      context_(context),
-      name_resolver_(context->GetNameResolver()) {
-  SetPrimitiveVariables(descriptor, messageBitIndex, 0,
-                        context->GetFieldGeneratorInfo(descriptor),
-                        name_resolver_, &variables_);
-}
-
-RepeatedImmutablePrimitiveFieldLiteGenerator::
-    ~RepeatedImmutablePrimitiveFieldLiteGenerator() {}
-
-int RepeatedImmutablePrimitiveFieldLiteGenerator::GetNumBitsForMessage() const {
-  return 0;
-}
-
-void RepeatedImmutablePrimitiveFieldLiteGenerator::GenerateInterfaceMembers(
-    io::Printer* printer) const {
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_GETTER);
-  printer->Print(variables_,
-                 "$deprecation$java.util.List<$boxed_type$> "
-                 "get$capitalized_name$List();\n");
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_COUNT);
-  printer->Print(variables_,
-                 "$deprecation$int get$capitalized_name$Count();\n");
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_INDEXED_GETTER);
-  printer->Print(variables_,
-                 "$deprecation$$type$ get$capitalized_name$(int index);\n");
-}
-
-void RepeatedImmutablePrimitiveFieldLiteGenerator::GenerateMembers(
-    io::Printer* printer) const {
-  printer->Print(variables_, "private $field_list_type$ $name$_;\n");
-  PrintExtraFieldInfo(variables_, printer);
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_GETTER);
-  printer->Print(variables_,
-                 "@java.lang.Override\n"
-                 "$deprecation$public java.util.List<$boxed_type$>\n"
-                 "    ${$get$capitalized_name$List$}$() {\n"
-                 "  return $name$_;\n"  // note:  unmodifiable list
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_COUNT);
-  printer->Print(
-      variables_,
-      "@java.lang.Override\n"
-      "$deprecation$public int ${$get$capitalized_name$Count$}$() {\n"
-      "  return $name$_.size();\n"
-      "}\n");
-  printer->Annotate("{", "}", descriptor_);
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_INDEXED_GETTER);
-  printer->Print(
-      variables_,
-      "@java.lang.Override\n"
-      "$deprecation$public $type$ ${$get$capitalized_name$$}$(int index) {\n"
-      "  return $repeated_get$(index);\n"
-      "}\n");
-  printer->Annotate("{", "}", descriptor_);
-
-  if (!EnableExperimentalRuntimeForLite() && descriptor_->is_packed() &&
-      context_->HasGeneratedMethods(descriptor_->containing_type())) {
-    printer->Print(variables_,
-                   "private int $name$MemoizedSerializedSize = -1;\n");
-  }
-
-  printer->Print(
-      variables_,
-      "private void ensure$capitalized_name$IsMutable() {\n"
-      // Use a temporary to avoid a redundant iget-object.
-      "  $field_list_type$ tmp = $name$_;\n"
-      "  if (!tmp.isModifiable()) {\n"
-      "    $name$_ =\n"
-      "        com.google.protobuf.GeneratedMessageLite.mutableCopy(tmp);\n"
-      "   }\n"
-      "}\n");
-
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_INDEXED_SETTER);
-  printer->Print(variables_,
-                 "private void set$capitalized_name$(\n"
-                 "    int index, $type$ value) {\n"
-                 "$null_check$"
-                 "  ensure$capitalized_name$IsMutable();\n"
-                 "  $repeated_set$(index, value);\n"
-                 "}\n");
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_ADDER);
-  printer->Print(variables_,
-                 "private void add$capitalized_name$($type$ value) {\n"
-                 "$null_check$"
-                 "  ensure$capitalized_name$IsMutable();\n"
-                 "  $repeated_add$(value);\n"
-                 "}\n");
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_MULTI_ADDER);
-  printer->Print(variables_,
-                 "private void addAll$capitalized_name$(\n"
-                 "    java.lang.Iterable<? extends $boxed_type$> values) {\n"
-                 "  ensure$capitalized_name$IsMutable();\n"
-                 "  com.google.protobuf.AbstractMessageLite.addAll(\n"
-                 "      values, $name$_);\n"
-                 "}\n");
-  WriteFieldAccessorDocComment(printer, descriptor_, CLEARER);
-  printer->Print(variables_,
-                 "private void clear$capitalized_name$() {\n"
-                 "  $name$_ = $empty_list$;\n"
-                 "}\n");
-}
-
-void RepeatedImmutablePrimitiveFieldLiteGenerator::GenerateBuilderMembers(
-    io::Printer* printer) const {
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_GETTER);
-  printer->Print(variables_,
-                 "@java.lang.Override\n"
-                 "$deprecation$public java.util.List<$boxed_type$>\n"
-                 "    ${$get$capitalized_name$List$}$() {\n"
-                 "  return java.util.Collections.unmodifiableList(\n"
-                 "      instance.get$capitalized_name$List());\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_COUNT);
-  printer->Print(
-      variables_,
-      "@java.lang.Override\n"
-      "$deprecation$public int ${$get$capitalized_name$Count$}$() {\n"
-      "  return instance.get$capitalized_name$Count();\n"
-      "}\n");
-  printer->Annotate("{", "}", descriptor_);
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_INDEXED_GETTER);
-  printer->Print(
-      variables_,
-      "@java.lang.Override\n"
-      "$deprecation$public $type$ ${$get$capitalized_name$$}$(int index) {\n"
-      "  return instance.get$capitalized_name$(index);\n"
-      "}\n");
-  printer->Annotate("{", "}", descriptor_);
-  WriteFieldAccessorDocComment(printer, descriptor_, SETTER,
-                               /* builder */ true);
-  printer->Print(variables_,
-                 "$deprecation$public Builder ${$set$capitalized_name$$}$(\n"
-                 "    int index, $type$ value) {\n"
-                 "  copyOnWrite();\n"
-                 "  instance.set$capitalized_name$(index, value);\n"
-                 "  return this;\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_ADDER,
-                               /* builder */ true);
-  printer->Print(variables_,
-                 "$deprecation$public Builder "
-                 "${$add$capitalized_name$$}$($type$ value) {\n"
-                 "  copyOnWrite();\n"
-                 "  instance.add$capitalized_name$(value);\n"
-                 "  return this;\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_MULTI_ADDER,
-                               /* builder */ true);
-  printer->Print(variables_,
-                 "$deprecation$public Builder ${$addAll$capitalized_name$$}$(\n"
-                 "    java.lang.Iterable<? extends $boxed_type$> values) {\n"
-                 "  copyOnWrite();\n"
-                 "  instance.addAll$capitalized_name$(values);\n"
-                 "  return this;\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-  WriteFieldAccessorDocComment(printer, descriptor_, CLEARER,
-                               /* builder */ true);
-  printer->Print(
-      variables_,
-      "$deprecation$public Builder ${$clear$capitalized_name$$}$() {\n"
-      "  copyOnWrite();\n"
-      "  instance.clear$capitalized_name$();\n"
-      "  return this;\n"
-      "}\n");
-  printer->Annotate("{", "}", descriptor_);
-}
-
-void RepeatedImmutablePrimitiveFieldLiteGenerator::GenerateKotlinDslMembers(
-    io::Printer* printer) const {
-  printer->Print(
-      variables_,
-      "/**\n"
-      " * An uninstantiable, behaviorless type to represent the field in\n"
-      " * generics.\n"
-      " */\n"
-      "@kotlin.OptIn"
-      "(com.google.protobuf.kotlin.OnlyForUseByGeneratedProtoCode::class)\n"
-      "public class ${$$kt_capitalized_name$Proxy$}$ private constructor()"
-      " : com.google.protobuf.kotlin.DslProxy()\n");
-
-  WriteFieldDocComment(printer, descriptor_);
-  printer->Print(variables_,
-                 "$kt_deprecation$ public val $kt_name$: "
-                 "com.google.protobuf.kotlin.DslList"
-                 "<$kt_type$, ${$$kt_capitalized_name$Proxy$}$>\n"
-                 "  @kotlin.jvm.JvmSynthetic\n"
-                 "  get() = com.google.protobuf.kotlin.DslList(\n"
-                 "    $kt_dsl_builder$.${$get$capitalized_name$List$}$()\n"
-                 "  )\n");
-
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_ADDER,
-                               /* builder */ false);
-  printer->Print(variables_,
-                 "@kotlin.jvm.JvmSynthetic\n"
-                 "@kotlin.jvm.JvmName(\"add$kt_capitalized_name$\")\n"
-                 "public fun com.google.protobuf.kotlin.DslList"
-                 "<$kt_type$, ${$$kt_capitalized_name$Proxy$}$>."
-                 "add(value: $kt_type$) {\n"
-                 "  $kt_dsl_builder$.${$add$capitalized_name$$}$(value)\n"
-                 "}");
-
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_ADDER,
-                               /* builder */ false);
-  printer->Print(variables_,
-                 "@kotlin.jvm.JvmSynthetic\n"
-                 "@kotlin.jvm.JvmName(\"plusAssign$kt_capitalized_name$\")\n"
-                 "@Suppress(\"NOTHING_TO_INLINE\")\n"
-                 "public inline operator fun com.google.protobuf.kotlin.DslList"
-                 "<$kt_type$, ${$$kt_capitalized_name$Proxy$}$>."
-                 "plusAssign(value: $kt_type$) {\n"
-                 "  add(value)\n"
-                 "}");
-
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_MULTI_ADDER,
-                               /* builder */ false);
-  printer->Print(variables_,
-                 "@kotlin.jvm.JvmSynthetic\n"
-                 "@kotlin.jvm.JvmName(\"addAll$kt_capitalized_name$\")\n"
-                 "public fun com.google.protobuf.kotlin.DslList"
-                 "<$kt_type$, ${$$kt_capitalized_name$Proxy$}$>."
-                 "addAll(values: kotlin.collections.Iterable<$kt_type$>) {\n"
-                 "  $kt_dsl_builder$.${$addAll$capitalized_name$$}$(values)\n"
-                 "}");
-
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_MULTI_ADDER,
-                               /* builder */ false);
-  printer->Print(
-      variables_,
-      "@kotlin.jvm.JvmSynthetic\n"
-      "@kotlin.jvm.JvmName(\"plusAssignAll$kt_capitalized_name$\")\n"
-      "@Suppress(\"NOTHING_TO_INLINE\")\n"
-      "public inline operator fun com.google.protobuf.kotlin.DslList"
-      "<$kt_type$, ${$$kt_capitalized_name$Proxy$}$>."
-      "plusAssign(values: kotlin.collections.Iterable<$kt_type$>) {\n"
-      "  addAll(values)\n"
-      "}");
-
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_INDEXED_SETTER,
-                               /* builder */ false);
-  printer->Print(
-      variables_,
-      "@kotlin.jvm.JvmSynthetic\n"
-      "@kotlin.jvm.JvmName(\"set$kt_capitalized_name$\")\n"
-      "public operator fun com.google.protobuf.kotlin.DslList"
-      "<$kt_type$, ${$$kt_capitalized_name$Proxy$}$>."
-      "set(index: kotlin.Int, value: $kt_type$) {\n"
-      "  $kt_dsl_builder$.${$set$capitalized_name$$}$(index, value)\n"
-      "}");
-
-  WriteFieldAccessorDocComment(printer, descriptor_, CLEARER,
-                               /* builder */ false);
-  printer->Print(variables_,
-                 "@kotlin.jvm.JvmSynthetic\n"
-                 "@kotlin.jvm.JvmName(\"clear$kt_capitalized_name$\")\n"
-                 "public fun com.google.protobuf.kotlin.DslList"
-                 "<$kt_type$, ${$$kt_capitalized_name$Proxy$}$>."
-                 "clear() {\n"
-                 "  $kt_dsl_builder$.${$clear$capitalized_name$$}$()\n"
-                 "}");
-}
-
-void RepeatedImmutablePrimitiveFieldLiteGenerator::GenerateFieldInfo(
-    io::Printer* printer, std::vector<uint16_t>* output) const {
-  WriteIntToUtf16CharSequence(descriptor_->number(), output);
-  WriteIntToUtf16CharSequence(GetExperimentalJavaFieldType(descriptor_),
-                              output);
-  printer->Print(variables_, "\"$name$_\",\n");
-}
-
-void RepeatedImmutablePrimitiveFieldLiteGenerator::GenerateInitializationCode(
-    io::Printer* printer) const {
-  printer->Print(variables_, "$name$_ = $empty_list$;\n");
-}
-
-std::string RepeatedImmutablePrimitiveFieldLiteGenerator::GetBoxedType() const {
-  return BoxedPrimitiveTypeName(GetJavaType(descriptor_));
-}
-
-}  // namespace java
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/compiler/java/primitive_field_lite.h b/libs/protobuf/src/google/protobuf/compiler/java/primitive_field_lite.h
deleted file mode 100644
index 2da0cd8..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/java/primitive_field_lite.h
+++ /dev/null
@@ -1,141 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-
-#ifndef GOOGLE_PROTOBUF_COMPILER_JAVA_PRIMITIVE_FIELD_LITE_H__
-#define GOOGLE_PROTOBUF_COMPILER_JAVA_PRIMITIVE_FIELD_LITE_H__
-
-#include <cstdint>
-#include <map>
-#include <string>
-
-#include <google/protobuf/compiler/java/field.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace java {
-class Context;            // context.h
-class ClassNameResolver;  // name_resolver.h
-}  // namespace java
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace java {
-
-class ImmutablePrimitiveFieldLiteGenerator
-    : public ImmutableFieldLiteGenerator {
- public:
-  explicit ImmutablePrimitiveFieldLiteGenerator(
-      const FieldDescriptor* descriptor, int messageBitIndex, Context* context);
-  ~ImmutablePrimitiveFieldLiteGenerator() override;
-
-  // implements ImmutableFieldLiteGenerator
-  // ------------------------------------
-  int GetNumBitsForMessage() const override;
-  void GenerateInterfaceMembers(io::Printer* printer) const override;
-  void GenerateMembers(io::Printer* printer) const override;
-  void GenerateBuilderMembers(io::Printer* printer) const override;
-  void GenerateInitializationCode(io::Printer* printer) const override;
-  void GenerateFieldInfo(io::Printer* printer,
-                         std::vector<uint16_t>* output) const override;
-  void GenerateKotlinDslMembers(io::Printer* printer) const override;
-
-  std::string GetBoxedType() const override;
-
- protected:
-  const FieldDescriptor* descriptor_;
-  std::map<std::string, std::string> variables_;
-  const int messageBitIndex_;
-  ClassNameResolver* name_resolver_;
-
- private:
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(ImmutablePrimitiveFieldLiteGenerator);
-};
-
-class ImmutablePrimitiveOneofFieldLiteGenerator
-    : public ImmutablePrimitiveFieldLiteGenerator {
- public:
-  ImmutablePrimitiveOneofFieldLiteGenerator(const FieldDescriptor* descriptor,
-                                            int messageBitIndex,
-                                            Context* context);
-  ~ImmutablePrimitiveOneofFieldLiteGenerator() override;
-
-  void GenerateMembers(io::Printer* printer) const override;
-  void GenerateBuilderMembers(io::Printer* printer) const override;
-
-  void GenerateFieldInfo(io::Printer* printer,
-                         std::vector<uint16_t>* output) const override;
-
- private:
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(ImmutablePrimitiveOneofFieldLiteGenerator);
-};
-
-class RepeatedImmutablePrimitiveFieldLiteGenerator
-    : public ImmutableFieldLiteGenerator {
- public:
-  explicit RepeatedImmutablePrimitiveFieldLiteGenerator(
-      const FieldDescriptor* descriptor, int messageBitIndex, Context* context);
-  ~RepeatedImmutablePrimitiveFieldLiteGenerator() override;
-
-  // implements ImmutableFieldLiteGenerator ------------------------------------
-  int GetNumBitsForMessage() const override;
-  void GenerateInterfaceMembers(io::Printer* printer) const override;
-  void GenerateMembers(io::Printer* printer) const override;
-  void GenerateBuilderMembers(io::Printer* printer) const override;
-  void GenerateInitializationCode(io::Printer* printer) const override;
-  void GenerateFieldInfo(io::Printer* printer,
-                         std::vector<uint16_t>* output) const override;
-  void GenerateKotlinDslMembers(io::Printer* printer) const override;
-
-  std::string GetBoxedType() const override;
-
- private:
-  const FieldDescriptor* descriptor_;
-  std::map<std::string, std::string> variables_;
-  Context* context_;
-  ClassNameResolver* name_resolver_;
-
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(RepeatedImmutablePrimitiveFieldLiteGenerator);
-};
-
-}  // namespace java
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // GOOGLE_PROTOBUF_COMPILER_JAVA_PRIMITIVE_FIELD_LITE_H__
diff --git a/libs/protobuf/src/google/protobuf/compiler/java/service.cc b/libs/protobuf/src/google/protobuf/compiler/java/service.cc
deleted file mode 100644
index 9e20620..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/java/service.cc
+++ /dev/null
@@ -1,479 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-
-#include <google/protobuf/compiler/java/service.h>
-
-#include <google/protobuf/io/printer.h>
-#include <google/protobuf/stubs/strutil.h>
-#include <google/protobuf/compiler/java/context.h>
-#include <google/protobuf/compiler/java/doc_comment.h>
-#include <google/protobuf/compiler/java/helpers.h>
-#include <google/protobuf/compiler/java/name_resolver.h>
-
-// Must be last.
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace java {
-
-ServiceGenerator::ServiceGenerator(const ServiceDescriptor* descriptor)
-    : descriptor_(descriptor) {}
-
-ServiceGenerator::~ServiceGenerator() {}
-
-// ===================================================================
-ImmutableServiceGenerator::ImmutableServiceGenerator(
-    const ServiceDescriptor* descriptor, Context* context)
-    : ServiceGenerator(descriptor),
-      context_(context),
-      name_resolver_(context->GetNameResolver()) {}
-
-ImmutableServiceGenerator::~ImmutableServiceGenerator() {}
-
-void ImmutableServiceGenerator::Generate(io::Printer* printer) {
-  bool is_own_file = IsOwnFile(descriptor_, /* immutable = */ true);
-  WriteServiceDocComment(printer, descriptor_);
-  MaybePrintGeneratedAnnotation(context_, printer, descriptor_,
-                                /* immutable = */ true);
-  printer->Print(
-      "public $static$ abstract class $classname$\n"
-      "    implements com.google.protobuf.Service {\n",
-      "static", is_own_file ? "" : "static", "classname", descriptor_->name());
-  printer->Indent();
-
-  printer->Print("protected $classname$() {}\n\n", "classname",
-                 descriptor_->name());
-
-  GenerateInterface(printer);
-
-  GenerateNewReflectiveServiceMethod(printer);
-  GenerateNewReflectiveBlockingServiceMethod(printer);
-
-  GenerateAbstractMethods(printer);
-
-  // Generate getDescriptor() and getDescriptorForType().
-  printer->Print(
-      "public static final\n"
-      "    com.google.protobuf.Descriptors.ServiceDescriptor\n"
-      "    getDescriptor() {\n"
-      "  return $file$.getDescriptor().getServices().get($index$);\n"
-      "}\n",
-      "file", name_resolver_->GetImmutableClassName(descriptor_->file()),
-      "index", StrCat(descriptor_->index()));
-  GenerateGetDescriptorForType(printer);
-
-  // Generate more stuff.
-  GenerateCallMethod(printer);
-  GenerateGetPrototype(REQUEST, printer);
-  GenerateGetPrototype(RESPONSE, printer);
-  GenerateStub(printer);
-  GenerateBlockingStub(printer);
-
-  // Add an insertion point.
-  printer->Print(
-      "\n"
-      "// @@protoc_insertion_point(class_scope:$full_name$)\n",
-      "full_name", descriptor_->full_name());
-
-  printer->Outdent();
-  printer->Print("}\n\n");
-}
-
-void ImmutableServiceGenerator::GenerateGetDescriptorForType(
-    io::Printer* printer) {
-  printer->Print(
-      "public final com.google.protobuf.Descriptors.ServiceDescriptor\n"
-      "    getDescriptorForType() {\n"
-      "  return getDescriptor();\n"
-      "}\n");
-}
-
-void ImmutableServiceGenerator::GenerateInterface(io::Printer* printer) {
-  printer->Print("public interface Interface {\n");
-  printer->Indent();
-  GenerateAbstractMethods(printer);
-  printer->Outdent();
-  printer->Print("}\n\n");
-}
-
-void ImmutableServiceGenerator::GenerateNewReflectiveServiceMethod(
-    io::Printer* printer) {
-  printer->Print(
-      "public static com.google.protobuf.Service newReflectiveService(\n"
-      "    final Interface impl) {\n"
-      "  return new $classname$() {\n",
-      "classname", descriptor_->name());
-  printer->Indent();
-  printer->Indent();
-
-  for (int i = 0; i < descriptor_->method_count(); i++) {
-    const MethodDescriptor* method = descriptor_->method(i);
-    printer->Print("@java.lang.Override\n");
-    GenerateMethodSignature(printer, method, IS_CONCRETE);
-    printer->Print(
-        " {\n"
-        "  impl.$method$(controller, request, done);\n"
-        "}\n\n",
-        "method", UnderscoresToCamelCase(method));
-  }
-
-  printer->Outdent();
-  printer->Print("};\n");
-  printer->Outdent();
-  printer->Print("}\n\n");
-}
-
-void ImmutableServiceGenerator::GenerateNewReflectiveBlockingServiceMethod(
-    io::Printer* printer) {
-  printer->Print(
-      "public static com.google.protobuf.BlockingService\n"
-      "    newReflectiveBlockingService(final BlockingInterface impl) {\n"
-      "  return new com.google.protobuf.BlockingService() {\n");
-  printer->Indent();
-  printer->Indent();
-
-  GenerateGetDescriptorForType(printer);
-
-  GenerateCallBlockingMethod(printer);
-  GenerateGetPrototype(REQUEST, printer);
-  GenerateGetPrototype(RESPONSE, printer);
-
-  printer->Outdent();
-  printer->Print("};\n");
-  printer->Outdent();
-  printer->Print("}\n\n");
-}
-
-void ImmutableServiceGenerator::GenerateAbstractMethods(io::Printer* printer) {
-  for (int i = 0; i < descriptor_->method_count(); i++) {
-    const MethodDescriptor* method = descriptor_->method(i);
-    WriteMethodDocComment(printer, method);
-    GenerateMethodSignature(printer, method, IS_ABSTRACT);
-    printer->Print(";\n\n");
-  }
-}
-
-std::string ImmutableServiceGenerator::GetOutput(
-    const MethodDescriptor* method) {
-  return name_resolver_->GetImmutableClassName(method->output_type());
-}
-
-void ImmutableServiceGenerator::GenerateCallMethod(io::Printer* printer) {
-  printer->Print(
-      "\n"
-      "public final void callMethod(\n"
-      "    com.google.protobuf.Descriptors.MethodDescriptor method,\n"
-      "    com.google.protobuf.RpcController controller,\n"
-      "    com.google.protobuf.Message request,\n"
-      "    com.google.protobuf.RpcCallback<\n"
-      "      com.google.protobuf.Message> done) {\n"
-      "  if (method.getService() != getDescriptor()) {\n"
-      "    throw new java.lang.IllegalArgumentException(\n"
-      "      \"Service.callMethod() given method descriptor for wrong \" +\n"
-      "      \"service type.\");\n"
-      "  }\n"
-      "  switch(method.getIndex()) {\n");
-  printer->Indent();
-  printer->Indent();
-
-  for (int i = 0; i < descriptor_->method_count(); i++) {
-    const MethodDescriptor* method = descriptor_->method(i);
-    std::map<std::string, std::string> vars;
-    vars["index"] = StrCat(i);
-    vars["method"] = UnderscoresToCamelCase(method);
-    vars["input"] = name_resolver_->GetImmutableClassName(method->input_type());
-    vars["output"] = GetOutput(method);
-    printer->Print(
-        vars,
-        "case $index$:\n"
-        "  this.$method$(controller, ($input$)request,\n"
-        "    com.google.protobuf.RpcUtil.<$output$>specializeCallback(\n"
-        "      done));\n"
-        "  return;\n");
-  }
-
-  printer->Print(
-      "default:\n"
-      "  throw new java.lang.AssertionError(\"Can't get here.\");\n");
-
-  printer->Outdent();
-  printer->Outdent();
-
-  printer->Print(
-      "  }\n"
-      "}\n"
-      "\n");
-}
-
-void ImmutableServiceGenerator::GenerateCallBlockingMethod(
-    io::Printer* printer) {
-  printer->Print(
-      "\n"
-      "public final com.google.protobuf.Message callBlockingMethod(\n"
-      "    com.google.protobuf.Descriptors.MethodDescriptor method,\n"
-      "    com.google.protobuf.RpcController controller,\n"
-      "    com.google.protobuf.Message request)\n"
-      "    throws com.google.protobuf.ServiceException {\n"
-      "  if (method.getService() != getDescriptor()) {\n"
-      "    throw new java.lang.IllegalArgumentException(\n"
-      "      \"Service.callBlockingMethod() given method descriptor for \" +\n"
-      "      \"wrong service type.\");\n"
-      "  }\n"
-      "  switch(method.getIndex()) {\n");
-  printer->Indent();
-  printer->Indent();
-
-  for (int i = 0; i < descriptor_->method_count(); i++) {
-    const MethodDescriptor* method = descriptor_->method(i);
-    std::map<std::string, std::string> vars;
-    vars["index"] = StrCat(i);
-    vars["method"] = UnderscoresToCamelCase(method);
-    vars["input"] = name_resolver_->GetImmutableClassName(method->input_type());
-    vars["output"] = GetOutput(method);
-    printer->Print(vars,
-                   "case $index$:\n"
-                   "  return impl.$method$(controller, ($input$)request);\n");
-  }
-
-  printer->Print(
-      "default:\n"
-      "  throw new java.lang.AssertionError(\"Can't get here.\");\n");
-
-  printer->Outdent();
-  printer->Outdent();
-
-  printer->Print(
-      "  }\n"
-      "}\n"
-      "\n");
-}
-
-void ImmutableServiceGenerator::GenerateGetPrototype(RequestOrResponse which,
-                                                     io::Printer* printer) {
-  /*
-   * TODO(cpovirk): The exception message says "Service.foo" when it may be
-   * "BlockingService.foo."  Consider fixing.
-   */
-  printer->Print(
-      "public final com.google.protobuf.Message\n"
-      "    get$request_or_response$Prototype(\n"
-      "    com.google.protobuf.Descriptors.MethodDescriptor method) {\n"
-      "  if (method.getService() != getDescriptor()) {\n"
-      "    throw new java.lang.IllegalArgumentException(\n"
-      "      \"Service.get$request_or_response$Prototype() given method \" +\n"
-      "      \"descriptor for wrong service type.\");\n"
-      "  }\n"
-      "  switch(method.getIndex()) {\n",
-      "request_or_response", (which == REQUEST) ? "Request" : "Response");
-  printer->Indent();
-  printer->Indent();
-
-  for (int i = 0; i < descriptor_->method_count(); i++) {
-    const MethodDescriptor* method = descriptor_->method(i);
-    std::map<std::string, std::string> vars;
-    vars["index"] = StrCat(i);
-    vars["type"] =
-        (which == REQUEST)
-            ? name_resolver_->GetImmutableClassName(method->input_type())
-            : GetOutput(method);
-    printer->Print(vars,
-                   "case $index$:\n"
-                   "  return $type$.getDefaultInstance();\n");
-  }
-
-  printer->Print(
-      "default:\n"
-      "  throw new java.lang.AssertionError(\"Can't get here.\");\n");
-
-  printer->Outdent();
-  printer->Outdent();
-
-  printer->Print(
-      "  }\n"
-      "}\n"
-      "\n");
-}
-
-void ImmutableServiceGenerator::GenerateStub(io::Printer* printer) {
-  printer->Print(
-      "public static Stub newStub(\n"
-      "    com.google.protobuf.RpcChannel channel) {\n"
-      "  return new Stub(channel);\n"
-      "}\n"
-      "\n"
-      "public static final class Stub extends $classname$ implements Interface "
-      "{"
-      "\n",
-      "classname", name_resolver_->GetImmutableClassName(descriptor_));
-  printer->Indent();
-
-  printer->Print(
-      "private Stub(com.google.protobuf.RpcChannel channel) {\n"
-      "  this.channel = channel;\n"
-      "}\n"
-      "\n"
-      "private final com.google.protobuf.RpcChannel channel;\n"
-      "\n"
-      "public com.google.protobuf.RpcChannel getChannel() {\n"
-      "  return channel;\n"
-      "}\n");
-
-  for (int i = 0; i < descriptor_->method_count(); i++) {
-    const MethodDescriptor* method = descriptor_->method(i);
-    printer->Print("\n");
-    GenerateMethodSignature(printer, method, IS_CONCRETE);
-    printer->Print(" {\n");
-    printer->Indent();
-
-    std::map<std::string, std::string> vars;
-    vars["index"] = StrCat(i);
-    vars["output"] = GetOutput(method);
-    printer->Print(vars,
-                   "channel.callMethod(\n"
-                   "  getDescriptor().getMethods().get($index$),\n"
-                   "  controller,\n"
-                   "  request,\n"
-                   "  $output$.getDefaultInstance(),\n"
-                   "  com.google.protobuf.RpcUtil.generalizeCallback(\n"
-                   "    done,\n"
-                   "    $output$.class,\n"
-                   "    $output$.getDefaultInstance()));\n");
-
-    printer->Outdent();
-    printer->Print("}\n");
-  }
-
-  printer->Outdent();
-  printer->Print(
-      "}\n"
-      "\n");
-}
-
-void ImmutableServiceGenerator::GenerateBlockingStub(io::Printer* printer) {
-  printer->Print(
-      "public static BlockingInterface newBlockingStub(\n"
-      "    com.google.protobuf.BlockingRpcChannel channel) {\n"
-      "  return new BlockingStub(channel);\n"
-      "}\n"
-      "\n");
-
-  printer->Print("public interface BlockingInterface {");
-  printer->Indent();
-
-  for (int i = 0; i < descriptor_->method_count(); i++) {
-    const MethodDescriptor* method = descriptor_->method(i);
-    GenerateBlockingMethodSignature(printer, method);
-    printer->Print(";\n");
-  }
-
-  printer->Outdent();
-  printer->Print(
-      "}\n"
-      "\n");
-
-  printer->Print(
-      "private static final class BlockingStub implements BlockingInterface "
-      "{\n");
-  printer->Indent();
-
-  printer->Print(
-      "private BlockingStub(com.google.protobuf.BlockingRpcChannel channel) {\n"
-      "  this.channel = channel;\n"
-      "}\n"
-      "\n"
-      "private final com.google.protobuf.BlockingRpcChannel channel;\n");
-
-  for (int i = 0; i < descriptor_->method_count(); i++) {
-    const MethodDescriptor* method = descriptor_->method(i);
-    GenerateBlockingMethodSignature(printer, method);
-    printer->Print(" {\n");
-    printer->Indent();
-
-    std::map<std::string, std::string> vars;
-    vars["index"] = StrCat(i);
-    vars["output"] = GetOutput(method);
-    printer->Print(vars,
-                   "return ($output$) channel.callBlockingMethod(\n"
-                   "  getDescriptor().getMethods().get($index$),\n"
-                   "  controller,\n"
-                   "  request,\n"
-                   "  $output$.getDefaultInstance());\n");
-
-    printer->Outdent();
-    printer->Print(
-        "}\n"
-        "\n");
-  }
-
-  printer->Outdent();
-  printer->Print("}\n");
-}
-
-void ImmutableServiceGenerator::GenerateMethodSignature(
-    io::Printer* printer, const MethodDescriptor* method,
-    IsAbstract is_abstract) {
-  std::map<std::string, std::string> vars;
-  vars["name"] = UnderscoresToCamelCase(method);
-  vars["input"] = name_resolver_->GetImmutableClassName(method->input_type());
-  vars["output"] = GetOutput(method);
-  vars["abstract"] = (is_abstract == IS_ABSTRACT) ? "abstract" : "";
-  printer->Print(vars,
-                 "public $abstract$ void $name$(\n"
-                 "    com.google.protobuf.RpcController controller,\n"
-                 "    $input$ request,\n"
-                 "    com.google.protobuf.RpcCallback<$output$> done)");
-}
-
-void ImmutableServiceGenerator::GenerateBlockingMethodSignature(
-    io::Printer* printer, const MethodDescriptor* method) {
-  std::map<std::string, std::string> vars;
-  vars["method"] = UnderscoresToCamelCase(method);
-  vars["input"] = name_resolver_->GetImmutableClassName(method->input_type());
-  vars["output"] = GetOutput(method);
-  printer->Print(vars,
-                 "\n"
-                 "public $output$ $method$(\n"
-                 "    com.google.protobuf.RpcController controller,\n"
-                 "    $input$ request)\n"
-                 "    throws com.google.protobuf.ServiceException");
-}
-
-}  // namespace java
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
diff --git a/libs/protobuf/src/google/protobuf/compiler/java/service.h b/libs/protobuf/src/google/protobuf/compiler/java/service.h
deleted file mode 100644
index 9cb9021..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/java/service.h
+++ /dev/null
@@ -1,139 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-
-#ifndef GOOGLE_PROTOBUF_COMPILER_JAVA_SERVICE_H__
-#define GOOGLE_PROTOBUF_COMPILER_JAVA_SERVICE_H__
-
-#include <map>
-#include <google/protobuf/descriptor.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace java {
-class Context;            // context.h
-class ClassNameResolver;  // name_resolver.h
-}  // namespace java
-}  // namespace compiler
-namespace io {
-class Printer;  // printer.h
-}
-}  // namespace protobuf
-}  // namespace google
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace java {
-
-class ServiceGenerator {
- public:
-  explicit ServiceGenerator(const ServiceDescriptor* descriptor);
-  virtual ~ServiceGenerator();
-
-  virtual void Generate(io::Printer* printer) = 0;
-
-  enum RequestOrResponse { REQUEST, RESPONSE };
-  enum IsAbstract { IS_ABSTRACT, IS_CONCRETE };
-
- protected:
-  const ServiceDescriptor* descriptor_;
-
- private:
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(ServiceGenerator);
-};
-
-class ImmutableServiceGenerator : public ServiceGenerator {
- public:
-  ImmutableServiceGenerator(const ServiceDescriptor* descriptor,
-                            Context* context);
-  ~ImmutableServiceGenerator() override;
-
-  void Generate(io::Printer* printer) override;
-
- private:
-  // Generate the getDescriptorForType() method.
-  void GenerateGetDescriptorForType(io::Printer* printer);
-
-  // Generate a Java interface for the service.
-  void GenerateInterface(io::Printer* printer);
-
-  // Generate newReflectiveService() method.
-  void GenerateNewReflectiveServiceMethod(io::Printer* printer);
-
-  // Generate newReflectiveBlockingService() method.
-  void GenerateNewReflectiveBlockingServiceMethod(io::Printer* printer);
-
-  // Generate abstract method declarations for all methods.
-  void GenerateAbstractMethods(io::Printer* printer);
-
-  // Generate the implementation of Service.callMethod().
-  void GenerateCallMethod(io::Printer* printer);
-
-  // Generate the implementation of BlockingService.callBlockingMethod().
-  void GenerateCallBlockingMethod(io::Printer* printer);
-
-  // Generate the implementations of Service.get{Request,Response}Prototype().
-  void GenerateGetPrototype(RequestOrResponse which, io::Printer* printer);
-
-  // Generate a stub implementation of the service.
-  void GenerateStub(io::Printer* printer);
-
-  // Generate a method signature, possibly abstract, without body or trailing
-  // semicolon.
-  void GenerateMethodSignature(io::Printer* printer,
-                               const MethodDescriptor* method,
-                               IsAbstract is_abstract);
-
-  // Generate a blocking stub interface and implementation of the service.
-  void GenerateBlockingStub(io::Printer* printer);
-
-  // Generate the method signature for one method of a blocking stub.
-  void GenerateBlockingMethodSignature(io::Printer* printer,
-                                       const MethodDescriptor* method);
-
-  // Return the output type of the method.
-  std::string GetOutput(const MethodDescriptor* method);
-
-  Context* context_;
-  ClassNameResolver* name_resolver_;
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(ImmutableServiceGenerator);
-};
-
-}  // namespace java
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // NET_PROTO2_COMPILER_JAVA_SERVICE_H__
diff --git a/libs/protobuf/src/google/protobuf/compiler/java/shared_code_generator.cc b/libs/protobuf/src/google/protobuf/compiler/java/shared_code_generator.cc
deleted file mode 100644
index 39b96ee..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/java/shared_code_generator.cc
+++ /dev/null
@@ -1,198 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: xiaofeng@google.com (Feng Xiao)
-
-#include <google/protobuf/compiler/java/shared_code_generator.h>
-
-#include <memory>
-
-#include <google/protobuf/compiler/code_generator.h>
-#include <google/protobuf/io/printer.h>
-#include <google/protobuf/io/zero_copy_stream.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/stubs/strutil.h>
-#include <google/protobuf/compiler/java/helpers.h>
-#include <google/protobuf/compiler/java/name_resolver.h>
-#include <google/protobuf/compiler/java/names.h>
-#include <google/protobuf/descriptor.pb.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace java {
-
-SharedCodeGenerator::SharedCodeGenerator(const FileDescriptor* file,
-                                         const Options& options)
-    : name_resolver_(new ClassNameResolver), file_(file), options_(options) {}
-
-SharedCodeGenerator::~SharedCodeGenerator() {}
-
-void SharedCodeGenerator::Generate(
-    GeneratorContext* context, std::vector<std::string>* file_list,
-    std::vector<std::string>* annotation_file_list) {
-  std::string java_package = FileJavaPackage(file_);
-  std::string package_dir = JavaPackageToDir(java_package);
-
-  if (HasDescriptorMethods(file_, options_.enforce_lite)) {
-    // Generate descriptors.
-    std::string classname = name_resolver_->GetDescriptorClassName(file_);
-    std::string filename = package_dir + classname + ".java";
-    file_list->push_back(filename);
-    std::unique_ptr<io::ZeroCopyOutputStream> output(context->Open(filename));
-    GeneratedCodeInfo annotations;
-    io::AnnotationProtoCollector<GeneratedCodeInfo> annotation_collector(
-        &annotations);
-    std::unique_ptr<io::Printer> printer(
-        new io::Printer(output.get(), '$',
-                        options_.annotate_code ? &annotation_collector : NULL));
-    std::string info_relative_path = classname + ".java.pb.meta";
-    std::string info_full_path = filename + ".pb.meta";
-    printer->Print(
-        "// Generated by the protocol buffer compiler.  DO NOT EDIT!\n"
-        "// source: $filename$\n"
-        "\n",
-        "filename", file_->name());
-    if (!java_package.empty()) {
-      printer->Print(
-          "package $package$;\n"
-          "\n",
-          "package", java_package);
-    }
-    PrintGeneratedAnnotation(printer.get(), '$',
-                             options_.annotate_code ? info_relative_path : "");
-    printer->Print(
-        "public final class $classname$ {\n"
-        "  public static com.google.protobuf.Descriptors.FileDescriptor\n"
-        "      descriptor;\n"
-        "  static {\n",
-        "classname", classname);
-    printer->Annotate("classname", file_->name());
-    printer->Indent();
-    printer->Indent();
-    GenerateDescriptors(printer.get());
-    printer->Outdent();
-    printer->Outdent();
-    printer->Print(
-        "  }\n"
-        "}\n");
-
-    if (options_.annotate_code) {
-      std::unique_ptr<io::ZeroCopyOutputStream> info_output(
-          context->Open(info_full_path));
-      annotations.SerializeToZeroCopyStream(info_output.get());
-      annotation_file_list->push_back(info_full_path);
-    }
-
-    printer.reset();
-    output.reset();
-  }
-}
-
-void SharedCodeGenerator::GenerateDescriptors(io::Printer* printer) {
-  // Embed the descriptor.  We simply serialize the entire FileDescriptorProto
-  // and embed it as a string literal, which is parsed and built into real
-  // descriptors at initialization time.  We unfortunately have to put it in
-  // a string literal, not a byte array, because apparently using a literal
-  // byte array causes the Java compiler to generate *instructions* to
-  // initialize each and every byte of the array, e.g. as if you typed:
-  //   b[0] = 123; b[1] = 456; b[2] = 789;
-  // This makes huge bytecode files and can easily hit the compiler's internal
-  // code size limits (error "code to large").  String literals are apparently
-  // embedded raw, which is what we want.
-  FileDescriptorProto file_proto;
-  file_->CopyTo(&file_proto);
-
-  std::string file_data;
-  file_proto.SerializeToString(&file_data);
-
-  printer->Print("java.lang.String[] descriptorData = {\n");
-  printer->Indent();
-
-  // Limit the number of bytes per line.
-  static const int kBytesPerLine = 40;
-  // Limit the number of lines per string part.
-  static const int kLinesPerPart = 400;
-  // Every block of bytes, start a new string literal, in order to avoid the
-  // 64k length limit. Note that this value needs to be <64k.
-  static const int kBytesPerPart = kBytesPerLine * kLinesPerPart;
-  for (int i = 0; i < file_data.size(); i += kBytesPerLine) {
-    if (i > 0) {
-      if (i % kBytesPerPart == 0) {
-        printer->Print(",\n");
-      } else {
-        printer->Print(" +\n");
-      }
-    }
-    printer->Print("\"$data$\"", "data",
-                   CEscape(file_data.substr(i, kBytesPerLine)));
-  }
-
-  printer->Outdent();
-  printer->Print("\n};\n");
-
-  // -----------------------------------------------------------------
-  // Find out all dependencies.
-  std::vector<std::pair<std::string, std::string> > dependencies;
-  for (int i = 0; i < file_->dependency_count(); i++) {
-    std::string filename = file_->dependency(i)->name();
-    std::string package = FileJavaPackage(file_->dependency(i));
-    std::string classname =
-        name_resolver_->GetDescriptorClassName(file_->dependency(i));
-    std::string full_name;
-    if (package.empty()) {
-      full_name = classname;
-    } else {
-      full_name = package + "." + classname;
-    }
-    dependencies.push_back(std::make_pair(filename, full_name));
-  }
-
-  // -----------------------------------------------------------------
-  // Invoke internalBuildGeneratedFileFrom() to build the file.
-  printer->Print(
-      "descriptor = com.google.protobuf.Descriptors.FileDescriptor\n"
-      "  .internalBuildGeneratedFileFrom(descriptorData,\n");
-  printer->Print(
-      "    new com.google.protobuf.Descriptors.FileDescriptor[] {\n");
-
-  for (int i = 0; i < dependencies.size(); i++) {
-    const std::string& dependency = dependencies[i].second;
-    printer->Print("      $dependency$.getDescriptor(),\n", "dependency",
-                   dependency);
-  }
-
-  printer->Print("    });\n");
-}
-
-}  // namespace java
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/compiler/java/shared_code_generator.h b/libs/protobuf/src/google/protobuf/compiler/java/shared_code_generator.h
deleted file mode 100644
index b1f6eb3..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/java/shared_code_generator.h
+++ /dev/null
@@ -1,90 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: xiaofeng@google.com (Feng Xiao)
-//
-// Generators that generate shared code between immutable API and mutable API.
-
-#ifndef GOOGLE_PROTOBUF_COMPILER_JAVA_SHARED_CODE_GENERATOR_H__
-#define GOOGLE_PROTOBUF_COMPILER_JAVA_SHARED_CODE_GENERATOR_H__
-
-#include <memory>
-#include <string>
-#include <vector>
-
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/compiler/java/options.h>
-
-namespace google {
-namespace protobuf {
-class FileDescriptor;  // descriptor.h
-namespace compiler {
-class GeneratorContext;  // code_generator.h
-namespace java {
-class ClassNameResolver;  // name_resolver.h
-}
-}  // namespace compiler
-namespace io {
-class Printer;  // printer.h
-}
-}  // namespace protobuf
-}  // namespace google
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace java {
-
-// A generator that generates code that are shared between immutable API
-// and mutable API. Currently only descriptors are shared.
-class SharedCodeGenerator {
- public:
-  SharedCodeGenerator(const FileDescriptor* file, const Options& options);
-  ~SharedCodeGenerator();
-
-  void Generate(GeneratorContext* generator_context,
-                std::vector<std::string>* file_list,
-                std::vector<std::string>* annotation_file_list);
-
-  void GenerateDescriptors(io::Printer* printer);
-
- private:
-  std::unique_ptr<ClassNameResolver> name_resolver_;
-  const FileDescriptor* file_;
-  const Options options_;
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(SharedCodeGenerator);
-};
-
-}  // namespace java
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // GOOGLE_PROTOBUF_COMPILER_JAVA_SHARED_CODE_GENERATOR_H__
diff --git a/libs/protobuf/src/google/protobuf/compiler/java/string_field.cc b/libs/protobuf/src/google/protobuf/compiler/java/string_field.cc
deleted file mode 100644
index 5f20792..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/java/string_field.cc
+++ /dev/null
@@ -1,1172 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-// Author: jonp@google.com (Jon Perlow)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-
-#include "google/protobuf/compiler/java/string_field.h"
-
-#include <cstdint>
-#include <map>
-#include <string>
-
-#include "google/protobuf/stubs/logging.h"
-#include "google/protobuf/stubs/common.h"
-#include "google/protobuf/io/printer.h"
-#include "google/protobuf/wire_format.h"
-#include "google/protobuf/stubs/strutil.h"
-#include "google/protobuf/compiler/java/context.h"
-#include "google/protobuf/compiler/java/doc_comment.h"
-#include "google/protobuf/compiler/java/helpers.h"
-#include "google/protobuf/compiler/java/name_resolver.h"
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace java {
-
-using internal::WireFormat;
-using internal::WireFormatLite;
-
-namespace {
-
-void SetPrimitiveVariables(
-    const FieldDescriptor* descriptor, int messageBitIndex, int builderBitIndex,
-    const FieldGeneratorInfo* info, ClassNameResolver* name_resolver,
-    std::map<std::string, std::string>* variables,
-    Context* context) {
-  SetCommonFieldVariables(descriptor, info, variables);
-
-  (*variables)["empty_list"] = "com.google.protobuf.LazyStringArrayList.EMPTY";
-
-  (*variables)["default"] = ImmutableDefaultValue(descriptor, name_resolver);
-  (*variables)["default_init"] =
-      "= " + ImmutableDefaultValue(descriptor, name_resolver);
-  (*variables)["capitalized_type"] = "String";
-  (*variables)["tag"] =
-      StrCat(static_cast<int32_t>(WireFormat::MakeTag(descriptor)));
-  (*variables)["tag_size"] = StrCat(
-      WireFormat::TagSize(descriptor->number(), GetType(descriptor)));
-  (*variables)["null_check"] =
-      "if (value == null) { throw new NullPointerException(); }";
-  (*variables)["isStringEmpty"] = "com.google.protobuf.GeneratedMessage" +
-                                  GeneratedCodeVersionSuffix() +
-                                  ".isStringEmpty";
-  (*variables)["writeString"] = "com.google.protobuf.GeneratedMessage" +
-                                GeneratedCodeVersionSuffix() + ".writeString";
-  (*variables)["computeStringSize"] = "com.google.protobuf.GeneratedMessage" +
-                                      GeneratedCodeVersionSuffix() +
-                                      ".computeStringSize";
-
-  // TODO(birdo): Add @deprecated javadoc when generating javadoc is supported
-  // by the proto compiler
-  (*variables)["deprecation"] =
-      descriptor->options().deprecated() ? "@java.lang.Deprecated " : "";
-  variables->insert(
-      {"kt_deprecation",
-       descriptor->options().deprecated()
-           ? StrCat("@kotlin.Deprecated(message = \"Field ",
-                          (*variables)["name"], " is deprecated\") ")
-           : ""});
-  (*variables)["on_changed"] = "onChanged();";
-
-  if (HasHasbit(descriptor)) {
-    // For singular messages and builders, one bit is used for the hasField bit.
-    (*variables)["get_has_field_bit_message"] = GenerateGetBit(messageBitIndex);
-    (*variables)["set_has_field_bit_to_local"] =
-        GenerateSetBitToLocal(messageBitIndex);
-
-    // Note that these have a trailing ";".
-    (*variables)["set_has_field_bit_message"] =
-        GenerateSetBit(messageBitIndex) + ";";
-
-    (*variables)["is_field_present_message"] = GenerateGetBit(messageBitIndex);
-  } else {
-    (*variables)["get_has_field_bit_message"] = "";
-    (*variables)["set_has_field_bit_to_local"] = "";
-    (*variables)["set_has_field_bit_message"] = "";
-
-    variables->insert({"is_field_present_message",
-                       StrCat("!", (*variables)["isStringEmpty"], "(",
-                                    (*variables)["name"], "_)")});
-  }
-
-  // For repeated builders, one bit is used for whether the array is immutable.
-  (*variables)["get_mutable_bit_builder"] = GenerateGetBit(builderBitIndex);
-  (*variables)["set_mutable_bit_builder"] = GenerateSetBit(builderBitIndex);
-  (*variables)["clear_mutable_bit_builder"] = GenerateClearBit(builderBitIndex);
-
-  (*variables)["get_has_field_bit_builder"] = GenerateGetBit(builderBitIndex);
-  (*variables)["get_has_field_bit_from_local"] =
-      GenerateGetBitFromLocal(builderBitIndex);
-  (*variables)["set_has_field_bit_builder"] =
-      GenerateSetBit(builderBitIndex) + ";";
-  (*variables)["clear_has_field_bit_builder"] =
-      GenerateClearBit(builderBitIndex) + ";";
-}
-
-}  // namespace
-
-// ===================================================================
-
-ImmutableStringFieldGenerator::ImmutableStringFieldGenerator(
-    const FieldDescriptor* descriptor, int messageBitIndex, int builderBitIndex,
-    Context* context)
-    : descriptor_(descriptor),
-      message_bit_index_(messageBitIndex),
-      builder_bit_index_(builderBitIndex),
-      name_resolver_(context->GetNameResolver()) {
-  SetPrimitiveVariables(descriptor, messageBitIndex, builderBitIndex,
-                        context->GetFieldGeneratorInfo(descriptor),
-                        name_resolver_, &variables_, context);
-}
-
-ImmutableStringFieldGenerator::~ImmutableStringFieldGenerator() {}
-
-int ImmutableStringFieldGenerator::GetMessageBitIndex() const {
-  return message_bit_index_;
-}
-
-int ImmutableStringFieldGenerator::GetBuilderBitIndex() const {
-  return builder_bit_index_;
-}
-
-int ImmutableStringFieldGenerator::GetNumBitsForMessage() const {
-  return HasHasbit(descriptor_) ? 1 : 0;
-}
-
-int ImmutableStringFieldGenerator::GetNumBitsForBuilder() const { return 1; }
-
-// A note about how strings are handled. This code used to just store a String
-// in the Message. This had two issues:
-//
-//  1. It wouldn't roundtrip byte arrays that were not valid UTF-8 encoded
-//     strings, but rather fields that were raw bytes incorrectly marked
-//     as strings in the proto file. This is common because in the proto1
-//     syntax, string was the way to indicate bytes and C++ engineers can
-//     easily make this mistake without affecting the C++ API. By converting to
-//     strings immediately, some java code might corrupt these byte arrays as
-//     it passes through a java server even if the field was never accessed by
-//     application code.
-//
-//  2. There's a performance hit to converting between bytes and strings and
-//     it many cases, the field is never even read by the application code. This
-//     avoids unnecessary conversions in the common use cases.
-//
-// So now, the field for String is maintained as an Object reference which can
-// either store a String or a ByteString. The code uses an instanceof check
-// to see which one it has and converts to the other one if needed. It remembers
-// the last value requested (in a thread safe manner) as this is most likely
-// the one needed next. The thread safety is such that if two threads both
-// convert the field because the changes made by each thread were not visible to
-// the other, they may cause a conversion to happen more times than would
-// otherwise be necessary. This was deemed better than adding synchronization
-// overhead. It will not cause any corruption issues or affect the behavior of
-// the API. The instanceof check is also highly optimized in the JVM and we
-// decided it was better to reduce the memory overhead by not having two
-// separate fields but rather use dynamic type checking.
-//
-// For single fields, the logic for this is done inside the generated code. For
-// repeated fields, the logic is done in LazyStringArrayList and
-// UnmodifiableLazyStringList.
-void ImmutableStringFieldGenerator::GenerateInterfaceMembers(
-    io::Printer* printer) const {
-  if (HasHazzer(descriptor_)) {
-    WriteFieldAccessorDocComment(printer, descriptor_, HAZZER);
-    printer->Print(variables_,
-                   "$deprecation$boolean has$capitalized_name$();\n");
-  }
-  WriteFieldAccessorDocComment(printer, descriptor_, GETTER);
-  printer->Print(variables_,
-                 "$deprecation$java.lang.String get$capitalized_name$();\n");
-  WriteFieldStringBytesAccessorDocComment(printer, descriptor_, GETTER);
-  printer->Print(variables_,
-                 "$deprecation$com.google.protobuf.ByteString\n"
-                 "    get$capitalized_name$Bytes();\n");
-}
-
-void ImmutableStringFieldGenerator::GenerateMembers(
-    io::Printer* printer) const {
-  printer->Print(variables_,
-                 "@SuppressWarnings(\"serial\")\n"
-                 "private volatile java.lang.Object $name$_ = $default$;\n");
-  PrintExtraFieldInfo(variables_, printer);
-
-  if (HasHazzer(descriptor_)) {
-    WriteFieldAccessorDocComment(printer, descriptor_, HAZZER);
-    printer->Print(
-        variables_,
-        "@java.lang.Override\n"
-        "$deprecation$public boolean ${$has$capitalized_name$$}$() {\n"
-        "  return $get_has_field_bit_message$;\n"
-        "}\n");
-    printer->Annotate("{", "}", descriptor_);
-  }
-
-  WriteFieldAccessorDocComment(printer, descriptor_, GETTER);
-  printer->Print(
-      variables_,
-      "@java.lang.Override\n"
-      "$deprecation$public java.lang.String ${$get$capitalized_name$$}$() {\n"
-      "  java.lang.Object ref = $name$_;\n"
-      "  if (ref instanceof java.lang.String) {\n"
-      "    return (java.lang.String) ref;\n"
-      "  } else {\n"
-      "    com.google.protobuf.ByteString bs = \n"
-      "        (com.google.protobuf.ByteString) ref;\n"
-      "    java.lang.String s = bs.toStringUtf8();\n");
-  printer->Annotate("{", "}", descriptor_);
-  if (CheckUtf8(descriptor_)) {
-    printer->Print(variables_, "    $name$_ = s;\n");
-  } else {
-    printer->Print(variables_,
-                   "    if (bs.isValidUtf8()) {\n"
-                   "      $name$_ = s;\n"
-                   "    }\n");
-  }
-  printer->Print(variables_,
-                 "    return s;\n"
-                 "  }\n"
-                 "}\n");
-  WriteFieldStringBytesAccessorDocComment(printer, descriptor_, GETTER);
-  printer->Print(variables_,
-                 "@java.lang.Override\n"
-                 "$deprecation$public com.google.protobuf.ByteString\n"
-                 "    ${$get$capitalized_name$Bytes$}$() {\n"
-                 "  java.lang.Object ref = $name$_;\n"
-                 "  if (ref instanceof java.lang.String) {\n"
-                 "    com.google.protobuf.ByteString b = \n"
-                 "        com.google.protobuf.ByteString.copyFromUtf8(\n"
-                 "            (java.lang.String) ref);\n"
-                 "    $name$_ = b;\n"
-                 "    return b;\n"
-                 "  } else {\n"
-                 "    return (com.google.protobuf.ByteString) ref;\n"
-                 "  }\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-}
-
-void ImmutableStringFieldGenerator::GenerateBuilderMembers(
-    io::Printer* printer) const {
-  printer->Print(variables_,
-                 "private java.lang.Object $name$_ $default_init$;\n");
-  if (HasHazzer(descriptor_)) {
-    WriteFieldAccessorDocComment(printer, descriptor_, HAZZER);
-    printer->Print(
-        variables_,
-        "$deprecation$public boolean ${$has$capitalized_name$$}$() {\n"
-        "  return $get_has_field_bit_builder$;\n"
-        "}\n");
-    printer->Annotate("{", "}", descriptor_);
-  }
-
-  WriteFieldAccessorDocComment(printer, descriptor_, GETTER);
-  printer->Print(
-      variables_,
-      "$deprecation$public java.lang.String ${$get$capitalized_name$$}$() {\n"
-      "  java.lang.Object ref = $name$_;\n"
-      "  if (!(ref instanceof java.lang.String)) {\n"
-      "    com.google.protobuf.ByteString bs =\n"
-      "        (com.google.protobuf.ByteString) ref;\n"
-      "    java.lang.String s = bs.toStringUtf8();\n");
-  printer->Annotate("{", "}", descriptor_);
-  if (CheckUtf8(descriptor_)) {
-    printer->Print(variables_, "    $name$_ = s;\n");
-  } else {
-    printer->Print(variables_,
-                   "    if (bs.isValidUtf8()) {\n"
-                   "      $name$_ = s;\n"
-                   "    }\n");
-  }
-  printer->Print(variables_,
-                 "    return s;\n"
-                 "  } else {\n"
-                 "    return (java.lang.String) ref;\n"
-                 "  }\n"
-                 "}\n");
-
-  WriteFieldStringBytesAccessorDocComment(printer, descriptor_, GETTER);
-  printer->Print(variables_,
-                 "$deprecation$public com.google.protobuf.ByteString\n"
-                 "    ${$get$capitalized_name$Bytes$}$() {\n"
-                 "  java.lang.Object ref = $name$_;\n"
-                 "  if (ref instanceof String) {\n"
-                 "    com.google.protobuf.ByteString b = \n"
-                 "        com.google.protobuf.ByteString.copyFromUtf8(\n"
-                 "            (java.lang.String) ref);\n"
-                 "    $name$_ = b;\n"
-                 "    return b;\n"
-                 "  } else {\n"
-                 "    return (com.google.protobuf.ByteString) ref;\n"
-                 "  }\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-
-  WriteFieldAccessorDocComment(printer, descriptor_, SETTER,
-                               /* builder */ true);
-  printer->Print(variables_,
-                 "$deprecation$public Builder ${$set$capitalized_name$$}$(\n"
-                 "    java.lang.String value) {\n"
-                 "  $null_check$\n"
-                 "  $name$_ = value;\n"
-                 "  $set_has_field_bit_builder$\n"
-                 "  $on_changed$\n"
-                 "  return this;\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-  WriteFieldAccessorDocComment(printer, descriptor_, CLEARER,
-                               /* builder */ true);
-  printer->Print(
-      variables_,
-      "$deprecation$public Builder ${$clear$capitalized_name$$}$() {\n");
-  printer->Annotate("{", "}", descriptor_);
-  // The default value is not a simple literal so we want to avoid executing
-  // it multiple times.  Instead, get the default out of the default instance.
-  printer->Print(variables_,
-                 "  $name$_ = getDefaultInstance().get$capitalized_name$();\n");
-  printer->Print(variables_,
-                 "  $clear_has_field_bit_builder$\n"
-                 "  $on_changed$\n"
-                 "  return this;\n"
-                 "}\n");
-
-  WriteFieldStringBytesAccessorDocComment(printer, descriptor_, SETTER,
-                                          /* builder */ true);
-  printer->Print(
-      variables_,
-      "$deprecation$public Builder ${$set$capitalized_name$Bytes$}$(\n"
-      "    com.google.protobuf.ByteString value) {\n"
-      "  $null_check$\n");
-  printer->Annotate("{", "}", descriptor_);
-  if (CheckUtf8(descriptor_)) {
-    printer->Print(variables_, "  checkByteStringIsUtf8(value);\n");
-  }
-  printer->Print(variables_,
-                 "  $name$_ = value;\n"
-                 "  $set_has_field_bit_builder$\n"
-                 "  $on_changed$\n"
-                 "  return this;\n"
-                 "}\n");
-}
-
-void ImmutableStringFieldGenerator::GenerateKotlinDslMembers(
-    io::Printer* printer) const {
-  WriteFieldDocComment(printer, descriptor_);
-  printer->Print(variables_,
-                 "$kt_deprecation$public var $kt_name$: kotlin.String\n"
-                 "  @JvmName(\"${$get$kt_capitalized_name$$}$\")\n"
-                 "  get() = $kt_dsl_builder$.${$get$capitalized_name$$}$()\n"
-                 "  @JvmName(\"${$set$kt_capitalized_name$$}$\")\n"
-                 "  set(value) {\n"
-                 "    $kt_dsl_builder$.${$set$capitalized_name$$}$(value)\n"
-                 "  }\n");
-
-  WriteFieldAccessorDocComment(printer, descriptor_, CLEARER,
-                               /* builder */ false);
-  printer->Print(variables_,
-                 "public fun ${$clear$kt_capitalized_name$$}$() {\n"
-                 "  $kt_dsl_builder$.${$clear$capitalized_name$$}$()\n"
-                 "}\n");
-
-  if (HasHazzer(descriptor_)) {
-    WriteFieldAccessorDocComment(printer, descriptor_, HAZZER);
-    printer->Print(
-        variables_,
-        "public fun ${$has$kt_capitalized_name$$}$(): kotlin.Boolean {\n"
-        "  return $kt_dsl_builder$.${$has$capitalized_name$$}$()\n"
-        "}\n");
-  }
-}
-
-void ImmutableStringFieldGenerator::GenerateFieldBuilderInitializationCode(
-    io::Printer* printer) const {
-  // noop for primitives
-}
-
-void ImmutableStringFieldGenerator::GenerateInitializationCode(
-    io::Printer* printer) const {
-  printer->Print(variables_, "$name$_ = $default$;\n");
-}
-
-void ImmutableStringFieldGenerator::GenerateBuilderClearCode(
-    io::Printer* printer) const {
-  printer->Print(variables_, "$name$_ = $default$;\n");
-}
-
-void ImmutableStringFieldGenerator::GenerateMergingCode(
-    io::Printer* printer) const {
-  if (HasHazzer(descriptor_)) {
-    // Allow a slight breach of abstraction here in order to avoid forcing
-    // all string fields to Strings when copying fields from a Message.
-    printer->Print(variables_,
-                   "if (other.has$capitalized_name$()) {\n"
-                   "  $name$_ = other.$name$_;\n"
-                   "  $set_has_field_bit_builder$\n"
-                   "  $on_changed$\n"
-                   "}\n");
-  } else {
-    printer->Print(variables_,
-                   "if (!other.get$capitalized_name$().isEmpty()) {\n"
-                   "  $name$_ = other.$name$_;\n"
-                   "  $set_has_field_bit_builder$\n"
-                   "  $on_changed$\n"
-                   "}\n");
-  }
-}
-
-void ImmutableStringFieldGenerator::GenerateBuildingCode(
-    io::Printer* printer) const {
-  printer->Print(variables_,
-                 "if ($get_has_field_bit_from_local$) {\n"
-                 "  result.$name$_ = $name$_;\n");
-  if (GetNumBitsForMessage() > 0) {
-    printer->Print(variables_, "  $set_has_field_bit_to_local$;\n");
-  }
-  printer->Print("}\n");
-}
-
-void ImmutableStringFieldGenerator::GenerateBuilderParsingCode(
-    io::Printer* printer) const {
-  if (CheckUtf8(descriptor_)) {
-    printer->Print(variables_,
-                   "$name$_ = input.readStringRequireUtf8();\n"
-                   "$set_has_field_bit_builder$\n");
-  } else {
-    printer->Print(variables_,
-                   "$name$_ = input.readBytes();\n"
-                   "$set_has_field_bit_builder$\n");
-  }
-}
-
-void ImmutableStringFieldGenerator::GenerateSerializationCode(
-    io::Printer* printer) const {
-  printer->Print(variables_,
-                 "if ($is_field_present_message$) {\n"
-                 "  $writeString$(output, $number$, $name$_);\n"
-                 "}\n");
-}
-
-void ImmutableStringFieldGenerator::GenerateSerializedSizeCode(
-    io::Printer* printer) const {
-  printer->Print(variables_,
-                 "if ($is_field_present_message$) {\n"
-                 "  size += $computeStringSize$($number$, $name$_);\n"
-                 "}\n");
-}
-
-void ImmutableStringFieldGenerator::GenerateEqualsCode(
-    io::Printer* printer) const {
-  printer->Print(variables_,
-                 "if (!get$capitalized_name$()\n"
-                 "    .equals(other.get$capitalized_name$())) return false;\n");
-}
-
-void ImmutableStringFieldGenerator::GenerateHashCode(
-    io::Printer* printer) const {
-  printer->Print(variables_, "hash = (37 * hash) + $constant_name$;\n");
-  printer->Print(variables_,
-                 "hash = (53 * hash) + get$capitalized_name$().hashCode();\n");
-}
-
-std::string ImmutableStringFieldGenerator::GetBoxedType() const {
-  return "java.lang.String";
-}
-
-// ===================================================================
-
-ImmutableStringOneofFieldGenerator::ImmutableStringOneofFieldGenerator(
-    const FieldDescriptor* descriptor, int messageBitIndex, int builderBitIndex,
-    Context* context)
-    : ImmutableStringFieldGenerator(descriptor, messageBitIndex,
-                                    builderBitIndex, context) {
-  const OneofGeneratorInfo* info =
-      context->GetOneofGeneratorInfo(descriptor->containing_oneof());
-  SetCommonOneofVariables(descriptor, info, &variables_);
-}
-
-ImmutableStringOneofFieldGenerator::~ImmutableStringOneofFieldGenerator() {}
-
-void ImmutableStringOneofFieldGenerator::GenerateMembers(
-    io::Printer* printer) const {
-  PrintExtraFieldInfo(variables_, printer);
-  GOOGLE_DCHECK(HasHazzer(descriptor_));
-  WriteFieldAccessorDocComment(printer, descriptor_, HAZZER);
-  printer->Print(variables_,
-                 "$deprecation$public boolean ${$has$capitalized_name$$}$() {\n"
-                 "  return $has_oneof_case_message$;\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-
-  WriteFieldAccessorDocComment(printer, descriptor_, GETTER);
-  printer->Print(
-      variables_,
-      "$deprecation$public java.lang.String ${$get$capitalized_name$$}$() {\n"
-      "  java.lang.Object ref $default_init$;\n"
-      "  if ($has_oneof_case_message$) {\n"
-      "    ref = $oneof_name$_;\n"
-      "  }\n"
-      "  if (ref instanceof java.lang.String) {\n"
-      "    return (java.lang.String) ref;\n"
-      "  } else {\n"
-      "    com.google.protobuf.ByteString bs = \n"
-      "        (com.google.protobuf.ByteString) ref;\n"
-      "    java.lang.String s = bs.toStringUtf8();\n");
-  printer->Annotate("{", "}", descriptor_);
-  if (CheckUtf8(descriptor_)) {
-    printer->Print(variables_,
-                   "    if ($has_oneof_case_message$) {\n"
-                   "      $oneof_name$_ = s;\n"
-                   "    }\n");
-  } else {
-    printer->Print(variables_,
-                   "    if (bs.isValidUtf8() && ($has_oneof_case_message$)) {\n"
-                   "      $oneof_name$_ = s;\n"
-                   "    }\n");
-  }
-  printer->Print(variables_,
-                 "    return s;\n"
-                 "  }\n"
-                 "}\n");
-  WriteFieldStringBytesAccessorDocComment(printer, descriptor_, GETTER);
-
-  printer->Print(variables_,
-                 "$deprecation$public com.google.protobuf.ByteString\n"
-                 "    ${$get$capitalized_name$Bytes$}$() {\n"
-                 "  java.lang.Object ref $default_init$;\n"
-                 "  if ($has_oneof_case_message$) {\n"
-                 "    ref = $oneof_name$_;\n"
-                 "  }\n"
-                 "  if (ref instanceof java.lang.String) {\n"
-                 "    com.google.protobuf.ByteString b = \n"
-                 "        com.google.protobuf.ByteString.copyFromUtf8(\n"
-                 "            (java.lang.String) ref);\n"
-                 "    if ($has_oneof_case_message$) {\n"
-                 "      $oneof_name$_ = b;\n"
-                 "    }\n"
-                 "    return b;\n"
-                 "  } else {\n"
-                 "    return (com.google.protobuf.ByteString) ref;\n"
-                 "  }\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-}
-
-void ImmutableStringOneofFieldGenerator::GenerateBuilderMembers(
-    io::Printer* printer) const {
-  GOOGLE_DCHECK(HasHazzer(descriptor_));
-  WriteFieldAccessorDocComment(printer, descriptor_, HAZZER);
-  printer->Print(variables_,
-                 "@java.lang.Override\n"
-                 "$deprecation$public boolean ${$has$capitalized_name$$}$() {\n"
-                 "  return $has_oneof_case_message$;\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-
-  WriteFieldAccessorDocComment(printer, descriptor_, GETTER);
-  printer->Print(
-      variables_,
-      "@java.lang.Override\n"
-      "$deprecation$public java.lang.String ${$get$capitalized_name$$}$() {\n"
-      "  java.lang.Object ref $default_init$;\n"
-      "  if ($has_oneof_case_message$) {\n"
-      "    ref = $oneof_name$_;\n"
-      "  }\n"
-      "  if (!(ref instanceof java.lang.String)) {\n"
-      "    com.google.protobuf.ByteString bs =\n"
-      "        (com.google.protobuf.ByteString) ref;\n"
-      "    java.lang.String s = bs.toStringUtf8();\n"
-      "    if ($has_oneof_case_message$) {\n");
-  printer->Annotate("{", "}", descriptor_);
-  if (CheckUtf8(descriptor_)) {
-    printer->Print(variables_, "      $oneof_name$_ = s;\n");
-  } else {
-    printer->Print(variables_,
-                   "      if (bs.isValidUtf8()) {\n"
-                   "        $oneof_name$_ = s;\n"
-                   "      }\n");
-  }
-  printer->Print(variables_,
-                 "    }\n"
-                 "    return s;\n"
-                 "  } else {\n"
-                 "    return (java.lang.String) ref;\n"
-                 "  }\n"
-                 "}\n");
-
-  WriteFieldStringBytesAccessorDocComment(printer, descriptor_, GETTER);
-  printer->Print(variables_,
-                 "@java.lang.Override\n"
-                 "$deprecation$public com.google.protobuf.ByteString\n"
-                 "    ${$get$capitalized_name$Bytes$}$() {\n"
-                 "  java.lang.Object ref $default_init$;\n"
-                 "  if ($has_oneof_case_message$) {\n"
-                 "    ref = $oneof_name$_;\n"
-                 "  }\n"
-                 "  if (ref instanceof String) {\n"
-                 "    com.google.protobuf.ByteString b = \n"
-                 "        com.google.protobuf.ByteString.copyFromUtf8(\n"
-                 "            (java.lang.String) ref);\n"
-                 "    if ($has_oneof_case_message$) {\n"
-                 "      $oneof_name$_ = b;\n"
-                 "    }\n"
-                 "    return b;\n"
-                 "  } else {\n"
-                 "    return (com.google.protobuf.ByteString) ref;\n"
-                 "  }\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-
-  WriteFieldAccessorDocComment(printer, descriptor_, SETTER,
-                               /* builder */ true);
-  printer->Print(variables_,
-                 "$deprecation$public Builder ${$set$capitalized_name$$}$(\n"
-                 "    java.lang.String value) {\n"
-                 "  $null_check$\n"
-                 "  $set_oneof_case_message$;\n"
-                 "  $oneof_name$_ = value;\n"
-                 "  $on_changed$\n"
-                 "  return this;\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-  WriteFieldAccessorDocComment(printer, descriptor_, CLEARER,
-                               /* builder */ true);
-  printer->Print(
-      variables_,
-      "$deprecation$public Builder ${$clear$capitalized_name$$}$() {\n"
-      "  if ($has_oneof_case_message$) {\n"
-      "    $clear_oneof_case_message$;\n"
-      "    $oneof_name$_ = null;\n"
-      "    $on_changed$\n"
-      "  }\n"
-      "  return this;\n"
-      "}\n");
-  printer->Annotate("{", "}", descriptor_);
-
-  WriteFieldStringBytesAccessorDocComment(printer, descriptor_, SETTER,
-                                          /* builder */ true);
-  printer->Print(
-      variables_,
-      "$deprecation$public Builder ${$set$capitalized_name$Bytes$}$(\n"
-      "    com.google.protobuf.ByteString value) {\n"
-      "  $null_check$\n");
-  printer->Annotate("{", "}", descriptor_);
-  if (CheckUtf8(descriptor_)) {
-    printer->Print(variables_, "  checkByteStringIsUtf8(value);\n");
-  }
-  printer->Print(variables_,
-                 "  $set_oneof_case_message$;\n"
-                 "  $oneof_name$_ = value;\n"
-                 "  $on_changed$\n"
-                 "  return this;\n"
-                 "}\n");
-}
-
-void ImmutableStringOneofFieldGenerator::GenerateBuilderClearCode(
-    io::Printer* printer) const {
-  // No-Op: String fields in oneofs are correctly cleared by clearing the oneof
-}
-
-void ImmutableStringOneofFieldGenerator::GenerateMergingCode(
-    io::Printer* printer) const {
-  // Allow a slight breach of abstraction here in order to avoid forcing
-  // all string fields to Strings when copying fields from a Message.
-  printer->Print(variables_,
-                 "$set_oneof_case_message$;\n"
-                 "$oneof_name$_ = other.$oneof_name$_;\n"
-                 "$on_changed$\n");
-}
-
-void ImmutableStringOneofFieldGenerator::GenerateBuildingCode(
-    io::Printer* printer) const {
-  // No-Op: oneof fields are built by a single statement
-}
-
-void ImmutableStringOneofFieldGenerator::GenerateBuilderParsingCode(
-    io::Printer* printer) const {
-  if (CheckUtf8(descriptor_)) {
-    printer->Print(variables_,
-                   "java.lang.String s = input.readStringRequireUtf8();\n"
-                   "$set_oneof_case_message$;\n"
-                   "$oneof_name$_ = s;\n");
-  } else {
-    printer->Print(variables_,
-                   "com.google.protobuf.ByteString bs = input.readBytes();\n"
-                   "$set_oneof_case_message$;\n"
-                   "$oneof_name$_ = bs;\n");
-  }
-}
-
-void ImmutableStringOneofFieldGenerator::GenerateSerializationCode(
-    io::Printer* printer) const {
-  printer->Print(variables_,
-                 "if ($has_oneof_case_message$) {\n"
-                 "  $writeString$(output, $number$, $oneof_name$_);\n"
-                 "}\n");
-}
-
-void ImmutableStringOneofFieldGenerator::GenerateSerializedSizeCode(
-    io::Printer* printer) const {
-  printer->Print(variables_,
-                 "if ($has_oneof_case_message$) {\n"
-                 "  size += $computeStringSize$($number$, $oneof_name$_);\n"
-                 "}\n");
-}
-
-// ===================================================================
-
-RepeatedImmutableStringFieldGenerator::RepeatedImmutableStringFieldGenerator(
-    const FieldDescriptor* descriptor, int messageBitIndex, int builderBitIndex,
-    Context* context)
-    : ImmutableStringFieldGenerator(descriptor, messageBitIndex,
-                                    builderBitIndex, context) {}
-
-RepeatedImmutableStringFieldGenerator::
-    ~RepeatedImmutableStringFieldGenerator() {}
-
-int RepeatedImmutableStringFieldGenerator::GetNumBitsForMessage() const {
-  return 0;
-}
-
-int RepeatedImmutableStringFieldGenerator::GetNumBitsForBuilder() const {
-  return 1;
-}
-
-void RepeatedImmutableStringFieldGenerator::GenerateInterfaceMembers(
-    io::Printer* printer) const {
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_GETTER);
-  printer->Print(
-      variables_,
-      // NOTE: the same method in the implementation class actually returns
-      // com.google.protobuf.ProtocolStringList (a subclass of List). It's
-      // changed between protobuf 2.5.0 release and protobuf 2.6.1 release.
-      // To retain binary compatibility with both 2.5.0 and 2.6.1 generated
-      // code, we make this interface method return List so both methods
-      // with different return types exist in the compiled byte code.
-      "$deprecation$java.util.List<java.lang.String>\n"
-      "    get$capitalized_name$List();\n");
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_COUNT);
-  printer->Print(variables_,
-                 "$deprecation$int get$capitalized_name$Count();\n");
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_INDEXED_GETTER);
-  printer->Print(
-      variables_,
-      "$deprecation$java.lang.String get$capitalized_name$(int index);\n");
-  WriteFieldStringBytesAccessorDocComment(printer, descriptor_,
-                                          LIST_INDEXED_GETTER);
-  printer->Print(variables_,
-                 "$deprecation$com.google.protobuf.ByteString\n"
-                 "    get$capitalized_name$Bytes(int index);\n");
-}
-
-void RepeatedImmutableStringFieldGenerator::GenerateMembers(
-    io::Printer* printer) const {
-  printer->Print(variables_,
-                 "@SuppressWarnings(\"serial\")\n"
-                 "private com.google.protobuf.LazyStringList $name$_;\n");
-  PrintExtraFieldInfo(variables_, printer);
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_GETTER);
-  printer->Print(variables_,
-                 "$deprecation$public com.google.protobuf.ProtocolStringList\n"
-                 "    ${$get$capitalized_name$List$}$() {\n"
-                 "  return $name$_;\n"  // note:  unmodifiable list
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_COUNT);
-  printer->Print(
-      variables_,
-      "$deprecation$public int ${$get$capitalized_name$Count$}$() {\n"
-      "  return $name$_.size();\n"
-      "}\n");
-  printer->Annotate("{", "}", descriptor_);
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_INDEXED_GETTER);
-  printer->Print(variables_,
-                 "$deprecation$public java.lang.String "
-                 "${$get$capitalized_name$$}$(int index) {\n"
-                 "  return $name$_.get(index);\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-  WriteFieldStringBytesAccessorDocComment(printer, descriptor_,
-                                          LIST_INDEXED_GETTER);
-  printer->Print(variables_,
-                 "$deprecation$public com.google.protobuf.ByteString\n"
-                 "    ${$get$capitalized_name$Bytes$}$(int index) {\n"
-                 "  return $name$_.getByteString(index);\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-}
-
-void RepeatedImmutableStringFieldGenerator::GenerateBuilderMembers(
-    io::Printer* printer) const {
-  // One field is the list and the bit field keeps track of whether the
-  // list is immutable. If it's immutable, the invariant is that it must
-  // either an instance of Collections.emptyList() or it's an ArrayList
-  // wrapped in a Collections.unmodifiableList() wrapper and nobody else has
-  // a reference to the underlying ArrayList. This invariant allows us to
-  // share instances of lists between protocol buffers avoiding expensive
-  // memory allocations. Note, immutable is a strong guarantee here -- not
-  // just that the list cannot be modified via the reference but that the
-  // list can never be modified.
-  printer->Print(
-      variables_,
-      "private com.google.protobuf.LazyStringList $name$_ = $empty_list$;\n");
-
-  printer->Print(
-      variables_,
-      "private void ensure$capitalized_name$IsMutable() {\n"
-      "  if (!$get_mutable_bit_builder$) {\n"
-      "    $name$_ = new com.google.protobuf.LazyStringArrayList($name$_);\n"
-      "    $set_mutable_bit_builder$;\n"
-      "   }\n"
-      "}\n");
-
-  // Note:  We return an unmodifiable list because otherwise the caller
-  //   could hold on to the returned list and modify it after the message
-  //   has been built, thus mutating the message which is supposed to be
-  //   immutable.
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_GETTER);
-  printer->Print(variables_,
-                 "$deprecation$public com.google.protobuf.ProtocolStringList\n"
-                 "    ${$get$capitalized_name$List$}$() {\n"
-                 "  return $name$_.getUnmodifiableView();\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_COUNT);
-  printer->Print(
-      variables_,
-      "$deprecation$public int ${$get$capitalized_name$Count$}$() {\n"
-      "  return $name$_.size();\n"
-      "}\n");
-  printer->Annotate("{", "}", descriptor_);
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_INDEXED_GETTER);
-  printer->Print(variables_,
-                 "$deprecation$public java.lang.String "
-                 "${$get$capitalized_name$$}$(int index) {\n"
-                 "  return $name$_.get(index);\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-  WriteFieldStringBytesAccessorDocComment(printer, descriptor_,
-                                          LIST_INDEXED_GETTER);
-  printer->Print(variables_,
-                 "$deprecation$public com.google.protobuf.ByteString\n"
-                 "    ${$get$capitalized_name$Bytes$}$(int index) {\n"
-                 "  return $name$_.getByteString(index);\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_INDEXED_SETTER,
-                               /* builder */ true);
-  printer->Print(variables_,
-                 "$deprecation$public Builder ${$set$capitalized_name$$}$(\n"
-                 "    int index, java.lang.String value) {\n"
-                 "  $null_check$\n"
-                 "  ensure$capitalized_name$IsMutable();\n"
-                 "  $name$_.set(index, value);\n"
-                 "  $on_changed$\n"
-                 "  return this;\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_ADDER,
-                               /* builder */ true);
-  printer->Print(variables_,
-                 "$deprecation$public Builder ${$add$capitalized_name$$}$(\n"
-                 "    java.lang.String value) {\n"
-                 "  $null_check$\n"
-                 "  ensure$capitalized_name$IsMutable();\n"
-                 "  $name$_.add(value);\n"
-                 "  $on_changed$\n"
-                 "  return this;\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_MULTI_ADDER,
-                               /* builder */ true);
-  printer->Print(variables_,
-                 "$deprecation$public Builder ${$addAll$capitalized_name$$}$(\n"
-                 "    java.lang.Iterable<java.lang.String> values) {\n"
-                 "  ensure$capitalized_name$IsMutable();\n"
-                 "  com.google.protobuf.AbstractMessageLite.Builder.addAll(\n"
-                 "      values, $name$_);\n"
-                 "  $on_changed$\n"
-                 "  return this;\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-  WriteFieldAccessorDocComment(printer, descriptor_, CLEARER,
-                               /* builder */ true);
-  printer->Print(
-      variables_,
-      "$deprecation$public Builder ${$clear$capitalized_name$$}$() {\n"
-      "  $name$_ = $empty_list$;\n"
-      "  $clear_mutable_bit_builder$;\n"
-      "  $on_changed$\n"
-      "  return this;\n"
-      "}\n");
-  printer->Annotate("{", "}", descriptor_);
-
-  WriteFieldStringBytesAccessorDocComment(printer, descriptor_, LIST_ADDER,
-                                          /* builder */ true);
-  printer->Print(
-      variables_,
-      "$deprecation$public Builder ${$add$capitalized_name$Bytes$}$(\n"
-      "    com.google.protobuf.ByteString value) {\n"
-      "  $null_check$\n");
-  printer->Annotate("{", "}", descriptor_);
-  if (CheckUtf8(descriptor_)) {
-    printer->Print(variables_, "  checkByteStringIsUtf8(value);\n");
-  }
-  printer->Print(variables_,
-                 "  ensure$capitalized_name$IsMutable();\n"
-                 "  $name$_.add(value);\n"
-                 "  $on_changed$\n"
-                 "  return this;\n"
-                 "}\n");
-}
-
-void RepeatedImmutableStringFieldGenerator::GenerateKotlinDslMembers(
-    io::Printer* printer) const {
-  printer->Print(
-      variables_,
-      "/**\n"
-      " * An uninstantiable, behaviorless type to represent the field in\n"
-      " * generics.\n"
-      " */\n"
-      "@kotlin.OptIn"
-      "(com.google.protobuf.kotlin.OnlyForUseByGeneratedProtoCode::class)\n"
-      "public class ${$$kt_capitalized_name$Proxy$}$ private constructor()"
-      " : com.google.protobuf.kotlin.DslProxy()\n");
-
-  // property for List<String>
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_GETTER);
-  printer->Print(variables_,
-                 "$kt_deprecation$public val $kt_name$: "
-                 "com.google.protobuf.kotlin.DslList"
-                 "<kotlin.String, ${$$kt_capitalized_name$Proxy$}$>\n"
-                 "  @kotlin.jvm.JvmSynthetic\n"
-                 "  get() = com.google.protobuf.kotlin.DslList(\n"
-                 "    $kt_dsl_builder$.${$get$capitalized_name$List$}$()\n"
-                 "  )\n");
-
-  // List<String>.add(String)
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_ADDER,
-                               /* builder */ false);
-  printer->Print(variables_,
-                 "@kotlin.jvm.JvmSynthetic\n"
-                 "@kotlin.jvm.JvmName(\"add$kt_capitalized_name$\")\n"
-                 "public fun com.google.protobuf.kotlin.DslList"
-                 "<kotlin.String, ${$$kt_capitalized_name$Proxy$}$>."
-                 "add(value: kotlin.String) {\n"
-                 "  $kt_dsl_builder$.${$add$capitalized_name$$}$(value)\n"
-                 "}\n");
-
-  // List<String> += String
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_ADDER,
-                               /* builder */ false);
-  printer->Print(variables_,
-                 "@kotlin.jvm.JvmSynthetic\n"
-                 "@kotlin.jvm.JvmName(\"plusAssign$kt_capitalized_name$\")\n"
-                 "@Suppress(\"NOTHING_TO_INLINE\")\n"
-                 "public inline operator fun com.google.protobuf.kotlin.DslList"
-                 "<kotlin.String, ${$$kt_capitalized_name$Proxy$}$>."
-                 "plusAssign(value: kotlin.String) {\n"
-                 "  add(value)\n"
-                 "}\n");
-
-  // List<String>.addAll(Iterable<String>)
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_MULTI_ADDER,
-                               /* builder */ false);
-  printer->Print(
-      variables_,
-      "@kotlin.jvm.JvmSynthetic\n"
-      "@kotlin.jvm.JvmName(\"addAll$kt_capitalized_name$\")\n"
-      "public fun com.google.protobuf.kotlin.DslList"
-      "<kotlin.String, ${$$kt_capitalized_name$Proxy$}$>."
-      "addAll(values: kotlin.collections.Iterable<kotlin.String>) {\n"
-      "  $kt_dsl_builder$.${$addAll$capitalized_name$$}$(values)\n"
-      "}\n");
-
-  // List<String> += Iterable<String>
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_MULTI_ADDER,
-                               /* builder */ false);
-  printer->Print(
-      variables_,
-      "@kotlin.jvm.JvmSynthetic\n"
-      "@kotlin.jvm.JvmName(\"plusAssignAll$kt_capitalized_name$\")\n"
-      "@Suppress(\"NOTHING_TO_INLINE\")\n"
-      "public inline operator fun com.google.protobuf.kotlin.DslList"
-      "<kotlin.String, ${$$kt_capitalized_name$Proxy$}$>."
-      "plusAssign(values: kotlin.collections.Iterable<kotlin.String>) {\n"
-      "  addAll(values)\n"
-      "}\n");
-
-  // List<String>[Int] = String
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_INDEXED_SETTER,
-                               /* builder */ false);
-  printer->Print(
-      variables_,
-      "@kotlin.jvm.JvmSynthetic\n"
-      "@kotlin.jvm.JvmName(\"set$kt_capitalized_name$\")\n"
-      "public operator fun com.google.protobuf.kotlin.DslList"
-      "<kotlin.String, ${$$kt_capitalized_name$Proxy$}$>."
-      "set(index: kotlin.Int, value: kotlin.String) {\n"
-      "  $kt_dsl_builder$.${$set$capitalized_name$$}$(index, value)\n"
-      "}");
-
-  WriteFieldAccessorDocComment(printer, descriptor_, CLEARER,
-                               /* builder */ false);
-  printer->Print(variables_,
-                 "@kotlin.jvm.JvmSynthetic\n"
-                 "@kotlin.jvm.JvmName(\"clear$kt_capitalized_name$\")\n"
-                 "public fun com.google.protobuf.kotlin.DslList"
-                 "<kotlin.String, ${$$kt_capitalized_name$Proxy$}$>."
-                 "clear() {\n"
-                 "  $kt_dsl_builder$.${$clear$capitalized_name$$}$()\n"
-                 "}");
-}
-
-void RepeatedImmutableStringFieldGenerator::
-    GenerateFieldBuilderInitializationCode(io::Printer* printer) const {
-  // noop for primitives
-}
-
-void RepeatedImmutableStringFieldGenerator::GenerateInitializationCode(
-    io::Printer* printer) const {
-  printer->Print(variables_, "$name$_ = $empty_list$;\n");
-}
-
-void RepeatedImmutableStringFieldGenerator::GenerateBuilderClearCode(
-    io::Printer* printer) const {
-  printer->Print(variables_,
-                 "$name$_ = $empty_list$;\n"
-                 "$clear_mutable_bit_builder$;\n");
-}
-
-void RepeatedImmutableStringFieldGenerator::GenerateMergingCode(
-    io::Printer* printer) const {
-  // The code below does two optimizations:
-  //   1. If the other list is empty, there's nothing to do. This ensures we
-  //      don't allocate a new array if we already have an immutable one.
-  //   2. If the other list is non-empty and our current list is empty, we can
-  //      reuse the other list which is guaranteed to be immutable.
-  printer->Print(variables_,
-                 "if (!other.$name$_.isEmpty()) {\n"
-                 "  if ($name$_.isEmpty()) {\n"
-                 "    $name$_ = other.$name$_;\n"
-                 "    $clear_mutable_bit_builder$;\n"
-                 "  } else {\n"
-                 "    ensure$capitalized_name$IsMutable();\n"
-                 "    $name$_.addAll(other.$name$_);\n"
-                 "  }\n"
-                 "  $on_changed$\n"
-                 "}\n");
-}
-
-void RepeatedImmutableStringFieldGenerator::GenerateBuildingCode(
-    io::Printer* printer) const {
-  // The code below ensures that the result has an immutable list. If our
-  // list is immutable, we can just reuse it. If not, we make it immutable.
-
-  printer->Print(variables_,
-                 "if ($get_mutable_bit_builder$) {\n"
-                 "  $name$_ = $name$_.getUnmodifiableView();\n"
-                 "  $clear_mutable_bit_builder$;\n"
-                 "}\n"
-                 "result.$name$_ = $name$_;\n");
-}
-
-void RepeatedImmutableStringFieldGenerator::GenerateBuilderParsingCode(
-    io::Printer* printer) const {
-  if (CheckUtf8(descriptor_)) {
-    printer->Print(variables_,
-                   "java.lang.String s = input.readStringRequireUtf8();\n"
-                   "ensure$capitalized_name$IsMutable();\n"
-                   "$name$_.add(s);\n");
-  } else {
-    printer->Print(variables_,
-                   "com.google.protobuf.ByteString bs = input.readBytes();\n"
-                   "ensure$capitalized_name$IsMutable();\n"
-                   "$name$_.add(bs);\n");
-  }
-}
-
-void RepeatedImmutableStringFieldGenerator::GenerateSerializationCode(
-    io::Printer* printer) const {
-  printer->Print(variables_,
-                 "for (int i = 0; i < $name$_.size(); i++) {\n"
-                 "  $writeString$(output, $number$, $name$_.getRaw(i));\n"
-                 "}\n");
-}
-
-void RepeatedImmutableStringFieldGenerator::GenerateSerializedSizeCode(
-    io::Printer* printer) const {
-  printer->Print(variables_,
-                 "{\n"
-                 "  int dataSize = 0;\n");
-  printer->Indent();
-
-  printer->Print(variables_,
-                 "for (int i = 0; i < $name$_.size(); i++) {\n"
-                 "  dataSize += computeStringSizeNoTag($name$_.getRaw(i));\n"
-                 "}\n");
-
-  printer->Print("size += dataSize;\n");
-
-  printer->Print(variables_,
-                 "size += $tag_size$ * get$capitalized_name$List().size();\n");
-
-  printer->Outdent();
-  printer->Print("}\n");
-}
-
-void RepeatedImmutableStringFieldGenerator::GenerateEqualsCode(
-    io::Printer* printer) const {
-  printer->Print(
-      variables_,
-      "if (!get$capitalized_name$List()\n"
-      "    .equals(other.get$capitalized_name$List())) return false;\n");
-}
-
-void RepeatedImmutableStringFieldGenerator::GenerateHashCode(
-    io::Printer* printer) const {
-  printer->Print(
-      variables_,
-      "if (get$capitalized_name$Count() > 0) {\n"
-      "  hash = (37 * hash) + $constant_name$;\n"
-      "  hash = (53 * hash) + get$capitalized_name$List().hashCode();\n"
-      "}\n");
-}
-
-std::string RepeatedImmutableStringFieldGenerator::GetBoxedType() const {
-  return "String";
-}
-
-}  // namespace java
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/compiler/java/string_field.h b/libs/protobuf/src/google/protobuf/compiler/java/string_field.h
deleted file mode 100644
index 814ebf2..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/java/string_field.h
+++ /dev/null
@@ -1,164 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-// Author: jonp@google.com (Jon Perlow)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-
-#ifndef GOOGLE_PROTOBUF_COMPILER_JAVA_STRING_FIELD_H__
-#define GOOGLE_PROTOBUF_COMPILER_JAVA_STRING_FIELD_H__
-
-#include <map>
-#include <string>
-
-#include "google/protobuf/compiler/java/field.h"
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace java {
-class Context;            // context.h
-class ClassNameResolver;  // name_resolver.h
-}  // namespace java
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace java {
-
-class ImmutableStringFieldGenerator : public ImmutableFieldGenerator {
- public:
-  explicit ImmutableStringFieldGenerator(const FieldDescriptor* descriptor,
-                                         int messageBitIndex,
-                                         int builderBitIndex, Context* context);
-  ImmutableStringFieldGenerator(const ImmutableStringFieldGenerator&) = delete;
-  ImmutableStringFieldGenerator& operator=(
-      const ImmutableStringFieldGenerator&) = delete;
-  ~ImmutableStringFieldGenerator() override;
-
-  // implements ImmutableFieldGenerator
-  // ---------------------------------------
-  int GetMessageBitIndex() const override;
-  int GetBuilderBitIndex() const override;
-  int GetNumBitsForMessage() const override;
-  int GetNumBitsForBuilder() const override;
-  void GenerateInterfaceMembers(io::Printer* printer) const override;
-  void GenerateMembers(io::Printer* printer) const override;
-  void GenerateBuilderMembers(io::Printer* printer) const override;
-  void GenerateInitializationCode(io::Printer* printer) const override;
-  void GenerateBuilderClearCode(io::Printer* printer) const override;
-  void GenerateMergingCode(io::Printer* printer) const override;
-  void GenerateBuildingCode(io::Printer* printer) const override;
-  void GenerateBuilderParsingCode(io::Printer* printer) const override;
-  void GenerateSerializationCode(io::Printer* printer) const override;
-  void GenerateSerializedSizeCode(io::Printer* printer) const override;
-  void GenerateFieldBuilderInitializationCode(
-      io::Printer* printer) const override;
-  void GenerateEqualsCode(io::Printer* printer) const override;
-  void GenerateHashCode(io::Printer* printer) const override;
-  void GenerateKotlinDslMembers(io::Printer* printer) const override;
-
-  std::string GetBoxedType() const override;
-
- protected:
-  const FieldDescriptor* descriptor_;
-  int message_bit_index_;
-  int builder_bit_index_;
-  std::map<std::string, std::string> variables_;
-  ClassNameResolver* name_resolver_;
-};
-
-class ImmutableStringOneofFieldGenerator
-    : public ImmutableStringFieldGenerator {
- public:
-  ImmutableStringOneofFieldGenerator(const FieldDescriptor* descriptor,
-                                     int messageBitIndex, int builderBitIndex,
-                                     Context* context);
-  ImmutableStringOneofFieldGenerator(
-      const ImmutableStringOneofFieldGenerator&) = delete;
-  ImmutableStringOneofFieldGenerator& operator=(
-      const ImmutableStringOneofFieldGenerator&) = delete;
-  ~ImmutableStringOneofFieldGenerator() override;
-
- private:
-  void GenerateMembers(io::Printer* printer) const override;
-  void GenerateBuilderMembers(io::Printer* printer) const override;
-  void GenerateBuilderClearCode(io::Printer* printer) const override;
-  void GenerateMergingCode(io::Printer* printer) const override;
-  void GenerateBuildingCode(io::Printer* printer) const override;
-  void GenerateBuilderParsingCode(io::Printer* printer) const override;
-  void GenerateSerializationCode(io::Printer* printer) const override;
-  void GenerateSerializedSizeCode(io::Printer* printer) const override;
-};
-
-class RepeatedImmutableStringFieldGenerator
-    : public ImmutableStringFieldGenerator {
- public:
-  explicit RepeatedImmutableStringFieldGenerator(
-      const FieldDescriptor* descriptor, int messageBitIndex,
-      int builderBitIndex, Context* context);
-  RepeatedImmutableStringFieldGenerator(
-      const RepeatedImmutableStringFieldGenerator&) = delete;
-  RepeatedImmutableStringFieldGenerator& operator=(
-      const RepeatedImmutableStringFieldGenerator&) = delete;
-  ~RepeatedImmutableStringFieldGenerator() override;
-
-  // implements ImmutableFieldGenerator ---------------------------------------
-  int GetNumBitsForMessage() const override;
-  int GetNumBitsForBuilder() const override;
-  void GenerateInterfaceMembers(io::Printer* printer) const override;
-  void GenerateMembers(io::Printer* printer) const override;
-  void GenerateBuilderMembers(io::Printer* printer) const override;
-  void GenerateInitializationCode(io::Printer* printer) const override;
-  void GenerateBuilderClearCode(io::Printer* printer) const override;
-  void GenerateMergingCode(io::Printer* printer) const override;
-  void GenerateBuildingCode(io::Printer* printer) const override;
-  void GenerateBuilderParsingCode(io::Printer* printer) const override;
-  void GenerateSerializationCode(io::Printer* printer) const override;
-  void GenerateSerializedSizeCode(io::Printer* printer) const override;
-  void GenerateFieldBuilderInitializationCode(
-      io::Printer* printer) const override;
-  void GenerateEqualsCode(io::Printer* printer) const override;
-  void GenerateHashCode(io::Printer* printer) const override;
-  void GenerateKotlinDslMembers(io::Printer* printer) const override;
-
-  std::string GetBoxedType() const override;
-};
-
-}  // namespace java
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // GOOGLE_PROTOBUF_COMPILER_JAVA_STRING_FIELD_H__
diff --git a/libs/protobuf/src/google/protobuf/compiler/java/string_field_lite.cc b/libs/protobuf/src/google/protobuf/compiler/java/string_field_lite.cc
deleted file mode 100644
index 49f6891..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/java/string_field_lite.cc
+++ /dev/null
@@ -1,864 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-// Author: jonp@google.com (Jon Perlow)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-
-#include <google/protobuf/compiler/java/string_field_lite.h>
-
-#include <cstdint>
-#include <map>
-#include <string>
-
-#include <google/protobuf/stubs/logging.h>
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/io/printer.h>
-#include <google/protobuf/wire_format.h>
-#include <google/protobuf/stubs/strutil.h>
-#include <google/protobuf/compiler/java/context.h>
-#include <google/protobuf/compiler/java/doc_comment.h>
-#include <google/protobuf/compiler/java/helpers.h>
-#include <google/protobuf/compiler/java/name_resolver.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace java {
-
-using internal::WireFormat;
-using internal::WireFormatLite;
-
-namespace {
-
-void SetPrimitiveVariables(const FieldDescriptor* descriptor,
-                           int messageBitIndex, int builderBitIndex,
-                           const FieldGeneratorInfo* info,
-                           ClassNameResolver* name_resolver,
-                           std::map<std::string, std::string>* variables) {
-  SetCommonFieldVariables(descriptor, info, variables);
-
-  (*variables)["empty_list"] =
-      "com.google.protobuf.GeneratedMessageLite.emptyProtobufList()";
-
-  (*variables)["default"] = ImmutableDefaultValue(descriptor, name_resolver);
-  (*variables)["default_init"] =
-      "= " + ImmutableDefaultValue(descriptor, name_resolver);
-  (*variables)["capitalized_type"] = "java.lang.String";
-  (*variables)["tag"] =
-      StrCat(static_cast<int32_t>(WireFormat::MakeTag(descriptor)));
-  (*variables)["tag_size"] = StrCat(
-      WireFormat::TagSize(descriptor->number(), GetType(descriptor)));
-  // We use `x.getClass()` as a null check because it generates less bytecode
-  // than an `if (x == null) { throw ... }` statement.
-  (*variables)["null_check"] =
-      "  java.lang.Class<?> valueClass = value.getClass();\n";
-
-  // TODO(birdo): Add @deprecated javadoc when generating javadoc is supported
-  // by the proto compiler
-  (*variables)["deprecation"] =
-      descriptor->options().deprecated() ? "@java.lang.Deprecated " : "";
-  (*variables)["kt_deprecation"] =
-      descriptor->options().deprecated()
-          ? "@kotlin.Deprecated(message = \"Field " + (*variables)["name"] +
-                " is deprecated\") "
-          : "";
-  (*variables)["required"] = descriptor->is_required() ? "true" : "false";
-
-  if (HasHasbit(descriptor)) {
-    // For singular messages and builders, one bit is used for the hasField bit.
-    (*variables)["get_has_field_bit_message"] = GenerateGetBit(messageBitIndex);
-
-    // Note that these have a trailing ";".
-    (*variables)["set_has_field_bit_message"] =
-        GenerateSetBit(messageBitIndex) + ";";
-    (*variables)["clear_has_field_bit_message"] =
-        GenerateClearBit(messageBitIndex) + ";";
-
-    (*variables)["is_field_present_message"] = GenerateGetBit(messageBitIndex);
-  } else {
-    (*variables)["set_has_field_bit_message"] = "";
-    (*variables)["clear_has_field_bit_message"] = "";
-
-    (*variables)["is_field_present_message"] =
-        "!" + (*variables)["name"] + "_.isEmpty()";
-  }
-
-  (*variables)["get_has_field_bit_from_local"] =
-      GenerateGetBitFromLocal(builderBitIndex);
-  (*variables)["set_has_field_bit_to_local"] =
-      GenerateSetBitToLocal(messageBitIndex);
-}
-
-}  // namespace
-
-// ===================================================================
-
-ImmutableStringFieldLiteGenerator::ImmutableStringFieldLiteGenerator(
-    const FieldDescriptor* descriptor, int messageBitIndex, Context* context)
-    : descriptor_(descriptor),
-      messageBitIndex_(messageBitIndex),
-      name_resolver_(context->GetNameResolver()) {
-  SetPrimitiveVariables(descriptor, messageBitIndex, 0,
-                        context->GetFieldGeneratorInfo(descriptor),
-                        name_resolver_, &variables_);
-}
-
-ImmutableStringFieldLiteGenerator::~ImmutableStringFieldLiteGenerator() {}
-
-int ImmutableStringFieldLiteGenerator::GetNumBitsForMessage() const {
-  return HasHasbit(descriptor_) ? 1 : 0;
-}
-
-// A note about how strings are handled. In the SPEED and CODE_SIZE runtimes,
-// strings are not stored as java.lang.String in the Message because of two
-// issues:
-//
-//  1. It wouldn't roundtrip byte arrays that were not valid UTF-8 encoded
-//     strings, but rather fields that were raw bytes incorrectly marked
-//     as strings in the proto file. This is common because in the proto1
-//     syntax, string was the way to indicate bytes and C++ engineers can
-//     easily make this mistake without affecting the C++ API. By converting to
-//     strings immediately, some java code might corrupt these byte arrays as
-//     it passes through a java server even if the field was never accessed by
-//     application code.
-//
-//  2. There's a performance hit to converting between bytes and strings and
-//     it many cases, the field is never even read by the application code. This
-//     avoids unnecessary conversions in the common use cases.
-//
-// In the LITE_RUNTIME, we store strings as java.lang.String because we assume
-// that the users of this runtime are not subject to proto1 constraints and are
-// running code on devices that are user facing. That is, the developers are
-// properly incentivized to only fetch the data they need to read and wish to
-// reduce the number of allocations incurred when running on a user's device.
-
-// TODO(dweis): Consider dropping all of the *Bytes() methods. They really
-//     shouldn't be necessary or used on devices.
-void ImmutableStringFieldLiteGenerator::GenerateInterfaceMembers(
-    io::Printer* printer) const {
-  if (HasHazzer(descriptor_)) {
-    WriteFieldAccessorDocComment(printer, descriptor_, HAZZER);
-    printer->Print(variables_,
-                   "$deprecation$boolean has$capitalized_name$();\n");
-  }
-  WriteFieldAccessorDocComment(printer, descriptor_, GETTER);
-  printer->Print(variables_,
-                 "$deprecation$java.lang.String get$capitalized_name$();\n");
-  WriteFieldStringBytesAccessorDocComment(printer, descriptor_, GETTER);
-  printer->Print(variables_,
-                 "$deprecation$com.google.protobuf.ByteString\n"
-                 "    get$capitalized_name$Bytes();\n");
-}
-
-void ImmutableStringFieldLiteGenerator::GenerateMembers(
-    io::Printer* printer) const {
-  printer->Print(variables_, "private java.lang.String $name$_;\n");
-  PrintExtraFieldInfo(variables_, printer);
-
-  if (HasHazzer(descriptor_)) {
-    WriteFieldAccessorDocComment(printer, descriptor_, HAZZER);
-    printer->Print(
-        variables_,
-        "@java.lang.Override\n"
-        "$deprecation$public boolean ${$has$capitalized_name$$}$() {\n"
-        "  return $get_has_field_bit_message$;\n"
-        "}\n");
-    printer->Annotate("{", "}", descriptor_);
-  }
-
-  WriteFieldAccessorDocComment(printer, descriptor_, GETTER);
-  printer->Print(
-      variables_,
-      "@java.lang.Override\n"
-      "$deprecation$public java.lang.String ${$get$capitalized_name$$}$() {\n"
-      "  return $name$_;\n"
-      "}\n");
-  printer->Annotate("{", "}", descriptor_);
-  WriteFieldStringBytesAccessorDocComment(printer, descriptor_, GETTER);
-  printer->Print(
-      variables_,
-      "@java.lang.Override\n"
-      "$deprecation$public com.google.protobuf.ByteString\n"
-      "    ${$get$capitalized_name$Bytes$}$() {\n"
-      "  return com.google.protobuf.ByteString.copyFromUtf8($name$_);\n"
-      "}\n");
-  printer->Annotate("{", "}", descriptor_);
-
-  WriteFieldAccessorDocComment(printer, descriptor_, SETTER);
-  printer->Print(variables_,
-                 "private void set$capitalized_name$(\n"
-                 "    java.lang.String value) {\n"
-                 "$null_check$"
-                 "  $set_has_field_bit_message$\n"
-                 "  $name$_ = value;\n"
-                 "}\n");
-  WriteFieldAccessorDocComment(printer, descriptor_, CLEARER);
-  printer->Print(variables_,
-                 "private void clear$capitalized_name$() {\n"
-                 "  $clear_has_field_bit_message$\n"
-                 // The default value is not a simple literal so we want to
-                 // avoid executing it multiple times.  Instead, get the default
-                 // out of the default instance.
-                 "  $name$_ = getDefaultInstance().get$capitalized_name$();\n"
-                 "}\n");
-
-  WriteFieldStringBytesAccessorDocComment(printer, descriptor_, SETTER);
-  printer->Print(variables_,
-                 "private void set$capitalized_name$Bytes(\n"
-                 "    com.google.protobuf.ByteString value) {\n");
-  if (CheckUtf8(descriptor_)) {
-    printer->Print(variables_, "  checkByteStringIsUtf8(value);\n");
-  }
-  printer->Print(variables_,
-                 "  $name$_ = value.toStringUtf8();\n"
-                 "  $set_has_field_bit_message$\n"
-                 "}\n");
-}
-
-void ImmutableStringFieldLiteGenerator::GenerateBuilderMembers(
-    io::Printer* printer) const {
-  if (HasHazzer(descriptor_)) {
-    WriteFieldAccessorDocComment(printer, descriptor_, HAZZER);
-    printer->Print(
-        variables_,
-        "@java.lang.Override\n"
-        "$deprecation$public boolean ${$has$capitalized_name$$}$() {\n"
-        "  return instance.has$capitalized_name$();\n"
-        "}\n");
-    printer->Annotate("{", "}", descriptor_);
-  }
-
-  WriteFieldAccessorDocComment(printer, descriptor_, GETTER);
-  printer->Print(
-      variables_,
-      "@java.lang.Override\n"
-      "$deprecation$public java.lang.String ${$get$capitalized_name$$}$() {\n"
-      "  return instance.get$capitalized_name$();\n"
-      "}\n");
-  printer->Annotate("{", "}", descriptor_);
-
-  WriteFieldStringBytesAccessorDocComment(printer, descriptor_, GETTER);
-  printer->Print(variables_,
-                 "@java.lang.Override\n"
-                 "$deprecation$public com.google.protobuf.ByteString\n"
-                 "    ${$get$capitalized_name$Bytes$}$() {\n"
-                 "  return instance.get$capitalized_name$Bytes();\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-
-  WriteFieldAccessorDocComment(printer, descriptor_, SETTER,
-                               /* builder */ true);
-  printer->Print(variables_,
-                 "$deprecation$public Builder ${$set$capitalized_name$$}$(\n"
-                 "    java.lang.String value) {\n"
-                 "  copyOnWrite();\n"
-                 "  instance.set$capitalized_name$(value);\n"
-                 "  return this;\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-  WriteFieldAccessorDocComment(printer, descriptor_, CLEARER,
-                               /* builder */ true);
-  printer->Print(
-      variables_,
-      "$deprecation$public Builder ${$clear$capitalized_name$$}$() {\n"
-      "  copyOnWrite();\n"
-      "  instance.clear$capitalized_name$();\n"
-      "  return this;\n"
-      "}\n");
-  printer->Annotate("{", "}", descriptor_);
-
-  WriteFieldStringBytesAccessorDocComment(printer, descriptor_, SETTER,
-                                          /* builder */ true);
-  printer->Print(
-      variables_,
-      "$deprecation$public Builder ${$set$capitalized_name$Bytes$}$(\n"
-      "    com.google.protobuf.ByteString value) {\n"
-      "  copyOnWrite();\n"
-      "  instance.set$capitalized_name$Bytes(value);\n"
-      "  return this;\n"
-      "}\n");
-  printer->Annotate("{", "}", descriptor_);
-}
-
-void ImmutableStringFieldLiteGenerator::GenerateKotlinDslMembers(
-    io::Printer* printer) const {
-  WriteFieldDocComment(printer, descriptor_);
-  printer->Print(variables_,
-                 "$kt_deprecation$public var $kt_name$: kotlin.String\n"
-                 "  @JvmName(\"${$get$kt_capitalized_name$$}$\")\n"
-                 "  get() = $kt_dsl_builder$.${$get$capitalized_name$$}$()\n"
-                 "  @JvmName(\"${$set$kt_capitalized_name$$}$\")\n"
-                 "  set(value) {\n"
-                 "    $kt_dsl_builder$.${$set$capitalized_name$$}$(value)\n"
-                 "  }\n");
-
-  WriteFieldAccessorDocComment(printer, descriptor_, CLEARER,
-                               /* builder */ false);
-  printer->Print(variables_,
-                 "public fun ${$clear$kt_capitalized_name$$}$() {\n"
-                 "  $kt_dsl_builder$.${$clear$capitalized_name$$}$()\n"
-                 "}\n");
-
-  if (HasHazzer(descriptor_)) {
-    WriteFieldAccessorDocComment(printer, descriptor_, HAZZER);
-    printer->Print(
-        variables_,
-        "public fun ${$has$kt_capitalized_name$$}$(): kotlin.Boolean {\n"
-        "  return $kt_dsl_builder$.${$has$capitalized_name$$}$()\n"
-        "}\n");
-  }
-}
-
-void ImmutableStringFieldLiteGenerator::GenerateFieldInfo(
-    io::Printer* printer, std::vector<uint16_t>* output) const {
-  WriteIntToUtf16CharSequence(descriptor_->number(), output);
-  WriteIntToUtf16CharSequence(GetExperimentalJavaFieldType(descriptor_),
-                              output);
-  if (HasHasbit(descriptor_)) {
-    WriteIntToUtf16CharSequence(messageBitIndex_, output);
-  }
-  printer->Print(variables_, "\"$name$_\",\n");
-}
-
-void ImmutableStringFieldLiteGenerator::GenerateInitializationCode(
-    io::Printer* printer) const {
-  printer->Print(variables_, "$name$_ = $default$;\n");
-}
-
-std::string ImmutableStringFieldLiteGenerator::GetBoxedType() const {
-  return "java.lang.String";
-}
-
-// ===================================================================
-
-ImmutableStringOneofFieldLiteGenerator::ImmutableStringOneofFieldLiteGenerator(
-    const FieldDescriptor* descriptor, int messageBitIndex, Context* context)
-    : ImmutableStringFieldLiteGenerator(descriptor, messageBitIndex, context) {
-  const OneofGeneratorInfo* info =
-      context->GetOneofGeneratorInfo(descriptor->containing_oneof());
-  SetCommonOneofVariables(descriptor, info, &variables_);
-}
-
-ImmutableStringOneofFieldLiteGenerator::
-    ~ImmutableStringOneofFieldLiteGenerator() {}
-
-void ImmutableStringOneofFieldLiteGenerator::GenerateMembers(
-    io::Printer* printer) const {
-  PrintExtraFieldInfo(variables_, printer);
-  GOOGLE_DCHECK(HasHazzer(descriptor_));
-  WriteFieldAccessorDocComment(printer, descriptor_, HAZZER);
-  printer->Print(variables_,
-                 "@java.lang.Override\n"
-                 "$deprecation$public boolean ${$has$capitalized_name$$}$() {\n"
-                 "  return $has_oneof_case_message$;\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-
-  WriteFieldAccessorDocComment(printer, descriptor_, GETTER);
-  printer->Print(
-      variables_,
-      "@java.lang.Override\n"
-      "$deprecation$public java.lang.String ${$get$capitalized_name$$}$() {\n"
-      "  java.lang.String ref $default_init$;\n"
-      "  if ($has_oneof_case_message$) {\n"
-      "    ref = (java.lang.String) $oneof_name$_;\n"
-      "  }\n"
-      "  return ref;\n"
-      "}\n");
-  printer->Annotate("{", "}", descriptor_);
-
-  WriteFieldStringBytesAccessorDocComment(printer, descriptor_, GETTER);
-  printer->Print(variables_,
-                 "@java.lang.Override\n"
-                 "$deprecation$public com.google.protobuf.ByteString\n"
-                 "    ${$get$capitalized_name$Bytes$}$() {\n"
-                 "  java.lang.String ref $default_init$;\n"
-                 "  if ($has_oneof_case_message$) {\n"
-                 "    ref = (java.lang.String) $oneof_name$_;\n"
-                 "  }\n"
-                 "  return com.google.protobuf.ByteString.copyFromUtf8(ref);\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-
-  WriteFieldAccessorDocComment(printer, descriptor_, SETTER);
-  printer->Print(variables_,
-                 "private void ${$set$capitalized_name$$}$(\n"
-                 "    java.lang.String value) {\n"
-                 "$null_check$"
-                 "  $set_oneof_case_message$;\n"
-                 "  $oneof_name$_ = value;\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-  WriteFieldAccessorDocComment(printer, descriptor_, CLEARER);
-  printer->Print(variables_,
-                 "private void ${$clear$capitalized_name$$}$() {\n"
-                 "  if ($has_oneof_case_message$) {\n"
-                 "    $clear_oneof_case_message$;\n"
-                 "    $oneof_name$_ = null;\n"
-                 "  }\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-
-  WriteFieldStringBytesAccessorDocComment(printer, descriptor_, SETTER);
-  printer->Print(variables_,
-                 "private void ${$set$capitalized_name$Bytes$}$(\n"
-                 "    com.google.protobuf.ByteString value) {\n");
-  printer->Annotate("{", "}", descriptor_);
-  if (CheckUtf8(descriptor_)) {
-    printer->Print(variables_, "  checkByteStringIsUtf8(value);\n");
-  }
-  printer->Print(variables_,
-                 "  $oneof_name$_ = value.toStringUtf8();\n"
-                 "  $set_oneof_case_message$;\n"
-                 "}\n");
-}
-
-void ImmutableStringOneofFieldLiteGenerator::GenerateFieldInfo(
-    io::Printer* printer, std::vector<uint16_t>* output) const {
-  WriteIntToUtf16CharSequence(descriptor_->number(), output);
-  WriteIntToUtf16CharSequence(GetExperimentalJavaFieldType(descriptor_),
-                              output);
-  WriteIntToUtf16CharSequence(descriptor_->containing_oneof()->index(), output);
-}
-
-void ImmutableStringOneofFieldLiteGenerator::GenerateBuilderMembers(
-    io::Printer* printer) const {
-  GOOGLE_DCHECK(HasHazzer(descriptor_));
-  WriteFieldAccessorDocComment(printer, descriptor_, HAZZER);
-  printer->Print(variables_,
-                 "@java.lang.Override\n"
-                 "$deprecation$public boolean ${$has$capitalized_name$$}$() {\n"
-                 "  return instance.has$capitalized_name$();\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-
-  WriteFieldAccessorDocComment(printer, descriptor_, GETTER);
-  printer->Print(
-      variables_,
-      "@java.lang.Override\n"
-      "$deprecation$public java.lang.String ${$get$capitalized_name$$}$() {\n"
-      "  return instance.get$capitalized_name$();\n"
-      "}\n");
-  printer->Annotate("{", "}", descriptor_);
-
-  WriteFieldStringBytesAccessorDocComment(printer, descriptor_, GETTER);
-  printer->Print(variables_,
-                 "@java.lang.Override\n"
-                 "$deprecation$public com.google.protobuf.ByteString\n"
-                 "    ${$get$capitalized_name$Bytes$}$() {\n"
-                 "  return instance.get$capitalized_name$Bytes();\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-
-  WriteFieldAccessorDocComment(printer, descriptor_, SETTER,
-                               /* builder */ true);
-  printer->Print(variables_,
-                 "$deprecation$public Builder ${$set$capitalized_name$$}$(\n"
-                 "    java.lang.String value) {\n"
-                 "  copyOnWrite();\n"
-                 "  instance.set$capitalized_name$(value);\n"
-                 "  return this;\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-  WriteFieldAccessorDocComment(printer, descriptor_, CLEARER,
-                               /* builder */ true);
-  printer->Print(
-      variables_,
-      "$deprecation$public Builder ${$clear$capitalized_name$$}$() {\n"
-      "  copyOnWrite();\n"
-      "  instance.clear$capitalized_name$();\n"
-      "  return this;\n"
-      "}\n");
-  printer->Annotate("{", "}", descriptor_);
-
-  WriteFieldStringBytesAccessorDocComment(printer, descriptor_, SETTER,
-                                          /* builder */ true);
-  printer->Print(
-      variables_,
-      "$deprecation$public Builder ${$set$capitalized_name$Bytes$}$(\n"
-      "    com.google.protobuf.ByteString value) {\n"
-      "  copyOnWrite();\n"
-      "  instance.set$capitalized_name$Bytes(value);\n"
-      "  return this;\n"
-      "}\n");
-  printer->Annotate("{", "}", descriptor_);
-}
-
-// ===================================================================
-
-RepeatedImmutableStringFieldLiteGenerator::
-    RepeatedImmutableStringFieldLiteGenerator(const FieldDescriptor* descriptor,
-                                              int messageBitIndex,
-                                              Context* context)
-    : descriptor_(descriptor), name_resolver_(context->GetNameResolver()) {
-  SetPrimitiveVariables(descriptor, messageBitIndex, 0,
-                        context->GetFieldGeneratorInfo(descriptor),
-                        name_resolver_, &variables_);
-}
-
-RepeatedImmutableStringFieldLiteGenerator::
-    ~RepeatedImmutableStringFieldLiteGenerator() {}
-
-int RepeatedImmutableStringFieldLiteGenerator::GetNumBitsForMessage() const {
-  return 0;
-}
-
-void RepeatedImmutableStringFieldLiteGenerator::GenerateInterfaceMembers(
-    io::Printer* printer) const {
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_GETTER);
-  printer->Print(variables_,
-                 "$deprecation$java.util.List<java.lang.String>\n"
-                 "    get$capitalized_name$List();\n");
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_COUNT);
-  printer->Print(variables_,
-                 "$deprecation$int get$capitalized_name$Count();\n");
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_INDEXED_GETTER);
-  printer->Print(
-      variables_,
-      "$deprecation$java.lang.String get$capitalized_name$(int index);\n");
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_INDEXED_GETTER);
-  printer->Print(variables_,
-                 "$deprecation$com.google.protobuf.ByteString\n"
-                 "    get$capitalized_name$Bytes(int index);\n");
-}
-
-void RepeatedImmutableStringFieldLiteGenerator::GenerateMembers(
-    io::Printer* printer) const {
-  printer->Print(
-      variables_,
-      "private com.google.protobuf.Internal.ProtobufList<java.lang.String> "
-      "$name$_;\n");
-  PrintExtraFieldInfo(variables_, printer);
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_GETTER);
-  printer->Print(variables_,
-                 "@java.lang.Override\n"
-                 "$deprecation$public java.util.List<java.lang.String> "
-                 "${$get$capitalized_name$List$}$() {\n"
-                 "  return $name$_;\n"  // note:  unmodifiable list
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_COUNT);
-  printer->Print(
-      variables_,
-      "@java.lang.Override\n"
-      "$deprecation$public int ${$get$capitalized_name$Count$}$() {\n"
-      "  return $name$_.size();\n"
-      "}\n");
-  printer->Annotate("{", "}", descriptor_);
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_INDEXED_GETTER);
-  printer->Print(variables_,
-                 "@java.lang.Override\n"
-                 "$deprecation$public java.lang.String "
-                 "${$get$capitalized_name$$}$(int index) {\n"
-                 "  return $name$_.get(index);\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-  WriteFieldStringBytesAccessorDocComment(printer, descriptor_,
-                                          LIST_INDEXED_GETTER);
-  printer->Print(variables_,
-                 "@java.lang.Override\n"
-                 "$deprecation$public com.google.protobuf.ByteString\n"
-                 "    ${$get$capitalized_name$Bytes$}$(int index) {\n"
-                 "  return com.google.protobuf.ByteString.copyFromUtf8(\n"
-                 "      $name$_.get(index));\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-
-  printer->Print(
-      variables_,
-      "private void ensure$capitalized_name$IsMutable() {\n"
-      // Use a temporary to avoid a redundant iget-object.
-      "  com.google.protobuf.Internal.ProtobufList<java.lang.String> tmp =\n"
-      "      $name$_;"
-      "  if (!tmp.isModifiable()) {\n"
-      "    $name$_ =\n"
-      "        com.google.protobuf.GeneratedMessageLite.mutableCopy(tmp);\n"
-      "   }\n"
-      "}\n");
-
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_INDEXED_SETTER);
-  printer->Print(variables_,
-                 "private void set$capitalized_name$(\n"
-                 "    int index, java.lang.String value) {\n"
-                 "$null_check$"
-                 "  ensure$capitalized_name$IsMutable();\n"
-                 "  $name$_.set(index, value);\n"
-                 "}\n");
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_ADDER);
-  printer->Print(variables_,
-                 "private void add$capitalized_name$(\n"
-                 "    java.lang.String value) {\n"
-                 "$null_check$"
-                 "  ensure$capitalized_name$IsMutable();\n"
-                 "  $name$_.add(value);\n"
-                 "}\n");
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_MULTI_ADDER);
-  printer->Print(variables_,
-                 "private void addAll$capitalized_name$(\n"
-                 "    java.lang.Iterable<java.lang.String> values) {\n"
-                 "  ensure$capitalized_name$IsMutable();\n"
-                 "  com.google.protobuf.AbstractMessageLite.addAll(\n"
-                 "      values, $name$_);\n"
-                 "}\n");
-  WriteFieldAccessorDocComment(printer, descriptor_, CLEARER);
-  printer->Print(variables_,
-                 "private void clear$capitalized_name$() {\n"
-                 "  $name$_ = $empty_list$;\n"
-                 "}\n");
-
-  WriteFieldStringBytesAccessorDocComment(printer, descriptor_, LIST_ADDER);
-  printer->Print(variables_,
-                 "private void add$capitalized_name$Bytes(\n"
-                 "    com.google.protobuf.ByteString value) {\n");
-  if (CheckUtf8(descriptor_)) {
-    printer->Print(variables_, "  checkByteStringIsUtf8(value);\n");
-  }
-  printer->Print(variables_,
-                 "  ensure$capitalized_name$IsMutable();\n"
-                 "  $name$_.add(value.toStringUtf8());\n"
-                 "}\n");
-}
-
-void RepeatedImmutableStringFieldLiteGenerator::GenerateBuilderMembers(
-    io::Printer* printer) const {
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_GETTER);
-  printer->Print(variables_,
-                 "@java.lang.Override\n"
-                 "$deprecation$public java.util.List<java.lang.String>\n"
-                 "    ${$get$capitalized_name$List$}$() {\n"
-                 "  return java.util.Collections.unmodifiableList(\n"
-                 "      instance.get$capitalized_name$List());\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_COUNT);
-  printer->Print(
-      variables_,
-      "@java.lang.Override\n"
-      "$deprecation$public int ${$get$capitalized_name$Count$}$() {\n"
-      "  return instance.get$capitalized_name$Count();\n"
-      "}\n");
-  printer->Annotate("{", "}", descriptor_);
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_INDEXED_GETTER);
-  printer->Print(variables_,
-                 "@java.lang.Override\n"
-                 "$deprecation$public java.lang.String "
-                 "${$get$capitalized_name$$}$(int index) {\n"
-                 "  return instance.get$capitalized_name$(index);\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-  WriteFieldStringBytesAccessorDocComment(printer, descriptor_,
-                                          LIST_INDEXED_GETTER);
-  printer->Print(variables_,
-                 "@java.lang.Override\n"
-                 "$deprecation$public com.google.protobuf.ByteString\n"
-                 "    ${$get$capitalized_name$Bytes$}$(int index) {\n"
-                 "  return instance.get$capitalized_name$Bytes(index);\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_INDEXED_SETTER,
-                               /* builder */ true);
-  printer->Print(variables_,
-                 "$deprecation$public Builder ${$set$capitalized_name$$}$(\n"
-                 "    int index, java.lang.String value) {\n"
-                 "  copyOnWrite();\n"
-                 "  instance.set$capitalized_name$(index, value);\n"
-                 "  return this;\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_ADDER,
-                               /* builder */ true);
-  printer->Print(variables_,
-                 "$deprecation$public Builder ${$add$capitalized_name$$}$(\n"
-                 "    java.lang.String value) {\n"
-                 "  copyOnWrite();\n"
-                 "  instance.add$capitalized_name$(value);\n"
-                 "  return this;\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_MULTI_ADDER,
-                               /* builder */ true);
-  printer->Print(variables_,
-                 "$deprecation$public Builder ${$addAll$capitalized_name$$}$(\n"
-                 "    java.lang.Iterable<java.lang.String> values) {\n"
-                 "  copyOnWrite();\n"
-                 "  instance.addAll$capitalized_name$(values);\n"
-                 "  return this;\n"
-                 "}\n");
-  printer->Annotate("{", "}", descriptor_);
-  WriteFieldAccessorDocComment(printer, descriptor_, CLEARER,
-                               /* builder */ true);
-  printer->Print(
-      variables_,
-      "$deprecation$public Builder ${$clear$capitalized_name$$}$() {\n"
-      "  copyOnWrite();\n"
-      "  instance.clear$capitalized_name$();\n"
-      "  return this;\n"
-      "}\n");
-  printer->Annotate("{", "}", descriptor_);
-
-  WriteFieldStringBytesAccessorDocComment(printer, descriptor_, LIST_ADDER,
-                                          /* builder */ true);
-  printer->Print(
-      variables_,
-      "$deprecation$public Builder ${$add$capitalized_name$Bytes$}$(\n"
-      "    com.google.protobuf.ByteString value) {\n"
-      "  copyOnWrite();\n"
-      "  instance.add$capitalized_name$Bytes(value);\n"
-      "  return this;\n"
-      "}\n");
-  printer->Annotate("{", "}", descriptor_);
-}
-
-void RepeatedImmutableStringFieldLiteGenerator::GenerateKotlinDslMembers(
-    io::Printer* printer) const {
-  printer->Print(
-      variables_,
-      "/**\n"
-      " * An uninstantiable, behaviorless type to represent the field in\n"
-      " * generics.\n"
-      " */\n"
-      "@kotlin.OptIn"
-      "(com.google.protobuf.kotlin.OnlyForUseByGeneratedProtoCode::class)\n"
-      "public class ${$$kt_capitalized_name$Proxy$}$ private constructor()"
-      " : com.google.protobuf.kotlin.DslProxy()\n");
-
-  // property for List<String>
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_GETTER);
-  printer->Print(
-      variables_,
-      "$kt_deprecation$public val $kt_name$: "
-      "com.google.protobuf.kotlin.DslList"
-      "<kotlin.String, ${$$kt_capitalized_name$Proxy$}$>\n"
-      "@kotlin.OptIn"
-      "(com.google.protobuf.kotlin.OnlyForUseByGeneratedProtoCode::class)\n"
-      "  get() = com.google.protobuf.kotlin.DslList(\n"
-      "    $kt_dsl_builder$.${$get$capitalized_name$List$}$()\n"
-      "  )\n");
-
-  // List<String>.add(String)
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_ADDER,
-                               /* builder */ false);
-  printer->Print(variables_,
-                 "@kotlin.jvm.JvmSynthetic\n"
-                 "@kotlin.jvm.JvmName(\"add$kt_capitalized_name$\")\n"
-                 "public fun com.google.protobuf.kotlin.DslList"
-                 "<kotlin.String, ${$$kt_capitalized_name$Proxy$}$>."
-                 "add(value: kotlin.String) {\n"
-                 "  $kt_dsl_builder$.${$add$capitalized_name$$}$(value)\n"
-                 "}\n");
-
-  // List<String> += String
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_ADDER,
-                               /* builder */ false);
-  printer->Print(variables_,
-                 "@kotlin.jvm.JvmSynthetic\n"
-                 "@kotlin.jvm.JvmName(\"plusAssign$kt_capitalized_name$\")\n"
-                 "@Suppress(\"NOTHING_TO_INLINE\")\n"
-                 "public inline operator fun com.google.protobuf.kotlin.DslList"
-                 "<kotlin.String, ${$$kt_capitalized_name$Proxy$}$>."
-                 "plusAssign(value: kotlin.String) {\n"
-                 "  add(value)\n"
-                 "}\n");
-
-  // List<String>.addAll(Iterable<String>)
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_MULTI_ADDER,
-                               /* builder */ false);
-  printer->Print(
-      variables_,
-      "@kotlin.jvm.JvmSynthetic\n"
-      "@kotlin.jvm.JvmName(\"addAll$kt_capitalized_name$\")\n"
-      "public fun com.google.protobuf.kotlin.DslList"
-      "<kotlin.String, ${$$kt_capitalized_name$Proxy$}$>."
-      "addAll(values: kotlin.collections.Iterable<kotlin.String>) {\n"
-      "  $kt_dsl_builder$.${$addAll$capitalized_name$$}$(values)\n"
-      "}\n");
-
-  // List<String> += Iterable<String>
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_MULTI_ADDER,
-                               /* builder */ false);
-  printer->Print(
-      variables_,
-      "@kotlin.jvm.JvmSynthetic\n"
-      "@kotlin.jvm.JvmName(\"plusAssignAll$kt_capitalized_name$\")\n"
-      "@Suppress(\"NOTHING_TO_INLINE\")\n"
-      "public inline operator fun com.google.protobuf.kotlin.DslList"
-      "<kotlin.String, ${$$kt_capitalized_name$Proxy$}$>."
-      "plusAssign(values: kotlin.collections.Iterable<kotlin.String>) {\n"
-      "  addAll(values)\n"
-      "}\n");
-
-  // List<String>[Int] = String
-  WriteFieldAccessorDocComment(printer, descriptor_, LIST_INDEXED_SETTER,
-                               /* builder */ false);
-  printer->Print(
-      variables_,
-      "@kotlin.jvm.JvmSynthetic\n"
-      "@kotlin.jvm.JvmName(\"set$kt_capitalized_name$\")\n"
-      "public operator fun com.google.protobuf.kotlin.DslList"
-      "<kotlin.String, ${$$kt_capitalized_name$Proxy$}$>."
-      "set(index: kotlin.Int, value: kotlin.String) {\n"
-      "  $kt_dsl_builder$.${$set$capitalized_name$$}$(index, value)\n"
-      "}");
-
-  WriteFieldAccessorDocComment(printer, descriptor_, CLEARER,
-                               /* builder */ false);
-  printer->Print(variables_,
-                 "@kotlin.jvm.JvmSynthetic\n"
-                 "@kotlin.jvm.JvmName(\"clear$kt_capitalized_name$\")\n"
-                 "public fun com.google.protobuf.kotlin.DslList"
-                 "<kotlin.String, ${$$kt_capitalized_name$Proxy$}$>."
-                 "clear() {\n"
-                 "  $kt_dsl_builder$.${$clear$capitalized_name$$}$()\n"
-                 "}");
-}
-
-void RepeatedImmutableStringFieldLiteGenerator::GenerateFieldInfo(
-    io::Printer* printer, std::vector<uint16_t>* output) const {
-  WriteIntToUtf16CharSequence(descriptor_->number(), output);
-  WriteIntToUtf16CharSequence(GetExperimentalJavaFieldType(descriptor_),
-                              output);
-  printer->Print(variables_, "\"$name$_\",\n");
-}
-
-void RepeatedImmutableStringFieldLiteGenerator::GenerateInitializationCode(
-    io::Printer* printer) const {
-  printer->Print(variables_, "$name$_ = $empty_list$;\n");
-}
-
-std::string RepeatedImmutableStringFieldLiteGenerator::GetBoxedType() const {
-  return "java.lang.String";
-}
-
-}  // namespace java
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/compiler/java/string_field_lite.h b/libs/protobuf/src/google/protobuf/compiler/java/string_field_lite.h
deleted file mode 100644
index b6ad1ea..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/java/string_field_lite.h
+++ /dev/null
@@ -1,139 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-// Author: jonp@google.com (Jon Perlow)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-
-#ifndef GOOGLE_PROTOBUF_COMPILER_JAVA_STRING_FIELD_LITE_H__
-#define GOOGLE_PROTOBUF_COMPILER_JAVA_STRING_FIELD_LITE_H__
-
-#include <cstdint>
-#include <map>
-#include <string>
-
-#include <google/protobuf/compiler/java/field.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace java {
-class Context;            // context.h
-class ClassNameResolver;  // name_resolver.h
-}  // namespace java
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace java {
-
-class ImmutableStringFieldLiteGenerator : public ImmutableFieldLiteGenerator {
- public:
-  explicit ImmutableStringFieldLiteGenerator(const FieldDescriptor* descriptor,
-                                             int messageBitIndex,
-                                             Context* context);
-  ~ImmutableStringFieldLiteGenerator() override;
-
-  // implements ImmutableFieldLiteGenerator
-  // ------------------------------------
-  int GetNumBitsForMessage() const override;
-  void GenerateInterfaceMembers(io::Printer* printer) const override;
-  void GenerateMembers(io::Printer* printer) const override;
-  void GenerateBuilderMembers(io::Printer* printer) const override;
-  void GenerateInitializationCode(io::Printer* printer) const override;
-  void GenerateFieldInfo(io::Printer* printer,
-                         std::vector<uint16_t>* output) const override;
-  void GenerateKotlinDslMembers(io::Printer* printer) const override;
-
-  std::string GetBoxedType() const override;
-
- protected:
-  const FieldDescriptor* descriptor_;
-  std::map<std::string, std::string> variables_;
-  const int messageBitIndex_;
-  ClassNameResolver* name_resolver_;
-
- private:
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(ImmutableStringFieldLiteGenerator);
-};
-
-class ImmutableStringOneofFieldLiteGenerator
-    : public ImmutableStringFieldLiteGenerator {
- public:
-  ImmutableStringOneofFieldLiteGenerator(const FieldDescriptor* descriptor,
-                                         int messageBitIndex, Context* context);
-  ~ImmutableStringOneofFieldLiteGenerator() override;
-
- private:
-  void GenerateMembers(io::Printer* printer) const override;
-  void GenerateBuilderMembers(io::Printer* printer) const override;
-  void GenerateFieldInfo(io::Printer* printer,
-                         std::vector<uint16_t>* output) const override;
-
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(ImmutableStringOneofFieldLiteGenerator);
-};
-
-class RepeatedImmutableStringFieldLiteGenerator
-    : public ImmutableFieldLiteGenerator {
- public:
-  explicit RepeatedImmutableStringFieldLiteGenerator(
-      const FieldDescriptor* descriptor, int messageBitIndex, Context* context);
-  ~RepeatedImmutableStringFieldLiteGenerator() override;
-
-  // implements ImmutableFieldLiteGenerator ------------------------------------
-  int GetNumBitsForMessage() const override;
-  void GenerateInterfaceMembers(io::Printer* printer) const override;
-  void GenerateMembers(io::Printer* printer) const override;
-  void GenerateBuilderMembers(io::Printer* printer) const override;
-  void GenerateInitializationCode(io::Printer* printer) const override;
-  void GenerateFieldInfo(io::Printer* printer,
-                         std::vector<uint16_t>* output) const override;
-  void GenerateKotlinDslMembers(io::Printer* printer) const override;
-
-  std::string GetBoxedType() const override;
-
- private:
-  const FieldDescriptor* descriptor_;
-  std::map<std::string, std::string> variables_;
-  ClassNameResolver* name_resolver_;
-
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(RepeatedImmutableStringFieldLiteGenerator);
-};
-
-}  // namespace java
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // GOOGLE_PROTOBUF_COMPILER_JAVA_STRING_FIELD_LITE_H__
diff --git a/libs/protobuf/src/google/protobuf/compiler/main.cc b/libs/protobuf/src/google/protobuf/compiler/main.cc
deleted file mode 100644
index 3960946..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/main.cc
+++ /dev/null
@@ -1,113 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <google/protobuf/compiler/cpp/generator.h>
-#include <google/protobuf/compiler/java/generator.h>
-#include <google/protobuf/compiler/java/kotlin_generator.h>
-#include <google/protobuf/compiler/command_line_interface.h>
-#include <google/protobuf/compiler/csharp/csharp_generator.h>
-#include <google/protobuf/compiler/objectivec/objectivec_generator.h>
-#include <google/protobuf/compiler/php/php_generator.h>
-#include <google/protobuf/compiler/python/generator.h>
-#include <google/protobuf/compiler/python/pyi_generator.h>
-#include <google/protobuf/compiler/ruby/ruby_generator.h>
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-
-int ProtobufMain(int argc, char* argv[]) {
-
-  CommandLineInterface cli;
-  cli.AllowPlugins("protoc-");
-
-  // Proto2 C++
-  cpp::CppGenerator cpp_generator;
-  cli.RegisterGenerator("--cpp_out", "--cpp_opt", &cpp_generator,
-                        "Generate C++ header and source.");
-
-#ifdef GOOGLE_PROTOBUF_RUNTIME_INCLUDE_BASE
-  cpp_generator.set_opensource_runtime(true);
-  cpp_generator.set_runtime_include_base(GOOGLE_PROTOBUF_RUNTIME_INCLUDE_BASE);
-#endif
-
-  // Proto2 Java
-  java::JavaGenerator java_generator;
-  cli.RegisterGenerator("--java_out", "--java_opt", &java_generator,
-                        "Generate Java source file.");
-
-  // Proto2 Kotlin
-  java::KotlinGenerator kt_generator;
-  cli.RegisterGenerator("--kotlin_out", "--kotlin_opt", &kt_generator,
-                        "Generate Kotlin file.");
-
-
-  // Proto2 Python
-  python::Generator py_generator;
-  cli.RegisterGenerator("--python_out", "--python_opt", &py_generator,
-                        "Generate Python source file.");
-  // Python pyi
-  python::PyiGenerator pyi_generator;
-  cli.RegisterGenerator("--pyi_out", &pyi_generator,
-                        "Generate python pyi stub.");
-
-  // PHP
-  php::Generator php_generator;
-  cli.RegisterGenerator("--php_out", "--php_opt", &php_generator,
-                        "Generate PHP source file.");
-
-  // Ruby
-  ruby::Generator rb_generator;
-  cli.RegisterGenerator("--ruby_out", "--ruby_opt", &rb_generator,
-                        "Generate Ruby source file.");
-
-  // CSharp
-  csharp::Generator csharp_generator;
-  cli.RegisterGenerator("--csharp_out", "--csharp_opt", &csharp_generator,
-                        "Generate C# source file.");
-
-  // Objective-C
-  objectivec::ObjectiveCGenerator objc_generator;
-  cli.RegisterGenerator("--objc_out", "--objc_opt", &objc_generator,
-                        "Generate Objective-C header and source.");
-
-  return cli.Run(argc, argv);
-}
-
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-int main(int argc, char* argv[]) {
-  return PROTOBUF_NAMESPACE_ID::compiler::ProtobufMain(argc, argv);
-}
diff --git a/libs/protobuf/src/google/protobuf/compiler/mock_code_generator.cc b/libs/protobuf/src/google/protobuf/compiler/mock_code_generator.cc
deleted file mode 100644
index 4d04511..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/mock_code_generator.cc
+++ /dev/null
@@ -1,384 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-
-#include <google/protobuf/compiler/mock_code_generator.h>
-
-#include <stdlib.h>
-
-#include <cstdint>
-#include <iostream>
-#include <memory>
-#include <vector>
-
-#include <google/protobuf/stubs/strutil.h>
-
-#include <google/protobuf/stubs/logging.h>
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/testing/file.h>
-#include <google/protobuf/testing/file.h>
-#include <google/protobuf/testing/file.h>
-#include <google/protobuf/compiler/plugin.pb.h>
-#include <google/protobuf/descriptor.pb.h>
-#include <gtest/gtest.h>
-#include <google/protobuf/stubs/substitute.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/io/printer.h>
-#include <google/protobuf/io/zero_copy_stream.h>
-#include <google/protobuf/text_format.h>
-
-#ifdef major
-#undef major
-#endif
-#ifdef minor
-#undef minor
-#endif
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-
-// Returns the list of the names of files in all_files in the form of a
-// comma-separated string.
-std::string CommaSeparatedList(
-    const std::vector<const FileDescriptor*>& all_files) {
-  std::vector<std::string> names;
-  for (size_t i = 0; i < all_files.size(); i++) {
-    names.push_back(all_files[i]->name());
-  }
-  return Join(names, ",");
-}
-
-static const char* kFirstInsertionPointName = "first_mock_insertion_point";
-static const char* kSecondInsertionPointName = "second_mock_insertion_point";
-static const char* kFirstInsertionPoint =
-    "# @@protoc_insertion_point(first_mock_insertion_point) is here\n";
-static const char* kSecondInsertionPoint =
-    "  # @@protoc_insertion_point(second_mock_insertion_point) is here\n";
-
-MockCodeGenerator::MockCodeGenerator(const std::string& name) : name_(name) {}
-
-MockCodeGenerator::~MockCodeGenerator() {}
-
-uint64_t MockCodeGenerator::GetSupportedFeatures() const {
-  uint64_t all_features = CodeGenerator::FEATURE_PROTO3_OPTIONAL;
-  return all_features & ~suppressed_features_;
-}
-
-void MockCodeGenerator::SuppressFeatures(uint64_t features) {
-  suppressed_features_ = features;
-}
-
-void MockCodeGenerator::ExpectGenerated(
-    const std::string& name, const std::string& parameter,
-    const std::string& insertions, const std::string& file,
-    const std::string& first_message_name,
-    const std::string& first_parsed_file_name,
-    const std::string& output_directory) {
-  std::string content;
-  GOOGLE_CHECK_OK(
-      File::GetContents(output_directory + "/" + GetOutputFileName(name, file),
-                        &content, true));
-
-  std::vector<std::string> lines =
-      Split(content, "\n", true);
-
-  while (!lines.empty() && lines.back().empty()) {
-    lines.pop_back();
-  }
-  for (size_t i = 0; i < lines.size(); i++) {
-    lines[i] += "\n";
-  }
-
-  std::vector<std::string> insertion_list;
-  if (!insertions.empty()) {
-    insertion_list = Split(insertions, ",", true);
-  }
-
-  EXPECT_EQ(lines.size(), 3 + insertion_list.size() * 2);
-  EXPECT_EQ(GetOutputFileContent(name, parameter, file, first_parsed_file_name,
-                                 first_message_name),
-            lines[0]);
-
-  EXPECT_EQ(kFirstInsertionPoint, lines[1 + insertion_list.size()]);
-  EXPECT_EQ(kSecondInsertionPoint, lines[2 + insertion_list.size() * 2]);
-
-  for (size_t i = 0; i < insertion_list.size(); i++) {
-    EXPECT_EQ(GetOutputFileContent(insertion_list[i], "first_insert", file,
-                                   file, first_message_name),
-              lines[1 + i]);
-    // Second insertion point is indented, so the inserted text should
-    // automatically be indented too.
-    EXPECT_EQ("  " + GetOutputFileContent(insertion_list[i], "second_insert",
-                                          file, file, first_message_name),
-              lines[2 + insertion_list.size() + i]);
-  }
-}
-
-namespace {
-void CheckSingleAnnotation(const std::string& expected_file,
-                           const std::string& expected_text,
-                           const std::string& file_content,
-                           const GeneratedCodeInfo::Annotation& annotation) {
-  EXPECT_EQ(expected_file, annotation.source_file());
-  ASSERT_GE(file_content.size(), annotation.begin());
-  ASSERT_GE(file_content.size(), annotation.end());
-  ASSERT_LE(annotation.begin(), annotation.end());
-  EXPECT_EQ(expected_text.size(), annotation.end() - annotation.begin());
-  EXPECT_EQ(expected_text,
-            file_content.substr(annotation.begin(), expected_text.size()));
-}
-}  // anonymous namespace
-
-void MockCodeGenerator::CheckGeneratedAnnotations(
-    const std::string& name, const std::string& file,
-    const std::string& output_directory) {
-  std::string file_content;
-  GOOGLE_CHECK_OK(
-      File::GetContents(output_directory + "/" + GetOutputFileName(name, file),
-                        &file_content, true));
-  std::string meta_content;
-  GOOGLE_CHECK_OK(File::GetContents(
-      output_directory + "/" + GetOutputFileName(name, file) + ".pb.meta",
-      &meta_content, true));
-  GeneratedCodeInfo annotations;
-  GOOGLE_CHECK(TextFormat::ParseFromString(meta_content, &annotations));
-  ASSERT_EQ(7, annotations.annotation_size());
-
-  CheckSingleAnnotation("first_annotation", "first", file_content,
-                        annotations.annotation(0));
-  CheckSingleAnnotation("first_path",
-                        "test_generator: first_insert,\n foo.proto,\n "
-                        "MockCodeGenerator_Annotate,\n foo.proto\n",
-                        file_content, annotations.annotation(1));
-  CheckSingleAnnotation("first_path",
-                        "test_plugin: first_insert,\n foo.proto,\n "
-                        "MockCodeGenerator_Annotate,\n foo.proto\n",
-                        file_content, annotations.annotation(2));
-  CheckSingleAnnotation("second_annotation", "second", file_content,
-                        annotations.annotation(3));
-  // This annotated text has changed because it was inserted at an indented
-  // insertion point.
-  CheckSingleAnnotation("second_path",
-                        "test_generator: second_insert,\n   foo.proto,\n   "
-                        "MockCodeGenerator_Annotate,\n   foo.proto\n",
-                        file_content, annotations.annotation(4));
-  CheckSingleAnnotation("second_path",
-                        "test_plugin: second_insert,\n   foo.proto,\n   "
-                        "MockCodeGenerator_Annotate,\n   foo.proto\n",
-                        file_content, annotations.annotation(5));
-  CheckSingleAnnotation("third_annotation", "third", file_content,
-                        annotations.annotation(6));
-}
-
-bool MockCodeGenerator::Generate(const FileDescriptor* file,
-                                 const std::string& parameter,
-                                 GeneratorContext* context,
-                                 std::string* error) const {
-  bool annotate = false;
-  for (int i = 0; i < file->message_type_count(); i++) {
-    if (HasPrefixString(file->message_type(i)->name(), "MockCodeGenerator_")) {
-      std::string command = StripPrefixString(
-          file->message_type(i)->name(), "MockCodeGenerator_");
-      if (command == "Error") {
-        *error = "Saw message type MockCodeGenerator_Error.";
-        return false;
-      } else if (command == "Exit") {
-        std::cerr << "Saw message type MockCodeGenerator_Exit." << std::endl;
-        exit(123);
-      } else if (command == "Abort") {
-        std::cerr << "Saw message type MockCodeGenerator_Abort." << std::endl;
-        abort();
-      } else if (command == "HasSourceCodeInfo") {
-        FileDescriptorProto file_descriptor_proto;
-        file->CopySourceCodeInfoTo(&file_descriptor_proto);
-        bool has_source_code_info =
-            file_descriptor_proto.has_source_code_info() &&
-            file_descriptor_proto.source_code_info().location_size() > 0;
-        std::cerr << "Saw message type MockCodeGenerator_HasSourceCodeInfo: "
-                  << has_source_code_info << "." << std::endl;
-        abort();
-      } else if (command == "HasJsonName") {
-        FieldDescriptorProto field_descriptor_proto;
-        file->message_type(i)->field(0)->CopyTo(&field_descriptor_proto);
-        std::cerr << "Saw json_name: " << field_descriptor_proto.has_json_name()
-                  << std::endl;
-        abort();
-      } else if (command == "Annotate") {
-        annotate = true;
-      } else if (command == "ShowVersionNumber") {
-        Version compiler_version;
-        context->GetCompilerVersion(&compiler_version);
-        std::cerr << "Saw compiler_version: "
-                  << compiler_version.major() * 1000000 +
-                         compiler_version.minor() * 1000 +
-                         compiler_version.patch()
-                  << " " << compiler_version.suffix() << std::endl;
-        abort();
-      } else {
-        GOOGLE_LOG(FATAL) << "Unknown MockCodeGenerator command: " << command;
-      }
-    }
-  }
-
-  bool insert_endlines = HasPrefixString(parameter, "insert_endlines=");
-  if (insert_endlines || HasPrefixString(parameter, "insert=")) {
-    std::vector<std::string> insert_into = Split(
-        StripPrefixString(
-            parameter, insert_endlines ? "insert_endlines=" : "insert="),
-        ",", true);
-
-    for (size_t i = 0; i < insert_into.size(); i++) {
-      {
-        google::protobuf::GeneratedCodeInfo info;
-        std::string content =
-            GetOutputFileContent(name_, "first_insert", file, context);
-        if (insert_endlines) {
-          GlobalReplaceSubstring(",", ",\n", &content);
-        }
-        if (annotate) {
-          auto* annotation = info.add_annotation();
-          annotation->set_begin(0);
-          annotation->set_end(content.size());
-          annotation->set_source_file("first_path");
-        }
-        std::unique_ptr<io::ZeroCopyOutputStream> output(
-            context->OpenForInsertWithGeneratedCodeInfo(
-                GetOutputFileName(insert_into[i], file),
-                kFirstInsertionPointName, info));
-        io::Printer printer(output.get(), '$');
-        printer.PrintRaw(content);
-        if (printer.failed()) {
-          *error = "MockCodeGenerator detected write error.";
-          return false;
-        }
-      }
-
-      {
-        google::protobuf::GeneratedCodeInfo info;
-        std::string content =
-            GetOutputFileContent(name_, "second_insert", file, context);
-        if (insert_endlines) {
-          GlobalReplaceSubstring(",", ",\n", &content);
-        }
-        if (annotate) {
-          auto* annotation = info.add_annotation();
-          annotation->set_begin(0);
-          annotation->set_end(content.size());
-          annotation->set_source_file("second_path");
-        }
-        std::unique_ptr<io::ZeroCopyOutputStream> output(
-            context->OpenForInsertWithGeneratedCodeInfo(
-                GetOutputFileName(insert_into[i], file),
-                kSecondInsertionPointName, info));
-        io::Printer printer(output.get(), '$');
-        printer.PrintRaw(content);
-        if (printer.failed()) {
-          *error = "MockCodeGenerator detected write error.";
-          return false;
-        }
-      }
-    }
-  } else {
-    std::unique_ptr<io::ZeroCopyOutputStream> output(
-        context->Open(GetOutputFileName(name_, file)));
-
-    GeneratedCodeInfo annotations;
-    io::AnnotationProtoCollector<GeneratedCodeInfo> annotation_collector(
-        &annotations);
-    io::Printer printer(output.get(), '$',
-                        annotate ? &annotation_collector : nullptr);
-    printer.PrintRaw(GetOutputFileContent(name_, parameter, file, context));
-    std::string annotate_suffix = "_annotation";
-    if (annotate) {
-      printer.Print("$p$\n", "p", "first");
-      printer.Annotate("p", "first" + annotate_suffix);
-    }
-    printer.PrintRaw(kFirstInsertionPoint);
-    if (annotate) {
-      printer.Print("$p$\n", "p", "second");
-      printer.Annotate("p", "second" + annotate_suffix);
-    }
-    printer.PrintRaw(kSecondInsertionPoint);
-    if (annotate) {
-      printer.Print("$p$\n", "p", "third");
-      printer.Annotate("p", "third" + annotate_suffix);
-    }
-
-    if (printer.failed()) {
-      *error = "MockCodeGenerator detected write error.";
-      return false;
-    }
-    if (annotate) {
-      std::unique_ptr<io::ZeroCopyOutputStream> meta_output(
-          context->Open(GetOutputFileName(name_, file) + ".pb.meta"));
-      if (!TextFormat::Print(annotations, meta_output.get())) {
-        *error = "MockCodeGenerator couldn't write .pb.meta";
-        return false;
-      }
-    }
-  }
-
-  return true;
-}
-
-std::string MockCodeGenerator::GetOutputFileName(
-    const std::string& generator_name, const FileDescriptor* file) {
-  return GetOutputFileName(generator_name, file->name());
-}
-
-std::string MockCodeGenerator::GetOutputFileName(
-    const std::string& generator_name, const std::string& file) {
-  return file + ".MockCodeGenerator." + generator_name;
-}
-
-std::string MockCodeGenerator::GetOutputFileContent(
-    const std::string& generator_name, const std::string& parameter,
-    const FileDescriptor* file, GeneratorContext* context) {
-  std::vector<const FileDescriptor*> all_files;
-  context->ListParsedFiles(&all_files);
-  return GetOutputFileContent(
-      generator_name, parameter, file->name(), CommaSeparatedList(all_files),
-      file->message_type_count() > 0 ? file->message_type(0)->name()
-                                     : "(none)");
-}
-
-std::string MockCodeGenerator::GetOutputFileContent(
-    const std::string& generator_name, const std::string& parameter,
-    const std::string& file, const std::string& parsed_file_list,
-    const std::string& first_message_name) {
-  return strings::Substitute("$0: $1, $2, $3, $4\n", generator_name, parameter,
-                          file, first_message_name, parsed_file_list);
-}
-
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/compiler/mock_code_generator.h b/libs/protobuf/src/google/protobuf/compiler/mock_code_generator.h
deleted file mode 100644
index 45d735a..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/mock_code_generator.h
+++ /dev/null
@@ -1,136 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-
-#ifndef GOOGLE_PROTOBUF_COMPILER_MOCK_CODE_GENERATOR_H__
-#define GOOGLE_PROTOBUF_COMPILER_MOCK_CODE_GENERATOR_H__
-
-#include <cstdint>
-#include <string>
-
-#include <google/protobuf/compiler/code_generator.h>
-
-namespace google {
-namespace protobuf {
-class FileDescriptor;
-}  // namespace protobuf
-}  // namespace google
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-
-// A mock CodeGenerator, used by command_line_interface_unittest.  This is in
-// its own file so that it can be used both directly and as a plugin.
-//
-// Generate() produces some output which can be checked by ExpectCalled().  The
-// generator can run in a different process (e.g. a plugin).
-//
-// If the parameter is "insert=NAMES", the MockCodeGenerator will insert lines
-// into the files generated by other MockCodeGenerators instead of creating
-// its own file.  NAMES is a comma-separated list of the names of those other
-// MockCodeGenerators.  If the parameter is "insert_endlines=NAMES", the
-// MockCodeGenerator will insert data guaranteed to contain more than one
-// endline into the files generated by NAMES.
-//
-// MockCodeGenerator will also modify its behavior slightly if the input file
-// contains a message type with one of the following names:
-//   MockCodeGenerator_Error:  Causes Generate() to return false and set the
-//     error message to "Saw message type MockCodeGenerator_Error."
-//   MockCodeGenerator_Exit:  Generate() prints "Saw message type
-//     MockCodeGenerator_Exit." to stderr and then calls exit(123).
-//   MockCodeGenerator_Abort:  Generate() prints "Saw message type
-//     MockCodeGenerator_Abort." to stderr and then calls abort().
-//   MockCodeGenerator_HasSourceCodeInfo:  Causes Generate() to abort after
-//     printing "Saw message type MockCodeGenerator_HasSourceCodeInfo: FOO." to
-//     stderr, where FOO is "1" if the supplied FileDescriptorProto has source
-//     code info, and "0" otherwise.
-//   MockCodeGenerator_Annotate:  Generate() will add annotations to its output
-//     that can later be verified with CheckGeneratedAnnotations.
-class MockCodeGenerator : public CodeGenerator {
- public:
-  MockCodeGenerator(const std::string& name);
-  ~MockCodeGenerator() override;
-
-  // Expect (via gTest) that a MockCodeGenerator with the given name was called
-  // with the given parameters by inspecting the output location.
-  //
-  // |insertions| is a comma-separated list of names of MockCodeGenerators which
-  // should have inserted lines into this file.
-  // |parsed_file_list| is a comma-separated list of names of the files
-  // that are being compiled together in this run.
-  static void ExpectGenerated(const std::string& name,
-                              const std::string& parameter,
-                              const std::string& insertions,
-                              const std::string& file,
-                              const std::string& first_message_name,
-                              const std::string& parsed_file_list,
-                              const std::string& output_directory);
-
-  // Checks that the correct text ranges were annotated by the
-  // MockCodeGenerator_Annotate directive.
-  static void CheckGeneratedAnnotations(const std::string& name,
-                                        const std::string& file,
-                                        const std::string& output_directory);
-
-  // Get the name of the file which would be written by the given generator.
-  static std::string GetOutputFileName(const std::string& generator_name,
-                                       const FileDescriptor* file);
-  static std::string GetOutputFileName(const std::string& generator_name,
-                                       const std::string& file);
-
-  // implements CodeGenerator ----------------------------------------
-
-  bool Generate(const FileDescriptor* file, const std::string& parameter,
-                GeneratorContext* context, std::string* error) const override;
-
-  uint64_t GetSupportedFeatures() const override;
-  void SuppressFeatures(uint64_t features);
-
- private:
-  std::string name_;
-  uint64_t suppressed_features_ = 0;
-
-  static std::string GetOutputFileContent(const std::string& generator_name,
-                                          const std::string& parameter,
-                                          const FileDescriptor* file,
-                                          GeneratorContext* context);
-  static std::string GetOutputFileContent(
-      const std::string& generator_name, const std::string& parameter,
-      const std::string& file, const std::string& parsed_file_list,
-      const std::string& first_message_name);
-};
-
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // GOOGLE_PROTOBUF_COMPILER_MOCK_CODE_GENERATOR_H__
diff --git a/libs/protobuf/src/google/protobuf/compiler/objectivec/method_dump.sh b/libs/protobuf/src/google/protobuf/compiler/objectivec/method_dump.sh
deleted file mode 100755
index 193825d..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/objectivec/method_dump.sh
+++ /dev/null
@@ -1,179 +0,0 @@
-#!/bin/bash
-
-# Updates objectivec_nsobject_methods.h by generating a list of all of the properties
-# and methods on NSObject that Protobufs should not overload from iOS and macOS combined.
-#
-# The rules:
-#   - No property should ever be overloaded.
-#   - Do not overload any methods that have 0 args such as "autorelease".
-#   - Do not overload any methods that start with "set[A-Z]" and have 1 arg such as
-#     "setValuesForKeysWithDictionary:". Note that these will end up in the list as just
-#     the "proto field" name, so "setValuesForKeysWithDictionary:" will become
-#     "valuesForKeysWithDictionary".
-
-set -eu
-
-trim() {
-    local var="$*"
-    # remove leading whitespace characters
-    var="${var#"${var%%[![:space:]]*}"}"
-    # remove trailing whitespace characters
-    var="${var%"${var##*[![:space:]]}"}"
-    echo -n "$var"
-}
-
-objc_code=$(cat <<'END_CODE'
-#import <Foundation/Foundation.h>
-#import <objc/runtime.h>
-
-int main(int argc, const char * argv[]) {
-  @autoreleasepool {
-    Class cls = [NSObject class];
-
-    // List out the protocols on NSObject just so we are aware if they change.
-    unsigned int protocolCount;
-    __unsafe_unretained Protocol **protocols =
-        class_copyProtocolList(cls, &protocolCount);
-    for (unsigned int i = 0; i < protocolCount; i++) {
-      printf("// Protocol: %s\n", protocol_getName(protocols[i]));
-    }
-    free(protocols);
-
-    // Grab all the properties.
-    unsigned int propCount;
-    objc_property_t *props = class_copyPropertyList(cls, &propCount);
-    NSMutableSet *reservedNames = [[NSMutableSet alloc] init];
-    for (unsigned int i = 0; i < propCount; ++i) {
-      NSString *propertyName = [NSString stringWithUTF8String:property_getName(props[i])];
-      [reservedNames addObject:propertyName];
-    }
-    free(props);
-
-    // Note that methods have 2 defaults args (_cmd and SEL) so a method "0 arg method"
-    // actually has 2.
-    unsigned int methodCount;
-    Method *methods = class_copyMethodList(cls, &methodCount);
-    for (unsigned int i = 0; i < methodCount; ++i) {
-      int argCount = method_getNumberOfArguments(methods[i]);
-      NSString *methodName =
-          [NSString stringWithUTF8String:sel_getName(method_getName(methods[i]))];
-      if (argCount == 2) {
-        [reservedNames addObject:methodName];
-      }
-      if (argCount == 3 && [methodName hasPrefix:@"set"] && methodName.length > 4) {
-        NSString *firstLetter = [methodName substringWithRange:NSMakeRange(3,1)];
-        NSString *lowerFirstLetter = [firstLetter lowercaseString];
-        if ([lowerFirstLetter isEqual:firstLetter]) {
-          // Make sure the next letter is a capital letter so we do not take things like
-          // settingSomething:
-          continue;
-        }
-        // -5 because 3 for set, 1 for the firstLetter and 1 for the colon on the end.
-        NSString *restOfString =
-            [methodName substringWithRange:NSMakeRange(4, methodName.length - 5)];
-        methodName = [lowerFirstLetter stringByAppendingString:restOfString];
-        [reservedNames addObject:methodName];
-      }
-    }
-    free(methods);
-
-    SEL sortSelector = @selector(caseInsensitiveCompare:);
-    NSArray *array = [reservedNames.allObjects sortedArrayUsingSelector:sortSelector];
-    for (NSString *item in array) {
-      // Some items with _ in them get returned in quotes, so do not add more.
-      if ([item hasPrefix:@"\""]) {
-        printf("\t%s,\n", item.UTF8String);
-      } else {
-        printf("\t\"%s\",\n", item.UTF8String);
-      }
-    }
-  }
-  return 0;
-}
-END_CODE
-)
-
-file_header=$(cat <<'END_HEADER'
-// NSObject methods
-// Autogenerated by method_dump.sh. Do not edit by hand.
-// Date: %DATE%
-// macOS: %MACOS%
-// iOS: %IOS%
-
-const char* const kNSObjectMethodsList[] = {
-END_HEADER
-)
-
-file_footer=$(cat <<'END_FOOTER'
-};
-END_FOOTER
-)
-
-# Check to make sure we are updating the correct file.
-if [[ ! -e "objectivec_nsobject_methods.h" ]]; then
-  echo "error: Must be run in the src/google/protobuf/compiler/objectivec directory"
-  exit 1
-fi
-
-temp_dir=$(mktemp -d)
-
-echo "$objc_code" >> "$temp_dir"/method_dump.m
-
-# Compile up iphonesimulator and macos version of cmd line app.
-iphone_simulator_sdk=$(xcrun --sdk iphonesimulator --show-sdk-path)
-clang -isysroot "$iphone_simulator_sdk" -o "$temp_dir"/method_dump_ios \
-    -framework Foundation -framework UIKit "$temp_dir"/method_dump.m
-macos_sdk=$(xcrun --sdk macosx --show-sdk-path)
-clang -isysroot "$macos_sdk" -o "$temp_dir"/method_dump_macos -framework Foundation \
-    -framework Cocoa "$temp_dir"/method_dump.m
-
-# Create a device of the latest phone and iphonesimulator SDK and run our iOS cmd line.
-device_type=$(xcrun simctl list devicetypes | grep \.iPhone- | tail -1 | sed 's/.*(\(.*\))/\1/')
-# runtimes come with a space at the end (for Xcode 10) so let's trim all of our input to
-# be safe.
-device_type=$(trim "$device_type")
-runtime=$(xcrun simctl list runtimes | grep \.iOS- | tail -1 | \
-    sed 's/.*\(com\.apple.\CoreSimulator\.SimRuntime\.iOS.*\)/\1/')
-runtime=$(trim "$runtime")
-uuid=$(uuidgen)
-device_name="method_dump_device_$uuid"
-device=$(xcrun simctl create "$device_name" "$device_type" "$runtime")
-xcrun simctl spawn "$device" "$temp_dir"/method_dump_ios > "$temp_dir"/methods_unsorted_ios.txt
-xcrun simctl delete "$device"
-
-# Run the Mac version
-"$temp_dir"/method_dump_macos >> "$temp_dir"/methods_unsorted_macos.txt
-
-# Generate sorted output
-echo "$file_header" | sed -e "s|%DATE%|$(date)|" -e "s|%MACOS%|$(basename $macos_sdk)|" \
-    -e "s|%IOS%|$(basename $iphone_simulator_sdk)|" > "$temp_dir"/methods_sorted.txt
-sort -u "$temp_dir"/methods_unsorted_ios.txt \
-    "$temp_dir"/methods_unsorted_macos.txt >> "$temp_dir"/methods_sorted.txt
-echo $"$file_footer" >> "$temp_dir"/methods_sorted.txt
-
-# Check for differences. Turn off error checking because we expect diff to fail when
-# there are no differences.
-set +e
-diff_out=$(diff -I "^//.*$" "$temp_dir"/methods_sorted.txt objectivec_nsobject_methods.h)
-removed_methods=$(echo "$diff_out" | grep '^>.*$')
-set -e
-if [[ -n "$removed_methods" ]]; then
-  echo "error: Methods removed from NSObject"
-  echo "It appears that some methods may have been removed from NSObject."
-  echo "This could mean that there may be some backwards compatibility issues."
-  echo "You could potentially build apps that may not work on earlier systems than:"
-  echo "$iphone_simulator_sdk"
-  echo "$macos_sdk"
-  echo "If they declare protobuf types that use any of the following as names:"
-  echo "$removed_methods"
-  echo ""
-  echo "New Version: $temp_dir/methods_sorted.txt"
-  echo "Old Version: objectivec_nsobject_methods.h"
-  exit 1
-fi
-if [[ -n "$diff_out" ]]; then
-  echo "Added Methods:"
-  echo "$(echo "$diff_out" | grep '^<.*$' | sed -e 's/^< "\(.*\)",$/  \1/')"
-fi;
-cp "$temp_dir"/methods_sorted.txt objectivec_nsobject_methods.h
-rm -rf "$temp_dir"
diff --git a/libs/protobuf/src/google/protobuf/compiler/objectivec/objectivec_enum.cc b/libs/protobuf/src/google/protobuf/compiler/objectivec/objectivec_enum.cc
deleted file mode 100644
index ea8f394..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/objectivec/objectivec_enum.cc
+++ /dev/null
@@ -1,260 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <map>
-#include <string>
-
-#include <google/protobuf/compiler/objectivec/objectivec_enum.h>
-#include <google/protobuf/compiler/objectivec/objectivec_helpers.h>
-#include <google/protobuf/io/printer.h>
-#include <google/protobuf/stubs/strutil.h>
-#include <algorithm> // std::find()
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace objectivec {
-
-EnumGenerator::EnumGenerator(const EnumDescriptor* descriptor)
-    : descriptor_(descriptor),
-      name_(EnumName(descriptor_)) {
-  // Track the names for the enum values, and if an alias overlaps a base
-  // value, skip making a name for it. Likewise if two alias overlap, the
-  // first one wins.
-  // The one gap in this logic is if two base values overlap, but for that
-  // to happen you have to have "Foo" and "FOO" or "FOO_BAR" and "FooBar",
-  // and if an enum has that, it is already going to be confusing and a
-  // compile error is just fine.
-  // The values are still tracked to support the reflection apis and
-  // TextFormat handing since they are different there.
-  std::set<std::string> value_names;
-
-  for (int i = 0; i < descriptor_->value_count(); i++) {
-    const EnumValueDescriptor* value = descriptor_->value(i);
-    const EnumValueDescriptor* canonical_value =
-        descriptor_->FindValueByNumber(value->number());
-
-    if (value == canonical_value) {
-      base_values_.push_back(value);
-      value_names.insert(EnumValueName(value));
-    } else {
-      std::string value_name(EnumValueName(value));
-      if (value_names.find(value_name) != value_names.end()) {
-        alias_values_to_skip_.insert(value);
-      } else {
-        value_names.insert(value_name);
-      }
-    }
-    all_values_.push_back(value);
-  }
-}
-
-EnumGenerator::~EnumGenerator() {}
-
-void EnumGenerator::GenerateHeader(io::Printer* printer) {
-  std::string enum_comments;
-  SourceLocation location;
-  if (descriptor_->GetSourceLocation(&location)) {
-    enum_comments = BuildCommentsString(location, true);
-  } else {
-    enum_comments = "";
-  }
-
-  printer->Print(
-      "#pragma mark - Enum $name$\n"
-      "\n",
-      "name", name_);
-
-  // Swift 5 included SE0192 "Handling Future Enum Cases"
-  //   https://github.com/apple/swift-evolution/blob/master/proposals/0192-non-exhaustive-enums.md
-  // Since a .proto file can get new values added to an enum at any time, they
-  // are effectively "non-frozen". Even in a proto3 syntax file where there is
-  // support for the unknown value, an edit to the file can always add a new
-  // value moving something from unknown to known. Since Swift is now ABI
-  // stable, it also means a binary could contain Swift compiled against one
-  // version of the .pbobjc.h file, but finally linked against an enum with
-  // more cases. So the Swift code will always have to treat ObjC Proto Enums
-  // as "non-frozen". The default behavior in SE0192 is for all objc enums to
-  // be "non-frozen" unless marked as otherwise, so this means this generation
-  // doesn't have to bother with the `enum_extensibility` attribute, as the
-  // default will be what is needed.
-
-  printer->Print("$comments$typedef$deprecated_attribute$ GPB_ENUM($name$) {\n",
-                 "comments", enum_comments,
-                 "deprecated_attribute", GetOptionalDeprecatedAttribute(descriptor_, descriptor_->file()),
-                 "name", name_);
-  printer->Indent();
-
-  if (HasPreservingUnknownEnumSemantics(descriptor_->file())) {
-    // Include the unknown value.
-    printer->Print(
-      "/**\n"
-      " * Value used if any message's field encounters a value that is not defined\n"
-      " * by this enum. The message will also have C functions to get/set the rawValue\n"
-      " * of the field.\n"
-      " **/\n"
-      "$name$_GPBUnrecognizedEnumeratorValue = kGPBUnrecognizedEnumeratorValue,\n",
-      "name", name_);
-  }
-  for (int i = 0; i < all_values_.size(); i++) {
-    if (alias_values_to_skip_.find(all_values_[i]) != alias_values_to_skip_.end()) {
-      continue;
-    }
-    if (all_values_[i]->GetSourceLocation(&location)) {
-      std::string comments = BuildCommentsString(location, true).c_str();
-      if (comments.length() > 0) {
-        if (i > 0) {
-          printer->Print("\n");
-        }
-        printer->Print(comments.c_str());
-      }
-    }
-
-    printer->Print(
-        "$name$$deprecated_attribute$ = $value$,\n",
-        "name", EnumValueName(all_values_[i]),
-        "deprecated_attribute", GetOptionalDeprecatedAttribute(all_values_[i]),
-        "value", StrCat(all_values_[i]->number()));
-  }
-  printer->Outdent();
-  printer->Print(
-      "};\n"
-      "\n"
-      "GPBEnumDescriptor *$name$_EnumDescriptor(void);\n"
-      "\n"
-      "/**\n"
-      " * Checks to see if the given value is defined by the enum or was not known at\n"
-      " * the time this source was generated.\n"
-      " **/\n"
-      "BOOL $name$_IsValidValue(int32_t value);\n"
-      "\n",
-      "name", name_);
-}
-
-void EnumGenerator::GenerateSource(io::Printer* printer) {
-  printer->Print(
-      "#pragma mark - Enum $name$\n"
-      "\n",
-      "name", name_);
-
-  // Note: For the TextFormat decode info, we can't use the enum value as
-  // the key because protocol buffer enums have 'allow_alias', which lets
-  // a value be used more than once. Instead, the index into the list of
-  // enum value descriptions is used. Note: start with -1 so the first one
-  // will be zero.
-  TextFormatDecodeData text_format_decode_data;
-  int enum_value_description_key = -1;
-  std::string text_blob;
-
-  for (int i = 0; i < all_values_.size(); i++) {
-    ++enum_value_description_key;
-    std::string short_name(EnumValueShortName(all_values_[i]));
-    text_blob += short_name + '\0';
-    if (UnCamelCaseEnumShortName(short_name) != all_values_[i]->name()) {
-      text_format_decode_data.AddString(enum_value_description_key, short_name,
-                                        all_values_[i]->name());
-    }
-  }
-
-  printer->Print(
-      "GPBEnumDescriptor *$name$_EnumDescriptor(void) {\n"
-      "  static _Atomic(GPBEnumDescriptor*) descriptor = nil;\n"
-      "  if (!descriptor) {\n",
-      "name", name_);
-
-  static const int kBytesPerLine = 40;  // allow for escaping
-  printer->Print(
-      "    static const char *valueNames =");
-  for (int i = 0; i < text_blob.size(); i += kBytesPerLine) {
-    printer->Print(
-        "\n        \"$data$\"",
-        "data", EscapeTrigraphs(CEscape(text_blob.substr(i, kBytesPerLine))));
-  }
-  printer->Print(
-      ";\n"
-      "    static const int32_t values[] = {\n");
-  for (int i = 0; i < all_values_.size(); i++) {
-    printer->Print("        $name$,\n",  "name", EnumValueName(all_values_[i]));
-  }
-  printer->Print("    };\n");
-
-  if (text_format_decode_data.num_entries() == 0) {
-    printer->Print(
-        "    GPBEnumDescriptor *worker =\n"
-        "        [GPBEnumDescriptor allocDescriptorForName:GPBNSStringifySymbol($name$)\n"
-        "                                       valueNames:valueNames\n"
-        "                                           values:values\n"
-        "                                            count:(uint32_t)(sizeof(values) / sizeof(int32_t))\n"
-        "                                     enumVerifier:$name$_IsValidValue];\n",
-        "name", name_);
-    } else {
-      printer->Print(
-        "    static const char *extraTextFormatInfo = \"$extraTextFormatInfo$\";\n"
-        "    GPBEnumDescriptor *worker =\n"
-        "        [GPBEnumDescriptor allocDescriptorForName:GPBNSStringifySymbol($name$)\n"
-        "                                       valueNames:valueNames\n"
-        "                                           values:values\n"
-        "                                            count:(uint32_t)(sizeof(values) / sizeof(int32_t))\n"
-        "                                     enumVerifier:$name$_IsValidValue\n"
-        "                              extraTextFormatInfo:extraTextFormatInfo];\n",
-        "name", name_,
-        "extraTextFormatInfo", CEscape(text_format_decode_data.Data()));
-    }
-    printer->Print(
-      "    GPBEnumDescriptor *expected = nil;\n"
-      "    if (!atomic_compare_exchange_strong(&descriptor, &expected, worker)) {\n"
-      "      [worker release];\n"
-      "    }\n"
-      "  }\n"
-      "  return descriptor;\n"
-      "}\n\n");
-
-  printer->Print(
-      "BOOL $name$_IsValidValue(int32_t value__) {\n"
-      "  switch (value__) {\n",
-      "name", name_);
-
-  for (int i = 0; i < base_values_.size(); i++) {
-    printer->Print(
-        "    case $name$:\n",
-        "name", EnumValueName(base_values_[i]));
-  }
-
-  printer->Print(
-      "      return YES;\n"
-      "    default:\n"
-      "      return NO;\n"
-      "  }\n"
-      "}\n\n");
-}
-}  // namespace objectivec
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/compiler/objectivec/objectivec_enum.h b/libs/protobuf/src/google/protobuf/compiler/objectivec/objectivec_enum.h
deleted file mode 100644
index 1d5741a..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/objectivec/objectivec_enum.h
+++ /dev/null
@@ -1,71 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef GOOGLE_PROTOBUF_COMPILER_OBJECTIVEC_ENUM_H__
-#define GOOGLE_PROTOBUF_COMPILER_OBJECTIVEC_ENUM_H__
-
-#include <string>
-#include <set>
-#include <vector>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/io/printer.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace objectivec {
-
-class EnumGenerator {
- public:
-  explicit EnumGenerator(const EnumDescriptor* descriptor);
-  ~EnumGenerator();
-
-  EnumGenerator(const EnumGenerator&) = delete;
-  EnumGenerator& operator=(const EnumGenerator&) = delete;
-
-  void GenerateHeader(io::Printer* printer);
-  void GenerateSource(io::Printer* printer);
-
-  const std::string& name() const { return name_; }
-
- private:
-  const EnumDescriptor* descriptor_;
-  std::vector<const EnumValueDescriptor*> base_values_;
-  std::vector<const EnumValueDescriptor*> all_values_;
-  std::set<const EnumValueDescriptor*> alias_values_to_skip_;
-  const std::string name_;
-};
-
-}  // namespace objectivec
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // GOOGLE_PROTOBUF_COMPILER_OBJECTIVEC_ENUM_H__
diff --git a/libs/protobuf/src/google/protobuf/compiler/objectivec/objectivec_enum_field.cc b/libs/protobuf/src/google/protobuf/compiler/objectivec/objectivec_enum_field.cc
deleted file mode 100644
index 6e0d69b..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/objectivec/objectivec_enum_field.cc
+++ /dev/null
@@ -1,151 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <map>
-#include <string>
-
-#include <google/protobuf/compiler/objectivec/objectivec_enum_field.h>
-#include <google/protobuf/compiler/objectivec/objectivec_helpers.h>
-#include <google/protobuf/io/printer.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace objectivec {
-
-namespace {
-
-void SetEnumVariables(const FieldDescriptor* descriptor,
-                      std::map<std::string, std::string>* variables) {
-  std::string type = EnumName(descriptor->enum_type());
-  (*variables)["storage_type"] = type;
-  // For non repeated fields, if it was defined in a different file, the
-  // property decls need to use "enum NAME" rather than just "NAME" to support
-  // the forward declaration of the enums.
-  if (!descriptor->is_repeated() &&
-      (descriptor->file() != descriptor->enum_type()->file())) {
-    (*variables)["property_type"] = "enum " + type;
-  }
-  (*variables)["enum_verifier"] = type + "_IsValidValue";
-  (*variables)["enum_desc_func"] = type + "_EnumDescriptor";
-
-  (*variables)["dataTypeSpecific_name"] = "enumDescFunc";
-  (*variables)["dataTypeSpecific_value"] = (*variables)["enum_desc_func"];
-
-  const Descriptor* msg_descriptor = descriptor->containing_type();
-  (*variables)["owning_message_class"] = ClassName(msg_descriptor);
-}
-}  // namespace
-
-EnumFieldGenerator::EnumFieldGenerator(const FieldDescriptor* descriptor)
-    : SingleFieldGenerator(descriptor) {
-  SetEnumVariables(descriptor, &variables_);
-}
-
-EnumFieldGenerator::~EnumFieldGenerator() {}
-
-void EnumFieldGenerator::GenerateCFunctionDeclarations(
-    io::Printer* printer) const {
-  if (!HasPreservingUnknownEnumSemantics(descriptor_->file())) {
-    return;
-  }
-
-  printer->Print(
-      variables_,
-      "/**\n"
-      " * Fetches the raw value of a @c $owning_message_class$'s @c $name$ property, even\n"
-      " * if the value was not defined by the enum at the time the code was generated.\n"
-      " **/\n"
-      "int32_t $owning_message_class$_$capitalized_name$_RawValue($owning_message_class$ *message);\n"
-      "/**\n"
-      " * Sets the raw value of an @c $owning_message_class$'s @c $name$ property, allowing\n"
-      " * it to be set to a value that was not defined by the enum at the time the code\n"
-      " * was generated.\n"
-      " **/\n"
-      "void Set$owning_message_class$_$capitalized_name$_RawValue($owning_message_class$ *message, int32_t value);\n"
-      "\n");
-}
-
-void EnumFieldGenerator::GenerateCFunctionImplementations(
-    io::Printer* printer) const {
-  if (!HasPreservingUnknownEnumSemantics(descriptor_->file())) return;
-
-  printer->Print(
-      variables_,
-      "int32_t $owning_message_class$_$capitalized_name$_RawValue($owning_message_class$ *message) {\n"
-      "  GPBDescriptor *descriptor = [$owning_message_class$ descriptor];\n"
-      "  GPBFieldDescriptor *field = [descriptor fieldWithNumber:$field_number_name$];\n"
-      "  return GPBGetMessageRawEnumField(message, field);\n"
-      "}\n"
-      "\n"
-      "void Set$owning_message_class$_$capitalized_name$_RawValue($owning_message_class$ *message, int32_t value) {\n"
-      "  GPBDescriptor *descriptor = [$owning_message_class$ descriptor];\n"
-      "  GPBFieldDescriptor *field = [descriptor fieldWithNumber:$field_number_name$];\n"
-      "  GPBSetMessageRawEnumField(message, field, value);\n"
-      "}\n"
-      "\n");
-}
-
-void EnumFieldGenerator::DetermineForwardDeclarations(
-    std::set<std::string>* fwd_decls,
-    bool include_external_types) const {
-  SingleFieldGenerator::DetermineForwardDeclarations(
-      fwd_decls, include_external_types);
-  // If it is an enum defined in a different file (and not a WKT), then we'll
-  // need a forward declaration for it.  When it is in our file, all the enums
-  // are output before the message, so it will be declared before it is needed.
-  if (include_external_types &&
-      descriptor_->file() != descriptor_->enum_type()->file() &&
-      !IsProtobufLibraryBundledProtoFile(descriptor_->enum_type()->file())) {
-    // Enum name is already in "storage_type".
-    const std::string& name = variable("storage_type");
-    fwd_decls->insert("GPB_ENUM_FWD_DECLARE(" + name + ")");
-  }
-}
-
-RepeatedEnumFieldGenerator::RepeatedEnumFieldGenerator(
-    const FieldDescriptor* descriptor)
-    : RepeatedFieldGenerator(descriptor) {
-  SetEnumVariables(descriptor, &variables_);
-  variables_["array_storage_type"] = "GPBEnumArray";
-}
-
-RepeatedEnumFieldGenerator::~RepeatedEnumFieldGenerator() {}
-
-void RepeatedEnumFieldGenerator::FinishInitialization(void) {
-  RepeatedFieldGenerator::FinishInitialization();
-  variables_["array_comment"] =
-      "// |" + variables_["name"] + "| contains |" + variables_["storage_type"] + "|\n";
-}
-
-}  // namespace objectivec
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/compiler/objectivec/objectivec_enum_field.h b/libs/protobuf/src/google/protobuf/compiler/objectivec/objectivec_enum_field.h
deleted file mode 100644
index f0d685c..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/objectivec/objectivec_enum_field.h
+++ /dev/null
@@ -1,78 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef GOOGLE_PROTOBUF_COMPILER_OBJECTIVEC_ENUM_FIELD_H__
-#define GOOGLE_PROTOBUF_COMPILER_OBJECTIVEC_ENUM_FIELD_H__
-
-#include <map>
-#include <string>
-#include <google/protobuf/compiler/objectivec/objectivec_field.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace objectivec {
-
-class EnumFieldGenerator : public SingleFieldGenerator {
-  friend FieldGenerator* FieldGenerator::Make(const FieldDescriptor* field);
-
-  EnumFieldGenerator(const EnumFieldGenerator&) = delete;
-  EnumFieldGenerator& operator=(const EnumFieldGenerator&) = delete;
-
- public:
-  virtual void GenerateCFunctionDeclarations(
-      io::Printer* printer) const override;
-  virtual void GenerateCFunctionImplementations(
-      io::Printer* printer) const override;
-  virtual void DetermineForwardDeclarations(
-      std::set<std::string>* fwd_decls,
-      bool include_external_types) const override;
-
- protected:
-  explicit EnumFieldGenerator(const FieldDescriptor* descriptor);
-  virtual ~EnumFieldGenerator();
-};
-
-class RepeatedEnumFieldGenerator : public RepeatedFieldGenerator {
-  friend FieldGenerator* FieldGenerator::Make(const FieldDescriptor* field);
-
- public:
-  virtual void FinishInitialization() override;
-
- protected:
-  explicit RepeatedEnumFieldGenerator(const FieldDescriptor* descriptor);
-  virtual ~RepeatedEnumFieldGenerator();
-};
-
-}  // namespace objectivec
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-#endif  // GOOGLE_PROTOBUF_COMPILER_OBJECTIVEC_ENUM_FIELD_H__
diff --git a/libs/protobuf/src/google/protobuf/compiler/objectivec/objectivec_extension.cc b/libs/protobuf/src/google/protobuf/compiler/objectivec/objectivec_extension.cc
deleted file mode 100644
index 9cebcb2..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/objectivec/objectivec_extension.cc
+++ /dev/null
@@ -1,156 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <iostream>
-
-#include <google/protobuf/compiler/objectivec/objectivec_extension.h>
-#include <google/protobuf/compiler/objectivec/objectivec_helpers.h>
-#include <google/protobuf/descriptor.pb.h>
-#include <google/protobuf/stubs/strutil.h>
-#include <google/protobuf/io/printer.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace objectivec {
-
-ExtensionGenerator::ExtensionGenerator(const std::string& root_class_name,
-                                       const FieldDescriptor* descriptor)
-    : method_name_(ExtensionMethodName(descriptor)),
-      root_class_and_method_name_(root_class_name + "_" + method_name_),
-      descriptor_(descriptor) {
-  if (descriptor->is_map()) {
-    // NOTE: src/google/protobuf/compiler/plugin.cc makes use of cerr for some
-    // error cases, so it seems to be ok to use as a back door for errors.
-    std::cerr << "error: Extension is a map<>!"
-         << " That used to be blocked by the compiler." << std::endl;
-    std::cerr.flush();
-    abort();
-  }
-}
-
-ExtensionGenerator::~ExtensionGenerator() {}
-
-void ExtensionGenerator::GenerateMembersHeader(io::Printer* printer) {
-  std::map<std::string, std::string> vars;
-  vars["method_name"] = method_name_;
-  if (IsRetainedName(method_name_)) {
-    vars["storage_attribute"] = " NS_RETURNS_NOT_RETAINED";
-  } else {
-    vars["storage_attribute"] = "";
-  }
-  SourceLocation location;
-  if (descriptor_->GetSourceLocation(&location)) {
-    vars["comments"] = BuildCommentsString(location, true);
-  } else {
-    vars["comments"] = "";
-  }
-  // Unlike normal message fields, check if the file for the extension was
-  // deprecated.
-  vars["deprecated_attribute"] = GetOptionalDeprecatedAttribute(descriptor_, descriptor_->file());
-  printer->Print(vars,
-                 "$comments$"
-                 "+ (GPBExtensionDescriptor *)$method_name$$storage_attribute$$deprecated_attribute$;\n");
-}
-
-void ExtensionGenerator::GenerateStaticVariablesInitialization(
-    io::Printer* printer) {
-  std::map<std::string, std::string> vars;
-  vars["root_class_and_method_name"] = root_class_and_method_name_;
-  const std::string containing_type = ClassName(descriptor_->containing_type());
-  vars["extended_type"] = ObjCClass(containing_type);
-  vars["number"] = StrCat(descriptor_->number());
-
-  std::vector<std::string> options;
-  if (descriptor_->is_repeated()) options.push_back("GPBExtensionRepeated");
-  if (descriptor_->is_packed()) options.push_back("GPBExtensionPacked");
-  if (descriptor_->containing_type()->options().message_set_wire_format()) {
-    options.push_back("GPBExtensionSetWireFormat");
-  }
-  vars["options"] = BuildFlagsString(FLAGTYPE_EXTENSION, options);
-
-  ObjectiveCType objc_type = GetObjectiveCType(descriptor_);
-  if (objc_type == OBJECTIVECTYPE_MESSAGE) {
-    std::string message_type = ClassName(descriptor_->message_type());
-    vars["type"] = ObjCClass(message_type);
-  } else {
-    vars["type"] = "Nil";
-  }
-
-  vars["default_name"] = GPBGenericValueFieldName(descriptor_);
-  if (descriptor_->is_repeated()) {
-    vars["default"] = "nil";
-  } else {
-    vars["default"] = DefaultValue(descriptor_);
-  }
-  std::string type = GetCapitalizedType(descriptor_);
-  vars["extension_type"] = std::string("GPBDataType") + type;
-
-  if (objc_type == OBJECTIVECTYPE_ENUM) {
-    vars["enum_desc_func_name"] =
-         EnumName(descriptor_->enum_type()) + "_EnumDescriptor";
-  } else {
-    vars["enum_desc_func_name"] = "NULL";
-  }
-
-  printer->Print(vars,
-                 "{\n"
-                 "  .defaultValue.$default_name$ = $default$,\n"
-                 "  .singletonName = GPBStringifySymbol($root_class_and_method_name$),\n"
-                 "  .extendedClass.clazz = $extended_type$,\n"
-                 "  .messageOrGroupClass.clazz = $type$,\n"
-                 "  .enumDescriptorFunc = $enum_desc_func_name$,\n"
-                 "  .fieldNumber = $number$,\n"
-                 "  .dataType = $extension_type$,\n"
-                 "  .options = $options$,\n"
-                 "},\n");
-}
-
-void ExtensionGenerator::DetermineObjectiveCClassDefinitions(
-    std::set<std::string>* fwd_decls) {
-  std::string extended_type = ClassName(descriptor_->containing_type());
-  fwd_decls->insert(ObjCClassDeclaration(extended_type));
-  ObjectiveCType objc_type = GetObjectiveCType(descriptor_);
-  if (objc_type == OBJECTIVECTYPE_MESSAGE) {
-    std::string message_type = ClassName(descriptor_->message_type());
-    fwd_decls->insert(ObjCClassDeclaration(message_type));
-  }
-}
-
-void ExtensionGenerator::GenerateRegistrationSource(io::Printer* printer) {
-  printer->Print(
-      "[registry addExtension:$root_class_and_method_name$];\n",
-      "root_class_and_method_name", root_class_and_method_name_);
-}
-
-}  // namespace objectivec
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/compiler/objectivec/objectivec_extension.h b/libs/protobuf/src/google/protobuf/compiler/objectivec/objectivec_extension.h
deleted file mode 100644
index d412f4a..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/objectivec/objectivec_extension.h
+++ /dev/null
@@ -1,67 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef GOOGLE_PROTOBUF_COMPILER_OBJECTIVEC_EXTENSION_H__
-#define GOOGLE_PROTOBUF_COMPILER_OBJECTIVEC_EXTENSION_H__
-
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/io/printer.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace objectivec {
-
-class ExtensionGenerator {
- public:
-  ExtensionGenerator(const std::string& root_class_name,
-                     const FieldDescriptor* descriptor);
-  ~ExtensionGenerator();
-
-  ExtensionGenerator(const ExtensionGenerator&) = delete;
-  ExtensionGenerator& operator=(const ExtensionGenerator&) = delete;
-
-  void GenerateMembersHeader(io::Printer* printer);
-  void GenerateStaticVariablesInitialization(io::Printer* printer);
-  void GenerateRegistrationSource(io::Printer* printer);
-  void DetermineObjectiveCClassDefinitions(std::set<std::string>* fwd_decls);
-
- private:
-  std::string method_name_;
-  std::string root_class_and_method_name_;
-  const FieldDescriptor* descriptor_;
-};
-
-}  // namespace objectivec
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // GOOGLE_PROTOBUF_COMPILER_OBJECTIVEC_MESSAGE_H__
diff --git a/libs/protobuf/src/google/protobuf/compiler/objectivec/objectivec_field.cc b/libs/protobuf/src/google/protobuf/compiler/objectivec/objectivec_field.cc
deleted file mode 100644
index 004ea19..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/objectivec/objectivec_field.cc
+++ /dev/null
@@ -1,470 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <iostream>
-
-#include <google/protobuf/compiler/objectivec/objectivec_field.h>
-#include <google/protobuf/compiler/objectivec/objectivec_helpers.h>
-#include <google/protobuf/compiler/objectivec/objectivec_enum_field.h>
-#include <google/protobuf/compiler/objectivec/objectivec_map_field.h>
-#include <google/protobuf/compiler/objectivec/objectivec_message_field.h>
-#include <google/protobuf/compiler/objectivec/objectivec_primitive_field.h>
-#include <google/protobuf/io/printer.h>
-#include <google/protobuf/stubs/strutil.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace objectivec {
-
-namespace {
-
-void SetCommonFieldVariables(const FieldDescriptor* descriptor,
-                             std::map<std::string, std::string>* variables) {
-  std::string camel_case_name = FieldName(descriptor);
-  std::string raw_field_name;
-  if (descriptor->type() == FieldDescriptor::TYPE_GROUP) {
-    raw_field_name = descriptor->message_type()->name();
-  } else {
-    raw_field_name = descriptor->name();
-  }
-  // The logic here has to match -[GGPBFieldDescriptor textFormatName].
-  const std::string un_camel_case_name(
-      UnCamelCaseFieldName(camel_case_name, descriptor));
-  const bool needs_custom_name = (raw_field_name != un_camel_case_name);
-
-  SourceLocation location;
-  if (descriptor->GetSourceLocation(&location)) {
-    (*variables)["comments"] = BuildCommentsString(location, true);
-  } else {
-    (*variables)["comments"] = "\n";
-  }
-  const std::string& classname = ClassName(descriptor->containing_type());
-  (*variables)["classname"] = classname;
-  (*variables)["name"] = camel_case_name;
-  const std::string& capitalized_name = FieldNameCapitalized(descriptor);
-  (*variables)["capitalized_name"] = capitalized_name;
-  (*variables)["raw_field_name"] = raw_field_name;
-  (*variables)["field_number_name"] =
-      classname + "_FieldNumber_" + capitalized_name;
-  (*variables)["field_number"] = StrCat(descriptor->number());
-  (*variables)["field_type"] = GetCapitalizedType(descriptor);
-  (*variables)["deprecated_attribute"] = GetOptionalDeprecatedAttribute(descriptor);
-  std::vector<std::string> field_flags;
-  if (descriptor->is_repeated()) field_flags.push_back("GPBFieldRepeated");
-  if (descriptor->is_required()) field_flags.push_back("GPBFieldRequired");
-  if (descriptor->is_optional()) field_flags.push_back("GPBFieldOptional");
-  if (descriptor->is_packed()) field_flags.push_back("GPBFieldPacked");
-
-  // ObjC custom flags.
-  if (descriptor->has_default_value())
-    field_flags.push_back("GPBFieldHasDefaultValue");
-  if (needs_custom_name) field_flags.push_back("GPBFieldTextFormatNameCustom");
-  if (descriptor->type() == FieldDescriptor::TYPE_ENUM) {
-    field_flags.push_back("GPBFieldHasEnumDescriptor");
-  }
-  // It will clear on a zero value if...
-  //  - not repeated/map
-  //  - doesn't have presence
-  bool clear_on_zero =
-      (!descriptor->is_repeated() && !descriptor->has_presence());
-  if (clear_on_zero) {
-    field_flags.push_back("GPBFieldClearHasIvarOnZero");
-  }
-
-  (*variables)["fieldflags"] = BuildFlagsString(FLAGTYPE_FIELD, field_flags);
-
-  (*variables)["default"] = DefaultValue(descriptor);
-  (*variables)["default_name"] = GPBGenericValueFieldName(descriptor);
-
-  (*variables)["dataTypeSpecific_name"] = "clazz";
-  (*variables)["dataTypeSpecific_value"] = "Nil";
-
-  (*variables)["storage_offset_value"] =
-      "(uint32_t)offsetof(" + classname + "__storage_, " + camel_case_name + ")";
-  (*variables)["storage_offset_comment"] = "";
-
-  // Clear some common things so they can be set just when needed.
-  (*variables)["storage_attribute"] = "";
-}
-
-}  // namespace
-
-FieldGenerator* FieldGenerator::Make(const FieldDescriptor* field) {
-  FieldGenerator* result = NULL;
-  if (field->is_repeated()) {
-    switch (GetObjectiveCType(field)) {
-      case OBJECTIVECTYPE_MESSAGE: {
-        if (field->is_map()) {
-          result = new MapFieldGenerator(field);
-        } else {
-          result = new RepeatedMessageFieldGenerator(field);
-        }
-        break;
-      }
-      case OBJECTIVECTYPE_ENUM:
-        result = new RepeatedEnumFieldGenerator(field);
-        break;
-      default:
-        result = new RepeatedPrimitiveFieldGenerator(field);
-        break;
-    }
-  } else {
-    switch (GetObjectiveCType(field)) {
-      case OBJECTIVECTYPE_MESSAGE: {
-        result = new MessageFieldGenerator(field);
-        break;
-      }
-      case OBJECTIVECTYPE_ENUM:
-        result = new EnumFieldGenerator(field);
-        break;
-      default:
-        if (IsReferenceType(field)) {
-          result = new PrimitiveObjFieldGenerator(field);
-        } else {
-          result = new PrimitiveFieldGenerator(field);
-        }
-        break;
-    }
-  }
-  result->FinishInitialization();
-  return result;
-}
-
-FieldGenerator::FieldGenerator(const FieldDescriptor* descriptor)
-    : descriptor_(descriptor) {
-  SetCommonFieldVariables(descriptor, &variables_);
-}
-
-FieldGenerator::~FieldGenerator() {}
-
-void FieldGenerator::GenerateFieldNumberConstant(io::Printer* printer) const {
-  printer->Print(
-      variables_,
-      "$field_number_name$ = $field_number$,\n");
-}
-
-void FieldGenerator::GenerateCFunctionDeclarations(
-    io::Printer* printer) const {
-  // Nothing
-}
-
-void FieldGenerator::GenerateCFunctionImplementations(
-    io::Printer* printer) const {
-  // Nothing
-}
-
-void FieldGenerator::DetermineForwardDeclarations(
-    std::set<std::string>* fwd_decls,
-    bool include_external_types) const {
-  // Nothing
-}
-
-void FieldGenerator::DetermineObjectiveCClassDefinitions(
-    std::set<std::string>* fwd_decls) const {
-  // Nothing
-}
-
-void FieldGenerator::GenerateFieldDescription(
-    io::Printer* printer, bool include_default) const {
-  // Printed in the same order as the structure decl.
-  if (include_default) {
-    printer->Print(
-        variables_,
-        "{\n"
-        "  .defaultValue.$default_name$ = $default$,\n"
-        "  .core.name = \"$name$\",\n"
-        "  .core.dataTypeSpecific.$dataTypeSpecific_name$ = $dataTypeSpecific_value$,\n"
-        "  .core.number = $field_number_name$,\n"
-        "  .core.hasIndex = $has_index$,\n"
-        "  .core.offset = $storage_offset_value$,$storage_offset_comment$\n"
-        "  .core.flags = $fieldflags$,\n"
-        "  .core.dataType = GPBDataType$field_type$,\n"
-        "},\n");
-  } else {
-    printer->Print(
-        variables_,
-        "{\n"
-        "  .name = \"$name$\",\n"
-        "  .dataTypeSpecific.$dataTypeSpecific_name$ = $dataTypeSpecific_value$,\n"
-        "  .number = $field_number_name$,\n"
-        "  .hasIndex = $has_index$,\n"
-        "  .offset = $storage_offset_value$,$storage_offset_comment$\n"
-        "  .flags = $fieldflags$,\n"
-        "  .dataType = GPBDataType$field_type$,\n"
-        "},\n");
-  }
-}
-
-void FieldGenerator::SetRuntimeHasBit(int has_index) {
-  variables_["has_index"] = StrCat(has_index);
-}
-
-void FieldGenerator::SetNoHasBit(void) {
-  variables_["has_index"] = "GPBNoHasBit";
-}
-
-int FieldGenerator::ExtraRuntimeHasBitsNeeded(void) const {
-  return 0;
-}
-
-void FieldGenerator::SetExtraRuntimeHasBitsBase(int index_base) {
-  // NOTE: src/google/protobuf/compiler/plugin.cc makes use of cerr for some
-  // error cases, so it seems to be ok to use as a back door for errors.
-  std::cerr << "Error: should have overridden SetExtraRuntimeHasBitsBase()." << std::endl;
-  std::cerr.flush();
-  abort();
-}
-
-void FieldGenerator::SetOneofIndexBase(int index_base) {
-  const OneofDescriptor* oneof = descriptor_->real_containing_oneof();
-  if (oneof != NULL) {
-    int index = oneof->index() + index_base;
-    // Flip the sign to mark it as a oneof.
-    variables_["has_index"] = StrCat(-index);
-  }
-}
-
-bool FieldGenerator::WantsHasProperty(void) const {
-  return descriptor_->has_presence() && !descriptor_->real_containing_oneof();
-}
-
-void FieldGenerator::FinishInitialization(void) {
-  // If "property_type" wasn't set, make it "storage_type".
-  if ((variables_.find("property_type") == variables_.end()) &&
-      (variables_.find("storage_type") != variables_.end())) {
-    variables_["property_type"] = variable("storage_type");
-  }
-}
-
-SingleFieldGenerator::SingleFieldGenerator(const FieldDescriptor* descriptor)
-    : FieldGenerator(descriptor) {
-  // Nothing
-}
-
-SingleFieldGenerator::~SingleFieldGenerator() {}
-
-void SingleFieldGenerator::GenerateFieldStorageDeclaration(
-    io::Printer* printer) const {
-  printer->Print(variables_, "$storage_type$ $name$;\n");
-}
-
-void SingleFieldGenerator::GeneratePropertyDeclaration(
-    io::Printer* printer) const {
-  printer->Print(variables_, "$comments$");
-  printer->Print(
-      variables_,
-      "@property(nonatomic, readwrite) $property_type$ $name$$deprecated_attribute$;\n"
-      "\n");
-  if (WantsHasProperty()) {
-    printer->Print(
-        variables_,
-        "@property(nonatomic, readwrite) BOOL has$capitalized_name$$deprecated_attribute$;\n");
-  }
-}
-
-void SingleFieldGenerator::GeneratePropertyImplementation(
-    io::Printer* printer) const {
-  if (WantsHasProperty()) {
-    printer->Print(variables_, "@dynamic has$capitalized_name$, $name$;\n");
-  } else {
-    printer->Print(variables_, "@dynamic $name$;\n");
-  }
-}
-
-bool SingleFieldGenerator::RuntimeUsesHasBit(void) const {
-  if (descriptor_->real_containing_oneof()) {
-    // The oneof tracks what is set instead.
-    return false;
-  }
-  return true;
-}
-
-ObjCObjFieldGenerator::ObjCObjFieldGenerator(const FieldDescriptor* descriptor)
-    : SingleFieldGenerator(descriptor) {
-  variables_["property_storage_attribute"] = "strong";
-  if (IsRetainedName(variables_["name"])) {
-    variables_["storage_attribute"] = " NS_RETURNS_NOT_RETAINED";
-  }
-}
-
-ObjCObjFieldGenerator::~ObjCObjFieldGenerator() {}
-
-void ObjCObjFieldGenerator::GenerateFieldStorageDeclaration(
-    io::Printer* printer) const {
-  printer->Print(variables_, "$storage_type$ *$name$;\n");
-}
-
-void ObjCObjFieldGenerator::GeneratePropertyDeclaration(
-    io::Printer* printer) const {
-
-  // Differs from SingleFieldGenerator::GeneratePropertyDeclaration() in that
-  // it uses pointers and deals with Objective C's rules around storage name
-  // conventions (init*, new*, etc.)
-
-  printer->Print(variables_, "$comments$");
-  printer->Print(
-      variables_,
-      "@property(nonatomic, readwrite, $property_storage_attribute$, null_resettable) $property_type$ *$name$$storage_attribute$$deprecated_attribute$;\n");
-  if (WantsHasProperty()) {
-    printer->Print(
-        variables_,
-        "/** Test to see if @c $name$ has been set. */\n"
-        "@property(nonatomic, readwrite) BOOL has$capitalized_name$$deprecated_attribute$;\n");
-  }
-  if (IsInitName(variables_.find("name")->second)) {
-    // If property name starts with init we need to annotate it to get past ARC.
-    // http://stackoverflow.com/questions/18723226/how-do-i-annotate-an-objective-c-property-with-an-objc-method-family/18723227#18723227
-    printer->Print(variables_,
-                   "- ($property_type$ *)$name$ GPB_METHOD_FAMILY_NONE$deprecated_attribute$;\n");
-  }
-  printer->Print("\n");
-}
-
-RepeatedFieldGenerator::RepeatedFieldGenerator(
-    const FieldDescriptor* descriptor)
-    : ObjCObjFieldGenerator(descriptor) {
-  // Default to no comment and let the cases needing it fill it in.
-  variables_["array_comment"] = "";
-}
-
-RepeatedFieldGenerator::~RepeatedFieldGenerator() {}
-
-void RepeatedFieldGenerator::FinishInitialization(void) {
-  FieldGenerator::FinishInitialization();
-  if (variables_.find("array_property_type") == variables_.end()) {
-    variables_["array_property_type"] = variable("array_storage_type");
-  }
-}
-
-void RepeatedFieldGenerator::GenerateFieldStorageDeclaration(
-    io::Printer* printer) const {
-  printer->Print(variables_, "$array_storage_type$ *$name$;\n");
-}
-
-void RepeatedFieldGenerator::GeneratePropertyImplementation(
-    io::Printer* printer) const {
-  printer->Print(variables_, "@dynamic $name$, $name$_Count;\n");
-}
-
-void RepeatedFieldGenerator::GeneratePropertyDeclaration(
-    io::Printer* printer) const {
-
-  // Repeated fields don't need the has* properties, but they do expose a
-  // *Count (to check without autocreation).  So for the field property we need
-  // the same logic as ObjCObjFieldGenerator::GeneratePropertyDeclaration() for
-  // dealing with needing Objective C's rules around storage name conventions
-  // (init*, new*, etc.)
-
-  printer->Print(
-      variables_,
-      "$comments$"
-      "$array_comment$"
-      "@property(nonatomic, readwrite, strong, null_resettable) $array_property_type$ *$name$$storage_attribute$$deprecated_attribute$;\n"
-      "/** The number of items in @c $name$ without causing the array to be created. */\n"
-      "@property(nonatomic, readonly) NSUInteger $name$_Count$deprecated_attribute$;\n");
-  if (IsInitName(variables_.find("name")->second)) {
-    // If property name starts with init we need to annotate it to get past ARC.
-    // http://stackoverflow.com/questions/18723226/how-do-i-annotate-an-objective-c-property-with-an-objc-method-family/18723227#18723227
-    printer->Print(variables_,
-                   "- ($array_property_type$ *)$name$ GPB_METHOD_FAMILY_NONE$deprecated_attribute$;\n");
-  }
-  printer->Print("\n");
-}
-
-bool RepeatedFieldGenerator::RuntimeUsesHasBit(void) const {
-  return false;  // The array (or map/dict) having anything is what is used.
-}
-
-FieldGeneratorMap::FieldGeneratorMap(const Descriptor* descriptor)
-    : descriptor_(descriptor),
-      field_generators_(descriptor->field_count()),
-      extension_generators_(descriptor->extension_count()) {
-  // Construct all the FieldGenerators.
-  for (int i = 0; i < descriptor->field_count(); i++) {
-    field_generators_[i].reset(
-        FieldGenerator::Make(descriptor->field(i)));
-  }
-  for (int i = 0; i < descriptor->extension_count(); i++) {
-    extension_generators_[i].reset(
-        FieldGenerator::Make(descriptor->extension(i)));
-  }
-}
-
-FieldGeneratorMap::~FieldGeneratorMap() {}
-
-const FieldGenerator& FieldGeneratorMap::get(
-    const FieldDescriptor* field) const {
-  GOOGLE_CHECK_EQ(field->containing_type(), descriptor_);
-  return *field_generators_[field->index()];
-}
-
-const FieldGenerator& FieldGeneratorMap::get_extension(int index) const {
-  return *extension_generators_[index];
-}
-
-int FieldGeneratorMap::CalculateHasBits(void) {
-  int total_bits = 0;
-  for (int i = 0; i < descriptor_->field_count(); i++) {
-    if (field_generators_[i]->RuntimeUsesHasBit()) {
-      field_generators_[i]->SetRuntimeHasBit(total_bits);
-      ++total_bits;
-    } else {
-      field_generators_[i]->SetNoHasBit();
-    }
-    int extra_bits = field_generators_[i]->ExtraRuntimeHasBitsNeeded();
-    if (extra_bits) {
-      field_generators_[i]->SetExtraRuntimeHasBitsBase(total_bits);
-      total_bits += extra_bits;
-    }
-  }
-  return total_bits;
-}
-
-void FieldGeneratorMap::SetOneofIndexBase(int index_base) {
-  for (int i = 0; i < descriptor_->field_count(); i++) {
-    field_generators_[i]->SetOneofIndexBase(index_base);
-  }
-}
-
-bool FieldGeneratorMap::DoesAnyFieldHaveNonZeroDefault(void) const {
-  for (int i = 0; i < descriptor_->field_count(); i++) {
-    if (HasNonZeroDefaultValue(descriptor_->field(i))) {
-      return true;
-    }
-  }
-
-  return false;
-}
-
-}  // namespace objectivec
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/compiler/objectivec/objectivec_field.h b/libs/protobuf/src/google/protobuf/compiler/objectivec/objectivec_field.h
deleted file mode 100644
index 759ef80..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/objectivec/objectivec_field.h
+++ /dev/null
@@ -1,190 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef GOOGLE_PROTOBUF_COMPILER_OBJECTIVEC_FIELD_H__
-#define GOOGLE_PROTOBUF_COMPILER_OBJECTIVEC_FIELD_H__
-
-#include <map>
-#include <string>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/io/printer.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace objectivec {
-
-class FieldGenerator {
- public:
-  static FieldGenerator* Make(const FieldDescriptor* field);
-
-  virtual ~FieldGenerator();
-
-  FieldGenerator(const FieldGenerator&) = delete;
-  FieldGenerator& operator=(const FieldGenerator&) = delete;
-
-  // Exposed for subclasses to fill in.
-  virtual void GenerateFieldStorageDeclaration(io::Printer* printer) const = 0;
-  virtual void GeneratePropertyDeclaration(io::Printer* printer) const = 0;
-  virtual void GeneratePropertyImplementation(io::Printer* printer) const = 0;
-
-  // Called by GenerateFieldDescription, exposed for classes that need custom
-  // generation.
-
-  // Exposed for subclasses to extend, base does nothing.
-  virtual void GenerateCFunctionDeclarations(io::Printer* printer) const;
-  virtual void GenerateCFunctionImplementations(io::Printer* printer) const;
-
-  // Exposed for subclasses, should always call it on the parent class also.
-  virtual void DetermineForwardDeclarations(
-      std::set<std::string>* fwd_decls,
-      bool include_external_types) const;
-  virtual void DetermineObjectiveCClassDefinitions(
-      std::set<std::string>* fwd_decls) const;
-
-  // Used during generation, not intended to be extended by subclasses.
-  void GenerateFieldDescription(
-      io::Printer* printer, bool include_default) const;
-  void GenerateFieldNumberConstant(io::Printer* printer) const;
-
-  // Exposed to get and set the has bits information.
-  virtual bool RuntimeUsesHasBit(void) const = 0;
-  void SetRuntimeHasBit(int has_index);
-  void SetNoHasBit(void);
-  virtual int ExtraRuntimeHasBitsNeeded(void) const;
-  virtual void SetExtraRuntimeHasBitsBase(int index_base);
-  void SetOneofIndexBase(int index_base);
-
-  std::string variable(const char* key) const {
-    return variables_.find(key)->second;
-  }
-
-  bool needs_textformat_name_support() const {
-    const std::string& field_flags = variable("fieldflags");
-    return field_flags.find("GPBFieldTextFormatNameCustom") !=
-           std::string::npos;
-  }
-  std::string generated_objc_name() const { return variable("name"); }
-  std::string raw_field_name() const { return variable("raw_field_name"); }
-
- protected:
-  explicit FieldGenerator(const FieldDescriptor* descriptor);
-
-  virtual void FinishInitialization(void);
-  bool WantsHasProperty(void) const;
-
-  const FieldDescriptor* descriptor_;
-  std::map<std::string, std::string> variables_;
-};
-
-class SingleFieldGenerator : public FieldGenerator {
- public:
-  virtual ~SingleFieldGenerator();
-
-  SingleFieldGenerator(const SingleFieldGenerator&) = delete;
-  SingleFieldGenerator& operator=(const SingleFieldGenerator&) = delete;
-
-  virtual void GenerateFieldStorageDeclaration(io::Printer* printer) const override;
-  virtual void GeneratePropertyDeclaration(io::Printer* printer) const override;
-
-  virtual void GeneratePropertyImplementation(io::Printer* printer) const override;
-
-  virtual bool RuntimeUsesHasBit(void) const override;
-
- protected:
-  explicit SingleFieldGenerator(const FieldDescriptor* descriptor);
-};
-
-// Subclass with common support for when the field ends up as an ObjC Object.
-class ObjCObjFieldGenerator : public SingleFieldGenerator {
- public:
-  virtual ~ObjCObjFieldGenerator();
-
-  ObjCObjFieldGenerator(const ObjCObjFieldGenerator&) = delete;
-  ObjCObjFieldGenerator& operator=(const ObjCObjFieldGenerator&) = delete;
-
-  virtual void GenerateFieldStorageDeclaration(io::Printer* printer) const override;
-  virtual void GeneratePropertyDeclaration(io::Printer* printer) const override;
-
- protected:
-  explicit ObjCObjFieldGenerator(const FieldDescriptor* descriptor);
-};
-
-class RepeatedFieldGenerator : public ObjCObjFieldGenerator {
- public:
-  virtual ~RepeatedFieldGenerator();
-
-  RepeatedFieldGenerator(const RepeatedFieldGenerator&) = delete;
-  RepeatedFieldGenerator& operator=(const RepeatedFieldGenerator&) = delete;
-
-  virtual void GenerateFieldStorageDeclaration(io::Printer* printer) const override;
-  virtual void GeneratePropertyDeclaration(io::Printer* printer) const override;
-
-  virtual void GeneratePropertyImplementation(io::Printer* printer) const override;
-
-  virtual bool RuntimeUsesHasBit(void) const override;
-
- protected:
-  explicit RepeatedFieldGenerator(const FieldDescriptor* descriptor);
-  virtual void FinishInitialization(void) override;
-};
-
-// Convenience class which constructs FieldGenerators for a Descriptor.
-class FieldGeneratorMap {
- public:
-  explicit FieldGeneratorMap(const Descriptor* descriptor);
-  ~FieldGeneratorMap();
-
-  FieldGeneratorMap(const FieldGeneratorMap&) = delete;
-  FieldGeneratorMap& operator=(const FieldGeneratorMap&) = delete;
-
-  const FieldGenerator& get(const FieldDescriptor* field) const;
-  const FieldGenerator& get_extension(int index) const;
-
-  // Assigns the has bits and returns the number of bits needed.
-  int CalculateHasBits(void);
-
-  void SetOneofIndexBase(int index_base);
-
-  // Check if any field of this message has a non zero default.
-  bool DoesAnyFieldHaveNonZeroDefault(void) const;
-
- private:
-  const Descriptor* descriptor_;
-  std::vector<std::unique_ptr<FieldGenerator>> field_generators_;
-  std::vector<std::unique_ptr<FieldGenerator>> extension_generators_;
-};
-
-}  // namespace objectivec
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // GOOGLE_PROTOBUF_COMPILER_OBJECTIVEC_FIELD_H__
diff --git a/libs/protobuf/src/google/protobuf/compiler/objectivec/objectivec_file.cc b/libs/protobuf/src/google/protobuf/compiler/objectivec/objectivec_file.cc
deleted file mode 100644
index 50b4285..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/objectivec/objectivec_file.cc
+++ /dev/null
@@ -1,681 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <google/protobuf/compiler/objectivec/objectivec_file.h>
-#include <google/protobuf/compiler/objectivec/objectivec_enum.h>
-#include <google/protobuf/compiler/objectivec/objectivec_extension.h>
-#include <google/protobuf/compiler/objectivec/objectivec_helpers.h>
-#include <google/protobuf/compiler/objectivec/objectivec_message.h>
-#include <google/protobuf/compiler/code_generator.h>
-#include <google/protobuf/io/printer.h>
-#include <google/protobuf/io/zero_copy_stream_impl.h>
-#include <google/protobuf/stubs/stl_util.h>
-#include <google/protobuf/stubs/strutil.h>
-#include <algorithm> // std::find()
-#include <iostream>
-#include <sstream>
-
-// NOTE: src/google/protobuf/compiler/plugin.cc makes use of cerr for some
-// error cases, so it seems to be ok to use as a back door for errors.
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace objectivec {
-
-namespace {
-
-// This is also found in GPBBootstrap.h, and needs to be kept in sync.
-const int32_t GOOGLE_PROTOBUF_OBJC_VERSION = 30004;
-
-const char* kHeaderExtension = ".pbobjc.h";
-
-std::string BundledFileName(const FileDescriptor* file) {
-  return "GPB" + FilePathBasename(file) + kHeaderExtension;
-}
-
-// Checks if a message contains any enums definitions (on the message or
-// a nested message under it).
-bool MessageContainsEnums(const Descriptor* message) {
-  if (message->enum_type_count() > 0) {
-    return true;
-  }
-  for (int i = 0; i < message->nested_type_count(); i++) {
-    if (MessageContainsEnums(message->nested_type(i))) {
-      return true;
-    }
-  }
-  return false;
-}
-
-// Checks if a message contains any extension definitions (on the message or
-// a nested message under it).
-bool MessageContainsExtensions(const Descriptor* message) {
-  if (message->extension_count() > 0) {
-    return true;
-  }
-  for (int i = 0; i < message->nested_type_count(); i++) {
-    if (MessageContainsExtensions(message->nested_type(i))) {
-      return true;
-    }
-  }
-  return false;
-}
-
-// Checks if the file contains any enum definitions (at the root or
-// nested under a message).
-bool FileContainsEnums(const FileDescriptor* file) {
-  if (file->enum_type_count() > 0) {
-    return true;
-  }
-  for (int i = 0; i < file->message_type_count(); i++) {
-    if (MessageContainsEnums(file->message_type(i))) {
-      return true;
-    }
-  }
-  return false;
-}
-
-// Checks if the file contains any extensions definitions (at the root or
-// nested under a message).
-bool FileContainsExtensions(const FileDescriptor* file) {
-  if (file->extension_count() > 0) {
-    return true;
-  }
-  for (int i = 0; i < file->message_type_count(); i++) {
-    if (MessageContainsExtensions(file->message_type(i))) {
-      return true;
-    }
-  }
-  return false;
-}
-
-bool IsDirectDependency(const FileDescriptor* dep, const FileDescriptor* file) {
-  for (int i = 0; i < file->dependency_count(); i++) {
-    if (dep == file->dependency(i)) {
-      return true;
-    }
-  }
-  return false;
-}
-
-struct FileDescriptorsOrderedByName {
-  inline bool operator()(const FileDescriptor* a,
-                         const FileDescriptor* b) const {
-    return a->name() < b->name();
-  }
-};
-
-}  // namespace
-
-FileGenerator::CommonState::CommonState() { }
-
-const FileGenerator::CommonState::MinDepsEntry&
-FileGenerator::CommonState::CollectMinimalFileDepsContainingExtensionsInternal(
-    const FileDescriptor* file) {
-  auto it = deps_info_cache_.find(file);
-  if (it != deps_info_cache_.end()) {
-    return it->second;
-  }
-
-  std::set<const FileDescriptor*> min_deps_collector;
-  std::set<const FileDescriptor*> covered_deps_collector;
-  std::set<const FileDescriptor*> to_prune;
-  for (int i = 0; i < file->dependency_count(); i++) {
-    const FileDescriptor* dep = file->dependency(i);
-    MinDepsEntry dep_info =
-        CollectMinimalFileDepsContainingExtensionsInternal(dep);
-
-    // Everything the dep covered, this file will also cover.
-    covered_deps_collector.insert(dep_info.covered_deps.begin(), dep_info.covered_deps.end());
-    // Prune everything from the dep's covered list in case another dep lists it
-    // as a min dep.
-    to_prune.insert(dep_info.covered_deps.begin(), dep_info.covered_deps.end());
-
-    // Does the dep have any extensions...
-    if (dep_info.has_extensions) {
-      // Yes -> Add this file, prune its min_deps and add them to the covered deps.
-      min_deps_collector.insert(dep);
-      to_prune.insert(dep_info.min_deps.begin(), dep_info.min_deps.end());
-      covered_deps_collector.insert(dep_info.min_deps.begin(), dep_info.min_deps.end());
-    } else {
-      // No -> Just use its min_deps.
-      min_deps_collector.insert(dep_info.min_deps.begin(), dep_info.min_deps.end());
-    }
-  }
-
-  const bool file_has_exts = FileContainsExtensions(file);
-
-  // Fast path: if nothing to prune or there was only one dep, the prune work is
-  // a waste, skip it.
-  if (to_prune.empty() || file->dependency_count() == 1) {
-    return deps_info_cache_.insert(
-        {file, {file_has_exts, min_deps_collector, covered_deps_collector}}).first->second;
-  }
-
-  std::set<const FileDescriptor*> min_deps;
-  std::copy_if(min_deps_collector.begin(), min_deps_collector.end(),
-               std::inserter(min_deps, min_deps.end()),
-               [&](const FileDescriptor* value){
-    return to_prune.find(value) == to_prune.end();
-  });
-  return deps_info_cache_.insert(
-      {file, {file_has_exts, min_deps, covered_deps_collector}}).first->second;
-}
-
-// Collect the deps of the given file that contain extensions. This can be used to
-// create the chain of roots that need to be wired together.
-//
-// NOTE: If any changes are made to this and the supporting functions, you will
-// need to manually validate what the generated code is for the test files:
-//   objectivec/Tests/unittest_extension_chain_*.proto
-// There are comments about what the expected code should be line and limited
-// testing objectivec/Tests/GPBUnittestProtos2.m around compilation (#imports
-// specifically).
-const std::vector<const FileDescriptor*>
-FileGenerator::CommonState::CollectMinimalFileDepsContainingExtensions(
-    const FileDescriptor* file) {
-  std::set<const FileDescriptor*> min_deps =
-    CollectMinimalFileDepsContainingExtensionsInternal(file).min_deps;
-  // Sort the list since pointer order isn't stable across runs.
-  std::vector<const FileDescriptor*> result(min_deps.begin(), min_deps.end());
-  std::sort(result.begin(), result.end(), FileDescriptorsOrderedByName());
-  return result;
-}
-
-FileGenerator::FileGenerator(const FileDescriptor* file,
-                             const GenerationOptions& generation_options,
-                             CommonState& common_state)
-    : file_(file),
-      generation_options_(generation_options),
-      common_state_(common_state),
-      root_class_name_(FileClassName(file)),
-      is_bundled_proto_(IsProtobufLibraryBundledProtoFile(file)) {
-  for (int i = 0; i < file_->enum_type_count(); i++) {
-    EnumGenerator* generator = new EnumGenerator(file_->enum_type(i));
-    enum_generators_.emplace_back(generator);
-  }
-  for (int i = 0; i < file_->message_type_count(); i++) {
-    MessageGenerator* generator =
-        new MessageGenerator(root_class_name_, file_->message_type(i));
-    message_generators_.emplace_back(generator);
-  }
-  for (int i = 0; i < file_->extension_count(); i++) {
-    ExtensionGenerator* generator =
-        new ExtensionGenerator(root_class_name_, file_->extension(i));
-    extension_generators_.emplace_back(generator);
-  }
-}
-
-FileGenerator::~FileGenerator() {}
-
-void FileGenerator::GenerateHeader(io::Printer* printer) {
-  std::vector<std::string> headers;
-  // Generated files bundled with the library get minimal imports, everything
-  // else gets the wrapper so everything is usable.
-  if (is_bundled_proto_) {
-    headers.push_back("GPBDescriptor.h");
-    headers.push_back("GPBMessage.h");
-    headers.push_back("GPBRootObject.h");
-    for (int i = 0; i < file_->dependency_count(); i++) {
-      const std::string header_name = BundledFileName(file_->dependency(i));
-      headers.push_back(header_name);
-    }
-  } else {
-    headers.push_back("GPBProtocolBuffers.h");
-  }
-  PrintFileRuntimePreamble(printer, headers);
-
-  // Add some verification that the generated code matches the source the
-  // code is being compiled with.
-  // NOTE: This captures the raw numeric values at the time the generator was
-  // compiled, since that will be the versions for the ObjC runtime at that
-  // time.  The constants in the generated code will then get their values at
-  // at compile time (so checking against the headers being used to compile).
-  printer->Print(
-      "#if GOOGLE_PROTOBUF_OBJC_VERSION < $google_protobuf_objc_version$\n"
-      "#error This file was generated by a newer version of protoc which is incompatible with your Protocol Buffer library sources.\n"
-      "#endif\n"
-      "#if $google_protobuf_objc_version$ < GOOGLE_PROTOBUF_OBJC_MIN_SUPPORTED_VERSION\n"
-      "#error This file was generated by an older version of protoc which is incompatible with your Protocol Buffer library sources.\n"
-      "#endif\n"
-      "\n",
-      "google_protobuf_objc_version", StrCat(GOOGLE_PROTOBUF_OBJC_VERSION));
-
-  // The bundled protos (WKTs) don't use of forward declarations.
-  bool headers_use_forward_declarations =
-      generation_options_.headers_use_forward_declarations && !is_bundled_proto_;
-
-  {
-    ImportWriter import_writer(
-        generation_options_.generate_for_named_framework,
-        generation_options_.named_framework_to_proto_path_mappings_path,
-        generation_options_.runtime_import_prefix,
-        /* include_wkt_imports = */ false);
-    const std::string header_extension(kHeaderExtension);
-    if (headers_use_forward_declarations) {
-      // #import any headers for "public imports" in the proto file.
-      for (int i = 0; i < file_->public_dependency_count(); i++) {
-        import_writer.AddFile(file_->public_dependency(i), header_extension);
-      }
-    } else {
-      for (int i = 0; i < file_->dependency_count(); i++) {
-        import_writer.AddFile(file_->dependency(i), header_extension);
-      }
-    }
-    import_writer.Print(printer);
-  }
-
-  // Note:
-  //  deprecated-declarations suppression is only needed if some place in this
-  //    proto file is something deprecated or if it references something from
-  //    another file that is deprecated.
-  printer->Print(
-      "// @@protoc_insertion_point(imports)\n"
-      "\n"
-      "#pragma clang diagnostic push\n"
-      "#pragma clang diagnostic ignored \"-Wdeprecated-declarations\"\n"
-      "\n"
-      "CF_EXTERN_C_BEGIN\n"
-      "\n");
-
-  std::set<std::string> fwd_decls;
-  for (const auto& generator : message_generators_) {
-    generator->DetermineForwardDeclarations(
-        &fwd_decls,
-        /* include_external_types = */ headers_use_forward_declarations);
-  }
-  for (std::set<std::string>::const_iterator i(fwd_decls.begin());
-       i != fwd_decls.end(); ++i) {
-    printer->Print("$value$;\n", "value", *i);
-  }
-  if (fwd_decls.begin() != fwd_decls.end()) {
-    printer->Print("\n");
-  }
-
-  printer->Print(
-      "NS_ASSUME_NONNULL_BEGIN\n"
-      "\n");
-
-  // need to write out all enums first
-  for (const auto& generator : enum_generators_) {
-    generator->GenerateHeader(printer);
-  }
-
-  for (const auto& generator : message_generators_) {
-    generator->GenerateEnumHeader(printer);
-  }
-
-  // For extensions to chain together, the Root gets created even if there
-  // are no extensions.
-  printer->Print(
-      "#pragma mark - $root_class_name$\n"
-      "\n"
-      "/**\n"
-      " * Exposes the extension registry for this file.\n"
-      " *\n"
-      " * The base class provides:\n"
-      " * @code\n"
-      " *   + (GPBExtensionRegistry *)extensionRegistry;\n"
-      " * @endcode\n"
-      " * which is a @c GPBExtensionRegistry that includes all the extensions defined by\n"
-      " * this file and all files that it depends on.\n"
-      " **/\n"
-      "GPB_FINAL @interface $root_class_name$ : GPBRootObject\n"
-      "@end\n"
-      "\n",
-      "root_class_name", root_class_name_);
-
-  if (!extension_generators_.empty()) {
-    // The dynamic methods block is only needed if there are extensions.
-    printer->Print(
-        "@interface $root_class_name$ (DynamicMethods)\n",
-        "root_class_name", root_class_name_);
-
-    for (const auto& generator : extension_generators_) {
-      generator->GenerateMembersHeader(printer);
-    }
-
-    printer->Print("@end\n\n");
-  }  // !extension_generators_.empty()
-
-  for (const auto& generator : message_generators_) {
-    generator->GenerateMessageHeader(printer);
-  }
-
-  printer->Print(
-      "NS_ASSUME_NONNULL_END\n"
-      "\n"
-      "CF_EXTERN_C_END\n"
-      "\n"
-      "#pragma clang diagnostic pop\n"
-      "\n"
-      "// @@protoc_insertion_point(global_scope)\n");
-}
-
-void FileGenerator::GenerateSource(io::Printer* printer) {
-  // #import the runtime support.
-  std::vector<std::string> headers;
-  headers.push_back("GPBProtocolBuffers_RuntimeSupport.h");
-  if (is_bundled_proto_) {
-    headers.push_back(BundledFileName(file_));
-  }
-  PrintFileRuntimePreamble(printer, headers);
-
-  // Enums use atomic in the generated code, so add the system import as needed.
-  if (FileContainsEnums(file_)) {
-    printer->Print(
-        "#import <stdatomic.h>\n"
-        "\n");
-  }
-
-  std::vector<const FileDescriptor*> deps_with_extensions =
-    common_state_.CollectMinimalFileDepsContainingExtensions(file_);
-
-  // The bundled protos (WKTs) don't use of forward declarations.
-  bool headers_use_forward_declarations =
-      generation_options_.headers_use_forward_declarations && !is_bundled_proto_;
-
-  {
-    ImportWriter import_writer(
-        generation_options_.generate_for_named_framework,
-        generation_options_.named_framework_to_proto_path_mappings_path,
-        generation_options_.runtime_import_prefix,
-        /* include_wkt_imports = */ false);
-    const std::string header_extension(kHeaderExtension);
-
-    // #import the header for this proto file.
-    import_writer.AddFile(file_, header_extension);
-
-    if (headers_use_forward_declarations) {
-      // #import the headers for anything that a plain dependency of this proto
-      // file (that means they were just an include, not a "public" include).
-      std::set<std::string> public_import_names;
-      for (int i = 0; i < file_->public_dependency_count(); i++) {
-        public_import_names.insert(file_->public_dependency(i)->name());
-      }
-      for (int i = 0; i < file_->dependency_count(); i++) {
-        const FileDescriptor *dep = file_->dependency(i);
-        bool public_import = (public_import_names.count(dep->name()) != 0);
-        if (!public_import) {
-          import_writer.AddFile(dep, header_extension);
-        }
-      }
-    }
-
-    // If any indirect dependency provided extensions, it needs to be directly
-    // imported so it can get merged into the root's extensions registry.
-    // See the Note by CollectMinimalFileDepsContainingExtensions before
-    // changing this.
-    for (std::vector<const FileDescriptor*>::iterator iter =
-             deps_with_extensions.begin();
-         iter != deps_with_extensions.end(); ++iter) {
-      if (!IsDirectDependency(*iter, file_)) {
-        import_writer.AddFile(*iter, header_extension);
-      }
-    }
-
-    import_writer.Print(printer);
-  }
-
-  bool includes_oneof = false;
-  for (const auto& generator : message_generators_) {
-    if (generator->IncludesOneOfDefinition()) {
-      includes_oneof = true;
-      break;
-    }
-  }
-
-  std::set<std::string> fwd_decls;
-  for (const auto& generator : message_generators_) {
-    generator->DetermineObjectiveCClassDefinitions(&fwd_decls);
-  }
-  for (const auto& generator : extension_generators_) {
-    generator->DetermineObjectiveCClassDefinitions(&fwd_decls);
-  }
-
-  // Note:
-  //  deprecated-declarations suppression is only needed if some place in this
-  //    proto file is something deprecated or if it references something from
-  //    another file that is deprecated.
-  //  dollar-in-identifier-extension is needed because we use references to
-  //    objc class names that have $ in identifiers.
-  printer->Print(
-      "// @@protoc_insertion_point(imports)\n"
-      "\n"
-      "#pragma clang diagnostic push\n"
-      "#pragma clang diagnostic ignored \"-Wdeprecated-declarations\"\n");
-  if (includes_oneof) {
-    // The generated code for oneof's uses direct ivar access, suppress the
-    // warning in case developer turn that on in the context they compile the
-    // generated code.
-    printer->Print(
-        "#pragma clang diagnostic ignored \"-Wdirect-ivar-access\"\n");
-  }
-  if (!fwd_decls.empty()) {
-    printer->Print(
-      "#pragma clang diagnostic ignored \"-Wdollar-in-identifier-extension\"\n");
-  }
-  printer->Print(
-      "\n");
-  if (!fwd_decls.empty()) {
-    printer->Print(
-        "#pragma mark - Objective C Class declarations\n"
-        "// Forward declarations of Objective C classes that we can use as\n"
-        "// static values in struct initializers.\n"
-        "// We don't use [Foo class] because it is not a static value.\n");
-  }
-  for (const auto& i : fwd_decls) {
-    printer->Print("$value$\n", "value", i);
-  }
-  if (!fwd_decls.empty()) {
-    printer->Print("\n");
-  }
-  printer->Print(
-      "#pragma mark - $root_class_name$\n"
-      "\n"
-      "@implementation $root_class_name$\n\n",
-      "root_class_name", root_class_name_);
-
-  const bool file_contains_extensions = FileContainsExtensions(file_);
-
-  // If there were any extensions or this file has any dependencies, output
-  // a registry to override to create the file specific registry.
-  if (file_contains_extensions || !deps_with_extensions.empty()) {
-    printer->Print(
-        "+ (GPBExtensionRegistry*)extensionRegistry {\n"
-        "  // This is called by +initialize so there is no need to worry\n"
-        "  // about thread safety and initialization of registry.\n"
-        "  static GPBExtensionRegistry* registry = nil;\n"
-        "  if (!registry) {\n"
-        "    GPB_DEBUG_CHECK_RUNTIME_VERSIONS();\n"
-        "    registry = [[GPBExtensionRegistry alloc] init];\n");
-
-    printer->Indent();
-    printer->Indent();
-
-    if (file_contains_extensions) {
-      printer->Print(
-          "static GPBExtensionDescription descriptions[] = {\n");
-      printer->Indent();
-      for (const auto& generator : extension_generators_) {
-        generator->GenerateStaticVariablesInitialization(printer);
-      }
-      for (const auto& generator : message_generators_) {
-        generator->GenerateStaticVariablesInitialization(printer);
-      }
-      printer->Outdent();
-      printer->Print(
-          "};\n"
-          "for (size_t i = 0; i < sizeof(descriptions) / sizeof(descriptions[0]); ++i) {\n"
-          "  GPBExtensionDescriptor *extension =\n"
-          "      [[GPBExtensionDescriptor alloc] initWithExtensionDescription:&descriptions[i]\n"
-          "                                                     usesClassRefs:YES];\n"
-          "  [registry addExtension:extension];\n"
-          "  [self globallyRegisterExtension:extension];\n"
-          "  [extension release];\n"
-          "}\n");
-    }
-
-    if (deps_with_extensions.empty()) {
-      printer->Print(
-          "// None of the imports (direct or indirect) defined extensions, so no need to add\n"
-          "// them to this registry.\n");
-    } else {
-      printer->Print(
-          "// Merge in the imports (direct or indirect) that defined extensions.\n");
-      for (std::vector<const FileDescriptor*>::iterator iter =
-               deps_with_extensions.begin();
-           iter != deps_with_extensions.end(); ++iter) {
-        const std::string root_class_name(FileClassName((*iter)));
-        printer->Print(
-            "[registry addExtensions:[$dependency$ extensionRegistry]];\n",
-            "dependency", root_class_name);
-      }
-    }
-
-    printer->Outdent();
-    printer->Outdent();
-
-    printer->Print(
-        "  }\n"
-        "  return registry;\n"
-        "}\n");
-  } else {
-    if (file_->dependency_count() > 0) {
-      printer->Print(
-          "// No extensions in the file and none of the imports (direct or indirect)\n"
-          "// defined extensions, so no need to generate +extensionRegistry.\n");
-    } else {
-      printer->Print(
-          "// No extensions in the file and no imports, so no need to generate\n"
-          "// +extensionRegistry.\n");
-    }
-  }
-
-  printer->Print("\n@end\n\n");
-
-  // File descriptor only needed if there are messages to use it.
-  if (!message_generators_.empty()) {
-    std::map<std::string, std::string> vars;
-    vars["root_class_name"] = root_class_name_;
-    vars["package"] = file_->package();
-    vars["objc_prefix"] = FileClassPrefix(file_);
-    switch (file_->syntax()) {
-      case FileDescriptor::SYNTAX_UNKNOWN:
-        vars["syntax"] = "GPBFileSyntaxUnknown";
-        break;
-      case FileDescriptor::SYNTAX_PROTO2:
-        vars["syntax"] = "GPBFileSyntaxProto2";
-        break;
-      case FileDescriptor::SYNTAX_PROTO3:
-        vars["syntax"] = "GPBFileSyntaxProto3";
-        break;
-    }
-    printer->Print(vars,
-        "#pragma mark - $root_class_name$_FileDescriptor\n"
-        "\n"
-        "static GPBFileDescriptor *$root_class_name$_FileDescriptor(void) {\n"
-        "  // This is called by +initialize so there is no need to worry\n"
-        "  // about thread safety of the singleton.\n"
-        "  static GPBFileDescriptor *descriptor = NULL;\n"
-        "  if (!descriptor) {\n"
-        "    GPB_DEBUG_CHECK_RUNTIME_VERSIONS();\n");
-    if (!vars["objc_prefix"].empty()) {
-      printer->Print(
-          vars,
-          "    descriptor = [[GPBFileDescriptor alloc] initWithPackage:@\"$package$\"\n"
-          "                                                 objcPrefix:@\"$objc_prefix$\"\n"
-          "                                                     syntax:$syntax$];\n");
-    } else {
-      printer->Print(
-          vars,
-          "    descriptor = [[GPBFileDescriptor alloc] initWithPackage:@\"$package$\"\n"
-          "                                                     syntax:$syntax$];\n");
-    }
-    printer->Print(
-        "  }\n"
-        "  return descriptor;\n"
-        "}\n"
-        "\n");
-  }
-
-  for (const auto& generator : enum_generators_) {
-    generator->GenerateSource(printer);
-  }
-  for (const auto& generator : message_generators_) {
-    generator->GenerateSource(printer);
-  }
-
-  printer->Print(
-    "\n"
-    "#pragma clang diagnostic pop\n"
-    "\n"
-    "// @@protoc_insertion_point(global_scope)\n");
-}
-
-// Helper to print the import of the runtime support at the top of generated
-// files. This currently only supports the runtime coming from a framework
-// as defined by the official CocoaPod.
-void FileGenerator::PrintFileRuntimePreamble(
-    io::Printer* printer,
-    const std::vector<std::string>& headers_to_import) const {
-  printer->Print(
-      "// Generated by the protocol buffer compiler.  DO NOT EDIT!\n"
-      "// source: $filename$\n"
-      "\n",
-      "filename", file_->name());
-
-  if (is_bundled_proto_) {
-    // This is basically a clone of ImportWriter::PrintRuntimeImports() but
-    // without the CPP symbol gate, since within the bundled files, that isn't
-    // needed.
-    std::string import_prefix = generation_options_.runtime_import_prefix;
-    if (!import_prefix.empty()) {
-      import_prefix += "/";
-    }
-    for (const auto& header : headers_to_import) {
-      printer->Print(
-          "#import \"$import_prefix$$header$\"\n",
-          "import_prefix", import_prefix,
-          "header", header);
-    }
-  } else {
-    ImportWriter::PrintRuntimeImports(
-        printer, headers_to_import, generation_options_.runtime_import_prefix, true);
-  }
-
-  printer->Print("\n");
-}
-
-}  // namespace objectivec
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/compiler/objectivec/objectivec_file.h b/libs/protobuf/src/google/protobuf/compiler/objectivec/objectivec_file.h
deleted file mode 100644
index ef49cf8..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/objectivec/objectivec_file.h
+++ /dev/null
@@ -1,115 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef GOOGLE_PROTOBUF_COMPILER_OBJECTIVEC_FILE_H__
-#define GOOGLE_PROTOBUF_COMPILER_OBJECTIVEC_FILE_H__
-
-#include <map>
-#include <set>
-#include <string>
-#include <vector>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/io/printer.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace objectivec {
-
-class EnumGenerator;
-class ExtensionGenerator;
-class MessageGenerator;
-
-class FileGenerator {
- public:
-  struct GenerationOptions {
-    GenerationOptions()
-      // TODO(thomasvl): Eventually flip this default to false for better
-      // interop with Swift if proto usages span modules made from ObjC sources.
-      : headers_use_forward_declarations(true) {}
-    std::string generate_for_named_framework;
-    std::string named_framework_to_proto_path_mappings_path;
-    std::string runtime_import_prefix;
-    bool headers_use_forward_declarations;
-  };
-
-  // Wrapper for some common state that is shared between file generations to
-  // improve performance when more than one file is generated at a time.
-  struct CommonState {
-    CommonState();
-
-    const std::vector<const FileDescriptor*>
-    CollectMinimalFileDepsContainingExtensions(const FileDescriptor* file);
-
-   private:
-    struct MinDepsEntry {
-      bool has_extensions;
-      std::set<const FileDescriptor*> min_deps;
-      // `covered_deps` are the transtive deps of `min_deps_w_exts` that also
-      // have extensions.
-      std::set<const FileDescriptor*> covered_deps;
-    };
-    const MinDepsEntry& CollectMinimalFileDepsContainingExtensionsInternal(const FileDescriptor* file);
-    std::map<const FileDescriptor*, MinDepsEntry> deps_info_cache_;
-  };
-
-  FileGenerator(const FileDescriptor* file,
-                const GenerationOptions& generation_options,
-                CommonState& common_state);
-  ~FileGenerator();
-
-  FileGenerator(const FileGenerator&) = delete;
-  FileGenerator& operator=(const FileGenerator&) = delete;
-
-  void GenerateSource(io::Printer* printer);
-  void GenerateHeader(io::Printer* printer);
-
- private:
-  const FileDescriptor* file_;
-  const GenerationOptions& generation_options_;
-  CommonState& common_state_;
-  std::string root_class_name_;
-  bool is_bundled_proto_;
-
-  std::vector<std::unique_ptr<EnumGenerator>> enum_generators_;
-  std::vector<std::unique_ptr<MessageGenerator>> message_generators_;
-  std::vector<std::unique_ptr<ExtensionGenerator>> extension_generators_;
-
-  void PrintFileRuntimePreamble(
-      io::Printer* printer,
-      const std::vector<std::string>& headers_to_import) const;
-};
-
-}  // namespace objectivec
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // GOOGLE_PROTOBUF_COMPILER_OBJECTIVEC_FILE_H__
diff --git a/libs/protobuf/src/google/protobuf/compiler/objectivec/objectivec_generator.cc b/libs/protobuf/src/google/protobuf/compiler/objectivec/objectivec_generator.cc
deleted file mode 100644
index 9dccf14..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/objectivec/objectivec_generator.cc
+++ /dev/null
@@ -1,301 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <fstream>
-#include <iostream>
-#include <string>
-#include <unordered_set>
-#include <google/protobuf/compiler/objectivec/objectivec_generator.h>
-#include <google/protobuf/compiler/objectivec/objectivec_file.h>
-#include <google/protobuf/compiler/objectivec/objectivec_helpers.h>
-#include <google/protobuf/io/printer.h>
-#include <google/protobuf/io/zero_copy_stream.h>
-#include <google/protobuf/stubs/strutil.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace objectivec {
-
-namespace {
-
-// Convert a string with "yes"/"no" (case insensitive) to a boolean, returning
-// true/false for if the input string was a valid value. If the input string is
-// invalid, `result` is unchanged.
-bool StringToBool(const std::string& value, bool* result) {
-  std::string upper_value(value);
-  UpperString(&upper_value);
-  if (upper_value == "NO") {
-    *result = false;
-    return true;
-  }
-  if (upper_value == "YES") {
-    *result = true;
-    return true;
-  }
-
-  return false;
-}
-
-}  // namespace
-
-ObjectiveCGenerator::ObjectiveCGenerator() {}
-
-ObjectiveCGenerator::~ObjectiveCGenerator() {}
-
-bool ObjectiveCGenerator::HasGenerateAll() const {
-  return true;
-}
-
-bool ObjectiveCGenerator::Generate(const FileDescriptor* file,
-                                   const std::string& parameter,
-                                   GeneratorContext* context,
-                                   std::string* error) const {
-  *error = "Unimplemented Generate() method. Call GenerateAll() instead.";
-  return false;
-}
-
-bool ObjectiveCGenerator::GenerateAll(
-    const std::vector<const FileDescriptor*>& files,
-    const std::string& parameter, GeneratorContext* context,
-    std::string* error) const {
-  // -----------------------------------------------------------------
-  // Parse generator options. These options are passed to the compiler using the
-  // --objc_opt flag. The options are passed as a comma separated list of
-  // options along with their values. If the option appears multiple times, only
-  // the last value will be considered.
-  //
-  // e.g. protoc ... --objc_opt=expected_prefixes=file.txt,generate_for_named_framework=MyFramework
-
-  Options validation_options;
-  FileGenerator::GenerationOptions generation_options;
-
-  std::vector<std::pair<std::string, std::string> > options;
-  ParseGeneratorParameter(parameter, &options);
-  for (int i = 0; i < options.size(); i++) {
-    if (options[i].first == "expected_prefixes_path") {
-      // Path to find a file containing the expected prefixes
-      // (objc_class_prefix "PREFIX") for proto packages (package NAME). The
-      // generator will then issue warnings/errors if in the proto files being
-      // generated the option is not listed/wrong/etc in the file.
-      //
-      // The format of the file is:
-      //   - An entry is a line of "package=prefix".
-      //   - Comments start with "#".
-      //   - A comment can go on a line after a expected package/prefix pair.
-      //     (i.e. - "package=prefix # comment")
-      //   - For files that do NOT have a proto package (not recommended), an
-      //     entry can be made as "no_package:PATH=prefix", where PATH is the
-      //     path for the .proto file.
-      //
-      // There is no validation that the prefixes are good prefixes, it is
-      // assumed that they are when you create the file.
-      validation_options.expected_prefixes_path = options[i].second;
-    } else if (options[i].first == "expected_prefixes_suppressions") {
-      // A semicolon delimited string that lists the paths of .proto files to
-      // exclude from the package prefix validations (expected_prefixes_path).
-      // This is provided as an "out", to skip some files being checked.
-      for (StringPiece split_piece : Split(
-               options[i].second, ";", true)) {
-        validation_options.expected_prefixes_suppressions.push_back(
-            std::string(split_piece));
-      }
-    } else if (options[i].first == "prefixes_must_be_registered") {
-      // If objc prefix file option value must be registered to be used. This
-      // option has no meaning if an "expected_prefixes_path" isn't set. The
-      // available options are:
-      //   "no": They don't have to be registered.
-      //   "yes": They must be registered and an error will be raised if a files
-      //     tried to use a prefix that isn't registered.
-      // Default is "no".
-      if (!StringToBool(options[i].second,
-                        &validation_options.prefixes_must_be_registered)) {
-        *error = "error: Unknown value for prefixes_must_be_registered: " + options[i].second;
-        return false;
-      }
-    } else if (options[i].first == "require_prefixes") {
-      // If every file must have an objc prefix file option to be used. The
-      // available options are:
-      //   "no": Files can be generated without the prefix option.
-      //   "yes": Files must have the objc prefix option, and an error will be
-      //     raised if a files doesn't have one.
-      // Default is "no".
-      if (!StringToBool(options[i].second,
-                        &validation_options.require_prefixes)) {
-        *error = "error: Unknown value for require_prefixes: " + options[i].second;
-        return false;
-      }
-    } else if (options[i].first == "generate_for_named_framework") {
-      // The name of the framework that protos are being generated for. This
-      // will cause the #import statements to be framework based using this
-      // name (i.e. - "#import <NAME/proto.pbobjc.h>).
-      //
-      // NOTE: If this option is used with
-      // named_framework_to_proto_path_mappings_path, then this is effectively
-      // the "default" framework name used for everything that wasn't mapped by
-      // the mapping file.
-      generation_options.generate_for_named_framework = options[i].second;
-    } else if (options[i].first == "named_framework_to_proto_path_mappings_path") {
-      // Path to find a file containing the list of framework names and proto
-      // files. The generator uses this to decide if a proto file
-      // referenced should use a framework style import vs. a user level import
-      // (#import <FRAMEWORK/file.pbobjc.h> vs #import "dir/file.pbobjc.h").
-      //
-      // The format of the file is:
-      //   - An entry is a line of "frameworkName: file.proto, dir/file2.proto".
-      //   - Comments start with "#".
-      //   - A comment can go on a line after a expected package/prefix pair.
-      //     (i.e. - "frameworkName: file.proto # comment")
-      //
-      // Any number of files can be listed for a framework, just separate them
-      // with commas.
-      //
-      // There can be multiple lines listing the same frameworkName in case it
-      // has a lot of proto files included in it; having multiple lines makes
-      // things easier to read. If a proto file is not configured in the
-      // mappings file, it will use the default framework name if one was passed
-      // with generate_for_named_framework, or the relative path to it's include
-      // path otherwise.
-      generation_options.named_framework_to_proto_path_mappings_path = options[i].second;
-    } else if (options[i].first == "runtime_import_prefix") {
-      // Path to use as a prefix on #imports of runtime provided headers in the
-      // generated files. When integrating ObjC protos into a build system,
-      // this can be used to avoid having to add the runtime directory to the
-      // header search path since the generate #import will be more complete.
-      generation_options.runtime_import_prefix = StripSuffixString(options[i].second, "/");
-    } else if (options[i].first == "package_to_prefix_mappings_path") {
-      // Path to use for when loading the objc class prefix mappings to use.
-      // The `objc_class_prefix` file option is always honored first if one is present.
-      // This option also has precedent over the use_package_as_prefix option.
-      //
-      // The format of the file is:
-      //   - An entry is a line of "package=prefix".
-      //   - Comments start with "#".
-      //   - A comment can go on a line after a expected package/prefix pair.
-      //     (i.e. - "package=prefix # comment")
-      //   - For files that do NOT have a proto package (not recommended), an
-      //     entry can be made as "no_package:PATH=prefix", where PATH is the
-      //     path for the .proto file.
-      //
-      SetPackageToPrefixMappingsPath(options[i].second);
-    } else if (options[i].first == "use_package_as_prefix") {
-      // Controls how the symbols should be prefixed to avoid symbols
-      // collisions. The objc_class_prefix file option is always honored, this
-      // is just what to do if that isn't set. The available options are:
-      //   "no": Not prefixed (the existing mode).
-      //   "yes": Make a prefix out of the proto package.
-      bool value = false;
-      if (StringToBool(options[i].second, &value)) {
-        SetUseProtoPackageAsDefaultPrefix(value);
-      } else {
-        *error = "error: Unknown use_package_as_prefix: " + options[i].second;
-        return false;
-      }
-    } else if (options[i].first == "proto_package_prefix_exceptions_path") {
-      // Path to find a file containing the list of proto package names that are
-      // exceptions when use_package_as_prefix is enabled. This can be used to
-      // migrate packages one at a time to use_package_as_prefix since there
-      // are likely code updates needed with each one.
-      //
-      // The format of the file is:
-      //   - An entry is a line of "proto.package.name".
-      //   - Comments start with "#".
-      //   - A comment can go on a line after a expected package/prefix pair.
-      //     (i.e. - "some.proto.package # comment")
-      SetProtoPackagePrefixExceptionList(options[i].second);
-    } else if (options[i].first == "headers_use_forward_declarations") {
-      if (!StringToBool(options[i].second,
-                        &generation_options.headers_use_forward_declarations)) {
-        *error = "error: Unknown value for headers_use_forward_declarations: " + options[i].second;
-        return false;
-      }
-    } else {
-      *error = "error: Unknown generator option: " + options[i].first;
-      return false;
-    }
-  }
-
-  // -----------------------------------------------------------------
-
-  // These are not official generation options and could be removed/changed in
-  // the future and doing that won't count as a breaking change.
-  bool headers_only = getenv("GPB_OBJC_HEADERS_ONLY") != NULL;
-  std::unordered_set<std::string> skip_impls;
-  if (getenv("GPB_OBJC_SKIP_IMPLS_FILE") != NULL) {
-    std::ifstream skip_file(getenv("GPB_OBJC_SKIP_IMPLS_FILE"));
-    if (skip_file.is_open()) {
-      std::string line;
-      while (std::getline(skip_file, line)) {
-        skip_impls.insert(line);
-      }
-    } else {
-      *error = "error: Failed to open GPB_OBJC_SKIP_IMPLS_FILE file";
-      return false;
-    }
-  }
-
-  // -----------------------------------------------------------------
-
-  // Validate the objc prefix/package pairings.
-  if (!ValidateObjCClassPrefixes(files, validation_options, error)) {
-    // *error will have been filled in.
-    return false;
-  }
-
-  FileGenerator::CommonState state;
-  for (int i = 0; i < files.size(); i++) {
-    const FileDescriptor* file = files[i];
-    FileGenerator file_generator(file, generation_options, state);
-    std::string filepath = FilePath(file);
-
-    // Generate header.
-    {
-      std::unique_ptr<io::ZeroCopyOutputStream> output(
-          context->Open(filepath + ".pbobjc.h"));
-      io::Printer printer(output.get(), '$');
-      file_generator.GenerateHeader(&printer);
-    }
-
-    // Generate m file.
-    if (!headers_only && skip_impls.count(file->name()) == 0) {
-      std::unique_ptr<io::ZeroCopyOutputStream> output(
-          context->Open(filepath + ".pbobjc.m"));
-      io::Printer printer(output.get(), '$');
-      file_generator.GenerateSource(&printer);
-    }
-  }
-
-  return true;
-}
-
-}  // namespace objectivec
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/compiler/objectivec/objectivec_generator.h b/libs/protobuf/src/google/protobuf/compiler/objectivec/objectivec_generator.h
deleted file mode 100644
index 1dbc666..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/objectivec/objectivec_generator.h
+++ /dev/null
@@ -1,79 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Generates ObjectiveC code for a given .proto file.
-
-#ifndef GOOGLE_PROTOBUF_COMPILER_OBJECTIVEC_GENERATOR_H__
-#define GOOGLE_PROTOBUF_COMPILER_OBJECTIVEC_GENERATOR_H__
-
-#include <string>
-#include <google/protobuf/compiler/code_generator.h>
-#include <google/protobuf/descriptor.h>
-
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace objectivec {
-
-// CodeGenerator implementation which generates a ObjectiveC source file and
-// header.  If you create your own protocol compiler binary and you want it to
-// support ObjectiveC output, you can do so by registering an instance of this
-// CodeGenerator with the CommandLineInterface in your main() function.
-class PROTOC_EXPORT ObjectiveCGenerator : public CodeGenerator {
- public:
-  ObjectiveCGenerator();
-  ~ObjectiveCGenerator();
-
-  ObjectiveCGenerator(const ObjectiveCGenerator&) = delete;
-  ObjectiveCGenerator& operator=(const ObjectiveCGenerator&) = delete;
-
-  // implements CodeGenerator ----------------------------------------
-  bool HasGenerateAll() const override;
-  bool Generate(const FileDescriptor* file, const std::string& parameter,
-                GeneratorContext* context, std::string* error) const override;
-  bool GenerateAll(const std::vector<const FileDescriptor*>& files,
-                   const std::string& parameter, GeneratorContext* context,
-                   std::string* error) const override;
-
-  uint64_t GetSupportedFeatures() const override {
-    return FEATURE_PROTO3_OPTIONAL;
-  }
-};
-
-}  // namespace objectivec
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
-
-#endif  // GOOGLE_PROTOBUF_COMPILER_OBJECTIVEC_GENERATOR_H__
diff --git a/libs/protobuf/src/google/protobuf/compiler/objectivec/objectivec_helpers.cc b/libs/protobuf/src/google/protobuf/compiler/objectivec/objectivec_helpers.cc
deleted file mode 100644
index b15f580..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/objectivec/objectivec_helpers.cc
+++ /dev/null
@@ -1,2043 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef _MSC_VER
-#include <unistd.h>
-#endif
-#include <climits>
-#include <errno.h>
-#include <fcntl.h>
-#include <fstream>
-#include <iostream>
-#include <sstream>
-#include <stdlib.h>
-#include <unordered_set>
-#include <vector>
-
-#include <google/protobuf/compiler/code_generator.h>
-#include <google/protobuf/compiler/objectivec/objectivec_helpers.h>
-#include <google/protobuf/compiler/objectivec/objectivec_nsobject_methods.h>
-#include <google/protobuf/descriptor.pb.h>
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/io/printer.h>
-#include <google/protobuf/io/zero_copy_stream_impl.h>
-#include <google/protobuf/io/io_win32.h>
-#include <google/protobuf/port.h>
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/stubs/strutil.h>
-
-// NOTE: src/google/protobuf/compiler/plugin.cc makes use of cerr for some
-// error cases, so it seems to be ok to use as a back door for errors.
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace objectivec {
-
-// <io.h> is transitively included in this file. Import the functions explicitly
-// in this port namespace to avoid ambiguous definition.
-namespace posix {
-#ifdef _WIN32
-using ::google::protobuf::io::win32::open;
-#else
-using ::open;
-#endif
-}  // namespace port
-
-namespace {
-
-bool BoolFromEnvVar(const char* env_var, bool default_value) {
-  const char* value = getenv(env_var);
-  if (value) {
-    return std::string("YES") == ToUpper(value);
-  }
-  return default_value;
-}
-
-class SimpleLineCollector : public LineConsumer {
- public:
-  SimpleLineCollector(std::unordered_set<std::string>* inout_set)
-      : set_(inout_set) {}
-
-  virtual bool ConsumeLine(const StringPiece& line, std::string* out_error) override {
-    set_->insert(std::string(line));
-    return true;
-  }
-
- private:
-  std::unordered_set<std::string>* set_;
-};
-
-class PackageToPrefixesCollector : public LineConsumer {
- public:
-  PackageToPrefixesCollector(const std::string &usage,
-                             std::map<std::string, std::string>* inout_package_to_prefix_map)
-      : usage_(usage), prefix_map_(inout_package_to_prefix_map) {}
-
-  virtual bool ConsumeLine(const StringPiece& line, std::string* out_error) override;
-
- private:
-  const std::string usage_;
-  std::map<std::string, std::string>* prefix_map_;
-};
-
-class PrefixModeStorage {
- public:
-  PrefixModeStorage();
-
-  const std::string package_to_prefix_mappings_path() const { return package_to_prefix_mappings_path_; }
-  void set_package_to_prefix_mappings_path(const std::string& path) {
-    package_to_prefix_mappings_path_ = path;
-    package_to_prefix_map_.clear();
-  }
-
-  std::string prefix_from_proto_package_mappings(const FileDescriptor* file);
-
-  bool use_package_name() const { return use_package_name_; }
-  void set_use_package_name(bool on_or_off) { use_package_name_ = on_or_off; }
-
-  const std::string exception_path() const { return exception_path_; }
-  void set_exception_path(const std::string& path) {
-    exception_path_ = path;
-    exceptions_.clear();
-  }
-
-  bool is_package_exempted(const std::string& package);
-
-  // When using a proto package as the prefix, this should be added as the
-  // prefix in front of it.
-  const std::string& forced_package_prefix() const { return forced_prefix_; }
-
- private:
-  bool use_package_name_;
-  std::map<std::string, std::string> package_to_prefix_map_;
-  std::string package_to_prefix_mappings_path_;
-  std::string exception_path_;
-  std::string forced_prefix_;
-  std::unordered_set<std::string> exceptions_;
-};
-
-PrefixModeStorage::PrefixModeStorage() {
-  // Even thought there are generation options, have an env back door since some
-  // of these helpers could be used in other plugins.
-
-  use_package_name_ = BoolFromEnvVar("GPB_OBJC_USE_PACKAGE_AS_PREFIX", false);
-
-  const char* exception_path = getenv("GPB_OBJC_PACKAGE_PREFIX_EXCEPTIONS_PATH");
-  if (exception_path) {
-    exception_path_ = exception_path;
-  }
-
-  // This one is a not expected to be common, so it doesn't get a generation
-  // option, just the env var.
-  const char* prefix = getenv("GPB_OBJC_USE_PACKAGE_AS_PREFIX_PREFIX");
-  if (prefix) {
-    forced_prefix_ = prefix;
-  }
-}
-
-std::string PrefixModeStorage::prefix_from_proto_package_mappings(const FileDescriptor* file) {
-  if (!file) {
-    return "";
-  }
-
-  if (package_to_prefix_map_.empty() && !package_to_prefix_mappings_path_.empty()) {
-    std::string error_str;
-    // Re use the same collector as we use for expected_prefixes_path since the file
-    // format is the same.
-    PackageToPrefixesCollector collector("Package to prefixes", &package_to_prefix_map_);
-    if (!ParseSimpleFile(package_to_prefix_mappings_path_, &collector, &error_str)) {
-      if (error_str.empty()) {
-        error_str = std::string("protoc:0: warning: Failed to parse")
-           + std::string(" prefix to proto package mappings file: ")
-           + package_to_prefix_mappings_path_;
-      }
-      std::cerr << error_str << std::endl;
-      std::cerr.flush();
-      package_to_prefix_map_.clear();
-    }
-  }
-
-  const std::string package = file->package();
-  // For files without packages, the can be registered as "no_package:PATH",
-  // allowing the expected prefixes file.
-  static const std::string no_package_prefix("no_package:");
-  const std::string lookup_key = package.empty() ? no_package_prefix + file->name() : package;
-
-  std::map<std::string, std::string>::const_iterator prefix_lookup =
-      package_to_prefix_map_.find(lookup_key);
-
-  if (prefix_lookup != package_to_prefix_map_.end()) {
-    return prefix_lookup->second;
-  }  
-
-  return "";
-}
-
-bool PrefixModeStorage::is_package_exempted(const std::string& package) {
-  if (exceptions_.empty() && !exception_path_.empty()) {
-    std::string error_str;
-    SimpleLineCollector collector(&exceptions_);
-    if (!ParseSimpleFile(exception_path_, &collector, &error_str)) {
-      if (error_str.empty()) {
-        error_str = std::string("protoc:0: warning: Failed to parse")
-           + std::string(" package prefix exceptions file: ")
-           + exception_path_;
-      }
-      std::cerr << error_str << std::endl;
-      std::cerr.flush();
-      exceptions_.clear();
-    }
-
-    // If the file was empty put something in it so it doesn't get reloaded over
-    // and over.
-    if (exceptions_.empty()) {
-      exceptions_.insert("<not a real package>");
-    }
-  }
-
-  return exceptions_.count(package) != 0;
-}
-
-PrefixModeStorage g_prefix_mode;
-
-}  // namespace
-
-std::string GetPackageToPrefixMappingsPath() {
-  return g_prefix_mode.package_to_prefix_mappings_path();
-}
-
-void SetPackageToPrefixMappingsPath(const std::string& file_path) {
-  g_prefix_mode.set_package_to_prefix_mappings_path(file_path);
-}
-
-bool UseProtoPackageAsDefaultPrefix() {
-  return g_prefix_mode.use_package_name();
-}
-
-void SetUseProtoPackageAsDefaultPrefix(bool on_or_off) {
-  g_prefix_mode.set_use_package_name(on_or_off);
-}
-
-std::string GetProtoPackagePrefixExceptionList() {
-  return g_prefix_mode.exception_path();
-}
-
-void SetProtoPackagePrefixExceptionList(const std::string& file_path) {
-  g_prefix_mode.set_exception_path(file_path);
-}
-
-Options::Options() {
-  // While there are generator options, also support env variables to help with
-  // build systems where it isn't as easy to hook in for add the generation
-  // options when invoking protoc.
-  const char* file_path = getenv("GPB_OBJC_EXPECTED_PACKAGE_PREFIXES");
-  if (file_path) {
-    expected_prefixes_path = file_path;
-  }
-  const char* suppressions = getenv("GPB_OBJC_EXPECTED_PACKAGE_PREFIXES_SUPPRESSIONS");
-  if (suppressions) {
-    expected_prefixes_suppressions =
-        Split(suppressions, ";", true);
-  }
-  prefixes_must_be_registered =
-      BoolFromEnvVar("GPB_OBJC_PREFIXES_MUST_BE_REGISTERED", false);
-  require_prefixes = BoolFromEnvVar("GPB_OBJC_REQUIRE_PREFIXES", false);
-}
-
-namespace {
-
-std::unordered_set<std::string> MakeWordsMap(const char* const words[],
-                                             size_t num_words) {
-  std::unordered_set<std::string> result;
-  for (int i = 0; i < num_words; i++) {
-    result.insert(words[i]);
-  }
-  return result;
-}
-
-const char* const kUpperSegmentsList[] = {"url", "http", "https"};
-
-std::unordered_set<std::string> kUpperSegments =
-    MakeWordsMap(kUpperSegmentsList, GOOGLE_ARRAYSIZE(kUpperSegmentsList));
-
-bool ascii_isnewline(char c) {
-  return c == '\n' || c == '\r';
-}
-
-// Internal helper for name handing.
-// Do not expose this outside of helpers, stick to having functions for specific
-// cases (ClassName(), FieldName()), so there is always consistent suffix rules.
-std::string UnderscoresToCamelCase(const std::string& input,
-                                   bool first_capitalized) {
-  std::vector<std::string> values;
-  std::string current;
-
-  bool last_char_was_number = false;
-  bool last_char_was_lower = false;
-  bool last_char_was_upper = false;
-  for (int i = 0; i < input.size(); i++) {
-    char c = input[i];
-    if (ascii_isdigit(c)) {
-      if (!last_char_was_number) {
-        values.push_back(current);
-        current = "";
-      }
-      current += c;
-      last_char_was_number = last_char_was_lower = last_char_was_upper = false;
-      last_char_was_number = true;
-    } else if (ascii_islower(c)) {
-      // lowercase letter can follow a lowercase or uppercase letter
-      if (!last_char_was_lower && !last_char_was_upper) {
-        values.push_back(current);
-        current = "";
-      }
-      current += c;  // already lower
-      last_char_was_number = last_char_was_lower = last_char_was_upper = false;
-      last_char_was_lower = true;
-    } else if (ascii_isupper(c)) {
-      if (!last_char_was_upper) {
-        values.push_back(current);
-        current = "";
-      }
-      current += ascii_tolower(c);
-      last_char_was_number = last_char_was_lower = last_char_was_upper = false;
-      last_char_was_upper = true;
-    } else {
-      last_char_was_number = last_char_was_lower = last_char_was_upper = false;
-    }
-  }
-  values.push_back(current);
-
-  std::string result;
-  bool first_segment_forces_upper = false;
-  for (std::vector<std::string>::iterator i = values.begin(); i != values.end();
-       ++i) {
-    std::string value = *i;
-    bool all_upper = (kUpperSegments.count(value) > 0);
-    if (all_upper && (result.length() == 0)) {
-      first_segment_forces_upper = true;
-    }
-    for (int j = 0; j < value.length(); j++) {
-      if (j == 0 || all_upper) {
-        value[j] = ascii_toupper(value[j]);
-      } else {
-        // Nothing, already in lower.
-      }
-    }
-    result += value;
-  }
-  if ((result.length() != 0) &&
-      !first_capitalized &&
-      !first_segment_forces_upper) {
-    result[0] = ascii_tolower(result[0]);
-  }
-  return result;
-}
-
-const char* const kReservedWordList[] = {
-  // Note NSObject Methods:
-  // These are brought in from objectivec_nsobject_methods.h that is generated
-  // using method_dump.sh. See kNSObjectMethods below.
-
-  // Objective C "keywords" that aren't in C
-  // From
-  // http://stackoverflow.com/questions/1873630/reserved-keywords-in-objective-c
-  // with some others added on.
-  "id", "_cmd", "super", "in", "out", "inout", "bycopy", "byref", "oneway",
-  "self", "instancetype", "nullable", "nonnull", "nil", "Nil",
-  "YES", "NO", "weak",
-
-  // C/C++ keywords (Incl C++ 0x11)
-  // From http://en.cppreference.com/w/cpp/keywords
-  "and", "and_eq", "alignas", "alignof", "asm", "auto", "bitand", "bitor",
-  "bool", "break", "case", "catch", "char", "char16_t", "char32_t", "class",
-  "compl", "const", "constexpr", "const_cast", "continue", "decltype",
-  "default", "delete", "double", "dynamic_cast", "else", "enum", "explicit",
-  "export", "extern ", "false", "float", "for", "friend", "goto", "if",
-  "inline", "int", "long", "mutable", "namespace", "new", "noexcept", "not",
-  "not_eq", "nullptr", "operator", "or", "or_eq", "private", "protected",
-  "public", "register", "reinterpret_cast", "return", "short", "signed",
-  "sizeof", "static", "static_assert", "static_cast", "struct", "switch",
-  "template", "this", "thread_local", "throw", "true", "try", "typedef",
-  "typeid", "typename", "union", "unsigned", "using", "virtual", "void",
-  "volatile", "wchar_t", "while", "xor", "xor_eq",
-
-  // C99 keywords
-  // From
-  // http://publib.boulder.ibm.com/infocenter/lnxpcomp/v8v101/index.jsp?topic=%2Fcom.ibm.xlcpp8l.doc%2Flanguage%2Fref%2Fkeyw.htm
-  "restrict",
-
-  // GCC/Clang extension
-  "typeof",
-
-  // Not a keyword, but will break you
-  "NULL",
-
-  // C88+ specs call for these to be macros, so depending on what they are
-  // defined to be it can lead to odd errors for some Xcode/SDK versions.
-  "stdin", "stdout", "stderr",
-
-  // Objective-C Runtime typedefs
-  // From <obc/runtime.h>
-  "Category", "Ivar", "Method", "Protocol",
-
-  // GPBMessage Methods
-  // Only need to add instance methods that may conflict with
-  // method declared in protos. The main cases are methods
-  // that take no arguments, or setFoo:/hasFoo: type methods.
-  "clear", "data", "delimitedData", "descriptor", "extensionRegistry",
-  "extensionsCurrentlySet", "initialized", "isInitialized", "serializedSize",
-  "sortedExtensionsInUse", "unknownFields",
-
-  // MacTypes.h names
-  "Fixed", "Fract", "Size", "LogicalAddress", "PhysicalAddress", "ByteCount",
-  "ByteOffset", "Duration", "AbsoluteTime", "OptionBits", "ItemCount",
-  "PBVersion", "ScriptCode", "LangCode", "RegionCode", "OSType",
-  "ProcessSerialNumber", "Point", "Rect", "FixedPoint", "FixedRect", "Style",
-  "StyleParameter", "StyleField", "TimeScale", "TimeBase", "TimeRecord",
-};
-
-// returns true is input starts with __ or _[A-Z] which are reserved identifiers
-// in C/ C++. All calls should go through UnderscoresToCamelCase before getting here
-// but this verifies and allows for future expansion if we decide to redefine what a
-// reserved C identifier is (for example the GNU list
-// https://www.gnu.org/software/libc/manual/html_node/Reserved-Names.html )
-bool IsReservedCIdentifier(const std::string& input) {
-  if (input.length() > 2) {
-    if (input.at(0) == '_') {
-      if (isupper(input.at(1)) || input.at(1) == '_') {
-        return true;
-      }
-    }
-  }
-  return false;
-}
-
-std::string SanitizeNameForObjC(const std::string& prefix,
-                                const std::string& input,
-                                const std::string& extension,
-                                std::string* out_suffix_added) {
-  static const std::unordered_set<std::string> kReservedWords =
-      MakeWordsMap(kReservedWordList, GOOGLE_ARRAYSIZE(kReservedWordList));
-  static const std::unordered_set<std::string> kNSObjectMethods =
-      MakeWordsMap(kNSObjectMethodsList, GOOGLE_ARRAYSIZE(kNSObjectMethodsList));
-  std::string sanitized;
-  // We add the prefix in the cases where the string is missing a prefix.
-  // We define "missing a prefix" as where 'input':
-  // a) Doesn't start with the prefix or
-  // b) Isn't equivalent to the prefix or
-  // c) Has the prefix, but the letter after the prefix is lowercase
-  if (HasPrefixString(input, prefix)) {
-    if (input.length() == prefix.length() || !ascii_isupper(input[prefix.length()])) {
-      sanitized = prefix + input;
-    } else {
-      sanitized = input;
-    }
-  } else {
-    sanitized = prefix + input;
-  }
-  if (IsReservedCIdentifier(sanitized) ||
-      (kReservedWords.count(sanitized) > 0) ||
-      (kNSObjectMethods.count(sanitized) > 0)) {
-    if (out_suffix_added) *out_suffix_added = extension;
-    return sanitized + extension;
-  }
-  if (out_suffix_added) out_suffix_added->clear();
-  return sanitized;
-}
-
-std::string NameFromFieldDescriptor(const FieldDescriptor* field) {
-  if (field->type() == FieldDescriptor::TYPE_GROUP) {
-    return field->message_type()->name();
-  } else {
-    return field->name();
-  }
-}
-
-void PathSplit(const std::string& path, std::string* directory,
-               std::string* basename) {
-  std::string::size_type last_slash = path.rfind('/');
-  if (last_slash == std::string::npos) {
-    if (directory) {
-      *directory = "";
-    }
-    if (basename) {
-      *basename = path;
-    }
-  } else {
-    if (directory) {
-      *directory = path.substr(0, last_slash);
-    }
-    if (basename) {
-      *basename = path.substr(last_slash + 1);
-    }
-  }
-}
-
-bool IsSpecialName(const std::string& name, const std::string* special_names,
-                   size_t count) {
-  for (size_t i = 0; i < count; ++i) {
-    size_t length = special_names[i].length();
-    if (name.compare(0, length, special_names[i]) == 0) {
-      if (name.length() > length) {
-        // If name is longer than the retained_name[i] that it matches
-        // the next character must be not lower case (newton vs newTon vs
-        // new_ton).
-        return !ascii_islower(name[length]);
-      } else {
-        return true;
-      }
-    }
-  }
-  return false;
-}
-
-std::string GetZeroEnumNameForFlagType(const FlagType flag_type) {
-  switch(flag_type) {
-    case FLAGTYPE_DESCRIPTOR_INITIALIZATION:
-      return "GPBDescriptorInitializationFlag_None";
-    case FLAGTYPE_EXTENSION:
-      return "GPBExtensionNone";
-    case FLAGTYPE_FIELD:
-      return "GPBFieldNone";
-    default:
-      GOOGLE_LOG(FATAL) << "Can't get here.";
-      return "0";
-  }
-}
-
-std::string GetEnumNameForFlagType(const FlagType flag_type) {
-  switch(flag_type) {
-    case FLAGTYPE_DESCRIPTOR_INITIALIZATION:
-      return "GPBDescriptorInitializationFlags";
-    case FLAGTYPE_EXTENSION:
-      return "GPBExtensionOptions";
-    case FLAGTYPE_FIELD:
-      return "GPBFieldFlags";
-    default:
-      GOOGLE_LOG(FATAL) << "Can't get here.";
-      return std::string();
-  }
-}
-
-void MaybeUnQuote(StringPiece* input) {
-  if ((input->length() >= 2) &&
-      ((*input->data() == '\'' || *input->data() == '"')) &&
-      ((*input)[input->length() - 1] == *input->data())) {
-    input->remove_prefix(1);
-    input->remove_suffix(1);
-  }
-}
-
-}  // namespace
-
-// Escape C++ trigraphs by escaping question marks to \?
-std::string EscapeTrigraphs(const std::string& to_escape) {
-  return StringReplace(to_escape, "?", "\\?", true);
-}
-
-void TrimWhitespace(StringPiece* input) {
-  while (!input->empty() && ascii_isspace(*input->data())) {
-    input->remove_prefix(1);
-  }
-  while (!input->empty() && ascii_isspace((*input)[input->length() - 1])) {
-    input->remove_suffix(1);
-  }
-}
-
-bool IsRetainedName(const std::string& name) {
-  // List of prefixes from
-  // http://developer.apple.com/library/mac/#documentation/Cocoa/Conceptual/MemoryMgmt/Articles/mmRules.html
-  static const std::string retained_names[] = {"new", "alloc", "copy",
-                                               "mutableCopy"};
-  return IsSpecialName(name, retained_names,
-                       sizeof(retained_names) / sizeof(retained_names[0]));
-}
-
-bool IsInitName(const std::string& name) {
-  static const std::string init_names[] = {"init"};
-  return IsSpecialName(name, init_names,
-                       sizeof(init_names) / sizeof(init_names[0]));
-}
-
-std::string BaseFileName(const FileDescriptor* file) {
-  std::string basename;
-  PathSplit(file->name(), NULL, &basename);
-  return basename;
-}
-
-std::string FileClassPrefix(const FileDescriptor* file) {
-  // Always honor the file option.
-  if (file->options().has_objc_class_prefix()) {
-    return file->options().objc_class_prefix();
-  }
-
-  // If package prefix is specified in an prefix to proto mappings file then use that.
-  std::string objc_class_prefix = g_prefix_mode.prefix_from_proto_package_mappings(file);
-  if (!objc_class_prefix.empty()) {
-    return objc_class_prefix;
-  }
-
-  // If package prefix isn't enabled, done.
-  if (!g_prefix_mode.use_package_name()) {
-    return "";
-  }
-
-  // If the package is in the exceptions list, done.
-  if (g_prefix_mode.is_package_exempted(file->package())) {
-    return "";
-  }
-
-  // Transform the package into a prefix: use the dot segments as part,
-  // camelcase each one and then join them with underscores, and add an
-  // underscore at the end.
-  std::string result;
-  const std::vector<std::string> segments = Split(file->package(), ".", true);
-  for (const auto& segment : segments) {
-    const std::string part = UnderscoresToCamelCase(segment, true);
-    if (part.empty()) {
-      continue;
-    }
-    if (!result.empty()) {
-      result.append("_");
-    }
-    result.append(part);
-  }
-  if (!result.empty()) {
-    result.append("_");
-  }
-  return g_prefix_mode.forced_package_prefix() + result;
-}
-
-std::string FilePath(const FileDescriptor* file) {
-  std::string output;
-  std::string basename;
-  std::string directory;
-  PathSplit(file->name(), &directory, &basename);
-  if (directory.length() > 0) {
-    output = directory + "/";
-  }
-  basename = StripProto(basename);
-
-  // CamelCase to be more ObjC friendly.
-  basename = UnderscoresToCamelCase(basename, true);
-
-  output += basename;
-  return output;
-}
-
-std::string FilePathBasename(const FileDescriptor* file) {
-  std::string output;
-  std::string basename;
-  std::string directory;
-  PathSplit(file->name(), &directory, &basename);
-  basename = StripProto(basename);
-
-  // CamelCase to be more ObjC friendly.
-  output = UnderscoresToCamelCase(basename, true);
-
-  return output;
-}
-
-std::string FileClassName(const FileDescriptor* file) {
-  const std::string prefix = FileClassPrefix(file);
-  const std::string name =
-      UnderscoresToCamelCase(StripProto(BaseFileName(file)), true) + "Root";
-  // There aren't really any reserved words that end in "Root", but playing
-  // it safe and checking.
-  return SanitizeNameForObjC(prefix, name, "_RootClass", NULL);
-}
-
-std::string ClassNameWorker(const Descriptor* descriptor) {
-  std::string name;
-  if (descriptor->containing_type() != NULL) {
-    name = ClassNameWorker(descriptor->containing_type());
-    name += "_";
-  }
-  return name + descriptor->name();
-}
-
-std::string ClassNameWorker(const EnumDescriptor* descriptor) {
-  std::string name;
-  if (descriptor->containing_type() != NULL) {
-    name = ClassNameWorker(descriptor->containing_type());
-    name += "_";
-  }
-  return name + descriptor->name();
-}
-
-std::string ClassName(const Descriptor* descriptor) {
-  return ClassName(descriptor, NULL);
-}
-
-std::string ClassName(const Descriptor* descriptor,
-                      std::string* out_suffix_added) {
-  // 1. Message names are used as is (style calls for CamelCase, trust it).
-  // 2. Check for reserved word at the very end and then suffix things.
-  const std::string prefix = FileClassPrefix(descriptor->file());
-  const std::string name = ClassNameWorker(descriptor);
-  return SanitizeNameForObjC(prefix, name, "_Class", out_suffix_added);
-}
-
-std::string EnumName(const EnumDescriptor* descriptor) {
-  // 1. Enum names are used as is (style calls for CamelCase, trust it).
-  // 2. Check for reserved word at the every end and then suffix things.
-  //      message Fixed {
-  //        message Size {...}
-  //        enum Mumble {...}
-  //      ...
-  //      }
-  //    yields Fixed_Class, Fixed_Size.
-  const std::string prefix = FileClassPrefix(descriptor->file());
-  const std::string name = ClassNameWorker(descriptor);
-  return SanitizeNameForObjC(prefix, name, "_Enum", NULL);
-}
-
-std::string EnumValueName(const EnumValueDescriptor* descriptor) {
-  // Because of the Switch enum compatibility, the name on the enum has to have
-  // the suffix handing, so it slightly diverges from how nested classes work.
-  //   enum Fixed {
-  //     FOO = 1
-  //   }
-  // yields Fixed_Enum and Fixed_Enum_Foo (not Fixed_Foo).
-  const std::string class_name = EnumName(descriptor->type());
-  const std::string value_str =
-      UnderscoresToCamelCase(descriptor->name(), true);
-  const std::string name = class_name + "_" + value_str;
-  // There aren't really any reserved words with an underscore and a leading
-  // capital letter, but playing it safe and checking.
-  return SanitizeNameForObjC("", name, "_Value", NULL);
-}
-
-std::string EnumValueShortName(const EnumValueDescriptor* descriptor) {
-  // Enum value names (EnumValueName above) are the enum name turned into
-  // a class name and then the value name is CamelCased and concatenated; the
-  // whole thing then gets sanitized for reserved words.
-  // The "short name" is intended to be the final leaf, the value name; but
-  // you can't simply send that off to sanitize as that could result in it
-  // getting modified when the full name didn't.  For example enum
-  // "StorageModes" has a value "retain".  So the full name is
-  // "StorageModes_Retain", but if we sanitize "retain" it would become
-  // "RetainValue".
-  // So the right way to get the short name is to take the full enum name
-  // and then strip off the enum name (leaving the value name and anything
-  // done by sanitize).
-  const std::string class_name = EnumName(descriptor->type());
-  const std::string long_name_prefix = class_name + "_";
-  const std::string long_name = EnumValueName(descriptor);
-  return StripPrefixString(long_name, long_name_prefix);
-}
-
-std::string UnCamelCaseEnumShortName(const std::string& name) {
-  std::string result;
-  for (int i = 0; i < name.size(); i++) {
-    char c = name[i];
-    if (i > 0 && ascii_isupper(c)) {
-      result += '_';
-    }
-    result += ascii_toupper(c);
-  }
-  return result;
-}
-
-std::string ExtensionMethodName(const FieldDescriptor* descriptor) {
-  const std::string name = NameFromFieldDescriptor(descriptor);
-  const std::string result = UnderscoresToCamelCase(name, false);
-  return SanitizeNameForObjC("", result, "_Extension", NULL);
-}
-
-std::string FieldName(const FieldDescriptor* field) {
-  const std::string name = NameFromFieldDescriptor(field);
-  std::string result = UnderscoresToCamelCase(name, false);
-  if (field->is_repeated() && !field->is_map()) {
-    // Add "Array" before do check for reserved worlds.
-    result += "Array";
-  } else {
-    // If it wasn't repeated, but ends in "Array", force on the _p suffix.
-    if (HasSuffixString(result, "Array")) {
-      result += "_p";
-    }
-  }
-  return SanitizeNameForObjC("", result, "_p", NULL);
-}
-
-std::string FieldNameCapitalized(const FieldDescriptor* field) {
-  // Want the same suffix handling, so upcase the first letter of the other
-  // name.
-  std::string result = FieldName(field);
-  if (result.length() > 0) {
-    result[0] = ascii_toupper(result[0]);
-  }
-  return result;
-}
-
-std::string OneofEnumName(const OneofDescriptor* descriptor) {
-  const Descriptor* fieldDescriptor = descriptor->containing_type();
-  std::string name = ClassName(fieldDescriptor);
-  name += "_" + UnderscoresToCamelCase(descriptor->name(), true) + "_OneOfCase";
-  // No sanitize needed because the OS never has names that end in _OneOfCase.
-  return name;
-}
-
-std::string OneofName(const OneofDescriptor* descriptor) {
-  std::string name = UnderscoresToCamelCase(descriptor->name(), false);
-  // No sanitize needed because it gets OneOfCase added and that shouldn't
-  // ever conflict.
-  return name;
-}
-
-std::string OneofNameCapitalized(const OneofDescriptor* descriptor) {
-  // Use the common handling and then up-case the first letter.
-  std::string result = OneofName(descriptor);
-  if (result.length() > 0) {
-    result[0] = ascii_toupper(result[0]);
-  }
-  return result;
-}
-
-std::string ObjCClass(const std::string& class_name) {
-  return std::string("GPBObjCClass(") + class_name + ")";
-}
-
-std::string ObjCClassDeclaration(const std::string& class_name) {
-  return std::string("GPBObjCClassDeclaration(") + class_name + ");";
-}
-
-std::string UnCamelCaseFieldName(const std::string& name, const FieldDescriptor* field) {
-  std::string worker(name);
-  if (HasSuffixString(worker, "_p")) {
-    worker = StripSuffixString(worker, "_p");
-  }
-  if (field->is_repeated() && HasSuffixString(worker, "Array")) {
-    worker = StripSuffixString(worker, "Array");
-  }
-  if (field->type() == FieldDescriptor::TYPE_GROUP) {
-    if (worker.length() > 0) {
-      if (ascii_islower(worker[0])) {
-        worker[0] = ascii_toupper(worker[0]);
-      }
-    }
-    return worker;
-  } else {
-    std::string result;
-    for (int i = 0; i < worker.size(); i++) {
-      char c = worker[i];
-      if (ascii_isupper(c)) {
-        if (i > 0) {
-          result += '_';
-        }
-        result += ascii_tolower(c);
-      } else {
-        result += c;
-      }
-    }
-    return result;
-  }
-}
-
-std::string GetCapitalizedType(const FieldDescriptor* field) {
-  switch (field->type()) {
-    case FieldDescriptor::TYPE_INT32:
-      return "Int32";
-    case FieldDescriptor::TYPE_UINT32:
-      return "UInt32";
-    case FieldDescriptor::TYPE_SINT32:
-      return "SInt32";
-    case FieldDescriptor::TYPE_FIXED32:
-      return "Fixed32";
-    case FieldDescriptor::TYPE_SFIXED32:
-      return "SFixed32";
-    case FieldDescriptor::TYPE_INT64:
-      return "Int64";
-    case FieldDescriptor::TYPE_UINT64:
-      return "UInt64";
-    case FieldDescriptor::TYPE_SINT64:
-      return "SInt64";
-    case FieldDescriptor::TYPE_FIXED64:
-      return "Fixed64";
-    case FieldDescriptor::TYPE_SFIXED64:
-      return "SFixed64";
-    case FieldDescriptor::TYPE_FLOAT:
-      return "Float";
-    case FieldDescriptor::TYPE_DOUBLE:
-      return "Double";
-    case FieldDescriptor::TYPE_BOOL:
-      return "Bool";
-    case FieldDescriptor::TYPE_STRING:
-      return "String";
-    case FieldDescriptor::TYPE_BYTES:
-      return "Bytes";
-    case FieldDescriptor::TYPE_ENUM:
-      return "Enum";
-    case FieldDescriptor::TYPE_GROUP:
-      return "Group";
-    case FieldDescriptor::TYPE_MESSAGE:
-      return "Message";
-  }
-
-  // Some compilers report reaching end of function even though all cases of
-  // the enum are handed in the switch.
-  GOOGLE_LOG(FATAL) << "Can't get here.";
-  return std::string();
-}
-
-ObjectiveCType GetObjectiveCType(FieldDescriptor::Type field_type) {
-  switch (field_type) {
-    case FieldDescriptor::TYPE_INT32:
-    case FieldDescriptor::TYPE_SINT32:
-    case FieldDescriptor::TYPE_SFIXED32:
-      return OBJECTIVECTYPE_INT32;
-
-    case FieldDescriptor::TYPE_UINT32:
-    case FieldDescriptor::TYPE_FIXED32:
-      return OBJECTIVECTYPE_UINT32;
-
-    case FieldDescriptor::TYPE_INT64:
-    case FieldDescriptor::TYPE_SINT64:
-    case FieldDescriptor::TYPE_SFIXED64:
-      return OBJECTIVECTYPE_INT64;
-
-    case FieldDescriptor::TYPE_UINT64:
-    case FieldDescriptor::TYPE_FIXED64:
-      return OBJECTIVECTYPE_UINT64;
-
-    case FieldDescriptor::TYPE_FLOAT:
-      return OBJECTIVECTYPE_FLOAT;
-
-    case FieldDescriptor::TYPE_DOUBLE:
-      return OBJECTIVECTYPE_DOUBLE;
-
-    case FieldDescriptor::TYPE_BOOL:
-      return OBJECTIVECTYPE_BOOLEAN;
-
-    case FieldDescriptor::TYPE_STRING:
-      return OBJECTIVECTYPE_STRING;
-
-    case FieldDescriptor::TYPE_BYTES:
-      return OBJECTIVECTYPE_DATA;
-
-    case FieldDescriptor::TYPE_ENUM:
-      return OBJECTIVECTYPE_ENUM;
-
-    case FieldDescriptor::TYPE_GROUP:
-    case FieldDescriptor::TYPE_MESSAGE:
-      return OBJECTIVECTYPE_MESSAGE;
-  }
-
-  // Some compilers report reaching end of function even though all cases of
-  // the enum are handed in the switch.
-  GOOGLE_LOG(FATAL) << "Can't get here.";
-  return OBJECTIVECTYPE_INT32;
-}
-
-bool IsPrimitiveType(const FieldDescriptor* field) {
-  ObjectiveCType type = GetObjectiveCType(field);
-  switch (type) {
-    case OBJECTIVECTYPE_INT32:
-    case OBJECTIVECTYPE_UINT32:
-    case OBJECTIVECTYPE_INT64:
-    case OBJECTIVECTYPE_UINT64:
-    case OBJECTIVECTYPE_FLOAT:
-    case OBJECTIVECTYPE_DOUBLE:
-    case OBJECTIVECTYPE_BOOLEAN:
-    case OBJECTIVECTYPE_ENUM:
-      return true;
-      break;
-    default:
-      return false;
-  }
-}
-
-bool IsReferenceType(const FieldDescriptor* field) {
-  return !IsPrimitiveType(field);
-}
-
-static std::string HandleExtremeFloatingPoint(std::string val,
-                                              bool add_float_suffix) {
-  if (val == "nan") {
-    return "NAN";
-  } else if (val == "inf") {
-    return "INFINITY";
-  } else if (val == "-inf") {
-    return "-INFINITY";
-  } else {
-    // float strings with ., e or E need to have f appended
-    if (add_float_suffix && (val.find(".") != std::string::npos ||
-                             val.find("e") != std::string::npos ||
-                             val.find("E") != std::string::npos)) {
-      val += "f";
-    }
-    return val;
-  }
-}
-
-std::string GPBGenericValueFieldName(const FieldDescriptor* field) {
-  // Returns the field within the GPBGenericValue union to use for the given
-  // field.
-  if (field->is_repeated()) {
-      return "valueMessage";
-  }
-  switch (field->cpp_type()) {
-    case FieldDescriptor::CPPTYPE_INT32:
-      return "valueInt32";
-    case FieldDescriptor::CPPTYPE_UINT32:
-      return "valueUInt32";
-    case FieldDescriptor::CPPTYPE_INT64:
-      return "valueInt64";
-    case FieldDescriptor::CPPTYPE_UINT64:
-      return "valueUInt64";
-    case FieldDescriptor::CPPTYPE_FLOAT:
-      return "valueFloat";
-    case FieldDescriptor::CPPTYPE_DOUBLE:
-      return "valueDouble";
-    case FieldDescriptor::CPPTYPE_BOOL:
-      return "valueBool";
-    case FieldDescriptor::CPPTYPE_STRING:
-      if (field->type() == FieldDescriptor::TYPE_BYTES) {
-        return "valueData";
-      } else {
-        return "valueString";
-      }
-    case FieldDescriptor::CPPTYPE_ENUM:
-      return "valueEnum";
-    case FieldDescriptor::CPPTYPE_MESSAGE:
-      return "valueMessage";
-  }
-
-  // Some compilers report reaching end of function even though all cases of
-  // the enum are handed in the switch.
-  GOOGLE_LOG(FATAL) << "Can't get here.";
-  return std::string();
-}
-
-
-std::string DefaultValue(const FieldDescriptor* field) {
-  // Repeated fields don't have defaults.
-  if (field->is_repeated()) {
-    return "nil";
-  }
-
-  // Switch on cpp_type since we need to know which default_value_* method
-  // of FieldDescriptor to call.
-  switch (field->cpp_type()) {
-    case FieldDescriptor::CPPTYPE_INT32:
-      // gcc and llvm reject the decimal form of kint32min and kint64min.
-      if (field->default_value_int32() == INT_MIN) {
-        return "-0x80000000";
-      }
-      return StrCat(field->default_value_int32());
-    case FieldDescriptor::CPPTYPE_UINT32:
-      return StrCat(field->default_value_uint32()) + "U";
-    case FieldDescriptor::CPPTYPE_INT64:
-      // gcc and llvm reject the decimal form of kint32min and kint64min.
-      if (field->default_value_int64() == LLONG_MIN) {
-        return "-0x8000000000000000LL";
-      }
-      return StrCat(field->default_value_int64()) + "LL";
-    case FieldDescriptor::CPPTYPE_UINT64:
-      return StrCat(field->default_value_uint64()) + "ULL";
-    case FieldDescriptor::CPPTYPE_DOUBLE:
-      return HandleExtremeFloatingPoint(
-          SimpleDtoa(field->default_value_double()), false);
-    case FieldDescriptor::CPPTYPE_FLOAT:
-      return HandleExtremeFloatingPoint(
-          SimpleFtoa(field->default_value_float()), true);
-    case FieldDescriptor::CPPTYPE_BOOL:
-      return field->default_value_bool() ? "YES" : "NO";
-    case FieldDescriptor::CPPTYPE_STRING: {
-      const bool has_default_value = field->has_default_value();
-      const std::string& default_string = field->default_value_string();
-      if (!has_default_value || default_string.length() == 0) {
-        // If the field is defined as being the empty string,
-        // then we will just assign to nil, as the empty string is the
-        // default for both strings and data.
-        return "nil";
-      }
-      if (field->type() == FieldDescriptor::TYPE_BYTES) {
-        // We want constant fields in our data structures so we can
-        // declare them as static. To achieve this we cheat and stuff
-        // a escaped c string (prefixed with a length) into the data
-        // field, and cast it to an (NSData*) so it will compile.
-        // The runtime library knows how to handle it.
-
-        // Must convert to a standard byte order for packing length into
-        // a cstring.
-        uint32_t length = ghtonl(default_string.length());
-        std::string bytes((const char*)&length, sizeof(length));
-        bytes.append(default_string);
-        return "(NSData*)\"" + EscapeTrigraphs(CEscape(bytes)) + "\"";
-      } else {
-        return "@\"" + EscapeTrigraphs(CEscape(default_string)) + "\"";
-      }
-    }
-    case FieldDescriptor::CPPTYPE_ENUM:
-      return EnumValueName(field->default_value_enum());
-    case FieldDescriptor::CPPTYPE_MESSAGE:
-      return "nil";
-  }
-
-  // Some compilers report reaching end of function even though all cases of
-  // the enum are handed in the switch.
-  GOOGLE_LOG(FATAL) << "Can't get here.";
-  return std::string();
-}
-
-bool HasNonZeroDefaultValue(const FieldDescriptor* field) {
-  // Repeated fields don't have defaults.
-  if (field->is_repeated()) {
-    return false;
-  }
-
-  // As much as checking field->has_default_value() seems useful, it isn't
-  // because of enums. proto2 syntax allows the first item in an enum (the
-  // default) to be non zero. So checking field->has_default_value() would
-  // result in missing this non zero default.  See MessageWithOneBasedEnum in
-  // objectivec/Tests/unittest_objc.proto for a test Message to confirm this.
-
-  // Some proto file set the default to the zero value, so make sure the value
-  // isn't the zero case.
-  switch (field->cpp_type()) {
-    case FieldDescriptor::CPPTYPE_INT32:
-      return field->default_value_int32() != 0;
-    case FieldDescriptor::CPPTYPE_UINT32:
-      return field->default_value_uint32() != 0U;
-    case FieldDescriptor::CPPTYPE_INT64:
-      return field->default_value_int64() != 0LL;
-    case FieldDescriptor::CPPTYPE_UINT64:
-      return field->default_value_uint64() != 0ULL;
-    case FieldDescriptor::CPPTYPE_DOUBLE:
-      return field->default_value_double() != 0.0;
-    case FieldDescriptor::CPPTYPE_FLOAT:
-      return field->default_value_float() != 0.0f;
-    case FieldDescriptor::CPPTYPE_BOOL:
-      return field->default_value_bool();
-    case FieldDescriptor::CPPTYPE_STRING: {
-      const std::string& default_string = field->default_value_string();
-      return default_string.length() != 0;
-    }
-    case FieldDescriptor::CPPTYPE_ENUM:
-      return field->default_value_enum()->number() != 0;
-    case FieldDescriptor::CPPTYPE_MESSAGE:
-      return false;
-  }
-
-  // Some compilers report reaching end of function even though all cases of
-  // the enum are handed in the switch.
-  GOOGLE_LOG(FATAL) << "Can't get here.";
-  return false;
-}
-
-std::string BuildFlagsString(const FlagType flag_type,
-                             const std::vector<std::string>& strings) {
-  if (strings.empty()) {
-    return GetZeroEnumNameForFlagType(flag_type);
-  } else if (strings.size() == 1) {
-    return strings[0];
-  }
-  std::string string("(" + GetEnumNameForFlagType(flag_type) + ")(");
-  for (size_t i = 0; i != strings.size(); ++i) {
-    if (i > 0) {
-      string.append(" | ");
-    }
-    string.append(strings[i]);
-  }
-  string.append(")");
-  return string;
-}
-
-std::string BuildCommentsString(const SourceLocation& location,
-                           bool prefer_single_line) {
-  const std::string& comments = location.leading_comments.empty()
-                               ? location.trailing_comments
-                               : location.leading_comments;
-  std::vector<std::string> lines;
-  lines = Split(comments, "\n", false);
-  while (!lines.empty() && lines.back().empty()) {
-    lines.pop_back();
-  }
-  // If there are no comments, just return an empty string.
-  if (lines.empty()) {
-    return "";
-  }
-
-  std::string prefix;
-  std::string suffix;
-  std::string final_comments;
-  std::string epilogue;
-
-  bool add_leading_space = false;
-
-  if (prefer_single_line && lines.size() == 1) {
-    prefix = "/** ";
-    suffix = " */\n";
-  } else {
-    prefix = "* ";
-    suffix = "\n";
-    final_comments += "/**\n";
-    epilogue = " **/\n";
-    add_leading_space = true;
-  }
-
-  for (int i = 0; i < lines.size(); i++) {
-    std::string line = StripPrefixString(lines[i], " ");
-    // HeaderDoc and appledoc use '\' and '@' for markers; escape them.
-    line = StringReplace(line, "\\", "\\\\", true);
-    line = StringReplace(line, "@", "\\@", true);
-    // Decouple / from * to not have inline comments inside comments.
-    line = StringReplace(line, "/*", "/\\*", true);
-    line = StringReplace(line, "*/", "*\\/", true);
-    line = prefix + line;
-    StripWhitespace(&line);
-    // If not a one line, need to add the first space before *, as
-    // StripWhitespace would have removed it.
-    line = (add_leading_space ? " " : "") + line;
-    final_comments += line + suffix;
-  }
-  final_comments += epilogue;
-  return final_comments;
-}
-
-// Making these a generator option for folks that don't use CocoaPods, but do
-// want to put the library in a framework is an interesting question. The
-// problem is it means changing sources shipped with the library to actually
-// use a different value; so it isn't as simple as a option.
-const char* const ProtobufLibraryFrameworkName = "Protobuf";
-
-std::string ProtobufFrameworkImportSymbol(const std::string& framework_name) {
-  // GPB_USE_[framework_name]_FRAMEWORK_IMPORTS
-  std::string result = std::string("GPB_USE_");
-  result += ToUpper(framework_name);
-  result += "_FRAMEWORK_IMPORTS";
-  return result;
-}
-
-bool IsProtobufLibraryBundledProtoFile(const FileDescriptor* file) {
-  // We don't check the name prefix or proto package because some files
-  // (descriptor.proto), aren't shipped generated by the library, so this
-  // seems to be the safest way to only catch the ones shipped.
-  const std::string name = file->name();
-  if (name == "google/protobuf/any.proto" ||
-      name == "google/protobuf/api.proto" ||
-      name == "google/protobuf/duration.proto" ||
-      name == "google/protobuf/empty.proto" ||
-      name == "google/protobuf/field_mask.proto" ||
-      name == "google/protobuf/source_context.proto" ||
-      name == "google/protobuf/struct.proto" ||
-      name == "google/protobuf/timestamp.proto" ||
-      name == "google/protobuf/type.proto" ||
-      name == "google/protobuf/wrappers.proto") {
-    return true;
-  }
-  return false;
-}
-
-bool ReadLine(StringPiece* input, StringPiece* line) {
-  for (int len = 0; len < input->size(); ++len) {
-    if (ascii_isnewline((*input)[len])) {
-      *line = StringPiece(input->data(), len);
-      ++len;  // advance over the newline
-      *input = StringPiece(input->data() + len, input->size() - len);
-      return true;
-    }
-  }
-  return false;  // Ran out of input with no newline.
-}
-
-void RemoveComment(StringPiece* input) {
-  int offset = input->find('#');
-  if (offset != StringPiece::npos) {
-    input->remove_suffix(input->length() - offset);
-  }
-}
-
-namespace {
-
-bool PackageToPrefixesCollector::ConsumeLine(
-    const StringPiece& line, std::string* out_error) {
-  int offset = line.find('=');
-  if (offset == StringPiece::npos) {
-    *out_error = usage_ + " file line without equal sign: '" + StrCat(line) + "'.";
-    return false;
-  }
-  StringPiece package = line.substr(0, offset);
-  StringPiece prefix = line.substr(offset + 1);
-  TrimWhitespace(&package);
-  TrimWhitespace(&prefix);
-  MaybeUnQuote(&prefix);
-  // Don't really worry about error checking the package/prefix for
-  // being valid.  Assume the file is validated when it is created/edited.
-  (*prefix_map_)[std::string(package)] = std::string(prefix);
-  return true;
-}
-
-bool LoadExpectedPackagePrefixes(const std::string& expected_prefixes_path,
-                                 std::map<std::string, std::string>* prefix_map,
-                                 std::string* out_error) {
-  if (expected_prefixes_path.empty()) {
-    return true;
-  }
-
-  PackageToPrefixesCollector collector("Expected prefixes", prefix_map);
-  return ParseSimpleFile(
-      expected_prefixes_path, &collector, out_error);
-}
-
-bool ValidateObjCClassPrefix(
-    const FileDescriptor* file, const std::string& expected_prefixes_path,
-    const std::map<std::string, std::string>& expected_package_prefixes,
-    bool prefixes_must_be_registered, bool require_prefixes,
-    std::string* out_error) {
-  // Reminder: An explicit prefix option of "" is valid in case the default
-  // prefixing is set to use the proto package and a file needs to be generated
-  // without any prefix at all (for legacy reasons).
-
-  bool has_prefix = file->options().has_objc_class_prefix();
-  bool have_expected_prefix_file = !expected_prefixes_path.empty();
-
-  const std::string prefix = file->options().objc_class_prefix();
-  const std::string package = file->package();
-  // For files without packages, the can be registered as "no_package:PATH",
-  // allowing the expected prefixes file.
-  static const std::string no_package_prefix("no_package:");
-  const std::string lookup_key =
-      package.empty() ? no_package_prefix + file->name() : package;
-
-  // NOTE: src/google/protobuf/compiler/plugin.cc makes use of cerr for some
-  // error cases, so it seems to be ok to use as a back door for warnings.
-
-  // Check: Error - See if there was an expected prefix for the package and
-  // report if it doesn't match (wrong or missing).
-  std::map<std::string, std::string>::const_iterator package_match =
-      expected_package_prefixes.find(lookup_key);
-  if (package_match != expected_package_prefixes.end()) {
-    // There was an entry, and...
-    if (has_prefix && package_match->second == prefix) {
-      // ...it matches.  All good, out of here!
-      return true;
-    } else {
-      // ...it didn't match!
-      *out_error = "error: Expected 'option objc_class_prefix = \"" +
-                   package_match->second + "\";'";
-      if (!package.empty()) {
-        *out_error += " for package '" + package + "'";
-      }
-      *out_error += " in '" + file->name() + "'";
-      if (has_prefix) {
-        *out_error += "; but found '" + prefix + "' instead";
-      }
-      *out_error += ".";
-      return false;
-    }
-  }
-
-  // If there was no prefix option, we're done at this point.
-  if (!has_prefix) {
-    if (require_prefixes) {
-      *out_error =
-        "error: '" + file->name() + "' does not have a required 'option" +
-        " objc_class_prefix'.";
-      return false;
-    }
-    return true;
-  }
-
-  // When the prefix is non empty, check it against the expected entries.
-  if (!prefix.empty() && have_expected_prefix_file) {
-    // For a non empty prefix, look for any other package that uses the prefix.
-    std::string other_package_for_prefix;
-    for (std::map<std::string, std::string>::const_iterator i =
-             expected_package_prefixes.begin();
-         i != expected_package_prefixes.end(); ++i) {
-      if (i->second == prefix) {
-        other_package_for_prefix = i->first;
-        // Stop on the first real package listing, if it was a no_package file
-        // specific entry, keep looking to try and find a package one.
-        if (!HasPrefixString(other_package_for_prefix, no_package_prefix)) {
-          break;
-        }
-      }
-    }
-
-    // Check: Error - Make sure the prefix wasn't expected for a different
-    // package (overlap is allowed, but it has to be listed as an expected
-    // overlap).
-    if (!other_package_for_prefix.empty()) {
-      *out_error =
-          "error: Found 'option objc_class_prefix = \"" + prefix +
-          "\";' in '" + file->name() + "'; that prefix is already used for ";
-      if (HasPrefixString(other_package_for_prefix, no_package_prefix)) {
-        *out_error += "file '" +
-          StripPrefixString(other_package_for_prefix, no_package_prefix) +
-          "'.";
-      } else {
-        *out_error += "'package " + other_package_for_prefix + ";'.";
-      }
-      *out_error +=
-        " It can only be reused by adding '" + lookup_key + " = " + prefix +
-        "' to the expected prefixes file (" + expected_prefixes_path + ").";
-      return false;  // Only report first usage of the prefix.
-    }
-  } // !prefix.empty() && have_expected_prefix_file
-
-  // Check: Warning - Make sure the prefix is is a reasonable value according
-  // to Apple's rules (the checks above implicitly whitelist anything that
-  // doesn't meet these rules).
-  if (!prefix.empty() && !ascii_isupper(prefix[0])) {
-    std::cerr
-         << "protoc:0: warning: Invalid 'option objc_class_prefix = \""
-         << prefix << "\";' in '" << file->name() << "';"
-         << " it should start with a capital letter." << std::endl;
-    std::cerr.flush();
-  }
-  if (!prefix.empty() && prefix.length() < 3) {
-    // Apple reserves 2 character prefixes for themselves. They do use some
-    // 3 character prefixes, but they haven't updated the rules/docs.
-    std::cerr
-         << "protoc:0: warning: Invalid 'option objc_class_prefix = \""
-         << prefix << "\";' in '" << file->name() << "';"
-         << " Apple recommends they should be at least 3 characters long."
-         << std::endl;
-    std::cerr.flush();
-  }
-
-  // Check: Error/Warning - If the given package/prefix pair wasn't expected,
-  // issue a error/warning to added to the file.
-  if (have_expected_prefix_file) {
-    if (prefixes_must_be_registered) {
-      *out_error =
-        "error: '" + file->name() + "' has 'option objc_class_prefix = \"" +
-        prefix + "\";', but it is not registered. Add '" + lookup_key + " = " +
-        (prefix.empty() ? "\"\"" : prefix) +
-        "' to the expected prefixes file (" + expected_prefixes_path + ").";
-      return false;
-    }
-
-    std::cerr
-         << "protoc:0: warning: Found unexpected 'option objc_class_prefix = \""
-         << prefix << "\";' in '" << file->name() << "'; consider adding '"
-         << lookup_key << " = " << (prefix.empty() ? "\"\"" : prefix)
-         << "' to the expected prefixes file (" << expected_prefixes_path
-         << ")." << std::endl;
-    std::cerr.flush();
-  }
-
-  return true;
-}
-
-}  // namespace
-
-bool ValidateObjCClassPrefixes(const std::vector<const FileDescriptor*>& files,
-                               std::string* out_error) {
-    // Options's ctor load from the environment.
-    Options options;
-    return ValidateObjCClassPrefixes(files, options, out_error);
-}
-
-bool ValidateObjCClassPrefixes(const std::vector<const FileDescriptor*>& files,
-                               const Options& generation_options,
-                               std::string* out_error) {
-  // Allow a '-' as the path for the expected prefixes to completely disable
-  // even the most basic of checks.
-  if (generation_options.expected_prefixes_path == "-") {
-    return true;
-  }
-
-  // Load the expected package prefixes, if available, to validate against.
-  std::map<std::string, std::string> expected_package_prefixes;
-  if (!LoadExpectedPackagePrefixes(generation_options.expected_prefixes_path,
-                                   &expected_package_prefixes,
-                                   out_error)) {
-    return false;
-  }
-
-  for (int i = 0; i < files.size(); i++) {
-    bool should_skip =
-      (std::find(generation_options.expected_prefixes_suppressions.begin(),
-                 generation_options.expected_prefixes_suppressions.end(),
-                 files[i]->name())
-          != generation_options.expected_prefixes_suppressions.end());
-    if (should_skip) {
-      continue;
-    }
-
-    bool is_valid =
-        ValidateObjCClassPrefix(files[i],
-                                generation_options.expected_prefixes_path,
-                                expected_package_prefixes,
-                                generation_options.prefixes_must_be_registered,
-                                generation_options.require_prefixes,
-                                out_error);
-    if (!is_valid) {
-      return false;
-    }
-  }
-  return true;
-}
-
-TextFormatDecodeData::TextFormatDecodeData() { }
-
-TextFormatDecodeData::~TextFormatDecodeData() { }
-
-void TextFormatDecodeData::AddString(int32_t key,
-                                     const std::string& input_for_decode,
-                                     const std::string& desired_output) {
-  for (std::vector<DataEntry>::const_iterator i = entries_.begin();
-       i != entries_.end(); ++i) {
-    if (i->first == key) {
-      std::cerr << "error: duplicate key (" << key
-           << ") making TextFormat data, input: \"" << input_for_decode
-           << "\", desired: \"" << desired_output << "\"." << std::endl;
-      std::cerr.flush();
-      abort();
-    }
-  }
-
-  const std::string& data = TextFormatDecodeData::DecodeDataForString(
-      input_for_decode, desired_output);
-  entries_.push_back(DataEntry(key, data));
-}
-
-std::string TextFormatDecodeData::Data() const {
-  std::ostringstream data_stringstream;
-
-  if (num_entries() > 0) {
-    io::OstreamOutputStream data_outputstream(&data_stringstream);
-    io::CodedOutputStream output_stream(&data_outputstream);
-
-    output_stream.WriteVarint32(num_entries());
-    for (std::vector<DataEntry>::const_iterator i = entries_.begin();
-         i != entries_.end(); ++i) {
-      output_stream.WriteVarint32(i->first);
-      output_stream.WriteString(i->second);
-    }
-  }
-
-  data_stringstream.flush();
-  return data_stringstream.str();
-}
-
-namespace {
-
-// Helper to build up the decode data for a string.
-class DecodeDataBuilder {
- public:
-  DecodeDataBuilder() { Reset(); }
-
-  bool AddCharacter(const char desired, const char input);
-  void AddUnderscore() {
-    Push();
-    need_underscore_ = true;
-  }
-  std::string Finish() {
-    Push();
-    return decode_data_;
-  }
-
- private:
-  static constexpr uint8_t kAddUnderscore = 0x80;
-
-  static constexpr uint8_t kOpAsIs = 0x00;
-  static constexpr uint8_t kOpFirstUpper = 0x40;
-  static constexpr uint8_t kOpFirstLower = 0x20;
-  static constexpr uint8_t kOpAllUpper = 0x60;
-
-  static constexpr int kMaxSegmentLen = 0x1f;
-
-  void AddChar(const char desired) {
-    ++segment_len_;
-    is_all_upper_ &= ascii_isupper(desired);
-  }
-
-  void Push() {
-    uint8_t op = (op_ | segment_len_);
-    if (need_underscore_) op |= kAddUnderscore;
-    if (op != 0) {
-      decode_data_ += (char)op;
-    }
-    Reset();
-  }
-
-  bool AddFirst(const char desired, const char input) {
-    if (desired == input) {
-      op_ = kOpAsIs;
-    } else if (desired == ascii_toupper(input)) {
-      op_ = kOpFirstUpper;
-    } else if (desired == ascii_tolower(input)) {
-      op_ = kOpFirstLower;
-    } else {
-      // Can't be transformed to match.
-      return false;
-    }
-    AddChar(desired);
-    return true;
-  }
-
-  void Reset() {
-    need_underscore_ = false;
-    op_ = 0;
-    segment_len_ = 0;
-    is_all_upper_ = true;
-  }
-
-  bool need_underscore_;
-  bool is_all_upper_;
-  uint8_t op_;
-  int segment_len_;
-
-  std::string decode_data_;
-};
-
-bool DecodeDataBuilder::AddCharacter(const char desired, const char input) {
-  // If we've hit the max size, push to start a new segment.
-  if (segment_len_ == kMaxSegmentLen) {
-    Push();
-  }
-  if (segment_len_ == 0) {
-    return AddFirst(desired, input);
-  }
-
-  // Desired and input match...
-  if (desired == input) {
-    // If we aren't transforming it, or we're upper casing it and it is
-    // supposed to be uppercase; just add it to the segment.
-    if ((op_ != kOpAllUpper) || ascii_isupper(desired)) {
-      AddChar(desired);
-      return true;
-    }
-
-    // Add the current segment, and start the next one.
-    Push();
-    return AddFirst(desired, input);
-  }
-
-  // If we need to uppercase, and everything so far has been uppercase,
-  // promote op to AllUpper.
-  if ((desired == ascii_toupper(input)) && is_all_upper_) {
-    op_ = kOpAllUpper;
-    AddChar(desired);
-    return true;
-  }
-
-  // Give up, push and start a new segment.
-  Push();
-  return AddFirst(desired, input);
-}
-
-// If decode data can't be generated, a directive for the raw string
-// is used instead.
-std::string DirectDecodeString(const std::string& str) {
-  std::string result;
-  result += (char)'\0';  // Marker for full string.
-  result += str;
-  result += (char)'\0';  // End of string.
-  return result;
-}
-
-}  // namespace
-
-// static
-std::string TextFormatDecodeData::DecodeDataForString(
-    const std::string& input_for_decode, const std::string& desired_output) {
-  if (input_for_decode.empty() || desired_output.empty()) {
-    std::cerr << "error: got empty string for making TextFormat data, input: \""
-         << input_for_decode << "\", desired: \"" << desired_output << "\"."
-         << std::endl;
-    std::cerr.flush();
-    abort();
-  }
-  if ((input_for_decode.find('\0') != std::string::npos) ||
-      (desired_output.find('\0') != std::string::npos)) {
-    std::cerr << "error: got a null char in a string for making TextFormat data,"
-         << " input: \"" << CEscape(input_for_decode) << "\", desired: \""
-         << CEscape(desired_output) << "\"." << std::endl;
-    std::cerr.flush();
-    abort();
-  }
-
-  DecodeDataBuilder builder;
-
-  // Walk the output building it from the input.
-  int x = 0;
-  for (int y = 0; y < desired_output.size(); y++) {
-    const char d = desired_output[y];
-    if (d == '_') {
-      builder.AddUnderscore();
-      continue;
-    }
-
-    if (x >= input_for_decode.size()) {
-      // Out of input, no way to encode it, just return a full decode.
-      return DirectDecodeString(desired_output);
-    }
-    if (builder.AddCharacter(d, input_for_decode[x])) {
-      ++x;  // Consumed one input
-    } else {
-      // Couldn't transform for the next character, just return a full decode.
-      return DirectDecodeString(desired_output);
-    }
-  }
-
-  if (x != input_for_decode.size()) {
-    // Extra input (suffix from name sanitizing?), just return a full decode.
-    return DirectDecodeString(desired_output);
-  }
-
-  // Add the end marker.
-  return builder.Finish() + (char)'\0';
-}
-
-namespace {
-
-class Parser {
- public:
-  Parser(LineConsumer* line_consumer)
-      : line_consumer_(line_consumer), line_(0) {}
-
-  // Feeds in some input, parse what it can, returning success/failure. Calling
-  // again after an error is undefined.
-  bool ParseChunk(StringPiece chunk, std::string* out_error);
-
-  // Should be called to finish parsing (after all input has been provided via
-  // successful calls to ParseChunk(), calling after a ParseChunk() failure is
-  // undefined). Returns success/failure.
-  bool Finish(std::string* out_error);
-
-  int last_line() const { return line_; }
-
- private:
-  LineConsumer* line_consumer_;
-  int line_;
-  std::string leftover_;
-};
-
-bool Parser::ParseChunk(StringPiece chunk, std::string* out_error) {
-  StringPiece full_chunk;
-  if (!leftover_.empty()) {
-    leftover_ += std::string(chunk);
-    full_chunk = StringPiece(leftover_);
-  } else {
-    full_chunk = chunk;
-  }
-
-  StringPiece line;
-  while (ReadLine(&full_chunk, &line)) {
-    ++line_;
-    RemoveComment(&line);
-    TrimWhitespace(&line);
-    if (!line.empty() && !line_consumer_->ConsumeLine(line, out_error)) {
-      if (out_error->empty()) {
-        *out_error = "ConsumeLine failed without setting an error.";
-      }
-      leftover_.clear();
-      return false;
-    }
-  }
-
-  if (full_chunk.empty()) {
-    leftover_.clear();
-  } else {
-    leftover_ = std::string(full_chunk);
-  }
-  return true;
-}
-
-bool Parser::Finish(std::string* out_error) {
-  // If there is still something to go, flush it with a newline.
-  if (!leftover_.empty() && !ParseChunk("\n", out_error)) {
-    return false;
-  }
-  // This really should never fail if ParseChunk succeeded, but check to be sure.
-  if (!leftover_.empty()) {
-    *out_error = "ParseSimple Internal error: finished with pending data.";
-    return false;
-  }
-  return true;
-}
-
-std::string FullErrorString(const std::string& name, int line_num, const std::string& msg) {
-  return std::string("error: ") + name + " Line " + StrCat(line_num) + ", " + msg;
-}
-
-}  // namespace
-
-LineConsumer::LineConsumer() {}
-
-LineConsumer::~LineConsumer() {}
-
-bool ParseSimpleFile(const std::string& path, LineConsumer* line_consumer,
-                     std::string* out_error) {
-  int fd;
-  do {
-    fd = posix::open(path.c_str(), O_RDONLY);
-  } while (fd < 0 && errno == EINTR);
-  if (fd < 0) {
-    *out_error = std::string("error: Unable to open \"") + path + "\", " +
-                 strerror(errno);
-    return false;
-  }
-  io::FileInputStream file_stream(fd);
-  file_stream.SetCloseOnDelete(true);
-
-  return ParseSimpleStream(file_stream, path, line_consumer, out_error);
-}
-
-bool ParseSimpleStream(io::ZeroCopyInputStream& input_stream,
-                       const std::string& stream_name,
-                       LineConsumer* line_consumer,
-                       std::string* out_error) {
-  std::string local_error;
-  Parser parser(line_consumer);
-  const void* buf;
-  int buf_len;
-  while (input_stream.Next(&buf, &buf_len)) {
-    if (buf_len == 0) {
-      continue;
-    }
-
-    if (!parser.ParseChunk(StringPiece(static_cast<const char*>(buf), buf_len),
-                           &local_error)) {
-      *out_error = FullErrorString(stream_name, parser.last_line(), local_error);
-      return false;
-    }
-  }
-  if (!parser.Finish(&local_error)) {
-    *out_error = FullErrorString(stream_name, parser.last_line(), local_error);
-    return false;
-  }
-  return true;
-}
-
-ImportWriter::ImportWriter(
-    const std::string& generate_for_named_framework,
-    const std::string& named_framework_to_proto_path_mappings_path,
-    const std::string& runtime_import_prefix, bool include_wkt_imports)
-    : generate_for_named_framework_(generate_for_named_framework),
-      named_framework_to_proto_path_mappings_path_(
-          named_framework_to_proto_path_mappings_path),
-      runtime_import_prefix_(runtime_import_prefix),
-      include_wkt_imports_(include_wkt_imports),
-      need_to_parse_mapping_file_(true) {}
-
-ImportWriter::~ImportWriter() {}
-
-void ImportWriter::AddFile(const FileDescriptor* file,
-                           const std::string& header_extension) {
-  if (IsProtobufLibraryBundledProtoFile(file)) {
-    // The imports of the WKTs are only needed within the library itself,
-    // in other cases, they get skipped because the generated code already
-    // import GPBProtocolBuffers.h and hence proves them.
-    if (include_wkt_imports_) {
-      const std::string header_name =
-          "GPB" + FilePathBasename(file) + header_extension;
-      protobuf_imports_.push_back(header_name);
-    }
-    return;
-  }
-
-  // Lazy parse any mappings.
-  if (need_to_parse_mapping_file_) {
-    ParseFrameworkMappings();
-  }
-
-  std::map<std::string, std::string>::iterator proto_lookup =
-      proto_file_to_framework_name_.find(file->name());
-  if (proto_lookup != proto_file_to_framework_name_.end()) {
-    other_framework_imports_.push_back(
-        proto_lookup->second + "/" +
-        FilePathBasename(file) + header_extension);
-    return;
-  }
-
-  if (!generate_for_named_framework_.empty()) {
-    other_framework_imports_.push_back(
-        generate_for_named_framework_ + "/" +
-        FilePathBasename(file) + header_extension);
-    return;
-  }
-
-  other_imports_.push_back(FilePath(file) + header_extension);
-}
-
-void ImportWriter::Print(io::Printer* printer) const {
-  bool add_blank_line = false;
-
-  if (!protobuf_imports_.empty()) {
-    PrintRuntimeImports(printer, protobuf_imports_, runtime_import_prefix_);
-    add_blank_line = true;
-  }
-
-  if (!other_framework_imports_.empty()) {
-    if (add_blank_line) {
-      printer->Print("\n");
-    }
-
-    for (std::vector<std::string>::const_iterator iter =
-             other_framework_imports_.begin();
-         iter != other_framework_imports_.end(); ++iter) {
-      printer->Print(
-          "#import <$header$>\n",
-          "header", *iter);
-    }
-
-    add_blank_line = true;
-  }
-
-  if (!other_imports_.empty()) {
-    if (add_blank_line) {
-      printer->Print("\n");
-    }
-
-    for (std::vector<std::string>::const_iterator iter = other_imports_.begin();
-         iter != other_imports_.end(); ++iter) {
-      printer->Print(
-          "#import \"$header$\"\n",
-          "header", *iter);
-    }
-  }
-}
-
-void ImportWriter::PrintRuntimeImports(
-    io::Printer* printer, const std::vector<std::string>& header_to_import,
-    const std::string& runtime_import_prefix, bool default_cpp_symbol) {
-  // Given an override, use that.
-  if (!runtime_import_prefix.empty()) {
-    for (const auto& header : header_to_import) {
-      printer->Print(
-          " #import \"$import_prefix$/$header$\"\n",
-          "import_prefix", runtime_import_prefix,
-          "header", header);
-    }
-    return;
-  }
-
-  const std::string framework_name(ProtobufLibraryFrameworkName);
-  const std::string cpp_symbol(ProtobufFrameworkImportSymbol(framework_name));
-
-  if (default_cpp_symbol) {
-    printer->Print(
-        "// This CPP symbol can be defined to use imports that match up to the framework\n"
-        "// imports needed when using CocoaPods.\n"
-        "#if !defined($cpp_symbol$)\n"
-        " #define $cpp_symbol$ 0\n"
-        "#endif\n"
-        "\n",
-        "cpp_symbol", cpp_symbol);
-  }
-
-  printer->Print(
-      "#if $cpp_symbol$\n",
-      "cpp_symbol", cpp_symbol);
-  for (const auto& header : header_to_import) {
-    printer->Print(
-        " #import <$framework_name$/$header$>\n",
-        "framework_name", framework_name,
-        "header", header);
-  }
-  printer->Print(
-      "#else\n");
-  for (const auto& header : header_to_import) {
-    printer->Print(
-        " #import \"$header$\"\n",
-        "header", header);
-  }
-  printer->Print(
-      "#endif\n");
-}
-
-void ImportWriter::ParseFrameworkMappings() {
-  need_to_parse_mapping_file_ = false;
-  if (named_framework_to_proto_path_mappings_path_.empty()) {
-    return;  // Nothing to do.
-  }
-
-  ProtoFrameworkCollector collector(&proto_file_to_framework_name_);
-  std::string parse_error;
-  if (!ParseSimpleFile(named_framework_to_proto_path_mappings_path_,
-                       &collector, &parse_error)) {
-    std::cerr << "error parsing " << named_framework_to_proto_path_mappings_path_
-         << " : " << parse_error << std::endl;
-    std::cerr.flush();
-  }
-}
-
-bool ImportWriter::ProtoFrameworkCollector::ConsumeLine(
-    const StringPiece& line, std::string* out_error) {
-  int offset = line.find(':');
-  if (offset == StringPiece::npos) {
-    *out_error =
-        std::string("Framework/proto file mapping line without colon sign: '") +
-        std::string(line) + "'.";
-    return false;
-  }
-  StringPiece framework_name = line.substr(0, offset);
-  StringPiece proto_file_list = line.substr(offset + 1);
-  TrimWhitespace(&framework_name);
-
-  int start = 0;
-  while (start < proto_file_list.length()) {
-    offset = proto_file_list.find(',', start);
-    if (offset == StringPiece::npos) {
-      offset = proto_file_list.length();
-    }
-
-    StringPiece proto_file = proto_file_list.substr(start, offset - start);
-    TrimWhitespace(&proto_file);
-    if (!proto_file.empty()) {
-      std::map<std::string, std::string>::iterator existing_entry =
-          map_->find(std::string(proto_file));
-      if (existing_entry != map_->end()) {
-        std::cerr << "warning: duplicate proto file reference, replacing "
-                     "framework entry for '"
-                  << std::string(proto_file) << "' with '" << std::string(framework_name)
-                  << "' (was '" << existing_entry->second << "')." << std::endl;
-        std::cerr.flush();
-      }
-
-      if (proto_file.find(' ') != StringPiece::npos) {
-        std::cerr << "note: framework mapping file had a proto file with a "
-                     "space in, hopefully that isn't a missing comma: '"
-                  << std::string(proto_file) << "'" << std::endl;
-        std::cerr.flush();
-      }
-
-      (*map_)[std::string(proto_file)] = std::string(framework_name);
-    }
-
-    start = offset + 1;
-  }
-
-  return true;
-}
-
-}  // namespace objectivec
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/compiler/objectivec/objectivec_helpers.h b/libs/protobuf/src/google/protobuf/compiler/objectivec/objectivec_helpers.h
deleted file mode 100644
index d21fed2..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/objectivec/objectivec_helpers.h
+++ /dev/null
@@ -1,353 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Helper functions for generating ObjectiveC code.
-
-#ifndef GOOGLE_PROTOBUF_COMPILER_OBJECTIVEC_HELPERS_H__
-#define GOOGLE_PROTOBUF_COMPILER_OBJECTIVEC_HELPERS_H__
-
-#include <string>
-#include <vector>
-
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/descriptor.pb.h>
-#include <google/protobuf/io/zero_copy_stream.h>
-
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace objectivec {
-
-// Get/Set the path to a file to load for objc class prefix lookups.
-std::string PROTOC_EXPORT GetPackageToPrefixMappingsPath();
-void PROTOC_EXPORT SetPackageToPrefixMappingsPath(
-    const std::string& file_path);
-// Get/Set if the proto package should be used to make the default prefix for
-// symbols. This will then impact most of the type naming apis below. It is done
-// as a global to not break any other generator reusing the methods since they
-// are exported.
-bool PROTOC_EXPORT UseProtoPackageAsDefaultPrefix();
-void PROTOC_EXPORT SetUseProtoPackageAsDefaultPrefix(bool on_or_off);
-// Get/Set the path to a file to load as exceptions when
-// `UseProtoPackageAsDefaultPrefix()` is `true`. An empty string means there
-// should be no exceptions.
-std::string PROTOC_EXPORT GetProtoPackagePrefixExceptionList();
-void PROTOC_EXPORT SetProtoPackagePrefixExceptionList(
-    const std::string& file_path);
-
-// Generator Prefix Validation Options (see objectivec_generator.cc for a
-// description of each):
-struct Options {
-  Options();
-  std::string expected_prefixes_path;
-  std::vector<std::string> expected_prefixes_suppressions;
-  bool prefixes_must_be_registered;
-  bool require_prefixes;
-};
-
-// Escape C++ trigraphs by escaping question marks to "\?".
-std::string PROTOC_EXPORT EscapeTrigraphs(const std::string& to_escape);
-
-// Remove white space from either end of a StringPiece.
-void PROTOC_EXPORT TrimWhitespace(StringPiece* input);
-
-// Returns true if the name requires a ns_returns_not_retained attribute applied
-// to it.
-bool PROTOC_EXPORT IsRetainedName(const std::string& name);
-
-// Returns true if the name starts with "init" and will need to have special
-// handling under ARC.
-bool PROTOC_EXPORT IsInitName(const std::string& name);
-
-// Gets the objc_class_prefix or the prefix made from the proto package.
-std::string PROTOC_EXPORT FileClassPrefix(const FileDescriptor* file);
-
-// Gets the path of the file we're going to generate (sans the .pb.h
-// extension).  The path will be dependent on the objectivec package
-// declared in the proto package.
-std::string PROTOC_EXPORT FilePath(const FileDescriptor* file);
-
-// Just like FilePath(), but without the directory part.
-std::string PROTOC_EXPORT FilePathBasename(const FileDescriptor* file);
-
-// Gets the name of the root class we'll generate in the file.  This class
-// is not meant for external consumption, but instead contains helpers that
-// the rest of the classes need
-std::string PROTOC_EXPORT FileClassName(const FileDescriptor* file);
-
-// These return the fully-qualified class name corresponding to the given
-// descriptor.
-std::string PROTOC_EXPORT ClassName(const Descriptor* descriptor);
-std::string PROTOC_EXPORT ClassName(const Descriptor* descriptor,
-                                    std::string* out_suffix_added);
-std::string PROTOC_EXPORT EnumName(const EnumDescriptor* descriptor);
-
-// Returns the fully-qualified name of the enum value corresponding to the
-// the descriptor.
-std::string PROTOC_EXPORT EnumValueName(const EnumValueDescriptor* descriptor);
-
-// Returns the name of the enum value corresponding to the descriptor.
-std::string PROTOC_EXPORT EnumValueShortName(const EnumValueDescriptor* descriptor);
-
-// Reverse what an enum does.
-std::string PROTOC_EXPORT UnCamelCaseEnumShortName(const std::string& name);
-
-// Returns the name to use for the extension (used as the method off the file's
-// Root class).
-std::string PROTOC_EXPORT ExtensionMethodName(const FieldDescriptor* descriptor);
-
-// Returns the transformed field name.
-std::string PROTOC_EXPORT FieldName(const FieldDescriptor* field);
-std::string PROTOC_EXPORT FieldNameCapitalized(const FieldDescriptor* field);
-
-// Returns the transformed oneof name.
-std::string PROTOC_EXPORT OneofEnumName(const OneofDescriptor* descriptor);
-std::string PROTOC_EXPORT OneofName(const OneofDescriptor* descriptor);
-std::string PROTOC_EXPORT OneofNameCapitalized(const OneofDescriptor* descriptor);
-
-// Returns a symbol that can be used in C code to refer to an Objective C
-// class without initializing the class.
-std::string PROTOC_EXPORT ObjCClass(const std::string& class_name);
-
-// Declares an Objective C class without initializing the class so that it can
-// be refrerred to by ObjCClass.
-std::string PROTOC_EXPORT ObjCClassDeclaration(const std::string& class_name);
-
-inline bool HasPreservingUnknownEnumSemantics(const FileDescriptor* file) {
-  return file->syntax() == FileDescriptor::SYNTAX_PROTO3;
-}
-
-inline bool IsMapEntryMessage(const Descriptor* descriptor) {
-  return descriptor->options().map_entry();
-}
-
-// Reverse of the above.
-std::string PROTOC_EXPORT UnCamelCaseFieldName(const std::string& name,
-                                               const FieldDescriptor* field);
-
-enum ObjectiveCType {
-  OBJECTIVECTYPE_INT32,
-  OBJECTIVECTYPE_UINT32,
-  OBJECTIVECTYPE_INT64,
-  OBJECTIVECTYPE_UINT64,
-  OBJECTIVECTYPE_FLOAT,
-  OBJECTIVECTYPE_DOUBLE,
-  OBJECTIVECTYPE_BOOLEAN,
-  OBJECTIVECTYPE_STRING,
-  OBJECTIVECTYPE_DATA,
-  OBJECTIVECTYPE_ENUM,
-  OBJECTIVECTYPE_MESSAGE
-};
-
-enum FlagType {
-  FLAGTYPE_DESCRIPTOR_INITIALIZATION,
-  FLAGTYPE_EXTENSION,
-  FLAGTYPE_FIELD
-};
-
-template <class TDescriptor>
-std::string GetOptionalDeprecatedAttribute(const TDescriptor* descriptor,
-                                           const FileDescriptor* file = NULL,
-                                           bool preSpace = true,
-                                           bool postNewline = false) {
-  bool isDeprecated = descriptor->options().deprecated();
-  // The file is only passed when checking Messages & Enums, so those types
-  // get tagged. At the moment, it doesn't seem to make sense to tag every
-  // field or enum value with when the file is deprecated.
-  bool isFileLevelDeprecation = false;
-  if (!isDeprecated && file) {
-    isFileLevelDeprecation = file->options().deprecated();
-    isDeprecated = isFileLevelDeprecation;
-  }
-  if (isDeprecated) {
-    std::string message;
-    const FileDescriptor* sourceFile = descriptor->file();
-    if (isFileLevelDeprecation) {
-      message = sourceFile->name() + " is deprecated.";
-    } else {
-      message = descriptor->full_name() + " is deprecated (see " +
-                sourceFile->name() + ").";
-    }
-
-    std::string result = std::string("GPB_DEPRECATED_MSG(\"") + message + "\")";
-    if (preSpace) {
-      result.insert(0, " ");
-    }
-    if (postNewline) {
-      result.append("\n");
-    }
-    return result;
-  } else {
-    return "";
-  }
-}
-
-std::string PROTOC_EXPORT GetCapitalizedType(const FieldDescriptor* field);
-
-ObjectiveCType PROTOC_EXPORT
-GetObjectiveCType(FieldDescriptor::Type field_type);
-
-inline ObjectiveCType GetObjectiveCType(const FieldDescriptor* field) {
-  return GetObjectiveCType(field->type());
-}
-
-bool PROTOC_EXPORT IsPrimitiveType(const FieldDescriptor* field);
-bool PROTOC_EXPORT IsReferenceType(const FieldDescriptor* field);
-
-std::string PROTOC_EXPORT
-GPBGenericValueFieldName(const FieldDescriptor* field);
-std::string PROTOC_EXPORT DefaultValue(const FieldDescriptor* field);
-bool PROTOC_EXPORT HasNonZeroDefaultValue(const FieldDescriptor* field);
-
-std::string PROTOC_EXPORT
-BuildFlagsString(const FlagType type, const std::vector<std::string>& strings);
-
-// Builds HeaderDoc/appledoc style comments out of the comments in the .proto
-// file.
-std::string PROTOC_EXPORT BuildCommentsString(const SourceLocation& location,
-                                              bool prefer_single_line);
-
-// The name the commonly used by the library when built as a framework.
-// This lines up to the name used in the CocoaPod.
-extern PROTOC_EXPORT const char* const ProtobufLibraryFrameworkName;
-// Returns the CPP symbol name to use as the gate for framework style imports
-// for the given framework name to use.
-std::string PROTOC_EXPORT
-ProtobufFrameworkImportSymbol(const std::string& framework_name);
-
-// Checks if the file is one of the proto's bundled with the library.
-bool PROTOC_EXPORT
-IsProtobufLibraryBundledProtoFile(const FileDescriptor* file);
-
-// Checks the prefix for the given files and outputs any warnings as needed. If
-// there are flat out errors, then out_error is filled in with the first error
-// and the result is false.
-bool PROTOC_EXPORT ValidateObjCClassPrefixes(
-    const std::vector<const FileDescriptor*>& files,
-    const Options& validation_options, std::string* out_error);
-// Same was the other ValidateObjCClassPrefixes() calls, but the options all
-// come from the environment variables.
-bool PROTOC_EXPORT ValidateObjCClassPrefixes(
-    const std::vector<const FileDescriptor*>& files, std::string* out_error);
-
-// Generate decode data needed for ObjC's GPBDecodeTextFormatName() to transform
-// the input into the expected output.
-class PROTOC_EXPORT TextFormatDecodeData {
- public:
-  TextFormatDecodeData();
-  ~TextFormatDecodeData();
-
-  TextFormatDecodeData(const TextFormatDecodeData&) = delete;
-  TextFormatDecodeData& operator=(const TextFormatDecodeData&) = delete;
-
-  void AddString(int32_t key, const std::string& input_for_decode,
-                 const std::string& desired_output);
-  size_t num_entries() const { return entries_.size(); }
-  std::string Data() const;
-
-  static std::string DecodeDataForString(const std::string& input_for_decode,
-                                         const std::string& desired_output);
-
- private:
-  typedef std::pair<int32_t, std::string> DataEntry;
-  std::vector<DataEntry> entries_;
-};
-
-// Helper for parsing simple files.
-class PROTOC_EXPORT LineConsumer {
- public:
-  LineConsumer();
-  virtual ~LineConsumer();
-  virtual bool ConsumeLine(const StringPiece& line, std::string* out_error) = 0;
-};
-
-bool PROTOC_EXPORT ParseSimpleFile(const std::string& path,
-                                   LineConsumer* line_consumer,
-                                   std::string* out_error);
-
-bool PROTOC_EXPORT ParseSimpleStream(io::ZeroCopyInputStream& input_stream,
-                                     const std::string& stream_name,
-                                     LineConsumer* line_consumer,
-                                     std::string* out_error);
-
-// Helper class for parsing framework import mappings and generating
-// import statements.
-class PROTOC_EXPORT ImportWriter {
- public:
-  ImportWriter(const std::string& generate_for_named_framework,
-               const std::string& named_framework_to_proto_path_mappings_path,
-               const std::string& runtime_import_prefix,
-               bool include_wkt_imports);
-  ~ImportWriter();
-
-  void AddFile(const FileDescriptor* file, const std::string& header_extension);
-  void Print(io::Printer* printer) const;
-
-  static void PrintRuntimeImports(io::Printer* printer,
-                                  const std::vector<std::string>& header_to_import,
-                                  const std::string& runtime_import_prefix,
-                                  bool default_cpp_symbol = false);
-
- private:
-  class ProtoFrameworkCollector : public LineConsumer {
-   public:
-    ProtoFrameworkCollector(std::map<std::string, std::string>* inout_proto_file_to_framework_name)
-        : map_(inout_proto_file_to_framework_name) {}
-
-    virtual bool ConsumeLine(const StringPiece& line, std::string* out_error) override;
-
-   private:
-    std::map<std::string, std::string>* map_;
-  };
-
-  void ParseFrameworkMappings();
-
-  const std::string generate_for_named_framework_;
-  const std::string named_framework_to_proto_path_mappings_path_;
-  const std::string runtime_import_prefix_;
-  const bool include_wkt_imports_;
-  std::map<std::string, std::string> proto_file_to_framework_name_;
-  bool need_to_parse_mapping_file_;
-
-  std::vector<std::string> protobuf_imports_;
-  std::vector<std::string> other_framework_imports_;
-  std::vector<std::string> other_imports_;
-};
-
-}  // namespace objectivec
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
-
-#endif  // GOOGLE_PROTOBUF_COMPILER_OBJECTIVEC_HELPERS_H__
diff --git a/libs/protobuf/src/google/protobuf/compiler/objectivec/objectivec_helpers_unittest.cc b/libs/protobuf/src/google/protobuf/compiler/objectivec/objectivec_helpers_unittest.cc
deleted file mode 100644
index 7ae6a92..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/objectivec/objectivec_helpers_unittest.cc
+++ /dev/null
@@ -1,384 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2014 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <google/protobuf/compiler/objectivec/objectivec_helpers.h>
-#include <google/protobuf/io/zero_copy_stream_impl_lite.h>
-#include <gtest/gtest.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace objectivec {
-namespace {
-
-TEST(ObjCHelper, TextFormatDecodeData_DecodeDataForString_RawStrings) {
-  std::string input_for_decode("abcdefghIJ");
-  std::string desired_output_for_decode;
-  std::string expected;
-  std::string result;
-
-  // Different data, can't transform.
-
-  desired_output_for_decode = "zbcdefghIJ";
-  expected = std::string("\0zbcdefghIJ\0", 12);
-  result = TextFormatDecodeData::DecodeDataForString(input_for_decode,
-                                                     desired_output_for_decode);
-  EXPECT_EQ(expected, result);
-
-  desired_output_for_decode = "abcdezghIJ";
-  expected = std::string("\0abcdezghIJ\0", 12);
-  result = TextFormatDecodeData::DecodeDataForString(input_for_decode,
-                                                     desired_output_for_decode);
-  EXPECT_EQ(expected, result);
-
-  // Shortened data, can't transform.
-
-  desired_output_for_decode = "abcdefghI";
-  expected = std::string("\0abcdefghI\0", 11);
-  result = TextFormatDecodeData::DecodeDataForString(input_for_decode,
-                                                     desired_output_for_decode);
-  EXPECT_EQ(expected, result);
-
-  // Extra data, can't transform.
-
-  desired_output_for_decode = "abcdefghIJz";
-  expected = std::string("\0abcdefghIJz\0", 13);
-  result = TextFormatDecodeData::DecodeDataForString(input_for_decode,
-                                                     desired_output_for_decode);
-  EXPECT_EQ(expected, result);
-}
-
-TEST(ObjCHelper, TextFormatDecodeData_DecodeDataForString_ByteCodes) {
-  std::string input_for_decode("abcdefghIJ");
-  std::string desired_output_for_decode;
-  std::string expected;
-  std::string result;
-
-  desired_output_for_decode = "abcdefghIJ";
-  expected = std::string("\x0A\x0", 2);
-  result = TextFormatDecodeData::DecodeDataForString(input_for_decode,
-                                                     desired_output_for_decode);
-  EXPECT_EQ(expected, result);
-
-  desired_output_for_decode = "_AbcdefghIJ";
-  expected = std::string("\xCA\x0", 2);
-  result = TextFormatDecodeData::DecodeDataForString(input_for_decode,
-                                                     desired_output_for_decode);
-  EXPECT_EQ(expected, result);
-
-  desired_output_for_decode = "ABCD__EfghI_j";
-  expected = std::string("\x64\x80\xC5\xA1\x0", 5);
-  result = TextFormatDecodeData::DecodeDataForString(input_for_decode,
-                                                     desired_output_for_decode);
-  EXPECT_EQ(expected, result);
-
-  // Long name so multiple decode ops are needed.
-
-  input_for_decode =
-      "longFieldNameIsLooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong1000";
-  desired_output_for_decode =
-      "long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_1000";
-  expected = std::string("\x04\xA5\xA4\xA2\xBF\x1F\x0E\x84\x0", 9);
-  result = TextFormatDecodeData::DecodeDataForString(input_for_decode,
-                                                     desired_output_for_decode);
-  EXPECT_EQ(expected, result);
-}
-
-// Death tests do not work on Windows as of yet.
-#ifdef PROTOBUF_HAS_DEATH_TEST
-TEST(ObjCHelperDeathTest, TextFormatDecodeData_DecodeDataForString_Failures) {
-  // Empty inputs.
-
-  EXPECT_EXIT(TextFormatDecodeData::DecodeDataForString("", ""),
-              ::testing::KilledBySignal(SIGABRT),
-              "error: got empty string for making TextFormat data, input:");
-  EXPECT_EXIT(TextFormatDecodeData::DecodeDataForString("a", ""),
-              ::testing::KilledBySignal(SIGABRT),
-              "error: got empty string for making TextFormat data, input:");
-  EXPECT_EXIT(TextFormatDecodeData::DecodeDataForString("", "a"),
-              ::testing::KilledBySignal(SIGABRT),
-              "error: got empty string for making TextFormat data, input:");
-
-  // Null char in the string.
-
-  std::string str_with_null_char("ab\0c", 4);
-  EXPECT_EXIT(
-      TextFormatDecodeData::DecodeDataForString(str_with_null_char, "def"),
-      ::testing::KilledBySignal(SIGABRT),
-      "error: got a null char in a string for making TextFormat data, input:");
-  EXPECT_EXIT(
-      TextFormatDecodeData::DecodeDataForString("def", str_with_null_char),
-      ::testing::KilledBySignal(SIGABRT),
-      "error: got a null char in a string for making TextFormat data, input:");
-}
-#endif  // PROTOBUF_HAS_DEATH_TEST
-
-TEST(ObjCHelper, TextFormatDecodeData_RawStrings) {
-  TextFormatDecodeData decode_data;
-
-  // Different data, can't transform.
-  decode_data.AddString(1, "abcdefghIJ", "zbcdefghIJ");
-  decode_data.AddString(3, "abcdefghIJ", "abcdezghIJ");
-  // Shortened data, can't transform.
-  decode_data.AddString(2, "abcdefghIJ", "abcdefghI");
-  // Extra data, can't transform.
-  decode_data.AddString(4, "abcdefghIJ", "abcdefghIJz");
-
-  EXPECT_EQ(4, decode_data.num_entries());
-
-  uint8_t expected_data[] = {
-      0x4,
-      0x1, 0x0, 'z', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'I', 'J', 0x0,
-      0x3, 0x0, 'a', 'b', 'c', 'd', 'e', 'z', 'g', 'h', 'I', 'J', 0x0,
-      0x2, 0x0, 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'I', 0x0,
-      0x4, 0x0, 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'I', 'J', 'z', 0x0,
-  };
-  std::string expected((const char*)expected_data, sizeof(expected_data));
-
-  EXPECT_EQ(expected, decode_data.Data());
-}
-
-TEST(ObjCHelper, TextFormatDecodeData_ByteCodes) {
-  TextFormatDecodeData decode_data;
-
-  decode_data.AddString(1, "abcdefghIJ", "abcdefghIJ");
-  decode_data.AddString(3, "abcdefghIJ", "_AbcdefghIJ");
-  decode_data.AddString(2, "abcdefghIJ", "Abcd_EfghIJ");
-  decode_data.AddString(4, "abcdefghIJ", "ABCD__EfghI_j");
-  decode_data.AddString(1000,
-                        "longFieldNameIsLooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong1000",
-                        "long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_1000");
-
-  EXPECT_EQ(5, decode_data.num_entries());
-
-  uint8_t expected_data[] = {
-      0x5,
-      // All as is (00 op)
-      0x1,  0x0A, 0x0,
-      // Underscore, upper + 9 (10 op)
-      0x3,  0xCA, 0x0,
-      //  Upper + 3 (10 op), underscore, upper + 5 (10 op)
-      0x2,  0x44, 0xC6, 0x0,
-      // All Upper for 4 (11 op), underscore, underscore, upper + 5 (10 op),
-      // underscore, lower + 0 (01 op)
-      0x4,  0x64, 0x80, 0xC5, 0xA1, 0x0,
-      // 2 byte key: as is + 3 (00 op), underscore, lower + 4 (01 op),
-      //   underscore, lower + 3 (01 op), underscore, lower + 1 (01 op),
-      //   underscore, lower + 30 (01 op), as is + 30 (00 op), as is + 13 (00
-      //   op),
-      //   underscore, as is + 3 (00 op)
-      0xE8, 0x07, 0x04, 0xA5, 0xA4, 0xA2, 0xBF, 0x1F, 0x0E, 0x84, 0x0,
-  };
-  std::string expected((const char*)expected_data, sizeof(expected_data));
-
-  EXPECT_EQ(expected, decode_data.Data());
-}
-
-
-// Death tests do not work on Windows as of yet.
-#ifdef PROTOBUF_HAS_DEATH_TEST
-TEST(ObjCHelperDeathTest, TextFormatDecodeData_Failures) {
-  TextFormatDecodeData decode_data;
-
-  // Empty inputs.
-
-  EXPECT_EXIT(decode_data.AddString(1, "", ""),
-              ::testing::KilledBySignal(SIGABRT),
-              "error: got empty string for making TextFormat data, input:");
-  EXPECT_EXIT(decode_data.AddString(1, "a", ""),
-              ::testing::KilledBySignal(SIGABRT),
-              "error: got empty string for making TextFormat data, input:");
-  EXPECT_EXIT(decode_data.AddString(1, "", "a"),
-              ::testing::KilledBySignal(SIGABRT),
-              "error: got empty string for making TextFormat data, input:");
-
-  // Null char in the string.
-
-  std::string str_with_null_char("ab\0c", 4);
-  EXPECT_EXIT(
-      decode_data.AddString(1, str_with_null_char, "def"),
-      ::testing::KilledBySignal(SIGABRT),
-      "error: got a null char in a string for making TextFormat data, input:");
-  EXPECT_EXIT(
-      decode_data.AddString(1, "def", str_with_null_char),
-      ::testing::KilledBySignal(SIGABRT),
-      "error: got a null char in a string for making TextFormat data, input:");
-
-  // Duplicate keys
-
-  decode_data.AddString(1, "abcdefghIJ", "abcdefghIJ");
-  decode_data.AddString(3, "abcdefghIJ", "_AbcdefghIJ");
-  decode_data.AddString(2, "abcdefghIJ", "Abcd_EfghIJ");
-  EXPECT_EXIT(decode_data.AddString(2, "xyz", "x_yz"),
-              ::testing::KilledBySignal(SIGABRT),
-              "error: duplicate key \\(2\\) making TextFormat data, input:");
-}
-#endif  // PROTOBUF_HAS_DEATH_TEST
-
-class TestLineCollector : public LineConsumer {
- public:
-  TestLineCollector(std::vector<std::string>* inout_lines,
-                    const std::string* reject_line = nullptr,
-                    bool skip_msg = false)
-    : lines_(inout_lines), reject_(reject_line), skip_msg_(skip_msg) {}
-
-  bool ConsumeLine(const StringPiece& line, std::string* out_error) override {
-    if (reject_ && *reject_ == line) {
-      if (!skip_msg_) {
-        *out_error = std::string("Rejected '") + *reject_ + "'";
-      }
-      return false;
-    }
-    if (lines_) {
-      lines_->emplace_back(line);
-    }
-    return true;
-  }
-
- private:
-  std::vector<std::string>* lines_;
-  const std::string* reject_;
-  bool skip_msg_;
-};
-
-const int kBlockSizes[] = {-1, 1, 2, 5, 64};
-const int kBlockSizeCount = GOOGLE_ARRAYSIZE(kBlockSizes);
-
-TEST(ObjCHelper, ParseSimple_BasicsSuccess) {
-  const std::vector<std::pair<std::string, std::vector<std::string>>> tests = {
-    {"", {}},
-    {"a", {"a"}},
-    {"a c", {"a c"}},
-    {" a c ", {"a c"}},
-    {"\ta c ", {"a c"}},
-    {"abc\n", {"abc"}},
-    {"abc\nd f", {"abc", "d f"}},
-    {"\n abc \n def \n\n", {"abc", "def"}},
-  };
-
-  for (const auto& test : tests) {
-    for (int i = 0; i < kBlockSizeCount; i++) {
-      io::ArrayInputStream input(test.first.data(), test.first.size(), kBlockSizes[i]);
-      std::string err_str;
-      std::vector<std::string> lines;
-      TestLineCollector collector(&lines);
-      EXPECT_TRUE(ParseSimpleStream(input, "dummy", &collector, &err_str));
-      EXPECT_EQ(lines, test.second);
-      EXPECT_TRUE(err_str.empty());
-    }
-  }
-}
-
-TEST(ObjCHelper, ParseSimple_DropsComments) {
-  const std::vector<std::pair<std::string, std::vector<std::string>>> tests = {
-    {"# nothing", {}},
-    {"#", {}},
-    {"##", {}},
-    {"\n# nothing\n", {}},
-    {"a # same line", {"a"}},
-    {"a # same line\n", {"a"}},
-    {"a\n# line\nc", {"a", "c"}},
-    {"# n o t # h i n g #", {}},
-    {"## n o # t h i n g #", {}},
-    {"a# n o t # h i n g #", {"a"}},
-    {"a\n## n o # t h i n g #", {"a"}},
-  };
-
-  for (const auto& test : tests) {
-    for (int i = 0; i < kBlockSizeCount; i++) {
-      io::ArrayInputStream input(test.first.data(), test.first.size(), kBlockSizes[i]);
-      std::string err_str;
-      std::vector<std::string> lines;
-      TestLineCollector collector(&lines);
-      EXPECT_TRUE(ParseSimpleStream(input, "dummy", &collector, &err_str));
-      EXPECT_EQ(lines, test.second);
-      EXPECT_TRUE(err_str.empty());
-    }
-  }
-}
-
-TEST(ObjCHelper, ParseSimple_RejectLines) {
-  const std::vector<std::tuple<std::string, std::string, int>> tests = {
-    std::make_tuple("a\nb\nc", "a", 1),
-    std::make_tuple("a\nb\nc", "b", 2),
-    std::make_tuple("a\nb\nc", "c", 3),
-    std::make_tuple("a\nb\nc\n", "c", 3),
-  };
-
-  for (const auto& test : tests) {
-    for (int i = 0; i < kBlockSizeCount; i++) {
-      io::ArrayInputStream input(std::get<0>(test).data(), std::get<0>(test).size(),
-                                 kBlockSizes[i]);
-      std::string err_str;
-      TestLineCollector collector(nullptr, &std::get<1>(test));
-      EXPECT_FALSE(ParseSimpleStream(input, "dummy", &collector, &err_str));
-      std::string expected_err =
-        StrCat("error: dummy Line ", std::get<2>(test), ", Rejected '", std::get<1>(test), "'");
-      EXPECT_EQ(err_str, expected_err);
-    }
-  }
-}
-
-TEST(ObjCHelper, ParseSimple_RejectLinesNoMessage) {
-  const std::vector<std::tuple<std::string, std::string, int>> tests = {
-    std::make_tuple("a\nb\nc", "a", 1),
-    std::make_tuple("a\nb\nc", "b", 2),
-    std::make_tuple("a\nb\nc", "c", 3),
-    std::make_tuple("a\nb\nc\n", "c", 3),
-  };
-
-  for (const auto& test : tests) {
-    for (int i = 0; i < kBlockSizeCount; i++) {
-      io::ArrayInputStream input(std::get<0>(test).data(), std::get<0>(test).size(),
-                                 kBlockSizes[i]);
-      std::string err_str;
-      TestLineCollector collector(nullptr, &std::get<1>(test), true /* skip msg */);
-      EXPECT_FALSE(ParseSimpleStream(input, "dummy", &collector, &err_str));
-      std::string expected_err =
-        StrCat("error: dummy Line ", std::get<2>(test),
-               ", ConsumeLine failed without setting an error.");
-      EXPECT_EQ(err_str, expected_err);
-    }
-  }
-}
-
-// TODO(thomasvl): Should probably add some unittests for all the special cases
-// of name mangling (class name, field name, enum names).  Rather than doing
-// this with an ObjC test in the objectivec directory, we should be able to
-// use src/google/protobuf/compiler/importer* (like other tests) to support a
-// virtual file system to feed in protos, once we have the Descriptor tree, the
-// tests could use the helper methods for generating names and validate the
-// right things are happening.
-
-}  // namespace
-}  // namespace objectivec
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/compiler/objectivec/objectivec_map_field.cc b/libs/protobuf/src/google/protobuf/compiler/objectivec/objectivec_map_field.cc
deleted file mode 100644
index 99d7581..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/objectivec/objectivec_map_field.cc
+++ /dev/null
@@ -1,196 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <map>
-#include <string>
-
-#include <google/protobuf/compiler/objectivec/objectivec_map_field.h>
-#include <google/protobuf/compiler/objectivec/objectivec_helpers.h>
-#include <google/protobuf/io/printer.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace objectivec {
-
-// MapFieldGenerator uses RepeatedFieldGenerator as the parent because it
-// provides a bunch of things (no has* methods, comments for contained type,
-// etc.).
-
-namespace {
-
-const char* MapEntryTypeName(const FieldDescriptor* descriptor, bool isKey) {
-  ObjectiveCType type = GetObjectiveCType(descriptor);
-  switch (type) {
-    case OBJECTIVECTYPE_INT32:
-      return "Int32";
-    case OBJECTIVECTYPE_UINT32:
-      return "UInt32";
-    case OBJECTIVECTYPE_INT64:
-      return "Int64";
-    case OBJECTIVECTYPE_UINT64:
-      return "UInt64";
-    case OBJECTIVECTYPE_FLOAT:
-      return "Float";
-    case OBJECTIVECTYPE_DOUBLE:
-      return "Double";
-    case OBJECTIVECTYPE_BOOLEAN:
-      return "Bool";
-    case OBJECTIVECTYPE_STRING:
-      return (isKey ? "String" : "Object");
-    case OBJECTIVECTYPE_DATA:
-      return "Object";
-    case OBJECTIVECTYPE_ENUM:
-      return "Enum";
-    case OBJECTIVECTYPE_MESSAGE:
-      return "Object";
-  }
-
-  // Some compilers report reaching end of function even though all cases of
-  // the enum are handed in the switch.
-  GOOGLE_LOG(FATAL) << "Can't get here.";
-  return NULL;
-}
-
-}  // namespace
-
-MapFieldGenerator::MapFieldGenerator(const FieldDescriptor* descriptor)
-    : RepeatedFieldGenerator(descriptor) {
-  const FieldDescriptor* key_descriptor =
-      descriptor->message_type()->map_key();
-  const FieldDescriptor* value_descriptor =
-      descriptor->message_type()->map_value();
-  value_field_generator_.reset(FieldGenerator::Make(value_descriptor));
-
-  // Pull over some variables_ from the value.
-  variables_["field_type"] = value_field_generator_->variable("field_type");
-  variables_["default"] = value_field_generator_->variable("default");
-  variables_["default_name"] = value_field_generator_->variable("default_name");
-
-  // Build custom field flags.
-  std::vector<std::string> field_flags;
-  field_flags.push_back("GPBFieldMapKey" + GetCapitalizedType(key_descriptor));
-  // Pull over the current text format custom name values that was calculated.
-  if (variables_["fieldflags"].find("GPBFieldTextFormatNameCustom") !=
-      std::string::npos) {
-    field_flags.push_back("GPBFieldTextFormatNameCustom");
-  }
-  // Pull over some info from the value's flags.
-  const std::string& value_field_flags =
-      value_field_generator_->variable("fieldflags");
-  if (value_field_flags.find("GPBFieldHasDefaultValue") != std::string::npos) {
-    field_flags.push_back("GPBFieldHasDefaultValue");
-  }
-  if (value_field_flags.find("GPBFieldHasEnumDescriptor") !=
-      std::string::npos) {
-    field_flags.push_back("GPBFieldHasEnumDescriptor");
-  }
-
-  variables_["fieldflags"] = BuildFlagsString(FLAGTYPE_FIELD, field_flags);
-
-  ObjectiveCType value_objc_type = GetObjectiveCType(value_descriptor);
-  const bool value_is_object_type =
-      ((value_objc_type == OBJECTIVECTYPE_STRING) ||
-       (value_objc_type == OBJECTIVECTYPE_DATA) ||
-       (value_objc_type == OBJECTIVECTYPE_MESSAGE));
-  if ((GetObjectiveCType(key_descriptor) == OBJECTIVECTYPE_STRING) &&
-      value_is_object_type) {
-    variables_["array_storage_type"] = "NSMutableDictionary";
-    variables_["array_property_type"] =
-        "NSMutableDictionary<NSString*, " +
-        value_field_generator_->variable("storage_type") + "*>";
-  } else {
-    std::string class_name("GPB");
-    class_name += MapEntryTypeName(key_descriptor, true);
-    class_name += MapEntryTypeName(value_descriptor, false);
-    class_name += "Dictionary";
-    variables_["array_storage_type"] = class_name;
-    if (value_is_object_type) {
-      variables_["array_property_type"] =
-          class_name + "<" +
-          value_field_generator_->variable("storage_type") + "*>";
-    }
-  }
-
-  variables_["dataTypeSpecific_name"] =
-      value_field_generator_->variable("dataTypeSpecific_name");
-  variables_["dataTypeSpecific_value"] =
-      value_field_generator_->variable("dataTypeSpecific_value");
-}
-
-MapFieldGenerator::~MapFieldGenerator() {}
-
-void MapFieldGenerator::FinishInitialization(void) {
-  RepeatedFieldGenerator::FinishInitialization();
-  // Use the array_comment support in RepeatedFieldGenerator to output what the
-  // values in the map are.
-  const FieldDescriptor* value_descriptor =
-      descriptor_->message_type()->map_value();
-  if (GetObjectiveCType(value_descriptor) == OBJECTIVECTYPE_ENUM) {
-    variables_["array_comment"] =
-        "// |" + variables_["name"] + "| values are |" + value_field_generator_->variable("storage_type") + "|\n";
-  }
-}
-
-void MapFieldGenerator::DetermineForwardDeclarations(
-    std::set<std::string>* fwd_decls,
-    bool include_external_types) const {
-  RepeatedFieldGenerator::DetermineForwardDeclarations(
-      fwd_decls, include_external_types);
-  const FieldDescriptor* value_descriptor =
-      descriptor_->message_type()->map_value();
-  // Within a file there is no requirement on the order of the messages, so
-  // local references need a forward declaration. External files (not WKTs),
-  // need one when requested.
-  if (GetObjectiveCType(value_descriptor) == OBJECTIVECTYPE_MESSAGE &&
-      ((include_external_types &&
-        !IsProtobufLibraryBundledProtoFile(value_descriptor->file())) ||
-       descriptor_->file() == value_descriptor->file())) {
-    const std::string& value_storage_type =
-        value_field_generator_->variable("storage_type");
-    fwd_decls->insert("@class " + value_storage_type);
-  }
-}
-
-void MapFieldGenerator::DetermineObjectiveCClassDefinitions(
-    std::set<std::string>* fwd_decls) const {
-  // Class name is already in "storage_type".
-  const FieldDescriptor* value_descriptor =
-      descriptor_->message_type()->map_value();
-  if (GetObjectiveCType(value_descriptor) == OBJECTIVECTYPE_MESSAGE) {
-    fwd_decls->insert(ObjCClassDeclaration(
-        value_field_generator_->variable("storage_type")));
-  }
-}
-
-}  // namespace objectivec
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/compiler/objectivec/objectivec_map_field.h b/libs/protobuf/src/google/protobuf/compiler/objectivec/objectivec_map_field.h
deleted file mode 100644
index d9aa387..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/objectivec/objectivec_map_field.h
+++ /dev/null
@@ -1,71 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2015 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef GOOGLE_PROTOBUF_COMPILER_OBJECTIVEC_MAP_FIELD_H__
-#define GOOGLE_PROTOBUF_COMPILER_OBJECTIVEC_MAP_FIELD_H__
-
-#include <map>
-#include <string>
-#include <google/protobuf/compiler/objectivec/objectivec_field.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace objectivec {
-
-class MapFieldGenerator : public RepeatedFieldGenerator {
-  friend FieldGenerator* FieldGenerator::Make(const FieldDescriptor* field);
-
- public:
-  virtual void FinishInitialization(void) override;
-
-  MapFieldGenerator(const MapFieldGenerator&) = delete;
-  MapFieldGenerator& operator=(const MapFieldGenerator&) = delete;
-
- protected:
-  explicit MapFieldGenerator(const FieldDescriptor* descriptor);
-  virtual ~MapFieldGenerator();
-
-  virtual void DetermineObjectiveCClassDefinitions(
-      std::set<std::string>* fwd_decls) const override;
-  virtual void DetermineForwardDeclarations(
-      std::set<std::string>* fwd_decls,
-      bool include_external_types) const override;
-
- private:
-  std::unique_ptr<FieldGenerator> value_field_generator_;
-};
-
-}  // namespace objectivec
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // GOOGLE_PROTOBUF_COMPILER_OBJECTIVEC_MAP_FIELD_H__
diff --git a/libs/protobuf/src/google/protobuf/compiler/objectivec/objectivec_message.cc b/libs/protobuf/src/google/protobuf/compiler/objectivec/objectivec_message.cc
deleted file mode 100644
index 4ebb75c..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/objectivec/objectivec_message.cc
+++ /dev/null
@@ -1,633 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <algorithm>
-#include <iostream>
-#include <sstream>
-
-#include <google/protobuf/compiler/objectivec/objectivec_message.h>
-#include <google/protobuf/compiler/objectivec/objectivec_enum.h>
-#include <google/protobuf/compiler/objectivec/objectivec_extension.h>
-#include <google/protobuf/compiler/objectivec/objectivec_helpers.h>
-#include <google/protobuf/stubs/stl_util.h>
-#include <google/protobuf/stubs/strutil.h>
-#include <google/protobuf/io/printer.h>
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/io/zero_copy_stream_impl.h>
-#include <google/protobuf/descriptor.pb.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace objectivec {
-
-namespace {
-struct FieldOrderingByNumber {
-  inline bool operator()(const FieldDescriptor* a,
-                         const FieldDescriptor* b) const {
-    return a->number() < b->number();
-  }
-};
-
-int OrderGroupForFieldDescriptor(const FieldDescriptor* descriptor) {
-  // The first item in the object structure is our uint32[] for has bits.
-  // We then want to order things to make the instances as small as
-  // possible. So we follow the has bits with:
-  //   1. Anything always 4 bytes - float, *32, enums
-  //   2. Anything that is always a pointer (they will be 8 bytes on 64 bit
-  //      builds and 4 bytes on 32bit builds.
-  //   3. Anything always 8 bytes - double, *64
-  //
-  // NOTE: Bools aren't listed, they were stored in the has bits.
-  //
-  // Why? Using 64bit builds as an example, this means worse case, we have
-  // enough bools that we overflow 1 byte from 4 byte alignment, so 3 bytes
-  // are wasted before the 4 byte values. Then if we have an odd number of
-  // those 4 byte values, the 8 byte values will be pushed down by 32bits to
-  // keep them aligned. But the structure will end 8 byte aligned, so no
-  // waste on the end. If you did the reverse order, you could waste 4 bytes
-  // before the first 8 byte value (after the has array), then a single
-  // bool on the end would need 7 bytes of padding to make the overall
-  // structure 8 byte aligned; so 11 bytes, wasted total.
-
-  // Anything repeated is a GPB*Array/NSArray, so pointer.
-  if (descriptor->is_repeated()) {
-    return 3;
-  }
-
-  switch (descriptor->type()) {
-    // All always 8 bytes.
-    case FieldDescriptor::TYPE_DOUBLE:
-    case FieldDescriptor::TYPE_INT64:
-    case FieldDescriptor::TYPE_SINT64:
-    case FieldDescriptor::TYPE_UINT64:
-    case FieldDescriptor::TYPE_SFIXED64:
-    case FieldDescriptor::TYPE_FIXED64:
-      return 4;
-
-    // Pointers (string and bytes are NSString and NSData); 8 or 4 bytes
-    // depending on the build architecture.
-    case FieldDescriptor::TYPE_GROUP:
-    case FieldDescriptor::TYPE_MESSAGE:
-    case FieldDescriptor::TYPE_STRING:
-    case FieldDescriptor::TYPE_BYTES:
-      return 3;
-
-    // All always 4 bytes (enums are int32s).
-    case FieldDescriptor::TYPE_FLOAT:
-    case FieldDescriptor::TYPE_INT32:
-    case FieldDescriptor::TYPE_SINT32:
-    case FieldDescriptor::TYPE_UINT32:
-    case FieldDescriptor::TYPE_SFIXED32:
-    case FieldDescriptor::TYPE_FIXED32:
-    case FieldDescriptor::TYPE_ENUM:
-      return 2;
-
-    // 0 bytes. Stored in the has bits.
-    case FieldDescriptor::TYPE_BOOL:
-      return 99;  // End of the list (doesn't really matter).
-  }
-
-  // Some compilers report reaching end of function even though all cases of
-  // the enum are handed in the switch.
-  GOOGLE_LOG(FATAL) << "Can't get here.";
-  return 0;
-}
-
-struct FieldOrderingByStorageSize {
-  inline bool operator()(const FieldDescriptor* a,
-                         const FieldDescriptor* b) const {
-    // Order by grouping.
-    const int order_group_a = OrderGroupForFieldDescriptor(a);
-    const int order_group_b = OrderGroupForFieldDescriptor(b);
-    if (order_group_a != order_group_b) {
-      return order_group_a < order_group_b;
-    }
-    // Within the group, order by field number (provides stable ordering).
-    return a->number() < b->number();
-  }
-};
-
-struct ExtensionRangeOrdering {
-  bool operator()(const Descriptor::ExtensionRange* a,
-                  const Descriptor::ExtensionRange* b) const {
-    return a->start < b->start;
-  }
-};
-
-// Sort the fields of the given Descriptor by number into a new[]'d array
-// and return it.
-const FieldDescriptor** SortFieldsByNumber(const Descriptor* descriptor) {
-  const FieldDescriptor** fields =
-      new const FieldDescriptor* [descriptor->field_count()];
-  for (int i = 0; i < descriptor->field_count(); i++) {
-    fields[i] = descriptor->field(i);
-  }
-  std::sort(fields, fields + descriptor->field_count(), FieldOrderingByNumber());
-  return fields;
-}
-
-// Sort the fields of the given Descriptor by storage size into a new[]'d
-// array and return it.
-const FieldDescriptor** SortFieldsByStorageSize(const Descriptor* descriptor) {
-  const FieldDescriptor** fields =
-      new const FieldDescriptor* [descriptor->field_count()];
-  for (int i = 0; i < descriptor->field_count(); i++) {
-    fields[i] = descriptor->field(i);
-  }
-  std::sort(fields, fields + descriptor->field_count(),
-       FieldOrderingByStorageSize());
-  return fields;
-}
-}  // namespace
-
-MessageGenerator::MessageGenerator(const std::string& root_classname,
-                                   const Descriptor* descriptor)
-    : root_classname_(root_classname),
-      descriptor_(descriptor),
-      field_generators_(descriptor),
-      class_name_(ClassName(descriptor_)),
-      deprecated_attribute_(GetOptionalDeprecatedAttribute(
-          descriptor, descriptor->file(), false, true)) {
-  for (int i = 0; i < descriptor_->extension_count(); i++) {
-    extension_generators_.emplace_back(
-        new ExtensionGenerator(class_name_, descriptor_->extension(i)));
-  }
-
-  for (int i = 0; i < descriptor_->real_oneof_decl_count(); i++) {
-    OneofGenerator* generator = new OneofGenerator(descriptor_->oneof_decl(i));
-    oneof_generators_.emplace_back(generator);
-  }
-
-  for (int i = 0; i < descriptor_->enum_type_count(); i++) {
-    EnumGenerator* generator = new EnumGenerator(descriptor_->enum_type(i));
-    enum_generators_.emplace_back(generator);
-  }
-
-  for (int i = 0; i < descriptor_->nested_type_count(); i++) {
-    MessageGenerator* generator =
-        new MessageGenerator(root_classname_,
-                             descriptor_->nested_type(i));
-    nested_message_generators_.emplace_back(generator);
-  }
-}
-
-MessageGenerator::~MessageGenerator() {}
-
-void MessageGenerator::GenerateStaticVariablesInitialization(
-    io::Printer* printer) {
-  for (const auto& generator : extension_generators_) {
-    generator->GenerateStaticVariablesInitialization(printer);
-  }
-
-  for (const auto& generator : nested_message_generators_) {
-    generator->GenerateStaticVariablesInitialization(printer);
-  }
-}
-
-void MessageGenerator::DetermineForwardDeclarations(
-    std::set<std::string>* fwd_decls,
-    bool include_external_types) {
-  if (!IsMapEntryMessage(descriptor_)) {
-    for (int i = 0; i < descriptor_->field_count(); i++) {
-      const FieldDescriptor* fieldDescriptor = descriptor_->field(i);
-      field_generators_.get(fieldDescriptor)
-          .DetermineForwardDeclarations(fwd_decls, include_external_types);
-    }
-  }
-
-  for (const auto& generator : nested_message_generators_) {
-    generator->DetermineForwardDeclarations(fwd_decls, include_external_types);
-  }
-}
-
-void MessageGenerator::DetermineObjectiveCClassDefinitions(
-    std::set<std::string>* fwd_decls) {
-  if (!IsMapEntryMessage(descriptor_)) {
-    for (int i = 0; i < descriptor_->field_count(); i++) {
-      const FieldDescriptor* fieldDescriptor = descriptor_->field(i);
-      field_generators_.get(fieldDescriptor)
-          .DetermineObjectiveCClassDefinitions(fwd_decls);
-    }
-  }
-
-  for (const auto& generator : extension_generators_) {
-    generator->DetermineObjectiveCClassDefinitions(fwd_decls);
-  }
-
-  for (const auto& generator : nested_message_generators_) {
-    generator->DetermineObjectiveCClassDefinitions(fwd_decls);
-  }
-
-  const Descriptor* containing_descriptor = descriptor_->containing_type();
-  if (containing_descriptor != NULL) {
-    std::string containing_class = ClassName(containing_descriptor);
-    fwd_decls->insert(ObjCClassDeclaration(containing_class));
-  }
-}
-
-bool MessageGenerator::IncludesOneOfDefinition() const {
-  if (!oneof_generators_.empty()) {
-    return true;
-  }
-
-  for (const auto& generator : nested_message_generators_) {
-    if (generator->IncludesOneOfDefinition()) {
-      return true;
-    }
-  }
-
-  return false;
-}
-
-void MessageGenerator::GenerateEnumHeader(io::Printer* printer) {
-  for (const auto& generator : enum_generators_) {
-    generator->GenerateHeader(printer);
-  }
-
-  for (const auto& generator : nested_message_generators_) {
-    generator->GenerateEnumHeader(printer);
-  }
-}
-
-void MessageGenerator::GenerateExtensionRegistrationSource(
-    io::Printer* printer) {
-  for (const auto& generator : extension_generators_) {
-    generator->GenerateRegistrationSource(printer);
-  }
-
-  for (const auto& generator : nested_message_generators_) {
-    generator->GenerateExtensionRegistrationSource(printer);
-  }
-}
-
-void MessageGenerator::GenerateMessageHeader(io::Printer* printer) {
-  // This a a map entry message, just recurse and do nothing directly.
-  if (IsMapEntryMessage(descriptor_)) {
-    for (const auto& generator : nested_message_generators_) {
-      generator->GenerateMessageHeader(printer);
-    }
-    return;
-  }
-
-  printer->Print(
-      "#pragma mark - $classname$\n"
-      "\n",
-      "classname", class_name_);
-
-  if (descriptor_->field_count()) {
-    std::unique_ptr<const FieldDescriptor*[]> sorted_fields(
-        SortFieldsByNumber(descriptor_));
-
-    printer->Print("typedef GPB_ENUM($classname$_FieldNumber) {\n",
-                   "classname", class_name_);
-    printer->Indent();
-
-    for (int i = 0; i < descriptor_->field_count(); i++) {
-      field_generators_.get(sorted_fields[i])
-          .GenerateFieldNumberConstant(printer);
-    }
-
-    printer->Outdent();
-    printer->Print("};\n\n");
-  }
-
-  for (const auto& generator : oneof_generators_) {
-    generator->GenerateCaseEnum(printer);
-  }
-
-  std::string message_comments;
-  SourceLocation location;
-  if (descriptor_->GetSourceLocation(&location)) {
-    message_comments = BuildCommentsString(location, false);
-  } else {
-    message_comments = "";
-  }
-
-  printer->Print(
-      "$comments$$deprecated_attribute$GPB_FINAL @interface $classname$ : GPBMessage\n\n",
-      "classname", class_name_,
-      "deprecated_attribute", deprecated_attribute_,
-      "comments", message_comments);
-
-  std::vector<char> seen_oneofs(oneof_generators_.size(), 0);
-  for (int i = 0; i < descriptor_->field_count(); i++) {
-    const FieldDescriptor* field = descriptor_->field(i);
-    const OneofDescriptor* oneof = field->real_containing_oneof();
-    if (oneof) {
-      const int oneof_index = oneof->index();
-      if (!seen_oneofs[oneof_index]) {
-        seen_oneofs[oneof_index] = 1;
-        oneof_generators_[oneof_index]->GeneratePublicCasePropertyDeclaration(
-            printer);
-      }
-    }
-    field_generators_.get(field).GeneratePropertyDeclaration(printer);
-  }
-
-  printer->Print("@end\n\n");
-
-  for (int i = 0; i < descriptor_->field_count(); i++) {
-    field_generators_.get(descriptor_->field(i))
-        .GenerateCFunctionDeclarations(printer);
-  }
-
-  if (!oneof_generators_.empty()) {
-    for (const auto& generator : oneof_generators_) {
-      generator->GenerateClearFunctionDeclaration(printer);
-    }
-    printer->Print("\n");
-  }
-
-  if (descriptor_->extension_count() > 0) {
-    printer->Print("@interface $classname$ (DynamicMethods)\n\n",
-                   "classname", class_name_);
-    for (const auto& generator : extension_generators_) {
-      generator->GenerateMembersHeader(printer);
-    }
-    printer->Print("@end\n\n");
-  }
-
-  for (const auto& generator : nested_message_generators_) {
-    generator->GenerateMessageHeader(printer);
-  }
-}
-
-void MessageGenerator::GenerateSource(io::Printer* printer) {
-  if (!IsMapEntryMessage(descriptor_)) {
-    printer->Print(
-        "#pragma mark - $classname$\n"
-        "\n",
-        "classname", class_name_);
-
-    if (!deprecated_attribute_.empty()) {
-      // No warnings when compiling the impl of this deprecated class.
-      printer->Print(
-          "#pragma clang diagnostic push\n"
-          "#pragma clang diagnostic ignored \"-Wdeprecated-implementations\"\n"
-          "\n");
-    }
-
-    printer->Print("@implementation $classname$\n\n",
-                   "classname", class_name_);
-
-    for (const auto& generator : oneof_generators_) {
-      generator->GeneratePropertyImplementation(printer);
-    }
-
-    for (int i = 0; i < descriptor_->field_count(); i++) {
-      field_generators_.get(descriptor_->field(i))
-          .GeneratePropertyImplementation(printer);
-    }
-
-    std::unique_ptr<const FieldDescriptor*[]> sorted_fields(
-        SortFieldsByNumber(descriptor_));
-    std::unique_ptr<const FieldDescriptor*[]> size_order_fields(
-        SortFieldsByStorageSize(descriptor_));
-
-    std::vector<const Descriptor::ExtensionRange*> sorted_extensions;
-    sorted_extensions.reserve(descriptor_->extension_range_count());
-    for (int i = 0; i < descriptor_->extension_range_count(); ++i) {
-      sorted_extensions.push_back(descriptor_->extension_range(i));
-    }
-
-    std::sort(sorted_extensions.begin(), sorted_extensions.end(),
-         ExtensionRangeOrdering());
-
-    // Assign has bits:
-    // 1. FieldGeneratorMap::CalculateHasBits() loops through the fields seeing
-    //    who needs has bits and assigning them.
-    // 2. FieldGenerator::SetOneofIndexBase() overrides has_bit with a negative
-    //    index that groups all the elements in the oneof.
-    size_t num_has_bits = field_generators_.CalculateHasBits();
-    size_t sizeof_has_storage = (num_has_bits + 31) / 32;
-    if (sizeof_has_storage == 0) {
-      // In the case where no field needs has bits, don't let the _has_storage_
-      // end up as zero length (zero length arrays are sort of a grey area
-      // since it has to be at the start of the struct). This also ensures a
-      // field with only oneofs keeps the required negative indices they need.
-      sizeof_has_storage = 1;
-    }
-    // Tell all the fields the oneof base.
-    for (const auto& generator : oneof_generators_) {
-      generator->SetOneofIndexBase(sizeof_has_storage);
-    }
-    field_generators_.SetOneofIndexBase(sizeof_has_storage);
-    // sizeof_has_storage needs enough bits for the single fields that aren't in
-    // any oneof, and then one int32 for each oneof (to store the field number).
-    sizeof_has_storage += oneof_generators_.size();
-
-    printer->Print(
-        "\n"
-        "typedef struct $classname$__storage_ {\n"
-        "  uint32_t _has_storage_[$sizeof_has_storage$];\n",
-        "classname", class_name_,
-        "sizeof_has_storage", StrCat(sizeof_has_storage));
-    printer->Indent();
-
-    for (int i = 0; i < descriptor_->field_count(); i++) {
-      field_generators_.get(size_order_fields[i])
-          .GenerateFieldStorageDeclaration(printer);
-    }
-    printer->Outdent();
-
-    printer->Print("} $classname$__storage_;\n\n", "classname", class_name_);
-
-
-    printer->Print(
-        "// This method is threadsafe because it is initially called\n"
-        "// in +initialize for each subclass.\n"
-        "+ (GPBDescriptor *)descriptor {\n"
-        "  static GPBDescriptor *descriptor = nil;\n"
-        "  if (!descriptor) {\n");
-
-    TextFormatDecodeData text_format_decode_data;
-    bool has_fields = descriptor_->field_count() > 0;
-    bool need_defaults = field_generators_.DoesAnyFieldHaveNonZeroDefault();
-    std::string field_description_type;
-    if (need_defaults) {
-      field_description_type = "GPBMessageFieldDescriptionWithDefault";
-    } else {
-      field_description_type = "GPBMessageFieldDescription";
-    }
-    if (has_fields) {
-      printer->Indent();
-      printer->Indent();
-      printer->Print(
-          "static $field_description_type$ fields[] = {\n",
-          "field_description_type", field_description_type);
-      printer->Indent();
-      for (int i = 0; i < descriptor_->field_count(); ++i) {
-        const FieldGenerator& field_generator =
-            field_generators_.get(sorted_fields[i]);
-        field_generator.GenerateFieldDescription(printer, need_defaults);
-        if (field_generator.needs_textformat_name_support()) {
-          text_format_decode_data.AddString(sorted_fields[i]->number(),
-                                            field_generator.generated_objc_name(),
-                                            field_generator.raw_field_name());
-        }
-      }
-      printer->Outdent();
-      printer->Print(
-          "};\n");
-      printer->Outdent();
-      printer->Outdent();
-    }
-
-    std::map<std::string, std::string> vars;
-    vars["classname"] = class_name_;
-    vars["rootclassname"] = root_classname_;
-    vars["fields"] = has_fields ? "fields" : "NULL";
-    if (has_fields) {
-      vars["fields_count"] =
-          "(uint32_t)(sizeof(fields) / sizeof(" + field_description_type + "))";
-    } else {
-      vars["fields_count"] = "0";
-    }
-
-    std::vector<std::string> init_flags;
-    init_flags.push_back("GPBDescriptorInitializationFlag_UsesClassRefs");
-    init_flags.push_back("GPBDescriptorInitializationFlag_Proto3OptionalKnown");
-    if (need_defaults) {
-      init_flags.push_back("GPBDescriptorInitializationFlag_FieldsWithDefault");
-    }
-    if (descriptor_->options().message_set_wire_format()) {
-      init_flags.push_back("GPBDescriptorInitializationFlag_WireFormat");
-    }
-    vars["init_flags"] = BuildFlagsString(FLAGTYPE_DESCRIPTOR_INITIALIZATION,
-                                          init_flags);
-
-    printer->Print(
-        vars,
-        "    GPBDescriptor *localDescriptor =\n"
-        "        [GPBDescriptor allocDescriptorForClass:[$classname$ class]\n"
-        "                                     rootClass:[$rootclassname$ class]\n"
-        "                                          file:$rootclassname$_FileDescriptor()\n"
-        "                                        fields:$fields$\n"
-        "                                    fieldCount:$fields_count$\n"
-        "                                   storageSize:sizeof($classname$__storage_)\n"
-        "                                         flags:$init_flags$];\n");
-    if (!oneof_generators_.empty()) {
-      printer->Print(
-          "    static const char *oneofs[] = {\n");
-      for (const auto& generator : oneof_generators_) {
-        printer->Print("      \"$name$\",\n", "name",
-                       generator->DescriptorName());
-      }
-      printer->Print(
-          "    };\n"
-          "    [localDescriptor setupOneofs:oneofs\n"
-          "                           count:(uint32_t)(sizeof(oneofs) / sizeof(char*))\n"
-          "                   firstHasIndex:$first_has_index$];\n",
-          "first_has_index", oneof_generators_[0]->HasIndexAsString());
-    }
-    if (text_format_decode_data.num_entries() != 0) {
-      const std::string text_format_data_str(text_format_decode_data.Data());
-      printer->Print(
-          "#if !GPBOBJC_SKIP_MESSAGE_TEXTFORMAT_EXTRAS\n"
-          "    static const char *extraTextFormatInfo =");
-      static const int kBytesPerLine = 40;  // allow for escaping
-      for (int i = 0; i < text_format_data_str.size(); i += kBytesPerLine) {
-        printer->Print(
-            "\n        \"$data$\"",
-            "data", EscapeTrigraphs(
-                CEscape(text_format_data_str.substr(i, kBytesPerLine))));
-      }
-      printer->Print(
-          ";\n"
-          "    [localDescriptor setupExtraTextInfo:extraTextFormatInfo];\n"
-          "#endif  // !GPBOBJC_SKIP_MESSAGE_TEXTFORMAT_EXTRAS\n");
-    }
-    if (!sorted_extensions.empty()) {
-      printer->Print(
-          "    static const GPBExtensionRange ranges[] = {\n");
-      for (int i = 0; i < sorted_extensions.size(); i++) {
-        printer->Print("      { .start = $start$, .end = $end$ },\n",
-                       "start", StrCat(sorted_extensions[i]->start),
-                       "end", StrCat(sorted_extensions[i]->end));
-      }
-      printer->Print(
-          "    };\n"
-          "    [localDescriptor setupExtensionRanges:ranges\n"
-          "                                    count:(uint32_t)(sizeof(ranges) / sizeof(GPBExtensionRange))];\n");
-    }
-    if (descriptor_->containing_type() != NULL) {
-      std::string containing_class = ClassName(descriptor_->containing_type());
-      std::string parent_class_ref = ObjCClass(containing_class);
-      printer->Print(
-          "    [localDescriptor setupContainingMessageClass:$parent_class_ref$];\n",
-          "parent_class_ref", parent_class_ref);
-    }
-    std::string suffix_added;
-    ClassName(descriptor_, &suffix_added);
-    if (!suffix_added.empty()) {
-      printer->Print(
-          "    [localDescriptor setupMessageClassNameSuffix:@\"$suffix$\"];\n",
-          "suffix", suffix_added);
-    }
-    printer->Print(
-        "    #if defined(DEBUG) && DEBUG\n"
-        "      NSAssert(descriptor == nil, @\"Startup recursed!\");\n"
-        "    #endif  // DEBUG\n"
-        "    descriptor = localDescriptor;\n"
-        "  }\n"
-        "  return descriptor;\n"
-        "}\n\n"
-        "@end\n\n");
-
-    if (!deprecated_attribute_.empty()) {
-      printer->Print(
-          "#pragma clang diagnostic pop\n"
-          "\n");
-    }
-
-    for (int i = 0; i < descriptor_->field_count(); i++) {
-      field_generators_.get(descriptor_->field(i))
-          .GenerateCFunctionImplementations(printer);
-    }
-
-    for (const auto& generator : oneof_generators_) {
-      generator->GenerateClearFunctionImplementation(printer);
-    }
-  }
-
-  for (const auto& generator : enum_generators_) {
-    generator->GenerateSource(printer);
-  }
-
-  for (const auto& generator : nested_message_generators_) {
-    generator->GenerateSource(printer);
-  }
-}
-
-}  // namespace objectivec
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/compiler/objectivec/objectivec_message.h b/libs/protobuf/src/google/protobuf/compiler/objectivec/objectivec_message.h
deleted file mode 100644
index 9d14430..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/objectivec/objectivec_message.h
+++ /dev/null
@@ -1,99 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef GOOGLE_PROTOBUF_COMPILER_OBJECTIVEC_MESSAGE_H__
-#define GOOGLE_PROTOBUF_COMPILER_OBJECTIVEC_MESSAGE_H__
-
-#include <string>
-#include <set>
-#include <vector>
-#include <google/protobuf/compiler/objectivec/objectivec_field.h>
-#include <google/protobuf/compiler/objectivec/objectivec_oneof.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/io/printer.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace objectivec {
-
-class ExtensionGenerator;
-class EnumGenerator;
-
-class MessageGenerator {
- public:
-  MessageGenerator(const std::string& root_classname,
-                   const Descriptor* descriptor);
-  ~MessageGenerator();
-
-  MessageGenerator(const MessageGenerator&) = delete;
-  MessageGenerator& operator=(const MessageGenerator&) = delete;
-
-  void GenerateStaticVariablesInitialization(io::Printer* printer);
-  void GenerateEnumHeader(io::Printer* printer);
-  void GenerateMessageHeader(io::Printer* printer);
-  void GenerateSource(io::Printer* printer);
-  void GenerateExtensionRegistrationSource(io::Printer* printer);
-  void DetermineObjectiveCClassDefinitions(std::set<std::string>* fwd_decls);
-  void DetermineForwardDeclarations(std::set<std::string>* fwd_decls,
-                                    bool include_external_types);
-
-  // Checks if the message or a nested message includes a oneof definition.
-  bool IncludesOneOfDefinition() const;
-
- private:
-  void GenerateParseFromMethodsHeader(io::Printer* printer);
-
-  void GenerateSerializeOneFieldSource(io::Printer* printer,
-                                       const FieldDescriptor* field);
-  void GenerateSerializeOneExtensionRangeSource(
-      io::Printer* printer, const Descriptor::ExtensionRange* range);
-
-  void GenerateMessageDescriptionSource(io::Printer* printer);
-  void GenerateDescriptionOneFieldSource(io::Printer* printer,
-                                         const FieldDescriptor* field);
-
-  const std::string root_classname_;
-  const Descriptor* descriptor_;
-  FieldGeneratorMap field_generators_;
-  const std::string class_name_;
-  const std::string deprecated_attribute_;
-  std::vector<std::unique_ptr<ExtensionGenerator>> extension_generators_;
-  std::vector<std::unique_ptr<EnumGenerator>> enum_generators_;
-  std::vector<std::unique_ptr<MessageGenerator>> nested_message_generators_;
-  std::vector<std::unique_ptr<OneofGenerator>> oneof_generators_;
-};
-
-}  // namespace objectivec
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // GOOGLE_PROTOBUF_COMPILER_OBJECTIVEC_MESSAGE_H__
diff --git a/libs/protobuf/src/google/protobuf/compiler/objectivec/objectivec_message_field.cc b/libs/protobuf/src/google/protobuf/compiler/objectivec/objectivec_message_field.cc
deleted file mode 100644
index 2ff0b44..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/objectivec/objectivec_message_field.cc
+++ /dev/null
@@ -1,123 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <map>
-#include <string>
-
-#include <google/protobuf/compiler/objectivec/objectivec_message_field.h>
-#include <google/protobuf/compiler/objectivec/objectivec_helpers.h>
-#include <google/protobuf/io/printer.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace objectivec {
-
-namespace {
-
-void SetMessageVariables(const FieldDescriptor* descriptor,
-                         std::map<std::string, std::string>* variables) {
-  const std::string& message_type = ClassName(descriptor->message_type());
-  const std::string& containing_class =
-      ClassName(descriptor->containing_type());
-  (*variables)["type"] = message_type;
-  (*variables)["containing_class"] = containing_class;
-  (*variables)["storage_type"] = message_type;
-  (*variables)["group_or_message"] =
-      (descriptor->type() == FieldDescriptor::TYPE_GROUP) ? "Group" : "Message";
-  (*variables)["dataTypeSpecific_value"] = ObjCClass(message_type);
-}
-
-}  // namespace
-
-MessageFieldGenerator::MessageFieldGenerator(const FieldDescriptor* descriptor)
-    : ObjCObjFieldGenerator(descriptor) {
-  SetMessageVariables(descriptor, &variables_);
-}
-
-MessageFieldGenerator::~MessageFieldGenerator() {}
-
-void MessageFieldGenerator::DetermineForwardDeclarations(
-    std::set<std::string>* fwd_decls,
-    bool include_external_types) const {
-  ObjCObjFieldGenerator::DetermineForwardDeclarations(
-      fwd_decls, include_external_types);
-  // Within a file there is no requirement on the order of the messages, so
-  // local references need a forward declaration. External files (not WKTs),
-  // need one when requested.
-  if ((include_external_types &&
-       !IsProtobufLibraryBundledProtoFile(descriptor_->message_type()->file())) ||
-      descriptor_->file() == descriptor_->message_type()->file()) {
-    // Class name is already in "storage_type".
-    fwd_decls->insert("@class " + variable("storage_type"));
-  }
-}
-
-void MessageFieldGenerator::DetermineObjectiveCClassDefinitions(
-    std::set<std::string>* fwd_decls) const {
-  fwd_decls->insert(ObjCClassDeclaration(variable("storage_type")));
-}
-
-RepeatedMessageFieldGenerator::RepeatedMessageFieldGenerator(
-    const FieldDescriptor* descriptor)
-    : RepeatedFieldGenerator(descriptor) {
-  SetMessageVariables(descriptor, &variables_);
-  variables_["array_storage_type"] = "NSMutableArray";
-  variables_["array_property_type"] =
-      "NSMutableArray<" + variables_["storage_type"] + "*>";
-}
-
-RepeatedMessageFieldGenerator::~RepeatedMessageFieldGenerator() {}
-
-void RepeatedMessageFieldGenerator::DetermineForwardDeclarations(
-    std::set<std::string>* fwd_decls,
-    bool include_external_types) const {
-  RepeatedFieldGenerator::DetermineForwardDeclarations(
-      fwd_decls, include_external_types);
-  // Within a file there is no requirement on the order of the messages, so
-  // local references need a forward declaration. External files (not WKTs),
-  // need one when requested.
-  if ((include_external_types &&
-       !IsProtobufLibraryBundledProtoFile(descriptor_->message_type()->file())) ||
-      descriptor_->file() == descriptor_->message_type()->file()) {
-    // Class name is already in "storage_type".
-    fwd_decls->insert("@class " + variable("storage_type"));
-  }
-}
-
-void RepeatedMessageFieldGenerator::DetermineObjectiveCClassDefinitions(
-    std::set<std::string>* fwd_decls) const {
-  fwd_decls->insert(ObjCClassDeclaration(variable("storage_type")));
-}
-
-}  // namespace objectivec
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/compiler/objectivec/objectivec_message_field.h b/libs/protobuf/src/google/protobuf/compiler/objectivec/objectivec_message_field.h
deleted file mode 100644
index 49a84fb..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/objectivec/objectivec_message_field.h
+++ /dev/null
@@ -1,85 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef GOOGLE_PROTOBUF_COMPILER_OBJECTIVEC_MESSAGE_FIELD_H__
-#define GOOGLE_PROTOBUF_COMPILER_OBJECTIVEC_MESSAGE_FIELD_H__
-
-#include <map>
-#include <string>
-#include <google/protobuf/compiler/objectivec/objectivec_field.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace objectivec {
-
-class MessageFieldGenerator : public ObjCObjFieldGenerator {
-  friend FieldGenerator* FieldGenerator::Make(const FieldDescriptor* field);
-
- protected:
-  explicit MessageFieldGenerator(const FieldDescriptor* descriptor);
-
-  MessageFieldGenerator(const MessageFieldGenerator&) = delete;
-  MessageFieldGenerator& operator=(const MessageFieldGenerator&) = delete;
-
-  virtual ~MessageFieldGenerator();
-
- public:
-  virtual void DetermineForwardDeclarations(
-      std::set<std::string>* fwd_decls,
-      bool include_external_types) const override;
-  virtual void DetermineObjectiveCClassDefinitions(
-      std::set<std::string>* fwd_decls) const override;
-};
-
-class RepeatedMessageFieldGenerator : public RepeatedFieldGenerator {
-  friend FieldGenerator* FieldGenerator::Make(const FieldDescriptor* field);
-
- protected:
-  explicit RepeatedMessageFieldGenerator(const FieldDescriptor* descriptor);
-  virtual ~RepeatedMessageFieldGenerator();
-
-  RepeatedMessageFieldGenerator(const RepeatedMessageFieldGenerator&) = delete;
-  RepeatedMessageFieldGenerator operator=(const RepeatedMessageFieldGenerator&) = delete;
-
- public:
-  virtual void DetermineForwardDeclarations(
-      std::set<std::string>* fwd_decls,
-      bool include_external_types) const override;
-  virtual void DetermineObjectiveCClassDefinitions(
-      std::set<std::string>* fwd_decls) const override;
-};
-
-}  // namespace objectivec
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // GOOGLE_PROTOBUF_COMPILER_OBJECTIVEC_MESSAGE_FIELD_H__
diff --git a/libs/protobuf/src/google/protobuf/compiler/objectivec/objectivec_nsobject_methods.h b/libs/protobuf/src/google/protobuf/compiler/objectivec/objectivec_nsobject_methods.h
deleted file mode 100644
index 1633046..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/objectivec/objectivec_nsobject_methods.h
+++ /dev/null
@@ -1,197 +0,0 @@
-// NSObject methods
-// Autogenerated by method_dump.sh. Do not edit by hand.
-// Date: Thu Nov  1 14:12:16 PDT 2018
-// macOS: MacOSX10.14.sdk
-// iOS: iPhoneSimulator12.1.sdk
-
-const char* const kNSObjectMethodsList[] = {
-	"CAMLType",
-	"CA_copyRenderValue",
-	"CA_prepareRenderValue",
-	"NS_copyCGImage",
-	"NS_tiledLayerVisibleRect",
-	"___tryRetain_OA",
-	"__autorelease_OA",
-	"__dealloc_zombie",
-	"__release_OA",
-	"__retain_OA",
-	"_accessibilityFinalize",
-	"_accessibilityIsTableViewDescendant",
-	"_accessibilityUIElementSpecifier",
-	"_accessibilityUseConvenienceAPI",
-	"_allowsDirectEncoding",
-	"_asScriptTerminologyNameArray",
-	"_asScriptTerminologyNameString",
-	"_bindingAdaptor",
-	"_cfTypeID",
-	"_copyDescription",
-	"_destroyObserverList",
-	"_didEndKeyValueObserving",
-	"_implicitObservationInfo",
-	"_internalAccessibilityAttributedHint",
-	"_internalAccessibilityAttributedLabel",
-	"_internalAccessibilityAttributedValue",
-	"_isAXConnector",
-	"_isAccessibilityContainerSectionCandidate",
-	"_isAccessibilityContentNavigatorSectionCandidate",
-	"_isAccessibilityContentSectionCandidate",
-	"_isAccessibilityTopLevelNavigatorSectionCandidate",
-	"_isDeallocating",
-	"_isKVOA",
-	"_isToManyChangeInformation",
-	"_ivarDescription",
-	"_localClassNameForClass",
-	"_methodDescription",
-	"_observerStorage",
-	"_overrideUseFastBlockObservers",
-	"_propertyDescription",
-	"_releaseBindingAdaptor",
-	"_scriptingCount",
-	"_scriptingCountNonrecursively",
-	"_scriptingDebugDescription",
-	"_scriptingExists",
-	"_scriptingShouldCheckObjectIndexes",
-	"_shortMethodDescription",
-	"_shouldSearchChildrenForSection",
-	"_traitStorageList",
-	"_tryRetain",
-	"_ui_descriptionBuilder",
-	"_uikit_variesByTraitCollections",
-	"_web_description",
-	"_webkit_invokeOnMainThread",
-	"_willBeginKeyValueObserving",
-	"accessibilityActivate",
-	"accessibilityActivationPoint",
-	"accessibilityAllowsOverriddenAttributesWhenIgnored",
-	"accessibilityAssistiveTechnologyFocusedIdentifiers",
-	"accessibilityAttributedHint",
-	"accessibilityAttributedLabel",
-	"accessibilityAttributedValue",
-	"accessibilityContainer",
-	"accessibilityContainerType",
-	"accessibilityCustomActions",
-	"accessibilityCustomRotors",
-	"accessibilityDecrement",
-	"accessibilityDragSourceDescriptors",
-	"accessibilityDropPointDescriptors",
-	"accessibilityElementCount",
-	"accessibilityElementDidBecomeFocused",
-	"accessibilityElementDidLoseFocus",
-	"accessibilityElementIsFocused",
-	"accessibilityElements",
-	"accessibilityElementsHidden",
-	"accessibilityFrame",
-	"accessibilityHeaderElements",
-	"accessibilityHint",
-	"accessibilityIdentification",
-	"accessibilityIdentifier",
-	"accessibilityIncrement",
-	"accessibilityLabel",
-	"accessibilityLanguage",
-	"accessibilityLocalizedStringKey",
-	"accessibilityNavigationStyle",
-	"accessibilityOverriddenAttributes",
-	"accessibilityParameterizedAttributeNames",
-	"accessibilityPath",
-	"accessibilityPerformEscape",
-	"accessibilityPerformMagicTap",
-	"accessibilityPresenterProcessIdentifier",
-	"accessibilityShouldUseUniqueId",
-	"accessibilitySupportsNotifications",
-	"accessibilitySupportsOverriddenAttributes",
-	"accessibilityTemporaryChildren",
-	"accessibilityTraits",
-	"accessibilityValue",
-	"accessibilityViewIsModal",
-	"accessibilityVisibleArea",
-	"allPropertyKeys",
-	"allowsWeakReference",
-	"attributeKeys",
-	"autoContentAccessingProxy",
-	"autorelease",
-	"awakeFromNib",
-	"boolValueSafe",
-	"bs_encoded",
-	"bs_isPlistableType",
-	"bs_secureEncoded",
-	"cl_json_serializeKey",
-	"class",
-	"classCode",
-	"classDescription",
-	"classForArchiver",
-	"classForCoder",
-	"classForKeyedArchiver",
-	"classForPortCoder",
-	"className",
-	"clearProperties",
-	"copy",
-	"dealloc",
-	"debugDescription",
-	"defaultAccessibilityTraits",
-	"description",
-	"doubleValueSafe",
-	"entityName",
-	"exposedBindings",
-	"finalize",
-	"finishObserving",
-	"flushKeyBindings",
-	"hash",
-	"init",
-	"int64ValueSafe",
-	"isAccessibilityElement",
-	"isAccessibilityElementByDefault",
-	"isElementAccessibilityExposedToInterfaceBuilder",
-	"isFault",
-	"isNSArray__",
-	"isNSCFConstantString__",
-	"isNSData__",
-	"isNSDate__",
-	"isNSDictionary__",
-	"isNSNumber__",
-	"isNSObject__",
-	"isNSOrderedSet__",
-	"isNSSet__",
-	"isNSString__",
-	"isNSTimeZone__",
-	"isNSValue__",
-	"isProxy",
-	"mutableCopy",
-	"nilValueForKey",
-	"objectSpecifier",
-	"observationInfo",
-	"pep_onDetachedThread",
-	"pep_onMainThread",
-	"pep_onMainThreadIfNecessary",
-	"prepareForInterfaceBuilder",
-	"release",
-	"releaseOnMainThread",
-	"retain",
-	"retainCount",
-	"retainWeakReference",
-	"scriptingProperties",
-	"self",
-	"shouldGroupAccessibilityChildren",
-	"storedAccessibilityActivationPoint",
-	"storedAccessibilityContainerType",
-	"storedAccessibilityElementsHidden",
-	"storedAccessibilityFrame",
-	"storedAccessibilityNavigationStyle",
-	"storedAccessibilityTraits",
-	"storedAccessibilityViewIsModal",
-	"storedIsAccessibilityElement",
-	"storedShouldGroupAccessibilityChildren",
-	"stringValueSafe",
-	"superclass",
-	"toManyRelationshipKeys",
-	"toOneRelationshipKeys",
-	"traitStorageList",
-	"un_safeBoolValue",
-	"userInterfaceItemIdentifier",
-	"utf8ValueSafe",
-	"valuesForKeysWithDictionary",
-	"zone",
-// Protocol: CAAnimatableValue
-// Protocol: CARenderValue
-// Protocol: NSObject
-// Protocol: ROCKRemoteInvocationInterface
-};
diff --git a/libs/protobuf/src/google/protobuf/compiler/objectivec/objectivec_oneof.cc b/libs/protobuf/src/google/protobuf/compiler/objectivec/objectivec_oneof.cc
deleted file mode 100644
index 1bef293..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/objectivec/objectivec_oneof.cc
+++ /dev/null
@@ -1,140 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <map>
-#include <string>
-
-#include <google/protobuf/compiler/objectivec/objectivec_oneof.h>
-#include <google/protobuf/compiler/objectivec/objectivec_helpers.h>
-#include <google/protobuf/io/printer.h>
-#include <google/protobuf/stubs/strutil.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace objectivec {
-
-OneofGenerator::OneofGenerator(const OneofDescriptor* descriptor)
-    : descriptor_(descriptor) {
-  variables_["enum_name"] = OneofEnumName(descriptor_);
-  variables_["name"] = OneofName(descriptor_);
-  variables_["capitalized_name"] = OneofNameCapitalized(descriptor_);
-  variables_["raw_index"] = StrCat(descriptor_->index());
-  const Descriptor* msg_descriptor = descriptor_->containing_type();
-  variables_["owning_message_class"] = ClassName(msg_descriptor);
-
-  std::string comments;
-  SourceLocation location;
-  if (descriptor_->GetSourceLocation(&location)) {
-    comments = BuildCommentsString(location, true);
-  } else {
-    comments = "";
-  }
-  variables_["comments"] = comments;
-}
-
-OneofGenerator::~OneofGenerator() {}
-
-void OneofGenerator::SetOneofIndexBase(int index_base) {
-  int index = descriptor_->index() + index_base;
-  // Flip the sign to mark it as a oneof.
-  variables_["index"] = StrCat(-index);
-}
-
-void OneofGenerator::GenerateCaseEnum(io::Printer* printer) {
-  printer->Print(
-      variables_,
-      "typedef GPB_ENUM($enum_name$) {\n");
-  printer->Indent();
-  printer->Print(
-      variables_,
-      "$enum_name$_GPBUnsetOneOfCase = 0,\n");
-  std::string enum_name = variables_["enum_name"];
-  for (int j = 0; j < descriptor_->field_count(); j++) {
-    const FieldDescriptor* field = descriptor_->field(j);
-    std::string field_name = FieldNameCapitalized(field);
-    printer->Print(
-        "$enum_name$_$field_name$ = $field_number$,\n",
-        "enum_name", enum_name,
-        "field_name", field_name,
-        "field_number", StrCat(field->number()));
-  }
-  printer->Outdent();
-  printer->Print(
-      "};\n"
-      "\n");
-}
-
-void OneofGenerator::GeneratePublicCasePropertyDeclaration(
-    io::Printer* printer) {
-  printer->Print(
-      variables_,
-      "$comments$"
-      "@property(nonatomic, readonly) $enum_name$ $name$OneOfCase;\n"
-      "\n");
-}
-
-void OneofGenerator::GenerateClearFunctionDeclaration(io::Printer* printer) {
-  printer->Print(
-      variables_,
-      "/**\n"
-      " * Clears whatever value was set for the oneof '$name$'.\n"
-      " **/\n"
-      "void $owning_message_class$_Clear$capitalized_name$OneOfCase($owning_message_class$ *message);\n");
-}
-
-void OneofGenerator::GeneratePropertyImplementation(io::Printer* printer) {
-  printer->Print(
-      variables_,
-      "@dynamic $name$OneOfCase;\n");
-}
-
-void OneofGenerator::GenerateClearFunctionImplementation(io::Printer* printer) {
-  printer->Print(
-      variables_,
-      "void $owning_message_class$_Clear$capitalized_name$OneOfCase($owning_message_class$ *message) {\n"
-      "  GPBDescriptor *descriptor = [$owning_message_class$ descriptor];\n"
-      "  GPBOneofDescriptor *oneof = [descriptor.oneofs objectAtIndex:$raw_index$];\n"
-      "  GPBClearOneof(message, oneof);\n"
-      "}\n");
-}
-
-std::string OneofGenerator::DescriptorName(void) const {
-  return variables_.find("name")->second;
-}
-
-std::string OneofGenerator::HasIndexAsString(void) const {
-  return variables_.find("index")->second;
-}
-
-}  // namespace objectivec
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/compiler/objectivec/objectivec_oneof.h b/libs/protobuf/src/google/protobuf/compiler/objectivec/objectivec_oneof.h
deleted file mode 100644
index 034f07f..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/objectivec/objectivec_oneof.h
+++ /dev/null
@@ -1,76 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef GOOGLE_PROTOBUF_COMPILER_OBJECTIVEC_ONEOF_H__
-#define GOOGLE_PROTOBUF_COMPILER_OBJECTIVEC_ONEOF_H__
-
-#include <string>
-#include <set>
-#include <vector>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/io/printer.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace objectivec {
-
-class OneofGenerator {
- public:
-  explicit OneofGenerator(const OneofDescriptor* descriptor);
-  ~OneofGenerator();
-
-  OneofGenerator(const OneofGenerator&) = delete;
-  OneofGenerator& operator=(const OneofGenerator&) = delete;
-
-  void SetOneofIndexBase(int index_base);
-
-  void GenerateCaseEnum(io::Printer* printer);
-
-  void GeneratePublicCasePropertyDeclaration(io::Printer* printer);
-  void GenerateClearFunctionDeclaration(io::Printer* printer);
-
-  void GeneratePropertyImplementation(io::Printer* printer);
-  void GenerateClearFunctionImplementation(io::Printer* printer);
-
-  std::string DescriptorName(void) const;
-  std::string HasIndexAsString(void) const;
-
- private:
-  const OneofDescriptor* descriptor_;
-  std::map<std::string, std::string> variables_;
-};
-
-}  // namespace objectivec
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // GOOGLE_PROTOBUF_COMPILER_OBJECTIVEC_ONEOF_H__
diff --git a/libs/protobuf/src/google/protobuf/compiler/objectivec/objectivec_primitive_field.cc b/libs/protobuf/src/google/protobuf/compiler/objectivec/objectivec_primitive_field.cc
deleted file mode 100644
index 1fefde5..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/objectivec/objectivec_primitive_field.cc
+++ /dev/null
@@ -1,188 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <map>
-#include <string>
-
-#include <google/protobuf/compiler/objectivec/objectivec_helpers.h>
-#include <google/protobuf/compiler/objectivec/objectivec_primitive_field.h>
-#include <google/protobuf/io/printer.h>
-#include <google/protobuf/stubs/strutil.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace objectivec {
-
-using internal::WireFormat;
-using internal::WireFormatLite;
-
-namespace {
-
-const char* PrimitiveTypeName(const FieldDescriptor* descriptor) {
-  ObjectiveCType type = GetObjectiveCType(descriptor);
-  switch (type) {
-    case OBJECTIVECTYPE_INT32:
-      return "int32_t";
-    case OBJECTIVECTYPE_UINT32:
-      return "uint32_t";
-    case OBJECTIVECTYPE_INT64:
-      return "int64_t";
-    case OBJECTIVECTYPE_UINT64:
-      return "uint64_t";
-    case OBJECTIVECTYPE_FLOAT:
-      return "float";
-    case OBJECTIVECTYPE_DOUBLE:
-      return "double";
-    case OBJECTIVECTYPE_BOOLEAN:
-      return "BOOL";
-    case OBJECTIVECTYPE_STRING:
-      return "NSString";
-    case OBJECTIVECTYPE_DATA:
-      return "NSData";
-    case OBJECTIVECTYPE_ENUM:
-      return "int32_t";
-    case OBJECTIVECTYPE_MESSAGE:
-      return NULL;  // Messages go through objectivec_message_field.cc|h.
-  }
-
-  // Some compilers report reaching end of function even though all cases of
-  // the enum are handed in the switch.
-  GOOGLE_LOG(FATAL) << "Can't get here.";
-  return NULL;
-}
-
-const char* PrimitiveArrayTypeName(const FieldDescriptor* descriptor) {
-  ObjectiveCType type = GetObjectiveCType(descriptor);
-  switch (type) {
-    case OBJECTIVECTYPE_INT32:
-      return "Int32";
-    case OBJECTIVECTYPE_UINT32:
-      return "UInt32";
-    case OBJECTIVECTYPE_INT64:
-      return "Int64";
-    case OBJECTIVECTYPE_UINT64:
-      return "UInt64";
-    case OBJECTIVECTYPE_FLOAT:
-      return "Float";
-    case OBJECTIVECTYPE_DOUBLE:
-      return "Double";
-    case OBJECTIVECTYPE_BOOLEAN:
-      return "Bool";
-    case OBJECTIVECTYPE_STRING:
-      return "";  // Want NSArray
-    case OBJECTIVECTYPE_DATA:
-      return "";  // Want NSArray
-    case OBJECTIVECTYPE_ENUM:
-      return "Enum";
-    case OBJECTIVECTYPE_MESSAGE:
-      // Want NSArray (but goes through objectivec_message_field.cc|h).
-      return "";
-  }
-
-  // Some compilers report reaching end of function even though all cases of
-  // the enum are handed in the switch.
-  GOOGLE_LOG(FATAL) << "Can't get here.";
-  return NULL;
-}
-
-void SetPrimitiveVariables(const FieldDescriptor* descriptor,
-                           std::map<std::string, std::string>* variables) {
-  std::string primitive_name = PrimitiveTypeName(descriptor);
-  (*variables)["type"] = primitive_name;
-  (*variables)["storage_type"] = primitive_name;
-}
-
-}  // namespace
-
-PrimitiveFieldGenerator::PrimitiveFieldGenerator(
-    const FieldDescriptor* descriptor)
-    : SingleFieldGenerator(descriptor) {
-  SetPrimitiveVariables(descriptor, &variables_);
-}
-
-PrimitiveFieldGenerator::~PrimitiveFieldGenerator() {}
-
-void PrimitiveFieldGenerator::GenerateFieldStorageDeclaration(
-    io::Printer* printer) const {
-  if (GetObjectiveCType(descriptor_) == OBJECTIVECTYPE_BOOLEAN) {
-    // Nothing, BOOLs are stored in the has bits.
-  } else {
-    SingleFieldGenerator::GenerateFieldStorageDeclaration(printer);
-  }
-}
-
-int PrimitiveFieldGenerator::ExtraRuntimeHasBitsNeeded(void) const {
-  if (GetObjectiveCType(descriptor_) == OBJECTIVECTYPE_BOOLEAN) {
-    // Reserve a bit for the storage of the boolean.
-    return 1;
-  }
-  return 0;
-}
-
-void PrimitiveFieldGenerator::SetExtraRuntimeHasBitsBase(int has_base) {
-  if (GetObjectiveCType(descriptor_) == OBJECTIVECTYPE_BOOLEAN) {
-    // Set into the offset the has bit to use for the actual value.
-    variables_["storage_offset_value"] = StrCat(has_base);
-    variables_["storage_offset_comment"] =
-        "  // Stored in _has_storage_ to save space.";
-  }
-}
-
-PrimitiveObjFieldGenerator::PrimitiveObjFieldGenerator(
-    const FieldDescriptor* descriptor)
-    : ObjCObjFieldGenerator(descriptor) {
-  SetPrimitiveVariables(descriptor, &variables_);
-  variables_["property_storage_attribute"] = "copy";
-}
-
-PrimitiveObjFieldGenerator::~PrimitiveObjFieldGenerator() {}
-
-RepeatedPrimitiveFieldGenerator::RepeatedPrimitiveFieldGenerator(
-    const FieldDescriptor* descriptor)
-    : RepeatedFieldGenerator(descriptor) {
-  SetPrimitiveVariables(descriptor, &variables_);
-
-  std::string base_name = PrimitiveArrayTypeName(descriptor);
-  if (base_name.length()) {
-    variables_["array_storage_type"] = "GPB" + base_name + "Array";
-  } else {
-    variables_["array_storage_type"] = "NSMutableArray";
-    variables_["array_property_type"] =
-        "NSMutableArray<" + variables_["storage_type"] + "*>";
-  }
-}
-
-RepeatedPrimitiveFieldGenerator::~RepeatedPrimitiveFieldGenerator() {}
-
-}  // namespace objectivec
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/compiler/objectivec/objectivec_primitive_field.h b/libs/protobuf/src/google/protobuf/compiler/objectivec/objectivec_primitive_field.h
deleted file mode 100644
index 06a1528..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/objectivec/objectivec_primitive_field.h
+++ /dev/null
@@ -1,87 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef GOOGLE_PROTOBUF_COMPILER_OBJECTIVEC_PRIMITIVE_FIELD_H__
-#define GOOGLE_PROTOBUF_COMPILER_OBJECTIVEC_PRIMITIVE_FIELD_H__
-
-#include <google/protobuf/compiler/objectivec/objectivec_field.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace objectivec {
-
-class PrimitiveFieldGenerator : public SingleFieldGenerator {
-  friend FieldGenerator* FieldGenerator::Make(const FieldDescriptor* field);
-
- protected:
-  explicit PrimitiveFieldGenerator(const FieldDescriptor* descriptor);
-  virtual ~PrimitiveFieldGenerator();
-
-  PrimitiveFieldGenerator(const PrimitiveFieldGenerator&) = delete;
-  PrimitiveFieldGenerator& operator=(const PrimitiveFieldGenerator&) = delete;
-
-  virtual void GenerateFieldStorageDeclaration(io::Printer* printer) const override;
-
-  virtual int ExtraRuntimeHasBitsNeeded(void) const override;
-  virtual void SetExtraRuntimeHasBitsBase(int index_base) override;
-};
-
-class PrimitiveObjFieldGenerator : public ObjCObjFieldGenerator {
-  friend FieldGenerator* FieldGenerator::Make(const FieldDescriptor* field);
-
- protected:
-  explicit PrimitiveObjFieldGenerator(const FieldDescriptor* descriptor);
-  virtual ~PrimitiveObjFieldGenerator();
-
-  PrimitiveObjFieldGenerator(const PrimitiveObjFieldGenerator&) = delete;
-  PrimitiveObjFieldGenerator& operator=(const PrimitiveObjFieldGenerator&) =
-      delete;
-};
-
-class RepeatedPrimitiveFieldGenerator : public RepeatedFieldGenerator {
-  friend FieldGenerator* FieldGenerator::Make(const FieldDescriptor* field);
-
- protected:
-  explicit RepeatedPrimitiveFieldGenerator(const FieldDescriptor* descriptor);
-  virtual ~RepeatedPrimitiveFieldGenerator();
-
-  RepeatedPrimitiveFieldGenerator(const RepeatedPrimitiveFieldGenerator&) =
-      delete;
-  RepeatedPrimitiveFieldGenerator& operator=(
-      const RepeatedPrimitiveFieldGenerator&) = delete;
-};
-
-}  // namespace objectivec
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // GOOGLE_PROTOBUF_COMPILER_OBJECTIVEC_PRIMITIVE_FIELD_H__
diff --git a/libs/protobuf/src/google/protobuf/compiler/package_info.h b/libs/protobuf/src/google/protobuf/compiler/package_info.h
deleted file mode 100644
index 105ef60..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/package_info.h
+++ /dev/null
@@ -1,63 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-//
-// This file exists solely to document the google::protobuf::compiler namespace.
-// It is not compiled into anything, but it may be read by an automated
-// documentation generator.
-
-namespace google {
-namespace protobuf {
-
-// Implementation of the Protocol Buffer compiler.
-//
-// This package contains code for parsing .proto files and generating code
-// based on them.  There are two reasons you might be interested in this
-// package:
-// - You want to parse .proto files at runtime.  In this case, you should
-//   look at importer.h.  Since this functionality is widely useful, it is
-//   included in the libprotobuf base library; you do not have to link against
-//   libprotoc.
-// - You want to write a custom protocol compiler which generates different
-//   kinds of code, e.g. code in a different language which is not supported
-//   by the official compiler.  For this purpose, command_line_interface.h
-//   provides you with a complete compiler front-end, so all you need to do
-//   is write a custom implementation of CodeGenerator and a trivial main()
-//   function.  You can even make your compiler support the official languages
-//   in addition to your own.  Since this functionality is only useful to those
-//   writing custom compilers, it is in a separate library called "libprotoc"
-//   which you will have to link against.
-namespace compiler {}
-
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/compiler/parser.cc b/libs/protobuf/src/google/protobuf/compiler/parser.cc
deleted file mode 100644
index 5bd37d1..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/parser.cc
+++ /dev/null
@@ -1,2446 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-//
-// Recursive descent FTW.
-
-#include <google/protobuf/compiler/parser.h>
-
-#include <float.h>
-
-#include <cstdint>
-#include <limits>
-#include <unordered_map>
-#include <unordered_set>
-
-#include <google/protobuf/stubs/casts.h>
-#include <google/protobuf/stubs/logging.h>
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/stubs/strutil.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/descriptor.pb.h>
-#include <google/protobuf/io/tokenizer.h>
-#include <google/protobuf/wire_format.h>
-#include <google/protobuf/stubs/map_util.h>
-#include <google/protobuf/stubs/hash.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-
-using internal::WireFormat;
-
-namespace {
-
-typedef std::unordered_map<std::string, FieldDescriptorProto::Type> TypeNameMap;
-
-const TypeNameMap& GetTypeNameTable() {
-  static auto* table = new auto([]() {
-    TypeNameMap result;
-
-    result["double"] = FieldDescriptorProto::TYPE_DOUBLE;
-    result["float"] = FieldDescriptorProto::TYPE_FLOAT;
-    result["uint64"] = FieldDescriptorProto::TYPE_UINT64;
-    result["fixed64"] = FieldDescriptorProto::TYPE_FIXED64;
-    result["fixed32"] = FieldDescriptorProto::TYPE_FIXED32;
-    result["bool"] = FieldDescriptorProto::TYPE_BOOL;
-    result["string"] = FieldDescriptorProto::TYPE_STRING;
-    result["group"] = FieldDescriptorProto::TYPE_GROUP;
-
-    result["bytes"] = FieldDescriptorProto::TYPE_BYTES;
-    result["uint32"] = FieldDescriptorProto::TYPE_UINT32;
-    result["sfixed32"] = FieldDescriptorProto::TYPE_SFIXED32;
-    result["sfixed64"] = FieldDescriptorProto::TYPE_SFIXED64;
-    result["int32"] = FieldDescriptorProto::TYPE_INT32;
-    result["int64"] = FieldDescriptorProto::TYPE_INT64;
-    result["sint32"] = FieldDescriptorProto::TYPE_SINT32;
-    result["sint64"] = FieldDescriptorProto::TYPE_SINT64;
-
-    return result;
-  }());
-  return *table;
-}
-
-// Camel-case the field name and append "Entry" for generated map entry name.
-// e.g. map<KeyType, ValueType> foo_map => FooMapEntry
-std::string MapEntryName(const std::string& field_name) {
-  std::string result;
-  static const char kSuffix[] = "Entry";
-  result.reserve(field_name.size() + sizeof(kSuffix));
-  bool cap_next = true;
-  for (const char field_name_char : field_name) {
-    if (field_name_char == '_') {
-      cap_next = true;
-    } else if (cap_next) {
-      // Note: Do not use ctype.h due to locales.
-      if ('a' <= field_name_char && field_name_char <= 'z') {
-        result.push_back(field_name_char - 'a' + 'A');
-      } else {
-        result.push_back(field_name_char);
-      }
-      cap_next = false;
-    } else {
-      result.push_back(field_name_char);
-    }
-  }
-  result.append(kSuffix);
-  return result;
-}
-
-bool IsUppercase(char c) { return c >= 'A' && c <= 'Z'; }
-
-bool IsLowercase(char c) { return c >= 'a' && c <= 'z'; }
-
-bool IsNumber(char c) { return c >= '0' && c <= '9'; }
-
-bool IsUpperCamelCase(const std::string& name) {
-  if (name.empty()) {
-    return true;
-  }
-  // Name must start with an upper case character.
-  if (!IsUppercase(name[0])) {
-    return false;
-  }
-  // Must not contains underscore.
-  for (const char c : name) {
-    if (c == '_') {
-      return false;
-    }
-  }
-  return true;
-}
-
-bool IsUpperUnderscore(const std::string& name) {
-  for (const char c : name) {
-    if (!IsUppercase(c) && c != '_' && !IsNumber(c)) {
-      return false;
-    }
-  }
-  return true;
-}
-
-bool IsLowerUnderscore(const std::string& name) {
-  for (const char c : name) {
-    if (!IsLowercase(c) && c != '_' && !IsNumber(c)) {
-      return false;
-    }
-  }
-  return true;
-}
-
-bool IsNumberFollowUnderscore(const std::string& name) {
-  for (int i = 1; i < name.length(); i++) {
-    const char c = name[i];
-    if (IsNumber(c) && name[i - 1] == '_') {
-      return true;
-    }
-  }
-  return false;
-}
-
-}  // anonymous namespace
-
-// Makes code slightly more readable.  The meaning of "DO(foo)" is
-// "Execute foo and fail if it fails.", where failure is indicated by
-// returning false.
-#define DO(STATEMENT) \
-  if (STATEMENT) {    \
-  } else              \
-    return false
-
-// ===================================================================
-
-Parser::Parser()
-    : input_(nullptr),
-      error_collector_(nullptr),
-      source_location_table_(nullptr),
-      had_errors_(false),
-      require_syntax_identifier_(false),
-      stop_after_syntax_identifier_(false) {
-}
-
-Parser::~Parser() {}
-
-// ===================================================================
-
-inline bool Parser::LookingAt(const char* text) {
-  return input_->current().text == text;
-}
-
-inline bool Parser::LookingAtType(io::Tokenizer::TokenType token_type) {
-  return input_->current().type == token_type;
-}
-
-inline bool Parser::AtEnd() { return LookingAtType(io::Tokenizer::TYPE_END); }
-
-bool Parser::TryConsume(const char* text) {
-  if (LookingAt(text)) {
-    input_->Next();
-    return true;
-  } else {
-    return false;
-  }
-}
-
-bool Parser::Consume(const char* text, const char* error) {
-  if (TryConsume(text)) {
-    return true;
-  } else {
-    AddError(error);
-    return false;
-  }
-}
-
-bool Parser::Consume(const char* text) {
-  std::string error = "Expected \"" + std::string(text) + "\".";
-  return Consume(text, error.c_str());
-}
-
-bool Parser::ConsumeIdentifier(std::string* output, const char* error) {
-  if (LookingAtType(io::Tokenizer::TYPE_IDENTIFIER)) {
-    *output = input_->current().text;
-    input_->Next();
-    return true;
-  } else {
-    AddError(error);
-    return false;
-  }
-}
-
-bool Parser::ConsumeInteger(int* output, const char* error) {
-  if (LookingAtType(io::Tokenizer::TYPE_INTEGER)) {
-    uint64_t value = 0;
-    if (!io::Tokenizer::ParseInteger(input_->current().text,
-                                     std::numeric_limits<int32_t>::max(),
-                                     &value)) {
-      AddError("Integer out of range.");
-      // We still return true because we did, in fact, parse an integer.
-    }
-    *output = value;
-    input_->Next();
-    return true;
-  } else {
-    AddError(error);
-    return false;
-  }
-}
-
-bool Parser::ConsumeSignedInteger(int* output, const char* error) {
-  bool is_negative = false;
-  uint64_t max_value = std::numeric_limits<int32_t>::max();
-  if (TryConsume("-")) {
-    is_negative = true;
-    max_value += 1;
-  }
-  uint64_t value = 0;
-  DO(ConsumeInteger64(max_value, &value, error));
-  if (is_negative) value *= -1;
-  *output = value;
-  return true;
-}
-
-bool Parser::ConsumeInteger64(uint64_t max_value, uint64_t* output,
-                              const char* error) {
-  if (LookingAtType(io::Tokenizer::TYPE_INTEGER)) {
-    if (!io::Tokenizer::ParseInteger(input_->current().text, max_value,
-                                     output)) {
-      AddError("Integer out of range.");
-      // We still return true because we did, in fact, parse an integer.
-      *output = 0;
-    }
-    input_->Next();
-    return true;
-  } else {
-    AddError(error);
-    return false;
-  }
-}
-
-bool Parser::ConsumeNumber(double* output, const char* error) {
-  if (LookingAtType(io::Tokenizer::TYPE_FLOAT)) {
-    *output = io::Tokenizer::ParseFloat(input_->current().text);
-    input_->Next();
-    return true;
-  } else if (LookingAtType(io::Tokenizer::TYPE_INTEGER)) {
-    // Also accept integers.
-    uint64_t value = 0;
-    if (!io::Tokenizer::ParseInteger(input_->current().text,
-                                     std::numeric_limits<uint64_t>::max(),
-                                     &value)) {
-      AddError("Integer out of range.");
-      // We still return true because we did, in fact, parse a number.
-    }
-    *output = value;
-    input_->Next();
-    return true;
-  } else if (LookingAt("inf")) {
-    *output = std::numeric_limits<double>::infinity();
-    input_->Next();
-    return true;
-  } else if (LookingAt("nan")) {
-    *output = std::numeric_limits<double>::quiet_NaN();
-    input_->Next();
-    return true;
-  } else {
-    AddError(error);
-    return false;
-  }
-}
-
-bool Parser::ConsumeString(std::string* output, const char* error) {
-  if (LookingAtType(io::Tokenizer::TYPE_STRING)) {
-    io::Tokenizer::ParseString(input_->current().text, output);
-    input_->Next();
-    // Allow C++ like concatenation of adjacent string tokens.
-    while (LookingAtType(io::Tokenizer::TYPE_STRING)) {
-      io::Tokenizer::ParseStringAppend(input_->current().text, output);
-      input_->Next();
-    }
-    return true;
-  } else {
-    AddError(error);
-    return false;
-  }
-}
-
-bool Parser::TryConsumeEndOfDeclaration(const char* text,
-                                        const LocationRecorder* location) {
-  if (LookingAt(text)) {
-    std::string leading, trailing;
-    std::vector<std::string> detached;
-    input_->NextWithComments(&trailing, &detached, &leading);
-
-    // Save the leading comments for next time, and recall the leading comments
-    // from last time.
-    leading.swap(upcoming_doc_comments_);
-
-    if (location != nullptr) {
-      upcoming_detached_comments_.swap(detached);
-      location->AttachComments(&leading, &trailing, &detached);
-    } else if (strcmp(text, "}") == 0) {
-      // If the current location is null and we are finishing the current scope,
-      // drop pending upcoming detached comments.
-      upcoming_detached_comments_.swap(detached);
-    } else {
-      // Otherwise, append the new detached comments to the existing upcoming
-      // detached comments.
-      upcoming_detached_comments_.insert(upcoming_detached_comments_.end(),
-                                         detached.begin(), detached.end());
-    }
-
-    return true;
-  } else {
-    return false;
-  }
-}
-
-bool Parser::ConsumeEndOfDeclaration(const char* text,
-                                     const LocationRecorder* location) {
-  if (TryConsumeEndOfDeclaration(text, location)) {
-    return true;
-  } else {
-    AddError("Expected \"" + std::string(text) + "\".");
-    return false;
-  }
-}
-
-// -------------------------------------------------------------------
-
-void Parser::AddError(int line, int column, const std::string& error) {
-  if (error_collector_ != nullptr) {
-    error_collector_->AddError(line, column, error);
-  }
-  had_errors_ = true;
-}
-
-void Parser::AddError(const std::string& error) {
-  AddError(input_->current().line, input_->current().column, error);
-}
-
-void Parser::AddWarning(const std::string& warning) {
-  if (error_collector_ != nullptr) {
-    error_collector_->AddWarning(input_->current().line,
-                                 input_->current().column, warning);
-  }
-}
-
-// -------------------------------------------------------------------
-
-Parser::LocationRecorder::LocationRecorder(Parser* parser)
-    : parser_(parser),
-      source_code_info_(parser->source_code_info_),
-      location_(parser_->source_code_info_->add_location()) {
-  location_->add_span(parser_->input_->current().line);
-  location_->add_span(parser_->input_->current().column);
-}
-
-Parser::LocationRecorder::LocationRecorder(const LocationRecorder& parent) {
-  Init(parent, parent.source_code_info_);
-}
-
-Parser::LocationRecorder::LocationRecorder(const LocationRecorder& parent,
-                                           int path1,
-                                           SourceCodeInfo* source_code_info) {
-  Init(parent, source_code_info);
-  AddPath(path1);
-}
-
-Parser::LocationRecorder::LocationRecorder(const LocationRecorder& parent,
-                                           int path1) {
-  Init(parent, parent.source_code_info_);
-  AddPath(path1);
-}
-
-Parser::LocationRecorder::LocationRecorder(const LocationRecorder& parent,
-                                           int path1, int path2) {
-  Init(parent, parent.source_code_info_);
-  AddPath(path1);
-  AddPath(path2);
-}
-
-void Parser::LocationRecorder::Init(const LocationRecorder& parent,
-                                    SourceCodeInfo* source_code_info) {
-  parser_ = parent.parser_;
-  source_code_info_ = source_code_info;
-
-  location_ = source_code_info_->add_location();
-  location_->mutable_path()->CopyFrom(parent.location_->path());
-
-  location_->add_span(parser_->input_->current().line);
-  location_->add_span(parser_->input_->current().column);
-}
-
-Parser::LocationRecorder::~LocationRecorder() {
-  if (location_->span_size() <= 2) {
-    EndAt(parser_->input_->previous());
-  }
-}
-
-void Parser::LocationRecorder::AddPath(int path_component) {
-  location_->add_path(path_component);
-}
-
-void Parser::LocationRecorder::StartAt(const io::Tokenizer::Token& token) {
-  location_->set_span(0, token.line);
-  location_->set_span(1, token.column);
-}
-
-void Parser::LocationRecorder::StartAt(const LocationRecorder& other) {
-  location_->set_span(0, other.location_->span(0));
-  location_->set_span(1, other.location_->span(1));
-}
-
-void Parser::LocationRecorder::EndAt(const io::Tokenizer::Token& token) {
-  if (token.line != location_->span(0)) {
-    location_->add_span(token.line);
-  }
-  location_->add_span(token.end_column);
-}
-
-void Parser::LocationRecorder::RecordLegacyLocation(
-    const Message* descriptor,
-    DescriptorPool::ErrorCollector::ErrorLocation location) {
-  if (parser_->source_location_table_ != nullptr) {
-    parser_->source_location_table_->Add(
-        descriptor, location, location_->span(0), location_->span(1));
-  }
-}
-
-void Parser::LocationRecorder::RecordLegacyImportLocation(
-    const Message* descriptor, const std::string& name) {
-  if (parser_->source_location_table_ != nullptr) {
-    parser_->source_location_table_->AddImport(
-        descriptor, name, location_->span(0), location_->span(1));
-  }
-}
-
-int Parser::LocationRecorder::CurrentPathSize() const {
-  return location_->path_size();
-}
-
-void Parser::LocationRecorder::AttachComments(
-    std::string* leading, std::string* trailing,
-    std::vector<std::string>* detached_comments) const {
-  GOOGLE_CHECK(!location_->has_leading_comments());
-  GOOGLE_CHECK(!location_->has_trailing_comments());
-
-  if (!leading->empty()) {
-    location_->mutable_leading_comments()->swap(*leading);
-  }
-  if (!trailing->empty()) {
-    location_->mutable_trailing_comments()->swap(*trailing);
-  }
-  for (int i = 0; i < detached_comments->size(); ++i) {
-    location_->add_leading_detached_comments()->swap((*detached_comments)[i]);
-  }
-  detached_comments->clear();
-}
-
-// -------------------------------------------------------------------
-
-void Parser::SkipStatement() {
-  while (true) {
-    if (AtEnd()) {
-      return;
-    } else if (LookingAtType(io::Tokenizer::TYPE_SYMBOL)) {
-      if (TryConsumeEndOfDeclaration(";", nullptr)) {
-        return;
-      } else if (TryConsume("{")) {
-        SkipRestOfBlock();
-        return;
-      } else if (LookingAt("}")) {
-        return;
-      }
-    }
-    input_->Next();
-  }
-}
-
-void Parser::SkipRestOfBlock() {
-  while (true) {
-    if (AtEnd()) {
-      return;
-    } else if (LookingAtType(io::Tokenizer::TYPE_SYMBOL)) {
-      if (TryConsumeEndOfDeclaration("}", nullptr)) {
-        return;
-      } else if (TryConsume("{")) {
-        SkipRestOfBlock();
-      }
-    }
-    input_->Next();
-  }
-}
-
-// ===================================================================
-
-bool Parser::ValidateEnum(const EnumDescriptorProto* proto) {
-  bool has_allow_alias = false;
-  bool allow_alias = false;
-
-  for (int i = 0; i < proto->options().uninterpreted_option_size(); i++) {
-    const UninterpretedOption option = proto->options().uninterpreted_option(i);
-    if (option.name_size() > 1) {
-      continue;
-    }
-    if (!option.name(0).is_extension() &&
-        option.name(0).name_part() == "allow_alias") {
-      has_allow_alias = true;
-      if (option.identifier_value() == "true") {
-        allow_alias = true;
-      }
-      break;
-    }
-  }
-
-  if (has_allow_alias && !allow_alias) {
-    std::string error =
-        "\"" + proto->name() +
-        "\" declares 'option allow_alias = false;' which has no effect. "
-        "Please remove the declaration.";
-    // This needlessly clutters declarations with nops.
-    AddError(error);
-    return false;
-  }
-
-  std::set<int> used_values;
-  bool has_duplicates = false;
-  for (int i = 0; i < proto->value_size(); ++i) {
-    const EnumValueDescriptorProto& enum_value = proto->value(i);
-    if (used_values.find(enum_value.number()) != used_values.end()) {
-      has_duplicates = true;
-      break;
-    } else {
-      used_values.insert(enum_value.number());
-    }
-  }
-  if (allow_alias && !has_duplicates) {
-    std::string error =
-        "\"" + proto->name() +
-        "\" declares support for enum aliases but no enum values share field "
-        "numbers. Please remove the unnecessary 'option allow_alias = true;' "
-        "declaration.";
-    // Generate an error if an enum declares support for duplicate enum values
-    // and does not use it protect future authors.
-    AddError(error);
-    return false;
-  }
-
-  // Enforce that enum constants must be UPPER_CASE except in case of
-  // enum_alias.
-  if (!allow_alias) {
-    for (const auto& enum_value : proto->value()) {
-      if (!IsUpperUnderscore(enum_value.name())) {
-        AddWarning(
-            "Enum constant should be in UPPER_CASE. Found: " +
-            enum_value.name() +
-            ". See https://developers.google.com/protocol-buffers/docs/style");
-      }
-    }
-  }
-
-  return true;
-}
-
-bool Parser::Parse(io::Tokenizer* input, FileDescriptorProto* file) {
-  input_ = input;
-  had_errors_ = false;
-  syntax_identifier_.clear();
-
-  // Note that |file| could be NULL at this point if
-  // stop_after_syntax_identifier_ is true.  So, we conservatively allocate
-  // SourceCodeInfo on the stack, then swap it into the FileDescriptorProto
-  // later on.
-  SourceCodeInfo source_code_info;
-  source_code_info_ = &source_code_info;
-
-  if (LookingAtType(io::Tokenizer::TYPE_START)) {
-    // Advance to first token.
-    input_->NextWithComments(nullptr, &upcoming_detached_comments_,
-                             &upcoming_doc_comments_);
-  }
-
-  {
-    LocationRecorder root_location(this);
-    root_location.RecordLegacyLocation(file,
-                                       DescriptorPool::ErrorCollector::OTHER);
-
-    if (require_syntax_identifier_ || LookingAt("syntax")) {
-      if (!ParseSyntaxIdentifier(root_location)) {
-        // Don't attempt to parse the file if we didn't recognize the syntax
-        // identifier.
-        return false;
-      }
-      // Store the syntax into the file.
-      if (file != nullptr) file->set_syntax(syntax_identifier_);
-    } else if (!stop_after_syntax_identifier_) {
-      GOOGLE_LOG(WARNING) << "No syntax specified for the proto file: " << file->name()
-                   << ". Please use 'syntax = \"proto2\";' "
-                   << "or 'syntax = \"proto3\";' to specify a syntax "
-                   << "version. (Defaulted to proto2 syntax.)";
-      syntax_identifier_ = "proto2";
-    }
-
-    if (stop_after_syntax_identifier_) return !had_errors_;
-
-    // Repeatedly parse statements until we reach the end of the file.
-    while (!AtEnd()) {
-      if (!ParseTopLevelStatement(file, root_location)) {
-        // This statement failed to parse.  Skip it, but keep looping to parse
-        // other statements.
-        SkipStatement();
-
-        if (LookingAt("}")) {
-          AddError("Unmatched \"}\".");
-          input_->NextWithComments(nullptr, &upcoming_detached_comments_,
-                                   &upcoming_doc_comments_);
-        }
-      }
-    }
-  }
-
-  input_ = nullptr;
-  source_code_info_ = nullptr;
-  assert(file != nullptr);
-  source_code_info.Swap(file->mutable_source_code_info());
-  return !had_errors_;
-}
-
-bool Parser::ParseSyntaxIdentifier(const LocationRecorder& parent) {
-  LocationRecorder syntax_location(parent,
-                                   FileDescriptorProto::kSyntaxFieldNumber);
-  DO(Consume(
-      "syntax",
-      "File must begin with a syntax statement, e.g. 'syntax = \"proto2\";'."));
-  DO(Consume("="));
-  io::Tokenizer::Token syntax_token = input_->current();
-  std::string syntax;
-  DO(ConsumeString(&syntax, "Expected syntax identifier."));
-  DO(ConsumeEndOfDeclaration(";", &syntax_location));
-
-  syntax_identifier_ = syntax;
-
-  if (syntax != "proto2" && syntax != "proto3" &&
-      !stop_after_syntax_identifier_) {
-    AddError(syntax_token.line, syntax_token.column,
-             "Unrecognized syntax identifier \"" + syntax +
-                 "\".  This parser "
-                 "only recognizes \"proto2\" and \"proto3\".");
-    return false;
-  }
-
-  return true;
-}
-
-bool Parser::ParseTopLevelStatement(FileDescriptorProto* file,
-                                    const LocationRecorder& root_location) {
-  if (TryConsumeEndOfDeclaration(";", nullptr)) {
-    // empty statement; ignore
-    return true;
-  } else if (LookingAt("message")) {
-    LocationRecorder location(root_location,
-                              FileDescriptorProto::kMessageTypeFieldNumber,
-                              file->message_type_size());
-    return ParseMessageDefinition(file->add_message_type(), location, file);
-  } else if (LookingAt("enum")) {
-    LocationRecorder location(root_location,
-                              FileDescriptorProto::kEnumTypeFieldNumber,
-                              file->enum_type_size());
-    return ParseEnumDefinition(file->add_enum_type(), location, file);
-  } else if (LookingAt("service")) {
-    LocationRecorder location(root_location,
-                              FileDescriptorProto::kServiceFieldNumber,
-                              file->service_size());
-    return ParseServiceDefinition(file->add_service(), location, file);
-  } else if (LookingAt("extend")) {
-    LocationRecorder location(root_location,
-                              FileDescriptorProto::kExtensionFieldNumber);
-    return ParseExtend(
-        file->mutable_extension(), file->mutable_message_type(), root_location,
-        FileDescriptorProto::kMessageTypeFieldNumber, location, file);
-  } else if (LookingAt("import")) {
-    return ParseImport(file->mutable_dependency(),
-                       file->mutable_public_dependency(),
-                       file->mutable_weak_dependency(), root_location, file);
-  } else if (LookingAt("package")) {
-    return ParsePackage(file, root_location, file);
-  } else if (LookingAt("option")) {
-    LocationRecorder location(root_location,
-                              FileDescriptorProto::kOptionsFieldNumber);
-    return ParseOption(file->mutable_options(), location, file,
-                       OPTION_STATEMENT);
-  } else {
-    AddError("Expected top-level statement (e.g. \"message\").");
-    return false;
-  }
-}
-
-// -------------------------------------------------------------------
-// Messages
-
-bool Parser::ParseMessageDefinition(
-    DescriptorProto* message, const LocationRecorder& message_location,
-    const FileDescriptorProto* containing_file) {
-  DO(Consume("message"));
-  {
-    LocationRecorder location(message_location,
-                              DescriptorProto::kNameFieldNumber);
-    location.RecordLegacyLocation(message,
-                                  DescriptorPool::ErrorCollector::NAME);
-    DO(ConsumeIdentifier(message->mutable_name(), "Expected message name."));
-    if (!IsUpperCamelCase(message->name())) {
-      AddWarning(
-          "Message name should be in UpperCamelCase. Found: " +
-          message->name() +
-          ". See https://developers.google.com/protocol-buffers/docs/style");
-    }
-  }
-  DO(ParseMessageBlock(message, message_location, containing_file));
-
-  if (syntax_identifier_ == "proto3") {
-    // Add synthetic one-field oneofs for optional fields, except messages which
-    // already have presence in proto3.
-    //
-    // We have to make sure the oneof names don't conflict with any other
-    // field or oneof.
-    std::unordered_set<std::string> names;
-    for (const auto& field : message->field()) {
-      names.insert(field.name());
-    }
-    for (const auto& oneof : message->oneof_decl()) {
-      names.insert(oneof.name());
-    }
-
-    for (auto& field : *message->mutable_field()) {
-      if (field.proto3_optional()) {
-        std::string oneof_name = field.name();
-
-        // Prepend 'XXXXX_' until we are no longer conflicting.
-        // Avoid prepending a double-underscore because such names are
-        // reserved in C++.
-        if (oneof_name.empty() || oneof_name[0] != '_') {
-          oneof_name = '_' + oneof_name;
-        }
-        while (names.count(oneof_name) > 0) {
-          oneof_name = 'X' + oneof_name;
-        }
-
-        names.insert(oneof_name);
-        field.set_oneof_index(message->oneof_decl_size());
-        OneofDescriptorProto* oneof = message->add_oneof_decl();
-        oneof->set_name(oneof_name);
-      }
-    }
-  }
-
-  return true;
-}
-
-namespace {
-
-const int kMaxRangeSentinel = -1;
-
-bool IsMessageSetWireFormatMessage(const DescriptorProto& message) {
-  const MessageOptions& options = message.options();
-  for (int i = 0; i < options.uninterpreted_option_size(); ++i) {
-    const UninterpretedOption& uninterpreted = options.uninterpreted_option(i);
-    if (uninterpreted.name_size() == 1 &&
-        uninterpreted.name(0).name_part() == "message_set_wire_format" &&
-        uninterpreted.identifier_value() == "true") {
-      return true;
-    }
-  }
-  return false;
-}
-
-// Modifies any extension ranges that specified 'max' as the end of the
-// extension range, and sets them to the type-specific maximum. The actual max
-// tag number can only be determined after all options have been parsed.
-void AdjustExtensionRangesWithMaxEndNumber(DescriptorProto* message) {
-  const bool is_message_set = IsMessageSetWireFormatMessage(*message);
-  const int max_extension_number = is_message_set
-                                       ? std::numeric_limits<int32_t>::max()
-                                       : FieldDescriptor::kMaxNumber + 1;
-  for (int i = 0; i < message->extension_range_size(); ++i) {
-    if (message->extension_range(i).end() == kMaxRangeSentinel) {
-      message->mutable_extension_range(i)->set_end(max_extension_number);
-    }
-  }
-}
-
-// Modifies any reserved ranges that specified 'max' as the end of the
-// reserved range, and sets them to the type-specific maximum. The actual max
-// tag number can only be determined after all options have been parsed.
-void AdjustReservedRangesWithMaxEndNumber(DescriptorProto* message) {
-  const bool is_message_set = IsMessageSetWireFormatMessage(*message);
-  const int max_field_number = is_message_set
-                                   ? std::numeric_limits<int32_t>::max()
-                                   : FieldDescriptor::kMaxNumber + 1;
-  for (int i = 0; i < message->reserved_range_size(); ++i) {
-    if (message->reserved_range(i).end() == kMaxRangeSentinel) {
-      message->mutable_reserved_range(i)->set_end(max_field_number);
-    }
-  }
-}
-
-}  // namespace
-
-bool Parser::ParseMessageBlock(DescriptorProto* message,
-                               const LocationRecorder& message_location,
-                               const FileDescriptorProto* containing_file) {
-  DO(ConsumeEndOfDeclaration("{", &message_location));
-
-  while (!TryConsumeEndOfDeclaration("}", nullptr)) {
-    if (AtEnd()) {
-      AddError("Reached end of input in message definition (missing '}').");
-      return false;
-    }
-
-    if (!ParseMessageStatement(message, message_location, containing_file)) {
-      // This statement failed to parse.  Skip it, but keep looping to parse
-      // other statements.
-      SkipStatement();
-    }
-  }
-
-  if (message->extension_range_size() > 0) {
-    AdjustExtensionRangesWithMaxEndNumber(message);
-  }
-  if (message->reserved_range_size() > 0) {
-    AdjustReservedRangesWithMaxEndNumber(message);
-  }
-  return true;
-}
-
-bool Parser::ParseMessageStatement(DescriptorProto* message,
-                                   const LocationRecorder& message_location,
-                                   const FileDescriptorProto* containing_file) {
-  if (TryConsumeEndOfDeclaration(";", nullptr)) {
-    // empty statement; ignore
-    return true;
-  } else if (LookingAt("message")) {
-    LocationRecorder location(message_location,
-                              DescriptorProto::kNestedTypeFieldNumber,
-                              message->nested_type_size());
-    return ParseMessageDefinition(message->add_nested_type(), location,
-                                  containing_file);
-  } else if (LookingAt("enum")) {
-    LocationRecorder location(message_location,
-                              DescriptorProto::kEnumTypeFieldNumber,
-                              message->enum_type_size());
-    return ParseEnumDefinition(message->add_enum_type(), location,
-                               containing_file);
-  } else if (LookingAt("extensions")) {
-    LocationRecorder location(message_location,
-                              DescriptorProto::kExtensionRangeFieldNumber);
-    return ParseExtensions(message, location, containing_file);
-  } else if (LookingAt("reserved")) {
-    return ParseReserved(message, message_location);
-  } else if (LookingAt("extend")) {
-    LocationRecorder location(message_location,
-                              DescriptorProto::kExtensionFieldNumber);
-    return ParseExtend(message->mutable_extension(),
-                       message->mutable_nested_type(), message_location,
-                       DescriptorProto::kNestedTypeFieldNumber, location,
-                       containing_file);
-  } else if (LookingAt("option")) {
-    LocationRecorder location(message_location,
-                              DescriptorProto::kOptionsFieldNumber);
-    return ParseOption(message->mutable_options(), location, containing_file,
-                       OPTION_STATEMENT);
-  } else if (LookingAt("oneof")) {
-    int oneof_index = message->oneof_decl_size();
-    LocationRecorder oneof_location(
-        message_location, DescriptorProto::kOneofDeclFieldNumber, oneof_index);
-
-    return ParseOneof(message->add_oneof_decl(), message, oneof_index,
-                      oneof_location, message_location, containing_file);
-  } else {
-    LocationRecorder location(message_location,
-                              DescriptorProto::kFieldFieldNumber,
-                              message->field_size());
-    return ParseMessageField(
-        message->add_field(), message->mutable_nested_type(), message_location,
-        DescriptorProto::kNestedTypeFieldNumber, location, containing_file);
-  }
-}
-
-bool Parser::ParseMessageField(FieldDescriptorProto* field,
-                               RepeatedPtrField<DescriptorProto>* messages,
-                               const LocationRecorder& parent_location,
-                               int location_field_number_for_nested_type,
-                               const LocationRecorder& field_location,
-                               const FileDescriptorProto* containing_file) {
-  {
-    FieldDescriptorProto::Label label;
-    if (ParseLabel(&label, field_location)) {
-      field->set_label(label);
-      if (label == FieldDescriptorProto::LABEL_OPTIONAL &&
-          syntax_identifier_ == "proto3") {
-        field->set_proto3_optional(true);
-      }
-    }
-  }
-
-  return ParseMessageFieldNoLabel(field, messages, parent_location,
-                                  location_field_number_for_nested_type,
-                                  field_location, containing_file);
-}
-
-bool Parser::ParseMessageFieldNoLabel(
-    FieldDescriptorProto* field, RepeatedPtrField<DescriptorProto>* messages,
-    const LocationRecorder& parent_location,
-    int location_field_number_for_nested_type,
-    const LocationRecorder& field_location,
-    const FileDescriptorProto* containing_file) {
-  MapField map_field;
-  // Parse type.
-  {
-    LocationRecorder location(field_location);  // add path later
-    location.RecordLegacyLocation(field, DescriptorPool::ErrorCollector::TYPE);
-
-    bool type_parsed = false;
-    FieldDescriptorProto::Type type = FieldDescriptorProto::TYPE_INT32;
-    std::string type_name;
-
-    // Special case map field. We only treat the field as a map field if the
-    // field type name starts with the word "map" with a following "<".
-    if (TryConsume("map")) {
-      if (LookingAt("<")) {
-        map_field.is_map_field = true;
-        DO(ParseMapType(&map_field, field, location));
-      } else {
-        // False positive
-        type_parsed = true;
-        type_name = "map";
-      }
-    }
-    if (!map_field.is_map_field) {
-      // Handle the case where no explicit label is given for a non-map field.
-      if (!field->has_label() && DefaultToOptionalFields()) {
-        field->set_label(FieldDescriptorProto::LABEL_OPTIONAL);
-      }
-      if (!field->has_label()) {
-        AddError("Expected \"required\", \"optional\", or \"repeated\".");
-        // We can actually reasonably recover here by just assuming the user
-        // forgot the label altogether.
-        field->set_label(FieldDescriptorProto::LABEL_OPTIONAL);
-      }
-
-      // Handle the case where the actual type is a message or enum named
-      // "map", which we already consumed in the code above.
-      if (!type_parsed) {
-        DO(ParseType(&type, &type_name));
-      }
-      if (type_name.empty()) {
-        location.AddPath(FieldDescriptorProto::kTypeFieldNumber);
-        field->set_type(type);
-      } else {
-        location.AddPath(FieldDescriptorProto::kTypeNameFieldNumber);
-        field->set_type_name(type_name);
-      }
-    }
-  }
-
-  // Parse name and '='.
-  io::Tokenizer::Token name_token = input_->current();
-  {
-    LocationRecorder location(field_location,
-                              FieldDescriptorProto::kNameFieldNumber);
-    location.RecordLegacyLocation(field, DescriptorPool::ErrorCollector::NAME);
-    DO(ConsumeIdentifier(field->mutable_name(), "Expected field name."));
-
-    if (!IsLowerUnderscore(field->name())) {
-      AddWarning(
-          "Field name should be lowercase. Found: " + field->name() +
-          ". See: https://developers.google.com/protocol-buffers/docs/style");
-    }
-    if (IsNumberFollowUnderscore(field->name())) {
-      AddWarning(
-          "Number should not come right after an underscore. Found: " +
-          field->name() +
-          ". See: https://developers.google.com/protocol-buffers/docs/style");
-    }
-  }
-  DO(Consume("=", "Missing field number."));
-
-  // Parse field number.
-  {
-    LocationRecorder location(field_location,
-                              FieldDescriptorProto::kNumberFieldNumber);
-    location.RecordLegacyLocation(field,
-                                  DescriptorPool::ErrorCollector::NUMBER);
-    int number;
-    DO(ConsumeInteger(&number, "Expected field number."));
-    field->set_number(number);
-  }
-
-  // Parse options.
-  DO(ParseFieldOptions(field, field_location, containing_file));
-
-  // Deal with groups.
-  if (field->has_type() && field->type() == FieldDescriptorProto::TYPE_GROUP) {
-    // Awkward:  Since a group declares both a message type and a field, we
-    //   have to create overlapping locations.
-    LocationRecorder group_location(parent_location);
-    group_location.StartAt(field_location);
-    group_location.AddPath(location_field_number_for_nested_type);
-    group_location.AddPath(messages->size());
-
-    DescriptorProto* group = messages->Add();
-    group->set_name(field->name());
-
-    // Record name location to match the field name's location.
-    {
-      LocationRecorder location(group_location,
-                                DescriptorProto::kNameFieldNumber);
-      location.StartAt(name_token);
-      location.EndAt(name_token);
-      location.RecordLegacyLocation(group,
-                                    DescriptorPool::ErrorCollector::NAME);
-    }
-
-    // The field's type_name also comes from the name.  Confusing!
-    {
-      LocationRecorder location(field_location,
-                                FieldDescriptorProto::kTypeNameFieldNumber);
-      location.StartAt(name_token);
-      location.EndAt(name_token);
-    }
-
-    // As a hack for backwards-compatibility, we force the group name to start
-    // with a capital letter and lower-case the field name.  New code should
-    // not use groups; it should use nested messages.
-    if (group->name()[0] < 'A' || 'Z' < group->name()[0]) {
-      AddError(name_token.line, name_token.column,
-               "Group names must start with a capital letter.");
-    }
-    LowerString(field->mutable_name());
-
-    field->set_type_name(group->name());
-    if (LookingAt("{")) {
-      DO(ParseMessageBlock(group, group_location, containing_file));
-    } else {
-      AddError("Missing group body.");
-      return false;
-    }
-  } else {
-    DO(ConsumeEndOfDeclaration(";", &field_location));
-  }
-
-  // Create a map entry type if this is a map field.
-  if (map_field.is_map_field) {
-    GenerateMapEntry(map_field, field, messages);
-  }
-
-  return true;
-}
-
-bool Parser::ParseMapType(MapField* map_field, FieldDescriptorProto* field,
-                          LocationRecorder& type_name_location) {
-  if (field->has_oneof_index()) {
-    AddError("Map fields are not allowed in oneofs.");
-    return false;
-  }
-  if (field->has_label()) {
-    AddError(
-        "Field labels (required/optional/repeated) are not allowed on "
-        "map fields.");
-    return false;
-  }
-  if (field->has_extendee()) {
-    AddError("Map fields are not allowed to be extensions.");
-    return false;
-  }
-  field->set_label(FieldDescriptorProto::LABEL_REPEATED);
-  DO(Consume("<"));
-  DO(ParseType(&map_field->key_type, &map_field->key_type_name));
-  DO(Consume(","));
-  DO(ParseType(&map_field->value_type, &map_field->value_type_name));
-  DO(Consume(">"));
-  // Defer setting of the type name of the map field until the
-  // field name is parsed. Add the source location though.
-  type_name_location.AddPath(FieldDescriptorProto::kTypeNameFieldNumber);
-  return true;
-}
-
-void Parser::GenerateMapEntry(const MapField& map_field,
-                              FieldDescriptorProto* field,
-                              RepeatedPtrField<DescriptorProto>* messages) {
-  DescriptorProto* entry = messages->Add();
-  std::string entry_name = MapEntryName(field->name());
-  field->set_type_name(entry_name);
-  entry->set_name(entry_name);
-  entry->mutable_options()->set_map_entry(true);
-  FieldDescriptorProto* key_field = entry->add_field();
-  key_field->set_name("key");
-  key_field->set_label(FieldDescriptorProto::LABEL_OPTIONAL);
-  key_field->set_number(1);
-  if (map_field.key_type_name.empty()) {
-    key_field->set_type(map_field.key_type);
-  } else {
-    key_field->set_type_name(map_field.key_type_name);
-  }
-  FieldDescriptorProto* value_field = entry->add_field();
-  value_field->set_name("value");
-  value_field->set_label(FieldDescriptorProto::LABEL_OPTIONAL);
-  value_field->set_number(2);
-  if (map_field.value_type_name.empty()) {
-    value_field->set_type(map_field.value_type);
-  } else {
-    value_field->set_type_name(map_field.value_type_name);
-  }
-  // Propagate the "enforce_utf8" option to key and value fields if they
-  // are strings. This helps simplify the implementation of code generators
-  // and also reflection-based parsing code.
-  //
-  // The following definition:
-  //   message Foo {
-  //     map<string, string> value = 1 [enforce_utf8 = false];
-  //   }
-  // will be interpreted as:
-  //   message Foo {
-  //     message ValueEntry {
-  //       option map_entry = true;
-  //       string key = 1 [enforce_utf8 = false];
-  //       string value = 2 [enforce_utf8 = false];
-  //     }
-  //     repeated ValueEntry value = 1 [enforce_utf8 = false];
-  //  }
-  //
-  // TODO(xiaofeng): Remove this when the "enforce_utf8" option is removed
-  // from protocol compiler.
-  for (int i = 0; i < field->options().uninterpreted_option_size(); ++i) {
-    const UninterpretedOption& option =
-        field->options().uninterpreted_option(i);
-    if (option.name_size() == 1 &&
-        option.name(0).name_part() == "enforce_utf8" &&
-        !option.name(0).is_extension()) {
-      if (key_field->type() == FieldDescriptorProto::TYPE_STRING) {
-        key_field->mutable_options()->add_uninterpreted_option()->CopyFrom(
-            option);
-      }
-      if (value_field->type() == FieldDescriptorProto::TYPE_STRING) {
-        value_field->mutable_options()->add_uninterpreted_option()->CopyFrom(
-            option);
-      }
-    }
-  }
-}
-
-bool Parser::ParseFieldOptions(FieldDescriptorProto* field,
-                               const LocationRecorder& field_location,
-                               const FileDescriptorProto* containing_file) {
-  if (!LookingAt("[")) return true;
-
-  LocationRecorder location(field_location,
-                            FieldDescriptorProto::kOptionsFieldNumber);
-
-  DO(Consume("["));
-
-  // Parse field options.
-  do {
-    if (LookingAt("default")) {
-      // We intentionally pass field_location rather than location here, since
-      // the default value is not actually an option.
-      DO(ParseDefaultAssignment(field, field_location, containing_file));
-    } else if (LookingAt("json_name")) {
-      // Like default value, this "json_name" is not an actual option.
-      DO(ParseJsonName(field, field_location, containing_file));
-    } else {
-      DO(ParseOption(field->mutable_options(), location, containing_file,
-                     OPTION_ASSIGNMENT));
-    }
-  } while (TryConsume(","));
-
-  DO(Consume("]"));
-  return true;
-}
-
-bool Parser::ParseDefaultAssignment(
-    FieldDescriptorProto* field, const LocationRecorder& field_location,
-    const FileDescriptorProto* containing_file) {
-  if (field->has_default_value()) {
-    AddError("Already set option \"default\".");
-    field->clear_default_value();
-  }
-
-  DO(Consume("default"));
-  DO(Consume("="));
-
-  LocationRecorder location(field_location,
-                            FieldDescriptorProto::kDefaultValueFieldNumber);
-  location.RecordLegacyLocation(field,
-                                DescriptorPool::ErrorCollector::DEFAULT_VALUE);
-  std::string* default_value = field->mutable_default_value();
-
-  if (!field->has_type()) {
-    // The field has a type name, but we don't know if it is a message or an
-    // enum yet. (If it were a primitive type, |field| would have a type set
-    // already.) In this case, simply take the current string as the default
-    // value; we will catch the error later if it is not a valid enum value.
-    // (N.B. that we do not check whether the current token is an identifier:
-    // doing so throws strange errors when the user mistypes a primitive
-    // typename and we assume it's an enum. E.g.: "optional int foo = 1 [default
-    // = 42]". In such a case the fundamental error is really that "int" is not
-    // a type, not that "42" is not an identifier. See b/12533582.)
-    *default_value = input_->current().text;
-    input_->Next();
-    return true;
-  }
-
-  switch (field->type()) {
-    case FieldDescriptorProto::TYPE_INT32:
-    case FieldDescriptorProto::TYPE_INT64:
-    case FieldDescriptorProto::TYPE_SINT32:
-    case FieldDescriptorProto::TYPE_SINT64:
-    case FieldDescriptorProto::TYPE_SFIXED32:
-    case FieldDescriptorProto::TYPE_SFIXED64: {
-      uint64_t max_value = std::numeric_limits<int64_t>::max();
-      if (field->type() == FieldDescriptorProto::TYPE_INT32 ||
-          field->type() == FieldDescriptorProto::TYPE_SINT32 ||
-          field->type() == FieldDescriptorProto::TYPE_SFIXED32) {
-        max_value = std::numeric_limits<int32_t>::max();
-      }
-
-      // These types can be negative.
-      if (TryConsume("-")) {
-        default_value->append("-");
-        // Two's complement always has one more negative value than positive.
-        ++max_value;
-      }
-      // Parse the integer to verify that it is not out-of-range.
-      uint64_t value;
-      DO(ConsumeInteger64(max_value, &value,
-                          "Expected integer for field default value."));
-      // And stringify it again.
-      default_value->append(StrCat(value));
-      break;
-    }
-
-    case FieldDescriptorProto::TYPE_UINT32:
-    case FieldDescriptorProto::TYPE_UINT64:
-    case FieldDescriptorProto::TYPE_FIXED32:
-    case FieldDescriptorProto::TYPE_FIXED64: {
-      uint64_t max_value = std::numeric_limits<uint64_t>::max();
-      if (field->type() == FieldDescriptorProto::TYPE_UINT32 ||
-          field->type() == FieldDescriptorProto::TYPE_FIXED32) {
-        max_value = std::numeric_limits<uint32_t>::max();
-      }
-
-      // Numeric, not negative.
-      if (TryConsume("-")) {
-        AddError("Unsigned field can't have negative default value.");
-      }
-      // Parse the integer to verify that it is not out-of-range.
-      uint64_t value;
-      DO(ConsumeInteger64(max_value, &value,
-                          "Expected integer for field default value."));
-      // And stringify it again.
-      default_value->append(StrCat(value));
-      break;
-    }
-
-    case FieldDescriptorProto::TYPE_FLOAT:
-    case FieldDescriptorProto::TYPE_DOUBLE:
-      // These types can be negative.
-      if (TryConsume("-")) {
-        default_value->append("-");
-      }
-      // Parse the integer because we have to convert hex integers to decimal
-      // floats.
-      double value;
-      DO(ConsumeNumber(&value, "Expected number."));
-      // And stringify it again.
-      default_value->append(SimpleDtoa(value));
-      break;
-
-    case FieldDescriptorProto::TYPE_BOOL:
-      if (TryConsume("true")) {
-        default_value->assign("true");
-      } else if (TryConsume("false")) {
-        default_value->assign("false");
-      } else {
-        AddError("Expected \"true\" or \"false\".");
-        return false;
-      }
-      break;
-
-    case FieldDescriptorProto::TYPE_STRING:
-      // Note: When file option java_string_check_utf8 is true, if a
-      // non-string representation (eg byte[]) is later supported, it must
-      // be checked for UTF-8-ness.
-      DO(ConsumeString(default_value,
-                       "Expected string for field default "
-                       "value."));
-      break;
-
-    case FieldDescriptorProto::TYPE_BYTES:
-      DO(ConsumeString(default_value, "Expected string."));
-      *default_value = CEscape(*default_value);
-      break;
-
-    case FieldDescriptorProto::TYPE_ENUM:
-      DO(ConsumeIdentifier(default_value,
-                           "Expected enum identifier for field "
-                           "default value."));
-      break;
-
-    case FieldDescriptorProto::TYPE_MESSAGE:
-    case FieldDescriptorProto::TYPE_GROUP:
-      AddError("Messages can't have default values.");
-      return false;
-  }
-
-  return true;
-}
-
-bool Parser::ParseJsonName(FieldDescriptorProto* field,
-                           const LocationRecorder& field_location,
-                           const FileDescriptorProto* containing_file) {
-  if (field->has_json_name()) {
-    AddError("Already set option \"json_name\".");
-    field->clear_json_name();
-  }
-
-  LocationRecorder location(field_location,
-                            FieldDescriptorProto::kJsonNameFieldNumber);
-  location.RecordLegacyLocation(field,
-                                DescriptorPool::ErrorCollector::OPTION_NAME);
-
-  DO(Consume("json_name"));
-  DO(Consume("="));
-
-  LocationRecorder value_location(location);
-  value_location.RecordLegacyLocation(
-      field, DescriptorPool::ErrorCollector::OPTION_VALUE);
-
-  DO(ConsumeString(field->mutable_json_name(),
-                   "Expected string for JSON name."));
-  return true;
-}
-
-bool Parser::ParseOptionNamePart(UninterpretedOption* uninterpreted_option,
-                                 const LocationRecorder& part_location,
-                                 const FileDescriptorProto* containing_file) {
-  UninterpretedOption::NamePart* name = uninterpreted_option->add_name();
-  std::string identifier;  // We parse identifiers into this string.
-  if (LookingAt("(")) {    // This is an extension.
-    DO(Consume("("));
-
-    {
-      LocationRecorder location(
-          part_location, UninterpretedOption::NamePart::kNamePartFieldNumber);
-      // An extension name consists of dot-separated identifiers, and may begin
-      // with a dot.
-      if (LookingAtType(io::Tokenizer::TYPE_IDENTIFIER)) {
-        DO(ConsumeIdentifier(&identifier, "Expected identifier."));
-        name->mutable_name_part()->append(identifier);
-      }
-      while (LookingAt(".")) {
-        DO(Consume("."));
-        name->mutable_name_part()->append(".");
-        DO(ConsumeIdentifier(&identifier, "Expected identifier."));
-        name->mutable_name_part()->append(identifier);
-      }
-    }
-
-    DO(Consume(")"));
-    name->set_is_extension(true);
-  } else {  // This is a regular field.
-    LocationRecorder location(
-        part_location, UninterpretedOption::NamePart::kNamePartFieldNumber);
-    DO(ConsumeIdentifier(&identifier, "Expected identifier."));
-    name->mutable_name_part()->append(identifier);
-    name->set_is_extension(false);
-  }
-  return true;
-}
-
-bool Parser::ParseUninterpretedBlock(std::string* value) {
-  // Note that enclosing braces are not added to *value.
-  // We do NOT use ConsumeEndOfStatement for this brace because it's delimiting
-  // an expression, not a block of statements.
-  DO(Consume("{"));
-  int brace_depth = 1;
-  while (!AtEnd()) {
-    if (LookingAt("{")) {
-      brace_depth++;
-    } else if (LookingAt("}")) {
-      brace_depth--;
-      if (brace_depth == 0) {
-        input_->Next();
-        return true;
-      }
-    }
-    // TODO(sanjay): Interpret line/column numbers to preserve formatting
-    if (!value->empty()) value->push_back(' ');
-    value->append(input_->current().text);
-    input_->Next();
-  }
-  AddError("Unexpected end of stream while parsing aggregate value.");
-  return false;
-}
-
-// We don't interpret the option here. Instead we store it in an
-// UninterpretedOption, to be interpreted later.
-bool Parser::ParseOption(Message* options,
-                         const LocationRecorder& options_location,
-                         const FileDescriptorProto* containing_file,
-                         OptionStyle style) {
-  // Create an entry in the uninterpreted_option field.
-  const FieldDescriptor* uninterpreted_option_field =
-      options->GetDescriptor()->FindFieldByName("uninterpreted_option");
-  GOOGLE_CHECK(uninterpreted_option_field != nullptr)
-      << "No field named \"uninterpreted_option\" in the Options proto.";
-
-  const Reflection* reflection = options->GetReflection();
-
-  LocationRecorder location(
-      options_location, uninterpreted_option_field->number(),
-      reflection->FieldSize(*options, uninterpreted_option_field));
-
-  if (style == OPTION_STATEMENT) {
-    DO(Consume("option"));
-  }
-
-  UninterpretedOption* uninterpreted_option =
-      down_cast<UninterpretedOption*>(options->GetReflection()->AddMessage(
-          options, uninterpreted_option_field));
-
-  // Parse dot-separated name.
-  {
-    LocationRecorder name_location(location,
-                                   UninterpretedOption::kNameFieldNumber);
-    name_location.RecordLegacyLocation(
-        uninterpreted_option, DescriptorPool::ErrorCollector::OPTION_NAME);
-
-    {
-      LocationRecorder part_location(name_location,
-                                     uninterpreted_option->name_size());
-      DO(ParseOptionNamePart(uninterpreted_option, part_location,
-                             containing_file));
-    }
-
-    while (LookingAt(".")) {
-      DO(Consume("."));
-      LocationRecorder part_location(name_location,
-                                     uninterpreted_option->name_size());
-      DO(ParseOptionNamePart(uninterpreted_option, part_location,
-                             containing_file));
-    }
-  }
-
-  DO(Consume("="));
-
-  {
-    LocationRecorder value_location(location);
-    value_location.RecordLegacyLocation(
-        uninterpreted_option, DescriptorPool::ErrorCollector::OPTION_VALUE);
-
-    // All values are a single token, except for negative numbers, which consist
-    // of a single '-' symbol, followed by a positive number.
-    bool is_negative = TryConsume("-");
-
-    switch (input_->current().type) {
-      case io::Tokenizer::TYPE_START:
-        GOOGLE_LOG(FATAL) << "Trying to read value before any tokens have been read.";
-        return false;
-
-      case io::Tokenizer::TYPE_END:
-        AddError("Unexpected end of stream while parsing option value.");
-        return false;
-
-      case io::Tokenizer::TYPE_WHITESPACE:
-      case io::Tokenizer::TYPE_NEWLINE:
-        GOOGLE_CHECK(!input_->report_whitespace() && !input_->report_newlines())
-            << "Whitespace tokens were not requested.";
-        GOOGLE_LOG(FATAL) << "Tokenizer reported whitespace.";
-        return false;
-
-      case io::Tokenizer::TYPE_IDENTIFIER: {
-        value_location.AddPath(
-            UninterpretedOption::kIdentifierValueFieldNumber);
-        if (is_negative) {
-          AddError("Invalid '-' symbol before identifier.");
-          return false;
-        }
-        std::string value;
-        DO(ConsumeIdentifier(&value, "Expected identifier."));
-        uninterpreted_option->set_identifier_value(value);
-        break;
-      }
-
-      case io::Tokenizer::TYPE_INTEGER: {
-        uint64_t value;
-        uint64_t max_value =
-            is_negative
-                ? static_cast<uint64_t>(std::numeric_limits<int64_t>::max()) + 1
-                : std::numeric_limits<uint64_t>::max();
-        DO(ConsumeInteger64(max_value, &value, "Expected integer."));
-        if (is_negative) {
-          value_location.AddPath(
-              UninterpretedOption::kNegativeIntValueFieldNumber);
-          uninterpreted_option->set_negative_int_value(
-              static_cast<int64_t>(0 - value));
-        } else {
-          value_location.AddPath(
-              UninterpretedOption::kPositiveIntValueFieldNumber);
-          uninterpreted_option->set_positive_int_value(value);
-        }
-        break;
-      }
-
-      case io::Tokenizer::TYPE_FLOAT: {
-        value_location.AddPath(UninterpretedOption::kDoubleValueFieldNumber);
-        double value;
-        DO(ConsumeNumber(&value, "Expected number."));
-        uninterpreted_option->set_double_value(is_negative ? -value : value);
-        break;
-      }
-
-      case io::Tokenizer::TYPE_STRING: {
-        value_location.AddPath(UninterpretedOption::kStringValueFieldNumber);
-        if (is_negative) {
-          AddError("Invalid '-' symbol before string.");
-          return false;
-        }
-        std::string value;
-        DO(ConsumeString(&value, "Expected string."));
-        uninterpreted_option->set_string_value(value);
-        break;
-      }
-
-      case io::Tokenizer::TYPE_SYMBOL:
-        if (LookingAt("{")) {
-          value_location.AddPath(
-              UninterpretedOption::kAggregateValueFieldNumber);
-          DO(ParseUninterpretedBlock(
-              uninterpreted_option->mutable_aggregate_value()));
-        } else {
-          AddError("Expected option value.");
-          return false;
-        }
-        break;
-    }
-  }
-
-  if (style == OPTION_STATEMENT) {
-    DO(ConsumeEndOfDeclaration(";", &location));
-  }
-
-  return true;
-}
-
-bool Parser::ParseExtensions(DescriptorProto* message,
-                             const LocationRecorder& extensions_location,
-                             const FileDescriptorProto* containing_file) {
-  // Parse the declaration.
-  DO(Consume("extensions"));
-
-  int old_range_size = message->extension_range_size();
-
-  do {
-    // Note that kExtensionRangeFieldNumber was already pushed by the parent.
-    LocationRecorder location(extensions_location,
-                              message->extension_range_size());
-
-    DescriptorProto::ExtensionRange* range = message->add_extension_range();
-    location.RecordLegacyLocation(range,
-                                  DescriptorPool::ErrorCollector::NUMBER);
-
-    int start, end;
-    io::Tokenizer::Token start_token;
-
-    {
-      LocationRecorder start_location(
-          location, DescriptorProto::ExtensionRange::kStartFieldNumber);
-      start_token = input_->current();
-      DO(ConsumeInteger(&start, "Expected field number range."));
-    }
-
-    if (TryConsume("to")) {
-      LocationRecorder end_location(
-          location, DescriptorProto::ExtensionRange::kEndFieldNumber);
-      if (TryConsume("max")) {
-        // Set to the sentinel value - 1 since we increment the value below.
-        // The actual value of the end of the range should be set with
-        // AdjustExtensionRangesWithMaxEndNumber.
-        end = kMaxRangeSentinel - 1;
-      } else {
-        DO(ConsumeInteger(&end, "Expected integer."));
-      }
-    } else {
-      LocationRecorder end_location(
-          location, DescriptorProto::ExtensionRange::kEndFieldNumber);
-      end_location.StartAt(start_token);
-      end_location.EndAt(start_token);
-      end = start;
-    }
-
-    // Users like to specify inclusive ranges, but in code we like the end
-    // number to be exclusive.
-    ++end;
-
-    range->set_start(start);
-    range->set_end(end);
-  } while (TryConsume(","));
-
-  if (LookingAt("[")) {
-    int range_number_index = extensions_location.CurrentPathSize();
-    SourceCodeInfo info;
-
-    // Parse extension range options in the first range.
-    ExtensionRangeOptions* options =
-        message->mutable_extension_range(old_range_size)->mutable_options();
-
-    {
-      LocationRecorder index_location(
-          extensions_location, 0 /* we fill this in w/ actual index below */,
-          &info);
-      LocationRecorder location(
-          index_location, DescriptorProto::ExtensionRange::kOptionsFieldNumber);
-      DO(Consume("["));
-
-      do {
-        DO(ParseOption(options, location, containing_file, OPTION_ASSIGNMENT));
-      } while (TryConsume(","));
-
-      DO(Consume("]"));
-    }
-
-    // Then copy the extension range options to all of the other ranges we've
-    // parsed.
-    for (int i = old_range_size + 1; i < message->extension_range_size(); i++) {
-      message->mutable_extension_range(i)->mutable_options()->CopyFrom(
-          *options);
-    }
-    // and copy source locations to the other ranges, too
-    for (int i = old_range_size; i < message->extension_range_size(); i++) {
-      for (int j = 0; j < info.location_size(); j++) {
-        if (info.location(j).path_size() == range_number_index + 1) {
-          // this location's path is up to the extension range index, but
-          // doesn't include options; so it's redundant with location above
-          continue;
-        }
-        SourceCodeInfo_Location* dest = source_code_info_->add_location();
-        *dest = info.location(j);
-        dest->set_path(range_number_index, i);
-      }
-    }
-  }
-
-  DO(ConsumeEndOfDeclaration(";", &extensions_location));
-  return true;
-}
-
-// This is similar to extension range parsing, except that it accepts field
-// name literals.
-bool Parser::ParseReserved(DescriptorProto* message,
-                           const LocationRecorder& message_location) {
-  io::Tokenizer::Token start_token = input_->current();
-  // Parse the declaration.
-  DO(Consume("reserved"));
-  if (LookingAtType(io::Tokenizer::TYPE_STRING)) {
-    LocationRecorder location(message_location,
-                              DescriptorProto::kReservedNameFieldNumber);
-    location.StartAt(start_token);
-    return ParseReservedNames(message, location);
-  } else {
-    LocationRecorder location(message_location,
-                              DescriptorProto::kReservedRangeFieldNumber);
-    location.StartAt(start_token);
-    return ParseReservedNumbers(message, location);
-  }
-}
-
-bool Parser::ParseReservedNames(DescriptorProto* message,
-                                const LocationRecorder& parent_location) {
-  do {
-    LocationRecorder location(parent_location, message->reserved_name_size());
-    DO(ConsumeString(message->add_reserved_name(), "Expected field name."));
-  } while (TryConsume(","));
-  DO(ConsumeEndOfDeclaration(";", &parent_location));
-  return true;
-}
-
-bool Parser::ParseReservedNumbers(DescriptorProto* message,
-                                  const LocationRecorder& parent_location) {
-  bool first = true;
-  do {
-    LocationRecorder location(parent_location, message->reserved_range_size());
-
-    DescriptorProto::ReservedRange* range = message->add_reserved_range();
-    int start, end;
-    io::Tokenizer::Token start_token;
-    {
-      LocationRecorder start_location(
-          location, DescriptorProto::ReservedRange::kStartFieldNumber);
-      start_token = input_->current();
-      DO(ConsumeInteger(&start, (first ? "Expected field name or number range."
-                                       : "Expected field number range.")));
-    }
-
-    if (TryConsume("to")) {
-      LocationRecorder end_location(
-          location, DescriptorProto::ReservedRange::kEndFieldNumber);
-      if (TryConsume("max")) {
-        // Set to the sentinel value - 1 since we increment the value below.
-        // The actual value of the end of the range should be set with
-        // AdjustExtensionRangesWithMaxEndNumber.
-        end = kMaxRangeSentinel - 1;
-      } else {
-        DO(ConsumeInteger(&end, "Expected integer."));
-      }
-    } else {
-      LocationRecorder end_location(
-          location, DescriptorProto::ReservedRange::kEndFieldNumber);
-      end_location.StartAt(start_token);
-      end_location.EndAt(start_token);
-      end = start;
-    }
-
-    // Users like to specify inclusive ranges, but in code we like the end
-    // number to be exclusive.
-    ++end;
-
-    range->set_start(start);
-    range->set_end(end);
-    first = false;
-  } while (TryConsume(","));
-
-  DO(ConsumeEndOfDeclaration(";", &parent_location));
-  return true;
-}
-
-bool Parser::ParseReserved(EnumDescriptorProto* message,
-                           const LocationRecorder& message_location) {
-  io::Tokenizer::Token start_token = input_->current();
-  // Parse the declaration.
-  DO(Consume("reserved"));
-  if (LookingAtType(io::Tokenizer::TYPE_STRING)) {
-    LocationRecorder location(message_location,
-                              EnumDescriptorProto::kReservedNameFieldNumber);
-    location.StartAt(start_token);
-    return ParseReservedNames(message, location);
-  } else {
-    LocationRecorder location(message_location,
-                              EnumDescriptorProto::kReservedRangeFieldNumber);
-    location.StartAt(start_token);
-    return ParseReservedNumbers(message, location);
-  }
-}
-
-bool Parser::ParseReservedNames(EnumDescriptorProto* message,
-                                const LocationRecorder& parent_location) {
-  do {
-    LocationRecorder location(parent_location, message->reserved_name_size());
-    DO(ConsumeString(message->add_reserved_name(), "Expected enum value."));
-  } while (TryConsume(","));
-  DO(ConsumeEndOfDeclaration(";", &parent_location));
-  return true;
-}
-
-bool Parser::ParseReservedNumbers(EnumDescriptorProto* message,
-                                  const LocationRecorder& parent_location) {
-  bool first = true;
-  do {
-    LocationRecorder location(parent_location, message->reserved_range_size());
-
-    EnumDescriptorProto::EnumReservedRange* range =
-        message->add_reserved_range();
-    int start, end;
-    io::Tokenizer::Token start_token;
-    {
-      LocationRecorder start_location(
-          location, EnumDescriptorProto::EnumReservedRange::kStartFieldNumber);
-      start_token = input_->current();
-      DO(ConsumeSignedInteger(&start,
-                              (first ? "Expected enum value or number range."
-                                     : "Expected enum number range.")));
-    }
-
-    if (TryConsume("to")) {
-      LocationRecorder end_location(
-          location, EnumDescriptorProto::EnumReservedRange::kEndFieldNumber);
-      if (TryConsume("max")) {
-        // This is in the enum descriptor path, which doesn't have the message
-        // set duality to fix up, so it doesn't integrate with the sentinel.
-        end = INT_MAX;
-      } else {
-        DO(ConsumeSignedInteger(&end, "Expected integer."));
-      }
-    } else {
-      LocationRecorder end_location(
-          location, EnumDescriptorProto::EnumReservedRange::kEndFieldNumber);
-      end_location.StartAt(start_token);
-      end_location.EndAt(start_token);
-      end = start;
-    }
-
-    range->set_start(start);
-    range->set_end(end);
-    first = false;
-  } while (TryConsume(","));
-
-  DO(ConsumeEndOfDeclaration(";", &parent_location));
-  return true;
-}
-
-bool Parser::ParseExtend(RepeatedPtrField<FieldDescriptorProto>* extensions,
-                         RepeatedPtrField<DescriptorProto>* messages,
-                         const LocationRecorder& parent_location,
-                         int location_field_number_for_nested_type,
-                         const LocationRecorder& extend_location,
-                         const FileDescriptorProto* containing_file) {
-  DO(Consume("extend"));
-
-  // Parse the extendee type.
-  io::Tokenizer::Token extendee_start = input_->current();
-  std::string extendee;
-  DO(ParseUserDefinedType(&extendee));
-  io::Tokenizer::Token extendee_end = input_->previous();
-
-  // Parse the block.
-  DO(ConsumeEndOfDeclaration("{", &extend_location));
-
-  bool is_first = true;
-
-  do {
-    if (AtEnd()) {
-      AddError("Reached end of input in extend definition (missing '}').");
-      return false;
-    }
-
-    // Note that kExtensionFieldNumber was already pushed by the parent.
-    LocationRecorder location(extend_location, extensions->size());
-
-    FieldDescriptorProto* field = extensions->Add();
-
-    {
-      LocationRecorder extendee_location(
-          location, FieldDescriptorProto::kExtendeeFieldNumber);
-      extendee_location.StartAt(extendee_start);
-      extendee_location.EndAt(extendee_end);
-
-      if (is_first) {
-        extendee_location.RecordLegacyLocation(
-            field, DescriptorPool::ErrorCollector::EXTENDEE);
-        is_first = false;
-      }
-    }
-
-    field->set_extendee(extendee);
-
-    if (!ParseMessageField(field, messages, parent_location,
-                           location_field_number_for_nested_type, location,
-                           containing_file)) {
-      // This statement failed to parse.  Skip it, but keep looping to parse
-      // other statements.
-      SkipStatement();
-    }
-  } while (!TryConsumeEndOfDeclaration("}", nullptr));
-
-  return true;
-}
-
-bool Parser::ParseOneof(OneofDescriptorProto* oneof_decl,
-                        DescriptorProto* containing_type, int oneof_index,
-                        const LocationRecorder& oneof_location,
-                        const LocationRecorder& containing_type_location,
-                        const FileDescriptorProto* containing_file) {
-  DO(Consume("oneof"));
-
-  {
-    LocationRecorder name_location(oneof_location,
-                                   OneofDescriptorProto::kNameFieldNumber);
-    DO(ConsumeIdentifier(oneof_decl->mutable_name(), "Expected oneof name."));
-  }
-
-  DO(ConsumeEndOfDeclaration("{", &oneof_location));
-
-  do {
-    if (AtEnd()) {
-      AddError("Reached end of input in oneof definition (missing '}').");
-      return false;
-    }
-
-    if (LookingAt("option")) {
-      LocationRecorder option_location(
-          oneof_location, OneofDescriptorProto::kOptionsFieldNumber);
-      if (!ParseOption(oneof_decl->mutable_options(), option_location,
-                       containing_file, OPTION_STATEMENT)) {
-        return false;
-      }
-      continue;
-    }
-
-    // Print a nice error if the user accidentally tries to place a label
-    // on an individual member of a oneof.
-    if (LookingAt("required") || LookingAt("optional") ||
-        LookingAt("repeated")) {
-      AddError(
-          "Fields in oneofs must not have labels (required / optional "
-          "/ repeated).");
-      // We can continue parsing here because we understand what the user
-      // meant.  The error report will still make parsing fail overall.
-      input_->Next();
-    }
-
-    LocationRecorder field_location(containing_type_location,
-                                    DescriptorProto::kFieldFieldNumber,
-                                    containing_type->field_size());
-
-    FieldDescriptorProto* field = containing_type->add_field();
-    field->set_label(FieldDescriptorProto::LABEL_OPTIONAL);
-    field->set_oneof_index(oneof_index);
-
-    if (!ParseMessageFieldNoLabel(field, containing_type->mutable_nested_type(),
-                                  containing_type_location,
-                                  DescriptorProto::kNestedTypeFieldNumber,
-                                  field_location, containing_file)) {
-      // This statement failed to parse.  Skip it, but keep looping to parse
-      // other statements.
-      SkipStatement();
-    }
-  } while (!TryConsumeEndOfDeclaration("}", nullptr));
-
-  return true;
-}
-
-// -------------------------------------------------------------------
-// Enums
-
-bool Parser::ParseEnumDefinition(EnumDescriptorProto* enum_type,
-                                 const LocationRecorder& enum_location,
-                                 const FileDescriptorProto* containing_file) {
-  DO(Consume("enum"));
-
-  {
-    LocationRecorder location(enum_location,
-                              EnumDescriptorProto::kNameFieldNumber);
-    location.RecordLegacyLocation(enum_type,
-                                  DescriptorPool::ErrorCollector::NAME);
-    DO(ConsumeIdentifier(enum_type->mutable_name(), "Expected enum name."));
-  }
-
-  DO(ParseEnumBlock(enum_type, enum_location, containing_file));
-
-  DO(ValidateEnum(enum_type));
-
-  return true;
-}
-
-bool Parser::ParseEnumBlock(EnumDescriptorProto* enum_type,
-                            const LocationRecorder& enum_location,
-                            const FileDescriptorProto* containing_file) {
-  DO(ConsumeEndOfDeclaration("{", &enum_location));
-
-  while (!TryConsumeEndOfDeclaration("}", nullptr)) {
-    if (AtEnd()) {
-      AddError("Reached end of input in enum definition (missing '}').");
-      return false;
-    }
-
-    if (!ParseEnumStatement(enum_type, enum_location, containing_file)) {
-      // This statement failed to parse.  Skip it, but keep looping to parse
-      // other statements.
-      SkipStatement();
-    }
-  }
-
-  return true;
-}
-
-bool Parser::ParseEnumStatement(EnumDescriptorProto* enum_type,
-                                const LocationRecorder& enum_location,
-                                const FileDescriptorProto* containing_file) {
-  if (TryConsumeEndOfDeclaration(";", nullptr)) {
-    // empty statement; ignore
-    return true;
-  } else if (LookingAt("option")) {
-    LocationRecorder location(enum_location,
-                              EnumDescriptorProto::kOptionsFieldNumber);
-    return ParseOption(enum_type->mutable_options(), location, containing_file,
-                       OPTION_STATEMENT);
-  } else if (LookingAt("reserved")) {
-    return ParseReserved(enum_type, enum_location);
-  } else {
-    LocationRecorder location(enum_location,
-                              EnumDescriptorProto::kValueFieldNumber,
-                              enum_type->value_size());
-    return ParseEnumConstant(enum_type->add_value(), location, containing_file);
-  }
-}
-
-bool Parser::ParseEnumConstant(EnumValueDescriptorProto* enum_value,
-                               const LocationRecorder& enum_value_location,
-                               const FileDescriptorProto* containing_file) {
-  // Parse name.
-  {
-    LocationRecorder location(enum_value_location,
-                              EnumValueDescriptorProto::kNameFieldNumber);
-    location.RecordLegacyLocation(enum_value,
-                                  DescriptorPool::ErrorCollector::NAME);
-    DO(ConsumeIdentifier(enum_value->mutable_name(),
-                         "Expected enum constant name."));
-  }
-
-  DO(Consume("=", "Missing numeric value for enum constant."));
-
-  // Parse value.
-  {
-    LocationRecorder location(enum_value_location,
-                              EnumValueDescriptorProto::kNumberFieldNumber);
-    location.RecordLegacyLocation(enum_value,
-                                  DescriptorPool::ErrorCollector::NUMBER);
-
-    int number;
-    DO(ConsumeSignedInteger(&number, "Expected integer."));
-    enum_value->set_number(number);
-  }
-
-  DO(ParseEnumConstantOptions(enum_value, enum_value_location,
-                              containing_file));
-
-  DO(ConsumeEndOfDeclaration(";", &enum_value_location));
-
-  return true;
-}
-
-bool Parser::ParseEnumConstantOptions(
-    EnumValueDescriptorProto* value,
-    const LocationRecorder& enum_value_location,
-    const FileDescriptorProto* containing_file) {
-  if (!LookingAt("[")) return true;
-
-  LocationRecorder location(enum_value_location,
-                            EnumValueDescriptorProto::kOptionsFieldNumber);
-
-  DO(Consume("["));
-
-  do {
-    DO(ParseOption(value->mutable_options(), location, containing_file,
-                   OPTION_ASSIGNMENT));
-  } while (TryConsume(","));
-
-  DO(Consume("]"));
-  return true;
-}
-
-// -------------------------------------------------------------------
-// Services
-
-bool Parser::ParseServiceDefinition(
-    ServiceDescriptorProto* service, const LocationRecorder& service_location,
-    const FileDescriptorProto* containing_file) {
-  DO(Consume("service"));
-
-  {
-    LocationRecorder location(service_location,
-                              ServiceDescriptorProto::kNameFieldNumber);
-    location.RecordLegacyLocation(service,
-                                  DescriptorPool::ErrorCollector::NAME);
-    DO(ConsumeIdentifier(service->mutable_name(), "Expected service name."));
-  }
-
-  DO(ParseServiceBlock(service, service_location, containing_file));
-  return true;
-}
-
-bool Parser::ParseServiceBlock(ServiceDescriptorProto* service,
-                               const LocationRecorder& service_location,
-                               const FileDescriptorProto* containing_file) {
-  DO(ConsumeEndOfDeclaration("{", &service_location));
-
-  while (!TryConsumeEndOfDeclaration("}", nullptr)) {
-    if (AtEnd()) {
-      AddError("Reached end of input in service definition (missing '}').");
-      return false;
-    }
-
-    if (!ParseServiceStatement(service, service_location, containing_file)) {
-      // This statement failed to parse.  Skip it, but keep looping to parse
-      // other statements.
-      SkipStatement();
-    }
-  }
-
-  return true;
-}
-
-bool Parser::ParseServiceStatement(ServiceDescriptorProto* service,
-                                   const LocationRecorder& service_location,
-                                   const FileDescriptorProto* containing_file) {
-  if (TryConsumeEndOfDeclaration(";", nullptr)) {
-    // empty statement; ignore
-    return true;
-  } else if (LookingAt("option")) {
-    LocationRecorder location(service_location,
-                              ServiceDescriptorProto::kOptionsFieldNumber);
-    return ParseOption(service->mutable_options(), location, containing_file,
-                       OPTION_STATEMENT);
-  } else {
-    LocationRecorder location(service_location,
-                              ServiceDescriptorProto::kMethodFieldNumber,
-                              service->method_size());
-    return ParseServiceMethod(service->add_method(), location, containing_file);
-  }
-}
-
-bool Parser::ParseServiceMethod(MethodDescriptorProto* method,
-                                const LocationRecorder& method_location,
-                                const FileDescriptorProto* containing_file) {
-  DO(Consume("rpc"));
-
-  {
-    LocationRecorder location(method_location,
-                              MethodDescriptorProto::kNameFieldNumber);
-    location.RecordLegacyLocation(method, DescriptorPool::ErrorCollector::NAME);
-    DO(ConsumeIdentifier(method->mutable_name(), "Expected method name."));
-  }
-
-  // Parse input type.
-  DO(Consume("("));
-  {
-    if (LookingAt("stream")) {
-      LocationRecorder location(
-          method_location, MethodDescriptorProto::kClientStreamingFieldNumber);
-      location.RecordLegacyLocation(method,
-                                    DescriptorPool::ErrorCollector::OTHER);
-      method->set_client_streaming(true);
-      DO(Consume("stream"));
-    }
-    LocationRecorder location(method_location,
-                              MethodDescriptorProto::kInputTypeFieldNumber);
-    location.RecordLegacyLocation(method,
-                                  DescriptorPool::ErrorCollector::INPUT_TYPE);
-    DO(ParseUserDefinedType(method->mutable_input_type()));
-  }
-  DO(Consume(")"));
-
-  // Parse output type.
-  DO(Consume("returns"));
-  DO(Consume("("));
-  {
-    if (LookingAt("stream")) {
-      LocationRecorder location(
-          method_location, MethodDescriptorProto::kServerStreamingFieldNumber);
-      location.RecordLegacyLocation(method,
-                                    DescriptorPool::ErrorCollector::OTHER);
-      DO(Consume("stream"));
-      method->set_server_streaming(true);
-    }
-    LocationRecorder location(method_location,
-                              MethodDescriptorProto::kOutputTypeFieldNumber);
-    location.RecordLegacyLocation(method,
-                                  DescriptorPool::ErrorCollector::OUTPUT_TYPE);
-    DO(ParseUserDefinedType(method->mutable_output_type()));
-  }
-  DO(Consume(")"));
-
-  if (LookingAt("{")) {
-    // Options!
-    DO(ParseMethodOptions(method_location, containing_file,
-                          MethodDescriptorProto::kOptionsFieldNumber,
-                          method->mutable_options()));
-  } else {
-    DO(ConsumeEndOfDeclaration(";", &method_location));
-  }
-
-  return true;
-}
-
-bool Parser::ParseMethodOptions(const LocationRecorder& parent_location,
-                                const FileDescriptorProto* containing_file,
-                                const int optionsFieldNumber,
-                                Message* mutable_options) {
-  // Options!
-  ConsumeEndOfDeclaration("{", &parent_location);
-  while (!TryConsumeEndOfDeclaration("}", nullptr)) {
-    if (AtEnd()) {
-      AddError("Reached end of input in method options (missing '}').");
-      return false;
-    }
-
-    if (TryConsumeEndOfDeclaration(";", nullptr)) {
-      // empty statement; ignore
-    } else {
-      LocationRecorder location(parent_location, optionsFieldNumber);
-      if (!ParseOption(mutable_options, location, containing_file,
-                       OPTION_STATEMENT)) {
-        // This statement failed to parse.  Skip it, but keep looping to
-        // parse other statements.
-        SkipStatement();
-      }
-    }
-  }
-
-  return true;
-}
-
-// -------------------------------------------------------------------
-
-bool Parser::ParseLabel(FieldDescriptorProto::Label* label,
-                        const LocationRecorder& field_location) {
-  if (!LookingAt("optional") && !LookingAt("repeated") &&
-      !LookingAt("required")) {
-    return false;
-  }
-  LocationRecorder location(field_location,
-                            FieldDescriptorProto::kLabelFieldNumber);
-  if (TryConsume("optional")) {
-    *label = FieldDescriptorProto::LABEL_OPTIONAL;
-  } else if (TryConsume("repeated")) {
-    *label = FieldDescriptorProto::LABEL_REPEATED;
-  } else {
-    Consume("required");
-    *label = FieldDescriptorProto::LABEL_REQUIRED;
-  }
-  return true;
-}
-
-bool Parser::ParseType(FieldDescriptorProto::Type* type,
-                       std::string* type_name) {
-  const auto& type_names_table = GetTypeNameTable();
-  auto iter = type_names_table.find(input_->current().text);
-  if (iter != type_names_table.end()) {
-    *type = iter->second;
-    input_->Next();
-  } else {
-    DO(ParseUserDefinedType(type_name));
-  }
-  return true;
-}
-
-bool Parser::ParseUserDefinedType(std::string* type_name) {
-  type_name->clear();
-
-  const auto& type_names_table = GetTypeNameTable();
-  auto iter = type_names_table.find(input_->current().text);
-  if (iter != type_names_table.end()) {
-    // Note:  The only place enum types are allowed is for field types, but
-    //   if we are parsing a field type then we would not get here because
-    //   primitives are allowed there as well.  So this error message doesn't
-    //   need to account for enums.
-    AddError("Expected message type.");
-
-    // Pretend to accept this type so that we can go on parsing.
-    *type_name = input_->current().text;
-    input_->Next();
-    return true;
-  }
-
-  // A leading "." means the name is fully-qualified.
-  if (TryConsume(".")) type_name->append(".");
-
-  // Consume the first part of the name.
-  std::string identifier;
-  DO(ConsumeIdentifier(&identifier, "Expected type name."));
-  type_name->append(identifier);
-
-  // Consume more parts.
-  while (TryConsume(".")) {
-    type_name->append(".");
-    DO(ConsumeIdentifier(&identifier, "Expected identifier."));
-    type_name->append(identifier);
-  }
-
-  return true;
-}
-
-// ===================================================================
-
-bool Parser::ParsePackage(FileDescriptorProto* file,
-                          const LocationRecorder& root_location,
-                          const FileDescriptorProto* containing_file) {
-  if (file->has_package()) {
-    AddError("Multiple package definitions.");
-    // Don't append the new package to the old one.  Just replace it.  Not
-    // that it really matters since this is an error anyway.
-    file->clear_package();
-  }
-
-  LocationRecorder location(root_location,
-                            FileDescriptorProto::kPackageFieldNumber);
-  location.RecordLegacyLocation(file, DescriptorPool::ErrorCollector::NAME);
-
-  DO(Consume("package"));
-
-  while (true) {
-    std::string identifier;
-    DO(ConsumeIdentifier(&identifier, "Expected identifier."));
-    file->mutable_package()->append(identifier);
-    if (!TryConsume(".")) break;
-    file->mutable_package()->append(".");
-  }
-
-  DO(ConsumeEndOfDeclaration(";", &location));
-
-  return true;
-}
-
-bool Parser::ParseImport(RepeatedPtrField<std::string>* dependency,
-                         RepeatedField<int32_t>* public_dependency,
-                         RepeatedField<int32_t>* weak_dependency,
-                         const LocationRecorder& root_location,
-                         const FileDescriptorProto* containing_file) {
-  LocationRecorder location(root_location,
-                            FileDescriptorProto::kDependencyFieldNumber,
-                            dependency->size());
-
-  DO(Consume("import"));
-
-  if (LookingAt("public")) {
-    LocationRecorder public_location(
-        root_location, FileDescriptorProto::kPublicDependencyFieldNumber,
-        public_dependency->size());
-    DO(Consume("public"));
-    *public_dependency->Add() = dependency->size();
-  } else if (LookingAt("weak")) {
-    LocationRecorder weak_location(
-        root_location, FileDescriptorProto::kWeakDependencyFieldNumber,
-        weak_dependency->size());
-    weak_location.RecordLegacyImportLocation(containing_file, "weak");
-    DO(Consume("weak"));
-    *weak_dependency->Add() = dependency->size();
-  }
-
-  std::string import_file;
-  DO(ConsumeString(&import_file,
-                   "Expected a string naming the file to import."));
-  *dependency->Add() = import_file;
-  location.RecordLegacyImportLocation(containing_file, import_file);
-
-  DO(ConsumeEndOfDeclaration(";", &location));
-
-  return true;
-}
-
-// ===================================================================
-
-SourceLocationTable::SourceLocationTable() {}
-SourceLocationTable::~SourceLocationTable() {}
-
-bool SourceLocationTable::Find(
-    const Message* descriptor,
-    DescriptorPool::ErrorCollector::ErrorLocation location, int* line,
-    int* column) const {
-  const std::pair<int, int>* result =
-      FindOrNull(location_map_, std::make_pair(descriptor, location));
-  if (result == nullptr) {
-    *line = -1;
-    *column = 0;
-    return false;
-  } else {
-    *line = result->first;
-    *column = result->second;
-    return true;
-  }
-}
-
-bool SourceLocationTable::FindImport(const Message* descriptor,
-                                     const std::string& name, int* line,
-                                     int* column) const {
-  const std::pair<int, int>* result =
-      FindOrNull(import_location_map_, std::make_pair(descriptor, name));
-  if (result == nullptr) {
-    *line = -1;
-    *column = 0;
-    return false;
-  } else {
-    *line = result->first;
-    *column = result->second;
-    return true;
-  }
-}
-
-void SourceLocationTable::Add(
-    const Message* descriptor,
-    DescriptorPool::ErrorCollector::ErrorLocation location, int line,
-    int column) {
-  location_map_[std::make_pair(descriptor, location)] =
-      std::make_pair(line, column);
-}
-
-void SourceLocationTable::AddImport(const Message* descriptor,
-                                    const std::string& name, int line,
-                                    int column) {
-  import_location_map_[std::make_pair(descriptor, name)] =
-      std::make_pair(line, column);
-}
-
-void SourceLocationTable::Clear() { location_map_.clear(); }
-
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/compiler/parser.h b/libs/protobuf/src/google/protobuf/compiler/parser.h
deleted file mode 100644
index d4eb763..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/parser.h
+++ /dev/null
@@ -1,602 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-//
-// Implements parsing of .proto files to FileDescriptorProtos.
-
-#ifndef GOOGLE_PROTOBUF_COMPILER_PARSER_H__
-#define GOOGLE_PROTOBUF_COMPILER_PARSER_H__
-
-#include <cstdint>
-#include <map>
-#include <string>
-#include <utility>
-
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/descriptor.pb.h>
-#include <google/protobuf/io/tokenizer.h>
-#include <google/protobuf/repeated_field.h>
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-
-class Message;
-
-namespace compiler {
-
-// Defined in this file.
-class Parser;
-class SourceLocationTable;
-
-// Implements parsing of protocol definitions (such as .proto files).
-//
-// Note that most users will be more interested in the Importer class.
-// Parser is a lower-level class which simply converts a single .proto file
-// to a FileDescriptorProto.  It does not resolve import directives or perform
-// many other kinds of validation needed to construct a complete
-// FileDescriptor.
-class PROTOBUF_EXPORT Parser {
- public:
-  Parser();
-  ~Parser();
-
-  // Parse the entire input and construct a FileDescriptorProto representing
-  // it.  Returns true if no errors occurred, false otherwise.
-  bool Parse(io::Tokenizer* input, FileDescriptorProto* file);
-
-  // Optional features:
-
-  // DEPRECATED:  New code should use the SourceCodeInfo embedded in the
-  //   FileDescriptorProto.
-  //
-  // Requests that locations of certain definitions be recorded to the given
-  // SourceLocationTable while parsing.  This can be used to look up exact line
-  // and column numbers for errors reported by DescriptorPool during validation.
-  // Set to NULL (the default) to discard source location information.
-  void RecordSourceLocationsTo(SourceLocationTable* location_table) {
-    source_location_table_ = location_table;
-  }
-
-  // Requests that errors be recorded to the given ErrorCollector while
-  // parsing.  Set to NULL (the default) to discard error messages.
-  void RecordErrorsTo(io::ErrorCollector* error_collector) {
-    error_collector_ = error_collector;
-  }
-
-  // Returns the identifier used in the "syntax = " declaration, if one was
-  // seen during the last call to Parse(), or the empty string otherwise.
-  const std::string& GetSyntaxIdentifier() { return syntax_identifier_; }
-
-  // If set true, input files will be required to begin with a syntax
-  // identifier.  Otherwise, files may omit this.  If a syntax identifier
-  // is provided, it must be 'syntax = "proto2";' and must appear at the
-  // top of this file regardless of whether or not it was required.
-  void SetRequireSyntaxIdentifier(bool value) {
-    require_syntax_identifier_ = value;
-  }
-
-  // Call SetStopAfterSyntaxIdentifier(true) to tell the parser to stop
-  // parsing as soon as it has seen the syntax identifier, or lack thereof.
-  // This is useful for quickly identifying the syntax of the file without
-  // parsing the whole thing.  If this is enabled, no error will be recorded
-  // if the syntax identifier is something other than "proto2" (since
-  // presumably the caller intends to deal with that), but other kinds of
-  // errors (e.g. parse errors) will still be reported.  When this is enabled,
-  // you may pass a NULL FileDescriptorProto to Parse().
-  void SetStopAfterSyntaxIdentifier(bool value) {
-    stop_after_syntax_identifier_ = value;
-  }
-
- private:
-  class LocationRecorder;
-  struct MapField;
-
-  // =================================================================
-  // Error recovery helpers
-
-  // Consume the rest of the current statement.  This consumes tokens
-  // until it sees one of:
-  //   ';'  Consumes the token and returns.
-  //   '{'  Consumes the brace then calls SkipRestOfBlock().
-  //   '}'  Returns without consuming.
-  //   EOF  Returns (can't consume).
-  // The Parser often calls SkipStatement() after encountering a syntax
-  // error.  This allows it to go on parsing the following lines, allowing
-  // it to report more than just one error in the file.
-  void SkipStatement();
-
-  // Consume the rest of the current block, including nested blocks,
-  // ending after the closing '}' is encountered and consumed, or at EOF.
-  void SkipRestOfBlock();
-
-  // -----------------------------------------------------------------
-  // Single-token consuming helpers
-  //
-  // These make parsing code more readable.
-
-  // True if the current token is TYPE_END.
-  inline bool AtEnd();
-
-  // True if the next token matches the given text.
-  inline bool LookingAt(const char* text);
-  // True if the next token is of the given type.
-  inline bool LookingAtType(io::Tokenizer::TokenType token_type);
-
-  // If the next token exactly matches the text given, consume it and return
-  // true.  Otherwise, return false without logging an error.
-  bool TryConsume(const char* text);
-
-  // These attempt to read some kind of token from the input.  If successful,
-  // they return true.  Otherwise they return false and add the given error
-  // to the error list.
-
-  // Consume a token with the exact text given.
-  bool Consume(const char* text, const char* error);
-  // Same as above, but automatically generates the error "Expected \"text\".",
-  // where "text" is the expected token text.
-  bool Consume(const char* text);
-  // Consume a token of type IDENTIFIER and store its text in "output".
-  bool ConsumeIdentifier(std::string* output, const char* error);
-  // Consume an integer and store its value in "output".
-  bool ConsumeInteger(int* output, const char* error);
-  // Consume a signed integer and store its value in "output".
-  bool ConsumeSignedInteger(int* output, const char* error);
-  // Consume a 64-bit integer and store its value in "output".  If the value
-  // is greater than max_value, an error will be reported.
-  bool ConsumeInteger64(uint64_t max_value, uint64_t* output,
-                        const char* error);
-  // Consume a number and store its value in "output".  This will accept
-  // tokens of either INTEGER or FLOAT type.
-  bool ConsumeNumber(double* output, const char* error);
-  // Consume a string literal and store its (unescaped) value in "output".
-  bool ConsumeString(std::string* output, const char* error);
-
-  // Consume a token representing the end of the statement.  Comments between
-  // this token and the next will be harvested for documentation.  The given
-  // LocationRecorder should refer to the declaration that was just parsed;
-  // it will be populated with these comments.
-  //
-  // TODO(kenton):  The LocationRecorder is const because historically locations
-  //   have been passed around by const reference, for no particularly good
-  //   reason.  We should probably go through and change them all to mutable
-  //   pointer to make this more intuitive.
-  bool TryConsumeEndOfDeclaration(const char* text,
-                                  const LocationRecorder* location);
-  bool TryConsumeEndOfDeclarationFinishScope(const char* text,
-                                             const LocationRecorder* location);
-
-  bool ConsumeEndOfDeclaration(const char* text,
-                               const LocationRecorder* location);
-
-  // -----------------------------------------------------------------
-  // Error logging helpers
-
-  // Invokes error_collector_->AddError(), if error_collector_ is not NULL.
-  void AddError(int line, int column, const std::string& error);
-
-  // Invokes error_collector_->AddError() with the line and column number
-  // of the current token.
-  void AddError(const std::string& error);
-
-  // Invokes error_collector_->AddWarning() with the line and column number
-  // of the current token.
-  void AddWarning(const std::string& warning);
-
-  // Records a location in the SourceCodeInfo.location table (see
-  // descriptor.proto).  We use RAII to ensure that the start and end locations
-  // are recorded -- the constructor records the start location and the
-  // destructor records the end location.  Since the parser is
-  // recursive-descent, this works out beautifully.
-  class PROTOBUF_EXPORT LocationRecorder {
-   public:
-    // Construct the file's "root" location.
-    LocationRecorder(Parser* parser);
-
-    // Construct a location that represents a declaration nested within the
-    // given parent.  E.g. a field's location is nested within the location
-    // for a message type.  The parent's path will be copied, so you should
-    // call AddPath() only to add the path components leading from the parent
-    // to the child (as opposed to leading from the root to the child).
-    LocationRecorder(const LocationRecorder& parent);
-
-    // Convenience constructors that call AddPath() one or two times.
-    LocationRecorder(const LocationRecorder& parent, int path1);
-    LocationRecorder(const LocationRecorder& parent, int path1, int path2);
-
-    // Creates a recorder that generates locations into given source code info.
-    LocationRecorder(const LocationRecorder& parent, int path1,
-                     SourceCodeInfo* source_code_info);
-
-    ~LocationRecorder();
-
-    // Add a path component.  See SourceCodeInfo.Location.path in
-    // descriptor.proto.
-    void AddPath(int path_component);
-
-    // By default the location is considered to start at the current token at
-    // the time the LocationRecorder is created.  StartAt() sets the start
-    // location to the given token instead.
-    void StartAt(const io::Tokenizer::Token& token);
-
-    // Start at the same location as some other LocationRecorder.
-    void StartAt(const LocationRecorder& other);
-
-    // By default the location is considered to end at the previous token at
-    // the time the LocationRecorder is destroyed.  EndAt() sets the end
-    // location to the given token instead.
-    void EndAt(const io::Tokenizer::Token& token);
-
-    // Records the start point of this location to the SourceLocationTable that
-    // was passed to RecordSourceLocationsTo(), if any.  SourceLocationTable
-    // is an older way of keeping track of source locations which is still
-    // used in some places.
-    void RecordLegacyLocation(
-        const Message* descriptor,
-        DescriptorPool::ErrorCollector::ErrorLocation location);
-    void RecordLegacyImportLocation(const Message* descriptor,
-                                    const std::string& name);
-
-    // Returns the number of path components in the recorder's current location.
-    int CurrentPathSize() const;
-
-    // Attaches leading and trailing comments to the location.  The two strings
-    // will be swapped into place, so after this is called *leading and
-    // *trailing will be empty.
-    //
-    // TODO(kenton):  See comment on TryConsumeEndOfDeclaration(), above, for
-    //   why this is const.
-    void AttachComments(std::string* leading, std::string* trailing,
-                        std::vector<std::string>* detached_comments) const;
-
-   private:
-    Parser* parser_;
-    SourceCodeInfo* source_code_info_;
-    SourceCodeInfo::Location* location_;
-
-    void Init(const LocationRecorder& parent, SourceCodeInfo* source_code_info);
-  };
-
-  // =================================================================
-  // Parsers for various language constructs
-
-  // Parses the "syntax = \"proto2\";" line at the top of the file.  Returns
-  // false if it failed to parse or if the syntax identifier was not
-  // recognized.
-  bool ParseSyntaxIdentifier(const LocationRecorder& parent);
-
-  // These methods parse various individual bits of code.  They return
-  // false if they completely fail to parse the construct.  In this case,
-  // it is probably necessary to skip the rest of the statement to recover.
-  // However, if these methods return true, it does NOT mean that there
-  // were no errors; only that there were no *syntax* errors.  For instance,
-  // if a service method is defined using proper syntax but uses a primitive
-  // type as its input or output, ParseMethodField() still returns true
-  // and only reports the error by calling AddError().  In practice, this
-  // makes logic much simpler for the caller.
-
-  // Parse a top-level message, enum, service, etc.
-  bool ParseTopLevelStatement(FileDescriptorProto* file,
-                              const LocationRecorder& root_location);
-
-  // Parse various language high-level language construrcts.
-  bool ParseMessageDefinition(DescriptorProto* message,
-                              const LocationRecorder& message_location,
-                              const FileDescriptorProto* containing_file);
-  bool ParseEnumDefinition(EnumDescriptorProto* enum_type,
-                           const LocationRecorder& enum_location,
-                           const FileDescriptorProto* containing_file);
-  bool ParseServiceDefinition(ServiceDescriptorProto* service,
-                              const LocationRecorder& service_location,
-                              const FileDescriptorProto* containing_file);
-  bool ParsePackage(FileDescriptorProto* file,
-                    const LocationRecorder& root_location,
-                    const FileDescriptorProto* containing_file);
-  bool ParseImport(RepeatedPtrField<std::string>* dependency,
-                   RepeatedField<int32_t>* public_dependency,
-                   RepeatedField<int32_t>* weak_dependency,
-                   const LocationRecorder& root_location,
-                   const FileDescriptorProto* containing_file);
-
-  // These methods parse the contents of a message, enum, or service type and
-  // add them to the given object.  They consume the entire block including
-  // the beginning and ending brace.
-  bool ParseMessageBlock(DescriptorProto* message,
-                         const LocationRecorder& message_location,
-                         const FileDescriptorProto* containing_file);
-  bool ParseEnumBlock(EnumDescriptorProto* enum_type,
-                      const LocationRecorder& enum_location,
-                      const FileDescriptorProto* containing_file);
-  bool ParseServiceBlock(ServiceDescriptorProto* service,
-                         const LocationRecorder& service_location,
-                         const FileDescriptorProto* containing_file);
-
-  // Parse one statement within a message, enum, or service block, including
-  // final semicolon.
-  bool ParseMessageStatement(DescriptorProto* message,
-                             const LocationRecorder& message_location,
-                             const FileDescriptorProto* containing_file);
-  bool ParseEnumStatement(EnumDescriptorProto* message,
-                          const LocationRecorder& enum_location,
-                          const FileDescriptorProto* containing_file);
-  bool ParseServiceStatement(ServiceDescriptorProto* message,
-                             const LocationRecorder& service_location,
-                             const FileDescriptorProto* containing_file);
-
-  // Parse a field of a message.  If the field is a group, its type will be
-  // added to "messages".
-  //
-  // parent_location and location_field_number_for_nested_type are needed when
-  // parsing groups -- we need to generate a nested message type within the
-  // parent and record its location accordingly.  Since the parent could be
-  // either a FileDescriptorProto or a DescriptorProto, we must pass in the
-  // correct field number to use.
-  bool ParseMessageField(FieldDescriptorProto* field,
-                         RepeatedPtrField<DescriptorProto>* messages,
-                         const LocationRecorder& parent_location,
-                         int location_field_number_for_nested_type,
-                         const LocationRecorder& field_location,
-                         const FileDescriptorProto* containing_file);
-
-  // Like ParseMessageField() but expects the label has already been filled in
-  // by the caller.
-  bool ParseMessageFieldNoLabel(FieldDescriptorProto* field,
-                                RepeatedPtrField<DescriptorProto>* messages,
-                                const LocationRecorder& parent_location,
-                                int location_field_number_for_nested_type,
-                                const LocationRecorder& field_location,
-                                const FileDescriptorProto* containing_file);
-
-  bool ParseMapType(MapField* map_field, FieldDescriptorProto* field,
-                    LocationRecorder& type_name_location);
-
-  // Parse an "extensions" declaration.
-  bool ParseExtensions(DescriptorProto* message,
-                       const LocationRecorder& extensions_location,
-                       const FileDescriptorProto* containing_file);
-
-  // Parse a "reserved" declaration.
-  bool ParseReserved(DescriptorProto* message,
-                     const LocationRecorder& message_location);
-  bool ParseReservedNames(DescriptorProto* message,
-                          const LocationRecorder& parent_location);
-  bool ParseReservedNumbers(DescriptorProto* message,
-                            const LocationRecorder& parent_location);
-  bool ParseReserved(EnumDescriptorProto* message,
-                     const LocationRecorder& message_location);
-  bool ParseReservedNames(EnumDescriptorProto* message,
-                          const LocationRecorder& parent_location);
-  bool ParseReservedNumbers(EnumDescriptorProto* message,
-                            const LocationRecorder& parent_location);
-
-  // Parse an "extend" declaration.  (See also comments for
-  // ParseMessageField().)
-  bool ParseExtend(RepeatedPtrField<FieldDescriptorProto>* extensions,
-                   RepeatedPtrField<DescriptorProto>* messages,
-                   const LocationRecorder& parent_location,
-                   int location_field_number_for_nested_type,
-                   const LocationRecorder& extend_location,
-                   const FileDescriptorProto* containing_file);
-
-  // Parse a "oneof" declaration.  The caller is responsible for setting
-  // oneof_decl->label() since it will have had to parse the label before it
-  // knew it was parsing a oneof.
-  bool ParseOneof(OneofDescriptorProto* oneof_decl,
-                  DescriptorProto* containing_type, int oneof_index,
-                  const LocationRecorder& oneof_location,
-                  const LocationRecorder& containing_type_location,
-                  const FileDescriptorProto* containing_file);
-
-  // Parse a single enum value within an enum block.
-  bool ParseEnumConstant(EnumValueDescriptorProto* enum_value,
-                         const LocationRecorder& enum_value_location,
-                         const FileDescriptorProto* containing_file);
-
-  // Parse enum constant options, i.e. the list in square brackets at the end
-  // of the enum constant value definition.
-  bool ParseEnumConstantOptions(EnumValueDescriptorProto* value,
-                                const LocationRecorder& enum_value_location,
-                                const FileDescriptorProto* containing_file);
-
-  // Parse a single method within a service definition.
-  bool ParseServiceMethod(MethodDescriptorProto* method,
-                          const LocationRecorder& method_location,
-                          const FileDescriptorProto* containing_file);
-
-  // Parse options of a single method or stream.
-  bool ParseMethodOptions(const LocationRecorder& parent_location,
-                          const FileDescriptorProto* containing_file,
-                          const int optionsFieldNumber,
-                          Message* mutable_options);
-
-  // Parse "required", "optional", or "repeated" and fill in "label"
-  // with the value. Returns true if such a label is consumed.
-  bool ParseLabel(FieldDescriptorProto::Label* label,
-                  const LocationRecorder& field_location);
-
-  // Parse a type name and fill in "type" (if it is a primitive) or
-  // "type_name" (if it is not) with the type parsed.
-  bool ParseType(FieldDescriptorProto::Type* type, std::string* type_name);
-  // Parse a user-defined type and fill in "type_name" with the name.
-  // If a primitive type is named, it is treated as an error.
-  bool ParseUserDefinedType(std::string* type_name);
-
-  // Parses field options, i.e. the stuff in square brackets at the end
-  // of a field definition.  Also parses default value.
-  bool ParseFieldOptions(FieldDescriptorProto* field,
-                         const LocationRecorder& field_location,
-                         const FileDescriptorProto* containing_file);
-
-  // Parse the "default" option.  This needs special handling because its
-  // type is the field's type.
-  bool ParseDefaultAssignment(FieldDescriptorProto* field,
-                              const LocationRecorder& field_location,
-                              const FileDescriptorProto* containing_file);
-
-  bool ParseJsonName(FieldDescriptorProto* field,
-                     const LocationRecorder& field_location,
-                     const FileDescriptorProto* containing_file);
-
-  enum OptionStyle {
-    OPTION_ASSIGNMENT,  // just "name = value"
-    OPTION_STATEMENT    // "option name = value;"
-  };
-
-  // Parse a single option name/value pair, e.g. "ctype = CORD".  The name
-  // identifies a field of the given Message, and the value of that field
-  // is set to the parsed value.
-  bool ParseOption(Message* options, const LocationRecorder& options_location,
-                   const FileDescriptorProto* containing_file,
-                   OptionStyle style);
-
-  // Parses a single part of a multipart option name. A multipart name consists
-  // of names separated by dots. Each name is either an identifier or a series
-  // of identifiers separated by dots and enclosed in parentheses. E.g.,
-  // "foo.(bar.baz).moo".
-  bool ParseOptionNamePart(UninterpretedOption* uninterpreted_option,
-                           const LocationRecorder& part_location,
-                           const FileDescriptorProto* containing_file);
-
-  // Parses a string surrounded by balanced braces.  Strips off the outer
-  // braces and stores the enclosed string in *value.
-  // E.g.,
-  //     { foo }                     *value gets 'foo'
-  //     { foo { bar: box } }        *value gets 'foo { bar: box }'
-  //     {}                          *value gets ''
-  //
-  // REQUIRES: LookingAt("{")
-  // When finished successfully, we are looking at the first token past
-  // the ending brace.
-  bool ParseUninterpretedBlock(std::string* value);
-
-  struct MapField {
-    // Whether the field is a map field.
-    bool is_map_field;
-    // The types of the key and value if they are primitive types.
-    FieldDescriptorProto::Type key_type;
-    FieldDescriptorProto::Type value_type;
-    // Or the type names string if the types are customized types.
-    std::string key_type_name;
-    std::string value_type_name;
-
-    MapField() : is_map_field(false) {}
-  };
-  // Desugar the map syntax to generate a nested map entry message.
-  void GenerateMapEntry(const MapField& map_field, FieldDescriptorProto* field,
-                        RepeatedPtrField<DescriptorProto>* messages);
-
-  // Whether fields without label default to optional fields.
-  bool DefaultToOptionalFields() const {
-    return syntax_identifier_ == "proto3";
-  }
-
-  bool ValidateEnum(const EnumDescriptorProto* proto);
-
-  // =================================================================
-
-  io::Tokenizer* input_;
-  io::ErrorCollector* error_collector_;
-  SourceCodeInfo* source_code_info_;
-  SourceLocationTable* source_location_table_;  // legacy
-  bool had_errors_;
-  bool require_syntax_identifier_;
-  bool stop_after_syntax_identifier_;
-  std::string syntax_identifier_;
-
-  // Leading doc comments for the next declaration.  These are not complete
-  // yet; use ConsumeEndOfDeclaration() to get the complete comments.
-  std::string upcoming_doc_comments_;
-
-  // Detached comments are not connected to any syntax entities. Elements in
-  // this vector are paragraphs of comments separated by empty lines. The
-  // detached comments will be put into the leading_detached_comments field for
-  // the next element (See SourceCodeInfo.Location in descriptor.proto), when
-  // ConsumeEndOfDeclaration() is called.
-  std::vector<std::string> upcoming_detached_comments_;
-
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(Parser);
-};
-
-// A table mapping (descriptor, ErrorLocation) pairs -- as reported by
-// DescriptorPool when validating descriptors -- to line and column numbers
-// within the original source code.
-//
-// This is semi-obsolete:  FileDescriptorProto.source_code_info now contains
-// far more complete information about source locations.  However, as of this
-// writing you still need to use SourceLocationTable when integrating with
-// DescriptorPool.
-class PROTOBUF_EXPORT SourceLocationTable {
- public:
-  SourceLocationTable();
-  ~SourceLocationTable();
-
-  // Finds the precise location of the given error and fills in *line and
-  // *column with the line and column numbers.  If not found, sets *line to
-  // -1 and *column to 0 (since line = -1 is used to mean "error has no exact
-  // location" in the ErrorCollector interface).  Returns true if found, false
-  // otherwise.
-  bool Find(const Message* descriptor,
-            DescriptorPool::ErrorCollector::ErrorLocation location, int* line,
-            int* column) const;
-  bool FindImport(const Message* descriptor, const std::string& name, int* line,
-                  int* column) const;
-
-  // Adds a location to the table.
-  void Add(const Message* descriptor,
-           DescriptorPool::ErrorCollector::ErrorLocation location, int line,
-           int column);
-  void AddImport(const Message* descriptor, const std::string& name, int line,
-                 int column);
-
-  // Clears the contents of the table.
-  void Clear();
-
- private:
-  typedef std::map<
-      std::pair<const Message*, DescriptorPool::ErrorCollector::ErrorLocation>,
-      std::pair<int, int> >
-      LocationMap;
-  LocationMap location_map_;
-  std::map<std::pair<const Message*, std::string>, std::pair<int, int> >
-      import_location_map_;
-};
-
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
-
-#endif  // GOOGLE_PROTOBUF_COMPILER_PARSER_H__
diff --git a/libs/protobuf/src/google/protobuf/compiler/parser_unittest.cc b/libs/protobuf/src/google/protobuf/compiler/parser_unittest.cc
deleted file mode 100644
index 2d681d9..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/parser_unittest.cc
+++ /dev/null
@@ -1,3685 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-
-#include <google/protobuf/compiler/parser.h>
-
-#include <algorithm>
-#include <map>
-#include <memory>
-#include <vector>
-
-#include <google/protobuf/test_util2.h>
-#include <google/protobuf/unittest.pb.h>
-#include <google/protobuf/any.pb.h>
-#include <google/protobuf/unittest_custom_options.pb.h>
-#include <google/protobuf/io/tokenizer.h>
-#include <google/protobuf/io/zero_copy_stream_impl.h>
-#include <google/protobuf/descriptor.pb.h>
-#include <google/protobuf/text_format.h>
-#include <google/protobuf/wire_format.h>
-#include <google/protobuf/testing/googletest.h>
-#include <gtest/gtest.h>
-#include <google/protobuf/stubs/substitute.h>
-#include <google/protobuf/stubs/map_util.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-
-namespace {
-
-class MockErrorCollector : public io::ErrorCollector {
- public:
-  MockErrorCollector() = default;
-  ~MockErrorCollector() override = default;
-
-  std::string warning_;
-  std::string text_;
-
-  // implements ErrorCollector ---------------------------------------
-  void AddWarning(int line, int column, const std::string& message) override {
-    strings::SubstituteAndAppend(&warning_, "$0:$1: $2\n", line, column, message);
-  }
-
-  void AddError(int line, int column, const std::string& message) override {
-    strings::SubstituteAndAppend(&text_, "$0:$1: $2\n", line, column, message);
-  }
-};
-
-class MockValidationErrorCollector : public DescriptorPool::ErrorCollector {
- public:
-  MockValidationErrorCollector(const SourceLocationTable& source_locations,
-                               io::ErrorCollector* wrapped_collector)
-      : source_locations_(source_locations),
-        wrapped_collector_(wrapped_collector) {}
-  ~MockValidationErrorCollector() override {}
-
-  // implements ErrorCollector ---------------------------------------
-  void AddError(const std::string& filename, const std::string& element_name,
-                const Message* descriptor, ErrorLocation location,
-                const std::string& message) override {
-    int line, column;
-    if (location == DescriptorPool::ErrorCollector::IMPORT) {
-      source_locations_.FindImport(descriptor, element_name, &line, &column);
-    } else {
-      source_locations_.Find(descriptor, location, &line, &column);
-    }
-    wrapped_collector_->AddError(line, column, message);
-  }
-
- private:
-  const SourceLocationTable& source_locations_;
-  io::ErrorCollector* wrapped_collector_;
-};
-
-class ParserTest : public testing::Test {
- protected:
-  ParserTest() : require_syntax_identifier_(false) {}
-
-  // Set up the parser to parse the given text.
-  void SetupParser(const char* text) {
-    raw_input_.reset(new io::ArrayInputStream(text, strlen(text)));
-    input_.reset(new io::Tokenizer(raw_input_.get(), &error_collector_));
-    parser_.reset(new Parser());
-    parser_->RecordErrorsTo(&error_collector_);
-    parser_->SetRequireSyntaxIdentifier(require_syntax_identifier_);
-  }
-
-  // Parse the input and expect that the resulting FileDescriptorProto matches
-  // the given output.  The output is a FileDescriptorProto in protocol buffer
-  // text format.
-  void ExpectParsesTo(const char* input, const char* output) {
-    SetupParser(input);
-    FileDescriptorProto actual, expected;
-
-    parser_->Parse(input_.get(), &actual);
-    EXPECT_EQ(io::Tokenizer::TYPE_END, input_->current().type);
-    ASSERT_EQ("", error_collector_.text_);
-
-    // We don't cover SourceCodeInfo in these tests.
-    actual.clear_source_code_info();
-
-    // Parse the ASCII representation in order to canonicalize it.  We could
-    // just compare directly to actual.DebugString(), but that would require
-    // that the caller precisely match the formatting that DebugString()
-    // produces.
-    ASSERT_TRUE(TextFormat::ParseFromString(output, &expected));
-
-    // Compare by comparing debug strings.
-    // TODO(kenton):  Use differencer, once it is available.
-    EXPECT_EQ(expected.DebugString(), actual.DebugString());
-  }
-
-  // Parse the text and expect that the given errors are reported.
-  void ExpectHasErrors(const char* text, const char* expected_errors) {
-    ExpectHasEarlyExitErrors(text, expected_errors);
-    EXPECT_EQ(io::Tokenizer::TYPE_END, input_->current().type);
-  }
-
-  // Same as above but does not expect that the parser parses the complete
-  // input.
-  void ExpectHasEarlyExitErrors(const char* text, const char* expected_errors) {
-    SetupParser(text);
-    FileDescriptorProto file;
-    parser_->Parse(input_.get(), &file);
-    EXPECT_EQ(expected_errors, error_collector_.text_);
-  }
-
-  // Parse the text as a file and validate it (with a DescriptorPool), and
-  // expect that the validation step reports the given errors.
-  void ExpectHasValidationErrors(const char* text,
-                                 const char* expected_errors) {
-    SetupParser(text);
-    SourceLocationTable source_locations;
-    parser_->RecordSourceLocationsTo(&source_locations);
-
-    FileDescriptorProto file;
-    file.set_name("foo.proto");
-    parser_->Parse(input_.get(), &file);
-    EXPECT_EQ(io::Tokenizer::TYPE_END, input_->current().type);
-    ASSERT_EQ("", error_collector_.text_);
-
-    MockValidationErrorCollector validation_error_collector(source_locations,
-                                                            &error_collector_);
-    EXPECT_TRUE(pool_.BuildFileCollectingErrors(
-                    file, &validation_error_collector) == nullptr);
-    EXPECT_EQ(expected_errors, error_collector_.text_);
-  }
-
-  MockErrorCollector error_collector_;
-  DescriptorPool pool_;
-
-  std::unique_ptr<io::ZeroCopyInputStream> raw_input_;
-  std::unique_ptr<io::Tokenizer> input_;
-  std::unique_ptr<Parser> parser_;
-  bool require_syntax_identifier_;
-};
-
-// ===================================================================
-
-TEST_F(ParserTest, StopAfterSyntaxIdentifier) {
-  SetupParser(
-      "// blah\n"
-      "syntax = \"foobar\";\n"
-      "this line will not be parsed\n");
-  parser_->SetStopAfterSyntaxIdentifier(true);
-  EXPECT_TRUE(parser_->Parse(input_.get(), nullptr));
-  EXPECT_EQ("", error_collector_.text_);
-  EXPECT_EQ("foobar", parser_->GetSyntaxIdentifier());
-}
-
-TEST_F(ParserTest, StopAfterOmittedSyntaxIdentifier) {
-  SetupParser(
-      "// blah\n"
-      "this line will not be parsed\n");
-  parser_->SetStopAfterSyntaxIdentifier(true);
-  EXPECT_TRUE(parser_->Parse(input_.get(), nullptr));
-  EXPECT_EQ("", error_collector_.text_);
-  EXPECT_EQ("", parser_->GetSyntaxIdentifier());
-}
-
-TEST_F(ParserTest, StopAfterSyntaxIdentifierWithErrors) {
-  SetupParser(
-      "// blah\n"
-      "syntax = error;\n");
-  parser_->SetStopAfterSyntaxIdentifier(true);
-  EXPECT_FALSE(parser_->Parse(input_.get(), nullptr));
-  EXPECT_EQ("1:9: Expected syntax identifier.\n", error_collector_.text_);
-}
-
-TEST_F(ParserTest, WarnIfSyntaxIdentifierOmmitted) {
-  SetupParser("message A {}");
-  FileDescriptorProto file;
-  CaptureTestStderr();
-  EXPECT_TRUE(parser_->Parse(input_.get(), &file));
-  EXPECT_TRUE(GetCapturedTestStderr().find("No syntax specified") !=
-              std::string::npos);
-}
-
-TEST_F(ParserTest, WarnIfFieldNameIsNotUpperCamel) {
-  SetupParser(
-      "syntax = \"proto2\";"
-      "message abc {}");
-  FileDescriptorProto file;
-  EXPECT_TRUE(parser_->Parse(input_.get(), &file));
-  EXPECT_TRUE(error_collector_.warning_.find(
-                  "Message name should be in UpperCamelCase. Found: abc.") !=
-              std::string::npos);
-}
-
-TEST_F(ParserTest, WarnIfFieldNameIsNotLowerUnderscore) {
-  SetupParser(
-      "syntax = \"proto2\";"
-      "message A {"
-      "  optional string SongName = 1;"
-      "}");
-  FileDescriptorProto file;
-  EXPECT_TRUE(parser_->Parse(input_.get(), &file));
-  EXPECT_TRUE(error_collector_.warning_.find(
-                  "Field name should be lowercase. Found: SongName") !=
-              std::string::npos);
-}
-
-TEST_F(ParserTest, WarnIfFieldNameContainsNumberImmediatelyFollowUnderscore) {
-  SetupParser(
-      "syntax = \"proto2\";"
-      "message A {"
-      "  optional string song_name_1 = 1;"
-      "}");
-  FileDescriptorProto file;
-  EXPECT_TRUE(parser_->Parse(input_.get(), &file));
-  EXPECT_TRUE(error_collector_.warning_.find(
-                  "Number should not come right after an underscore. Found: "
-                  "song_name_1.") != std::string::npos);
-}
-
-// ===================================================================
-
-typedef ParserTest ParseMessageTest;
-
-TEST_F(ParseMessageTest, IgnoreBOM) {
-  char input[] =
-      "   message TestMessage {\n"
-      "  required int32 foo = 1;\n"
-      "}\n";
-  // Set UTF-8 BOM.
-  input[0] = (char)0xEF;
-  input[1] = (char)0xBB;
-  input[2] = (char)0xBF;
-  ExpectParsesTo(
-      input,
-      "message_type {"
-      "  name: \"TestMessage\""
-      "  field { name:\"foo\" label:LABEL_REQUIRED type:TYPE_INT32 number:1 }"
-      "}");
-}
-
-TEST_F(ParseMessageTest, BOMError) {
-  char input[] =
-      "   message TestMessage {\n"
-      "  required int32 foo = 1;\n"
-      "}\n";
-  input[0] = (char)0xEF;
-  ExpectHasErrors(input,
-                  "0:1: Proto file starts with 0xEF but not UTF-8 BOM. "
-                  "Only UTF-8 is accepted for proto file.\n"
-                  "0:0: Expected top-level statement (e.g. \"message\").\n");
-}
-
-TEST_F(ParseMessageTest, SimpleMessage) {
-  ExpectParsesTo(
-      "message TestMessage {\n"
-      "  required int32 foo = 1;\n"
-      "}\n",
-
-      "message_type {"
-      "  name: \"TestMessage\""
-      "  field { name:\"foo\" label:LABEL_REQUIRED type:TYPE_INT32 number:1 }"
-      "}");
-}
-
-TEST_F(ParseMessageTest, ImplicitSyntaxIdentifier) {
-  require_syntax_identifier_ = false;
-  ExpectParsesTo(
-      "message TestMessage {\n"
-      "  required int32 foo = 1;\n"
-      "}\n",
-
-      "message_type {"
-      "  name: \"TestMessage\""
-      "  field { name:\"foo\" label:LABEL_REQUIRED type:TYPE_INT32 number:1 }"
-      "}");
-  EXPECT_EQ("proto2", parser_->GetSyntaxIdentifier());
-}
-
-TEST_F(ParseMessageTest, ExplicitSyntaxIdentifier) {
-  ExpectParsesTo(
-      "syntax = \"proto2\";\n"
-      "message TestMessage {\n"
-      "  required int32 foo = 1;\n"
-      "}\n",
-
-      "syntax: 'proto2' "
-      "message_type {"
-      "  name: \"TestMessage\""
-      "  field { name:\"foo\" label:LABEL_REQUIRED type:TYPE_INT32 number:1 }"
-      "}");
-  EXPECT_EQ("proto2", parser_->GetSyntaxIdentifier());
-}
-
-TEST_F(ParseMessageTest, ExplicitRequiredSyntaxIdentifier) {
-  require_syntax_identifier_ = true;
-  ExpectParsesTo(
-      "syntax = \"proto2\";\n"
-      "message TestMessage {\n"
-      "  required int32 foo = 1;\n"
-      "}\n",
-
-      "syntax: 'proto2' "
-      "message_type {"
-      "  name: \"TestMessage\""
-      "  field { name:\"foo\" label:LABEL_REQUIRED type:TYPE_INT32 number:1 }"
-      "}");
-  EXPECT_EQ("proto2", parser_->GetSyntaxIdentifier());
-}
-
-TEST_F(ParseMessageTest, SimpleFields) {
-  ExpectParsesTo(
-      "message TestMessage {\n"
-      "  required int32 foo = 15;\n"
-      "  optional int32 bar = 34;\n"
-      "  repeated int32 baz = 3;\n"
-      "}\n",
-
-      "message_type {"
-      "  name: \"TestMessage\""
-      "  field { name:\"foo\" label:LABEL_REQUIRED type:TYPE_INT32 number:15 }"
-      "  field { name:\"bar\" label:LABEL_OPTIONAL type:TYPE_INT32 number:34 }"
-      "  field { name:\"baz\" label:LABEL_REPEATED type:TYPE_INT32 number:3  }"
-      "}");
-}
-
-TEST_F(ParseMessageTest, PrimitiveFieldTypes) {
-  ExpectParsesTo(
-      "message TestMessage {\n"
-      "  required int32    foo = 1;\n"
-      "  required int64    foo = 1;\n"
-      "  required uint32   foo = 1;\n"
-      "  required uint64   foo = 1;\n"
-      "  required sint32   foo = 1;\n"
-      "  required sint64   foo = 1;\n"
-      "  required fixed32  foo = 1;\n"
-      "  required fixed64  foo = 1;\n"
-      "  required sfixed32 foo = 1;\n"
-      "  required sfixed64 foo = 1;\n"
-      "  required float    foo = 1;\n"
-      "  required double   foo = 1;\n"
-      "  required string   foo = 1;\n"
-      "  required bytes    foo = 1;\n"
-      "  required bool     foo = 1;\n"
-      "}\n",
-
-      "message_type {"
-      "  name: \"TestMessage\""
-      "  field { name:\"foo\" label:LABEL_REQUIRED type:TYPE_INT32    number:1 "
-      "}"
-      "  field { name:\"foo\" label:LABEL_REQUIRED type:TYPE_INT64    number:1 "
-      "}"
-      "  field { name:\"foo\" label:LABEL_REQUIRED type:TYPE_UINT32   number:1 "
-      "}"
-      "  field { name:\"foo\" label:LABEL_REQUIRED type:TYPE_UINT64   number:1 "
-      "}"
-      "  field { name:\"foo\" label:LABEL_REQUIRED type:TYPE_SINT32   number:1 "
-      "}"
-      "  field { name:\"foo\" label:LABEL_REQUIRED type:TYPE_SINT64   number:1 "
-      "}"
-      "  field { name:\"foo\" label:LABEL_REQUIRED type:TYPE_FIXED32  number:1 "
-      "}"
-      "  field { name:\"foo\" label:LABEL_REQUIRED type:TYPE_FIXED64  number:1 "
-      "}"
-      "  field { name:\"foo\" label:LABEL_REQUIRED type:TYPE_SFIXED32 number:1 "
-      "}"
-      "  field { name:\"foo\" label:LABEL_REQUIRED type:TYPE_SFIXED64 number:1 "
-      "}"
-      "  field { name:\"foo\" label:LABEL_REQUIRED type:TYPE_FLOAT    number:1 "
-      "}"
-      "  field { name:\"foo\" label:LABEL_REQUIRED type:TYPE_DOUBLE   number:1 "
-      "}"
-      "  field { name:\"foo\" label:LABEL_REQUIRED type:TYPE_STRING   number:1 "
-      "}"
-      "  field { name:\"foo\" label:LABEL_REQUIRED type:TYPE_BYTES    number:1 "
-      "}"
-      "  field { name:\"foo\" label:LABEL_REQUIRED type:TYPE_BOOL     number:1 "
-      "}"
-      "}");
-}
-
-TEST_F(ParseMessageTest, FieldDefaults) {
-  ExpectParsesTo(
-      "message TestMessage {\n"
-      "  required int32  foo = 1 [default=  1  ];\n"
-      "  required int32  foo = 1 [default= -2  ];\n"
-      "  required int64  foo = 1 [default=  3  ];\n"
-      "  required int64  foo = 1 [default= -4  ];\n"
-      "  required uint32 foo = 1 [default=  5  ];\n"
-      "  required uint64 foo = 1 [default=  6  ];\n"
-      "  required float  foo = 1 [default=  7.5];\n"
-      "  required float  foo = 1 [default= -8.5];\n"
-      "  required float  foo = 1 [default=  9  ];\n"
-      "  required double foo = 1 [default= 10.5];\n"
-      "  required double foo = 1 [default=-11.5];\n"
-      "  required double foo = 1 [default= 12  ];\n"
-      "  required double foo = 1 [default= inf ];\n"
-      "  required double foo = 1 [default=-inf ];\n"
-      "  required double foo = 1 [default= nan ];\n"
-      "  required string foo = 1 [default='13\\001'];\n"
-      "  required string foo = 1 [default='a' \"b\" \n \"c\"];\n"
-      "  required bytes  foo = 1 [default='14\\002'];\n"
-      "  required bytes  foo = 1 [default='a' \"b\" \n 'c'];\n"
-      "  required bool   foo = 1 [default=true ];\n"
-      "  required Foo    foo = 1 [default=FOO  ];\n"
-
-      "  required int32  foo = 1 [default= 0x7FFFFFFF];\n"
-      "  required int32  foo = 1 [default=-0x80000000];\n"
-      "  required uint32 foo = 1 [default= 0xFFFFFFFF];\n"
-      "  required int64  foo = 1 [default= 0x7FFFFFFFFFFFFFFF];\n"
-      "  required int64  foo = 1 [default=-0x8000000000000000];\n"
-      "  required uint64 foo = 1 [default= 0xFFFFFFFFFFFFFFFF];\n"
-      "  required double foo = 1 [default= 0xabcd];\n"
-      "}\n",
-
-#define ETC "name:\"foo\" label:LABEL_REQUIRED number:1"
-      "message_type {"
-      "  name: \"TestMessage\""
-      "  field { type:TYPE_INT32   default_value:\"1\"         " ETC
-      " }"
-      "  field { type:TYPE_INT32   default_value:\"-2\"        " ETC
-      " }"
-      "  field { type:TYPE_INT64   default_value:\"3\"         " ETC
-      " }"
-      "  field { type:TYPE_INT64   default_value:\"-4\"        " ETC
-      " }"
-      "  field { type:TYPE_UINT32  default_value:\"5\"         " ETC
-      " }"
-      "  field { type:TYPE_UINT64  default_value:\"6\"         " ETC
-      " }"
-      "  field { type:TYPE_FLOAT   default_value:\"7.5\"       " ETC
-      " }"
-      "  field { type:TYPE_FLOAT   default_value:\"-8.5\"      " ETC
-      " }"
-      "  field { type:TYPE_FLOAT   default_value:\"9\"         " ETC
-      " }"
-      "  field { type:TYPE_DOUBLE  default_value:\"10.5\"      " ETC
-      " }"
-      "  field { type:TYPE_DOUBLE  default_value:\"-11.5\"     " ETC
-      " }"
-      "  field { type:TYPE_DOUBLE  default_value:\"12\"        " ETC
-      " }"
-      "  field { type:TYPE_DOUBLE  default_value:\"inf\"       " ETC
-      " }"
-      "  field { type:TYPE_DOUBLE  default_value:\"-inf\"      " ETC
-      " }"
-      "  field { type:TYPE_DOUBLE  default_value:\"nan\"       " ETC
-      " }"
-      "  field { type:TYPE_STRING  default_value:\"13\\001\"   " ETC
-      " }"
-      "  field { type:TYPE_STRING  default_value:\"abc\"       " ETC
-      " }"
-      "  field { type:TYPE_BYTES   default_value:\"14\\\\002\" " ETC
-      " }"
-      "  field { type:TYPE_BYTES   default_value:\"abc\"       " ETC
-      " }"
-      "  field { type:TYPE_BOOL    default_value:\"true\"      " ETC
-      " }"
-      "  field { type_name:\"Foo\" default_value:\"FOO\"       " ETC
-      " }"
-
-      "  field {"
-      "    type:TYPE_INT32   default_value:\"2147483647\"           " ETC
-      "  }"
-      "  field {"
-      "    type:TYPE_INT32   default_value:\"-2147483648\"          " ETC
-      "  }"
-      "  field {"
-      "    type:TYPE_UINT32  default_value:\"4294967295\"           " ETC
-      "  }"
-      "  field {"
-      "    type:TYPE_INT64   default_value:\"9223372036854775807\"  " ETC
-      "  }"
-      "  field {"
-      "    type:TYPE_INT64   default_value:\"-9223372036854775808\" " ETC
-      "  }"
-      "  field {"
-      "    type:TYPE_UINT64  default_value:\"18446744073709551615\" " ETC
-      "  }"
-      "  field {"
-      "    type:TYPE_DOUBLE  default_value:\"43981\"                " ETC
-      "  }"
-      "}");
-#undef ETC
-}
-
-TEST_F(ParseMessageTest, FieldJsonName) {
-  ExpectParsesTo(
-      "message TestMessage {\n"
-      "  optional string foo = 1 [json_name = \"@type\"];\n"
-      "}\n",
-      "message_type {"
-      "  name: \"TestMessage\""
-      "  field {\n"
-      "    name: \"foo\" label: LABEL_OPTIONAL type: TYPE_STRING number: 1"
-      "    json_name: \"@type\"\n"
-      "  }\n"
-      "}\n");
-}
-
-TEST_F(ParseMessageTest, FieldOptions) {
-  ExpectParsesTo(
-      "message TestMessage {\n"
-      "  optional string foo = 1\n"
-      "      [ctype=CORD, (foo)=7, foo.(.bar.baz).qux.quux.(corge)=-33, \n"
-      "       (quux)=\"x\040y\", (baz.qux)=hey];\n"
-      "}\n",
-
-      "message_type {"
-      "  name: \"TestMessage\""
-      "  field { name: \"foo\" label: LABEL_OPTIONAL type: TYPE_STRING number: "
-      "1"
-      "          options { uninterpreted_option: { name { name_part: \"ctype\" "
-      "                                                   is_extension: false "
-      "} "
-      "                                            identifier_value: \"CORD\"  "
-      "}"
-      "                    uninterpreted_option: { name { name_part: \"foo\" "
-      "                                                   is_extension: true } "
-      "                                            positive_int_value: 7  }"
-      "                    uninterpreted_option: { name { name_part: \"foo\" "
-      "                                                   is_extension: false "
-      "} "
-      "                                            name { name_part: "
-      "\".bar.baz\""
-      "                                                   is_extension: true } "
-      "                                            name { name_part: \"qux\" "
-      "                                                   is_extension: false "
-      "} "
-      "                                            name { name_part: \"quux\" "
-      "                                                   is_extension: false "
-      "} "
-      "                                            name { name_part: \"corge\" "
-      "                                                   is_extension: true } "
-      "                                            negative_int_value: -33 }"
-      "                    uninterpreted_option: { name { name_part: \"quux\" "
-      "                                                   is_extension: true } "
-      "                                            string_value: \"x y\" }"
-      "                    uninterpreted_option: { name { name_part: "
-      "\"baz.qux\" "
-      "                                                   is_extension: true } "
-      "                                            identifier_value: \"hey\" }"
-      "          }"
-      "  }"
-      "}");
-}
-
-TEST_F(ParseMessageTest, Oneof) {
-  ExpectParsesTo(
-      "message TestMessage {\n"
-      "  oneof foo {\n"
-      "    int32 a = 1;\n"
-      "    string b = 2;\n"
-      "    TestMessage c = 3;\n"
-      "    group D = 4 { optional int32 i = 5; }\n"
-      "  }\n"
-      "}\n",
-
-      "message_type {"
-      "  name: \"TestMessage\""
-      "  field { name:\"a\" label:LABEL_OPTIONAL type:TYPE_INT32 number:1 "
-      "          oneof_index:0 }"
-      "  field { name:\"b\" label:LABEL_OPTIONAL type:TYPE_STRING number:2 "
-      "          oneof_index:0 }"
-      "  field { name:\"c\" label:LABEL_OPTIONAL type_name:\"TestMessage\" "
-      "          number:3 oneof_index:0 }"
-      "  field { name:\"d\" label:LABEL_OPTIONAL type:TYPE_GROUP "
-      "          type_name:\"D\" number:4 oneof_index:0 }"
-      "  oneof_decl {"
-      "    name: \"foo\""
-      "  }"
-      "  nested_type {"
-      "    name: \"D\""
-      "    field { name:\"i\" label:LABEL_OPTIONAL type:TYPE_INT32 number:5 }"
-      "  }"
-      "}");
-}
-
-TEST_F(ParseMessageTest, MultipleOneofs) {
-  ExpectParsesTo(
-      "message TestMessage {\n"
-      "  oneof foo {\n"
-      "    int32 a = 1;\n"
-      "    string b = 2;\n"
-      "  }\n"
-      "  oneof bar {\n"
-      "    int32 c = 3;\n"
-      "    string d = 4;\n"
-      "  }\n"
-      "}\n",
-
-      "message_type {"
-      "  name: \"TestMessage\""
-      "  field { name:\"a\" label:LABEL_OPTIONAL type:TYPE_INT32 number:1 "
-      "          oneof_index:0 }"
-      "  field { name:\"b\" label:LABEL_OPTIONAL type:TYPE_STRING number:2 "
-      "          oneof_index:0 }"
-      "  field { name:\"c\" label:LABEL_OPTIONAL type:TYPE_INT32 number:3 "
-      "          oneof_index:1 }"
-      "  field { name:\"d\" label:LABEL_OPTIONAL type:TYPE_STRING number:4 "
-      "          oneof_index:1 }"
-      "  oneof_decl {"
-      "    name: \"foo\""
-      "  }"
-      "  oneof_decl {"
-      "    name: \"bar\""
-      "  }"
-      "}");
-}
-
-TEST_F(ParseMessageTest, Maps) {
-  ExpectParsesTo(
-      "message TestMessage {\n"
-      "  map<int32, string> primitive_type_map = 1;\n"
-      "  map<KeyType, ValueType> composite_type_map = 2;\n"
-      "}\n",
-
-      "message_type {"
-      "  name: \"TestMessage\""
-      "  nested_type {"
-      "    name: \"PrimitiveTypeMapEntry\""
-      "    field { "
-      "       name: \"key\" number: 1 label:LABEL_OPTIONAL"
-      "       type:TYPE_INT32"
-      "    }"
-      "    field { "
-      "       name: \"value\" number: 2 label:LABEL_OPTIONAL"
-      "       type:TYPE_STRING"
-      "    }"
-      "    options { map_entry: true }"
-      "  }"
-      "  nested_type {"
-      "    name: \"CompositeTypeMapEntry\""
-      "    field { "
-      "       name: \"key\" number: 1 label:LABEL_OPTIONAL"
-      "       type_name: \"KeyType\""
-      "    }"
-      "    field { "
-      "       name: \"value\" number: 2 label:LABEL_OPTIONAL"
-      "       type_name: \"ValueType\""
-      "    }"
-      "    options { map_entry: true }"
-      "  }"
-      "  field {"
-      "    name: \"primitive_type_map\""
-      "    label: LABEL_REPEATED"
-      "    type_name: \"PrimitiveTypeMapEntry\""
-      "    number: 1"
-      "  }"
-      "  field {"
-      "    name: \"composite_type_map\""
-      "    label: LABEL_REPEATED"
-      "    type_name: \"CompositeTypeMapEntry\""
-      "    number: 2"
-      "  }"
-      "}");
-}
-
-TEST_F(ParseMessageTest, Group) {
-  ExpectParsesTo(
-      "message TestMessage {\n"
-      "  optional group TestGroup = 1 {};\n"
-      "}\n",
-
-      "message_type {"
-      "  name: \"TestMessage\""
-      "  nested_type { name: \"TestGroup\" }"
-      "  field { name:\"testgroup\" label:LABEL_OPTIONAL number:1"
-      "          type:TYPE_GROUP type_name: \"TestGroup\" }"
-      "}");
-}
-
-TEST_F(ParseMessageTest, NestedMessage) {
-  ExpectParsesTo(
-      "message TestMessage {\n"
-      "  message Nested {}\n"
-      "  optional Nested test_nested = 1;\n"
-      "}\n",
-
-      "message_type {"
-      "  name: \"TestMessage\""
-      "  nested_type { name: \"Nested\" }"
-      "  field { name:\"test_nested\" label:LABEL_OPTIONAL number:1"
-      "          type_name: \"Nested\" }"
-      "}");
-}
-
-TEST_F(ParseMessageTest, NestedEnum) {
-  ExpectParsesTo(
-      "message TestMessage {\n"
-      "  enum NestedEnum {}\n"
-      "  optional NestedEnum test_enum = 1;\n"
-      "}\n",
-
-      "message_type {"
-      "  name: \"TestMessage\""
-      "  enum_type { name: \"NestedEnum\" }"
-      "  field { name:\"test_enum\" label:LABEL_OPTIONAL number:1"
-      "          type_name: \"NestedEnum\" }"
-      "}");
-}
-
-TEST_F(ParseMessageTest, ReservedRange) {
-  ExpectParsesTo(
-      "message TestMessage {\n"
-      "  required int32 foo = 1;\n"
-      "  reserved 2, 15, 9 to 11, 3, 20 to max;\n"
-      "}\n",
-
-      "message_type {"
-      "  name: \"TestMessage\""
-      "  field { name:\"foo\" label:LABEL_REQUIRED type:TYPE_INT32 number:1 }"
-      "  reserved_range { start:2   end:3         }"
-      "  reserved_range { start:15  end:16        }"
-      "  reserved_range { start:9   end:12        }"
-      "  reserved_range { start:3   end:4         }"
-      "  reserved_range { start:20  end:536870912 }"
-      "}");
-}
-
-TEST_F(ParseMessageTest, ReservedRangeOnMessageSet) {
-  ExpectParsesTo(
-      "message TestMessage {\n"
-      "  option message_set_wire_format = true;\n"
-      "  reserved 20 to max;\n"
-      "}\n",
-
-      "message_type {"
-      "  name: \"TestMessage\""
-      "  options {"
-      "    uninterpreted_option {"
-      "      name {"
-      "        name_part: \"message_set_wire_format\""
-      "        is_extension: false"
-      "      }"
-      "      identifier_value: \"true\""
-      "    }"
-      "  }"
-      "  reserved_range { start:20  end:2147483647 }"
-      "}");
-}
-
-TEST_F(ParseMessageTest, ReservedNames) {
-  ExpectParsesTo(
-      "message TestMessage {\n"
-      "  reserved \"foo\", \"bar\";\n"
-      "}\n",
-
-      "message_type {"
-      "  name: \"TestMessage\""
-      "  reserved_name: \"foo\""
-      "  reserved_name: \"bar\""
-      "}");
-}
-
-TEST_F(ParseMessageTest, ExtensionRange) {
-  ExpectParsesTo(
-      "message TestMessage {\n"
-      "  extensions 10 to 19;\n"
-      "  extensions 30 to max;\n"
-      "}\n",
-
-      "message_type {"
-      "  name: \"TestMessage\""
-      "  extension_range { start:10 end:20        }"
-      "  extension_range { start:30 end:536870912 }"
-      "}");
-}
-
-TEST_F(ParseMessageTest, ExtensionRangeWithOptions) {
-  ExpectParsesTo(
-      "message TestMessage {\n"
-      "  extensions 10 to 19 [(i) = 5];\n"
-      "}\n",
-
-      "message_type {"
-      "  name: \"TestMessage\""
-      "  extension_range {"
-      "    start:10"
-      "    end:20"
-      "    options {"
-      "      uninterpreted_option {"
-      "        name {"
-      "          name_part: \"i\""
-      "          is_extension: true"
-      "        }"
-      "        positive_int_value: 5"
-      "      }"
-      "    }"
-      "  }"
-      "}");
-}
-
-TEST_F(ParseMessageTest, CompoundExtensionRange) {
-  ExpectParsesTo(
-      "message TestMessage {\n"
-      "  extensions 2, 15, 9 to 11, 100 to max, 3;\n"
-      "}\n",
-
-      "message_type {"
-      "  name: \"TestMessage\""
-      "  extension_range { start:2   end:3         }"
-      "  extension_range { start:15  end:16        }"
-      "  extension_range { start:9   end:12        }"
-      "  extension_range { start:100 end:536870912 }"
-      "  extension_range { start:3   end:4         }"
-      "}");
-}
-
-TEST_F(ParseMessageTest, CompoundExtensionRangeWithOptions) {
-  ExpectParsesTo(
-      "message TestMessage {\n"
-      "  extensions 2, 15, 9 to 11, 100 to max, 3 [(i) = 5];\n"
-      "}\n",
-
-      "message_type {"
-      "  name: \"TestMessage\""
-      "  extension_range {"
-      "    start:2"
-      "    end:3"
-      "    options {"
-      "      uninterpreted_option {"
-      "        name {"
-      "          name_part: \"i\""
-      "          is_extension: true"
-      "        }"
-      "        positive_int_value: 5"
-      "      }"
-      "    }"
-      "  }"
-      "  extension_range {"
-      "    start:15"
-      "    end:16"
-      "    options {"
-      "      uninterpreted_option {"
-      "        name {"
-      "          name_part: \"i\""
-      "          is_extension: true"
-      "        }"
-      "        positive_int_value: 5"
-      "      }"
-      "    }"
-      "  }"
-      "  extension_range {"
-      "    start:9"
-      "    end:12"
-      "    options {"
-      "      uninterpreted_option {"
-      "        name {"
-      "          name_part: \"i\""
-      "          is_extension: true"
-      "        }"
-      "        positive_int_value: 5"
-      "      }"
-      "    }"
-      "  }"
-      "  extension_range {"
-      "    start:100"
-      "    end:536870912"
-      "    options {"
-      "      uninterpreted_option {"
-      "        name {"
-      "          name_part: \"i\""
-      "          is_extension: true"
-      "        }"
-      "        positive_int_value: 5"
-      "      }"
-      "    }"
-      "  }"
-      "  extension_range {"
-      "    start:3"
-      "    end:4"
-      "    options {"
-      "      uninterpreted_option {"
-      "        name {"
-      "          name_part: \"i\""
-      "          is_extension: true"
-      "        }"
-      "        positive_int_value: 5"
-      "      }"
-      "    }"
-      "  }"
-      "}");
-}
-
-TEST_F(ParseMessageTest, LargerMaxForMessageSetWireFormatMessages) {
-  // Messages using the message_set_wire_format option can accept larger
-  // extension numbers, as the numbers are not encoded as int32 field values
-  // rather than tags.
-  ExpectParsesTo(
-      "message TestMessage {\n"
-      "  extensions 4 to max;\n"
-      "  option message_set_wire_format = true;\n"
-      "}\n",
-
-      "message_type {"
-      "  name: \"TestMessage\""
-      "    extension_range { start:4 end: 0x7fffffff }"
-      "  options {\n"
-      "    uninterpreted_option { \n"
-      "      name {\n"
-      "        name_part: \"message_set_wire_format\"\n"
-      "        is_extension: false\n"
-      "      }\n"
-      "      identifier_value: \"true\"\n"
-      "    }\n"
-      "  }\n"
-      "}");
-}
-
-TEST_F(ParseMessageTest, Extensions) {
-  ExpectParsesTo(
-      "extend Extendee1 { optional int32 foo = 12; }\n"
-      "extend Extendee2 { repeated TestMessage bar = 22; }\n",
-
-      "extension { name:\"foo\" label:LABEL_OPTIONAL type:TYPE_INT32 number:12"
-      "            extendee: \"Extendee1\" } "
-      "extension { name:\"bar\" label:LABEL_REPEATED number:22"
-      "            type_name:\"TestMessage\" extendee: \"Extendee2\" }");
-}
-
-TEST_F(ParseMessageTest, ExtensionsInMessageScope) {
-  ExpectParsesTo(
-      "message TestMessage {\n"
-      "  extend Extendee1 { optional int32 foo = 12; }\n"
-      "  extend Extendee2 { repeated TestMessage bar = 22; }\n"
-      "}\n",
-
-      "message_type {"
-      "  name: \"TestMessage\""
-      "  extension { name:\"foo\" label:LABEL_OPTIONAL type:TYPE_INT32 "
-      "number:12"
-      "              extendee: \"Extendee1\" }"
-      "  extension { name:\"bar\" label:LABEL_REPEATED number:22"
-      "              type_name:\"TestMessage\" extendee: \"Extendee2\" }"
-      "}");
-}
-
-TEST_F(ParseMessageTest, MultipleExtensionsOneExtendee) {
-  ExpectParsesTo(
-      "extend Extendee1 {\n"
-      "  optional int32 foo = 12;\n"
-      "  repeated TestMessage bar = 22;\n"
-      "}\n",
-
-      "extension { name:\"foo\" label:LABEL_OPTIONAL type:TYPE_INT32 number:12"
-      "            extendee: \"Extendee1\" } "
-      "extension { name:\"bar\" label:LABEL_REPEATED number:22"
-      "            type_name:\"TestMessage\" extendee: \"Extendee1\" }");
-}
-
-TEST_F(ParseMessageTest, OptionalLabelProto3) {
-  ExpectParsesTo(
-      "syntax = \"proto3\";\n"
-      "message TestMessage {\n"
-      "  int32 foo = 1;\n"
-      "}\n",
-
-      "syntax: \"proto3\" "
-      "message_type {"
-      "  name: \"TestMessage\""
-      "  field { name:\"foo\" label:LABEL_OPTIONAL type:TYPE_INT32 number:1 } "
-      "}");
-}
-
-TEST_F(ParseMessageTest, ExplicitOptionalLabelProto3) {
-  ExpectParsesTo(
-      "syntax = 'proto3';\n"
-      "message TestMessage {\n"
-      "  optional int32 foo = 1;\n"
-      "}\n",
-
-      "syntax: \"proto3\" "
-      "message_type {"
-      "  name: \"TestMessage\""
-      "  field { name:\"foo\" label:LABEL_OPTIONAL type:TYPE_INT32 number:1 "
-      "          proto3_optional: true oneof_index: 0 } "
-      "  oneof_decl { name:\"_foo\" } "
-      "}");
-
-  // Handle collisions in the synthetic oneof name.
-  ExpectParsesTo(
-      "syntax = 'proto3';\n"
-      "message TestMessage {\n"
-      "  optional int32 foo = 1;\n"
-      "  oneof _foo {\n"
-      "    int32 __foo = 2;\n"
-      "  }\n"
-      "}\n",
-
-      "syntax: \"proto3\" "
-      "message_type {"
-      "  name: \"TestMessage\""
-      "  field { name:\"foo\" label:LABEL_OPTIONAL type:TYPE_INT32 number:1 "
-      "          proto3_optional: true oneof_index: 1 } "
-      "  field { name:\"__foo\" label:LABEL_OPTIONAL type:TYPE_INT32 number:2 "
-      "          oneof_index: 0 } "
-      "  oneof_decl { name:\"_foo\" } "
-      "  oneof_decl { name:\"X_foo\" } "
-      "}");
-}
-
-// ===================================================================
-
-typedef ParserTest ParseEnumTest;
-
-TEST_F(ParseEnumTest, SimpleEnum) {
-  ExpectParsesTo(
-      "enum TestEnum {\n"
-      "  FOO = 0;\n"
-      "}\n",
-
-      "enum_type {"
-      "  name: \"TestEnum\""
-      "  value { name:\"FOO\" number:0 }"
-      "}");
-}
-
-TEST_F(ParseEnumTest, Values) {
-  ExpectParsesTo(
-      "enum TestEnum {\n"
-      "  FOO = 13;\n"
-      "  BAR = -10;\n"
-      "  BAZ = 500;\n"
-      "  HEX_MAX = 0x7FFFFFFF;\n"
-      "  HEX_MIN = -0x80000000;\n"
-      "  INT_MAX = 2147483647;\n"
-      "  INT_MIN = -2147483648;\n"
-      "}\n",
-
-      "enum_type {"
-      "  name: \"TestEnum\""
-      "  value { name:\"FOO\" number:13 }"
-      "  value { name:\"BAR\" number:-10 }"
-      "  value { name:\"BAZ\" number:500 }"
-      "  value { name:\"HEX_MAX\" number:2147483647 }"
-      "  value { name:\"HEX_MIN\" number:-2147483648 }"
-      "  value { name:\"INT_MAX\" number:2147483647 }"
-      "  value { name:\"INT_MIN\" number:-2147483648 }"
-      "}");
-}
-
-TEST_F(ParseEnumTest, ValueOptions) {
-  ExpectParsesTo(
-      "enum TestEnum {\n"
-      "  FOO = 13;\n"
-      "  BAR = -10 [ (something.text) = 'abc' ];\n"
-      "  BAZ = 500 [ (something.text) = 'def', other = 1 ];\n"
-      "}\n",
-
-      "enum_type {"
-      "  name: \"TestEnum\""
-      "  value { name: \"FOO\" number: 13 }"
-      "  value { name: \"BAR\" number: -10 "
-      "    options { "
-      "      uninterpreted_option { "
-      "        name { name_part: \"something.text\" is_extension: true } "
-      "        string_value: \"abc\" "
-      "      } "
-      "    } "
-      "  } "
-      "  value { name: \"BAZ\" number: 500 "
-      "    options { "
-      "      uninterpreted_option { "
-      "        name { name_part: \"something.text\" is_extension: true } "
-      "        string_value: \"def\" "
-      "      } "
-      "      uninterpreted_option { "
-      "        name { name_part: \"other\" is_extension: false } "
-      "        positive_int_value: 1 "
-      "      } "
-      "    } "
-      "  } "
-      "}");
-}
-
-TEST_F(ParseEnumTest, ReservedRange) {
-  ExpectParsesTo(
-      "enum TestEnum {\n"
-      "  FOO = 0;\n"
-      "  reserved -2147483648, -6 to -4, -1 to 1, 2, 15, 9 to 11, 3, 20 to "
-      "max;\n"
-      "}\n",
-
-      "enum_type {"
-      "  name: \"TestEnum\""
-      "  value { name:\"FOO\" number:0 }"
-      "  reserved_range { start:-2147483648  end:-2147483648 }"
-      "  reserved_range { start:-6           end:-4          }"
-      "  reserved_range { start:-1           end:1           }"
-      "  reserved_range { start:2            end:2           }"
-      "  reserved_range { start:15           end:15          }"
-      "  reserved_range { start:9            end:11          }"
-      "  reserved_range { start:3            end:3           }"
-      "  reserved_range { start:20           end:2147483647  }"
-      "}");
-}
-
-TEST_F(ParseEnumTest, ReservedNames) {
-  ExpectParsesTo(
-      "enum TestEnum {\n"
-      "  FOO = 0;\n"
-      "  reserved \"foo\", \"bar\";\n"
-      "}\n",
-
-      "enum_type {"
-      "  name: \"TestEnum\""
-      "  value { name:\"FOO\" number:0 }"
-      "  reserved_name: \"foo\""
-      "  reserved_name: \"bar\""
-      "}");
-}
-
-// ===================================================================
-
-typedef ParserTest ParseServiceTest;
-
-TEST_F(ParseServiceTest, SimpleService) {
-  ExpectParsesTo(
-      "service TestService {\n"
-      "  rpc Foo(In) returns (Out);\n"
-      "}\n",
-
-      "service {"
-      "  name: \"TestService\""
-      "  method { name:\"Foo\" input_type:\"In\" output_type:\"Out\" }"
-      "}");
-}
-
-TEST_F(ParseServiceTest, MethodsAndStreams) {
-  ExpectParsesTo(
-      "service TestService {\n"
-      "  rpc Foo(In1) returns (Out1);\n"
-      "  rpc Bar(In2) returns (Out2);\n"
-      "  rpc Baz(In3) returns (Out3);\n"
-      "}\n",
-
-      "service {"
-      "  name: \"TestService\""
-      "  method { name:\"Foo\" input_type:\"In1\" output_type:\"Out1\" }"
-      "  method { name:\"Bar\" input_type:\"In2\" output_type:\"Out2\" }"
-      "  method { name:\"Baz\" input_type:\"In3\" output_type:\"Out3\" }"
-      "}");
-}
-
-
-// ===================================================================
-// imports and packages
-
-typedef ParserTest ParseMiscTest;
-
-TEST_F(ParseMiscTest, ParseImport) {
-  ExpectParsesTo("import \"foo/bar/baz.proto\";\n",
-                 "dependency: \"foo/bar/baz.proto\"");
-}
-
-TEST_F(ParseMiscTest, ParseMultipleImports) {
-  ExpectParsesTo(
-      "import \"foo.proto\";\n"
-      "import \"bar.proto\";\n"
-      "import \"baz.proto\";\n",
-      "dependency: \"foo.proto\""
-      "dependency: \"bar.proto\""
-      "dependency: \"baz.proto\"");
-}
-
-TEST_F(ParseMiscTest, ParsePublicImports) {
-  ExpectParsesTo(
-      "import \"foo.proto\";\n"
-      "import public \"bar.proto\";\n"
-      "import \"baz.proto\";\n"
-      "import public \"qux.proto\";\n",
-      "dependency: \"foo.proto\""
-      "dependency: \"bar.proto\""
-      "dependency: \"baz.proto\""
-      "dependency: \"qux.proto\""
-      "public_dependency: 1 "
-      "public_dependency: 3 ");
-}
-
-TEST_F(ParseMiscTest, ParsePackage) {
-  ExpectParsesTo("package foo.bar.baz;\n", "package: \"foo.bar.baz\"");
-}
-
-TEST_F(ParseMiscTest, ParsePackageWithSpaces) {
-  ExpectParsesTo(
-      "package foo   .   bar.  \n"
-      "  baz;\n",
-      "package: \"foo.bar.baz\"");
-}
-
-// ===================================================================
-// options
-
-TEST_F(ParseMiscTest, ParseFileOptions) {
-  ExpectParsesTo(
-      "option java_package = \"com.google.foo\";\n"
-      "option optimize_for = CODE_SIZE;",
-
-      "options {"
-      "uninterpreted_option { name { name_part: \"java_package\" "
-      "                              is_extension: false }"
-      "                       string_value: \"com.google.foo\"} "
-      "uninterpreted_option { name { name_part: \"optimize_for\" "
-      "                              is_extension: false }"
-      "                       identifier_value: \"CODE_SIZE\" } "
-      "}");
-}
-
-// ===================================================================
-// Error tests
-//
-// There are a very large number of possible errors that the parser could
-// report, so it's infeasible to test every single one of them.  Instead,
-// we test each unique call to AddError() in parser.h.  This does not mean
-// we are testing every possible error that Parser can generate because
-// each variant of the Consume() helper only counts as one unique call to
-// AddError().
-
-typedef ParserTest ParseErrorTest;
-
-TEST_F(ParseErrorTest, MissingSyntaxIdentifier) {
-  require_syntax_identifier_ = true;
-  ExpectHasEarlyExitErrors("message TestMessage {}",
-                           "0:0: File must begin with a syntax statement, e.g. "
-                           "'syntax = \"proto2\";'.\n");
-  EXPECT_EQ("", parser_->GetSyntaxIdentifier());
-}
-
-TEST_F(ParseErrorTest, UnknownSyntaxIdentifier) {
-  ExpectHasEarlyExitErrors(
-      "syntax = \"no_such_syntax\";",
-      "0:9: Unrecognized syntax identifier \"no_such_syntax\".  This parser "
-      "only recognizes \"proto2\" and \"proto3\".\n");
-  EXPECT_EQ("no_such_syntax", parser_->GetSyntaxIdentifier());
-}
-
-TEST_F(ParseErrorTest, SimpleSyntaxError) {
-  ExpectHasErrors("message TestMessage @#$ { blah }",
-                  "0:20: Expected \"{\".\n");
-  EXPECT_EQ("proto2", parser_->GetSyntaxIdentifier());
-}
-
-TEST_F(ParseErrorTest, ExpectedTopLevel) {
-  ExpectHasErrors("blah;",
-                  "0:0: Expected top-level statement (e.g. \"message\").\n");
-}
-
-TEST_F(ParseErrorTest, UnmatchedCloseBrace) {
-  // This used to cause an infinite loop.  Doh.
-  ExpectHasErrors("}",
-                  "0:0: Expected top-level statement (e.g. \"message\").\n"
-                  "0:0: Unmatched \"}\".\n");
-}
-
-// -------------------------------------------------------------------
-// Message errors
-
-TEST_F(ParseErrorTest, MessageMissingName) {
-  ExpectHasErrors("message {}", "0:8: Expected message name.\n");
-}
-
-TEST_F(ParseErrorTest, MessageMissingBody) {
-  ExpectHasErrors("message TestMessage;", "0:19: Expected \"{\".\n");
-}
-
-TEST_F(ParseErrorTest, EofInMessage) {
-  ExpectHasErrors(
-      "message TestMessage {",
-      "0:21: Reached end of input in message definition (missing '}').\n");
-}
-
-TEST_F(ParseErrorTest, MissingFieldNumber) {
-  ExpectHasErrors(
-      "message TestMessage {\n"
-      "  optional int32 foo;\n"
-      "}\n",
-      "1:20: Missing field number.\n");
-}
-
-TEST_F(ParseErrorTest, ExpectedFieldNumber) {
-  ExpectHasErrors(
-      "message TestMessage {\n"
-      "  optional int32 foo = ;\n"
-      "}\n",
-      "1:23: Expected field number.\n");
-}
-
-TEST_F(ParseErrorTest, FieldNumberOutOfRange) {
-  ExpectHasErrors(
-      "message TestMessage {\n"
-      "  optional int32 foo = 0x100000000;\n"
-      "}\n",
-      "1:23: Integer out of range.\n");
-}
-
-TEST_F(ParseErrorTest, MissingLabel) {
-  ExpectHasErrors(
-      "message TestMessage {\n"
-      "  int32 foo = 1;\n"
-      "}\n",
-      "1:2: Expected \"required\", \"optional\", or \"repeated\".\n");
-}
-
-TEST_F(ParseErrorTest, ExpectedOptionName) {
-  ExpectHasErrors(
-      "message TestMessage {\n"
-      "  optional uint32 foo = 1 [];\n"
-      "}\n",
-      "1:27: Expected identifier.\n");
-}
-
-TEST_F(ParseErrorTest, NonExtensionOptionNameBeginningWithDot) {
-  ExpectHasErrors(
-      "message TestMessage {\n"
-      "  optional uint32 foo = 1 [.foo=1];\n"
-      "}\n",
-      "1:27: Expected identifier.\n");
-}
-
-TEST_F(ParseErrorTest, DefaultValueTypeMismatch) {
-  ExpectHasErrors(
-      "message TestMessage {\n"
-      "  optional uint32 foo = 1 [default=true];\n"
-      "}\n",
-      "1:35: Expected integer for field default value.\n");
-}
-
-TEST_F(ParseErrorTest, DefaultValueNotBoolean) {
-  ExpectHasErrors(
-      "message TestMessage {\n"
-      "  optional bool foo = 1 [default=blah];\n"
-      "}\n",
-      "1:33: Expected \"true\" or \"false\".\n");
-}
-
-TEST_F(ParseErrorTest, DefaultValueNotString) {
-  ExpectHasErrors(
-      "message TestMessage {\n"
-      "  optional string foo = 1 [default=1];\n"
-      "}\n",
-      "1:35: Expected string for field default value.\n");
-}
-
-TEST_F(ParseErrorTest, DefaultValueUnsignedNegative) {
-  ExpectHasErrors(
-      "message TestMessage {\n"
-      "  optional uint32 foo = 1 [default=-1];\n"
-      "}\n",
-      "1:36: Unsigned field can't have negative default value.\n");
-}
-
-TEST_F(ParseErrorTest, DefaultValueTooLarge) {
-  ExpectHasErrors(
-      "message TestMessage {\n"
-      "  optional int32  foo = 1 [default= 0x80000000];\n"
-      "  optional int32  foo = 1 [default=-0x80000001];\n"
-      "  optional uint32 foo = 1 [default= 0x100000000];\n"
-      "  optional int64  foo = 1 [default= 0x80000000000000000];\n"
-      "  optional int64  foo = 1 [default=-0x80000000000000001];\n"
-      "  optional uint64 foo = 1 [default= 0x100000000000000000];\n"
-      "}\n",
-      "1:36: Integer out of range.\n"
-      "2:36: Integer out of range.\n"
-      "3:36: Integer out of range.\n"
-      "4:36: Integer out of range.\n"
-      "5:36: Integer out of range.\n"
-      "6:36: Integer out of range.\n");
-}
-
-TEST_F(ParseErrorTest, JsonNameNotString) {
-  ExpectHasErrors(
-      "message TestMessage {\n"
-      "  optional string foo = 1 [json_name=1];\n"
-      "}\n",
-      "1:37: Expected string for JSON name.\n");
-}
-
-TEST_F(ParseErrorTest, DuplicateJsonName) {
-  ExpectHasErrors(
-      "message TestMessage {\n"
-      "  optional uint32 foo = 1 [json_name=\"a\",json_name=\"b\"];\n"
-      "}\n",
-      "1:41: Already set option \"json_name\".\n");
-}
-
-TEST_F(ParseErrorTest, EnumValueOutOfRange) {
-  ExpectHasErrors(
-      "enum TestEnum {\n"
-      "  HEX_TOO_BIG   =  0x80000000;\n"
-      "  HEX_TOO_SMALL = -0x80000001;\n"
-      "  INT_TOO_BIG   =  2147483648;\n"
-      "  INT_TOO_SMALL = -2147483649;\n"
-      "}\n",
-      "1:19: Integer out of range.\n"
-      "2:19: Integer out of range.\n"
-      "3:19: Integer out of range.\n"
-      "4:19: Integer out of range.\n");
-}
-
-TEST_F(ParseErrorTest, EnumAllowAliasFalse) {
-  ExpectHasErrors(
-      "enum Foo {\n"
-      "  option allow_alias = false;\n"
-      "  BAR = 1;\n"
-      "  BAZ = 2;\n"
-      "}\n",
-      "5:0: \"Foo\" declares 'option allow_alias = false;' which has no "
-      "effect. "
-      "Please remove the declaration.\n");
-}
-
-TEST_F(ParseErrorTest, UnnecessaryEnumAllowAlias) {
-  ExpectHasErrors(
-      "enum Foo {\n"
-      "  option allow_alias = true;\n"
-      "  BAR = 1;\n"
-      "  BAZ = 2;\n"
-      "}\n",
-      "5:0: \"Foo\" declares support for enum aliases but no enum values share "
-      "field numbers. Please remove the unnecessary 'option allow_alias = "
-      "true;' "
-      "declaration.\n");
-}
-
-TEST_F(ParseErrorTest, DefaultValueMissing) {
-  ExpectHasErrors(
-      "message TestMessage {\n"
-      "  optional uint32 foo = 1 [default=];\n"
-      "}\n",
-      "1:35: Expected integer for field default value.\n");
-}
-
-TEST_F(ParseErrorTest, DefaultValueForGroup) {
-  ExpectHasErrors(
-      "message TestMessage {\n"
-      "  optional group Foo = 1 [default=blah] {}\n"
-      "}\n",
-      "1:34: Messages can't have default values.\n");
-}
-
-TEST_F(ParseErrorTest, DuplicateDefaultValue) {
-  ExpectHasErrors(
-      "message TestMessage {\n"
-      "  optional uint32 foo = 1 [default=1,default=2];\n"
-      "}\n",
-      "1:37: Already set option \"default\".\n");
-}
-
-TEST_F(ParseErrorTest, MissingOneofName) {
-  ExpectHasErrors(
-      "message TestMessage {\n"
-      "  oneof {\n"
-      "    int32 bar = 1;\n"
-      "  }\n"
-      "}\n",
-      "1:8: Expected oneof name.\n");
-}
-
-TEST_F(ParseErrorTest, LabelInOneof) {
-  ExpectHasErrors(
-      "message TestMessage {\n"
-      "  oneof foo {\n"
-      "    optional int32 bar = 1;\n"
-      "  }\n"
-      "}\n",
-      "2:4: Fields in oneofs must not have labels (required / optional "
-      "/ repeated).\n");
-}
-
-TEST_F(ParseErrorTest, MapInOneof) {
-  ExpectHasErrors(
-      "message TestMessage {\n"
-      "  oneof foo {\n"
-      "    map<int32, int32> foo_map = 1;\n"
-      "    map message_field = 2;\n"  // a normal message field is OK
-      "  }\n"
-      "}\n",
-      "2:7: Map fields are not allowed in oneofs.\n");
-}
-
-TEST_F(ParseErrorTest, LabelForMap) {
-  ExpectHasErrors(
-      "message TestMessage {\n"
-      "  optional map<int32, int32> int_map = 1;\n"
-      "  required map<int32, int32> int_map2 = 2;\n"
-      "  repeated map<int32, int32> int_map3 = 3;\n"
-      "  optional map map_message = 4;\n"  // a normal message field is OK
-      "}\n",
-      "1:14: Field labels (required/optional/repeated) are not allowed on map "
-      "fields.\n"
-      "2:14: Field labels (required/optional/repeated) are not allowed on map "
-      "fields.\n"
-      "3:14: Field labels (required/optional/repeated) are not allowed on map "
-      "fields.\n");
-}
-
-TEST_F(ParseErrorTest, MalformedMaps) {
-  ExpectHasErrors(
-      "message TestMessage {\n"
-      "  map map_message = 1;\n"  // a normal message field lacking label
-      "  map<string> str_map = 2;\n"
-      "  map<string,> str_map2 = 3;\n"
-      "  map<,string> str_map3 = 4;\n"
-      "  map<> empty_map = 5;\n"
-      "  map<string,string str_map6 = 6;\n"
-      "}"
-      "extend SomeMessage {\n"
-      "  map<int32, int32> int_map = 1;\n"
-      "}",
-      "1:6: Expected \"required\", \"optional\", or \"repeated\".\n"
-      "2:12: Expected \",\".\n"
-      "3:13: Expected type name.\n"
-      "4:6: Expected type name.\n"
-      "5:6: Expected type name.\n"
-      "6:20: Expected \">\".\n"
-      "8:5: Map fields are not allowed to be extensions.\n");
-}
-
-TEST_F(ParseErrorTest, GroupNotCapitalized) {
-  ExpectHasErrors(
-      "message TestMessage {\n"
-      "  optional group foo = 1 {}\n"
-      "}\n",
-      "1:17: Group names must start with a capital letter.\n");
-}
-
-TEST_F(ParseErrorTest, GroupMissingBody) {
-  ExpectHasErrors(
-      "message TestMessage {\n"
-      "  optional group Foo = 1;\n"
-      "}\n",
-      "1:24: Missing group body.\n");
-}
-
-TEST_F(ParseErrorTest, ExtendingPrimitive) {
-  ExpectHasErrors("extend int32 { optional string foo = 4; }\n",
-                  "0:7: Expected message type.\n");
-}
-
-TEST_F(ParseErrorTest, ErrorInExtension) {
-  ExpectHasErrors(
-      "message Foo { extensions 100 to 199; }\n"
-      "extend Foo { optional string foo; }\n",
-      "1:32: Missing field number.\n");
-}
-
-TEST_F(ParseErrorTest, MultipleParseErrors) {
-  // When a statement has a parse error, the parser should be able to continue
-  // parsing at the next statement.
-  ExpectHasErrors(
-      "message TestMessage {\n"
-      "  optional int32 foo;\n"
-      "  !invalid statement ending in a block { blah blah { blah } blah }\n"
-      "  optional int32 bar = 3 {}\n"
-      "}\n",
-      "1:20: Missing field number.\n"
-      "2:2: Expected \"required\", \"optional\", or \"repeated\".\n"
-      "2:2: Expected type name.\n"
-      "3:25: Expected \";\".\n");
-}
-
-TEST_F(ParseErrorTest, EofInAggregateValue) {
-  ExpectHasErrors(
-      "option (fileopt) = { i:100\n",
-      "1:0: Unexpected end of stream while parsing aggregate value.\n");
-}
-
-// -------------------------------------------------------------------
-// Enum errors
-
-TEST_F(ParseErrorTest, EofInEnum) {
-  ExpectHasErrors(
-      "enum TestEnum {",
-      "0:15: Reached end of input in enum definition (missing '}').\n");
-}
-
-TEST_F(ParseErrorTest, EnumValueMissingNumber) {
-  ExpectHasErrors(
-      "enum TestEnum {\n"
-      "  FOO;\n"
-      "}\n",
-      "1:5: Missing numeric value for enum constant.\n");
-}
-
-TEST_F(ParseErrorTest, EnumReservedStandaloneMaxNotAllowed) {
-  ExpectHasErrors(
-      "enum TestEnum {\n"
-      "  FOO = 1;\n"
-      "  reserved max;\n"
-      "}\n",
-      "2:11: Expected enum value or number range.\n");
-}
-
-TEST_F(ParseErrorTest, EnumReservedMixNameAndNumber) {
-  ExpectHasErrors(
-      "enum TestEnum {\n"
-      "  FOO = 1;\n"
-      "  reserved 10, \"foo\";\n"
-      "}\n",
-      "2:15: Expected enum number range.\n");
-}
-
-TEST_F(ParseErrorTest, EnumReservedPositiveNumberOutOfRange) {
-  ExpectHasErrors(
-      "enum TestEnum {\n"
-      "FOO = 1;\n"
-      "  reserved 2147483648;\n"
-      "}\n",
-      "2:11: Integer out of range.\n");
-}
-
-TEST_F(ParseErrorTest, EnumReservedNegativeNumberOutOfRange) {
-  ExpectHasErrors(
-      "enum TestEnum {\n"
-      "FOO = 1;\n"
-      "  reserved -2147483649;\n"
-      "}\n",
-      "2:12: Integer out of range.\n");
-}
-
-TEST_F(ParseErrorTest, EnumReservedMissingQuotes) {
-  ExpectHasErrors(
-      "enum TestEnum {\n"
-      "  FOO = 1;\n"
-      "  reserved foo;\n"
-      "}\n",
-      "2:11: Expected enum value or number range.\n");
-}
-
-// -------------------------------------------------------------------
-// Reserved field number errors
-
-TEST_F(ParseErrorTest, ReservedStandaloneMaxNotAllowed) {
-  ExpectHasErrors(
-      "message Foo {\n"
-      "  reserved max;\n"
-      "}\n",
-      "1:11: Expected field name or number range.\n");
-}
-
-TEST_F(ParseErrorTest, ReservedMixNameAndNumber) {
-  ExpectHasErrors(
-      "message Foo {\n"
-      "  reserved 10, \"foo\";\n"
-      "}\n",
-      "1:15: Expected field number range.\n");
-}
-
-TEST_F(ParseErrorTest, ReservedMissingQuotes) {
-  ExpectHasErrors(
-      "message Foo {\n"
-      "  reserved foo;\n"
-      "}\n",
-      "1:11: Expected field name or number range.\n");
-}
-
-TEST_F(ParseErrorTest, ReservedNegativeNumber) {
-  ExpectHasErrors(
-      "message Foo {\n"
-      "  reserved -10;\n"
-      "}\n",
-      "1:11: Expected field name or number range.\n");
-}
-
-TEST_F(ParseErrorTest, ReservedNumberOutOfRange) {
-  ExpectHasErrors(
-      "message Foo {\n"
-      "  reserved 2147483648;\n"
-      "}\n",
-      "1:11: Integer out of range.\n");
-}
-
-// -------------------------------------------------------------------
-// Service errors
-
-TEST_F(ParseErrorTest, EofInService) {
-  ExpectHasErrors(
-      "service TestService {",
-      "0:21: Reached end of input in service definition (missing '}').\n");
-}
-
-TEST_F(ParseErrorTest, ServiceMethodPrimitiveParams) {
-  ExpectHasErrors(
-      "service TestService {\n"
-      "  rpc Foo(int32) returns (string);\n"
-      "}\n",
-      "1:10: Expected message type.\n"
-      "1:26: Expected message type.\n");
-}
-
-
-TEST_F(ParseErrorTest, EofInMethodOptions) {
-  ExpectHasErrors(
-      "service TestService {\n"
-      "  rpc Foo(Bar) returns(Bar) {",
-      "1:29: Reached end of input in method options (missing '}').\n"
-      "1:29: Reached end of input in service definition (missing '}').\n");
-}
-
-
-TEST_F(ParseErrorTest, PrimitiveMethodInput) {
-  ExpectHasErrors(
-      "service TestService {\n"
-      "  rpc Foo(int32) returns(Bar);\n"
-      "}\n",
-      "1:10: Expected message type.\n");
-}
-
-
-TEST_F(ParseErrorTest, MethodOptionTypeError) {
-  // This used to cause an infinite loop.
-  ExpectHasErrors(
-      "message Baz {}\n"
-      "service Foo {\n"
-      "  rpc Bar(Baz) returns(Baz) { option invalid syntax; }\n"
-      "}\n",
-      "2:45: Expected \"=\".\n");
-}
-
-
-// -------------------------------------------------------------------
-// Import and package errors
-
-TEST_F(ParseErrorTest, ImportNotQuoted) {
-  ExpectHasErrors("import foo;\n",
-                  "0:7: Expected a string naming the file to import.\n");
-}
-
-TEST_F(ParseErrorTest, MultiplePackagesInFile) {
-  ExpectHasErrors(
-      "package foo;\n"
-      "package bar;\n",
-      "1:0: Multiple package definitions.\n");
-}
-
-// ===================================================================
-// Test that errors detected by DescriptorPool correctly report line and
-// column numbers.  We have one test for every call to RecordLocation() in
-// parser.cc.
-
-typedef ParserTest ParserValidationErrorTest;
-
-TEST_F(ParserValidationErrorTest, PackageNameError) {
-  // Create another file which defines symbol "foo".
-  FileDescriptorProto other_file;
-  other_file.set_name("bar.proto");
-  other_file.add_message_type()->set_name("foo");
-  EXPECT_TRUE(pool_.BuildFile(other_file) != nullptr);
-
-  // Now try to define it as a package.
-  ExpectHasValidationErrors(
-      "package foo.bar;",
-      "0:0: \"foo\" is already defined (as something other than a package) "
-      "in file \"bar.proto\".\n");
-}
-
-TEST_F(ParserValidationErrorTest, ImportUnloadedError) {
-  ExpectHasValidationErrors(
-      "package test;\n"
-      "\n"
-      "import \"unloaded.proto\";",
-      "2:0: Import \"unloaded.proto\" has not been loaded.\n");
-}
-
-TEST_F(ParserValidationErrorTest, ImportTwice) {
-  FileDescriptorProto other_file;
-  other_file.set_name("bar.proto");
-  other_file.add_message_type()->set_name("foo");
-  EXPECT_TRUE(pool_.BuildFile(other_file) != nullptr);
-
-  ExpectHasValidationErrors(
-      "package test;\n"
-      "\n"
-      "import \"bar.proto\";\n"
-      "  import \"bar.proto\";",
-      "3:2: Import \"bar.proto\" was listed twice.\n");
-}
-
-TEST_F(ParserValidationErrorTest, DuplicateFileError) {
-  FileDescriptorProto other_file;
-  other_file.set_name("foo.proto");
-  EXPECT_TRUE(pool_.BuildFile(other_file) != nullptr);
-
-  ExpectHasValidationErrors(
-      "package test;", "0:0: A file with this name is already in the pool.\n");
-}
-
-TEST_F(ParserValidationErrorTest, MessageNameError) {
-  ExpectHasValidationErrors(
-      "message Foo {}\n"
-      "message Foo {}\n",
-      "1:8: \"Foo\" is already defined.\n");
-}
-
-TEST_F(ParserValidationErrorTest, FieldNameError) {
-  ExpectHasValidationErrors(
-      "message Foo {\n"
-      "  optional int32 bar = 1;\n"
-      "  optional int32 bar = 2;\n"
-      "}\n",
-      "2:17: \"bar\" is already defined in \"Foo\".\n");
-}
-
-TEST_F(ParserValidationErrorTest, FieldTypeError) {
-  ExpectHasValidationErrors(
-      "message Foo {\n"
-      "  optional Baz bar = 1;\n"
-      "}\n",
-      "1:11: \"Baz\" is not defined.\n");
-}
-
-TEST_F(ParserValidationErrorTest, FieldNumberError) {
-  ExpectHasValidationErrors(
-      "message Foo {\n"
-      "  optional int32 bar = 0;\n"
-      "}\n",
-      "1:23: Field numbers must be positive integers.\n"
-      "1:23: Suggested field numbers for Foo: 1\n");
-}
-
-TEST_F(ParserValidationErrorTest, FieldExtendeeError) {
-  ExpectHasValidationErrors("extend Baz { optional int32 bar = 1; }\n",
-                            "0:7: \"Baz\" is not defined.\n");
-}
-
-TEST_F(ParserValidationErrorTest, ExtensionJsonNameError) {
-  ExpectHasValidationErrors(
-      "message TestMessage {\n"
-      "  extensions 1 to 100;\n"
-      "}\n"
-      "extend TestMessage {\n"
-      "  optional int32 foo = 12 [json_name = \"bar\"];\n"
-      "}",
-      "4:27: option json_name is not allowed on extension fields.\n");
-}
-
-TEST_F(ParserValidationErrorTest, FieldDefaultValueError) {
-  ExpectHasValidationErrors(
-      "enum Baz { QUX = 1; }\n"
-      "message Foo {\n"
-      "  optional Baz bar = 1 [default=NO_SUCH_VALUE];\n"
-      "}\n",
-      "2:32: Enum type \"Baz\" has no value named \"NO_SUCH_VALUE\".\n");
-}
-
-TEST_F(ParserValidationErrorTest, FileOptionNameError) {
-  ExpectHasValidationErrors(
-      "option foo = 5;",
-      "0:7: Option \"foo\" unknown. Ensure that your proto definition file "
-      "imports the proto which defines the option.\n");
-}
-
-TEST_F(ParserValidationErrorTest, FileOptionValueError) {
-  ExpectHasValidationErrors(
-      "option java_outer_classname = 5;",
-      "0:30: Value must be quoted string for string option "
-      "\"google.protobuf.FileOptions.java_outer_classname\".\n");
-}
-
-TEST_F(ParserValidationErrorTest, FieldOptionNameError) {
-  ExpectHasValidationErrors(
-      "message Foo {\n"
-      "  optional bool bar = 1 [foo=1];\n"
-      "}\n",
-      "1:25: Option \"foo\" unknown. Ensure that your proto definition file "
-      "imports the proto which defines the option.\n");
-}
-
-TEST_F(ParserValidationErrorTest, FieldOptionValueError) {
-  ExpectHasValidationErrors(
-      "message Foo {\n"
-      "  optional int32 bar = 1 [ctype=1];\n"
-      "}\n",
-      "1:32: Value must be identifier for enum-valued option "
-      "\"google.protobuf.FieldOptions.ctype\".\n");
-}
-
-TEST_F(ParserValidationErrorTest, ExtensionRangeNumberError) {
-  ExpectHasValidationErrors(
-      "message Foo {\n"
-      "  extensions 0;\n"
-      "}\n",
-      "1:13: Extension numbers must be positive integers.\n"
-      "1:13: Suggested field numbers for Foo: 1\n");
-}
-
-TEST_F(ParserValidationErrorTest, Proto3ExtensionError) {
-  ExpectHasValidationErrors(
-      "syntax = 'proto3';\n"
-      "message Foo { \n"
-      "  extensions 100 to 199;\n"
-      "}\n"
-      "extend Foo { string foo = 101; }\n",
-      "4:7: Extensions in proto3 are only allowed for defining options.\n"
-      "2:13: Extension ranges are not allowed in proto3.\n");
-}
-
-TEST_F(ParserValidationErrorTest, Proto3MessageSet) {
-  ExpectHasValidationErrors(
-      "syntax = 'proto3';\n"
-      "message Foo { \n"
-      "  option message_set_wire_format = true;\n"
-      "}\n",
-      "1:8: MessageSet is not supported in proto3.\n");
-}
-
-TEST_F(ParserValidationErrorTest, Proto3Required) {
-  ExpectHasValidationErrors(
-      "syntax = 'proto3';\n"
-      "message Foo { \n"
-      "  required int32 field = 1;"
-      "}\n",
-      "2:11: Required fields are not allowed in proto3.\n");
-}
-
-TEST_F(ParserValidationErrorTest, Proto3Default) {
-  ExpectHasValidationErrors(
-      "syntax = 'proto3';\n"
-      "message Foo { \n"
-      "  int32 field = 1 [default = 12];"
-      "}\n",
-      "2:29: Explicit default values are not allowed in proto3.\n");
-}
-
-TEST_F(ParserValidationErrorTest, Proto3JsonConflictError) {
-  ExpectHasValidationErrors(
-      "syntax = 'proto3';\n"
-      "message TestMessage {\n"
-      "  uint32 foo = 1;\n"
-      "  uint32 Foo = 2;\n"
-      "}\n",
-      "3:9: The JSON camel-case name of field \"Foo\" conflicts with field "
-      "\"foo\". This is not allowed in proto3.\n");
-}
-
-TEST_F(ParserValidationErrorTest, EnumNameError) {
-  ExpectHasValidationErrors(
-      "enum Foo {A = 1;}\n"
-      "enum Foo {B = 1;}\n",
-      "1:5: \"Foo\" is already defined.\n");
-}
-
-TEST_F(ParserValidationErrorTest, Proto3EnumError) {
-  ExpectHasValidationErrors(
-      "syntax = 'proto3';\n"
-      "enum Foo {A = 1;}\n",
-      "1:14: The first enum value must be zero in proto3.\n");
-}
-
-TEST_F(ParserValidationErrorTest, EnumValueNameError) {
-  ExpectHasValidationErrors(
-      "enum Foo {\n"
-      "  BAR = 1;\n"
-      "  BAR = 1;\n"
-      "}\n",
-      "2:2: \"BAR\" is already defined.\n");
-}
-
-TEST_F(ParserValidationErrorTest, EnumValueAliasError) {
-  ExpectHasValidationErrors(
-      "enum Foo {\n"
-      "  BAR = 1;\n"
-      "  BAZ = 1;\n"
-      "}\n",
-      "2:8: \"BAZ\" uses the same enum value as \"BAR\". If this is "
-      "intended, set 'option allow_alias = true;' to the enum "
-      "definition.\n");
-}
-
-TEST_F(ParserValidationErrorTest, ExplicitlyMapEntryError) {
-  ExpectHasValidationErrors(
-      "message Foo {\n"
-      "  message ValueEntry {\n"
-      "    option map_entry = true;\n"
-      "    optional int32 key = 1;\n"
-      "    optional int32 value = 2;\n"
-      "    extensions 99 to 999;\n"
-      "  }\n"
-      "  repeated ValueEntry value = 1;\n"
-      "}",
-      "7:11: map_entry should not be set explicitly. Use "
-      "map<KeyType, ValueType> instead.\n");
-}
-
-TEST_F(ParserValidationErrorTest, ServiceNameError) {
-  ExpectHasValidationErrors(
-      "service Foo {}\n"
-      "service Foo {}\n",
-      "1:8: \"Foo\" is already defined.\n");
-}
-
-TEST_F(ParserValidationErrorTest, MethodNameError) {
-  ExpectHasValidationErrors(
-      "message Baz {}\n"
-      "service Foo {\n"
-      "  rpc Bar(Baz) returns(Baz);\n"
-      "  rpc Bar(Baz) returns(Baz);\n"
-      "}\n",
-      "3:6: \"Bar\" is already defined in \"Foo\".\n");
-}
-
-
-TEST_F(ParserValidationErrorTest, MethodInputTypeError) {
-  ExpectHasValidationErrors(
-      "message Baz {}\n"
-      "service Foo {\n"
-      "  rpc Bar(Qux) returns(Baz);\n"
-      "}\n",
-      "2:10: \"Qux\" is not defined.\n");
-}
-
-
-TEST_F(ParserValidationErrorTest, MethodOutputTypeError) {
-  ExpectHasValidationErrors(
-      "message Baz {}\n"
-      "service Foo {\n"
-      "  rpc Bar(Baz) returns(Qux);\n"
-      "}\n",
-      "2:23: \"Qux\" is not defined.\n");
-}
-
-
-TEST_F(ParserValidationErrorTest, ResolvedUndefinedError) {
-  // Create another file which defines symbol ".base.bar".
-  FileDescriptorProto other_file;
-  other_file.set_name("base.proto");
-  other_file.set_package("base");
-  other_file.add_message_type()->set_name("bar");
-  EXPECT_TRUE(pool_.BuildFile(other_file) != nullptr);
-
-  // Define "foo.base" and try "base.bar".
-  // "base.bar" is resolved to "foo.base.bar" which is not defined.
-  ExpectHasValidationErrors(
-      "package foo.base;\n"
-      "import \"base.proto\";\n"
-      "message qux {\n"
-      "  optional base.bar baz = 1;\n"
-      "  optional .base.bar quz = 2;\n"
-      "}\n",
-      "3:11: \"base.bar\" is resolved to \"foo.base.bar\","
-      " which is not defined. The innermost scope is searched first "
-      "in name resolution. Consider using a leading '.'(i.e., \".base.bar\")"
-      " to start from the outermost scope.\n");
-}
-
-TEST_F(ParserValidationErrorTest, ResovledUndefinedOptionError) {
-  // Build descriptor message in test pool
-  FileDescriptorProto descriptor_proto;
-  DescriptorProto::descriptor()->file()->CopyTo(&descriptor_proto);
-  ASSERT_TRUE(pool_.BuildFile(descriptor_proto) != nullptr);
-
-  // base2.proto:
-  //   package baz
-  //   import net/proto2/proto/descriptor.proto
-  //   message Bar { optional int32 foo = 1; }
-  //   extend FileOptions { optional Bar bar = 7672757; }
-  FileDescriptorProto other_file;
-  other_file.set_name("base2.proto");
-  other_file.set_package("baz");
-  other_file.add_dependency();
-  other_file.set_dependency(0, descriptor_proto.name());
-
-  DescriptorProto* message(other_file.add_message_type());
-  message->set_name("Bar");
-  FieldDescriptorProto* field(message->add_field());
-  field->set_name("foo");
-  field->set_number(1);
-  field->set_label(FieldDescriptorProto::LABEL_OPTIONAL);
-  field->set_type(FieldDescriptorProto::TYPE_INT32);
-
-  FieldDescriptorProto* extension(other_file.add_extension());
-  extension->set_name("bar");
-  extension->set_number(7672757);
-  extension->set_label(FieldDescriptorProto::LABEL_OPTIONAL);
-  extension->set_type(FieldDescriptorProto::TYPE_MESSAGE);
-  extension->set_type_name("Bar");
-  extension->set_extendee("google.protobuf.FileOptions");
-
-  EXPECT_TRUE(pool_.BuildFile(other_file) != nullptr);
-
-  // qux.proto:
-  //   package qux.baz
-  //   option (baz.bar).foo = 1;
-  //
-  // Although "baz.bar" is already defined, the lookup code will try
-  // "qux.baz.bar", since it's the match from the innermost scope,
-  // which will cause a symbol not defined error.
-  ExpectHasValidationErrors(
-      "package qux.baz;\n"
-      "import \"base2.proto\";\n"
-      "option (baz.bar).foo = 1;\n",
-      "2:7: Option \"(baz.bar)\" is resolved to \"(qux.baz.bar)\","
-      " which is not defined. The innermost scope is searched first "
-      "in name resolution. Consider using a leading '.'(i.e., \"(.baz.bar)\")"
-      " to start from the outermost scope.\n");
-}
-
-// ===================================================================
-// Test that the output from FileDescriptor::DebugString() (and all other
-// descriptor types) is parseable, and results in the same Descriptor
-// definitions again afoter parsing (note, however, that the order of messages
-// cannot be guaranteed to be the same)
-
-typedef ParserTest ParseDescriptorDebugTest;
-
-class CompareDescriptorNames {
- public:
-  bool operator()(const DescriptorProto* left,
-                  const DescriptorProto* right) const {
-    return left->name() < right->name();
-  }
-};
-
-// Sorts nested DescriptorProtos of a DescriptoProto, by name.
-void SortMessages(DescriptorProto* descriptor_proto) {
-  int size = descriptor_proto->nested_type_size();
-  // recursively sort; we can't guarantee the order of nested messages either
-  for (int i = 0; i < size; ++i) {
-    SortMessages(descriptor_proto->mutable_nested_type(i));
-  }
-  DescriptorProto** data =
-      descriptor_proto->mutable_nested_type()->mutable_data();
-  std::sort(data, data + size, CompareDescriptorNames());
-}
-
-// Sorts DescriptorProtos belonging to a FileDescriptorProto, by name.
-void SortMessages(FileDescriptorProto* file_descriptor_proto) {
-  int size = file_descriptor_proto->message_type_size();
-  // recursively sort; we can't guarantee the order of nested messages either
-  for (int i = 0; i < size; ++i) {
-    SortMessages(file_descriptor_proto->mutable_message_type(i));
-  }
-  DescriptorProto** data =
-      file_descriptor_proto->mutable_message_type()->mutable_data();
-  std::sort(data, data + size, CompareDescriptorNames());
-}
-
-// Strips the message and enum field type names for comparison purpose only.
-void StripFieldTypeName(DescriptorProto* proto) {
-  for (int i = 0; i < proto->field_size(); ++i) {
-    std::string type_name = proto->field(i).type_name();
-    std::string::size_type pos = type_name.find_last_of('.');
-    if (pos != std::string::npos) {
-      proto->mutable_field(i)->mutable_type_name()->assign(
-          type_name.begin() + pos + 1, type_name.end());
-    }
-  }
-  for (int i = 0; i < proto->nested_type_size(); ++i) {
-    StripFieldTypeName(proto->mutable_nested_type(i));
-  }
-}
-
-void StripFieldTypeName(FileDescriptorProto* file_proto) {
-  for (int i = 0; i < file_proto->message_type_size(); ++i) {
-    StripFieldTypeName(file_proto->mutable_message_type(i));
-  }
-}
-
-TEST_F(ParseDescriptorDebugTest, TestAllDescriptorTypes) {
-  const FileDescriptor* original_file =
-      protobuf_unittest::TestAllTypes::descriptor()->file();
-  FileDescriptorProto expected;
-  original_file->CopyTo(&expected);
-
-  // Get the DebugString of the unittest.proto FileDecriptor, which includes
-  // all other descriptor types
-  std::string debug_string = original_file->DebugString();
-
-  // Parse the debug string
-  SetupParser(debug_string.c_str());
-  FileDescriptorProto parsed;
-  parser_->Parse(input_.get(), &parsed);
-  EXPECT_EQ(io::Tokenizer::TYPE_END, input_->current().type);
-  ASSERT_EQ("", error_collector_.text_) << "Failed to parse:\n" << debug_string;
-
-  // We now have a FileDescriptorProto, but to compare with the expected we
-  // need to link to a FileDecriptor, then output back to a proto. We'll
-  // also need to give it the same name as the original.
-  parsed.set_name(
-      TestUtil::MaybeTranslatePath("net/proto2/internal/unittest.proto"));
-  // We need the imported dependency before we can build our parsed proto
-  const FileDescriptor* public_import =
-      protobuf_unittest_import::PublicImportMessage::descriptor()->file();
-  FileDescriptorProto public_import_proto;
-  public_import->CopyTo(&public_import_proto);
-  ASSERT_TRUE(pool_.BuildFile(public_import_proto) != nullptr);
-  const FileDescriptor* import =
-      protobuf_unittest_import::ImportMessage::descriptor()->file();
-  FileDescriptorProto import_proto;
-  import->CopyTo(&import_proto);
-  ASSERT_TRUE(pool_.BuildFile(import_proto) != nullptr);
-  const FileDescriptor* actual = pool_.BuildFile(parsed);
-  parsed.Clear();
-  ASSERT_TRUE(actual != nullptr) << "Failed to validate:\n" << debug_string;
-  actual->CopyTo(&parsed);
-  ASSERT_TRUE(actual != nullptr);
-
-  // The messages might be in different orders, making them hard to compare.
-  // So, sort the messages in the descriptor protos (including nested messages,
-  // recursively).
-  SortMessages(&expected);
-  SortMessages(&parsed);
-
-  // I really wanted to use StringDiff here for the debug output on fail,
-  // but the strings are too long for it, and if I increase its max size,
-  // we get a memory allocation failure :(
-  EXPECT_EQ(expected.DebugString(), parsed.DebugString());
-}
-
-TEST_F(ParseDescriptorDebugTest, TestCustomOptions) {
-  const FileDescriptor* original_file =
-      protobuf_unittest::AggregateMessage::descriptor()->file();
-  FileDescriptorProto expected;
-  original_file->CopyTo(&expected);
-
-  std::string debug_string = original_file->DebugString();
-
-  // Parse the debug string
-  SetupParser(debug_string.c_str());
-  FileDescriptorProto parsed;
-  parser_->Parse(input_.get(), &parsed);
-  EXPECT_EQ(io::Tokenizer::TYPE_END, input_->current().type);
-  ASSERT_EQ("", error_collector_.text_);
-
-  // We now have a FileDescriptorProto, but to compare with the expected we
-  // need to link to a FileDecriptor, then output back to a proto. We'll
-  // also need to give it the same name as the original.
-  parsed.set_name(original_file->name());
-
-  // unittest_custom_options.proto depends on descriptor.proto.
-  const FileDescriptor* import = FileDescriptorProto::descriptor()->file();
-  FileDescriptorProto import_proto;
-  import->CopyTo(&import_proto);
-  ASSERT_TRUE(pool_.BuildFile(import_proto) != nullptr);
-
-  FileDescriptorProto any_import;
-  google::protobuf::Any::descriptor()->file()->CopyTo(&any_import);
-  ASSERT_TRUE(pool_.BuildFile(any_import) != nullptr);
-
-  const FileDescriptor* actual = pool_.BuildFile(parsed);
-  ASSERT_TRUE(actual != nullptr);
-  parsed.Clear();
-  actual->CopyTo(&parsed);
-
-  // The messages might be in different orders, making them hard to compare.
-  // So, sort the messages in the descriptor protos (including nested messages,
-  // recursively).
-  SortMessages(&expected);
-  SortMessages(&parsed);
-
-  EXPECT_EQ(expected.DebugString(), parsed.DebugString());
-}
-
-// Ensure that DebugStringWithOptions(), with |include_comments| set to true,
-// includes comments from the original parser input in all of the appropriate
-// places.
-TEST_F(ParseDescriptorDebugTest, TestCommentsInDebugString) {
-  SetupParser(
-      "// Detached comment before syntax.\n"
-      "\n"
-      "// Syntax comment.\n"
-      "syntax = \"proto2\";\n"
-      "\n"
-      "// Detached comment before package.\n"
-      "\n"
-      "// Package comment.\n"
-      "package comment_test;\n"
-      "\n"
-      "// Detached comment before TestMessage1.\n"
-      "\n"
-      "// Message comment.\n"
-      "//\n"
-      "// More detail in message comment.\n"
-      "message TestMessage1 {\n"
-      "\n"
-      "  // Detached comment before foo.\n"
-      "\n"
-      "  // Field comment.\n"
-      "  optional int32 foo = 1;\n"
-      "\n"
-      "  // Detached comment before NestedMessage.\n"
-      "\n"
-      "  // Nested-message comment.\n"
-      "  message NestedMessage {\n"
-      "    optional int32 bar = 1;\n"
-      "  }\n"
-      "}\n"
-      "\n"
-      "// Detached comment before MyEnumType.\n"
-      "\n"
-      "// Enum comment.\n"
-      "enum MyEnumType {\n"
-      "\n"
-      "  // Detached comment before ASDF.\n"
-      "\n"
-      "  // Enum-value comment.\n"
-      "  ASDF = 1;\n"
-      "}\n"
-      "\n"
-      "// Detached comment before MyService.\n"
-      "\n"
-      "// Service comment.\n"
-      "service MyService {\n"
-      "\n"
-      "  // Detached comment before MyRPCCall.\n"
-      "\n"
-      "  // RPC comment.\n"
-      "  rpc MyRPCCall(TestMessage1) returns (TestMessage1) { }\n"
-      "}\n");
-
-  FileDescriptorProto parsed_desc;
-  parsed_desc.set_name("foo.proto");
-  SourceLocationTable source_locations;
-  parser_->RecordSourceLocationsTo(&source_locations);
-  parser_->Parse(input_.get(), &parsed_desc);
-  EXPECT_EQ(io::Tokenizer::TYPE_END, input_->current().type);
-  ASSERT_EQ("", error_collector_.text_);
-
-  // We need to import the FileDescriptorProto to get a FileDescriptor.
-  MockValidationErrorCollector collector(source_locations, &error_collector_);
-  const FileDescriptor* descriptor =
-      pool_.BuildFileCollectingErrors(parsed_desc, &collector);
-  ASSERT_TRUE(descriptor != nullptr);
-
-  // Ensure that each of the comments appears somewhere in the DebugString().
-  // We don't test the exact comment placement or formatting, because we do not
-  // want to be too fragile here.
-  const char* expected_comments[] = {
-      "Detached comment before syntax.",
-      "Syntax comment.",
-      "Detached comment before package.",
-      "Package comment.",
-      "Detached comment before TestMessage1.",
-      "Message comment.",
-      "More detail in message comment.",
-      "Detached comment before foo.",
-      "Field comment",
-      "Detached comment before NestedMessage.",
-      "Nested-message comment",
-      "Detached comment before MyEnumType.",
-      "Enum comment",
-      "Detached comment before ASDF.",
-      "Enum-value comment",
-      "Detached comment before MyService.",
-      "Service comment",
-      "Detached comment before MyRPCCall.",
-      "RPC comment",
-  };
-
-  DebugStringOptions debug_string_options;
-  debug_string_options.include_comments = true;
-
-  {
-    const std::string debug_string =
-        descriptor->DebugStringWithOptions(debug_string_options);
-
-    for (int i = 0; i < GOOGLE_ARRAYSIZE(expected_comments); ++i) {
-      std::string::size_type found_pos =
-          debug_string.find(expected_comments[i]);
-      EXPECT_TRUE(found_pos != std::string::npos)
-          << "\"" << expected_comments[i] << "\" not found.";
-    }
-
-    // Result of DebugStringWithOptions should be parseable.
-    SetupParser(debug_string.c_str());
-    FileDescriptorProto parsed;
-    parser_->Parse(input_.get(), &parsed);
-    EXPECT_EQ(io::Tokenizer::TYPE_END, input_->current().type);
-    ASSERT_EQ("", error_collector_.text_) << "Failed to parse:\n"
-                                          << debug_string;
-  }
-
-}
-
-TEST_F(ParseDescriptorDebugTest, TestMaps) {
-  SetupParser(
-      "syntax = \"proto3\"; "
-      "message Foo { "
-      "  message Bar { } "
-      "  map<int32, Bar> enum_message_map = 1; "
-      "  map<string, float> primitive_map = 2; "
-      "} ");
-  FileDescriptorProto original;
-  EXPECT_TRUE(parser_->Parse(input_.get(), &original));
-  original.set_name("foo.proto");
-  const FileDescriptor* file = pool_.BuildFile(original);
-  ASSERT_TRUE(file != nullptr);
-
-  // Make sure the debug string uses map syntax and does not have the auto
-  // generated entry.
-  std::string debug_string = file->DebugString();
-  EXPECT_TRUE(debug_string.find("map<") != std::string::npos);
-  EXPECT_TRUE(debug_string.find("option map_entry") == std::string::npos);
-  EXPECT_TRUE(debug_string.find("MapEntry") == std::string::npos);
-
-  // Make sure the descriptor debug string is parsable.
-  FileDescriptorProto parsed;
-  SetupParser(debug_string.c_str());
-  parsed.set_name("foo.proto");
-  ASSERT_TRUE(parser_->Parse(input_.get(), &parsed));
-
-  original.clear_source_code_info();
-  parsed.clear_source_code_info();
-  StripFieldTypeName(&original);
-  StripFieldTypeName(&parsed);
-  EXPECT_EQ(original.DebugString(), parsed.DebugString());
-}
-
-// ===================================================================
-// SourceCodeInfo tests.
-
-// Follows a path -- as defined by SourceCodeInfo.Location.path -- from a
-// message to a particular sub-field.
-// * If the target is itself a message, sets *output_message to point at it,
-//   *output_field to NULL, and *output_index to -1.
-// * Otherwise, if the target is an element of a repeated field, sets
-//   *output_message to the containing message, *output_field to the descriptor
-//   of the field, and *output_index to the index of the element.
-// * Otherwise, the target is a field (possibly a repeated field, but not any
-//   one element).  Sets *output_message to the containing message,
-//   *output_field to the descriptor of the field, and *output_index to -1.
-// Returns true if the path was valid, false otherwise.  A gTest failure is
-// recorded before returning false.
-bool FollowPath(const Message& root,
-                RepeatedField<int>::const_iterator path_begin,
-                RepeatedField<int>::const_iterator path_end,
-                const Message** output_message,
-                const FieldDescriptor** output_field, int* output_index) {
-  if (path_begin == path_end) {
-    // Path refers to this whole message.
-    *output_message = &root;
-    *output_field = nullptr;
-    *output_index = -1;
-    return true;
-  }
-
-  const Descriptor* descriptor = root.GetDescriptor();
-  const Reflection* reflection = root.GetReflection();
-
-  const FieldDescriptor* field = descriptor->FindFieldByNumber(*path_begin);
-
-  if (field == nullptr) {
-    ADD_FAILURE() << descriptor->name()
-                  << " has no field number: " << *path_begin;
-    return false;
-  }
-
-  ++path_begin;
-
-  if (field->is_repeated()) {
-    if (path_begin == path_end) {
-      // Path refers to the whole repeated field.
-      *output_message = &root;
-      *output_field = field;
-      *output_index = -1;
-      return true;
-    }
-
-    int index = *path_begin++;
-    int size = reflection->FieldSize(root, field);
-
-    if (index >= size) {
-      ADD_FAILURE() << descriptor->name() << "." << field->name()
-                    << " has size " << size
-                    << ", but path contained index: " << index;
-      return false;
-    }
-
-    if (field->cpp_type() == FieldDescriptor::CPPTYPE_MESSAGE) {
-      // Descend into child message.
-      const Message& child = reflection->GetRepeatedMessage(root, field, index);
-      return FollowPath(child, path_begin, path_end, output_message,
-                        output_field, output_index);
-    } else if (path_begin == path_end) {
-      // Path refers to this element.
-      *output_message = &root;
-      *output_field = field;
-      *output_index = index;
-      return true;
-    } else {
-      ADD_FAILURE() << descriptor->name() << "." << field->name()
-                    << " is not a message; cannot descend into it.";
-      return false;
-    }
-  } else {
-    if (field->cpp_type() == FieldDescriptor::CPPTYPE_MESSAGE) {
-      const Message& child = reflection->GetMessage(root, field);
-      return FollowPath(child, path_begin, path_end, output_message,
-                        output_field, output_index);
-    } else if (path_begin == path_end) {
-      // Path refers to this field.
-      *output_message = &root;
-      *output_field = field;
-      *output_index = -1;
-      return true;
-    } else {
-      ADD_FAILURE() << descriptor->name() << "." << field->name()
-                    << " is not a message; cannot descend into it.";
-      return false;
-    }
-  }
-}
-
-// Check if two spans are equal.
-bool CompareSpans(const RepeatedField<int>& span1,
-                  const RepeatedField<int>& span2) {
-  if (span1.size() != span2.size()) return false;
-  for (int i = 0; i < span1.size(); i++) {
-    if (span1.Get(i) != span2.Get(i)) return false;
-  }
-  return true;
-}
-
-// Test fixture for source info tests, which check that source locations are
-// recorded correctly in FileDescriptorProto.source_code_info.location.
-class SourceInfoTest : public ParserTest {
- protected:
-  // The parsed file (initialized by Parse()).
-  FileDescriptorProto file_;
-
-  // Parse the given text as a .proto file and populate the spans_ map with
-  // all the source location spans in its SourceCodeInfo table.
-  bool Parse(const char* text) {
-    ExtractMarkers(text);
-    SetupParser(text_without_markers_.c_str());
-    if (!parser_->Parse(input_.get(), &file_)) {
-      return false;
-    }
-
-    const SourceCodeInfo& source_info = file_.source_code_info();
-    for (int i = 0; i < source_info.location_size(); i++) {
-      const SourceCodeInfo::Location& location = source_info.location(i);
-      const Message* descriptor_proto = nullptr;
-      const FieldDescriptor* field = nullptr;
-      int index = 0;
-      if (!FollowPath(file_, location.path().begin(), location.path().end(),
-                      &descriptor_proto, &field, &index)) {
-        return false;
-      }
-
-      spans_.insert(
-          std::make_pair(SpanKey(*descriptor_proto, field, index), &location));
-    }
-
-    return true;
-  }
-
-  void TearDown() override {
-    EXPECT_TRUE(spans_.empty()) << "Forgot to call HasSpan() for:\n"
-                                << spans_.begin()->second->DebugString();
-  }
-
-  // -----------------------------------------------------------------
-  // HasSpan() checks that the span of source code delimited by the given
-  // tags (comments) correspond via the SourceCodeInfo table to the given
-  // part of the FileDescriptorProto.  (If unclear, look at the actual tests;
-  // it should quickly become obvious.)
-
-  bool HasSpan(char start_marker, char end_marker,
-               const Message& descriptor_proto) {
-    return HasSpanWithComment(start_marker, end_marker, descriptor_proto,
-                              nullptr, -1, nullptr, nullptr, nullptr);
-  }
-
-  bool HasSpanWithComment(char start_marker, char end_marker,
-                          const Message& descriptor_proto,
-                          const char* expected_leading_comments,
-                          const char* expected_trailing_comments,
-                          const char* expected_leading_detached_comments) {
-    return HasSpanWithComment(start_marker, end_marker, descriptor_proto,
-                              nullptr, -1, expected_leading_comments,
-                              expected_trailing_comments,
-                              expected_leading_detached_comments);
-  }
-
-  bool HasSpan(char start_marker, char end_marker,
-               const Message& descriptor_proto, const std::string& field_name) {
-    return HasSpan(start_marker, end_marker, descriptor_proto, field_name, -1);
-  }
-
-  bool HasSpan(char start_marker, char end_marker,
-               const Message& descriptor_proto, const std::string& field_name,
-               int index) {
-    return HasSpan(start_marker, end_marker, descriptor_proto, field_name,
-                   index, nullptr, nullptr, nullptr);
-  }
-
-  bool HasSpan(char start_marker, char end_marker,
-               const Message& descriptor_proto, const std::string& field_name,
-               int index, const char* expected_leading_comments,
-               const char* expected_trailing_comments,
-               const char* expected_leading_detached_comments) {
-    const FieldDescriptor* field =
-        descriptor_proto.GetDescriptor()->FindFieldByName(field_name);
-    if (field == nullptr) {
-      ADD_FAILURE() << descriptor_proto.GetDescriptor()->name()
-                    << " has no such field: " << field_name;
-      return false;
-    }
-
-    return HasSpanWithComment(start_marker, end_marker, descriptor_proto, field,
-                              index, expected_leading_comments,
-                              expected_trailing_comments,
-                              expected_leading_detached_comments);
-  }
-
-  bool HasSpan(const Message& descriptor_proto) {
-    return HasSpanWithComment('\0', '\0', descriptor_proto, nullptr, -1,
-                              nullptr, nullptr, nullptr);
-  }
-
-  bool HasSpan(const Message& descriptor_proto, const std::string& field_name) {
-    return HasSpan('\0', '\0', descriptor_proto, field_name, -1);
-  }
-
-  bool HasSpanWithComment(char start_marker, char end_marker,
-                          const Message& descriptor_proto,
-                          const FieldDescriptor* field, int index,
-                          const char* expected_leading_comments,
-                          const char* expected_trailing_comments,
-                          const char* expected_leading_detached_comments) {
-    std::pair<SpanMap::iterator, SpanMap::iterator> range =
-        spans_.equal_range(SpanKey(descriptor_proto, field, index));
-
-    if (start_marker == '\0') {
-      if (range.first == range.second) {
-        return false;
-      } else {
-        spans_.erase(range.first);
-        return true;
-      }
-    } else {
-      std::pair<int, int> start_pos = FindOrDie(markers_, start_marker);
-      std::pair<int, int> end_pos = FindOrDie(markers_, end_marker);
-
-      RepeatedField<int> expected_span;
-      expected_span.Add(start_pos.first);
-      expected_span.Add(start_pos.second);
-      if (end_pos.first != start_pos.first) {
-        expected_span.Add(end_pos.first);
-      }
-      expected_span.Add(end_pos.second);
-
-      for (SpanMap::iterator iter = range.first; iter != range.second; ++iter) {
-        if (CompareSpans(expected_span, iter->second->span())) {
-          if (expected_leading_comments == nullptr) {
-            EXPECT_FALSE(iter->second->has_leading_comments());
-          } else {
-            EXPECT_TRUE(iter->second->has_leading_comments());
-            EXPECT_EQ(expected_leading_comments,
-                      iter->second->leading_comments());
-          }
-          if (expected_trailing_comments == nullptr) {
-            EXPECT_FALSE(iter->second->has_trailing_comments());
-          } else {
-            EXPECT_TRUE(iter->second->has_trailing_comments());
-            EXPECT_EQ(expected_trailing_comments,
-                      iter->second->trailing_comments());
-          }
-          if (expected_leading_detached_comments == nullptr) {
-            EXPECT_EQ(0, iter->second->leading_detached_comments_size());
-          } else {
-            EXPECT_EQ(
-                expected_leading_detached_comments,
-                Join(iter->second->leading_detached_comments(), "\n"));
-          }
-
-          spans_.erase(iter);
-          return true;
-        }
-      }
-
-      return false;
-    }
-  }
-
- private:
-  struct SpanKey {
-    const Message* descriptor_proto;
-    const FieldDescriptor* field;
-    int index;
-
-    inline SpanKey() {}
-    inline SpanKey(const Message& descriptor_proto_param,
-                   const FieldDescriptor* field_param, int index_param)
-        : descriptor_proto(&descriptor_proto_param),
-          field(field_param),
-          index(index_param) {}
-
-    inline bool operator<(const SpanKey& other) const {
-      if (descriptor_proto < other.descriptor_proto) return true;
-      if (descriptor_proto > other.descriptor_proto) return false;
-      if (field < other.field) return true;
-      if (field > other.field) return false;
-      return index < other.index;
-    }
-  };
-
-  typedef std::multimap<SpanKey, const SourceCodeInfo::Location*> SpanMap;
-  SpanMap spans_;
-  std::map<char, std::pair<int, int> > markers_;
-  std::string text_without_markers_;
-
-  void ExtractMarkers(const char* text) {
-    markers_.clear();
-    text_without_markers_.clear();
-    int line = 0;
-    int column = 0;
-    while (*text != '\0') {
-      if (*text == '$') {
-        ++text;
-        GOOGLE_CHECK_NE('\0', *text);
-        if (*text == '$') {
-          text_without_markers_ += '$';
-          ++column;
-        } else {
-          markers_[*text] = std::make_pair(line, column);
-          ++text;
-          GOOGLE_CHECK_EQ('$', *text);
-        }
-      } else if (*text == '\n') {
-        ++line;
-        column = 0;
-        text_without_markers_ += *text;
-      } else {
-        text_without_markers_ += *text;
-        ++column;
-      }
-      ++text;
-    }
-  }
-};
-
-TEST_F(SourceInfoTest, BasicFileDecls) {
-  EXPECT_TRUE(
-      Parse("$a$syntax = \"proto2\";$i$\n"
-            "$b$package foo.bar;$c$\n"
-            "$d$import \"baz.proto\";$e$\n"
-            "$f$import\"qux.proto\";$h$\n"
-            "$j$import $k$public$l$ \"bar.proto\";$m$\n"
-            "$n$import $o$weak$p$ \"bar.proto\";$q$\n"
-            "\n"
-            "// comment ignored\n"));
-
-  EXPECT_TRUE(HasSpan('a', 'q', file_));
-  EXPECT_TRUE(HasSpan('b', 'c', file_, "package"));
-  EXPECT_TRUE(HasSpan('d', 'e', file_, "dependency", 0));
-  EXPECT_TRUE(HasSpan('f', 'h', file_, "dependency", 1));
-  EXPECT_TRUE(HasSpan('j', 'm', file_, "dependency", 2));
-  EXPECT_TRUE(HasSpan('k', 'l', file_, "public_dependency", 0));
-  EXPECT_TRUE(HasSpan('n', 'q', file_, "dependency", 3));
-  EXPECT_TRUE(HasSpan('o', 'p', file_, "weak_dependency", 0));
-  EXPECT_TRUE(HasSpan('a', 'i', file_, "syntax"));
-}
-
-TEST_F(SourceInfoTest, Messages) {
-  EXPECT_TRUE(
-      Parse("$a$message $b$Foo$c$ {}$d$\n"
-            "$e$message $f$Bar$g$ {}$h$\n"));
-
-  EXPECT_TRUE(HasSpan('a', 'd', file_.message_type(0)));
-  EXPECT_TRUE(HasSpan('b', 'c', file_.message_type(0), "name"));
-  EXPECT_TRUE(HasSpan('e', 'h', file_.message_type(1)));
-  EXPECT_TRUE(HasSpan('f', 'g', file_.message_type(1), "name"));
-
-  // Ignore these.
-  EXPECT_TRUE(HasSpan(file_));
-}
-
-TEST_F(SourceInfoTest, Fields) {
-  EXPECT_TRUE(
-      Parse("message Foo {\n"
-            "  $a$optional$b$ $c$int32$d$ $e$bar$f$ = $g$1$h$;$i$\n"
-            "  $j$repeated$k$ $l$X.Y$m$ $n$baz$o$ = $p$2$q$;$r$\n"
-            "}\n"));
-
-  const FieldDescriptorProto& field1 = file_.message_type(0).field(0);
-  const FieldDescriptorProto& field2 = file_.message_type(0).field(1);
-
-  EXPECT_TRUE(HasSpan('a', 'i', field1));
-  EXPECT_TRUE(HasSpan('a', 'b', field1, "label"));
-  EXPECT_TRUE(HasSpan('c', 'd', field1, "type"));
-  EXPECT_TRUE(HasSpan('e', 'f', field1, "name"));
-  EXPECT_TRUE(HasSpan('g', 'h', field1, "number"));
-
-  EXPECT_TRUE(HasSpan('j', 'r', field2));
-  EXPECT_TRUE(HasSpan('j', 'k', field2, "label"));
-  EXPECT_TRUE(HasSpan('l', 'm', field2, "type_name"));
-  EXPECT_TRUE(HasSpan('n', 'o', field2, "name"));
-  EXPECT_TRUE(HasSpan('p', 'q', field2, "number"));
-
-  // Ignore these.
-  EXPECT_TRUE(HasSpan(file_));
-  EXPECT_TRUE(HasSpan(file_.message_type(0)));
-  EXPECT_TRUE(HasSpan(file_.message_type(0), "name"));
-}
-
-TEST_F(SourceInfoTest, Proto3Fields) {
-  EXPECT_TRUE(
-      Parse("syntax = \"proto3\";\n"
-            "message Foo {\n"
-            "  $a$int32$b$ $c$bar$d$ = $e$1$f$;$g$\n"
-            "  $h$repeated$i$ $j$X.Y$k$ $l$baz$m$ = $n$2$o$;$p$\n"
-            "}\n"));
-
-  const FieldDescriptorProto& field1 = file_.message_type(0).field(0);
-  const FieldDescriptorProto& field2 = file_.message_type(0).field(1);
-
-  EXPECT_TRUE(HasSpan('a', 'g', field1));
-  EXPECT_TRUE(HasSpan('a', 'b', field1, "type"));
-  EXPECT_TRUE(HasSpan('c', 'd', field1, "name"));
-  EXPECT_TRUE(HasSpan('e', 'f', field1, "number"));
-
-  EXPECT_TRUE(HasSpan('h', 'p', field2));
-  EXPECT_TRUE(HasSpan('h', 'i', field2, "label"));
-  EXPECT_TRUE(HasSpan('j', 'k', field2, "type_name"));
-  EXPECT_TRUE(HasSpan('l', 'm', field2, "name"));
-  EXPECT_TRUE(HasSpan('n', 'o', field2, "number"));
-
-  // Ignore these.
-  EXPECT_TRUE(HasSpan(file_));
-  EXPECT_TRUE(HasSpan(file_, "syntax"));
-  EXPECT_TRUE(HasSpan(file_.message_type(0)));
-  EXPECT_TRUE(HasSpan(file_.message_type(0), "name"));
-}
-
-TEST_F(SourceInfoTest, Extensions) {
-  EXPECT_TRUE(
-      Parse("$a$extend $b$Foo$c$ {\n"
-            "  $d$optional$e$ int32 bar = 1;$f$\n"
-            "  $g$repeated$h$ X.Y baz = 2;$i$\n"
-            "}$j$\n"
-            "$k$extend $l$Bar$m$ {\n"
-            "  $n$optional int32 qux = 1;$o$\n"
-            "}$p$\n"));
-
-  const FieldDescriptorProto& field1 = file_.extension(0);
-  const FieldDescriptorProto& field2 = file_.extension(1);
-  const FieldDescriptorProto& field3 = file_.extension(2);
-
-  EXPECT_TRUE(HasSpan('a', 'j', file_, "extension"));
-  EXPECT_TRUE(HasSpan('k', 'p', file_, "extension"));
-
-  EXPECT_TRUE(HasSpan('d', 'f', field1));
-  EXPECT_TRUE(HasSpan('d', 'e', field1, "label"));
-  EXPECT_TRUE(HasSpan('b', 'c', field1, "extendee"));
-
-  EXPECT_TRUE(HasSpan('g', 'i', field2));
-  EXPECT_TRUE(HasSpan('g', 'h', field2, "label"));
-  EXPECT_TRUE(HasSpan('b', 'c', field2, "extendee"));
-
-  EXPECT_TRUE(HasSpan('n', 'o', field3));
-  EXPECT_TRUE(HasSpan('l', 'm', field3, "extendee"));
-
-  // Ignore these.
-  EXPECT_TRUE(HasSpan(file_));
-  EXPECT_TRUE(HasSpan(field1, "type"));
-  EXPECT_TRUE(HasSpan(field1, "name"));
-  EXPECT_TRUE(HasSpan(field1, "number"));
-  EXPECT_TRUE(HasSpan(field2, "type_name"));
-  EXPECT_TRUE(HasSpan(field2, "name"));
-  EXPECT_TRUE(HasSpan(field2, "number"));
-  EXPECT_TRUE(HasSpan(field3, "label"));
-  EXPECT_TRUE(HasSpan(field3, "type"));
-  EXPECT_TRUE(HasSpan(field3, "name"));
-  EXPECT_TRUE(HasSpan(field3, "number"));
-}
-
-TEST_F(SourceInfoTest, NestedExtensions) {
-  EXPECT_TRUE(
-      Parse("message Message {\n"
-            "  $a$extend $b$Foo$c$ {\n"
-            "    $d$optional$e$ int32 bar = 1;$f$\n"
-            "    $g$repeated$h$ X.Y baz = 2;$i$\n"
-            "  }$j$\n"
-            "  $k$extend $l$Bar$m$ {\n"
-            "    $n$optional int32 qux = 1;$o$\n"
-            "  }$p$\n"
-            "}\n"));
-
-  const FieldDescriptorProto& field1 = file_.message_type(0).extension(0);
-  const FieldDescriptorProto& field2 = file_.message_type(0).extension(1);
-  const FieldDescriptorProto& field3 = file_.message_type(0).extension(2);
-
-  EXPECT_TRUE(HasSpan('a', 'j', file_.message_type(0), "extension"));
-  EXPECT_TRUE(HasSpan('k', 'p', file_.message_type(0), "extension"));
-
-  EXPECT_TRUE(HasSpan('d', 'f', field1));
-  EXPECT_TRUE(HasSpan('d', 'e', field1, "label"));
-  EXPECT_TRUE(HasSpan('b', 'c', field1, "extendee"));
-
-  EXPECT_TRUE(HasSpan('g', 'i', field2));
-  EXPECT_TRUE(HasSpan('g', 'h', field2, "label"));
-  EXPECT_TRUE(HasSpan('b', 'c', field2, "extendee"));
-
-  EXPECT_TRUE(HasSpan('n', 'o', field3));
-  EXPECT_TRUE(HasSpan('l', 'm', field3, "extendee"));
-
-  // Ignore these.
-  EXPECT_TRUE(HasSpan(file_));
-  EXPECT_TRUE(HasSpan(file_.message_type(0)));
-  EXPECT_TRUE(HasSpan(file_.message_type(0), "name"));
-  EXPECT_TRUE(HasSpan(field1, "type"));
-  EXPECT_TRUE(HasSpan(field1, "name"));
-  EXPECT_TRUE(HasSpan(field1, "number"));
-  EXPECT_TRUE(HasSpan(field2, "type_name"));
-  EXPECT_TRUE(HasSpan(field2, "name"));
-  EXPECT_TRUE(HasSpan(field2, "number"));
-  EXPECT_TRUE(HasSpan(field3, "label"));
-  EXPECT_TRUE(HasSpan(field3, "type"));
-  EXPECT_TRUE(HasSpan(field3, "name"));
-  EXPECT_TRUE(HasSpan(field3, "number"));
-}
-
-TEST_F(SourceInfoTest, ExtensionRanges) {
-  EXPECT_TRUE(
-      Parse("message Message {\n"
-            "  $a$extensions $b$1$c$ to $d$4$e$, $f$6$g$;$h$\n"
-            "  $i$extensions $j$8$k$ to $l$max$m$;$n$\n"
-            "}\n"));
-
-  const DescriptorProto::ExtensionRange& range1 =
-      file_.message_type(0).extension_range(0);
-  const DescriptorProto::ExtensionRange& range2 =
-      file_.message_type(0).extension_range(1);
-  const DescriptorProto::ExtensionRange& range3 =
-      file_.message_type(0).extension_range(2);
-
-  EXPECT_TRUE(HasSpan('a', 'h', file_.message_type(0), "extension_range"));
-  EXPECT_TRUE(HasSpan('i', 'n', file_.message_type(0), "extension_range"));
-
-  EXPECT_TRUE(HasSpan('b', 'e', range1));
-  EXPECT_TRUE(HasSpan('b', 'c', range1, "start"));
-  EXPECT_TRUE(HasSpan('d', 'e', range1, "end"));
-
-  EXPECT_TRUE(HasSpan('f', 'g', range2));
-  EXPECT_TRUE(HasSpan('f', 'g', range2, "start"));
-  EXPECT_TRUE(HasSpan('f', 'g', range2, "end"));
-
-  EXPECT_TRUE(HasSpan('j', 'm', range3));
-  EXPECT_TRUE(HasSpan('j', 'k', range3, "start"));
-  EXPECT_TRUE(HasSpan('l', 'm', range3, "end"));
-
-  // Ignore these.
-  EXPECT_TRUE(HasSpan(file_));
-  EXPECT_TRUE(HasSpan(file_.message_type(0)));
-  EXPECT_TRUE(HasSpan(file_.message_type(0), "name"));
-}
-
-TEST_F(SourceInfoTest, ReservedRanges) {
-  EXPECT_TRUE(
-      Parse("message Message {\n"
-            "  $a$reserved $b$1$c$ to $d$4$e$, $f$6$g$;$h$\n"
-            "}\n"));
-
-  const DescriptorProto::ReservedRange& range1 =
-      file_.message_type(0).reserved_range(0);
-  const DescriptorProto::ReservedRange& range2 =
-      file_.message_type(0).reserved_range(1);
-
-  EXPECT_TRUE(HasSpan('a', 'h', file_.message_type(0), "reserved_range"));
-
-  EXPECT_TRUE(HasSpan('b', 'e', range1));
-  EXPECT_TRUE(HasSpan('b', 'c', range1, "start"));
-  EXPECT_TRUE(HasSpan('d', 'e', range1, "end"));
-
-  EXPECT_TRUE(HasSpan('f', 'g', range2));
-  EXPECT_TRUE(HasSpan('f', 'g', range2, "start"));
-  EXPECT_TRUE(HasSpan('f', 'g', range2, "end"));
-
-  // Ignore these.
-  EXPECT_TRUE(HasSpan(file_));
-  EXPECT_TRUE(HasSpan(file_.message_type(0)));
-  EXPECT_TRUE(HasSpan(file_.message_type(0), "name"));
-}
-
-TEST_F(SourceInfoTest, Oneofs) {
-  EXPECT_TRUE(
-      Parse("message Foo {\n"
-            "  $a$oneof $c$foo$d$ {\n"
-            "    $e$int32$f$ $g$a$h$ = $i$1$j$;$k$\n"
-            "  }$r$\n"
-            "}\n"));
-
-  const OneofDescriptorProto& oneof_decl = file_.message_type(0).oneof_decl(0);
-  const FieldDescriptorProto& field = file_.message_type(0).field(0);
-
-  EXPECT_TRUE(HasSpan('a', 'r', oneof_decl));
-  EXPECT_TRUE(HasSpan('c', 'd', oneof_decl, "name"));
-
-  EXPECT_TRUE(HasSpan('e', 'k', field));
-  EXPECT_TRUE(HasSpan('e', 'f', field, "type"));
-  EXPECT_TRUE(HasSpan('g', 'h', field, "name"));
-  EXPECT_TRUE(HasSpan('i', 'j', field, "number"));
-
-  // Ignore these.
-  EXPECT_TRUE(HasSpan(file_));
-  EXPECT_TRUE(HasSpan(file_.message_type(0)));
-  EXPECT_TRUE(HasSpan(file_.message_type(0), "name"));
-}
-
-TEST_F(SourceInfoTest, NestedMessages) {
-  EXPECT_TRUE(
-      Parse("message Foo {\n"
-            "  $a$message $b$Bar$c$ {\n"
-            "    $d$message $e$Baz$f$ {}$g$\n"
-            "  }$h$\n"
-            "  $i$message $j$Qux$k$ {}$l$\n"
-            "}\n"));
-
-  const DescriptorProto& bar = file_.message_type(0).nested_type(0);
-  const DescriptorProto& baz = bar.nested_type(0);
-  const DescriptorProto& qux = file_.message_type(0).nested_type(1);
-
-  EXPECT_TRUE(HasSpan('a', 'h', bar));
-  EXPECT_TRUE(HasSpan('b', 'c', bar, "name"));
-  EXPECT_TRUE(HasSpan('d', 'g', baz));
-  EXPECT_TRUE(HasSpan('e', 'f', baz, "name"));
-  EXPECT_TRUE(HasSpan('i', 'l', qux));
-  EXPECT_TRUE(HasSpan('j', 'k', qux, "name"));
-
-  // Ignore these.
-  EXPECT_TRUE(HasSpan(file_));
-  EXPECT_TRUE(HasSpan(file_.message_type(0)));
-  EXPECT_TRUE(HasSpan(file_.message_type(0), "name"));
-}
-
-TEST_F(SourceInfoTest, Groups) {
-  EXPECT_TRUE(
-      Parse("message Foo {\n"
-            "  message Bar {}\n"
-            "  $a$optional$b$ $c$group$d$ $e$Baz$f$ = $g$1$h$ {\n"
-            "    $i$message Qux {}$j$\n"
-            "  }$k$\n"
-            "}\n"));
-
-  const DescriptorProto& bar = file_.message_type(0).nested_type(0);
-  const DescriptorProto& baz = file_.message_type(0).nested_type(1);
-  const DescriptorProto& qux = baz.nested_type(0);
-  const FieldDescriptorProto& field = file_.message_type(0).field(0);
-
-  EXPECT_TRUE(HasSpan('a', 'k', field));
-  EXPECT_TRUE(HasSpan('a', 'b', field, "label"));
-  EXPECT_TRUE(HasSpan('c', 'd', field, "type"));
-  EXPECT_TRUE(HasSpan('e', 'f', field, "name"));
-  EXPECT_TRUE(HasSpan('e', 'f', field, "type_name"));
-  EXPECT_TRUE(HasSpan('g', 'h', field, "number"));
-
-  EXPECT_TRUE(HasSpan('a', 'k', baz));
-  EXPECT_TRUE(HasSpan('e', 'f', baz, "name"));
-  EXPECT_TRUE(HasSpan('i', 'j', qux));
-
-  // Ignore these.
-  EXPECT_TRUE(HasSpan(file_));
-  EXPECT_TRUE(HasSpan(file_.message_type(0)));
-  EXPECT_TRUE(HasSpan(file_.message_type(0), "name"));
-  EXPECT_TRUE(HasSpan(bar));
-  EXPECT_TRUE(HasSpan(bar, "name"));
-  EXPECT_TRUE(HasSpan(qux, "name"));
-}
-
-TEST_F(SourceInfoTest, Enums) {
-  EXPECT_TRUE(
-      Parse("$a$enum $b$Foo$c$ {}$d$\n"
-            "$e$enum $f$Bar$g$ {}$h$\n"));
-
-  EXPECT_TRUE(HasSpan('a', 'd', file_.enum_type(0)));
-  EXPECT_TRUE(HasSpan('b', 'c', file_.enum_type(0), "name"));
-  EXPECT_TRUE(HasSpan('e', 'h', file_.enum_type(1)));
-  EXPECT_TRUE(HasSpan('f', 'g', file_.enum_type(1), "name"));
-
-  // Ignore these.
-  EXPECT_TRUE(HasSpan(file_));
-}
-
-TEST_F(SourceInfoTest, EnumValues) {
-  EXPECT_TRUE(
-      Parse("enum Foo {\n"
-            "  $a$BAR$b$ = $c$1$d$;$e$\n"
-            "  $f$BAZ$g$ = $h$2$i$;$j$\n"
-            "}"));
-
-  const EnumValueDescriptorProto& bar = file_.enum_type(0).value(0);
-  const EnumValueDescriptorProto& baz = file_.enum_type(0).value(1);
-
-  EXPECT_TRUE(HasSpan('a', 'e', bar));
-  EXPECT_TRUE(HasSpan('a', 'b', bar, "name"));
-  EXPECT_TRUE(HasSpan('c', 'd', bar, "number"));
-  EXPECT_TRUE(HasSpan('f', 'j', baz));
-  EXPECT_TRUE(HasSpan('f', 'g', baz, "name"));
-  EXPECT_TRUE(HasSpan('h', 'i', baz, "number"));
-
-  // Ignore these.
-  EXPECT_TRUE(HasSpan(file_));
-  EXPECT_TRUE(HasSpan(file_.enum_type(0)));
-  EXPECT_TRUE(HasSpan(file_.enum_type(0), "name"));
-}
-
-TEST_F(SourceInfoTest, EnumReservedRange) {
-  EXPECT_TRUE(
-      Parse("enum TestEnum {\n"
-            "  $a$reserved $b$1$c$ to $d$10$e$;$f$\n"
-            "}"));
-
-  const EnumDescriptorProto::EnumReservedRange& bar =
-      file_.enum_type(0).reserved_range(0);
-
-  EXPECT_TRUE(HasSpan('a', 'f', file_.enum_type(0), "reserved_range"));
-  EXPECT_TRUE(HasSpan('b', 'e', bar));
-  EXPECT_TRUE(HasSpan('b', 'c', bar, "start"));
-  EXPECT_TRUE(HasSpan('d', 'e', bar, "end"));
-
-  // Ignore these.
-  EXPECT_TRUE(HasSpan(file_));
-  EXPECT_TRUE(HasSpan(file_.enum_type(0)));
-  EXPECT_TRUE(HasSpan(file_.enum_type(0), "name"));
-}
-
-TEST_F(SourceInfoTest, EnumReservedName) {
-  EXPECT_TRUE(
-      Parse("enum TestEnum {\n"
-            "  $a$reserved $b$'foo'$c$;$d$\n"
-            "}"));
-
-  const EnumDescriptorProto& bar = file_.enum_type(0);
-
-  EXPECT_TRUE(HasSpan('a', 'd', bar, "reserved_name"));
-  EXPECT_TRUE(HasSpan('b', 'c', bar, "reserved_name", 0));
-
-  // Ignore these.
-  EXPECT_TRUE(HasSpan(file_));
-  EXPECT_TRUE(HasSpan(file_.enum_type(0)));
-  EXPECT_TRUE(HasSpan(file_.enum_type(0), "name"));
-}
-
-TEST_F(SourceInfoTest, NestedEnums) {
-  EXPECT_TRUE(
-      Parse("message Foo {\n"
-            "  $a$enum $b$Bar$c$ {}$d$\n"
-            "  $e$enum $f$Baz$g$ {}$h$\n"
-            "}\n"));
-
-  const EnumDescriptorProto& bar = file_.message_type(0).enum_type(0);
-  const EnumDescriptorProto& baz = file_.message_type(0).enum_type(1);
-
-  EXPECT_TRUE(HasSpan('a', 'd', bar));
-  EXPECT_TRUE(HasSpan('b', 'c', bar, "name"));
-  EXPECT_TRUE(HasSpan('e', 'h', baz));
-  EXPECT_TRUE(HasSpan('f', 'g', baz, "name"));
-
-  // Ignore these.
-  EXPECT_TRUE(HasSpan(file_));
-  EXPECT_TRUE(HasSpan(file_.message_type(0)));
-  EXPECT_TRUE(HasSpan(file_.message_type(0), "name"));
-}
-
-TEST_F(SourceInfoTest, Services) {
-  EXPECT_TRUE(
-      Parse("$a$service $b$Foo$c$ {}$d$\n"
-            "$e$service $f$Bar$g$ {}$h$\n"));
-
-  EXPECT_TRUE(HasSpan('a', 'd', file_.service(0)));
-  EXPECT_TRUE(HasSpan('b', 'c', file_.service(0), "name"));
-  EXPECT_TRUE(HasSpan('e', 'h', file_.service(1)));
-  EXPECT_TRUE(HasSpan('f', 'g', file_.service(1), "name"));
-
-  // Ignore these.
-  EXPECT_TRUE(HasSpan(file_));
-}
-
-TEST_F(SourceInfoTest, MethodsAndStreams) {
-  EXPECT_TRUE(
-      Parse("service Foo {\n"
-            "  $a$rpc $b$Bar$c$($d$X$e$) returns($f$Y$g$);$h$"
-            "  $i$rpc $j$Baz$k$($l$Z$m$) returns($n$W$o$);$p$"
-            "}"));
-
-  const MethodDescriptorProto& bar = file_.service(0).method(0);
-  const MethodDescriptorProto& baz = file_.service(0).method(1);
-
-  EXPECT_TRUE(HasSpan('a', 'h', bar));
-  EXPECT_TRUE(HasSpan('b', 'c', bar, "name"));
-  EXPECT_TRUE(HasSpan('d', 'e', bar, "input_type"));
-  EXPECT_TRUE(HasSpan('f', 'g', bar, "output_type"));
-
-  EXPECT_TRUE(HasSpan('i', 'p', baz));
-  EXPECT_TRUE(HasSpan('j', 'k', baz, "name"));
-  EXPECT_TRUE(HasSpan('l', 'm', baz, "input_type"));
-  EXPECT_TRUE(HasSpan('n', 'o', baz, "output_type"));
-
-  // Ignore these.
-  EXPECT_TRUE(HasSpan(file_));
-  EXPECT_TRUE(HasSpan(file_.service(0)));
-  EXPECT_TRUE(HasSpan(file_.service(0), "name"));
-}
-
-
-TEST_F(SourceInfoTest, Options) {
-  EXPECT_TRUE(
-      Parse("$a$option $b$foo$c$.$d$($e$bar.baz$f$)$g$ = "
-            "$h$123$i$;$j$\n"
-            "$k$option qux = $l$-123$m$;$n$\n"
-            "$o$option corge = $p$abc$q$;$r$\n"
-            "$s$option grault = $t$'blah'$u$;$v$\n"
-            "$w$option garply = $x${ yadda yadda }$y$;$z$\n"
-            "$0$option waldo = $1$123.0$2$;$3$\n"));
-
-  const UninterpretedOption& option1 = file_.options().uninterpreted_option(0);
-  const UninterpretedOption& option2 = file_.options().uninterpreted_option(1);
-  const UninterpretedOption& option3 = file_.options().uninterpreted_option(2);
-  const UninterpretedOption& option4 = file_.options().uninterpreted_option(3);
-  const UninterpretedOption& option5 = file_.options().uninterpreted_option(4);
-  const UninterpretedOption& option6 = file_.options().uninterpreted_option(5);
-
-  EXPECT_TRUE(HasSpan('a', 'j', file_.options()));
-  EXPECT_TRUE(HasSpan('a', 'j', option1));
-  EXPECT_TRUE(HasSpan('b', 'g', option1, "name"));
-  EXPECT_TRUE(HasSpan('b', 'c', option1.name(0)));
-  EXPECT_TRUE(HasSpan('b', 'c', option1.name(0), "name_part"));
-  EXPECT_TRUE(HasSpan('d', 'g', option1.name(1)));
-  EXPECT_TRUE(HasSpan('e', 'f', option1.name(1), "name_part"));
-  EXPECT_TRUE(HasSpan('h', 'i', option1, "positive_int_value"));
-
-  EXPECT_TRUE(HasSpan('k', 'n', file_.options()));
-  EXPECT_TRUE(HasSpan('l', 'm', option2, "negative_int_value"));
-
-  EXPECT_TRUE(HasSpan('o', 'r', file_.options()));
-  EXPECT_TRUE(HasSpan('p', 'q', option3, "identifier_value"));
-
-  EXPECT_TRUE(HasSpan('s', 'v', file_.options()));
-  EXPECT_TRUE(HasSpan('t', 'u', option4, "string_value"));
-
-  EXPECT_TRUE(HasSpan('w', 'z', file_.options()));
-  EXPECT_TRUE(HasSpan('x', 'y', option5, "aggregate_value"));
-
-  EXPECT_TRUE(HasSpan('0', '3', file_.options()));
-  EXPECT_TRUE(HasSpan('1', '2', option6, "double_value"));
-
-  // Ignore these.
-  EXPECT_TRUE(HasSpan(file_));
-  EXPECT_TRUE(HasSpan(option2));
-  EXPECT_TRUE(HasSpan(option3));
-  EXPECT_TRUE(HasSpan(option4));
-  EXPECT_TRUE(HasSpan(option5));
-  EXPECT_TRUE(HasSpan(option6));
-  EXPECT_TRUE(HasSpan(option2, "name"));
-  EXPECT_TRUE(HasSpan(option3, "name"));
-  EXPECT_TRUE(HasSpan(option4, "name"));
-  EXPECT_TRUE(HasSpan(option5, "name"));
-  EXPECT_TRUE(HasSpan(option6, "name"));
-  EXPECT_TRUE(HasSpan(option2.name(0)));
-  EXPECT_TRUE(HasSpan(option3.name(0)));
-  EXPECT_TRUE(HasSpan(option4.name(0)));
-  EXPECT_TRUE(HasSpan(option5.name(0)));
-  EXPECT_TRUE(HasSpan(option6.name(0)));
-  EXPECT_TRUE(HasSpan(option2.name(0), "name_part"));
-  EXPECT_TRUE(HasSpan(option3.name(0), "name_part"));
-  EXPECT_TRUE(HasSpan(option4.name(0), "name_part"));
-  EXPECT_TRUE(HasSpan(option5.name(0), "name_part"));
-  EXPECT_TRUE(HasSpan(option6.name(0), "name_part"));
-}
-
-TEST_F(SourceInfoTest, ScopedOptions) {
-  EXPECT_TRUE(
-      Parse("message Foo {\n"
-            "  $a$option mopt = 1;$b$\n"
-            "}\n"
-            "enum Bar {\n"
-            "  $c$option eopt = 1;$d$\n"
-            "}\n"
-            "service Baz {\n"
-            "  $e$option sopt = 1;$f$\n"
-            "  rpc M(X) returns(Y) {\n"
-            "    $g$option mopt = 1;$h$\n"
-            "  }\n"
-            "  rpc MS4($1$stream$2$ X) returns($3$stream$4$ Y) {\n"
-            "    $k$option mopt = 1;$l$\n"
-            "  }\n"
-            "}\n"));
-
-  EXPECT_TRUE(HasSpan('a', 'b', file_.message_type(0).options()));
-  EXPECT_TRUE(HasSpan('c', 'd', file_.enum_type(0).options()));
-  EXPECT_TRUE(HasSpan('e', 'f', file_.service(0).options()));
-  EXPECT_TRUE(HasSpan('g', 'h', file_.service(0).method(0).options()));
-
-  // Ignore these.
-  EXPECT_TRUE(HasSpan(file_));
-  EXPECT_TRUE(HasSpan(file_.message_type(0)));
-  EXPECT_TRUE(HasSpan(file_.message_type(0), "name"));
-  EXPECT_TRUE(HasSpan(file_.message_type(0).options().uninterpreted_option(0)));
-  EXPECT_TRUE(
-      HasSpan(file_.message_type(0).options().uninterpreted_option(0), "name"));
-  EXPECT_TRUE(
-      HasSpan(file_.message_type(0).options().uninterpreted_option(0).name(0)));
-  EXPECT_TRUE(
-      HasSpan(file_.message_type(0).options().uninterpreted_option(0).name(0),
-              "name_part"));
-  EXPECT_TRUE(HasSpan(file_.message_type(0).options().uninterpreted_option(0),
-                      "positive_int_value"));
-  EXPECT_TRUE(HasSpan(file_.enum_type(0)));
-  EXPECT_TRUE(HasSpan(file_.enum_type(0), "name"));
-  EXPECT_TRUE(HasSpan(file_.enum_type(0).options().uninterpreted_option(0)));
-  EXPECT_TRUE(
-      HasSpan(file_.enum_type(0).options().uninterpreted_option(0), "name"));
-  EXPECT_TRUE(
-      HasSpan(file_.enum_type(0).options().uninterpreted_option(0).name(0)));
-  EXPECT_TRUE(
-      HasSpan(file_.enum_type(0).options().uninterpreted_option(0).name(0),
-              "name_part"));
-  EXPECT_TRUE(HasSpan(file_.enum_type(0).options().uninterpreted_option(0),
-                      "positive_int_value"));
-  EXPECT_TRUE(HasSpan(file_.service(0)));
-  EXPECT_TRUE(HasSpan(file_.service(0), "name"));
-  EXPECT_TRUE(HasSpan(file_.service(0).method(0)));
-  EXPECT_TRUE(HasSpan(file_.service(0).options().uninterpreted_option(0)));
-  EXPECT_TRUE(
-      HasSpan(file_.service(0).options().uninterpreted_option(0), "name"));
-  EXPECT_TRUE(
-      HasSpan(file_.service(0).options().uninterpreted_option(0).name(0)));
-  EXPECT_TRUE(HasSpan(
-      file_.service(0).options().uninterpreted_option(0).name(0), "name_part"));
-  EXPECT_TRUE(HasSpan(file_.service(0).options().uninterpreted_option(0),
-                      "positive_int_value"));
-  EXPECT_TRUE(HasSpan(file_.service(0).method(0), "name"));
-  EXPECT_TRUE(HasSpan(file_.service(0).method(0), "input_type"));
-  EXPECT_TRUE(HasSpan(file_.service(0).method(0), "output_type"));
-  EXPECT_TRUE(
-      HasSpan(file_.service(0).method(0).options().uninterpreted_option(0)));
-  EXPECT_TRUE(HasSpan(
-      file_.service(0).method(0).options().uninterpreted_option(0), "name"));
-  EXPECT_TRUE(HasSpan(
-      file_.service(0).method(0).options().uninterpreted_option(0).name(0)));
-  EXPECT_TRUE(HasSpan(
-      file_.service(0).method(0).options().uninterpreted_option(0).name(0),
-      "name_part"));
-  EXPECT_TRUE(
-      HasSpan(file_.service(0).method(0).options().uninterpreted_option(0),
-              "positive_int_value"));
-
-  EXPECT_TRUE(HasSpan('k', 'l', file_.service(0).method(1).options()));
-  EXPECT_TRUE(HasSpan(file_.service(0).method(1)));
-  EXPECT_TRUE(HasSpan(file_.service(0).method(1), "name"));
-  EXPECT_TRUE(HasSpan(file_.service(0).method(1), "input_type"));
-  EXPECT_TRUE(HasSpan(file_.service(0).method(1), "output_type"));
-  EXPECT_TRUE(
-      HasSpan(file_.service(0).method(1).options().uninterpreted_option(0)));
-  EXPECT_TRUE(HasSpan(
-      file_.service(0).method(1).options().uninterpreted_option(0), "name"));
-  EXPECT_TRUE(HasSpan(
-      file_.service(0).method(1).options().uninterpreted_option(0).name(0)));
-  EXPECT_TRUE(HasSpan(
-      file_.service(0).method(1).options().uninterpreted_option(0).name(0),
-      "name_part"));
-  EXPECT_TRUE(
-      HasSpan(file_.service(0).method(1).options().uninterpreted_option(0),
-              "positive_int_value"));
-  EXPECT_TRUE(
-      HasSpan('1', '2', file_.service(0).method(1), "client_streaming"));
-  EXPECT_TRUE(
-      HasSpan('3', '4', file_.service(0).method(1), "server_streaming"));
-}
-
-TEST_F(SourceInfoTest, FieldOptions) {
-  // The actual "name = value" pairs are parsed by the same code as for
-  // top-level options so we won't re-test that -- just make sure that the
-  // syntax used for field options is understood.
-  EXPECT_TRUE(
-      Parse("message Foo {"
-            "  optional int32 bar = 1 "
-            "$a$[default=$b$123$c$,$d$opt1=123$e$,"
-            "$f$opt2='hi'$g$]$h$;"
-            "}\n"));
-
-  const FieldDescriptorProto& field = file_.message_type(0).field(0);
-  const UninterpretedOption& option1 = field.options().uninterpreted_option(0);
-  const UninterpretedOption& option2 = field.options().uninterpreted_option(1);
-
-  EXPECT_TRUE(HasSpan('a', 'h', field.options()));
-  EXPECT_TRUE(HasSpan('b', 'c', field, "default_value"));
-  EXPECT_TRUE(HasSpan('d', 'e', option1));
-  EXPECT_TRUE(HasSpan('f', 'g', option2));
-
-  // Ignore these.
-  EXPECT_TRUE(HasSpan(file_));
-  EXPECT_TRUE(HasSpan(file_.message_type(0)));
-  EXPECT_TRUE(HasSpan(file_.message_type(0), "name"));
-  EXPECT_TRUE(HasSpan(field));
-  EXPECT_TRUE(HasSpan(field, "label"));
-  EXPECT_TRUE(HasSpan(field, "type"));
-  EXPECT_TRUE(HasSpan(field, "name"));
-  EXPECT_TRUE(HasSpan(field, "number"));
-  EXPECT_TRUE(HasSpan(option1, "name"));
-  EXPECT_TRUE(HasSpan(option2, "name"));
-  EXPECT_TRUE(HasSpan(option1.name(0)));
-  EXPECT_TRUE(HasSpan(option2.name(0)));
-  EXPECT_TRUE(HasSpan(option1.name(0), "name_part"));
-  EXPECT_TRUE(HasSpan(option2.name(0), "name_part"));
-  EXPECT_TRUE(HasSpan(option1, "positive_int_value"));
-  EXPECT_TRUE(HasSpan(option2, "string_value"));
-}
-
-TEST_F(SourceInfoTest, EnumValueOptions) {
-  // The actual "name = value" pairs are parsed by the same code as for
-  // top-level options so we won't re-test that -- just make sure that the
-  // syntax used for enum options is understood.
-  EXPECT_TRUE(
-      Parse("enum Foo {"
-            "  BAR = 1 $a$[$b$opt1=123$c$,$d$opt2='hi'$e$]$f$;"
-            "}\n"));
-
-  const EnumValueDescriptorProto& value = file_.enum_type(0).value(0);
-  const UninterpretedOption& option1 = value.options().uninterpreted_option(0);
-  const UninterpretedOption& option2 = value.options().uninterpreted_option(1);
-
-  EXPECT_TRUE(HasSpan('a', 'f', value.options()));
-  EXPECT_TRUE(HasSpan('b', 'c', option1));
-  EXPECT_TRUE(HasSpan('d', 'e', option2));
-
-  // Ignore these.
-  EXPECT_TRUE(HasSpan(file_));
-  EXPECT_TRUE(HasSpan(file_.enum_type(0)));
-  EXPECT_TRUE(HasSpan(file_.enum_type(0), "name"));
-  EXPECT_TRUE(HasSpan(value));
-  EXPECT_TRUE(HasSpan(value, "name"));
-  EXPECT_TRUE(HasSpan(value, "number"));
-  EXPECT_TRUE(HasSpan(option1, "name"));
-  EXPECT_TRUE(HasSpan(option2, "name"));
-  EXPECT_TRUE(HasSpan(option1.name(0)));
-  EXPECT_TRUE(HasSpan(option2.name(0)));
-  EXPECT_TRUE(HasSpan(option1.name(0), "name_part"));
-  EXPECT_TRUE(HasSpan(option2.name(0), "name_part"));
-  EXPECT_TRUE(HasSpan(option1, "positive_int_value"));
-  EXPECT_TRUE(HasSpan(option2, "string_value"));
-}
-
-TEST_F(SourceInfoTest, DocComments) {
-  EXPECT_TRUE(
-      Parse("// Foo leading\n"
-            "// line 2\n"
-            "$a$message Foo {\n"
-            "  // Foo trailing\n"
-            "  // line 2\n"
-            "\n"
-            "  // detached\n"
-            "\n"
-            "  // bar leading\n"
-            "  $b$optional int32 bar = 1;$c$\n"
-            "  // bar trailing\n"
-            "}$d$\n"
-            "// ignored\n"));
-
-  const DescriptorProto& foo = file_.message_type(0);
-  const FieldDescriptorProto& bar = foo.field(0);
-
-  EXPECT_TRUE(HasSpanWithComment('a', 'd', foo, " Foo leading\n line 2\n",
-                                 " Foo trailing\n line 2\n", nullptr));
-  EXPECT_TRUE(HasSpanWithComment('b', 'c', bar, " bar leading\n",
-                                 " bar trailing\n", " detached\n"));
-
-  // Ignore these.
-  EXPECT_TRUE(HasSpan(file_));
-  EXPECT_TRUE(HasSpan(foo, "name"));
-  EXPECT_TRUE(HasSpan(bar, "label"));
-  EXPECT_TRUE(HasSpan(bar, "type"));
-  EXPECT_TRUE(HasSpan(bar, "name"));
-  EXPECT_TRUE(HasSpan(bar, "number"));
-}
-
-TEST_F(SourceInfoTest, DocComments2) {
-  EXPECT_TRUE(
-      Parse("// detached before message.\n"
-            "\n"
-            "// Foo leading\n"
-            "// line 2\n"
-            "$a$message Foo {\n"
-            "  /* Foo trailing\n"
-            "   * line 2 */\n"
-            "  // detached\n"
-            "  /* bar leading\n"
-            "   */"
-            "  $b$optional int32 bar = 1;$c$  // bar trailing\n"
-            "  // ignored detached\n"
-            "}$d$\n"
-            "// ignored\n"
-            "\n"
-            "// detached before option\n"
-            "\n"
-            "// option leading\n"
-            "$e$option baz = 123;$f$\n"
-            "// option trailing\n"));
-
-  const DescriptorProto& foo = file_.message_type(0);
-  const FieldDescriptorProto& bar = foo.field(0);
-  const UninterpretedOption& baz = file_.options().uninterpreted_option(0);
-
-  EXPECT_TRUE(HasSpanWithComment('a', 'd', foo, " Foo leading\n line 2\n",
-                                 " Foo trailing\n line 2 ",
-                                 " detached before message.\n"));
-  EXPECT_TRUE(HasSpanWithComment('b', 'c', bar, " bar leading\n",
-                                 " bar trailing\n", " detached\n"));
-  EXPECT_TRUE(HasSpanWithComment('e', 'f', baz, " option leading\n",
-                                 " option trailing\n",
-                                 " detached before option\n"));
-
-  // Ignore these.
-  EXPECT_TRUE(HasSpan(file_));
-  EXPECT_TRUE(HasSpan(foo, "name"));
-  EXPECT_TRUE(HasSpan(bar, "label"));
-  EXPECT_TRUE(HasSpan(bar, "type"));
-  EXPECT_TRUE(HasSpan(bar, "name"));
-  EXPECT_TRUE(HasSpan(bar, "number"));
-  EXPECT_TRUE(HasSpan(file_.options()));
-  EXPECT_TRUE(HasSpan(baz, "name"));
-  EXPECT_TRUE(HasSpan(baz.name(0)));
-  EXPECT_TRUE(HasSpan(baz.name(0), "name_part"));
-  EXPECT_TRUE(HasSpan(baz, "positive_int_value"));
-}
-
-TEST_F(SourceInfoTest, DocComments3) {
-  EXPECT_TRUE(
-      Parse("$a$message Foo {\n"
-            "  // bar leading\n"
-            "  $b$optional int32 bar = 1 [(baz.qux) = {}];$c$\n"
-            "  // bar trailing\n"
-            "}$d$\n"
-            "// ignored\n"));
-
-  const DescriptorProto& foo = file_.message_type(0);
-  const FieldDescriptorProto& bar = foo.field(0);
-
-  EXPECT_TRUE(HasSpanWithComment('b', 'c', bar, " bar leading\n",
-                                 " bar trailing\n", nullptr));
-
-  // Ignore these.
-  EXPECT_TRUE(HasSpan(file_));
-  EXPECT_TRUE(HasSpan(foo));
-  EXPECT_TRUE(HasSpan(foo, "name"));
-  EXPECT_TRUE(HasSpan(bar, "label"));
-  EXPECT_TRUE(HasSpan(bar, "type"));
-  EXPECT_TRUE(HasSpan(bar, "name"));
-  EXPECT_TRUE(HasSpan(bar, "number"));
-  EXPECT_TRUE(HasSpan(bar.options()));
-  EXPECT_TRUE(HasSpan(bar.options().uninterpreted_option(0)));
-  EXPECT_TRUE(HasSpan(bar.options().uninterpreted_option(0), "name"));
-  EXPECT_TRUE(HasSpan(bar.options().uninterpreted_option(0).name(0)));
-  EXPECT_TRUE(
-      HasSpan(bar.options().uninterpreted_option(0).name(0), "name_part"));
-  EXPECT_TRUE(
-      HasSpan(bar.options().uninterpreted_option(0), "aggregate_value"));
-}
-
-TEST_F(SourceInfoTest, DocCommentsTopLevel) {
-  EXPECT_TRUE(
-      Parse("// detached before syntax paragraph 1\n"
-            "\n"
-            "// detached before syntax paragraph 2\n"
-            "\n"
-            "// syntax leading\n"
-            "$a$syntax = \"proto2\";$b$\n"
-            "// syntax trailing\n"
-            "\n"
-            "// syntax-package detached comments\n"
-            "\n"
-            ";\n"
-            "\n"
-            "// detached after empty before package\n"
-            "\n"
-            "// package leading\n"
-            "$c$package foo;$d$\n"
-            "// package trailing\n"
-            "\n"
-            "// ignored detach\n"
-            "\n"));
-
-  EXPECT_TRUE(HasSpan('a', 'b', file_, "syntax", -1, " syntax leading\n",
-                      " syntax trailing\n",
-                      " detached before syntax paragraph 1\n"
-                      "\n"
-                      " detached before syntax paragraph 2\n"));
-  EXPECT_TRUE(HasSpan('c', 'd', file_, "package", -1, " package leading\n",
-                      " package trailing\n",
-                      " syntax-package detached comments\n"
-                      "\n"
-                      " detached after empty before package\n"));
-
-  // ignore these.
-  EXPECT_TRUE(HasSpan(file_));
-}
-
-TEST_F(SourceInfoTest, DocCommentsOneof) {
-  EXPECT_TRUE(
-      Parse("// Foo leading\n"
-            "$a$message Foo {\n"
-            "  /* Foo trailing\n"
-            "   */\n"
-            "  // detached before oneof\n"
-            "  /* bar leading\n"
-            "   * line 2 */\n"
-            "  $b$oneof bar {\n"
-            "  /* bar trailing\n"
-            "   * line 2 */\n"
-            "  // detached before bar_int\n"
-            "  /* bar_int leading\n"
-            "   */\n"
-            "  $c$int32 bar_int = 1;$d$  // bar_int trailing\n"
-            "  // detach comment ignored\n"
-            "  }$e$\n"
-            "}$f$\n"));
-
-  const DescriptorProto& foo = file_.message_type(0);
-  const OneofDescriptorProto& bar = foo.oneof_decl(0);
-  const FieldDescriptorProto& bar_int = foo.field(0);
-
-  EXPECT_TRUE(HasSpanWithComment('a', 'f', foo, " Foo leading\n",
-                                 " Foo trailing\n", nullptr));
-  EXPECT_TRUE(HasSpanWithComment('b', 'e', bar, " bar leading\n line 2 ",
-                                 " bar trailing\n line 2 ",
-                                 " detached before oneof\n"));
-  EXPECT_TRUE(HasSpanWithComment('c', 'd', bar_int, " bar_int leading\n",
-                                 " bar_int trailing\n",
-                                 " detached before bar_int\n"));
-
-  // Ignore these.
-  EXPECT_TRUE(HasSpan(file_));
-  EXPECT_TRUE(HasSpan(foo, "name"));
-  EXPECT_TRUE(HasSpan(bar, "name"));
-  EXPECT_TRUE(HasSpan(bar_int, "type"));
-  EXPECT_TRUE(HasSpan(bar_int, "name"));
-  EXPECT_TRUE(HasSpan(bar_int, "number"));
-}
-
-// ===================================================================
-
-}  // anonymous namespace
-
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/compiler/php/php_generator.cc b/libs/protobuf/src/google/protobuf/compiler/php/php_generator.cc
deleted file mode 100644
index f3aa92f..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/php/php_generator.cc
+++ /dev/null
@@ -1,2426 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <google/protobuf/compiler/php/php_generator.h>
-
-#include <google/protobuf/compiler/code_generator.h>
-#include <google/protobuf/compiler/plugin.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/descriptor.pb.h>
-#include <google/protobuf/io/printer.h>
-#include <google/protobuf/io/zero_copy_stream.h>
-#include <google/protobuf/stubs/strutil.h>
-
-#include <sstream>
-
-const std::string kDescriptorFile = "google/protobuf/descriptor.proto";
-const std::string kEmptyFile = "google/protobuf/empty.proto";
-const std::string kEmptyMetadataFile = "GPBMetadata/Google/Protobuf/GPBEmpty.php";
-const std::string kDescriptorMetadataFile =
-    "GPBMetadata/Google/Protobuf/Internal/Descriptor.php";
-const std::string kDescriptorDirName = "Google/Protobuf/Internal";
-const std::string kDescriptorPackageName = "Google\\Protobuf\\Internal";
-const char* const kReservedNames[] = {
-    "abstract",     "and",        "array",        "as",         "break",
-    "callable",     "case",       "catch",        "class",      "clone",
-    "const",        "continue",   "declare",      "default",    "die",
-    "do",           "echo",       "else",         "elseif",     "empty",
-    "enddeclare",   "endfor",     "endforeach",   "endif",      "endswitch",
-    "endwhile",     "eval",       "exit",         "extends",    "final",
-    "finally",      "fn",         "for",          "foreach",    "function",
-    "global",       "goto",       "if",           "implements", "include",
-    "include_once", "instanceof", "insteadof",    "interface",  "isset",
-    "list",         "match",      "namespace",    "new",        "or",
-    "parent",       "print",      "private",      "protected",  "public",
-    "readonly",     "require",    "require_once", "return",     "self",
-    "static",       "switch",     "throw",        "trait",      "try",
-    "unset",        "use",        "var",          "while",      "xor",
-    "yield",        "int",        "float",        "bool",       "string",
-    "true",         "false",      "null",         "void",       "iterable"};
-const char* const kValidConstantNames[] = {
-    "int",   "float", "bool", "string",   "true",
-    "false", "null",  "void", "iterable", "parent",
-    "self", "readonly"
-};
-const int kReservedNamesSize = 80;
-const int kValidConstantNamesSize = 12;
-const int kFieldSetter = 1;
-const int kFieldGetter = 2;
-const int kFieldProperty = 3;
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace php {
-
-struct Options {
-  bool is_descriptor = false;
-  bool aggregate_metadata = false;
-  bool gen_c_wkt = false;
-  std::set<std::string> aggregate_metadata_prefixes;
-};
-
-namespace {
-
-// Forward decls.
-std::string PhpName(const std::string& full_name, const Options& options);
-std::string IntToString(int32_t value);
-std::string FilenameToClassname(const std::string& filename);
-std::string GeneratedMetadataFileName(const FileDescriptor* file,
-                                      const Options& options);
-std::string UnderscoresToCamelCase(const std::string& name,
-                                   bool cap_first_letter);
-void Indent(io::Printer* printer);
-void Outdent(io::Printer* printer);
-void GenerateAddFilesToPool(const FileDescriptor* file, const Options& options,
-                            io::Printer* printer);
-void GenerateMessageDocComment(io::Printer* printer, const Descriptor* message,
-                               const Options& options);
-void GenerateMessageConstructorDocComment(io::Printer* printer,
-                                          const Descriptor* message,
-                                          const Options& options);
-void GenerateFieldDocComment(io::Printer* printer, const FieldDescriptor* field,
-                             const Options& options, int function_type);
-void GenerateWrapperFieldGetterDocComment(io::Printer* printer,
-                                          const FieldDescriptor* field);
-void GenerateWrapperFieldSetterDocComment(io::Printer* printer,
-                                          const FieldDescriptor* field);
-void GenerateEnumDocComment(io::Printer* printer, const EnumDescriptor* enum_,
-                            const Options& options);
-void GenerateEnumValueDocComment(io::Printer* printer,
-                                 const EnumValueDescriptor* value);
-void GenerateServiceDocComment(io::Printer* printer,
-                               const ServiceDescriptor* service);
-void GenerateServiceMethodDocComment(io::Printer* printer,
-                              const MethodDescriptor* method);
-
-std::string ReservedNamePrefix(const std::string& classname,
-                                const FileDescriptor* file) {
-  bool is_reserved = false;
-
-  std::string lower = classname;
-  std::transform(lower.begin(), lower.end(), lower.begin(), ::tolower);
-
-  for (int i = 0; i < kReservedNamesSize; i++) {
-    if (lower == kReservedNames[i]) {
-      is_reserved = true;
-      break;
-    }
-  }
-
-  if (is_reserved) {
-    if (file->package() == "google.protobuf") {
-      return "GPB";
-    } else {
-      return "PB";
-    }
-  }
-
-  return "";
-}
-
-template <typename DescriptorType>
-std::string DescriptorFullName(const DescriptorType* desc, bool is_internal) {
-  if (is_internal) {
-    return StringReplace(desc->full_name(),
-                         "google.protobuf",
-                         "google.protobuf.internal", false);
-  } else {
-    return desc->full_name();
-  }
-}
-
-template <typename DescriptorType>
-std::string ClassNamePrefix(const std::string& classname,
-                            const DescriptorType* desc) {
-  const std::string& prefix = (desc->file()->options()).php_class_prefix();
-  if (!prefix.empty()) {
-    return prefix;
-  }
-
-  return ReservedNamePrefix(classname, desc->file());
-}
-
-template <typename DescriptorType>
-std::string GeneratedClassNameImpl(const DescriptorType* desc) {
-  std::string classname = ClassNamePrefix(desc->name(), desc) + desc->name();
-  const Descriptor* containing = desc->containing_type();
-  while (containing != NULL) {
-    classname = ClassNamePrefix(containing->name(), desc) + containing->name()
-       + '\\' + classname;
-    containing = containing->containing_type();
-  }
-  return classname;
-}
-
-std::string GeneratedClassNameImpl(const ServiceDescriptor* desc) {
-  std::string classname = desc->name();
-  return ClassNamePrefix(classname, desc) + classname;
-}
-
-template <typename DescriptorType>
-std::string LegacyGeneratedClassName(const DescriptorType* desc) {
-  std::string classname = desc->name();
-  const Descriptor* containing = desc->containing_type();
-  while (containing != NULL) {
-    classname = containing->name() + '_' + classname;
-    containing = containing->containing_type();
-  }
-  return ClassNamePrefix(classname, desc) + classname;
-}
-
-std::string ClassNamePrefix(const std::string& classname) {
-  std::string lower = classname;
-  std::transform(lower.begin(), lower.end(), lower.begin(), ::tolower);
-
-  for (int i = 0; i < kReservedNamesSize; i++) {
-    if (lower == kReservedNames[i]) {
-      return "PB";
-    }
-  }
-
-  return "";
-}
-
-std::string ConstantNamePrefix(const std::string& classname) {
-  bool is_reserved = false;
-
-  std::string lower = classname;
-  std::transform(lower.begin(), lower.end(), lower.begin(), ::tolower);
-
-  for (int i = 0; i < kReservedNamesSize; i++) {
-    if (lower == kReservedNames[i]) {
-      is_reserved = true;
-      break;
-    }
-  }
-
-  for (int i = 0; i < kValidConstantNamesSize; i++) {
-    if (lower == kValidConstantNames[i]) {
-      is_reserved = false;
-      break;
-    }
-  }
-
-  if (is_reserved) {
-    return "PB";
-  }
-
-  return "";
-}
-
-template <typename DescriptorType>
-std::string RootPhpNamespace(const DescriptorType* desc,
-                             const Options& options) {
-  if (desc->file()->options().has_php_namespace()) {
-    const std::string& php_namespace = desc->file()->options().php_namespace();
-    if (!php_namespace.empty()) {
-      return php_namespace;
-    }
-    return "";
-  }
-
-  if (!desc->file()->package().empty()) {
-    return PhpName(desc->file()->package(), options);
-  }
-  return "";
-}
-
-template <typename DescriptorType>
-std::string FullClassName(const DescriptorType* desc, const Options& options) {
-  std::string classname = GeneratedClassNameImpl(desc);
-  std::string php_namespace = RootPhpNamespace(desc, options);
-  if (!php_namespace.empty()) {
-    return php_namespace + "\\" + classname;
-  }
-  return classname;
-}
-
-template <typename DescriptorType>
-std::string FullClassName(const DescriptorType* desc, bool is_descriptor) {
-  Options options;
-  options.is_descriptor = is_descriptor;
-  return FullClassName(desc, options);
-}
-
-template <typename DescriptorType>
-std::string LegacyFullClassName(const DescriptorType* desc,
-                                const Options& options) {
-  std::string classname = LegacyGeneratedClassName(desc);
-  std::string php_namespace = RootPhpNamespace(desc, options);
-  if (!php_namespace.empty()) {
-    return php_namespace + "\\" + classname;
-  }
-  return classname;
-}
-
-std::string PhpName(const std::string& full_name, const Options& options) {
-  if (options.is_descriptor) {
-    return kDescriptorPackageName;
-  }
-
-  std::string segment;
-  std::string result;
-  bool cap_next_letter = true;
-  for (int i = 0; i < full_name.size(); i++) {
-    if ('a' <= full_name[i] && full_name[i] <= 'z' && cap_next_letter) {
-      segment += full_name[i] + ('A' - 'a');
-      cap_next_letter = false;
-    } else if (full_name[i] == '.') {
-      result += ClassNamePrefix(segment) + segment + '\\';
-      segment = "";
-      cap_next_letter = true;
-    } else {
-      segment += full_name[i];
-      cap_next_letter = false;
-    }
-  }
-  result += ClassNamePrefix(segment) + segment;
-  return result;
-}
-
-std::string DefaultForField(const FieldDescriptor* field) {
-  switch (field->type()) {
-    case FieldDescriptor::TYPE_INT32:
-    case FieldDescriptor::TYPE_INT64:
-    case FieldDescriptor::TYPE_UINT32:
-    case FieldDescriptor::TYPE_UINT64:
-    case FieldDescriptor::TYPE_SINT32:
-    case FieldDescriptor::TYPE_SINT64:
-    case FieldDescriptor::TYPE_FIXED32:
-    case FieldDescriptor::TYPE_FIXED64:
-    case FieldDescriptor::TYPE_SFIXED32:
-    case FieldDescriptor::TYPE_SFIXED64:
-    case FieldDescriptor::TYPE_ENUM: return "0";
-    case FieldDescriptor::TYPE_DOUBLE:
-    case FieldDescriptor::TYPE_FLOAT: return "0.0";
-    case FieldDescriptor::TYPE_BOOL: return "false";
-    case FieldDescriptor::TYPE_STRING:
-    case FieldDescriptor::TYPE_BYTES: return "''";
-    case FieldDescriptor::TYPE_MESSAGE:
-    case FieldDescriptor::TYPE_GROUP: return "null";
-    default: assert(false); return "";
-  }
-}
-
-std::string GeneratedMetadataFileName(const FileDescriptor* file,
-                                      const Options& options) {
-  const std::string& proto_file = file->name();
-  int start_index = 0;
-  int first_index = proto_file.find_first_of("/", start_index);
-  std::string result = "";
-  std::string segment = "";
-
-  if (proto_file == kEmptyFile) {
-    return kEmptyMetadataFile;
-  }
-  if (options.is_descriptor) {
-    return kDescriptorMetadataFile;
-  }
-
-  // Append directory name.
-  std::string file_no_suffix;
-  int lastindex = proto_file.find_last_of(".");
-  if (proto_file == kEmptyFile) {
-    return kEmptyMetadataFile;
-  } else {
-    file_no_suffix = proto_file.substr(0, lastindex);
-  }
-
-  if (file->options().has_php_metadata_namespace()) {
-    const std::string& php_metadata_namespace =
-        file->options().php_metadata_namespace();
-    if (!php_metadata_namespace.empty() && php_metadata_namespace != "\\") {
-      result += php_metadata_namespace;
-      std::replace(result.begin(), result.end(), '\\', '/');
-      if (result.at(result.size() - 1) != '/') {
-        result += "/";
-      }
-    }
-  } else {
-    result += "GPBMetadata/";
-    while (first_index != std::string::npos) {
-      segment = UnderscoresToCamelCase(
-          file_no_suffix.substr(start_index, first_index - start_index), true);
-      result += ReservedNamePrefix(segment, file) + segment + "/";
-      start_index = first_index + 1;
-      first_index = file_no_suffix.find_first_of("/", start_index);
-    }
-  }
-
-  // Append file name.
-  int file_name_start = file_no_suffix.find_last_of("/");
-  if (file_name_start == std::string::npos) {
-    file_name_start = 0;
-  } else {
-    file_name_start += 1;
-  }
-  segment = UnderscoresToCamelCase(
-      file_no_suffix.substr(file_name_start, first_index - file_name_start), true);
-
-  return result + ReservedNamePrefix(segment, file) + segment + ".php";
-}
-
-std::string GeneratedMetadataFileName(const FileDescriptor* file,
-                                      bool is_descriptor) {
-  Options options;
-  options.is_descriptor = is_descriptor;
-  return GeneratedMetadataFileName(file, options);
-}
-
-template <typename DescriptorType>
-std::string GeneratedClassFileName(const DescriptorType* desc,
-                                   const Options& options) {
-  std::string result = FullClassName(desc, options);
-  for (int i = 0; i < result.size(); i++) {
-    if (result[i] == '\\') {
-      result[i] = '/';
-    }
-  }
-  return result + ".php";
-}
-
-template <typename DescriptorType>
-std::string LegacyGeneratedClassFileName(const DescriptorType* desc,
-                                         const Options& options) {
-  std::string result = LegacyFullClassName(desc, options);
-
-  for (int i = 0; i < result.size(); i++) {
-    if (result[i] == '\\') {
-      result[i] = '/';
-    }
-  }
-  return result + ".php";
-}
-
-template <typename DescriptorType>
-std::string LegacyReadOnlyGeneratedClassFileName(std::string php_namespace,
-                                                 const DescriptorType* desc) {
-  if (!php_namespace.empty()) {
-    for (int i = 0; i < php_namespace.size(); i++) {
-      if (php_namespace[i] == '\\') {
-        php_namespace[i] = '/';
-      }
-    }
-    return php_namespace + "/" + desc->name() + ".php";
-  }
-
-  return desc->name() + ".php";
-}
-
-std::string GeneratedServiceFileName(const ServiceDescriptor* service,
-                                     const Options& options) {
-  std::string result = FullClassName(service, options) + "Interface";
-  for (int i = 0; i < result.size(); i++) {
-    if (result[i] == '\\') {
-      result[i] = '/';
-    }
-  }
-  return result + ".php";
-}
-
-std::string IntToString(int32_t value) {
-  std::ostringstream os;
-  os << value;
-  return os.str();
-}
-
-std::string LabelForField(const FieldDescriptor* field) {
-  switch (field->label()) {
-    case FieldDescriptor::LABEL_OPTIONAL: return "optional";
-    case FieldDescriptor::LABEL_REQUIRED: return "required";
-    case FieldDescriptor::LABEL_REPEATED: return "repeated";
-    default: assert(false); return "";
-  }
-}
-
-std::string PhpSetterTypeName(const FieldDescriptor* field,
-                              const Options& options) {
-  if (field->is_map()) {
-    return "array|\\Google\\Protobuf\\Internal\\MapField";
-  }
-  std::string type;
-  switch (field->type()) {
-    case FieldDescriptor::TYPE_INT32:
-    case FieldDescriptor::TYPE_UINT32:
-    case FieldDescriptor::TYPE_SINT32:
-    case FieldDescriptor::TYPE_FIXED32:
-    case FieldDescriptor::TYPE_SFIXED32:
-    case FieldDescriptor::TYPE_ENUM:
-      type = "int";
-      break;
-    case FieldDescriptor::TYPE_INT64:
-    case FieldDescriptor::TYPE_UINT64:
-    case FieldDescriptor::TYPE_SINT64:
-    case FieldDescriptor::TYPE_FIXED64:
-    case FieldDescriptor::TYPE_SFIXED64:
-      type = "int|string";
-      break;
-    case FieldDescriptor::TYPE_DOUBLE:
-    case FieldDescriptor::TYPE_FLOAT:
-      type = "float";
-      break;
-    case FieldDescriptor::TYPE_BOOL:
-      type = "bool";
-      break;
-    case FieldDescriptor::TYPE_STRING:
-    case FieldDescriptor::TYPE_BYTES:
-      type = "string";
-      break;
-    case FieldDescriptor::TYPE_MESSAGE:
-      type = "\\" + FullClassName(field->message_type(), options);
-      break;
-    case FieldDescriptor::TYPE_GROUP:
-      return "null";
-    default: assert(false); return "";
-  }
-  if (field->is_repeated()) {
-    // accommodate for edge case with multiple types.
-    size_t start_pos = type.find("|");
-    if (start_pos != std::string::npos) {
-      type.replace(start_pos, 1, ">|array<");
-    }
-    type = "array<" + type + ">|\\Google\\Protobuf\\Internal\\RepeatedField";
-  }
-  return type;
-}
-
-std::string PhpSetterTypeName(const FieldDescriptor* field,
-                              bool is_descriptor) {
-  Options options;
-  options.is_descriptor = is_descriptor;
-  return PhpSetterTypeName(field, options);
-}
-
-std::string PhpGetterTypeName(const FieldDescriptor* field,
-                              const Options& options) {
-  if (field->is_map()) {
-    return "\\Google\\Protobuf\\Internal\\MapField";
-  }
-  if (field->is_repeated()) {
-    return "\\Google\\Protobuf\\Internal\\RepeatedField";
-  }
-  switch (field->type()) {
-    case FieldDescriptor::TYPE_INT32:
-    case FieldDescriptor::TYPE_UINT32:
-    case FieldDescriptor::TYPE_SINT32:
-    case FieldDescriptor::TYPE_FIXED32:
-    case FieldDescriptor::TYPE_SFIXED32:
-    case FieldDescriptor::TYPE_ENUM: return "int";
-    case FieldDescriptor::TYPE_INT64:
-    case FieldDescriptor::TYPE_UINT64:
-    case FieldDescriptor::TYPE_SINT64:
-    case FieldDescriptor::TYPE_FIXED64:
-    case FieldDescriptor::TYPE_SFIXED64: return "int|string";
-    case FieldDescriptor::TYPE_DOUBLE:
-    case FieldDescriptor::TYPE_FLOAT: return "float";
-    case FieldDescriptor::TYPE_BOOL: return "bool";
-    case FieldDescriptor::TYPE_STRING:
-    case FieldDescriptor::TYPE_BYTES: return "string";
-    case FieldDescriptor::TYPE_MESSAGE:
-      return "\\" + FullClassName(field->message_type(), options);
-    case FieldDescriptor::TYPE_GROUP: return "null";
-    default: assert(false); return "";
-  }
-}
-
-std::string PhpGetterTypeName(const FieldDescriptor* field,
-                              bool is_descriptor) {
-  Options options;
-  options.is_descriptor = is_descriptor;
-  return PhpGetterTypeName(field, options);
-}
-
-std::string EnumOrMessageSuffix(const FieldDescriptor* field,
-                                const Options& options) {
-  if (field->cpp_type() == FieldDescriptor::CPPTYPE_MESSAGE) {
-    return ", '" +
-           DescriptorFullName(field->message_type(), options.is_descriptor) +
-           "'";
-  }
-  if (field->cpp_type() == FieldDescriptor::CPPTYPE_ENUM) {
-    return ", '" +
-           DescriptorFullName(field->enum_type(), options.is_descriptor) + "'";
-  }
-  return "";
-}
-
-std::string EnumOrMessageSuffix(const FieldDescriptor* field,
-                                bool is_descriptor) {
-  Options options;
-  options.is_descriptor = is_descriptor;
-  return EnumOrMessageSuffix(field, options);
-}
-
-// Converts a name to camel-case. If cap_first_letter is true, capitalize the
-// first letter.
-std::string UnderscoresToCamelCase(const std::string& name,
-                                   bool cap_first_letter) {
-  std::string result;
-  for (int i = 0; i < name.size(); i++) {
-    if ('a' <= name[i] && name[i] <= 'z') {
-      if (cap_first_letter) {
-        result += name[i] + ('A' - 'a');
-      } else {
-        result += name[i];
-      }
-      cap_first_letter = false;
-    } else if ('A' <= name[i] && name[i] <= 'Z') {
-      if (i == 0 && !cap_first_letter) {
-        // Force first letter to lower-case unless explicitly told to
-        // capitalize it.
-        result += name[i] + ('a' - 'A');
-      } else {
-        // Capital letters after the first are left as-is.
-        result += name[i];
-      }
-      cap_first_letter = false;
-    } else if ('0' <= name[i] && name[i] <= '9') {
-      result += name[i];
-      cap_first_letter = true;
-    } else {
-      cap_first_letter = true;
-    }
-  }
-  // Add a trailing "_" if the name should be altered.
-  if (name[name.size() - 1] == '#') {
-    result += '_';
-  }
-  return result;
-}
-
-void Indent(io::Printer* printer) {
-  printer->Indent();
-  printer->Indent();
-}
-void Outdent(io::Printer* printer) {
-  printer->Outdent();
-  printer->Outdent();
-}
-
-void GenerateField(const FieldDescriptor* field, io::Printer* printer,
-                   const Options& options) {
-  if (field->is_repeated()) {
-    GenerateFieldDocComment(printer, field, options, kFieldProperty);
-    printer->Print(
-        "private $^name^;\n",
-        "name", field->name());
-  } else if (field->real_containing_oneof()) {
-    // Oneof fields are handled by GenerateOneofField.
-    return;
-  } else {
-    std::string initial_value =
-        field->has_presence() ? "null" : DefaultForField(field);
-    GenerateFieldDocComment(printer, field, options, kFieldProperty);
-    printer->Print(
-        "protected $^name^ = ^initial_value^;\n",
-        "name", field->name(),
-        "initial_value", initial_value);
-  }
-}
-
-void GenerateOneofField(const OneofDescriptor* oneof, io::Printer* printer) {
-  // Oneof property needs to be protected in order to be accessed by parent
-  // class in implementation.
-  printer->Print(
-      "protected $^name^;\n",
-      "name", oneof->name());
-}
-
-void GenerateFieldAccessor(const FieldDescriptor* field, const Options& options,
-                           io::Printer* printer) {
-  const OneofDescriptor* oneof = field->real_containing_oneof();
-
-  // Generate getter.
-  GenerateFieldDocComment(printer, field, options, kFieldGetter);
-
-  // deprecation
-  std::string deprecation_trigger = (field->options().deprecated()) ? "@trigger_error('" +
-      field->name() + " is deprecated.', E_USER_DEPRECATED);\n        " : "";
-
-  // Emit getter.
-  if (oneof != NULL) {
-    printer->Print(
-        "public function get^camel_name^()\n"
-        "{\n"
-        "    ^deprecation_trigger^return $this->readOneof(^number^);\n"
-        "}\n\n",
-        "camel_name", UnderscoresToCamelCase(field->name(), true),
-        "number", IntToString(field->number()),
-        "deprecation_trigger", deprecation_trigger);
-  } else if (field->has_presence() && !field->message_type()) {
-    printer->Print(
-        "public function get^camel_name^()\n"
-        "{\n"
-        "    ^deprecation_trigger^return isset($this->^name^) ? $this->^name^ : ^default_value^;\n"
-        "}\n\n",
-        "camel_name", UnderscoresToCamelCase(field->name(), true),
-        "name", field->name(),
-        "default_value", DefaultForField(field),
-        "deprecation_trigger", deprecation_trigger);
-  } else {
-    printer->Print(
-        "public function get^camel_name^()\n"
-        "{\n"
-        "    ^deprecation_trigger^return $this->^name^;\n"
-        "}\n\n",
-        "camel_name", UnderscoresToCamelCase(field->name(), true),
-        "name", field->name(),
-        "deprecation_trigger", deprecation_trigger);
-  }
-
-  // Emit hazzers/clear.
-  if (oneof) {
-    printer->Print(
-        "public function has^camel_name^()\n"
-        "{\n"
-        "    ^deprecation_trigger^return $this->hasOneof(^number^);\n"
-        "}\n\n",
-        "camel_name", UnderscoresToCamelCase(field->name(), true),
-        "number", IntToString(field->number()),
-        "deprecation_trigger", deprecation_trigger);
-  } else if (field->has_presence()) {
-    printer->Print(
-        "public function has^camel_name^()\n"
-        "{\n"
-        "    ^deprecation_trigger^return isset($this->^name^);\n"
-        "}\n\n"
-        "public function clear^camel_name^()\n"
-        "{\n"
-        "    ^deprecation_trigger^unset($this->^name^);\n"
-        "}\n\n",
-        "camel_name", UnderscoresToCamelCase(field->name(), true),
-        "name", field->name(),
-        "default_value", DefaultForField(field),
-        "deprecation_trigger", deprecation_trigger);
-  }
-
-  // For wrapper types, generate an additional getXXXUnwrapped getter
-  if (!field->is_map() &&
-      !field->is_repeated() &&
-      field->cpp_type() == FieldDescriptor::CPPTYPE_MESSAGE &&
-      IsWrapperType(field)) {
-    GenerateWrapperFieldGetterDocComment(printer, field);
-    printer->Print(
-        "public function get^camel_name^Unwrapped()\n"
-        "{\n"
-        "    ^deprecation_trigger^return $this->readWrapperValue(\"^field_name^\");\n"
-        "}\n\n",
-        "camel_name", UnderscoresToCamelCase(field->name(), true),
-        "field_name", field->name(),
-        "deprecation_trigger", deprecation_trigger);
-  }
-
-  // Generate setter.
-  GenerateFieldDocComment(printer, field, options, kFieldSetter);
-  printer->Print(
-      "public function set^camel_name^($var)\n"
-      "{\n",
-      "camel_name", UnderscoresToCamelCase(field->name(), true));
-
-  Indent(printer);
-
-  if (field->options().deprecated()) {
-      printer->Print(
-          "^deprecation_trigger^",
-          "deprecation_trigger", deprecation_trigger
-      );
-  }
-
-  // Type check.
-  if (field->is_map()) {
-    const Descriptor* map_entry = field->message_type();
-    const FieldDescriptor* key = map_entry->map_key();
-    const FieldDescriptor* value = map_entry->map_value();
-    printer->Print(
-        "$arr = GPBUtil::checkMapField($var, "
-        "\\Google\\Protobuf\\Internal\\GPBType::^key_type^, "
-        "\\Google\\Protobuf\\Internal\\GPBType::^value_type^",
-        "key_type", ToUpper(key->type_name()),
-        "value_type", ToUpper(value->type_name()));
-    if (value->cpp_type() == FieldDescriptor::CPPTYPE_MESSAGE) {
-      printer->Print(
-          ", \\^class_name^);\n",
-          "class_name",
-          FullClassName(value->message_type(), options) + "::class");
-    } else if (value->cpp_type() == FieldDescriptor::CPPTYPE_ENUM) {
-      printer->Print(
-          ", \\^class_name^);\n",
-          "class_name",
-          FullClassName(value->enum_type(), options) + "::class");
-    } else {
-      printer->Print(");\n");
-    }
-  } else if (field->is_repeated()) {
-    printer->Print(
-        "$arr = GPBUtil::checkRepeatedField($var, "
-        "\\Google\\Protobuf\\Internal\\GPBType::^type^",
-        "type", ToUpper(field->type_name()));
-    if (field->cpp_type() == FieldDescriptor::CPPTYPE_MESSAGE) {
-      printer->Print(
-          ", \\^class_name^);\n",
-          "class_name",
-          FullClassName(field->message_type(), options) + "::class");
-    } else if (field->cpp_type() == FieldDescriptor::CPPTYPE_ENUM) {
-      printer->Print(
-          ", \\^class_name^);\n",
-          "class_name",
-          FullClassName(field->enum_type(), options) + "::class");
-    } else {
-      printer->Print(");\n");
-    }
-  } else if (field->cpp_type() == FieldDescriptor::CPPTYPE_MESSAGE) {
-    printer->Print(
-        "GPBUtil::checkMessage($var, \\^class_name^::class);\n",
-        "class_name", FullClassName(field->message_type(), options));
-  } else if (field->cpp_type() == FieldDescriptor::CPPTYPE_ENUM) {
-    printer->Print(
-        "GPBUtil::checkEnum($var, \\^class_name^::class);\n",
-        "class_name", FullClassName(field->enum_type(), options));
-  } else if (field->cpp_type() == FieldDescriptor::CPPTYPE_STRING) {
-    printer->Print(
-        "GPBUtil::checkString($var, ^utf8^);\n",
-        "utf8",
-        field->type() == FieldDescriptor::TYPE_STRING ? "True": "False");
-  } else {
-    printer->Print(
-        "GPBUtil::check^type^($var);\n",
-        "type", UnderscoresToCamelCase(field->cpp_type_name(), true));
-  }
-
-  if (oneof != NULL) {
-    printer->Print(
-        "$this->writeOneof(^number^, $var);\n",
-        "number", IntToString(field->number()));
-  } else if (field->is_repeated()) {
-    printer->Print(
-        "$this->^name^ = $arr;\n",
-        "name", field->name());
-  } else {
-    printer->Print(
-        "$this->^name^ = $var;\n",
-        "name", field->name());
-  }
-
-  printer->Print("\nreturn $this;\n");
-
-  Outdent(printer);
-
-  printer->Print(
-      "}\n\n");
-
-  // For wrapper types, generate an additional setXXXValue getter
-  if (!field->is_map() &&
-      !field->is_repeated() &&
-      field->cpp_type() == FieldDescriptor::CPPTYPE_MESSAGE &&
-      IsWrapperType(field)) {
-    GenerateWrapperFieldSetterDocComment(printer, field);
-    printer->Print(
-        "public function set^camel_name^Unwrapped($var)\n"
-        "{\n"
-        "    $this->writeWrapperValue(\"^field_name^\", $var);\n"
-        "    return $this;"
-        "}\n\n",
-        "camel_name", UnderscoresToCamelCase(field->name(), true),
-        "field_name", field->name());
-  }
-}
-
-void GenerateEnumToPool(const EnumDescriptor* en, io::Printer* printer) {
-  printer->Print(
-      "$pool->addEnum('^name^', "
-      "\\Google\\Protobuf\\Internal\\^class_name^::class)\n",
-      "name", DescriptorFullName(en, true),
-      "class_name", en->name());
-  Indent(printer);
-
-  for (int i = 0; i < en->value_count(); i++) {
-    const EnumValueDescriptor* value = en->value(i);
-    printer->Print(
-        "->value(\"^name^\", ^number^)\n",
-        "name", ConstantNamePrefix(value->name()) + value->name(),
-        "number", IntToString(value->number()));
-  }
-  printer->Print("->finalizeToPool();\n\n");
-  Outdent(printer);
-}
-
-void GenerateServiceMethod(const MethodDescriptor* method,
-                           io::Printer* printer) {
-  printer->Print(
-        "public function ^camel_name^(\\^request_name^ $request);\n\n",
-        "camel_name", UnderscoresToCamelCase(method->name(), false),
-        "request_name", FullClassName(
-          method->input_type(), false)
-  );
-}
-
-void GenerateMessageToPool(const std::string& name_prefix,
-                           const Descriptor* message, io::Printer* printer) {
-  // Don't generate MapEntry messages -- we use the PHP extension's native
-  // support for map fields instead.
-  if (message->options().map_entry()) {
-    return;
-  }
-  std::string class_name =
-      (name_prefix.empty() ? "" : name_prefix + "\\") +
-      ReservedNamePrefix(message->name(), message->file()) + message->name();
-
-  printer->Print(
-      "$pool->addMessage('^message^', "
-      "\\Google\\Protobuf\\Internal\\^class_name^::class)\n",
-      "message", DescriptorFullName(message, true),
-      "class_name", class_name);
-
-  Indent(printer);
-
-  for (int i = 0; i < message->field_count(); i++) {
-    const FieldDescriptor* field = message->field(i);
-    if (field->is_map()) {
-      const FieldDescriptor* key =
-          field->message_type()->map_key();
-      const FieldDescriptor* val =
-          field->message_type()->map_value();
-      printer->Print(
-          "->map('^field^', \\Google\\Protobuf\\Internal\\GPBType::^key^, "
-          "\\Google\\Protobuf\\Internal\\GPBType::^value^, ^number^^other^)\n",
-          "field", field->name(),
-          "key", ToUpper(key->type_name()),
-          "value", ToUpper(val->type_name()),
-          "number", StrCat(field->number()),
-          "other", EnumOrMessageSuffix(val, true));
-    } else if (!field->real_containing_oneof()) {
-      printer->Print(
-          "->^label^('^field^', "
-          "\\Google\\Protobuf\\Internal\\GPBType::^type^, ^number^^other^)\n",
-          "field", field->name(),
-          "label", LabelForField(field),
-          "type", ToUpper(field->type_name()),
-          "number", StrCat(field->number()),
-          "other", EnumOrMessageSuffix(field, true));
-    }
-  }
-
-  // oneofs.
-  for (int i = 0; i < message->real_oneof_decl_count(); i++) {
-    const OneofDescriptor* oneof = message->oneof_decl(i);
-    printer->Print("->oneof(^name^)\n",
-                   "name", oneof->name());
-    Indent(printer);
-    for (int index = 0; index < oneof->field_count(); index++) {
-      const FieldDescriptor* field = oneof->field(index);
-      printer->Print(
-          "->value('^field^', "
-          "\\Google\\Protobuf\\Internal\\GPBType::^type^, ^number^^other^)\n",
-          "field", field->name(),
-          "type", ToUpper(field->type_name()),
-          "number", StrCat(field->number()),
-          "other", EnumOrMessageSuffix(field, true));
-    }
-    printer->Print("->finish()\n");
-    Outdent(printer);
-  }
-
-  printer->Print(
-      "->finalizeToPool();\n");
-
-  Outdent(printer);
-
-  printer->Print(
-      "\n");
-
-  for (int i = 0; i < message->nested_type_count(); i++) {
-    GenerateMessageToPool(class_name, message->nested_type(i), printer);
-  }
-  for (int i = 0; i < message->enum_type_count(); i++) {
-    GenerateEnumToPool(message->enum_type(i), printer);
-  }
-}
-
-void GenerateAddFileToPool(const FileDescriptor* file, const Options& options,
-                           io::Printer* printer) {
-  printer->Print(
-      "public static $is_initialized = false;\n\n"
-      "public static function initOnce() {\n");
-  Indent(printer);
-
-  if (options.aggregate_metadata) {
-    GenerateAddFilesToPool(file, options, printer);
-  } else {
-    printer->Print(
-        "$pool = \\Google\\Protobuf\\Internal\\"
-        "DescriptorPool::getGeneratedPool();\n\n"
-        "if (static::$is_initialized == true) {\n"
-        "  return;\n"
-        "}\n");
-
-    if (options.is_descriptor) {
-      for (int i = 0; i < file->message_type_count(); i++) {
-        GenerateMessageToPool("", file->message_type(i), printer);
-      }
-      for (int i = 0; i < file->enum_type_count(); i++) {
-        GenerateEnumToPool(file->enum_type(i), printer);
-      }
-
-      printer->Print(
-          "$pool->finish();\n");
-    } else {
-      for (int i = 0; i < file->dependency_count(); i++) {
-        const std::string& name = file->dependency(i)->name();
-        // Currently, descriptor.proto is not ready for external usage. Skip to
-        // import it for now, so that its dependencies can still work as long as
-        // they don't use protos defined in descriptor.proto.
-        if (name == kDescriptorFile) {
-          continue;
-        }
-        std::string dependency_filename =
-            GeneratedMetadataFileName(file->dependency(i), options);
-        printer->Print(
-            "\\^name^::initOnce();\n",
-            "name", FilenameToClassname(dependency_filename));
-      }
-
-      // Add messages and enums to descriptor pool.
-      FileDescriptorSet files;
-      FileDescriptorProto* file_proto = files.add_file();
-      file->CopyTo(file_proto);
-
-      // Filter out descriptor.proto as it cannot be depended on for now.
-      RepeatedPtrField<std::string>* dependency =
-          file_proto->mutable_dependency();
-      for (RepeatedPtrField<std::string>::iterator it = dependency->begin();
-           it != dependency->end(); ++it) {
-        if (*it != kDescriptorFile) {
-          dependency->erase(it);
-          break;
-        }
-      }
-
-      // Filter out all extensions, since we do not support extension yet.
-      file_proto->clear_extension();
-      RepeatedPtrField<DescriptorProto>* message_type =
-          file_proto->mutable_message_type();
-      for (RepeatedPtrField<DescriptorProto>::iterator it = message_type->begin();
-           it != message_type->end(); ++it) {
-        it->clear_extension();
-      }
-
-      std::string files_data;
-      files.SerializeToString(&files_data);
-
-      printer->Print("$pool->internalAddGeneratedFile(\n");
-      Indent(printer);
-      printer->Print("'");
-
-      for (auto ch : files_data) {
-        switch (ch) {
-          case '\\':
-            printer->Print(R"(\\)");
-            break;
-          case '\'':
-            printer->Print(R"(\')");
-            break;
-          default:
-            printer->Print("^char^", "char", std::string(1, ch));
-            break;
-        }
-      }
-
-      printer->Print("'\n");
-      Outdent(printer);
-      printer->Print(
-          ", true);\n\n");
-    }
-    printer->Print(
-        "static::$is_initialized = true;\n");
-  }
-
-  Outdent(printer);
-  printer->Print("}\n");
-}
-
-static void AnalyzeDependencyForFile(
-    const FileDescriptor* file,
-    std::set<const FileDescriptor*>* nodes_without_dependency,
-    std::map<const FileDescriptor*, std::set<const FileDescriptor*>>* deps,
-    std::map<const FileDescriptor*, int>* dependency_count) {
-  int count = file->dependency_count();
-  for (int i = 0; i < file->dependency_count(); i++) {
-      const FileDescriptor* dependency = file->dependency(i);
-      if (dependency->name() == kDescriptorFile) {
-        count--;
-        break;
-      }
-  }
-
-  if (count == 0) {
-    nodes_without_dependency->insert(file);
-  } else {
-    (*dependency_count)[file] = count;
-    for (int i = 0; i < file->dependency_count(); i++) {
-      const FileDescriptor* dependency = file->dependency(i);
-      if (dependency->name() == kDescriptorFile) {
-        continue;
-      }
-      if (deps->find(dependency) == deps->end()) {
-        (*deps)[dependency] = std::set<const FileDescriptor*>();
-      }
-      (*deps)[dependency].insert(file);
-      AnalyzeDependencyForFile(
-          dependency, nodes_without_dependency, deps, dependency_count);
-    }
-  }
-}
-
-static bool NeedsUnwrapping(const FileDescriptor* file,
-                            const Options& options) {
-  bool has_aggregate_metadata_prefix = false;
-  if (options.aggregate_metadata_prefixes.empty()) {
-    has_aggregate_metadata_prefix = true;
-  } else {
-    for (const auto& prefix : options.aggregate_metadata_prefixes) {
-      if (HasPrefixString(file->package(), prefix)) {
-        has_aggregate_metadata_prefix = true;
-        break;
-      }
-    }
-  }
-
-  return has_aggregate_metadata_prefix;
-}
-
-void GenerateAddFilesToPool(const FileDescriptor* file, const Options& options,
-                            io::Printer* printer) {
-  printer->Print(
-      "$pool = \\Google\\Protobuf\\Internal\\"
-      "DescriptorPool::getGeneratedPool();\n"
-      "if (static::$is_initialized == true) {\n"
-      "  return;\n"
-      "}\n");
-
-  // Sort files according to dependency
-  std::map<const FileDescriptor*, std::set<const FileDescriptor*>> deps;
-  std::map<const FileDescriptor*, int> dependency_count;
-  std::set<const FileDescriptor*> nodes_without_dependency;
-  FileDescriptorSet sorted_file_set;
-
-  AnalyzeDependencyForFile(
-      file, &nodes_without_dependency, &deps, &dependency_count);
-
-  while (!nodes_without_dependency.empty()) {
-    auto file_node = *nodes_without_dependency.begin();
-    nodes_without_dependency.erase(file_node);
-    for (auto dependent : deps[file_node]) {
-      if (dependency_count[dependent] == 1) {
-        dependency_count.erase(dependent);
-        nodes_without_dependency.insert(dependent);
-      } else {
-        dependency_count[dependent] -= 1;
-      }
-    }
-
-    bool needs_aggregate = NeedsUnwrapping(file_node, options);
-
-    if (needs_aggregate) {
-      auto file_proto = sorted_file_set.add_file();
-      file_node->CopyTo(file_proto);
-
-      // Filter out descriptor.proto as it cannot be depended on for now.
-      RepeatedPtrField<std::string>* dependency =
-          file_proto->mutable_dependency();
-      for (RepeatedPtrField<std::string>::iterator it = dependency->begin();
-           it != dependency->end(); ++it) {
-        if (*it != kDescriptorFile) {
-          dependency->erase(it);
-          break;
-        }
-      }
-
-      // Filter out all extensions, since we do not support extension yet.
-      file_proto->clear_extension();
-      RepeatedPtrField<DescriptorProto>* message_type =
-          file_proto->mutable_message_type();
-      for (RepeatedPtrField<DescriptorProto>::iterator it = message_type->begin();
-           it != message_type->end(); ++it) {
-        it->clear_extension();
-      }
-    } else {
-      std::string dependency_filename = GeneratedMetadataFileName(file_node, false);
-      printer->Print(
-          "\\^name^::initOnce();\n",
-          "name", FilenameToClassname(dependency_filename));
-    }
-  }
-
-  std::string files_data;
-  sorted_file_set.SerializeToString(&files_data);
-
-  printer->Print("$pool->internalAddGeneratedFile(\n");
-  Indent(printer);
-  printer->Print("'");
-
-  for (auto ch : files_data) {
-    switch (ch) {
-      case '\\':
-        printer->Print(R"(\\)");
-        break;
-      case '\'':
-        printer->Print(R"(\')");
-        break;
-      default:
-        printer->Print("^char^", "char", std::string(1, ch));
-        break;
-    }
-  }
-
-  printer->Print("'\n");
-  Outdent(printer);
-  printer->Print(
-      ", true);\n");
-
-  printer->Print(
-      "static::$is_initialized = true;\n");
-}
-
-void GenerateUseDeclaration(const Options& options, io::Printer* printer) {
-  if (!options.is_descriptor) {
-    printer->Print(
-        "use Google\\Protobuf\\Internal\\GPBType;\n"
-        "use Google\\Protobuf\\Internal\\RepeatedField;\n"
-        "use Google\\Protobuf\\Internal\\GPBUtil;\n\n");
-  } else {
-    printer->Print(
-        "use Google\\Protobuf\\Internal\\GPBType;\n"
-        "use Google\\Protobuf\\Internal\\GPBWire;\n"
-        "use Google\\Protobuf\\Internal\\RepeatedField;\n"
-        "use Google\\Protobuf\\Internal\\InputStream;\n"
-        "use Google\\Protobuf\\Internal\\GPBUtil;\n\n");
-  }
-}
-
-void GenerateHead(const FileDescriptor* file, io::Printer* printer) {
-  printer->Print(
-    "<?php\n"
-    "# Generated by the protocol buffer compiler.  DO NOT EDIT!\n"
-    "# source: ^filename^\n"
-    "\n",
-    "filename", file->name());
-}
-
-std::string FilenameToClassname(const std::string& filename) {
-  int lastindex = filename.find_last_of(".");
-  std::string result = filename.substr(0, lastindex);
-  for (int i = 0; i < result.size(); i++) {
-    if (result[i] == '/') {
-      result[i] = '\\';
-    }
-  }
-  return result;
-}
-
-void GenerateMetadataFile(const FileDescriptor* file, const Options& options,
-                          GeneratorContext* generator_context) {
-  std::string filename = GeneratedMetadataFileName(file, options);
-  std::unique_ptr<io::ZeroCopyOutputStream> output(
-      generator_context->Open(filename));
-  io::Printer printer(output.get(), '^');
-
-  GenerateHead(file, &printer);
-
-  std::string fullname = FilenameToClassname(filename);
-  int lastindex = fullname.find_last_of("\\");
-
-  if (lastindex != std::string::npos) {
-    printer.Print(
-        "namespace ^name^;\n\n",
-        "name", fullname.substr(0, lastindex));
-
-    printer.Print(
-        "class ^name^\n"
-        "{\n",
-        "name", fullname.substr(lastindex + 1));
-  } else {
-    printer.Print(
-        "class ^name^\n"
-        "{\n",
-        "name", fullname);
-  }
-  Indent(&printer);
-
-  GenerateAddFileToPool(file, options, &printer);
-
-  Outdent(&printer);
-  printer.Print("}\n\n");
-}
-
-template <typename DescriptorType>
-void LegacyGenerateClassFile(const FileDescriptor* file,
-                             const DescriptorType* desc, const Options& options,
-                             GeneratorContext* generator_context) {
-  std::string filename = LegacyGeneratedClassFileName(desc, options);
-  std::unique_ptr<io::ZeroCopyOutputStream> output(
-      generator_context->Open(filename));
-  io::Printer printer(output.get(), '^');
-
-  GenerateHead(file, &printer);
-
-  std::string php_namespace = RootPhpNamespace(desc, options);
-  if (!php_namespace.empty()) {
-    printer.Print(
-        "namespace ^name^;\n\n",
-        "name", php_namespace);
-  }
-  std::string newname = FullClassName(desc, options);
-  printer.Print("if (false) {\n");
-  Indent(&printer);
-  printer.Print("/**\n");
-  printer.Print(" * This class is deprecated. Use ^new^ instead.\n",
-      "new", newname);
-  printer.Print(" * @deprecated\n");
-  printer.Print(" */\n");
-  printer.Print("class ^old^ {}\n",
-      "old", LegacyGeneratedClassName(desc));
-  Outdent(&printer);
-  printer.Print("}\n");
-  printer.Print("class_exists(^new^::class);\n",
-      "new", GeneratedClassNameImpl(desc));
-  printer.Print("@trigger_error('^old^ is deprecated and will be removed in "
-      "the next major release. Use ^fullname^ instead', E_USER_DEPRECATED);\n\n",
-      "old", LegacyFullClassName(desc, options),
-      "fullname", newname);
-}
-
-template <typename DescriptorType>
-void LegacyReadOnlyGenerateClassFile(const FileDescriptor* file,
-                             const DescriptorType* desc, const Options& options,
-                             GeneratorContext* generator_context) {
-  std::string fullname = FullClassName(desc, options);
-  std::string php_namespace;
-  std::string classname;
-  int lastindex = fullname.find_last_of("\\");
-
-  if (lastindex != std::string::npos) {
-    php_namespace = fullname.substr(0, lastindex);
-    classname = fullname.substr(lastindex + 1);
-  } else {
-    php_namespace = "";
-    classname = fullname;
-  }
-
-  std::string filename = LegacyReadOnlyGeneratedClassFileName(php_namespace, desc);
-  std::unique_ptr<io::ZeroCopyOutputStream> output(
-      generator_context->Open(filename));
-  io::Printer printer(output.get(), '^');
-
-  GenerateHead(file, &printer);
-
-  if (!php_namespace.empty()) {
-    printer.Print(
-        "namespace ^name^;\n\n",
-        "name", php_namespace);
-  }
-
-  printer.Print("class_exists(^new^::class); // autoload the new class, which "
-      "will also create an alias to the deprecated class\n",
-      "new", classname);
-  printer.Print("@trigger_error(__NAMESPACE__ . '\\^old^ is deprecated and will be removed in "
-      "the next major release. Use ^fullname^ instead', E_USER_DEPRECATED);\n\n",
-      "old", desc->name(),
-      "fullname", classname);
-}
-
-void GenerateEnumFile(const FileDescriptor* file, const EnumDescriptor* en,
-                      const Options& options,
-                      GeneratorContext* generator_context) {
-  std::string filename = GeneratedClassFileName(en, options);
-  std::unique_ptr<io::ZeroCopyOutputStream> output(
-      generator_context->Open(filename));
-  io::Printer printer(output.get(), '^');
-
-  GenerateHead(file, &printer);
-
-  std::string fullname = FilenameToClassname(filename);
-  int lastindex = fullname.find_last_of("\\");
-
-  if (lastindex != std::string::npos) {
-    printer.Print(
-        "namespace ^name^;\n\n",
-        "name", fullname.substr(0, lastindex));
-
-    // We only need this 'use' statement if the enum has a namespace.
-    // Otherwise, we get a warning that the use statement has no effect.
-    printer.Print("use UnexpectedValueException;\n\n");
-  }
-
-  GenerateEnumDocComment(&printer, en, options);
-
-  if (lastindex != std::string::npos) {
-    fullname = fullname.substr(lastindex + 1);
-  }
-
-  printer.Print(
-      "class ^name^\n"
-      "{\n",
-      "name", fullname);
-  Indent(&printer);
-
-  bool hasReserved = false;
-  for (int i = 0; i < en->value_count(); i++) {
-    const EnumValueDescriptor* value = en->value(i);
-    GenerateEnumValueDocComment(&printer, value);
-
-    std::string prefix = ConstantNamePrefix(value->name());
-    if (!prefix.empty()) {
-      hasReserved = true;
-    }
-
-    printer.Print("const ^name^ = ^number^;\n",
-                  "name", prefix + value->name(),
-                  "number", IntToString(value->number()));
-  }
-
-  printer.Print("\nprivate static $valueToName = [\n");
-  Indent(&printer);
-  for (int i = 0; i < en->value_count(); i++) {
-    const EnumValueDescriptor* value = en->value(i);
-    printer.Print("self::^constant^ => '^name^',\n",
-                  "constant", ConstantNamePrefix(value->name()) + value->name(),
-                  "name", value->name());
-  }
-  Outdent(&printer);
-  printer.Print("];\n");
-
-  printer.Print(
-      "\npublic static function name($value)\n"
-      "{\n");
-  Indent(&printer);
-  printer.Print("if (!isset(self::$valueToName[$value])) {\n");
-  Indent(&printer);
-  printer.Print("throw new UnexpectedValueException(sprintf(\n");
-  Indent(&printer);
-  Indent(&printer);
-  printer.Print("'Enum %s has no name defined for value %s', __CLASS__, $value));\n");
-  Outdent(&printer);
-  Outdent(&printer);
-  Outdent(&printer);
-  printer.Print("}\n"
-                "return self::$valueToName[$value];\n");
-  Outdent(&printer);
-  printer.Print("}\n\n");
-
-  printer.Print(
-      "\npublic static function value($name)\n"
-      "{\n");
-  Indent(&printer);
-  printer.Print("$const = __CLASS__ . '::' . strtoupper($name);\n"
-                "if (!defined($const)) {\n");
-  Indent(&printer);
-  if (hasReserved) {
-    printer.Print("$pbconst =  __CLASS__. '::PB' . strtoupper($name);\n"
-                "if (!defined($pbconst)) {\n");
-    Indent(&printer);
-  }
-  printer.Print("throw new UnexpectedValueException(sprintf(\n");
-  Indent(&printer);
-  Indent(&printer);
-  printer.Print("'Enum %s has no value defined for name %s', __CLASS__, $name));\n");
-  Outdent(&printer);
-  Outdent(&printer);
-  if (hasReserved) {
-    Outdent(&printer);
-    printer.Print("}\n"
-                  "return constant($pbconst);\n");
-  }
-  Outdent(&printer);
-  printer.Print("}\n"
-                "return constant($const);\n");
-  Outdent(&printer);
-  printer.Print("}\n");
-
-  Outdent(&printer);
-  printer.Print("}\n\n");
-
-  // write legacy file for backwards compatibility with nested messages and enums
-  if (en->containing_type() != NULL) {
-    printer.Print(
-        "// Adding a class alias for backwards compatibility with the previous class name.\n");
-    printer.Print(
-        "class_alias(^new^::class, \\^old^::class);\n\n",
-        "new", fullname,
-        "old", LegacyFullClassName(en, options));
-    LegacyGenerateClassFile(file, en, options, generator_context);
-  }
-
-  // Write legacy file for backwards compatibility with "readonly" keywword
-  std::string lower = en->name();
-  std::transform(lower.begin(), lower.end(), lower.begin(), ::tolower);
-  if (lower == "readonly") {
-    printer.Print(
-        "// Adding a class alias for backwards compatibility with the \"readonly\" keyword.\n");
-    printer.Print(
-        "class_alias(^new^::class, __NAMESPACE__ . '\\^old^');\n\n",
-        "new", fullname,
-        "old", en->name());
-    LegacyReadOnlyGenerateClassFile(file, en, options, generator_context);
-  }
-}
-
-void GenerateMessageFile(const FileDescriptor* file, const Descriptor* message,
-                         const Options& options,
-                         GeneratorContext* generator_context) {
-  // Don't generate MapEntry messages -- we use the PHP extension's native
-  // support for map fields instead.
-  if (message->options().map_entry()) {
-    return;
-  }
-
-  std::string filename = GeneratedClassFileName(message, options);
-  std::unique_ptr<io::ZeroCopyOutputStream> output(
-      generator_context->Open(filename));
-  io::Printer printer(output.get(), '^');
-
-  GenerateHead(file, &printer);
-
-  std::string fullname = FilenameToClassname(filename);
-  int lastindex = fullname.find_last_of("\\");
-
-  if (lastindex != std::string::npos) {
-    printer.Print(
-        "namespace ^name^;\n\n",
-        "name", fullname.substr(0, lastindex));
-  }
-
-  GenerateUseDeclaration(options, &printer);
-
-  GenerateMessageDocComment(&printer, message, options);
-  if (lastindex != std::string::npos) {
-    fullname = fullname.substr(lastindex + 1);
-  }
-
-  std::string base;
-
-  switch (message->well_known_type()) {
-    case Descriptor::WELLKNOWNTYPE_ANY:
-      base = "\\Google\\Protobuf\\Internal\\AnyBase";
-      break;
-    case Descriptor::WELLKNOWNTYPE_TIMESTAMP:
-      base = "\\Google\\Protobuf\\Internal\\TimestampBase";
-      break;
-    default:
-      base = "\\Google\\Protobuf\\Internal\\Message";
-      break;
-  }
-
-  printer.Print(
-      "class ^name^ extends ^base^\n"
-      "{\n",
-      "base", base,
-      "name", fullname);
-  Indent(&printer);
-
-  // Field and oneof definitions.
-  for (int i = 0; i < message->field_count(); i++) {
-    const FieldDescriptor* field = message->field(i);
-    GenerateField(field, &printer, options);
-  }
-  for (int i = 0; i < message->real_oneof_decl_count(); i++) {
-    const OneofDescriptor* oneof = message->oneof_decl(i);
-    GenerateOneofField(oneof, &printer);
-  }
-  printer.Print("\n");
-
-  GenerateMessageConstructorDocComment(&printer, message, options);
-  printer.Print(
-      "public function __construct($data = NULL) {\n");
-  Indent(&printer);
-
-  std::string metadata_filename = GeneratedMetadataFileName(file, options);
-  std::string metadata_fullname = FilenameToClassname(metadata_filename);
-  printer.Print(
-      "\\^fullname^::initOnce();\n",
-      "fullname", metadata_fullname);
-
-  printer.Print(
-      "parent::__construct($data);\n");
-
-  Outdent(&printer);
-  printer.Print("}\n\n");
-
-  // Field and oneof accessors.
-  for (int i = 0; i < message->field_count(); i++) {
-    const FieldDescriptor* field = message->field(i);
-    GenerateFieldAccessor(field, options, &printer);
-  }
-  for (int i = 0; i < message->real_oneof_decl_count(); i++) {
-    const OneofDescriptor* oneof = message->oneof_decl(i);
-    printer.Print(
-      "/**\n"
-      " * @return string\n"
-      " */\n"
-      "public function get^camel_name^()\n"
-      "{\n"
-      "    return $this->whichOneof(\"^name^\");\n"
-      "}\n\n",
-      "camel_name", UnderscoresToCamelCase(oneof->name(), true), "name",
-      oneof->name());
-  }
-
-  Outdent(&printer);
-  printer.Print("}\n\n");
-
-  // write legacy file for backwards compatibility with nested messages and enums
-  if (message->containing_type() != NULL) {
-    printer.Print(
-        "// Adding a class alias for backwards compatibility with the previous class name.\n");
-    printer.Print(
-        "class_alias(^new^::class, \\^old^::class);\n\n",
-        "new", fullname,
-        "old", LegacyFullClassName(message, options));
-    LegacyGenerateClassFile(file, message, options, generator_context);
-  }
-
-  // Write legacy file for backwards compatibility with "readonly" keywword
-  std::string lower = message->name();
-  std::transform(lower.begin(), lower.end(), lower.begin(), ::tolower);
-  if (lower == "readonly") {
-    printer.Print(
-        "// Adding a class alias for backwards compatibility with the \"readonly\" keyword.\n");
-    printer.Print(
-        "class_alias(^new^::class, __NAMESPACE__ . '\\^old^');\n\n",
-        "new", fullname,
-        "old", message->name());
-    LegacyReadOnlyGenerateClassFile(file, message, options, generator_context);
-  }
-
-  // Nested messages and enums.
-  for (int i = 0; i < message->nested_type_count(); i++) {
-    GenerateMessageFile(file, message->nested_type(i), options,
-                        generator_context);
-  }
-  for (int i = 0; i < message->enum_type_count(); i++) {
-    GenerateEnumFile(file, message->enum_type(i), options, generator_context);
-  }
-}
-
-void GenerateServiceFile(
-    const FileDescriptor* file, const ServiceDescriptor* service,
-    const Options& options, GeneratorContext* generator_context) {
-  std::string filename = GeneratedServiceFileName(service, options);
-  std::unique_ptr<io::ZeroCopyOutputStream> output(
-      generator_context->Open(filename));
-  io::Printer printer(output.get(), '^');
-
-  GenerateHead(file, &printer);
-
-  std::string fullname = FilenameToClassname(filename);
-  int lastindex = fullname.find_last_of("\\");
-
-  if (!file->options().php_namespace().empty() ||
-      (!file->options().has_php_namespace() && !file->package().empty()) ||
-      lastindex != std::string::npos) {
-    printer.Print(
-        "namespace ^name^;\n\n",
-        "name", fullname.substr(0, lastindex));
-  }
-
-  GenerateServiceDocComment(&printer, service);
-
-  if (lastindex != std::string::npos) {
-    printer.Print(
-        "interface ^name^\n"
-        "{\n",
-        "name", fullname.substr(lastindex + 1));
-  } else {
-    printer.Print(
-        "interface ^name^\n"
-        "{\n",
-        "name", fullname);
-  }
-
-  Indent(&printer);
-
-  for (int i = 0; i < service->method_count(); i++) {
-    const MethodDescriptor* method = service->method(i);
-    GenerateServiceMethodDocComment(&printer, method);
-    GenerateServiceMethod(method, &printer);
-  }
-
-  Outdent(&printer);
-  printer.Print("}\n\n");
-}
-
-void GenerateFile(const FileDescriptor* file, const Options& options,
-                  GeneratorContext* generator_context) {
-  GenerateMetadataFile(file, options, generator_context);
-
-  for (int i = 0; i < file->message_type_count(); i++) {
-    GenerateMessageFile(file, file->message_type(i), options,
-                        generator_context);
-  }
-  for (int i = 0; i < file->enum_type_count(); i++) {
-    GenerateEnumFile(file, file->enum_type(i), options, generator_context);
-  }
-  if (file->options().php_generic_services()) {
-    for (int i = 0; i < file->service_count(); i++) {
-      GenerateServiceFile(file, file->service(i), options, generator_context);
-    }
-  }
-}
-
-static std::string EscapePhpdoc(const std::string& input) {
-  std::string result;
-  result.reserve(input.size() * 2);
-
-  char prev = '*';
-
-  for (std::string::size_type i = 0; i < input.size(); i++) {
-    char c = input[i];
-    switch (c) {
-      case '*':
-        // Avoid "/*".
-        if (prev == '/') {
-          result.append("&#42;");
-        } else {
-          result.push_back(c);
-        }
-        break;
-      case '/':
-        // Avoid "*/".
-        if (prev == '*') {
-          result.append("&#47;");
-        } else {
-          result.push_back(c);
-        }
-        break;
-      case '@':
-        // '@' starts phpdoc tags including the @deprecated tag, which will
-        // cause a compile-time error if inserted before a declaration that
-        // does not have a corresponding @Deprecated annotation.
-        result.append("&#64;");
-        break;
-      default:
-        result.push_back(c);
-        break;
-    }
-
-    prev = c;
-  }
-
-  return result;
-}
-
-static void GenerateDocCommentBodyForLocation(
-    io::Printer* printer, const SourceLocation& location, bool trailingNewline,
-    int indentCount) {
-  std::string comments = location.leading_comments.empty()
-                             ? location.trailing_comments
-                             : location.leading_comments;
-  if (!comments.empty()) {
-    // TODO(teboring):  Ideally we should parse the comment text as Markdown and
-    //   write it back as HTML, but this requires a Markdown parser.  For now
-    //   we just use the proto comments unchanged.
-
-    // If the comment itself contains block comment start or end markers,
-    // HTML-escape them so that they don't accidentally close the doc comment.
-    comments = EscapePhpdoc(comments);
-
-    std::vector<std::string> lines = Split(comments, "\n", true);
-    while (!lines.empty() && lines.back().empty()) {
-      lines.pop_back();
-    }
-
-    for (int i = 0; i < lines.size(); i++) {
-      // Most lines should start with a space.  Watch out for lines that start
-      // with a /, since putting that right after the leading asterisk will
-      // close the comment.
-      if (indentCount == 0 && !lines[i].empty() && lines[i][0] == '/') {
-        printer->Print(" * ^line^\n", "line", lines[i]);
-      } else {
-        std::string indent = std::string(indentCount, ' ');
-        printer->Print(" *^ind^^line^\n", "ind", indent, "line", lines[i]);
-      }
-    }
-    if (trailingNewline) {
-      printer->Print(" *\n");
-    }
-  }
-}
-
-template <typename DescriptorType>
-static void GenerateDocCommentBody(
-    io::Printer* printer, const DescriptorType* descriptor) {
-  SourceLocation location;
-  if (descriptor->GetSourceLocation(&location)) {
-    GenerateDocCommentBodyForLocation(printer, location, true, 0);
-  }
-}
-
-static std::string FirstLineOf(const std::string& value) {
-  std::string result = value;
-
-  std::string::size_type pos = result.find_first_of('\n');
-  if (pos != std::string::npos) {
-    result.erase(pos);
-  }
-
-  return result;
-}
-
-void GenerateMessageDocComment(io::Printer* printer, const Descriptor* message,
-                               const Options& options) {
-  printer->Print("/**\n");
-  GenerateDocCommentBody(printer, message);
-  printer->Print(
-    " * Generated from protobuf message <code>^messagename^</code>\n"
-    " */\n",
-    "fullname", EscapePhpdoc(FullClassName(message, options)),
-    "messagename", EscapePhpdoc(message->full_name()));
-}
-
-void GenerateMessageConstructorDocComment(io::Printer* printer,
-                                          const Descriptor* message,
-                                          const Options& options) {
-  // In theory we should have slightly different comments for setters, getters,
-  // etc., but in practice everyone already knows the difference between these
-  // so it's redundant information.
-
-  // We start the comment with the main body based on the comments from the
-  // .proto file (if present). We then end with the field declaration, e.g.:
-  //   optional string foo = 5;
-  // If the field is a group, the debug string might end with {.
-  printer->Print("/**\n");
-  printer->Print(" * Constructor.\n");
-  printer->Print(" *\n");
-  printer->Print(" * @param array $data {\n");
-  printer->Print(" *     Optional. Data for populating the Message object.\n");
-  printer->Print(" *\n");
-  for (int i = 0; i < message->field_count(); i++) {
-    const FieldDescriptor* field = message->field(i);
-    printer->Print(" *     @type ^php_type^ $^var^\n",
-      "php_type", PhpSetterTypeName(field, options),
-      "var", field->name());
-    SourceLocation location;
-    if (field->GetSourceLocation(&location)) {
-      GenerateDocCommentBodyForLocation(printer, location, false, 10);
-    }
-  }
-  printer->Print(" * }\n");
-  printer->Print(" */\n");
-}
-
-void GenerateServiceDocComment(io::Printer* printer,
-                               const ServiceDescriptor* service) {
-  printer->Print("/**\n");
-  GenerateDocCommentBody(printer, service);
-  printer->Print(
-    " * Protobuf type <code>^fullname^</code>\n"
-    " */\n",
-    "fullname", EscapePhpdoc(service->full_name()));
-}
-
-void GenerateFieldDocComment(io::Printer* printer, const FieldDescriptor* field,
-                             const Options& options, int function_type) {
-  // In theory we should have slightly different comments for setters, getters,
-  // etc., but in practice everyone already knows the difference between these
-  // so it's redundant information.
-
-  // We start the comment with the main body based on the comments from the
-  // .proto file (if present). We then end with the field declaration, e.g.:
-  //   optional string foo = 5;
-  // If the field is a group, the debug string might end with {.
-  printer->Print("/**\n");
-  GenerateDocCommentBody(printer, field);
-  printer->Print(
-    " * Generated from protobuf field <code>^def^</code>\n",
-    "def", EscapePhpdoc(FirstLineOf(field->DebugString())));
-  if (function_type == kFieldSetter) {
-    printer->Print(" * @param ^php_type^ $var\n",
-      "php_type", PhpSetterTypeName(field, options));
-    printer->Print(" * @return $this\n");
-  } else if (function_type == kFieldGetter) {
-    bool can_return_null = field->has_presence() &&
-                           field->cpp_type() == FieldDescriptor::CPPTYPE_MESSAGE;
-    printer->Print(" * @return ^php_type^^maybe_null^\n",
-      "php_type", PhpGetterTypeName(field, options),
-      "maybe_null", can_return_null ? "|null" : "");
-  }
-  if (field->options().deprecated()) {
-    printer->Print(" * @deprecated\n");
-  }
-  printer->Print(" */\n");
-}
-
-void GenerateWrapperFieldGetterDocComment(io::Printer* printer, const FieldDescriptor* field) {
-  // Generate a doc comment for the special getXXXValue methods that are
-  // generated for wrapper types.
-  const FieldDescriptor* primitiveField = field->message_type()->FindFieldByName("value");
-  printer->Print("/**\n");
-  printer->Print(
-      " * Returns the unboxed value from <code>get^camel_name^()</code>\n\n",
-      "camel_name", UnderscoresToCamelCase(field->name(), true));
-  GenerateDocCommentBody(printer, field);
-  printer->Print(
-    " * Generated from protobuf field <code>^def^</code>\n",
-    "def", EscapePhpdoc(FirstLineOf(field->DebugString())));
-  printer->Print(" * @return ^php_type^|null\n",
-        "php_type", PhpGetterTypeName(primitiveField, false));
-  printer->Print(" */\n");
-}
-
-void GenerateWrapperFieldSetterDocComment(io::Printer* printer, const FieldDescriptor* field) {
-  // Generate a doc comment for the special setXXXValue methods that are
-  // generated for wrapper types.
-  const FieldDescriptor* primitiveField = field->message_type()->FindFieldByName("value");
-  printer->Print("/**\n");
-  printer->Print(
-      " * Sets the field by wrapping a primitive type in a ^message_name^ object.\n\n",
-      "message_name", FullClassName(field->message_type(), false));
-  GenerateDocCommentBody(printer, field);
-  printer->Print(
-    " * Generated from protobuf field <code>^def^</code>\n",
-    "def", EscapePhpdoc(FirstLineOf(field->DebugString())));
-  printer->Print(" * @param ^php_type^|null $var\n",
-        "php_type", PhpSetterTypeName(primitiveField, false));
-  printer->Print(" * @return $this\n");
-  printer->Print(" */\n");
-}
-
-void GenerateEnumDocComment(io::Printer* printer, const EnumDescriptor* enum_,
-                            const Options& options) {
-  printer->Print("/**\n");
-  GenerateDocCommentBody(printer, enum_);
-  printer->Print(
-    " * Protobuf type <code>^fullname^</code>\n"
-    " */\n",
-    "fullname", EscapePhpdoc(enum_->full_name()));
-}
-
-void GenerateEnumValueDocComment(io::Printer* printer,
-                                 const EnumValueDescriptor* value) {
-  printer->Print("/**\n");
-  GenerateDocCommentBody(printer, value);
-  printer->Print(
-    " * Generated from protobuf enum <code>^def^</code>\n"
-    " */\n",
-    "def", EscapePhpdoc(FirstLineOf(value->DebugString())));
-}
-
-void GenerateServiceMethodDocComment(io::Printer* printer,
-                                     const MethodDescriptor* method) {
-  printer->Print("/**\n");
-  GenerateDocCommentBody(printer, method);
-  printer->Print(
-    " * Method <code>^method_name^</code>\n"
-    " *\n",
-    "method_name", EscapePhpdoc(UnderscoresToCamelCase(method->name(), false)));
-  printer->Print(
-    " * @param \\^input_type^ $request\n",
-    "input_type", EscapePhpdoc(FullClassName(method->input_type(), false)));
-  printer->Print(
-    " * @return \\^return_type^\n"
-    " */\n",
-    "return_type", EscapePhpdoc(FullClassName(method->output_type(), false)));
-}
-
-std::string FilenameCName(const FileDescriptor* file) {
-  std::string c_name = file->name();
-  c_name = StringReplace(c_name, ".", "_", true);
-  c_name = StringReplace(c_name, "/", "_", true);
-  return c_name;
-}
-
-void GenerateCEnum(const EnumDescriptor* desc, io::Printer* printer) {
-  std::string c_name = desc->full_name();
-  c_name = StringReplace(c_name, ".", "_", true);
-  std::string php_name = FullClassName(desc, Options());
-  php_name = StringReplace(php_name, "\\", "\\\\", true);
-  printer->Print(
-      "/* $c_name$ */\n"
-      "\n"
-      "zend_class_entry* $c_name$_ce;\n"
-      "\n"
-      "PHP_METHOD($c_name$, name) {\n"
-      "  $file_c_name$_AddDescriptor();\n"
-      "  const upb_DefPool *symtab = DescriptorPool_GetSymbolTable();\n"
-      "  const upb_EnumDef *e = upb_DefPool_FindEnumByName(symtab, \"$name$\");\n"
-      "  zend_long value;\n"
-      "  if (zend_parse_parameters(ZEND_NUM_ARGS(), \"l\", &value) ==\n"
-      "      FAILURE) {\n"
-      "    return;\n"
-      "  }\n"
-      "  const upb_EnumValueDef* ev =\n"
-      "      upb_EnumDef_FindValueByNumber(e, value);\n"
-      "  if (!ev) {\n"
-      "    zend_throw_exception_ex(NULL, 0,\n"
-      "                            \"$php_name$ has no name \"\n"
-      "                            \"defined for value \" ZEND_LONG_FMT \".\",\n"
-      "                            value);\n"
-      "    return;\n"
-      "  }\n"
-      "  RETURN_STRING(upb_EnumValueDef_Name(ev));\n"
-      "}\n"
-      "\n"
-      "PHP_METHOD($c_name$, value) {\n"
-      "  $file_c_name$_AddDescriptor();\n"
-      "  const upb_DefPool *symtab = DescriptorPool_GetSymbolTable();\n"
-      "  const upb_EnumDef *e = upb_DefPool_FindEnumByName(symtab, \"$name$\");\n"
-      "  char *name = NULL;\n"
-      "  size_t name_len;\n"
-      "  if (zend_parse_parameters(ZEND_NUM_ARGS(), \"s\", &name,\n"
-      "                            &name_len) == FAILURE) {\n"
-      "    return;\n"
-      "  }\n"
-      "  const upb_EnumValueDef* ev = upb_EnumDef_FindValueByNameWithSize(\n"
-      "      e, name, name_len);\n"
-      "  if (!ev) {\n"
-      "    zend_throw_exception_ex(NULL, 0,\n"
-      "                            \"$php_name$ has no value \"\n"
-      "                            \"defined for name %s.\",\n"
-      "                            name);\n"
-      "    return;\n"
-      "  }\n"
-      "  RETURN_LONG(upb_EnumValueDef_Number(ev));\n"
-      "}\n"
-      "\n"
-      "static zend_function_entry $c_name$_phpmethods[] = {\n"
-      "  PHP_ME($c_name$, name, arginfo_lookup, ZEND_ACC_PUBLIC | ZEND_ACC_STATIC)\n"
-      "  PHP_ME($c_name$, value, arginfo_lookup, ZEND_ACC_PUBLIC | ZEND_ACC_STATIC)\n"
-      "  ZEND_FE_END\n"
-      "};\n"
-      "\n"
-      "static void $c_name$_ModuleInit() {\n"
-      "  zend_class_entry tmp_ce;\n"
-      "\n"
-      "  INIT_CLASS_ENTRY(tmp_ce, \"$php_name$\",\n"
-      "                   $c_name$_phpmethods);\n"
-      "\n"
-      "  $c_name$_ce = zend_register_internal_class(&tmp_ce);\n",
-      "name", desc->full_name(),
-      "file_c_name", FilenameCName(desc->file()),
-      "c_name", c_name,
-      "php_name", php_name);
-
-  for (int i = 0; i < desc->value_count(); i++) {
-    const EnumValueDescriptor* value = desc->value(i);
-    printer->Print(
-        "  zend_declare_class_constant_long($c_name$_ce, \"$name$\",\n"
-        "                                   strlen(\"$name$\"), $num$);\n",
-        "c_name", c_name,
-        "name", value->name(),
-        "num", std::to_string(value->number()));
-  }
-
-  printer->Print(
-      "}\n"
-      "\n");
-}
-
-void GenerateCMessage(const Descriptor* message, io::Printer* printer) {
-  std::string c_name = message->full_name();
-  c_name = StringReplace(c_name, ".", "_", true);
-  std::string php_name = FullClassName(message, Options());
-  php_name = StringReplace(php_name, "\\", "\\\\", true);
-  printer->Print(
-      "/* $c_name$ */\n"
-      "\n"
-      "zend_class_entry* $c_name$_ce;\n"
-      "\n"
-      "static PHP_METHOD($c_name$, __construct) {\n"
-      "  $file_c_name$_AddDescriptor();\n"
-      "  zim_Message___construct(INTERNAL_FUNCTION_PARAM_PASSTHRU);\n"
-      "}\n"
-      "\n",
-      "file_c_name", FilenameCName(message->file()),
-      "c_name", c_name);
-
-  for (int i = 0; i < message->field_count(); i++) {
-    auto field = message->field(i);
-    printer->Print(
-      "static PHP_METHOD($c_name$, get$camel_name$) {\n"
-      "  Message* intern = (Message*)Z_OBJ_P(getThis());\n"
-      "  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(\n"
-      "      intern->desc->msgdef, \"$name$\");\n"
-      "  zval ret;\n"
-      "  Message_get(intern, f, &ret);\n"
-      "  RETURN_COPY_VALUE(&ret);\n"
-      "}\n"
-      "\n"
-      "static PHP_METHOD($c_name$, set$camel_name$) {\n"
-      "  Message* intern = (Message*)Z_OBJ_P(getThis());\n"
-      "  const upb_FieldDef *f = upb_MessageDef_FindFieldByName(\n"
-      "      intern->desc->msgdef, \"$name$\");\n"
-      "  zval *val;\n"
-      "  if (zend_parse_parameters(ZEND_NUM_ARGS(), \"z\", &val)\n"
-      "      == FAILURE) {\n"
-      "    return;\n"
-      "  }\n"
-      "  Message_set(intern, f, val);\n"
-      "  RETURN_COPY(getThis());\n"
-      "}\n"
-      "\n",
-      "c_name", c_name,
-      "name", field->name(),
-      "camel_name", UnderscoresToCamelCase(field->name(), true));
-  }
-
-  for (int i = 0; i < message->real_oneof_decl_count(); i++) {
-    auto oneof = message->oneof_decl(i);
-    printer->Print(
-      "static PHP_METHOD($c_name$, get$camel_name$) {\n"
-      "  Message* intern = (Message*)Z_OBJ_P(getThis());\n"
-      "  const upb_OneofDef *oneof = upb_MessageDef_FindOneofByName(\n"
-      "      intern->desc->msgdef, \"$name$\");\n"
-      "  const upb_FieldDef *field = \n"
-      "      upb_Message_WhichOneof(intern->msg, oneof);\n"
-      "  RETURN_STRING(field ? upb_FieldDef_Name(field) : \"\");\n"
-      "}\n",
-      "c_name", c_name,
-      "name", oneof->name(),
-      "camel_name", UnderscoresToCamelCase(oneof->name(), true));
-  }
-
-  switch (message->well_known_type()) {
-    case Descriptor::WELLKNOWNTYPE_ANY:
-      printer->Print(
-          "ZEND_BEGIN_ARG_INFO_EX(arginfo_is, 0, 0, 1)\n"
-          "  ZEND_ARG_INFO(0, proto)\n"
-          "ZEND_END_ARG_INFO()\n"
-          "\n"
-      );
-      break;
-    case Descriptor::WELLKNOWNTYPE_TIMESTAMP:
-      printer->Print(
-          "ZEND_BEGIN_ARG_INFO_EX(arginfo_timestamp_fromdatetime, 0, 0, 1)\n"
-          "  ZEND_ARG_INFO(0, datetime)\n"
-          "ZEND_END_ARG_INFO()\n"
-          "\n"
-      );
-      break;
-    default:
-      break;
-  }
-
-  printer->Print(
-      "static zend_function_entry $c_name$_phpmethods[] = {\n"
-      "  PHP_ME($c_name$, __construct, arginfo_construct, ZEND_ACC_PUBLIC)\n",
-      "c_name", c_name);
-
-  for (int i = 0; i < message->field_count(); i++) {
-    auto field = message->field(i);
-    printer->Print(
-      "  PHP_ME($c_name$, get$camel_name$, arginfo_void, ZEND_ACC_PUBLIC)\n"
-      "  PHP_ME($c_name$, set$camel_name$, arginfo_setter, ZEND_ACC_PUBLIC)\n",
-      "c_name", c_name,
-      "camel_name", UnderscoresToCamelCase(field->name(), true));
-  }
-
-  for (int i = 0; i < message->real_oneof_decl_count(); i++) {
-    auto oneof = message->oneof_decl(i);
-    printer->Print(
-      "  PHP_ME($c_name$, get$camel_name$, arginfo_void, ZEND_ACC_PUBLIC)\n",
-      "c_name", c_name,
-      "camel_name", UnderscoresToCamelCase(oneof->name(), true));
-  }
-
-  // Extra hand-written functions added to the well-known types.
-  switch (message->well_known_type()) {
-    case Descriptor::WELLKNOWNTYPE_ANY:
-      printer->Print(
-        "  PHP_ME($c_name$, is, arginfo_is, ZEND_ACC_PUBLIC)\n"
-        "  PHP_ME($c_name$, pack, arginfo_setter, ZEND_ACC_PUBLIC)\n"
-        "  PHP_ME($c_name$, unpack, arginfo_void, ZEND_ACC_PUBLIC)\n",
-        "c_name", c_name);
-      break;
-    case Descriptor::WELLKNOWNTYPE_TIMESTAMP:
-      printer->Print(
-        "  PHP_ME($c_name$, fromDateTime, arginfo_timestamp_fromdatetime, ZEND_ACC_PUBLIC)\n"
-        "  PHP_ME($c_name$, toDateTime, arginfo_void, ZEND_ACC_PUBLIC)\n",
-        "c_name", c_name);
-      break;
-    default:
-      break;
-  }
-
-  printer->Print(
-      "  ZEND_FE_END\n"
-      "};\n"
-      "\n"
-      "static void $c_name$_ModuleInit() {\n"
-      "  zend_class_entry tmp_ce;\n"
-      "\n"
-      "  INIT_CLASS_ENTRY(tmp_ce, \"$php_name$\",\n"
-      "                   $c_name$_phpmethods);\n"
-      "\n"
-      "  $c_name$_ce = zend_register_internal_class(&tmp_ce);\n"
-      "  $c_name$_ce->ce_flags |= ZEND_ACC_FINAL;\n"
-      "  $c_name$_ce->create_object = Message_create;\n"
-      "  zend_do_inheritance($c_name$_ce, message_ce);\n"
-      "}\n"
-      "\n",
-      "c_name", c_name,
-      "php_name", php_name);
-
-  for (int i = 0; i < message->nested_type_count(); i++) {
-    GenerateCMessage(message->nested_type(i), printer);
-  }
-  for (int i = 0; i < message->enum_type_count(); i++) {
-    GenerateCEnum(message->enum_type(i), printer);
-  }
-}
-
-void GenerateEnumCInit(const EnumDescriptor* desc, io::Printer* printer) {
-  std::string c_name = desc->full_name();
-  c_name = StringReplace(c_name, ".", "_", true);
-
-  printer->Print(
-      "  $c_name$_ModuleInit();\n",
-      "c_name", c_name);
-}
-
-void GenerateCInit(const Descriptor* message, io::Printer* printer) {
-  std::string c_name = message->full_name();
-  c_name = StringReplace(c_name, ".", "_", true);
-
-  printer->Print(
-      "  $c_name$_ModuleInit();\n",
-      "c_name", c_name);
-
-  for (int i = 0; i < message->nested_type_count(); i++) {
-    GenerateCInit(message->nested_type(i), printer);
-  }
-  for (int i = 0; i < message->enum_type_count(); i++) {
-    GenerateEnumCInit(message->enum_type(i), printer);
-  }
-}
-
-void GenerateCWellKnownTypes(const std::vector<const FileDescriptor*>& files,
-                             GeneratorContext* context) {
-  std::unique_ptr<io::ZeroCopyOutputStream> output(
-      context->Open("../ext/google/protobuf/wkt.inc"));
-  io::Printer printer(output.get(), '$');
-
-  printer.Print(
-      "// This file is generated from the .proto files for the well-known\n"
-      "// types. Do not edit!\n\n");
-
-  printer.Print(
-      "ZEND_BEGIN_ARG_INFO_EX(arginfo_lookup, 0, 0, 1)\n"
-      "  ZEND_ARG_INFO(0, key)\n"
-      "ZEND_END_ARG_INFO()\n"
-      "\n"
-  );
-
-  for (auto file : files) {
-    printer.Print(
-        "static void $c_name$_AddDescriptor();\n",
-        "c_name", FilenameCName(file));
-  }
-
-  for (auto file : files) {
-    std::string c_name = FilenameCName(file);
-    std::string metadata_filename = GeneratedMetadataFileName(file, Options());
-    std::string metadata_classname = FilenameToClassname(metadata_filename);
-    std::string metadata_c_name =
-        StringReplace(metadata_classname, "\\", "_", true);
-    metadata_classname = StringReplace(metadata_classname, "\\", "\\\\", true);
-    FileDescriptorProto file_proto;
-    file->CopyTo(&file_proto);
-    std::string serialized;
-    file_proto.SerializeToString(&serialized);
-    printer.Print(
-        "/* $filename$ */\n"
-        "\n"
-        "zend_class_entry* $metadata_c_name$_ce;\n"
-        "\n"
-        "const char $c_name$_descriptor [$size$] = {\n",
-        "filename", file->name(),
-        "c_name", c_name,
-        "metadata_c_name", metadata_c_name,
-        "size", std::to_string(serialized.size()));
-
-    for (size_t i = 0; i < serialized.size();) {
-      for (size_t j = 0; j < 25 && i < serialized.size(); ++i, ++j) {
-        printer.Print("'$ch$', ", "ch", CEscape(serialized.substr(i, 1)));
-      }
-      printer.Print("\n");
-    }
-
-    printer.Print(
-        "};\n"
-        "\n"
-        "static void $c_name$_AddDescriptor() {\n"
-        "  if (DescriptorPool_HasFile(\"$filename$\")) return;\n",
-        "filename", file->name(),
-        "c_name", c_name,
-        "metadata_c_name", metadata_c_name);
-
-    for (int i = 0; i < file->dependency_count(); i++) {
-      std::string dep_c_name = FilenameCName(file->dependency(i));
-      printer.Print(
-          "  $dep_c_name$_AddDescriptor();\n",
-          "dep_c_name", dep_c_name);
-    }
-
-    printer.Print(
-        "  DescriptorPool_AddDescriptor(\"$filename$\", $c_name$_descriptor,\n"
-        "                               sizeof($c_name$_descriptor));\n"
-        "}\n"
-        "\n"
-        "static PHP_METHOD($metadata_c_name$, initOnce) {\n"
-        "  $c_name$_AddDescriptor();\n"
-        "}\n"
-        "\n"
-        "static zend_function_entry $metadata_c_name$_methods[] = {\n"
-        "  PHP_ME($metadata_c_name$, initOnce, arginfo_void, ZEND_ACC_PUBLIC | ZEND_ACC_STATIC)\n"
-        "  ZEND_FE_END\n"
-        "};\n"
-        "\n"
-        "static void $metadata_c_name$_ModuleInit() {\n"
-        "  zend_class_entry tmp_ce;\n"
-        "\n"
-        "  INIT_CLASS_ENTRY(tmp_ce, \"$metadata_classname$\",\n"
-        "                   $metadata_c_name$_methods);\n"
-        "\n"
-        "  $metadata_c_name$_ce = zend_register_internal_class(&tmp_ce);\n"
-        "}\n"
-        "\n",
-        "filename", file->name(),
-        "c_name", c_name,
-        "metadata_c_name", metadata_c_name,
-        "metadata_classname", metadata_classname);
-    for (int i = 0; i < file->message_type_count(); i++) {
-      GenerateCMessage(file->message_type(i), &printer);
-    }
-    for (int i = 0; i < file->enum_type_count(); i++) {
-      GenerateCEnum(file->enum_type(i), &printer);
-    }
-  }
-
-  printer.Print(
-      "static void WellKnownTypes_ModuleInit() {\n");
-
-  for (auto file : files) {
-    std::string metadata_filename = GeneratedMetadataFileName(file, Options());
-    std::string metadata_classname = FilenameToClassname(metadata_filename);
-    std::string metadata_c_name =
-        StringReplace(metadata_classname, "\\", "_", true);
-    printer.Print(
-        "  $metadata_c_name$_ModuleInit();\n",
-        "metadata_c_name", metadata_c_name);
-    for (int i = 0; i < file->message_type_count(); i++) {
-      GenerateCInit(file->message_type(i), &printer);
-    }
-    for (int i = 0; i < file->enum_type_count(); i++) {
-      GenerateEnumCInit(file->enum_type(i), &printer);
-    }
-  }
-
-  printer.Print(
-      "}\n");
-}
-
-}  // namespace
-
-std::string GeneratedClassName(const Descriptor* desc) {
-  return GeneratedClassNameImpl(desc);
-}
-
-std::string GeneratedClassName(const EnumDescriptor* desc) {
-  return GeneratedClassNameImpl(desc);
-}
-
-std::string GeneratedClassName(const ServiceDescriptor* desc) {
-  return GeneratedClassNameImpl(desc);
-}
-
-bool Generator::Generate(const FileDescriptor* file,
-                         const std::string& parameter,
-                         GeneratorContext* generator_context,
-                         std::string* error) const {
-  return Generate(file, Options(), generator_context, error);
-}
-
-bool Generator::Generate(const FileDescriptor* file, const Options& options,
-                         GeneratorContext* generator_context,
-                         std::string* error) const {
-  if (options.is_descriptor && file->name() != kDescriptorFile) {
-    *error =
-        "Can only generate PHP code for google/protobuf/descriptor.proto.\n";
-    return false;
-  }
-
-  if (!options.is_descriptor && file->syntax() != FileDescriptor::SYNTAX_PROTO3) {
-    *error =
-        "Can only generate PHP code for proto3 .proto files.\n"
-        "Please add 'syntax = \"proto3\";' to the top of your .proto file.\n";
-    return false;
-  }
-
-  GenerateFile(file, options, generator_context);
-
-  return true;
-}
-
-bool Generator::GenerateAll(const std::vector<const FileDescriptor*>& files,
-                            const std::string& parameter,
-                            GeneratorContext* generator_context,
-                            std::string* error) const {
-  Options options;
-
-  for (const auto& option : Split(parameter, ",", true)) {
-    const std::vector<std::string> option_pair = Split(option, "=", true);
-    if (HasPrefixString(option_pair[0], "aggregate_metadata")) {
-      options.aggregate_metadata = true;
-      for (const auto& prefix : Split(option_pair[1], "#", false)) {
-        options.aggregate_metadata_prefixes.emplace(prefix);
-        GOOGLE_LOG(INFO) << prefix;
-      }
-    } else if (option_pair[0] == "internal") {
-      options.is_descriptor = true;
-    } else if (option_pair[0] == "internal_generate_c_wkt") {
-      GenerateCWellKnownTypes(files, generator_context);
-    } else {
-      GOOGLE_LOG(FATAL) << "Unknown codegen option: " << option_pair[0];
-    }
-  }
-
-  for (auto file : files) {
-    if (!Generate(file, options, generator_context, error)) {
-      return false;
-    }
-  }
-
-  return true;
-}
-
-}  // namespace php
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/compiler/php/php_generator.h b/libs/protobuf/src/google/protobuf/compiler/php/php_generator.h
deleted file mode 100644
index 17cb59c..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/php/php_generator.h
+++ /dev/null
@@ -1,92 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef GOOGLE_PROTOBUF_COMPILER_PHP_GENERATOR_H__
-#define GOOGLE_PROTOBUF_COMPILER_PHP_GENERATOR_H__
-
-#include <google/protobuf/compiler/code_generator.h>
-#include <google/protobuf/descriptor.h>
-
-#include <string>
-
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace php {
-
-struct Options;
-
-class PROTOC_EXPORT Generator : public CodeGenerator {
- public:
-  virtual bool Generate(
-      const FileDescriptor* file,
-      const std::string& parameter,
-      GeneratorContext* generator_context,
-      std::string* error) const override;
-
-  bool GenerateAll(const std::vector<const FileDescriptor*>& files,
-                   const std::string& parameter,
-                   GeneratorContext* generator_context,
-                   std::string* error) const override;
-
-  uint64_t GetSupportedFeatures() const override {
-    return FEATURE_PROTO3_OPTIONAL;
-  }
-
- private:
-  bool Generate(
-      const FileDescriptor* file,
-      const Options& options,
-      GeneratorContext* generator_context,
-      std::string* error) const;
-};
-
-// To skip reserved keywords in php, some generated classname are prefixed.
-// Other code generators may need following API to figure out the actual
-// classname.
-PROTOC_EXPORT std::string GeneratedClassName(const Descriptor* desc);
-PROTOC_EXPORT std::string GeneratedClassName(const EnumDescriptor* desc);
-PROTOC_EXPORT std::string GeneratedClassName(const ServiceDescriptor* desc);
-
-inline bool IsWrapperType(const FieldDescriptor* descriptor) {
-  return descriptor->cpp_type() == FieldDescriptor::CPPTYPE_MESSAGE &&
-      descriptor->message_type()->file()->name() == "google/protobuf/wrappers.proto";
-}
-
-}  // namespace php
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
-
-#endif  // GOOGLE_PROTOBUF_COMPILER_PHP_GENERATOR_H__
diff --git a/libs/protobuf/src/google/protobuf/compiler/plugin.cc b/libs/protobuf/src/google/protobuf/compiler/plugin.cc
deleted file mode 100644
index 0a32384..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/plugin.cc
+++ /dev/null
@@ -1,201 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-
-#include <google/protobuf/compiler/plugin.h>
-
-#include <iostream>
-#include <set>
-
-#ifdef _WIN32
-#include <fcntl.h>
-#else
-#include <unistd.h>
-#endif
-
-#include <google/protobuf/stubs/logging.h>
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/compiler/plugin.pb.h>
-#include <google/protobuf/compiler/code_generator.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/descriptor.pb.h>
-#include <google/protobuf/io/io_win32.h>
-#include <google/protobuf/io/zero_copy_stream_impl.h>
-
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-
-#if defined(_WIN32)
-// DO NOT include <io.h>, instead create functions in io_win32.{h,cc} and import
-// them like we do below.
-using google::protobuf::io::win32::setmode;
-#endif
-
-class GeneratorResponseContext : public GeneratorContext {
- public:
-  GeneratorResponseContext(
-      const Version& compiler_version, CodeGeneratorResponse* response,
-      const std::vector<const FileDescriptor*>& parsed_files)
-      : compiler_version_(compiler_version),
-        response_(response),
-        parsed_files_(parsed_files) {}
-  ~GeneratorResponseContext() override {}
-
-  // implements GeneratorContext --------------------------------------
-
-  io::ZeroCopyOutputStream* Open(const std::string& filename) override {
-    CodeGeneratorResponse::File* file = response_->add_file();
-    file->set_name(filename);
-    return new io::StringOutputStream(file->mutable_content());
-  }
-
-  io::ZeroCopyOutputStream* OpenForInsert(
-      const std::string& filename,
-      const std::string& insertion_point) override {
-    CodeGeneratorResponse::File* file = response_->add_file();
-    file->set_name(filename);
-    file->set_insertion_point(insertion_point);
-    return new io::StringOutputStream(file->mutable_content());
-  }
-
-  io::ZeroCopyOutputStream* OpenForInsertWithGeneratedCodeInfo(
-      const std::string& filename, const std::string& insertion_point,
-      const google::protobuf::GeneratedCodeInfo& info) override {
-    CodeGeneratorResponse::File* file = response_->add_file();
-    file->set_name(filename);
-    file->set_insertion_point(insertion_point);
-    *file->mutable_generated_code_info() = info;
-    return new io::StringOutputStream(file->mutable_content());
-  }
-
-  void ListParsedFiles(std::vector<const FileDescriptor*>* output) override {
-    *output = parsed_files_;
-  }
-
-  void GetCompilerVersion(Version* version) const override {
-    *version = compiler_version_;
-  }
-
- private:
-  Version compiler_version_;
-  CodeGeneratorResponse* response_;
-  const std::vector<const FileDescriptor*>& parsed_files_;
-};
-
-bool GenerateCode(const CodeGeneratorRequest& request,
-                  const CodeGenerator& generator,
-                  CodeGeneratorResponse* response, std::string* error_msg) {
-  DescriptorPool pool;
-  for (int i = 0; i < request.proto_file_size(); i++) {
-    const FileDescriptor* file = pool.BuildFile(request.proto_file(i));
-    if (file == nullptr) {
-      // BuildFile() already wrote an error message.
-      return false;
-    }
-  }
-
-  std::vector<const FileDescriptor*> parsed_files;
-  for (int i = 0; i < request.file_to_generate_size(); i++) {
-    parsed_files.push_back(pool.FindFileByName(request.file_to_generate(i)));
-    if (parsed_files.back() == nullptr) {
-      *error_msg =
-          "protoc asked plugin to generate a file but "
-          "did not provide a descriptor for the file: " +
-          request.file_to_generate(i);
-      return false;
-    }
-  }
-
-  GeneratorResponseContext context(request.compiler_version(), response,
-                                   parsed_files);
-
-
-  std::string error;
-  bool succeeded = generator.GenerateAll(parsed_files, request.parameter(),
-                                         &context, &error);
-
-  response->set_supported_features(generator.GetSupportedFeatures());
-
-  if (!succeeded && error.empty()) {
-    error =
-        "Code generator returned false but provided no error "
-        "description.";
-  }
-  if (!error.empty()) {
-    response->set_error(error);
-  }
-
-  return true;
-}
-
-int PluginMain(int argc, char* argv[], const CodeGenerator* generator) {
-
-  if (argc > 1) {
-    std::cerr << argv[0] << ": Unknown option: " << argv[1] << std::endl;
-    return 1;
-  }
-
-#ifdef _WIN32
-  setmode(STDIN_FILENO, _O_BINARY);
-  setmode(STDOUT_FILENO, _O_BINARY);
-#endif
-
-  CodeGeneratorRequest request;
-  if (!request.ParseFromFileDescriptor(STDIN_FILENO)) {
-    std::cerr << argv[0] << ": protoc sent unparseable request to plugin."
-              << std::endl;
-    return 1;
-  }
-
-
-  std::string error_msg;
-  CodeGeneratorResponse response;
-
-  if (GenerateCode(request, *generator, &response, &error_msg)) {
-    if (!response.SerializeToFileDescriptor(STDOUT_FILENO)) {
-      std::cerr << argv[0] << ": Error writing to stdout." << std::endl;
-      return 1;
-    }
-  } else {
-    if (!error_msg.empty()) {
-      std::cerr << argv[0] << ": " << error_msg << std::endl;
-    }
-    return 1;
-  }
-
-  return 0;
-}
-
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/compiler/plugin.h b/libs/protobuf/src/google/protobuf/compiler/plugin.h
deleted file mode 100644
index 611713e..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/plugin.h
+++ /dev/null
@@ -1,96 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//
-// Front-end for protoc code generator plugins written in C++.
-//
-// To implement a protoc plugin in C++, simply write an implementation of
-// CodeGenerator, then create a main() function like:
-//   int main(int argc, char* argv[]) {
-//     MyCodeGenerator generator;
-//     return google::protobuf::compiler::PluginMain(argc, argv, &generator);
-//   }
-// You must link your plugin against libprotobuf and libprotoc.
-//
-// The core part of PluginMain is to invoke the given CodeGenerator on a
-// CodeGeneratorRequest to generate a CodeGeneratorResponse. This part is
-// abstracted out and made into function GenerateCode so that it can be reused,
-// for example, to implement a variant of PluginMain that does some
-// preprocessing on the input CodeGeneratorRequest before feeding the request
-// to the given code generator.
-//
-// To get protoc to use the plugin, do one of the following:
-// * Place the plugin binary somewhere in the PATH and give it the name
-//   "protoc-gen-NAME" (replacing "NAME" with the name of your plugin).  If you
-//   then invoke protoc with the parameter --NAME_out=OUT_DIR (again, replace
-//   "NAME" with your plugin's name), protoc will invoke your plugin to generate
-//   the output, which will be placed in OUT_DIR.
-// * Place the plugin binary anywhere, with any name, and pass the --plugin
-//   parameter to protoc to direct it to your plugin like so:
-//     protoc --plugin=protoc-gen-NAME=path/to/mybinary --NAME_out=OUT_DIR
-//   On Windows, make sure to include the .exe suffix:
-//     protoc --plugin=protoc-gen-NAME=path/to/mybinary.exe --NAME_out=OUT_DIR
-
-#ifndef GOOGLE_PROTOBUF_COMPILER_PLUGIN_H__
-#define GOOGLE_PROTOBUF_COMPILER_PLUGIN_H__
-
-#include <string>
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-
-class CodeGenerator;  // code_generator.h
-class CodeGeneratorRequest;
-class CodeGeneratorResponse;
-
-// Implements main() for a protoc plugin exposing the given code generator.
-PROTOC_EXPORT int PluginMain(int argc, char* argv[],
-                             const CodeGenerator* generator);
-
-
-// Generates code using the given code generator. Returns true if the code
-// generation is successful. If the code generation fails, error_msg may be
-// populated to describe the failure cause.
-bool GenerateCode(const CodeGeneratorRequest& request,
-                  const CodeGenerator& generator,
-                  CodeGeneratorResponse* response, std::string* error_msg);
-
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
-
-#endif  // GOOGLE_PROTOBUF_COMPILER_PLUGIN_H__
diff --git a/libs/protobuf/src/google/protobuf/compiler/plugin.pb.cc b/libs/protobuf/src/google/protobuf/compiler/plugin.pb.cc
deleted file mode 100644
index 8f8d83f..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/plugin.pb.cc
+++ /dev/null
@@ -1,1612 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/protobuf/compiler/plugin.proto
-
-#include <google/protobuf/compiler/plugin.pb.h>
-
-#include <algorithm>
-
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/extension_set.h>
-#include <google/protobuf/wire_format_lite.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/generated_message_reflection.h>
-#include <google/protobuf/reflection_ops.h>
-#include <google/protobuf/wire_format.h>
-// @@protoc_insertion_point(includes)
-#include <google/protobuf/port_def.inc>
-
-PROTOBUF_PRAGMA_INIT_SEG
-
-namespace _pb = ::PROTOBUF_NAMESPACE_ID;
-namespace _pbi = _pb::internal;
-
-PROTOBUF_NAMESPACE_OPEN
-namespace compiler {
-PROTOBUF_CONSTEXPR Version::Version(
-    ::_pbi::ConstantInitialized): _impl_{
-    /*decltype(_impl_._has_bits_)*/{}
-  , /*decltype(_impl_._cached_size_)*/{}
-  , /*decltype(_impl_.suffix_)*/{&::_pbi::fixed_address_empty_string, ::_pbi::ConstantInitialized{}}
-  , /*decltype(_impl_.major_)*/0
-  , /*decltype(_impl_.minor_)*/0
-  , /*decltype(_impl_.patch_)*/0} {}
-struct VersionDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR VersionDefaultTypeInternal()
-      : _instance(::_pbi::ConstantInitialized{}) {}
-  ~VersionDefaultTypeInternal() {}
-  union {
-    Version _instance;
-  };
-};
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 VersionDefaultTypeInternal _Version_default_instance_;
-PROTOBUF_CONSTEXPR CodeGeneratorRequest::CodeGeneratorRequest(
-    ::_pbi::ConstantInitialized): _impl_{
-    /*decltype(_impl_._has_bits_)*/{}
-  , /*decltype(_impl_._cached_size_)*/{}
-  , /*decltype(_impl_.file_to_generate_)*/{}
-  , /*decltype(_impl_.proto_file_)*/{}
-  , /*decltype(_impl_.parameter_)*/{&::_pbi::fixed_address_empty_string, ::_pbi::ConstantInitialized{}}
-  , /*decltype(_impl_.compiler_version_)*/nullptr} {}
-struct CodeGeneratorRequestDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR CodeGeneratorRequestDefaultTypeInternal()
-      : _instance(::_pbi::ConstantInitialized{}) {}
-  ~CodeGeneratorRequestDefaultTypeInternal() {}
-  union {
-    CodeGeneratorRequest _instance;
-  };
-};
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 CodeGeneratorRequestDefaultTypeInternal _CodeGeneratorRequest_default_instance_;
-PROTOBUF_CONSTEXPR CodeGeneratorResponse_File::CodeGeneratorResponse_File(
-    ::_pbi::ConstantInitialized): _impl_{
-    /*decltype(_impl_._has_bits_)*/{}
-  , /*decltype(_impl_._cached_size_)*/{}
-  , /*decltype(_impl_.name_)*/{&::_pbi::fixed_address_empty_string, ::_pbi::ConstantInitialized{}}
-  , /*decltype(_impl_.insertion_point_)*/{&::_pbi::fixed_address_empty_string, ::_pbi::ConstantInitialized{}}
-  , /*decltype(_impl_.content_)*/{&::_pbi::fixed_address_empty_string, ::_pbi::ConstantInitialized{}}
-  , /*decltype(_impl_.generated_code_info_)*/nullptr} {}
-struct CodeGeneratorResponse_FileDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR CodeGeneratorResponse_FileDefaultTypeInternal()
-      : _instance(::_pbi::ConstantInitialized{}) {}
-  ~CodeGeneratorResponse_FileDefaultTypeInternal() {}
-  union {
-    CodeGeneratorResponse_File _instance;
-  };
-};
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 CodeGeneratorResponse_FileDefaultTypeInternal _CodeGeneratorResponse_File_default_instance_;
-PROTOBUF_CONSTEXPR CodeGeneratorResponse::CodeGeneratorResponse(
-    ::_pbi::ConstantInitialized): _impl_{
-    /*decltype(_impl_._has_bits_)*/{}
-  , /*decltype(_impl_._cached_size_)*/{}
-  , /*decltype(_impl_.file_)*/{}
-  , /*decltype(_impl_.error_)*/{&::_pbi::fixed_address_empty_string, ::_pbi::ConstantInitialized{}}
-  , /*decltype(_impl_.supported_features_)*/uint64_t{0u}} {}
-struct CodeGeneratorResponseDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR CodeGeneratorResponseDefaultTypeInternal()
-      : _instance(::_pbi::ConstantInitialized{}) {}
-  ~CodeGeneratorResponseDefaultTypeInternal() {}
-  union {
-    CodeGeneratorResponse _instance;
-  };
-};
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 CodeGeneratorResponseDefaultTypeInternal _CodeGeneratorResponse_default_instance_;
-}  // namespace compiler
-PROTOBUF_NAMESPACE_CLOSE
-static ::_pb::Metadata file_level_metadata_google_2fprotobuf_2fcompiler_2fplugin_2eproto[4];
-static const ::_pb::EnumDescriptor* file_level_enum_descriptors_google_2fprotobuf_2fcompiler_2fplugin_2eproto[1];
-static constexpr ::_pb::ServiceDescriptor const** file_level_service_descriptors_google_2fprotobuf_2fcompiler_2fplugin_2eproto = nullptr;
-
-const uint32_t TableStruct_google_2fprotobuf_2fcompiler_2fplugin_2eproto::offsets[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = {
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::compiler::Version, _impl_._has_bits_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::compiler::Version, _internal_metadata_),
-  ~0u,  // no _extensions_
-  ~0u,  // no _oneof_case_
-  ~0u,  // no _weak_field_map_
-  ~0u,  // no _inlined_string_donated_
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::compiler::Version, _impl_.major_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::compiler::Version, _impl_.minor_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::compiler::Version, _impl_.patch_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::compiler::Version, _impl_.suffix_),
-  1,
-  2,
-  3,
-  0,
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::compiler::CodeGeneratorRequest, _impl_._has_bits_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::compiler::CodeGeneratorRequest, _internal_metadata_),
-  ~0u,  // no _extensions_
-  ~0u,  // no _oneof_case_
-  ~0u,  // no _weak_field_map_
-  ~0u,  // no _inlined_string_donated_
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::compiler::CodeGeneratorRequest, _impl_.file_to_generate_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::compiler::CodeGeneratorRequest, _impl_.parameter_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::compiler::CodeGeneratorRequest, _impl_.proto_file_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::compiler::CodeGeneratorRequest, _impl_.compiler_version_),
-  ~0u,
-  0,
-  ~0u,
-  1,
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::compiler::CodeGeneratorResponse_File, _impl_._has_bits_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::compiler::CodeGeneratorResponse_File, _internal_metadata_),
-  ~0u,  // no _extensions_
-  ~0u,  // no _oneof_case_
-  ~0u,  // no _weak_field_map_
-  ~0u,  // no _inlined_string_donated_
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::compiler::CodeGeneratorResponse_File, _impl_.name_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::compiler::CodeGeneratorResponse_File, _impl_.insertion_point_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::compiler::CodeGeneratorResponse_File, _impl_.content_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::compiler::CodeGeneratorResponse_File, _impl_.generated_code_info_),
-  0,
-  1,
-  2,
-  3,
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::compiler::CodeGeneratorResponse, _impl_._has_bits_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::compiler::CodeGeneratorResponse, _internal_metadata_),
-  ~0u,  // no _extensions_
-  ~0u,  // no _oneof_case_
-  ~0u,  // no _weak_field_map_
-  ~0u,  // no _inlined_string_donated_
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::compiler::CodeGeneratorResponse, _impl_.error_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::compiler::CodeGeneratorResponse, _impl_.supported_features_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::compiler::CodeGeneratorResponse, _impl_.file_),
-  0,
-  1,
-  ~0u,
-};
-static const ::_pbi::MigrationSchema schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = {
-  { 0, 10, -1, sizeof(::PROTOBUF_NAMESPACE_ID::compiler::Version)},
-  { 14, 24, -1, sizeof(::PROTOBUF_NAMESPACE_ID::compiler::CodeGeneratorRequest)},
-  { 28, 38, -1, sizeof(::PROTOBUF_NAMESPACE_ID::compiler::CodeGeneratorResponse_File)},
-  { 42, 51, -1, sizeof(::PROTOBUF_NAMESPACE_ID::compiler::CodeGeneratorResponse)},
-};
-
-static const ::_pb::Message* const file_default_instances[] = {
-  &::PROTOBUF_NAMESPACE_ID::compiler::_Version_default_instance_._instance,
-  &::PROTOBUF_NAMESPACE_ID::compiler::_CodeGeneratorRequest_default_instance_._instance,
-  &::PROTOBUF_NAMESPACE_ID::compiler::_CodeGeneratorResponse_File_default_instance_._instance,
-  &::PROTOBUF_NAMESPACE_ID::compiler::_CodeGeneratorResponse_default_instance_._instance,
-};
-
-const char descriptor_table_protodef_google_2fprotobuf_2fcompiler_2fplugin_2eproto[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) =
-  "\n%google/protobuf/compiler/plugin.proto\022"
-  "\030google.protobuf.compiler\032 google/protob"
-  "uf/descriptor.proto\"F\n\007Version\022\r\n\005major\030"
-  "\001 \001(\005\022\r\n\005minor\030\002 \001(\005\022\r\n\005patch\030\003 \001(\005\022\016\n\006s"
-  "uffix\030\004 \001(\t\"\272\001\n\024CodeGeneratorRequest\022\030\n\020"
-  "file_to_generate\030\001 \003(\t\022\021\n\tparameter\030\002 \001("
-  "\t\0228\n\nproto_file\030\017 \003(\0132$.google.protobuf."
-  "FileDescriptorProto\022;\n\020compiler_version\030"
-  "\003 \001(\0132!.google.protobuf.compiler.Version"
-  "\"\301\002\n\025CodeGeneratorResponse\022\r\n\005error\030\001 \001("
-  "\t\022\032\n\022supported_features\030\002 \001(\004\022B\n\004file\030\017 "
-  "\003(\01324.google.protobuf.compiler.CodeGener"
-  "atorResponse.File\032\177\n\004File\022\014\n\004name\030\001 \001(\t\022"
-  "\027\n\017insertion_point\030\002 \001(\t\022\017\n\007content\030\017 \001("
-  "\t\022\?\n\023generated_code_info\030\020 \001(\0132\".google."
-  "protobuf.GeneratedCodeInfo\"8\n\007Feature\022\020\n"
-  "\014FEATURE_NONE\020\000\022\033\n\027FEATURE_PROTO3_OPTION"
-  "AL\020\001BW\n\034com.google.protobuf.compilerB\014Pl"
-  "uginProtosZ)google.golang.org/protobuf/t"
-  "ypes/pluginpb"
-  ;
-static const ::_pbi::DescriptorTable* const descriptor_table_google_2fprotobuf_2fcompiler_2fplugin_2eproto_deps[1] = {
-  &::descriptor_table_google_2fprotobuf_2fdescriptor_2eproto,
-};
-static ::_pbi::once_flag descriptor_table_google_2fprotobuf_2fcompiler_2fplugin_2eproto_once;
-const ::_pbi::DescriptorTable descriptor_table_google_2fprotobuf_2fcompiler_2fplugin_2eproto = {
-    false, false, 773, descriptor_table_protodef_google_2fprotobuf_2fcompiler_2fplugin_2eproto,
-    "google/protobuf/compiler/plugin.proto",
-    &descriptor_table_google_2fprotobuf_2fcompiler_2fplugin_2eproto_once, descriptor_table_google_2fprotobuf_2fcompiler_2fplugin_2eproto_deps, 1, 4,
-    schemas, file_default_instances, TableStruct_google_2fprotobuf_2fcompiler_2fplugin_2eproto::offsets,
-    file_level_metadata_google_2fprotobuf_2fcompiler_2fplugin_2eproto, file_level_enum_descriptors_google_2fprotobuf_2fcompiler_2fplugin_2eproto,
-    file_level_service_descriptors_google_2fprotobuf_2fcompiler_2fplugin_2eproto,
-};
-PROTOBUF_ATTRIBUTE_WEAK const ::_pbi::DescriptorTable* descriptor_table_google_2fprotobuf_2fcompiler_2fplugin_2eproto_getter() {
-  return &descriptor_table_google_2fprotobuf_2fcompiler_2fplugin_2eproto;
-}
-
-// Force running AddDescriptors() at dynamic initialization time.
-PROTOBUF_ATTRIBUTE_INIT_PRIORITY2 static ::_pbi::AddDescriptorsRunner dynamic_init_dummy_google_2fprotobuf_2fcompiler_2fplugin_2eproto(&descriptor_table_google_2fprotobuf_2fcompiler_2fplugin_2eproto);
-PROTOBUF_NAMESPACE_OPEN
-namespace compiler {
-const ::PROTOBUF_NAMESPACE_ID::EnumDescriptor* CodeGeneratorResponse_Feature_descriptor() {
-  ::PROTOBUF_NAMESPACE_ID::internal::AssignDescriptors(&descriptor_table_google_2fprotobuf_2fcompiler_2fplugin_2eproto);
-  return file_level_enum_descriptors_google_2fprotobuf_2fcompiler_2fplugin_2eproto[0];
-}
-bool CodeGeneratorResponse_Feature_IsValid(int value) {
-  switch (value) {
-    case 0:
-    case 1:
-      return true;
-    default:
-      return false;
-  }
-}
-
-#if (__cplusplus < 201703) && (!defined(_MSC_VER) || (_MSC_VER >= 1900 && _MSC_VER < 1912))
-constexpr CodeGeneratorResponse_Feature CodeGeneratorResponse::FEATURE_NONE;
-constexpr CodeGeneratorResponse_Feature CodeGeneratorResponse::FEATURE_PROTO3_OPTIONAL;
-constexpr CodeGeneratorResponse_Feature CodeGeneratorResponse::Feature_MIN;
-constexpr CodeGeneratorResponse_Feature CodeGeneratorResponse::Feature_MAX;
-constexpr int CodeGeneratorResponse::Feature_ARRAYSIZE;
-#endif  // (__cplusplus < 201703) && (!defined(_MSC_VER) || (_MSC_VER >= 1900 && _MSC_VER < 1912))
-
-// ===================================================================
-
-class Version::_Internal {
- public:
-  using HasBits = decltype(std::declval<Version>()._impl_._has_bits_);
-  static void set_has_major(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
-  static void set_has_minor(HasBits* has_bits) {
-    (*has_bits)[0] |= 4u;
-  }
-  static void set_has_patch(HasBits* has_bits) {
-    (*has_bits)[0] |= 8u;
-  }
-  static void set_has_suffix(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-};
-
-Version::Version(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                         bool is_message_owned)
-  : ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned) {
-  SharedCtor(arena, is_message_owned);
-  // @@protoc_insertion_point(arena_constructor:google.protobuf.compiler.Version)
-}
-Version::Version(const Version& from)
-  : ::PROTOBUF_NAMESPACE_ID::Message() {
-  Version* const _this = this; (void)_this;
-  new (&_impl_) Impl_{
-      decltype(_impl_._has_bits_){from._impl_._has_bits_}
-    , /*decltype(_impl_._cached_size_)*/{}
-    , decltype(_impl_.suffix_){}
-    , decltype(_impl_.major_){}
-    , decltype(_impl_.minor_){}
-    , decltype(_impl_.patch_){}};
-
-  _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-  _impl_.suffix_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.suffix_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (from._internal_has_suffix()) {
-    _this->_impl_.suffix_.Set(from._internal_suffix(), 
-      _this->GetArenaForAllocation());
-  }
-  ::memcpy(&_impl_.major_, &from._impl_.major_,
-    static_cast<size_t>(reinterpret_cast<char*>(&_impl_.patch_) -
-    reinterpret_cast<char*>(&_impl_.major_)) + sizeof(_impl_.patch_));
-  // @@protoc_insertion_point(copy_constructor:google.protobuf.compiler.Version)
-}
-
-inline void Version::SharedCtor(
-    ::_pb::Arena* arena, bool is_message_owned) {
-  (void)arena;
-  (void)is_message_owned;
-  new (&_impl_) Impl_{
-      decltype(_impl_._has_bits_){}
-    , /*decltype(_impl_._cached_size_)*/{}
-    , decltype(_impl_.suffix_){}
-    , decltype(_impl_.major_){0}
-    , decltype(_impl_.minor_){0}
-    , decltype(_impl_.patch_){0}
-  };
-  _impl_.suffix_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.suffix_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-}
-
-Version::~Version() {
-  // @@protoc_insertion_point(destructor:google.protobuf.compiler.Version)
-  if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) {
-  (void)arena;
-    return;
-  }
-  SharedDtor();
-}
-
-inline void Version::SharedDtor() {
-  GOOGLE_DCHECK(GetArenaForAllocation() == nullptr);
-  _impl_.suffix_.Destroy();
-}
-
-void Version::SetCachedSize(int size) const {
-  _impl_._cached_size_.Set(size);
-}
-
-void Version::Clear() {
-// @@protoc_insertion_point(message_clear_start:google.protobuf.compiler.Version)
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000001u) {
-    _impl_.suffix_.ClearNonDefaultToEmpty();
-  }
-  if (cached_has_bits & 0x0000000eu) {
-    ::memset(&_impl_.major_, 0, static_cast<size_t>(
-        reinterpret_cast<char*>(&_impl_.patch_) -
-        reinterpret_cast<char*>(&_impl_.major_)) + sizeof(_impl_.patch_));
-  }
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>();
-}
-
-const char* Version::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) {
-#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure
-  _Internal::HasBits has_bits{};
-  while (!ctx->Done(&ptr)) {
-    uint32_t tag;
-    ptr = ::_pbi::ReadTag(ptr, &tag);
-    switch (tag >> 3) {
-      // optional int32 major = 1;
-      case 1:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 8)) {
-          _Internal::set_has_major(&has_bits);
-          _impl_.major_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr);
-          CHK_(ptr);
-        } else
-          goto handle_unusual;
-        continue;
-      // optional int32 minor = 2;
-      case 2:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 16)) {
-          _Internal::set_has_minor(&has_bits);
-          _impl_.minor_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr);
-          CHK_(ptr);
-        } else
-          goto handle_unusual;
-        continue;
-      // optional int32 patch = 3;
-      case 3:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 24)) {
-          _Internal::set_has_patch(&has_bits);
-          _impl_.patch_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr);
-          CHK_(ptr);
-        } else
-          goto handle_unusual;
-        continue;
-      // optional string suffix = 4;
-      case 4:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 34)) {
-          auto str = _internal_mutable_suffix();
-          ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx);
-          CHK_(ptr);
-          #ifndef NDEBUG
-          ::_pbi::VerifyUTF8(str, "google.protobuf.compiler.Version.suffix");
-          #endif  // !NDEBUG
-        } else
-          goto handle_unusual;
-        continue;
-      default:
-        goto handle_unusual;
-    }  // switch
-  handle_unusual:
-    if ((tag == 0) || ((tag & 7) == 4)) {
-      CHK_(ptr);
-      ctx->SetLastTag(tag);
-      goto message_done;
-    }
-    ptr = UnknownFieldParse(
-        tag,
-        _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(),
-        ptr, ctx);
-    CHK_(ptr != nullptr);
-  }  // while
-message_done:
-  _impl_._has_bits_.Or(has_bits);
-  return ptr;
-failure:
-  ptr = nullptr;
-  goto message_done;
-#undef CHK_
-}
-
-uint8_t* Version::_InternalSerialize(
-    uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.compiler.Version)
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // optional int32 major = 1;
-  if (cached_has_bits & 0x00000002u) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteInt32ToArray(1, this->_internal_major(), target);
-  }
-
-  // optional int32 minor = 2;
-  if (cached_has_bits & 0x00000004u) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteInt32ToArray(2, this->_internal_minor(), target);
-  }
-
-  // optional int32 patch = 3;
-  if (cached_has_bits & 0x00000008u) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteInt32ToArray(3, this->_internal_patch(), target);
-  }
-
-  // optional string suffix = 4;
-  if (cached_has_bits & 0x00000001u) {
-    ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::VerifyUTF8StringNamedField(
-      this->_internal_suffix().data(), static_cast<int>(this->_internal_suffix().length()),
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::SERIALIZE,
-      "google.protobuf.compiler.Version.suffix");
-    target = stream->WriteStringMaybeAliased(
-        4, this->_internal_suffix(), target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-        _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.compiler.Version)
-  return target;
-}
-
-size_t Version::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:google.protobuf.compiler.Version)
-  size_t total_size = 0;
-
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x0000000fu) {
-    // optional string suffix = 4;
-    if (cached_has_bits & 0x00000001u) {
-      total_size += 1 +
-        ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize(
-          this->_internal_suffix());
-    }
-
-    // optional int32 major = 1;
-    if (cached_has_bits & 0x00000002u) {
-      total_size += ::_pbi::WireFormatLite::Int32SizePlusOne(this->_internal_major());
-    }
-
-    // optional int32 minor = 2;
-    if (cached_has_bits & 0x00000004u) {
-      total_size += ::_pbi::WireFormatLite::Int32SizePlusOne(this->_internal_minor());
-    }
-
-    // optional int32 patch = 3;
-    if (cached_has_bits & 0x00000008u) {
-      total_size += ::_pbi::WireFormatLite::Int32SizePlusOne(this->_internal_patch());
-    }
-
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData Version::_class_data_ = {
-    ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck,
-    Version::MergeImpl
-};
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*Version::GetClassData() const { return &_class_data_; }
-
-
-void Version::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) {
-  auto* const _this = static_cast<Version*>(&to_msg);
-  auto& from = static_cast<const Version&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.compiler.Version)
-  GOOGLE_DCHECK_NE(&from, _this);
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  cached_has_bits = from._impl_._has_bits_[0];
-  if (cached_has_bits & 0x0000000fu) {
-    if (cached_has_bits & 0x00000001u) {
-      _this->_internal_set_suffix(from._internal_suffix());
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _this->_impl_.major_ = from._impl_.major_;
-    }
-    if (cached_has_bits & 0x00000004u) {
-      _this->_impl_.minor_ = from._impl_.minor_;
-    }
-    if (cached_has_bits & 0x00000008u) {
-      _this->_impl_.patch_ = from._impl_.patch_;
-    }
-    _this->_impl_._has_bits_[0] |= cached_has_bits;
-  }
-  _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void Version::CopyFrom(const Version& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.compiler.Version)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool Version::IsInitialized() const {
-  return true;
-}
-
-void Version::InternalSwap(Version* other) {
-  using std::swap;
-  auto* lhs_arena = GetArenaForAllocation();
-  auto* rhs_arena = other->GetArenaForAllocation();
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::InternalSwap(
-      &_impl_.suffix_, lhs_arena,
-      &other->_impl_.suffix_, rhs_arena
-  );
-  ::PROTOBUF_NAMESPACE_ID::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(Version, _impl_.patch_)
-      + sizeof(Version::_impl_.patch_)
-      - PROTOBUF_FIELD_OFFSET(Version, _impl_.major_)>(
-          reinterpret_cast<char*>(&_impl_.major_),
-          reinterpret_cast<char*>(&other->_impl_.major_));
-}
-
-::PROTOBUF_NAMESPACE_ID::Metadata Version::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_google_2fprotobuf_2fcompiler_2fplugin_2eproto_getter, &descriptor_table_google_2fprotobuf_2fcompiler_2fplugin_2eproto_once,
-      file_level_metadata_google_2fprotobuf_2fcompiler_2fplugin_2eproto[0]);
-}
-
-// ===================================================================
-
-class CodeGeneratorRequest::_Internal {
- public:
-  using HasBits = decltype(std::declval<CodeGeneratorRequest>()._impl_._has_bits_);
-  static void set_has_parameter(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::compiler::Version& compiler_version(const CodeGeneratorRequest* msg);
-  static void set_has_compiler_version(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
-};
-
-const ::PROTOBUF_NAMESPACE_ID::compiler::Version&
-CodeGeneratorRequest::_Internal::compiler_version(const CodeGeneratorRequest* msg) {
-  return *msg->_impl_.compiler_version_;
-}
-void CodeGeneratorRequest::clear_proto_file() {
-  _impl_.proto_file_.Clear();
-}
-CodeGeneratorRequest::CodeGeneratorRequest(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                         bool is_message_owned)
-  : ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned) {
-  SharedCtor(arena, is_message_owned);
-  // @@protoc_insertion_point(arena_constructor:google.protobuf.compiler.CodeGeneratorRequest)
-}
-CodeGeneratorRequest::CodeGeneratorRequest(const CodeGeneratorRequest& from)
-  : ::PROTOBUF_NAMESPACE_ID::Message() {
-  CodeGeneratorRequest* const _this = this; (void)_this;
-  new (&_impl_) Impl_{
-      decltype(_impl_._has_bits_){from._impl_._has_bits_}
-    , /*decltype(_impl_._cached_size_)*/{}
-    , decltype(_impl_.file_to_generate_){from._impl_.file_to_generate_}
-    , decltype(_impl_.proto_file_){from._impl_.proto_file_}
-    , decltype(_impl_.parameter_){}
-    , decltype(_impl_.compiler_version_){nullptr}};
-
-  _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-  _impl_.parameter_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.parameter_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (from._internal_has_parameter()) {
-    _this->_impl_.parameter_.Set(from._internal_parameter(), 
-      _this->GetArenaForAllocation());
-  }
-  if (from._internal_has_compiler_version()) {
-    _this->_impl_.compiler_version_ = new ::PROTOBUF_NAMESPACE_ID::compiler::Version(*from._impl_.compiler_version_);
-  }
-  // @@protoc_insertion_point(copy_constructor:google.protobuf.compiler.CodeGeneratorRequest)
-}
-
-inline void CodeGeneratorRequest::SharedCtor(
-    ::_pb::Arena* arena, bool is_message_owned) {
-  (void)arena;
-  (void)is_message_owned;
-  new (&_impl_) Impl_{
-      decltype(_impl_._has_bits_){}
-    , /*decltype(_impl_._cached_size_)*/{}
-    , decltype(_impl_.file_to_generate_){arena}
-    , decltype(_impl_.proto_file_){arena}
-    , decltype(_impl_.parameter_){}
-    , decltype(_impl_.compiler_version_){nullptr}
-  };
-  _impl_.parameter_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.parameter_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-}
-
-CodeGeneratorRequest::~CodeGeneratorRequest() {
-  // @@protoc_insertion_point(destructor:google.protobuf.compiler.CodeGeneratorRequest)
-  if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) {
-  (void)arena;
-    return;
-  }
-  SharedDtor();
-}
-
-inline void CodeGeneratorRequest::SharedDtor() {
-  GOOGLE_DCHECK(GetArenaForAllocation() == nullptr);
-  _impl_.file_to_generate_.~RepeatedPtrField();
-  _impl_.proto_file_.~RepeatedPtrField();
-  _impl_.parameter_.Destroy();
-  if (this != internal_default_instance()) delete _impl_.compiler_version_;
-}
-
-void CodeGeneratorRequest::SetCachedSize(int size) const {
-  _impl_._cached_size_.Set(size);
-}
-
-void CodeGeneratorRequest::Clear() {
-// @@protoc_insertion_point(message_clear_start:google.protobuf.compiler.CodeGeneratorRequest)
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.file_to_generate_.Clear();
-  _impl_.proto_file_.Clear();
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      _impl_.parameter_.ClearNonDefaultToEmpty();
-    }
-    if (cached_has_bits & 0x00000002u) {
-      GOOGLE_DCHECK(_impl_.compiler_version_ != nullptr);
-      _impl_.compiler_version_->Clear();
-    }
-  }
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>();
-}
-
-const char* CodeGeneratorRequest::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) {
-#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure
-  _Internal::HasBits has_bits{};
-  while (!ctx->Done(&ptr)) {
-    uint32_t tag;
-    ptr = ::_pbi::ReadTag(ptr, &tag);
-    switch (tag >> 3) {
-      // repeated string file_to_generate = 1;
-      case 1:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 10)) {
-          ptr -= 1;
-          do {
-            ptr += 1;
-            auto str = _internal_add_file_to_generate();
-            ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx);
-            CHK_(ptr);
-            #ifndef NDEBUG
-            ::_pbi::VerifyUTF8(str, "google.protobuf.compiler.CodeGeneratorRequest.file_to_generate");
-            #endif  // !NDEBUG
-            if (!ctx->DataAvailable(ptr)) break;
-          } while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<10>(ptr));
-        } else
-          goto handle_unusual;
-        continue;
-      // optional string parameter = 2;
-      case 2:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 18)) {
-          auto str = _internal_mutable_parameter();
-          ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx);
-          CHK_(ptr);
-          #ifndef NDEBUG
-          ::_pbi::VerifyUTF8(str, "google.protobuf.compiler.CodeGeneratorRequest.parameter");
-          #endif  // !NDEBUG
-        } else
-          goto handle_unusual;
-        continue;
-      // optional .google.protobuf.compiler.Version compiler_version = 3;
-      case 3:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 26)) {
-          ptr = ctx->ParseMessage(_internal_mutable_compiler_version(), ptr);
-          CHK_(ptr);
-        } else
-          goto handle_unusual;
-        continue;
-      // repeated .google.protobuf.FileDescriptorProto proto_file = 15;
-      case 15:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 122)) {
-          ptr -= 1;
-          do {
-            ptr += 1;
-            ptr = ctx->ParseMessage(_internal_add_proto_file(), ptr);
-            CHK_(ptr);
-            if (!ctx->DataAvailable(ptr)) break;
-          } while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<122>(ptr));
-        } else
-          goto handle_unusual;
-        continue;
-      default:
-        goto handle_unusual;
-    }  // switch
-  handle_unusual:
-    if ((tag == 0) || ((tag & 7) == 4)) {
-      CHK_(ptr);
-      ctx->SetLastTag(tag);
-      goto message_done;
-    }
-    ptr = UnknownFieldParse(
-        tag,
-        _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(),
-        ptr, ctx);
-    CHK_(ptr != nullptr);
-  }  // while
-message_done:
-  _impl_._has_bits_.Or(has_bits);
-  return ptr;
-failure:
-  ptr = nullptr;
-  goto message_done;
-#undef CHK_
-}
-
-uint8_t* CodeGeneratorRequest::_InternalSerialize(
-    uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.compiler.CodeGeneratorRequest)
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  // repeated string file_to_generate = 1;
-  for (int i = 0, n = this->_internal_file_to_generate_size(); i < n; i++) {
-    const auto& s = this->_internal_file_to_generate(i);
-    ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::VerifyUTF8StringNamedField(
-      s.data(), static_cast<int>(s.length()),
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::SERIALIZE,
-      "google.protobuf.compiler.CodeGeneratorRequest.file_to_generate");
-    target = stream->WriteString(1, s, target);
-  }
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // optional string parameter = 2;
-  if (cached_has_bits & 0x00000001u) {
-    ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::VerifyUTF8StringNamedField(
-      this->_internal_parameter().data(), static_cast<int>(this->_internal_parameter().length()),
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::SERIALIZE,
-      "google.protobuf.compiler.CodeGeneratorRequest.parameter");
-    target = stream->WriteStringMaybeAliased(
-        2, this->_internal_parameter(), target);
-  }
-
-  // optional .google.protobuf.compiler.Version compiler_version = 3;
-  if (cached_has_bits & 0x00000002u) {
-    target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
-      InternalWriteMessage(3, _Internal::compiler_version(this),
-        _Internal::compiler_version(this).GetCachedSize(), target, stream);
-  }
-
-  // repeated .google.protobuf.FileDescriptorProto proto_file = 15;
-  for (unsigned i = 0,
-      n = static_cast<unsigned>(this->_internal_proto_file_size()); i < n; i++) {
-    const auto& repfield = this->_internal_proto_file(i);
-    target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
-        InternalWriteMessage(15, repfield, repfield.GetCachedSize(), target, stream);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-        _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.compiler.CodeGeneratorRequest)
-  return target;
-}
-
-size_t CodeGeneratorRequest::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:google.protobuf.compiler.CodeGeneratorRequest)
-  size_t total_size = 0;
-
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // repeated string file_to_generate = 1;
-  total_size += 1 *
-      ::PROTOBUF_NAMESPACE_ID::internal::FromIntSize(_impl_.file_to_generate_.size());
-  for (int i = 0, n = _impl_.file_to_generate_.size(); i < n; i++) {
-    total_size += ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize(
-      _impl_.file_to_generate_.Get(i));
-  }
-
-  // repeated .google.protobuf.FileDescriptorProto proto_file = 15;
-  total_size += 1UL * this->_internal_proto_file_size();
-  for (const auto& msg : this->_impl_.proto_file_) {
-    total_size +=
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(msg);
-  }
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    // optional string parameter = 2;
-    if (cached_has_bits & 0x00000001u) {
-      total_size += 1 +
-        ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize(
-          this->_internal_parameter());
-    }
-
-    // optional .google.protobuf.compiler.Version compiler_version = 3;
-    if (cached_has_bits & 0x00000002u) {
-      total_size += 1 +
-        ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(
-          *_impl_.compiler_version_);
-    }
-
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData CodeGeneratorRequest::_class_data_ = {
-    ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck,
-    CodeGeneratorRequest::MergeImpl
-};
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*CodeGeneratorRequest::GetClassData() const { return &_class_data_; }
-
-
-void CodeGeneratorRequest::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) {
-  auto* const _this = static_cast<CodeGeneratorRequest*>(&to_msg);
-  auto& from = static_cast<const CodeGeneratorRequest&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.compiler.CodeGeneratorRequest)
-  GOOGLE_DCHECK_NE(&from, _this);
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  _this->_impl_.file_to_generate_.MergeFrom(from._impl_.file_to_generate_);
-  _this->_impl_.proto_file_.MergeFrom(from._impl_.proto_file_);
-  cached_has_bits = from._impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      _this->_internal_set_parameter(from._internal_parameter());
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _this->_internal_mutable_compiler_version()->::PROTOBUF_NAMESPACE_ID::compiler::Version::MergeFrom(
-          from._internal_compiler_version());
-    }
-  }
-  _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void CodeGeneratorRequest::CopyFrom(const CodeGeneratorRequest& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.compiler.CodeGeneratorRequest)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool CodeGeneratorRequest::IsInitialized() const {
-  if (!::PROTOBUF_NAMESPACE_ID::internal::AllAreInitialized(_impl_.proto_file_))
-    return false;
-  return true;
-}
-
-void CodeGeneratorRequest::InternalSwap(CodeGeneratorRequest* other) {
-  using std::swap;
-  auto* lhs_arena = GetArenaForAllocation();
-  auto* rhs_arena = other->GetArenaForAllocation();
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  _impl_.file_to_generate_.InternalSwap(&other->_impl_.file_to_generate_);
-  _impl_.proto_file_.InternalSwap(&other->_impl_.proto_file_);
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::InternalSwap(
-      &_impl_.parameter_, lhs_arena,
-      &other->_impl_.parameter_, rhs_arena
-  );
-  swap(_impl_.compiler_version_, other->_impl_.compiler_version_);
-}
-
-::PROTOBUF_NAMESPACE_ID::Metadata CodeGeneratorRequest::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_google_2fprotobuf_2fcompiler_2fplugin_2eproto_getter, &descriptor_table_google_2fprotobuf_2fcompiler_2fplugin_2eproto_once,
-      file_level_metadata_google_2fprotobuf_2fcompiler_2fplugin_2eproto[1]);
-}
-
-// ===================================================================
-
-class CodeGeneratorResponse_File::_Internal {
- public:
-  using HasBits = decltype(std::declval<CodeGeneratorResponse_File>()._impl_._has_bits_);
-  static void set_has_name(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-  static void set_has_insertion_point(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
-  static void set_has_content(HasBits* has_bits) {
-    (*has_bits)[0] |= 4u;
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::GeneratedCodeInfo& generated_code_info(const CodeGeneratorResponse_File* msg);
-  static void set_has_generated_code_info(HasBits* has_bits) {
-    (*has_bits)[0] |= 8u;
-  }
-};
-
-const ::PROTOBUF_NAMESPACE_ID::GeneratedCodeInfo&
-CodeGeneratorResponse_File::_Internal::generated_code_info(const CodeGeneratorResponse_File* msg) {
-  return *msg->_impl_.generated_code_info_;
-}
-void CodeGeneratorResponse_File::clear_generated_code_info() {
-  if (_impl_.generated_code_info_ != nullptr) _impl_.generated_code_info_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000008u;
-}
-CodeGeneratorResponse_File::CodeGeneratorResponse_File(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                         bool is_message_owned)
-  : ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned) {
-  SharedCtor(arena, is_message_owned);
-  // @@protoc_insertion_point(arena_constructor:google.protobuf.compiler.CodeGeneratorResponse.File)
-}
-CodeGeneratorResponse_File::CodeGeneratorResponse_File(const CodeGeneratorResponse_File& from)
-  : ::PROTOBUF_NAMESPACE_ID::Message() {
-  CodeGeneratorResponse_File* const _this = this; (void)_this;
-  new (&_impl_) Impl_{
-      decltype(_impl_._has_bits_){from._impl_._has_bits_}
-    , /*decltype(_impl_._cached_size_)*/{}
-    , decltype(_impl_.name_){}
-    , decltype(_impl_.insertion_point_){}
-    , decltype(_impl_.content_){}
-    , decltype(_impl_.generated_code_info_){nullptr}};
-
-  _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-  _impl_.name_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.name_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (from._internal_has_name()) {
-    _this->_impl_.name_.Set(from._internal_name(), 
-      _this->GetArenaForAllocation());
-  }
-  _impl_.insertion_point_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.insertion_point_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (from._internal_has_insertion_point()) {
-    _this->_impl_.insertion_point_.Set(from._internal_insertion_point(), 
-      _this->GetArenaForAllocation());
-  }
-  _impl_.content_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.content_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (from._internal_has_content()) {
-    _this->_impl_.content_.Set(from._internal_content(), 
-      _this->GetArenaForAllocation());
-  }
-  if (from._internal_has_generated_code_info()) {
-    _this->_impl_.generated_code_info_ = new ::PROTOBUF_NAMESPACE_ID::GeneratedCodeInfo(*from._impl_.generated_code_info_);
-  }
-  // @@protoc_insertion_point(copy_constructor:google.protobuf.compiler.CodeGeneratorResponse.File)
-}
-
-inline void CodeGeneratorResponse_File::SharedCtor(
-    ::_pb::Arena* arena, bool is_message_owned) {
-  (void)arena;
-  (void)is_message_owned;
-  new (&_impl_) Impl_{
-      decltype(_impl_._has_bits_){}
-    , /*decltype(_impl_._cached_size_)*/{}
-    , decltype(_impl_.name_){}
-    , decltype(_impl_.insertion_point_){}
-    , decltype(_impl_.content_){}
-    , decltype(_impl_.generated_code_info_){nullptr}
-  };
-  _impl_.name_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.name_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  _impl_.insertion_point_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.insertion_point_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  _impl_.content_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.content_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-}
-
-CodeGeneratorResponse_File::~CodeGeneratorResponse_File() {
-  // @@protoc_insertion_point(destructor:google.protobuf.compiler.CodeGeneratorResponse.File)
-  if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) {
-  (void)arena;
-    return;
-  }
-  SharedDtor();
-}
-
-inline void CodeGeneratorResponse_File::SharedDtor() {
-  GOOGLE_DCHECK(GetArenaForAllocation() == nullptr);
-  _impl_.name_.Destroy();
-  _impl_.insertion_point_.Destroy();
-  _impl_.content_.Destroy();
-  if (this != internal_default_instance()) delete _impl_.generated_code_info_;
-}
-
-void CodeGeneratorResponse_File::SetCachedSize(int size) const {
-  _impl_._cached_size_.Set(size);
-}
-
-void CodeGeneratorResponse_File::Clear() {
-// @@protoc_insertion_point(message_clear_start:google.protobuf.compiler.CodeGeneratorResponse.File)
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x0000000fu) {
-    if (cached_has_bits & 0x00000001u) {
-      _impl_.name_.ClearNonDefaultToEmpty();
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _impl_.insertion_point_.ClearNonDefaultToEmpty();
-    }
-    if (cached_has_bits & 0x00000004u) {
-      _impl_.content_.ClearNonDefaultToEmpty();
-    }
-    if (cached_has_bits & 0x00000008u) {
-      GOOGLE_DCHECK(_impl_.generated_code_info_ != nullptr);
-      _impl_.generated_code_info_->Clear();
-    }
-  }
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>();
-}
-
-const char* CodeGeneratorResponse_File::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) {
-#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure
-  _Internal::HasBits has_bits{};
-  while (!ctx->Done(&ptr)) {
-    uint32_t tag;
-    ptr = ::_pbi::ReadTag(ptr, &tag);
-    switch (tag >> 3) {
-      // optional string name = 1;
-      case 1:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 10)) {
-          auto str = _internal_mutable_name();
-          ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx);
-          CHK_(ptr);
-          #ifndef NDEBUG
-          ::_pbi::VerifyUTF8(str, "google.protobuf.compiler.CodeGeneratorResponse.File.name");
-          #endif  // !NDEBUG
-        } else
-          goto handle_unusual;
-        continue;
-      // optional string insertion_point = 2;
-      case 2:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 18)) {
-          auto str = _internal_mutable_insertion_point();
-          ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx);
-          CHK_(ptr);
-          #ifndef NDEBUG
-          ::_pbi::VerifyUTF8(str, "google.protobuf.compiler.CodeGeneratorResponse.File.insertion_point");
-          #endif  // !NDEBUG
-        } else
-          goto handle_unusual;
-        continue;
-      // optional string content = 15;
-      case 15:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 122)) {
-          auto str = _internal_mutable_content();
-          ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx);
-          CHK_(ptr);
-          #ifndef NDEBUG
-          ::_pbi::VerifyUTF8(str, "google.protobuf.compiler.CodeGeneratorResponse.File.content");
-          #endif  // !NDEBUG
-        } else
-          goto handle_unusual;
-        continue;
-      // optional .google.protobuf.GeneratedCodeInfo generated_code_info = 16;
-      case 16:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 130)) {
-          ptr = ctx->ParseMessage(_internal_mutable_generated_code_info(), ptr);
-          CHK_(ptr);
-        } else
-          goto handle_unusual;
-        continue;
-      default:
-        goto handle_unusual;
-    }  // switch
-  handle_unusual:
-    if ((tag == 0) || ((tag & 7) == 4)) {
-      CHK_(ptr);
-      ctx->SetLastTag(tag);
-      goto message_done;
-    }
-    ptr = UnknownFieldParse(
-        tag,
-        _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(),
-        ptr, ctx);
-    CHK_(ptr != nullptr);
-  }  // while
-message_done:
-  _impl_._has_bits_.Or(has_bits);
-  return ptr;
-failure:
-  ptr = nullptr;
-  goto message_done;
-#undef CHK_
-}
-
-uint8_t* CodeGeneratorResponse_File::_InternalSerialize(
-    uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.compiler.CodeGeneratorResponse.File)
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // optional string name = 1;
-  if (cached_has_bits & 0x00000001u) {
-    ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::VerifyUTF8StringNamedField(
-      this->_internal_name().data(), static_cast<int>(this->_internal_name().length()),
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::SERIALIZE,
-      "google.protobuf.compiler.CodeGeneratorResponse.File.name");
-    target = stream->WriteStringMaybeAliased(
-        1, this->_internal_name(), target);
-  }
-
-  // optional string insertion_point = 2;
-  if (cached_has_bits & 0x00000002u) {
-    ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::VerifyUTF8StringNamedField(
-      this->_internal_insertion_point().data(), static_cast<int>(this->_internal_insertion_point().length()),
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::SERIALIZE,
-      "google.protobuf.compiler.CodeGeneratorResponse.File.insertion_point");
-    target = stream->WriteStringMaybeAliased(
-        2, this->_internal_insertion_point(), target);
-  }
-
-  // optional string content = 15;
-  if (cached_has_bits & 0x00000004u) {
-    ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::VerifyUTF8StringNamedField(
-      this->_internal_content().data(), static_cast<int>(this->_internal_content().length()),
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::SERIALIZE,
-      "google.protobuf.compiler.CodeGeneratorResponse.File.content");
-    target = stream->WriteStringMaybeAliased(
-        15, this->_internal_content(), target);
-  }
-
-  // optional .google.protobuf.GeneratedCodeInfo generated_code_info = 16;
-  if (cached_has_bits & 0x00000008u) {
-    target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
-      InternalWriteMessage(16, _Internal::generated_code_info(this),
-        _Internal::generated_code_info(this).GetCachedSize(), target, stream);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-        _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.compiler.CodeGeneratorResponse.File)
-  return target;
-}
-
-size_t CodeGeneratorResponse_File::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:google.protobuf.compiler.CodeGeneratorResponse.File)
-  size_t total_size = 0;
-
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x0000000fu) {
-    // optional string name = 1;
-    if (cached_has_bits & 0x00000001u) {
-      total_size += 1 +
-        ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize(
-          this->_internal_name());
-    }
-
-    // optional string insertion_point = 2;
-    if (cached_has_bits & 0x00000002u) {
-      total_size += 1 +
-        ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize(
-          this->_internal_insertion_point());
-    }
-
-    // optional string content = 15;
-    if (cached_has_bits & 0x00000004u) {
-      total_size += 1 +
-        ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize(
-          this->_internal_content());
-    }
-
-    // optional .google.protobuf.GeneratedCodeInfo generated_code_info = 16;
-    if (cached_has_bits & 0x00000008u) {
-      total_size += 2 +
-        ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(
-          *_impl_.generated_code_info_);
-    }
-
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData CodeGeneratorResponse_File::_class_data_ = {
-    ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck,
-    CodeGeneratorResponse_File::MergeImpl
-};
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*CodeGeneratorResponse_File::GetClassData() const { return &_class_data_; }
-
-
-void CodeGeneratorResponse_File::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) {
-  auto* const _this = static_cast<CodeGeneratorResponse_File*>(&to_msg);
-  auto& from = static_cast<const CodeGeneratorResponse_File&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.compiler.CodeGeneratorResponse.File)
-  GOOGLE_DCHECK_NE(&from, _this);
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  cached_has_bits = from._impl_._has_bits_[0];
-  if (cached_has_bits & 0x0000000fu) {
-    if (cached_has_bits & 0x00000001u) {
-      _this->_internal_set_name(from._internal_name());
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _this->_internal_set_insertion_point(from._internal_insertion_point());
-    }
-    if (cached_has_bits & 0x00000004u) {
-      _this->_internal_set_content(from._internal_content());
-    }
-    if (cached_has_bits & 0x00000008u) {
-      _this->_internal_mutable_generated_code_info()->::PROTOBUF_NAMESPACE_ID::GeneratedCodeInfo::MergeFrom(
-          from._internal_generated_code_info());
-    }
-  }
-  _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void CodeGeneratorResponse_File::CopyFrom(const CodeGeneratorResponse_File& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.compiler.CodeGeneratorResponse.File)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool CodeGeneratorResponse_File::IsInitialized() const {
-  return true;
-}
-
-void CodeGeneratorResponse_File::InternalSwap(CodeGeneratorResponse_File* other) {
-  using std::swap;
-  auto* lhs_arena = GetArenaForAllocation();
-  auto* rhs_arena = other->GetArenaForAllocation();
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::InternalSwap(
-      &_impl_.name_, lhs_arena,
-      &other->_impl_.name_, rhs_arena
-  );
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::InternalSwap(
-      &_impl_.insertion_point_, lhs_arena,
-      &other->_impl_.insertion_point_, rhs_arena
-  );
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::InternalSwap(
-      &_impl_.content_, lhs_arena,
-      &other->_impl_.content_, rhs_arena
-  );
-  swap(_impl_.generated_code_info_, other->_impl_.generated_code_info_);
-}
-
-::PROTOBUF_NAMESPACE_ID::Metadata CodeGeneratorResponse_File::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_google_2fprotobuf_2fcompiler_2fplugin_2eproto_getter, &descriptor_table_google_2fprotobuf_2fcompiler_2fplugin_2eproto_once,
-      file_level_metadata_google_2fprotobuf_2fcompiler_2fplugin_2eproto[2]);
-}
-
-// ===================================================================
-
-class CodeGeneratorResponse::_Internal {
- public:
-  using HasBits = decltype(std::declval<CodeGeneratorResponse>()._impl_._has_bits_);
-  static void set_has_error(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-  static void set_has_supported_features(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
-};
-
-CodeGeneratorResponse::CodeGeneratorResponse(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                         bool is_message_owned)
-  : ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned) {
-  SharedCtor(arena, is_message_owned);
-  // @@protoc_insertion_point(arena_constructor:google.protobuf.compiler.CodeGeneratorResponse)
-}
-CodeGeneratorResponse::CodeGeneratorResponse(const CodeGeneratorResponse& from)
-  : ::PROTOBUF_NAMESPACE_ID::Message() {
-  CodeGeneratorResponse* const _this = this; (void)_this;
-  new (&_impl_) Impl_{
-      decltype(_impl_._has_bits_){from._impl_._has_bits_}
-    , /*decltype(_impl_._cached_size_)*/{}
-    , decltype(_impl_.file_){from._impl_.file_}
-    , decltype(_impl_.error_){}
-    , decltype(_impl_.supported_features_){}};
-
-  _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-  _impl_.error_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.error_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (from._internal_has_error()) {
-    _this->_impl_.error_.Set(from._internal_error(), 
-      _this->GetArenaForAllocation());
-  }
-  _this->_impl_.supported_features_ = from._impl_.supported_features_;
-  // @@protoc_insertion_point(copy_constructor:google.protobuf.compiler.CodeGeneratorResponse)
-}
-
-inline void CodeGeneratorResponse::SharedCtor(
-    ::_pb::Arena* arena, bool is_message_owned) {
-  (void)arena;
-  (void)is_message_owned;
-  new (&_impl_) Impl_{
-      decltype(_impl_._has_bits_){}
-    , /*decltype(_impl_._cached_size_)*/{}
-    , decltype(_impl_.file_){arena}
-    , decltype(_impl_.error_){}
-    , decltype(_impl_.supported_features_){uint64_t{0u}}
-  };
-  _impl_.error_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.error_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-}
-
-CodeGeneratorResponse::~CodeGeneratorResponse() {
-  // @@protoc_insertion_point(destructor:google.protobuf.compiler.CodeGeneratorResponse)
-  if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) {
-  (void)arena;
-    return;
-  }
-  SharedDtor();
-}
-
-inline void CodeGeneratorResponse::SharedDtor() {
-  GOOGLE_DCHECK(GetArenaForAllocation() == nullptr);
-  _impl_.file_.~RepeatedPtrField();
-  _impl_.error_.Destroy();
-}
-
-void CodeGeneratorResponse::SetCachedSize(int size) const {
-  _impl_._cached_size_.Set(size);
-}
-
-void CodeGeneratorResponse::Clear() {
-// @@protoc_insertion_point(message_clear_start:google.protobuf.compiler.CodeGeneratorResponse)
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.file_.Clear();
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000001u) {
-    _impl_.error_.ClearNonDefaultToEmpty();
-  }
-  _impl_.supported_features_ = uint64_t{0u};
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>();
-}
-
-const char* CodeGeneratorResponse::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) {
-#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure
-  _Internal::HasBits has_bits{};
-  while (!ctx->Done(&ptr)) {
-    uint32_t tag;
-    ptr = ::_pbi::ReadTag(ptr, &tag);
-    switch (tag >> 3) {
-      // optional string error = 1;
-      case 1:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 10)) {
-          auto str = _internal_mutable_error();
-          ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx);
-          CHK_(ptr);
-          #ifndef NDEBUG
-          ::_pbi::VerifyUTF8(str, "google.protobuf.compiler.CodeGeneratorResponse.error");
-          #endif  // !NDEBUG
-        } else
-          goto handle_unusual;
-        continue;
-      // optional uint64 supported_features = 2;
-      case 2:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 16)) {
-          _Internal::set_has_supported_features(&has_bits);
-          _impl_.supported_features_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr);
-          CHK_(ptr);
-        } else
-          goto handle_unusual;
-        continue;
-      // repeated .google.protobuf.compiler.CodeGeneratorResponse.File file = 15;
-      case 15:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 122)) {
-          ptr -= 1;
-          do {
-            ptr += 1;
-            ptr = ctx->ParseMessage(_internal_add_file(), ptr);
-            CHK_(ptr);
-            if (!ctx->DataAvailable(ptr)) break;
-          } while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<122>(ptr));
-        } else
-          goto handle_unusual;
-        continue;
-      default:
-        goto handle_unusual;
-    }  // switch
-  handle_unusual:
-    if ((tag == 0) || ((tag & 7) == 4)) {
-      CHK_(ptr);
-      ctx->SetLastTag(tag);
-      goto message_done;
-    }
-    ptr = UnknownFieldParse(
-        tag,
-        _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(),
-        ptr, ctx);
-    CHK_(ptr != nullptr);
-  }  // while
-message_done:
-  _impl_._has_bits_.Or(has_bits);
-  return ptr;
-failure:
-  ptr = nullptr;
-  goto message_done;
-#undef CHK_
-}
-
-uint8_t* CodeGeneratorResponse::_InternalSerialize(
-    uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.compiler.CodeGeneratorResponse)
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // optional string error = 1;
-  if (cached_has_bits & 0x00000001u) {
-    ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::VerifyUTF8StringNamedField(
-      this->_internal_error().data(), static_cast<int>(this->_internal_error().length()),
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::SERIALIZE,
-      "google.protobuf.compiler.CodeGeneratorResponse.error");
-    target = stream->WriteStringMaybeAliased(
-        1, this->_internal_error(), target);
-  }
-
-  // optional uint64 supported_features = 2;
-  if (cached_has_bits & 0x00000002u) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteUInt64ToArray(2, this->_internal_supported_features(), target);
-  }
-
-  // repeated .google.protobuf.compiler.CodeGeneratorResponse.File file = 15;
-  for (unsigned i = 0,
-      n = static_cast<unsigned>(this->_internal_file_size()); i < n; i++) {
-    const auto& repfield = this->_internal_file(i);
-    target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
-        InternalWriteMessage(15, repfield, repfield.GetCachedSize(), target, stream);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-        _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.compiler.CodeGeneratorResponse)
-  return target;
-}
-
-size_t CodeGeneratorResponse::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:google.protobuf.compiler.CodeGeneratorResponse)
-  size_t total_size = 0;
-
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // repeated .google.protobuf.compiler.CodeGeneratorResponse.File file = 15;
-  total_size += 1UL * this->_internal_file_size();
-  for (const auto& msg : this->_impl_.file_) {
-    total_size +=
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(msg);
-  }
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    // optional string error = 1;
-    if (cached_has_bits & 0x00000001u) {
-      total_size += 1 +
-        ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize(
-          this->_internal_error());
-    }
-
-    // optional uint64 supported_features = 2;
-    if (cached_has_bits & 0x00000002u) {
-      total_size += ::_pbi::WireFormatLite::UInt64SizePlusOne(this->_internal_supported_features());
-    }
-
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData CodeGeneratorResponse::_class_data_ = {
-    ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck,
-    CodeGeneratorResponse::MergeImpl
-};
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*CodeGeneratorResponse::GetClassData() const { return &_class_data_; }
-
-
-void CodeGeneratorResponse::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) {
-  auto* const _this = static_cast<CodeGeneratorResponse*>(&to_msg);
-  auto& from = static_cast<const CodeGeneratorResponse&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.compiler.CodeGeneratorResponse)
-  GOOGLE_DCHECK_NE(&from, _this);
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  _this->_impl_.file_.MergeFrom(from._impl_.file_);
-  cached_has_bits = from._impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      _this->_internal_set_error(from._internal_error());
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _this->_impl_.supported_features_ = from._impl_.supported_features_;
-    }
-    _this->_impl_._has_bits_[0] |= cached_has_bits;
-  }
-  _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void CodeGeneratorResponse::CopyFrom(const CodeGeneratorResponse& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.compiler.CodeGeneratorResponse)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool CodeGeneratorResponse::IsInitialized() const {
-  return true;
-}
-
-void CodeGeneratorResponse::InternalSwap(CodeGeneratorResponse* other) {
-  using std::swap;
-  auto* lhs_arena = GetArenaForAllocation();
-  auto* rhs_arena = other->GetArenaForAllocation();
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  _impl_.file_.InternalSwap(&other->_impl_.file_);
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::InternalSwap(
-      &_impl_.error_, lhs_arena,
-      &other->_impl_.error_, rhs_arena
-  );
-  swap(_impl_.supported_features_, other->_impl_.supported_features_);
-}
-
-::PROTOBUF_NAMESPACE_ID::Metadata CodeGeneratorResponse::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_google_2fprotobuf_2fcompiler_2fplugin_2eproto_getter, &descriptor_table_google_2fprotobuf_2fcompiler_2fplugin_2eproto_once,
-      file_level_metadata_google_2fprotobuf_2fcompiler_2fplugin_2eproto[3]);
-}
-
-// @@protoc_insertion_point(namespace_scope)
-}  // namespace compiler
-PROTOBUF_NAMESPACE_CLOSE
-PROTOBUF_NAMESPACE_OPEN
-template<> PROTOBUF_NOINLINE ::PROTOBUF_NAMESPACE_ID::compiler::Version*
-Arena::CreateMaybeMessage< ::PROTOBUF_NAMESPACE_ID::compiler::Version >(Arena* arena) {
-  return Arena::CreateMessageInternal< ::PROTOBUF_NAMESPACE_ID::compiler::Version >(arena);
-}
-template<> PROTOBUF_NOINLINE ::PROTOBUF_NAMESPACE_ID::compiler::CodeGeneratorRequest*
-Arena::CreateMaybeMessage< ::PROTOBUF_NAMESPACE_ID::compiler::CodeGeneratorRequest >(Arena* arena) {
-  return Arena::CreateMessageInternal< ::PROTOBUF_NAMESPACE_ID::compiler::CodeGeneratorRequest >(arena);
-}
-template<> PROTOBUF_NOINLINE ::PROTOBUF_NAMESPACE_ID::compiler::CodeGeneratorResponse_File*
-Arena::CreateMaybeMessage< ::PROTOBUF_NAMESPACE_ID::compiler::CodeGeneratorResponse_File >(Arena* arena) {
-  return Arena::CreateMessageInternal< ::PROTOBUF_NAMESPACE_ID::compiler::CodeGeneratorResponse_File >(arena);
-}
-template<> PROTOBUF_NOINLINE ::PROTOBUF_NAMESPACE_ID::compiler::CodeGeneratorResponse*
-Arena::CreateMaybeMessage< ::PROTOBUF_NAMESPACE_ID::compiler::CodeGeneratorResponse >(Arena* arena) {
-  return Arena::CreateMessageInternal< ::PROTOBUF_NAMESPACE_ID::compiler::CodeGeneratorResponse >(arena);
-}
-PROTOBUF_NAMESPACE_CLOSE
-
-// @@protoc_insertion_point(global_scope)
-#include <google/protobuf/port_undef.inc>
diff --git a/libs/protobuf/src/google/protobuf/compiler/plugin.pb.h b/libs/protobuf/src/google/protobuf/compiler/plugin.pb.h
deleted file mode 100644
index 5f3fa52..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/plugin.pb.h
+++ /dev/null
@@ -1,1901 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/protobuf/compiler/plugin.proto
-
-#ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fcompiler_2fplugin_2eproto
-#define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fcompiler_2fplugin_2eproto
-
-#include <limits>
-#include <string>
-
-#include <google/protobuf/port_def.inc>
-#if PROTOBUF_VERSION < 3021000
-#error This file was generated by a newer version of protoc which is
-#error incompatible with your Protocol Buffer headers. Please update
-#error your headers.
-#endif
-#if 3021012 < PROTOBUF_MIN_PROTOC_VERSION
-#error This file was generated by an older version of protoc which is
-#error incompatible with your Protocol Buffer headers. Please
-#error regenerate this file with a newer version of protoc.
-#endif
-
-#include <google/protobuf/port_undef.inc>
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/arena.h>
-#include <google/protobuf/arenastring.h>
-#include <google/protobuf/generated_message_util.h>
-#include <google/protobuf/metadata_lite.h>
-#include <google/protobuf/generated_message_reflection.h>
-#include <google/protobuf/message.h>
-#include <google/protobuf/repeated_field.h>  // IWYU pragma: export
-#include <google/protobuf/extension_set.h>  // IWYU pragma: export
-#include <google/protobuf/generated_enum_reflection.h>
-#include <google/protobuf/unknown_field_set.h>
-#include <google/protobuf/descriptor.pb.h>
-// @@protoc_insertion_point(includes)
-#include <google/protobuf/port_def.inc>
-#define PROTOBUF_INTERNAL_EXPORT_google_2fprotobuf_2fcompiler_2fplugin_2eproto PROTOC_EXPORT
-#ifdef major
-#undef major
-#endif
-#ifdef minor
-#undef minor
-#endif
-PROTOBUF_NAMESPACE_OPEN
-namespace internal {
-class AnyMetadata;
-}  // namespace internal
-PROTOBUF_NAMESPACE_CLOSE
-
-// Internal implementation detail -- do not use these members.
-struct PROTOC_EXPORT TableStruct_google_2fprotobuf_2fcompiler_2fplugin_2eproto {
-  static const uint32_t offsets[];
-};
-PROTOC_EXPORT extern const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable descriptor_table_google_2fprotobuf_2fcompiler_2fplugin_2eproto;
-PROTOBUF_NAMESPACE_OPEN
-namespace compiler {
-class CodeGeneratorRequest;
-struct CodeGeneratorRequestDefaultTypeInternal;
-PROTOC_EXPORT extern CodeGeneratorRequestDefaultTypeInternal _CodeGeneratorRequest_default_instance_;
-class CodeGeneratorResponse;
-struct CodeGeneratorResponseDefaultTypeInternal;
-PROTOC_EXPORT extern CodeGeneratorResponseDefaultTypeInternal _CodeGeneratorResponse_default_instance_;
-class CodeGeneratorResponse_File;
-struct CodeGeneratorResponse_FileDefaultTypeInternal;
-PROTOC_EXPORT extern CodeGeneratorResponse_FileDefaultTypeInternal _CodeGeneratorResponse_File_default_instance_;
-class Version;
-struct VersionDefaultTypeInternal;
-PROTOC_EXPORT extern VersionDefaultTypeInternal _Version_default_instance_;
-}  // namespace compiler
-PROTOBUF_NAMESPACE_CLOSE
-PROTOBUF_NAMESPACE_OPEN
-template<> PROTOC_EXPORT ::PROTOBUF_NAMESPACE_ID::compiler::CodeGeneratorRequest* Arena::CreateMaybeMessage<::PROTOBUF_NAMESPACE_ID::compiler::CodeGeneratorRequest>(Arena*);
-template<> PROTOC_EXPORT ::PROTOBUF_NAMESPACE_ID::compiler::CodeGeneratorResponse* Arena::CreateMaybeMessage<::PROTOBUF_NAMESPACE_ID::compiler::CodeGeneratorResponse>(Arena*);
-template<> PROTOC_EXPORT ::PROTOBUF_NAMESPACE_ID::compiler::CodeGeneratorResponse_File* Arena::CreateMaybeMessage<::PROTOBUF_NAMESPACE_ID::compiler::CodeGeneratorResponse_File>(Arena*);
-template<> PROTOC_EXPORT ::PROTOBUF_NAMESPACE_ID::compiler::Version* Arena::CreateMaybeMessage<::PROTOBUF_NAMESPACE_ID::compiler::Version>(Arena*);
-PROTOBUF_NAMESPACE_CLOSE
-PROTOBUF_NAMESPACE_OPEN
-namespace compiler {
-
-enum CodeGeneratorResponse_Feature : int {
-  CodeGeneratorResponse_Feature_FEATURE_NONE = 0,
-  CodeGeneratorResponse_Feature_FEATURE_PROTO3_OPTIONAL = 1
-};
-PROTOC_EXPORT bool CodeGeneratorResponse_Feature_IsValid(int value);
-constexpr CodeGeneratorResponse_Feature CodeGeneratorResponse_Feature_Feature_MIN = CodeGeneratorResponse_Feature_FEATURE_NONE;
-constexpr CodeGeneratorResponse_Feature CodeGeneratorResponse_Feature_Feature_MAX = CodeGeneratorResponse_Feature_FEATURE_PROTO3_OPTIONAL;
-constexpr int CodeGeneratorResponse_Feature_Feature_ARRAYSIZE = CodeGeneratorResponse_Feature_Feature_MAX + 1;
-
-PROTOC_EXPORT const ::PROTOBUF_NAMESPACE_ID::EnumDescriptor* CodeGeneratorResponse_Feature_descriptor();
-template<typename T>
-inline const std::string& CodeGeneratorResponse_Feature_Name(T enum_t_value) {
-  static_assert(::std::is_same<T, CodeGeneratorResponse_Feature>::value ||
-    ::std::is_integral<T>::value,
-    "Incorrect type passed to function CodeGeneratorResponse_Feature_Name.");
-  return ::PROTOBUF_NAMESPACE_ID::internal::NameOfEnum(
-    CodeGeneratorResponse_Feature_descriptor(), enum_t_value);
-}
-inline bool CodeGeneratorResponse_Feature_Parse(
-    ::PROTOBUF_NAMESPACE_ID::ConstStringParam name, CodeGeneratorResponse_Feature* value) {
-  return ::PROTOBUF_NAMESPACE_ID::internal::ParseNamedEnum<CodeGeneratorResponse_Feature>(
-    CodeGeneratorResponse_Feature_descriptor(), name, value);
-}
-// ===================================================================
-
-class PROTOC_EXPORT Version final :
-    public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:google.protobuf.compiler.Version) */ {
- public:
-  inline Version() : Version(nullptr) {}
-  ~Version() override;
-  explicit PROTOBUF_CONSTEXPR Version(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
-
-  Version(const Version& from);
-  Version(Version&& from) noexcept
-    : Version() {
-    *this = ::std::move(from);
-  }
-
-  inline Version& operator=(const Version& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline Version& operator=(Version&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetOwningArena() == from.GetOwningArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetOwningArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::PROTOBUF_NAMESPACE_ID::UnknownFieldSet& unknown_fields() const {
-    return _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance);
-  }
-  inline ::PROTOBUF_NAMESPACE_ID::UnknownFieldSet* mutable_unknown_fields() {
-    return _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>();
-  }
-
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const Version& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const Version* internal_default_instance() {
-    return reinterpret_cast<const Version*>(
-               &_Version_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    0;
-
-  friend void swap(Version& a, Version& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(Version* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() != nullptr &&
-        GetOwningArena() == other->GetOwningArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() == other->GetOwningArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(Version* other) {
-    if (other == this) return;
-    GOOGLE_DCHECK(GetOwningArena() == other->GetOwningArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  Version* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<Version>(arena);
-  }
-  using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
-  void CopyFrom(const Version& from);
-  using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom( const Version& from) {
-    Version::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  uint8_t* _InternalSerialize(
-      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
-
-  private:
-  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
-  void SharedDtor();
-  void SetCachedSize(int size) const final;
-  void InternalSwap(Version* other);
-
-  private:
-  friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
-  static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
-    return "google.protobuf.compiler.Version";
-  }
-  protected:
-  explicit Version(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                       bool is_message_owned = false);
-  public:
-
-  static const ClassData _class_data_;
-  const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*GetClassData() const final;
-
-  ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kSuffixFieldNumber = 4,
-    kMajorFieldNumber = 1,
-    kMinorFieldNumber = 2,
-    kPatchFieldNumber = 3,
-  };
-  // optional string suffix = 4;
-  bool has_suffix() const;
-  private:
-  bool _internal_has_suffix() const;
-  public:
-  void clear_suffix();
-  const std::string& suffix() const;
-  template <typename ArgT0 = const std::string&, typename... ArgT>
-  void set_suffix(ArgT0&& arg0, ArgT... args);
-  std::string* mutable_suffix();
-  PROTOBUF_NODISCARD std::string* release_suffix();
-  void set_allocated_suffix(std::string* suffix);
-  private:
-  const std::string& _internal_suffix() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_suffix(const std::string& value);
-  std::string* _internal_mutable_suffix();
-  public:
-
-  // optional int32 major = 1;
-  bool has_major() const;
-  private:
-  bool _internal_has_major() const;
-  public:
-  void clear_major();
-  int32_t major() const;
-  void set_major(int32_t value);
-  private:
-  int32_t _internal_major() const;
-  void _internal_set_major(int32_t value);
-  public:
-
-  // optional int32 minor = 2;
-  bool has_minor() const;
-  private:
-  bool _internal_has_minor() const;
-  public:
-  void clear_minor();
-  int32_t minor() const;
-  void set_minor(int32_t value);
-  private:
-  int32_t _internal_minor() const;
-  void _internal_set_minor(int32_t value);
-  public:
-
-  // optional int32 patch = 3;
-  bool has_patch() const;
-  private:
-  bool _internal_has_patch() const;
-  public:
-  void clear_patch();
-  int32_t patch() const;
-  void set_patch(int32_t value);
-  private:
-  int32_t _internal_patch() const;
-  void _internal_set_patch(int32_t value);
-  public:
-
-  // @@protoc_insertion_point(class_scope:google.protobuf.compiler.Version)
- private:
-  class _Internal;
-
-  template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
-  typedef void InternalArenaConstructable_;
-  typedef void DestructorSkippable_;
-  struct Impl_ {
-    ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
-    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr suffix_;
-    int32_t major_;
-    int32_t minor_;
-    int32_t patch_;
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_google_2fprotobuf_2fcompiler_2fplugin_2eproto;
-};
-// -------------------------------------------------------------------
-
-class PROTOC_EXPORT CodeGeneratorRequest final :
-    public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:google.protobuf.compiler.CodeGeneratorRequest) */ {
- public:
-  inline CodeGeneratorRequest() : CodeGeneratorRequest(nullptr) {}
-  ~CodeGeneratorRequest() override;
-  explicit PROTOBUF_CONSTEXPR CodeGeneratorRequest(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
-
-  CodeGeneratorRequest(const CodeGeneratorRequest& from);
-  CodeGeneratorRequest(CodeGeneratorRequest&& from) noexcept
-    : CodeGeneratorRequest() {
-    *this = ::std::move(from);
-  }
-
-  inline CodeGeneratorRequest& operator=(const CodeGeneratorRequest& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline CodeGeneratorRequest& operator=(CodeGeneratorRequest&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetOwningArena() == from.GetOwningArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetOwningArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::PROTOBUF_NAMESPACE_ID::UnknownFieldSet& unknown_fields() const {
-    return _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance);
-  }
-  inline ::PROTOBUF_NAMESPACE_ID::UnknownFieldSet* mutable_unknown_fields() {
-    return _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>();
-  }
-
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const CodeGeneratorRequest& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const CodeGeneratorRequest* internal_default_instance() {
-    return reinterpret_cast<const CodeGeneratorRequest*>(
-               &_CodeGeneratorRequest_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    1;
-
-  friend void swap(CodeGeneratorRequest& a, CodeGeneratorRequest& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(CodeGeneratorRequest* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() != nullptr &&
-        GetOwningArena() == other->GetOwningArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() == other->GetOwningArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(CodeGeneratorRequest* other) {
-    if (other == this) return;
-    GOOGLE_DCHECK(GetOwningArena() == other->GetOwningArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  CodeGeneratorRequest* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<CodeGeneratorRequest>(arena);
-  }
-  using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
-  void CopyFrom(const CodeGeneratorRequest& from);
-  using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom( const CodeGeneratorRequest& from) {
-    CodeGeneratorRequest::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  uint8_t* _InternalSerialize(
-      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
-
-  private:
-  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
-  void SharedDtor();
-  void SetCachedSize(int size) const final;
-  void InternalSwap(CodeGeneratorRequest* other);
-
-  private:
-  friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
-  static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
-    return "google.protobuf.compiler.CodeGeneratorRequest";
-  }
-  protected:
-  explicit CodeGeneratorRequest(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                       bool is_message_owned = false);
-  public:
-
-  static const ClassData _class_data_;
-  const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*GetClassData() const final;
-
-  ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kFileToGenerateFieldNumber = 1,
-    kProtoFileFieldNumber = 15,
-    kParameterFieldNumber = 2,
-    kCompilerVersionFieldNumber = 3,
-  };
-  // repeated string file_to_generate = 1;
-  int file_to_generate_size() const;
-  private:
-  int _internal_file_to_generate_size() const;
-  public:
-  void clear_file_to_generate();
-  const std::string& file_to_generate(int index) const;
-  std::string* mutable_file_to_generate(int index);
-  void set_file_to_generate(int index, const std::string& value);
-  void set_file_to_generate(int index, std::string&& value);
-  void set_file_to_generate(int index, const char* value);
-  void set_file_to_generate(int index, const char* value, size_t size);
-  std::string* add_file_to_generate();
-  void add_file_to_generate(const std::string& value);
-  void add_file_to_generate(std::string&& value);
-  void add_file_to_generate(const char* value);
-  void add_file_to_generate(const char* value, size_t size);
-  const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string>& file_to_generate() const;
-  ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string>* mutable_file_to_generate();
-  private:
-  const std::string& _internal_file_to_generate(int index) const;
-  std::string* _internal_add_file_to_generate();
-  public:
-
-  // repeated .google.protobuf.FileDescriptorProto proto_file = 15;
-  int proto_file_size() const;
-  private:
-  int _internal_proto_file_size() const;
-  public:
-  void clear_proto_file();
-  ::PROTOBUF_NAMESPACE_ID::FileDescriptorProto* mutable_proto_file(int index);
-  ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::FileDescriptorProto >*
-      mutable_proto_file();
-  private:
-  const ::PROTOBUF_NAMESPACE_ID::FileDescriptorProto& _internal_proto_file(int index) const;
-  ::PROTOBUF_NAMESPACE_ID::FileDescriptorProto* _internal_add_proto_file();
-  public:
-  const ::PROTOBUF_NAMESPACE_ID::FileDescriptorProto& proto_file(int index) const;
-  ::PROTOBUF_NAMESPACE_ID::FileDescriptorProto* add_proto_file();
-  const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::FileDescriptorProto >&
-      proto_file() const;
-
-  // optional string parameter = 2;
-  bool has_parameter() const;
-  private:
-  bool _internal_has_parameter() const;
-  public:
-  void clear_parameter();
-  const std::string& parameter() const;
-  template <typename ArgT0 = const std::string&, typename... ArgT>
-  void set_parameter(ArgT0&& arg0, ArgT... args);
-  std::string* mutable_parameter();
-  PROTOBUF_NODISCARD std::string* release_parameter();
-  void set_allocated_parameter(std::string* parameter);
-  private:
-  const std::string& _internal_parameter() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_parameter(const std::string& value);
-  std::string* _internal_mutable_parameter();
-  public:
-
-  // optional .google.protobuf.compiler.Version compiler_version = 3;
-  bool has_compiler_version() const;
-  private:
-  bool _internal_has_compiler_version() const;
-  public:
-  void clear_compiler_version();
-  const ::PROTOBUF_NAMESPACE_ID::compiler::Version& compiler_version() const;
-  PROTOBUF_NODISCARD ::PROTOBUF_NAMESPACE_ID::compiler::Version* release_compiler_version();
-  ::PROTOBUF_NAMESPACE_ID::compiler::Version* mutable_compiler_version();
-  void set_allocated_compiler_version(::PROTOBUF_NAMESPACE_ID::compiler::Version* compiler_version);
-  private:
-  const ::PROTOBUF_NAMESPACE_ID::compiler::Version& _internal_compiler_version() const;
-  ::PROTOBUF_NAMESPACE_ID::compiler::Version* _internal_mutable_compiler_version();
-  public:
-  void unsafe_arena_set_allocated_compiler_version(
-      ::PROTOBUF_NAMESPACE_ID::compiler::Version* compiler_version);
-  ::PROTOBUF_NAMESPACE_ID::compiler::Version* unsafe_arena_release_compiler_version();
-
-  // @@protoc_insertion_point(class_scope:google.protobuf.compiler.CodeGeneratorRequest)
- private:
-  class _Internal;
-
-  template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
-  typedef void InternalArenaConstructable_;
-  typedef void DestructorSkippable_;
-  struct Impl_ {
-    ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
-    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-    ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string> file_to_generate_;
-    ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::FileDescriptorProto > proto_file_;
-    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr parameter_;
-    ::PROTOBUF_NAMESPACE_ID::compiler::Version* compiler_version_;
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_google_2fprotobuf_2fcompiler_2fplugin_2eproto;
-};
-// -------------------------------------------------------------------
-
-class PROTOC_EXPORT CodeGeneratorResponse_File final :
-    public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:google.protobuf.compiler.CodeGeneratorResponse.File) */ {
- public:
-  inline CodeGeneratorResponse_File() : CodeGeneratorResponse_File(nullptr) {}
-  ~CodeGeneratorResponse_File() override;
-  explicit PROTOBUF_CONSTEXPR CodeGeneratorResponse_File(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
-
-  CodeGeneratorResponse_File(const CodeGeneratorResponse_File& from);
-  CodeGeneratorResponse_File(CodeGeneratorResponse_File&& from) noexcept
-    : CodeGeneratorResponse_File() {
-    *this = ::std::move(from);
-  }
-
-  inline CodeGeneratorResponse_File& operator=(const CodeGeneratorResponse_File& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline CodeGeneratorResponse_File& operator=(CodeGeneratorResponse_File&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetOwningArena() == from.GetOwningArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetOwningArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::PROTOBUF_NAMESPACE_ID::UnknownFieldSet& unknown_fields() const {
-    return _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance);
-  }
-  inline ::PROTOBUF_NAMESPACE_ID::UnknownFieldSet* mutable_unknown_fields() {
-    return _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>();
-  }
-
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const CodeGeneratorResponse_File& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const CodeGeneratorResponse_File* internal_default_instance() {
-    return reinterpret_cast<const CodeGeneratorResponse_File*>(
-               &_CodeGeneratorResponse_File_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    2;
-
-  friend void swap(CodeGeneratorResponse_File& a, CodeGeneratorResponse_File& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(CodeGeneratorResponse_File* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() != nullptr &&
-        GetOwningArena() == other->GetOwningArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() == other->GetOwningArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(CodeGeneratorResponse_File* other) {
-    if (other == this) return;
-    GOOGLE_DCHECK(GetOwningArena() == other->GetOwningArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  CodeGeneratorResponse_File* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<CodeGeneratorResponse_File>(arena);
-  }
-  using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
-  void CopyFrom(const CodeGeneratorResponse_File& from);
-  using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom( const CodeGeneratorResponse_File& from) {
-    CodeGeneratorResponse_File::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  uint8_t* _InternalSerialize(
-      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
-
-  private:
-  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
-  void SharedDtor();
-  void SetCachedSize(int size) const final;
-  void InternalSwap(CodeGeneratorResponse_File* other);
-
-  private:
-  friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
-  static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
-    return "google.protobuf.compiler.CodeGeneratorResponse.File";
-  }
-  protected:
-  explicit CodeGeneratorResponse_File(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                       bool is_message_owned = false);
-  public:
-
-  static const ClassData _class_data_;
-  const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*GetClassData() const final;
-
-  ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kNameFieldNumber = 1,
-    kInsertionPointFieldNumber = 2,
-    kContentFieldNumber = 15,
-    kGeneratedCodeInfoFieldNumber = 16,
-  };
-  // optional string name = 1;
-  bool has_name() const;
-  private:
-  bool _internal_has_name() const;
-  public:
-  void clear_name();
-  const std::string& name() const;
-  template <typename ArgT0 = const std::string&, typename... ArgT>
-  void set_name(ArgT0&& arg0, ArgT... args);
-  std::string* mutable_name();
-  PROTOBUF_NODISCARD std::string* release_name();
-  void set_allocated_name(std::string* name);
-  private:
-  const std::string& _internal_name() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_name(const std::string& value);
-  std::string* _internal_mutable_name();
-  public:
-
-  // optional string insertion_point = 2;
-  bool has_insertion_point() const;
-  private:
-  bool _internal_has_insertion_point() const;
-  public:
-  void clear_insertion_point();
-  const std::string& insertion_point() const;
-  template <typename ArgT0 = const std::string&, typename... ArgT>
-  void set_insertion_point(ArgT0&& arg0, ArgT... args);
-  std::string* mutable_insertion_point();
-  PROTOBUF_NODISCARD std::string* release_insertion_point();
-  void set_allocated_insertion_point(std::string* insertion_point);
-  private:
-  const std::string& _internal_insertion_point() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_insertion_point(const std::string& value);
-  std::string* _internal_mutable_insertion_point();
-  public:
-
-  // optional string content = 15;
-  bool has_content() const;
-  private:
-  bool _internal_has_content() const;
-  public:
-  void clear_content();
-  const std::string& content() const;
-  template <typename ArgT0 = const std::string&, typename... ArgT>
-  void set_content(ArgT0&& arg0, ArgT... args);
-  std::string* mutable_content();
-  PROTOBUF_NODISCARD std::string* release_content();
-  void set_allocated_content(std::string* content);
-  private:
-  const std::string& _internal_content() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_content(const std::string& value);
-  std::string* _internal_mutable_content();
-  public:
-
-  // optional .google.protobuf.GeneratedCodeInfo generated_code_info = 16;
-  bool has_generated_code_info() const;
-  private:
-  bool _internal_has_generated_code_info() const;
-  public:
-  void clear_generated_code_info();
-  const ::PROTOBUF_NAMESPACE_ID::GeneratedCodeInfo& generated_code_info() const;
-  PROTOBUF_NODISCARD ::PROTOBUF_NAMESPACE_ID::GeneratedCodeInfo* release_generated_code_info();
-  ::PROTOBUF_NAMESPACE_ID::GeneratedCodeInfo* mutable_generated_code_info();
-  void set_allocated_generated_code_info(::PROTOBUF_NAMESPACE_ID::GeneratedCodeInfo* generated_code_info);
-  private:
-  const ::PROTOBUF_NAMESPACE_ID::GeneratedCodeInfo& _internal_generated_code_info() const;
-  ::PROTOBUF_NAMESPACE_ID::GeneratedCodeInfo* _internal_mutable_generated_code_info();
-  public:
-  void unsafe_arena_set_allocated_generated_code_info(
-      ::PROTOBUF_NAMESPACE_ID::GeneratedCodeInfo* generated_code_info);
-  ::PROTOBUF_NAMESPACE_ID::GeneratedCodeInfo* unsafe_arena_release_generated_code_info();
-
-  // @@protoc_insertion_point(class_scope:google.protobuf.compiler.CodeGeneratorResponse.File)
- private:
-  class _Internal;
-
-  template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
-  typedef void InternalArenaConstructable_;
-  typedef void DestructorSkippable_;
-  struct Impl_ {
-    ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
-    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr name_;
-    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr insertion_point_;
-    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr content_;
-    ::PROTOBUF_NAMESPACE_ID::GeneratedCodeInfo* generated_code_info_;
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_google_2fprotobuf_2fcompiler_2fplugin_2eproto;
-};
-// -------------------------------------------------------------------
-
-class PROTOC_EXPORT CodeGeneratorResponse final :
-    public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:google.protobuf.compiler.CodeGeneratorResponse) */ {
- public:
-  inline CodeGeneratorResponse() : CodeGeneratorResponse(nullptr) {}
-  ~CodeGeneratorResponse() override;
-  explicit PROTOBUF_CONSTEXPR CodeGeneratorResponse(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
-
-  CodeGeneratorResponse(const CodeGeneratorResponse& from);
-  CodeGeneratorResponse(CodeGeneratorResponse&& from) noexcept
-    : CodeGeneratorResponse() {
-    *this = ::std::move(from);
-  }
-
-  inline CodeGeneratorResponse& operator=(const CodeGeneratorResponse& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline CodeGeneratorResponse& operator=(CodeGeneratorResponse&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetOwningArena() == from.GetOwningArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetOwningArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::PROTOBUF_NAMESPACE_ID::UnknownFieldSet& unknown_fields() const {
-    return _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance);
-  }
-  inline ::PROTOBUF_NAMESPACE_ID::UnknownFieldSet* mutable_unknown_fields() {
-    return _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>();
-  }
-
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const CodeGeneratorResponse& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const CodeGeneratorResponse* internal_default_instance() {
-    return reinterpret_cast<const CodeGeneratorResponse*>(
-               &_CodeGeneratorResponse_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    3;
-
-  friend void swap(CodeGeneratorResponse& a, CodeGeneratorResponse& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(CodeGeneratorResponse* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() != nullptr &&
-        GetOwningArena() == other->GetOwningArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() == other->GetOwningArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(CodeGeneratorResponse* other) {
-    if (other == this) return;
-    GOOGLE_DCHECK(GetOwningArena() == other->GetOwningArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  CodeGeneratorResponse* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<CodeGeneratorResponse>(arena);
-  }
-  using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
-  void CopyFrom(const CodeGeneratorResponse& from);
-  using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom( const CodeGeneratorResponse& from) {
-    CodeGeneratorResponse::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  uint8_t* _InternalSerialize(
-      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
-
-  private:
-  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
-  void SharedDtor();
-  void SetCachedSize(int size) const final;
-  void InternalSwap(CodeGeneratorResponse* other);
-
-  private:
-  friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
-  static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
-    return "google.protobuf.compiler.CodeGeneratorResponse";
-  }
-  protected:
-  explicit CodeGeneratorResponse(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                       bool is_message_owned = false);
-  public:
-
-  static const ClassData _class_data_;
-  const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*GetClassData() const final;
-
-  ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  typedef CodeGeneratorResponse_File File;
-
-  typedef CodeGeneratorResponse_Feature Feature;
-  static constexpr Feature FEATURE_NONE =
-    CodeGeneratorResponse_Feature_FEATURE_NONE;
-  static constexpr Feature FEATURE_PROTO3_OPTIONAL =
-    CodeGeneratorResponse_Feature_FEATURE_PROTO3_OPTIONAL;
-  static inline bool Feature_IsValid(int value) {
-    return CodeGeneratorResponse_Feature_IsValid(value);
-  }
-  static constexpr Feature Feature_MIN =
-    CodeGeneratorResponse_Feature_Feature_MIN;
-  static constexpr Feature Feature_MAX =
-    CodeGeneratorResponse_Feature_Feature_MAX;
-  static constexpr int Feature_ARRAYSIZE =
-    CodeGeneratorResponse_Feature_Feature_ARRAYSIZE;
-  static inline const ::PROTOBUF_NAMESPACE_ID::EnumDescriptor*
-  Feature_descriptor() {
-    return CodeGeneratorResponse_Feature_descriptor();
-  }
-  template<typename T>
-  static inline const std::string& Feature_Name(T enum_t_value) {
-    static_assert(::std::is_same<T, Feature>::value ||
-      ::std::is_integral<T>::value,
-      "Incorrect type passed to function Feature_Name.");
-    return CodeGeneratorResponse_Feature_Name(enum_t_value);
-  }
-  static inline bool Feature_Parse(::PROTOBUF_NAMESPACE_ID::ConstStringParam name,
-      Feature* value) {
-    return CodeGeneratorResponse_Feature_Parse(name, value);
-  }
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kFileFieldNumber = 15,
-    kErrorFieldNumber = 1,
-    kSupportedFeaturesFieldNumber = 2,
-  };
-  // repeated .google.protobuf.compiler.CodeGeneratorResponse.File file = 15;
-  int file_size() const;
-  private:
-  int _internal_file_size() const;
-  public:
-  void clear_file();
-  ::PROTOBUF_NAMESPACE_ID::compiler::CodeGeneratorResponse_File* mutable_file(int index);
-  ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::compiler::CodeGeneratorResponse_File >*
-      mutable_file();
-  private:
-  const ::PROTOBUF_NAMESPACE_ID::compiler::CodeGeneratorResponse_File& _internal_file(int index) const;
-  ::PROTOBUF_NAMESPACE_ID::compiler::CodeGeneratorResponse_File* _internal_add_file();
-  public:
-  const ::PROTOBUF_NAMESPACE_ID::compiler::CodeGeneratorResponse_File& file(int index) const;
-  ::PROTOBUF_NAMESPACE_ID::compiler::CodeGeneratorResponse_File* add_file();
-  const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::compiler::CodeGeneratorResponse_File >&
-      file() const;
-
-  // optional string error = 1;
-  bool has_error() const;
-  private:
-  bool _internal_has_error() const;
-  public:
-  void clear_error();
-  const std::string& error() const;
-  template <typename ArgT0 = const std::string&, typename... ArgT>
-  void set_error(ArgT0&& arg0, ArgT... args);
-  std::string* mutable_error();
-  PROTOBUF_NODISCARD std::string* release_error();
-  void set_allocated_error(std::string* error);
-  private:
-  const std::string& _internal_error() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_error(const std::string& value);
-  std::string* _internal_mutable_error();
-  public:
-
-  // optional uint64 supported_features = 2;
-  bool has_supported_features() const;
-  private:
-  bool _internal_has_supported_features() const;
-  public:
-  void clear_supported_features();
-  uint64_t supported_features() const;
-  void set_supported_features(uint64_t value);
-  private:
-  uint64_t _internal_supported_features() const;
-  void _internal_set_supported_features(uint64_t value);
-  public:
-
-  // @@protoc_insertion_point(class_scope:google.protobuf.compiler.CodeGeneratorResponse)
- private:
-  class _Internal;
-
-  template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
-  typedef void InternalArenaConstructable_;
-  typedef void DestructorSkippable_;
-  struct Impl_ {
-    ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
-    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-    ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::compiler::CodeGeneratorResponse_File > file_;
-    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr error_;
-    uint64_t supported_features_;
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_google_2fprotobuf_2fcompiler_2fplugin_2eproto;
-};
-// ===================================================================
-
-
-// ===================================================================
-
-#ifdef __GNUC__
-  #pragma GCC diagnostic push
-  #pragma GCC diagnostic ignored "-Wstrict-aliasing"
-#endif  // __GNUC__
-// Version
-
-// optional int32 major = 1;
-inline bool Version::_internal_has_major() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
-  return value;
-}
-inline bool Version::has_major() const {
-  return _internal_has_major();
-}
-inline void Version::clear_major() {
-  _impl_.major_ = 0;
-  _impl_._has_bits_[0] &= ~0x00000002u;
-}
-inline int32_t Version::_internal_major() const {
-  return _impl_.major_;
-}
-inline int32_t Version::major() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.compiler.Version.major)
-  return _internal_major();
-}
-inline void Version::_internal_set_major(int32_t value) {
-  _impl_._has_bits_[0] |= 0x00000002u;
-  _impl_.major_ = value;
-}
-inline void Version::set_major(int32_t value) {
-  _internal_set_major(value);
-  // @@protoc_insertion_point(field_set:google.protobuf.compiler.Version.major)
-}
-
-// optional int32 minor = 2;
-inline bool Version::_internal_has_minor() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000004u) != 0;
-  return value;
-}
-inline bool Version::has_minor() const {
-  return _internal_has_minor();
-}
-inline void Version::clear_minor() {
-  _impl_.minor_ = 0;
-  _impl_._has_bits_[0] &= ~0x00000004u;
-}
-inline int32_t Version::_internal_minor() const {
-  return _impl_.minor_;
-}
-inline int32_t Version::minor() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.compiler.Version.minor)
-  return _internal_minor();
-}
-inline void Version::_internal_set_minor(int32_t value) {
-  _impl_._has_bits_[0] |= 0x00000004u;
-  _impl_.minor_ = value;
-}
-inline void Version::set_minor(int32_t value) {
-  _internal_set_minor(value);
-  // @@protoc_insertion_point(field_set:google.protobuf.compiler.Version.minor)
-}
-
-// optional int32 patch = 3;
-inline bool Version::_internal_has_patch() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000008u) != 0;
-  return value;
-}
-inline bool Version::has_patch() const {
-  return _internal_has_patch();
-}
-inline void Version::clear_patch() {
-  _impl_.patch_ = 0;
-  _impl_._has_bits_[0] &= ~0x00000008u;
-}
-inline int32_t Version::_internal_patch() const {
-  return _impl_.patch_;
-}
-inline int32_t Version::patch() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.compiler.Version.patch)
-  return _internal_patch();
-}
-inline void Version::_internal_set_patch(int32_t value) {
-  _impl_._has_bits_[0] |= 0x00000008u;
-  _impl_.patch_ = value;
-}
-inline void Version::set_patch(int32_t value) {
-  _internal_set_patch(value);
-  // @@protoc_insertion_point(field_set:google.protobuf.compiler.Version.patch)
-}
-
-// optional string suffix = 4;
-inline bool Version::_internal_has_suffix() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  return value;
-}
-inline bool Version::has_suffix() const {
-  return _internal_has_suffix();
-}
-inline void Version::clear_suffix() {
-  _impl_.suffix_.ClearToEmpty();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-inline const std::string& Version::suffix() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.compiler.Version.suffix)
-  return _internal_suffix();
-}
-template <typename ArgT0, typename... ArgT>
-inline PROTOBUF_ALWAYS_INLINE
-void Version::set_suffix(ArgT0&& arg0, ArgT... args) {
- _impl_._has_bits_[0] |= 0x00000001u;
- _impl_.suffix_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
-  // @@protoc_insertion_point(field_set:google.protobuf.compiler.Version.suffix)
-}
-inline std::string* Version::mutable_suffix() {
-  std::string* _s = _internal_mutable_suffix();
-  // @@protoc_insertion_point(field_mutable:google.protobuf.compiler.Version.suffix)
-  return _s;
-}
-inline const std::string& Version::_internal_suffix() const {
-  return _impl_.suffix_.Get();
-}
-inline void Version::_internal_set_suffix(const std::string& value) {
-  _impl_._has_bits_[0] |= 0x00000001u;
-  _impl_.suffix_.Set(value, GetArenaForAllocation());
-}
-inline std::string* Version::_internal_mutable_suffix() {
-  _impl_._has_bits_[0] |= 0x00000001u;
-  return _impl_.suffix_.Mutable(GetArenaForAllocation());
-}
-inline std::string* Version::release_suffix() {
-  // @@protoc_insertion_point(field_release:google.protobuf.compiler.Version.suffix)
-  if (!_internal_has_suffix()) {
-    return nullptr;
-  }
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  auto* p = _impl_.suffix_.Release();
-#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (_impl_.suffix_.IsDefault()) {
-    _impl_.suffix_.Set("", GetArenaForAllocation());
-  }
-#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  return p;
-}
-inline void Version::set_allocated_suffix(std::string* suffix) {
-  if (suffix != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  _impl_.suffix_.SetAllocated(suffix, GetArenaForAllocation());
-#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (_impl_.suffix_.IsDefault()) {
-    _impl_.suffix_.Set("", GetArenaForAllocation());
-  }
-#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:google.protobuf.compiler.Version.suffix)
-}
-
-// -------------------------------------------------------------------
-
-// CodeGeneratorRequest
-
-// repeated string file_to_generate = 1;
-inline int CodeGeneratorRequest::_internal_file_to_generate_size() const {
-  return _impl_.file_to_generate_.size();
-}
-inline int CodeGeneratorRequest::file_to_generate_size() const {
-  return _internal_file_to_generate_size();
-}
-inline void CodeGeneratorRequest::clear_file_to_generate() {
-  _impl_.file_to_generate_.Clear();
-}
-inline std::string* CodeGeneratorRequest::add_file_to_generate() {
-  std::string* _s = _internal_add_file_to_generate();
-  // @@protoc_insertion_point(field_add_mutable:google.protobuf.compiler.CodeGeneratorRequest.file_to_generate)
-  return _s;
-}
-inline const std::string& CodeGeneratorRequest::_internal_file_to_generate(int index) const {
-  return _impl_.file_to_generate_.Get(index);
-}
-inline const std::string& CodeGeneratorRequest::file_to_generate(int index) const {
-  // @@protoc_insertion_point(field_get:google.protobuf.compiler.CodeGeneratorRequest.file_to_generate)
-  return _internal_file_to_generate(index);
-}
-inline std::string* CodeGeneratorRequest::mutable_file_to_generate(int index) {
-  // @@protoc_insertion_point(field_mutable:google.protobuf.compiler.CodeGeneratorRequest.file_to_generate)
-  return _impl_.file_to_generate_.Mutable(index);
-}
-inline void CodeGeneratorRequest::set_file_to_generate(int index, const std::string& value) {
-  _impl_.file_to_generate_.Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set:google.protobuf.compiler.CodeGeneratorRequest.file_to_generate)
-}
-inline void CodeGeneratorRequest::set_file_to_generate(int index, std::string&& value) {
-  _impl_.file_to_generate_.Mutable(index)->assign(std::move(value));
-  // @@protoc_insertion_point(field_set:google.protobuf.compiler.CodeGeneratorRequest.file_to_generate)
-}
-inline void CodeGeneratorRequest::set_file_to_generate(int index, const char* value) {
-  GOOGLE_DCHECK(value != nullptr);
-  _impl_.file_to_generate_.Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set_char:google.protobuf.compiler.CodeGeneratorRequest.file_to_generate)
-}
-inline void CodeGeneratorRequest::set_file_to_generate(int index, const char* value, size_t size) {
-  _impl_.file_to_generate_.Mutable(index)->assign(
-    reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_set_pointer:google.protobuf.compiler.CodeGeneratorRequest.file_to_generate)
-}
-inline std::string* CodeGeneratorRequest::_internal_add_file_to_generate() {
-  return _impl_.file_to_generate_.Add();
-}
-inline void CodeGeneratorRequest::add_file_to_generate(const std::string& value) {
-  _impl_.file_to_generate_.Add()->assign(value);
-  // @@protoc_insertion_point(field_add:google.protobuf.compiler.CodeGeneratorRequest.file_to_generate)
-}
-inline void CodeGeneratorRequest::add_file_to_generate(std::string&& value) {
-  _impl_.file_to_generate_.Add(std::move(value));
-  // @@protoc_insertion_point(field_add:google.protobuf.compiler.CodeGeneratorRequest.file_to_generate)
-}
-inline void CodeGeneratorRequest::add_file_to_generate(const char* value) {
-  GOOGLE_DCHECK(value != nullptr);
-  _impl_.file_to_generate_.Add()->assign(value);
-  // @@protoc_insertion_point(field_add_char:google.protobuf.compiler.CodeGeneratorRequest.file_to_generate)
-}
-inline void CodeGeneratorRequest::add_file_to_generate(const char* value, size_t size) {
-  _impl_.file_to_generate_.Add()->assign(reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_add_pointer:google.protobuf.compiler.CodeGeneratorRequest.file_to_generate)
-}
-inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string>&
-CodeGeneratorRequest::file_to_generate() const {
-  // @@protoc_insertion_point(field_list:google.protobuf.compiler.CodeGeneratorRequest.file_to_generate)
-  return _impl_.file_to_generate_;
-}
-inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string>*
-CodeGeneratorRequest::mutable_file_to_generate() {
-  // @@protoc_insertion_point(field_mutable_list:google.protobuf.compiler.CodeGeneratorRequest.file_to_generate)
-  return &_impl_.file_to_generate_;
-}
-
-// optional string parameter = 2;
-inline bool CodeGeneratorRequest::_internal_has_parameter() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  return value;
-}
-inline bool CodeGeneratorRequest::has_parameter() const {
-  return _internal_has_parameter();
-}
-inline void CodeGeneratorRequest::clear_parameter() {
-  _impl_.parameter_.ClearToEmpty();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-inline const std::string& CodeGeneratorRequest::parameter() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.compiler.CodeGeneratorRequest.parameter)
-  return _internal_parameter();
-}
-template <typename ArgT0, typename... ArgT>
-inline PROTOBUF_ALWAYS_INLINE
-void CodeGeneratorRequest::set_parameter(ArgT0&& arg0, ArgT... args) {
- _impl_._has_bits_[0] |= 0x00000001u;
- _impl_.parameter_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
-  // @@protoc_insertion_point(field_set:google.protobuf.compiler.CodeGeneratorRequest.parameter)
-}
-inline std::string* CodeGeneratorRequest::mutable_parameter() {
-  std::string* _s = _internal_mutable_parameter();
-  // @@protoc_insertion_point(field_mutable:google.protobuf.compiler.CodeGeneratorRequest.parameter)
-  return _s;
-}
-inline const std::string& CodeGeneratorRequest::_internal_parameter() const {
-  return _impl_.parameter_.Get();
-}
-inline void CodeGeneratorRequest::_internal_set_parameter(const std::string& value) {
-  _impl_._has_bits_[0] |= 0x00000001u;
-  _impl_.parameter_.Set(value, GetArenaForAllocation());
-}
-inline std::string* CodeGeneratorRequest::_internal_mutable_parameter() {
-  _impl_._has_bits_[0] |= 0x00000001u;
-  return _impl_.parameter_.Mutable(GetArenaForAllocation());
-}
-inline std::string* CodeGeneratorRequest::release_parameter() {
-  // @@protoc_insertion_point(field_release:google.protobuf.compiler.CodeGeneratorRequest.parameter)
-  if (!_internal_has_parameter()) {
-    return nullptr;
-  }
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  auto* p = _impl_.parameter_.Release();
-#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (_impl_.parameter_.IsDefault()) {
-    _impl_.parameter_.Set("", GetArenaForAllocation());
-  }
-#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  return p;
-}
-inline void CodeGeneratorRequest::set_allocated_parameter(std::string* parameter) {
-  if (parameter != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  _impl_.parameter_.SetAllocated(parameter, GetArenaForAllocation());
-#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (_impl_.parameter_.IsDefault()) {
-    _impl_.parameter_.Set("", GetArenaForAllocation());
-  }
-#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:google.protobuf.compiler.CodeGeneratorRequest.parameter)
-}
-
-// repeated .google.protobuf.FileDescriptorProto proto_file = 15;
-inline int CodeGeneratorRequest::_internal_proto_file_size() const {
-  return _impl_.proto_file_.size();
-}
-inline int CodeGeneratorRequest::proto_file_size() const {
-  return _internal_proto_file_size();
-}
-inline ::PROTOBUF_NAMESPACE_ID::FileDescriptorProto* CodeGeneratorRequest::mutable_proto_file(int index) {
-  // @@protoc_insertion_point(field_mutable:google.protobuf.compiler.CodeGeneratorRequest.proto_file)
-  return _impl_.proto_file_.Mutable(index);
-}
-inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::FileDescriptorProto >*
-CodeGeneratorRequest::mutable_proto_file() {
-  // @@protoc_insertion_point(field_mutable_list:google.protobuf.compiler.CodeGeneratorRequest.proto_file)
-  return &_impl_.proto_file_;
-}
-inline const ::PROTOBUF_NAMESPACE_ID::FileDescriptorProto& CodeGeneratorRequest::_internal_proto_file(int index) const {
-  return _impl_.proto_file_.Get(index);
-}
-inline const ::PROTOBUF_NAMESPACE_ID::FileDescriptorProto& CodeGeneratorRequest::proto_file(int index) const {
-  // @@protoc_insertion_point(field_get:google.protobuf.compiler.CodeGeneratorRequest.proto_file)
-  return _internal_proto_file(index);
-}
-inline ::PROTOBUF_NAMESPACE_ID::FileDescriptorProto* CodeGeneratorRequest::_internal_add_proto_file() {
-  return _impl_.proto_file_.Add();
-}
-inline ::PROTOBUF_NAMESPACE_ID::FileDescriptorProto* CodeGeneratorRequest::add_proto_file() {
-  ::PROTOBUF_NAMESPACE_ID::FileDescriptorProto* _add = _internal_add_proto_file();
-  // @@protoc_insertion_point(field_add:google.protobuf.compiler.CodeGeneratorRequest.proto_file)
-  return _add;
-}
-inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::FileDescriptorProto >&
-CodeGeneratorRequest::proto_file() const {
-  // @@protoc_insertion_point(field_list:google.protobuf.compiler.CodeGeneratorRequest.proto_file)
-  return _impl_.proto_file_;
-}
-
-// optional .google.protobuf.compiler.Version compiler_version = 3;
-inline bool CodeGeneratorRequest::_internal_has_compiler_version() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.compiler_version_ != nullptr);
-  return value;
-}
-inline bool CodeGeneratorRequest::has_compiler_version() const {
-  return _internal_has_compiler_version();
-}
-inline void CodeGeneratorRequest::clear_compiler_version() {
-  if (_impl_.compiler_version_ != nullptr) _impl_.compiler_version_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000002u;
-}
-inline const ::PROTOBUF_NAMESPACE_ID::compiler::Version& CodeGeneratorRequest::_internal_compiler_version() const {
-  const ::PROTOBUF_NAMESPACE_ID::compiler::Version* p = _impl_.compiler_version_;
-  return p != nullptr ? *p : reinterpret_cast<const ::PROTOBUF_NAMESPACE_ID::compiler::Version&>(
-      ::PROTOBUF_NAMESPACE_ID::compiler::_Version_default_instance_);
-}
-inline const ::PROTOBUF_NAMESPACE_ID::compiler::Version& CodeGeneratorRequest::compiler_version() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.compiler.CodeGeneratorRequest.compiler_version)
-  return _internal_compiler_version();
-}
-inline void CodeGeneratorRequest::unsafe_arena_set_allocated_compiler_version(
-    ::PROTOBUF_NAMESPACE_ID::compiler::Version* compiler_version) {
-  if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.compiler_version_);
-  }
-  _impl_.compiler_version_ = compiler_version;
-  if (compiler_version) {
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:google.protobuf.compiler.CodeGeneratorRequest.compiler_version)
-}
-inline ::PROTOBUF_NAMESPACE_ID::compiler::Version* CodeGeneratorRequest::release_compiler_version() {
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::PROTOBUF_NAMESPACE_ID::compiler::Version* temp = _impl_.compiler_version_;
-  _impl_.compiler_version_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
-  temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
-  if (GetArenaForAllocation() == nullptr) { delete old; }
-#else  // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArenaForAllocation() != nullptr) {
-    temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return temp;
-}
-inline ::PROTOBUF_NAMESPACE_ID::compiler::Version* CodeGeneratorRequest::unsafe_arena_release_compiler_version() {
-  // @@protoc_insertion_point(field_release:google.protobuf.compiler.CodeGeneratorRequest.compiler_version)
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::PROTOBUF_NAMESPACE_ID::compiler::Version* temp = _impl_.compiler_version_;
-  _impl_.compiler_version_ = nullptr;
-  return temp;
-}
-inline ::PROTOBUF_NAMESPACE_ID::compiler::Version* CodeGeneratorRequest::_internal_mutable_compiler_version() {
-  _impl_._has_bits_[0] |= 0x00000002u;
-  if (_impl_.compiler_version_ == nullptr) {
-    auto* p = CreateMaybeMessage<::PROTOBUF_NAMESPACE_ID::compiler::Version>(GetArenaForAllocation());
-    _impl_.compiler_version_ = p;
-  }
-  return _impl_.compiler_version_;
-}
-inline ::PROTOBUF_NAMESPACE_ID::compiler::Version* CodeGeneratorRequest::mutable_compiler_version() {
-  ::PROTOBUF_NAMESPACE_ID::compiler::Version* _msg = _internal_mutable_compiler_version();
-  // @@protoc_insertion_point(field_mutable:google.protobuf.compiler.CodeGeneratorRequest.compiler_version)
-  return _msg;
-}
-inline void CodeGeneratorRequest::set_allocated_compiler_version(::PROTOBUF_NAMESPACE_ID::compiler::Version* compiler_version) {
-  ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
-  if (message_arena == nullptr) {
-    delete _impl_.compiler_version_;
-  }
-  if (compiler_version) {
-    ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(compiler_version);
-    if (message_arena != submessage_arena) {
-      compiler_version = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
-          message_arena, compiler_version, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-  _impl_.compiler_version_ = compiler_version;
-  // @@protoc_insertion_point(field_set_allocated:google.protobuf.compiler.CodeGeneratorRequest.compiler_version)
-}
-
-// -------------------------------------------------------------------
-
-// CodeGeneratorResponse_File
-
-// optional string name = 1;
-inline bool CodeGeneratorResponse_File::_internal_has_name() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  return value;
-}
-inline bool CodeGeneratorResponse_File::has_name() const {
-  return _internal_has_name();
-}
-inline void CodeGeneratorResponse_File::clear_name() {
-  _impl_.name_.ClearToEmpty();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-inline const std::string& CodeGeneratorResponse_File::name() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.compiler.CodeGeneratorResponse.File.name)
-  return _internal_name();
-}
-template <typename ArgT0, typename... ArgT>
-inline PROTOBUF_ALWAYS_INLINE
-void CodeGeneratorResponse_File::set_name(ArgT0&& arg0, ArgT... args) {
- _impl_._has_bits_[0] |= 0x00000001u;
- _impl_.name_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
-  // @@protoc_insertion_point(field_set:google.protobuf.compiler.CodeGeneratorResponse.File.name)
-}
-inline std::string* CodeGeneratorResponse_File::mutable_name() {
-  std::string* _s = _internal_mutable_name();
-  // @@protoc_insertion_point(field_mutable:google.protobuf.compiler.CodeGeneratorResponse.File.name)
-  return _s;
-}
-inline const std::string& CodeGeneratorResponse_File::_internal_name() const {
-  return _impl_.name_.Get();
-}
-inline void CodeGeneratorResponse_File::_internal_set_name(const std::string& value) {
-  _impl_._has_bits_[0] |= 0x00000001u;
-  _impl_.name_.Set(value, GetArenaForAllocation());
-}
-inline std::string* CodeGeneratorResponse_File::_internal_mutable_name() {
-  _impl_._has_bits_[0] |= 0x00000001u;
-  return _impl_.name_.Mutable(GetArenaForAllocation());
-}
-inline std::string* CodeGeneratorResponse_File::release_name() {
-  // @@protoc_insertion_point(field_release:google.protobuf.compiler.CodeGeneratorResponse.File.name)
-  if (!_internal_has_name()) {
-    return nullptr;
-  }
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  auto* p = _impl_.name_.Release();
-#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (_impl_.name_.IsDefault()) {
-    _impl_.name_.Set("", GetArenaForAllocation());
-  }
-#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  return p;
-}
-inline void CodeGeneratorResponse_File::set_allocated_name(std::string* name) {
-  if (name != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  _impl_.name_.SetAllocated(name, GetArenaForAllocation());
-#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (_impl_.name_.IsDefault()) {
-    _impl_.name_.Set("", GetArenaForAllocation());
-  }
-#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:google.protobuf.compiler.CodeGeneratorResponse.File.name)
-}
-
-// optional string insertion_point = 2;
-inline bool CodeGeneratorResponse_File::_internal_has_insertion_point() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
-  return value;
-}
-inline bool CodeGeneratorResponse_File::has_insertion_point() const {
-  return _internal_has_insertion_point();
-}
-inline void CodeGeneratorResponse_File::clear_insertion_point() {
-  _impl_.insertion_point_.ClearToEmpty();
-  _impl_._has_bits_[0] &= ~0x00000002u;
-}
-inline const std::string& CodeGeneratorResponse_File::insertion_point() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.compiler.CodeGeneratorResponse.File.insertion_point)
-  return _internal_insertion_point();
-}
-template <typename ArgT0, typename... ArgT>
-inline PROTOBUF_ALWAYS_INLINE
-void CodeGeneratorResponse_File::set_insertion_point(ArgT0&& arg0, ArgT... args) {
- _impl_._has_bits_[0] |= 0x00000002u;
- _impl_.insertion_point_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
-  // @@protoc_insertion_point(field_set:google.protobuf.compiler.CodeGeneratorResponse.File.insertion_point)
-}
-inline std::string* CodeGeneratorResponse_File::mutable_insertion_point() {
-  std::string* _s = _internal_mutable_insertion_point();
-  // @@protoc_insertion_point(field_mutable:google.protobuf.compiler.CodeGeneratorResponse.File.insertion_point)
-  return _s;
-}
-inline const std::string& CodeGeneratorResponse_File::_internal_insertion_point() const {
-  return _impl_.insertion_point_.Get();
-}
-inline void CodeGeneratorResponse_File::_internal_set_insertion_point(const std::string& value) {
-  _impl_._has_bits_[0] |= 0x00000002u;
-  _impl_.insertion_point_.Set(value, GetArenaForAllocation());
-}
-inline std::string* CodeGeneratorResponse_File::_internal_mutable_insertion_point() {
-  _impl_._has_bits_[0] |= 0x00000002u;
-  return _impl_.insertion_point_.Mutable(GetArenaForAllocation());
-}
-inline std::string* CodeGeneratorResponse_File::release_insertion_point() {
-  // @@protoc_insertion_point(field_release:google.protobuf.compiler.CodeGeneratorResponse.File.insertion_point)
-  if (!_internal_has_insertion_point()) {
-    return nullptr;
-  }
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  auto* p = _impl_.insertion_point_.Release();
-#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (_impl_.insertion_point_.IsDefault()) {
-    _impl_.insertion_point_.Set("", GetArenaForAllocation());
-  }
-#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  return p;
-}
-inline void CodeGeneratorResponse_File::set_allocated_insertion_point(std::string* insertion_point) {
-  if (insertion_point != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-  _impl_.insertion_point_.SetAllocated(insertion_point, GetArenaForAllocation());
-#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (_impl_.insertion_point_.IsDefault()) {
-    _impl_.insertion_point_.Set("", GetArenaForAllocation());
-  }
-#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:google.protobuf.compiler.CodeGeneratorResponse.File.insertion_point)
-}
-
-// optional string content = 15;
-inline bool CodeGeneratorResponse_File::_internal_has_content() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000004u) != 0;
-  return value;
-}
-inline bool CodeGeneratorResponse_File::has_content() const {
-  return _internal_has_content();
-}
-inline void CodeGeneratorResponse_File::clear_content() {
-  _impl_.content_.ClearToEmpty();
-  _impl_._has_bits_[0] &= ~0x00000004u;
-}
-inline const std::string& CodeGeneratorResponse_File::content() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.compiler.CodeGeneratorResponse.File.content)
-  return _internal_content();
-}
-template <typename ArgT0, typename... ArgT>
-inline PROTOBUF_ALWAYS_INLINE
-void CodeGeneratorResponse_File::set_content(ArgT0&& arg0, ArgT... args) {
- _impl_._has_bits_[0] |= 0x00000004u;
- _impl_.content_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
-  // @@protoc_insertion_point(field_set:google.protobuf.compiler.CodeGeneratorResponse.File.content)
-}
-inline std::string* CodeGeneratorResponse_File::mutable_content() {
-  std::string* _s = _internal_mutable_content();
-  // @@protoc_insertion_point(field_mutable:google.protobuf.compiler.CodeGeneratorResponse.File.content)
-  return _s;
-}
-inline const std::string& CodeGeneratorResponse_File::_internal_content() const {
-  return _impl_.content_.Get();
-}
-inline void CodeGeneratorResponse_File::_internal_set_content(const std::string& value) {
-  _impl_._has_bits_[0] |= 0x00000004u;
-  _impl_.content_.Set(value, GetArenaForAllocation());
-}
-inline std::string* CodeGeneratorResponse_File::_internal_mutable_content() {
-  _impl_._has_bits_[0] |= 0x00000004u;
-  return _impl_.content_.Mutable(GetArenaForAllocation());
-}
-inline std::string* CodeGeneratorResponse_File::release_content() {
-  // @@protoc_insertion_point(field_release:google.protobuf.compiler.CodeGeneratorResponse.File.content)
-  if (!_internal_has_content()) {
-    return nullptr;
-  }
-  _impl_._has_bits_[0] &= ~0x00000004u;
-  auto* p = _impl_.content_.Release();
-#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (_impl_.content_.IsDefault()) {
-    _impl_.content_.Set("", GetArenaForAllocation());
-  }
-#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  return p;
-}
-inline void CodeGeneratorResponse_File::set_allocated_content(std::string* content) {
-  if (content != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000004u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000004u;
-  }
-  _impl_.content_.SetAllocated(content, GetArenaForAllocation());
-#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (_impl_.content_.IsDefault()) {
-    _impl_.content_.Set("", GetArenaForAllocation());
-  }
-#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:google.protobuf.compiler.CodeGeneratorResponse.File.content)
-}
-
-// optional .google.protobuf.GeneratedCodeInfo generated_code_info = 16;
-inline bool CodeGeneratorResponse_File::_internal_has_generated_code_info() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000008u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.generated_code_info_ != nullptr);
-  return value;
-}
-inline bool CodeGeneratorResponse_File::has_generated_code_info() const {
-  return _internal_has_generated_code_info();
-}
-inline const ::PROTOBUF_NAMESPACE_ID::GeneratedCodeInfo& CodeGeneratorResponse_File::_internal_generated_code_info() const {
-  const ::PROTOBUF_NAMESPACE_ID::GeneratedCodeInfo* p = _impl_.generated_code_info_;
-  return p != nullptr ? *p : reinterpret_cast<const ::PROTOBUF_NAMESPACE_ID::GeneratedCodeInfo&>(
-      ::PROTOBUF_NAMESPACE_ID::_GeneratedCodeInfo_default_instance_);
-}
-inline const ::PROTOBUF_NAMESPACE_ID::GeneratedCodeInfo& CodeGeneratorResponse_File::generated_code_info() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.compiler.CodeGeneratorResponse.File.generated_code_info)
-  return _internal_generated_code_info();
-}
-inline void CodeGeneratorResponse_File::unsafe_arena_set_allocated_generated_code_info(
-    ::PROTOBUF_NAMESPACE_ID::GeneratedCodeInfo* generated_code_info) {
-  if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.generated_code_info_);
-  }
-  _impl_.generated_code_info_ = generated_code_info;
-  if (generated_code_info) {
-    _impl_._has_bits_[0] |= 0x00000008u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000008u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:google.protobuf.compiler.CodeGeneratorResponse.File.generated_code_info)
-}
-inline ::PROTOBUF_NAMESPACE_ID::GeneratedCodeInfo* CodeGeneratorResponse_File::release_generated_code_info() {
-  _impl_._has_bits_[0] &= ~0x00000008u;
-  ::PROTOBUF_NAMESPACE_ID::GeneratedCodeInfo* temp = _impl_.generated_code_info_;
-  _impl_.generated_code_info_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
-  temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
-  if (GetArenaForAllocation() == nullptr) { delete old; }
-#else  // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArenaForAllocation() != nullptr) {
-    temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return temp;
-}
-inline ::PROTOBUF_NAMESPACE_ID::GeneratedCodeInfo* CodeGeneratorResponse_File::unsafe_arena_release_generated_code_info() {
-  // @@protoc_insertion_point(field_release:google.protobuf.compiler.CodeGeneratorResponse.File.generated_code_info)
-  _impl_._has_bits_[0] &= ~0x00000008u;
-  ::PROTOBUF_NAMESPACE_ID::GeneratedCodeInfo* temp = _impl_.generated_code_info_;
-  _impl_.generated_code_info_ = nullptr;
-  return temp;
-}
-inline ::PROTOBUF_NAMESPACE_ID::GeneratedCodeInfo* CodeGeneratorResponse_File::_internal_mutable_generated_code_info() {
-  _impl_._has_bits_[0] |= 0x00000008u;
-  if (_impl_.generated_code_info_ == nullptr) {
-    auto* p = CreateMaybeMessage<::PROTOBUF_NAMESPACE_ID::GeneratedCodeInfo>(GetArenaForAllocation());
-    _impl_.generated_code_info_ = p;
-  }
-  return _impl_.generated_code_info_;
-}
-inline ::PROTOBUF_NAMESPACE_ID::GeneratedCodeInfo* CodeGeneratorResponse_File::mutable_generated_code_info() {
-  ::PROTOBUF_NAMESPACE_ID::GeneratedCodeInfo* _msg = _internal_mutable_generated_code_info();
-  // @@protoc_insertion_point(field_mutable:google.protobuf.compiler.CodeGeneratorResponse.File.generated_code_info)
-  return _msg;
-}
-inline void CodeGeneratorResponse_File::set_allocated_generated_code_info(::PROTOBUF_NAMESPACE_ID::GeneratedCodeInfo* generated_code_info) {
-  ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
-  if (message_arena == nullptr) {
-    delete reinterpret_cast< ::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.generated_code_info_);
-  }
-  if (generated_code_info) {
-    ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(
-                reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(generated_code_info));
-    if (message_arena != submessage_arena) {
-      generated_code_info = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
-          message_arena, generated_code_info, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000008u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000008u;
-  }
-  _impl_.generated_code_info_ = generated_code_info;
-  // @@protoc_insertion_point(field_set_allocated:google.protobuf.compiler.CodeGeneratorResponse.File.generated_code_info)
-}
-
-// -------------------------------------------------------------------
-
-// CodeGeneratorResponse
-
-// optional string error = 1;
-inline bool CodeGeneratorResponse::_internal_has_error() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  return value;
-}
-inline bool CodeGeneratorResponse::has_error() const {
-  return _internal_has_error();
-}
-inline void CodeGeneratorResponse::clear_error() {
-  _impl_.error_.ClearToEmpty();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-inline const std::string& CodeGeneratorResponse::error() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.compiler.CodeGeneratorResponse.error)
-  return _internal_error();
-}
-template <typename ArgT0, typename... ArgT>
-inline PROTOBUF_ALWAYS_INLINE
-void CodeGeneratorResponse::set_error(ArgT0&& arg0, ArgT... args) {
- _impl_._has_bits_[0] |= 0x00000001u;
- _impl_.error_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
-  // @@protoc_insertion_point(field_set:google.protobuf.compiler.CodeGeneratorResponse.error)
-}
-inline std::string* CodeGeneratorResponse::mutable_error() {
-  std::string* _s = _internal_mutable_error();
-  // @@protoc_insertion_point(field_mutable:google.protobuf.compiler.CodeGeneratorResponse.error)
-  return _s;
-}
-inline const std::string& CodeGeneratorResponse::_internal_error() const {
-  return _impl_.error_.Get();
-}
-inline void CodeGeneratorResponse::_internal_set_error(const std::string& value) {
-  _impl_._has_bits_[0] |= 0x00000001u;
-  _impl_.error_.Set(value, GetArenaForAllocation());
-}
-inline std::string* CodeGeneratorResponse::_internal_mutable_error() {
-  _impl_._has_bits_[0] |= 0x00000001u;
-  return _impl_.error_.Mutable(GetArenaForAllocation());
-}
-inline std::string* CodeGeneratorResponse::release_error() {
-  // @@protoc_insertion_point(field_release:google.protobuf.compiler.CodeGeneratorResponse.error)
-  if (!_internal_has_error()) {
-    return nullptr;
-  }
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  auto* p = _impl_.error_.Release();
-#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (_impl_.error_.IsDefault()) {
-    _impl_.error_.Set("", GetArenaForAllocation());
-  }
-#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  return p;
-}
-inline void CodeGeneratorResponse::set_allocated_error(std::string* error) {
-  if (error != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  _impl_.error_.SetAllocated(error, GetArenaForAllocation());
-#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (_impl_.error_.IsDefault()) {
-    _impl_.error_.Set("", GetArenaForAllocation());
-  }
-#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:google.protobuf.compiler.CodeGeneratorResponse.error)
-}
-
-// optional uint64 supported_features = 2;
-inline bool CodeGeneratorResponse::_internal_has_supported_features() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
-  return value;
-}
-inline bool CodeGeneratorResponse::has_supported_features() const {
-  return _internal_has_supported_features();
-}
-inline void CodeGeneratorResponse::clear_supported_features() {
-  _impl_.supported_features_ = uint64_t{0u};
-  _impl_._has_bits_[0] &= ~0x00000002u;
-}
-inline uint64_t CodeGeneratorResponse::_internal_supported_features() const {
-  return _impl_.supported_features_;
-}
-inline uint64_t CodeGeneratorResponse::supported_features() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.compiler.CodeGeneratorResponse.supported_features)
-  return _internal_supported_features();
-}
-inline void CodeGeneratorResponse::_internal_set_supported_features(uint64_t value) {
-  _impl_._has_bits_[0] |= 0x00000002u;
-  _impl_.supported_features_ = value;
-}
-inline void CodeGeneratorResponse::set_supported_features(uint64_t value) {
-  _internal_set_supported_features(value);
-  // @@protoc_insertion_point(field_set:google.protobuf.compiler.CodeGeneratorResponse.supported_features)
-}
-
-// repeated .google.protobuf.compiler.CodeGeneratorResponse.File file = 15;
-inline int CodeGeneratorResponse::_internal_file_size() const {
-  return _impl_.file_.size();
-}
-inline int CodeGeneratorResponse::file_size() const {
-  return _internal_file_size();
-}
-inline void CodeGeneratorResponse::clear_file() {
-  _impl_.file_.Clear();
-}
-inline ::PROTOBUF_NAMESPACE_ID::compiler::CodeGeneratorResponse_File* CodeGeneratorResponse::mutable_file(int index) {
-  // @@protoc_insertion_point(field_mutable:google.protobuf.compiler.CodeGeneratorResponse.file)
-  return _impl_.file_.Mutable(index);
-}
-inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::compiler::CodeGeneratorResponse_File >*
-CodeGeneratorResponse::mutable_file() {
-  // @@protoc_insertion_point(field_mutable_list:google.protobuf.compiler.CodeGeneratorResponse.file)
-  return &_impl_.file_;
-}
-inline const ::PROTOBUF_NAMESPACE_ID::compiler::CodeGeneratorResponse_File& CodeGeneratorResponse::_internal_file(int index) const {
-  return _impl_.file_.Get(index);
-}
-inline const ::PROTOBUF_NAMESPACE_ID::compiler::CodeGeneratorResponse_File& CodeGeneratorResponse::file(int index) const {
-  // @@protoc_insertion_point(field_get:google.protobuf.compiler.CodeGeneratorResponse.file)
-  return _internal_file(index);
-}
-inline ::PROTOBUF_NAMESPACE_ID::compiler::CodeGeneratorResponse_File* CodeGeneratorResponse::_internal_add_file() {
-  return _impl_.file_.Add();
-}
-inline ::PROTOBUF_NAMESPACE_ID::compiler::CodeGeneratorResponse_File* CodeGeneratorResponse::add_file() {
-  ::PROTOBUF_NAMESPACE_ID::compiler::CodeGeneratorResponse_File* _add = _internal_add_file();
-  // @@protoc_insertion_point(field_add:google.protobuf.compiler.CodeGeneratorResponse.file)
-  return _add;
-}
-inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::compiler::CodeGeneratorResponse_File >&
-CodeGeneratorResponse::file() const {
-  // @@protoc_insertion_point(field_list:google.protobuf.compiler.CodeGeneratorResponse.file)
-  return _impl_.file_;
-}
-
-#ifdef __GNUC__
-  #pragma GCC diagnostic pop
-#endif  // __GNUC__
-// -------------------------------------------------------------------
-
-// -------------------------------------------------------------------
-
-// -------------------------------------------------------------------
-
-
-// @@protoc_insertion_point(namespace_scope)
-
-}  // namespace compiler
-PROTOBUF_NAMESPACE_CLOSE
-
-PROTOBUF_NAMESPACE_OPEN
-
-template <> struct is_proto_enum< ::PROTOBUF_NAMESPACE_ID::compiler::CodeGeneratorResponse_Feature> : ::std::true_type {};
-template <>
-inline const EnumDescriptor* GetEnumDescriptor< ::PROTOBUF_NAMESPACE_ID::compiler::CodeGeneratorResponse_Feature>() {
-  return ::PROTOBUF_NAMESPACE_ID::compiler::CodeGeneratorResponse_Feature_descriptor();
-}
-
-PROTOBUF_NAMESPACE_CLOSE
-
-// @@protoc_insertion_point(global_scope)
-
-#include <google/protobuf/port_undef.inc>
-#endif  // GOOGLE_PROTOBUF_INCLUDED_GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fcompiler_2fplugin_2eproto
diff --git a/libs/protobuf/src/google/protobuf/compiler/plugin.proto b/libs/protobuf/src/google/protobuf/compiler/plugin.proto
deleted file mode 100644
index 9242aac..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/plugin.proto
+++ /dev/null
@@ -1,183 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//
-// WARNING:  The plugin interface is currently EXPERIMENTAL and is subject to
-//   change.
-//
-// protoc (aka the Protocol Compiler) can be extended via plugins.  A plugin is
-// just a program that reads a CodeGeneratorRequest from stdin and writes a
-// CodeGeneratorResponse to stdout.
-//
-// Plugins written using C++ can use google/protobuf/compiler/plugin.h instead
-// of dealing with the raw protocol defined here.
-//
-// A plugin executable needs only to be placed somewhere in the path.  The
-// plugin should be named "protoc-gen-$NAME", and will then be used when the
-// flag "--${NAME}_out" is passed to protoc.
-
-syntax = "proto2";
-
-package google.protobuf.compiler;
-option java_package = "com.google.protobuf.compiler";
-option java_outer_classname = "PluginProtos";
-
-option go_package = "google.golang.org/protobuf/types/pluginpb";
-
-import "google/protobuf/descriptor.proto";
-
-// The version number of protocol compiler.
-message Version {
-  optional int32 major = 1;
-  optional int32 minor = 2;
-  optional int32 patch = 3;
-  // A suffix for alpha, beta or rc release, e.g., "alpha-1", "rc2". It should
-  // be empty for mainline stable releases.
-  optional string suffix = 4;
-}
-
-// An encoded CodeGeneratorRequest is written to the plugin's stdin.
-message CodeGeneratorRequest {
-  // The .proto files that were explicitly listed on the command-line.  The
-  // code generator should generate code only for these files.  Each file's
-  // descriptor will be included in proto_file, below.
-  repeated string file_to_generate = 1;
-
-  // The generator parameter passed on the command-line.
-  optional string parameter = 2;
-
-  // FileDescriptorProtos for all files in files_to_generate and everything
-  // they import.  The files will appear in topological order, so each file
-  // appears before any file that imports it.
-  //
-  // protoc guarantees that all proto_files will be written after
-  // the fields above, even though this is not technically guaranteed by the
-  // protobuf wire format.  This theoretically could allow a plugin to stream
-  // in the FileDescriptorProtos and handle them one by one rather than read
-  // the entire set into memory at once.  However, as of this writing, this
-  // is not similarly optimized on protoc's end -- it will store all fields in
-  // memory at once before sending them to the plugin.
-  //
-  // Type names of fields and extensions in the FileDescriptorProto are always
-  // fully qualified.
-  repeated FileDescriptorProto proto_file = 15;
-
-  // The version number of protocol compiler.
-  optional Version compiler_version = 3;
-
-}
-
-// The plugin writes an encoded CodeGeneratorResponse to stdout.
-message CodeGeneratorResponse {
-  // Error message.  If non-empty, code generation failed.  The plugin process
-  // should exit with status code zero even if it reports an error in this way.
-  //
-  // This should be used to indicate errors in .proto files which prevent the
-  // code generator from generating correct code.  Errors which indicate a
-  // problem in protoc itself -- such as the input CodeGeneratorRequest being
-  // unparseable -- should be reported by writing a message to stderr and
-  // exiting with a non-zero status code.
-  optional string error = 1;
-
-  // A bitmask of supported features that the code generator supports.
-  // This is a bitwise "or" of values from the Feature enum.
-  optional uint64 supported_features = 2;
-
-  // Sync with code_generator.h.
-  enum Feature {
-    FEATURE_NONE = 0;
-    FEATURE_PROTO3_OPTIONAL = 1;
-  }
-
-  // Represents a single generated file.
-  message File {
-    // The file name, relative to the output directory.  The name must not
-    // contain "." or ".." components and must be relative, not be absolute (so,
-    // the file cannot lie outside the output directory).  "/" must be used as
-    // the path separator, not "\".
-    //
-    // If the name is omitted, the content will be appended to the previous
-    // file.  This allows the generator to break large files into small chunks,
-    // and allows the generated text to be streamed back to protoc so that large
-    // files need not reside completely in memory at one time.  Note that as of
-    // this writing protoc does not optimize for this -- it will read the entire
-    // CodeGeneratorResponse before writing files to disk.
-    optional string name = 1;
-
-    // If non-empty, indicates that the named file should already exist, and the
-    // content here is to be inserted into that file at a defined insertion
-    // point.  This feature allows a code generator to extend the output
-    // produced by another code generator.  The original generator may provide
-    // insertion points by placing special annotations in the file that look
-    // like:
-    //   @@protoc_insertion_point(NAME)
-    // The annotation can have arbitrary text before and after it on the line,
-    // which allows it to be placed in a comment.  NAME should be replaced with
-    // an identifier naming the point -- this is what other generators will use
-    // as the insertion_point.  Code inserted at this point will be placed
-    // immediately above the line containing the insertion point (thus multiple
-    // insertions to the same point will come out in the order they were added).
-    // The double-@ is intended to make it unlikely that the generated code
-    // could contain things that look like insertion points by accident.
-    //
-    // For example, the C++ code generator places the following line in the
-    // .pb.h files that it generates:
-    //   // @@protoc_insertion_point(namespace_scope)
-    // This line appears within the scope of the file's package namespace, but
-    // outside of any particular class.  Another plugin can then specify the
-    // insertion_point "namespace_scope" to generate additional classes or
-    // other declarations that should be placed in this scope.
-    //
-    // Note that if the line containing the insertion point begins with
-    // whitespace, the same whitespace will be added to every line of the
-    // inserted text.  This is useful for languages like Python, where
-    // indentation matters.  In these languages, the insertion point comment
-    // should be indented the same amount as any inserted code will need to be
-    // in order to work correctly in that context.
-    //
-    // The code generator that generates the initial file and the one which
-    // inserts into it must both run as part of a single invocation of protoc.
-    // Code generators are executed in the order in which they appear on the
-    // command line.
-    //
-    // If |insertion_point| is present, |name| must also be present.
-    optional string insertion_point = 2;
-
-    // The file contents.
-    optional string content = 15;
-
-    // Information describing the file content being inserted. If an insertion
-    // point is used, this information will be appropriately offset and inserted
-    // into the code generation metadata for the generated files.
-    optional GeneratedCodeInfo generated_code_info = 16;
-  }
-  repeated File file = 15;
-}
diff --git a/libs/protobuf/src/google/protobuf/compiler/python/generator.cc b/libs/protobuf/src/google/protobuf/compiler/python/generator.cc
deleted file mode 100644
index d8d6d74..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/python/generator.cc
+++ /dev/null
@@ -1,1393 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: robinson@google.com (Will Robinson)
-//
-// This module outputs pure-Python protocol message classes that will
-// largely be constructed at runtime via the metaclass in reflection.py.
-// In other words, our job is basically to output a Python equivalent
-// of the C++ *Descriptor objects, and fix up all circular references
-// within these objects.
-//
-// Note that the runtime performance of protocol message classes created in
-// this way is expected to be lousy.  The plan is to create an alternate
-// generator that outputs a Python/C extension module that lets
-// performance-minded Python code leverage the fast C++ implementation
-// directly.
-
-#include <google/protobuf/compiler/python/generator.h>
-
-#include <algorithm>
-#include <limits>
-#include <map>
-#include <memory>
-#include <string>
-#include <utility>
-#include <vector>
-
-#include <google/protobuf/stubs/logging.h>
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/stubs/strutil.h>
-#include <google/protobuf/stubs/stringprintf.h>
-#include <google/protobuf/stubs/substitute.h>
-#include <google/protobuf/compiler/python/helpers.h>
-#include <google/protobuf/compiler/python/pyi_generator.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/descriptor.pb.h>
-#include <google/protobuf/io/printer.h>
-#include <google/protobuf/io/zero_copy_stream.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace python {
-
-namespace {
-// Returns the alias we assign to the module of the given .proto filename
-// when importing. See testPackageInitializationImport in
-// net/proto2/python/internal/reflection_test.py
-// to see why we need the alias.
-std::string ModuleAlias(const std::string& filename) {
-  std::string module_name = ModuleName(filename);
-  // We can't have dots in the module name, so we replace each with _dot_.
-  // But that could lead to a collision between a.b and a_dot_b, so we also
-  // duplicate each underscore.
-  GlobalReplaceSubstring("_", "__", &module_name);
-  GlobalReplaceSubstring(".", "_dot_", &module_name);
-  return module_name;
-}
-
-// Name of the class attribute where we store the Python
-// descriptor.Descriptor instance for the generated class.
-// Must stay consistent with the _DESCRIPTOR_KEY constant
-// in proto2/public/reflection.py.
-const char kDescriptorKey[] = "DESCRIPTOR";
-
-
-// file output by this generator.
-void PrintTopBoilerplate(io::Printer* printer, const FileDescriptor* file,
-                         bool descriptor_proto) {
-  // TODO(robinson): Allow parameterization of Python version?
-  printer->Print(
-      "# -*- coding: utf-8 -*-\n"
-      "# Generated by the protocol buffer compiler.  DO NOT EDIT!\n"
-      "# source: $filename$\n"
-      "\"\"\"Generated protocol buffer code.\"\"\"\n",
-      "filename", file->name());
-  printer->Print(
-      "from google.protobuf.internal import builder as _builder\n"
-      "from google.protobuf import descriptor as _descriptor\n"
-      "from google.protobuf import descriptor_pool as "
-      "_descriptor_pool\n"
-      "from google.protobuf import symbol_database as "
-      "_symbol_database\n");
-
-  printer->Print("# @@protoc_insertion_point(imports)\n\n");
-  printer->Print("_sym_db = _symbol_database.Default()\n");
-  printer->Print("\n\n");
-}
-
-// Returns a Python literal giving the default value for a field.
-// If the field specifies no explicit default value, we'll return
-// the default default value for the field type (zero for numbers,
-// empty string for strings, empty list for repeated fields, and
-// None for non-repeated, composite fields).
-//
-// TODO(robinson): Unify with code from
-// //compiler/cpp/internal/primitive_field.cc
-// //compiler/cpp/internal/enum_field.cc
-// //compiler/cpp/internal/string_field.cc
-std::string StringifyDefaultValue(const FieldDescriptor& field) {
-  if (field.is_repeated()) {
-    return "[]";
-  }
-
-  switch (field.cpp_type()) {
-    case FieldDescriptor::CPPTYPE_INT32:
-      return StrCat(field.default_value_int32());
-    case FieldDescriptor::CPPTYPE_UINT32:
-      return StrCat(field.default_value_uint32());
-    case FieldDescriptor::CPPTYPE_INT64:
-      return StrCat(field.default_value_int64());
-    case FieldDescriptor::CPPTYPE_UINT64:
-      return StrCat(field.default_value_uint64());
-    case FieldDescriptor::CPPTYPE_DOUBLE: {
-      double value = field.default_value_double();
-      if (value == std::numeric_limits<double>::infinity()) {
-        // Python pre-2.6 on Windows does not parse "inf" correctly.  However,
-        // a numeric literal that is too big for a double will become infinity.
-        return "1e10000";
-      } else if (value == -std::numeric_limits<double>::infinity()) {
-        // See above.
-        return "-1e10000";
-      } else if (value != value) {
-        // infinity * 0 = nan
-        return "(1e10000 * 0)";
-      } else {
-        return "float(" + SimpleDtoa(value) + ")";
-      }
-    }
-    case FieldDescriptor::CPPTYPE_FLOAT: {
-      float value = field.default_value_float();
-      if (value == std::numeric_limits<float>::infinity()) {
-        // Python pre-2.6 on Windows does not parse "inf" correctly.  However,
-        // a numeric literal that is too big for a double will become infinity.
-        return "1e10000";
-      } else if (value == -std::numeric_limits<float>::infinity()) {
-        // See above.
-        return "-1e10000";
-      } else if (value != value) {
-        // infinity - infinity = nan
-        return "(1e10000 * 0)";
-      } else {
-        return "float(" + SimpleFtoa(value) + ")";
-      }
-    }
-    case FieldDescriptor::CPPTYPE_BOOL:
-      return field.default_value_bool() ? "True" : "False";
-    case FieldDescriptor::CPPTYPE_ENUM:
-      return StrCat(field.default_value_enum()->number());
-    case FieldDescriptor::CPPTYPE_STRING:
-      return "b\"" + CEscape(field.default_value_string()) +
-             (field.type() != FieldDescriptor::TYPE_STRING
-                  ? "\""
-                  : "\".decode('utf-8')");
-    case FieldDescriptor::CPPTYPE_MESSAGE:
-      return "None";
-  }
-  // (We could add a default case above but then we wouldn't get the nice
-  // compiler warning when a new type is added.)
-  GOOGLE_LOG(FATAL) << "Not reached.";
-  return "";
-}
-
-std::string StringifySyntax(FileDescriptor::Syntax syntax) {
-  switch (syntax) {
-    case FileDescriptor::SYNTAX_PROTO2:
-      return "proto2";
-    case FileDescriptor::SYNTAX_PROTO3:
-      return "proto3";
-    case FileDescriptor::SYNTAX_UNKNOWN:
-    default:
-      GOOGLE_LOG(FATAL) << "Unsupported syntax; this generator only supports proto2 "
-                    "and proto3 syntax.";
-      return "";
-  }
-}
-
-}  // namespace
-
-Generator::Generator() : file_(nullptr) {}
-
-Generator::~Generator() {}
-
-uint64_t Generator::GetSupportedFeatures() const {
-  return CodeGenerator::Feature::FEATURE_PROTO3_OPTIONAL;
-}
-
-bool Generator::Generate(const FileDescriptor* file,
-                         const std::string& parameter,
-                         GeneratorContext* context, std::string* error) const {
-  // -----------------------------------------------------------------
-  // parse generator options
-  bool cpp_generated_lib_linked = false;
-
-  std::vector<std::pair<std::string, std::string> > options;
-  ParseGeneratorParameter(parameter, &options);
-
-  for (int i = 0; i < options.size(); i++) {
-    if (options[i].first == "cpp_generated_lib_linked") {
-      cpp_generated_lib_linked = true;
-    } else if (options[i].first == "pyi_out") {
-      python::PyiGenerator pyi_generator;
-      if (!pyi_generator.Generate(file, "", context, error)) {
-        return false;
-      }
-    } else {
-      *error = "Unknown generator option: " + options[i].first;
-      return false;
-    }
-  }
-
-  // Completely serialize all Generate() calls on this instance.  The
-  // thread-safety constraints of the CodeGenerator interface aren't clear so
-  // just be as conservative as possible.  It's easier to relax this later if
-  // we need to, but I doubt it will be an issue.
-  // TODO(kenton):  The proper thing to do would be to allocate any state on
-  //   the stack and use that, so that the Generator class itself does not need
-  //   to have any mutable members.  Then it is implicitly thread-safe.
-  MutexLock lock(&mutex_);
-  file_ = file;
-
-  std::string filename = GetFileName(file, ".py");
-  pure_python_workable_ = !cpp_generated_lib_linked;
-  if (HasPrefixString(file->name(), "google/protobuf/")) {
-    pure_python_workable_ = true;
-  }
-
-  FileDescriptorProto fdp;
-  file_->CopyTo(&fdp);
-  fdp.SerializeToString(&file_descriptor_serialized_);
-
-
-  std::unique_ptr<io::ZeroCopyOutputStream> output(context->Open(filename));
-  GOOGLE_CHECK(output.get());
-  io::Printer printer(output.get(), '$');
-  printer_ = &printer;
-
-  PrintTopBoilerplate(printer_, file_, GeneratingDescriptorProto());
-  if (pure_python_workable_) {
-    PrintImports();
-  }
-  PrintFileDescriptor();
-  if (pure_python_workable_) {
-    if (GeneratingDescriptorProto()) {
-      printer_->Print("if _descriptor._USE_C_DESCRIPTORS == False:\n");
-      printer_->Indent();
-      // Create enums before message descriptors
-      PrintAllNestedEnumsInFile();
-      PrintMessageDescriptors();
-      FixForeignFieldsInDescriptors();
-      printer_->Outdent();
-      printer_->Print("else:\n");
-      printer_->Indent();
-    }
-    // Find the message descriptors first and then use the message
-    // descriptor to find enums.
-    printer_->Print(
-        "_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals())\n");
-    if (GeneratingDescriptorProto()) {
-      printer_->Outdent();
-    }
-  }
-  std::string module_name = ModuleName(file->name());
-  printer_->Print(
-      "_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, '$module_name$', "
-      "globals())\n",
-      "module_name", module_name);
-  if (pure_python_workable_) {
-    printer.Print("if _descriptor._USE_C_DESCRIPTORS == False:\n");
-    printer_->Indent();
-
-    // We have to fix up the extensions after the message classes themselves,
-    // since they need to call static RegisterExtension() methods on these
-    // classes.
-    FixForeignFieldsInExtensions();
-    // Descriptor options may have custom extensions. These custom options
-    // can only be successfully parsed after we register corresponding
-    // extensions. Therefore we parse all options again here to recognize
-    // custom options that may be unknown when we define the descriptors.
-    // This does not apply to services because they are not used by extensions.
-    FixAllDescriptorOptions();
-
-    // Set serialized_start and serialized_end.
-    SetSerializedPbInterval();
-
-    printer_->Outdent();
-  }
-  if (HasGenericServices(file)) {
-    printer_->Print(
-        "_builder.BuildServices(DESCRIPTOR, '$module_name$', globals())\n",
-        "module_name", module_name);
-  }
-
-  printer.Print("# @@protoc_insertion_point(module_scope)\n");
-
-  return !printer.failed();
-}
-
-// Prints Python imports for all modules imported by |file|.
-void Generator::PrintImports() const {
-  for (int i = 0; i < file_->dependency_count(); ++i) {
-    const std::string& filename = file_->dependency(i)->name();
-
-    std::string module_name = ModuleName(filename);
-    std::string module_alias = ModuleAlias(filename);
-    if (ContainsPythonKeyword(module_name)) {
-      // If the module path contains a Python keyword, we have to quote the
-      // module name and import it using importlib. Otherwise the usual kind of
-      // import statement would result in a syntax error from the presence of
-      // the keyword.
-      printer_->Print("import importlib\n");
-      printer_->Print("$alias$ = importlib.import_module('$name$')\n", "alias",
-                      module_alias, "name", module_name);
-    } else {
-      int last_dot_pos = module_name.rfind('.');
-      std::string import_statement;
-      if (last_dot_pos == std::string::npos) {
-        // NOTE(petya): this is not tested as it would require a protocol buffer
-        // outside of any package, and I don't think that is easily achievable.
-        import_statement = "import " + module_name;
-      } else {
-        import_statement = "from " + module_name.substr(0, last_dot_pos) +
-                           " import " + module_name.substr(last_dot_pos + 1);
-      }
-      printer_->Print("$statement$ as $alias$\n", "statement", import_statement,
-                      "alias", module_alias);
-    }
-
-    CopyPublicDependenciesAliases(module_alias, file_->dependency(i));
-  }
-  printer_->Print("\n");
-
-  // Print public imports.
-  for (int i = 0; i < file_->public_dependency_count(); ++i) {
-    std::string module_name = ModuleName(file_->public_dependency(i)->name());
-    printer_->Print("from $module$ import *\n", "module", module_name);
-  }
-  printer_->Print("\n");
-}
-
-// Prints the single file descriptor for this file.
-void Generator::PrintFileDescriptor() const {
-  std::map<std::string, std::string> m;
-  m["descriptor_name"] = kDescriptorKey;
-  m["name"] = file_->name();
-  m["package"] = file_->package();
-  m["syntax"] = StringifySyntax(file_->syntax());
-  m["options"] = OptionsValue(file_->options().SerializeAsString());
-  m["serialized_descriptor"] = strings::CHexEscape(file_descriptor_serialized_);
-  if (GeneratingDescriptorProto()) {
-    printer_->Print("if _descriptor._USE_C_DESCRIPTORS == False:\n");
-    printer_->Indent();
-    // Pure python's AddSerializedFile() depend on the generated
-    // descriptor_pb2.py thus we can not use AddSerializedFile() when
-    // generated descriptor.proto for pure python.
-    const char file_descriptor_template[] =
-        "$descriptor_name$ = _descriptor.FileDescriptor(\n"
-        "  name='$name$',\n"
-        "  package='$package$',\n"
-        "  syntax='$syntax$',\n"
-        "  serialized_options=$options$,\n"
-        "  create_key=_descriptor._internal_create_key,\n";
-    printer_->Print(m, file_descriptor_template);
-    printer_->Indent();
-    if (pure_python_workable_) {
-      printer_->Print("serialized_pb=b'$value$'\n", "value",
-                      strings::CHexEscape(file_descriptor_serialized_));
-      if (file_->dependency_count() != 0) {
-        printer_->Print(",\ndependencies=[");
-        for (int i = 0; i < file_->dependency_count(); ++i) {
-          std::string module_alias = ModuleAlias(file_->dependency(i)->name());
-          printer_->Print("$module_alias$.DESCRIPTOR,", "module_alias",
-                          module_alias);
-        }
-        printer_->Print("]");
-      }
-      if (file_->public_dependency_count() > 0) {
-        printer_->Print(",\npublic_dependencies=[");
-        for (int i = 0; i < file_->public_dependency_count(); ++i) {
-          std::string module_alias =
-              ModuleAlias(file_->public_dependency(i)->name());
-          printer_->Print("$module_alias$.DESCRIPTOR,", "module_alias",
-                          module_alias);
-        }
-        printer_->Print("]");
-      }
-    } else {
-      printer_->Print("serialized_pb=''\n");
-    }
-
-    // TODO(falk): Also print options and fix the message_type, enum_type,
-    //             service and extension later in the generation.
-
-    printer_->Outdent();
-    printer_->Print(")\n");
-
-    printer_->Outdent();
-    printer_->Print("else:\n");
-    printer_->Indent();
-  }
-  printer_->Print(m,
-                  "$descriptor_name$ = "
-                  "_descriptor_pool.Default().AddSerializedFile(b'$serialized_"
-                  "descriptor$')\n");
-  if (GeneratingDescriptorProto()) {
-    printer_->Outdent();
-  }
-  printer_->Print("\n");
-}
-
-// Prints all enums contained in all message types in |file|.
-void Generator::PrintAllNestedEnumsInFile() const {
-  for (int i = 0; i < file_->message_type_count(); ++i) {
-    PrintNestedEnums(*file_->message_type(i));
-  }
-}
-
-// Prints a Python statement assigning the appropriate module-level
-// enum name to a Python EnumDescriptor object equivalent to
-// enum_descriptor.
-void Generator::PrintEnum(const EnumDescriptor& enum_descriptor) const {
-  std::map<std::string, std::string> m;
-  std::string module_level_descriptor_name =
-      ModuleLevelDescriptorName(enum_descriptor);
-  m["descriptor_name"] = module_level_descriptor_name;
-  m["name"] = enum_descriptor.name();
-  m["full_name"] = enum_descriptor.full_name();
-  m["file"] = kDescriptorKey;
-  const char enum_descriptor_template[] =
-      "$descriptor_name$ = _descriptor.EnumDescriptor(\n"
-      "  name='$name$',\n"
-      "  full_name='$full_name$',\n"
-      "  filename=None,\n"
-      "  file=$file$,\n"
-      "  create_key=_descriptor._internal_create_key,\n"
-      "  values=[\n";
-  std::string options_string;
-  enum_descriptor.options().SerializeToString(&options_string);
-  printer_->Print(m, enum_descriptor_template);
-  printer_->Indent();
-  printer_->Indent();
-
-  if (pure_python_workable_) {
-    for (int i = 0; i < enum_descriptor.value_count(); ++i) {
-      PrintEnumValueDescriptor(*enum_descriptor.value(i));
-      printer_->Print(",\n");
-    }
-  }
-
-  printer_->Outdent();
-  printer_->Print("],\n");
-  printer_->Print("containing_type=None,\n");
-  printer_->Print("serialized_options=$options_value$,\n", "options_value",
-                  OptionsValue(options_string));
-  EnumDescriptorProto edp;
-  printer_->Outdent();
-  printer_->Print(")\n");
-  if (pure_python_workable_) {
-    printer_->Print("_sym_db.RegisterEnumDescriptor($name$)\n", "name",
-                    module_level_descriptor_name);
-  }
-  printer_->Print("\n");
-}
-
-// Recursively prints enums in nested types within descriptor, then
-// prints enums contained at the top level in descriptor.
-void Generator::PrintNestedEnums(const Descriptor& descriptor) const {
-  for (int i = 0; i < descriptor.nested_type_count(); ++i) {
-    PrintNestedEnums(*descriptor.nested_type(i));
-  }
-
-  for (int i = 0; i < descriptor.enum_type_count(); ++i) {
-    PrintEnum(*descriptor.enum_type(i));
-  }
-}
-
-// Prints Python equivalents of all Descriptors in |file|.
-void Generator::PrintMessageDescriptors() const {
-  for (int i = 0; i < file_->message_type_count(); ++i) {
-    PrintDescriptor(*file_->message_type(i));
-    printer_->Print("\n");
-  }
-}
-
-void Generator::PrintServiceDescriptors() const {
-  for (int i = 0; i < file_->service_count(); ++i) {
-    PrintServiceDescriptor(*file_->service(i));
-  }
-}
-
-void Generator::PrintServices() const {
-  for (int i = 0; i < file_->service_count(); ++i) {
-    PrintServiceClass(*file_->service(i));
-    PrintServiceStub(*file_->service(i));
-    printer_->Print("\n");
-  }
-}
-
-void Generator::PrintServiceDescriptor(
-    const ServiceDescriptor& descriptor) const {
-  std::map<std::string, std::string> m;
-  m["service_name"] = ModuleLevelServiceDescriptorName(descriptor);
-  m["name"] = descriptor.name();
-  m["file"] = kDescriptorKey;
-  printer_->Print(m, "$service_name$ = $file$.services_by_name['$name$']\n");
-}
-
-void Generator::PrintDescriptorKeyAndModuleName(
-    const ServiceDescriptor& descriptor) const {
-  std::string name = ModuleLevelServiceDescriptorName(descriptor);
-  if (!pure_python_workable_) {
-    name = "_descriptor.ServiceDescriptor(full_name='" +
-           descriptor.full_name() + "')";
-  }
-  printer_->Print("$descriptor_key$ = $descriptor_name$,\n", "descriptor_key",
-                  kDescriptorKey, "descriptor_name", name);
-  std::string module_name = ModuleName(file_->name());
-  printer_->Print("__module__ = '$module_name$'\n", "module_name", module_name);
-}
-
-void Generator::PrintServiceClass(const ServiceDescriptor& descriptor) const {
-  // Print the service.
-  printer_->Print(
-      "$class_name$ = service_reflection.GeneratedServiceType("
-      "'$class_name$', (_service.Service,), dict(\n",
-      "class_name", descriptor.name());
-  printer_->Indent();
-  Generator::PrintDescriptorKeyAndModuleName(descriptor);
-  printer_->Print("))\n\n");
-  printer_->Outdent();
-}
-
-void Generator::PrintServiceStub(const ServiceDescriptor& descriptor) const {
-  // Print the service stub.
-  printer_->Print(
-      "$class_name$_Stub = "
-      "service_reflection.GeneratedServiceStubType("
-      "'$class_name$_Stub', ($class_name$,), dict(\n",
-      "class_name", descriptor.name());
-  printer_->Indent();
-  Generator::PrintDescriptorKeyAndModuleName(descriptor);
-  printer_->Print("))\n\n");
-  printer_->Outdent();
-}
-
-// Prints statement assigning ModuleLevelDescriptorName(message_descriptor)
-// to a Python Descriptor object for message_descriptor.
-//
-// Mutually recursive with PrintNestedDescriptors().
-void Generator::PrintDescriptor(const Descriptor& message_descriptor) const {
-  std::map<std::string, std::string> m;
-  m["name"] = message_descriptor.name();
-  m["full_name"] = message_descriptor.full_name();
-  m["file"] = kDescriptorKey;
-
-  PrintNestedDescriptors(message_descriptor);
-
-  printer_->Print("\n");
-  printer_->Print("$descriptor_name$ = _descriptor.Descriptor(\n",
-                  "descriptor_name",
-                  ModuleLevelDescriptorName(message_descriptor));
-  printer_->Indent();
-  const char required_function_arguments[] =
-      "name='$name$',\n"
-      "full_name='$full_name$',\n"
-      "filename=None,\n"
-      "file=$file$,\n"
-      "containing_type=None,\n"
-      "create_key=_descriptor._internal_create_key,\n";
-  printer_->Print(m, required_function_arguments);
-  PrintFieldsInDescriptor(message_descriptor);
-  PrintExtensionsInDescriptor(message_descriptor);
-
-  // Nested types
-  printer_->Print("nested_types=[");
-  for (int i = 0; i < message_descriptor.nested_type_count(); ++i) {
-    const std::string nested_name =
-        ModuleLevelDescriptorName(*message_descriptor.nested_type(i));
-    printer_->Print("$name$, ", "name", nested_name);
-  }
-  printer_->Print("],\n");
-
-  // Enum types
-  printer_->Print("enum_types=[\n");
-  printer_->Indent();
-  for (int i = 0; i < message_descriptor.enum_type_count(); ++i) {
-    const std::string descriptor_name =
-        ModuleLevelDescriptorName(*message_descriptor.enum_type(i));
-    printer_->Print(descriptor_name.c_str());
-    printer_->Print(",\n");
-  }
-  printer_->Outdent();
-  printer_->Print("],\n");
-  std::string options_string;
-  message_descriptor.options().SerializeToString(&options_string);
-  printer_->Print(
-      "serialized_options=$options_value$,\n"
-      "is_extendable=$extendable$,\n"
-      "syntax='$syntax$'",
-      "options_value", OptionsValue(options_string), "extendable",
-      message_descriptor.extension_range_count() > 0 ? "True" : "False",
-      "syntax", StringifySyntax(message_descriptor.file()->syntax()));
-  printer_->Print(",\n");
-
-  // Extension ranges
-  printer_->Print("extension_ranges=[");
-  for (int i = 0; i < message_descriptor.extension_range_count(); ++i) {
-    const Descriptor::ExtensionRange* range =
-        message_descriptor.extension_range(i);
-    printer_->Print("($start$, $end$), ", "start", StrCat(range->start),
-                    "end", StrCat(range->end));
-  }
-  printer_->Print("],\n");
-  printer_->Print("oneofs=[\n");
-  printer_->Indent();
-  for (int i = 0; i < message_descriptor.oneof_decl_count(); ++i) {
-    const OneofDescriptor* desc = message_descriptor.oneof_decl(i);
-    m.clear();
-    m["name"] = desc->name();
-    m["full_name"] = desc->full_name();
-    m["index"] = StrCat(desc->index());
-    options_string = OptionsValue(desc->options().SerializeAsString());
-    if (options_string == "None") {
-      m["serialized_options"] = "";
-    } else {
-      m["serialized_options"] = ", serialized_options=" + options_string;
-    }
-    printer_->Print(m,
-                    "_descriptor.OneofDescriptor(\n"
-                    "  name='$name$', full_name='$full_name$',\n"
-                    "  index=$index$, containing_type=None,\n"
-                    "  create_key=_descriptor._internal_create_key,\n"
-                    "fields=[]$serialized_options$),\n");
-  }
-  printer_->Outdent();
-  printer_->Print("],\n");
-
-  printer_->Outdent();
-  printer_->Print(")\n");
-}
-
-// Prints Python Descriptor objects for all nested types contained in
-// message_descriptor.
-//
-// Mutually recursive with PrintDescriptor().
-void Generator::PrintNestedDescriptors(
-    const Descriptor& containing_descriptor) const {
-  for (int i = 0; i < containing_descriptor.nested_type_count(); ++i) {
-    PrintDescriptor(*containing_descriptor.nested_type(i));
-  }
-}
-
-// Prints all messages in |file|.
-void Generator::PrintMessages() const {
-  for (int i = 0; i < file_->message_type_count(); ++i) {
-    std::vector<std::string> to_register;
-    PrintMessage(*file_->message_type(i), "", &to_register, false);
-    for (int j = 0; j < to_register.size(); ++j) {
-      printer_->Print("_sym_db.RegisterMessage($name$)\n", "name",
-                      ResolveKeyword(to_register[j]));
-    }
-    printer_->Print("\n");
-  }
-}
-
-// Prints a Python class for the given message descriptor.  We defer to the
-// metaclass to do almost all of the work of actually creating a useful class.
-// The purpose of this function and its many helper functions above is merely
-// to output a Python version of the descriptors, which the metaclass in
-// reflection.py will use to construct the meat of the class itself.
-//
-// Mutually recursive with PrintNestedMessages().
-// Collect nested message names to_register for the symbol_database.
-void Generator::PrintMessage(const Descriptor& message_descriptor,
-                             const std::string& prefix,
-                             std::vector<std::string>* to_register,
-                             bool is_nested) const {
-  std::string qualified_name;
-  if (is_nested) {
-    if (IsPythonKeyword(message_descriptor.name())) {
-      qualified_name =
-          "getattr(" + prefix + ", '" + message_descriptor.name() + "')";
-    } else {
-      qualified_name = prefix + "." + message_descriptor.name();
-    }
-    printer_->Print(
-        "'$name$' : _reflection.GeneratedProtocolMessageType('$name$', "
-        "(_message.Message,), {\n",
-        "name", message_descriptor.name());
-  } else {
-    qualified_name = ResolveKeyword(message_descriptor.name());
-    printer_->Print(
-        "$qualified_name$ = _reflection.GeneratedProtocolMessageType('$name$', "
-        "(_message.Message,), {\n",
-        "qualified_name", qualified_name, "name", message_descriptor.name());
-  }
-  printer_->Indent();
-
-  to_register->push_back(qualified_name);
-
-  PrintNestedMessages(message_descriptor, qualified_name, to_register);
-  std::map<std::string, std::string> m;
-  m["descriptor_key"] = kDescriptorKey;
-  if (pure_python_workable_) {
-    m["descriptor_name"] = ModuleLevelDescriptorName(message_descriptor);
-  } else {
-    m["descriptor_name"] = "_descriptor.Descriptor(full_name='" +
-                           message_descriptor.full_name() + "')";
-  }
-  printer_->Print(m, "'$descriptor_key$' : $descriptor_name$,\n");
-  std::string module_name = ModuleName(file_->name());
-  printer_->Print("'__module__' : '$module_name$'\n", "module_name",
-                  module_name);
-  printer_->Print("# @@protoc_insertion_point(class_scope:$full_name$)\n",
-                  "full_name", message_descriptor.full_name());
-  printer_->Print("})\n");
-  printer_->Outdent();
-}
-
-// Prints all nested messages within |containing_descriptor|.
-// Mutually recursive with PrintMessage().
-void Generator::PrintNestedMessages(
-    const Descriptor& containing_descriptor, const std::string& prefix,
-    std::vector<std::string>* to_register) const {
-  for (int i = 0; i < containing_descriptor.nested_type_count(); ++i) {
-    printer_->Print("\n");
-    PrintMessage(*containing_descriptor.nested_type(i), prefix, to_register,
-                 true);
-    printer_->Print(",\n");
-  }
-}
-
-// Recursively fixes foreign fields in all nested types in |descriptor|, then
-// sets the message_type and enum_type of all message and enum fields to point
-// to their respective descriptors.
-// Args:
-//   descriptor: descriptor to print fields for.
-//   containing_descriptor: if descriptor is a nested type, this is its
-//       containing type, or NULL if this is a root/top-level type.
-void Generator::FixForeignFieldsInDescriptor(
-    const Descriptor& descriptor,
-    const Descriptor* containing_descriptor) const {
-  for (int i = 0; i < descriptor.nested_type_count(); ++i) {
-    FixForeignFieldsInDescriptor(*descriptor.nested_type(i), &descriptor);
-  }
-
-  for (int i = 0; i < descriptor.field_count(); ++i) {
-    const FieldDescriptor& field_descriptor = *descriptor.field(i);
-    FixForeignFieldsInField(&descriptor, field_descriptor, "fields_by_name");
-  }
-
-  FixContainingTypeInDescriptor(descriptor, containing_descriptor);
-  for (int i = 0; i < descriptor.enum_type_count(); ++i) {
-    const EnumDescriptor& enum_descriptor = *descriptor.enum_type(i);
-    FixContainingTypeInDescriptor(enum_descriptor, &descriptor);
-  }
-  for (int i = 0; i < descriptor.oneof_decl_count(); ++i) {
-    std::map<std::string, std::string> m;
-    const OneofDescriptor* oneof = descriptor.oneof_decl(i);
-    m["descriptor_name"] = ModuleLevelDescriptorName(descriptor);
-    m["oneof_name"] = oneof->name();
-    for (int j = 0; j < oneof->field_count(); ++j) {
-      m["field_name"] = oneof->field(j)->name();
-      printer_->Print(
-          m,
-          "$descriptor_name$.oneofs_by_name['$oneof_name$'].fields.append(\n"
-          "  $descriptor_name$.fields_by_name['$field_name$'])\n");
-      printer_->Print(
-          m,
-          "$descriptor_name$.fields_by_name['$field_name$'].containing_oneof = "
-          "$descriptor_name$.oneofs_by_name['$oneof_name$']\n");
-    }
-  }
-}
-
-void Generator::AddMessageToFileDescriptor(const Descriptor& descriptor) const {
-  std::map<std::string, std::string> m;
-  m["descriptor_name"] = kDescriptorKey;
-  m["message_name"] = descriptor.name();
-  m["message_descriptor_name"] = ModuleLevelDescriptorName(descriptor);
-  const char file_descriptor_template[] =
-      "$descriptor_name$.message_types_by_name['$message_name$'] = "
-      "$message_descriptor_name$\n";
-  printer_->Print(m, file_descriptor_template);
-}
-
-void Generator::AddServiceToFileDescriptor(
-    const ServiceDescriptor& descriptor) const {
-  std::map<std::string, std::string> m;
-  m["descriptor_name"] = kDescriptorKey;
-  m["service_name"] = descriptor.name();
-  m["service_descriptor_name"] = ModuleLevelServiceDescriptorName(descriptor);
-  const char file_descriptor_template[] =
-      "$descriptor_name$.services_by_name['$service_name$'] = "
-      "$service_descriptor_name$\n";
-  printer_->Print(m, file_descriptor_template);
-}
-
-void Generator::AddEnumToFileDescriptor(
-    const EnumDescriptor& descriptor) const {
-  std::map<std::string, std::string> m;
-  m["descriptor_name"] = kDescriptorKey;
-  m["enum_name"] = descriptor.name();
-  m["enum_descriptor_name"] = ModuleLevelDescriptorName(descriptor);
-  const char file_descriptor_template[] =
-      "$descriptor_name$.enum_types_by_name['$enum_name$'] = "
-      "$enum_descriptor_name$\n";
-  printer_->Print(m, file_descriptor_template);
-}
-
-void Generator::AddExtensionToFileDescriptor(
-    const FieldDescriptor& descriptor) const {
-  std::map<std::string, std::string> m;
-  m["descriptor_name"] = kDescriptorKey;
-  m["field_name"] = descriptor.name();
-  m["resolved_name"] = ResolveKeyword(descriptor.name());
-  const char file_descriptor_template[] =
-      "$descriptor_name$.extensions_by_name['$field_name$'] = "
-      "$resolved_name$\n";
-  printer_->Print(m, file_descriptor_template);
-}
-
-// Sets any necessary message_type and enum_type attributes
-// for the Python version of |field|.
-//
-// containing_type may be NULL, in which case this is a module-level field.
-//
-// python_dict_name is the name of the Python dict where we should
-// look the field up in the containing type.  (e.g., fields_by_name
-// or extensions_by_name).  We ignore python_dict_name if containing_type
-// is NULL.
-void Generator::FixForeignFieldsInField(
-    const Descriptor* containing_type, const FieldDescriptor& field,
-    const std::string& python_dict_name) const {
-  const std::string field_referencing_expression =
-      FieldReferencingExpression(containing_type, field, python_dict_name);
-  std::map<std::string, std::string> m;
-  m["field_ref"] = field_referencing_expression;
-  const Descriptor* foreign_message_type = field.message_type();
-  if (foreign_message_type) {
-    m["foreign_type"] = ModuleLevelDescriptorName(*foreign_message_type);
-    printer_->Print(m, "$field_ref$.message_type = $foreign_type$\n");
-  }
-  const EnumDescriptor* enum_type = field.enum_type();
-  if (enum_type) {
-    m["enum_type"] = ModuleLevelDescriptorName(*enum_type);
-    printer_->Print(m, "$field_ref$.enum_type = $enum_type$\n");
-  }
-}
-
-// Returns the module-level expression for the given FieldDescriptor.
-// Only works for fields in the .proto file this Generator is generating for.
-//
-// containing_type may be NULL, in which case this is a module-level field.
-//
-// python_dict_name is the name of the Python dict where we should
-// look the field up in the containing type.  (e.g., fields_by_name
-// or extensions_by_name).  We ignore python_dict_name if containing_type
-// is NULL.
-std::string Generator::FieldReferencingExpression(
-    const Descriptor* containing_type, const FieldDescriptor& field,
-    const std::string& python_dict_name) const {
-  // We should only ever be looking up fields in the current file.
-  // The only things we refer to from other files are message descriptors.
-  GOOGLE_CHECK_EQ(field.file(), file_)
-      << field.file()->name() << " vs. " << file_->name();
-  if (!containing_type) {
-    return ResolveKeyword(field.name());
-  }
-  return strings::Substitute("$0.$1['$2']",
-                          ModuleLevelDescriptorName(*containing_type),
-                          python_dict_name, field.name());
-}
-
-// Prints containing_type for nested descriptors or enum descriptors.
-template <typename DescriptorT>
-void Generator::FixContainingTypeInDescriptor(
-    const DescriptorT& descriptor,
-    const Descriptor* containing_descriptor) const {
-  if (containing_descriptor != nullptr) {
-    const std::string nested_name = ModuleLevelDescriptorName(descriptor);
-    const std::string parent_name =
-        ModuleLevelDescriptorName(*containing_descriptor);
-    printer_->Print("$nested_name$.containing_type = $parent_name$\n",
-                    "nested_name", nested_name, "parent_name", parent_name);
-  }
-}
-
-// Prints statements setting the message_type and enum_type fields in the
-// Python descriptor objects we've already output in the file.  We must
-// do this in a separate step due to circular references (otherwise, we'd
-// just set everything in the initial assignment statements).
-void Generator::FixForeignFieldsInDescriptors() const {
-  for (int i = 0; i < file_->message_type_count(); ++i) {
-    FixForeignFieldsInDescriptor(*file_->message_type(i), nullptr);
-  }
-  for (int i = 0; i < file_->message_type_count(); ++i) {
-    AddMessageToFileDescriptor(*file_->message_type(i));
-  }
-  for (int i = 0; i < file_->enum_type_count(); ++i) {
-    AddEnumToFileDescriptor(*file_->enum_type(i));
-  }
-  for (int i = 0; i < file_->extension_count(); ++i) {
-    AddExtensionToFileDescriptor(*file_->extension(i));
-  }
-
-  // TODO(jieluo): Move this register to PrintFileDescriptor() when
-  // FieldDescriptor.file is added in generated file.
-  printer_->Print("_sym_db.RegisterFileDescriptor($name$)\n", "name",
-                  kDescriptorKey);
-  printer_->Print("\n");
-}
-
-// We need to not only set any necessary message_type fields, but
-// also need to call RegisterExtension() on each message we're
-// extending.
-void Generator::FixForeignFieldsInExtensions() const {
-  // Top-level extensions.
-  for (int i = 0; i < file_->extension_count(); ++i) {
-    FixForeignFieldsInExtension(*file_->extension(i));
-  }
-  // Nested extensions.
-  for (int i = 0; i < file_->message_type_count(); ++i) {
-    FixForeignFieldsInNestedExtensions(*file_->message_type(i));
-  }
-  printer_->Print("\n");
-}
-
-void Generator::FixForeignFieldsInExtension(
-    const FieldDescriptor& extension_field) const {
-  GOOGLE_CHECK(extension_field.is_extension());
-
-  std::map<std::string, std::string> m;
-  // Confusingly, for FieldDescriptors that happen to be extensions,
-  // containing_type() means "extended type."
-  // On the other hand, extension_scope() will give us what we normally
-  // mean by containing_type().
-  m["extended_message_class"] =
-      ModuleLevelMessageName(*extension_field.containing_type());
-  m["field"] = FieldReferencingExpression(
-      extension_field.extension_scope(), extension_field, "extensions_by_name");
-  printer_->Print(m, "$extended_message_class$.RegisterExtension($field$)\n");
-}
-
-void Generator::FixForeignFieldsInNestedExtensions(
-    const Descriptor& descriptor) const {
-  // Recursively fix up extensions in all nested types.
-  for (int i = 0; i < descriptor.nested_type_count(); ++i) {
-    FixForeignFieldsInNestedExtensions(*descriptor.nested_type(i));
-  }
-  // Fix up extensions directly contained within this type.
-  for (int i = 0; i < descriptor.extension_count(); ++i) {
-    FixForeignFieldsInExtension(*descriptor.extension(i));
-  }
-}
-
-// Returns a Python expression that instantiates a Python EnumValueDescriptor
-// object for the given C++ descriptor.
-void Generator::PrintEnumValueDescriptor(
-    const EnumValueDescriptor& descriptor) const {
-  // TODO(robinson): Fix up EnumValueDescriptor "type" fields.
-  // More circular references.  ::sigh::
-  std::string options_string;
-  descriptor.options().SerializeToString(&options_string);
-  std::map<std::string, std::string> m;
-  m["name"] = descriptor.name();
-  m["index"] = StrCat(descriptor.index());
-  m["number"] = StrCat(descriptor.number());
-  m["options"] = OptionsValue(options_string);
-  printer_->Print(m,
-                  "_descriptor.EnumValueDescriptor(\n"
-                  "  name='$name$', index=$index$, number=$number$,\n"
-                  "  serialized_options=$options$,\n"
-                  "  type=None,\n"
-                  "  create_key=_descriptor._internal_create_key)");
-}
-
-// Returns a CEscaped string of serialized_options.
-std::string Generator::OptionsValue(
-    const std::string& serialized_options) const {
-  if (serialized_options.length() == 0 || GeneratingDescriptorProto()) {
-    return "None";
-  } else {
-    return "b'" + CEscape(serialized_options) + "'";
-  }
-}
-
-// Prints an expression for a Python FieldDescriptor for |field|.
-void Generator::PrintFieldDescriptor(const FieldDescriptor& field,
-                                     bool is_extension) const {
-  std::string options_string;
-  field.options().SerializeToString(&options_string);
-  std::map<std::string, std::string> m;
-  m["name"] = field.name();
-  m["full_name"] = field.full_name();
-  m["index"] = StrCat(field.index());
-  m["number"] = StrCat(field.number());
-  m["type"] = StrCat(field.type());
-  m["cpp_type"] = StrCat(field.cpp_type());
-  m["label"] = StrCat(field.label());
-  m["has_default_value"] = field.has_default_value() ? "True" : "False";
-  m["default_value"] = StringifyDefaultValue(field);
-  m["is_extension"] = is_extension ? "True" : "False";
-  m["serialized_options"] = OptionsValue(options_string);
-  m["json_name"] =
-      field.has_json_name() ? ", json_name='" + field.json_name() + "'" : "";
-  // We always set message_type and enum_type to None at this point, and then
-  // these fields in correctly after all referenced descriptors have been
-  // defined and/or imported (see FixForeignFieldsInDescriptors()).
-  const char field_descriptor_decl[] =
-      "_descriptor.FieldDescriptor(\n"
-      "  name='$name$', full_name='$full_name$', index=$index$,\n"
-      "  number=$number$, type=$type$, cpp_type=$cpp_type$, label=$label$,\n"
-      "  has_default_value=$has_default_value$, "
-      "default_value=$default_value$,\n"
-      "  message_type=None, enum_type=None, containing_type=None,\n"
-      "  is_extension=$is_extension$, extension_scope=None,\n"
-      "  serialized_options=$serialized_options$$json_name$, file=DESCRIPTOR,"
-      "  create_key=_descriptor._internal_create_key)";
-  printer_->Print(m, field_descriptor_decl);
-}
-
-// Helper for Print{Fields,Extensions}InDescriptor().
-void Generator::PrintFieldDescriptorsInDescriptor(
-    const Descriptor& message_descriptor, bool is_extension,
-    const std::string& list_variable_name, int (Descriptor::*CountFn)() const,
-    const FieldDescriptor* (Descriptor::*GetterFn)(int)const) const {
-  printer_->Print("$list$=[\n", "list", list_variable_name);
-  printer_->Indent();
-  for (int i = 0; i < (message_descriptor.*CountFn)(); ++i) {
-    PrintFieldDescriptor(*(message_descriptor.*GetterFn)(i), is_extension);
-    printer_->Print(",\n");
-  }
-  printer_->Outdent();
-  printer_->Print("],\n");
-}
-
-// Prints a statement assigning "fields" to a list of Python FieldDescriptors,
-// one for each field present in message_descriptor.
-void Generator::PrintFieldsInDescriptor(
-    const Descriptor& message_descriptor) const {
-  const bool is_extension = false;
-  PrintFieldDescriptorsInDescriptor(message_descriptor, is_extension, "fields",
-                                    &Descriptor::field_count,
-                                    &Descriptor::field);
-}
-
-// Prints a statement assigning "extensions" to a list of Python
-// FieldDescriptors, one for each extension present in message_descriptor.
-void Generator::PrintExtensionsInDescriptor(
-    const Descriptor& message_descriptor) const {
-  const bool is_extension = true;
-  PrintFieldDescriptorsInDescriptor(message_descriptor, is_extension,
-                                    "extensions", &Descriptor::extension_count,
-                                    &Descriptor::extension);
-}
-
-bool Generator::GeneratingDescriptorProto() const {
-  return file_->name() == "net/proto2/proto/descriptor.proto" ||
-         file_->name() == "google/protobuf/descriptor.proto";
-}
-
-// Returns the unique Python module-level identifier given to a descriptor.
-// This name is module-qualified iff the given descriptor describes an
-// entity that doesn't come from the current file.
-template <typename DescriptorT>
-std::string Generator::ModuleLevelDescriptorName(
-    const DescriptorT& descriptor) const {
-  // FIXME(robinson):
-  // We currently don't worry about collisions with underscores in the type
-  // names, so these would collide in nasty ways if found in the same file:
-  //   OuterProto.ProtoA.ProtoB
-  //   OuterProto_ProtoA.ProtoB  # Underscore instead of period.
-  // As would these:
-  //   OuterProto.ProtoA_.ProtoB
-  //   OuterProto.ProtoA._ProtoB  # Leading vs. trailing underscore.
-  // (Contrived, but certainly possible).
-  //
-  // The C++ implementation doesn't guard against this either.  Leaving
-  // it for now...
-  std::string name = NamePrefixedWithNestedTypes(descriptor, "_");
-  ToUpper(&name);
-  // Module-private for now.  Easy to make public later; almost impossible
-  // to make private later.
-  name = "_" + name;
-  // We now have the name relative to its own module.  Also qualify with
-  // the module name iff this descriptor is from a different .proto file.
-  if (descriptor.file() != file_) {
-    name = ModuleAlias(descriptor.file()->name()) + "." + name;
-  }
-  return name;
-}
-
-// Returns the name of the message class itself, not the descriptor.
-// Like ModuleLevelDescriptorName(), module-qualifies the name iff
-// the given descriptor describes an entity that doesn't come from
-// the current file.
-std::string Generator::ModuleLevelMessageName(
-    const Descriptor& descriptor) const {
-  std::string name = NamePrefixedWithNestedTypes(descriptor, ".");
-  if (descriptor.file() != file_) {
-    name = ModuleAlias(descriptor.file()->name()) + "." + name;
-  }
-  return name;
-}
-
-// Returns the unique Python module-level identifier given to a service
-// descriptor.
-std::string Generator::ModuleLevelServiceDescriptorName(
-    const ServiceDescriptor& descriptor) const {
-  std::string name = descriptor.name();
-  ToUpper(&name);
-  name = "_" + name;
-  if (descriptor.file() != file_) {
-    name = ModuleAlias(descriptor.file()->name()) + "." + name;
-  }
-  return name;
-}
-
-// Prints standard constructor arguments serialized_start and serialized_end.
-// Args:
-//   descriptor: The cpp descriptor to have a serialized reference.
-//   proto: A proto
-// Example printer output:
-// serialized_start=41,
-// serialized_end=43,
-//
-template <typename DescriptorT, typename DescriptorProtoT>
-void Generator::PrintSerializedPbInterval(const DescriptorT& descriptor,
-                                          DescriptorProtoT& proto,
-                                          const std::string& name) const {
-  descriptor.CopyTo(&proto);
-  std::string sp;
-  proto.SerializeToString(&sp);
-  int offset = file_descriptor_serialized_.find(sp);
-  GOOGLE_CHECK_GE(offset, 0);
-
-  printer_->Print(
-      "$name$._serialized_start=$serialized_start$\n"
-      "$name$._serialized_end=$serialized_end$\n",
-      "name", name, "serialized_start", StrCat(offset), "serialized_end",
-      StrCat(offset + sp.size()));
-}
-
-namespace {
-void PrintDescriptorOptionsFixingCode(const std::string& descriptor,
-                                      const std::string& options,
-                                      io::Printer* printer) {
-  // Reset the _options to None thus DescriptorBase.GetOptions() can
-  // parse _options again after extensions are registered.
-  printer->Print(
-      "$descriptor$._options = None\n"
-      "$descriptor$._serialized_options = $serialized_value$\n",
-      "descriptor", descriptor, "serialized_value", options);
-}
-}  // namespace
-
-void Generator::SetSerializedPbInterval() const {
-  // Top level enums.
-  for (int i = 0; i < file_->enum_type_count(); ++i) {
-    EnumDescriptorProto proto;
-    const EnumDescriptor& descriptor = *file_->enum_type(i);
-    PrintSerializedPbInterval(descriptor, proto,
-                              ModuleLevelDescriptorName(descriptor));
-  }
-
-  // Messages.
-  for (int i = 0; i < file_->message_type_count(); ++i) {
-    SetMessagePbInterval(*file_->message_type(i));
-  }
-
-  // Services.
-  for (int i = 0; i < file_->service_count(); ++i) {
-    ServiceDescriptorProto proto;
-    const ServiceDescriptor& service = *file_->service(i);
-    PrintSerializedPbInterval(service, proto,
-                              ModuleLevelServiceDescriptorName(service));
-  }
-}
-
-void Generator::SetMessagePbInterval(const Descriptor& descriptor) const {
-  DescriptorProto message_proto;
-  PrintSerializedPbInterval(descriptor, message_proto,
-                            ModuleLevelDescriptorName(descriptor));
-
-  // Nested messages.
-  for (int i = 0; i < descriptor.nested_type_count(); ++i) {
-    SetMessagePbInterval(*descriptor.nested_type(i));
-  }
-
-  for (int i = 0; i < descriptor.enum_type_count(); ++i) {
-    EnumDescriptorProto proto;
-    const EnumDescriptor& enum_des = *descriptor.enum_type(i);
-    PrintSerializedPbInterval(enum_des, proto,
-                              ModuleLevelDescriptorName(enum_des));
-  }
-}
-
-// Prints expressions that set the options field of all descriptors.
-void Generator::FixAllDescriptorOptions() const {
-  // Prints an expression that sets the file descriptor's options.
-  std::string file_options = OptionsValue(file_->options().SerializeAsString());
-  if (file_options != "None") {
-    PrintDescriptorOptionsFixingCode(kDescriptorKey, file_options, printer_);
-  } else {
-    printer_->Print("DESCRIPTOR._options = None\n");
-  }
-  // Prints expressions that set the options for all top level enums.
-  for (int i = 0; i < file_->enum_type_count(); ++i) {
-    const EnumDescriptor& enum_descriptor = *file_->enum_type(i);
-    FixOptionsForEnum(enum_descriptor);
-  }
-  // Prints expressions that set the options for all top level extensions.
-  for (int i = 0; i < file_->extension_count(); ++i) {
-    const FieldDescriptor& field = *file_->extension(i);
-    FixOptionsForField(field);
-  }
-  // Prints expressions that set the options for all messages, nested enums,
-  // nested extensions and message fields.
-  for (int i = 0; i < file_->message_type_count(); ++i) {
-    FixOptionsForMessage(*file_->message_type(i));
-  }
-
-  for (int i = 0; i < file_->service_count(); ++i) {
-    FixOptionsForService(*file_->service(i));
-  }
-}
-
-void Generator::FixOptionsForOneof(const OneofDescriptor& oneof) const {
-  std::string oneof_options = OptionsValue(oneof.options().SerializeAsString());
-  if (oneof_options != "None") {
-    std::string oneof_name = strings::Substitute(
-        "$0.$1['$2']", ModuleLevelDescriptorName(*oneof.containing_type()),
-        "oneofs_by_name", oneof.name());
-    PrintDescriptorOptionsFixingCode(oneof_name, oneof_options, printer_);
-  }
-}
-
-// Prints expressions that set the options for an enum descriptor and its
-// value descriptors.
-void Generator::FixOptionsForEnum(const EnumDescriptor& enum_descriptor) const {
-  std::string descriptor_name = ModuleLevelDescriptorName(enum_descriptor);
-  std::string enum_options =
-      OptionsValue(enum_descriptor.options().SerializeAsString());
-  if (enum_options != "None") {
-    PrintDescriptorOptionsFixingCode(descriptor_name, enum_options, printer_);
-  }
-  for (int i = 0; i < enum_descriptor.value_count(); ++i) {
-    const EnumValueDescriptor& value_descriptor = *enum_descriptor.value(i);
-    std::string value_options =
-        OptionsValue(value_descriptor.options().SerializeAsString());
-    if (value_options != "None") {
-      PrintDescriptorOptionsFixingCode(
-          StringPrintf("%s.values_by_name[\"%s\"]", descriptor_name.c_str(),
-                          value_descriptor.name().c_str()),
-          value_options, printer_);
-    }
-  }
-}
-
-// Prints expressions that set the options for an service descriptor and its
-// value descriptors.
-void Generator::FixOptionsForService(
-    const ServiceDescriptor& service_descriptor) const {
-  std::string descriptor_name =
-      ModuleLevelServiceDescriptorName(service_descriptor);
-  std::string service_options =
-      OptionsValue(service_descriptor.options().SerializeAsString());
-  if (service_options != "None") {
-    PrintDescriptorOptionsFixingCode(descriptor_name, service_options,
-                                     printer_);
-  }
-
-  for (int i = 0; i < service_descriptor.method_count(); ++i) {
-    const MethodDescriptor* method = service_descriptor.method(i);
-    std::string method_options =
-        OptionsValue(method->options().SerializeAsString());
-    if (method_options != "None") {
-      std::string method_name =
-          descriptor_name + ".methods_by_name['" + method->name() + "']";
-      PrintDescriptorOptionsFixingCode(method_name, method_options, printer_);
-    }
-  }
-}
-
-// Prints expressions that set the options for field descriptors (including
-// extensions).
-void Generator::FixOptionsForField(const FieldDescriptor& field) const {
-  std::string field_options = OptionsValue(field.options().SerializeAsString());
-  if (field_options != "None") {
-    std::string field_name;
-    if (field.is_extension()) {
-      if (field.extension_scope() == nullptr) {
-        // Top level extensions.
-        field_name = field.name();
-      } else {
-        field_name = FieldReferencingExpression(field.extension_scope(), field,
-                                                "extensions_by_name");
-      }
-    } else {
-      field_name = FieldReferencingExpression(field.containing_type(), field,
-                                              "fields_by_name");
-    }
-    PrintDescriptorOptionsFixingCode(field_name, field_options, printer_);
-  }
-}
-
-// Prints expressions that set the options for a message and all its inner
-// types (nested messages, nested enums, extensions, fields).
-void Generator::FixOptionsForMessage(const Descriptor& descriptor) const {
-  // Nested messages.
-  for (int i = 0; i < descriptor.nested_type_count(); ++i) {
-    FixOptionsForMessage(*descriptor.nested_type(i));
-  }
-  // Oneofs.
-  for (int i = 0; i < descriptor.oneof_decl_count(); ++i) {
-    FixOptionsForOneof(*descriptor.oneof_decl(i));
-  }
-  // Enums.
-  for (int i = 0; i < descriptor.enum_type_count(); ++i) {
-    FixOptionsForEnum(*descriptor.enum_type(i));
-  }
-  // Fields.
-  for (int i = 0; i < descriptor.field_count(); ++i) {
-    const FieldDescriptor& field = *descriptor.field(i);
-    FixOptionsForField(field);
-  }
-  // Extensions.
-  for (int i = 0; i < descriptor.extension_count(); ++i) {
-    const FieldDescriptor& field = *descriptor.extension(i);
-    FixOptionsForField(field);
-  }
-  // Message option for this message.
-  std::string message_options =
-      OptionsValue(descriptor.options().SerializeAsString());
-  if (message_options != "None") {
-    std::string descriptor_name = ModuleLevelDescriptorName(descriptor);
-    PrintDescriptorOptionsFixingCode(descriptor_name, message_options,
-                                     printer_);
-  }
-}
-
-// If a dependency forwards other files through public dependencies, let's
-// copy over the corresponding module aliases.
-void Generator::CopyPublicDependenciesAliases(
-    const std::string& copy_from, const FileDescriptor* file) const {
-  for (int i = 0; i < file->public_dependency_count(); ++i) {
-    std::string module_name = ModuleName(file->public_dependency(i)->name());
-    std::string module_alias = ModuleAlias(file->public_dependency(i)->name());
-    // There's no module alias in the dependent file if it was generated by
-    // an old protoc (less than 3.0.0-alpha-1). Use module name in this
-    // situation.
-    printer_->Print(
-        "try:\n"
-        "  $alias$ = $copy_from$.$alias$\n"
-        "except AttributeError:\n"
-        "  $alias$ = $copy_from$.$module$\n",
-        "alias", module_alias, "module", module_name, "copy_from", copy_from);
-    CopyPublicDependenciesAliases(copy_from, file->public_dependency(i));
-  }
-}
-
-}  // namespace python
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/compiler/python/generator.h b/libs/protobuf/src/google/protobuf/compiler/python/generator.h
deleted file mode 100644
index f1fecbc..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/python/generator.h
+++ /dev/null
@@ -1,185 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: robinson@google.com (Will Robinson)
-//
-// Generates Python code for a given .proto file.
-
-#ifndef GOOGLE_PROTOBUF_COMPILER_PYTHON_GENERATOR_H__
-#define GOOGLE_PROTOBUF_COMPILER_PYTHON_GENERATOR_H__
-
-#include <string>
-
-#include <google/protobuf/stubs/mutex.h>
-#include <google/protobuf/compiler/code_generator.h>
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-
-class Descriptor;
-class EnumDescriptor;
-class EnumValueDescriptor;
-class FieldDescriptor;
-class OneofDescriptor;
-class ServiceDescriptor;
-
-namespace io {
-class Printer;
-}
-
-namespace compiler {
-namespace python {
-
-// CodeGenerator implementation for generated Python protocol buffer classes.
-// If you create your own protocol compiler binary and you want it to support
-// Python output, you can do so by registering an instance of this
-// CodeGenerator with the CommandLineInterface in your main() function.
-class PROTOC_EXPORT Generator : public CodeGenerator {
- public:
-  Generator();
-  ~Generator() override;
-
-  // CodeGenerator methods.
-  bool Generate(const FileDescriptor* file, const std::string& parameter,
-                GeneratorContext* generator_context,
-                std::string* error) const override;
-
-  uint64_t GetSupportedFeatures() const override;
-
- private:
-  void PrintImports() const;
-  void PrintFileDescriptor() const;
-  void PrintAllNestedEnumsInFile() const;
-  void PrintNestedEnums(const Descriptor& descriptor) const;
-  void PrintEnum(const EnumDescriptor& enum_descriptor) const;
-
-  void PrintFieldDescriptor(const FieldDescriptor& field,
-                            bool is_extension) const;
-  void PrintFieldDescriptorsInDescriptor(
-      const Descriptor& message_descriptor, bool is_extension,
-      const std::string& list_variable_name, int (Descriptor::*CountFn)() const,
-      const FieldDescriptor* (Descriptor::*GetterFn)(int)const) const;
-  void PrintFieldsInDescriptor(const Descriptor& message_descriptor) const;
-  void PrintExtensionsInDescriptor(const Descriptor& message_descriptor) const;
-  void PrintMessageDescriptors() const;
-  void PrintDescriptor(const Descriptor& message_descriptor) const;
-  void PrintNestedDescriptors(const Descriptor& containing_descriptor) const;
-
-  void PrintMessages() const;
-  void PrintMessage(const Descriptor& message_descriptor,
-                    const std::string& prefix,
-                    std::vector<std::string>* to_register,
-                    bool is_nested) const;
-  void PrintNestedMessages(const Descriptor& containing_descriptor,
-                           const std::string& prefix,
-                           std::vector<std::string>* to_register) const;
-
-  void FixForeignFieldsInDescriptors() const;
-  void FixForeignFieldsInDescriptor(
-      const Descriptor& descriptor,
-      const Descriptor* containing_descriptor) const;
-  void FixForeignFieldsInField(const Descriptor* containing_type,
-                               const FieldDescriptor& field,
-                               const std::string& python_dict_name) const;
-  void AddMessageToFileDescriptor(const Descriptor& descriptor) const;
-  void AddEnumToFileDescriptor(const EnumDescriptor& descriptor) const;
-  void AddExtensionToFileDescriptor(const FieldDescriptor& descriptor) const;
-  void AddServiceToFileDescriptor(const ServiceDescriptor& descriptor) const;
-  std::string FieldReferencingExpression(
-      const Descriptor* containing_type, const FieldDescriptor& field,
-      const std::string& python_dict_name) const;
-  template <typename DescriptorT>
-  void FixContainingTypeInDescriptor(
-      const DescriptorT& descriptor,
-      const Descriptor* containing_descriptor) const;
-
-  void FixForeignFieldsInExtensions() const;
-  void FixForeignFieldsInExtension(
-      const FieldDescriptor& extension_field) const;
-  void FixForeignFieldsInNestedExtensions(const Descriptor& descriptor) const;
-
-  void PrintServices() const;
-  void PrintServiceDescriptors() const;
-  void PrintServiceDescriptor(const ServiceDescriptor& descriptor) const;
-  void PrintServiceClass(const ServiceDescriptor& descriptor) const;
-  void PrintServiceStub(const ServiceDescriptor& descriptor) const;
-  void PrintDescriptorKeyAndModuleName(
-      const ServiceDescriptor& descriptor) const;
-
-  void PrintEnumValueDescriptor(const EnumValueDescriptor& descriptor) const;
-  std::string OptionsValue(const std::string& serialized_options) const;
-  bool GeneratingDescriptorProto() const;
-
-  template <typename DescriptorT>
-  std::string ModuleLevelDescriptorName(const DescriptorT& descriptor) const;
-  std::string ModuleLevelMessageName(const Descriptor& descriptor) const;
-  std::string ModuleLevelServiceDescriptorName(
-      const ServiceDescriptor& descriptor) const;
-
-  template <typename DescriptorT, typename DescriptorProtoT>
-  void PrintSerializedPbInterval(const DescriptorT& descriptor,
-                                 DescriptorProtoT& proto,
-                                 const std::string& name) const;
-
-  void FixAllDescriptorOptions() const;
-  void FixOptionsForField(const FieldDescriptor& field) const;
-  void FixOptionsForOneof(const OneofDescriptor& oneof) const;
-  void FixOptionsForEnum(const EnumDescriptor& descriptor) const;
-  void FixOptionsForService(const ServiceDescriptor& descriptor) const;
-  void FixOptionsForMessage(const Descriptor& descriptor) const;
-
-  void SetSerializedPbInterval() const;
-  void SetMessagePbInterval(const Descriptor& descriptor) const;
-
-  void CopyPublicDependenciesAliases(const std::string& copy_from,
-                                     const FileDescriptor* file) const;
-
-  // Very coarse-grained lock to ensure that Generate() is reentrant.
-  // Guards file_, printer_ and file_descriptor_serialized_.
-  mutable Mutex mutex_;
-  mutable const FileDescriptor* file_;  // Set in Generate().  Under mutex_.
-  mutable std::string file_descriptor_serialized_;
-  mutable io::Printer* printer_;  // Set in Generate().  Under mutex_.
-  mutable bool pure_python_workable_;
-
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(Generator);
-};
-
-}  // namespace python
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
-
-#endif  // GOOGLE_PROTOBUF_COMPILER_PYTHON_GENERATOR_H__
diff --git a/libs/protobuf/src/google/protobuf/compiler/python/helpers.cc b/libs/protobuf/src/google/protobuf/compiler/python/helpers.cc
deleted file mode 100644
index e4d3c13..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/python/helpers.cc
+++ /dev/null
@@ -1,131 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <google/protobuf/compiler/python/helpers.h>
-
-#include <algorithm>
-
-#include <google/protobuf/stubs/strutil.h>
-#include <google/protobuf/compiler/code_generator.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/descriptor.pb.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace python {
-
-// Returns the Python module name expected for a given .proto filename.
-std::string ModuleName(const std::string& filename) {
-  std::string basename = StripProto(filename);
-  ReplaceCharacters(&basename, "-", '_');
-  ReplaceCharacters(&basename, "/", '.');
-  return basename + "_pb2";
-}
-
-std::string StrippedModuleName(const std::string& filename) {
-  std::string module_name = ModuleName(filename);
-  return module_name;
-}
-
-// Keywords reserved by the Python language.
-const char* const kKeywords[] = {
-    "False",  "None",     "True",  "and",    "as",       "assert",
-    "async",  "await",    "break", "class",  "continue", "def",
-    "del",    "elif",     "else",  "except", "finally",  "for",
-    "from",   "global",   "if",    "import", "in",       "is",
-    "lambda", "nonlocal", "not",   "or",     "pass",     "raise",
-    "return", "try",      "while", "with",   "yield",
-};
-const char* const* kKeywordsEnd =
-    kKeywords + (sizeof(kKeywords) / sizeof(kKeywords[0]));
-
-bool ContainsPythonKeyword(const std::string& module_name) {
-  std::vector<std::string> tokens = Split(module_name, ".");
-  for (int i = 0; i < static_cast<int>(tokens.size()); ++i) {
-    if (std::find(kKeywords, kKeywordsEnd, tokens[i]) != kKeywordsEnd) {
-      return true;
-    }
-  }
-  return false;
-}
-
-bool IsPythonKeyword(const std::string& name) {
-  return (std::find(kKeywords, kKeywordsEnd, name) != kKeywordsEnd);
-}
-
-std::string ResolveKeyword(const std::string& name) {
-  if (IsPythonKeyword(name)) {
-    return "globals()['" + name + "']";
-  }
-  return name;
-}
-
-std::string GetFileName(const FileDescriptor* file_des,
-                        const std::string& suffix) {
-  std::string module_name = ModuleName(file_des->name());
-  std::string filename = module_name;
-  ReplaceCharacters(&filename, ".", '/');
-  filename += suffix;
-  return filename;
-}
-
-bool HasGenericServices(const FileDescriptor* file) {
-  return file->service_count() > 0 && file->options().py_generic_services();
-}
-
-template <typename DescriptorT>
-std::string NamePrefixedWithNestedTypes(const DescriptorT& descriptor,
-                                        const std::string& separator) {
-  std::string name = descriptor.name();
-  const Descriptor* parent = descriptor.containing_type();
-  if (parent != nullptr) {
-    std::string prefix = NamePrefixedWithNestedTypes(*parent, separator);
-    if (separator == "." && IsPythonKeyword(name)) {
-      return "getattr(" + prefix + ", '" + name + "')";
-    } else {
-      return prefix + separator + name;
-    }
-  }
-  if (separator == ".") {
-    name = ResolveKeyword(name);
-  }
-  return name;
-}
-
-template std::string NamePrefixedWithNestedTypes<Descriptor>(
-    const Descriptor& descriptor, const std::string& separator);
-template std::string NamePrefixedWithNestedTypes<EnumDescriptor>(
-    const EnumDescriptor& descriptor, const std::string& separator);
-
-}  // namespace python
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/compiler/python/helpers.h b/libs/protobuf/src/google/protobuf/compiler/python/helpers.h
deleted file mode 100644
index a68ceb1..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/python/helpers.h
+++ /dev/null
@@ -1,62 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef GOOGLE_PROTOBUF_COMPILER_PYTHON_HELPERS_H__
-#define GOOGLE_PROTOBUF_COMPILER_PYTHON_HELPERS_H__
-
-#include <string>
-
-#include <google/protobuf/descriptor.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace python {
-
-
-std::string ModuleName(const std::string& filename);
-std::string StrippedModuleName(const std::string& filename);
-bool ContainsPythonKeyword(const std::string& module_name);
-bool IsPythonKeyword(const std::string& name);
-std::string ResolveKeyword(const std::string& name);
-std::string GetFileName(const FileDescriptor* file_des,
-                        const std::string& suffix);
-bool HasGenericServices(const FileDescriptor* file);
-
-template <typename DescriptorT>
-std::string NamePrefixedWithNestedTypes(const DescriptorT& descriptor,
-                                        const std::string& separator);
-
-}  // namespace python
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // GOOGLE_PROTOBUF_COMPILER_PYTHON_HELPERS_H__
diff --git a/libs/protobuf/src/google/protobuf/compiler/python/plugin_unittest.cc b/libs/protobuf/src/google/protobuf/compiler/python/plugin_unittest.cc
deleted file mode 100644
index 7f9589b..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/python/plugin_unittest.cc
+++ /dev/null
@@ -1,126 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-
-#include <memory>
-#include <string>
-
-#include <google/protobuf/testing/file.h>
-#include <google/protobuf/testing/file.h>
-#include <google/protobuf/compiler/command_line_interface.h>
-#include <google/protobuf/compiler/python/generator.h>
-#include <google/protobuf/io/printer.h>
-#include <google/protobuf/io/zero_copy_stream.h>
-#include <google/protobuf/stubs/strutil.h>
-#include <google/protobuf/testing/googletest.h>
-#include <gtest/gtest.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace python {
-namespace {
-
-class TestGenerator : public CodeGenerator {
- public:
-  TestGenerator() {}
-  ~TestGenerator() override {}
-
-  bool Generate(const FileDescriptor* file, const std::string& parameter,
-                GeneratorContext* context, std::string* error) const override {
-    TryInsert("test_pb2.py", "imports", context);
-    TryInsert("test_pb2.py", "module_scope", context);
-    TryInsert("test_pb2.py", "class_scope:foo.Bar", context);
-    TryInsert("test_pb2.py", "class_scope:foo.Bar.Baz", context);
-    return true;
-  }
-
-  void TryInsert(const std::string& filename,
-                 const std::string& insertion_point,
-                 GeneratorContext* context) const {
-    std::unique_ptr<io::ZeroCopyOutputStream> output(
-        context->OpenForInsert(filename, insertion_point));
-    io::Printer printer(output.get(), '$');
-    printer.Print("// inserted $name$\n", "name", insertion_point);
-  }
-};
-
-// opposed to importlib) in the usual case where the .proto file paths do not
-// not contain any Python keywords.
-TEST(PythonPluginTest, ImportTest) {
-  // Create files test1.proto and test2.proto with the former importing the
-  // latter.
-  GOOGLE_CHECK_OK(File::SetContents(TestTempDir() + "/test1.proto",
-                             "syntax = \"proto3\";\n"
-                             "package foo;\n"
-                             "import \"test2.proto\";"
-                             "message Message1 {\n"
-                             "  Message2 message_2 = 1;\n"
-                             "}\n",
-                             true));
-  GOOGLE_CHECK_OK(File::SetContents(TestTempDir() + "/test2.proto",
-                             "syntax = \"proto3\";\n"
-                             "package foo;\n"
-                             "message Message2 {}\n",
-                             true));
-
-  compiler::CommandLineInterface cli;
-  cli.SetInputsAreProtoPathRelative(true);
-  python::Generator python_generator;
-  cli.RegisterGenerator("--python_out", &python_generator, "");
-  std::string proto_path = "-I" + TestTempDir();
-  std::string python_out = "--python_out=" + TestTempDir();
-  const char* argv[] = {"protoc", proto_path.c_str(), "-I.", python_out.c_str(),
-                        "test1.proto"};
-  ASSERT_EQ(0, cli.Run(5, argv));
-
-  // Loop over the lines of the generated code and verify that we find an
-  // ordinary Python import but do not find the string "importlib".
-  std::string output;
-  GOOGLE_CHECK_OK(File::GetContents(TestTempDir() + "/test1_pb2.py", &output,
-                             true));
-  std::vector<std::string> lines = Split(output, "\n");
-  std::string expected_import = "import test2_pb2";
-  bool found_expected_import = false;
-  for (int i = 0; i < lines.size(); ++i) {
-    if (lines[i].find(expected_import) != std::string::npos) {
-      found_expected_import = true;
-    }
-    EXPECT_EQ(std::string::npos, lines[i].find("importlib"));
-  }
-  EXPECT_TRUE(found_expected_import);
-}
-
-}  // namespace
-}  // namespace python
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/compiler/python/pyi_generator.cc b/libs/protobuf/src/google/protobuf/compiler/python/pyi_generator.cc
deleted file mode 100644
index 1ccc9a2..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/python/pyi_generator.cc
+++ /dev/null
@@ -1,636 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <google/protobuf/compiler/python/pyi_generator.h>
-
-#include <string>
-
-#include <google/protobuf/stubs/strutil.h>
-#include <google/protobuf/compiler/python/helpers.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/descriptor.pb.h>
-#include <google/protobuf/io/printer.h>
-#include <google/protobuf/io/zero_copy_stream.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace python {
-
-template <typename DescriptorT>
-struct SortByName {
-  bool operator()(const DescriptorT* l, const DescriptorT* r) const {
-    return l->name() < r->name();
-  }
-};
-
-PyiGenerator::PyiGenerator() : file_(nullptr) {}
-
-PyiGenerator::~PyiGenerator() {}
-
-void PyiGenerator::PrintItemMap(
-    const std::map<std::string, std::string>& item_map) const {
-  for (const auto& entry : item_map) {
-    printer_->Print("$key$: $value$\n", "key", entry.first, "value",
-                    entry.second);
-  }
-}
-
-template <typename DescriptorT>
-std::string PyiGenerator::ModuleLevelName(
-    const DescriptorT& descriptor,
-    const std::map<std::string, std::string>& import_map) const {
-  std::string name = NamePrefixedWithNestedTypes(descriptor, ".");
-  if (descriptor.file() != file_) {
-    std::string module_alias;
-    std::string filename = descriptor.file()->name();
-    if (import_map.find(filename) == import_map.end()) {
-      std::string module_name = ModuleName(descriptor.file()->name());
-      std::vector<std::string> tokens = Split(module_name, ".");
-      module_alias = "_" + tokens.back();
-    } else {
-      module_alias = import_map.at(filename);
-    }
-    name = module_alias + "." + name;
-  }
-  return name;
-}
-
-struct ImportModules {
-  bool has_repeated = false;    // _containers
-  bool has_iterable = false;    // typing.Iterable
-  bool has_messages = false;    // _message
-  bool has_enums = false;       // _enum_type_wrapper
-  bool has_extendable = false;  // _python_message
-  bool has_mapping = false;     // typing.Mapping
-  bool has_optional = false;    // typing.Optional
-  bool has_union = false;       // typing.Union
-  bool has_well_known_type = false;
-};
-
-// Checks whether a descriptor name matches a well-known type.
-bool IsWellKnownType(const std::string& name) {
-  // LINT.IfChange(wktbases)
-  return (name == "google.protobuf.Any" ||
-          name == "google.protobuf.Duration" ||
-          name == "google.protobuf.FieldMask" ||
-          name == "google.protobuf.ListValue" ||
-          name == "google.protobuf.Struct" ||
-          name == "google.protobuf.Timestamp");
-  // LINT.ThenChange(//depot/google3/net/proto2/python/internal/well_known_types.py:wktbases)
-}
-
-// Checks what modules should be imported for this message
-// descriptor.
-void CheckImportModules(const Descriptor* descriptor,
-                        ImportModules* import_modules) {
-  if (descriptor->extension_range_count() > 0) {
-    import_modules->has_extendable = true;
-  }
-  if (descriptor->enum_type_count() > 0) {
-    import_modules->has_enums = true;
-  }
-  if (IsWellKnownType(descriptor->full_name())) {
-    import_modules->has_well_known_type = true;
-  }
-  for (int i = 0; i < descriptor->field_count(); ++i) {
-    const FieldDescriptor* field = descriptor->field(i);
-    if (IsPythonKeyword(field->name())) {
-      continue;
-    }
-    import_modules->has_optional = true;
-    if (field->is_repeated()) {
-      import_modules->has_repeated = true;
-    }
-    if (field->is_map()) {
-      import_modules->has_mapping = true;
-      const FieldDescriptor* value_des = field->message_type()->field(1);
-      if (value_des->cpp_type() == FieldDescriptor::CPPTYPE_MESSAGE ||
-          value_des->cpp_type() == FieldDescriptor::CPPTYPE_ENUM) {
-        import_modules->has_union = true;
-      }
-    } else {
-      if (field->is_repeated()) {
-        import_modules->has_iterable = true;
-      }
-      if (field->cpp_type() == FieldDescriptor::CPPTYPE_MESSAGE) {
-        import_modules->has_union = true;
-        import_modules->has_mapping = true;
-      }
-      if (field->cpp_type() == FieldDescriptor::CPPTYPE_ENUM) {
-        import_modules->has_union = true;
-      }
-    }
-  }
-  for (int i = 0; i < descriptor->nested_type_count(); ++i) {
-    CheckImportModules(descriptor->nested_type(i), import_modules);
-  }
-}
-
-void PyiGenerator::PrintImportForDescriptor(
-    const FileDescriptor& desc,
-    std::map<std::string, std::string>* import_map,
-    std::set<std::string>* seen_aliases) const {
-  const std::string& filename = desc.name();
-  std::string module_name = StrippedModuleName(filename);
-  size_t last_dot_pos = module_name.rfind('.');
-  std::string import_statement;
-  if (last_dot_pos == std::string::npos) {
-    import_statement = "import " + module_name;
-  } else {
-    import_statement = "from " + module_name.substr(0, last_dot_pos) +
-                       " import " + module_name.substr(last_dot_pos + 1);
-    module_name = module_name.substr(last_dot_pos + 1);
-  }
-  std::string alias = "_" + module_name;
-  // Generate a unique alias by adding _1 suffixes until we get an unused alias.
-  while (seen_aliases->find(alias) != seen_aliases->end()) {
-    alias = alias + "_1";
-  }
-  printer_->Print("$statement$ as $alias$\n", "statement",
-                  import_statement, "alias", alias);
-  (*import_map)[filename] = alias;
-  seen_aliases->insert(alias);
-}
-
-void PyiGenerator::PrintImports(
-    std::map<std::string, std::string>* item_map,
-    std::map<std::string, std::string>* import_map) const {
-  // Prints imported dependent _pb2 files.
-  std::set<std::string> seen_aliases;
-  for (int i = 0; i < file_->dependency_count(); ++i) {
-    const FileDescriptor* dep = file_->dependency(i);
-    PrintImportForDescriptor(*dep, import_map, &seen_aliases);
-    for (int j = 0; j < dep->public_dependency_count(); ++j) {
-      PrintImportForDescriptor(
-          *dep->public_dependency(j), import_map, &seen_aliases);
-    }
-  }
-
-  // Checks what modules should be imported.
-  ImportModules import_modules;
-  if (file_->message_type_count() > 0) {
-    import_modules.has_messages = true;
-  }
-  if (file_->enum_type_count() > 0) {
-    import_modules.has_enums = true;
-  }
-  for (int i = 0; i < file_->message_type_count(); i++) {
-    CheckImportModules(file_->message_type(i), &import_modules);
-  }
-
-  // Prints modules (e.g. _containers, _messages, typing) that are
-  // required in the proto file.
-  if (import_modules.has_repeated) {
-    printer_->Print(
-        "from google.protobuf.internal import containers as "
-        "_containers\n");
-  }
-  if (import_modules.has_enums) {
-    printer_->Print(
-        "from google.protobuf.internal import enum_type_wrapper"
-        " as _enum_type_wrapper\n");
-  }
-  if (import_modules.has_extendable) {
-    printer_->Print(
-        "from google.protobuf.internal import python_message"
-        " as _python_message\n");
-  }
-  if (import_modules.has_well_known_type) {
-    printer_->Print(
-        "from google.protobuf.internal import well_known_types"
-        " as _well_known_types\n");
-  }
-  printer_->Print(
-      "from google.protobuf import"
-      " descriptor as _descriptor\n");
-  if (import_modules.has_messages) {
-    printer_->Print(
-        "from google.protobuf import message as _message\n");
-  }
-  if (HasGenericServices(file_)) {
-    printer_->Print(
-        "from google.protobuf import service as"
-        " _service\n");
-  }
-  printer_->Print("from typing import ");
-  printer_->Print("ClassVar as _ClassVar");
-  if (import_modules.has_iterable) {
-    printer_->Print(", Iterable as _Iterable");
-  }
-  if (import_modules.has_mapping) {
-    printer_->Print(", Mapping as _Mapping");
-  }
-  if (import_modules.has_optional) {
-    printer_->Print(", Optional as _Optional");
-  }
-  if (import_modules.has_union) {
-    printer_->Print(", Union as _Union");
-  }
-  printer_->Print("\n\n");
-
-  // Public imports
-  for (int i = 0; i < file_->public_dependency_count(); ++i) {
-    const FileDescriptor* public_dep = file_->public_dependency(i);
-    std::string module_name = StrippedModuleName(public_dep->name());
-    // Top level messages in public imports
-    for (int i = 0; i < public_dep->message_type_count(); ++i) {
-      printer_->Print("from $module$ import $message_class$\n", "module",
-                      module_name, "message_class",
-                      public_dep->message_type(i)->name());
-    }
-    // Top level enums for public imports
-    for (int i = 0; i < public_dep->enum_type_count(); ++i) {
-      printer_->Print("from $module$ import $enum_class$\n", "module",
-                      module_name, "enum_class",
-                      public_dep->enum_type(i)->name());
-    }
-    // Enum values for public imports
-    for (int i = 0; i < public_dep->enum_type_count(); ++i) {
-      const EnumDescriptor* enum_descriptor = public_dep->enum_type(i);
-      for (int j = 0; j < enum_descriptor->value_count(); ++j) {
-        (*item_map)[enum_descriptor->value(j)->name()] =
-            ModuleLevelName(*enum_descriptor, *import_map);
-      }
-    }
-    // Top level extensions for public imports
-    AddExtensions(*public_dep, item_map);
-  }
-}
-
-void PyiGenerator::PrintEnum(const EnumDescriptor& enum_descriptor) const {
-  std::string enum_name = enum_descriptor.name();
-  printer_->Print(
-      "class $enum_name$(int, metaclass=_enum_type_wrapper.EnumTypeWrapper):\n"
-      "    __slots__ = []\n",
-      "enum_name", enum_name);
-}
-
-// Adds enum value to item map which will be ordered and printed later.
-void PyiGenerator::AddEnumValue(
-    const EnumDescriptor& enum_descriptor,
-    std::map<std::string, std::string>* item_map,
-    const std::map<std::string, std::string>& import_map) const {
-  // enum values
-  std::string module_enum_name = ModuleLevelName(enum_descriptor, import_map);
-  for (int j = 0; j < enum_descriptor.value_count(); ++j) {
-    const EnumValueDescriptor* value_descriptor = enum_descriptor.value(j);
-    (*item_map)[value_descriptor->name()] = module_enum_name;
-  }
-}
-
-// Prints top level enums
-void PyiGenerator::PrintTopLevelEnums() const {
-  for (int i = 0; i < file_->enum_type_count(); ++i) {
-    printer_->Print("\n");
-    PrintEnum(*file_->enum_type(i));
-  }
-}
-
-// Add top level extensions to item_map which will be ordered and
-// printed later.
-template <typename DescriptorT>
-void PyiGenerator::AddExtensions(
-    const DescriptorT& descriptor,
-    std::map<std::string, std::string>* item_map) const {
-  for (int i = 0; i < descriptor.extension_count(); ++i) {
-    const FieldDescriptor* extension_field = descriptor.extension(i);
-    std::string constant_name = extension_field->name() + "_FIELD_NUMBER";
-    ToUpper(&constant_name);
-    (*item_map)[constant_name] = "_ClassVar[int]";
-    (*item_map)[extension_field->name()] = "_descriptor.FieldDescriptor";
-  }
-}
-
-// Returns the string format of a field's cpp_type
-std::string PyiGenerator::GetFieldType(
-    const FieldDescriptor& field_des, const Descriptor& containing_des,
-    const std::map<std::string, std::string>& import_map) const {
-  switch (field_des.cpp_type()) {
-    case FieldDescriptor::CPPTYPE_INT32:
-    case FieldDescriptor::CPPTYPE_UINT32:
-    case FieldDescriptor::CPPTYPE_INT64:
-    case FieldDescriptor::CPPTYPE_UINT64:
-      return "int";
-    case FieldDescriptor::CPPTYPE_DOUBLE:
-    case FieldDescriptor::CPPTYPE_FLOAT:
-      return "float";
-    case FieldDescriptor::CPPTYPE_BOOL:
-      return "bool";
-    case FieldDescriptor::CPPTYPE_ENUM:
-      return ModuleLevelName(*field_des.enum_type(), import_map);
-    case FieldDescriptor::CPPTYPE_STRING:
-      if (field_des.type() == FieldDescriptor::TYPE_STRING) {
-        return "str";
-      } else {
-        return "bytes";
-      }
-    case FieldDescriptor::CPPTYPE_MESSAGE: {
-      // If the field is inside a nested message and the nested message has the
-      // same name as a top-level message, then we need to prefix the field type
-      // with the module name for disambiguation.
-      std::string name = ModuleLevelName(*field_des.message_type(), import_map);
-      if ((containing_des.containing_type() != nullptr &&
-           name == containing_des.name())) {
-        std::string module = ModuleName(field_des.file()->name());
-        name = module + "." + name;
-      }
-      return name;
-    }
-    default:
-      GOOGLE_LOG(FATAL) << "Unsupported field type.";
-  }
-  return "";
-}
-
-void PyiGenerator::PrintMessage(
-    const Descriptor& message_descriptor, bool is_nested,
-    const std::map<std::string, std::string>& import_map) const {
-  if (!is_nested) {
-    printer_->Print("\n");
-  }
-  std::string class_name = message_descriptor.name();
-  std::string extra_base;
-  // A well-known type needs to inherit from its corresponding base class in
-  // net/proto2/python/internal/well_known_types.
-  if (IsWellKnownType(message_descriptor.full_name())) {
-    extra_base = ", _well_known_types." + message_descriptor.name();
-  } else {
-    extra_base = "";
-  }
-  printer_->Print("class $class_name$(_message.Message$extra_base$):\n",
-                  "class_name", class_name, "extra_base", extra_base);
-  printer_->Indent();
-  printer_->Indent();
-
-  std::vector<const FieldDescriptor*> fields;
-  fields.reserve(message_descriptor.field_count());
-  for (int i = 0; i < message_descriptor.field_count(); ++i) {
-    fields.push_back(message_descriptor.field(i));
-  }
-  std::sort(fields.begin(), fields.end(), SortByName<FieldDescriptor>());
-
-  // Prints slots
-  printer_->Print("__slots__ = [", "class_name", class_name);
-  bool first_item = true;
-  for (const auto& field_des : fields) {
-    if (IsPythonKeyword(field_des->name())) {
-      continue;
-    }
-    if (first_item) {
-      first_item = false;
-    } else {
-      printer_->Print(", ");
-    }
-    printer_->Print("\"$field_name$\"", "field_name", field_des->name());
-  }
-  printer_->Print("]\n");
-
-  std::map<std::string, std::string> item_map;
-  // Prints Extensions for extendable messages
-  if (message_descriptor.extension_range_count() > 0) {
-    item_map["Extensions"] = "_python_message._ExtensionDict";
-  }
-
-  // Prints nested enums
-  std::vector<const EnumDescriptor*> nested_enums;
-  nested_enums.reserve(message_descriptor.enum_type_count());
-  for (int i = 0; i < message_descriptor.enum_type_count(); ++i) {
-    nested_enums.push_back(message_descriptor.enum_type(i));
-  }
-  std::sort(nested_enums.begin(), nested_enums.end(),
-            SortByName<EnumDescriptor>());
-
-  for (const auto& entry : nested_enums) {
-    PrintEnum(*entry);
-    // Adds enum value to item_map which will be ordered and printed later
-    AddEnumValue(*entry, &item_map, import_map);
-  }
-
-  // Prints nested messages
-  std::vector<const Descriptor*> nested_messages;
-  nested_messages.reserve(message_descriptor.nested_type_count());
-  for (int i = 0; i < message_descriptor.nested_type_count(); ++i) {
-    nested_messages.push_back(message_descriptor.nested_type(i));
-  }
-  std::sort(nested_messages.begin(), nested_messages.end(),
-            SortByName<Descriptor>());
-
-  for (const auto& entry : nested_messages) {
-    PrintMessage(*entry, true, import_map);
-  }
-
-  // Adds extensions to item_map which will be ordered and printed later
-  AddExtensions(message_descriptor, &item_map);
-
-  // Adds field number and field descriptor to item_map
-  for (int i = 0; i < message_descriptor.field_count(); ++i) {
-    const FieldDescriptor& field_des = *message_descriptor.field(i);
-    item_map[ToUpper(field_des.name()) + "_FIELD_NUMBER"] =
-        "_ClassVar[int]";
-    if (IsPythonKeyword(field_des.name())) {
-      continue;
-    }
-    std::string field_type = "";
-    if (field_des.is_map()) {
-      const FieldDescriptor* key_des = field_des.message_type()->field(0);
-      const FieldDescriptor* value_des = field_des.message_type()->field(1);
-      field_type = (value_des->cpp_type() == FieldDescriptor::CPPTYPE_MESSAGE
-                        ? "_containers.MessageMap["
-                        : "_containers.ScalarMap[");
-      field_type += GetFieldType(*key_des, message_descriptor, import_map);
-      field_type += ", ";
-      field_type += GetFieldType(*value_des, message_descriptor, import_map);
-    } else {
-      if (field_des.is_repeated()) {
-        field_type = (field_des.cpp_type() == FieldDescriptor::CPPTYPE_MESSAGE
-                          ? "_containers.RepeatedCompositeFieldContainer["
-                          : "_containers.RepeatedScalarFieldContainer[");
-      }
-      field_type += GetFieldType(field_des, message_descriptor, import_map);
-    }
-
-    if (field_des.is_repeated()) {
-      field_type += "]";
-    }
-    item_map[field_des.name()] = field_type;
-  }
-
-  // Prints all items in item_map
-  PrintItemMap(item_map);
-
-  // Prints __init__
-  printer_->Print("def __init__(self");
-  bool has_key_words = false;
-  bool is_first = true;
-  for (int i = 0; i < message_descriptor.field_count(); ++i) {
-    const FieldDescriptor* field_des = message_descriptor.field(i);
-    if (IsPythonKeyword(field_des->name())) {
-      has_key_words = true;
-      continue;
-    }
-    std::string field_name = field_des->name();
-    if (is_first && field_name == "self") {
-      // See b/144146793 for an example of real code that generates a (self,
-      // self) method signature. Since repeating a parameter name is illegal in
-      // Python, we rename the duplicate self.
-      field_name = "self_";
-    }
-    is_first = false;
-    printer_->Print(", $field_name$: ", "field_name", field_name);
-    if (field_des->is_repeated() ||
-        field_des->cpp_type() != FieldDescriptor::CPPTYPE_BOOL) {
-      printer_->Print("_Optional[");
-    }
-    if (field_des->is_map()) {
-      const Descriptor* map_entry = field_des->message_type();
-      printer_->Print(
-          "_Mapping[$key_type$, $value_type$]", "key_type",
-          GetFieldType(*map_entry->field(0), message_descriptor, import_map),
-          "value_type",
-          GetFieldType(*map_entry->field(1), message_descriptor, import_map));
-    } else {
-      if (field_des->is_repeated()) {
-        printer_->Print("_Iterable[");
-      }
-      if (field_des->cpp_type() == FieldDescriptor::CPPTYPE_MESSAGE) {
-        printer_->Print(
-            "_Union[$type_name$, _Mapping]", "type_name",
-            GetFieldType(*field_des, message_descriptor, import_map));
-      } else {
-        if (field_des->cpp_type() == FieldDescriptor::CPPTYPE_ENUM) {
-          printer_->Print("_Union[$type_name$, str]", "type_name",
-                          ModuleLevelName(*field_des->enum_type(), import_map));
-        } else {
-          printer_->Print(
-              "$type_name$", "type_name",
-              GetFieldType(*field_des, message_descriptor, import_map));
-        }
-      }
-      if (field_des->is_repeated()) {
-        printer_->Print("]");
-      }
-    }
-    if (field_des->is_repeated() ||
-        field_des->cpp_type() != FieldDescriptor::CPPTYPE_BOOL) {
-      printer_->Print("]");
-    }
-    printer_->Print(" = ...");
-  }
-  if (has_key_words) {
-    printer_->Print(", **kwargs");
-  }
-  printer_->Print(") -> None: ...\n");
-
-  printer_->Outdent();
-  printer_->Outdent();
-}
-
-void PyiGenerator::PrintMessages(
-    const std::map<std::string, std::string>& import_map) const {
-  // Deterministically order the descriptors.
-  std::vector<const Descriptor*> messages;
-  messages.reserve(file_->message_type_count());
-  for (int i = 0; i < file_->message_type_count(); ++i) {
-    messages.push_back(file_->message_type(i));
-  }
-  std::sort(messages.begin(), messages.end(), SortByName<Descriptor>());
-
-  for (const auto& entry : messages) {
-    PrintMessage(*entry, false, import_map);
-  }
-}
-
-void PyiGenerator::PrintServices() const {
-  std::vector<const ServiceDescriptor*> services;
-  services.reserve(file_->service_count());
-  for (int i = 0; i < file_->service_count(); ++i) {
-    services.push_back(file_->service(i));
-  }
-  std::sort(services.begin(), services.end(), SortByName<ServiceDescriptor>());
-
-  // Prints $Service$ and $Service$_Stub classes
-  for (const auto& entry : services) {
-    printer_->Print("\n");
-    printer_->Print(
-        "class $service_name$(_service.service): ...\n\n"
-        "class $service_name$_Stub($service_name$): ...\n",
-        "service_name", entry->name());
-  }
-}
-
-bool PyiGenerator::Generate(const FileDescriptor* file,
-                            const std::string& parameter,
-                            GeneratorContext* context,
-                            std::string* error) const {
-  MutexLock lock(&mutex_);
-  // Calculate file name.
-  file_ = file;
-  std::string filename =
-      parameter.empty() ? GetFileName(file, ".pyi") : parameter;
-
-  std::unique_ptr<io::ZeroCopyOutputStream> output(context->Open(filename));
-  GOOGLE_CHECK(output.get());
-  io::Printer printer(output.get(), '$');
-  printer_ = &printer;
-
-  // item map will store "DESCRIPTOR", top level extensions, top level enum
-  // values. The items will be sorted and printed later.
-  std::map<std::string, std::string> item_map;
-
-  // Adds "DESCRIPTOR" into item_map.
-  item_map["DESCRIPTOR"] = "_descriptor.FileDescriptor";
-
-  // import_map will be a mapping from filename to module alias, e.g.
-  // "google3/foo/bar.py" -> "_bar"
-  std::map<std::string, std::string> import_map;
-
-  PrintImports(&item_map, &import_map);
-  // Adds top level enum values to item_map.
-  for (int i = 0; i < file_->enum_type_count(); ++i) {
-    AddEnumValue(*file_->enum_type(i), &item_map, import_map);
-  }
-  // Adds top level extensions to item_map.
-  AddExtensions(*file_, &item_map);
-  // Prints item map
-  PrintItemMap(item_map);
-
-  PrintMessages(import_map);
-  PrintTopLevelEnums();
-  if (HasGenericServices(file)) {
-    PrintServices();
-  }
-  return true;
-}
-
-}  // namespace python
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/compiler/python/pyi_generator.h b/libs/protobuf/src/google/protobuf/compiler/python/pyi_generator.h
deleted file mode 100644
index 9611ed4..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/python/pyi_generator.h
+++ /dev/null
@@ -1,120 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: jieluo@google.com (Jie Luo)
-//
-// Generates Python stub (.pyi) for a given .proto file.
-
-#ifndef GOOGLE_PROTOBUF_COMPILER_PYTHON_PYI_GENERATOR_H__
-#define GOOGLE_PROTOBUF_COMPILER_PYTHON_PYI_GENERATOR_H__
-
-#include <map>
-#include <set>
-#include <string>
-
-#include <google/protobuf/stubs/mutex.h>
-#include <google/protobuf/compiler/code_generator.h>
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-class Descriptor;
-class EnumDescriptor;
-class FieldDescriptor;
-class MethodDescriptor;
-class ServiceDescriptor;
-
-namespace io {
-class Printer;
-}
-
-namespace compiler {
-namespace python {
-
-class PROTOC_EXPORT PyiGenerator : public google::protobuf::compiler::CodeGenerator {
- public:
-  PyiGenerator();
-  ~PyiGenerator() override;
-
-  // CodeGenerator methods.
-  uint64_t GetSupportedFeatures() const override {
-    // Code generators must explicitly support proto3 optional.
-    return CodeGenerator::FEATURE_PROTO3_OPTIONAL;
-  }
-  bool Generate(const FileDescriptor* file, const std::string& parameter,
-                GeneratorContext* generator_context,
-                std::string* error) const override;
-
- private:
-  void PrintImportForDescriptor(const FileDescriptor& desc,
-                                std::map<std::string, std::string>* import_map,
-                                std::set<std::string>* seen_aliases) const;
-  void PrintImports(std::map<std::string, std::string>* item_map,
-                    std::map<std::string, std::string>* import_map) const;
-  void PrintEnum(const EnumDescriptor& enum_descriptor) const;
-  void AddEnumValue(const EnumDescriptor& enum_descriptor,
-                    std::map<std::string, std::string>* item_map,
-                    const std::map<std::string, std::string>& import_map) const;
-  void PrintTopLevelEnums() const;
-  template <typename DescriptorT>
-  void AddExtensions(const DescriptorT& descriptor,
-                     std::map<std::string, std::string>* item_map) const;
-  void PrintMessages(
-      const std::map<std::string, std::string>& import_map) const;
-  void PrintMessage(const Descriptor& message_descriptor, bool is_nested,
-                    const std::map<std::string, std::string>& import_map) const;
-  void PrintServices() const;
-  void PrintItemMap(const std::map<std::string, std::string>& item_map) const;
-  std::string GetFieldType(
-      const FieldDescriptor& field_des, const Descriptor& containing_des,
-      const std::map<std::string, std::string>& import_map) const;
-  template <typename DescriptorT>
-  std::string ModuleLevelName(
-      const DescriptorT& descriptor,
-      const std::map<std::string, std::string>& import_map) const;
-
-  // Very coarse-grained lock to ensure that Generate() is reentrant.
-  // Guards file_ and printer_.
-  mutable Mutex mutex_;
-  mutable const FileDescriptor* file_;  // Set in Generate().  Under mutex_.
-  mutable io::Printer* printer_;        // Set in Generate().  Under mutex_.
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(PyiGenerator);
-};
-
-}  // namespace python
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
-
-#endif  // GOOGLE_PROTOBUF_COMPILER_PYTHON_PYI_GENERATOR_H__
diff --git a/libs/protobuf/src/google/protobuf/compiler/python/python_generator.h b/libs/protobuf/src/google/protobuf/compiler/python/python_generator.h
deleted file mode 100644
index 21d48cd..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/python/python_generator.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef GOOGLE_PROTOBUF_COMPILER_PYTHON_PYTHON_GENERATOR_H_
-#define GOOGLE_PROTOBUF_COMPILER_PYTHON_PYTHON_GENERATOR_H_
-
-#include <google/protobuf/compiler/python/generator.h>
-
-#endif  // GOOGLE_PROTOBUF_COMPILER_PYTHON_PYTHON_GENERATOR_H_
diff --git a/libs/protobuf/src/google/protobuf/compiler/ruby/ruby_generated_code.proto b/libs/protobuf/src/google/protobuf/compiler/ruby/ruby_generated_code.proto
deleted file mode 100644
index 70ec9f1..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/ruby/ruby_generated_code.proto
+++ /dev/null
@@ -1,70 +0,0 @@
-syntax = "proto3";
-
-package A.B.C;
-
-import "ruby_generated_code_proto2_import.proto";
-
-message TestMessage {
-  int32 optional_int32 = 1;
-  int64 optional_int64 = 2;
-  uint32 optional_uint32 = 3;
-  uint64 optional_uint64 = 4;
-  bool optional_bool = 5;
-  double optional_double = 6;
-  float optional_float = 7;
-  string optional_string = 8;
-  bytes optional_bytes = 9;
-  TestEnum optional_enum = 10;
-  TestMessage optional_msg = 11;
-  TestImportedMessage optional_proto2_submessage = 12;
-
-  repeated int32 repeated_int32 = 21;
-  repeated int64 repeated_int64 = 22;
-  repeated uint32 repeated_uint32 = 23;
-  repeated uint64 repeated_uint64 = 24;
-  repeated bool repeated_bool = 25;
-  repeated double repeated_double = 26;
-  repeated float repeated_float = 27;
-  repeated string repeated_string = 28;
-  repeated bytes repeated_bytes = 29;
-  repeated TestEnum repeated_enum = 30;
-  repeated TestMessage repeated_msg = 31;
-
-  oneof my_oneof {
-    int32 oneof_int32 = 41;
-    int64 oneof_int64 = 42;
-    uint32 oneof_uint32 = 43;
-    uint64 oneof_uint64 = 44;
-    bool oneof_bool = 45;
-    double oneof_double = 46;
-    float oneof_float = 47;
-    string oneof_string = 48;
-    bytes oneof_bytes = 49;
-    TestEnum oneof_enum = 50;
-    TestMessage oneof_msg = 51;
-  }
-
-  map<int32, string> map_int32_string = 61;
-  map<int64, string> map_int64_string = 62;
-  map<uint32, string> map_uint32_string = 63;
-  map<uint64, string> map_uint64_string = 64;
-  map<bool, string> map_bool_string = 65;
-  map<string, string> map_string_string = 66;
-  map<string, TestMessage> map_string_msg = 67;
-  map<string, TestEnum> map_string_enum = 68;
-  map<string, int32> map_string_int32 = 69;
-  map<string, bool> map_string_bool = 70;
-
-  message NestedMessage {
-    int32 foo = 1;
-  }
-
-  NestedMessage nested_message = 80;
-}
-
-enum TestEnum {
-  Default = 0;
-  A = 1;
-  B = 2;
-  C = 3;
-}
diff --git a/libs/protobuf/src/google/protobuf/compiler/ruby/ruby_generated_code_pb.rb b/libs/protobuf/src/google/protobuf/compiler/ruby/ruby_generated_code_pb.rb
deleted file mode 100644
index 256ac7c..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/ruby/ruby_generated_code_pb.rb
+++ /dev/null
@@ -1,79 +0,0 @@
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: ruby_generated_code.proto
-
-require 'google/protobuf'
-
-require 'ruby_generated_code_proto2_import_pb'
-
-Google::Protobuf::DescriptorPool.generated_pool.build do
-  add_file("ruby_generated_code.proto", :syntax => :proto3) do
-    add_message "A.B.C.TestMessage" do
-      optional :optional_int32, :int32, 1
-      optional :optional_int64, :int64, 2
-      optional :optional_uint32, :uint32, 3
-      optional :optional_uint64, :uint64, 4
-      optional :optional_bool, :bool, 5
-      optional :optional_double, :double, 6
-      optional :optional_float, :float, 7
-      optional :optional_string, :string, 8
-      optional :optional_bytes, :bytes, 9
-      optional :optional_enum, :enum, 10, "A.B.C.TestEnum"
-      optional :optional_msg, :message, 11, "A.B.C.TestMessage"
-      optional :optional_proto2_submessage, :message, 12, "A.B.C.TestImportedMessage"
-      repeated :repeated_int32, :int32, 21
-      repeated :repeated_int64, :int64, 22
-      repeated :repeated_uint32, :uint32, 23
-      repeated :repeated_uint64, :uint64, 24
-      repeated :repeated_bool, :bool, 25
-      repeated :repeated_double, :double, 26
-      repeated :repeated_float, :float, 27
-      repeated :repeated_string, :string, 28
-      repeated :repeated_bytes, :bytes, 29
-      repeated :repeated_enum, :enum, 30, "A.B.C.TestEnum"
-      repeated :repeated_msg, :message, 31, "A.B.C.TestMessage"
-      map :map_int32_string, :int32, :string, 61
-      map :map_int64_string, :int64, :string, 62
-      map :map_uint32_string, :uint32, :string, 63
-      map :map_uint64_string, :uint64, :string, 64
-      map :map_bool_string, :bool, :string, 65
-      map :map_string_string, :string, :string, 66
-      map :map_string_msg, :string, :message, 67, "A.B.C.TestMessage"
-      map :map_string_enum, :string, :enum, 68, "A.B.C.TestEnum"
-      map :map_string_int32, :string, :int32, 69
-      map :map_string_bool, :string, :bool, 70
-      optional :nested_message, :message, 80, "A.B.C.TestMessage.NestedMessage"
-      oneof :my_oneof do
-        optional :oneof_int32, :int32, 41
-        optional :oneof_int64, :int64, 42
-        optional :oneof_uint32, :uint32, 43
-        optional :oneof_uint64, :uint64, 44
-        optional :oneof_bool, :bool, 45
-        optional :oneof_double, :double, 46
-        optional :oneof_float, :float, 47
-        optional :oneof_string, :string, 48
-        optional :oneof_bytes, :bytes, 49
-        optional :oneof_enum, :enum, 50, "A.B.C.TestEnum"
-        optional :oneof_msg, :message, 51, "A.B.C.TestMessage"
-      end
-    end
-    add_message "A.B.C.TestMessage.NestedMessage" do
-      optional :foo, :int32, 1
-    end
-    add_enum "A.B.C.TestEnum" do
-      value :Default, 0
-      value :A, 1
-      value :B, 2
-      value :C, 3
-    end
-  end
-end
-
-module A
-  module B
-    module C
-      TestMessage = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("A.B.C.TestMessage").msgclass
-      TestMessage::NestedMessage = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("A.B.C.TestMessage.NestedMessage").msgclass
-      TestEnum = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("A.B.C.TestEnum").enummodule
-    end
-  end
-end
diff --git a/libs/protobuf/src/google/protobuf/compiler/ruby/ruby_generated_code_proto2.proto b/libs/protobuf/src/google/protobuf/compiler/ruby/ruby_generated_code_proto2.proto
deleted file mode 100644
index ea7f783..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/ruby/ruby_generated_code_proto2.proto
+++ /dev/null
@@ -1,71 +0,0 @@
-syntax = "proto2";
-
-package A.B.C;
-
-import "ruby_generated_code_proto2_import.proto";
-
-message TestMessage {
-  optional int32 optional_int32 = 1 [default = 1];
-  optional int64 optional_int64 = 2 [default = 2];
-  optional uint32 optional_uint32 = 3 [default = 3];
-  optional uint64 optional_uint64 = 4 [default = 4];
-  optional bool optional_bool = 5 [default = true];
-  optional double optional_double = 6 [default = 6.0];
-  optional float optional_float = 7 [default = 7.0];
-  optional string optional_string = 8 [default = "default str"];
-  optional bytes optional_bytes = 9 [default = "\0\1\2\100fubar"];
-  optional TestEnum optional_enum = 10 [default = A];
-  optional TestMessage optional_msg = 11;
-  optional TestImportedMessage optional_proto2_submessage = 12;
-
-  repeated int32 repeated_int32 = 21;
-  repeated int64 repeated_int64 = 22;
-  repeated uint32 repeated_uint32 = 23;
-  repeated uint64 repeated_uint64 = 24;
-  repeated bool repeated_bool = 25;
-  repeated double repeated_double = 26;
-  repeated float repeated_float = 27;
-  repeated string repeated_string = 28;
-  repeated bytes repeated_bytes = 29;
-  repeated TestEnum repeated_enum = 30;
-  repeated TestMessage repeated_msg = 31;
-
-  required int32 required_int32 = 41;
-  required int64 required_int64 = 42;
-  required uint32 required_uint32 = 43;
-  required uint64 required_uint64 = 44;
-  required bool required_bool = 45;
-  required double required_double = 46;
-  required float required_float = 47;
-  required string required_string = 48;
-  required bytes required_bytes = 49;
-  required TestEnum required_enum = 50;
-  required TestMessage required_msg = 51;
-
-  oneof my_oneof {
-    int32 oneof_int32 = 61;
-    int64 oneof_int64 = 62;
-    uint32 oneof_uint32 = 63;
-    uint64 oneof_uint64 = 64;
-    bool oneof_bool = 65;
-    double oneof_double = 66;
-    float oneof_float = 67;
-    string oneof_string = 68;
-    bytes oneof_bytes = 69;
-    TestEnum oneof_enum = 70;
-    TestMessage oneof_msg = 71;
-  }
-
-  message NestedMessage {
-    optional int32 foo = 1;
-  }
-
-  optional NestedMessage nested_message = 80;
-}
-
-enum TestEnum {
-  Default = 0;
-  A = 1;
-  B = 2;
-  C = 3;
-}
diff --git a/libs/protobuf/src/google/protobuf/compiler/ruby/ruby_generated_code_proto2_import.proto b/libs/protobuf/src/google/protobuf/compiler/ruby/ruby_generated_code_proto2_import.proto
deleted file mode 100644
index 9ec0738..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/ruby/ruby_generated_code_proto2_import.proto
+++ /dev/null
@@ -1,5 +0,0 @@
-syntax = "proto2";
-
-package A.B.C;
-
-message TestImportedMessage {}
diff --git a/libs/protobuf/src/google/protobuf/compiler/ruby/ruby_generated_code_proto2_pb.rb b/libs/protobuf/src/google/protobuf/compiler/ruby/ruby_generated_code_proto2_pb.rb
deleted file mode 100644
index 44d3196..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/ruby/ruby_generated_code_proto2_pb.rb
+++ /dev/null
@@ -1,80 +0,0 @@
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: ruby_generated_code_proto2.proto
-
-require 'google/protobuf'
-
-require 'ruby_generated_code_proto2_import_pb'
-
-Google::Protobuf::DescriptorPool.generated_pool.build do
-  add_file("ruby_generated_code_proto2.proto", :syntax => :proto2) do
-    add_message "A.B.C.TestMessage" do
-      optional :optional_int32, :int32, 1, default: 1
-      optional :optional_int64, :int64, 2, default: 2
-      optional :optional_uint32, :uint32, 3, default: 3
-      optional :optional_uint64, :uint64, 4, default: 4
-      optional :optional_bool, :bool, 5, default: true
-      optional :optional_double, :double, 6, default: 6
-      optional :optional_float, :float, 7, default: 7
-      optional :optional_string, :string, 8, default: "default str"
-      optional :optional_bytes, :bytes, 9, default: "\x00\x01\x02\x40\x66\x75\x62\x61\x72".force_encoding("ASCII-8BIT")
-      optional :optional_enum, :enum, 10, "A.B.C.TestEnum", default: 1
-      optional :optional_msg, :message, 11, "A.B.C.TestMessage"
-      optional :optional_proto2_submessage, :message, 12, "A.B.C.TestImportedMessage"
-      repeated :repeated_int32, :int32, 21
-      repeated :repeated_int64, :int64, 22
-      repeated :repeated_uint32, :uint32, 23
-      repeated :repeated_uint64, :uint64, 24
-      repeated :repeated_bool, :bool, 25
-      repeated :repeated_double, :double, 26
-      repeated :repeated_float, :float, 27
-      repeated :repeated_string, :string, 28
-      repeated :repeated_bytes, :bytes, 29
-      repeated :repeated_enum, :enum, 30, "A.B.C.TestEnum"
-      repeated :repeated_msg, :message, 31, "A.B.C.TestMessage"
-      required :required_int32, :int32, 41
-      required :required_int64, :int64, 42
-      required :required_uint32, :uint32, 43
-      required :required_uint64, :uint64, 44
-      required :required_bool, :bool, 45
-      required :required_double, :double, 46
-      required :required_float, :float, 47
-      required :required_string, :string, 48
-      required :required_bytes, :bytes, 49
-      required :required_enum, :enum, 50, "A.B.C.TestEnum"
-      required :required_msg, :message, 51, "A.B.C.TestMessage"
-      optional :nested_message, :message, 80, "A.B.C.TestMessage.NestedMessage"
-      oneof :my_oneof do
-        optional :oneof_int32, :int32, 61
-        optional :oneof_int64, :int64, 62
-        optional :oneof_uint32, :uint32, 63
-        optional :oneof_uint64, :uint64, 64
-        optional :oneof_bool, :bool, 65
-        optional :oneof_double, :double, 66
-        optional :oneof_float, :float, 67
-        optional :oneof_string, :string, 68
-        optional :oneof_bytes, :bytes, 69
-        optional :oneof_enum, :enum, 70, "A.B.C.TestEnum"
-        optional :oneof_msg, :message, 71, "A.B.C.TestMessage"
-      end
-    end
-    add_message "A.B.C.TestMessage.NestedMessage" do
-      optional :foo, :int32, 1
-    end
-    add_enum "A.B.C.TestEnum" do
-      value :Default, 0
-      value :A, 1
-      value :B, 2
-      value :C, 3
-    end
-  end
-end
-
-module A
-  module B
-    module C
-      TestMessage = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("A.B.C.TestMessage").msgclass
-      TestMessage::NestedMessage = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("A.B.C.TestMessage.NestedMessage").msgclass
-      TestEnum = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("A.B.C.TestEnum").enummodule
-    end
-  end
-end
diff --git a/libs/protobuf/src/google/protobuf/compiler/ruby/ruby_generated_pkg_explicit.proto b/libs/protobuf/src/google/protobuf/compiler/ruby/ruby_generated_pkg_explicit.proto
deleted file mode 100644
index 8d7c948..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/ruby/ruby_generated_pkg_explicit.proto
+++ /dev/null
@@ -1,9 +0,0 @@
-syntax = "proto3";
-
-package one.two.a_three;
-
-option ruby_package = "A::B::C";
-
-message Four {
-  string a_string = 1;
-}
diff --git a/libs/protobuf/src/google/protobuf/compiler/ruby/ruby_generated_pkg_explicit_legacy.proto b/libs/protobuf/src/google/protobuf/compiler/ruby/ruby_generated_pkg_explicit_legacy.proto
deleted file mode 100644
index 7a0d260..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/ruby/ruby_generated_pkg_explicit_legacy.proto
+++ /dev/null
@@ -1,9 +0,0 @@
-syntax = "proto3";
-
-package one.two.a_three.and;
-
-option ruby_package = "AA.BB.CC";
-
-message Four {
-  string another_string = 1;
-}
diff --git a/libs/protobuf/src/google/protobuf/compiler/ruby/ruby_generated_pkg_explicit_legacy_pb.rb b/libs/protobuf/src/google/protobuf/compiler/ruby/ruby_generated_pkg_explicit_legacy_pb.rb
deleted file mode 100644
index cdbbe89..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/ruby/ruby_generated_pkg_explicit_legacy_pb.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: ruby_generated_pkg_explicit_legacy.proto
-
-require 'google/protobuf'
-
-Google::Protobuf::DescriptorPool.generated_pool.build do
-  add_file("ruby_generated_pkg_explicit_legacy.proto", :syntax => :proto3) do
-    add_message "one.two.a_three.and.Four" do
-      optional :another_string, :string, 1
-    end
-  end
-end
-
-module AA
-  module BB
-    module CC
-      Four = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("one.two.a_three.and.Four").msgclass
-    end
-  end
-end
diff --git a/libs/protobuf/src/google/protobuf/compiler/ruby/ruby_generated_pkg_explicit_pb.rb b/libs/protobuf/src/google/protobuf/compiler/ruby/ruby_generated_pkg_explicit_pb.rb
deleted file mode 100644
index e6d4701..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/ruby/ruby_generated_pkg_explicit_pb.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: ruby_generated_pkg_explicit.proto
-
-require 'google/protobuf'
-
-Google::Protobuf::DescriptorPool.generated_pool.build do
-  add_file("ruby_generated_pkg_explicit.proto", :syntax => :proto3) do
-    add_message "one.two.a_three.Four" do
-      optional :a_string, :string, 1
-    end
-  end
-end
-
-module A
-  module B
-    module C
-      Four = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("one.two.a_three.Four").msgclass
-    end
-  end
-end
diff --git a/libs/protobuf/src/google/protobuf/compiler/ruby/ruby_generated_pkg_implicit.proto b/libs/protobuf/src/google/protobuf/compiler/ruby/ruby_generated_pkg_implicit.proto
deleted file mode 100644
index 544db64..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/ruby/ruby_generated_pkg_implicit.proto
+++ /dev/null
@@ -1,7 +0,0 @@
-syntax = "proto3";
-
-package one.two.a_three;
-
-message Four {
-  string a_string = 1;
-}
diff --git a/libs/protobuf/src/google/protobuf/compiler/ruby/ruby_generated_pkg_implicit_pb.rb b/libs/protobuf/src/google/protobuf/compiler/ruby/ruby_generated_pkg_implicit_pb.rb
deleted file mode 100644
index 1ac0ef7..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/ruby/ruby_generated_pkg_implicit_pb.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: ruby_generated_pkg_implicit.proto
-
-require 'google/protobuf'
-
-Google::Protobuf::DescriptorPool.generated_pool.build do
-  add_file("ruby_generated_pkg_implicit.proto", :syntax => :proto3) do
-    add_message "one.two.a_three.Four" do
-      optional :a_string, :string, 1
-    end
-  end
-end
-
-module One
-  module Two
-    module AThree
-      Four = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("one.two.a_three.Four").msgclass
-    end
-  end
-end
diff --git a/libs/protobuf/src/google/protobuf/compiler/ruby/ruby_generator.cc b/libs/protobuf/src/google/protobuf/compiler/ruby/ruby_generator.cc
deleted file mode 100644
index d4a53d5..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/ruby/ruby_generator.cc
+++ /dev/null
@@ -1,575 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <iomanip>
-#include <sstream>
-
-#include <google/protobuf/compiler/code_generator.h>
-#include <google/protobuf/compiler/plugin.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/descriptor.pb.h>
-#include <google/protobuf/io/printer.h>
-#include <google/protobuf/io/zero_copy_stream.h>
-
-#include <google/protobuf/compiler/ruby/ruby_generator.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace ruby {
-
-// Forward decls.
-template <class numeric_type>
-std::string NumberToString(numeric_type value);
-std::string GetRequireName(const std::string& proto_file);
-std::string LabelForField(FieldDescriptor* field);
-std::string TypeName(FieldDescriptor* field);
-bool GenerateMessage(const Descriptor* message, io::Printer* printer,
-                     std::string* error);
-void GenerateEnum(const EnumDescriptor* en, io::Printer* printer);
-void GenerateMessageAssignment(const std::string& prefix,
-                               const Descriptor* message, io::Printer* printer);
-void GenerateEnumAssignment(const std::string& prefix, const EnumDescriptor* en,
-                            io::Printer* printer);
-std::string DefaultValueForField(const FieldDescriptor* field);
-
-template<class numeric_type>
-std::string NumberToString(numeric_type value) {
-  std::ostringstream os;
-  os << value;
-  return os.str();
-}
-
-std::string GetRequireName(const std::string& proto_file) {
-  int lastindex = proto_file.find_last_of(".");
-  return proto_file.substr(0, lastindex) + "_pb";
-}
-
-std::string GetOutputFilename(const std::string& proto_file) {
-  return GetRequireName(proto_file) + ".rb";
-}
-
-std::string LabelForField(const FieldDescriptor* field) {
-  if (field->has_optional_keyword() &&
-      field->file()->syntax() == FileDescriptor::SYNTAX_PROTO3) {
-    return "proto3_optional";
-  }
-  switch (field->label()) {
-    case FieldDescriptor::LABEL_OPTIONAL: return "optional";
-    case FieldDescriptor::LABEL_REQUIRED: return "required";
-    case FieldDescriptor::LABEL_REPEATED: return "repeated";
-    default: assert(false); return "";
-  }
-}
-
-std::string TypeName(const FieldDescriptor* field) {
-  switch (field->type()) {
-    case FieldDescriptor::TYPE_INT32: return "int32";
-    case FieldDescriptor::TYPE_INT64: return "int64";
-    case FieldDescriptor::TYPE_UINT32: return "uint32";
-    case FieldDescriptor::TYPE_UINT64: return "uint64";
-    case FieldDescriptor::TYPE_SINT32: return "sint32";
-    case FieldDescriptor::TYPE_SINT64: return "sint64";
-    case FieldDescriptor::TYPE_FIXED32: return "fixed32";
-    case FieldDescriptor::TYPE_FIXED64: return "fixed64";
-    case FieldDescriptor::TYPE_SFIXED32: return "sfixed32";
-    case FieldDescriptor::TYPE_SFIXED64: return "sfixed64";
-    case FieldDescriptor::TYPE_DOUBLE: return "double";
-    case FieldDescriptor::TYPE_FLOAT: return "float";
-    case FieldDescriptor::TYPE_BOOL: return "bool";
-    case FieldDescriptor::TYPE_ENUM: return "enum";
-    case FieldDescriptor::TYPE_STRING: return "string";
-    case FieldDescriptor::TYPE_BYTES: return "bytes";
-    case FieldDescriptor::TYPE_MESSAGE: return "message";
-    case FieldDescriptor::TYPE_GROUP: return "group";
-    default: assert(false); return "";
-  }
-}
-
-std::string StringifySyntax(FileDescriptor::Syntax syntax) {
-  switch (syntax) {
-    case FileDescriptor::SYNTAX_PROTO2:
-      return "proto2";
-    case FileDescriptor::SYNTAX_PROTO3:
-      return "proto3";
-    case FileDescriptor::SYNTAX_UNKNOWN:
-    default:
-      GOOGLE_LOG(FATAL) << "Unsupported syntax; this generator only supports "
-                           "proto2 and proto3 syntax.";
-      return "";
-  }
-}
-
-std::string DefaultValueForField(const FieldDescriptor* field) {
-  switch(field->cpp_type()) {
-    case FieldDescriptor::CPPTYPE_INT32:
-      return NumberToString(field->default_value_int32());
-    case FieldDescriptor::CPPTYPE_INT64:
-      return NumberToString(field->default_value_int64());
-    case FieldDescriptor::CPPTYPE_UINT32:
-      return NumberToString(field->default_value_uint32());
-    case FieldDescriptor::CPPTYPE_UINT64:
-      return NumberToString(field->default_value_uint64());
-    case FieldDescriptor::CPPTYPE_FLOAT:
-      return NumberToString(field->default_value_float());
-    case FieldDescriptor::CPPTYPE_DOUBLE:
-      return NumberToString(field->default_value_double());
-    case FieldDescriptor::CPPTYPE_BOOL:
-      return field->default_value_bool() ? "true" : "false";
-    case FieldDescriptor::CPPTYPE_ENUM:
-      return NumberToString(field->default_value_enum()->number());
-    case FieldDescriptor::CPPTYPE_STRING: {
-      std::ostringstream os;
-      std::string default_str = field->default_value_string();
-
-      if (field->type() == FieldDescriptor::TYPE_STRING) {
-        os << "\"" << default_str << "\"";
-      } else if (field->type() == FieldDescriptor::TYPE_BYTES) {
-        os << "\"";
-
-        os.fill('0');
-        for (int i = 0; i < default_str.length(); ++i) {
-          // Write the hex form of each byte.
-          os << "\\x" << std::hex << std::setw(2)
-             << ((uint16_t)((unsigned char)default_str.at(i)));
-        }
-        os << "\".force_encoding(\"ASCII-8BIT\")";
-      }
-
-      return os.str();
-    }
-    default: assert(false); return "";
-  }
-}
-
-void GenerateField(const FieldDescriptor* field, io::Printer* printer) {
-  if (field->is_map()) {
-    const FieldDescriptor* key_field =
-        field->message_type()->FindFieldByNumber(1);
-    const FieldDescriptor* value_field =
-        field->message_type()->FindFieldByNumber(2);
-
-    printer->Print(
-      "map :$name$, :$key_type$, :$value_type$, $number$",
-      "name", field->name(),
-      "key_type", TypeName(key_field),
-      "value_type", TypeName(value_field),
-      "number", NumberToString(field->number()));
-
-    if (value_field->cpp_type() == FieldDescriptor::CPPTYPE_MESSAGE) {
-      printer->Print(
-        ", \"$subtype$\"\n",
-        "subtype", value_field->message_type()->full_name());
-    } else if (value_field->cpp_type() == FieldDescriptor::CPPTYPE_ENUM) {
-      printer->Print(
-        ", \"$subtype$\"\n",
-        "subtype", value_field->enum_type()->full_name());
-    } else {
-      printer->Print("\n");
-    }
-  } else {
-
-    printer->Print(
-      "$label$ :$name$, ",
-      "label", LabelForField(field),
-      "name", field->name());
-    printer->Print(
-      ":$type$, $number$",
-      "type", TypeName(field),
-      "number", NumberToString(field->number()));
-
-    if (field->cpp_type() == FieldDescriptor::CPPTYPE_MESSAGE) {
-      printer->Print(
-        ", \"$subtype$\"",
-       "subtype", field->message_type()->full_name());
-    } else if (field->cpp_type() == FieldDescriptor::CPPTYPE_ENUM) {
-      printer->Print(
-        ", \"$subtype$\"",
-        "subtype", field->enum_type()->full_name());
-    }
-
-    if (field->has_default_value()) {
-      printer->Print(", default: $default$", "default",
-                     DefaultValueForField(field));
-    }
-
-    if (field->has_json_name()) {
-      printer->Print(", json_name: \"$json_name$\"", "json_name",
-                    field->json_name());
-    }
-
-    printer->Print("\n");
-  }
-}
-
-void GenerateOneof(const OneofDescriptor* oneof, io::Printer* printer) {
-  printer->Print(
-      "oneof :$name$ do\n",
-      "name", oneof->name());
-  printer->Indent();
-
-  for (int i = 0; i < oneof->field_count(); i++) {
-    const FieldDescriptor* field = oneof->field(i);
-    GenerateField(field, printer);
-  }
-
-  printer->Outdent();
-  printer->Print("end\n");
-}
-
-bool GenerateMessage(const Descriptor* message, io::Printer* printer,
-                     std::string* error) {
-  if (message->extension_range_count() > 0 || message->extension_count() > 0) {
-    GOOGLE_LOG(WARNING) << "Extensions are not yet supported for proto2 .proto files.";
-  }
-
-  // Don't generate MapEntry messages -- we use the Ruby extension's native
-  // support for map fields instead.
-  if (message->options().map_entry()) {
-    return true;
-  }
-
-  printer->Print(
-    "add_message \"$name$\" do\n",
-    "name", message->full_name());
-  printer->Indent();
-
-  for (int i = 0; i < message->field_count(); i++) {
-    const FieldDescriptor* field = message->field(i);
-    if (!field->real_containing_oneof()) {
-      GenerateField(field, printer);
-    }
-  }
-
-  for (int i = 0; i < message->real_oneof_decl_count(); i++) {
-    const OneofDescriptor* oneof = message->oneof_decl(i);
-    GenerateOneof(oneof, printer);
-  }
-
-  printer->Outdent();
-  printer->Print("end\n");
-
-  for (int i = 0; i < message->nested_type_count(); i++) {
-    if (!GenerateMessage(message->nested_type(i), printer, error)) {
-      return false;
-    }
-  }
-  for (int i = 0; i < message->enum_type_count(); i++) {
-    GenerateEnum(message->enum_type(i), printer);
-  }
-
-  return true;
-}
-
-void GenerateEnum(const EnumDescriptor* en, io::Printer* printer) {
-  printer->Print(
-    "add_enum \"$name$\" do\n",
-    "name", en->full_name());
-  printer->Indent();
-
-  for (int i = 0; i < en->value_count(); i++) {
-    const EnumValueDescriptor* value = en->value(i);
-    printer->Print(
-      "value :$name$, $number$\n",
-      "name", value->name(),
-      "number", NumberToString(value->number()));
-  }
-
-  printer->Outdent();
-  printer->Print(
-    "end\n");
-}
-
-// Locale-agnostic utility functions.
-bool IsLower(char ch) { return ch >= 'a' && ch <= 'z'; }
-
-bool IsUpper(char ch) { return ch >= 'A' && ch <= 'Z'; }
-
-bool IsAlpha(char ch) { return IsLower(ch) || IsUpper(ch); }
-
-char UpperChar(char ch) { return IsLower(ch) ? (ch - 'a' + 'A') : ch; }
-
-
-// Package names in protobuf are snake_case by convention, but Ruby module
-// names must be PascalCased.
-//
-//   foo_bar_baz -> FooBarBaz
-std::string PackageToModule(const std::string& name) {
-  bool next_upper = true;
-  std::string result;
-  result.reserve(name.size());
-
-  for (int i = 0; i < name.size(); i++) {
-    if (name[i] == '_') {
-      next_upper = true;
-    } else {
-      if (next_upper) {
-        result.push_back(UpperChar(name[i]));
-      } else {
-        result.push_back(name[i]);
-      }
-      next_upper = false;
-    }
-  }
-
-  return result;
-}
-
-// Class and enum names in protobuf should be PascalCased by convention, but
-// since there is nothing enforcing this we need to ensure that they are valid
-// Ruby constants.  That mainly means making sure that the first character is
-// an upper-case letter.
-std::string RubifyConstant(const std::string& name) {
-  std::string ret = name;
-  if (!ret.empty()) {
-    if (IsLower(ret[0])) {
-      // If it starts with a lowercase letter, capitalize it.
-      ret[0] = UpperChar(ret[0]);
-    } else if (!IsAlpha(ret[0])) {
-      // Otherwise (e.g. if it begins with an underscore), we need to come up
-      // with some prefix that starts with a capital letter. We could be smarter
-      // here, e.g. try to strip leading underscores, but this may cause other
-      // problems if the user really intended the name. So let's just prepend a
-      // well-known suffix.
-      ret = "PB_" + ret;
-    }
-  }
-
-  return ret;
-}
-
-void GenerateMessageAssignment(const std::string& prefix,
-                               const Descriptor* message,
-                               io::Printer* printer) {
-  // Don't generate MapEntry messages -- we use the Ruby extension's native
-  // support for map fields instead.
-  if (message->options().map_entry()) {
-    return;
-  }
-
-  printer->Print(
-    "$prefix$$name$ = ",
-    "prefix", prefix,
-    "name", RubifyConstant(message->name()));
-  printer->Print(
-    "::Google::Protobuf::DescriptorPool.generated_pool."
-    "lookup(\"$full_name$\").msgclass\n",
-    "full_name", message->full_name());
-
-  std::string nested_prefix = prefix + RubifyConstant(message->name()) + "::";
-  for (int i = 0; i < message->nested_type_count(); i++) {
-    GenerateMessageAssignment(nested_prefix, message->nested_type(i), printer);
-  }
-  for (int i = 0; i < message->enum_type_count(); i++) {
-    GenerateEnumAssignment(nested_prefix, message->enum_type(i), printer);
-  }
-}
-
-void GenerateEnumAssignment(const std::string& prefix, const EnumDescriptor* en,
-                            io::Printer* printer) {
-  printer->Print(
-    "$prefix$$name$ = ",
-    "prefix", prefix,
-    "name", RubifyConstant(en->name()));
-  printer->Print(
-    "::Google::Protobuf::DescriptorPool.generated_pool."
-    "lookup(\"$full_name$\").enummodule\n",
-    "full_name", en->full_name());
-}
-
-int GeneratePackageModules(const FileDescriptor* file, io::Printer* printer) {
-  int levels = 0;
-  bool need_change_to_module = true;
-  std::string package_name;
-
-  // Determine the name to use in either format:
-  //   proto package:         one.two.three
-  //   option ruby_package:   One::Two::Three
-  if (file->options().has_ruby_package()) {
-    package_name = file->options().ruby_package();
-
-    // If :: is in the package use the Ruby formatted name as-is
-    //    -> A::B::C
-    // otherwise, use the dot separator
-    //    -> A.B.C
-    if (package_name.find("::") != std::string::npos) {
-      need_change_to_module = false;
-    } else if (package_name.find(".") != std::string::npos) {
-      GOOGLE_LOG(WARNING) << "ruby_package option should be in the form of:"
-                          << " 'A::B::C' and not 'A.B.C'";
-    }
-  } else {
-    package_name = file->package();
-  }
-
-  // Use the appropriate delimiter
-  std::string delimiter = need_change_to_module ? "." : "::";
-  int delimiter_size = need_change_to_module ? 1 : 2;
-
-  // Extract each module name and indent
-  while (!package_name.empty()) {
-    size_t dot_index = package_name.find(delimiter);
-    std::string component;
-    if (dot_index == std::string::npos) {
-      component = package_name;
-      package_name = "";
-    } else {
-      component = package_name.substr(0, dot_index);
-      package_name = package_name.substr(dot_index + delimiter_size);
-    }
-    if (need_change_to_module) {
-      component = PackageToModule(component);
-    }
-    printer->Print(
-      "module $name$\n",
-      "name", component);
-    printer->Indent();
-    levels++;
-  }
-  return levels;
-}
-
-void EndPackageModules(int levels, io::Printer* printer) {
-  while (levels > 0) {
-    levels--;
-    printer->Outdent();
-    printer->Print(
-      "end\n");
-  }
-}
-
-bool GenerateDslDescriptor(const FileDescriptor* file, io::Printer* printer,
-                           std::string* error) {
-  printer->Print("Google::Protobuf::DescriptorPool.generated_pool.build do\n");
-  printer->Indent();
-  printer->Print("add_file(\"$filename$\", :syntax => :$syntax$) do\n",
-                 "filename", file->name(), "syntax",
-                 StringifySyntax(file->syntax()));
-  printer->Indent();
-  for (int i = 0; i < file->message_type_count(); i++) {
-    if (!GenerateMessage(file->message_type(i), printer, error)) {
-      return false;
-    }
-  }
-  for (int i = 0; i < file->enum_type_count(); i++) {
-    GenerateEnum(file->enum_type(i), printer);
-  }
-  printer->Outdent();
-  printer->Print("end\n");
-  printer->Outdent();
-  printer->Print(
-    "end\n\n");
-  return true;
-}
-
-bool GenerateBinaryDescriptor(const FileDescriptor* file, io::Printer* printer,
-                              std::string* error) {
-  printer->Print(
-      R"(descriptor_data = File.binread(__FILE__).split("\n__END__\n", 2)[1])");
-  printer->Print(
-      "\nGoogle::Protobuf::DescriptorPool.generated_pool.add_serialized_file("
-      "descriptor_data)\n\n");
-  return true;
-}
-
-bool GenerateFile(const FileDescriptor* file, io::Printer* printer,
-                  std::string* error) {
-  printer->Print(
-    "# Generated by the protocol buffer compiler.  DO NOT EDIT!\n"
-    "# source: $filename$\n"
-    "\n",
-    "filename", file->name());
-
-  printer->Print("require 'google/protobuf'\n\n");
-
-  if (file->dependency_count() != 0) {
-    for (int i = 0; i < file->dependency_count(); i++) {
-      printer->Print("require '$name$'\n", "name", GetRequireName(file->dependency(i)->name()));
-    }
-    printer->Print("\n");
-  }
-
-  // TODO: Remove this when ruby supports extensions for proto2 syntax.
-  if (file->syntax() == FileDescriptor::SYNTAX_PROTO2 &&
-      file->extension_count() > 0) {
-    GOOGLE_LOG(WARNING) << "Extensions are not yet supported for proto2 .proto files.";
-  }
-
-  bool use_raw_descriptor = file->name() == "google/protobuf/descriptor.proto";
-
-  if (use_raw_descriptor) {
-    GenerateBinaryDescriptor(file, printer, error);
-  } else {
-    GenerateDslDescriptor(file, printer, error);
-  }
-
-  int levels = GeneratePackageModules(file, printer);
-  for (int i = 0; i < file->message_type_count(); i++) {
-    GenerateMessageAssignment("", file->message_type(i), printer);
-  }
-  for (int i = 0; i < file->enum_type_count(); i++) {
-    GenerateEnumAssignment("", file->enum_type(i), printer);
-  }
-  EndPackageModules(levels, printer);
-
-  if (use_raw_descriptor) {
-    printer->Print("\n__END__\n");
-    FileDescriptorProto file_proto;
-    file->CopyTo(&file_proto);
-    std::string file_data;
-    file_proto.SerializeToString(&file_data);
-    printer->Print("$raw_descriptor$", "raw_descriptor", file_data);
-  }
-  return true;
-}
-
-bool Generator::Generate(
-    const FileDescriptor* file,
-    const std::string& parameter,
-    GeneratorContext* generator_context,
-    std::string* error) const {
-
-  if (file->syntax() != FileDescriptor::SYNTAX_PROTO3 &&
-      file->syntax() != FileDescriptor::SYNTAX_PROTO2) {
-    *error = "Invalid or unsupported proto syntax";
-    return false;
-  }
-
-  std::unique_ptr<io::ZeroCopyOutputStream> output(
-      generator_context->Open(GetOutputFilename(file->name())));
-  io::Printer printer(output.get(), '$');
-
-  return GenerateFile(file, &printer, error);
-}
-
-}  // namespace ruby
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/compiler/ruby/ruby_generator.h b/libs/protobuf/src/google/protobuf/compiler/ruby/ruby_generator.h
deleted file mode 100644
index 647bb83..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/ruby/ruby_generator.h
+++ /dev/null
@@ -1,67 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Generates Ruby code for a given .proto file.
-
-#ifndef GOOGLE_PROTOBUF_COMPILER_RUBY_GENERATOR_H__
-#define GOOGLE_PROTOBUF_COMPILER_RUBY_GENERATOR_H__
-
-#include <string>
-
-#include <google/protobuf/compiler/code_generator.h>
-
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace ruby {
-
-// CodeGenerator implementation for generated Ruby protocol buffer classes.
-// If you create your own protocol compiler binary and you want it to support
-// Ruby output, you can do so by registering an instance of this
-// CodeGenerator with the CommandLineInterface in your main() function.
-class PROTOC_EXPORT Generator : public CodeGenerator {
-  bool Generate(const FileDescriptor* file, const std::string& parameter,
-                GeneratorContext* generator_context,
-                std::string* error) const override;
-  uint64_t GetSupportedFeatures() const override {
-    return FEATURE_PROTO3_OPTIONAL;
-  }
-};
-
-}  // namespace ruby
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
-
-#endif  // GOOGLE_PROTOBUF_COMPILER_RUBY_GENERATOR_H__
diff --git a/libs/protobuf/src/google/protobuf/compiler/ruby/ruby_generator_unittest.cc b/libs/protobuf/src/google/protobuf/compiler/ruby/ruby_generator_unittest.cc
deleted file mode 100644
index c3ce1d3..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/ruby/ruby_generator_unittest.cc
+++ /dev/null
@@ -1,145 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2014 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <memory>
-#include <list>
-
-#include <google/protobuf/compiler/ruby/ruby_generator.h>
-#include <google/protobuf/compiler/command_line_interface.h>
-#include <google/protobuf/io/zero_copy_stream.h>
-#include <google/protobuf/io/printer.h>
-
-#include <google/protobuf/testing/googletest.h>
-#include <gtest/gtest.h>
-#include <google/protobuf/testing/file.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-namespace ruby {
-namespace {
-
-std::string FindRubyTestDir() {
-  return TestSourceDir() + "/google/protobuf/compiler/ruby";
-}
-
-// This test is a simple golden-file test over the output of the Ruby code
-// generator. When we make changes to the Ruby extension and alter the Ruby code
-// generator to use those changes, we should (i) manually test the output of the
-// code generator with the extension, and (ii) update the golden output above.
-// Some day, we may integrate build systems between protoc and the language
-// extensions to the point where we can do this test in a more automated way.
-
-void RubyTest(std::string proto_file, std::string import_proto_file = "") {
-  std::string ruby_tests = FindRubyTestDir();
-
-  google::protobuf::compiler::CommandLineInterface cli;
-  cli.SetInputsAreProtoPathRelative(true);
-
-  ruby::Generator ruby_generator;
-  cli.RegisterGenerator("--ruby_out", &ruby_generator, "");
-
-  // Copy generated_code.proto to the temporary test directory.
-  std::string test_input;
-  GOOGLE_CHECK_OK(File::GetContents(
-      ruby_tests + proto_file + ".proto",
-      &test_input,
-      true));
-  GOOGLE_CHECK_OK(File::SetContents(
-      TestTempDir() + proto_file + ".proto",
-      test_input,
-      true));
-
-  // Copy generated_code_import.proto to the temporary test directory.
-  std::string test_import;
-  if (!import_proto_file.empty()) {
-    GOOGLE_CHECK_OK(File::GetContents(
-        ruby_tests + import_proto_file + ".proto",
-        &test_import,
-        true));
-    GOOGLE_CHECK_OK(File::SetContents(
-        TestTempDir() + import_proto_file + ".proto",
-        test_import,
-        true));
-  }
-
-  // Invoke the proto compiler (we will be inside TestTempDir() at this point).
-  std::string ruby_out = "--ruby_out=" + TestTempDir();
-  std::string proto_path = "--proto_path=" + TestTempDir();
-
-  std::string proto_target = TestTempDir() + proto_file + ".proto";
-  const char* argv[] = {
-    "protoc",
-    ruby_out.c_str(),
-    proto_path.c_str(),
-    proto_target.c_str(),
-  };
-
-  EXPECT_EQ(0, cli.Run(4, argv));
-
-  // Load the generated output and compare to the expected result.
-  std::string output;
-  GOOGLE_CHECK_OK(File::GetContentsAsText(
-      TestTempDir() + proto_file + "_pb.rb",
-      &output,
-      true));
-  std::string expected_output;
-  GOOGLE_CHECK_OK(File::GetContentsAsText(
-      ruby_tests + proto_file + "_pb.rb",
-      &expected_output,
-      true));
-  EXPECT_EQ(expected_output, output);
-}
-
-TEST(RubyGeneratorTest, Proto3GeneratorTest) {
-  RubyTest("/ruby_generated_code", "/ruby_generated_code_proto2_import");
-}
-
-TEST(RubyGeneratorTest, Proto2GeneratorTest) {
-    RubyTest("/ruby_generated_code_proto2", "/ruby_generated_code_proto2_import");
-}
-
-TEST(RubyGeneratorTest, Proto3ImplicitPackageTest) {
-    RubyTest("/ruby_generated_pkg_implicit");
-}
-
-TEST(RubyGeneratorTest, Proto3ExplictPackageTest) {
-    RubyTest("/ruby_generated_pkg_explicit");
-}
-
-TEST(RubyGeneratorTest, Proto3ExplictLegacyPackageTest) {
-    RubyTest("/ruby_generated_pkg_explicit_legacy");
-}
-
-}  // namespace
-}  // namespace ruby
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/compiler/scc.h b/libs/protobuf/src/google/protobuf/compiler/scc.h
deleted file mode 100644
index 7b95689..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/scc.h
+++ /dev/null
@@ -1,165 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef GOOGLE_PROTOBUF_COMPILER_SCC_H__
-#define GOOGLE_PROTOBUF_COMPILER_SCC_H__
-
-#include <map>
-
-#include <google/protobuf/stubs/logging.h>
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/descriptor.h>
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-
-// Description of each strongly connected component. Note that the order
-// of both the descriptors in this SCC and the order of children is
-// deterministic.
-struct SCC {
-  std::vector<const Descriptor*> descriptors;
-  std::vector<const SCC*> children;
-
-  const Descriptor* GetRepresentative() const { return descriptors[0]; }
-
-  // All messages must necessarily be in the same file.
-  const FileDescriptor* GetFile() const { return descriptors[0]->file(); }
-};
-
-// This class is used for analyzing the SCC for each message, to ensure linear
-// instead of quadratic performance, if we do this per message we would get
-// O(V*(V+E)).
-template <class DepsGenerator>
-class PROTOC_EXPORT SCCAnalyzer {
- public:
-  explicit SCCAnalyzer() : index_(0) {}
-
-  const SCC* GetSCC(const Descriptor* descriptor) {
-    if (cache_.count(descriptor)) return cache_[descriptor].scc;
-    return DFS(descriptor).scc;
-  }
-
- private:
-  struct NodeData {
-    const SCC* scc;  // if null it means its still on the stack
-    int index;
-    int lowlink;
-  };
-
-  std::map<const Descriptor*, NodeData> cache_;
-  std::vector<const Descriptor*> stack_;
-  int index_;
-  std::vector<std::unique_ptr<SCC>> garbage_bin_;
-
-  SCC* CreateSCC() {
-    garbage_bin_.emplace_back(new SCC());
-    return garbage_bin_.back().get();
-  }
-
-  // Tarjan's Strongly Connected Components algo
-  NodeData DFS(const Descriptor* descriptor) {
-    // Must not have visited already.
-    GOOGLE_DCHECK_EQ(cache_.count(descriptor), 0);
-
-    // Mark visited by inserting in map.
-    NodeData& result = cache_[descriptor];
-    // Initialize data structures.
-    result.index = result.lowlink = index_++;
-    stack_.push_back(descriptor);
-
-    // Recurse the fields / nodes in graph
-    for (auto dep : DepsGenerator()(descriptor)) {
-      GOOGLE_CHECK(dep);
-      if (cache_.count(dep) == 0) {
-        // unexplored node
-        NodeData child_data = DFS(dep);
-        result.lowlink = std::min(result.lowlink, child_data.lowlink);
-      } else {
-        NodeData child_data = cache_[dep];
-        if (child_data.scc == nullptr) {
-          // Still in the stack_ so we found a back edge
-          result.lowlink = std::min(result.lowlink, child_data.index);
-        }
-      }
-    }
-    if (result.index == result.lowlink) {
-      // This is the root of a strongly connected component
-      SCC* scc = CreateSCC();
-      while (true) {
-        const Descriptor* scc_desc = stack_.back();
-        scc->descriptors.push_back(scc_desc);
-        // Remove from stack
-        stack_.pop_back();
-        cache_[scc_desc].scc = scc;
-
-        if (scc_desc == descriptor) break;
-      }
-
-      // The order of descriptors is random and depends how this SCC was
-      // discovered. In-order to ensure maximum stability we sort it by name.
-      std::sort(scc->descriptors.begin(), scc->descriptors.end(),
-                [](const Descriptor* a, const Descriptor* b) {
-                  return a->full_name() < b->full_name();
-                });
-      AddChildren(scc);
-    }
-    return result;
-  }
-
-  // Add the SCC's that are children of this SCC to its children.
-  void AddChildren(SCC* scc) {
-    std::set<const SCC*> seen;
-    for (auto descriptor : scc->descriptors) {
-      for (auto child_msg : DepsGenerator()(descriptor)) {
-        GOOGLE_CHECK(child_msg);
-        const SCC* child = GetSCC(child_msg);
-        if (child == scc) continue;
-        if (seen.insert(child).second) {
-          scc->children.push_back(child);
-        }
-      }
-    }
-  }
-
-  // This is necessary for compiler bug in msvc2015.
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(SCCAnalyzer);
-};
-
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
-
-#endif  // GOOGLE_PROTOBUF_COMPILER_SCC_H__
diff --git a/libs/protobuf/src/google/protobuf/compiler/subprocess.cc b/libs/protobuf/src/google/protobuf/compiler/subprocess.cc
deleted file mode 100644
index 6f547db..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/subprocess.cc
+++ /dev/null
@@ -1,498 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-
-#include <google/protobuf/compiler/subprocess.h>
-
-#include <algorithm>
-#include <cstring>
-#include <iostream>
-
-#ifndef _WIN32
-#include <errno.h>
-#include <signal.h>
-#include <sys/select.h>
-#include <sys/wait.h>
-#endif
-
-#include <google/protobuf/stubs/logging.h>
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/stubs/substitute.h>
-#include <google/protobuf/message.h>
-#include <google/protobuf/io/io_win32.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-
-namespace {
-char* portable_strdup(const char* s) {
-  char* ns = (char*)malloc(strlen(s) + 1);
-  if (ns != nullptr) {
-    strcpy(ns, s);
-  }
-  return ns;
-}
-}  // namespace
-
-#ifdef _WIN32
-
-static void CloseHandleOrDie(HANDLE handle) {
-  if (!CloseHandle(handle)) {
-    GOOGLE_LOG(FATAL) << "CloseHandle: "
-                      << Subprocess::Win32ErrorMessage(GetLastError());
-  }
-}
-
-Subprocess::Subprocess()
-    : process_start_error_(ERROR_SUCCESS),
-      child_handle_(nullptr),
-      child_stdin_(nullptr),
-      child_stdout_(nullptr) {}
-
-Subprocess::~Subprocess() {
-  if (child_stdin_ != nullptr) {
-    CloseHandleOrDie(child_stdin_);
-  }
-  if (child_stdout_ != nullptr) {
-    CloseHandleOrDie(child_stdout_);
-  }
-}
-
-void Subprocess::Start(const std::string& program, SearchMode search_mode) {
-  // Create the pipes.
-  HANDLE stdin_pipe_read;
-  HANDLE stdin_pipe_write;
-  HANDLE stdout_pipe_read;
-  HANDLE stdout_pipe_write;
-
-  if (!CreatePipe(&stdin_pipe_read, &stdin_pipe_write, nullptr, 0)) {
-    GOOGLE_LOG(FATAL) << "CreatePipe: " << Win32ErrorMessage(GetLastError());
-  }
-  if (!CreatePipe(&stdout_pipe_read, &stdout_pipe_write, nullptr, 0)) {
-    GOOGLE_LOG(FATAL) << "CreatePipe: " << Win32ErrorMessage(GetLastError());
-  }
-
-  // Make child side of the pipes inheritable.
-  if (!SetHandleInformation(stdin_pipe_read, HANDLE_FLAG_INHERIT,
-                            HANDLE_FLAG_INHERIT)) {
-    GOOGLE_LOG(FATAL) << "SetHandleInformation: "
-                      << Win32ErrorMessage(GetLastError());
-  }
-  if (!SetHandleInformation(stdout_pipe_write, HANDLE_FLAG_INHERIT,
-                            HANDLE_FLAG_INHERIT)) {
-    GOOGLE_LOG(FATAL) << "SetHandleInformation: "
-                      << Win32ErrorMessage(GetLastError());
-  }
-
-  // Setup STARTUPINFO to redirect handles.
-  STARTUPINFOW startup_info;
-  ZeroMemory(&startup_info, sizeof(startup_info));
-  startup_info.cb = sizeof(startup_info);
-  startup_info.dwFlags = STARTF_USESTDHANDLES;
-  startup_info.hStdInput = stdin_pipe_read;
-  startup_info.hStdOutput = stdout_pipe_write;
-  startup_info.hStdError = GetStdHandle(STD_ERROR_HANDLE);
-
-  if (startup_info.hStdError == INVALID_HANDLE_VALUE) {
-    GOOGLE_LOG(FATAL) << "GetStdHandle: " << Win32ErrorMessage(GetLastError());
-  }
-
-  // get wide string version of program as the path may contain non-ascii characters
-  std::wstring wprogram;
-  if (!io::win32::strings::utf8_to_wcs(program.c_str(), &wprogram)) {
-    GOOGLE_LOG(FATAL) << "utf8_to_wcs: " << Win32ErrorMessage(GetLastError());
-  }
-
-  // Invoking cmd.exe allows for '.bat' files from the path as well as '.exe'.
-  std::string command_line = "cmd.exe /c \"" + program + "\"";
-
-  // get wide string version of command line as the path may contain non-ascii characters
-  std::wstring wcommand_line;
-  if (!io::win32::strings::utf8_to_wcs(command_line.c_str(), &wcommand_line)) {
-    GOOGLE_LOG(FATAL) << "utf8_to_wcs: " << Win32ErrorMessage(GetLastError());
-  }
-
-  // Using a malloc'ed string because CreateProcess() can mutate its second
-  // parameter.
-  wchar_t *wcommand_line_copy = _wcsdup(wcommand_line.c_str());
-
-  // Create the process.
-  PROCESS_INFORMATION process_info;
-
-  if (CreateProcessW((search_mode == SEARCH_PATH) ? nullptr : wprogram.c_str(),
-                     (search_mode == SEARCH_PATH) ? wcommand_line_copy : NULL,
-                     nullptr,  // process security attributes
-                     nullptr,  // thread security attributes
-                     TRUE,     // inherit handles?
-                     0,        // obscure creation flags
-                     nullptr,  // environment (inherit from parent)
-                     nullptr,  // current directory (inherit from parent)
-                     &startup_info, &process_info)) {
-    child_handle_ = process_info.hProcess;
-    CloseHandleOrDie(process_info.hThread);
-    child_stdin_ = stdin_pipe_write;
-    child_stdout_ = stdout_pipe_read;
-  } else {
-    process_start_error_ = GetLastError();
-    CloseHandleOrDie(stdin_pipe_write);
-    CloseHandleOrDie(stdout_pipe_read);
-  }
-
-  CloseHandleOrDie(stdin_pipe_read);
-  CloseHandleOrDie(stdout_pipe_write);
-  free(wcommand_line_copy);
-}
-
-bool Subprocess::Communicate(const Message& input, Message* output,
-                             std::string* error) {
-  if (process_start_error_ != ERROR_SUCCESS) {
-    *error = Win32ErrorMessage(process_start_error_);
-    return false;
-  }
-
-  GOOGLE_CHECK(child_handle_ != nullptr) << "Must call Start() first.";
-
-  std::string input_data;
-  if (!input.SerializeToString(&input_data)) {
-    *error = "Failed to serialize request.";
-    return false;
-  }
-  std::string output_data;
-
-  int input_pos = 0;
-
-  while (child_stdout_ != nullptr) {
-    HANDLE handles[2];
-    int handle_count = 0;
-
-    if (child_stdin_ != nullptr) {
-      handles[handle_count++] = child_stdin_;
-    }
-    if (child_stdout_ != nullptr) {
-      handles[handle_count++] = child_stdout_;
-    }
-
-    DWORD wait_result =
-        WaitForMultipleObjects(handle_count, handles, FALSE, INFINITE);
-
-    HANDLE signaled_handle = nullptr;
-    if (wait_result >= WAIT_OBJECT_0 &&
-        wait_result < WAIT_OBJECT_0 + handle_count) {
-      signaled_handle = handles[wait_result - WAIT_OBJECT_0];
-    } else if (wait_result == WAIT_FAILED) {
-      GOOGLE_LOG(FATAL) << "WaitForMultipleObjects: "
-                        << Win32ErrorMessage(GetLastError());
-    } else {
-      GOOGLE_LOG(FATAL) << "WaitForMultipleObjects: Unexpected return code: "
-                        << wait_result;
-    }
-
-    if (signaled_handle == child_stdin_) {
-      DWORD n;
-      if (!WriteFile(child_stdin_, input_data.data() + input_pos,
-                     input_data.size() - input_pos, &n, nullptr)) {
-        // Child closed pipe.  Presumably it will report an error later.
-        // Pretend we're done for now.
-        input_pos = input_data.size();
-      } else {
-        input_pos += n;
-      }
-
-      if (input_pos == input_data.size()) {
-        // We're done writing.  Close.
-        CloseHandleOrDie(child_stdin_);
-        child_stdin_ = nullptr;
-      }
-    } else if (signaled_handle == child_stdout_) {
-      char buffer[4096];
-      DWORD n;
-
-      if (!ReadFile(child_stdout_, buffer, sizeof(buffer), &n, nullptr)) {
-        // We're done reading.  Close.
-        CloseHandleOrDie(child_stdout_);
-        child_stdout_ = nullptr;
-      } else {
-        output_data.append(buffer, n);
-      }
-    }
-  }
-
-  if (child_stdin_ != nullptr) {
-    // Child did not finish reading input before it closed the output.
-    // Presumably it exited with an error.
-    CloseHandleOrDie(child_stdin_);
-    child_stdin_ = nullptr;
-  }
-
-  DWORD wait_result = WaitForSingleObject(child_handle_, INFINITE);
-
-  if (wait_result == WAIT_FAILED) {
-    GOOGLE_LOG(FATAL) << "WaitForSingleObject: "
-                      << Win32ErrorMessage(GetLastError());
-  } else if (wait_result != WAIT_OBJECT_0) {
-    GOOGLE_LOG(FATAL) << "WaitForSingleObject: Unexpected return code: "
-                      << wait_result;
-  }
-
-  DWORD exit_code;
-  if (!GetExitCodeProcess(child_handle_, &exit_code)) {
-    GOOGLE_LOG(FATAL) << "GetExitCodeProcess: "
-                      << Win32ErrorMessage(GetLastError());
-  }
-
-  CloseHandleOrDie(child_handle_);
-  child_handle_ = nullptr;
-
-  if (exit_code != 0) {
-    *error = strings::Substitute("Plugin failed with status code $0.", exit_code);
-    return false;
-  }
-
-  if (!output->ParseFromString(output_data)) {
-    *error = "Plugin output is unparseable: " + CEscape(output_data);
-    return false;
-  }
-
-  return true;
-}
-
-std::string Subprocess::Win32ErrorMessage(DWORD error_code) {
-  char* message;
-
-  // WTF?
-  FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM |
-                     FORMAT_MESSAGE_IGNORE_INSERTS,
-                 nullptr, error_code,
-                 MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US),
-                 (LPSTR)&message,  // NOT A BUG!
-                 0, nullptr);
-
-  std::string result = message;
-  LocalFree(message);
-  return result;
-}
-
-// ===================================================================
-
-#else  // _WIN32
-
-Subprocess::Subprocess()
-    : child_pid_(-1), child_stdin_(-1), child_stdout_(-1) {}
-
-Subprocess::~Subprocess() {
-  if (child_stdin_ != -1) {
-    close(child_stdin_);
-  }
-  if (child_stdout_ != -1) {
-    close(child_stdout_);
-  }
-}
-
-void Subprocess::Start(const std::string& program, SearchMode search_mode) {
-  // Note that we assume that there are no other threads, thus we don't have to
-  // do crazy stuff like using socket pairs or avoiding libc locks.
-
-  // [0] is read end, [1] is write end.
-  int stdin_pipe[2];
-  int stdout_pipe[2];
-
-  GOOGLE_CHECK(pipe(stdin_pipe) != -1);
-  GOOGLE_CHECK(pipe(stdout_pipe) != -1);
-
-  char* argv[2] = {portable_strdup(program.c_str()), nullptr};
-
-  child_pid_ = fork();
-  if (child_pid_ == -1) {
-    GOOGLE_LOG(FATAL) << "fork: " << strerror(errno);
-  } else if (child_pid_ == 0) {
-    // We are the child.
-    dup2(stdin_pipe[0], STDIN_FILENO);
-    dup2(stdout_pipe[1], STDOUT_FILENO);
-
-    close(stdin_pipe[0]);
-    close(stdin_pipe[1]);
-    close(stdout_pipe[0]);
-    close(stdout_pipe[1]);
-
-    switch (search_mode) {
-      case SEARCH_PATH:
-        execvp(argv[0], argv);
-        break;
-      case EXACT_NAME:
-        execv(argv[0], argv);
-        break;
-    }
-
-    // Write directly to STDERR_FILENO to avoid stdio code paths that may do
-    // stuff that is unsafe here.
-    int ignored;
-    ignored = write(STDERR_FILENO, argv[0], strlen(argv[0]));
-    const char* message =
-        ": program not found or is not executable\n"
-        "Please specify a program using absolute path or make sure "
-        "the program is available in your PATH system variable\n";
-    ignored = write(STDERR_FILENO, message, strlen(message));
-    (void)ignored;
-
-    // Must use _exit() rather than exit() to avoid flushing output buffers
-    // that will also be flushed by the parent.
-    _exit(1);
-  } else {
-    free(argv[0]);
-
-    close(stdin_pipe[0]);
-    close(stdout_pipe[1]);
-
-    child_stdin_ = stdin_pipe[1];
-    child_stdout_ = stdout_pipe[0];
-  }
-}
-
-bool Subprocess::Communicate(const Message& input, Message* output,
-                             std::string* error) {
-  GOOGLE_CHECK_NE(child_stdin_, -1) << "Must call Start() first.";
-
-  // The "sighandler_t" typedef is GNU-specific, so define our own.
-  typedef void SignalHandler(int);
-
-  // Make sure SIGPIPE is disabled so that if the child dies it doesn't kill us.
-  SignalHandler* old_pipe_handler = signal(SIGPIPE, SIG_IGN);
-
-  std::string input_data;
-  if (!input.SerializeToString(&input_data)) {
-    *error = "Failed to serialize request.";
-    return false;
-  }
-  std::string output_data;
-
-  int input_pos = 0;
-  int max_fd = std::max(child_stdin_, child_stdout_);
-
-  while (child_stdout_ != -1) {
-    fd_set read_fds;
-    fd_set write_fds;
-    FD_ZERO(&read_fds);
-    FD_ZERO(&write_fds);
-    if (child_stdout_ != -1) {
-      FD_SET(child_stdout_, &read_fds);
-    }
-    if (child_stdin_ != -1) {
-      FD_SET(child_stdin_, &write_fds);
-    }
-
-    if (select(max_fd + 1, &read_fds, &write_fds, nullptr, nullptr) < 0) {
-      if (errno == EINTR) {
-        // Interrupted by signal.  Try again.
-        continue;
-      } else {
-        GOOGLE_LOG(FATAL) << "select: " << strerror(errno);
-      }
-    }
-
-    if (child_stdin_ != -1 && FD_ISSET(child_stdin_, &write_fds)) {
-      int n = write(child_stdin_, input_data.data() + input_pos,
-                    input_data.size() - input_pos);
-      if (n < 0) {
-        // Child closed pipe.  Presumably it will report an error later.
-        // Pretend we're done for now.
-        input_pos = input_data.size();
-      } else {
-        input_pos += n;
-      }
-
-      if (input_pos == input_data.size()) {
-        // We're done writing.  Close.
-        close(child_stdin_);
-        child_stdin_ = -1;
-      }
-    }
-
-    if (child_stdout_ != -1 && FD_ISSET(child_stdout_, &read_fds)) {
-      char buffer[4096];
-      int n = read(child_stdout_, buffer, sizeof(buffer));
-
-      if (n > 0) {
-        output_data.append(buffer, n);
-      } else {
-        // We're done reading.  Close.
-        close(child_stdout_);
-        child_stdout_ = -1;
-      }
-    }
-  }
-
-  if (child_stdin_ != -1) {
-    // Child did not finish reading input before it closed the output.
-    // Presumably it exited with an error.
-    close(child_stdin_);
-    child_stdin_ = -1;
-  }
-
-  int status;
-  while (waitpid(child_pid_, &status, 0) == -1) {
-    if (errno != EINTR) {
-      GOOGLE_LOG(FATAL) << "waitpid: " << strerror(errno);
-    }
-  }
-
-  // Restore SIGPIPE handling.
-  signal(SIGPIPE, old_pipe_handler);
-
-  if (WIFEXITED(status)) {
-    if (WEXITSTATUS(status) != 0) {
-      int error_code = WEXITSTATUS(status);
-      *error =
-          strings::Substitute("Plugin failed with status code $0.", error_code);
-      return false;
-    }
-  } else if (WIFSIGNALED(status)) {
-    int signal = WTERMSIG(status);
-    *error = strings::Substitute("Plugin killed by signal $0.", signal);
-    return false;
-  } else {
-    *error = "Neither WEXITSTATUS nor WTERMSIG is true?";
-    return false;
-  }
-
-  if (!output->ParseFromString(output_data)) {
-    *error = "Plugin output is unparseable: " + CEscape(output_data);
-    return false;
-  }
-
-  return true;
-}
-
-#endif  // !_WIN32
-
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/compiler/subprocess.h b/libs/protobuf/src/google/protobuf/compiler/subprocess.h
deleted file mode 100644
index 5cb784d..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/subprocess.h
+++ /dev/null
@@ -1,114 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-
-#ifndef GOOGLE_PROTOBUF_COMPILER_SUBPROCESS_H__
-#define GOOGLE_PROTOBUF_COMPILER_SUBPROCESS_H__
-
-#ifdef _WIN32
-#ifndef WIN32_LEAN_AND_MEAN
-#define WIN32_LEAN_AND_MEAN  // right...
-#endif
-#include <windows.h>
-#else  // _WIN32
-#include <sys/types.h>
-#include <unistd.h>
-#endif  // !_WIN32
-#include <google/protobuf/stubs/common.h>
-
-#include <string>
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-
-class Message;
-
-namespace compiler {
-
-// Utility class for launching sub-processes.
-class PROTOC_EXPORT Subprocess {
- public:
-  Subprocess();
-  ~Subprocess();
-
-  enum SearchMode {
-    SEARCH_PATH,  // Use PATH environment variable.
-    EXACT_NAME    // Program is an exact file name; don't use the PATH.
-  };
-
-  // Start the subprocess.  Currently we don't provide a way to specify
-  // arguments as protoc plugins don't have any.
-  void Start(const std::string& program, SearchMode search_mode);
-
-  // Serialize the input message and pipe it to the subprocess's stdin, then
-  // close the pipe.  Meanwhile, read from the subprocess's stdout and parse
-  // the data into *output.  All this is done carefully to avoid deadlocks.
-  // Returns true if successful.  On any sort of error, returns false and sets
-  // *error to a description of the problem.
-  bool Communicate(const Message& input, Message* output, std::string* error);
-
-#ifdef _WIN32
-  // Given an error code, returns a human-readable error message.  This is
-  // defined here so that CommandLineInterface can share it.
-  static std::string Win32ErrorMessage(DWORD error_code);
-#endif
-
- private:
-#ifdef _WIN32
-  DWORD process_start_error_;
-  HANDLE child_handle_;
-
-  // The file handles for our end of the child's pipes.  We close each and
-  // set it to NULL when no longer needed.
-  HANDLE child_stdin_;
-  HANDLE child_stdout_;
-
-#else  // _WIN32
-  pid_t child_pid_;
-
-  // The file descriptors for our end of the child's pipes.  We close each and
-  // set it to -1 when no longer needed.
-  int child_stdin_;
-  int child_stdout_;
-
-#endif  // !_WIN32
-};
-
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
-
-#endif  // GOOGLE_PROTOBUF_COMPILER_SUBPROCESS_H__
diff --git a/libs/protobuf/src/google/protobuf/compiler/test_plugin.cc b/libs/protobuf/src/google/protobuf/compiler/test_plugin.cc
deleted file mode 100644
index 2556078..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/test_plugin.cc
+++ /dev/null
@@ -1,63 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//
-// This is a dummy code generator plugin used by
-// command_line_interface_unittest.
-
-#include <stdlib.h>
-
-#include <string>
-
-#include <google/protobuf/compiler/mock_code_generator.h>
-#include <google/protobuf/compiler/plugin.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-
-int ProtobufMain(int argc, char* argv[]) {
-  MockCodeGenerator generator("test_plugin");
-  return PluginMain(argc, argv, &generator);
-}
-
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-int main(int argc, char* argv[]) {
-#ifdef _MSC_VER
-  // Don't print a silly message or stick a modal dialog box in my face,
-  // please.
-  _set_abort_behavior(0, ~0);
-#endif  // !_MSC_VER
-  return google::protobuf::compiler::ProtobufMain(argc, argv);
-}
diff --git a/libs/protobuf/src/google/protobuf/compiler/zip_output_unittest.sh b/libs/protobuf/src/google/protobuf/compiler/zip_output_unittest.sh
deleted file mode 100755
index f859791..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/zip_output_unittest.sh
+++ /dev/null
@@ -1,100 +0,0 @@
-#!/bin/sh
-#
-# Protocol Buffers - Google's data interchange format
-# Copyright 2009 Google Inc.  All rights reserved.
-# https://developers.google.com/protocol-buffers/
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# Author: kenton@google.com (Kenton Varda)
-#
-# Test protoc's zip output mode.
-
-fail() {
-  echo "$@" >&2
-  exit 1
-}
-
-TEST_TMPDIR=.
-PROTOC=./protoc
-JAR=jar
-UNZIP=unzip
-
-echo '
-  syntax = "proto2";
-  option java_multiple_files = true;
-  option java_package = "test.jar";
-  option java_outer_classname = "Outer";
-  message Foo {}
-  message Bar {}
-' > $TEST_TMPDIR/testzip.proto
-
-$PROTOC \
-    --cpp_out=$TEST_TMPDIR/testzip.zip --python_out=$TEST_TMPDIR/testzip.zip \
-    --java_out=$TEST_TMPDIR/testzip.jar -I$TEST_TMPDIR testzip.proto \
-    || fail 'protoc failed.'
-
-echo "Testing output to zip..."
-if $UNZIP -h > /dev/null; then
-  $UNZIP -t $TEST_TMPDIR/testzip.zip > $TEST_TMPDIR/testzip.list \
-    || fail 'unzip failed.'
-
-  grep 'testing: testzip\.pb\.cc *OK$' $TEST_TMPDIR/testzip.list > /dev/null \
-    || fail 'testzip.pb.cc not found in output zip.'
-  grep 'testing: testzip\.pb\.h *OK$' $TEST_TMPDIR/testzip.list > /dev/null \
-    || fail 'testzip.pb.h not found in output zip.'
-  grep 'testing: testzip_pb2\.py *OK$' $TEST_TMPDIR/testzip.list > /dev/null \
-    || fail 'testzip_pb2.py not found in output zip.'
-  grep -i 'manifest' $TEST_TMPDIR/testzip.list > /dev/null \
-    && fail 'Zip file contained manifest.'
-else
-  echo "Warning:  'unzip' command not available.  Skipping test."
-fi
-
-echo "Testing output to jar..."
-if $JAR c $TEST_TMPDIR/testzip.proto > /dev/null; then
-  $JAR tf $TEST_TMPDIR/testzip.jar > $TEST_TMPDIR/testzip.list \
-    || fail 'jar failed.'
-
-  # Check that -interface.jar timestamps are normalized:
-  if [[ "$(TZ=UTC $JAR tvf $TEST_TMPDIR/testzip.jar)" != *'Tue Jan 01 00:00:00 UTC 1980'* ]]; then
-    fail 'Zip did not contain normalized timestamps'
-  fi
-
-  grep '^test/jar/Foo\.java$' $TEST_TMPDIR/testzip.list > /dev/null \
-    || fail 'Foo.java not found in output jar.'
-  grep '^test/jar/Bar\.java$' $TEST_TMPDIR/testzip.list > /dev/null \
-    || fail 'Bar.java not found in output jar.'
-  grep '^test/jar/Outer\.java$' $TEST_TMPDIR/testzip.list > /dev/null \
-    || fail 'Outer.java not found in output jar.'
-  grep '^META-INF/MANIFEST\.MF$' $TEST_TMPDIR/testzip.list > /dev/null \
-    || fail 'Manifest not found in output jar.'
-else
-  echo "Warning:  'jar' command not available.  Skipping test."
-fi
-
-echo PASS
diff --git a/libs/protobuf/src/google/protobuf/compiler/zip_writer.cc b/libs/protobuf/src/google/protobuf/compiler/zip_writer.cc
deleted file mode 100644
index 72e1d71..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/zip_writer.cc
+++ /dev/null
@@ -1,195 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: ambrose@google.com (Ambrose Feinstein),
-//         kenton@google.com (Kenton Varda)
-//
-// Based on http://www.pkware.com/documents/casestudies/APPNOTE.TXT
-
-#include <google/protobuf/compiler/zip_writer.h>
-
-#include <cstdint>
-
-#include <google/protobuf/io/coded_stream.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-
-// January 1, 1980 as a DOS date.
-// see https://msdn.microsoft.com/en-us/library/9kkf9tah.aspx
-static const uint16_t kDosEpoch = 1 << 5 | 1;
-
-static const uint32_t kCRC32Table[256] = {
-    0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f,
-    0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988,
-    0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91, 0x1db71064, 0x6ab020f2,
-    0xf3b97148, 0x84be41de, 0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7,
-    0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9,
-    0xfa0f3d63, 0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172,
-    0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b, 0x35b5a8fa, 0x42b2986c,
-    0xdbbbc9d6, 0xacbcf940, 0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59,
-    0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423,
-    0xcfba9599, 0xb8bda50f, 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924,
-    0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d, 0x76dc4190, 0x01db7106,
-    0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433,
-    0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818, 0x7f6a0dbb, 0x086d3d2d,
-    0x91646c97, 0xe6635c01, 0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e,
-    0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950,
-    0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65,
-    0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2, 0x4adfa541, 0x3dd895d7,
-    0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0,
-    0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9, 0x5005713c, 0x270241aa,
-    0xbe0b1010, 0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f,
-    0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17, 0x2eb40d81,
-    0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a,
-    0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683, 0xe3630b12, 0x94643b84,
-    0x0d6d6a3e, 0x7a6a5aa8, 0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1,
-    0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb,
-    0x196c3671, 0x6e6b06e7, 0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc,
-    0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5, 0xd6d6a3e8, 0xa1d1937e,
-    0x38d8c2c4, 0x4fdff252, 0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b,
-    0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55,
-    0x316e8eef, 0x4669be79, 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236,
-    0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, 0xc5ba3bbe, 0xb2bd0b28,
-    0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d,
-    0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a, 0x9c0906a9, 0xeb0e363f,
-    0x72076785, 0x05005713, 0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38,
-    0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, 0x86d3d2d4, 0xf1d4e242,
-    0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777,
-    0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c, 0x8f659eff, 0xf862ae69,
-    0x616bffd3, 0x166ccf45, 0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2,
-    0xa7672661, 0xd06016f7, 0x4969474d, 0x3e6e77db, 0xaed16a4a, 0xd9d65adc,
-    0x40df0b66, 0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9,
-    0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605, 0xcdd70693,
-    0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94,
-    0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d};
-
-static uint32_t ComputeCRC32(const std::string& buf) {
-  uint32_t x = ~0U;
-  for (int i = 0; i < buf.size(); ++i) {
-    unsigned char c = buf[i];
-    x = kCRC32Table[(x ^ c) & 0xff] ^ (x >> 8);
-  }
-  return ~x;
-}
-
-static void WriteShort(io::CodedOutputStream* out, uint16_t val) {
-  uint8_t p[2];
-  p[0] = static_cast<uint8_t>(val);
-  p[1] = static_cast<uint8_t>(val >> 8);
-  out->WriteRaw(p, 2);
-}
-
-ZipWriter::ZipWriter(io::ZeroCopyOutputStream* raw_output)
-    : raw_output_(raw_output) {}
-ZipWriter::~ZipWriter() {}
-
-bool ZipWriter::Write(const std::string& filename,
-                      const std::string& contents) {
-  FileInfo info;
-
-  info.name = filename;
-  uint16_t filename_size = filename.size();
-  info.offset = raw_output_->ByteCount();
-  info.size = contents.size();
-  info.crc32 = ComputeCRC32(contents);
-
-  files_.push_back(info);
-
-  // write file header
-  io::CodedOutputStream output(raw_output_);
-  output.WriteLittleEndian32(0x04034b50);  // magic
-  WriteShort(&output, 10);                 // version needed to extract
-  WriteShort(&output, 0);                  // flags
-  WriteShort(&output, 0);                  // compression method: stored
-  WriteShort(&output, 0);                  // last modified time
-  WriteShort(&output, kDosEpoch);          // last modified date
-  output.WriteLittleEndian32(info.crc32);  // crc-32
-  output.WriteLittleEndian32(info.size);   // compressed size
-  output.WriteLittleEndian32(info.size);   // uncompressed size
-  WriteShort(&output, filename_size);      // file name length
-  WriteShort(&output, 0);                  // extra field length
-  output.WriteString(filename);            // file name
-  output.WriteString(contents);            // file data
-
-  return !output.HadError();
-}
-
-bool ZipWriter::WriteDirectory() {
-  uint16_t num_entries = files_.size();
-  uint32_t dir_ofs = raw_output_->ByteCount();
-
-  // write central directory
-  io::CodedOutputStream output(raw_output_);
-  for (int i = 0; i < num_entries; ++i) {
-    const std::string& filename = files_[i].name;
-    uint16_t filename_size = filename.size();
-    uint32_t crc32 = files_[i].crc32;
-    uint32_t size = files_[i].size;
-    uint32_t offset = files_[i].offset;
-
-    output.WriteLittleEndian32(0x02014b50);  // magic
-    WriteShort(&output, 10);                 // version made by
-    WriteShort(&output, 10);                 // version needed to extract
-    WriteShort(&output, 0);                  // flags
-    WriteShort(&output, 0);                  // compression method: stored
-    WriteShort(&output, 0);                  // last modified time
-    WriteShort(&output, kDosEpoch);          // last modified date
-    output.WriteLittleEndian32(crc32);       // crc-32
-    output.WriteLittleEndian32(size);        // compressed size
-    output.WriteLittleEndian32(size);        // uncompressed size
-    WriteShort(&output, filename_size);      // file name length
-    WriteShort(&output, 0);                  // extra field length
-    WriteShort(&output, 0);                  // file comment length
-    WriteShort(&output, 0);                  // starting disk number
-    WriteShort(&output, 0);                  // internal file attributes
-    output.WriteLittleEndian32(0);           // external file attributes
-    output.WriteLittleEndian32(offset);      // local header offset
-    output.WriteString(filename);            // file name
-  }
-  uint32_t dir_len = output.ByteCount();
-
-  // write end of central directory marker
-  output.WriteLittleEndian32(0x06054b50);  // magic
-  WriteShort(&output, 0);                  // disk number
-  WriteShort(&output, 0);               // disk with start of central directory
-  WriteShort(&output, num_entries);     // central directory entries (this disk)
-  WriteShort(&output, num_entries);     // central directory entries (total)
-  output.WriteLittleEndian32(dir_len);  // central directory byte size
-  output.WriteLittleEndian32(dir_ofs);  // central directory offset
-  WriteShort(&output, 0);               // comment length
-
-  return output.HadError();
-}
-
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/compiler/zip_writer.h b/libs/protobuf/src/google/protobuf/compiler/zip_writer.h
deleted file mode 100644
index 5d7f69a..0000000
--- a/libs/protobuf/src/google/protobuf/compiler/zip_writer.h
+++ /dev/null
@@ -1,69 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-#ifndef GOOGLE_PROTOBUF_COMPILER_ZIP_WRITER_H__
-#define GOOGLE_PROTOBUF_COMPILER_ZIP_WRITER_H__
-
-#include <cstdint>
-#include <vector>
-
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/io/zero_copy_stream.h>
-
-namespace google {
-namespace protobuf {
-namespace compiler {
-
-class ZipWriter {
- public:
-  ZipWriter(io::ZeroCopyOutputStream* raw_output);
-  ~ZipWriter();
-
-  bool Write(const std::string& filename, const std::string& contents);
-  bool WriteDirectory();
-
- private:
-  struct FileInfo {
-    std::string name;
-    uint32_t offset;
-    uint32_t size;
-    uint32_t crc32;
-  };
-
-  io::ZeroCopyOutputStream* raw_output_;
-  std::vector<FileInfo> files_;
-};
-
-}  // namespace compiler
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // GOOGLE_PROTOBUF_COMPILER_ZIP_WRITER_H__
diff --git a/libs/protobuf/src/google/protobuf/descriptor.cc b/libs/protobuf/src/google/protobuf/descriptor.cc
deleted file mode 100644
index 5f3427d..0000000
--- a/libs/protobuf/src/google/protobuf/descriptor.cc
+++ /dev/null
@@ -1,8340 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-
-#include <google/protobuf/descriptor.h>
-
-#include <algorithm>
-#include <array>
-#include <functional>
-#include <limits>
-#include <map>
-#include <memory>
-#include <set>
-#include <sstream>
-#include <string>
-#include <type_traits>
-#include <unordered_map>
-#include <unordered_set>
-#include <vector>
-
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/stubs/logging.h>
-#include <google/protobuf/stubs/strutil.h>
-#include <google/protobuf/stubs/once.h>
-#include <google/protobuf/any.h>
-#include <google/protobuf/descriptor.pb.h>
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/io/tokenizer.h>
-#include <google/protobuf/io/zero_copy_stream_impl.h>
-#include <google/protobuf/stubs/casts.h>
-#include <google/protobuf/stubs/stringprintf.h>
-#include <google/protobuf/stubs/substitute.h>
-#include <google/protobuf/descriptor_database.h>
-#include <google/protobuf/dynamic_message.h>
-#include <google/protobuf/generated_message_util.h>
-#include <google/protobuf/io/strtod.h>
-#include <google/protobuf/port.h>
-#include <google/protobuf/text_format.h>
-#include <google/protobuf/unknown_field_set.h>
-#include <google/protobuf/stubs/map_util.h>
-#include <google/protobuf/stubs/stl_util.h>
-#include <google/protobuf/stubs/hash.h>
-
-#undef PACKAGE  // autoheader #defines this.  :(
-
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-
-namespace {
-const int kPackageLimit = 100;
-
-// Note:  I distrust ctype.h due to locales.
-char ToUpper(char ch) {
-  return (ch >= 'a' && ch <= 'z') ? (ch - 'a' + 'A') : ch;
-}
-
-char ToLower(char ch) {
-  return (ch >= 'A' && ch <= 'Z') ? (ch - 'A' + 'a') : ch;
-}
-
-std::string ToCamelCase(const std::string& input, bool lower_first) {
-  bool capitalize_next = !lower_first;
-  std::string result;
-  result.reserve(input.size());
-
-  for (char character : input) {
-    if (character == '_') {
-      capitalize_next = true;
-    } else if (capitalize_next) {
-      result.push_back(ToUpper(character));
-      capitalize_next = false;
-    } else {
-      result.push_back(character);
-    }
-  }
-
-  // Lower-case the first letter.
-  if (lower_first && !result.empty()) {
-    result[0] = ToLower(result[0]);
-  }
-
-  return result;
-}
-
-std::string ToJsonName(const std::string& input) {
-  bool capitalize_next = false;
-  std::string result;
-  result.reserve(input.size());
-
-  for (char character : input) {
-    if (character == '_') {
-      capitalize_next = true;
-    } else if (capitalize_next) {
-      result.push_back(ToUpper(character));
-      capitalize_next = false;
-    } else {
-      result.push_back(character);
-    }
-  }
-
-  return result;
-}
-
-// Backport of fold expressions for the comma operator to C++11.
-// Usage:  Fold({expr...});
-// Guaranteed to evaluate left-to-right
-struct ExpressionEater {
-  template <typename T>
-  ExpressionEater(T&&) {}  // NOLINT
-};
-void Fold(std::initializer_list<ExpressionEater>) {}
-
-template <int R>
-constexpr size_t RoundUpTo(size_t n) {
-  static_assert((R & (R - 1)) == 0, "Must be power of two");
-  return (n + (R - 1)) & ~(R - 1);
-}
-
-constexpr size_t Max(size_t a, size_t b) { return a > b ? a : b; }
-template <typename T, typename... Ts>
-constexpr size_t Max(T a, Ts... b) {
-  return Max(a, Max(b...));
-}
-
-template <typename T>
-constexpr size_t EffectiveAlignof() {
-  // `char` is special in that it gets aligned to 8. It is where we drop the
-  // trivial structs.
-  return std::is_same<T, char>::value ? 8 : alignof(T);
-}
-
-template <int align, typename U, typename... T>
-using AppendIfAlign =
-    typename std::conditional<EffectiveAlignof<U>() == align, void (*)(T..., U),
-                              void (*)(T...)>::type;
-
-// Metafunction to sort types in descending order of alignment.
-// Useful for the flat allocator to ensure proper alignment of all elements
-// without having to add padding.
-// Instead of implementing a proper sort metafunction we just do a
-// filter+merge, which is much simpler to write as a metafunction.
-// We have a fixed set of alignments we can filter on.
-// For simplicity we use a function pointer as a type list.
-template <typename In, typename T16, typename T8, typename T4, typename T2,
-          typename T1>
-struct TypeListSortImpl;
-
-template <typename... T16, typename... T8, typename... T4, typename... T2,
-          typename... T1>
-struct TypeListSortImpl<void (*)(), void (*)(T16...), void (*)(T8...),
-                        void (*)(T4...), void (*)(T2...), void (*)(T1...)> {
-  using type = void (*)(T16..., T8..., T4..., T2..., T1...);
-};
-
-template <typename First, typename... Rest, typename... T16, typename... T8,
-          typename... T4, typename... T2, typename... T1>
-struct TypeListSortImpl<void (*)(First, Rest...), void (*)(T16...),
-                        void (*)(T8...), void (*)(T4...), void (*)(T2...),
-                        void (*)(T1...)> {
-  using type = typename TypeListSortImpl<
-      void (*)(Rest...), AppendIfAlign<16, First, T16...>,
-      AppendIfAlign<8, First, T8...>, AppendIfAlign<4, First, T4...>,
-      AppendIfAlign<2, First, T2...>, AppendIfAlign<1, First, T1...>>::type;
-};
-
-template <typename... T>
-using SortByAlignment =
-    typename TypeListSortImpl<void (*)(T...), void (*)(), void (*)(),
-                              void (*)(), void (*)(), void (*)()>::type;
-
-template <template <typename...> class C, typename... T>
-auto ApplyTypeList(void (*)(T...)) -> C<T...>;
-
-template <typename T>
-constexpr int FindTypeIndex() {
-  return -1;
-}
-
-template <typename T, typename T1, typename... Ts>
-constexpr int FindTypeIndex() {
-  return std::is_same<T, T1>::value ? 0 : FindTypeIndex<T, Ts...>() + 1;
-}
-
-// A type to value map, where the possible keys as specified in `Keys...`.
-// The values for key `K` is `ValueT<K>`
-template <template <typename> class ValueT, typename... Keys>
-class TypeMap {
- public:
-  template <typename K>
-  ValueT<K>& Get() {
-    return static_cast<Base<K>&>(payload_).value;
-  }
-
-  template <typename K>
-  const ValueT<K>& Get() const {
-    return static_cast<const Base<K>&>(payload_).value;
-  }
-
- private:
-  template <typename K>
-  struct Base {
-    ValueT<K> value{};
-  };
-  struct Payload : Base<Keys>... {};
-  Payload payload_;
-};
-
-template <typename T>
-using IntT = int;
-template <typename T>
-using PointerT = T*;
-
-// Manages an allocation of sequential arrays of type `T...`.
-// It is more space efficient than storing N (ptr, size) pairs, by storing only
-// the pointer to the head and the boundaries between the arrays.
-template <typename... T>
-class FlatAllocation {
- public:
-  static constexpr size_t kMaxAlign = Max(alignof(T)...);
-
-  FlatAllocation(const TypeMap<IntT, T...>& ends) : ends_(ends) {
-    // The arrays start just after FlatAllocation, so adjust the ends.
-    Fold({(ends_.template Get<T>() +=
-           RoundUpTo<kMaxAlign>(sizeof(FlatAllocation)))...});
-    Fold({Init<T>()...});
-  }
-
-  void Destroy() {
-    Fold({Destroy<T>()...});
-    internal::SizedDelete(this, total_bytes());
-  }
-
-  template <int I>
-  using type = typename std::tuple_element<I, std::tuple<T...>>::type;
-
-  // Gets a tuple of the head pointers for the arrays
-  TypeMap<PointerT, T...> Pointers() const {
-    TypeMap<PointerT, T...> out;
-    Fold({(out.template Get<T>() = Begin<T>())...});
-    return out;
-  }
-
-
- private:
-  // Total number of bytes used by all arrays.
-  int total_bytes() const {
-    // Get the last end.
-    return ends_.template Get<typename std::tuple_element<
-        sizeof...(T) - 1, std::tuple<T...>>::type>();
-  }
-
-
-  template <typename U>
-  int BeginOffset() const {
-    constexpr int type_index = FindTypeIndex<U, T...>();
-    // Avoid a negative value here to keep it compiling when type_index == 0
-    constexpr int prev_type_index = type_index == 0 ? 0 : type_index - 1;
-    using PrevType =
-        typename std::tuple_element<prev_type_index, std::tuple<T...>>::type;
-    // Ensure the types are properly aligned.
-    static_assert(EffectiveAlignof<PrevType>() >= EffectiveAlignof<U>(), "");
-    return type_index == 0 ? RoundUpTo<kMaxAlign>(sizeof(FlatAllocation))
-                           : ends_.template Get<PrevType>();
-  }
-
-  template <typename U>
-  int EndOffset() const {
-    return ends_.template Get<U>();
-  }
-
-  // Avoid the reinterpret_cast if the array is empty.
-  // Clang's Control Flow Integrity does not like the cast pointing to memory
-  // that is not yet initialized to be of that type.
-  // (from -fsanitize=cfi-unrelated-cast)
-  template <typename U>
-  U* Begin() const {
-    int begin = BeginOffset<U>(), end = EndOffset<U>();
-    if (begin == end) return nullptr;
-    return reinterpret_cast<U*>(data() + begin);
-  }
-
-  template <typename U>
-  U* End() const {
-    int begin = BeginOffset<U>(), end = EndOffset<U>();
-    if (begin == end) return nullptr;
-    return reinterpret_cast<U*>(data() + end);
-  }
-
-  template <typename U>
-  bool Init() {
-    // Skip for the `char` block. No need to zero initialize it.
-    if (std::is_same<U, char>::value) return true;
-    for (char *p = data() + BeginOffset<U>(), *end = data() + EndOffset<U>();
-         p != end; p += sizeof(U)) {
-      ::new (p) U{};
-    }
-    return true;
-  }
-
-  template <typename U>
-  bool Destroy() {
-    if (std::is_trivially_destructible<U>::value) return true;
-    for (U* it = Begin<U>(), *end = End<U>(); it != end; ++it) {
-      it->~U();
-    }
-    return true;
-  }
-
-  char* data() const {
-    return const_cast<char*>(reinterpret_cast<const char*>(this));
-  }
-
-  TypeMap<IntT, T...> ends_;
-};
-
-template <typename... T>
-TypeMap<IntT, T...> CalculateEnds(const TypeMap<IntT, T...>& sizes) {
-  int total = 0;
-  TypeMap<IntT, T...> out;
-  Fold({(out.template Get<T>() = total +=
-         sizeof(T) * sizes.template Get<T>())...});
-  return out;
-}
-
-// The implementation for FlatAllocator below.
-// This separate class template makes it easier to have methods that fold on
-// `T...`.
-template <typename... T>
-class FlatAllocatorImpl {
- public:
-  using Allocation = FlatAllocation<T...>;
-
-  template <typename U>
-  void PlanArray(int array_size) {
-    // We can't call PlanArray after FinalizePlanning has been called.
-    GOOGLE_CHECK(!has_allocated());
-    if (std::is_trivially_destructible<U>::value) {
-      // Trivial types are aligned to 8 bytes.
-      static_assert(alignof(U) <= 8, "");
-      total_.template Get<char>() += RoundUpTo<8>(array_size * sizeof(U));
-    } else {
-      // Since we can't use `if constexpr`, just make the expression compile
-      // when this path is not taken.
-      using TypeToUse =
-          typename std::conditional<std::is_trivially_destructible<U>::value,
-                                    char, U>::type;
-      total_.template Get<TypeToUse>() += array_size;
-    }
-  }
-
-  template <typename U>
-  U* AllocateArray(int array_size) {
-    constexpr bool trivial = std::is_trivially_destructible<U>::value;
-    using TypeToUse = typename std::conditional<trivial, char, U>::type;
-
-    // We can only allocate after FinalizePlanning has been called.
-    GOOGLE_CHECK(has_allocated());
-
-    TypeToUse*& data = pointers_.template Get<TypeToUse>();
-    int& used = used_.template Get<TypeToUse>();
-    U* res = reinterpret_cast<U*>(data + used);
-    used += trivial ? RoundUpTo<8>(array_size * sizeof(U)) : array_size;
-    GOOGLE_CHECK_LE(used, total_.template Get<TypeToUse>());
-    return res;
-  }
-
-  template <typename... In>
-  const std::string* AllocateStrings(In&&... in) {
-    std::string* strings = AllocateArray<std::string>(sizeof...(in));
-    std::string* res = strings;
-    Fold({(*strings++ = std::string(std::forward<In>(in)))...});
-    return res;
-  }
-
-  // Allocate all 5 names of the field:
-  // name, full name, lowercase, camelcase and json.
-  // It will dedup the strings when possible.
-  // The resulting array contains `name` at index 0, `full_name` at index 1
-  // and the other 3 indices are specified in the result.
-  void PlanFieldNames(const std::string& name,
-                      const std::string* opt_json_name) {
-    GOOGLE_CHECK(!has_allocated());
-
-    // Fast path for snake_case names, which follow the style guide.
-    if (opt_json_name == nullptr) {
-      switch (GetFieldNameCase(name)) {
-        case FieldNameCase::kAllLower:
-          // Case 1: they are all the same.
-          return PlanArray<std::string>(2);
-        case FieldNameCase::kSnakeCase:
-          // Case 2: name==lower, camel==json
-          return PlanArray<std::string>(3);
-        default:
-          break;
-      }
-    }
-
-    std::string lowercase_name = name;
-    LowerString(&lowercase_name);
-
-    std::string camelcase_name = ToCamelCase(name, /* lower_first = */ true);
-    std::string json_name =
-        opt_json_name != nullptr ? *opt_json_name : ToJsonName(name);
-
-    StringPiece all_names[] = {name, lowercase_name, camelcase_name,
-                                     json_name};
-    std::sort(all_names, all_names + 4);
-    int unique =
-        static_cast<int>(std::unique(all_names, all_names + 4) - all_names);
-
-    PlanArray<std::string>(unique + 1);
-  }
-
-  struct FieldNamesResult {
-    const std::string* array;
-    int lowercase_index;
-    int camelcase_index;
-    int json_index;
-  };
-  FieldNamesResult AllocateFieldNames(const std::string& name,
-                                      const std::string& scope,
-                                      const std::string* opt_json_name) {
-    GOOGLE_CHECK(has_allocated());
-
-    std::string full_name =
-        scope.empty() ? name : StrCat(scope, ".", name);
-
-    // Fast path for snake_case names, which follow the style guide.
-    if (opt_json_name == nullptr) {
-      switch (GetFieldNameCase(name)) {
-        case FieldNameCase::kAllLower:
-          // Case 1: they are all the same.
-          return {AllocateStrings(name, std::move(full_name)), 0, 0, 0};
-        case FieldNameCase::kSnakeCase:
-          // Case 2: name==lower, camel==json
-          return {AllocateStrings(name, std::move(full_name),
-                                  ToCamelCase(name, /* lower_first = */ true)),
-                  0, 2, 2};
-        default:
-          break;
-      }
-    }
-
-    std::vector<std::string> names;
-    names.push_back(name);
-    names.push_back(std::move(full_name));
-
-    const auto push_name = [&](std::string new_name) {
-      for (size_t i = 0; i < names.size(); ++i) {
-        // Do not compare the full_name. It is unlikely to match, except in
-        // custom json_name. We are not taking this into account in
-        // PlanFieldNames so better to not try it.
-        if (i == 1) continue;
-        if (names[i] == new_name) return i;
-      }
-      names.push_back(std::move(new_name));
-      return names.size() - 1;
-    };
-
-    FieldNamesResult result{nullptr, 0, 0, 0};
-
-    std::string lowercase_name = name;
-    LowerString(&lowercase_name);
-    result.lowercase_index = push_name(std::move(lowercase_name));
-    result.camelcase_index =
-        push_name(ToCamelCase(name, /* lower_first = */ true));
-    result.json_index =
-        push_name(opt_json_name != nullptr ? *opt_json_name : ToJsonName(name));
-
-    std::string* all_names = AllocateArray<std::string>(names.size());
-    result.array = all_names;
-    std::move(names.begin(), names.end(), all_names);
-
-    return result;
-  }
-
-  template <typename Alloc>
-  void FinalizePlanning(Alloc& alloc) {
-    GOOGLE_CHECK(!has_allocated());
-
-    pointers_ = alloc->CreateFlatAlloc(total_)->Pointers();
-
-    GOOGLE_CHECK(has_allocated());
-  }
-
-  void ExpectConsumed() const {
-    // We verify that we consumed all the memory requested if there was no
-    // error in processing.
-    Fold({ExpectConsumed<T>()...});
-  }
-
- private:
-  bool has_allocated() const {
-    return pointers_.template Get<char>() != nullptr;
-  }
-
-  static bool IsLower(char c) { return 'a' <= c && c <= 'z'; }
-  static bool IsDigit(char c) { return '0' <= c && c <= '9'; }
-  static bool IsLowerOrDigit(char c) { return IsLower(c) || IsDigit(c); }
-
-  enum class FieldNameCase { kAllLower, kSnakeCase, kOther };
-  FieldNameCase GetFieldNameCase(const std::string& name) {
-    if (!IsLower(name[0])) return FieldNameCase::kOther;
-    FieldNameCase best = FieldNameCase::kAllLower;
-    for (char c : name) {
-      if (IsLowerOrDigit(c)) {
-        // nothing to do
-      } else if (c == '_') {
-        best = FieldNameCase::kSnakeCase;
-      } else {
-        return FieldNameCase::kOther;
-      }
-    }
-    return best;
-  }
-
-  template <typename U>
-  bool ExpectConsumed() const {
-    GOOGLE_CHECK_EQ(total_.template Get<U>(), used_.template Get<U>());
-    return true;
-  }
-
-  TypeMap<PointerT, T...> pointers_;
-  TypeMap<IntT, T...> total_;
-  TypeMap<IntT, T...> used_;
-};
-
-}  // namespace
-
-class Symbol {
- public:
-  enum Type {
-    NULL_SYMBOL,
-    MESSAGE,
-    FIELD,
-    ONEOF,
-    ENUM,
-    ENUM_VALUE,
-    ENUM_VALUE_OTHER_PARENT,
-    SERVICE,
-    METHOD,
-    FULL_PACKAGE,
-    SUB_PACKAGE,
-    QUERY_KEY
-  };
-
-  Symbol() {
-    static constexpr internal::SymbolBase null_symbol{};
-    static_assert(null_symbol.symbol_type_ == NULL_SYMBOL, "");
-    // Initialize with a sentinel to make sure `ptr_` is never null.
-    ptr_ = &null_symbol;
-  }
-
-  // Every object we store derives from internal::SymbolBase, where we store the
-  // symbol type enum.
-  // Storing in the object can be done without using more space in most cases,
-  // while storing it in the Symbol type would require 8 bytes.
-#define DEFINE_MEMBERS(TYPE, TYPE_CONSTANT, FIELD)                             \
-  explicit Symbol(TYPE* value) : ptr_(value) {                                 \
-    value->symbol_type_ = TYPE_CONSTANT;                                       \
-  }                                                                            \
-  const TYPE* FIELD() const {                                                  \
-    return type() == TYPE_CONSTANT ? static_cast<const TYPE*>(ptr_) : nullptr; \
-  }
-
-  DEFINE_MEMBERS(Descriptor, MESSAGE, descriptor)
-  DEFINE_MEMBERS(FieldDescriptor, FIELD, field_descriptor)
-  DEFINE_MEMBERS(OneofDescriptor, ONEOF, oneof_descriptor)
-  DEFINE_MEMBERS(EnumDescriptor, ENUM, enum_descriptor)
-  DEFINE_MEMBERS(ServiceDescriptor, SERVICE, service_descriptor)
-  DEFINE_MEMBERS(MethodDescriptor, METHOD, method_descriptor)
-  DEFINE_MEMBERS(FileDescriptor, FULL_PACKAGE, file_descriptor)
-
-  // We use a special node for subpackage FileDescriptor.
-  // It is potentially added to the table with multiple different names, so we
-  // need a separate place to put the name.
-  struct Subpackage : internal::SymbolBase {
-    int name_size;
-    const FileDescriptor* file;
-  };
-  DEFINE_MEMBERS(Subpackage, SUB_PACKAGE, sub_package_file_descriptor)
-
-  // Enum values have two different parents.
-  // We use two different identitied for the same object to determine the two
-  // different insertions in the map.
-  static Symbol EnumValue(EnumValueDescriptor* value, int n) {
-    Symbol s;
-    internal::SymbolBase* ptr;
-    if (n == 0) {
-      ptr = static_cast<internal::SymbolBaseN<0>*>(value);
-      ptr->symbol_type_ = ENUM_VALUE;
-    } else {
-      ptr = static_cast<internal::SymbolBaseN<1>*>(value);
-      ptr->symbol_type_ = ENUM_VALUE_OTHER_PARENT;
-    }
-    s.ptr_ = ptr;
-    return s;
-  }
-
-  const EnumValueDescriptor* enum_value_descriptor() const {
-    return type() == ENUM_VALUE
-               ? static_cast<const EnumValueDescriptor*>(
-                     static_cast<const internal::SymbolBaseN<0>*>(ptr_))
-           : type() == ENUM_VALUE_OTHER_PARENT
-               ? static_cast<const EnumValueDescriptor*>(
-                     static_cast<const internal::SymbolBaseN<1>*>(ptr_))
-               : nullptr;
-  }
-
-  // Not a real symbol.
-  // Only used for heterogeneous lookups and never actually inserted in the
-  // tables.
-  // TODO(b/215557658): If we templetize QueryKey on the expected object type we
-  // can skip the switches for the eq function altogether.
-  struct QueryKey : internal::SymbolBase {
-    StringPiece name;
-    const void* parent;
-    int field_number;
-
-    // Adaptor functions to look like a Symbol to the comparators.
-    StringPiece full_name() const { return name; }
-    std::pair<const void*, int> parent_number_key() const {
-      return {parent, field_number};
-    }
-    std::pair<const void*, StringPiece> parent_name_key() const {
-      return {parent, name};
-    }
-  };
-  // This constructor is implicit to allow for non-transparent lookups when
-  // necessary.
-  // For transparent lookup cases we query directly with the object without the
-  // type erasure layer.
-  Symbol(QueryKey& value) : ptr_(&value) {  // NOLINT
-    value.symbol_type_ = QUERY_KEY;
-  }
-  const QueryKey* query_key() const {
-    return type() == QUERY_KEY ? static_cast<const QueryKey*>(ptr_) : nullptr;
-  }
-#undef DEFINE_MEMBERS
-
-  Type type() const { return static_cast<Type>(ptr_->symbol_type_); }
-  bool IsNull() const { return type() == NULL_SYMBOL; }
-  bool IsType() const { return type() == MESSAGE || type() == ENUM; }
-  bool IsAggregate() const {
-    return IsType() || IsPackage() || type() == SERVICE;
-  }
-  bool IsPackage() const {
-    return type() == FULL_PACKAGE || type() == SUB_PACKAGE;
-  }
-
-  const FileDescriptor* GetFile() const {
-    switch (type()) {
-      case MESSAGE:
-        return descriptor()->file();
-      case FIELD:
-        return field_descriptor()->file();
-      case ONEOF:
-        return oneof_descriptor()->containing_type()->file();
-      case ENUM:
-        return enum_descriptor()->file();
-      case ENUM_VALUE:
-        return enum_value_descriptor()->type()->file();
-      case SERVICE:
-        return service_descriptor()->file();
-      case METHOD:
-        return method_descriptor()->service()->file();
-      case FULL_PACKAGE:
-        return file_descriptor();
-      case SUB_PACKAGE:
-        return sub_package_file_descriptor()->file;
-      default:
-        return nullptr;
-    }
-  }
-
-  StringPiece full_name() const {
-    switch (type()) {
-      case MESSAGE:
-        return descriptor()->full_name();
-      case FIELD:
-        return field_descriptor()->full_name();
-      case ONEOF:
-        return oneof_descriptor()->full_name();
-      case ENUM:
-        return enum_descriptor()->full_name();
-      case ENUM_VALUE:
-        return enum_value_descriptor()->full_name();
-      case SERVICE:
-        return service_descriptor()->full_name();
-      case METHOD:
-        return method_descriptor()->full_name();
-      case FULL_PACKAGE:
-        return file_descriptor()->package();
-      case SUB_PACKAGE:
-        return StringPiece(sub_package_file_descriptor()->file->package())
-            .substr(0, sub_package_file_descriptor()->name_size);
-      case QUERY_KEY:
-        return query_key()->full_name();
-      default:
-        GOOGLE_CHECK(false);
-    }
-    return "";
-  }
-
-  std::pair<const void*, StringPiece> parent_name_key() const {
-    const auto or_file = [&](const void* p) { return p ? p : GetFile(); };
-    switch (type()) {
-      case MESSAGE:
-        return {or_file(descriptor()->containing_type()), descriptor()->name()};
-      case FIELD: {
-        auto* field = field_descriptor();
-        return {or_file(field->is_extension() ? field->extension_scope()
-                                              : field->containing_type()),
-                field->name()};
-      }
-      case ONEOF:
-        return {oneof_descriptor()->containing_type(),
-                oneof_descriptor()->name()};
-      case ENUM:
-        return {or_file(enum_descriptor()->containing_type()),
-                enum_descriptor()->name()};
-      case ENUM_VALUE:
-        return {or_file(enum_value_descriptor()->type()->containing_type()),
-                enum_value_descriptor()->name()};
-      case ENUM_VALUE_OTHER_PARENT:
-        return {enum_value_descriptor()->type(),
-                enum_value_descriptor()->name()};
-      case SERVICE:
-        return {GetFile(), service_descriptor()->name()};
-      case METHOD:
-        return {method_descriptor()->service(), method_descriptor()->name()};
-      case QUERY_KEY:
-        return query_key()->parent_name_key();
-      default:
-        GOOGLE_CHECK(false);
-    }
-    return {};
-  }
-
-  std::pair<const void*, int> parent_number_key() const {
-    switch (type()) {
-      case FIELD:
-        return {field_descriptor()->containing_type(),
-                field_descriptor()->number()};
-      case ENUM_VALUE:
-        return {enum_value_descriptor()->type(),
-                enum_value_descriptor()->number()};
-      case QUERY_KEY:
-        return query_key()->parent_number_key();
-      default:
-        GOOGLE_CHECK(false);
-    }
-    return {};
-  }
-
- private:
-  const internal::SymbolBase* ptr_;
-};
-
-const FieldDescriptor::CppType
-    FieldDescriptor::kTypeToCppTypeMap[MAX_TYPE + 1] = {
-        static_cast<CppType>(0),  // 0 is reserved for errors
-
-        CPPTYPE_DOUBLE,   // TYPE_DOUBLE
-        CPPTYPE_FLOAT,    // TYPE_FLOAT
-        CPPTYPE_INT64,    // TYPE_INT64
-        CPPTYPE_UINT64,   // TYPE_UINT64
-        CPPTYPE_INT32,    // TYPE_INT32
-        CPPTYPE_UINT64,   // TYPE_FIXED64
-        CPPTYPE_UINT32,   // TYPE_FIXED32
-        CPPTYPE_BOOL,     // TYPE_BOOL
-        CPPTYPE_STRING,   // TYPE_STRING
-        CPPTYPE_MESSAGE,  // TYPE_GROUP
-        CPPTYPE_MESSAGE,  // TYPE_MESSAGE
-        CPPTYPE_STRING,   // TYPE_BYTES
-        CPPTYPE_UINT32,   // TYPE_UINT32
-        CPPTYPE_ENUM,     // TYPE_ENUM
-        CPPTYPE_INT32,    // TYPE_SFIXED32
-        CPPTYPE_INT64,    // TYPE_SFIXED64
-        CPPTYPE_INT32,    // TYPE_SINT32
-        CPPTYPE_INT64,    // TYPE_SINT64
-};
-
-const char* const FieldDescriptor::kTypeToName[MAX_TYPE + 1] = {
-    "ERROR",  // 0 is reserved for errors
-
-    "double",    // TYPE_DOUBLE
-    "float",     // TYPE_FLOAT
-    "int64",     // TYPE_INT64
-    "uint64",    // TYPE_UINT64
-    "int32",     // TYPE_INT32
-    "fixed64",   // TYPE_FIXED64
-    "fixed32",   // TYPE_FIXED32
-    "bool",      // TYPE_BOOL
-    "string",    // TYPE_STRING
-    "group",     // TYPE_GROUP
-    "message",   // TYPE_MESSAGE
-    "bytes",     // TYPE_BYTES
-    "uint32",    // TYPE_UINT32
-    "enum",      // TYPE_ENUM
-    "sfixed32",  // TYPE_SFIXED32
-    "sfixed64",  // TYPE_SFIXED64
-    "sint32",    // TYPE_SINT32
-    "sint64",    // TYPE_SINT64
-};
-
-const char* const FieldDescriptor::kCppTypeToName[MAX_CPPTYPE + 1] = {
-    "ERROR",  // 0 is reserved for errors
-
-    "int32",    // CPPTYPE_INT32
-    "int64",    // CPPTYPE_INT64
-    "uint32",   // CPPTYPE_UINT32
-    "uint64",   // CPPTYPE_UINT64
-    "double",   // CPPTYPE_DOUBLE
-    "float",    // CPPTYPE_FLOAT
-    "bool",     // CPPTYPE_BOOL
-    "enum",     // CPPTYPE_ENUM
-    "string",   // CPPTYPE_STRING
-    "message",  // CPPTYPE_MESSAGE
-};
-
-const char* const FieldDescriptor::kLabelToName[MAX_LABEL + 1] = {
-    "ERROR",  // 0 is reserved for errors
-
-    "optional",  // LABEL_OPTIONAL
-    "required",  // LABEL_REQUIRED
-    "repeated",  // LABEL_REPEATED
-};
-
-const char* FileDescriptor::SyntaxName(FileDescriptor::Syntax syntax) {
-  switch (syntax) {
-    case SYNTAX_PROTO2:
-      return "proto2";
-    case SYNTAX_PROTO3:
-      return "proto3";
-    case SYNTAX_UNKNOWN:
-      return "unknown";
-  }
-  GOOGLE_LOG(FATAL) << "can't reach here.";
-  return nullptr;
-}
-
-static const char* const kNonLinkedWeakMessageReplacementName = "google.protobuf.Empty";
-
-#if !defined(_MSC_VER) || (_MSC_VER >= 1900 && _MSC_VER < 1912)
-const int FieldDescriptor::kMaxNumber;
-const int FieldDescriptor::kFirstReservedNumber;
-const int FieldDescriptor::kLastReservedNumber;
-#endif
-
-namespace {
-
-std::string EnumValueToPascalCase(const std::string& input) {
-  bool next_upper = true;
-  std::string result;
-  result.reserve(input.size());
-
-  for (char character : input) {
-    if (character == '_') {
-      next_upper = true;
-    } else {
-      if (next_upper) {
-        result.push_back(ToUpper(character));
-      } else {
-        result.push_back(ToLower(character));
-      }
-      next_upper = false;
-    }
-  }
-
-  return result;
-}
-
-// Class to remove an enum prefix from enum values.
-class PrefixRemover {
- public:
-  PrefixRemover(StringPiece prefix) {
-    // Strip underscores and lower-case the prefix.
-    for (char character : prefix) {
-      if (character != '_') {
-        prefix_ += ascii_tolower(character);
-      }
-    }
-  }
-
-  // Tries to remove the enum prefix from this enum value.
-  // If this is not possible, returns the input verbatim.
-  std::string MaybeRemove(StringPiece str) {
-    // We can't just lowercase and strip str and look for a prefix.
-    // We need to properly recognize the difference between:
-    //
-    //   enum Foo {
-    //     FOO_BAR_BAZ = 0;
-    //     FOO_BARBAZ = 1;
-    //   }
-    //
-    // This is acceptable (though perhaps not advisable) because even when
-    // we PascalCase, these two will still be distinct (BarBaz vs. Barbaz).
-    size_t i, j;
-
-    // Skip past prefix_ in str if we can.
-    for (i = 0, j = 0; i < str.size() && j < prefix_.size(); i++) {
-      if (str[i] == '_') {
-        continue;
-      }
-
-      if (ascii_tolower(str[i]) != prefix_[j++]) {
-        return std::string(str);
-      }
-    }
-
-    // If we didn't make it through the prefix, we've failed to strip the
-    // prefix.
-    if (j < prefix_.size()) {
-      return std::string(str);
-    }
-
-    // Skip underscores between prefix and further characters.
-    while (i < str.size() && str[i] == '_') {
-      i++;
-    }
-
-    // Enum label can't be the empty string.
-    if (i == str.size()) {
-      return std::string(str);
-    }
-
-    // We successfully stripped the prefix.
-    str.remove_prefix(i);
-    return std::string(str);
-  }
-
- private:
-  std::string prefix_;
-};
-
-// A DescriptorPool contains a bunch of hash-maps to implement the
-// various Find*By*() methods.  Since hashtable lookups are O(1), it's
-// most efficient to construct a fixed set of large hash-maps used by
-// all objects in the pool rather than construct one or more small
-// hash-maps for each object.
-//
-// The keys to these hash-maps are (parent, name) or (parent, number) pairs.
-
-typedef std::pair<const void*, StringPiece> PointerStringPair;
-
-typedef std::pair<const Descriptor*, int> DescriptorIntPair;
-
-#define HASH_MAP std::unordered_map
-#define HASH_SET std::unordered_set
-#define HASH_FXN hash
-
-template <typename PairType>
-struct PointerIntegerPairHash {
-  size_t operator()(const PairType& p) const {
-    static const size_t prime1 = 16777499;
-    static const size_t prime2 = 16777619;
-    return reinterpret_cast<size_t>(p.first) * prime1 ^
-           static_cast<size_t>(p.second) * prime2;
-  }
-
-#ifdef _MSC_VER
-  // Used only by MSVC and platforms where hash_map is not available.
-  static const size_t bucket_size = 4;
-  static const size_t min_buckets = 8;
-#endif
-  inline bool operator()(const PairType& a, const PairType& b) const {
-    return a < b;
-  }
-};
-
-struct PointerStringPairHash {
-  size_t operator()(const PointerStringPair& p) const {
-    static const size_t prime = 16777619;
-    hash<StringPiece> string_hash;
-    return reinterpret_cast<size_t>(p.first) * prime ^
-           static_cast<size_t>(string_hash(p.second));
-  }
-
-#ifdef _MSC_VER
-  // Used only by MSVC and platforms where hash_map is not available.
-  static const size_t bucket_size = 4;
-  static const size_t min_buckets = 8;
-#endif
-  inline bool operator()(const PointerStringPair& a,
-                         const PointerStringPair& b) const {
-    return a < b;
-  }
-};
-
-
-struct SymbolByFullNameHash {
-  using is_transparent = void;
-
-  template <typename T>
-  size_t operator()(const T& s) const {
-    return HASH_FXN<StringPiece>{}(s.full_name());
-  }
-};
-struct SymbolByFullNameEq {
-  using is_transparent = void;
-
-  template <typename T, typename U>
-  bool operator()(const T& a, const U& b) const {
-    return a.full_name() == b.full_name();
-  }
-};
-using SymbolsByNameSet =
-    HASH_SET<Symbol, SymbolByFullNameHash, SymbolByFullNameEq>;
-
-struct SymbolByParentHash {
-  using is_transparent = void;
-
-  template <typename T>
-  size_t operator()(const T& s) const {
-    return PointerStringPairHash{}(s.parent_name_key());
-  }
-};
-struct SymbolByParentEq {
-  using is_transparent = void;
-
-  template <typename T, typename U>
-  bool operator()(const T& a, const U& b) const {
-    return a.parent_name_key() == b.parent_name_key();
-  }
-};
-using SymbolsByParentSet =
-    HASH_SET<Symbol, SymbolByParentHash, SymbolByParentEq>;
-
-typedef HASH_MAP<StringPiece, const FileDescriptor*,
-                 HASH_FXN<StringPiece>>
-    FilesByNameMap;
-
-typedef HASH_MAP<PointerStringPair, const FieldDescriptor*,
-                 PointerStringPairHash>
-    FieldsByNameMap;
-
-struct FieldsByNumberHash {
-  using is_transparent = void;
-
-  template <typename T>
-  size_t operator()(const T& s) const {
-    return PointerIntegerPairHash<std::pair<const void*, int>>{}(
-        s.parent_number_key());
-  }
-};
-struct FieldsByNumberEq {
-  using is_transparent = void;
-
-  template <typename T, typename U>
-  bool operator()(const T& a, const U& b) const {
-    return a.parent_number_key() == b.parent_number_key();
-  }
-};
-using FieldsByNumberSet =
-    HASH_SET<Symbol, FieldsByNumberHash, FieldsByNumberEq>;
-using EnumValuesByNumberSet = FieldsByNumberSet;
-
-// This is a map rather than a hash-map, since we use it to iterate
-// through all the extensions that extend a given Descriptor, and an
-// ordered data structure that implements lower_bound is convenient
-// for that.
-typedef std::map<DescriptorIntPair, const FieldDescriptor*>
-    ExtensionsGroupedByDescriptorMap;
-typedef HASH_MAP<std::string, const SourceCodeInfo_Location*>
-    LocationsByPathMap;
-
-std::set<std::string>* NewAllowedProto3Extendee() {
-  auto allowed_proto3_extendees = new std::set<std::string>;
-  const char* kOptionNames[] = {
-      "FileOptions",   "MessageOptions",   "FieldOptions",
-      "EnumOptions",   "EnumValueOptions", "ServiceOptions",
-      "MethodOptions", "OneofOptions",     "ExtensionRangeOptions"};
-  for (const char* option_name : kOptionNames) {
-    // descriptor.proto has a different package name in opensource. We allow
-    // both so the opensource protocol compiler can also compile internal
-    // proto3 files with custom options. See: b/27567912
-    allowed_proto3_extendees->insert(std::string("google.protobuf.") +
-                                     option_name);
-    // Split the word to trick the opensource processing scripts so they
-    // will keep the original package name.
-    allowed_proto3_extendees->insert(std::string("proto") + "2." + option_name);
-  }
-  return allowed_proto3_extendees;
-}
-
-// Checks whether the extendee type is allowed in proto3.
-// Only extensions to descriptor options are allowed. We use name comparison
-// instead of comparing the descriptor directly because the extensions may be
-// defined in a different pool.
-bool AllowedExtendeeInProto3(const std::string& name) {
-  static auto allowed_proto3_extendees =
-      internal::OnShutdownDelete(NewAllowedProto3Extendee());
-  return allowed_proto3_extendees->find(name) !=
-         allowed_proto3_extendees->end();
-}
-}  // anonymous namespace
-
-// Contains tables specific to a particular file.  These tables are not
-// modified once the file has been constructed, so they need not be
-// protected by a mutex.  This makes operations that depend only on the
-// contents of a single file -- e.g. Descriptor::FindFieldByName() --
-// lock-free.
-//
-// For historical reasons, the definitions of the methods of
-// FileDescriptorTables and DescriptorPool::Tables are interleaved below.
-// These used to be a single class.
-class FileDescriptorTables {
- public:
-  FileDescriptorTables();
-  ~FileDescriptorTables();
-
-  // Empty table, used with placeholder files.
-  inline static const FileDescriptorTables& GetEmptyInstance();
-
-  // -----------------------------------------------------------------
-  // Finding items.
-
-  // Returns a null Symbol (symbol.IsNull() is true) if not found.
-  inline Symbol FindNestedSymbol(const void* parent,
-                                 StringPiece name) const;
-
-  // These return nullptr if not found.
-  inline const FieldDescriptor* FindFieldByNumber(const Descriptor* parent,
-                                                  int number) const;
-  inline const FieldDescriptor* FindFieldByLowercaseName(
-      const void* parent, StringPiece lowercase_name) const;
-  inline const FieldDescriptor* FindFieldByCamelcaseName(
-      const void* parent, StringPiece camelcase_name) const;
-  inline const EnumValueDescriptor* FindEnumValueByNumber(
-      const EnumDescriptor* parent, int number) const;
-  // This creates a new EnumValueDescriptor if not found, in a thread-safe way.
-  inline const EnumValueDescriptor* FindEnumValueByNumberCreatingIfUnknown(
-      const EnumDescriptor* parent, int number) const;
-
-  // -----------------------------------------------------------------
-  // Adding items.
-
-  // These add items to the corresponding tables.  They return false if
-  // the key already exists in the table.
-  bool AddAliasUnderParent(const void* parent, const std::string& name,
-                           Symbol symbol);
-  bool AddFieldByNumber(FieldDescriptor* field);
-  bool AddEnumValueByNumber(EnumValueDescriptor* value);
-
-  // Populates p->first->locations_by_path_ from p->second.
-  // Unusual signature dictated by internal::call_once.
-  static void BuildLocationsByPath(
-      std::pair<const FileDescriptorTables*, const SourceCodeInfo*>* p);
-
-  // Returns the location denoted by the specified path through info,
-  // or nullptr if not found.
-  // The value of info must be that of the corresponding FileDescriptor.
-  // (Conceptually a pure function, but stateful as an optimisation.)
-  const SourceCodeInfo_Location* GetSourceLocation(
-      const std::vector<int>& path, const SourceCodeInfo* info) const;
-
-  // Must be called after BuildFileImpl(), even if the build failed and
-  // we are going to roll back to the last checkpoint.
-  void FinalizeTables();
-
- private:
-  const void* FindParentForFieldsByMap(const FieldDescriptor* field) const;
-  static void FieldsByLowercaseNamesLazyInitStatic(
-      const FileDescriptorTables* tables);
-  void FieldsByLowercaseNamesLazyInitInternal() const;
-  static void FieldsByCamelcaseNamesLazyInitStatic(
-      const FileDescriptorTables* tables);
-  void FieldsByCamelcaseNamesLazyInitInternal() const;
-
-  SymbolsByParentSet symbols_by_parent_;
-  mutable internal::once_flag fields_by_lowercase_name_once_;
-  mutable internal::once_flag fields_by_camelcase_name_once_;
-  // Make these fields atomic to avoid race conditions with
-  // GetEstimatedOwnedMemoryBytesSize. Once the pointer is set the map won't
-  // change anymore.
-  mutable std::atomic<const FieldsByNameMap*> fields_by_lowercase_name_{};
-  mutable std::atomic<const FieldsByNameMap*> fields_by_camelcase_name_{};
-  FieldsByNumberSet fields_by_number_;  // Not including extensions.
-  EnumValuesByNumberSet enum_values_by_number_;
-  mutable EnumValuesByNumberSet unknown_enum_values_by_number_
-      PROTOBUF_GUARDED_BY(unknown_enum_values_mu_);
-
-  // Populated on first request to save space, hence constness games.
-  mutable internal::once_flag locations_by_path_once_;
-  mutable LocationsByPathMap locations_by_path_;
-
-  // Mutex to protect the unknown-enum-value map due to dynamic
-  // EnumValueDescriptor creation on unknown values.
-  mutable internal::WrappedMutex unknown_enum_values_mu_;
-};
-
-namespace internal {
-
-// Small sequential allocator to be used within a single file.
-// Most of the memory for a single FileDescriptor and everything under it is
-// allocated in a single block of memory, with the FlatAllocator giving it out
-// in parts later.
-// The code first plans the total number of bytes needed by calling PlanArray
-// with all the allocations that will happen afterwards, then calls
-// FinalizePlanning passing the underlying allocator (the DescriptorPool::Tables
-// instance), and then proceeds to get the memory via
-// `AllocateArray`/`AllocateString` calls. The calls to PlanArray and
-// The calls have to match between planning and allocating, though not
-// necessarily in the same order.
-class FlatAllocator
-    : public decltype(ApplyTypeList<FlatAllocatorImpl>(
-          SortByAlignment<char, std::string, SourceCodeInfo,
-                          FileDescriptorTables,
-                          // Option types
-                          MessageOptions, FieldOptions, EnumOptions,
-                          EnumValueOptions, ExtensionRangeOptions, OneofOptions,
-                          ServiceOptions, MethodOptions, FileOptions>())) {};
-
-}  // namespace internal
-
-// ===================================================================
-// DescriptorPool::Tables
-
-class DescriptorPool::Tables {
- public:
-  Tables();
-  ~Tables();
-
-  // Record the current state of the tables to the stack of checkpoints.
-  // Each call to AddCheckpoint() must be paired with exactly one call to either
-  // ClearLastCheckpoint() or RollbackToLastCheckpoint().
-  //
-  // This is used when building files, since some kinds of validation errors
-  // cannot be detected until the file's descriptors have already been added to
-  // the tables.
-  //
-  // This supports recursive checkpoints, since building a file may trigger
-  // recursive building of other files. Note that recursive checkpoints are not
-  // normally necessary; explicit dependencies are built prior to checkpointing.
-  // So although we recursively build transitive imports, there is at most one
-  // checkpoint in the stack during dependency building.
-  //
-  // Recursive checkpoints only arise during cross-linking of the descriptors.
-  // Symbol references must be resolved, via DescriptorBuilder::FindSymbol and
-  // friends. If the pending file references an unknown symbol
-  // (e.g., it is not defined in the pending file's explicit dependencies), and
-  // the pool is using a fallback database, and that database contains a file
-  // defining that symbol, and that file has not yet been built by the pool,
-  // the pool builds the file during cross-linking, leading to another
-  // checkpoint.
-  void AddCheckpoint();
-
-  // Mark the last checkpoint as having cleared successfully, removing it from
-  // the stack. If the stack is empty, all pending symbols will be committed.
-  //
-  // Note that this does not guarantee that the symbols added since the last
-  // checkpoint won't be rolled back: if a checkpoint gets rolled back,
-  // everything past that point gets rolled back, including symbols added after
-  // checkpoints that were pushed onto the stack after it and marked as cleared.
-  void ClearLastCheckpoint();
-
-  // Roll back the Tables to the state of the checkpoint at the top of the
-  // stack, removing everything that was added after that point.
-  void RollbackToLastCheckpoint();
-
-  // The stack of files which are currently being built.  Used to detect
-  // cyclic dependencies when loading files from a DescriptorDatabase.  Not
-  // used when fallback_database_ == nullptr.
-  std::vector<std::string> pending_files_;
-
-  // A set of files which we have tried to load from the fallback database
-  // and encountered errors.  We will not attempt to load them again during
-  // execution of the current public API call, but for compatibility with
-  // legacy clients, this is cleared at the beginning of each public API call.
-  // Not used when fallback_database_ == nullptr.
-  HASH_SET<std::string> known_bad_files_;
-
-  // A set of symbols which we have tried to load from the fallback database
-  // and encountered errors. We will not attempt to load them again during
-  // execution of the current public API call, but for compatibility with
-  // legacy clients, this is cleared at the beginning of each public API call.
-  HASH_SET<std::string> known_bad_symbols_;
-
-  // The set of descriptors for which we've already loaded the full
-  // set of extensions numbers from fallback_database_.
-  HASH_SET<const Descriptor*> extensions_loaded_from_db_;
-
-  // Maps type name to Descriptor::WellKnownType.  This is logically global
-  // and const, but we make it a member here to simplify its construction and
-  // destruction.  This only has 20-ish entries and is one per DescriptorPool,
-  // so the overhead is small.
-  HASH_MAP<std::string, Descriptor::WellKnownType> well_known_types_;
-
-  // -----------------------------------------------------------------
-  // Finding items.
-
-  // Find symbols.  This returns a null Symbol (symbol.IsNull() is true)
-  // if not found.
-  inline Symbol FindSymbol(StringPiece key) const;
-
-  // This implements the body of DescriptorPool::Find*ByName().  It should
-  // really be a private method of DescriptorPool, but that would require
-  // declaring Symbol in descriptor.h, which would drag all kinds of other
-  // stuff into the header.  Yay C++.
-  Symbol FindByNameHelper(const DescriptorPool* pool, StringPiece name);
-
-  // These return nullptr if not found.
-  inline const FileDescriptor* FindFile(StringPiece key) const;
-  inline const FieldDescriptor* FindExtension(const Descriptor* extendee,
-                                              int number) const;
-  inline void FindAllExtensions(const Descriptor* extendee,
-                                std::vector<const FieldDescriptor*>* out) const;
-
-  // -----------------------------------------------------------------
-  // Adding items.
-
-  // These add items to the corresponding tables.  They return false if
-  // the key already exists in the table.  For AddSymbol(), the string passed
-  // in must be one that was constructed using AllocateString(), as it will
-  // be used as a key in the symbols_by_name_ map without copying.
-  bool AddSymbol(const std::string& full_name, Symbol symbol);
-  bool AddFile(const FileDescriptor* file);
-  bool AddExtension(const FieldDescriptor* field);
-
-  // -----------------------------------------------------------------
-  // Allocating memory.
-
-  // Allocate an object which will be reclaimed when the pool is
-  // destroyed.  Note that the object's destructor will never be called,
-  // so its fields must be plain old data (primitive data types and
-  // pointers).  All of the descriptor types are such objects.
-  template <typename Type>
-  Type* Allocate();
-
-  // Allocate some bytes which will be reclaimed when the pool is
-  // destroyed. Memory is aligned to 8 bytes.
-  void* AllocateBytes(int size);
-
-  // Create a FlatAllocation for the corresponding sizes.
-  // All objects within it will be default constructed.
-  // The whole allocation, including the non-trivial objects within, will be
-  // destroyed with the pool.
-  template <typename... T>
-  internal::FlatAllocator::Allocation* CreateFlatAlloc(
-      const TypeMap<IntT, T...>& sizes);
-
-
- private:
-  // All memory allocated in the pool.  Must be first as other objects can
-  // point into these.
-  struct MiscDeleter {
-    void operator()(int* p) const { internal::SizedDelete(p, *p + 8); }
-  };
-  // Miscellaneous allocations are length prefixed. The paylaod is 8 bytes after
-  // the `int` that contains the size. This keeps the payload aligned.
-  std::vector<std::unique_ptr<int, MiscDeleter>> misc_allocs_;
-  struct FlatAllocDeleter {
-    void operator()(internal::FlatAllocator::Allocation* p) const {
-      p->Destroy();
-    }
-  };
-  std::vector<
-      std::unique_ptr<internal::FlatAllocator::Allocation, FlatAllocDeleter>>
-      flat_allocs_;
-
-  SymbolsByNameSet symbols_by_name_;
-  FilesByNameMap files_by_name_;
-  ExtensionsGroupedByDescriptorMap extensions_;
-
-  struct CheckPoint {
-    explicit CheckPoint(const Tables* tables)
-        : flat_allocations_before_checkpoint(
-              static_cast<int>(tables->flat_allocs_.size())),
-          misc_allocations_before_checkpoint(
-              static_cast<int>(tables->misc_allocs_.size())),
-          pending_symbols_before_checkpoint(
-              tables->symbols_after_checkpoint_.size()),
-          pending_files_before_checkpoint(
-              tables->files_after_checkpoint_.size()),
-          pending_extensions_before_checkpoint(
-              tables->extensions_after_checkpoint_.size()) {}
-    int flat_allocations_before_checkpoint;
-    int misc_allocations_before_checkpoint;
-    int pending_symbols_before_checkpoint;
-    int pending_files_before_checkpoint;
-    int pending_extensions_before_checkpoint;
-  };
-  std::vector<CheckPoint> checkpoints_;
-  std::vector<Symbol> symbols_after_checkpoint_;
-  std::vector<const FileDescriptor*> files_after_checkpoint_;
-  std::vector<DescriptorIntPair> extensions_after_checkpoint_;
-};
-
-DescriptorPool::Tables::Tables() {
-  well_known_types_.insert({
-      {"google.protobuf.DoubleValue", Descriptor::WELLKNOWNTYPE_DOUBLEVALUE},
-      {"google.protobuf.FloatValue", Descriptor::WELLKNOWNTYPE_FLOATVALUE},
-      {"google.protobuf.Int64Value", Descriptor::WELLKNOWNTYPE_INT64VALUE},
-      {"google.protobuf.UInt64Value", Descriptor::WELLKNOWNTYPE_UINT64VALUE},
-      {"google.protobuf.Int32Value", Descriptor::WELLKNOWNTYPE_INT32VALUE},
-      {"google.protobuf.UInt32Value", Descriptor::WELLKNOWNTYPE_UINT32VALUE},
-      {"google.protobuf.StringValue", Descriptor::WELLKNOWNTYPE_STRINGVALUE},
-      {"google.protobuf.BytesValue", Descriptor::WELLKNOWNTYPE_BYTESVALUE},
-      {"google.protobuf.BoolValue", Descriptor::WELLKNOWNTYPE_BOOLVALUE},
-      {"google.protobuf.Any", Descriptor::WELLKNOWNTYPE_ANY},
-      {"google.protobuf.FieldMask", Descriptor::WELLKNOWNTYPE_FIELDMASK},
-      {"google.protobuf.Duration", Descriptor::WELLKNOWNTYPE_DURATION},
-      {"google.protobuf.Timestamp", Descriptor::WELLKNOWNTYPE_TIMESTAMP},
-      {"google.protobuf.Value", Descriptor::WELLKNOWNTYPE_VALUE},
-      {"google.protobuf.ListValue", Descriptor::WELLKNOWNTYPE_LISTVALUE},
-      {"google.protobuf.Struct", Descriptor::WELLKNOWNTYPE_STRUCT},
-  });
-}
-
-DescriptorPool::Tables::~Tables() { GOOGLE_DCHECK(checkpoints_.empty()); }
-
-FileDescriptorTables::FileDescriptorTables() {}
-
-FileDescriptorTables::~FileDescriptorTables() {
-  delete fields_by_lowercase_name_.load(std::memory_order_acquire);
-  delete fields_by_camelcase_name_.load(std::memory_order_acquire);
-}
-
-inline const FileDescriptorTables& FileDescriptorTables::GetEmptyInstance() {
-  static auto file_descriptor_tables =
-      internal::OnShutdownDelete(new FileDescriptorTables());
-  return *file_descriptor_tables;
-}
-
-void DescriptorPool::Tables::AddCheckpoint() {
-  checkpoints_.push_back(CheckPoint(this));
-}
-
-void DescriptorPool::Tables::ClearLastCheckpoint() {
-  GOOGLE_DCHECK(!checkpoints_.empty());
-  checkpoints_.pop_back();
-  if (checkpoints_.empty()) {
-    // All checkpoints have been cleared: we can now commit all of the pending
-    // data.
-    symbols_after_checkpoint_.clear();
-    files_after_checkpoint_.clear();
-    extensions_after_checkpoint_.clear();
-  }
-}
-
-void DescriptorPool::Tables::RollbackToLastCheckpoint() {
-  GOOGLE_DCHECK(!checkpoints_.empty());
-  const CheckPoint& checkpoint = checkpoints_.back();
-
-  for (size_t i = checkpoint.pending_symbols_before_checkpoint;
-       i < symbols_after_checkpoint_.size(); i++) {
-    symbols_by_name_.erase(symbols_after_checkpoint_[i]);
-  }
-  for (size_t i = checkpoint.pending_files_before_checkpoint;
-       i < files_after_checkpoint_.size(); i++) {
-    files_by_name_.erase(files_after_checkpoint_[i]->name());
-  }
-  for (size_t i = checkpoint.pending_extensions_before_checkpoint;
-       i < extensions_after_checkpoint_.size(); i++) {
-    extensions_.erase(extensions_after_checkpoint_[i]);
-  }
-
-  symbols_after_checkpoint_.resize(
-      checkpoint.pending_symbols_before_checkpoint);
-  files_after_checkpoint_.resize(checkpoint.pending_files_before_checkpoint);
-  extensions_after_checkpoint_.resize(
-      checkpoint.pending_extensions_before_checkpoint);
-
-  flat_allocs_.resize(checkpoint.flat_allocations_before_checkpoint);
-  misc_allocs_.resize(checkpoint.misc_allocations_before_checkpoint);
-  checkpoints_.pop_back();
-}
-
-// -------------------------------------------------------------------
-
-inline Symbol DescriptorPool::Tables::FindSymbol(StringPiece key) const {
-  Symbol::QueryKey name;
-  name.name = key;
-  auto it = symbols_by_name_.find(name);
-  return it == symbols_by_name_.end() ? Symbol() : *it;
-}
-
-inline Symbol FileDescriptorTables::FindNestedSymbol(
-    const void* parent, StringPiece name) const {
-  Symbol::QueryKey query;
-  query.name = name;
-  query.parent = parent;
-  auto it = symbols_by_parent_.find(query);
-  return it == symbols_by_parent_.end() ? Symbol() : *it;
-}
-
-Symbol DescriptorPool::Tables::FindByNameHelper(const DescriptorPool* pool,
-                                                StringPiece name) {
-  if (pool->mutex_ != nullptr) {
-    // Fast path: the Symbol is already cached.  This is just a hash lookup.
-    ReaderMutexLock lock(pool->mutex_);
-    if (known_bad_symbols_.empty() && known_bad_files_.empty()) {
-      Symbol result = FindSymbol(name);
-      if (!result.IsNull()) return result;
-    }
-  }
-  MutexLockMaybe lock(pool->mutex_);
-  if (pool->fallback_database_ != nullptr) {
-    known_bad_symbols_.clear();
-    known_bad_files_.clear();
-  }
-  Symbol result = FindSymbol(name);
-
-  if (result.IsNull() && pool->underlay_ != nullptr) {
-    // Symbol not found; check the underlay.
-    result = pool->underlay_->tables_->FindByNameHelper(pool->underlay_, name);
-  }
-
-  if (result.IsNull()) {
-    // Symbol still not found, so check fallback database.
-    if (pool->TryFindSymbolInFallbackDatabase(name)) {
-      result = FindSymbol(name);
-    }
-  }
-
-  return result;
-}
-
-inline const FileDescriptor* DescriptorPool::Tables::FindFile(
-    StringPiece key) const {
-  return FindPtrOrNull(files_by_name_, key);
-}
-
-inline const FieldDescriptor* FileDescriptorTables::FindFieldByNumber(
-    const Descriptor* parent, int number) const {
-  // If `number` is within the sequential range, just index into the parent
-  // without doing a table lookup.
-  if (parent != nullptr &&  //
-      1 <= number && number <= parent->sequential_field_limit_) {
-    return parent->field(number - 1);
-  }
-
-  Symbol::QueryKey query;
-  query.parent = parent;
-  query.field_number = number;
-
-  auto it = fields_by_number_.find(query);
-  return it == fields_by_number_.end() ? nullptr : it->field_descriptor();
-}
-
-const void* FileDescriptorTables::FindParentForFieldsByMap(
-    const FieldDescriptor* field) const {
-  if (field->is_extension()) {
-    if (field->extension_scope() == nullptr) {
-      return field->file();
-    } else {
-      return field->extension_scope();
-    }
-  } else {
-    return field->containing_type();
-  }
-}
-
-void FileDescriptorTables::FieldsByLowercaseNamesLazyInitStatic(
-    const FileDescriptorTables* tables) {
-  tables->FieldsByLowercaseNamesLazyInitInternal();
-}
-
-void FileDescriptorTables::FieldsByLowercaseNamesLazyInitInternal() const {
-  auto* map = new FieldsByNameMap;
-  for (Symbol symbol : symbols_by_parent_) {
-    const FieldDescriptor* field = symbol.field_descriptor();
-    if (!field) continue;
-    (*map)[{FindParentForFieldsByMap(field), field->lowercase_name().c_str()}] =
-        field;
-  }
-  fields_by_lowercase_name_.store(map, std::memory_order_release);
-}
-
-inline const FieldDescriptor* FileDescriptorTables::FindFieldByLowercaseName(
-    const void* parent, StringPiece lowercase_name) const {
-  internal::call_once(
-      fields_by_lowercase_name_once_,
-      &FileDescriptorTables::FieldsByLowercaseNamesLazyInitStatic, this);
-  return FindPtrOrNull(
-      *fields_by_lowercase_name_.load(std::memory_order_acquire),
-      PointerStringPair(parent, lowercase_name));
-}
-
-void FileDescriptorTables::FieldsByCamelcaseNamesLazyInitStatic(
-    const FileDescriptorTables* tables) {
-  tables->FieldsByCamelcaseNamesLazyInitInternal();
-}
-
-void FileDescriptorTables::FieldsByCamelcaseNamesLazyInitInternal() const {
-  auto* map = new FieldsByNameMap;
-  for (Symbol symbol : symbols_by_parent_) {
-    const FieldDescriptor* field = symbol.field_descriptor();
-    if (!field) continue;
-    (*map)[{FindParentForFieldsByMap(field), field->camelcase_name().c_str()}] =
-        field;
-  }
-  fields_by_camelcase_name_.store(map, std::memory_order_release);
-}
-
-inline const FieldDescriptor* FileDescriptorTables::FindFieldByCamelcaseName(
-    const void* parent, StringPiece camelcase_name) const {
-  internal::call_once(
-      fields_by_camelcase_name_once_,
-      FileDescriptorTables::FieldsByCamelcaseNamesLazyInitStatic, this);
-  return FindPtrOrNull(
-      *fields_by_camelcase_name_.load(std::memory_order_acquire),
-      PointerStringPair(parent, camelcase_name));
-}
-
-inline const EnumValueDescriptor* FileDescriptorTables::FindEnumValueByNumber(
-    const EnumDescriptor* parent, int number) const {
-  // If `number` is within the sequential range, just index into the parent
-  // without doing a table lookup.
-  const int base = parent->value(0)->number();
-  if (base <= number &&
-      number <= static_cast<int64_t>(base) + parent->sequential_value_limit_) {
-    return parent->value(number - base);
-  }
-
-  Symbol::QueryKey query;
-  query.parent = parent;
-  query.field_number = number;
-
-  auto it = enum_values_by_number_.find(query);
-  return it == enum_values_by_number_.end() ? nullptr
-                                            : it->enum_value_descriptor();
-}
-
-inline const EnumValueDescriptor*
-FileDescriptorTables::FindEnumValueByNumberCreatingIfUnknown(
-    const EnumDescriptor* parent, int number) const {
-  // First try, with map of compiled-in values.
-  {
-    const auto* value = FindEnumValueByNumber(parent, number);
-    if (value != nullptr) {
-      return value;
-    }
-  }
-
-  Symbol::QueryKey query;
-  query.parent = parent;
-  query.field_number = number;
-
-  // Second try, with reader lock held on unknown enum values: common case.
-  {
-    ReaderMutexLock l(&unknown_enum_values_mu_);
-    auto it = unknown_enum_values_by_number_.find(query);
-    if (it != unknown_enum_values_by_number_.end() &&
-        it->enum_value_descriptor() != nullptr) {
-      return it->enum_value_descriptor();
-    }
-  }
-  // If not found, try again with writer lock held, and create new descriptor if
-  // necessary.
-  {
-    WriterMutexLock l(&unknown_enum_values_mu_);
-    auto it = unknown_enum_values_by_number_.find(query);
-    if (it != unknown_enum_values_by_number_.end() &&
-        it->enum_value_descriptor() != nullptr) {
-      return it->enum_value_descriptor();
-    }
-
-    // Create an EnumValueDescriptor dynamically. We don't insert it into the
-    // EnumDescriptor (it's not a part of the enum as originally defined), but
-    // we do insert it into the table so that we can return the same pointer
-    // later.
-    std::string enum_value_name = StringPrintf(
-        "UNKNOWN_ENUM_VALUE_%s_%d", parent->name().c_str(), number);
-    auto* pool = DescriptorPool::generated_pool();
-    auto* tables = const_cast<DescriptorPool::Tables*>(pool->tables_.get());
-    internal::FlatAllocator alloc;
-    alloc.PlanArray<EnumValueDescriptor>(1);
-    alloc.PlanArray<std::string>(2);
-
-    {
-      // Must lock the pool because we will do allocations in the shared arena.
-      MutexLockMaybe l2(pool->mutex_);
-      alloc.FinalizePlanning(tables);
-    }
-    EnumValueDescriptor* result = alloc.AllocateArray<EnumValueDescriptor>(1);
-    result->all_names_ = alloc.AllocateStrings(
-        enum_value_name,
-        StrCat(parent->full_name(), ".", enum_value_name));
-    result->number_ = number;
-    result->type_ = parent;
-    result->options_ = &EnumValueOptions::default_instance();
-    unknown_enum_values_by_number_.insert(Symbol::EnumValue(result, 0));
-    return result;
-  }
-}
-
-inline const FieldDescriptor* DescriptorPool::Tables::FindExtension(
-    const Descriptor* extendee, int number) const {
-  return FindPtrOrNull(extensions_, std::make_pair(extendee, number));
-}
-
-inline void DescriptorPool::Tables::FindAllExtensions(
-    const Descriptor* extendee,
-    std::vector<const FieldDescriptor*>* out) const {
-  ExtensionsGroupedByDescriptorMap::const_iterator it =
-      extensions_.lower_bound(std::make_pair(extendee, 0));
-  for (; it != extensions_.end() && it->first.first == extendee; ++it) {
-    out->push_back(it->second);
-  }
-}
-
-// -------------------------------------------------------------------
-
-bool DescriptorPool::Tables::AddSymbol(const std::string& full_name,
-                                       Symbol symbol) {
-  GOOGLE_DCHECK_EQ(full_name, symbol.full_name());
-  if (symbols_by_name_.insert(symbol).second) {
-    symbols_after_checkpoint_.push_back(symbol);
-    return true;
-  } else {
-    return false;
-  }
-}
-
-bool FileDescriptorTables::AddAliasUnderParent(const void* parent,
-                                               const std::string& name,
-                                               Symbol symbol) {
-  GOOGLE_DCHECK_EQ(name, symbol.parent_name_key().second);
-  GOOGLE_DCHECK_EQ(parent, symbol.parent_name_key().first);
-  return symbols_by_parent_.insert(symbol).second;
-}
-
-bool DescriptorPool::Tables::AddFile(const FileDescriptor* file) {
-  if (InsertIfNotPresent(&files_by_name_, file->name(), file)) {
-    files_after_checkpoint_.push_back(file);
-    return true;
-  } else {
-    return false;
-  }
-}
-
-void FileDescriptorTables::FinalizeTables() {}
-
-bool FileDescriptorTables::AddFieldByNumber(FieldDescriptor* field) {
-  // Skip fields that are at the start of the sequence.
-  if (field->containing_type() != nullptr && field->number() >= 1 &&
-      field->number() <= field->containing_type()->sequential_field_limit_) {
-    if (field->is_extension()) {
-      // Conflicts with the field that already exists in the sequential range.
-      return false;
-    }
-    // Only return true if the field at that index matches. Otherwise it
-    // conflicts with the existing field in the sequential range.
-    return field->containing_type()->field(field->number() - 1) == field;
-  }
-
-  return fields_by_number_.insert(Symbol(field)).second;
-}
-
-bool FileDescriptorTables::AddEnumValueByNumber(EnumValueDescriptor* value) {
-  // Skip values that are at the start of the sequence.
-  const int base = value->type()->value(0)->number();
-  if (base <= value->number() &&
-      value->number() <=
-          static_cast<int64_t>(base) + value->type()->sequential_value_limit_)
-    return true;
-  return enum_values_by_number_.insert(Symbol::EnumValue(value, 0)).second;
-}
-
-bool DescriptorPool::Tables::AddExtension(const FieldDescriptor* field) {
-  DescriptorIntPair key(field->containing_type(), field->number());
-  if (InsertIfNotPresent(&extensions_, key, field)) {
-    extensions_after_checkpoint_.push_back(key);
-    return true;
-  } else {
-    return false;
-  }
-}
-
-// -------------------------------------------------------------------
-
-template <typename Type>
-Type* DescriptorPool::Tables::Allocate() {
-  static_assert(std::is_trivially_destructible<Type>::value, "");
-  static_assert(alignof(Type) <= 8, "");
-  return ::new (AllocateBytes(sizeof(Type))) Type{};
-}
-
-void* DescriptorPool::Tables::AllocateBytes(int size) {
-  if (size == 0) return nullptr;
-  void* p = ::operator new(size + RoundUpTo<8>(sizeof(int)));
-  int* sizep = static_cast<int*>(p);
-  misc_allocs_.emplace_back(sizep);
-  *sizep = size;
-  return static_cast<char*>(p) + RoundUpTo<8>(sizeof(int));
-}
-
-template <typename... T>
-internal::FlatAllocator::Allocation* DescriptorPool::Tables::CreateFlatAlloc(
-    const TypeMap<IntT, T...>& sizes) {
-  auto ends = CalculateEnds(sizes);
-  using FlatAlloc = internal::FlatAllocator::Allocation;
-
-  int last_end = ends.template Get<
-      typename std::tuple_element<sizeof...(T) - 1, std::tuple<T...>>::type>();
-  size_t total_size =
-      last_end + RoundUpTo<FlatAlloc::kMaxAlign>(sizeof(FlatAlloc));
-  char* data = static_cast<char*>(::operator new(total_size));
-  auto* res = ::new (data) FlatAlloc(ends);
-  flat_allocs_.emplace_back(res);
-
-  return res;
-}
-
-void FileDescriptorTables::BuildLocationsByPath(
-    std::pair<const FileDescriptorTables*, const SourceCodeInfo*>* p) {
-  for (int i = 0, len = p->second->location_size(); i < len; ++i) {
-    const SourceCodeInfo_Location* loc = &p->second->location().Get(i);
-    p->first->locations_by_path_[Join(loc->path(), ",")] = loc;
-  }
-}
-
-const SourceCodeInfo_Location* FileDescriptorTables::GetSourceLocation(
-    const std::vector<int>& path, const SourceCodeInfo* info) const {
-  std::pair<const FileDescriptorTables*, const SourceCodeInfo*> p(
-      std::make_pair(this, info));
-  internal::call_once(locations_by_path_once_,
-                      FileDescriptorTables::BuildLocationsByPath, &p);
-  return FindPtrOrNull(locations_by_path_, Join(path, ","));
-}
-
-// ===================================================================
-// DescriptorPool
-
-DescriptorPool::ErrorCollector::~ErrorCollector() {}
-
-DescriptorPool::DescriptorPool()
-    : mutex_(nullptr),
-      fallback_database_(nullptr),
-      default_error_collector_(nullptr),
-      underlay_(nullptr),
-      tables_(new Tables),
-      enforce_dependencies_(true),
-      lazily_build_dependencies_(false),
-      allow_unknown_(false),
-      enforce_weak_(false),
-      disallow_enforce_utf8_(false) {}
-
-DescriptorPool::DescriptorPool(DescriptorDatabase* fallback_database,
-                               ErrorCollector* error_collector)
-    : mutex_(new internal::WrappedMutex),
-      fallback_database_(fallback_database),
-      default_error_collector_(error_collector),
-      underlay_(nullptr),
-      tables_(new Tables),
-      enforce_dependencies_(true),
-      lazily_build_dependencies_(false),
-      allow_unknown_(false),
-      enforce_weak_(false),
-      disallow_enforce_utf8_(false) {}
-
-DescriptorPool::DescriptorPool(const DescriptorPool* underlay)
-    : mutex_(nullptr),
-      fallback_database_(nullptr),
-      default_error_collector_(nullptr),
-      underlay_(underlay),
-      tables_(new Tables),
-      enforce_dependencies_(true),
-      lazily_build_dependencies_(false),
-      allow_unknown_(false),
-      enforce_weak_(false),
-      disallow_enforce_utf8_(false) {}
-
-DescriptorPool::~DescriptorPool() {
-  if (mutex_ != nullptr) delete mutex_;
-}
-
-// DescriptorPool::BuildFile() defined later.
-// DescriptorPool::BuildFileCollectingErrors() defined later.
-
-void DescriptorPool::InternalDontEnforceDependencies() {
-  enforce_dependencies_ = false;
-}
-
-void DescriptorPool::AddUnusedImportTrackFile(ConstStringParam file_name,
-                                              bool is_error) {
-  unused_import_track_files_[std::string(file_name)] = is_error;
-}
-
-void DescriptorPool::ClearUnusedImportTrackFiles() {
-  unused_import_track_files_.clear();
-}
-
-bool DescriptorPool::InternalIsFileLoaded(ConstStringParam filename) const {
-  MutexLockMaybe lock(mutex_);
-  return tables_->FindFile(filename) != nullptr;
-}
-
-// generated_pool ====================================================
-
-namespace {
-
-
-EncodedDescriptorDatabase* GeneratedDatabase() {
-  static auto generated_database =
-      internal::OnShutdownDelete(new EncodedDescriptorDatabase());
-  return generated_database;
-}
-
-DescriptorPool* NewGeneratedPool() {
-  auto generated_pool = new DescriptorPool(GeneratedDatabase());
-  generated_pool->InternalSetLazilyBuildDependencies();
-  return generated_pool;
-}
-
-}  // anonymous namespace
-
-DescriptorDatabase* DescriptorPool::internal_generated_database() {
-  return GeneratedDatabase();
-}
-
-DescriptorPool* DescriptorPool::internal_generated_pool() {
-  static DescriptorPool* generated_pool =
-      internal::OnShutdownDelete(NewGeneratedPool());
-  return generated_pool;
-}
-
-const DescriptorPool* DescriptorPool::generated_pool() {
-  const DescriptorPool* pool = internal_generated_pool();
-  // Ensure that descriptor.proto has been registered in the generated pool.
-  DescriptorProto::descriptor();
-  return pool;
-}
-
-
-void DescriptorPool::InternalAddGeneratedFile(
-    const void* encoded_file_descriptor, int size) {
-  // So, this function is called in the process of initializing the
-  // descriptors for generated proto classes.  Each generated .pb.cc file
-  // has an internal procedure called AddDescriptors() which is called at
-  // process startup, and that function calls this one in order to register
-  // the raw bytes of the FileDescriptorProto representing the file.
-  //
-  // We do not actually construct the descriptor objects right away.  We just
-  // hang on to the bytes until they are actually needed.  We actually construct
-  // the descriptor the first time one of the following things happens:
-  // * Someone calls a method like descriptor(), GetDescriptor(), or
-  //   GetReflection() on the generated types, which requires returning the
-  //   descriptor or an object based on it.
-  // * Someone looks up the descriptor in DescriptorPool::generated_pool().
-  //
-  // Once one of these happens, the DescriptorPool actually parses the
-  // FileDescriptorProto and generates a FileDescriptor (and all its children)
-  // based on it.
-  //
-  // Note that FileDescriptorProto is itself a generated protocol message.
-  // Therefore, when we parse one, we have to be very careful to avoid using
-  // any descriptor-based operations, since this might cause infinite recursion
-  // or deadlock.
-  GOOGLE_CHECK(GeneratedDatabase()->Add(encoded_file_descriptor, size));
-}
-
-
-// Find*By* methods ==================================================
-
-// TODO(kenton):  There's a lot of repeated code here, but I'm not sure if
-//   there's any good way to factor it out.  Think about this some time when
-//   there's nothing more important to do (read: never).
-
-const FileDescriptor* DescriptorPool::FindFileByName(
-    ConstStringParam name) const {
-  MutexLockMaybe lock(mutex_);
-  if (fallback_database_ != nullptr) {
-    tables_->known_bad_symbols_.clear();
-    tables_->known_bad_files_.clear();
-  }
-  const FileDescriptor* result = tables_->FindFile(name);
-  if (result != nullptr) return result;
-  if (underlay_ != nullptr) {
-    result = underlay_->FindFileByName(name);
-    if (result != nullptr) return result;
-  }
-  if (TryFindFileInFallbackDatabase(name)) {
-    result = tables_->FindFile(name);
-    if (result != nullptr) return result;
-  }
-  return nullptr;
-}
-
-const FileDescriptor* DescriptorPool::FindFileContainingSymbol(
-    ConstStringParam symbol_name) const {
-  MutexLockMaybe lock(mutex_);
-  if (fallback_database_ != nullptr) {
-    tables_->known_bad_symbols_.clear();
-    tables_->known_bad_files_.clear();
-  }
-  Symbol result = tables_->FindSymbol(symbol_name);
-  if (!result.IsNull()) return result.GetFile();
-  if (underlay_ != nullptr) {
-    const FileDescriptor* file_result =
-        underlay_->FindFileContainingSymbol(symbol_name);
-    if (file_result != nullptr) return file_result;
-  }
-  if (TryFindSymbolInFallbackDatabase(symbol_name)) {
-    result = tables_->FindSymbol(symbol_name);
-    if (!result.IsNull()) return result.GetFile();
-  }
-  return nullptr;
-}
-
-const Descriptor* DescriptorPool::FindMessageTypeByName(
-    ConstStringParam name) const {
-  return tables_->FindByNameHelper(this, name).descriptor();
-}
-
-const FieldDescriptor* DescriptorPool::FindFieldByName(
-    ConstStringParam name) const {
-  if (const FieldDescriptor* field =
-          tables_->FindByNameHelper(this, name).field_descriptor()) {
-    if (!field->is_extension()) {
-      return field;
-    }
-  }
-  return nullptr;
-}
-
-const FieldDescriptor* DescriptorPool::FindExtensionByName(
-    ConstStringParam name) const {
-  if (const FieldDescriptor* field =
-          tables_->FindByNameHelper(this, name).field_descriptor()) {
-    if (field->is_extension()) {
-      return field;
-    }
-  }
-  return nullptr;
-}
-
-const OneofDescriptor* DescriptorPool::FindOneofByName(
-    ConstStringParam name) const {
-  return tables_->FindByNameHelper(this, name).oneof_descriptor();
-}
-
-const EnumDescriptor* DescriptorPool::FindEnumTypeByName(
-    ConstStringParam name) const {
-  return tables_->FindByNameHelper(this, name).enum_descriptor();
-}
-
-const EnumValueDescriptor* DescriptorPool::FindEnumValueByName(
-    ConstStringParam name) const {
-  return tables_->FindByNameHelper(this, name).enum_value_descriptor();
-}
-
-const ServiceDescriptor* DescriptorPool::FindServiceByName(
-    ConstStringParam name) const {
-  return tables_->FindByNameHelper(this, name).service_descriptor();
-}
-
-const MethodDescriptor* DescriptorPool::FindMethodByName(
-    ConstStringParam name) const {
-  return tables_->FindByNameHelper(this, name).method_descriptor();
-}
-
-const FieldDescriptor* DescriptorPool::FindExtensionByNumber(
-    const Descriptor* extendee, int number) const {
-  if (extendee->extension_range_count() == 0) return nullptr;
-  // A faster path to reduce lock contention in finding extensions, assuming
-  // most extensions will be cache hit.
-  if (mutex_ != nullptr) {
-    ReaderMutexLock lock(mutex_);
-    const FieldDescriptor* result = tables_->FindExtension(extendee, number);
-    if (result != nullptr) {
-      return result;
-    }
-  }
-  MutexLockMaybe lock(mutex_);
-  if (fallback_database_ != nullptr) {
-    tables_->known_bad_symbols_.clear();
-    tables_->known_bad_files_.clear();
-  }
-  const FieldDescriptor* result = tables_->FindExtension(extendee, number);
-  if (result != nullptr) {
-    return result;
-  }
-  if (underlay_ != nullptr) {
-    result = underlay_->FindExtensionByNumber(extendee, number);
-    if (result != nullptr) return result;
-  }
-  if (TryFindExtensionInFallbackDatabase(extendee, number)) {
-    result = tables_->FindExtension(extendee, number);
-    if (result != nullptr) {
-      return result;
-    }
-  }
-  return nullptr;
-}
-
-const FieldDescriptor* DescriptorPool::InternalFindExtensionByNumberNoLock(
-    const Descriptor* extendee, int number) const {
-  if (extendee->extension_range_count() == 0) return nullptr;
-
-  const FieldDescriptor* result = tables_->FindExtension(extendee, number);
-  if (result != nullptr) {
-    return result;
-  }
-
-  if (underlay_ != nullptr) {
-    result = underlay_->InternalFindExtensionByNumberNoLock(extendee, number);
-    if (result != nullptr) return result;
-  }
-
-  return nullptr;
-}
-
-const FieldDescriptor* DescriptorPool::FindExtensionByPrintableName(
-    const Descriptor* extendee, ConstStringParam printable_name) const {
-  if (extendee->extension_range_count() == 0) return nullptr;
-  const FieldDescriptor* result = FindExtensionByName(printable_name);
-  if (result != nullptr && result->containing_type() == extendee) {
-    return result;
-  }
-  if (extendee->options().message_set_wire_format()) {
-    // MessageSet extensions may be identified by type name.
-    const Descriptor* type = FindMessageTypeByName(printable_name);
-    if (type != nullptr) {
-      // Look for a matching extension in the foreign type's scope.
-      const int type_extension_count = type->extension_count();
-      for (int i = 0; i < type_extension_count; i++) {
-        const FieldDescriptor* extension = type->extension(i);
-        if (extension->containing_type() == extendee &&
-            extension->type() == FieldDescriptor::TYPE_MESSAGE &&
-            extension->is_optional() && extension->message_type() == type) {
-          // Found it.
-          return extension;
-        }
-      }
-    }
-  }
-  return nullptr;
-}
-
-void DescriptorPool::FindAllExtensions(
-    const Descriptor* extendee,
-    std::vector<const FieldDescriptor*>* out) const {
-  MutexLockMaybe lock(mutex_);
-  if (fallback_database_ != nullptr) {
-    tables_->known_bad_symbols_.clear();
-    tables_->known_bad_files_.clear();
-  }
-
-  // Initialize tables_->extensions_ from the fallback database first
-  // (but do this only once per descriptor).
-  if (fallback_database_ != nullptr &&
-      tables_->extensions_loaded_from_db_.count(extendee) == 0) {
-    std::vector<int> numbers;
-    if (fallback_database_->FindAllExtensionNumbers(extendee->full_name(),
-                                                    &numbers)) {
-      for (int number : numbers) {
-        if (tables_->FindExtension(extendee, number) == nullptr) {
-          TryFindExtensionInFallbackDatabase(extendee, number);
-        }
-      }
-      tables_->extensions_loaded_from_db_.insert(extendee);
-    }
-  }
-
-  tables_->FindAllExtensions(extendee, out);
-  if (underlay_ != nullptr) {
-    underlay_->FindAllExtensions(extendee, out);
-  }
-}
-
-
-// -------------------------------------------------------------------
-
-const FieldDescriptor* Descriptor::FindFieldByNumber(int key) const {
-  const FieldDescriptor* result = file()->tables_->FindFieldByNumber(this, key);
-  if (result == nullptr || result->is_extension()) {
-    return nullptr;
-  } else {
-    return result;
-  }
-}
-
-const FieldDescriptor* Descriptor::FindFieldByLowercaseName(
-    ConstStringParam key) const {
-  const FieldDescriptor* result =
-      file()->tables_->FindFieldByLowercaseName(this, key);
-  if (result == nullptr || result->is_extension()) {
-    return nullptr;
-  } else {
-    return result;
-  }
-}
-
-const FieldDescriptor* Descriptor::FindFieldByCamelcaseName(
-    ConstStringParam key) const {
-  const FieldDescriptor* result =
-      file()->tables_->FindFieldByCamelcaseName(this, key);
-  if (result == nullptr || result->is_extension()) {
-    return nullptr;
-  } else {
-    return result;
-  }
-}
-
-const FieldDescriptor* Descriptor::FindFieldByName(ConstStringParam key) const {
-  const FieldDescriptor* field =
-      file()->tables_->FindNestedSymbol(this, key).field_descriptor();
-  return field != nullptr && !field->is_extension() ? field : nullptr;
-}
-
-const OneofDescriptor* Descriptor::FindOneofByName(ConstStringParam key) const {
-  return file()->tables_->FindNestedSymbol(this, key).oneof_descriptor();
-}
-
-const FieldDescriptor* Descriptor::FindExtensionByName(
-    ConstStringParam key) const {
-  const FieldDescriptor* field =
-      file()->tables_->FindNestedSymbol(this, key).field_descriptor();
-  return field != nullptr && field->is_extension() ? field : nullptr;
-}
-
-const FieldDescriptor* Descriptor::FindExtensionByLowercaseName(
-    ConstStringParam key) const {
-  const FieldDescriptor* result =
-      file()->tables_->FindFieldByLowercaseName(this, key);
-  if (result == nullptr || !result->is_extension()) {
-    return nullptr;
-  } else {
-    return result;
-  }
-}
-
-const FieldDescriptor* Descriptor::FindExtensionByCamelcaseName(
-    ConstStringParam key) const {
-  const FieldDescriptor* result =
-      file()->tables_->FindFieldByCamelcaseName(this, key);
-  if (result == nullptr || !result->is_extension()) {
-    return nullptr;
-  } else {
-    return result;
-  }
-}
-
-const Descriptor* Descriptor::FindNestedTypeByName(ConstStringParam key) const {
-  return file()->tables_->FindNestedSymbol(this, key).descriptor();
-}
-
-const EnumDescriptor* Descriptor::FindEnumTypeByName(
-    ConstStringParam key) const {
-  return file()->tables_->FindNestedSymbol(this, key).enum_descriptor();
-}
-
-const EnumValueDescriptor* Descriptor::FindEnumValueByName(
-    ConstStringParam key) const {
-  return file()->tables_->FindNestedSymbol(this, key).enum_value_descriptor();
-}
-
-const FieldDescriptor* Descriptor::map_key() const {
-  if (!options().map_entry()) return nullptr;
-  GOOGLE_DCHECK_EQ(field_count(), 2);
-  return field(0);
-}
-
-const FieldDescriptor* Descriptor::map_value() const {
-  if (!options().map_entry()) return nullptr;
-  GOOGLE_DCHECK_EQ(field_count(), 2);
-  return field(1);
-}
-
-const EnumValueDescriptor* EnumDescriptor::FindValueByName(
-    ConstStringParam key) const {
-  return file()->tables_->FindNestedSymbol(this, key).enum_value_descriptor();
-}
-
-const EnumValueDescriptor* EnumDescriptor::FindValueByNumber(int key) const {
-  return file()->tables_->FindEnumValueByNumber(this, key);
-}
-
-const EnumValueDescriptor* EnumDescriptor::FindValueByNumberCreatingIfUnknown(
-    int key) const {
-  return file()->tables_->FindEnumValueByNumberCreatingIfUnknown(this, key);
-}
-
-const MethodDescriptor* ServiceDescriptor::FindMethodByName(
-    ConstStringParam key) const {
-  return file()->tables_->FindNestedSymbol(this, key).method_descriptor();
-}
-
-const Descriptor* FileDescriptor::FindMessageTypeByName(
-    ConstStringParam key) const {
-  return tables_->FindNestedSymbol(this, key).descriptor();
-}
-
-const EnumDescriptor* FileDescriptor::FindEnumTypeByName(
-    ConstStringParam key) const {
-  return tables_->FindNestedSymbol(this, key).enum_descriptor();
-}
-
-const EnumValueDescriptor* FileDescriptor::FindEnumValueByName(
-    ConstStringParam key) const {
-  return tables_->FindNestedSymbol(this, key).enum_value_descriptor();
-}
-
-const ServiceDescriptor* FileDescriptor::FindServiceByName(
-    ConstStringParam key) const {
-  return tables_->FindNestedSymbol(this, key).service_descriptor();
-}
-
-const FieldDescriptor* FileDescriptor::FindExtensionByName(
-    ConstStringParam key) const {
-  const FieldDescriptor* field =
-      tables_->FindNestedSymbol(this, key).field_descriptor();
-  return field != nullptr && field->is_extension() ? field : nullptr;
-}
-
-const FieldDescriptor* FileDescriptor::FindExtensionByLowercaseName(
-    ConstStringParam key) const {
-  const FieldDescriptor* result = tables_->FindFieldByLowercaseName(this, key);
-  if (result == nullptr || !result->is_extension()) {
-    return nullptr;
-  } else {
-    return result;
-  }
-}
-
-const FieldDescriptor* FileDescriptor::FindExtensionByCamelcaseName(
-    ConstStringParam key) const {
-  const FieldDescriptor* result = tables_->FindFieldByCamelcaseName(this, key);
-  if (result == nullptr || !result->is_extension()) {
-    return nullptr;
-  } else {
-    return result;
-  }
-}
-
-void Descriptor::ExtensionRange::CopyTo(
-    DescriptorProto_ExtensionRange* proto) const {
-  proto->set_start(this->start);
-  proto->set_end(this->end);
-  if (options_ != &ExtensionRangeOptions::default_instance()) {
-    *proto->mutable_options() = *options_;
-  }
-}
-
-const Descriptor::ExtensionRange*
-Descriptor::FindExtensionRangeContainingNumber(int number) const {
-  // Linear search should be fine because we don't expect a message to have
-  // more than a couple extension ranges.
-  for (int i = 0; i < extension_range_count(); i++) {
-    if (number >= extension_range(i)->start &&
-        number < extension_range(i)->end) {
-      return extension_range(i);
-    }
-  }
-  return nullptr;
-}
-
-const Descriptor::ReservedRange* Descriptor::FindReservedRangeContainingNumber(
-    int number) const {
-  // TODO(chrisn): Consider a non-linear search.
-  for (int i = 0; i < reserved_range_count(); i++) {
-    if (number >= reserved_range(i)->start && number < reserved_range(i)->end) {
-      return reserved_range(i);
-    }
-  }
-  return nullptr;
-}
-
-const EnumDescriptor::ReservedRange*
-EnumDescriptor::FindReservedRangeContainingNumber(int number) const {
-  // TODO(chrisn): Consider a non-linear search.
-  for (int i = 0; i < reserved_range_count(); i++) {
-    if (number >= reserved_range(i)->start &&
-        number <= reserved_range(i)->end) {
-      return reserved_range(i);
-    }
-  }
-  return nullptr;
-}
-
-// -------------------------------------------------------------------
-
-bool DescriptorPool::TryFindFileInFallbackDatabase(
-    StringPiece name) const {
-  if (fallback_database_ == nullptr) return false;
-
-  auto name_string = std::string(name);
-  if (tables_->known_bad_files_.count(name_string) > 0) return false;
-
-  FileDescriptorProto file_proto;
-  if (!fallback_database_->FindFileByName(name_string, &file_proto) ||
-      BuildFileFromDatabase(file_proto) == nullptr) {
-    tables_->known_bad_files_.insert(std::move(name_string));
-    return false;
-  }
-  return true;
-}
-
-bool DescriptorPool::IsSubSymbolOfBuiltType(StringPiece name) const {
-  auto prefix = std::string(name);
-  for (;;) {
-    std::string::size_type dot_pos = prefix.find_last_of('.');
-    if (dot_pos == std::string::npos) {
-      break;
-    }
-    prefix = prefix.substr(0, dot_pos);
-    Symbol symbol = tables_->FindSymbol(prefix);
-    // If the symbol type is anything other than PACKAGE, then its complete
-    // definition is already known.
-    if (!symbol.IsNull() && !symbol.IsPackage()) {
-      return true;
-    }
-  }
-  if (underlay_ != nullptr) {
-    // Check to see if any prefix of this symbol exists in the underlay.
-    return underlay_->IsSubSymbolOfBuiltType(name);
-  }
-  return false;
-}
-
-bool DescriptorPool::TryFindSymbolInFallbackDatabase(
-    StringPiece name) const {
-  if (fallback_database_ == nullptr) return false;
-
-  auto name_string = std::string(name);
-  if (tables_->known_bad_symbols_.count(name_string) > 0) return false;
-
-  FileDescriptorProto file_proto;
-  if (  // We skip looking in the fallback database if the name is a sub-symbol
-        // of any descriptor that already exists in the descriptor pool (except
-        // for package descriptors).  This is valid because all symbols except
-        // for packages are defined in a single file, so if the symbol exists
-        // then we should already have its definition.
-        //
-        // The other reason to do this is to support "overriding" type
-        // definitions by merging two databases that define the same type. (Yes,
-        // people do this.)  The main difficulty with making this work is that
-        // FindFileContainingSymbol() is allowed to return both false positives
-        // (e.g., SimpleDescriptorDatabase, UpgradedDescriptorDatabase) and
-        // false negatives (e.g. ProtoFileParser, SourceTreeDescriptorDatabase).
-        // When two such databases are merged, looking up a non-existent
-        // sub-symbol of a type that already exists in the descriptor pool can
-        // result in an attempt to load multiple definitions of the same type.
-        // The check below avoids this.
-      IsSubSymbolOfBuiltType(name)
-
-      // Look up file containing this symbol in fallback database.
-      || !fallback_database_->FindFileContainingSymbol(name_string, &file_proto)
-
-      // Check if we've already built this file. If so, it apparently doesn't
-      // contain the symbol we're looking for.  Some DescriptorDatabases
-      // return false positives.
-      || tables_->FindFile(file_proto.name()) != nullptr
-
-      // Build the file.
-      || BuildFileFromDatabase(file_proto) == nullptr) {
-    tables_->known_bad_symbols_.insert(std::move(name_string));
-    return false;
-  }
-
-  return true;
-}
-
-bool DescriptorPool::TryFindExtensionInFallbackDatabase(
-    const Descriptor* containing_type, int field_number) const {
-  if (fallback_database_ == nullptr) return false;
-
-  FileDescriptorProto file_proto;
-  if (!fallback_database_->FindFileContainingExtension(
-          containing_type->full_name(), field_number, &file_proto)) {
-    return false;
-  }
-
-  if (tables_->FindFile(file_proto.name()) != nullptr) {
-    // We've already loaded this file, and it apparently doesn't contain the
-    // extension we're looking for.  Some DescriptorDatabases return false
-    // positives.
-    return false;
-  }
-
-  if (BuildFileFromDatabase(file_proto) == nullptr) {
-    return false;
-  }
-
-  return true;
-}
-
-// ===================================================================
-
-bool FieldDescriptor::is_map_message_type() const {
-  return type_descriptor_.message_type->options().map_entry();
-}
-
-std::string FieldDescriptor::DefaultValueAsString(
-    bool quote_string_type) const {
-  GOOGLE_CHECK(has_default_value()) << "No default value";
-  switch (cpp_type()) {
-    case CPPTYPE_INT32:
-      return StrCat(default_value_int32_t());
-    case CPPTYPE_INT64:
-      return StrCat(default_value_int64_t());
-    case CPPTYPE_UINT32:
-      return StrCat(default_value_uint32_t());
-    case CPPTYPE_UINT64:
-      return StrCat(default_value_uint64_t());
-    case CPPTYPE_FLOAT:
-      return SimpleFtoa(default_value_float());
-    case CPPTYPE_DOUBLE:
-      return SimpleDtoa(default_value_double());
-    case CPPTYPE_BOOL:
-      return default_value_bool() ? "true" : "false";
-    case CPPTYPE_STRING:
-      if (quote_string_type) {
-        return "\"" + CEscape(default_value_string()) + "\"";
-      } else {
-        if (type() == TYPE_BYTES) {
-          return CEscape(default_value_string());
-        } else {
-          return default_value_string();
-        }
-      }
-    case CPPTYPE_ENUM:
-      return default_value_enum()->name();
-    case CPPTYPE_MESSAGE:
-      GOOGLE_LOG(DFATAL) << "Messages can't have default values!";
-      break;
-  }
-  GOOGLE_LOG(FATAL) << "Can't get here: failed to get default value as string";
-  return "";
-}
-
-// CopyTo methods ====================================================
-
-void FileDescriptor::CopyTo(FileDescriptorProto* proto) const {
-  proto->set_name(name());
-  if (!package().empty()) proto->set_package(package());
-  // TODO(liujisi): Also populate when syntax="proto2".
-  if (syntax() == SYNTAX_PROTO3) proto->set_syntax(SyntaxName(syntax()));
-
-  for (int i = 0; i < dependency_count(); i++) {
-    proto->add_dependency(dependency(i)->name());
-  }
-
-  for (int i = 0; i < public_dependency_count(); i++) {
-    proto->add_public_dependency(public_dependencies_[i]);
-  }
-
-  for (int i = 0; i < weak_dependency_count(); i++) {
-    proto->add_weak_dependency(weak_dependencies_[i]);
-  }
-
-  for (int i = 0; i < message_type_count(); i++) {
-    message_type(i)->CopyTo(proto->add_message_type());
-  }
-  for (int i = 0; i < enum_type_count(); i++) {
-    enum_type(i)->CopyTo(proto->add_enum_type());
-  }
-  for (int i = 0; i < service_count(); i++) {
-    service(i)->CopyTo(proto->add_service());
-  }
-  for (int i = 0; i < extension_count(); i++) {
-    extension(i)->CopyTo(proto->add_extension());
-  }
-
-  if (&options() != &FileOptions::default_instance()) {
-    proto->mutable_options()->CopyFrom(options());
-  }
-}
-
-void FileDescriptor::CopyJsonNameTo(FileDescriptorProto* proto) const {
-  if (message_type_count() != proto->message_type_size() ||
-      extension_count() != proto->extension_size()) {
-    GOOGLE_LOG(ERROR) << "Cannot copy json_name to a proto of a different size.";
-    return;
-  }
-  for (int i = 0; i < message_type_count(); i++) {
-    message_type(i)->CopyJsonNameTo(proto->mutable_message_type(i));
-  }
-  for (int i = 0; i < extension_count(); i++) {
-    extension(i)->CopyJsonNameTo(proto->mutable_extension(i));
-  }
-}
-
-void FileDescriptor::CopySourceCodeInfoTo(FileDescriptorProto* proto) const {
-  if (source_code_info_ &&
-      source_code_info_ != &SourceCodeInfo::default_instance()) {
-    proto->mutable_source_code_info()->CopyFrom(*source_code_info_);
-  }
-}
-
-void Descriptor::CopyTo(DescriptorProto* proto) const {
-  proto->set_name(name());
-
-  for (int i = 0; i < field_count(); i++) {
-    field(i)->CopyTo(proto->add_field());
-  }
-  for (int i = 0; i < oneof_decl_count(); i++) {
-    oneof_decl(i)->CopyTo(proto->add_oneof_decl());
-  }
-  for (int i = 0; i < nested_type_count(); i++) {
-    nested_type(i)->CopyTo(proto->add_nested_type());
-  }
-  for (int i = 0; i < enum_type_count(); i++) {
-    enum_type(i)->CopyTo(proto->add_enum_type());
-  }
-  for (int i = 0; i < extension_range_count(); i++) {
-    extension_range(i)->CopyTo(proto->add_extension_range());
-  }
-  for (int i = 0; i < extension_count(); i++) {
-    extension(i)->CopyTo(proto->add_extension());
-  }
-  for (int i = 0; i < reserved_range_count(); i++) {
-    DescriptorProto::ReservedRange* range = proto->add_reserved_range();
-    range->set_start(reserved_range(i)->start);
-    range->set_end(reserved_range(i)->end);
-  }
-  for (int i = 0; i < reserved_name_count(); i++) {
-    proto->add_reserved_name(reserved_name(i));
-  }
-
-  if (&options() != &MessageOptions::default_instance()) {
-    proto->mutable_options()->CopyFrom(options());
-  }
-}
-
-void Descriptor::CopyJsonNameTo(DescriptorProto* proto) const {
-  if (field_count() != proto->field_size() ||
-      nested_type_count() != proto->nested_type_size() ||
-      extension_count() != proto->extension_size()) {
-    GOOGLE_LOG(ERROR) << "Cannot copy json_name to a proto of a different size.";
-    return;
-  }
-  for (int i = 0; i < field_count(); i++) {
-    field(i)->CopyJsonNameTo(proto->mutable_field(i));
-  }
-  for (int i = 0; i < nested_type_count(); i++) {
-    nested_type(i)->CopyJsonNameTo(proto->mutable_nested_type(i));
-  }
-  for (int i = 0; i < extension_count(); i++) {
-    extension(i)->CopyJsonNameTo(proto->mutable_extension(i));
-  }
-}
-
-void FieldDescriptor::CopyTo(FieldDescriptorProto* proto) const {
-  proto->set_name(name());
-  proto->set_number(number());
-  if (has_json_name_) {
-    proto->set_json_name(json_name());
-  }
-  if (proto3_optional_) {
-    proto->set_proto3_optional(true);
-  }
-  // Some compilers do not allow static_cast directly between two enum types,
-  // so we must cast to int first.
-  proto->set_label(static_cast<FieldDescriptorProto::Label>(
-      implicit_cast<int>(label())));
-  proto->set_type(static_cast<FieldDescriptorProto::Type>(
-      implicit_cast<int>(type())));
-
-  if (is_extension()) {
-    if (!containing_type()->is_unqualified_placeholder_) {
-      proto->set_extendee(".");
-    }
-    proto->mutable_extendee()->append(containing_type()->full_name());
-  }
-
-  if (cpp_type() == CPPTYPE_MESSAGE) {
-    if (message_type()->is_placeholder_) {
-      // We don't actually know if the type is a message type.  It could be
-      // an enum.
-      proto->clear_type();
-    }
-
-    if (!message_type()->is_unqualified_placeholder_) {
-      proto->set_type_name(".");
-    }
-    proto->mutable_type_name()->append(message_type()->full_name());
-  } else if (cpp_type() == CPPTYPE_ENUM) {
-    if (!enum_type()->is_unqualified_placeholder_) {
-      proto->set_type_name(".");
-    }
-    proto->mutable_type_name()->append(enum_type()->full_name());
-  }
-
-  if (has_default_value()) {
-    proto->set_default_value(DefaultValueAsString(false));
-  }
-
-  if (containing_oneof() != nullptr && !is_extension()) {
-    proto->set_oneof_index(containing_oneof()->index());
-  }
-
-  if (&options() != &FieldOptions::default_instance()) {
-    proto->mutable_options()->CopyFrom(options());
-  }
-}
-
-void FieldDescriptor::CopyJsonNameTo(FieldDescriptorProto* proto) const {
-  proto->set_json_name(json_name());
-}
-
-void OneofDescriptor::CopyTo(OneofDescriptorProto* proto) const {
-  proto->set_name(name());
-  if (&options() != &OneofOptions::default_instance()) {
-    proto->mutable_options()->CopyFrom(options());
-  }
-}
-
-void EnumDescriptor::CopyTo(EnumDescriptorProto* proto) const {
-  proto->set_name(name());
-
-  for (int i = 0; i < value_count(); i++) {
-    value(i)->CopyTo(proto->add_value());
-  }
-  for (int i = 0; i < reserved_range_count(); i++) {
-    EnumDescriptorProto::EnumReservedRange* range = proto->add_reserved_range();
-    range->set_start(reserved_range(i)->start);
-    range->set_end(reserved_range(i)->end);
-  }
-  for (int i = 0; i < reserved_name_count(); i++) {
-    proto->add_reserved_name(reserved_name(i));
-  }
-
-  if (&options() != &EnumOptions::default_instance()) {
-    proto->mutable_options()->CopyFrom(options());
-  }
-}
-
-void EnumValueDescriptor::CopyTo(EnumValueDescriptorProto* proto) const {
-  proto->set_name(name());
-  proto->set_number(number());
-
-  if (&options() != &EnumValueOptions::default_instance()) {
-    proto->mutable_options()->CopyFrom(options());
-  }
-}
-
-void ServiceDescriptor::CopyTo(ServiceDescriptorProto* proto) const {
-  proto->set_name(name());
-
-  for (int i = 0; i < method_count(); i++) {
-    method(i)->CopyTo(proto->add_method());
-  }
-
-  if (&options() != &ServiceOptions::default_instance()) {
-    proto->mutable_options()->CopyFrom(options());
-  }
-}
-
-void MethodDescriptor::CopyTo(MethodDescriptorProto* proto) const {
-  proto->set_name(name());
-
-  if (!input_type()->is_unqualified_placeholder_) {
-    proto->set_input_type(".");
-  }
-  proto->mutable_input_type()->append(input_type()->full_name());
-
-  if (!output_type()->is_unqualified_placeholder_) {
-    proto->set_output_type(".");
-  }
-  proto->mutable_output_type()->append(output_type()->full_name());
-
-  if (&options() != &MethodOptions::default_instance()) {
-    proto->mutable_options()->CopyFrom(options());
-  }
-
-  if (client_streaming_) {
-    proto->set_client_streaming(true);
-  }
-  if (server_streaming_) {
-    proto->set_server_streaming(true);
-  }
-}
-
-// DebugString methods ===============================================
-
-namespace {
-
-bool RetrieveOptionsAssumingRightPool(
-    int depth, const Message& options,
-    std::vector<std::string>* option_entries) {
-  option_entries->clear();
-  const Reflection* reflection = options.GetReflection();
-  std::vector<const FieldDescriptor*> fields;
-  reflection->ListFields(options, &fields);
-  for (const FieldDescriptor* field : fields) {
-    int count = 1;
-    bool repeated = false;
-    if (field->is_repeated()) {
-      count = reflection->FieldSize(options, field);
-      repeated = true;
-    }
-    for (int j = 0; j < count; j++) {
-      std::string fieldval;
-      if (field->cpp_type() == FieldDescriptor::CPPTYPE_MESSAGE) {
-        std::string tmp;
-        TextFormat::Printer printer;
-        printer.SetExpandAny(true);
-        printer.SetInitialIndentLevel(depth + 1);
-        printer.PrintFieldValueToString(options, field, repeated ? j : -1,
-                                        &tmp);
-        fieldval.append("{\n");
-        fieldval.append(tmp);
-        fieldval.append(depth * 2, ' ');
-        fieldval.append("}");
-      } else {
-        TextFormat::PrintFieldValueToString(options, field, repeated ? j : -1,
-                                            &fieldval);
-      }
-      std::string name;
-      if (field->is_extension()) {
-        name = "(." + field->full_name() + ")";
-      } else {
-        name = field->name();
-      }
-      option_entries->push_back(name + " = " + fieldval);
-    }
-  }
-  return !option_entries->empty();
-}
-
-// Used by each of the option formatters.
-bool RetrieveOptions(int depth, const Message& options,
-                     const DescriptorPool* pool,
-                     std::vector<std::string>* option_entries) {
-  // When printing custom options for a descriptor, we must use an options
-  // message built on top of the same DescriptorPool where the descriptor
-  // is coming from. This is to ensure we are interpreting custom options
-  // against the right pool.
-  if (options.GetDescriptor()->file()->pool() == pool) {
-    return RetrieveOptionsAssumingRightPool(depth, options, option_entries);
-  } else {
-    const Descriptor* option_descriptor =
-        pool->FindMessageTypeByName(options.GetDescriptor()->full_name());
-    if (option_descriptor == nullptr) {
-      // descriptor.proto is not in the pool. This means no custom options are
-      // used so we are safe to proceed with the compiled options message type.
-      return RetrieveOptionsAssumingRightPool(depth, options, option_entries);
-    }
-    DynamicMessageFactory factory;
-    std::unique_ptr<Message> dynamic_options(
-        factory.GetPrototype(option_descriptor)->New());
-    std::string serialized = options.SerializeAsString();
-    io::CodedInputStream input(
-        reinterpret_cast<const uint8_t*>(serialized.c_str()),
-        serialized.size());
-    input.SetExtensionRegistry(pool, &factory);
-    if (dynamic_options->ParseFromCodedStream(&input)) {
-      return RetrieveOptionsAssumingRightPool(depth, *dynamic_options,
-                                              option_entries);
-    } else {
-      GOOGLE_LOG(ERROR) << "Found invalid proto option data for: "
-                 << options.GetDescriptor()->full_name();
-      return RetrieveOptionsAssumingRightPool(depth, options, option_entries);
-    }
-  }
-}
-
-// Formats options that all appear together in brackets. Does not include
-// brackets.
-bool FormatBracketedOptions(int depth, const Message& options,
-                            const DescriptorPool* pool, std::string* output) {
-  std::vector<std::string> all_options;
-  if (RetrieveOptions(depth, options, pool, &all_options)) {
-    output->append(Join(all_options, ", "));
-  }
-  return !all_options.empty();
-}
-
-// Formats options one per line
-bool FormatLineOptions(int depth, const Message& options,
-                       const DescriptorPool* pool, std::string* output) {
-  std::string prefix(depth * 2, ' ');
-  std::vector<std::string> all_options;
-  if (RetrieveOptions(depth, options, pool, &all_options)) {
-    for (const std::string& option : all_options) {
-      strings::SubstituteAndAppend(output, "$0option $1;\n", prefix, option);
-    }
-  }
-  return !all_options.empty();
-}
-
-class SourceLocationCommentPrinter {
- public:
-  template <typename DescType>
-  SourceLocationCommentPrinter(const DescType* desc, const std::string& prefix,
-                               const DebugStringOptions& options)
-      : options_(options), prefix_(prefix) {
-    // Perform the SourceLocation lookup only if we're including user comments,
-    // because the lookup is fairly expensive.
-    have_source_loc_ =
-        options.include_comments && desc->GetSourceLocation(&source_loc_);
-  }
-  SourceLocationCommentPrinter(const FileDescriptor* file,
-                               const std::vector<int>& path,
-                               const std::string& prefix,
-                               const DebugStringOptions& options)
-      : options_(options), prefix_(prefix) {
-    // Perform the SourceLocation lookup only if we're including user comments,
-    // because the lookup is fairly expensive.
-    have_source_loc_ =
-        options.include_comments && file->GetSourceLocation(path, &source_loc_);
-  }
-  void AddPreComment(std::string* output) {
-    if (have_source_loc_) {
-      // Detached leading comments.
-      for (const std::string& leading_detached_comment :
-           source_loc_.leading_detached_comments) {
-        *output += FormatComment(leading_detached_comment);
-        *output += "\n";
-      }
-      // Attached leading comments.
-      if (!source_loc_.leading_comments.empty()) {
-        *output += FormatComment(source_loc_.leading_comments);
-      }
-    }
-  }
-  void AddPostComment(std::string* output) {
-    if (have_source_loc_ && source_loc_.trailing_comments.size() > 0) {
-      *output += FormatComment(source_loc_.trailing_comments);
-    }
-  }
-
-  // Format comment such that each line becomes a full-line C++-style comment in
-  // the DebugString() output.
-  std::string FormatComment(const std::string& comment_text) {
-    std::string stripped_comment = comment_text;
-    StripWhitespace(&stripped_comment);
-    std::vector<std::string> lines = Split(stripped_comment, "\n");
-    std::string output;
-    for (const std::string& line : lines) {
-      strings::SubstituteAndAppend(&output, "$0// $1\n", prefix_, line);
-    }
-    return output;
-  }
-
- private:
-
-  bool have_source_loc_;
-  SourceLocation source_loc_;
-  DebugStringOptions options_;
-  std::string prefix_;
-};
-
-}  // anonymous namespace
-
-std::string FileDescriptor::DebugString() const {
-  DebugStringOptions options;  // default options
-  return DebugStringWithOptions(options);
-}
-
-std::string FileDescriptor::DebugStringWithOptions(
-    const DebugStringOptions& debug_string_options) const {
-  std::string contents;
-  {
-    std::vector<int> path;
-    path.push_back(FileDescriptorProto::kSyntaxFieldNumber);
-    SourceLocationCommentPrinter syntax_comment(this, path, "",
-                                                debug_string_options);
-    syntax_comment.AddPreComment(&contents);
-    strings::SubstituteAndAppend(&contents, "syntax = \"$0\";\n\n",
-                              SyntaxName(syntax()));
-    syntax_comment.AddPostComment(&contents);
-  }
-
-  SourceLocationCommentPrinter comment_printer(this, "", debug_string_options);
-  comment_printer.AddPreComment(&contents);
-
-  std::set<int> public_dependencies;
-  std::set<int> weak_dependencies;
-  public_dependencies.insert(public_dependencies_,
-                             public_dependencies_ + public_dependency_count_);
-  weak_dependencies.insert(weak_dependencies_,
-                           weak_dependencies_ + weak_dependency_count_);
-
-  for (int i = 0; i < dependency_count(); i++) {
-    if (public_dependencies.count(i) > 0) {
-      strings::SubstituteAndAppend(&contents, "import public \"$0\";\n",
-                                dependency(i)->name());
-    } else if (weak_dependencies.count(i) > 0) {
-      strings::SubstituteAndAppend(&contents, "import weak \"$0\";\n",
-                                dependency(i)->name());
-    } else {
-      strings::SubstituteAndAppend(&contents, "import \"$0\";\n",
-                                dependency(i)->name());
-    }
-  }
-
-  if (!package().empty()) {
-    std::vector<int> path;
-    path.push_back(FileDescriptorProto::kPackageFieldNumber);
-    SourceLocationCommentPrinter package_comment(this, path, "",
-                                                 debug_string_options);
-    package_comment.AddPreComment(&contents);
-    strings::SubstituteAndAppend(&contents, "package $0;\n\n", package());
-    package_comment.AddPostComment(&contents);
-  }
-
-  if (FormatLineOptions(0, options(), pool(), &contents)) {
-    contents.append("\n");  // add some space if we had options
-  }
-
-  for (int i = 0; i < enum_type_count(); i++) {
-    enum_type(i)->DebugString(0, &contents, debug_string_options);
-    contents.append("\n");
-  }
-
-  // Find all the 'group' type extensions; we will not output their nested
-  // definitions (those will be done with their group field descriptor).
-  std::set<const Descriptor*> groups;
-  for (int i = 0; i < extension_count(); i++) {
-    if (extension(i)->type() == FieldDescriptor::TYPE_GROUP) {
-      groups.insert(extension(i)->message_type());
-    }
-  }
-
-  for (int i = 0; i < message_type_count(); i++) {
-    if (groups.count(message_type(i)) == 0) {
-      message_type(i)->DebugString(0, &contents, debug_string_options,
-                                   /* include_opening_clause */ true);
-      contents.append("\n");
-    }
-  }
-
-  for (int i = 0; i < service_count(); i++) {
-    service(i)->DebugString(&contents, debug_string_options);
-    contents.append("\n");
-  }
-
-  const Descriptor* containing_type = nullptr;
-  for (int i = 0; i < extension_count(); i++) {
-    if (extension(i)->containing_type() != containing_type) {
-      if (i > 0) contents.append("}\n\n");
-      containing_type = extension(i)->containing_type();
-      strings::SubstituteAndAppend(&contents, "extend .$0 {\n",
-                                containing_type->full_name());
-    }
-    extension(i)->DebugString(1, &contents, debug_string_options);
-  }
-  if (extension_count() > 0) contents.append("}\n\n");
-
-  comment_printer.AddPostComment(&contents);
-
-  return contents;
-}
-
-std::string Descriptor::DebugString() const {
-  DebugStringOptions options;  // default options
-  return DebugStringWithOptions(options);
-}
-
-std::string Descriptor::DebugStringWithOptions(
-    const DebugStringOptions& options) const {
-  std::string contents;
-  DebugString(0, &contents, options, /* include_opening_clause */ true);
-  return contents;
-}
-
-void Descriptor::DebugString(int depth, std::string* contents,
-                             const DebugStringOptions& debug_string_options,
-                             bool include_opening_clause) const {
-  if (options().map_entry()) {
-    // Do not generate debug string for auto-generated map-entry type.
-    return;
-  }
-  std::string prefix(depth * 2, ' ');
-  ++depth;
-
-  SourceLocationCommentPrinter comment_printer(this, prefix,
-                                               debug_string_options);
-  comment_printer.AddPreComment(contents);
-
-  if (include_opening_clause) {
-    strings::SubstituteAndAppend(contents, "$0message $1", prefix, name());
-  }
-  contents->append(" {\n");
-
-  FormatLineOptions(depth, options(), file()->pool(), contents);
-
-  // Find all the 'group' types for fields and extensions; we will not output
-  // their nested definitions (those will be done with their group field
-  // descriptor).
-  std::set<const Descriptor*> groups;
-  for (int i = 0; i < field_count(); i++) {
-    if (field(i)->type() == FieldDescriptor::TYPE_GROUP) {
-      groups.insert(field(i)->message_type());
-    }
-  }
-  for (int i = 0; i < extension_count(); i++) {
-    if (extension(i)->type() == FieldDescriptor::TYPE_GROUP) {
-      groups.insert(extension(i)->message_type());
-    }
-  }
-
-  for (int i = 0; i < nested_type_count(); i++) {
-    if (groups.count(nested_type(i)) == 0) {
-      nested_type(i)->DebugString(depth, contents, debug_string_options,
-                                  /* include_opening_clause */ true);
-    }
-  }
-  for (int i = 0; i < enum_type_count(); i++) {
-    enum_type(i)->DebugString(depth, contents, debug_string_options);
-  }
-  for (int i = 0; i < field_count(); i++) {
-    if (field(i)->real_containing_oneof() == nullptr) {
-      field(i)->DebugString(depth, contents, debug_string_options);
-    } else if (field(i)->containing_oneof()->field(0) == field(i)) {
-      // This is the first field in this oneof, so print the whole oneof.
-      field(i)->containing_oneof()->DebugString(depth, contents,
-                                                debug_string_options);
-    }
-  }
-
-  for (int i = 0; i < extension_range_count(); i++) {
-    strings::SubstituteAndAppend(contents, "$0  extensions $1 to $2;\n", prefix,
-                              extension_range(i)->start,
-                              extension_range(i)->end - 1);
-  }
-
-  // Group extensions by what they extend, so they can be printed out together.
-  const Descriptor* containing_type = nullptr;
-  for (int i = 0; i < extension_count(); i++) {
-    if (extension(i)->containing_type() != containing_type) {
-      if (i > 0) strings::SubstituteAndAppend(contents, "$0  }\n", prefix);
-      containing_type = extension(i)->containing_type();
-      strings::SubstituteAndAppend(contents, "$0  extend .$1 {\n", prefix,
-                                containing_type->full_name());
-    }
-    extension(i)->DebugString(depth + 1, contents, debug_string_options);
-  }
-  if (extension_count() > 0)
-    strings::SubstituteAndAppend(contents, "$0  }\n", prefix);
-
-  if (reserved_range_count() > 0) {
-    strings::SubstituteAndAppend(contents, "$0  reserved ", prefix);
-    for (int i = 0; i < reserved_range_count(); i++) {
-      const Descriptor::ReservedRange* range = reserved_range(i);
-      if (range->end == range->start + 1) {
-        strings::SubstituteAndAppend(contents, "$0, ", range->start);
-      } else if (range->end > FieldDescriptor::kMaxNumber) {
-        strings::SubstituteAndAppend(contents, "$0 to max, ", range->start);
-      } else {
-        strings::SubstituteAndAppend(contents, "$0 to $1, ", range->start,
-                                  range->end - 1);
-      }
-    }
-    contents->replace(contents->size() - 2, 2, ";\n");
-  }
-
-  if (reserved_name_count() > 0) {
-    strings::SubstituteAndAppend(contents, "$0  reserved ", prefix);
-    for (int i = 0; i < reserved_name_count(); i++) {
-      strings::SubstituteAndAppend(contents, "\"$0\", ",
-                                CEscape(reserved_name(i)));
-    }
-    contents->replace(contents->size() - 2, 2, ";\n");
-  }
-
-  strings::SubstituteAndAppend(contents, "$0}\n", prefix);
-  comment_printer.AddPostComment(contents);
-}
-
-std::string FieldDescriptor::DebugString() const {
-  DebugStringOptions options;  // default options
-  return DebugStringWithOptions(options);
-}
-
-std::string FieldDescriptor::DebugStringWithOptions(
-    const DebugStringOptions& debug_string_options) const {
-  std::string contents;
-  int depth = 0;
-  if (is_extension()) {
-    strings::SubstituteAndAppend(&contents, "extend .$0 {\n",
-                              containing_type()->full_name());
-    depth = 1;
-  }
-  DebugString(depth, &contents, debug_string_options);
-  if (is_extension()) {
-    contents.append("}\n");
-  }
-  return contents;
-}
-
-// The field type string used in FieldDescriptor::DebugString()
-std::string FieldDescriptor::FieldTypeNameDebugString() const {
-  switch (type()) {
-    case TYPE_MESSAGE:
-      return "." + message_type()->full_name();
-    case TYPE_ENUM:
-      return "." + enum_type()->full_name();
-    default:
-      return kTypeToName[type()];
-  }
-}
-
-void FieldDescriptor::DebugString(
-    int depth, std::string* contents,
-    const DebugStringOptions& debug_string_options) const {
-  std::string prefix(depth * 2, ' ');
-  std::string field_type;
-
-  // Special case map fields.
-  if (is_map()) {
-    strings::SubstituteAndAppend(
-        &field_type, "map<$0, $1>",
-        message_type()->field(0)->FieldTypeNameDebugString(),
-        message_type()->field(1)->FieldTypeNameDebugString());
-  } else {
-    field_type = FieldTypeNameDebugString();
-  }
-
-  std::string label = StrCat(kLabelToName[this->label()], " ");
-
-  // Label is omitted for maps, oneof, and plain proto3 fields.
-  if (is_map() || real_containing_oneof() ||
-      (is_optional() && !has_optional_keyword())) {
-    label.clear();
-  }
-
-  SourceLocationCommentPrinter comment_printer(this, prefix,
-                                               debug_string_options);
-  comment_printer.AddPreComment(contents);
-
-  strings::SubstituteAndAppend(
-      contents, "$0$1$2 $3 = $4", prefix, label, field_type,
-      type() == TYPE_GROUP ? message_type()->name() : name(), number());
-
-  bool bracketed = false;
-  if (has_default_value()) {
-    bracketed = true;
-    strings::SubstituteAndAppend(contents, " [default = $0",
-                              DefaultValueAsString(true));
-  }
-  if (has_json_name_) {
-    if (!bracketed) {
-      bracketed = true;
-      contents->append(" [");
-    } else {
-      contents->append(", ");
-    }
-    contents->append("json_name = \"");
-    contents->append(CEscape(json_name()));
-    contents->append("\"");
-  }
-
-  std::string formatted_options;
-  if (FormatBracketedOptions(depth, options(), file()->pool(),
-                             &formatted_options)) {
-    contents->append(bracketed ? ", " : " [");
-    bracketed = true;
-    contents->append(formatted_options);
-  }
-
-  if (bracketed) {
-    contents->append("]");
-  }
-
-  if (type() == TYPE_GROUP) {
-    if (debug_string_options.elide_group_body) {
-      contents->append(" { ... };\n");
-    } else {
-      message_type()->DebugString(depth, contents, debug_string_options,
-                                  /* include_opening_clause */ false);
-    }
-  } else {
-    contents->append(";\n");
-  }
-
-  comment_printer.AddPostComment(contents);
-}
-
-std::string OneofDescriptor::DebugString() const {
-  DebugStringOptions options;  // default values
-  return DebugStringWithOptions(options);
-}
-
-std::string OneofDescriptor::DebugStringWithOptions(
-    const DebugStringOptions& options) const {
-  std::string contents;
-  DebugString(0, &contents, options);
-  return contents;
-}
-
-void OneofDescriptor::DebugString(
-    int depth, std::string* contents,
-    const DebugStringOptions& debug_string_options) const {
-  std::string prefix(depth * 2, ' ');
-  ++depth;
-  SourceLocationCommentPrinter comment_printer(this, prefix,
-                                               debug_string_options);
-  comment_printer.AddPreComment(contents);
-  strings::SubstituteAndAppend(contents, "$0oneof $1 {", prefix, name());
-
-  FormatLineOptions(depth, options(), containing_type()->file()->pool(),
-                    contents);
-
-  if (debug_string_options.elide_oneof_body) {
-    contents->append(" ... }\n");
-  } else {
-    contents->append("\n");
-    for (int i = 0; i < field_count(); i++) {
-      field(i)->DebugString(depth, contents, debug_string_options);
-    }
-    strings::SubstituteAndAppend(contents, "$0}\n", prefix);
-  }
-  comment_printer.AddPostComment(contents);
-}
-
-std::string EnumDescriptor::DebugString() const {
-  DebugStringOptions options;  // default values
-  return DebugStringWithOptions(options);
-}
-
-std::string EnumDescriptor::DebugStringWithOptions(
-    const DebugStringOptions& options) const {
-  std::string contents;
-  DebugString(0, &contents, options);
-  return contents;
-}
-
-void EnumDescriptor::DebugString(
-    int depth, std::string* contents,
-    const DebugStringOptions& debug_string_options) const {
-  std::string prefix(depth * 2, ' ');
-  ++depth;
-
-  SourceLocationCommentPrinter comment_printer(this, prefix,
-                                               debug_string_options);
-  comment_printer.AddPreComment(contents);
-
-  strings::SubstituteAndAppend(contents, "$0enum $1 {\n", prefix, name());
-
-  FormatLineOptions(depth, options(), file()->pool(), contents);
-
-  for (int i = 0; i < value_count(); i++) {
-    value(i)->DebugString(depth, contents, debug_string_options);
-  }
-
-  if (reserved_range_count() > 0) {
-    strings::SubstituteAndAppend(contents, "$0  reserved ", prefix);
-    for (int i = 0; i < reserved_range_count(); i++) {
-      const EnumDescriptor::ReservedRange* range = reserved_range(i);
-      if (range->end == range->start) {
-        strings::SubstituteAndAppend(contents, "$0, ", range->start);
-      } else if (range->end == INT_MAX) {
-        strings::SubstituteAndAppend(contents, "$0 to max, ", range->start);
-      } else {
-        strings::SubstituteAndAppend(contents, "$0 to $1, ", range->start,
-                                  range->end);
-      }
-    }
-    contents->replace(contents->size() - 2, 2, ";\n");
-  }
-
-  if (reserved_name_count() > 0) {
-    strings::SubstituteAndAppend(contents, "$0  reserved ", prefix);
-    for (int i = 0; i < reserved_name_count(); i++) {
-      strings::SubstituteAndAppend(contents, "\"$0\", ",
-                                CEscape(reserved_name(i)));
-    }
-    contents->replace(contents->size() - 2, 2, ";\n");
-  }
-
-  strings::SubstituteAndAppend(contents, "$0}\n", prefix);
-
-  comment_printer.AddPostComment(contents);
-}
-
-std::string EnumValueDescriptor::DebugString() const {
-  DebugStringOptions options;  // default values
-  return DebugStringWithOptions(options);
-}
-
-std::string EnumValueDescriptor::DebugStringWithOptions(
-    const DebugStringOptions& options) const {
-  std::string contents;
-  DebugString(0, &contents, options);
-  return contents;
-}
-
-void EnumValueDescriptor::DebugString(
-    int depth, std::string* contents,
-    const DebugStringOptions& debug_string_options) const {
-  std::string prefix(depth * 2, ' ');
-
-  SourceLocationCommentPrinter comment_printer(this, prefix,
-                                               debug_string_options);
-  comment_printer.AddPreComment(contents);
-
-  strings::SubstituteAndAppend(contents, "$0$1 = $2", prefix, name(), number());
-
-  std::string formatted_options;
-  if (FormatBracketedOptions(depth, options(), type()->file()->pool(),
-                             &formatted_options)) {
-    strings::SubstituteAndAppend(contents, " [$0]", formatted_options);
-  }
-  contents->append(";\n");
-
-  comment_printer.AddPostComment(contents);
-}
-
-std::string ServiceDescriptor::DebugString() const {
-  DebugStringOptions options;  // default values
-  return DebugStringWithOptions(options);
-}
-
-std::string ServiceDescriptor::DebugStringWithOptions(
-    const DebugStringOptions& options) const {
-  std::string contents;
-  DebugString(&contents, options);
-  return contents;
-}
-
-void ServiceDescriptor::DebugString(
-    std::string* contents,
-    const DebugStringOptions& debug_string_options) const {
-  SourceLocationCommentPrinter comment_printer(this, /* prefix */ "",
-                                               debug_string_options);
-  comment_printer.AddPreComment(contents);
-
-  strings::SubstituteAndAppend(contents, "service $0 {\n", name());
-
-  FormatLineOptions(1, options(), file()->pool(), contents);
-
-  for (int i = 0; i < method_count(); i++) {
-    method(i)->DebugString(1, contents, debug_string_options);
-  }
-
-  contents->append("}\n");
-
-  comment_printer.AddPostComment(contents);
-}
-
-std::string MethodDescriptor::DebugString() const {
-  DebugStringOptions options;  // default values
-  return DebugStringWithOptions(options);
-}
-
-std::string MethodDescriptor::DebugStringWithOptions(
-    const DebugStringOptions& options) const {
-  std::string contents;
-  DebugString(0, &contents, options);
-  return contents;
-}
-
-void MethodDescriptor::DebugString(
-    int depth, std::string* contents,
-    const DebugStringOptions& debug_string_options) const {
-  std::string prefix(depth * 2, ' ');
-  ++depth;
-
-  SourceLocationCommentPrinter comment_printer(this, prefix,
-                                               debug_string_options);
-  comment_printer.AddPreComment(contents);
-
-  strings::SubstituteAndAppend(
-      contents, "$0rpc $1($4.$2) returns ($5.$3)", prefix, name(),
-      input_type()->full_name(), output_type()->full_name(),
-      client_streaming() ? "stream " : "", server_streaming() ? "stream " : "");
-
-  std::string formatted_options;
-  if (FormatLineOptions(depth, options(), service()->file()->pool(),
-                        &formatted_options)) {
-    strings::SubstituteAndAppend(contents, " {\n$0$1}\n", formatted_options,
-                              prefix);
-  } else {
-    contents->append(";\n");
-  }
-
-  comment_printer.AddPostComment(contents);
-}
-
-// Location methods ===============================================
-
-bool FileDescriptor::GetSourceLocation(const std::vector<int>& path,
-                                       SourceLocation* out_location) const {
-  GOOGLE_CHECK(out_location != nullptr);
-  if (source_code_info_) {
-    if (const SourceCodeInfo_Location* loc =
-            tables_->GetSourceLocation(path, source_code_info_)) {
-      const RepeatedField<int32_t>& span = loc->span();
-      if (span.size() == 3 || span.size() == 4) {
-        out_location->start_line = span.Get(0);
-        out_location->start_column = span.Get(1);
-        out_location->end_line = span.Get(span.size() == 3 ? 0 : 2);
-        out_location->end_column = span.Get(span.size() - 1);
-
-        out_location->leading_comments = loc->leading_comments();
-        out_location->trailing_comments = loc->trailing_comments();
-        out_location->leading_detached_comments.assign(
-            loc->leading_detached_comments().begin(),
-            loc->leading_detached_comments().end());
-        return true;
-      }
-    }
-  }
-  return false;
-}
-
-bool FileDescriptor::GetSourceLocation(SourceLocation* out_location) const {
-  std::vector<int> path;  // empty path for root FileDescriptor
-  return GetSourceLocation(path, out_location);
-}
-
-bool FieldDescriptor::is_packed() const {
-  if (!is_packable()) return false;
-  if (file_->syntax() == FileDescriptor::SYNTAX_PROTO2) {
-    return (options_ != nullptr) && options_->packed();
-  } else {
-    return options_ == nullptr || !options_->has_packed() || options_->packed();
-  }
-}
-
-bool Descriptor::GetSourceLocation(SourceLocation* out_location) const {
-  std::vector<int> path;
-  GetLocationPath(&path);
-  return file()->GetSourceLocation(path, out_location);
-}
-
-bool FieldDescriptor::GetSourceLocation(SourceLocation* out_location) const {
-  std::vector<int> path;
-  GetLocationPath(&path);
-  return file()->GetSourceLocation(path, out_location);
-}
-
-bool OneofDescriptor::GetSourceLocation(SourceLocation* out_location) const {
-  std::vector<int> path;
-  GetLocationPath(&path);
-  return containing_type()->file()->GetSourceLocation(path, out_location);
-}
-
-bool EnumDescriptor::GetSourceLocation(SourceLocation* out_location) const {
-  std::vector<int> path;
-  GetLocationPath(&path);
-  return file()->GetSourceLocation(path, out_location);
-}
-
-bool MethodDescriptor::GetSourceLocation(SourceLocation* out_location) const {
-  std::vector<int> path;
-  GetLocationPath(&path);
-  return service()->file()->GetSourceLocation(path, out_location);
-}
-
-bool ServiceDescriptor::GetSourceLocation(SourceLocation* out_location) const {
-  std::vector<int> path;
-  GetLocationPath(&path);
-  return file()->GetSourceLocation(path, out_location);
-}
-
-bool EnumValueDescriptor::GetSourceLocation(
-    SourceLocation* out_location) const {
-  std::vector<int> path;
-  GetLocationPath(&path);
-  return type()->file()->GetSourceLocation(path, out_location);
-}
-
-void Descriptor::GetLocationPath(std::vector<int>* output) const {
-  if (containing_type()) {
-    containing_type()->GetLocationPath(output);
-    output->push_back(DescriptorProto::kNestedTypeFieldNumber);
-    output->push_back(index());
-  } else {
-    output->push_back(FileDescriptorProto::kMessageTypeFieldNumber);
-    output->push_back(index());
-  }
-}
-
-void FieldDescriptor::GetLocationPath(std::vector<int>* output) const {
-  if (is_extension()) {
-    if (extension_scope() == nullptr) {
-      output->push_back(FileDescriptorProto::kExtensionFieldNumber);
-      output->push_back(index());
-    } else {
-      extension_scope()->GetLocationPath(output);
-      output->push_back(DescriptorProto::kExtensionFieldNumber);
-      output->push_back(index());
-    }
-  } else {
-    containing_type()->GetLocationPath(output);
-    output->push_back(DescriptorProto::kFieldFieldNumber);
-    output->push_back(index());
-  }
-}
-
-void OneofDescriptor::GetLocationPath(std::vector<int>* output) const {
-  containing_type()->GetLocationPath(output);
-  output->push_back(DescriptorProto::kOneofDeclFieldNumber);
-  output->push_back(index());
-}
-
-void EnumDescriptor::GetLocationPath(std::vector<int>* output) const {
-  if (containing_type()) {
-    containing_type()->GetLocationPath(output);
-    output->push_back(DescriptorProto::kEnumTypeFieldNumber);
-    output->push_back(index());
-  } else {
-    output->push_back(FileDescriptorProto::kEnumTypeFieldNumber);
-    output->push_back(index());
-  }
-}
-
-void EnumValueDescriptor::GetLocationPath(std::vector<int>* output) const {
-  type()->GetLocationPath(output);
-  output->push_back(EnumDescriptorProto::kValueFieldNumber);
-  output->push_back(index());
-}
-
-void ServiceDescriptor::GetLocationPath(std::vector<int>* output) const {
-  output->push_back(FileDescriptorProto::kServiceFieldNumber);
-  output->push_back(index());
-}
-
-void MethodDescriptor::GetLocationPath(std::vector<int>* output) const {
-  service()->GetLocationPath(output);
-  output->push_back(ServiceDescriptorProto::kMethodFieldNumber);
-  output->push_back(index());
-}
-
-// ===================================================================
-
-namespace {
-
-// Represents an options message to interpret. Extension names in the option
-// name are resolved relative to name_scope. element_name and orig_opt are
-// used only for error reporting (since the parser records locations against
-// pointers in the original options, not the mutable copy). The Message must be
-// one of the Options messages in descriptor.proto.
-struct OptionsToInterpret {
-  OptionsToInterpret(const std::string& ns, const std::string& el,
-                     const std::vector<int>& path, const Message* orig_opt,
-                     Message* opt)
-      : name_scope(ns),
-        element_name(el),
-        element_path(path),
-        original_options(orig_opt),
-        options(opt) {}
-  std::string name_scope;
-  std::string element_name;
-  std::vector<int> element_path;
-  const Message* original_options;
-  Message* options;
-};
-
-}  // namespace
-
-class DescriptorBuilder {
- public:
-  DescriptorBuilder(const DescriptorPool* pool, DescriptorPool::Tables* tables,
-                    DescriptorPool::ErrorCollector* error_collector);
-  ~DescriptorBuilder();
-
-  const FileDescriptor* BuildFile(const FileDescriptorProto& proto);
-
- private:
-  friend class OptionInterpreter;
-
-  // Non-recursive part of BuildFile functionality.
-  FileDescriptor* BuildFileImpl(const FileDescriptorProto& proto,
-                                internal::FlatAllocator& alloc);
-
-  const DescriptorPool* pool_;
-  DescriptorPool::Tables* tables_;  // for convenience
-  DescriptorPool::ErrorCollector* error_collector_;
-
-  // As we build descriptors we store copies of the options messages in
-  // them. We put pointers to those copies in this vector, as we build, so we
-  // can later (after cross-linking) interpret those options.
-  std::vector<OptionsToInterpret> options_to_interpret_;
-
-  bool had_errors_;
-  std::string filename_;
-  FileDescriptor* file_;
-  FileDescriptorTables* file_tables_;
-  std::set<const FileDescriptor*> dependencies_;
-
-  struct MessageHints {
-    int fields_to_suggest = 0;
-    const Message* first_reason = nullptr;
-    DescriptorPool::ErrorCollector::ErrorLocation first_reason_location =
-        DescriptorPool::ErrorCollector::ErrorLocation::OTHER;
-
-    void RequestHintOnFieldNumbers(
-        const Message& reason,
-        DescriptorPool::ErrorCollector::ErrorLocation reason_location,
-        int range_start = 0, int range_end = 1) {
-      auto fit = [](int value) {
-        return std::min(std::max(value, 0), FieldDescriptor::kMaxNumber);
-      };
-      fields_to_suggest =
-          fit(fields_to_suggest + fit(fit(range_end) - fit(range_start)));
-      if (first_reason) return;
-      first_reason = &reason;
-      first_reason_location = reason_location;
-    }
-  };
-
-  std::unordered_map<const Descriptor*, MessageHints> message_hints_;
-
-  // unused_dependency_ is used to record the unused imported files.
-  // Note: public import is not considered.
-  std::set<const FileDescriptor*> unused_dependency_;
-
-  // If LookupSymbol() finds a symbol that is in a file which is not a declared
-  // dependency of this file, it will fail, but will set
-  // possible_undeclared_dependency_ to point at that file.  This is only used
-  // by AddNotDefinedError() to report a more useful error message.
-  // possible_undeclared_dependency_name_ is the name of the symbol that was
-  // actually found in possible_undeclared_dependency_, which may be a parent
-  // of the symbol actually looked for.
-  const FileDescriptor* possible_undeclared_dependency_;
-  std::string possible_undeclared_dependency_name_;
-
-  // If LookupSymbol() could resolve a symbol which is not defined,
-  // record the resolved name.  This is only used by AddNotDefinedError()
-  // to report a more useful error message.
-  std::string undefine_resolved_name_;
-
-  // Tracker for current recursion depth to implement recursion protection.
-  //
-  // Counts down to 0 when there is no depth remaining.
-  //
-  // Maximum recursion depth corresponds to 32 nested message declarations.
-  int recursion_depth_ = 32;
-
-  void AddError(const std::string& element_name, const Message& descriptor,
-                DescriptorPool::ErrorCollector::ErrorLocation location,
-                const std::string& error);
-  void AddError(const std::string& element_name, const Message& descriptor,
-                DescriptorPool::ErrorCollector::ErrorLocation location,
-                const char* error);
-  void AddRecursiveImportError(const FileDescriptorProto& proto, int from_here);
-  void AddTwiceListedError(const FileDescriptorProto& proto, int index);
-  void AddImportError(const FileDescriptorProto& proto, int index);
-
-  // Adds an error indicating that undefined_symbol was not defined.  Must
-  // only be called after LookupSymbol() fails.
-  void AddNotDefinedError(
-      const std::string& element_name, const Message& descriptor,
-      DescriptorPool::ErrorCollector::ErrorLocation location,
-      const std::string& undefined_symbol);
-
-  void AddWarning(const std::string& element_name, const Message& descriptor,
-                  DescriptorPool::ErrorCollector::ErrorLocation location,
-                  const std::string& error);
-
-  // Silly helper which determines if the given file is in the given package.
-  // I.e., either file->package() == package_name or file->package() is a
-  // nested package within package_name.
-  bool IsInPackage(const FileDescriptor* file, const std::string& package_name);
-
-  // Helper function which finds all public dependencies of the given file, and
-  // stores the them in the dependencies_ set in the builder.
-  void RecordPublicDependencies(const FileDescriptor* file);
-
-  // Like tables_->FindSymbol(), but additionally:
-  // - Search the pool's underlay if not found in tables_.
-  // - Insure that the resulting Symbol is from one of the file's declared
-  //   dependencies.
-  Symbol FindSymbol(const std::string& name, bool build_it = true);
-
-  // Like FindSymbol() but does not require that the symbol is in one of the
-  // file's declared dependencies.
-  Symbol FindSymbolNotEnforcingDeps(const std::string& name,
-                                    bool build_it = true);
-
-  // This implements the body of FindSymbolNotEnforcingDeps().
-  Symbol FindSymbolNotEnforcingDepsHelper(const DescriptorPool* pool,
-                                          const std::string& name,
-                                          bool build_it = true);
-
-  // Like FindSymbol(), but looks up the name relative to some other symbol
-  // name.  This first searches siblings of relative_to, then siblings of its
-  // parents, etc.  For example, LookupSymbol("foo.bar", "baz.moo.corge") makes
-  // the following calls, returning the first non-null result:
-  // FindSymbol("baz.moo.foo.bar"), FindSymbol("baz.foo.bar"),
-  // FindSymbol("foo.bar").  If AllowUnknownDependencies() has been called
-  // on the DescriptorPool, this will generate a placeholder type if
-  // the name is not found (unless the name itself is malformed).  The
-  // placeholder_type parameter indicates what kind of placeholder should be
-  // constructed in this case.  The resolve_mode parameter determines whether
-  // any symbol is returned, or only symbols that are types.  Note, however,
-  // that LookupSymbol may still return a non-type symbol in LOOKUP_TYPES mode,
-  // if it believes that's all it could refer to.  The caller should always
-  // check that it receives the type of symbol it was expecting.
-  enum ResolveMode { LOOKUP_ALL, LOOKUP_TYPES };
-  Symbol LookupSymbol(const std::string& name, const std::string& relative_to,
-                      DescriptorPool::PlaceholderType placeholder_type =
-                          DescriptorPool::PLACEHOLDER_MESSAGE,
-                      ResolveMode resolve_mode = LOOKUP_ALL,
-                      bool build_it = true);
-
-  // Like LookupSymbol() but will not return a placeholder even if
-  // AllowUnknownDependencies() has been used.
-  Symbol LookupSymbolNoPlaceholder(const std::string& name,
-                                   const std::string& relative_to,
-                                   ResolveMode resolve_mode = LOOKUP_ALL,
-                                   bool build_it = true);
-
-  // Calls tables_->AddSymbol() and records an error if it fails.  Returns
-  // true if successful or false if failed, though most callers can ignore
-  // the return value since an error has already been recorded.
-  bool AddSymbol(const std::string& full_name, const void* parent,
-                 const std::string& name, const Message& proto, Symbol symbol);
-
-  // Like AddSymbol(), but succeeds if the symbol is already defined as long
-  // as the existing definition is also a package (because it's OK to define
-  // the same package in two different files).  Also adds all parents of the
-  // package to the symbol table (e.g. AddPackage("foo.bar", ...) will add
-  // "foo.bar" and "foo" to the table).
-  void AddPackage(const std::string& name, const Message& proto,
-                  FileDescriptor* file);
-
-  // Checks that the symbol name contains only alphanumeric characters and
-  // underscores.  Records an error otherwise.
-  void ValidateSymbolName(const std::string& name, const std::string& full_name,
-                          const Message& proto);
-
-  // Allocates a copy of orig_options in tables_ and stores it in the
-  // descriptor. Remembers its uninterpreted options, to be interpreted
-  // later. DescriptorT must be one of the Descriptor messages from
-  // descriptor.proto.
-  template <class DescriptorT>
-  void AllocateOptions(const typename DescriptorT::OptionsType& orig_options,
-                       DescriptorT* descriptor, int options_field_tag,
-                       const std::string& option_name,
-                       internal::FlatAllocator& alloc);
-  // Specialization for FileOptions.
-  void AllocateOptions(const FileOptions& orig_options,
-                       FileDescriptor* descriptor,
-                       internal::FlatAllocator& alloc);
-
-  // Implementation for AllocateOptions(). Don't call this directly.
-  template <class DescriptorT>
-  void AllocateOptionsImpl(
-      const std::string& name_scope, const std::string& element_name,
-      const typename DescriptorT::OptionsType& orig_options,
-      DescriptorT* descriptor, const std::vector<int>& options_path,
-      const std::string& option_name, internal::FlatAllocator& alloc);
-
-  // Allocates an array of two strings, the first one is a copy of `proto_name`,
-  // and the second one is the full name.
-  // Full proto name is "scope.proto_name" if scope is non-empty and
-  // "proto_name" otherwise.
-  const std::string* AllocateNameStrings(const std::string& scope,
-                                         const std::string& proto_name,
-                                         internal::FlatAllocator& alloc);
-
-  // These methods all have the same signature for the sake of the BUILD_ARRAY
-  // macro, below.
-  void BuildMessage(const DescriptorProto& proto, const Descriptor* parent,
-                    Descriptor* result, internal::FlatAllocator& alloc);
-  void BuildFieldOrExtension(const FieldDescriptorProto& proto,
-                             Descriptor* parent, FieldDescriptor* result,
-                             bool is_extension, internal::FlatAllocator& alloc);
-  void BuildField(const FieldDescriptorProto& proto, Descriptor* parent,
-                  FieldDescriptor* result, internal::FlatAllocator& alloc) {
-    BuildFieldOrExtension(proto, parent, result, false, alloc);
-  }
-  void BuildExtension(const FieldDescriptorProto& proto, Descriptor* parent,
-                      FieldDescriptor* result, internal::FlatAllocator& alloc) {
-    BuildFieldOrExtension(proto, parent, result, true, alloc);
-  }
-  void BuildExtensionRange(const DescriptorProto::ExtensionRange& proto,
-                           const Descriptor* parent,
-                           Descriptor::ExtensionRange* result,
-                           internal::FlatAllocator& alloc);
-  void BuildReservedRange(const DescriptorProto::ReservedRange& proto,
-                          const Descriptor* parent,
-                          Descriptor::ReservedRange* result,
-                          internal::FlatAllocator& alloc);
-  void BuildReservedRange(const EnumDescriptorProto::EnumReservedRange& proto,
-                          const EnumDescriptor* parent,
-                          EnumDescriptor::ReservedRange* result,
-                          internal::FlatAllocator& alloc);
-  void BuildOneof(const OneofDescriptorProto& proto, Descriptor* parent,
-                  OneofDescriptor* result, internal::FlatAllocator& alloc);
-  void CheckEnumValueUniqueness(const EnumDescriptorProto& proto,
-                                const EnumDescriptor* result);
-  void BuildEnum(const EnumDescriptorProto& proto, const Descriptor* parent,
-                 EnumDescriptor* result, internal::FlatAllocator& alloc);
-  void BuildEnumValue(const EnumValueDescriptorProto& proto,
-                      const EnumDescriptor* parent, EnumValueDescriptor* result,
-                      internal::FlatAllocator& alloc);
-  void BuildService(const ServiceDescriptorProto& proto, const void* dummy,
-                    ServiceDescriptor* result, internal::FlatAllocator& alloc);
-  void BuildMethod(const MethodDescriptorProto& proto,
-                   const ServiceDescriptor* parent, MethodDescriptor* result,
-                   internal::FlatAllocator& alloc);
-
-  void LogUnusedDependency(const FileDescriptorProto& proto,
-                           const FileDescriptor* result);
-
-  // Must be run only after building.
-  //
-  // NOTE: Options will not be available during cross-linking, as they
-  // have not yet been interpreted. Defer any handling of options to the
-  // Validate*Options methods.
-  void CrossLinkFile(FileDescriptor* file, const FileDescriptorProto& proto);
-  void CrossLinkMessage(Descriptor* message, const DescriptorProto& proto);
-  void CrossLinkField(FieldDescriptor* field,
-                      const FieldDescriptorProto& proto);
-  void CrossLinkExtensionRange(Descriptor::ExtensionRange* range,
-                               const DescriptorProto::ExtensionRange& proto);
-  void CrossLinkEnum(EnumDescriptor* enum_type,
-                     const EnumDescriptorProto& proto);
-  void CrossLinkEnumValue(EnumValueDescriptor* enum_value,
-                          const EnumValueDescriptorProto& proto);
-  void CrossLinkService(ServiceDescriptor* service,
-                        const ServiceDescriptorProto& proto);
-  void CrossLinkMethod(MethodDescriptor* method,
-                       const MethodDescriptorProto& proto);
-  void SuggestFieldNumbers(FileDescriptor* file,
-                           const FileDescriptorProto& proto);
-
-  // Must be run only after cross-linking.
-  void InterpretOptions();
-
-  // A helper class for interpreting options.
-  class OptionInterpreter {
-   public:
-    // Creates an interpreter that operates in the context of the pool of the
-    // specified builder, which must not be nullptr. We don't take ownership of
-    // the builder.
-    explicit OptionInterpreter(DescriptorBuilder* builder);
-
-    ~OptionInterpreter();
-
-    // Interprets the uninterpreted options in the specified Options message.
-    // On error, calls AddError() on the underlying builder and returns false.
-    // Otherwise returns true.
-    bool InterpretOptions(OptionsToInterpret* options_to_interpret);
-
-    // Updates the given source code info by re-writing uninterpreted option
-    // locations to refer to the corresponding interpreted option.
-    void UpdateSourceCodeInfo(SourceCodeInfo* info);
-
-    class AggregateOptionFinder;
-
-   private:
-    // Interprets uninterpreted_option_ on the specified message, which
-    // must be the mutable copy of the original options message to which
-    // uninterpreted_option_ belongs. The given src_path is the source
-    // location path to the uninterpreted option, and options_path is the
-    // source location path to the options message. The location paths are
-    // recorded and then used in UpdateSourceCodeInfo.
-    bool InterpretSingleOption(Message* options,
-                               const std::vector<int>& src_path,
-                               const std::vector<int>& options_path);
-
-    // Adds the uninterpreted_option to the given options message verbatim.
-    // Used when AllowUnknownDependencies() is in effect and we can't find
-    // the option's definition.
-    void AddWithoutInterpreting(const UninterpretedOption& uninterpreted_option,
-                                Message* options);
-
-    // A recursive helper function that drills into the intermediate fields
-    // in unknown_fields to check if field innermost_field is set on the
-    // innermost message. Returns false and sets an error if so.
-    bool ExamineIfOptionIsSet(
-        std::vector<const FieldDescriptor*>::const_iterator
-            intermediate_fields_iter,
-        std::vector<const FieldDescriptor*>::const_iterator
-            intermediate_fields_end,
-        const FieldDescriptor* innermost_field,
-        const std::string& debug_msg_name,
-        const UnknownFieldSet& unknown_fields);
-
-    // Validates the value for the option field of the currently interpreted
-    // option and then sets it on the unknown_field.
-    bool SetOptionValue(const FieldDescriptor* option_field,
-                        UnknownFieldSet* unknown_fields);
-
-    // Parses an aggregate value for a CPPTYPE_MESSAGE option and
-    // saves it into *unknown_fields.
-    bool SetAggregateOption(const FieldDescriptor* option_field,
-                            UnknownFieldSet* unknown_fields);
-
-    // Convenience functions to set an int field the right way, depending on
-    // its wire type (a single int CppType can represent multiple wire types).
-    void SetInt32(int number, int32_t value, FieldDescriptor::Type type,
-                  UnknownFieldSet* unknown_fields);
-    void SetInt64(int number, int64_t value, FieldDescriptor::Type type,
-                  UnknownFieldSet* unknown_fields);
-    void SetUInt32(int number, uint32_t value, FieldDescriptor::Type type,
-                   UnknownFieldSet* unknown_fields);
-    void SetUInt64(int number, uint64_t value, FieldDescriptor::Type type,
-                   UnknownFieldSet* unknown_fields);
-
-    // A helper function that adds an error at the specified location of the
-    // option we're currently interpreting, and returns false.
-    bool AddOptionError(DescriptorPool::ErrorCollector::ErrorLocation location,
-                        const std::string& msg) {
-      builder_->AddError(options_to_interpret_->element_name,
-                         *uninterpreted_option_, location, msg);
-      return false;
-    }
-
-    // A helper function that adds an error at the location of the option name
-    // and returns false.
-    bool AddNameError(const std::string& msg) {
-#ifdef PROTOBUF_INTERNAL_IGNORE_FIELD_NAME_ERRORS_
-      return true;
-#else   // PROTOBUF_INTERNAL_IGNORE_FIELD_NAME_ERRORS_
-      return AddOptionError(DescriptorPool::ErrorCollector::OPTION_NAME, msg);
-#endif  // PROTOBUF_INTERNAL_IGNORE_FIELD_NAME_ERRORS_
-    }
-
-    // A helper function that adds an error at the location of the option name
-    // and returns false.
-    bool AddValueError(const std::string& msg) {
-      return AddOptionError(DescriptorPool::ErrorCollector::OPTION_VALUE, msg);
-    }
-
-    // We interpret against this builder's pool. Is never nullptr. We don't own
-    // this pointer.
-    DescriptorBuilder* builder_;
-
-    // The options we're currently interpreting, or nullptr if we're not in a
-    // call to InterpretOptions.
-    const OptionsToInterpret* options_to_interpret_;
-
-    // The option we're currently interpreting within options_to_interpret_, or
-    // nullptr if we're not in a call to InterpretOptions(). This points to a
-    // submessage of the original option, not the mutable copy. Therefore we
-    // can use it to find locations recorded by the parser.
-    const UninterpretedOption* uninterpreted_option_;
-
-    // This maps the element path of uninterpreted options to the element path
-    // of the resulting interpreted option. This is used to modify a file's
-    // source code info to account for option interpretation.
-    std::map<std::vector<int>, std::vector<int>> interpreted_paths_;
-
-    // This maps the path to a repeated option field to the known number of
-    // elements the field contains. This is used to track the compute the
-    // index portion of the element path when interpreting a single option.
-    std::map<std::vector<int>, int> repeated_option_counts_;
-
-    // Factory used to create the dynamic messages we need to parse
-    // any aggregate option values we encounter.
-    DynamicMessageFactory dynamic_factory_;
-
-    GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(OptionInterpreter);
-  };
-
-  // Work-around for broken compilers:  According to the C++ standard,
-  // OptionInterpreter should have access to the private members of any class
-  // which has declared DescriptorBuilder as a friend.  Unfortunately some old
-  // versions of GCC and other compilers do not implement this correctly.  So,
-  // we have to have these intermediate methods to provide access.  We also
-  // redundantly declare OptionInterpreter a friend just to make things extra
-  // clear for these bad compilers.
-  friend class OptionInterpreter;
-  friend class OptionInterpreter::AggregateOptionFinder;
-
-  static inline bool get_allow_unknown(const DescriptorPool* pool) {
-    return pool->allow_unknown_;
-  }
-  static inline bool get_enforce_weak(const DescriptorPool* pool) {
-    return pool->enforce_weak_;
-  }
-  static inline bool get_is_placeholder(const Descriptor* descriptor) {
-    return descriptor != nullptr && descriptor->is_placeholder_;
-  }
-  static inline void assert_mutex_held(const DescriptorPool* pool) {
-    if (pool->mutex_ != nullptr) {
-      pool->mutex_->AssertHeld();
-    }
-  }
-
-  // Must be run only after options have been interpreted.
-  //
-  // NOTE: Validation code must only reference the options in the mutable
-  // descriptors, which are the ones that have been interpreted. The const
-  // proto references are passed in only so they can be provided to calls to
-  // AddError(). Do not look at their options, which have not been interpreted.
-  void ValidateFileOptions(FileDescriptor* file,
-                           const FileDescriptorProto& proto);
-  void ValidateMessageOptions(Descriptor* message,
-                              const DescriptorProto& proto);
-  void ValidateFieldOptions(FieldDescriptor* field,
-                            const FieldDescriptorProto& proto);
-  void ValidateEnumOptions(EnumDescriptor* enm,
-                           const EnumDescriptorProto& proto);
-  void ValidateEnumValueOptions(EnumValueDescriptor* enum_value,
-                                const EnumValueDescriptorProto& proto);
-  void ValidateExtensionRangeOptions(
-      const std::string& full_name, Descriptor::ExtensionRange* extension_range,
-      const DescriptorProto_ExtensionRange& proto);
-  void ValidateServiceOptions(ServiceDescriptor* service,
-                              const ServiceDescriptorProto& proto);
-  void ValidateMethodOptions(MethodDescriptor* method,
-                             const MethodDescriptorProto& proto);
-  void ValidateProto3(FileDescriptor* file, const FileDescriptorProto& proto);
-  void ValidateProto3Message(Descriptor* message, const DescriptorProto& proto);
-  void ValidateProto3Field(FieldDescriptor* field,
-                           const FieldDescriptorProto& proto);
-  void ValidateProto3Enum(EnumDescriptor* enm,
-                          const EnumDescriptorProto& proto);
-
-  // Returns true if the map entry message is compatible with the
-  // auto-generated entry message from map fields syntax.
-  bool ValidateMapEntry(FieldDescriptor* field,
-                        const FieldDescriptorProto& proto);
-
-  // Recursively detects naming conflicts with map entry types for a
-  // better error message.
-  void DetectMapConflicts(const Descriptor* message,
-                          const DescriptorProto& proto);
-
-  void ValidateJSType(FieldDescriptor* field,
-                      const FieldDescriptorProto& proto);
-};
-
-const FileDescriptor* DescriptorPool::BuildFile(
-    const FileDescriptorProto& proto) {
-  GOOGLE_CHECK(fallback_database_ == nullptr)
-      << "Cannot call BuildFile on a DescriptorPool that uses a "
-         "DescriptorDatabase.  You must instead find a way to get your file "
-         "into the underlying database.";
-  GOOGLE_CHECK(mutex_ == nullptr);  // Implied by the above GOOGLE_CHECK.
-  tables_->known_bad_symbols_.clear();
-  tables_->known_bad_files_.clear();
-  return DescriptorBuilder(this, tables_.get(), nullptr).BuildFile(proto);
-}
-
-const FileDescriptor* DescriptorPool::BuildFileCollectingErrors(
-    const FileDescriptorProto& proto, ErrorCollector* error_collector) {
-  GOOGLE_CHECK(fallback_database_ == nullptr)
-      << "Cannot call BuildFile on a DescriptorPool that uses a "
-         "DescriptorDatabase.  You must instead find a way to get your file "
-         "into the underlying database.";
-  GOOGLE_CHECK(mutex_ == nullptr);  // Implied by the above GOOGLE_CHECK.
-  tables_->known_bad_symbols_.clear();
-  tables_->known_bad_files_.clear();
-  return DescriptorBuilder(this, tables_.get(), error_collector)
-      .BuildFile(proto);
-}
-
-const FileDescriptor* DescriptorPool::BuildFileFromDatabase(
-    const FileDescriptorProto& proto) const {
-  mutex_->AssertHeld();
-  if (tables_->known_bad_files_.count(proto.name()) > 0) {
-    return nullptr;
-  }
-  const FileDescriptor* result =
-      DescriptorBuilder(this, tables_.get(), default_error_collector_)
-          .BuildFile(proto);
-  if (result == nullptr) {
-    tables_->known_bad_files_.insert(proto.name());
-  }
-  return result;
-}
-
-DescriptorBuilder::DescriptorBuilder(
-    const DescriptorPool* pool, DescriptorPool::Tables* tables,
-    DescriptorPool::ErrorCollector* error_collector)
-    : pool_(pool),
-      tables_(tables),
-      error_collector_(error_collector),
-      had_errors_(false),
-      possible_undeclared_dependency_(nullptr),
-      undefine_resolved_name_("") {}
-
-DescriptorBuilder::~DescriptorBuilder() {}
-
-void DescriptorBuilder::AddError(
-    const std::string& element_name, const Message& descriptor,
-    DescriptorPool::ErrorCollector::ErrorLocation location,
-    const std::string& error) {
-  if (error_collector_ == nullptr) {
-    if (!had_errors_) {
-      GOOGLE_LOG(ERROR) << "Invalid proto descriptor for file \"" << filename_
-                 << "\":";
-    }
-    GOOGLE_LOG(ERROR) << "  " << element_name << ": " << error;
-  } else {
-    error_collector_->AddError(filename_, element_name, &descriptor, location,
-                               error);
-  }
-  had_errors_ = true;
-}
-
-void DescriptorBuilder::AddError(
-    const std::string& element_name, const Message& descriptor,
-    DescriptorPool::ErrorCollector::ErrorLocation location, const char* error) {
-  AddError(element_name, descriptor, location, std::string(error));
-}
-
-void DescriptorBuilder::AddNotDefinedError(
-    const std::string& element_name, const Message& descriptor,
-    DescriptorPool::ErrorCollector::ErrorLocation location,
-    const std::string& undefined_symbol) {
-  if (possible_undeclared_dependency_ == nullptr &&
-      undefine_resolved_name_.empty()) {
-    AddError(element_name, descriptor, location,
-             "\"" + undefined_symbol + "\" is not defined.");
-  } else {
-    if (possible_undeclared_dependency_ != nullptr) {
-      AddError(element_name, descriptor, location,
-               "\"" + possible_undeclared_dependency_name_ +
-                   "\" seems to be defined in \"" +
-                   possible_undeclared_dependency_->name() +
-                   "\", which is not "
-                   "imported by \"" +
-                   filename_ +
-                   "\".  To use it here, please "
-                   "add the necessary import.");
-    }
-    if (!undefine_resolved_name_.empty()) {
-      AddError(element_name, descriptor, location,
-               "\"" + undefined_symbol + "\" is resolved to \"" +
-                   undefine_resolved_name_ +
-                   "\", which is not defined. "
-                   "The innermost scope is searched first in name resolution. "
-                   "Consider using a leading '.'(i.e., \"." +
-                   undefined_symbol + "\") to start from the outermost scope.");
-    }
-  }
-}
-
-void DescriptorBuilder::AddWarning(
-    const std::string& element_name, const Message& descriptor,
-    DescriptorPool::ErrorCollector::ErrorLocation location,
-    const std::string& error) {
-  if (error_collector_ == nullptr) {
-    GOOGLE_LOG(WARNING) << filename_ << " " << element_name << ": " << error;
-  } else {
-    error_collector_->AddWarning(filename_, element_name, &descriptor, location,
-                                 error);
-  }
-}
-
-bool DescriptorBuilder::IsInPackage(const FileDescriptor* file,
-                                    const std::string& package_name) {
-  return HasPrefixString(file->package(), package_name) &&
-         (file->package().size() == package_name.size() ||
-          file->package()[package_name.size()] == '.');
-}
-
-void DescriptorBuilder::RecordPublicDependencies(const FileDescriptor* file) {
-  if (file == nullptr || !dependencies_.insert(file).second) return;
-  for (int i = 0; file != nullptr && i < file->public_dependency_count(); i++) {
-    RecordPublicDependencies(file->public_dependency(i));
-  }
-}
-
-Symbol DescriptorBuilder::FindSymbolNotEnforcingDepsHelper(
-    const DescriptorPool* pool, const std::string& name, bool build_it) {
-  // If we are looking at an underlay, we must lock its mutex_, since we are
-  // accessing the underlay's tables_ directly.
-  MutexLockMaybe lock((pool == pool_) ? nullptr : pool->mutex_);
-
-  Symbol result = pool->tables_->FindSymbol(name);
-  if (result.IsNull() && pool->underlay_ != nullptr) {
-    // Symbol not found; check the underlay.
-    result = FindSymbolNotEnforcingDepsHelper(pool->underlay_, name);
-  }
-
-  if (result.IsNull()) {
-    // With lazily_build_dependencies_, a symbol lookup at cross link time is
-    // not guaranteed to be successful. In most cases, build_it will be false,
-    // which intentionally prevents us from building an import until it's
-    // actually needed. In some cases, like registering an extension, we want
-    // to build the file containing the symbol, and build_it will be set.
-    // Also, build_it will be true when !lazily_build_dependencies_, to provide
-    // better error reporting of missing dependencies.
-    if (build_it && pool->TryFindSymbolInFallbackDatabase(name)) {
-      result = pool->tables_->FindSymbol(name);
-    }
-  }
-
-  return result;
-}
-
-Symbol DescriptorBuilder::FindSymbolNotEnforcingDeps(const std::string& name,
-                                                     bool build_it) {
-  Symbol result = FindSymbolNotEnforcingDepsHelper(pool_, name, build_it);
-  // Only find symbols which were defined in this file or one of its
-  // dependencies.
-  const FileDescriptor* file = result.GetFile();
-  if (file == file_ || dependencies_.count(file) > 0) {
-    unused_dependency_.erase(file);
-  }
-  return result;
-}
-
-Symbol DescriptorBuilder::FindSymbol(const std::string& name, bool build_it) {
-  Symbol result = FindSymbolNotEnforcingDeps(name, build_it);
-
-  if (result.IsNull()) return result;
-
-  if (!pool_->enforce_dependencies_) {
-    // Hack for CompilerUpgrader, and also used for lazily_build_dependencies_
-    return result;
-  }
-
-  // Only find symbols which were defined in this file or one of its
-  // dependencies.
-  const FileDescriptor* file = result.GetFile();
-  if (file == file_ || dependencies_.count(file) > 0) {
-    return result;
-  }
-
-  if (result.IsPackage()) {
-    // Arg, this is overcomplicated.  The symbol is a package name.  It could
-    // be that the package was defined in multiple files.  result.GetFile()
-    // returns the first file we saw that used this package.  We've determined
-    // that that file is not a direct dependency of the file we are currently
-    // building, but it could be that some other file which *is* a direct
-    // dependency also defines the same package.  We can't really rule out this
-    // symbol unless none of the dependencies define it.
-    if (IsInPackage(file_, name)) return result;
-    for (std::set<const FileDescriptor*>::const_iterator it =
-             dependencies_.begin();
-         it != dependencies_.end(); ++it) {
-      // Note:  A dependency may be nullptr if it was not found or had errors.
-      if (*it != nullptr && IsInPackage(*it, name)) return result;
-    }
-  }
-
-  possible_undeclared_dependency_ = file;
-  possible_undeclared_dependency_name_ = name;
-  return Symbol();
-}
-
-Symbol DescriptorBuilder::LookupSymbolNoPlaceholder(
-    const std::string& name, const std::string& relative_to,
-    ResolveMode resolve_mode, bool build_it) {
-  possible_undeclared_dependency_ = nullptr;
-  undefine_resolved_name_.clear();
-
-  if (!name.empty() && name[0] == '.') {
-    // Fully-qualified name.
-    return FindSymbol(name.substr(1), build_it);
-  }
-
-  // If name is something like "Foo.Bar.baz", and symbols named "Foo" are
-  // defined in multiple parent scopes, we only want to find "Bar.baz" in the
-  // innermost one.  E.g., the following should produce an error:
-  //   message Bar { message Baz {} }
-  //   message Foo {
-  //     message Bar {
-  //     }
-  //     optional Bar.Baz baz = 1;
-  //   }
-  // So, we look for just "Foo" first, then look for "Bar.baz" within it if
-  // found.
-  std::string::size_type name_dot_pos = name.find_first_of('.');
-  std::string first_part_of_name;
-  if (name_dot_pos == std::string::npos) {
-    first_part_of_name = name;
-  } else {
-    first_part_of_name = name.substr(0, name_dot_pos);
-  }
-
-  std::string scope_to_try(relative_to);
-
-  while (true) {
-    // Chop off the last component of the scope.
-    std::string::size_type dot_pos = scope_to_try.find_last_of('.');
-    if (dot_pos == std::string::npos) {
-      return FindSymbol(name, build_it);
-    } else {
-      scope_to_try.erase(dot_pos);
-    }
-
-    // Append ".first_part_of_name" and try to find.
-    std::string::size_type old_size = scope_to_try.size();
-    scope_to_try.append(1, '.');
-    scope_to_try.append(first_part_of_name);
-    Symbol result = FindSymbol(scope_to_try, build_it);
-    if (!result.IsNull()) {
-      if (first_part_of_name.size() < name.size()) {
-        // name is a compound symbol, of which we only found the first part.
-        // Now try to look up the rest of it.
-        if (result.IsAggregate()) {
-          scope_to_try.append(name, first_part_of_name.size(),
-                              name.size() - first_part_of_name.size());
-          result = FindSymbol(scope_to_try, build_it);
-          if (result.IsNull()) {
-            undefine_resolved_name_ = scope_to_try;
-          }
-          return result;
-        } else {
-          // We found a symbol but it's not an aggregate.  Continue the loop.
-        }
-      } else {
-        if (resolve_mode == LOOKUP_TYPES && !result.IsType()) {
-          // We found a symbol but it's not a type.  Continue the loop.
-        } else {
-          return result;
-        }
-      }
-    }
-
-    // Not found.  Remove the name so we can try again.
-    scope_to_try.erase(old_size);
-  }
-}
-
-Symbol DescriptorBuilder::LookupSymbol(
-    const std::string& name, const std::string& relative_to,
-    DescriptorPool::PlaceholderType placeholder_type, ResolveMode resolve_mode,
-    bool build_it) {
-  Symbol result =
-      LookupSymbolNoPlaceholder(name, relative_to, resolve_mode, build_it);
-  if (result.IsNull() && pool_->allow_unknown_) {
-    // Not found, but AllowUnknownDependencies() is enabled.  Return a
-    // placeholder instead.
-    result = pool_->NewPlaceholderWithMutexHeld(name, placeholder_type);
-  }
-  return result;
-}
-
-static bool ValidateQualifiedName(StringPiece name) {
-  bool last_was_period = false;
-
-  for (char character : name) {
-    // I don't trust isalnum() due to locales.  :(
-    if (('a' <= character && character <= 'z') ||
-        ('A' <= character && character <= 'Z') ||
-        ('0' <= character && character <= '9') || (character == '_')) {
-      last_was_period = false;
-    } else if (character == '.') {
-      if (last_was_period) return false;
-      last_was_period = true;
-    } else {
-      return false;
-    }
-  }
-
-  return !name.empty() && !last_was_period;
-}
-
-Symbol DescriptorPool::NewPlaceholder(StringPiece name,
-                                      PlaceholderType placeholder_type) const {
-  MutexLockMaybe lock(mutex_);
-  return NewPlaceholderWithMutexHeld(name, placeholder_type);
-}
-
-Symbol DescriptorPool::NewPlaceholderWithMutexHeld(
-    StringPiece name, PlaceholderType placeholder_type) const {
-  if (mutex_) {
-    mutex_->AssertHeld();
-  }
-  // Compute names.
-  StringPiece placeholder_full_name;
-  StringPiece placeholder_name;
-  const std::string* placeholder_package;
-
-  if (!ValidateQualifiedName(name)) return Symbol();
-  if (name[0] == '.') {
-    // Fully-qualified.
-    placeholder_full_name = name.substr(1);
-  } else {
-    placeholder_full_name = name;
-  }
-
-  // Create the placeholders.
-  internal::FlatAllocator alloc;
-  alloc.PlanArray<FileDescriptor>(1);
-  alloc.PlanArray<std::string>(2);
-  if (placeholder_type == PLACEHOLDER_ENUM) {
-    alloc.PlanArray<EnumDescriptor>(1);
-    alloc.PlanArray<EnumValueDescriptor>(1);
-    alloc.PlanArray<std::string>(2);  // names for the descriptor.
-    alloc.PlanArray<std::string>(2);  // names for the value.
-  } else {
-    alloc.PlanArray<Descriptor>(1);
-    alloc.PlanArray<std::string>(2);  // names for the descriptor.
-    if (placeholder_type == PLACEHOLDER_EXTENDABLE_MESSAGE) {
-      alloc.PlanArray<Descriptor::ExtensionRange>(1);
-    }
-  }
-  alloc.FinalizePlanning(tables_);
-
-  const std::string::size_type dotpos = placeholder_full_name.find_last_of('.');
-  if (dotpos != std::string::npos) {
-    placeholder_package =
-        alloc.AllocateStrings(placeholder_full_name.substr(0, dotpos));
-    placeholder_name = placeholder_full_name.substr(dotpos + 1);
-  } else {
-    placeholder_package = alloc.AllocateStrings("");
-    placeholder_name = placeholder_full_name;
-  }
-
-  FileDescriptor* placeholder_file = NewPlaceholderFileWithMutexHeld(
-      StrCat(placeholder_full_name, ".placeholder.proto"), alloc);
-  placeholder_file->package_ = placeholder_package;
-
-  if (placeholder_type == PLACEHOLDER_ENUM) {
-    placeholder_file->enum_type_count_ = 1;
-    placeholder_file->enum_types_ = alloc.AllocateArray<EnumDescriptor>(1);
-
-    EnumDescriptor* placeholder_enum = &placeholder_file->enum_types_[0];
-    memset(static_cast<void*>(placeholder_enum), 0, sizeof(*placeholder_enum));
-
-    placeholder_enum->all_names_ =
-        alloc.AllocateStrings(placeholder_name, placeholder_full_name);
-    placeholder_enum->file_ = placeholder_file;
-    placeholder_enum->options_ = &EnumOptions::default_instance();
-    placeholder_enum->is_placeholder_ = true;
-    placeholder_enum->is_unqualified_placeholder_ = (name[0] != '.');
-
-    // Enums must have at least one value.
-    placeholder_enum->value_count_ = 1;
-    placeholder_enum->values_ = alloc.AllocateArray<EnumValueDescriptor>(1);
-    // Disable fast-path lookup for this enum.
-    placeholder_enum->sequential_value_limit_ = -1;
-
-    EnumValueDescriptor* placeholder_value = &placeholder_enum->values_[0];
-    memset(static_cast<void*>(placeholder_value), 0,
-           sizeof(*placeholder_value));
-
-    // Note that enum value names are siblings of their type, not children.
-    placeholder_value->all_names_ = alloc.AllocateStrings(
-        "PLACEHOLDER_VALUE", placeholder_package->empty()
-                                 ? "PLACEHOLDER_VALUE"
-                                 : *placeholder_package + ".PLACEHOLDER_VALUE");
-
-    placeholder_value->number_ = 0;
-    placeholder_value->type_ = placeholder_enum;
-    placeholder_value->options_ = &EnumValueOptions::default_instance();
-
-    return Symbol(placeholder_enum);
-  } else {
-    placeholder_file->message_type_count_ = 1;
-    placeholder_file->message_types_ = alloc.AllocateArray<Descriptor>(1);
-
-    Descriptor* placeholder_message = &placeholder_file->message_types_[0];
-    memset(static_cast<void*>(placeholder_message), 0,
-           sizeof(*placeholder_message));
-
-    placeholder_message->all_names_ =
-        alloc.AllocateStrings(placeholder_name, placeholder_full_name);
-    placeholder_message->file_ = placeholder_file;
-    placeholder_message->options_ = &MessageOptions::default_instance();
-    placeholder_message->is_placeholder_ = true;
-    placeholder_message->is_unqualified_placeholder_ = (name[0] != '.');
-
-    if (placeholder_type == PLACEHOLDER_EXTENDABLE_MESSAGE) {
-      placeholder_message->extension_range_count_ = 1;
-      placeholder_message->extension_ranges_ =
-          alloc.AllocateArray<Descriptor::ExtensionRange>(1);
-      placeholder_message->extension_ranges_[0].start = 1;
-      // kMaxNumber + 1 because ExtensionRange::end is exclusive.
-      placeholder_message->extension_ranges_[0].end =
-          FieldDescriptor::kMaxNumber + 1;
-      placeholder_message->extension_ranges_[0].options_ = nullptr;
-    }
-
-    return Symbol(placeholder_message);
-  }
-}
-
-FileDescriptor* DescriptorPool::NewPlaceholderFile(
-    StringPiece name) const {
-  MutexLockMaybe lock(mutex_);
-  internal::FlatAllocator alloc;
-  alloc.PlanArray<FileDescriptor>(1);
-  alloc.PlanArray<std::string>(1);
-  alloc.FinalizePlanning(tables_);
-
-  return NewPlaceholderFileWithMutexHeld(name, alloc);
-}
-
-FileDescriptor* DescriptorPool::NewPlaceholderFileWithMutexHeld(
-    StringPiece name, internal::FlatAllocator& alloc) const {
-  if (mutex_) {
-    mutex_->AssertHeld();
-  }
-  FileDescriptor* placeholder = alloc.AllocateArray<FileDescriptor>(1);
-  memset(static_cast<void*>(placeholder), 0, sizeof(*placeholder));
-
-  placeholder->name_ = alloc.AllocateStrings(name);
-  placeholder->package_ = &internal::GetEmptyString();
-  placeholder->pool_ = this;
-  placeholder->options_ = &FileOptions::default_instance();
-  placeholder->tables_ = &FileDescriptorTables::GetEmptyInstance();
-  placeholder->source_code_info_ = &SourceCodeInfo::default_instance();
-  placeholder->is_placeholder_ = true;
-  placeholder->syntax_ = FileDescriptor::SYNTAX_UNKNOWN;
-  placeholder->finished_building_ = true;
-  // All other fields are zero or nullptr.
-
-  return placeholder;
-}
-
-bool DescriptorBuilder::AddSymbol(const std::string& full_name,
-                                  const void* parent, const std::string& name,
-                                  const Message& proto, Symbol symbol) {
-  // If the caller passed nullptr for the parent, the symbol is at file scope.
-  // Use its file as the parent instead.
-  if (parent == nullptr) parent = file_;
-
-  if (full_name.find('\0') != std::string::npos) {
-    AddError(full_name, proto, DescriptorPool::ErrorCollector::NAME,
-             "\"" + full_name + "\" contains null character.");
-    return false;
-  }
-  if (tables_->AddSymbol(full_name, symbol)) {
-    if (!file_tables_->AddAliasUnderParent(parent, name, symbol)) {
-      // This is only possible if there was already an error adding something of
-      // the same name.
-      if (!had_errors_) {
-        GOOGLE_LOG(DFATAL) << "\"" << full_name
-                    << "\" not previously defined in "
-                       "symbols_by_name_, but was defined in "
-                       "symbols_by_parent_; this shouldn't be possible.";
-      }
-      return false;
-    }
-    return true;
-  } else {
-    const FileDescriptor* other_file = tables_->FindSymbol(full_name).GetFile();
-    if (other_file == file_) {
-      std::string::size_type dot_pos = full_name.find_last_of('.');
-      if (dot_pos == std::string::npos) {
-        AddError(full_name, proto, DescriptorPool::ErrorCollector::NAME,
-                 "\"" + full_name + "\" is already defined.");
-      } else {
-        AddError(full_name, proto, DescriptorPool::ErrorCollector::NAME,
-                 "\"" + full_name.substr(dot_pos + 1) +
-                     "\" is already defined in \"" +
-                     full_name.substr(0, dot_pos) + "\".");
-      }
-    } else {
-      // Symbol seems to have been defined in a different file.
-      AddError(full_name, proto, DescriptorPool::ErrorCollector::NAME,
-               "\"" + full_name + "\" is already defined in file \"" +
-                   (other_file == nullptr ? "null" : other_file->name()) +
-                   "\".");
-    }
-    return false;
-  }
-}
-
-void DescriptorBuilder::AddPackage(const std::string& name,
-                                   const Message& proto, FileDescriptor* file) {
-  if (name.find('\0') != std::string::npos) {
-    AddError(name, proto, DescriptorPool::ErrorCollector::NAME,
-             "\"" + name + "\" contains null character.");
-    return;
-  }
-
-  Symbol existing_symbol = tables_->FindSymbol(name);
-  // It's OK to redefine a package.
-  if (existing_symbol.IsNull()) {
-    if (&name == &file->package()) {
-      // It is the toplevel package name, so insert the descriptor directly.
-      tables_->AddSymbol(file->package(), Symbol(file));
-    } else {
-      auto* package = tables_->Allocate<Symbol::Subpackage>();
-      // If the name is the package name, then it is already in the arena.
-      // If not, copy it there. It came from the call to AddPackage below.
-      package->name_size = static_cast<int>(name.size());
-      package->file = file;
-      tables_->AddSymbol(name, Symbol(package));
-    }
-    // Also add parent package, if any.
-    std::string::size_type dot_pos = name.find_last_of('.');
-    if (dot_pos == std::string::npos) {
-      // No parents.
-      ValidateSymbolName(name, name, proto);
-    } else {
-      // Has parent.
-      AddPackage(name.substr(0, dot_pos), proto, file);
-      ValidateSymbolName(name.substr(dot_pos + 1), name, proto);
-    }
-  } else if (!existing_symbol.IsPackage()) {
-    // Symbol seems to have been defined in a different file.
-    const FileDescriptor* other_file = existing_symbol.GetFile();
-    AddError(name, proto, DescriptorPool::ErrorCollector::NAME,
-             "\"" + name +
-                 "\" is already defined (as something other than "
-                 "a package) in file \"" +
-                 (other_file == nullptr ? "null" : other_file->name()) + "\".");
-  }
-}
-
-void DescriptorBuilder::ValidateSymbolName(const std::string& name,
-                                           const std::string& full_name,
-                                           const Message& proto) {
-  if (name.empty()) {
-    AddError(full_name, proto, DescriptorPool::ErrorCollector::NAME,
-             "Missing name.");
-  } else {
-    for (char character : name) {
-      // I don't trust isalnum() due to locales.  :(
-      if ((character < 'a' || 'z' < character) &&
-          (character < 'A' || 'Z' < character) &&
-          (character < '0' || '9' < character) && (character != '_')) {
-        AddError(full_name, proto, DescriptorPool::ErrorCollector::NAME,
-                 "\"" + name + "\" is not a valid identifier.");
-        return;
-      }
-    }
-  }
-}
-
-// -------------------------------------------------------------------
-
-// This generic implementation is good for all descriptors except
-// FileDescriptor.
-template <class DescriptorT>
-void DescriptorBuilder::AllocateOptions(
-    const typename DescriptorT::OptionsType& orig_options,
-    DescriptorT* descriptor, int options_field_tag,
-    const std::string& option_name, internal::FlatAllocator& alloc) {
-  std::vector<int> options_path;
-  descriptor->GetLocationPath(&options_path);
-  options_path.push_back(options_field_tag);
-  AllocateOptionsImpl(descriptor->full_name(), descriptor->full_name(),
-                      orig_options, descriptor, options_path, option_name,
-                      alloc);
-}
-
-// We specialize for FileDescriptor.
-void DescriptorBuilder::AllocateOptions(const FileOptions& orig_options,
-                                        FileDescriptor* descriptor,
-                                        internal::FlatAllocator& alloc) {
-  std::vector<int> options_path;
-  options_path.push_back(FileDescriptorProto::kOptionsFieldNumber);
-  // We add the dummy token so that LookupSymbol does the right thing.
-  AllocateOptionsImpl(descriptor->package() + ".dummy", descriptor->name(),
-                      orig_options, descriptor, options_path,
-                      "google.protobuf.FileOptions", alloc);
-}
-
-template <class DescriptorT>
-void DescriptorBuilder::AllocateOptionsImpl(
-    const std::string& name_scope, const std::string& element_name,
-    const typename DescriptorT::OptionsType& orig_options,
-    DescriptorT* descriptor, const std::vector<int>& options_path,
-    const std::string& option_name, internal::FlatAllocator& alloc) {
-  auto* options = alloc.AllocateArray<typename DescriptorT::OptionsType>(1);
-
-  if (!orig_options.IsInitialized()) {
-    AddError(name_scope + "." + element_name, orig_options,
-             DescriptorPool::ErrorCollector::OPTION_NAME,
-             "Uninterpreted option is missing name or value.");
-    return;
-  }
-
-  // Avoid using MergeFrom()/CopyFrom() in this class to make it -fno-rtti
-  // friendly. Without RTTI, MergeFrom() and CopyFrom() will fallback to the
-  // reflection based method, which requires the Descriptor. However, we are in
-  // the middle of building the descriptors, thus the deadlock.
-  options->ParseFromString(orig_options.SerializeAsString());
-  descriptor->options_ = options;
-
-  // Don't add to options_to_interpret_ unless there were uninterpreted
-  // options.  This not only avoids unnecessary work, but prevents a
-  // bootstrapping problem when building descriptors for descriptor.proto.
-  // descriptor.proto does not contain any uninterpreted options, but
-  // attempting to interpret options anyway will cause
-  // OptionsType::GetDescriptor() to be called which may then deadlock since
-  // we're still trying to build it.
-  if (options->uninterpreted_option_size() > 0) {
-    options_to_interpret_.push_back(OptionsToInterpret(
-        name_scope, element_name, options_path, &orig_options, options));
-  }
-
-  // If the custom option is in unknown fields, no need to interpret it.
-  // Remove the dependency file from unused_dependency.
-  const UnknownFieldSet& unknown_fields = orig_options.unknown_fields();
-  if (!unknown_fields.empty()) {
-    // Can not use options->GetDescriptor() which may case deadlock.
-    Symbol msg_symbol = tables_->FindSymbol(option_name);
-    if (msg_symbol.type() == Symbol::MESSAGE) {
-      for (int i = 0; i < unknown_fields.field_count(); ++i) {
-        assert_mutex_held(pool_);
-        const FieldDescriptor* field =
-            pool_->InternalFindExtensionByNumberNoLock(
-                msg_symbol.descriptor(), unknown_fields.field(i).number());
-        if (field) {
-          unused_dependency_.erase(field->file());
-        }
-      }
-    }
-  }
-}
-
-// A common pattern:  We want to convert a repeated field in the descriptor
-// to an array of values, calling some method to build each value.
-#define BUILD_ARRAY(INPUT, OUTPUT, NAME, METHOD, PARENT)               \
-  OUTPUT->NAME##_count_ = INPUT.NAME##_size();                         \
-  OUTPUT->NAME##s_ = alloc.AllocateArray<                              \
-      typename std::remove_pointer<decltype(OUTPUT->NAME##s_)>::type>( \
-      INPUT.NAME##_size());                                            \
-  for (int i = 0; i < INPUT.NAME##_size(); i++) {                      \
-    METHOD(INPUT.NAME(i), PARENT, OUTPUT->NAME##s_ + i, alloc);        \
-  }
-
-void DescriptorBuilder::AddRecursiveImportError(
-    const FileDescriptorProto& proto, int from_here) {
-  std::string error_message("File recursively imports itself: ");
-  for (size_t i = from_here; i < tables_->pending_files_.size(); i++) {
-    error_message.append(tables_->pending_files_[i]);
-    error_message.append(" -> ");
-  }
-  error_message.append(proto.name());
-
-  if (static_cast<size_t>(from_here) < tables_->pending_files_.size() - 1) {
-    AddError(tables_->pending_files_[from_here + 1], proto,
-             DescriptorPool::ErrorCollector::IMPORT, error_message);
-  } else {
-    AddError(proto.name(), proto, DescriptorPool::ErrorCollector::IMPORT,
-             error_message);
-  }
-}
-
-void DescriptorBuilder::AddTwiceListedError(const FileDescriptorProto& proto,
-                                            int index) {
-  AddError(proto.dependency(index), proto,
-           DescriptorPool::ErrorCollector::IMPORT,
-           "Import \"" + proto.dependency(index) + "\" was listed twice.");
-}
-
-void DescriptorBuilder::AddImportError(const FileDescriptorProto& proto,
-                                       int index) {
-  std::string message;
-  if (pool_->fallback_database_ == nullptr) {
-    message = "Import \"" + proto.dependency(index) + "\" has not been loaded.";
-  } else {
-    message = "Import \"" + proto.dependency(index) +
-              "\" was not found or had errors.";
-  }
-  AddError(proto.dependency(index), proto,
-           DescriptorPool::ErrorCollector::IMPORT, message);
-}
-
-static bool ExistingFileMatchesProto(const FileDescriptor* existing_file,
-                                     const FileDescriptorProto& proto) {
-  FileDescriptorProto existing_proto;
-  existing_file->CopyTo(&existing_proto);
-  // TODO(liujisi): Remove it when CopyTo supports copying syntax params when
-  // syntax="proto2".
-  if (existing_file->syntax() == FileDescriptor::SYNTAX_PROTO2 &&
-      proto.has_syntax()) {
-    existing_proto.set_syntax(
-        existing_file->SyntaxName(existing_file->syntax()));
-  }
-
-  return existing_proto.SerializeAsString() == proto.SerializeAsString();
-}
-
-// These PlanAllocationSize functions will gather into the FlatAllocator all the
-// necessary memory allocations that BuildXXX functions below will do on the
-// Tables object.
-// They *must* be kept in sync. If we miss some PlanArray call we won't have
-// enough memory and will GOOGLE_CHECK-fail.
-static void PlanAllocationSize(
-    const RepeatedPtrField<EnumValueDescriptorProto>& values,
-    internal::FlatAllocator& alloc) {
-  alloc.PlanArray<EnumValueDescriptor>(values.size());
-  alloc.PlanArray<std::string>(2 * values.size());  // name + full_name
-  for (const auto& v : values) {
-    if (v.has_options()) alloc.PlanArray<EnumValueOptions>(1);
-  }
-}
-
-static void PlanAllocationSize(
-    const RepeatedPtrField<EnumDescriptorProto>& enums,
-    internal::FlatAllocator& alloc) {
-  alloc.PlanArray<EnumDescriptor>(enums.size());
-  alloc.PlanArray<std::string>(2 * enums.size());  // name + full_name
-  for (const auto& e : enums) {
-    if (e.has_options()) alloc.PlanArray<EnumOptions>(1);
-    PlanAllocationSize(e.value(), alloc);
-    alloc.PlanArray<EnumDescriptor::ReservedRange>(e.reserved_range_size());
-    alloc.PlanArray<const std::string*>(e.reserved_name_size());
-    alloc.PlanArray<std::string>(e.reserved_name_size());
-  }
-}
-
-static void PlanAllocationSize(
-    const RepeatedPtrField<OneofDescriptorProto>& oneofs,
-    internal::FlatAllocator& alloc) {
-  alloc.PlanArray<OneofDescriptor>(oneofs.size());
-  alloc.PlanArray<std::string>(2 * oneofs.size());  // name + full_name
-  for (const auto& oneof : oneofs) {
-    if (oneof.has_options()) alloc.PlanArray<OneofOptions>(1);
-  }
-}
-
-static void PlanAllocationSize(
-    const RepeatedPtrField<FieldDescriptorProto>& fields,
-    internal::FlatAllocator& alloc) {
-  alloc.PlanArray<FieldDescriptor>(fields.size());
-  for (const auto& field : fields) {
-    if (field.has_options()) alloc.PlanArray<FieldOptions>(1);
-    alloc.PlanFieldNames(field.name(),
-                         field.has_json_name() ? &field.json_name() : nullptr);
-    if (field.has_default_value() && field.has_type() &&
-        (field.type() == FieldDescriptorProto::TYPE_STRING ||
-         field.type() == FieldDescriptorProto::TYPE_BYTES)) {
-      // For the default string value.
-      alloc.PlanArray<std::string>(1);
-    }
-  }
-}
-
-static void PlanAllocationSize(
-    const RepeatedPtrField<DescriptorProto::ExtensionRange>& ranges,
-    internal::FlatAllocator& alloc) {
-  alloc.PlanArray<Descriptor::ExtensionRange>(ranges.size());
-  for (const auto& r : ranges) {
-    if (r.has_options()) alloc.PlanArray<ExtensionRangeOptions>(1);
-  }
-}
-
-static void PlanAllocationSize(
-    const RepeatedPtrField<DescriptorProto>& messages,
-    internal::FlatAllocator& alloc) {
-  alloc.PlanArray<Descriptor>(messages.size());
-  alloc.PlanArray<std::string>(2 * messages.size());  // name + full_name
-
-  for (const auto& message : messages) {
-    if (message.has_options()) alloc.PlanArray<MessageOptions>(1);
-    PlanAllocationSize(message.nested_type(), alloc);
-    PlanAllocationSize(message.field(), alloc);
-    PlanAllocationSize(message.extension(), alloc);
-    PlanAllocationSize(message.extension_range(), alloc);
-    alloc.PlanArray<Descriptor::ReservedRange>(message.reserved_range_size());
-    alloc.PlanArray<const std::string*>(message.reserved_name_size());
-    alloc.PlanArray<std::string>(message.reserved_name_size());
-    PlanAllocationSize(message.enum_type(), alloc);
-    PlanAllocationSize(message.oneof_decl(), alloc);
-  }
-}
-
-static void PlanAllocationSize(
-    const RepeatedPtrField<MethodDescriptorProto>& methods,
-    internal::FlatAllocator& alloc) {
-  alloc.PlanArray<MethodDescriptor>(methods.size());
-  alloc.PlanArray<std::string>(2 * methods.size());  // name + full_name
-  for (const auto& m : methods) {
-    if (m.has_options()) alloc.PlanArray<MethodOptions>(1);
-  }
-}
-
-static void PlanAllocationSize(
-    const RepeatedPtrField<ServiceDescriptorProto>& services,
-    internal::FlatAllocator& alloc) {
-  alloc.PlanArray<ServiceDescriptor>(services.size());
-  alloc.PlanArray<std::string>(2 * services.size());  // name + full_name
-  for (const auto& service : services) {
-    if (service.has_options()) alloc.PlanArray<ServiceOptions>(1);
-    PlanAllocationSize(service.method(), alloc);
-  }
-}
-
-static void PlanAllocationSize(const FileDescriptorProto& proto,
-                               internal::FlatAllocator& alloc) {
-  alloc.PlanArray<FileDescriptor>(1);
-  alloc.PlanArray<FileDescriptorTables>(1);
-  alloc.PlanArray<std::string>(2);  // name + package
-  if (proto.has_options()) alloc.PlanArray<FileOptions>(1);
-  if (proto.has_source_code_info()) alloc.PlanArray<SourceCodeInfo>(1);
-
-  PlanAllocationSize(proto.service(), alloc);
-  PlanAllocationSize(proto.message_type(), alloc);
-  PlanAllocationSize(proto.enum_type(), alloc);
-  PlanAllocationSize(proto.extension(), alloc);
-
-  alloc.PlanArray<int>(proto.weak_dependency_size());
-  alloc.PlanArray<int>(proto.public_dependency_size());
-  alloc.PlanArray<const FileDescriptor*>(proto.dependency_size());
-}
-
-const FileDescriptor* DescriptorBuilder::BuildFile(
-    const FileDescriptorProto& proto) {
-  filename_ = proto.name();
-
-  // Check if the file already exists and is identical to the one being built.
-  // Note:  This only works if the input is canonical -- that is, it
-  //   fully-qualifies all type names, has no UninterpretedOptions, etc.
-  //   This is fine, because this idempotency "feature" really only exists to
-  //   accommodate one hack in the proto1->proto2 migration layer.
-  const FileDescriptor* existing_file = tables_->FindFile(filename_);
-  if (existing_file != nullptr) {
-    // File already in pool.  Compare the existing one to the input.
-    if (ExistingFileMatchesProto(existing_file, proto)) {
-      // They're identical.  Return the existing descriptor.
-      return existing_file;
-    }
-
-    // Not a match.  The error will be detected and handled later.
-  }
-
-  // Check to see if this file is already on the pending files list.
-  // TODO(kenton):  Allow recursive imports?  It may not work with some
-  //   (most?) programming languages.  E.g., in C++, a forward declaration
-  //   of a type is not sufficient to allow it to be used even in a
-  //   generated header file due to inlining.  This could perhaps be
-  //   worked around using tricks involving inserting #include statements
-  //   mid-file, but that's pretty ugly, and I'm pretty sure there are
-  //   some languages out there that do not allow recursive dependencies
-  //   at all.
-  for (size_t i = 0; i < tables_->pending_files_.size(); i++) {
-    if (tables_->pending_files_[i] == proto.name()) {
-      AddRecursiveImportError(proto, i);
-      return nullptr;
-    }
-  }
-
-  static const int kMaximumPackageLength = 511;
-  if (proto.package().size() > kMaximumPackageLength) {
-    AddError(proto.package(), proto, DescriptorPool::ErrorCollector::NAME,
-             "Package name is too long");
-    return nullptr;
-  }
-
-  // If we have a fallback_database_, and we aren't doing lazy import building,
-  // attempt to load all dependencies now, before checkpointing tables_.  This
-  // avoids confusion with recursive checkpoints.
-  if (!pool_->lazily_build_dependencies_) {
-    if (pool_->fallback_database_ != nullptr) {
-      tables_->pending_files_.push_back(proto.name());
-      for (int i = 0; i < proto.dependency_size(); i++) {
-        if (tables_->FindFile(proto.dependency(i)) == nullptr &&
-            (pool_->underlay_ == nullptr ||
-             pool_->underlay_->FindFileByName(proto.dependency(i)) ==
-                 nullptr)) {
-          // We don't care what this returns since we'll find out below anyway.
-          pool_->TryFindFileInFallbackDatabase(proto.dependency(i));
-        }
-      }
-      tables_->pending_files_.pop_back();
-    }
-  }
-
-  // Checkpoint the tables so that we can roll back if something goes wrong.
-  tables_->AddCheckpoint();
-
-  internal::FlatAllocator alloc;
-  PlanAllocationSize(proto, alloc);
-  alloc.FinalizePlanning(tables_);
-  FileDescriptor* result = BuildFileImpl(proto, alloc);
-
-  file_tables_->FinalizeTables();
-  if (result) {
-    tables_->ClearLastCheckpoint();
-    result->finished_building_ = true;
-    alloc.ExpectConsumed();
-  } else {
-    tables_->RollbackToLastCheckpoint();
-  }
-
-  return result;
-}
-
-FileDescriptor* DescriptorBuilder::BuildFileImpl(
-    const FileDescriptorProto& proto, internal::FlatAllocator& alloc) {
-  FileDescriptor* result = alloc.AllocateArray<FileDescriptor>(1);
-  file_ = result;
-
-  result->is_placeholder_ = false;
-  result->finished_building_ = false;
-  SourceCodeInfo* info = nullptr;
-  if (proto.has_source_code_info()) {
-    info = alloc.AllocateArray<SourceCodeInfo>(1);
-    info->CopyFrom(proto.source_code_info());
-    result->source_code_info_ = info;
-  } else {
-    result->source_code_info_ = &SourceCodeInfo::default_instance();
-  }
-
-  file_tables_ = alloc.AllocateArray<FileDescriptorTables>(1);
-  file_->tables_ = file_tables_;
-
-  if (!proto.has_name()) {
-    AddError("", proto, DescriptorPool::ErrorCollector::OTHER,
-             "Missing field: FileDescriptorProto.name.");
-  }
-
-  // TODO(liujisi): Report error when the syntax is empty after all the protos
-  // have added the syntax statement.
-  if (proto.syntax().empty() || proto.syntax() == "proto2") {
-    file_->syntax_ = FileDescriptor::SYNTAX_PROTO2;
-  } else if (proto.syntax() == "proto3") {
-    file_->syntax_ = FileDescriptor::SYNTAX_PROTO3;
-  } else {
-    file_->syntax_ = FileDescriptor::SYNTAX_UNKNOWN;
-    AddError(proto.name(), proto, DescriptorPool::ErrorCollector::OTHER,
-             "Unrecognized syntax: " + proto.syntax());
-  }
-
-  result->name_ = alloc.AllocateStrings(proto.name());
-  if (proto.has_package()) {
-    result->package_ = alloc.AllocateStrings(proto.package());
-  } else {
-    // We cannot rely on proto.package() returning a valid string if
-    // proto.has_package() is false, because we might be running at static
-    // initialization time, in which case default values have not yet been
-    // initialized.
-    result->package_ = alloc.AllocateStrings("");
-  }
-  result->pool_ = pool_;
-
-  if (result->name().find('\0') != std::string::npos) {
-    AddError(result->name(), proto, DescriptorPool::ErrorCollector::NAME,
-             "\"" + result->name() + "\" contains null character.");
-    return nullptr;
-  }
-
-  // Add to tables.
-  if (!tables_->AddFile(result)) {
-    AddError(proto.name(), proto, DescriptorPool::ErrorCollector::OTHER,
-             "A file with this name is already in the pool.");
-    // Bail out early so that if this is actually the exact same file, we
-    // don't end up reporting that every single symbol is already defined.
-    return nullptr;
-  }
-  if (!result->package().empty()) {
-    if (std::count(result->package().begin(), result->package().end(), '.') >
-        kPackageLimit) {
-      AddError(result->package(), proto, DescriptorPool::ErrorCollector::NAME,
-               "Exceeds Maximum Package Depth");
-      return nullptr;
-    }
-    AddPackage(result->package(), proto, result);
-  }
-
-  // Make sure all dependencies are loaded.
-  std::set<std::string> seen_dependencies;
-  result->dependency_count_ = proto.dependency_size();
-  result->dependencies_ =
-      alloc.AllocateArray<const FileDescriptor*>(proto.dependency_size());
-  result->dependencies_once_ = nullptr;
-  unused_dependency_.clear();
-  std::set<int> weak_deps;
-  for (int i = 0; i < proto.weak_dependency_size(); ++i) {
-    weak_deps.insert(proto.weak_dependency(i));
-  }
-
-  bool need_lazy_deps = false;
-  for (int i = 0; i < proto.dependency_size(); i++) {
-    if (!seen_dependencies.insert(proto.dependency(i)).second) {
-      AddTwiceListedError(proto, i);
-    }
-
-    const FileDescriptor* dependency = tables_->FindFile(proto.dependency(i));
-    if (dependency == nullptr && pool_->underlay_ != nullptr) {
-      dependency = pool_->underlay_->FindFileByName(proto.dependency(i));
-    }
-
-    if (dependency == result) {
-      // Recursive import.  dependency/result is not fully initialized, and it's
-      // dangerous to try to do anything with it.  The recursive import error
-      // will be detected and reported in DescriptorBuilder::BuildFile().
-      return nullptr;
-    }
-
-    if (dependency == nullptr) {
-      if (!pool_->lazily_build_dependencies_) {
-        if (pool_->allow_unknown_ ||
-            (!pool_->enforce_weak_ && weak_deps.find(i) != weak_deps.end())) {
-          internal::FlatAllocator lazy_dep_alloc;
-          lazy_dep_alloc.PlanArray<FileDescriptor>(1);
-          lazy_dep_alloc.PlanArray<std::string>(1);
-          lazy_dep_alloc.FinalizePlanning(tables_);
-          dependency = pool_->NewPlaceholderFileWithMutexHeld(
-              proto.dependency(i), lazy_dep_alloc);
-        } else {
-          AddImportError(proto, i);
-        }
-      }
-    } else {
-      // Add to unused_dependency_ to track unused imported files.
-      // Note: do not track unused imported files for public import.
-      if (pool_->enforce_dependencies_ &&
-          (pool_->unused_import_track_files_.find(proto.name()) !=
-           pool_->unused_import_track_files_.end()) &&
-          (dependency->public_dependency_count() == 0)) {
-        unused_dependency_.insert(dependency);
-      }
-    }
-
-    result->dependencies_[i] = dependency;
-    if (pool_->lazily_build_dependencies_ && !dependency) {
-      need_lazy_deps = true;
-    }
-  }
-  if (need_lazy_deps) {
-    int total_char_size = 0;
-    for (int i = 0; i < proto.dependency_size(); i++) {
-      if (result->dependencies_[i] == nullptr) {
-        total_char_size += static_cast<int>(proto.dependency(i).size());
-      }
-      ++total_char_size;  // For NUL char
-    }
-
-    void* data = tables_->AllocateBytes(
-        static_cast<int>(sizeof(internal::once_flag) + total_char_size));
-    result->dependencies_once_ = ::new (data) internal::once_flag{};
-    char* name_data = reinterpret_cast<char*>(result->dependencies_once_ + 1);
-
-    for (int i = 0; i < proto.dependency_size(); i++) {
-      if (result->dependencies_[i] == nullptr) {
-        memcpy(name_data, proto.dependency(i).c_str(),
-               proto.dependency(i).size());
-        name_data += proto.dependency(i).size();
-      }
-      *name_data++ = '\0';
-    }
-  }
-
-  // Check public dependencies.
-  int public_dependency_count = 0;
-  result->public_dependencies_ =
-      alloc.AllocateArray<int>(proto.public_dependency_size());
-  for (int i = 0; i < proto.public_dependency_size(); i++) {
-    // Only put valid public dependency indexes.
-    int index = proto.public_dependency(i);
-    if (index >= 0 && index < proto.dependency_size()) {
-      result->public_dependencies_[public_dependency_count++] = index;
-      // Do not track unused imported files for public import.
-      // Calling dependency(i) builds that file when doing lazy imports,
-      // need to avoid doing this. Unused dependency detection isn't done
-      // when building lazily, anyways.
-      if (!pool_->lazily_build_dependencies_) {
-        unused_dependency_.erase(result->dependency(index));
-      }
-    } else {
-      AddError(proto.name(), proto, DescriptorPool::ErrorCollector::OTHER,
-               "Invalid public dependency index.");
-    }
-  }
-  result->public_dependency_count_ = public_dependency_count;
-
-  // Build dependency set
-  dependencies_.clear();
-  // We don't/can't do proper dependency error checking when
-  // lazily_build_dependencies_, and calling dependency(i) will force
-  // a dependency to be built, which we don't want.
-  if (!pool_->lazily_build_dependencies_) {
-    for (int i = 0; i < result->dependency_count(); i++) {
-      RecordPublicDependencies(result->dependency(i));
-    }
-  }
-
-  // Check weak dependencies.
-  int weak_dependency_count = 0;
-  result->weak_dependencies_ =
-      alloc.AllocateArray<int>(proto.weak_dependency_size());
-  for (int i = 0; i < proto.weak_dependency_size(); i++) {
-    int index = proto.weak_dependency(i);
-    if (index >= 0 && index < proto.dependency_size()) {
-      result->weak_dependencies_[weak_dependency_count++] = index;
-    } else {
-      AddError(proto.name(), proto, DescriptorPool::ErrorCollector::OTHER,
-               "Invalid weak dependency index.");
-    }
-  }
-  result->weak_dependency_count_ = weak_dependency_count;
-
-  // Convert children.
-  BUILD_ARRAY(proto, result, message_type, BuildMessage, nullptr);
-  BUILD_ARRAY(proto, result, enum_type, BuildEnum, nullptr);
-  BUILD_ARRAY(proto, result, service, BuildService, nullptr);
-  BUILD_ARRAY(proto, result, extension, BuildExtension, nullptr);
-
-  // Copy options.
-  result->options_ = nullptr;  // Set to default_instance later if necessary.
-  if (proto.has_options()) {
-    AllocateOptions(proto.options(), result, alloc);
-  }
-
-  // Note that the following steps must occur in exactly the specified order.
-
-  // Cross-link.
-  CrossLinkFile(result, proto);
-
-  if (!message_hints_.empty()) {
-    SuggestFieldNumbers(result, proto);
-  }
-
-  // Interpret any remaining uninterpreted options gathered into
-  // options_to_interpret_ during descriptor building.  Cross-linking has made
-  // extension options known, so all interpretations should now succeed.
-  if (!had_errors_) {
-    OptionInterpreter option_interpreter(this);
-    for (std::vector<OptionsToInterpret>::iterator iter =
-             options_to_interpret_.begin();
-         iter != options_to_interpret_.end(); ++iter) {
-      option_interpreter.InterpretOptions(&(*iter));
-    }
-    options_to_interpret_.clear();
-    if (info != nullptr) {
-      option_interpreter.UpdateSourceCodeInfo(info);
-    }
-  }
-
-  // Validate options. See comments at InternalSetLazilyBuildDependencies about
-  // error checking and lazy import building.
-  if (!had_errors_ && !pool_->lazily_build_dependencies_) {
-    ValidateFileOptions(result, proto);
-  }
-
-  // Additional naming conflict check for map entry types. Only need to check
-  // this if there are already errors.
-  if (had_errors_) {
-    for (int i = 0; i < proto.message_type_size(); ++i) {
-      DetectMapConflicts(result->message_type(i), proto.message_type(i));
-    }
-  }
-
-
-  // Again, see comments at InternalSetLazilyBuildDependencies about error
-  // checking. Also, don't log unused dependencies if there were previous
-  // errors, since the results might be inaccurate.
-  if (!had_errors_ && !unused_dependency_.empty() &&
-      !pool_->lazily_build_dependencies_) {
-    LogUnusedDependency(proto, result);
-  }
-
-  if (had_errors_) {
-    return nullptr;
-  } else {
-    return result;
-  }
-}
-
-
-const std::string* DescriptorBuilder::AllocateNameStrings(
-    const std::string& scope, const std::string& proto_name,
-    internal::FlatAllocator& alloc) {
-  if (scope.empty()) {
-    return alloc.AllocateStrings(proto_name, proto_name);
-  } else {
-    return alloc.AllocateStrings(proto_name,
-                                 StrCat(scope, ".", proto_name));
-  }
-}
-
-namespace {
-
-// Helper for BuildMessage below.
-struct IncrementWhenDestroyed {
-  ~IncrementWhenDestroyed() { ++to_increment; }
-  int& to_increment;
-};
-
-}  // namespace
-
-void DescriptorBuilder::BuildMessage(const DescriptorProto& proto,
-                                     const Descriptor* parent,
-                                     Descriptor* result,
-                                     internal::FlatAllocator& alloc) {
-  const std::string& scope =
-      (parent == nullptr) ? file_->package() : parent->full_name();
-  result->all_names_ = AllocateNameStrings(scope, proto.name(), alloc);
-  ValidateSymbolName(proto.name(), result->full_name(), proto);
-
-  result->file_ = file_;
-  result->containing_type_ = parent;
-  result->is_placeholder_ = false;
-  result->is_unqualified_placeholder_ = false;
-  result->well_known_type_ = Descriptor::WELLKNOWNTYPE_UNSPECIFIED;
-  result->options_ = nullptr;  // Set to default_instance later if necessary.
-
-  auto it = pool_->tables_->well_known_types_.find(result->full_name());
-  if (it != pool_->tables_->well_known_types_.end()) {
-    result->well_known_type_ = it->second;
-  }
-
-  // Calculate the continuous sequence of fields.
-  // These can be fast-path'd during lookup and don't need to be added to the
-  // tables.
-  // We use uint16_t to save space for sequential_field_limit_, so stop before
-  // overflowing it. Worst case, we are not taking full advantage on huge
-  // messages, but it is unlikely.
-  result->sequential_field_limit_ = 0;
-  for (int i = 0; i < std::numeric_limits<uint16_t>::max() &&
-                  i < proto.field_size() && proto.field(i).number() == i + 1;
-       ++i) {
-    result->sequential_field_limit_ = i + 1;
-  }
-
-  // Build oneofs first so that fields and extension ranges can refer to them.
-  BUILD_ARRAY(proto, result, oneof_decl, BuildOneof, result);
-  BUILD_ARRAY(proto, result, field, BuildField, result);
-  BUILD_ARRAY(proto, result, enum_type, BuildEnum, result);
-  BUILD_ARRAY(proto, result, extension_range, BuildExtensionRange, result);
-  BUILD_ARRAY(proto, result, extension, BuildExtension, result);
-  BUILD_ARRAY(proto, result, reserved_range, BuildReservedRange, result);
-
-  // Before building submessages, check recursion limit.
-  --recursion_depth_;
-  IncrementWhenDestroyed revert{recursion_depth_};
-  if (recursion_depth_ <= 0) {
-    AddError(result->full_name(), proto, DescriptorPool::ErrorCollector::OTHER,
-             "Reached maximum recursion limit for nested messages.");
-    result->nested_types_ = nullptr;
-    result->nested_type_count_ = 0;
-    return;
-  }
-  BUILD_ARRAY(proto, result, nested_type, BuildMessage, result);
-
-  // Copy reserved names.
-  int reserved_name_count = proto.reserved_name_size();
-  result->reserved_name_count_ = reserved_name_count;
-  result->reserved_names_ =
-      alloc.AllocateArray<const std::string*>(reserved_name_count);
-  for (int i = 0; i < reserved_name_count; ++i) {
-    result->reserved_names_[i] =
-        alloc.AllocateStrings(proto.reserved_name(i));
-  }
-
-  // Copy options.
-  if (proto.has_options()) {
-    AllocateOptions(proto.options(), result,
-                    DescriptorProto::kOptionsFieldNumber,
-                    "google.protobuf.MessageOptions", alloc);
-  }
-
-  AddSymbol(result->full_name(), parent, result->name(), proto, Symbol(result));
-
-  for (int i = 0; i < proto.reserved_range_size(); i++) {
-    const DescriptorProto_ReservedRange& range1 = proto.reserved_range(i);
-    for (int j = i + 1; j < proto.reserved_range_size(); j++) {
-      const DescriptorProto_ReservedRange& range2 = proto.reserved_range(j);
-      if (range1.end() > range2.start() && range2.end() > range1.start()) {
-        AddError(result->full_name(), proto.reserved_range(i),
-                 DescriptorPool::ErrorCollector::NUMBER,
-                 strings::Substitute("Reserved range $0 to $1 overlaps with "
-                                  "already-defined range $2 to $3.",
-                                  range2.start(), range2.end() - 1,
-                                  range1.start(), range1.end() - 1));
-      }
-    }
-  }
-
-  HASH_SET<std::string> reserved_name_set;
-  for (int i = 0; i < proto.reserved_name_size(); i++) {
-    const std::string& name = proto.reserved_name(i);
-    if (reserved_name_set.find(name) == reserved_name_set.end()) {
-      reserved_name_set.insert(name);
-    } else {
-      AddError(name, proto, DescriptorPool::ErrorCollector::NAME,
-               strings::Substitute("Field name \"$0\" is reserved multiple times.",
-                                name));
-    }
-  }
-
-
-  for (int i = 0; i < result->field_count(); i++) {
-    const FieldDescriptor* field = result->field(i);
-    for (int j = 0; j < result->extension_range_count(); j++) {
-      const Descriptor::ExtensionRange* range = result->extension_range(j);
-      if (range->start <= field->number() && field->number() < range->end) {
-        message_hints_[result].RequestHintOnFieldNumbers(
-            proto.extension_range(j), DescriptorPool::ErrorCollector::NUMBER);
-        AddError(
-            field->full_name(), proto.extension_range(j),
-            DescriptorPool::ErrorCollector::NUMBER,
-            strings::Substitute(
-                "Extension range $0 to $1 includes field \"$2\" ($3).",
-                range->start, range->end - 1, field->name(), field->number()));
-      }
-    }
-    for (int j = 0; j < result->reserved_range_count(); j++) {
-      const Descriptor::ReservedRange* range = result->reserved_range(j);
-      if (range->start <= field->number() && field->number() < range->end) {
-        message_hints_[result].RequestHintOnFieldNumbers(
-            proto.reserved_range(j), DescriptorPool::ErrorCollector::NUMBER);
-        AddError(field->full_name(), proto.reserved_range(j),
-                 DescriptorPool::ErrorCollector::NUMBER,
-                 strings::Substitute("Field \"$0\" uses reserved number $1.",
-                                  field->name(), field->number()));
-      }
-    }
-    if (reserved_name_set.find(field->name()) != reserved_name_set.end()) {
-      AddError(
-          field->full_name(), proto.field(i),
-          DescriptorPool::ErrorCollector::NAME,
-          strings::Substitute("Field name \"$0\" is reserved.", field->name()));
-    }
-
-  }
-
-  // Check that extension ranges don't overlap and don't include
-  // reserved field numbers or names.
-  for (int i = 0; i < result->extension_range_count(); i++) {
-    const Descriptor::ExtensionRange* range1 = result->extension_range(i);
-    for (int j = 0; j < result->reserved_range_count(); j++) {
-      const Descriptor::ReservedRange* range2 = result->reserved_range(j);
-      if (range1->end > range2->start && range2->end > range1->start) {
-        AddError(result->full_name(), proto.extension_range(i),
-                 DescriptorPool::ErrorCollector::NUMBER,
-                 strings::Substitute("Extension range $0 to $1 overlaps with "
-                                  "reserved range $2 to $3.",
-                                  range1->start, range1->end - 1, range2->start,
-                                  range2->end - 1));
-      }
-    }
-    for (int j = i + 1; j < result->extension_range_count(); j++) {
-      const Descriptor::ExtensionRange* range2 = result->extension_range(j);
-      if (range1->end > range2->start && range2->end > range1->start) {
-        AddError(result->full_name(), proto.extension_range(i),
-                 DescriptorPool::ErrorCollector::NUMBER,
-                 strings::Substitute("Extension range $0 to $1 overlaps with "
-                                  "already-defined range $2 to $3.",
-                                  range2->start, range2->end - 1, range1->start,
-                                  range1->end - 1));
-      }
-    }
-  }
-}
-
-void DescriptorBuilder::BuildFieldOrExtension(const FieldDescriptorProto& proto,
-                                              Descriptor* parent,
-                                              FieldDescriptor* result,
-                                              bool is_extension,
-                                              internal::FlatAllocator& alloc) {
-  const std::string& scope =
-      (parent == nullptr) ? file_->package() : parent->full_name();
-
-  // We allocate all names in a single array, and dedup them.
-  // We remember the indices for the potentially deduped values.
-  auto all_names = alloc.AllocateFieldNames(
-      proto.name(), scope,
-      proto.has_json_name() ? &proto.json_name() : nullptr);
-  result->all_names_ = all_names.array;
-  result->lowercase_name_index_ = all_names.lowercase_index;
-  result->camelcase_name_index_ = all_names.camelcase_index;
-  result->json_name_index_ = all_names.json_index;
-
-  ValidateSymbolName(proto.name(), result->full_name(), proto);
-
-  result->file_ = file_;
-  result->number_ = proto.number();
-  result->is_extension_ = is_extension;
-  result->is_oneof_ = false;
-  result->proto3_optional_ = proto.proto3_optional();
-
-  if (proto.proto3_optional() &&
-      file_->syntax() != FileDescriptor::SYNTAX_PROTO3) {
-    AddError(result->full_name(), proto, DescriptorPool::ErrorCollector::TYPE,
-             "The [proto3_optional=true] option may only be set on proto3"
-             "fields, not " +
-                 result->full_name());
-  }
-
-  result->has_json_name_ = proto.has_json_name();
-
-  // Some compilers do not allow static_cast directly between two enum types,
-  // so we must cast to int first.
-  result->type_ = static_cast<FieldDescriptor::Type>(
-      implicit_cast<int>(proto.type()));
-  result->label_ = static_cast<FieldDescriptor::Label>(
-      implicit_cast<int>(proto.label()));
-
-  if (result->label_ == FieldDescriptor::LABEL_REQUIRED) {
-    // An extension cannot have a required field (b/13365836).
-    if (result->is_extension_) {
-      AddError(result->full_name(), proto,
-               // Error location `TYPE`: we would really like to indicate
-               // `LABEL`, but the `ErrorLocation` enum has no entry for this,
-               // and we don't necessarily know about all implementations of the
-               // `ErrorCollector` interface to extend them to handle the new
-               // error location type properly.
-               DescriptorPool::ErrorCollector::TYPE,
-               "The extension " + result->full_name() + " cannot be required.");
-    }
-  }
-
-  // Some of these may be filled in when cross-linking.
-  result->containing_type_ = nullptr;
-  result->type_once_ = nullptr;
-  result->default_value_enum_ = nullptr;
-
-  result->has_default_value_ = proto.has_default_value();
-  if (proto.has_default_value() && result->is_repeated()) {
-    AddError(result->full_name(), proto,
-             DescriptorPool::ErrorCollector::DEFAULT_VALUE,
-             "Repeated fields can't have default values.");
-  }
-
-  if (proto.has_type()) {
-    if (proto.has_default_value()) {
-      char* end_pos = nullptr;
-      switch (result->cpp_type()) {
-        case FieldDescriptor::CPPTYPE_INT32:
-          result->default_value_int32_t_ =
-              strtol(proto.default_value().c_str(), &end_pos, 0);
-          break;
-        case FieldDescriptor::CPPTYPE_INT64:
-          result->default_value_int64_t_ =
-              strto64(proto.default_value().c_str(), &end_pos, 0);
-          break;
-        case FieldDescriptor::CPPTYPE_UINT32:
-          result->default_value_uint32_t_ =
-              strtoul(proto.default_value().c_str(), &end_pos, 0);
-          break;
-        case FieldDescriptor::CPPTYPE_UINT64:
-          result->default_value_uint64_t_ =
-              strtou64(proto.default_value().c_str(), &end_pos, 0);
-          break;
-        case FieldDescriptor::CPPTYPE_FLOAT:
-          if (proto.default_value() == "inf") {
-            result->default_value_float_ =
-                std::numeric_limits<float>::infinity();
-          } else if (proto.default_value() == "-inf") {
-            result->default_value_float_ =
-                -std::numeric_limits<float>::infinity();
-          } else if (proto.default_value() == "nan") {
-            result->default_value_float_ =
-                std::numeric_limits<float>::quiet_NaN();
-          } else {
-            result->default_value_float_ = io::SafeDoubleToFloat(
-                io::NoLocaleStrtod(proto.default_value().c_str(), &end_pos));
-          }
-          break;
-        case FieldDescriptor::CPPTYPE_DOUBLE:
-          if (proto.default_value() == "inf") {
-            result->default_value_double_ =
-                std::numeric_limits<double>::infinity();
-          } else if (proto.default_value() == "-inf") {
-            result->default_value_double_ =
-                -std::numeric_limits<double>::infinity();
-          } else if (proto.default_value() == "nan") {
-            result->default_value_double_ =
-                std::numeric_limits<double>::quiet_NaN();
-          } else {
-            result->default_value_double_ =
-                io::NoLocaleStrtod(proto.default_value().c_str(), &end_pos);
-          }
-          break;
-        case FieldDescriptor::CPPTYPE_BOOL:
-          if (proto.default_value() == "true") {
-            result->default_value_bool_ = true;
-          } else if (proto.default_value() == "false") {
-            result->default_value_bool_ = false;
-          } else {
-            AddError(result->full_name(), proto,
-                     DescriptorPool::ErrorCollector::DEFAULT_VALUE,
-                     "Boolean default must be true or false.");
-          }
-          break;
-        case FieldDescriptor::CPPTYPE_ENUM:
-          // This will be filled in when cross-linking.
-          result->default_value_enum_ = nullptr;
-          break;
-        case FieldDescriptor::CPPTYPE_STRING:
-          if (result->type() == FieldDescriptor::TYPE_BYTES) {
-            result->default_value_string_ = alloc.AllocateStrings(
-                UnescapeCEscapeString(proto.default_value()));
-          } else {
-            result->default_value_string_ =
-                alloc.AllocateStrings(proto.default_value());
-          }
-          break;
-        case FieldDescriptor::CPPTYPE_MESSAGE:
-          AddError(result->full_name(), proto,
-                   DescriptorPool::ErrorCollector::DEFAULT_VALUE,
-                   "Messages can't have default values.");
-          result->has_default_value_ = false;
-          result->default_generated_instance_ = nullptr;
-          break;
-      }
-
-      if (end_pos != nullptr) {
-        // end_pos is only set non-null by the parsers for numeric types,
-        // above. This checks that the default was non-empty and had no extra
-        // junk after the end of the number.
-        if (proto.default_value().empty() || *end_pos != '\0') {
-          AddError(result->full_name(), proto,
-                   DescriptorPool::ErrorCollector::DEFAULT_VALUE,
-                   "Couldn't parse default value \"" + proto.default_value() +
-                       "\".");
-        }
-      }
-    } else {
-      // No explicit default value
-      switch (result->cpp_type()) {
-        case FieldDescriptor::CPPTYPE_INT32:
-          result->default_value_int32_t_ = 0;
-          break;
-        case FieldDescriptor::CPPTYPE_INT64:
-          result->default_value_int64_t_ = 0;
-          break;
-        case FieldDescriptor::CPPTYPE_UINT32:
-          result->default_value_uint32_t_ = 0;
-          break;
-        case FieldDescriptor::CPPTYPE_UINT64:
-          result->default_value_uint64_t_ = 0;
-          break;
-        case FieldDescriptor::CPPTYPE_FLOAT:
-          result->default_value_float_ = 0.0f;
-          break;
-        case FieldDescriptor::CPPTYPE_DOUBLE:
-          result->default_value_double_ = 0.0;
-          break;
-        case FieldDescriptor::CPPTYPE_BOOL:
-          result->default_value_bool_ = false;
-          break;
-        case FieldDescriptor::CPPTYPE_ENUM:
-          // This will be filled in when cross-linking.
-          result->default_value_enum_ = nullptr;
-          break;
-        case FieldDescriptor::CPPTYPE_STRING:
-          result->default_value_string_ = &internal::GetEmptyString();
-          break;
-        case FieldDescriptor::CPPTYPE_MESSAGE:
-          result->default_generated_instance_ = nullptr;
-          break;
-      }
-    }
-  }
-
-  if (result->number() <= 0) {
-    message_hints_[parent].RequestHintOnFieldNumbers(
-        proto, DescriptorPool::ErrorCollector::NUMBER);
-    AddError(result->full_name(), proto, DescriptorPool::ErrorCollector::NUMBER,
-             "Field numbers must be positive integers.");
-  } else if (!is_extension && result->number() > FieldDescriptor::kMaxNumber) {
-    // Only validate that the number is within the valid field range if it is
-    // not an extension. Since extension numbers are validated with the
-    // extendee's valid set of extension numbers, and those are in turn
-    // validated against the max allowed number, the check is unnecessary for
-    // extension fields.
-    // This avoids cross-linking issues that arise when attempting to check if
-    // the extendee is a message_set_wire_format message, which has a higher max
-    // on extension numbers.
-    message_hints_[parent].RequestHintOnFieldNumbers(
-        proto, DescriptorPool::ErrorCollector::NUMBER);
-    AddError(result->full_name(), proto, DescriptorPool::ErrorCollector::NUMBER,
-             strings::Substitute("Field numbers cannot be greater than $0.",
-                              FieldDescriptor::kMaxNumber));
-  } else if (result->number() >= FieldDescriptor::kFirstReservedNumber &&
-             result->number() <= FieldDescriptor::kLastReservedNumber) {
-    message_hints_[parent].RequestHintOnFieldNumbers(
-        proto, DescriptorPool::ErrorCollector::NUMBER);
-    AddError(result->full_name(), proto, DescriptorPool::ErrorCollector::NUMBER,
-             strings::Substitute(
-                 "Field numbers $0 through $1 are reserved for the protocol "
-                 "buffer library implementation.",
-                 FieldDescriptor::kFirstReservedNumber,
-                 FieldDescriptor::kLastReservedNumber));
-  }
-
-  if (is_extension) {
-    if (!proto.has_extendee()) {
-      AddError(result->full_name(), proto,
-               DescriptorPool::ErrorCollector::EXTENDEE,
-               "FieldDescriptorProto.extendee not set for extension field.");
-    }
-
-    result->scope_.extension_scope = parent;
-
-    if (proto.has_oneof_index()) {
-      AddError(result->full_name(), proto, DescriptorPool::ErrorCollector::TYPE,
-               "FieldDescriptorProto.oneof_index should not be set for "
-               "extensions.");
-    }
-  } else {
-    if (proto.has_extendee()) {
-      AddError(result->full_name(), proto,
-               DescriptorPool::ErrorCollector::EXTENDEE,
-               "FieldDescriptorProto.extendee set for non-extension field.");
-    }
-
-    result->containing_type_ = parent;
-
-    if (proto.has_oneof_index()) {
-      if (proto.oneof_index() < 0 ||
-          proto.oneof_index() >= parent->oneof_decl_count()) {
-        AddError(result->full_name(), proto,
-                 DescriptorPool::ErrorCollector::TYPE,
-                 strings::Substitute("FieldDescriptorProto.oneof_index $0 is "
-                                  "out of range for type \"$1\".",
-                                  proto.oneof_index(), parent->name()));
-      } else {
-        result->is_oneof_ = true;
-        result->scope_.containing_oneof =
-            parent->oneof_decl(proto.oneof_index());
-      }
-    }
-  }
-
-  // Copy options.
-  result->options_ = nullptr;  // Set to default_instance later if necessary.
-  if (proto.has_options()) {
-    AllocateOptions(proto.options(), result,
-                    FieldDescriptorProto::kOptionsFieldNumber,
-                    "google.protobuf.FieldOptions", alloc);
-  }
-
-  AddSymbol(result->full_name(), parent, result->name(), proto, Symbol(result));
-}
-
-void DescriptorBuilder::BuildExtensionRange(
-    const DescriptorProto::ExtensionRange& proto, const Descriptor* parent,
-    Descriptor::ExtensionRange* result, internal::FlatAllocator& alloc) {
-  result->start = proto.start();
-  result->end = proto.end();
-  if (result->start <= 0) {
-    message_hints_[parent].RequestHintOnFieldNumbers(
-        proto, DescriptorPool::ErrorCollector::NUMBER, result->start,
-        result->end);
-    AddError(parent->full_name(), proto, DescriptorPool::ErrorCollector::NUMBER,
-             "Extension numbers must be positive integers.");
-  }
-
-  // Checking of the upper bound of the extension range is deferred until after
-  // options interpreting. This allows messages with message_set_wire_format to
-  // have extensions beyond FieldDescriptor::kMaxNumber, since the extension
-  // numbers are actually used as int32s in the message_set_wire_format.
-
-  if (result->start >= result->end) {
-    AddError(parent->full_name(), proto, DescriptorPool::ErrorCollector::NUMBER,
-             "Extension range end number must be greater than start number.");
-  }
-
-  result->options_ = nullptr;  // Set to default_instance later if necessary.
-  if (proto.has_options()) {
-    std::vector<int> options_path;
-    parent->GetLocationPath(&options_path);
-    options_path.push_back(DescriptorProto::kExtensionRangeFieldNumber);
-    // find index of this extension range in order to compute path
-    int index;
-    for (index = 0; parent->extension_ranges_ + index != result; index++) {
-    }
-    options_path.push_back(index);
-    options_path.push_back(DescriptorProto_ExtensionRange::kOptionsFieldNumber);
-    AllocateOptionsImpl(parent->full_name(), parent->full_name(),
-                        proto.options(), result, options_path,
-                        "google.protobuf.ExtensionRangeOptions", alloc);
-  }
-}
-
-void DescriptorBuilder::BuildReservedRange(
-    const DescriptorProto::ReservedRange& proto, const Descriptor* parent,
-    Descriptor::ReservedRange* result, internal::FlatAllocator&) {
-  result->start = proto.start();
-  result->end = proto.end();
-  if (result->start <= 0) {
-    message_hints_[parent].RequestHintOnFieldNumbers(
-        proto, DescriptorPool::ErrorCollector::NUMBER, result->start,
-        result->end);
-    AddError(parent->full_name(), proto, DescriptorPool::ErrorCollector::NUMBER,
-             "Reserved numbers must be positive integers.");
-  }
-}
-
-void DescriptorBuilder::BuildReservedRange(
-    const EnumDescriptorProto::EnumReservedRange& proto,
-    const EnumDescriptor* parent, EnumDescriptor::ReservedRange* result,
-    internal::FlatAllocator&) {
-  result->start = proto.start();
-  result->end = proto.end();
-
-  if (result->start > result->end) {
-    AddError(parent->full_name(), proto, DescriptorPool::ErrorCollector::NUMBER,
-             "Reserved range end number must be greater than start number.");
-  }
-}
-
-void DescriptorBuilder::BuildOneof(const OneofDescriptorProto& proto,
-                                   Descriptor* parent, OneofDescriptor* result,
-                                   internal::FlatAllocator& alloc) {
-  result->all_names_ =
-      AllocateNameStrings(parent->full_name(), proto.name(), alloc);
-  ValidateSymbolName(proto.name(), result->full_name(), proto);
-
-  result->containing_type_ = parent;
-
-  // We need to fill these in later.
-  result->field_count_ = 0;
-  result->fields_ = nullptr;
-  result->options_ = nullptr;
-
-  // Copy options.
-  if (proto.has_options()) {
-    AllocateOptions(proto.options(), result,
-                    OneofDescriptorProto::kOptionsFieldNumber,
-                    "google.protobuf.OneofOptions", alloc);
-  }
-
-  AddSymbol(result->full_name(), parent, result->name(), proto, Symbol(result));
-}
-
-void DescriptorBuilder::CheckEnumValueUniqueness(
-    const EnumDescriptorProto& proto, const EnumDescriptor* result) {
-
-  // Check that enum labels are still unique when we remove the enum prefix from
-  // values that have it.
-  //
-  // This will fail for something like:
-  //
-  //   enum MyEnum {
-  //     MY_ENUM_FOO = 0;
-  //     FOO = 1;
-  //   }
-  //
-  // By enforcing this reasonable constraint, we allow code generators to strip
-  // the prefix and/or PascalCase it without creating conflicts.  This can lead
-  // to much nicer language-specific enums like:
-  //
-  //   enum NameType {
-  //     FirstName = 1,
-  //     LastName = 2,
-  //   }
-  //
-  // Instead of:
-  //
-  //   enum NameType {
-  //     NAME_TYPE_FIRST_NAME = 1,
-  //     NAME_TYPE_LAST_NAME = 2,
-  //   }
-  PrefixRemover remover(result->name());
-  std::map<std::string, const EnumValueDescriptor*> values;
-  for (int i = 0; i < result->value_count(); i++) {
-    const EnumValueDescriptor* value = result->value(i);
-    std::string stripped =
-        EnumValueToPascalCase(remover.MaybeRemove(value->name()));
-    std::pair<std::map<std::string, const EnumValueDescriptor*>::iterator, bool>
-        insert_result = values.insert(std::make_pair(stripped, value));
-    bool inserted = insert_result.second;
-
-    // We don't throw the error if the two conflicting symbols are identical, or
-    // if they map to the same number.  In the former case, the normal symbol
-    // duplication error will fire so we don't need to (and its error message
-    // will make more sense). We allow the latter case so users can create
-    // aliases which add or remove the prefix (code generators that do prefix
-    // stripping should de-dup the labels in this case).
-    if (!inserted && insert_result.first->second->name() != value->name() &&
-        insert_result.first->second->number() != value->number()) {
-      std::string error_message =
-          "Enum name " + value->name() + " has the same name as " +
-          values[stripped]->name() +
-          " if you ignore case and strip out the enum name prefix (if any). "
-          "This is error-prone and can lead to undefined behavior. "
-          "Please avoid doing this. If you are using allow_alias, please "
-          "assign the same numeric value to both enums.";
-      // There are proto2 enums out there with conflicting names, so to preserve
-      // compatibility we issue only a warning for proto2.
-      if (result->file()->syntax() == FileDescriptor::SYNTAX_PROTO2) {
-        AddWarning(value->full_name(), proto.value(i),
-                   DescriptorPool::ErrorCollector::NAME, error_message);
-      } else {
-        AddError(value->full_name(), proto.value(i),
-                 DescriptorPool::ErrorCollector::NAME, error_message);
-      }
-    }
-  }
-}
-
-void DescriptorBuilder::BuildEnum(const EnumDescriptorProto& proto,
-                                  const Descriptor* parent,
-                                  EnumDescriptor* result,
-                                  internal::FlatAllocator& alloc) {
-  const std::string& scope =
-      (parent == nullptr) ? file_->package() : parent->full_name();
-
-  result->all_names_ = AllocateNameStrings(scope, proto.name(), alloc);
-  ValidateSymbolName(proto.name(), result->full_name(), proto);
-  result->file_ = file_;
-  result->containing_type_ = parent;
-  result->is_placeholder_ = false;
-  result->is_unqualified_placeholder_ = false;
-
-  if (proto.value_size() == 0) {
-    // We cannot allow enums with no values because this would mean there
-    // would be no valid default value for fields of this type.
-    AddError(result->full_name(), proto, DescriptorPool::ErrorCollector::NAME,
-             "Enums must contain at least one value.");
-  }
-
-  // Calculate the continuous sequence of the labels.
-  // These can be fast-path'd during lookup and don't need to be added to the
-  // tables.
-  // We use uint16_t to save space for sequential_value_limit_, so stop before
-  // overflowing it. Worst case, we are not taking full advantage on huge
-  // enums, but it is unlikely.
-  for (int i = 0;
-       i < std::numeric_limits<uint16_t>::max() && i < proto.value_size() &&
-       // We do the math in int64_t to avoid overflows.
-       proto.value(i).number() ==
-           static_cast<int64_t>(i) + proto.value(0).number();
-       ++i) {
-    result->sequential_value_limit_ = i;
-  }
-
-  BUILD_ARRAY(proto, result, value, BuildEnumValue, result);
-  BUILD_ARRAY(proto, result, reserved_range, BuildReservedRange, result);
-
-  // Copy reserved names.
-  int reserved_name_count = proto.reserved_name_size();
-  result->reserved_name_count_ = reserved_name_count;
-  result->reserved_names_ =
-      alloc.AllocateArray<const std::string*>(reserved_name_count);
-  for (int i = 0; i < reserved_name_count; ++i) {
-    result->reserved_names_[i] =
-        alloc.AllocateStrings(proto.reserved_name(i));
-  }
-
-  CheckEnumValueUniqueness(proto, result);
-
-  // Copy options.
-  result->options_ = nullptr;  // Set to default_instance later if necessary.
-  if (proto.has_options()) {
-    AllocateOptions(proto.options(), result,
-                    EnumDescriptorProto::kOptionsFieldNumber,
-                    "google.protobuf.EnumOptions", alloc);
-  }
-
-  AddSymbol(result->full_name(), parent, result->name(), proto, Symbol(result));
-
-  for (int i = 0; i < proto.reserved_range_size(); i++) {
-    const EnumDescriptorProto_EnumReservedRange& range1 =
-        proto.reserved_range(i);
-    for (int j = i + 1; j < proto.reserved_range_size(); j++) {
-      const EnumDescriptorProto_EnumReservedRange& range2 =
-          proto.reserved_range(j);
-      if (range1.end() >= range2.start() && range2.end() >= range1.start()) {
-        AddError(result->full_name(), proto.reserved_range(i),
-                 DescriptorPool::ErrorCollector::NUMBER,
-                 strings::Substitute("Reserved range $0 to $1 overlaps with "
-                                  "already-defined range $2 to $3.",
-                                  range2.start(), range2.end(), range1.start(),
-                                  range1.end()));
-      }
-    }
-  }
-
-  HASH_SET<std::string> reserved_name_set;
-  for (int i = 0; i < proto.reserved_name_size(); i++) {
-    const std::string& name = proto.reserved_name(i);
-    if (reserved_name_set.find(name) == reserved_name_set.end()) {
-      reserved_name_set.insert(name);
-    } else {
-      AddError(name, proto, DescriptorPool::ErrorCollector::NAME,
-               strings::Substitute("Enum value \"$0\" is reserved multiple times.",
-                                name));
-    }
-  }
-
-  for (int i = 0; i < result->value_count(); i++) {
-    const EnumValueDescriptor* value = result->value(i);
-    for (int j = 0; j < result->reserved_range_count(); j++) {
-      const EnumDescriptor::ReservedRange* range = result->reserved_range(j);
-      if (range->start <= value->number() && value->number() <= range->end) {
-        AddError(value->full_name(), proto.reserved_range(j),
-                 DescriptorPool::ErrorCollector::NUMBER,
-                 strings::Substitute("Enum value \"$0\" uses reserved number $1.",
-                                  value->name(), value->number()));
-      }
-    }
-    if (reserved_name_set.find(value->name()) != reserved_name_set.end()) {
-      AddError(
-          value->full_name(), proto.value(i),
-          DescriptorPool::ErrorCollector::NAME,
-          strings::Substitute("Enum value \"$0\" is reserved.", value->name()));
-    }
-  }
-}
-
-void DescriptorBuilder::BuildEnumValue(const EnumValueDescriptorProto& proto,
-                                       const EnumDescriptor* parent,
-                                       EnumValueDescriptor* result,
-                                       internal::FlatAllocator& alloc) {
-  // Note:  full_name for enum values is a sibling to the parent's name, not a
-  //   child of it.
-  std::string full_name;
-  size_t scope_len = parent->full_name().size() - parent->name().size();
-  full_name.reserve(scope_len + proto.name().size());
-  full_name.append(parent->full_name().data(), scope_len);
-  full_name.append(proto.name());
-
-  result->all_names_ =
-      alloc.AllocateStrings(proto.name(), std::move(full_name));
-  result->number_ = proto.number();
-  result->type_ = parent;
-
-  ValidateSymbolName(proto.name(), result->full_name(), proto);
-
-  // Copy options.
-  result->options_ = nullptr;  // Set to default_instance later if necessary.
-  if (proto.has_options()) {
-    AllocateOptions(proto.options(), result,
-                    EnumValueDescriptorProto::kOptionsFieldNumber,
-                    "google.protobuf.EnumValueOptions", alloc);
-  }
-
-  // Again, enum values are weird because we makes them appear as siblings
-  // of the enum type instead of children of it.  So, we use
-  // parent->containing_type() as the value's parent.
-  bool added_to_outer_scope =
-      AddSymbol(result->full_name(), parent->containing_type(), result->name(),
-                proto, Symbol::EnumValue(result, 0));
-
-  // However, we also want to be able to search for values within a single
-  // enum type, so we add it as a child of the enum type itself, too.
-  // Note:  This could fail, but if it does, the error has already been
-  //   reported by the above AddSymbol() call, so we ignore the return code.
-  bool added_to_inner_scope = file_tables_->AddAliasUnderParent(
-      parent, result->name(), Symbol::EnumValue(result, 1));
-
-  if (added_to_inner_scope && !added_to_outer_scope) {
-    // This value did not conflict with any values defined in the same enum,
-    // but it did conflict with some other symbol defined in the enum type's
-    // scope.  Let's print an additional error to explain this.
-    std::string outer_scope;
-    if (parent->containing_type() == nullptr) {
-      outer_scope = file_->package();
-    } else {
-      outer_scope = parent->containing_type()->full_name();
-    }
-
-    if (outer_scope.empty()) {
-      outer_scope = "the global scope";
-    } else {
-      outer_scope = "\"" + outer_scope + "\"";
-    }
-
-    AddError(result->full_name(), proto, DescriptorPool::ErrorCollector::NAME,
-             "Note that enum values use C++ scoping rules, meaning that "
-             "enum values are siblings of their type, not children of it.  "
-             "Therefore, \"" +
-                 result->name() + "\" must be unique within " + outer_scope +
-                 ", not just within \"" + parent->name() + "\".");
-  }
-
-  // An enum is allowed to define two numbers that refer to the same value.
-  // FindValueByNumber() should return the first such value, so we simply
-  // ignore AddEnumValueByNumber()'s return code.
-  file_tables_->AddEnumValueByNumber(result);
-}
-
-void DescriptorBuilder::BuildService(const ServiceDescriptorProto& proto,
-                                     const void* /* dummy */,
-                                     ServiceDescriptor* result,
-                                     internal::FlatAllocator& alloc) {
-  result->all_names_ =
-      AllocateNameStrings(file_->package(), proto.name(), alloc);
-  result->file_ = file_;
-  ValidateSymbolName(proto.name(), result->full_name(), proto);
-
-  BUILD_ARRAY(proto, result, method, BuildMethod, result);
-
-  // Copy options.
-  result->options_ = nullptr;  // Set to default_instance later if necessary.
-  if (proto.has_options()) {
-    AllocateOptions(proto.options(), result,
-                    ServiceDescriptorProto::kOptionsFieldNumber,
-                    "google.protobuf.ServiceOptions", alloc);
-  }
-
-  AddSymbol(result->full_name(), nullptr, result->name(), proto,
-            Symbol(result));
-}
-
-void DescriptorBuilder::BuildMethod(const MethodDescriptorProto& proto,
-                                    const ServiceDescriptor* parent,
-                                    MethodDescriptor* result,
-                                    internal::FlatAllocator& alloc) {
-  result->service_ = parent;
-  result->all_names_ =
-      AllocateNameStrings(parent->full_name(), proto.name(), alloc);
-
-  ValidateSymbolName(proto.name(), result->full_name(), proto);
-
-  // These will be filled in when cross-linking.
-  result->input_type_.Init();
-  result->output_type_.Init();
-
-  // Copy options.
-  result->options_ = nullptr;  // Set to default_instance later if necessary.
-  if (proto.has_options()) {
-    AllocateOptions(proto.options(), result,
-                    MethodDescriptorProto::kOptionsFieldNumber,
-                    "google.protobuf.MethodOptions", alloc);
-  }
-
-  result->client_streaming_ = proto.client_streaming();
-  result->server_streaming_ = proto.server_streaming();
-
-  AddSymbol(result->full_name(), parent, result->name(), proto, Symbol(result));
-}
-
-#undef BUILD_ARRAY
-
-// -------------------------------------------------------------------
-
-void DescriptorBuilder::CrossLinkFile(FileDescriptor* file,
-                                      const FileDescriptorProto& proto) {
-  if (file->options_ == nullptr) {
-    file->options_ = &FileOptions::default_instance();
-  }
-
-  for (int i = 0; i < file->message_type_count(); i++) {
-    CrossLinkMessage(&file->message_types_[i], proto.message_type(i));
-  }
-
-  for (int i = 0; i < file->extension_count(); i++) {
-    CrossLinkField(&file->extensions_[i], proto.extension(i));
-  }
-
-  for (int i = 0; i < file->enum_type_count(); i++) {
-    CrossLinkEnum(&file->enum_types_[i], proto.enum_type(i));
-  }
-
-  for (int i = 0; i < file->service_count(); i++) {
-    CrossLinkService(&file->services_[i], proto.service(i));
-  }
-}
-
-void DescriptorBuilder::CrossLinkMessage(Descriptor* message,
-                                         const DescriptorProto& proto) {
-  if (message->options_ == nullptr) {
-    message->options_ = &MessageOptions::default_instance();
-  }
-
-  for (int i = 0; i < message->nested_type_count(); i++) {
-    CrossLinkMessage(&message->nested_types_[i], proto.nested_type(i));
-  }
-
-  for (int i = 0; i < message->enum_type_count(); i++) {
-    CrossLinkEnum(&message->enum_types_[i], proto.enum_type(i));
-  }
-
-  for (int i = 0; i < message->field_count(); i++) {
-    CrossLinkField(&message->fields_[i], proto.field(i));
-  }
-
-  for (int i = 0; i < message->extension_count(); i++) {
-    CrossLinkField(&message->extensions_[i], proto.extension(i));
-  }
-
-  for (int i = 0; i < message->extension_range_count(); i++) {
-    CrossLinkExtensionRange(&message->extension_ranges_[i],
-                            proto.extension_range(i));
-  }
-
-  // Set up field array for each oneof.
-
-  // First count the number of fields per oneof.
-  for (int i = 0; i < message->field_count(); i++) {
-    const OneofDescriptor* oneof_decl = message->field(i)->containing_oneof();
-    if (oneof_decl != nullptr) {
-      // Make sure fields belonging to the same oneof are defined consecutively.
-      // This enables optimizations in codegens and reflection libraries to
-      // skip fields in the oneof group, as only one of the field can be set.
-      // Note that field_count() returns how many fields in this oneof we have
-      // seen so far. field_count() > 0 guarantees that i > 0, so field(i-1) is
-      // safe.
-      if (oneof_decl->field_count() > 0 &&
-          message->field(i - 1)->containing_oneof() != oneof_decl) {
-        AddError(message->full_name() + "." + message->field(i - 1)->name(),
-                 proto.field(i - 1), DescriptorPool::ErrorCollector::TYPE,
-                 strings::Substitute(
-                     "Fields in the same oneof must be defined consecutively. "
-                     "\"$0\" cannot be defined before the completion of the "
-                     "\"$1\" oneof definition.",
-                     message->field(i - 1)->name(), oneof_decl->name()));
-      }
-      // Must go through oneof_decls_ array to get a non-const version of the
-      // OneofDescriptor.
-      auto& out_oneof_decl = message->oneof_decls_[oneof_decl->index()];
-      if (out_oneof_decl.field_count_ == 0) {
-        out_oneof_decl.fields_ = message->field(i);
-      }
-
-      if (!had_errors_) {
-        // Verify that they are contiguous.
-        // This is assumed by OneofDescriptor::field(i).
-        // But only if there are no errors.
-        GOOGLE_CHECK_EQ(out_oneof_decl.fields_ + out_oneof_decl.field_count_,
-                 message->field(i));
-      }
-      ++out_oneof_decl.field_count_;
-    }
-  }
-
-  // Then verify the sizes.
-  for (int i = 0; i < message->oneof_decl_count(); i++) {
-    OneofDescriptor* oneof_decl = &message->oneof_decls_[i];
-
-    if (oneof_decl->field_count() == 0) {
-      AddError(message->full_name() + "." + oneof_decl->name(),
-               proto.oneof_decl(i), DescriptorPool::ErrorCollector::NAME,
-               "Oneof must have at least one field.");
-    }
-
-    if (oneof_decl->options_ == nullptr) {
-      oneof_decl->options_ = &OneofOptions::default_instance();
-    }
-  }
-
-  for (int i = 0; i < message->field_count(); i++) {
-    const FieldDescriptor* field = message->field(i);
-    if (field->proto3_optional_) {
-      if (!field->containing_oneof() ||
-          !field->containing_oneof()->is_synthetic()) {
-        AddError(message->full_name(), proto.field(i),
-                 DescriptorPool::ErrorCollector::OTHER,
-                 "Fields with proto3_optional set must be "
-                 "a member of a one-field oneof");
-      }
-    }
-  }
-
-  // Synthetic oneofs must be last.
-  int first_synthetic = -1;
-  for (int i = 0; i < message->oneof_decl_count(); i++) {
-    const OneofDescriptor* oneof = message->oneof_decl(i);
-    if (oneof->is_synthetic()) {
-      if (first_synthetic == -1) {
-        first_synthetic = i;
-      }
-    } else {
-      if (first_synthetic != -1) {
-        AddError(message->full_name(), proto.oneof_decl(i),
-                 DescriptorPool::ErrorCollector::OTHER,
-                 "Synthetic oneofs must be after all other oneofs");
-      }
-    }
-  }
-
-  if (first_synthetic == -1) {
-    message->real_oneof_decl_count_ = message->oneof_decl_count_;
-  } else {
-    message->real_oneof_decl_count_ = first_synthetic;
-  }
-}
-
-void DescriptorBuilder::CrossLinkExtensionRange(
-    Descriptor::ExtensionRange* range,
-    const DescriptorProto::ExtensionRange& /*proto*/) {
-  if (range->options_ == nullptr) {
-    range->options_ = &ExtensionRangeOptions::default_instance();
-  }
-}
-
-void DescriptorBuilder::CrossLinkField(FieldDescriptor* field,
-                                       const FieldDescriptorProto& proto) {
-  if (field->options_ == nullptr) {
-    field->options_ = &FieldOptions::default_instance();
-  }
-
-  if (proto.has_extendee()) {
-    Symbol extendee =
-        LookupSymbol(proto.extendee(), field->full_name(),
-                     DescriptorPool::PLACEHOLDER_EXTENDABLE_MESSAGE);
-    if (extendee.IsNull()) {
-      AddNotDefinedError(field->full_name(), proto,
-                         DescriptorPool::ErrorCollector::EXTENDEE,
-                         proto.extendee());
-      return;
-    } else if (extendee.type() != Symbol::MESSAGE) {
-      AddError(field->full_name(), proto,
-               DescriptorPool::ErrorCollector::EXTENDEE,
-               "\"" + proto.extendee() + "\" is not a message type.");
-      return;
-    }
-    field->containing_type_ = extendee.descriptor();
-
-    const Descriptor::ExtensionRange* extension_range =
-        field->containing_type()->FindExtensionRangeContainingNumber(
-            field->number());
-
-    if (extension_range == nullptr) {
-      // Set of valid extension numbers for MessageSet is different (< 2^32)
-      // from other extendees (< 2^29). If unknown deps are allowed, we may not
-      // have that information, and wrongly deem the extension as invalid.
-      auto skip_check = get_allow_unknown(pool_) &&
-                        proto.extendee() == "google.protobuf.bridge.MessageSet";
-      if (!skip_check) {
-        AddError(field->full_name(), proto,
-                 DescriptorPool::ErrorCollector::NUMBER,
-                 strings::Substitute("\"$0\" does not declare $1 as an "
-                                  "extension number.",
-                                  field->containing_type()->full_name(),
-                                  field->number()));
-      }
-    }
-  }
-
-  if (field->containing_oneof() != nullptr) {
-    if (field->label() != FieldDescriptor::LABEL_OPTIONAL) {
-      // Note that this error will never happen when parsing .proto files.
-      // It can only happen if you manually construct a FileDescriptorProto
-      // that is incorrect.
-      AddError(field->full_name(), proto, DescriptorPool::ErrorCollector::NAME,
-               "Fields of oneofs must themselves have label LABEL_OPTIONAL.");
-    }
-  }
-
-  if (proto.has_type_name()) {
-    // Assume we are expecting a message type unless the proto contains some
-    // evidence that it expects an enum type.  This only makes a difference if
-    // we end up creating a placeholder.
-    bool expecting_enum = (proto.type() == FieldDescriptorProto::TYPE_ENUM) ||
-                          proto.has_default_value();
-
-    // In case of weak fields we force building the dependency. We need to know
-    // if the type exist or not. If it doesn't exist we substitute Empty which
-    // should only be done if the type can't be found in the generated pool.
-    // TODO(gerbens) Ideally we should query the database directly to check
-    // if weak fields exist or not so that we don't need to force building
-    // weak dependencies. However the name lookup rules for symbols are
-    // somewhat complicated, so I defer it too another CL.
-    bool is_weak = !pool_->enforce_weak_ && proto.options().weak();
-    bool is_lazy = pool_->lazily_build_dependencies_ && !is_weak;
-
-    Symbol type =
-        LookupSymbol(proto.type_name(), field->full_name(),
-                     expecting_enum ? DescriptorPool::PLACEHOLDER_ENUM
-                                    : DescriptorPool::PLACEHOLDER_MESSAGE,
-                     LOOKUP_TYPES, !is_lazy);
-
-    if (type.IsNull()) {
-      if (is_lazy) {
-        // Save the symbol names for later for lookup, and allocate the once
-        // object needed for the accessors.
-        const std::string& name = proto.type_name();
-
-        int name_sizes = static_cast<int>(name.size() + 1 +
-                                          proto.default_value().size() + 1);
-
-        field->type_once_ = ::new (tables_->AllocateBytes(static_cast<int>(
-            sizeof(internal::once_flag) + name_sizes))) internal::once_flag{};
-        char* names = reinterpret_cast<char*>(field->type_once_ + 1);
-
-        memcpy(names, name.c_str(), name.size() + 1);
-        memcpy(names + name.size() + 1, proto.default_value().c_str(),
-               proto.default_value().size() + 1);
-
-        // AddFieldByNumber and AddExtension are done later in this function,
-        // and can/must be done if the field type was not found. The related
-        // error checking is not necessary when in lazily_build_dependencies_
-        // mode, and can't be done without building the type's descriptor,
-        // which we don't want to do.
-        file_tables_->AddFieldByNumber(field);
-        if (field->is_extension()) {
-          tables_->AddExtension(field);
-        }
-        return;
-      } else {
-        // If the type is a weak type, we change the type to a google.protobuf.Empty
-        // field.
-        if (is_weak) {
-          type = FindSymbol(kNonLinkedWeakMessageReplacementName);
-        }
-        if (type.IsNull()) {
-          AddNotDefinedError(field->full_name(), proto,
-                             DescriptorPool::ErrorCollector::TYPE,
-                             proto.type_name());
-          return;
-        }
-      }
-    }
-
-    if (!proto.has_type()) {
-      // Choose field type based on symbol.
-      if (type.type() == Symbol::MESSAGE) {
-        field->type_ = FieldDescriptor::TYPE_MESSAGE;
-      } else if (type.type() == Symbol::ENUM) {
-        field->type_ = FieldDescriptor::TYPE_ENUM;
-      } else {
-        AddError(field->full_name(), proto,
-                 DescriptorPool::ErrorCollector::TYPE,
-                 "\"" + proto.type_name() + "\" is not a type.");
-        return;
-      }
-    }
-
-    if (field->cpp_type() == FieldDescriptor::CPPTYPE_MESSAGE) {
-      field->type_descriptor_.message_type = type.descriptor();
-      if (field->type_descriptor_.message_type == nullptr) {
-        AddError(field->full_name(), proto,
-                 DescriptorPool::ErrorCollector::TYPE,
-                 "\"" + proto.type_name() + "\" is not a message type.");
-        return;
-      }
-
-      if (field->has_default_value()) {
-        AddError(field->full_name(), proto,
-                 DescriptorPool::ErrorCollector::DEFAULT_VALUE,
-                 "Messages can't have default values.");
-      }
-    } else if (field->cpp_type() == FieldDescriptor::CPPTYPE_ENUM) {
-      field->type_descriptor_.enum_type = type.enum_descriptor();
-      if (field->type_descriptor_.enum_type == nullptr) {
-        AddError(field->full_name(), proto,
-                 DescriptorPool::ErrorCollector::TYPE,
-                 "\"" + proto.type_name() + "\" is not an enum type.");
-        return;
-      }
-
-      if (field->enum_type()->is_placeholder_) {
-        // We can't look up default values for placeholder types.  We'll have
-        // to just drop them.
-        field->has_default_value_ = false;
-      }
-
-      if (field->has_default_value()) {
-        // Ensure that the default value is an identifier. Parser cannot always
-        // verify this because it does not have complete type information.
-        // N.B. that this check yields better error messages but is not
-        // necessary for correctness (an enum symbol must be a valid identifier
-        // anyway), only for better errors.
-        if (!io::Tokenizer::IsIdentifier(proto.default_value())) {
-          AddError(field->full_name(), proto,
-                   DescriptorPool::ErrorCollector::DEFAULT_VALUE,
-                   "Default value for an enum field must be an identifier.");
-        } else {
-          // We can't just use field->enum_type()->FindValueByName() here
-          // because that locks the pool's mutex, which we have already locked
-          // at this point.
-          const EnumValueDescriptor* default_value =
-              LookupSymbolNoPlaceholder(proto.default_value(),
-                                        field->enum_type()->full_name())
-                  .enum_value_descriptor();
-
-          if (default_value != nullptr &&
-              default_value->type() == field->enum_type()) {
-            field->default_value_enum_ = default_value;
-          } else {
-            AddError(field->full_name(), proto,
-                     DescriptorPool::ErrorCollector::DEFAULT_VALUE,
-                     "Enum type \"" + field->enum_type()->full_name() +
-                         "\" has no value named \"" + proto.default_value() +
-                         "\".");
-          }
-        }
-      } else if (field->enum_type()->value_count() > 0) {
-        // All enums must have at least one value, or we would have reported
-        // an error elsewhere.  We use the first defined value as the default
-        // if a default is not explicitly defined.
-        field->default_value_enum_ = field->enum_type()->value(0);
-      }
-    } else {
-      AddError(field->full_name(), proto, DescriptorPool::ErrorCollector::TYPE,
-               "Field with primitive type has type_name.");
-    }
-  } else {
-    if (field->cpp_type() == FieldDescriptor::CPPTYPE_MESSAGE ||
-        field->cpp_type() == FieldDescriptor::CPPTYPE_ENUM) {
-      AddError(field->full_name(), proto, DescriptorPool::ErrorCollector::TYPE,
-               "Field with message or enum type missing type_name.");
-    }
-  }
-
-  // Add the field to the fields-by-number table.
-  // Note:  We have to do this *after* cross-linking because extensions do not
-  // know their containing type until now. If we're in
-  // lazily_build_dependencies_ mode, we're guaranteed there's no errors, so no
-  // risk to calling containing_type() or other accessors that will build
-  // dependencies.
-  if (!file_tables_->AddFieldByNumber(field)) {
-    const FieldDescriptor* conflicting_field = file_tables_->FindFieldByNumber(
-        field->containing_type(), field->number());
-    std::string containing_type_name =
-        field->containing_type() == nullptr
-            ? "unknown"
-            : field->containing_type()->full_name();
-    if (field->is_extension()) {
-      AddError(field->full_name(), proto,
-               DescriptorPool::ErrorCollector::NUMBER,
-               strings::Substitute("Extension number $0 has already been used "
-                                "in \"$1\" by extension \"$2\".",
-                                field->number(), containing_type_name,
-                                conflicting_field->full_name()));
-    } else {
-      AddError(field->full_name(), proto,
-               DescriptorPool::ErrorCollector::NUMBER,
-               strings::Substitute("Field number $0 has already been used in "
-                                "\"$1\" by field \"$2\".",
-                                field->number(), containing_type_name,
-                                conflicting_field->name()));
-    }
-  } else {
-    if (field->is_extension()) {
-      if (!tables_->AddExtension(field)) {
-        const FieldDescriptor* conflicting_field =
-            tables_->FindExtension(field->containing_type(), field->number());
-        std::string containing_type_name =
-            field->containing_type() == nullptr
-                ? "unknown"
-                : field->containing_type()->full_name();
-        std::string error_msg = strings::Substitute(
-            "Extension number $0 has already been used in \"$1\" by extension "
-            "\"$2\" defined in $3.",
-            field->number(), containing_type_name,
-            conflicting_field->full_name(), conflicting_field->file()->name());
-        // Conflicting extension numbers should be an error. However, before
-        // turning this into an error we need to fix all existing broken
-        // protos first.
-        // TODO(xiaofeng): Change this to an error.
-        AddWarning(field->full_name(), proto,
-                   DescriptorPool::ErrorCollector::NUMBER, error_msg);
-      }
-    }
-  }
-}
-
-void DescriptorBuilder::CrossLinkEnum(EnumDescriptor* enum_type,
-                                      const EnumDescriptorProto& proto) {
-  if (enum_type->options_ == nullptr) {
-    enum_type->options_ = &EnumOptions::default_instance();
-  }
-
-  for (int i = 0; i < enum_type->value_count(); i++) {
-    CrossLinkEnumValue(&enum_type->values_[i], proto.value(i));
-  }
-}
-
-void DescriptorBuilder::CrossLinkEnumValue(
-    EnumValueDescriptor* enum_value,
-    const EnumValueDescriptorProto& /* proto */) {
-  if (enum_value->options_ == nullptr) {
-    enum_value->options_ = &EnumValueOptions::default_instance();
-  }
-}
-
-void DescriptorBuilder::CrossLinkService(ServiceDescriptor* service,
-                                         const ServiceDescriptorProto& proto) {
-  if (service->options_ == nullptr) {
-    service->options_ = &ServiceOptions::default_instance();
-  }
-
-  for (int i = 0; i < service->method_count(); i++) {
-    CrossLinkMethod(&service->methods_[i], proto.method(i));
-  }
-}
-
-void DescriptorBuilder::CrossLinkMethod(MethodDescriptor* method,
-                                        const MethodDescriptorProto& proto) {
-  if (method->options_ == nullptr) {
-    method->options_ = &MethodOptions::default_instance();
-  }
-
-  Symbol input_type =
-      LookupSymbol(proto.input_type(), method->full_name(),
-                   DescriptorPool::PLACEHOLDER_MESSAGE, LOOKUP_ALL,
-                   !pool_->lazily_build_dependencies_);
-  if (input_type.IsNull()) {
-    if (!pool_->lazily_build_dependencies_) {
-      AddNotDefinedError(method->full_name(), proto,
-                         DescriptorPool::ErrorCollector::INPUT_TYPE,
-                         proto.input_type());
-    } else {
-      method->input_type_.SetLazy(proto.input_type(), file_);
-    }
-  } else if (input_type.type() != Symbol::MESSAGE) {
-    AddError(method->full_name(), proto,
-             DescriptorPool::ErrorCollector::INPUT_TYPE,
-             "\"" + proto.input_type() + "\" is not a message type.");
-  } else {
-    method->input_type_.Set(input_type.descriptor());
-  }
-
-  Symbol output_type =
-      LookupSymbol(proto.output_type(), method->full_name(),
-                   DescriptorPool::PLACEHOLDER_MESSAGE, LOOKUP_ALL,
-                   !pool_->lazily_build_dependencies_);
-  if (output_type.IsNull()) {
-    if (!pool_->lazily_build_dependencies_) {
-      AddNotDefinedError(method->full_name(), proto,
-                         DescriptorPool::ErrorCollector::OUTPUT_TYPE,
-                         proto.output_type());
-    } else {
-      method->output_type_.SetLazy(proto.output_type(), file_);
-    }
-  } else if (output_type.type() != Symbol::MESSAGE) {
-    AddError(method->full_name(), proto,
-             DescriptorPool::ErrorCollector::OUTPUT_TYPE,
-             "\"" + proto.output_type() + "\" is not a message type.");
-  } else {
-    method->output_type_.Set(output_type.descriptor());
-  }
-}
-
-void DescriptorBuilder::SuggestFieldNumbers(FileDescriptor* file,
-                                            const FileDescriptorProto& proto) {
-  for (int message_index = 0; message_index < file->message_type_count();
-       message_index++) {
-    const Descriptor* message = &file->message_types_[message_index];
-    auto* hints = FindOrNull(message_hints_, message);
-    if (!hints) continue;
-    constexpr int kMaxSuggestions = 3;
-    int fields_to_suggest = std::min(kMaxSuggestions, hints->fields_to_suggest);
-    if (fields_to_suggest <= 0) continue;
-    struct Range {
-      int from;
-      int to;
-    };
-    std::vector<Range> used_ordinals;
-    auto add_ordinal = [&](int ordinal) {
-      if (ordinal <= 0 || ordinal > FieldDescriptor::kMaxNumber) return;
-      if (!used_ordinals.empty() &&
-          ordinal == used_ordinals.back().to) {
-        used_ordinals.back().to = ordinal + 1;
-      } else {
-        used_ordinals.push_back({ordinal, ordinal + 1});
-      }
-    };
-    auto add_range = [&](int from, int to) {
-      from = std::max(0, std::min(FieldDescriptor::kMaxNumber + 1, from));
-      to = std::max(0, std::min(FieldDescriptor::kMaxNumber + 1, to));
-      if (from >= to) return;
-      used_ordinals.push_back({from, to});
-    };
-    for (int i = 0; i < message->field_count(); i++) {
-      add_ordinal(message->field(i)->number());
-    }
-    for (int i = 0; i < message->extension_count(); i++) {
-      add_ordinal(message->extension(i)->number());
-    }
-    for (int i = 0; i < message->reserved_range_count(); i++) {
-      auto range = message->reserved_range(i);
-      add_range(range->start, range->end);
-    }
-    for (int i = 0; i < message->extension_range_count(); i++) {
-      auto range = message->extension_range(i);
-      add_range(range->start, range->end);
-    }
-    used_ordinals.push_back(
-        {FieldDescriptor::kMaxNumber, FieldDescriptor::kMaxNumber + 1});
-    used_ordinals.push_back({FieldDescriptor::kFirstReservedNumber,
-                             FieldDescriptor::kLastReservedNumber});
-    std::sort(used_ordinals.begin(), used_ordinals.end(),
-              [](Range lhs, Range rhs) {
-                return std::tie(lhs.from, lhs.to) < std::tie(rhs.from, rhs.to);
-              });
-    int current_ordinal = 1;
-    std::stringstream id_list;
-    id_list << "Suggested field numbers for " << message->full_name() << ": ";
-    const char* separator = "";
-    for (auto& current_range : used_ordinals) {
-      while (current_ordinal < current_range.from && fields_to_suggest > 0) {
-        id_list << separator << current_ordinal++;
-        separator = ", ";
-        fields_to_suggest--;
-      }
-      if (fields_to_suggest == 0) break;
-      current_ordinal = std::max(current_ordinal, current_range.to);
-    }
-    if (hints->first_reason) {
-      AddError(message->full_name(), *hints->first_reason,
-               hints->first_reason_location, id_list.str());
-    }
-  }
-}
-
-// -------------------------------------------------------------------
-
-#define VALIDATE_OPTIONS_FROM_ARRAY(descriptor, array_name, type) \
-  for (int i = 0; i < descriptor->array_name##_count(); ++i) {    \
-    Validate##type##Options(descriptor->array_name##s_ + i,       \
-                            proto.array_name(i));                 \
-  }
-
-// Determine if the file uses optimize_for = LITE_RUNTIME, being careful to
-// avoid problems that exist at init time.
-static bool IsLite(const FileDescriptor* file) {
-  // TODO(kenton):  I don't even remember how many of these conditions are
-  //   actually possible.  I'm just being super-safe.
-  return file != nullptr &&
-         &file->options() != &FileOptions::default_instance() &&
-         file->options().optimize_for() == FileOptions::LITE_RUNTIME;
-}
-
-void DescriptorBuilder::ValidateFileOptions(FileDescriptor* file,
-                                            const FileDescriptorProto& proto) {
-  VALIDATE_OPTIONS_FROM_ARRAY(file, message_type, Message);
-  VALIDATE_OPTIONS_FROM_ARRAY(file, enum_type, Enum);
-  VALIDATE_OPTIONS_FROM_ARRAY(file, service, Service);
-  VALIDATE_OPTIONS_FROM_ARRAY(file, extension, Field);
-
-  // Lite files can only be imported by other Lite files.
-  if (!IsLite(file)) {
-    for (int i = 0; i < file->dependency_count(); i++) {
-      if (IsLite(file->dependency(i))) {
-        AddError(
-            file->dependency(i)->name(), proto,
-            DescriptorPool::ErrorCollector::IMPORT,
-            "Files that do not use optimize_for = LITE_RUNTIME cannot import "
-            "files which do use this option.  This file is not lite, but it "
-            "imports \"" +
-                file->dependency(i)->name() + "\" which is.");
-        break;
-      }
-    }
-  }
-  if (file->syntax() == FileDescriptor::SYNTAX_PROTO3) {
-    ValidateProto3(file, proto);
-  }
-}
-
-void DescriptorBuilder::ValidateProto3(FileDescriptor* file,
-                                       const FileDescriptorProto& proto) {
-  for (int i = 0; i < file->extension_count(); ++i) {
-    ValidateProto3Field(file->extensions_ + i, proto.extension(i));
-  }
-  for (int i = 0; i < file->message_type_count(); ++i) {
-    ValidateProto3Message(file->message_types_ + i, proto.message_type(i));
-  }
-  for (int i = 0; i < file->enum_type_count(); ++i) {
-    ValidateProto3Enum(file->enum_types_ + i, proto.enum_type(i));
-  }
-}
-
-static std::string ToLowercaseWithoutUnderscores(const std::string& name) {
-  std::string result;
-  for (char character : name) {
-    if (character != '_') {
-      if (character >= 'A' && character <= 'Z') {
-        result.push_back(character - 'A' + 'a');
-      } else {
-        result.push_back(character);
-      }
-    }
-  }
-  return result;
-}
-
-void DescriptorBuilder::ValidateProto3Message(Descriptor* message,
-                                              const DescriptorProto& proto) {
-  for (int i = 0; i < message->nested_type_count(); ++i) {
-    ValidateProto3Message(message->nested_types_ + i, proto.nested_type(i));
-  }
-  for (int i = 0; i < message->enum_type_count(); ++i) {
-    ValidateProto3Enum(message->enum_types_ + i, proto.enum_type(i));
-  }
-  for (int i = 0; i < message->field_count(); ++i) {
-    ValidateProto3Field(message->fields_ + i, proto.field(i));
-  }
-  for (int i = 0; i < message->extension_count(); ++i) {
-    ValidateProto3Field(message->extensions_ + i, proto.extension(i));
-  }
-  if (message->extension_range_count() > 0) {
-    AddError(message->full_name(), proto.extension_range(0),
-             DescriptorPool::ErrorCollector::NUMBER,
-             "Extension ranges are not allowed in proto3.");
-  }
-  if (message->options().message_set_wire_format()) {
-    // Using MessageSet doesn't make sense since we disallow extensions.
-    AddError(message->full_name(), proto, DescriptorPool::ErrorCollector::NAME,
-             "MessageSet is not supported in proto3.");
-  }
-
-  // In proto3, we reject field names if they conflict in camelCase.
-  // Note that we currently enforce a stricter rule: Field names must be
-  // unique after being converted to lowercase with underscores removed.
-  std::map<std::string, const FieldDescriptor*> name_to_field;
-  for (int i = 0; i < message->field_count(); ++i) {
-    std::string lowercase_name =
-        ToLowercaseWithoutUnderscores(message->field(i)->name());
-    if (name_to_field.find(lowercase_name) != name_to_field.end()) {
-      AddError(message->full_name(), proto.field(i),
-               DescriptorPool::ErrorCollector::NAME,
-               "The JSON camel-case name of field \"" +
-                   message->field(i)->name() + "\" conflicts with field \"" +
-                   name_to_field[lowercase_name]->name() + "\". This is not " +
-                   "allowed in proto3.");
-    } else {
-      name_to_field[lowercase_name] = message->field(i);
-    }
-  }
-}
-
-void DescriptorBuilder::ValidateProto3Field(FieldDescriptor* field,
-                                            const FieldDescriptorProto& proto) {
-  if (field->is_extension() &&
-      !AllowedExtendeeInProto3(field->containing_type()->full_name())) {
-    AddError(field->full_name(), proto,
-             DescriptorPool::ErrorCollector::EXTENDEE,
-             "Extensions in proto3 are only allowed for defining options.");
-  }
-  if (field->is_required()) {
-    AddError(field->full_name(), proto, DescriptorPool::ErrorCollector::TYPE,
-             "Required fields are not allowed in proto3.");
-  }
-  if (field->has_default_value()) {
-    AddError(field->full_name(), proto,
-             DescriptorPool::ErrorCollector::DEFAULT_VALUE,
-             "Explicit default values are not allowed in proto3.");
-  }
-  if (field->cpp_type() == FieldDescriptor::CPPTYPE_ENUM &&
-      field->enum_type() &&
-      field->enum_type()->file()->syntax() != FileDescriptor::SYNTAX_PROTO3 &&
-      field->enum_type()->file()->syntax() != FileDescriptor::SYNTAX_UNKNOWN) {
-    // Proto3 messages can only use Proto3 enum types; otherwise we can't
-    // guarantee that the default value is zero.
-    AddError(field->full_name(), proto, DescriptorPool::ErrorCollector::TYPE,
-             "Enum type \"" + field->enum_type()->full_name() +
-                 "\" is not a proto3 enum, but is used in \"" +
-                 field->containing_type()->full_name() +
-                 "\" which is a proto3 message type.");
-  }
-  if (field->type() == FieldDescriptor::TYPE_GROUP) {
-    AddError(field->full_name(), proto, DescriptorPool::ErrorCollector::TYPE,
-             "Groups are not supported in proto3 syntax.");
-  }
-}
-
-void DescriptorBuilder::ValidateProto3Enum(EnumDescriptor* enm,
-                                           const EnumDescriptorProto& proto) {
-  if (enm->value_count() > 0 && enm->value(0)->number() != 0) {
-    AddError(enm->full_name(), proto.value(0),
-             DescriptorPool::ErrorCollector::NUMBER,
-             "The first enum value must be zero in proto3.");
-  }
-}
-
-void DescriptorBuilder::ValidateMessageOptions(Descriptor* message,
-                                               const DescriptorProto& proto) {
-  VALIDATE_OPTIONS_FROM_ARRAY(message, field, Field);
-  VALIDATE_OPTIONS_FROM_ARRAY(message, nested_type, Message);
-  VALIDATE_OPTIONS_FROM_ARRAY(message, enum_type, Enum);
-  VALIDATE_OPTIONS_FROM_ARRAY(message, extension, Field);
-
-  const int64_t max_extension_range =
-      static_cast<int64_t>(message->options().message_set_wire_format()
-                               ? std::numeric_limits<int32_t>::max()
-                               : FieldDescriptor::kMaxNumber);
-  for (int i = 0; i < message->extension_range_count(); ++i) {
-    if (message->extension_range(i)->end > max_extension_range + 1) {
-      AddError(message->full_name(), proto.extension_range(i),
-               DescriptorPool::ErrorCollector::NUMBER,
-               strings::Substitute("Extension numbers cannot be greater than $0.",
-                                max_extension_range));
-    }
-
-    ValidateExtensionRangeOptions(message->full_name(),
-                                  message->extension_ranges_ + i,
-                                  proto.extension_range(i));
-  }
-}
-
-
-void DescriptorBuilder::ValidateFieldOptions(
-    FieldDescriptor* field, const FieldDescriptorProto& proto) {
-  if (pool_->lazily_build_dependencies_ && (!field || !field->message_type())) {
-    return;
-  }
-  // Only message type fields may be lazy.
-  if (field->options().lazy() || field->options().unverified_lazy()) {
-    if (field->type() != FieldDescriptor::TYPE_MESSAGE) {
-      AddError(field->full_name(), proto, DescriptorPool::ErrorCollector::TYPE,
-               "[lazy = true] can only be specified for submessage fields.");
-    }
-  }
-
-  // Only repeated primitive fields may be packed.
-  if (field->options().packed() && !field->is_packable()) {
-    AddError(
-        field->full_name(), proto, DescriptorPool::ErrorCollector::TYPE,
-        "[packed = true] can only be specified for repeated primitive fields.");
-  }
-
-  // Note:  Default instance may not yet be initialized here, so we have to
-  //   avoid reading from it.
-  if (field->containing_type_ != nullptr &&
-      &field->containing_type()->options() !=
-          &MessageOptions::default_instance() &&
-      field->containing_type()->options().message_set_wire_format()) {
-    if (field->is_extension()) {
-      if (!field->is_optional() ||
-          field->type() != FieldDescriptor::TYPE_MESSAGE) {
-        AddError(field->full_name(), proto,
-                 DescriptorPool::ErrorCollector::TYPE,
-                 "Extensions of MessageSets must be optional messages.");
-      }
-    } else {
-      AddError(field->full_name(), proto, DescriptorPool::ErrorCollector::NAME,
-               "MessageSets cannot have fields, only extensions.");
-    }
-  }
-
-  // Lite extensions can only be of Lite types.
-  if (IsLite(field->file()) && field->containing_type_ != nullptr &&
-      !IsLite(field->containing_type()->file())) {
-    AddError(field->full_name(), proto,
-             DescriptorPool::ErrorCollector::EXTENDEE,
-             "Extensions to non-lite types can only be declared in non-lite "
-             "files.  Note that you cannot extend a non-lite type to contain "
-             "a lite type, but the reverse is allowed.");
-  }
-
-  // Validate map types.
-  if (field->is_map()) {
-    if (!ValidateMapEntry(field, proto)) {
-      AddError(field->full_name(), proto, DescriptorPool::ErrorCollector::TYPE,
-               "map_entry should not be set explicitly. Use map<KeyType, "
-               "ValueType> instead.");
-    }
-  }
-
-  ValidateJSType(field, proto);
-
-  // json_name option is not allowed on extension fields. Note that the
-  // json_name field in FieldDescriptorProto is always populated by protoc
-  // when it sends descriptor data to plugins (calculated from field name if
-  // the option is not explicitly set) so we can't rely on its presence to
-  // determine whether the json_name option is set on the field. Here we
-  // compare it against the default calculated json_name value and consider
-  // the option set if they are different. This won't catch the case when
-  // an user explicitly sets json_name to the default value, but should be
-  // good enough to catch common misuses.
-  if (field->is_extension() &&
-      (field->has_json_name() &&
-       field->json_name() != ToJsonName(field->name()))) {
-    AddError(field->full_name(), proto,
-             DescriptorPool::ErrorCollector::OPTION_NAME,
-             "option json_name is not allowed on extension fields.");
-  }
-
-}
-
-void DescriptorBuilder::ValidateEnumOptions(EnumDescriptor* enm,
-                                            const EnumDescriptorProto& proto) {
-  VALIDATE_OPTIONS_FROM_ARRAY(enm, value, EnumValue);
-  if (!enm->options().has_allow_alias() || !enm->options().allow_alias()) {
-    std::map<int, std::string> used_values;
-    for (int i = 0; i < enm->value_count(); ++i) {
-      const EnumValueDescriptor* enum_value = enm->value(i);
-      if (used_values.find(enum_value->number()) != used_values.end()) {
-        std::string error =
-            "\"" + enum_value->full_name() +
-            "\" uses the same enum value as \"" +
-            used_values[enum_value->number()] +
-            "\". If this is intended, set "
-            "'option allow_alias = true;' to the enum definition.";
-        if (!enm->options().allow_alias()) {
-          // Generate error if duplicated enum values are explicitly disallowed.
-          AddError(enm->full_name(), proto.value(i),
-                   DescriptorPool::ErrorCollector::NUMBER, error);
-        }
-      } else {
-        used_values[enum_value->number()] = enum_value->full_name();
-      }
-    }
-  }
-}
-
-void DescriptorBuilder::ValidateEnumValueOptions(
-    EnumValueDescriptor* /* enum_value */,
-    const EnumValueDescriptorProto& /* proto */) {
-  // Nothing to do so far.
-}
-
-void DescriptorBuilder::ValidateExtensionRangeOptions(
-    const std::string& full_name, Descriptor::ExtensionRange* extension_range,
-    const DescriptorProto_ExtensionRange& proto) {
-  (void)full_name;        // Parameter is used by Google-internal code.
-  (void)extension_range;  // Parameter is used by Google-internal code.
-}
-
-void DescriptorBuilder::ValidateServiceOptions(
-    ServiceDescriptor* service, const ServiceDescriptorProto& proto) {
-  if (IsLite(service->file()) &&
-      (service->file()->options().cc_generic_services() ||
-       service->file()->options().java_generic_services())) {
-    AddError(service->full_name(), proto, DescriptorPool::ErrorCollector::NAME,
-             "Files with optimize_for = LITE_RUNTIME cannot define services "
-             "unless you set both options cc_generic_services and "
-             "java_generic_services to false.");
-  }
-
-  VALIDATE_OPTIONS_FROM_ARRAY(service, method, Method);
-}
-
-void DescriptorBuilder::ValidateMethodOptions(
-    MethodDescriptor* /* method */, const MethodDescriptorProto& /* proto */) {
-  // Nothing to do so far.
-}
-
-bool DescriptorBuilder::ValidateMapEntry(FieldDescriptor* field,
-                                         const FieldDescriptorProto& proto) {
-  const Descriptor* message = field->message_type();
-  if (  // Must not contain extensions, extension range or nested message or
-        // enums
-      message->extension_count() != 0 ||
-      field->label() != FieldDescriptor::LABEL_REPEATED ||
-      message->extension_range_count() != 0 ||
-      message->nested_type_count() != 0 || message->enum_type_count() != 0 ||
-      // Must contain exactly two fields
-      message->field_count() != 2 ||
-      // Field name and message name must match
-      message->name() != ToCamelCase(field->name(), false) + "Entry" ||
-      // Entry message must be in the same containing type of the field.
-      field->containing_type() != message->containing_type()) {
-    return false;
-  }
-
-  const FieldDescriptor* key = message->map_key();
-  const FieldDescriptor* value = message->map_value();
-  if (key->label() != FieldDescriptor::LABEL_OPTIONAL || key->number() != 1 ||
-      key->name() != "key") {
-    return false;
-  }
-  if (value->label() != FieldDescriptor::LABEL_OPTIONAL ||
-      value->number() != 2 || value->name() != "value") {
-    return false;
-  }
-
-  // Check key types are legal.
-  switch (key->type()) {
-    case FieldDescriptor::TYPE_ENUM:
-      AddError(field->full_name(), proto, DescriptorPool::ErrorCollector::TYPE,
-               "Key in map fields cannot be enum types.");
-      break;
-    case FieldDescriptor::TYPE_FLOAT:
-    case FieldDescriptor::TYPE_DOUBLE:
-    case FieldDescriptor::TYPE_MESSAGE:
-    case FieldDescriptor::TYPE_GROUP:
-    case FieldDescriptor::TYPE_BYTES:
-      AddError(
-          field->full_name(), proto, DescriptorPool::ErrorCollector::TYPE,
-          "Key in map fields cannot be float/double, bytes or message types.");
-      break;
-    case FieldDescriptor::TYPE_BOOL:
-    case FieldDescriptor::TYPE_INT32:
-    case FieldDescriptor::TYPE_INT64:
-    case FieldDescriptor::TYPE_SINT32:
-    case FieldDescriptor::TYPE_SINT64:
-    case FieldDescriptor::TYPE_STRING:
-    case FieldDescriptor::TYPE_UINT32:
-    case FieldDescriptor::TYPE_UINT64:
-    case FieldDescriptor::TYPE_FIXED32:
-    case FieldDescriptor::TYPE_FIXED64:
-    case FieldDescriptor::TYPE_SFIXED32:
-    case FieldDescriptor::TYPE_SFIXED64:
-      // Legal cases
-      break;
-      // Do not add a default, so that the compiler will complain when new types
-      // are added.
-  }
-
-  if (value->type() == FieldDescriptor::TYPE_ENUM) {
-    if (value->enum_type()->value(0)->number() != 0) {
-      AddError(field->full_name(), proto, DescriptorPool::ErrorCollector::TYPE,
-               "Enum value in map must define 0 as the first value.");
-    }
-  }
-
-  return true;
-}
-
-void DescriptorBuilder::DetectMapConflicts(const Descriptor* message,
-                                           const DescriptorProto& proto) {
-  std::map<std::string, const Descriptor*> seen_types;
-  for (int i = 0; i < message->nested_type_count(); ++i) {
-    const Descriptor* nested = message->nested_type(i);
-    std::pair<std::map<std::string, const Descriptor*>::iterator, bool> result =
-        seen_types.insert(std::make_pair(nested->name(), nested));
-    if (!result.second) {
-      if (result.first->second->options().map_entry() ||
-          nested->options().map_entry()) {
-        AddError(message->full_name(), proto,
-                 DescriptorPool::ErrorCollector::NAME,
-                 "Expanded map entry type " + nested->name() +
-                     " conflicts with an existing nested message type.");
-        break;
-      }
-    }
-    // Recursively test on the nested types.
-    DetectMapConflicts(message->nested_type(i), proto.nested_type(i));
-  }
-  // Check for conflicted field names.
-  for (int i = 0; i < message->field_count(); ++i) {
-    const FieldDescriptor* field = message->field(i);
-    std::map<std::string, const Descriptor*>::iterator iter =
-        seen_types.find(field->name());
-    if (iter != seen_types.end() && iter->second->options().map_entry()) {
-      AddError(message->full_name(), proto,
-               DescriptorPool::ErrorCollector::NAME,
-               "Expanded map entry type " + iter->second->name() +
-                   " conflicts with an existing field.");
-    }
-  }
-  // Check for conflicted enum names.
-  for (int i = 0; i < message->enum_type_count(); ++i) {
-    const EnumDescriptor* enum_desc = message->enum_type(i);
-    std::map<std::string, const Descriptor*>::iterator iter =
-        seen_types.find(enum_desc->name());
-    if (iter != seen_types.end() && iter->second->options().map_entry()) {
-      AddError(message->full_name(), proto,
-               DescriptorPool::ErrorCollector::NAME,
-               "Expanded map entry type " + iter->second->name() +
-                   " conflicts with an existing enum type.");
-    }
-  }
-  // Check for conflicted oneof names.
-  for (int i = 0; i < message->oneof_decl_count(); ++i) {
-    const OneofDescriptor* oneof_desc = message->oneof_decl(i);
-    std::map<std::string, const Descriptor*>::iterator iter =
-        seen_types.find(oneof_desc->name());
-    if (iter != seen_types.end() && iter->second->options().map_entry()) {
-      AddError(message->full_name(), proto,
-               DescriptorPool::ErrorCollector::NAME,
-               "Expanded map entry type " + iter->second->name() +
-                   " conflicts with an existing oneof type.");
-    }
-  }
-}
-
-void DescriptorBuilder::ValidateJSType(FieldDescriptor* field,
-                                       const FieldDescriptorProto& proto) {
-  FieldOptions::JSType jstype = field->options().jstype();
-  // The default is always acceptable.
-  if (jstype == FieldOptions::JS_NORMAL) {
-    return;
-  }
-
-  switch (field->type()) {
-    // Integral 64-bit types may be represented as JavaScript numbers or
-    // strings.
-    case FieldDescriptor::TYPE_UINT64:
-    case FieldDescriptor::TYPE_INT64:
-    case FieldDescriptor::TYPE_SINT64:
-    case FieldDescriptor::TYPE_FIXED64:
-    case FieldDescriptor::TYPE_SFIXED64:
-      if (jstype == FieldOptions::JS_STRING ||
-          jstype == FieldOptions::JS_NUMBER) {
-        return;
-      }
-      AddError(field->full_name(), proto, DescriptorPool::ErrorCollector::TYPE,
-               "Illegal jstype for int64, uint64, sint64, fixed64 "
-               "or sfixed64 field: " +
-                   FieldOptions_JSType_descriptor()->value(jstype)->name());
-      break;
-
-    // No other types permit a jstype option.
-    default:
-      AddError(field->full_name(), proto, DescriptorPool::ErrorCollector::TYPE,
-               "jstype is only allowed on int64, uint64, sint64, fixed64 "
-               "or sfixed64 fields.");
-      break;
-  }
-}
-
-#undef VALIDATE_OPTIONS_FROM_ARRAY
-
-// -------------------------------------------------------------------
-
-DescriptorBuilder::OptionInterpreter::OptionInterpreter(
-    DescriptorBuilder* builder)
-    : builder_(builder) {
-  GOOGLE_CHECK(builder_);
-}
-
-DescriptorBuilder::OptionInterpreter::~OptionInterpreter() {}
-
-bool DescriptorBuilder::OptionInterpreter::InterpretOptions(
-    OptionsToInterpret* options_to_interpret) {
-  // Note that these may be in different pools, so we can't use the same
-  // descriptor and reflection objects on both.
-  Message* options = options_to_interpret->options;
-  const Message* original_options = options_to_interpret->original_options;
-
-  bool failed = false;
-  options_to_interpret_ = options_to_interpret;
-
-  // Find the uninterpreted_option field in the mutable copy of the options
-  // and clear them, since we're about to interpret them.
-  const FieldDescriptor* uninterpreted_options_field =
-      options->GetDescriptor()->FindFieldByName("uninterpreted_option");
-  GOOGLE_CHECK(uninterpreted_options_field != nullptr)
-      << "No field named \"uninterpreted_option\" in the Options proto.";
-  options->GetReflection()->ClearField(options, uninterpreted_options_field);
-
-  std::vector<int> src_path = options_to_interpret->element_path;
-  src_path.push_back(uninterpreted_options_field->number());
-
-  // Find the uninterpreted_option field in the original options.
-  const FieldDescriptor* original_uninterpreted_options_field =
-      original_options->GetDescriptor()->FindFieldByName(
-          "uninterpreted_option");
-  GOOGLE_CHECK(original_uninterpreted_options_field != nullptr)
-      << "No field named \"uninterpreted_option\" in the Options proto.";
-
-  const int num_uninterpreted_options =
-      original_options->GetReflection()->FieldSize(
-          *original_options, original_uninterpreted_options_field);
-  for (int i = 0; i < num_uninterpreted_options; ++i) {
-    src_path.push_back(i);
-    uninterpreted_option_ = down_cast<const UninterpretedOption*>(
-        &original_options->GetReflection()->GetRepeatedMessage(
-            *original_options, original_uninterpreted_options_field, i));
-    if (!InterpretSingleOption(options, src_path,
-                               options_to_interpret->element_path)) {
-      // Error already added by InterpretSingleOption().
-      failed = true;
-      break;
-    }
-    src_path.pop_back();
-  }
-  // Reset these, so we don't have any dangling pointers.
-  uninterpreted_option_ = nullptr;
-  options_to_interpret_ = nullptr;
-
-  if (!failed) {
-    // InterpretSingleOption() added the interpreted options in the
-    // UnknownFieldSet, in case the option isn't yet known to us.  Now we
-    // serialize the options message and deserialize it back.  That way, any
-    // option fields that we do happen to know about will get moved from the
-    // UnknownFieldSet into the real fields, and thus be available right away.
-    // If they are not known, that's OK too. They will get reparsed into the
-    // UnknownFieldSet and wait there until the message is parsed by something
-    // that does know about the options.
-
-    // Keep the unparsed options around in case the reparsing fails.
-    std::unique_ptr<Message> unparsed_options(options->New());
-    options->GetReflection()->Swap(unparsed_options.get(), options);
-
-    std::string buf;
-    if (!unparsed_options->AppendToString(&buf) ||
-        !options->ParseFromString(buf)) {
-      builder_->AddError(
-          options_to_interpret->element_name, *original_options,
-          DescriptorPool::ErrorCollector::OTHER,
-          "Some options could not be correctly parsed using the proto "
-          "descriptors compiled into this binary.\n"
-          "Unparsed options: " +
-              unparsed_options->ShortDebugString() +
-              "\n"
-              "Parsing attempt:  " +
-              options->ShortDebugString());
-      // Restore the unparsed options.
-      options->GetReflection()->Swap(unparsed_options.get(), options);
-    }
-  }
-
-  return !failed;
-}
-
-bool DescriptorBuilder::OptionInterpreter::InterpretSingleOption(
-    Message* options, const std::vector<int>& src_path,
-    const std::vector<int>& options_path) {
-  // First do some basic validation.
-  if (uninterpreted_option_->name_size() == 0) {
-    // This should never happen unless the parser has gone seriously awry or
-    // someone has manually created the uninterpreted option badly.
-    return AddNameError("Option must have a name.");
-  }
-  if (uninterpreted_option_->name(0).name_part() == "uninterpreted_option") {
-    return AddNameError(
-        "Option must not use reserved name "
-        "\"uninterpreted_option\".");
-  }
-
-  const Descriptor* options_descriptor = nullptr;
-  // Get the options message's descriptor from the builder's pool, so that we
-  // get the version that knows about any extension options declared in the file
-  // we're currently building. The descriptor should be there as long as the
-  // file we're building imported descriptor.proto.
-
-  // Note that we use DescriptorBuilder::FindSymbolNotEnforcingDeps(), not
-  // DescriptorPool::FindMessageTypeByName() because we're already holding the
-  // pool's mutex, and the latter method locks it again.  We don't use
-  // FindSymbol() because files that use custom options only need to depend on
-  // the file that defines the option, not descriptor.proto itself.
-  Symbol symbol = builder_->FindSymbolNotEnforcingDeps(
-      options->GetDescriptor()->full_name());
-  options_descriptor = symbol.descriptor();
-  if (options_descriptor == nullptr) {
-    // The options message's descriptor was not in the builder's pool, so use
-    // the standard version from the generated pool. We're not holding the
-    // generated pool's mutex, so we can search it the straightforward way.
-    options_descriptor = options->GetDescriptor();
-  }
-  GOOGLE_CHECK(options_descriptor);
-
-  // We iterate over the name parts to drill into the submessages until we find
-  // the leaf field for the option. As we drill down we remember the current
-  // submessage's descriptor in |descriptor| and the next field in that
-  // submessage in |field|. We also track the fields we're drilling down
-  // through in |intermediate_fields|. As we go, we reconstruct the full option
-  // name in |debug_msg_name|, for use in error messages.
-  const Descriptor* descriptor = options_descriptor;
-  const FieldDescriptor* field = nullptr;
-  std::vector<const FieldDescriptor*> intermediate_fields;
-  std::string debug_msg_name = "";
-
-  std::vector<int> dest_path = options_path;
-
-  for (int i = 0; i < uninterpreted_option_->name_size(); ++i) {
-    builder_->undefine_resolved_name_.clear();
-    const std::string& name_part = uninterpreted_option_->name(i).name_part();
-    if (debug_msg_name.size() > 0) {
-      debug_msg_name += ".";
-    }
-    if (uninterpreted_option_->name(i).is_extension()) {
-      debug_msg_name += "(" + name_part + ")";
-      // Search for the extension's descriptor as an extension in the builder's
-      // pool. Note that we use DescriptorBuilder::LookupSymbol(), not
-      // DescriptorPool::FindExtensionByName(), for two reasons: 1) It allows
-      // relative lookups, and 2) because we're already holding the pool's
-      // mutex, and the latter method locks it again.
-      symbol =
-          builder_->LookupSymbol(name_part, options_to_interpret_->name_scope);
-      field = symbol.field_descriptor();
-      // If we don't find the field then the field's descriptor was not in the
-      // builder's pool, but there's no point in looking in the generated
-      // pool. We require that you import the file that defines any extensions
-      // you use, so they must be present in the builder's pool.
-    } else {
-      debug_msg_name += name_part;
-      // Search for the field's descriptor as a regular field.
-      field = descriptor->FindFieldByName(name_part);
-    }
-
-    if (field == nullptr) {
-      if (get_allow_unknown(builder_->pool_)) {
-        // We can't find the option, but AllowUnknownDependencies() is enabled,
-        // so we will just leave it as uninterpreted.
-        AddWithoutInterpreting(*uninterpreted_option_, options);
-        return true;
-      } else if (!(builder_->undefine_resolved_name_).empty()) {
-        // Option is resolved to a name which is not defined.
-        return AddNameError(
-            "Option \"" + debug_msg_name + "\" is resolved to \"(" +
-            builder_->undefine_resolved_name_ +
-            ")\", which is not defined. The innermost scope is searched first "
-            "in name resolution. Consider using a leading '.'(i.e., \"(." +
-            debug_msg_name.substr(1) +
-            "\") to start from the outermost scope.");
-      } else {
-        return AddNameError(
-            "Option \"" + debug_msg_name +
-            "\" unknown. Ensure that your proto" +
-            " definition file imports the proto which defines the option.");
-      }
-    } else if (field->containing_type() != descriptor) {
-      if (get_is_placeholder(field->containing_type())) {
-        // The field is an extension of a placeholder type, so we can't
-        // reliably verify whether it is a valid extension to use here (e.g.
-        // we don't know if it is an extension of the correct *Options message,
-        // or if it has a valid field number, etc.).  Just leave it as
-        // uninterpreted instead.
-        AddWithoutInterpreting(*uninterpreted_option_, options);
-        return true;
-      } else {
-        // This can only happen if, due to some insane misconfiguration of the
-        // pools, we find the options message in one pool but the field in
-        // another. This would probably imply a hefty bug somewhere.
-        return AddNameError("Option field \"" + debug_msg_name +
-                            "\" is not a field or extension of message \"" +
-                            descriptor->name() + "\".");
-      }
-    } else {
-      // accumulate field numbers to form path to interpreted option
-      dest_path.push_back(field->number());
-
-      if (i < uninterpreted_option_->name_size() - 1) {
-        if (field->cpp_type() != FieldDescriptor::CPPTYPE_MESSAGE) {
-          return AddNameError("Option \"" + debug_msg_name +
-                              "\" is an atomic type, not a message.");
-        } else if (field->is_repeated()) {
-          return AddNameError("Option field \"" + debug_msg_name +
-                              "\" is a repeated message. Repeated message "
-                              "options must be initialized using an "
-                              "aggregate value.");
-        } else {
-          // Drill down into the submessage.
-          intermediate_fields.push_back(field);
-          descriptor = field->message_type();
-        }
-      }
-    }
-  }
-
-  // We've found the leaf field. Now we use UnknownFieldSets to set its value
-  // on the options message. We do so because the message may not yet know
-  // about its extension fields, so we may not be able to set the fields
-  // directly. But the UnknownFieldSets will serialize to the same wire-format
-  // message, so reading that message back in once the extension fields are
-  // known will populate them correctly.
-
-  // First see if the option is already set.
-  if (!field->is_repeated() &&
-      !ExamineIfOptionIsSet(
-          intermediate_fields.begin(), intermediate_fields.end(), field,
-          debug_msg_name,
-          options->GetReflection()->GetUnknownFields(*options))) {
-    return false;  // ExamineIfOptionIsSet() already added the error.
-  }
-
-  // First set the value on the UnknownFieldSet corresponding to the
-  // innermost message.
-  std::unique_ptr<UnknownFieldSet> unknown_fields(new UnknownFieldSet());
-  if (!SetOptionValue(field, unknown_fields.get())) {
-    return false;  // SetOptionValue() already added the error.
-  }
-
-  // Now wrap the UnknownFieldSet with UnknownFieldSets corresponding to all
-  // the intermediate messages.
-  for (std::vector<const FieldDescriptor*>::reverse_iterator iter =
-           intermediate_fields.rbegin();
-       iter != intermediate_fields.rend(); ++iter) {
-    std::unique_ptr<UnknownFieldSet> parent_unknown_fields(
-        new UnknownFieldSet());
-    switch ((*iter)->type()) {
-      case FieldDescriptor::TYPE_MESSAGE: {
-        std::string* outstr =
-            parent_unknown_fields->AddLengthDelimited((*iter)->number());
-        GOOGLE_CHECK(unknown_fields->SerializeToString(outstr))
-            << "Unexpected failure while serializing option submessage "
-            << debug_msg_name << "\".";
-        break;
-      }
-
-      case FieldDescriptor::TYPE_GROUP: {
-        parent_unknown_fields->AddGroup((*iter)->number())
-            ->MergeFrom(*unknown_fields);
-        break;
-      }
-
-      default:
-        GOOGLE_LOG(FATAL) << "Invalid wire type for CPPTYPE_MESSAGE: "
-                   << (*iter)->type();
-        return false;
-    }
-    unknown_fields.reset(parent_unknown_fields.release());
-  }
-
-  // Now merge the UnknownFieldSet corresponding to the top-level message into
-  // the options message.
-  options->GetReflection()->MutableUnknownFields(options)->MergeFrom(
-      *unknown_fields);
-
-  // record the element path of the interpreted option
-  if (field->is_repeated()) {
-    int index = repeated_option_counts_[dest_path]++;
-    dest_path.push_back(index);
-  }
-  interpreted_paths_[src_path] = dest_path;
-
-  return true;
-}
-
-void DescriptorBuilder::OptionInterpreter::UpdateSourceCodeInfo(
-    SourceCodeInfo* info) {
-  if (interpreted_paths_.empty()) {
-    // nothing to do!
-    return;
-  }
-
-  // We find locations that match keys in interpreted_paths_ and
-  // 1) replace the path with the corresponding value in interpreted_paths_
-  // 2) remove any subsequent sub-locations (sub-location is one whose path
-  //    has the parent path as a prefix)
-  //
-  // To avoid quadratic behavior of removing interior rows as we go,
-  // we keep a copy. But we don't actually copy anything until we've
-  // found the first match (so if the source code info has no locations
-  // that need to be changed, there is zero copy overhead).
-
-  RepeatedPtrField<SourceCodeInfo_Location>* locs = info->mutable_location();
-  RepeatedPtrField<SourceCodeInfo_Location> new_locs;
-  bool copying = false;
-
-  std::vector<int> pathv;
-  bool matched = false;
-
-  for (RepeatedPtrField<SourceCodeInfo_Location>::iterator loc = locs->begin();
-       loc != locs->end(); loc++) {
-    if (matched) {
-      // see if this location is in the range to remove
-      bool loc_matches = true;
-      if (loc->path_size() < static_cast<int64_t>(pathv.size())) {
-        loc_matches = false;
-      } else {
-        for (size_t j = 0; j < pathv.size(); j++) {
-          if (loc->path(j) != pathv[j]) {
-            loc_matches = false;
-            break;
-          }
-        }
-      }
-
-      if (loc_matches) {
-        // don't copy this row since it is a sub-location that we're removing
-        continue;
-      }
-
-      matched = false;
-    }
-
-    pathv.clear();
-    for (int j = 0; j < loc->path_size(); j++) {
-      pathv.push_back(loc->path(j));
-    }
-
-    std::map<std::vector<int>, std::vector<int>>::iterator entry =
-        interpreted_paths_.find(pathv);
-
-    if (entry == interpreted_paths_.end()) {
-      // not a match
-      if (copying) {
-        *new_locs.Add() = *loc;
-      }
-      continue;
-    }
-
-    matched = true;
-
-    if (!copying) {
-      // initialize the copy we are building
-      copying = true;
-      new_locs.Reserve(locs->size());
-      for (RepeatedPtrField<SourceCodeInfo_Location>::iterator it =
-               locs->begin();
-           it != loc; it++) {
-        *new_locs.Add() = *it;
-      }
-    }
-
-    // add replacement and update its path
-    SourceCodeInfo_Location* replacement = new_locs.Add();
-    *replacement = *loc;
-    replacement->clear_path();
-    for (std::vector<int>::iterator rit = entry->second.begin();
-         rit != entry->second.end(); rit++) {
-      replacement->add_path(*rit);
-    }
-  }
-
-  // if we made a changed copy, put it in place
-  if (copying) {
-    *locs = new_locs;
-  }
-}
-
-void DescriptorBuilder::OptionInterpreter::AddWithoutInterpreting(
-    const UninterpretedOption& uninterpreted_option, Message* options) {
-  const FieldDescriptor* field =
-      options->GetDescriptor()->FindFieldByName("uninterpreted_option");
-  GOOGLE_CHECK(field != nullptr);
-
-  options->GetReflection()
-      ->AddMessage(options, field)
-      ->CopyFrom(uninterpreted_option);
-}
-
-bool DescriptorBuilder::OptionInterpreter::ExamineIfOptionIsSet(
-    std::vector<const FieldDescriptor*>::const_iterator
-        intermediate_fields_iter,
-    std::vector<const FieldDescriptor*>::const_iterator intermediate_fields_end,
-    const FieldDescriptor* innermost_field, const std::string& debug_msg_name,
-    const UnknownFieldSet& unknown_fields) {
-  // We do linear searches of the UnknownFieldSet and its sub-groups.  This
-  // should be fine since it's unlikely that any one options structure will
-  // contain more than a handful of options.
-
-  if (intermediate_fields_iter == intermediate_fields_end) {
-    // We're at the innermost submessage.
-    for (int i = 0; i < unknown_fields.field_count(); i++) {
-      if (unknown_fields.field(i).number() == innermost_field->number()) {
-        return AddNameError("Option \"" + debug_msg_name +
-                            "\" was already set.");
-      }
-    }
-    return true;
-  }
-
-  for (int i = 0; i < unknown_fields.field_count(); i++) {
-    if (unknown_fields.field(i).number() ==
-        (*intermediate_fields_iter)->number()) {
-      const UnknownField* unknown_field = &unknown_fields.field(i);
-      FieldDescriptor::Type type = (*intermediate_fields_iter)->type();
-      // Recurse into the next submessage.
-      switch (type) {
-        case FieldDescriptor::TYPE_MESSAGE:
-          if (unknown_field->type() == UnknownField::TYPE_LENGTH_DELIMITED) {
-            UnknownFieldSet intermediate_unknown_fields;
-            if (intermediate_unknown_fields.ParseFromString(
-                    unknown_field->length_delimited()) &&
-                !ExamineIfOptionIsSet(intermediate_fields_iter + 1,
-                                      intermediate_fields_end, innermost_field,
-                                      debug_msg_name,
-                                      intermediate_unknown_fields)) {
-              return false;  // Error already added.
-            }
-          }
-          break;
-
-        case FieldDescriptor::TYPE_GROUP:
-          if (unknown_field->type() == UnknownField::TYPE_GROUP) {
-            if (!ExamineIfOptionIsSet(intermediate_fields_iter + 1,
-                                      intermediate_fields_end, innermost_field,
-                                      debug_msg_name, unknown_field->group())) {
-              return false;  // Error already added.
-            }
-          }
-          break;
-
-        default:
-          GOOGLE_LOG(FATAL) << "Invalid wire type for CPPTYPE_MESSAGE: " << type;
-          return false;
-      }
-    }
-  }
-  return true;
-}
-
-bool DescriptorBuilder::OptionInterpreter::SetOptionValue(
-    const FieldDescriptor* option_field, UnknownFieldSet* unknown_fields) {
-  // We switch on the CppType to validate.
-  switch (option_field->cpp_type()) {
-    case FieldDescriptor::CPPTYPE_INT32:
-      if (uninterpreted_option_->has_positive_int_value()) {
-        if (uninterpreted_option_->positive_int_value() >
-            static_cast<uint64_t>(std::numeric_limits<int32_t>::max())) {
-          return AddValueError("Value out of range for int32 option \"" +
-                               option_field->full_name() + "\".");
-        } else {
-          SetInt32(option_field->number(),
-                   uninterpreted_option_->positive_int_value(),
-                   option_field->type(), unknown_fields);
-        }
-      } else if (uninterpreted_option_->has_negative_int_value()) {
-        if (uninterpreted_option_->negative_int_value() <
-            static_cast<int64_t>(std::numeric_limits<int32_t>::min())) {
-          return AddValueError("Value out of range for int32 option \"" +
-                               option_field->full_name() + "\".");
-        } else {
-          SetInt32(option_field->number(),
-                   uninterpreted_option_->negative_int_value(),
-                   option_field->type(), unknown_fields);
-        }
-      } else {
-        return AddValueError("Value must be integer for int32 option \"" +
-                             option_field->full_name() + "\".");
-      }
-      break;
-
-    case FieldDescriptor::CPPTYPE_INT64:
-      if (uninterpreted_option_->has_positive_int_value()) {
-        if (uninterpreted_option_->positive_int_value() >
-            static_cast<uint64_t>(std::numeric_limits<int64_t>::max())) {
-          return AddValueError("Value out of range for int64 option \"" +
-                               option_field->full_name() + "\".");
-        } else {
-          SetInt64(option_field->number(),
-                   uninterpreted_option_->positive_int_value(),
-                   option_field->type(), unknown_fields);
-        }
-      } else if (uninterpreted_option_->has_negative_int_value()) {
-        SetInt64(option_field->number(),
-                 uninterpreted_option_->negative_int_value(),
-                 option_field->type(), unknown_fields);
-      } else {
-        return AddValueError("Value must be integer for int64 option \"" +
-                             option_field->full_name() + "\".");
-      }
-      break;
-
-    case FieldDescriptor::CPPTYPE_UINT32:
-      if (uninterpreted_option_->has_positive_int_value()) {
-        if (uninterpreted_option_->positive_int_value() >
-            std::numeric_limits<uint32_t>::max()) {
-          return AddValueError("Value out of range for uint32 option \"" +
-                               option_field->name() + "\".");
-        } else {
-          SetUInt32(option_field->number(),
-                    uninterpreted_option_->positive_int_value(),
-                    option_field->type(), unknown_fields);
-        }
-      } else {
-        return AddValueError(
-            "Value must be non-negative integer for uint32 "
-            "option \"" +
-            option_field->full_name() + "\".");
-      }
-      break;
-
-    case FieldDescriptor::CPPTYPE_UINT64:
-      if (uninterpreted_option_->has_positive_int_value()) {
-        SetUInt64(option_field->number(),
-                  uninterpreted_option_->positive_int_value(),
-                  option_field->type(), unknown_fields);
-      } else {
-        return AddValueError(
-            "Value must be non-negative integer for uint64 "
-            "option \"" +
-            option_field->full_name() + "\".");
-      }
-      break;
-
-    case FieldDescriptor::CPPTYPE_FLOAT: {
-      float value;
-      if (uninterpreted_option_->has_double_value()) {
-        value = uninterpreted_option_->double_value();
-      } else if (uninterpreted_option_->has_positive_int_value()) {
-        value = uninterpreted_option_->positive_int_value();
-      } else if (uninterpreted_option_->has_negative_int_value()) {
-        value = uninterpreted_option_->negative_int_value();
-      } else {
-        return AddValueError("Value must be number for float option \"" +
-                             option_field->full_name() + "\".");
-      }
-      unknown_fields->AddFixed32(option_field->number(),
-                                 internal::WireFormatLite::EncodeFloat(value));
-      break;
-    }
-
-    case FieldDescriptor::CPPTYPE_DOUBLE: {
-      double value;
-      if (uninterpreted_option_->has_double_value()) {
-        value = uninterpreted_option_->double_value();
-      } else if (uninterpreted_option_->has_positive_int_value()) {
-        value = uninterpreted_option_->positive_int_value();
-      } else if (uninterpreted_option_->has_negative_int_value()) {
-        value = uninterpreted_option_->negative_int_value();
-      } else {
-        return AddValueError("Value must be number for double option \"" +
-                             option_field->full_name() + "\".");
-      }
-      unknown_fields->AddFixed64(option_field->number(),
-                                 internal::WireFormatLite::EncodeDouble(value));
-      break;
-    }
-
-    case FieldDescriptor::CPPTYPE_BOOL:
-      uint64_t value;
-      if (!uninterpreted_option_->has_identifier_value()) {
-        return AddValueError(
-            "Value must be identifier for boolean option "
-            "\"" +
-            option_field->full_name() + "\".");
-      }
-      if (uninterpreted_option_->identifier_value() == "true") {
-        value = 1;
-      } else if (uninterpreted_option_->identifier_value() == "false") {
-        value = 0;
-      } else {
-        return AddValueError(
-            "Value must be \"true\" or \"false\" for boolean "
-            "option \"" +
-            option_field->full_name() + "\".");
-      }
-      unknown_fields->AddVarint(option_field->number(), value);
-      break;
-
-    case FieldDescriptor::CPPTYPE_ENUM: {
-      if (!uninterpreted_option_->has_identifier_value()) {
-        return AddValueError(
-            "Value must be identifier for enum-valued option "
-            "\"" +
-            option_field->full_name() + "\".");
-      }
-      const EnumDescriptor* enum_type = option_field->enum_type();
-      const std::string& value_name = uninterpreted_option_->identifier_value();
-      const EnumValueDescriptor* enum_value = nullptr;
-
-      if (enum_type->file()->pool() != DescriptorPool::generated_pool()) {
-        // Note that the enum value's fully-qualified name is a sibling of the
-        // enum's name, not a child of it.
-        std::string fully_qualified_name = enum_type->full_name();
-        fully_qualified_name.resize(fully_qualified_name.size() -
-                                    enum_type->name().size());
-        fully_qualified_name += value_name;
-
-        // Search for the enum value's descriptor in the builder's pool. Note
-        // that we use DescriptorBuilder::FindSymbolNotEnforcingDeps(), not
-        // DescriptorPool::FindEnumValueByName() because we're already holding
-        // the pool's mutex, and the latter method locks it again.
-        Symbol symbol =
-            builder_->FindSymbolNotEnforcingDeps(fully_qualified_name);
-        if (auto* candicate_descriptor = symbol.enum_value_descriptor()) {
-          if (candicate_descriptor->type() != enum_type) {
-            return AddValueError(
-                "Enum type \"" + enum_type->full_name() +
-                "\" has no value named \"" + value_name + "\" for option \"" +
-                option_field->full_name() +
-                "\". This appears to be a value from a sibling type.");
-          } else {
-            enum_value = candicate_descriptor;
-          }
-        }
-      } else {
-        // The enum type is in the generated pool, so we can search for the
-        // value there.
-        enum_value = enum_type->FindValueByName(value_name);
-      }
-
-      if (enum_value == nullptr) {
-        return AddValueError("Enum type \"" +
-                             option_field->enum_type()->full_name() +
-                             "\" has no value named \"" + value_name +
-                             "\" for "
-                             "option \"" +
-                             option_field->full_name() + "\".");
-      } else {
-        // Sign-extension is not a problem, since we cast directly from int32_t
-        // to uint64_t, without first going through uint32_t.
-        unknown_fields->AddVarint(
-            option_field->number(),
-            static_cast<uint64_t>(static_cast<int64_t>(enum_value->number())));
-      }
-      break;
-    }
-
-    case FieldDescriptor::CPPTYPE_STRING:
-      if (!uninterpreted_option_->has_string_value()) {
-        return AddValueError(
-            "Value must be quoted string for string option "
-            "\"" +
-            option_field->full_name() + "\".");
-      }
-      // The string has already been unquoted and unescaped by the parser.
-      unknown_fields->AddLengthDelimited(option_field->number(),
-                                         uninterpreted_option_->string_value());
-      break;
-
-    case FieldDescriptor::CPPTYPE_MESSAGE:
-      if (!SetAggregateOption(option_field, unknown_fields)) {
-        return false;
-      }
-      break;
-  }
-
-  return true;
-}
-
-class DescriptorBuilder::OptionInterpreter::AggregateOptionFinder
-    : public TextFormat::Finder {
- public:
-  DescriptorBuilder* builder_;
-
-  const Descriptor* FindAnyType(const Message& /*message*/,
-                                const std::string& prefix,
-                                const std::string& name) const override {
-    if (prefix != internal::kTypeGoogleApisComPrefix &&
-        prefix != internal::kTypeGoogleProdComPrefix) {
-      return nullptr;
-    }
-    assert_mutex_held(builder_->pool_);
-    return builder_->FindSymbol(name).descriptor();
-  }
-
-  const FieldDescriptor* FindExtension(Message* message,
-                                       const std::string& name) const override {
-    assert_mutex_held(builder_->pool_);
-    const Descriptor* descriptor = message->GetDescriptor();
-    Symbol result =
-        builder_->LookupSymbolNoPlaceholder(name, descriptor->full_name());
-    if (auto* field = result.field_descriptor()) {
-      return field;
-    } else if (result.type() == Symbol::MESSAGE &&
-               descriptor->options().message_set_wire_format()) {
-      const Descriptor* foreign_type = result.descriptor();
-      // The text format allows MessageSet items to be specified using
-      // the type name, rather than the extension identifier. If the symbol
-      // lookup returned a Message, and the enclosing Message has
-      // message_set_wire_format = true, then return the message set
-      // extension, if one exists.
-      for (int i = 0; i < foreign_type->extension_count(); i++) {
-        const FieldDescriptor* extension = foreign_type->extension(i);
-        if (extension->containing_type() == descriptor &&
-            extension->type() == FieldDescriptor::TYPE_MESSAGE &&
-            extension->is_optional() &&
-            extension->message_type() == foreign_type) {
-          // Found it.
-          return extension;
-        }
-      }
-    }
-    return nullptr;
-  }
-};
-
-// A custom error collector to record any text-format parsing errors
-namespace {
-class AggregateErrorCollector : public io::ErrorCollector {
- public:
-  std::string error_;
-
-  void AddError(int /* line */, int /* column */,
-                const std::string& message) override {
-    if (!error_.empty()) {
-      error_ += "; ";
-    }
-    error_ += message;
-  }
-
-  void AddWarning(int /* line */, int /* column */,
-                  const std::string& /* message */) override {
-    // Ignore warnings
-  }
-};
-}  // namespace
-
-// We construct a dynamic message of the type corresponding to
-// option_field, parse the supplied text-format string into this
-// message, and serialize the resulting message to produce the value.
-bool DescriptorBuilder::OptionInterpreter::SetAggregateOption(
-    const FieldDescriptor* option_field, UnknownFieldSet* unknown_fields) {
-  if (!uninterpreted_option_->has_aggregate_value()) {
-    return AddValueError("Option \"" + option_field->full_name() +
-                         "\" is a message. To set the entire message, use "
-                         "syntax like \"" +
-                         option_field->name() +
-                         " = { <proto text format> }\". "
-                         "To set fields within it, use "
-                         "syntax like \"" +
-                         option_field->name() + ".foo = value\".");
-  }
-
-  const Descriptor* type = option_field->message_type();
-  std::unique_ptr<Message> dynamic(dynamic_factory_.GetPrototype(type)->New());
-  GOOGLE_CHECK(dynamic.get() != nullptr)
-      << "Could not create an instance of " << option_field->DebugString();
-
-  AggregateErrorCollector collector;
-  AggregateOptionFinder finder;
-  finder.builder_ = builder_;
-  TextFormat::Parser parser;
-  parser.RecordErrorsTo(&collector);
-  parser.SetFinder(&finder);
-  if (!parser.ParseFromString(uninterpreted_option_->aggregate_value(),
-                              dynamic.get())) {
-    AddValueError("Error while parsing option value for \"" +
-                  option_field->name() + "\": " + collector.error_);
-    return false;
-  } else {
-    std::string serial;
-    dynamic->SerializeToString(&serial);  // Never fails
-    if (option_field->type() == FieldDescriptor::TYPE_MESSAGE) {
-      unknown_fields->AddLengthDelimited(option_field->number(), serial);
-    } else {
-      GOOGLE_CHECK_EQ(option_field->type(), FieldDescriptor::TYPE_GROUP);
-      UnknownFieldSet* group = unknown_fields->AddGroup(option_field->number());
-      group->ParseFromString(serial);
-    }
-    return true;
-  }
-}
-
-void DescriptorBuilder::OptionInterpreter::SetInt32(
-    int number, int32_t value, FieldDescriptor::Type type,
-    UnknownFieldSet* unknown_fields) {
-  switch (type) {
-    case FieldDescriptor::TYPE_INT32:
-      unknown_fields->AddVarint(
-          number, static_cast<uint64_t>(static_cast<int64_t>(value)));
-      break;
-
-    case FieldDescriptor::TYPE_SFIXED32:
-      unknown_fields->AddFixed32(number, static_cast<uint32_t>(value));
-      break;
-
-    case FieldDescriptor::TYPE_SINT32:
-      unknown_fields->AddVarint(
-          number, internal::WireFormatLite::ZigZagEncode32(value));
-      break;
-
-    default:
-      GOOGLE_LOG(FATAL) << "Invalid wire type for CPPTYPE_INT32: " << type;
-      break;
-  }
-}
-
-void DescriptorBuilder::OptionInterpreter::SetInt64(
-    int number, int64_t value, FieldDescriptor::Type type,
-    UnknownFieldSet* unknown_fields) {
-  switch (type) {
-    case FieldDescriptor::TYPE_INT64:
-      unknown_fields->AddVarint(number, static_cast<uint64_t>(value));
-      break;
-
-    case FieldDescriptor::TYPE_SFIXED64:
-      unknown_fields->AddFixed64(number, static_cast<uint64_t>(value));
-      break;
-
-    case FieldDescriptor::TYPE_SINT64:
-      unknown_fields->AddVarint(
-          number, internal::WireFormatLite::ZigZagEncode64(value));
-      break;
-
-    default:
-      GOOGLE_LOG(FATAL) << "Invalid wire type for CPPTYPE_INT64: " << type;
-      break;
-  }
-}
-
-void DescriptorBuilder::OptionInterpreter::SetUInt32(
-    int number, uint32_t value, FieldDescriptor::Type type,
-    UnknownFieldSet* unknown_fields) {
-  switch (type) {
-    case FieldDescriptor::TYPE_UINT32:
-      unknown_fields->AddVarint(number, static_cast<uint64_t>(value));
-      break;
-
-    case FieldDescriptor::TYPE_FIXED32:
-      unknown_fields->AddFixed32(number, static_cast<uint32_t>(value));
-      break;
-
-    default:
-      GOOGLE_LOG(FATAL) << "Invalid wire type for CPPTYPE_UINT32: " << type;
-      break;
-  }
-}
-
-void DescriptorBuilder::OptionInterpreter::SetUInt64(
-    int number, uint64_t value, FieldDescriptor::Type type,
-    UnknownFieldSet* unknown_fields) {
-  switch (type) {
-    case FieldDescriptor::TYPE_UINT64:
-      unknown_fields->AddVarint(number, value);
-      break;
-
-    case FieldDescriptor::TYPE_FIXED64:
-      unknown_fields->AddFixed64(number, value);
-      break;
-
-    default:
-      GOOGLE_LOG(FATAL) << "Invalid wire type for CPPTYPE_UINT64: " << type;
-      break;
-  }
-}
-
-void DescriptorBuilder::LogUnusedDependency(const FileDescriptorProto& proto,
-                                            const FileDescriptor* result) {
-  (void)result;  // Parameter is used by Google-internal code.
-
-  if (!unused_dependency_.empty()) {
-    auto itr = pool_->unused_import_track_files_.find(proto.name());
-    bool is_error =
-        itr != pool_->unused_import_track_files_.end() && itr->second;
-    for (std::set<const FileDescriptor*>::const_iterator it =
-             unused_dependency_.begin();
-         it != unused_dependency_.end(); ++it) {
-      std::string error_message = "Import " + (*it)->name() + " is unused.";
-      if (is_error) {
-        AddError((*it)->name(), proto, DescriptorPool::ErrorCollector::IMPORT,
-                 error_message);
-      } else {
-        AddWarning((*it)->name(), proto, DescriptorPool::ErrorCollector::IMPORT,
-                   error_message);
-      }
-    }
-  }
-}
-
-Symbol DescriptorPool::CrossLinkOnDemandHelper(StringPiece name,
-                                               bool expecting_enum) const {
-  (void)expecting_enum;  // Parameter is used by Google-internal code.
-  auto lookup_name = std::string(name);
-  if (!lookup_name.empty() && lookup_name[0] == '.') {
-    lookup_name = lookup_name.substr(1);
-  }
-  Symbol result = tables_->FindByNameHelper(this, lookup_name);
-  return result;
-}
-
-// Handle the lazy import building for a message field whose type wasn't built
-// at cross link time. If that was the case, we saved the name of the type to
-// be looked up when the accessor for the type was called. Set type_,
-// enum_type_, message_type_, and default_value_enum_ appropriately.
-void FieldDescriptor::InternalTypeOnceInit() const {
-  GOOGLE_CHECK(file()->finished_building_ == true);
-  const EnumDescriptor* enum_type = nullptr;
-  const char* lazy_type_name = reinterpret_cast<const char*>(type_once_ + 1);
-  const char* lazy_default_value_enum_name =
-      lazy_type_name + strlen(lazy_type_name) + 1;
-  Symbol result = file()->pool()->CrossLinkOnDemandHelper(
-      lazy_type_name, type_ == FieldDescriptor::TYPE_ENUM);
-  if (result.type() == Symbol::MESSAGE) {
-    type_ = FieldDescriptor::TYPE_MESSAGE;
-    type_descriptor_.message_type = result.descriptor();
-  } else if (result.type() == Symbol::ENUM) {
-    type_ = FieldDescriptor::TYPE_ENUM;
-    enum_type = type_descriptor_.enum_type = result.enum_descriptor();
-  }
-
-  if (enum_type) {
-    if (lazy_default_value_enum_name[0] != '\0') {
-      // Have to build the full name now instead of at CrossLink time,
-      // because enum_type may not be known at the time.
-      std::string name = enum_type->full_name();
-      // Enum values reside in the same scope as the enum type.
-      std::string::size_type last_dot = name.find_last_of('.');
-      if (last_dot != std::string::npos) {
-        name = name.substr(0, last_dot) + "." + lazy_default_value_enum_name;
-      } else {
-        name = lazy_default_value_enum_name;
-      }
-      Symbol result = file()->pool()->CrossLinkOnDemandHelper(name, true);
-      default_value_enum_ = result.enum_value_descriptor();
-    } else {
-      default_value_enum_ = nullptr;
-    }
-    if (!default_value_enum_) {
-      // We use the first defined value as the default
-      // if a default is not explicitly defined.
-      GOOGLE_CHECK(enum_type->value_count());
-      default_value_enum_ = enum_type->value(0);
-    }
-  }
-}
-
-void FieldDescriptor::TypeOnceInit(const FieldDescriptor* to_init) {
-  to_init->InternalTypeOnceInit();
-}
-
-// message_type(), enum_type(), default_value_enum(), and type()
-// all share the same internal::call_once init path to do lazy
-// import building and cross linking of a field of a message.
-const Descriptor* FieldDescriptor::message_type() const {
-  if (type_once_) {
-    internal::call_once(*type_once_, FieldDescriptor::TypeOnceInit, this);
-  }
-  return type_ == TYPE_MESSAGE || type_ == TYPE_GROUP
-             ? type_descriptor_.message_type
-             : nullptr;
-}
-
-const EnumDescriptor* FieldDescriptor::enum_type() const {
-  if (type_once_) {
-    internal::call_once(*type_once_, FieldDescriptor::TypeOnceInit, this);
-  }
-  return type_ == TYPE_ENUM ? type_descriptor_.enum_type : nullptr;
-}
-
-const EnumValueDescriptor* FieldDescriptor::default_value_enum() const {
-  if (type_once_) {
-    internal::call_once(*type_once_, FieldDescriptor::TypeOnceInit, this);
-  }
-  return default_value_enum_;
-}
-
-const std::string& FieldDescriptor::PrintableNameForExtension() const {
-  const bool is_message_set_extension =
-      is_extension() &&
-      containing_type()->options().message_set_wire_format() &&
-      type() == FieldDescriptor::TYPE_MESSAGE && is_optional() &&
-      extension_scope() == message_type();
-  return is_message_set_extension ? message_type()->full_name() : full_name();
-}
-
-void FileDescriptor::InternalDependenciesOnceInit() const {
-  GOOGLE_CHECK(finished_building_ == true);
-  const char* names_ptr = reinterpret_cast<const char*>(dependencies_once_ + 1);
-  for (int i = 0; i < dependency_count(); i++) {
-    const char* name = names_ptr;
-    names_ptr += strlen(name) + 1;
-    if (name[0] != '\0') {
-      dependencies_[i] = pool_->FindFileByName(name);
-    }
-  }
-}
-
-void FileDescriptor::DependenciesOnceInit(const FileDescriptor* to_init) {
-  to_init->InternalDependenciesOnceInit();
-}
-
-const FileDescriptor* FileDescriptor::dependency(int index) const {
-  if (dependencies_once_) {
-    // Do once init for all indices, as it's unlikely only a single index would
-    // be called, and saves on internal::call_once allocations.
-    internal::call_once(*dependencies_once_,
-                        FileDescriptor::DependenciesOnceInit, this);
-  }
-  return dependencies_[index];
-}
-
-const Descriptor* MethodDescriptor::input_type() const {
-  return input_type_.Get(service());
-}
-
-const Descriptor* MethodDescriptor::output_type() const {
-  return output_type_.Get(service());
-}
-
-namespace internal {
-void LazyDescriptor::Set(const Descriptor* descriptor) {
-  GOOGLE_CHECK(!once_);
-  descriptor_ = descriptor;
-}
-
-void LazyDescriptor::SetLazy(StringPiece name,
-                             const FileDescriptor* file) {
-  // verify Init() has been called and Set hasn't been called yet.
-  GOOGLE_CHECK(!descriptor_);
-  GOOGLE_CHECK(!once_);
-  GOOGLE_CHECK(file && file->pool_);
-  GOOGLE_CHECK(file->pool_->lazily_build_dependencies_);
-  GOOGLE_CHECK(!file->finished_building_);
-  once_ = ::new (file->pool_->tables_->AllocateBytes(static_cast<int>(
-      sizeof(internal::once_flag) + name.size() + 1))) internal::once_flag{};
-  char* lazy_name = reinterpret_cast<char*>(once_ + 1);
-  memcpy(lazy_name, name.data(), name.size());
-  lazy_name[name.size()] = 0;
-}
-
-void LazyDescriptor::Once(const ServiceDescriptor* service) {
-  if (once_) {
-    internal::call_once(*once_, [&] {
-      auto* file = service->file();
-      GOOGLE_CHECK(file->finished_building_);
-      const char* lazy_name = reinterpret_cast<const char*>(once_ + 1);
-      descriptor_ =
-          file->pool_->CrossLinkOnDemandHelper(lazy_name, false).descriptor();
-    });
-  }
-}
-
-}  // namespace internal
-
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
diff --git a/libs/protobuf/src/google/protobuf/descriptor.h b/libs/protobuf/src/google/protobuf/descriptor.h
deleted file mode 100644
index 6e536e5..0000000
--- a/libs/protobuf/src/google/protobuf/descriptor.h
+++ /dev/null
@@ -1,2440 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-//
-// This file contains classes which describe a type of protocol message.
-// You can use a message's descriptor to learn at runtime what fields
-// it contains and what the types of those fields are.  The Message
-// interface also allows you to dynamically access and modify individual
-// fields by passing the FieldDescriptor of the field you are interested
-// in.
-//
-// Most users will not care about descriptors, because they will write
-// code specific to certain protocol types and will simply use the classes
-// generated by the protocol compiler directly.  Advanced users who want
-// to operate on arbitrary types (not known at compile time) may want to
-// read descriptors in order to learn about the contents of a message.
-// A very small number of users will want to construct their own
-// Descriptors, either because they are implementing Message manually or
-// because they are writing something like the protocol compiler.
-//
-// For an example of how you might use descriptors, see the code example
-// at the top of message.h.
-
-#ifndef GOOGLE_PROTOBUF_DESCRIPTOR_H__
-#define GOOGLE_PROTOBUF_DESCRIPTOR_H__
-
-
-#include <atomic>
-#include <map>
-#include <memory>
-#include <set>
-#include <string>
-#include <vector>
-
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/stubs/logging.h>
-#include <google/protobuf/stubs/mutex.h>
-#include <google/protobuf/stubs/once.h>
-#include <google/protobuf/port.h>
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-// TYPE_BOOL is defined in the MacOS's ConditionalMacros.h.
-#ifdef TYPE_BOOL
-#undef TYPE_BOOL
-#endif  // TYPE_BOOL
-
-#ifdef SWIG
-#define PROTOBUF_EXPORT
-#endif
-
-
-namespace google {
-namespace protobuf {
-
-// Defined in this file.
-class Descriptor;
-class FieldDescriptor;
-class OneofDescriptor;
-class EnumDescriptor;
-class EnumValueDescriptor;
-class ServiceDescriptor;
-class MethodDescriptor;
-class FileDescriptor;
-class DescriptorDatabase;
-class DescriptorPool;
-
-// Defined in descriptor.proto
-class DescriptorProto;
-class DescriptorProto_ExtensionRange;
-class FieldDescriptorProto;
-class OneofDescriptorProto;
-class EnumDescriptorProto;
-class EnumValueDescriptorProto;
-class ServiceDescriptorProto;
-class MethodDescriptorProto;
-class FileDescriptorProto;
-class MessageOptions;
-class FieldOptions;
-class OneofOptions;
-class EnumOptions;
-class EnumValueOptions;
-class ExtensionRangeOptions;
-class ServiceOptions;
-class MethodOptions;
-class FileOptions;
-class UninterpretedOption;
-class SourceCodeInfo;
-
-// Defined in message.h
-class Message;
-class Reflection;
-
-// Defined in descriptor.cc
-class DescriptorBuilder;
-class FileDescriptorTables;
-class Symbol;
-
-// Defined in unknown_field_set.h.
-class UnknownField;
-
-// Defined in command_line_interface.cc
-namespace compiler {
-class CommandLineInterface;
-namespace cpp {
-// Defined in helpers.h
-class Formatter;
-}  // namespace cpp
-}  // namespace compiler
-
-namespace descriptor_unittest {
-class DescriptorTest;
-}  // namespace descriptor_unittest
-
-// Defined in printer.h
-namespace io {
-class Printer;
-}  // namespace io
-
-// NB, all indices are zero-based.
-struct SourceLocation {
-  int start_line;
-  int end_line;
-  int start_column;
-  int end_column;
-
-  // Doc comments found at the source location.
-  // See the comments in SourceCodeInfo.Location (descriptor.proto) for details.
-  std::string leading_comments;
-  std::string trailing_comments;
-  std::vector<std::string> leading_detached_comments;
-};
-
-// Options when generating machine-parsable output from a descriptor with
-// DebugString().
-struct DebugStringOptions {
-  // include original user comments as recorded in SourceLocation entries. N.B.
-  // that this must be |false| by default: several other pieces of code (for
-  // example, the C++ code generation for fields in the proto compiler) rely on
-  // DebugString() output being unobstructed by user comments.
-  bool include_comments;
-  // If true, elide the braced body in the debug string.
-  bool elide_group_body;
-  bool elide_oneof_body;
-
-  DebugStringOptions()
-      : include_comments(false),
-        elide_group_body(false),
-        elide_oneof_body(false) {
-  }
-};
-
-// A class to handle the simplest cases of a lazily linked descriptor
-// for a message type that isn't built at the time of cross linking,
-// which is needed when a pool has lazily_build_dependencies_ set.
-// Must be instantiated as mutable in a descriptor.
-namespace internal {
-
-// The classes in this file represent a significant memory footprint for the
-// library. We make sure we are not accidentally making them larger by
-// hardcoding the struct size for a specific platform. Use as:
-//
-//   PROTOBUF_INTERNAL_CHECK_CLASS_SIZE(type, expected_size_in_x84-64);
-//
-
-#if !defined(PROTOBUF_INTERNAL_CHECK_CLASS_SIZE)
-#define PROTOBUF_INTERNAL_CHECK_CLASS_SIZE(t, expected)
-#endif
-
-class FlatAllocator;
-
-class PROTOBUF_EXPORT LazyDescriptor {
- public:
-  // Init function to be called at init time of a descriptor containing
-  // a LazyDescriptor.
-  void Init() {
-    descriptor_ = nullptr;
-    once_ = nullptr;
-  }
-
-  // Sets the value of the descriptor if it is known during the descriptor
-  // building process. Not thread safe, should only be called during the
-  // descriptor build process. Should not be called after SetLazy has been
-  // called.
-  void Set(const Descriptor* descriptor);
-
-  // Sets the information needed to lazily cross link the descriptor at a later
-  // time, SetLazy is not thread safe, should be called only once at descriptor
-  // build time if the symbol wasn't found and building of the file containing
-  // that type is delayed because lazily_build_dependencies_ is set on the pool.
-  // Should not be called after Set() has been called.
-  void SetLazy(StringPiece name, const FileDescriptor* file);
-
-  // Returns the current value of the descriptor, thread-safe. If SetLazy(...)
-  // has been called, will do a one-time cross link of the type specified,
-  // building the descriptor file that contains the type if necessary.
-  inline const Descriptor* Get(const ServiceDescriptor* service) {
-    Once(service);
-    return descriptor_;
-  }
-
- private:
-  void Once(const ServiceDescriptor* service);
-
-  const Descriptor* descriptor_;
-  // The once_ flag is followed by a NUL terminated string for the type name.
-  internal::once_flag* once_;
-};
-
-class PROTOBUF_EXPORT SymbolBase {
- private:
-  friend class google::protobuf::Symbol;
-  uint8_t symbol_type_;
-};
-
-// Some types have more than one SymbolBase because they have multiple
-// identities in the table. We can't have duplicate direct bases, so we use this
-// intermediate base to do so.
-// See BuildEnumValue for details.
-template <int N>
-class PROTOBUF_EXPORT SymbolBaseN : public SymbolBase {};
-
-}  // namespace internal
-
-// Describes a type of protocol message, or a particular group within a
-// message.  To obtain the Descriptor for a given message object, call
-// Message::GetDescriptor().  Generated message classes also have a
-// static method called descriptor() which returns the type's descriptor.
-// Use DescriptorPool to construct your own descriptors.
-class PROTOBUF_EXPORT Descriptor : private internal::SymbolBase {
- public:
-  typedef DescriptorProto Proto;
-
-  // The name of the message type, not including its scope.
-  const std::string& name() const;
-
-  // The fully-qualified name of the message type, scope delimited by
-  // periods.  For example, message type "Foo" which is declared in package
-  // "bar" has full name "bar.Foo".  If a type "Baz" is nested within
-  // Foo, Baz's full_name is "bar.Foo.Baz".  To get only the part that
-  // comes after the last '.', use name().
-  const std::string& full_name() const;
-
-  // Index of this descriptor within the file or containing type's message
-  // type array.
-  int index() const;
-
-  // The .proto file in which this message type was defined.  Never nullptr.
-  const FileDescriptor* file() const;
-
-  // If this Descriptor describes a nested type, this returns the type
-  // in which it is nested.  Otherwise, returns nullptr.
-  const Descriptor* containing_type() const;
-
-  // Get options for this message type.  These are specified in the .proto file
-  // by placing lines like "option foo = 1234;" in the message definition.
-  // Allowed options are defined by MessageOptions in descriptor.proto, and any
-  // available extensions of that message.
-  const MessageOptions& options() const;
-
-  // Write the contents of this Descriptor into the given DescriptorProto.
-  // The target DescriptorProto must be clear before calling this; if it
-  // isn't, the result may be garbage.
-  void CopyTo(DescriptorProto* proto) const;
-
-  // Write the contents of this descriptor in a human-readable form. Output
-  // will be suitable for re-parsing.
-  std::string DebugString() const;
-
-  // Similar to DebugString(), but additionally takes options (e.g.,
-  // include original user comments in output).
-  std::string DebugStringWithOptions(const DebugStringOptions& options) const;
-
-  // Returns true if this is a placeholder for an unknown type. This will
-  // only be the case if this descriptor comes from a DescriptorPool
-  // with AllowUnknownDependencies() set.
-  bool is_placeholder() const;
-
-  enum WellKnownType {
-    WELLKNOWNTYPE_UNSPECIFIED,  // Not a well-known type.
-
-    // Wrapper types.
-    WELLKNOWNTYPE_DOUBLEVALUE,  // google.protobuf.DoubleValue
-    WELLKNOWNTYPE_FLOATVALUE,   // google.protobuf.FloatValue
-    WELLKNOWNTYPE_INT64VALUE,   // google.protobuf.Int64Value
-    WELLKNOWNTYPE_UINT64VALUE,  // google.protobuf.UInt64Value
-    WELLKNOWNTYPE_INT32VALUE,   // google.protobuf.Int32Value
-    WELLKNOWNTYPE_UINT32VALUE,  // google.protobuf.UInt32Value
-    WELLKNOWNTYPE_STRINGVALUE,  // google.protobuf.StringValue
-    WELLKNOWNTYPE_BYTESVALUE,   // google.protobuf.BytesValue
-    WELLKNOWNTYPE_BOOLVALUE,    // google.protobuf.BoolValue
-
-    // Other well known types.
-    WELLKNOWNTYPE_ANY,        // google.protobuf.Any
-    WELLKNOWNTYPE_FIELDMASK,  // google.protobuf.FieldMask
-    WELLKNOWNTYPE_DURATION,   // google.protobuf.Duration
-    WELLKNOWNTYPE_TIMESTAMP,  // google.protobuf.Timestamp
-    WELLKNOWNTYPE_VALUE,      // google.protobuf.Value
-    WELLKNOWNTYPE_LISTVALUE,  // google.protobuf.ListValue
-    WELLKNOWNTYPE_STRUCT,     // google.protobuf.Struct
-
-    // New well-known types may be added in the future.
-    // Please make sure any switch() statements have a 'default' case.
-    __WELLKNOWNTYPE__DO_NOT_USE__ADD_DEFAULT_INSTEAD__,
-  };
-
-  WellKnownType well_known_type() const;
-
-  // Field stuff -----------------------------------------------------
-
-  // The number of fields in this message type.
-  int field_count() const;
-  // Gets a field by index, where 0 <= index < field_count().
-  // These are returned in the order they were defined in the .proto file.
-  const FieldDescriptor* field(int index) const;
-
-  // Looks up a field by declared tag number.  Returns nullptr if no such field
-  // exists.
-  const FieldDescriptor* FindFieldByNumber(int number) const;
-  // Looks up a field by name.  Returns nullptr if no such field exists.
-  const FieldDescriptor* FindFieldByName(ConstStringParam name) const;
-
-  // Looks up a field by lowercased name (as returned by lowercase_name()).
-  // This lookup may be ambiguous if multiple field names differ only by case,
-  // in which case the field returned is chosen arbitrarily from the matches.
-  const FieldDescriptor* FindFieldByLowercaseName(
-      ConstStringParam lowercase_name) const;
-
-  // Looks up a field by camel-case name (as returned by camelcase_name()).
-  // This lookup may be ambiguous if multiple field names differ in a way that
-  // leads them to have identical camel-case names, in which case the field
-  // returned is chosen arbitrarily from the matches.
-  const FieldDescriptor* FindFieldByCamelcaseName(
-      ConstStringParam camelcase_name) const;
-
-  // The number of oneofs in this message type.
-  int oneof_decl_count() const;
-  // The number of oneofs in this message type, excluding synthetic oneofs.
-  // Real oneofs always come first, so iterating up to real_oneof_decl_cout()
-  // will yield all real oneofs.
-  int real_oneof_decl_count() const;
-  // Get a oneof by index, where 0 <= index < oneof_decl_count().
-  // These are returned in the order they were defined in the .proto file.
-  const OneofDescriptor* oneof_decl(int index) const;
-
-  // Looks up a oneof by name.  Returns nullptr if no such oneof exists.
-  const OneofDescriptor* FindOneofByName(ConstStringParam name) const;
-
-  // Nested type stuff -----------------------------------------------
-
-  // The number of nested types in this message type.
-  int nested_type_count() const;
-  // Gets a nested type by index, where 0 <= index < nested_type_count().
-  // These are returned in the order they were defined in the .proto file.
-  const Descriptor* nested_type(int index) const;
-
-  // Looks up a nested type by name.  Returns nullptr if no such nested type
-  // exists.
-  const Descriptor* FindNestedTypeByName(ConstStringParam name) const;
-
-  // Enum stuff ------------------------------------------------------
-
-  // The number of enum types in this message type.
-  int enum_type_count() const;
-  // Gets an enum type by index, where 0 <= index < enum_type_count().
-  // These are returned in the order they were defined in the .proto file.
-  const EnumDescriptor* enum_type(int index) const;
-
-  // Looks up an enum type by name.  Returns nullptr if no such enum type
-  // exists.
-  const EnumDescriptor* FindEnumTypeByName(ConstStringParam name) const;
-
-  // Looks up an enum value by name, among all enum types in this message.
-  // Returns nullptr if no such value exists.
-  const EnumValueDescriptor* FindEnumValueByName(ConstStringParam name) const;
-
-  // Extensions ------------------------------------------------------
-
-  // A range of field numbers which are designated for third-party
-  // extensions.
-  struct ExtensionRange {
-    typedef DescriptorProto_ExtensionRange Proto;
-
-    typedef ExtensionRangeOptions OptionsType;
-
-    // See Descriptor::CopyTo().
-    void CopyTo(DescriptorProto_ExtensionRange* proto) const;
-
-    int start;  // inclusive
-    int end;    // exclusive
-
-    const ExtensionRangeOptions* options_;
-  };
-
-  // The number of extension ranges in this message type.
-  int extension_range_count() const;
-  // Gets an extension range by index, where 0 <= index <
-  // extension_range_count(). These are returned in the order they were defined
-  // in the .proto file.
-  const ExtensionRange* extension_range(int index) const;
-
-  // Returns true if the number is in one of the extension ranges.
-  bool IsExtensionNumber(int number) const;
-
-  // Returns nullptr if no extension range contains the given number.
-  const ExtensionRange* FindExtensionRangeContainingNumber(int number) const;
-
-  // The number of extensions defined nested within this message type's scope.
-  // See doc:
-  // https://developers.google.com/protocol-buffers/docs/proto#nested-extensions
-  //
-  // Note that the extensions may be extending *other* messages.
-  //
-  // For example:
-  // message M1 {
-  //   extensions 1 to max;
-  // }
-  //
-  // message M2 {
-  //   extend M1 {
-  //     optional int32 foo = 1;
-  //   }
-  // }
-  //
-  // In this case,
-  // DescriptorPool::generated_pool()
-  //     ->FindMessageTypeByName("M2")
-  //     ->extension(0)
-  // will return "foo", even though "foo" is an extension of M1.
-  // To find all known extensions of a given message, instead use
-  // DescriptorPool::FindAllExtensions.
-  int extension_count() const;
-  // Get an extension by index, where 0 <= index < extension_count().
-  // These are returned in the order they were defined in the .proto file.
-  const FieldDescriptor* extension(int index) const;
-
-  // Looks up a named extension (which extends some *other* message type)
-  // defined within this message type's scope.
-  const FieldDescriptor* FindExtensionByName(ConstStringParam name) const;
-
-  // Similar to FindFieldByLowercaseName(), but finds extensions defined within
-  // this message type's scope.
-  const FieldDescriptor* FindExtensionByLowercaseName(
-      ConstStringParam name) const;
-
-  // Similar to FindFieldByCamelcaseName(), but finds extensions defined within
-  // this message type's scope.
-  const FieldDescriptor* FindExtensionByCamelcaseName(
-      ConstStringParam name) const;
-
-  // Reserved fields -------------------------------------------------
-
-  // A range of reserved field numbers.
-  struct ReservedRange {
-    int start;  // inclusive
-    int end;    // exclusive
-  };
-
-  // The number of reserved ranges in this message type.
-  int reserved_range_count() const;
-  // Gets an reserved range by index, where 0 <= index <
-  // reserved_range_count(). These are returned in the order they were defined
-  // in the .proto file.
-  const ReservedRange* reserved_range(int index) const;
-
-  // Returns true if the number is in one of the reserved ranges.
-  bool IsReservedNumber(int number) const;
-
-  // Returns nullptr if no reserved range contains the given number.
-  const ReservedRange* FindReservedRangeContainingNumber(int number) const;
-
-  // The number of reserved field names in this message type.
-  int reserved_name_count() const;
-
-  // Gets a reserved name by index, where 0 <= index < reserved_name_count().
-  const std::string& reserved_name(int index) const;
-
-  // Returns true if the field name is reserved.
-  bool IsReservedName(ConstStringParam name) const;
-
-  // Source Location ---------------------------------------------------
-
-  // Updates |*out_location| to the source location of the complete
-  // extent of this message declaration.  Returns false and leaves
-  // |*out_location| unchanged iff location information was not available.
-  bool GetSourceLocation(SourceLocation* out_location) const;
-
-  // Maps --------------------------------------------------------------
-
-  // Returns the FieldDescriptor for the "key" field. If this isn't a map entry
-  // field, returns nullptr.
-  const FieldDescriptor* map_key() const;
-
-  // Returns the FieldDescriptor for the "value" field. If this isn't a map
-  // entry field, returns nullptr.
-  const FieldDescriptor* map_value() const;
-
- private:
-  friend class Symbol;
-  typedef MessageOptions OptionsType;
-
-  // Allows tests to test CopyTo(proto, true).
-  friend class descriptor_unittest::DescriptorTest;
-
-  // Allows access to GetLocationPath for annotations.
-  friend class io::Printer;
-  friend class compiler::cpp::Formatter;
-
-  // Fill the json_name field of FieldDescriptorProto.
-  void CopyJsonNameTo(DescriptorProto* proto) const;
-
-  // Internal version of DebugString; controls the level of indenting for
-  // correct depth. Takes |options| to control debug-string options, and
-  // |include_opening_clause| to indicate whether the "message ... " part of the
-  // clause has already been generated (this varies depending on context).
-  void DebugString(int depth, std::string* contents,
-                   const DebugStringOptions& options,
-                   bool include_opening_clause) const;
-
-  // Walks up the descriptor tree to generate the source location path
-  // to this descriptor from the file root.
-  void GetLocationPath(std::vector<int>* output) const;
-
-  // True if this is a placeholder for an unknown type.
-  bool is_placeholder_ : 1;
-  // True if this is a placeholder and the type name wasn't fully-qualified.
-  bool is_unqualified_placeholder_ : 1;
-  // Well known type.  Stored like this to conserve space.
-  uint8_t well_known_type_ : 5;
-
-  // This points to the last field _number_ that is part of the sequence
-  // starting at 1, where
-  //     `desc->field(i)->number() == i + 1`
-  // A value of `0` means no field matches. That is, there are no fields or the
-  // first field is not field `1`.
-  // Uses 16-bit to avoid extra padding. Unlikely to have more than 2^16
-  // sequentially numbered fields in a message.
-  uint16_t sequential_field_limit_;
-
-  int field_count_;
-
-  // all_names_ = [name, full_name]
-  const std::string* all_names_;
-  const FileDescriptor* file_;
-  const Descriptor* containing_type_;
-  const MessageOptions* options_;
-
-  // These arrays are separated from their sizes to minimize padding on 64-bit.
-  FieldDescriptor* fields_;
-  OneofDescriptor* oneof_decls_;
-  Descriptor* nested_types_;
-  EnumDescriptor* enum_types_;
-  ExtensionRange* extension_ranges_;
-  FieldDescriptor* extensions_;
-  ReservedRange* reserved_ranges_;
-  const std::string** reserved_names_;
-
-  int oneof_decl_count_;
-  int real_oneof_decl_count_;
-  int nested_type_count_;
-  int enum_type_count_;
-  int extension_range_count_;
-  int extension_count_;
-  int reserved_range_count_;
-  int reserved_name_count_;
-
-  // IMPORTANT:  If you add a new field, make sure to search for all instances
-  // of Allocate<Descriptor>() and AllocateArray<Descriptor>() in descriptor.cc
-  // and update them to initialize the field.
-
-  // Must be constructed using DescriptorPool.
-  Descriptor() {}
-  friend class DescriptorBuilder;
-  friend class DescriptorPool;
-  friend class EnumDescriptor;
-  friend class FieldDescriptor;
-  friend class FileDescriptorTables;
-  friend class OneofDescriptor;
-  friend class MethodDescriptor;
-  friend class FileDescriptor;
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(Descriptor);
-};
-
-PROTOBUF_INTERNAL_CHECK_CLASS_SIZE(Descriptor, 136);
-
-// Describes a single field of a message.  To get the descriptor for a given
-// field, first get the Descriptor for the message in which it is defined,
-// then call Descriptor::FindFieldByName().  To get a FieldDescriptor for
-// an extension, do one of the following:
-// - Get the Descriptor or FileDescriptor for its containing scope, then
-//   call Descriptor::FindExtensionByName() or
-//   FileDescriptor::FindExtensionByName().
-// - Given a DescriptorPool, call DescriptorPool::FindExtensionByNumber() or
-//   DescriptorPool::FindExtensionByPrintableName().
-// Use DescriptorPool to construct your own descriptors.
-class PROTOBUF_EXPORT FieldDescriptor : private internal::SymbolBase {
- public:
-  typedef FieldDescriptorProto Proto;
-
-  // Identifies a field type.  0 is reserved for errors.  The order is weird
-  // for historical reasons.  Types 12 and up are new in proto2.
-  enum Type {
-    TYPE_DOUBLE = 1,    // double, exactly eight bytes on the wire.
-    TYPE_FLOAT = 2,     // float, exactly four bytes on the wire.
-    TYPE_INT64 = 3,     // int64, varint on the wire.  Negative numbers
-                        // take 10 bytes.  Use TYPE_SINT64 if negative
-                        // values are likely.
-    TYPE_UINT64 = 4,    // uint64, varint on the wire.
-    TYPE_INT32 = 5,     // int32, varint on the wire.  Negative numbers
-                        // take 10 bytes.  Use TYPE_SINT32 if negative
-                        // values are likely.
-    TYPE_FIXED64 = 6,   // uint64, exactly eight bytes on the wire.
-    TYPE_FIXED32 = 7,   // uint32, exactly four bytes on the wire.
-    TYPE_BOOL = 8,      // bool, varint on the wire.
-    TYPE_STRING = 9,    // UTF-8 text.
-    TYPE_GROUP = 10,    // Tag-delimited message.  Deprecated.
-    TYPE_MESSAGE = 11,  // Length-delimited message.
-
-    TYPE_BYTES = 12,     // Arbitrary byte array.
-    TYPE_UINT32 = 13,    // uint32, varint on the wire
-    TYPE_ENUM = 14,      // Enum, varint on the wire
-    TYPE_SFIXED32 = 15,  // int32, exactly four bytes on the wire
-    TYPE_SFIXED64 = 16,  // int64, exactly eight bytes on the wire
-    TYPE_SINT32 = 17,    // int32, ZigZag-encoded varint on the wire
-    TYPE_SINT64 = 18,    // int64, ZigZag-encoded varint on the wire
-
-    MAX_TYPE = 18,  // Constant useful for defining lookup tables
-                    // indexed by Type.
-  };
-
-  // Specifies the C++ data type used to represent the field.  There is a
-  // fixed mapping from Type to CppType where each Type maps to exactly one
-  // CppType.  0 is reserved for errors.
-  enum CppType {
-    CPPTYPE_INT32 = 1,     // TYPE_INT32, TYPE_SINT32, TYPE_SFIXED32
-    CPPTYPE_INT64 = 2,     // TYPE_INT64, TYPE_SINT64, TYPE_SFIXED64
-    CPPTYPE_UINT32 = 3,    // TYPE_UINT32, TYPE_FIXED32
-    CPPTYPE_UINT64 = 4,    // TYPE_UINT64, TYPE_FIXED64
-    CPPTYPE_DOUBLE = 5,    // TYPE_DOUBLE
-    CPPTYPE_FLOAT = 6,     // TYPE_FLOAT
-    CPPTYPE_BOOL = 7,      // TYPE_BOOL
-    CPPTYPE_ENUM = 8,      // TYPE_ENUM
-    CPPTYPE_STRING = 9,    // TYPE_STRING, TYPE_BYTES
-    CPPTYPE_MESSAGE = 10,  // TYPE_MESSAGE, TYPE_GROUP
-
-    MAX_CPPTYPE = 10,  // Constant useful for defining lookup tables
-                       // indexed by CppType.
-  };
-
-  // Identifies whether the field is optional, required, or repeated.  0 is
-  // reserved for errors.
-  enum Label {
-    LABEL_OPTIONAL = 1,  // optional
-    LABEL_REQUIRED = 2,  // required
-    LABEL_REPEATED = 3,  // repeated
-
-    MAX_LABEL = 3,  // Constant useful for defining lookup tables
-                    // indexed by Label.
-  };
-
-  // Valid field numbers are positive integers up to kMaxNumber.
-  static const int kMaxNumber = (1 << 29) - 1;
-
-  // First field number reserved for the protocol buffer library implementation.
-  // Users may not declare fields that use reserved numbers.
-  static const int kFirstReservedNumber = 19000;
-  // Last field number reserved for the protocol buffer library implementation.
-  // Users may not declare fields that use reserved numbers.
-  static const int kLastReservedNumber = 19999;
-
-  const std::string& name() const;  // Name of this field within the message.
-  const std::string& full_name() const;  // Fully-qualified name of the field.
-  const std::string& json_name() const;  // JSON name of this field.
-  const FileDescriptor* file() const;  // File in which this field was defined.
-  bool is_extension() const;           // Is this an extension field?
-  int number() const;                  // Declared tag number.
-
-  // Same as name() except converted to lower-case.  This (and especially the
-  // FindFieldByLowercaseName() method) can be useful when parsing formats
-  // which prefer to use lowercase naming style.  (Although, technically
-  // field names should be lowercased anyway according to the protobuf style
-  // guide, so this only makes a difference when dealing with old .proto files
-  // which do not follow the guide.)
-  const std::string& lowercase_name() const;
-
-  // Same as name() except converted to camel-case.  In this conversion, any
-  // time an underscore appears in the name, it is removed and the next
-  // letter is capitalized.  Furthermore, the first letter of the name is
-  // lower-cased.  Examples:
-  //   FooBar -> fooBar
-  //   foo_bar -> fooBar
-  //   fooBar -> fooBar
-  // This (and especially the FindFieldByCamelcaseName() method) can be useful
-  // when parsing formats which prefer to use camel-case naming style.
-  const std::string& camelcase_name() const;
-
-  Type type() const;                  // Declared type of this field.
-  const char* type_name() const;      // Name of the declared type.
-  CppType cpp_type() const;           // C++ type of this field.
-  const char* cpp_type_name() const;  // Name of the C++ type.
-  Label label() const;                // optional/required/repeated
-
-  bool is_required() const;  // shorthand for label() == LABEL_REQUIRED
-  bool is_optional() const;  // shorthand for label() == LABEL_OPTIONAL
-  bool is_repeated() const;  // shorthand for label() == LABEL_REPEATED
-  bool is_packable() const;  // shorthand for is_repeated() &&
-                             //               IsTypePackable(type())
-  bool is_packed() const;    // shorthand for is_packable() &&
-                             //               options().packed()
-  bool is_map() const;       // shorthand for type() == TYPE_MESSAGE &&
-                             // message_type()->options().map_entry()
-
-  // Returns true if this field was syntactically written with "optional" in the
-  // .proto file. Excludes singular proto3 fields that do not have a label.
-  bool has_optional_keyword() const;
-
-  // Returns true if this field tracks presence, ie. does the field
-  // distinguish between "unset" and "present with default value."
-  // This includes required, optional, and oneof fields. It excludes maps,
-  // repeated fields, and singular proto3 fields without "optional".
-  //
-  // For fields where has_presence() == true, the return value of
-  // Reflection::HasField() is semantically meaningful.
-  bool has_presence() const;
-
-  // Index of this field within the message's field array, or the file or
-  // extension scope's extensions array.
-  int index() const;
-
-  // Does this field have an explicitly-declared default value?
-  bool has_default_value() const;
-
-  // Whether the user has specified the json_name field option in the .proto
-  // file.
-  bool has_json_name() const;
-
-  // Get the field default value if cpp_type() == CPPTYPE_INT32.  If no
-  // explicit default was defined, the default is 0.
-  int32_t default_value_int32_t() const;
-  int32_t default_value_int32() const { return default_value_int32_t(); }
-  // Get the field default value if cpp_type() == CPPTYPE_INT64.  If no
-  // explicit default was defined, the default is 0.
-  int64_t default_value_int64_t() const;
-  int64_t default_value_int64() const { return default_value_int64_t(); }
-  // Get the field default value if cpp_type() == CPPTYPE_UINT32.  If no
-  // explicit default was defined, the default is 0.
-  uint32_t default_value_uint32_t() const;
-  uint32_t default_value_uint32() const { return default_value_uint32_t(); }
-  // Get the field default value if cpp_type() == CPPTYPE_UINT64.  If no
-  // explicit default was defined, the default is 0.
-  uint64_t default_value_uint64_t() const;
-  uint64_t default_value_uint64() const { return default_value_uint64_t(); }
-  // Get the field default value if cpp_type() == CPPTYPE_FLOAT.  If no
-  // explicit default was defined, the default is 0.0.
-  float default_value_float() const;
-  // Get the field default value if cpp_type() == CPPTYPE_DOUBLE.  If no
-  // explicit default was defined, the default is 0.0.
-  double default_value_double() const;
-  // Get the field default value if cpp_type() == CPPTYPE_BOOL.  If no
-  // explicit default was defined, the default is false.
-  bool default_value_bool() const;
-  // Get the field default value if cpp_type() == CPPTYPE_ENUM.  If no
-  // explicit default was defined, the default is the first value defined
-  // in the enum type (all enum types are required to have at least one value).
-  // This never returns nullptr.
-  const EnumValueDescriptor* default_value_enum() const;
-  // Get the field default value if cpp_type() == CPPTYPE_STRING.  If no
-  // explicit default was defined, the default is the empty string.
-  const std::string& default_value_string() const;
-
-  // The Descriptor for the message of which this is a field.  For extensions,
-  // this is the extended type.  Never nullptr.
-  const Descriptor* containing_type() const;
-
-  // If the field is a member of a oneof, this is the one, otherwise this is
-  // nullptr.
-  const OneofDescriptor* containing_oneof() const;
-
-  // If the field is a member of a non-synthetic oneof, returns the descriptor
-  // for the oneof, otherwise returns nullptr.
-  const OneofDescriptor* real_containing_oneof() const;
-
-  // If the field is a member of a oneof, returns the index in that oneof.
-  int index_in_oneof() const;
-
-  // An extension may be declared within the scope of another message.  If this
-  // field is an extension (is_extension() is true), then extension_scope()
-  // returns that message, or nullptr if the extension was declared at global
-  // scope.  If this is not an extension, extension_scope() is undefined (may
-  // assert-fail).
-  const Descriptor* extension_scope() const;
-
-  // If type is TYPE_MESSAGE or TYPE_GROUP, returns a descriptor for the
-  // message or the group type.  Otherwise, returns null.
-  const Descriptor* message_type() const;
-  // If type is TYPE_ENUM, returns a descriptor for the enum.  Otherwise,
-  // returns null.
-  const EnumDescriptor* enum_type() const;
-
-  // Get the FieldOptions for this field.  This includes things listed in
-  // square brackets after the field definition.  E.g., the field:
-  //   optional string text = 1 [ctype=CORD];
-  // has the "ctype" option set.  Allowed options are defined by FieldOptions in
-  // descriptor.proto, and any available extensions of that message.
-  const FieldOptions& options() const;
-
-  // See Descriptor::CopyTo().
-  void CopyTo(FieldDescriptorProto* proto) const;
-
-  // See Descriptor::DebugString().
-  std::string DebugString() const;
-
-  // See Descriptor::DebugStringWithOptions().
-  std::string DebugStringWithOptions(const DebugStringOptions& options) const;
-
-  // Helper method to get the CppType for a particular Type.
-  static CppType TypeToCppType(Type type);
-
-  // Helper method to get the name of a Type.
-  static const char* TypeName(Type type);
-
-  // Helper method to get the name of a CppType.
-  static const char* CppTypeName(CppType cpp_type);
-
-  // Return true iff [packed = true] is valid for fields of this type.
-  static inline bool IsTypePackable(Type field_type);
-
-  // Returns full_name() except if the field is a MessageSet extension,
-  // in which case it returns the full_name() of the containing message type
-  // for backwards compatibility with proto1.
-  //
-  // A MessageSet extension is defined as an optional message extension
-  // whose containing type has the message_set_wire_format option set.
-  // This should be true of extensions of google.protobuf.bridge.MessageSet;
-  // by convention, such extensions are named "message_set_extension".
-  //
-  // The opposite operation (looking up an extension's FieldDescriptor given
-  // its printable name) can be accomplished with
-  //     message->file()->pool()->FindExtensionByPrintableName(message, name)
-  // where the extension extends "message".
-  const std::string& PrintableNameForExtension() const;
-
-  // Source Location ---------------------------------------------------
-
-  // Updates |*out_location| to the source location of the complete
-  // extent of this field declaration.  Returns false and leaves
-  // |*out_location| unchanged iff location information was not available.
-  bool GetSourceLocation(SourceLocation* out_location) const;
-
- private:
-  friend class Symbol;
-  typedef FieldOptions OptionsType;
-
-  // Allows access to GetLocationPath for annotations.
-  friend class io::Printer;
-  friend class compiler::cpp::Formatter;
-  friend class Reflection;
-
-  // Fill the json_name field of FieldDescriptorProto.
-  void CopyJsonNameTo(FieldDescriptorProto* proto) const;
-
-  // See Descriptor::DebugString().
-  void DebugString(int depth, std::string* contents,
-                   const DebugStringOptions& options) const;
-
-  // formats the default value appropriately and returns it as a string.
-  // Must have a default value to call this. If quote_string_type is true, then
-  // types of CPPTYPE_STRING will be surrounded by quotes and CEscaped.
-  std::string DefaultValueAsString(bool quote_string_type) const;
-
-  // Helper function that returns the field type name for DebugString.
-  std::string FieldTypeNameDebugString() const;
-
-  // Walks up the descriptor tree to generate the source location path
-  // to this descriptor from the file root.
-  void GetLocationPath(std::vector<int>* output) const;
-
-  // Returns true if this is a map message type.
-  bool is_map_message_type() const;
-
-  bool has_default_value_ : 1;
-  bool proto3_optional_ : 1;
-  // Whether the user has specified the json_name field option in the .proto
-  // file.
-  bool has_json_name_ : 1;
-  bool is_extension_ : 1;
-  bool is_oneof_ : 1;
-
-  // Actually a `Label` but stored as uint8_t to save space.
-  uint8_t label_ : 2;
-
-  // Actually a `Type`, but stored as uint8_t to save space.
-  mutable uint8_t type_;
-
-  // Logically:
-  //   all_names_ = [name, full_name, lower, camel, json]
-  // However:
-  //   duplicates will be omitted, so lower/camel/json might be in the same
-  //   position.
-  // We store the true offset for each name here, and the bit width must be
-  // large enough to account for the worst case where all names are present.
-  uint8_t lowercase_name_index_ : 2;
-  uint8_t camelcase_name_index_ : 2;
-  uint8_t json_name_index_ : 3;
-  // Sadly, `number_` located here to reduce padding. Unrelated to all_names_
-  // and its indices above.
-  int number_;
-  const std::string* all_names_;
-  const FileDescriptor* file_;
-
-  // The once_flag is followed by a NUL terminated string for the type name and
-  // enum default value (or empty string if no default enum).
-  internal::once_flag* type_once_;
-  static void TypeOnceInit(const FieldDescriptor* to_init);
-  void InternalTypeOnceInit() const;
-  const Descriptor* containing_type_;
-  union {
-    const OneofDescriptor* containing_oneof;
-    const Descriptor* extension_scope;
-  } scope_;
-  union {
-    mutable const Descriptor* message_type;
-    mutable const EnumDescriptor* enum_type;
-  } type_descriptor_;
-  const FieldOptions* options_;
-  // IMPORTANT:  If you add a new field, make sure to search for all instances
-  // of Allocate<FieldDescriptor>() and AllocateArray<FieldDescriptor>() in
-  // descriptor.cc and update them to initialize the field.
-
-  union {
-    int32_t default_value_int32_t_;
-    int64_t default_value_int64_t_;
-    uint32_t default_value_uint32_t_;
-    uint64_t default_value_uint64_t_;
-    float default_value_float_;
-    double default_value_double_;
-    bool default_value_bool_;
-
-    mutable const EnumValueDescriptor* default_value_enum_;
-    const std::string* default_value_string_;
-    mutable std::atomic<const Message*> default_generated_instance_;
-  };
-
-  static const CppType kTypeToCppTypeMap[MAX_TYPE + 1];
-
-  static const char* const kTypeToName[MAX_TYPE + 1];
-
-  static const char* const kCppTypeToName[MAX_CPPTYPE + 1];
-
-  static const char* const kLabelToName[MAX_LABEL + 1];
-
-  // Must be constructed using DescriptorPool.
-  FieldDescriptor() {}
-  friend class DescriptorBuilder;
-  friend class FileDescriptor;
-  friend class Descriptor;
-  friend class OneofDescriptor;
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(FieldDescriptor);
-};
-
-PROTOBUF_INTERNAL_CHECK_CLASS_SIZE(FieldDescriptor, 72);
-
-// Describes a oneof defined in a message type.
-class PROTOBUF_EXPORT OneofDescriptor : private internal::SymbolBase {
- public:
-  typedef OneofDescriptorProto Proto;
-
-  const std::string& name() const;       // Name of this oneof.
-  const std::string& full_name() const;  // Fully-qualified name of the oneof.
-
-  // Index of this oneof within the message's oneof array.
-  int index() const;
-
-  // Returns whether this oneof was inserted by the compiler to wrap a proto3
-  // optional field. If this returns true, code generators should *not* emit it.
-  bool is_synthetic() const;
-
-  // The .proto file in which this oneof was defined.  Never nullptr.
-  const FileDescriptor* file() const;
-  // The Descriptor for the message containing this oneof.
-  const Descriptor* containing_type() const;
-
-  // The number of (non-extension) fields which are members of this oneof.
-  int field_count() const;
-  // Get a member of this oneof, in the order in which they were declared in the
-  // .proto file.  Does not include extensions.
-  const FieldDescriptor* field(int index) const;
-
-  const OneofOptions& options() const;
-
-  // See Descriptor::CopyTo().
-  void CopyTo(OneofDescriptorProto* proto) const;
-
-  // See Descriptor::DebugString().
-  std::string DebugString() const;
-
-  // See Descriptor::DebugStringWithOptions().
-  std::string DebugStringWithOptions(const DebugStringOptions& options) const;
-
-  // Source Location ---------------------------------------------------
-
-  // Updates |*out_location| to the source location of the complete
-  // extent of this oneof declaration.  Returns false and leaves
-  // |*out_location| unchanged iff location information was not available.
-  bool GetSourceLocation(SourceLocation* out_location) const;
-
- private:
-  friend class Symbol;
-  typedef OneofOptions OptionsType;
-
-  // Allows access to GetLocationPath for annotations.
-  friend class io::Printer;
-  friend class compiler::cpp::Formatter;
-
-  // See Descriptor::DebugString().
-  void DebugString(int depth, std::string* contents,
-                   const DebugStringOptions& options) const;
-
-  // Walks up the descriptor tree to generate the source location path
-  // to this descriptor from the file root.
-  void GetLocationPath(std::vector<int>* output) const;
-
-  int field_count_;
-
-  // all_names_ = [name, full_name]
-  const std::string* all_names_;
-  const Descriptor* containing_type_;
-  const OneofOptions* options_;
-  const FieldDescriptor* fields_;
-
-  // IMPORTANT:  If you add a new field, make sure to search for all instances
-  // of Allocate<OneofDescriptor>() and AllocateArray<OneofDescriptor>()
-  // in descriptor.cc and update them to initialize the field.
-
-  // Must be constructed using DescriptorPool.
-  OneofDescriptor() {}
-  friend class DescriptorBuilder;
-  friend class Descriptor;
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(OneofDescriptor);
-};
-
-PROTOBUF_INTERNAL_CHECK_CLASS_SIZE(OneofDescriptor, 40);
-
-// Describes an enum type defined in a .proto file.  To get the EnumDescriptor
-// for a generated enum type, call TypeName_descriptor().  Use DescriptorPool
-// to construct your own descriptors.
-class PROTOBUF_EXPORT EnumDescriptor : private internal::SymbolBase {
- public:
-  typedef EnumDescriptorProto Proto;
-
-  // The name of this enum type in the containing scope.
-  const std::string& name() const;
-
-  // The fully-qualified name of the enum type, scope delimited by periods.
-  const std::string& full_name() const;
-
-  // Index of this enum within the file or containing message's enum array.
-  int index() const;
-
-  // The .proto file in which this enum type was defined.  Never nullptr.
-  const FileDescriptor* file() const;
-
-  // The number of values for this EnumDescriptor.  Guaranteed to be greater
-  // than zero.
-  int value_count() const;
-  // Gets a value by index, where 0 <= index < value_count().
-  // These are returned in the order they were defined in the .proto file.
-  const EnumValueDescriptor* value(int index) const;
-
-  // Looks up a value by name.  Returns nullptr if no such value exists.
-  const EnumValueDescriptor* FindValueByName(ConstStringParam name) const;
-  // Looks up a value by number.  Returns nullptr if no such value exists.  If
-  // multiple values have this number, the first one defined is returned.
-  const EnumValueDescriptor* FindValueByNumber(int number) const;
-
-  // If this enum type is nested in a message type, this is that message type.
-  // Otherwise, nullptr.
-  const Descriptor* containing_type() const;
-
-  // Get options for this enum type.  These are specified in the .proto file by
-  // placing lines like "option foo = 1234;" in the enum definition.  Allowed
-  // options are defined by EnumOptions in descriptor.proto, and any available
-  // extensions of that message.
-  const EnumOptions& options() const;
-
-  // See Descriptor::CopyTo().
-  void CopyTo(EnumDescriptorProto* proto) const;
-
-  // See Descriptor::DebugString().
-  std::string DebugString() const;
-
-  // See Descriptor::DebugStringWithOptions().
-  std::string DebugStringWithOptions(const DebugStringOptions& options) const;
-
-  // Returns true if this is a placeholder for an unknown enum. This will
-  // only be the case if this descriptor comes from a DescriptorPool
-  // with AllowUnknownDependencies() set.
-  bool is_placeholder() const;
-
-  // Reserved fields -------------------------------------------------
-
-  // A range of reserved field numbers.
-  struct ReservedRange {
-    int start;  // inclusive
-    int end;    // inclusive
-  };
-
-  // The number of reserved ranges in this message type.
-  int reserved_range_count() const;
-  // Gets an reserved range by index, where 0 <= index <
-  // reserved_range_count(). These are returned in the order they were defined
-  // in the .proto file.
-  const EnumDescriptor::ReservedRange* reserved_range(int index) const;
-
-  // Returns true if the number is in one of the reserved ranges.
-  bool IsReservedNumber(int number) const;
-
-  // Returns nullptr if no reserved range contains the given number.
-  const EnumDescriptor::ReservedRange* FindReservedRangeContainingNumber(
-      int number) const;
-
-  // The number of reserved field names in this message type.
-  int reserved_name_count() const;
-
-  // Gets a reserved name by index, where 0 <= index < reserved_name_count().
-  const std::string& reserved_name(int index) const;
-
-  // Returns true if the field name is reserved.
-  bool IsReservedName(ConstStringParam name) const;
-
-  // Source Location ---------------------------------------------------
-
-  // Updates |*out_location| to the source location of the complete
-  // extent of this enum declaration.  Returns false and leaves
-  // |*out_location| unchanged iff location information was not available.
-  bool GetSourceLocation(SourceLocation* out_location) const;
-
- private:
-  friend class Symbol;
-  typedef EnumOptions OptionsType;
-
-  // Allows access to GetLocationPath for annotations.
-  friend class io::Printer;
-  friend class compiler::cpp::Formatter;
-
-  // Allow access to FindValueByNumberCreatingIfUnknown.
-  friend class descriptor_unittest::DescriptorTest;
-
-  // Looks up a value by number.  If the value does not exist, dynamically
-  // creates a new EnumValueDescriptor for that value, assuming that it was
-  // unknown. If a new descriptor is created, this is done in a thread-safe way,
-  // and future calls will return the same value descriptor pointer.
-  //
-  // This is private but is used by Reflection (which is friended below) to
-  // return a valid EnumValueDescriptor from GetEnum() when this feature is
-  // enabled.
-  const EnumValueDescriptor* FindValueByNumberCreatingIfUnknown(
-      int number) const;
-
-  // See Descriptor::DebugString().
-  void DebugString(int depth, std::string* contents,
-                   const DebugStringOptions& options) const;
-
-  // Walks up the descriptor tree to generate the source location path
-  // to this descriptor from the file root.
-  void GetLocationPath(std::vector<int>* output) const;
-
-  // True if this is a placeholder for an unknown type.
-  bool is_placeholder_ : 1;
-  // True if this is a placeholder and the type name wasn't fully-qualified.
-  bool is_unqualified_placeholder_ : 1;
-
-  // This points to the last value _index_ that is part of the sequence starting
-  // with the first label, where
-  //   `enum->value(i)->number() == enum->value(0)->number() + i`
-  // We measure relative to the first label to adapt to enum labels starting at
-  // 0 or 1.
-  // Uses 16-bit to avoid extra padding. Unlikely to have more than 2^15
-  // sequentially numbered labels in an enum.
-  int16_t sequential_value_limit_;
-
-  int value_count_;
-
-  // all_names_ = [name, full_name]
-  const std::string* all_names_;
-  const FileDescriptor* file_;
-  const Descriptor* containing_type_;
-  const EnumOptions* options_;
-  EnumValueDescriptor* values_;
-
-  int reserved_range_count_;
-  int reserved_name_count_;
-  EnumDescriptor::ReservedRange* reserved_ranges_;
-  const std::string** reserved_names_;
-
-  // IMPORTANT:  If you add a new field, make sure to search for all instances
-  // of Allocate<EnumDescriptor>() and AllocateArray<EnumDescriptor>() in
-  // descriptor.cc and update them to initialize the field.
-
-  // Must be constructed using DescriptorPool.
-  EnumDescriptor() {}
-  friend class DescriptorBuilder;
-  friend class Descriptor;
-  friend class FieldDescriptor;
-  friend class FileDescriptorTables;
-  friend class EnumValueDescriptor;
-  friend class FileDescriptor;
-  friend class DescriptorPool;
-  friend class Reflection;
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(EnumDescriptor);
-};
-
-PROTOBUF_INTERNAL_CHECK_CLASS_SIZE(EnumDescriptor, 72);
-
-// Describes an individual enum constant of a particular type.  To get the
-// EnumValueDescriptor for a given enum value, first get the EnumDescriptor
-// for its type, then use EnumDescriptor::FindValueByName() or
-// EnumDescriptor::FindValueByNumber().  Use DescriptorPool to construct
-// your own descriptors.
-class PROTOBUF_EXPORT EnumValueDescriptor : private internal::SymbolBaseN<0>,
-                                            private internal::SymbolBaseN<1> {
- public:
-  typedef EnumValueDescriptorProto Proto;
-
-  const std::string& name() const;  // Name of this enum constant.
-  int index() const;                // Index within the enums's Descriptor.
-  int number() const;               // Numeric value of this enum constant.
-
-  // The full_name of an enum value is a sibling symbol of the enum type.
-  // e.g. the full name of FieldDescriptorProto::TYPE_INT32 is actually
-  // "google.protobuf.FieldDescriptorProto.TYPE_INT32", NOT
-  // "google.protobuf.FieldDescriptorProto.Type.TYPE_INT32".  This is to conform
-  // with C++ scoping rules for enums.
-  const std::string& full_name() const;
-
-  // The .proto file in which this value was defined.  Never nullptr.
-  const FileDescriptor* file() const;
-  // The type of this value.  Never nullptr.
-  const EnumDescriptor* type() const;
-
-  // Get options for this enum value.  These are specified in the .proto file by
-  // adding text like "[foo = 1234]" after an enum value definition.  Allowed
-  // options are defined by EnumValueOptions in descriptor.proto, and any
-  // available extensions of that message.
-  const EnumValueOptions& options() const;
-
-  // See Descriptor::CopyTo().
-  void CopyTo(EnumValueDescriptorProto* proto) const;
-
-  // See Descriptor::DebugString().
-  std::string DebugString() const;
-
-  // See Descriptor::DebugStringWithOptions().
-  std::string DebugStringWithOptions(const DebugStringOptions& options) const;
-
-  // Source Location ---------------------------------------------------
-
-  // Updates |*out_location| to the source location of the complete
-  // extent of this enum value declaration.  Returns false and leaves
-  // |*out_location| unchanged iff location information was not available.
-  bool GetSourceLocation(SourceLocation* out_location) const;
-
- private:
-  friend class Symbol;
-  typedef EnumValueOptions OptionsType;
-
-  // Allows access to GetLocationPath for annotations.
-  friend class io::Printer;
-  friend class compiler::cpp::Formatter;
-
-  // See Descriptor::DebugString().
-  void DebugString(int depth, std::string* contents,
-                   const DebugStringOptions& options) const;
-
-  // Walks up the descriptor tree to generate the source location path
-  // to this descriptor from the file root.
-  void GetLocationPath(std::vector<int>* output) const;
-
-  int number_;
-  // all_names_ = [name, full_name]
-  const std::string* all_names_;
-  const EnumDescriptor* type_;
-  const EnumValueOptions* options_;
-  // IMPORTANT:  If you add a new field, make sure to search for all instances
-  // of Allocate<EnumValueDescriptor>() and AllocateArray<EnumValueDescriptor>()
-  // in descriptor.cc and update them to initialize the field.
-
-  // Must be constructed using DescriptorPool.
-  EnumValueDescriptor() {}
-  friend class DescriptorBuilder;
-  friend class EnumDescriptor;
-  friend class DescriptorPool;
-  friend class FileDescriptorTables;
-  friend class Reflection;
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(EnumValueDescriptor);
-};
-
-PROTOBUF_INTERNAL_CHECK_CLASS_SIZE(EnumValueDescriptor, 32);
-
-// Describes an RPC service. Use DescriptorPool to construct your own
-// descriptors.
-class PROTOBUF_EXPORT ServiceDescriptor : private internal::SymbolBase {
- public:
-  typedef ServiceDescriptorProto Proto;
-
-  // The name of the service, not including its containing scope.
-  const std::string& name() const;
-  // The fully-qualified name of the service, scope delimited by periods.
-  const std::string& full_name() const;
-  // Index of this service within the file's services array.
-  int index() const;
-
-  // The .proto file in which this service was defined.  Never nullptr.
-  const FileDescriptor* file() const;
-
-  // Get options for this service type.  These are specified in the .proto file
-  // by placing lines like "option foo = 1234;" in the service definition.
-  // Allowed options are defined by ServiceOptions in descriptor.proto, and any
-  // available extensions of that message.
-  const ServiceOptions& options() const;
-
-  // The number of methods this service defines.
-  int method_count() const;
-  // Gets a MethodDescriptor by index, where 0 <= index < method_count().
-  // These are returned in the order they were defined in the .proto file.
-  const MethodDescriptor* method(int index) const;
-
-  // Look up a MethodDescriptor by name.
-  const MethodDescriptor* FindMethodByName(ConstStringParam name) const;
-
-  // See Descriptor::CopyTo().
-  void CopyTo(ServiceDescriptorProto* proto) const;
-
-  // See Descriptor::DebugString().
-  std::string DebugString() const;
-
-  // See Descriptor::DebugStringWithOptions().
-  std::string DebugStringWithOptions(const DebugStringOptions& options) const;
-
-  // Source Location ---------------------------------------------------
-
-  // Updates |*out_location| to the source location of the complete
-  // extent of this service declaration.  Returns false and leaves
-  // |*out_location| unchanged iff location information was not available.
-  bool GetSourceLocation(SourceLocation* out_location) const;
-
- private:
-  friend class Symbol;
-  typedef ServiceOptions OptionsType;
-
-  // Allows access to GetLocationPath for annotations.
-  friend class io::Printer;
-  friend class compiler::cpp::Formatter;
-
-  // See Descriptor::DebugString().
-  void DebugString(std::string* contents,
-                   const DebugStringOptions& options) const;
-
-  // Walks up the descriptor tree to generate the source location path
-  // to this descriptor from the file root.
-  void GetLocationPath(std::vector<int>* output) const;
-
-  // all_names_ = [name, full_name]
-  const std::string* all_names_;
-  const FileDescriptor* file_;
-  const ServiceOptions* options_;
-  MethodDescriptor* methods_;
-  int method_count_;
-  // IMPORTANT:  If you add a new field, make sure to search for all instances
-  // of Allocate<ServiceDescriptor>() and AllocateArray<ServiceDescriptor>() in
-  // descriptor.cc and update them to initialize the field.
-
-  // Must be constructed using DescriptorPool.
-  ServiceDescriptor() {}
-  friend class DescriptorBuilder;
-  friend class FileDescriptor;
-  friend class MethodDescriptor;
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(ServiceDescriptor);
-};
-
-PROTOBUF_INTERNAL_CHECK_CLASS_SIZE(ServiceDescriptor, 48);
-
-// Describes an individual service method.  To obtain a MethodDescriptor given
-// a service, first get its ServiceDescriptor, then call
-// ServiceDescriptor::FindMethodByName().  Use DescriptorPool to construct your
-// own descriptors.
-class PROTOBUF_EXPORT MethodDescriptor : private internal::SymbolBase {
- public:
-  typedef MethodDescriptorProto Proto;
-
-  // Name of this method, not including containing scope.
-  const std::string& name() const;
-  // The fully-qualified name of the method, scope delimited by periods.
-  const std::string& full_name() const;
-  // Index within the service's Descriptor.
-  int index() const;
-
-  // The .proto file in which this method was defined.  Never nullptr.
-  const FileDescriptor* file() const;
-  // Gets the service to which this method belongs.  Never nullptr.
-  const ServiceDescriptor* service() const;
-
-  // Gets the type of protocol message which this method accepts as input.
-  const Descriptor* input_type() const;
-  // Gets the type of protocol message which this message produces as output.
-  const Descriptor* output_type() const;
-
-  // Gets whether the client streams multiple requests.
-  bool client_streaming() const;
-  // Gets whether the server streams multiple responses.
-  bool server_streaming() const;
-
-  // Get options for this method.  These are specified in the .proto file by
-  // placing lines like "option foo = 1234;" in curly-braces after a method
-  // declaration.  Allowed options are defined by MethodOptions in
-  // descriptor.proto, and any available extensions of that message.
-  const MethodOptions& options() const;
-
-  // See Descriptor::CopyTo().
-  void CopyTo(MethodDescriptorProto* proto) const;
-
-  // See Descriptor::DebugString().
-  std::string DebugString() const;
-
-  // See Descriptor::DebugStringWithOptions().
-  std::string DebugStringWithOptions(const DebugStringOptions& options) const;
-
-  // Source Location ---------------------------------------------------
-
-  // Updates |*out_location| to the source location of the complete
-  // extent of this method declaration.  Returns false and leaves
-  // |*out_location| unchanged iff location information was not available.
-  bool GetSourceLocation(SourceLocation* out_location) const;
-
- private:
-  friend class Symbol;
-  typedef MethodOptions OptionsType;
-
-  // Allows access to GetLocationPath for annotations.
-  friend class io::Printer;
-  friend class compiler::cpp::Formatter;
-
-  // See Descriptor::DebugString().
-  void DebugString(int depth, std::string* contents,
-                   const DebugStringOptions& options) const;
-
-  // Walks up the descriptor tree to generate the source location path
-  // to this descriptor from the file root.
-  void GetLocationPath(std::vector<int>* output) const;
-
-  bool client_streaming_;
-  bool server_streaming_;
-  // all_names_ = [name, full_name]
-  const std::string* all_names_;
-  const ServiceDescriptor* service_;
-  mutable internal::LazyDescriptor input_type_;
-  mutable internal::LazyDescriptor output_type_;
-  const MethodOptions* options_;
-  // IMPORTANT:  If you add a new field, make sure to search for all instances
-  // of Allocate<MethodDescriptor>() and AllocateArray<MethodDescriptor>() in
-  // descriptor.cc and update them to initialize the field.
-
-  // Must be constructed using DescriptorPool.
-  MethodDescriptor() {}
-  friend class DescriptorBuilder;
-  friend class ServiceDescriptor;
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(MethodDescriptor);
-};
-
-PROTOBUF_INTERNAL_CHECK_CLASS_SIZE(MethodDescriptor, 64);
-
-// Describes a whole .proto file.  To get the FileDescriptor for a compiled-in
-// file, get the descriptor for something defined in that file and call
-// descriptor->file().  Use DescriptorPool to construct your own descriptors.
-class PROTOBUF_EXPORT FileDescriptor : private internal::SymbolBase {
- public:
-  typedef FileDescriptorProto Proto;
-
-  // The filename, relative to the source tree.
-  // e.g. "foo/bar/baz.proto"
-  const std::string& name() const;
-
-  // The package, e.g. "google.protobuf.compiler".
-  const std::string& package() const;
-
-  // The DescriptorPool in which this FileDescriptor and all its contents were
-  // allocated.  Never nullptr.
-  const DescriptorPool* pool() const;
-
-  // The number of files imported by this one.
-  int dependency_count() const;
-  // Gets an imported file by index, where 0 <= index < dependency_count().
-  // These are returned in the order they were defined in the .proto file.
-  const FileDescriptor* dependency(int index) const;
-
-  // The number of files public imported by this one.
-  // The public dependency list is a subset of the dependency list.
-  int public_dependency_count() const;
-  // Gets a public imported file by index, where 0 <= index <
-  // public_dependency_count().
-  // These are returned in the order they were defined in the .proto file.
-  const FileDescriptor* public_dependency(int index) const;
-
-  // The number of files that are imported for weak fields.
-  // The weak dependency list is a subset of the dependency list.
-  int weak_dependency_count() const;
-  // Gets a weak imported file by index, where 0 <= index <
-  // weak_dependency_count().
-  // These are returned in the order they were defined in the .proto file.
-  const FileDescriptor* weak_dependency(int index) const;
-
-  // Number of top-level message types defined in this file.  (This does not
-  // include nested types.)
-  int message_type_count() const;
-  // Gets a top-level message type, where 0 <= index < message_type_count().
-  // These are returned in the order they were defined in the .proto file.
-  const Descriptor* message_type(int index) const;
-
-  // Number of top-level enum types defined in this file.  (This does not
-  // include nested types.)
-  int enum_type_count() const;
-  // Gets a top-level enum type, where 0 <= index < enum_type_count().
-  // These are returned in the order they were defined in the .proto file.
-  const EnumDescriptor* enum_type(int index) const;
-
-  // Number of services defined in this file.
-  int service_count() const;
-  // Gets a service, where 0 <= index < service_count().
-  // These are returned in the order they were defined in the .proto file.
-  const ServiceDescriptor* service(int index) const;
-
-  // Number of extensions defined at file scope.  (This does not include
-  // extensions nested within message types.)
-  int extension_count() const;
-  // Gets an extension's descriptor, where 0 <= index < extension_count().
-  // These are returned in the order they were defined in the .proto file.
-  const FieldDescriptor* extension(int index) const;
-
-  // Get options for this file.  These are specified in the .proto file by
-  // placing lines like "option foo = 1234;" at the top level, outside of any
-  // other definitions.  Allowed options are defined by FileOptions in
-  // descriptor.proto, and any available extensions of that message.
-  const FileOptions& options() const;
-
-  // Syntax of this file.
-  enum Syntax {
-    SYNTAX_UNKNOWN = 0,
-    SYNTAX_PROTO2 = 2,
-    SYNTAX_PROTO3 = 3,
-  };
-  Syntax syntax() const;
-  static const char* SyntaxName(Syntax syntax);
-
-  // Find a top-level message type by name (not full_name).  Returns nullptr if
-  // not found.
-  const Descriptor* FindMessageTypeByName(ConstStringParam name) const;
-  // Find a top-level enum type by name.  Returns nullptr if not found.
-  const EnumDescriptor* FindEnumTypeByName(ConstStringParam name) const;
-  // Find an enum value defined in any top-level enum by name.  Returns nullptr
-  // if not found.
-  const EnumValueDescriptor* FindEnumValueByName(ConstStringParam name) const;
-  // Find a service definition by name.  Returns nullptr if not found.
-  const ServiceDescriptor* FindServiceByName(ConstStringParam name) const;
-  // Find a top-level extension definition by name.  Returns nullptr if not
-  // found.
-  const FieldDescriptor* FindExtensionByName(ConstStringParam name) const;
-  // Similar to FindExtensionByName(), but searches by lowercased-name.  See
-  // Descriptor::FindFieldByLowercaseName().
-  const FieldDescriptor* FindExtensionByLowercaseName(
-      ConstStringParam name) const;
-  // Similar to FindExtensionByName(), but searches by camelcased-name.  See
-  // Descriptor::FindFieldByCamelcaseName().
-  const FieldDescriptor* FindExtensionByCamelcaseName(
-      ConstStringParam name) const;
-
-  // See Descriptor::CopyTo().
-  // Notes:
-  // - This method does NOT copy source code information since it is relatively
-  //   large and rarely needed.  See CopySourceCodeInfoTo() below.
-  void CopyTo(FileDescriptorProto* proto) const;
-  // Write the source code information of this FileDescriptor into the given
-  // FileDescriptorProto.  See CopyTo() above.
-  void CopySourceCodeInfoTo(FileDescriptorProto* proto) const;
-  // Fill the json_name field of FieldDescriptorProto for all fields. Can only
-  // be called after CopyTo().
-  void CopyJsonNameTo(FileDescriptorProto* proto) const;
-
-  // See Descriptor::DebugString().
-  std::string DebugString() const;
-
-  // See Descriptor::DebugStringWithOptions().
-  std::string DebugStringWithOptions(const DebugStringOptions& options) const;
-
-  // Returns true if this is a placeholder for an unknown file. This will
-  // only be the case if this descriptor comes from a DescriptorPool
-  // with AllowUnknownDependencies() set.
-  bool is_placeholder() const;
-
-  // Updates |*out_location| to the source location of the complete extent of
-  // this file declaration (namely, the empty path).
-  bool GetSourceLocation(SourceLocation* out_location) const;
-
-  // Updates |*out_location| to the source location of the complete
-  // extent of the declaration or declaration-part denoted by |path|.
-  // Returns false and leaves |*out_location| unchanged iff location
-  // information was not available.  (See SourceCodeInfo for
-  // description of path encoding.)
-  bool GetSourceLocation(const std::vector<int>& path,
-                         SourceLocation* out_location) const;
-
- private:
-  friend class Symbol;
-  typedef FileOptions OptionsType;
-
-  bool is_placeholder_;
-  // Indicates the FileDescriptor is completed building. Used to verify
-  // that type accessor functions that can possibly build a dependent file
-  // aren't called during the process of building the file.
-  bool finished_building_;
-  // Actually a `Syntax` but stored as uint8_t to save space.
-  uint8_t syntax_;
-  // This one is here to fill the padding.
-  int extension_count_;
-
-  const std::string* name_;
-  const std::string* package_;
-  const DescriptorPool* pool_;
-
-  // dependencies_once_ contain a once_flag followed by N NUL terminated
-  // strings. Dependencies that do not need to be loaded will be empty. ie just
-  // {'\0'}
-  internal::once_flag* dependencies_once_;
-  static void DependenciesOnceInit(const FileDescriptor* to_init);
-  void InternalDependenciesOnceInit() const;
-
-  // These are arranged to minimize padding on 64-bit.
-  int dependency_count_;
-  int public_dependency_count_;
-  int weak_dependency_count_;
-  int message_type_count_;
-  int enum_type_count_;
-  int service_count_;
-
-  mutable const FileDescriptor** dependencies_;
-  int* public_dependencies_;
-  int* weak_dependencies_;
-  Descriptor* message_types_;
-  EnumDescriptor* enum_types_;
-  ServiceDescriptor* services_;
-  FieldDescriptor* extensions_;
-  const FileOptions* options_;
-
-  const FileDescriptorTables* tables_;
-  const SourceCodeInfo* source_code_info_;
-
-  // IMPORTANT:  If you add a new field, make sure to search for all instances
-  // of Allocate<FileDescriptor>() and AllocateArray<FileDescriptor>() in
-  // descriptor.cc and update them to initialize the field.
-
-  FileDescriptor() {}
-  friend class DescriptorBuilder;
-  friend class DescriptorPool;
-  friend class Descriptor;
-  friend class FieldDescriptor;
-  friend class internal::LazyDescriptor;
-  friend class OneofDescriptor;
-  friend class EnumDescriptor;
-  friend class EnumValueDescriptor;
-  friend class MethodDescriptor;
-  friend class ServiceDescriptor;
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(FileDescriptor);
-};
-
-PROTOBUF_INTERNAL_CHECK_CLASS_SIZE(FileDescriptor, 144);
-
-// ===================================================================
-
-// Used to construct descriptors.
-//
-// Normally you won't want to build your own descriptors.  Message classes
-// constructed by the protocol compiler will provide them for you.  However,
-// if you are implementing Message on your own, or if you are writing a
-// program which can operate on totally arbitrary types and needs to load
-// them from some sort of database, you might need to.
-//
-// Since Descriptors are composed of a whole lot of cross-linked bits of
-// data that would be a pain to put together manually, the
-// DescriptorPool class is provided to make the process easier.  It can
-// take a FileDescriptorProto (defined in descriptor.proto), validate it,
-// and convert it to a set of nicely cross-linked Descriptors.
-//
-// DescriptorPool also helps with memory management.  Descriptors are
-// composed of many objects containing static data and pointers to each
-// other.  In all likelihood, when it comes time to delete this data,
-// you'll want to delete it all at once.  In fact, it is not uncommon to
-// have a whole pool of descriptors all cross-linked with each other which
-// you wish to delete all at once.  This class represents such a pool, and
-// handles the memory management for you.
-//
-// You can also search for descriptors within a DescriptorPool by name, and
-// extensions by number.
-class PROTOBUF_EXPORT DescriptorPool {
- public:
-  // Create a normal, empty DescriptorPool.
-  DescriptorPool();
-
-  // Constructs a DescriptorPool that, when it can't find something among the
-  // descriptors already in the pool, looks for it in the given
-  // DescriptorDatabase.
-  // Notes:
-  // - If a DescriptorPool is constructed this way, its BuildFile*() methods
-  //   must not be called (they will assert-fail).  The only way to populate
-  //   the pool with descriptors is to call the Find*By*() methods.
-  // - The Find*By*() methods may block the calling thread if the
-  //   DescriptorDatabase blocks.  This in turn means that parsing messages
-  //   may block if they need to look up extensions.
-  // - The Find*By*() methods will use mutexes for thread-safety, thus making
-  //   them slower even when they don't have to fall back to the database.
-  //   In fact, even the Find*By*() methods of descriptor objects owned by
-  //   this pool will be slower, since they will have to obtain locks too.
-  // - An ErrorCollector may optionally be given to collect validation errors
-  //   in files loaded from the database.  If not given, errors will be printed
-  //   to GOOGLE_LOG(ERROR).  Remember that files are built on-demand, so this
-  //   ErrorCollector may be called from any thread that calls one of the
-  //   Find*By*() methods.
-  // - The DescriptorDatabase must not be mutated during the lifetime of
-  //   the DescriptorPool. Even if the client takes care to avoid data races,
-  //   changes to the content of the DescriptorDatabase may not be reflected
-  //   in subsequent lookups in the DescriptorPool.
-  class ErrorCollector;
-  explicit DescriptorPool(DescriptorDatabase* fallback_database,
-                          ErrorCollector* error_collector = nullptr);
-
-  ~DescriptorPool();
-
-  // Get a pointer to the generated pool.  Generated protocol message classes
-  // which are compiled into the binary will allocate their descriptors in
-  // this pool.  Do not add your own descriptors to this pool.
-  static const DescriptorPool* generated_pool();
-
-
-  // Find a FileDescriptor in the pool by file name.  Returns nullptr if not
-  // found.
-  const FileDescriptor* FindFileByName(ConstStringParam name) const;
-
-  // Find the FileDescriptor in the pool which defines the given symbol.
-  // If any of the Find*ByName() methods below would succeed, then this is
-  // equivalent to calling that method and calling the result's file() method.
-  // Otherwise this returns nullptr.
-  const FileDescriptor* FindFileContainingSymbol(
-      ConstStringParam symbol_name) const;
-
-  // Looking up descriptors ------------------------------------------
-  // These find descriptors by fully-qualified name.  These will find both
-  // top-level descriptors and nested descriptors.  They return nullptr if not
-  // found.
-
-  const Descriptor* FindMessageTypeByName(ConstStringParam name) const;
-  const FieldDescriptor* FindFieldByName(ConstStringParam name) const;
-  const FieldDescriptor* FindExtensionByName(ConstStringParam name) const;
-  const OneofDescriptor* FindOneofByName(ConstStringParam name) const;
-  const EnumDescriptor* FindEnumTypeByName(ConstStringParam name) const;
-  const EnumValueDescriptor* FindEnumValueByName(ConstStringParam name) const;
-  const ServiceDescriptor* FindServiceByName(ConstStringParam name) const;
-  const MethodDescriptor* FindMethodByName(ConstStringParam name) const;
-
-  // Finds an extension of the given type by number.  The extendee must be
-  // a member of this DescriptorPool or one of its underlays.
-  const FieldDescriptor* FindExtensionByNumber(const Descriptor* extendee,
-                                               int number) const;
-
-  // Finds an extension of the given type by its printable name.
-  // See comments above PrintableNameForExtension() for the definition of
-  // "printable name".  The extendee must be a member of this DescriptorPool
-  // or one of its underlays.  Returns nullptr if there is no known message
-  // extension with the given printable name.
-  const FieldDescriptor* FindExtensionByPrintableName(
-      const Descriptor* extendee, ConstStringParam printable_name) const;
-
-  // Finds extensions of extendee. The extensions will be appended to
-  // out in an undefined order. Only extensions defined directly in
-  // this DescriptorPool or one of its underlays are guaranteed to be
-  // found: extensions defined in the fallback database might not be found
-  // depending on the database implementation.
-  void FindAllExtensions(const Descriptor* extendee,
-                         std::vector<const FieldDescriptor*>* out) const;
-
-  // Building descriptors --------------------------------------------
-
-  // When converting a FileDescriptorProto to a FileDescriptor, various
-  // errors might be detected in the input.  The caller may handle these
-  // programmatically by implementing an ErrorCollector.
-  class PROTOBUF_EXPORT ErrorCollector {
-   public:
-    inline ErrorCollector() {}
-    virtual ~ErrorCollector();
-
-    // These constants specify what exact part of the construct is broken.
-    // This is useful e.g. for mapping the error back to an exact location
-    // in a .proto file.
-    enum ErrorLocation {
-      NAME,           // the symbol name, or the package name for files
-      NUMBER,         // field or extension range number
-      TYPE,           // field type
-      EXTENDEE,       // field extendee
-      DEFAULT_VALUE,  // field default value
-      INPUT_TYPE,     // method input type
-      OUTPUT_TYPE,    // method output type
-      OPTION_NAME,    // name in assignment
-      OPTION_VALUE,   // value in option assignment
-      IMPORT,         // import error
-      OTHER           // some other problem
-    };
-
-    // Reports an error in the FileDescriptorProto. Use this function if the
-    // problem occurred should interrupt building the FileDescriptorProto.
-    virtual void AddError(
-        const std::string& filename,  // File name in which the error occurred.
-        const std::string& element_name,  // Full name of the erroneous element.
-        const Message* descriptor,  // Descriptor of the erroneous element.
-        ErrorLocation location,     // One of the location constants, above.
-        const std::string& message  // Human-readable error message.
-        ) = 0;
-
-    // Reports a warning in the FileDescriptorProto. Use this function if the
-    // problem occurred should NOT interrupt building the FileDescriptorProto.
-    virtual void AddWarning(
-        const std::string& /*filename*/,      // File name in which the error
-                                              // occurred.
-        const std::string& /*element_name*/,  // Full name of the erroneous
-                                              // element.
-        const Message* /*descriptor*/,  // Descriptor of the erroneous element.
-        ErrorLocation /*location*/,     // One of the location constants, above.
-        const std::string& /*message*/  // Human-readable error message.
-    ) {}
-
-   private:
-    GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(ErrorCollector);
-  };
-
-  // Convert the FileDescriptorProto to real descriptors and place them in
-  // this DescriptorPool.  All dependencies of the file must already be in
-  // the pool.  Returns the resulting FileDescriptor, or nullptr if there were
-  // problems with the input (e.g. the message was invalid, or dependencies
-  // were missing).  Details about the errors are written to GOOGLE_LOG(ERROR).
-  const FileDescriptor* BuildFile(const FileDescriptorProto& proto);
-
-  // Same as BuildFile() except errors are sent to the given ErrorCollector.
-  const FileDescriptor* BuildFileCollectingErrors(
-      const FileDescriptorProto& proto, ErrorCollector* error_collector);
-
-  // By default, it is an error if a FileDescriptorProto contains references
-  // to types or other files that are not found in the DescriptorPool (or its
-  // backing DescriptorDatabase, if any).  If you call
-  // AllowUnknownDependencies(), however, then unknown types and files
-  // will be replaced by placeholder descriptors (which can be identified by
-  // the is_placeholder() method).  This can allow you to
-  // perform some useful operations with a .proto file even if you do not
-  // have access to other .proto files on which it depends.  However, some
-  // heuristics must be used to fill in the gaps in information, and these
-  // can lead to descriptors which are inaccurate.  For example, the
-  // DescriptorPool may be forced to guess whether an unknown type is a message
-  // or an enum, as well as what package it resides in.  Furthermore,
-  // placeholder types will not be discoverable via FindMessageTypeByName()
-  // and similar methods, which could confuse some descriptor-based algorithms.
-  // Generally, the results of this option should be handled with extreme care.
-  void AllowUnknownDependencies() { allow_unknown_ = true; }
-
-  // By default, weak imports are allowed to be missing, in which case we will
-  // use a placeholder for the dependency and convert the field to be an Empty
-  // message field. If you call EnforceWeakDependencies(true), however, the
-  // DescriptorPool will report a import not found error.
-  void EnforceWeakDependencies(bool enforce) { enforce_weak_ = enforce; }
-
-  // Internal stuff --------------------------------------------------
-  // These methods MUST NOT be called from outside the proto2 library.
-  // These methods may contain hidden pitfalls and may be removed in a
-  // future library version.
-
-  // Create a DescriptorPool which is overlaid on top of some other pool.
-  // If you search for a descriptor in the overlay and it is not found, the
-  // underlay will be searched as a backup.  If the underlay has its own
-  // underlay, that will be searched next, and so on.  This also means that
-  // files built in the overlay will be cross-linked with the underlay's
-  // descriptors if necessary.  The underlay remains property of the caller;
-  // it must remain valid for the lifetime of the newly-constructed pool.
-  //
-  // Example:  Say you want to parse a .proto file at runtime in order to use
-  // its type with a DynamicMessage.  Say this .proto file has dependencies,
-  // but you know that all the dependencies will be things that are already
-  // compiled into the binary.  For ease of use, you'd like to load the types
-  // right out of generated_pool() rather than have to parse redundant copies
-  // of all these .protos and runtime.  But, you don't want to add the parsed
-  // types directly into generated_pool(): this is not allowed, and would be
-  // bad design anyway.  So, instead, you could use generated_pool() as an
-  // underlay for a new DescriptorPool in which you add only the new file.
-  //
-  // WARNING:  Use of underlays can lead to many subtle gotchas.  Instead,
-  //   try to formulate what you want to do in terms of DescriptorDatabases.
-  explicit DescriptorPool(const DescriptorPool* underlay);
-
-  // Called by generated classes at init time to add their descriptors to
-  // generated_pool.  Do NOT call this in your own code!  filename must be a
-  // permanent string (e.g. a string literal).
-  static void InternalAddGeneratedFile(const void* encoded_file_descriptor,
-                                       int size);
-
-  // Disallow [enforce_utf8 = false] in .proto files.
-  void DisallowEnforceUtf8() { disallow_enforce_utf8_ = true; }
-
-
-  // For internal use only:  Gets a non-const pointer to the generated pool.
-  // This is called at static-initialization time only, so thread-safety is
-  // not a concern.  If both an underlay and a fallback database are present,
-  // the underlay takes precedence.
-  static DescriptorPool* internal_generated_pool();
-
-  // For internal use only:  Gets a non-const pointer to the generated
-  // descriptor database.
-  // Only used for testing.
-  static DescriptorDatabase* internal_generated_database();
-
-  // For internal use only:  Changes the behavior of BuildFile() such that it
-  // allows the file to make reference to message types declared in other files
-  // which it did not officially declare as dependencies.
-  void InternalDontEnforceDependencies();
-
-  // For internal use only: Enables lazy building of dependencies of a file.
-  // Delay the building of dependencies of a file descriptor until absolutely
-  // necessary, like when message_type() is called on a field that is defined
-  // in that dependency's file. This will cause functional issues if a proto
-  // or one of its dependencies has errors. Should only be enabled for the
-  // generated_pool_ (because no descriptor build errors are guaranteed by
-  // the compilation generation process), testing, or if a lack of descriptor
-  // build errors can be guaranteed for a pool.
-  void InternalSetLazilyBuildDependencies() {
-    lazily_build_dependencies_ = true;
-    // This needs to be set when lazily building dependencies, as it breaks
-    // dependency checking.
-    InternalDontEnforceDependencies();
-  }
-
-  // For internal use only.
-  void internal_set_underlay(const DescriptorPool* underlay) {
-    underlay_ = underlay;
-  }
-
-  // For internal (unit test) use only:  Returns true if a FileDescriptor has
-  // been constructed for the given file, false otherwise.  Useful for testing
-  // lazy descriptor initialization behavior.
-  bool InternalIsFileLoaded(ConstStringParam filename) const;
-
-  // Add a file to unused_import_track_files_. DescriptorBuilder will log
-  // warnings or errors for those files if there is any unused import.
-  void AddUnusedImportTrackFile(ConstStringParam file_name,
-                                bool is_error = false);
-  void ClearUnusedImportTrackFiles();
-
- private:
-  friend class Descriptor;
-  friend class internal::LazyDescriptor;
-  friend class FieldDescriptor;
-  friend class EnumDescriptor;
-  friend class ServiceDescriptor;
-  friend class MethodDescriptor;
-  friend class FileDescriptor;
-  friend class DescriptorBuilder;
-  friend class FileDescriptorTables;
-
-  // Return true if the given name is a sub-symbol of any non-package
-  // descriptor that already exists in the descriptor pool.  (The full
-  // definition of such types is already known.)
-  bool IsSubSymbolOfBuiltType(StringPiece name) const;
-
-  // Tries to find something in the fallback database and link in the
-  // corresponding proto file.  Returns true if successful, in which case
-  // the caller should search for the thing again.  These are declared
-  // const because they are called by (semantically) const methods.
-  bool TryFindFileInFallbackDatabase(StringPiece name) const;
-  bool TryFindSymbolInFallbackDatabase(StringPiece name) const;
-  bool TryFindExtensionInFallbackDatabase(const Descriptor* containing_type,
-                                          int field_number) const;
-
-  // This internal find extension method only check with its table and underlay
-  // descriptor_pool's table. It does not check with fallback DB and no
-  // additional proto file will be build in this method.
-  const FieldDescriptor* InternalFindExtensionByNumberNoLock(
-      const Descriptor* extendee, int number) const;
-
-  // Like BuildFile() but called internally when the file has been loaded from
-  // fallback_database_.  Declared const because it is called by (semantically)
-  // const methods.
-  const FileDescriptor* BuildFileFromDatabase(
-      const FileDescriptorProto& proto) const;
-
-  // Helper for when lazily_build_dependencies_ is set, can look up a symbol
-  // after the file's descriptor is built, and can build the file where that
-  // symbol is defined if necessary. Will create a placeholder if the type
-  // doesn't exist in the fallback database, or the file doesn't build
-  // successfully.
-  Symbol CrossLinkOnDemandHelper(StringPiece name,
-                                 bool expecting_enum) const;
-
-  // Create a placeholder FileDescriptor of the specified name
-  FileDescriptor* NewPlaceholderFile(StringPiece name) const;
-  FileDescriptor* NewPlaceholderFileWithMutexHeld(
-      StringPiece name, internal::FlatAllocator& alloc) const;
-
-  enum PlaceholderType {
-    PLACEHOLDER_MESSAGE,
-    PLACEHOLDER_ENUM,
-    PLACEHOLDER_EXTENDABLE_MESSAGE
-  };
-  // Create a placeholder Descriptor of the specified name
-  Symbol NewPlaceholder(StringPiece name,
-                        PlaceholderType placeholder_type) const;
-  Symbol NewPlaceholderWithMutexHeld(StringPiece name,
-                                     PlaceholderType placeholder_type) const;
-
-  // If fallback_database_ is nullptr, this is nullptr.  Otherwise, this is a
-  // mutex which must be locked while accessing tables_.
-  internal::WrappedMutex* mutex_;
-
-  // See constructor.
-  DescriptorDatabase* fallback_database_;
-  ErrorCollector* default_error_collector_;
-  const DescriptorPool* underlay_;
-
-  // This class contains a lot of hash maps with complicated types that
-  // we'd like to keep out of the header.
-  class Tables;
-  std::unique_ptr<Tables> tables_;
-
-  bool enforce_dependencies_;
-  bool lazily_build_dependencies_;
-  bool allow_unknown_;
-  bool enforce_weak_;
-  bool disallow_enforce_utf8_;
-
-  // Set of files to track for unused imports. The bool value when true means
-  // unused imports are treated as errors (and as warnings when false).
-  std::map<std::string, bool> unused_import_track_files_;
-
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(DescriptorPool);
-};
-
-
-// inline methods ====================================================
-
-// These macros makes this repetitive code more readable.
-#define PROTOBUF_DEFINE_ACCESSOR(CLASS, FIELD, TYPE) \
-  inline TYPE CLASS::FIELD() const { return FIELD##_; }
-
-// Strings fields are stored as pointers but returned as const references.
-#define PROTOBUF_DEFINE_STRING_ACCESSOR(CLASS, FIELD) \
-  inline const std::string& CLASS::FIELD() const { return *FIELD##_; }
-
-// Name and full name are stored in a single array to save space.
-#define PROTOBUF_DEFINE_NAME_ACCESSOR(CLASS)                              \
-  inline const std::string& CLASS::name() const { return all_names_[0]; } \
-  inline const std::string& CLASS::full_name() const { return all_names_[1]; }
-
-// Arrays take an index parameter, obviously.
-#define PROTOBUF_DEFINE_ARRAY_ACCESSOR(CLASS, FIELD, TYPE) \
-  inline TYPE CLASS::FIELD(int index) const { return FIELD##s_ + index; }
-
-#define PROTOBUF_DEFINE_OPTIONS_ACCESSOR(CLASS, TYPE) \
-  inline const TYPE& CLASS::options() const { return *options_; }
-
-PROTOBUF_DEFINE_NAME_ACCESSOR(Descriptor)
-PROTOBUF_DEFINE_ACCESSOR(Descriptor, file, const FileDescriptor*)
-PROTOBUF_DEFINE_ACCESSOR(Descriptor, containing_type, const Descriptor*)
-
-PROTOBUF_DEFINE_ACCESSOR(Descriptor, field_count, int)
-PROTOBUF_DEFINE_ACCESSOR(Descriptor, oneof_decl_count, int)
-PROTOBUF_DEFINE_ACCESSOR(Descriptor, real_oneof_decl_count, int)
-PROTOBUF_DEFINE_ACCESSOR(Descriptor, nested_type_count, int)
-PROTOBUF_DEFINE_ACCESSOR(Descriptor, enum_type_count, int)
-
-PROTOBUF_DEFINE_ARRAY_ACCESSOR(Descriptor, field, const FieldDescriptor*)
-PROTOBUF_DEFINE_ARRAY_ACCESSOR(Descriptor, oneof_decl, const OneofDescriptor*)
-PROTOBUF_DEFINE_ARRAY_ACCESSOR(Descriptor, nested_type, const Descriptor*)
-PROTOBUF_DEFINE_ARRAY_ACCESSOR(Descriptor, enum_type, const EnumDescriptor*)
-
-PROTOBUF_DEFINE_ACCESSOR(Descriptor, extension_range_count, int)
-PROTOBUF_DEFINE_ACCESSOR(Descriptor, extension_count, int)
-PROTOBUF_DEFINE_ARRAY_ACCESSOR(Descriptor, extension_range,
-                               const Descriptor::ExtensionRange*)
-PROTOBUF_DEFINE_ARRAY_ACCESSOR(Descriptor, extension, const FieldDescriptor*)
-
-PROTOBUF_DEFINE_ACCESSOR(Descriptor, reserved_range_count, int)
-PROTOBUF_DEFINE_ARRAY_ACCESSOR(Descriptor, reserved_range,
-                               const Descriptor::ReservedRange*)
-PROTOBUF_DEFINE_ACCESSOR(Descriptor, reserved_name_count, int)
-
-PROTOBUF_DEFINE_OPTIONS_ACCESSOR(Descriptor, MessageOptions)
-PROTOBUF_DEFINE_ACCESSOR(Descriptor, is_placeholder, bool)
-
-PROTOBUF_DEFINE_NAME_ACCESSOR(FieldDescriptor)
-PROTOBUF_DEFINE_ACCESSOR(FieldDescriptor, file, const FileDescriptor*)
-PROTOBUF_DEFINE_ACCESSOR(FieldDescriptor, number, int)
-PROTOBUF_DEFINE_ACCESSOR(FieldDescriptor, is_extension, bool)
-PROTOBUF_DEFINE_ACCESSOR(FieldDescriptor, containing_type, const Descriptor*)
-PROTOBUF_DEFINE_OPTIONS_ACCESSOR(FieldDescriptor, FieldOptions)
-PROTOBUF_DEFINE_ACCESSOR(FieldDescriptor, has_default_value, bool)
-PROTOBUF_DEFINE_ACCESSOR(FieldDescriptor, has_json_name, bool)
-PROTOBUF_DEFINE_ACCESSOR(FieldDescriptor, default_value_int32_t, int32_t)
-PROTOBUF_DEFINE_ACCESSOR(FieldDescriptor, default_value_int64_t, int64_t)
-PROTOBUF_DEFINE_ACCESSOR(FieldDescriptor, default_value_uint32_t, uint32_t)
-PROTOBUF_DEFINE_ACCESSOR(FieldDescriptor, default_value_uint64_t, uint64_t)
-PROTOBUF_DEFINE_ACCESSOR(FieldDescriptor, default_value_float, float)
-PROTOBUF_DEFINE_ACCESSOR(FieldDescriptor, default_value_double, double)
-PROTOBUF_DEFINE_ACCESSOR(FieldDescriptor, default_value_bool, bool)
-PROTOBUF_DEFINE_STRING_ACCESSOR(FieldDescriptor, default_value_string)
-
-PROTOBUF_DEFINE_NAME_ACCESSOR(OneofDescriptor)
-PROTOBUF_DEFINE_ACCESSOR(OneofDescriptor, containing_type, const Descriptor*)
-PROTOBUF_DEFINE_ACCESSOR(OneofDescriptor, field_count, int)
-PROTOBUF_DEFINE_ARRAY_ACCESSOR(OneofDescriptor, field, const FieldDescriptor*)
-PROTOBUF_DEFINE_OPTIONS_ACCESSOR(OneofDescriptor, OneofOptions)
-
-PROTOBUF_DEFINE_NAME_ACCESSOR(EnumDescriptor)
-PROTOBUF_DEFINE_ACCESSOR(EnumDescriptor, file, const FileDescriptor*)
-PROTOBUF_DEFINE_ACCESSOR(EnumDescriptor, containing_type, const Descriptor*)
-PROTOBUF_DEFINE_ACCESSOR(EnumDescriptor, value_count, int)
-PROTOBUF_DEFINE_ARRAY_ACCESSOR(EnumDescriptor, value,
-                               const EnumValueDescriptor*)
-PROTOBUF_DEFINE_OPTIONS_ACCESSOR(EnumDescriptor, EnumOptions)
-PROTOBUF_DEFINE_ACCESSOR(EnumDescriptor, is_placeholder, bool)
-PROTOBUF_DEFINE_ACCESSOR(EnumDescriptor, reserved_range_count, int)
-PROTOBUF_DEFINE_ARRAY_ACCESSOR(EnumDescriptor, reserved_range,
-                               const EnumDescriptor::ReservedRange*)
-PROTOBUF_DEFINE_ACCESSOR(EnumDescriptor, reserved_name_count, int)
-
-PROTOBUF_DEFINE_NAME_ACCESSOR(EnumValueDescriptor)
-PROTOBUF_DEFINE_ACCESSOR(EnumValueDescriptor, number, int)
-PROTOBUF_DEFINE_ACCESSOR(EnumValueDescriptor, type, const EnumDescriptor*)
-PROTOBUF_DEFINE_OPTIONS_ACCESSOR(EnumValueDescriptor, EnumValueOptions)
-
-PROTOBUF_DEFINE_NAME_ACCESSOR(ServiceDescriptor)
-PROTOBUF_DEFINE_ACCESSOR(ServiceDescriptor, file, const FileDescriptor*)
-PROTOBUF_DEFINE_ACCESSOR(ServiceDescriptor, method_count, int)
-PROTOBUF_DEFINE_ARRAY_ACCESSOR(ServiceDescriptor, method,
-                               const MethodDescriptor*)
-PROTOBUF_DEFINE_OPTIONS_ACCESSOR(ServiceDescriptor, ServiceOptions)
-
-PROTOBUF_DEFINE_NAME_ACCESSOR(MethodDescriptor)
-PROTOBUF_DEFINE_ACCESSOR(MethodDescriptor, service, const ServiceDescriptor*)
-PROTOBUF_DEFINE_OPTIONS_ACCESSOR(MethodDescriptor, MethodOptions)
-PROTOBUF_DEFINE_ACCESSOR(MethodDescriptor, client_streaming, bool)
-PROTOBUF_DEFINE_ACCESSOR(MethodDescriptor, server_streaming, bool)
-
-PROTOBUF_DEFINE_STRING_ACCESSOR(FileDescriptor, name)
-PROTOBUF_DEFINE_STRING_ACCESSOR(FileDescriptor, package)
-PROTOBUF_DEFINE_ACCESSOR(FileDescriptor, pool, const DescriptorPool*)
-PROTOBUF_DEFINE_ACCESSOR(FileDescriptor, dependency_count, int)
-PROTOBUF_DEFINE_ACCESSOR(FileDescriptor, public_dependency_count, int)
-PROTOBUF_DEFINE_ACCESSOR(FileDescriptor, weak_dependency_count, int)
-PROTOBUF_DEFINE_ACCESSOR(FileDescriptor, message_type_count, int)
-PROTOBUF_DEFINE_ACCESSOR(FileDescriptor, enum_type_count, int)
-PROTOBUF_DEFINE_ACCESSOR(FileDescriptor, service_count, int)
-PROTOBUF_DEFINE_ACCESSOR(FileDescriptor, extension_count, int)
-PROTOBUF_DEFINE_OPTIONS_ACCESSOR(FileDescriptor, FileOptions)
-PROTOBUF_DEFINE_ACCESSOR(FileDescriptor, is_placeholder, bool)
-
-PROTOBUF_DEFINE_ARRAY_ACCESSOR(FileDescriptor, message_type, const Descriptor*)
-PROTOBUF_DEFINE_ARRAY_ACCESSOR(FileDescriptor, enum_type, const EnumDescriptor*)
-PROTOBUF_DEFINE_ARRAY_ACCESSOR(FileDescriptor, service,
-                               const ServiceDescriptor*)
-PROTOBUF_DEFINE_ARRAY_ACCESSOR(FileDescriptor, extension,
-                               const FieldDescriptor*)
-
-#undef PROTOBUF_DEFINE_ACCESSOR
-#undef PROTOBUF_DEFINE_STRING_ACCESSOR
-#undef PROTOBUF_DEFINE_ARRAY_ACCESSOR
-
-// A few accessors differ from the macros...
-
-inline Descriptor::WellKnownType Descriptor::well_known_type() const {
-  return static_cast<Descriptor::WellKnownType>(well_known_type_);
-}
-
-inline bool Descriptor::IsExtensionNumber(int number) const {
-  return FindExtensionRangeContainingNumber(number) != nullptr;
-}
-
-inline bool Descriptor::IsReservedNumber(int number) const {
-  return FindReservedRangeContainingNumber(number) != nullptr;
-}
-
-inline bool Descriptor::IsReservedName(ConstStringParam name) const {
-  for (int i = 0; i < reserved_name_count(); i++) {
-    if (name == static_cast<ConstStringParam>(reserved_name(i))) {
-      return true;
-    }
-  }
-  return false;
-}
-
-// Can't use PROTOBUF_DEFINE_ARRAY_ACCESSOR because reserved_names_ is actually
-// an array of pointers rather than the usual array of objects.
-inline const std::string& Descriptor::reserved_name(int index) const {
-  return *reserved_names_[index];
-}
-
-inline bool EnumDescriptor::IsReservedNumber(int number) const {
-  return FindReservedRangeContainingNumber(number) != nullptr;
-}
-
-inline bool EnumDescriptor::IsReservedName(ConstStringParam name) const {
-  for (int i = 0; i < reserved_name_count(); i++) {
-    if (name == static_cast<ConstStringParam>(reserved_name(i))) {
-      return true;
-    }
-  }
-  return false;
-}
-
-// Can't use PROTOBUF_DEFINE_ARRAY_ACCESSOR because reserved_names_ is actually
-// an array of pointers rather than the usual array of objects.
-inline const std::string& EnumDescriptor::reserved_name(int index) const {
-  return *reserved_names_[index];
-}
-
-inline const std::string& FieldDescriptor::lowercase_name() const {
-  return all_names_[lowercase_name_index_];
-}
-
-inline const std::string& FieldDescriptor::camelcase_name() const {
-  return all_names_[camelcase_name_index_];
-}
-
-inline const std::string& FieldDescriptor::json_name() const {
-  return all_names_[json_name_index_];
-}
-
-inline const OneofDescriptor* FieldDescriptor::containing_oneof() const {
-  return is_oneof_ ? scope_.containing_oneof : nullptr;
-}
-
-inline int FieldDescriptor::index_in_oneof() const {
-  GOOGLE_DCHECK(is_oneof_);
-  return static_cast<int>(this - scope_.containing_oneof->field(0));
-}
-
-inline const Descriptor* FieldDescriptor::extension_scope() const {
-  GOOGLE_CHECK(is_extension_);
-  return scope_.extension_scope;
-}
-
-inline FieldDescriptor::Label FieldDescriptor::label() const {
-  return static_cast<Label>(label_);
-}
-
-inline FieldDescriptor::Type FieldDescriptor::type() const {
-  if (type_once_) {
-    internal::call_once(*type_once_, &FieldDescriptor::TypeOnceInit, this);
-  }
-  return static_cast<Type>(type_);
-}
-
-inline bool FieldDescriptor::is_required() const {
-  return label() == LABEL_REQUIRED;
-}
-
-inline bool FieldDescriptor::is_optional() const {
-  return label() == LABEL_OPTIONAL;
-}
-
-inline bool FieldDescriptor::is_repeated() const {
-  return label() == LABEL_REPEATED;
-}
-
-inline bool FieldDescriptor::is_packable() const {
-  return is_repeated() && IsTypePackable(type());
-}
-
-inline bool FieldDescriptor::is_map() const {
-  return type() == TYPE_MESSAGE && is_map_message_type();
-}
-
-inline bool FieldDescriptor::has_optional_keyword() const {
-  return proto3_optional_ ||
-         (file()->syntax() == FileDescriptor::SYNTAX_PROTO2 && is_optional() &&
-          !containing_oneof());
-}
-
-inline const OneofDescriptor* FieldDescriptor::real_containing_oneof() const {
-  auto* oneof = containing_oneof();
-  return oneof && !oneof->is_synthetic() ? oneof : nullptr;
-}
-
-inline bool FieldDescriptor::has_presence() const {
-  if (is_repeated()) return false;
-  return cpp_type() == CPPTYPE_MESSAGE || containing_oneof() ||
-         file()->syntax() == FileDescriptor::SYNTAX_PROTO2;
-}
-
-// To save space, index() is computed by looking at the descriptor's position
-// in the parent's array of children.
-inline int FieldDescriptor::index() const {
-  if (!is_extension_) {
-    return static_cast<int>(this - containing_type()->fields_);
-  } else if (extension_scope() != nullptr) {
-    return static_cast<int>(this - extension_scope()->extensions_);
-  } else {
-    return static_cast<int>(this - file_->extensions_);
-  }
-}
-
-inline int Descriptor::index() const {
-  if (containing_type_ == nullptr) {
-    return static_cast<int>(this - file_->message_types_);
-  } else {
-    return static_cast<int>(this - containing_type_->nested_types_);
-  }
-}
-
-inline const FileDescriptor* OneofDescriptor::file() const {
-  return containing_type()->file();
-}
-
-inline int OneofDescriptor::index() const {
-  return static_cast<int>(this - containing_type_->oneof_decls_);
-}
-
-inline bool OneofDescriptor::is_synthetic() const {
-  return field_count() == 1 && field(0)->proto3_optional_;
-}
-
-inline int EnumDescriptor::index() const {
-  if (containing_type_ == nullptr) {
-    return static_cast<int>(this - file_->enum_types_);
-  } else {
-    return static_cast<int>(this - containing_type_->enum_types_);
-  }
-}
-
-inline const FileDescriptor* EnumValueDescriptor::file() const {
-  return type()->file();
-}
-
-inline int EnumValueDescriptor::index() const {
-  return static_cast<int>(this - type_->values_);
-}
-
-inline int ServiceDescriptor::index() const {
-  return static_cast<int>(this - file_->services_);
-}
-
-inline const FileDescriptor* MethodDescriptor::file() const {
-  return service()->file();
-}
-
-inline int MethodDescriptor::index() const {
-  return static_cast<int>(this - service_->methods_);
-}
-
-inline const char* FieldDescriptor::type_name() const {
-  return kTypeToName[type()];
-}
-
-inline FieldDescriptor::CppType FieldDescriptor::cpp_type() const {
-  return kTypeToCppTypeMap[type()];
-}
-
-inline const char* FieldDescriptor::cpp_type_name() const {
-  return kCppTypeToName[kTypeToCppTypeMap[type()]];
-}
-
-inline FieldDescriptor::CppType FieldDescriptor::TypeToCppType(Type type) {
-  return kTypeToCppTypeMap[type];
-}
-
-inline const char* FieldDescriptor::TypeName(Type type) {
-  return kTypeToName[type];
-}
-
-inline const char* FieldDescriptor::CppTypeName(CppType cpp_type) {
-  return kCppTypeToName[cpp_type];
-}
-
-inline bool FieldDescriptor::IsTypePackable(Type field_type) {
-  return (field_type != FieldDescriptor::TYPE_STRING &&
-          field_type != FieldDescriptor::TYPE_GROUP &&
-          field_type != FieldDescriptor::TYPE_MESSAGE &&
-          field_type != FieldDescriptor::TYPE_BYTES);
-}
-
-inline const FileDescriptor* FileDescriptor::public_dependency(
-    int index) const {
-  return dependency(public_dependencies_[index]);
-}
-
-inline const FileDescriptor* FileDescriptor::weak_dependency(int index) const {
-  return dependency(weak_dependencies_[index]);
-}
-
-inline FileDescriptor::Syntax FileDescriptor::syntax() const {
-  return static_cast<Syntax>(syntax_);
-}
-
-}  // namespace protobuf
-}  // namespace google
-
-#undef PROTOBUF_INTERNAL_CHECK_CLASS_SIZE
-#include <google/protobuf/port_undef.inc>
-
-#endif  // GOOGLE_PROTOBUF_DESCRIPTOR_H__
diff --git a/libs/protobuf/src/google/protobuf/descriptor.pb.cc b/libs/protobuf/src/google/protobuf/descriptor.pb.cc
deleted file mode 100644
index d3bfb46..0000000
--- a/libs/protobuf/src/google/protobuf/descriptor.pb.cc
+++ /dev/null
@@ -1,11351 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/protobuf/descriptor.proto
-
-#include <google/protobuf/descriptor.pb.h>
-
-#include <algorithm>
-
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/extension_set.h>
-#include <google/protobuf/wire_format_lite.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/generated_message_reflection.h>
-#include <google/protobuf/reflection_ops.h>
-#include <google/protobuf/wire_format.h>
-// @@protoc_insertion_point(includes)
-#include <google/protobuf/port_def.inc>
-
-PROTOBUF_PRAGMA_INIT_SEG
-
-namespace _pb = ::PROTOBUF_NAMESPACE_ID;
-namespace _pbi = _pb::internal;
-
-PROTOBUF_NAMESPACE_OPEN
-PROTOBUF_CONSTEXPR FileDescriptorSet::FileDescriptorSet(
-    ::_pbi::ConstantInitialized): _impl_{
-    /*decltype(_impl_.file_)*/{}
-  , /*decltype(_impl_._cached_size_)*/{}} {}
-struct FileDescriptorSetDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR FileDescriptorSetDefaultTypeInternal()
-      : _instance(::_pbi::ConstantInitialized{}) {}
-  ~FileDescriptorSetDefaultTypeInternal() {}
-  union {
-    FileDescriptorSet _instance;
-  };
-};
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 FileDescriptorSetDefaultTypeInternal _FileDescriptorSet_default_instance_;
-PROTOBUF_CONSTEXPR FileDescriptorProto::FileDescriptorProto(
-    ::_pbi::ConstantInitialized): _impl_{
-    /*decltype(_impl_._has_bits_)*/{}
-  , /*decltype(_impl_._cached_size_)*/{}
-  , /*decltype(_impl_.dependency_)*/{}
-  , /*decltype(_impl_.message_type_)*/{}
-  , /*decltype(_impl_.enum_type_)*/{}
-  , /*decltype(_impl_.service_)*/{}
-  , /*decltype(_impl_.extension_)*/{}
-  , /*decltype(_impl_.public_dependency_)*/{}
-  , /*decltype(_impl_.weak_dependency_)*/{}
-  , /*decltype(_impl_.name_)*/{&::_pbi::fixed_address_empty_string, ::_pbi::ConstantInitialized{}}
-  , /*decltype(_impl_.package_)*/{&::_pbi::fixed_address_empty_string, ::_pbi::ConstantInitialized{}}
-  , /*decltype(_impl_.syntax_)*/{&::_pbi::fixed_address_empty_string, ::_pbi::ConstantInitialized{}}
-  , /*decltype(_impl_.options_)*/nullptr
-  , /*decltype(_impl_.source_code_info_)*/nullptr} {}
-struct FileDescriptorProtoDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR FileDescriptorProtoDefaultTypeInternal()
-      : _instance(::_pbi::ConstantInitialized{}) {}
-  ~FileDescriptorProtoDefaultTypeInternal() {}
-  union {
-    FileDescriptorProto _instance;
-  };
-};
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 FileDescriptorProtoDefaultTypeInternal _FileDescriptorProto_default_instance_;
-PROTOBUF_CONSTEXPR DescriptorProto_ExtensionRange::DescriptorProto_ExtensionRange(
-    ::_pbi::ConstantInitialized): _impl_{
-    /*decltype(_impl_._has_bits_)*/{}
-  , /*decltype(_impl_._cached_size_)*/{}
-  , /*decltype(_impl_.options_)*/nullptr
-  , /*decltype(_impl_.start_)*/0
-  , /*decltype(_impl_.end_)*/0} {}
-struct DescriptorProto_ExtensionRangeDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR DescriptorProto_ExtensionRangeDefaultTypeInternal()
-      : _instance(::_pbi::ConstantInitialized{}) {}
-  ~DescriptorProto_ExtensionRangeDefaultTypeInternal() {}
-  union {
-    DescriptorProto_ExtensionRange _instance;
-  };
-};
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 DescriptorProto_ExtensionRangeDefaultTypeInternal _DescriptorProto_ExtensionRange_default_instance_;
-PROTOBUF_CONSTEXPR DescriptorProto_ReservedRange::DescriptorProto_ReservedRange(
-    ::_pbi::ConstantInitialized): _impl_{
-    /*decltype(_impl_._has_bits_)*/{}
-  , /*decltype(_impl_._cached_size_)*/{}
-  , /*decltype(_impl_.start_)*/0
-  , /*decltype(_impl_.end_)*/0} {}
-struct DescriptorProto_ReservedRangeDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR DescriptorProto_ReservedRangeDefaultTypeInternal()
-      : _instance(::_pbi::ConstantInitialized{}) {}
-  ~DescriptorProto_ReservedRangeDefaultTypeInternal() {}
-  union {
-    DescriptorProto_ReservedRange _instance;
-  };
-};
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 DescriptorProto_ReservedRangeDefaultTypeInternal _DescriptorProto_ReservedRange_default_instance_;
-PROTOBUF_CONSTEXPR DescriptorProto::DescriptorProto(
-    ::_pbi::ConstantInitialized): _impl_{
-    /*decltype(_impl_._has_bits_)*/{}
-  , /*decltype(_impl_._cached_size_)*/{}
-  , /*decltype(_impl_.field_)*/{}
-  , /*decltype(_impl_.nested_type_)*/{}
-  , /*decltype(_impl_.enum_type_)*/{}
-  , /*decltype(_impl_.extension_range_)*/{}
-  , /*decltype(_impl_.extension_)*/{}
-  , /*decltype(_impl_.oneof_decl_)*/{}
-  , /*decltype(_impl_.reserved_range_)*/{}
-  , /*decltype(_impl_.reserved_name_)*/{}
-  , /*decltype(_impl_.name_)*/{&::_pbi::fixed_address_empty_string, ::_pbi::ConstantInitialized{}}
-  , /*decltype(_impl_.options_)*/nullptr} {}
-struct DescriptorProtoDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR DescriptorProtoDefaultTypeInternal()
-      : _instance(::_pbi::ConstantInitialized{}) {}
-  ~DescriptorProtoDefaultTypeInternal() {}
-  union {
-    DescriptorProto _instance;
-  };
-};
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 DescriptorProtoDefaultTypeInternal _DescriptorProto_default_instance_;
-PROTOBUF_CONSTEXPR ExtensionRangeOptions::ExtensionRangeOptions(
-    ::_pbi::ConstantInitialized): _impl_{
-    /*decltype(_impl_._extensions_)*/{}
-  , /*decltype(_impl_.uninterpreted_option_)*/{}
-  , /*decltype(_impl_._cached_size_)*/{}} {}
-struct ExtensionRangeOptionsDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR ExtensionRangeOptionsDefaultTypeInternal()
-      : _instance(::_pbi::ConstantInitialized{}) {}
-  ~ExtensionRangeOptionsDefaultTypeInternal() {}
-  union {
-    ExtensionRangeOptions _instance;
-  };
-};
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 ExtensionRangeOptionsDefaultTypeInternal _ExtensionRangeOptions_default_instance_;
-PROTOBUF_CONSTEXPR FieldDescriptorProto::FieldDescriptorProto(
-    ::_pbi::ConstantInitialized): _impl_{
-    /*decltype(_impl_._has_bits_)*/{}
-  , /*decltype(_impl_._cached_size_)*/{}
-  , /*decltype(_impl_.name_)*/{&::_pbi::fixed_address_empty_string, ::_pbi::ConstantInitialized{}}
-  , /*decltype(_impl_.extendee_)*/{&::_pbi::fixed_address_empty_string, ::_pbi::ConstantInitialized{}}
-  , /*decltype(_impl_.type_name_)*/{&::_pbi::fixed_address_empty_string, ::_pbi::ConstantInitialized{}}
-  , /*decltype(_impl_.default_value_)*/{&::_pbi::fixed_address_empty_string, ::_pbi::ConstantInitialized{}}
-  , /*decltype(_impl_.json_name_)*/{&::_pbi::fixed_address_empty_string, ::_pbi::ConstantInitialized{}}
-  , /*decltype(_impl_.options_)*/nullptr
-  , /*decltype(_impl_.number_)*/0
-  , /*decltype(_impl_.oneof_index_)*/0
-  , /*decltype(_impl_.proto3_optional_)*/false
-  , /*decltype(_impl_.label_)*/1
-  , /*decltype(_impl_.type_)*/1} {}
-struct FieldDescriptorProtoDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR FieldDescriptorProtoDefaultTypeInternal()
-      : _instance(::_pbi::ConstantInitialized{}) {}
-  ~FieldDescriptorProtoDefaultTypeInternal() {}
-  union {
-    FieldDescriptorProto _instance;
-  };
-};
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 FieldDescriptorProtoDefaultTypeInternal _FieldDescriptorProto_default_instance_;
-PROTOBUF_CONSTEXPR OneofDescriptorProto::OneofDescriptorProto(
-    ::_pbi::ConstantInitialized): _impl_{
-    /*decltype(_impl_._has_bits_)*/{}
-  , /*decltype(_impl_._cached_size_)*/{}
-  , /*decltype(_impl_.name_)*/{&::_pbi::fixed_address_empty_string, ::_pbi::ConstantInitialized{}}
-  , /*decltype(_impl_.options_)*/nullptr} {}
-struct OneofDescriptorProtoDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR OneofDescriptorProtoDefaultTypeInternal()
-      : _instance(::_pbi::ConstantInitialized{}) {}
-  ~OneofDescriptorProtoDefaultTypeInternal() {}
-  union {
-    OneofDescriptorProto _instance;
-  };
-};
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 OneofDescriptorProtoDefaultTypeInternal _OneofDescriptorProto_default_instance_;
-PROTOBUF_CONSTEXPR EnumDescriptorProto_EnumReservedRange::EnumDescriptorProto_EnumReservedRange(
-    ::_pbi::ConstantInitialized): _impl_{
-    /*decltype(_impl_._has_bits_)*/{}
-  , /*decltype(_impl_._cached_size_)*/{}
-  , /*decltype(_impl_.start_)*/0
-  , /*decltype(_impl_.end_)*/0} {}
-struct EnumDescriptorProto_EnumReservedRangeDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR EnumDescriptorProto_EnumReservedRangeDefaultTypeInternal()
-      : _instance(::_pbi::ConstantInitialized{}) {}
-  ~EnumDescriptorProto_EnumReservedRangeDefaultTypeInternal() {}
-  union {
-    EnumDescriptorProto_EnumReservedRange _instance;
-  };
-};
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 EnumDescriptorProto_EnumReservedRangeDefaultTypeInternal _EnumDescriptorProto_EnumReservedRange_default_instance_;
-PROTOBUF_CONSTEXPR EnumDescriptorProto::EnumDescriptorProto(
-    ::_pbi::ConstantInitialized): _impl_{
-    /*decltype(_impl_._has_bits_)*/{}
-  , /*decltype(_impl_._cached_size_)*/{}
-  , /*decltype(_impl_.value_)*/{}
-  , /*decltype(_impl_.reserved_range_)*/{}
-  , /*decltype(_impl_.reserved_name_)*/{}
-  , /*decltype(_impl_.name_)*/{&::_pbi::fixed_address_empty_string, ::_pbi::ConstantInitialized{}}
-  , /*decltype(_impl_.options_)*/nullptr} {}
-struct EnumDescriptorProtoDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR EnumDescriptorProtoDefaultTypeInternal()
-      : _instance(::_pbi::ConstantInitialized{}) {}
-  ~EnumDescriptorProtoDefaultTypeInternal() {}
-  union {
-    EnumDescriptorProto _instance;
-  };
-};
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 EnumDescriptorProtoDefaultTypeInternal _EnumDescriptorProto_default_instance_;
-PROTOBUF_CONSTEXPR EnumValueDescriptorProto::EnumValueDescriptorProto(
-    ::_pbi::ConstantInitialized): _impl_{
-    /*decltype(_impl_._has_bits_)*/{}
-  , /*decltype(_impl_._cached_size_)*/{}
-  , /*decltype(_impl_.name_)*/{&::_pbi::fixed_address_empty_string, ::_pbi::ConstantInitialized{}}
-  , /*decltype(_impl_.options_)*/nullptr
-  , /*decltype(_impl_.number_)*/0} {}
-struct EnumValueDescriptorProtoDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR EnumValueDescriptorProtoDefaultTypeInternal()
-      : _instance(::_pbi::ConstantInitialized{}) {}
-  ~EnumValueDescriptorProtoDefaultTypeInternal() {}
-  union {
-    EnumValueDescriptorProto _instance;
-  };
-};
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 EnumValueDescriptorProtoDefaultTypeInternal _EnumValueDescriptorProto_default_instance_;
-PROTOBUF_CONSTEXPR ServiceDescriptorProto::ServiceDescriptorProto(
-    ::_pbi::ConstantInitialized): _impl_{
-    /*decltype(_impl_._has_bits_)*/{}
-  , /*decltype(_impl_._cached_size_)*/{}
-  , /*decltype(_impl_.method_)*/{}
-  , /*decltype(_impl_.name_)*/{&::_pbi::fixed_address_empty_string, ::_pbi::ConstantInitialized{}}
-  , /*decltype(_impl_.options_)*/nullptr} {}
-struct ServiceDescriptorProtoDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR ServiceDescriptorProtoDefaultTypeInternal()
-      : _instance(::_pbi::ConstantInitialized{}) {}
-  ~ServiceDescriptorProtoDefaultTypeInternal() {}
-  union {
-    ServiceDescriptorProto _instance;
-  };
-};
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 ServiceDescriptorProtoDefaultTypeInternal _ServiceDescriptorProto_default_instance_;
-PROTOBUF_CONSTEXPR MethodDescriptorProto::MethodDescriptorProto(
-    ::_pbi::ConstantInitialized): _impl_{
-    /*decltype(_impl_._has_bits_)*/{}
-  , /*decltype(_impl_._cached_size_)*/{}
-  , /*decltype(_impl_.name_)*/{&::_pbi::fixed_address_empty_string, ::_pbi::ConstantInitialized{}}
-  , /*decltype(_impl_.input_type_)*/{&::_pbi::fixed_address_empty_string, ::_pbi::ConstantInitialized{}}
-  , /*decltype(_impl_.output_type_)*/{&::_pbi::fixed_address_empty_string, ::_pbi::ConstantInitialized{}}
-  , /*decltype(_impl_.options_)*/nullptr
-  , /*decltype(_impl_.client_streaming_)*/false
-  , /*decltype(_impl_.server_streaming_)*/false} {}
-struct MethodDescriptorProtoDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR MethodDescriptorProtoDefaultTypeInternal()
-      : _instance(::_pbi::ConstantInitialized{}) {}
-  ~MethodDescriptorProtoDefaultTypeInternal() {}
-  union {
-    MethodDescriptorProto _instance;
-  };
-};
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 MethodDescriptorProtoDefaultTypeInternal _MethodDescriptorProto_default_instance_;
-PROTOBUF_CONSTEXPR FileOptions::FileOptions(
-    ::_pbi::ConstantInitialized): _impl_{
-    /*decltype(_impl_._extensions_)*/{}
-  , /*decltype(_impl_._has_bits_)*/{}
-  , /*decltype(_impl_._cached_size_)*/{}
-  , /*decltype(_impl_.uninterpreted_option_)*/{}
-  , /*decltype(_impl_.java_package_)*/{&::_pbi::fixed_address_empty_string, ::_pbi::ConstantInitialized{}}
-  , /*decltype(_impl_.java_outer_classname_)*/{&::_pbi::fixed_address_empty_string, ::_pbi::ConstantInitialized{}}
-  , /*decltype(_impl_.go_package_)*/{&::_pbi::fixed_address_empty_string, ::_pbi::ConstantInitialized{}}
-  , /*decltype(_impl_.objc_class_prefix_)*/{&::_pbi::fixed_address_empty_string, ::_pbi::ConstantInitialized{}}
-  , /*decltype(_impl_.csharp_namespace_)*/{&::_pbi::fixed_address_empty_string, ::_pbi::ConstantInitialized{}}
-  , /*decltype(_impl_.swift_prefix_)*/{&::_pbi::fixed_address_empty_string, ::_pbi::ConstantInitialized{}}
-  , /*decltype(_impl_.php_class_prefix_)*/{&::_pbi::fixed_address_empty_string, ::_pbi::ConstantInitialized{}}
-  , /*decltype(_impl_.php_namespace_)*/{&::_pbi::fixed_address_empty_string, ::_pbi::ConstantInitialized{}}
-  , /*decltype(_impl_.php_metadata_namespace_)*/{&::_pbi::fixed_address_empty_string, ::_pbi::ConstantInitialized{}}
-  , /*decltype(_impl_.ruby_package_)*/{&::_pbi::fixed_address_empty_string, ::_pbi::ConstantInitialized{}}
-  , /*decltype(_impl_.java_multiple_files_)*/false
-  , /*decltype(_impl_.java_generate_equals_and_hash_)*/false
-  , /*decltype(_impl_.java_string_check_utf8_)*/false
-  , /*decltype(_impl_.cc_generic_services_)*/false
-  , /*decltype(_impl_.java_generic_services_)*/false
-  , /*decltype(_impl_.py_generic_services_)*/false
-  , /*decltype(_impl_.php_generic_services_)*/false
-  , /*decltype(_impl_.deprecated_)*/false
-  , /*decltype(_impl_.optimize_for_)*/1
-  , /*decltype(_impl_.cc_enable_arenas_)*/true} {}
-struct FileOptionsDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR FileOptionsDefaultTypeInternal()
-      : _instance(::_pbi::ConstantInitialized{}) {}
-  ~FileOptionsDefaultTypeInternal() {}
-  union {
-    FileOptions _instance;
-  };
-};
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 FileOptionsDefaultTypeInternal _FileOptions_default_instance_;
-PROTOBUF_CONSTEXPR MessageOptions::MessageOptions(
-    ::_pbi::ConstantInitialized): _impl_{
-    /*decltype(_impl_._extensions_)*/{}
-  , /*decltype(_impl_._has_bits_)*/{}
-  , /*decltype(_impl_._cached_size_)*/{}
-  , /*decltype(_impl_.uninterpreted_option_)*/{}
-  , /*decltype(_impl_.message_set_wire_format_)*/false
-  , /*decltype(_impl_.no_standard_descriptor_accessor_)*/false
-  , /*decltype(_impl_.deprecated_)*/false
-  , /*decltype(_impl_.map_entry_)*/false} {}
-struct MessageOptionsDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR MessageOptionsDefaultTypeInternal()
-      : _instance(::_pbi::ConstantInitialized{}) {}
-  ~MessageOptionsDefaultTypeInternal() {}
-  union {
-    MessageOptions _instance;
-  };
-};
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 MessageOptionsDefaultTypeInternal _MessageOptions_default_instance_;
-PROTOBUF_CONSTEXPR FieldOptions::FieldOptions(
-    ::_pbi::ConstantInitialized): _impl_{
-    /*decltype(_impl_._extensions_)*/{}
-  , /*decltype(_impl_._has_bits_)*/{}
-  , /*decltype(_impl_._cached_size_)*/{}
-  , /*decltype(_impl_.uninterpreted_option_)*/{}
-  , /*decltype(_impl_.ctype_)*/0
-  , /*decltype(_impl_.jstype_)*/0
-  , /*decltype(_impl_.packed_)*/false
-  , /*decltype(_impl_.lazy_)*/false
-  , /*decltype(_impl_.unverified_lazy_)*/false
-  , /*decltype(_impl_.deprecated_)*/false
-  , /*decltype(_impl_.weak_)*/false} {}
-struct FieldOptionsDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR FieldOptionsDefaultTypeInternal()
-      : _instance(::_pbi::ConstantInitialized{}) {}
-  ~FieldOptionsDefaultTypeInternal() {}
-  union {
-    FieldOptions _instance;
-  };
-};
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 FieldOptionsDefaultTypeInternal _FieldOptions_default_instance_;
-PROTOBUF_CONSTEXPR OneofOptions::OneofOptions(
-    ::_pbi::ConstantInitialized): _impl_{
-    /*decltype(_impl_._extensions_)*/{}
-  , /*decltype(_impl_.uninterpreted_option_)*/{}
-  , /*decltype(_impl_._cached_size_)*/{}} {}
-struct OneofOptionsDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR OneofOptionsDefaultTypeInternal()
-      : _instance(::_pbi::ConstantInitialized{}) {}
-  ~OneofOptionsDefaultTypeInternal() {}
-  union {
-    OneofOptions _instance;
-  };
-};
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 OneofOptionsDefaultTypeInternal _OneofOptions_default_instance_;
-PROTOBUF_CONSTEXPR EnumOptions::EnumOptions(
-    ::_pbi::ConstantInitialized): _impl_{
-    /*decltype(_impl_._extensions_)*/{}
-  , /*decltype(_impl_._has_bits_)*/{}
-  , /*decltype(_impl_._cached_size_)*/{}
-  , /*decltype(_impl_.uninterpreted_option_)*/{}
-  , /*decltype(_impl_.allow_alias_)*/false
-  , /*decltype(_impl_.deprecated_)*/false} {}
-struct EnumOptionsDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR EnumOptionsDefaultTypeInternal()
-      : _instance(::_pbi::ConstantInitialized{}) {}
-  ~EnumOptionsDefaultTypeInternal() {}
-  union {
-    EnumOptions _instance;
-  };
-};
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 EnumOptionsDefaultTypeInternal _EnumOptions_default_instance_;
-PROTOBUF_CONSTEXPR EnumValueOptions::EnumValueOptions(
-    ::_pbi::ConstantInitialized): _impl_{
-    /*decltype(_impl_._extensions_)*/{}
-  , /*decltype(_impl_._has_bits_)*/{}
-  , /*decltype(_impl_._cached_size_)*/{}
-  , /*decltype(_impl_.uninterpreted_option_)*/{}
-  , /*decltype(_impl_.deprecated_)*/false} {}
-struct EnumValueOptionsDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR EnumValueOptionsDefaultTypeInternal()
-      : _instance(::_pbi::ConstantInitialized{}) {}
-  ~EnumValueOptionsDefaultTypeInternal() {}
-  union {
-    EnumValueOptions _instance;
-  };
-};
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 EnumValueOptionsDefaultTypeInternal _EnumValueOptions_default_instance_;
-PROTOBUF_CONSTEXPR ServiceOptions::ServiceOptions(
-    ::_pbi::ConstantInitialized): _impl_{
-    /*decltype(_impl_._extensions_)*/{}
-  , /*decltype(_impl_._has_bits_)*/{}
-  , /*decltype(_impl_._cached_size_)*/{}
-  , /*decltype(_impl_.uninterpreted_option_)*/{}
-  , /*decltype(_impl_.deprecated_)*/false} {}
-struct ServiceOptionsDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR ServiceOptionsDefaultTypeInternal()
-      : _instance(::_pbi::ConstantInitialized{}) {}
-  ~ServiceOptionsDefaultTypeInternal() {}
-  union {
-    ServiceOptions _instance;
-  };
-};
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 ServiceOptionsDefaultTypeInternal _ServiceOptions_default_instance_;
-PROTOBUF_CONSTEXPR MethodOptions::MethodOptions(
-    ::_pbi::ConstantInitialized): _impl_{
-    /*decltype(_impl_._extensions_)*/{}
-  , /*decltype(_impl_._has_bits_)*/{}
-  , /*decltype(_impl_._cached_size_)*/{}
-  , /*decltype(_impl_.uninterpreted_option_)*/{}
-  , /*decltype(_impl_.deprecated_)*/false
-  , /*decltype(_impl_.idempotency_level_)*/0} {}
-struct MethodOptionsDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR MethodOptionsDefaultTypeInternal()
-      : _instance(::_pbi::ConstantInitialized{}) {}
-  ~MethodOptionsDefaultTypeInternal() {}
-  union {
-    MethodOptions _instance;
-  };
-};
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 MethodOptionsDefaultTypeInternal _MethodOptions_default_instance_;
-PROTOBUF_CONSTEXPR UninterpretedOption_NamePart::UninterpretedOption_NamePart(
-    ::_pbi::ConstantInitialized): _impl_{
-    /*decltype(_impl_._has_bits_)*/{}
-  , /*decltype(_impl_._cached_size_)*/{}
-  , /*decltype(_impl_.name_part_)*/{&::_pbi::fixed_address_empty_string, ::_pbi::ConstantInitialized{}}
-  , /*decltype(_impl_.is_extension_)*/false} {}
-struct UninterpretedOption_NamePartDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR UninterpretedOption_NamePartDefaultTypeInternal()
-      : _instance(::_pbi::ConstantInitialized{}) {}
-  ~UninterpretedOption_NamePartDefaultTypeInternal() {}
-  union {
-    UninterpretedOption_NamePart _instance;
-  };
-};
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 UninterpretedOption_NamePartDefaultTypeInternal _UninterpretedOption_NamePart_default_instance_;
-PROTOBUF_CONSTEXPR UninterpretedOption::UninterpretedOption(
-    ::_pbi::ConstantInitialized): _impl_{
-    /*decltype(_impl_._has_bits_)*/{}
-  , /*decltype(_impl_._cached_size_)*/{}
-  , /*decltype(_impl_.name_)*/{}
-  , /*decltype(_impl_.identifier_value_)*/{&::_pbi::fixed_address_empty_string, ::_pbi::ConstantInitialized{}}
-  , /*decltype(_impl_.string_value_)*/{&::_pbi::fixed_address_empty_string, ::_pbi::ConstantInitialized{}}
-  , /*decltype(_impl_.aggregate_value_)*/{&::_pbi::fixed_address_empty_string, ::_pbi::ConstantInitialized{}}
-  , /*decltype(_impl_.positive_int_value_)*/uint64_t{0u}
-  , /*decltype(_impl_.negative_int_value_)*/int64_t{0}
-  , /*decltype(_impl_.double_value_)*/0} {}
-struct UninterpretedOptionDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR UninterpretedOptionDefaultTypeInternal()
-      : _instance(::_pbi::ConstantInitialized{}) {}
-  ~UninterpretedOptionDefaultTypeInternal() {}
-  union {
-    UninterpretedOption _instance;
-  };
-};
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 UninterpretedOptionDefaultTypeInternal _UninterpretedOption_default_instance_;
-PROTOBUF_CONSTEXPR SourceCodeInfo_Location::SourceCodeInfo_Location(
-    ::_pbi::ConstantInitialized): _impl_{
-    /*decltype(_impl_._has_bits_)*/{}
-  , /*decltype(_impl_._cached_size_)*/{}
-  , /*decltype(_impl_.path_)*/{}
-  , /*decltype(_impl_._path_cached_byte_size_)*/{0}
-  , /*decltype(_impl_.span_)*/{}
-  , /*decltype(_impl_._span_cached_byte_size_)*/{0}
-  , /*decltype(_impl_.leading_detached_comments_)*/{}
-  , /*decltype(_impl_.leading_comments_)*/{&::_pbi::fixed_address_empty_string, ::_pbi::ConstantInitialized{}}
-  , /*decltype(_impl_.trailing_comments_)*/{&::_pbi::fixed_address_empty_string, ::_pbi::ConstantInitialized{}}} {}
-struct SourceCodeInfo_LocationDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR SourceCodeInfo_LocationDefaultTypeInternal()
-      : _instance(::_pbi::ConstantInitialized{}) {}
-  ~SourceCodeInfo_LocationDefaultTypeInternal() {}
-  union {
-    SourceCodeInfo_Location _instance;
-  };
-};
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 SourceCodeInfo_LocationDefaultTypeInternal _SourceCodeInfo_Location_default_instance_;
-PROTOBUF_CONSTEXPR SourceCodeInfo::SourceCodeInfo(
-    ::_pbi::ConstantInitialized): _impl_{
-    /*decltype(_impl_.location_)*/{}
-  , /*decltype(_impl_._cached_size_)*/{}} {}
-struct SourceCodeInfoDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR SourceCodeInfoDefaultTypeInternal()
-      : _instance(::_pbi::ConstantInitialized{}) {}
-  ~SourceCodeInfoDefaultTypeInternal() {}
-  union {
-    SourceCodeInfo _instance;
-  };
-};
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 SourceCodeInfoDefaultTypeInternal _SourceCodeInfo_default_instance_;
-PROTOBUF_CONSTEXPR GeneratedCodeInfo_Annotation::GeneratedCodeInfo_Annotation(
-    ::_pbi::ConstantInitialized): _impl_{
-    /*decltype(_impl_._has_bits_)*/{}
-  , /*decltype(_impl_._cached_size_)*/{}
-  , /*decltype(_impl_.path_)*/{}
-  , /*decltype(_impl_._path_cached_byte_size_)*/{0}
-  , /*decltype(_impl_.source_file_)*/{&::_pbi::fixed_address_empty_string, ::_pbi::ConstantInitialized{}}
-  , /*decltype(_impl_.begin_)*/0
-  , /*decltype(_impl_.end_)*/0} {}
-struct GeneratedCodeInfo_AnnotationDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR GeneratedCodeInfo_AnnotationDefaultTypeInternal()
-      : _instance(::_pbi::ConstantInitialized{}) {}
-  ~GeneratedCodeInfo_AnnotationDefaultTypeInternal() {}
-  union {
-    GeneratedCodeInfo_Annotation _instance;
-  };
-};
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 GeneratedCodeInfo_AnnotationDefaultTypeInternal _GeneratedCodeInfo_Annotation_default_instance_;
-PROTOBUF_CONSTEXPR GeneratedCodeInfo::GeneratedCodeInfo(
-    ::_pbi::ConstantInitialized): _impl_{
-    /*decltype(_impl_.annotation_)*/{}
-  , /*decltype(_impl_._cached_size_)*/{}} {}
-struct GeneratedCodeInfoDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR GeneratedCodeInfoDefaultTypeInternal()
-      : _instance(::_pbi::ConstantInitialized{}) {}
-  ~GeneratedCodeInfoDefaultTypeInternal() {}
-  union {
-    GeneratedCodeInfo _instance;
-  };
-};
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 GeneratedCodeInfoDefaultTypeInternal _GeneratedCodeInfo_default_instance_;
-PROTOBUF_NAMESPACE_CLOSE
-static ::_pb::Metadata file_level_metadata_google_2fprotobuf_2fdescriptor_2eproto[27];
-static const ::_pb::EnumDescriptor* file_level_enum_descriptors_google_2fprotobuf_2fdescriptor_2eproto[6];
-static constexpr ::_pb::ServiceDescriptor const** file_level_service_descriptors_google_2fprotobuf_2fdescriptor_2eproto = nullptr;
-
-const uint32_t TableStruct_google_2fprotobuf_2fdescriptor_2eproto::offsets[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = {
-  ~0u,  // no _has_bits_
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::FileDescriptorSet, _internal_metadata_),
-  ~0u,  // no _extensions_
-  ~0u,  // no _oneof_case_
-  ~0u,  // no _weak_field_map_
-  ~0u,  // no _inlined_string_donated_
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::FileDescriptorSet, _impl_.file_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::FileDescriptorProto, _impl_._has_bits_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::FileDescriptorProto, _internal_metadata_),
-  ~0u,  // no _extensions_
-  ~0u,  // no _oneof_case_
-  ~0u,  // no _weak_field_map_
-  ~0u,  // no _inlined_string_donated_
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::FileDescriptorProto, _impl_.name_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::FileDescriptorProto, _impl_.package_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::FileDescriptorProto, _impl_.dependency_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::FileDescriptorProto, _impl_.public_dependency_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::FileDescriptorProto, _impl_.weak_dependency_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::FileDescriptorProto, _impl_.message_type_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::FileDescriptorProto, _impl_.enum_type_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::FileDescriptorProto, _impl_.service_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::FileDescriptorProto, _impl_.extension_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::FileDescriptorProto, _impl_.options_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::FileDescriptorProto, _impl_.source_code_info_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::FileDescriptorProto, _impl_.syntax_),
-  0,
-  1,
-  ~0u,
-  ~0u,
-  ~0u,
-  ~0u,
-  ~0u,
-  ~0u,
-  ~0u,
-  3,
-  4,
-  2,
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::DescriptorProto_ExtensionRange, _impl_._has_bits_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::DescriptorProto_ExtensionRange, _internal_metadata_),
-  ~0u,  // no _extensions_
-  ~0u,  // no _oneof_case_
-  ~0u,  // no _weak_field_map_
-  ~0u,  // no _inlined_string_donated_
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::DescriptorProto_ExtensionRange, _impl_.start_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::DescriptorProto_ExtensionRange, _impl_.end_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::DescriptorProto_ExtensionRange, _impl_.options_),
-  1,
-  2,
-  0,
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::DescriptorProto_ReservedRange, _impl_._has_bits_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::DescriptorProto_ReservedRange, _internal_metadata_),
-  ~0u,  // no _extensions_
-  ~0u,  // no _oneof_case_
-  ~0u,  // no _weak_field_map_
-  ~0u,  // no _inlined_string_donated_
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::DescriptorProto_ReservedRange, _impl_.start_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::DescriptorProto_ReservedRange, _impl_.end_),
-  0,
-  1,
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::DescriptorProto, _impl_._has_bits_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::DescriptorProto, _internal_metadata_),
-  ~0u,  // no _extensions_
-  ~0u,  // no _oneof_case_
-  ~0u,  // no _weak_field_map_
-  ~0u,  // no _inlined_string_donated_
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::DescriptorProto, _impl_.name_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::DescriptorProto, _impl_.field_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::DescriptorProto, _impl_.extension_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::DescriptorProto, _impl_.nested_type_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::DescriptorProto, _impl_.enum_type_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::DescriptorProto, _impl_.extension_range_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::DescriptorProto, _impl_.oneof_decl_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::DescriptorProto, _impl_.options_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::DescriptorProto, _impl_.reserved_range_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::DescriptorProto, _impl_.reserved_name_),
-  0,
-  ~0u,
-  ~0u,
-  ~0u,
-  ~0u,
-  ~0u,
-  ~0u,
-  1,
-  ~0u,
-  ~0u,
-  ~0u,  // no _has_bits_
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::ExtensionRangeOptions, _internal_metadata_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::ExtensionRangeOptions, _impl_._extensions_),
-  ~0u,  // no _oneof_case_
-  ~0u,  // no _weak_field_map_
-  ~0u,  // no _inlined_string_donated_
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::ExtensionRangeOptions, _impl_.uninterpreted_option_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::FieldDescriptorProto, _impl_._has_bits_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::FieldDescriptorProto, _internal_metadata_),
-  ~0u,  // no _extensions_
-  ~0u,  // no _oneof_case_
-  ~0u,  // no _weak_field_map_
-  ~0u,  // no _inlined_string_donated_
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::FieldDescriptorProto, _impl_.name_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::FieldDescriptorProto, _impl_.number_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::FieldDescriptorProto, _impl_.label_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::FieldDescriptorProto, _impl_.type_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::FieldDescriptorProto, _impl_.type_name_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::FieldDescriptorProto, _impl_.extendee_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::FieldDescriptorProto, _impl_.default_value_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::FieldDescriptorProto, _impl_.oneof_index_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::FieldDescriptorProto, _impl_.json_name_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::FieldDescriptorProto, _impl_.options_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::FieldDescriptorProto, _impl_.proto3_optional_),
-  0,
-  6,
-  9,
-  10,
-  2,
-  1,
-  3,
-  7,
-  4,
-  5,
-  8,
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::OneofDescriptorProto, _impl_._has_bits_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::OneofDescriptorProto, _internal_metadata_),
-  ~0u,  // no _extensions_
-  ~0u,  // no _oneof_case_
-  ~0u,  // no _weak_field_map_
-  ~0u,  // no _inlined_string_donated_
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::OneofDescriptorProto, _impl_.name_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::OneofDescriptorProto, _impl_.options_),
-  0,
-  1,
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::EnumDescriptorProto_EnumReservedRange, _impl_._has_bits_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::EnumDescriptorProto_EnumReservedRange, _internal_metadata_),
-  ~0u,  // no _extensions_
-  ~0u,  // no _oneof_case_
-  ~0u,  // no _weak_field_map_
-  ~0u,  // no _inlined_string_donated_
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::EnumDescriptorProto_EnumReservedRange, _impl_.start_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::EnumDescriptorProto_EnumReservedRange, _impl_.end_),
-  0,
-  1,
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::EnumDescriptorProto, _impl_._has_bits_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::EnumDescriptorProto, _internal_metadata_),
-  ~0u,  // no _extensions_
-  ~0u,  // no _oneof_case_
-  ~0u,  // no _weak_field_map_
-  ~0u,  // no _inlined_string_donated_
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::EnumDescriptorProto, _impl_.name_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::EnumDescriptorProto, _impl_.value_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::EnumDescriptorProto, _impl_.options_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::EnumDescriptorProto, _impl_.reserved_range_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::EnumDescriptorProto, _impl_.reserved_name_),
-  0,
-  ~0u,
-  1,
-  ~0u,
-  ~0u,
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::EnumValueDescriptorProto, _impl_._has_bits_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::EnumValueDescriptorProto, _internal_metadata_),
-  ~0u,  // no _extensions_
-  ~0u,  // no _oneof_case_
-  ~0u,  // no _weak_field_map_
-  ~0u,  // no _inlined_string_donated_
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::EnumValueDescriptorProto, _impl_.name_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::EnumValueDescriptorProto, _impl_.number_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::EnumValueDescriptorProto, _impl_.options_),
-  0,
-  2,
-  1,
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::ServiceDescriptorProto, _impl_._has_bits_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::ServiceDescriptorProto, _internal_metadata_),
-  ~0u,  // no _extensions_
-  ~0u,  // no _oneof_case_
-  ~0u,  // no _weak_field_map_
-  ~0u,  // no _inlined_string_donated_
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::ServiceDescriptorProto, _impl_.name_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::ServiceDescriptorProto, _impl_.method_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::ServiceDescriptorProto, _impl_.options_),
-  0,
-  ~0u,
-  1,
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::MethodDescriptorProto, _impl_._has_bits_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::MethodDescriptorProto, _internal_metadata_),
-  ~0u,  // no _extensions_
-  ~0u,  // no _oneof_case_
-  ~0u,  // no _weak_field_map_
-  ~0u,  // no _inlined_string_donated_
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::MethodDescriptorProto, _impl_.name_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::MethodDescriptorProto, _impl_.input_type_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::MethodDescriptorProto, _impl_.output_type_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::MethodDescriptorProto, _impl_.options_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::MethodDescriptorProto, _impl_.client_streaming_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::MethodDescriptorProto, _impl_.server_streaming_),
-  0,
-  1,
-  2,
-  3,
-  4,
-  5,
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::FileOptions, _impl_._has_bits_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::FileOptions, _internal_metadata_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::FileOptions, _impl_._extensions_),
-  ~0u,  // no _oneof_case_
-  ~0u,  // no _weak_field_map_
-  ~0u,  // no _inlined_string_donated_
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::FileOptions, _impl_.java_package_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::FileOptions, _impl_.java_outer_classname_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::FileOptions, _impl_.java_multiple_files_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::FileOptions, _impl_.java_generate_equals_and_hash_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::FileOptions, _impl_.java_string_check_utf8_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::FileOptions, _impl_.optimize_for_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::FileOptions, _impl_.go_package_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::FileOptions, _impl_.cc_generic_services_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::FileOptions, _impl_.java_generic_services_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::FileOptions, _impl_.py_generic_services_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::FileOptions, _impl_.php_generic_services_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::FileOptions, _impl_.deprecated_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::FileOptions, _impl_.cc_enable_arenas_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::FileOptions, _impl_.objc_class_prefix_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::FileOptions, _impl_.csharp_namespace_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::FileOptions, _impl_.swift_prefix_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::FileOptions, _impl_.php_class_prefix_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::FileOptions, _impl_.php_namespace_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::FileOptions, _impl_.php_metadata_namespace_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::FileOptions, _impl_.ruby_package_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::FileOptions, _impl_.uninterpreted_option_),
-  0,
-  1,
-  10,
-  11,
-  12,
-  18,
-  2,
-  13,
-  14,
-  15,
-  16,
-  17,
-  19,
-  3,
-  4,
-  5,
-  6,
-  7,
-  8,
-  9,
-  ~0u,
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::MessageOptions, _impl_._has_bits_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::MessageOptions, _internal_metadata_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::MessageOptions, _impl_._extensions_),
-  ~0u,  // no _oneof_case_
-  ~0u,  // no _weak_field_map_
-  ~0u,  // no _inlined_string_donated_
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::MessageOptions, _impl_.message_set_wire_format_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::MessageOptions, _impl_.no_standard_descriptor_accessor_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::MessageOptions, _impl_.deprecated_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::MessageOptions, _impl_.map_entry_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::MessageOptions, _impl_.uninterpreted_option_),
-  0,
-  1,
-  2,
-  3,
-  ~0u,
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::FieldOptions, _impl_._has_bits_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::FieldOptions, _internal_metadata_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::FieldOptions, _impl_._extensions_),
-  ~0u,  // no _oneof_case_
-  ~0u,  // no _weak_field_map_
-  ~0u,  // no _inlined_string_donated_
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::FieldOptions, _impl_.ctype_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::FieldOptions, _impl_.packed_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::FieldOptions, _impl_.jstype_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::FieldOptions, _impl_.lazy_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::FieldOptions, _impl_.unverified_lazy_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::FieldOptions, _impl_.deprecated_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::FieldOptions, _impl_.weak_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::FieldOptions, _impl_.uninterpreted_option_),
-  0,
-  2,
-  1,
-  3,
-  4,
-  5,
-  6,
-  ~0u,
-  ~0u,  // no _has_bits_
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::OneofOptions, _internal_metadata_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::OneofOptions, _impl_._extensions_),
-  ~0u,  // no _oneof_case_
-  ~0u,  // no _weak_field_map_
-  ~0u,  // no _inlined_string_donated_
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::OneofOptions, _impl_.uninterpreted_option_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::EnumOptions, _impl_._has_bits_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::EnumOptions, _internal_metadata_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::EnumOptions, _impl_._extensions_),
-  ~0u,  // no _oneof_case_
-  ~0u,  // no _weak_field_map_
-  ~0u,  // no _inlined_string_donated_
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::EnumOptions, _impl_.allow_alias_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::EnumOptions, _impl_.deprecated_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::EnumOptions, _impl_.uninterpreted_option_),
-  0,
-  1,
-  ~0u,
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::EnumValueOptions, _impl_._has_bits_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::EnumValueOptions, _internal_metadata_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::EnumValueOptions, _impl_._extensions_),
-  ~0u,  // no _oneof_case_
-  ~0u,  // no _weak_field_map_
-  ~0u,  // no _inlined_string_donated_
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::EnumValueOptions, _impl_.deprecated_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::EnumValueOptions, _impl_.uninterpreted_option_),
-  0,
-  ~0u,
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::ServiceOptions, _impl_._has_bits_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::ServiceOptions, _internal_metadata_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::ServiceOptions, _impl_._extensions_),
-  ~0u,  // no _oneof_case_
-  ~0u,  // no _weak_field_map_
-  ~0u,  // no _inlined_string_donated_
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::ServiceOptions, _impl_.deprecated_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::ServiceOptions, _impl_.uninterpreted_option_),
-  0,
-  ~0u,
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::MethodOptions, _impl_._has_bits_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::MethodOptions, _internal_metadata_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::MethodOptions, _impl_._extensions_),
-  ~0u,  // no _oneof_case_
-  ~0u,  // no _weak_field_map_
-  ~0u,  // no _inlined_string_donated_
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::MethodOptions, _impl_.deprecated_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::MethodOptions, _impl_.idempotency_level_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::MethodOptions, _impl_.uninterpreted_option_),
-  0,
-  1,
-  ~0u,
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::UninterpretedOption_NamePart, _impl_._has_bits_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::UninterpretedOption_NamePart, _internal_metadata_),
-  ~0u,  // no _extensions_
-  ~0u,  // no _oneof_case_
-  ~0u,  // no _weak_field_map_
-  ~0u,  // no _inlined_string_donated_
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::UninterpretedOption_NamePart, _impl_.name_part_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::UninterpretedOption_NamePart, _impl_.is_extension_),
-  0,
-  1,
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::UninterpretedOption, _impl_._has_bits_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::UninterpretedOption, _internal_metadata_),
-  ~0u,  // no _extensions_
-  ~0u,  // no _oneof_case_
-  ~0u,  // no _weak_field_map_
-  ~0u,  // no _inlined_string_donated_
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::UninterpretedOption, _impl_.name_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::UninterpretedOption, _impl_.identifier_value_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::UninterpretedOption, _impl_.positive_int_value_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::UninterpretedOption, _impl_.negative_int_value_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::UninterpretedOption, _impl_.double_value_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::UninterpretedOption, _impl_.string_value_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::UninterpretedOption, _impl_.aggregate_value_),
-  ~0u,
-  0,
-  3,
-  4,
-  5,
-  1,
-  2,
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::SourceCodeInfo_Location, _impl_._has_bits_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::SourceCodeInfo_Location, _internal_metadata_),
-  ~0u,  // no _extensions_
-  ~0u,  // no _oneof_case_
-  ~0u,  // no _weak_field_map_
-  ~0u,  // no _inlined_string_donated_
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::SourceCodeInfo_Location, _impl_.path_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::SourceCodeInfo_Location, _impl_.span_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::SourceCodeInfo_Location, _impl_.leading_comments_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::SourceCodeInfo_Location, _impl_.trailing_comments_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::SourceCodeInfo_Location, _impl_.leading_detached_comments_),
-  ~0u,
-  ~0u,
-  0,
-  1,
-  ~0u,
-  ~0u,  // no _has_bits_
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::SourceCodeInfo, _internal_metadata_),
-  ~0u,  // no _extensions_
-  ~0u,  // no _oneof_case_
-  ~0u,  // no _weak_field_map_
-  ~0u,  // no _inlined_string_donated_
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::SourceCodeInfo, _impl_.location_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::GeneratedCodeInfo_Annotation, _impl_._has_bits_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::GeneratedCodeInfo_Annotation, _internal_metadata_),
-  ~0u,  // no _extensions_
-  ~0u,  // no _oneof_case_
-  ~0u,  // no _weak_field_map_
-  ~0u,  // no _inlined_string_donated_
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::GeneratedCodeInfo_Annotation, _impl_.path_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::GeneratedCodeInfo_Annotation, _impl_.source_file_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::GeneratedCodeInfo_Annotation, _impl_.begin_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::GeneratedCodeInfo_Annotation, _impl_.end_),
-  ~0u,
-  0,
-  1,
-  2,
-  ~0u,  // no _has_bits_
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::GeneratedCodeInfo, _internal_metadata_),
-  ~0u,  // no _extensions_
-  ~0u,  // no _oneof_case_
-  ~0u,  // no _weak_field_map_
-  ~0u,  // no _inlined_string_donated_
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::GeneratedCodeInfo, _impl_.annotation_),
-};
-static const ::_pbi::MigrationSchema schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = {
-  { 0, -1, -1, sizeof(::PROTOBUF_NAMESPACE_ID::FileDescriptorSet)},
-  { 7, 25, -1, sizeof(::PROTOBUF_NAMESPACE_ID::FileDescriptorProto)},
-  { 37, 46, -1, sizeof(::PROTOBUF_NAMESPACE_ID::DescriptorProto_ExtensionRange)},
-  { 49, 57, -1, sizeof(::PROTOBUF_NAMESPACE_ID::DescriptorProto_ReservedRange)},
-  { 59, 75, -1, sizeof(::PROTOBUF_NAMESPACE_ID::DescriptorProto)},
-  { 85, -1, -1, sizeof(::PROTOBUF_NAMESPACE_ID::ExtensionRangeOptions)},
-  { 92, 109, -1, sizeof(::PROTOBUF_NAMESPACE_ID::FieldDescriptorProto)},
-  { 120, 128, -1, sizeof(::PROTOBUF_NAMESPACE_ID::OneofDescriptorProto)},
-  { 130, 138, -1, sizeof(::PROTOBUF_NAMESPACE_ID::EnumDescriptorProto_EnumReservedRange)},
-  { 140, 151, -1, sizeof(::PROTOBUF_NAMESPACE_ID::EnumDescriptorProto)},
-  { 156, 165, -1, sizeof(::PROTOBUF_NAMESPACE_ID::EnumValueDescriptorProto)},
-  { 168, 177, -1, sizeof(::PROTOBUF_NAMESPACE_ID::ServiceDescriptorProto)},
-  { 180, 192, -1, sizeof(::PROTOBUF_NAMESPACE_ID::MethodDescriptorProto)},
-  { 198, 225, -1, sizeof(::PROTOBUF_NAMESPACE_ID::FileOptions)},
-  { 246, 257, -1, sizeof(::PROTOBUF_NAMESPACE_ID::MessageOptions)},
-  { 262, 276, -1, sizeof(::PROTOBUF_NAMESPACE_ID::FieldOptions)},
-  { 284, -1, -1, sizeof(::PROTOBUF_NAMESPACE_ID::OneofOptions)},
-  { 291, 300, -1, sizeof(::PROTOBUF_NAMESPACE_ID::EnumOptions)},
-  { 303, 311, -1, sizeof(::PROTOBUF_NAMESPACE_ID::EnumValueOptions)},
-  { 313, 321, -1, sizeof(::PROTOBUF_NAMESPACE_ID::ServiceOptions)},
-  { 323, 332, -1, sizeof(::PROTOBUF_NAMESPACE_ID::MethodOptions)},
-  { 335, 343, -1, sizeof(::PROTOBUF_NAMESPACE_ID::UninterpretedOption_NamePart)},
-  { 345, 358, -1, sizeof(::PROTOBUF_NAMESPACE_ID::UninterpretedOption)},
-  { 365, 376, -1, sizeof(::PROTOBUF_NAMESPACE_ID::SourceCodeInfo_Location)},
-  { 381, -1, -1, sizeof(::PROTOBUF_NAMESPACE_ID::SourceCodeInfo)},
-  { 388, 398, -1, sizeof(::PROTOBUF_NAMESPACE_ID::GeneratedCodeInfo_Annotation)},
-  { 402, -1, -1, sizeof(::PROTOBUF_NAMESPACE_ID::GeneratedCodeInfo)},
-};
-
-static const ::_pb::Message* const file_default_instances[] = {
-  &::PROTOBUF_NAMESPACE_ID::_FileDescriptorSet_default_instance_._instance,
-  &::PROTOBUF_NAMESPACE_ID::_FileDescriptorProto_default_instance_._instance,
-  &::PROTOBUF_NAMESPACE_ID::_DescriptorProto_ExtensionRange_default_instance_._instance,
-  &::PROTOBUF_NAMESPACE_ID::_DescriptorProto_ReservedRange_default_instance_._instance,
-  &::PROTOBUF_NAMESPACE_ID::_DescriptorProto_default_instance_._instance,
-  &::PROTOBUF_NAMESPACE_ID::_ExtensionRangeOptions_default_instance_._instance,
-  &::PROTOBUF_NAMESPACE_ID::_FieldDescriptorProto_default_instance_._instance,
-  &::PROTOBUF_NAMESPACE_ID::_OneofDescriptorProto_default_instance_._instance,
-  &::PROTOBUF_NAMESPACE_ID::_EnumDescriptorProto_EnumReservedRange_default_instance_._instance,
-  &::PROTOBUF_NAMESPACE_ID::_EnumDescriptorProto_default_instance_._instance,
-  &::PROTOBUF_NAMESPACE_ID::_EnumValueDescriptorProto_default_instance_._instance,
-  &::PROTOBUF_NAMESPACE_ID::_ServiceDescriptorProto_default_instance_._instance,
-  &::PROTOBUF_NAMESPACE_ID::_MethodDescriptorProto_default_instance_._instance,
-  &::PROTOBUF_NAMESPACE_ID::_FileOptions_default_instance_._instance,
-  &::PROTOBUF_NAMESPACE_ID::_MessageOptions_default_instance_._instance,
-  &::PROTOBUF_NAMESPACE_ID::_FieldOptions_default_instance_._instance,
-  &::PROTOBUF_NAMESPACE_ID::_OneofOptions_default_instance_._instance,
-  &::PROTOBUF_NAMESPACE_ID::_EnumOptions_default_instance_._instance,
-  &::PROTOBUF_NAMESPACE_ID::_EnumValueOptions_default_instance_._instance,
-  &::PROTOBUF_NAMESPACE_ID::_ServiceOptions_default_instance_._instance,
-  &::PROTOBUF_NAMESPACE_ID::_MethodOptions_default_instance_._instance,
-  &::PROTOBUF_NAMESPACE_ID::_UninterpretedOption_NamePart_default_instance_._instance,
-  &::PROTOBUF_NAMESPACE_ID::_UninterpretedOption_default_instance_._instance,
-  &::PROTOBUF_NAMESPACE_ID::_SourceCodeInfo_Location_default_instance_._instance,
-  &::PROTOBUF_NAMESPACE_ID::_SourceCodeInfo_default_instance_._instance,
-  &::PROTOBUF_NAMESPACE_ID::_GeneratedCodeInfo_Annotation_default_instance_._instance,
-  &::PROTOBUF_NAMESPACE_ID::_GeneratedCodeInfo_default_instance_._instance,
-};
-
-const char descriptor_table_protodef_google_2fprotobuf_2fdescriptor_2eproto[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) =
-  "\n google/protobuf/descriptor.proto\022\017goog"
-  "le.protobuf\"G\n\021FileDescriptorSet\0222\n\004file"
-  "\030\001 \003(\0132$.google.protobuf.FileDescriptorP"
-  "roto\"\333\003\n\023FileDescriptorProto\022\014\n\004name\030\001 \001"
-  "(\t\022\017\n\007package\030\002 \001(\t\022\022\n\ndependency\030\003 \003(\t\022"
-  "\031\n\021public_dependency\030\n \003(\005\022\027\n\017weak_depen"
-  "dency\030\013 \003(\005\0226\n\014message_type\030\004 \003(\0132 .goog"
-  "le.protobuf.DescriptorProto\0227\n\tenum_type"
-  "\030\005 \003(\0132$.google.protobuf.EnumDescriptorP"
-  "roto\0228\n\007service\030\006 \003(\0132\'.google.protobuf."
-  "ServiceDescriptorProto\0228\n\textension\030\007 \003("
-  "\0132%.google.protobuf.FieldDescriptorProto"
-  "\022-\n\007options\030\010 \001(\0132\034.google.protobuf.File"
-  "Options\0229\n\020source_code_info\030\t \001(\0132\037.goog"
-  "le.protobuf.SourceCodeInfo\022\016\n\006syntax\030\014 \001"
-  "(\t\"\251\005\n\017DescriptorProto\022\014\n\004name\030\001 \001(\t\0224\n\005"
-  "field\030\002 \003(\0132%.google.protobuf.FieldDescr"
-  "iptorProto\0228\n\textension\030\006 \003(\0132%.google.p"
-  "rotobuf.FieldDescriptorProto\0225\n\013nested_t"
-  "ype\030\003 \003(\0132 .google.protobuf.DescriptorPr"
-  "oto\0227\n\tenum_type\030\004 \003(\0132$.google.protobuf"
-  ".EnumDescriptorProto\022H\n\017extension_range\030"
-  "\005 \003(\0132/.google.protobuf.DescriptorProto."
-  "ExtensionRange\0229\n\noneof_decl\030\010 \003(\0132%.goo"
-  "gle.protobuf.OneofDescriptorProto\0220\n\007opt"
-  "ions\030\007 \001(\0132\037.google.protobuf.MessageOpti"
-  "ons\022F\n\016reserved_range\030\t \003(\0132..google.pro"
-  "tobuf.DescriptorProto.ReservedRange\022\025\n\rr"
-  "eserved_name\030\n \003(\t\032e\n\016ExtensionRange\022\r\n\005"
-  "start\030\001 \001(\005\022\013\n\003end\030\002 \001(\005\0227\n\007options\030\003 \001("
-  "\0132&.google.protobuf.ExtensionRangeOption"
-  "s\032+\n\rReservedRange\022\r\n\005start\030\001 \001(\005\022\013\n\003end"
-  "\030\002 \001(\005\"g\n\025ExtensionRangeOptions\022C\n\024unint"
-  "erpreted_option\030\347\007 \003(\0132$.google.protobuf"
-  ".UninterpretedOption*\t\010\350\007\020\200\200\200\200\002\"\325\005\n\024Fiel"
-  "dDescriptorProto\022\014\n\004name\030\001 \001(\t\022\016\n\006number"
-  "\030\003 \001(\005\022:\n\005label\030\004 \001(\0162+.google.protobuf."
-  "FieldDescriptorProto.Label\0228\n\004type\030\005 \001(\016"
-  "2*.google.protobuf.FieldDescriptorProto."
-  "Type\022\021\n\ttype_name\030\006 \001(\t\022\020\n\010extendee\030\002 \001("
-  "\t\022\025\n\rdefault_value\030\007 \001(\t\022\023\n\013oneof_index\030"
-  "\t \001(\005\022\021\n\tjson_name\030\n \001(\t\022.\n\007options\030\010 \001("
-  "\0132\035.google.protobuf.FieldOptions\022\027\n\017prot"
-  "o3_optional\030\021 \001(\010\"\266\002\n\004Type\022\017\n\013TYPE_DOUBL"
-  "E\020\001\022\016\n\nTYPE_FLOAT\020\002\022\016\n\nTYPE_INT64\020\003\022\017\n\013T"
-  "YPE_UINT64\020\004\022\016\n\nTYPE_INT32\020\005\022\020\n\014TYPE_FIX"
-  "ED64\020\006\022\020\n\014TYPE_FIXED32\020\007\022\r\n\tTYPE_BOOL\020\010\022"
-  "\017\n\013TYPE_STRING\020\t\022\016\n\nTYPE_GROUP\020\n\022\020\n\014TYPE"
-  "_MESSAGE\020\013\022\016\n\nTYPE_BYTES\020\014\022\017\n\013TYPE_UINT3"
-  "2\020\r\022\r\n\tTYPE_ENUM\020\016\022\021\n\rTYPE_SFIXED32\020\017\022\021\n"
-  "\rTYPE_SFIXED64\020\020\022\017\n\013TYPE_SINT32\020\021\022\017\n\013TYP"
-  "E_SINT64\020\022\"C\n\005Label\022\022\n\016LABEL_OPTIONAL\020\001\022"
-  "\022\n\016LABEL_REQUIRED\020\002\022\022\n\016LABEL_REPEATED\020\003\""
-  "T\n\024OneofDescriptorProto\022\014\n\004name\030\001 \001(\t\022.\n"
-  "\007options\030\002 \001(\0132\035.google.protobuf.OneofOp"
-  "tions\"\244\002\n\023EnumDescriptorProto\022\014\n\004name\030\001 "
-  "\001(\t\0228\n\005value\030\002 \003(\0132).google.protobuf.Enu"
-  "mValueDescriptorProto\022-\n\007options\030\003 \001(\0132\034"
-  ".google.protobuf.EnumOptions\022N\n\016reserved"
-  "_range\030\004 \003(\01326.google.protobuf.EnumDescr"
-  "iptorProto.EnumReservedRange\022\025\n\rreserved"
-  "_name\030\005 \003(\t\032/\n\021EnumReservedRange\022\r\n\005star"
-  "t\030\001 \001(\005\022\013\n\003end\030\002 \001(\005\"l\n\030EnumValueDescrip"
-  "torProto\022\014\n\004name\030\001 \001(\t\022\016\n\006number\030\002 \001(\005\0222"
-  "\n\007options\030\003 \001(\0132!.google.protobuf.EnumVa"
-  "lueOptions\"\220\001\n\026ServiceDescriptorProto\022\014\n"
-  "\004name\030\001 \001(\t\0226\n\006method\030\002 \003(\0132&.google.pro"
-  "tobuf.MethodDescriptorProto\0220\n\007options\030\003"
-  " \001(\0132\037.google.protobuf.ServiceOptions\"\301\001"
-  "\n\025MethodDescriptorProto\022\014\n\004name\030\001 \001(\t\022\022\n"
-  "\ninput_type\030\002 \001(\t\022\023\n\013output_type\030\003 \001(\t\022/"
-  "\n\007options\030\004 \001(\0132\036.google.protobuf.Method"
-  "Options\022\037\n\020client_streaming\030\005 \001(\010:\005false"
-  "\022\037\n\020server_streaming\030\006 \001(\010:\005false\"\245\006\n\013Fi"
-  "leOptions\022\024\n\014java_package\030\001 \001(\t\022\034\n\024java_"
-  "outer_classname\030\010 \001(\t\022\"\n\023java_multiple_f"
-  "iles\030\n \001(\010:\005false\022)\n\035java_generate_equal"
-  "s_and_hash\030\024 \001(\010B\002\030\001\022%\n\026java_string_chec"
-  "k_utf8\030\033 \001(\010:\005false\022F\n\014optimize_for\030\t \001("
-  "\0162).google.protobuf.FileOptions.Optimize"
-  "Mode:\005SPEED\022\022\n\ngo_package\030\013 \001(\t\022\"\n\023cc_ge"
-  "neric_services\030\020 \001(\010:\005false\022$\n\025java_gene"
-  "ric_services\030\021 \001(\010:\005false\022\"\n\023py_generic_"
-  "services\030\022 \001(\010:\005false\022#\n\024php_generic_ser"
-  "vices\030* \001(\010:\005false\022\031\n\ndeprecated\030\027 \001(\010:\005"
-  "false\022\036\n\020cc_enable_arenas\030\037 \001(\010:\004true\022\031\n"
-  "\021objc_class_prefix\030$ \001(\t\022\030\n\020csharp_names"
-  "pace\030% \001(\t\022\024\n\014swift_prefix\030\' \001(\t\022\030\n\020php_"
-  "class_prefix\030( \001(\t\022\025\n\rphp_namespace\030) \001("
-  "\t\022\036\n\026php_metadata_namespace\030, \001(\t\022\024\n\014rub"
-  "y_package\030- \001(\t\022C\n\024uninterpreted_option\030"
-  "\347\007 \003(\0132$.google.protobuf.UninterpretedOp"
-  "tion\":\n\014OptimizeMode\022\t\n\005SPEED\020\001\022\r\n\tCODE_"
-  "SIZE\020\002\022\020\n\014LITE_RUNTIME\020\003*\t\010\350\007\020\200\200\200\200\002J\004\010&\020"
-  "\'\"\204\002\n\016MessageOptions\022&\n\027message_set_wire"
-  "_format\030\001 \001(\010:\005false\022.\n\037no_standard_desc"
-  "riptor_accessor\030\002 \001(\010:\005false\022\031\n\ndeprecat"
-  "ed\030\003 \001(\010:\005false\022\021\n\tmap_entry\030\007 \001(\010\022C\n\024un"
-  "interpreted_option\030\347\007 \003(\0132$.google.proto"
-  "buf.UninterpretedOption*\t\010\350\007\020\200\200\200\200\002J\004\010\004\020\005"
-  "J\004\010\005\020\006J\004\010\006\020\007J\004\010\010\020\tJ\004\010\t\020\n\"\276\003\n\014FieldOption"
-  "s\022:\n\005ctype\030\001 \001(\0162#.google.protobuf.Field"
-  "Options.CType:\006STRING\022\016\n\006packed\030\002 \001(\010\022\?\n"
-  "\006jstype\030\006 \001(\0162$.google.protobuf.FieldOpt"
-  "ions.JSType:\tJS_NORMAL\022\023\n\004lazy\030\005 \001(\010:\005fa"
-  "lse\022\036\n\017unverified_lazy\030\017 \001(\010:\005false\022\031\n\nd"
-  "eprecated\030\003 \001(\010:\005false\022\023\n\004weak\030\n \001(\010:\005fa"
-  "lse\022C\n\024uninterpreted_option\030\347\007 \003(\0132$.goo"
-  "gle.protobuf.UninterpretedOption\"/\n\005CTyp"
-  "e\022\n\n\006STRING\020\000\022\010\n\004CORD\020\001\022\020\n\014STRING_PIECE\020"
-  "\002\"5\n\006JSType\022\r\n\tJS_NORMAL\020\000\022\r\n\tJS_STRING\020"
-  "\001\022\r\n\tJS_NUMBER\020\002*\t\010\350\007\020\200\200\200\200\002J\004\010\004\020\005\"^\n\014One"
-  "ofOptions\022C\n\024uninterpreted_option\030\347\007 \003(\013"
-  "2$.google.protobuf.UninterpretedOption*\t"
-  "\010\350\007\020\200\200\200\200\002\"\223\001\n\013EnumOptions\022\023\n\013allow_alias"
-  "\030\002 \001(\010\022\031\n\ndeprecated\030\003 \001(\010:\005false\022C\n\024uni"
-  "nterpreted_option\030\347\007 \003(\0132$.google.protob"
-  "uf.UninterpretedOption*\t\010\350\007\020\200\200\200\200\002J\004\010\005\020\006\""
-  "}\n\020EnumValueOptions\022\031\n\ndeprecated\030\001 \001(\010:"
-  "\005false\022C\n\024uninterpreted_option\030\347\007 \003(\0132$."
-  "google.protobuf.UninterpretedOption*\t\010\350\007"
-  "\020\200\200\200\200\002\"{\n\016ServiceOptions\022\031\n\ndeprecated\030!"
-  " \001(\010:\005false\022C\n\024uninterpreted_option\030\347\007 \003"
-  "(\0132$.google.protobuf.UninterpretedOption"
-  "*\t\010\350\007\020\200\200\200\200\002\"\255\002\n\rMethodOptions\022\031\n\ndepreca"
-  "ted\030! \001(\010:\005false\022_\n\021idempotency_level\030\" "
-  "\001(\0162/.google.protobuf.MethodOptions.Idem"
-  "potencyLevel:\023IDEMPOTENCY_UNKNOWN\022C\n\024uni"
-  "nterpreted_option\030\347\007 \003(\0132$.google.protob"
-  "uf.UninterpretedOption\"P\n\020IdempotencyLev"
-  "el\022\027\n\023IDEMPOTENCY_UNKNOWN\020\000\022\023\n\017NO_SIDE_E"
-  "FFECTS\020\001\022\016\n\nIDEMPOTENT\020\002*\t\010\350\007\020\200\200\200\200\002\"\236\002\n\023"
-  "UninterpretedOption\022;\n\004name\030\002 \003(\0132-.goog"
-  "le.protobuf.UninterpretedOption.NamePart"
-  "\022\030\n\020identifier_value\030\003 \001(\t\022\032\n\022positive_i"
-  "nt_value\030\004 \001(\004\022\032\n\022negative_int_value\030\005 \001"
-  "(\003\022\024\n\014double_value\030\006 \001(\001\022\024\n\014string_value"
-  "\030\007 \001(\014\022\027\n\017aggregate_value\030\010 \001(\t\0323\n\010NameP"
-  "art\022\021\n\tname_part\030\001 \002(\t\022\024\n\014is_extension\030\002"
-  " \002(\010\"\325\001\n\016SourceCodeInfo\022:\n\010location\030\001 \003("
-  "\0132(.google.protobuf.SourceCodeInfo.Locat"
-  "ion\032\206\001\n\010Location\022\020\n\004path\030\001 \003(\005B\002\020\001\022\020\n\004sp"
-  "an\030\002 \003(\005B\002\020\001\022\030\n\020leading_comments\030\003 \001(\t\022\031"
-  "\n\021trailing_comments\030\004 \001(\t\022!\n\031leading_det"
-  "ached_comments\030\006 \003(\t\"\247\001\n\021GeneratedCodeIn"
-  "fo\022A\n\nannotation\030\001 \003(\0132-.google.protobuf"
-  ".GeneratedCodeInfo.Annotation\032O\n\nAnnotat"
-  "ion\022\020\n\004path\030\001 \003(\005B\002\020\001\022\023\n\013source_file\030\002 \001"
-  "(\t\022\r\n\005begin\030\003 \001(\005\022\013\n\003end\030\004 \001(\005B~\n\023com.go"
-  "ogle.protobufB\020DescriptorProtosH\001Z-googl"
-  "e.golang.org/protobuf/types/descriptorpb"
-  "\370\001\001\242\002\003GPB\252\002\032Google.Protobuf.Reflection"
-  ;
-static ::_pbi::once_flag descriptor_table_google_2fprotobuf_2fdescriptor_2eproto_once;
-const ::_pbi::DescriptorTable descriptor_table_google_2fprotobuf_2fdescriptor_2eproto = {
-    false, false, 6078, descriptor_table_protodef_google_2fprotobuf_2fdescriptor_2eproto,
-    "google/protobuf/descriptor.proto",
-    &descriptor_table_google_2fprotobuf_2fdescriptor_2eproto_once, nullptr, 0, 27,
-    schemas, file_default_instances, TableStruct_google_2fprotobuf_2fdescriptor_2eproto::offsets,
-    file_level_metadata_google_2fprotobuf_2fdescriptor_2eproto, file_level_enum_descriptors_google_2fprotobuf_2fdescriptor_2eproto,
-    file_level_service_descriptors_google_2fprotobuf_2fdescriptor_2eproto,
-};
-PROTOBUF_ATTRIBUTE_WEAK const ::_pbi::DescriptorTable* descriptor_table_google_2fprotobuf_2fdescriptor_2eproto_getter() {
-  return &descriptor_table_google_2fprotobuf_2fdescriptor_2eproto;
-}
-
-// Force running AddDescriptors() at dynamic initialization time.
-PROTOBUF_ATTRIBUTE_INIT_PRIORITY2 static ::_pbi::AddDescriptorsRunner dynamic_init_dummy_google_2fprotobuf_2fdescriptor_2eproto(&descriptor_table_google_2fprotobuf_2fdescriptor_2eproto);
-PROTOBUF_NAMESPACE_OPEN
-const ::PROTOBUF_NAMESPACE_ID::EnumDescriptor* FieldDescriptorProto_Type_descriptor() {
-  ::PROTOBUF_NAMESPACE_ID::internal::AssignDescriptors(&descriptor_table_google_2fprotobuf_2fdescriptor_2eproto);
-  return file_level_enum_descriptors_google_2fprotobuf_2fdescriptor_2eproto[0];
-}
-bool FieldDescriptorProto_Type_IsValid(int value) {
-  switch (value) {
-    case 1:
-    case 2:
-    case 3:
-    case 4:
-    case 5:
-    case 6:
-    case 7:
-    case 8:
-    case 9:
-    case 10:
-    case 11:
-    case 12:
-    case 13:
-    case 14:
-    case 15:
-    case 16:
-    case 17:
-    case 18:
-      return true;
-    default:
-      return false;
-  }
-}
-
-#if (__cplusplus < 201703) && (!defined(_MSC_VER) || (_MSC_VER >= 1900 && _MSC_VER < 1912))
-constexpr FieldDescriptorProto_Type FieldDescriptorProto::TYPE_DOUBLE;
-constexpr FieldDescriptorProto_Type FieldDescriptorProto::TYPE_FLOAT;
-constexpr FieldDescriptorProto_Type FieldDescriptorProto::TYPE_INT64;
-constexpr FieldDescriptorProto_Type FieldDescriptorProto::TYPE_UINT64;
-constexpr FieldDescriptorProto_Type FieldDescriptorProto::TYPE_INT32;
-constexpr FieldDescriptorProto_Type FieldDescriptorProto::TYPE_FIXED64;
-constexpr FieldDescriptorProto_Type FieldDescriptorProto::TYPE_FIXED32;
-constexpr FieldDescriptorProto_Type FieldDescriptorProto::TYPE_BOOL;
-constexpr FieldDescriptorProto_Type FieldDescriptorProto::TYPE_STRING;
-constexpr FieldDescriptorProto_Type FieldDescriptorProto::TYPE_GROUP;
-constexpr FieldDescriptorProto_Type FieldDescriptorProto::TYPE_MESSAGE;
-constexpr FieldDescriptorProto_Type FieldDescriptorProto::TYPE_BYTES;
-constexpr FieldDescriptorProto_Type FieldDescriptorProto::TYPE_UINT32;
-constexpr FieldDescriptorProto_Type FieldDescriptorProto::TYPE_ENUM;
-constexpr FieldDescriptorProto_Type FieldDescriptorProto::TYPE_SFIXED32;
-constexpr FieldDescriptorProto_Type FieldDescriptorProto::TYPE_SFIXED64;
-constexpr FieldDescriptorProto_Type FieldDescriptorProto::TYPE_SINT32;
-constexpr FieldDescriptorProto_Type FieldDescriptorProto::TYPE_SINT64;
-constexpr FieldDescriptorProto_Type FieldDescriptorProto::Type_MIN;
-constexpr FieldDescriptorProto_Type FieldDescriptorProto::Type_MAX;
-constexpr int FieldDescriptorProto::Type_ARRAYSIZE;
-#endif  // (__cplusplus < 201703) && (!defined(_MSC_VER) || (_MSC_VER >= 1900 && _MSC_VER < 1912))
-const ::PROTOBUF_NAMESPACE_ID::EnumDescriptor* FieldDescriptorProto_Label_descriptor() {
-  ::PROTOBUF_NAMESPACE_ID::internal::AssignDescriptors(&descriptor_table_google_2fprotobuf_2fdescriptor_2eproto);
-  return file_level_enum_descriptors_google_2fprotobuf_2fdescriptor_2eproto[1];
-}
-bool FieldDescriptorProto_Label_IsValid(int value) {
-  switch (value) {
-    case 1:
-    case 2:
-    case 3:
-      return true;
-    default:
-      return false;
-  }
-}
-
-#if (__cplusplus < 201703) && (!defined(_MSC_VER) || (_MSC_VER >= 1900 && _MSC_VER < 1912))
-constexpr FieldDescriptorProto_Label FieldDescriptorProto::LABEL_OPTIONAL;
-constexpr FieldDescriptorProto_Label FieldDescriptorProto::LABEL_REQUIRED;
-constexpr FieldDescriptorProto_Label FieldDescriptorProto::LABEL_REPEATED;
-constexpr FieldDescriptorProto_Label FieldDescriptorProto::Label_MIN;
-constexpr FieldDescriptorProto_Label FieldDescriptorProto::Label_MAX;
-constexpr int FieldDescriptorProto::Label_ARRAYSIZE;
-#endif  // (__cplusplus < 201703) && (!defined(_MSC_VER) || (_MSC_VER >= 1900 && _MSC_VER < 1912))
-const ::PROTOBUF_NAMESPACE_ID::EnumDescriptor* FileOptions_OptimizeMode_descriptor() {
-  ::PROTOBUF_NAMESPACE_ID::internal::AssignDescriptors(&descriptor_table_google_2fprotobuf_2fdescriptor_2eproto);
-  return file_level_enum_descriptors_google_2fprotobuf_2fdescriptor_2eproto[2];
-}
-bool FileOptions_OptimizeMode_IsValid(int value) {
-  switch (value) {
-    case 1:
-    case 2:
-    case 3:
-      return true;
-    default:
-      return false;
-  }
-}
-
-#if (__cplusplus < 201703) && (!defined(_MSC_VER) || (_MSC_VER >= 1900 && _MSC_VER < 1912))
-constexpr FileOptions_OptimizeMode FileOptions::SPEED;
-constexpr FileOptions_OptimizeMode FileOptions::CODE_SIZE;
-constexpr FileOptions_OptimizeMode FileOptions::LITE_RUNTIME;
-constexpr FileOptions_OptimizeMode FileOptions::OptimizeMode_MIN;
-constexpr FileOptions_OptimizeMode FileOptions::OptimizeMode_MAX;
-constexpr int FileOptions::OptimizeMode_ARRAYSIZE;
-#endif  // (__cplusplus < 201703) && (!defined(_MSC_VER) || (_MSC_VER >= 1900 && _MSC_VER < 1912))
-const ::PROTOBUF_NAMESPACE_ID::EnumDescriptor* FieldOptions_CType_descriptor() {
-  ::PROTOBUF_NAMESPACE_ID::internal::AssignDescriptors(&descriptor_table_google_2fprotobuf_2fdescriptor_2eproto);
-  return file_level_enum_descriptors_google_2fprotobuf_2fdescriptor_2eproto[3];
-}
-bool FieldOptions_CType_IsValid(int value) {
-  switch (value) {
-    case 0:
-    case 1:
-    case 2:
-      return true;
-    default:
-      return false;
-  }
-}
-
-#if (__cplusplus < 201703) && (!defined(_MSC_VER) || (_MSC_VER >= 1900 && _MSC_VER < 1912))
-constexpr FieldOptions_CType FieldOptions::STRING;
-constexpr FieldOptions_CType FieldOptions::CORD;
-constexpr FieldOptions_CType FieldOptions::STRING_PIECE;
-constexpr FieldOptions_CType FieldOptions::CType_MIN;
-constexpr FieldOptions_CType FieldOptions::CType_MAX;
-constexpr int FieldOptions::CType_ARRAYSIZE;
-#endif  // (__cplusplus < 201703) && (!defined(_MSC_VER) || (_MSC_VER >= 1900 && _MSC_VER < 1912))
-const ::PROTOBUF_NAMESPACE_ID::EnumDescriptor* FieldOptions_JSType_descriptor() {
-  ::PROTOBUF_NAMESPACE_ID::internal::AssignDescriptors(&descriptor_table_google_2fprotobuf_2fdescriptor_2eproto);
-  return file_level_enum_descriptors_google_2fprotobuf_2fdescriptor_2eproto[4];
-}
-bool FieldOptions_JSType_IsValid(int value) {
-  switch (value) {
-    case 0:
-    case 1:
-    case 2:
-      return true;
-    default:
-      return false;
-  }
-}
-
-#if (__cplusplus < 201703) && (!defined(_MSC_VER) || (_MSC_VER >= 1900 && _MSC_VER < 1912))
-constexpr FieldOptions_JSType FieldOptions::JS_NORMAL;
-constexpr FieldOptions_JSType FieldOptions::JS_STRING;
-constexpr FieldOptions_JSType FieldOptions::JS_NUMBER;
-constexpr FieldOptions_JSType FieldOptions::JSType_MIN;
-constexpr FieldOptions_JSType FieldOptions::JSType_MAX;
-constexpr int FieldOptions::JSType_ARRAYSIZE;
-#endif  // (__cplusplus < 201703) && (!defined(_MSC_VER) || (_MSC_VER >= 1900 && _MSC_VER < 1912))
-const ::PROTOBUF_NAMESPACE_ID::EnumDescriptor* MethodOptions_IdempotencyLevel_descriptor() {
-  ::PROTOBUF_NAMESPACE_ID::internal::AssignDescriptors(&descriptor_table_google_2fprotobuf_2fdescriptor_2eproto);
-  return file_level_enum_descriptors_google_2fprotobuf_2fdescriptor_2eproto[5];
-}
-bool MethodOptions_IdempotencyLevel_IsValid(int value) {
-  switch (value) {
-    case 0:
-    case 1:
-    case 2:
-      return true;
-    default:
-      return false;
-  }
-}
-
-#if (__cplusplus < 201703) && (!defined(_MSC_VER) || (_MSC_VER >= 1900 && _MSC_VER < 1912))
-constexpr MethodOptions_IdempotencyLevel MethodOptions::IDEMPOTENCY_UNKNOWN;
-constexpr MethodOptions_IdempotencyLevel MethodOptions::NO_SIDE_EFFECTS;
-constexpr MethodOptions_IdempotencyLevel MethodOptions::IDEMPOTENT;
-constexpr MethodOptions_IdempotencyLevel MethodOptions::IdempotencyLevel_MIN;
-constexpr MethodOptions_IdempotencyLevel MethodOptions::IdempotencyLevel_MAX;
-constexpr int MethodOptions::IdempotencyLevel_ARRAYSIZE;
-#endif  // (__cplusplus < 201703) && (!defined(_MSC_VER) || (_MSC_VER >= 1900 && _MSC_VER < 1912))
-
-// ===================================================================
-
-class FileDescriptorSet::_Internal {
- public:
-};
-
-FileDescriptorSet::FileDescriptorSet(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                         bool is_message_owned)
-  : ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned) {
-  SharedCtor(arena, is_message_owned);
-  // @@protoc_insertion_point(arena_constructor:google.protobuf.FileDescriptorSet)
-}
-FileDescriptorSet::FileDescriptorSet(const FileDescriptorSet& from)
-  : ::PROTOBUF_NAMESPACE_ID::Message() {
-  FileDescriptorSet* const _this = this; (void)_this;
-  new (&_impl_) Impl_{
-      decltype(_impl_.file_){from._impl_.file_}
-    , /*decltype(_impl_._cached_size_)*/{}};
-
-  _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-  // @@protoc_insertion_point(copy_constructor:google.protobuf.FileDescriptorSet)
-}
-
-inline void FileDescriptorSet::SharedCtor(
-    ::_pb::Arena* arena, bool is_message_owned) {
-  (void)arena;
-  (void)is_message_owned;
-  new (&_impl_) Impl_{
-      decltype(_impl_.file_){arena}
-    , /*decltype(_impl_._cached_size_)*/{}
-  };
-}
-
-FileDescriptorSet::~FileDescriptorSet() {
-  // @@protoc_insertion_point(destructor:google.protobuf.FileDescriptorSet)
-  if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) {
-  (void)arena;
-    return;
-  }
-  SharedDtor();
-}
-
-inline void FileDescriptorSet::SharedDtor() {
-  GOOGLE_DCHECK(GetArenaForAllocation() == nullptr);
-  _impl_.file_.~RepeatedPtrField();
-}
-
-void FileDescriptorSet::SetCachedSize(int size) const {
-  _impl_._cached_size_.Set(size);
-}
-
-void FileDescriptorSet::Clear() {
-// @@protoc_insertion_point(message_clear_start:google.protobuf.FileDescriptorSet)
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.file_.Clear();
-  _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>();
-}
-
-const char* FileDescriptorSet::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) {
-#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure
-  while (!ctx->Done(&ptr)) {
-    uint32_t tag;
-    ptr = ::_pbi::ReadTag(ptr, &tag);
-    switch (tag >> 3) {
-      // repeated .google.protobuf.FileDescriptorProto file = 1;
-      case 1:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 10)) {
-          ptr -= 1;
-          do {
-            ptr += 1;
-            ptr = ctx->ParseMessage(_internal_add_file(), ptr);
-            CHK_(ptr);
-            if (!ctx->DataAvailable(ptr)) break;
-          } while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<10>(ptr));
-        } else
-          goto handle_unusual;
-        continue;
-      default:
-        goto handle_unusual;
-    }  // switch
-  handle_unusual:
-    if ((tag == 0) || ((tag & 7) == 4)) {
-      CHK_(ptr);
-      ctx->SetLastTag(tag);
-      goto message_done;
-    }
-    ptr = UnknownFieldParse(
-        tag,
-        _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(),
-        ptr, ctx);
-    CHK_(ptr != nullptr);
-  }  // while
-message_done:
-  return ptr;
-failure:
-  ptr = nullptr;
-  goto message_done;
-#undef CHK_
-}
-
-uint8_t* FileDescriptorSet::_InternalSerialize(
-    uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.FileDescriptorSet)
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  // repeated .google.protobuf.FileDescriptorProto file = 1;
-  for (unsigned i = 0,
-      n = static_cast<unsigned>(this->_internal_file_size()); i < n; i++) {
-    const auto& repfield = this->_internal_file(i);
-    target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
-        InternalWriteMessage(1, repfield, repfield.GetCachedSize(), target, stream);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-        _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.FileDescriptorSet)
-  return target;
-}
-
-size_t FileDescriptorSet::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:google.protobuf.FileDescriptorSet)
-  size_t total_size = 0;
-
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // repeated .google.protobuf.FileDescriptorProto file = 1;
-  total_size += 1UL * this->_internal_file_size();
-  for (const auto& msg : this->_impl_.file_) {
-    total_size +=
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(msg);
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData FileDescriptorSet::_class_data_ = {
-    ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck,
-    FileDescriptorSet::MergeImpl
-};
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*FileDescriptorSet::GetClassData() const { return &_class_data_; }
-
-
-void FileDescriptorSet::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) {
-  auto* const _this = static_cast<FileDescriptorSet*>(&to_msg);
-  auto& from = static_cast<const FileDescriptorSet&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.FileDescriptorSet)
-  GOOGLE_DCHECK_NE(&from, _this);
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  _this->_impl_.file_.MergeFrom(from._impl_.file_);
-  _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void FileDescriptorSet::CopyFrom(const FileDescriptorSet& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.FileDescriptorSet)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool FileDescriptorSet::IsInitialized() const {
-  if (!::PROTOBUF_NAMESPACE_ID::internal::AllAreInitialized(_impl_.file_))
-    return false;
-  return true;
-}
-
-void FileDescriptorSet::InternalSwap(FileDescriptorSet* other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  _impl_.file_.InternalSwap(&other->_impl_.file_);
-}
-
-::PROTOBUF_NAMESPACE_ID::Metadata FileDescriptorSet::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_google_2fprotobuf_2fdescriptor_2eproto_getter, &descriptor_table_google_2fprotobuf_2fdescriptor_2eproto_once,
-      file_level_metadata_google_2fprotobuf_2fdescriptor_2eproto[0]);
-}
-
-// ===================================================================
-
-class FileDescriptorProto::_Internal {
- public:
-  using HasBits = decltype(std::declval<FileDescriptorProto>()._impl_._has_bits_);
-  static void set_has_name(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-  static void set_has_package(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::FileOptions& options(const FileDescriptorProto* msg);
-  static void set_has_options(HasBits* has_bits) {
-    (*has_bits)[0] |= 8u;
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::SourceCodeInfo& source_code_info(const FileDescriptorProto* msg);
-  static void set_has_source_code_info(HasBits* has_bits) {
-    (*has_bits)[0] |= 16u;
-  }
-  static void set_has_syntax(HasBits* has_bits) {
-    (*has_bits)[0] |= 4u;
-  }
-};
-
-const ::PROTOBUF_NAMESPACE_ID::FileOptions&
-FileDescriptorProto::_Internal::options(const FileDescriptorProto* msg) {
-  return *msg->_impl_.options_;
-}
-const ::PROTOBUF_NAMESPACE_ID::SourceCodeInfo&
-FileDescriptorProto::_Internal::source_code_info(const FileDescriptorProto* msg) {
-  return *msg->_impl_.source_code_info_;
-}
-FileDescriptorProto::FileDescriptorProto(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                         bool is_message_owned)
-  : ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned) {
-  SharedCtor(arena, is_message_owned);
-  // @@protoc_insertion_point(arena_constructor:google.protobuf.FileDescriptorProto)
-}
-FileDescriptorProto::FileDescriptorProto(const FileDescriptorProto& from)
-  : ::PROTOBUF_NAMESPACE_ID::Message() {
-  FileDescriptorProto* const _this = this; (void)_this;
-  new (&_impl_) Impl_{
-      decltype(_impl_._has_bits_){from._impl_._has_bits_}
-    , /*decltype(_impl_._cached_size_)*/{}
-    , decltype(_impl_.dependency_){from._impl_.dependency_}
-    , decltype(_impl_.message_type_){from._impl_.message_type_}
-    , decltype(_impl_.enum_type_){from._impl_.enum_type_}
-    , decltype(_impl_.service_){from._impl_.service_}
-    , decltype(_impl_.extension_){from._impl_.extension_}
-    , decltype(_impl_.public_dependency_){from._impl_.public_dependency_}
-    , decltype(_impl_.weak_dependency_){from._impl_.weak_dependency_}
-    , decltype(_impl_.name_){}
-    , decltype(_impl_.package_){}
-    , decltype(_impl_.syntax_){}
-    , decltype(_impl_.options_){nullptr}
-    , decltype(_impl_.source_code_info_){nullptr}};
-
-  _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-  _impl_.name_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.name_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (from._internal_has_name()) {
-    _this->_impl_.name_.Set(from._internal_name(), 
-      _this->GetArenaForAllocation());
-  }
-  _impl_.package_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.package_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (from._internal_has_package()) {
-    _this->_impl_.package_.Set(from._internal_package(), 
-      _this->GetArenaForAllocation());
-  }
-  _impl_.syntax_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.syntax_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (from._internal_has_syntax()) {
-    _this->_impl_.syntax_.Set(from._internal_syntax(), 
-      _this->GetArenaForAllocation());
-  }
-  if (from._internal_has_options()) {
-    _this->_impl_.options_ = new ::PROTOBUF_NAMESPACE_ID::FileOptions(*from._impl_.options_);
-  }
-  if (from._internal_has_source_code_info()) {
-    _this->_impl_.source_code_info_ = new ::PROTOBUF_NAMESPACE_ID::SourceCodeInfo(*from._impl_.source_code_info_);
-  }
-  // @@protoc_insertion_point(copy_constructor:google.protobuf.FileDescriptorProto)
-}
-
-inline void FileDescriptorProto::SharedCtor(
-    ::_pb::Arena* arena, bool is_message_owned) {
-  (void)arena;
-  (void)is_message_owned;
-  new (&_impl_) Impl_{
-      decltype(_impl_._has_bits_){}
-    , /*decltype(_impl_._cached_size_)*/{}
-    , decltype(_impl_.dependency_){arena}
-    , decltype(_impl_.message_type_){arena}
-    , decltype(_impl_.enum_type_){arena}
-    , decltype(_impl_.service_){arena}
-    , decltype(_impl_.extension_){arena}
-    , decltype(_impl_.public_dependency_){arena}
-    , decltype(_impl_.weak_dependency_){arena}
-    , decltype(_impl_.name_){}
-    , decltype(_impl_.package_){}
-    , decltype(_impl_.syntax_){}
-    , decltype(_impl_.options_){nullptr}
-    , decltype(_impl_.source_code_info_){nullptr}
-  };
-  _impl_.name_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.name_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  _impl_.package_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.package_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  _impl_.syntax_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.syntax_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-}
-
-FileDescriptorProto::~FileDescriptorProto() {
-  // @@protoc_insertion_point(destructor:google.protobuf.FileDescriptorProto)
-  if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) {
-  (void)arena;
-    return;
-  }
-  SharedDtor();
-}
-
-inline void FileDescriptorProto::SharedDtor() {
-  GOOGLE_DCHECK(GetArenaForAllocation() == nullptr);
-  _impl_.dependency_.~RepeatedPtrField();
-  _impl_.message_type_.~RepeatedPtrField();
-  _impl_.enum_type_.~RepeatedPtrField();
-  _impl_.service_.~RepeatedPtrField();
-  _impl_.extension_.~RepeatedPtrField();
-  _impl_.public_dependency_.~RepeatedField();
-  _impl_.weak_dependency_.~RepeatedField();
-  _impl_.name_.Destroy();
-  _impl_.package_.Destroy();
-  _impl_.syntax_.Destroy();
-  if (this != internal_default_instance()) delete _impl_.options_;
-  if (this != internal_default_instance()) delete _impl_.source_code_info_;
-}
-
-void FileDescriptorProto::SetCachedSize(int size) const {
-  _impl_._cached_size_.Set(size);
-}
-
-void FileDescriptorProto::Clear() {
-// @@protoc_insertion_point(message_clear_start:google.protobuf.FileDescriptorProto)
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.dependency_.Clear();
-  _impl_.message_type_.Clear();
-  _impl_.enum_type_.Clear();
-  _impl_.service_.Clear();
-  _impl_.extension_.Clear();
-  _impl_.public_dependency_.Clear();
-  _impl_.weak_dependency_.Clear();
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x0000001fu) {
-    if (cached_has_bits & 0x00000001u) {
-      _impl_.name_.ClearNonDefaultToEmpty();
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _impl_.package_.ClearNonDefaultToEmpty();
-    }
-    if (cached_has_bits & 0x00000004u) {
-      _impl_.syntax_.ClearNonDefaultToEmpty();
-    }
-    if (cached_has_bits & 0x00000008u) {
-      GOOGLE_DCHECK(_impl_.options_ != nullptr);
-      _impl_.options_->Clear();
-    }
-    if (cached_has_bits & 0x00000010u) {
-      GOOGLE_DCHECK(_impl_.source_code_info_ != nullptr);
-      _impl_.source_code_info_->Clear();
-    }
-  }
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>();
-}
-
-const char* FileDescriptorProto::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) {
-#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure
-  _Internal::HasBits has_bits{};
-  while (!ctx->Done(&ptr)) {
-    uint32_t tag;
-    ptr = ::_pbi::ReadTag(ptr, &tag);
-    switch (tag >> 3) {
-      // optional string name = 1;
-      case 1:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 10)) {
-          auto str = _internal_mutable_name();
-          ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx);
-          CHK_(ptr);
-          #ifndef NDEBUG
-          ::_pbi::VerifyUTF8(str, "google.protobuf.FileDescriptorProto.name");
-          #endif  // !NDEBUG
-        } else
-          goto handle_unusual;
-        continue;
-      // optional string package = 2;
-      case 2:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 18)) {
-          auto str = _internal_mutable_package();
-          ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx);
-          CHK_(ptr);
-          #ifndef NDEBUG
-          ::_pbi::VerifyUTF8(str, "google.protobuf.FileDescriptorProto.package");
-          #endif  // !NDEBUG
-        } else
-          goto handle_unusual;
-        continue;
-      // repeated string dependency = 3;
-      case 3:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 26)) {
-          ptr -= 1;
-          do {
-            ptr += 1;
-            auto str = _internal_add_dependency();
-            ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx);
-            CHK_(ptr);
-            #ifndef NDEBUG
-            ::_pbi::VerifyUTF8(str, "google.protobuf.FileDescriptorProto.dependency");
-            #endif  // !NDEBUG
-            if (!ctx->DataAvailable(ptr)) break;
-          } while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<26>(ptr));
-        } else
-          goto handle_unusual;
-        continue;
-      // repeated .google.protobuf.DescriptorProto message_type = 4;
-      case 4:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 34)) {
-          ptr -= 1;
-          do {
-            ptr += 1;
-            ptr = ctx->ParseMessage(_internal_add_message_type(), ptr);
-            CHK_(ptr);
-            if (!ctx->DataAvailable(ptr)) break;
-          } while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<34>(ptr));
-        } else
-          goto handle_unusual;
-        continue;
-      // repeated .google.protobuf.EnumDescriptorProto enum_type = 5;
-      case 5:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 42)) {
-          ptr -= 1;
-          do {
-            ptr += 1;
-            ptr = ctx->ParseMessage(_internal_add_enum_type(), ptr);
-            CHK_(ptr);
-            if (!ctx->DataAvailable(ptr)) break;
-          } while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<42>(ptr));
-        } else
-          goto handle_unusual;
-        continue;
-      // repeated .google.protobuf.ServiceDescriptorProto service = 6;
-      case 6:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 50)) {
-          ptr -= 1;
-          do {
-            ptr += 1;
-            ptr = ctx->ParseMessage(_internal_add_service(), ptr);
-            CHK_(ptr);
-            if (!ctx->DataAvailable(ptr)) break;
-          } while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<50>(ptr));
-        } else
-          goto handle_unusual;
-        continue;
-      // repeated .google.protobuf.FieldDescriptorProto extension = 7;
-      case 7:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 58)) {
-          ptr -= 1;
-          do {
-            ptr += 1;
-            ptr = ctx->ParseMessage(_internal_add_extension(), ptr);
-            CHK_(ptr);
-            if (!ctx->DataAvailable(ptr)) break;
-          } while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<58>(ptr));
-        } else
-          goto handle_unusual;
-        continue;
-      // optional .google.protobuf.FileOptions options = 8;
-      case 8:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 66)) {
-          ptr = ctx->ParseMessage(_internal_mutable_options(), ptr);
-          CHK_(ptr);
-        } else
-          goto handle_unusual;
-        continue;
-      // optional .google.protobuf.SourceCodeInfo source_code_info = 9;
-      case 9:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 74)) {
-          ptr = ctx->ParseMessage(_internal_mutable_source_code_info(), ptr);
-          CHK_(ptr);
-        } else
-          goto handle_unusual;
-        continue;
-      // repeated int32 public_dependency = 10;
-      case 10:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 80)) {
-          ptr -= 1;
-          do {
-            ptr += 1;
-            _internal_add_public_dependency(::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr));
-            CHK_(ptr);
-            if (!ctx->DataAvailable(ptr)) break;
-          } while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<80>(ptr));
-        } else if (static_cast<uint8_t>(tag) == 82) {
-          ptr = ::PROTOBUF_NAMESPACE_ID::internal::PackedInt32Parser(_internal_mutable_public_dependency(), ptr, ctx);
-          CHK_(ptr);
-        } else
-          goto handle_unusual;
-        continue;
-      // repeated int32 weak_dependency = 11;
-      case 11:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 88)) {
-          ptr -= 1;
-          do {
-            ptr += 1;
-            _internal_add_weak_dependency(::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr));
-            CHK_(ptr);
-            if (!ctx->DataAvailable(ptr)) break;
-          } while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<88>(ptr));
-        } else if (static_cast<uint8_t>(tag) == 90) {
-          ptr = ::PROTOBUF_NAMESPACE_ID::internal::PackedInt32Parser(_internal_mutable_weak_dependency(), ptr, ctx);
-          CHK_(ptr);
-        } else
-          goto handle_unusual;
-        continue;
-      // optional string syntax = 12;
-      case 12:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 98)) {
-          auto str = _internal_mutable_syntax();
-          ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx);
-          CHK_(ptr);
-          #ifndef NDEBUG
-          ::_pbi::VerifyUTF8(str, "google.protobuf.FileDescriptorProto.syntax");
-          #endif  // !NDEBUG
-        } else
-          goto handle_unusual;
-        continue;
-      default:
-        goto handle_unusual;
-    }  // switch
-  handle_unusual:
-    if ((tag == 0) || ((tag & 7) == 4)) {
-      CHK_(ptr);
-      ctx->SetLastTag(tag);
-      goto message_done;
-    }
-    ptr = UnknownFieldParse(
-        tag,
-        _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(),
-        ptr, ctx);
-    CHK_(ptr != nullptr);
-  }  // while
-message_done:
-  _impl_._has_bits_.Or(has_bits);
-  return ptr;
-failure:
-  ptr = nullptr;
-  goto message_done;
-#undef CHK_
-}
-
-uint8_t* FileDescriptorProto::_InternalSerialize(
-    uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.FileDescriptorProto)
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // optional string name = 1;
-  if (cached_has_bits & 0x00000001u) {
-    ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::VerifyUTF8StringNamedField(
-      this->_internal_name().data(), static_cast<int>(this->_internal_name().length()),
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::SERIALIZE,
-      "google.protobuf.FileDescriptorProto.name");
-    target = stream->WriteStringMaybeAliased(
-        1, this->_internal_name(), target);
-  }
-
-  // optional string package = 2;
-  if (cached_has_bits & 0x00000002u) {
-    ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::VerifyUTF8StringNamedField(
-      this->_internal_package().data(), static_cast<int>(this->_internal_package().length()),
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::SERIALIZE,
-      "google.protobuf.FileDescriptorProto.package");
-    target = stream->WriteStringMaybeAliased(
-        2, this->_internal_package(), target);
-  }
-
-  // repeated string dependency = 3;
-  for (int i = 0, n = this->_internal_dependency_size(); i < n; i++) {
-    const auto& s = this->_internal_dependency(i);
-    ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::VerifyUTF8StringNamedField(
-      s.data(), static_cast<int>(s.length()),
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::SERIALIZE,
-      "google.protobuf.FileDescriptorProto.dependency");
-    target = stream->WriteString(3, s, target);
-  }
-
-  // repeated .google.protobuf.DescriptorProto message_type = 4;
-  for (unsigned i = 0,
-      n = static_cast<unsigned>(this->_internal_message_type_size()); i < n; i++) {
-    const auto& repfield = this->_internal_message_type(i);
-    target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
-        InternalWriteMessage(4, repfield, repfield.GetCachedSize(), target, stream);
-  }
-
-  // repeated .google.protobuf.EnumDescriptorProto enum_type = 5;
-  for (unsigned i = 0,
-      n = static_cast<unsigned>(this->_internal_enum_type_size()); i < n; i++) {
-    const auto& repfield = this->_internal_enum_type(i);
-    target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
-        InternalWriteMessage(5, repfield, repfield.GetCachedSize(), target, stream);
-  }
-
-  // repeated .google.protobuf.ServiceDescriptorProto service = 6;
-  for (unsigned i = 0,
-      n = static_cast<unsigned>(this->_internal_service_size()); i < n; i++) {
-    const auto& repfield = this->_internal_service(i);
-    target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
-        InternalWriteMessage(6, repfield, repfield.GetCachedSize(), target, stream);
-  }
-
-  // repeated .google.protobuf.FieldDescriptorProto extension = 7;
-  for (unsigned i = 0,
-      n = static_cast<unsigned>(this->_internal_extension_size()); i < n; i++) {
-    const auto& repfield = this->_internal_extension(i);
-    target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
-        InternalWriteMessage(7, repfield, repfield.GetCachedSize(), target, stream);
-  }
-
-  // optional .google.protobuf.FileOptions options = 8;
-  if (cached_has_bits & 0x00000008u) {
-    target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
-      InternalWriteMessage(8, _Internal::options(this),
-        _Internal::options(this).GetCachedSize(), target, stream);
-  }
-
-  // optional .google.protobuf.SourceCodeInfo source_code_info = 9;
-  if (cached_has_bits & 0x00000010u) {
-    target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
-      InternalWriteMessage(9, _Internal::source_code_info(this),
-        _Internal::source_code_info(this).GetCachedSize(), target, stream);
-  }
-
-  // repeated int32 public_dependency = 10;
-  for (int i = 0, n = this->_internal_public_dependency_size(); i < n; i++) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteInt32ToArray(10, this->_internal_public_dependency(i), target);
-  }
-
-  // repeated int32 weak_dependency = 11;
-  for (int i = 0, n = this->_internal_weak_dependency_size(); i < n; i++) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteInt32ToArray(11, this->_internal_weak_dependency(i), target);
-  }
-
-  // optional string syntax = 12;
-  if (cached_has_bits & 0x00000004u) {
-    ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::VerifyUTF8StringNamedField(
-      this->_internal_syntax().data(), static_cast<int>(this->_internal_syntax().length()),
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::SERIALIZE,
-      "google.protobuf.FileDescriptorProto.syntax");
-    target = stream->WriteStringMaybeAliased(
-        12, this->_internal_syntax(), target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-        _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.FileDescriptorProto)
-  return target;
-}
-
-size_t FileDescriptorProto::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:google.protobuf.FileDescriptorProto)
-  size_t total_size = 0;
-
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // repeated string dependency = 3;
-  total_size += 1 *
-      ::PROTOBUF_NAMESPACE_ID::internal::FromIntSize(_impl_.dependency_.size());
-  for (int i = 0, n = _impl_.dependency_.size(); i < n; i++) {
-    total_size += ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize(
-      _impl_.dependency_.Get(i));
-  }
-
-  // repeated .google.protobuf.DescriptorProto message_type = 4;
-  total_size += 1UL * this->_internal_message_type_size();
-  for (const auto& msg : this->_impl_.message_type_) {
-    total_size +=
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(msg);
-  }
-
-  // repeated .google.protobuf.EnumDescriptorProto enum_type = 5;
-  total_size += 1UL * this->_internal_enum_type_size();
-  for (const auto& msg : this->_impl_.enum_type_) {
-    total_size +=
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(msg);
-  }
-
-  // repeated .google.protobuf.ServiceDescriptorProto service = 6;
-  total_size += 1UL * this->_internal_service_size();
-  for (const auto& msg : this->_impl_.service_) {
-    total_size +=
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(msg);
-  }
-
-  // repeated .google.protobuf.FieldDescriptorProto extension = 7;
-  total_size += 1UL * this->_internal_extension_size();
-  for (const auto& msg : this->_impl_.extension_) {
-    total_size +=
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(msg);
-  }
-
-  // repeated int32 public_dependency = 10;
-  {
-    size_t data_size = ::_pbi::WireFormatLite::
-      Int32Size(this->_impl_.public_dependency_);
-    total_size += 1 *
-                  ::_pbi::FromIntSize(this->_internal_public_dependency_size());
-    total_size += data_size;
-  }
-
-  // repeated int32 weak_dependency = 11;
-  {
-    size_t data_size = ::_pbi::WireFormatLite::
-      Int32Size(this->_impl_.weak_dependency_);
-    total_size += 1 *
-                  ::_pbi::FromIntSize(this->_internal_weak_dependency_size());
-    total_size += data_size;
-  }
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x0000001fu) {
-    // optional string name = 1;
-    if (cached_has_bits & 0x00000001u) {
-      total_size += 1 +
-        ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize(
-          this->_internal_name());
-    }
-
-    // optional string package = 2;
-    if (cached_has_bits & 0x00000002u) {
-      total_size += 1 +
-        ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize(
-          this->_internal_package());
-    }
-
-    // optional string syntax = 12;
-    if (cached_has_bits & 0x00000004u) {
-      total_size += 1 +
-        ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize(
-          this->_internal_syntax());
-    }
-
-    // optional .google.protobuf.FileOptions options = 8;
-    if (cached_has_bits & 0x00000008u) {
-      total_size += 1 +
-        ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(
-          *_impl_.options_);
-    }
-
-    // optional .google.protobuf.SourceCodeInfo source_code_info = 9;
-    if (cached_has_bits & 0x00000010u) {
-      total_size += 1 +
-        ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(
-          *_impl_.source_code_info_);
-    }
-
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData FileDescriptorProto::_class_data_ = {
-    ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck,
-    FileDescriptorProto::MergeImpl
-};
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*FileDescriptorProto::GetClassData() const { return &_class_data_; }
-
-
-void FileDescriptorProto::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) {
-  auto* const _this = static_cast<FileDescriptorProto*>(&to_msg);
-  auto& from = static_cast<const FileDescriptorProto&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.FileDescriptorProto)
-  GOOGLE_DCHECK_NE(&from, _this);
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  _this->_impl_.dependency_.MergeFrom(from._impl_.dependency_);
-  _this->_impl_.message_type_.MergeFrom(from._impl_.message_type_);
-  _this->_impl_.enum_type_.MergeFrom(from._impl_.enum_type_);
-  _this->_impl_.service_.MergeFrom(from._impl_.service_);
-  _this->_impl_.extension_.MergeFrom(from._impl_.extension_);
-  _this->_impl_.public_dependency_.MergeFrom(from._impl_.public_dependency_);
-  _this->_impl_.weak_dependency_.MergeFrom(from._impl_.weak_dependency_);
-  cached_has_bits = from._impl_._has_bits_[0];
-  if (cached_has_bits & 0x0000001fu) {
-    if (cached_has_bits & 0x00000001u) {
-      _this->_internal_set_name(from._internal_name());
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _this->_internal_set_package(from._internal_package());
-    }
-    if (cached_has_bits & 0x00000004u) {
-      _this->_internal_set_syntax(from._internal_syntax());
-    }
-    if (cached_has_bits & 0x00000008u) {
-      _this->_internal_mutable_options()->::PROTOBUF_NAMESPACE_ID::FileOptions::MergeFrom(
-          from._internal_options());
-    }
-    if (cached_has_bits & 0x00000010u) {
-      _this->_internal_mutable_source_code_info()->::PROTOBUF_NAMESPACE_ID::SourceCodeInfo::MergeFrom(
-          from._internal_source_code_info());
-    }
-  }
-  _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void FileDescriptorProto::CopyFrom(const FileDescriptorProto& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.FileDescriptorProto)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool FileDescriptorProto::IsInitialized() const {
-  if (!::PROTOBUF_NAMESPACE_ID::internal::AllAreInitialized(_impl_.message_type_))
-    return false;
-  if (!::PROTOBUF_NAMESPACE_ID::internal::AllAreInitialized(_impl_.enum_type_))
-    return false;
-  if (!::PROTOBUF_NAMESPACE_ID::internal::AllAreInitialized(_impl_.service_))
-    return false;
-  if (!::PROTOBUF_NAMESPACE_ID::internal::AllAreInitialized(_impl_.extension_))
-    return false;
-  if (_internal_has_options()) {
-    if (!_impl_.options_->IsInitialized()) return false;
-  }
-  return true;
-}
-
-void FileDescriptorProto::InternalSwap(FileDescriptorProto* other) {
-  using std::swap;
-  auto* lhs_arena = GetArenaForAllocation();
-  auto* rhs_arena = other->GetArenaForAllocation();
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  _impl_.dependency_.InternalSwap(&other->_impl_.dependency_);
-  _impl_.message_type_.InternalSwap(&other->_impl_.message_type_);
-  _impl_.enum_type_.InternalSwap(&other->_impl_.enum_type_);
-  _impl_.service_.InternalSwap(&other->_impl_.service_);
-  _impl_.extension_.InternalSwap(&other->_impl_.extension_);
-  _impl_.public_dependency_.InternalSwap(&other->_impl_.public_dependency_);
-  _impl_.weak_dependency_.InternalSwap(&other->_impl_.weak_dependency_);
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::InternalSwap(
-      &_impl_.name_, lhs_arena,
-      &other->_impl_.name_, rhs_arena
-  );
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::InternalSwap(
-      &_impl_.package_, lhs_arena,
-      &other->_impl_.package_, rhs_arena
-  );
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::InternalSwap(
-      &_impl_.syntax_, lhs_arena,
-      &other->_impl_.syntax_, rhs_arena
-  );
-  ::PROTOBUF_NAMESPACE_ID::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(FileDescriptorProto, _impl_.source_code_info_)
-      + sizeof(FileDescriptorProto::_impl_.source_code_info_)
-      - PROTOBUF_FIELD_OFFSET(FileDescriptorProto, _impl_.options_)>(
-          reinterpret_cast<char*>(&_impl_.options_),
-          reinterpret_cast<char*>(&other->_impl_.options_));
-}
-
-::PROTOBUF_NAMESPACE_ID::Metadata FileDescriptorProto::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_google_2fprotobuf_2fdescriptor_2eproto_getter, &descriptor_table_google_2fprotobuf_2fdescriptor_2eproto_once,
-      file_level_metadata_google_2fprotobuf_2fdescriptor_2eproto[1]);
-}
-
-// ===================================================================
-
-class DescriptorProto_ExtensionRange::_Internal {
- public:
-  using HasBits = decltype(std::declval<DescriptorProto_ExtensionRange>()._impl_._has_bits_);
-  static void set_has_start(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
-  static void set_has_end(HasBits* has_bits) {
-    (*has_bits)[0] |= 4u;
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::ExtensionRangeOptions& options(const DescriptorProto_ExtensionRange* msg);
-  static void set_has_options(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-};
-
-const ::PROTOBUF_NAMESPACE_ID::ExtensionRangeOptions&
-DescriptorProto_ExtensionRange::_Internal::options(const DescriptorProto_ExtensionRange* msg) {
-  return *msg->_impl_.options_;
-}
-DescriptorProto_ExtensionRange::DescriptorProto_ExtensionRange(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                         bool is_message_owned)
-  : ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned) {
-  SharedCtor(arena, is_message_owned);
-  // @@protoc_insertion_point(arena_constructor:google.protobuf.DescriptorProto.ExtensionRange)
-}
-DescriptorProto_ExtensionRange::DescriptorProto_ExtensionRange(const DescriptorProto_ExtensionRange& from)
-  : ::PROTOBUF_NAMESPACE_ID::Message() {
-  DescriptorProto_ExtensionRange* const _this = this; (void)_this;
-  new (&_impl_) Impl_{
-      decltype(_impl_._has_bits_){from._impl_._has_bits_}
-    , /*decltype(_impl_._cached_size_)*/{}
-    , decltype(_impl_.options_){nullptr}
-    , decltype(_impl_.start_){}
-    , decltype(_impl_.end_){}};
-
-  _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-  if (from._internal_has_options()) {
-    _this->_impl_.options_ = new ::PROTOBUF_NAMESPACE_ID::ExtensionRangeOptions(*from._impl_.options_);
-  }
-  ::memcpy(&_impl_.start_, &from._impl_.start_,
-    static_cast<size_t>(reinterpret_cast<char*>(&_impl_.end_) -
-    reinterpret_cast<char*>(&_impl_.start_)) + sizeof(_impl_.end_));
-  // @@protoc_insertion_point(copy_constructor:google.protobuf.DescriptorProto.ExtensionRange)
-}
-
-inline void DescriptorProto_ExtensionRange::SharedCtor(
-    ::_pb::Arena* arena, bool is_message_owned) {
-  (void)arena;
-  (void)is_message_owned;
-  new (&_impl_) Impl_{
-      decltype(_impl_._has_bits_){}
-    , /*decltype(_impl_._cached_size_)*/{}
-    , decltype(_impl_.options_){nullptr}
-    , decltype(_impl_.start_){0}
-    , decltype(_impl_.end_){0}
-  };
-}
-
-DescriptorProto_ExtensionRange::~DescriptorProto_ExtensionRange() {
-  // @@protoc_insertion_point(destructor:google.protobuf.DescriptorProto.ExtensionRange)
-  if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) {
-  (void)arena;
-    return;
-  }
-  SharedDtor();
-}
-
-inline void DescriptorProto_ExtensionRange::SharedDtor() {
-  GOOGLE_DCHECK(GetArenaForAllocation() == nullptr);
-  if (this != internal_default_instance()) delete _impl_.options_;
-}
-
-void DescriptorProto_ExtensionRange::SetCachedSize(int size) const {
-  _impl_._cached_size_.Set(size);
-}
-
-void DescriptorProto_ExtensionRange::Clear() {
-// @@protoc_insertion_point(message_clear_start:google.protobuf.DescriptorProto.ExtensionRange)
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000001u) {
-    GOOGLE_DCHECK(_impl_.options_ != nullptr);
-    _impl_.options_->Clear();
-  }
-  if (cached_has_bits & 0x00000006u) {
-    ::memset(&_impl_.start_, 0, static_cast<size_t>(
-        reinterpret_cast<char*>(&_impl_.end_) -
-        reinterpret_cast<char*>(&_impl_.start_)) + sizeof(_impl_.end_));
-  }
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>();
-}
-
-const char* DescriptorProto_ExtensionRange::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) {
-#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure
-  _Internal::HasBits has_bits{};
-  while (!ctx->Done(&ptr)) {
-    uint32_t tag;
-    ptr = ::_pbi::ReadTag(ptr, &tag);
-    switch (tag >> 3) {
-      // optional int32 start = 1;
-      case 1:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 8)) {
-          _Internal::set_has_start(&has_bits);
-          _impl_.start_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr);
-          CHK_(ptr);
-        } else
-          goto handle_unusual;
-        continue;
-      // optional int32 end = 2;
-      case 2:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 16)) {
-          _Internal::set_has_end(&has_bits);
-          _impl_.end_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr);
-          CHK_(ptr);
-        } else
-          goto handle_unusual;
-        continue;
-      // optional .google.protobuf.ExtensionRangeOptions options = 3;
-      case 3:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 26)) {
-          ptr = ctx->ParseMessage(_internal_mutable_options(), ptr);
-          CHK_(ptr);
-        } else
-          goto handle_unusual;
-        continue;
-      default:
-        goto handle_unusual;
-    }  // switch
-  handle_unusual:
-    if ((tag == 0) || ((tag & 7) == 4)) {
-      CHK_(ptr);
-      ctx->SetLastTag(tag);
-      goto message_done;
-    }
-    ptr = UnknownFieldParse(
-        tag,
-        _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(),
-        ptr, ctx);
-    CHK_(ptr != nullptr);
-  }  // while
-message_done:
-  _impl_._has_bits_.Or(has_bits);
-  return ptr;
-failure:
-  ptr = nullptr;
-  goto message_done;
-#undef CHK_
-}
-
-uint8_t* DescriptorProto_ExtensionRange::_InternalSerialize(
-    uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.DescriptorProto.ExtensionRange)
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // optional int32 start = 1;
-  if (cached_has_bits & 0x00000002u) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteInt32ToArray(1, this->_internal_start(), target);
-  }
-
-  // optional int32 end = 2;
-  if (cached_has_bits & 0x00000004u) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteInt32ToArray(2, this->_internal_end(), target);
-  }
-
-  // optional .google.protobuf.ExtensionRangeOptions options = 3;
-  if (cached_has_bits & 0x00000001u) {
-    target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
-      InternalWriteMessage(3, _Internal::options(this),
-        _Internal::options(this).GetCachedSize(), target, stream);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-        _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.DescriptorProto.ExtensionRange)
-  return target;
-}
-
-size_t DescriptorProto_ExtensionRange::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:google.protobuf.DescriptorProto.ExtensionRange)
-  size_t total_size = 0;
-
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000007u) {
-    // optional .google.protobuf.ExtensionRangeOptions options = 3;
-    if (cached_has_bits & 0x00000001u) {
-      total_size += 1 +
-        ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(
-          *_impl_.options_);
-    }
-
-    // optional int32 start = 1;
-    if (cached_has_bits & 0x00000002u) {
-      total_size += ::_pbi::WireFormatLite::Int32SizePlusOne(this->_internal_start());
-    }
-
-    // optional int32 end = 2;
-    if (cached_has_bits & 0x00000004u) {
-      total_size += ::_pbi::WireFormatLite::Int32SizePlusOne(this->_internal_end());
-    }
-
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData DescriptorProto_ExtensionRange::_class_data_ = {
-    ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck,
-    DescriptorProto_ExtensionRange::MergeImpl
-};
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*DescriptorProto_ExtensionRange::GetClassData() const { return &_class_data_; }
-
-
-void DescriptorProto_ExtensionRange::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) {
-  auto* const _this = static_cast<DescriptorProto_ExtensionRange*>(&to_msg);
-  auto& from = static_cast<const DescriptorProto_ExtensionRange&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.DescriptorProto.ExtensionRange)
-  GOOGLE_DCHECK_NE(&from, _this);
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  cached_has_bits = from._impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000007u) {
-    if (cached_has_bits & 0x00000001u) {
-      _this->_internal_mutable_options()->::PROTOBUF_NAMESPACE_ID::ExtensionRangeOptions::MergeFrom(
-          from._internal_options());
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _this->_impl_.start_ = from._impl_.start_;
-    }
-    if (cached_has_bits & 0x00000004u) {
-      _this->_impl_.end_ = from._impl_.end_;
-    }
-    _this->_impl_._has_bits_[0] |= cached_has_bits;
-  }
-  _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void DescriptorProto_ExtensionRange::CopyFrom(const DescriptorProto_ExtensionRange& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.DescriptorProto.ExtensionRange)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool DescriptorProto_ExtensionRange::IsInitialized() const {
-  if (_internal_has_options()) {
-    if (!_impl_.options_->IsInitialized()) return false;
-  }
-  return true;
-}
-
-void DescriptorProto_ExtensionRange::InternalSwap(DescriptorProto_ExtensionRange* other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  ::PROTOBUF_NAMESPACE_ID::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(DescriptorProto_ExtensionRange, _impl_.end_)
-      + sizeof(DescriptorProto_ExtensionRange::_impl_.end_)
-      - PROTOBUF_FIELD_OFFSET(DescriptorProto_ExtensionRange, _impl_.options_)>(
-          reinterpret_cast<char*>(&_impl_.options_),
-          reinterpret_cast<char*>(&other->_impl_.options_));
-}
-
-::PROTOBUF_NAMESPACE_ID::Metadata DescriptorProto_ExtensionRange::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_google_2fprotobuf_2fdescriptor_2eproto_getter, &descriptor_table_google_2fprotobuf_2fdescriptor_2eproto_once,
-      file_level_metadata_google_2fprotobuf_2fdescriptor_2eproto[2]);
-}
-
-// ===================================================================
-
-class DescriptorProto_ReservedRange::_Internal {
- public:
-  using HasBits = decltype(std::declval<DescriptorProto_ReservedRange>()._impl_._has_bits_);
-  static void set_has_start(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-  static void set_has_end(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
-};
-
-DescriptorProto_ReservedRange::DescriptorProto_ReservedRange(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                         bool is_message_owned)
-  : ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned) {
-  SharedCtor(arena, is_message_owned);
-  // @@protoc_insertion_point(arena_constructor:google.protobuf.DescriptorProto.ReservedRange)
-}
-DescriptorProto_ReservedRange::DescriptorProto_ReservedRange(const DescriptorProto_ReservedRange& from)
-  : ::PROTOBUF_NAMESPACE_ID::Message() {
-  DescriptorProto_ReservedRange* const _this = this; (void)_this;
-  new (&_impl_) Impl_{
-      decltype(_impl_._has_bits_){from._impl_._has_bits_}
-    , /*decltype(_impl_._cached_size_)*/{}
-    , decltype(_impl_.start_){}
-    , decltype(_impl_.end_){}};
-
-  _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-  ::memcpy(&_impl_.start_, &from._impl_.start_,
-    static_cast<size_t>(reinterpret_cast<char*>(&_impl_.end_) -
-    reinterpret_cast<char*>(&_impl_.start_)) + sizeof(_impl_.end_));
-  // @@protoc_insertion_point(copy_constructor:google.protobuf.DescriptorProto.ReservedRange)
-}
-
-inline void DescriptorProto_ReservedRange::SharedCtor(
-    ::_pb::Arena* arena, bool is_message_owned) {
-  (void)arena;
-  (void)is_message_owned;
-  new (&_impl_) Impl_{
-      decltype(_impl_._has_bits_){}
-    , /*decltype(_impl_._cached_size_)*/{}
-    , decltype(_impl_.start_){0}
-    , decltype(_impl_.end_){0}
-  };
-}
-
-DescriptorProto_ReservedRange::~DescriptorProto_ReservedRange() {
-  // @@protoc_insertion_point(destructor:google.protobuf.DescriptorProto.ReservedRange)
-  if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) {
-  (void)arena;
-    return;
-  }
-  SharedDtor();
-}
-
-inline void DescriptorProto_ReservedRange::SharedDtor() {
-  GOOGLE_DCHECK(GetArenaForAllocation() == nullptr);
-}
-
-void DescriptorProto_ReservedRange::SetCachedSize(int size) const {
-  _impl_._cached_size_.Set(size);
-}
-
-void DescriptorProto_ReservedRange::Clear() {
-// @@protoc_insertion_point(message_clear_start:google.protobuf.DescriptorProto.ReservedRange)
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    ::memset(&_impl_.start_, 0, static_cast<size_t>(
-        reinterpret_cast<char*>(&_impl_.end_) -
-        reinterpret_cast<char*>(&_impl_.start_)) + sizeof(_impl_.end_));
-  }
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>();
-}
-
-const char* DescriptorProto_ReservedRange::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) {
-#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure
-  _Internal::HasBits has_bits{};
-  while (!ctx->Done(&ptr)) {
-    uint32_t tag;
-    ptr = ::_pbi::ReadTag(ptr, &tag);
-    switch (tag >> 3) {
-      // optional int32 start = 1;
-      case 1:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 8)) {
-          _Internal::set_has_start(&has_bits);
-          _impl_.start_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr);
-          CHK_(ptr);
-        } else
-          goto handle_unusual;
-        continue;
-      // optional int32 end = 2;
-      case 2:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 16)) {
-          _Internal::set_has_end(&has_bits);
-          _impl_.end_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr);
-          CHK_(ptr);
-        } else
-          goto handle_unusual;
-        continue;
-      default:
-        goto handle_unusual;
-    }  // switch
-  handle_unusual:
-    if ((tag == 0) || ((tag & 7) == 4)) {
-      CHK_(ptr);
-      ctx->SetLastTag(tag);
-      goto message_done;
-    }
-    ptr = UnknownFieldParse(
-        tag,
-        _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(),
-        ptr, ctx);
-    CHK_(ptr != nullptr);
-  }  // while
-message_done:
-  _impl_._has_bits_.Or(has_bits);
-  return ptr;
-failure:
-  ptr = nullptr;
-  goto message_done;
-#undef CHK_
-}
-
-uint8_t* DescriptorProto_ReservedRange::_InternalSerialize(
-    uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.DescriptorProto.ReservedRange)
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // optional int32 start = 1;
-  if (cached_has_bits & 0x00000001u) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteInt32ToArray(1, this->_internal_start(), target);
-  }
-
-  // optional int32 end = 2;
-  if (cached_has_bits & 0x00000002u) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteInt32ToArray(2, this->_internal_end(), target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-        _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.DescriptorProto.ReservedRange)
-  return target;
-}
-
-size_t DescriptorProto_ReservedRange::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:google.protobuf.DescriptorProto.ReservedRange)
-  size_t total_size = 0;
-
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    // optional int32 start = 1;
-    if (cached_has_bits & 0x00000001u) {
-      total_size += ::_pbi::WireFormatLite::Int32SizePlusOne(this->_internal_start());
-    }
-
-    // optional int32 end = 2;
-    if (cached_has_bits & 0x00000002u) {
-      total_size += ::_pbi::WireFormatLite::Int32SizePlusOne(this->_internal_end());
-    }
-
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData DescriptorProto_ReservedRange::_class_data_ = {
-    ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck,
-    DescriptorProto_ReservedRange::MergeImpl
-};
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*DescriptorProto_ReservedRange::GetClassData() const { return &_class_data_; }
-
-
-void DescriptorProto_ReservedRange::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) {
-  auto* const _this = static_cast<DescriptorProto_ReservedRange*>(&to_msg);
-  auto& from = static_cast<const DescriptorProto_ReservedRange&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.DescriptorProto.ReservedRange)
-  GOOGLE_DCHECK_NE(&from, _this);
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  cached_has_bits = from._impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      _this->_impl_.start_ = from._impl_.start_;
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _this->_impl_.end_ = from._impl_.end_;
-    }
-    _this->_impl_._has_bits_[0] |= cached_has_bits;
-  }
-  _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void DescriptorProto_ReservedRange::CopyFrom(const DescriptorProto_ReservedRange& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.DescriptorProto.ReservedRange)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool DescriptorProto_ReservedRange::IsInitialized() const {
-  return true;
-}
-
-void DescriptorProto_ReservedRange::InternalSwap(DescriptorProto_ReservedRange* other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  ::PROTOBUF_NAMESPACE_ID::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(DescriptorProto_ReservedRange, _impl_.end_)
-      + sizeof(DescriptorProto_ReservedRange::_impl_.end_)
-      - PROTOBUF_FIELD_OFFSET(DescriptorProto_ReservedRange, _impl_.start_)>(
-          reinterpret_cast<char*>(&_impl_.start_),
-          reinterpret_cast<char*>(&other->_impl_.start_));
-}
-
-::PROTOBUF_NAMESPACE_ID::Metadata DescriptorProto_ReservedRange::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_google_2fprotobuf_2fdescriptor_2eproto_getter, &descriptor_table_google_2fprotobuf_2fdescriptor_2eproto_once,
-      file_level_metadata_google_2fprotobuf_2fdescriptor_2eproto[3]);
-}
-
-// ===================================================================
-
-class DescriptorProto::_Internal {
- public:
-  using HasBits = decltype(std::declval<DescriptorProto>()._impl_._has_bits_);
-  static void set_has_name(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::MessageOptions& options(const DescriptorProto* msg);
-  static void set_has_options(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
-};
-
-const ::PROTOBUF_NAMESPACE_ID::MessageOptions&
-DescriptorProto::_Internal::options(const DescriptorProto* msg) {
-  return *msg->_impl_.options_;
-}
-DescriptorProto::DescriptorProto(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                         bool is_message_owned)
-  : ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned) {
-  SharedCtor(arena, is_message_owned);
-  // @@protoc_insertion_point(arena_constructor:google.protobuf.DescriptorProto)
-}
-DescriptorProto::DescriptorProto(const DescriptorProto& from)
-  : ::PROTOBUF_NAMESPACE_ID::Message() {
-  DescriptorProto* const _this = this; (void)_this;
-  new (&_impl_) Impl_{
-      decltype(_impl_._has_bits_){from._impl_._has_bits_}
-    , /*decltype(_impl_._cached_size_)*/{}
-    , decltype(_impl_.field_){from._impl_.field_}
-    , decltype(_impl_.nested_type_){from._impl_.nested_type_}
-    , decltype(_impl_.enum_type_){from._impl_.enum_type_}
-    , decltype(_impl_.extension_range_){from._impl_.extension_range_}
-    , decltype(_impl_.extension_){from._impl_.extension_}
-    , decltype(_impl_.oneof_decl_){from._impl_.oneof_decl_}
-    , decltype(_impl_.reserved_range_){from._impl_.reserved_range_}
-    , decltype(_impl_.reserved_name_){from._impl_.reserved_name_}
-    , decltype(_impl_.name_){}
-    , decltype(_impl_.options_){nullptr}};
-
-  _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-  _impl_.name_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.name_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (from._internal_has_name()) {
-    _this->_impl_.name_.Set(from._internal_name(), 
-      _this->GetArenaForAllocation());
-  }
-  if (from._internal_has_options()) {
-    _this->_impl_.options_ = new ::PROTOBUF_NAMESPACE_ID::MessageOptions(*from._impl_.options_);
-  }
-  // @@protoc_insertion_point(copy_constructor:google.protobuf.DescriptorProto)
-}
-
-inline void DescriptorProto::SharedCtor(
-    ::_pb::Arena* arena, bool is_message_owned) {
-  (void)arena;
-  (void)is_message_owned;
-  new (&_impl_) Impl_{
-      decltype(_impl_._has_bits_){}
-    , /*decltype(_impl_._cached_size_)*/{}
-    , decltype(_impl_.field_){arena}
-    , decltype(_impl_.nested_type_){arena}
-    , decltype(_impl_.enum_type_){arena}
-    , decltype(_impl_.extension_range_){arena}
-    , decltype(_impl_.extension_){arena}
-    , decltype(_impl_.oneof_decl_){arena}
-    , decltype(_impl_.reserved_range_){arena}
-    , decltype(_impl_.reserved_name_){arena}
-    , decltype(_impl_.name_){}
-    , decltype(_impl_.options_){nullptr}
-  };
-  _impl_.name_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.name_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-}
-
-DescriptorProto::~DescriptorProto() {
-  // @@protoc_insertion_point(destructor:google.protobuf.DescriptorProto)
-  if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) {
-  (void)arena;
-    return;
-  }
-  SharedDtor();
-}
-
-inline void DescriptorProto::SharedDtor() {
-  GOOGLE_DCHECK(GetArenaForAllocation() == nullptr);
-  _impl_.field_.~RepeatedPtrField();
-  _impl_.nested_type_.~RepeatedPtrField();
-  _impl_.enum_type_.~RepeatedPtrField();
-  _impl_.extension_range_.~RepeatedPtrField();
-  _impl_.extension_.~RepeatedPtrField();
-  _impl_.oneof_decl_.~RepeatedPtrField();
-  _impl_.reserved_range_.~RepeatedPtrField();
-  _impl_.reserved_name_.~RepeatedPtrField();
-  _impl_.name_.Destroy();
-  if (this != internal_default_instance()) delete _impl_.options_;
-}
-
-void DescriptorProto::SetCachedSize(int size) const {
-  _impl_._cached_size_.Set(size);
-}
-
-void DescriptorProto::Clear() {
-// @@protoc_insertion_point(message_clear_start:google.protobuf.DescriptorProto)
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.field_.Clear();
-  _impl_.nested_type_.Clear();
-  _impl_.enum_type_.Clear();
-  _impl_.extension_range_.Clear();
-  _impl_.extension_.Clear();
-  _impl_.oneof_decl_.Clear();
-  _impl_.reserved_range_.Clear();
-  _impl_.reserved_name_.Clear();
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      _impl_.name_.ClearNonDefaultToEmpty();
-    }
-    if (cached_has_bits & 0x00000002u) {
-      GOOGLE_DCHECK(_impl_.options_ != nullptr);
-      _impl_.options_->Clear();
-    }
-  }
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>();
-}
-
-const char* DescriptorProto::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) {
-#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure
-  _Internal::HasBits has_bits{};
-  while (!ctx->Done(&ptr)) {
-    uint32_t tag;
-    ptr = ::_pbi::ReadTag(ptr, &tag);
-    switch (tag >> 3) {
-      // optional string name = 1;
-      case 1:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 10)) {
-          auto str = _internal_mutable_name();
-          ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx);
-          CHK_(ptr);
-          #ifndef NDEBUG
-          ::_pbi::VerifyUTF8(str, "google.protobuf.DescriptorProto.name");
-          #endif  // !NDEBUG
-        } else
-          goto handle_unusual;
-        continue;
-      // repeated .google.protobuf.FieldDescriptorProto field = 2;
-      case 2:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 18)) {
-          ptr -= 1;
-          do {
-            ptr += 1;
-            ptr = ctx->ParseMessage(_internal_add_field(), ptr);
-            CHK_(ptr);
-            if (!ctx->DataAvailable(ptr)) break;
-          } while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<18>(ptr));
-        } else
-          goto handle_unusual;
-        continue;
-      // repeated .google.protobuf.DescriptorProto nested_type = 3;
-      case 3:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 26)) {
-          ptr -= 1;
-          do {
-            ptr += 1;
-            ptr = ctx->ParseMessage(_internal_add_nested_type(), ptr);
-            CHK_(ptr);
-            if (!ctx->DataAvailable(ptr)) break;
-          } while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<26>(ptr));
-        } else
-          goto handle_unusual;
-        continue;
-      // repeated .google.protobuf.EnumDescriptorProto enum_type = 4;
-      case 4:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 34)) {
-          ptr -= 1;
-          do {
-            ptr += 1;
-            ptr = ctx->ParseMessage(_internal_add_enum_type(), ptr);
-            CHK_(ptr);
-            if (!ctx->DataAvailable(ptr)) break;
-          } while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<34>(ptr));
-        } else
-          goto handle_unusual;
-        continue;
-      // repeated .google.protobuf.DescriptorProto.ExtensionRange extension_range = 5;
-      case 5:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 42)) {
-          ptr -= 1;
-          do {
-            ptr += 1;
-            ptr = ctx->ParseMessage(_internal_add_extension_range(), ptr);
-            CHK_(ptr);
-            if (!ctx->DataAvailable(ptr)) break;
-          } while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<42>(ptr));
-        } else
-          goto handle_unusual;
-        continue;
-      // repeated .google.protobuf.FieldDescriptorProto extension = 6;
-      case 6:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 50)) {
-          ptr -= 1;
-          do {
-            ptr += 1;
-            ptr = ctx->ParseMessage(_internal_add_extension(), ptr);
-            CHK_(ptr);
-            if (!ctx->DataAvailable(ptr)) break;
-          } while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<50>(ptr));
-        } else
-          goto handle_unusual;
-        continue;
-      // optional .google.protobuf.MessageOptions options = 7;
-      case 7:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 58)) {
-          ptr = ctx->ParseMessage(_internal_mutable_options(), ptr);
-          CHK_(ptr);
-        } else
-          goto handle_unusual;
-        continue;
-      // repeated .google.protobuf.OneofDescriptorProto oneof_decl = 8;
-      case 8:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 66)) {
-          ptr -= 1;
-          do {
-            ptr += 1;
-            ptr = ctx->ParseMessage(_internal_add_oneof_decl(), ptr);
-            CHK_(ptr);
-            if (!ctx->DataAvailable(ptr)) break;
-          } while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<66>(ptr));
-        } else
-          goto handle_unusual;
-        continue;
-      // repeated .google.protobuf.DescriptorProto.ReservedRange reserved_range = 9;
-      case 9:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 74)) {
-          ptr -= 1;
-          do {
-            ptr += 1;
-            ptr = ctx->ParseMessage(_internal_add_reserved_range(), ptr);
-            CHK_(ptr);
-            if (!ctx->DataAvailable(ptr)) break;
-          } while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<74>(ptr));
-        } else
-          goto handle_unusual;
-        continue;
-      // repeated string reserved_name = 10;
-      case 10:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 82)) {
-          ptr -= 1;
-          do {
-            ptr += 1;
-            auto str = _internal_add_reserved_name();
-            ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx);
-            CHK_(ptr);
-            #ifndef NDEBUG
-            ::_pbi::VerifyUTF8(str, "google.protobuf.DescriptorProto.reserved_name");
-            #endif  // !NDEBUG
-            if (!ctx->DataAvailable(ptr)) break;
-          } while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<82>(ptr));
-        } else
-          goto handle_unusual;
-        continue;
-      default:
-        goto handle_unusual;
-    }  // switch
-  handle_unusual:
-    if ((tag == 0) || ((tag & 7) == 4)) {
-      CHK_(ptr);
-      ctx->SetLastTag(tag);
-      goto message_done;
-    }
-    ptr = UnknownFieldParse(
-        tag,
-        _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(),
-        ptr, ctx);
-    CHK_(ptr != nullptr);
-  }  // while
-message_done:
-  _impl_._has_bits_.Or(has_bits);
-  return ptr;
-failure:
-  ptr = nullptr;
-  goto message_done;
-#undef CHK_
-}
-
-uint8_t* DescriptorProto::_InternalSerialize(
-    uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.DescriptorProto)
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // optional string name = 1;
-  if (cached_has_bits & 0x00000001u) {
-    ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::VerifyUTF8StringNamedField(
-      this->_internal_name().data(), static_cast<int>(this->_internal_name().length()),
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::SERIALIZE,
-      "google.protobuf.DescriptorProto.name");
-    target = stream->WriteStringMaybeAliased(
-        1, this->_internal_name(), target);
-  }
-
-  // repeated .google.protobuf.FieldDescriptorProto field = 2;
-  for (unsigned i = 0,
-      n = static_cast<unsigned>(this->_internal_field_size()); i < n; i++) {
-    const auto& repfield = this->_internal_field(i);
-    target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
-        InternalWriteMessage(2, repfield, repfield.GetCachedSize(), target, stream);
-  }
-
-  // repeated .google.protobuf.DescriptorProto nested_type = 3;
-  for (unsigned i = 0,
-      n = static_cast<unsigned>(this->_internal_nested_type_size()); i < n; i++) {
-    const auto& repfield = this->_internal_nested_type(i);
-    target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
-        InternalWriteMessage(3, repfield, repfield.GetCachedSize(), target, stream);
-  }
-
-  // repeated .google.protobuf.EnumDescriptorProto enum_type = 4;
-  for (unsigned i = 0,
-      n = static_cast<unsigned>(this->_internal_enum_type_size()); i < n; i++) {
-    const auto& repfield = this->_internal_enum_type(i);
-    target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
-        InternalWriteMessage(4, repfield, repfield.GetCachedSize(), target, stream);
-  }
-
-  // repeated .google.protobuf.DescriptorProto.ExtensionRange extension_range = 5;
-  for (unsigned i = 0,
-      n = static_cast<unsigned>(this->_internal_extension_range_size()); i < n; i++) {
-    const auto& repfield = this->_internal_extension_range(i);
-    target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
-        InternalWriteMessage(5, repfield, repfield.GetCachedSize(), target, stream);
-  }
-
-  // repeated .google.protobuf.FieldDescriptorProto extension = 6;
-  for (unsigned i = 0,
-      n = static_cast<unsigned>(this->_internal_extension_size()); i < n; i++) {
-    const auto& repfield = this->_internal_extension(i);
-    target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
-        InternalWriteMessage(6, repfield, repfield.GetCachedSize(), target, stream);
-  }
-
-  // optional .google.protobuf.MessageOptions options = 7;
-  if (cached_has_bits & 0x00000002u) {
-    target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
-      InternalWriteMessage(7, _Internal::options(this),
-        _Internal::options(this).GetCachedSize(), target, stream);
-  }
-
-  // repeated .google.protobuf.OneofDescriptorProto oneof_decl = 8;
-  for (unsigned i = 0,
-      n = static_cast<unsigned>(this->_internal_oneof_decl_size()); i < n; i++) {
-    const auto& repfield = this->_internal_oneof_decl(i);
-    target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
-        InternalWriteMessage(8, repfield, repfield.GetCachedSize(), target, stream);
-  }
-
-  // repeated .google.protobuf.DescriptorProto.ReservedRange reserved_range = 9;
-  for (unsigned i = 0,
-      n = static_cast<unsigned>(this->_internal_reserved_range_size()); i < n; i++) {
-    const auto& repfield = this->_internal_reserved_range(i);
-    target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
-        InternalWriteMessage(9, repfield, repfield.GetCachedSize(), target, stream);
-  }
-
-  // repeated string reserved_name = 10;
-  for (int i = 0, n = this->_internal_reserved_name_size(); i < n; i++) {
-    const auto& s = this->_internal_reserved_name(i);
-    ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::VerifyUTF8StringNamedField(
-      s.data(), static_cast<int>(s.length()),
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::SERIALIZE,
-      "google.protobuf.DescriptorProto.reserved_name");
-    target = stream->WriteString(10, s, target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-        _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.DescriptorProto)
-  return target;
-}
-
-size_t DescriptorProto::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:google.protobuf.DescriptorProto)
-  size_t total_size = 0;
-
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // repeated .google.protobuf.FieldDescriptorProto field = 2;
-  total_size += 1UL * this->_internal_field_size();
-  for (const auto& msg : this->_impl_.field_) {
-    total_size +=
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(msg);
-  }
-
-  // repeated .google.protobuf.DescriptorProto nested_type = 3;
-  total_size += 1UL * this->_internal_nested_type_size();
-  for (const auto& msg : this->_impl_.nested_type_) {
-    total_size +=
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(msg);
-  }
-
-  // repeated .google.protobuf.EnumDescriptorProto enum_type = 4;
-  total_size += 1UL * this->_internal_enum_type_size();
-  for (const auto& msg : this->_impl_.enum_type_) {
-    total_size +=
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(msg);
-  }
-
-  // repeated .google.protobuf.DescriptorProto.ExtensionRange extension_range = 5;
-  total_size += 1UL * this->_internal_extension_range_size();
-  for (const auto& msg : this->_impl_.extension_range_) {
-    total_size +=
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(msg);
-  }
-
-  // repeated .google.protobuf.FieldDescriptorProto extension = 6;
-  total_size += 1UL * this->_internal_extension_size();
-  for (const auto& msg : this->_impl_.extension_) {
-    total_size +=
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(msg);
-  }
-
-  // repeated .google.protobuf.OneofDescriptorProto oneof_decl = 8;
-  total_size += 1UL * this->_internal_oneof_decl_size();
-  for (const auto& msg : this->_impl_.oneof_decl_) {
-    total_size +=
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(msg);
-  }
-
-  // repeated .google.protobuf.DescriptorProto.ReservedRange reserved_range = 9;
-  total_size += 1UL * this->_internal_reserved_range_size();
-  for (const auto& msg : this->_impl_.reserved_range_) {
-    total_size +=
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(msg);
-  }
-
-  // repeated string reserved_name = 10;
-  total_size += 1 *
-      ::PROTOBUF_NAMESPACE_ID::internal::FromIntSize(_impl_.reserved_name_.size());
-  for (int i = 0, n = _impl_.reserved_name_.size(); i < n; i++) {
-    total_size += ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize(
-      _impl_.reserved_name_.Get(i));
-  }
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    // optional string name = 1;
-    if (cached_has_bits & 0x00000001u) {
-      total_size += 1 +
-        ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize(
-          this->_internal_name());
-    }
-
-    // optional .google.protobuf.MessageOptions options = 7;
-    if (cached_has_bits & 0x00000002u) {
-      total_size += 1 +
-        ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(
-          *_impl_.options_);
-    }
-
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData DescriptorProto::_class_data_ = {
-    ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck,
-    DescriptorProto::MergeImpl
-};
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*DescriptorProto::GetClassData() const { return &_class_data_; }
-
-
-void DescriptorProto::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) {
-  auto* const _this = static_cast<DescriptorProto*>(&to_msg);
-  auto& from = static_cast<const DescriptorProto&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.DescriptorProto)
-  GOOGLE_DCHECK_NE(&from, _this);
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  _this->_impl_.field_.MergeFrom(from._impl_.field_);
-  _this->_impl_.nested_type_.MergeFrom(from._impl_.nested_type_);
-  _this->_impl_.enum_type_.MergeFrom(from._impl_.enum_type_);
-  _this->_impl_.extension_range_.MergeFrom(from._impl_.extension_range_);
-  _this->_impl_.extension_.MergeFrom(from._impl_.extension_);
-  _this->_impl_.oneof_decl_.MergeFrom(from._impl_.oneof_decl_);
-  _this->_impl_.reserved_range_.MergeFrom(from._impl_.reserved_range_);
-  _this->_impl_.reserved_name_.MergeFrom(from._impl_.reserved_name_);
-  cached_has_bits = from._impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      _this->_internal_set_name(from._internal_name());
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _this->_internal_mutable_options()->::PROTOBUF_NAMESPACE_ID::MessageOptions::MergeFrom(
-          from._internal_options());
-    }
-  }
-  _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void DescriptorProto::CopyFrom(const DescriptorProto& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.DescriptorProto)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool DescriptorProto::IsInitialized() const {
-  if (!::PROTOBUF_NAMESPACE_ID::internal::AllAreInitialized(_impl_.field_))
-    return false;
-  if (!::PROTOBUF_NAMESPACE_ID::internal::AllAreInitialized(_impl_.nested_type_))
-    return false;
-  if (!::PROTOBUF_NAMESPACE_ID::internal::AllAreInitialized(_impl_.enum_type_))
-    return false;
-  if (!::PROTOBUF_NAMESPACE_ID::internal::AllAreInitialized(_impl_.extension_range_))
-    return false;
-  if (!::PROTOBUF_NAMESPACE_ID::internal::AllAreInitialized(_impl_.extension_))
-    return false;
-  if (!::PROTOBUF_NAMESPACE_ID::internal::AllAreInitialized(_impl_.oneof_decl_))
-    return false;
-  if (_internal_has_options()) {
-    if (!_impl_.options_->IsInitialized()) return false;
-  }
-  return true;
-}
-
-void DescriptorProto::InternalSwap(DescriptorProto* other) {
-  using std::swap;
-  auto* lhs_arena = GetArenaForAllocation();
-  auto* rhs_arena = other->GetArenaForAllocation();
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  _impl_.field_.InternalSwap(&other->_impl_.field_);
-  _impl_.nested_type_.InternalSwap(&other->_impl_.nested_type_);
-  _impl_.enum_type_.InternalSwap(&other->_impl_.enum_type_);
-  _impl_.extension_range_.InternalSwap(&other->_impl_.extension_range_);
-  _impl_.extension_.InternalSwap(&other->_impl_.extension_);
-  _impl_.oneof_decl_.InternalSwap(&other->_impl_.oneof_decl_);
-  _impl_.reserved_range_.InternalSwap(&other->_impl_.reserved_range_);
-  _impl_.reserved_name_.InternalSwap(&other->_impl_.reserved_name_);
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::InternalSwap(
-      &_impl_.name_, lhs_arena,
-      &other->_impl_.name_, rhs_arena
-  );
-  swap(_impl_.options_, other->_impl_.options_);
-}
-
-::PROTOBUF_NAMESPACE_ID::Metadata DescriptorProto::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_google_2fprotobuf_2fdescriptor_2eproto_getter, &descriptor_table_google_2fprotobuf_2fdescriptor_2eproto_once,
-      file_level_metadata_google_2fprotobuf_2fdescriptor_2eproto[4]);
-}
-
-// ===================================================================
-
-class ExtensionRangeOptions::_Internal {
- public:
-};
-
-ExtensionRangeOptions::ExtensionRangeOptions(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                         bool is_message_owned)
-  : ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned) {
-  SharedCtor(arena, is_message_owned);
-  // @@protoc_insertion_point(arena_constructor:google.protobuf.ExtensionRangeOptions)
-}
-ExtensionRangeOptions::ExtensionRangeOptions(const ExtensionRangeOptions& from)
-  : ::PROTOBUF_NAMESPACE_ID::Message() {
-  ExtensionRangeOptions* const _this = this; (void)_this;
-  new (&_impl_) Impl_{
-      /*decltype(_impl_._extensions_)*/{}
-    , decltype(_impl_.uninterpreted_option_){from._impl_.uninterpreted_option_}
-    , /*decltype(_impl_._cached_size_)*/{}};
-
-  _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-  _impl_._extensions_.MergeFrom(internal_default_instance(), from._impl_._extensions_);
-  // @@protoc_insertion_point(copy_constructor:google.protobuf.ExtensionRangeOptions)
-}
-
-inline void ExtensionRangeOptions::SharedCtor(
-    ::_pb::Arena* arena, bool is_message_owned) {
-  (void)arena;
-  (void)is_message_owned;
-  new (&_impl_) Impl_{
-      /*decltype(_impl_._extensions_)*/{::_pbi::ArenaInitialized(), arena}
-    , decltype(_impl_.uninterpreted_option_){arena}
-    , /*decltype(_impl_._cached_size_)*/{}
-  };
-}
-
-ExtensionRangeOptions::~ExtensionRangeOptions() {
-  // @@protoc_insertion_point(destructor:google.protobuf.ExtensionRangeOptions)
-  if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) {
-  (void)arena;
-    return;
-  }
-  SharedDtor();
-}
-
-inline void ExtensionRangeOptions::SharedDtor() {
-  GOOGLE_DCHECK(GetArenaForAllocation() == nullptr);
-  _impl_._extensions_.~ExtensionSet();
-  _impl_.uninterpreted_option_.~RepeatedPtrField();
-}
-
-void ExtensionRangeOptions::SetCachedSize(int size) const {
-  _impl_._cached_size_.Set(size);
-}
-
-void ExtensionRangeOptions::Clear() {
-// @@protoc_insertion_point(message_clear_start:google.protobuf.ExtensionRangeOptions)
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_._extensions_.Clear();
-  _impl_.uninterpreted_option_.Clear();
-  _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>();
-}
-
-const char* ExtensionRangeOptions::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) {
-#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure
-  while (!ctx->Done(&ptr)) {
-    uint32_t tag;
-    ptr = ::_pbi::ReadTag(ptr, &tag);
-    switch (tag >> 3) {
-      // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
-      case 999:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 58)) {
-          ptr -= 2;
-          do {
-            ptr += 2;
-            ptr = ctx->ParseMessage(_internal_add_uninterpreted_option(), ptr);
-            CHK_(ptr);
-            if (!ctx->DataAvailable(ptr)) break;
-          } while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<7994>(ptr));
-        } else
-          goto handle_unusual;
-        continue;
-      default:
-        goto handle_unusual;
-    }  // switch
-  handle_unusual:
-    if ((tag == 0) || ((tag & 7) == 4)) {
-      CHK_(ptr);
-      ctx->SetLastTag(tag);
-      goto message_done;
-    }
-    if ((8000u <= tag)) {
-      ptr = _impl_._extensions_.ParseField(tag, ptr, internal_default_instance(), &_internal_metadata_, ctx);
-      CHK_(ptr != nullptr);
-      continue;
-    }
-    ptr = UnknownFieldParse(
-        tag,
-        _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(),
-        ptr, ctx);
-    CHK_(ptr != nullptr);
-  }  // while
-message_done:
-  return ptr;
-failure:
-  ptr = nullptr;
-  goto message_done;
-#undef CHK_
-}
-
-uint8_t* ExtensionRangeOptions::_InternalSerialize(
-    uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.ExtensionRangeOptions)
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
-  for (unsigned i = 0,
-      n = static_cast<unsigned>(this->_internal_uninterpreted_option_size()); i < n; i++) {
-    const auto& repfield = this->_internal_uninterpreted_option(i);
-    target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
-        InternalWriteMessage(999, repfield, repfield.GetCachedSize(), target, stream);
-  }
-
-  // Extension range [1000, 536870912)
-  target = _impl_._extensions_._InternalSerialize(
-  internal_default_instance(), 1000, 536870912, target, stream);
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-        _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.ExtensionRangeOptions)
-  return target;
-}
-
-size_t ExtensionRangeOptions::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:google.protobuf.ExtensionRangeOptions)
-  size_t total_size = 0;
-
-  total_size += _impl_._extensions_.ByteSize();
-
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
-  total_size += 2UL * this->_internal_uninterpreted_option_size();
-  for (const auto& msg : this->_impl_.uninterpreted_option_) {
-    total_size +=
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(msg);
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData ExtensionRangeOptions::_class_data_ = {
-    ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck,
-    ExtensionRangeOptions::MergeImpl
-};
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*ExtensionRangeOptions::GetClassData() const { return &_class_data_; }
-
-
-void ExtensionRangeOptions::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) {
-  auto* const _this = static_cast<ExtensionRangeOptions*>(&to_msg);
-  auto& from = static_cast<const ExtensionRangeOptions&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.ExtensionRangeOptions)
-  GOOGLE_DCHECK_NE(&from, _this);
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  _this->_impl_.uninterpreted_option_.MergeFrom(from._impl_.uninterpreted_option_);
-  _this->_impl_._extensions_.MergeFrom(internal_default_instance(), from._impl_._extensions_);
-  _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void ExtensionRangeOptions::CopyFrom(const ExtensionRangeOptions& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.ExtensionRangeOptions)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool ExtensionRangeOptions::IsInitialized() const {
-  if (!_impl_._extensions_.IsInitialized()) {
-    return false;
-  }
-
-  if (!::PROTOBUF_NAMESPACE_ID::internal::AllAreInitialized(_impl_.uninterpreted_option_))
-    return false;
-  return true;
-}
-
-void ExtensionRangeOptions::InternalSwap(ExtensionRangeOptions* other) {
-  using std::swap;
-  _impl_._extensions_.InternalSwap(&other->_impl_._extensions_);
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  _impl_.uninterpreted_option_.InternalSwap(&other->_impl_.uninterpreted_option_);
-}
-
-::PROTOBUF_NAMESPACE_ID::Metadata ExtensionRangeOptions::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_google_2fprotobuf_2fdescriptor_2eproto_getter, &descriptor_table_google_2fprotobuf_2fdescriptor_2eproto_once,
-      file_level_metadata_google_2fprotobuf_2fdescriptor_2eproto[5]);
-}
-
-// ===================================================================
-
-class FieldDescriptorProto::_Internal {
- public:
-  using HasBits = decltype(std::declval<FieldDescriptorProto>()._impl_._has_bits_);
-  static void set_has_name(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-  static void set_has_number(HasBits* has_bits) {
-    (*has_bits)[0] |= 64u;
-  }
-  static void set_has_label(HasBits* has_bits) {
-    (*has_bits)[0] |= 512u;
-  }
-  static void set_has_type(HasBits* has_bits) {
-    (*has_bits)[0] |= 1024u;
-  }
-  static void set_has_type_name(HasBits* has_bits) {
-    (*has_bits)[0] |= 4u;
-  }
-  static void set_has_extendee(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
-  static void set_has_default_value(HasBits* has_bits) {
-    (*has_bits)[0] |= 8u;
-  }
-  static void set_has_oneof_index(HasBits* has_bits) {
-    (*has_bits)[0] |= 128u;
-  }
-  static void set_has_json_name(HasBits* has_bits) {
-    (*has_bits)[0] |= 16u;
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::FieldOptions& options(const FieldDescriptorProto* msg);
-  static void set_has_options(HasBits* has_bits) {
-    (*has_bits)[0] |= 32u;
-  }
-  static void set_has_proto3_optional(HasBits* has_bits) {
-    (*has_bits)[0] |= 256u;
-  }
-};
-
-const ::PROTOBUF_NAMESPACE_ID::FieldOptions&
-FieldDescriptorProto::_Internal::options(const FieldDescriptorProto* msg) {
-  return *msg->_impl_.options_;
-}
-FieldDescriptorProto::FieldDescriptorProto(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                         bool is_message_owned)
-  : ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned) {
-  SharedCtor(arena, is_message_owned);
-  // @@protoc_insertion_point(arena_constructor:google.protobuf.FieldDescriptorProto)
-}
-FieldDescriptorProto::FieldDescriptorProto(const FieldDescriptorProto& from)
-  : ::PROTOBUF_NAMESPACE_ID::Message() {
-  FieldDescriptorProto* const _this = this; (void)_this;
-  new (&_impl_) Impl_{
-      decltype(_impl_._has_bits_){from._impl_._has_bits_}
-    , /*decltype(_impl_._cached_size_)*/{}
-    , decltype(_impl_.name_){}
-    , decltype(_impl_.extendee_){}
-    , decltype(_impl_.type_name_){}
-    , decltype(_impl_.default_value_){}
-    , decltype(_impl_.json_name_){}
-    , decltype(_impl_.options_){nullptr}
-    , decltype(_impl_.number_){}
-    , decltype(_impl_.oneof_index_){}
-    , decltype(_impl_.proto3_optional_){}
-    , decltype(_impl_.label_){}
-    , decltype(_impl_.type_){}};
-
-  _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-  _impl_.name_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.name_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (from._internal_has_name()) {
-    _this->_impl_.name_.Set(from._internal_name(), 
-      _this->GetArenaForAllocation());
-  }
-  _impl_.extendee_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.extendee_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (from._internal_has_extendee()) {
-    _this->_impl_.extendee_.Set(from._internal_extendee(), 
-      _this->GetArenaForAllocation());
-  }
-  _impl_.type_name_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.type_name_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (from._internal_has_type_name()) {
-    _this->_impl_.type_name_.Set(from._internal_type_name(), 
-      _this->GetArenaForAllocation());
-  }
-  _impl_.default_value_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.default_value_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (from._internal_has_default_value()) {
-    _this->_impl_.default_value_.Set(from._internal_default_value(), 
-      _this->GetArenaForAllocation());
-  }
-  _impl_.json_name_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.json_name_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (from._internal_has_json_name()) {
-    _this->_impl_.json_name_.Set(from._internal_json_name(), 
-      _this->GetArenaForAllocation());
-  }
-  if (from._internal_has_options()) {
-    _this->_impl_.options_ = new ::PROTOBUF_NAMESPACE_ID::FieldOptions(*from._impl_.options_);
-  }
-  ::memcpy(&_impl_.number_, &from._impl_.number_,
-    static_cast<size_t>(reinterpret_cast<char*>(&_impl_.type_) -
-    reinterpret_cast<char*>(&_impl_.number_)) + sizeof(_impl_.type_));
-  // @@protoc_insertion_point(copy_constructor:google.protobuf.FieldDescriptorProto)
-}
-
-inline void FieldDescriptorProto::SharedCtor(
-    ::_pb::Arena* arena, bool is_message_owned) {
-  (void)arena;
-  (void)is_message_owned;
-  new (&_impl_) Impl_{
-      decltype(_impl_._has_bits_){}
-    , /*decltype(_impl_._cached_size_)*/{}
-    , decltype(_impl_.name_){}
-    , decltype(_impl_.extendee_){}
-    , decltype(_impl_.type_name_){}
-    , decltype(_impl_.default_value_){}
-    , decltype(_impl_.json_name_){}
-    , decltype(_impl_.options_){nullptr}
-    , decltype(_impl_.number_){0}
-    , decltype(_impl_.oneof_index_){0}
-    , decltype(_impl_.proto3_optional_){false}
-    , decltype(_impl_.label_){1}
-    , decltype(_impl_.type_){1}
-  };
-  _impl_.name_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.name_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  _impl_.extendee_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.extendee_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  _impl_.type_name_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.type_name_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  _impl_.default_value_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.default_value_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  _impl_.json_name_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.json_name_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-}
-
-FieldDescriptorProto::~FieldDescriptorProto() {
-  // @@protoc_insertion_point(destructor:google.protobuf.FieldDescriptorProto)
-  if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) {
-  (void)arena;
-    return;
-  }
-  SharedDtor();
-}
-
-inline void FieldDescriptorProto::SharedDtor() {
-  GOOGLE_DCHECK(GetArenaForAllocation() == nullptr);
-  _impl_.name_.Destroy();
-  _impl_.extendee_.Destroy();
-  _impl_.type_name_.Destroy();
-  _impl_.default_value_.Destroy();
-  _impl_.json_name_.Destroy();
-  if (this != internal_default_instance()) delete _impl_.options_;
-}
-
-void FieldDescriptorProto::SetCachedSize(int size) const {
-  _impl_._cached_size_.Set(size);
-}
-
-void FieldDescriptorProto::Clear() {
-// @@protoc_insertion_point(message_clear_start:google.protobuf.FieldDescriptorProto)
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x0000003fu) {
-    if (cached_has_bits & 0x00000001u) {
-      _impl_.name_.ClearNonDefaultToEmpty();
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _impl_.extendee_.ClearNonDefaultToEmpty();
-    }
-    if (cached_has_bits & 0x00000004u) {
-      _impl_.type_name_.ClearNonDefaultToEmpty();
-    }
-    if (cached_has_bits & 0x00000008u) {
-      _impl_.default_value_.ClearNonDefaultToEmpty();
-    }
-    if (cached_has_bits & 0x00000010u) {
-      _impl_.json_name_.ClearNonDefaultToEmpty();
-    }
-    if (cached_has_bits & 0x00000020u) {
-      GOOGLE_DCHECK(_impl_.options_ != nullptr);
-      _impl_.options_->Clear();
-    }
-  }
-  if (cached_has_bits & 0x000000c0u) {
-    ::memset(&_impl_.number_, 0, static_cast<size_t>(
-        reinterpret_cast<char*>(&_impl_.oneof_index_) -
-        reinterpret_cast<char*>(&_impl_.number_)) + sizeof(_impl_.oneof_index_));
-  }
-  if (cached_has_bits & 0x00000700u) {
-    _impl_.proto3_optional_ = false;
-    _impl_.label_ = 1;
-    _impl_.type_ = 1;
-  }
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>();
-}
-
-const char* FieldDescriptorProto::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) {
-#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure
-  _Internal::HasBits has_bits{};
-  while (!ctx->Done(&ptr)) {
-    uint32_t tag;
-    ptr = ::_pbi::ReadTag(ptr, &tag);
-    switch (tag >> 3) {
-      // optional string name = 1;
-      case 1:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 10)) {
-          auto str = _internal_mutable_name();
-          ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx);
-          CHK_(ptr);
-          #ifndef NDEBUG
-          ::_pbi::VerifyUTF8(str, "google.protobuf.FieldDescriptorProto.name");
-          #endif  // !NDEBUG
-        } else
-          goto handle_unusual;
-        continue;
-      // optional string extendee = 2;
-      case 2:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 18)) {
-          auto str = _internal_mutable_extendee();
-          ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx);
-          CHK_(ptr);
-          #ifndef NDEBUG
-          ::_pbi::VerifyUTF8(str, "google.protobuf.FieldDescriptorProto.extendee");
-          #endif  // !NDEBUG
-        } else
-          goto handle_unusual;
-        continue;
-      // optional int32 number = 3;
-      case 3:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 24)) {
-          _Internal::set_has_number(&has_bits);
-          _impl_.number_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr);
-          CHK_(ptr);
-        } else
-          goto handle_unusual;
-        continue;
-      // optional .google.protobuf.FieldDescriptorProto.Label label = 4;
-      case 4:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 32)) {
-          uint64_t val = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr);
-          CHK_(ptr);
-          if (PROTOBUF_PREDICT_TRUE(::PROTOBUF_NAMESPACE_ID::FieldDescriptorProto_Label_IsValid(val))) {
-            _internal_set_label(static_cast<::PROTOBUF_NAMESPACE_ID::FieldDescriptorProto_Label>(val));
-          } else {
-            ::PROTOBUF_NAMESPACE_ID::internal::WriteVarint(4, val, mutable_unknown_fields());
-          }
-        } else
-          goto handle_unusual;
-        continue;
-      // optional .google.protobuf.FieldDescriptorProto.Type type = 5;
-      case 5:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 40)) {
-          uint64_t val = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr);
-          CHK_(ptr);
-          if (PROTOBUF_PREDICT_TRUE(::PROTOBUF_NAMESPACE_ID::FieldDescriptorProto_Type_IsValid(val))) {
-            _internal_set_type(static_cast<::PROTOBUF_NAMESPACE_ID::FieldDescriptorProto_Type>(val));
-          } else {
-            ::PROTOBUF_NAMESPACE_ID::internal::WriteVarint(5, val, mutable_unknown_fields());
-          }
-        } else
-          goto handle_unusual;
-        continue;
-      // optional string type_name = 6;
-      case 6:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 50)) {
-          auto str = _internal_mutable_type_name();
-          ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx);
-          CHK_(ptr);
-          #ifndef NDEBUG
-          ::_pbi::VerifyUTF8(str, "google.protobuf.FieldDescriptorProto.type_name");
-          #endif  // !NDEBUG
-        } else
-          goto handle_unusual;
-        continue;
-      // optional string default_value = 7;
-      case 7:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 58)) {
-          auto str = _internal_mutable_default_value();
-          ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx);
-          CHK_(ptr);
-          #ifndef NDEBUG
-          ::_pbi::VerifyUTF8(str, "google.protobuf.FieldDescriptorProto.default_value");
-          #endif  // !NDEBUG
-        } else
-          goto handle_unusual;
-        continue;
-      // optional .google.protobuf.FieldOptions options = 8;
-      case 8:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 66)) {
-          ptr = ctx->ParseMessage(_internal_mutable_options(), ptr);
-          CHK_(ptr);
-        } else
-          goto handle_unusual;
-        continue;
-      // optional int32 oneof_index = 9;
-      case 9:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 72)) {
-          _Internal::set_has_oneof_index(&has_bits);
-          _impl_.oneof_index_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr);
-          CHK_(ptr);
-        } else
-          goto handle_unusual;
-        continue;
-      // optional string json_name = 10;
-      case 10:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 82)) {
-          auto str = _internal_mutable_json_name();
-          ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx);
-          CHK_(ptr);
-          #ifndef NDEBUG
-          ::_pbi::VerifyUTF8(str, "google.protobuf.FieldDescriptorProto.json_name");
-          #endif  // !NDEBUG
-        } else
-          goto handle_unusual;
-        continue;
-      // optional bool proto3_optional = 17;
-      case 17:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 136)) {
-          _Internal::set_has_proto3_optional(&has_bits);
-          _impl_.proto3_optional_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr);
-          CHK_(ptr);
-        } else
-          goto handle_unusual;
-        continue;
-      default:
-        goto handle_unusual;
-    }  // switch
-  handle_unusual:
-    if ((tag == 0) || ((tag & 7) == 4)) {
-      CHK_(ptr);
-      ctx->SetLastTag(tag);
-      goto message_done;
-    }
-    ptr = UnknownFieldParse(
-        tag,
-        _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(),
-        ptr, ctx);
-    CHK_(ptr != nullptr);
-  }  // while
-message_done:
-  _impl_._has_bits_.Or(has_bits);
-  return ptr;
-failure:
-  ptr = nullptr;
-  goto message_done;
-#undef CHK_
-}
-
-uint8_t* FieldDescriptorProto::_InternalSerialize(
-    uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.FieldDescriptorProto)
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // optional string name = 1;
-  if (cached_has_bits & 0x00000001u) {
-    ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::VerifyUTF8StringNamedField(
-      this->_internal_name().data(), static_cast<int>(this->_internal_name().length()),
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::SERIALIZE,
-      "google.protobuf.FieldDescriptorProto.name");
-    target = stream->WriteStringMaybeAliased(
-        1, this->_internal_name(), target);
-  }
-
-  // optional string extendee = 2;
-  if (cached_has_bits & 0x00000002u) {
-    ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::VerifyUTF8StringNamedField(
-      this->_internal_extendee().data(), static_cast<int>(this->_internal_extendee().length()),
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::SERIALIZE,
-      "google.protobuf.FieldDescriptorProto.extendee");
-    target = stream->WriteStringMaybeAliased(
-        2, this->_internal_extendee(), target);
-  }
-
-  // optional int32 number = 3;
-  if (cached_has_bits & 0x00000040u) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteInt32ToArray(3, this->_internal_number(), target);
-  }
-
-  // optional .google.protobuf.FieldDescriptorProto.Label label = 4;
-  if (cached_has_bits & 0x00000200u) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteEnumToArray(
-      4, this->_internal_label(), target);
-  }
-
-  // optional .google.protobuf.FieldDescriptorProto.Type type = 5;
-  if (cached_has_bits & 0x00000400u) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteEnumToArray(
-      5, this->_internal_type(), target);
-  }
-
-  // optional string type_name = 6;
-  if (cached_has_bits & 0x00000004u) {
-    ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::VerifyUTF8StringNamedField(
-      this->_internal_type_name().data(), static_cast<int>(this->_internal_type_name().length()),
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::SERIALIZE,
-      "google.protobuf.FieldDescriptorProto.type_name");
-    target = stream->WriteStringMaybeAliased(
-        6, this->_internal_type_name(), target);
-  }
-
-  // optional string default_value = 7;
-  if (cached_has_bits & 0x00000008u) {
-    ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::VerifyUTF8StringNamedField(
-      this->_internal_default_value().data(), static_cast<int>(this->_internal_default_value().length()),
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::SERIALIZE,
-      "google.protobuf.FieldDescriptorProto.default_value");
-    target = stream->WriteStringMaybeAliased(
-        7, this->_internal_default_value(), target);
-  }
-
-  // optional .google.protobuf.FieldOptions options = 8;
-  if (cached_has_bits & 0x00000020u) {
-    target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
-      InternalWriteMessage(8, _Internal::options(this),
-        _Internal::options(this).GetCachedSize(), target, stream);
-  }
-
-  // optional int32 oneof_index = 9;
-  if (cached_has_bits & 0x00000080u) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteInt32ToArray(9, this->_internal_oneof_index(), target);
-  }
-
-  // optional string json_name = 10;
-  if (cached_has_bits & 0x00000010u) {
-    ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::VerifyUTF8StringNamedField(
-      this->_internal_json_name().data(), static_cast<int>(this->_internal_json_name().length()),
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::SERIALIZE,
-      "google.protobuf.FieldDescriptorProto.json_name");
-    target = stream->WriteStringMaybeAliased(
-        10, this->_internal_json_name(), target);
-  }
-
-  // optional bool proto3_optional = 17;
-  if (cached_has_bits & 0x00000100u) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteBoolToArray(17, this->_internal_proto3_optional(), target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-        _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.FieldDescriptorProto)
-  return target;
-}
-
-size_t FieldDescriptorProto::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:google.protobuf.FieldDescriptorProto)
-  size_t total_size = 0;
-
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x000000ffu) {
-    // optional string name = 1;
-    if (cached_has_bits & 0x00000001u) {
-      total_size += 1 +
-        ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize(
-          this->_internal_name());
-    }
-
-    // optional string extendee = 2;
-    if (cached_has_bits & 0x00000002u) {
-      total_size += 1 +
-        ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize(
-          this->_internal_extendee());
-    }
-
-    // optional string type_name = 6;
-    if (cached_has_bits & 0x00000004u) {
-      total_size += 1 +
-        ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize(
-          this->_internal_type_name());
-    }
-
-    // optional string default_value = 7;
-    if (cached_has_bits & 0x00000008u) {
-      total_size += 1 +
-        ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize(
-          this->_internal_default_value());
-    }
-
-    // optional string json_name = 10;
-    if (cached_has_bits & 0x00000010u) {
-      total_size += 1 +
-        ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize(
-          this->_internal_json_name());
-    }
-
-    // optional .google.protobuf.FieldOptions options = 8;
-    if (cached_has_bits & 0x00000020u) {
-      total_size += 1 +
-        ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(
-          *_impl_.options_);
-    }
-
-    // optional int32 number = 3;
-    if (cached_has_bits & 0x00000040u) {
-      total_size += ::_pbi::WireFormatLite::Int32SizePlusOne(this->_internal_number());
-    }
-
-    // optional int32 oneof_index = 9;
-    if (cached_has_bits & 0x00000080u) {
-      total_size += ::_pbi::WireFormatLite::Int32SizePlusOne(this->_internal_oneof_index());
-    }
-
-  }
-  if (cached_has_bits & 0x00000700u) {
-    // optional bool proto3_optional = 17;
-    if (cached_has_bits & 0x00000100u) {
-      total_size += 2 + 1;
-    }
-
-    // optional .google.protobuf.FieldDescriptorProto.Label label = 4;
-    if (cached_has_bits & 0x00000200u) {
-      total_size += 1 +
-        ::_pbi::WireFormatLite::EnumSize(this->_internal_label());
-    }
-
-    // optional .google.protobuf.FieldDescriptorProto.Type type = 5;
-    if (cached_has_bits & 0x00000400u) {
-      total_size += 1 +
-        ::_pbi::WireFormatLite::EnumSize(this->_internal_type());
-    }
-
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData FieldDescriptorProto::_class_data_ = {
-    ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck,
-    FieldDescriptorProto::MergeImpl
-};
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*FieldDescriptorProto::GetClassData() const { return &_class_data_; }
-
-
-void FieldDescriptorProto::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) {
-  auto* const _this = static_cast<FieldDescriptorProto*>(&to_msg);
-  auto& from = static_cast<const FieldDescriptorProto&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.FieldDescriptorProto)
-  GOOGLE_DCHECK_NE(&from, _this);
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  cached_has_bits = from._impl_._has_bits_[0];
-  if (cached_has_bits & 0x000000ffu) {
-    if (cached_has_bits & 0x00000001u) {
-      _this->_internal_set_name(from._internal_name());
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _this->_internal_set_extendee(from._internal_extendee());
-    }
-    if (cached_has_bits & 0x00000004u) {
-      _this->_internal_set_type_name(from._internal_type_name());
-    }
-    if (cached_has_bits & 0x00000008u) {
-      _this->_internal_set_default_value(from._internal_default_value());
-    }
-    if (cached_has_bits & 0x00000010u) {
-      _this->_internal_set_json_name(from._internal_json_name());
-    }
-    if (cached_has_bits & 0x00000020u) {
-      _this->_internal_mutable_options()->::PROTOBUF_NAMESPACE_ID::FieldOptions::MergeFrom(
-          from._internal_options());
-    }
-    if (cached_has_bits & 0x00000040u) {
-      _this->_impl_.number_ = from._impl_.number_;
-    }
-    if (cached_has_bits & 0x00000080u) {
-      _this->_impl_.oneof_index_ = from._impl_.oneof_index_;
-    }
-    _this->_impl_._has_bits_[0] |= cached_has_bits;
-  }
-  if (cached_has_bits & 0x00000700u) {
-    if (cached_has_bits & 0x00000100u) {
-      _this->_impl_.proto3_optional_ = from._impl_.proto3_optional_;
-    }
-    if (cached_has_bits & 0x00000200u) {
-      _this->_impl_.label_ = from._impl_.label_;
-    }
-    if (cached_has_bits & 0x00000400u) {
-      _this->_impl_.type_ = from._impl_.type_;
-    }
-    _this->_impl_._has_bits_[0] |= cached_has_bits;
-  }
-  _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void FieldDescriptorProto::CopyFrom(const FieldDescriptorProto& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.FieldDescriptorProto)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool FieldDescriptorProto::IsInitialized() const {
-  if (_internal_has_options()) {
-    if (!_impl_.options_->IsInitialized()) return false;
-  }
-  return true;
-}
-
-void FieldDescriptorProto::InternalSwap(FieldDescriptorProto* other) {
-  using std::swap;
-  auto* lhs_arena = GetArenaForAllocation();
-  auto* rhs_arena = other->GetArenaForAllocation();
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::InternalSwap(
-      &_impl_.name_, lhs_arena,
-      &other->_impl_.name_, rhs_arena
-  );
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::InternalSwap(
-      &_impl_.extendee_, lhs_arena,
-      &other->_impl_.extendee_, rhs_arena
-  );
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::InternalSwap(
-      &_impl_.type_name_, lhs_arena,
-      &other->_impl_.type_name_, rhs_arena
-  );
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::InternalSwap(
-      &_impl_.default_value_, lhs_arena,
-      &other->_impl_.default_value_, rhs_arena
-  );
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::InternalSwap(
-      &_impl_.json_name_, lhs_arena,
-      &other->_impl_.json_name_, rhs_arena
-  );
-  ::PROTOBUF_NAMESPACE_ID::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(FieldDescriptorProto, _impl_.proto3_optional_)
-      + sizeof(FieldDescriptorProto::_impl_.proto3_optional_)
-      - PROTOBUF_FIELD_OFFSET(FieldDescriptorProto, _impl_.options_)>(
-          reinterpret_cast<char*>(&_impl_.options_),
-          reinterpret_cast<char*>(&other->_impl_.options_));
-  swap(_impl_.label_, other->_impl_.label_);
-  swap(_impl_.type_, other->_impl_.type_);
-}
-
-::PROTOBUF_NAMESPACE_ID::Metadata FieldDescriptorProto::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_google_2fprotobuf_2fdescriptor_2eproto_getter, &descriptor_table_google_2fprotobuf_2fdescriptor_2eproto_once,
-      file_level_metadata_google_2fprotobuf_2fdescriptor_2eproto[6]);
-}
-
-// ===================================================================
-
-class OneofDescriptorProto::_Internal {
- public:
-  using HasBits = decltype(std::declval<OneofDescriptorProto>()._impl_._has_bits_);
-  static void set_has_name(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::OneofOptions& options(const OneofDescriptorProto* msg);
-  static void set_has_options(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
-};
-
-const ::PROTOBUF_NAMESPACE_ID::OneofOptions&
-OneofDescriptorProto::_Internal::options(const OneofDescriptorProto* msg) {
-  return *msg->_impl_.options_;
-}
-OneofDescriptorProto::OneofDescriptorProto(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                         bool is_message_owned)
-  : ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned) {
-  SharedCtor(arena, is_message_owned);
-  // @@protoc_insertion_point(arena_constructor:google.protobuf.OneofDescriptorProto)
-}
-OneofDescriptorProto::OneofDescriptorProto(const OneofDescriptorProto& from)
-  : ::PROTOBUF_NAMESPACE_ID::Message() {
-  OneofDescriptorProto* const _this = this; (void)_this;
-  new (&_impl_) Impl_{
-      decltype(_impl_._has_bits_){from._impl_._has_bits_}
-    , /*decltype(_impl_._cached_size_)*/{}
-    , decltype(_impl_.name_){}
-    , decltype(_impl_.options_){nullptr}};
-
-  _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-  _impl_.name_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.name_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (from._internal_has_name()) {
-    _this->_impl_.name_.Set(from._internal_name(), 
-      _this->GetArenaForAllocation());
-  }
-  if (from._internal_has_options()) {
-    _this->_impl_.options_ = new ::PROTOBUF_NAMESPACE_ID::OneofOptions(*from._impl_.options_);
-  }
-  // @@protoc_insertion_point(copy_constructor:google.protobuf.OneofDescriptorProto)
-}
-
-inline void OneofDescriptorProto::SharedCtor(
-    ::_pb::Arena* arena, bool is_message_owned) {
-  (void)arena;
-  (void)is_message_owned;
-  new (&_impl_) Impl_{
-      decltype(_impl_._has_bits_){}
-    , /*decltype(_impl_._cached_size_)*/{}
-    , decltype(_impl_.name_){}
-    , decltype(_impl_.options_){nullptr}
-  };
-  _impl_.name_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.name_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-}
-
-OneofDescriptorProto::~OneofDescriptorProto() {
-  // @@protoc_insertion_point(destructor:google.protobuf.OneofDescriptorProto)
-  if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) {
-  (void)arena;
-    return;
-  }
-  SharedDtor();
-}
-
-inline void OneofDescriptorProto::SharedDtor() {
-  GOOGLE_DCHECK(GetArenaForAllocation() == nullptr);
-  _impl_.name_.Destroy();
-  if (this != internal_default_instance()) delete _impl_.options_;
-}
-
-void OneofDescriptorProto::SetCachedSize(int size) const {
-  _impl_._cached_size_.Set(size);
-}
-
-void OneofDescriptorProto::Clear() {
-// @@protoc_insertion_point(message_clear_start:google.protobuf.OneofDescriptorProto)
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      _impl_.name_.ClearNonDefaultToEmpty();
-    }
-    if (cached_has_bits & 0x00000002u) {
-      GOOGLE_DCHECK(_impl_.options_ != nullptr);
-      _impl_.options_->Clear();
-    }
-  }
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>();
-}
-
-const char* OneofDescriptorProto::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) {
-#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure
-  _Internal::HasBits has_bits{};
-  while (!ctx->Done(&ptr)) {
-    uint32_t tag;
-    ptr = ::_pbi::ReadTag(ptr, &tag);
-    switch (tag >> 3) {
-      // optional string name = 1;
-      case 1:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 10)) {
-          auto str = _internal_mutable_name();
-          ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx);
-          CHK_(ptr);
-          #ifndef NDEBUG
-          ::_pbi::VerifyUTF8(str, "google.protobuf.OneofDescriptorProto.name");
-          #endif  // !NDEBUG
-        } else
-          goto handle_unusual;
-        continue;
-      // optional .google.protobuf.OneofOptions options = 2;
-      case 2:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 18)) {
-          ptr = ctx->ParseMessage(_internal_mutable_options(), ptr);
-          CHK_(ptr);
-        } else
-          goto handle_unusual;
-        continue;
-      default:
-        goto handle_unusual;
-    }  // switch
-  handle_unusual:
-    if ((tag == 0) || ((tag & 7) == 4)) {
-      CHK_(ptr);
-      ctx->SetLastTag(tag);
-      goto message_done;
-    }
-    ptr = UnknownFieldParse(
-        tag,
-        _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(),
-        ptr, ctx);
-    CHK_(ptr != nullptr);
-  }  // while
-message_done:
-  _impl_._has_bits_.Or(has_bits);
-  return ptr;
-failure:
-  ptr = nullptr;
-  goto message_done;
-#undef CHK_
-}
-
-uint8_t* OneofDescriptorProto::_InternalSerialize(
-    uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.OneofDescriptorProto)
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // optional string name = 1;
-  if (cached_has_bits & 0x00000001u) {
-    ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::VerifyUTF8StringNamedField(
-      this->_internal_name().data(), static_cast<int>(this->_internal_name().length()),
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::SERIALIZE,
-      "google.protobuf.OneofDescriptorProto.name");
-    target = stream->WriteStringMaybeAliased(
-        1, this->_internal_name(), target);
-  }
-
-  // optional .google.protobuf.OneofOptions options = 2;
-  if (cached_has_bits & 0x00000002u) {
-    target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
-      InternalWriteMessage(2, _Internal::options(this),
-        _Internal::options(this).GetCachedSize(), target, stream);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-        _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.OneofDescriptorProto)
-  return target;
-}
-
-size_t OneofDescriptorProto::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:google.protobuf.OneofDescriptorProto)
-  size_t total_size = 0;
-
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    // optional string name = 1;
-    if (cached_has_bits & 0x00000001u) {
-      total_size += 1 +
-        ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize(
-          this->_internal_name());
-    }
-
-    // optional .google.protobuf.OneofOptions options = 2;
-    if (cached_has_bits & 0x00000002u) {
-      total_size += 1 +
-        ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(
-          *_impl_.options_);
-    }
-
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData OneofDescriptorProto::_class_data_ = {
-    ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck,
-    OneofDescriptorProto::MergeImpl
-};
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*OneofDescriptorProto::GetClassData() const { return &_class_data_; }
-
-
-void OneofDescriptorProto::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) {
-  auto* const _this = static_cast<OneofDescriptorProto*>(&to_msg);
-  auto& from = static_cast<const OneofDescriptorProto&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.OneofDescriptorProto)
-  GOOGLE_DCHECK_NE(&from, _this);
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  cached_has_bits = from._impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      _this->_internal_set_name(from._internal_name());
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _this->_internal_mutable_options()->::PROTOBUF_NAMESPACE_ID::OneofOptions::MergeFrom(
-          from._internal_options());
-    }
-  }
-  _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void OneofDescriptorProto::CopyFrom(const OneofDescriptorProto& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.OneofDescriptorProto)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool OneofDescriptorProto::IsInitialized() const {
-  if (_internal_has_options()) {
-    if (!_impl_.options_->IsInitialized()) return false;
-  }
-  return true;
-}
-
-void OneofDescriptorProto::InternalSwap(OneofDescriptorProto* other) {
-  using std::swap;
-  auto* lhs_arena = GetArenaForAllocation();
-  auto* rhs_arena = other->GetArenaForAllocation();
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::InternalSwap(
-      &_impl_.name_, lhs_arena,
-      &other->_impl_.name_, rhs_arena
-  );
-  swap(_impl_.options_, other->_impl_.options_);
-}
-
-::PROTOBUF_NAMESPACE_ID::Metadata OneofDescriptorProto::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_google_2fprotobuf_2fdescriptor_2eproto_getter, &descriptor_table_google_2fprotobuf_2fdescriptor_2eproto_once,
-      file_level_metadata_google_2fprotobuf_2fdescriptor_2eproto[7]);
-}
-
-// ===================================================================
-
-class EnumDescriptorProto_EnumReservedRange::_Internal {
- public:
-  using HasBits = decltype(std::declval<EnumDescriptorProto_EnumReservedRange>()._impl_._has_bits_);
-  static void set_has_start(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-  static void set_has_end(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
-};
-
-EnumDescriptorProto_EnumReservedRange::EnumDescriptorProto_EnumReservedRange(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                         bool is_message_owned)
-  : ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned) {
-  SharedCtor(arena, is_message_owned);
-  // @@protoc_insertion_point(arena_constructor:google.protobuf.EnumDescriptorProto.EnumReservedRange)
-}
-EnumDescriptorProto_EnumReservedRange::EnumDescriptorProto_EnumReservedRange(const EnumDescriptorProto_EnumReservedRange& from)
-  : ::PROTOBUF_NAMESPACE_ID::Message() {
-  EnumDescriptorProto_EnumReservedRange* const _this = this; (void)_this;
-  new (&_impl_) Impl_{
-      decltype(_impl_._has_bits_){from._impl_._has_bits_}
-    , /*decltype(_impl_._cached_size_)*/{}
-    , decltype(_impl_.start_){}
-    , decltype(_impl_.end_){}};
-
-  _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-  ::memcpy(&_impl_.start_, &from._impl_.start_,
-    static_cast<size_t>(reinterpret_cast<char*>(&_impl_.end_) -
-    reinterpret_cast<char*>(&_impl_.start_)) + sizeof(_impl_.end_));
-  // @@protoc_insertion_point(copy_constructor:google.protobuf.EnumDescriptorProto.EnumReservedRange)
-}
-
-inline void EnumDescriptorProto_EnumReservedRange::SharedCtor(
-    ::_pb::Arena* arena, bool is_message_owned) {
-  (void)arena;
-  (void)is_message_owned;
-  new (&_impl_) Impl_{
-      decltype(_impl_._has_bits_){}
-    , /*decltype(_impl_._cached_size_)*/{}
-    , decltype(_impl_.start_){0}
-    , decltype(_impl_.end_){0}
-  };
-}
-
-EnumDescriptorProto_EnumReservedRange::~EnumDescriptorProto_EnumReservedRange() {
-  // @@protoc_insertion_point(destructor:google.protobuf.EnumDescriptorProto.EnumReservedRange)
-  if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) {
-  (void)arena;
-    return;
-  }
-  SharedDtor();
-}
-
-inline void EnumDescriptorProto_EnumReservedRange::SharedDtor() {
-  GOOGLE_DCHECK(GetArenaForAllocation() == nullptr);
-}
-
-void EnumDescriptorProto_EnumReservedRange::SetCachedSize(int size) const {
-  _impl_._cached_size_.Set(size);
-}
-
-void EnumDescriptorProto_EnumReservedRange::Clear() {
-// @@protoc_insertion_point(message_clear_start:google.protobuf.EnumDescriptorProto.EnumReservedRange)
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    ::memset(&_impl_.start_, 0, static_cast<size_t>(
-        reinterpret_cast<char*>(&_impl_.end_) -
-        reinterpret_cast<char*>(&_impl_.start_)) + sizeof(_impl_.end_));
-  }
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>();
-}
-
-const char* EnumDescriptorProto_EnumReservedRange::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) {
-#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure
-  _Internal::HasBits has_bits{};
-  while (!ctx->Done(&ptr)) {
-    uint32_t tag;
-    ptr = ::_pbi::ReadTag(ptr, &tag);
-    switch (tag >> 3) {
-      // optional int32 start = 1;
-      case 1:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 8)) {
-          _Internal::set_has_start(&has_bits);
-          _impl_.start_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr);
-          CHK_(ptr);
-        } else
-          goto handle_unusual;
-        continue;
-      // optional int32 end = 2;
-      case 2:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 16)) {
-          _Internal::set_has_end(&has_bits);
-          _impl_.end_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr);
-          CHK_(ptr);
-        } else
-          goto handle_unusual;
-        continue;
-      default:
-        goto handle_unusual;
-    }  // switch
-  handle_unusual:
-    if ((tag == 0) || ((tag & 7) == 4)) {
-      CHK_(ptr);
-      ctx->SetLastTag(tag);
-      goto message_done;
-    }
-    ptr = UnknownFieldParse(
-        tag,
-        _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(),
-        ptr, ctx);
-    CHK_(ptr != nullptr);
-  }  // while
-message_done:
-  _impl_._has_bits_.Or(has_bits);
-  return ptr;
-failure:
-  ptr = nullptr;
-  goto message_done;
-#undef CHK_
-}
-
-uint8_t* EnumDescriptorProto_EnumReservedRange::_InternalSerialize(
-    uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.EnumDescriptorProto.EnumReservedRange)
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // optional int32 start = 1;
-  if (cached_has_bits & 0x00000001u) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteInt32ToArray(1, this->_internal_start(), target);
-  }
-
-  // optional int32 end = 2;
-  if (cached_has_bits & 0x00000002u) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteInt32ToArray(2, this->_internal_end(), target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-        _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.EnumDescriptorProto.EnumReservedRange)
-  return target;
-}
-
-size_t EnumDescriptorProto_EnumReservedRange::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:google.protobuf.EnumDescriptorProto.EnumReservedRange)
-  size_t total_size = 0;
-
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    // optional int32 start = 1;
-    if (cached_has_bits & 0x00000001u) {
-      total_size += ::_pbi::WireFormatLite::Int32SizePlusOne(this->_internal_start());
-    }
-
-    // optional int32 end = 2;
-    if (cached_has_bits & 0x00000002u) {
-      total_size += ::_pbi::WireFormatLite::Int32SizePlusOne(this->_internal_end());
-    }
-
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData EnumDescriptorProto_EnumReservedRange::_class_data_ = {
-    ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck,
-    EnumDescriptorProto_EnumReservedRange::MergeImpl
-};
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*EnumDescriptorProto_EnumReservedRange::GetClassData() const { return &_class_data_; }
-
-
-void EnumDescriptorProto_EnumReservedRange::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) {
-  auto* const _this = static_cast<EnumDescriptorProto_EnumReservedRange*>(&to_msg);
-  auto& from = static_cast<const EnumDescriptorProto_EnumReservedRange&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.EnumDescriptorProto.EnumReservedRange)
-  GOOGLE_DCHECK_NE(&from, _this);
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  cached_has_bits = from._impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      _this->_impl_.start_ = from._impl_.start_;
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _this->_impl_.end_ = from._impl_.end_;
-    }
-    _this->_impl_._has_bits_[0] |= cached_has_bits;
-  }
-  _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void EnumDescriptorProto_EnumReservedRange::CopyFrom(const EnumDescriptorProto_EnumReservedRange& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.EnumDescriptorProto.EnumReservedRange)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool EnumDescriptorProto_EnumReservedRange::IsInitialized() const {
-  return true;
-}
-
-void EnumDescriptorProto_EnumReservedRange::InternalSwap(EnumDescriptorProto_EnumReservedRange* other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  ::PROTOBUF_NAMESPACE_ID::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(EnumDescriptorProto_EnumReservedRange, _impl_.end_)
-      + sizeof(EnumDescriptorProto_EnumReservedRange::_impl_.end_)
-      - PROTOBUF_FIELD_OFFSET(EnumDescriptorProto_EnumReservedRange, _impl_.start_)>(
-          reinterpret_cast<char*>(&_impl_.start_),
-          reinterpret_cast<char*>(&other->_impl_.start_));
-}
-
-::PROTOBUF_NAMESPACE_ID::Metadata EnumDescriptorProto_EnumReservedRange::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_google_2fprotobuf_2fdescriptor_2eproto_getter, &descriptor_table_google_2fprotobuf_2fdescriptor_2eproto_once,
-      file_level_metadata_google_2fprotobuf_2fdescriptor_2eproto[8]);
-}
-
-// ===================================================================
-
-class EnumDescriptorProto::_Internal {
- public:
-  using HasBits = decltype(std::declval<EnumDescriptorProto>()._impl_._has_bits_);
-  static void set_has_name(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::EnumOptions& options(const EnumDescriptorProto* msg);
-  static void set_has_options(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
-};
-
-const ::PROTOBUF_NAMESPACE_ID::EnumOptions&
-EnumDescriptorProto::_Internal::options(const EnumDescriptorProto* msg) {
-  return *msg->_impl_.options_;
-}
-EnumDescriptorProto::EnumDescriptorProto(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                         bool is_message_owned)
-  : ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned) {
-  SharedCtor(arena, is_message_owned);
-  // @@protoc_insertion_point(arena_constructor:google.protobuf.EnumDescriptorProto)
-}
-EnumDescriptorProto::EnumDescriptorProto(const EnumDescriptorProto& from)
-  : ::PROTOBUF_NAMESPACE_ID::Message() {
-  EnumDescriptorProto* const _this = this; (void)_this;
-  new (&_impl_) Impl_{
-      decltype(_impl_._has_bits_){from._impl_._has_bits_}
-    , /*decltype(_impl_._cached_size_)*/{}
-    , decltype(_impl_.value_){from._impl_.value_}
-    , decltype(_impl_.reserved_range_){from._impl_.reserved_range_}
-    , decltype(_impl_.reserved_name_){from._impl_.reserved_name_}
-    , decltype(_impl_.name_){}
-    , decltype(_impl_.options_){nullptr}};
-
-  _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-  _impl_.name_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.name_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (from._internal_has_name()) {
-    _this->_impl_.name_.Set(from._internal_name(), 
-      _this->GetArenaForAllocation());
-  }
-  if (from._internal_has_options()) {
-    _this->_impl_.options_ = new ::PROTOBUF_NAMESPACE_ID::EnumOptions(*from._impl_.options_);
-  }
-  // @@protoc_insertion_point(copy_constructor:google.protobuf.EnumDescriptorProto)
-}
-
-inline void EnumDescriptorProto::SharedCtor(
-    ::_pb::Arena* arena, bool is_message_owned) {
-  (void)arena;
-  (void)is_message_owned;
-  new (&_impl_) Impl_{
-      decltype(_impl_._has_bits_){}
-    , /*decltype(_impl_._cached_size_)*/{}
-    , decltype(_impl_.value_){arena}
-    , decltype(_impl_.reserved_range_){arena}
-    , decltype(_impl_.reserved_name_){arena}
-    , decltype(_impl_.name_){}
-    , decltype(_impl_.options_){nullptr}
-  };
-  _impl_.name_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.name_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-}
-
-EnumDescriptorProto::~EnumDescriptorProto() {
-  // @@protoc_insertion_point(destructor:google.protobuf.EnumDescriptorProto)
-  if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) {
-  (void)arena;
-    return;
-  }
-  SharedDtor();
-}
-
-inline void EnumDescriptorProto::SharedDtor() {
-  GOOGLE_DCHECK(GetArenaForAllocation() == nullptr);
-  _impl_.value_.~RepeatedPtrField();
-  _impl_.reserved_range_.~RepeatedPtrField();
-  _impl_.reserved_name_.~RepeatedPtrField();
-  _impl_.name_.Destroy();
-  if (this != internal_default_instance()) delete _impl_.options_;
-}
-
-void EnumDescriptorProto::SetCachedSize(int size) const {
-  _impl_._cached_size_.Set(size);
-}
-
-void EnumDescriptorProto::Clear() {
-// @@protoc_insertion_point(message_clear_start:google.protobuf.EnumDescriptorProto)
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.value_.Clear();
-  _impl_.reserved_range_.Clear();
-  _impl_.reserved_name_.Clear();
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      _impl_.name_.ClearNonDefaultToEmpty();
-    }
-    if (cached_has_bits & 0x00000002u) {
-      GOOGLE_DCHECK(_impl_.options_ != nullptr);
-      _impl_.options_->Clear();
-    }
-  }
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>();
-}
-
-const char* EnumDescriptorProto::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) {
-#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure
-  _Internal::HasBits has_bits{};
-  while (!ctx->Done(&ptr)) {
-    uint32_t tag;
-    ptr = ::_pbi::ReadTag(ptr, &tag);
-    switch (tag >> 3) {
-      // optional string name = 1;
-      case 1:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 10)) {
-          auto str = _internal_mutable_name();
-          ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx);
-          CHK_(ptr);
-          #ifndef NDEBUG
-          ::_pbi::VerifyUTF8(str, "google.protobuf.EnumDescriptorProto.name");
-          #endif  // !NDEBUG
-        } else
-          goto handle_unusual;
-        continue;
-      // repeated .google.protobuf.EnumValueDescriptorProto value = 2;
-      case 2:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 18)) {
-          ptr -= 1;
-          do {
-            ptr += 1;
-            ptr = ctx->ParseMessage(_internal_add_value(), ptr);
-            CHK_(ptr);
-            if (!ctx->DataAvailable(ptr)) break;
-          } while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<18>(ptr));
-        } else
-          goto handle_unusual;
-        continue;
-      // optional .google.protobuf.EnumOptions options = 3;
-      case 3:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 26)) {
-          ptr = ctx->ParseMessage(_internal_mutable_options(), ptr);
-          CHK_(ptr);
-        } else
-          goto handle_unusual;
-        continue;
-      // repeated .google.protobuf.EnumDescriptorProto.EnumReservedRange reserved_range = 4;
-      case 4:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 34)) {
-          ptr -= 1;
-          do {
-            ptr += 1;
-            ptr = ctx->ParseMessage(_internal_add_reserved_range(), ptr);
-            CHK_(ptr);
-            if (!ctx->DataAvailable(ptr)) break;
-          } while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<34>(ptr));
-        } else
-          goto handle_unusual;
-        continue;
-      // repeated string reserved_name = 5;
-      case 5:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 42)) {
-          ptr -= 1;
-          do {
-            ptr += 1;
-            auto str = _internal_add_reserved_name();
-            ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx);
-            CHK_(ptr);
-            #ifndef NDEBUG
-            ::_pbi::VerifyUTF8(str, "google.protobuf.EnumDescriptorProto.reserved_name");
-            #endif  // !NDEBUG
-            if (!ctx->DataAvailable(ptr)) break;
-          } while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<42>(ptr));
-        } else
-          goto handle_unusual;
-        continue;
-      default:
-        goto handle_unusual;
-    }  // switch
-  handle_unusual:
-    if ((tag == 0) || ((tag & 7) == 4)) {
-      CHK_(ptr);
-      ctx->SetLastTag(tag);
-      goto message_done;
-    }
-    ptr = UnknownFieldParse(
-        tag,
-        _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(),
-        ptr, ctx);
-    CHK_(ptr != nullptr);
-  }  // while
-message_done:
-  _impl_._has_bits_.Or(has_bits);
-  return ptr;
-failure:
-  ptr = nullptr;
-  goto message_done;
-#undef CHK_
-}
-
-uint8_t* EnumDescriptorProto::_InternalSerialize(
-    uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.EnumDescriptorProto)
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // optional string name = 1;
-  if (cached_has_bits & 0x00000001u) {
-    ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::VerifyUTF8StringNamedField(
-      this->_internal_name().data(), static_cast<int>(this->_internal_name().length()),
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::SERIALIZE,
-      "google.protobuf.EnumDescriptorProto.name");
-    target = stream->WriteStringMaybeAliased(
-        1, this->_internal_name(), target);
-  }
-
-  // repeated .google.protobuf.EnumValueDescriptorProto value = 2;
-  for (unsigned i = 0,
-      n = static_cast<unsigned>(this->_internal_value_size()); i < n; i++) {
-    const auto& repfield = this->_internal_value(i);
-    target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
-        InternalWriteMessage(2, repfield, repfield.GetCachedSize(), target, stream);
-  }
-
-  // optional .google.protobuf.EnumOptions options = 3;
-  if (cached_has_bits & 0x00000002u) {
-    target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
-      InternalWriteMessage(3, _Internal::options(this),
-        _Internal::options(this).GetCachedSize(), target, stream);
-  }
-
-  // repeated .google.protobuf.EnumDescriptorProto.EnumReservedRange reserved_range = 4;
-  for (unsigned i = 0,
-      n = static_cast<unsigned>(this->_internal_reserved_range_size()); i < n; i++) {
-    const auto& repfield = this->_internal_reserved_range(i);
-    target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
-        InternalWriteMessage(4, repfield, repfield.GetCachedSize(), target, stream);
-  }
-
-  // repeated string reserved_name = 5;
-  for (int i = 0, n = this->_internal_reserved_name_size(); i < n; i++) {
-    const auto& s = this->_internal_reserved_name(i);
-    ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::VerifyUTF8StringNamedField(
-      s.data(), static_cast<int>(s.length()),
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::SERIALIZE,
-      "google.protobuf.EnumDescriptorProto.reserved_name");
-    target = stream->WriteString(5, s, target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-        _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.EnumDescriptorProto)
-  return target;
-}
-
-size_t EnumDescriptorProto::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:google.protobuf.EnumDescriptorProto)
-  size_t total_size = 0;
-
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // repeated .google.protobuf.EnumValueDescriptorProto value = 2;
-  total_size += 1UL * this->_internal_value_size();
-  for (const auto& msg : this->_impl_.value_) {
-    total_size +=
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(msg);
-  }
-
-  // repeated .google.protobuf.EnumDescriptorProto.EnumReservedRange reserved_range = 4;
-  total_size += 1UL * this->_internal_reserved_range_size();
-  for (const auto& msg : this->_impl_.reserved_range_) {
-    total_size +=
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(msg);
-  }
-
-  // repeated string reserved_name = 5;
-  total_size += 1 *
-      ::PROTOBUF_NAMESPACE_ID::internal::FromIntSize(_impl_.reserved_name_.size());
-  for (int i = 0, n = _impl_.reserved_name_.size(); i < n; i++) {
-    total_size += ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize(
-      _impl_.reserved_name_.Get(i));
-  }
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    // optional string name = 1;
-    if (cached_has_bits & 0x00000001u) {
-      total_size += 1 +
-        ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize(
-          this->_internal_name());
-    }
-
-    // optional .google.protobuf.EnumOptions options = 3;
-    if (cached_has_bits & 0x00000002u) {
-      total_size += 1 +
-        ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(
-          *_impl_.options_);
-    }
-
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData EnumDescriptorProto::_class_data_ = {
-    ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck,
-    EnumDescriptorProto::MergeImpl
-};
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*EnumDescriptorProto::GetClassData() const { return &_class_data_; }
-
-
-void EnumDescriptorProto::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) {
-  auto* const _this = static_cast<EnumDescriptorProto*>(&to_msg);
-  auto& from = static_cast<const EnumDescriptorProto&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.EnumDescriptorProto)
-  GOOGLE_DCHECK_NE(&from, _this);
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  _this->_impl_.value_.MergeFrom(from._impl_.value_);
-  _this->_impl_.reserved_range_.MergeFrom(from._impl_.reserved_range_);
-  _this->_impl_.reserved_name_.MergeFrom(from._impl_.reserved_name_);
-  cached_has_bits = from._impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      _this->_internal_set_name(from._internal_name());
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _this->_internal_mutable_options()->::PROTOBUF_NAMESPACE_ID::EnumOptions::MergeFrom(
-          from._internal_options());
-    }
-  }
-  _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void EnumDescriptorProto::CopyFrom(const EnumDescriptorProto& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.EnumDescriptorProto)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool EnumDescriptorProto::IsInitialized() const {
-  if (!::PROTOBUF_NAMESPACE_ID::internal::AllAreInitialized(_impl_.value_))
-    return false;
-  if (_internal_has_options()) {
-    if (!_impl_.options_->IsInitialized()) return false;
-  }
-  return true;
-}
-
-void EnumDescriptorProto::InternalSwap(EnumDescriptorProto* other) {
-  using std::swap;
-  auto* lhs_arena = GetArenaForAllocation();
-  auto* rhs_arena = other->GetArenaForAllocation();
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  _impl_.value_.InternalSwap(&other->_impl_.value_);
-  _impl_.reserved_range_.InternalSwap(&other->_impl_.reserved_range_);
-  _impl_.reserved_name_.InternalSwap(&other->_impl_.reserved_name_);
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::InternalSwap(
-      &_impl_.name_, lhs_arena,
-      &other->_impl_.name_, rhs_arena
-  );
-  swap(_impl_.options_, other->_impl_.options_);
-}
-
-::PROTOBUF_NAMESPACE_ID::Metadata EnumDescriptorProto::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_google_2fprotobuf_2fdescriptor_2eproto_getter, &descriptor_table_google_2fprotobuf_2fdescriptor_2eproto_once,
-      file_level_metadata_google_2fprotobuf_2fdescriptor_2eproto[9]);
-}
-
-// ===================================================================
-
-class EnumValueDescriptorProto::_Internal {
- public:
-  using HasBits = decltype(std::declval<EnumValueDescriptorProto>()._impl_._has_bits_);
-  static void set_has_name(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-  static void set_has_number(HasBits* has_bits) {
-    (*has_bits)[0] |= 4u;
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::EnumValueOptions& options(const EnumValueDescriptorProto* msg);
-  static void set_has_options(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
-};
-
-const ::PROTOBUF_NAMESPACE_ID::EnumValueOptions&
-EnumValueDescriptorProto::_Internal::options(const EnumValueDescriptorProto* msg) {
-  return *msg->_impl_.options_;
-}
-EnumValueDescriptorProto::EnumValueDescriptorProto(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                         bool is_message_owned)
-  : ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned) {
-  SharedCtor(arena, is_message_owned);
-  // @@protoc_insertion_point(arena_constructor:google.protobuf.EnumValueDescriptorProto)
-}
-EnumValueDescriptorProto::EnumValueDescriptorProto(const EnumValueDescriptorProto& from)
-  : ::PROTOBUF_NAMESPACE_ID::Message() {
-  EnumValueDescriptorProto* const _this = this; (void)_this;
-  new (&_impl_) Impl_{
-      decltype(_impl_._has_bits_){from._impl_._has_bits_}
-    , /*decltype(_impl_._cached_size_)*/{}
-    , decltype(_impl_.name_){}
-    , decltype(_impl_.options_){nullptr}
-    , decltype(_impl_.number_){}};
-
-  _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-  _impl_.name_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.name_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (from._internal_has_name()) {
-    _this->_impl_.name_.Set(from._internal_name(), 
-      _this->GetArenaForAllocation());
-  }
-  if (from._internal_has_options()) {
-    _this->_impl_.options_ = new ::PROTOBUF_NAMESPACE_ID::EnumValueOptions(*from._impl_.options_);
-  }
-  _this->_impl_.number_ = from._impl_.number_;
-  // @@protoc_insertion_point(copy_constructor:google.protobuf.EnumValueDescriptorProto)
-}
-
-inline void EnumValueDescriptorProto::SharedCtor(
-    ::_pb::Arena* arena, bool is_message_owned) {
-  (void)arena;
-  (void)is_message_owned;
-  new (&_impl_) Impl_{
-      decltype(_impl_._has_bits_){}
-    , /*decltype(_impl_._cached_size_)*/{}
-    , decltype(_impl_.name_){}
-    , decltype(_impl_.options_){nullptr}
-    , decltype(_impl_.number_){0}
-  };
-  _impl_.name_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.name_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-}
-
-EnumValueDescriptorProto::~EnumValueDescriptorProto() {
-  // @@protoc_insertion_point(destructor:google.protobuf.EnumValueDescriptorProto)
-  if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) {
-  (void)arena;
-    return;
-  }
-  SharedDtor();
-}
-
-inline void EnumValueDescriptorProto::SharedDtor() {
-  GOOGLE_DCHECK(GetArenaForAllocation() == nullptr);
-  _impl_.name_.Destroy();
-  if (this != internal_default_instance()) delete _impl_.options_;
-}
-
-void EnumValueDescriptorProto::SetCachedSize(int size) const {
-  _impl_._cached_size_.Set(size);
-}
-
-void EnumValueDescriptorProto::Clear() {
-// @@protoc_insertion_point(message_clear_start:google.protobuf.EnumValueDescriptorProto)
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      _impl_.name_.ClearNonDefaultToEmpty();
-    }
-    if (cached_has_bits & 0x00000002u) {
-      GOOGLE_DCHECK(_impl_.options_ != nullptr);
-      _impl_.options_->Clear();
-    }
-  }
-  _impl_.number_ = 0;
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>();
-}
-
-const char* EnumValueDescriptorProto::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) {
-#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure
-  _Internal::HasBits has_bits{};
-  while (!ctx->Done(&ptr)) {
-    uint32_t tag;
-    ptr = ::_pbi::ReadTag(ptr, &tag);
-    switch (tag >> 3) {
-      // optional string name = 1;
-      case 1:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 10)) {
-          auto str = _internal_mutable_name();
-          ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx);
-          CHK_(ptr);
-          #ifndef NDEBUG
-          ::_pbi::VerifyUTF8(str, "google.protobuf.EnumValueDescriptorProto.name");
-          #endif  // !NDEBUG
-        } else
-          goto handle_unusual;
-        continue;
-      // optional int32 number = 2;
-      case 2:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 16)) {
-          _Internal::set_has_number(&has_bits);
-          _impl_.number_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr);
-          CHK_(ptr);
-        } else
-          goto handle_unusual;
-        continue;
-      // optional .google.protobuf.EnumValueOptions options = 3;
-      case 3:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 26)) {
-          ptr = ctx->ParseMessage(_internal_mutable_options(), ptr);
-          CHK_(ptr);
-        } else
-          goto handle_unusual;
-        continue;
-      default:
-        goto handle_unusual;
-    }  // switch
-  handle_unusual:
-    if ((tag == 0) || ((tag & 7) == 4)) {
-      CHK_(ptr);
-      ctx->SetLastTag(tag);
-      goto message_done;
-    }
-    ptr = UnknownFieldParse(
-        tag,
-        _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(),
-        ptr, ctx);
-    CHK_(ptr != nullptr);
-  }  // while
-message_done:
-  _impl_._has_bits_.Or(has_bits);
-  return ptr;
-failure:
-  ptr = nullptr;
-  goto message_done;
-#undef CHK_
-}
-
-uint8_t* EnumValueDescriptorProto::_InternalSerialize(
-    uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.EnumValueDescriptorProto)
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // optional string name = 1;
-  if (cached_has_bits & 0x00000001u) {
-    ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::VerifyUTF8StringNamedField(
-      this->_internal_name().data(), static_cast<int>(this->_internal_name().length()),
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::SERIALIZE,
-      "google.protobuf.EnumValueDescriptorProto.name");
-    target = stream->WriteStringMaybeAliased(
-        1, this->_internal_name(), target);
-  }
-
-  // optional int32 number = 2;
-  if (cached_has_bits & 0x00000004u) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteInt32ToArray(2, this->_internal_number(), target);
-  }
-
-  // optional .google.protobuf.EnumValueOptions options = 3;
-  if (cached_has_bits & 0x00000002u) {
-    target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
-      InternalWriteMessage(3, _Internal::options(this),
-        _Internal::options(this).GetCachedSize(), target, stream);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-        _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.EnumValueDescriptorProto)
-  return target;
-}
-
-size_t EnumValueDescriptorProto::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:google.protobuf.EnumValueDescriptorProto)
-  size_t total_size = 0;
-
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000007u) {
-    // optional string name = 1;
-    if (cached_has_bits & 0x00000001u) {
-      total_size += 1 +
-        ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize(
-          this->_internal_name());
-    }
-
-    // optional .google.protobuf.EnumValueOptions options = 3;
-    if (cached_has_bits & 0x00000002u) {
-      total_size += 1 +
-        ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(
-          *_impl_.options_);
-    }
-
-    // optional int32 number = 2;
-    if (cached_has_bits & 0x00000004u) {
-      total_size += ::_pbi::WireFormatLite::Int32SizePlusOne(this->_internal_number());
-    }
-
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData EnumValueDescriptorProto::_class_data_ = {
-    ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck,
-    EnumValueDescriptorProto::MergeImpl
-};
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*EnumValueDescriptorProto::GetClassData() const { return &_class_data_; }
-
-
-void EnumValueDescriptorProto::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) {
-  auto* const _this = static_cast<EnumValueDescriptorProto*>(&to_msg);
-  auto& from = static_cast<const EnumValueDescriptorProto&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.EnumValueDescriptorProto)
-  GOOGLE_DCHECK_NE(&from, _this);
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  cached_has_bits = from._impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000007u) {
-    if (cached_has_bits & 0x00000001u) {
-      _this->_internal_set_name(from._internal_name());
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _this->_internal_mutable_options()->::PROTOBUF_NAMESPACE_ID::EnumValueOptions::MergeFrom(
-          from._internal_options());
-    }
-    if (cached_has_bits & 0x00000004u) {
-      _this->_impl_.number_ = from._impl_.number_;
-    }
-    _this->_impl_._has_bits_[0] |= cached_has_bits;
-  }
-  _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void EnumValueDescriptorProto::CopyFrom(const EnumValueDescriptorProto& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.EnumValueDescriptorProto)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool EnumValueDescriptorProto::IsInitialized() const {
-  if (_internal_has_options()) {
-    if (!_impl_.options_->IsInitialized()) return false;
-  }
-  return true;
-}
-
-void EnumValueDescriptorProto::InternalSwap(EnumValueDescriptorProto* other) {
-  using std::swap;
-  auto* lhs_arena = GetArenaForAllocation();
-  auto* rhs_arena = other->GetArenaForAllocation();
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::InternalSwap(
-      &_impl_.name_, lhs_arena,
-      &other->_impl_.name_, rhs_arena
-  );
-  ::PROTOBUF_NAMESPACE_ID::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(EnumValueDescriptorProto, _impl_.number_)
-      + sizeof(EnumValueDescriptorProto::_impl_.number_)
-      - PROTOBUF_FIELD_OFFSET(EnumValueDescriptorProto, _impl_.options_)>(
-          reinterpret_cast<char*>(&_impl_.options_),
-          reinterpret_cast<char*>(&other->_impl_.options_));
-}
-
-::PROTOBUF_NAMESPACE_ID::Metadata EnumValueDescriptorProto::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_google_2fprotobuf_2fdescriptor_2eproto_getter, &descriptor_table_google_2fprotobuf_2fdescriptor_2eproto_once,
-      file_level_metadata_google_2fprotobuf_2fdescriptor_2eproto[10]);
-}
-
-// ===================================================================
-
-class ServiceDescriptorProto::_Internal {
- public:
-  using HasBits = decltype(std::declval<ServiceDescriptorProto>()._impl_._has_bits_);
-  static void set_has_name(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::ServiceOptions& options(const ServiceDescriptorProto* msg);
-  static void set_has_options(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
-};
-
-const ::PROTOBUF_NAMESPACE_ID::ServiceOptions&
-ServiceDescriptorProto::_Internal::options(const ServiceDescriptorProto* msg) {
-  return *msg->_impl_.options_;
-}
-ServiceDescriptorProto::ServiceDescriptorProto(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                         bool is_message_owned)
-  : ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned) {
-  SharedCtor(arena, is_message_owned);
-  // @@protoc_insertion_point(arena_constructor:google.protobuf.ServiceDescriptorProto)
-}
-ServiceDescriptorProto::ServiceDescriptorProto(const ServiceDescriptorProto& from)
-  : ::PROTOBUF_NAMESPACE_ID::Message() {
-  ServiceDescriptorProto* const _this = this; (void)_this;
-  new (&_impl_) Impl_{
-      decltype(_impl_._has_bits_){from._impl_._has_bits_}
-    , /*decltype(_impl_._cached_size_)*/{}
-    , decltype(_impl_.method_){from._impl_.method_}
-    , decltype(_impl_.name_){}
-    , decltype(_impl_.options_){nullptr}};
-
-  _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-  _impl_.name_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.name_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (from._internal_has_name()) {
-    _this->_impl_.name_.Set(from._internal_name(), 
-      _this->GetArenaForAllocation());
-  }
-  if (from._internal_has_options()) {
-    _this->_impl_.options_ = new ::PROTOBUF_NAMESPACE_ID::ServiceOptions(*from._impl_.options_);
-  }
-  // @@protoc_insertion_point(copy_constructor:google.protobuf.ServiceDescriptorProto)
-}
-
-inline void ServiceDescriptorProto::SharedCtor(
-    ::_pb::Arena* arena, bool is_message_owned) {
-  (void)arena;
-  (void)is_message_owned;
-  new (&_impl_) Impl_{
-      decltype(_impl_._has_bits_){}
-    , /*decltype(_impl_._cached_size_)*/{}
-    , decltype(_impl_.method_){arena}
-    , decltype(_impl_.name_){}
-    , decltype(_impl_.options_){nullptr}
-  };
-  _impl_.name_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.name_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-}
-
-ServiceDescriptorProto::~ServiceDescriptorProto() {
-  // @@protoc_insertion_point(destructor:google.protobuf.ServiceDescriptorProto)
-  if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) {
-  (void)arena;
-    return;
-  }
-  SharedDtor();
-}
-
-inline void ServiceDescriptorProto::SharedDtor() {
-  GOOGLE_DCHECK(GetArenaForAllocation() == nullptr);
-  _impl_.method_.~RepeatedPtrField();
-  _impl_.name_.Destroy();
-  if (this != internal_default_instance()) delete _impl_.options_;
-}
-
-void ServiceDescriptorProto::SetCachedSize(int size) const {
-  _impl_._cached_size_.Set(size);
-}
-
-void ServiceDescriptorProto::Clear() {
-// @@protoc_insertion_point(message_clear_start:google.protobuf.ServiceDescriptorProto)
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.method_.Clear();
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      _impl_.name_.ClearNonDefaultToEmpty();
-    }
-    if (cached_has_bits & 0x00000002u) {
-      GOOGLE_DCHECK(_impl_.options_ != nullptr);
-      _impl_.options_->Clear();
-    }
-  }
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>();
-}
-
-const char* ServiceDescriptorProto::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) {
-#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure
-  _Internal::HasBits has_bits{};
-  while (!ctx->Done(&ptr)) {
-    uint32_t tag;
-    ptr = ::_pbi::ReadTag(ptr, &tag);
-    switch (tag >> 3) {
-      // optional string name = 1;
-      case 1:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 10)) {
-          auto str = _internal_mutable_name();
-          ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx);
-          CHK_(ptr);
-          #ifndef NDEBUG
-          ::_pbi::VerifyUTF8(str, "google.protobuf.ServiceDescriptorProto.name");
-          #endif  // !NDEBUG
-        } else
-          goto handle_unusual;
-        continue;
-      // repeated .google.protobuf.MethodDescriptorProto method = 2;
-      case 2:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 18)) {
-          ptr -= 1;
-          do {
-            ptr += 1;
-            ptr = ctx->ParseMessage(_internal_add_method(), ptr);
-            CHK_(ptr);
-            if (!ctx->DataAvailable(ptr)) break;
-          } while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<18>(ptr));
-        } else
-          goto handle_unusual;
-        continue;
-      // optional .google.protobuf.ServiceOptions options = 3;
-      case 3:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 26)) {
-          ptr = ctx->ParseMessage(_internal_mutable_options(), ptr);
-          CHK_(ptr);
-        } else
-          goto handle_unusual;
-        continue;
-      default:
-        goto handle_unusual;
-    }  // switch
-  handle_unusual:
-    if ((tag == 0) || ((tag & 7) == 4)) {
-      CHK_(ptr);
-      ctx->SetLastTag(tag);
-      goto message_done;
-    }
-    ptr = UnknownFieldParse(
-        tag,
-        _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(),
-        ptr, ctx);
-    CHK_(ptr != nullptr);
-  }  // while
-message_done:
-  _impl_._has_bits_.Or(has_bits);
-  return ptr;
-failure:
-  ptr = nullptr;
-  goto message_done;
-#undef CHK_
-}
-
-uint8_t* ServiceDescriptorProto::_InternalSerialize(
-    uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.ServiceDescriptorProto)
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // optional string name = 1;
-  if (cached_has_bits & 0x00000001u) {
-    ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::VerifyUTF8StringNamedField(
-      this->_internal_name().data(), static_cast<int>(this->_internal_name().length()),
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::SERIALIZE,
-      "google.protobuf.ServiceDescriptorProto.name");
-    target = stream->WriteStringMaybeAliased(
-        1, this->_internal_name(), target);
-  }
-
-  // repeated .google.protobuf.MethodDescriptorProto method = 2;
-  for (unsigned i = 0,
-      n = static_cast<unsigned>(this->_internal_method_size()); i < n; i++) {
-    const auto& repfield = this->_internal_method(i);
-    target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
-        InternalWriteMessage(2, repfield, repfield.GetCachedSize(), target, stream);
-  }
-
-  // optional .google.protobuf.ServiceOptions options = 3;
-  if (cached_has_bits & 0x00000002u) {
-    target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
-      InternalWriteMessage(3, _Internal::options(this),
-        _Internal::options(this).GetCachedSize(), target, stream);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-        _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.ServiceDescriptorProto)
-  return target;
-}
-
-size_t ServiceDescriptorProto::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:google.protobuf.ServiceDescriptorProto)
-  size_t total_size = 0;
-
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // repeated .google.protobuf.MethodDescriptorProto method = 2;
-  total_size += 1UL * this->_internal_method_size();
-  for (const auto& msg : this->_impl_.method_) {
-    total_size +=
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(msg);
-  }
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    // optional string name = 1;
-    if (cached_has_bits & 0x00000001u) {
-      total_size += 1 +
-        ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize(
-          this->_internal_name());
-    }
-
-    // optional .google.protobuf.ServiceOptions options = 3;
-    if (cached_has_bits & 0x00000002u) {
-      total_size += 1 +
-        ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(
-          *_impl_.options_);
-    }
-
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData ServiceDescriptorProto::_class_data_ = {
-    ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck,
-    ServiceDescriptorProto::MergeImpl
-};
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*ServiceDescriptorProto::GetClassData() const { return &_class_data_; }
-
-
-void ServiceDescriptorProto::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) {
-  auto* const _this = static_cast<ServiceDescriptorProto*>(&to_msg);
-  auto& from = static_cast<const ServiceDescriptorProto&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.ServiceDescriptorProto)
-  GOOGLE_DCHECK_NE(&from, _this);
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  _this->_impl_.method_.MergeFrom(from._impl_.method_);
-  cached_has_bits = from._impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      _this->_internal_set_name(from._internal_name());
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _this->_internal_mutable_options()->::PROTOBUF_NAMESPACE_ID::ServiceOptions::MergeFrom(
-          from._internal_options());
-    }
-  }
-  _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void ServiceDescriptorProto::CopyFrom(const ServiceDescriptorProto& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.ServiceDescriptorProto)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool ServiceDescriptorProto::IsInitialized() const {
-  if (!::PROTOBUF_NAMESPACE_ID::internal::AllAreInitialized(_impl_.method_))
-    return false;
-  if (_internal_has_options()) {
-    if (!_impl_.options_->IsInitialized()) return false;
-  }
-  return true;
-}
-
-void ServiceDescriptorProto::InternalSwap(ServiceDescriptorProto* other) {
-  using std::swap;
-  auto* lhs_arena = GetArenaForAllocation();
-  auto* rhs_arena = other->GetArenaForAllocation();
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  _impl_.method_.InternalSwap(&other->_impl_.method_);
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::InternalSwap(
-      &_impl_.name_, lhs_arena,
-      &other->_impl_.name_, rhs_arena
-  );
-  swap(_impl_.options_, other->_impl_.options_);
-}
-
-::PROTOBUF_NAMESPACE_ID::Metadata ServiceDescriptorProto::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_google_2fprotobuf_2fdescriptor_2eproto_getter, &descriptor_table_google_2fprotobuf_2fdescriptor_2eproto_once,
-      file_level_metadata_google_2fprotobuf_2fdescriptor_2eproto[11]);
-}
-
-// ===================================================================
-
-class MethodDescriptorProto::_Internal {
- public:
-  using HasBits = decltype(std::declval<MethodDescriptorProto>()._impl_._has_bits_);
-  static void set_has_name(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-  static void set_has_input_type(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
-  static void set_has_output_type(HasBits* has_bits) {
-    (*has_bits)[0] |= 4u;
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::MethodOptions& options(const MethodDescriptorProto* msg);
-  static void set_has_options(HasBits* has_bits) {
-    (*has_bits)[0] |= 8u;
-  }
-  static void set_has_client_streaming(HasBits* has_bits) {
-    (*has_bits)[0] |= 16u;
-  }
-  static void set_has_server_streaming(HasBits* has_bits) {
-    (*has_bits)[0] |= 32u;
-  }
-};
-
-const ::PROTOBUF_NAMESPACE_ID::MethodOptions&
-MethodDescriptorProto::_Internal::options(const MethodDescriptorProto* msg) {
-  return *msg->_impl_.options_;
-}
-MethodDescriptorProto::MethodDescriptorProto(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                         bool is_message_owned)
-  : ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned) {
-  SharedCtor(arena, is_message_owned);
-  // @@protoc_insertion_point(arena_constructor:google.protobuf.MethodDescriptorProto)
-}
-MethodDescriptorProto::MethodDescriptorProto(const MethodDescriptorProto& from)
-  : ::PROTOBUF_NAMESPACE_ID::Message() {
-  MethodDescriptorProto* const _this = this; (void)_this;
-  new (&_impl_) Impl_{
-      decltype(_impl_._has_bits_){from._impl_._has_bits_}
-    , /*decltype(_impl_._cached_size_)*/{}
-    , decltype(_impl_.name_){}
-    , decltype(_impl_.input_type_){}
-    , decltype(_impl_.output_type_){}
-    , decltype(_impl_.options_){nullptr}
-    , decltype(_impl_.client_streaming_){}
-    , decltype(_impl_.server_streaming_){}};
-
-  _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-  _impl_.name_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.name_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (from._internal_has_name()) {
-    _this->_impl_.name_.Set(from._internal_name(), 
-      _this->GetArenaForAllocation());
-  }
-  _impl_.input_type_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.input_type_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (from._internal_has_input_type()) {
-    _this->_impl_.input_type_.Set(from._internal_input_type(), 
-      _this->GetArenaForAllocation());
-  }
-  _impl_.output_type_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.output_type_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (from._internal_has_output_type()) {
-    _this->_impl_.output_type_.Set(from._internal_output_type(), 
-      _this->GetArenaForAllocation());
-  }
-  if (from._internal_has_options()) {
-    _this->_impl_.options_ = new ::PROTOBUF_NAMESPACE_ID::MethodOptions(*from._impl_.options_);
-  }
-  ::memcpy(&_impl_.client_streaming_, &from._impl_.client_streaming_,
-    static_cast<size_t>(reinterpret_cast<char*>(&_impl_.server_streaming_) -
-    reinterpret_cast<char*>(&_impl_.client_streaming_)) + sizeof(_impl_.server_streaming_));
-  // @@protoc_insertion_point(copy_constructor:google.protobuf.MethodDescriptorProto)
-}
-
-inline void MethodDescriptorProto::SharedCtor(
-    ::_pb::Arena* arena, bool is_message_owned) {
-  (void)arena;
-  (void)is_message_owned;
-  new (&_impl_) Impl_{
-      decltype(_impl_._has_bits_){}
-    , /*decltype(_impl_._cached_size_)*/{}
-    , decltype(_impl_.name_){}
-    , decltype(_impl_.input_type_){}
-    , decltype(_impl_.output_type_){}
-    , decltype(_impl_.options_){nullptr}
-    , decltype(_impl_.client_streaming_){false}
-    , decltype(_impl_.server_streaming_){false}
-  };
-  _impl_.name_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.name_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  _impl_.input_type_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.input_type_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  _impl_.output_type_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.output_type_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-}
-
-MethodDescriptorProto::~MethodDescriptorProto() {
-  // @@protoc_insertion_point(destructor:google.protobuf.MethodDescriptorProto)
-  if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) {
-  (void)arena;
-    return;
-  }
-  SharedDtor();
-}
-
-inline void MethodDescriptorProto::SharedDtor() {
-  GOOGLE_DCHECK(GetArenaForAllocation() == nullptr);
-  _impl_.name_.Destroy();
-  _impl_.input_type_.Destroy();
-  _impl_.output_type_.Destroy();
-  if (this != internal_default_instance()) delete _impl_.options_;
-}
-
-void MethodDescriptorProto::SetCachedSize(int size) const {
-  _impl_._cached_size_.Set(size);
-}
-
-void MethodDescriptorProto::Clear() {
-// @@protoc_insertion_point(message_clear_start:google.protobuf.MethodDescriptorProto)
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x0000000fu) {
-    if (cached_has_bits & 0x00000001u) {
-      _impl_.name_.ClearNonDefaultToEmpty();
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _impl_.input_type_.ClearNonDefaultToEmpty();
-    }
-    if (cached_has_bits & 0x00000004u) {
-      _impl_.output_type_.ClearNonDefaultToEmpty();
-    }
-    if (cached_has_bits & 0x00000008u) {
-      GOOGLE_DCHECK(_impl_.options_ != nullptr);
-      _impl_.options_->Clear();
-    }
-  }
-  ::memset(&_impl_.client_streaming_, 0, static_cast<size_t>(
-      reinterpret_cast<char*>(&_impl_.server_streaming_) -
-      reinterpret_cast<char*>(&_impl_.client_streaming_)) + sizeof(_impl_.server_streaming_));
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>();
-}
-
-const char* MethodDescriptorProto::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) {
-#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure
-  _Internal::HasBits has_bits{};
-  while (!ctx->Done(&ptr)) {
-    uint32_t tag;
-    ptr = ::_pbi::ReadTag(ptr, &tag);
-    switch (tag >> 3) {
-      // optional string name = 1;
-      case 1:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 10)) {
-          auto str = _internal_mutable_name();
-          ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx);
-          CHK_(ptr);
-          #ifndef NDEBUG
-          ::_pbi::VerifyUTF8(str, "google.protobuf.MethodDescriptorProto.name");
-          #endif  // !NDEBUG
-        } else
-          goto handle_unusual;
-        continue;
-      // optional string input_type = 2;
-      case 2:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 18)) {
-          auto str = _internal_mutable_input_type();
-          ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx);
-          CHK_(ptr);
-          #ifndef NDEBUG
-          ::_pbi::VerifyUTF8(str, "google.protobuf.MethodDescriptorProto.input_type");
-          #endif  // !NDEBUG
-        } else
-          goto handle_unusual;
-        continue;
-      // optional string output_type = 3;
-      case 3:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 26)) {
-          auto str = _internal_mutable_output_type();
-          ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx);
-          CHK_(ptr);
-          #ifndef NDEBUG
-          ::_pbi::VerifyUTF8(str, "google.protobuf.MethodDescriptorProto.output_type");
-          #endif  // !NDEBUG
-        } else
-          goto handle_unusual;
-        continue;
-      // optional .google.protobuf.MethodOptions options = 4;
-      case 4:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 34)) {
-          ptr = ctx->ParseMessage(_internal_mutable_options(), ptr);
-          CHK_(ptr);
-        } else
-          goto handle_unusual;
-        continue;
-      // optional bool client_streaming = 5 [default = false];
-      case 5:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 40)) {
-          _Internal::set_has_client_streaming(&has_bits);
-          _impl_.client_streaming_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr);
-          CHK_(ptr);
-        } else
-          goto handle_unusual;
-        continue;
-      // optional bool server_streaming = 6 [default = false];
-      case 6:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 48)) {
-          _Internal::set_has_server_streaming(&has_bits);
-          _impl_.server_streaming_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr);
-          CHK_(ptr);
-        } else
-          goto handle_unusual;
-        continue;
-      default:
-        goto handle_unusual;
-    }  // switch
-  handle_unusual:
-    if ((tag == 0) || ((tag & 7) == 4)) {
-      CHK_(ptr);
-      ctx->SetLastTag(tag);
-      goto message_done;
-    }
-    ptr = UnknownFieldParse(
-        tag,
-        _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(),
-        ptr, ctx);
-    CHK_(ptr != nullptr);
-  }  // while
-message_done:
-  _impl_._has_bits_.Or(has_bits);
-  return ptr;
-failure:
-  ptr = nullptr;
-  goto message_done;
-#undef CHK_
-}
-
-uint8_t* MethodDescriptorProto::_InternalSerialize(
-    uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.MethodDescriptorProto)
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // optional string name = 1;
-  if (cached_has_bits & 0x00000001u) {
-    ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::VerifyUTF8StringNamedField(
-      this->_internal_name().data(), static_cast<int>(this->_internal_name().length()),
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::SERIALIZE,
-      "google.protobuf.MethodDescriptorProto.name");
-    target = stream->WriteStringMaybeAliased(
-        1, this->_internal_name(), target);
-  }
-
-  // optional string input_type = 2;
-  if (cached_has_bits & 0x00000002u) {
-    ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::VerifyUTF8StringNamedField(
-      this->_internal_input_type().data(), static_cast<int>(this->_internal_input_type().length()),
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::SERIALIZE,
-      "google.protobuf.MethodDescriptorProto.input_type");
-    target = stream->WriteStringMaybeAliased(
-        2, this->_internal_input_type(), target);
-  }
-
-  // optional string output_type = 3;
-  if (cached_has_bits & 0x00000004u) {
-    ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::VerifyUTF8StringNamedField(
-      this->_internal_output_type().data(), static_cast<int>(this->_internal_output_type().length()),
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::SERIALIZE,
-      "google.protobuf.MethodDescriptorProto.output_type");
-    target = stream->WriteStringMaybeAliased(
-        3, this->_internal_output_type(), target);
-  }
-
-  // optional .google.protobuf.MethodOptions options = 4;
-  if (cached_has_bits & 0x00000008u) {
-    target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
-      InternalWriteMessage(4, _Internal::options(this),
-        _Internal::options(this).GetCachedSize(), target, stream);
-  }
-
-  // optional bool client_streaming = 5 [default = false];
-  if (cached_has_bits & 0x00000010u) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteBoolToArray(5, this->_internal_client_streaming(), target);
-  }
-
-  // optional bool server_streaming = 6 [default = false];
-  if (cached_has_bits & 0x00000020u) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteBoolToArray(6, this->_internal_server_streaming(), target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-        _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.MethodDescriptorProto)
-  return target;
-}
-
-size_t MethodDescriptorProto::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:google.protobuf.MethodDescriptorProto)
-  size_t total_size = 0;
-
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x0000003fu) {
-    // optional string name = 1;
-    if (cached_has_bits & 0x00000001u) {
-      total_size += 1 +
-        ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize(
-          this->_internal_name());
-    }
-
-    // optional string input_type = 2;
-    if (cached_has_bits & 0x00000002u) {
-      total_size += 1 +
-        ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize(
-          this->_internal_input_type());
-    }
-
-    // optional string output_type = 3;
-    if (cached_has_bits & 0x00000004u) {
-      total_size += 1 +
-        ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize(
-          this->_internal_output_type());
-    }
-
-    // optional .google.protobuf.MethodOptions options = 4;
-    if (cached_has_bits & 0x00000008u) {
-      total_size += 1 +
-        ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(
-          *_impl_.options_);
-    }
-
-    // optional bool client_streaming = 5 [default = false];
-    if (cached_has_bits & 0x00000010u) {
-      total_size += 1 + 1;
-    }
-
-    // optional bool server_streaming = 6 [default = false];
-    if (cached_has_bits & 0x00000020u) {
-      total_size += 1 + 1;
-    }
-
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData MethodDescriptorProto::_class_data_ = {
-    ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck,
-    MethodDescriptorProto::MergeImpl
-};
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*MethodDescriptorProto::GetClassData() const { return &_class_data_; }
-
-
-void MethodDescriptorProto::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) {
-  auto* const _this = static_cast<MethodDescriptorProto*>(&to_msg);
-  auto& from = static_cast<const MethodDescriptorProto&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.MethodDescriptorProto)
-  GOOGLE_DCHECK_NE(&from, _this);
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  cached_has_bits = from._impl_._has_bits_[0];
-  if (cached_has_bits & 0x0000003fu) {
-    if (cached_has_bits & 0x00000001u) {
-      _this->_internal_set_name(from._internal_name());
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _this->_internal_set_input_type(from._internal_input_type());
-    }
-    if (cached_has_bits & 0x00000004u) {
-      _this->_internal_set_output_type(from._internal_output_type());
-    }
-    if (cached_has_bits & 0x00000008u) {
-      _this->_internal_mutable_options()->::PROTOBUF_NAMESPACE_ID::MethodOptions::MergeFrom(
-          from._internal_options());
-    }
-    if (cached_has_bits & 0x00000010u) {
-      _this->_impl_.client_streaming_ = from._impl_.client_streaming_;
-    }
-    if (cached_has_bits & 0x00000020u) {
-      _this->_impl_.server_streaming_ = from._impl_.server_streaming_;
-    }
-    _this->_impl_._has_bits_[0] |= cached_has_bits;
-  }
-  _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void MethodDescriptorProto::CopyFrom(const MethodDescriptorProto& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.MethodDescriptorProto)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool MethodDescriptorProto::IsInitialized() const {
-  if (_internal_has_options()) {
-    if (!_impl_.options_->IsInitialized()) return false;
-  }
-  return true;
-}
-
-void MethodDescriptorProto::InternalSwap(MethodDescriptorProto* other) {
-  using std::swap;
-  auto* lhs_arena = GetArenaForAllocation();
-  auto* rhs_arena = other->GetArenaForAllocation();
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::InternalSwap(
-      &_impl_.name_, lhs_arena,
-      &other->_impl_.name_, rhs_arena
-  );
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::InternalSwap(
-      &_impl_.input_type_, lhs_arena,
-      &other->_impl_.input_type_, rhs_arena
-  );
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::InternalSwap(
-      &_impl_.output_type_, lhs_arena,
-      &other->_impl_.output_type_, rhs_arena
-  );
-  ::PROTOBUF_NAMESPACE_ID::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(MethodDescriptorProto, _impl_.server_streaming_)
-      + sizeof(MethodDescriptorProto::_impl_.server_streaming_)
-      - PROTOBUF_FIELD_OFFSET(MethodDescriptorProto, _impl_.options_)>(
-          reinterpret_cast<char*>(&_impl_.options_),
-          reinterpret_cast<char*>(&other->_impl_.options_));
-}
-
-::PROTOBUF_NAMESPACE_ID::Metadata MethodDescriptorProto::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_google_2fprotobuf_2fdescriptor_2eproto_getter, &descriptor_table_google_2fprotobuf_2fdescriptor_2eproto_once,
-      file_level_metadata_google_2fprotobuf_2fdescriptor_2eproto[12]);
-}
-
-// ===================================================================
-
-class FileOptions::_Internal {
- public:
-  using HasBits = decltype(std::declval<FileOptions>()._impl_._has_bits_);
-  static void set_has_java_package(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-  static void set_has_java_outer_classname(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
-  static void set_has_java_multiple_files(HasBits* has_bits) {
-    (*has_bits)[0] |= 1024u;
-  }
-  static void set_has_java_generate_equals_and_hash(HasBits* has_bits) {
-    (*has_bits)[0] |= 2048u;
-  }
-  static void set_has_java_string_check_utf8(HasBits* has_bits) {
-    (*has_bits)[0] |= 4096u;
-  }
-  static void set_has_optimize_for(HasBits* has_bits) {
-    (*has_bits)[0] |= 262144u;
-  }
-  static void set_has_go_package(HasBits* has_bits) {
-    (*has_bits)[0] |= 4u;
-  }
-  static void set_has_cc_generic_services(HasBits* has_bits) {
-    (*has_bits)[0] |= 8192u;
-  }
-  static void set_has_java_generic_services(HasBits* has_bits) {
-    (*has_bits)[0] |= 16384u;
-  }
-  static void set_has_py_generic_services(HasBits* has_bits) {
-    (*has_bits)[0] |= 32768u;
-  }
-  static void set_has_php_generic_services(HasBits* has_bits) {
-    (*has_bits)[0] |= 65536u;
-  }
-  static void set_has_deprecated(HasBits* has_bits) {
-    (*has_bits)[0] |= 131072u;
-  }
-  static void set_has_cc_enable_arenas(HasBits* has_bits) {
-    (*has_bits)[0] |= 524288u;
-  }
-  static void set_has_objc_class_prefix(HasBits* has_bits) {
-    (*has_bits)[0] |= 8u;
-  }
-  static void set_has_csharp_namespace(HasBits* has_bits) {
-    (*has_bits)[0] |= 16u;
-  }
-  static void set_has_swift_prefix(HasBits* has_bits) {
-    (*has_bits)[0] |= 32u;
-  }
-  static void set_has_php_class_prefix(HasBits* has_bits) {
-    (*has_bits)[0] |= 64u;
-  }
-  static void set_has_php_namespace(HasBits* has_bits) {
-    (*has_bits)[0] |= 128u;
-  }
-  static void set_has_php_metadata_namespace(HasBits* has_bits) {
-    (*has_bits)[0] |= 256u;
-  }
-  static void set_has_ruby_package(HasBits* has_bits) {
-    (*has_bits)[0] |= 512u;
-  }
-};
-
-FileOptions::FileOptions(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                         bool is_message_owned)
-  : ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned) {
-  SharedCtor(arena, is_message_owned);
-  // @@protoc_insertion_point(arena_constructor:google.protobuf.FileOptions)
-}
-FileOptions::FileOptions(const FileOptions& from)
-  : ::PROTOBUF_NAMESPACE_ID::Message() {
-  FileOptions* const _this = this; (void)_this;
-  new (&_impl_) Impl_{
-      /*decltype(_impl_._extensions_)*/{}
-    , decltype(_impl_._has_bits_){from._impl_._has_bits_}
-    , /*decltype(_impl_._cached_size_)*/{}
-    , decltype(_impl_.uninterpreted_option_){from._impl_.uninterpreted_option_}
-    , decltype(_impl_.java_package_){}
-    , decltype(_impl_.java_outer_classname_){}
-    , decltype(_impl_.go_package_){}
-    , decltype(_impl_.objc_class_prefix_){}
-    , decltype(_impl_.csharp_namespace_){}
-    , decltype(_impl_.swift_prefix_){}
-    , decltype(_impl_.php_class_prefix_){}
-    , decltype(_impl_.php_namespace_){}
-    , decltype(_impl_.php_metadata_namespace_){}
-    , decltype(_impl_.ruby_package_){}
-    , decltype(_impl_.java_multiple_files_){}
-    , decltype(_impl_.java_generate_equals_and_hash_){}
-    , decltype(_impl_.java_string_check_utf8_){}
-    , decltype(_impl_.cc_generic_services_){}
-    , decltype(_impl_.java_generic_services_){}
-    , decltype(_impl_.py_generic_services_){}
-    , decltype(_impl_.php_generic_services_){}
-    , decltype(_impl_.deprecated_){}
-    , decltype(_impl_.optimize_for_){}
-    , decltype(_impl_.cc_enable_arenas_){}};
-
-  _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-  _impl_._extensions_.MergeFrom(internal_default_instance(), from._impl_._extensions_);
-  _impl_.java_package_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.java_package_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (from._internal_has_java_package()) {
-    _this->_impl_.java_package_.Set(from._internal_java_package(), 
-      _this->GetArenaForAllocation());
-  }
-  _impl_.java_outer_classname_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.java_outer_classname_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (from._internal_has_java_outer_classname()) {
-    _this->_impl_.java_outer_classname_.Set(from._internal_java_outer_classname(), 
-      _this->GetArenaForAllocation());
-  }
-  _impl_.go_package_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.go_package_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (from._internal_has_go_package()) {
-    _this->_impl_.go_package_.Set(from._internal_go_package(), 
-      _this->GetArenaForAllocation());
-  }
-  _impl_.objc_class_prefix_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.objc_class_prefix_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (from._internal_has_objc_class_prefix()) {
-    _this->_impl_.objc_class_prefix_.Set(from._internal_objc_class_prefix(), 
-      _this->GetArenaForAllocation());
-  }
-  _impl_.csharp_namespace_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.csharp_namespace_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (from._internal_has_csharp_namespace()) {
-    _this->_impl_.csharp_namespace_.Set(from._internal_csharp_namespace(), 
-      _this->GetArenaForAllocation());
-  }
-  _impl_.swift_prefix_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.swift_prefix_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (from._internal_has_swift_prefix()) {
-    _this->_impl_.swift_prefix_.Set(from._internal_swift_prefix(), 
-      _this->GetArenaForAllocation());
-  }
-  _impl_.php_class_prefix_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.php_class_prefix_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (from._internal_has_php_class_prefix()) {
-    _this->_impl_.php_class_prefix_.Set(from._internal_php_class_prefix(), 
-      _this->GetArenaForAllocation());
-  }
-  _impl_.php_namespace_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.php_namespace_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (from._internal_has_php_namespace()) {
-    _this->_impl_.php_namespace_.Set(from._internal_php_namespace(), 
-      _this->GetArenaForAllocation());
-  }
-  _impl_.php_metadata_namespace_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.php_metadata_namespace_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (from._internal_has_php_metadata_namespace()) {
-    _this->_impl_.php_metadata_namespace_.Set(from._internal_php_metadata_namespace(), 
-      _this->GetArenaForAllocation());
-  }
-  _impl_.ruby_package_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.ruby_package_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (from._internal_has_ruby_package()) {
-    _this->_impl_.ruby_package_.Set(from._internal_ruby_package(), 
-      _this->GetArenaForAllocation());
-  }
-  ::memcpy(&_impl_.java_multiple_files_, &from._impl_.java_multiple_files_,
-    static_cast<size_t>(reinterpret_cast<char*>(&_impl_.cc_enable_arenas_) -
-    reinterpret_cast<char*>(&_impl_.java_multiple_files_)) + sizeof(_impl_.cc_enable_arenas_));
-  // @@protoc_insertion_point(copy_constructor:google.protobuf.FileOptions)
-}
-
-inline void FileOptions::SharedCtor(
-    ::_pb::Arena* arena, bool is_message_owned) {
-  (void)arena;
-  (void)is_message_owned;
-  new (&_impl_) Impl_{
-      /*decltype(_impl_._extensions_)*/{::_pbi::ArenaInitialized(), arena}
-    , decltype(_impl_._has_bits_){}
-    , /*decltype(_impl_._cached_size_)*/{}
-    , decltype(_impl_.uninterpreted_option_){arena}
-    , decltype(_impl_.java_package_){}
-    , decltype(_impl_.java_outer_classname_){}
-    , decltype(_impl_.go_package_){}
-    , decltype(_impl_.objc_class_prefix_){}
-    , decltype(_impl_.csharp_namespace_){}
-    , decltype(_impl_.swift_prefix_){}
-    , decltype(_impl_.php_class_prefix_){}
-    , decltype(_impl_.php_namespace_){}
-    , decltype(_impl_.php_metadata_namespace_){}
-    , decltype(_impl_.ruby_package_){}
-    , decltype(_impl_.java_multiple_files_){false}
-    , decltype(_impl_.java_generate_equals_and_hash_){false}
-    , decltype(_impl_.java_string_check_utf8_){false}
-    , decltype(_impl_.cc_generic_services_){false}
-    , decltype(_impl_.java_generic_services_){false}
-    , decltype(_impl_.py_generic_services_){false}
-    , decltype(_impl_.php_generic_services_){false}
-    , decltype(_impl_.deprecated_){false}
-    , decltype(_impl_.optimize_for_){1}
-    , decltype(_impl_.cc_enable_arenas_){true}
-  };
-  _impl_.java_package_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.java_package_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  _impl_.java_outer_classname_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.java_outer_classname_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  _impl_.go_package_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.go_package_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  _impl_.objc_class_prefix_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.objc_class_prefix_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  _impl_.csharp_namespace_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.csharp_namespace_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  _impl_.swift_prefix_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.swift_prefix_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  _impl_.php_class_prefix_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.php_class_prefix_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  _impl_.php_namespace_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.php_namespace_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  _impl_.php_metadata_namespace_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.php_metadata_namespace_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  _impl_.ruby_package_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.ruby_package_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-}
-
-FileOptions::~FileOptions() {
-  // @@protoc_insertion_point(destructor:google.protobuf.FileOptions)
-  if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) {
-  (void)arena;
-    return;
-  }
-  SharedDtor();
-}
-
-inline void FileOptions::SharedDtor() {
-  GOOGLE_DCHECK(GetArenaForAllocation() == nullptr);
-  _impl_._extensions_.~ExtensionSet();
-  _impl_.uninterpreted_option_.~RepeatedPtrField();
-  _impl_.java_package_.Destroy();
-  _impl_.java_outer_classname_.Destroy();
-  _impl_.go_package_.Destroy();
-  _impl_.objc_class_prefix_.Destroy();
-  _impl_.csharp_namespace_.Destroy();
-  _impl_.swift_prefix_.Destroy();
-  _impl_.php_class_prefix_.Destroy();
-  _impl_.php_namespace_.Destroy();
-  _impl_.php_metadata_namespace_.Destroy();
-  _impl_.ruby_package_.Destroy();
-}
-
-void FileOptions::SetCachedSize(int size) const {
-  _impl_._cached_size_.Set(size);
-}
-
-void FileOptions::Clear() {
-// @@protoc_insertion_point(message_clear_start:google.protobuf.FileOptions)
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_._extensions_.Clear();
-  _impl_.uninterpreted_option_.Clear();
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x000000ffu) {
-    if (cached_has_bits & 0x00000001u) {
-      _impl_.java_package_.ClearNonDefaultToEmpty();
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _impl_.java_outer_classname_.ClearNonDefaultToEmpty();
-    }
-    if (cached_has_bits & 0x00000004u) {
-      _impl_.go_package_.ClearNonDefaultToEmpty();
-    }
-    if (cached_has_bits & 0x00000008u) {
-      _impl_.objc_class_prefix_.ClearNonDefaultToEmpty();
-    }
-    if (cached_has_bits & 0x00000010u) {
-      _impl_.csharp_namespace_.ClearNonDefaultToEmpty();
-    }
-    if (cached_has_bits & 0x00000020u) {
-      _impl_.swift_prefix_.ClearNonDefaultToEmpty();
-    }
-    if (cached_has_bits & 0x00000040u) {
-      _impl_.php_class_prefix_.ClearNonDefaultToEmpty();
-    }
-    if (cached_has_bits & 0x00000080u) {
-      _impl_.php_namespace_.ClearNonDefaultToEmpty();
-    }
-  }
-  if (cached_has_bits & 0x00000300u) {
-    if (cached_has_bits & 0x00000100u) {
-      _impl_.php_metadata_namespace_.ClearNonDefaultToEmpty();
-    }
-    if (cached_has_bits & 0x00000200u) {
-      _impl_.ruby_package_.ClearNonDefaultToEmpty();
-    }
-  }
-  if (cached_has_bits & 0x0000fc00u) {
-    ::memset(&_impl_.java_multiple_files_, 0, static_cast<size_t>(
-        reinterpret_cast<char*>(&_impl_.py_generic_services_) -
-        reinterpret_cast<char*>(&_impl_.java_multiple_files_)) + sizeof(_impl_.py_generic_services_));
-  }
-  if (cached_has_bits & 0x000f0000u) {
-    ::memset(&_impl_.php_generic_services_, 0, static_cast<size_t>(
-        reinterpret_cast<char*>(&_impl_.deprecated_) -
-        reinterpret_cast<char*>(&_impl_.php_generic_services_)) + sizeof(_impl_.deprecated_));
-    _impl_.optimize_for_ = 1;
-    _impl_.cc_enable_arenas_ = true;
-  }
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>();
-}
-
-const char* FileOptions::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) {
-#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure
-  _Internal::HasBits has_bits{};
-  while (!ctx->Done(&ptr)) {
-    uint32_t tag;
-    ptr = ::_pbi::ReadTag(ptr, &tag);
-    switch (tag >> 3) {
-      // optional string java_package = 1;
-      case 1:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 10)) {
-          auto str = _internal_mutable_java_package();
-          ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx);
-          CHK_(ptr);
-          #ifndef NDEBUG
-          ::_pbi::VerifyUTF8(str, "google.protobuf.FileOptions.java_package");
-          #endif  // !NDEBUG
-        } else
-          goto handle_unusual;
-        continue;
-      // optional string java_outer_classname = 8;
-      case 8:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 66)) {
-          auto str = _internal_mutable_java_outer_classname();
-          ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx);
-          CHK_(ptr);
-          #ifndef NDEBUG
-          ::_pbi::VerifyUTF8(str, "google.protobuf.FileOptions.java_outer_classname");
-          #endif  // !NDEBUG
-        } else
-          goto handle_unusual;
-        continue;
-      // optional .google.protobuf.FileOptions.OptimizeMode optimize_for = 9 [default = SPEED];
-      case 9:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 72)) {
-          uint64_t val = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr);
-          CHK_(ptr);
-          if (PROTOBUF_PREDICT_TRUE(::PROTOBUF_NAMESPACE_ID::FileOptions_OptimizeMode_IsValid(val))) {
-            _internal_set_optimize_for(static_cast<::PROTOBUF_NAMESPACE_ID::FileOptions_OptimizeMode>(val));
-          } else {
-            ::PROTOBUF_NAMESPACE_ID::internal::WriteVarint(9, val, mutable_unknown_fields());
-          }
-        } else
-          goto handle_unusual;
-        continue;
-      // optional bool java_multiple_files = 10 [default = false];
-      case 10:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 80)) {
-          _Internal::set_has_java_multiple_files(&has_bits);
-          _impl_.java_multiple_files_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr);
-          CHK_(ptr);
-        } else
-          goto handle_unusual;
-        continue;
-      // optional string go_package = 11;
-      case 11:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 90)) {
-          auto str = _internal_mutable_go_package();
-          ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx);
-          CHK_(ptr);
-          #ifndef NDEBUG
-          ::_pbi::VerifyUTF8(str, "google.protobuf.FileOptions.go_package");
-          #endif  // !NDEBUG
-        } else
-          goto handle_unusual;
-        continue;
-      // optional bool cc_generic_services = 16 [default = false];
-      case 16:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 128)) {
-          _Internal::set_has_cc_generic_services(&has_bits);
-          _impl_.cc_generic_services_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr);
-          CHK_(ptr);
-        } else
-          goto handle_unusual;
-        continue;
-      // optional bool java_generic_services = 17 [default = false];
-      case 17:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 136)) {
-          _Internal::set_has_java_generic_services(&has_bits);
-          _impl_.java_generic_services_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr);
-          CHK_(ptr);
-        } else
-          goto handle_unusual;
-        continue;
-      // optional bool py_generic_services = 18 [default = false];
-      case 18:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 144)) {
-          _Internal::set_has_py_generic_services(&has_bits);
-          _impl_.py_generic_services_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr);
-          CHK_(ptr);
-        } else
-          goto handle_unusual;
-        continue;
-      // optional bool java_generate_equals_and_hash = 20 [deprecated = true];
-      case 20:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 160)) {
-          _Internal::set_has_java_generate_equals_and_hash(&has_bits);
-          _impl_.java_generate_equals_and_hash_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr);
-          CHK_(ptr);
-        } else
-          goto handle_unusual;
-        continue;
-      // optional bool deprecated = 23 [default = false];
-      case 23:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 184)) {
-          _Internal::set_has_deprecated(&has_bits);
-          _impl_.deprecated_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr);
-          CHK_(ptr);
-        } else
-          goto handle_unusual;
-        continue;
-      // optional bool java_string_check_utf8 = 27 [default = false];
-      case 27:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 216)) {
-          _Internal::set_has_java_string_check_utf8(&has_bits);
-          _impl_.java_string_check_utf8_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr);
-          CHK_(ptr);
-        } else
-          goto handle_unusual;
-        continue;
-      // optional bool cc_enable_arenas = 31 [default = true];
-      case 31:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 248)) {
-          _Internal::set_has_cc_enable_arenas(&has_bits);
-          _impl_.cc_enable_arenas_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr);
-          CHK_(ptr);
-        } else
-          goto handle_unusual;
-        continue;
-      // optional string objc_class_prefix = 36;
-      case 36:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 34)) {
-          auto str = _internal_mutable_objc_class_prefix();
-          ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx);
-          CHK_(ptr);
-          #ifndef NDEBUG
-          ::_pbi::VerifyUTF8(str, "google.protobuf.FileOptions.objc_class_prefix");
-          #endif  // !NDEBUG
-        } else
-          goto handle_unusual;
-        continue;
-      // optional string csharp_namespace = 37;
-      case 37:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 42)) {
-          auto str = _internal_mutable_csharp_namespace();
-          ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx);
-          CHK_(ptr);
-          #ifndef NDEBUG
-          ::_pbi::VerifyUTF8(str, "google.protobuf.FileOptions.csharp_namespace");
-          #endif  // !NDEBUG
-        } else
-          goto handle_unusual;
-        continue;
-      // optional string swift_prefix = 39;
-      case 39:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 58)) {
-          auto str = _internal_mutable_swift_prefix();
-          ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx);
-          CHK_(ptr);
-          #ifndef NDEBUG
-          ::_pbi::VerifyUTF8(str, "google.protobuf.FileOptions.swift_prefix");
-          #endif  // !NDEBUG
-        } else
-          goto handle_unusual;
-        continue;
-      // optional string php_class_prefix = 40;
-      case 40:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 66)) {
-          auto str = _internal_mutable_php_class_prefix();
-          ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx);
-          CHK_(ptr);
-          #ifndef NDEBUG
-          ::_pbi::VerifyUTF8(str, "google.protobuf.FileOptions.php_class_prefix");
-          #endif  // !NDEBUG
-        } else
-          goto handle_unusual;
-        continue;
-      // optional string php_namespace = 41;
-      case 41:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 74)) {
-          auto str = _internal_mutable_php_namespace();
-          ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx);
-          CHK_(ptr);
-          #ifndef NDEBUG
-          ::_pbi::VerifyUTF8(str, "google.protobuf.FileOptions.php_namespace");
-          #endif  // !NDEBUG
-        } else
-          goto handle_unusual;
-        continue;
-      // optional bool php_generic_services = 42 [default = false];
-      case 42:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 80)) {
-          _Internal::set_has_php_generic_services(&has_bits);
-          _impl_.php_generic_services_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr);
-          CHK_(ptr);
-        } else
-          goto handle_unusual;
-        continue;
-      // optional string php_metadata_namespace = 44;
-      case 44:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 98)) {
-          auto str = _internal_mutable_php_metadata_namespace();
-          ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx);
-          CHK_(ptr);
-          #ifndef NDEBUG
-          ::_pbi::VerifyUTF8(str, "google.protobuf.FileOptions.php_metadata_namespace");
-          #endif  // !NDEBUG
-        } else
-          goto handle_unusual;
-        continue;
-      // optional string ruby_package = 45;
-      case 45:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 106)) {
-          auto str = _internal_mutable_ruby_package();
-          ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx);
-          CHK_(ptr);
-          #ifndef NDEBUG
-          ::_pbi::VerifyUTF8(str, "google.protobuf.FileOptions.ruby_package");
-          #endif  // !NDEBUG
-        } else
-          goto handle_unusual;
-        continue;
-      // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
-      case 999:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 58)) {
-          ptr -= 2;
-          do {
-            ptr += 2;
-            ptr = ctx->ParseMessage(_internal_add_uninterpreted_option(), ptr);
-            CHK_(ptr);
-            if (!ctx->DataAvailable(ptr)) break;
-          } while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<7994>(ptr));
-        } else
-          goto handle_unusual;
-        continue;
-      default:
-        goto handle_unusual;
-    }  // switch
-  handle_unusual:
-    if ((tag == 0) || ((tag & 7) == 4)) {
-      CHK_(ptr);
-      ctx->SetLastTag(tag);
-      goto message_done;
-    }
-    if ((8000u <= tag)) {
-      ptr = _impl_._extensions_.ParseField(tag, ptr, internal_default_instance(), &_internal_metadata_, ctx);
-      CHK_(ptr != nullptr);
-      continue;
-    }
-    ptr = UnknownFieldParse(
-        tag,
-        _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(),
-        ptr, ctx);
-    CHK_(ptr != nullptr);
-  }  // while
-message_done:
-  _impl_._has_bits_.Or(has_bits);
-  return ptr;
-failure:
-  ptr = nullptr;
-  goto message_done;
-#undef CHK_
-}
-
-uint8_t* FileOptions::_InternalSerialize(
-    uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.FileOptions)
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // optional string java_package = 1;
-  if (cached_has_bits & 0x00000001u) {
-    ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::VerifyUTF8StringNamedField(
-      this->_internal_java_package().data(), static_cast<int>(this->_internal_java_package().length()),
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::SERIALIZE,
-      "google.protobuf.FileOptions.java_package");
-    target = stream->WriteStringMaybeAliased(
-        1, this->_internal_java_package(), target);
-  }
-
-  // optional string java_outer_classname = 8;
-  if (cached_has_bits & 0x00000002u) {
-    ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::VerifyUTF8StringNamedField(
-      this->_internal_java_outer_classname().data(), static_cast<int>(this->_internal_java_outer_classname().length()),
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::SERIALIZE,
-      "google.protobuf.FileOptions.java_outer_classname");
-    target = stream->WriteStringMaybeAliased(
-        8, this->_internal_java_outer_classname(), target);
-  }
-
-  // optional .google.protobuf.FileOptions.OptimizeMode optimize_for = 9 [default = SPEED];
-  if (cached_has_bits & 0x00040000u) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteEnumToArray(
-      9, this->_internal_optimize_for(), target);
-  }
-
-  // optional bool java_multiple_files = 10 [default = false];
-  if (cached_has_bits & 0x00000400u) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteBoolToArray(10, this->_internal_java_multiple_files(), target);
-  }
-
-  // optional string go_package = 11;
-  if (cached_has_bits & 0x00000004u) {
-    ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::VerifyUTF8StringNamedField(
-      this->_internal_go_package().data(), static_cast<int>(this->_internal_go_package().length()),
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::SERIALIZE,
-      "google.protobuf.FileOptions.go_package");
-    target = stream->WriteStringMaybeAliased(
-        11, this->_internal_go_package(), target);
-  }
-
-  // optional bool cc_generic_services = 16 [default = false];
-  if (cached_has_bits & 0x00002000u) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteBoolToArray(16, this->_internal_cc_generic_services(), target);
-  }
-
-  // optional bool java_generic_services = 17 [default = false];
-  if (cached_has_bits & 0x00004000u) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteBoolToArray(17, this->_internal_java_generic_services(), target);
-  }
-
-  // optional bool py_generic_services = 18 [default = false];
-  if (cached_has_bits & 0x00008000u) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteBoolToArray(18, this->_internal_py_generic_services(), target);
-  }
-
-  // optional bool java_generate_equals_and_hash = 20 [deprecated = true];
-  if (cached_has_bits & 0x00000800u) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteBoolToArray(20, this->_internal_java_generate_equals_and_hash(), target);
-  }
-
-  // optional bool deprecated = 23 [default = false];
-  if (cached_has_bits & 0x00020000u) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteBoolToArray(23, this->_internal_deprecated(), target);
-  }
-
-  // optional bool java_string_check_utf8 = 27 [default = false];
-  if (cached_has_bits & 0x00001000u) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteBoolToArray(27, this->_internal_java_string_check_utf8(), target);
-  }
-
-  // optional bool cc_enable_arenas = 31 [default = true];
-  if (cached_has_bits & 0x00080000u) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteBoolToArray(31, this->_internal_cc_enable_arenas(), target);
-  }
-
-  // optional string objc_class_prefix = 36;
-  if (cached_has_bits & 0x00000008u) {
-    ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::VerifyUTF8StringNamedField(
-      this->_internal_objc_class_prefix().data(), static_cast<int>(this->_internal_objc_class_prefix().length()),
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::SERIALIZE,
-      "google.protobuf.FileOptions.objc_class_prefix");
-    target = stream->WriteStringMaybeAliased(
-        36, this->_internal_objc_class_prefix(), target);
-  }
-
-  // optional string csharp_namespace = 37;
-  if (cached_has_bits & 0x00000010u) {
-    ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::VerifyUTF8StringNamedField(
-      this->_internal_csharp_namespace().data(), static_cast<int>(this->_internal_csharp_namespace().length()),
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::SERIALIZE,
-      "google.protobuf.FileOptions.csharp_namespace");
-    target = stream->WriteStringMaybeAliased(
-        37, this->_internal_csharp_namespace(), target);
-  }
-
-  // optional string swift_prefix = 39;
-  if (cached_has_bits & 0x00000020u) {
-    ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::VerifyUTF8StringNamedField(
-      this->_internal_swift_prefix().data(), static_cast<int>(this->_internal_swift_prefix().length()),
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::SERIALIZE,
-      "google.protobuf.FileOptions.swift_prefix");
-    target = stream->WriteStringMaybeAliased(
-        39, this->_internal_swift_prefix(), target);
-  }
-
-  // optional string php_class_prefix = 40;
-  if (cached_has_bits & 0x00000040u) {
-    ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::VerifyUTF8StringNamedField(
-      this->_internal_php_class_prefix().data(), static_cast<int>(this->_internal_php_class_prefix().length()),
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::SERIALIZE,
-      "google.protobuf.FileOptions.php_class_prefix");
-    target = stream->WriteStringMaybeAliased(
-        40, this->_internal_php_class_prefix(), target);
-  }
-
-  // optional string php_namespace = 41;
-  if (cached_has_bits & 0x00000080u) {
-    ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::VerifyUTF8StringNamedField(
-      this->_internal_php_namespace().data(), static_cast<int>(this->_internal_php_namespace().length()),
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::SERIALIZE,
-      "google.protobuf.FileOptions.php_namespace");
-    target = stream->WriteStringMaybeAliased(
-        41, this->_internal_php_namespace(), target);
-  }
-
-  // optional bool php_generic_services = 42 [default = false];
-  if (cached_has_bits & 0x00010000u) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteBoolToArray(42, this->_internal_php_generic_services(), target);
-  }
-
-  // optional string php_metadata_namespace = 44;
-  if (cached_has_bits & 0x00000100u) {
-    ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::VerifyUTF8StringNamedField(
-      this->_internal_php_metadata_namespace().data(), static_cast<int>(this->_internal_php_metadata_namespace().length()),
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::SERIALIZE,
-      "google.protobuf.FileOptions.php_metadata_namespace");
-    target = stream->WriteStringMaybeAliased(
-        44, this->_internal_php_metadata_namespace(), target);
-  }
-
-  // optional string ruby_package = 45;
-  if (cached_has_bits & 0x00000200u) {
-    ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::VerifyUTF8StringNamedField(
-      this->_internal_ruby_package().data(), static_cast<int>(this->_internal_ruby_package().length()),
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::SERIALIZE,
-      "google.protobuf.FileOptions.ruby_package");
-    target = stream->WriteStringMaybeAliased(
-        45, this->_internal_ruby_package(), target);
-  }
-
-  // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
-  for (unsigned i = 0,
-      n = static_cast<unsigned>(this->_internal_uninterpreted_option_size()); i < n; i++) {
-    const auto& repfield = this->_internal_uninterpreted_option(i);
-    target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
-        InternalWriteMessage(999, repfield, repfield.GetCachedSize(), target, stream);
-  }
-
-  // Extension range [1000, 536870912)
-  target = _impl_._extensions_._InternalSerialize(
-  internal_default_instance(), 1000, 536870912, target, stream);
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-        _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.FileOptions)
-  return target;
-}
-
-size_t FileOptions::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:google.protobuf.FileOptions)
-  size_t total_size = 0;
-
-  total_size += _impl_._extensions_.ByteSize();
-
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
-  total_size += 2UL * this->_internal_uninterpreted_option_size();
-  for (const auto& msg : this->_impl_.uninterpreted_option_) {
-    total_size +=
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(msg);
-  }
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x000000ffu) {
-    // optional string java_package = 1;
-    if (cached_has_bits & 0x00000001u) {
-      total_size += 1 +
-        ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize(
-          this->_internal_java_package());
-    }
-
-    // optional string java_outer_classname = 8;
-    if (cached_has_bits & 0x00000002u) {
-      total_size += 1 +
-        ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize(
-          this->_internal_java_outer_classname());
-    }
-
-    // optional string go_package = 11;
-    if (cached_has_bits & 0x00000004u) {
-      total_size += 1 +
-        ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize(
-          this->_internal_go_package());
-    }
-
-    // optional string objc_class_prefix = 36;
-    if (cached_has_bits & 0x00000008u) {
-      total_size += 2 +
-        ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize(
-          this->_internal_objc_class_prefix());
-    }
-
-    // optional string csharp_namespace = 37;
-    if (cached_has_bits & 0x00000010u) {
-      total_size += 2 +
-        ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize(
-          this->_internal_csharp_namespace());
-    }
-
-    // optional string swift_prefix = 39;
-    if (cached_has_bits & 0x00000020u) {
-      total_size += 2 +
-        ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize(
-          this->_internal_swift_prefix());
-    }
-
-    // optional string php_class_prefix = 40;
-    if (cached_has_bits & 0x00000040u) {
-      total_size += 2 +
-        ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize(
-          this->_internal_php_class_prefix());
-    }
-
-    // optional string php_namespace = 41;
-    if (cached_has_bits & 0x00000080u) {
-      total_size += 2 +
-        ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize(
-          this->_internal_php_namespace());
-    }
-
-  }
-  if (cached_has_bits & 0x0000ff00u) {
-    // optional string php_metadata_namespace = 44;
-    if (cached_has_bits & 0x00000100u) {
-      total_size += 2 +
-        ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize(
-          this->_internal_php_metadata_namespace());
-    }
-
-    // optional string ruby_package = 45;
-    if (cached_has_bits & 0x00000200u) {
-      total_size += 2 +
-        ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize(
-          this->_internal_ruby_package());
-    }
-
-    // optional bool java_multiple_files = 10 [default = false];
-    if (cached_has_bits & 0x00000400u) {
-      total_size += 1 + 1;
-    }
-
-    // optional bool java_generate_equals_and_hash = 20 [deprecated = true];
-    if (cached_has_bits & 0x00000800u) {
-      total_size += 2 + 1;
-    }
-
-    // optional bool java_string_check_utf8 = 27 [default = false];
-    if (cached_has_bits & 0x00001000u) {
-      total_size += 2 + 1;
-    }
-
-    // optional bool cc_generic_services = 16 [default = false];
-    if (cached_has_bits & 0x00002000u) {
-      total_size += 2 + 1;
-    }
-
-    // optional bool java_generic_services = 17 [default = false];
-    if (cached_has_bits & 0x00004000u) {
-      total_size += 2 + 1;
-    }
-
-    // optional bool py_generic_services = 18 [default = false];
-    if (cached_has_bits & 0x00008000u) {
-      total_size += 2 + 1;
-    }
-
-  }
-  if (cached_has_bits & 0x000f0000u) {
-    // optional bool php_generic_services = 42 [default = false];
-    if (cached_has_bits & 0x00010000u) {
-      total_size += 2 + 1;
-    }
-
-    // optional bool deprecated = 23 [default = false];
-    if (cached_has_bits & 0x00020000u) {
-      total_size += 2 + 1;
-    }
-
-    // optional .google.protobuf.FileOptions.OptimizeMode optimize_for = 9 [default = SPEED];
-    if (cached_has_bits & 0x00040000u) {
-      total_size += 1 +
-        ::_pbi::WireFormatLite::EnumSize(this->_internal_optimize_for());
-    }
-
-    // optional bool cc_enable_arenas = 31 [default = true];
-    if (cached_has_bits & 0x00080000u) {
-      total_size += 2 + 1;
-    }
-
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData FileOptions::_class_data_ = {
-    ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck,
-    FileOptions::MergeImpl
-};
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*FileOptions::GetClassData() const { return &_class_data_; }
-
-
-void FileOptions::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) {
-  auto* const _this = static_cast<FileOptions*>(&to_msg);
-  auto& from = static_cast<const FileOptions&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.FileOptions)
-  GOOGLE_DCHECK_NE(&from, _this);
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  _this->_impl_.uninterpreted_option_.MergeFrom(from._impl_.uninterpreted_option_);
-  cached_has_bits = from._impl_._has_bits_[0];
-  if (cached_has_bits & 0x000000ffu) {
-    if (cached_has_bits & 0x00000001u) {
-      _this->_internal_set_java_package(from._internal_java_package());
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _this->_internal_set_java_outer_classname(from._internal_java_outer_classname());
-    }
-    if (cached_has_bits & 0x00000004u) {
-      _this->_internal_set_go_package(from._internal_go_package());
-    }
-    if (cached_has_bits & 0x00000008u) {
-      _this->_internal_set_objc_class_prefix(from._internal_objc_class_prefix());
-    }
-    if (cached_has_bits & 0x00000010u) {
-      _this->_internal_set_csharp_namespace(from._internal_csharp_namespace());
-    }
-    if (cached_has_bits & 0x00000020u) {
-      _this->_internal_set_swift_prefix(from._internal_swift_prefix());
-    }
-    if (cached_has_bits & 0x00000040u) {
-      _this->_internal_set_php_class_prefix(from._internal_php_class_prefix());
-    }
-    if (cached_has_bits & 0x00000080u) {
-      _this->_internal_set_php_namespace(from._internal_php_namespace());
-    }
-  }
-  if (cached_has_bits & 0x0000ff00u) {
-    if (cached_has_bits & 0x00000100u) {
-      _this->_internal_set_php_metadata_namespace(from._internal_php_metadata_namespace());
-    }
-    if (cached_has_bits & 0x00000200u) {
-      _this->_internal_set_ruby_package(from._internal_ruby_package());
-    }
-    if (cached_has_bits & 0x00000400u) {
-      _this->_impl_.java_multiple_files_ = from._impl_.java_multiple_files_;
-    }
-    if (cached_has_bits & 0x00000800u) {
-      _this->_impl_.java_generate_equals_and_hash_ = from._impl_.java_generate_equals_and_hash_;
-    }
-    if (cached_has_bits & 0x00001000u) {
-      _this->_impl_.java_string_check_utf8_ = from._impl_.java_string_check_utf8_;
-    }
-    if (cached_has_bits & 0x00002000u) {
-      _this->_impl_.cc_generic_services_ = from._impl_.cc_generic_services_;
-    }
-    if (cached_has_bits & 0x00004000u) {
-      _this->_impl_.java_generic_services_ = from._impl_.java_generic_services_;
-    }
-    if (cached_has_bits & 0x00008000u) {
-      _this->_impl_.py_generic_services_ = from._impl_.py_generic_services_;
-    }
-    _this->_impl_._has_bits_[0] |= cached_has_bits;
-  }
-  if (cached_has_bits & 0x000f0000u) {
-    if (cached_has_bits & 0x00010000u) {
-      _this->_impl_.php_generic_services_ = from._impl_.php_generic_services_;
-    }
-    if (cached_has_bits & 0x00020000u) {
-      _this->_impl_.deprecated_ = from._impl_.deprecated_;
-    }
-    if (cached_has_bits & 0x00040000u) {
-      _this->_impl_.optimize_for_ = from._impl_.optimize_for_;
-    }
-    if (cached_has_bits & 0x00080000u) {
-      _this->_impl_.cc_enable_arenas_ = from._impl_.cc_enable_arenas_;
-    }
-    _this->_impl_._has_bits_[0] |= cached_has_bits;
-  }
-  _this->_impl_._extensions_.MergeFrom(internal_default_instance(), from._impl_._extensions_);
-  _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void FileOptions::CopyFrom(const FileOptions& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.FileOptions)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool FileOptions::IsInitialized() const {
-  if (!_impl_._extensions_.IsInitialized()) {
-    return false;
-  }
-
-  if (!::PROTOBUF_NAMESPACE_ID::internal::AllAreInitialized(_impl_.uninterpreted_option_))
-    return false;
-  return true;
-}
-
-void FileOptions::InternalSwap(FileOptions* other) {
-  using std::swap;
-  _impl_._extensions_.InternalSwap(&other->_impl_._extensions_);
-  auto* lhs_arena = GetArenaForAllocation();
-  auto* rhs_arena = other->GetArenaForAllocation();
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  _impl_.uninterpreted_option_.InternalSwap(&other->_impl_.uninterpreted_option_);
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::InternalSwap(
-      &_impl_.java_package_, lhs_arena,
-      &other->_impl_.java_package_, rhs_arena
-  );
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::InternalSwap(
-      &_impl_.java_outer_classname_, lhs_arena,
-      &other->_impl_.java_outer_classname_, rhs_arena
-  );
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::InternalSwap(
-      &_impl_.go_package_, lhs_arena,
-      &other->_impl_.go_package_, rhs_arena
-  );
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::InternalSwap(
-      &_impl_.objc_class_prefix_, lhs_arena,
-      &other->_impl_.objc_class_prefix_, rhs_arena
-  );
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::InternalSwap(
-      &_impl_.csharp_namespace_, lhs_arena,
-      &other->_impl_.csharp_namespace_, rhs_arena
-  );
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::InternalSwap(
-      &_impl_.swift_prefix_, lhs_arena,
-      &other->_impl_.swift_prefix_, rhs_arena
-  );
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::InternalSwap(
-      &_impl_.php_class_prefix_, lhs_arena,
-      &other->_impl_.php_class_prefix_, rhs_arena
-  );
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::InternalSwap(
-      &_impl_.php_namespace_, lhs_arena,
-      &other->_impl_.php_namespace_, rhs_arena
-  );
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::InternalSwap(
-      &_impl_.php_metadata_namespace_, lhs_arena,
-      &other->_impl_.php_metadata_namespace_, rhs_arena
-  );
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::InternalSwap(
-      &_impl_.ruby_package_, lhs_arena,
-      &other->_impl_.ruby_package_, rhs_arena
-  );
-  ::PROTOBUF_NAMESPACE_ID::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(FileOptions, _impl_.deprecated_)
-      + sizeof(FileOptions::_impl_.deprecated_)
-      - PROTOBUF_FIELD_OFFSET(FileOptions, _impl_.java_multiple_files_)>(
-          reinterpret_cast<char*>(&_impl_.java_multiple_files_),
-          reinterpret_cast<char*>(&other->_impl_.java_multiple_files_));
-  swap(_impl_.optimize_for_, other->_impl_.optimize_for_);
-  swap(_impl_.cc_enable_arenas_, other->_impl_.cc_enable_arenas_);
-}
-
-::PROTOBUF_NAMESPACE_ID::Metadata FileOptions::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_google_2fprotobuf_2fdescriptor_2eproto_getter, &descriptor_table_google_2fprotobuf_2fdescriptor_2eproto_once,
-      file_level_metadata_google_2fprotobuf_2fdescriptor_2eproto[13]);
-}
-
-// ===================================================================
-
-class MessageOptions::_Internal {
- public:
-  using HasBits = decltype(std::declval<MessageOptions>()._impl_._has_bits_);
-  static void set_has_message_set_wire_format(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-  static void set_has_no_standard_descriptor_accessor(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
-  static void set_has_deprecated(HasBits* has_bits) {
-    (*has_bits)[0] |= 4u;
-  }
-  static void set_has_map_entry(HasBits* has_bits) {
-    (*has_bits)[0] |= 8u;
-  }
-};
-
-MessageOptions::MessageOptions(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                         bool is_message_owned)
-  : ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned) {
-  SharedCtor(arena, is_message_owned);
-  // @@protoc_insertion_point(arena_constructor:google.protobuf.MessageOptions)
-}
-MessageOptions::MessageOptions(const MessageOptions& from)
-  : ::PROTOBUF_NAMESPACE_ID::Message() {
-  MessageOptions* const _this = this; (void)_this;
-  new (&_impl_) Impl_{
-      /*decltype(_impl_._extensions_)*/{}
-    , decltype(_impl_._has_bits_){from._impl_._has_bits_}
-    , /*decltype(_impl_._cached_size_)*/{}
-    , decltype(_impl_.uninterpreted_option_){from._impl_.uninterpreted_option_}
-    , decltype(_impl_.message_set_wire_format_){}
-    , decltype(_impl_.no_standard_descriptor_accessor_){}
-    , decltype(_impl_.deprecated_){}
-    , decltype(_impl_.map_entry_){}};
-
-  _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-  _impl_._extensions_.MergeFrom(internal_default_instance(), from._impl_._extensions_);
-  ::memcpy(&_impl_.message_set_wire_format_, &from._impl_.message_set_wire_format_,
-    static_cast<size_t>(reinterpret_cast<char*>(&_impl_.map_entry_) -
-    reinterpret_cast<char*>(&_impl_.message_set_wire_format_)) + sizeof(_impl_.map_entry_));
-  // @@protoc_insertion_point(copy_constructor:google.protobuf.MessageOptions)
-}
-
-inline void MessageOptions::SharedCtor(
-    ::_pb::Arena* arena, bool is_message_owned) {
-  (void)arena;
-  (void)is_message_owned;
-  new (&_impl_) Impl_{
-      /*decltype(_impl_._extensions_)*/{::_pbi::ArenaInitialized(), arena}
-    , decltype(_impl_._has_bits_){}
-    , /*decltype(_impl_._cached_size_)*/{}
-    , decltype(_impl_.uninterpreted_option_){arena}
-    , decltype(_impl_.message_set_wire_format_){false}
-    , decltype(_impl_.no_standard_descriptor_accessor_){false}
-    , decltype(_impl_.deprecated_){false}
-    , decltype(_impl_.map_entry_){false}
-  };
-}
-
-MessageOptions::~MessageOptions() {
-  // @@protoc_insertion_point(destructor:google.protobuf.MessageOptions)
-  if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) {
-  (void)arena;
-    return;
-  }
-  SharedDtor();
-}
-
-inline void MessageOptions::SharedDtor() {
-  GOOGLE_DCHECK(GetArenaForAllocation() == nullptr);
-  _impl_._extensions_.~ExtensionSet();
-  _impl_.uninterpreted_option_.~RepeatedPtrField();
-}
-
-void MessageOptions::SetCachedSize(int size) const {
-  _impl_._cached_size_.Set(size);
-}
-
-void MessageOptions::Clear() {
-// @@protoc_insertion_point(message_clear_start:google.protobuf.MessageOptions)
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_._extensions_.Clear();
-  _impl_.uninterpreted_option_.Clear();
-  ::memset(&_impl_.message_set_wire_format_, 0, static_cast<size_t>(
-      reinterpret_cast<char*>(&_impl_.map_entry_) -
-      reinterpret_cast<char*>(&_impl_.message_set_wire_format_)) + sizeof(_impl_.map_entry_));
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>();
-}
-
-const char* MessageOptions::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) {
-#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure
-  _Internal::HasBits has_bits{};
-  while (!ctx->Done(&ptr)) {
-    uint32_t tag;
-    ptr = ::_pbi::ReadTag(ptr, &tag);
-    switch (tag >> 3) {
-      // optional bool message_set_wire_format = 1 [default = false];
-      case 1:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 8)) {
-          _Internal::set_has_message_set_wire_format(&has_bits);
-          _impl_.message_set_wire_format_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr);
-          CHK_(ptr);
-        } else
-          goto handle_unusual;
-        continue;
-      // optional bool no_standard_descriptor_accessor = 2 [default = false];
-      case 2:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 16)) {
-          _Internal::set_has_no_standard_descriptor_accessor(&has_bits);
-          _impl_.no_standard_descriptor_accessor_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr);
-          CHK_(ptr);
-        } else
-          goto handle_unusual;
-        continue;
-      // optional bool deprecated = 3 [default = false];
-      case 3:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 24)) {
-          _Internal::set_has_deprecated(&has_bits);
-          _impl_.deprecated_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr);
-          CHK_(ptr);
-        } else
-          goto handle_unusual;
-        continue;
-      // optional bool map_entry = 7;
-      case 7:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 56)) {
-          _Internal::set_has_map_entry(&has_bits);
-          _impl_.map_entry_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr);
-          CHK_(ptr);
-        } else
-          goto handle_unusual;
-        continue;
-      // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
-      case 999:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 58)) {
-          ptr -= 2;
-          do {
-            ptr += 2;
-            ptr = ctx->ParseMessage(_internal_add_uninterpreted_option(), ptr);
-            CHK_(ptr);
-            if (!ctx->DataAvailable(ptr)) break;
-          } while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<7994>(ptr));
-        } else
-          goto handle_unusual;
-        continue;
-      default:
-        goto handle_unusual;
-    }  // switch
-  handle_unusual:
-    if ((tag == 0) || ((tag & 7) == 4)) {
-      CHK_(ptr);
-      ctx->SetLastTag(tag);
-      goto message_done;
-    }
-    if ((8000u <= tag)) {
-      ptr = _impl_._extensions_.ParseField(tag, ptr, internal_default_instance(), &_internal_metadata_, ctx);
-      CHK_(ptr != nullptr);
-      continue;
-    }
-    ptr = UnknownFieldParse(
-        tag,
-        _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(),
-        ptr, ctx);
-    CHK_(ptr != nullptr);
-  }  // while
-message_done:
-  _impl_._has_bits_.Or(has_bits);
-  return ptr;
-failure:
-  ptr = nullptr;
-  goto message_done;
-#undef CHK_
-}
-
-uint8_t* MessageOptions::_InternalSerialize(
-    uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.MessageOptions)
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // optional bool message_set_wire_format = 1 [default = false];
-  if (cached_has_bits & 0x00000001u) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteBoolToArray(1, this->_internal_message_set_wire_format(), target);
-  }
-
-  // optional bool no_standard_descriptor_accessor = 2 [default = false];
-  if (cached_has_bits & 0x00000002u) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteBoolToArray(2, this->_internal_no_standard_descriptor_accessor(), target);
-  }
-
-  // optional bool deprecated = 3 [default = false];
-  if (cached_has_bits & 0x00000004u) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteBoolToArray(3, this->_internal_deprecated(), target);
-  }
-
-  // optional bool map_entry = 7;
-  if (cached_has_bits & 0x00000008u) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteBoolToArray(7, this->_internal_map_entry(), target);
-  }
-
-  // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
-  for (unsigned i = 0,
-      n = static_cast<unsigned>(this->_internal_uninterpreted_option_size()); i < n; i++) {
-    const auto& repfield = this->_internal_uninterpreted_option(i);
-    target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
-        InternalWriteMessage(999, repfield, repfield.GetCachedSize(), target, stream);
-  }
-
-  // Extension range [1000, 536870912)
-  target = _impl_._extensions_._InternalSerialize(
-  internal_default_instance(), 1000, 536870912, target, stream);
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-        _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.MessageOptions)
-  return target;
-}
-
-size_t MessageOptions::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:google.protobuf.MessageOptions)
-  size_t total_size = 0;
-
-  total_size += _impl_._extensions_.ByteSize();
-
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
-  total_size += 2UL * this->_internal_uninterpreted_option_size();
-  for (const auto& msg : this->_impl_.uninterpreted_option_) {
-    total_size +=
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(msg);
-  }
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x0000000fu) {
-    // optional bool message_set_wire_format = 1 [default = false];
-    if (cached_has_bits & 0x00000001u) {
-      total_size += 1 + 1;
-    }
-
-    // optional bool no_standard_descriptor_accessor = 2 [default = false];
-    if (cached_has_bits & 0x00000002u) {
-      total_size += 1 + 1;
-    }
-
-    // optional bool deprecated = 3 [default = false];
-    if (cached_has_bits & 0x00000004u) {
-      total_size += 1 + 1;
-    }
-
-    // optional bool map_entry = 7;
-    if (cached_has_bits & 0x00000008u) {
-      total_size += 1 + 1;
-    }
-
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData MessageOptions::_class_data_ = {
-    ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck,
-    MessageOptions::MergeImpl
-};
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*MessageOptions::GetClassData() const { return &_class_data_; }
-
-
-void MessageOptions::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) {
-  auto* const _this = static_cast<MessageOptions*>(&to_msg);
-  auto& from = static_cast<const MessageOptions&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.MessageOptions)
-  GOOGLE_DCHECK_NE(&from, _this);
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  _this->_impl_.uninterpreted_option_.MergeFrom(from._impl_.uninterpreted_option_);
-  cached_has_bits = from._impl_._has_bits_[0];
-  if (cached_has_bits & 0x0000000fu) {
-    if (cached_has_bits & 0x00000001u) {
-      _this->_impl_.message_set_wire_format_ = from._impl_.message_set_wire_format_;
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _this->_impl_.no_standard_descriptor_accessor_ = from._impl_.no_standard_descriptor_accessor_;
-    }
-    if (cached_has_bits & 0x00000004u) {
-      _this->_impl_.deprecated_ = from._impl_.deprecated_;
-    }
-    if (cached_has_bits & 0x00000008u) {
-      _this->_impl_.map_entry_ = from._impl_.map_entry_;
-    }
-    _this->_impl_._has_bits_[0] |= cached_has_bits;
-  }
-  _this->_impl_._extensions_.MergeFrom(internal_default_instance(), from._impl_._extensions_);
-  _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void MessageOptions::CopyFrom(const MessageOptions& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.MessageOptions)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool MessageOptions::IsInitialized() const {
-  if (!_impl_._extensions_.IsInitialized()) {
-    return false;
-  }
-
-  if (!::PROTOBUF_NAMESPACE_ID::internal::AllAreInitialized(_impl_.uninterpreted_option_))
-    return false;
-  return true;
-}
-
-void MessageOptions::InternalSwap(MessageOptions* other) {
-  using std::swap;
-  _impl_._extensions_.InternalSwap(&other->_impl_._extensions_);
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  _impl_.uninterpreted_option_.InternalSwap(&other->_impl_.uninterpreted_option_);
-  ::PROTOBUF_NAMESPACE_ID::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(MessageOptions, _impl_.map_entry_)
-      + sizeof(MessageOptions::_impl_.map_entry_)
-      - PROTOBUF_FIELD_OFFSET(MessageOptions, _impl_.message_set_wire_format_)>(
-          reinterpret_cast<char*>(&_impl_.message_set_wire_format_),
-          reinterpret_cast<char*>(&other->_impl_.message_set_wire_format_));
-}
-
-::PROTOBUF_NAMESPACE_ID::Metadata MessageOptions::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_google_2fprotobuf_2fdescriptor_2eproto_getter, &descriptor_table_google_2fprotobuf_2fdescriptor_2eproto_once,
-      file_level_metadata_google_2fprotobuf_2fdescriptor_2eproto[14]);
-}
-
-// ===================================================================
-
-class FieldOptions::_Internal {
- public:
-  using HasBits = decltype(std::declval<FieldOptions>()._impl_._has_bits_);
-  static void set_has_ctype(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-  static void set_has_packed(HasBits* has_bits) {
-    (*has_bits)[0] |= 4u;
-  }
-  static void set_has_jstype(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
-  static void set_has_lazy(HasBits* has_bits) {
-    (*has_bits)[0] |= 8u;
-  }
-  static void set_has_unverified_lazy(HasBits* has_bits) {
-    (*has_bits)[0] |= 16u;
-  }
-  static void set_has_deprecated(HasBits* has_bits) {
-    (*has_bits)[0] |= 32u;
-  }
-  static void set_has_weak(HasBits* has_bits) {
-    (*has_bits)[0] |= 64u;
-  }
-};
-
-FieldOptions::FieldOptions(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                         bool is_message_owned)
-  : ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned) {
-  SharedCtor(arena, is_message_owned);
-  // @@protoc_insertion_point(arena_constructor:google.protobuf.FieldOptions)
-}
-FieldOptions::FieldOptions(const FieldOptions& from)
-  : ::PROTOBUF_NAMESPACE_ID::Message() {
-  FieldOptions* const _this = this; (void)_this;
-  new (&_impl_) Impl_{
-      /*decltype(_impl_._extensions_)*/{}
-    , decltype(_impl_._has_bits_){from._impl_._has_bits_}
-    , /*decltype(_impl_._cached_size_)*/{}
-    , decltype(_impl_.uninterpreted_option_){from._impl_.uninterpreted_option_}
-    , decltype(_impl_.ctype_){}
-    , decltype(_impl_.jstype_){}
-    , decltype(_impl_.packed_){}
-    , decltype(_impl_.lazy_){}
-    , decltype(_impl_.unverified_lazy_){}
-    , decltype(_impl_.deprecated_){}
-    , decltype(_impl_.weak_){}};
-
-  _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-  _impl_._extensions_.MergeFrom(internal_default_instance(), from._impl_._extensions_);
-  ::memcpy(&_impl_.ctype_, &from._impl_.ctype_,
-    static_cast<size_t>(reinterpret_cast<char*>(&_impl_.weak_) -
-    reinterpret_cast<char*>(&_impl_.ctype_)) + sizeof(_impl_.weak_));
-  // @@protoc_insertion_point(copy_constructor:google.protobuf.FieldOptions)
-}
-
-inline void FieldOptions::SharedCtor(
-    ::_pb::Arena* arena, bool is_message_owned) {
-  (void)arena;
-  (void)is_message_owned;
-  new (&_impl_) Impl_{
-      /*decltype(_impl_._extensions_)*/{::_pbi::ArenaInitialized(), arena}
-    , decltype(_impl_._has_bits_){}
-    , /*decltype(_impl_._cached_size_)*/{}
-    , decltype(_impl_.uninterpreted_option_){arena}
-    , decltype(_impl_.ctype_){0}
-    , decltype(_impl_.jstype_){0}
-    , decltype(_impl_.packed_){false}
-    , decltype(_impl_.lazy_){false}
-    , decltype(_impl_.unverified_lazy_){false}
-    , decltype(_impl_.deprecated_){false}
-    , decltype(_impl_.weak_){false}
-  };
-}
-
-FieldOptions::~FieldOptions() {
-  // @@protoc_insertion_point(destructor:google.protobuf.FieldOptions)
-  if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) {
-  (void)arena;
-    return;
-  }
-  SharedDtor();
-}
-
-inline void FieldOptions::SharedDtor() {
-  GOOGLE_DCHECK(GetArenaForAllocation() == nullptr);
-  _impl_._extensions_.~ExtensionSet();
-  _impl_.uninterpreted_option_.~RepeatedPtrField();
-}
-
-void FieldOptions::SetCachedSize(int size) const {
-  _impl_._cached_size_.Set(size);
-}
-
-void FieldOptions::Clear() {
-// @@protoc_insertion_point(message_clear_start:google.protobuf.FieldOptions)
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_._extensions_.Clear();
-  _impl_.uninterpreted_option_.Clear();
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x0000007fu) {
-    ::memset(&_impl_.ctype_, 0, static_cast<size_t>(
-        reinterpret_cast<char*>(&_impl_.weak_) -
-        reinterpret_cast<char*>(&_impl_.ctype_)) + sizeof(_impl_.weak_));
-  }
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>();
-}
-
-const char* FieldOptions::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) {
-#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure
-  _Internal::HasBits has_bits{};
-  while (!ctx->Done(&ptr)) {
-    uint32_t tag;
-    ptr = ::_pbi::ReadTag(ptr, &tag);
-    switch (tag >> 3) {
-      // optional .google.protobuf.FieldOptions.CType ctype = 1 [default = STRING];
-      case 1:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 8)) {
-          uint64_t val = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr);
-          CHK_(ptr);
-          if (PROTOBUF_PREDICT_TRUE(::PROTOBUF_NAMESPACE_ID::FieldOptions_CType_IsValid(val))) {
-            _internal_set_ctype(static_cast<::PROTOBUF_NAMESPACE_ID::FieldOptions_CType>(val));
-          } else {
-            ::PROTOBUF_NAMESPACE_ID::internal::WriteVarint(1, val, mutable_unknown_fields());
-          }
-        } else
-          goto handle_unusual;
-        continue;
-      // optional bool packed = 2;
-      case 2:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 16)) {
-          _Internal::set_has_packed(&has_bits);
-          _impl_.packed_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr);
-          CHK_(ptr);
-        } else
-          goto handle_unusual;
-        continue;
-      // optional bool deprecated = 3 [default = false];
-      case 3:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 24)) {
-          _Internal::set_has_deprecated(&has_bits);
-          _impl_.deprecated_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr);
-          CHK_(ptr);
-        } else
-          goto handle_unusual;
-        continue;
-      // optional bool lazy = 5 [default = false];
-      case 5:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 40)) {
-          _Internal::set_has_lazy(&has_bits);
-          _impl_.lazy_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr);
-          CHK_(ptr);
-        } else
-          goto handle_unusual;
-        continue;
-      // optional .google.protobuf.FieldOptions.JSType jstype = 6 [default = JS_NORMAL];
-      case 6:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 48)) {
-          uint64_t val = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr);
-          CHK_(ptr);
-          if (PROTOBUF_PREDICT_TRUE(::PROTOBUF_NAMESPACE_ID::FieldOptions_JSType_IsValid(val))) {
-            _internal_set_jstype(static_cast<::PROTOBUF_NAMESPACE_ID::FieldOptions_JSType>(val));
-          } else {
-            ::PROTOBUF_NAMESPACE_ID::internal::WriteVarint(6, val, mutable_unknown_fields());
-          }
-        } else
-          goto handle_unusual;
-        continue;
-      // optional bool weak = 10 [default = false];
-      case 10:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 80)) {
-          _Internal::set_has_weak(&has_bits);
-          _impl_.weak_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr);
-          CHK_(ptr);
-        } else
-          goto handle_unusual;
-        continue;
-      // optional bool unverified_lazy = 15 [default = false];
-      case 15:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 120)) {
-          _Internal::set_has_unverified_lazy(&has_bits);
-          _impl_.unverified_lazy_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr);
-          CHK_(ptr);
-        } else
-          goto handle_unusual;
-        continue;
-      // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
-      case 999:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 58)) {
-          ptr -= 2;
-          do {
-            ptr += 2;
-            ptr = ctx->ParseMessage(_internal_add_uninterpreted_option(), ptr);
-            CHK_(ptr);
-            if (!ctx->DataAvailable(ptr)) break;
-          } while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<7994>(ptr));
-        } else
-          goto handle_unusual;
-        continue;
-      default:
-        goto handle_unusual;
-    }  // switch
-  handle_unusual:
-    if ((tag == 0) || ((tag & 7) == 4)) {
-      CHK_(ptr);
-      ctx->SetLastTag(tag);
-      goto message_done;
-    }
-    if ((8000u <= tag)) {
-      ptr = _impl_._extensions_.ParseField(tag, ptr, internal_default_instance(), &_internal_metadata_, ctx);
-      CHK_(ptr != nullptr);
-      continue;
-    }
-    ptr = UnknownFieldParse(
-        tag,
-        _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(),
-        ptr, ctx);
-    CHK_(ptr != nullptr);
-  }  // while
-message_done:
-  _impl_._has_bits_.Or(has_bits);
-  return ptr;
-failure:
-  ptr = nullptr;
-  goto message_done;
-#undef CHK_
-}
-
-uint8_t* FieldOptions::_InternalSerialize(
-    uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.FieldOptions)
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // optional .google.protobuf.FieldOptions.CType ctype = 1 [default = STRING];
-  if (cached_has_bits & 0x00000001u) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteEnumToArray(
-      1, this->_internal_ctype(), target);
-  }
-
-  // optional bool packed = 2;
-  if (cached_has_bits & 0x00000004u) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteBoolToArray(2, this->_internal_packed(), target);
-  }
-
-  // optional bool deprecated = 3 [default = false];
-  if (cached_has_bits & 0x00000020u) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteBoolToArray(3, this->_internal_deprecated(), target);
-  }
-
-  // optional bool lazy = 5 [default = false];
-  if (cached_has_bits & 0x00000008u) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteBoolToArray(5, this->_internal_lazy(), target);
-  }
-
-  // optional .google.protobuf.FieldOptions.JSType jstype = 6 [default = JS_NORMAL];
-  if (cached_has_bits & 0x00000002u) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteEnumToArray(
-      6, this->_internal_jstype(), target);
-  }
-
-  // optional bool weak = 10 [default = false];
-  if (cached_has_bits & 0x00000040u) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteBoolToArray(10, this->_internal_weak(), target);
-  }
-
-  // optional bool unverified_lazy = 15 [default = false];
-  if (cached_has_bits & 0x00000010u) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteBoolToArray(15, this->_internal_unverified_lazy(), target);
-  }
-
-  // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
-  for (unsigned i = 0,
-      n = static_cast<unsigned>(this->_internal_uninterpreted_option_size()); i < n; i++) {
-    const auto& repfield = this->_internal_uninterpreted_option(i);
-    target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
-        InternalWriteMessage(999, repfield, repfield.GetCachedSize(), target, stream);
-  }
-
-  // Extension range [1000, 536870912)
-  target = _impl_._extensions_._InternalSerialize(
-  internal_default_instance(), 1000, 536870912, target, stream);
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-        _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.FieldOptions)
-  return target;
-}
-
-size_t FieldOptions::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:google.protobuf.FieldOptions)
-  size_t total_size = 0;
-
-  total_size += _impl_._extensions_.ByteSize();
-
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
-  total_size += 2UL * this->_internal_uninterpreted_option_size();
-  for (const auto& msg : this->_impl_.uninterpreted_option_) {
-    total_size +=
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(msg);
-  }
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x0000007fu) {
-    // optional .google.protobuf.FieldOptions.CType ctype = 1 [default = STRING];
-    if (cached_has_bits & 0x00000001u) {
-      total_size += 1 +
-        ::_pbi::WireFormatLite::EnumSize(this->_internal_ctype());
-    }
-
-    // optional .google.protobuf.FieldOptions.JSType jstype = 6 [default = JS_NORMAL];
-    if (cached_has_bits & 0x00000002u) {
-      total_size += 1 +
-        ::_pbi::WireFormatLite::EnumSize(this->_internal_jstype());
-    }
-
-    // optional bool packed = 2;
-    if (cached_has_bits & 0x00000004u) {
-      total_size += 1 + 1;
-    }
-
-    // optional bool lazy = 5 [default = false];
-    if (cached_has_bits & 0x00000008u) {
-      total_size += 1 + 1;
-    }
-
-    // optional bool unverified_lazy = 15 [default = false];
-    if (cached_has_bits & 0x00000010u) {
-      total_size += 1 + 1;
-    }
-
-    // optional bool deprecated = 3 [default = false];
-    if (cached_has_bits & 0x00000020u) {
-      total_size += 1 + 1;
-    }
-
-    // optional bool weak = 10 [default = false];
-    if (cached_has_bits & 0x00000040u) {
-      total_size += 1 + 1;
-    }
-
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData FieldOptions::_class_data_ = {
-    ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck,
-    FieldOptions::MergeImpl
-};
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*FieldOptions::GetClassData() const { return &_class_data_; }
-
-
-void FieldOptions::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) {
-  auto* const _this = static_cast<FieldOptions*>(&to_msg);
-  auto& from = static_cast<const FieldOptions&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.FieldOptions)
-  GOOGLE_DCHECK_NE(&from, _this);
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  _this->_impl_.uninterpreted_option_.MergeFrom(from._impl_.uninterpreted_option_);
-  cached_has_bits = from._impl_._has_bits_[0];
-  if (cached_has_bits & 0x0000007fu) {
-    if (cached_has_bits & 0x00000001u) {
-      _this->_impl_.ctype_ = from._impl_.ctype_;
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _this->_impl_.jstype_ = from._impl_.jstype_;
-    }
-    if (cached_has_bits & 0x00000004u) {
-      _this->_impl_.packed_ = from._impl_.packed_;
-    }
-    if (cached_has_bits & 0x00000008u) {
-      _this->_impl_.lazy_ = from._impl_.lazy_;
-    }
-    if (cached_has_bits & 0x00000010u) {
-      _this->_impl_.unverified_lazy_ = from._impl_.unverified_lazy_;
-    }
-    if (cached_has_bits & 0x00000020u) {
-      _this->_impl_.deprecated_ = from._impl_.deprecated_;
-    }
-    if (cached_has_bits & 0x00000040u) {
-      _this->_impl_.weak_ = from._impl_.weak_;
-    }
-    _this->_impl_._has_bits_[0] |= cached_has_bits;
-  }
-  _this->_impl_._extensions_.MergeFrom(internal_default_instance(), from._impl_._extensions_);
-  _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void FieldOptions::CopyFrom(const FieldOptions& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.FieldOptions)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool FieldOptions::IsInitialized() const {
-  if (!_impl_._extensions_.IsInitialized()) {
-    return false;
-  }
-
-  if (!::PROTOBUF_NAMESPACE_ID::internal::AllAreInitialized(_impl_.uninterpreted_option_))
-    return false;
-  return true;
-}
-
-void FieldOptions::InternalSwap(FieldOptions* other) {
-  using std::swap;
-  _impl_._extensions_.InternalSwap(&other->_impl_._extensions_);
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  _impl_.uninterpreted_option_.InternalSwap(&other->_impl_.uninterpreted_option_);
-  ::PROTOBUF_NAMESPACE_ID::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(FieldOptions, _impl_.weak_)
-      + sizeof(FieldOptions::_impl_.weak_)
-      - PROTOBUF_FIELD_OFFSET(FieldOptions, _impl_.ctype_)>(
-          reinterpret_cast<char*>(&_impl_.ctype_),
-          reinterpret_cast<char*>(&other->_impl_.ctype_));
-}
-
-::PROTOBUF_NAMESPACE_ID::Metadata FieldOptions::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_google_2fprotobuf_2fdescriptor_2eproto_getter, &descriptor_table_google_2fprotobuf_2fdescriptor_2eproto_once,
-      file_level_metadata_google_2fprotobuf_2fdescriptor_2eproto[15]);
-}
-
-// ===================================================================
-
-class OneofOptions::_Internal {
- public:
-};
-
-OneofOptions::OneofOptions(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                         bool is_message_owned)
-  : ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned) {
-  SharedCtor(arena, is_message_owned);
-  // @@protoc_insertion_point(arena_constructor:google.protobuf.OneofOptions)
-}
-OneofOptions::OneofOptions(const OneofOptions& from)
-  : ::PROTOBUF_NAMESPACE_ID::Message() {
-  OneofOptions* const _this = this; (void)_this;
-  new (&_impl_) Impl_{
-      /*decltype(_impl_._extensions_)*/{}
-    , decltype(_impl_.uninterpreted_option_){from._impl_.uninterpreted_option_}
-    , /*decltype(_impl_._cached_size_)*/{}};
-
-  _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-  _impl_._extensions_.MergeFrom(internal_default_instance(), from._impl_._extensions_);
-  // @@protoc_insertion_point(copy_constructor:google.protobuf.OneofOptions)
-}
-
-inline void OneofOptions::SharedCtor(
-    ::_pb::Arena* arena, bool is_message_owned) {
-  (void)arena;
-  (void)is_message_owned;
-  new (&_impl_) Impl_{
-      /*decltype(_impl_._extensions_)*/{::_pbi::ArenaInitialized(), arena}
-    , decltype(_impl_.uninterpreted_option_){arena}
-    , /*decltype(_impl_._cached_size_)*/{}
-  };
-}
-
-OneofOptions::~OneofOptions() {
-  // @@protoc_insertion_point(destructor:google.protobuf.OneofOptions)
-  if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) {
-  (void)arena;
-    return;
-  }
-  SharedDtor();
-}
-
-inline void OneofOptions::SharedDtor() {
-  GOOGLE_DCHECK(GetArenaForAllocation() == nullptr);
-  _impl_._extensions_.~ExtensionSet();
-  _impl_.uninterpreted_option_.~RepeatedPtrField();
-}
-
-void OneofOptions::SetCachedSize(int size) const {
-  _impl_._cached_size_.Set(size);
-}
-
-void OneofOptions::Clear() {
-// @@protoc_insertion_point(message_clear_start:google.protobuf.OneofOptions)
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_._extensions_.Clear();
-  _impl_.uninterpreted_option_.Clear();
-  _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>();
-}
-
-const char* OneofOptions::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) {
-#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure
-  while (!ctx->Done(&ptr)) {
-    uint32_t tag;
-    ptr = ::_pbi::ReadTag(ptr, &tag);
-    switch (tag >> 3) {
-      // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
-      case 999:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 58)) {
-          ptr -= 2;
-          do {
-            ptr += 2;
-            ptr = ctx->ParseMessage(_internal_add_uninterpreted_option(), ptr);
-            CHK_(ptr);
-            if (!ctx->DataAvailable(ptr)) break;
-          } while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<7994>(ptr));
-        } else
-          goto handle_unusual;
-        continue;
-      default:
-        goto handle_unusual;
-    }  // switch
-  handle_unusual:
-    if ((tag == 0) || ((tag & 7) == 4)) {
-      CHK_(ptr);
-      ctx->SetLastTag(tag);
-      goto message_done;
-    }
-    if ((8000u <= tag)) {
-      ptr = _impl_._extensions_.ParseField(tag, ptr, internal_default_instance(), &_internal_metadata_, ctx);
-      CHK_(ptr != nullptr);
-      continue;
-    }
-    ptr = UnknownFieldParse(
-        tag,
-        _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(),
-        ptr, ctx);
-    CHK_(ptr != nullptr);
-  }  // while
-message_done:
-  return ptr;
-failure:
-  ptr = nullptr;
-  goto message_done;
-#undef CHK_
-}
-
-uint8_t* OneofOptions::_InternalSerialize(
-    uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.OneofOptions)
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
-  for (unsigned i = 0,
-      n = static_cast<unsigned>(this->_internal_uninterpreted_option_size()); i < n; i++) {
-    const auto& repfield = this->_internal_uninterpreted_option(i);
-    target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
-        InternalWriteMessage(999, repfield, repfield.GetCachedSize(), target, stream);
-  }
-
-  // Extension range [1000, 536870912)
-  target = _impl_._extensions_._InternalSerialize(
-  internal_default_instance(), 1000, 536870912, target, stream);
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-        _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.OneofOptions)
-  return target;
-}
-
-size_t OneofOptions::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:google.protobuf.OneofOptions)
-  size_t total_size = 0;
-
-  total_size += _impl_._extensions_.ByteSize();
-
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
-  total_size += 2UL * this->_internal_uninterpreted_option_size();
-  for (const auto& msg : this->_impl_.uninterpreted_option_) {
-    total_size +=
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(msg);
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData OneofOptions::_class_data_ = {
-    ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck,
-    OneofOptions::MergeImpl
-};
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*OneofOptions::GetClassData() const { return &_class_data_; }
-
-
-void OneofOptions::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) {
-  auto* const _this = static_cast<OneofOptions*>(&to_msg);
-  auto& from = static_cast<const OneofOptions&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.OneofOptions)
-  GOOGLE_DCHECK_NE(&from, _this);
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  _this->_impl_.uninterpreted_option_.MergeFrom(from._impl_.uninterpreted_option_);
-  _this->_impl_._extensions_.MergeFrom(internal_default_instance(), from._impl_._extensions_);
-  _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void OneofOptions::CopyFrom(const OneofOptions& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.OneofOptions)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool OneofOptions::IsInitialized() const {
-  if (!_impl_._extensions_.IsInitialized()) {
-    return false;
-  }
-
-  if (!::PROTOBUF_NAMESPACE_ID::internal::AllAreInitialized(_impl_.uninterpreted_option_))
-    return false;
-  return true;
-}
-
-void OneofOptions::InternalSwap(OneofOptions* other) {
-  using std::swap;
-  _impl_._extensions_.InternalSwap(&other->_impl_._extensions_);
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  _impl_.uninterpreted_option_.InternalSwap(&other->_impl_.uninterpreted_option_);
-}
-
-::PROTOBUF_NAMESPACE_ID::Metadata OneofOptions::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_google_2fprotobuf_2fdescriptor_2eproto_getter, &descriptor_table_google_2fprotobuf_2fdescriptor_2eproto_once,
-      file_level_metadata_google_2fprotobuf_2fdescriptor_2eproto[16]);
-}
-
-// ===================================================================
-
-class EnumOptions::_Internal {
- public:
-  using HasBits = decltype(std::declval<EnumOptions>()._impl_._has_bits_);
-  static void set_has_allow_alias(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-  static void set_has_deprecated(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
-};
-
-EnumOptions::EnumOptions(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                         bool is_message_owned)
-  : ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned) {
-  SharedCtor(arena, is_message_owned);
-  // @@protoc_insertion_point(arena_constructor:google.protobuf.EnumOptions)
-}
-EnumOptions::EnumOptions(const EnumOptions& from)
-  : ::PROTOBUF_NAMESPACE_ID::Message() {
-  EnumOptions* const _this = this; (void)_this;
-  new (&_impl_) Impl_{
-      /*decltype(_impl_._extensions_)*/{}
-    , decltype(_impl_._has_bits_){from._impl_._has_bits_}
-    , /*decltype(_impl_._cached_size_)*/{}
-    , decltype(_impl_.uninterpreted_option_){from._impl_.uninterpreted_option_}
-    , decltype(_impl_.allow_alias_){}
-    , decltype(_impl_.deprecated_){}};
-
-  _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-  _impl_._extensions_.MergeFrom(internal_default_instance(), from._impl_._extensions_);
-  ::memcpy(&_impl_.allow_alias_, &from._impl_.allow_alias_,
-    static_cast<size_t>(reinterpret_cast<char*>(&_impl_.deprecated_) -
-    reinterpret_cast<char*>(&_impl_.allow_alias_)) + sizeof(_impl_.deprecated_));
-  // @@protoc_insertion_point(copy_constructor:google.protobuf.EnumOptions)
-}
-
-inline void EnumOptions::SharedCtor(
-    ::_pb::Arena* arena, bool is_message_owned) {
-  (void)arena;
-  (void)is_message_owned;
-  new (&_impl_) Impl_{
-      /*decltype(_impl_._extensions_)*/{::_pbi::ArenaInitialized(), arena}
-    , decltype(_impl_._has_bits_){}
-    , /*decltype(_impl_._cached_size_)*/{}
-    , decltype(_impl_.uninterpreted_option_){arena}
-    , decltype(_impl_.allow_alias_){false}
-    , decltype(_impl_.deprecated_){false}
-  };
-}
-
-EnumOptions::~EnumOptions() {
-  // @@protoc_insertion_point(destructor:google.protobuf.EnumOptions)
-  if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) {
-  (void)arena;
-    return;
-  }
-  SharedDtor();
-}
-
-inline void EnumOptions::SharedDtor() {
-  GOOGLE_DCHECK(GetArenaForAllocation() == nullptr);
-  _impl_._extensions_.~ExtensionSet();
-  _impl_.uninterpreted_option_.~RepeatedPtrField();
-}
-
-void EnumOptions::SetCachedSize(int size) const {
-  _impl_._cached_size_.Set(size);
-}
-
-void EnumOptions::Clear() {
-// @@protoc_insertion_point(message_clear_start:google.protobuf.EnumOptions)
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_._extensions_.Clear();
-  _impl_.uninterpreted_option_.Clear();
-  ::memset(&_impl_.allow_alias_, 0, static_cast<size_t>(
-      reinterpret_cast<char*>(&_impl_.deprecated_) -
-      reinterpret_cast<char*>(&_impl_.allow_alias_)) + sizeof(_impl_.deprecated_));
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>();
-}
-
-const char* EnumOptions::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) {
-#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure
-  _Internal::HasBits has_bits{};
-  while (!ctx->Done(&ptr)) {
-    uint32_t tag;
-    ptr = ::_pbi::ReadTag(ptr, &tag);
-    switch (tag >> 3) {
-      // optional bool allow_alias = 2;
-      case 2:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 16)) {
-          _Internal::set_has_allow_alias(&has_bits);
-          _impl_.allow_alias_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr);
-          CHK_(ptr);
-        } else
-          goto handle_unusual;
-        continue;
-      // optional bool deprecated = 3 [default = false];
-      case 3:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 24)) {
-          _Internal::set_has_deprecated(&has_bits);
-          _impl_.deprecated_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr);
-          CHK_(ptr);
-        } else
-          goto handle_unusual;
-        continue;
-      // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
-      case 999:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 58)) {
-          ptr -= 2;
-          do {
-            ptr += 2;
-            ptr = ctx->ParseMessage(_internal_add_uninterpreted_option(), ptr);
-            CHK_(ptr);
-            if (!ctx->DataAvailable(ptr)) break;
-          } while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<7994>(ptr));
-        } else
-          goto handle_unusual;
-        continue;
-      default:
-        goto handle_unusual;
-    }  // switch
-  handle_unusual:
-    if ((tag == 0) || ((tag & 7) == 4)) {
-      CHK_(ptr);
-      ctx->SetLastTag(tag);
-      goto message_done;
-    }
-    if ((8000u <= tag)) {
-      ptr = _impl_._extensions_.ParseField(tag, ptr, internal_default_instance(), &_internal_metadata_, ctx);
-      CHK_(ptr != nullptr);
-      continue;
-    }
-    ptr = UnknownFieldParse(
-        tag,
-        _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(),
-        ptr, ctx);
-    CHK_(ptr != nullptr);
-  }  // while
-message_done:
-  _impl_._has_bits_.Or(has_bits);
-  return ptr;
-failure:
-  ptr = nullptr;
-  goto message_done;
-#undef CHK_
-}
-
-uint8_t* EnumOptions::_InternalSerialize(
-    uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.EnumOptions)
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // optional bool allow_alias = 2;
-  if (cached_has_bits & 0x00000001u) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteBoolToArray(2, this->_internal_allow_alias(), target);
-  }
-
-  // optional bool deprecated = 3 [default = false];
-  if (cached_has_bits & 0x00000002u) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteBoolToArray(3, this->_internal_deprecated(), target);
-  }
-
-  // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
-  for (unsigned i = 0,
-      n = static_cast<unsigned>(this->_internal_uninterpreted_option_size()); i < n; i++) {
-    const auto& repfield = this->_internal_uninterpreted_option(i);
-    target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
-        InternalWriteMessage(999, repfield, repfield.GetCachedSize(), target, stream);
-  }
-
-  // Extension range [1000, 536870912)
-  target = _impl_._extensions_._InternalSerialize(
-  internal_default_instance(), 1000, 536870912, target, stream);
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-        _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.EnumOptions)
-  return target;
-}
-
-size_t EnumOptions::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:google.protobuf.EnumOptions)
-  size_t total_size = 0;
-
-  total_size += _impl_._extensions_.ByteSize();
-
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
-  total_size += 2UL * this->_internal_uninterpreted_option_size();
-  for (const auto& msg : this->_impl_.uninterpreted_option_) {
-    total_size +=
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(msg);
-  }
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    // optional bool allow_alias = 2;
-    if (cached_has_bits & 0x00000001u) {
-      total_size += 1 + 1;
-    }
-
-    // optional bool deprecated = 3 [default = false];
-    if (cached_has_bits & 0x00000002u) {
-      total_size += 1 + 1;
-    }
-
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData EnumOptions::_class_data_ = {
-    ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck,
-    EnumOptions::MergeImpl
-};
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*EnumOptions::GetClassData() const { return &_class_data_; }
-
-
-void EnumOptions::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) {
-  auto* const _this = static_cast<EnumOptions*>(&to_msg);
-  auto& from = static_cast<const EnumOptions&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.EnumOptions)
-  GOOGLE_DCHECK_NE(&from, _this);
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  _this->_impl_.uninterpreted_option_.MergeFrom(from._impl_.uninterpreted_option_);
-  cached_has_bits = from._impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      _this->_impl_.allow_alias_ = from._impl_.allow_alias_;
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _this->_impl_.deprecated_ = from._impl_.deprecated_;
-    }
-    _this->_impl_._has_bits_[0] |= cached_has_bits;
-  }
-  _this->_impl_._extensions_.MergeFrom(internal_default_instance(), from._impl_._extensions_);
-  _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void EnumOptions::CopyFrom(const EnumOptions& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.EnumOptions)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool EnumOptions::IsInitialized() const {
-  if (!_impl_._extensions_.IsInitialized()) {
-    return false;
-  }
-
-  if (!::PROTOBUF_NAMESPACE_ID::internal::AllAreInitialized(_impl_.uninterpreted_option_))
-    return false;
-  return true;
-}
-
-void EnumOptions::InternalSwap(EnumOptions* other) {
-  using std::swap;
-  _impl_._extensions_.InternalSwap(&other->_impl_._extensions_);
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  _impl_.uninterpreted_option_.InternalSwap(&other->_impl_.uninterpreted_option_);
-  ::PROTOBUF_NAMESPACE_ID::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(EnumOptions, _impl_.deprecated_)
-      + sizeof(EnumOptions::_impl_.deprecated_)
-      - PROTOBUF_FIELD_OFFSET(EnumOptions, _impl_.allow_alias_)>(
-          reinterpret_cast<char*>(&_impl_.allow_alias_),
-          reinterpret_cast<char*>(&other->_impl_.allow_alias_));
-}
-
-::PROTOBUF_NAMESPACE_ID::Metadata EnumOptions::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_google_2fprotobuf_2fdescriptor_2eproto_getter, &descriptor_table_google_2fprotobuf_2fdescriptor_2eproto_once,
-      file_level_metadata_google_2fprotobuf_2fdescriptor_2eproto[17]);
-}
-
-// ===================================================================
-
-class EnumValueOptions::_Internal {
- public:
-  using HasBits = decltype(std::declval<EnumValueOptions>()._impl_._has_bits_);
-  static void set_has_deprecated(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-};
-
-EnumValueOptions::EnumValueOptions(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                         bool is_message_owned)
-  : ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned) {
-  SharedCtor(arena, is_message_owned);
-  // @@protoc_insertion_point(arena_constructor:google.protobuf.EnumValueOptions)
-}
-EnumValueOptions::EnumValueOptions(const EnumValueOptions& from)
-  : ::PROTOBUF_NAMESPACE_ID::Message() {
-  EnumValueOptions* const _this = this; (void)_this;
-  new (&_impl_) Impl_{
-      /*decltype(_impl_._extensions_)*/{}
-    , decltype(_impl_._has_bits_){from._impl_._has_bits_}
-    , /*decltype(_impl_._cached_size_)*/{}
-    , decltype(_impl_.uninterpreted_option_){from._impl_.uninterpreted_option_}
-    , decltype(_impl_.deprecated_){}};
-
-  _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-  _impl_._extensions_.MergeFrom(internal_default_instance(), from._impl_._extensions_);
-  _this->_impl_.deprecated_ = from._impl_.deprecated_;
-  // @@protoc_insertion_point(copy_constructor:google.protobuf.EnumValueOptions)
-}
-
-inline void EnumValueOptions::SharedCtor(
-    ::_pb::Arena* arena, bool is_message_owned) {
-  (void)arena;
-  (void)is_message_owned;
-  new (&_impl_) Impl_{
-      /*decltype(_impl_._extensions_)*/{::_pbi::ArenaInitialized(), arena}
-    , decltype(_impl_._has_bits_){}
-    , /*decltype(_impl_._cached_size_)*/{}
-    , decltype(_impl_.uninterpreted_option_){arena}
-    , decltype(_impl_.deprecated_){false}
-  };
-}
-
-EnumValueOptions::~EnumValueOptions() {
-  // @@protoc_insertion_point(destructor:google.protobuf.EnumValueOptions)
-  if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) {
-  (void)arena;
-    return;
-  }
-  SharedDtor();
-}
-
-inline void EnumValueOptions::SharedDtor() {
-  GOOGLE_DCHECK(GetArenaForAllocation() == nullptr);
-  _impl_._extensions_.~ExtensionSet();
-  _impl_.uninterpreted_option_.~RepeatedPtrField();
-}
-
-void EnumValueOptions::SetCachedSize(int size) const {
-  _impl_._cached_size_.Set(size);
-}
-
-void EnumValueOptions::Clear() {
-// @@protoc_insertion_point(message_clear_start:google.protobuf.EnumValueOptions)
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_._extensions_.Clear();
-  _impl_.uninterpreted_option_.Clear();
-  _impl_.deprecated_ = false;
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>();
-}
-
-const char* EnumValueOptions::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) {
-#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure
-  _Internal::HasBits has_bits{};
-  while (!ctx->Done(&ptr)) {
-    uint32_t tag;
-    ptr = ::_pbi::ReadTag(ptr, &tag);
-    switch (tag >> 3) {
-      // optional bool deprecated = 1 [default = false];
-      case 1:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 8)) {
-          _Internal::set_has_deprecated(&has_bits);
-          _impl_.deprecated_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr);
-          CHK_(ptr);
-        } else
-          goto handle_unusual;
-        continue;
-      // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
-      case 999:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 58)) {
-          ptr -= 2;
-          do {
-            ptr += 2;
-            ptr = ctx->ParseMessage(_internal_add_uninterpreted_option(), ptr);
-            CHK_(ptr);
-            if (!ctx->DataAvailable(ptr)) break;
-          } while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<7994>(ptr));
-        } else
-          goto handle_unusual;
-        continue;
-      default:
-        goto handle_unusual;
-    }  // switch
-  handle_unusual:
-    if ((tag == 0) || ((tag & 7) == 4)) {
-      CHK_(ptr);
-      ctx->SetLastTag(tag);
-      goto message_done;
-    }
-    if ((8000u <= tag)) {
-      ptr = _impl_._extensions_.ParseField(tag, ptr, internal_default_instance(), &_internal_metadata_, ctx);
-      CHK_(ptr != nullptr);
-      continue;
-    }
-    ptr = UnknownFieldParse(
-        tag,
-        _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(),
-        ptr, ctx);
-    CHK_(ptr != nullptr);
-  }  // while
-message_done:
-  _impl_._has_bits_.Or(has_bits);
-  return ptr;
-failure:
-  ptr = nullptr;
-  goto message_done;
-#undef CHK_
-}
-
-uint8_t* EnumValueOptions::_InternalSerialize(
-    uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.EnumValueOptions)
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // optional bool deprecated = 1 [default = false];
-  if (cached_has_bits & 0x00000001u) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteBoolToArray(1, this->_internal_deprecated(), target);
-  }
-
-  // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
-  for (unsigned i = 0,
-      n = static_cast<unsigned>(this->_internal_uninterpreted_option_size()); i < n; i++) {
-    const auto& repfield = this->_internal_uninterpreted_option(i);
-    target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
-        InternalWriteMessage(999, repfield, repfield.GetCachedSize(), target, stream);
-  }
-
-  // Extension range [1000, 536870912)
-  target = _impl_._extensions_._InternalSerialize(
-  internal_default_instance(), 1000, 536870912, target, stream);
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-        _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.EnumValueOptions)
-  return target;
-}
-
-size_t EnumValueOptions::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:google.protobuf.EnumValueOptions)
-  size_t total_size = 0;
-
-  total_size += _impl_._extensions_.ByteSize();
-
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
-  total_size += 2UL * this->_internal_uninterpreted_option_size();
-  for (const auto& msg : this->_impl_.uninterpreted_option_) {
-    total_size +=
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(msg);
-  }
-
-  // optional bool deprecated = 1 [default = false];
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000001u) {
-    total_size += 1 + 1;
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData EnumValueOptions::_class_data_ = {
-    ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck,
-    EnumValueOptions::MergeImpl
-};
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*EnumValueOptions::GetClassData() const { return &_class_data_; }
-
-
-void EnumValueOptions::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) {
-  auto* const _this = static_cast<EnumValueOptions*>(&to_msg);
-  auto& from = static_cast<const EnumValueOptions&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.EnumValueOptions)
-  GOOGLE_DCHECK_NE(&from, _this);
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  _this->_impl_.uninterpreted_option_.MergeFrom(from._impl_.uninterpreted_option_);
-  if (from._internal_has_deprecated()) {
-    _this->_internal_set_deprecated(from._internal_deprecated());
-  }
-  _this->_impl_._extensions_.MergeFrom(internal_default_instance(), from._impl_._extensions_);
-  _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void EnumValueOptions::CopyFrom(const EnumValueOptions& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.EnumValueOptions)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool EnumValueOptions::IsInitialized() const {
-  if (!_impl_._extensions_.IsInitialized()) {
-    return false;
-  }
-
-  if (!::PROTOBUF_NAMESPACE_ID::internal::AllAreInitialized(_impl_.uninterpreted_option_))
-    return false;
-  return true;
-}
-
-void EnumValueOptions::InternalSwap(EnumValueOptions* other) {
-  using std::swap;
-  _impl_._extensions_.InternalSwap(&other->_impl_._extensions_);
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  _impl_.uninterpreted_option_.InternalSwap(&other->_impl_.uninterpreted_option_);
-  swap(_impl_.deprecated_, other->_impl_.deprecated_);
-}
-
-::PROTOBUF_NAMESPACE_ID::Metadata EnumValueOptions::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_google_2fprotobuf_2fdescriptor_2eproto_getter, &descriptor_table_google_2fprotobuf_2fdescriptor_2eproto_once,
-      file_level_metadata_google_2fprotobuf_2fdescriptor_2eproto[18]);
-}
-
-// ===================================================================
-
-class ServiceOptions::_Internal {
- public:
-  using HasBits = decltype(std::declval<ServiceOptions>()._impl_._has_bits_);
-  static void set_has_deprecated(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-};
-
-ServiceOptions::ServiceOptions(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                         bool is_message_owned)
-  : ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned) {
-  SharedCtor(arena, is_message_owned);
-  // @@protoc_insertion_point(arena_constructor:google.protobuf.ServiceOptions)
-}
-ServiceOptions::ServiceOptions(const ServiceOptions& from)
-  : ::PROTOBUF_NAMESPACE_ID::Message() {
-  ServiceOptions* const _this = this; (void)_this;
-  new (&_impl_) Impl_{
-      /*decltype(_impl_._extensions_)*/{}
-    , decltype(_impl_._has_bits_){from._impl_._has_bits_}
-    , /*decltype(_impl_._cached_size_)*/{}
-    , decltype(_impl_.uninterpreted_option_){from._impl_.uninterpreted_option_}
-    , decltype(_impl_.deprecated_){}};
-
-  _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-  _impl_._extensions_.MergeFrom(internal_default_instance(), from._impl_._extensions_);
-  _this->_impl_.deprecated_ = from._impl_.deprecated_;
-  // @@protoc_insertion_point(copy_constructor:google.protobuf.ServiceOptions)
-}
-
-inline void ServiceOptions::SharedCtor(
-    ::_pb::Arena* arena, bool is_message_owned) {
-  (void)arena;
-  (void)is_message_owned;
-  new (&_impl_) Impl_{
-      /*decltype(_impl_._extensions_)*/{::_pbi::ArenaInitialized(), arena}
-    , decltype(_impl_._has_bits_){}
-    , /*decltype(_impl_._cached_size_)*/{}
-    , decltype(_impl_.uninterpreted_option_){arena}
-    , decltype(_impl_.deprecated_){false}
-  };
-}
-
-ServiceOptions::~ServiceOptions() {
-  // @@protoc_insertion_point(destructor:google.protobuf.ServiceOptions)
-  if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) {
-  (void)arena;
-    return;
-  }
-  SharedDtor();
-}
-
-inline void ServiceOptions::SharedDtor() {
-  GOOGLE_DCHECK(GetArenaForAllocation() == nullptr);
-  _impl_._extensions_.~ExtensionSet();
-  _impl_.uninterpreted_option_.~RepeatedPtrField();
-}
-
-void ServiceOptions::SetCachedSize(int size) const {
-  _impl_._cached_size_.Set(size);
-}
-
-void ServiceOptions::Clear() {
-// @@protoc_insertion_point(message_clear_start:google.protobuf.ServiceOptions)
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_._extensions_.Clear();
-  _impl_.uninterpreted_option_.Clear();
-  _impl_.deprecated_ = false;
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>();
-}
-
-const char* ServiceOptions::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) {
-#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure
-  _Internal::HasBits has_bits{};
-  while (!ctx->Done(&ptr)) {
-    uint32_t tag;
-    ptr = ::_pbi::ReadTag(ptr, &tag);
-    switch (tag >> 3) {
-      // optional bool deprecated = 33 [default = false];
-      case 33:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 8)) {
-          _Internal::set_has_deprecated(&has_bits);
-          _impl_.deprecated_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr);
-          CHK_(ptr);
-        } else
-          goto handle_unusual;
-        continue;
-      // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
-      case 999:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 58)) {
-          ptr -= 2;
-          do {
-            ptr += 2;
-            ptr = ctx->ParseMessage(_internal_add_uninterpreted_option(), ptr);
-            CHK_(ptr);
-            if (!ctx->DataAvailable(ptr)) break;
-          } while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<7994>(ptr));
-        } else
-          goto handle_unusual;
-        continue;
-      default:
-        goto handle_unusual;
-    }  // switch
-  handle_unusual:
-    if ((tag == 0) || ((tag & 7) == 4)) {
-      CHK_(ptr);
-      ctx->SetLastTag(tag);
-      goto message_done;
-    }
-    if ((8000u <= tag)) {
-      ptr = _impl_._extensions_.ParseField(tag, ptr, internal_default_instance(), &_internal_metadata_, ctx);
-      CHK_(ptr != nullptr);
-      continue;
-    }
-    ptr = UnknownFieldParse(
-        tag,
-        _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(),
-        ptr, ctx);
-    CHK_(ptr != nullptr);
-  }  // while
-message_done:
-  _impl_._has_bits_.Or(has_bits);
-  return ptr;
-failure:
-  ptr = nullptr;
-  goto message_done;
-#undef CHK_
-}
-
-uint8_t* ServiceOptions::_InternalSerialize(
-    uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.ServiceOptions)
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // optional bool deprecated = 33 [default = false];
-  if (cached_has_bits & 0x00000001u) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteBoolToArray(33, this->_internal_deprecated(), target);
-  }
-
-  // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
-  for (unsigned i = 0,
-      n = static_cast<unsigned>(this->_internal_uninterpreted_option_size()); i < n; i++) {
-    const auto& repfield = this->_internal_uninterpreted_option(i);
-    target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
-        InternalWriteMessage(999, repfield, repfield.GetCachedSize(), target, stream);
-  }
-
-  // Extension range [1000, 536870912)
-  target = _impl_._extensions_._InternalSerialize(
-  internal_default_instance(), 1000, 536870912, target, stream);
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-        _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.ServiceOptions)
-  return target;
-}
-
-size_t ServiceOptions::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:google.protobuf.ServiceOptions)
-  size_t total_size = 0;
-
-  total_size += _impl_._extensions_.ByteSize();
-
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
-  total_size += 2UL * this->_internal_uninterpreted_option_size();
-  for (const auto& msg : this->_impl_.uninterpreted_option_) {
-    total_size +=
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(msg);
-  }
-
-  // optional bool deprecated = 33 [default = false];
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000001u) {
-    total_size += 2 + 1;
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData ServiceOptions::_class_data_ = {
-    ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck,
-    ServiceOptions::MergeImpl
-};
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*ServiceOptions::GetClassData() const { return &_class_data_; }
-
-
-void ServiceOptions::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) {
-  auto* const _this = static_cast<ServiceOptions*>(&to_msg);
-  auto& from = static_cast<const ServiceOptions&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.ServiceOptions)
-  GOOGLE_DCHECK_NE(&from, _this);
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  _this->_impl_.uninterpreted_option_.MergeFrom(from._impl_.uninterpreted_option_);
-  if (from._internal_has_deprecated()) {
-    _this->_internal_set_deprecated(from._internal_deprecated());
-  }
-  _this->_impl_._extensions_.MergeFrom(internal_default_instance(), from._impl_._extensions_);
-  _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void ServiceOptions::CopyFrom(const ServiceOptions& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.ServiceOptions)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool ServiceOptions::IsInitialized() const {
-  if (!_impl_._extensions_.IsInitialized()) {
-    return false;
-  }
-
-  if (!::PROTOBUF_NAMESPACE_ID::internal::AllAreInitialized(_impl_.uninterpreted_option_))
-    return false;
-  return true;
-}
-
-void ServiceOptions::InternalSwap(ServiceOptions* other) {
-  using std::swap;
-  _impl_._extensions_.InternalSwap(&other->_impl_._extensions_);
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  _impl_.uninterpreted_option_.InternalSwap(&other->_impl_.uninterpreted_option_);
-  swap(_impl_.deprecated_, other->_impl_.deprecated_);
-}
-
-::PROTOBUF_NAMESPACE_ID::Metadata ServiceOptions::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_google_2fprotobuf_2fdescriptor_2eproto_getter, &descriptor_table_google_2fprotobuf_2fdescriptor_2eproto_once,
-      file_level_metadata_google_2fprotobuf_2fdescriptor_2eproto[19]);
-}
-
-// ===================================================================
-
-class MethodOptions::_Internal {
- public:
-  using HasBits = decltype(std::declval<MethodOptions>()._impl_._has_bits_);
-  static void set_has_deprecated(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-  static void set_has_idempotency_level(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
-};
-
-MethodOptions::MethodOptions(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                         bool is_message_owned)
-  : ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned) {
-  SharedCtor(arena, is_message_owned);
-  // @@protoc_insertion_point(arena_constructor:google.protobuf.MethodOptions)
-}
-MethodOptions::MethodOptions(const MethodOptions& from)
-  : ::PROTOBUF_NAMESPACE_ID::Message() {
-  MethodOptions* const _this = this; (void)_this;
-  new (&_impl_) Impl_{
-      /*decltype(_impl_._extensions_)*/{}
-    , decltype(_impl_._has_bits_){from._impl_._has_bits_}
-    , /*decltype(_impl_._cached_size_)*/{}
-    , decltype(_impl_.uninterpreted_option_){from._impl_.uninterpreted_option_}
-    , decltype(_impl_.deprecated_){}
-    , decltype(_impl_.idempotency_level_){}};
-
-  _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-  _impl_._extensions_.MergeFrom(internal_default_instance(), from._impl_._extensions_);
-  ::memcpy(&_impl_.deprecated_, &from._impl_.deprecated_,
-    static_cast<size_t>(reinterpret_cast<char*>(&_impl_.idempotency_level_) -
-    reinterpret_cast<char*>(&_impl_.deprecated_)) + sizeof(_impl_.idempotency_level_));
-  // @@protoc_insertion_point(copy_constructor:google.protobuf.MethodOptions)
-}
-
-inline void MethodOptions::SharedCtor(
-    ::_pb::Arena* arena, bool is_message_owned) {
-  (void)arena;
-  (void)is_message_owned;
-  new (&_impl_) Impl_{
-      /*decltype(_impl_._extensions_)*/{::_pbi::ArenaInitialized(), arena}
-    , decltype(_impl_._has_bits_){}
-    , /*decltype(_impl_._cached_size_)*/{}
-    , decltype(_impl_.uninterpreted_option_){arena}
-    , decltype(_impl_.deprecated_){false}
-    , decltype(_impl_.idempotency_level_){0}
-  };
-}
-
-MethodOptions::~MethodOptions() {
-  // @@protoc_insertion_point(destructor:google.protobuf.MethodOptions)
-  if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) {
-  (void)arena;
-    return;
-  }
-  SharedDtor();
-}
-
-inline void MethodOptions::SharedDtor() {
-  GOOGLE_DCHECK(GetArenaForAllocation() == nullptr);
-  _impl_._extensions_.~ExtensionSet();
-  _impl_.uninterpreted_option_.~RepeatedPtrField();
-}
-
-void MethodOptions::SetCachedSize(int size) const {
-  _impl_._cached_size_.Set(size);
-}
-
-void MethodOptions::Clear() {
-// @@protoc_insertion_point(message_clear_start:google.protobuf.MethodOptions)
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_._extensions_.Clear();
-  _impl_.uninterpreted_option_.Clear();
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    ::memset(&_impl_.deprecated_, 0, static_cast<size_t>(
-        reinterpret_cast<char*>(&_impl_.idempotency_level_) -
-        reinterpret_cast<char*>(&_impl_.deprecated_)) + sizeof(_impl_.idempotency_level_));
-  }
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>();
-}
-
-const char* MethodOptions::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) {
-#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure
-  _Internal::HasBits has_bits{};
-  while (!ctx->Done(&ptr)) {
-    uint32_t tag;
-    ptr = ::_pbi::ReadTag(ptr, &tag);
-    switch (tag >> 3) {
-      // optional bool deprecated = 33 [default = false];
-      case 33:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 8)) {
-          _Internal::set_has_deprecated(&has_bits);
-          _impl_.deprecated_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr);
-          CHK_(ptr);
-        } else
-          goto handle_unusual;
-        continue;
-      // optional .google.protobuf.MethodOptions.IdempotencyLevel idempotency_level = 34 [default = IDEMPOTENCY_UNKNOWN];
-      case 34:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 16)) {
-          uint64_t val = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr);
-          CHK_(ptr);
-          if (PROTOBUF_PREDICT_TRUE(::PROTOBUF_NAMESPACE_ID::MethodOptions_IdempotencyLevel_IsValid(val))) {
-            _internal_set_idempotency_level(static_cast<::PROTOBUF_NAMESPACE_ID::MethodOptions_IdempotencyLevel>(val));
-          } else {
-            ::PROTOBUF_NAMESPACE_ID::internal::WriteVarint(34, val, mutable_unknown_fields());
-          }
-        } else
-          goto handle_unusual;
-        continue;
-      // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
-      case 999:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 58)) {
-          ptr -= 2;
-          do {
-            ptr += 2;
-            ptr = ctx->ParseMessage(_internal_add_uninterpreted_option(), ptr);
-            CHK_(ptr);
-            if (!ctx->DataAvailable(ptr)) break;
-          } while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<7994>(ptr));
-        } else
-          goto handle_unusual;
-        continue;
-      default:
-        goto handle_unusual;
-    }  // switch
-  handle_unusual:
-    if ((tag == 0) || ((tag & 7) == 4)) {
-      CHK_(ptr);
-      ctx->SetLastTag(tag);
-      goto message_done;
-    }
-    if ((8000u <= tag)) {
-      ptr = _impl_._extensions_.ParseField(tag, ptr, internal_default_instance(), &_internal_metadata_, ctx);
-      CHK_(ptr != nullptr);
-      continue;
-    }
-    ptr = UnknownFieldParse(
-        tag,
-        _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(),
-        ptr, ctx);
-    CHK_(ptr != nullptr);
-  }  // while
-message_done:
-  _impl_._has_bits_.Or(has_bits);
-  return ptr;
-failure:
-  ptr = nullptr;
-  goto message_done;
-#undef CHK_
-}
-
-uint8_t* MethodOptions::_InternalSerialize(
-    uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.MethodOptions)
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // optional bool deprecated = 33 [default = false];
-  if (cached_has_bits & 0x00000001u) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteBoolToArray(33, this->_internal_deprecated(), target);
-  }
-
-  // optional .google.protobuf.MethodOptions.IdempotencyLevel idempotency_level = 34 [default = IDEMPOTENCY_UNKNOWN];
-  if (cached_has_bits & 0x00000002u) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteEnumToArray(
-      34, this->_internal_idempotency_level(), target);
-  }
-
-  // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
-  for (unsigned i = 0,
-      n = static_cast<unsigned>(this->_internal_uninterpreted_option_size()); i < n; i++) {
-    const auto& repfield = this->_internal_uninterpreted_option(i);
-    target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
-        InternalWriteMessage(999, repfield, repfield.GetCachedSize(), target, stream);
-  }
-
-  // Extension range [1000, 536870912)
-  target = _impl_._extensions_._InternalSerialize(
-  internal_default_instance(), 1000, 536870912, target, stream);
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-        _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.MethodOptions)
-  return target;
-}
-
-size_t MethodOptions::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:google.protobuf.MethodOptions)
-  size_t total_size = 0;
-
-  total_size += _impl_._extensions_.ByteSize();
-
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
-  total_size += 2UL * this->_internal_uninterpreted_option_size();
-  for (const auto& msg : this->_impl_.uninterpreted_option_) {
-    total_size +=
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(msg);
-  }
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    // optional bool deprecated = 33 [default = false];
-    if (cached_has_bits & 0x00000001u) {
-      total_size += 2 + 1;
-    }
-
-    // optional .google.protobuf.MethodOptions.IdempotencyLevel idempotency_level = 34 [default = IDEMPOTENCY_UNKNOWN];
-    if (cached_has_bits & 0x00000002u) {
-      total_size += 2 +
-        ::_pbi::WireFormatLite::EnumSize(this->_internal_idempotency_level());
-    }
-
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData MethodOptions::_class_data_ = {
-    ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck,
-    MethodOptions::MergeImpl
-};
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*MethodOptions::GetClassData() const { return &_class_data_; }
-
-
-void MethodOptions::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) {
-  auto* const _this = static_cast<MethodOptions*>(&to_msg);
-  auto& from = static_cast<const MethodOptions&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.MethodOptions)
-  GOOGLE_DCHECK_NE(&from, _this);
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  _this->_impl_.uninterpreted_option_.MergeFrom(from._impl_.uninterpreted_option_);
-  cached_has_bits = from._impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      _this->_impl_.deprecated_ = from._impl_.deprecated_;
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _this->_impl_.idempotency_level_ = from._impl_.idempotency_level_;
-    }
-    _this->_impl_._has_bits_[0] |= cached_has_bits;
-  }
-  _this->_impl_._extensions_.MergeFrom(internal_default_instance(), from._impl_._extensions_);
-  _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void MethodOptions::CopyFrom(const MethodOptions& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.MethodOptions)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool MethodOptions::IsInitialized() const {
-  if (!_impl_._extensions_.IsInitialized()) {
-    return false;
-  }
-
-  if (!::PROTOBUF_NAMESPACE_ID::internal::AllAreInitialized(_impl_.uninterpreted_option_))
-    return false;
-  return true;
-}
-
-void MethodOptions::InternalSwap(MethodOptions* other) {
-  using std::swap;
-  _impl_._extensions_.InternalSwap(&other->_impl_._extensions_);
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  _impl_.uninterpreted_option_.InternalSwap(&other->_impl_.uninterpreted_option_);
-  ::PROTOBUF_NAMESPACE_ID::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(MethodOptions, _impl_.idempotency_level_)
-      + sizeof(MethodOptions::_impl_.idempotency_level_)
-      - PROTOBUF_FIELD_OFFSET(MethodOptions, _impl_.deprecated_)>(
-          reinterpret_cast<char*>(&_impl_.deprecated_),
-          reinterpret_cast<char*>(&other->_impl_.deprecated_));
-}
-
-::PROTOBUF_NAMESPACE_ID::Metadata MethodOptions::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_google_2fprotobuf_2fdescriptor_2eproto_getter, &descriptor_table_google_2fprotobuf_2fdescriptor_2eproto_once,
-      file_level_metadata_google_2fprotobuf_2fdescriptor_2eproto[20]);
-}
-
-// ===================================================================
-
-class UninterpretedOption_NamePart::_Internal {
- public:
-  using HasBits = decltype(std::declval<UninterpretedOption_NamePart>()._impl_._has_bits_);
-  static void set_has_name_part(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-  static void set_has_is_extension(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
-  static bool MissingRequiredFields(const HasBits& has_bits) {
-    return ((has_bits[0] & 0x00000003) ^ 0x00000003) != 0;
-  }
-};
-
-UninterpretedOption_NamePart::UninterpretedOption_NamePart(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                         bool is_message_owned)
-  : ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned) {
-  SharedCtor(arena, is_message_owned);
-  // @@protoc_insertion_point(arena_constructor:google.protobuf.UninterpretedOption.NamePart)
-}
-UninterpretedOption_NamePart::UninterpretedOption_NamePart(const UninterpretedOption_NamePart& from)
-  : ::PROTOBUF_NAMESPACE_ID::Message() {
-  UninterpretedOption_NamePart* const _this = this; (void)_this;
-  new (&_impl_) Impl_{
-      decltype(_impl_._has_bits_){from._impl_._has_bits_}
-    , /*decltype(_impl_._cached_size_)*/{}
-    , decltype(_impl_.name_part_){}
-    , decltype(_impl_.is_extension_){}};
-
-  _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-  _impl_.name_part_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.name_part_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (from._internal_has_name_part()) {
-    _this->_impl_.name_part_.Set(from._internal_name_part(), 
-      _this->GetArenaForAllocation());
-  }
-  _this->_impl_.is_extension_ = from._impl_.is_extension_;
-  // @@protoc_insertion_point(copy_constructor:google.protobuf.UninterpretedOption.NamePart)
-}
-
-inline void UninterpretedOption_NamePart::SharedCtor(
-    ::_pb::Arena* arena, bool is_message_owned) {
-  (void)arena;
-  (void)is_message_owned;
-  new (&_impl_) Impl_{
-      decltype(_impl_._has_bits_){}
-    , /*decltype(_impl_._cached_size_)*/{}
-    , decltype(_impl_.name_part_){}
-    , decltype(_impl_.is_extension_){false}
-  };
-  _impl_.name_part_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.name_part_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-}
-
-UninterpretedOption_NamePart::~UninterpretedOption_NamePart() {
-  // @@protoc_insertion_point(destructor:google.protobuf.UninterpretedOption.NamePart)
-  if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) {
-  (void)arena;
-    return;
-  }
-  SharedDtor();
-}
-
-inline void UninterpretedOption_NamePart::SharedDtor() {
-  GOOGLE_DCHECK(GetArenaForAllocation() == nullptr);
-  _impl_.name_part_.Destroy();
-}
-
-void UninterpretedOption_NamePart::SetCachedSize(int size) const {
-  _impl_._cached_size_.Set(size);
-}
-
-void UninterpretedOption_NamePart::Clear() {
-// @@protoc_insertion_point(message_clear_start:google.protobuf.UninterpretedOption.NamePart)
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000001u) {
-    _impl_.name_part_.ClearNonDefaultToEmpty();
-  }
-  _impl_.is_extension_ = false;
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>();
-}
-
-const char* UninterpretedOption_NamePart::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) {
-#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure
-  _Internal::HasBits has_bits{};
-  while (!ctx->Done(&ptr)) {
-    uint32_t tag;
-    ptr = ::_pbi::ReadTag(ptr, &tag);
-    switch (tag >> 3) {
-      // required string name_part = 1;
-      case 1:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 10)) {
-          auto str = _internal_mutable_name_part();
-          ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx);
-          CHK_(ptr);
-          #ifndef NDEBUG
-          ::_pbi::VerifyUTF8(str, "google.protobuf.UninterpretedOption.NamePart.name_part");
-          #endif  // !NDEBUG
-        } else
-          goto handle_unusual;
-        continue;
-      // required bool is_extension = 2;
-      case 2:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 16)) {
-          _Internal::set_has_is_extension(&has_bits);
-          _impl_.is_extension_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr);
-          CHK_(ptr);
-        } else
-          goto handle_unusual;
-        continue;
-      default:
-        goto handle_unusual;
-    }  // switch
-  handle_unusual:
-    if ((tag == 0) || ((tag & 7) == 4)) {
-      CHK_(ptr);
-      ctx->SetLastTag(tag);
-      goto message_done;
-    }
-    ptr = UnknownFieldParse(
-        tag,
-        _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(),
-        ptr, ctx);
-    CHK_(ptr != nullptr);
-  }  // while
-message_done:
-  _impl_._has_bits_.Or(has_bits);
-  return ptr;
-failure:
-  ptr = nullptr;
-  goto message_done;
-#undef CHK_
-}
-
-uint8_t* UninterpretedOption_NamePart::_InternalSerialize(
-    uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.UninterpretedOption.NamePart)
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // required string name_part = 1;
-  if (cached_has_bits & 0x00000001u) {
-    ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::VerifyUTF8StringNamedField(
-      this->_internal_name_part().data(), static_cast<int>(this->_internal_name_part().length()),
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::SERIALIZE,
-      "google.protobuf.UninterpretedOption.NamePart.name_part");
-    target = stream->WriteStringMaybeAliased(
-        1, this->_internal_name_part(), target);
-  }
-
-  // required bool is_extension = 2;
-  if (cached_has_bits & 0x00000002u) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteBoolToArray(2, this->_internal_is_extension(), target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-        _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.UninterpretedOption.NamePart)
-  return target;
-}
-
-size_t UninterpretedOption_NamePart::RequiredFieldsByteSizeFallback() const {
-// @@protoc_insertion_point(required_fields_byte_size_fallback_start:google.protobuf.UninterpretedOption.NamePart)
-  size_t total_size = 0;
-
-  if (_internal_has_name_part()) {
-    // required string name_part = 1;
-    total_size += 1 +
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize(
-        this->_internal_name_part());
-  }
-
-  if (_internal_has_is_extension()) {
-    // required bool is_extension = 2;
-    total_size += 1 + 1;
-  }
-
-  return total_size;
-}
-size_t UninterpretedOption_NamePart::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:google.protobuf.UninterpretedOption.NamePart)
-  size_t total_size = 0;
-
-  if (((_impl_._has_bits_[0] & 0x00000003) ^ 0x00000003) == 0) {  // All required fields are present.
-    // required string name_part = 1;
-    total_size += 1 +
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize(
-        this->_internal_name_part());
-
-    // required bool is_extension = 2;
-    total_size += 1 + 1;
-
-  } else {
-    total_size += RequiredFieldsByteSizeFallback();
-  }
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData UninterpretedOption_NamePart::_class_data_ = {
-    ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck,
-    UninterpretedOption_NamePart::MergeImpl
-};
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*UninterpretedOption_NamePart::GetClassData() const { return &_class_data_; }
-
-
-void UninterpretedOption_NamePart::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) {
-  auto* const _this = static_cast<UninterpretedOption_NamePart*>(&to_msg);
-  auto& from = static_cast<const UninterpretedOption_NamePart&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.UninterpretedOption.NamePart)
-  GOOGLE_DCHECK_NE(&from, _this);
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  cached_has_bits = from._impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      _this->_internal_set_name_part(from._internal_name_part());
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _this->_impl_.is_extension_ = from._impl_.is_extension_;
-    }
-    _this->_impl_._has_bits_[0] |= cached_has_bits;
-  }
-  _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void UninterpretedOption_NamePart::CopyFrom(const UninterpretedOption_NamePart& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.UninterpretedOption.NamePart)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool UninterpretedOption_NamePart::IsInitialized() const {
-  if (_Internal::MissingRequiredFields(_impl_._has_bits_)) return false;
-  return true;
-}
-
-void UninterpretedOption_NamePart::InternalSwap(UninterpretedOption_NamePart* other) {
-  using std::swap;
-  auto* lhs_arena = GetArenaForAllocation();
-  auto* rhs_arena = other->GetArenaForAllocation();
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::InternalSwap(
-      &_impl_.name_part_, lhs_arena,
-      &other->_impl_.name_part_, rhs_arena
-  );
-  swap(_impl_.is_extension_, other->_impl_.is_extension_);
-}
-
-::PROTOBUF_NAMESPACE_ID::Metadata UninterpretedOption_NamePart::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_google_2fprotobuf_2fdescriptor_2eproto_getter, &descriptor_table_google_2fprotobuf_2fdescriptor_2eproto_once,
-      file_level_metadata_google_2fprotobuf_2fdescriptor_2eproto[21]);
-}
-
-// ===================================================================
-
-class UninterpretedOption::_Internal {
- public:
-  using HasBits = decltype(std::declval<UninterpretedOption>()._impl_._has_bits_);
-  static void set_has_identifier_value(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-  static void set_has_positive_int_value(HasBits* has_bits) {
-    (*has_bits)[0] |= 8u;
-  }
-  static void set_has_negative_int_value(HasBits* has_bits) {
-    (*has_bits)[0] |= 16u;
-  }
-  static void set_has_double_value(HasBits* has_bits) {
-    (*has_bits)[0] |= 32u;
-  }
-  static void set_has_string_value(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
-  static void set_has_aggregate_value(HasBits* has_bits) {
-    (*has_bits)[0] |= 4u;
-  }
-};
-
-UninterpretedOption::UninterpretedOption(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                         bool is_message_owned)
-  : ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned) {
-  SharedCtor(arena, is_message_owned);
-  // @@protoc_insertion_point(arena_constructor:google.protobuf.UninterpretedOption)
-}
-UninterpretedOption::UninterpretedOption(const UninterpretedOption& from)
-  : ::PROTOBUF_NAMESPACE_ID::Message() {
-  UninterpretedOption* const _this = this; (void)_this;
-  new (&_impl_) Impl_{
-      decltype(_impl_._has_bits_){from._impl_._has_bits_}
-    , /*decltype(_impl_._cached_size_)*/{}
-    , decltype(_impl_.name_){from._impl_.name_}
-    , decltype(_impl_.identifier_value_){}
-    , decltype(_impl_.string_value_){}
-    , decltype(_impl_.aggregate_value_){}
-    , decltype(_impl_.positive_int_value_){}
-    , decltype(_impl_.negative_int_value_){}
-    , decltype(_impl_.double_value_){}};
-
-  _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-  _impl_.identifier_value_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.identifier_value_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (from._internal_has_identifier_value()) {
-    _this->_impl_.identifier_value_.Set(from._internal_identifier_value(), 
-      _this->GetArenaForAllocation());
-  }
-  _impl_.string_value_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.string_value_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (from._internal_has_string_value()) {
-    _this->_impl_.string_value_.Set(from._internal_string_value(), 
-      _this->GetArenaForAllocation());
-  }
-  _impl_.aggregate_value_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.aggregate_value_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (from._internal_has_aggregate_value()) {
-    _this->_impl_.aggregate_value_.Set(from._internal_aggregate_value(), 
-      _this->GetArenaForAllocation());
-  }
-  ::memcpy(&_impl_.positive_int_value_, &from._impl_.positive_int_value_,
-    static_cast<size_t>(reinterpret_cast<char*>(&_impl_.double_value_) -
-    reinterpret_cast<char*>(&_impl_.positive_int_value_)) + sizeof(_impl_.double_value_));
-  // @@protoc_insertion_point(copy_constructor:google.protobuf.UninterpretedOption)
-}
-
-inline void UninterpretedOption::SharedCtor(
-    ::_pb::Arena* arena, bool is_message_owned) {
-  (void)arena;
-  (void)is_message_owned;
-  new (&_impl_) Impl_{
-      decltype(_impl_._has_bits_){}
-    , /*decltype(_impl_._cached_size_)*/{}
-    , decltype(_impl_.name_){arena}
-    , decltype(_impl_.identifier_value_){}
-    , decltype(_impl_.string_value_){}
-    , decltype(_impl_.aggregate_value_){}
-    , decltype(_impl_.positive_int_value_){uint64_t{0u}}
-    , decltype(_impl_.negative_int_value_){int64_t{0}}
-    , decltype(_impl_.double_value_){0}
-  };
-  _impl_.identifier_value_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.identifier_value_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  _impl_.string_value_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.string_value_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  _impl_.aggregate_value_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.aggregate_value_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-}
-
-UninterpretedOption::~UninterpretedOption() {
-  // @@protoc_insertion_point(destructor:google.protobuf.UninterpretedOption)
-  if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) {
-  (void)arena;
-    return;
-  }
-  SharedDtor();
-}
-
-inline void UninterpretedOption::SharedDtor() {
-  GOOGLE_DCHECK(GetArenaForAllocation() == nullptr);
-  _impl_.name_.~RepeatedPtrField();
-  _impl_.identifier_value_.Destroy();
-  _impl_.string_value_.Destroy();
-  _impl_.aggregate_value_.Destroy();
-}
-
-void UninterpretedOption::SetCachedSize(int size) const {
-  _impl_._cached_size_.Set(size);
-}
-
-void UninterpretedOption::Clear() {
-// @@protoc_insertion_point(message_clear_start:google.protobuf.UninterpretedOption)
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.name_.Clear();
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000007u) {
-    if (cached_has_bits & 0x00000001u) {
-      _impl_.identifier_value_.ClearNonDefaultToEmpty();
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _impl_.string_value_.ClearNonDefaultToEmpty();
-    }
-    if (cached_has_bits & 0x00000004u) {
-      _impl_.aggregate_value_.ClearNonDefaultToEmpty();
-    }
-  }
-  if (cached_has_bits & 0x00000038u) {
-    ::memset(&_impl_.positive_int_value_, 0, static_cast<size_t>(
-        reinterpret_cast<char*>(&_impl_.double_value_) -
-        reinterpret_cast<char*>(&_impl_.positive_int_value_)) + sizeof(_impl_.double_value_));
-  }
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>();
-}
-
-const char* UninterpretedOption::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) {
-#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure
-  _Internal::HasBits has_bits{};
-  while (!ctx->Done(&ptr)) {
-    uint32_t tag;
-    ptr = ::_pbi::ReadTag(ptr, &tag);
-    switch (tag >> 3) {
-      // repeated .google.protobuf.UninterpretedOption.NamePart name = 2;
-      case 2:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 18)) {
-          ptr -= 1;
-          do {
-            ptr += 1;
-            ptr = ctx->ParseMessage(_internal_add_name(), ptr);
-            CHK_(ptr);
-            if (!ctx->DataAvailable(ptr)) break;
-          } while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<18>(ptr));
-        } else
-          goto handle_unusual;
-        continue;
-      // optional string identifier_value = 3;
-      case 3:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 26)) {
-          auto str = _internal_mutable_identifier_value();
-          ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx);
-          CHK_(ptr);
-          #ifndef NDEBUG
-          ::_pbi::VerifyUTF8(str, "google.protobuf.UninterpretedOption.identifier_value");
-          #endif  // !NDEBUG
-        } else
-          goto handle_unusual;
-        continue;
-      // optional uint64 positive_int_value = 4;
-      case 4:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 32)) {
-          _Internal::set_has_positive_int_value(&has_bits);
-          _impl_.positive_int_value_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr);
-          CHK_(ptr);
-        } else
-          goto handle_unusual;
-        continue;
-      // optional int64 negative_int_value = 5;
-      case 5:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 40)) {
-          _Internal::set_has_negative_int_value(&has_bits);
-          _impl_.negative_int_value_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr);
-          CHK_(ptr);
-        } else
-          goto handle_unusual;
-        continue;
-      // optional double double_value = 6;
-      case 6:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 49)) {
-          _Internal::set_has_double_value(&has_bits);
-          _impl_.double_value_ = ::PROTOBUF_NAMESPACE_ID::internal::UnalignedLoad<double>(ptr);
-          ptr += sizeof(double);
-        } else
-          goto handle_unusual;
-        continue;
-      // optional bytes string_value = 7;
-      case 7:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 58)) {
-          auto str = _internal_mutable_string_value();
-          ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx);
-          CHK_(ptr);
-        } else
-          goto handle_unusual;
-        continue;
-      // optional string aggregate_value = 8;
-      case 8:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 66)) {
-          auto str = _internal_mutable_aggregate_value();
-          ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx);
-          CHK_(ptr);
-          #ifndef NDEBUG
-          ::_pbi::VerifyUTF8(str, "google.protobuf.UninterpretedOption.aggregate_value");
-          #endif  // !NDEBUG
-        } else
-          goto handle_unusual;
-        continue;
-      default:
-        goto handle_unusual;
-    }  // switch
-  handle_unusual:
-    if ((tag == 0) || ((tag & 7) == 4)) {
-      CHK_(ptr);
-      ctx->SetLastTag(tag);
-      goto message_done;
-    }
-    ptr = UnknownFieldParse(
-        tag,
-        _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(),
-        ptr, ctx);
-    CHK_(ptr != nullptr);
-  }  // while
-message_done:
-  _impl_._has_bits_.Or(has_bits);
-  return ptr;
-failure:
-  ptr = nullptr;
-  goto message_done;
-#undef CHK_
-}
-
-uint8_t* UninterpretedOption::_InternalSerialize(
-    uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.UninterpretedOption)
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  // repeated .google.protobuf.UninterpretedOption.NamePart name = 2;
-  for (unsigned i = 0,
-      n = static_cast<unsigned>(this->_internal_name_size()); i < n; i++) {
-    const auto& repfield = this->_internal_name(i);
-    target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
-        InternalWriteMessage(2, repfield, repfield.GetCachedSize(), target, stream);
-  }
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // optional string identifier_value = 3;
-  if (cached_has_bits & 0x00000001u) {
-    ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::VerifyUTF8StringNamedField(
-      this->_internal_identifier_value().data(), static_cast<int>(this->_internal_identifier_value().length()),
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::SERIALIZE,
-      "google.protobuf.UninterpretedOption.identifier_value");
-    target = stream->WriteStringMaybeAliased(
-        3, this->_internal_identifier_value(), target);
-  }
-
-  // optional uint64 positive_int_value = 4;
-  if (cached_has_bits & 0x00000008u) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteUInt64ToArray(4, this->_internal_positive_int_value(), target);
-  }
-
-  // optional int64 negative_int_value = 5;
-  if (cached_has_bits & 0x00000010u) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteInt64ToArray(5, this->_internal_negative_int_value(), target);
-  }
-
-  // optional double double_value = 6;
-  if (cached_has_bits & 0x00000020u) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteDoubleToArray(6, this->_internal_double_value(), target);
-  }
-
-  // optional bytes string_value = 7;
-  if (cached_has_bits & 0x00000002u) {
-    target = stream->WriteBytesMaybeAliased(
-        7, this->_internal_string_value(), target);
-  }
-
-  // optional string aggregate_value = 8;
-  if (cached_has_bits & 0x00000004u) {
-    ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::VerifyUTF8StringNamedField(
-      this->_internal_aggregate_value().data(), static_cast<int>(this->_internal_aggregate_value().length()),
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::SERIALIZE,
-      "google.protobuf.UninterpretedOption.aggregate_value");
-    target = stream->WriteStringMaybeAliased(
-        8, this->_internal_aggregate_value(), target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-        _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.UninterpretedOption)
-  return target;
-}
-
-size_t UninterpretedOption::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:google.protobuf.UninterpretedOption)
-  size_t total_size = 0;
-
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // repeated .google.protobuf.UninterpretedOption.NamePart name = 2;
-  total_size += 1UL * this->_internal_name_size();
-  for (const auto& msg : this->_impl_.name_) {
-    total_size +=
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(msg);
-  }
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x0000003fu) {
-    // optional string identifier_value = 3;
-    if (cached_has_bits & 0x00000001u) {
-      total_size += 1 +
-        ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize(
-          this->_internal_identifier_value());
-    }
-
-    // optional bytes string_value = 7;
-    if (cached_has_bits & 0x00000002u) {
-      total_size += 1 +
-        ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::BytesSize(
-          this->_internal_string_value());
-    }
-
-    // optional string aggregate_value = 8;
-    if (cached_has_bits & 0x00000004u) {
-      total_size += 1 +
-        ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize(
-          this->_internal_aggregate_value());
-    }
-
-    // optional uint64 positive_int_value = 4;
-    if (cached_has_bits & 0x00000008u) {
-      total_size += ::_pbi::WireFormatLite::UInt64SizePlusOne(this->_internal_positive_int_value());
-    }
-
-    // optional int64 negative_int_value = 5;
-    if (cached_has_bits & 0x00000010u) {
-      total_size += ::_pbi::WireFormatLite::Int64SizePlusOne(this->_internal_negative_int_value());
-    }
-
-    // optional double double_value = 6;
-    if (cached_has_bits & 0x00000020u) {
-      total_size += 1 + 8;
-    }
-
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData UninterpretedOption::_class_data_ = {
-    ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck,
-    UninterpretedOption::MergeImpl
-};
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*UninterpretedOption::GetClassData() const { return &_class_data_; }
-
-
-void UninterpretedOption::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) {
-  auto* const _this = static_cast<UninterpretedOption*>(&to_msg);
-  auto& from = static_cast<const UninterpretedOption&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.UninterpretedOption)
-  GOOGLE_DCHECK_NE(&from, _this);
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  _this->_impl_.name_.MergeFrom(from._impl_.name_);
-  cached_has_bits = from._impl_._has_bits_[0];
-  if (cached_has_bits & 0x0000003fu) {
-    if (cached_has_bits & 0x00000001u) {
-      _this->_internal_set_identifier_value(from._internal_identifier_value());
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _this->_internal_set_string_value(from._internal_string_value());
-    }
-    if (cached_has_bits & 0x00000004u) {
-      _this->_internal_set_aggregate_value(from._internal_aggregate_value());
-    }
-    if (cached_has_bits & 0x00000008u) {
-      _this->_impl_.positive_int_value_ = from._impl_.positive_int_value_;
-    }
-    if (cached_has_bits & 0x00000010u) {
-      _this->_impl_.negative_int_value_ = from._impl_.negative_int_value_;
-    }
-    if (cached_has_bits & 0x00000020u) {
-      _this->_impl_.double_value_ = from._impl_.double_value_;
-    }
-    _this->_impl_._has_bits_[0] |= cached_has_bits;
-  }
-  _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void UninterpretedOption::CopyFrom(const UninterpretedOption& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.UninterpretedOption)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool UninterpretedOption::IsInitialized() const {
-  if (!::PROTOBUF_NAMESPACE_ID::internal::AllAreInitialized(_impl_.name_))
-    return false;
-  return true;
-}
-
-void UninterpretedOption::InternalSwap(UninterpretedOption* other) {
-  using std::swap;
-  auto* lhs_arena = GetArenaForAllocation();
-  auto* rhs_arena = other->GetArenaForAllocation();
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  _impl_.name_.InternalSwap(&other->_impl_.name_);
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::InternalSwap(
-      &_impl_.identifier_value_, lhs_arena,
-      &other->_impl_.identifier_value_, rhs_arena
-  );
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::InternalSwap(
-      &_impl_.string_value_, lhs_arena,
-      &other->_impl_.string_value_, rhs_arena
-  );
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::InternalSwap(
-      &_impl_.aggregate_value_, lhs_arena,
-      &other->_impl_.aggregate_value_, rhs_arena
-  );
-  ::PROTOBUF_NAMESPACE_ID::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(UninterpretedOption, _impl_.double_value_)
-      + sizeof(UninterpretedOption::_impl_.double_value_)
-      - PROTOBUF_FIELD_OFFSET(UninterpretedOption, _impl_.positive_int_value_)>(
-          reinterpret_cast<char*>(&_impl_.positive_int_value_),
-          reinterpret_cast<char*>(&other->_impl_.positive_int_value_));
-}
-
-::PROTOBUF_NAMESPACE_ID::Metadata UninterpretedOption::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_google_2fprotobuf_2fdescriptor_2eproto_getter, &descriptor_table_google_2fprotobuf_2fdescriptor_2eproto_once,
-      file_level_metadata_google_2fprotobuf_2fdescriptor_2eproto[22]);
-}
-
-// ===================================================================
-
-class SourceCodeInfo_Location::_Internal {
- public:
-  using HasBits = decltype(std::declval<SourceCodeInfo_Location>()._impl_._has_bits_);
-  static void set_has_leading_comments(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-  static void set_has_trailing_comments(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
-};
-
-SourceCodeInfo_Location::SourceCodeInfo_Location(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                         bool is_message_owned)
-  : ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned) {
-  SharedCtor(arena, is_message_owned);
-  // @@protoc_insertion_point(arena_constructor:google.protobuf.SourceCodeInfo.Location)
-}
-SourceCodeInfo_Location::SourceCodeInfo_Location(const SourceCodeInfo_Location& from)
-  : ::PROTOBUF_NAMESPACE_ID::Message() {
-  SourceCodeInfo_Location* const _this = this; (void)_this;
-  new (&_impl_) Impl_{
-      decltype(_impl_._has_bits_){from._impl_._has_bits_}
-    , /*decltype(_impl_._cached_size_)*/{}
-    , decltype(_impl_.path_){from._impl_.path_}
-    , /*decltype(_impl_._path_cached_byte_size_)*/{0}
-    , decltype(_impl_.span_){from._impl_.span_}
-    , /*decltype(_impl_._span_cached_byte_size_)*/{0}
-    , decltype(_impl_.leading_detached_comments_){from._impl_.leading_detached_comments_}
-    , decltype(_impl_.leading_comments_){}
-    , decltype(_impl_.trailing_comments_){}};
-
-  _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-  _impl_.leading_comments_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.leading_comments_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (from._internal_has_leading_comments()) {
-    _this->_impl_.leading_comments_.Set(from._internal_leading_comments(), 
-      _this->GetArenaForAllocation());
-  }
-  _impl_.trailing_comments_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.trailing_comments_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (from._internal_has_trailing_comments()) {
-    _this->_impl_.trailing_comments_.Set(from._internal_trailing_comments(), 
-      _this->GetArenaForAllocation());
-  }
-  // @@protoc_insertion_point(copy_constructor:google.protobuf.SourceCodeInfo.Location)
-}
-
-inline void SourceCodeInfo_Location::SharedCtor(
-    ::_pb::Arena* arena, bool is_message_owned) {
-  (void)arena;
-  (void)is_message_owned;
-  new (&_impl_) Impl_{
-      decltype(_impl_._has_bits_){}
-    , /*decltype(_impl_._cached_size_)*/{}
-    , decltype(_impl_.path_){arena}
-    , /*decltype(_impl_._path_cached_byte_size_)*/{0}
-    , decltype(_impl_.span_){arena}
-    , /*decltype(_impl_._span_cached_byte_size_)*/{0}
-    , decltype(_impl_.leading_detached_comments_){arena}
-    , decltype(_impl_.leading_comments_){}
-    , decltype(_impl_.trailing_comments_){}
-  };
-  _impl_.leading_comments_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.leading_comments_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  _impl_.trailing_comments_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.trailing_comments_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-}
-
-SourceCodeInfo_Location::~SourceCodeInfo_Location() {
-  // @@protoc_insertion_point(destructor:google.protobuf.SourceCodeInfo.Location)
-  if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) {
-  (void)arena;
-    return;
-  }
-  SharedDtor();
-}
-
-inline void SourceCodeInfo_Location::SharedDtor() {
-  GOOGLE_DCHECK(GetArenaForAllocation() == nullptr);
-  _impl_.path_.~RepeatedField();
-  _impl_.span_.~RepeatedField();
-  _impl_.leading_detached_comments_.~RepeatedPtrField();
-  _impl_.leading_comments_.Destroy();
-  _impl_.trailing_comments_.Destroy();
-}
-
-void SourceCodeInfo_Location::SetCachedSize(int size) const {
-  _impl_._cached_size_.Set(size);
-}
-
-void SourceCodeInfo_Location::Clear() {
-// @@protoc_insertion_point(message_clear_start:google.protobuf.SourceCodeInfo.Location)
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.path_.Clear();
-  _impl_.span_.Clear();
-  _impl_.leading_detached_comments_.Clear();
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      _impl_.leading_comments_.ClearNonDefaultToEmpty();
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _impl_.trailing_comments_.ClearNonDefaultToEmpty();
-    }
-  }
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>();
-}
-
-const char* SourceCodeInfo_Location::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) {
-#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure
-  _Internal::HasBits has_bits{};
-  while (!ctx->Done(&ptr)) {
-    uint32_t tag;
-    ptr = ::_pbi::ReadTag(ptr, &tag);
-    switch (tag >> 3) {
-      // repeated int32 path = 1 [packed = true];
-      case 1:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 10)) {
-          ptr = ::PROTOBUF_NAMESPACE_ID::internal::PackedInt32Parser(_internal_mutable_path(), ptr, ctx);
-          CHK_(ptr);
-        } else if (static_cast<uint8_t>(tag) == 8) {
-          _internal_add_path(::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr));
-          CHK_(ptr);
-        } else
-          goto handle_unusual;
-        continue;
-      // repeated int32 span = 2 [packed = true];
-      case 2:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 18)) {
-          ptr = ::PROTOBUF_NAMESPACE_ID::internal::PackedInt32Parser(_internal_mutable_span(), ptr, ctx);
-          CHK_(ptr);
-        } else if (static_cast<uint8_t>(tag) == 16) {
-          _internal_add_span(::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr));
-          CHK_(ptr);
-        } else
-          goto handle_unusual;
-        continue;
-      // optional string leading_comments = 3;
-      case 3:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 26)) {
-          auto str = _internal_mutable_leading_comments();
-          ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx);
-          CHK_(ptr);
-          #ifndef NDEBUG
-          ::_pbi::VerifyUTF8(str, "google.protobuf.SourceCodeInfo.Location.leading_comments");
-          #endif  // !NDEBUG
-        } else
-          goto handle_unusual;
-        continue;
-      // optional string trailing_comments = 4;
-      case 4:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 34)) {
-          auto str = _internal_mutable_trailing_comments();
-          ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx);
-          CHK_(ptr);
-          #ifndef NDEBUG
-          ::_pbi::VerifyUTF8(str, "google.protobuf.SourceCodeInfo.Location.trailing_comments");
-          #endif  // !NDEBUG
-        } else
-          goto handle_unusual;
-        continue;
-      // repeated string leading_detached_comments = 6;
-      case 6:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 50)) {
-          ptr -= 1;
-          do {
-            ptr += 1;
-            auto str = _internal_add_leading_detached_comments();
-            ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx);
-            CHK_(ptr);
-            #ifndef NDEBUG
-            ::_pbi::VerifyUTF8(str, "google.protobuf.SourceCodeInfo.Location.leading_detached_comments");
-            #endif  // !NDEBUG
-            if (!ctx->DataAvailable(ptr)) break;
-          } while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<50>(ptr));
-        } else
-          goto handle_unusual;
-        continue;
-      default:
-        goto handle_unusual;
-    }  // switch
-  handle_unusual:
-    if ((tag == 0) || ((tag & 7) == 4)) {
-      CHK_(ptr);
-      ctx->SetLastTag(tag);
-      goto message_done;
-    }
-    ptr = UnknownFieldParse(
-        tag,
-        _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(),
-        ptr, ctx);
-    CHK_(ptr != nullptr);
-  }  // while
-message_done:
-  _impl_._has_bits_.Or(has_bits);
-  return ptr;
-failure:
-  ptr = nullptr;
-  goto message_done;
-#undef CHK_
-}
-
-uint8_t* SourceCodeInfo_Location::_InternalSerialize(
-    uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.SourceCodeInfo.Location)
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  // repeated int32 path = 1 [packed = true];
-  {
-    int byte_size = _impl_._path_cached_byte_size_.load(std::memory_order_relaxed);
-    if (byte_size > 0) {
-      target = stream->WriteInt32Packed(
-          1, _internal_path(), byte_size, target);
-    }
-  }
-
-  // repeated int32 span = 2 [packed = true];
-  {
-    int byte_size = _impl_._span_cached_byte_size_.load(std::memory_order_relaxed);
-    if (byte_size > 0) {
-      target = stream->WriteInt32Packed(
-          2, _internal_span(), byte_size, target);
-    }
-  }
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // optional string leading_comments = 3;
-  if (cached_has_bits & 0x00000001u) {
-    ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::VerifyUTF8StringNamedField(
-      this->_internal_leading_comments().data(), static_cast<int>(this->_internal_leading_comments().length()),
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::SERIALIZE,
-      "google.protobuf.SourceCodeInfo.Location.leading_comments");
-    target = stream->WriteStringMaybeAliased(
-        3, this->_internal_leading_comments(), target);
-  }
-
-  // optional string trailing_comments = 4;
-  if (cached_has_bits & 0x00000002u) {
-    ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::VerifyUTF8StringNamedField(
-      this->_internal_trailing_comments().data(), static_cast<int>(this->_internal_trailing_comments().length()),
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::SERIALIZE,
-      "google.protobuf.SourceCodeInfo.Location.trailing_comments");
-    target = stream->WriteStringMaybeAliased(
-        4, this->_internal_trailing_comments(), target);
-  }
-
-  // repeated string leading_detached_comments = 6;
-  for (int i = 0, n = this->_internal_leading_detached_comments_size(); i < n; i++) {
-    const auto& s = this->_internal_leading_detached_comments(i);
-    ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::VerifyUTF8StringNamedField(
-      s.data(), static_cast<int>(s.length()),
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::SERIALIZE,
-      "google.protobuf.SourceCodeInfo.Location.leading_detached_comments");
-    target = stream->WriteString(6, s, target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-        _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.SourceCodeInfo.Location)
-  return target;
-}
-
-size_t SourceCodeInfo_Location::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:google.protobuf.SourceCodeInfo.Location)
-  size_t total_size = 0;
-
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // repeated int32 path = 1 [packed = true];
-  {
-    size_t data_size = ::_pbi::WireFormatLite::
-      Int32Size(this->_impl_.path_);
-    if (data_size > 0) {
-      total_size += 1 +
-        ::_pbi::WireFormatLite::Int32Size(static_cast<int32_t>(data_size));
-    }
-    int cached_size = ::_pbi::ToCachedSize(data_size);
-    _impl_._path_cached_byte_size_.store(cached_size,
-                                    std::memory_order_relaxed);
-    total_size += data_size;
-  }
-
-  // repeated int32 span = 2 [packed = true];
-  {
-    size_t data_size = ::_pbi::WireFormatLite::
-      Int32Size(this->_impl_.span_);
-    if (data_size > 0) {
-      total_size += 1 +
-        ::_pbi::WireFormatLite::Int32Size(static_cast<int32_t>(data_size));
-    }
-    int cached_size = ::_pbi::ToCachedSize(data_size);
-    _impl_._span_cached_byte_size_.store(cached_size,
-                                    std::memory_order_relaxed);
-    total_size += data_size;
-  }
-
-  // repeated string leading_detached_comments = 6;
-  total_size += 1 *
-      ::PROTOBUF_NAMESPACE_ID::internal::FromIntSize(_impl_.leading_detached_comments_.size());
-  for (int i = 0, n = _impl_.leading_detached_comments_.size(); i < n; i++) {
-    total_size += ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize(
-      _impl_.leading_detached_comments_.Get(i));
-  }
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    // optional string leading_comments = 3;
-    if (cached_has_bits & 0x00000001u) {
-      total_size += 1 +
-        ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize(
-          this->_internal_leading_comments());
-    }
-
-    // optional string trailing_comments = 4;
-    if (cached_has_bits & 0x00000002u) {
-      total_size += 1 +
-        ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize(
-          this->_internal_trailing_comments());
-    }
-
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData SourceCodeInfo_Location::_class_data_ = {
-    ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck,
-    SourceCodeInfo_Location::MergeImpl
-};
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*SourceCodeInfo_Location::GetClassData() const { return &_class_data_; }
-
-
-void SourceCodeInfo_Location::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) {
-  auto* const _this = static_cast<SourceCodeInfo_Location*>(&to_msg);
-  auto& from = static_cast<const SourceCodeInfo_Location&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.SourceCodeInfo.Location)
-  GOOGLE_DCHECK_NE(&from, _this);
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  _this->_impl_.path_.MergeFrom(from._impl_.path_);
-  _this->_impl_.span_.MergeFrom(from._impl_.span_);
-  _this->_impl_.leading_detached_comments_.MergeFrom(from._impl_.leading_detached_comments_);
-  cached_has_bits = from._impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      _this->_internal_set_leading_comments(from._internal_leading_comments());
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _this->_internal_set_trailing_comments(from._internal_trailing_comments());
-    }
-  }
-  _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void SourceCodeInfo_Location::CopyFrom(const SourceCodeInfo_Location& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.SourceCodeInfo.Location)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool SourceCodeInfo_Location::IsInitialized() const {
-  return true;
-}
-
-void SourceCodeInfo_Location::InternalSwap(SourceCodeInfo_Location* other) {
-  using std::swap;
-  auto* lhs_arena = GetArenaForAllocation();
-  auto* rhs_arena = other->GetArenaForAllocation();
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  _impl_.path_.InternalSwap(&other->_impl_.path_);
-  _impl_.span_.InternalSwap(&other->_impl_.span_);
-  _impl_.leading_detached_comments_.InternalSwap(&other->_impl_.leading_detached_comments_);
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::InternalSwap(
-      &_impl_.leading_comments_, lhs_arena,
-      &other->_impl_.leading_comments_, rhs_arena
-  );
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::InternalSwap(
-      &_impl_.trailing_comments_, lhs_arena,
-      &other->_impl_.trailing_comments_, rhs_arena
-  );
-}
-
-::PROTOBUF_NAMESPACE_ID::Metadata SourceCodeInfo_Location::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_google_2fprotobuf_2fdescriptor_2eproto_getter, &descriptor_table_google_2fprotobuf_2fdescriptor_2eproto_once,
-      file_level_metadata_google_2fprotobuf_2fdescriptor_2eproto[23]);
-}
-
-// ===================================================================
-
-class SourceCodeInfo::_Internal {
- public:
-};
-
-SourceCodeInfo::SourceCodeInfo(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                         bool is_message_owned)
-  : ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned) {
-  SharedCtor(arena, is_message_owned);
-  // @@protoc_insertion_point(arena_constructor:google.protobuf.SourceCodeInfo)
-}
-SourceCodeInfo::SourceCodeInfo(const SourceCodeInfo& from)
-  : ::PROTOBUF_NAMESPACE_ID::Message() {
-  SourceCodeInfo* const _this = this; (void)_this;
-  new (&_impl_) Impl_{
-      decltype(_impl_.location_){from._impl_.location_}
-    , /*decltype(_impl_._cached_size_)*/{}};
-
-  _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-  // @@protoc_insertion_point(copy_constructor:google.protobuf.SourceCodeInfo)
-}
-
-inline void SourceCodeInfo::SharedCtor(
-    ::_pb::Arena* arena, bool is_message_owned) {
-  (void)arena;
-  (void)is_message_owned;
-  new (&_impl_) Impl_{
-      decltype(_impl_.location_){arena}
-    , /*decltype(_impl_._cached_size_)*/{}
-  };
-}
-
-SourceCodeInfo::~SourceCodeInfo() {
-  // @@protoc_insertion_point(destructor:google.protobuf.SourceCodeInfo)
-  if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) {
-  (void)arena;
-    return;
-  }
-  SharedDtor();
-}
-
-inline void SourceCodeInfo::SharedDtor() {
-  GOOGLE_DCHECK(GetArenaForAllocation() == nullptr);
-  _impl_.location_.~RepeatedPtrField();
-}
-
-void SourceCodeInfo::SetCachedSize(int size) const {
-  _impl_._cached_size_.Set(size);
-}
-
-void SourceCodeInfo::Clear() {
-// @@protoc_insertion_point(message_clear_start:google.protobuf.SourceCodeInfo)
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.location_.Clear();
-  _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>();
-}
-
-const char* SourceCodeInfo::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) {
-#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure
-  while (!ctx->Done(&ptr)) {
-    uint32_t tag;
-    ptr = ::_pbi::ReadTag(ptr, &tag);
-    switch (tag >> 3) {
-      // repeated .google.protobuf.SourceCodeInfo.Location location = 1;
-      case 1:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 10)) {
-          ptr -= 1;
-          do {
-            ptr += 1;
-            ptr = ctx->ParseMessage(_internal_add_location(), ptr);
-            CHK_(ptr);
-            if (!ctx->DataAvailable(ptr)) break;
-          } while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<10>(ptr));
-        } else
-          goto handle_unusual;
-        continue;
-      default:
-        goto handle_unusual;
-    }  // switch
-  handle_unusual:
-    if ((tag == 0) || ((tag & 7) == 4)) {
-      CHK_(ptr);
-      ctx->SetLastTag(tag);
-      goto message_done;
-    }
-    ptr = UnknownFieldParse(
-        tag,
-        _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(),
-        ptr, ctx);
-    CHK_(ptr != nullptr);
-  }  // while
-message_done:
-  return ptr;
-failure:
-  ptr = nullptr;
-  goto message_done;
-#undef CHK_
-}
-
-uint8_t* SourceCodeInfo::_InternalSerialize(
-    uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.SourceCodeInfo)
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  // repeated .google.protobuf.SourceCodeInfo.Location location = 1;
-  for (unsigned i = 0,
-      n = static_cast<unsigned>(this->_internal_location_size()); i < n; i++) {
-    const auto& repfield = this->_internal_location(i);
-    target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
-        InternalWriteMessage(1, repfield, repfield.GetCachedSize(), target, stream);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-        _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.SourceCodeInfo)
-  return target;
-}
-
-size_t SourceCodeInfo::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:google.protobuf.SourceCodeInfo)
-  size_t total_size = 0;
-
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // repeated .google.protobuf.SourceCodeInfo.Location location = 1;
-  total_size += 1UL * this->_internal_location_size();
-  for (const auto& msg : this->_impl_.location_) {
-    total_size +=
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(msg);
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData SourceCodeInfo::_class_data_ = {
-    ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck,
-    SourceCodeInfo::MergeImpl
-};
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*SourceCodeInfo::GetClassData() const { return &_class_data_; }
-
-
-void SourceCodeInfo::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) {
-  auto* const _this = static_cast<SourceCodeInfo*>(&to_msg);
-  auto& from = static_cast<const SourceCodeInfo&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.SourceCodeInfo)
-  GOOGLE_DCHECK_NE(&from, _this);
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  _this->_impl_.location_.MergeFrom(from._impl_.location_);
-  _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void SourceCodeInfo::CopyFrom(const SourceCodeInfo& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.SourceCodeInfo)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool SourceCodeInfo::IsInitialized() const {
-  return true;
-}
-
-void SourceCodeInfo::InternalSwap(SourceCodeInfo* other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  _impl_.location_.InternalSwap(&other->_impl_.location_);
-}
-
-::PROTOBUF_NAMESPACE_ID::Metadata SourceCodeInfo::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_google_2fprotobuf_2fdescriptor_2eproto_getter, &descriptor_table_google_2fprotobuf_2fdescriptor_2eproto_once,
-      file_level_metadata_google_2fprotobuf_2fdescriptor_2eproto[24]);
-}
-
-// ===================================================================
-
-class GeneratedCodeInfo_Annotation::_Internal {
- public:
-  using HasBits = decltype(std::declval<GeneratedCodeInfo_Annotation>()._impl_._has_bits_);
-  static void set_has_source_file(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-  static void set_has_begin(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
-  static void set_has_end(HasBits* has_bits) {
-    (*has_bits)[0] |= 4u;
-  }
-};
-
-GeneratedCodeInfo_Annotation::GeneratedCodeInfo_Annotation(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                         bool is_message_owned)
-  : ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned) {
-  SharedCtor(arena, is_message_owned);
-  // @@protoc_insertion_point(arena_constructor:google.protobuf.GeneratedCodeInfo.Annotation)
-}
-GeneratedCodeInfo_Annotation::GeneratedCodeInfo_Annotation(const GeneratedCodeInfo_Annotation& from)
-  : ::PROTOBUF_NAMESPACE_ID::Message() {
-  GeneratedCodeInfo_Annotation* const _this = this; (void)_this;
-  new (&_impl_) Impl_{
-      decltype(_impl_._has_bits_){from._impl_._has_bits_}
-    , /*decltype(_impl_._cached_size_)*/{}
-    , decltype(_impl_.path_){from._impl_.path_}
-    , /*decltype(_impl_._path_cached_byte_size_)*/{0}
-    , decltype(_impl_.source_file_){}
-    , decltype(_impl_.begin_){}
-    , decltype(_impl_.end_){}};
-
-  _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-  _impl_.source_file_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.source_file_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (from._internal_has_source_file()) {
-    _this->_impl_.source_file_.Set(from._internal_source_file(), 
-      _this->GetArenaForAllocation());
-  }
-  ::memcpy(&_impl_.begin_, &from._impl_.begin_,
-    static_cast<size_t>(reinterpret_cast<char*>(&_impl_.end_) -
-    reinterpret_cast<char*>(&_impl_.begin_)) + sizeof(_impl_.end_));
-  // @@protoc_insertion_point(copy_constructor:google.protobuf.GeneratedCodeInfo.Annotation)
-}
-
-inline void GeneratedCodeInfo_Annotation::SharedCtor(
-    ::_pb::Arena* arena, bool is_message_owned) {
-  (void)arena;
-  (void)is_message_owned;
-  new (&_impl_) Impl_{
-      decltype(_impl_._has_bits_){}
-    , /*decltype(_impl_._cached_size_)*/{}
-    , decltype(_impl_.path_){arena}
-    , /*decltype(_impl_._path_cached_byte_size_)*/{0}
-    , decltype(_impl_.source_file_){}
-    , decltype(_impl_.begin_){0}
-    , decltype(_impl_.end_){0}
-  };
-  _impl_.source_file_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.source_file_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-}
-
-GeneratedCodeInfo_Annotation::~GeneratedCodeInfo_Annotation() {
-  // @@protoc_insertion_point(destructor:google.protobuf.GeneratedCodeInfo.Annotation)
-  if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) {
-  (void)arena;
-    return;
-  }
-  SharedDtor();
-}
-
-inline void GeneratedCodeInfo_Annotation::SharedDtor() {
-  GOOGLE_DCHECK(GetArenaForAllocation() == nullptr);
-  _impl_.path_.~RepeatedField();
-  _impl_.source_file_.Destroy();
-}
-
-void GeneratedCodeInfo_Annotation::SetCachedSize(int size) const {
-  _impl_._cached_size_.Set(size);
-}
-
-void GeneratedCodeInfo_Annotation::Clear() {
-// @@protoc_insertion_point(message_clear_start:google.protobuf.GeneratedCodeInfo.Annotation)
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.path_.Clear();
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000001u) {
-    _impl_.source_file_.ClearNonDefaultToEmpty();
-  }
-  if (cached_has_bits & 0x00000006u) {
-    ::memset(&_impl_.begin_, 0, static_cast<size_t>(
-        reinterpret_cast<char*>(&_impl_.end_) -
-        reinterpret_cast<char*>(&_impl_.begin_)) + sizeof(_impl_.end_));
-  }
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>();
-}
-
-const char* GeneratedCodeInfo_Annotation::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) {
-#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure
-  _Internal::HasBits has_bits{};
-  while (!ctx->Done(&ptr)) {
-    uint32_t tag;
-    ptr = ::_pbi::ReadTag(ptr, &tag);
-    switch (tag >> 3) {
-      // repeated int32 path = 1 [packed = true];
-      case 1:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 10)) {
-          ptr = ::PROTOBUF_NAMESPACE_ID::internal::PackedInt32Parser(_internal_mutable_path(), ptr, ctx);
-          CHK_(ptr);
-        } else if (static_cast<uint8_t>(tag) == 8) {
-          _internal_add_path(::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr));
-          CHK_(ptr);
-        } else
-          goto handle_unusual;
-        continue;
-      // optional string source_file = 2;
-      case 2:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 18)) {
-          auto str = _internal_mutable_source_file();
-          ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx);
-          CHK_(ptr);
-          #ifndef NDEBUG
-          ::_pbi::VerifyUTF8(str, "google.protobuf.GeneratedCodeInfo.Annotation.source_file");
-          #endif  // !NDEBUG
-        } else
-          goto handle_unusual;
-        continue;
-      // optional int32 begin = 3;
-      case 3:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 24)) {
-          _Internal::set_has_begin(&has_bits);
-          _impl_.begin_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr);
-          CHK_(ptr);
-        } else
-          goto handle_unusual;
-        continue;
-      // optional int32 end = 4;
-      case 4:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 32)) {
-          _Internal::set_has_end(&has_bits);
-          _impl_.end_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr);
-          CHK_(ptr);
-        } else
-          goto handle_unusual;
-        continue;
-      default:
-        goto handle_unusual;
-    }  // switch
-  handle_unusual:
-    if ((tag == 0) || ((tag & 7) == 4)) {
-      CHK_(ptr);
-      ctx->SetLastTag(tag);
-      goto message_done;
-    }
-    ptr = UnknownFieldParse(
-        tag,
-        _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(),
-        ptr, ctx);
-    CHK_(ptr != nullptr);
-  }  // while
-message_done:
-  _impl_._has_bits_.Or(has_bits);
-  return ptr;
-failure:
-  ptr = nullptr;
-  goto message_done;
-#undef CHK_
-}
-
-uint8_t* GeneratedCodeInfo_Annotation::_InternalSerialize(
-    uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.GeneratedCodeInfo.Annotation)
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  // repeated int32 path = 1 [packed = true];
-  {
-    int byte_size = _impl_._path_cached_byte_size_.load(std::memory_order_relaxed);
-    if (byte_size > 0) {
-      target = stream->WriteInt32Packed(
-          1, _internal_path(), byte_size, target);
-    }
-  }
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // optional string source_file = 2;
-  if (cached_has_bits & 0x00000001u) {
-    ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::VerifyUTF8StringNamedField(
-      this->_internal_source_file().data(), static_cast<int>(this->_internal_source_file().length()),
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::SERIALIZE,
-      "google.protobuf.GeneratedCodeInfo.Annotation.source_file");
-    target = stream->WriteStringMaybeAliased(
-        2, this->_internal_source_file(), target);
-  }
-
-  // optional int32 begin = 3;
-  if (cached_has_bits & 0x00000002u) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteInt32ToArray(3, this->_internal_begin(), target);
-  }
-
-  // optional int32 end = 4;
-  if (cached_has_bits & 0x00000004u) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteInt32ToArray(4, this->_internal_end(), target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-        _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.GeneratedCodeInfo.Annotation)
-  return target;
-}
-
-size_t GeneratedCodeInfo_Annotation::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:google.protobuf.GeneratedCodeInfo.Annotation)
-  size_t total_size = 0;
-
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // repeated int32 path = 1 [packed = true];
-  {
-    size_t data_size = ::_pbi::WireFormatLite::
-      Int32Size(this->_impl_.path_);
-    if (data_size > 0) {
-      total_size += 1 +
-        ::_pbi::WireFormatLite::Int32Size(static_cast<int32_t>(data_size));
-    }
-    int cached_size = ::_pbi::ToCachedSize(data_size);
-    _impl_._path_cached_byte_size_.store(cached_size,
-                                    std::memory_order_relaxed);
-    total_size += data_size;
-  }
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000007u) {
-    // optional string source_file = 2;
-    if (cached_has_bits & 0x00000001u) {
-      total_size += 1 +
-        ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize(
-          this->_internal_source_file());
-    }
-
-    // optional int32 begin = 3;
-    if (cached_has_bits & 0x00000002u) {
-      total_size += ::_pbi::WireFormatLite::Int32SizePlusOne(this->_internal_begin());
-    }
-
-    // optional int32 end = 4;
-    if (cached_has_bits & 0x00000004u) {
-      total_size += ::_pbi::WireFormatLite::Int32SizePlusOne(this->_internal_end());
-    }
-
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData GeneratedCodeInfo_Annotation::_class_data_ = {
-    ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck,
-    GeneratedCodeInfo_Annotation::MergeImpl
-};
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*GeneratedCodeInfo_Annotation::GetClassData() const { return &_class_data_; }
-
-
-void GeneratedCodeInfo_Annotation::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) {
-  auto* const _this = static_cast<GeneratedCodeInfo_Annotation*>(&to_msg);
-  auto& from = static_cast<const GeneratedCodeInfo_Annotation&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.GeneratedCodeInfo.Annotation)
-  GOOGLE_DCHECK_NE(&from, _this);
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  _this->_impl_.path_.MergeFrom(from._impl_.path_);
-  cached_has_bits = from._impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000007u) {
-    if (cached_has_bits & 0x00000001u) {
-      _this->_internal_set_source_file(from._internal_source_file());
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _this->_impl_.begin_ = from._impl_.begin_;
-    }
-    if (cached_has_bits & 0x00000004u) {
-      _this->_impl_.end_ = from._impl_.end_;
-    }
-    _this->_impl_._has_bits_[0] |= cached_has_bits;
-  }
-  _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void GeneratedCodeInfo_Annotation::CopyFrom(const GeneratedCodeInfo_Annotation& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.GeneratedCodeInfo.Annotation)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool GeneratedCodeInfo_Annotation::IsInitialized() const {
-  return true;
-}
-
-void GeneratedCodeInfo_Annotation::InternalSwap(GeneratedCodeInfo_Annotation* other) {
-  using std::swap;
-  auto* lhs_arena = GetArenaForAllocation();
-  auto* rhs_arena = other->GetArenaForAllocation();
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  _impl_.path_.InternalSwap(&other->_impl_.path_);
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::InternalSwap(
-      &_impl_.source_file_, lhs_arena,
-      &other->_impl_.source_file_, rhs_arena
-  );
-  ::PROTOBUF_NAMESPACE_ID::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(GeneratedCodeInfo_Annotation, _impl_.end_)
-      + sizeof(GeneratedCodeInfo_Annotation::_impl_.end_)
-      - PROTOBUF_FIELD_OFFSET(GeneratedCodeInfo_Annotation, _impl_.begin_)>(
-          reinterpret_cast<char*>(&_impl_.begin_),
-          reinterpret_cast<char*>(&other->_impl_.begin_));
-}
-
-::PROTOBUF_NAMESPACE_ID::Metadata GeneratedCodeInfo_Annotation::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_google_2fprotobuf_2fdescriptor_2eproto_getter, &descriptor_table_google_2fprotobuf_2fdescriptor_2eproto_once,
-      file_level_metadata_google_2fprotobuf_2fdescriptor_2eproto[25]);
-}
-
-// ===================================================================
-
-class GeneratedCodeInfo::_Internal {
- public:
-};
-
-GeneratedCodeInfo::GeneratedCodeInfo(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                         bool is_message_owned)
-  : ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned) {
-  SharedCtor(arena, is_message_owned);
-  // @@protoc_insertion_point(arena_constructor:google.protobuf.GeneratedCodeInfo)
-}
-GeneratedCodeInfo::GeneratedCodeInfo(const GeneratedCodeInfo& from)
-  : ::PROTOBUF_NAMESPACE_ID::Message() {
-  GeneratedCodeInfo* const _this = this; (void)_this;
-  new (&_impl_) Impl_{
-      decltype(_impl_.annotation_){from._impl_.annotation_}
-    , /*decltype(_impl_._cached_size_)*/{}};
-
-  _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-  // @@protoc_insertion_point(copy_constructor:google.protobuf.GeneratedCodeInfo)
-}
-
-inline void GeneratedCodeInfo::SharedCtor(
-    ::_pb::Arena* arena, bool is_message_owned) {
-  (void)arena;
-  (void)is_message_owned;
-  new (&_impl_) Impl_{
-      decltype(_impl_.annotation_){arena}
-    , /*decltype(_impl_._cached_size_)*/{}
-  };
-}
-
-GeneratedCodeInfo::~GeneratedCodeInfo() {
-  // @@protoc_insertion_point(destructor:google.protobuf.GeneratedCodeInfo)
-  if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) {
-  (void)arena;
-    return;
-  }
-  SharedDtor();
-}
-
-inline void GeneratedCodeInfo::SharedDtor() {
-  GOOGLE_DCHECK(GetArenaForAllocation() == nullptr);
-  _impl_.annotation_.~RepeatedPtrField();
-}
-
-void GeneratedCodeInfo::SetCachedSize(int size) const {
-  _impl_._cached_size_.Set(size);
-}
-
-void GeneratedCodeInfo::Clear() {
-// @@protoc_insertion_point(message_clear_start:google.protobuf.GeneratedCodeInfo)
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.annotation_.Clear();
-  _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>();
-}
-
-const char* GeneratedCodeInfo::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) {
-#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure
-  while (!ctx->Done(&ptr)) {
-    uint32_t tag;
-    ptr = ::_pbi::ReadTag(ptr, &tag);
-    switch (tag >> 3) {
-      // repeated .google.protobuf.GeneratedCodeInfo.Annotation annotation = 1;
-      case 1:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 10)) {
-          ptr -= 1;
-          do {
-            ptr += 1;
-            ptr = ctx->ParseMessage(_internal_add_annotation(), ptr);
-            CHK_(ptr);
-            if (!ctx->DataAvailable(ptr)) break;
-          } while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<10>(ptr));
-        } else
-          goto handle_unusual;
-        continue;
-      default:
-        goto handle_unusual;
-    }  // switch
-  handle_unusual:
-    if ((tag == 0) || ((tag & 7) == 4)) {
-      CHK_(ptr);
-      ctx->SetLastTag(tag);
-      goto message_done;
-    }
-    ptr = UnknownFieldParse(
-        tag,
-        _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(),
-        ptr, ctx);
-    CHK_(ptr != nullptr);
-  }  // while
-message_done:
-  return ptr;
-failure:
-  ptr = nullptr;
-  goto message_done;
-#undef CHK_
-}
-
-uint8_t* GeneratedCodeInfo::_InternalSerialize(
-    uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.GeneratedCodeInfo)
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  // repeated .google.protobuf.GeneratedCodeInfo.Annotation annotation = 1;
-  for (unsigned i = 0,
-      n = static_cast<unsigned>(this->_internal_annotation_size()); i < n; i++) {
-    const auto& repfield = this->_internal_annotation(i);
-    target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
-        InternalWriteMessage(1, repfield, repfield.GetCachedSize(), target, stream);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-        _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.GeneratedCodeInfo)
-  return target;
-}
-
-size_t GeneratedCodeInfo::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:google.protobuf.GeneratedCodeInfo)
-  size_t total_size = 0;
-
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // repeated .google.protobuf.GeneratedCodeInfo.Annotation annotation = 1;
-  total_size += 1UL * this->_internal_annotation_size();
-  for (const auto& msg : this->_impl_.annotation_) {
-    total_size +=
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(msg);
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData GeneratedCodeInfo::_class_data_ = {
-    ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck,
-    GeneratedCodeInfo::MergeImpl
-};
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*GeneratedCodeInfo::GetClassData() const { return &_class_data_; }
-
-
-void GeneratedCodeInfo::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) {
-  auto* const _this = static_cast<GeneratedCodeInfo*>(&to_msg);
-  auto& from = static_cast<const GeneratedCodeInfo&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.GeneratedCodeInfo)
-  GOOGLE_DCHECK_NE(&from, _this);
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  _this->_impl_.annotation_.MergeFrom(from._impl_.annotation_);
-  _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void GeneratedCodeInfo::CopyFrom(const GeneratedCodeInfo& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.GeneratedCodeInfo)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool GeneratedCodeInfo::IsInitialized() const {
-  return true;
-}
-
-void GeneratedCodeInfo::InternalSwap(GeneratedCodeInfo* other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  _impl_.annotation_.InternalSwap(&other->_impl_.annotation_);
-}
-
-::PROTOBUF_NAMESPACE_ID::Metadata GeneratedCodeInfo::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_google_2fprotobuf_2fdescriptor_2eproto_getter, &descriptor_table_google_2fprotobuf_2fdescriptor_2eproto_once,
-      file_level_metadata_google_2fprotobuf_2fdescriptor_2eproto[26]);
-}
-
-// @@protoc_insertion_point(namespace_scope)
-PROTOBUF_NAMESPACE_CLOSE
-PROTOBUF_NAMESPACE_OPEN
-template<> PROTOBUF_NOINLINE ::PROTOBUF_NAMESPACE_ID::FileDescriptorSet*
-Arena::CreateMaybeMessage< ::PROTOBUF_NAMESPACE_ID::FileDescriptorSet >(Arena* arena) {
-  return Arena::CreateMessageInternal< ::PROTOBUF_NAMESPACE_ID::FileDescriptorSet >(arena);
-}
-template<> PROTOBUF_NOINLINE ::PROTOBUF_NAMESPACE_ID::FileDescriptorProto*
-Arena::CreateMaybeMessage< ::PROTOBUF_NAMESPACE_ID::FileDescriptorProto >(Arena* arena) {
-  return Arena::CreateMessageInternal< ::PROTOBUF_NAMESPACE_ID::FileDescriptorProto >(arena);
-}
-template<> PROTOBUF_NOINLINE ::PROTOBUF_NAMESPACE_ID::DescriptorProto_ExtensionRange*
-Arena::CreateMaybeMessage< ::PROTOBUF_NAMESPACE_ID::DescriptorProto_ExtensionRange >(Arena* arena) {
-  return Arena::CreateMessageInternal< ::PROTOBUF_NAMESPACE_ID::DescriptorProto_ExtensionRange >(arena);
-}
-template<> PROTOBUF_NOINLINE ::PROTOBUF_NAMESPACE_ID::DescriptorProto_ReservedRange*
-Arena::CreateMaybeMessage< ::PROTOBUF_NAMESPACE_ID::DescriptorProto_ReservedRange >(Arena* arena) {
-  return Arena::CreateMessageInternal< ::PROTOBUF_NAMESPACE_ID::DescriptorProto_ReservedRange >(arena);
-}
-template<> PROTOBUF_NOINLINE ::PROTOBUF_NAMESPACE_ID::DescriptorProto*
-Arena::CreateMaybeMessage< ::PROTOBUF_NAMESPACE_ID::DescriptorProto >(Arena* arena) {
-  return Arena::CreateMessageInternal< ::PROTOBUF_NAMESPACE_ID::DescriptorProto >(arena);
-}
-template<> PROTOBUF_NOINLINE ::PROTOBUF_NAMESPACE_ID::ExtensionRangeOptions*
-Arena::CreateMaybeMessage< ::PROTOBUF_NAMESPACE_ID::ExtensionRangeOptions >(Arena* arena) {
-  return Arena::CreateMessageInternal< ::PROTOBUF_NAMESPACE_ID::ExtensionRangeOptions >(arena);
-}
-template<> PROTOBUF_NOINLINE ::PROTOBUF_NAMESPACE_ID::FieldDescriptorProto*
-Arena::CreateMaybeMessage< ::PROTOBUF_NAMESPACE_ID::FieldDescriptorProto >(Arena* arena) {
-  return Arena::CreateMessageInternal< ::PROTOBUF_NAMESPACE_ID::FieldDescriptorProto >(arena);
-}
-template<> PROTOBUF_NOINLINE ::PROTOBUF_NAMESPACE_ID::OneofDescriptorProto*
-Arena::CreateMaybeMessage< ::PROTOBUF_NAMESPACE_ID::OneofDescriptorProto >(Arena* arena) {
-  return Arena::CreateMessageInternal< ::PROTOBUF_NAMESPACE_ID::OneofDescriptorProto >(arena);
-}
-template<> PROTOBUF_NOINLINE ::PROTOBUF_NAMESPACE_ID::EnumDescriptorProto_EnumReservedRange*
-Arena::CreateMaybeMessage< ::PROTOBUF_NAMESPACE_ID::EnumDescriptorProto_EnumReservedRange >(Arena* arena) {
-  return Arena::CreateMessageInternal< ::PROTOBUF_NAMESPACE_ID::EnumDescriptorProto_EnumReservedRange >(arena);
-}
-template<> PROTOBUF_NOINLINE ::PROTOBUF_NAMESPACE_ID::EnumDescriptorProto*
-Arena::CreateMaybeMessage< ::PROTOBUF_NAMESPACE_ID::EnumDescriptorProto >(Arena* arena) {
-  return Arena::CreateMessageInternal< ::PROTOBUF_NAMESPACE_ID::EnumDescriptorProto >(arena);
-}
-template<> PROTOBUF_NOINLINE ::PROTOBUF_NAMESPACE_ID::EnumValueDescriptorProto*
-Arena::CreateMaybeMessage< ::PROTOBUF_NAMESPACE_ID::EnumValueDescriptorProto >(Arena* arena) {
-  return Arena::CreateMessageInternal< ::PROTOBUF_NAMESPACE_ID::EnumValueDescriptorProto >(arena);
-}
-template<> PROTOBUF_NOINLINE ::PROTOBUF_NAMESPACE_ID::ServiceDescriptorProto*
-Arena::CreateMaybeMessage< ::PROTOBUF_NAMESPACE_ID::ServiceDescriptorProto >(Arena* arena) {
-  return Arena::CreateMessageInternal< ::PROTOBUF_NAMESPACE_ID::ServiceDescriptorProto >(arena);
-}
-template<> PROTOBUF_NOINLINE ::PROTOBUF_NAMESPACE_ID::MethodDescriptorProto*
-Arena::CreateMaybeMessage< ::PROTOBUF_NAMESPACE_ID::MethodDescriptorProto >(Arena* arena) {
-  return Arena::CreateMessageInternal< ::PROTOBUF_NAMESPACE_ID::MethodDescriptorProto >(arena);
-}
-template<> PROTOBUF_NOINLINE ::PROTOBUF_NAMESPACE_ID::FileOptions*
-Arena::CreateMaybeMessage< ::PROTOBUF_NAMESPACE_ID::FileOptions >(Arena* arena) {
-  return Arena::CreateMessageInternal< ::PROTOBUF_NAMESPACE_ID::FileOptions >(arena);
-}
-template<> PROTOBUF_NOINLINE ::PROTOBUF_NAMESPACE_ID::MessageOptions*
-Arena::CreateMaybeMessage< ::PROTOBUF_NAMESPACE_ID::MessageOptions >(Arena* arena) {
-  return Arena::CreateMessageInternal< ::PROTOBUF_NAMESPACE_ID::MessageOptions >(arena);
-}
-template<> PROTOBUF_NOINLINE ::PROTOBUF_NAMESPACE_ID::FieldOptions*
-Arena::CreateMaybeMessage< ::PROTOBUF_NAMESPACE_ID::FieldOptions >(Arena* arena) {
-  return Arena::CreateMessageInternal< ::PROTOBUF_NAMESPACE_ID::FieldOptions >(arena);
-}
-template<> PROTOBUF_NOINLINE ::PROTOBUF_NAMESPACE_ID::OneofOptions*
-Arena::CreateMaybeMessage< ::PROTOBUF_NAMESPACE_ID::OneofOptions >(Arena* arena) {
-  return Arena::CreateMessageInternal< ::PROTOBUF_NAMESPACE_ID::OneofOptions >(arena);
-}
-template<> PROTOBUF_NOINLINE ::PROTOBUF_NAMESPACE_ID::EnumOptions*
-Arena::CreateMaybeMessage< ::PROTOBUF_NAMESPACE_ID::EnumOptions >(Arena* arena) {
-  return Arena::CreateMessageInternal< ::PROTOBUF_NAMESPACE_ID::EnumOptions >(arena);
-}
-template<> PROTOBUF_NOINLINE ::PROTOBUF_NAMESPACE_ID::EnumValueOptions*
-Arena::CreateMaybeMessage< ::PROTOBUF_NAMESPACE_ID::EnumValueOptions >(Arena* arena) {
-  return Arena::CreateMessageInternal< ::PROTOBUF_NAMESPACE_ID::EnumValueOptions >(arena);
-}
-template<> PROTOBUF_NOINLINE ::PROTOBUF_NAMESPACE_ID::ServiceOptions*
-Arena::CreateMaybeMessage< ::PROTOBUF_NAMESPACE_ID::ServiceOptions >(Arena* arena) {
-  return Arena::CreateMessageInternal< ::PROTOBUF_NAMESPACE_ID::ServiceOptions >(arena);
-}
-template<> PROTOBUF_NOINLINE ::PROTOBUF_NAMESPACE_ID::MethodOptions*
-Arena::CreateMaybeMessage< ::PROTOBUF_NAMESPACE_ID::MethodOptions >(Arena* arena) {
-  return Arena::CreateMessageInternal< ::PROTOBUF_NAMESPACE_ID::MethodOptions >(arena);
-}
-template<> PROTOBUF_NOINLINE ::PROTOBUF_NAMESPACE_ID::UninterpretedOption_NamePart*
-Arena::CreateMaybeMessage< ::PROTOBUF_NAMESPACE_ID::UninterpretedOption_NamePart >(Arena* arena) {
-  return Arena::CreateMessageInternal< ::PROTOBUF_NAMESPACE_ID::UninterpretedOption_NamePart >(arena);
-}
-template<> PROTOBUF_NOINLINE ::PROTOBUF_NAMESPACE_ID::UninterpretedOption*
-Arena::CreateMaybeMessage< ::PROTOBUF_NAMESPACE_ID::UninterpretedOption >(Arena* arena) {
-  return Arena::CreateMessageInternal< ::PROTOBUF_NAMESPACE_ID::UninterpretedOption >(arena);
-}
-template<> PROTOBUF_NOINLINE ::PROTOBUF_NAMESPACE_ID::SourceCodeInfo_Location*
-Arena::CreateMaybeMessage< ::PROTOBUF_NAMESPACE_ID::SourceCodeInfo_Location >(Arena* arena) {
-  return Arena::CreateMessageInternal< ::PROTOBUF_NAMESPACE_ID::SourceCodeInfo_Location >(arena);
-}
-template<> PROTOBUF_NOINLINE ::PROTOBUF_NAMESPACE_ID::SourceCodeInfo*
-Arena::CreateMaybeMessage< ::PROTOBUF_NAMESPACE_ID::SourceCodeInfo >(Arena* arena) {
-  return Arena::CreateMessageInternal< ::PROTOBUF_NAMESPACE_ID::SourceCodeInfo >(arena);
-}
-template<> PROTOBUF_NOINLINE ::PROTOBUF_NAMESPACE_ID::GeneratedCodeInfo_Annotation*
-Arena::CreateMaybeMessage< ::PROTOBUF_NAMESPACE_ID::GeneratedCodeInfo_Annotation >(Arena* arena) {
-  return Arena::CreateMessageInternal< ::PROTOBUF_NAMESPACE_ID::GeneratedCodeInfo_Annotation >(arena);
-}
-template<> PROTOBUF_NOINLINE ::PROTOBUF_NAMESPACE_ID::GeneratedCodeInfo*
-Arena::CreateMaybeMessage< ::PROTOBUF_NAMESPACE_ID::GeneratedCodeInfo >(Arena* arena) {
-  return Arena::CreateMessageInternal< ::PROTOBUF_NAMESPACE_ID::GeneratedCodeInfo >(arena);
-}
-PROTOBUF_NAMESPACE_CLOSE
-
-// @@protoc_insertion_point(global_scope)
-#include <google/protobuf/port_undef.inc>
diff --git a/libs/protobuf/src/google/protobuf/descriptor.pb.h b/libs/protobuf/src/google/protobuf/descriptor.pb.h
deleted file mode 100644
index 9ae046a..0000000
--- a/libs/protobuf/src/google/protobuf/descriptor.pb.h
+++ /dev/null
@@ -1,14821 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/protobuf/descriptor.proto
-
-#ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fdescriptor_2eproto
-#define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fdescriptor_2eproto
-
-#include <limits>
-#include <string>
-
-#include <google/protobuf/port_def.inc>
-#if PROTOBUF_VERSION < 3021000
-#error This file was generated by a newer version of protoc which is
-#error incompatible with your Protocol Buffer headers. Please update
-#error your headers.
-#endif
-#if 3021012 < PROTOBUF_MIN_PROTOC_VERSION
-#error This file was generated by an older version of protoc which is
-#error incompatible with your Protocol Buffer headers. Please
-#error regenerate this file with a newer version of protoc.
-#endif
-
-#include <google/protobuf/port_undef.inc>
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/arena.h>
-#include <google/protobuf/arenastring.h>
-#include <google/protobuf/generated_message_util.h>
-#include <google/protobuf/metadata_lite.h>
-#include <google/protobuf/generated_message_reflection.h>
-#include <google/protobuf/message.h>
-#include <google/protobuf/repeated_field.h>  // IWYU pragma: export
-#include <google/protobuf/extension_set.h>  // IWYU pragma: export
-#include <google/protobuf/generated_enum_reflection.h>
-#include <google/protobuf/unknown_field_set.h>
-// @@protoc_insertion_point(includes)
-#include <google/protobuf/port_def.inc>
-#define PROTOBUF_INTERNAL_EXPORT_google_2fprotobuf_2fdescriptor_2eproto PROTOBUF_EXPORT
-PROTOBUF_NAMESPACE_OPEN
-namespace internal {
-class AnyMetadata;
-}  // namespace internal
-PROTOBUF_NAMESPACE_CLOSE
-
-// Internal implementation detail -- do not use these members.
-struct PROTOBUF_EXPORT TableStruct_google_2fprotobuf_2fdescriptor_2eproto {
-  static const uint32_t offsets[];
-};
-PROTOBUF_EXPORT extern const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable descriptor_table_google_2fprotobuf_2fdescriptor_2eproto;
-PROTOBUF_NAMESPACE_OPEN
-class DescriptorProto;
-struct DescriptorProtoDefaultTypeInternal;
-PROTOBUF_EXPORT extern DescriptorProtoDefaultTypeInternal _DescriptorProto_default_instance_;
-class DescriptorProto_ExtensionRange;
-struct DescriptorProto_ExtensionRangeDefaultTypeInternal;
-PROTOBUF_EXPORT extern DescriptorProto_ExtensionRangeDefaultTypeInternal _DescriptorProto_ExtensionRange_default_instance_;
-class DescriptorProto_ReservedRange;
-struct DescriptorProto_ReservedRangeDefaultTypeInternal;
-PROTOBUF_EXPORT extern DescriptorProto_ReservedRangeDefaultTypeInternal _DescriptorProto_ReservedRange_default_instance_;
-class EnumDescriptorProto;
-struct EnumDescriptorProtoDefaultTypeInternal;
-PROTOBUF_EXPORT extern EnumDescriptorProtoDefaultTypeInternal _EnumDescriptorProto_default_instance_;
-class EnumDescriptorProto_EnumReservedRange;
-struct EnumDescriptorProto_EnumReservedRangeDefaultTypeInternal;
-PROTOBUF_EXPORT extern EnumDescriptorProto_EnumReservedRangeDefaultTypeInternal _EnumDescriptorProto_EnumReservedRange_default_instance_;
-class EnumOptions;
-struct EnumOptionsDefaultTypeInternal;
-PROTOBUF_EXPORT extern EnumOptionsDefaultTypeInternal _EnumOptions_default_instance_;
-class EnumValueDescriptorProto;
-struct EnumValueDescriptorProtoDefaultTypeInternal;
-PROTOBUF_EXPORT extern EnumValueDescriptorProtoDefaultTypeInternal _EnumValueDescriptorProto_default_instance_;
-class EnumValueOptions;
-struct EnumValueOptionsDefaultTypeInternal;
-PROTOBUF_EXPORT extern EnumValueOptionsDefaultTypeInternal _EnumValueOptions_default_instance_;
-class ExtensionRangeOptions;
-struct ExtensionRangeOptionsDefaultTypeInternal;
-PROTOBUF_EXPORT extern ExtensionRangeOptionsDefaultTypeInternal _ExtensionRangeOptions_default_instance_;
-class FieldDescriptorProto;
-struct FieldDescriptorProtoDefaultTypeInternal;
-PROTOBUF_EXPORT extern FieldDescriptorProtoDefaultTypeInternal _FieldDescriptorProto_default_instance_;
-class FieldOptions;
-struct FieldOptionsDefaultTypeInternal;
-PROTOBUF_EXPORT extern FieldOptionsDefaultTypeInternal _FieldOptions_default_instance_;
-class FileDescriptorProto;
-struct FileDescriptorProtoDefaultTypeInternal;
-PROTOBUF_EXPORT extern FileDescriptorProtoDefaultTypeInternal _FileDescriptorProto_default_instance_;
-class FileDescriptorSet;
-struct FileDescriptorSetDefaultTypeInternal;
-PROTOBUF_EXPORT extern FileDescriptorSetDefaultTypeInternal _FileDescriptorSet_default_instance_;
-class FileOptions;
-struct FileOptionsDefaultTypeInternal;
-PROTOBUF_EXPORT extern FileOptionsDefaultTypeInternal _FileOptions_default_instance_;
-class GeneratedCodeInfo;
-struct GeneratedCodeInfoDefaultTypeInternal;
-PROTOBUF_EXPORT extern GeneratedCodeInfoDefaultTypeInternal _GeneratedCodeInfo_default_instance_;
-class GeneratedCodeInfo_Annotation;
-struct GeneratedCodeInfo_AnnotationDefaultTypeInternal;
-PROTOBUF_EXPORT extern GeneratedCodeInfo_AnnotationDefaultTypeInternal _GeneratedCodeInfo_Annotation_default_instance_;
-class MessageOptions;
-struct MessageOptionsDefaultTypeInternal;
-PROTOBUF_EXPORT extern MessageOptionsDefaultTypeInternal _MessageOptions_default_instance_;
-class MethodDescriptorProto;
-struct MethodDescriptorProtoDefaultTypeInternal;
-PROTOBUF_EXPORT extern MethodDescriptorProtoDefaultTypeInternal _MethodDescriptorProto_default_instance_;
-class MethodOptions;
-struct MethodOptionsDefaultTypeInternal;
-PROTOBUF_EXPORT extern MethodOptionsDefaultTypeInternal _MethodOptions_default_instance_;
-class OneofDescriptorProto;
-struct OneofDescriptorProtoDefaultTypeInternal;
-PROTOBUF_EXPORT extern OneofDescriptorProtoDefaultTypeInternal _OneofDescriptorProto_default_instance_;
-class OneofOptions;
-struct OneofOptionsDefaultTypeInternal;
-PROTOBUF_EXPORT extern OneofOptionsDefaultTypeInternal _OneofOptions_default_instance_;
-class ServiceDescriptorProto;
-struct ServiceDescriptorProtoDefaultTypeInternal;
-PROTOBUF_EXPORT extern ServiceDescriptorProtoDefaultTypeInternal _ServiceDescriptorProto_default_instance_;
-class ServiceOptions;
-struct ServiceOptionsDefaultTypeInternal;
-PROTOBUF_EXPORT extern ServiceOptionsDefaultTypeInternal _ServiceOptions_default_instance_;
-class SourceCodeInfo;
-struct SourceCodeInfoDefaultTypeInternal;
-PROTOBUF_EXPORT extern SourceCodeInfoDefaultTypeInternal _SourceCodeInfo_default_instance_;
-class SourceCodeInfo_Location;
-struct SourceCodeInfo_LocationDefaultTypeInternal;
-PROTOBUF_EXPORT extern SourceCodeInfo_LocationDefaultTypeInternal _SourceCodeInfo_Location_default_instance_;
-class UninterpretedOption;
-struct UninterpretedOptionDefaultTypeInternal;
-PROTOBUF_EXPORT extern UninterpretedOptionDefaultTypeInternal _UninterpretedOption_default_instance_;
-class UninterpretedOption_NamePart;
-struct UninterpretedOption_NamePartDefaultTypeInternal;
-PROTOBUF_EXPORT extern UninterpretedOption_NamePartDefaultTypeInternal _UninterpretedOption_NamePart_default_instance_;
-PROTOBUF_NAMESPACE_CLOSE
-PROTOBUF_NAMESPACE_OPEN
-template<> PROTOBUF_EXPORT ::PROTOBUF_NAMESPACE_ID::DescriptorProto* Arena::CreateMaybeMessage<::PROTOBUF_NAMESPACE_ID::DescriptorProto>(Arena*);
-template<> PROTOBUF_EXPORT ::PROTOBUF_NAMESPACE_ID::DescriptorProto_ExtensionRange* Arena::CreateMaybeMessage<::PROTOBUF_NAMESPACE_ID::DescriptorProto_ExtensionRange>(Arena*);
-template<> PROTOBUF_EXPORT ::PROTOBUF_NAMESPACE_ID::DescriptorProto_ReservedRange* Arena::CreateMaybeMessage<::PROTOBUF_NAMESPACE_ID::DescriptorProto_ReservedRange>(Arena*);
-template<> PROTOBUF_EXPORT ::PROTOBUF_NAMESPACE_ID::EnumDescriptorProto* Arena::CreateMaybeMessage<::PROTOBUF_NAMESPACE_ID::EnumDescriptorProto>(Arena*);
-template<> PROTOBUF_EXPORT ::PROTOBUF_NAMESPACE_ID::EnumDescriptorProto_EnumReservedRange* Arena::CreateMaybeMessage<::PROTOBUF_NAMESPACE_ID::EnumDescriptorProto_EnumReservedRange>(Arena*);
-template<> PROTOBUF_EXPORT ::PROTOBUF_NAMESPACE_ID::EnumOptions* Arena::CreateMaybeMessage<::PROTOBUF_NAMESPACE_ID::EnumOptions>(Arena*);
-template<> PROTOBUF_EXPORT ::PROTOBUF_NAMESPACE_ID::EnumValueDescriptorProto* Arena::CreateMaybeMessage<::PROTOBUF_NAMESPACE_ID::EnumValueDescriptorProto>(Arena*);
-template<> PROTOBUF_EXPORT ::PROTOBUF_NAMESPACE_ID::EnumValueOptions* Arena::CreateMaybeMessage<::PROTOBUF_NAMESPACE_ID::EnumValueOptions>(Arena*);
-template<> PROTOBUF_EXPORT ::PROTOBUF_NAMESPACE_ID::ExtensionRangeOptions* Arena::CreateMaybeMessage<::PROTOBUF_NAMESPACE_ID::ExtensionRangeOptions>(Arena*);
-template<> PROTOBUF_EXPORT ::PROTOBUF_NAMESPACE_ID::FieldDescriptorProto* Arena::CreateMaybeMessage<::PROTOBUF_NAMESPACE_ID::FieldDescriptorProto>(Arena*);
-template<> PROTOBUF_EXPORT ::PROTOBUF_NAMESPACE_ID::FieldOptions* Arena::CreateMaybeMessage<::PROTOBUF_NAMESPACE_ID::FieldOptions>(Arena*);
-template<> PROTOBUF_EXPORT ::PROTOBUF_NAMESPACE_ID::FileDescriptorProto* Arena::CreateMaybeMessage<::PROTOBUF_NAMESPACE_ID::FileDescriptorProto>(Arena*);
-template<> PROTOBUF_EXPORT ::PROTOBUF_NAMESPACE_ID::FileDescriptorSet* Arena::CreateMaybeMessage<::PROTOBUF_NAMESPACE_ID::FileDescriptorSet>(Arena*);
-template<> PROTOBUF_EXPORT ::PROTOBUF_NAMESPACE_ID::FileOptions* Arena::CreateMaybeMessage<::PROTOBUF_NAMESPACE_ID::FileOptions>(Arena*);
-template<> PROTOBUF_EXPORT ::PROTOBUF_NAMESPACE_ID::GeneratedCodeInfo* Arena::CreateMaybeMessage<::PROTOBUF_NAMESPACE_ID::GeneratedCodeInfo>(Arena*);
-template<> PROTOBUF_EXPORT ::PROTOBUF_NAMESPACE_ID::GeneratedCodeInfo_Annotation* Arena::CreateMaybeMessage<::PROTOBUF_NAMESPACE_ID::GeneratedCodeInfo_Annotation>(Arena*);
-template<> PROTOBUF_EXPORT ::PROTOBUF_NAMESPACE_ID::MessageOptions* Arena::CreateMaybeMessage<::PROTOBUF_NAMESPACE_ID::MessageOptions>(Arena*);
-template<> PROTOBUF_EXPORT ::PROTOBUF_NAMESPACE_ID::MethodDescriptorProto* Arena::CreateMaybeMessage<::PROTOBUF_NAMESPACE_ID::MethodDescriptorProto>(Arena*);
-template<> PROTOBUF_EXPORT ::PROTOBUF_NAMESPACE_ID::MethodOptions* Arena::CreateMaybeMessage<::PROTOBUF_NAMESPACE_ID::MethodOptions>(Arena*);
-template<> PROTOBUF_EXPORT ::PROTOBUF_NAMESPACE_ID::OneofDescriptorProto* Arena::CreateMaybeMessage<::PROTOBUF_NAMESPACE_ID::OneofDescriptorProto>(Arena*);
-template<> PROTOBUF_EXPORT ::PROTOBUF_NAMESPACE_ID::OneofOptions* Arena::CreateMaybeMessage<::PROTOBUF_NAMESPACE_ID::OneofOptions>(Arena*);
-template<> PROTOBUF_EXPORT ::PROTOBUF_NAMESPACE_ID::ServiceDescriptorProto* Arena::CreateMaybeMessage<::PROTOBUF_NAMESPACE_ID::ServiceDescriptorProto>(Arena*);
-template<> PROTOBUF_EXPORT ::PROTOBUF_NAMESPACE_ID::ServiceOptions* Arena::CreateMaybeMessage<::PROTOBUF_NAMESPACE_ID::ServiceOptions>(Arena*);
-template<> PROTOBUF_EXPORT ::PROTOBUF_NAMESPACE_ID::SourceCodeInfo* Arena::CreateMaybeMessage<::PROTOBUF_NAMESPACE_ID::SourceCodeInfo>(Arena*);
-template<> PROTOBUF_EXPORT ::PROTOBUF_NAMESPACE_ID::SourceCodeInfo_Location* Arena::CreateMaybeMessage<::PROTOBUF_NAMESPACE_ID::SourceCodeInfo_Location>(Arena*);
-template<> PROTOBUF_EXPORT ::PROTOBUF_NAMESPACE_ID::UninterpretedOption* Arena::CreateMaybeMessage<::PROTOBUF_NAMESPACE_ID::UninterpretedOption>(Arena*);
-template<> PROTOBUF_EXPORT ::PROTOBUF_NAMESPACE_ID::UninterpretedOption_NamePart* Arena::CreateMaybeMessage<::PROTOBUF_NAMESPACE_ID::UninterpretedOption_NamePart>(Arena*);
-PROTOBUF_NAMESPACE_CLOSE
-PROTOBUF_NAMESPACE_OPEN
-
-enum FieldDescriptorProto_Type : int {
-  FieldDescriptorProto_Type_TYPE_DOUBLE = 1,
-  FieldDescriptorProto_Type_TYPE_FLOAT = 2,
-  FieldDescriptorProto_Type_TYPE_INT64 = 3,
-  FieldDescriptorProto_Type_TYPE_UINT64 = 4,
-  FieldDescriptorProto_Type_TYPE_INT32 = 5,
-  FieldDescriptorProto_Type_TYPE_FIXED64 = 6,
-  FieldDescriptorProto_Type_TYPE_FIXED32 = 7,
-  FieldDescriptorProto_Type_TYPE_BOOL = 8,
-  FieldDescriptorProto_Type_TYPE_STRING = 9,
-  FieldDescriptorProto_Type_TYPE_GROUP = 10,
-  FieldDescriptorProto_Type_TYPE_MESSAGE = 11,
-  FieldDescriptorProto_Type_TYPE_BYTES = 12,
-  FieldDescriptorProto_Type_TYPE_UINT32 = 13,
-  FieldDescriptorProto_Type_TYPE_ENUM = 14,
-  FieldDescriptorProto_Type_TYPE_SFIXED32 = 15,
-  FieldDescriptorProto_Type_TYPE_SFIXED64 = 16,
-  FieldDescriptorProto_Type_TYPE_SINT32 = 17,
-  FieldDescriptorProto_Type_TYPE_SINT64 = 18
-};
-PROTOBUF_EXPORT bool FieldDescriptorProto_Type_IsValid(int value);
-constexpr FieldDescriptorProto_Type FieldDescriptorProto_Type_Type_MIN = FieldDescriptorProto_Type_TYPE_DOUBLE;
-constexpr FieldDescriptorProto_Type FieldDescriptorProto_Type_Type_MAX = FieldDescriptorProto_Type_TYPE_SINT64;
-constexpr int FieldDescriptorProto_Type_Type_ARRAYSIZE = FieldDescriptorProto_Type_Type_MAX + 1;
-
-PROTOBUF_EXPORT const ::PROTOBUF_NAMESPACE_ID::EnumDescriptor* FieldDescriptorProto_Type_descriptor();
-template<typename T>
-inline const std::string& FieldDescriptorProto_Type_Name(T enum_t_value) {
-  static_assert(::std::is_same<T, FieldDescriptorProto_Type>::value ||
-    ::std::is_integral<T>::value,
-    "Incorrect type passed to function FieldDescriptorProto_Type_Name.");
-  return ::PROTOBUF_NAMESPACE_ID::internal::NameOfEnum(
-    FieldDescriptorProto_Type_descriptor(), enum_t_value);
-}
-inline bool FieldDescriptorProto_Type_Parse(
-    ::PROTOBUF_NAMESPACE_ID::ConstStringParam name, FieldDescriptorProto_Type* value) {
-  return ::PROTOBUF_NAMESPACE_ID::internal::ParseNamedEnum<FieldDescriptorProto_Type>(
-    FieldDescriptorProto_Type_descriptor(), name, value);
-}
-enum FieldDescriptorProto_Label : int {
-  FieldDescriptorProto_Label_LABEL_OPTIONAL = 1,
-  FieldDescriptorProto_Label_LABEL_REQUIRED = 2,
-  FieldDescriptorProto_Label_LABEL_REPEATED = 3
-};
-PROTOBUF_EXPORT bool FieldDescriptorProto_Label_IsValid(int value);
-constexpr FieldDescriptorProto_Label FieldDescriptorProto_Label_Label_MIN = FieldDescriptorProto_Label_LABEL_OPTIONAL;
-constexpr FieldDescriptorProto_Label FieldDescriptorProto_Label_Label_MAX = FieldDescriptorProto_Label_LABEL_REPEATED;
-constexpr int FieldDescriptorProto_Label_Label_ARRAYSIZE = FieldDescriptorProto_Label_Label_MAX + 1;
-
-PROTOBUF_EXPORT const ::PROTOBUF_NAMESPACE_ID::EnumDescriptor* FieldDescriptorProto_Label_descriptor();
-template<typename T>
-inline const std::string& FieldDescriptorProto_Label_Name(T enum_t_value) {
-  static_assert(::std::is_same<T, FieldDescriptorProto_Label>::value ||
-    ::std::is_integral<T>::value,
-    "Incorrect type passed to function FieldDescriptorProto_Label_Name.");
-  return ::PROTOBUF_NAMESPACE_ID::internal::NameOfEnum(
-    FieldDescriptorProto_Label_descriptor(), enum_t_value);
-}
-inline bool FieldDescriptorProto_Label_Parse(
-    ::PROTOBUF_NAMESPACE_ID::ConstStringParam name, FieldDescriptorProto_Label* value) {
-  return ::PROTOBUF_NAMESPACE_ID::internal::ParseNamedEnum<FieldDescriptorProto_Label>(
-    FieldDescriptorProto_Label_descriptor(), name, value);
-}
-enum FileOptions_OptimizeMode : int {
-  FileOptions_OptimizeMode_SPEED = 1,
-  FileOptions_OptimizeMode_CODE_SIZE = 2,
-  FileOptions_OptimizeMode_LITE_RUNTIME = 3
-};
-PROTOBUF_EXPORT bool FileOptions_OptimizeMode_IsValid(int value);
-constexpr FileOptions_OptimizeMode FileOptions_OptimizeMode_OptimizeMode_MIN = FileOptions_OptimizeMode_SPEED;
-constexpr FileOptions_OptimizeMode FileOptions_OptimizeMode_OptimizeMode_MAX = FileOptions_OptimizeMode_LITE_RUNTIME;
-constexpr int FileOptions_OptimizeMode_OptimizeMode_ARRAYSIZE = FileOptions_OptimizeMode_OptimizeMode_MAX + 1;
-
-PROTOBUF_EXPORT const ::PROTOBUF_NAMESPACE_ID::EnumDescriptor* FileOptions_OptimizeMode_descriptor();
-template<typename T>
-inline const std::string& FileOptions_OptimizeMode_Name(T enum_t_value) {
-  static_assert(::std::is_same<T, FileOptions_OptimizeMode>::value ||
-    ::std::is_integral<T>::value,
-    "Incorrect type passed to function FileOptions_OptimizeMode_Name.");
-  return ::PROTOBUF_NAMESPACE_ID::internal::NameOfEnum(
-    FileOptions_OptimizeMode_descriptor(), enum_t_value);
-}
-inline bool FileOptions_OptimizeMode_Parse(
-    ::PROTOBUF_NAMESPACE_ID::ConstStringParam name, FileOptions_OptimizeMode* value) {
-  return ::PROTOBUF_NAMESPACE_ID::internal::ParseNamedEnum<FileOptions_OptimizeMode>(
-    FileOptions_OptimizeMode_descriptor(), name, value);
-}
-enum FieldOptions_CType : int {
-  FieldOptions_CType_STRING = 0,
-  FieldOptions_CType_CORD = 1,
-  FieldOptions_CType_STRING_PIECE = 2
-};
-PROTOBUF_EXPORT bool FieldOptions_CType_IsValid(int value);
-constexpr FieldOptions_CType FieldOptions_CType_CType_MIN = FieldOptions_CType_STRING;
-constexpr FieldOptions_CType FieldOptions_CType_CType_MAX = FieldOptions_CType_STRING_PIECE;
-constexpr int FieldOptions_CType_CType_ARRAYSIZE = FieldOptions_CType_CType_MAX + 1;
-
-PROTOBUF_EXPORT const ::PROTOBUF_NAMESPACE_ID::EnumDescriptor* FieldOptions_CType_descriptor();
-template<typename T>
-inline const std::string& FieldOptions_CType_Name(T enum_t_value) {
-  static_assert(::std::is_same<T, FieldOptions_CType>::value ||
-    ::std::is_integral<T>::value,
-    "Incorrect type passed to function FieldOptions_CType_Name.");
-  return ::PROTOBUF_NAMESPACE_ID::internal::NameOfEnum(
-    FieldOptions_CType_descriptor(), enum_t_value);
-}
-inline bool FieldOptions_CType_Parse(
-    ::PROTOBUF_NAMESPACE_ID::ConstStringParam name, FieldOptions_CType* value) {
-  return ::PROTOBUF_NAMESPACE_ID::internal::ParseNamedEnum<FieldOptions_CType>(
-    FieldOptions_CType_descriptor(), name, value);
-}
-enum FieldOptions_JSType : int {
-  FieldOptions_JSType_JS_NORMAL = 0,
-  FieldOptions_JSType_JS_STRING = 1,
-  FieldOptions_JSType_JS_NUMBER = 2
-};
-PROTOBUF_EXPORT bool FieldOptions_JSType_IsValid(int value);
-constexpr FieldOptions_JSType FieldOptions_JSType_JSType_MIN = FieldOptions_JSType_JS_NORMAL;
-constexpr FieldOptions_JSType FieldOptions_JSType_JSType_MAX = FieldOptions_JSType_JS_NUMBER;
-constexpr int FieldOptions_JSType_JSType_ARRAYSIZE = FieldOptions_JSType_JSType_MAX + 1;
-
-PROTOBUF_EXPORT const ::PROTOBUF_NAMESPACE_ID::EnumDescriptor* FieldOptions_JSType_descriptor();
-template<typename T>
-inline const std::string& FieldOptions_JSType_Name(T enum_t_value) {
-  static_assert(::std::is_same<T, FieldOptions_JSType>::value ||
-    ::std::is_integral<T>::value,
-    "Incorrect type passed to function FieldOptions_JSType_Name.");
-  return ::PROTOBUF_NAMESPACE_ID::internal::NameOfEnum(
-    FieldOptions_JSType_descriptor(), enum_t_value);
-}
-inline bool FieldOptions_JSType_Parse(
-    ::PROTOBUF_NAMESPACE_ID::ConstStringParam name, FieldOptions_JSType* value) {
-  return ::PROTOBUF_NAMESPACE_ID::internal::ParseNamedEnum<FieldOptions_JSType>(
-    FieldOptions_JSType_descriptor(), name, value);
-}
-enum MethodOptions_IdempotencyLevel : int {
-  MethodOptions_IdempotencyLevel_IDEMPOTENCY_UNKNOWN = 0,
-  MethodOptions_IdempotencyLevel_NO_SIDE_EFFECTS = 1,
-  MethodOptions_IdempotencyLevel_IDEMPOTENT = 2
-};
-PROTOBUF_EXPORT bool MethodOptions_IdempotencyLevel_IsValid(int value);
-constexpr MethodOptions_IdempotencyLevel MethodOptions_IdempotencyLevel_IdempotencyLevel_MIN = MethodOptions_IdempotencyLevel_IDEMPOTENCY_UNKNOWN;
-constexpr MethodOptions_IdempotencyLevel MethodOptions_IdempotencyLevel_IdempotencyLevel_MAX = MethodOptions_IdempotencyLevel_IDEMPOTENT;
-constexpr int MethodOptions_IdempotencyLevel_IdempotencyLevel_ARRAYSIZE = MethodOptions_IdempotencyLevel_IdempotencyLevel_MAX + 1;
-
-PROTOBUF_EXPORT const ::PROTOBUF_NAMESPACE_ID::EnumDescriptor* MethodOptions_IdempotencyLevel_descriptor();
-template<typename T>
-inline const std::string& MethodOptions_IdempotencyLevel_Name(T enum_t_value) {
-  static_assert(::std::is_same<T, MethodOptions_IdempotencyLevel>::value ||
-    ::std::is_integral<T>::value,
-    "Incorrect type passed to function MethodOptions_IdempotencyLevel_Name.");
-  return ::PROTOBUF_NAMESPACE_ID::internal::NameOfEnum(
-    MethodOptions_IdempotencyLevel_descriptor(), enum_t_value);
-}
-inline bool MethodOptions_IdempotencyLevel_Parse(
-    ::PROTOBUF_NAMESPACE_ID::ConstStringParam name, MethodOptions_IdempotencyLevel* value) {
-  return ::PROTOBUF_NAMESPACE_ID::internal::ParseNamedEnum<MethodOptions_IdempotencyLevel>(
-    MethodOptions_IdempotencyLevel_descriptor(), name, value);
-}
-// ===================================================================
-
-class PROTOBUF_EXPORT FileDescriptorSet final :
-    public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:google.protobuf.FileDescriptorSet) */ {
- public:
-  inline FileDescriptorSet() : FileDescriptorSet(nullptr) {}
-  ~FileDescriptorSet() override;
-  explicit PROTOBUF_CONSTEXPR FileDescriptorSet(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
-
-  FileDescriptorSet(const FileDescriptorSet& from);
-  FileDescriptorSet(FileDescriptorSet&& from) noexcept
-    : FileDescriptorSet() {
-    *this = ::std::move(from);
-  }
-
-  inline FileDescriptorSet& operator=(const FileDescriptorSet& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline FileDescriptorSet& operator=(FileDescriptorSet&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetOwningArena() == from.GetOwningArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetOwningArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::PROTOBUF_NAMESPACE_ID::UnknownFieldSet& unknown_fields() const {
-    return _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance);
-  }
-  inline ::PROTOBUF_NAMESPACE_ID::UnknownFieldSet* mutable_unknown_fields() {
-    return _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>();
-  }
-
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const FileDescriptorSet& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const FileDescriptorSet* internal_default_instance() {
-    return reinterpret_cast<const FileDescriptorSet*>(
-               &_FileDescriptorSet_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    0;
-
-  friend void swap(FileDescriptorSet& a, FileDescriptorSet& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(FileDescriptorSet* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() != nullptr &&
-        GetOwningArena() == other->GetOwningArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() == other->GetOwningArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(FileDescriptorSet* other) {
-    if (other == this) return;
-    GOOGLE_DCHECK(GetOwningArena() == other->GetOwningArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  FileDescriptorSet* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<FileDescriptorSet>(arena);
-  }
-  using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
-  void CopyFrom(const FileDescriptorSet& from);
-  using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom( const FileDescriptorSet& from) {
-    FileDescriptorSet::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  uint8_t* _InternalSerialize(
-      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
-
-  private:
-  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
-  void SharedDtor();
-  void SetCachedSize(int size) const final;
-  void InternalSwap(FileDescriptorSet* other);
-
-  private:
-  friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
-  static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
-    return "google.protobuf.FileDescriptorSet";
-  }
-  protected:
-  explicit FileDescriptorSet(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                       bool is_message_owned = false);
-  public:
-
-  static const ClassData _class_data_;
-  const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*GetClassData() const final;
-
-  ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kFileFieldNumber = 1,
-  };
-  // repeated .google.protobuf.FileDescriptorProto file = 1;
-  int file_size() const;
-  private:
-  int _internal_file_size() const;
-  public:
-  void clear_file();
-  ::PROTOBUF_NAMESPACE_ID::FileDescriptorProto* mutable_file(int index);
-  ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::FileDescriptorProto >*
-      mutable_file();
-  private:
-  const ::PROTOBUF_NAMESPACE_ID::FileDescriptorProto& _internal_file(int index) const;
-  ::PROTOBUF_NAMESPACE_ID::FileDescriptorProto* _internal_add_file();
-  public:
-  const ::PROTOBUF_NAMESPACE_ID::FileDescriptorProto& file(int index) const;
-  ::PROTOBUF_NAMESPACE_ID::FileDescriptorProto* add_file();
-  const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::FileDescriptorProto >&
-      file() const;
-
-  // @@protoc_insertion_point(class_scope:google.protobuf.FileDescriptorSet)
- private:
-  class _Internal;
-
-  template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
-  typedef void InternalArenaConstructable_;
-  typedef void DestructorSkippable_;
-  struct Impl_ {
-    ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::FileDescriptorProto > file_;
-    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_google_2fprotobuf_2fdescriptor_2eproto;
-};
-// -------------------------------------------------------------------
-
-class PROTOBUF_EXPORT FileDescriptorProto final :
-    public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:google.protobuf.FileDescriptorProto) */ {
- public:
-  inline FileDescriptorProto() : FileDescriptorProto(nullptr) {}
-  ~FileDescriptorProto() override;
-  explicit PROTOBUF_CONSTEXPR FileDescriptorProto(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
-
-  FileDescriptorProto(const FileDescriptorProto& from);
-  FileDescriptorProto(FileDescriptorProto&& from) noexcept
-    : FileDescriptorProto() {
-    *this = ::std::move(from);
-  }
-
-  inline FileDescriptorProto& operator=(const FileDescriptorProto& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline FileDescriptorProto& operator=(FileDescriptorProto&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetOwningArena() == from.GetOwningArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetOwningArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::PROTOBUF_NAMESPACE_ID::UnknownFieldSet& unknown_fields() const {
-    return _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance);
-  }
-  inline ::PROTOBUF_NAMESPACE_ID::UnknownFieldSet* mutable_unknown_fields() {
-    return _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>();
-  }
-
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const FileDescriptorProto& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const FileDescriptorProto* internal_default_instance() {
-    return reinterpret_cast<const FileDescriptorProto*>(
-               &_FileDescriptorProto_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    1;
-
-  friend void swap(FileDescriptorProto& a, FileDescriptorProto& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(FileDescriptorProto* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() != nullptr &&
-        GetOwningArena() == other->GetOwningArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() == other->GetOwningArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(FileDescriptorProto* other) {
-    if (other == this) return;
-    GOOGLE_DCHECK(GetOwningArena() == other->GetOwningArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  FileDescriptorProto* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<FileDescriptorProto>(arena);
-  }
-  using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
-  void CopyFrom(const FileDescriptorProto& from);
-  using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom( const FileDescriptorProto& from) {
-    FileDescriptorProto::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  uint8_t* _InternalSerialize(
-      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
-
-  private:
-  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
-  void SharedDtor();
-  void SetCachedSize(int size) const final;
-  void InternalSwap(FileDescriptorProto* other);
-
-  private:
-  friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
-  static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
-    return "google.protobuf.FileDescriptorProto";
-  }
-  protected:
-  explicit FileDescriptorProto(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                       bool is_message_owned = false);
-  public:
-
-  static const ClassData _class_data_;
-  const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*GetClassData() const final;
-
-  ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kDependencyFieldNumber = 3,
-    kMessageTypeFieldNumber = 4,
-    kEnumTypeFieldNumber = 5,
-    kServiceFieldNumber = 6,
-    kExtensionFieldNumber = 7,
-    kPublicDependencyFieldNumber = 10,
-    kWeakDependencyFieldNumber = 11,
-    kNameFieldNumber = 1,
-    kPackageFieldNumber = 2,
-    kSyntaxFieldNumber = 12,
-    kOptionsFieldNumber = 8,
-    kSourceCodeInfoFieldNumber = 9,
-  };
-  // repeated string dependency = 3;
-  int dependency_size() const;
-  private:
-  int _internal_dependency_size() const;
-  public:
-  void clear_dependency();
-  const std::string& dependency(int index) const;
-  std::string* mutable_dependency(int index);
-  void set_dependency(int index, const std::string& value);
-  void set_dependency(int index, std::string&& value);
-  void set_dependency(int index, const char* value);
-  void set_dependency(int index, const char* value, size_t size);
-  std::string* add_dependency();
-  void add_dependency(const std::string& value);
-  void add_dependency(std::string&& value);
-  void add_dependency(const char* value);
-  void add_dependency(const char* value, size_t size);
-  const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string>& dependency() const;
-  ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string>* mutable_dependency();
-  private:
-  const std::string& _internal_dependency(int index) const;
-  std::string* _internal_add_dependency();
-  public:
-
-  // repeated .google.protobuf.DescriptorProto message_type = 4;
-  int message_type_size() const;
-  private:
-  int _internal_message_type_size() const;
-  public:
-  void clear_message_type();
-  ::PROTOBUF_NAMESPACE_ID::DescriptorProto* mutable_message_type(int index);
-  ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::DescriptorProto >*
-      mutable_message_type();
-  private:
-  const ::PROTOBUF_NAMESPACE_ID::DescriptorProto& _internal_message_type(int index) const;
-  ::PROTOBUF_NAMESPACE_ID::DescriptorProto* _internal_add_message_type();
-  public:
-  const ::PROTOBUF_NAMESPACE_ID::DescriptorProto& message_type(int index) const;
-  ::PROTOBUF_NAMESPACE_ID::DescriptorProto* add_message_type();
-  const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::DescriptorProto >&
-      message_type() const;
-
-  // repeated .google.protobuf.EnumDescriptorProto enum_type = 5;
-  int enum_type_size() const;
-  private:
-  int _internal_enum_type_size() const;
-  public:
-  void clear_enum_type();
-  ::PROTOBUF_NAMESPACE_ID::EnumDescriptorProto* mutable_enum_type(int index);
-  ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::EnumDescriptorProto >*
-      mutable_enum_type();
-  private:
-  const ::PROTOBUF_NAMESPACE_ID::EnumDescriptorProto& _internal_enum_type(int index) const;
-  ::PROTOBUF_NAMESPACE_ID::EnumDescriptorProto* _internal_add_enum_type();
-  public:
-  const ::PROTOBUF_NAMESPACE_ID::EnumDescriptorProto& enum_type(int index) const;
-  ::PROTOBUF_NAMESPACE_ID::EnumDescriptorProto* add_enum_type();
-  const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::EnumDescriptorProto >&
-      enum_type() const;
-
-  // repeated .google.protobuf.ServiceDescriptorProto service = 6;
-  int service_size() const;
-  private:
-  int _internal_service_size() const;
-  public:
-  void clear_service();
-  ::PROTOBUF_NAMESPACE_ID::ServiceDescriptorProto* mutable_service(int index);
-  ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::ServiceDescriptorProto >*
-      mutable_service();
-  private:
-  const ::PROTOBUF_NAMESPACE_ID::ServiceDescriptorProto& _internal_service(int index) const;
-  ::PROTOBUF_NAMESPACE_ID::ServiceDescriptorProto* _internal_add_service();
-  public:
-  const ::PROTOBUF_NAMESPACE_ID::ServiceDescriptorProto& service(int index) const;
-  ::PROTOBUF_NAMESPACE_ID::ServiceDescriptorProto* add_service();
-  const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::ServiceDescriptorProto >&
-      service() const;
-
-  // repeated .google.protobuf.FieldDescriptorProto extension = 7;
-  int extension_size() const;
-  private:
-  int _internal_extension_size() const;
-  public:
-  void clear_extension();
-  ::PROTOBUF_NAMESPACE_ID::FieldDescriptorProto* mutable_extension(int index);
-  ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::FieldDescriptorProto >*
-      mutable_extension();
-  private:
-  const ::PROTOBUF_NAMESPACE_ID::FieldDescriptorProto& _internal_extension(int index) const;
-  ::PROTOBUF_NAMESPACE_ID::FieldDescriptorProto* _internal_add_extension();
-  public:
-  const ::PROTOBUF_NAMESPACE_ID::FieldDescriptorProto& extension(int index) const;
-  ::PROTOBUF_NAMESPACE_ID::FieldDescriptorProto* add_extension();
-  const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::FieldDescriptorProto >&
-      extension() const;
-
-  // repeated int32 public_dependency = 10;
-  int public_dependency_size() const;
-  private:
-  int _internal_public_dependency_size() const;
-  public:
-  void clear_public_dependency();
-  private:
-  int32_t _internal_public_dependency(int index) const;
-  const ::PROTOBUF_NAMESPACE_ID::RepeatedField< int32_t >&
-      _internal_public_dependency() const;
-  void _internal_add_public_dependency(int32_t value);
-  ::PROTOBUF_NAMESPACE_ID::RepeatedField< int32_t >*
-      _internal_mutable_public_dependency();
-  public:
-  int32_t public_dependency(int index) const;
-  void set_public_dependency(int index, int32_t value);
-  void add_public_dependency(int32_t value);
-  const ::PROTOBUF_NAMESPACE_ID::RepeatedField< int32_t >&
-      public_dependency() const;
-  ::PROTOBUF_NAMESPACE_ID::RepeatedField< int32_t >*
-      mutable_public_dependency();
-
-  // repeated int32 weak_dependency = 11;
-  int weak_dependency_size() const;
-  private:
-  int _internal_weak_dependency_size() const;
-  public:
-  void clear_weak_dependency();
-  private:
-  int32_t _internal_weak_dependency(int index) const;
-  const ::PROTOBUF_NAMESPACE_ID::RepeatedField< int32_t >&
-      _internal_weak_dependency() const;
-  void _internal_add_weak_dependency(int32_t value);
-  ::PROTOBUF_NAMESPACE_ID::RepeatedField< int32_t >*
-      _internal_mutable_weak_dependency();
-  public:
-  int32_t weak_dependency(int index) const;
-  void set_weak_dependency(int index, int32_t value);
-  void add_weak_dependency(int32_t value);
-  const ::PROTOBUF_NAMESPACE_ID::RepeatedField< int32_t >&
-      weak_dependency() const;
-  ::PROTOBUF_NAMESPACE_ID::RepeatedField< int32_t >*
-      mutable_weak_dependency();
-
-  // optional string name = 1;
-  bool has_name() const;
-  private:
-  bool _internal_has_name() const;
-  public:
-  void clear_name();
-  const std::string& name() const;
-  template <typename ArgT0 = const std::string&, typename... ArgT>
-  void set_name(ArgT0&& arg0, ArgT... args);
-  std::string* mutable_name();
-  PROTOBUF_NODISCARD std::string* release_name();
-  void set_allocated_name(std::string* name);
-  private:
-  const std::string& _internal_name() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_name(const std::string& value);
-  std::string* _internal_mutable_name();
-  public:
-
-  // optional string package = 2;
-  bool has_package() const;
-  private:
-  bool _internal_has_package() const;
-  public:
-  void clear_package();
-  const std::string& package() const;
-  template <typename ArgT0 = const std::string&, typename... ArgT>
-  void set_package(ArgT0&& arg0, ArgT... args);
-  std::string* mutable_package();
-  PROTOBUF_NODISCARD std::string* release_package();
-  void set_allocated_package(std::string* package);
-  private:
-  const std::string& _internal_package() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_package(const std::string& value);
-  std::string* _internal_mutable_package();
-  public:
-
-  // optional string syntax = 12;
-  bool has_syntax() const;
-  private:
-  bool _internal_has_syntax() const;
-  public:
-  void clear_syntax();
-  const std::string& syntax() const;
-  template <typename ArgT0 = const std::string&, typename... ArgT>
-  void set_syntax(ArgT0&& arg0, ArgT... args);
-  std::string* mutable_syntax();
-  PROTOBUF_NODISCARD std::string* release_syntax();
-  void set_allocated_syntax(std::string* syntax);
-  private:
-  const std::string& _internal_syntax() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_syntax(const std::string& value);
-  std::string* _internal_mutable_syntax();
-  public:
-
-  // optional .google.protobuf.FileOptions options = 8;
-  bool has_options() const;
-  private:
-  bool _internal_has_options() const;
-  public:
-  void clear_options();
-  const ::PROTOBUF_NAMESPACE_ID::FileOptions& options() const;
-  PROTOBUF_NODISCARD ::PROTOBUF_NAMESPACE_ID::FileOptions* release_options();
-  ::PROTOBUF_NAMESPACE_ID::FileOptions* mutable_options();
-  void set_allocated_options(::PROTOBUF_NAMESPACE_ID::FileOptions* options);
-  private:
-  const ::PROTOBUF_NAMESPACE_ID::FileOptions& _internal_options() const;
-  ::PROTOBUF_NAMESPACE_ID::FileOptions* _internal_mutable_options();
-  public:
-  void unsafe_arena_set_allocated_options(
-      ::PROTOBUF_NAMESPACE_ID::FileOptions* options);
-  ::PROTOBUF_NAMESPACE_ID::FileOptions* unsafe_arena_release_options();
-
-  // optional .google.protobuf.SourceCodeInfo source_code_info = 9;
-  bool has_source_code_info() const;
-  private:
-  bool _internal_has_source_code_info() const;
-  public:
-  void clear_source_code_info();
-  const ::PROTOBUF_NAMESPACE_ID::SourceCodeInfo& source_code_info() const;
-  PROTOBUF_NODISCARD ::PROTOBUF_NAMESPACE_ID::SourceCodeInfo* release_source_code_info();
-  ::PROTOBUF_NAMESPACE_ID::SourceCodeInfo* mutable_source_code_info();
-  void set_allocated_source_code_info(::PROTOBUF_NAMESPACE_ID::SourceCodeInfo* source_code_info);
-  private:
-  const ::PROTOBUF_NAMESPACE_ID::SourceCodeInfo& _internal_source_code_info() const;
-  ::PROTOBUF_NAMESPACE_ID::SourceCodeInfo* _internal_mutable_source_code_info();
-  public:
-  void unsafe_arena_set_allocated_source_code_info(
-      ::PROTOBUF_NAMESPACE_ID::SourceCodeInfo* source_code_info);
-  ::PROTOBUF_NAMESPACE_ID::SourceCodeInfo* unsafe_arena_release_source_code_info();
-
-  // @@protoc_insertion_point(class_scope:google.protobuf.FileDescriptorProto)
- private:
-  class _Internal;
-
-  template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
-  typedef void InternalArenaConstructable_;
-  typedef void DestructorSkippable_;
-  struct Impl_ {
-    ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
-    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-    ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string> dependency_;
-    ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::DescriptorProto > message_type_;
-    ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::EnumDescriptorProto > enum_type_;
-    ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::ServiceDescriptorProto > service_;
-    ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::FieldDescriptorProto > extension_;
-    ::PROTOBUF_NAMESPACE_ID::RepeatedField< int32_t > public_dependency_;
-    ::PROTOBUF_NAMESPACE_ID::RepeatedField< int32_t > weak_dependency_;
-    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr name_;
-    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr package_;
-    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr syntax_;
-    ::PROTOBUF_NAMESPACE_ID::FileOptions* options_;
-    ::PROTOBUF_NAMESPACE_ID::SourceCodeInfo* source_code_info_;
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_google_2fprotobuf_2fdescriptor_2eproto;
-};
-// -------------------------------------------------------------------
-
-class PROTOBUF_EXPORT DescriptorProto_ExtensionRange final :
-    public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:google.protobuf.DescriptorProto.ExtensionRange) */ {
- public:
-  inline DescriptorProto_ExtensionRange() : DescriptorProto_ExtensionRange(nullptr) {}
-  ~DescriptorProto_ExtensionRange() override;
-  explicit PROTOBUF_CONSTEXPR DescriptorProto_ExtensionRange(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
-
-  DescriptorProto_ExtensionRange(const DescriptorProto_ExtensionRange& from);
-  DescriptorProto_ExtensionRange(DescriptorProto_ExtensionRange&& from) noexcept
-    : DescriptorProto_ExtensionRange() {
-    *this = ::std::move(from);
-  }
-
-  inline DescriptorProto_ExtensionRange& operator=(const DescriptorProto_ExtensionRange& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline DescriptorProto_ExtensionRange& operator=(DescriptorProto_ExtensionRange&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetOwningArena() == from.GetOwningArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetOwningArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::PROTOBUF_NAMESPACE_ID::UnknownFieldSet& unknown_fields() const {
-    return _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance);
-  }
-  inline ::PROTOBUF_NAMESPACE_ID::UnknownFieldSet* mutable_unknown_fields() {
-    return _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>();
-  }
-
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const DescriptorProto_ExtensionRange& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const DescriptorProto_ExtensionRange* internal_default_instance() {
-    return reinterpret_cast<const DescriptorProto_ExtensionRange*>(
-               &_DescriptorProto_ExtensionRange_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    2;
-
-  friend void swap(DescriptorProto_ExtensionRange& a, DescriptorProto_ExtensionRange& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(DescriptorProto_ExtensionRange* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() != nullptr &&
-        GetOwningArena() == other->GetOwningArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() == other->GetOwningArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(DescriptorProto_ExtensionRange* other) {
-    if (other == this) return;
-    GOOGLE_DCHECK(GetOwningArena() == other->GetOwningArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  DescriptorProto_ExtensionRange* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<DescriptorProto_ExtensionRange>(arena);
-  }
-  using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
-  void CopyFrom(const DescriptorProto_ExtensionRange& from);
-  using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom( const DescriptorProto_ExtensionRange& from) {
-    DescriptorProto_ExtensionRange::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  uint8_t* _InternalSerialize(
-      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
-
-  private:
-  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
-  void SharedDtor();
-  void SetCachedSize(int size) const final;
-  void InternalSwap(DescriptorProto_ExtensionRange* other);
-
-  private:
-  friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
-  static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
-    return "google.protobuf.DescriptorProto.ExtensionRange";
-  }
-  protected:
-  explicit DescriptorProto_ExtensionRange(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                       bool is_message_owned = false);
-  public:
-
-  static const ClassData _class_data_;
-  const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*GetClassData() const final;
-
-  ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kOptionsFieldNumber = 3,
-    kStartFieldNumber = 1,
-    kEndFieldNumber = 2,
-  };
-  // optional .google.protobuf.ExtensionRangeOptions options = 3;
-  bool has_options() const;
-  private:
-  bool _internal_has_options() const;
-  public:
-  void clear_options();
-  const ::PROTOBUF_NAMESPACE_ID::ExtensionRangeOptions& options() const;
-  PROTOBUF_NODISCARD ::PROTOBUF_NAMESPACE_ID::ExtensionRangeOptions* release_options();
-  ::PROTOBUF_NAMESPACE_ID::ExtensionRangeOptions* mutable_options();
-  void set_allocated_options(::PROTOBUF_NAMESPACE_ID::ExtensionRangeOptions* options);
-  private:
-  const ::PROTOBUF_NAMESPACE_ID::ExtensionRangeOptions& _internal_options() const;
-  ::PROTOBUF_NAMESPACE_ID::ExtensionRangeOptions* _internal_mutable_options();
-  public:
-  void unsafe_arena_set_allocated_options(
-      ::PROTOBUF_NAMESPACE_ID::ExtensionRangeOptions* options);
-  ::PROTOBUF_NAMESPACE_ID::ExtensionRangeOptions* unsafe_arena_release_options();
-
-  // optional int32 start = 1;
-  bool has_start() const;
-  private:
-  bool _internal_has_start() const;
-  public:
-  void clear_start();
-  int32_t start() const;
-  void set_start(int32_t value);
-  private:
-  int32_t _internal_start() const;
-  void _internal_set_start(int32_t value);
-  public:
-
-  // optional int32 end = 2;
-  bool has_end() const;
-  private:
-  bool _internal_has_end() const;
-  public:
-  void clear_end();
-  int32_t end() const;
-  void set_end(int32_t value);
-  private:
-  int32_t _internal_end() const;
-  void _internal_set_end(int32_t value);
-  public:
-
-  // @@protoc_insertion_point(class_scope:google.protobuf.DescriptorProto.ExtensionRange)
- private:
-  class _Internal;
-
-  template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
-  typedef void InternalArenaConstructable_;
-  typedef void DestructorSkippable_;
-  struct Impl_ {
-    ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
-    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-    ::PROTOBUF_NAMESPACE_ID::ExtensionRangeOptions* options_;
-    int32_t start_;
-    int32_t end_;
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_google_2fprotobuf_2fdescriptor_2eproto;
-};
-// -------------------------------------------------------------------
-
-class PROTOBUF_EXPORT DescriptorProto_ReservedRange final :
-    public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:google.protobuf.DescriptorProto.ReservedRange) */ {
- public:
-  inline DescriptorProto_ReservedRange() : DescriptorProto_ReservedRange(nullptr) {}
-  ~DescriptorProto_ReservedRange() override;
-  explicit PROTOBUF_CONSTEXPR DescriptorProto_ReservedRange(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
-
-  DescriptorProto_ReservedRange(const DescriptorProto_ReservedRange& from);
-  DescriptorProto_ReservedRange(DescriptorProto_ReservedRange&& from) noexcept
-    : DescriptorProto_ReservedRange() {
-    *this = ::std::move(from);
-  }
-
-  inline DescriptorProto_ReservedRange& operator=(const DescriptorProto_ReservedRange& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline DescriptorProto_ReservedRange& operator=(DescriptorProto_ReservedRange&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetOwningArena() == from.GetOwningArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetOwningArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::PROTOBUF_NAMESPACE_ID::UnknownFieldSet& unknown_fields() const {
-    return _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance);
-  }
-  inline ::PROTOBUF_NAMESPACE_ID::UnknownFieldSet* mutable_unknown_fields() {
-    return _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>();
-  }
-
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const DescriptorProto_ReservedRange& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const DescriptorProto_ReservedRange* internal_default_instance() {
-    return reinterpret_cast<const DescriptorProto_ReservedRange*>(
-               &_DescriptorProto_ReservedRange_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    3;
-
-  friend void swap(DescriptorProto_ReservedRange& a, DescriptorProto_ReservedRange& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(DescriptorProto_ReservedRange* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() != nullptr &&
-        GetOwningArena() == other->GetOwningArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() == other->GetOwningArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(DescriptorProto_ReservedRange* other) {
-    if (other == this) return;
-    GOOGLE_DCHECK(GetOwningArena() == other->GetOwningArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  DescriptorProto_ReservedRange* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<DescriptorProto_ReservedRange>(arena);
-  }
-  using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
-  void CopyFrom(const DescriptorProto_ReservedRange& from);
-  using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom( const DescriptorProto_ReservedRange& from) {
-    DescriptorProto_ReservedRange::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  uint8_t* _InternalSerialize(
-      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
-
-  private:
-  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
-  void SharedDtor();
-  void SetCachedSize(int size) const final;
-  void InternalSwap(DescriptorProto_ReservedRange* other);
-
-  private:
-  friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
-  static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
-    return "google.protobuf.DescriptorProto.ReservedRange";
-  }
-  protected:
-  explicit DescriptorProto_ReservedRange(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                       bool is_message_owned = false);
-  public:
-
-  static const ClassData _class_data_;
-  const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*GetClassData() const final;
-
-  ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kStartFieldNumber = 1,
-    kEndFieldNumber = 2,
-  };
-  // optional int32 start = 1;
-  bool has_start() const;
-  private:
-  bool _internal_has_start() const;
-  public:
-  void clear_start();
-  int32_t start() const;
-  void set_start(int32_t value);
-  private:
-  int32_t _internal_start() const;
-  void _internal_set_start(int32_t value);
-  public:
-
-  // optional int32 end = 2;
-  bool has_end() const;
-  private:
-  bool _internal_has_end() const;
-  public:
-  void clear_end();
-  int32_t end() const;
-  void set_end(int32_t value);
-  private:
-  int32_t _internal_end() const;
-  void _internal_set_end(int32_t value);
-  public:
-
-  // @@protoc_insertion_point(class_scope:google.protobuf.DescriptorProto.ReservedRange)
- private:
-  class _Internal;
-
-  template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
-  typedef void InternalArenaConstructable_;
-  typedef void DestructorSkippable_;
-  struct Impl_ {
-    ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
-    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-    int32_t start_;
-    int32_t end_;
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_google_2fprotobuf_2fdescriptor_2eproto;
-};
-// -------------------------------------------------------------------
-
-class PROTOBUF_EXPORT DescriptorProto final :
-    public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:google.protobuf.DescriptorProto) */ {
- public:
-  inline DescriptorProto() : DescriptorProto(nullptr) {}
-  ~DescriptorProto() override;
-  explicit PROTOBUF_CONSTEXPR DescriptorProto(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
-
-  DescriptorProto(const DescriptorProto& from);
-  DescriptorProto(DescriptorProto&& from) noexcept
-    : DescriptorProto() {
-    *this = ::std::move(from);
-  }
-
-  inline DescriptorProto& operator=(const DescriptorProto& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline DescriptorProto& operator=(DescriptorProto&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetOwningArena() == from.GetOwningArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetOwningArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::PROTOBUF_NAMESPACE_ID::UnknownFieldSet& unknown_fields() const {
-    return _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance);
-  }
-  inline ::PROTOBUF_NAMESPACE_ID::UnknownFieldSet* mutable_unknown_fields() {
-    return _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>();
-  }
-
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const DescriptorProto& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const DescriptorProto* internal_default_instance() {
-    return reinterpret_cast<const DescriptorProto*>(
-               &_DescriptorProto_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    4;
-
-  friend void swap(DescriptorProto& a, DescriptorProto& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(DescriptorProto* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() != nullptr &&
-        GetOwningArena() == other->GetOwningArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() == other->GetOwningArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(DescriptorProto* other) {
-    if (other == this) return;
-    GOOGLE_DCHECK(GetOwningArena() == other->GetOwningArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  DescriptorProto* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<DescriptorProto>(arena);
-  }
-  using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
-  void CopyFrom(const DescriptorProto& from);
-  using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom( const DescriptorProto& from) {
-    DescriptorProto::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  uint8_t* _InternalSerialize(
-      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
-
-  private:
-  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
-  void SharedDtor();
-  void SetCachedSize(int size) const final;
-  void InternalSwap(DescriptorProto* other);
-
-  private:
-  friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
-  static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
-    return "google.protobuf.DescriptorProto";
-  }
-  protected:
-  explicit DescriptorProto(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                       bool is_message_owned = false);
-  public:
-
-  static const ClassData _class_data_;
-  const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*GetClassData() const final;
-
-  ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  typedef DescriptorProto_ExtensionRange ExtensionRange;
-  typedef DescriptorProto_ReservedRange ReservedRange;
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kFieldFieldNumber = 2,
-    kNestedTypeFieldNumber = 3,
-    kEnumTypeFieldNumber = 4,
-    kExtensionRangeFieldNumber = 5,
-    kExtensionFieldNumber = 6,
-    kOneofDeclFieldNumber = 8,
-    kReservedRangeFieldNumber = 9,
-    kReservedNameFieldNumber = 10,
-    kNameFieldNumber = 1,
-    kOptionsFieldNumber = 7,
-  };
-  // repeated .google.protobuf.FieldDescriptorProto field = 2;
-  int field_size() const;
-  private:
-  int _internal_field_size() const;
-  public:
-  void clear_field();
-  ::PROTOBUF_NAMESPACE_ID::FieldDescriptorProto* mutable_field(int index);
-  ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::FieldDescriptorProto >*
-      mutable_field();
-  private:
-  const ::PROTOBUF_NAMESPACE_ID::FieldDescriptorProto& _internal_field(int index) const;
-  ::PROTOBUF_NAMESPACE_ID::FieldDescriptorProto* _internal_add_field();
-  public:
-  const ::PROTOBUF_NAMESPACE_ID::FieldDescriptorProto& field(int index) const;
-  ::PROTOBUF_NAMESPACE_ID::FieldDescriptorProto* add_field();
-  const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::FieldDescriptorProto >&
-      field() const;
-
-  // repeated .google.protobuf.DescriptorProto nested_type = 3;
-  int nested_type_size() const;
-  private:
-  int _internal_nested_type_size() const;
-  public:
-  void clear_nested_type();
-  ::PROTOBUF_NAMESPACE_ID::DescriptorProto* mutable_nested_type(int index);
-  ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::DescriptorProto >*
-      mutable_nested_type();
-  private:
-  const ::PROTOBUF_NAMESPACE_ID::DescriptorProto& _internal_nested_type(int index) const;
-  ::PROTOBUF_NAMESPACE_ID::DescriptorProto* _internal_add_nested_type();
-  public:
-  const ::PROTOBUF_NAMESPACE_ID::DescriptorProto& nested_type(int index) const;
-  ::PROTOBUF_NAMESPACE_ID::DescriptorProto* add_nested_type();
-  const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::DescriptorProto >&
-      nested_type() const;
-
-  // repeated .google.protobuf.EnumDescriptorProto enum_type = 4;
-  int enum_type_size() const;
-  private:
-  int _internal_enum_type_size() const;
-  public:
-  void clear_enum_type();
-  ::PROTOBUF_NAMESPACE_ID::EnumDescriptorProto* mutable_enum_type(int index);
-  ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::EnumDescriptorProto >*
-      mutable_enum_type();
-  private:
-  const ::PROTOBUF_NAMESPACE_ID::EnumDescriptorProto& _internal_enum_type(int index) const;
-  ::PROTOBUF_NAMESPACE_ID::EnumDescriptorProto* _internal_add_enum_type();
-  public:
-  const ::PROTOBUF_NAMESPACE_ID::EnumDescriptorProto& enum_type(int index) const;
-  ::PROTOBUF_NAMESPACE_ID::EnumDescriptorProto* add_enum_type();
-  const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::EnumDescriptorProto >&
-      enum_type() const;
-
-  // repeated .google.protobuf.DescriptorProto.ExtensionRange extension_range = 5;
-  int extension_range_size() const;
-  private:
-  int _internal_extension_range_size() const;
-  public:
-  void clear_extension_range();
-  ::PROTOBUF_NAMESPACE_ID::DescriptorProto_ExtensionRange* mutable_extension_range(int index);
-  ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::DescriptorProto_ExtensionRange >*
-      mutable_extension_range();
-  private:
-  const ::PROTOBUF_NAMESPACE_ID::DescriptorProto_ExtensionRange& _internal_extension_range(int index) const;
-  ::PROTOBUF_NAMESPACE_ID::DescriptorProto_ExtensionRange* _internal_add_extension_range();
-  public:
-  const ::PROTOBUF_NAMESPACE_ID::DescriptorProto_ExtensionRange& extension_range(int index) const;
-  ::PROTOBUF_NAMESPACE_ID::DescriptorProto_ExtensionRange* add_extension_range();
-  const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::DescriptorProto_ExtensionRange >&
-      extension_range() const;
-
-  // repeated .google.protobuf.FieldDescriptorProto extension = 6;
-  int extension_size() const;
-  private:
-  int _internal_extension_size() const;
-  public:
-  void clear_extension();
-  ::PROTOBUF_NAMESPACE_ID::FieldDescriptorProto* mutable_extension(int index);
-  ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::FieldDescriptorProto >*
-      mutable_extension();
-  private:
-  const ::PROTOBUF_NAMESPACE_ID::FieldDescriptorProto& _internal_extension(int index) const;
-  ::PROTOBUF_NAMESPACE_ID::FieldDescriptorProto* _internal_add_extension();
-  public:
-  const ::PROTOBUF_NAMESPACE_ID::FieldDescriptorProto& extension(int index) const;
-  ::PROTOBUF_NAMESPACE_ID::FieldDescriptorProto* add_extension();
-  const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::FieldDescriptorProto >&
-      extension() const;
-
-  // repeated .google.protobuf.OneofDescriptorProto oneof_decl = 8;
-  int oneof_decl_size() const;
-  private:
-  int _internal_oneof_decl_size() const;
-  public:
-  void clear_oneof_decl();
-  ::PROTOBUF_NAMESPACE_ID::OneofDescriptorProto* mutable_oneof_decl(int index);
-  ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::OneofDescriptorProto >*
-      mutable_oneof_decl();
-  private:
-  const ::PROTOBUF_NAMESPACE_ID::OneofDescriptorProto& _internal_oneof_decl(int index) const;
-  ::PROTOBUF_NAMESPACE_ID::OneofDescriptorProto* _internal_add_oneof_decl();
-  public:
-  const ::PROTOBUF_NAMESPACE_ID::OneofDescriptorProto& oneof_decl(int index) const;
-  ::PROTOBUF_NAMESPACE_ID::OneofDescriptorProto* add_oneof_decl();
-  const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::OneofDescriptorProto >&
-      oneof_decl() const;
-
-  // repeated .google.protobuf.DescriptorProto.ReservedRange reserved_range = 9;
-  int reserved_range_size() const;
-  private:
-  int _internal_reserved_range_size() const;
-  public:
-  void clear_reserved_range();
-  ::PROTOBUF_NAMESPACE_ID::DescriptorProto_ReservedRange* mutable_reserved_range(int index);
-  ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::DescriptorProto_ReservedRange >*
-      mutable_reserved_range();
-  private:
-  const ::PROTOBUF_NAMESPACE_ID::DescriptorProto_ReservedRange& _internal_reserved_range(int index) const;
-  ::PROTOBUF_NAMESPACE_ID::DescriptorProto_ReservedRange* _internal_add_reserved_range();
-  public:
-  const ::PROTOBUF_NAMESPACE_ID::DescriptorProto_ReservedRange& reserved_range(int index) const;
-  ::PROTOBUF_NAMESPACE_ID::DescriptorProto_ReservedRange* add_reserved_range();
-  const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::DescriptorProto_ReservedRange >&
-      reserved_range() const;
-
-  // repeated string reserved_name = 10;
-  int reserved_name_size() const;
-  private:
-  int _internal_reserved_name_size() const;
-  public:
-  void clear_reserved_name();
-  const std::string& reserved_name(int index) const;
-  std::string* mutable_reserved_name(int index);
-  void set_reserved_name(int index, const std::string& value);
-  void set_reserved_name(int index, std::string&& value);
-  void set_reserved_name(int index, const char* value);
-  void set_reserved_name(int index, const char* value, size_t size);
-  std::string* add_reserved_name();
-  void add_reserved_name(const std::string& value);
-  void add_reserved_name(std::string&& value);
-  void add_reserved_name(const char* value);
-  void add_reserved_name(const char* value, size_t size);
-  const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string>& reserved_name() const;
-  ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string>* mutable_reserved_name();
-  private:
-  const std::string& _internal_reserved_name(int index) const;
-  std::string* _internal_add_reserved_name();
-  public:
-
-  // optional string name = 1;
-  bool has_name() const;
-  private:
-  bool _internal_has_name() const;
-  public:
-  void clear_name();
-  const std::string& name() const;
-  template <typename ArgT0 = const std::string&, typename... ArgT>
-  void set_name(ArgT0&& arg0, ArgT... args);
-  std::string* mutable_name();
-  PROTOBUF_NODISCARD std::string* release_name();
-  void set_allocated_name(std::string* name);
-  private:
-  const std::string& _internal_name() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_name(const std::string& value);
-  std::string* _internal_mutable_name();
-  public:
-
-  // optional .google.protobuf.MessageOptions options = 7;
-  bool has_options() const;
-  private:
-  bool _internal_has_options() const;
-  public:
-  void clear_options();
-  const ::PROTOBUF_NAMESPACE_ID::MessageOptions& options() const;
-  PROTOBUF_NODISCARD ::PROTOBUF_NAMESPACE_ID::MessageOptions* release_options();
-  ::PROTOBUF_NAMESPACE_ID::MessageOptions* mutable_options();
-  void set_allocated_options(::PROTOBUF_NAMESPACE_ID::MessageOptions* options);
-  private:
-  const ::PROTOBUF_NAMESPACE_ID::MessageOptions& _internal_options() const;
-  ::PROTOBUF_NAMESPACE_ID::MessageOptions* _internal_mutable_options();
-  public:
-  void unsafe_arena_set_allocated_options(
-      ::PROTOBUF_NAMESPACE_ID::MessageOptions* options);
-  ::PROTOBUF_NAMESPACE_ID::MessageOptions* unsafe_arena_release_options();
-
-  // @@protoc_insertion_point(class_scope:google.protobuf.DescriptorProto)
- private:
-  class _Internal;
-
-  template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
-  typedef void InternalArenaConstructable_;
-  typedef void DestructorSkippable_;
-  struct Impl_ {
-    ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
-    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-    ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::FieldDescriptorProto > field_;
-    ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::DescriptorProto > nested_type_;
-    ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::EnumDescriptorProto > enum_type_;
-    ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::DescriptorProto_ExtensionRange > extension_range_;
-    ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::FieldDescriptorProto > extension_;
-    ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::OneofDescriptorProto > oneof_decl_;
-    ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::DescriptorProto_ReservedRange > reserved_range_;
-    ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string> reserved_name_;
-    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr name_;
-    ::PROTOBUF_NAMESPACE_ID::MessageOptions* options_;
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_google_2fprotobuf_2fdescriptor_2eproto;
-};
-// -------------------------------------------------------------------
-
-class PROTOBUF_EXPORT ExtensionRangeOptions final :
-    public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:google.protobuf.ExtensionRangeOptions) */ {
- public:
-  inline ExtensionRangeOptions() : ExtensionRangeOptions(nullptr) {}
-  ~ExtensionRangeOptions() override;
-  explicit PROTOBUF_CONSTEXPR ExtensionRangeOptions(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
-
-  ExtensionRangeOptions(const ExtensionRangeOptions& from);
-  ExtensionRangeOptions(ExtensionRangeOptions&& from) noexcept
-    : ExtensionRangeOptions() {
-    *this = ::std::move(from);
-  }
-
-  inline ExtensionRangeOptions& operator=(const ExtensionRangeOptions& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline ExtensionRangeOptions& operator=(ExtensionRangeOptions&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetOwningArena() == from.GetOwningArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetOwningArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::PROTOBUF_NAMESPACE_ID::UnknownFieldSet& unknown_fields() const {
-    return _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance);
-  }
-  inline ::PROTOBUF_NAMESPACE_ID::UnknownFieldSet* mutable_unknown_fields() {
-    return _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>();
-  }
-
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const ExtensionRangeOptions& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const ExtensionRangeOptions* internal_default_instance() {
-    return reinterpret_cast<const ExtensionRangeOptions*>(
-               &_ExtensionRangeOptions_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    5;
-
-  friend void swap(ExtensionRangeOptions& a, ExtensionRangeOptions& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(ExtensionRangeOptions* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() != nullptr &&
-        GetOwningArena() == other->GetOwningArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() == other->GetOwningArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(ExtensionRangeOptions* other) {
-    if (other == this) return;
-    GOOGLE_DCHECK(GetOwningArena() == other->GetOwningArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  ExtensionRangeOptions* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<ExtensionRangeOptions>(arena);
-  }
-  using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
-  void CopyFrom(const ExtensionRangeOptions& from);
-  using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom( const ExtensionRangeOptions& from) {
-    ExtensionRangeOptions::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  uint8_t* _InternalSerialize(
-      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
-
-  private:
-  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
-  void SharedDtor();
-  void SetCachedSize(int size) const final;
-  void InternalSwap(ExtensionRangeOptions* other);
-
-  private:
-  friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
-  static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
-    return "google.protobuf.ExtensionRangeOptions";
-  }
-  protected:
-  explicit ExtensionRangeOptions(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                       bool is_message_owned = false);
-  public:
-
-  static const ClassData _class_data_;
-  const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*GetClassData() const final;
-
-  ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kUninterpretedOptionFieldNumber = 999,
-  };
-  // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
-  int uninterpreted_option_size() const;
-  private:
-  int _internal_uninterpreted_option_size() const;
-  public:
-  void clear_uninterpreted_option();
-  ::PROTOBUF_NAMESPACE_ID::UninterpretedOption* mutable_uninterpreted_option(int index);
-  ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::UninterpretedOption >*
-      mutable_uninterpreted_option();
-  private:
-  const ::PROTOBUF_NAMESPACE_ID::UninterpretedOption& _internal_uninterpreted_option(int index) const;
-  ::PROTOBUF_NAMESPACE_ID::UninterpretedOption* _internal_add_uninterpreted_option();
-  public:
-  const ::PROTOBUF_NAMESPACE_ID::UninterpretedOption& uninterpreted_option(int index) const;
-  ::PROTOBUF_NAMESPACE_ID::UninterpretedOption* add_uninterpreted_option();
-  const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::UninterpretedOption >&
-      uninterpreted_option() const;
-
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline bool HasExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          ExtensionRangeOptions, _proto_TypeTraits, _field_type, _is_packed>& id) const {
-
-    return _impl_._extensions_.Has(id.number());
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline void ClearExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          ExtensionRangeOptions, _proto_TypeTraits, _field_type, _is_packed>& id) {
-    _impl_._extensions_.ClearExtension(id.number());
-
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline int ExtensionSize(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          ExtensionRangeOptions, _proto_TypeTraits, _field_type, _is_packed>& id) const {
-
-    return _impl_._extensions_.ExtensionSize(id.number());
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline typename _proto_TypeTraits::Singular::ConstType GetExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          ExtensionRangeOptions, _proto_TypeTraits, _field_type, _is_packed>& id) const {
-
-    return _proto_TypeTraits::Get(id.number(), _impl_._extensions_,
-                                  id.default_value());
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline typename _proto_TypeTraits::Singular::MutableType MutableExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          ExtensionRangeOptions, _proto_TypeTraits, _field_type, _is_packed>& id) {
-
-    return _proto_TypeTraits::Mutable(id.number(), _field_type,
-                                      &_impl_._extensions_);
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline void SetExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          ExtensionRangeOptions, _proto_TypeTraits, _field_type, _is_packed>& id,
-      typename _proto_TypeTraits::Singular::ConstType value) {
-    _proto_TypeTraits::Set(id.number(), _field_type, value, &_impl_._extensions_);
-
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline void SetAllocatedExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          ExtensionRangeOptions, _proto_TypeTraits, _field_type, _is_packed>& id,
-      typename _proto_TypeTraits::Singular::MutableType value) {
-    _proto_TypeTraits::SetAllocated(id.number(), _field_type, value,
-                                    &_impl_._extensions_);
-
-  }
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline void UnsafeArenaSetAllocatedExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          ExtensionRangeOptions, _proto_TypeTraits, _field_type, _is_packed>& id,
-      typename _proto_TypeTraits::Singular::MutableType value) {
-    _proto_TypeTraits::UnsafeArenaSetAllocated(id.number(), _field_type,
-                                               value, &_impl_._extensions_);
-
-  }
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  PROTOBUF_NODISCARD inline
-      typename _proto_TypeTraits::Singular::MutableType
-      ReleaseExtension(
-          const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-              ExtensionRangeOptions, _proto_TypeTraits, _field_type, _is_packed>& id) {
-
-    return _proto_TypeTraits::Release(id.number(), _field_type,
-                                      &_impl_._extensions_);
-  }
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline typename _proto_TypeTraits::Singular::MutableType
-  UnsafeArenaReleaseExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          ExtensionRangeOptions, _proto_TypeTraits, _field_type, _is_packed>& id) {
-
-    return _proto_TypeTraits::UnsafeArenaRelease(id.number(), _field_type,
-                                                 &_impl_._extensions_);
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline typename _proto_TypeTraits::Repeated::ConstType GetExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          ExtensionRangeOptions, _proto_TypeTraits, _field_type, _is_packed>& id,
-      int index) const {
-
-    return _proto_TypeTraits::Get(id.number(), _impl_._extensions_, index);
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline typename _proto_TypeTraits::Repeated::MutableType MutableExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          ExtensionRangeOptions, _proto_TypeTraits, _field_type, _is_packed>& id,
-      int index) {
-
-    return _proto_TypeTraits::Mutable(id.number(), index, &_impl_._extensions_);
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline void SetExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          ExtensionRangeOptions, _proto_TypeTraits, _field_type, _is_packed>& id,
-      int index, typename _proto_TypeTraits::Repeated::ConstType value) {
-    _proto_TypeTraits::Set(id.number(), index, value, &_impl_._extensions_);
-
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline typename _proto_TypeTraits::Repeated::MutableType AddExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          ExtensionRangeOptions, _proto_TypeTraits, _field_type, _is_packed>& id) {
-    typename _proto_TypeTraits::Repeated::MutableType to_add =
-        _proto_TypeTraits::Add(id.number(), _field_type, &_impl_._extensions_);
-
-    return to_add;
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline void AddExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          ExtensionRangeOptions, _proto_TypeTraits, _field_type, _is_packed>& id,
-      typename _proto_TypeTraits::Repeated::ConstType value) {
-    _proto_TypeTraits::Add(id.number(), _field_type, _is_packed, value,
-                           &_impl_._extensions_);
-
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline const typename _proto_TypeTraits::Repeated::RepeatedFieldType&
-  GetRepeatedExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          ExtensionRangeOptions, _proto_TypeTraits, _field_type, _is_packed>& id) const {
-
-    return _proto_TypeTraits::GetRepeated(id.number(), _impl_._extensions_);
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline typename _proto_TypeTraits::Repeated::RepeatedFieldType*
-  MutableRepeatedExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          ExtensionRangeOptions, _proto_TypeTraits, _field_type, _is_packed>& id) {
-
-    return _proto_TypeTraits::MutableRepeated(id.number(), _field_type,
-                                              _is_packed, &_impl_._extensions_);
-  }
-
-  // @@protoc_insertion_point(class_scope:google.protobuf.ExtensionRangeOptions)
- private:
-  class _Internal;
-
-  template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
-  typedef void InternalArenaConstructable_;
-  typedef void DestructorSkippable_;
-  struct Impl_ {
-    ::PROTOBUF_NAMESPACE_ID::internal::ExtensionSet _extensions_;
-
-    ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::UninterpretedOption > uninterpreted_option_;
-    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_google_2fprotobuf_2fdescriptor_2eproto;
-};
-// -------------------------------------------------------------------
-
-class PROTOBUF_EXPORT FieldDescriptorProto final :
-    public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:google.protobuf.FieldDescriptorProto) */ {
- public:
-  inline FieldDescriptorProto() : FieldDescriptorProto(nullptr) {}
-  ~FieldDescriptorProto() override;
-  explicit PROTOBUF_CONSTEXPR FieldDescriptorProto(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
-
-  FieldDescriptorProto(const FieldDescriptorProto& from);
-  FieldDescriptorProto(FieldDescriptorProto&& from) noexcept
-    : FieldDescriptorProto() {
-    *this = ::std::move(from);
-  }
-
-  inline FieldDescriptorProto& operator=(const FieldDescriptorProto& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline FieldDescriptorProto& operator=(FieldDescriptorProto&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetOwningArena() == from.GetOwningArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetOwningArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::PROTOBUF_NAMESPACE_ID::UnknownFieldSet& unknown_fields() const {
-    return _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance);
-  }
-  inline ::PROTOBUF_NAMESPACE_ID::UnknownFieldSet* mutable_unknown_fields() {
-    return _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>();
-  }
-
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const FieldDescriptorProto& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const FieldDescriptorProto* internal_default_instance() {
-    return reinterpret_cast<const FieldDescriptorProto*>(
-               &_FieldDescriptorProto_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    6;
-
-  friend void swap(FieldDescriptorProto& a, FieldDescriptorProto& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(FieldDescriptorProto* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() != nullptr &&
-        GetOwningArena() == other->GetOwningArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() == other->GetOwningArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(FieldDescriptorProto* other) {
-    if (other == this) return;
-    GOOGLE_DCHECK(GetOwningArena() == other->GetOwningArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  FieldDescriptorProto* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<FieldDescriptorProto>(arena);
-  }
-  using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
-  void CopyFrom(const FieldDescriptorProto& from);
-  using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom( const FieldDescriptorProto& from) {
-    FieldDescriptorProto::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  uint8_t* _InternalSerialize(
-      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
-
-  private:
-  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
-  void SharedDtor();
-  void SetCachedSize(int size) const final;
-  void InternalSwap(FieldDescriptorProto* other);
-
-  private:
-  friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
-  static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
-    return "google.protobuf.FieldDescriptorProto";
-  }
-  protected:
-  explicit FieldDescriptorProto(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                       bool is_message_owned = false);
-  public:
-
-  static const ClassData _class_data_;
-  const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*GetClassData() const final;
-
-  ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  typedef FieldDescriptorProto_Type Type;
-  static constexpr Type TYPE_DOUBLE =
-    FieldDescriptorProto_Type_TYPE_DOUBLE;
-  static constexpr Type TYPE_FLOAT =
-    FieldDescriptorProto_Type_TYPE_FLOAT;
-  static constexpr Type TYPE_INT64 =
-    FieldDescriptorProto_Type_TYPE_INT64;
-  static constexpr Type TYPE_UINT64 =
-    FieldDescriptorProto_Type_TYPE_UINT64;
-  static constexpr Type TYPE_INT32 =
-    FieldDescriptorProto_Type_TYPE_INT32;
-  static constexpr Type TYPE_FIXED64 =
-    FieldDescriptorProto_Type_TYPE_FIXED64;
-  static constexpr Type TYPE_FIXED32 =
-    FieldDescriptorProto_Type_TYPE_FIXED32;
-  static constexpr Type TYPE_BOOL =
-    FieldDescriptorProto_Type_TYPE_BOOL;
-  static constexpr Type TYPE_STRING =
-    FieldDescriptorProto_Type_TYPE_STRING;
-  static constexpr Type TYPE_GROUP =
-    FieldDescriptorProto_Type_TYPE_GROUP;
-  static constexpr Type TYPE_MESSAGE =
-    FieldDescriptorProto_Type_TYPE_MESSAGE;
-  static constexpr Type TYPE_BYTES =
-    FieldDescriptorProto_Type_TYPE_BYTES;
-  static constexpr Type TYPE_UINT32 =
-    FieldDescriptorProto_Type_TYPE_UINT32;
-  static constexpr Type TYPE_ENUM =
-    FieldDescriptorProto_Type_TYPE_ENUM;
-  static constexpr Type TYPE_SFIXED32 =
-    FieldDescriptorProto_Type_TYPE_SFIXED32;
-  static constexpr Type TYPE_SFIXED64 =
-    FieldDescriptorProto_Type_TYPE_SFIXED64;
-  static constexpr Type TYPE_SINT32 =
-    FieldDescriptorProto_Type_TYPE_SINT32;
-  static constexpr Type TYPE_SINT64 =
-    FieldDescriptorProto_Type_TYPE_SINT64;
-  static inline bool Type_IsValid(int value) {
-    return FieldDescriptorProto_Type_IsValid(value);
-  }
-  static constexpr Type Type_MIN =
-    FieldDescriptorProto_Type_Type_MIN;
-  static constexpr Type Type_MAX =
-    FieldDescriptorProto_Type_Type_MAX;
-  static constexpr int Type_ARRAYSIZE =
-    FieldDescriptorProto_Type_Type_ARRAYSIZE;
-  static inline const ::PROTOBUF_NAMESPACE_ID::EnumDescriptor*
-  Type_descriptor() {
-    return FieldDescriptorProto_Type_descriptor();
-  }
-  template<typename T>
-  static inline const std::string& Type_Name(T enum_t_value) {
-    static_assert(::std::is_same<T, Type>::value ||
-      ::std::is_integral<T>::value,
-      "Incorrect type passed to function Type_Name.");
-    return FieldDescriptorProto_Type_Name(enum_t_value);
-  }
-  static inline bool Type_Parse(::PROTOBUF_NAMESPACE_ID::ConstStringParam name,
-      Type* value) {
-    return FieldDescriptorProto_Type_Parse(name, value);
-  }
-
-  typedef FieldDescriptorProto_Label Label;
-  static constexpr Label LABEL_OPTIONAL =
-    FieldDescriptorProto_Label_LABEL_OPTIONAL;
-  static constexpr Label LABEL_REQUIRED =
-    FieldDescriptorProto_Label_LABEL_REQUIRED;
-  static constexpr Label LABEL_REPEATED =
-    FieldDescriptorProto_Label_LABEL_REPEATED;
-  static inline bool Label_IsValid(int value) {
-    return FieldDescriptorProto_Label_IsValid(value);
-  }
-  static constexpr Label Label_MIN =
-    FieldDescriptorProto_Label_Label_MIN;
-  static constexpr Label Label_MAX =
-    FieldDescriptorProto_Label_Label_MAX;
-  static constexpr int Label_ARRAYSIZE =
-    FieldDescriptorProto_Label_Label_ARRAYSIZE;
-  static inline const ::PROTOBUF_NAMESPACE_ID::EnumDescriptor*
-  Label_descriptor() {
-    return FieldDescriptorProto_Label_descriptor();
-  }
-  template<typename T>
-  static inline const std::string& Label_Name(T enum_t_value) {
-    static_assert(::std::is_same<T, Label>::value ||
-      ::std::is_integral<T>::value,
-      "Incorrect type passed to function Label_Name.");
-    return FieldDescriptorProto_Label_Name(enum_t_value);
-  }
-  static inline bool Label_Parse(::PROTOBUF_NAMESPACE_ID::ConstStringParam name,
-      Label* value) {
-    return FieldDescriptorProto_Label_Parse(name, value);
-  }
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kNameFieldNumber = 1,
-    kExtendeeFieldNumber = 2,
-    kTypeNameFieldNumber = 6,
-    kDefaultValueFieldNumber = 7,
-    kJsonNameFieldNumber = 10,
-    kOptionsFieldNumber = 8,
-    kNumberFieldNumber = 3,
-    kOneofIndexFieldNumber = 9,
-    kProto3OptionalFieldNumber = 17,
-    kLabelFieldNumber = 4,
-    kTypeFieldNumber = 5,
-  };
-  // optional string name = 1;
-  bool has_name() const;
-  private:
-  bool _internal_has_name() const;
-  public:
-  void clear_name();
-  const std::string& name() const;
-  template <typename ArgT0 = const std::string&, typename... ArgT>
-  void set_name(ArgT0&& arg0, ArgT... args);
-  std::string* mutable_name();
-  PROTOBUF_NODISCARD std::string* release_name();
-  void set_allocated_name(std::string* name);
-  private:
-  const std::string& _internal_name() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_name(const std::string& value);
-  std::string* _internal_mutable_name();
-  public:
-
-  // optional string extendee = 2;
-  bool has_extendee() const;
-  private:
-  bool _internal_has_extendee() const;
-  public:
-  void clear_extendee();
-  const std::string& extendee() const;
-  template <typename ArgT0 = const std::string&, typename... ArgT>
-  void set_extendee(ArgT0&& arg0, ArgT... args);
-  std::string* mutable_extendee();
-  PROTOBUF_NODISCARD std::string* release_extendee();
-  void set_allocated_extendee(std::string* extendee);
-  private:
-  const std::string& _internal_extendee() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_extendee(const std::string& value);
-  std::string* _internal_mutable_extendee();
-  public:
-
-  // optional string type_name = 6;
-  bool has_type_name() const;
-  private:
-  bool _internal_has_type_name() const;
-  public:
-  void clear_type_name();
-  const std::string& type_name() const;
-  template <typename ArgT0 = const std::string&, typename... ArgT>
-  void set_type_name(ArgT0&& arg0, ArgT... args);
-  std::string* mutable_type_name();
-  PROTOBUF_NODISCARD std::string* release_type_name();
-  void set_allocated_type_name(std::string* type_name);
-  private:
-  const std::string& _internal_type_name() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_type_name(const std::string& value);
-  std::string* _internal_mutable_type_name();
-  public:
-
-  // optional string default_value = 7;
-  bool has_default_value() const;
-  private:
-  bool _internal_has_default_value() const;
-  public:
-  void clear_default_value();
-  const std::string& default_value() const;
-  template <typename ArgT0 = const std::string&, typename... ArgT>
-  void set_default_value(ArgT0&& arg0, ArgT... args);
-  std::string* mutable_default_value();
-  PROTOBUF_NODISCARD std::string* release_default_value();
-  void set_allocated_default_value(std::string* default_value);
-  private:
-  const std::string& _internal_default_value() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_default_value(const std::string& value);
-  std::string* _internal_mutable_default_value();
-  public:
-
-  // optional string json_name = 10;
-  bool has_json_name() const;
-  private:
-  bool _internal_has_json_name() const;
-  public:
-  void clear_json_name();
-  const std::string& json_name() const;
-  template <typename ArgT0 = const std::string&, typename... ArgT>
-  void set_json_name(ArgT0&& arg0, ArgT... args);
-  std::string* mutable_json_name();
-  PROTOBUF_NODISCARD std::string* release_json_name();
-  void set_allocated_json_name(std::string* json_name);
-  private:
-  const std::string& _internal_json_name() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_json_name(const std::string& value);
-  std::string* _internal_mutable_json_name();
-  public:
-
-  // optional .google.protobuf.FieldOptions options = 8;
-  bool has_options() const;
-  private:
-  bool _internal_has_options() const;
-  public:
-  void clear_options();
-  const ::PROTOBUF_NAMESPACE_ID::FieldOptions& options() const;
-  PROTOBUF_NODISCARD ::PROTOBUF_NAMESPACE_ID::FieldOptions* release_options();
-  ::PROTOBUF_NAMESPACE_ID::FieldOptions* mutable_options();
-  void set_allocated_options(::PROTOBUF_NAMESPACE_ID::FieldOptions* options);
-  private:
-  const ::PROTOBUF_NAMESPACE_ID::FieldOptions& _internal_options() const;
-  ::PROTOBUF_NAMESPACE_ID::FieldOptions* _internal_mutable_options();
-  public:
-  void unsafe_arena_set_allocated_options(
-      ::PROTOBUF_NAMESPACE_ID::FieldOptions* options);
-  ::PROTOBUF_NAMESPACE_ID::FieldOptions* unsafe_arena_release_options();
-
-  // optional int32 number = 3;
-  bool has_number() const;
-  private:
-  bool _internal_has_number() const;
-  public:
-  void clear_number();
-  int32_t number() const;
-  void set_number(int32_t value);
-  private:
-  int32_t _internal_number() const;
-  void _internal_set_number(int32_t value);
-  public:
-
-  // optional int32 oneof_index = 9;
-  bool has_oneof_index() const;
-  private:
-  bool _internal_has_oneof_index() const;
-  public:
-  void clear_oneof_index();
-  int32_t oneof_index() const;
-  void set_oneof_index(int32_t value);
-  private:
-  int32_t _internal_oneof_index() const;
-  void _internal_set_oneof_index(int32_t value);
-  public:
-
-  // optional bool proto3_optional = 17;
-  bool has_proto3_optional() const;
-  private:
-  bool _internal_has_proto3_optional() const;
-  public:
-  void clear_proto3_optional();
-  bool proto3_optional() const;
-  void set_proto3_optional(bool value);
-  private:
-  bool _internal_proto3_optional() const;
-  void _internal_set_proto3_optional(bool value);
-  public:
-
-  // optional .google.protobuf.FieldDescriptorProto.Label label = 4;
-  bool has_label() const;
-  private:
-  bool _internal_has_label() const;
-  public:
-  void clear_label();
-  ::PROTOBUF_NAMESPACE_ID::FieldDescriptorProto_Label label() const;
-  void set_label(::PROTOBUF_NAMESPACE_ID::FieldDescriptorProto_Label value);
-  private:
-  ::PROTOBUF_NAMESPACE_ID::FieldDescriptorProto_Label _internal_label() const;
-  void _internal_set_label(::PROTOBUF_NAMESPACE_ID::FieldDescriptorProto_Label value);
-  public:
-
-  // optional .google.protobuf.FieldDescriptorProto.Type type = 5;
-  bool has_type() const;
-  private:
-  bool _internal_has_type() const;
-  public:
-  void clear_type();
-  ::PROTOBUF_NAMESPACE_ID::FieldDescriptorProto_Type type() const;
-  void set_type(::PROTOBUF_NAMESPACE_ID::FieldDescriptorProto_Type value);
-  private:
-  ::PROTOBUF_NAMESPACE_ID::FieldDescriptorProto_Type _internal_type() const;
-  void _internal_set_type(::PROTOBUF_NAMESPACE_ID::FieldDescriptorProto_Type value);
-  public:
-
-  // @@protoc_insertion_point(class_scope:google.protobuf.FieldDescriptorProto)
- private:
-  class _Internal;
-
-  template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
-  typedef void InternalArenaConstructable_;
-  typedef void DestructorSkippable_;
-  struct Impl_ {
-    ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
-    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr name_;
-    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr extendee_;
-    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr type_name_;
-    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr default_value_;
-    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr json_name_;
-    ::PROTOBUF_NAMESPACE_ID::FieldOptions* options_;
-    int32_t number_;
-    int32_t oneof_index_;
-    bool proto3_optional_;
-    int label_;
-    int type_;
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_google_2fprotobuf_2fdescriptor_2eproto;
-};
-// -------------------------------------------------------------------
-
-class PROTOBUF_EXPORT OneofDescriptorProto final :
-    public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:google.protobuf.OneofDescriptorProto) */ {
- public:
-  inline OneofDescriptorProto() : OneofDescriptorProto(nullptr) {}
-  ~OneofDescriptorProto() override;
-  explicit PROTOBUF_CONSTEXPR OneofDescriptorProto(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
-
-  OneofDescriptorProto(const OneofDescriptorProto& from);
-  OneofDescriptorProto(OneofDescriptorProto&& from) noexcept
-    : OneofDescriptorProto() {
-    *this = ::std::move(from);
-  }
-
-  inline OneofDescriptorProto& operator=(const OneofDescriptorProto& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline OneofDescriptorProto& operator=(OneofDescriptorProto&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetOwningArena() == from.GetOwningArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetOwningArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::PROTOBUF_NAMESPACE_ID::UnknownFieldSet& unknown_fields() const {
-    return _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance);
-  }
-  inline ::PROTOBUF_NAMESPACE_ID::UnknownFieldSet* mutable_unknown_fields() {
-    return _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>();
-  }
-
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const OneofDescriptorProto& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const OneofDescriptorProto* internal_default_instance() {
-    return reinterpret_cast<const OneofDescriptorProto*>(
-               &_OneofDescriptorProto_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    7;
-
-  friend void swap(OneofDescriptorProto& a, OneofDescriptorProto& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(OneofDescriptorProto* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() != nullptr &&
-        GetOwningArena() == other->GetOwningArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() == other->GetOwningArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(OneofDescriptorProto* other) {
-    if (other == this) return;
-    GOOGLE_DCHECK(GetOwningArena() == other->GetOwningArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  OneofDescriptorProto* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<OneofDescriptorProto>(arena);
-  }
-  using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
-  void CopyFrom(const OneofDescriptorProto& from);
-  using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom( const OneofDescriptorProto& from) {
-    OneofDescriptorProto::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  uint8_t* _InternalSerialize(
-      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
-
-  private:
-  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
-  void SharedDtor();
-  void SetCachedSize(int size) const final;
-  void InternalSwap(OneofDescriptorProto* other);
-
-  private:
-  friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
-  static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
-    return "google.protobuf.OneofDescriptorProto";
-  }
-  protected:
-  explicit OneofDescriptorProto(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                       bool is_message_owned = false);
-  public:
-
-  static const ClassData _class_data_;
-  const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*GetClassData() const final;
-
-  ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kNameFieldNumber = 1,
-    kOptionsFieldNumber = 2,
-  };
-  // optional string name = 1;
-  bool has_name() const;
-  private:
-  bool _internal_has_name() const;
-  public:
-  void clear_name();
-  const std::string& name() const;
-  template <typename ArgT0 = const std::string&, typename... ArgT>
-  void set_name(ArgT0&& arg0, ArgT... args);
-  std::string* mutable_name();
-  PROTOBUF_NODISCARD std::string* release_name();
-  void set_allocated_name(std::string* name);
-  private:
-  const std::string& _internal_name() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_name(const std::string& value);
-  std::string* _internal_mutable_name();
-  public:
-
-  // optional .google.protobuf.OneofOptions options = 2;
-  bool has_options() const;
-  private:
-  bool _internal_has_options() const;
-  public:
-  void clear_options();
-  const ::PROTOBUF_NAMESPACE_ID::OneofOptions& options() const;
-  PROTOBUF_NODISCARD ::PROTOBUF_NAMESPACE_ID::OneofOptions* release_options();
-  ::PROTOBUF_NAMESPACE_ID::OneofOptions* mutable_options();
-  void set_allocated_options(::PROTOBUF_NAMESPACE_ID::OneofOptions* options);
-  private:
-  const ::PROTOBUF_NAMESPACE_ID::OneofOptions& _internal_options() const;
-  ::PROTOBUF_NAMESPACE_ID::OneofOptions* _internal_mutable_options();
-  public:
-  void unsafe_arena_set_allocated_options(
-      ::PROTOBUF_NAMESPACE_ID::OneofOptions* options);
-  ::PROTOBUF_NAMESPACE_ID::OneofOptions* unsafe_arena_release_options();
-
-  // @@protoc_insertion_point(class_scope:google.protobuf.OneofDescriptorProto)
- private:
-  class _Internal;
-
-  template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
-  typedef void InternalArenaConstructable_;
-  typedef void DestructorSkippable_;
-  struct Impl_ {
-    ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
-    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr name_;
-    ::PROTOBUF_NAMESPACE_ID::OneofOptions* options_;
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_google_2fprotobuf_2fdescriptor_2eproto;
-};
-// -------------------------------------------------------------------
-
-class PROTOBUF_EXPORT EnumDescriptorProto_EnumReservedRange final :
-    public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:google.protobuf.EnumDescriptorProto.EnumReservedRange) */ {
- public:
-  inline EnumDescriptorProto_EnumReservedRange() : EnumDescriptorProto_EnumReservedRange(nullptr) {}
-  ~EnumDescriptorProto_EnumReservedRange() override;
-  explicit PROTOBUF_CONSTEXPR EnumDescriptorProto_EnumReservedRange(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
-
-  EnumDescriptorProto_EnumReservedRange(const EnumDescriptorProto_EnumReservedRange& from);
-  EnumDescriptorProto_EnumReservedRange(EnumDescriptorProto_EnumReservedRange&& from) noexcept
-    : EnumDescriptorProto_EnumReservedRange() {
-    *this = ::std::move(from);
-  }
-
-  inline EnumDescriptorProto_EnumReservedRange& operator=(const EnumDescriptorProto_EnumReservedRange& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline EnumDescriptorProto_EnumReservedRange& operator=(EnumDescriptorProto_EnumReservedRange&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetOwningArena() == from.GetOwningArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetOwningArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::PROTOBUF_NAMESPACE_ID::UnknownFieldSet& unknown_fields() const {
-    return _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance);
-  }
-  inline ::PROTOBUF_NAMESPACE_ID::UnknownFieldSet* mutable_unknown_fields() {
-    return _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>();
-  }
-
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const EnumDescriptorProto_EnumReservedRange& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const EnumDescriptorProto_EnumReservedRange* internal_default_instance() {
-    return reinterpret_cast<const EnumDescriptorProto_EnumReservedRange*>(
-               &_EnumDescriptorProto_EnumReservedRange_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    8;
-
-  friend void swap(EnumDescriptorProto_EnumReservedRange& a, EnumDescriptorProto_EnumReservedRange& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(EnumDescriptorProto_EnumReservedRange* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() != nullptr &&
-        GetOwningArena() == other->GetOwningArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() == other->GetOwningArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(EnumDescriptorProto_EnumReservedRange* other) {
-    if (other == this) return;
-    GOOGLE_DCHECK(GetOwningArena() == other->GetOwningArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  EnumDescriptorProto_EnumReservedRange* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<EnumDescriptorProto_EnumReservedRange>(arena);
-  }
-  using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
-  void CopyFrom(const EnumDescriptorProto_EnumReservedRange& from);
-  using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom( const EnumDescriptorProto_EnumReservedRange& from) {
-    EnumDescriptorProto_EnumReservedRange::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  uint8_t* _InternalSerialize(
-      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
-
-  private:
-  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
-  void SharedDtor();
-  void SetCachedSize(int size) const final;
-  void InternalSwap(EnumDescriptorProto_EnumReservedRange* other);
-
-  private:
-  friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
-  static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
-    return "google.protobuf.EnumDescriptorProto.EnumReservedRange";
-  }
-  protected:
-  explicit EnumDescriptorProto_EnumReservedRange(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                       bool is_message_owned = false);
-  public:
-
-  static const ClassData _class_data_;
-  const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*GetClassData() const final;
-
-  ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kStartFieldNumber = 1,
-    kEndFieldNumber = 2,
-  };
-  // optional int32 start = 1;
-  bool has_start() const;
-  private:
-  bool _internal_has_start() const;
-  public:
-  void clear_start();
-  int32_t start() const;
-  void set_start(int32_t value);
-  private:
-  int32_t _internal_start() const;
-  void _internal_set_start(int32_t value);
-  public:
-
-  // optional int32 end = 2;
-  bool has_end() const;
-  private:
-  bool _internal_has_end() const;
-  public:
-  void clear_end();
-  int32_t end() const;
-  void set_end(int32_t value);
-  private:
-  int32_t _internal_end() const;
-  void _internal_set_end(int32_t value);
-  public:
-
-  // @@protoc_insertion_point(class_scope:google.protobuf.EnumDescriptorProto.EnumReservedRange)
- private:
-  class _Internal;
-
-  template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
-  typedef void InternalArenaConstructable_;
-  typedef void DestructorSkippable_;
-  struct Impl_ {
-    ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
-    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-    int32_t start_;
-    int32_t end_;
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_google_2fprotobuf_2fdescriptor_2eproto;
-};
-// -------------------------------------------------------------------
-
-class PROTOBUF_EXPORT EnumDescriptorProto final :
-    public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:google.protobuf.EnumDescriptorProto) */ {
- public:
-  inline EnumDescriptorProto() : EnumDescriptorProto(nullptr) {}
-  ~EnumDescriptorProto() override;
-  explicit PROTOBUF_CONSTEXPR EnumDescriptorProto(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
-
-  EnumDescriptorProto(const EnumDescriptorProto& from);
-  EnumDescriptorProto(EnumDescriptorProto&& from) noexcept
-    : EnumDescriptorProto() {
-    *this = ::std::move(from);
-  }
-
-  inline EnumDescriptorProto& operator=(const EnumDescriptorProto& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline EnumDescriptorProto& operator=(EnumDescriptorProto&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetOwningArena() == from.GetOwningArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetOwningArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::PROTOBUF_NAMESPACE_ID::UnknownFieldSet& unknown_fields() const {
-    return _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance);
-  }
-  inline ::PROTOBUF_NAMESPACE_ID::UnknownFieldSet* mutable_unknown_fields() {
-    return _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>();
-  }
-
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const EnumDescriptorProto& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const EnumDescriptorProto* internal_default_instance() {
-    return reinterpret_cast<const EnumDescriptorProto*>(
-               &_EnumDescriptorProto_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    9;
-
-  friend void swap(EnumDescriptorProto& a, EnumDescriptorProto& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(EnumDescriptorProto* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() != nullptr &&
-        GetOwningArena() == other->GetOwningArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() == other->GetOwningArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(EnumDescriptorProto* other) {
-    if (other == this) return;
-    GOOGLE_DCHECK(GetOwningArena() == other->GetOwningArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  EnumDescriptorProto* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<EnumDescriptorProto>(arena);
-  }
-  using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
-  void CopyFrom(const EnumDescriptorProto& from);
-  using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom( const EnumDescriptorProto& from) {
-    EnumDescriptorProto::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  uint8_t* _InternalSerialize(
-      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
-
-  private:
-  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
-  void SharedDtor();
-  void SetCachedSize(int size) const final;
-  void InternalSwap(EnumDescriptorProto* other);
-
-  private:
-  friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
-  static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
-    return "google.protobuf.EnumDescriptorProto";
-  }
-  protected:
-  explicit EnumDescriptorProto(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                       bool is_message_owned = false);
-  public:
-
-  static const ClassData _class_data_;
-  const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*GetClassData() const final;
-
-  ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  typedef EnumDescriptorProto_EnumReservedRange EnumReservedRange;
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kValueFieldNumber = 2,
-    kReservedRangeFieldNumber = 4,
-    kReservedNameFieldNumber = 5,
-    kNameFieldNumber = 1,
-    kOptionsFieldNumber = 3,
-  };
-  // repeated .google.protobuf.EnumValueDescriptorProto value = 2;
-  int value_size() const;
-  private:
-  int _internal_value_size() const;
-  public:
-  void clear_value();
-  ::PROTOBUF_NAMESPACE_ID::EnumValueDescriptorProto* mutable_value(int index);
-  ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::EnumValueDescriptorProto >*
-      mutable_value();
-  private:
-  const ::PROTOBUF_NAMESPACE_ID::EnumValueDescriptorProto& _internal_value(int index) const;
-  ::PROTOBUF_NAMESPACE_ID::EnumValueDescriptorProto* _internal_add_value();
-  public:
-  const ::PROTOBUF_NAMESPACE_ID::EnumValueDescriptorProto& value(int index) const;
-  ::PROTOBUF_NAMESPACE_ID::EnumValueDescriptorProto* add_value();
-  const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::EnumValueDescriptorProto >&
-      value() const;
-
-  // repeated .google.protobuf.EnumDescriptorProto.EnumReservedRange reserved_range = 4;
-  int reserved_range_size() const;
-  private:
-  int _internal_reserved_range_size() const;
-  public:
-  void clear_reserved_range();
-  ::PROTOBUF_NAMESPACE_ID::EnumDescriptorProto_EnumReservedRange* mutable_reserved_range(int index);
-  ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::EnumDescriptorProto_EnumReservedRange >*
-      mutable_reserved_range();
-  private:
-  const ::PROTOBUF_NAMESPACE_ID::EnumDescriptorProto_EnumReservedRange& _internal_reserved_range(int index) const;
-  ::PROTOBUF_NAMESPACE_ID::EnumDescriptorProto_EnumReservedRange* _internal_add_reserved_range();
-  public:
-  const ::PROTOBUF_NAMESPACE_ID::EnumDescriptorProto_EnumReservedRange& reserved_range(int index) const;
-  ::PROTOBUF_NAMESPACE_ID::EnumDescriptorProto_EnumReservedRange* add_reserved_range();
-  const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::EnumDescriptorProto_EnumReservedRange >&
-      reserved_range() const;
-
-  // repeated string reserved_name = 5;
-  int reserved_name_size() const;
-  private:
-  int _internal_reserved_name_size() const;
-  public:
-  void clear_reserved_name();
-  const std::string& reserved_name(int index) const;
-  std::string* mutable_reserved_name(int index);
-  void set_reserved_name(int index, const std::string& value);
-  void set_reserved_name(int index, std::string&& value);
-  void set_reserved_name(int index, const char* value);
-  void set_reserved_name(int index, const char* value, size_t size);
-  std::string* add_reserved_name();
-  void add_reserved_name(const std::string& value);
-  void add_reserved_name(std::string&& value);
-  void add_reserved_name(const char* value);
-  void add_reserved_name(const char* value, size_t size);
-  const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string>& reserved_name() const;
-  ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string>* mutable_reserved_name();
-  private:
-  const std::string& _internal_reserved_name(int index) const;
-  std::string* _internal_add_reserved_name();
-  public:
-
-  // optional string name = 1;
-  bool has_name() const;
-  private:
-  bool _internal_has_name() const;
-  public:
-  void clear_name();
-  const std::string& name() const;
-  template <typename ArgT0 = const std::string&, typename... ArgT>
-  void set_name(ArgT0&& arg0, ArgT... args);
-  std::string* mutable_name();
-  PROTOBUF_NODISCARD std::string* release_name();
-  void set_allocated_name(std::string* name);
-  private:
-  const std::string& _internal_name() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_name(const std::string& value);
-  std::string* _internal_mutable_name();
-  public:
-
-  // optional .google.protobuf.EnumOptions options = 3;
-  bool has_options() const;
-  private:
-  bool _internal_has_options() const;
-  public:
-  void clear_options();
-  const ::PROTOBUF_NAMESPACE_ID::EnumOptions& options() const;
-  PROTOBUF_NODISCARD ::PROTOBUF_NAMESPACE_ID::EnumOptions* release_options();
-  ::PROTOBUF_NAMESPACE_ID::EnumOptions* mutable_options();
-  void set_allocated_options(::PROTOBUF_NAMESPACE_ID::EnumOptions* options);
-  private:
-  const ::PROTOBUF_NAMESPACE_ID::EnumOptions& _internal_options() const;
-  ::PROTOBUF_NAMESPACE_ID::EnumOptions* _internal_mutable_options();
-  public:
-  void unsafe_arena_set_allocated_options(
-      ::PROTOBUF_NAMESPACE_ID::EnumOptions* options);
-  ::PROTOBUF_NAMESPACE_ID::EnumOptions* unsafe_arena_release_options();
-
-  // @@protoc_insertion_point(class_scope:google.protobuf.EnumDescriptorProto)
- private:
-  class _Internal;
-
-  template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
-  typedef void InternalArenaConstructable_;
-  typedef void DestructorSkippable_;
-  struct Impl_ {
-    ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
-    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-    ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::EnumValueDescriptorProto > value_;
-    ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::EnumDescriptorProto_EnumReservedRange > reserved_range_;
-    ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string> reserved_name_;
-    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr name_;
-    ::PROTOBUF_NAMESPACE_ID::EnumOptions* options_;
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_google_2fprotobuf_2fdescriptor_2eproto;
-};
-// -------------------------------------------------------------------
-
-class PROTOBUF_EXPORT EnumValueDescriptorProto final :
-    public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:google.protobuf.EnumValueDescriptorProto) */ {
- public:
-  inline EnumValueDescriptorProto() : EnumValueDescriptorProto(nullptr) {}
-  ~EnumValueDescriptorProto() override;
-  explicit PROTOBUF_CONSTEXPR EnumValueDescriptorProto(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
-
-  EnumValueDescriptorProto(const EnumValueDescriptorProto& from);
-  EnumValueDescriptorProto(EnumValueDescriptorProto&& from) noexcept
-    : EnumValueDescriptorProto() {
-    *this = ::std::move(from);
-  }
-
-  inline EnumValueDescriptorProto& operator=(const EnumValueDescriptorProto& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline EnumValueDescriptorProto& operator=(EnumValueDescriptorProto&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetOwningArena() == from.GetOwningArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetOwningArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::PROTOBUF_NAMESPACE_ID::UnknownFieldSet& unknown_fields() const {
-    return _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance);
-  }
-  inline ::PROTOBUF_NAMESPACE_ID::UnknownFieldSet* mutable_unknown_fields() {
-    return _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>();
-  }
-
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const EnumValueDescriptorProto& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const EnumValueDescriptorProto* internal_default_instance() {
-    return reinterpret_cast<const EnumValueDescriptorProto*>(
-               &_EnumValueDescriptorProto_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    10;
-
-  friend void swap(EnumValueDescriptorProto& a, EnumValueDescriptorProto& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(EnumValueDescriptorProto* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() != nullptr &&
-        GetOwningArena() == other->GetOwningArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() == other->GetOwningArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(EnumValueDescriptorProto* other) {
-    if (other == this) return;
-    GOOGLE_DCHECK(GetOwningArena() == other->GetOwningArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  EnumValueDescriptorProto* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<EnumValueDescriptorProto>(arena);
-  }
-  using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
-  void CopyFrom(const EnumValueDescriptorProto& from);
-  using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom( const EnumValueDescriptorProto& from) {
-    EnumValueDescriptorProto::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  uint8_t* _InternalSerialize(
-      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
-
-  private:
-  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
-  void SharedDtor();
-  void SetCachedSize(int size) const final;
-  void InternalSwap(EnumValueDescriptorProto* other);
-
-  private:
-  friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
-  static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
-    return "google.protobuf.EnumValueDescriptorProto";
-  }
-  protected:
-  explicit EnumValueDescriptorProto(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                       bool is_message_owned = false);
-  public:
-
-  static const ClassData _class_data_;
-  const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*GetClassData() const final;
-
-  ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kNameFieldNumber = 1,
-    kOptionsFieldNumber = 3,
-    kNumberFieldNumber = 2,
-  };
-  // optional string name = 1;
-  bool has_name() const;
-  private:
-  bool _internal_has_name() const;
-  public:
-  void clear_name();
-  const std::string& name() const;
-  template <typename ArgT0 = const std::string&, typename... ArgT>
-  void set_name(ArgT0&& arg0, ArgT... args);
-  std::string* mutable_name();
-  PROTOBUF_NODISCARD std::string* release_name();
-  void set_allocated_name(std::string* name);
-  private:
-  const std::string& _internal_name() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_name(const std::string& value);
-  std::string* _internal_mutable_name();
-  public:
-
-  // optional .google.protobuf.EnumValueOptions options = 3;
-  bool has_options() const;
-  private:
-  bool _internal_has_options() const;
-  public:
-  void clear_options();
-  const ::PROTOBUF_NAMESPACE_ID::EnumValueOptions& options() const;
-  PROTOBUF_NODISCARD ::PROTOBUF_NAMESPACE_ID::EnumValueOptions* release_options();
-  ::PROTOBUF_NAMESPACE_ID::EnumValueOptions* mutable_options();
-  void set_allocated_options(::PROTOBUF_NAMESPACE_ID::EnumValueOptions* options);
-  private:
-  const ::PROTOBUF_NAMESPACE_ID::EnumValueOptions& _internal_options() const;
-  ::PROTOBUF_NAMESPACE_ID::EnumValueOptions* _internal_mutable_options();
-  public:
-  void unsafe_arena_set_allocated_options(
-      ::PROTOBUF_NAMESPACE_ID::EnumValueOptions* options);
-  ::PROTOBUF_NAMESPACE_ID::EnumValueOptions* unsafe_arena_release_options();
-
-  // optional int32 number = 2;
-  bool has_number() const;
-  private:
-  bool _internal_has_number() const;
-  public:
-  void clear_number();
-  int32_t number() const;
-  void set_number(int32_t value);
-  private:
-  int32_t _internal_number() const;
-  void _internal_set_number(int32_t value);
-  public:
-
-  // @@protoc_insertion_point(class_scope:google.protobuf.EnumValueDescriptorProto)
- private:
-  class _Internal;
-
-  template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
-  typedef void InternalArenaConstructable_;
-  typedef void DestructorSkippable_;
-  struct Impl_ {
-    ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
-    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr name_;
-    ::PROTOBUF_NAMESPACE_ID::EnumValueOptions* options_;
-    int32_t number_;
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_google_2fprotobuf_2fdescriptor_2eproto;
-};
-// -------------------------------------------------------------------
-
-class PROTOBUF_EXPORT ServiceDescriptorProto final :
-    public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:google.protobuf.ServiceDescriptorProto) */ {
- public:
-  inline ServiceDescriptorProto() : ServiceDescriptorProto(nullptr) {}
-  ~ServiceDescriptorProto() override;
-  explicit PROTOBUF_CONSTEXPR ServiceDescriptorProto(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
-
-  ServiceDescriptorProto(const ServiceDescriptorProto& from);
-  ServiceDescriptorProto(ServiceDescriptorProto&& from) noexcept
-    : ServiceDescriptorProto() {
-    *this = ::std::move(from);
-  }
-
-  inline ServiceDescriptorProto& operator=(const ServiceDescriptorProto& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline ServiceDescriptorProto& operator=(ServiceDescriptorProto&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetOwningArena() == from.GetOwningArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetOwningArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::PROTOBUF_NAMESPACE_ID::UnknownFieldSet& unknown_fields() const {
-    return _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance);
-  }
-  inline ::PROTOBUF_NAMESPACE_ID::UnknownFieldSet* mutable_unknown_fields() {
-    return _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>();
-  }
-
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const ServiceDescriptorProto& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const ServiceDescriptorProto* internal_default_instance() {
-    return reinterpret_cast<const ServiceDescriptorProto*>(
-               &_ServiceDescriptorProto_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    11;
-
-  friend void swap(ServiceDescriptorProto& a, ServiceDescriptorProto& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(ServiceDescriptorProto* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() != nullptr &&
-        GetOwningArena() == other->GetOwningArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() == other->GetOwningArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(ServiceDescriptorProto* other) {
-    if (other == this) return;
-    GOOGLE_DCHECK(GetOwningArena() == other->GetOwningArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  ServiceDescriptorProto* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<ServiceDescriptorProto>(arena);
-  }
-  using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
-  void CopyFrom(const ServiceDescriptorProto& from);
-  using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom( const ServiceDescriptorProto& from) {
-    ServiceDescriptorProto::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  uint8_t* _InternalSerialize(
-      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
-
-  private:
-  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
-  void SharedDtor();
-  void SetCachedSize(int size) const final;
-  void InternalSwap(ServiceDescriptorProto* other);
-
-  private:
-  friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
-  static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
-    return "google.protobuf.ServiceDescriptorProto";
-  }
-  protected:
-  explicit ServiceDescriptorProto(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                       bool is_message_owned = false);
-  public:
-
-  static const ClassData _class_data_;
-  const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*GetClassData() const final;
-
-  ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kMethodFieldNumber = 2,
-    kNameFieldNumber = 1,
-    kOptionsFieldNumber = 3,
-  };
-  // repeated .google.protobuf.MethodDescriptorProto method = 2;
-  int method_size() const;
-  private:
-  int _internal_method_size() const;
-  public:
-  void clear_method();
-  ::PROTOBUF_NAMESPACE_ID::MethodDescriptorProto* mutable_method(int index);
-  ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::MethodDescriptorProto >*
-      mutable_method();
-  private:
-  const ::PROTOBUF_NAMESPACE_ID::MethodDescriptorProto& _internal_method(int index) const;
-  ::PROTOBUF_NAMESPACE_ID::MethodDescriptorProto* _internal_add_method();
-  public:
-  const ::PROTOBUF_NAMESPACE_ID::MethodDescriptorProto& method(int index) const;
-  ::PROTOBUF_NAMESPACE_ID::MethodDescriptorProto* add_method();
-  const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::MethodDescriptorProto >&
-      method() const;
-
-  // optional string name = 1;
-  bool has_name() const;
-  private:
-  bool _internal_has_name() const;
-  public:
-  void clear_name();
-  const std::string& name() const;
-  template <typename ArgT0 = const std::string&, typename... ArgT>
-  void set_name(ArgT0&& arg0, ArgT... args);
-  std::string* mutable_name();
-  PROTOBUF_NODISCARD std::string* release_name();
-  void set_allocated_name(std::string* name);
-  private:
-  const std::string& _internal_name() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_name(const std::string& value);
-  std::string* _internal_mutable_name();
-  public:
-
-  // optional .google.protobuf.ServiceOptions options = 3;
-  bool has_options() const;
-  private:
-  bool _internal_has_options() const;
-  public:
-  void clear_options();
-  const ::PROTOBUF_NAMESPACE_ID::ServiceOptions& options() const;
-  PROTOBUF_NODISCARD ::PROTOBUF_NAMESPACE_ID::ServiceOptions* release_options();
-  ::PROTOBUF_NAMESPACE_ID::ServiceOptions* mutable_options();
-  void set_allocated_options(::PROTOBUF_NAMESPACE_ID::ServiceOptions* options);
-  private:
-  const ::PROTOBUF_NAMESPACE_ID::ServiceOptions& _internal_options() const;
-  ::PROTOBUF_NAMESPACE_ID::ServiceOptions* _internal_mutable_options();
-  public:
-  void unsafe_arena_set_allocated_options(
-      ::PROTOBUF_NAMESPACE_ID::ServiceOptions* options);
-  ::PROTOBUF_NAMESPACE_ID::ServiceOptions* unsafe_arena_release_options();
-
-  // @@protoc_insertion_point(class_scope:google.protobuf.ServiceDescriptorProto)
- private:
-  class _Internal;
-
-  template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
-  typedef void InternalArenaConstructable_;
-  typedef void DestructorSkippable_;
-  struct Impl_ {
-    ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
-    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-    ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::MethodDescriptorProto > method_;
-    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr name_;
-    ::PROTOBUF_NAMESPACE_ID::ServiceOptions* options_;
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_google_2fprotobuf_2fdescriptor_2eproto;
-};
-// -------------------------------------------------------------------
-
-class PROTOBUF_EXPORT MethodDescriptorProto final :
-    public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:google.protobuf.MethodDescriptorProto) */ {
- public:
-  inline MethodDescriptorProto() : MethodDescriptorProto(nullptr) {}
-  ~MethodDescriptorProto() override;
-  explicit PROTOBUF_CONSTEXPR MethodDescriptorProto(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
-
-  MethodDescriptorProto(const MethodDescriptorProto& from);
-  MethodDescriptorProto(MethodDescriptorProto&& from) noexcept
-    : MethodDescriptorProto() {
-    *this = ::std::move(from);
-  }
-
-  inline MethodDescriptorProto& operator=(const MethodDescriptorProto& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline MethodDescriptorProto& operator=(MethodDescriptorProto&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetOwningArena() == from.GetOwningArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetOwningArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::PROTOBUF_NAMESPACE_ID::UnknownFieldSet& unknown_fields() const {
-    return _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance);
-  }
-  inline ::PROTOBUF_NAMESPACE_ID::UnknownFieldSet* mutable_unknown_fields() {
-    return _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>();
-  }
-
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const MethodDescriptorProto& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const MethodDescriptorProto* internal_default_instance() {
-    return reinterpret_cast<const MethodDescriptorProto*>(
-               &_MethodDescriptorProto_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    12;
-
-  friend void swap(MethodDescriptorProto& a, MethodDescriptorProto& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(MethodDescriptorProto* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() != nullptr &&
-        GetOwningArena() == other->GetOwningArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() == other->GetOwningArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(MethodDescriptorProto* other) {
-    if (other == this) return;
-    GOOGLE_DCHECK(GetOwningArena() == other->GetOwningArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  MethodDescriptorProto* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<MethodDescriptorProto>(arena);
-  }
-  using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
-  void CopyFrom(const MethodDescriptorProto& from);
-  using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom( const MethodDescriptorProto& from) {
-    MethodDescriptorProto::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  uint8_t* _InternalSerialize(
-      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
-
-  private:
-  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
-  void SharedDtor();
-  void SetCachedSize(int size) const final;
-  void InternalSwap(MethodDescriptorProto* other);
-
-  private:
-  friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
-  static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
-    return "google.protobuf.MethodDescriptorProto";
-  }
-  protected:
-  explicit MethodDescriptorProto(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                       bool is_message_owned = false);
-  public:
-
-  static const ClassData _class_data_;
-  const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*GetClassData() const final;
-
-  ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kNameFieldNumber = 1,
-    kInputTypeFieldNumber = 2,
-    kOutputTypeFieldNumber = 3,
-    kOptionsFieldNumber = 4,
-    kClientStreamingFieldNumber = 5,
-    kServerStreamingFieldNumber = 6,
-  };
-  // optional string name = 1;
-  bool has_name() const;
-  private:
-  bool _internal_has_name() const;
-  public:
-  void clear_name();
-  const std::string& name() const;
-  template <typename ArgT0 = const std::string&, typename... ArgT>
-  void set_name(ArgT0&& arg0, ArgT... args);
-  std::string* mutable_name();
-  PROTOBUF_NODISCARD std::string* release_name();
-  void set_allocated_name(std::string* name);
-  private:
-  const std::string& _internal_name() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_name(const std::string& value);
-  std::string* _internal_mutable_name();
-  public:
-
-  // optional string input_type = 2;
-  bool has_input_type() const;
-  private:
-  bool _internal_has_input_type() const;
-  public:
-  void clear_input_type();
-  const std::string& input_type() const;
-  template <typename ArgT0 = const std::string&, typename... ArgT>
-  void set_input_type(ArgT0&& arg0, ArgT... args);
-  std::string* mutable_input_type();
-  PROTOBUF_NODISCARD std::string* release_input_type();
-  void set_allocated_input_type(std::string* input_type);
-  private:
-  const std::string& _internal_input_type() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_input_type(const std::string& value);
-  std::string* _internal_mutable_input_type();
-  public:
-
-  // optional string output_type = 3;
-  bool has_output_type() const;
-  private:
-  bool _internal_has_output_type() const;
-  public:
-  void clear_output_type();
-  const std::string& output_type() const;
-  template <typename ArgT0 = const std::string&, typename... ArgT>
-  void set_output_type(ArgT0&& arg0, ArgT... args);
-  std::string* mutable_output_type();
-  PROTOBUF_NODISCARD std::string* release_output_type();
-  void set_allocated_output_type(std::string* output_type);
-  private:
-  const std::string& _internal_output_type() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_output_type(const std::string& value);
-  std::string* _internal_mutable_output_type();
-  public:
-
-  // optional .google.protobuf.MethodOptions options = 4;
-  bool has_options() const;
-  private:
-  bool _internal_has_options() const;
-  public:
-  void clear_options();
-  const ::PROTOBUF_NAMESPACE_ID::MethodOptions& options() const;
-  PROTOBUF_NODISCARD ::PROTOBUF_NAMESPACE_ID::MethodOptions* release_options();
-  ::PROTOBUF_NAMESPACE_ID::MethodOptions* mutable_options();
-  void set_allocated_options(::PROTOBUF_NAMESPACE_ID::MethodOptions* options);
-  private:
-  const ::PROTOBUF_NAMESPACE_ID::MethodOptions& _internal_options() const;
-  ::PROTOBUF_NAMESPACE_ID::MethodOptions* _internal_mutable_options();
-  public:
-  void unsafe_arena_set_allocated_options(
-      ::PROTOBUF_NAMESPACE_ID::MethodOptions* options);
-  ::PROTOBUF_NAMESPACE_ID::MethodOptions* unsafe_arena_release_options();
-
-  // optional bool client_streaming = 5 [default = false];
-  bool has_client_streaming() const;
-  private:
-  bool _internal_has_client_streaming() const;
-  public:
-  void clear_client_streaming();
-  bool client_streaming() const;
-  void set_client_streaming(bool value);
-  private:
-  bool _internal_client_streaming() const;
-  void _internal_set_client_streaming(bool value);
-  public:
-
-  // optional bool server_streaming = 6 [default = false];
-  bool has_server_streaming() const;
-  private:
-  bool _internal_has_server_streaming() const;
-  public:
-  void clear_server_streaming();
-  bool server_streaming() const;
-  void set_server_streaming(bool value);
-  private:
-  bool _internal_server_streaming() const;
-  void _internal_set_server_streaming(bool value);
-  public:
-
-  // @@protoc_insertion_point(class_scope:google.protobuf.MethodDescriptorProto)
- private:
-  class _Internal;
-
-  template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
-  typedef void InternalArenaConstructable_;
-  typedef void DestructorSkippable_;
-  struct Impl_ {
-    ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
-    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr name_;
-    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr input_type_;
-    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr output_type_;
-    ::PROTOBUF_NAMESPACE_ID::MethodOptions* options_;
-    bool client_streaming_;
-    bool server_streaming_;
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_google_2fprotobuf_2fdescriptor_2eproto;
-};
-// -------------------------------------------------------------------
-
-class PROTOBUF_EXPORT FileOptions final :
-    public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:google.protobuf.FileOptions) */ {
- public:
-  inline FileOptions() : FileOptions(nullptr) {}
-  ~FileOptions() override;
-  explicit PROTOBUF_CONSTEXPR FileOptions(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
-
-  FileOptions(const FileOptions& from);
-  FileOptions(FileOptions&& from) noexcept
-    : FileOptions() {
-    *this = ::std::move(from);
-  }
-
-  inline FileOptions& operator=(const FileOptions& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline FileOptions& operator=(FileOptions&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetOwningArena() == from.GetOwningArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetOwningArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::PROTOBUF_NAMESPACE_ID::UnknownFieldSet& unknown_fields() const {
-    return _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance);
-  }
-  inline ::PROTOBUF_NAMESPACE_ID::UnknownFieldSet* mutable_unknown_fields() {
-    return _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>();
-  }
-
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const FileOptions& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const FileOptions* internal_default_instance() {
-    return reinterpret_cast<const FileOptions*>(
-               &_FileOptions_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    13;
-
-  friend void swap(FileOptions& a, FileOptions& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(FileOptions* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() != nullptr &&
-        GetOwningArena() == other->GetOwningArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() == other->GetOwningArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(FileOptions* other) {
-    if (other == this) return;
-    GOOGLE_DCHECK(GetOwningArena() == other->GetOwningArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  FileOptions* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<FileOptions>(arena);
-  }
-  using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
-  void CopyFrom(const FileOptions& from);
-  using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom( const FileOptions& from) {
-    FileOptions::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  uint8_t* _InternalSerialize(
-      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
-
-  private:
-  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
-  void SharedDtor();
-  void SetCachedSize(int size) const final;
-  void InternalSwap(FileOptions* other);
-
-  private:
-  friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
-  static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
-    return "google.protobuf.FileOptions";
-  }
-  protected:
-  explicit FileOptions(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                       bool is_message_owned = false);
-  public:
-
-  static const ClassData _class_data_;
-  const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*GetClassData() const final;
-
-  ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  typedef FileOptions_OptimizeMode OptimizeMode;
-  static constexpr OptimizeMode SPEED =
-    FileOptions_OptimizeMode_SPEED;
-  static constexpr OptimizeMode CODE_SIZE =
-    FileOptions_OptimizeMode_CODE_SIZE;
-  static constexpr OptimizeMode LITE_RUNTIME =
-    FileOptions_OptimizeMode_LITE_RUNTIME;
-  static inline bool OptimizeMode_IsValid(int value) {
-    return FileOptions_OptimizeMode_IsValid(value);
-  }
-  static constexpr OptimizeMode OptimizeMode_MIN =
-    FileOptions_OptimizeMode_OptimizeMode_MIN;
-  static constexpr OptimizeMode OptimizeMode_MAX =
-    FileOptions_OptimizeMode_OptimizeMode_MAX;
-  static constexpr int OptimizeMode_ARRAYSIZE =
-    FileOptions_OptimizeMode_OptimizeMode_ARRAYSIZE;
-  static inline const ::PROTOBUF_NAMESPACE_ID::EnumDescriptor*
-  OptimizeMode_descriptor() {
-    return FileOptions_OptimizeMode_descriptor();
-  }
-  template<typename T>
-  static inline const std::string& OptimizeMode_Name(T enum_t_value) {
-    static_assert(::std::is_same<T, OptimizeMode>::value ||
-      ::std::is_integral<T>::value,
-      "Incorrect type passed to function OptimizeMode_Name.");
-    return FileOptions_OptimizeMode_Name(enum_t_value);
-  }
-  static inline bool OptimizeMode_Parse(::PROTOBUF_NAMESPACE_ID::ConstStringParam name,
-      OptimizeMode* value) {
-    return FileOptions_OptimizeMode_Parse(name, value);
-  }
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kUninterpretedOptionFieldNumber = 999,
-    kJavaPackageFieldNumber = 1,
-    kJavaOuterClassnameFieldNumber = 8,
-    kGoPackageFieldNumber = 11,
-    kObjcClassPrefixFieldNumber = 36,
-    kCsharpNamespaceFieldNumber = 37,
-    kSwiftPrefixFieldNumber = 39,
-    kPhpClassPrefixFieldNumber = 40,
-    kPhpNamespaceFieldNumber = 41,
-    kPhpMetadataNamespaceFieldNumber = 44,
-    kRubyPackageFieldNumber = 45,
-    kJavaMultipleFilesFieldNumber = 10,
-    kJavaGenerateEqualsAndHashFieldNumber = 20,
-    kJavaStringCheckUtf8FieldNumber = 27,
-    kCcGenericServicesFieldNumber = 16,
-    kJavaGenericServicesFieldNumber = 17,
-    kPyGenericServicesFieldNumber = 18,
-    kPhpGenericServicesFieldNumber = 42,
-    kDeprecatedFieldNumber = 23,
-    kOptimizeForFieldNumber = 9,
-    kCcEnableArenasFieldNumber = 31,
-  };
-  // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
-  int uninterpreted_option_size() const;
-  private:
-  int _internal_uninterpreted_option_size() const;
-  public:
-  void clear_uninterpreted_option();
-  ::PROTOBUF_NAMESPACE_ID::UninterpretedOption* mutable_uninterpreted_option(int index);
-  ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::UninterpretedOption >*
-      mutable_uninterpreted_option();
-  private:
-  const ::PROTOBUF_NAMESPACE_ID::UninterpretedOption& _internal_uninterpreted_option(int index) const;
-  ::PROTOBUF_NAMESPACE_ID::UninterpretedOption* _internal_add_uninterpreted_option();
-  public:
-  const ::PROTOBUF_NAMESPACE_ID::UninterpretedOption& uninterpreted_option(int index) const;
-  ::PROTOBUF_NAMESPACE_ID::UninterpretedOption* add_uninterpreted_option();
-  const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::UninterpretedOption >&
-      uninterpreted_option() const;
-
-  // optional string java_package = 1;
-  bool has_java_package() const;
-  private:
-  bool _internal_has_java_package() const;
-  public:
-  void clear_java_package();
-  const std::string& java_package() const;
-  template <typename ArgT0 = const std::string&, typename... ArgT>
-  void set_java_package(ArgT0&& arg0, ArgT... args);
-  std::string* mutable_java_package();
-  PROTOBUF_NODISCARD std::string* release_java_package();
-  void set_allocated_java_package(std::string* java_package);
-  private:
-  const std::string& _internal_java_package() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_java_package(const std::string& value);
-  std::string* _internal_mutable_java_package();
-  public:
-
-  // optional string java_outer_classname = 8;
-  bool has_java_outer_classname() const;
-  private:
-  bool _internal_has_java_outer_classname() const;
-  public:
-  void clear_java_outer_classname();
-  const std::string& java_outer_classname() const;
-  template <typename ArgT0 = const std::string&, typename... ArgT>
-  void set_java_outer_classname(ArgT0&& arg0, ArgT... args);
-  std::string* mutable_java_outer_classname();
-  PROTOBUF_NODISCARD std::string* release_java_outer_classname();
-  void set_allocated_java_outer_classname(std::string* java_outer_classname);
-  private:
-  const std::string& _internal_java_outer_classname() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_java_outer_classname(const std::string& value);
-  std::string* _internal_mutable_java_outer_classname();
-  public:
-
-  // optional string go_package = 11;
-  bool has_go_package() const;
-  private:
-  bool _internal_has_go_package() const;
-  public:
-  void clear_go_package();
-  const std::string& go_package() const;
-  template <typename ArgT0 = const std::string&, typename... ArgT>
-  void set_go_package(ArgT0&& arg0, ArgT... args);
-  std::string* mutable_go_package();
-  PROTOBUF_NODISCARD std::string* release_go_package();
-  void set_allocated_go_package(std::string* go_package);
-  private:
-  const std::string& _internal_go_package() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_go_package(const std::string& value);
-  std::string* _internal_mutable_go_package();
-  public:
-
-  // optional string objc_class_prefix = 36;
-  bool has_objc_class_prefix() const;
-  private:
-  bool _internal_has_objc_class_prefix() const;
-  public:
-  void clear_objc_class_prefix();
-  const std::string& objc_class_prefix() const;
-  template <typename ArgT0 = const std::string&, typename... ArgT>
-  void set_objc_class_prefix(ArgT0&& arg0, ArgT... args);
-  std::string* mutable_objc_class_prefix();
-  PROTOBUF_NODISCARD std::string* release_objc_class_prefix();
-  void set_allocated_objc_class_prefix(std::string* objc_class_prefix);
-  private:
-  const std::string& _internal_objc_class_prefix() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_objc_class_prefix(const std::string& value);
-  std::string* _internal_mutable_objc_class_prefix();
-  public:
-
-  // optional string csharp_namespace = 37;
-  bool has_csharp_namespace() const;
-  private:
-  bool _internal_has_csharp_namespace() const;
-  public:
-  void clear_csharp_namespace();
-  const std::string& csharp_namespace() const;
-  template <typename ArgT0 = const std::string&, typename... ArgT>
-  void set_csharp_namespace(ArgT0&& arg0, ArgT... args);
-  std::string* mutable_csharp_namespace();
-  PROTOBUF_NODISCARD std::string* release_csharp_namespace();
-  void set_allocated_csharp_namespace(std::string* csharp_namespace);
-  private:
-  const std::string& _internal_csharp_namespace() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_csharp_namespace(const std::string& value);
-  std::string* _internal_mutable_csharp_namespace();
-  public:
-
-  // optional string swift_prefix = 39;
-  bool has_swift_prefix() const;
-  private:
-  bool _internal_has_swift_prefix() const;
-  public:
-  void clear_swift_prefix();
-  const std::string& swift_prefix() const;
-  template <typename ArgT0 = const std::string&, typename... ArgT>
-  void set_swift_prefix(ArgT0&& arg0, ArgT... args);
-  std::string* mutable_swift_prefix();
-  PROTOBUF_NODISCARD std::string* release_swift_prefix();
-  void set_allocated_swift_prefix(std::string* swift_prefix);
-  private:
-  const std::string& _internal_swift_prefix() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_swift_prefix(const std::string& value);
-  std::string* _internal_mutable_swift_prefix();
-  public:
-
-  // optional string php_class_prefix = 40;
-  bool has_php_class_prefix() const;
-  private:
-  bool _internal_has_php_class_prefix() const;
-  public:
-  void clear_php_class_prefix();
-  const std::string& php_class_prefix() const;
-  template <typename ArgT0 = const std::string&, typename... ArgT>
-  void set_php_class_prefix(ArgT0&& arg0, ArgT... args);
-  std::string* mutable_php_class_prefix();
-  PROTOBUF_NODISCARD std::string* release_php_class_prefix();
-  void set_allocated_php_class_prefix(std::string* php_class_prefix);
-  private:
-  const std::string& _internal_php_class_prefix() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_php_class_prefix(const std::string& value);
-  std::string* _internal_mutable_php_class_prefix();
-  public:
-
-  // optional string php_namespace = 41;
-  bool has_php_namespace() const;
-  private:
-  bool _internal_has_php_namespace() const;
-  public:
-  void clear_php_namespace();
-  const std::string& php_namespace() const;
-  template <typename ArgT0 = const std::string&, typename... ArgT>
-  void set_php_namespace(ArgT0&& arg0, ArgT... args);
-  std::string* mutable_php_namespace();
-  PROTOBUF_NODISCARD std::string* release_php_namespace();
-  void set_allocated_php_namespace(std::string* php_namespace);
-  private:
-  const std::string& _internal_php_namespace() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_php_namespace(const std::string& value);
-  std::string* _internal_mutable_php_namespace();
-  public:
-
-  // optional string php_metadata_namespace = 44;
-  bool has_php_metadata_namespace() const;
-  private:
-  bool _internal_has_php_metadata_namespace() const;
-  public:
-  void clear_php_metadata_namespace();
-  const std::string& php_metadata_namespace() const;
-  template <typename ArgT0 = const std::string&, typename... ArgT>
-  void set_php_metadata_namespace(ArgT0&& arg0, ArgT... args);
-  std::string* mutable_php_metadata_namespace();
-  PROTOBUF_NODISCARD std::string* release_php_metadata_namespace();
-  void set_allocated_php_metadata_namespace(std::string* php_metadata_namespace);
-  private:
-  const std::string& _internal_php_metadata_namespace() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_php_metadata_namespace(const std::string& value);
-  std::string* _internal_mutable_php_metadata_namespace();
-  public:
-
-  // optional string ruby_package = 45;
-  bool has_ruby_package() const;
-  private:
-  bool _internal_has_ruby_package() const;
-  public:
-  void clear_ruby_package();
-  const std::string& ruby_package() const;
-  template <typename ArgT0 = const std::string&, typename... ArgT>
-  void set_ruby_package(ArgT0&& arg0, ArgT... args);
-  std::string* mutable_ruby_package();
-  PROTOBUF_NODISCARD std::string* release_ruby_package();
-  void set_allocated_ruby_package(std::string* ruby_package);
-  private:
-  const std::string& _internal_ruby_package() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_ruby_package(const std::string& value);
-  std::string* _internal_mutable_ruby_package();
-  public:
-
-  // optional bool java_multiple_files = 10 [default = false];
-  bool has_java_multiple_files() const;
-  private:
-  bool _internal_has_java_multiple_files() const;
-  public:
-  void clear_java_multiple_files();
-  bool java_multiple_files() const;
-  void set_java_multiple_files(bool value);
-  private:
-  bool _internal_java_multiple_files() const;
-  void _internal_set_java_multiple_files(bool value);
-  public:
-
-  // optional bool java_generate_equals_and_hash = 20 [deprecated = true];
-  PROTOBUF_DEPRECATED bool has_java_generate_equals_and_hash() const;
-  private:
-  bool _internal_has_java_generate_equals_and_hash() const;
-  public:
-  PROTOBUF_DEPRECATED void clear_java_generate_equals_and_hash();
-  PROTOBUF_DEPRECATED bool java_generate_equals_and_hash() const;
-  PROTOBUF_DEPRECATED void set_java_generate_equals_and_hash(bool value);
-  private:
-  bool _internal_java_generate_equals_and_hash() const;
-  void _internal_set_java_generate_equals_and_hash(bool value);
-  public:
-
-  // optional bool java_string_check_utf8 = 27 [default = false];
-  bool has_java_string_check_utf8() const;
-  private:
-  bool _internal_has_java_string_check_utf8() const;
-  public:
-  void clear_java_string_check_utf8();
-  bool java_string_check_utf8() const;
-  void set_java_string_check_utf8(bool value);
-  private:
-  bool _internal_java_string_check_utf8() const;
-  void _internal_set_java_string_check_utf8(bool value);
-  public:
-
-  // optional bool cc_generic_services = 16 [default = false];
-  bool has_cc_generic_services() const;
-  private:
-  bool _internal_has_cc_generic_services() const;
-  public:
-  void clear_cc_generic_services();
-  bool cc_generic_services() const;
-  void set_cc_generic_services(bool value);
-  private:
-  bool _internal_cc_generic_services() const;
-  void _internal_set_cc_generic_services(bool value);
-  public:
-
-  // optional bool java_generic_services = 17 [default = false];
-  bool has_java_generic_services() const;
-  private:
-  bool _internal_has_java_generic_services() const;
-  public:
-  void clear_java_generic_services();
-  bool java_generic_services() const;
-  void set_java_generic_services(bool value);
-  private:
-  bool _internal_java_generic_services() const;
-  void _internal_set_java_generic_services(bool value);
-  public:
-
-  // optional bool py_generic_services = 18 [default = false];
-  bool has_py_generic_services() const;
-  private:
-  bool _internal_has_py_generic_services() const;
-  public:
-  void clear_py_generic_services();
-  bool py_generic_services() const;
-  void set_py_generic_services(bool value);
-  private:
-  bool _internal_py_generic_services() const;
-  void _internal_set_py_generic_services(bool value);
-  public:
-
-  // optional bool php_generic_services = 42 [default = false];
-  bool has_php_generic_services() const;
-  private:
-  bool _internal_has_php_generic_services() const;
-  public:
-  void clear_php_generic_services();
-  bool php_generic_services() const;
-  void set_php_generic_services(bool value);
-  private:
-  bool _internal_php_generic_services() const;
-  void _internal_set_php_generic_services(bool value);
-  public:
-
-  // optional bool deprecated = 23 [default = false];
-  bool has_deprecated() const;
-  private:
-  bool _internal_has_deprecated() const;
-  public:
-  void clear_deprecated();
-  bool deprecated() const;
-  void set_deprecated(bool value);
-  private:
-  bool _internal_deprecated() const;
-  void _internal_set_deprecated(bool value);
-  public:
-
-  // optional .google.protobuf.FileOptions.OptimizeMode optimize_for = 9 [default = SPEED];
-  bool has_optimize_for() const;
-  private:
-  bool _internal_has_optimize_for() const;
-  public:
-  void clear_optimize_for();
-  ::PROTOBUF_NAMESPACE_ID::FileOptions_OptimizeMode optimize_for() const;
-  void set_optimize_for(::PROTOBUF_NAMESPACE_ID::FileOptions_OptimizeMode value);
-  private:
-  ::PROTOBUF_NAMESPACE_ID::FileOptions_OptimizeMode _internal_optimize_for() const;
-  void _internal_set_optimize_for(::PROTOBUF_NAMESPACE_ID::FileOptions_OptimizeMode value);
-  public:
-
-  // optional bool cc_enable_arenas = 31 [default = true];
-  bool has_cc_enable_arenas() const;
-  private:
-  bool _internal_has_cc_enable_arenas() const;
-  public:
-  void clear_cc_enable_arenas();
-  bool cc_enable_arenas() const;
-  void set_cc_enable_arenas(bool value);
-  private:
-  bool _internal_cc_enable_arenas() const;
-  void _internal_set_cc_enable_arenas(bool value);
-  public:
-
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline bool HasExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          FileOptions, _proto_TypeTraits, _field_type, _is_packed>& id) const {
-
-    return _impl_._extensions_.Has(id.number());
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline void ClearExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          FileOptions, _proto_TypeTraits, _field_type, _is_packed>& id) {
-    _impl_._extensions_.ClearExtension(id.number());
-
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline int ExtensionSize(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          FileOptions, _proto_TypeTraits, _field_type, _is_packed>& id) const {
-
-    return _impl_._extensions_.ExtensionSize(id.number());
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline typename _proto_TypeTraits::Singular::ConstType GetExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          FileOptions, _proto_TypeTraits, _field_type, _is_packed>& id) const {
-
-    return _proto_TypeTraits::Get(id.number(), _impl_._extensions_,
-                                  id.default_value());
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline typename _proto_TypeTraits::Singular::MutableType MutableExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          FileOptions, _proto_TypeTraits, _field_type, _is_packed>& id) {
-
-    return _proto_TypeTraits::Mutable(id.number(), _field_type,
-                                      &_impl_._extensions_);
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline void SetExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          FileOptions, _proto_TypeTraits, _field_type, _is_packed>& id,
-      typename _proto_TypeTraits::Singular::ConstType value) {
-    _proto_TypeTraits::Set(id.number(), _field_type, value, &_impl_._extensions_);
-
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline void SetAllocatedExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          FileOptions, _proto_TypeTraits, _field_type, _is_packed>& id,
-      typename _proto_TypeTraits::Singular::MutableType value) {
-    _proto_TypeTraits::SetAllocated(id.number(), _field_type, value,
-                                    &_impl_._extensions_);
-
-  }
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline void UnsafeArenaSetAllocatedExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          FileOptions, _proto_TypeTraits, _field_type, _is_packed>& id,
-      typename _proto_TypeTraits::Singular::MutableType value) {
-    _proto_TypeTraits::UnsafeArenaSetAllocated(id.number(), _field_type,
-                                               value, &_impl_._extensions_);
-
-  }
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  PROTOBUF_NODISCARD inline
-      typename _proto_TypeTraits::Singular::MutableType
-      ReleaseExtension(
-          const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-              FileOptions, _proto_TypeTraits, _field_type, _is_packed>& id) {
-
-    return _proto_TypeTraits::Release(id.number(), _field_type,
-                                      &_impl_._extensions_);
-  }
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline typename _proto_TypeTraits::Singular::MutableType
-  UnsafeArenaReleaseExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          FileOptions, _proto_TypeTraits, _field_type, _is_packed>& id) {
-
-    return _proto_TypeTraits::UnsafeArenaRelease(id.number(), _field_type,
-                                                 &_impl_._extensions_);
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline typename _proto_TypeTraits::Repeated::ConstType GetExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          FileOptions, _proto_TypeTraits, _field_type, _is_packed>& id,
-      int index) const {
-
-    return _proto_TypeTraits::Get(id.number(), _impl_._extensions_, index);
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline typename _proto_TypeTraits::Repeated::MutableType MutableExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          FileOptions, _proto_TypeTraits, _field_type, _is_packed>& id,
-      int index) {
-
-    return _proto_TypeTraits::Mutable(id.number(), index, &_impl_._extensions_);
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline void SetExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          FileOptions, _proto_TypeTraits, _field_type, _is_packed>& id,
-      int index, typename _proto_TypeTraits::Repeated::ConstType value) {
-    _proto_TypeTraits::Set(id.number(), index, value, &_impl_._extensions_);
-
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline typename _proto_TypeTraits::Repeated::MutableType AddExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          FileOptions, _proto_TypeTraits, _field_type, _is_packed>& id) {
-    typename _proto_TypeTraits::Repeated::MutableType to_add =
-        _proto_TypeTraits::Add(id.number(), _field_type, &_impl_._extensions_);
-
-    return to_add;
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline void AddExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          FileOptions, _proto_TypeTraits, _field_type, _is_packed>& id,
-      typename _proto_TypeTraits::Repeated::ConstType value) {
-    _proto_TypeTraits::Add(id.number(), _field_type, _is_packed, value,
-                           &_impl_._extensions_);
-
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline const typename _proto_TypeTraits::Repeated::RepeatedFieldType&
-  GetRepeatedExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          FileOptions, _proto_TypeTraits, _field_type, _is_packed>& id) const {
-
-    return _proto_TypeTraits::GetRepeated(id.number(), _impl_._extensions_);
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline typename _proto_TypeTraits::Repeated::RepeatedFieldType*
-  MutableRepeatedExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          FileOptions, _proto_TypeTraits, _field_type, _is_packed>& id) {
-
-    return _proto_TypeTraits::MutableRepeated(id.number(), _field_type,
-                                              _is_packed, &_impl_._extensions_);
-  }
-
-  // @@protoc_insertion_point(class_scope:google.protobuf.FileOptions)
- private:
-  class _Internal;
-
-  template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
-  typedef void InternalArenaConstructable_;
-  typedef void DestructorSkippable_;
-  struct Impl_ {
-    ::PROTOBUF_NAMESPACE_ID::internal::ExtensionSet _extensions_;
-
-    ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
-    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-    ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::UninterpretedOption > uninterpreted_option_;
-    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr java_package_;
-    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr java_outer_classname_;
-    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr go_package_;
-    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr objc_class_prefix_;
-    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr csharp_namespace_;
-    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr swift_prefix_;
-    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr php_class_prefix_;
-    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr php_namespace_;
-    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr php_metadata_namespace_;
-    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr ruby_package_;
-    bool java_multiple_files_;
-    bool java_generate_equals_and_hash_;
-    bool java_string_check_utf8_;
-    bool cc_generic_services_;
-    bool java_generic_services_;
-    bool py_generic_services_;
-    bool php_generic_services_;
-    bool deprecated_;
-    int optimize_for_;
-    bool cc_enable_arenas_;
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_google_2fprotobuf_2fdescriptor_2eproto;
-};
-// -------------------------------------------------------------------
-
-class PROTOBUF_EXPORT MessageOptions final :
-    public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:google.protobuf.MessageOptions) */ {
- public:
-  inline MessageOptions() : MessageOptions(nullptr) {}
-  ~MessageOptions() override;
-  explicit PROTOBUF_CONSTEXPR MessageOptions(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
-
-  MessageOptions(const MessageOptions& from);
-  MessageOptions(MessageOptions&& from) noexcept
-    : MessageOptions() {
-    *this = ::std::move(from);
-  }
-
-  inline MessageOptions& operator=(const MessageOptions& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline MessageOptions& operator=(MessageOptions&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetOwningArena() == from.GetOwningArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetOwningArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::PROTOBUF_NAMESPACE_ID::UnknownFieldSet& unknown_fields() const {
-    return _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance);
-  }
-  inline ::PROTOBUF_NAMESPACE_ID::UnknownFieldSet* mutable_unknown_fields() {
-    return _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>();
-  }
-
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const MessageOptions& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const MessageOptions* internal_default_instance() {
-    return reinterpret_cast<const MessageOptions*>(
-               &_MessageOptions_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    14;
-
-  friend void swap(MessageOptions& a, MessageOptions& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(MessageOptions* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() != nullptr &&
-        GetOwningArena() == other->GetOwningArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() == other->GetOwningArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(MessageOptions* other) {
-    if (other == this) return;
-    GOOGLE_DCHECK(GetOwningArena() == other->GetOwningArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  MessageOptions* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<MessageOptions>(arena);
-  }
-  using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
-  void CopyFrom(const MessageOptions& from);
-  using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom( const MessageOptions& from) {
-    MessageOptions::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  uint8_t* _InternalSerialize(
-      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
-
-  private:
-  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
-  void SharedDtor();
-  void SetCachedSize(int size) const final;
-  void InternalSwap(MessageOptions* other);
-
-  private:
-  friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
-  static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
-    return "google.protobuf.MessageOptions";
-  }
-  protected:
-  explicit MessageOptions(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                       bool is_message_owned = false);
-  public:
-
-  static const ClassData _class_data_;
-  const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*GetClassData() const final;
-
-  ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kUninterpretedOptionFieldNumber = 999,
-    kMessageSetWireFormatFieldNumber = 1,
-    kNoStandardDescriptorAccessorFieldNumber = 2,
-    kDeprecatedFieldNumber = 3,
-    kMapEntryFieldNumber = 7,
-  };
-  // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
-  int uninterpreted_option_size() const;
-  private:
-  int _internal_uninterpreted_option_size() const;
-  public:
-  void clear_uninterpreted_option();
-  ::PROTOBUF_NAMESPACE_ID::UninterpretedOption* mutable_uninterpreted_option(int index);
-  ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::UninterpretedOption >*
-      mutable_uninterpreted_option();
-  private:
-  const ::PROTOBUF_NAMESPACE_ID::UninterpretedOption& _internal_uninterpreted_option(int index) const;
-  ::PROTOBUF_NAMESPACE_ID::UninterpretedOption* _internal_add_uninterpreted_option();
-  public:
-  const ::PROTOBUF_NAMESPACE_ID::UninterpretedOption& uninterpreted_option(int index) const;
-  ::PROTOBUF_NAMESPACE_ID::UninterpretedOption* add_uninterpreted_option();
-  const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::UninterpretedOption >&
-      uninterpreted_option() const;
-
-  // optional bool message_set_wire_format = 1 [default = false];
-  bool has_message_set_wire_format() const;
-  private:
-  bool _internal_has_message_set_wire_format() const;
-  public:
-  void clear_message_set_wire_format();
-  bool message_set_wire_format() const;
-  void set_message_set_wire_format(bool value);
-  private:
-  bool _internal_message_set_wire_format() const;
-  void _internal_set_message_set_wire_format(bool value);
-  public:
-
-  // optional bool no_standard_descriptor_accessor = 2 [default = false];
-  bool has_no_standard_descriptor_accessor() const;
-  private:
-  bool _internal_has_no_standard_descriptor_accessor() const;
-  public:
-  void clear_no_standard_descriptor_accessor();
-  bool no_standard_descriptor_accessor() const;
-  void set_no_standard_descriptor_accessor(bool value);
-  private:
-  bool _internal_no_standard_descriptor_accessor() const;
-  void _internal_set_no_standard_descriptor_accessor(bool value);
-  public:
-
-  // optional bool deprecated = 3 [default = false];
-  bool has_deprecated() const;
-  private:
-  bool _internal_has_deprecated() const;
-  public:
-  void clear_deprecated();
-  bool deprecated() const;
-  void set_deprecated(bool value);
-  private:
-  bool _internal_deprecated() const;
-  void _internal_set_deprecated(bool value);
-  public:
-
-  // optional bool map_entry = 7;
-  bool has_map_entry() const;
-  private:
-  bool _internal_has_map_entry() const;
-  public:
-  void clear_map_entry();
-  bool map_entry() const;
-  void set_map_entry(bool value);
-  private:
-  bool _internal_map_entry() const;
-  void _internal_set_map_entry(bool value);
-  public:
-
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline bool HasExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          MessageOptions, _proto_TypeTraits, _field_type, _is_packed>& id) const {
-
-    return _impl_._extensions_.Has(id.number());
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline void ClearExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          MessageOptions, _proto_TypeTraits, _field_type, _is_packed>& id) {
-    _impl_._extensions_.ClearExtension(id.number());
-
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline int ExtensionSize(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          MessageOptions, _proto_TypeTraits, _field_type, _is_packed>& id) const {
-
-    return _impl_._extensions_.ExtensionSize(id.number());
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline typename _proto_TypeTraits::Singular::ConstType GetExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          MessageOptions, _proto_TypeTraits, _field_type, _is_packed>& id) const {
-
-    return _proto_TypeTraits::Get(id.number(), _impl_._extensions_,
-                                  id.default_value());
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline typename _proto_TypeTraits::Singular::MutableType MutableExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          MessageOptions, _proto_TypeTraits, _field_type, _is_packed>& id) {
-
-    return _proto_TypeTraits::Mutable(id.number(), _field_type,
-                                      &_impl_._extensions_);
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline void SetExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          MessageOptions, _proto_TypeTraits, _field_type, _is_packed>& id,
-      typename _proto_TypeTraits::Singular::ConstType value) {
-    _proto_TypeTraits::Set(id.number(), _field_type, value, &_impl_._extensions_);
-
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline void SetAllocatedExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          MessageOptions, _proto_TypeTraits, _field_type, _is_packed>& id,
-      typename _proto_TypeTraits::Singular::MutableType value) {
-    _proto_TypeTraits::SetAllocated(id.number(), _field_type, value,
-                                    &_impl_._extensions_);
-
-  }
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline void UnsafeArenaSetAllocatedExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          MessageOptions, _proto_TypeTraits, _field_type, _is_packed>& id,
-      typename _proto_TypeTraits::Singular::MutableType value) {
-    _proto_TypeTraits::UnsafeArenaSetAllocated(id.number(), _field_type,
-                                               value, &_impl_._extensions_);
-
-  }
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  PROTOBUF_NODISCARD inline
-      typename _proto_TypeTraits::Singular::MutableType
-      ReleaseExtension(
-          const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-              MessageOptions, _proto_TypeTraits, _field_type, _is_packed>& id) {
-
-    return _proto_TypeTraits::Release(id.number(), _field_type,
-                                      &_impl_._extensions_);
-  }
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline typename _proto_TypeTraits::Singular::MutableType
-  UnsafeArenaReleaseExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          MessageOptions, _proto_TypeTraits, _field_type, _is_packed>& id) {
-
-    return _proto_TypeTraits::UnsafeArenaRelease(id.number(), _field_type,
-                                                 &_impl_._extensions_);
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline typename _proto_TypeTraits::Repeated::ConstType GetExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          MessageOptions, _proto_TypeTraits, _field_type, _is_packed>& id,
-      int index) const {
-
-    return _proto_TypeTraits::Get(id.number(), _impl_._extensions_, index);
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline typename _proto_TypeTraits::Repeated::MutableType MutableExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          MessageOptions, _proto_TypeTraits, _field_type, _is_packed>& id,
-      int index) {
-
-    return _proto_TypeTraits::Mutable(id.number(), index, &_impl_._extensions_);
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline void SetExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          MessageOptions, _proto_TypeTraits, _field_type, _is_packed>& id,
-      int index, typename _proto_TypeTraits::Repeated::ConstType value) {
-    _proto_TypeTraits::Set(id.number(), index, value, &_impl_._extensions_);
-
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline typename _proto_TypeTraits::Repeated::MutableType AddExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          MessageOptions, _proto_TypeTraits, _field_type, _is_packed>& id) {
-    typename _proto_TypeTraits::Repeated::MutableType to_add =
-        _proto_TypeTraits::Add(id.number(), _field_type, &_impl_._extensions_);
-
-    return to_add;
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline void AddExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          MessageOptions, _proto_TypeTraits, _field_type, _is_packed>& id,
-      typename _proto_TypeTraits::Repeated::ConstType value) {
-    _proto_TypeTraits::Add(id.number(), _field_type, _is_packed, value,
-                           &_impl_._extensions_);
-
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline const typename _proto_TypeTraits::Repeated::RepeatedFieldType&
-  GetRepeatedExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          MessageOptions, _proto_TypeTraits, _field_type, _is_packed>& id) const {
-
-    return _proto_TypeTraits::GetRepeated(id.number(), _impl_._extensions_);
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline typename _proto_TypeTraits::Repeated::RepeatedFieldType*
-  MutableRepeatedExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          MessageOptions, _proto_TypeTraits, _field_type, _is_packed>& id) {
-
-    return _proto_TypeTraits::MutableRepeated(id.number(), _field_type,
-                                              _is_packed, &_impl_._extensions_);
-  }
-
-  // @@protoc_insertion_point(class_scope:google.protobuf.MessageOptions)
- private:
-  class _Internal;
-
-  template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
-  typedef void InternalArenaConstructable_;
-  typedef void DestructorSkippable_;
-  struct Impl_ {
-    ::PROTOBUF_NAMESPACE_ID::internal::ExtensionSet _extensions_;
-
-    ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
-    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-    ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::UninterpretedOption > uninterpreted_option_;
-    bool message_set_wire_format_;
-    bool no_standard_descriptor_accessor_;
-    bool deprecated_;
-    bool map_entry_;
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_google_2fprotobuf_2fdescriptor_2eproto;
-};
-// -------------------------------------------------------------------
-
-class PROTOBUF_EXPORT FieldOptions final :
-    public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:google.protobuf.FieldOptions) */ {
- public:
-  inline FieldOptions() : FieldOptions(nullptr) {}
-  ~FieldOptions() override;
-  explicit PROTOBUF_CONSTEXPR FieldOptions(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
-
-  FieldOptions(const FieldOptions& from);
-  FieldOptions(FieldOptions&& from) noexcept
-    : FieldOptions() {
-    *this = ::std::move(from);
-  }
-
-  inline FieldOptions& operator=(const FieldOptions& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline FieldOptions& operator=(FieldOptions&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetOwningArena() == from.GetOwningArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetOwningArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::PROTOBUF_NAMESPACE_ID::UnknownFieldSet& unknown_fields() const {
-    return _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance);
-  }
-  inline ::PROTOBUF_NAMESPACE_ID::UnknownFieldSet* mutable_unknown_fields() {
-    return _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>();
-  }
-
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const FieldOptions& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const FieldOptions* internal_default_instance() {
-    return reinterpret_cast<const FieldOptions*>(
-               &_FieldOptions_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    15;
-
-  friend void swap(FieldOptions& a, FieldOptions& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(FieldOptions* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() != nullptr &&
-        GetOwningArena() == other->GetOwningArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() == other->GetOwningArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(FieldOptions* other) {
-    if (other == this) return;
-    GOOGLE_DCHECK(GetOwningArena() == other->GetOwningArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  FieldOptions* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<FieldOptions>(arena);
-  }
-  using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
-  void CopyFrom(const FieldOptions& from);
-  using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom( const FieldOptions& from) {
-    FieldOptions::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  uint8_t* _InternalSerialize(
-      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
-
-  private:
-  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
-  void SharedDtor();
-  void SetCachedSize(int size) const final;
-  void InternalSwap(FieldOptions* other);
-
-  private:
-  friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
-  static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
-    return "google.protobuf.FieldOptions";
-  }
-  protected:
-  explicit FieldOptions(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                       bool is_message_owned = false);
-  public:
-
-  static const ClassData _class_data_;
-  const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*GetClassData() const final;
-
-  ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  typedef FieldOptions_CType CType;
-  static constexpr CType STRING =
-    FieldOptions_CType_STRING;
-  static constexpr CType CORD =
-    FieldOptions_CType_CORD;
-  static constexpr CType STRING_PIECE =
-    FieldOptions_CType_STRING_PIECE;
-  static inline bool CType_IsValid(int value) {
-    return FieldOptions_CType_IsValid(value);
-  }
-  static constexpr CType CType_MIN =
-    FieldOptions_CType_CType_MIN;
-  static constexpr CType CType_MAX =
-    FieldOptions_CType_CType_MAX;
-  static constexpr int CType_ARRAYSIZE =
-    FieldOptions_CType_CType_ARRAYSIZE;
-  static inline const ::PROTOBUF_NAMESPACE_ID::EnumDescriptor*
-  CType_descriptor() {
-    return FieldOptions_CType_descriptor();
-  }
-  template<typename T>
-  static inline const std::string& CType_Name(T enum_t_value) {
-    static_assert(::std::is_same<T, CType>::value ||
-      ::std::is_integral<T>::value,
-      "Incorrect type passed to function CType_Name.");
-    return FieldOptions_CType_Name(enum_t_value);
-  }
-  static inline bool CType_Parse(::PROTOBUF_NAMESPACE_ID::ConstStringParam name,
-      CType* value) {
-    return FieldOptions_CType_Parse(name, value);
-  }
-
-  typedef FieldOptions_JSType JSType;
-  static constexpr JSType JS_NORMAL =
-    FieldOptions_JSType_JS_NORMAL;
-  static constexpr JSType JS_STRING =
-    FieldOptions_JSType_JS_STRING;
-  static constexpr JSType JS_NUMBER =
-    FieldOptions_JSType_JS_NUMBER;
-  static inline bool JSType_IsValid(int value) {
-    return FieldOptions_JSType_IsValid(value);
-  }
-  static constexpr JSType JSType_MIN =
-    FieldOptions_JSType_JSType_MIN;
-  static constexpr JSType JSType_MAX =
-    FieldOptions_JSType_JSType_MAX;
-  static constexpr int JSType_ARRAYSIZE =
-    FieldOptions_JSType_JSType_ARRAYSIZE;
-  static inline const ::PROTOBUF_NAMESPACE_ID::EnumDescriptor*
-  JSType_descriptor() {
-    return FieldOptions_JSType_descriptor();
-  }
-  template<typename T>
-  static inline const std::string& JSType_Name(T enum_t_value) {
-    static_assert(::std::is_same<T, JSType>::value ||
-      ::std::is_integral<T>::value,
-      "Incorrect type passed to function JSType_Name.");
-    return FieldOptions_JSType_Name(enum_t_value);
-  }
-  static inline bool JSType_Parse(::PROTOBUF_NAMESPACE_ID::ConstStringParam name,
-      JSType* value) {
-    return FieldOptions_JSType_Parse(name, value);
-  }
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kUninterpretedOptionFieldNumber = 999,
-    kCtypeFieldNumber = 1,
-    kJstypeFieldNumber = 6,
-    kPackedFieldNumber = 2,
-    kLazyFieldNumber = 5,
-    kUnverifiedLazyFieldNumber = 15,
-    kDeprecatedFieldNumber = 3,
-    kWeakFieldNumber = 10,
-  };
-  // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
-  int uninterpreted_option_size() const;
-  private:
-  int _internal_uninterpreted_option_size() const;
-  public:
-  void clear_uninterpreted_option();
-  ::PROTOBUF_NAMESPACE_ID::UninterpretedOption* mutable_uninterpreted_option(int index);
-  ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::UninterpretedOption >*
-      mutable_uninterpreted_option();
-  private:
-  const ::PROTOBUF_NAMESPACE_ID::UninterpretedOption& _internal_uninterpreted_option(int index) const;
-  ::PROTOBUF_NAMESPACE_ID::UninterpretedOption* _internal_add_uninterpreted_option();
-  public:
-  const ::PROTOBUF_NAMESPACE_ID::UninterpretedOption& uninterpreted_option(int index) const;
-  ::PROTOBUF_NAMESPACE_ID::UninterpretedOption* add_uninterpreted_option();
-  const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::UninterpretedOption >&
-      uninterpreted_option() const;
-
-  // optional .google.protobuf.FieldOptions.CType ctype = 1 [default = STRING];
-  bool has_ctype() const;
-  private:
-  bool _internal_has_ctype() const;
-  public:
-  void clear_ctype();
-  ::PROTOBUF_NAMESPACE_ID::FieldOptions_CType ctype() const;
-  void set_ctype(::PROTOBUF_NAMESPACE_ID::FieldOptions_CType value);
-  private:
-  ::PROTOBUF_NAMESPACE_ID::FieldOptions_CType _internal_ctype() const;
-  void _internal_set_ctype(::PROTOBUF_NAMESPACE_ID::FieldOptions_CType value);
-  public:
-
-  // optional .google.protobuf.FieldOptions.JSType jstype = 6 [default = JS_NORMAL];
-  bool has_jstype() const;
-  private:
-  bool _internal_has_jstype() const;
-  public:
-  void clear_jstype();
-  ::PROTOBUF_NAMESPACE_ID::FieldOptions_JSType jstype() const;
-  void set_jstype(::PROTOBUF_NAMESPACE_ID::FieldOptions_JSType value);
-  private:
-  ::PROTOBUF_NAMESPACE_ID::FieldOptions_JSType _internal_jstype() const;
-  void _internal_set_jstype(::PROTOBUF_NAMESPACE_ID::FieldOptions_JSType value);
-  public:
-
-  // optional bool packed = 2;
-  bool has_packed() const;
-  private:
-  bool _internal_has_packed() const;
-  public:
-  void clear_packed();
-  bool packed() const;
-  void set_packed(bool value);
-  private:
-  bool _internal_packed() const;
-  void _internal_set_packed(bool value);
-  public:
-
-  // optional bool lazy = 5 [default = false];
-  bool has_lazy() const;
-  private:
-  bool _internal_has_lazy() const;
-  public:
-  void clear_lazy();
-  bool lazy() const;
-  void set_lazy(bool value);
-  private:
-  bool _internal_lazy() const;
-  void _internal_set_lazy(bool value);
-  public:
-
-  // optional bool unverified_lazy = 15 [default = false];
-  bool has_unverified_lazy() const;
-  private:
-  bool _internal_has_unverified_lazy() const;
-  public:
-  void clear_unverified_lazy();
-  bool unverified_lazy() const;
-  void set_unverified_lazy(bool value);
-  private:
-  bool _internal_unverified_lazy() const;
-  void _internal_set_unverified_lazy(bool value);
-  public:
-
-  // optional bool deprecated = 3 [default = false];
-  bool has_deprecated() const;
-  private:
-  bool _internal_has_deprecated() const;
-  public:
-  void clear_deprecated();
-  bool deprecated() const;
-  void set_deprecated(bool value);
-  private:
-  bool _internal_deprecated() const;
-  void _internal_set_deprecated(bool value);
-  public:
-
-  // optional bool weak = 10 [default = false];
-  bool has_weak() const;
-  private:
-  bool _internal_has_weak() const;
-  public:
-  void clear_weak();
-  bool weak() const;
-  void set_weak(bool value);
-  private:
-  bool _internal_weak() const;
-  void _internal_set_weak(bool value);
-  public:
-
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline bool HasExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          FieldOptions, _proto_TypeTraits, _field_type, _is_packed>& id) const {
-
-    return _impl_._extensions_.Has(id.number());
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline void ClearExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          FieldOptions, _proto_TypeTraits, _field_type, _is_packed>& id) {
-    _impl_._extensions_.ClearExtension(id.number());
-
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline int ExtensionSize(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          FieldOptions, _proto_TypeTraits, _field_type, _is_packed>& id) const {
-
-    return _impl_._extensions_.ExtensionSize(id.number());
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline typename _proto_TypeTraits::Singular::ConstType GetExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          FieldOptions, _proto_TypeTraits, _field_type, _is_packed>& id) const {
-
-    return _proto_TypeTraits::Get(id.number(), _impl_._extensions_,
-                                  id.default_value());
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline typename _proto_TypeTraits::Singular::MutableType MutableExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          FieldOptions, _proto_TypeTraits, _field_type, _is_packed>& id) {
-
-    return _proto_TypeTraits::Mutable(id.number(), _field_type,
-                                      &_impl_._extensions_);
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline void SetExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          FieldOptions, _proto_TypeTraits, _field_type, _is_packed>& id,
-      typename _proto_TypeTraits::Singular::ConstType value) {
-    _proto_TypeTraits::Set(id.number(), _field_type, value, &_impl_._extensions_);
-
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline void SetAllocatedExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          FieldOptions, _proto_TypeTraits, _field_type, _is_packed>& id,
-      typename _proto_TypeTraits::Singular::MutableType value) {
-    _proto_TypeTraits::SetAllocated(id.number(), _field_type, value,
-                                    &_impl_._extensions_);
-
-  }
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline void UnsafeArenaSetAllocatedExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          FieldOptions, _proto_TypeTraits, _field_type, _is_packed>& id,
-      typename _proto_TypeTraits::Singular::MutableType value) {
-    _proto_TypeTraits::UnsafeArenaSetAllocated(id.number(), _field_type,
-                                               value, &_impl_._extensions_);
-
-  }
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  PROTOBUF_NODISCARD inline
-      typename _proto_TypeTraits::Singular::MutableType
-      ReleaseExtension(
-          const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-              FieldOptions, _proto_TypeTraits, _field_type, _is_packed>& id) {
-
-    return _proto_TypeTraits::Release(id.number(), _field_type,
-                                      &_impl_._extensions_);
-  }
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline typename _proto_TypeTraits::Singular::MutableType
-  UnsafeArenaReleaseExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          FieldOptions, _proto_TypeTraits, _field_type, _is_packed>& id) {
-
-    return _proto_TypeTraits::UnsafeArenaRelease(id.number(), _field_type,
-                                                 &_impl_._extensions_);
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline typename _proto_TypeTraits::Repeated::ConstType GetExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          FieldOptions, _proto_TypeTraits, _field_type, _is_packed>& id,
-      int index) const {
-
-    return _proto_TypeTraits::Get(id.number(), _impl_._extensions_, index);
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline typename _proto_TypeTraits::Repeated::MutableType MutableExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          FieldOptions, _proto_TypeTraits, _field_type, _is_packed>& id,
-      int index) {
-
-    return _proto_TypeTraits::Mutable(id.number(), index, &_impl_._extensions_);
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline void SetExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          FieldOptions, _proto_TypeTraits, _field_type, _is_packed>& id,
-      int index, typename _proto_TypeTraits::Repeated::ConstType value) {
-    _proto_TypeTraits::Set(id.number(), index, value, &_impl_._extensions_);
-
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline typename _proto_TypeTraits::Repeated::MutableType AddExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          FieldOptions, _proto_TypeTraits, _field_type, _is_packed>& id) {
-    typename _proto_TypeTraits::Repeated::MutableType to_add =
-        _proto_TypeTraits::Add(id.number(), _field_type, &_impl_._extensions_);
-
-    return to_add;
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline void AddExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          FieldOptions, _proto_TypeTraits, _field_type, _is_packed>& id,
-      typename _proto_TypeTraits::Repeated::ConstType value) {
-    _proto_TypeTraits::Add(id.number(), _field_type, _is_packed, value,
-                           &_impl_._extensions_);
-
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline const typename _proto_TypeTraits::Repeated::RepeatedFieldType&
-  GetRepeatedExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          FieldOptions, _proto_TypeTraits, _field_type, _is_packed>& id) const {
-
-    return _proto_TypeTraits::GetRepeated(id.number(), _impl_._extensions_);
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline typename _proto_TypeTraits::Repeated::RepeatedFieldType*
-  MutableRepeatedExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          FieldOptions, _proto_TypeTraits, _field_type, _is_packed>& id) {
-
-    return _proto_TypeTraits::MutableRepeated(id.number(), _field_type,
-                                              _is_packed, &_impl_._extensions_);
-  }
-
-  // @@protoc_insertion_point(class_scope:google.protobuf.FieldOptions)
- private:
-  class _Internal;
-
-  template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
-  typedef void InternalArenaConstructable_;
-  typedef void DestructorSkippable_;
-  struct Impl_ {
-    ::PROTOBUF_NAMESPACE_ID::internal::ExtensionSet _extensions_;
-
-    ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
-    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-    ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::UninterpretedOption > uninterpreted_option_;
-    int ctype_;
-    int jstype_;
-    bool packed_;
-    bool lazy_;
-    bool unverified_lazy_;
-    bool deprecated_;
-    bool weak_;
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_google_2fprotobuf_2fdescriptor_2eproto;
-};
-// -------------------------------------------------------------------
-
-class PROTOBUF_EXPORT OneofOptions final :
-    public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:google.protobuf.OneofOptions) */ {
- public:
-  inline OneofOptions() : OneofOptions(nullptr) {}
-  ~OneofOptions() override;
-  explicit PROTOBUF_CONSTEXPR OneofOptions(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
-
-  OneofOptions(const OneofOptions& from);
-  OneofOptions(OneofOptions&& from) noexcept
-    : OneofOptions() {
-    *this = ::std::move(from);
-  }
-
-  inline OneofOptions& operator=(const OneofOptions& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline OneofOptions& operator=(OneofOptions&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetOwningArena() == from.GetOwningArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetOwningArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::PROTOBUF_NAMESPACE_ID::UnknownFieldSet& unknown_fields() const {
-    return _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance);
-  }
-  inline ::PROTOBUF_NAMESPACE_ID::UnknownFieldSet* mutable_unknown_fields() {
-    return _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>();
-  }
-
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const OneofOptions& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const OneofOptions* internal_default_instance() {
-    return reinterpret_cast<const OneofOptions*>(
-               &_OneofOptions_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    16;
-
-  friend void swap(OneofOptions& a, OneofOptions& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(OneofOptions* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() != nullptr &&
-        GetOwningArena() == other->GetOwningArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() == other->GetOwningArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(OneofOptions* other) {
-    if (other == this) return;
-    GOOGLE_DCHECK(GetOwningArena() == other->GetOwningArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  OneofOptions* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<OneofOptions>(arena);
-  }
-  using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
-  void CopyFrom(const OneofOptions& from);
-  using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom( const OneofOptions& from) {
-    OneofOptions::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  uint8_t* _InternalSerialize(
-      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
-
-  private:
-  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
-  void SharedDtor();
-  void SetCachedSize(int size) const final;
-  void InternalSwap(OneofOptions* other);
-
-  private:
-  friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
-  static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
-    return "google.protobuf.OneofOptions";
-  }
-  protected:
-  explicit OneofOptions(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                       bool is_message_owned = false);
-  public:
-
-  static const ClassData _class_data_;
-  const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*GetClassData() const final;
-
-  ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kUninterpretedOptionFieldNumber = 999,
-  };
-  // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
-  int uninterpreted_option_size() const;
-  private:
-  int _internal_uninterpreted_option_size() const;
-  public:
-  void clear_uninterpreted_option();
-  ::PROTOBUF_NAMESPACE_ID::UninterpretedOption* mutable_uninterpreted_option(int index);
-  ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::UninterpretedOption >*
-      mutable_uninterpreted_option();
-  private:
-  const ::PROTOBUF_NAMESPACE_ID::UninterpretedOption& _internal_uninterpreted_option(int index) const;
-  ::PROTOBUF_NAMESPACE_ID::UninterpretedOption* _internal_add_uninterpreted_option();
-  public:
-  const ::PROTOBUF_NAMESPACE_ID::UninterpretedOption& uninterpreted_option(int index) const;
-  ::PROTOBUF_NAMESPACE_ID::UninterpretedOption* add_uninterpreted_option();
-  const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::UninterpretedOption >&
-      uninterpreted_option() const;
-
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline bool HasExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          OneofOptions, _proto_TypeTraits, _field_type, _is_packed>& id) const {
-
-    return _impl_._extensions_.Has(id.number());
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline void ClearExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          OneofOptions, _proto_TypeTraits, _field_type, _is_packed>& id) {
-    _impl_._extensions_.ClearExtension(id.number());
-
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline int ExtensionSize(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          OneofOptions, _proto_TypeTraits, _field_type, _is_packed>& id) const {
-
-    return _impl_._extensions_.ExtensionSize(id.number());
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline typename _proto_TypeTraits::Singular::ConstType GetExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          OneofOptions, _proto_TypeTraits, _field_type, _is_packed>& id) const {
-
-    return _proto_TypeTraits::Get(id.number(), _impl_._extensions_,
-                                  id.default_value());
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline typename _proto_TypeTraits::Singular::MutableType MutableExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          OneofOptions, _proto_TypeTraits, _field_type, _is_packed>& id) {
-
-    return _proto_TypeTraits::Mutable(id.number(), _field_type,
-                                      &_impl_._extensions_);
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline void SetExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          OneofOptions, _proto_TypeTraits, _field_type, _is_packed>& id,
-      typename _proto_TypeTraits::Singular::ConstType value) {
-    _proto_TypeTraits::Set(id.number(), _field_type, value, &_impl_._extensions_);
-
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline void SetAllocatedExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          OneofOptions, _proto_TypeTraits, _field_type, _is_packed>& id,
-      typename _proto_TypeTraits::Singular::MutableType value) {
-    _proto_TypeTraits::SetAllocated(id.number(), _field_type, value,
-                                    &_impl_._extensions_);
-
-  }
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline void UnsafeArenaSetAllocatedExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          OneofOptions, _proto_TypeTraits, _field_type, _is_packed>& id,
-      typename _proto_TypeTraits::Singular::MutableType value) {
-    _proto_TypeTraits::UnsafeArenaSetAllocated(id.number(), _field_type,
-                                               value, &_impl_._extensions_);
-
-  }
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  PROTOBUF_NODISCARD inline
-      typename _proto_TypeTraits::Singular::MutableType
-      ReleaseExtension(
-          const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-              OneofOptions, _proto_TypeTraits, _field_type, _is_packed>& id) {
-
-    return _proto_TypeTraits::Release(id.number(), _field_type,
-                                      &_impl_._extensions_);
-  }
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline typename _proto_TypeTraits::Singular::MutableType
-  UnsafeArenaReleaseExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          OneofOptions, _proto_TypeTraits, _field_type, _is_packed>& id) {
-
-    return _proto_TypeTraits::UnsafeArenaRelease(id.number(), _field_type,
-                                                 &_impl_._extensions_);
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline typename _proto_TypeTraits::Repeated::ConstType GetExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          OneofOptions, _proto_TypeTraits, _field_type, _is_packed>& id,
-      int index) const {
-
-    return _proto_TypeTraits::Get(id.number(), _impl_._extensions_, index);
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline typename _proto_TypeTraits::Repeated::MutableType MutableExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          OneofOptions, _proto_TypeTraits, _field_type, _is_packed>& id,
-      int index) {
-
-    return _proto_TypeTraits::Mutable(id.number(), index, &_impl_._extensions_);
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline void SetExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          OneofOptions, _proto_TypeTraits, _field_type, _is_packed>& id,
-      int index, typename _proto_TypeTraits::Repeated::ConstType value) {
-    _proto_TypeTraits::Set(id.number(), index, value, &_impl_._extensions_);
-
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline typename _proto_TypeTraits::Repeated::MutableType AddExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          OneofOptions, _proto_TypeTraits, _field_type, _is_packed>& id) {
-    typename _proto_TypeTraits::Repeated::MutableType to_add =
-        _proto_TypeTraits::Add(id.number(), _field_type, &_impl_._extensions_);
-
-    return to_add;
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline void AddExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          OneofOptions, _proto_TypeTraits, _field_type, _is_packed>& id,
-      typename _proto_TypeTraits::Repeated::ConstType value) {
-    _proto_TypeTraits::Add(id.number(), _field_type, _is_packed, value,
-                           &_impl_._extensions_);
-
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline const typename _proto_TypeTraits::Repeated::RepeatedFieldType&
-  GetRepeatedExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          OneofOptions, _proto_TypeTraits, _field_type, _is_packed>& id) const {
-
-    return _proto_TypeTraits::GetRepeated(id.number(), _impl_._extensions_);
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline typename _proto_TypeTraits::Repeated::RepeatedFieldType*
-  MutableRepeatedExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          OneofOptions, _proto_TypeTraits, _field_type, _is_packed>& id) {
-
-    return _proto_TypeTraits::MutableRepeated(id.number(), _field_type,
-                                              _is_packed, &_impl_._extensions_);
-  }
-
-  // @@protoc_insertion_point(class_scope:google.protobuf.OneofOptions)
- private:
-  class _Internal;
-
-  template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
-  typedef void InternalArenaConstructable_;
-  typedef void DestructorSkippable_;
-  struct Impl_ {
-    ::PROTOBUF_NAMESPACE_ID::internal::ExtensionSet _extensions_;
-
-    ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::UninterpretedOption > uninterpreted_option_;
-    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_google_2fprotobuf_2fdescriptor_2eproto;
-};
-// -------------------------------------------------------------------
-
-class PROTOBUF_EXPORT EnumOptions final :
-    public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:google.protobuf.EnumOptions) */ {
- public:
-  inline EnumOptions() : EnumOptions(nullptr) {}
-  ~EnumOptions() override;
-  explicit PROTOBUF_CONSTEXPR EnumOptions(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
-
-  EnumOptions(const EnumOptions& from);
-  EnumOptions(EnumOptions&& from) noexcept
-    : EnumOptions() {
-    *this = ::std::move(from);
-  }
-
-  inline EnumOptions& operator=(const EnumOptions& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline EnumOptions& operator=(EnumOptions&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetOwningArena() == from.GetOwningArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetOwningArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::PROTOBUF_NAMESPACE_ID::UnknownFieldSet& unknown_fields() const {
-    return _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance);
-  }
-  inline ::PROTOBUF_NAMESPACE_ID::UnknownFieldSet* mutable_unknown_fields() {
-    return _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>();
-  }
-
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const EnumOptions& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const EnumOptions* internal_default_instance() {
-    return reinterpret_cast<const EnumOptions*>(
-               &_EnumOptions_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    17;
-
-  friend void swap(EnumOptions& a, EnumOptions& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(EnumOptions* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() != nullptr &&
-        GetOwningArena() == other->GetOwningArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() == other->GetOwningArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(EnumOptions* other) {
-    if (other == this) return;
-    GOOGLE_DCHECK(GetOwningArena() == other->GetOwningArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  EnumOptions* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<EnumOptions>(arena);
-  }
-  using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
-  void CopyFrom(const EnumOptions& from);
-  using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom( const EnumOptions& from) {
-    EnumOptions::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  uint8_t* _InternalSerialize(
-      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
-
-  private:
-  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
-  void SharedDtor();
-  void SetCachedSize(int size) const final;
-  void InternalSwap(EnumOptions* other);
-
-  private:
-  friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
-  static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
-    return "google.protobuf.EnumOptions";
-  }
-  protected:
-  explicit EnumOptions(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                       bool is_message_owned = false);
-  public:
-
-  static const ClassData _class_data_;
-  const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*GetClassData() const final;
-
-  ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kUninterpretedOptionFieldNumber = 999,
-    kAllowAliasFieldNumber = 2,
-    kDeprecatedFieldNumber = 3,
-  };
-  // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
-  int uninterpreted_option_size() const;
-  private:
-  int _internal_uninterpreted_option_size() const;
-  public:
-  void clear_uninterpreted_option();
-  ::PROTOBUF_NAMESPACE_ID::UninterpretedOption* mutable_uninterpreted_option(int index);
-  ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::UninterpretedOption >*
-      mutable_uninterpreted_option();
-  private:
-  const ::PROTOBUF_NAMESPACE_ID::UninterpretedOption& _internal_uninterpreted_option(int index) const;
-  ::PROTOBUF_NAMESPACE_ID::UninterpretedOption* _internal_add_uninterpreted_option();
-  public:
-  const ::PROTOBUF_NAMESPACE_ID::UninterpretedOption& uninterpreted_option(int index) const;
-  ::PROTOBUF_NAMESPACE_ID::UninterpretedOption* add_uninterpreted_option();
-  const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::UninterpretedOption >&
-      uninterpreted_option() const;
-
-  // optional bool allow_alias = 2;
-  bool has_allow_alias() const;
-  private:
-  bool _internal_has_allow_alias() const;
-  public:
-  void clear_allow_alias();
-  bool allow_alias() const;
-  void set_allow_alias(bool value);
-  private:
-  bool _internal_allow_alias() const;
-  void _internal_set_allow_alias(bool value);
-  public:
-
-  // optional bool deprecated = 3 [default = false];
-  bool has_deprecated() const;
-  private:
-  bool _internal_has_deprecated() const;
-  public:
-  void clear_deprecated();
-  bool deprecated() const;
-  void set_deprecated(bool value);
-  private:
-  bool _internal_deprecated() const;
-  void _internal_set_deprecated(bool value);
-  public:
-
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline bool HasExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          EnumOptions, _proto_TypeTraits, _field_type, _is_packed>& id) const {
-
-    return _impl_._extensions_.Has(id.number());
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline void ClearExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          EnumOptions, _proto_TypeTraits, _field_type, _is_packed>& id) {
-    _impl_._extensions_.ClearExtension(id.number());
-
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline int ExtensionSize(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          EnumOptions, _proto_TypeTraits, _field_type, _is_packed>& id) const {
-
-    return _impl_._extensions_.ExtensionSize(id.number());
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline typename _proto_TypeTraits::Singular::ConstType GetExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          EnumOptions, _proto_TypeTraits, _field_type, _is_packed>& id) const {
-
-    return _proto_TypeTraits::Get(id.number(), _impl_._extensions_,
-                                  id.default_value());
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline typename _proto_TypeTraits::Singular::MutableType MutableExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          EnumOptions, _proto_TypeTraits, _field_type, _is_packed>& id) {
-
-    return _proto_TypeTraits::Mutable(id.number(), _field_type,
-                                      &_impl_._extensions_);
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline void SetExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          EnumOptions, _proto_TypeTraits, _field_type, _is_packed>& id,
-      typename _proto_TypeTraits::Singular::ConstType value) {
-    _proto_TypeTraits::Set(id.number(), _field_type, value, &_impl_._extensions_);
-
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline void SetAllocatedExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          EnumOptions, _proto_TypeTraits, _field_type, _is_packed>& id,
-      typename _proto_TypeTraits::Singular::MutableType value) {
-    _proto_TypeTraits::SetAllocated(id.number(), _field_type, value,
-                                    &_impl_._extensions_);
-
-  }
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline void UnsafeArenaSetAllocatedExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          EnumOptions, _proto_TypeTraits, _field_type, _is_packed>& id,
-      typename _proto_TypeTraits::Singular::MutableType value) {
-    _proto_TypeTraits::UnsafeArenaSetAllocated(id.number(), _field_type,
-                                               value, &_impl_._extensions_);
-
-  }
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  PROTOBUF_NODISCARD inline
-      typename _proto_TypeTraits::Singular::MutableType
-      ReleaseExtension(
-          const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-              EnumOptions, _proto_TypeTraits, _field_type, _is_packed>& id) {
-
-    return _proto_TypeTraits::Release(id.number(), _field_type,
-                                      &_impl_._extensions_);
-  }
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline typename _proto_TypeTraits::Singular::MutableType
-  UnsafeArenaReleaseExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          EnumOptions, _proto_TypeTraits, _field_type, _is_packed>& id) {
-
-    return _proto_TypeTraits::UnsafeArenaRelease(id.number(), _field_type,
-                                                 &_impl_._extensions_);
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline typename _proto_TypeTraits::Repeated::ConstType GetExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          EnumOptions, _proto_TypeTraits, _field_type, _is_packed>& id,
-      int index) const {
-
-    return _proto_TypeTraits::Get(id.number(), _impl_._extensions_, index);
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline typename _proto_TypeTraits::Repeated::MutableType MutableExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          EnumOptions, _proto_TypeTraits, _field_type, _is_packed>& id,
-      int index) {
-
-    return _proto_TypeTraits::Mutable(id.number(), index, &_impl_._extensions_);
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline void SetExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          EnumOptions, _proto_TypeTraits, _field_type, _is_packed>& id,
-      int index, typename _proto_TypeTraits::Repeated::ConstType value) {
-    _proto_TypeTraits::Set(id.number(), index, value, &_impl_._extensions_);
-
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline typename _proto_TypeTraits::Repeated::MutableType AddExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          EnumOptions, _proto_TypeTraits, _field_type, _is_packed>& id) {
-    typename _proto_TypeTraits::Repeated::MutableType to_add =
-        _proto_TypeTraits::Add(id.number(), _field_type, &_impl_._extensions_);
-
-    return to_add;
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline void AddExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          EnumOptions, _proto_TypeTraits, _field_type, _is_packed>& id,
-      typename _proto_TypeTraits::Repeated::ConstType value) {
-    _proto_TypeTraits::Add(id.number(), _field_type, _is_packed, value,
-                           &_impl_._extensions_);
-
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline const typename _proto_TypeTraits::Repeated::RepeatedFieldType&
-  GetRepeatedExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          EnumOptions, _proto_TypeTraits, _field_type, _is_packed>& id) const {
-
-    return _proto_TypeTraits::GetRepeated(id.number(), _impl_._extensions_);
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline typename _proto_TypeTraits::Repeated::RepeatedFieldType*
-  MutableRepeatedExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          EnumOptions, _proto_TypeTraits, _field_type, _is_packed>& id) {
-
-    return _proto_TypeTraits::MutableRepeated(id.number(), _field_type,
-                                              _is_packed, &_impl_._extensions_);
-  }
-
-  // @@protoc_insertion_point(class_scope:google.protobuf.EnumOptions)
- private:
-  class _Internal;
-
-  template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
-  typedef void InternalArenaConstructable_;
-  typedef void DestructorSkippable_;
-  struct Impl_ {
-    ::PROTOBUF_NAMESPACE_ID::internal::ExtensionSet _extensions_;
-
-    ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
-    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-    ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::UninterpretedOption > uninterpreted_option_;
-    bool allow_alias_;
-    bool deprecated_;
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_google_2fprotobuf_2fdescriptor_2eproto;
-};
-// -------------------------------------------------------------------
-
-class PROTOBUF_EXPORT EnumValueOptions final :
-    public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:google.protobuf.EnumValueOptions) */ {
- public:
-  inline EnumValueOptions() : EnumValueOptions(nullptr) {}
-  ~EnumValueOptions() override;
-  explicit PROTOBUF_CONSTEXPR EnumValueOptions(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
-
-  EnumValueOptions(const EnumValueOptions& from);
-  EnumValueOptions(EnumValueOptions&& from) noexcept
-    : EnumValueOptions() {
-    *this = ::std::move(from);
-  }
-
-  inline EnumValueOptions& operator=(const EnumValueOptions& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline EnumValueOptions& operator=(EnumValueOptions&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetOwningArena() == from.GetOwningArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetOwningArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::PROTOBUF_NAMESPACE_ID::UnknownFieldSet& unknown_fields() const {
-    return _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance);
-  }
-  inline ::PROTOBUF_NAMESPACE_ID::UnknownFieldSet* mutable_unknown_fields() {
-    return _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>();
-  }
-
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const EnumValueOptions& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const EnumValueOptions* internal_default_instance() {
-    return reinterpret_cast<const EnumValueOptions*>(
-               &_EnumValueOptions_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    18;
-
-  friend void swap(EnumValueOptions& a, EnumValueOptions& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(EnumValueOptions* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() != nullptr &&
-        GetOwningArena() == other->GetOwningArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() == other->GetOwningArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(EnumValueOptions* other) {
-    if (other == this) return;
-    GOOGLE_DCHECK(GetOwningArena() == other->GetOwningArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  EnumValueOptions* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<EnumValueOptions>(arena);
-  }
-  using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
-  void CopyFrom(const EnumValueOptions& from);
-  using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom( const EnumValueOptions& from) {
-    EnumValueOptions::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  uint8_t* _InternalSerialize(
-      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
-
-  private:
-  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
-  void SharedDtor();
-  void SetCachedSize(int size) const final;
-  void InternalSwap(EnumValueOptions* other);
-
-  private:
-  friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
-  static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
-    return "google.protobuf.EnumValueOptions";
-  }
-  protected:
-  explicit EnumValueOptions(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                       bool is_message_owned = false);
-  public:
-
-  static const ClassData _class_data_;
-  const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*GetClassData() const final;
-
-  ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kUninterpretedOptionFieldNumber = 999,
-    kDeprecatedFieldNumber = 1,
-  };
-  // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
-  int uninterpreted_option_size() const;
-  private:
-  int _internal_uninterpreted_option_size() const;
-  public:
-  void clear_uninterpreted_option();
-  ::PROTOBUF_NAMESPACE_ID::UninterpretedOption* mutable_uninterpreted_option(int index);
-  ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::UninterpretedOption >*
-      mutable_uninterpreted_option();
-  private:
-  const ::PROTOBUF_NAMESPACE_ID::UninterpretedOption& _internal_uninterpreted_option(int index) const;
-  ::PROTOBUF_NAMESPACE_ID::UninterpretedOption* _internal_add_uninterpreted_option();
-  public:
-  const ::PROTOBUF_NAMESPACE_ID::UninterpretedOption& uninterpreted_option(int index) const;
-  ::PROTOBUF_NAMESPACE_ID::UninterpretedOption* add_uninterpreted_option();
-  const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::UninterpretedOption >&
-      uninterpreted_option() const;
-
-  // optional bool deprecated = 1 [default = false];
-  bool has_deprecated() const;
-  private:
-  bool _internal_has_deprecated() const;
-  public:
-  void clear_deprecated();
-  bool deprecated() const;
-  void set_deprecated(bool value);
-  private:
-  bool _internal_deprecated() const;
-  void _internal_set_deprecated(bool value);
-  public:
-
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline bool HasExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          EnumValueOptions, _proto_TypeTraits, _field_type, _is_packed>& id) const {
-
-    return _impl_._extensions_.Has(id.number());
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline void ClearExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          EnumValueOptions, _proto_TypeTraits, _field_type, _is_packed>& id) {
-    _impl_._extensions_.ClearExtension(id.number());
-
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline int ExtensionSize(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          EnumValueOptions, _proto_TypeTraits, _field_type, _is_packed>& id) const {
-
-    return _impl_._extensions_.ExtensionSize(id.number());
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline typename _proto_TypeTraits::Singular::ConstType GetExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          EnumValueOptions, _proto_TypeTraits, _field_type, _is_packed>& id) const {
-
-    return _proto_TypeTraits::Get(id.number(), _impl_._extensions_,
-                                  id.default_value());
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline typename _proto_TypeTraits::Singular::MutableType MutableExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          EnumValueOptions, _proto_TypeTraits, _field_type, _is_packed>& id) {
-
-    return _proto_TypeTraits::Mutable(id.number(), _field_type,
-                                      &_impl_._extensions_);
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline void SetExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          EnumValueOptions, _proto_TypeTraits, _field_type, _is_packed>& id,
-      typename _proto_TypeTraits::Singular::ConstType value) {
-    _proto_TypeTraits::Set(id.number(), _field_type, value, &_impl_._extensions_);
-
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline void SetAllocatedExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          EnumValueOptions, _proto_TypeTraits, _field_type, _is_packed>& id,
-      typename _proto_TypeTraits::Singular::MutableType value) {
-    _proto_TypeTraits::SetAllocated(id.number(), _field_type, value,
-                                    &_impl_._extensions_);
-
-  }
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline void UnsafeArenaSetAllocatedExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          EnumValueOptions, _proto_TypeTraits, _field_type, _is_packed>& id,
-      typename _proto_TypeTraits::Singular::MutableType value) {
-    _proto_TypeTraits::UnsafeArenaSetAllocated(id.number(), _field_type,
-                                               value, &_impl_._extensions_);
-
-  }
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  PROTOBUF_NODISCARD inline
-      typename _proto_TypeTraits::Singular::MutableType
-      ReleaseExtension(
-          const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-              EnumValueOptions, _proto_TypeTraits, _field_type, _is_packed>& id) {
-
-    return _proto_TypeTraits::Release(id.number(), _field_type,
-                                      &_impl_._extensions_);
-  }
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline typename _proto_TypeTraits::Singular::MutableType
-  UnsafeArenaReleaseExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          EnumValueOptions, _proto_TypeTraits, _field_type, _is_packed>& id) {
-
-    return _proto_TypeTraits::UnsafeArenaRelease(id.number(), _field_type,
-                                                 &_impl_._extensions_);
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline typename _proto_TypeTraits::Repeated::ConstType GetExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          EnumValueOptions, _proto_TypeTraits, _field_type, _is_packed>& id,
-      int index) const {
-
-    return _proto_TypeTraits::Get(id.number(), _impl_._extensions_, index);
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline typename _proto_TypeTraits::Repeated::MutableType MutableExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          EnumValueOptions, _proto_TypeTraits, _field_type, _is_packed>& id,
-      int index) {
-
-    return _proto_TypeTraits::Mutable(id.number(), index, &_impl_._extensions_);
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline void SetExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          EnumValueOptions, _proto_TypeTraits, _field_type, _is_packed>& id,
-      int index, typename _proto_TypeTraits::Repeated::ConstType value) {
-    _proto_TypeTraits::Set(id.number(), index, value, &_impl_._extensions_);
-
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline typename _proto_TypeTraits::Repeated::MutableType AddExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          EnumValueOptions, _proto_TypeTraits, _field_type, _is_packed>& id) {
-    typename _proto_TypeTraits::Repeated::MutableType to_add =
-        _proto_TypeTraits::Add(id.number(), _field_type, &_impl_._extensions_);
-
-    return to_add;
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline void AddExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          EnumValueOptions, _proto_TypeTraits, _field_type, _is_packed>& id,
-      typename _proto_TypeTraits::Repeated::ConstType value) {
-    _proto_TypeTraits::Add(id.number(), _field_type, _is_packed, value,
-                           &_impl_._extensions_);
-
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline const typename _proto_TypeTraits::Repeated::RepeatedFieldType&
-  GetRepeatedExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          EnumValueOptions, _proto_TypeTraits, _field_type, _is_packed>& id) const {
-
-    return _proto_TypeTraits::GetRepeated(id.number(), _impl_._extensions_);
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline typename _proto_TypeTraits::Repeated::RepeatedFieldType*
-  MutableRepeatedExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          EnumValueOptions, _proto_TypeTraits, _field_type, _is_packed>& id) {
-
-    return _proto_TypeTraits::MutableRepeated(id.number(), _field_type,
-                                              _is_packed, &_impl_._extensions_);
-  }
-
-  // @@protoc_insertion_point(class_scope:google.protobuf.EnumValueOptions)
- private:
-  class _Internal;
-
-  template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
-  typedef void InternalArenaConstructable_;
-  typedef void DestructorSkippable_;
-  struct Impl_ {
-    ::PROTOBUF_NAMESPACE_ID::internal::ExtensionSet _extensions_;
-
-    ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
-    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-    ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::UninterpretedOption > uninterpreted_option_;
-    bool deprecated_;
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_google_2fprotobuf_2fdescriptor_2eproto;
-};
-// -------------------------------------------------------------------
-
-class PROTOBUF_EXPORT ServiceOptions final :
-    public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:google.protobuf.ServiceOptions) */ {
- public:
-  inline ServiceOptions() : ServiceOptions(nullptr) {}
-  ~ServiceOptions() override;
-  explicit PROTOBUF_CONSTEXPR ServiceOptions(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
-
-  ServiceOptions(const ServiceOptions& from);
-  ServiceOptions(ServiceOptions&& from) noexcept
-    : ServiceOptions() {
-    *this = ::std::move(from);
-  }
-
-  inline ServiceOptions& operator=(const ServiceOptions& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline ServiceOptions& operator=(ServiceOptions&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetOwningArena() == from.GetOwningArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetOwningArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::PROTOBUF_NAMESPACE_ID::UnknownFieldSet& unknown_fields() const {
-    return _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance);
-  }
-  inline ::PROTOBUF_NAMESPACE_ID::UnknownFieldSet* mutable_unknown_fields() {
-    return _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>();
-  }
-
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const ServiceOptions& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const ServiceOptions* internal_default_instance() {
-    return reinterpret_cast<const ServiceOptions*>(
-               &_ServiceOptions_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    19;
-
-  friend void swap(ServiceOptions& a, ServiceOptions& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(ServiceOptions* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() != nullptr &&
-        GetOwningArena() == other->GetOwningArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() == other->GetOwningArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(ServiceOptions* other) {
-    if (other == this) return;
-    GOOGLE_DCHECK(GetOwningArena() == other->GetOwningArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  ServiceOptions* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<ServiceOptions>(arena);
-  }
-  using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
-  void CopyFrom(const ServiceOptions& from);
-  using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom( const ServiceOptions& from) {
-    ServiceOptions::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  uint8_t* _InternalSerialize(
-      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
-
-  private:
-  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
-  void SharedDtor();
-  void SetCachedSize(int size) const final;
-  void InternalSwap(ServiceOptions* other);
-
-  private:
-  friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
-  static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
-    return "google.protobuf.ServiceOptions";
-  }
-  protected:
-  explicit ServiceOptions(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                       bool is_message_owned = false);
-  public:
-
-  static const ClassData _class_data_;
-  const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*GetClassData() const final;
-
-  ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kUninterpretedOptionFieldNumber = 999,
-    kDeprecatedFieldNumber = 33,
-  };
-  // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
-  int uninterpreted_option_size() const;
-  private:
-  int _internal_uninterpreted_option_size() const;
-  public:
-  void clear_uninterpreted_option();
-  ::PROTOBUF_NAMESPACE_ID::UninterpretedOption* mutable_uninterpreted_option(int index);
-  ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::UninterpretedOption >*
-      mutable_uninterpreted_option();
-  private:
-  const ::PROTOBUF_NAMESPACE_ID::UninterpretedOption& _internal_uninterpreted_option(int index) const;
-  ::PROTOBUF_NAMESPACE_ID::UninterpretedOption* _internal_add_uninterpreted_option();
-  public:
-  const ::PROTOBUF_NAMESPACE_ID::UninterpretedOption& uninterpreted_option(int index) const;
-  ::PROTOBUF_NAMESPACE_ID::UninterpretedOption* add_uninterpreted_option();
-  const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::UninterpretedOption >&
-      uninterpreted_option() const;
-
-  // optional bool deprecated = 33 [default = false];
-  bool has_deprecated() const;
-  private:
-  bool _internal_has_deprecated() const;
-  public:
-  void clear_deprecated();
-  bool deprecated() const;
-  void set_deprecated(bool value);
-  private:
-  bool _internal_deprecated() const;
-  void _internal_set_deprecated(bool value);
-  public:
-
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline bool HasExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          ServiceOptions, _proto_TypeTraits, _field_type, _is_packed>& id) const {
-
-    return _impl_._extensions_.Has(id.number());
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline void ClearExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          ServiceOptions, _proto_TypeTraits, _field_type, _is_packed>& id) {
-    _impl_._extensions_.ClearExtension(id.number());
-
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline int ExtensionSize(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          ServiceOptions, _proto_TypeTraits, _field_type, _is_packed>& id) const {
-
-    return _impl_._extensions_.ExtensionSize(id.number());
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline typename _proto_TypeTraits::Singular::ConstType GetExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          ServiceOptions, _proto_TypeTraits, _field_type, _is_packed>& id) const {
-
-    return _proto_TypeTraits::Get(id.number(), _impl_._extensions_,
-                                  id.default_value());
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline typename _proto_TypeTraits::Singular::MutableType MutableExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          ServiceOptions, _proto_TypeTraits, _field_type, _is_packed>& id) {
-
-    return _proto_TypeTraits::Mutable(id.number(), _field_type,
-                                      &_impl_._extensions_);
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline void SetExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          ServiceOptions, _proto_TypeTraits, _field_type, _is_packed>& id,
-      typename _proto_TypeTraits::Singular::ConstType value) {
-    _proto_TypeTraits::Set(id.number(), _field_type, value, &_impl_._extensions_);
-
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline void SetAllocatedExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          ServiceOptions, _proto_TypeTraits, _field_type, _is_packed>& id,
-      typename _proto_TypeTraits::Singular::MutableType value) {
-    _proto_TypeTraits::SetAllocated(id.number(), _field_type, value,
-                                    &_impl_._extensions_);
-
-  }
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline void UnsafeArenaSetAllocatedExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          ServiceOptions, _proto_TypeTraits, _field_type, _is_packed>& id,
-      typename _proto_TypeTraits::Singular::MutableType value) {
-    _proto_TypeTraits::UnsafeArenaSetAllocated(id.number(), _field_type,
-                                               value, &_impl_._extensions_);
-
-  }
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  PROTOBUF_NODISCARD inline
-      typename _proto_TypeTraits::Singular::MutableType
-      ReleaseExtension(
-          const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-              ServiceOptions, _proto_TypeTraits, _field_type, _is_packed>& id) {
-
-    return _proto_TypeTraits::Release(id.number(), _field_type,
-                                      &_impl_._extensions_);
-  }
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline typename _proto_TypeTraits::Singular::MutableType
-  UnsafeArenaReleaseExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          ServiceOptions, _proto_TypeTraits, _field_type, _is_packed>& id) {
-
-    return _proto_TypeTraits::UnsafeArenaRelease(id.number(), _field_type,
-                                                 &_impl_._extensions_);
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline typename _proto_TypeTraits::Repeated::ConstType GetExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          ServiceOptions, _proto_TypeTraits, _field_type, _is_packed>& id,
-      int index) const {
-
-    return _proto_TypeTraits::Get(id.number(), _impl_._extensions_, index);
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline typename _proto_TypeTraits::Repeated::MutableType MutableExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          ServiceOptions, _proto_TypeTraits, _field_type, _is_packed>& id,
-      int index) {
-
-    return _proto_TypeTraits::Mutable(id.number(), index, &_impl_._extensions_);
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline void SetExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          ServiceOptions, _proto_TypeTraits, _field_type, _is_packed>& id,
-      int index, typename _proto_TypeTraits::Repeated::ConstType value) {
-    _proto_TypeTraits::Set(id.number(), index, value, &_impl_._extensions_);
-
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline typename _proto_TypeTraits::Repeated::MutableType AddExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          ServiceOptions, _proto_TypeTraits, _field_type, _is_packed>& id) {
-    typename _proto_TypeTraits::Repeated::MutableType to_add =
-        _proto_TypeTraits::Add(id.number(), _field_type, &_impl_._extensions_);
-
-    return to_add;
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline void AddExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          ServiceOptions, _proto_TypeTraits, _field_type, _is_packed>& id,
-      typename _proto_TypeTraits::Repeated::ConstType value) {
-    _proto_TypeTraits::Add(id.number(), _field_type, _is_packed, value,
-                           &_impl_._extensions_);
-
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline const typename _proto_TypeTraits::Repeated::RepeatedFieldType&
-  GetRepeatedExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          ServiceOptions, _proto_TypeTraits, _field_type, _is_packed>& id) const {
-
-    return _proto_TypeTraits::GetRepeated(id.number(), _impl_._extensions_);
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline typename _proto_TypeTraits::Repeated::RepeatedFieldType*
-  MutableRepeatedExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          ServiceOptions, _proto_TypeTraits, _field_type, _is_packed>& id) {
-
-    return _proto_TypeTraits::MutableRepeated(id.number(), _field_type,
-                                              _is_packed, &_impl_._extensions_);
-  }
-
-  // @@protoc_insertion_point(class_scope:google.protobuf.ServiceOptions)
- private:
-  class _Internal;
-
-  template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
-  typedef void InternalArenaConstructable_;
-  typedef void DestructorSkippable_;
-  struct Impl_ {
-    ::PROTOBUF_NAMESPACE_ID::internal::ExtensionSet _extensions_;
-
-    ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
-    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-    ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::UninterpretedOption > uninterpreted_option_;
-    bool deprecated_;
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_google_2fprotobuf_2fdescriptor_2eproto;
-};
-// -------------------------------------------------------------------
-
-class PROTOBUF_EXPORT MethodOptions final :
-    public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:google.protobuf.MethodOptions) */ {
- public:
-  inline MethodOptions() : MethodOptions(nullptr) {}
-  ~MethodOptions() override;
-  explicit PROTOBUF_CONSTEXPR MethodOptions(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
-
-  MethodOptions(const MethodOptions& from);
-  MethodOptions(MethodOptions&& from) noexcept
-    : MethodOptions() {
-    *this = ::std::move(from);
-  }
-
-  inline MethodOptions& operator=(const MethodOptions& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline MethodOptions& operator=(MethodOptions&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetOwningArena() == from.GetOwningArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetOwningArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::PROTOBUF_NAMESPACE_ID::UnknownFieldSet& unknown_fields() const {
-    return _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance);
-  }
-  inline ::PROTOBUF_NAMESPACE_ID::UnknownFieldSet* mutable_unknown_fields() {
-    return _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>();
-  }
-
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const MethodOptions& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const MethodOptions* internal_default_instance() {
-    return reinterpret_cast<const MethodOptions*>(
-               &_MethodOptions_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    20;
-
-  friend void swap(MethodOptions& a, MethodOptions& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(MethodOptions* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() != nullptr &&
-        GetOwningArena() == other->GetOwningArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() == other->GetOwningArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(MethodOptions* other) {
-    if (other == this) return;
-    GOOGLE_DCHECK(GetOwningArena() == other->GetOwningArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  MethodOptions* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<MethodOptions>(arena);
-  }
-  using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
-  void CopyFrom(const MethodOptions& from);
-  using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom( const MethodOptions& from) {
-    MethodOptions::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  uint8_t* _InternalSerialize(
-      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
-
-  private:
-  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
-  void SharedDtor();
-  void SetCachedSize(int size) const final;
-  void InternalSwap(MethodOptions* other);
-
-  private:
-  friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
-  static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
-    return "google.protobuf.MethodOptions";
-  }
-  protected:
-  explicit MethodOptions(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                       bool is_message_owned = false);
-  public:
-
-  static const ClassData _class_data_;
-  const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*GetClassData() const final;
-
-  ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  typedef MethodOptions_IdempotencyLevel IdempotencyLevel;
-  static constexpr IdempotencyLevel IDEMPOTENCY_UNKNOWN =
-    MethodOptions_IdempotencyLevel_IDEMPOTENCY_UNKNOWN;
-  static constexpr IdempotencyLevel NO_SIDE_EFFECTS =
-    MethodOptions_IdempotencyLevel_NO_SIDE_EFFECTS;
-  static constexpr IdempotencyLevel IDEMPOTENT =
-    MethodOptions_IdempotencyLevel_IDEMPOTENT;
-  static inline bool IdempotencyLevel_IsValid(int value) {
-    return MethodOptions_IdempotencyLevel_IsValid(value);
-  }
-  static constexpr IdempotencyLevel IdempotencyLevel_MIN =
-    MethodOptions_IdempotencyLevel_IdempotencyLevel_MIN;
-  static constexpr IdempotencyLevel IdempotencyLevel_MAX =
-    MethodOptions_IdempotencyLevel_IdempotencyLevel_MAX;
-  static constexpr int IdempotencyLevel_ARRAYSIZE =
-    MethodOptions_IdempotencyLevel_IdempotencyLevel_ARRAYSIZE;
-  static inline const ::PROTOBUF_NAMESPACE_ID::EnumDescriptor*
-  IdempotencyLevel_descriptor() {
-    return MethodOptions_IdempotencyLevel_descriptor();
-  }
-  template<typename T>
-  static inline const std::string& IdempotencyLevel_Name(T enum_t_value) {
-    static_assert(::std::is_same<T, IdempotencyLevel>::value ||
-      ::std::is_integral<T>::value,
-      "Incorrect type passed to function IdempotencyLevel_Name.");
-    return MethodOptions_IdempotencyLevel_Name(enum_t_value);
-  }
-  static inline bool IdempotencyLevel_Parse(::PROTOBUF_NAMESPACE_ID::ConstStringParam name,
-      IdempotencyLevel* value) {
-    return MethodOptions_IdempotencyLevel_Parse(name, value);
-  }
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kUninterpretedOptionFieldNumber = 999,
-    kDeprecatedFieldNumber = 33,
-    kIdempotencyLevelFieldNumber = 34,
-  };
-  // repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
-  int uninterpreted_option_size() const;
-  private:
-  int _internal_uninterpreted_option_size() const;
-  public:
-  void clear_uninterpreted_option();
-  ::PROTOBUF_NAMESPACE_ID::UninterpretedOption* mutable_uninterpreted_option(int index);
-  ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::UninterpretedOption >*
-      mutable_uninterpreted_option();
-  private:
-  const ::PROTOBUF_NAMESPACE_ID::UninterpretedOption& _internal_uninterpreted_option(int index) const;
-  ::PROTOBUF_NAMESPACE_ID::UninterpretedOption* _internal_add_uninterpreted_option();
-  public:
-  const ::PROTOBUF_NAMESPACE_ID::UninterpretedOption& uninterpreted_option(int index) const;
-  ::PROTOBUF_NAMESPACE_ID::UninterpretedOption* add_uninterpreted_option();
-  const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::UninterpretedOption >&
-      uninterpreted_option() const;
-
-  // optional bool deprecated = 33 [default = false];
-  bool has_deprecated() const;
-  private:
-  bool _internal_has_deprecated() const;
-  public:
-  void clear_deprecated();
-  bool deprecated() const;
-  void set_deprecated(bool value);
-  private:
-  bool _internal_deprecated() const;
-  void _internal_set_deprecated(bool value);
-  public:
-
-  // optional .google.protobuf.MethodOptions.IdempotencyLevel idempotency_level = 34 [default = IDEMPOTENCY_UNKNOWN];
-  bool has_idempotency_level() const;
-  private:
-  bool _internal_has_idempotency_level() const;
-  public:
-  void clear_idempotency_level();
-  ::PROTOBUF_NAMESPACE_ID::MethodOptions_IdempotencyLevel idempotency_level() const;
-  void set_idempotency_level(::PROTOBUF_NAMESPACE_ID::MethodOptions_IdempotencyLevel value);
-  private:
-  ::PROTOBUF_NAMESPACE_ID::MethodOptions_IdempotencyLevel _internal_idempotency_level() const;
-  void _internal_set_idempotency_level(::PROTOBUF_NAMESPACE_ID::MethodOptions_IdempotencyLevel value);
-  public:
-
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline bool HasExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          MethodOptions, _proto_TypeTraits, _field_type, _is_packed>& id) const {
-
-    return _impl_._extensions_.Has(id.number());
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline void ClearExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          MethodOptions, _proto_TypeTraits, _field_type, _is_packed>& id) {
-    _impl_._extensions_.ClearExtension(id.number());
-
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline int ExtensionSize(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          MethodOptions, _proto_TypeTraits, _field_type, _is_packed>& id) const {
-
-    return _impl_._extensions_.ExtensionSize(id.number());
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline typename _proto_TypeTraits::Singular::ConstType GetExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          MethodOptions, _proto_TypeTraits, _field_type, _is_packed>& id) const {
-
-    return _proto_TypeTraits::Get(id.number(), _impl_._extensions_,
-                                  id.default_value());
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline typename _proto_TypeTraits::Singular::MutableType MutableExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          MethodOptions, _proto_TypeTraits, _field_type, _is_packed>& id) {
-
-    return _proto_TypeTraits::Mutable(id.number(), _field_type,
-                                      &_impl_._extensions_);
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline void SetExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          MethodOptions, _proto_TypeTraits, _field_type, _is_packed>& id,
-      typename _proto_TypeTraits::Singular::ConstType value) {
-    _proto_TypeTraits::Set(id.number(), _field_type, value, &_impl_._extensions_);
-
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline void SetAllocatedExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          MethodOptions, _proto_TypeTraits, _field_type, _is_packed>& id,
-      typename _proto_TypeTraits::Singular::MutableType value) {
-    _proto_TypeTraits::SetAllocated(id.number(), _field_type, value,
-                                    &_impl_._extensions_);
-
-  }
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline void UnsafeArenaSetAllocatedExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          MethodOptions, _proto_TypeTraits, _field_type, _is_packed>& id,
-      typename _proto_TypeTraits::Singular::MutableType value) {
-    _proto_TypeTraits::UnsafeArenaSetAllocated(id.number(), _field_type,
-                                               value, &_impl_._extensions_);
-
-  }
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  PROTOBUF_NODISCARD inline
-      typename _proto_TypeTraits::Singular::MutableType
-      ReleaseExtension(
-          const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-              MethodOptions, _proto_TypeTraits, _field_type, _is_packed>& id) {
-
-    return _proto_TypeTraits::Release(id.number(), _field_type,
-                                      &_impl_._extensions_);
-  }
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline typename _proto_TypeTraits::Singular::MutableType
-  UnsafeArenaReleaseExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          MethodOptions, _proto_TypeTraits, _field_type, _is_packed>& id) {
-
-    return _proto_TypeTraits::UnsafeArenaRelease(id.number(), _field_type,
-                                                 &_impl_._extensions_);
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline typename _proto_TypeTraits::Repeated::ConstType GetExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          MethodOptions, _proto_TypeTraits, _field_type, _is_packed>& id,
-      int index) const {
-
-    return _proto_TypeTraits::Get(id.number(), _impl_._extensions_, index);
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline typename _proto_TypeTraits::Repeated::MutableType MutableExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          MethodOptions, _proto_TypeTraits, _field_type, _is_packed>& id,
-      int index) {
-
-    return _proto_TypeTraits::Mutable(id.number(), index, &_impl_._extensions_);
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline void SetExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          MethodOptions, _proto_TypeTraits, _field_type, _is_packed>& id,
-      int index, typename _proto_TypeTraits::Repeated::ConstType value) {
-    _proto_TypeTraits::Set(id.number(), index, value, &_impl_._extensions_);
-
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline typename _proto_TypeTraits::Repeated::MutableType AddExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          MethodOptions, _proto_TypeTraits, _field_type, _is_packed>& id) {
-    typename _proto_TypeTraits::Repeated::MutableType to_add =
-        _proto_TypeTraits::Add(id.number(), _field_type, &_impl_._extensions_);
-
-    return to_add;
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline void AddExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          MethodOptions, _proto_TypeTraits, _field_type, _is_packed>& id,
-      typename _proto_TypeTraits::Repeated::ConstType value) {
-    _proto_TypeTraits::Add(id.number(), _field_type, _is_packed, value,
-                           &_impl_._extensions_);
-
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline const typename _proto_TypeTraits::Repeated::RepeatedFieldType&
-  GetRepeatedExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          MethodOptions, _proto_TypeTraits, _field_type, _is_packed>& id) const {
-
-    return _proto_TypeTraits::GetRepeated(id.number(), _impl_._extensions_);
-  }
-
-  template <typename _proto_TypeTraits,
-            ::PROTOBUF_NAMESPACE_ID::internal::FieldType _field_type,
-            bool _is_packed>
-  inline typename _proto_TypeTraits::Repeated::RepeatedFieldType*
-  MutableRepeatedExtension(
-      const ::PROTOBUF_NAMESPACE_ID::internal::ExtensionIdentifier<
-          MethodOptions, _proto_TypeTraits, _field_type, _is_packed>& id) {
-
-    return _proto_TypeTraits::MutableRepeated(id.number(), _field_type,
-                                              _is_packed, &_impl_._extensions_);
-  }
-
-  // @@protoc_insertion_point(class_scope:google.protobuf.MethodOptions)
- private:
-  class _Internal;
-
-  template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
-  typedef void InternalArenaConstructable_;
-  typedef void DestructorSkippable_;
-  struct Impl_ {
-    ::PROTOBUF_NAMESPACE_ID::internal::ExtensionSet _extensions_;
-
-    ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
-    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-    ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::UninterpretedOption > uninterpreted_option_;
-    bool deprecated_;
-    int idempotency_level_;
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_google_2fprotobuf_2fdescriptor_2eproto;
-};
-// -------------------------------------------------------------------
-
-class PROTOBUF_EXPORT UninterpretedOption_NamePart final :
-    public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:google.protobuf.UninterpretedOption.NamePart) */ {
- public:
-  inline UninterpretedOption_NamePart() : UninterpretedOption_NamePart(nullptr) {}
-  ~UninterpretedOption_NamePart() override;
-  explicit PROTOBUF_CONSTEXPR UninterpretedOption_NamePart(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
-
-  UninterpretedOption_NamePart(const UninterpretedOption_NamePart& from);
-  UninterpretedOption_NamePart(UninterpretedOption_NamePart&& from) noexcept
-    : UninterpretedOption_NamePart() {
-    *this = ::std::move(from);
-  }
-
-  inline UninterpretedOption_NamePart& operator=(const UninterpretedOption_NamePart& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline UninterpretedOption_NamePart& operator=(UninterpretedOption_NamePart&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetOwningArena() == from.GetOwningArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetOwningArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::PROTOBUF_NAMESPACE_ID::UnknownFieldSet& unknown_fields() const {
-    return _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance);
-  }
-  inline ::PROTOBUF_NAMESPACE_ID::UnknownFieldSet* mutable_unknown_fields() {
-    return _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>();
-  }
-
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const UninterpretedOption_NamePart& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const UninterpretedOption_NamePart* internal_default_instance() {
-    return reinterpret_cast<const UninterpretedOption_NamePart*>(
-               &_UninterpretedOption_NamePart_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    21;
-
-  friend void swap(UninterpretedOption_NamePart& a, UninterpretedOption_NamePart& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(UninterpretedOption_NamePart* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() != nullptr &&
-        GetOwningArena() == other->GetOwningArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() == other->GetOwningArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(UninterpretedOption_NamePart* other) {
-    if (other == this) return;
-    GOOGLE_DCHECK(GetOwningArena() == other->GetOwningArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  UninterpretedOption_NamePart* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<UninterpretedOption_NamePart>(arena);
-  }
-  using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
-  void CopyFrom(const UninterpretedOption_NamePart& from);
-  using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom( const UninterpretedOption_NamePart& from) {
-    UninterpretedOption_NamePart::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  uint8_t* _InternalSerialize(
-      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
-
-  private:
-  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
-  void SharedDtor();
-  void SetCachedSize(int size) const final;
-  void InternalSwap(UninterpretedOption_NamePart* other);
-
-  private:
-  friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
-  static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
-    return "google.protobuf.UninterpretedOption.NamePart";
-  }
-  protected:
-  explicit UninterpretedOption_NamePart(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                       bool is_message_owned = false);
-  public:
-
-  static const ClassData _class_data_;
-  const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*GetClassData() const final;
-
-  ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kNamePartFieldNumber = 1,
-    kIsExtensionFieldNumber = 2,
-  };
-  // required string name_part = 1;
-  bool has_name_part() const;
-  private:
-  bool _internal_has_name_part() const;
-  public:
-  void clear_name_part();
-  const std::string& name_part() const;
-  template <typename ArgT0 = const std::string&, typename... ArgT>
-  void set_name_part(ArgT0&& arg0, ArgT... args);
-  std::string* mutable_name_part();
-  PROTOBUF_NODISCARD std::string* release_name_part();
-  void set_allocated_name_part(std::string* name_part);
-  private:
-  const std::string& _internal_name_part() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_name_part(const std::string& value);
-  std::string* _internal_mutable_name_part();
-  public:
-
-  // required bool is_extension = 2;
-  bool has_is_extension() const;
-  private:
-  bool _internal_has_is_extension() const;
-  public:
-  void clear_is_extension();
-  bool is_extension() const;
-  void set_is_extension(bool value);
-  private:
-  bool _internal_is_extension() const;
-  void _internal_set_is_extension(bool value);
-  public:
-
-  // @@protoc_insertion_point(class_scope:google.protobuf.UninterpretedOption.NamePart)
- private:
-  class _Internal;
-
-  // helper for ByteSizeLong()
-  size_t RequiredFieldsByteSizeFallback() const;
-
-  template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
-  typedef void InternalArenaConstructable_;
-  typedef void DestructorSkippable_;
-  struct Impl_ {
-    ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
-    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr name_part_;
-    bool is_extension_;
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_google_2fprotobuf_2fdescriptor_2eproto;
-};
-// -------------------------------------------------------------------
-
-class PROTOBUF_EXPORT UninterpretedOption final :
-    public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:google.protobuf.UninterpretedOption) */ {
- public:
-  inline UninterpretedOption() : UninterpretedOption(nullptr) {}
-  ~UninterpretedOption() override;
-  explicit PROTOBUF_CONSTEXPR UninterpretedOption(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
-
-  UninterpretedOption(const UninterpretedOption& from);
-  UninterpretedOption(UninterpretedOption&& from) noexcept
-    : UninterpretedOption() {
-    *this = ::std::move(from);
-  }
-
-  inline UninterpretedOption& operator=(const UninterpretedOption& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline UninterpretedOption& operator=(UninterpretedOption&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetOwningArena() == from.GetOwningArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetOwningArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::PROTOBUF_NAMESPACE_ID::UnknownFieldSet& unknown_fields() const {
-    return _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance);
-  }
-  inline ::PROTOBUF_NAMESPACE_ID::UnknownFieldSet* mutable_unknown_fields() {
-    return _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>();
-  }
-
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const UninterpretedOption& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const UninterpretedOption* internal_default_instance() {
-    return reinterpret_cast<const UninterpretedOption*>(
-               &_UninterpretedOption_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    22;
-
-  friend void swap(UninterpretedOption& a, UninterpretedOption& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(UninterpretedOption* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() != nullptr &&
-        GetOwningArena() == other->GetOwningArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() == other->GetOwningArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(UninterpretedOption* other) {
-    if (other == this) return;
-    GOOGLE_DCHECK(GetOwningArena() == other->GetOwningArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  UninterpretedOption* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<UninterpretedOption>(arena);
-  }
-  using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
-  void CopyFrom(const UninterpretedOption& from);
-  using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom( const UninterpretedOption& from) {
-    UninterpretedOption::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  uint8_t* _InternalSerialize(
-      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
-
-  private:
-  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
-  void SharedDtor();
-  void SetCachedSize(int size) const final;
-  void InternalSwap(UninterpretedOption* other);
-
-  private:
-  friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
-  static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
-    return "google.protobuf.UninterpretedOption";
-  }
-  protected:
-  explicit UninterpretedOption(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                       bool is_message_owned = false);
-  public:
-
-  static const ClassData _class_data_;
-  const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*GetClassData() const final;
-
-  ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  typedef UninterpretedOption_NamePart NamePart;
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kNameFieldNumber = 2,
-    kIdentifierValueFieldNumber = 3,
-    kStringValueFieldNumber = 7,
-    kAggregateValueFieldNumber = 8,
-    kPositiveIntValueFieldNumber = 4,
-    kNegativeIntValueFieldNumber = 5,
-    kDoubleValueFieldNumber = 6,
-  };
-  // repeated .google.protobuf.UninterpretedOption.NamePart name = 2;
-  int name_size() const;
-  private:
-  int _internal_name_size() const;
-  public:
-  void clear_name();
-  ::PROTOBUF_NAMESPACE_ID::UninterpretedOption_NamePart* mutable_name(int index);
-  ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::UninterpretedOption_NamePart >*
-      mutable_name();
-  private:
-  const ::PROTOBUF_NAMESPACE_ID::UninterpretedOption_NamePart& _internal_name(int index) const;
-  ::PROTOBUF_NAMESPACE_ID::UninterpretedOption_NamePart* _internal_add_name();
-  public:
-  const ::PROTOBUF_NAMESPACE_ID::UninterpretedOption_NamePart& name(int index) const;
-  ::PROTOBUF_NAMESPACE_ID::UninterpretedOption_NamePart* add_name();
-  const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::UninterpretedOption_NamePart >&
-      name() const;
-
-  // optional string identifier_value = 3;
-  bool has_identifier_value() const;
-  private:
-  bool _internal_has_identifier_value() const;
-  public:
-  void clear_identifier_value();
-  const std::string& identifier_value() const;
-  template <typename ArgT0 = const std::string&, typename... ArgT>
-  void set_identifier_value(ArgT0&& arg0, ArgT... args);
-  std::string* mutable_identifier_value();
-  PROTOBUF_NODISCARD std::string* release_identifier_value();
-  void set_allocated_identifier_value(std::string* identifier_value);
-  private:
-  const std::string& _internal_identifier_value() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_identifier_value(const std::string& value);
-  std::string* _internal_mutable_identifier_value();
-  public:
-
-  // optional bytes string_value = 7;
-  bool has_string_value() const;
-  private:
-  bool _internal_has_string_value() const;
-  public:
-  void clear_string_value();
-  const std::string& string_value() const;
-  template <typename ArgT0 = const std::string&, typename... ArgT>
-  void set_string_value(ArgT0&& arg0, ArgT... args);
-  std::string* mutable_string_value();
-  PROTOBUF_NODISCARD std::string* release_string_value();
-  void set_allocated_string_value(std::string* string_value);
-  private:
-  const std::string& _internal_string_value() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_string_value(const std::string& value);
-  std::string* _internal_mutable_string_value();
-  public:
-
-  // optional string aggregate_value = 8;
-  bool has_aggregate_value() const;
-  private:
-  bool _internal_has_aggregate_value() const;
-  public:
-  void clear_aggregate_value();
-  const std::string& aggregate_value() const;
-  template <typename ArgT0 = const std::string&, typename... ArgT>
-  void set_aggregate_value(ArgT0&& arg0, ArgT... args);
-  std::string* mutable_aggregate_value();
-  PROTOBUF_NODISCARD std::string* release_aggregate_value();
-  void set_allocated_aggregate_value(std::string* aggregate_value);
-  private:
-  const std::string& _internal_aggregate_value() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_aggregate_value(const std::string& value);
-  std::string* _internal_mutable_aggregate_value();
-  public:
-
-  // optional uint64 positive_int_value = 4;
-  bool has_positive_int_value() const;
-  private:
-  bool _internal_has_positive_int_value() const;
-  public:
-  void clear_positive_int_value();
-  uint64_t positive_int_value() const;
-  void set_positive_int_value(uint64_t value);
-  private:
-  uint64_t _internal_positive_int_value() const;
-  void _internal_set_positive_int_value(uint64_t value);
-  public:
-
-  // optional int64 negative_int_value = 5;
-  bool has_negative_int_value() const;
-  private:
-  bool _internal_has_negative_int_value() const;
-  public:
-  void clear_negative_int_value();
-  int64_t negative_int_value() const;
-  void set_negative_int_value(int64_t value);
-  private:
-  int64_t _internal_negative_int_value() const;
-  void _internal_set_negative_int_value(int64_t value);
-  public:
-
-  // optional double double_value = 6;
-  bool has_double_value() const;
-  private:
-  bool _internal_has_double_value() const;
-  public:
-  void clear_double_value();
-  double double_value() const;
-  void set_double_value(double value);
-  private:
-  double _internal_double_value() const;
-  void _internal_set_double_value(double value);
-  public:
-
-  // @@protoc_insertion_point(class_scope:google.protobuf.UninterpretedOption)
- private:
-  class _Internal;
-
-  template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
-  typedef void InternalArenaConstructable_;
-  typedef void DestructorSkippable_;
-  struct Impl_ {
-    ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
-    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-    ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::UninterpretedOption_NamePart > name_;
-    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr identifier_value_;
-    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr string_value_;
-    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr aggregate_value_;
-    uint64_t positive_int_value_;
-    int64_t negative_int_value_;
-    double double_value_;
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_google_2fprotobuf_2fdescriptor_2eproto;
-};
-// -------------------------------------------------------------------
-
-class PROTOBUF_EXPORT SourceCodeInfo_Location final :
-    public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:google.protobuf.SourceCodeInfo.Location) */ {
- public:
-  inline SourceCodeInfo_Location() : SourceCodeInfo_Location(nullptr) {}
-  ~SourceCodeInfo_Location() override;
-  explicit PROTOBUF_CONSTEXPR SourceCodeInfo_Location(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
-
-  SourceCodeInfo_Location(const SourceCodeInfo_Location& from);
-  SourceCodeInfo_Location(SourceCodeInfo_Location&& from) noexcept
-    : SourceCodeInfo_Location() {
-    *this = ::std::move(from);
-  }
-
-  inline SourceCodeInfo_Location& operator=(const SourceCodeInfo_Location& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline SourceCodeInfo_Location& operator=(SourceCodeInfo_Location&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetOwningArena() == from.GetOwningArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetOwningArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::PROTOBUF_NAMESPACE_ID::UnknownFieldSet& unknown_fields() const {
-    return _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance);
-  }
-  inline ::PROTOBUF_NAMESPACE_ID::UnknownFieldSet* mutable_unknown_fields() {
-    return _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>();
-  }
-
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const SourceCodeInfo_Location& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const SourceCodeInfo_Location* internal_default_instance() {
-    return reinterpret_cast<const SourceCodeInfo_Location*>(
-               &_SourceCodeInfo_Location_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    23;
-
-  friend void swap(SourceCodeInfo_Location& a, SourceCodeInfo_Location& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(SourceCodeInfo_Location* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() != nullptr &&
-        GetOwningArena() == other->GetOwningArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() == other->GetOwningArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(SourceCodeInfo_Location* other) {
-    if (other == this) return;
-    GOOGLE_DCHECK(GetOwningArena() == other->GetOwningArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  SourceCodeInfo_Location* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<SourceCodeInfo_Location>(arena);
-  }
-  using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
-  void CopyFrom(const SourceCodeInfo_Location& from);
-  using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom( const SourceCodeInfo_Location& from) {
-    SourceCodeInfo_Location::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  uint8_t* _InternalSerialize(
-      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
-
-  private:
-  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
-  void SharedDtor();
-  void SetCachedSize(int size) const final;
-  void InternalSwap(SourceCodeInfo_Location* other);
-
-  private:
-  friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
-  static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
-    return "google.protobuf.SourceCodeInfo.Location";
-  }
-  protected:
-  explicit SourceCodeInfo_Location(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                       bool is_message_owned = false);
-  public:
-
-  static const ClassData _class_data_;
-  const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*GetClassData() const final;
-
-  ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kPathFieldNumber = 1,
-    kSpanFieldNumber = 2,
-    kLeadingDetachedCommentsFieldNumber = 6,
-    kLeadingCommentsFieldNumber = 3,
-    kTrailingCommentsFieldNumber = 4,
-  };
-  // repeated int32 path = 1 [packed = true];
-  int path_size() const;
-  private:
-  int _internal_path_size() const;
-  public:
-  void clear_path();
-  private:
-  int32_t _internal_path(int index) const;
-  const ::PROTOBUF_NAMESPACE_ID::RepeatedField< int32_t >&
-      _internal_path() const;
-  void _internal_add_path(int32_t value);
-  ::PROTOBUF_NAMESPACE_ID::RepeatedField< int32_t >*
-      _internal_mutable_path();
-  public:
-  int32_t path(int index) const;
-  void set_path(int index, int32_t value);
-  void add_path(int32_t value);
-  const ::PROTOBUF_NAMESPACE_ID::RepeatedField< int32_t >&
-      path() const;
-  ::PROTOBUF_NAMESPACE_ID::RepeatedField< int32_t >*
-      mutable_path();
-
-  // repeated int32 span = 2 [packed = true];
-  int span_size() const;
-  private:
-  int _internal_span_size() const;
-  public:
-  void clear_span();
-  private:
-  int32_t _internal_span(int index) const;
-  const ::PROTOBUF_NAMESPACE_ID::RepeatedField< int32_t >&
-      _internal_span() const;
-  void _internal_add_span(int32_t value);
-  ::PROTOBUF_NAMESPACE_ID::RepeatedField< int32_t >*
-      _internal_mutable_span();
-  public:
-  int32_t span(int index) const;
-  void set_span(int index, int32_t value);
-  void add_span(int32_t value);
-  const ::PROTOBUF_NAMESPACE_ID::RepeatedField< int32_t >&
-      span() const;
-  ::PROTOBUF_NAMESPACE_ID::RepeatedField< int32_t >*
-      mutable_span();
-
-  // repeated string leading_detached_comments = 6;
-  int leading_detached_comments_size() const;
-  private:
-  int _internal_leading_detached_comments_size() const;
-  public:
-  void clear_leading_detached_comments();
-  const std::string& leading_detached_comments(int index) const;
-  std::string* mutable_leading_detached_comments(int index);
-  void set_leading_detached_comments(int index, const std::string& value);
-  void set_leading_detached_comments(int index, std::string&& value);
-  void set_leading_detached_comments(int index, const char* value);
-  void set_leading_detached_comments(int index, const char* value, size_t size);
-  std::string* add_leading_detached_comments();
-  void add_leading_detached_comments(const std::string& value);
-  void add_leading_detached_comments(std::string&& value);
-  void add_leading_detached_comments(const char* value);
-  void add_leading_detached_comments(const char* value, size_t size);
-  const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string>& leading_detached_comments() const;
-  ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string>* mutable_leading_detached_comments();
-  private:
-  const std::string& _internal_leading_detached_comments(int index) const;
-  std::string* _internal_add_leading_detached_comments();
-  public:
-
-  // optional string leading_comments = 3;
-  bool has_leading_comments() const;
-  private:
-  bool _internal_has_leading_comments() const;
-  public:
-  void clear_leading_comments();
-  const std::string& leading_comments() const;
-  template <typename ArgT0 = const std::string&, typename... ArgT>
-  void set_leading_comments(ArgT0&& arg0, ArgT... args);
-  std::string* mutable_leading_comments();
-  PROTOBUF_NODISCARD std::string* release_leading_comments();
-  void set_allocated_leading_comments(std::string* leading_comments);
-  private:
-  const std::string& _internal_leading_comments() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_leading_comments(const std::string& value);
-  std::string* _internal_mutable_leading_comments();
-  public:
-
-  // optional string trailing_comments = 4;
-  bool has_trailing_comments() const;
-  private:
-  bool _internal_has_trailing_comments() const;
-  public:
-  void clear_trailing_comments();
-  const std::string& trailing_comments() const;
-  template <typename ArgT0 = const std::string&, typename... ArgT>
-  void set_trailing_comments(ArgT0&& arg0, ArgT... args);
-  std::string* mutable_trailing_comments();
-  PROTOBUF_NODISCARD std::string* release_trailing_comments();
-  void set_allocated_trailing_comments(std::string* trailing_comments);
-  private:
-  const std::string& _internal_trailing_comments() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_trailing_comments(const std::string& value);
-  std::string* _internal_mutable_trailing_comments();
-  public:
-
-  // @@protoc_insertion_point(class_scope:google.protobuf.SourceCodeInfo.Location)
- private:
-  class _Internal;
-
-  template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
-  typedef void InternalArenaConstructable_;
-  typedef void DestructorSkippable_;
-  struct Impl_ {
-    ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
-    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-    ::PROTOBUF_NAMESPACE_ID::RepeatedField< int32_t > path_;
-    mutable std::atomic<int> _path_cached_byte_size_;
-    ::PROTOBUF_NAMESPACE_ID::RepeatedField< int32_t > span_;
-    mutable std::atomic<int> _span_cached_byte_size_;
-    ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string> leading_detached_comments_;
-    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr leading_comments_;
-    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr trailing_comments_;
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_google_2fprotobuf_2fdescriptor_2eproto;
-};
-// -------------------------------------------------------------------
-
-class PROTOBUF_EXPORT SourceCodeInfo final :
-    public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:google.protobuf.SourceCodeInfo) */ {
- public:
-  inline SourceCodeInfo() : SourceCodeInfo(nullptr) {}
-  ~SourceCodeInfo() override;
-  explicit PROTOBUF_CONSTEXPR SourceCodeInfo(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
-
-  SourceCodeInfo(const SourceCodeInfo& from);
-  SourceCodeInfo(SourceCodeInfo&& from) noexcept
-    : SourceCodeInfo() {
-    *this = ::std::move(from);
-  }
-
-  inline SourceCodeInfo& operator=(const SourceCodeInfo& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline SourceCodeInfo& operator=(SourceCodeInfo&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetOwningArena() == from.GetOwningArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetOwningArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::PROTOBUF_NAMESPACE_ID::UnknownFieldSet& unknown_fields() const {
-    return _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance);
-  }
-  inline ::PROTOBUF_NAMESPACE_ID::UnknownFieldSet* mutable_unknown_fields() {
-    return _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>();
-  }
-
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const SourceCodeInfo& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const SourceCodeInfo* internal_default_instance() {
-    return reinterpret_cast<const SourceCodeInfo*>(
-               &_SourceCodeInfo_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    24;
-
-  friend void swap(SourceCodeInfo& a, SourceCodeInfo& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(SourceCodeInfo* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() != nullptr &&
-        GetOwningArena() == other->GetOwningArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() == other->GetOwningArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(SourceCodeInfo* other) {
-    if (other == this) return;
-    GOOGLE_DCHECK(GetOwningArena() == other->GetOwningArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  SourceCodeInfo* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<SourceCodeInfo>(arena);
-  }
-  using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
-  void CopyFrom(const SourceCodeInfo& from);
-  using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom( const SourceCodeInfo& from) {
-    SourceCodeInfo::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  uint8_t* _InternalSerialize(
-      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
-
-  private:
-  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
-  void SharedDtor();
-  void SetCachedSize(int size) const final;
-  void InternalSwap(SourceCodeInfo* other);
-
-  private:
-  friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
-  static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
-    return "google.protobuf.SourceCodeInfo";
-  }
-  protected:
-  explicit SourceCodeInfo(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                       bool is_message_owned = false);
-  public:
-
-  static const ClassData _class_data_;
-  const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*GetClassData() const final;
-
-  ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  typedef SourceCodeInfo_Location Location;
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kLocationFieldNumber = 1,
-  };
-  // repeated .google.protobuf.SourceCodeInfo.Location location = 1;
-  int location_size() const;
-  private:
-  int _internal_location_size() const;
-  public:
-  void clear_location();
-  ::PROTOBUF_NAMESPACE_ID::SourceCodeInfo_Location* mutable_location(int index);
-  ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::SourceCodeInfo_Location >*
-      mutable_location();
-  private:
-  const ::PROTOBUF_NAMESPACE_ID::SourceCodeInfo_Location& _internal_location(int index) const;
-  ::PROTOBUF_NAMESPACE_ID::SourceCodeInfo_Location* _internal_add_location();
-  public:
-  const ::PROTOBUF_NAMESPACE_ID::SourceCodeInfo_Location& location(int index) const;
-  ::PROTOBUF_NAMESPACE_ID::SourceCodeInfo_Location* add_location();
-  const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::SourceCodeInfo_Location >&
-      location() const;
-
-  // @@protoc_insertion_point(class_scope:google.protobuf.SourceCodeInfo)
- private:
-  class _Internal;
-
-  template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
-  typedef void InternalArenaConstructable_;
-  typedef void DestructorSkippable_;
-  struct Impl_ {
-    ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::SourceCodeInfo_Location > location_;
-    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_google_2fprotobuf_2fdescriptor_2eproto;
-};
-// -------------------------------------------------------------------
-
-class PROTOBUF_EXPORT GeneratedCodeInfo_Annotation final :
-    public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:google.protobuf.GeneratedCodeInfo.Annotation) */ {
- public:
-  inline GeneratedCodeInfo_Annotation() : GeneratedCodeInfo_Annotation(nullptr) {}
-  ~GeneratedCodeInfo_Annotation() override;
-  explicit PROTOBUF_CONSTEXPR GeneratedCodeInfo_Annotation(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
-
-  GeneratedCodeInfo_Annotation(const GeneratedCodeInfo_Annotation& from);
-  GeneratedCodeInfo_Annotation(GeneratedCodeInfo_Annotation&& from) noexcept
-    : GeneratedCodeInfo_Annotation() {
-    *this = ::std::move(from);
-  }
-
-  inline GeneratedCodeInfo_Annotation& operator=(const GeneratedCodeInfo_Annotation& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline GeneratedCodeInfo_Annotation& operator=(GeneratedCodeInfo_Annotation&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetOwningArena() == from.GetOwningArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetOwningArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::PROTOBUF_NAMESPACE_ID::UnknownFieldSet& unknown_fields() const {
-    return _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance);
-  }
-  inline ::PROTOBUF_NAMESPACE_ID::UnknownFieldSet* mutable_unknown_fields() {
-    return _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>();
-  }
-
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const GeneratedCodeInfo_Annotation& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const GeneratedCodeInfo_Annotation* internal_default_instance() {
-    return reinterpret_cast<const GeneratedCodeInfo_Annotation*>(
-               &_GeneratedCodeInfo_Annotation_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    25;
-
-  friend void swap(GeneratedCodeInfo_Annotation& a, GeneratedCodeInfo_Annotation& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(GeneratedCodeInfo_Annotation* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() != nullptr &&
-        GetOwningArena() == other->GetOwningArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() == other->GetOwningArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(GeneratedCodeInfo_Annotation* other) {
-    if (other == this) return;
-    GOOGLE_DCHECK(GetOwningArena() == other->GetOwningArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  GeneratedCodeInfo_Annotation* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<GeneratedCodeInfo_Annotation>(arena);
-  }
-  using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
-  void CopyFrom(const GeneratedCodeInfo_Annotation& from);
-  using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom( const GeneratedCodeInfo_Annotation& from) {
-    GeneratedCodeInfo_Annotation::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  uint8_t* _InternalSerialize(
-      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
-
-  private:
-  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
-  void SharedDtor();
-  void SetCachedSize(int size) const final;
-  void InternalSwap(GeneratedCodeInfo_Annotation* other);
-
-  private:
-  friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
-  static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
-    return "google.protobuf.GeneratedCodeInfo.Annotation";
-  }
-  protected:
-  explicit GeneratedCodeInfo_Annotation(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                       bool is_message_owned = false);
-  public:
-
-  static const ClassData _class_data_;
-  const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*GetClassData() const final;
-
-  ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kPathFieldNumber = 1,
-    kSourceFileFieldNumber = 2,
-    kBeginFieldNumber = 3,
-    kEndFieldNumber = 4,
-  };
-  // repeated int32 path = 1 [packed = true];
-  int path_size() const;
-  private:
-  int _internal_path_size() const;
-  public:
-  void clear_path();
-  private:
-  int32_t _internal_path(int index) const;
-  const ::PROTOBUF_NAMESPACE_ID::RepeatedField< int32_t >&
-      _internal_path() const;
-  void _internal_add_path(int32_t value);
-  ::PROTOBUF_NAMESPACE_ID::RepeatedField< int32_t >*
-      _internal_mutable_path();
-  public:
-  int32_t path(int index) const;
-  void set_path(int index, int32_t value);
-  void add_path(int32_t value);
-  const ::PROTOBUF_NAMESPACE_ID::RepeatedField< int32_t >&
-      path() const;
-  ::PROTOBUF_NAMESPACE_ID::RepeatedField< int32_t >*
-      mutable_path();
-
-  // optional string source_file = 2;
-  bool has_source_file() const;
-  private:
-  bool _internal_has_source_file() const;
-  public:
-  void clear_source_file();
-  const std::string& source_file() const;
-  template <typename ArgT0 = const std::string&, typename... ArgT>
-  void set_source_file(ArgT0&& arg0, ArgT... args);
-  std::string* mutable_source_file();
-  PROTOBUF_NODISCARD std::string* release_source_file();
-  void set_allocated_source_file(std::string* source_file);
-  private:
-  const std::string& _internal_source_file() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_source_file(const std::string& value);
-  std::string* _internal_mutable_source_file();
-  public:
-
-  // optional int32 begin = 3;
-  bool has_begin() const;
-  private:
-  bool _internal_has_begin() const;
-  public:
-  void clear_begin();
-  int32_t begin() const;
-  void set_begin(int32_t value);
-  private:
-  int32_t _internal_begin() const;
-  void _internal_set_begin(int32_t value);
-  public:
-
-  // optional int32 end = 4;
-  bool has_end() const;
-  private:
-  bool _internal_has_end() const;
-  public:
-  void clear_end();
-  int32_t end() const;
-  void set_end(int32_t value);
-  private:
-  int32_t _internal_end() const;
-  void _internal_set_end(int32_t value);
-  public:
-
-  // @@protoc_insertion_point(class_scope:google.protobuf.GeneratedCodeInfo.Annotation)
- private:
-  class _Internal;
-
-  template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
-  typedef void InternalArenaConstructable_;
-  typedef void DestructorSkippable_;
-  struct Impl_ {
-    ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
-    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-    ::PROTOBUF_NAMESPACE_ID::RepeatedField< int32_t > path_;
-    mutable std::atomic<int> _path_cached_byte_size_;
-    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr source_file_;
-    int32_t begin_;
-    int32_t end_;
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_google_2fprotobuf_2fdescriptor_2eproto;
-};
-// -------------------------------------------------------------------
-
-class PROTOBUF_EXPORT GeneratedCodeInfo final :
-    public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:google.protobuf.GeneratedCodeInfo) */ {
- public:
-  inline GeneratedCodeInfo() : GeneratedCodeInfo(nullptr) {}
-  ~GeneratedCodeInfo() override;
-  explicit PROTOBUF_CONSTEXPR GeneratedCodeInfo(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
-
-  GeneratedCodeInfo(const GeneratedCodeInfo& from);
-  GeneratedCodeInfo(GeneratedCodeInfo&& from) noexcept
-    : GeneratedCodeInfo() {
-    *this = ::std::move(from);
-  }
-
-  inline GeneratedCodeInfo& operator=(const GeneratedCodeInfo& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline GeneratedCodeInfo& operator=(GeneratedCodeInfo&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetOwningArena() == from.GetOwningArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetOwningArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::PROTOBUF_NAMESPACE_ID::UnknownFieldSet& unknown_fields() const {
-    return _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance);
-  }
-  inline ::PROTOBUF_NAMESPACE_ID::UnknownFieldSet* mutable_unknown_fields() {
-    return _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>();
-  }
-
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const GeneratedCodeInfo& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const GeneratedCodeInfo* internal_default_instance() {
-    return reinterpret_cast<const GeneratedCodeInfo*>(
-               &_GeneratedCodeInfo_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    26;
-
-  friend void swap(GeneratedCodeInfo& a, GeneratedCodeInfo& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(GeneratedCodeInfo* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() != nullptr &&
-        GetOwningArena() == other->GetOwningArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() == other->GetOwningArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(GeneratedCodeInfo* other) {
-    if (other == this) return;
-    GOOGLE_DCHECK(GetOwningArena() == other->GetOwningArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  GeneratedCodeInfo* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<GeneratedCodeInfo>(arena);
-  }
-  using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
-  void CopyFrom(const GeneratedCodeInfo& from);
-  using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom( const GeneratedCodeInfo& from) {
-    GeneratedCodeInfo::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  uint8_t* _InternalSerialize(
-      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
-
-  private:
-  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
-  void SharedDtor();
-  void SetCachedSize(int size) const final;
-  void InternalSwap(GeneratedCodeInfo* other);
-
-  private:
-  friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
-  static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
-    return "google.protobuf.GeneratedCodeInfo";
-  }
-  protected:
-  explicit GeneratedCodeInfo(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                       bool is_message_owned = false);
-  public:
-
-  static const ClassData _class_data_;
-  const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*GetClassData() const final;
-
-  ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  typedef GeneratedCodeInfo_Annotation Annotation;
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kAnnotationFieldNumber = 1,
-  };
-  // repeated .google.protobuf.GeneratedCodeInfo.Annotation annotation = 1;
-  int annotation_size() const;
-  private:
-  int _internal_annotation_size() const;
-  public:
-  void clear_annotation();
-  ::PROTOBUF_NAMESPACE_ID::GeneratedCodeInfo_Annotation* mutable_annotation(int index);
-  ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::GeneratedCodeInfo_Annotation >*
-      mutable_annotation();
-  private:
-  const ::PROTOBUF_NAMESPACE_ID::GeneratedCodeInfo_Annotation& _internal_annotation(int index) const;
-  ::PROTOBUF_NAMESPACE_ID::GeneratedCodeInfo_Annotation* _internal_add_annotation();
-  public:
-  const ::PROTOBUF_NAMESPACE_ID::GeneratedCodeInfo_Annotation& annotation(int index) const;
-  ::PROTOBUF_NAMESPACE_ID::GeneratedCodeInfo_Annotation* add_annotation();
-  const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::GeneratedCodeInfo_Annotation >&
-      annotation() const;
-
-  // @@protoc_insertion_point(class_scope:google.protobuf.GeneratedCodeInfo)
- private:
-  class _Internal;
-
-  template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
-  typedef void InternalArenaConstructable_;
-  typedef void DestructorSkippable_;
-  struct Impl_ {
-    ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::GeneratedCodeInfo_Annotation > annotation_;
-    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_google_2fprotobuf_2fdescriptor_2eproto;
-};
-// ===================================================================
-
-
-// ===================================================================
-
-#ifdef __GNUC__
-  #pragma GCC diagnostic push
-  #pragma GCC diagnostic ignored "-Wstrict-aliasing"
-#endif  // __GNUC__
-// FileDescriptorSet
-
-// repeated .google.protobuf.FileDescriptorProto file = 1;
-inline int FileDescriptorSet::_internal_file_size() const {
-  return _impl_.file_.size();
-}
-inline int FileDescriptorSet::file_size() const {
-  return _internal_file_size();
-}
-inline void FileDescriptorSet::clear_file() {
-  _impl_.file_.Clear();
-}
-inline ::PROTOBUF_NAMESPACE_ID::FileDescriptorProto* FileDescriptorSet::mutable_file(int index) {
-  // @@protoc_insertion_point(field_mutable:google.protobuf.FileDescriptorSet.file)
-  return _impl_.file_.Mutable(index);
-}
-inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::FileDescriptorProto >*
-FileDescriptorSet::mutable_file() {
-  // @@protoc_insertion_point(field_mutable_list:google.protobuf.FileDescriptorSet.file)
-  return &_impl_.file_;
-}
-inline const ::PROTOBUF_NAMESPACE_ID::FileDescriptorProto& FileDescriptorSet::_internal_file(int index) const {
-  return _impl_.file_.Get(index);
-}
-inline const ::PROTOBUF_NAMESPACE_ID::FileDescriptorProto& FileDescriptorSet::file(int index) const {
-  // @@protoc_insertion_point(field_get:google.protobuf.FileDescriptorSet.file)
-  return _internal_file(index);
-}
-inline ::PROTOBUF_NAMESPACE_ID::FileDescriptorProto* FileDescriptorSet::_internal_add_file() {
-  return _impl_.file_.Add();
-}
-inline ::PROTOBUF_NAMESPACE_ID::FileDescriptorProto* FileDescriptorSet::add_file() {
-  ::PROTOBUF_NAMESPACE_ID::FileDescriptorProto* _add = _internal_add_file();
-  // @@protoc_insertion_point(field_add:google.protobuf.FileDescriptorSet.file)
-  return _add;
-}
-inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::FileDescriptorProto >&
-FileDescriptorSet::file() const {
-  // @@protoc_insertion_point(field_list:google.protobuf.FileDescriptorSet.file)
-  return _impl_.file_;
-}
-
-// -------------------------------------------------------------------
-
-// FileDescriptorProto
-
-// optional string name = 1;
-inline bool FileDescriptorProto::_internal_has_name() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  return value;
-}
-inline bool FileDescriptorProto::has_name() const {
-  return _internal_has_name();
-}
-inline void FileDescriptorProto::clear_name() {
-  _impl_.name_.ClearToEmpty();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-inline const std::string& FileDescriptorProto::name() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.FileDescriptorProto.name)
-  return _internal_name();
-}
-template <typename ArgT0, typename... ArgT>
-inline PROTOBUF_ALWAYS_INLINE
-void FileDescriptorProto::set_name(ArgT0&& arg0, ArgT... args) {
- _impl_._has_bits_[0] |= 0x00000001u;
- _impl_.name_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
-  // @@protoc_insertion_point(field_set:google.protobuf.FileDescriptorProto.name)
-}
-inline std::string* FileDescriptorProto::mutable_name() {
-  std::string* _s = _internal_mutable_name();
-  // @@protoc_insertion_point(field_mutable:google.protobuf.FileDescriptorProto.name)
-  return _s;
-}
-inline const std::string& FileDescriptorProto::_internal_name() const {
-  return _impl_.name_.Get();
-}
-inline void FileDescriptorProto::_internal_set_name(const std::string& value) {
-  _impl_._has_bits_[0] |= 0x00000001u;
-  _impl_.name_.Set(value, GetArenaForAllocation());
-}
-inline std::string* FileDescriptorProto::_internal_mutable_name() {
-  _impl_._has_bits_[0] |= 0x00000001u;
-  return _impl_.name_.Mutable(GetArenaForAllocation());
-}
-inline std::string* FileDescriptorProto::release_name() {
-  // @@protoc_insertion_point(field_release:google.protobuf.FileDescriptorProto.name)
-  if (!_internal_has_name()) {
-    return nullptr;
-  }
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  auto* p = _impl_.name_.Release();
-#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (_impl_.name_.IsDefault()) {
-    _impl_.name_.Set("", GetArenaForAllocation());
-  }
-#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  return p;
-}
-inline void FileDescriptorProto::set_allocated_name(std::string* name) {
-  if (name != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  _impl_.name_.SetAllocated(name, GetArenaForAllocation());
-#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (_impl_.name_.IsDefault()) {
-    _impl_.name_.Set("", GetArenaForAllocation());
-  }
-#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:google.protobuf.FileDescriptorProto.name)
-}
-
-// optional string package = 2;
-inline bool FileDescriptorProto::_internal_has_package() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
-  return value;
-}
-inline bool FileDescriptorProto::has_package() const {
-  return _internal_has_package();
-}
-inline void FileDescriptorProto::clear_package() {
-  _impl_.package_.ClearToEmpty();
-  _impl_._has_bits_[0] &= ~0x00000002u;
-}
-inline const std::string& FileDescriptorProto::package() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.FileDescriptorProto.package)
-  return _internal_package();
-}
-template <typename ArgT0, typename... ArgT>
-inline PROTOBUF_ALWAYS_INLINE
-void FileDescriptorProto::set_package(ArgT0&& arg0, ArgT... args) {
- _impl_._has_bits_[0] |= 0x00000002u;
- _impl_.package_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
-  // @@protoc_insertion_point(field_set:google.protobuf.FileDescriptorProto.package)
-}
-inline std::string* FileDescriptorProto::mutable_package() {
-  std::string* _s = _internal_mutable_package();
-  // @@protoc_insertion_point(field_mutable:google.protobuf.FileDescriptorProto.package)
-  return _s;
-}
-inline const std::string& FileDescriptorProto::_internal_package() const {
-  return _impl_.package_.Get();
-}
-inline void FileDescriptorProto::_internal_set_package(const std::string& value) {
-  _impl_._has_bits_[0] |= 0x00000002u;
-  _impl_.package_.Set(value, GetArenaForAllocation());
-}
-inline std::string* FileDescriptorProto::_internal_mutable_package() {
-  _impl_._has_bits_[0] |= 0x00000002u;
-  return _impl_.package_.Mutable(GetArenaForAllocation());
-}
-inline std::string* FileDescriptorProto::release_package() {
-  // @@protoc_insertion_point(field_release:google.protobuf.FileDescriptorProto.package)
-  if (!_internal_has_package()) {
-    return nullptr;
-  }
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  auto* p = _impl_.package_.Release();
-#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (_impl_.package_.IsDefault()) {
-    _impl_.package_.Set("", GetArenaForAllocation());
-  }
-#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  return p;
-}
-inline void FileDescriptorProto::set_allocated_package(std::string* package) {
-  if (package != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-  _impl_.package_.SetAllocated(package, GetArenaForAllocation());
-#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (_impl_.package_.IsDefault()) {
-    _impl_.package_.Set("", GetArenaForAllocation());
-  }
-#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:google.protobuf.FileDescriptorProto.package)
-}
-
-// repeated string dependency = 3;
-inline int FileDescriptorProto::_internal_dependency_size() const {
-  return _impl_.dependency_.size();
-}
-inline int FileDescriptorProto::dependency_size() const {
-  return _internal_dependency_size();
-}
-inline void FileDescriptorProto::clear_dependency() {
-  _impl_.dependency_.Clear();
-}
-inline std::string* FileDescriptorProto::add_dependency() {
-  std::string* _s = _internal_add_dependency();
-  // @@protoc_insertion_point(field_add_mutable:google.protobuf.FileDescriptorProto.dependency)
-  return _s;
-}
-inline const std::string& FileDescriptorProto::_internal_dependency(int index) const {
-  return _impl_.dependency_.Get(index);
-}
-inline const std::string& FileDescriptorProto::dependency(int index) const {
-  // @@protoc_insertion_point(field_get:google.protobuf.FileDescriptorProto.dependency)
-  return _internal_dependency(index);
-}
-inline std::string* FileDescriptorProto::mutable_dependency(int index) {
-  // @@protoc_insertion_point(field_mutable:google.protobuf.FileDescriptorProto.dependency)
-  return _impl_.dependency_.Mutable(index);
-}
-inline void FileDescriptorProto::set_dependency(int index, const std::string& value) {
-  _impl_.dependency_.Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set:google.protobuf.FileDescriptorProto.dependency)
-}
-inline void FileDescriptorProto::set_dependency(int index, std::string&& value) {
-  _impl_.dependency_.Mutable(index)->assign(std::move(value));
-  // @@protoc_insertion_point(field_set:google.protobuf.FileDescriptorProto.dependency)
-}
-inline void FileDescriptorProto::set_dependency(int index, const char* value) {
-  GOOGLE_DCHECK(value != nullptr);
-  _impl_.dependency_.Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set_char:google.protobuf.FileDescriptorProto.dependency)
-}
-inline void FileDescriptorProto::set_dependency(int index, const char* value, size_t size) {
-  _impl_.dependency_.Mutable(index)->assign(
-    reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_set_pointer:google.protobuf.FileDescriptorProto.dependency)
-}
-inline std::string* FileDescriptorProto::_internal_add_dependency() {
-  return _impl_.dependency_.Add();
-}
-inline void FileDescriptorProto::add_dependency(const std::string& value) {
-  _impl_.dependency_.Add()->assign(value);
-  // @@protoc_insertion_point(field_add:google.protobuf.FileDescriptorProto.dependency)
-}
-inline void FileDescriptorProto::add_dependency(std::string&& value) {
-  _impl_.dependency_.Add(std::move(value));
-  // @@protoc_insertion_point(field_add:google.protobuf.FileDescriptorProto.dependency)
-}
-inline void FileDescriptorProto::add_dependency(const char* value) {
-  GOOGLE_DCHECK(value != nullptr);
-  _impl_.dependency_.Add()->assign(value);
-  // @@protoc_insertion_point(field_add_char:google.protobuf.FileDescriptorProto.dependency)
-}
-inline void FileDescriptorProto::add_dependency(const char* value, size_t size) {
-  _impl_.dependency_.Add()->assign(reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_add_pointer:google.protobuf.FileDescriptorProto.dependency)
-}
-inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string>&
-FileDescriptorProto::dependency() const {
-  // @@protoc_insertion_point(field_list:google.protobuf.FileDescriptorProto.dependency)
-  return _impl_.dependency_;
-}
-inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string>*
-FileDescriptorProto::mutable_dependency() {
-  // @@protoc_insertion_point(field_mutable_list:google.protobuf.FileDescriptorProto.dependency)
-  return &_impl_.dependency_;
-}
-
-// repeated int32 public_dependency = 10;
-inline int FileDescriptorProto::_internal_public_dependency_size() const {
-  return _impl_.public_dependency_.size();
-}
-inline int FileDescriptorProto::public_dependency_size() const {
-  return _internal_public_dependency_size();
-}
-inline void FileDescriptorProto::clear_public_dependency() {
-  _impl_.public_dependency_.Clear();
-}
-inline int32_t FileDescriptorProto::_internal_public_dependency(int index) const {
-  return _impl_.public_dependency_.Get(index);
-}
-inline int32_t FileDescriptorProto::public_dependency(int index) const {
-  // @@protoc_insertion_point(field_get:google.protobuf.FileDescriptorProto.public_dependency)
-  return _internal_public_dependency(index);
-}
-inline void FileDescriptorProto::set_public_dependency(int index, int32_t value) {
-  _impl_.public_dependency_.Set(index, value);
-  // @@protoc_insertion_point(field_set:google.protobuf.FileDescriptorProto.public_dependency)
-}
-inline void FileDescriptorProto::_internal_add_public_dependency(int32_t value) {
-  _impl_.public_dependency_.Add(value);
-}
-inline void FileDescriptorProto::add_public_dependency(int32_t value) {
-  _internal_add_public_dependency(value);
-  // @@protoc_insertion_point(field_add:google.protobuf.FileDescriptorProto.public_dependency)
-}
-inline const ::PROTOBUF_NAMESPACE_ID::RepeatedField< int32_t >&
-FileDescriptorProto::_internal_public_dependency() const {
-  return _impl_.public_dependency_;
-}
-inline const ::PROTOBUF_NAMESPACE_ID::RepeatedField< int32_t >&
-FileDescriptorProto::public_dependency() const {
-  // @@protoc_insertion_point(field_list:google.protobuf.FileDescriptorProto.public_dependency)
-  return _internal_public_dependency();
-}
-inline ::PROTOBUF_NAMESPACE_ID::RepeatedField< int32_t >*
-FileDescriptorProto::_internal_mutable_public_dependency() {
-  return &_impl_.public_dependency_;
-}
-inline ::PROTOBUF_NAMESPACE_ID::RepeatedField< int32_t >*
-FileDescriptorProto::mutable_public_dependency() {
-  // @@protoc_insertion_point(field_mutable_list:google.protobuf.FileDescriptorProto.public_dependency)
-  return _internal_mutable_public_dependency();
-}
-
-// repeated int32 weak_dependency = 11;
-inline int FileDescriptorProto::_internal_weak_dependency_size() const {
-  return _impl_.weak_dependency_.size();
-}
-inline int FileDescriptorProto::weak_dependency_size() const {
-  return _internal_weak_dependency_size();
-}
-inline void FileDescriptorProto::clear_weak_dependency() {
-  _impl_.weak_dependency_.Clear();
-}
-inline int32_t FileDescriptorProto::_internal_weak_dependency(int index) const {
-  return _impl_.weak_dependency_.Get(index);
-}
-inline int32_t FileDescriptorProto::weak_dependency(int index) const {
-  // @@protoc_insertion_point(field_get:google.protobuf.FileDescriptorProto.weak_dependency)
-  return _internal_weak_dependency(index);
-}
-inline void FileDescriptorProto::set_weak_dependency(int index, int32_t value) {
-  _impl_.weak_dependency_.Set(index, value);
-  // @@protoc_insertion_point(field_set:google.protobuf.FileDescriptorProto.weak_dependency)
-}
-inline void FileDescriptorProto::_internal_add_weak_dependency(int32_t value) {
-  _impl_.weak_dependency_.Add(value);
-}
-inline void FileDescriptorProto::add_weak_dependency(int32_t value) {
-  _internal_add_weak_dependency(value);
-  // @@protoc_insertion_point(field_add:google.protobuf.FileDescriptorProto.weak_dependency)
-}
-inline const ::PROTOBUF_NAMESPACE_ID::RepeatedField< int32_t >&
-FileDescriptorProto::_internal_weak_dependency() const {
-  return _impl_.weak_dependency_;
-}
-inline const ::PROTOBUF_NAMESPACE_ID::RepeatedField< int32_t >&
-FileDescriptorProto::weak_dependency() const {
-  // @@protoc_insertion_point(field_list:google.protobuf.FileDescriptorProto.weak_dependency)
-  return _internal_weak_dependency();
-}
-inline ::PROTOBUF_NAMESPACE_ID::RepeatedField< int32_t >*
-FileDescriptorProto::_internal_mutable_weak_dependency() {
-  return &_impl_.weak_dependency_;
-}
-inline ::PROTOBUF_NAMESPACE_ID::RepeatedField< int32_t >*
-FileDescriptorProto::mutable_weak_dependency() {
-  // @@protoc_insertion_point(field_mutable_list:google.protobuf.FileDescriptorProto.weak_dependency)
-  return _internal_mutable_weak_dependency();
-}
-
-// repeated .google.protobuf.DescriptorProto message_type = 4;
-inline int FileDescriptorProto::_internal_message_type_size() const {
-  return _impl_.message_type_.size();
-}
-inline int FileDescriptorProto::message_type_size() const {
-  return _internal_message_type_size();
-}
-inline void FileDescriptorProto::clear_message_type() {
-  _impl_.message_type_.Clear();
-}
-inline ::PROTOBUF_NAMESPACE_ID::DescriptorProto* FileDescriptorProto::mutable_message_type(int index) {
-  // @@protoc_insertion_point(field_mutable:google.protobuf.FileDescriptorProto.message_type)
-  return _impl_.message_type_.Mutable(index);
-}
-inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::DescriptorProto >*
-FileDescriptorProto::mutable_message_type() {
-  // @@protoc_insertion_point(field_mutable_list:google.protobuf.FileDescriptorProto.message_type)
-  return &_impl_.message_type_;
-}
-inline const ::PROTOBUF_NAMESPACE_ID::DescriptorProto& FileDescriptorProto::_internal_message_type(int index) const {
-  return _impl_.message_type_.Get(index);
-}
-inline const ::PROTOBUF_NAMESPACE_ID::DescriptorProto& FileDescriptorProto::message_type(int index) const {
-  // @@protoc_insertion_point(field_get:google.protobuf.FileDescriptorProto.message_type)
-  return _internal_message_type(index);
-}
-inline ::PROTOBUF_NAMESPACE_ID::DescriptorProto* FileDescriptorProto::_internal_add_message_type() {
-  return _impl_.message_type_.Add();
-}
-inline ::PROTOBUF_NAMESPACE_ID::DescriptorProto* FileDescriptorProto::add_message_type() {
-  ::PROTOBUF_NAMESPACE_ID::DescriptorProto* _add = _internal_add_message_type();
-  // @@protoc_insertion_point(field_add:google.protobuf.FileDescriptorProto.message_type)
-  return _add;
-}
-inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::DescriptorProto >&
-FileDescriptorProto::message_type() const {
-  // @@protoc_insertion_point(field_list:google.protobuf.FileDescriptorProto.message_type)
-  return _impl_.message_type_;
-}
-
-// repeated .google.protobuf.EnumDescriptorProto enum_type = 5;
-inline int FileDescriptorProto::_internal_enum_type_size() const {
-  return _impl_.enum_type_.size();
-}
-inline int FileDescriptorProto::enum_type_size() const {
-  return _internal_enum_type_size();
-}
-inline void FileDescriptorProto::clear_enum_type() {
-  _impl_.enum_type_.Clear();
-}
-inline ::PROTOBUF_NAMESPACE_ID::EnumDescriptorProto* FileDescriptorProto::mutable_enum_type(int index) {
-  // @@protoc_insertion_point(field_mutable:google.protobuf.FileDescriptorProto.enum_type)
-  return _impl_.enum_type_.Mutable(index);
-}
-inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::EnumDescriptorProto >*
-FileDescriptorProto::mutable_enum_type() {
-  // @@protoc_insertion_point(field_mutable_list:google.protobuf.FileDescriptorProto.enum_type)
-  return &_impl_.enum_type_;
-}
-inline const ::PROTOBUF_NAMESPACE_ID::EnumDescriptorProto& FileDescriptorProto::_internal_enum_type(int index) const {
-  return _impl_.enum_type_.Get(index);
-}
-inline const ::PROTOBUF_NAMESPACE_ID::EnumDescriptorProto& FileDescriptorProto::enum_type(int index) const {
-  // @@protoc_insertion_point(field_get:google.protobuf.FileDescriptorProto.enum_type)
-  return _internal_enum_type(index);
-}
-inline ::PROTOBUF_NAMESPACE_ID::EnumDescriptorProto* FileDescriptorProto::_internal_add_enum_type() {
-  return _impl_.enum_type_.Add();
-}
-inline ::PROTOBUF_NAMESPACE_ID::EnumDescriptorProto* FileDescriptorProto::add_enum_type() {
-  ::PROTOBUF_NAMESPACE_ID::EnumDescriptorProto* _add = _internal_add_enum_type();
-  // @@protoc_insertion_point(field_add:google.protobuf.FileDescriptorProto.enum_type)
-  return _add;
-}
-inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::EnumDescriptorProto >&
-FileDescriptorProto::enum_type() const {
-  // @@protoc_insertion_point(field_list:google.protobuf.FileDescriptorProto.enum_type)
-  return _impl_.enum_type_;
-}
-
-// repeated .google.protobuf.ServiceDescriptorProto service = 6;
-inline int FileDescriptorProto::_internal_service_size() const {
-  return _impl_.service_.size();
-}
-inline int FileDescriptorProto::service_size() const {
-  return _internal_service_size();
-}
-inline void FileDescriptorProto::clear_service() {
-  _impl_.service_.Clear();
-}
-inline ::PROTOBUF_NAMESPACE_ID::ServiceDescriptorProto* FileDescriptorProto::mutable_service(int index) {
-  // @@protoc_insertion_point(field_mutable:google.protobuf.FileDescriptorProto.service)
-  return _impl_.service_.Mutable(index);
-}
-inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::ServiceDescriptorProto >*
-FileDescriptorProto::mutable_service() {
-  // @@protoc_insertion_point(field_mutable_list:google.protobuf.FileDescriptorProto.service)
-  return &_impl_.service_;
-}
-inline const ::PROTOBUF_NAMESPACE_ID::ServiceDescriptorProto& FileDescriptorProto::_internal_service(int index) const {
-  return _impl_.service_.Get(index);
-}
-inline const ::PROTOBUF_NAMESPACE_ID::ServiceDescriptorProto& FileDescriptorProto::service(int index) const {
-  // @@protoc_insertion_point(field_get:google.protobuf.FileDescriptorProto.service)
-  return _internal_service(index);
-}
-inline ::PROTOBUF_NAMESPACE_ID::ServiceDescriptorProto* FileDescriptorProto::_internal_add_service() {
-  return _impl_.service_.Add();
-}
-inline ::PROTOBUF_NAMESPACE_ID::ServiceDescriptorProto* FileDescriptorProto::add_service() {
-  ::PROTOBUF_NAMESPACE_ID::ServiceDescriptorProto* _add = _internal_add_service();
-  // @@protoc_insertion_point(field_add:google.protobuf.FileDescriptorProto.service)
-  return _add;
-}
-inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::ServiceDescriptorProto >&
-FileDescriptorProto::service() const {
-  // @@protoc_insertion_point(field_list:google.protobuf.FileDescriptorProto.service)
-  return _impl_.service_;
-}
-
-// repeated .google.protobuf.FieldDescriptorProto extension = 7;
-inline int FileDescriptorProto::_internal_extension_size() const {
-  return _impl_.extension_.size();
-}
-inline int FileDescriptorProto::extension_size() const {
-  return _internal_extension_size();
-}
-inline void FileDescriptorProto::clear_extension() {
-  _impl_.extension_.Clear();
-}
-inline ::PROTOBUF_NAMESPACE_ID::FieldDescriptorProto* FileDescriptorProto::mutable_extension(int index) {
-  // @@protoc_insertion_point(field_mutable:google.protobuf.FileDescriptorProto.extension)
-  return _impl_.extension_.Mutable(index);
-}
-inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::FieldDescriptorProto >*
-FileDescriptorProto::mutable_extension() {
-  // @@protoc_insertion_point(field_mutable_list:google.protobuf.FileDescriptorProto.extension)
-  return &_impl_.extension_;
-}
-inline const ::PROTOBUF_NAMESPACE_ID::FieldDescriptorProto& FileDescriptorProto::_internal_extension(int index) const {
-  return _impl_.extension_.Get(index);
-}
-inline const ::PROTOBUF_NAMESPACE_ID::FieldDescriptorProto& FileDescriptorProto::extension(int index) const {
-  // @@protoc_insertion_point(field_get:google.protobuf.FileDescriptorProto.extension)
-  return _internal_extension(index);
-}
-inline ::PROTOBUF_NAMESPACE_ID::FieldDescriptorProto* FileDescriptorProto::_internal_add_extension() {
-  return _impl_.extension_.Add();
-}
-inline ::PROTOBUF_NAMESPACE_ID::FieldDescriptorProto* FileDescriptorProto::add_extension() {
-  ::PROTOBUF_NAMESPACE_ID::FieldDescriptorProto* _add = _internal_add_extension();
-  // @@protoc_insertion_point(field_add:google.protobuf.FileDescriptorProto.extension)
-  return _add;
-}
-inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::FieldDescriptorProto >&
-FileDescriptorProto::extension() const {
-  // @@protoc_insertion_point(field_list:google.protobuf.FileDescriptorProto.extension)
-  return _impl_.extension_;
-}
-
-// optional .google.protobuf.FileOptions options = 8;
-inline bool FileDescriptorProto::_internal_has_options() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000008u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.options_ != nullptr);
-  return value;
-}
-inline bool FileDescriptorProto::has_options() const {
-  return _internal_has_options();
-}
-inline void FileDescriptorProto::clear_options() {
-  if (_impl_.options_ != nullptr) _impl_.options_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000008u;
-}
-inline const ::PROTOBUF_NAMESPACE_ID::FileOptions& FileDescriptorProto::_internal_options() const {
-  const ::PROTOBUF_NAMESPACE_ID::FileOptions* p = _impl_.options_;
-  return p != nullptr ? *p : reinterpret_cast<const ::PROTOBUF_NAMESPACE_ID::FileOptions&>(
-      ::PROTOBUF_NAMESPACE_ID::_FileOptions_default_instance_);
-}
-inline const ::PROTOBUF_NAMESPACE_ID::FileOptions& FileDescriptorProto::options() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.FileDescriptorProto.options)
-  return _internal_options();
-}
-inline void FileDescriptorProto::unsafe_arena_set_allocated_options(
-    ::PROTOBUF_NAMESPACE_ID::FileOptions* options) {
-  if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.options_);
-  }
-  _impl_.options_ = options;
-  if (options) {
-    _impl_._has_bits_[0] |= 0x00000008u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000008u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:google.protobuf.FileDescriptorProto.options)
-}
-inline ::PROTOBUF_NAMESPACE_ID::FileOptions* FileDescriptorProto::release_options() {
-  _impl_._has_bits_[0] &= ~0x00000008u;
-  ::PROTOBUF_NAMESPACE_ID::FileOptions* temp = _impl_.options_;
-  _impl_.options_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
-  temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
-  if (GetArenaForAllocation() == nullptr) { delete old; }
-#else  // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArenaForAllocation() != nullptr) {
-    temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return temp;
-}
-inline ::PROTOBUF_NAMESPACE_ID::FileOptions* FileDescriptorProto::unsafe_arena_release_options() {
-  // @@protoc_insertion_point(field_release:google.protobuf.FileDescriptorProto.options)
-  _impl_._has_bits_[0] &= ~0x00000008u;
-  ::PROTOBUF_NAMESPACE_ID::FileOptions* temp = _impl_.options_;
-  _impl_.options_ = nullptr;
-  return temp;
-}
-inline ::PROTOBUF_NAMESPACE_ID::FileOptions* FileDescriptorProto::_internal_mutable_options() {
-  _impl_._has_bits_[0] |= 0x00000008u;
-  if (_impl_.options_ == nullptr) {
-    auto* p = CreateMaybeMessage<::PROTOBUF_NAMESPACE_ID::FileOptions>(GetArenaForAllocation());
-    _impl_.options_ = p;
-  }
-  return _impl_.options_;
-}
-inline ::PROTOBUF_NAMESPACE_ID::FileOptions* FileDescriptorProto::mutable_options() {
-  ::PROTOBUF_NAMESPACE_ID::FileOptions* _msg = _internal_mutable_options();
-  // @@protoc_insertion_point(field_mutable:google.protobuf.FileDescriptorProto.options)
-  return _msg;
-}
-inline void FileDescriptorProto::set_allocated_options(::PROTOBUF_NAMESPACE_ID::FileOptions* options) {
-  ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
-  if (message_arena == nullptr) {
-    delete _impl_.options_;
-  }
-  if (options) {
-    ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(options);
-    if (message_arena != submessage_arena) {
-      options = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
-          message_arena, options, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000008u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000008u;
-  }
-  _impl_.options_ = options;
-  // @@protoc_insertion_point(field_set_allocated:google.protobuf.FileDescriptorProto.options)
-}
-
-// optional .google.protobuf.SourceCodeInfo source_code_info = 9;
-inline bool FileDescriptorProto::_internal_has_source_code_info() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000010u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.source_code_info_ != nullptr);
-  return value;
-}
-inline bool FileDescriptorProto::has_source_code_info() const {
-  return _internal_has_source_code_info();
-}
-inline void FileDescriptorProto::clear_source_code_info() {
-  if (_impl_.source_code_info_ != nullptr) _impl_.source_code_info_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000010u;
-}
-inline const ::PROTOBUF_NAMESPACE_ID::SourceCodeInfo& FileDescriptorProto::_internal_source_code_info() const {
-  const ::PROTOBUF_NAMESPACE_ID::SourceCodeInfo* p = _impl_.source_code_info_;
-  return p != nullptr ? *p : reinterpret_cast<const ::PROTOBUF_NAMESPACE_ID::SourceCodeInfo&>(
-      ::PROTOBUF_NAMESPACE_ID::_SourceCodeInfo_default_instance_);
-}
-inline const ::PROTOBUF_NAMESPACE_ID::SourceCodeInfo& FileDescriptorProto::source_code_info() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.FileDescriptorProto.source_code_info)
-  return _internal_source_code_info();
-}
-inline void FileDescriptorProto::unsafe_arena_set_allocated_source_code_info(
-    ::PROTOBUF_NAMESPACE_ID::SourceCodeInfo* source_code_info) {
-  if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.source_code_info_);
-  }
-  _impl_.source_code_info_ = source_code_info;
-  if (source_code_info) {
-    _impl_._has_bits_[0] |= 0x00000010u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000010u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:google.protobuf.FileDescriptorProto.source_code_info)
-}
-inline ::PROTOBUF_NAMESPACE_ID::SourceCodeInfo* FileDescriptorProto::release_source_code_info() {
-  _impl_._has_bits_[0] &= ~0x00000010u;
-  ::PROTOBUF_NAMESPACE_ID::SourceCodeInfo* temp = _impl_.source_code_info_;
-  _impl_.source_code_info_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
-  temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
-  if (GetArenaForAllocation() == nullptr) { delete old; }
-#else  // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArenaForAllocation() != nullptr) {
-    temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return temp;
-}
-inline ::PROTOBUF_NAMESPACE_ID::SourceCodeInfo* FileDescriptorProto::unsafe_arena_release_source_code_info() {
-  // @@protoc_insertion_point(field_release:google.protobuf.FileDescriptorProto.source_code_info)
-  _impl_._has_bits_[0] &= ~0x00000010u;
-  ::PROTOBUF_NAMESPACE_ID::SourceCodeInfo* temp = _impl_.source_code_info_;
-  _impl_.source_code_info_ = nullptr;
-  return temp;
-}
-inline ::PROTOBUF_NAMESPACE_ID::SourceCodeInfo* FileDescriptorProto::_internal_mutable_source_code_info() {
-  _impl_._has_bits_[0] |= 0x00000010u;
-  if (_impl_.source_code_info_ == nullptr) {
-    auto* p = CreateMaybeMessage<::PROTOBUF_NAMESPACE_ID::SourceCodeInfo>(GetArenaForAllocation());
-    _impl_.source_code_info_ = p;
-  }
-  return _impl_.source_code_info_;
-}
-inline ::PROTOBUF_NAMESPACE_ID::SourceCodeInfo* FileDescriptorProto::mutable_source_code_info() {
-  ::PROTOBUF_NAMESPACE_ID::SourceCodeInfo* _msg = _internal_mutable_source_code_info();
-  // @@protoc_insertion_point(field_mutable:google.protobuf.FileDescriptorProto.source_code_info)
-  return _msg;
-}
-inline void FileDescriptorProto::set_allocated_source_code_info(::PROTOBUF_NAMESPACE_ID::SourceCodeInfo* source_code_info) {
-  ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
-  if (message_arena == nullptr) {
-    delete _impl_.source_code_info_;
-  }
-  if (source_code_info) {
-    ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(source_code_info);
-    if (message_arena != submessage_arena) {
-      source_code_info = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
-          message_arena, source_code_info, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000010u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000010u;
-  }
-  _impl_.source_code_info_ = source_code_info;
-  // @@protoc_insertion_point(field_set_allocated:google.protobuf.FileDescriptorProto.source_code_info)
-}
-
-// optional string syntax = 12;
-inline bool FileDescriptorProto::_internal_has_syntax() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000004u) != 0;
-  return value;
-}
-inline bool FileDescriptorProto::has_syntax() const {
-  return _internal_has_syntax();
-}
-inline void FileDescriptorProto::clear_syntax() {
-  _impl_.syntax_.ClearToEmpty();
-  _impl_._has_bits_[0] &= ~0x00000004u;
-}
-inline const std::string& FileDescriptorProto::syntax() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.FileDescriptorProto.syntax)
-  return _internal_syntax();
-}
-template <typename ArgT0, typename... ArgT>
-inline PROTOBUF_ALWAYS_INLINE
-void FileDescriptorProto::set_syntax(ArgT0&& arg0, ArgT... args) {
- _impl_._has_bits_[0] |= 0x00000004u;
- _impl_.syntax_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
-  // @@protoc_insertion_point(field_set:google.protobuf.FileDescriptorProto.syntax)
-}
-inline std::string* FileDescriptorProto::mutable_syntax() {
-  std::string* _s = _internal_mutable_syntax();
-  // @@protoc_insertion_point(field_mutable:google.protobuf.FileDescriptorProto.syntax)
-  return _s;
-}
-inline const std::string& FileDescriptorProto::_internal_syntax() const {
-  return _impl_.syntax_.Get();
-}
-inline void FileDescriptorProto::_internal_set_syntax(const std::string& value) {
-  _impl_._has_bits_[0] |= 0x00000004u;
-  _impl_.syntax_.Set(value, GetArenaForAllocation());
-}
-inline std::string* FileDescriptorProto::_internal_mutable_syntax() {
-  _impl_._has_bits_[0] |= 0x00000004u;
-  return _impl_.syntax_.Mutable(GetArenaForAllocation());
-}
-inline std::string* FileDescriptorProto::release_syntax() {
-  // @@protoc_insertion_point(field_release:google.protobuf.FileDescriptorProto.syntax)
-  if (!_internal_has_syntax()) {
-    return nullptr;
-  }
-  _impl_._has_bits_[0] &= ~0x00000004u;
-  auto* p = _impl_.syntax_.Release();
-#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (_impl_.syntax_.IsDefault()) {
-    _impl_.syntax_.Set("", GetArenaForAllocation());
-  }
-#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  return p;
-}
-inline void FileDescriptorProto::set_allocated_syntax(std::string* syntax) {
-  if (syntax != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000004u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000004u;
-  }
-  _impl_.syntax_.SetAllocated(syntax, GetArenaForAllocation());
-#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (_impl_.syntax_.IsDefault()) {
-    _impl_.syntax_.Set("", GetArenaForAllocation());
-  }
-#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:google.protobuf.FileDescriptorProto.syntax)
-}
-
-// -------------------------------------------------------------------
-
-// DescriptorProto_ExtensionRange
-
-// optional int32 start = 1;
-inline bool DescriptorProto_ExtensionRange::_internal_has_start() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
-  return value;
-}
-inline bool DescriptorProto_ExtensionRange::has_start() const {
-  return _internal_has_start();
-}
-inline void DescriptorProto_ExtensionRange::clear_start() {
-  _impl_.start_ = 0;
-  _impl_._has_bits_[0] &= ~0x00000002u;
-}
-inline int32_t DescriptorProto_ExtensionRange::_internal_start() const {
-  return _impl_.start_;
-}
-inline int32_t DescriptorProto_ExtensionRange::start() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.DescriptorProto.ExtensionRange.start)
-  return _internal_start();
-}
-inline void DescriptorProto_ExtensionRange::_internal_set_start(int32_t value) {
-  _impl_._has_bits_[0] |= 0x00000002u;
-  _impl_.start_ = value;
-}
-inline void DescriptorProto_ExtensionRange::set_start(int32_t value) {
-  _internal_set_start(value);
-  // @@protoc_insertion_point(field_set:google.protobuf.DescriptorProto.ExtensionRange.start)
-}
-
-// optional int32 end = 2;
-inline bool DescriptorProto_ExtensionRange::_internal_has_end() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000004u) != 0;
-  return value;
-}
-inline bool DescriptorProto_ExtensionRange::has_end() const {
-  return _internal_has_end();
-}
-inline void DescriptorProto_ExtensionRange::clear_end() {
-  _impl_.end_ = 0;
-  _impl_._has_bits_[0] &= ~0x00000004u;
-}
-inline int32_t DescriptorProto_ExtensionRange::_internal_end() const {
-  return _impl_.end_;
-}
-inline int32_t DescriptorProto_ExtensionRange::end() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.DescriptorProto.ExtensionRange.end)
-  return _internal_end();
-}
-inline void DescriptorProto_ExtensionRange::_internal_set_end(int32_t value) {
-  _impl_._has_bits_[0] |= 0x00000004u;
-  _impl_.end_ = value;
-}
-inline void DescriptorProto_ExtensionRange::set_end(int32_t value) {
-  _internal_set_end(value);
-  // @@protoc_insertion_point(field_set:google.protobuf.DescriptorProto.ExtensionRange.end)
-}
-
-// optional .google.protobuf.ExtensionRangeOptions options = 3;
-inline bool DescriptorProto_ExtensionRange::_internal_has_options() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.options_ != nullptr);
-  return value;
-}
-inline bool DescriptorProto_ExtensionRange::has_options() const {
-  return _internal_has_options();
-}
-inline void DescriptorProto_ExtensionRange::clear_options() {
-  if (_impl_.options_ != nullptr) _impl_.options_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-inline const ::PROTOBUF_NAMESPACE_ID::ExtensionRangeOptions& DescriptorProto_ExtensionRange::_internal_options() const {
-  const ::PROTOBUF_NAMESPACE_ID::ExtensionRangeOptions* p = _impl_.options_;
-  return p != nullptr ? *p : reinterpret_cast<const ::PROTOBUF_NAMESPACE_ID::ExtensionRangeOptions&>(
-      ::PROTOBUF_NAMESPACE_ID::_ExtensionRangeOptions_default_instance_);
-}
-inline const ::PROTOBUF_NAMESPACE_ID::ExtensionRangeOptions& DescriptorProto_ExtensionRange::options() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.DescriptorProto.ExtensionRange.options)
-  return _internal_options();
-}
-inline void DescriptorProto_ExtensionRange::unsafe_arena_set_allocated_options(
-    ::PROTOBUF_NAMESPACE_ID::ExtensionRangeOptions* options) {
-  if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.options_);
-  }
-  _impl_.options_ = options;
-  if (options) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:google.protobuf.DescriptorProto.ExtensionRange.options)
-}
-inline ::PROTOBUF_NAMESPACE_ID::ExtensionRangeOptions* DescriptorProto_ExtensionRange::release_options() {
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::PROTOBUF_NAMESPACE_ID::ExtensionRangeOptions* temp = _impl_.options_;
-  _impl_.options_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
-  temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
-  if (GetArenaForAllocation() == nullptr) { delete old; }
-#else  // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArenaForAllocation() != nullptr) {
-    temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return temp;
-}
-inline ::PROTOBUF_NAMESPACE_ID::ExtensionRangeOptions* DescriptorProto_ExtensionRange::unsafe_arena_release_options() {
-  // @@protoc_insertion_point(field_release:google.protobuf.DescriptorProto.ExtensionRange.options)
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::PROTOBUF_NAMESPACE_ID::ExtensionRangeOptions* temp = _impl_.options_;
-  _impl_.options_ = nullptr;
-  return temp;
-}
-inline ::PROTOBUF_NAMESPACE_ID::ExtensionRangeOptions* DescriptorProto_ExtensionRange::_internal_mutable_options() {
-  _impl_._has_bits_[0] |= 0x00000001u;
-  if (_impl_.options_ == nullptr) {
-    auto* p = CreateMaybeMessage<::PROTOBUF_NAMESPACE_ID::ExtensionRangeOptions>(GetArenaForAllocation());
-    _impl_.options_ = p;
-  }
-  return _impl_.options_;
-}
-inline ::PROTOBUF_NAMESPACE_ID::ExtensionRangeOptions* DescriptorProto_ExtensionRange::mutable_options() {
-  ::PROTOBUF_NAMESPACE_ID::ExtensionRangeOptions* _msg = _internal_mutable_options();
-  // @@protoc_insertion_point(field_mutable:google.protobuf.DescriptorProto.ExtensionRange.options)
-  return _msg;
-}
-inline void DescriptorProto_ExtensionRange::set_allocated_options(::PROTOBUF_NAMESPACE_ID::ExtensionRangeOptions* options) {
-  ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
-  if (message_arena == nullptr) {
-    delete _impl_.options_;
-  }
-  if (options) {
-    ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(options);
-    if (message_arena != submessage_arena) {
-      options = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
-          message_arena, options, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  _impl_.options_ = options;
-  // @@protoc_insertion_point(field_set_allocated:google.protobuf.DescriptorProto.ExtensionRange.options)
-}
-
-// -------------------------------------------------------------------
-
-// DescriptorProto_ReservedRange
-
-// optional int32 start = 1;
-inline bool DescriptorProto_ReservedRange::_internal_has_start() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  return value;
-}
-inline bool DescriptorProto_ReservedRange::has_start() const {
-  return _internal_has_start();
-}
-inline void DescriptorProto_ReservedRange::clear_start() {
-  _impl_.start_ = 0;
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-inline int32_t DescriptorProto_ReservedRange::_internal_start() const {
-  return _impl_.start_;
-}
-inline int32_t DescriptorProto_ReservedRange::start() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.DescriptorProto.ReservedRange.start)
-  return _internal_start();
-}
-inline void DescriptorProto_ReservedRange::_internal_set_start(int32_t value) {
-  _impl_._has_bits_[0] |= 0x00000001u;
-  _impl_.start_ = value;
-}
-inline void DescriptorProto_ReservedRange::set_start(int32_t value) {
-  _internal_set_start(value);
-  // @@protoc_insertion_point(field_set:google.protobuf.DescriptorProto.ReservedRange.start)
-}
-
-// optional int32 end = 2;
-inline bool DescriptorProto_ReservedRange::_internal_has_end() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
-  return value;
-}
-inline bool DescriptorProto_ReservedRange::has_end() const {
-  return _internal_has_end();
-}
-inline void DescriptorProto_ReservedRange::clear_end() {
-  _impl_.end_ = 0;
-  _impl_._has_bits_[0] &= ~0x00000002u;
-}
-inline int32_t DescriptorProto_ReservedRange::_internal_end() const {
-  return _impl_.end_;
-}
-inline int32_t DescriptorProto_ReservedRange::end() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.DescriptorProto.ReservedRange.end)
-  return _internal_end();
-}
-inline void DescriptorProto_ReservedRange::_internal_set_end(int32_t value) {
-  _impl_._has_bits_[0] |= 0x00000002u;
-  _impl_.end_ = value;
-}
-inline void DescriptorProto_ReservedRange::set_end(int32_t value) {
-  _internal_set_end(value);
-  // @@protoc_insertion_point(field_set:google.protobuf.DescriptorProto.ReservedRange.end)
-}
-
-// -------------------------------------------------------------------
-
-// DescriptorProto
-
-// optional string name = 1;
-inline bool DescriptorProto::_internal_has_name() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  return value;
-}
-inline bool DescriptorProto::has_name() const {
-  return _internal_has_name();
-}
-inline void DescriptorProto::clear_name() {
-  _impl_.name_.ClearToEmpty();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-inline const std::string& DescriptorProto::name() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.DescriptorProto.name)
-  return _internal_name();
-}
-template <typename ArgT0, typename... ArgT>
-inline PROTOBUF_ALWAYS_INLINE
-void DescriptorProto::set_name(ArgT0&& arg0, ArgT... args) {
- _impl_._has_bits_[0] |= 0x00000001u;
- _impl_.name_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
-  // @@protoc_insertion_point(field_set:google.protobuf.DescriptorProto.name)
-}
-inline std::string* DescriptorProto::mutable_name() {
-  std::string* _s = _internal_mutable_name();
-  // @@protoc_insertion_point(field_mutable:google.protobuf.DescriptorProto.name)
-  return _s;
-}
-inline const std::string& DescriptorProto::_internal_name() const {
-  return _impl_.name_.Get();
-}
-inline void DescriptorProto::_internal_set_name(const std::string& value) {
-  _impl_._has_bits_[0] |= 0x00000001u;
-  _impl_.name_.Set(value, GetArenaForAllocation());
-}
-inline std::string* DescriptorProto::_internal_mutable_name() {
-  _impl_._has_bits_[0] |= 0x00000001u;
-  return _impl_.name_.Mutable(GetArenaForAllocation());
-}
-inline std::string* DescriptorProto::release_name() {
-  // @@protoc_insertion_point(field_release:google.protobuf.DescriptorProto.name)
-  if (!_internal_has_name()) {
-    return nullptr;
-  }
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  auto* p = _impl_.name_.Release();
-#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (_impl_.name_.IsDefault()) {
-    _impl_.name_.Set("", GetArenaForAllocation());
-  }
-#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  return p;
-}
-inline void DescriptorProto::set_allocated_name(std::string* name) {
-  if (name != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  _impl_.name_.SetAllocated(name, GetArenaForAllocation());
-#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (_impl_.name_.IsDefault()) {
-    _impl_.name_.Set("", GetArenaForAllocation());
-  }
-#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:google.protobuf.DescriptorProto.name)
-}
-
-// repeated .google.protobuf.FieldDescriptorProto field = 2;
-inline int DescriptorProto::_internal_field_size() const {
-  return _impl_.field_.size();
-}
-inline int DescriptorProto::field_size() const {
-  return _internal_field_size();
-}
-inline void DescriptorProto::clear_field() {
-  _impl_.field_.Clear();
-}
-inline ::PROTOBUF_NAMESPACE_ID::FieldDescriptorProto* DescriptorProto::mutable_field(int index) {
-  // @@protoc_insertion_point(field_mutable:google.protobuf.DescriptorProto.field)
-  return _impl_.field_.Mutable(index);
-}
-inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::FieldDescriptorProto >*
-DescriptorProto::mutable_field() {
-  // @@protoc_insertion_point(field_mutable_list:google.protobuf.DescriptorProto.field)
-  return &_impl_.field_;
-}
-inline const ::PROTOBUF_NAMESPACE_ID::FieldDescriptorProto& DescriptorProto::_internal_field(int index) const {
-  return _impl_.field_.Get(index);
-}
-inline const ::PROTOBUF_NAMESPACE_ID::FieldDescriptorProto& DescriptorProto::field(int index) const {
-  // @@protoc_insertion_point(field_get:google.protobuf.DescriptorProto.field)
-  return _internal_field(index);
-}
-inline ::PROTOBUF_NAMESPACE_ID::FieldDescriptorProto* DescriptorProto::_internal_add_field() {
-  return _impl_.field_.Add();
-}
-inline ::PROTOBUF_NAMESPACE_ID::FieldDescriptorProto* DescriptorProto::add_field() {
-  ::PROTOBUF_NAMESPACE_ID::FieldDescriptorProto* _add = _internal_add_field();
-  // @@protoc_insertion_point(field_add:google.protobuf.DescriptorProto.field)
-  return _add;
-}
-inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::FieldDescriptorProto >&
-DescriptorProto::field() const {
-  // @@protoc_insertion_point(field_list:google.protobuf.DescriptorProto.field)
-  return _impl_.field_;
-}
-
-// repeated .google.protobuf.FieldDescriptorProto extension = 6;
-inline int DescriptorProto::_internal_extension_size() const {
-  return _impl_.extension_.size();
-}
-inline int DescriptorProto::extension_size() const {
-  return _internal_extension_size();
-}
-inline void DescriptorProto::clear_extension() {
-  _impl_.extension_.Clear();
-}
-inline ::PROTOBUF_NAMESPACE_ID::FieldDescriptorProto* DescriptorProto::mutable_extension(int index) {
-  // @@protoc_insertion_point(field_mutable:google.protobuf.DescriptorProto.extension)
-  return _impl_.extension_.Mutable(index);
-}
-inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::FieldDescriptorProto >*
-DescriptorProto::mutable_extension() {
-  // @@protoc_insertion_point(field_mutable_list:google.protobuf.DescriptorProto.extension)
-  return &_impl_.extension_;
-}
-inline const ::PROTOBUF_NAMESPACE_ID::FieldDescriptorProto& DescriptorProto::_internal_extension(int index) const {
-  return _impl_.extension_.Get(index);
-}
-inline const ::PROTOBUF_NAMESPACE_ID::FieldDescriptorProto& DescriptorProto::extension(int index) const {
-  // @@protoc_insertion_point(field_get:google.protobuf.DescriptorProto.extension)
-  return _internal_extension(index);
-}
-inline ::PROTOBUF_NAMESPACE_ID::FieldDescriptorProto* DescriptorProto::_internal_add_extension() {
-  return _impl_.extension_.Add();
-}
-inline ::PROTOBUF_NAMESPACE_ID::FieldDescriptorProto* DescriptorProto::add_extension() {
-  ::PROTOBUF_NAMESPACE_ID::FieldDescriptorProto* _add = _internal_add_extension();
-  // @@protoc_insertion_point(field_add:google.protobuf.DescriptorProto.extension)
-  return _add;
-}
-inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::FieldDescriptorProto >&
-DescriptorProto::extension() const {
-  // @@protoc_insertion_point(field_list:google.protobuf.DescriptorProto.extension)
-  return _impl_.extension_;
-}
-
-// repeated .google.protobuf.DescriptorProto nested_type = 3;
-inline int DescriptorProto::_internal_nested_type_size() const {
-  return _impl_.nested_type_.size();
-}
-inline int DescriptorProto::nested_type_size() const {
-  return _internal_nested_type_size();
-}
-inline void DescriptorProto::clear_nested_type() {
-  _impl_.nested_type_.Clear();
-}
-inline ::PROTOBUF_NAMESPACE_ID::DescriptorProto* DescriptorProto::mutable_nested_type(int index) {
-  // @@protoc_insertion_point(field_mutable:google.protobuf.DescriptorProto.nested_type)
-  return _impl_.nested_type_.Mutable(index);
-}
-inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::DescriptorProto >*
-DescriptorProto::mutable_nested_type() {
-  // @@protoc_insertion_point(field_mutable_list:google.protobuf.DescriptorProto.nested_type)
-  return &_impl_.nested_type_;
-}
-inline const ::PROTOBUF_NAMESPACE_ID::DescriptorProto& DescriptorProto::_internal_nested_type(int index) const {
-  return _impl_.nested_type_.Get(index);
-}
-inline const ::PROTOBUF_NAMESPACE_ID::DescriptorProto& DescriptorProto::nested_type(int index) const {
-  // @@protoc_insertion_point(field_get:google.protobuf.DescriptorProto.nested_type)
-  return _internal_nested_type(index);
-}
-inline ::PROTOBUF_NAMESPACE_ID::DescriptorProto* DescriptorProto::_internal_add_nested_type() {
-  return _impl_.nested_type_.Add();
-}
-inline ::PROTOBUF_NAMESPACE_ID::DescriptorProto* DescriptorProto::add_nested_type() {
-  ::PROTOBUF_NAMESPACE_ID::DescriptorProto* _add = _internal_add_nested_type();
-  // @@protoc_insertion_point(field_add:google.protobuf.DescriptorProto.nested_type)
-  return _add;
-}
-inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::DescriptorProto >&
-DescriptorProto::nested_type() const {
-  // @@protoc_insertion_point(field_list:google.protobuf.DescriptorProto.nested_type)
-  return _impl_.nested_type_;
-}
-
-// repeated .google.protobuf.EnumDescriptorProto enum_type = 4;
-inline int DescriptorProto::_internal_enum_type_size() const {
-  return _impl_.enum_type_.size();
-}
-inline int DescriptorProto::enum_type_size() const {
-  return _internal_enum_type_size();
-}
-inline void DescriptorProto::clear_enum_type() {
-  _impl_.enum_type_.Clear();
-}
-inline ::PROTOBUF_NAMESPACE_ID::EnumDescriptorProto* DescriptorProto::mutable_enum_type(int index) {
-  // @@protoc_insertion_point(field_mutable:google.protobuf.DescriptorProto.enum_type)
-  return _impl_.enum_type_.Mutable(index);
-}
-inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::EnumDescriptorProto >*
-DescriptorProto::mutable_enum_type() {
-  // @@protoc_insertion_point(field_mutable_list:google.protobuf.DescriptorProto.enum_type)
-  return &_impl_.enum_type_;
-}
-inline const ::PROTOBUF_NAMESPACE_ID::EnumDescriptorProto& DescriptorProto::_internal_enum_type(int index) const {
-  return _impl_.enum_type_.Get(index);
-}
-inline const ::PROTOBUF_NAMESPACE_ID::EnumDescriptorProto& DescriptorProto::enum_type(int index) const {
-  // @@protoc_insertion_point(field_get:google.protobuf.DescriptorProto.enum_type)
-  return _internal_enum_type(index);
-}
-inline ::PROTOBUF_NAMESPACE_ID::EnumDescriptorProto* DescriptorProto::_internal_add_enum_type() {
-  return _impl_.enum_type_.Add();
-}
-inline ::PROTOBUF_NAMESPACE_ID::EnumDescriptorProto* DescriptorProto::add_enum_type() {
-  ::PROTOBUF_NAMESPACE_ID::EnumDescriptorProto* _add = _internal_add_enum_type();
-  // @@protoc_insertion_point(field_add:google.protobuf.DescriptorProto.enum_type)
-  return _add;
-}
-inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::EnumDescriptorProto >&
-DescriptorProto::enum_type() const {
-  // @@protoc_insertion_point(field_list:google.protobuf.DescriptorProto.enum_type)
-  return _impl_.enum_type_;
-}
-
-// repeated .google.protobuf.DescriptorProto.ExtensionRange extension_range = 5;
-inline int DescriptorProto::_internal_extension_range_size() const {
-  return _impl_.extension_range_.size();
-}
-inline int DescriptorProto::extension_range_size() const {
-  return _internal_extension_range_size();
-}
-inline void DescriptorProto::clear_extension_range() {
-  _impl_.extension_range_.Clear();
-}
-inline ::PROTOBUF_NAMESPACE_ID::DescriptorProto_ExtensionRange* DescriptorProto::mutable_extension_range(int index) {
-  // @@protoc_insertion_point(field_mutable:google.protobuf.DescriptorProto.extension_range)
-  return _impl_.extension_range_.Mutable(index);
-}
-inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::DescriptorProto_ExtensionRange >*
-DescriptorProto::mutable_extension_range() {
-  // @@protoc_insertion_point(field_mutable_list:google.protobuf.DescriptorProto.extension_range)
-  return &_impl_.extension_range_;
-}
-inline const ::PROTOBUF_NAMESPACE_ID::DescriptorProto_ExtensionRange& DescriptorProto::_internal_extension_range(int index) const {
-  return _impl_.extension_range_.Get(index);
-}
-inline const ::PROTOBUF_NAMESPACE_ID::DescriptorProto_ExtensionRange& DescriptorProto::extension_range(int index) const {
-  // @@protoc_insertion_point(field_get:google.protobuf.DescriptorProto.extension_range)
-  return _internal_extension_range(index);
-}
-inline ::PROTOBUF_NAMESPACE_ID::DescriptorProto_ExtensionRange* DescriptorProto::_internal_add_extension_range() {
-  return _impl_.extension_range_.Add();
-}
-inline ::PROTOBUF_NAMESPACE_ID::DescriptorProto_ExtensionRange* DescriptorProto::add_extension_range() {
-  ::PROTOBUF_NAMESPACE_ID::DescriptorProto_ExtensionRange* _add = _internal_add_extension_range();
-  // @@protoc_insertion_point(field_add:google.protobuf.DescriptorProto.extension_range)
-  return _add;
-}
-inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::DescriptorProto_ExtensionRange >&
-DescriptorProto::extension_range() const {
-  // @@protoc_insertion_point(field_list:google.protobuf.DescriptorProto.extension_range)
-  return _impl_.extension_range_;
-}
-
-// repeated .google.protobuf.OneofDescriptorProto oneof_decl = 8;
-inline int DescriptorProto::_internal_oneof_decl_size() const {
-  return _impl_.oneof_decl_.size();
-}
-inline int DescriptorProto::oneof_decl_size() const {
-  return _internal_oneof_decl_size();
-}
-inline void DescriptorProto::clear_oneof_decl() {
-  _impl_.oneof_decl_.Clear();
-}
-inline ::PROTOBUF_NAMESPACE_ID::OneofDescriptorProto* DescriptorProto::mutable_oneof_decl(int index) {
-  // @@protoc_insertion_point(field_mutable:google.protobuf.DescriptorProto.oneof_decl)
-  return _impl_.oneof_decl_.Mutable(index);
-}
-inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::OneofDescriptorProto >*
-DescriptorProto::mutable_oneof_decl() {
-  // @@protoc_insertion_point(field_mutable_list:google.protobuf.DescriptorProto.oneof_decl)
-  return &_impl_.oneof_decl_;
-}
-inline const ::PROTOBUF_NAMESPACE_ID::OneofDescriptorProto& DescriptorProto::_internal_oneof_decl(int index) const {
-  return _impl_.oneof_decl_.Get(index);
-}
-inline const ::PROTOBUF_NAMESPACE_ID::OneofDescriptorProto& DescriptorProto::oneof_decl(int index) const {
-  // @@protoc_insertion_point(field_get:google.protobuf.DescriptorProto.oneof_decl)
-  return _internal_oneof_decl(index);
-}
-inline ::PROTOBUF_NAMESPACE_ID::OneofDescriptorProto* DescriptorProto::_internal_add_oneof_decl() {
-  return _impl_.oneof_decl_.Add();
-}
-inline ::PROTOBUF_NAMESPACE_ID::OneofDescriptorProto* DescriptorProto::add_oneof_decl() {
-  ::PROTOBUF_NAMESPACE_ID::OneofDescriptorProto* _add = _internal_add_oneof_decl();
-  // @@protoc_insertion_point(field_add:google.protobuf.DescriptorProto.oneof_decl)
-  return _add;
-}
-inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::OneofDescriptorProto >&
-DescriptorProto::oneof_decl() const {
-  // @@protoc_insertion_point(field_list:google.protobuf.DescriptorProto.oneof_decl)
-  return _impl_.oneof_decl_;
-}
-
-// optional .google.protobuf.MessageOptions options = 7;
-inline bool DescriptorProto::_internal_has_options() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.options_ != nullptr);
-  return value;
-}
-inline bool DescriptorProto::has_options() const {
-  return _internal_has_options();
-}
-inline void DescriptorProto::clear_options() {
-  if (_impl_.options_ != nullptr) _impl_.options_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000002u;
-}
-inline const ::PROTOBUF_NAMESPACE_ID::MessageOptions& DescriptorProto::_internal_options() const {
-  const ::PROTOBUF_NAMESPACE_ID::MessageOptions* p = _impl_.options_;
-  return p != nullptr ? *p : reinterpret_cast<const ::PROTOBUF_NAMESPACE_ID::MessageOptions&>(
-      ::PROTOBUF_NAMESPACE_ID::_MessageOptions_default_instance_);
-}
-inline const ::PROTOBUF_NAMESPACE_ID::MessageOptions& DescriptorProto::options() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.DescriptorProto.options)
-  return _internal_options();
-}
-inline void DescriptorProto::unsafe_arena_set_allocated_options(
-    ::PROTOBUF_NAMESPACE_ID::MessageOptions* options) {
-  if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.options_);
-  }
-  _impl_.options_ = options;
-  if (options) {
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:google.protobuf.DescriptorProto.options)
-}
-inline ::PROTOBUF_NAMESPACE_ID::MessageOptions* DescriptorProto::release_options() {
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::PROTOBUF_NAMESPACE_ID::MessageOptions* temp = _impl_.options_;
-  _impl_.options_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
-  temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
-  if (GetArenaForAllocation() == nullptr) { delete old; }
-#else  // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArenaForAllocation() != nullptr) {
-    temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return temp;
-}
-inline ::PROTOBUF_NAMESPACE_ID::MessageOptions* DescriptorProto::unsafe_arena_release_options() {
-  // @@protoc_insertion_point(field_release:google.protobuf.DescriptorProto.options)
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::PROTOBUF_NAMESPACE_ID::MessageOptions* temp = _impl_.options_;
-  _impl_.options_ = nullptr;
-  return temp;
-}
-inline ::PROTOBUF_NAMESPACE_ID::MessageOptions* DescriptorProto::_internal_mutable_options() {
-  _impl_._has_bits_[0] |= 0x00000002u;
-  if (_impl_.options_ == nullptr) {
-    auto* p = CreateMaybeMessage<::PROTOBUF_NAMESPACE_ID::MessageOptions>(GetArenaForAllocation());
-    _impl_.options_ = p;
-  }
-  return _impl_.options_;
-}
-inline ::PROTOBUF_NAMESPACE_ID::MessageOptions* DescriptorProto::mutable_options() {
-  ::PROTOBUF_NAMESPACE_ID::MessageOptions* _msg = _internal_mutable_options();
-  // @@protoc_insertion_point(field_mutable:google.protobuf.DescriptorProto.options)
-  return _msg;
-}
-inline void DescriptorProto::set_allocated_options(::PROTOBUF_NAMESPACE_ID::MessageOptions* options) {
-  ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
-  if (message_arena == nullptr) {
-    delete _impl_.options_;
-  }
-  if (options) {
-    ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(options);
-    if (message_arena != submessage_arena) {
-      options = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
-          message_arena, options, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-  _impl_.options_ = options;
-  // @@protoc_insertion_point(field_set_allocated:google.protobuf.DescriptorProto.options)
-}
-
-// repeated .google.protobuf.DescriptorProto.ReservedRange reserved_range = 9;
-inline int DescriptorProto::_internal_reserved_range_size() const {
-  return _impl_.reserved_range_.size();
-}
-inline int DescriptorProto::reserved_range_size() const {
-  return _internal_reserved_range_size();
-}
-inline void DescriptorProto::clear_reserved_range() {
-  _impl_.reserved_range_.Clear();
-}
-inline ::PROTOBUF_NAMESPACE_ID::DescriptorProto_ReservedRange* DescriptorProto::mutable_reserved_range(int index) {
-  // @@protoc_insertion_point(field_mutable:google.protobuf.DescriptorProto.reserved_range)
-  return _impl_.reserved_range_.Mutable(index);
-}
-inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::DescriptorProto_ReservedRange >*
-DescriptorProto::mutable_reserved_range() {
-  // @@protoc_insertion_point(field_mutable_list:google.protobuf.DescriptorProto.reserved_range)
-  return &_impl_.reserved_range_;
-}
-inline const ::PROTOBUF_NAMESPACE_ID::DescriptorProto_ReservedRange& DescriptorProto::_internal_reserved_range(int index) const {
-  return _impl_.reserved_range_.Get(index);
-}
-inline const ::PROTOBUF_NAMESPACE_ID::DescriptorProto_ReservedRange& DescriptorProto::reserved_range(int index) const {
-  // @@protoc_insertion_point(field_get:google.protobuf.DescriptorProto.reserved_range)
-  return _internal_reserved_range(index);
-}
-inline ::PROTOBUF_NAMESPACE_ID::DescriptorProto_ReservedRange* DescriptorProto::_internal_add_reserved_range() {
-  return _impl_.reserved_range_.Add();
-}
-inline ::PROTOBUF_NAMESPACE_ID::DescriptorProto_ReservedRange* DescriptorProto::add_reserved_range() {
-  ::PROTOBUF_NAMESPACE_ID::DescriptorProto_ReservedRange* _add = _internal_add_reserved_range();
-  // @@protoc_insertion_point(field_add:google.protobuf.DescriptorProto.reserved_range)
-  return _add;
-}
-inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::DescriptorProto_ReservedRange >&
-DescriptorProto::reserved_range() const {
-  // @@protoc_insertion_point(field_list:google.protobuf.DescriptorProto.reserved_range)
-  return _impl_.reserved_range_;
-}
-
-// repeated string reserved_name = 10;
-inline int DescriptorProto::_internal_reserved_name_size() const {
-  return _impl_.reserved_name_.size();
-}
-inline int DescriptorProto::reserved_name_size() const {
-  return _internal_reserved_name_size();
-}
-inline void DescriptorProto::clear_reserved_name() {
-  _impl_.reserved_name_.Clear();
-}
-inline std::string* DescriptorProto::add_reserved_name() {
-  std::string* _s = _internal_add_reserved_name();
-  // @@protoc_insertion_point(field_add_mutable:google.protobuf.DescriptorProto.reserved_name)
-  return _s;
-}
-inline const std::string& DescriptorProto::_internal_reserved_name(int index) const {
-  return _impl_.reserved_name_.Get(index);
-}
-inline const std::string& DescriptorProto::reserved_name(int index) const {
-  // @@protoc_insertion_point(field_get:google.protobuf.DescriptorProto.reserved_name)
-  return _internal_reserved_name(index);
-}
-inline std::string* DescriptorProto::mutable_reserved_name(int index) {
-  // @@protoc_insertion_point(field_mutable:google.protobuf.DescriptorProto.reserved_name)
-  return _impl_.reserved_name_.Mutable(index);
-}
-inline void DescriptorProto::set_reserved_name(int index, const std::string& value) {
-  _impl_.reserved_name_.Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set:google.protobuf.DescriptorProto.reserved_name)
-}
-inline void DescriptorProto::set_reserved_name(int index, std::string&& value) {
-  _impl_.reserved_name_.Mutable(index)->assign(std::move(value));
-  // @@protoc_insertion_point(field_set:google.protobuf.DescriptorProto.reserved_name)
-}
-inline void DescriptorProto::set_reserved_name(int index, const char* value) {
-  GOOGLE_DCHECK(value != nullptr);
-  _impl_.reserved_name_.Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set_char:google.protobuf.DescriptorProto.reserved_name)
-}
-inline void DescriptorProto::set_reserved_name(int index, const char* value, size_t size) {
-  _impl_.reserved_name_.Mutable(index)->assign(
-    reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_set_pointer:google.protobuf.DescriptorProto.reserved_name)
-}
-inline std::string* DescriptorProto::_internal_add_reserved_name() {
-  return _impl_.reserved_name_.Add();
-}
-inline void DescriptorProto::add_reserved_name(const std::string& value) {
-  _impl_.reserved_name_.Add()->assign(value);
-  // @@protoc_insertion_point(field_add:google.protobuf.DescriptorProto.reserved_name)
-}
-inline void DescriptorProto::add_reserved_name(std::string&& value) {
-  _impl_.reserved_name_.Add(std::move(value));
-  // @@protoc_insertion_point(field_add:google.protobuf.DescriptorProto.reserved_name)
-}
-inline void DescriptorProto::add_reserved_name(const char* value) {
-  GOOGLE_DCHECK(value != nullptr);
-  _impl_.reserved_name_.Add()->assign(value);
-  // @@protoc_insertion_point(field_add_char:google.protobuf.DescriptorProto.reserved_name)
-}
-inline void DescriptorProto::add_reserved_name(const char* value, size_t size) {
-  _impl_.reserved_name_.Add()->assign(reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_add_pointer:google.protobuf.DescriptorProto.reserved_name)
-}
-inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string>&
-DescriptorProto::reserved_name() const {
-  // @@protoc_insertion_point(field_list:google.protobuf.DescriptorProto.reserved_name)
-  return _impl_.reserved_name_;
-}
-inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string>*
-DescriptorProto::mutable_reserved_name() {
-  // @@protoc_insertion_point(field_mutable_list:google.protobuf.DescriptorProto.reserved_name)
-  return &_impl_.reserved_name_;
-}
-
-// -------------------------------------------------------------------
-
-// ExtensionRangeOptions
-
-// repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
-inline int ExtensionRangeOptions::_internal_uninterpreted_option_size() const {
-  return _impl_.uninterpreted_option_.size();
-}
-inline int ExtensionRangeOptions::uninterpreted_option_size() const {
-  return _internal_uninterpreted_option_size();
-}
-inline void ExtensionRangeOptions::clear_uninterpreted_option() {
-  _impl_.uninterpreted_option_.Clear();
-}
-inline ::PROTOBUF_NAMESPACE_ID::UninterpretedOption* ExtensionRangeOptions::mutable_uninterpreted_option(int index) {
-  // @@protoc_insertion_point(field_mutable:google.protobuf.ExtensionRangeOptions.uninterpreted_option)
-  return _impl_.uninterpreted_option_.Mutable(index);
-}
-inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::UninterpretedOption >*
-ExtensionRangeOptions::mutable_uninterpreted_option() {
-  // @@protoc_insertion_point(field_mutable_list:google.protobuf.ExtensionRangeOptions.uninterpreted_option)
-  return &_impl_.uninterpreted_option_;
-}
-inline const ::PROTOBUF_NAMESPACE_ID::UninterpretedOption& ExtensionRangeOptions::_internal_uninterpreted_option(int index) const {
-  return _impl_.uninterpreted_option_.Get(index);
-}
-inline const ::PROTOBUF_NAMESPACE_ID::UninterpretedOption& ExtensionRangeOptions::uninterpreted_option(int index) const {
-  // @@protoc_insertion_point(field_get:google.protobuf.ExtensionRangeOptions.uninterpreted_option)
-  return _internal_uninterpreted_option(index);
-}
-inline ::PROTOBUF_NAMESPACE_ID::UninterpretedOption* ExtensionRangeOptions::_internal_add_uninterpreted_option() {
-  return _impl_.uninterpreted_option_.Add();
-}
-inline ::PROTOBUF_NAMESPACE_ID::UninterpretedOption* ExtensionRangeOptions::add_uninterpreted_option() {
-  ::PROTOBUF_NAMESPACE_ID::UninterpretedOption* _add = _internal_add_uninterpreted_option();
-  // @@protoc_insertion_point(field_add:google.protobuf.ExtensionRangeOptions.uninterpreted_option)
-  return _add;
-}
-inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::UninterpretedOption >&
-ExtensionRangeOptions::uninterpreted_option() const {
-  // @@protoc_insertion_point(field_list:google.protobuf.ExtensionRangeOptions.uninterpreted_option)
-  return _impl_.uninterpreted_option_;
-}
-
-// -------------------------------------------------------------------
-
-// FieldDescriptorProto
-
-// optional string name = 1;
-inline bool FieldDescriptorProto::_internal_has_name() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  return value;
-}
-inline bool FieldDescriptorProto::has_name() const {
-  return _internal_has_name();
-}
-inline void FieldDescriptorProto::clear_name() {
-  _impl_.name_.ClearToEmpty();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-inline const std::string& FieldDescriptorProto::name() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.FieldDescriptorProto.name)
-  return _internal_name();
-}
-template <typename ArgT0, typename... ArgT>
-inline PROTOBUF_ALWAYS_INLINE
-void FieldDescriptorProto::set_name(ArgT0&& arg0, ArgT... args) {
- _impl_._has_bits_[0] |= 0x00000001u;
- _impl_.name_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
-  // @@protoc_insertion_point(field_set:google.protobuf.FieldDescriptorProto.name)
-}
-inline std::string* FieldDescriptorProto::mutable_name() {
-  std::string* _s = _internal_mutable_name();
-  // @@protoc_insertion_point(field_mutable:google.protobuf.FieldDescriptorProto.name)
-  return _s;
-}
-inline const std::string& FieldDescriptorProto::_internal_name() const {
-  return _impl_.name_.Get();
-}
-inline void FieldDescriptorProto::_internal_set_name(const std::string& value) {
-  _impl_._has_bits_[0] |= 0x00000001u;
-  _impl_.name_.Set(value, GetArenaForAllocation());
-}
-inline std::string* FieldDescriptorProto::_internal_mutable_name() {
-  _impl_._has_bits_[0] |= 0x00000001u;
-  return _impl_.name_.Mutable(GetArenaForAllocation());
-}
-inline std::string* FieldDescriptorProto::release_name() {
-  // @@protoc_insertion_point(field_release:google.protobuf.FieldDescriptorProto.name)
-  if (!_internal_has_name()) {
-    return nullptr;
-  }
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  auto* p = _impl_.name_.Release();
-#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (_impl_.name_.IsDefault()) {
-    _impl_.name_.Set("", GetArenaForAllocation());
-  }
-#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  return p;
-}
-inline void FieldDescriptorProto::set_allocated_name(std::string* name) {
-  if (name != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  _impl_.name_.SetAllocated(name, GetArenaForAllocation());
-#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (_impl_.name_.IsDefault()) {
-    _impl_.name_.Set("", GetArenaForAllocation());
-  }
-#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:google.protobuf.FieldDescriptorProto.name)
-}
-
-// optional int32 number = 3;
-inline bool FieldDescriptorProto::_internal_has_number() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000040u) != 0;
-  return value;
-}
-inline bool FieldDescriptorProto::has_number() const {
-  return _internal_has_number();
-}
-inline void FieldDescriptorProto::clear_number() {
-  _impl_.number_ = 0;
-  _impl_._has_bits_[0] &= ~0x00000040u;
-}
-inline int32_t FieldDescriptorProto::_internal_number() const {
-  return _impl_.number_;
-}
-inline int32_t FieldDescriptorProto::number() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.FieldDescriptorProto.number)
-  return _internal_number();
-}
-inline void FieldDescriptorProto::_internal_set_number(int32_t value) {
-  _impl_._has_bits_[0] |= 0x00000040u;
-  _impl_.number_ = value;
-}
-inline void FieldDescriptorProto::set_number(int32_t value) {
-  _internal_set_number(value);
-  // @@protoc_insertion_point(field_set:google.protobuf.FieldDescriptorProto.number)
-}
-
-// optional .google.protobuf.FieldDescriptorProto.Label label = 4;
-inline bool FieldDescriptorProto::_internal_has_label() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000200u) != 0;
-  return value;
-}
-inline bool FieldDescriptorProto::has_label() const {
-  return _internal_has_label();
-}
-inline void FieldDescriptorProto::clear_label() {
-  _impl_.label_ = 1;
-  _impl_._has_bits_[0] &= ~0x00000200u;
-}
-inline ::PROTOBUF_NAMESPACE_ID::FieldDescriptorProto_Label FieldDescriptorProto::_internal_label() const {
-  return static_cast< ::PROTOBUF_NAMESPACE_ID::FieldDescriptorProto_Label >(_impl_.label_);
-}
-inline ::PROTOBUF_NAMESPACE_ID::FieldDescriptorProto_Label FieldDescriptorProto::label() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.FieldDescriptorProto.label)
-  return _internal_label();
-}
-inline void FieldDescriptorProto::_internal_set_label(::PROTOBUF_NAMESPACE_ID::FieldDescriptorProto_Label value) {
-  assert(::PROTOBUF_NAMESPACE_ID::FieldDescriptorProto_Label_IsValid(value));
-  _impl_._has_bits_[0] |= 0x00000200u;
-  _impl_.label_ = value;
-}
-inline void FieldDescriptorProto::set_label(::PROTOBUF_NAMESPACE_ID::FieldDescriptorProto_Label value) {
-  _internal_set_label(value);
-  // @@protoc_insertion_point(field_set:google.protobuf.FieldDescriptorProto.label)
-}
-
-// optional .google.protobuf.FieldDescriptorProto.Type type = 5;
-inline bool FieldDescriptorProto::_internal_has_type() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000400u) != 0;
-  return value;
-}
-inline bool FieldDescriptorProto::has_type() const {
-  return _internal_has_type();
-}
-inline void FieldDescriptorProto::clear_type() {
-  _impl_.type_ = 1;
-  _impl_._has_bits_[0] &= ~0x00000400u;
-}
-inline ::PROTOBUF_NAMESPACE_ID::FieldDescriptorProto_Type FieldDescriptorProto::_internal_type() const {
-  return static_cast< ::PROTOBUF_NAMESPACE_ID::FieldDescriptorProto_Type >(_impl_.type_);
-}
-inline ::PROTOBUF_NAMESPACE_ID::FieldDescriptorProto_Type FieldDescriptorProto::type() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.FieldDescriptorProto.type)
-  return _internal_type();
-}
-inline void FieldDescriptorProto::_internal_set_type(::PROTOBUF_NAMESPACE_ID::FieldDescriptorProto_Type value) {
-  assert(::PROTOBUF_NAMESPACE_ID::FieldDescriptorProto_Type_IsValid(value));
-  _impl_._has_bits_[0] |= 0x00000400u;
-  _impl_.type_ = value;
-}
-inline void FieldDescriptorProto::set_type(::PROTOBUF_NAMESPACE_ID::FieldDescriptorProto_Type value) {
-  _internal_set_type(value);
-  // @@protoc_insertion_point(field_set:google.protobuf.FieldDescriptorProto.type)
-}
-
-// optional string type_name = 6;
-inline bool FieldDescriptorProto::_internal_has_type_name() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000004u) != 0;
-  return value;
-}
-inline bool FieldDescriptorProto::has_type_name() const {
-  return _internal_has_type_name();
-}
-inline void FieldDescriptorProto::clear_type_name() {
-  _impl_.type_name_.ClearToEmpty();
-  _impl_._has_bits_[0] &= ~0x00000004u;
-}
-inline const std::string& FieldDescriptorProto::type_name() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.FieldDescriptorProto.type_name)
-  return _internal_type_name();
-}
-template <typename ArgT0, typename... ArgT>
-inline PROTOBUF_ALWAYS_INLINE
-void FieldDescriptorProto::set_type_name(ArgT0&& arg0, ArgT... args) {
- _impl_._has_bits_[0] |= 0x00000004u;
- _impl_.type_name_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
-  // @@protoc_insertion_point(field_set:google.protobuf.FieldDescriptorProto.type_name)
-}
-inline std::string* FieldDescriptorProto::mutable_type_name() {
-  std::string* _s = _internal_mutable_type_name();
-  // @@protoc_insertion_point(field_mutable:google.protobuf.FieldDescriptorProto.type_name)
-  return _s;
-}
-inline const std::string& FieldDescriptorProto::_internal_type_name() const {
-  return _impl_.type_name_.Get();
-}
-inline void FieldDescriptorProto::_internal_set_type_name(const std::string& value) {
-  _impl_._has_bits_[0] |= 0x00000004u;
-  _impl_.type_name_.Set(value, GetArenaForAllocation());
-}
-inline std::string* FieldDescriptorProto::_internal_mutable_type_name() {
-  _impl_._has_bits_[0] |= 0x00000004u;
-  return _impl_.type_name_.Mutable(GetArenaForAllocation());
-}
-inline std::string* FieldDescriptorProto::release_type_name() {
-  // @@protoc_insertion_point(field_release:google.protobuf.FieldDescriptorProto.type_name)
-  if (!_internal_has_type_name()) {
-    return nullptr;
-  }
-  _impl_._has_bits_[0] &= ~0x00000004u;
-  auto* p = _impl_.type_name_.Release();
-#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (_impl_.type_name_.IsDefault()) {
-    _impl_.type_name_.Set("", GetArenaForAllocation());
-  }
-#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  return p;
-}
-inline void FieldDescriptorProto::set_allocated_type_name(std::string* type_name) {
-  if (type_name != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000004u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000004u;
-  }
-  _impl_.type_name_.SetAllocated(type_name, GetArenaForAllocation());
-#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (_impl_.type_name_.IsDefault()) {
-    _impl_.type_name_.Set("", GetArenaForAllocation());
-  }
-#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:google.protobuf.FieldDescriptorProto.type_name)
-}
-
-// optional string extendee = 2;
-inline bool FieldDescriptorProto::_internal_has_extendee() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
-  return value;
-}
-inline bool FieldDescriptorProto::has_extendee() const {
-  return _internal_has_extendee();
-}
-inline void FieldDescriptorProto::clear_extendee() {
-  _impl_.extendee_.ClearToEmpty();
-  _impl_._has_bits_[0] &= ~0x00000002u;
-}
-inline const std::string& FieldDescriptorProto::extendee() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.FieldDescriptorProto.extendee)
-  return _internal_extendee();
-}
-template <typename ArgT0, typename... ArgT>
-inline PROTOBUF_ALWAYS_INLINE
-void FieldDescriptorProto::set_extendee(ArgT0&& arg0, ArgT... args) {
- _impl_._has_bits_[0] |= 0x00000002u;
- _impl_.extendee_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
-  // @@protoc_insertion_point(field_set:google.protobuf.FieldDescriptorProto.extendee)
-}
-inline std::string* FieldDescriptorProto::mutable_extendee() {
-  std::string* _s = _internal_mutable_extendee();
-  // @@protoc_insertion_point(field_mutable:google.protobuf.FieldDescriptorProto.extendee)
-  return _s;
-}
-inline const std::string& FieldDescriptorProto::_internal_extendee() const {
-  return _impl_.extendee_.Get();
-}
-inline void FieldDescriptorProto::_internal_set_extendee(const std::string& value) {
-  _impl_._has_bits_[0] |= 0x00000002u;
-  _impl_.extendee_.Set(value, GetArenaForAllocation());
-}
-inline std::string* FieldDescriptorProto::_internal_mutable_extendee() {
-  _impl_._has_bits_[0] |= 0x00000002u;
-  return _impl_.extendee_.Mutable(GetArenaForAllocation());
-}
-inline std::string* FieldDescriptorProto::release_extendee() {
-  // @@protoc_insertion_point(field_release:google.protobuf.FieldDescriptorProto.extendee)
-  if (!_internal_has_extendee()) {
-    return nullptr;
-  }
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  auto* p = _impl_.extendee_.Release();
-#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (_impl_.extendee_.IsDefault()) {
-    _impl_.extendee_.Set("", GetArenaForAllocation());
-  }
-#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  return p;
-}
-inline void FieldDescriptorProto::set_allocated_extendee(std::string* extendee) {
-  if (extendee != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-  _impl_.extendee_.SetAllocated(extendee, GetArenaForAllocation());
-#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (_impl_.extendee_.IsDefault()) {
-    _impl_.extendee_.Set("", GetArenaForAllocation());
-  }
-#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:google.protobuf.FieldDescriptorProto.extendee)
-}
-
-// optional string default_value = 7;
-inline bool FieldDescriptorProto::_internal_has_default_value() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000008u) != 0;
-  return value;
-}
-inline bool FieldDescriptorProto::has_default_value() const {
-  return _internal_has_default_value();
-}
-inline void FieldDescriptorProto::clear_default_value() {
-  _impl_.default_value_.ClearToEmpty();
-  _impl_._has_bits_[0] &= ~0x00000008u;
-}
-inline const std::string& FieldDescriptorProto::default_value() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.FieldDescriptorProto.default_value)
-  return _internal_default_value();
-}
-template <typename ArgT0, typename... ArgT>
-inline PROTOBUF_ALWAYS_INLINE
-void FieldDescriptorProto::set_default_value(ArgT0&& arg0, ArgT... args) {
- _impl_._has_bits_[0] |= 0x00000008u;
- _impl_.default_value_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
-  // @@protoc_insertion_point(field_set:google.protobuf.FieldDescriptorProto.default_value)
-}
-inline std::string* FieldDescriptorProto::mutable_default_value() {
-  std::string* _s = _internal_mutable_default_value();
-  // @@protoc_insertion_point(field_mutable:google.protobuf.FieldDescriptorProto.default_value)
-  return _s;
-}
-inline const std::string& FieldDescriptorProto::_internal_default_value() const {
-  return _impl_.default_value_.Get();
-}
-inline void FieldDescriptorProto::_internal_set_default_value(const std::string& value) {
-  _impl_._has_bits_[0] |= 0x00000008u;
-  _impl_.default_value_.Set(value, GetArenaForAllocation());
-}
-inline std::string* FieldDescriptorProto::_internal_mutable_default_value() {
-  _impl_._has_bits_[0] |= 0x00000008u;
-  return _impl_.default_value_.Mutable(GetArenaForAllocation());
-}
-inline std::string* FieldDescriptorProto::release_default_value() {
-  // @@protoc_insertion_point(field_release:google.protobuf.FieldDescriptorProto.default_value)
-  if (!_internal_has_default_value()) {
-    return nullptr;
-  }
-  _impl_._has_bits_[0] &= ~0x00000008u;
-  auto* p = _impl_.default_value_.Release();
-#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (_impl_.default_value_.IsDefault()) {
-    _impl_.default_value_.Set("", GetArenaForAllocation());
-  }
-#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  return p;
-}
-inline void FieldDescriptorProto::set_allocated_default_value(std::string* default_value) {
-  if (default_value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000008u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000008u;
-  }
-  _impl_.default_value_.SetAllocated(default_value, GetArenaForAllocation());
-#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (_impl_.default_value_.IsDefault()) {
-    _impl_.default_value_.Set("", GetArenaForAllocation());
-  }
-#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:google.protobuf.FieldDescriptorProto.default_value)
-}
-
-// optional int32 oneof_index = 9;
-inline bool FieldDescriptorProto::_internal_has_oneof_index() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000080u) != 0;
-  return value;
-}
-inline bool FieldDescriptorProto::has_oneof_index() const {
-  return _internal_has_oneof_index();
-}
-inline void FieldDescriptorProto::clear_oneof_index() {
-  _impl_.oneof_index_ = 0;
-  _impl_._has_bits_[0] &= ~0x00000080u;
-}
-inline int32_t FieldDescriptorProto::_internal_oneof_index() const {
-  return _impl_.oneof_index_;
-}
-inline int32_t FieldDescriptorProto::oneof_index() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.FieldDescriptorProto.oneof_index)
-  return _internal_oneof_index();
-}
-inline void FieldDescriptorProto::_internal_set_oneof_index(int32_t value) {
-  _impl_._has_bits_[0] |= 0x00000080u;
-  _impl_.oneof_index_ = value;
-}
-inline void FieldDescriptorProto::set_oneof_index(int32_t value) {
-  _internal_set_oneof_index(value);
-  // @@protoc_insertion_point(field_set:google.protobuf.FieldDescriptorProto.oneof_index)
-}
-
-// optional string json_name = 10;
-inline bool FieldDescriptorProto::_internal_has_json_name() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000010u) != 0;
-  return value;
-}
-inline bool FieldDescriptorProto::has_json_name() const {
-  return _internal_has_json_name();
-}
-inline void FieldDescriptorProto::clear_json_name() {
-  _impl_.json_name_.ClearToEmpty();
-  _impl_._has_bits_[0] &= ~0x00000010u;
-}
-inline const std::string& FieldDescriptorProto::json_name() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.FieldDescriptorProto.json_name)
-  return _internal_json_name();
-}
-template <typename ArgT0, typename... ArgT>
-inline PROTOBUF_ALWAYS_INLINE
-void FieldDescriptorProto::set_json_name(ArgT0&& arg0, ArgT... args) {
- _impl_._has_bits_[0] |= 0x00000010u;
- _impl_.json_name_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
-  // @@protoc_insertion_point(field_set:google.protobuf.FieldDescriptorProto.json_name)
-}
-inline std::string* FieldDescriptorProto::mutable_json_name() {
-  std::string* _s = _internal_mutable_json_name();
-  // @@protoc_insertion_point(field_mutable:google.protobuf.FieldDescriptorProto.json_name)
-  return _s;
-}
-inline const std::string& FieldDescriptorProto::_internal_json_name() const {
-  return _impl_.json_name_.Get();
-}
-inline void FieldDescriptorProto::_internal_set_json_name(const std::string& value) {
-  _impl_._has_bits_[0] |= 0x00000010u;
-  _impl_.json_name_.Set(value, GetArenaForAllocation());
-}
-inline std::string* FieldDescriptorProto::_internal_mutable_json_name() {
-  _impl_._has_bits_[0] |= 0x00000010u;
-  return _impl_.json_name_.Mutable(GetArenaForAllocation());
-}
-inline std::string* FieldDescriptorProto::release_json_name() {
-  // @@protoc_insertion_point(field_release:google.protobuf.FieldDescriptorProto.json_name)
-  if (!_internal_has_json_name()) {
-    return nullptr;
-  }
-  _impl_._has_bits_[0] &= ~0x00000010u;
-  auto* p = _impl_.json_name_.Release();
-#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (_impl_.json_name_.IsDefault()) {
-    _impl_.json_name_.Set("", GetArenaForAllocation());
-  }
-#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  return p;
-}
-inline void FieldDescriptorProto::set_allocated_json_name(std::string* json_name) {
-  if (json_name != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000010u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000010u;
-  }
-  _impl_.json_name_.SetAllocated(json_name, GetArenaForAllocation());
-#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (_impl_.json_name_.IsDefault()) {
-    _impl_.json_name_.Set("", GetArenaForAllocation());
-  }
-#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:google.protobuf.FieldDescriptorProto.json_name)
-}
-
-// optional .google.protobuf.FieldOptions options = 8;
-inline bool FieldDescriptorProto::_internal_has_options() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000020u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.options_ != nullptr);
-  return value;
-}
-inline bool FieldDescriptorProto::has_options() const {
-  return _internal_has_options();
-}
-inline void FieldDescriptorProto::clear_options() {
-  if (_impl_.options_ != nullptr) _impl_.options_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000020u;
-}
-inline const ::PROTOBUF_NAMESPACE_ID::FieldOptions& FieldDescriptorProto::_internal_options() const {
-  const ::PROTOBUF_NAMESPACE_ID::FieldOptions* p = _impl_.options_;
-  return p != nullptr ? *p : reinterpret_cast<const ::PROTOBUF_NAMESPACE_ID::FieldOptions&>(
-      ::PROTOBUF_NAMESPACE_ID::_FieldOptions_default_instance_);
-}
-inline const ::PROTOBUF_NAMESPACE_ID::FieldOptions& FieldDescriptorProto::options() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.FieldDescriptorProto.options)
-  return _internal_options();
-}
-inline void FieldDescriptorProto::unsafe_arena_set_allocated_options(
-    ::PROTOBUF_NAMESPACE_ID::FieldOptions* options) {
-  if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.options_);
-  }
-  _impl_.options_ = options;
-  if (options) {
-    _impl_._has_bits_[0] |= 0x00000020u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000020u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:google.protobuf.FieldDescriptorProto.options)
-}
-inline ::PROTOBUF_NAMESPACE_ID::FieldOptions* FieldDescriptorProto::release_options() {
-  _impl_._has_bits_[0] &= ~0x00000020u;
-  ::PROTOBUF_NAMESPACE_ID::FieldOptions* temp = _impl_.options_;
-  _impl_.options_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
-  temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
-  if (GetArenaForAllocation() == nullptr) { delete old; }
-#else  // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArenaForAllocation() != nullptr) {
-    temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return temp;
-}
-inline ::PROTOBUF_NAMESPACE_ID::FieldOptions* FieldDescriptorProto::unsafe_arena_release_options() {
-  // @@protoc_insertion_point(field_release:google.protobuf.FieldDescriptorProto.options)
-  _impl_._has_bits_[0] &= ~0x00000020u;
-  ::PROTOBUF_NAMESPACE_ID::FieldOptions* temp = _impl_.options_;
-  _impl_.options_ = nullptr;
-  return temp;
-}
-inline ::PROTOBUF_NAMESPACE_ID::FieldOptions* FieldDescriptorProto::_internal_mutable_options() {
-  _impl_._has_bits_[0] |= 0x00000020u;
-  if (_impl_.options_ == nullptr) {
-    auto* p = CreateMaybeMessage<::PROTOBUF_NAMESPACE_ID::FieldOptions>(GetArenaForAllocation());
-    _impl_.options_ = p;
-  }
-  return _impl_.options_;
-}
-inline ::PROTOBUF_NAMESPACE_ID::FieldOptions* FieldDescriptorProto::mutable_options() {
-  ::PROTOBUF_NAMESPACE_ID::FieldOptions* _msg = _internal_mutable_options();
-  // @@protoc_insertion_point(field_mutable:google.protobuf.FieldDescriptorProto.options)
-  return _msg;
-}
-inline void FieldDescriptorProto::set_allocated_options(::PROTOBUF_NAMESPACE_ID::FieldOptions* options) {
-  ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
-  if (message_arena == nullptr) {
-    delete _impl_.options_;
-  }
-  if (options) {
-    ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(options);
-    if (message_arena != submessage_arena) {
-      options = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
-          message_arena, options, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000020u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000020u;
-  }
-  _impl_.options_ = options;
-  // @@protoc_insertion_point(field_set_allocated:google.protobuf.FieldDescriptorProto.options)
-}
-
-// optional bool proto3_optional = 17;
-inline bool FieldDescriptorProto::_internal_has_proto3_optional() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000100u) != 0;
-  return value;
-}
-inline bool FieldDescriptorProto::has_proto3_optional() const {
-  return _internal_has_proto3_optional();
-}
-inline void FieldDescriptorProto::clear_proto3_optional() {
-  _impl_.proto3_optional_ = false;
-  _impl_._has_bits_[0] &= ~0x00000100u;
-}
-inline bool FieldDescriptorProto::_internal_proto3_optional() const {
-  return _impl_.proto3_optional_;
-}
-inline bool FieldDescriptorProto::proto3_optional() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.FieldDescriptorProto.proto3_optional)
-  return _internal_proto3_optional();
-}
-inline void FieldDescriptorProto::_internal_set_proto3_optional(bool value) {
-  _impl_._has_bits_[0] |= 0x00000100u;
-  _impl_.proto3_optional_ = value;
-}
-inline void FieldDescriptorProto::set_proto3_optional(bool value) {
-  _internal_set_proto3_optional(value);
-  // @@protoc_insertion_point(field_set:google.protobuf.FieldDescriptorProto.proto3_optional)
-}
-
-// -------------------------------------------------------------------
-
-// OneofDescriptorProto
-
-// optional string name = 1;
-inline bool OneofDescriptorProto::_internal_has_name() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  return value;
-}
-inline bool OneofDescriptorProto::has_name() const {
-  return _internal_has_name();
-}
-inline void OneofDescriptorProto::clear_name() {
-  _impl_.name_.ClearToEmpty();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-inline const std::string& OneofDescriptorProto::name() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.OneofDescriptorProto.name)
-  return _internal_name();
-}
-template <typename ArgT0, typename... ArgT>
-inline PROTOBUF_ALWAYS_INLINE
-void OneofDescriptorProto::set_name(ArgT0&& arg0, ArgT... args) {
- _impl_._has_bits_[0] |= 0x00000001u;
- _impl_.name_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
-  // @@protoc_insertion_point(field_set:google.protobuf.OneofDescriptorProto.name)
-}
-inline std::string* OneofDescriptorProto::mutable_name() {
-  std::string* _s = _internal_mutable_name();
-  // @@protoc_insertion_point(field_mutable:google.protobuf.OneofDescriptorProto.name)
-  return _s;
-}
-inline const std::string& OneofDescriptorProto::_internal_name() const {
-  return _impl_.name_.Get();
-}
-inline void OneofDescriptorProto::_internal_set_name(const std::string& value) {
-  _impl_._has_bits_[0] |= 0x00000001u;
-  _impl_.name_.Set(value, GetArenaForAllocation());
-}
-inline std::string* OneofDescriptorProto::_internal_mutable_name() {
-  _impl_._has_bits_[0] |= 0x00000001u;
-  return _impl_.name_.Mutable(GetArenaForAllocation());
-}
-inline std::string* OneofDescriptorProto::release_name() {
-  // @@protoc_insertion_point(field_release:google.protobuf.OneofDescriptorProto.name)
-  if (!_internal_has_name()) {
-    return nullptr;
-  }
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  auto* p = _impl_.name_.Release();
-#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (_impl_.name_.IsDefault()) {
-    _impl_.name_.Set("", GetArenaForAllocation());
-  }
-#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  return p;
-}
-inline void OneofDescriptorProto::set_allocated_name(std::string* name) {
-  if (name != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  _impl_.name_.SetAllocated(name, GetArenaForAllocation());
-#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (_impl_.name_.IsDefault()) {
-    _impl_.name_.Set("", GetArenaForAllocation());
-  }
-#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:google.protobuf.OneofDescriptorProto.name)
-}
-
-// optional .google.protobuf.OneofOptions options = 2;
-inline bool OneofDescriptorProto::_internal_has_options() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.options_ != nullptr);
-  return value;
-}
-inline bool OneofDescriptorProto::has_options() const {
-  return _internal_has_options();
-}
-inline void OneofDescriptorProto::clear_options() {
-  if (_impl_.options_ != nullptr) _impl_.options_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000002u;
-}
-inline const ::PROTOBUF_NAMESPACE_ID::OneofOptions& OneofDescriptorProto::_internal_options() const {
-  const ::PROTOBUF_NAMESPACE_ID::OneofOptions* p = _impl_.options_;
-  return p != nullptr ? *p : reinterpret_cast<const ::PROTOBUF_NAMESPACE_ID::OneofOptions&>(
-      ::PROTOBUF_NAMESPACE_ID::_OneofOptions_default_instance_);
-}
-inline const ::PROTOBUF_NAMESPACE_ID::OneofOptions& OneofDescriptorProto::options() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.OneofDescriptorProto.options)
-  return _internal_options();
-}
-inline void OneofDescriptorProto::unsafe_arena_set_allocated_options(
-    ::PROTOBUF_NAMESPACE_ID::OneofOptions* options) {
-  if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.options_);
-  }
-  _impl_.options_ = options;
-  if (options) {
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:google.protobuf.OneofDescriptorProto.options)
-}
-inline ::PROTOBUF_NAMESPACE_ID::OneofOptions* OneofDescriptorProto::release_options() {
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::PROTOBUF_NAMESPACE_ID::OneofOptions* temp = _impl_.options_;
-  _impl_.options_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
-  temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
-  if (GetArenaForAllocation() == nullptr) { delete old; }
-#else  // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArenaForAllocation() != nullptr) {
-    temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return temp;
-}
-inline ::PROTOBUF_NAMESPACE_ID::OneofOptions* OneofDescriptorProto::unsafe_arena_release_options() {
-  // @@protoc_insertion_point(field_release:google.protobuf.OneofDescriptorProto.options)
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::PROTOBUF_NAMESPACE_ID::OneofOptions* temp = _impl_.options_;
-  _impl_.options_ = nullptr;
-  return temp;
-}
-inline ::PROTOBUF_NAMESPACE_ID::OneofOptions* OneofDescriptorProto::_internal_mutable_options() {
-  _impl_._has_bits_[0] |= 0x00000002u;
-  if (_impl_.options_ == nullptr) {
-    auto* p = CreateMaybeMessage<::PROTOBUF_NAMESPACE_ID::OneofOptions>(GetArenaForAllocation());
-    _impl_.options_ = p;
-  }
-  return _impl_.options_;
-}
-inline ::PROTOBUF_NAMESPACE_ID::OneofOptions* OneofDescriptorProto::mutable_options() {
-  ::PROTOBUF_NAMESPACE_ID::OneofOptions* _msg = _internal_mutable_options();
-  // @@protoc_insertion_point(field_mutable:google.protobuf.OneofDescriptorProto.options)
-  return _msg;
-}
-inline void OneofDescriptorProto::set_allocated_options(::PROTOBUF_NAMESPACE_ID::OneofOptions* options) {
-  ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
-  if (message_arena == nullptr) {
-    delete _impl_.options_;
-  }
-  if (options) {
-    ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(options);
-    if (message_arena != submessage_arena) {
-      options = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
-          message_arena, options, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-  _impl_.options_ = options;
-  // @@protoc_insertion_point(field_set_allocated:google.protobuf.OneofDescriptorProto.options)
-}
-
-// -------------------------------------------------------------------
-
-// EnumDescriptorProto_EnumReservedRange
-
-// optional int32 start = 1;
-inline bool EnumDescriptorProto_EnumReservedRange::_internal_has_start() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  return value;
-}
-inline bool EnumDescriptorProto_EnumReservedRange::has_start() const {
-  return _internal_has_start();
-}
-inline void EnumDescriptorProto_EnumReservedRange::clear_start() {
-  _impl_.start_ = 0;
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-inline int32_t EnumDescriptorProto_EnumReservedRange::_internal_start() const {
-  return _impl_.start_;
-}
-inline int32_t EnumDescriptorProto_EnumReservedRange::start() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.EnumDescriptorProto.EnumReservedRange.start)
-  return _internal_start();
-}
-inline void EnumDescriptorProto_EnumReservedRange::_internal_set_start(int32_t value) {
-  _impl_._has_bits_[0] |= 0x00000001u;
-  _impl_.start_ = value;
-}
-inline void EnumDescriptorProto_EnumReservedRange::set_start(int32_t value) {
-  _internal_set_start(value);
-  // @@protoc_insertion_point(field_set:google.protobuf.EnumDescriptorProto.EnumReservedRange.start)
-}
-
-// optional int32 end = 2;
-inline bool EnumDescriptorProto_EnumReservedRange::_internal_has_end() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
-  return value;
-}
-inline bool EnumDescriptorProto_EnumReservedRange::has_end() const {
-  return _internal_has_end();
-}
-inline void EnumDescriptorProto_EnumReservedRange::clear_end() {
-  _impl_.end_ = 0;
-  _impl_._has_bits_[0] &= ~0x00000002u;
-}
-inline int32_t EnumDescriptorProto_EnumReservedRange::_internal_end() const {
-  return _impl_.end_;
-}
-inline int32_t EnumDescriptorProto_EnumReservedRange::end() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.EnumDescriptorProto.EnumReservedRange.end)
-  return _internal_end();
-}
-inline void EnumDescriptorProto_EnumReservedRange::_internal_set_end(int32_t value) {
-  _impl_._has_bits_[0] |= 0x00000002u;
-  _impl_.end_ = value;
-}
-inline void EnumDescriptorProto_EnumReservedRange::set_end(int32_t value) {
-  _internal_set_end(value);
-  // @@protoc_insertion_point(field_set:google.protobuf.EnumDescriptorProto.EnumReservedRange.end)
-}
-
-// -------------------------------------------------------------------
-
-// EnumDescriptorProto
-
-// optional string name = 1;
-inline bool EnumDescriptorProto::_internal_has_name() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  return value;
-}
-inline bool EnumDescriptorProto::has_name() const {
-  return _internal_has_name();
-}
-inline void EnumDescriptorProto::clear_name() {
-  _impl_.name_.ClearToEmpty();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-inline const std::string& EnumDescriptorProto::name() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.EnumDescriptorProto.name)
-  return _internal_name();
-}
-template <typename ArgT0, typename... ArgT>
-inline PROTOBUF_ALWAYS_INLINE
-void EnumDescriptorProto::set_name(ArgT0&& arg0, ArgT... args) {
- _impl_._has_bits_[0] |= 0x00000001u;
- _impl_.name_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
-  // @@protoc_insertion_point(field_set:google.protobuf.EnumDescriptorProto.name)
-}
-inline std::string* EnumDescriptorProto::mutable_name() {
-  std::string* _s = _internal_mutable_name();
-  // @@protoc_insertion_point(field_mutable:google.protobuf.EnumDescriptorProto.name)
-  return _s;
-}
-inline const std::string& EnumDescriptorProto::_internal_name() const {
-  return _impl_.name_.Get();
-}
-inline void EnumDescriptorProto::_internal_set_name(const std::string& value) {
-  _impl_._has_bits_[0] |= 0x00000001u;
-  _impl_.name_.Set(value, GetArenaForAllocation());
-}
-inline std::string* EnumDescriptorProto::_internal_mutable_name() {
-  _impl_._has_bits_[0] |= 0x00000001u;
-  return _impl_.name_.Mutable(GetArenaForAllocation());
-}
-inline std::string* EnumDescriptorProto::release_name() {
-  // @@protoc_insertion_point(field_release:google.protobuf.EnumDescriptorProto.name)
-  if (!_internal_has_name()) {
-    return nullptr;
-  }
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  auto* p = _impl_.name_.Release();
-#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (_impl_.name_.IsDefault()) {
-    _impl_.name_.Set("", GetArenaForAllocation());
-  }
-#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  return p;
-}
-inline void EnumDescriptorProto::set_allocated_name(std::string* name) {
-  if (name != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  _impl_.name_.SetAllocated(name, GetArenaForAllocation());
-#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (_impl_.name_.IsDefault()) {
-    _impl_.name_.Set("", GetArenaForAllocation());
-  }
-#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:google.protobuf.EnumDescriptorProto.name)
-}
-
-// repeated .google.protobuf.EnumValueDescriptorProto value = 2;
-inline int EnumDescriptorProto::_internal_value_size() const {
-  return _impl_.value_.size();
-}
-inline int EnumDescriptorProto::value_size() const {
-  return _internal_value_size();
-}
-inline void EnumDescriptorProto::clear_value() {
-  _impl_.value_.Clear();
-}
-inline ::PROTOBUF_NAMESPACE_ID::EnumValueDescriptorProto* EnumDescriptorProto::mutable_value(int index) {
-  // @@protoc_insertion_point(field_mutable:google.protobuf.EnumDescriptorProto.value)
-  return _impl_.value_.Mutable(index);
-}
-inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::EnumValueDescriptorProto >*
-EnumDescriptorProto::mutable_value() {
-  // @@protoc_insertion_point(field_mutable_list:google.protobuf.EnumDescriptorProto.value)
-  return &_impl_.value_;
-}
-inline const ::PROTOBUF_NAMESPACE_ID::EnumValueDescriptorProto& EnumDescriptorProto::_internal_value(int index) const {
-  return _impl_.value_.Get(index);
-}
-inline const ::PROTOBUF_NAMESPACE_ID::EnumValueDescriptorProto& EnumDescriptorProto::value(int index) const {
-  // @@protoc_insertion_point(field_get:google.protobuf.EnumDescriptorProto.value)
-  return _internal_value(index);
-}
-inline ::PROTOBUF_NAMESPACE_ID::EnumValueDescriptorProto* EnumDescriptorProto::_internal_add_value() {
-  return _impl_.value_.Add();
-}
-inline ::PROTOBUF_NAMESPACE_ID::EnumValueDescriptorProto* EnumDescriptorProto::add_value() {
-  ::PROTOBUF_NAMESPACE_ID::EnumValueDescriptorProto* _add = _internal_add_value();
-  // @@protoc_insertion_point(field_add:google.protobuf.EnumDescriptorProto.value)
-  return _add;
-}
-inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::EnumValueDescriptorProto >&
-EnumDescriptorProto::value() const {
-  // @@protoc_insertion_point(field_list:google.protobuf.EnumDescriptorProto.value)
-  return _impl_.value_;
-}
-
-// optional .google.protobuf.EnumOptions options = 3;
-inline bool EnumDescriptorProto::_internal_has_options() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.options_ != nullptr);
-  return value;
-}
-inline bool EnumDescriptorProto::has_options() const {
-  return _internal_has_options();
-}
-inline void EnumDescriptorProto::clear_options() {
-  if (_impl_.options_ != nullptr) _impl_.options_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000002u;
-}
-inline const ::PROTOBUF_NAMESPACE_ID::EnumOptions& EnumDescriptorProto::_internal_options() const {
-  const ::PROTOBUF_NAMESPACE_ID::EnumOptions* p = _impl_.options_;
-  return p != nullptr ? *p : reinterpret_cast<const ::PROTOBUF_NAMESPACE_ID::EnumOptions&>(
-      ::PROTOBUF_NAMESPACE_ID::_EnumOptions_default_instance_);
-}
-inline const ::PROTOBUF_NAMESPACE_ID::EnumOptions& EnumDescriptorProto::options() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.EnumDescriptorProto.options)
-  return _internal_options();
-}
-inline void EnumDescriptorProto::unsafe_arena_set_allocated_options(
-    ::PROTOBUF_NAMESPACE_ID::EnumOptions* options) {
-  if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.options_);
-  }
-  _impl_.options_ = options;
-  if (options) {
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:google.protobuf.EnumDescriptorProto.options)
-}
-inline ::PROTOBUF_NAMESPACE_ID::EnumOptions* EnumDescriptorProto::release_options() {
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::PROTOBUF_NAMESPACE_ID::EnumOptions* temp = _impl_.options_;
-  _impl_.options_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
-  temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
-  if (GetArenaForAllocation() == nullptr) { delete old; }
-#else  // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArenaForAllocation() != nullptr) {
-    temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return temp;
-}
-inline ::PROTOBUF_NAMESPACE_ID::EnumOptions* EnumDescriptorProto::unsafe_arena_release_options() {
-  // @@protoc_insertion_point(field_release:google.protobuf.EnumDescriptorProto.options)
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::PROTOBUF_NAMESPACE_ID::EnumOptions* temp = _impl_.options_;
-  _impl_.options_ = nullptr;
-  return temp;
-}
-inline ::PROTOBUF_NAMESPACE_ID::EnumOptions* EnumDescriptorProto::_internal_mutable_options() {
-  _impl_._has_bits_[0] |= 0x00000002u;
-  if (_impl_.options_ == nullptr) {
-    auto* p = CreateMaybeMessage<::PROTOBUF_NAMESPACE_ID::EnumOptions>(GetArenaForAllocation());
-    _impl_.options_ = p;
-  }
-  return _impl_.options_;
-}
-inline ::PROTOBUF_NAMESPACE_ID::EnumOptions* EnumDescriptorProto::mutable_options() {
-  ::PROTOBUF_NAMESPACE_ID::EnumOptions* _msg = _internal_mutable_options();
-  // @@protoc_insertion_point(field_mutable:google.protobuf.EnumDescriptorProto.options)
-  return _msg;
-}
-inline void EnumDescriptorProto::set_allocated_options(::PROTOBUF_NAMESPACE_ID::EnumOptions* options) {
-  ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
-  if (message_arena == nullptr) {
-    delete _impl_.options_;
-  }
-  if (options) {
-    ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(options);
-    if (message_arena != submessage_arena) {
-      options = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
-          message_arena, options, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-  _impl_.options_ = options;
-  // @@protoc_insertion_point(field_set_allocated:google.protobuf.EnumDescriptorProto.options)
-}
-
-// repeated .google.protobuf.EnumDescriptorProto.EnumReservedRange reserved_range = 4;
-inline int EnumDescriptorProto::_internal_reserved_range_size() const {
-  return _impl_.reserved_range_.size();
-}
-inline int EnumDescriptorProto::reserved_range_size() const {
-  return _internal_reserved_range_size();
-}
-inline void EnumDescriptorProto::clear_reserved_range() {
-  _impl_.reserved_range_.Clear();
-}
-inline ::PROTOBUF_NAMESPACE_ID::EnumDescriptorProto_EnumReservedRange* EnumDescriptorProto::mutable_reserved_range(int index) {
-  // @@protoc_insertion_point(field_mutable:google.protobuf.EnumDescriptorProto.reserved_range)
-  return _impl_.reserved_range_.Mutable(index);
-}
-inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::EnumDescriptorProto_EnumReservedRange >*
-EnumDescriptorProto::mutable_reserved_range() {
-  // @@protoc_insertion_point(field_mutable_list:google.protobuf.EnumDescriptorProto.reserved_range)
-  return &_impl_.reserved_range_;
-}
-inline const ::PROTOBUF_NAMESPACE_ID::EnumDescriptorProto_EnumReservedRange& EnumDescriptorProto::_internal_reserved_range(int index) const {
-  return _impl_.reserved_range_.Get(index);
-}
-inline const ::PROTOBUF_NAMESPACE_ID::EnumDescriptorProto_EnumReservedRange& EnumDescriptorProto::reserved_range(int index) const {
-  // @@protoc_insertion_point(field_get:google.protobuf.EnumDescriptorProto.reserved_range)
-  return _internal_reserved_range(index);
-}
-inline ::PROTOBUF_NAMESPACE_ID::EnumDescriptorProto_EnumReservedRange* EnumDescriptorProto::_internal_add_reserved_range() {
-  return _impl_.reserved_range_.Add();
-}
-inline ::PROTOBUF_NAMESPACE_ID::EnumDescriptorProto_EnumReservedRange* EnumDescriptorProto::add_reserved_range() {
-  ::PROTOBUF_NAMESPACE_ID::EnumDescriptorProto_EnumReservedRange* _add = _internal_add_reserved_range();
-  // @@protoc_insertion_point(field_add:google.protobuf.EnumDescriptorProto.reserved_range)
-  return _add;
-}
-inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::EnumDescriptorProto_EnumReservedRange >&
-EnumDescriptorProto::reserved_range() const {
-  // @@protoc_insertion_point(field_list:google.protobuf.EnumDescriptorProto.reserved_range)
-  return _impl_.reserved_range_;
-}
-
-// repeated string reserved_name = 5;
-inline int EnumDescriptorProto::_internal_reserved_name_size() const {
-  return _impl_.reserved_name_.size();
-}
-inline int EnumDescriptorProto::reserved_name_size() const {
-  return _internal_reserved_name_size();
-}
-inline void EnumDescriptorProto::clear_reserved_name() {
-  _impl_.reserved_name_.Clear();
-}
-inline std::string* EnumDescriptorProto::add_reserved_name() {
-  std::string* _s = _internal_add_reserved_name();
-  // @@protoc_insertion_point(field_add_mutable:google.protobuf.EnumDescriptorProto.reserved_name)
-  return _s;
-}
-inline const std::string& EnumDescriptorProto::_internal_reserved_name(int index) const {
-  return _impl_.reserved_name_.Get(index);
-}
-inline const std::string& EnumDescriptorProto::reserved_name(int index) const {
-  // @@protoc_insertion_point(field_get:google.protobuf.EnumDescriptorProto.reserved_name)
-  return _internal_reserved_name(index);
-}
-inline std::string* EnumDescriptorProto::mutable_reserved_name(int index) {
-  // @@protoc_insertion_point(field_mutable:google.protobuf.EnumDescriptorProto.reserved_name)
-  return _impl_.reserved_name_.Mutable(index);
-}
-inline void EnumDescriptorProto::set_reserved_name(int index, const std::string& value) {
-  _impl_.reserved_name_.Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set:google.protobuf.EnumDescriptorProto.reserved_name)
-}
-inline void EnumDescriptorProto::set_reserved_name(int index, std::string&& value) {
-  _impl_.reserved_name_.Mutable(index)->assign(std::move(value));
-  // @@protoc_insertion_point(field_set:google.protobuf.EnumDescriptorProto.reserved_name)
-}
-inline void EnumDescriptorProto::set_reserved_name(int index, const char* value) {
-  GOOGLE_DCHECK(value != nullptr);
-  _impl_.reserved_name_.Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set_char:google.protobuf.EnumDescriptorProto.reserved_name)
-}
-inline void EnumDescriptorProto::set_reserved_name(int index, const char* value, size_t size) {
-  _impl_.reserved_name_.Mutable(index)->assign(
-    reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_set_pointer:google.protobuf.EnumDescriptorProto.reserved_name)
-}
-inline std::string* EnumDescriptorProto::_internal_add_reserved_name() {
-  return _impl_.reserved_name_.Add();
-}
-inline void EnumDescriptorProto::add_reserved_name(const std::string& value) {
-  _impl_.reserved_name_.Add()->assign(value);
-  // @@protoc_insertion_point(field_add:google.protobuf.EnumDescriptorProto.reserved_name)
-}
-inline void EnumDescriptorProto::add_reserved_name(std::string&& value) {
-  _impl_.reserved_name_.Add(std::move(value));
-  // @@protoc_insertion_point(field_add:google.protobuf.EnumDescriptorProto.reserved_name)
-}
-inline void EnumDescriptorProto::add_reserved_name(const char* value) {
-  GOOGLE_DCHECK(value != nullptr);
-  _impl_.reserved_name_.Add()->assign(value);
-  // @@protoc_insertion_point(field_add_char:google.protobuf.EnumDescriptorProto.reserved_name)
-}
-inline void EnumDescriptorProto::add_reserved_name(const char* value, size_t size) {
-  _impl_.reserved_name_.Add()->assign(reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_add_pointer:google.protobuf.EnumDescriptorProto.reserved_name)
-}
-inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string>&
-EnumDescriptorProto::reserved_name() const {
-  // @@protoc_insertion_point(field_list:google.protobuf.EnumDescriptorProto.reserved_name)
-  return _impl_.reserved_name_;
-}
-inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string>*
-EnumDescriptorProto::mutable_reserved_name() {
-  // @@protoc_insertion_point(field_mutable_list:google.protobuf.EnumDescriptorProto.reserved_name)
-  return &_impl_.reserved_name_;
-}
-
-// -------------------------------------------------------------------
-
-// EnumValueDescriptorProto
-
-// optional string name = 1;
-inline bool EnumValueDescriptorProto::_internal_has_name() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  return value;
-}
-inline bool EnumValueDescriptorProto::has_name() const {
-  return _internal_has_name();
-}
-inline void EnumValueDescriptorProto::clear_name() {
-  _impl_.name_.ClearToEmpty();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-inline const std::string& EnumValueDescriptorProto::name() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.EnumValueDescriptorProto.name)
-  return _internal_name();
-}
-template <typename ArgT0, typename... ArgT>
-inline PROTOBUF_ALWAYS_INLINE
-void EnumValueDescriptorProto::set_name(ArgT0&& arg0, ArgT... args) {
- _impl_._has_bits_[0] |= 0x00000001u;
- _impl_.name_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
-  // @@protoc_insertion_point(field_set:google.protobuf.EnumValueDescriptorProto.name)
-}
-inline std::string* EnumValueDescriptorProto::mutable_name() {
-  std::string* _s = _internal_mutable_name();
-  // @@protoc_insertion_point(field_mutable:google.protobuf.EnumValueDescriptorProto.name)
-  return _s;
-}
-inline const std::string& EnumValueDescriptorProto::_internal_name() const {
-  return _impl_.name_.Get();
-}
-inline void EnumValueDescriptorProto::_internal_set_name(const std::string& value) {
-  _impl_._has_bits_[0] |= 0x00000001u;
-  _impl_.name_.Set(value, GetArenaForAllocation());
-}
-inline std::string* EnumValueDescriptorProto::_internal_mutable_name() {
-  _impl_._has_bits_[0] |= 0x00000001u;
-  return _impl_.name_.Mutable(GetArenaForAllocation());
-}
-inline std::string* EnumValueDescriptorProto::release_name() {
-  // @@protoc_insertion_point(field_release:google.protobuf.EnumValueDescriptorProto.name)
-  if (!_internal_has_name()) {
-    return nullptr;
-  }
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  auto* p = _impl_.name_.Release();
-#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (_impl_.name_.IsDefault()) {
-    _impl_.name_.Set("", GetArenaForAllocation());
-  }
-#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  return p;
-}
-inline void EnumValueDescriptorProto::set_allocated_name(std::string* name) {
-  if (name != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  _impl_.name_.SetAllocated(name, GetArenaForAllocation());
-#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (_impl_.name_.IsDefault()) {
-    _impl_.name_.Set("", GetArenaForAllocation());
-  }
-#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:google.protobuf.EnumValueDescriptorProto.name)
-}
-
-// optional int32 number = 2;
-inline bool EnumValueDescriptorProto::_internal_has_number() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000004u) != 0;
-  return value;
-}
-inline bool EnumValueDescriptorProto::has_number() const {
-  return _internal_has_number();
-}
-inline void EnumValueDescriptorProto::clear_number() {
-  _impl_.number_ = 0;
-  _impl_._has_bits_[0] &= ~0x00000004u;
-}
-inline int32_t EnumValueDescriptorProto::_internal_number() const {
-  return _impl_.number_;
-}
-inline int32_t EnumValueDescriptorProto::number() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.EnumValueDescriptorProto.number)
-  return _internal_number();
-}
-inline void EnumValueDescriptorProto::_internal_set_number(int32_t value) {
-  _impl_._has_bits_[0] |= 0x00000004u;
-  _impl_.number_ = value;
-}
-inline void EnumValueDescriptorProto::set_number(int32_t value) {
-  _internal_set_number(value);
-  // @@protoc_insertion_point(field_set:google.protobuf.EnumValueDescriptorProto.number)
-}
-
-// optional .google.protobuf.EnumValueOptions options = 3;
-inline bool EnumValueDescriptorProto::_internal_has_options() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.options_ != nullptr);
-  return value;
-}
-inline bool EnumValueDescriptorProto::has_options() const {
-  return _internal_has_options();
-}
-inline void EnumValueDescriptorProto::clear_options() {
-  if (_impl_.options_ != nullptr) _impl_.options_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000002u;
-}
-inline const ::PROTOBUF_NAMESPACE_ID::EnumValueOptions& EnumValueDescriptorProto::_internal_options() const {
-  const ::PROTOBUF_NAMESPACE_ID::EnumValueOptions* p = _impl_.options_;
-  return p != nullptr ? *p : reinterpret_cast<const ::PROTOBUF_NAMESPACE_ID::EnumValueOptions&>(
-      ::PROTOBUF_NAMESPACE_ID::_EnumValueOptions_default_instance_);
-}
-inline const ::PROTOBUF_NAMESPACE_ID::EnumValueOptions& EnumValueDescriptorProto::options() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.EnumValueDescriptorProto.options)
-  return _internal_options();
-}
-inline void EnumValueDescriptorProto::unsafe_arena_set_allocated_options(
-    ::PROTOBUF_NAMESPACE_ID::EnumValueOptions* options) {
-  if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.options_);
-  }
-  _impl_.options_ = options;
-  if (options) {
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:google.protobuf.EnumValueDescriptorProto.options)
-}
-inline ::PROTOBUF_NAMESPACE_ID::EnumValueOptions* EnumValueDescriptorProto::release_options() {
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::PROTOBUF_NAMESPACE_ID::EnumValueOptions* temp = _impl_.options_;
-  _impl_.options_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
-  temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
-  if (GetArenaForAllocation() == nullptr) { delete old; }
-#else  // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArenaForAllocation() != nullptr) {
-    temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return temp;
-}
-inline ::PROTOBUF_NAMESPACE_ID::EnumValueOptions* EnumValueDescriptorProto::unsafe_arena_release_options() {
-  // @@protoc_insertion_point(field_release:google.protobuf.EnumValueDescriptorProto.options)
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::PROTOBUF_NAMESPACE_ID::EnumValueOptions* temp = _impl_.options_;
-  _impl_.options_ = nullptr;
-  return temp;
-}
-inline ::PROTOBUF_NAMESPACE_ID::EnumValueOptions* EnumValueDescriptorProto::_internal_mutable_options() {
-  _impl_._has_bits_[0] |= 0x00000002u;
-  if (_impl_.options_ == nullptr) {
-    auto* p = CreateMaybeMessage<::PROTOBUF_NAMESPACE_ID::EnumValueOptions>(GetArenaForAllocation());
-    _impl_.options_ = p;
-  }
-  return _impl_.options_;
-}
-inline ::PROTOBUF_NAMESPACE_ID::EnumValueOptions* EnumValueDescriptorProto::mutable_options() {
-  ::PROTOBUF_NAMESPACE_ID::EnumValueOptions* _msg = _internal_mutable_options();
-  // @@protoc_insertion_point(field_mutable:google.protobuf.EnumValueDescriptorProto.options)
-  return _msg;
-}
-inline void EnumValueDescriptorProto::set_allocated_options(::PROTOBUF_NAMESPACE_ID::EnumValueOptions* options) {
-  ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
-  if (message_arena == nullptr) {
-    delete _impl_.options_;
-  }
-  if (options) {
-    ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(options);
-    if (message_arena != submessage_arena) {
-      options = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
-          message_arena, options, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-  _impl_.options_ = options;
-  // @@protoc_insertion_point(field_set_allocated:google.protobuf.EnumValueDescriptorProto.options)
-}
-
-// -------------------------------------------------------------------
-
-// ServiceDescriptorProto
-
-// optional string name = 1;
-inline bool ServiceDescriptorProto::_internal_has_name() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  return value;
-}
-inline bool ServiceDescriptorProto::has_name() const {
-  return _internal_has_name();
-}
-inline void ServiceDescriptorProto::clear_name() {
-  _impl_.name_.ClearToEmpty();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-inline const std::string& ServiceDescriptorProto::name() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.ServiceDescriptorProto.name)
-  return _internal_name();
-}
-template <typename ArgT0, typename... ArgT>
-inline PROTOBUF_ALWAYS_INLINE
-void ServiceDescriptorProto::set_name(ArgT0&& arg0, ArgT... args) {
- _impl_._has_bits_[0] |= 0x00000001u;
- _impl_.name_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
-  // @@protoc_insertion_point(field_set:google.protobuf.ServiceDescriptorProto.name)
-}
-inline std::string* ServiceDescriptorProto::mutable_name() {
-  std::string* _s = _internal_mutable_name();
-  // @@protoc_insertion_point(field_mutable:google.protobuf.ServiceDescriptorProto.name)
-  return _s;
-}
-inline const std::string& ServiceDescriptorProto::_internal_name() const {
-  return _impl_.name_.Get();
-}
-inline void ServiceDescriptorProto::_internal_set_name(const std::string& value) {
-  _impl_._has_bits_[0] |= 0x00000001u;
-  _impl_.name_.Set(value, GetArenaForAllocation());
-}
-inline std::string* ServiceDescriptorProto::_internal_mutable_name() {
-  _impl_._has_bits_[0] |= 0x00000001u;
-  return _impl_.name_.Mutable(GetArenaForAllocation());
-}
-inline std::string* ServiceDescriptorProto::release_name() {
-  // @@protoc_insertion_point(field_release:google.protobuf.ServiceDescriptorProto.name)
-  if (!_internal_has_name()) {
-    return nullptr;
-  }
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  auto* p = _impl_.name_.Release();
-#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (_impl_.name_.IsDefault()) {
-    _impl_.name_.Set("", GetArenaForAllocation());
-  }
-#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  return p;
-}
-inline void ServiceDescriptorProto::set_allocated_name(std::string* name) {
-  if (name != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  _impl_.name_.SetAllocated(name, GetArenaForAllocation());
-#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (_impl_.name_.IsDefault()) {
-    _impl_.name_.Set("", GetArenaForAllocation());
-  }
-#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:google.protobuf.ServiceDescriptorProto.name)
-}
-
-// repeated .google.protobuf.MethodDescriptorProto method = 2;
-inline int ServiceDescriptorProto::_internal_method_size() const {
-  return _impl_.method_.size();
-}
-inline int ServiceDescriptorProto::method_size() const {
-  return _internal_method_size();
-}
-inline void ServiceDescriptorProto::clear_method() {
-  _impl_.method_.Clear();
-}
-inline ::PROTOBUF_NAMESPACE_ID::MethodDescriptorProto* ServiceDescriptorProto::mutable_method(int index) {
-  // @@protoc_insertion_point(field_mutable:google.protobuf.ServiceDescriptorProto.method)
-  return _impl_.method_.Mutable(index);
-}
-inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::MethodDescriptorProto >*
-ServiceDescriptorProto::mutable_method() {
-  // @@protoc_insertion_point(field_mutable_list:google.protobuf.ServiceDescriptorProto.method)
-  return &_impl_.method_;
-}
-inline const ::PROTOBUF_NAMESPACE_ID::MethodDescriptorProto& ServiceDescriptorProto::_internal_method(int index) const {
-  return _impl_.method_.Get(index);
-}
-inline const ::PROTOBUF_NAMESPACE_ID::MethodDescriptorProto& ServiceDescriptorProto::method(int index) const {
-  // @@protoc_insertion_point(field_get:google.protobuf.ServiceDescriptorProto.method)
-  return _internal_method(index);
-}
-inline ::PROTOBUF_NAMESPACE_ID::MethodDescriptorProto* ServiceDescriptorProto::_internal_add_method() {
-  return _impl_.method_.Add();
-}
-inline ::PROTOBUF_NAMESPACE_ID::MethodDescriptorProto* ServiceDescriptorProto::add_method() {
-  ::PROTOBUF_NAMESPACE_ID::MethodDescriptorProto* _add = _internal_add_method();
-  // @@protoc_insertion_point(field_add:google.protobuf.ServiceDescriptorProto.method)
-  return _add;
-}
-inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::MethodDescriptorProto >&
-ServiceDescriptorProto::method() const {
-  // @@protoc_insertion_point(field_list:google.protobuf.ServiceDescriptorProto.method)
-  return _impl_.method_;
-}
-
-// optional .google.protobuf.ServiceOptions options = 3;
-inline bool ServiceDescriptorProto::_internal_has_options() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.options_ != nullptr);
-  return value;
-}
-inline bool ServiceDescriptorProto::has_options() const {
-  return _internal_has_options();
-}
-inline void ServiceDescriptorProto::clear_options() {
-  if (_impl_.options_ != nullptr) _impl_.options_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000002u;
-}
-inline const ::PROTOBUF_NAMESPACE_ID::ServiceOptions& ServiceDescriptorProto::_internal_options() const {
-  const ::PROTOBUF_NAMESPACE_ID::ServiceOptions* p = _impl_.options_;
-  return p != nullptr ? *p : reinterpret_cast<const ::PROTOBUF_NAMESPACE_ID::ServiceOptions&>(
-      ::PROTOBUF_NAMESPACE_ID::_ServiceOptions_default_instance_);
-}
-inline const ::PROTOBUF_NAMESPACE_ID::ServiceOptions& ServiceDescriptorProto::options() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.ServiceDescriptorProto.options)
-  return _internal_options();
-}
-inline void ServiceDescriptorProto::unsafe_arena_set_allocated_options(
-    ::PROTOBUF_NAMESPACE_ID::ServiceOptions* options) {
-  if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.options_);
-  }
-  _impl_.options_ = options;
-  if (options) {
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:google.protobuf.ServiceDescriptorProto.options)
-}
-inline ::PROTOBUF_NAMESPACE_ID::ServiceOptions* ServiceDescriptorProto::release_options() {
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::PROTOBUF_NAMESPACE_ID::ServiceOptions* temp = _impl_.options_;
-  _impl_.options_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
-  temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
-  if (GetArenaForAllocation() == nullptr) { delete old; }
-#else  // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArenaForAllocation() != nullptr) {
-    temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return temp;
-}
-inline ::PROTOBUF_NAMESPACE_ID::ServiceOptions* ServiceDescriptorProto::unsafe_arena_release_options() {
-  // @@protoc_insertion_point(field_release:google.protobuf.ServiceDescriptorProto.options)
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::PROTOBUF_NAMESPACE_ID::ServiceOptions* temp = _impl_.options_;
-  _impl_.options_ = nullptr;
-  return temp;
-}
-inline ::PROTOBUF_NAMESPACE_ID::ServiceOptions* ServiceDescriptorProto::_internal_mutable_options() {
-  _impl_._has_bits_[0] |= 0x00000002u;
-  if (_impl_.options_ == nullptr) {
-    auto* p = CreateMaybeMessage<::PROTOBUF_NAMESPACE_ID::ServiceOptions>(GetArenaForAllocation());
-    _impl_.options_ = p;
-  }
-  return _impl_.options_;
-}
-inline ::PROTOBUF_NAMESPACE_ID::ServiceOptions* ServiceDescriptorProto::mutable_options() {
-  ::PROTOBUF_NAMESPACE_ID::ServiceOptions* _msg = _internal_mutable_options();
-  // @@protoc_insertion_point(field_mutable:google.protobuf.ServiceDescriptorProto.options)
-  return _msg;
-}
-inline void ServiceDescriptorProto::set_allocated_options(::PROTOBUF_NAMESPACE_ID::ServiceOptions* options) {
-  ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
-  if (message_arena == nullptr) {
-    delete _impl_.options_;
-  }
-  if (options) {
-    ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(options);
-    if (message_arena != submessage_arena) {
-      options = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
-          message_arena, options, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-  _impl_.options_ = options;
-  // @@protoc_insertion_point(field_set_allocated:google.protobuf.ServiceDescriptorProto.options)
-}
-
-// -------------------------------------------------------------------
-
-// MethodDescriptorProto
-
-// optional string name = 1;
-inline bool MethodDescriptorProto::_internal_has_name() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  return value;
-}
-inline bool MethodDescriptorProto::has_name() const {
-  return _internal_has_name();
-}
-inline void MethodDescriptorProto::clear_name() {
-  _impl_.name_.ClearToEmpty();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-inline const std::string& MethodDescriptorProto::name() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.MethodDescriptorProto.name)
-  return _internal_name();
-}
-template <typename ArgT0, typename... ArgT>
-inline PROTOBUF_ALWAYS_INLINE
-void MethodDescriptorProto::set_name(ArgT0&& arg0, ArgT... args) {
- _impl_._has_bits_[0] |= 0x00000001u;
- _impl_.name_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
-  // @@protoc_insertion_point(field_set:google.protobuf.MethodDescriptorProto.name)
-}
-inline std::string* MethodDescriptorProto::mutable_name() {
-  std::string* _s = _internal_mutable_name();
-  // @@protoc_insertion_point(field_mutable:google.protobuf.MethodDescriptorProto.name)
-  return _s;
-}
-inline const std::string& MethodDescriptorProto::_internal_name() const {
-  return _impl_.name_.Get();
-}
-inline void MethodDescriptorProto::_internal_set_name(const std::string& value) {
-  _impl_._has_bits_[0] |= 0x00000001u;
-  _impl_.name_.Set(value, GetArenaForAllocation());
-}
-inline std::string* MethodDescriptorProto::_internal_mutable_name() {
-  _impl_._has_bits_[0] |= 0x00000001u;
-  return _impl_.name_.Mutable(GetArenaForAllocation());
-}
-inline std::string* MethodDescriptorProto::release_name() {
-  // @@protoc_insertion_point(field_release:google.protobuf.MethodDescriptorProto.name)
-  if (!_internal_has_name()) {
-    return nullptr;
-  }
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  auto* p = _impl_.name_.Release();
-#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (_impl_.name_.IsDefault()) {
-    _impl_.name_.Set("", GetArenaForAllocation());
-  }
-#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  return p;
-}
-inline void MethodDescriptorProto::set_allocated_name(std::string* name) {
-  if (name != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  _impl_.name_.SetAllocated(name, GetArenaForAllocation());
-#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (_impl_.name_.IsDefault()) {
-    _impl_.name_.Set("", GetArenaForAllocation());
-  }
-#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:google.protobuf.MethodDescriptorProto.name)
-}
-
-// optional string input_type = 2;
-inline bool MethodDescriptorProto::_internal_has_input_type() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
-  return value;
-}
-inline bool MethodDescriptorProto::has_input_type() const {
-  return _internal_has_input_type();
-}
-inline void MethodDescriptorProto::clear_input_type() {
-  _impl_.input_type_.ClearToEmpty();
-  _impl_._has_bits_[0] &= ~0x00000002u;
-}
-inline const std::string& MethodDescriptorProto::input_type() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.MethodDescriptorProto.input_type)
-  return _internal_input_type();
-}
-template <typename ArgT0, typename... ArgT>
-inline PROTOBUF_ALWAYS_INLINE
-void MethodDescriptorProto::set_input_type(ArgT0&& arg0, ArgT... args) {
- _impl_._has_bits_[0] |= 0x00000002u;
- _impl_.input_type_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
-  // @@protoc_insertion_point(field_set:google.protobuf.MethodDescriptorProto.input_type)
-}
-inline std::string* MethodDescriptorProto::mutable_input_type() {
-  std::string* _s = _internal_mutable_input_type();
-  // @@protoc_insertion_point(field_mutable:google.protobuf.MethodDescriptorProto.input_type)
-  return _s;
-}
-inline const std::string& MethodDescriptorProto::_internal_input_type() const {
-  return _impl_.input_type_.Get();
-}
-inline void MethodDescriptorProto::_internal_set_input_type(const std::string& value) {
-  _impl_._has_bits_[0] |= 0x00000002u;
-  _impl_.input_type_.Set(value, GetArenaForAllocation());
-}
-inline std::string* MethodDescriptorProto::_internal_mutable_input_type() {
-  _impl_._has_bits_[0] |= 0x00000002u;
-  return _impl_.input_type_.Mutable(GetArenaForAllocation());
-}
-inline std::string* MethodDescriptorProto::release_input_type() {
-  // @@protoc_insertion_point(field_release:google.protobuf.MethodDescriptorProto.input_type)
-  if (!_internal_has_input_type()) {
-    return nullptr;
-  }
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  auto* p = _impl_.input_type_.Release();
-#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (_impl_.input_type_.IsDefault()) {
-    _impl_.input_type_.Set("", GetArenaForAllocation());
-  }
-#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  return p;
-}
-inline void MethodDescriptorProto::set_allocated_input_type(std::string* input_type) {
-  if (input_type != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-  _impl_.input_type_.SetAllocated(input_type, GetArenaForAllocation());
-#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (_impl_.input_type_.IsDefault()) {
-    _impl_.input_type_.Set("", GetArenaForAllocation());
-  }
-#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:google.protobuf.MethodDescriptorProto.input_type)
-}
-
-// optional string output_type = 3;
-inline bool MethodDescriptorProto::_internal_has_output_type() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000004u) != 0;
-  return value;
-}
-inline bool MethodDescriptorProto::has_output_type() const {
-  return _internal_has_output_type();
-}
-inline void MethodDescriptorProto::clear_output_type() {
-  _impl_.output_type_.ClearToEmpty();
-  _impl_._has_bits_[0] &= ~0x00000004u;
-}
-inline const std::string& MethodDescriptorProto::output_type() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.MethodDescriptorProto.output_type)
-  return _internal_output_type();
-}
-template <typename ArgT0, typename... ArgT>
-inline PROTOBUF_ALWAYS_INLINE
-void MethodDescriptorProto::set_output_type(ArgT0&& arg0, ArgT... args) {
- _impl_._has_bits_[0] |= 0x00000004u;
- _impl_.output_type_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
-  // @@protoc_insertion_point(field_set:google.protobuf.MethodDescriptorProto.output_type)
-}
-inline std::string* MethodDescriptorProto::mutable_output_type() {
-  std::string* _s = _internal_mutable_output_type();
-  // @@protoc_insertion_point(field_mutable:google.protobuf.MethodDescriptorProto.output_type)
-  return _s;
-}
-inline const std::string& MethodDescriptorProto::_internal_output_type() const {
-  return _impl_.output_type_.Get();
-}
-inline void MethodDescriptorProto::_internal_set_output_type(const std::string& value) {
-  _impl_._has_bits_[0] |= 0x00000004u;
-  _impl_.output_type_.Set(value, GetArenaForAllocation());
-}
-inline std::string* MethodDescriptorProto::_internal_mutable_output_type() {
-  _impl_._has_bits_[0] |= 0x00000004u;
-  return _impl_.output_type_.Mutable(GetArenaForAllocation());
-}
-inline std::string* MethodDescriptorProto::release_output_type() {
-  // @@protoc_insertion_point(field_release:google.protobuf.MethodDescriptorProto.output_type)
-  if (!_internal_has_output_type()) {
-    return nullptr;
-  }
-  _impl_._has_bits_[0] &= ~0x00000004u;
-  auto* p = _impl_.output_type_.Release();
-#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (_impl_.output_type_.IsDefault()) {
-    _impl_.output_type_.Set("", GetArenaForAllocation());
-  }
-#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  return p;
-}
-inline void MethodDescriptorProto::set_allocated_output_type(std::string* output_type) {
-  if (output_type != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000004u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000004u;
-  }
-  _impl_.output_type_.SetAllocated(output_type, GetArenaForAllocation());
-#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (_impl_.output_type_.IsDefault()) {
-    _impl_.output_type_.Set("", GetArenaForAllocation());
-  }
-#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:google.protobuf.MethodDescriptorProto.output_type)
-}
-
-// optional .google.protobuf.MethodOptions options = 4;
-inline bool MethodDescriptorProto::_internal_has_options() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000008u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.options_ != nullptr);
-  return value;
-}
-inline bool MethodDescriptorProto::has_options() const {
-  return _internal_has_options();
-}
-inline void MethodDescriptorProto::clear_options() {
-  if (_impl_.options_ != nullptr) _impl_.options_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000008u;
-}
-inline const ::PROTOBUF_NAMESPACE_ID::MethodOptions& MethodDescriptorProto::_internal_options() const {
-  const ::PROTOBUF_NAMESPACE_ID::MethodOptions* p = _impl_.options_;
-  return p != nullptr ? *p : reinterpret_cast<const ::PROTOBUF_NAMESPACE_ID::MethodOptions&>(
-      ::PROTOBUF_NAMESPACE_ID::_MethodOptions_default_instance_);
-}
-inline const ::PROTOBUF_NAMESPACE_ID::MethodOptions& MethodDescriptorProto::options() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.MethodDescriptorProto.options)
-  return _internal_options();
-}
-inline void MethodDescriptorProto::unsafe_arena_set_allocated_options(
-    ::PROTOBUF_NAMESPACE_ID::MethodOptions* options) {
-  if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.options_);
-  }
-  _impl_.options_ = options;
-  if (options) {
-    _impl_._has_bits_[0] |= 0x00000008u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000008u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:google.protobuf.MethodDescriptorProto.options)
-}
-inline ::PROTOBUF_NAMESPACE_ID::MethodOptions* MethodDescriptorProto::release_options() {
-  _impl_._has_bits_[0] &= ~0x00000008u;
-  ::PROTOBUF_NAMESPACE_ID::MethodOptions* temp = _impl_.options_;
-  _impl_.options_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
-  temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
-  if (GetArenaForAllocation() == nullptr) { delete old; }
-#else  // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArenaForAllocation() != nullptr) {
-    temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return temp;
-}
-inline ::PROTOBUF_NAMESPACE_ID::MethodOptions* MethodDescriptorProto::unsafe_arena_release_options() {
-  // @@protoc_insertion_point(field_release:google.protobuf.MethodDescriptorProto.options)
-  _impl_._has_bits_[0] &= ~0x00000008u;
-  ::PROTOBUF_NAMESPACE_ID::MethodOptions* temp = _impl_.options_;
-  _impl_.options_ = nullptr;
-  return temp;
-}
-inline ::PROTOBUF_NAMESPACE_ID::MethodOptions* MethodDescriptorProto::_internal_mutable_options() {
-  _impl_._has_bits_[0] |= 0x00000008u;
-  if (_impl_.options_ == nullptr) {
-    auto* p = CreateMaybeMessage<::PROTOBUF_NAMESPACE_ID::MethodOptions>(GetArenaForAllocation());
-    _impl_.options_ = p;
-  }
-  return _impl_.options_;
-}
-inline ::PROTOBUF_NAMESPACE_ID::MethodOptions* MethodDescriptorProto::mutable_options() {
-  ::PROTOBUF_NAMESPACE_ID::MethodOptions* _msg = _internal_mutable_options();
-  // @@protoc_insertion_point(field_mutable:google.protobuf.MethodDescriptorProto.options)
-  return _msg;
-}
-inline void MethodDescriptorProto::set_allocated_options(::PROTOBUF_NAMESPACE_ID::MethodOptions* options) {
-  ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
-  if (message_arena == nullptr) {
-    delete _impl_.options_;
-  }
-  if (options) {
-    ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(options);
-    if (message_arena != submessage_arena) {
-      options = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
-          message_arena, options, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000008u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000008u;
-  }
-  _impl_.options_ = options;
-  // @@protoc_insertion_point(field_set_allocated:google.protobuf.MethodDescriptorProto.options)
-}
-
-// optional bool client_streaming = 5 [default = false];
-inline bool MethodDescriptorProto::_internal_has_client_streaming() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000010u) != 0;
-  return value;
-}
-inline bool MethodDescriptorProto::has_client_streaming() const {
-  return _internal_has_client_streaming();
-}
-inline void MethodDescriptorProto::clear_client_streaming() {
-  _impl_.client_streaming_ = false;
-  _impl_._has_bits_[0] &= ~0x00000010u;
-}
-inline bool MethodDescriptorProto::_internal_client_streaming() const {
-  return _impl_.client_streaming_;
-}
-inline bool MethodDescriptorProto::client_streaming() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.MethodDescriptorProto.client_streaming)
-  return _internal_client_streaming();
-}
-inline void MethodDescriptorProto::_internal_set_client_streaming(bool value) {
-  _impl_._has_bits_[0] |= 0x00000010u;
-  _impl_.client_streaming_ = value;
-}
-inline void MethodDescriptorProto::set_client_streaming(bool value) {
-  _internal_set_client_streaming(value);
-  // @@protoc_insertion_point(field_set:google.protobuf.MethodDescriptorProto.client_streaming)
-}
-
-// optional bool server_streaming = 6 [default = false];
-inline bool MethodDescriptorProto::_internal_has_server_streaming() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000020u) != 0;
-  return value;
-}
-inline bool MethodDescriptorProto::has_server_streaming() const {
-  return _internal_has_server_streaming();
-}
-inline void MethodDescriptorProto::clear_server_streaming() {
-  _impl_.server_streaming_ = false;
-  _impl_._has_bits_[0] &= ~0x00000020u;
-}
-inline bool MethodDescriptorProto::_internal_server_streaming() const {
-  return _impl_.server_streaming_;
-}
-inline bool MethodDescriptorProto::server_streaming() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.MethodDescriptorProto.server_streaming)
-  return _internal_server_streaming();
-}
-inline void MethodDescriptorProto::_internal_set_server_streaming(bool value) {
-  _impl_._has_bits_[0] |= 0x00000020u;
-  _impl_.server_streaming_ = value;
-}
-inline void MethodDescriptorProto::set_server_streaming(bool value) {
-  _internal_set_server_streaming(value);
-  // @@protoc_insertion_point(field_set:google.protobuf.MethodDescriptorProto.server_streaming)
-}
-
-// -------------------------------------------------------------------
-
-// FileOptions
-
-// optional string java_package = 1;
-inline bool FileOptions::_internal_has_java_package() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  return value;
-}
-inline bool FileOptions::has_java_package() const {
-  return _internal_has_java_package();
-}
-inline void FileOptions::clear_java_package() {
-  _impl_.java_package_.ClearToEmpty();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-inline const std::string& FileOptions::java_package() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.FileOptions.java_package)
-  return _internal_java_package();
-}
-template <typename ArgT0, typename... ArgT>
-inline PROTOBUF_ALWAYS_INLINE
-void FileOptions::set_java_package(ArgT0&& arg0, ArgT... args) {
- _impl_._has_bits_[0] |= 0x00000001u;
- _impl_.java_package_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
-  // @@protoc_insertion_point(field_set:google.protobuf.FileOptions.java_package)
-}
-inline std::string* FileOptions::mutable_java_package() {
-  std::string* _s = _internal_mutable_java_package();
-  // @@protoc_insertion_point(field_mutable:google.protobuf.FileOptions.java_package)
-  return _s;
-}
-inline const std::string& FileOptions::_internal_java_package() const {
-  return _impl_.java_package_.Get();
-}
-inline void FileOptions::_internal_set_java_package(const std::string& value) {
-  _impl_._has_bits_[0] |= 0x00000001u;
-  _impl_.java_package_.Set(value, GetArenaForAllocation());
-}
-inline std::string* FileOptions::_internal_mutable_java_package() {
-  _impl_._has_bits_[0] |= 0x00000001u;
-  return _impl_.java_package_.Mutable(GetArenaForAllocation());
-}
-inline std::string* FileOptions::release_java_package() {
-  // @@protoc_insertion_point(field_release:google.protobuf.FileOptions.java_package)
-  if (!_internal_has_java_package()) {
-    return nullptr;
-  }
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  auto* p = _impl_.java_package_.Release();
-#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (_impl_.java_package_.IsDefault()) {
-    _impl_.java_package_.Set("", GetArenaForAllocation());
-  }
-#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  return p;
-}
-inline void FileOptions::set_allocated_java_package(std::string* java_package) {
-  if (java_package != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  _impl_.java_package_.SetAllocated(java_package, GetArenaForAllocation());
-#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (_impl_.java_package_.IsDefault()) {
-    _impl_.java_package_.Set("", GetArenaForAllocation());
-  }
-#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:google.protobuf.FileOptions.java_package)
-}
-
-// optional string java_outer_classname = 8;
-inline bool FileOptions::_internal_has_java_outer_classname() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
-  return value;
-}
-inline bool FileOptions::has_java_outer_classname() const {
-  return _internal_has_java_outer_classname();
-}
-inline void FileOptions::clear_java_outer_classname() {
-  _impl_.java_outer_classname_.ClearToEmpty();
-  _impl_._has_bits_[0] &= ~0x00000002u;
-}
-inline const std::string& FileOptions::java_outer_classname() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.FileOptions.java_outer_classname)
-  return _internal_java_outer_classname();
-}
-template <typename ArgT0, typename... ArgT>
-inline PROTOBUF_ALWAYS_INLINE
-void FileOptions::set_java_outer_classname(ArgT0&& arg0, ArgT... args) {
- _impl_._has_bits_[0] |= 0x00000002u;
- _impl_.java_outer_classname_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
-  // @@protoc_insertion_point(field_set:google.protobuf.FileOptions.java_outer_classname)
-}
-inline std::string* FileOptions::mutable_java_outer_classname() {
-  std::string* _s = _internal_mutable_java_outer_classname();
-  // @@protoc_insertion_point(field_mutable:google.protobuf.FileOptions.java_outer_classname)
-  return _s;
-}
-inline const std::string& FileOptions::_internal_java_outer_classname() const {
-  return _impl_.java_outer_classname_.Get();
-}
-inline void FileOptions::_internal_set_java_outer_classname(const std::string& value) {
-  _impl_._has_bits_[0] |= 0x00000002u;
-  _impl_.java_outer_classname_.Set(value, GetArenaForAllocation());
-}
-inline std::string* FileOptions::_internal_mutable_java_outer_classname() {
-  _impl_._has_bits_[0] |= 0x00000002u;
-  return _impl_.java_outer_classname_.Mutable(GetArenaForAllocation());
-}
-inline std::string* FileOptions::release_java_outer_classname() {
-  // @@protoc_insertion_point(field_release:google.protobuf.FileOptions.java_outer_classname)
-  if (!_internal_has_java_outer_classname()) {
-    return nullptr;
-  }
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  auto* p = _impl_.java_outer_classname_.Release();
-#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (_impl_.java_outer_classname_.IsDefault()) {
-    _impl_.java_outer_classname_.Set("", GetArenaForAllocation());
-  }
-#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  return p;
-}
-inline void FileOptions::set_allocated_java_outer_classname(std::string* java_outer_classname) {
-  if (java_outer_classname != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-  _impl_.java_outer_classname_.SetAllocated(java_outer_classname, GetArenaForAllocation());
-#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (_impl_.java_outer_classname_.IsDefault()) {
-    _impl_.java_outer_classname_.Set("", GetArenaForAllocation());
-  }
-#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:google.protobuf.FileOptions.java_outer_classname)
-}
-
-// optional bool java_multiple_files = 10 [default = false];
-inline bool FileOptions::_internal_has_java_multiple_files() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000400u) != 0;
-  return value;
-}
-inline bool FileOptions::has_java_multiple_files() const {
-  return _internal_has_java_multiple_files();
-}
-inline void FileOptions::clear_java_multiple_files() {
-  _impl_.java_multiple_files_ = false;
-  _impl_._has_bits_[0] &= ~0x00000400u;
-}
-inline bool FileOptions::_internal_java_multiple_files() const {
-  return _impl_.java_multiple_files_;
-}
-inline bool FileOptions::java_multiple_files() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.FileOptions.java_multiple_files)
-  return _internal_java_multiple_files();
-}
-inline void FileOptions::_internal_set_java_multiple_files(bool value) {
-  _impl_._has_bits_[0] |= 0x00000400u;
-  _impl_.java_multiple_files_ = value;
-}
-inline void FileOptions::set_java_multiple_files(bool value) {
-  _internal_set_java_multiple_files(value);
-  // @@protoc_insertion_point(field_set:google.protobuf.FileOptions.java_multiple_files)
-}
-
-// optional bool java_generate_equals_and_hash = 20 [deprecated = true];
-inline bool FileOptions::_internal_has_java_generate_equals_and_hash() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000800u) != 0;
-  return value;
-}
-inline bool FileOptions::has_java_generate_equals_and_hash() const {
-  return _internal_has_java_generate_equals_and_hash();
-}
-inline void FileOptions::clear_java_generate_equals_and_hash() {
-  _impl_.java_generate_equals_and_hash_ = false;
-  _impl_._has_bits_[0] &= ~0x00000800u;
-}
-inline bool FileOptions::_internal_java_generate_equals_and_hash() const {
-  return _impl_.java_generate_equals_and_hash_;
-}
-inline bool FileOptions::java_generate_equals_and_hash() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.FileOptions.java_generate_equals_and_hash)
-  return _internal_java_generate_equals_and_hash();
-}
-inline void FileOptions::_internal_set_java_generate_equals_and_hash(bool value) {
-  _impl_._has_bits_[0] |= 0x00000800u;
-  _impl_.java_generate_equals_and_hash_ = value;
-}
-inline void FileOptions::set_java_generate_equals_and_hash(bool value) {
-  _internal_set_java_generate_equals_and_hash(value);
-  // @@protoc_insertion_point(field_set:google.protobuf.FileOptions.java_generate_equals_and_hash)
-}
-
-// optional bool java_string_check_utf8 = 27 [default = false];
-inline bool FileOptions::_internal_has_java_string_check_utf8() const {
-  bool value = (_impl_._has_bits_[0] & 0x00001000u) != 0;
-  return value;
-}
-inline bool FileOptions::has_java_string_check_utf8() const {
-  return _internal_has_java_string_check_utf8();
-}
-inline void FileOptions::clear_java_string_check_utf8() {
-  _impl_.java_string_check_utf8_ = false;
-  _impl_._has_bits_[0] &= ~0x00001000u;
-}
-inline bool FileOptions::_internal_java_string_check_utf8() const {
-  return _impl_.java_string_check_utf8_;
-}
-inline bool FileOptions::java_string_check_utf8() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.FileOptions.java_string_check_utf8)
-  return _internal_java_string_check_utf8();
-}
-inline void FileOptions::_internal_set_java_string_check_utf8(bool value) {
-  _impl_._has_bits_[0] |= 0x00001000u;
-  _impl_.java_string_check_utf8_ = value;
-}
-inline void FileOptions::set_java_string_check_utf8(bool value) {
-  _internal_set_java_string_check_utf8(value);
-  // @@protoc_insertion_point(field_set:google.protobuf.FileOptions.java_string_check_utf8)
-}
-
-// optional .google.protobuf.FileOptions.OptimizeMode optimize_for = 9 [default = SPEED];
-inline bool FileOptions::_internal_has_optimize_for() const {
-  bool value = (_impl_._has_bits_[0] & 0x00040000u) != 0;
-  return value;
-}
-inline bool FileOptions::has_optimize_for() const {
-  return _internal_has_optimize_for();
-}
-inline void FileOptions::clear_optimize_for() {
-  _impl_.optimize_for_ = 1;
-  _impl_._has_bits_[0] &= ~0x00040000u;
-}
-inline ::PROTOBUF_NAMESPACE_ID::FileOptions_OptimizeMode FileOptions::_internal_optimize_for() const {
-  return static_cast< ::PROTOBUF_NAMESPACE_ID::FileOptions_OptimizeMode >(_impl_.optimize_for_);
-}
-inline ::PROTOBUF_NAMESPACE_ID::FileOptions_OptimizeMode FileOptions::optimize_for() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.FileOptions.optimize_for)
-  return _internal_optimize_for();
-}
-inline void FileOptions::_internal_set_optimize_for(::PROTOBUF_NAMESPACE_ID::FileOptions_OptimizeMode value) {
-  assert(::PROTOBUF_NAMESPACE_ID::FileOptions_OptimizeMode_IsValid(value));
-  _impl_._has_bits_[0] |= 0x00040000u;
-  _impl_.optimize_for_ = value;
-}
-inline void FileOptions::set_optimize_for(::PROTOBUF_NAMESPACE_ID::FileOptions_OptimizeMode value) {
-  _internal_set_optimize_for(value);
-  // @@protoc_insertion_point(field_set:google.protobuf.FileOptions.optimize_for)
-}
-
-// optional string go_package = 11;
-inline bool FileOptions::_internal_has_go_package() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000004u) != 0;
-  return value;
-}
-inline bool FileOptions::has_go_package() const {
-  return _internal_has_go_package();
-}
-inline void FileOptions::clear_go_package() {
-  _impl_.go_package_.ClearToEmpty();
-  _impl_._has_bits_[0] &= ~0x00000004u;
-}
-inline const std::string& FileOptions::go_package() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.FileOptions.go_package)
-  return _internal_go_package();
-}
-template <typename ArgT0, typename... ArgT>
-inline PROTOBUF_ALWAYS_INLINE
-void FileOptions::set_go_package(ArgT0&& arg0, ArgT... args) {
- _impl_._has_bits_[0] |= 0x00000004u;
- _impl_.go_package_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
-  // @@protoc_insertion_point(field_set:google.protobuf.FileOptions.go_package)
-}
-inline std::string* FileOptions::mutable_go_package() {
-  std::string* _s = _internal_mutable_go_package();
-  // @@protoc_insertion_point(field_mutable:google.protobuf.FileOptions.go_package)
-  return _s;
-}
-inline const std::string& FileOptions::_internal_go_package() const {
-  return _impl_.go_package_.Get();
-}
-inline void FileOptions::_internal_set_go_package(const std::string& value) {
-  _impl_._has_bits_[0] |= 0x00000004u;
-  _impl_.go_package_.Set(value, GetArenaForAllocation());
-}
-inline std::string* FileOptions::_internal_mutable_go_package() {
-  _impl_._has_bits_[0] |= 0x00000004u;
-  return _impl_.go_package_.Mutable(GetArenaForAllocation());
-}
-inline std::string* FileOptions::release_go_package() {
-  // @@protoc_insertion_point(field_release:google.protobuf.FileOptions.go_package)
-  if (!_internal_has_go_package()) {
-    return nullptr;
-  }
-  _impl_._has_bits_[0] &= ~0x00000004u;
-  auto* p = _impl_.go_package_.Release();
-#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (_impl_.go_package_.IsDefault()) {
-    _impl_.go_package_.Set("", GetArenaForAllocation());
-  }
-#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  return p;
-}
-inline void FileOptions::set_allocated_go_package(std::string* go_package) {
-  if (go_package != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000004u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000004u;
-  }
-  _impl_.go_package_.SetAllocated(go_package, GetArenaForAllocation());
-#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (_impl_.go_package_.IsDefault()) {
-    _impl_.go_package_.Set("", GetArenaForAllocation());
-  }
-#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:google.protobuf.FileOptions.go_package)
-}
-
-// optional bool cc_generic_services = 16 [default = false];
-inline bool FileOptions::_internal_has_cc_generic_services() const {
-  bool value = (_impl_._has_bits_[0] & 0x00002000u) != 0;
-  return value;
-}
-inline bool FileOptions::has_cc_generic_services() const {
-  return _internal_has_cc_generic_services();
-}
-inline void FileOptions::clear_cc_generic_services() {
-  _impl_.cc_generic_services_ = false;
-  _impl_._has_bits_[0] &= ~0x00002000u;
-}
-inline bool FileOptions::_internal_cc_generic_services() const {
-  return _impl_.cc_generic_services_;
-}
-inline bool FileOptions::cc_generic_services() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.FileOptions.cc_generic_services)
-  return _internal_cc_generic_services();
-}
-inline void FileOptions::_internal_set_cc_generic_services(bool value) {
-  _impl_._has_bits_[0] |= 0x00002000u;
-  _impl_.cc_generic_services_ = value;
-}
-inline void FileOptions::set_cc_generic_services(bool value) {
-  _internal_set_cc_generic_services(value);
-  // @@protoc_insertion_point(field_set:google.protobuf.FileOptions.cc_generic_services)
-}
-
-// optional bool java_generic_services = 17 [default = false];
-inline bool FileOptions::_internal_has_java_generic_services() const {
-  bool value = (_impl_._has_bits_[0] & 0x00004000u) != 0;
-  return value;
-}
-inline bool FileOptions::has_java_generic_services() const {
-  return _internal_has_java_generic_services();
-}
-inline void FileOptions::clear_java_generic_services() {
-  _impl_.java_generic_services_ = false;
-  _impl_._has_bits_[0] &= ~0x00004000u;
-}
-inline bool FileOptions::_internal_java_generic_services() const {
-  return _impl_.java_generic_services_;
-}
-inline bool FileOptions::java_generic_services() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.FileOptions.java_generic_services)
-  return _internal_java_generic_services();
-}
-inline void FileOptions::_internal_set_java_generic_services(bool value) {
-  _impl_._has_bits_[0] |= 0x00004000u;
-  _impl_.java_generic_services_ = value;
-}
-inline void FileOptions::set_java_generic_services(bool value) {
-  _internal_set_java_generic_services(value);
-  // @@protoc_insertion_point(field_set:google.protobuf.FileOptions.java_generic_services)
-}
-
-// optional bool py_generic_services = 18 [default = false];
-inline bool FileOptions::_internal_has_py_generic_services() const {
-  bool value = (_impl_._has_bits_[0] & 0x00008000u) != 0;
-  return value;
-}
-inline bool FileOptions::has_py_generic_services() const {
-  return _internal_has_py_generic_services();
-}
-inline void FileOptions::clear_py_generic_services() {
-  _impl_.py_generic_services_ = false;
-  _impl_._has_bits_[0] &= ~0x00008000u;
-}
-inline bool FileOptions::_internal_py_generic_services() const {
-  return _impl_.py_generic_services_;
-}
-inline bool FileOptions::py_generic_services() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.FileOptions.py_generic_services)
-  return _internal_py_generic_services();
-}
-inline void FileOptions::_internal_set_py_generic_services(bool value) {
-  _impl_._has_bits_[0] |= 0x00008000u;
-  _impl_.py_generic_services_ = value;
-}
-inline void FileOptions::set_py_generic_services(bool value) {
-  _internal_set_py_generic_services(value);
-  // @@protoc_insertion_point(field_set:google.protobuf.FileOptions.py_generic_services)
-}
-
-// optional bool php_generic_services = 42 [default = false];
-inline bool FileOptions::_internal_has_php_generic_services() const {
-  bool value = (_impl_._has_bits_[0] & 0x00010000u) != 0;
-  return value;
-}
-inline bool FileOptions::has_php_generic_services() const {
-  return _internal_has_php_generic_services();
-}
-inline void FileOptions::clear_php_generic_services() {
-  _impl_.php_generic_services_ = false;
-  _impl_._has_bits_[0] &= ~0x00010000u;
-}
-inline bool FileOptions::_internal_php_generic_services() const {
-  return _impl_.php_generic_services_;
-}
-inline bool FileOptions::php_generic_services() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.FileOptions.php_generic_services)
-  return _internal_php_generic_services();
-}
-inline void FileOptions::_internal_set_php_generic_services(bool value) {
-  _impl_._has_bits_[0] |= 0x00010000u;
-  _impl_.php_generic_services_ = value;
-}
-inline void FileOptions::set_php_generic_services(bool value) {
-  _internal_set_php_generic_services(value);
-  // @@protoc_insertion_point(field_set:google.protobuf.FileOptions.php_generic_services)
-}
-
-// optional bool deprecated = 23 [default = false];
-inline bool FileOptions::_internal_has_deprecated() const {
-  bool value = (_impl_._has_bits_[0] & 0x00020000u) != 0;
-  return value;
-}
-inline bool FileOptions::has_deprecated() const {
-  return _internal_has_deprecated();
-}
-inline void FileOptions::clear_deprecated() {
-  _impl_.deprecated_ = false;
-  _impl_._has_bits_[0] &= ~0x00020000u;
-}
-inline bool FileOptions::_internal_deprecated() const {
-  return _impl_.deprecated_;
-}
-inline bool FileOptions::deprecated() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.FileOptions.deprecated)
-  return _internal_deprecated();
-}
-inline void FileOptions::_internal_set_deprecated(bool value) {
-  _impl_._has_bits_[0] |= 0x00020000u;
-  _impl_.deprecated_ = value;
-}
-inline void FileOptions::set_deprecated(bool value) {
-  _internal_set_deprecated(value);
-  // @@protoc_insertion_point(field_set:google.protobuf.FileOptions.deprecated)
-}
-
-// optional bool cc_enable_arenas = 31 [default = true];
-inline bool FileOptions::_internal_has_cc_enable_arenas() const {
-  bool value = (_impl_._has_bits_[0] & 0x00080000u) != 0;
-  return value;
-}
-inline bool FileOptions::has_cc_enable_arenas() const {
-  return _internal_has_cc_enable_arenas();
-}
-inline void FileOptions::clear_cc_enable_arenas() {
-  _impl_.cc_enable_arenas_ = true;
-  _impl_._has_bits_[0] &= ~0x00080000u;
-}
-inline bool FileOptions::_internal_cc_enable_arenas() const {
-  return _impl_.cc_enable_arenas_;
-}
-inline bool FileOptions::cc_enable_arenas() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.FileOptions.cc_enable_arenas)
-  return _internal_cc_enable_arenas();
-}
-inline void FileOptions::_internal_set_cc_enable_arenas(bool value) {
-  _impl_._has_bits_[0] |= 0x00080000u;
-  _impl_.cc_enable_arenas_ = value;
-}
-inline void FileOptions::set_cc_enable_arenas(bool value) {
-  _internal_set_cc_enable_arenas(value);
-  // @@protoc_insertion_point(field_set:google.protobuf.FileOptions.cc_enable_arenas)
-}
-
-// optional string objc_class_prefix = 36;
-inline bool FileOptions::_internal_has_objc_class_prefix() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000008u) != 0;
-  return value;
-}
-inline bool FileOptions::has_objc_class_prefix() const {
-  return _internal_has_objc_class_prefix();
-}
-inline void FileOptions::clear_objc_class_prefix() {
-  _impl_.objc_class_prefix_.ClearToEmpty();
-  _impl_._has_bits_[0] &= ~0x00000008u;
-}
-inline const std::string& FileOptions::objc_class_prefix() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.FileOptions.objc_class_prefix)
-  return _internal_objc_class_prefix();
-}
-template <typename ArgT0, typename... ArgT>
-inline PROTOBUF_ALWAYS_INLINE
-void FileOptions::set_objc_class_prefix(ArgT0&& arg0, ArgT... args) {
- _impl_._has_bits_[0] |= 0x00000008u;
- _impl_.objc_class_prefix_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
-  // @@protoc_insertion_point(field_set:google.protobuf.FileOptions.objc_class_prefix)
-}
-inline std::string* FileOptions::mutable_objc_class_prefix() {
-  std::string* _s = _internal_mutable_objc_class_prefix();
-  // @@protoc_insertion_point(field_mutable:google.protobuf.FileOptions.objc_class_prefix)
-  return _s;
-}
-inline const std::string& FileOptions::_internal_objc_class_prefix() const {
-  return _impl_.objc_class_prefix_.Get();
-}
-inline void FileOptions::_internal_set_objc_class_prefix(const std::string& value) {
-  _impl_._has_bits_[0] |= 0x00000008u;
-  _impl_.objc_class_prefix_.Set(value, GetArenaForAllocation());
-}
-inline std::string* FileOptions::_internal_mutable_objc_class_prefix() {
-  _impl_._has_bits_[0] |= 0x00000008u;
-  return _impl_.objc_class_prefix_.Mutable(GetArenaForAllocation());
-}
-inline std::string* FileOptions::release_objc_class_prefix() {
-  // @@protoc_insertion_point(field_release:google.protobuf.FileOptions.objc_class_prefix)
-  if (!_internal_has_objc_class_prefix()) {
-    return nullptr;
-  }
-  _impl_._has_bits_[0] &= ~0x00000008u;
-  auto* p = _impl_.objc_class_prefix_.Release();
-#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (_impl_.objc_class_prefix_.IsDefault()) {
-    _impl_.objc_class_prefix_.Set("", GetArenaForAllocation());
-  }
-#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  return p;
-}
-inline void FileOptions::set_allocated_objc_class_prefix(std::string* objc_class_prefix) {
-  if (objc_class_prefix != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000008u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000008u;
-  }
-  _impl_.objc_class_prefix_.SetAllocated(objc_class_prefix, GetArenaForAllocation());
-#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (_impl_.objc_class_prefix_.IsDefault()) {
-    _impl_.objc_class_prefix_.Set("", GetArenaForAllocation());
-  }
-#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:google.protobuf.FileOptions.objc_class_prefix)
-}
-
-// optional string csharp_namespace = 37;
-inline bool FileOptions::_internal_has_csharp_namespace() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000010u) != 0;
-  return value;
-}
-inline bool FileOptions::has_csharp_namespace() const {
-  return _internal_has_csharp_namespace();
-}
-inline void FileOptions::clear_csharp_namespace() {
-  _impl_.csharp_namespace_.ClearToEmpty();
-  _impl_._has_bits_[0] &= ~0x00000010u;
-}
-inline const std::string& FileOptions::csharp_namespace() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.FileOptions.csharp_namespace)
-  return _internal_csharp_namespace();
-}
-template <typename ArgT0, typename... ArgT>
-inline PROTOBUF_ALWAYS_INLINE
-void FileOptions::set_csharp_namespace(ArgT0&& arg0, ArgT... args) {
- _impl_._has_bits_[0] |= 0x00000010u;
- _impl_.csharp_namespace_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
-  // @@protoc_insertion_point(field_set:google.protobuf.FileOptions.csharp_namespace)
-}
-inline std::string* FileOptions::mutable_csharp_namespace() {
-  std::string* _s = _internal_mutable_csharp_namespace();
-  // @@protoc_insertion_point(field_mutable:google.protobuf.FileOptions.csharp_namespace)
-  return _s;
-}
-inline const std::string& FileOptions::_internal_csharp_namespace() const {
-  return _impl_.csharp_namespace_.Get();
-}
-inline void FileOptions::_internal_set_csharp_namespace(const std::string& value) {
-  _impl_._has_bits_[0] |= 0x00000010u;
-  _impl_.csharp_namespace_.Set(value, GetArenaForAllocation());
-}
-inline std::string* FileOptions::_internal_mutable_csharp_namespace() {
-  _impl_._has_bits_[0] |= 0x00000010u;
-  return _impl_.csharp_namespace_.Mutable(GetArenaForAllocation());
-}
-inline std::string* FileOptions::release_csharp_namespace() {
-  // @@protoc_insertion_point(field_release:google.protobuf.FileOptions.csharp_namespace)
-  if (!_internal_has_csharp_namespace()) {
-    return nullptr;
-  }
-  _impl_._has_bits_[0] &= ~0x00000010u;
-  auto* p = _impl_.csharp_namespace_.Release();
-#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (_impl_.csharp_namespace_.IsDefault()) {
-    _impl_.csharp_namespace_.Set("", GetArenaForAllocation());
-  }
-#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  return p;
-}
-inline void FileOptions::set_allocated_csharp_namespace(std::string* csharp_namespace) {
-  if (csharp_namespace != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000010u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000010u;
-  }
-  _impl_.csharp_namespace_.SetAllocated(csharp_namespace, GetArenaForAllocation());
-#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (_impl_.csharp_namespace_.IsDefault()) {
-    _impl_.csharp_namespace_.Set("", GetArenaForAllocation());
-  }
-#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:google.protobuf.FileOptions.csharp_namespace)
-}
-
-// optional string swift_prefix = 39;
-inline bool FileOptions::_internal_has_swift_prefix() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000020u) != 0;
-  return value;
-}
-inline bool FileOptions::has_swift_prefix() const {
-  return _internal_has_swift_prefix();
-}
-inline void FileOptions::clear_swift_prefix() {
-  _impl_.swift_prefix_.ClearToEmpty();
-  _impl_._has_bits_[0] &= ~0x00000020u;
-}
-inline const std::string& FileOptions::swift_prefix() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.FileOptions.swift_prefix)
-  return _internal_swift_prefix();
-}
-template <typename ArgT0, typename... ArgT>
-inline PROTOBUF_ALWAYS_INLINE
-void FileOptions::set_swift_prefix(ArgT0&& arg0, ArgT... args) {
- _impl_._has_bits_[0] |= 0x00000020u;
- _impl_.swift_prefix_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
-  // @@protoc_insertion_point(field_set:google.protobuf.FileOptions.swift_prefix)
-}
-inline std::string* FileOptions::mutable_swift_prefix() {
-  std::string* _s = _internal_mutable_swift_prefix();
-  // @@protoc_insertion_point(field_mutable:google.protobuf.FileOptions.swift_prefix)
-  return _s;
-}
-inline const std::string& FileOptions::_internal_swift_prefix() const {
-  return _impl_.swift_prefix_.Get();
-}
-inline void FileOptions::_internal_set_swift_prefix(const std::string& value) {
-  _impl_._has_bits_[0] |= 0x00000020u;
-  _impl_.swift_prefix_.Set(value, GetArenaForAllocation());
-}
-inline std::string* FileOptions::_internal_mutable_swift_prefix() {
-  _impl_._has_bits_[0] |= 0x00000020u;
-  return _impl_.swift_prefix_.Mutable(GetArenaForAllocation());
-}
-inline std::string* FileOptions::release_swift_prefix() {
-  // @@protoc_insertion_point(field_release:google.protobuf.FileOptions.swift_prefix)
-  if (!_internal_has_swift_prefix()) {
-    return nullptr;
-  }
-  _impl_._has_bits_[0] &= ~0x00000020u;
-  auto* p = _impl_.swift_prefix_.Release();
-#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (_impl_.swift_prefix_.IsDefault()) {
-    _impl_.swift_prefix_.Set("", GetArenaForAllocation());
-  }
-#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  return p;
-}
-inline void FileOptions::set_allocated_swift_prefix(std::string* swift_prefix) {
-  if (swift_prefix != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000020u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000020u;
-  }
-  _impl_.swift_prefix_.SetAllocated(swift_prefix, GetArenaForAllocation());
-#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (_impl_.swift_prefix_.IsDefault()) {
-    _impl_.swift_prefix_.Set("", GetArenaForAllocation());
-  }
-#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:google.protobuf.FileOptions.swift_prefix)
-}
-
-// optional string php_class_prefix = 40;
-inline bool FileOptions::_internal_has_php_class_prefix() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000040u) != 0;
-  return value;
-}
-inline bool FileOptions::has_php_class_prefix() const {
-  return _internal_has_php_class_prefix();
-}
-inline void FileOptions::clear_php_class_prefix() {
-  _impl_.php_class_prefix_.ClearToEmpty();
-  _impl_._has_bits_[0] &= ~0x00000040u;
-}
-inline const std::string& FileOptions::php_class_prefix() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.FileOptions.php_class_prefix)
-  return _internal_php_class_prefix();
-}
-template <typename ArgT0, typename... ArgT>
-inline PROTOBUF_ALWAYS_INLINE
-void FileOptions::set_php_class_prefix(ArgT0&& arg0, ArgT... args) {
- _impl_._has_bits_[0] |= 0x00000040u;
- _impl_.php_class_prefix_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
-  // @@protoc_insertion_point(field_set:google.protobuf.FileOptions.php_class_prefix)
-}
-inline std::string* FileOptions::mutable_php_class_prefix() {
-  std::string* _s = _internal_mutable_php_class_prefix();
-  // @@protoc_insertion_point(field_mutable:google.protobuf.FileOptions.php_class_prefix)
-  return _s;
-}
-inline const std::string& FileOptions::_internal_php_class_prefix() const {
-  return _impl_.php_class_prefix_.Get();
-}
-inline void FileOptions::_internal_set_php_class_prefix(const std::string& value) {
-  _impl_._has_bits_[0] |= 0x00000040u;
-  _impl_.php_class_prefix_.Set(value, GetArenaForAllocation());
-}
-inline std::string* FileOptions::_internal_mutable_php_class_prefix() {
-  _impl_._has_bits_[0] |= 0x00000040u;
-  return _impl_.php_class_prefix_.Mutable(GetArenaForAllocation());
-}
-inline std::string* FileOptions::release_php_class_prefix() {
-  // @@protoc_insertion_point(field_release:google.protobuf.FileOptions.php_class_prefix)
-  if (!_internal_has_php_class_prefix()) {
-    return nullptr;
-  }
-  _impl_._has_bits_[0] &= ~0x00000040u;
-  auto* p = _impl_.php_class_prefix_.Release();
-#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (_impl_.php_class_prefix_.IsDefault()) {
-    _impl_.php_class_prefix_.Set("", GetArenaForAllocation());
-  }
-#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  return p;
-}
-inline void FileOptions::set_allocated_php_class_prefix(std::string* php_class_prefix) {
-  if (php_class_prefix != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000040u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000040u;
-  }
-  _impl_.php_class_prefix_.SetAllocated(php_class_prefix, GetArenaForAllocation());
-#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (_impl_.php_class_prefix_.IsDefault()) {
-    _impl_.php_class_prefix_.Set("", GetArenaForAllocation());
-  }
-#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:google.protobuf.FileOptions.php_class_prefix)
-}
-
-// optional string php_namespace = 41;
-inline bool FileOptions::_internal_has_php_namespace() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000080u) != 0;
-  return value;
-}
-inline bool FileOptions::has_php_namespace() const {
-  return _internal_has_php_namespace();
-}
-inline void FileOptions::clear_php_namespace() {
-  _impl_.php_namespace_.ClearToEmpty();
-  _impl_._has_bits_[0] &= ~0x00000080u;
-}
-inline const std::string& FileOptions::php_namespace() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.FileOptions.php_namespace)
-  return _internal_php_namespace();
-}
-template <typename ArgT0, typename... ArgT>
-inline PROTOBUF_ALWAYS_INLINE
-void FileOptions::set_php_namespace(ArgT0&& arg0, ArgT... args) {
- _impl_._has_bits_[0] |= 0x00000080u;
- _impl_.php_namespace_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
-  // @@protoc_insertion_point(field_set:google.protobuf.FileOptions.php_namespace)
-}
-inline std::string* FileOptions::mutable_php_namespace() {
-  std::string* _s = _internal_mutable_php_namespace();
-  // @@protoc_insertion_point(field_mutable:google.protobuf.FileOptions.php_namespace)
-  return _s;
-}
-inline const std::string& FileOptions::_internal_php_namespace() const {
-  return _impl_.php_namespace_.Get();
-}
-inline void FileOptions::_internal_set_php_namespace(const std::string& value) {
-  _impl_._has_bits_[0] |= 0x00000080u;
-  _impl_.php_namespace_.Set(value, GetArenaForAllocation());
-}
-inline std::string* FileOptions::_internal_mutable_php_namespace() {
-  _impl_._has_bits_[0] |= 0x00000080u;
-  return _impl_.php_namespace_.Mutable(GetArenaForAllocation());
-}
-inline std::string* FileOptions::release_php_namespace() {
-  // @@protoc_insertion_point(field_release:google.protobuf.FileOptions.php_namespace)
-  if (!_internal_has_php_namespace()) {
-    return nullptr;
-  }
-  _impl_._has_bits_[0] &= ~0x00000080u;
-  auto* p = _impl_.php_namespace_.Release();
-#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (_impl_.php_namespace_.IsDefault()) {
-    _impl_.php_namespace_.Set("", GetArenaForAllocation());
-  }
-#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  return p;
-}
-inline void FileOptions::set_allocated_php_namespace(std::string* php_namespace) {
-  if (php_namespace != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000080u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000080u;
-  }
-  _impl_.php_namespace_.SetAllocated(php_namespace, GetArenaForAllocation());
-#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (_impl_.php_namespace_.IsDefault()) {
-    _impl_.php_namespace_.Set("", GetArenaForAllocation());
-  }
-#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:google.protobuf.FileOptions.php_namespace)
-}
-
-// optional string php_metadata_namespace = 44;
-inline bool FileOptions::_internal_has_php_metadata_namespace() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000100u) != 0;
-  return value;
-}
-inline bool FileOptions::has_php_metadata_namespace() const {
-  return _internal_has_php_metadata_namespace();
-}
-inline void FileOptions::clear_php_metadata_namespace() {
-  _impl_.php_metadata_namespace_.ClearToEmpty();
-  _impl_._has_bits_[0] &= ~0x00000100u;
-}
-inline const std::string& FileOptions::php_metadata_namespace() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.FileOptions.php_metadata_namespace)
-  return _internal_php_metadata_namespace();
-}
-template <typename ArgT0, typename... ArgT>
-inline PROTOBUF_ALWAYS_INLINE
-void FileOptions::set_php_metadata_namespace(ArgT0&& arg0, ArgT... args) {
- _impl_._has_bits_[0] |= 0x00000100u;
- _impl_.php_metadata_namespace_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
-  // @@protoc_insertion_point(field_set:google.protobuf.FileOptions.php_metadata_namespace)
-}
-inline std::string* FileOptions::mutable_php_metadata_namespace() {
-  std::string* _s = _internal_mutable_php_metadata_namespace();
-  // @@protoc_insertion_point(field_mutable:google.protobuf.FileOptions.php_metadata_namespace)
-  return _s;
-}
-inline const std::string& FileOptions::_internal_php_metadata_namespace() const {
-  return _impl_.php_metadata_namespace_.Get();
-}
-inline void FileOptions::_internal_set_php_metadata_namespace(const std::string& value) {
-  _impl_._has_bits_[0] |= 0x00000100u;
-  _impl_.php_metadata_namespace_.Set(value, GetArenaForAllocation());
-}
-inline std::string* FileOptions::_internal_mutable_php_metadata_namespace() {
-  _impl_._has_bits_[0] |= 0x00000100u;
-  return _impl_.php_metadata_namespace_.Mutable(GetArenaForAllocation());
-}
-inline std::string* FileOptions::release_php_metadata_namespace() {
-  // @@protoc_insertion_point(field_release:google.protobuf.FileOptions.php_metadata_namespace)
-  if (!_internal_has_php_metadata_namespace()) {
-    return nullptr;
-  }
-  _impl_._has_bits_[0] &= ~0x00000100u;
-  auto* p = _impl_.php_metadata_namespace_.Release();
-#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (_impl_.php_metadata_namespace_.IsDefault()) {
-    _impl_.php_metadata_namespace_.Set("", GetArenaForAllocation());
-  }
-#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  return p;
-}
-inline void FileOptions::set_allocated_php_metadata_namespace(std::string* php_metadata_namespace) {
-  if (php_metadata_namespace != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000100u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000100u;
-  }
-  _impl_.php_metadata_namespace_.SetAllocated(php_metadata_namespace, GetArenaForAllocation());
-#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (_impl_.php_metadata_namespace_.IsDefault()) {
-    _impl_.php_metadata_namespace_.Set("", GetArenaForAllocation());
-  }
-#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:google.protobuf.FileOptions.php_metadata_namespace)
-}
-
-// optional string ruby_package = 45;
-inline bool FileOptions::_internal_has_ruby_package() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000200u) != 0;
-  return value;
-}
-inline bool FileOptions::has_ruby_package() const {
-  return _internal_has_ruby_package();
-}
-inline void FileOptions::clear_ruby_package() {
-  _impl_.ruby_package_.ClearToEmpty();
-  _impl_._has_bits_[0] &= ~0x00000200u;
-}
-inline const std::string& FileOptions::ruby_package() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.FileOptions.ruby_package)
-  return _internal_ruby_package();
-}
-template <typename ArgT0, typename... ArgT>
-inline PROTOBUF_ALWAYS_INLINE
-void FileOptions::set_ruby_package(ArgT0&& arg0, ArgT... args) {
- _impl_._has_bits_[0] |= 0x00000200u;
- _impl_.ruby_package_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
-  // @@protoc_insertion_point(field_set:google.protobuf.FileOptions.ruby_package)
-}
-inline std::string* FileOptions::mutable_ruby_package() {
-  std::string* _s = _internal_mutable_ruby_package();
-  // @@protoc_insertion_point(field_mutable:google.protobuf.FileOptions.ruby_package)
-  return _s;
-}
-inline const std::string& FileOptions::_internal_ruby_package() const {
-  return _impl_.ruby_package_.Get();
-}
-inline void FileOptions::_internal_set_ruby_package(const std::string& value) {
-  _impl_._has_bits_[0] |= 0x00000200u;
-  _impl_.ruby_package_.Set(value, GetArenaForAllocation());
-}
-inline std::string* FileOptions::_internal_mutable_ruby_package() {
-  _impl_._has_bits_[0] |= 0x00000200u;
-  return _impl_.ruby_package_.Mutable(GetArenaForAllocation());
-}
-inline std::string* FileOptions::release_ruby_package() {
-  // @@protoc_insertion_point(field_release:google.protobuf.FileOptions.ruby_package)
-  if (!_internal_has_ruby_package()) {
-    return nullptr;
-  }
-  _impl_._has_bits_[0] &= ~0x00000200u;
-  auto* p = _impl_.ruby_package_.Release();
-#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (_impl_.ruby_package_.IsDefault()) {
-    _impl_.ruby_package_.Set("", GetArenaForAllocation());
-  }
-#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  return p;
-}
-inline void FileOptions::set_allocated_ruby_package(std::string* ruby_package) {
-  if (ruby_package != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000200u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000200u;
-  }
-  _impl_.ruby_package_.SetAllocated(ruby_package, GetArenaForAllocation());
-#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (_impl_.ruby_package_.IsDefault()) {
-    _impl_.ruby_package_.Set("", GetArenaForAllocation());
-  }
-#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:google.protobuf.FileOptions.ruby_package)
-}
-
-// repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
-inline int FileOptions::_internal_uninterpreted_option_size() const {
-  return _impl_.uninterpreted_option_.size();
-}
-inline int FileOptions::uninterpreted_option_size() const {
-  return _internal_uninterpreted_option_size();
-}
-inline void FileOptions::clear_uninterpreted_option() {
-  _impl_.uninterpreted_option_.Clear();
-}
-inline ::PROTOBUF_NAMESPACE_ID::UninterpretedOption* FileOptions::mutable_uninterpreted_option(int index) {
-  // @@protoc_insertion_point(field_mutable:google.protobuf.FileOptions.uninterpreted_option)
-  return _impl_.uninterpreted_option_.Mutable(index);
-}
-inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::UninterpretedOption >*
-FileOptions::mutable_uninterpreted_option() {
-  // @@protoc_insertion_point(field_mutable_list:google.protobuf.FileOptions.uninterpreted_option)
-  return &_impl_.uninterpreted_option_;
-}
-inline const ::PROTOBUF_NAMESPACE_ID::UninterpretedOption& FileOptions::_internal_uninterpreted_option(int index) const {
-  return _impl_.uninterpreted_option_.Get(index);
-}
-inline const ::PROTOBUF_NAMESPACE_ID::UninterpretedOption& FileOptions::uninterpreted_option(int index) const {
-  // @@protoc_insertion_point(field_get:google.protobuf.FileOptions.uninterpreted_option)
-  return _internal_uninterpreted_option(index);
-}
-inline ::PROTOBUF_NAMESPACE_ID::UninterpretedOption* FileOptions::_internal_add_uninterpreted_option() {
-  return _impl_.uninterpreted_option_.Add();
-}
-inline ::PROTOBUF_NAMESPACE_ID::UninterpretedOption* FileOptions::add_uninterpreted_option() {
-  ::PROTOBUF_NAMESPACE_ID::UninterpretedOption* _add = _internal_add_uninterpreted_option();
-  // @@protoc_insertion_point(field_add:google.protobuf.FileOptions.uninterpreted_option)
-  return _add;
-}
-inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::UninterpretedOption >&
-FileOptions::uninterpreted_option() const {
-  // @@protoc_insertion_point(field_list:google.protobuf.FileOptions.uninterpreted_option)
-  return _impl_.uninterpreted_option_;
-}
-
-// -------------------------------------------------------------------
-
-// MessageOptions
-
-// optional bool message_set_wire_format = 1 [default = false];
-inline bool MessageOptions::_internal_has_message_set_wire_format() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  return value;
-}
-inline bool MessageOptions::has_message_set_wire_format() const {
-  return _internal_has_message_set_wire_format();
-}
-inline void MessageOptions::clear_message_set_wire_format() {
-  _impl_.message_set_wire_format_ = false;
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-inline bool MessageOptions::_internal_message_set_wire_format() const {
-  return _impl_.message_set_wire_format_;
-}
-inline bool MessageOptions::message_set_wire_format() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.MessageOptions.message_set_wire_format)
-  return _internal_message_set_wire_format();
-}
-inline void MessageOptions::_internal_set_message_set_wire_format(bool value) {
-  _impl_._has_bits_[0] |= 0x00000001u;
-  _impl_.message_set_wire_format_ = value;
-}
-inline void MessageOptions::set_message_set_wire_format(bool value) {
-  _internal_set_message_set_wire_format(value);
-  // @@protoc_insertion_point(field_set:google.protobuf.MessageOptions.message_set_wire_format)
-}
-
-// optional bool no_standard_descriptor_accessor = 2 [default = false];
-inline bool MessageOptions::_internal_has_no_standard_descriptor_accessor() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
-  return value;
-}
-inline bool MessageOptions::has_no_standard_descriptor_accessor() const {
-  return _internal_has_no_standard_descriptor_accessor();
-}
-inline void MessageOptions::clear_no_standard_descriptor_accessor() {
-  _impl_.no_standard_descriptor_accessor_ = false;
-  _impl_._has_bits_[0] &= ~0x00000002u;
-}
-inline bool MessageOptions::_internal_no_standard_descriptor_accessor() const {
-  return _impl_.no_standard_descriptor_accessor_;
-}
-inline bool MessageOptions::no_standard_descriptor_accessor() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.MessageOptions.no_standard_descriptor_accessor)
-  return _internal_no_standard_descriptor_accessor();
-}
-inline void MessageOptions::_internal_set_no_standard_descriptor_accessor(bool value) {
-  _impl_._has_bits_[0] |= 0x00000002u;
-  _impl_.no_standard_descriptor_accessor_ = value;
-}
-inline void MessageOptions::set_no_standard_descriptor_accessor(bool value) {
-  _internal_set_no_standard_descriptor_accessor(value);
-  // @@protoc_insertion_point(field_set:google.protobuf.MessageOptions.no_standard_descriptor_accessor)
-}
-
-// optional bool deprecated = 3 [default = false];
-inline bool MessageOptions::_internal_has_deprecated() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000004u) != 0;
-  return value;
-}
-inline bool MessageOptions::has_deprecated() const {
-  return _internal_has_deprecated();
-}
-inline void MessageOptions::clear_deprecated() {
-  _impl_.deprecated_ = false;
-  _impl_._has_bits_[0] &= ~0x00000004u;
-}
-inline bool MessageOptions::_internal_deprecated() const {
-  return _impl_.deprecated_;
-}
-inline bool MessageOptions::deprecated() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.MessageOptions.deprecated)
-  return _internal_deprecated();
-}
-inline void MessageOptions::_internal_set_deprecated(bool value) {
-  _impl_._has_bits_[0] |= 0x00000004u;
-  _impl_.deprecated_ = value;
-}
-inline void MessageOptions::set_deprecated(bool value) {
-  _internal_set_deprecated(value);
-  // @@protoc_insertion_point(field_set:google.protobuf.MessageOptions.deprecated)
-}
-
-// optional bool map_entry = 7;
-inline bool MessageOptions::_internal_has_map_entry() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000008u) != 0;
-  return value;
-}
-inline bool MessageOptions::has_map_entry() const {
-  return _internal_has_map_entry();
-}
-inline void MessageOptions::clear_map_entry() {
-  _impl_.map_entry_ = false;
-  _impl_._has_bits_[0] &= ~0x00000008u;
-}
-inline bool MessageOptions::_internal_map_entry() const {
-  return _impl_.map_entry_;
-}
-inline bool MessageOptions::map_entry() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.MessageOptions.map_entry)
-  return _internal_map_entry();
-}
-inline void MessageOptions::_internal_set_map_entry(bool value) {
-  _impl_._has_bits_[0] |= 0x00000008u;
-  _impl_.map_entry_ = value;
-}
-inline void MessageOptions::set_map_entry(bool value) {
-  _internal_set_map_entry(value);
-  // @@protoc_insertion_point(field_set:google.protobuf.MessageOptions.map_entry)
-}
-
-// repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
-inline int MessageOptions::_internal_uninterpreted_option_size() const {
-  return _impl_.uninterpreted_option_.size();
-}
-inline int MessageOptions::uninterpreted_option_size() const {
-  return _internal_uninterpreted_option_size();
-}
-inline void MessageOptions::clear_uninterpreted_option() {
-  _impl_.uninterpreted_option_.Clear();
-}
-inline ::PROTOBUF_NAMESPACE_ID::UninterpretedOption* MessageOptions::mutable_uninterpreted_option(int index) {
-  // @@protoc_insertion_point(field_mutable:google.protobuf.MessageOptions.uninterpreted_option)
-  return _impl_.uninterpreted_option_.Mutable(index);
-}
-inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::UninterpretedOption >*
-MessageOptions::mutable_uninterpreted_option() {
-  // @@protoc_insertion_point(field_mutable_list:google.protobuf.MessageOptions.uninterpreted_option)
-  return &_impl_.uninterpreted_option_;
-}
-inline const ::PROTOBUF_NAMESPACE_ID::UninterpretedOption& MessageOptions::_internal_uninterpreted_option(int index) const {
-  return _impl_.uninterpreted_option_.Get(index);
-}
-inline const ::PROTOBUF_NAMESPACE_ID::UninterpretedOption& MessageOptions::uninterpreted_option(int index) const {
-  // @@protoc_insertion_point(field_get:google.protobuf.MessageOptions.uninterpreted_option)
-  return _internal_uninterpreted_option(index);
-}
-inline ::PROTOBUF_NAMESPACE_ID::UninterpretedOption* MessageOptions::_internal_add_uninterpreted_option() {
-  return _impl_.uninterpreted_option_.Add();
-}
-inline ::PROTOBUF_NAMESPACE_ID::UninterpretedOption* MessageOptions::add_uninterpreted_option() {
-  ::PROTOBUF_NAMESPACE_ID::UninterpretedOption* _add = _internal_add_uninterpreted_option();
-  // @@protoc_insertion_point(field_add:google.protobuf.MessageOptions.uninterpreted_option)
-  return _add;
-}
-inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::UninterpretedOption >&
-MessageOptions::uninterpreted_option() const {
-  // @@protoc_insertion_point(field_list:google.protobuf.MessageOptions.uninterpreted_option)
-  return _impl_.uninterpreted_option_;
-}
-
-// -------------------------------------------------------------------
-
-// FieldOptions
-
-// optional .google.protobuf.FieldOptions.CType ctype = 1 [default = STRING];
-inline bool FieldOptions::_internal_has_ctype() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  return value;
-}
-inline bool FieldOptions::has_ctype() const {
-  return _internal_has_ctype();
-}
-inline void FieldOptions::clear_ctype() {
-  _impl_.ctype_ = 0;
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-inline ::PROTOBUF_NAMESPACE_ID::FieldOptions_CType FieldOptions::_internal_ctype() const {
-  return static_cast< ::PROTOBUF_NAMESPACE_ID::FieldOptions_CType >(_impl_.ctype_);
-}
-inline ::PROTOBUF_NAMESPACE_ID::FieldOptions_CType FieldOptions::ctype() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.FieldOptions.ctype)
-  return _internal_ctype();
-}
-inline void FieldOptions::_internal_set_ctype(::PROTOBUF_NAMESPACE_ID::FieldOptions_CType value) {
-  assert(::PROTOBUF_NAMESPACE_ID::FieldOptions_CType_IsValid(value));
-  _impl_._has_bits_[0] |= 0x00000001u;
-  _impl_.ctype_ = value;
-}
-inline void FieldOptions::set_ctype(::PROTOBUF_NAMESPACE_ID::FieldOptions_CType value) {
-  _internal_set_ctype(value);
-  // @@protoc_insertion_point(field_set:google.protobuf.FieldOptions.ctype)
-}
-
-// optional bool packed = 2;
-inline bool FieldOptions::_internal_has_packed() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000004u) != 0;
-  return value;
-}
-inline bool FieldOptions::has_packed() const {
-  return _internal_has_packed();
-}
-inline void FieldOptions::clear_packed() {
-  _impl_.packed_ = false;
-  _impl_._has_bits_[0] &= ~0x00000004u;
-}
-inline bool FieldOptions::_internal_packed() const {
-  return _impl_.packed_;
-}
-inline bool FieldOptions::packed() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.FieldOptions.packed)
-  return _internal_packed();
-}
-inline void FieldOptions::_internal_set_packed(bool value) {
-  _impl_._has_bits_[0] |= 0x00000004u;
-  _impl_.packed_ = value;
-}
-inline void FieldOptions::set_packed(bool value) {
-  _internal_set_packed(value);
-  // @@protoc_insertion_point(field_set:google.protobuf.FieldOptions.packed)
-}
-
-// optional .google.protobuf.FieldOptions.JSType jstype = 6 [default = JS_NORMAL];
-inline bool FieldOptions::_internal_has_jstype() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
-  return value;
-}
-inline bool FieldOptions::has_jstype() const {
-  return _internal_has_jstype();
-}
-inline void FieldOptions::clear_jstype() {
-  _impl_.jstype_ = 0;
-  _impl_._has_bits_[0] &= ~0x00000002u;
-}
-inline ::PROTOBUF_NAMESPACE_ID::FieldOptions_JSType FieldOptions::_internal_jstype() const {
-  return static_cast< ::PROTOBUF_NAMESPACE_ID::FieldOptions_JSType >(_impl_.jstype_);
-}
-inline ::PROTOBUF_NAMESPACE_ID::FieldOptions_JSType FieldOptions::jstype() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.FieldOptions.jstype)
-  return _internal_jstype();
-}
-inline void FieldOptions::_internal_set_jstype(::PROTOBUF_NAMESPACE_ID::FieldOptions_JSType value) {
-  assert(::PROTOBUF_NAMESPACE_ID::FieldOptions_JSType_IsValid(value));
-  _impl_._has_bits_[0] |= 0x00000002u;
-  _impl_.jstype_ = value;
-}
-inline void FieldOptions::set_jstype(::PROTOBUF_NAMESPACE_ID::FieldOptions_JSType value) {
-  _internal_set_jstype(value);
-  // @@protoc_insertion_point(field_set:google.protobuf.FieldOptions.jstype)
-}
-
-// optional bool lazy = 5 [default = false];
-inline bool FieldOptions::_internal_has_lazy() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000008u) != 0;
-  return value;
-}
-inline bool FieldOptions::has_lazy() const {
-  return _internal_has_lazy();
-}
-inline void FieldOptions::clear_lazy() {
-  _impl_.lazy_ = false;
-  _impl_._has_bits_[0] &= ~0x00000008u;
-}
-inline bool FieldOptions::_internal_lazy() const {
-  return _impl_.lazy_;
-}
-inline bool FieldOptions::lazy() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.FieldOptions.lazy)
-  return _internal_lazy();
-}
-inline void FieldOptions::_internal_set_lazy(bool value) {
-  _impl_._has_bits_[0] |= 0x00000008u;
-  _impl_.lazy_ = value;
-}
-inline void FieldOptions::set_lazy(bool value) {
-  _internal_set_lazy(value);
-  // @@protoc_insertion_point(field_set:google.protobuf.FieldOptions.lazy)
-}
-
-// optional bool unverified_lazy = 15 [default = false];
-inline bool FieldOptions::_internal_has_unverified_lazy() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000010u) != 0;
-  return value;
-}
-inline bool FieldOptions::has_unverified_lazy() const {
-  return _internal_has_unverified_lazy();
-}
-inline void FieldOptions::clear_unverified_lazy() {
-  _impl_.unverified_lazy_ = false;
-  _impl_._has_bits_[0] &= ~0x00000010u;
-}
-inline bool FieldOptions::_internal_unverified_lazy() const {
-  return _impl_.unverified_lazy_;
-}
-inline bool FieldOptions::unverified_lazy() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.FieldOptions.unverified_lazy)
-  return _internal_unverified_lazy();
-}
-inline void FieldOptions::_internal_set_unverified_lazy(bool value) {
-  _impl_._has_bits_[0] |= 0x00000010u;
-  _impl_.unverified_lazy_ = value;
-}
-inline void FieldOptions::set_unverified_lazy(bool value) {
-  _internal_set_unverified_lazy(value);
-  // @@protoc_insertion_point(field_set:google.protobuf.FieldOptions.unverified_lazy)
-}
-
-// optional bool deprecated = 3 [default = false];
-inline bool FieldOptions::_internal_has_deprecated() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000020u) != 0;
-  return value;
-}
-inline bool FieldOptions::has_deprecated() const {
-  return _internal_has_deprecated();
-}
-inline void FieldOptions::clear_deprecated() {
-  _impl_.deprecated_ = false;
-  _impl_._has_bits_[0] &= ~0x00000020u;
-}
-inline bool FieldOptions::_internal_deprecated() const {
-  return _impl_.deprecated_;
-}
-inline bool FieldOptions::deprecated() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.FieldOptions.deprecated)
-  return _internal_deprecated();
-}
-inline void FieldOptions::_internal_set_deprecated(bool value) {
-  _impl_._has_bits_[0] |= 0x00000020u;
-  _impl_.deprecated_ = value;
-}
-inline void FieldOptions::set_deprecated(bool value) {
-  _internal_set_deprecated(value);
-  // @@protoc_insertion_point(field_set:google.protobuf.FieldOptions.deprecated)
-}
-
-// optional bool weak = 10 [default = false];
-inline bool FieldOptions::_internal_has_weak() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000040u) != 0;
-  return value;
-}
-inline bool FieldOptions::has_weak() const {
-  return _internal_has_weak();
-}
-inline void FieldOptions::clear_weak() {
-  _impl_.weak_ = false;
-  _impl_._has_bits_[0] &= ~0x00000040u;
-}
-inline bool FieldOptions::_internal_weak() const {
-  return _impl_.weak_;
-}
-inline bool FieldOptions::weak() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.FieldOptions.weak)
-  return _internal_weak();
-}
-inline void FieldOptions::_internal_set_weak(bool value) {
-  _impl_._has_bits_[0] |= 0x00000040u;
-  _impl_.weak_ = value;
-}
-inline void FieldOptions::set_weak(bool value) {
-  _internal_set_weak(value);
-  // @@protoc_insertion_point(field_set:google.protobuf.FieldOptions.weak)
-}
-
-// repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
-inline int FieldOptions::_internal_uninterpreted_option_size() const {
-  return _impl_.uninterpreted_option_.size();
-}
-inline int FieldOptions::uninterpreted_option_size() const {
-  return _internal_uninterpreted_option_size();
-}
-inline void FieldOptions::clear_uninterpreted_option() {
-  _impl_.uninterpreted_option_.Clear();
-}
-inline ::PROTOBUF_NAMESPACE_ID::UninterpretedOption* FieldOptions::mutable_uninterpreted_option(int index) {
-  // @@protoc_insertion_point(field_mutable:google.protobuf.FieldOptions.uninterpreted_option)
-  return _impl_.uninterpreted_option_.Mutable(index);
-}
-inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::UninterpretedOption >*
-FieldOptions::mutable_uninterpreted_option() {
-  // @@protoc_insertion_point(field_mutable_list:google.protobuf.FieldOptions.uninterpreted_option)
-  return &_impl_.uninterpreted_option_;
-}
-inline const ::PROTOBUF_NAMESPACE_ID::UninterpretedOption& FieldOptions::_internal_uninterpreted_option(int index) const {
-  return _impl_.uninterpreted_option_.Get(index);
-}
-inline const ::PROTOBUF_NAMESPACE_ID::UninterpretedOption& FieldOptions::uninterpreted_option(int index) const {
-  // @@protoc_insertion_point(field_get:google.protobuf.FieldOptions.uninterpreted_option)
-  return _internal_uninterpreted_option(index);
-}
-inline ::PROTOBUF_NAMESPACE_ID::UninterpretedOption* FieldOptions::_internal_add_uninterpreted_option() {
-  return _impl_.uninterpreted_option_.Add();
-}
-inline ::PROTOBUF_NAMESPACE_ID::UninterpretedOption* FieldOptions::add_uninterpreted_option() {
-  ::PROTOBUF_NAMESPACE_ID::UninterpretedOption* _add = _internal_add_uninterpreted_option();
-  // @@protoc_insertion_point(field_add:google.protobuf.FieldOptions.uninterpreted_option)
-  return _add;
-}
-inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::UninterpretedOption >&
-FieldOptions::uninterpreted_option() const {
-  // @@protoc_insertion_point(field_list:google.protobuf.FieldOptions.uninterpreted_option)
-  return _impl_.uninterpreted_option_;
-}
-
-// -------------------------------------------------------------------
-
-// OneofOptions
-
-// repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
-inline int OneofOptions::_internal_uninterpreted_option_size() const {
-  return _impl_.uninterpreted_option_.size();
-}
-inline int OneofOptions::uninterpreted_option_size() const {
-  return _internal_uninterpreted_option_size();
-}
-inline void OneofOptions::clear_uninterpreted_option() {
-  _impl_.uninterpreted_option_.Clear();
-}
-inline ::PROTOBUF_NAMESPACE_ID::UninterpretedOption* OneofOptions::mutable_uninterpreted_option(int index) {
-  // @@protoc_insertion_point(field_mutable:google.protobuf.OneofOptions.uninterpreted_option)
-  return _impl_.uninterpreted_option_.Mutable(index);
-}
-inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::UninterpretedOption >*
-OneofOptions::mutable_uninterpreted_option() {
-  // @@protoc_insertion_point(field_mutable_list:google.protobuf.OneofOptions.uninterpreted_option)
-  return &_impl_.uninterpreted_option_;
-}
-inline const ::PROTOBUF_NAMESPACE_ID::UninterpretedOption& OneofOptions::_internal_uninterpreted_option(int index) const {
-  return _impl_.uninterpreted_option_.Get(index);
-}
-inline const ::PROTOBUF_NAMESPACE_ID::UninterpretedOption& OneofOptions::uninterpreted_option(int index) const {
-  // @@protoc_insertion_point(field_get:google.protobuf.OneofOptions.uninterpreted_option)
-  return _internal_uninterpreted_option(index);
-}
-inline ::PROTOBUF_NAMESPACE_ID::UninterpretedOption* OneofOptions::_internal_add_uninterpreted_option() {
-  return _impl_.uninterpreted_option_.Add();
-}
-inline ::PROTOBUF_NAMESPACE_ID::UninterpretedOption* OneofOptions::add_uninterpreted_option() {
-  ::PROTOBUF_NAMESPACE_ID::UninterpretedOption* _add = _internal_add_uninterpreted_option();
-  // @@protoc_insertion_point(field_add:google.protobuf.OneofOptions.uninterpreted_option)
-  return _add;
-}
-inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::UninterpretedOption >&
-OneofOptions::uninterpreted_option() const {
-  // @@protoc_insertion_point(field_list:google.protobuf.OneofOptions.uninterpreted_option)
-  return _impl_.uninterpreted_option_;
-}
-
-// -------------------------------------------------------------------
-
-// EnumOptions
-
-// optional bool allow_alias = 2;
-inline bool EnumOptions::_internal_has_allow_alias() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  return value;
-}
-inline bool EnumOptions::has_allow_alias() const {
-  return _internal_has_allow_alias();
-}
-inline void EnumOptions::clear_allow_alias() {
-  _impl_.allow_alias_ = false;
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-inline bool EnumOptions::_internal_allow_alias() const {
-  return _impl_.allow_alias_;
-}
-inline bool EnumOptions::allow_alias() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.EnumOptions.allow_alias)
-  return _internal_allow_alias();
-}
-inline void EnumOptions::_internal_set_allow_alias(bool value) {
-  _impl_._has_bits_[0] |= 0x00000001u;
-  _impl_.allow_alias_ = value;
-}
-inline void EnumOptions::set_allow_alias(bool value) {
-  _internal_set_allow_alias(value);
-  // @@protoc_insertion_point(field_set:google.protobuf.EnumOptions.allow_alias)
-}
-
-// optional bool deprecated = 3 [default = false];
-inline bool EnumOptions::_internal_has_deprecated() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
-  return value;
-}
-inline bool EnumOptions::has_deprecated() const {
-  return _internal_has_deprecated();
-}
-inline void EnumOptions::clear_deprecated() {
-  _impl_.deprecated_ = false;
-  _impl_._has_bits_[0] &= ~0x00000002u;
-}
-inline bool EnumOptions::_internal_deprecated() const {
-  return _impl_.deprecated_;
-}
-inline bool EnumOptions::deprecated() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.EnumOptions.deprecated)
-  return _internal_deprecated();
-}
-inline void EnumOptions::_internal_set_deprecated(bool value) {
-  _impl_._has_bits_[0] |= 0x00000002u;
-  _impl_.deprecated_ = value;
-}
-inline void EnumOptions::set_deprecated(bool value) {
-  _internal_set_deprecated(value);
-  // @@protoc_insertion_point(field_set:google.protobuf.EnumOptions.deprecated)
-}
-
-// repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
-inline int EnumOptions::_internal_uninterpreted_option_size() const {
-  return _impl_.uninterpreted_option_.size();
-}
-inline int EnumOptions::uninterpreted_option_size() const {
-  return _internal_uninterpreted_option_size();
-}
-inline void EnumOptions::clear_uninterpreted_option() {
-  _impl_.uninterpreted_option_.Clear();
-}
-inline ::PROTOBUF_NAMESPACE_ID::UninterpretedOption* EnumOptions::mutable_uninterpreted_option(int index) {
-  // @@protoc_insertion_point(field_mutable:google.protobuf.EnumOptions.uninterpreted_option)
-  return _impl_.uninterpreted_option_.Mutable(index);
-}
-inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::UninterpretedOption >*
-EnumOptions::mutable_uninterpreted_option() {
-  // @@protoc_insertion_point(field_mutable_list:google.protobuf.EnumOptions.uninterpreted_option)
-  return &_impl_.uninterpreted_option_;
-}
-inline const ::PROTOBUF_NAMESPACE_ID::UninterpretedOption& EnumOptions::_internal_uninterpreted_option(int index) const {
-  return _impl_.uninterpreted_option_.Get(index);
-}
-inline const ::PROTOBUF_NAMESPACE_ID::UninterpretedOption& EnumOptions::uninterpreted_option(int index) const {
-  // @@protoc_insertion_point(field_get:google.protobuf.EnumOptions.uninterpreted_option)
-  return _internal_uninterpreted_option(index);
-}
-inline ::PROTOBUF_NAMESPACE_ID::UninterpretedOption* EnumOptions::_internal_add_uninterpreted_option() {
-  return _impl_.uninterpreted_option_.Add();
-}
-inline ::PROTOBUF_NAMESPACE_ID::UninterpretedOption* EnumOptions::add_uninterpreted_option() {
-  ::PROTOBUF_NAMESPACE_ID::UninterpretedOption* _add = _internal_add_uninterpreted_option();
-  // @@protoc_insertion_point(field_add:google.protobuf.EnumOptions.uninterpreted_option)
-  return _add;
-}
-inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::UninterpretedOption >&
-EnumOptions::uninterpreted_option() const {
-  // @@protoc_insertion_point(field_list:google.protobuf.EnumOptions.uninterpreted_option)
-  return _impl_.uninterpreted_option_;
-}
-
-// -------------------------------------------------------------------
-
-// EnumValueOptions
-
-// optional bool deprecated = 1 [default = false];
-inline bool EnumValueOptions::_internal_has_deprecated() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  return value;
-}
-inline bool EnumValueOptions::has_deprecated() const {
-  return _internal_has_deprecated();
-}
-inline void EnumValueOptions::clear_deprecated() {
-  _impl_.deprecated_ = false;
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-inline bool EnumValueOptions::_internal_deprecated() const {
-  return _impl_.deprecated_;
-}
-inline bool EnumValueOptions::deprecated() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.EnumValueOptions.deprecated)
-  return _internal_deprecated();
-}
-inline void EnumValueOptions::_internal_set_deprecated(bool value) {
-  _impl_._has_bits_[0] |= 0x00000001u;
-  _impl_.deprecated_ = value;
-}
-inline void EnumValueOptions::set_deprecated(bool value) {
-  _internal_set_deprecated(value);
-  // @@protoc_insertion_point(field_set:google.protobuf.EnumValueOptions.deprecated)
-}
-
-// repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
-inline int EnumValueOptions::_internal_uninterpreted_option_size() const {
-  return _impl_.uninterpreted_option_.size();
-}
-inline int EnumValueOptions::uninterpreted_option_size() const {
-  return _internal_uninterpreted_option_size();
-}
-inline void EnumValueOptions::clear_uninterpreted_option() {
-  _impl_.uninterpreted_option_.Clear();
-}
-inline ::PROTOBUF_NAMESPACE_ID::UninterpretedOption* EnumValueOptions::mutable_uninterpreted_option(int index) {
-  // @@protoc_insertion_point(field_mutable:google.protobuf.EnumValueOptions.uninterpreted_option)
-  return _impl_.uninterpreted_option_.Mutable(index);
-}
-inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::UninterpretedOption >*
-EnumValueOptions::mutable_uninterpreted_option() {
-  // @@protoc_insertion_point(field_mutable_list:google.protobuf.EnumValueOptions.uninterpreted_option)
-  return &_impl_.uninterpreted_option_;
-}
-inline const ::PROTOBUF_NAMESPACE_ID::UninterpretedOption& EnumValueOptions::_internal_uninterpreted_option(int index) const {
-  return _impl_.uninterpreted_option_.Get(index);
-}
-inline const ::PROTOBUF_NAMESPACE_ID::UninterpretedOption& EnumValueOptions::uninterpreted_option(int index) const {
-  // @@protoc_insertion_point(field_get:google.protobuf.EnumValueOptions.uninterpreted_option)
-  return _internal_uninterpreted_option(index);
-}
-inline ::PROTOBUF_NAMESPACE_ID::UninterpretedOption* EnumValueOptions::_internal_add_uninterpreted_option() {
-  return _impl_.uninterpreted_option_.Add();
-}
-inline ::PROTOBUF_NAMESPACE_ID::UninterpretedOption* EnumValueOptions::add_uninterpreted_option() {
-  ::PROTOBUF_NAMESPACE_ID::UninterpretedOption* _add = _internal_add_uninterpreted_option();
-  // @@protoc_insertion_point(field_add:google.protobuf.EnumValueOptions.uninterpreted_option)
-  return _add;
-}
-inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::UninterpretedOption >&
-EnumValueOptions::uninterpreted_option() const {
-  // @@protoc_insertion_point(field_list:google.protobuf.EnumValueOptions.uninterpreted_option)
-  return _impl_.uninterpreted_option_;
-}
-
-// -------------------------------------------------------------------
-
-// ServiceOptions
-
-// optional bool deprecated = 33 [default = false];
-inline bool ServiceOptions::_internal_has_deprecated() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  return value;
-}
-inline bool ServiceOptions::has_deprecated() const {
-  return _internal_has_deprecated();
-}
-inline void ServiceOptions::clear_deprecated() {
-  _impl_.deprecated_ = false;
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-inline bool ServiceOptions::_internal_deprecated() const {
-  return _impl_.deprecated_;
-}
-inline bool ServiceOptions::deprecated() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.ServiceOptions.deprecated)
-  return _internal_deprecated();
-}
-inline void ServiceOptions::_internal_set_deprecated(bool value) {
-  _impl_._has_bits_[0] |= 0x00000001u;
-  _impl_.deprecated_ = value;
-}
-inline void ServiceOptions::set_deprecated(bool value) {
-  _internal_set_deprecated(value);
-  // @@protoc_insertion_point(field_set:google.protobuf.ServiceOptions.deprecated)
-}
-
-// repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
-inline int ServiceOptions::_internal_uninterpreted_option_size() const {
-  return _impl_.uninterpreted_option_.size();
-}
-inline int ServiceOptions::uninterpreted_option_size() const {
-  return _internal_uninterpreted_option_size();
-}
-inline void ServiceOptions::clear_uninterpreted_option() {
-  _impl_.uninterpreted_option_.Clear();
-}
-inline ::PROTOBUF_NAMESPACE_ID::UninterpretedOption* ServiceOptions::mutable_uninterpreted_option(int index) {
-  // @@protoc_insertion_point(field_mutable:google.protobuf.ServiceOptions.uninterpreted_option)
-  return _impl_.uninterpreted_option_.Mutable(index);
-}
-inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::UninterpretedOption >*
-ServiceOptions::mutable_uninterpreted_option() {
-  // @@protoc_insertion_point(field_mutable_list:google.protobuf.ServiceOptions.uninterpreted_option)
-  return &_impl_.uninterpreted_option_;
-}
-inline const ::PROTOBUF_NAMESPACE_ID::UninterpretedOption& ServiceOptions::_internal_uninterpreted_option(int index) const {
-  return _impl_.uninterpreted_option_.Get(index);
-}
-inline const ::PROTOBUF_NAMESPACE_ID::UninterpretedOption& ServiceOptions::uninterpreted_option(int index) const {
-  // @@protoc_insertion_point(field_get:google.protobuf.ServiceOptions.uninterpreted_option)
-  return _internal_uninterpreted_option(index);
-}
-inline ::PROTOBUF_NAMESPACE_ID::UninterpretedOption* ServiceOptions::_internal_add_uninterpreted_option() {
-  return _impl_.uninterpreted_option_.Add();
-}
-inline ::PROTOBUF_NAMESPACE_ID::UninterpretedOption* ServiceOptions::add_uninterpreted_option() {
-  ::PROTOBUF_NAMESPACE_ID::UninterpretedOption* _add = _internal_add_uninterpreted_option();
-  // @@protoc_insertion_point(field_add:google.protobuf.ServiceOptions.uninterpreted_option)
-  return _add;
-}
-inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::UninterpretedOption >&
-ServiceOptions::uninterpreted_option() const {
-  // @@protoc_insertion_point(field_list:google.protobuf.ServiceOptions.uninterpreted_option)
-  return _impl_.uninterpreted_option_;
-}
-
-// -------------------------------------------------------------------
-
-// MethodOptions
-
-// optional bool deprecated = 33 [default = false];
-inline bool MethodOptions::_internal_has_deprecated() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  return value;
-}
-inline bool MethodOptions::has_deprecated() const {
-  return _internal_has_deprecated();
-}
-inline void MethodOptions::clear_deprecated() {
-  _impl_.deprecated_ = false;
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-inline bool MethodOptions::_internal_deprecated() const {
-  return _impl_.deprecated_;
-}
-inline bool MethodOptions::deprecated() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.MethodOptions.deprecated)
-  return _internal_deprecated();
-}
-inline void MethodOptions::_internal_set_deprecated(bool value) {
-  _impl_._has_bits_[0] |= 0x00000001u;
-  _impl_.deprecated_ = value;
-}
-inline void MethodOptions::set_deprecated(bool value) {
-  _internal_set_deprecated(value);
-  // @@protoc_insertion_point(field_set:google.protobuf.MethodOptions.deprecated)
-}
-
-// optional .google.protobuf.MethodOptions.IdempotencyLevel idempotency_level = 34 [default = IDEMPOTENCY_UNKNOWN];
-inline bool MethodOptions::_internal_has_idempotency_level() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
-  return value;
-}
-inline bool MethodOptions::has_idempotency_level() const {
-  return _internal_has_idempotency_level();
-}
-inline void MethodOptions::clear_idempotency_level() {
-  _impl_.idempotency_level_ = 0;
-  _impl_._has_bits_[0] &= ~0x00000002u;
-}
-inline ::PROTOBUF_NAMESPACE_ID::MethodOptions_IdempotencyLevel MethodOptions::_internal_idempotency_level() const {
-  return static_cast< ::PROTOBUF_NAMESPACE_ID::MethodOptions_IdempotencyLevel >(_impl_.idempotency_level_);
-}
-inline ::PROTOBUF_NAMESPACE_ID::MethodOptions_IdempotencyLevel MethodOptions::idempotency_level() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.MethodOptions.idempotency_level)
-  return _internal_idempotency_level();
-}
-inline void MethodOptions::_internal_set_idempotency_level(::PROTOBUF_NAMESPACE_ID::MethodOptions_IdempotencyLevel value) {
-  assert(::PROTOBUF_NAMESPACE_ID::MethodOptions_IdempotencyLevel_IsValid(value));
-  _impl_._has_bits_[0] |= 0x00000002u;
-  _impl_.idempotency_level_ = value;
-}
-inline void MethodOptions::set_idempotency_level(::PROTOBUF_NAMESPACE_ID::MethodOptions_IdempotencyLevel value) {
-  _internal_set_idempotency_level(value);
-  // @@protoc_insertion_point(field_set:google.protobuf.MethodOptions.idempotency_level)
-}
-
-// repeated .google.protobuf.UninterpretedOption uninterpreted_option = 999;
-inline int MethodOptions::_internal_uninterpreted_option_size() const {
-  return _impl_.uninterpreted_option_.size();
-}
-inline int MethodOptions::uninterpreted_option_size() const {
-  return _internal_uninterpreted_option_size();
-}
-inline void MethodOptions::clear_uninterpreted_option() {
-  _impl_.uninterpreted_option_.Clear();
-}
-inline ::PROTOBUF_NAMESPACE_ID::UninterpretedOption* MethodOptions::mutable_uninterpreted_option(int index) {
-  // @@protoc_insertion_point(field_mutable:google.protobuf.MethodOptions.uninterpreted_option)
-  return _impl_.uninterpreted_option_.Mutable(index);
-}
-inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::UninterpretedOption >*
-MethodOptions::mutable_uninterpreted_option() {
-  // @@protoc_insertion_point(field_mutable_list:google.protobuf.MethodOptions.uninterpreted_option)
-  return &_impl_.uninterpreted_option_;
-}
-inline const ::PROTOBUF_NAMESPACE_ID::UninterpretedOption& MethodOptions::_internal_uninterpreted_option(int index) const {
-  return _impl_.uninterpreted_option_.Get(index);
-}
-inline const ::PROTOBUF_NAMESPACE_ID::UninterpretedOption& MethodOptions::uninterpreted_option(int index) const {
-  // @@protoc_insertion_point(field_get:google.protobuf.MethodOptions.uninterpreted_option)
-  return _internal_uninterpreted_option(index);
-}
-inline ::PROTOBUF_NAMESPACE_ID::UninterpretedOption* MethodOptions::_internal_add_uninterpreted_option() {
-  return _impl_.uninterpreted_option_.Add();
-}
-inline ::PROTOBUF_NAMESPACE_ID::UninterpretedOption* MethodOptions::add_uninterpreted_option() {
-  ::PROTOBUF_NAMESPACE_ID::UninterpretedOption* _add = _internal_add_uninterpreted_option();
-  // @@protoc_insertion_point(field_add:google.protobuf.MethodOptions.uninterpreted_option)
-  return _add;
-}
-inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::UninterpretedOption >&
-MethodOptions::uninterpreted_option() const {
-  // @@protoc_insertion_point(field_list:google.protobuf.MethodOptions.uninterpreted_option)
-  return _impl_.uninterpreted_option_;
-}
-
-// -------------------------------------------------------------------
-
-// UninterpretedOption_NamePart
-
-// required string name_part = 1;
-inline bool UninterpretedOption_NamePart::_internal_has_name_part() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  return value;
-}
-inline bool UninterpretedOption_NamePart::has_name_part() const {
-  return _internal_has_name_part();
-}
-inline void UninterpretedOption_NamePart::clear_name_part() {
-  _impl_.name_part_.ClearToEmpty();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-inline const std::string& UninterpretedOption_NamePart::name_part() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.UninterpretedOption.NamePart.name_part)
-  return _internal_name_part();
-}
-template <typename ArgT0, typename... ArgT>
-inline PROTOBUF_ALWAYS_INLINE
-void UninterpretedOption_NamePart::set_name_part(ArgT0&& arg0, ArgT... args) {
- _impl_._has_bits_[0] |= 0x00000001u;
- _impl_.name_part_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
-  // @@protoc_insertion_point(field_set:google.protobuf.UninterpretedOption.NamePart.name_part)
-}
-inline std::string* UninterpretedOption_NamePart::mutable_name_part() {
-  std::string* _s = _internal_mutable_name_part();
-  // @@protoc_insertion_point(field_mutable:google.protobuf.UninterpretedOption.NamePart.name_part)
-  return _s;
-}
-inline const std::string& UninterpretedOption_NamePart::_internal_name_part() const {
-  return _impl_.name_part_.Get();
-}
-inline void UninterpretedOption_NamePart::_internal_set_name_part(const std::string& value) {
-  _impl_._has_bits_[0] |= 0x00000001u;
-  _impl_.name_part_.Set(value, GetArenaForAllocation());
-}
-inline std::string* UninterpretedOption_NamePart::_internal_mutable_name_part() {
-  _impl_._has_bits_[0] |= 0x00000001u;
-  return _impl_.name_part_.Mutable(GetArenaForAllocation());
-}
-inline std::string* UninterpretedOption_NamePart::release_name_part() {
-  // @@protoc_insertion_point(field_release:google.protobuf.UninterpretedOption.NamePart.name_part)
-  if (!_internal_has_name_part()) {
-    return nullptr;
-  }
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  auto* p = _impl_.name_part_.Release();
-#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (_impl_.name_part_.IsDefault()) {
-    _impl_.name_part_.Set("", GetArenaForAllocation());
-  }
-#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  return p;
-}
-inline void UninterpretedOption_NamePart::set_allocated_name_part(std::string* name_part) {
-  if (name_part != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  _impl_.name_part_.SetAllocated(name_part, GetArenaForAllocation());
-#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (_impl_.name_part_.IsDefault()) {
-    _impl_.name_part_.Set("", GetArenaForAllocation());
-  }
-#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:google.protobuf.UninterpretedOption.NamePart.name_part)
-}
-
-// required bool is_extension = 2;
-inline bool UninterpretedOption_NamePart::_internal_has_is_extension() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
-  return value;
-}
-inline bool UninterpretedOption_NamePart::has_is_extension() const {
-  return _internal_has_is_extension();
-}
-inline void UninterpretedOption_NamePart::clear_is_extension() {
-  _impl_.is_extension_ = false;
-  _impl_._has_bits_[0] &= ~0x00000002u;
-}
-inline bool UninterpretedOption_NamePart::_internal_is_extension() const {
-  return _impl_.is_extension_;
-}
-inline bool UninterpretedOption_NamePart::is_extension() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.UninterpretedOption.NamePart.is_extension)
-  return _internal_is_extension();
-}
-inline void UninterpretedOption_NamePart::_internal_set_is_extension(bool value) {
-  _impl_._has_bits_[0] |= 0x00000002u;
-  _impl_.is_extension_ = value;
-}
-inline void UninterpretedOption_NamePart::set_is_extension(bool value) {
-  _internal_set_is_extension(value);
-  // @@protoc_insertion_point(field_set:google.protobuf.UninterpretedOption.NamePart.is_extension)
-}
-
-// -------------------------------------------------------------------
-
-// UninterpretedOption
-
-// repeated .google.protobuf.UninterpretedOption.NamePart name = 2;
-inline int UninterpretedOption::_internal_name_size() const {
-  return _impl_.name_.size();
-}
-inline int UninterpretedOption::name_size() const {
-  return _internal_name_size();
-}
-inline void UninterpretedOption::clear_name() {
-  _impl_.name_.Clear();
-}
-inline ::PROTOBUF_NAMESPACE_ID::UninterpretedOption_NamePart* UninterpretedOption::mutable_name(int index) {
-  // @@protoc_insertion_point(field_mutable:google.protobuf.UninterpretedOption.name)
-  return _impl_.name_.Mutable(index);
-}
-inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::UninterpretedOption_NamePart >*
-UninterpretedOption::mutable_name() {
-  // @@protoc_insertion_point(field_mutable_list:google.protobuf.UninterpretedOption.name)
-  return &_impl_.name_;
-}
-inline const ::PROTOBUF_NAMESPACE_ID::UninterpretedOption_NamePart& UninterpretedOption::_internal_name(int index) const {
-  return _impl_.name_.Get(index);
-}
-inline const ::PROTOBUF_NAMESPACE_ID::UninterpretedOption_NamePart& UninterpretedOption::name(int index) const {
-  // @@protoc_insertion_point(field_get:google.protobuf.UninterpretedOption.name)
-  return _internal_name(index);
-}
-inline ::PROTOBUF_NAMESPACE_ID::UninterpretedOption_NamePart* UninterpretedOption::_internal_add_name() {
-  return _impl_.name_.Add();
-}
-inline ::PROTOBUF_NAMESPACE_ID::UninterpretedOption_NamePart* UninterpretedOption::add_name() {
-  ::PROTOBUF_NAMESPACE_ID::UninterpretedOption_NamePart* _add = _internal_add_name();
-  // @@protoc_insertion_point(field_add:google.protobuf.UninterpretedOption.name)
-  return _add;
-}
-inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::UninterpretedOption_NamePart >&
-UninterpretedOption::name() const {
-  // @@protoc_insertion_point(field_list:google.protobuf.UninterpretedOption.name)
-  return _impl_.name_;
-}
-
-// optional string identifier_value = 3;
-inline bool UninterpretedOption::_internal_has_identifier_value() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  return value;
-}
-inline bool UninterpretedOption::has_identifier_value() const {
-  return _internal_has_identifier_value();
-}
-inline void UninterpretedOption::clear_identifier_value() {
-  _impl_.identifier_value_.ClearToEmpty();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-inline const std::string& UninterpretedOption::identifier_value() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.UninterpretedOption.identifier_value)
-  return _internal_identifier_value();
-}
-template <typename ArgT0, typename... ArgT>
-inline PROTOBUF_ALWAYS_INLINE
-void UninterpretedOption::set_identifier_value(ArgT0&& arg0, ArgT... args) {
- _impl_._has_bits_[0] |= 0x00000001u;
- _impl_.identifier_value_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
-  // @@protoc_insertion_point(field_set:google.protobuf.UninterpretedOption.identifier_value)
-}
-inline std::string* UninterpretedOption::mutable_identifier_value() {
-  std::string* _s = _internal_mutable_identifier_value();
-  // @@protoc_insertion_point(field_mutable:google.protobuf.UninterpretedOption.identifier_value)
-  return _s;
-}
-inline const std::string& UninterpretedOption::_internal_identifier_value() const {
-  return _impl_.identifier_value_.Get();
-}
-inline void UninterpretedOption::_internal_set_identifier_value(const std::string& value) {
-  _impl_._has_bits_[0] |= 0x00000001u;
-  _impl_.identifier_value_.Set(value, GetArenaForAllocation());
-}
-inline std::string* UninterpretedOption::_internal_mutable_identifier_value() {
-  _impl_._has_bits_[0] |= 0x00000001u;
-  return _impl_.identifier_value_.Mutable(GetArenaForAllocation());
-}
-inline std::string* UninterpretedOption::release_identifier_value() {
-  // @@protoc_insertion_point(field_release:google.protobuf.UninterpretedOption.identifier_value)
-  if (!_internal_has_identifier_value()) {
-    return nullptr;
-  }
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  auto* p = _impl_.identifier_value_.Release();
-#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (_impl_.identifier_value_.IsDefault()) {
-    _impl_.identifier_value_.Set("", GetArenaForAllocation());
-  }
-#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  return p;
-}
-inline void UninterpretedOption::set_allocated_identifier_value(std::string* identifier_value) {
-  if (identifier_value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  _impl_.identifier_value_.SetAllocated(identifier_value, GetArenaForAllocation());
-#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (_impl_.identifier_value_.IsDefault()) {
-    _impl_.identifier_value_.Set("", GetArenaForAllocation());
-  }
-#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:google.protobuf.UninterpretedOption.identifier_value)
-}
-
-// optional uint64 positive_int_value = 4;
-inline bool UninterpretedOption::_internal_has_positive_int_value() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000008u) != 0;
-  return value;
-}
-inline bool UninterpretedOption::has_positive_int_value() const {
-  return _internal_has_positive_int_value();
-}
-inline void UninterpretedOption::clear_positive_int_value() {
-  _impl_.positive_int_value_ = uint64_t{0u};
-  _impl_._has_bits_[0] &= ~0x00000008u;
-}
-inline uint64_t UninterpretedOption::_internal_positive_int_value() const {
-  return _impl_.positive_int_value_;
-}
-inline uint64_t UninterpretedOption::positive_int_value() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.UninterpretedOption.positive_int_value)
-  return _internal_positive_int_value();
-}
-inline void UninterpretedOption::_internal_set_positive_int_value(uint64_t value) {
-  _impl_._has_bits_[0] |= 0x00000008u;
-  _impl_.positive_int_value_ = value;
-}
-inline void UninterpretedOption::set_positive_int_value(uint64_t value) {
-  _internal_set_positive_int_value(value);
-  // @@protoc_insertion_point(field_set:google.protobuf.UninterpretedOption.positive_int_value)
-}
-
-// optional int64 negative_int_value = 5;
-inline bool UninterpretedOption::_internal_has_negative_int_value() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000010u) != 0;
-  return value;
-}
-inline bool UninterpretedOption::has_negative_int_value() const {
-  return _internal_has_negative_int_value();
-}
-inline void UninterpretedOption::clear_negative_int_value() {
-  _impl_.negative_int_value_ = int64_t{0};
-  _impl_._has_bits_[0] &= ~0x00000010u;
-}
-inline int64_t UninterpretedOption::_internal_negative_int_value() const {
-  return _impl_.negative_int_value_;
-}
-inline int64_t UninterpretedOption::negative_int_value() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.UninterpretedOption.negative_int_value)
-  return _internal_negative_int_value();
-}
-inline void UninterpretedOption::_internal_set_negative_int_value(int64_t value) {
-  _impl_._has_bits_[0] |= 0x00000010u;
-  _impl_.negative_int_value_ = value;
-}
-inline void UninterpretedOption::set_negative_int_value(int64_t value) {
-  _internal_set_negative_int_value(value);
-  // @@protoc_insertion_point(field_set:google.protobuf.UninterpretedOption.negative_int_value)
-}
-
-// optional double double_value = 6;
-inline bool UninterpretedOption::_internal_has_double_value() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000020u) != 0;
-  return value;
-}
-inline bool UninterpretedOption::has_double_value() const {
-  return _internal_has_double_value();
-}
-inline void UninterpretedOption::clear_double_value() {
-  _impl_.double_value_ = 0;
-  _impl_._has_bits_[0] &= ~0x00000020u;
-}
-inline double UninterpretedOption::_internal_double_value() const {
-  return _impl_.double_value_;
-}
-inline double UninterpretedOption::double_value() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.UninterpretedOption.double_value)
-  return _internal_double_value();
-}
-inline void UninterpretedOption::_internal_set_double_value(double value) {
-  _impl_._has_bits_[0] |= 0x00000020u;
-  _impl_.double_value_ = value;
-}
-inline void UninterpretedOption::set_double_value(double value) {
-  _internal_set_double_value(value);
-  // @@protoc_insertion_point(field_set:google.protobuf.UninterpretedOption.double_value)
-}
-
-// optional bytes string_value = 7;
-inline bool UninterpretedOption::_internal_has_string_value() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
-  return value;
-}
-inline bool UninterpretedOption::has_string_value() const {
-  return _internal_has_string_value();
-}
-inline void UninterpretedOption::clear_string_value() {
-  _impl_.string_value_.ClearToEmpty();
-  _impl_._has_bits_[0] &= ~0x00000002u;
-}
-inline const std::string& UninterpretedOption::string_value() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.UninterpretedOption.string_value)
-  return _internal_string_value();
-}
-template <typename ArgT0, typename... ArgT>
-inline PROTOBUF_ALWAYS_INLINE
-void UninterpretedOption::set_string_value(ArgT0&& arg0, ArgT... args) {
- _impl_._has_bits_[0] |= 0x00000002u;
- _impl_.string_value_.SetBytes(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
-  // @@protoc_insertion_point(field_set:google.protobuf.UninterpretedOption.string_value)
-}
-inline std::string* UninterpretedOption::mutable_string_value() {
-  std::string* _s = _internal_mutable_string_value();
-  // @@protoc_insertion_point(field_mutable:google.protobuf.UninterpretedOption.string_value)
-  return _s;
-}
-inline const std::string& UninterpretedOption::_internal_string_value() const {
-  return _impl_.string_value_.Get();
-}
-inline void UninterpretedOption::_internal_set_string_value(const std::string& value) {
-  _impl_._has_bits_[0] |= 0x00000002u;
-  _impl_.string_value_.Set(value, GetArenaForAllocation());
-}
-inline std::string* UninterpretedOption::_internal_mutable_string_value() {
-  _impl_._has_bits_[0] |= 0x00000002u;
-  return _impl_.string_value_.Mutable(GetArenaForAllocation());
-}
-inline std::string* UninterpretedOption::release_string_value() {
-  // @@protoc_insertion_point(field_release:google.protobuf.UninterpretedOption.string_value)
-  if (!_internal_has_string_value()) {
-    return nullptr;
-  }
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  auto* p = _impl_.string_value_.Release();
-#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (_impl_.string_value_.IsDefault()) {
-    _impl_.string_value_.Set("", GetArenaForAllocation());
-  }
-#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  return p;
-}
-inline void UninterpretedOption::set_allocated_string_value(std::string* string_value) {
-  if (string_value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-  _impl_.string_value_.SetAllocated(string_value, GetArenaForAllocation());
-#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (_impl_.string_value_.IsDefault()) {
-    _impl_.string_value_.Set("", GetArenaForAllocation());
-  }
-#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:google.protobuf.UninterpretedOption.string_value)
-}
-
-// optional string aggregate_value = 8;
-inline bool UninterpretedOption::_internal_has_aggregate_value() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000004u) != 0;
-  return value;
-}
-inline bool UninterpretedOption::has_aggregate_value() const {
-  return _internal_has_aggregate_value();
-}
-inline void UninterpretedOption::clear_aggregate_value() {
-  _impl_.aggregate_value_.ClearToEmpty();
-  _impl_._has_bits_[0] &= ~0x00000004u;
-}
-inline const std::string& UninterpretedOption::aggregate_value() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.UninterpretedOption.aggregate_value)
-  return _internal_aggregate_value();
-}
-template <typename ArgT0, typename... ArgT>
-inline PROTOBUF_ALWAYS_INLINE
-void UninterpretedOption::set_aggregate_value(ArgT0&& arg0, ArgT... args) {
- _impl_._has_bits_[0] |= 0x00000004u;
- _impl_.aggregate_value_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
-  // @@protoc_insertion_point(field_set:google.protobuf.UninterpretedOption.aggregate_value)
-}
-inline std::string* UninterpretedOption::mutable_aggregate_value() {
-  std::string* _s = _internal_mutable_aggregate_value();
-  // @@protoc_insertion_point(field_mutable:google.protobuf.UninterpretedOption.aggregate_value)
-  return _s;
-}
-inline const std::string& UninterpretedOption::_internal_aggregate_value() const {
-  return _impl_.aggregate_value_.Get();
-}
-inline void UninterpretedOption::_internal_set_aggregate_value(const std::string& value) {
-  _impl_._has_bits_[0] |= 0x00000004u;
-  _impl_.aggregate_value_.Set(value, GetArenaForAllocation());
-}
-inline std::string* UninterpretedOption::_internal_mutable_aggregate_value() {
-  _impl_._has_bits_[0] |= 0x00000004u;
-  return _impl_.aggregate_value_.Mutable(GetArenaForAllocation());
-}
-inline std::string* UninterpretedOption::release_aggregate_value() {
-  // @@protoc_insertion_point(field_release:google.protobuf.UninterpretedOption.aggregate_value)
-  if (!_internal_has_aggregate_value()) {
-    return nullptr;
-  }
-  _impl_._has_bits_[0] &= ~0x00000004u;
-  auto* p = _impl_.aggregate_value_.Release();
-#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (_impl_.aggregate_value_.IsDefault()) {
-    _impl_.aggregate_value_.Set("", GetArenaForAllocation());
-  }
-#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  return p;
-}
-inline void UninterpretedOption::set_allocated_aggregate_value(std::string* aggregate_value) {
-  if (aggregate_value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000004u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000004u;
-  }
-  _impl_.aggregate_value_.SetAllocated(aggregate_value, GetArenaForAllocation());
-#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (_impl_.aggregate_value_.IsDefault()) {
-    _impl_.aggregate_value_.Set("", GetArenaForAllocation());
-  }
-#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:google.protobuf.UninterpretedOption.aggregate_value)
-}
-
-// -------------------------------------------------------------------
-
-// SourceCodeInfo_Location
-
-// repeated int32 path = 1 [packed = true];
-inline int SourceCodeInfo_Location::_internal_path_size() const {
-  return _impl_.path_.size();
-}
-inline int SourceCodeInfo_Location::path_size() const {
-  return _internal_path_size();
-}
-inline void SourceCodeInfo_Location::clear_path() {
-  _impl_.path_.Clear();
-}
-inline int32_t SourceCodeInfo_Location::_internal_path(int index) const {
-  return _impl_.path_.Get(index);
-}
-inline int32_t SourceCodeInfo_Location::path(int index) const {
-  // @@protoc_insertion_point(field_get:google.protobuf.SourceCodeInfo.Location.path)
-  return _internal_path(index);
-}
-inline void SourceCodeInfo_Location::set_path(int index, int32_t value) {
-  _impl_.path_.Set(index, value);
-  // @@protoc_insertion_point(field_set:google.protobuf.SourceCodeInfo.Location.path)
-}
-inline void SourceCodeInfo_Location::_internal_add_path(int32_t value) {
-  _impl_.path_.Add(value);
-}
-inline void SourceCodeInfo_Location::add_path(int32_t value) {
-  _internal_add_path(value);
-  // @@protoc_insertion_point(field_add:google.protobuf.SourceCodeInfo.Location.path)
-}
-inline const ::PROTOBUF_NAMESPACE_ID::RepeatedField< int32_t >&
-SourceCodeInfo_Location::_internal_path() const {
-  return _impl_.path_;
-}
-inline const ::PROTOBUF_NAMESPACE_ID::RepeatedField< int32_t >&
-SourceCodeInfo_Location::path() const {
-  // @@protoc_insertion_point(field_list:google.protobuf.SourceCodeInfo.Location.path)
-  return _internal_path();
-}
-inline ::PROTOBUF_NAMESPACE_ID::RepeatedField< int32_t >*
-SourceCodeInfo_Location::_internal_mutable_path() {
-  return &_impl_.path_;
-}
-inline ::PROTOBUF_NAMESPACE_ID::RepeatedField< int32_t >*
-SourceCodeInfo_Location::mutable_path() {
-  // @@protoc_insertion_point(field_mutable_list:google.protobuf.SourceCodeInfo.Location.path)
-  return _internal_mutable_path();
-}
-
-// repeated int32 span = 2 [packed = true];
-inline int SourceCodeInfo_Location::_internal_span_size() const {
-  return _impl_.span_.size();
-}
-inline int SourceCodeInfo_Location::span_size() const {
-  return _internal_span_size();
-}
-inline void SourceCodeInfo_Location::clear_span() {
-  _impl_.span_.Clear();
-}
-inline int32_t SourceCodeInfo_Location::_internal_span(int index) const {
-  return _impl_.span_.Get(index);
-}
-inline int32_t SourceCodeInfo_Location::span(int index) const {
-  // @@protoc_insertion_point(field_get:google.protobuf.SourceCodeInfo.Location.span)
-  return _internal_span(index);
-}
-inline void SourceCodeInfo_Location::set_span(int index, int32_t value) {
-  _impl_.span_.Set(index, value);
-  // @@protoc_insertion_point(field_set:google.protobuf.SourceCodeInfo.Location.span)
-}
-inline void SourceCodeInfo_Location::_internal_add_span(int32_t value) {
-  _impl_.span_.Add(value);
-}
-inline void SourceCodeInfo_Location::add_span(int32_t value) {
-  _internal_add_span(value);
-  // @@protoc_insertion_point(field_add:google.protobuf.SourceCodeInfo.Location.span)
-}
-inline const ::PROTOBUF_NAMESPACE_ID::RepeatedField< int32_t >&
-SourceCodeInfo_Location::_internal_span() const {
-  return _impl_.span_;
-}
-inline const ::PROTOBUF_NAMESPACE_ID::RepeatedField< int32_t >&
-SourceCodeInfo_Location::span() const {
-  // @@protoc_insertion_point(field_list:google.protobuf.SourceCodeInfo.Location.span)
-  return _internal_span();
-}
-inline ::PROTOBUF_NAMESPACE_ID::RepeatedField< int32_t >*
-SourceCodeInfo_Location::_internal_mutable_span() {
-  return &_impl_.span_;
-}
-inline ::PROTOBUF_NAMESPACE_ID::RepeatedField< int32_t >*
-SourceCodeInfo_Location::mutable_span() {
-  // @@protoc_insertion_point(field_mutable_list:google.protobuf.SourceCodeInfo.Location.span)
-  return _internal_mutable_span();
-}
-
-// optional string leading_comments = 3;
-inline bool SourceCodeInfo_Location::_internal_has_leading_comments() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  return value;
-}
-inline bool SourceCodeInfo_Location::has_leading_comments() const {
-  return _internal_has_leading_comments();
-}
-inline void SourceCodeInfo_Location::clear_leading_comments() {
-  _impl_.leading_comments_.ClearToEmpty();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-inline const std::string& SourceCodeInfo_Location::leading_comments() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.SourceCodeInfo.Location.leading_comments)
-  return _internal_leading_comments();
-}
-template <typename ArgT0, typename... ArgT>
-inline PROTOBUF_ALWAYS_INLINE
-void SourceCodeInfo_Location::set_leading_comments(ArgT0&& arg0, ArgT... args) {
- _impl_._has_bits_[0] |= 0x00000001u;
- _impl_.leading_comments_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
-  // @@protoc_insertion_point(field_set:google.protobuf.SourceCodeInfo.Location.leading_comments)
-}
-inline std::string* SourceCodeInfo_Location::mutable_leading_comments() {
-  std::string* _s = _internal_mutable_leading_comments();
-  // @@protoc_insertion_point(field_mutable:google.protobuf.SourceCodeInfo.Location.leading_comments)
-  return _s;
-}
-inline const std::string& SourceCodeInfo_Location::_internal_leading_comments() const {
-  return _impl_.leading_comments_.Get();
-}
-inline void SourceCodeInfo_Location::_internal_set_leading_comments(const std::string& value) {
-  _impl_._has_bits_[0] |= 0x00000001u;
-  _impl_.leading_comments_.Set(value, GetArenaForAllocation());
-}
-inline std::string* SourceCodeInfo_Location::_internal_mutable_leading_comments() {
-  _impl_._has_bits_[0] |= 0x00000001u;
-  return _impl_.leading_comments_.Mutable(GetArenaForAllocation());
-}
-inline std::string* SourceCodeInfo_Location::release_leading_comments() {
-  // @@protoc_insertion_point(field_release:google.protobuf.SourceCodeInfo.Location.leading_comments)
-  if (!_internal_has_leading_comments()) {
-    return nullptr;
-  }
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  auto* p = _impl_.leading_comments_.Release();
-#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (_impl_.leading_comments_.IsDefault()) {
-    _impl_.leading_comments_.Set("", GetArenaForAllocation());
-  }
-#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  return p;
-}
-inline void SourceCodeInfo_Location::set_allocated_leading_comments(std::string* leading_comments) {
-  if (leading_comments != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  _impl_.leading_comments_.SetAllocated(leading_comments, GetArenaForAllocation());
-#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (_impl_.leading_comments_.IsDefault()) {
-    _impl_.leading_comments_.Set("", GetArenaForAllocation());
-  }
-#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:google.protobuf.SourceCodeInfo.Location.leading_comments)
-}
-
-// optional string trailing_comments = 4;
-inline bool SourceCodeInfo_Location::_internal_has_trailing_comments() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
-  return value;
-}
-inline bool SourceCodeInfo_Location::has_trailing_comments() const {
-  return _internal_has_trailing_comments();
-}
-inline void SourceCodeInfo_Location::clear_trailing_comments() {
-  _impl_.trailing_comments_.ClearToEmpty();
-  _impl_._has_bits_[0] &= ~0x00000002u;
-}
-inline const std::string& SourceCodeInfo_Location::trailing_comments() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.SourceCodeInfo.Location.trailing_comments)
-  return _internal_trailing_comments();
-}
-template <typename ArgT0, typename... ArgT>
-inline PROTOBUF_ALWAYS_INLINE
-void SourceCodeInfo_Location::set_trailing_comments(ArgT0&& arg0, ArgT... args) {
- _impl_._has_bits_[0] |= 0x00000002u;
- _impl_.trailing_comments_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
-  // @@protoc_insertion_point(field_set:google.protobuf.SourceCodeInfo.Location.trailing_comments)
-}
-inline std::string* SourceCodeInfo_Location::mutable_trailing_comments() {
-  std::string* _s = _internal_mutable_trailing_comments();
-  // @@protoc_insertion_point(field_mutable:google.protobuf.SourceCodeInfo.Location.trailing_comments)
-  return _s;
-}
-inline const std::string& SourceCodeInfo_Location::_internal_trailing_comments() const {
-  return _impl_.trailing_comments_.Get();
-}
-inline void SourceCodeInfo_Location::_internal_set_trailing_comments(const std::string& value) {
-  _impl_._has_bits_[0] |= 0x00000002u;
-  _impl_.trailing_comments_.Set(value, GetArenaForAllocation());
-}
-inline std::string* SourceCodeInfo_Location::_internal_mutable_trailing_comments() {
-  _impl_._has_bits_[0] |= 0x00000002u;
-  return _impl_.trailing_comments_.Mutable(GetArenaForAllocation());
-}
-inline std::string* SourceCodeInfo_Location::release_trailing_comments() {
-  // @@protoc_insertion_point(field_release:google.protobuf.SourceCodeInfo.Location.trailing_comments)
-  if (!_internal_has_trailing_comments()) {
-    return nullptr;
-  }
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  auto* p = _impl_.trailing_comments_.Release();
-#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (_impl_.trailing_comments_.IsDefault()) {
-    _impl_.trailing_comments_.Set("", GetArenaForAllocation());
-  }
-#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  return p;
-}
-inline void SourceCodeInfo_Location::set_allocated_trailing_comments(std::string* trailing_comments) {
-  if (trailing_comments != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-  _impl_.trailing_comments_.SetAllocated(trailing_comments, GetArenaForAllocation());
-#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (_impl_.trailing_comments_.IsDefault()) {
-    _impl_.trailing_comments_.Set("", GetArenaForAllocation());
-  }
-#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:google.protobuf.SourceCodeInfo.Location.trailing_comments)
-}
-
-// repeated string leading_detached_comments = 6;
-inline int SourceCodeInfo_Location::_internal_leading_detached_comments_size() const {
-  return _impl_.leading_detached_comments_.size();
-}
-inline int SourceCodeInfo_Location::leading_detached_comments_size() const {
-  return _internal_leading_detached_comments_size();
-}
-inline void SourceCodeInfo_Location::clear_leading_detached_comments() {
-  _impl_.leading_detached_comments_.Clear();
-}
-inline std::string* SourceCodeInfo_Location::add_leading_detached_comments() {
-  std::string* _s = _internal_add_leading_detached_comments();
-  // @@protoc_insertion_point(field_add_mutable:google.protobuf.SourceCodeInfo.Location.leading_detached_comments)
-  return _s;
-}
-inline const std::string& SourceCodeInfo_Location::_internal_leading_detached_comments(int index) const {
-  return _impl_.leading_detached_comments_.Get(index);
-}
-inline const std::string& SourceCodeInfo_Location::leading_detached_comments(int index) const {
-  // @@protoc_insertion_point(field_get:google.protobuf.SourceCodeInfo.Location.leading_detached_comments)
-  return _internal_leading_detached_comments(index);
-}
-inline std::string* SourceCodeInfo_Location::mutable_leading_detached_comments(int index) {
-  // @@protoc_insertion_point(field_mutable:google.protobuf.SourceCodeInfo.Location.leading_detached_comments)
-  return _impl_.leading_detached_comments_.Mutable(index);
-}
-inline void SourceCodeInfo_Location::set_leading_detached_comments(int index, const std::string& value) {
-  _impl_.leading_detached_comments_.Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set:google.protobuf.SourceCodeInfo.Location.leading_detached_comments)
-}
-inline void SourceCodeInfo_Location::set_leading_detached_comments(int index, std::string&& value) {
-  _impl_.leading_detached_comments_.Mutable(index)->assign(std::move(value));
-  // @@protoc_insertion_point(field_set:google.protobuf.SourceCodeInfo.Location.leading_detached_comments)
-}
-inline void SourceCodeInfo_Location::set_leading_detached_comments(int index, const char* value) {
-  GOOGLE_DCHECK(value != nullptr);
-  _impl_.leading_detached_comments_.Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set_char:google.protobuf.SourceCodeInfo.Location.leading_detached_comments)
-}
-inline void SourceCodeInfo_Location::set_leading_detached_comments(int index, const char* value, size_t size) {
-  _impl_.leading_detached_comments_.Mutable(index)->assign(
-    reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_set_pointer:google.protobuf.SourceCodeInfo.Location.leading_detached_comments)
-}
-inline std::string* SourceCodeInfo_Location::_internal_add_leading_detached_comments() {
-  return _impl_.leading_detached_comments_.Add();
-}
-inline void SourceCodeInfo_Location::add_leading_detached_comments(const std::string& value) {
-  _impl_.leading_detached_comments_.Add()->assign(value);
-  // @@protoc_insertion_point(field_add:google.protobuf.SourceCodeInfo.Location.leading_detached_comments)
-}
-inline void SourceCodeInfo_Location::add_leading_detached_comments(std::string&& value) {
-  _impl_.leading_detached_comments_.Add(std::move(value));
-  // @@protoc_insertion_point(field_add:google.protobuf.SourceCodeInfo.Location.leading_detached_comments)
-}
-inline void SourceCodeInfo_Location::add_leading_detached_comments(const char* value) {
-  GOOGLE_DCHECK(value != nullptr);
-  _impl_.leading_detached_comments_.Add()->assign(value);
-  // @@protoc_insertion_point(field_add_char:google.protobuf.SourceCodeInfo.Location.leading_detached_comments)
-}
-inline void SourceCodeInfo_Location::add_leading_detached_comments(const char* value, size_t size) {
-  _impl_.leading_detached_comments_.Add()->assign(reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_add_pointer:google.protobuf.SourceCodeInfo.Location.leading_detached_comments)
-}
-inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string>&
-SourceCodeInfo_Location::leading_detached_comments() const {
-  // @@protoc_insertion_point(field_list:google.protobuf.SourceCodeInfo.Location.leading_detached_comments)
-  return _impl_.leading_detached_comments_;
-}
-inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string>*
-SourceCodeInfo_Location::mutable_leading_detached_comments() {
-  // @@protoc_insertion_point(field_mutable_list:google.protobuf.SourceCodeInfo.Location.leading_detached_comments)
-  return &_impl_.leading_detached_comments_;
-}
-
-// -------------------------------------------------------------------
-
-// SourceCodeInfo
-
-// repeated .google.protobuf.SourceCodeInfo.Location location = 1;
-inline int SourceCodeInfo::_internal_location_size() const {
-  return _impl_.location_.size();
-}
-inline int SourceCodeInfo::location_size() const {
-  return _internal_location_size();
-}
-inline void SourceCodeInfo::clear_location() {
-  _impl_.location_.Clear();
-}
-inline ::PROTOBUF_NAMESPACE_ID::SourceCodeInfo_Location* SourceCodeInfo::mutable_location(int index) {
-  // @@protoc_insertion_point(field_mutable:google.protobuf.SourceCodeInfo.location)
-  return _impl_.location_.Mutable(index);
-}
-inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::SourceCodeInfo_Location >*
-SourceCodeInfo::mutable_location() {
-  // @@protoc_insertion_point(field_mutable_list:google.protobuf.SourceCodeInfo.location)
-  return &_impl_.location_;
-}
-inline const ::PROTOBUF_NAMESPACE_ID::SourceCodeInfo_Location& SourceCodeInfo::_internal_location(int index) const {
-  return _impl_.location_.Get(index);
-}
-inline const ::PROTOBUF_NAMESPACE_ID::SourceCodeInfo_Location& SourceCodeInfo::location(int index) const {
-  // @@protoc_insertion_point(field_get:google.protobuf.SourceCodeInfo.location)
-  return _internal_location(index);
-}
-inline ::PROTOBUF_NAMESPACE_ID::SourceCodeInfo_Location* SourceCodeInfo::_internal_add_location() {
-  return _impl_.location_.Add();
-}
-inline ::PROTOBUF_NAMESPACE_ID::SourceCodeInfo_Location* SourceCodeInfo::add_location() {
-  ::PROTOBUF_NAMESPACE_ID::SourceCodeInfo_Location* _add = _internal_add_location();
-  // @@protoc_insertion_point(field_add:google.protobuf.SourceCodeInfo.location)
-  return _add;
-}
-inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::SourceCodeInfo_Location >&
-SourceCodeInfo::location() const {
-  // @@protoc_insertion_point(field_list:google.protobuf.SourceCodeInfo.location)
-  return _impl_.location_;
-}
-
-// -------------------------------------------------------------------
-
-// GeneratedCodeInfo_Annotation
-
-// repeated int32 path = 1 [packed = true];
-inline int GeneratedCodeInfo_Annotation::_internal_path_size() const {
-  return _impl_.path_.size();
-}
-inline int GeneratedCodeInfo_Annotation::path_size() const {
-  return _internal_path_size();
-}
-inline void GeneratedCodeInfo_Annotation::clear_path() {
-  _impl_.path_.Clear();
-}
-inline int32_t GeneratedCodeInfo_Annotation::_internal_path(int index) const {
-  return _impl_.path_.Get(index);
-}
-inline int32_t GeneratedCodeInfo_Annotation::path(int index) const {
-  // @@protoc_insertion_point(field_get:google.protobuf.GeneratedCodeInfo.Annotation.path)
-  return _internal_path(index);
-}
-inline void GeneratedCodeInfo_Annotation::set_path(int index, int32_t value) {
-  _impl_.path_.Set(index, value);
-  // @@protoc_insertion_point(field_set:google.protobuf.GeneratedCodeInfo.Annotation.path)
-}
-inline void GeneratedCodeInfo_Annotation::_internal_add_path(int32_t value) {
-  _impl_.path_.Add(value);
-}
-inline void GeneratedCodeInfo_Annotation::add_path(int32_t value) {
-  _internal_add_path(value);
-  // @@protoc_insertion_point(field_add:google.protobuf.GeneratedCodeInfo.Annotation.path)
-}
-inline const ::PROTOBUF_NAMESPACE_ID::RepeatedField< int32_t >&
-GeneratedCodeInfo_Annotation::_internal_path() const {
-  return _impl_.path_;
-}
-inline const ::PROTOBUF_NAMESPACE_ID::RepeatedField< int32_t >&
-GeneratedCodeInfo_Annotation::path() const {
-  // @@protoc_insertion_point(field_list:google.protobuf.GeneratedCodeInfo.Annotation.path)
-  return _internal_path();
-}
-inline ::PROTOBUF_NAMESPACE_ID::RepeatedField< int32_t >*
-GeneratedCodeInfo_Annotation::_internal_mutable_path() {
-  return &_impl_.path_;
-}
-inline ::PROTOBUF_NAMESPACE_ID::RepeatedField< int32_t >*
-GeneratedCodeInfo_Annotation::mutable_path() {
-  // @@protoc_insertion_point(field_mutable_list:google.protobuf.GeneratedCodeInfo.Annotation.path)
-  return _internal_mutable_path();
-}
-
-// optional string source_file = 2;
-inline bool GeneratedCodeInfo_Annotation::_internal_has_source_file() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  return value;
-}
-inline bool GeneratedCodeInfo_Annotation::has_source_file() const {
-  return _internal_has_source_file();
-}
-inline void GeneratedCodeInfo_Annotation::clear_source_file() {
-  _impl_.source_file_.ClearToEmpty();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-inline const std::string& GeneratedCodeInfo_Annotation::source_file() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.GeneratedCodeInfo.Annotation.source_file)
-  return _internal_source_file();
-}
-template <typename ArgT0, typename... ArgT>
-inline PROTOBUF_ALWAYS_INLINE
-void GeneratedCodeInfo_Annotation::set_source_file(ArgT0&& arg0, ArgT... args) {
- _impl_._has_bits_[0] |= 0x00000001u;
- _impl_.source_file_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
-  // @@protoc_insertion_point(field_set:google.protobuf.GeneratedCodeInfo.Annotation.source_file)
-}
-inline std::string* GeneratedCodeInfo_Annotation::mutable_source_file() {
-  std::string* _s = _internal_mutable_source_file();
-  // @@protoc_insertion_point(field_mutable:google.protobuf.GeneratedCodeInfo.Annotation.source_file)
-  return _s;
-}
-inline const std::string& GeneratedCodeInfo_Annotation::_internal_source_file() const {
-  return _impl_.source_file_.Get();
-}
-inline void GeneratedCodeInfo_Annotation::_internal_set_source_file(const std::string& value) {
-  _impl_._has_bits_[0] |= 0x00000001u;
-  _impl_.source_file_.Set(value, GetArenaForAllocation());
-}
-inline std::string* GeneratedCodeInfo_Annotation::_internal_mutable_source_file() {
-  _impl_._has_bits_[0] |= 0x00000001u;
-  return _impl_.source_file_.Mutable(GetArenaForAllocation());
-}
-inline std::string* GeneratedCodeInfo_Annotation::release_source_file() {
-  // @@protoc_insertion_point(field_release:google.protobuf.GeneratedCodeInfo.Annotation.source_file)
-  if (!_internal_has_source_file()) {
-    return nullptr;
-  }
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  auto* p = _impl_.source_file_.Release();
-#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (_impl_.source_file_.IsDefault()) {
-    _impl_.source_file_.Set("", GetArenaForAllocation());
-  }
-#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  return p;
-}
-inline void GeneratedCodeInfo_Annotation::set_allocated_source_file(std::string* source_file) {
-  if (source_file != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  _impl_.source_file_.SetAllocated(source_file, GetArenaForAllocation());
-#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (_impl_.source_file_.IsDefault()) {
-    _impl_.source_file_.Set("", GetArenaForAllocation());
-  }
-#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:google.protobuf.GeneratedCodeInfo.Annotation.source_file)
-}
-
-// optional int32 begin = 3;
-inline bool GeneratedCodeInfo_Annotation::_internal_has_begin() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
-  return value;
-}
-inline bool GeneratedCodeInfo_Annotation::has_begin() const {
-  return _internal_has_begin();
-}
-inline void GeneratedCodeInfo_Annotation::clear_begin() {
-  _impl_.begin_ = 0;
-  _impl_._has_bits_[0] &= ~0x00000002u;
-}
-inline int32_t GeneratedCodeInfo_Annotation::_internal_begin() const {
-  return _impl_.begin_;
-}
-inline int32_t GeneratedCodeInfo_Annotation::begin() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.GeneratedCodeInfo.Annotation.begin)
-  return _internal_begin();
-}
-inline void GeneratedCodeInfo_Annotation::_internal_set_begin(int32_t value) {
-  _impl_._has_bits_[0] |= 0x00000002u;
-  _impl_.begin_ = value;
-}
-inline void GeneratedCodeInfo_Annotation::set_begin(int32_t value) {
-  _internal_set_begin(value);
-  // @@protoc_insertion_point(field_set:google.protobuf.GeneratedCodeInfo.Annotation.begin)
-}
-
-// optional int32 end = 4;
-inline bool GeneratedCodeInfo_Annotation::_internal_has_end() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000004u) != 0;
-  return value;
-}
-inline bool GeneratedCodeInfo_Annotation::has_end() const {
-  return _internal_has_end();
-}
-inline void GeneratedCodeInfo_Annotation::clear_end() {
-  _impl_.end_ = 0;
-  _impl_._has_bits_[0] &= ~0x00000004u;
-}
-inline int32_t GeneratedCodeInfo_Annotation::_internal_end() const {
-  return _impl_.end_;
-}
-inline int32_t GeneratedCodeInfo_Annotation::end() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.GeneratedCodeInfo.Annotation.end)
-  return _internal_end();
-}
-inline void GeneratedCodeInfo_Annotation::_internal_set_end(int32_t value) {
-  _impl_._has_bits_[0] |= 0x00000004u;
-  _impl_.end_ = value;
-}
-inline void GeneratedCodeInfo_Annotation::set_end(int32_t value) {
-  _internal_set_end(value);
-  // @@protoc_insertion_point(field_set:google.protobuf.GeneratedCodeInfo.Annotation.end)
-}
-
-// -------------------------------------------------------------------
-
-// GeneratedCodeInfo
-
-// repeated .google.protobuf.GeneratedCodeInfo.Annotation annotation = 1;
-inline int GeneratedCodeInfo::_internal_annotation_size() const {
-  return _impl_.annotation_.size();
-}
-inline int GeneratedCodeInfo::annotation_size() const {
-  return _internal_annotation_size();
-}
-inline void GeneratedCodeInfo::clear_annotation() {
-  _impl_.annotation_.Clear();
-}
-inline ::PROTOBUF_NAMESPACE_ID::GeneratedCodeInfo_Annotation* GeneratedCodeInfo::mutable_annotation(int index) {
-  // @@protoc_insertion_point(field_mutable:google.protobuf.GeneratedCodeInfo.annotation)
-  return _impl_.annotation_.Mutable(index);
-}
-inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::GeneratedCodeInfo_Annotation >*
-GeneratedCodeInfo::mutable_annotation() {
-  // @@protoc_insertion_point(field_mutable_list:google.protobuf.GeneratedCodeInfo.annotation)
-  return &_impl_.annotation_;
-}
-inline const ::PROTOBUF_NAMESPACE_ID::GeneratedCodeInfo_Annotation& GeneratedCodeInfo::_internal_annotation(int index) const {
-  return _impl_.annotation_.Get(index);
-}
-inline const ::PROTOBUF_NAMESPACE_ID::GeneratedCodeInfo_Annotation& GeneratedCodeInfo::annotation(int index) const {
-  // @@protoc_insertion_point(field_get:google.protobuf.GeneratedCodeInfo.annotation)
-  return _internal_annotation(index);
-}
-inline ::PROTOBUF_NAMESPACE_ID::GeneratedCodeInfo_Annotation* GeneratedCodeInfo::_internal_add_annotation() {
-  return _impl_.annotation_.Add();
-}
-inline ::PROTOBUF_NAMESPACE_ID::GeneratedCodeInfo_Annotation* GeneratedCodeInfo::add_annotation() {
-  ::PROTOBUF_NAMESPACE_ID::GeneratedCodeInfo_Annotation* _add = _internal_add_annotation();
-  // @@protoc_insertion_point(field_add:google.protobuf.GeneratedCodeInfo.annotation)
-  return _add;
-}
-inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::GeneratedCodeInfo_Annotation >&
-GeneratedCodeInfo::annotation() const {
-  // @@protoc_insertion_point(field_list:google.protobuf.GeneratedCodeInfo.annotation)
-  return _impl_.annotation_;
-}
-
-#ifdef __GNUC__
-  #pragma GCC diagnostic pop
-#endif  // __GNUC__
-// -------------------------------------------------------------------
-
-// -------------------------------------------------------------------
-
-// -------------------------------------------------------------------
-
-// -------------------------------------------------------------------
-
-// -------------------------------------------------------------------
-
-// -------------------------------------------------------------------
-
-// -------------------------------------------------------------------
-
-// -------------------------------------------------------------------
-
-// -------------------------------------------------------------------
-
-// -------------------------------------------------------------------
-
-// -------------------------------------------------------------------
-
-// -------------------------------------------------------------------
-
-// -------------------------------------------------------------------
-
-// -------------------------------------------------------------------
-
-// -------------------------------------------------------------------
-
-// -------------------------------------------------------------------
-
-// -------------------------------------------------------------------
-
-// -------------------------------------------------------------------
-
-// -------------------------------------------------------------------
-
-// -------------------------------------------------------------------
-
-// -------------------------------------------------------------------
-
-// -------------------------------------------------------------------
-
-// -------------------------------------------------------------------
-
-// -------------------------------------------------------------------
-
-// -------------------------------------------------------------------
-
-// -------------------------------------------------------------------
-
-
-// @@protoc_insertion_point(namespace_scope)
-
-PROTOBUF_NAMESPACE_CLOSE
-
-PROTOBUF_NAMESPACE_OPEN
-
-template <> struct is_proto_enum< ::PROTOBUF_NAMESPACE_ID::FieldDescriptorProto_Type> : ::std::true_type {};
-template <>
-inline const EnumDescriptor* GetEnumDescriptor< ::PROTOBUF_NAMESPACE_ID::FieldDescriptorProto_Type>() {
-  return ::PROTOBUF_NAMESPACE_ID::FieldDescriptorProto_Type_descriptor();
-}
-template <> struct is_proto_enum< ::PROTOBUF_NAMESPACE_ID::FieldDescriptorProto_Label> : ::std::true_type {};
-template <>
-inline const EnumDescriptor* GetEnumDescriptor< ::PROTOBUF_NAMESPACE_ID::FieldDescriptorProto_Label>() {
-  return ::PROTOBUF_NAMESPACE_ID::FieldDescriptorProto_Label_descriptor();
-}
-template <> struct is_proto_enum< ::PROTOBUF_NAMESPACE_ID::FileOptions_OptimizeMode> : ::std::true_type {};
-template <>
-inline const EnumDescriptor* GetEnumDescriptor< ::PROTOBUF_NAMESPACE_ID::FileOptions_OptimizeMode>() {
-  return ::PROTOBUF_NAMESPACE_ID::FileOptions_OptimizeMode_descriptor();
-}
-template <> struct is_proto_enum< ::PROTOBUF_NAMESPACE_ID::FieldOptions_CType> : ::std::true_type {};
-template <>
-inline const EnumDescriptor* GetEnumDescriptor< ::PROTOBUF_NAMESPACE_ID::FieldOptions_CType>() {
-  return ::PROTOBUF_NAMESPACE_ID::FieldOptions_CType_descriptor();
-}
-template <> struct is_proto_enum< ::PROTOBUF_NAMESPACE_ID::FieldOptions_JSType> : ::std::true_type {};
-template <>
-inline const EnumDescriptor* GetEnumDescriptor< ::PROTOBUF_NAMESPACE_ID::FieldOptions_JSType>() {
-  return ::PROTOBUF_NAMESPACE_ID::FieldOptions_JSType_descriptor();
-}
-template <> struct is_proto_enum< ::PROTOBUF_NAMESPACE_ID::MethodOptions_IdempotencyLevel> : ::std::true_type {};
-template <>
-inline const EnumDescriptor* GetEnumDescriptor< ::PROTOBUF_NAMESPACE_ID::MethodOptions_IdempotencyLevel>() {
-  return ::PROTOBUF_NAMESPACE_ID::MethodOptions_IdempotencyLevel_descriptor();
-}
-
-PROTOBUF_NAMESPACE_CLOSE
-
-// @@protoc_insertion_point(global_scope)
-
-#include <google/protobuf/port_undef.inc>
-#endif  // GOOGLE_PROTOBUF_INCLUDED_GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fdescriptor_2eproto
diff --git a/libs/protobuf/src/google/protobuf/descriptor.proto b/libs/protobuf/src/google/protobuf/descriptor.proto
deleted file mode 100644
index f8eb216..0000000
--- a/libs/protobuf/src/google/protobuf/descriptor.proto
+++ /dev/null
@@ -1,921 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-//
-// The messages in this file describe the definitions found in .proto files.
-// A valid .proto file can be translated directly to a FileDescriptorProto
-// without any other information (e.g. without reading its imports).
-
-
-syntax = "proto2";
-
-package google.protobuf;
-
-option go_package = "google.golang.org/protobuf/types/descriptorpb";
-option java_package = "com.google.protobuf";
-option java_outer_classname = "DescriptorProtos";
-option csharp_namespace = "Google.Protobuf.Reflection";
-option objc_class_prefix = "GPB";
-option cc_enable_arenas = true;
-
-// descriptor.proto must be optimized for speed because reflection-based
-// algorithms don't work during bootstrapping.
-option optimize_for = SPEED;
-
-// The protocol compiler can output a FileDescriptorSet containing the .proto
-// files it parses.
-message FileDescriptorSet {
-  repeated FileDescriptorProto file = 1;
-}
-
-// Describes a complete .proto file.
-message FileDescriptorProto {
-  optional string name = 1;     // file name, relative to root of source tree
-  optional string package = 2;  // e.g. "foo", "foo.bar", etc.
-
-  // Names of files imported by this file.
-  repeated string dependency = 3;
-  // Indexes of the public imported files in the dependency list above.
-  repeated int32 public_dependency = 10;
-  // Indexes of the weak imported files in the dependency list.
-  // For Google-internal migration only. Do not use.
-  repeated int32 weak_dependency = 11;
-
-  // All top-level definitions in this file.
-  repeated DescriptorProto message_type = 4;
-  repeated EnumDescriptorProto enum_type = 5;
-  repeated ServiceDescriptorProto service = 6;
-  repeated FieldDescriptorProto extension = 7;
-
-  optional FileOptions options = 8;
-
-  // This field contains optional information about the original source code.
-  // You may safely remove this entire field without harming runtime
-  // functionality of the descriptors -- the information is needed only by
-  // development tools.
-  optional SourceCodeInfo source_code_info = 9;
-
-  // The syntax of the proto file.
-  // The supported values are "proto2" and "proto3".
-  optional string syntax = 12;
-}
-
-// Describes a message type.
-message DescriptorProto {
-  optional string name = 1;
-
-  repeated FieldDescriptorProto field = 2;
-  repeated FieldDescriptorProto extension = 6;
-
-  repeated DescriptorProto nested_type = 3;
-  repeated EnumDescriptorProto enum_type = 4;
-
-  message ExtensionRange {
-    optional int32 start = 1;  // Inclusive.
-    optional int32 end = 2;    // Exclusive.
-
-    optional ExtensionRangeOptions options = 3;
-  }
-  repeated ExtensionRange extension_range = 5;
-
-  repeated OneofDescriptorProto oneof_decl = 8;
-
-  optional MessageOptions options = 7;
-
-  // Range of reserved tag numbers. Reserved tag numbers may not be used by
-  // fields or extension ranges in the same message. Reserved ranges may
-  // not overlap.
-  message ReservedRange {
-    optional int32 start = 1;  // Inclusive.
-    optional int32 end = 2;    // Exclusive.
-  }
-  repeated ReservedRange reserved_range = 9;
-  // Reserved field names, which may not be used by fields in the same message.
-  // A given name may only be reserved once.
-  repeated string reserved_name = 10;
-}
-
-message ExtensionRangeOptions {
-  // The parser stores options it doesn't recognize here. See above.
-  repeated UninterpretedOption uninterpreted_option = 999;
-
-
-  // Clients can define custom options in extensions of this message. See above.
-  extensions 1000 to max;
-}
-
-// Describes a field within a message.
-message FieldDescriptorProto {
-  enum Type {
-    // 0 is reserved for errors.
-    // Order is weird for historical reasons.
-    TYPE_DOUBLE = 1;
-    TYPE_FLOAT = 2;
-    // Not ZigZag encoded.  Negative numbers take 10 bytes.  Use TYPE_SINT64 if
-    // negative values are likely.
-    TYPE_INT64 = 3;
-    TYPE_UINT64 = 4;
-    // Not ZigZag encoded.  Negative numbers take 10 bytes.  Use TYPE_SINT32 if
-    // negative values are likely.
-    TYPE_INT32 = 5;
-    TYPE_FIXED64 = 6;
-    TYPE_FIXED32 = 7;
-    TYPE_BOOL = 8;
-    TYPE_STRING = 9;
-    // Tag-delimited aggregate.
-    // Group type is deprecated and not supported in proto3. However, Proto3
-    // implementations should still be able to parse the group wire format and
-    // treat group fields as unknown fields.
-    TYPE_GROUP = 10;
-    TYPE_MESSAGE = 11;  // Length-delimited aggregate.
-
-    // New in version 2.
-    TYPE_BYTES = 12;
-    TYPE_UINT32 = 13;
-    TYPE_ENUM = 14;
-    TYPE_SFIXED32 = 15;
-    TYPE_SFIXED64 = 16;
-    TYPE_SINT32 = 17;  // Uses ZigZag encoding.
-    TYPE_SINT64 = 18;  // Uses ZigZag encoding.
-  }
-
-  enum Label {
-    // 0 is reserved for errors
-    LABEL_OPTIONAL = 1;
-    LABEL_REQUIRED = 2;
-    LABEL_REPEATED = 3;
-  }
-
-  optional string name = 1;
-  optional int32 number = 3;
-  optional Label label = 4;
-
-  // If type_name is set, this need not be set.  If both this and type_name
-  // are set, this must be one of TYPE_ENUM, TYPE_MESSAGE or TYPE_GROUP.
-  optional Type type = 5;
-
-  // For message and enum types, this is the name of the type.  If the name
-  // starts with a '.', it is fully-qualified.  Otherwise, C++-like scoping
-  // rules are used to find the type (i.e. first the nested types within this
-  // message are searched, then within the parent, on up to the root
-  // namespace).
-  optional string type_name = 6;
-
-  // For extensions, this is the name of the type being extended.  It is
-  // resolved in the same manner as type_name.
-  optional string extendee = 2;
-
-  // For numeric types, contains the original text representation of the value.
-  // For booleans, "true" or "false".
-  // For strings, contains the default text contents (not escaped in any way).
-  // For bytes, contains the C escaped value.  All bytes >= 128 are escaped.
-  optional string default_value = 7;
-
-  // If set, gives the index of a oneof in the containing type's oneof_decl
-  // list.  This field is a member of that oneof.
-  optional int32 oneof_index = 9;
-
-  // JSON name of this field. The value is set by protocol compiler. If the
-  // user has set a "json_name" option on this field, that option's value
-  // will be used. Otherwise, it's deduced from the field's name by converting
-  // it to camelCase.
-  optional string json_name = 10;
-
-  optional FieldOptions options = 8;
-
-  // If true, this is a proto3 "optional". When a proto3 field is optional, it
-  // tracks presence regardless of field type.
-  //
-  // When proto3_optional is true, this field must be belong to a oneof to
-  // signal to old proto3 clients that presence is tracked for this field. This
-  // oneof is known as a "synthetic" oneof, and this field must be its sole
-  // member (each proto3 optional field gets its own synthetic oneof). Synthetic
-  // oneofs exist in the descriptor only, and do not generate any API. Synthetic
-  // oneofs must be ordered after all "real" oneofs.
-  //
-  // For message fields, proto3_optional doesn't create any semantic change,
-  // since non-repeated message fields always track presence. However it still
-  // indicates the semantic detail of whether the user wrote "optional" or not.
-  // This can be useful for round-tripping the .proto file. For consistency we
-  // give message fields a synthetic oneof also, even though it is not required
-  // to track presence. This is especially important because the parser can't
-  // tell if a field is a message or an enum, so it must always create a
-  // synthetic oneof.
-  //
-  // Proto2 optional fields do not set this flag, because they already indicate
-  // optional with `LABEL_OPTIONAL`.
-  optional bool proto3_optional = 17;
-}
-
-// Describes a oneof.
-message OneofDescriptorProto {
-  optional string name = 1;
-  optional OneofOptions options = 2;
-}
-
-// Describes an enum type.
-message EnumDescriptorProto {
-  optional string name = 1;
-
-  repeated EnumValueDescriptorProto value = 2;
-
-  optional EnumOptions options = 3;
-
-  // Range of reserved numeric values. Reserved values may not be used by
-  // entries in the same enum. Reserved ranges may not overlap.
-  //
-  // Note that this is distinct from DescriptorProto.ReservedRange in that it
-  // is inclusive such that it can appropriately represent the entire int32
-  // domain.
-  message EnumReservedRange {
-    optional int32 start = 1;  // Inclusive.
-    optional int32 end = 2;    // Inclusive.
-  }
-
-  // Range of reserved numeric values. Reserved numeric values may not be used
-  // by enum values in the same enum declaration. Reserved ranges may not
-  // overlap.
-  repeated EnumReservedRange reserved_range = 4;
-
-  // Reserved enum value names, which may not be reused. A given name may only
-  // be reserved once.
-  repeated string reserved_name = 5;
-}
-
-// Describes a value within an enum.
-message EnumValueDescriptorProto {
-  optional string name = 1;
-  optional int32 number = 2;
-
-  optional EnumValueOptions options = 3;
-}
-
-// Describes a service.
-message ServiceDescriptorProto {
-  optional string name = 1;
-  repeated MethodDescriptorProto method = 2;
-
-  optional ServiceOptions options = 3;
-}
-
-// Describes a method of a service.
-message MethodDescriptorProto {
-  optional string name = 1;
-
-  // Input and output type names.  These are resolved in the same way as
-  // FieldDescriptorProto.type_name, but must refer to a message type.
-  optional string input_type = 2;
-  optional string output_type = 3;
-
-  optional MethodOptions options = 4;
-
-  // Identifies if client streams multiple client messages
-  optional bool client_streaming = 5 [default = false];
-  // Identifies if server streams multiple server messages
-  optional bool server_streaming = 6 [default = false];
-}
-
-
-// ===================================================================
-// Options
-
-// Each of the definitions above may have "options" attached.  These are
-// just annotations which may cause code to be generated slightly differently
-// or may contain hints for code that manipulates protocol messages.
-//
-// Clients may define custom options as extensions of the *Options messages.
-// These extensions may not yet be known at parsing time, so the parser cannot
-// store the values in them.  Instead it stores them in a field in the *Options
-// message called uninterpreted_option. This field must have the same name
-// across all *Options messages. We then use this field to populate the
-// extensions when we build a descriptor, at which point all protos have been
-// parsed and so all extensions are known.
-//
-// Extension numbers for custom options may be chosen as follows:
-// * For options which will only be used within a single application or
-//   organization, or for experimental options, use field numbers 50000
-//   through 99999.  It is up to you to ensure that you do not use the
-//   same number for multiple options.
-// * For options which will be published and used publicly by multiple
-//   independent entities, e-mail protobuf-global-extension-registry@google.com
-//   to reserve extension numbers. Simply provide your project name (e.g.
-//   Objective-C plugin) and your project website (if available) -- there's no
-//   need to explain how you intend to use them. Usually you only need one
-//   extension number. You can declare multiple options with only one extension
-//   number by putting them in a sub-message. See the Custom Options section of
-//   the docs for examples:
-//   https://developers.google.com/protocol-buffers/docs/proto#options
-//   If this turns out to be popular, a web service will be set up
-//   to automatically assign option numbers.
-
-message FileOptions {
-
-  // Sets the Java package where classes generated from this .proto will be
-  // placed.  By default, the proto package is used, but this is often
-  // inappropriate because proto packages do not normally start with backwards
-  // domain names.
-  optional string java_package = 1;
-
-
-  // Controls the name of the wrapper Java class generated for the .proto file.
-  // That class will always contain the .proto file's getDescriptor() method as
-  // well as any top-level extensions defined in the .proto file.
-  // If java_multiple_files is disabled, then all the other classes from the
-  // .proto file will be nested inside the single wrapper outer class.
-  optional string java_outer_classname = 8;
-
-  // If enabled, then the Java code generator will generate a separate .java
-  // file for each top-level message, enum, and service defined in the .proto
-  // file.  Thus, these types will *not* be nested inside the wrapper class
-  // named by java_outer_classname.  However, the wrapper class will still be
-  // generated to contain the file's getDescriptor() method as well as any
-  // top-level extensions defined in the file.
-  optional bool java_multiple_files = 10 [default = false];
-
-  // This option does nothing.
-  optional bool java_generate_equals_and_hash = 20 [deprecated=true];
-
-  // If set true, then the Java2 code generator will generate code that
-  // throws an exception whenever an attempt is made to assign a non-UTF-8
-  // byte sequence to a string field.
-  // Message reflection will do the same.
-  // However, an extension field still accepts non-UTF-8 byte sequences.
-  // This option has no effect on when used with the lite runtime.
-  optional bool java_string_check_utf8 = 27 [default = false];
-
-
-  // Generated classes can be optimized for speed or code size.
-  enum OptimizeMode {
-    SPEED = 1;         // Generate complete code for parsing, serialization,
-                       // etc.
-    CODE_SIZE = 2;     // Use ReflectionOps to implement these methods.
-    LITE_RUNTIME = 3;  // Generate code using MessageLite and the lite runtime.
-  }
-  optional OptimizeMode optimize_for = 9 [default = SPEED];
-
-  // Sets the Go package where structs generated from this .proto will be
-  // placed. If omitted, the Go package will be derived from the following:
-  //   - The basename of the package import path, if provided.
-  //   - Otherwise, the package statement in the .proto file, if present.
-  //   - Otherwise, the basename of the .proto file, without extension.
-  optional string go_package = 11;
-
-
-
-
-  // Should generic services be generated in each language?  "Generic" services
-  // are not specific to any particular RPC system.  They are generated by the
-  // main code generators in each language (without additional plugins).
-  // Generic services were the only kind of service generation supported by
-  // early versions of google.protobuf.
-  //
-  // Generic services are now considered deprecated in favor of using plugins
-  // that generate code specific to your particular RPC system.  Therefore,
-  // these default to false.  Old code which depends on generic services should
-  // explicitly set them to true.
-  optional bool cc_generic_services = 16 [default = false];
-  optional bool java_generic_services = 17 [default = false];
-  optional bool py_generic_services = 18 [default = false];
-  optional bool php_generic_services = 42 [default = false];
-
-  // Is this file deprecated?
-  // Depending on the target platform, this can emit Deprecated annotations
-  // for everything in the file, or it will be completely ignored; in the very
-  // least, this is a formalization for deprecating files.
-  optional bool deprecated = 23 [default = false];
-
-  // Enables the use of arenas for the proto messages in this file. This applies
-  // only to generated classes for C++.
-  optional bool cc_enable_arenas = 31 [default = true];
-
-
-  // Sets the objective c class prefix which is prepended to all objective c
-  // generated classes from this .proto. There is no default.
-  optional string objc_class_prefix = 36;
-
-  // Namespace for generated classes; defaults to the package.
-  optional string csharp_namespace = 37;
-
-  // By default Swift generators will take the proto package and CamelCase it
-  // replacing '.' with underscore and use that to prefix the types/symbols
-  // defined. When this options is provided, they will use this value instead
-  // to prefix the types/symbols defined.
-  optional string swift_prefix = 39;
-
-  // Sets the php class prefix which is prepended to all php generated classes
-  // from this .proto. Default is empty.
-  optional string php_class_prefix = 40;
-
-  // Use this option to change the namespace of php generated classes. Default
-  // is empty. When this option is empty, the package name will be used for
-  // determining the namespace.
-  optional string php_namespace = 41;
-
-  // Use this option to change the namespace of php generated metadata classes.
-  // Default is empty. When this option is empty, the proto file name will be
-  // used for determining the namespace.
-  optional string php_metadata_namespace = 44;
-
-  // Use this option to change the package of ruby generated classes. Default
-  // is empty. When this option is not set, the package name will be used for
-  // determining the ruby package.
-  optional string ruby_package = 45;
-
-
-  // The parser stores options it doesn't recognize here.
-  // See the documentation for the "Options" section above.
-  repeated UninterpretedOption uninterpreted_option = 999;
-
-  // Clients can define custom options in extensions of this message.
-  // See the documentation for the "Options" section above.
-  extensions 1000 to max;
-
-  reserved 38;
-}
-
-message MessageOptions {
-  // Set true to use the old proto1 MessageSet wire format for extensions.
-  // This is provided for backwards-compatibility with the MessageSet wire
-  // format.  You should not use this for any other reason:  It's less
-  // efficient, has fewer features, and is more complicated.
-  //
-  // The message must be defined exactly as follows:
-  //   message Foo {
-  //     option message_set_wire_format = true;
-  //     extensions 4 to max;
-  //   }
-  // Note that the message cannot have any defined fields; MessageSets only
-  // have extensions.
-  //
-  // All extensions of your type must be singular messages; e.g. they cannot
-  // be int32s, enums, or repeated messages.
-  //
-  // Because this is an option, the above two restrictions are not enforced by
-  // the protocol compiler.
-  optional bool message_set_wire_format = 1 [default = false];
-
-  // Disables the generation of the standard "descriptor()" accessor, which can
-  // conflict with a field of the same name.  This is meant to make migration
-  // from proto1 easier; new code should avoid fields named "descriptor".
-  optional bool no_standard_descriptor_accessor = 2 [default = false];
-
-  // Is this message deprecated?
-  // Depending on the target platform, this can emit Deprecated annotations
-  // for the message, or it will be completely ignored; in the very least,
-  // this is a formalization for deprecating messages.
-  optional bool deprecated = 3 [default = false];
-
-  reserved 4, 5, 6;
-
-  // Whether the message is an automatically generated map entry type for the
-  // maps field.
-  //
-  // For maps fields:
-  //     map<KeyType, ValueType> map_field = 1;
-  // The parsed descriptor looks like:
-  //     message MapFieldEntry {
-  //         option map_entry = true;
-  //         optional KeyType key = 1;
-  //         optional ValueType value = 2;
-  //     }
-  //     repeated MapFieldEntry map_field = 1;
-  //
-  // Implementations may choose not to generate the map_entry=true message, but
-  // use a native map in the target language to hold the keys and values.
-  // The reflection APIs in such implementations still need to work as
-  // if the field is a repeated message field.
-  //
-  // NOTE: Do not set the option in .proto files. Always use the maps syntax
-  // instead. The option should only be implicitly set by the proto compiler
-  // parser.
-  optional bool map_entry = 7;
-
-  reserved 8;  // javalite_serializable
-  reserved 9;  // javanano_as_lite
-
-
-  // The parser stores options it doesn't recognize here. See above.
-  repeated UninterpretedOption uninterpreted_option = 999;
-
-  // Clients can define custom options in extensions of this message. See above.
-  extensions 1000 to max;
-}
-
-message FieldOptions {
-  // The ctype option instructs the C++ code generator to use a different
-  // representation of the field than it normally would.  See the specific
-  // options below.  This option is not yet implemented in the open source
-  // release -- sorry, we'll try to include it in a future version!
-  optional CType ctype = 1 [default = STRING];
-  enum CType {
-    // Default mode.
-    STRING = 0;
-
-    CORD = 1;
-
-    STRING_PIECE = 2;
-  }
-  // The packed option can be enabled for repeated primitive fields to enable
-  // a more efficient representation on the wire. Rather than repeatedly
-  // writing the tag and type for each element, the entire array is encoded as
-  // a single length-delimited blob. In proto3, only explicit setting it to
-  // false will avoid using packed encoding.
-  optional bool packed = 2;
-
-  // The jstype option determines the JavaScript type used for values of the
-  // field.  The option is permitted only for 64 bit integral and fixed types
-  // (int64, uint64, sint64, fixed64, sfixed64).  A field with jstype JS_STRING
-  // is represented as JavaScript string, which avoids loss of precision that
-  // can happen when a large value is converted to a floating point JavaScript.
-  // Specifying JS_NUMBER for the jstype causes the generated JavaScript code to
-  // use the JavaScript "number" type.  The behavior of the default option
-  // JS_NORMAL is implementation dependent.
-  //
-  // This option is an enum to permit additional types to be added, e.g.
-  // goog.math.Integer.
-  optional JSType jstype = 6 [default = JS_NORMAL];
-  enum JSType {
-    // Use the default type.
-    JS_NORMAL = 0;
-
-    // Use JavaScript strings.
-    JS_STRING = 1;
-
-    // Use JavaScript numbers.
-    JS_NUMBER = 2;
-  }
-
-  // Should this field be parsed lazily?  Lazy applies only to message-type
-  // fields.  It means that when the outer message is initially parsed, the
-  // inner message's contents will not be parsed but instead stored in encoded
-  // form.  The inner message will actually be parsed when it is first accessed.
-  //
-  // This is only a hint.  Implementations are free to choose whether to use
-  // eager or lazy parsing regardless of the value of this option.  However,
-  // setting this option true suggests that the protocol author believes that
-  // using lazy parsing on this field is worth the additional bookkeeping
-  // overhead typically needed to implement it.
-  //
-  // This option does not affect the public interface of any generated code;
-  // all method signatures remain the same.  Furthermore, thread-safety of the
-  // interface is not affected by this option; const methods remain safe to
-  // call from multiple threads concurrently, while non-const methods continue
-  // to require exclusive access.
-  //
-  //
-  // Note that implementations may choose not to check required fields within
-  // a lazy sub-message.  That is, calling IsInitialized() on the outer message
-  // may return true even if the inner message has missing required fields.
-  // This is necessary because otherwise the inner message would have to be
-  // parsed in order to perform the check, defeating the purpose of lazy
-  // parsing.  An implementation which chooses not to check required fields
-  // must be consistent about it.  That is, for any particular sub-message, the
-  // implementation must either *always* check its required fields, or *never*
-  // check its required fields, regardless of whether or not the message has
-  // been parsed.
-  //
-  // As of 2021, lazy does no correctness checks on the byte stream during
-  // parsing.  This may lead to crashes if and when an invalid byte stream is
-  // finally parsed upon access.
-  //
-  // TODO(b/211906113):  Enable validation on lazy fields.
-  optional bool lazy = 5 [default = false];
-
-  // unverified_lazy does no correctness checks on the byte stream. This should
-  // only be used where lazy with verification is prohibitive for performance
-  // reasons.
-  optional bool unverified_lazy = 15 [default = false];
-
-  // Is this field deprecated?
-  // Depending on the target platform, this can emit Deprecated annotations
-  // for accessors, or it will be completely ignored; in the very least, this
-  // is a formalization for deprecating fields.
-  optional bool deprecated = 3 [default = false];
-
-  // For Google-internal migration only. Do not use.
-  optional bool weak = 10 [default = false];
-
-
-  // The parser stores options it doesn't recognize here. See above.
-  repeated UninterpretedOption uninterpreted_option = 999;
-
-  // Clients can define custom options in extensions of this message. See above.
-  extensions 1000 to max;
-
-  reserved 4;  // removed jtype
-}
-
-message OneofOptions {
-  // The parser stores options it doesn't recognize here. See above.
-  repeated UninterpretedOption uninterpreted_option = 999;
-
-  // Clients can define custom options in extensions of this message. See above.
-  extensions 1000 to max;
-}
-
-message EnumOptions {
-
-  // Set this option to true to allow mapping different tag names to the same
-  // value.
-  optional bool allow_alias = 2;
-
-  // Is this enum deprecated?
-  // Depending on the target platform, this can emit Deprecated annotations
-  // for the enum, or it will be completely ignored; in the very least, this
-  // is a formalization for deprecating enums.
-  optional bool deprecated = 3 [default = false];
-
-  reserved 5;  // javanano_as_lite
-
-  // The parser stores options it doesn't recognize here. See above.
-  repeated UninterpretedOption uninterpreted_option = 999;
-
-  // Clients can define custom options in extensions of this message. See above.
-  extensions 1000 to max;
-}
-
-message EnumValueOptions {
-  // Is this enum value deprecated?
-  // Depending on the target platform, this can emit Deprecated annotations
-  // for the enum value, or it will be completely ignored; in the very least,
-  // this is a formalization for deprecating enum values.
-  optional bool deprecated = 1 [default = false];
-
-  // The parser stores options it doesn't recognize here. See above.
-  repeated UninterpretedOption uninterpreted_option = 999;
-
-  // Clients can define custom options in extensions of this message. See above.
-  extensions 1000 to max;
-}
-
-message ServiceOptions {
-
-  // Note:  Field numbers 1 through 32 are reserved for Google's internal RPC
-  //   framework.  We apologize for hoarding these numbers to ourselves, but
-  //   we were already using them long before we decided to release Protocol
-  //   Buffers.
-
-  // Is this service deprecated?
-  // Depending on the target platform, this can emit Deprecated annotations
-  // for the service, or it will be completely ignored; in the very least,
-  // this is a formalization for deprecating services.
-  optional bool deprecated = 33 [default = false];
-
-  // The parser stores options it doesn't recognize here. See above.
-  repeated UninterpretedOption uninterpreted_option = 999;
-
-  // Clients can define custom options in extensions of this message. See above.
-  extensions 1000 to max;
-}
-
-message MethodOptions {
-
-  // Note:  Field numbers 1 through 32 are reserved for Google's internal RPC
-  //   framework.  We apologize for hoarding these numbers to ourselves, but
-  //   we were already using them long before we decided to release Protocol
-  //   Buffers.
-
-  // Is this method deprecated?
-  // Depending on the target platform, this can emit Deprecated annotations
-  // for the method, or it will be completely ignored; in the very least,
-  // this is a formalization for deprecating methods.
-  optional bool deprecated = 33 [default = false];
-
-  // Is this method side-effect-free (or safe in HTTP parlance), or idempotent,
-  // or neither? HTTP based RPC implementation may choose GET verb for safe
-  // methods, and PUT verb for idempotent methods instead of the default POST.
-  enum IdempotencyLevel {
-    IDEMPOTENCY_UNKNOWN = 0;
-    NO_SIDE_EFFECTS = 1;  // implies idempotent
-    IDEMPOTENT = 2;       // idempotent, but may have side effects
-  }
-  optional IdempotencyLevel idempotency_level = 34
-      [default = IDEMPOTENCY_UNKNOWN];
-
-  // The parser stores options it doesn't recognize here. See above.
-  repeated UninterpretedOption uninterpreted_option = 999;
-
-  // Clients can define custom options in extensions of this message. See above.
-  extensions 1000 to max;
-}
-
-
-// A message representing a option the parser does not recognize. This only
-// appears in options protos created by the compiler::Parser class.
-// DescriptorPool resolves these when building Descriptor objects. Therefore,
-// options protos in descriptor objects (e.g. returned by Descriptor::options(),
-// or produced by Descriptor::CopyTo()) will never have UninterpretedOptions
-// in them.
-message UninterpretedOption {
-  // The name of the uninterpreted option.  Each string represents a segment in
-  // a dot-separated name.  is_extension is true iff a segment represents an
-  // extension (denoted with parentheses in options specs in .proto files).
-  // E.g.,{ ["foo", false], ["bar.baz", true], ["moo", false] } represents
-  // "foo.(bar.baz).moo".
-  message NamePart {
-    required string name_part = 1;
-    required bool is_extension = 2;
-  }
-  repeated NamePart name = 2;
-
-  // The value of the uninterpreted option, in whatever type the tokenizer
-  // identified it as during parsing. Exactly one of these should be set.
-  optional string identifier_value = 3;
-  optional uint64 positive_int_value = 4;
-  optional int64 negative_int_value = 5;
-  optional double double_value = 6;
-  optional bytes string_value = 7;
-  optional string aggregate_value = 8;
-}
-
-// ===================================================================
-// Optional source code info
-
-// Encapsulates information about the original source file from which a
-// FileDescriptorProto was generated.
-message SourceCodeInfo {
-  // A Location identifies a piece of source code in a .proto file which
-  // corresponds to a particular definition.  This information is intended
-  // to be useful to IDEs, code indexers, documentation generators, and similar
-  // tools.
-  //
-  // For example, say we have a file like:
-  //   message Foo {
-  //     optional string foo = 1;
-  //   }
-  // Let's look at just the field definition:
-  //   optional string foo = 1;
-  //   ^       ^^     ^^  ^  ^^^
-  //   a       bc     de  f  ghi
-  // We have the following locations:
-  //   span   path               represents
-  //   [a,i)  [ 4, 0, 2, 0 ]     The whole field definition.
-  //   [a,b)  [ 4, 0, 2, 0, 4 ]  The label (optional).
-  //   [c,d)  [ 4, 0, 2, 0, 5 ]  The type (string).
-  //   [e,f)  [ 4, 0, 2, 0, 1 ]  The name (foo).
-  //   [g,h)  [ 4, 0, 2, 0, 3 ]  The number (1).
-  //
-  // Notes:
-  // - A location may refer to a repeated field itself (i.e. not to any
-  //   particular index within it).  This is used whenever a set of elements are
-  //   logically enclosed in a single code segment.  For example, an entire
-  //   extend block (possibly containing multiple extension definitions) will
-  //   have an outer location whose path refers to the "extensions" repeated
-  //   field without an index.
-  // - Multiple locations may have the same path.  This happens when a single
-  //   logical declaration is spread out across multiple places.  The most
-  //   obvious example is the "extend" block again -- there may be multiple
-  //   extend blocks in the same scope, each of which will have the same path.
-  // - A location's span is not always a subset of its parent's span.  For
-  //   example, the "extendee" of an extension declaration appears at the
-  //   beginning of the "extend" block and is shared by all extensions within
-  //   the block.
-  // - Just because a location's span is a subset of some other location's span
-  //   does not mean that it is a descendant.  For example, a "group" defines
-  //   both a type and a field in a single declaration.  Thus, the locations
-  //   corresponding to the type and field and their components will overlap.
-  // - Code which tries to interpret locations should probably be designed to
-  //   ignore those that it doesn't understand, as more types of locations could
-  //   be recorded in the future.
-  repeated Location location = 1;
-  message Location {
-    // Identifies which part of the FileDescriptorProto was defined at this
-    // location.
-    //
-    // Each element is a field number or an index.  They form a path from
-    // the root FileDescriptorProto to the place where the definition occurs.
-    // For example, this path:
-    //   [ 4, 3, 2, 7, 1 ]
-    // refers to:
-    //   file.message_type(3)  // 4, 3
-    //       .field(7)         // 2, 7
-    //       .name()           // 1
-    // This is because FileDescriptorProto.message_type has field number 4:
-    //   repeated DescriptorProto message_type = 4;
-    // and DescriptorProto.field has field number 2:
-    //   repeated FieldDescriptorProto field = 2;
-    // and FieldDescriptorProto.name has field number 1:
-    //   optional string name = 1;
-    //
-    // Thus, the above path gives the location of a field name.  If we removed
-    // the last element:
-    //   [ 4, 3, 2, 7 ]
-    // this path refers to the whole field declaration (from the beginning
-    // of the label to the terminating semicolon).
-    repeated int32 path = 1 [packed = true];
-
-    // Always has exactly three or four elements: start line, start column,
-    // end line (optional, otherwise assumed same as start line), end column.
-    // These are packed into a single field for efficiency.  Note that line
-    // and column numbers are zero-based -- typically you will want to add
-    // 1 to each before displaying to a user.
-    repeated int32 span = 2 [packed = true];
-
-    // If this SourceCodeInfo represents a complete declaration, these are any
-    // comments appearing before and after the declaration which appear to be
-    // attached to the declaration.
-    //
-    // A series of line comments appearing on consecutive lines, with no other
-    // tokens appearing on those lines, will be treated as a single comment.
-    //
-    // leading_detached_comments will keep paragraphs of comments that appear
-    // before (but not connected to) the current element. Each paragraph,
-    // separated by empty lines, will be one comment element in the repeated
-    // field.
-    //
-    // Only the comment content is provided; comment markers (e.g. //) are
-    // stripped out.  For block comments, leading whitespace and an asterisk
-    // will be stripped from the beginning of each line other than the first.
-    // Newlines are included in the output.
-    //
-    // Examples:
-    //
-    //   optional int32 foo = 1;  // Comment attached to foo.
-    //   // Comment attached to bar.
-    //   optional int32 bar = 2;
-    //
-    //   optional string baz = 3;
-    //   // Comment attached to baz.
-    //   // Another line attached to baz.
-    //
-    //   // Comment attached to moo.
-    //   //
-    //   // Another line attached to moo.
-    //   optional double moo = 4;
-    //
-    //   // Detached comment for corge. This is not leading or trailing comments
-    //   // to moo or corge because there are blank lines separating it from
-    //   // both.
-    //
-    //   // Detached comment for corge paragraph 2.
-    //
-    //   optional string corge = 5;
-    //   /* Block comment attached
-    //    * to corge.  Leading asterisks
-    //    * will be removed. */
-    //   /* Block comment attached to
-    //    * grault. */
-    //   optional int32 grault = 6;
-    //
-    //   // ignored detached comments.
-    optional string leading_comments = 3;
-    optional string trailing_comments = 4;
-    repeated string leading_detached_comments = 6;
-  }
-}
-
-// Describes the relationship between generated code and its original source
-// file. A GeneratedCodeInfo message is associated with only one generated
-// source file, but may contain references to different source .proto files.
-message GeneratedCodeInfo {
-  // An Annotation connects some span of text in generated code to an element
-  // of its generating .proto file.
-  repeated Annotation annotation = 1;
-  message Annotation {
-    // Identifies the element in the original source .proto file. This field
-    // is formatted the same as SourceCodeInfo.Location.path.
-    repeated int32 path = 1 [packed = true];
-
-    // Identifies the filesystem path to the original source .proto.
-    optional string source_file = 2;
-
-    // Identifies the starting offset in bytes in the generated code
-    // that relates to the identified object.
-    optional int32 begin = 3;
-
-    // Identifies the ending offset in bytes in the generated code that
-    // relates to the identified offset. The end offset should be one past
-    // the last relevant byte (so the length of the text = end - begin).
-    optional int32 end = 4;
-  }
-}
diff --git a/libs/protobuf/src/google/protobuf/descriptor_database.cc b/libs/protobuf/src/google/protobuf/descriptor_database.cc
deleted file mode 100644
index 203000d..0000000
--- a/libs/protobuf/src/google/protobuf/descriptor_database.cc
+++ /dev/null
@@ -1,1048 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-
-#include <google/protobuf/descriptor_database.h>
-
-#include <algorithm>
-#include <set>
-
-#include <google/protobuf/descriptor.pb.h>
-#include <google/protobuf/stubs/map_util.h>
-#include <google/protobuf/stubs/stl_util.h>
-
-
-namespace google {
-namespace protobuf {
-
-namespace {
-void RecordMessageNames(const DescriptorProto& desc_proto,
-                        const std::string& prefix,
-                        std::set<std::string>* output) {
-  GOOGLE_CHECK(desc_proto.has_name());
-  std::string full_name = prefix.empty()
-                              ? desc_proto.name()
-                              : StrCat(prefix, ".", desc_proto.name());
-  output->insert(full_name);
-
-  for (const auto& d : desc_proto.nested_type()) {
-    RecordMessageNames(d, full_name, output);
-  }
-}
-
-void RecordMessageNames(const FileDescriptorProto& file_proto,
-                        std::set<std::string>* output) {
-  for (const auto& d : file_proto.message_type()) {
-    RecordMessageNames(d, file_proto.package(), output);
-  }
-}
-
-template <typename Fn>
-bool ForAllFileProtos(DescriptorDatabase* db, Fn callback,
-                      std::vector<std::string>* output) {
-  std::vector<std::string> file_names;
-  if (!db->FindAllFileNames(&file_names)) {
-    return false;
-  }
-  std::set<std::string> set;
-  FileDescriptorProto file_proto;
-  for (const auto& f : file_names) {
-    file_proto.Clear();
-    if (!db->FindFileByName(f, &file_proto)) {
-      GOOGLE_LOG(ERROR) << "File not found in database (unexpected): " << f;
-      return false;
-    }
-    callback(file_proto, &set);
-  }
-  output->insert(output->end(), set.begin(), set.end());
-  return true;
-}
-}  // namespace
-
-DescriptorDatabase::~DescriptorDatabase() {}
-
-bool DescriptorDatabase::FindAllPackageNames(std::vector<std::string>* output) {
-  return ForAllFileProtos(
-      this,
-      [](const FileDescriptorProto& file_proto, std::set<std::string>* set) {
-        set->insert(file_proto.package());
-      },
-      output);
-}
-
-bool DescriptorDatabase::FindAllMessageNames(std::vector<std::string>* output) {
-  return ForAllFileProtos(
-      this,
-      [](const FileDescriptorProto& file_proto, std::set<std::string>* set) {
-        RecordMessageNames(file_proto, set);
-      },
-      output);
-}
-
-// ===================================================================
-
-SimpleDescriptorDatabase::SimpleDescriptorDatabase() {}
-SimpleDescriptorDatabase::~SimpleDescriptorDatabase() {}
-
-template <typename Value>
-bool SimpleDescriptorDatabase::DescriptorIndex<Value>::AddFile(
-    const FileDescriptorProto& file, Value value) {
-  if (!InsertIfNotPresent(&by_name_, file.name(), value)) {
-    GOOGLE_LOG(ERROR) << "File already exists in database: " << file.name();
-    return false;
-  }
-
-  // We must be careful here -- calling file.package() if file.has_package() is
-  // false could access an uninitialized static-storage variable if we are being
-  // run at startup time.
-  std::string path = file.has_package() ? file.package() : std::string();
-  if (!path.empty()) path += '.';
-
-  for (int i = 0; i < file.message_type_size(); i++) {
-    if (!AddSymbol(path + file.message_type(i).name(), value)) return false;
-    if (!AddNestedExtensions(file.name(), file.message_type(i), value))
-      return false;
-  }
-  for (int i = 0; i < file.enum_type_size(); i++) {
-    if (!AddSymbol(path + file.enum_type(i).name(), value)) return false;
-  }
-  for (int i = 0; i < file.extension_size(); i++) {
-    if (!AddSymbol(path + file.extension(i).name(), value)) return false;
-    if (!AddExtension(file.name(), file.extension(i), value)) return false;
-  }
-  for (int i = 0; i < file.service_size(); i++) {
-    if (!AddSymbol(path + file.service(i).name(), value)) return false;
-  }
-
-  return true;
-}
-
-namespace {
-
-// Returns true if and only if all characters in the name are alphanumerics,
-// underscores, or periods.
-bool ValidateSymbolName(StringPiece name) {
-  for (char c : name) {
-    // I don't trust ctype.h due to locales.  :(
-    if (c != '.' && c != '_' && (c < '0' || c > '9') && (c < 'A' || c > 'Z') &&
-        (c < 'a' || c > 'z')) {
-      return false;
-    }
-  }
-  return true;
-}
-
-// Find the last key in the container which sorts less than or equal to the
-// symbol name.  Since upper_bound() returns the *first* key that sorts
-// *greater* than the input, we want the element immediately before that.
-template <typename Container, typename Key>
-typename Container::const_iterator FindLastLessOrEqual(
-    const Container* container, const Key& key) {
-  auto iter = container->upper_bound(key);
-  if (iter != container->begin()) --iter;
-  return iter;
-}
-
-// As above, but using std::upper_bound instead.
-template <typename Container, typename Key, typename Cmp>
-typename Container::const_iterator FindLastLessOrEqual(
-    const Container* container, const Key& key, const Cmp& cmp) {
-  auto iter = std::upper_bound(container->begin(), container->end(), key, cmp);
-  if (iter != container->begin()) --iter;
-  return iter;
-}
-
-// True if either the arguments are equal or super_symbol identifies a
-// parent symbol of sub_symbol (e.g. "foo.bar" is a parent of
-// "foo.bar.baz", but not a parent of "foo.barbaz").
-bool IsSubSymbol(StringPiece sub_symbol, StringPiece super_symbol) {
-  return sub_symbol == super_symbol ||
-         (HasPrefixString(super_symbol, sub_symbol) &&
-          super_symbol[sub_symbol.size()] == '.');
-}
-
-}  // namespace
-
-template <typename Value>
-bool SimpleDescriptorDatabase::DescriptorIndex<Value>::AddSymbol(
-    const std::string& name, Value value) {
-  // We need to make sure not to violate our map invariant.
-
-  // If the symbol name is invalid it could break our lookup algorithm (which
-  // relies on the fact that '.' sorts before all other characters that are
-  // valid in symbol names).
-  if (!ValidateSymbolName(name)) {
-    GOOGLE_LOG(ERROR) << "Invalid symbol name: " << name;
-    return false;
-  }
-
-  // Try to look up the symbol to make sure a super-symbol doesn't already
-  // exist.
-  auto iter = FindLastLessOrEqual(&by_symbol_, name);
-
-  if (iter == by_symbol_.end()) {
-    // Apparently the map is currently empty.  Just insert and be done with it.
-    by_symbol_.insert(
-        typename std::map<std::string, Value>::value_type(name, value));
-    return true;
-  }
-
-  if (IsSubSymbol(iter->first, name)) {
-    GOOGLE_LOG(ERROR) << "Symbol name \"" << name
-               << "\" conflicts with the existing "
-                  "symbol \""
-               << iter->first << "\".";
-    return false;
-  }
-
-  // OK, that worked.  Now we have to make sure that no symbol in the map is
-  // a sub-symbol of the one we are inserting.  The only symbol which could
-  // be so is the first symbol that is greater than the new symbol.  Since
-  // |iter| points at the last symbol that is less than or equal, we just have
-  // to increment it.
-  ++iter;
-
-  if (iter != by_symbol_.end() && IsSubSymbol(name, iter->first)) {
-    GOOGLE_LOG(ERROR) << "Symbol name \"" << name
-               << "\" conflicts with the existing "
-                  "symbol \""
-               << iter->first << "\".";
-    return false;
-  }
-
-  // OK, no conflicts.
-
-  // Insert the new symbol using the iterator as a hint, the new entry will
-  // appear immediately before the one the iterator is pointing at.
-  by_symbol_.insert(
-      iter, typename std::map<std::string, Value>::value_type(name, value));
-
-  return true;
-}
-
-template <typename Value>
-bool SimpleDescriptorDatabase::DescriptorIndex<Value>::AddNestedExtensions(
-    const std::string& filename, const DescriptorProto& message_type,
-    Value value) {
-  for (int i = 0; i < message_type.nested_type_size(); i++) {
-    if (!AddNestedExtensions(filename, message_type.nested_type(i), value))
-      return false;
-  }
-  for (int i = 0; i < message_type.extension_size(); i++) {
-    if (!AddExtension(filename, message_type.extension(i), value)) return false;
-  }
-  return true;
-}
-
-template <typename Value>
-bool SimpleDescriptorDatabase::DescriptorIndex<Value>::AddExtension(
-    const std::string& filename, const FieldDescriptorProto& field,
-    Value value) {
-  if (!field.extendee().empty() && field.extendee()[0] == '.') {
-    // The extension is fully-qualified.  We can use it as a lookup key in
-    // the by_symbol_ table.
-    if (!InsertIfNotPresent(
-            &by_extension_,
-            std::make_pair(field.extendee().substr(1), field.number()),
-            value)) {
-      GOOGLE_LOG(ERROR) << "Extension conflicts with extension already in database: "
-                    "extend "
-                 << field.extendee() << " { " << field.name() << " = "
-                 << field.number() << " } from:" << filename;
-      return false;
-    }
-  } else {
-    // Not fully-qualified.  We can't really do anything here, unfortunately.
-    // We don't consider this an error, though, because the descriptor is
-    // valid.
-  }
-  return true;
-}
-
-template <typename Value>
-Value SimpleDescriptorDatabase::DescriptorIndex<Value>::FindFile(
-    const std::string& filename) {
-  return FindWithDefault(by_name_, filename, Value());
-}
-
-template <typename Value>
-Value SimpleDescriptorDatabase::DescriptorIndex<Value>::FindSymbol(
-    const std::string& name) {
-  auto iter = FindLastLessOrEqual(&by_symbol_, name);
-
-  return (iter != by_symbol_.end() && IsSubSymbol(iter->first, name))
-             ? iter->second
-             : Value();
-}
-
-template <typename Value>
-Value SimpleDescriptorDatabase::DescriptorIndex<Value>::FindExtension(
-    const std::string& containing_type, int field_number) {
-  return FindWithDefault(
-      by_extension_, std::make_pair(containing_type, field_number), Value());
-}
-
-template <typename Value>
-bool SimpleDescriptorDatabase::DescriptorIndex<Value>::FindAllExtensionNumbers(
-    const std::string& containing_type, std::vector<int>* output) {
-  typename std::map<std::pair<std::string, int>, Value>::const_iterator it =
-      by_extension_.lower_bound(std::make_pair(containing_type, 0));
-  bool success = false;
-
-  for (; it != by_extension_.end() && it->first.first == containing_type;
-       ++it) {
-    output->push_back(it->first.second);
-    success = true;
-  }
-
-  return success;
-}
-
-template <typename Value>
-void SimpleDescriptorDatabase::DescriptorIndex<Value>::FindAllFileNames(
-    std::vector<std::string>* output) {
-  output->resize(by_name_.size());
-  int i = 0;
-  for (const auto& kv : by_name_) {
-    (*output)[i] = kv.first;
-    i++;
-  }
-}
-
-// -------------------------------------------------------------------
-
-bool SimpleDescriptorDatabase::Add(const FileDescriptorProto& file) {
-  FileDescriptorProto* new_file = new FileDescriptorProto;
-  new_file->CopyFrom(file);
-  return AddAndOwn(new_file);
-}
-
-bool SimpleDescriptorDatabase::AddAndOwn(const FileDescriptorProto* file) {
-  files_to_delete_.emplace_back(file);
-  return index_.AddFile(*file, file);
-}
-
-bool SimpleDescriptorDatabase::FindFileByName(const std::string& filename,
-                                              FileDescriptorProto* output) {
-  return MaybeCopy(index_.FindFile(filename), output);
-}
-
-bool SimpleDescriptorDatabase::FindFileContainingSymbol(
-    const std::string& symbol_name, FileDescriptorProto* output) {
-  return MaybeCopy(index_.FindSymbol(symbol_name), output);
-}
-
-bool SimpleDescriptorDatabase::FindFileContainingExtension(
-    const std::string& containing_type, int field_number,
-    FileDescriptorProto* output) {
-  return MaybeCopy(index_.FindExtension(containing_type, field_number), output);
-}
-
-bool SimpleDescriptorDatabase::FindAllExtensionNumbers(
-    const std::string& extendee_type, std::vector<int>* output) {
-  return index_.FindAllExtensionNumbers(extendee_type, output);
-}
-
-
-bool SimpleDescriptorDatabase::FindAllFileNames(
-    std::vector<std::string>* output) {
-  index_.FindAllFileNames(output);
-  return true;
-}
-
-bool SimpleDescriptorDatabase::MaybeCopy(const FileDescriptorProto* file,
-                                         FileDescriptorProto* output) {
-  if (file == nullptr) return false;
-  output->CopyFrom(*file);
-  return true;
-}
-
-// -------------------------------------------------------------------
-
-class EncodedDescriptorDatabase::DescriptorIndex {
- public:
-  using Value = std::pair<const void*, int>;
-  // Helpers to recursively add particular descriptors and all their contents
-  // to the index.
-  template <typename FileProto>
-  bool AddFile(const FileProto& file, Value value);
-
-  Value FindFile(StringPiece filename);
-  Value FindSymbol(StringPiece name);
-  Value FindSymbolOnlyFlat(StringPiece name) const;
-  Value FindExtension(StringPiece containing_type, int field_number);
-  bool FindAllExtensionNumbers(StringPiece containing_type,
-                               std::vector<int>* output);
-  void FindAllFileNames(std::vector<std::string>* output) const;
-
- private:
-  friend class EncodedDescriptorDatabase;
-
-  bool AddSymbol(StringPiece symbol);
-
-  template <typename DescProto>
-  bool AddNestedExtensions(StringPiece filename,
-                           const DescProto& message_type);
-  template <typename FieldProto>
-  bool AddExtension(StringPiece filename, const FieldProto& field);
-
-  // All the maps below have two representations:
-  //  - a std::set<> where we insert initially.
-  //  - a std::vector<> where we flatten the structure on demand.
-  // The initial tree helps avoid O(N) behavior of inserting into a sorted
-  // vector, while the vector reduces the heap requirements of the data
-  // structure.
-
-  void EnsureFlat();
-
-  using String = std::string;
-
-  String EncodeString(StringPiece str) const { return String(str); }
-  StringPiece DecodeString(const String& str, int) const { return str; }
-
-  struct EncodedEntry {
-    // Do not use `Value` here to avoid the padding of that object.
-    const void* data;
-    int size;
-    // Keep the package here instead of each SymbolEntry to save space.
-    String encoded_package;
-
-    Value value() const { return {data, size}; }
-  };
-  std::vector<EncodedEntry> all_values_;
-
-  struct FileEntry {
-    int data_offset;
-    String encoded_name;
-
-    StringPiece name(const DescriptorIndex& index) const {
-      return index.DecodeString(encoded_name, data_offset);
-    }
-  };
-  struct FileCompare {
-    const DescriptorIndex& index;
-
-    bool operator()(const FileEntry& a, const FileEntry& b) const {
-      return a.name(index) < b.name(index);
-    }
-    bool operator()(const FileEntry& a, StringPiece b) const {
-      return a.name(index) < b;
-    }
-    bool operator()(StringPiece a, const FileEntry& b) const {
-      return a < b.name(index);
-    }
-  };
-  std::set<FileEntry, FileCompare> by_name_{FileCompare{*this}};
-  std::vector<FileEntry> by_name_flat_;
-
-  struct SymbolEntry {
-    int data_offset;
-    String encoded_symbol;
-
-    StringPiece package(const DescriptorIndex& index) const {
-      return index.DecodeString(index.all_values_[data_offset].encoded_package,
-                                data_offset);
-    }
-    StringPiece symbol(const DescriptorIndex& index) const {
-      return index.DecodeString(encoded_symbol, data_offset);
-    }
-
-    std::string AsString(const DescriptorIndex& index) const {
-      auto p = package(index);
-      return StrCat(p, p.empty() ? "" : ".", symbol(index));
-    }
-  };
-
-  struct SymbolCompare {
-    const DescriptorIndex& index;
-
-    std::string AsString(const SymbolEntry& entry) const {
-      return entry.AsString(index);
-    }
-    static StringPiece AsString(StringPiece str) { return str; }
-
-    std::pair<StringPiece, StringPiece> GetParts(
-        const SymbolEntry& entry) const {
-      auto package = entry.package(index);
-      if (package.empty()) return {entry.symbol(index), StringPiece{}};
-      return {package, entry.symbol(index)};
-    }
-    std::pair<StringPiece, StringPiece> GetParts(
-        StringPiece str) const {
-      return {str, {}};
-    }
-
-    template <typename T, typename U>
-    bool operator()(const T& lhs, const U& rhs) const {
-      auto lhs_parts = GetParts(lhs);
-      auto rhs_parts = GetParts(rhs);
-
-      // Fast path to avoid making the whole string for common cases.
-      if (int res =
-              lhs_parts.first.substr(0, rhs_parts.first.size())
-                  .compare(rhs_parts.first.substr(0, lhs_parts.first.size()))) {
-        // If the packages already differ, exit early.
-        return res < 0;
-      } else if (lhs_parts.first.size() == rhs_parts.first.size()) {
-        return lhs_parts.second < rhs_parts.second;
-      }
-      return AsString(lhs) < AsString(rhs);
-    }
-  };
-  std::set<SymbolEntry, SymbolCompare> by_symbol_{SymbolCompare{*this}};
-  std::vector<SymbolEntry> by_symbol_flat_;
-
-  struct ExtensionEntry {
-    int data_offset;
-    String encoded_extendee;
-    StringPiece extendee(const DescriptorIndex& index) const {
-      return index.DecodeString(encoded_extendee, data_offset).substr(1);
-    }
-    int extension_number;
-  };
-  struct ExtensionCompare {
-    const DescriptorIndex& index;
-
-    bool operator()(const ExtensionEntry& a, const ExtensionEntry& b) const {
-      return std::make_tuple(a.extendee(index), a.extension_number) <
-             std::make_tuple(b.extendee(index), b.extension_number);
-    }
-    bool operator()(const ExtensionEntry& a,
-                    std::tuple<StringPiece, int> b) const {
-      return std::make_tuple(a.extendee(index), a.extension_number) < b;
-    }
-    bool operator()(std::tuple<StringPiece, int> a,
-                    const ExtensionEntry& b) const {
-      return a < std::make_tuple(b.extendee(index), b.extension_number);
-    }
-  };
-  std::set<ExtensionEntry, ExtensionCompare> by_extension_{
-      ExtensionCompare{*this}};
-  std::vector<ExtensionEntry> by_extension_flat_;
-};
-
-bool EncodedDescriptorDatabase::Add(const void* encoded_file_descriptor,
-                                    int size) {
-  FileDescriptorProto file;
-  if (file.ParseFromArray(encoded_file_descriptor, size)) {
-    return index_->AddFile(file, std::make_pair(encoded_file_descriptor, size));
-  } else {
-    GOOGLE_LOG(ERROR) << "Invalid file descriptor data passed to "
-                  "EncodedDescriptorDatabase::Add().";
-    return false;
-  }
-}
-
-bool EncodedDescriptorDatabase::AddCopy(const void* encoded_file_descriptor,
-                                        int size) {
-  void* copy = operator new(size);
-  memcpy(copy, encoded_file_descriptor, size);
-  files_to_delete_.push_back(copy);
-  return Add(copy, size);
-}
-
-bool EncodedDescriptorDatabase::FindFileByName(const std::string& filename,
-                                               FileDescriptorProto* output) {
-  return MaybeParse(index_->FindFile(filename), output);
-}
-
-bool EncodedDescriptorDatabase::FindFileContainingSymbol(
-    const std::string& symbol_name, FileDescriptorProto* output) {
-  return MaybeParse(index_->FindSymbol(symbol_name), output);
-}
-
-bool EncodedDescriptorDatabase::FindNameOfFileContainingSymbol(
-    const std::string& symbol_name, std::string* output) {
-  auto encoded_file = index_->FindSymbol(symbol_name);
-  if (encoded_file.first == nullptr) return false;
-
-  // Optimization:  The name should be the first field in the encoded message.
-  //   Try to just read it directly.
-  io::CodedInputStream input(static_cast<const uint8_t*>(encoded_file.first),
-                             encoded_file.second);
-
-  const uint32_t kNameTag = internal::WireFormatLite::MakeTag(
-      FileDescriptorProto::kNameFieldNumber,
-      internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED);
-
-  if (input.ReadTagNoLastTag() == kNameTag) {
-    // Success!
-    return internal::WireFormatLite::ReadString(&input, output);
-  } else {
-    // Slow path.  Parse whole message.
-    FileDescriptorProto file_proto;
-    if (!file_proto.ParseFromArray(encoded_file.first, encoded_file.second)) {
-      return false;
-    }
-    *output = file_proto.name();
-    return true;
-  }
-}
-
-bool EncodedDescriptorDatabase::FindFileContainingExtension(
-    const std::string& containing_type, int field_number,
-    FileDescriptorProto* output) {
-  return MaybeParse(index_->FindExtension(containing_type, field_number),
-                    output);
-}
-
-bool EncodedDescriptorDatabase::FindAllExtensionNumbers(
-    const std::string& extendee_type, std::vector<int>* output) {
-  return index_->FindAllExtensionNumbers(extendee_type, output);
-}
-
-template <typename FileProto>
-bool EncodedDescriptorDatabase::DescriptorIndex::AddFile(const FileProto& file,
-                                                         Value value) {
-  // We push `value` into the array first. This is important because the AddXXX
-  // functions below will expect it to be there.
-  all_values_.push_back({value.first, value.second, {}});
-
-  if (!ValidateSymbolName(file.package())) {
-    GOOGLE_LOG(ERROR) << "Invalid package name: " << file.package();
-    return false;
-  }
-  all_values_.back().encoded_package = EncodeString(file.package());
-
-  if (!InsertIfNotPresent(
-          &by_name_, FileEntry{static_cast<int>(all_values_.size() - 1),
-                               EncodeString(file.name())}) ||
-      std::binary_search(by_name_flat_.begin(), by_name_flat_.end(),
-                         file.name(), by_name_.key_comp())) {
-    GOOGLE_LOG(ERROR) << "File already exists in database: " << file.name();
-    return false;
-  }
-
-  for (const auto& message_type : file.message_type()) {
-    if (!AddSymbol(message_type.name())) return false;
-    if (!AddNestedExtensions(file.name(), message_type)) return false;
-  }
-  for (const auto& enum_type : file.enum_type()) {
-    if (!AddSymbol(enum_type.name())) return false;
-  }
-  for (const auto& extension : file.extension()) {
-    if (!AddSymbol(extension.name())) return false;
-    if (!AddExtension(file.name(), extension)) return false;
-  }
-  for (const auto& service : file.service()) {
-    if (!AddSymbol(service.name())) return false;
-  }
-
-  return true;
-}
-
-template <typename Iter, typename Iter2, typename Index>
-static bool CheckForMutualSubsymbols(StringPiece symbol_name, Iter* iter,
-                                     Iter2 end, const Index& index) {
-  if (*iter != end) {
-    if (IsSubSymbol((*iter)->AsString(index), symbol_name)) {
-      GOOGLE_LOG(ERROR) << "Symbol name \"" << symbol_name
-                 << "\" conflicts with the existing symbol \""
-                 << (*iter)->AsString(index) << "\".";
-      return false;
-    }
-
-    // OK, that worked.  Now we have to make sure that no symbol in the map is
-    // a sub-symbol of the one we are inserting.  The only symbol which could
-    // be so is the first symbol that is greater than the new symbol.  Since
-    // |iter| points at the last symbol that is less than or equal, we just have
-    // to increment it.
-    ++*iter;
-
-    if (*iter != end && IsSubSymbol(symbol_name, (*iter)->AsString(index))) {
-      GOOGLE_LOG(ERROR) << "Symbol name \"" << symbol_name
-                 << "\" conflicts with the existing symbol \""
-                 << (*iter)->AsString(index) << "\".";
-      return false;
-    }
-  }
-  return true;
-}
-
-bool EncodedDescriptorDatabase::DescriptorIndex::AddSymbol(
-    StringPiece symbol) {
-  SymbolEntry entry = {static_cast<int>(all_values_.size() - 1),
-                       EncodeString(symbol)};
-  std::string entry_as_string = entry.AsString(*this);
-
-  // We need to make sure not to violate our map invariant.
-
-  // If the symbol name is invalid it could break our lookup algorithm (which
-  // relies on the fact that '.' sorts before all other characters that are
-  // valid in symbol names).
-  if (!ValidateSymbolName(symbol)) {
-    GOOGLE_LOG(ERROR) << "Invalid symbol name: " << entry_as_string;
-    return false;
-  }
-
-  auto iter = FindLastLessOrEqual(&by_symbol_, entry);
-  if (!CheckForMutualSubsymbols(entry_as_string, &iter, by_symbol_.end(),
-                                *this)) {
-    return false;
-  }
-
-  // Same, but on by_symbol_flat_
-  auto flat_iter =
-      FindLastLessOrEqual(&by_symbol_flat_, entry, by_symbol_.key_comp());
-  if (!CheckForMutualSubsymbols(entry_as_string, &flat_iter,
-                                by_symbol_flat_.end(), *this)) {
-    return false;
-  }
-
-  // OK, no conflicts.
-
-  // Insert the new symbol using the iterator as a hint, the new entry will
-  // appear immediately before the one the iterator is pointing at.
-  by_symbol_.insert(iter, entry);
-
-  return true;
-}
-
-template <typename DescProto>
-bool EncodedDescriptorDatabase::DescriptorIndex::AddNestedExtensions(
-    StringPiece filename, const DescProto& message_type) {
-  for (const auto& nested_type : message_type.nested_type()) {
-    if (!AddNestedExtensions(filename, nested_type)) return false;
-  }
-  for (const auto& extension : message_type.extension()) {
-    if (!AddExtension(filename, extension)) return false;
-  }
-  return true;
-}
-
-template <typename FieldProto>
-bool EncodedDescriptorDatabase::DescriptorIndex::AddExtension(
-    StringPiece filename, const FieldProto& field) {
-  if (!field.extendee().empty() && field.extendee()[0] == '.') {
-    // The extension is fully-qualified.  We can use it as a lookup key in
-    // the by_symbol_ table.
-    if (!InsertIfNotPresent(
-            &by_extension_,
-            ExtensionEntry{static_cast<int>(all_values_.size() - 1),
-                           EncodeString(field.extendee()), field.number()}) ||
-        std::binary_search(
-            by_extension_flat_.begin(), by_extension_flat_.end(),
-            std::make_pair(field.extendee().substr(1), field.number()),
-            by_extension_.key_comp())) {
-      GOOGLE_LOG(ERROR) << "Extension conflicts with extension already in database: "
-                    "extend "
-                 << field.extendee() << " { " << field.name() << " = "
-                 << field.number() << " } from:" << filename;
-      return false;
-    }
-  } else {
-    // Not fully-qualified.  We can't really do anything here, unfortunately.
-    // We don't consider this an error, though, because the descriptor is
-    // valid.
-  }
-  return true;
-}
-
-std::pair<const void*, int>
-EncodedDescriptorDatabase::DescriptorIndex::FindSymbol(StringPiece name) {
-  EnsureFlat();
-  return FindSymbolOnlyFlat(name);
-}
-
-std::pair<const void*, int>
-EncodedDescriptorDatabase::DescriptorIndex::FindSymbolOnlyFlat(
-    StringPiece name) const {
-  auto iter =
-      FindLastLessOrEqual(&by_symbol_flat_, name, by_symbol_.key_comp());
-
-  return iter != by_symbol_flat_.end() &&
-                 IsSubSymbol(iter->AsString(*this), name)
-             ? all_values_[iter->data_offset].value()
-             : Value();
-}
-
-std::pair<const void*, int>
-EncodedDescriptorDatabase::DescriptorIndex::FindExtension(
-    StringPiece containing_type, int field_number) {
-  EnsureFlat();
-
-  auto it = std::lower_bound(
-      by_extension_flat_.begin(), by_extension_flat_.end(),
-      std::make_tuple(containing_type, field_number), by_extension_.key_comp());
-  return it == by_extension_flat_.end() ||
-                 it->extendee(*this) != containing_type ||
-                 it->extension_number != field_number
-             ? std::make_pair(nullptr, 0)
-             : all_values_[it->data_offset].value();
-}
-
-template <typename T, typename Less>
-static void MergeIntoFlat(std::set<T, Less>* s, std::vector<T>* flat) {
-  if (s->empty()) return;
-  std::vector<T> new_flat(s->size() + flat->size());
-  std::merge(s->begin(), s->end(), flat->begin(), flat->end(), &new_flat[0],
-             s->key_comp());
-  *flat = std::move(new_flat);
-  s->clear();
-}
-
-void EncodedDescriptorDatabase::DescriptorIndex::EnsureFlat() {
-  all_values_.shrink_to_fit();
-  // Merge each of the sets into their flat counterpart.
-  MergeIntoFlat(&by_name_, &by_name_flat_);
-  MergeIntoFlat(&by_symbol_, &by_symbol_flat_);
-  MergeIntoFlat(&by_extension_, &by_extension_flat_);
-}
-
-bool EncodedDescriptorDatabase::DescriptorIndex::FindAllExtensionNumbers(
-    StringPiece containing_type, std::vector<int>* output) {
-  EnsureFlat();
-
-  bool success = false;
-  auto it = std::lower_bound(
-      by_extension_flat_.begin(), by_extension_flat_.end(),
-      std::make_tuple(containing_type, 0), by_extension_.key_comp());
-  for (;
-       it != by_extension_flat_.end() && it->extendee(*this) == containing_type;
-       ++it) {
-    output->push_back(it->extension_number);
-    success = true;
-  }
-
-  return success;
-}
-
-void EncodedDescriptorDatabase::DescriptorIndex::FindAllFileNames(
-    std::vector<std::string>* output) const {
-  output->resize(by_name_.size() + by_name_flat_.size());
-  int i = 0;
-  for (const auto& entry : by_name_) {
-    (*output)[i] = std::string(entry.name(*this));
-    i++;
-  }
-  for (const auto& entry : by_name_flat_) {
-    (*output)[i] = std::string(entry.name(*this));
-    i++;
-  }
-}
-
-std::pair<const void*, int>
-EncodedDescriptorDatabase::DescriptorIndex::FindFile(
-    StringPiece filename) {
-  EnsureFlat();
-
-  auto it = std::lower_bound(by_name_flat_.begin(), by_name_flat_.end(),
-                             filename, by_name_.key_comp());
-  return it == by_name_flat_.end() || it->name(*this) != filename
-             ? std::make_pair(nullptr, 0)
-             : all_values_[it->data_offset].value();
-}
-
-
-bool EncodedDescriptorDatabase::FindAllFileNames(
-    std::vector<std::string>* output) {
-  index_->FindAllFileNames(output);
-  return true;
-}
-
-bool EncodedDescriptorDatabase::MaybeParse(
-    std::pair<const void*, int> encoded_file, FileDescriptorProto* output) {
-  if (encoded_file.first == nullptr) return false;
-  return output->ParseFromArray(encoded_file.first, encoded_file.second);
-}
-
-EncodedDescriptorDatabase::EncodedDescriptorDatabase()
-    : index_(new DescriptorIndex()) {}
-
-EncodedDescriptorDatabase::~EncodedDescriptorDatabase() {
-  for (void* p : files_to_delete_) {
-    operator delete(p);
-  }
-}
-
-// ===================================================================
-
-DescriptorPoolDatabase::DescriptorPoolDatabase(const DescriptorPool& pool)
-    : pool_(pool) {}
-DescriptorPoolDatabase::~DescriptorPoolDatabase() {}
-
-bool DescriptorPoolDatabase::FindFileByName(const std::string& filename,
-                                            FileDescriptorProto* output) {
-  const FileDescriptor* file = pool_.FindFileByName(filename);
-  if (file == nullptr) return false;
-  output->Clear();
-  file->CopyTo(output);
-  return true;
-}
-
-bool DescriptorPoolDatabase::FindFileContainingSymbol(
-    const std::string& symbol_name, FileDescriptorProto* output) {
-  const FileDescriptor* file = pool_.FindFileContainingSymbol(symbol_name);
-  if (file == nullptr) return false;
-  output->Clear();
-  file->CopyTo(output);
-  return true;
-}
-
-bool DescriptorPoolDatabase::FindFileContainingExtension(
-    const std::string& containing_type, int field_number,
-    FileDescriptorProto* output) {
-  const Descriptor* extendee = pool_.FindMessageTypeByName(containing_type);
-  if (extendee == nullptr) return false;
-
-  const FieldDescriptor* extension =
-      pool_.FindExtensionByNumber(extendee, field_number);
-  if (extension == nullptr) return false;
-
-  output->Clear();
-  extension->file()->CopyTo(output);
-  return true;
-}
-
-bool DescriptorPoolDatabase::FindAllExtensionNumbers(
-    const std::string& extendee_type, std::vector<int>* output) {
-  const Descriptor* extendee = pool_.FindMessageTypeByName(extendee_type);
-  if (extendee == nullptr) return false;
-
-  std::vector<const FieldDescriptor*> extensions;
-  pool_.FindAllExtensions(extendee, &extensions);
-
-  for (const FieldDescriptor* extension : extensions) {
-    output->push_back(extension->number());
-  }
-
-  return true;
-}
-
-// ===================================================================
-
-MergedDescriptorDatabase::MergedDescriptorDatabase(
-    DescriptorDatabase* source1, DescriptorDatabase* source2) {
-  sources_.push_back(source1);
-  sources_.push_back(source2);
-}
-MergedDescriptorDatabase::MergedDescriptorDatabase(
-    const std::vector<DescriptorDatabase*>& sources)
-    : sources_(sources) {}
-MergedDescriptorDatabase::~MergedDescriptorDatabase() {}
-
-bool MergedDescriptorDatabase::FindFileByName(const std::string& filename,
-                                              FileDescriptorProto* output) {
-  for (DescriptorDatabase* source : sources_) {
-    if (source->FindFileByName(filename, output)) {
-      return true;
-    }
-  }
-  return false;
-}
-
-bool MergedDescriptorDatabase::FindFileContainingSymbol(
-    const std::string& symbol_name, FileDescriptorProto* output) {
-  for (size_t i = 0; i < sources_.size(); i++) {
-    if (sources_[i]->FindFileContainingSymbol(symbol_name, output)) {
-      // The symbol was found in source i.  However, if one of the previous
-      // sources defines a file with the same name (which presumably doesn't
-      // contain the symbol, since it wasn't found in that source), then we
-      // must hide it from the caller.
-      FileDescriptorProto temp;
-      for (size_t j = 0; j < i; j++) {
-        if (sources_[j]->FindFileByName(output->name(), &temp)) {
-          // Found conflicting file in a previous source.
-          return false;
-        }
-      }
-      return true;
-    }
-  }
-  return false;
-}
-
-bool MergedDescriptorDatabase::FindFileContainingExtension(
-    const std::string& containing_type, int field_number,
-    FileDescriptorProto* output) {
-  for (size_t i = 0; i < sources_.size(); i++) {
-    if (sources_[i]->FindFileContainingExtension(containing_type, field_number,
-                                                 output)) {
-      // The symbol was found in source i.  However, if one of the previous
-      // sources defines a file with the same name (which presumably doesn't
-      // contain the symbol, since it wasn't found in that source), then we
-      // must hide it from the caller.
-      FileDescriptorProto temp;
-      for (size_t j = 0; j < i; j++) {
-        if (sources_[j]->FindFileByName(output->name(), &temp)) {
-          // Found conflicting file in a previous source.
-          return false;
-        }
-      }
-      return true;
-    }
-  }
-  return false;
-}
-
-bool MergedDescriptorDatabase::FindAllExtensionNumbers(
-    const std::string& extendee_type, std::vector<int>* output) {
-  std::set<int> merged_results;
-  std::vector<int> results;
-  bool success = false;
-
-  for (DescriptorDatabase* source : sources_) {
-    if (source->FindAllExtensionNumbers(extendee_type, &results)) {
-      std::copy(results.begin(), results.end(),
-                std::insert_iterator<std::set<int> >(merged_results,
-                                                     merged_results.begin()));
-      success = true;
-    }
-    results.clear();
-  }
-
-  std::copy(merged_results.begin(), merged_results.end(),
-            std::insert_iterator<std::vector<int> >(*output, output->end()));
-
-  return success;
-}
-
-
-bool MergedDescriptorDatabase::FindAllFileNames(
-    std::vector<std::string>* output) {
-  bool implemented = false;
-  for (DescriptorDatabase* source : sources_) {
-    std::vector<std::string> source_output;
-    if (source->FindAllFileNames(&source_output)) {
-      output->reserve(output->size() + source_output.size());
-      for (auto& source : source_output) {
-        output->push_back(std::move(source));
-      }
-      implemented = true;
-    }
-  }
-  return implemented;
-}
-
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/descriptor_database.h b/libs/protobuf/src/google/protobuf/descriptor_database.h
deleted file mode 100644
index f4f06bb..0000000
--- a/libs/protobuf/src/google/protobuf/descriptor_database.h
+++ /dev/null
@@ -1,398 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-//
-// Interface for manipulating databases of descriptors.
-
-#ifndef GOOGLE_PROTOBUF_DESCRIPTOR_DATABASE_H__
-#define GOOGLE_PROTOBUF_DESCRIPTOR_DATABASE_H__
-
-
-#include <map>
-#include <string>
-#include <utility>
-#include <vector>
-
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/descriptor.h>
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-#ifdef SWIG
-#error "You cannot SWIG proto headers"
-#endif
-
-namespace google {
-namespace protobuf {
-
-// Defined in this file.
-class DescriptorDatabase;
-class SimpleDescriptorDatabase;
-class EncodedDescriptorDatabase;
-class DescriptorPoolDatabase;
-class MergedDescriptorDatabase;
-
-// Abstract interface for a database of descriptors.
-//
-// This is useful if you want to create a DescriptorPool which loads
-// descriptors on-demand from some sort of large database.  If the database
-// is large, it may be inefficient to enumerate every .proto file inside it
-// calling DescriptorPool::BuildFile() for each one.  Instead, a DescriptorPool
-// can be created which wraps a DescriptorDatabase and only builds particular
-// descriptors when they are needed.
-class PROTOBUF_EXPORT DescriptorDatabase {
- public:
-  inline DescriptorDatabase() {}
-  virtual ~DescriptorDatabase();
-
-  // Find a file by file name.  Fills in in *output and returns true if found.
-  // Otherwise, returns false, leaving the contents of *output undefined.
-  virtual bool FindFileByName(const std::string& filename,
-                              FileDescriptorProto* output) = 0;
-
-  // Find the file that declares the given fully-qualified symbol name.
-  // If found, fills in *output and returns true, otherwise returns false
-  // and leaves *output undefined.
-  virtual bool FindFileContainingSymbol(const std::string& symbol_name,
-                                        FileDescriptorProto* output) = 0;
-
-  // Find the file which defines an extension extending the given message type
-  // with the given field number.  If found, fills in *output and returns true,
-  // otherwise returns false and leaves *output undefined.  containing_type
-  // must be a fully-qualified type name.
-  virtual bool FindFileContainingExtension(const std::string& containing_type,
-                                           int field_number,
-                                           FileDescriptorProto* output) = 0;
-
-  // Finds the tag numbers used by all known extensions of
-  // extendee_type, and appends them to output in an undefined
-  // order. This method is best-effort: it's not guaranteed that the
-  // database will find all extensions, and it's not guaranteed that
-  // FindFileContainingExtension will return true on all of the found
-  // numbers. Returns true if the search was successful, otherwise
-  // returns false and leaves output unchanged.
-  //
-  // This method has a default implementation that always returns
-  // false.
-  virtual bool FindAllExtensionNumbers(const std::string& /* extendee_type */,
-                                       std::vector<int>* /* output */) {
-    return false;
-  }
-
-
-  // Finds the file names and appends them to the output in an
-  // undefined order. This method is best-effort: it's not guaranteed that the
-  // database will find all files. Returns true if the database supports
-  // searching all file names, otherwise returns false and leaves output
-  // unchanged.
-  //
-  // This method has a default implementation that always returns
-  // false.
-  virtual bool FindAllFileNames(std::vector<std::string>* /*output*/) {
-    return false;
-  }
-
-  // Finds the package names and appends them to the output in an
-  // undefined order. This method is best-effort: it's not guaranteed that the
-  // database will find all packages. Returns true if the database supports
-  // searching all package names, otherwise returns false and leaves output
-  // unchanged.
-  bool FindAllPackageNames(std::vector<std::string>* output);
-
-  // Finds the message names and appends them to the output in an
-  // undefined order. This method is best-effort: it's not guaranteed that the
-  // database will find all messages. Returns true if the database supports
-  // searching all message names, otherwise returns false and leaves output
-  // unchanged.
-  bool FindAllMessageNames(std::vector<std::string>* output);
-
- private:
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(DescriptorDatabase);
-};
-
-// A DescriptorDatabase into which you can insert files manually.
-//
-// FindFileContainingSymbol() is fully-implemented.  When you add a file, its
-// symbols will be indexed for this purpose.  Note that the implementation
-// may return false positives, but only if it isn't possible for the symbol
-// to be defined in any other file.  In particular, if a file defines a symbol
-// "Foo", then searching for "Foo.[anything]" will match that file.  This way,
-// the database does not need to aggressively index all children of a symbol.
-//
-// FindFileContainingExtension() is mostly-implemented.  It works if and only
-// if the original FieldDescriptorProto defining the extension has a
-// fully-qualified type name in its "extendee" field (i.e. starts with a '.').
-// If the extendee is a relative name, SimpleDescriptorDatabase will not
-// attempt to resolve the type, so it will not know what type the extension is
-// extending.  Therefore, calling FindFileContainingExtension() with the
-// extension's containing type will never actually find that extension.  Note
-// that this is an unlikely problem, as all FileDescriptorProtos created by the
-// protocol compiler (as well as ones created by calling
-// FileDescriptor::CopyTo()) will always use fully-qualified names for all
-// types.  You only need to worry if you are constructing FileDescriptorProtos
-// yourself, or are calling compiler::Parser directly.
-class PROTOBUF_EXPORT SimpleDescriptorDatabase : public DescriptorDatabase {
- public:
-  SimpleDescriptorDatabase();
-  ~SimpleDescriptorDatabase() override;
-
-  // Adds the FileDescriptorProto to the database, making a copy.  The object
-  // can be deleted after Add() returns.  Returns false if the file conflicted
-  // with a file already in the database, in which case an error will have
-  // been written to GOOGLE_LOG(ERROR).
-  bool Add(const FileDescriptorProto& file);
-
-  // Adds the FileDescriptorProto to the database and takes ownership of it.
-  bool AddAndOwn(const FileDescriptorProto* file);
-
-  // implements DescriptorDatabase -----------------------------------
-  bool FindFileByName(const std::string& filename,
-                      FileDescriptorProto* output) override;
-  bool FindFileContainingSymbol(const std::string& symbol_name,
-                                FileDescriptorProto* output) override;
-  bool FindFileContainingExtension(const std::string& containing_type,
-                                   int field_number,
-                                   FileDescriptorProto* output) override;
-  bool FindAllExtensionNumbers(const std::string& extendee_type,
-                               std::vector<int>* output) override;
-
-  bool FindAllFileNames(std::vector<std::string>* output) override;
-
- private:
-  // An index mapping file names, symbol names, and extension numbers to
-  // some sort of values.
-  template <typename Value>
-  class DescriptorIndex {
-   public:
-    // Helpers to recursively add particular descriptors and all their contents
-    // to the index.
-    bool AddFile(const FileDescriptorProto& file, Value value);
-    bool AddSymbol(const std::string& name, Value value);
-    bool AddNestedExtensions(const std::string& filename,
-                             const DescriptorProto& message_type, Value value);
-    bool AddExtension(const std::string& filename,
-                      const FieldDescriptorProto& field, Value value);
-
-    Value FindFile(const std::string& filename);
-    Value FindSymbol(const std::string& name);
-    Value FindExtension(const std::string& containing_type, int field_number);
-    bool FindAllExtensionNumbers(const std::string& containing_type,
-                                 std::vector<int>* output);
-    void FindAllFileNames(std::vector<std::string>* output);
-
-   private:
-    std::map<std::string, Value> by_name_;
-    std::map<std::string, Value> by_symbol_;
-    std::map<std::pair<std::string, int>, Value> by_extension_;
-
-    // Invariant:  The by_symbol_ map does not contain any symbols which are
-    // prefixes of other symbols in the map.  For example, "foo.bar" is a
-    // prefix of "foo.bar.baz" (but is not a prefix of "foo.barbaz").
-    //
-    // This invariant is important because it means that given a symbol name,
-    // we can find a key in the map which is a prefix of the symbol in O(lg n)
-    // time, and we know that there is at most one such key.
-    //
-    // The prefix lookup algorithm works like so:
-    // 1) Find the last key in the map which is less than or equal to the
-    //    search key.
-    // 2) If the found key is a prefix of the search key, then return it.
-    //    Otherwise, there is no match.
-    //
-    // I am sure this algorithm has been described elsewhere, but since I
-    // wasn't able to find it quickly I will instead prove that it works
-    // myself.  The key to the algorithm is that if a match exists, step (1)
-    // will find it.  Proof:
-    // 1) Define the "search key" to be the key we are looking for, the "found
-    //    key" to be the key found in step (1), and the "match key" to be the
-    //    key which actually matches the search key (i.e. the key we're trying
-    //    to find).
-    // 2) The found key must be less than or equal to the search key by
-    //    definition.
-    // 3) The match key must also be less than or equal to the search key
-    //    (because it is a prefix).
-    // 4) The match key cannot be greater than the found key, because if it
-    //    were, then step (1) of the algorithm would have returned the match
-    //    key instead (since it finds the *greatest* key which is less than or
-    //    equal to the search key).
-    // 5) Therefore, the found key must be between the match key and the search
-    //    key, inclusive.
-    // 6) Since the search key must be a sub-symbol of the match key, if it is
-    //    not equal to the match key, then search_key[match_key.size()] must
-    //    be '.'.
-    // 7) Since '.' sorts before any other character that is valid in a symbol
-    //    name, then if the found key is not equal to the match key, then
-    //    found_key[match_key.size()] must also be '.', because any other value
-    //    would make it sort after the search key.
-    // 8) Therefore, if the found key is not equal to the match key, then the
-    //    found key must be a sub-symbol of the match key.  However, this would
-    //    contradict our map invariant which says that no symbol in the map is
-    //    a sub-symbol of any other.
-    // 9) Therefore, the found key must match the match key.
-    //
-    // The above proof assumes the match key exists.  In the case that the
-    // match key does not exist, then step (1) will return some other symbol.
-    // That symbol cannot be a super-symbol of the search key since if it were,
-    // then it would be a match, and we're assuming the match key doesn't exist.
-    // Therefore, step 2 will correctly return no match.
-  };
-
-  DescriptorIndex<const FileDescriptorProto*> index_;
-  std::vector<std::unique_ptr<const FileDescriptorProto>> files_to_delete_;
-
-  // If file is non-nullptr, copy it into *output and return true, otherwise
-  // return false.
-  bool MaybeCopy(const FileDescriptorProto* file, FileDescriptorProto* output);
-
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(SimpleDescriptorDatabase);
-};
-
-// Very similar to SimpleDescriptorDatabase, but stores all the descriptors
-// as raw bytes and generally tries to use as little memory as possible.
-//
-// The same caveats regarding FindFileContainingExtension() apply as with
-// SimpleDescriptorDatabase.
-class PROTOBUF_EXPORT EncodedDescriptorDatabase : public DescriptorDatabase {
- public:
-  EncodedDescriptorDatabase();
-  ~EncodedDescriptorDatabase() override;
-
-  // Adds the FileDescriptorProto to the database.  The descriptor is provided
-  // in encoded form.  The database does not make a copy of the bytes, nor
-  // does it take ownership; it's up to the caller to make sure the bytes
-  // remain valid for the life of the database.  Returns false and logs an error
-  // if the bytes are not a valid FileDescriptorProto or if the file conflicted
-  // with a file already in the database.
-  bool Add(const void* encoded_file_descriptor, int size);
-
-  // Like Add(), but makes a copy of the data, so that the caller does not
-  // need to keep it around.
-  bool AddCopy(const void* encoded_file_descriptor, int size);
-
-  // Like FindFileContainingSymbol but returns only the name of the file.
-  bool FindNameOfFileContainingSymbol(const std::string& symbol_name,
-                                      std::string* output);
-
-  // implements DescriptorDatabase -----------------------------------
-  bool FindFileByName(const std::string& filename,
-                      FileDescriptorProto* output) override;
-  bool FindFileContainingSymbol(const std::string& symbol_name,
-                                FileDescriptorProto* output) override;
-  bool FindFileContainingExtension(const std::string& containing_type,
-                                   int field_number,
-                                   FileDescriptorProto* output) override;
-  bool FindAllExtensionNumbers(const std::string& extendee_type,
-                               std::vector<int>* output) override;
-  bool FindAllFileNames(std::vector<std::string>* output) override;
-
- private:
-  class DescriptorIndex;
-  // Keep DescriptorIndex by pointer to hide the implementation to keep a
-  // cleaner header.
-  std::unique_ptr<DescriptorIndex> index_;
-  std::vector<void*> files_to_delete_;
-
-  // If encoded_file.first is non-nullptr, parse the data into *output and
-  // return true, otherwise return false.
-  bool MaybeParse(std::pair<const void*, int> encoded_file,
-                  FileDescriptorProto* output);
-
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(EncodedDescriptorDatabase);
-};
-
-// A DescriptorDatabase that fetches files from a given pool.
-class PROTOBUF_EXPORT DescriptorPoolDatabase : public DescriptorDatabase {
- public:
-  explicit DescriptorPoolDatabase(const DescriptorPool& pool);
-  ~DescriptorPoolDatabase() override;
-
-  // implements DescriptorDatabase -----------------------------------
-  bool FindFileByName(const std::string& filename,
-                      FileDescriptorProto* output) override;
-  bool FindFileContainingSymbol(const std::string& symbol_name,
-                                FileDescriptorProto* output) override;
-  bool FindFileContainingExtension(const std::string& containing_type,
-                                   int field_number,
-                                   FileDescriptorProto* output) override;
-  bool FindAllExtensionNumbers(const std::string& extendee_type,
-                               std::vector<int>* output) override;
-
- private:
-  const DescriptorPool& pool_;
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(DescriptorPoolDatabase);
-};
-
-// A DescriptorDatabase that wraps two or more others.  It first searches the
-// first database and, if that fails, tries the second, and so on.
-class PROTOBUF_EXPORT MergedDescriptorDatabase : public DescriptorDatabase {
- public:
-  // Merge just two databases.  The sources remain property of the caller.
-  MergedDescriptorDatabase(DescriptorDatabase* source1,
-                           DescriptorDatabase* source2);
-  // Merge more than two databases.  The sources remain property of the caller.
-  // The vector may be deleted after the constructor returns but the
-  // DescriptorDatabases need to stick around.
-  explicit MergedDescriptorDatabase(
-      const std::vector<DescriptorDatabase*>& sources);
-  ~MergedDescriptorDatabase() override;
-
-  // implements DescriptorDatabase -----------------------------------
-  bool FindFileByName(const std::string& filename,
-                      FileDescriptorProto* output) override;
-  bool FindFileContainingSymbol(const std::string& symbol_name,
-                                FileDescriptorProto* output) override;
-  bool FindFileContainingExtension(const std::string& containing_type,
-                                   int field_number,
-                                   FileDescriptorProto* output) override;
-  // Merges the results of calling all databases. Returns true iff any
-  // of the databases returned true.
-  bool FindAllExtensionNumbers(const std::string& extendee_type,
-                               std::vector<int>* output) override;
-
-
-  // This function is best-effort. Returns true if at least one underlying
-  // DescriptorDatabase returns true.
-  bool FindAllFileNames(std::vector<std::string>* output) override;
-
- private:
-  std::vector<DescriptorDatabase*> sources_;
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(MergedDescriptorDatabase);
-};
-
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
-
-#endif  // GOOGLE_PROTOBUF_DESCRIPTOR_DATABASE_H__
diff --git a/libs/protobuf/src/google/protobuf/descriptor_database_unittest.cc b/libs/protobuf/src/google/protobuf/descriptor_database_unittest.cc
deleted file mode 100644
index f582448..0000000
--- a/libs/protobuf/src/google/protobuf/descriptor_database_unittest.cc
+++ /dev/null
@@ -1,812 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-//
-// This file makes extensive use of RFC 3092.  :)
-
-#include <google/protobuf/descriptor_database.h>
-
-#include <algorithm>
-#include <memory>
-
-#include <google/protobuf/stubs/logging.h>
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/descriptor.pb.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/text_format.h>
-#include <gmock/gmock.h>
-#include <google/protobuf/testing/googletest.h>
-#include <gtest/gtest.h>
-
-
-namespace google {
-namespace protobuf {
-namespace {
-
-static void AddToDatabase(SimpleDescriptorDatabase* database,
-                          const char* file_text) {
-  FileDescriptorProto file_proto;
-  EXPECT_TRUE(TextFormat::ParseFromString(file_text, &file_proto));
-  database->Add(file_proto);
-}
-
-static void ExpectContainsType(const FileDescriptorProto& proto,
-                               const std::string& type_name) {
-  for (int i = 0; i < proto.message_type_size(); i++) {
-    if (proto.message_type(i).name() == type_name) return;
-  }
-  ADD_FAILURE() << "\"" << proto.name() << "\" did not contain expected type \""
-                << type_name << "\".";
-}
-
-// ===================================================================
-
-#if GTEST_HAS_PARAM_TEST
-
-// SimpleDescriptorDatabase, EncodedDescriptorDatabase, and
-// DescriptorPoolDatabase call for very similar tests.  Instead of writing
-// three nearly-identical sets of tests, we use parameterized tests to apply
-// the same code to all three.
-
-// The parameterized test runs against a DescriptorDatabaseTestCase.  We have
-// implementations for each of the three classes we want to test.
-class DescriptorDatabaseTestCase {
- public:
-  virtual ~DescriptorDatabaseTestCase() {}
-
-  virtual DescriptorDatabase* GetDatabase() = 0;
-  virtual bool AddToDatabase(const FileDescriptorProto& file) = 0;
-};
-
-// Factory function type.
-typedef DescriptorDatabaseTestCase* DescriptorDatabaseTestCaseFactory();
-
-// Specialization for SimpleDescriptorDatabase.
-class SimpleDescriptorDatabaseTestCase : public DescriptorDatabaseTestCase {
- public:
-  static DescriptorDatabaseTestCase* New() {
-    return new SimpleDescriptorDatabaseTestCase;
-  }
-
-  virtual ~SimpleDescriptorDatabaseTestCase() {}
-
-  virtual DescriptorDatabase* GetDatabase() { return &database_; }
-  virtual bool AddToDatabase(const FileDescriptorProto& file) {
-    return database_.Add(file);
-  }
-
- private:
-  SimpleDescriptorDatabase database_;
-};
-
-// Specialization for EncodedDescriptorDatabase.
-class EncodedDescriptorDatabaseTestCase : public DescriptorDatabaseTestCase {
- public:
-  static DescriptorDatabaseTestCase* New() {
-    return new EncodedDescriptorDatabaseTestCase;
-  }
-
-  virtual ~EncodedDescriptorDatabaseTestCase() {}
-
-  virtual DescriptorDatabase* GetDatabase() { return &database_; }
-  virtual bool AddToDatabase(const FileDescriptorProto& file) {
-    std::string data;
-    file.SerializeToString(&data);
-    return database_.AddCopy(data.data(), data.size());
-  }
-
- private:
-  EncodedDescriptorDatabase database_;
-};
-
-// Specialization for DescriptorPoolDatabase.
-class DescriptorPoolDatabaseTestCase : public DescriptorDatabaseTestCase {
- public:
-  static DescriptorDatabaseTestCase* New() {
-    return new EncodedDescriptorDatabaseTestCase;
-  }
-
-  DescriptorPoolDatabaseTestCase() : database_(pool_) {}
-  virtual ~DescriptorPoolDatabaseTestCase() {}
-
-  virtual DescriptorDatabase* GetDatabase() { return &database_; }
-  virtual bool AddToDatabase(const FileDescriptorProto& file) {
-    return pool_.BuildFile(file);
-  }
-
- private:
-  DescriptorPool pool_;
-  DescriptorPoolDatabase database_;
-};
-
-// -------------------------------------------------------------------
-
-class DescriptorDatabaseTest
-    : public testing::TestWithParam<DescriptorDatabaseTestCaseFactory*> {
- protected:
-  virtual void SetUp() {
-    test_case_.reset(GetParam()());
-    database_ = test_case_->GetDatabase();
-  }
-
-  void AddToDatabase(const char* file_descriptor_text) {
-    FileDescriptorProto file_proto;
-    EXPECT_TRUE(TextFormat::ParseFromString(file_descriptor_text, &file_proto));
-    EXPECT_TRUE(test_case_->AddToDatabase(file_proto));
-  }
-
-  void AddToDatabaseWithError(const char* file_descriptor_text) {
-    FileDescriptorProto file_proto;
-    EXPECT_TRUE(TextFormat::ParseFromString(file_descriptor_text, &file_proto));
-    EXPECT_FALSE(test_case_->AddToDatabase(file_proto));
-  }
-
-  std::unique_ptr<DescriptorDatabaseTestCase> test_case_;
-  DescriptorDatabase* database_;
-};
-
-TEST_P(DescriptorDatabaseTest, FindFileByName) {
-  AddToDatabase(
-      "name: \"foo.proto\" "
-      "message_type { name:\"Foo\" }");
-  AddToDatabase(
-      "name: \"bar.proto\" "
-      "message_type { name:\"Bar\" }");
-
-  {
-    FileDescriptorProto file;
-    EXPECT_TRUE(database_->FindFileByName("foo.proto", &file));
-    EXPECT_EQ("foo.proto", file.name());
-    ExpectContainsType(file, "Foo");
-  }
-
-  {
-    FileDescriptorProto file;
-    EXPECT_TRUE(database_->FindFileByName("bar.proto", &file));
-    EXPECT_EQ("bar.proto", file.name());
-    ExpectContainsType(file, "Bar");
-  }
-
-  {
-    // Fails to find undefined files.
-    FileDescriptorProto file;
-    EXPECT_FALSE(database_->FindFileByName("baz.proto", &file));
-  }
-}
-
-TEST_P(DescriptorDatabaseTest, FindFileContainingSymbol) {
-  AddToDatabase(
-      "name: \"foo.proto\" "
-      "message_type { "
-      "  name: \"Foo\" "
-      "  field { name:\"qux\" }"
-      "  nested_type { name: \"Grault\" } "
-      "  enum_type { name: \"Garply\" } "
-      "} "
-      "enum_type { "
-      "  name: \"Waldo\" "
-      "  value { name:\"FRED\" } "
-      "} "
-      "extension { name: \"plugh\" } "
-      "service { "
-      "  name: \"Xyzzy\" "
-      "  method { name: \"Thud\" } "
-      "}");
-  AddToDatabase(
-      "name: \"bar.proto\" "
-      "package: \"corge\" "
-      "message_type { name: \"Bar\" }");
-
-  {
-    FileDescriptorProto file;
-    EXPECT_TRUE(database_->FindFileContainingSymbol("Foo", &file));
-    EXPECT_EQ("foo.proto", file.name());
-  }
-
-  {
-    // Can find fields.
-    FileDescriptorProto file;
-    EXPECT_TRUE(database_->FindFileContainingSymbol("Foo.qux", &file));
-    EXPECT_EQ("foo.proto", file.name());
-    // Non-existent field under a valid top level symbol can also be
-    // found.
-    EXPECT_TRUE(
-        database_->FindFileContainingSymbol("Foo.none_field.none", &file));
-  }
-
-  {
-    // Can find nested types.
-    FileDescriptorProto file;
-    EXPECT_TRUE(database_->FindFileContainingSymbol("Foo.Grault", &file));
-    EXPECT_EQ("foo.proto", file.name());
-  }
-
-  {
-    // Can find nested enums.
-    FileDescriptorProto file;
-    EXPECT_TRUE(database_->FindFileContainingSymbol("Foo.Garply", &file));
-    EXPECT_EQ("foo.proto", file.name());
-  }
-
-  {
-    // Can find enum types.
-    FileDescriptorProto file;
-    EXPECT_TRUE(database_->FindFileContainingSymbol("Waldo", &file));
-    EXPECT_EQ("foo.proto", file.name());
-  }
-
-  {
-    // Can find enum values.
-    FileDescriptorProto file;
-    EXPECT_TRUE(database_->FindFileContainingSymbol("Waldo.FRED", &file));
-    EXPECT_EQ("foo.proto", file.name());
-  }
-
-  {
-    // Can find extensions.
-    FileDescriptorProto file;
-    EXPECT_TRUE(database_->FindFileContainingSymbol("plugh", &file));
-    EXPECT_EQ("foo.proto", file.name());
-  }
-
-  {
-    // Can find services.
-    FileDescriptorProto file;
-    EXPECT_TRUE(database_->FindFileContainingSymbol("Xyzzy", &file));
-    EXPECT_EQ("foo.proto", file.name());
-  }
-
-  {
-    // Can find methods.
-    FileDescriptorProto file;
-    EXPECT_TRUE(database_->FindFileContainingSymbol("Xyzzy.Thud", &file));
-    EXPECT_EQ("foo.proto", file.name());
-  }
-
-  {
-    // Can find things in packages.
-    FileDescriptorProto file;
-    EXPECT_TRUE(database_->FindFileContainingSymbol("corge.Bar", &file));
-    EXPECT_EQ("bar.proto", file.name());
-  }
-
-  {
-    // Fails to find undefined symbols.
-    FileDescriptorProto file;
-    EXPECT_FALSE(database_->FindFileContainingSymbol("Baz", &file));
-  }
-
-  {
-    // Names must be fully-qualified.
-    FileDescriptorProto file;
-    EXPECT_FALSE(database_->FindFileContainingSymbol("Bar", &file));
-  }
-}
-
-TEST_P(DescriptorDatabaseTest, FindFileContainingExtension) {
-  AddToDatabase(
-      "name: \"foo.proto\" "
-      "message_type { "
-      "  name: \"Foo\" "
-      "  extension_range { start: 1 end: 1000 } "
-      "  extension { name:\"qux\" label:LABEL_OPTIONAL type:TYPE_INT32 "
-      "number:5 "
-      "              extendee: \".Foo\" }"
-      "}");
-  AddToDatabase(
-      "name: \"bar.proto\" "
-      "package: \"corge\" "
-      "dependency: \"foo.proto\" "
-      "message_type { "
-      "  name: \"Bar\" "
-      "  extension_range { start: 1 end: 1000 } "
-      "} "
-      "extension { name:\"grault\" extendee: \".Foo\"       number:32 } "
-      "extension { name:\"garply\" extendee: \".corge.Bar\" number:70 } "
-      "extension { name:\"waldo\"  extendee: \"Bar\"        number:56 } ");
-
-  {
-    FileDescriptorProto file;
-    EXPECT_TRUE(database_->FindFileContainingExtension("Foo", 5, &file));
-    EXPECT_EQ("foo.proto", file.name());
-  }
-
-  {
-    FileDescriptorProto file;
-    EXPECT_TRUE(database_->FindFileContainingExtension("Foo", 32, &file));
-    EXPECT_EQ("bar.proto", file.name());
-  }
-
-  {
-    // Can find extensions for qualified type names.
-    FileDescriptorProto file;
-    EXPECT_TRUE(database_->FindFileContainingExtension("corge.Bar", 70, &file));
-    EXPECT_EQ("bar.proto", file.name());
-  }
-
-  {
-    // Can't find extensions whose extendee was not fully-qualified in the
-    // FileDescriptorProto.
-    FileDescriptorProto file;
-    EXPECT_FALSE(database_->FindFileContainingExtension("Bar", 56, &file));
-    EXPECT_FALSE(
-        database_->FindFileContainingExtension("corge.Bar", 56, &file));
-  }
-
-  {
-    // Can't find non-existent extension numbers.
-    FileDescriptorProto file;
-    EXPECT_FALSE(database_->FindFileContainingExtension("Foo", 12, &file));
-  }
-
-  {
-    // Can't find extensions for non-existent types.
-    FileDescriptorProto file;
-    EXPECT_FALSE(
-        database_->FindFileContainingExtension("NoSuchType", 5, &file));
-  }
-
-  {
-    // Can't find extensions for unqualified type names.
-    FileDescriptorProto file;
-    EXPECT_FALSE(database_->FindFileContainingExtension("Bar", 70, &file));
-  }
-}
-
-TEST_P(DescriptorDatabaseTest, FindAllExtensionNumbers) {
-  AddToDatabase(
-      "name: \"foo.proto\" "
-      "message_type { "
-      "  name: \"Foo\" "
-      "  extension_range { start: 1 end: 1000 } "
-      "  extension { name:\"qux\" label:LABEL_OPTIONAL type:TYPE_INT32 "
-      "number:5 "
-      "              extendee: \".Foo\" }"
-      "}");
-  AddToDatabase(
-      "name: \"bar.proto\" "
-      "package: \"corge\" "
-      "dependency: \"foo.proto\" "
-      "message_type { "
-      "  name: \"Bar\" "
-      "  extension_range { start: 1 end: 1000 } "
-      "} "
-      "extension { name:\"grault\" extendee: \".Foo\"       number:32 } "
-      "extension { name:\"garply\" extendee: \".corge.Bar\" number:70 } "
-      "extension { name:\"waldo\"  extendee: \"Bar\"        number:56 } ");
-
-  {
-    std::vector<int> numbers;
-    EXPECT_TRUE(database_->FindAllExtensionNumbers("Foo", &numbers));
-    ASSERT_EQ(2, numbers.size());
-    std::sort(numbers.begin(), numbers.end());
-    EXPECT_EQ(5, numbers[0]);
-    EXPECT_EQ(32, numbers[1]);
-  }
-
-  {
-    std::vector<int> numbers;
-    EXPECT_TRUE(database_->FindAllExtensionNumbers("corge.Bar", &numbers));
-    // Note: won't find extension 56 due to the name not being fully qualified.
-    ASSERT_EQ(1, numbers.size());
-    EXPECT_EQ(70, numbers[0]);
-  }
-
-  {
-    // Can't find extensions for non-existent types.
-    std::vector<int> numbers;
-    EXPECT_FALSE(database_->FindAllExtensionNumbers("NoSuchType", &numbers));
-  }
-
-  {
-    // Can't find extensions for unqualified types.
-    std::vector<int> numbers;
-    EXPECT_FALSE(database_->FindAllExtensionNumbers("Bar", &numbers));
-  }
-}
-
-TEST_P(DescriptorDatabaseTest, ConflictingFileError) {
-  AddToDatabase(
-      "name: \"foo.proto\" "
-      "message_type { "
-      "  name: \"Foo\" "
-      "}");
-  AddToDatabaseWithError(
-      "name: \"foo.proto\" "
-      "message_type { "
-      "  name: \"Bar\" "
-      "}");
-}
-
-TEST_P(DescriptorDatabaseTest, ConflictingTypeError) {
-  AddToDatabase(
-      "name: \"foo.proto\" "
-      "message_type { "
-      "  name: \"Foo\" "
-      "}");
-  AddToDatabaseWithError(
-      "name: \"bar.proto\" "
-      "message_type { "
-      "  name: \"Foo\" "
-      "}");
-}
-
-TEST_P(DescriptorDatabaseTest, ConflictingExtensionError) {
-  AddToDatabase(
-      "name: \"foo.proto\" "
-      "extension { name:\"foo\" label:LABEL_OPTIONAL type:TYPE_INT32 number:5 "
-      "            extendee: \".Foo\" }");
-  AddToDatabaseWithError(
-      "name: \"bar.proto\" "
-      "extension { name:\"bar\" label:LABEL_OPTIONAL type:TYPE_INT32 number:5 "
-      "            extendee: \".Foo\" }");
-}
-
-INSTANTIATE_TEST_CASE_P(
-    Simple, DescriptorDatabaseTest,
-    testing::Values(&SimpleDescriptorDatabaseTestCase::New));
-INSTANTIATE_TEST_CASE_P(
-    MemoryConserving, DescriptorDatabaseTest,
-    testing::Values(&EncodedDescriptorDatabaseTestCase::New));
-INSTANTIATE_TEST_CASE_P(Pool, DescriptorDatabaseTest,
-                        testing::Values(&DescriptorPoolDatabaseTestCase::New));
-
-#endif  // GTEST_HAS_PARAM_TEST
-
-TEST(EncodedDescriptorDatabaseExtraTest, FindNameOfFileContainingSymbol) {
-  // Create two files, one of which is in two parts.
-  FileDescriptorProto file1, file2a, file2b;
-  file1.set_name("foo.proto");
-  file1.set_package("foo");
-  file1.add_message_type()->set_name("Foo");
-  file2a.set_name("bar.proto");
-  file2b.set_package("bar");
-  file2b.add_message_type()->set_name("Bar");
-
-  // Normal serialization allows our optimization to kick in.
-  std::string data1 = file1.SerializeAsString();
-
-  // Force out-of-order serialization to test slow path.
-  std::string data2 = file2b.SerializeAsString() + file2a.SerializeAsString();
-
-  // Create EncodedDescriptorDatabase containing both files.
-  EncodedDescriptorDatabase db;
-  db.Add(data1.data(), data1.size());
-  db.Add(data2.data(), data2.size());
-
-  // Test!
-  std::string filename;
-  EXPECT_TRUE(db.FindNameOfFileContainingSymbol("foo.Foo", &filename));
-  EXPECT_EQ("foo.proto", filename);
-  EXPECT_TRUE(db.FindNameOfFileContainingSymbol("foo.Foo.Blah", &filename));
-  EXPECT_EQ("foo.proto", filename);
-  EXPECT_TRUE(db.FindNameOfFileContainingSymbol("bar.Bar", &filename));
-  EXPECT_EQ("bar.proto", filename);
-  EXPECT_FALSE(db.FindNameOfFileContainingSymbol("foo", &filename));
-  EXPECT_FALSE(db.FindNameOfFileContainingSymbol("bar", &filename));
-  EXPECT_FALSE(db.FindNameOfFileContainingSymbol("baz.Baz", &filename));
-}
-
-TEST(SimpleDescriptorDatabaseExtraTest, FindAllFileNames) {
-  FileDescriptorProto f;
-  f.set_name("foo.proto");
-  f.set_package("foo");
-  f.add_message_type()->set_name("Foo");
-
-  SimpleDescriptorDatabase db;
-  db.Add(f);
-
-  // Test!
-  std::vector<std::string> all_files;
-  db.FindAllFileNames(&all_files);
-  EXPECT_THAT(all_files, testing::ElementsAre("foo.proto"));
-}
-
-TEST(SimpleDescriptorDatabaseExtraTest, FindAllPackageNames) {
-  FileDescriptorProto f;
-  f.set_name("foo.proto");
-  f.set_package("foo");
-  f.add_message_type()->set_name("Foo");
-
-  FileDescriptorProto b;
-  b.set_name("bar.proto");
-  b.set_package("");
-  b.add_message_type()->set_name("Bar");
-
-  SimpleDescriptorDatabase db;
-  db.Add(f);
-  db.Add(b);
-
-  std::vector<std::string> packages;
-  EXPECT_TRUE(db.FindAllPackageNames(&packages));
-  EXPECT_THAT(packages, ::testing::UnorderedElementsAre("foo", ""));
-}
-
-TEST(SimpleDescriptorDatabaseExtraTest, FindAllMessageNames) {
-  FileDescriptorProto f;
-  f.set_name("foo.proto");
-  f.set_package("foo");
-  f.add_message_type()->set_name("Foo");
-
-  FileDescriptorProto b;
-  b.set_name("bar.proto");
-  b.set_package("");
-  b.add_message_type()->set_name("Bar");
-
-  SimpleDescriptorDatabase db;
-  db.Add(f);
-  db.Add(b);
-
-  std::vector<std::string> messages;
-  EXPECT_TRUE(db.FindAllMessageNames(&messages));
-  EXPECT_THAT(messages, ::testing::UnorderedElementsAre("foo.Foo", "Bar"));
-}
-
-// ===================================================================
-
-class MergedDescriptorDatabaseTest : public testing::Test {
- protected:
-  MergedDescriptorDatabaseTest()
-      : forward_merged_(&database1_, &database2_),
-        reverse_merged_(&database2_, &database1_) {}
-
-  void SetUp() override {
-    AddToDatabase(
-        &database1_,
-        "name: \"foo.proto\" "
-        "message_type { name:\"Foo\" extension_range { start: 1 end: 100 } } "
-        "extension { name:\"foo_ext\" extendee: \".Foo\" number:3 "
-        "            label:LABEL_OPTIONAL type:TYPE_INT32 } ");
-    AddToDatabase(
-        &database2_,
-        "name: \"bar.proto\" "
-        "message_type { name:\"Bar\" extension_range { start: 1 end: 100 } } "
-        "extension { name:\"bar_ext\" extendee: \".Bar\" number:5 "
-        "            label:LABEL_OPTIONAL type:TYPE_INT32 } ");
-
-    // baz.proto exists in both pools, with different definitions.
-    AddToDatabase(
-        &database1_,
-        "name: \"baz.proto\" "
-        "message_type { name:\"Baz\" extension_range { start: 1 end: 100 } } "
-        "message_type { name:\"FromPool1\" } "
-        "extension { name:\"baz_ext\" extendee: \".Baz\" number:12 "
-        "            label:LABEL_OPTIONAL type:TYPE_INT32 } "
-        "extension { name:\"database1_only_ext\" extendee: \".Baz\" number:13 "
-        "            label:LABEL_OPTIONAL type:TYPE_INT32 } ");
-    AddToDatabase(
-        &database2_,
-        "name: \"baz.proto\" "
-        "message_type { name:\"Baz\" extension_range { start: 1 end: 100 } } "
-        "message_type { name:\"FromPool2\" } "
-        "extension { name:\"baz_ext\" extendee: \".Baz\" number:12 "
-        "            label:LABEL_OPTIONAL type:TYPE_INT32 } ");
-  }
-
-  SimpleDescriptorDatabase database1_;
-  SimpleDescriptorDatabase database2_;
-
-  MergedDescriptorDatabase forward_merged_;
-  MergedDescriptorDatabase reverse_merged_;
-};
-
-TEST_F(MergedDescriptorDatabaseTest, FindFileByName) {
-  {
-    // Can find file that is only in database1_.
-    FileDescriptorProto file;
-    EXPECT_TRUE(forward_merged_.FindFileByName("foo.proto", &file));
-    EXPECT_EQ("foo.proto", file.name());
-    ExpectContainsType(file, "Foo");
-  }
-
-  {
-    // Can find file that is only in database2_.
-    FileDescriptorProto file;
-    EXPECT_TRUE(forward_merged_.FindFileByName("bar.proto", &file));
-    EXPECT_EQ("bar.proto", file.name());
-    ExpectContainsType(file, "Bar");
-  }
-
-  {
-    // In forward_merged_, database1_'s baz.proto takes precedence.
-    FileDescriptorProto file;
-    EXPECT_TRUE(forward_merged_.FindFileByName("baz.proto", &file));
-    EXPECT_EQ("baz.proto", file.name());
-    ExpectContainsType(file, "FromPool1");
-  }
-
-  {
-    // In reverse_merged_, database2_'s baz.proto takes precedence.
-    FileDescriptorProto file;
-    EXPECT_TRUE(reverse_merged_.FindFileByName("baz.proto", &file));
-    EXPECT_EQ("baz.proto", file.name());
-    ExpectContainsType(file, "FromPool2");
-  }
-
-  {
-    // Can't find non-existent file.
-    FileDescriptorProto file;
-    EXPECT_FALSE(forward_merged_.FindFileByName("no_such.proto", &file));
-  }
-}
-
-TEST_F(MergedDescriptorDatabaseTest, FindFileContainingSymbol) {
-  {
-    // Can find file that is only in database1_.
-    FileDescriptorProto file;
-    EXPECT_TRUE(forward_merged_.FindFileContainingSymbol("Foo", &file));
-    EXPECT_EQ("foo.proto", file.name());
-    ExpectContainsType(file, "Foo");
-  }
-
-  {
-    // Can find file that is only in database2_.
-    FileDescriptorProto file;
-    EXPECT_TRUE(forward_merged_.FindFileContainingSymbol("Bar", &file));
-    EXPECT_EQ("bar.proto", file.name());
-    ExpectContainsType(file, "Bar");
-  }
-
-  {
-    // In forward_merged_, database1_'s baz.proto takes precedence.
-    FileDescriptorProto file;
-    EXPECT_TRUE(forward_merged_.FindFileContainingSymbol("Baz", &file));
-    EXPECT_EQ("baz.proto", file.name());
-    ExpectContainsType(file, "FromPool1");
-  }
-
-  {
-    // In reverse_merged_, database2_'s baz.proto takes precedence.
-    FileDescriptorProto file;
-    EXPECT_TRUE(reverse_merged_.FindFileContainingSymbol("Baz", &file));
-    EXPECT_EQ("baz.proto", file.name());
-    ExpectContainsType(file, "FromPool2");
-  }
-
-  {
-    // FromPool1 only shows up in forward_merged_ because it is masked by
-    // database2_'s baz.proto in reverse_merged_.
-    FileDescriptorProto file;
-    EXPECT_TRUE(forward_merged_.FindFileContainingSymbol("FromPool1", &file));
-    EXPECT_FALSE(reverse_merged_.FindFileContainingSymbol("FromPool1", &file));
-  }
-
-  {
-    // Can't find non-existent symbol.
-    FileDescriptorProto file;
-    EXPECT_FALSE(forward_merged_.FindFileContainingSymbol("NoSuchType", &file));
-  }
-}
-
-TEST_F(MergedDescriptorDatabaseTest, FindFileContainingExtension) {
-  {
-    // Can find file that is only in database1_.
-    FileDescriptorProto file;
-    EXPECT_TRUE(forward_merged_.FindFileContainingExtension("Foo", 3, &file));
-    EXPECT_EQ("foo.proto", file.name());
-    ExpectContainsType(file, "Foo");
-  }
-
-  {
-    // Can find file that is only in database2_.
-    FileDescriptorProto file;
-    EXPECT_TRUE(forward_merged_.FindFileContainingExtension("Bar", 5, &file));
-    EXPECT_EQ("bar.proto", file.name());
-    ExpectContainsType(file, "Bar");
-  }
-
-  {
-    // In forward_merged_, database1_'s baz.proto takes precedence.
-    FileDescriptorProto file;
-    EXPECT_TRUE(forward_merged_.FindFileContainingExtension("Baz", 12, &file));
-    EXPECT_EQ("baz.proto", file.name());
-    ExpectContainsType(file, "FromPool1");
-  }
-
-  {
-    // In reverse_merged_, database2_'s baz.proto takes precedence.
-    FileDescriptorProto file;
-    EXPECT_TRUE(reverse_merged_.FindFileContainingExtension("Baz", 12, &file));
-    EXPECT_EQ("baz.proto", file.name());
-    ExpectContainsType(file, "FromPool2");
-  }
-
-  {
-    // Baz's extension 13 only shows up in forward_merged_ because it is
-    // masked by database2_'s baz.proto in reverse_merged_.
-    FileDescriptorProto file;
-    EXPECT_TRUE(forward_merged_.FindFileContainingExtension("Baz", 13, &file));
-    EXPECT_FALSE(reverse_merged_.FindFileContainingExtension("Baz", 13, &file));
-  }
-
-  {
-    // Can't find non-existent extension.
-    FileDescriptorProto file;
-    EXPECT_FALSE(forward_merged_.FindFileContainingExtension("Foo", 6, &file));
-  }
-}
-
-TEST_F(MergedDescriptorDatabaseTest, FindAllExtensionNumbers) {
-  {
-    // Message only has extension in database1_
-    std::vector<int> numbers;
-    EXPECT_TRUE(forward_merged_.FindAllExtensionNumbers("Foo", &numbers));
-    ASSERT_EQ(1, numbers.size());
-    EXPECT_EQ(3, numbers[0]);
-  }
-
-  {
-    // Message only has extension in database2_
-    std::vector<int> numbers;
-    EXPECT_TRUE(forward_merged_.FindAllExtensionNumbers("Bar", &numbers));
-    ASSERT_EQ(1, numbers.size());
-    EXPECT_EQ(5, numbers[0]);
-  }
-
-  {
-    // Merge results from the two databases.
-    std::vector<int> numbers;
-    EXPECT_TRUE(forward_merged_.FindAllExtensionNumbers("Baz", &numbers));
-    ASSERT_EQ(2, numbers.size());
-    std::sort(numbers.begin(), numbers.end());
-    EXPECT_EQ(12, numbers[0]);
-    EXPECT_EQ(13, numbers[1]);
-  }
-
-  {
-    std::vector<int> numbers;
-    EXPECT_TRUE(reverse_merged_.FindAllExtensionNumbers("Baz", &numbers));
-    ASSERT_EQ(2, numbers.size());
-    std::sort(numbers.begin(), numbers.end());
-    EXPECT_EQ(12, numbers[0]);
-    EXPECT_EQ(13, numbers[1]);
-  }
-
-  {
-    // Can't find extensions for a non-existent message.
-    std::vector<int> numbers;
-    EXPECT_FALSE(reverse_merged_.FindAllExtensionNumbers("Blah", &numbers));
-  }
-}
-
-TEST_F(MergedDescriptorDatabaseTest, FindAllFileNames) {
-  std::vector<std::string> files;
-  EXPECT_TRUE(forward_merged_.FindAllFileNames(&files));
-  EXPECT_THAT(files, ::testing::UnorderedElementsAre("foo.proto", "bar.proto",
-                                                     "baz.proto", "baz.proto"));
-}
-
-
-}  // anonymous namespace
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/descriptor_unittest.cc b/libs/protobuf/src/google/protobuf/descriptor_unittest.cc
deleted file mode 100644
index dc47531..0000000
--- a/libs/protobuf/src/google/protobuf/descriptor_unittest.cc
+++ /dev/null
@@ -1,8430 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-//
-// This file makes extensive use of RFC 3092.  :)
-
-#include <limits>
-#include <memory>
-#include <vector>
-
-#include <google/protobuf/any.pb.h>
-#include <google/protobuf/compiler/importer.h>
-#include <google/protobuf/compiler/parser.h>
-#include <google/protobuf/unittest.pb.h>
-#include <google/protobuf/unittest_custom_options.pb.h>
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/stubs/logging.h>
-#include <google/protobuf/stubs/stringprintf.h>
-#include <google/protobuf/unittest_lazy_dependencies.pb.h>
-#include <google/protobuf/unittest_proto3_arena.pb.h>
-#include <google/protobuf/io/tokenizer.h>
-#include <google/protobuf/io/zero_copy_stream_impl.h>
-#include <google/protobuf/descriptor.pb.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/descriptor_database.h>
-#include <google/protobuf/dynamic_message.h>
-#include <google/protobuf/text_format.h>
-#include <google/protobuf/stubs/strutil.h>
-#include <gmock/gmock.h>
-#include <google/protobuf/testing/googletest.h>
-#include <gtest/gtest.h>
-#include <google/protobuf/stubs/logging.h>
-#include <google/protobuf/stubs/substitute.h>
-
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-using ::testing::AnyOf;
-
-namespace google {
-namespace protobuf {
-
-// Can't use an anonymous namespace here due to brokenness of Tru64 compiler.
-namespace descriptor_unittest {
-
-// Some helpers to make assembling descriptors faster.
-DescriptorProto* AddMessage(FileDescriptorProto* file,
-                            const std::string& name) {
-  DescriptorProto* result = file->add_message_type();
-  result->set_name(name);
-  return result;
-}
-
-DescriptorProto* AddNestedMessage(DescriptorProto* parent,
-                                  const std::string& name) {
-  DescriptorProto* result = parent->add_nested_type();
-  result->set_name(name);
-  return result;
-}
-
-EnumDescriptorProto* AddEnum(FileDescriptorProto* file,
-                             const std::string& name) {
-  EnumDescriptorProto* result = file->add_enum_type();
-  result->set_name(name);
-  return result;
-}
-
-EnumDescriptorProto* AddNestedEnum(DescriptorProto* parent,
-                                   const std::string& name) {
-  EnumDescriptorProto* result = parent->add_enum_type();
-  result->set_name(name);
-  return result;
-}
-
-ServiceDescriptorProto* AddService(FileDescriptorProto* file,
-                                   const std::string& name) {
-  ServiceDescriptorProto* result = file->add_service();
-  result->set_name(name);
-  return result;
-}
-
-FieldDescriptorProto* AddField(DescriptorProto* parent, const std::string& name,
-                               int number, FieldDescriptorProto::Label label,
-                               FieldDescriptorProto::Type type) {
-  FieldDescriptorProto* result = parent->add_field();
-  result->set_name(name);
-  result->set_number(number);
-  result->set_label(label);
-  result->set_type(type);
-  return result;
-}
-
-FieldDescriptorProto* AddExtension(FileDescriptorProto* file,
-                                   const std::string& extendee,
-                                   const std::string& name, int number,
-                                   FieldDescriptorProto::Label label,
-                                   FieldDescriptorProto::Type type) {
-  FieldDescriptorProto* result = file->add_extension();
-  result->set_name(name);
-  result->set_number(number);
-  result->set_label(label);
-  result->set_type(type);
-  result->set_extendee(extendee);
-  return result;
-}
-
-FieldDescriptorProto* AddNestedExtension(DescriptorProto* parent,
-                                         const std::string& extendee,
-                                         const std::string& name, int number,
-                                         FieldDescriptorProto::Label label,
-                                         FieldDescriptorProto::Type type) {
-  FieldDescriptorProto* result = parent->add_extension();
-  result->set_name(name);
-  result->set_number(number);
-  result->set_label(label);
-  result->set_type(type);
-  result->set_extendee(extendee);
-  return result;
-}
-
-DescriptorProto::ExtensionRange* AddExtensionRange(DescriptorProto* parent,
-                                                   int start, int end) {
-  DescriptorProto::ExtensionRange* result = parent->add_extension_range();
-  result->set_start(start);
-  result->set_end(end);
-  return result;
-}
-
-DescriptorProto::ReservedRange* AddReservedRange(DescriptorProto* parent,
-                                                 int start, int end) {
-  DescriptorProto::ReservedRange* result = parent->add_reserved_range();
-  result->set_start(start);
-  result->set_end(end);
-  return result;
-}
-
-EnumDescriptorProto::EnumReservedRange* AddReservedRange(
-    EnumDescriptorProto* parent, int start, int end) {
-  EnumDescriptorProto::EnumReservedRange* result = parent->add_reserved_range();
-  result->set_start(start);
-  result->set_end(end);
-  return result;
-}
-
-EnumValueDescriptorProto* AddEnumValue(EnumDescriptorProto* enum_proto,
-                                       const std::string& name, int number) {
-  EnumValueDescriptorProto* result = enum_proto->add_value();
-  result->set_name(name);
-  result->set_number(number);
-  return result;
-}
-
-MethodDescriptorProto* AddMethod(ServiceDescriptorProto* service,
-                                 const std::string& name,
-                                 const std::string& input_type,
-                                 const std::string& output_type) {
-  MethodDescriptorProto* result = service->add_method();
-  result->set_name(name);
-  result->set_input_type(input_type);
-  result->set_output_type(output_type);
-  return result;
-}
-
-// Empty enums technically aren't allowed.  We need to insert a dummy value
-// into them.
-void AddEmptyEnum(FileDescriptorProto* file, const std::string& name) {
-  AddEnumValue(AddEnum(file, name), name + "_DUMMY", 1);
-}
-
-class MockErrorCollector : public DescriptorPool::ErrorCollector {
- public:
-  MockErrorCollector() {}
-  ~MockErrorCollector() override {}
-
-  std::string text_;
-  std::string warning_text_;
-
-  // implements ErrorCollector ---------------------------------------
-  void AddError(const std::string& filename, const std::string& element_name,
-                const Message* descriptor, ErrorLocation location,
-                const std::string& message) override {
-    const char* location_name = nullptr;
-    switch (location) {
-      case NAME:
-        location_name = "NAME";
-        break;
-      case NUMBER:
-        location_name = "NUMBER";
-        break;
-      case TYPE:
-        location_name = "TYPE";
-        break;
-      case EXTENDEE:
-        location_name = "EXTENDEE";
-        break;
-      case DEFAULT_VALUE:
-        location_name = "DEFAULT_VALUE";
-        break;
-      case OPTION_NAME:
-        location_name = "OPTION_NAME";
-        break;
-      case OPTION_VALUE:
-        location_name = "OPTION_VALUE";
-        break;
-      case INPUT_TYPE:
-        location_name = "INPUT_TYPE";
-        break;
-      case OUTPUT_TYPE:
-        location_name = "OUTPUT_TYPE";
-        break;
-      case IMPORT:
-        location_name = "IMPORT";
-        break;
-      case OTHER:
-        location_name = "OTHER";
-        break;
-    }
-
-    strings::SubstituteAndAppend(&text_, "$0: $1: $2: $3\n", filename,
-                              element_name, location_name, message);
-  }
-
-  // implements ErrorCollector ---------------------------------------
-  void AddWarning(const std::string& filename, const std::string& element_name,
-                  const Message* descriptor, ErrorLocation location,
-                  const std::string& message) override {
-    const char* location_name = nullptr;
-    switch (location) {
-      case NAME:
-        location_name = "NAME";
-        break;
-      case NUMBER:
-        location_name = "NUMBER";
-        break;
-      case TYPE:
-        location_name = "TYPE";
-        break;
-      case EXTENDEE:
-        location_name = "EXTENDEE";
-        break;
-      case DEFAULT_VALUE:
-        location_name = "DEFAULT_VALUE";
-        break;
-      case OPTION_NAME:
-        location_name = "OPTION_NAME";
-        break;
-      case OPTION_VALUE:
-        location_name = "OPTION_VALUE";
-        break;
-      case INPUT_TYPE:
-        location_name = "INPUT_TYPE";
-        break;
-      case OUTPUT_TYPE:
-        location_name = "OUTPUT_TYPE";
-        break;
-      case IMPORT:
-        location_name = "IMPORT";
-        break;
-      case OTHER:
-        location_name = "OTHER";
-        break;
-    }
-
-    strings::SubstituteAndAppend(&warning_text_, "$0: $1: $2: $3\n", filename,
-                              element_name, location_name, message);
-  }
-};
-
-// ===================================================================
-
-// Test simple files.
-class FileDescriptorTest : public testing::Test {
- protected:
-  void SetUp() override {
-    // Build descriptors for the following definitions:
-    //
-    //   // in "foo.proto"
-    //   message FooMessage { extensions 1; }
-    //   enum FooEnum {FOO_ENUM_VALUE = 1;}
-    //   service FooService {}
-    //   extend FooMessage { optional int32 foo_extension = 1; }
-    //
-    //   // in "bar.proto"
-    //   package bar_package;
-    //   message BarMessage { extensions 1; }
-    //   enum BarEnum {BAR_ENUM_VALUE = 1;}
-    //   service BarService {}
-    //   extend BarMessage { optional int32 bar_extension = 1; }
-    //
-    // Also, we have an empty file "baz.proto".  This file's purpose is to
-    // make sure that even though it has the same package as foo.proto,
-    // searching it for members of foo.proto won't work.
-
-    FileDescriptorProto foo_file;
-    foo_file.set_name("foo.proto");
-    AddExtensionRange(AddMessage(&foo_file, "FooMessage"), 1, 2);
-    AddEnumValue(AddEnum(&foo_file, "FooEnum"), "FOO_ENUM_VALUE", 1);
-    AddService(&foo_file, "FooService");
-    AddExtension(&foo_file, "FooMessage", "foo_extension", 1,
-                 FieldDescriptorProto::LABEL_OPTIONAL,
-                 FieldDescriptorProto::TYPE_INT32);
-
-    FileDescriptorProto bar_file;
-    bar_file.set_name("bar.proto");
-    bar_file.set_package("bar_package");
-    bar_file.add_dependency("foo.proto");
-    AddExtensionRange(AddMessage(&bar_file, "BarMessage"), 1, 2);
-    AddEnumValue(AddEnum(&bar_file, "BarEnum"), "BAR_ENUM_VALUE", 1);
-    AddService(&bar_file, "BarService");
-    AddExtension(&bar_file, "bar_package.BarMessage", "bar_extension", 1,
-                 FieldDescriptorProto::LABEL_OPTIONAL,
-                 FieldDescriptorProto::TYPE_INT32);
-
-    FileDescriptorProto baz_file;
-    baz_file.set_name("baz.proto");
-
-    // Build the descriptors and get the pointers.
-    foo_file_ = pool_.BuildFile(foo_file);
-    ASSERT_TRUE(foo_file_ != nullptr);
-
-    bar_file_ = pool_.BuildFile(bar_file);
-    ASSERT_TRUE(bar_file_ != nullptr);
-
-    baz_file_ = pool_.BuildFile(baz_file);
-    ASSERT_TRUE(baz_file_ != nullptr);
-
-    ASSERT_EQ(1, foo_file_->message_type_count());
-    foo_message_ = foo_file_->message_type(0);
-    ASSERT_EQ(1, foo_file_->enum_type_count());
-    foo_enum_ = foo_file_->enum_type(0);
-    ASSERT_EQ(1, foo_enum_->value_count());
-    foo_enum_value_ = foo_enum_->value(0);
-    ASSERT_EQ(1, foo_file_->service_count());
-    foo_service_ = foo_file_->service(0);
-    ASSERT_EQ(1, foo_file_->extension_count());
-    foo_extension_ = foo_file_->extension(0);
-
-    ASSERT_EQ(1, bar_file_->message_type_count());
-    bar_message_ = bar_file_->message_type(0);
-    ASSERT_EQ(1, bar_file_->enum_type_count());
-    bar_enum_ = bar_file_->enum_type(0);
-    ASSERT_EQ(1, bar_enum_->value_count());
-    bar_enum_value_ = bar_enum_->value(0);
-    ASSERT_EQ(1, bar_file_->service_count());
-    bar_service_ = bar_file_->service(0);
-    ASSERT_EQ(1, bar_file_->extension_count());
-    bar_extension_ = bar_file_->extension(0);
-  }
-
-  DescriptorPool pool_;
-
-  const FileDescriptor* foo_file_;
-  const FileDescriptor* bar_file_;
-  const FileDescriptor* baz_file_;
-
-  const Descriptor* foo_message_;
-  const EnumDescriptor* foo_enum_;
-  const EnumValueDescriptor* foo_enum_value_;
-  const ServiceDescriptor* foo_service_;
-  const FieldDescriptor* foo_extension_;
-
-  const Descriptor* bar_message_;
-  const EnumDescriptor* bar_enum_;
-  const EnumValueDescriptor* bar_enum_value_;
-  const ServiceDescriptor* bar_service_;
-  const FieldDescriptor* bar_extension_;
-};
-
-TEST_F(FileDescriptorTest, Name) {
-  EXPECT_EQ("foo.proto", foo_file_->name());
-  EXPECT_EQ("bar.proto", bar_file_->name());
-  EXPECT_EQ("baz.proto", baz_file_->name());
-}
-
-TEST_F(FileDescriptorTest, Package) {
-  EXPECT_EQ("", foo_file_->package());
-  EXPECT_EQ("bar_package", bar_file_->package());
-}
-
-TEST_F(FileDescriptorTest, Dependencies) {
-  EXPECT_EQ(0, foo_file_->dependency_count());
-  EXPECT_EQ(1, bar_file_->dependency_count());
-  EXPECT_EQ(foo_file_, bar_file_->dependency(0));
-}
-
-TEST_F(FileDescriptorTest, FindMessageTypeByName) {
-  EXPECT_EQ(foo_message_, foo_file_->FindMessageTypeByName("FooMessage"));
-  EXPECT_EQ(bar_message_, bar_file_->FindMessageTypeByName("BarMessage"));
-
-  EXPECT_TRUE(foo_file_->FindMessageTypeByName("BarMessage") == nullptr);
-  EXPECT_TRUE(bar_file_->FindMessageTypeByName("FooMessage") == nullptr);
-  EXPECT_TRUE(baz_file_->FindMessageTypeByName("FooMessage") == nullptr);
-
-  EXPECT_TRUE(foo_file_->FindMessageTypeByName("NoSuchMessage") == nullptr);
-  EXPECT_TRUE(foo_file_->FindMessageTypeByName("FooEnum") == nullptr);
-}
-
-TEST_F(FileDescriptorTest, FindEnumTypeByName) {
-  EXPECT_EQ(foo_enum_, foo_file_->FindEnumTypeByName("FooEnum"));
-  EXPECT_EQ(bar_enum_, bar_file_->FindEnumTypeByName("BarEnum"));
-
-  EXPECT_TRUE(foo_file_->FindEnumTypeByName("BarEnum") == nullptr);
-  EXPECT_TRUE(bar_file_->FindEnumTypeByName("FooEnum") == nullptr);
-  EXPECT_TRUE(baz_file_->FindEnumTypeByName("FooEnum") == nullptr);
-
-  EXPECT_TRUE(foo_file_->FindEnumTypeByName("NoSuchEnum") == nullptr);
-  EXPECT_TRUE(foo_file_->FindEnumTypeByName("FooMessage") == nullptr);
-}
-
-TEST_F(FileDescriptorTest, FindEnumValueByName) {
-  EXPECT_EQ(foo_enum_value_, foo_file_->FindEnumValueByName("FOO_ENUM_VALUE"));
-  EXPECT_EQ(bar_enum_value_, bar_file_->FindEnumValueByName("BAR_ENUM_VALUE"));
-
-  EXPECT_TRUE(foo_file_->FindEnumValueByName("BAR_ENUM_VALUE") == nullptr);
-  EXPECT_TRUE(bar_file_->FindEnumValueByName("FOO_ENUM_VALUE") == nullptr);
-  EXPECT_TRUE(baz_file_->FindEnumValueByName("FOO_ENUM_VALUE") == nullptr);
-
-  EXPECT_TRUE(foo_file_->FindEnumValueByName("NO_SUCH_VALUE") == nullptr);
-  EXPECT_TRUE(foo_file_->FindEnumValueByName("FooMessage") == nullptr);
-}
-
-TEST_F(FileDescriptorTest, FindServiceByName) {
-  EXPECT_EQ(foo_service_, foo_file_->FindServiceByName("FooService"));
-  EXPECT_EQ(bar_service_, bar_file_->FindServiceByName("BarService"));
-
-  EXPECT_TRUE(foo_file_->FindServiceByName("BarService") == nullptr);
-  EXPECT_TRUE(bar_file_->FindServiceByName("FooService") == nullptr);
-  EXPECT_TRUE(baz_file_->FindServiceByName("FooService") == nullptr);
-
-  EXPECT_TRUE(foo_file_->FindServiceByName("NoSuchService") == nullptr);
-  EXPECT_TRUE(foo_file_->FindServiceByName("FooMessage") == nullptr);
-}
-
-TEST_F(FileDescriptorTest, FindExtensionByName) {
-  EXPECT_EQ(foo_extension_, foo_file_->FindExtensionByName("foo_extension"));
-  EXPECT_EQ(bar_extension_, bar_file_->FindExtensionByName("bar_extension"));
-
-  EXPECT_TRUE(foo_file_->FindExtensionByName("bar_extension") == nullptr);
-  EXPECT_TRUE(bar_file_->FindExtensionByName("foo_extension") == nullptr);
-  EXPECT_TRUE(baz_file_->FindExtensionByName("foo_extension") == nullptr);
-
-  EXPECT_TRUE(foo_file_->FindExtensionByName("no_such_extension") == nullptr);
-  EXPECT_TRUE(foo_file_->FindExtensionByName("FooMessage") == nullptr);
-}
-
-TEST_F(FileDescriptorTest, FindExtensionByNumber) {
-  EXPECT_EQ(foo_extension_, pool_.FindExtensionByNumber(foo_message_, 1));
-  EXPECT_EQ(bar_extension_, pool_.FindExtensionByNumber(bar_message_, 1));
-
-  EXPECT_TRUE(pool_.FindExtensionByNumber(foo_message_, 2) == nullptr);
-}
-
-
-TEST_F(FileDescriptorTest, BuildAgain) {
-  // Test that if we call BuildFile again on the same input we get the same
-  // FileDescriptor back.
-  FileDescriptorProto file;
-  foo_file_->CopyTo(&file);
-  EXPECT_EQ(foo_file_, pool_.BuildFile(file));
-
-  // But if we change the file then it won't work.
-  file.set_package("some.other.package");
-  EXPECT_TRUE(pool_.BuildFile(file) == nullptr);
-}
-
-TEST_F(FileDescriptorTest, BuildAgainWithSyntax) {
-  // Test that if we call BuildFile again on the same input we get the same
-  // FileDescriptor back even if syntax param is specified.
-  FileDescriptorProto proto_syntax2;
-  proto_syntax2.set_name("foo_syntax2");
-  proto_syntax2.set_syntax("proto2");
-
-  const FileDescriptor* proto2_descriptor = pool_.BuildFile(proto_syntax2);
-  EXPECT_TRUE(proto2_descriptor != nullptr);
-  EXPECT_EQ(proto2_descriptor, pool_.BuildFile(proto_syntax2));
-
-  FileDescriptorProto implicit_proto2;
-  implicit_proto2.set_name("foo_implicit_syntax2");
-
-  const FileDescriptor* implicit_proto2_descriptor =
-      pool_.BuildFile(implicit_proto2);
-  EXPECT_TRUE(implicit_proto2_descriptor != nullptr);
-  // We get the same FileDescriptor back if syntax param is explicitly
-  // specified.
-  implicit_proto2.set_syntax("proto2");
-  EXPECT_EQ(implicit_proto2_descriptor, pool_.BuildFile(implicit_proto2));
-
-  FileDescriptorProto proto_syntax3;
-  proto_syntax3.set_name("foo_syntax3");
-  proto_syntax3.set_syntax("proto3");
-
-  const FileDescriptor* proto3_descriptor = pool_.BuildFile(proto_syntax3);
-  EXPECT_TRUE(proto3_descriptor != nullptr);
-  EXPECT_EQ(proto3_descriptor, pool_.BuildFile(proto_syntax3));
-}
-
-TEST_F(FileDescriptorTest, Syntax) {
-  FileDescriptorProto proto;
-  proto.set_name("foo");
-  // Enable the test when we also populate the syntax for proto2.
-#if 0
-  {
-    proto.set_syntax("proto2");
-    DescriptorPool pool;
-    const FileDescriptor* file = pool.BuildFile(proto);
-    EXPECT_TRUE(file != nullptr);
-    EXPECT_EQ(FileDescriptor::SYNTAX_PROTO2, file->syntax());
-    FileDescriptorProto other;
-    file->CopyTo(&other);
-    EXPECT_EQ("proto2", other.syntax());
-  }
-#endif
-  {
-    proto.set_syntax("proto3");
-    DescriptorPool pool;
-    const FileDescriptor* file = pool.BuildFile(proto);
-    EXPECT_TRUE(file != nullptr);
-    EXPECT_EQ(FileDescriptor::SYNTAX_PROTO3, file->syntax());
-    FileDescriptorProto other;
-    file->CopyTo(&other);
-    EXPECT_EQ("proto3", other.syntax());
-  }
-}
-
-void ExtractDebugString(
-    const FileDescriptor* file, std::set<std::string>* visited,
-    std::vector<std::pair<std::string, std::string>>* debug_strings) {
-  if (!visited->insert(file->name()).second) {
-    return;
-  }
-  for (int i = 0; i < file->dependency_count(); ++i) {
-    ExtractDebugString(file->dependency(i), visited, debug_strings);
-  }
-  debug_strings->push_back(std::make_pair(file->name(), file->DebugString()));
-}
-
-class SimpleErrorCollector : public io::ErrorCollector {
- public:
-  // implements ErrorCollector ---------------------------------------
-  void AddError(int line, int column, const std::string& message) override {
-    last_error_ = StringPrintf("%d:%d:", line, column) + message;
-  }
-
-  const std::string& last_error() { return last_error_; }
-
- private:
-  std::string last_error_;
-};
-// Test that the result of FileDescriptor::DebugString() can be used to create
-// the original descriptors.
-TEST_F(FileDescriptorTest, DebugStringRoundTrip) {
-  std::set<std::string> visited;
-  std::vector<std::pair<std::string, std::string>> debug_strings;
-  ExtractDebugString(protobuf_unittest::TestAllTypes::descriptor()->file(),
-                     &visited, &debug_strings);
-  ExtractDebugString(
-      protobuf_unittest::TestMessageWithCustomOptions::descriptor()->file(),
-      &visited, &debug_strings);
-  ExtractDebugString(proto3_arena_unittest::TestAllTypes::descriptor()->file(),
-                     &visited, &debug_strings);
-  ASSERT_GE(debug_strings.size(), 3);
-
-  DescriptorPool pool;
-  for (int i = 0; i < debug_strings.size(); ++i) {
-    const std::string& name = debug_strings[i].first;
-    const std::string& content = debug_strings[i].second;
-    io::ArrayInputStream input_stream(content.data(), content.size());
-    SimpleErrorCollector error_collector;
-    io::Tokenizer tokenizer(&input_stream, &error_collector);
-    compiler::Parser parser;
-    parser.RecordErrorsTo(&error_collector);
-    FileDescriptorProto proto;
-    ASSERT_TRUE(parser.Parse(&tokenizer, &proto))
-        << error_collector.last_error() << "\n"
-        << content;
-    ASSERT_EQ("", error_collector.last_error());
-    proto.set_name(name);
-    const FileDescriptor* descriptor = pool.BuildFile(proto);
-    ASSERT_TRUE(descriptor != nullptr) << proto.DebugString();
-    EXPECT_EQ(content, descriptor->DebugString());
-  }
-}
-
-// ===================================================================
-
-// Test simple flat messages and fields.
-class DescriptorTest : public testing::Test {
- protected:
-  void SetUp() override {
-    // Build descriptors for the following definitions:
-    //
-    //   // in "foo.proto"
-    //   message TestForeign {}
-    //   enum TestEnum {}
-    //
-    //   message TestMessage {
-    //     required string      foo = 1;
-    //     optional TestEnum    bar = 6;
-    //     repeated TestForeign baz = 500000000;
-    //     optional group       moo = 15 {}
-    //   }
-    //
-    //   // in "bar.proto"
-    //   package corge.grault;
-    //   message TestMessage2 {
-    //     required string foo = 1;
-    //     required string bar = 2;
-    //     required string mooo = 6;
-    //   }
-    //
-    //   // in "map.proto"
-    //   message TestMessage3 {
-    //     map<int32, int32> map_int32_int32 = 1;
-    //   }
-    //
-    //   // in "json.proto"
-    //   message TestMessage4 {
-    //     optional int32 field_name1 = 1;
-    //     optional int32 fieldName2 = 2;
-    //     optional int32 FieldName3 = 3;
-    //     optional int32 _field_name4 = 4;
-    //     optional int32 FIELD_NAME5 = 5;
-    //     optional int32 field_name6 = 6 [json_name = "@type"];
-    //   }
-    //
-    // We cheat and use TestForeign as the type for moo rather than create
-    // an actual nested type.
-    //
-    // Since all primitive types (including string) use the same building
-    // code, there's no need to test each one individually.
-    //
-    // TestMessage2 is primarily here to test FindFieldByName and friends.
-    // All messages created from the same DescriptorPool share the same lookup
-    // table, so we need to insure that they don't interfere.
-
-    FileDescriptorProto foo_file;
-    foo_file.set_name("foo.proto");
-    AddMessage(&foo_file, "TestForeign");
-    AddEmptyEnum(&foo_file, "TestEnum");
-
-    DescriptorProto* message = AddMessage(&foo_file, "TestMessage");
-    AddField(message, "foo", 1, FieldDescriptorProto::LABEL_REQUIRED,
-             FieldDescriptorProto::TYPE_STRING);
-    AddField(message, "bar", 6, FieldDescriptorProto::LABEL_OPTIONAL,
-             FieldDescriptorProto::TYPE_ENUM)
-        ->set_type_name("TestEnum");
-    AddField(message, "baz", 500000000, FieldDescriptorProto::LABEL_REPEATED,
-             FieldDescriptorProto::TYPE_MESSAGE)
-        ->set_type_name("TestForeign");
-    AddField(message, "moo", 15, FieldDescriptorProto::LABEL_OPTIONAL,
-             FieldDescriptorProto::TYPE_GROUP)
-        ->set_type_name("TestForeign");
-
-    FileDescriptorProto bar_file;
-    bar_file.set_name("bar.proto");
-    bar_file.set_package("corge.grault");
-
-    DescriptorProto* message2 = AddMessage(&bar_file, "TestMessage2");
-    AddField(message2, "foo", 1, FieldDescriptorProto::LABEL_REQUIRED,
-             FieldDescriptorProto::TYPE_STRING);
-    AddField(message2, "bar", 2, FieldDescriptorProto::LABEL_REQUIRED,
-             FieldDescriptorProto::TYPE_STRING);
-    AddField(message2, "mooo", 6, FieldDescriptorProto::LABEL_REQUIRED,
-             FieldDescriptorProto::TYPE_STRING);
-
-    FileDescriptorProto map_file;
-    map_file.set_name("map.proto");
-    DescriptorProto* message3 = AddMessage(&map_file, "TestMessage3");
-
-    DescriptorProto* entry = AddNestedMessage(message3, "MapInt32Int32Entry");
-    AddField(entry, "key", 1, FieldDescriptorProto::LABEL_OPTIONAL,
-             FieldDescriptorProto::TYPE_INT32);
-    AddField(entry, "value", 2, FieldDescriptorProto::LABEL_OPTIONAL,
-             FieldDescriptorProto::TYPE_INT32);
-    entry->mutable_options()->set_map_entry(true);
-
-    AddField(message3, "map_int32_int32", 1,
-             FieldDescriptorProto::LABEL_REPEATED,
-             FieldDescriptorProto::TYPE_MESSAGE)
-        ->set_type_name("MapInt32Int32Entry");
-
-    FileDescriptorProto json_file;
-    json_file.set_name("json.proto");
-    json_file.set_syntax("proto3");
-    DescriptorProto* message4 = AddMessage(&json_file, "TestMessage4");
-    AddField(message4, "field_name1", 1, FieldDescriptorProto::LABEL_OPTIONAL,
-             FieldDescriptorProto::TYPE_INT32);
-    AddField(message4, "fieldName2", 2, FieldDescriptorProto::LABEL_OPTIONAL,
-             FieldDescriptorProto::TYPE_INT32);
-    AddField(message4, "FieldName3", 3, FieldDescriptorProto::LABEL_OPTIONAL,
-             FieldDescriptorProto::TYPE_INT32);
-    AddField(message4, "_field_name4", 4, FieldDescriptorProto::LABEL_OPTIONAL,
-             FieldDescriptorProto::TYPE_INT32);
-    AddField(message4, "FIELD_NAME5", 5, FieldDescriptorProto::LABEL_OPTIONAL,
-             FieldDescriptorProto::TYPE_INT32);
-    AddField(message4, "field_name6", 6, FieldDescriptorProto::LABEL_OPTIONAL,
-             FieldDescriptorProto::TYPE_INT32)
-        ->set_json_name("@type");
-    AddField(message4, "fieldname7", 7, FieldDescriptorProto::LABEL_OPTIONAL,
-             FieldDescriptorProto::TYPE_INT32);
-
-    // Build the descriptors and get the pointers.
-    foo_file_ = pool_.BuildFile(foo_file);
-    ASSERT_TRUE(foo_file_ != nullptr);
-
-    bar_file_ = pool_.BuildFile(bar_file);
-    ASSERT_TRUE(bar_file_ != nullptr);
-
-    map_file_ = pool_.BuildFile(map_file);
-    ASSERT_TRUE(map_file_ != nullptr);
-
-    json_file_ = pool_.BuildFile(json_file);
-    ASSERT_TRUE(json_file_ != nullptr);
-
-    ASSERT_EQ(1, foo_file_->enum_type_count());
-    enum_ = foo_file_->enum_type(0);
-
-    ASSERT_EQ(2, foo_file_->message_type_count());
-    foreign_ = foo_file_->message_type(0);
-    message_ = foo_file_->message_type(1);
-
-    ASSERT_EQ(4, message_->field_count());
-    foo_ = message_->field(0);
-    bar_ = message_->field(1);
-    baz_ = message_->field(2);
-    moo_ = message_->field(3);
-
-    ASSERT_EQ(1, bar_file_->message_type_count());
-    message2_ = bar_file_->message_type(0);
-
-    ASSERT_EQ(3, message2_->field_count());
-    foo2_ = message2_->field(0);
-    bar2_ = message2_->field(1);
-    mooo2_ = message2_->field(2);
-
-    ASSERT_EQ(1, map_file_->message_type_count());
-    message3_ = map_file_->message_type(0);
-
-    ASSERT_EQ(1, message3_->field_count());
-    map_ = message3_->field(0);
-
-    ASSERT_EQ(1, json_file_->message_type_count());
-    message4_ = json_file_->message_type(0);
-  }
-
-  void CopyWithJsonName(const Descriptor* message, DescriptorProto* proto) {
-    message->CopyTo(proto);
-    message->CopyJsonNameTo(proto);
-  }
-
-  const EnumValueDescriptor* FindValueByNumberCreatingIfUnknown(
-      const EnumDescriptor* desc, int number) {
-    return desc->FindValueByNumberCreatingIfUnknown(number);
-  }
-
-  DescriptorPool pool_;
-
-  const FileDescriptor* foo_file_;
-  const FileDescriptor* bar_file_;
-  const FileDescriptor* map_file_;
-  const FileDescriptor* json_file_;
-
-  const Descriptor* message_;
-  const Descriptor* message2_;
-  const Descriptor* message3_;
-  const Descriptor* message4_;
-  const Descriptor* foreign_;
-  const EnumDescriptor* enum_;
-
-  const FieldDescriptor* foo_;
-  const FieldDescriptor* bar_;
-  const FieldDescriptor* baz_;
-  const FieldDescriptor* moo_;
-
-  const FieldDescriptor* foo2_;
-  const FieldDescriptor* bar2_;
-  const FieldDescriptor* mooo2_;
-
-  const FieldDescriptor* map_;
-};
-
-TEST_F(DescriptorTest, Name) {
-  EXPECT_EQ("TestMessage", message_->name());
-  EXPECT_EQ("TestMessage", message_->full_name());
-  EXPECT_EQ(foo_file_, message_->file());
-
-  EXPECT_EQ("TestMessage2", message2_->name());
-  EXPECT_EQ("corge.grault.TestMessage2", message2_->full_name());
-  EXPECT_EQ(bar_file_, message2_->file());
-}
-
-TEST_F(DescriptorTest, ContainingType) {
-  EXPECT_TRUE(message_->containing_type() == nullptr);
-  EXPECT_TRUE(message2_->containing_type() == nullptr);
-}
-
-TEST_F(DescriptorTest, FieldNamesDedup) {
-  const auto collect_unique_names = [](const FieldDescriptor* field) {
-    std::set<std::string> names{field->name(), field->lowercase_name(),
-                                field->camelcase_name(), field->json_name()};
-    // Verify that we have the same number of string objects as we have string
-    // values. That is, duplicate names use the same std::string object.
-    // This is for memory efficiency.
-    EXPECT_EQ(names.size(), (std::set<const std::string*>{
-                                &field->name(), &field->lowercase_name(),
-                                &field->camelcase_name(), &field->json_name()}
-                                 .size()))
-        << testing::PrintToString(names);
-    return names;
-  };
-
-  using testing::ElementsAre;
-  // field_name1
-  EXPECT_THAT(collect_unique_names(message4_->field(0)),
-              ElementsAre("fieldName1", "field_name1"));
-  // fieldName2
-  EXPECT_THAT(collect_unique_names(message4_->field(1)),
-              ElementsAre("fieldName2", "fieldname2"));
-  // FieldName3
-  EXPECT_THAT(collect_unique_names(message4_->field(2)),
-              ElementsAre("FieldName3", "fieldName3", "fieldname3"));
-  // _field_name4
-  EXPECT_THAT(collect_unique_names(message4_->field(3)),
-              ElementsAre("FieldName4", "_field_name4", "fieldName4"));
-  // FIELD_NAME5
-  EXPECT_THAT(
-      collect_unique_names(message4_->field(4)),
-      ElementsAre("FIELDNAME5", "FIELD_NAME5", "fIELDNAME5", "field_name5"));
-  // field_name6, with json name @type
-  EXPECT_THAT(collect_unique_names(message4_->field(5)),
-              ElementsAre("@type", "fieldName6", "field_name6"));
-  // fieldname7
-  EXPECT_THAT(collect_unique_names(message4_->field(6)),
-              ElementsAre("fieldname7"));
-}
-
-TEST_F(DescriptorTest, FieldNameDedupJsonEqFull) {
-  // Test a regression where json_name == full_name
-  FileDescriptorProto proto;
-  proto.set_name("file");
-  auto* message = AddMessage(&proto, "Name1");
-  auto* field =
-      AddField(message, "Name2", 1, FieldDescriptorProto::LABEL_OPTIONAL,
-               FieldDescriptorProto::TYPE_INT32);
-  field->set_json_name("Name1.Name2");
-  auto* file = pool_.BuildFile(proto);
-  EXPECT_EQ(file->message_type(0)->name(), "Name1");
-  EXPECT_EQ(file->message_type(0)->field(0)->name(), "Name2");
-  EXPECT_EQ(file->message_type(0)->field(0)->full_name(), "Name1.Name2");
-  EXPECT_EQ(file->message_type(0)->field(0)->json_name(), "Name1.Name2");
-}
-
-TEST_F(DescriptorTest, FieldsByIndex) {
-  ASSERT_EQ(4, message_->field_count());
-  EXPECT_EQ(foo_, message_->field(0));
-  EXPECT_EQ(bar_, message_->field(1));
-  EXPECT_EQ(baz_, message_->field(2));
-  EXPECT_EQ(moo_, message_->field(3));
-}
-
-TEST_F(DescriptorTest, FindFieldByName) {
-  // All messages in the same DescriptorPool share a single lookup table for
-  // fields.  So, in addition to testing that FindFieldByName finds the fields
-  // of the message, we need to test that it does *not* find the fields of
-  // *other* messages.
-
-  EXPECT_EQ(foo_, message_->FindFieldByName("foo"));
-  EXPECT_EQ(bar_, message_->FindFieldByName("bar"));
-  EXPECT_EQ(baz_, message_->FindFieldByName("baz"));
-  EXPECT_EQ(moo_, message_->FindFieldByName("moo"));
-  EXPECT_TRUE(message_->FindFieldByName("no_such_field") == nullptr);
-  EXPECT_TRUE(message_->FindFieldByName("mooo") == nullptr);
-
-  EXPECT_EQ(foo2_, message2_->FindFieldByName("foo"));
-  EXPECT_EQ(bar2_, message2_->FindFieldByName("bar"));
-  EXPECT_EQ(mooo2_, message2_->FindFieldByName("mooo"));
-  EXPECT_TRUE(message2_->FindFieldByName("baz") == nullptr);
-  EXPECT_TRUE(message2_->FindFieldByName("moo") == nullptr);
-}
-
-TEST_F(DescriptorTest, FindFieldByNumber) {
-  EXPECT_EQ(foo_, message_->FindFieldByNumber(1));
-  EXPECT_EQ(bar_, message_->FindFieldByNumber(6));
-  EXPECT_EQ(baz_, message_->FindFieldByNumber(500000000));
-  EXPECT_EQ(moo_, message_->FindFieldByNumber(15));
-  EXPECT_TRUE(message_->FindFieldByNumber(837592) == nullptr);
-  EXPECT_TRUE(message_->FindFieldByNumber(2) == nullptr);
-
-  EXPECT_EQ(foo2_, message2_->FindFieldByNumber(1));
-  EXPECT_EQ(bar2_, message2_->FindFieldByNumber(2));
-  EXPECT_EQ(mooo2_, message2_->FindFieldByNumber(6));
-  EXPECT_TRUE(message2_->FindFieldByNumber(15) == nullptr);
-  EXPECT_TRUE(message2_->FindFieldByNumber(500000000) == nullptr);
-}
-
-TEST_F(DescriptorTest, FieldName) {
-  EXPECT_EQ("foo", foo_->name());
-  EXPECT_EQ("bar", bar_->name());
-  EXPECT_EQ("baz", baz_->name());
-  EXPECT_EQ("moo", moo_->name());
-}
-
-TEST_F(DescriptorTest, FieldFullName) {
-  EXPECT_EQ("TestMessage.foo", foo_->full_name());
-  EXPECT_EQ("TestMessage.bar", bar_->full_name());
-  EXPECT_EQ("TestMessage.baz", baz_->full_name());
-  EXPECT_EQ("TestMessage.moo", moo_->full_name());
-
-  EXPECT_EQ("corge.grault.TestMessage2.foo", foo2_->full_name());
-  EXPECT_EQ("corge.grault.TestMessage2.bar", bar2_->full_name());
-  EXPECT_EQ("corge.grault.TestMessage2.mooo", mooo2_->full_name());
-}
-
-TEST_F(DescriptorTest, PrintableNameIsFullNameForNonExtensionFields) {
-  EXPECT_EQ("TestMessage.foo", foo_->PrintableNameForExtension());
-  EXPECT_EQ("TestMessage.bar", bar_->PrintableNameForExtension());
-  EXPECT_EQ("TestMessage.baz", baz_->PrintableNameForExtension());
-  EXPECT_EQ("TestMessage.moo", moo_->PrintableNameForExtension());
-
-  EXPECT_EQ("corge.grault.TestMessage2.foo",
-            foo2_->PrintableNameForExtension());
-  EXPECT_EQ("corge.grault.TestMessage2.bar",
-            bar2_->PrintableNameForExtension());
-  EXPECT_EQ("corge.grault.TestMessage2.mooo",
-            mooo2_->PrintableNameForExtension());
-}
-
-TEST_F(DescriptorTest, PrintableNameIsFullNameForNonMessageSetExtension) {
-  EXPECT_EQ("protobuf_unittest.Aggregate.nested",
-            protobuf_unittest::Aggregate::descriptor()
-                ->FindExtensionByName("nested")
-                ->PrintableNameForExtension());
-}
-
-TEST_F(DescriptorTest, PrintableNameIsExtendingTypeForMessageSetExtension) {
-  EXPECT_EQ("protobuf_unittest.AggregateMessageSetElement",
-            protobuf_unittest::AggregateMessageSetElement::descriptor()
-                ->FindExtensionByName("message_set_extension")
-                ->PrintableNameForExtension());
-}
-
-TEST_F(DescriptorTest, FieldJsonName) {
-  EXPECT_EQ("fieldName1", message4_->field(0)->json_name());
-  EXPECT_EQ("fieldName2", message4_->field(1)->json_name());
-  EXPECT_EQ("FieldName3", message4_->field(2)->json_name());
-  EXPECT_EQ("FieldName4", message4_->field(3)->json_name());
-  EXPECT_EQ("FIELDNAME5", message4_->field(4)->json_name());
-  EXPECT_EQ("@type", message4_->field(5)->json_name());
-
-  DescriptorProto proto;
-  message4_->CopyTo(&proto);
-  ASSERT_EQ(7, proto.field_size());
-  EXPECT_FALSE(proto.field(0).has_json_name());
-  EXPECT_FALSE(proto.field(1).has_json_name());
-  EXPECT_FALSE(proto.field(2).has_json_name());
-  EXPECT_FALSE(proto.field(3).has_json_name());
-  EXPECT_FALSE(proto.field(4).has_json_name());
-  EXPECT_EQ("@type", proto.field(5).json_name());
-  EXPECT_FALSE(proto.field(6).has_json_name());
-
-  proto.Clear();
-  CopyWithJsonName(message4_, &proto);
-  ASSERT_EQ(7, proto.field_size());
-  EXPECT_EQ("fieldName1", proto.field(0).json_name());
-  EXPECT_EQ("fieldName2", proto.field(1).json_name());
-  EXPECT_EQ("FieldName3", proto.field(2).json_name());
-  EXPECT_EQ("FieldName4", proto.field(3).json_name());
-  EXPECT_EQ("FIELDNAME5", proto.field(4).json_name());
-  EXPECT_EQ("@type", proto.field(5).json_name());
-  EXPECT_EQ("fieldname7", proto.field(6).json_name());
-
-  // Test generated descriptor.
-  const Descriptor* generated = protobuf_unittest::TestJsonName::descriptor();
-  ASSERT_EQ(7, generated->field_count());
-  EXPECT_EQ("fieldName1", generated->field(0)->json_name());
-  EXPECT_EQ("fieldName2", generated->field(1)->json_name());
-  EXPECT_EQ("FieldName3", generated->field(2)->json_name());
-  EXPECT_EQ("FieldName4", generated->field(3)->json_name());
-  EXPECT_EQ("FIELDNAME5", generated->field(4)->json_name());
-  EXPECT_EQ("@type", generated->field(5)->json_name());
-  EXPECT_EQ("fieldname7", generated->field(6)->json_name());
-}
-
-TEST_F(DescriptorTest, FieldFile) {
-  EXPECT_EQ(foo_file_, foo_->file());
-  EXPECT_EQ(foo_file_, bar_->file());
-  EXPECT_EQ(foo_file_, baz_->file());
-  EXPECT_EQ(foo_file_, moo_->file());
-
-  EXPECT_EQ(bar_file_, foo2_->file());
-  EXPECT_EQ(bar_file_, bar2_->file());
-  EXPECT_EQ(bar_file_, mooo2_->file());
-}
-
-TEST_F(DescriptorTest, FieldIndex) {
-  EXPECT_EQ(0, foo_->index());
-  EXPECT_EQ(1, bar_->index());
-  EXPECT_EQ(2, baz_->index());
-  EXPECT_EQ(3, moo_->index());
-}
-
-TEST_F(DescriptorTest, FieldNumber) {
-  EXPECT_EQ(1, foo_->number());
-  EXPECT_EQ(6, bar_->number());
-  EXPECT_EQ(500000000, baz_->number());
-  EXPECT_EQ(15, moo_->number());
-}
-
-TEST_F(DescriptorTest, FieldType) {
-  EXPECT_EQ(FieldDescriptor::TYPE_STRING, foo_->type());
-  EXPECT_EQ(FieldDescriptor::TYPE_ENUM, bar_->type());
-  EXPECT_EQ(FieldDescriptor::TYPE_MESSAGE, baz_->type());
-  EXPECT_EQ(FieldDescriptor::TYPE_GROUP, moo_->type());
-}
-
-TEST_F(DescriptorTest, FieldLabel) {
-  EXPECT_EQ(FieldDescriptor::LABEL_REQUIRED, foo_->label());
-  EXPECT_EQ(FieldDescriptor::LABEL_OPTIONAL, bar_->label());
-  EXPECT_EQ(FieldDescriptor::LABEL_REPEATED, baz_->label());
-  EXPECT_EQ(FieldDescriptor::LABEL_OPTIONAL, moo_->label());
-
-  EXPECT_TRUE(foo_->is_required());
-  EXPECT_FALSE(foo_->is_optional());
-  EXPECT_FALSE(foo_->is_repeated());
-
-  EXPECT_FALSE(bar_->is_required());
-  EXPECT_TRUE(bar_->is_optional());
-  EXPECT_FALSE(bar_->is_repeated());
-
-  EXPECT_FALSE(baz_->is_required());
-  EXPECT_FALSE(baz_->is_optional());
-  EXPECT_TRUE(baz_->is_repeated());
-}
-
-TEST_F(DescriptorTest, IsMap) {
-  EXPECT_TRUE(map_->is_map());
-  EXPECT_FALSE(baz_->is_map());
-  EXPECT_TRUE(map_->message_type()->options().map_entry());
-}
-
-TEST_F(DescriptorTest, GetMap) {
-  const Descriptor* map_desc = map_->message_type();
-  const FieldDescriptor* map_key = map_desc->map_key();
-  ASSERT_TRUE(map_key != nullptr);
-  EXPECT_EQ(map_key->name(), "key");
-  EXPECT_EQ(map_key->number(), 1);
-
-  const FieldDescriptor* map_value = map_desc->map_value();
-  ASSERT_TRUE(map_value != nullptr);
-  EXPECT_EQ(map_value->name(), "value");
-  EXPECT_EQ(map_value->number(), 2);
-
-  EXPECT_EQ(message_->map_key(), nullptr);
-  EXPECT_EQ(message_->map_value(), nullptr);
-}
-
-TEST_F(DescriptorTest, FieldHasDefault) {
-  EXPECT_FALSE(foo_->has_default_value());
-  EXPECT_FALSE(bar_->has_default_value());
-  EXPECT_FALSE(baz_->has_default_value());
-  EXPECT_FALSE(moo_->has_default_value());
-}
-
-TEST_F(DescriptorTest, FieldContainingType) {
-  EXPECT_EQ(message_, foo_->containing_type());
-  EXPECT_EQ(message_, bar_->containing_type());
-  EXPECT_EQ(message_, baz_->containing_type());
-  EXPECT_EQ(message_, moo_->containing_type());
-
-  EXPECT_EQ(message2_, foo2_->containing_type());
-  EXPECT_EQ(message2_, bar2_->containing_type());
-  EXPECT_EQ(message2_, mooo2_->containing_type());
-}
-
-TEST_F(DescriptorTest, FieldMessageType) {
-  EXPECT_TRUE(foo_->message_type() == nullptr);
-  EXPECT_TRUE(bar_->message_type() == nullptr);
-
-  EXPECT_EQ(foreign_, baz_->message_type());
-  EXPECT_EQ(foreign_, moo_->message_type());
-}
-
-TEST_F(DescriptorTest, FieldEnumType) {
-  EXPECT_TRUE(foo_->enum_type() == nullptr);
-  EXPECT_TRUE(baz_->enum_type() == nullptr);
-  EXPECT_TRUE(moo_->enum_type() == nullptr);
-
-  EXPECT_EQ(enum_, bar_->enum_type());
-}
-
-
-// ===================================================================
-
-// Test simple flat messages and fields.
-class OneofDescriptorTest : public testing::Test {
- protected:
-  void SetUp() override {
-    // Build descriptors for the following definitions:
-    //
-    //   package garply;
-    //   message TestOneof {
-    //     optional int32 a = 1;
-    //     oneof foo {
-    //       string b = 2;
-    //       TestOneof c = 3;
-    //     }
-    //     oneof bar {
-    //       float d = 4;
-    //     }
-    //   }
-
-    FileDescriptorProto baz_file;
-    baz_file.set_name("baz.proto");
-    baz_file.set_package("garply");
-
-    DescriptorProto* oneof_message = AddMessage(&baz_file, "TestOneof");
-    oneof_message->add_oneof_decl()->set_name("foo");
-    oneof_message->add_oneof_decl()->set_name("bar");
-
-    AddField(oneof_message, "a", 1, FieldDescriptorProto::LABEL_OPTIONAL,
-             FieldDescriptorProto::TYPE_INT32);
-    AddField(oneof_message, "b", 2, FieldDescriptorProto::LABEL_OPTIONAL,
-             FieldDescriptorProto::TYPE_STRING);
-    oneof_message->mutable_field(1)->set_oneof_index(0);
-    AddField(oneof_message, "c", 3, FieldDescriptorProto::LABEL_OPTIONAL,
-             FieldDescriptorProto::TYPE_MESSAGE);
-    oneof_message->mutable_field(2)->set_oneof_index(0);
-    oneof_message->mutable_field(2)->set_type_name("TestOneof");
-
-    AddField(oneof_message, "d", 4, FieldDescriptorProto::LABEL_OPTIONAL,
-             FieldDescriptorProto::TYPE_FLOAT);
-    oneof_message->mutable_field(3)->set_oneof_index(1);
-
-    // Build the descriptors and get the pointers.
-    baz_file_ = pool_.BuildFile(baz_file);
-    ASSERT_TRUE(baz_file_ != nullptr);
-
-    ASSERT_EQ(1, baz_file_->message_type_count());
-    oneof_message_ = baz_file_->message_type(0);
-
-    ASSERT_EQ(2, oneof_message_->oneof_decl_count());
-    oneof_ = oneof_message_->oneof_decl(0);
-    oneof2_ = oneof_message_->oneof_decl(1);
-
-    ASSERT_EQ(4, oneof_message_->field_count());
-    a_ = oneof_message_->field(0);
-    b_ = oneof_message_->field(1);
-    c_ = oneof_message_->field(2);
-    d_ = oneof_message_->field(3);
-  }
-
-  DescriptorPool pool_;
-
-  const FileDescriptor* baz_file_;
-
-  const Descriptor* oneof_message_;
-
-  const OneofDescriptor* oneof_;
-  const OneofDescriptor* oneof2_;
-  const FieldDescriptor* a_;
-  const FieldDescriptor* b_;
-  const FieldDescriptor* c_;
-  const FieldDescriptor* d_;
-};
-
-TEST_F(OneofDescriptorTest, Normal) {
-  EXPECT_EQ("foo", oneof_->name());
-  EXPECT_EQ("garply.TestOneof.foo", oneof_->full_name());
-  EXPECT_EQ(0, oneof_->index());
-  ASSERT_EQ(2, oneof_->field_count());
-  EXPECT_EQ(b_, oneof_->field(0));
-  EXPECT_EQ(c_, oneof_->field(1));
-  EXPECT_TRUE(a_->containing_oneof() == nullptr);
-  EXPECT_EQ(oneof_, b_->containing_oneof());
-  EXPECT_EQ(oneof_, c_->containing_oneof());
-}
-
-TEST_F(OneofDescriptorTest, FindByName) {
-  EXPECT_EQ(oneof_, oneof_message_->FindOneofByName("foo"));
-  EXPECT_EQ(oneof2_, oneof_message_->FindOneofByName("bar"));
-  EXPECT_TRUE(oneof_message_->FindOneofByName("no_such_oneof") == nullptr);
-}
-
-// ===================================================================
-
-class StylizedFieldNamesTest : public testing::Test {
- protected:
-  void SetUp() override {
-    FileDescriptorProto file;
-    file.set_name("foo.proto");
-
-    AddExtensionRange(AddMessage(&file, "ExtendableMessage"), 1, 1000);
-
-    DescriptorProto* message = AddMessage(&file, "TestMessage");
-    AddField(message, "foo_foo", 1, FieldDescriptorProto::LABEL_OPTIONAL,
-             FieldDescriptorProto::TYPE_INT32);
-    AddField(message, "FooBar", 2, FieldDescriptorProto::LABEL_OPTIONAL,
-             FieldDescriptorProto::TYPE_INT32);
-    AddField(message, "fooBaz", 3, FieldDescriptorProto::LABEL_OPTIONAL,
-             FieldDescriptorProto::TYPE_INT32);
-    AddField(message, "fooFoo", 4,  // Camel-case conflict with foo_foo.
-             FieldDescriptorProto::LABEL_OPTIONAL,
-             FieldDescriptorProto::TYPE_INT32);
-    AddField(message, "foobar", 5,  // Lower-case conflict with FooBar.
-             FieldDescriptorProto::LABEL_OPTIONAL,
-             FieldDescriptorProto::TYPE_INT32);
-
-    AddNestedExtension(message, "ExtendableMessage", "bar_foo", 1,
-                       FieldDescriptorProto::LABEL_OPTIONAL,
-                       FieldDescriptorProto::TYPE_INT32);
-    AddNestedExtension(message, "ExtendableMessage", "BarBar", 2,
-                       FieldDescriptorProto::LABEL_OPTIONAL,
-                       FieldDescriptorProto::TYPE_INT32);
-    AddNestedExtension(message, "ExtendableMessage", "BarBaz", 3,
-                       FieldDescriptorProto::LABEL_OPTIONAL,
-                       FieldDescriptorProto::TYPE_INT32);
-    AddNestedExtension(message, "ExtendableMessage", "barFoo", 4,  // Conflict
-                       FieldDescriptorProto::LABEL_OPTIONAL,
-                       FieldDescriptorProto::TYPE_INT32);
-    AddNestedExtension(message, "ExtendableMessage", "barbar", 5,  // Conflict
-                       FieldDescriptorProto::LABEL_OPTIONAL,
-                       FieldDescriptorProto::TYPE_INT32);
-
-    AddExtension(&file, "ExtendableMessage", "baz_foo", 11,
-                 FieldDescriptorProto::LABEL_OPTIONAL,
-                 FieldDescriptorProto::TYPE_INT32);
-    AddExtension(&file, "ExtendableMessage", "BazBar", 12,
-                 FieldDescriptorProto::LABEL_OPTIONAL,
-                 FieldDescriptorProto::TYPE_INT32);
-    AddExtension(&file, "ExtendableMessage", "BazBaz", 13,
-                 FieldDescriptorProto::LABEL_OPTIONAL,
-                 FieldDescriptorProto::TYPE_INT32);
-    AddExtension(&file, "ExtendableMessage", "bazFoo", 14,  // Conflict
-                 FieldDescriptorProto::LABEL_OPTIONAL,
-                 FieldDescriptorProto::TYPE_INT32);
-    AddExtension(&file, "ExtendableMessage", "bazbar", 15,  // Conflict
-                 FieldDescriptorProto::LABEL_OPTIONAL,
-                 FieldDescriptorProto::TYPE_INT32);
-
-    file_ = pool_.BuildFile(file);
-    ASSERT_TRUE(file_ != nullptr);
-    ASSERT_EQ(2, file_->message_type_count());
-    message_ = file_->message_type(1);
-    ASSERT_EQ("TestMessage", message_->name());
-    ASSERT_EQ(5, message_->field_count());
-    ASSERT_EQ(5, message_->extension_count());
-    ASSERT_EQ(5, file_->extension_count());
-  }
-
-  DescriptorPool pool_;
-  const FileDescriptor* file_;
-  const Descriptor* message_;
-};
-
-TEST_F(StylizedFieldNamesTest, LowercaseName) {
-  EXPECT_EQ("foo_foo", message_->field(0)->lowercase_name());
-  EXPECT_EQ("foobar", message_->field(1)->lowercase_name());
-  EXPECT_EQ("foobaz", message_->field(2)->lowercase_name());
-  EXPECT_EQ("foofoo", message_->field(3)->lowercase_name());
-  EXPECT_EQ("foobar", message_->field(4)->lowercase_name());
-
-  EXPECT_EQ("bar_foo", message_->extension(0)->lowercase_name());
-  EXPECT_EQ("barbar", message_->extension(1)->lowercase_name());
-  EXPECT_EQ("barbaz", message_->extension(2)->lowercase_name());
-  EXPECT_EQ("barfoo", message_->extension(3)->lowercase_name());
-  EXPECT_EQ("barbar", message_->extension(4)->lowercase_name());
-
-  EXPECT_EQ("baz_foo", file_->extension(0)->lowercase_name());
-  EXPECT_EQ("bazbar", file_->extension(1)->lowercase_name());
-  EXPECT_EQ("bazbaz", file_->extension(2)->lowercase_name());
-  EXPECT_EQ("bazfoo", file_->extension(3)->lowercase_name());
-  EXPECT_EQ("bazbar", file_->extension(4)->lowercase_name());
-}
-
-TEST_F(StylizedFieldNamesTest, CamelcaseName) {
-  EXPECT_EQ("fooFoo", message_->field(0)->camelcase_name());
-  EXPECT_EQ("fooBar", message_->field(1)->camelcase_name());
-  EXPECT_EQ("fooBaz", message_->field(2)->camelcase_name());
-  EXPECT_EQ("fooFoo", message_->field(3)->camelcase_name());
-  EXPECT_EQ("foobar", message_->field(4)->camelcase_name());
-
-  EXPECT_EQ("barFoo", message_->extension(0)->camelcase_name());
-  EXPECT_EQ("barBar", message_->extension(1)->camelcase_name());
-  EXPECT_EQ("barBaz", message_->extension(2)->camelcase_name());
-  EXPECT_EQ("barFoo", message_->extension(3)->camelcase_name());
-  EXPECT_EQ("barbar", message_->extension(4)->camelcase_name());
-
-  EXPECT_EQ("bazFoo", file_->extension(0)->camelcase_name());
-  EXPECT_EQ("bazBar", file_->extension(1)->camelcase_name());
-  EXPECT_EQ("bazBaz", file_->extension(2)->camelcase_name());
-  EXPECT_EQ("bazFoo", file_->extension(3)->camelcase_name());
-  EXPECT_EQ("bazbar", file_->extension(4)->camelcase_name());
-}
-
-TEST_F(StylizedFieldNamesTest, FindByLowercaseName) {
-  EXPECT_EQ(message_->field(0), message_->FindFieldByLowercaseName("foo_foo"));
-  EXPECT_THAT(message_->FindFieldByLowercaseName("foobar"),
-              AnyOf(message_->field(1), message_->field(4)));
-  EXPECT_EQ(message_->field(2), message_->FindFieldByLowercaseName("foobaz"));
-  EXPECT_TRUE(message_->FindFieldByLowercaseName("FooBar") == nullptr);
-  EXPECT_TRUE(message_->FindFieldByLowercaseName("fooBaz") == nullptr);
-  EXPECT_TRUE(message_->FindFieldByLowercaseName("bar_foo") == nullptr);
-  EXPECT_TRUE(message_->FindFieldByLowercaseName("nosuchfield") == nullptr);
-
-  EXPECT_EQ(message_->extension(0),
-            message_->FindExtensionByLowercaseName("bar_foo"));
-  EXPECT_THAT(message_->FindExtensionByLowercaseName("barbar"),
-              AnyOf(message_->extension(1), message_->extension(4)));
-  EXPECT_EQ(message_->extension(2),
-            message_->FindExtensionByLowercaseName("barbaz"));
-  EXPECT_TRUE(message_->FindExtensionByLowercaseName("BarBar") == nullptr);
-  EXPECT_TRUE(message_->FindExtensionByLowercaseName("barBaz") == nullptr);
-  EXPECT_TRUE(message_->FindExtensionByLowercaseName("foo_foo") == nullptr);
-  EXPECT_TRUE(message_->FindExtensionByLowercaseName("nosuchfield") == nullptr);
-
-  EXPECT_EQ(file_->extension(0),
-            file_->FindExtensionByLowercaseName("baz_foo"));
-  EXPECT_THAT(file_->FindExtensionByLowercaseName("bazbar"),
-              AnyOf(file_->extension(1), file_->extension(4)));
-  EXPECT_EQ(file_->extension(2), file_->FindExtensionByLowercaseName("bazbaz"));
-  EXPECT_TRUE(file_->FindExtensionByLowercaseName("BazBar") == nullptr);
-  EXPECT_TRUE(file_->FindExtensionByLowercaseName("bazBaz") == nullptr);
-  EXPECT_TRUE(file_->FindExtensionByLowercaseName("nosuchfield") == nullptr);
-}
-
-TEST_F(StylizedFieldNamesTest, FindByCamelcaseName) {
-  EXPECT_THAT(message_->FindFieldByCamelcaseName("fooFoo"),
-              AnyOf(message_->field(0), message_->field(3)));
-  EXPECT_EQ(message_->field(1), message_->FindFieldByCamelcaseName("fooBar"));
-  EXPECT_EQ(message_->field(2), message_->FindFieldByCamelcaseName("fooBaz"));
-  EXPECT_TRUE(message_->FindFieldByCamelcaseName("foo_foo") == nullptr);
-  EXPECT_TRUE(message_->FindFieldByCamelcaseName("FooBar") == nullptr);
-  EXPECT_TRUE(message_->FindFieldByCamelcaseName("barFoo") == nullptr);
-  EXPECT_TRUE(message_->FindFieldByCamelcaseName("nosuchfield") == nullptr);
-
-  EXPECT_THAT(message_->FindExtensionByCamelcaseName("barFoo"),
-              AnyOf(message_->extension(0), message_->extension(3)));
-  EXPECT_EQ(message_->extension(1),
-            message_->FindExtensionByCamelcaseName("barBar"));
-  EXPECT_EQ(message_->extension(2),
-            message_->FindExtensionByCamelcaseName("barBaz"));
-  EXPECT_TRUE(message_->FindExtensionByCamelcaseName("bar_foo") == nullptr);
-  EXPECT_TRUE(message_->FindExtensionByCamelcaseName("BarBar") == nullptr);
-  EXPECT_TRUE(message_->FindExtensionByCamelcaseName("fooFoo") == nullptr);
-  EXPECT_TRUE(message_->FindExtensionByCamelcaseName("nosuchfield") == nullptr);
-
-  EXPECT_THAT(file_->FindExtensionByCamelcaseName("bazFoo"),
-              AnyOf(file_->extension(0), file_->extension(3)));
-  EXPECT_EQ(file_->extension(1), file_->FindExtensionByCamelcaseName("bazBar"));
-  EXPECT_EQ(file_->extension(2), file_->FindExtensionByCamelcaseName("bazBaz"));
-  EXPECT_TRUE(file_->FindExtensionByCamelcaseName("baz_foo") == nullptr);
-  EXPECT_TRUE(file_->FindExtensionByCamelcaseName("BazBar") == nullptr);
-  EXPECT_TRUE(file_->FindExtensionByCamelcaseName("nosuchfield") == nullptr);
-}
-
-// ===================================================================
-
-// Test enum descriptors.
-class EnumDescriptorTest : public testing::Test {
- protected:
-  void SetUp() override {
-    // Build descriptors for the following definitions:
-    //
-    //   // in "foo.proto"
-    //   enum TestEnum {
-    //     FOO = 1;
-    //     BAR = 2;
-    //   }
-    //
-    //   // in "bar.proto"
-    //   package corge.grault;
-    //   enum TestEnum2 {
-    //     FOO = 1;
-    //     BAZ = 3;
-    //   }
-    //
-    // TestEnum2 is primarily here to test FindValueByName and friends.
-    // All enums created from the same DescriptorPool share the same lookup
-    // table, so we need to insure that they don't interfere.
-
-    // TestEnum
-    FileDescriptorProto foo_file;
-    foo_file.set_name("foo.proto");
-
-    EnumDescriptorProto* enum_proto = AddEnum(&foo_file, "TestEnum");
-    AddEnumValue(enum_proto, "FOO", 1);
-    AddEnumValue(enum_proto, "BAR", 2);
-
-    // TestEnum2
-    FileDescriptorProto bar_file;
-    bar_file.set_name("bar.proto");
-    bar_file.set_package("corge.grault");
-
-    EnumDescriptorProto* enum2_proto = AddEnum(&bar_file, "TestEnum2");
-    AddEnumValue(enum2_proto, "FOO", 1);
-    AddEnumValue(enum2_proto, "BAZ", 3);
-
-    // Build the descriptors and get the pointers.
-    foo_file_ = pool_.BuildFile(foo_file);
-    ASSERT_TRUE(foo_file_ != nullptr);
-
-    bar_file_ = pool_.BuildFile(bar_file);
-    ASSERT_TRUE(bar_file_ != nullptr);
-
-    ASSERT_EQ(1, foo_file_->enum_type_count());
-    enum_ = foo_file_->enum_type(0);
-
-    ASSERT_EQ(2, enum_->value_count());
-    foo_ = enum_->value(0);
-    bar_ = enum_->value(1);
-
-    ASSERT_EQ(1, bar_file_->enum_type_count());
-    enum2_ = bar_file_->enum_type(0);
-
-    ASSERT_EQ(2, enum2_->value_count());
-    foo2_ = enum2_->value(0);
-    baz2_ = enum2_->value(1);
-  }
-
-  DescriptorPool pool_;
-
-  const FileDescriptor* foo_file_;
-  const FileDescriptor* bar_file_;
-
-  const EnumDescriptor* enum_;
-  const EnumDescriptor* enum2_;
-
-  const EnumValueDescriptor* foo_;
-  const EnumValueDescriptor* bar_;
-
-  const EnumValueDescriptor* foo2_;
-  const EnumValueDescriptor* baz2_;
-};
-
-TEST_F(EnumDescriptorTest, Name) {
-  EXPECT_EQ("TestEnum", enum_->name());
-  EXPECT_EQ("TestEnum", enum_->full_name());
-  EXPECT_EQ(foo_file_, enum_->file());
-
-  EXPECT_EQ("TestEnum2", enum2_->name());
-  EXPECT_EQ("corge.grault.TestEnum2", enum2_->full_name());
-  EXPECT_EQ(bar_file_, enum2_->file());
-}
-
-TEST_F(EnumDescriptorTest, ContainingType) {
-  EXPECT_TRUE(enum_->containing_type() == nullptr);
-  EXPECT_TRUE(enum2_->containing_type() == nullptr);
-}
-
-TEST_F(EnumDescriptorTest, ValuesByIndex) {
-  ASSERT_EQ(2, enum_->value_count());
-  EXPECT_EQ(foo_, enum_->value(0));
-  EXPECT_EQ(bar_, enum_->value(1));
-}
-
-TEST_F(EnumDescriptorTest, FindValueByName) {
-  EXPECT_EQ(foo_, enum_->FindValueByName("FOO"));
-  EXPECT_EQ(bar_, enum_->FindValueByName("BAR"));
-  EXPECT_EQ(foo2_, enum2_->FindValueByName("FOO"));
-  EXPECT_EQ(baz2_, enum2_->FindValueByName("BAZ"));
-
-  EXPECT_TRUE(enum_->FindValueByName("NO_SUCH_VALUE") == nullptr);
-  EXPECT_TRUE(enum_->FindValueByName("BAZ") == nullptr);
-  EXPECT_TRUE(enum2_->FindValueByName("BAR") == nullptr);
-}
-
-TEST_F(EnumDescriptorTest, FindValueByNumber) {
-  EXPECT_EQ(foo_, enum_->FindValueByNumber(1));
-  EXPECT_EQ(bar_, enum_->FindValueByNumber(2));
-  EXPECT_EQ(foo2_, enum2_->FindValueByNumber(1));
-  EXPECT_EQ(baz2_, enum2_->FindValueByNumber(3));
-
-  EXPECT_TRUE(enum_->FindValueByNumber(416) == nullptr);
-  EXPECT_TRUE(enum_->FindValueByNumber(3) == nullptr);
-  EXPECT_TRUE(enum2_->FindValueByNumber(2) == nullptr);
-}
-
-TEST_F(EnumDescriptorTest, ValueName) {
-  EXPECT_EQ("FOO", foo_->name());
-  EXPECT_EQ("BAR", bar_->name());
-}
-
-TEST_F(EnumDescriptorTest, ValueFullName) {
-  EXPECT_EQ("FOO", foo_->full_name());
-  EXPECT_EQ("BAR", bar_->full_name());
-  EXPECT_EQ("corge.grault.FOO", foo2_->full_name());
-  EXPECT_EQ("corge.grault.BAZ", baz2_->full_name());
-}
-
-TEST_F(EnumDescriptorTest, ValueIndex) {
-  EXPECT_EQ(0, foo_->index());
-  EXPECT_EQ(1, bar_->index());
-}
-
-TEST_F(EnumDescriptorTest, ValueNumber) {
-  EXPECT_EQ(1, foo_->number());
-  EXPECT_EQ(2, bar_->number());
-}
-
-TEST_F(EnumDescriptorTest, ValueType) {
-  EXPECT_EQ(enum_, foo_->type());
-  EXPECT_EQ(enum_, bar_->type());
-  EXPECT_EQ(enum2_, foo2_->type());
-  EXPECT_EQ(enum2_, baz2_->type());
-}
-
-// ===================================================================
-
-// Test service descriptors.
-class ServiceDescriptorTest : public testing::Test {
- protected:
-  void SetUp() override {
-    // Build descriptors for the following messages and service:
-    //    // in "foo.proto"
-    //    message FooRequest  {}
-    //    message FooResponse {}
-    //    message BarRequest  {}
-    //    message BarResponse {}
-    //    message BazRequest  {}
-    //    message BazResponse {}
-    //
-    //    service TestService {
-    //      rpc Foo(FooRequest) returns (FooResponse);
-    //      rpc Bar(BarRequest) returns (BarResponse);
-    //    }
-    //
-    //    // in "bar.proto"
-    //    package corge.grault
-    //    service TestService2 {
-    //      rpc Foo(FooRequest) returns (FooResponse);
-    //      rpc Baz(BazRequest) returns (BazResponse);
-    //    }
-
-    FileDescriptorProto foo_file;
-    foo_file.set_name("foo.proto");
-
-    AddMessage(&foo_file, "FooRequest");
-    AddMessage(&foo_file, "FooResponse");
-    AddMessage(&foo_file, "BarRequest");
-    AddMessage(&foo_file, "BarResponse");
-    AddMessage(&foo_file, "BazRequest");
-    AddMessage(&foo_file, "BazResponse");
-
-    ServiceDescriptorProto* service = AddService(&foo_file, "TestService");
-    AddMethod(service, "Foo", "FooRequest", "FooResponse");
-    AddMethod(service, "Bar", "BarRequest", "BarResponse");
-
-    FileDescriptorProto bar_file;
-    bar_file.set_name("bar.proto");
-    bar_file.set_package("corge.grault");
-    bar_file.add_dependency("foo.proto");
-
-    ServiceDescriptorProto* service2 = AddService(&bar_file, "TestService2");
-    AddMethod(service2, "Foo", "FooRequest", "FooResponse");
-    AddMethod(service2, "Baz", "BazRequest", "BazResponse");
-
-    // Build the descriptors and get the pointers.
-    foo_file_ = pool_.BuildFile(foo_file);
-    ASSERT_TRUE(foo_file_ != nullptr);
-
-    bar_file_ = pool_.BuildFile(bar_file);
-    ASSERT_TRUE(bar_file_ != nullptr);
-
-    ASSERT_EQ(6, foo_file_->message_type_count());
-    foo_request_ = foo_file_->message_type(0);
-    foo_response_ = foo_file_->message_type(1);
-    bar_request_ = foo_file_->message_type(2);
-    bar_response_ = foo_file_->message_type(3);
-    baz_request_ = foo_file_->message_type(4);
-    baz_response_ = foo_file_->message_type(5);
-
-    ASSERT_EQ(1, foo_file_->service_count());
-    service_ = foo_file_->service(0);
-
-    ASSERT_EQ(2, service_->method_count());
-    foo_ = service_->method(0);
-    bar_ = service_->method(1);
-
-    ASSERT_EQ(1, bar_file_->service_count());
-    service2_ = bar_file_->service(0);
-
-    ASSERT_EQ(2, service2_->method_count());
-    foo2_ = service2_->method(0);
-    baz2_ = service2_->method(1);
-  }
-
-  DescriptorPool pool_;
-
-  const FileDescriptor* foo_file_;
-  const FileDescriptor* bar_file_;
-
-  const Descriptor* foo_request_;
-  const Descriptor* foo_response_;
-  const Descriptor* bar_request_;
-  const Descriptor* bar_response_;
-  const Descriptor* baz_request_;
-  const Descriptor* baz_response_;
-
-  const ServiceDescriptor* service_;
-  const ServiceDescriptor* service2_;
-
-  const MethodDescriptor* foo_;
-  const MethodDescriptor* bar_;
-
-  const MethodDescriptor* foo2_;
-  const MethodDescriptor* baz2_;
-};
-
-TEST_F(ServiceDescriptorTest, Name) {
-  EXPECT_EQ("TestService", service_->name());
-  EXPECT_EQ("TestService", service_->full_name());
-  EXPECT_EQ(foo_file_, service_->file());
-
-  EXPECT_EQ("TestService2", service2_->name());
-  EXPECT_EQ("corge.grault.TestService2", service2_->full_name());
-  EXPECT_EQ(bar_file_, service2_->file());
-}
-
-TEST_F(ServiceDescriptorTest, MethodsByIndex) {
-  ASSERT_EQ(2, service_->method_count());
-  EXPECT_EQ(foo_, service_->method(0));
-  EXPECT_EQ(bar_, service_->method(1));
-}
-
-TEST_F(ServiceDescriptorTest, FindMethodByName) {
-  EXPECT_EQ(foo_, service_->FindMethodByName("Foo"));
-  EXPECT_EQ(bar_, service_->FindMethodByName("Bar"));
-  EXPECT_EQ(foo2_, service2_->FindMethodByName("Foo"));
-  EXPECT_EQ(baz2_, service2_->FindMethodByName("Baz"));
-
-  EXPECT_TRUE(service_->FindMethodByName("NoSuchMethod") == nullptr);
-  EXPECT_TRUE(service_->FindMethodByName("Baz") == nullptr);
-  EXPECT_TRUE(service2_->FindMethodByName("Bar") == nullptr);
-}
-
-TEST_F(ServiceDescriptorTest, MethodName) {
-  EXPECT_EQ("Foo", foo_->name());
-  EXPECT_EQ("Bar", bar_->name());
-}
-TEST_F(ServiceDescriptorTest, MethodFullName) {
-  EXPECT_EQ("TestService.Foo", foo_->full_name());
-  EXPECT_EQ("TestService.Bar", bar_->full_name());
-  EXPECT_EQ("corge.grault.TestService2.Foo", foo2_->full_name());
-  EXPECT_EQ("corge.grault.TestService2.Baz", baz2_->full_name());
-}
-
-TEST_F(ServiceDescriptorTest, MethodIndex) {
-  EXPECT_EQ(0, foo_->index());
-  EXPECT_EQ(1, bar_->index());
-}
-
-TEST_F(ServiceDescriptorTest, MethodParent) {
-  EXPECT_EQ(service_, foo_->service());
-  EXPECT_EQ(service_, bar_->service());
-}
-
-TEST_F(ServiceDescriptorTest, MethodInputType) {
-  EXPECT_EQ(foo_request_, foo_->input_type());
-  EXPECT_EQ(bar_request_, bar_->input_type());
-}
-
-TEST_F(ServiceDescriptorTest, MethodOutputType) {
-  EXPECT_EQ(foo_response_, foo_->output_type());
-  EXPECT_EQ(bar_response_, bar_->output_type());
-}
-
-// ===================================================================
-
-// Test nested types.
-class NestedDescriptorTest : public testing::Test {
- protected:
-  void SetUp() override {
-    // Build descriptors for the following definitions:
-    //
-    //   // in "foo.proto"
-    //   message TestMessage {
-    //     message Foo {}
-    //     message Bar {}
-    //     enum Baz { A = 1; }
-    //     enum Moo { B = 1; }
-    //   }
-    //
-    //   // in "bar.proto"
-    //   package corge.grault;
-    //   message TestMessage2 {
-    //     message Foo {}
-    //     message Baz {}
-    //     enum Moo  { A = 1; }
-    //     enum Mooo { C = 1; }
-    //   }
-    //
-    // TestMessage2 is primarily here to test FindNestedTypeByName and friends.
-    // All messages created from the same DescriptorPool share the same lookup
-    // table, so we need to insure that they don't interfere.
-    //
-    // We add enum values to the enums in order to test searching for enum
-    // values across a message's scope.
-
-    FileDescriptorProto foo_file;
-    foo_file.set_name("foo.proto");
-
-    DescriptorProto* message = AddMessage(&foo_file, "TestMessage");
-    AddNestedMessage(message, "Foo");
-    AddNestedMessage(message, "Bar");
-    EnumDescriptorProto* baz = AddNestedEnum(message, "Baz");
-    AddEnumValue(baz, "A", 1);
-    EnumDescriptorProto* moo = AddNestedEnum(message, "Moo");
-    AddEnumValue(moo, "B", 1);
-
-    FileDescriptorProto bar_file;
-    bar_file.set_name("bar.proto");
-    bar_file.set_package("corge.grault");
-
-    DescriptorProto* message2 = AddMessage(&bar_file, "TestMessage2");
-    AddNestedMessage(message2, "Foo");
-    AddNestedMessage(message2, "Baz");
-    EnumDescriptorProto* moo2 = AddNestedEnum(message2, "Moo");
-    AddEnumValue(moo2, "A", 1);
-    EnumDescriptorProto* mooo2 = AddNestedEnum(message2, "Mooo");
-    AddEnumValue(mooo2, "C", 1);
-
-    // Build the descriptors and get the pointers.
-    foo_file_ = pool_.BuildFile(foo_file);
-    ASSERT_TRUE(foo_file_ != nullptr);
-
-    bar_file_ = pool_.BuildFile(bar_file);
-    ASSERT_TRUE(bar_file_ != nullptr);
-
-    ASSERT_EQ(1, foo_file_->message_type_count());
-    message_ = foo_file_->message_type(0);
-
-    ASSERT_EQ(2, message_->nested_type_count());
-    foo_ = message_->nested_type(0);
-    bar_ = message_->nested_type(1);
-
-    ASSERT_EQ(2, message_->enum_type_count());
-    baz_ = message_->enum_type(0);
-    moo_ = message_->enum_type(1);
-
-    ASSERT_EQ(1, baz_->value_count());
-    a_ = baz_->value(0);
-    ASSERT_EQ(1, moo_->value_count());
-    b_ = moo_->value(0);
-
-    ASSERT_EQ(1, bar_file_->message_type_count());
-    message2_ = bar_file_->message_type(0);
-
-    ASSERT_EQ(2, message2_->nested_type_count());
-    foo2_ = message2_->nested_type(0);
-    baz2_ = message2_->nested_type(1);
-
-    ASSERT_EQ(2, message2_->enum_type_count());
-    moo2_ = message2_->enum_type(0);
-    mooo2_ = message2_->enum_type(1);
-
-    ASSERT_EQ(1, moo2_->value_count());
-    a2_ = moo2_->value(0);
-    ASSERT_EQ(1, mooo2_->value_count());
-    c2_ = mooo2_->value(0);
-  }
-
-  DescriptorPool pool_;
-
-  const FileDescriptor* foo_file_;
-  const FileDescriptor* bar_file_;
-
-  const Descriptor* message_;
-  const Descriptor* message2_;
-
-  const Descriptor* foo_;
-  const Descriptor* bar_;
-  const EnumDescriptor* baz_;
-  const EnumDescriptor* moo_;
-  const EnumValueDescriptor* a_;
-  const EnumValueDescriptor* b_;
-
-  const Descriptor* foo2_;
-  const Descriptor* baz2_;
-  const EnumDescriptor* moo2_;
-  const EnumDescriptor* mooo2_;
-  const EnumValueDescriptor* a2_;
-  const EnumValueDescriptor* c2_;
-};
-
-TEST_F(NestedDescriptorTest, MessageName) {
-  EXPECT_EQ("Foo", foo_->name());
-  EXPECT_EQ("Bar", bar_->name());
-  EXPECT_EQ("Foo", foo2_->name());
-  EXPECT_EQ("Baz", baz2_->name());
-
-  EXPECT_EQ("TestMessage.Foo", foo_->full_name());
-  EXPECT_EQ("TestMessage.Bar", bar_->full_name());
-  EXPECT_EQ("corge.grault.TestMessage2.Foo", foo2_->full_name());
-  EXPECT_EQ("corge.grault.TestMessage2.Baz", baz2_->full_name());
-}
-
-TEST_F(NestedDescriptorTest, MessageContainingType) {
-  EXPECT_EQ(message_, foo_->containing_type());
-  EXPECT_EQ(message_, bar_->containing_type());
-  EXPECT_EQ(message2_, foo2_->containing_type());
-  EXPECT_EQ(message2_, baz2_->containing_type());
-}
-
-TEST_F(NestedDescriptorTest, NestedMessagesByIndex) {
-  ASSERT_EQ(2, message_->nested_type_count());
-  EXPECT_EQ(foo_, message_->nested_type(0));
-  EXPECT_EQ(bar_, message_->nested_type(1));
-}
-
-TEST_F(NestedDescriptorTest, FindFieldByNameDoesntFindNestedTypes) {
-  EXPECT_TRUE(message_->FindFieldByName("Foo") == nullptr);
-  EXPECT_TRUE(message_->FindFieldByName("Moo") == nullptr);
-  EXPECT_TRUE(message_->FindExtensionByName("Foo") == nullptr);
-  EXPECT_TRUE(message_->FindExtensionByName("Moo") == nullptr);
-}
-
-TEST_F(NestedDescriptorTest, FindNestedTypeByName) {
-  EXPECT_EQ(foo_, message_->FindNestedTypeByName("Foo"));
-  EXPECT_EQ(bar_, message_->FindNestedTypeByName("Bar"));
-  EXPECT_EQ(foo2_, message2_->FindNestedTypeByName("Foo"));
-  EXPECT_EQ(baz2_, message2_->FindNestedTypeByName("Baz"));
-
-  EXPECT_TRUE(message_->FindNestedTypeByName("NoSuchType") == nullptr);
-  EXPECT_TRUE(message_->FindNestedTypeByName("Baz") == nullptr);
-  EXPECT_TRUE(message2_->FindNestedTypeByName("Bar") == nullptr);
-
-  EXPECT_TRUE(message_->FindNestedTypeByName("Moo") == nullptr);
-}
-
-TEST_F(NestedDescriptorTest, EnumName) {
-  EXPECT_EQ("Baz", baz_->name());
-  EXPECT_EQ("Moo", moo_->name());
-  EXPECT_EQ("Moo", moo2_->name());
-  EXPECT_EQ("Mooo", mooo2_->name());
-
-  EXPECT_EQ("TestMessage.Baz", baz_->full_name());
-  EXPECT_EQ("TestMessage.Moo", moo_->full_name());
-  EXPECT_EQ("corge.grault.TestMessage2.Moo", moo2_->full_name());
-  EXPECT_EQ("corge.grault.TestMessage2.Mooo", mooo2_->full_name());
-}
-
-TEST_F(NestedDescriptorTest, EnumContainingType) {
-  EXPECT_EQ(message_, baz_->containing_type());
-  EXPECT_EQ(message_, moo_->containing_type());
-  EXPECT_EQ(message2_, moo2_->containing_type());
-  EXPECT_EQ(message2_, mooo2_->containing_type());
-}
-
-TEST_F(NestedDescriptorTest, NestedEnumsByIndex) {
-  ASSERT_EQ(2, message_->nested_type_count());
-  EXPECT_EQ(foo_, message_->nested_type(0));
-  EXPECT_EQ(bar_, message_->nested_type(1));
-}
-
-TEST_F(NestedDescriptorTest, FindEnumTypeByName) {
-  EXPECT_EQ(baz_, message_->FindEnumTypeByName("Baz"));
-  EXPECT_EQ(moo_, message_->FindEnumTypeByName("Moo"));
-  EXPECT_EQ(moo2_, message2_->FindEnumTypeByName("Moo"));
-  EXPECT_EQ(mooo2_, message2_->FindEnumTypeByName("Mooo"));
-
-  EXPECT_TRUE(message_->FindEnumTypeByName("NoSuchType") == nullptr);
-  EXPECT_TRUE(message_->FindEnumTypeByName("Mooo") == nullptr);
-  EXPECT_TRUE(message2_->FindEnumTypeByName("Baz") == nullptr);
-
-  EXPECT_TRUE(message_->FindEnumTypeByName("Foo") == nullptr);
-}
-
-TEST_F(NestedDescriptorTest, FindEnumValueByName) {
-  EXPECT_EQ(a_, message_->FindEnumValueByName("A"));
-  EXPECT_EQ(b_, message_->FindEnumValueByName("B"));
-  EXPECT_EQ(a2_, message2_->FindEnumValueByName("A"));
-  EXPECT_EQ(c2_, message2_->FindEnumValueByName("C"));
-
-  EXPECT_TRUE(message_->FindEnumValueByName("NO_SUCH_VALUE") == nullptr);
-  EXPECT_TRUE(message_->FindEnumValueByName("C") == nullptr);
-  EXPECT_TRUE(message2_->FindEnumValueByName("B") == nullptr);
-
-  EXPECT_TRUE(message_->FindEnumValueByName("Foo") == nullptr);
-}
-
-// ===================================================================
-
-// Test extensions.
-class ExtensionDescriptorTest : public testing::Test {
- protected:
-  void SetUp() override {
-    // Build descriptors for the following definitions:
-    //
-    //   enum Baz {}
-    //   message Moo {}
-    //
-    //   message Foo {
-    //     extensions 10 to 19;
-    //     extensions 30 to 39;
-    //   }
-    //   extend Foo {
-    //     optional int32 foo_int32 = 10;
-    //   }
-    //   extend Foo {
-    //     repeated TestEnum foo_enum = 19;
-    //   }
-    //   message Bar {
-    //     optional int32 non_ext_int32 = 1;
-    //     extend Foo {
-    //       optional Moo foo_message = 30;
-    //       repeated Moo foo_group = 39;  // (but internally set to TYPE_GROUP)
-    //     }
-    //   }
-
-    FileDescriptorProto foo_file;
-    foo_file.set_name("foo.proto");
-
-    AddEmptyEnum(&foo_file, "Baz");
-    AddMessage(&foo_file, "Moo");
-
-    DescriptorProto* foo = AddMessage(&foo_file, "Foo");
-    AddExtensionRange(foo, 10, 20);
-    AddExtensionRange(foo, 30, 40);
-
-    AddExtension(&foo_file, "Foo", "foo_int32", 10,
-                 FieldDescriptorProto::LABEL_OPTIONAL,
-                 FieldDescriptorProto::TYPE_INT32);
-    AddExtension(&foo_file, "Foo", "foo_enum", 19,
-                 FieldDescriptorProto::LABEL_REPEATED,
-                 FieldDescriptorProto::TYPE_ENUM)
-        ->set_type_name("Baz");
-
-    DescriptorProto* bar = AddMessage(&foo_file, "Bar");
-    AddField(bar, "non_ext_int32", 1, FieldDescriptorProto::LABEL_OPTIONAL,
-             FieldDescriptorProto::TYPE_INT32);
-    AddNestedExtension(bar, "Foo", "foo_message", 30,
-                       FieldDescriptorProto::LABEL_OPTIONAL,
-                       FieldDescriptorProto::TYPE_MESSAGE)
-        ->set_type_name("Moo");
-    AddNestedExtension(bar, "Foo", "foo_group", 39,
-                       FieldDescriptorProto::LABEL_REPEATED,
-                       FieldDescriptorProto::TYPE_GROUP)
-        ->set_type_name("Moo");
-
-    // Build the descriptors and get the pointers.
-    foo_file_ = pool_.BuildFile(foo_file);
-    ASSERT_TRUE(foo_file_ != nullptr);
-
-    ASSERT_EQ(1, foo_file_->enum_type_count());
-    baz_ = foo_file_->enum_type(0);
-
-    ASSERT_EQ(3, foo_file_->message_type_count());
-    moo_ = foo_file_->message_type(0);
-    foo_ = foo_file_->message_type(1);
-    bar_ = foo_file_->message_type(2);
-  }
-
-  DescriptorPool pool_;
-
-  const FileDescriptor* foo_file_;
-
-  const Descriptor* foo_;
-  const Descriptor* bar_;
-  const EnumDescriptor* baz_;
-  const Descriptor* moo_;
-};
-
-TEST_F(ExtensionDescriptorTest, ExtensionRanges) {
-  EXPECT_EQ(0, bar_->extension_range_count());
-  ASSERT_EQ(2, foo_->extension_range_count());
-
-  EXPECT_EQ(10, foo_->extension_range(0)->start);
-  EXPECT_EQ(30, foo_->extension_range(1)->start);
-
-  EXPECT_EQ(20, foo_->extension_range(0)->end);
-  EXPECT_EQ(40, foo_->extension_range(1)->end);
-}
-
-TEST_F(ExtensionDescriptorTest, Extensions) {
-  EXPECT_EQ(0, foo_->extension_count());
-  ASSERT_EQ(2, foo_file_->extension_count());
-  ASSERT_EQ(2, bar_->extension_count());
-
-  EXPECT_TRUE(foo_file_->extension(0)->is_extension());
-  EXPECT_TRUE(foo_file_->extension(1)->is_extension());
-  EXPECT_TRUE(bar_->extension(0)->is_extension());
-  EXPECT_TRUE(bar_->extension(1)->is_extension());
-
-  EXPECT_EQ("foo_int32", foo_file_->extension(0)->name());
-  EXPECT_EQ("foo_enum", foo_file_->extension(1)->name());
-  EXPECT_EQ("foo_message", bar_->extension(0)->name());
-  EXPECT_EQ("foo_group", bar_->extension(1)->name());
-
-  EXPECT_EQ(10, foo_file_->extension(0)->number());
-  EXPECT_EQ(19, foo_file_->extension(1)->number());
-  EXPECT_EQ(30, bar_->extension(0)->number());
-  EXPECT_EQ(39, bar_->extension(1)->number());
-
-  EXPECT_EQ(FieldDescriptor::TYPE_INT32, foo_file_->extension(0)->type());
-  EXPECT_EQ(FieldDescriptor::TYPE_ENUM, foo_file_->extension(1)->type());
-  EXPECT_EQ(FieldDescriptor::TYPE_MESSAGE, bar_->extension(0)->type());
-  EXPECT_EQ(FieldDescriptor::TYPE_GROUP, bar_->extension(1)->type());
-
-  EXPECT_EQ(baz_, foo_file_->extension(1)->enum_type());
-  EXPECT_EQ(moo_, bar_->extension(0)->message_type());
-  EXPECT_EQ(moo_, bar_->extension(1)->message_type());
-
-  EXPECT_EQ(FieldDescriptor::LABEL_OPTIONAL, foo_file_->extension(0)->label());
-  EXPECT_EQ(FieldDescriptor::LABEL_REPEATED, foo_file_->extension(1)->label());
-  EXPECT_EQ(FieldDescriptor::LABEL_OPTIONAL, bar_->extension(0)->label());
-  EXPECT_EQ(FieldDescriptor::LABEL_REPEATED, bar_->extension(1)->label());
-
-  EXPECT_EQ(foo_, foo_file_->extension(0)->containing_type());
-  EXPECT_EQ(foo_, foo_file_->extension(1)->containing_type());
-  EXPECT_EQ(foo_, bar_->extension(0)->containing_type());
-  EXPECT_EQ(foo_, bar_->extension(1)->containing_type());
-
-  EXPECT_TRUE(foo_file_->extension(0)->extension_scope() == nullptr);
-  EXPECT_TRUE(foo_file_->extension(1)->extension_scope() == nullptr);
-  EXPECT_EQ(bar_, bar_->extension(0)->extension_scope());
-  EXPECT_EQ(bar_, bar_->extension(1)->extension_scope());
-}
-
-TEST_F(ExtensionDescriptorTest, IsExtensionNumber) {
-  EXPECT_FALSE(foo_->IsExtensionNumber(9));
-  EXPECT_TRUE(foo_->IsExtensionNumber(10));
-  EXPECT_TRUE(foo_->IsExtensionNumber(19));
-  EXPECT_FALSE(foo_->IsExtensionNumber(20));
-  EXPECT_FALSE(foo_->IsExtensionNumber(29));
-  EXPECT_TRUE(foo_->IsExtensionNumber(30));
-  EXPECT_TRUE(foo_->IsExtensionNumber(39));
-  EXPECT_FALSE(foo_->IsExtensionNumber(40));
-}
-
-TEST_F(ExtensionDescriptorTest, FindExtensionByName) {
-  // Note that FileDescriptor::FindExtensionByName() is tested by
-  // FileDescriptorTest.
-  ASSERT_EQ(2, bar_->extension_count());
-
-  EXPECT_EQ(bar_->extension(0), bar_->FindExtensionByName("foo_message"));
-  EXPECT_EQ(bar_->extension(1), bar_->FindExtensionByName("foo_group"));
-
-  EXPECT_TRUE(bar_->FindExtensionByName("no_such_extension") == nullptr);
-  EXPECT_TRUE(foo_->FindExtensionByName("foo_int32") == nullptr);
-  EXPECT_TRUE(foo_->FindExtensionByName("foo_message") == nullptr);
-}
-
-TEST_F(ExtensionDescriptorTest, FieldVsExtension) {
-  EXPECT_EQ(foo_->FindFieldByName("foo_message"), nullptr);
-  EXPECT_EQ(bar_->FindFieldByName("foo_message"), nullptr);
-  EXPECT_NE(bar_->FindFieldByName("non_ext_int32"), nullptr);
-  EXPECT_EQ(foo_->FindExtensionByName("foo_message"), nullptr);
-  EXPECT_NE(bar_->FindExtensionByName("foo_message"), nullptr);
-  EXPECT_EQ(bar_->FindExtensionByName("non_ext_int32"), nullptr);
-}
-
-TEST_F(ExtensionDescriptorTest, FindExtensionByPrintableName) {
-  EXPECT_TRUE(pool_.FindExtensionByPrintableName(foo_, "no_such_extension") ==
-              nullptr);
-  EXPECT_TRUE(pool_.FindExtensionByPrintableName(bar_, "no_such_extension") ==
-              nullptr);
-
-  ASSERT_FALSE(pool_.FindExtensionByPrintableName(foo_, "Bar.foo_message") ==
-               nullptr);
-  ASSERT_FALSE(pool_.FindExtensionByPrintableName(foo_, "Bar.foo_group") ==
-               nullptr);
-  EXPECT_TRUE(pool_.FindExtensionByPrintableName(bar_, "foo_message") ==
-              nullptr);
-  EXPECT_TRUE(pool_.FindExtensionByPrintableName(bar_, "foo_group") == nullptr);
-  EXPECT_EQ(bar_->FindExtensionByName("foo_message"),
-            pool_.FindExtensionByPrintableName(foo_, "Bar.foo_message"));
-  EXPECT_EQ(bar_->FindExtensionByName("foo_group"),
-            pool_.FindExtensionByPrintableName(foo_, "Bar.foo_group"));
-
-  ASSERT_FALSE(pool_.FindExtensionByPrintableName(foo_, "foo_int32") ==
-               nullptr);
-  ASSERT_FALSE(pool_.FindExtensionByPrintableName(foo_, "foo_enum") == nullptr);
-  EXPECT_TRUE(pool_.FindExtensionByPrintableName(bar_, "foo_int32") == nullptr);
-  EXPECT_TRUE(pool_.FindExtensionByPrintableName(bar_, "foo_enum") == nullptr);
-  EXPECT_EQ(foo_file_->FindExtensionByName("foo_int32"),
-            pool_.FindExtensionByPrintableName(foo_, "foo_int32"));
-  EXPECT_EQ(foo_file_->FindExtensionByName("foo_enum"),
-            pool_.FindExtensionByPrintableName(foo_, "foo_enum"));
-}
-
-TEST_F(ExtensionDescriptorTest, FindAllExtensions) {
-  std::vector<const FieldDescriptor*> extensions;
-  pool_.FindAllExtensions(foo_, &extensions);
-  ASSERT_EQ(4, extensions.size());
-  EXPECT_EQ(10, extensions[0]->number());
-  EXPECT_EQ(19, extensions[1]->number());
-  EXPECT_EQ(30, extensions[2]->number());
-  EXPECT_EQ(39, extensions[3]->number());
-}
-
-
-TEST_F(ExtensionDescriptorTest, DuplicateFieldNumber) {
-  DescriptorPool pool;
-  FileDescriptorProto file_proto;
-  // Add "google/protobuf/descriptor.proto".
-  FileDescriptorProto::descriptor()->file()->CopyTo(&file_proto);
-  ASSERT_TRUE(pool.BuildFile(file_proto) != nullptr);
-  // Add "foo.proto":
-  //   import "google/protobuf/descriptor.proto";
-  //   extend google.protobuf.FieldOptions {
-  //     optional int32 option1 = 1000;
-  //   }
-  file_proto.Clear();
-  file_proto.set_name("foo.proto");
-  file_proto.add_dependency("google/protobuf/descriptor.proto");
-  AddExtension(&file_proto, "google.protobuf.FieldOptions", "option1", 1000,
-               FieldDescriptorProto::LABEL_OPTIONAL,
-               FieldDescriptorProto::TYPE_INT32);
-  ASSERT_TRUE(pool.BuildFile(file_proto) != nullptr);
-  // Add "bar.proto":
-  //   import "google/protobuf/descriptor.proto";
-  //   extend google.protobuf.FieldOptions {
-  //     optional int32 option2 = 1000;
-  //   }
-  file_proto.Clear();
-  file_proto.set_name("bar.proto");
-  file_proto.add_dependency("google/protobuf/descriptor.proto");
-  AddExtension(&file_proto, "google.protobuf.FieldOptions", "option2", 1000,
-               FieldDescriptorProto::LABEL_OPTIONAL,
-               FieldDescriptorProto::TYPE_INT32);
-  // Currently we only generate a warning for conflicting extension numbers.
-  // TODO(xiaofeng): Change it to an error.
-  ASSERT_TRUE(pool.BuildFile(file_proto) != nullptr);
-}
-
-// ===================================================================
-
-// Ensure that overlapping extension ranges are not allowed.
-TEST(OverlappingExtensionRangeTest, ExtensionRangeInternal) {
-  // Build descriptors for the following definitions:
-  //
-  //   message Foo {
-  //     extensions 10 to 19;
-  //     extensions 15;
-  //   }
-  FileDescriptorProto foo_file;
-  foo_file.set_name("foo.proto");
-
-  DescriptorProto* foo = AddMessage(&foo_file, "Foo");
-  AddExtensionRange(foo, 10, 20);
-  AddExtensionRange(foo, 15, 16);
-
-  DescriptorPool pool;
-  MockErrorCollector error_collector;
-  // The extensions ranges are invalid, so the proto shouldn't build.
-  ASSERT_TRUE(pool.BuildFileCollectingErrors(foo_file, &error_collector) ==
-              nullptr);
-  ASSERT_EQ(
-      "foo.proto: Foo: NUMBER: Extension range 15 to 15 overlaps with "
-      "already-defined range 10 to 19.\n",
-      error_collector.text_);
-}
-
-TEST(OverlappingExtensionRangeTest, ExtensionRangeAfter) {
-  // Build descriptors for the following definitions:
-  //
-  //   message Foo {
-  //     extensions 10 to 19;
-  //     extensions 15 to 24;
-  //   }
-  FileDescriptorProto foo_file;
-  foo_file.set_name("foo.proto");
-
-  DescriptorProto* foo = AddMessage(&foo_file, "Foo");
-  AddExtensionRange(foo, 10, 20);
-  AddExtensionRange(foo, 15, 25);
-
-  DescriptorPool pool;
-  MockErrorCollector error_collector;
-  // The extensions ranges are invalid, so the proto shouldn't build.
-  ASSERT_TRUE(pool.BuildFileCollectingErrors(foo_file, &error_collector) ==
-              nullptr);
-  ASSERT_EQ(
-      "foo.proto: Foo: NUMBER: Extension range 15 to 24 overlaps with "
-      "already-defined range 10 to 19.\n",
-      error_collector.text_);
-}
-
-TEST(OverlappingExtensionRangeTest, ExtensionRangeBefore) {
-  // Build descriptors for the following definitions:
-  //
-  //   message Foo {
-  //     extensions 10 to 19;
-  //     extensions 5 to 14;
-  //   }
-  FileDescriptorProto foo_file;
-  foo_file.set_name("foo.proto");
-
-  DescriptorProto* foo = AddMessage(&foo_file, "Foo");
-  AddExtensionRange(foo, 10, 20);
-  AddExtensionRange(foo, 5, 15);
-
-  DescriptorPool pool;
-  MockErrorCollector error_collector;
-  // The extensions ranges are invalid, so the proto shouldn't build.
-  ASSERT_TRUE(pool.BuildFileCollectingErrors(foo_file, &error_collector) ==
-              nullptr);
-  ASSERT_EQ(
-      "foo.proto: Foo: NUMBER: Extension range 5 to 14 overlaps with "
-      "already-defined range 10 to 19.\n",
-      error_collector.text_);
-}
-
-// ===================================================================
-
-// Test reserved fields.
-class ReservedDescriptorTest : public testing::Test {
- protected:
-  void SetUp() override {
-    // Build descriptors for the following definitions:
-    //
-    //   message Foo {
-    //     reserved 2, 9 to 11, 15;
-    //     reserved "foo", "bar";
-    //   }
-
-    FileDescriptorProto foo_file;
-    foo_file.set_name("foo.proto");
-
-    DescriptorProto* foo = AddMessage(&foo_file, "Foo");
-    AddReservedRange(foo, 2, 3);
-    AddReservedRange(foo, 9, 12);
-    AddReservedRange(foo, 15, 16);
-
-    foo->add_reserved_name("foo");
-    foo->add_reserved_name("bar");
-
-    // Build the descriptors and get the pointers.
-    foo_file_ = pool_.BuildFile(foo_file);
-    ASSERT_TRUE(foo_file_ != nullptr);
-
-    ASSERT_EQ(1, foo_file_->message_type_count());
-    foo_ = foo_file_->message_type(0);
-  }
-
-  DescriptorPool pool_;
-  const FileDescriptor* foo_file_;
-  const Descriptor* foo_;
-};
-
-TEST_F(ReservedDescriptorTest, ReservedRanges) {
-  ASSERT_EQ(3, foo_->reserved_range_count());
-
-  EXPECT_EQ(2, foo_->reserved_range(0)->start);
-  EXPECT_EQ(3, foo_->reserved_range(0)->end);
-
-  EXPECT_EQ(9, foo_->reserved_range(1)->start);
-  EXPECT_EQ(12, foo_->reserved_range(1)->end);
-
-  EXPECT_EQ(15, foo_->reserved_range(2)->start);
-  EXPECT_EQ(16, foo_->reserved_range(2)->end);
-}
-
-TEST_F(ReservedDescriptorTest, IsReservedNumber) {
-  EXPECT_FALSE(foo_->IsReservedNumber(1));
-  EXPECT_TRUE(foo_->IsReservedNumber(2));
-  EXPECT_FALSE(foo_->IsReservedNumber(3));
-  EXPECT_FALSE(foo_->IsReservedNumber(8));
-  EXPECT_TRUE(foo_->IsReservedNumber(9));
-  EXPECT_TRUE(foo_->IsReservedNumber(10));
-  EXPECT_TRUE(foo_->IsReservedNumber(11));
-  EXPECT_FALSE(foo_->IsReservedNumber(12));
-  EXPECT_FALSE(foo_->IsReservedNumber(13));
-  EXPECT_FALSE(foo_->IsReservedNumber(14));
-  EXPECT_TRUE(foo_->IsReservedNumber(15));
-  EXPECT_FALSE(foo_->IsReservedNumber(16));
-}
-
-TEST_F(ReservedDescriptorTest, ReservedNames) {
-  ASSERT_EQ(2, foo_->reserved_name_count());
-
-  EXPECT_EQ("foo", foo_->reserved_name(0));
-  EXPECT_EQ("bar", foo_->reserved_name(1));
-}
-
-TEST_F(ReservedDescriptorTest, IsReservedName) {
-  EXPECT_TRUE(foo_->IsReservedName("foo"));
-  EXPECT_TRUE(foo_->IsReservedName("bar"));
-  EXPECT_FALSE(foo_->IsReservedName("baz"));
-}
-
-// ===================================================================
-
-// Test reserved enum fields.
-class ReservedEnumDescriptorTest : public testing::Test {
- protected:
-  void SetUp() override {
-    // Build descriptors for the following definitions:
-    //
-    //   enum Foo {
-    //     BAR = 1;
-    //     reserved 2, 9 to 11, 15;
-    //     reserved "foo", "bar";
-    //   }
-
-    FileDescriptorProto foo_file;
-    foo_file.set_name("foo.proto");
-
-    EnumDescriptorProto* foo = AddEnum(&foo_file, "Foo");
-    EnumDescriptorProto* edge1 = AddEnum(&foo_file, "Edge1");
-    EnumDescriptorProto* edge2 = AddEnum(&foo_file, "Edge2");
-
-    AddEnumValue(foo, "BAR", 4);
-    AddReservedRange(foo, -5, -3);
-    AddReservedRange(foo, -2, 1);
-    AddReservedRange(foo, 2, 3);
-    AddReservedRange(foo, 9, 12);
-    AddReservedRange(foo, 15, 16);
-
-    foo->add_reserved_name("foo");
-    foo->add_reserved_name("bar");
-
-    // Some additional edge cases that cover most or all of the range of enum
-    // values
-
-    // Note: We use INT_MAX as the maximum reserved range upper bound,
-    // inclusive.
-    AddEnumValue(edge1, "EDGE1", 1);
-    AddReservedRange(edge1, 10, INT_MAX);
-    AddEnumValue(edge2, "EDGE2", 15);
-    AddReservedRange(edge2, INT_MIN, 10);
-
-    // Build the descriptors and get the pointers.
-    foo_file_ = pool_.BuildFile(foo_file);
-    ASSERT_TRUE(foo_file_ != nullptr);
-
-    ASSERT_EQ(3, foo_file_->enum_type_count());
-    foo_ = foo_file_->enum_type(0);
-    edge1_ = foo_file_->enum_type(1);
-    edge2_ = foo_file_->enum_type(2);
-  }
-
-  DescriptorPool pool_;
-  const FileDescriptor* foo_file_;
-  const EnumDescriptor* foo_;
-  const EnumDescriptor* edge1_;
-  const EnumDescriptor* edge2_;
-};
-
-TEST_F(ReservedEnumDescriptorTest, ReservedRanges) {
-  ASSERT_EQ(5, foo_->reserved_range_count());
-
-  EXPECT_EQ(-5, foo_->reserved_range(0)->start);
-  EXPECT_EQ(-3, foo_->reserved_range(0)->end);
-
-  EXPECT_EQ(-2, foo_->reserved_range(1)->start);
-  EXPECT_EQ(1, foo_->reserved_range(1)->end);
-
-  EXPECT_EQ(2, foo_->reserved_range(2)->start);
-  EXPECT_EQ(3, foo_->reserved_range(2)->end);
-
-  EXPECT_EQ(9, foo_->reserved_range(3)->start);
-  EXPECT_EQ(12, foo_->reserved_range(3)->end);
-
-  EXPECT_EQ(15, foo_->reserved_range(4)->start);
-  EXPECT_EQ(16, foo_->reserved_range(4)->end);
-
-  ASSERT_EQ(1, edge1_->reserved_range_count());
-  EXPECT_EQ(10, edge1_->reserved_range(0)->start);
-  EXPECT_EQ(INT_MAX, edge1_->reserved_range(0)->end);
-
-  ASSERT_EQ(1, edge2_->reserved_range_count());
-  EXPECT_EQ(INT_MIN, edge2_->reserved_range(0)->start);
-  EXPECT_EQ(10, edge2_->reserved_range(0)->end);
-}
-
-TEST_F(ReservedEnumDescriptorTest, IsReservedNumber) {
-  EXPECT_TRUE(foo_->IsReservedNumber(-5));
-  EXPECT_TRUE(foo_->IsReservedNumber(-4));
-  EXPECT_TRUE(foo_->IsReservedNumber(-3));
-  EXPECT_TRUE(foo_->IsReservedNumber(-2));
-  EXPECT_TRUE(foo_->IsReservedNumber(-1));
-  EXPECT_TRUE(foo_->IsReservedNumber(0));
-  EXPECT_TRUE(foo_->IsReservedNumber(1));
-  EXPECT_TRUE(foo_->IsReservedNumber(2));
-  EXPECT_TRUE(foo_->IsReservedNumber(3));
-  EXPECT_FALSE(foo_->IsReservedNumber(8));
-  EXPECT_TRUE(foo_->IsReservedNumber(9));
-  EXPECT_TRUE(foo_->IsReservedNumber(10));
-  EXPECT_TRUE(foo_->IsReservedNumber(11));
-  EXPECT_TRUE(foo_->IsReservedNumber(12));
-  EXPECT_FALSE(foo_->IsReservedNumber(13));
-  EXPECT_FALSE(foo_->IsReservedNumber(13));
-  EXPECT_FALSE(foo_->IsReservedNumber(14));
-  EXPECT_TRUE(foo_->IsReservedNumber(15));
-  EXPECT_TRUE(foo_->IsReservedNumber(16));
-  EXPECT_FALSE(foo_->IsReservedNumber(17));
-
-  EXPECT_FALSE(edge1_->IsReservedNumber(9));
-  EXPECT_TRUE(edge1_->IsReservedNumber(10));
-  EXPECT_TRUE(edge1_->IsReservedNumber(INT_MAX - 1));
-  EXPECT_TRUE(edge1_->IsReservedNumber(INT_MAX));
-
-  EXPECT_TRUE(edge2_->IsReservedNumber(INT_MIN));
-  EXPECT_TRUE(edge2_->IsReservedNumber(9));
-  EXPECT_TRUE(edge2_->IsReservedNumber(10));
-  EXPECT_FALSE(edge2_->IsReservedNumber(11));
-}
-
-TEST_F(ReservedEnumDescriptorTest, ReservedNames) {
-  ASSERT_EQ(2, foo_->reserved_name_count());
-
-  EXPECT_EQ("foo", foo_->reserved_name(0));
-  EXPECT_EQ("bar", foo_->reserved_name(1));
-}
-
-TEST_F(ReservedEnumDescriptorTest, IsReservedName) {
-  EXPECT_TRUE(foo_->IsReservedName("foo"));
-  EXPECT_TRUE(foo_->IsReservedName("bar"));
-  EXPECT_FALSE(foo_->IsReservedName("baz"));
-}
-
-// ===================================================================
-
-class MiscTest : public testing::Test {
- protected:
-  // Function which makes a field descriptor of the given type.
-  const FieldDescriptor* GetFieldDescriptorOfType(FieldDescriptor::Type type) {
-    FileDescriptorProto file_proto;
-    file_proto.set_name("foo.proto");
-    AddEmptyEnum(&file_proto, "DummyEnum");
-
-    DescriptorProto* message = AddMessage(&file_proto, "TestMessage");
-    FieldDescriptorProto* field = AddField(
-        message, "foo", 1, FieldDescriptorProto::LABEL_OPTIONAL,
-        static_cast<FieldDescriptorProto::Type>(static_cast<int>(type)));
-
-    if (type == FieldDescriptor::TYPE_MESSAGE ||
-        type == FieldDescriptor::TYPE_GROUP) {
-      field->set_type_name("TestMessage");
-    } else if (type == FieldDescriptor::TYPE_ENUM) {
-      field->set_type_name("DummyEnum");
-    }
-
-    // Build the descriptors and get the pointers.
-    pool_.reset(new DescriptorPool());
-    const FileDescriptor* file = pool_->BuildFile(file_proto);
-
-    if (file != nullptr && file->message_type_count() == 1 &&
-        file->message_type(0)->field_count() == 1) {
-      return file->message_type(0)->field(0);
-    } else {
-      return nullptr;
-    }
-  }
-
-  const char* GetTypeNameForFieldType(FieldDescriptor::Type type) {
-    const FieldDescriptor* field = GetFieldDescriptorOfType(type);
-    return field != nullptr ? field->type_name() : "";
-  }
-
-  FieldDescriptor::CppType GetCppTypeForFieldType(FieldDescriptor::Type type) {
-    const FieldDescriptor* field = GetFieldDescriptorOfType(type);
-    return field != nullptr ? field->cpp_type()
-                            : static_cast<FieldDescriptor::CppType>(0);
-  }
-
-  const char* GetCppTypeNameForFieldType(FieldDescriptor::Type type) {
-    const FieldDescriptor* field = GetFieldDescriptorOfType(type);
-    return field != nullptr ? field->cpp_type_name() : "";
-  }
-
-  const Descriptor* GetMessageDescriptorForFieldType(
-      FieldDescriptor::Type type) {
-    const FieldDescriptor* field = GetFieldDescriptorOfType(type);
-    return field != nullptr ? field->message_type() : nullptr;
-  }
-
-  const EnumDescriptor* GetEnumDescriptorForFieldType(
-      FieldDescriptor::Type type) {
-    const FieldDescriptor* field = GetFieldDescriptorOfType(type);
-    return field != nullptr ? field->enum_type() : nullptr;
-  }
-
-  std::unique_ptr<DescriptorPool> pool_;
-};
-
-TEST_F(MiscTest, TypeNames) {
-  // Test that correct type names are returned.
-
-  typedef FieldDescriptor FD;  // avoid ugly line wrapping
-
-  EXPECT_STREQ("double", GetTypeNameForFieldType(FD::TYPE_DOUBLE));
-  EXPECT_STREQ("float", GetTypeNameForFieldType(FD::TYPE_FLOAT));
-  EXPECT_STREQ("int64", GetTypeNameForFieldType(FD::TYPE_INT64));
-  EXPECT_STREQ("uint64", GetTypeNameForFieldType(FD::TYPE_UINT64));
-  EXPECT_STREQ("int32", GetTypeNameForFieldType(FD::TYPE_INT32));
-  EXPECT_STREQ("fixed64", GetTypeNameForFieldType(FD::TYPE_FIXED64));
-  EXPECT_STREQ("fixed32", GetTypeNameForFieldType(FD::TYPE_FIXED32));
-  EXPECT_STREQ("bool", GetTypeNameForFieldType(FD::TYPE_BOOL));
-  EXPECT_STREQ("string", GetTypeNameForFieldType(FD::TYPE_STRING));
-  EXPECT_STREQ("group", GetTypeNameForFieldType(FD::TYPE_GROUP));
-  EXPECT_STREQ("message", GetTypeNameForFieldType(FD::TYPE_MESSAGE));
-  EXPECT_STREQ("bytes", GetTypeNameForFieldType(FD::TYPE_BYTES));
-  EXPECT_STREQ("uint32", GetTypeNameForFieldType(FD::TYPE_UINT32));
-  EXPECT_STREQ("enum", GetTypeNameForFieldType(FD::TYPE_ENUM));
-  EXPECT_STREQ("sfixed32", GetTypeNameForFieldType(FD::TYPE_SFIXED32));
-  EXPECT_STREQ("sfixed64", GetTypeNameForFieldType(FD::TYPE_SFIXED64));
-  EXPECT_STREQ("sint32", GetTypeNameForFieldType(FD::TYPE_SINT32));
-  EXPECT_STREQ("sint64", GetTypeNameForFieldType(FD::TYPE_SINT64));
-}
-
-TEST_F(MiscTest, StaticTypeNames) {
-  // Test that correct type names are returned.
-
-  typedef FieldDescriptor FD;  // avoid ugly line wrapping
-
-  EXPECT_STREQ("double", FD::TypeName(FD::TYPE_DOUBLE));
-  EXPECT_STREQ("float", FD::TypeName(FD::TYPE_FLOAT));
-  EXPECT_STREQ("int64", FD::TypeName(FD::TYPE_INT64));
-  EXPECT_STREQ("uint64", FD::TypeName(FD::TYPE_UINT64));
-  EXPECT_STREQ("int32", FD::TypeName(FD::TYPE_INT32));
-  EXPECT_STREQ("fixed64", FD::TypeName(FD::TYPE_FIXED64));
-  EXPECT_STREQ("fixed32", FD::TypeName(FD::TYPE_FIXED32));
-  EXPECT_STREQ("bool", FD::TypeName(FD::TYPE_BOOL));
-  EXPECT_STREQ("string", FD::TypeName(FD::TYPE_STRING));
-  EXPECT_STREQ("group", FD::TypeName(FD::TYPE_GROUP));
-  EXPECT_STREQ("message", FD::TypeName(FD::TYPE_MESSAGE));
-  EXPECT_STREQ("bytes", FD::TypeName(FD::TYPE_BYTES));
-  EXPECT_STREQ("uint32", FD::TypeName(FD::TYPE_UINT32));
-  EXPECT_STREQ("enum", FD::TypeName(FD::TYPE_ENUM));
-  EXPECT_STREQ("sfixed32", FD::TypeName(FD::TYPE_SFIXED32));
-  EXPECT_STREQ("sfixed64", FD::TypeName(FD::TYPE_SFIXED64));
-  EXPECT_STREQ("sint32", FD::TypeName(FD::TYPE_SINT32));
-  EXPECT_STREQ("sint64", FD::TypeName(FD::TYPE_SINT64));
-}
-
-TEST_F(MiscTest, CppTypes) {
-  // Test that CPP types are assigned correctly.
-
-  typedef FieldDescriptor FD;  // avoid ugly line wrapping
-
-  EXPECT_EQ(FD::CPPTYPE_DOUBLE, GetCppTypeForFieldType(FD::TYPE_DOUBLE));
-  EXPECT_EQ(FD::CPPTYPE_FLOAT, GetCppTypeForFieldType(FD::TYPE_FLOAT));
-  EXPECT_EQ(FD::CPPTYPE_INT64, GetCppTypeForFieldType(FD::TYPE_INT64));
-  EXPECT_EQ(FD::CPPTYPE_UINT64, GetCppTypeForFieldType(FD::TYPE_UINT64));
-  EXPECT_EQ(FD::CPPTYPE_INT32, GetCppTypeForFieldType(FD::TYPE_INT32));
-  EXPECT_EQ(FD::CPPTYPE_UINT64, GetCppTypeForFieldType(FD::TYPE_FIXED64));
-  EXPECT_EQ(FD::CPPTYPE_UINT32, GetCppTypeForFieldType(FD::TYPE_FIXED32));
-  EXPECT_EQ(FD::CPPTYPE_BOOL, GetCppTypeForFieldType(FD::TYPE_BOOL));
-  EXPECT_EQ(FD::CPPTYPE_STRING, GetCppTypeForFieldType(FD::TYPE_STRING));
-  EXPECT_EQ(FD::CPPTYPE_MESSAGE, GetCppTypeForFieldType(FD::TYPE_GROUP));
-  EXPECT_EQ(FD::CPPTYPE_MESSAGE, GetCppTypeForFieldType(FD::TYPE_MESSAGE));
-  EXPECT_EQ(FD::CPPTYPE_STRING, GetCppTypeForFieldType(FD::TYPE_BYTES));
-  EXPECT_EQ(FD::CPPTYPE_UINT32, GetCppTypeForFieldType(FD::TYPE_UINT32));
-  EXPECT_EQ(FD::CPPTYPE_ENUM, GetCppTypeForFieldType(FD::TYPE_ENUM));
-  EXPECT_EQ(FD::CPPTYPE_INT32, GetCppTypeForFieldType(FD::TYPE_SFIXED32));
-  EXPECT_EQ(FD::CPPTYPE_INT64, GetCppTypeForFieldType(FD::TYPE_SFIXED64));
-  EXPECT_EQ(FD::CPPTYPE_INT32, GetCppTypeForFieldType(FD::TYPE_SINT32));
-  EXPECT_EQ(FD::CPPTYPE_INT64, GetCppTypeForFieldType(FD::TYPE_SINT64));
-}
-
-TEST_F(MiscTest, CppTypeNames) {
-  // Test that correct CPP type names are returned.
-
-  typedef FieldDescriptor FD;  // avoid ugly line wrapping
-
-  EXPECT_STREQ("double", GetCppTypeNameForFieldType(FD::TYPE_DOUBLE));
-  EXPECT_STREQ("float", GetCppTypeNameForFieldType(FD::TYPE_FLOAT));
-  EXPECT_STREQ("int64", GetCppTypeNameForFieldType(FD::TYPE_INT64));
-  EXPECT_STREQ("uint64", GetCppTypeNameForFieldType(FD::TYPE_UINT64));
-  EXPECT_STREQ("int32", GetCppTypeNameForFieldType(FD::TYPE_INT32));
-  EXPECT_STREQ("uint64", GetCppTypeNameForFieldType(FD::TYPE_FIXED64));
-  EXPECT_STREQ("uint32", GetCppTypeNameForFieldType(FD::TYPE_FIXED32));
-  EXPECT_STREQ("bool", GetCppTypeNameForFieldType(FD::TYPE_BOOL));
-  EXPECT_STREQ("string", GetCppTypeNameForFieldType(FD::TYPE_STRING));
-  EXPECT_STREQ("message", GetCppTypeNameForFieldType(FD::TYPE_GROUP));
-  EXPECT_STREQ("message", GetCppTypeNameForFieldType(FD::TYPE_MESSAGE));
-  EXPECT_STREQ("string", GetCppTypeNameForFieldType(FD::TYPE_BYTES));
-  EXPECT_STREQ("uint32", GetCppTypeNameForFieldType(FD::TYPE_UINT32));
-  EXPECT_STREQ("enum", GetCppTypeNameForFieldType(FD::TYPE_ENUM));
-  EXPECT_STREQ("int32", GetCppTypeNameForFieldType(FD::TYPE_SFIXED32));
-  EXPECT_STREQ("int64", GetCppTypeNameForFieldType(FD::TYPE_SFIXED64));
-  EXPECT_STREQ("int32", GetCppTypeNameForFieldType(FD::TYPE_SINT32));
-  EXPECT_STREQ("int64", GetCppTypeNameForFieldType(FD::TYPE_SINT64));
-}
-
-TEST_F(MiscTest, StaticCppTypeNames) {
-  // Test that correct CPP type names are returned.
-
-  typedef FieldDescriptor FD;  // avoid ugly line wrapping
-
-  EXPECT_STREQ("int32", FD::CppTypeName(FD::CPPTYPE_INT32));
-  EXPECT_STREQ("int64", FD::CppTypeName(FD::CPPTYPE_INT64));
-  EXPECT_STREQ("uint32", FD::CppTypeName(FD::CPPTYPE_UINT32));
-  EXPECT_STREQ("uint64", FD::CppTypeName(FD::CPPTYPE_UINT64));
-  EXPECT_STREQ("double", FD::CppTypeName(FD::CPPTYPE_DOUBLE));
-  EXPECT_STREQ("float", FD::CppTypeName(FD::CPPTYPE_FLOAT));
-  EXPECT_STREQ("bool", FD::CppTypeName(FD::CPPTYPE_BOOL));
-  EXPECT_STREQ("enum", FD::CppTypeName(FD::CPPTYPE_ENUM));
-  EXPECT_STREQ("string", FD::CppTypeName(FD::CPPTYPE_STRING));
-  EXPECT_STREQ("message", FD::CppTypeName(FD::CPPTYPE_MESSAGE));
-}
-
-TEST_F(MiscTest, MessageType) {
-  // Test that message_type() is nullptr for non-aggregate fields
-
-  typedef FieldDescriptor FD;  // avoid ugly line wrapping
-
-  EXPECT_TRUE(nullptr == GetMessageDescriptorForFieldType(FD::TYPE_DOUBLE));
-  EXPECT_TRUE(nullptr == GetMessageDescriptorForFieldType(FD::TYPE_FLOAT));
-  EXPECT_TRUE(nullptr == GetMessageDescriptorForFieldType(FD::TYPE_INT64));
-  EXPECT_TRUE(nullptr == GetMessageDescriptorForFieldType(FD::TYPE_UINT64));
-  EXPECT_TRUE(nullptr == GetMessageDescriptorForFieldType(FD::TYPE_INT32));
-  EXPECT_TRUE(nullptr == GetMessageDescriptorForFieldType(FD::TYPE_FIXED64));
-  EXPECT_TRUE(nullptr == GetMessageDescriptorForFieldType(FD::TYPE_FIXED32));
-  EXPECT_TRUE(nullptr == GetMessageDescriptorForFieldType(FD::TYPE_BOOL));
-  EXPECT_TRUE(nullptr == GetMessageDescriptorForFieldType(FD::TYPE_STRING));
-  EXPECT_TRUE(nullptr != GetMessageDescriptorForFieldType(FD::TYPE_GROUP));
-  EXPECT_TRUE(nullptr != GetMessageDescriptorForFieldType(FD::TYPE_MESSAGE));
-  EXPECT_TRUE(nullptr == GetMessageDescriptorForFieldType(FD::TYPE_BYTES));
-  EXPECT_TRUE(nullptr == GetMessageDescriptorForFieldType(FD::TYPE_UINT32));
-  EXPECT_TRUE(nullptr == GetMessageDescriptorForFieldType(FD::TYPE_ENUM));
-  EXPECT_TRUE(nullptr == GetMessageDescriptorForFieldType(FD::TYPE_SFIXED32));
-  EXPECT_TRUE(nullptr == GetMessageDescriptorForFieldType(FD::TYPE_SFIXED64));
-  EXPECT_TRUE(nullptr == GetMessageDescriptorForFieldType(FD::TYPE_SINT32));
-  EXPECT_TRUE(nullptr == GetMessageDescriptorForFieldType(FD::TYPE_SINT64));
-}
-
-TEST_F(MiscTest, EnumType) {
-  // Test that enum_type() is nullptr for non-enum fields
-
-  typedef FieldDescriptor FD;  // avoid ugly line wrapping
-
-  EXPECT_TRUE(nullptr == GetEnumDescriptorForFieldType(FD::TYPE_DOUBLE));
-  EXPECT_TRUE(nullptr == GetEnumDescriptorForFieldType(FD::TYPE_FLOAT));
-  EXPECT_TRUE(nullptr == GetEnumDescriptorForFieldType(FD::TYPE_INT64));
-  EXPECT_TRUE(nullptr == GetEnumDescriptorForFieldType(FD::TYPE_UINT64));
-  EXPECT_TRUE(nullptr == GetEnumDescriptorForFieldType(FD::TYPE_INT32));
-  EXPECT_TRUE(nullptr == GetEnumDescriptorForFieldType(FD::TYPE_FIXED64));
-  EXPECT_TRUE(nullptr == GetEnumDescriptorForFieldType(FD::TYPE_FIXED32));
-  EXPECT_TRUE(nullptr == GetEnumDescriptorForFieldType(FD::TYPE_BOOL));
-  EXPECT_TRUE(nullptr == GetEnumDescriptorForFieldType(FD::TYPE_STRING));
-  EXPECT_TRUE(nullptr == GetEnumDescriptorForFieldType(FD::TYPE_GROUP));
-  EXPECT_TRUE(nullptr == GetEnumDescriptorForFieldType(FD::TYPE_MESSAGE));
-  EXPECT_TRUE(nullptr == GetEnumDescriptorForFieldType(FD::TYPE_BYTES));
-  EXPECT_TRUE(nullptr == GetEnumDescriptorForFieldType(FD::TYPE_UINT32));
-  EXPECT_TRUE(nullptr != GetEnumDescriptorForFieldType(FD::TYPE_ENUM));
-  EXPECT_TRUE(nullptr == GetEnumDescriptorForFieldType(FD::TYPE_SFIXED32));
-  EXPECT_TRUE(nullptr == GetEnumDescriptorForFieldType(FD::TYPE_SFIXED64));
-  EXPECT_TRUE(nullptr == GetEnumDescriptorForFieldType(FD::TYPE_SINT32));
-  EXPECT_TRUE(nullptr == GetEnumDescriptorForFieldType(FD::TYPE_SINT64));
-}
-
-TEST_F(MiscTest, DefaultValues) {
-  // Test that setting default values works.
-  FileDescriptorProto file_proto;
-  file_proto.set_name("foo.proto");
-
-  EnumDescriptorProto* enum_type_proto = AddEnum(&file_proto, "DummyEnum");
-  AddEnumValue(enum_type_proto, "A", 1);
-  AddEnumValue(enum_type_proto, "B", 2);
-
-  DescriptorProto* message_proto = AddMessage(&file_proto, "TestMessage");
-
-  typedef FieldDescriptorProto FD;  // avoid ugly line wrapping
-  const FD::Label label = FD::LABEL_OPTIONAL;
-
-  // Create fields of every CPP type with default values.
-  AddField(message_proto, "int32", 1, label, FD::TYPE_INT32)
-      ->set_default_value("-1");
-  AddField(message_proto, "int64", 2, label, FD::TYPE_INT64)
-      ->set_default_value("-1000000000000");
-  AddField(message_proto, "uint32", 3, label, FD::TYPE_UINT32)
-      ->set_default_value("42");
-  AddField(message_proto, "uint64", 4, label, FD::TYPE_UINT64)
-      ->set_default_value("2000000000000");
-  AddField(message_proto, "float", 5, label, FD::TYPE_FLOAT)
-      ->set_default_value("4.5");
-  AddField(message_proto, "double", 6, label, FD::TYPE_DOUBLE)
-      ->set_default_value("10e100");
-  AddField(message_proto, "bool", 7, label, FD::TYPE_BOOL)
-      ->set_default_value("true");
-  AddField(message_proto, "string", 8, label, FD::TYPE_STRING)
-      ->set_default_value("hello");
-  AddField(message_proto, "data", 9, label, FD::TYPE_BYTES)
-      ->set_default_value("\\001\\002\\003");
-
-  FieldDescriptorProto* enum_field =
-      AddField(message_proto, "enum", 10, label, FD::TYPE_ENUM);
-  enum_field->set_type_name("DummyEnum");
-  enum_field->set_default_value("B");
-
-  // Strings are allowed to have empty defaults.  (At one point, due to
-  // a bug, empty defaults for strings were rejected.  Oops.)
-  AddField(message_proto, "empty_string", 11, label, FD::TYPE_STRING)
-      ->set_default_value("");
-
-  // Add a second set of fields with implicit default values.
-  AddField(message_proto, "implicit_int32", 21, label, FD::TYPE_INT32);
-  AddField(message_proto, "implicit_int64", 22, label, FD::TYPE_INT64);
-  AddField(message_proto, "implicit_uint32", 23, label, FD::TYPE_UINT32);
-  AddField(message_proto, "implicit_uint64", 24, label, FD::TYPE_UINT64);
-  AddField(message_proto, "implicit_float", 25, label, FD::TYPE_FLOAT);
-  AddField(message_proto, "implicit_double", 26, label, FD::TYPE_DOUBLE);
-  AddField(message_proto, "implicit_bool", 27, label, FD::TYPE_BOOL);
-  AddField(message_proto, "implicit_string", 28, label, FD::TYPE_STRING);
-  AddField(message_proto, "implicit_data", 29, label, FD::TYPE_BYTES);
-  AddField(message_proto, "implicit_enum", 30, label, FD::TYPE_ENUM)
-      ->set_type_name("DummyEnum");
-
-  // Build it.
-  DescriptorPool pool;
-  const FileDescriptor* file = pool.BuildFile(file_proto);
-  ASSERT_TRUE(file != nullptr);
-
-  ASSERT_EQ(1, file->enum_type_count());
-  const EnumDescriptor* enum_type = file->enum_type(0);
-  ASSERT_EQ(2, enum_type->value_count());
-  const EnumValueDescriptor* enum_value_a = enum_type->value(0);
-  const EnumValueDescriptor* enum_value_b = enum_type->value(1);
-
-  ASSERT_EQ(1, file->message_type_count());
-  const Descriptor* message = file->message_type(0);
-
-  ASSERT_EQ(21, message->field_count());
-
-  // Check the default values.
-  ASSERT_TRUE(message->field(0)->has_default_value());
-  ASSERT_TRUE(message->field(1)->has_default_value());
-  ASSERT_TRUE(message->field(2)->has_default_value());
-  ASSERT_TRUE(message->field(3)->has_default_value());
-  ASSERT_TRUE(message->field(4)->has_default_value());
-  ASSERT_TRUE(message->field(5)->has_default_value());
-  ASSERT_TRUE(message->field(6)->has_default_value());
-  ASSERT_TRUE(message->field(7)->has_default_value());
-  ASSERT_TRUE(message->field(8)->has_default_value());
-  ASSERT_TRUE(message->field(9)->has_default_value());
-  ASSERT_TRUE(message->field(10)->has_default_value());
-
-  EXPECT_EQ(-1, message->field(0)->default_value_int32());
-  EXPECT_EQ(int64_t{-1000000000000}, message->field(1)->default_value_int64());
-  EXPECT_EQ(42, message->field(2)->default_value_uint32());
-  EXPECT_EQ(uint64_t{2000000000000}, message->field(3)->default_value_uint64());
-  EXPECT_EQ(4.5, message->field(4)->default_value_float());
-  EXPECT_EQ(10e100, message->field(5)->default_value_double());
-  EXPECT_TRUE(message->field(6)->default_value_bool());
-  EXPECT_EQ("hello", message->field(7)->default_value_string());
-  EXPECT_EQ("\001\002\003", message->field(8)->default_value_string());
-  EXPECT_EQ(enum_value_b, message->field(9)->default_value_enum());
-  EXPECT_EQ("", message->field(10)->default_value_string());
-
-  ASSERT_FALSE(message->field(11)->has_default_value());
-  ASSERT_FALSE(message->field(12)->has_default_value());
-  ASSERT_FALSE(message->field(13)->has_default_value());
-  ASSERT_FALSE(message->field(14)->has_default_value());
-  ASSERT_FALSE(message->field(15)->has_default_value());
-  ASSERT_FALSE(message->field(16)->has_default_value());
-  ASSERT_FALSE(message->field(17)->has_default_value());
-  ASSERT_FALSE(message->field(18)->has_default_value());
-  ASSERT_FALSE(message->field(19)->has_default_value());
-  ASSERT_FALSE(message->field(20)->has_default_value());
-
-  EXPECT_EQ(0, message->field(11)->default_value_int32());
-  EXPECT_EQ(0, message->field(12)->default_value_int64());
-  EXPECT_EQ(0, message->field(13)->default_value_uint32());
-  EXPECT_EQ(0, message->field(14)->default_value_uint64());
-  EXPECT_EQ(0.0f, message->field(15)->default_value_float());
-  EXPECT_EQ(0.0, message->field(16)->default_value_double());
-  EXPECT_FALSE(message->field(17)->default_value_bool());
-  EXPECT_EQ("", message->field(18)->default_value_string());
-  EXPECT_EQ("", message->field(19)->default_value_string());
-  EXPECT_EQ(enum_value_a, message->field(20)->default_value_enum());
-}
-
-TEST_F(MiscTest, FieldOptions) {
-  // Try setting field options.
-
-  FileDescriptorProto file_proto;
-  file_proto.set_name("foo.proto");
-
-  DescriptorProto* message_proto = AddMessage(&file_proto, "TestMessage");
-  AddField(message_proto, "foo", 1, FieldDescriptorProto::LABEL_OPTIONAL,
-           FieldDescriptorProto::TYPE_INT32);
-  FieldDescriptorProto* bar_proto =
-      AddField(message_proto, "bar", 2, FieldDescriptorProto::LABEL_OPTIONAL,
-               FieldDescriptorProto::TYPE_INT32);
-
-  FieldOptions* options = bar_proto->mutable_options();
-  options->set_ctype(FieldOptions::CORD);
-
-  // Build the descriptors and get the pointers.
-  DescriptorPool pool;
-  const FileDescriptor* file = pool.BuildFile(file_proto);
-  ASSERT_TRUE(file != nullptr);
-
-  ASSERT_EQ(1, file->message_type_count());
-  const Descriptor* message = file->message_type(0);
-
-  ASSERT_EQ(2, message->field_count());
-  const FieldDescriptor* foo = message->field(0);
-  const FieldDescriptor* bar = message->field(1);
-
-  // "foo" had no options set, so it should return the default options.
-  EXPECT_EQ(&FieldOptions::default_instance(), &foo->options());
-
-  // "bar" had options set.
-  EXPECT_NE(&FieldOptions::default_instance(), options);
-  EXPECT_TRUE(bar->options().has_ctype());
-  EXPECT_EQ(FieldOptions::CORD, bar->options().ctype());
-}
-
-// ===================================================================
-enum DescriptorPoolMode { NO_DATABASE, FALLBACK_DATABASE };
-
-class AllowUnknownDependenciesTest
-    : public testing::TestWithParam<
-          std::tuple<DescriptorPoolMode, const char*>> {
- protected:
-  DescriptorPoolMode mode() { return std::get<0>(GetParam()); }
-  const char* syntax() { return std::get<1>(GetParam()); }
-
-  void SetUp() override {
-    FileDescriptorProto foo_proto, bar_proto;
-
-    switch (mode()) {
-      case NO_DATABASE:
-        pool_.reset(new DescriptorPool);
-        break;
-      case FALLBACK_DATABASE:
-        pool_.reset(new DescriptorPool(&db_));
-        break;
-    }
-
-    pool_->AllowUnknownDependencies();
-
-    ASSERT_TRUE(TextFormat::ParseFromString(
-        "name: 'foo.proto'"
-        "dependency: 'bar.proto'"
-        "dependency: 'baz.proto'"
-        "message_type {"
-        "  name: 'Foo'"
-        "  field { name:'bar' number:1 label:LABEL_OPTIONAL type_name:'Bar' }"
-        "  field { name:'baz' number:2 label:LABEL_OPTIONAL type_name:'Baz' }"
-        "  field { name:'moo' number:3 label:LABEL_OPTIONAL"
-        "    type_name: '.corge.Moo'"
-        "    type: TYPE_ENUM"
-        "    options {"
-        "      uninterpreted_option {"
-        "        name {"
-        "          name_part: 'grault'"
-        "          is_extension: true"
-        "        }"
-        "        positive_int_value: 1234"
-        "      }"
-        "    }"
-        "  }"
-        "}",
-        &foo_proto));
-    foo_proto.set_syntax(syntax());
-
-    ASSERT_TRUE(
-        TextFormat::ParseFromString("name: 'bar.proto'"
-                                    "message_type { name: 'Bar' }",
-                                    &bar_proto));
-    bar_proto.set_syntax(syntax());
-
-    // Collect pointers to stuff.
-    bar_file_ = BuildFile(bar_proto);
-    ASSERT_TRUE(bar_file_ != nullptr);
-
-    ASSERT_EQ(1, bar_file_->message_type_count());
-    bar_type_ = bar_file_->message_type(0);
-
-    foo_file_ = BuildFile(foo_proto);
-    ASSERT_TRUE(foo_file_ != nullptr);
-
-    ASSERT_EQ(1, foo_file_->message_type_count());
-    foo_type_ = foo_file_->message_type(0);
-
-    ASSERT_EQ(3, foo_type_->field_count());
-    bar_field_ = foo_type_->field(0);
-    baz_field_ = foo_type_->field(1);
-    moo_field_ = foo_type_->field(2);
-  }
-
-  const FileDescriptor* BuildFile(const FileDescriptorProto& proto) {
-    switch (mode()) {
-      case NO_DATABASE:
-        return pool_->BuildFile(proto);
-        break;
-      case FALLBACK_DATABASE: {
-        EXPECT_TRUE(db_.Add(proto));
-        return pool_->FindFileByName(proto.name());
-      }
-    }
-    GOOGLE_LOG(FATAL) << "Can't get here.";
-    return nullptr;
-  }
-
-  const FileDescriptor* bar_file_;
-  const Descriptor* bar_type_;
-  const FileDescriptor* foo_file_;
-  const Descriptor* foo_type_;
-  const FieldDescriptor* bar_field_;
-  const FieldDescriptor* baz_field_;
-  const FieldDescriptor* moo_field_;
-
-  SimpleDescriptorDatabase db_;  // used if in FALLBACK_DATABASE mode.
-  std::unique_ptr<DescriptorPool> pool_;
-};
-
-TEST_P(AllowUnknownDependenciesTest, PlaceholderFile) {
-  ASSERT_EQ(2, foo_file_->dependency_count());
-  EXPECT_EQ(bar_file_, foo_file_->dependency(0));
-  EXPECT_FALSE(bar_file_->is_placeholder());
-
-  const FileDescriptor* baz_file = foo_file_->dependency(1);
-  EXPECT_EQ("baz.proto", baz_file->name());
-  EXPECT_EQ(0, baz_file->message_type_count());
-  EXPECT_TRUE(baz_file->is_placeholder());
-
-  // Placeholder files should not be findable.
-  EXPECT_EQ(bar_file_, pool_->FindFileByName(bar_file_->name()));
-  EXPECT_TRUE(pool_->FindFileByName(baz_file->name()) == nullptr);
-
-  // Copy*To should not crash for placeholder files.
-  FileDescriptorProto baz_file_proto;
-  baz_file->CopyTo(&baz_file_proto);
-  baz_file->CopySourceCodeInfoTo(&baz_file_proto);
-  EXPECT_FALSE(baz_file_proto.has_source_code_info());
-}
-
-TEST_P(AllowUnknownDependenciesTest, PlaceholderTypes) {
-  ASSERT_EQ(FieldDescriptor::TYPE_MESSAGE, bar_field_->type());
-  EXPECT_EQ(bar_type_, bar_field_->message_type());
-  EXPECT_FALSE(bar_type_->is_placeholder());
-
-  ASSERT_EQ(FieldDescriptor::TYPE_MESSAGE, baz_field_->type());
-  const Descriptor* baz_type = baz_field_->message_type();
-  EXPECT_EQ("Baz", baz_type->name());
-  EXPECT_EQ("Baz", baz_type->full_name());
-  EXPECT_EQ(0, baz_type->extension_range_count());
-  EXPECT_TRUE(baz_type->is_placeholder());
-
-  ASSERT_EQ(FieldDescriptor::TYPE_ENUM, moo_field_->type());
-  const EnumDescriptor* moo_type = moo_field_->enum_type();
-  EXPECT_EQ("Moo", moo_type->name());
-  EXPECT_EQ("corge.Moo", moo_type->full_name());
-  EXPECT_TRUE(moo_type->is_placeholder());
-  // Placeholder enum values should not be findable.
-  EXPECT_EQ(moo_type->FindValueByNumber(0), nullptr);
-
-  // Placeholder types should not be findable.
-  EXPECT_EQ(bar_type_, pool_->FindMessageTypeByName(bar_type_->full_name()));
-  EXPECT_TRUE(pool_->FindMessageTypeByName(baz_type->full_name()) == nullptr);
-  EXPECT_TRUE(pool_->FindEnumTypeByName(moo_type->full_name()) == nullptr);
-}
-
-TEST_P(AllowUnknownDependenciesTest, CopyTo) {
-  // FieldDescriptor::CopyTo() should write non-fully-qualified type names
-  // for placeholder types which were not originally fully-qualified.
-  FieldDescriptorProto proto;
-
-  // Bar is not a placeholder, so it is fully-qualified.
-  bar_field_->CopyTo(&proto);
-  EXPECT_EQ(".Bar", proto.type_name());
-  EXPECT_EQ(FieldDescriptorProto::TYPE_MESSAGE, proto.type());
-
-  // Baz is an unqualified placeholder.
-  proto.Clear();
-  baz_field_->CopyTo(&proto);
-  EXPECT_EQ("Baz", proto.type_name());
-  EXPECT_FALSE(proto.has_type());
-
-  // Moo is a fully-qualified placeholder.
-  proto.Clear();
-  moo_field_->CopyTo(&proto);
-  EXPECT_EQ(".corge.Moo", proto.type_name());
-  EXPECT_EQ(FieldDescriptorProto::TYPE_ENUM, proto.type());
-}
-
-TEST_P(AllowUnknownDependenciesTest, CustomOptions) {
-  // Moo should still have the uninterpreted option attached.
-  ASSERT_EQ(1, moo_field_->options().uninterpreted_option_size());
-  const UninterpretedOption& option =
-      moo_field_->options().uninterpreted_option(0);
-  ASSERT_EQ(1, option.name_size());
-  EXPECT_EQ("grault", option.name(0).name_part());
-}
-
-TEST_P(AllowUnknownDependenciesTest, UnknownExtendee) {
-  // Test that we can extend an unknown type.  This is slightly tricky because
-  // it means that the placeholder type must have an extension range.
-
-  FileDescriptorProto extension_proto;
-
-  ASSERT_TRUE(TextFormat::ParseFromString(
-      "name: 'extension.proto'"
-      "extension { extendee: 'UnknownType' name:'some_extension' number:123"
-      "            label:LABEL_OPTIONAL type:TYPE_INT32 }",
-      &extension_proto));
-  const FileDescriptor* file = BuildFile(extension_proto);
-
-  ASSERT_TRUE(file != nullptr);
-
-  ASSERT_EQ(1, file->extension_count());
-  const Descriptor* extendee = file->extension(0)->containing_type();
-  EXPECT_EQ("UnknownType", extendee->name());
-  EXPECT_TRUE(extendee->is_placeholder());
-  ASSERT_EQ(1, extendee->extension_range_count());
-  EXPECT_EQ(1, extendee->extension_range(0)->start);
-  EXPECT_EQ(FieldDescriptor::kMaxNumber + 1, extendee->extension_range(0)->end);
-}
-
-TEST_P(AllowUnknownDependenciesTest, CustomOption) {
-  // Test that we can use a custom option without having parsed
-  // descriptor.proto.
-
-  FileDescriptorProto option_proto;
-
-  ASSERT_TRUE(TextFormat::ParseFromString(
-      "name: \"unknown_custom_options.proto\" "
-      "dependency: \"google/protobuf/descriptor.proto\" "
-      "extension { "
-      "  extendee: \"google.protobuf.FileOptions\" "
-      "  name: \"some_option\" "
-      "  number: 123456 "
-      "  label: LABEL_OPTIONAL "
-      "  type: TYPE_INT32 "
-      "} "
-      "options { "
-      "  uninterpreted_option { "
-      "    name { "
-      "      name_part: \"some_option\" "
-      "      is_extension: true "
-      "    } "
-      "    positive_int_value: 1234 "
-      "  } "
-      "  uninterpreted_option { "
-      "    name { "
-      "      name_part: \"unknown_option\" "
-      "      is_extension: true "
-      "    } "
-      "    positive_int_value: 1234 "
-      "  } "
-      "  uninterpreted_option { "
-      "    name { "
-      "      name_part: \"optimize_for\" "
-      "      is_extension: false "
-      "    } "
-      "    identifier_value: \"SPEED\" "
-      "  } "
-      "}",
-      &option_proto));
-
-  const FileDescriptor* file = BuildFile(option_proto);
-  ASSERT_TRUE(file != nullptr);
-
-  // Verify that no extension options were set, but they were left as
-  // uninterpreted_options.
-  std::vector<const FieldDescriptor*> fields;
-  file->options().GetReflection()->ListFields(file->options(), &fields);
-  ASSERT_EQ(2, fields.size());
-  EXPECT_TRUE(file->options().has_optimize_for());
-  EXPECT_EQ(2, file->options().uninterpreted_option_size());
-}
-
-TEST_P(AllowUnknownDependenciesTest,
-       UndeclaredDependencyTriggersBuildOfDependency) {
-  // Crazy case: suppose foo.proto refers to a symbol without declaring the
-  // dependency that finds it. In the event that the pool is backed by a
-  // DescriptorDatabase, the pool will attempt to find the symbol in the
-  // database. If successful, it will build the undeclared dependency to verify
-  // that the file does indeed contain the symbol. If that file fails to build,
-  // then its descriptors must be rolled back. However, we still want foo.proto
-  // to build successfully, since we are allowing unknown dependencies.
-
-  FileDescriptorProto undeclared_dep_proto;
-  // We make this file fail to build by giving it two fields with tag 1.
-  ASSERT_TRUE(TextFormat::ParseFromString(
-      "name: \"invalid_file_as_undeclared_dep.proto\" "
-      "package: \"undeclared\" "
-      "message_type: {  "
-      "  name: \"Mooo\"  "
-      "  field { "
-      "    name:'moo' number:1 label:LABEL_OPTIONAL type: TYPE_INT32 "
-      "  }"
-      "  field { "
-      "    name:'mooo' number:1 label:LABEL_OPTIONAL type: TYPE_INT64 "
-      "  }"
-      "}",
-      &undeclared_dep_proto));
-  // We can't use the BuildFile() helper because we don't actually want to build
-  // it into the descriptor pool in the fallback database case: it just needs to
-  // be sitting in the database so that it gets built during the building of
-  // test.proto below.
-  switch (mode()) {
-    case NO_DATABASE: {
-      ASSERT_TRUE(pool_->BuildFile(undeclared_dep_proto) == nullptr);
-      break;
-    }
-    case FALLBACK_DATABASE: {
-      ASSERT_TRUE(db_.Add(undeclared_dep_proto));
-    }
-  }
-
-  FileDescriptorProto test_proto;
-  ASSERT_TRUE(TextFormat::ParseFromString(
-      "name: \"test.proto\" "
-      "message_type: { "
-      "  name: \"Corge\" "
-      "  field { "
-      "    name:'mooo' number:1 label: LABEL_OPTIONAL "
-      "    type_name:'undeclared.Mooo' type: TYPE_MESSAGE "
-      "  }"
-      "}",
-      &test_proto));
-
-  const FileDescriptor* file = BuildFile(test_proto);
-  ASSERT_TRUE(file != nullptr);
-  GOOGLE_LOG(INFO) << file->DebugString();
-
-  EXPECT_EQ(0, file->dependency_count());
-  ASSERT_EQ(1, file->message_type_count());
-  const Descriptor* corge_desc = file->message_type(0);
-  ASSERT_EQ("Corge", corge_desc->name());
-  ASSERT_EQ(1, corge_desc->field_count());
-  EXPECT_FALSE(corge_desc->is_placeholder());
-
-  const FieldDescriptor* mooo_field = corge_desc->field(0);
-  ASSERT_EQ(FieldDescriptor::TYPE_MESSAGE, mooo_field->type());
-  ASSERT_EQ("Mooo", mooo_field->message_type()->name());
-  ASSERT_EQ("undeclared.Mooo", mooo_field->message_type()->full_name());
-  EXPECT_TRUE(mooo_field->message_type()->is_placeholder());
-  // The place holder type should not be findable.
-  ASSERT_TRUE(pool_->FindMessageTypeByName("undeclared.Mooo") == nullptr);
-}
-
-INSTANTIATE_TEST_SUITE_P(DatabaseSource, AllowUnknownDependenciesTest,
-                         testing::Combine(testing::Values(NO_DATABASE,
-                                                          FALLBACK_DATABASE),
-                                          testing::Values("proto2", "proto3")));
-
-// ===================================================================
-
-TEST(CustomOptions, OptionLocations) {
-  const Descriptor* message =
-      protobuf_unittest::TestMessageWithCustomOptions::descriptor();
-  const FileDescriptor* file = message->file();
-  const FieldDescriptor* field = message->FindFieldByName("field1");
-  const OneofDescriptor* oneof = message->FindOneofByName("AnOneof");
-  const FieldDescriptor* map_field = message->FindFieldByName("map_field");
-  const EnumDescriptor* enm = message->FindEnumTypeByName("AnEnum");
-  // TODO(benjy): Support EnumValue options, once the compiler does.
-  const ServiceDescriptor* service =
-      file->FindServiceByName("TestServiceWithCustomOptions");
-  const MethodDescriptor* method = service->FindMethodByName("Foo");
-
-  EXPECT_EQ(int64_t{9876543210},
-            file->options().GetExtension(protobuf_unittest::file_opt1));
-  EXPECT_EQ(-56,
-            message->options().GetExtension(protobuf_unittest::message_opt1));
-  EXPECT_EQ(int64_t{8765432109},
-            field->options().GetExtension(protobuf_unittest::field_opt1));
-  EXPECT_EQ(42,  // Check that we get the default for an option we don't set.
-            field->options().GetExtension(protobuf_unittest::field_opt2));
-  EXPECT_EQ(-99, oneof->options().GetExtension(protobuf_unittest::oneof_opt1));
-  EXPECT_EQ(int64_t{12345},
-            map_field->options().GetExtension(protobuf_unittest::field_opt1));
-  EXPECT_EQ(-789, enm->options().GetExtension(protobuf_unittest::enum_opt1));
-  EXPECT_EQ(123, enm->value(1)->options().GetExtension(
-                     protobuf_unittest::enum_value_opt1));
-  EXPECT_EQ(int64_t{-9876543210},
-            service->options().GetExtension(protobuf_unittest::service_opt1));
-  EXPECT_EQ(protobuf_unittest::METHODOPT1_VAL2,
-            method->options().GetExtension(protobuf_unittest::method_opt1));
-
-  // See that the regular options went through unscathed.
-  EXPECT_TRUE(message->options().has_message_set_wire_format());
-  EXPECT_EQ(FieldOptions::CORD, field->options().ctype());
-}
-
-TEST(CustomOptions, OptionTypes) {
-  const MessageOptions* options = nullptr;
-
-  constexpr int32_t kint32min = std::numeric_limits<int32_t>::min();
-  constexpr int32_t kint32max = std::numeric_limits<int32_t>::max();
-  constexpr uint32_t kuint32max = std::numeric_limits<uint32_t>::max();
-  constexpr int64_t kint64min = std::numeric_limits<int64_t>::min();
-  constexpr int64_t kint64max = std::numeric_limits<int64_t>::max();
-  constexpr uint64_t kuint64max = std::numeric_limits<uint64_t>::max();
-
-  options =
-      &protobuf_unittest::CustomOptionMinIntegerValues::descriptor()->options();
-  EXPECT_EQ(false, options->GetExtension(protobuf_unittest::bool_opt));
-  EXPECT_EQ(kint32min, options->GetExtension(protobuf_unittest::int32_opt));
-  EXPECT_EQ(kint64min, options->GetExtension(protobuf_unittest::int64_opt));
-  EXPECT_EQ(0, options->GetExtension(protobuf_unittest::uint32_opt));
-  EXPECT_EQ(0, options->GetExtension(protobuf_unittest::uint64_opt));
-  EXPECT_EQ(kint32min, options->GetExtension(protobuf_unittest::sint32_opt));
-  EXPECT_EQ(kint64min, options->GetExtension(protobuf_unittest::sint64_opt));
-  EXPECT_EQ(0, options->GetExtension(protobuf_unittest::fixed32_opt));
-  EXPECT_EQ(0, options->GetExtension(protobuf_unittest::fixed64_opt));
-  EXPECT_EQ(kint32min, options->GetExtension(protobuf_unittest::sfixed32_opt));
-  EXPECT_EQ(kint64min, options->GetExtension(protobuf_unittest::sfixed64_opt));
-
-  options =
-      &protobuf_unittest::CustomOptionMaxIntegerValues::descriptor()->options();
-  EXPECT_EQ(true, options->GetExtension(protobuf_unittest::bool_opt));
-  EXPECT_EQ(kint32max, options->GetExtension(protobuf_unittest::int32_opt));
-  EXPECT_EQ(kint64max, options->GetExtension(protobuf_unittest::int64_opt));
-  EXPECT_EQ(kuint32max, options->GetExtension(protobuf_unittest::uint32_opt));
-  EXPECT_EQ(kuint64max, options->GetExtension(protobuf_unittest::uint64_opt));
-  EXPECT_EQ(kint32max, options->GetExtension(protobuf_unittest::sint32_opt));
-  EXPECT_EQ(kint64max, options->GetExtension(protobuf_unittest::sint64_opt));
-  EXPECT_EQ(kuint32max, options->GetExtension(protobuf_unittest::fixed32_opt));
-  EXPECT_EQ(kuint64max, options->GetExtension(protobuf_unittest::fixed64_opt));
-  EXPECT_EQ(kint32max, options->GetExtension(protobuf_unittest::sfixed32_opt));
-  EXPECT_EQ(kint64max, options->GetExtension(protobuf_unittest::sfixed64_opt));
-
-  options = &protobuf_unittest::CustomOptionOtherValues::descriptor()->options();
-  EXPECT_EQ(-100, options->GetExtension(protobuf_unittest::int32_opt));
-  EXPECT_FLOAT_EQ(12.3456789,
-                  options->GetExtension(protobuf_unittest::float_opt));
-  EXPECT_DOUBLE_EQ(1.234567890123456789,
-                   options->GetExtension(protobuf_unittest::double_opt));
-  EXPECT_EQ("Hello, \"World\"",
-            options->GetExtension(protobuf_unittest::string_opt));
-
-  EXPECT_EQ(std::string("Hello\0World", 11),
-            options->GetExtension(protobuf_unittest::bytes_opt));
-
-  EXPECT_EQ(protobuf_unittest::DummyMessageContainingEnum::TEST_OPTION_ENUM_TYPE2,
-            options->GetExtension(protobuf_unittest::enum_opt));
-
-  options =
-      &protobuf_unittest::SettingRealsFromPositiveInts::descriptor()->options();
-  EXPECT_FLOAT_EQ(12, options->GetExtension(protobuf_unittest::float_opt));
-  EXPECT_DOUBLE_EQ(154, options->GetExtension(protobuf_unittest::double_opt));
-
-  options =
-      &protobuf_unittest::SettingRealsFromNegativeInts::descriptor()->options();
-  EXPECT_FLOAT_EQ(-12, options->GetExtension(protobuf_unittest::float_opt));
-  EXPECT_DOUBLE_EQ(-154, options->GetExtension(protobuf_unittest::double_opt));
-}
-
-TEST(CustomOptions, ComplexExtensionOptions) {
-  const MessageOptions* options =
-      &protobuf_unittest::VariousComplexOptions::descriptor()->options();
-  EXPECT_EQ(options->GetExtension(protobuf_unittest::complex_opt1).foo(), 42);
-  EXPECT_EQ(options->GetExtension(protobuf_unittest::complex_opt1)
-                .GetExtension(protobuf_unittest::mooo),
-            324);
-  EXPECT_EQ(options->GetExtension(protobuf_unittest::complex_opt1)
-                .GetExtension(protobuf_unittest::corge)
-                .moo(),
-            876);
-  EXPECT_EQ(options->GetExtension(protobuf_unittest::complex_opt2).baz(), 987);
-  EXPECT_EQ(options->GetExtension(protobuf_unittest::complex_opt2)
-                .GetExtension(protobuf_unittest::grault),
-            654);
-  EXPECT_EQ(options->GetExtension(protobuf_unittest::complex_opt2).bar().foo(),
-            743);
-  EXPECT_EQ(options->GetExtension(protobuf_unittest::complex_opt2)
-                .bar()
-                .GetExtension(protobuf_unittest::mooo),
-            1999);
-  EXPECT_EQ(options->GetExtension(protobuf_unittest::complex_opt2)
-                .bar()
-                .GetExtension(protobuf_unittest::corge)
-                .moo(),
-            2008);
-  EXPECT_EQ(options->GetExtension(protobuf_unittest::complex_opt2)
-                .GetExtension(protobuf_unittest::garply)
-                .foo(),
-            741);
-  EXPECT_EQ(options->GetExtension(protobuf_unittest::complex_opt2)
-                .GetExtension(protobuf_unittest::garply)
-                .GetExtension(protobuf_unittest::mooo),
-            1998);
-  EXPECT_EQ(options->GetExtension(protobuf_unittest::complex_opt2)
-                .GetExtension(protobuf_unittest::garply)
-                .GetExtension(protobuf_unittest::corge)
-                .moo(),
-            2121);
-  EXPECT_EQ(options
-                ->GetExtension(protobuf_unittest::ComplexOptionType2::
-                                   ComplexOptionType4::complex_opt4)
-                .waldo(),
-            1971);
-  EXPECT_EQ(options->GetExtension(protobuf_unittest::complex_opt2).fred().waldo(),
-            321);
-  EXPECT_EQ(9, options->GetExtension(protobuf_unittest::complex_opt3).moo());
-  EXPECT_EQ(22, options->GetExtension(protobuf_unittest::complex_opt3)
-                    .complexoptiontype5()
-                    .plugh());
-  EXPECT_EQ(24, options->GetExtension(protobuf_unittest::complexopt6).xyzzy());
-}
-
-TEST(CustomOptions, OptionsFromOtherFile) {
-  // Test that to use a custom option, we only need to import the file
-  // defining the option; we do not also have to import descriptor.proto.
-  DescriptorPool pool;
-
-  FileDescriptorProto file_proto;
-  FileDescriptorProto::descriptor()->file()->CopyTo(&file_proto);
-  ASSERT_TRUE(pool.BuildFile(file_proto) != nullptr);
-
-  // We have to import the Any dependency.
-  FileDescriptorProto any_proto;
-  google::protobuf::Any::descriptor()->file()->CopyTo(&any_proto);
-  ASSERT_TRUE(pool.BuildFile(any_proto) != nullptr);
-
-  protobuf_unittest::TestMessageWithCustomOptions::descriptor()->file()->CopyTo(
-      &file_proto);
-  ASSERT_TRUE(pool.BuildFile(file_proto) != nullptr);
-
-  ASSERT_TRUE(TextFormat::ParseFromString(
-      "name: \"custom_options_import.proto\" "
-      "package: \"protobuf_unittest\" "
-      "dependency: \"google/protobuf/unittest_custom_options.proto\" "
-      "options { "
-      "  uninterpreted_option { "
-      "    name { "
-      "      name_part: \"file_opt1\" "
-      "      is_extension: true "
-      "    } "
-      "    positive_int_value: 1234 "
-      "  } "
-      // Test a non-extension option too.  (At one point this failed due to a
-      // bug.)
-      "  uninterpreted_option { "
-      "    name { "
-      "      name_part: \"java_package\" "
-      "      is_extension: false "
-      "    } "
-      "    string_value: \"foo\" "
-      "  } "
-      // Test that enum-typed options still work too.  (At one point this also
-      // failed due to a bug.)
-      "  uninterpreted_option { "
-      "    name { "
-      "      name_part: \"optimize_for\" "
-      "      is_extension: false "
-      "    } "
-      "    identifier_value: \"SPEED\" "
-      "  } "
-      "}",
-      &file_proto));
-
-  const FileDescriptor* file = pool.BuildFile(file_proto);
-  ASSERT_TRUE(file != nullptr);
-  EXPECT_EQ(1234, file->options().GetExtension(protobuf_unittest::file_opt1));
-  EXPECT_TRUE(file->options().has_java_package());
-  EXPECT_EQ("foo", file->options().java_package());
-  EXPECT_TRUE(file->options().has_optimize_for());
-  EXPECT_EQ(FileOptions::SPEED, file->options().optimize_for());
-}
-
-TEST(CustomOptions, MessageOptionThreeFieldsSet) {
-  // This tests a bug which previously existed in custom options parsing.  The
-  // bug occurred when you defined a custom option with message type and then
-  // set three fields of that option on a single definition (see the example
-  // below).  The bug is a bit hard to explain, so check the change history if
-  // you want to know more.
-  DescriptorPool pool;
-
-  FileDescriptorProto file_proto;
-  FileDescriptorProto::descriptor()->file()->CopyTo(&file_proto);
-  ASSERT_TRUE(pool.BuildFile(file_proto) != nullptr);
-
-  FileDescriptorProto any_proto;
-  google::protobuf::Any::descriptor()->file()->CopyTo(&any_proto);
-  ASSERT_TRUE(pool.BuildFile(any_proto) != nullptr);
-
-  protobuf_unittest::TestMessageWithCustomOptions::descriptor()->file()->CopyTo(
-      &file_proto);
-  ASSERT_TRUE(pool.BuildFile(file_proto) != nullptr);
-
-  // The following represents the definition:
-  //
-  //   import "google/protobuf/unittest_custom_options.proto"
-  //   package protobuf_unittest;
-  //   message Foo {
-  //     option (complex_opt1).foo  = 1234;
-  //     option (complex_opt1).foo2 = 1234;
-  //     option (complex_opt1).foo3 = 1234;
-  //   }
-  ASSERT_TRUE(TextFormat::ParseFromString(
-      "name: \"custom_options_import.proto\" "
-      "package: \"protobuf_unittest\" "
-      "dependency: \"google/protobuf/unittest_custom_options.proto\" "
-      "message_type { "
-      "  name: \"Foo\" "
-      "  options { "
-      "    uninterpreted_option { "
-      "      name { "
-      "        name_part: \"complex_opt1\" "
-      "        is_extension: true "
-      "      } "
-      "      name { "
-      "        name_part: \"foo\" "
-      "        is_extension: false "
-      "      } "
-      "      positive_int_value: 1234 "
-      "    } "
-      "    uninterpreted_option { "
-      "      name { "
-      "        name_part: \"complex_opt1\" "
-      "        is_extension: true "
-      "      } "
-      "      name { "
-      "        name_part: \"foo2\" "
-      "        is_extension: false "
-      "      } "
-      "      positive_int_value: 1234 "
-      "    } "
-      "    uninterpreted_option { "
-      "      name { "
-      "        name_part: \"complex_opt1\" "
-      "        is_extension: true "
-      "      } "
-      "      name { "
-      "        name_part: \"foo3\" "
-      "        is_extension: false "
-      "      } "
-      "      positive_int_value: 1234 "
-      "    } "
-      "  } "
-      "}",
-      &file_proto));
-
-  const FileDescriptor* file = pool.BuildFile(file_proto);
-  ASSERT_TRUE(file != nullptr);
-  ASSERT_EQ(1, file->message_type_count());
-
-  const MessageOptions& options = file->message_type(0)->options();
-  EXPECT_EQ(1234, options.GetExtension(protobuf_unittest::complex_opt1).foo());
-}
-
-TEST(CustomOptions, MessageOptionRepeatedLeafFieldSet) {
-  // This test verifies that repeated fields in custom options can be
-  // given multiple values by repeating the option with a different value.
-  // This test checks repeated leaf values. Each repeated custom value
-  // appears in a different uninterpreted_option, which will be concatenated
-  // when they are merged into the final option value.
-  DescriptorPool pool;
-
-  FileDescriptorProto file_proto;
-  FileDescriptorProto::descriptor()->file()->CopyTo(&file_proto);
-  ASSERT_TRUE(pool.BuildFile(file_proto) != nullptr);
-
-  FileDescriptorProto any_proto;
-  google::protobuf::Any::descriptor()->file()->CopyTo(&any_proto);
-  ASSERT_TRUE(pool.BuildFile(any_proto) != nullptr);
-
-  protobuf_unittest::TestMessageWithCustomOptions::descriptor()->file()->CopyTo(
-      &file_proto);
-  ASSERT_TRUE(pool.BuildFile(file_proto) != nullptr);
-
-  // The following represents the definition:
-  //
-  //   import "google/protobuf/unittest_custom_options.proto"
-  //   package protobuf_unittest;
-  //   message Foo {
-  //     option (complex_opt1).foo4 = 12;
-  //     option (complex_opt1).foo4 = 34;
-  //     option (complex_opt1).foo4 = 56;
-  //   }
-  ASSERT_TRUE(TextFormat::ParseFromString(
-      "name: \"custom_options_import.proto\" "
-      "package: \"protobuf_unittest\" "
-      "dependency: \"google/protobuf/unittest_custom_options.proto\" "
-      "message_type { "
-      "  name: \"Foo\" "
-      "  options { "
-      "    uninterpreted_option { "
-      "      name { "
-      "        name_part: \"complex_opt1\" "
-      "        is_extension: true "
-      "      } "
-      "      name { "
-      "        name_part: \"foo4\" "
-      "        is_extension: false "
-      "      } "
-      "      positive_int_value: 12 "
-      "    } "
-      "    uninterpreted_option { "
-      "      name { "
-      "        name_part: \"complex_opt1\" "
-      "        is_extension: true "
-      "      } "
-      "      name { "
-      "        name_part: \"foo4\" "
-      "        is_extension: false "
-      "      } "
-      "      positive_int_value: 34 "
-      "    } "
-      "    uninterpreted_option { "
-      "      name { "
-      "        name_part: \"complex_opt1\" "
-      "        is_extension: true "
-      "      } "
-      "      name { "
-      "        name_part: \"foo4\" "
-      "        is_extension: false "
-      "      } "
-      "      positive_int_value: 56 "
-      "    } "
-      "  } "
-      "}",
-      &file_proto));
-
-  const FileDescriptor* file = pool.BuildFile(file_proto);
-  ASSERT_TRUE(file != nullptr);
-  ASSERT_EQ(1, file->message_type_count());
-
-  const MessageOptions& options = file->message_type(0)->options();
-  EXPECT_EQ(3, options.GetExtension(protobuf_unittest::complex_opt1).foo4_size());
-  EXPECT_EQ(12, options.GetExtension(protobuf_unittest::complex_opt1).foo4(0));
-  EXPECT_EQ(34, options.GetExtension(protobuf_unittest::complex_opt1).foo4(1));
-  EXPECT_EQ(56, options.GetExtension(protobuf_unittest::complex_opt1).foo4(2));
-}
-
-TEST(CustomOptions, MessageOptionRepeatedMsgFieldSet) {
-  // This test verifies that repeated fields in custom options can be
-  // given multiple values by repeating the option with a different value.
-  // This test checks repeated message values. Each repeated custom value
-  // appears in a different uninterpreted_option, which will be concatenated
-  // when they are merged into the final option value.
-  DescriptorPool pool;
-
-  FileDescriptorProto file_proto;
-  FileDescriptorProto::descriptor()->file()->CopyTo(&file_proto);
-  ASSERT_TRUE(pool.BuildFile(file_proto) != nullptr);
-
-  FileDescriptorProto any_proto;
-  google::protobuf::Any::descriptor()->file()->CopyTo(&any_proto);
-  ASSERT_TRUE(pool.BuildFile(any_proto) != nullptr);
-
-  protobuf_unittest::TestMessageWithCustomOptions::descriptor()->file()->CopyTo(
-      &file_proto);
-  ASSERT_TRUE(pool.BuildFile(file_proto) != nullptr);
-
-  // The following represents the definition:
-  //
-  //   import "google/protobuf/unittest_custom_options.proto"
-  //   package protobuf_unittest;
-  //   message Foo {
-  //     option (complex_opt2).barney = {waldo: 1};
-  //     option (complex_opt2).barney = {waldo: 10};
-  //     option (complex_opt2).barney = {waldo: 100};
-  //   }
-  ASSERT_TRUE(TextFormat::ParseFromString(
-      "name: \"custom_options_import.proto\" "
-      "package: \"protobuf_unittest\" "
-      "dependency: \"google/protobuf/unittest_custom_options.proto\" "
-      "message_type { "
-      "  name: \"Foo\" "
-      "  options { "
-      "    uninterpreted_option { "
-      "      name { "
-      "        name_part: \"complex_opt2\" "
-      "        is_extension: true "
-      "      } "
-      "      name { "
-      "        name_part: \"barney\" "
-      "        is_extension: false "
-      "      } "
-      "      aggregate_value: \"waldo: 1\" "
-      "    } "
-      "    uninterpreted_option { "
-      "      name { "
-      "        name_part: \"complex_opt2\" "
-      "        is_extension: true "
-      "      } "
-      "      name { "
-      "        name_part: \"barney\" "
-      "        is_extension: false "
-      "      } "
-      "      aggregate_value: \"waldo: 10\" "
-      "    } "
-      "    uninterpreted_option { "
-      "      name { "
-      "        name_part: \"complex_opt2\" "
-      "        is_extension: true "
-      "      } "
-      "      name { "
-      "        name_part: \"barney\" "
-      "        is_extension: false "
-      "      } "
-      "      aggregate_value: \"waldo: 100\" "
-      "    } "
-      "  } "
-      "}",
-      &file_proto));
-
-  const FileDescriptor* file = pool.BuildFile(file_proto);
-  ASSERT_TRUE(file != nullptr);
-  ASSERT_EQ(1, file->message_type_count());
-
-  const MessageOptions& options = file->message_type(0)->options();
-  EXPECT_EQ(3,
-            options.GetExtension(protobuf_unittest::complex_opt2).barney_size());
-  EXPECT_EQ(
-      1, options.GetExtension(protobuf_unittest::complex_opt2).barney(0).waldo());
-  EXPECT_EQ(
-      10,
-      options.GetExtension(protobuf_unittest::complex_opt2).barney(1).waldo());
-  EXPECT_EQ(
-      100,
-      options.GetExtension(protobuf_unittest::complex_opt2).barney(2).waldo());
-}
-
-// Check that aggregate options were parsed and saved correctly in
-// the appropriate descriptors.
-TEST(CustomOptions, AggregateOptions) {
-  const Descriptor* msg = protobuf_unittest::AggregateMessage::descriptor();
-  const FileDescriptor* file = msg->file();
-  const FieldDescriptor* field = msg->FindFieldByName("fieldname");
-  const EnumDescriptor* enumd = file->FindEnumTypeByName("AggregateEnum");
-  const EnumValueDescriptor* enumv = enumd->FindValueByName("VALUE");
-  const ServiceDescriptor* service =
-      file->FindServiceByName("AggregateService");
-  const MethodDescriptor* method = service->FindMethodByName("Method");
-
-  // Tests for the different types of data embedded in fileopt
-  const protobuf_unittest::Aggregate& file_options =
-      file->options().GetExtension(protobuf_unittest::fileopt);
-  EXPECT_EQ(100, file_options.i());
-  EXPECT_EQ("FileAnnotation", file_options.s());
-  EXPECT_EQ("NestedFileAnnotation", file_options.sub().s());
-  EXPECT_EQ("FileExtensionAnnotation",
-            file_options.file().GetExtension(protobuf_unittest::fileopt).s());
-  EXPECT_EQ("EmbeddedMessageSetElement",
-            file_options.mset()
-                .GetExtension(protobuf_unittest::AggregateMessageSetElement ::
-                                  message_set_extension)
-                .s());
-
-  protobuf_unittest::AggregateMessageSetElement any_payload;
-  ASSERT_TRUE(file_options.any().UnpackTo(&any_payload));
-  EXPECT_EQ("EmbeddedMessageSetElement", any_payload.s());
-
-  // Simple tests for all the other types of annotations
-  EXPECT_EQ("MessageAnnotation",
-            msg->options().GetExtension(protobuf_unittest::msgopt).s());
-  EXPECT_EQ("FieldAnnotation",
-            field->options().GetExtension(protobuf_unittest::fieldopt).s());
-  EXPECT_EQ("EnumAnnotation",
-            enumd->options().GetExtension(protobuf_unittest::enumopt).s());
-  EXPECT_EQ("EnumValueAnnotation",
-            enumv->options().GetExtension(protobuf_unittest::enumvalopt).s());
-  EXPECT_EQ("ServiceAnnotation",
-            service->options().GetExtension(protobuf_unittest::serviceopt).s());
-  EXPECT_EQ("MethodAnnotation",
-            method->options().GetExtension(protobuf_unittest::methodopt).s());
-}
-
-TEST(CustomOptions, UnusedImportError) {
-  DescriptorPool pool;
-
-  FileDescriptorProto file_proto;
-  FileDescriptorProto::descriptor()->file()->CopyTo(&file_proto);
-  ASSERT_TRUE(pool.BuildFile(file_proto) != nullptr);
-
-  FileDescriptorProto any_proto;
-  google::protobuf::Any::descriptor()->file()->CopyTo(&any_proto);
-  ASSERT_TRUE(pool.BuildFile(any_proto) != nullptr);
-
-  protobuf_unittest::TestMessageWithCustomOptions::descriptor()->file()->CopyTo(
-      &file_proto);
-  ASSERT_TRUE(pool.BuildFile(file_proto) != nullptr);
-
-  pool.AddUnusedImportTrackFile("custom_options_import.proto", true);
-  ASSERT_TRUE(TextFormat::ParseFromString(
-      "name: \"custom_options_import.proto\" "
-      "package: \"protobuf_unittest\" "
-      "dependency: \"google/protobuf/unittest_custom_options.proto\" ",
-      &file_proto));
-
-  MockErrorCollector error_collector;
-  EXPECT_FALSE(pool.BuildFileCollectingErrors(file_proto, &error_collector));
-  EXPECT_EQ(
-      "custom_options_import.proto: "
-      "google/protobuf/unittest_custom_options.proto: IMPORT: Import "
-      "google/protobuf/unittest_custom_options.proto is unused.\n",
-      error_collector.text_);
-}
-
-// Verifies that proto files can correctly be parsed, even if the
-// custom options defined in the file are incompatible with those
-// compiled in the binary. See http://b/19276250.
-TEST(CustomOptions, OptionsWithIncompatibleDescriptors) {
-  DescriptorPool pool;
-
-  FileDescriptorProto file_proto;
-  MessageOptions::descriptor()->file()->CopyTo(&file_proto);
-  ASSERT_TRUE(pool.BuildFile(file_proto) != nullptr);
-
-  // Create a new file descriptor proto containing a subset of the
-  // messages defined in google/protobuf/unittest_custom_options.proto.
-  file_proto.Clear();
-  file_proto.set_name("unittest_custom_options.proto");
-  file_proto.set_package("protobuf_unittest");
-  file_proto.add_dependency("google/protobuf/descriptor.proto");
-
-  // Add the "required_enum_opt" extension.
-  FieldDescriptorProto* extension = file_proto.add_extension();
-  protobuf_unittest::OldOptionType::descriptor()
-      ->file()
-      ->FindExtensionByName("required_enum_opt")
-      ->CopyTo(extension);
-
-  // Add a test message that uses the "required_enum_opt" option.
-  DescriptorProto* test_message_type = file_proto.add_message_type();
-  protobuf_unittest::TestMessageWithRequiredEnumOption::descriptor()->CopyTo(
-      test_message_type);
-
-  // Instruct the extension to use NewOptionType instead of
-  // OldOptionType, and add the descriptor of NewOptionType.
-  extension->set_type_name(".protobuf_unittest.NewOptionType");
-  DescriptorProto* new_option_type = file_proto.add_message_type();
-  protobuf_unittest::NewOptionType::descriptor()->CopyTo(new_option_type);
-
-  // Replace the value of the "required_enum_opt" option used in the
-  // test message with an enum value that only exists in NewOptionType.
-  ASSERT_TRUE(
-      TextFormat::ParseFromString("uninterpreted_option { "
-                                  "  name { "
-                                  "    name_part: 'required_enum_opt' "
-                                  "    is_extension: true "
-                                  "  } "
-                                  "  aggregate_value: 'value: NEW_VALUE'"
-                                  "}",
-                                  test_message_type->mutable_options()));
-
-  // Adding the file descriptor to the pool should fail.
-  EXPECT_TRUE(pool.BuildFile(file_proto) == nullptr);
-}
-
-// Test that FileDescriptor::DebugString() formats custom options correctly.
-TEST(CustomOptions, DebugString) {
-  DescriptorPool pool;
-
-  FileDescriptorProto file_proto;
-  MessageOptions::descriptor()->file()->CopyTo(&file_proto);
-  ASSERT_TRUE(pool.BuildFile(file_proto) != nullptr);
-
-  // Add "foo.proto":
-  //   import "google/protobuf/descriptor.proto";
-  //   package "protobuf_unittest";
-  //   option (protobuf_unittest.cc_option1) = 1;
-  //   option (protobuf_unittest.cc_option2) = 2;
-  //   extend google.protobuf.FieldOptions {
-  //     optional int32 cc_option1 = 7736974;
-  //     optional int32 cc_option2 = 7736975;
-  //   }
-  ASSERT_TRUE(TextFormat::ParseFromString(
-      "name: \"foo.proto\" "
-      "package: \"protobuf_unittest\" "
-      "dependency: \"google/protobuf/descriptor.proto\" "
-      "options { "
-      "  uninterpreted_option { "
-      "    name { "
-      "      name_part: \"protobuf_unittest.cc_option1\" "
-      "      is_extension: true "
-      "    } "
-      "    positive_int_value: 1 "
-      "  } "
-      "  uninterpreted_option { "
-      "    name { "
-      "      name_part: \"protobuf_unittest.cc_option2\" "
-      "      is_extension: true "
-      "    } "
-      "    positive_int_value: 2 "
-      "  } "
-      "} "
-      "extension { "
-      "  name: \"cc_option1\" "
-      "  extendee: \".google.protobuf.FileOptions\" "
-      // This field number is intentionally chosen to be the same as
-      // (.fileopt1) defined in unittest_custom_options.proto (linked
-      // in this test binary). This is to test whether we are messing
-      // generated pool with custom descriptor pools when dealing with
-      // custom options.
-      "  number: 7736974 "
-      "  label: LABEL_OPTIONAL "
-      "  type: TYPE_INT32 "
-      "}"
-      "extension { "
-      "  name: \"cc_option2\" "
-      "  extendee: \".google.protobuf.FileOptions\" "
-      "  number: 7736975 "
-      "  label: LABEL_OPTIONAL "
-      "  type: TYPE_INT32 "
-      "}",
-      &file_proto));
-  const FileDescriptor* descriptor = pool.BuildFile(file_proto);
-  ASSERT_TRUE(descriptor != nullptr);
-
-  EXPECT_EQ(2, descriptor->extension_count());
-
-  ASSERT_EQ(
-      "syntax = \"proto2\";\n"
-      "\n"
-      "import \"google/protobuf/descriptor.proto\";\n"
-      "package protobuf_unittest;\n"
-      "\n"
-      "option (.protobuf_unittest.cc_option1) = 1;\n"
-      "option (.protobuf_unittest.cc_option2) = 2;\n"
-      "\n"
-      "extend .google.protobuf.FileOptions {\n"
-      "  optional int32 cc_option1 = 7736974;\n"
-      "  optional int32 cc_option2 = 7736975;\n"
-      "}\n"
-      "\n",
-      descriptor->DebugString());
-}
-
-// ===================================================================
-
-class ValidationErrorTest : public testing::Test {
- protected:
-  // Parse file_text as a FileDescriptorProto in text format and add it
-  // to the DescriptorPool.  Expect no errors.
-  const FileDescriptor* BuildFile(const std::string& file_text) {
-    FileDescriptorProto file_proto;
-    EXPECT_TRUE(TextFormat::ParseFromString(file_text, &file_proto));
-    return GOOGLE_CHECK_NOTNULL(pool_.BuildFile(file_proto));
-  }
-
-  // Parse file_text as a FileDescriptorProto in text format and add it
-  // to the DescriptorPool.  Expect errors to be produced which match the
-  // given error text.
-  void BuildFileWithErrors(const std::string& file_text,
-                           const std::string& expected_errors) {
-    FileDescriptorProto file_proto;
-    ASSERT_TRUE(TextFormat::ParseFromString(file_text, &file_proto));
-
-    MockErrorCollector error_collector;
-    EXPECT_TRUE(pool_.BuildFileCollectingErrors(file_proto, &error_collector) ==
-                nullptr);
-    EXPECT_EQ(expected_errors, error_collector.text_);
-  }
-
-  // Parse file_text as a FileDescriptorProto in text format and add it
-  // to the DescriptorPool.  Expect errors to be produced which match the
-  // given warning text.
-  void BuildFileWithWarnings(const std::string& file_text,
-                             const std::string& expected_warnings) {
-    FileDescriptorProto file_proto;
-    ASSERT_TRUE(TextFormat::ParseFromString(file_text, &file_proto));
-
-    MockErrorCollector error_collector;
-    EXPECT_TRUE(pool_.BuildFileCollectingErrors(file_proto, &error_collector));
-    EXPECT_EQ(expected_warnings, error_collector.warning_text_);
-  }
-
-  // Builds some already-parsed file in our test pool.
-  void BuildFileInTestPool(const FileDescriptor* file) {
-    FileDescriptorProto file_proto;
-    file->CopyTo(&file_proto);
-    ASSERT_TRUE(pool_.BuildFile(file_proto) != nullptr);
-  }
-
-  // Build descriptor.proto in our test pool. This allows us to extend it in
-  // the test pool, so we can test custom options.
-  void BuildDescriptorMessagesInTestPool() {
-    BuildFileInTestPool(DescriptorProto::descriptor()->file());
-  }
-
-  DescriptorPool pool_;
-};
-
-TEST_F(ValidationErrorTest, AlreadyDefined) {
-  BuildFileWithErrors(
-      "name: \"foo.proto\" "
-      "message_type { name: \"Foo\" }"
-      "message_type { name: \"Foo\" }",
-
-      "foo.proto: Foo: NAME: \"Foo\" is already defined.\n");
-}
-
-TEST_F(ValidationErrorTest, AlreadyDefinedInPackage) {
-  BuildFileWithErrors(
-      "name: \"foo.proto\" "
-      "package: \"foo.bar\" "
-      "message_type { name: \"Foo\" }"
-      "message_type { name: \"Foo\" }",
-
-      "foo.proto: foo.bar.Foo: NAME: \"Foo\" is already defined in "
-      "\"foo.bar\".\n");
-}
-
-TEST_F(ValidationErrorTest, AlreadyDefinedInOtherFile) {
-  BuildFile(
-      "name: \"foo.proto\" "
-      "message_type { name: \"Foo\" }");
-
-  BuildFileWithErrors(
-      "name: \"bar.proto\" "
-      "message_type { name: \"Foo\" }",
-
-      "bar.proto: Foo: NAME: \"Foo\" is already defined in file "
-      "\"foo.proto\".\n");
-}
-
-TEST_F(ValidationErrorTest, PackageAlreadyDefined) {
-  BuildFile(
-      "name: \"foo.proto\" "
-      "message_type { name: \"foo\" }");
-  BuildFileWithErrors(
-      "name: \"bar.proto\" "
-      "package: \"foo.bar\"",
-
-      "bar.proto: foo: NAME: \"foo\" is already defined (as something other "
-      "than a package) in file \"foo.proto\".\n");
-}
-
-TEST_F(ValidationErrorTest, EnumValueAlreadyDefinedInParent) {
-  BuildFileWithErrors(
-      "name: \"foo.proto\" "
-      "enum_type { name: \"Foo\" value { name: \"FOO\" number: 1 } } "
-      "enum_type { name: \"Bar\" value { name: \"FOO\" number: 1 } } ",
-
-      "foo.proto: FOO: NAME: \"FOO\" is already defined.\n"
-      "foo.proto: FOO: NAME: Note that enum values use C++ scoping rules, "
-      "meaning that enum values are siblings of their type, not children of "
-      "it.  Therefore, \"FOO\" must be unique within the global scope, not "
-      "just within \"Bar\".\n");
-}
-
-TEST_F(ValidationErrorTest, EnumValueAlreadyDefinedInParentNonGlobal) {
-  BuildFileWithErrors(
-      "name: \"foo.proto\" "
-      "package: \"pkg\" "
-      "enum_type { name: \"Foo\" value { name: \"FOO\" number: 1 } } "
-      "enum_type { name: \"Bar\" value { name: \"FOO\" number: 1 } } ",
-
-      "foo.proto: pkg.FOO: NAME: \"FOO\" is already defined in \"pkg\".\n"
-      "foo.proto: pkg.FOO: NAME: Note that enum values use C++ scoping rules, "
-      "meaning that enum values are siblings of their type, not children of "
-      "it.  Therefore, \"FOO\" must be unique within \"pkg\", not just within "
-      "\"Bar\".\n");
-}
-
-TEST_F(ValidationErrorTest, MissingName) {
-  BuildFileWithErrors(
-      "name: \"foo.proto\" "
-      "message_type { }",
-
-      "foo.proto: : NAME: Missing name.\n");
-}
-
-TEST_F(ValidationErrorTest, InvalidName) {
-  BuildFileWithErrors(
-      "name: \"foo.proto\" "
-      "message_type { name: \"$\" }",
-
-      "foo.proto: $: NAME: \"$\" is not a valid identifier.\n");
-}
-
-TEST_F(ValidationErrorTest, InvalidPackageName) {
-  BuildFileWithErrors(
-      "name: \"foo.proto\" "
-      "package: \"foo.$\"",
-
-      "foo.proto: foo.$: NAME: \"$\" is not a valid identifier.\n");
-}
-
-// 'str' is a static C-style string that may contain '\0'
-#define STATIC_STR(str) std::string((str), sizeof(str) - 1)
-
-TEST_F(ValidationErrorTest, NullCharSymbolName) {
-  BuildFileWithErrors(
-      "name: \"bar.proto\" "
-      "package: \"foo\""
-      "message_type { "
-      "  name: '\\000\\001\\013.Bar' "
-      "  field { name: \"foo\" number:  9 label:LABEL_OPTIONAL type:TYPE_INT32 "
-      "} "
-      "}",
-      STATIC_STR("bar.proto: foo.\0\x1\v.Bar: NAME: \"\0\x1\v.Bar\" is not a "
-                 "valid identifier.\nbar.proto: foo.\0\x1\v.Bar.foo: NAME: "
-                 "\"foo.\0\x1\v.Bar.foo\" contains null character.\nbar.proto: "
-                 "foo.\0\x1\v.Bar: NAME: \"foo.\0\x1\v.Bar\" contains null "
-                 "character.\n"));
-}
-
-TEST_F(ValidationErrorTest, NullCharFileName) {
-  BuildFileWithErrors(
-      "name: \"bar\\000\\001\\013.proto\" "
-      "package: \"outer.foo\"",
-      STATIC_STR("bar\0\x1\v.proto: bar\0\x1\v.proto: NAME: "
-                 "\"bar\0\x1\v.proto\" contains null character.\n"));
-}
-
-TEST_F(ValidationErrorTest, NullCharPackageName) {
-  BuildFileWithErrors(
-      "name: \"bar.proto\" "
-      "package: \"\\000\\001\\013.\"",
-      STATIC_STR("bar.proto: \0\x1\v.: NAME: \"\0\x1\v.\" contains null "
-                 "character.\n"));
-}
-
-TEST_F(ValidationErrorTest, MissingFileName) {
-  BuildFileWithErrors("",
-
-                      ": : OTHER: Missing field: FileDescriptorProto.name.\n");
-}
-
-TEST_F(ValidationErrorTest, DupeDependency) {
-  BuildFile("name: \"foo.proto\"");
-  BuildFileWithErrors(
-      "name: \"bar.proto\" "
-      "dependency: \"foo.proto\" "
-      "dependency: \"foo.proto\" ",
-
-      "bar.proto: foo.proto: IMPORT: Import \"foo.proto\" was listed twice.\n");
-}
-
-TEST_F(ValidationErrorTest, UnknownDependency) {
-  BuildFileWithErrors(
-      "name: \"bar.proto\" "
-      "dependency: \"foo.proto\" ",
-
-      "bar.proto: foo.proto: IMPORT: Import \"foo.proto\" has not been "
-      "loaded.\n");
-}
-
-TEST_F(ValidationErrorTest, InvalidPublicDependencyIndex) {
-  BuildFile("name: \"foo.proto\"");
-  BuildFileWithErrors(
-      "name: \"bar.proto\" "
-      "dependency: \"foo.proto\" "
-      "public_dependency: 1",
-      "bar.proto: bar.proto: OTHER: Invalid public dependency index.\n");
-}
-
-TEST_F(ValidationErrorTest, ForeignUnimportedPackageNoCrash) {
-  // Used to crash:  If we depend on a non-existent file and then refer to a
-  // package defined in a file that we didn't import, and that package is
-  // nested within a parent package which this file is also in, and we don't
-  // include that parent package in the name (i.e. we do a relative lookup)...
-  // Yes, really.
-  BuildFile(
-      "name: 'foo.proto' "
-      "package: 'outer.foo' ");
-  BuildFileWithErrors(
-      "name: 'bar.proto' "
-      "dependency: 'baz.proto' "
-      "package: 'outer.bar' "
-      "message_type { "
-      "  name: 'Bar' "
-      "  field { name:'bar' number:1 label:LABEL_OPTIONAL type_name:'foo.Foo' }"
-      "}",
-
-      "bar.proto: baz.proto: IMPORT: Import \"baz.proto\" has not been "
-      "loaded.\n"
-      "bar.proto: outer.bar.Bar.bar: TYPE: \"outer.foo\" seems to be defined "
-      "in "
-      "\"foo.proto\", which is not imported by \"bar.proto\".  To use it here, "
-      "please add the necessary import.\n");
-}
-
-TEST_F(ValidationErrorTest, DupeFile) {
-  BuildFile(
-      "name: \"foo.proto\" "
-      "message_type { name: \"Foo\" }");
-  // Note:  We should *not* get redundant errors about "Foo" already being
-  //   defined.
-  BuildFileWithErrors(
-      "name: \"foo.proto\" "
-      "message_type { name: \"Foo\" } "
-      // Add another type so that the files aren't identical (in which case
-      // there would be no error).
-      "enum_type { name: \"Bar\" }",
-
-      "foo.proto: foo.proto: OTHER: A file with this name is already in the "
-      "pool.\n");
-}
-
-TEST_F(ValidationErrorTest, FieldInExtensionRange) {
-  BuildFileWithErrors(
-      "name: \"foo.proto\" "
-      "message_type {"
-      "  name: \"Foo\""
-      "  field { name: \"foo\" number:  9 label:LABEL_OPTIONAL type:TYPE_INT32 "
-      "}"
-      "  field { name: \"bar\" number: 10 label:LABEL_OPTIONAL type:TYPE_INT32 "
-      "}"
-      "  field { name: \"baz\" number: 19 label:LABEL_OPTIONAL type:TYPE_INT32 "
-      "}"
-      "  field { name: \"moo\" number: 20 label:LABEL_OPTIONAL type:TYPE_INT32 "
-      "}"
-      "  extension_range { start: 10 end: 20 }"
-      "}",
-
-      "foo.proto: Foo.bar: NUMBER: Extension range 10 to 19 includes field "
-      "\"bar\" (10).\n"
-      "foo.proto: Foo.baz: NUMBER: Extension range 10 to 19 includes field "
-      "\"baz\" (19).\n"
-      "foo.proto: Foo: NUMBER: Suggested field numbers for Foo: 1, 2\n");
-}
-
-TEST_F(ValidationErrorTest, OverlappingExtensionRanges) {
-  BuildFileWithErrors(
-      "name: \"foo.proto\" "
-      "message_type {"
-      "  name: \"Foo\""
-      "  extension_range { start: 10 end: 20 }"
-      "  extension_range { start: 20 end: 30 }"
-      "  extension_range { start: 19 end: 21 }"
-      "}",
-
-      "foo.proto: Foo: NUMBER: Extension range 19 to 20 overlaps with "
-      "already-defined range 10 to 19.\n"
-      "foo.proto: Foo: NUMBER: Extension range 19 to 20 overlaps with "
-      "already-defined range 20 to 29.\n");
-}
-
-TEST_F(ValidationErrorTest, ReservedFieldError) {
-  BuildFileWithErrors(
-      "name: \"foo.proto\" "
-      "message_type {"
-      "  name: \"Foo\""
-      "  field { name: \"foo\" number: 15 label:LABEL_OPTIONAL type:TYPE_INT32 "
-      "}"
-      "  reserved_range { start: 10 end: 20 }"
-      "}",
-
-      "foo.proto: Foo.foo: NUMBER: Field \"foo\" uses reserved number 15.\n"
-      "foo.proto: Foo: NUMBER: Suggested field numbers for Foo: 1\n");
-}
-
-TEST_F(ValidationErrorTest, ReservedExtensionRangeError) {
-  BuildFileWithErrors(
-      "name: \"foo.proto\" "
-      "message_type {"
-      "  name: \"Foo\""
-      "  extension_range { start: 10 end: 20 }"
-      "  reserved_range { start: 5 end: 15 }"
-      "}",
-
-      "foo.proto: Foo: NUMBER: Extension range 10 to 19"
-      " overlaps with reserved range 5 to 14.\n");
-}
-
-TEST_F(ValidationErrorTest, ReservedExtensionRangeAdjacent) {
-  BuildFile(
-      "name: \"foo.proto\" "
-      "message_type {"
-      "  name: \"Foo\""
-      "  extension_range { start: 10 end: 20 }"
-      "  reserved_range { start: 5 end: 10 }"
-      "}");
-}
-
-TEST_F(ValidationErrorTest, ReservedRangeOverlap) {
-  BuildFileWithErrors(
-      "name: \"foo.proto\" "
-      "message_type {"
-      "  name: \"Foo\""
-      "  reserved_range { start: 10 end: 20 }"
-      "  reserved_range { start: 5 end: 15 }"
-      "}",
-
-      "foo.proto: Foo: NUMBER: Reserved range 5 to 14"
-      " overlaps with already-defined range 10 to 19.\n");
-}
-
-TEST_F(ValidationErrorTest, ReservedNameError) {
-  BuildFileWithErrors(
-      "name: \"foo.proto\" "
-      "message_type {"
-      "  name: \"Foo\""
-      "  field { name: \"foo\" number: 15 label:LABEL_OPTIONAL type:TYPE_INT32 "
-      "}"
-      "  field { name: \"bar\" number: 16 label:LABEL_OPTIONAL type:TYPE_INT32 "
-      "}"
-      "  field { name: \"baz\" number: 17 label:LABEL_OPTIONAL type:TYPE_INT32 "
-      "}"
-      "  reserved_name: \"foo\""
-      "  reserved_name: \"bar\""
-      "}",
-
-      "foo.proto: Foo.foo: NAME: Field name \"foo\" is reserved.\n"
-      "foo.proto: Foo.bar: NAME: Field name \"bar\" is reserved.\n");
-}
-
-TEST_F(ValidationErrorTest, ReservedNameRedundant) {
-  BuildFileWithErrors(
-      "name: \"foo.proto\" "
-      "message_type {"
-      "  name: \"Foo\""
-      "  reserved_name: \"foo\""
-      "  reserved_name: \"foo\""
-      "}",
-
-      "foo.proto: foo: NAME: Field name \"foo\" is reserved multiple times.\n");
-}
-
-TEST_F(ValidationErrorTest, ReservedFieldsDebugString) {
-  const FileDescriptor* file = BuildFile(
-      "name: \"foo.proto\" "
-      "message_type {"
-      "  name: \"Foo\""
-      "  reserved_name: \"foo\""
-      "  reserved_name: \"bar\""
-      "  reserved_range { start: 5 end: 6 }"
-      "  reserved_range { start: 10 end: 20 }"
-      "}");
-
-  ASSERT_EQ(
-      "syntax = \"proto2\";\n\n"
-      "message Foo {\n"
-      "  reserved 5, 10 to 19;\n"
-      "  reserved \"foo\", \"bar\";\n"
-      "}\n\n",
-      file->DebugString());
-}
-
-TEST_F(ValidationErrorTest, DebugStringReservedRangeMax) {
-  const FileDescriptor* file = BuildFile(strings::Substitute(
-      "name: \"foo.proto\" "
-      "enum_type { "
-      "  name: \"Bar\""
-      "  value { name:\"BAR\" number:1 }"
-      "  reserved_range { start: 5 end: $0 }"
-      "}"
-      "message_type {"
-      "  name: \"Foo\""
-      "  reserved_range { start: 5 end: $1 }"
-      "}",
-      std::numeric_limits<int>::max(), FieldDescriptor::kMaxNumber + 1));
-
-  ASSERT_EQ(
-      "syntax = \"proto2\";\n\n"
-      "enum Bar {\n"
-      "  BAR = 1;\n"
-      "  reserved 5 to max;\n"
-      "}\n\n"
-      "message Foo {\n"
-      "  reserved 5 to max;\n"
-      "}\n\n",
-      file->DebugString());
-}
-
-TEST_F(ValidationErrorTest, EnumReservedFieldError) {
-  BuildFileWithErrors(
-      "name: \"foo.proto\" "
-      "enum_type {"
-      "  name: \"Foo\""
-      "  value { name:\"BAR\" number:15 }"
-      "  reserved_range { start: 10 end: 20 }"
-      "}",
-
-      "foo.proto: BAR: NUMBER: Enum value \"BAR\" uses reserved number 15.\n");
-}
-
-TEST_F(ValidationErrorTest, EnumNegativeReservedFieldError) {
-  BuildFileWithErrors(
-      "name: \"foo.proto\" "
-      "enum_type {"
-      "  name: \"Foo\""
-      "  value { name:\"BAR\" number:-15 }"
-      "  reserved_range { start: -20 end: -10 }"
-      "}",
-
-      "foo.proto: BAR: NUMBER: Enum value \"BAR\" uses reserved number -15.\n");
-}
-
-TEST_F(ValidationErrorTest, EnumReservedRangeOverlap) {
-  BuildFileWithErrors(
-      "name: \"foo.proto\" "
-      "enum_type {"
-      "  name: \"Foo\""
-      "  value { name:\"BAR\" number:0 }"
-      "  reserved_range { start: 10 end: 20 }"
-      "  reserved_range { start: 5 end: 15 }"
-      "}",
-
-      "foo.proto: Foo: NUMBER: Reserved range 5 to 15"
-      " overlaps with already-defined range 10 to 20.\n");
-}
-
-TEST_F(ValidationErrorTest, EnumReservedRangeOverlapByOne) {
-  BuildFileWithErrors(
-      "name: \"foo.proto\" "
-      "enum_type {"
-      "  name: \"Foo\""
-      "  value { name:\"BAR\" number:0 }"
-      "  reserved_range { start: 10 end: 20 }"
-      "  reserved_range { start: 5 end: 10 }"
-      "}",
-
-      "foo.proto: Foo: NUMBER: Reserved range 5 to 10"
-      " overlaps with already-defined range 10 to 20.\n");
-}
-
-TEST_F(ValidationErrorTest, EnumNegativeReservedRangeOverlap) {
-  BuildFileWithErrors(
-      "name: \"foo.proto\" "
-      "enum_type {"
-      "  name: \"Foo\""
-      "  value { name:\"BAR\" number:0 }"
-      "  reserved_range { start: -20 end: -10 }"
-      "  reserved_range { start: -15 end: -5 }"
-      "}",
-
-      "foo.proto: Foo: NUMBER: Reserved range -15 to -5"
-      " overlaps with already-defined range -20 to -10.\n");
-}
-
-TEST_F(ValidationErrorTest, EnumMixedReservedRangeOverlap) {
-  BuildFileWithErrors(
-      "name: \"foo.proto\" "
-      "enum_type {"
-      "  name: \"Foo\""
-      "  value { name:\"BAR\" number:20 }"
-      "  reserved_range { start: -20 end: 10 }"
-      "  reserved_range { start: -15 end: 5 }"
-      "}",
-
-      "foo.proto: Foo: NUMBER: Reserved range -15 to 5"
-      " overlaps with already-defined range -20 to 10.\n");
-}
-
-TEST_F(ValidationErrorTest, EnumMixedReservedRangeOverlap2) {
-  BuildFileWithErrors(
-      "name: \"foo.proto\" "
-      "enum_type {"
-      "  name: \"Foo\""
-      "  value { name:\"BAR\" number:20 }"
-      "  reserved_range { start: -20 end: 10 }"
-      "  reserved_range { start: 10 end: 10 }"
-      "}",
-
-      "foo.proto: Foo: NUMBER: Reserved range 10 to 10"
-      " overlaps with already-defined range -20 to 10.\n");
-}
-
-TEST_F(ValidationErrorTest, EnumReservedRangeStartGreaterThanEnd) {
-  BuildFileWithErrors(
-      "name: \"foo.proto\" "
-      "enum_type {"
-      "  name: \"Foo\""
-      "  value { name:\"BAR\" number:20 }"
-      "  reserved_range { start: 11 end: 10 }"
-      "}",
-
-      "foo.proto: Foo: NUMBER: Reserved range end number must be greater"
-      " than start number.\n");
-}
-
-TEST_F(ValidationErrorTest, EnumReservedNameError) {
-  BuildFileWithErrors(
-      "name: \"foo.proto\" "
-      "enum_type {"
-      "  name: \"Foo\""
-      "  value { name:\"FOO\" number:15 }"
-      "  value { name:\"BAR\" number:15 }"
-      "  reserved_name: \"FOO\""
-      "  reserved_name: \"BAR\""
-      "}",
-
-      "foo.proto: FOO: NAME: Enum value \"FOO\" is reserved.\n"
-      "foo.proto: BAR: NAME: Enum value \"BAR\" is reserved.\n");
-}
-
-TEST_F(ValidationErrorTest, EnumReservedNameRedundant) {
-  BuildFileWithErrors(
-      "name: \"foo.proto\" "
-      "enum_type {"
-      "  name: \"Foo\""
-      "  value { name:\"FOO\" number:15 }"
-      "  reserved_name: \"foo\""
-      "  reserved_name: \"foo\""
-      "}",
-
-      "foo.proto: foo: NAME: Enum value \"foo\" is reserved multiple times.\n");
-}
-
-TEST_F(ValidationErrorTest, EnumReservedFieldsDebugString) {
-  const FileDescriptor* file = BuildFile(
-      "name: \"foo.proto\" "
-      "enum_type {"
-      "  name: \"Foo\""
-      "  value { name:\"FOO\" number:3 }"
-      "  reserved_name: \"foo\""
-      "  reserved_name: \"bar\""
-      "  reserved_range { start: -6 end: -6 }"
-      "  reserved_range { start: -5 end: -4 }"
-      "  reserved_range { start: -1 end: 1 }"
-      "  reserved_range { start: 5 end: 5 }"
-      "  reserved_range { start: 10 end: 19 }"
-      "}");
-
-  ASSERT_EQ(
-      "syntax = \"proto2\";\n\n"
-      "enum Foo {\n"
-      "  FOO = 3;\n"
-      "  reserved -6, -5 to -4, -1 to 1, 5, 10 to 19;\n"
-      "  reserved \"foo\", \"bar\";\n"
-      "}\n\n",
-      file->DebugString());
-}
-
-TEST_F(ValidationErrorTest, InvalidDefaults) {
-  BuildFileWithErrors(
-      "name: \"foo.proto\" "
-      "message_type {"
-      "  name: \"Foo\""
-
-      // Invalid number.
-      "  field { name: \"foo\" number: 1 label: LABEL_OPTIONAL type: TYPE_INT32"
-      "          default_value: \"abc\" }"
-
-      // Empty default value.
-      "  field { name: \"bar\" number: 2 label: LABEL_OPTIONAL type: TYPE_INT32"
-      "          default_value: \"\" }"
-
-      // Invalid boolean.
-      "  field { name: \"baz\" number: 3 label: LABEL_OPTIONAL type: TYPE_BOOL"
-      "          default_value: \"abc\" }"
-
-      // Messages can't have defaults.
-      "  field { name: \"moo\" number: 4 label: LABEL_OPTIONAL type: "
-      "TYPE_MESSAGE"
-      "          default_value: \"abc\" type_name: \"Foo\" }"
-
-      // Same thing, but we don't know that this field has message type until
-      // we look up the type name.
-      "  field { name: \"mooo\" number: 5 label: LABEL_OPTIONAL"
-      "          default_value: \"abc\" type_name: \"Foo\" }"
-
-      // Repeateds can't have defaults.
-      "  field { name: \"corge\" number: 6 label: LABEL_REPEATED type: "
-      "TYPE_INT32"
-      "          default_value: \"1\" }"
-      "}",
-
-      "foo.proto: Foo.foo: DEFAULT_VALUE: Couldn't parse default value "
-      "\"abc\".\n"
-      "foo.proto: Foo.bar: DEFAULT_VALUE: Couldn't parse default value \"\".\n"
-      "foo.proto: Foo.baz: DEFAULT_VALUE: Boolean default must be true or "
-      "false.\n"
-      "foo.proto: Foo.moo: DEFAULT_VALUE: Messages can't have default values.\n"
-      "foo.proto: Foo.corge: DEFAULT_VALUE: Repeated fields can't have default "
-      "values.\n"
-      // This ends up being reported later because the error is detected at
-      // cross-linking time.
-      "foo.proto: Foo.mooo: DEFAULT_VALUE: Messages can't have default "
-      "values.\n");
-}
-
-TEST_F(ValidationErrorTest, NegativeFieldNumber) {
-  BuildFileWithErrors(
-      "name: \"foo.proto\" "
-      "message_type {"
-      "  name: \"Foo\""
-      "  field { name: \"foo\" number: -1 label:LABEL_OPTIONAL type:TYPE_INT32 "
-      "}"
-      "}",
-
-      "foo.proto: Foo.foo: NUMBER: Field numbers must be positive integers.\n"
-      "foo.proto: Foo: NUMBER: Suggested field numbers for Foo: 1\n");
-}
-
-TEST_F(ValidationErrorTest, HugeFieldNumber) {
-  BuildFileWithErrors(
-      "name: \"foo.proto\" "
-      "message_type {"
-      "  name: \"Foo\""
-      "  field { name: \"foo\" number: 0x70000000 "
-      "          label:LABEL_OPTIONAL type:TYPE_INT32 }"
-      "}",
-
-      "foo.proto: Foo.foo: NUMBER: Field numbers cannot be greater than "
-      "536870911.\n"
-      "foo.proto: Foo: NUMBER: Suggested field numbers for Foo: 1\n");
-}
-
-TEST_F(ValidationErrorTest, ReservedFieldNumber) {
-  BuildFileWithErrors(
-      "name: \"foo.proto\" "
-      "message_type {"
-      "  name: \"Foo\""
-      "  field {name:\"foo\" number: 18999 label:LABEL_OPTIONAL "
-      "type:TYPE_INT32 }"
-      "  field {name:\"bar\" number: 19000 label:LABEL_OPTIONAL "
-      "type:TYPE_INT32 }"
-      "  field {name:\"baz\" number: 19999 label:LABEL_OPTIONAL "
-      "type:TYPE_INT32 }"
-      "  field {name:\"moo\" number: 20000 label:LABEL_OPTIONAL "
-      "type:TYPE_INT32 }"
-      "}",
-
-      "foo.proto: Foo.bar: NUMBER: Field numbers 19000 through 19999 are "
-      "reserved for the protocol buffer library implementation.\n"
-      "foo.proto: Foo.baz: NUMBER: Field numbers 19000 through 19999 are "
-      "reserved for the protocol buffer library implementation.\n"
-      "foo.proto: Foo: NUMBER: Suggested field numbers for Foo: 1, 2\n");
-}
-
-TEST_F(ValidationErrorTest, ExtensionMissingExtendee) {
-  BuildFileWithErrors(
-      "name: \"foo.proto\" "
-      "message_type {"
-      "  name: \"Foo\""
-      "  extension { name: \"foo\" number: 1 label: LABEL_OPTIONAL"
-      "              type_name: \"Foo\" }"
-      "}",
-
-      "foo.proto: Foo.foo: EXTENDEE: FieldDescriptorProto.extendee not set for "
-      "extension field.\n");
-}
-
-TEST_F(ValidationErrorTest, NonExtensionWithExtendee) {
-  BuildFileWithErrors(
-      "name: \"foo.proto\" "
-      "message_type {"
-      "  name: \"Bar\""
-      "  extension_range { start: 1 end: 2 }"
-      "}"
-      "message_type {"
-      "  name: \"Foo\""
-      "  field { name: \"foo\" number: 1 label: LABEL_OPTIONAL"
-      "          type_name: \"Foo\" extendee: \"Bar\" }"
-      "}",
-
-      "foo.proto: Foo.foo: EXTENDEE: FieldDescriptorProto.extendee set for "
-      "non-extension field.\n");
-}
-
-TEST_F(ValidationErrorTest, FieldOneofIndexTooLarge) {
-  BuildFileWithErrors(
-      "name: \"foo.proto\" "
-      "message_type {"
-      "  name: \"Foo\""
-      "  field { name:\"foo\" number:1 label:LABEL_OPTIONAL type:TYPE_INT32 "
-      "          oneof_index: 1 }"
-      "  field { name:\"dummy\" number:2 label:LABEL_OPTIONAL type:TYPE_INT32 "
-      "          oneof_index: 0 }"
-      "  oneof_decl { name:\"bar\" }"
-      "}",
-
-      "foo.proto: Foo.foo: TYPE: FieldDescriptorProto.oneof_index 1 is out of "
-      "range for type \"Foo\".\n");
-}
-
-TEST_F(ValidationErrorTest, FieldOneofIndexNegative) {
-  BuildFileWithErrors(
-      "name: \"foo.proto\" "
-      "message_type {"
-      "  name: \"Foo\""
-      "  field { name:\"foo\" number:1 label:LABEL_OPTIONAL type:TYPE_INT32 "
-      "          oneof_index: -1 }"
-      "  field { name:\"dummy\" number:2 label:LABEL_OPTIONAL type:TYPE_INT32 "
-      "          oneof_index: 0 }"
-      "  oneof_decl { name:\"bar\" }"
-      "}",
-
-      "foo.proto: Foo.foo: TYPE: FieldDescriptorProto.oneof_index -1 is out "
-      "of "
-      "range for type \"Foo\".\n");
-}
-
-TEST_F(ValidationErrorTest, OneofFieldsConsecutiveDefinition) {
-  // Fields belonging to the same oneof must be defined consecutively.
-  BuildFileWithErrors(
-      "name: \"foo.proto\" "
-      "message_type {"
-      "  name: \"Foo\""
-      "  field { name:\"foo1\" number: 1 label:LABEL_OPTIONAL type:TYPE_INT32 "
-      "          oneof_index: 0 }"
-      "  field { name:\"bar\" number: 2 label:LABEL_OPTIONAL type:TYPE_INT32 }"
-      "  field { name:\"foo2\" number: 3 label:LABEL_OPTIONAL type:TYPE_INT32 "
-      "          oneof_index: 0 }"
-      "  oneof_decl { name:\"foos\" }"
-      "}",
-
-      "foo.proto: Foo.bar: TYPE: Fields in the same oneof must be defined "
-      "consecutively. \"bar\" cannot be defined before the completion of the "
-      "\"foos\" oneof definition.\n");
-
-  // Prevent interleaved fields, which belong to different oneofs.
-  BuildFileWithErrors(
-      "name: \"foo2.proto\" "
-      "message_type {"
-      "  name: \"Foo2\""
-      "  field { name:\"foo1\" number: 1 label:LABEL_OPTIONAL type:TYPE_INT32 "
-      "          oneof_index: 0 }"
-      "  field { name:\"bar1\" number: 2 label:LABEL_OPTIONAL type:TYPE_INT32 "
-      "          oneof_index: 1 }"
-      "  field { name:\"foo2\" number: 3 label:LABEL_OPTIONAL type:TYPE_INT32 "
-      "          oneof_index: 0 }"
-      "  field { name:\"bar2\" number: 4 label:LABEL_OPTIONAL type:TYPE_INT32 "
-      "          oneof_index: 1 }"
-      "  oneof_decl { name:\"foos\" }"
-      "  oneof_decl { name:\"bars\" }"
-      "}",
-      "foo2.proto: Foo2.bar1: TYPE: Fields in the same oneof must be defined "
-      "consecutively. \"bar1\" cannot be defined before the completion of the "
-      "\"foos\" oneof definition.\n"
-      "foo2.proto: Foo2.foo2: TYPE: Fields in the same oneof must be defined "
-      "consecutively. \"foo2\" cannot be defined before the completion of the "
-      "\"bars\" oneof definition.\n");
-
-  // Another case for normal fields and different oneof fields interleave.
-  BuildFileWithErrors(
-      "name: \"foo3.proto\" "
-      "message_type {"
-      "  name: \"Foo3\""
-      "  field { name:\"foo1\" number: 1 label:LABEL_OPTIONAL type:TYPE_INT32 "
-      "          oneof_index: 0 }"
-      "  field { name:\"bar1\" number: 2 label:LABEL_OPTIONAL type:TYPE_INT32 "
-      "          oneof_index: 1 }"
-      "  field { name:\"baz\" number: 3 label:LABEL_OPTIONAL type:TYPE_INT32 }"
-      "  field { name:\"foo2\" number: 4 label:LABEL_OPTIONAL type:TYPE_INT32 "
-      "          oneof_index: 0 }"
-      "  oneof_decl { name:\"foos\" }"
-      "  oneof_decl { name:\"bars\" }"
-      "}",
-      "foo3.proto: Foo3.baz: TYPE: Fields in the same oneof must be defined "
-      "consecutively. \"baz\" cannot be defined before the completion of the "
-      "\"foos\" oneof definition.\n");
-}
-
-TEST_F(ValidationErrorTest, FieldNumberConflict) {
-  BuildFileWithErrors(
-      "name: \"foo.proto\" "
-      "message_type {"
-      "  name: \"Foo\""
-      "  field { name: \"foo\" number: 1 label:LABEL_OPTIONAL type:TYPE_INT32 }"
-      "  field { name: \"bar\" number: 1 label:LABEL_OPTIONAL type:TYPE_INT32 }"
-      "}",
-
-      "foo.proto: Foo.bar: NUMBER: Field number 1 has already been used in "
-      "\"Foo\" by field \"foo\".\n");
-}
-
-TEST_F(ValidationErrorTest, BadMessageSetExtensionType) {
-  BuildFileWithErrors(
-      "name: \"foo.proto\" "
-      "message_type {"
-      "  name: \"MessageSet\""
-      "  options { message_set_wire_format: true }"
-      "  extension_range { start: 4 end: 5 }"
-      "}"
-      "message_type {"
-      "  name: \"Foo\""
-      "  extension { name:\"foo\" number:4 label:LABEL_OPTIONAL type:TYPE_INT32"
-      "              extendee: \"MessageSet\" }"
-      "}",
-
-      "foo.proto: Foo.foo: TYPE: Extensions of MessageSets must be optional "
-      "messages.\n");
-}
-
-TEST_F(ValidationErrorTest, BadMessageSetExtensionLabel) {
-  BuildFileWithErrors(
-      "name: \"foo.proto\" "
-      "message_type {"
-      "  name: \"MessageSet\""
-      "  options { message_set_wire_format: true }"
-      "  extension_range { start: 4 end: 5 }"
-      "}"
-      "message_type {"
-      "  name: \"Foo\""
-      "  extension { name:\"foo\" number:4 label:LABEL_REPEATED "
-      "type:TYPE_MESSAGE"
-      "              type_name: \"Foo\" extendee: \"MessageSet\" }"
-      "}",
-
-      "foo.proto: Foo.foo: TYPE: Extensions of MessageSets must be optional "
-      "messages.\n");
-}
-
-TEST_F(ValidationErrorTest, FieldInMessageSet) {
-  BuildFileWithErrors(
-      "name: \"foo.proto\" "
-      "message_type {"
-      "  name: \"Foo\""
-      "  options { message_set_wire_format: true }"
-      "  field { name: \"foo\" number: 1 label:LABEL_OPTIONAL type:TYPE_INT32 }"
-      "}",
-
-      "foo.proto: Foo.foo: NAME: MessageSets cannot have fields, only "
-      "extensions.\n");
-}
-
-TEST_F(ValidationErrorTest, NegativeExtensionRangeNumber) {
-  BuildFileWithErrors(
-      "name: \"foo.proto\" "
-      "message_type {"
-      "  name: \"Foo\""
-      "  extension_range { start: -10 end: -1 }"
-      "}",
-
-      "foo.proto: Foo: NUMBER: Extension numbers must be positive integers.\n");
-}
-
-TEST_F(ValidationErrorTest, HugeExtensionRangeNumber) {
-  BuildFileWithErrors(
-      "name: \"foo.proto\" "
-      "message_type {"
-      "  name: \"Foo\""
-      "  extension_range { start: 1 end: 0x70000000 }"
-      "}",
-
-      "foo.proto: Foo: NUMBER: Extension numbers cannot be greater than "
-      "536870911.\n");
-}
-
-TEST_F(ValidationErrorTest, ExtensionRangeEndBeforeStart) {
-  BuildFileWithErrors(
-      "name: \"foo.proto\" "
-      "message_type {"
-      "  name: \"Foo\""
-      "  extension_range { start: 10 end: 10 }"
-      "  extension_range { start: 10 end: 5 }"
-      "}",
-
-      "foo.proto: Foo: NUMBER: Extension range end number must be greater than "
-      "start number.\n"
-      "foo.proto: Foo: NUMBER: Extension range end number must be greater than "
-      "start number.\n");
-}
-
-TEST_F(ValidationErrorTest, EmptyEnum) {
-  BuildFileWithErrors(
-      "name: \"foo.proto\" "
-      "enum_type { name: \"Foo\" }"
-      // Also use the empty enum in a message to make sure there are no crashes
-      // during validation (possible if the code attempts to derive a default
-      // value for the field).
-      "message_type {"
-      "  name: \"Bar\""
-      "  field { name: \"foo\" number: 1 label:LABEL_OPTIONAL "
-      "type_name:\"Foo\" }"
-      "  field { name: \"bar\" number: 2 label:LABEL_OPTIONAL "
-      "type_name:\"Foo\" "
-      "          default_value: \"NO_SUCH_VALUE\" }"
-      "}",
-
-      "foo.proto: Foo: NAME: Enums must contain at least one value.\n"
-      "foo.proto: Bar.bar: DEFAULT_VALUE: Enum type \"Foo\" has no value named "
-      "\"NO_SUCH_VALUE\".\n");
-}
-
-TEST_F(ValidationErrorTest, UndefinedExtendee) {
-  BuildFileWithErrors(
-      "name: \"foo.proto\" "
-      "message_type {"
-      "  name: \"Foo\""
-      "  extension { name:\"foo\" number:1 label:LABEL_OPTIONAL type:TYPE_INT32"
-      "              extendee: \"Bar\" }"
-      "}",
-
-      "foo.proto: Foo.foo: EXTENDEE: \"Bar\" is not defined.\n");
-}
-
-TEST_F(ValidationErrorTest, NonMessageExtendee) {
-  BuildFileWithErrors(
-      "name: \"foo.proto\" "
-      "enum_type { name: \"Bar\" value { name:\"DUMMY\" number:0 } }"
-      "message_type {"
-      "  name: \"Foo\""
-      "  extension { name:\"foo\" number:1 label:LABEL_OPTIONAL type:TYPE_INT32"
-      "              extendee: \"Bar\" }"
-      "}",
-
-      "foo.proto: Foo.foo: EXTENDEE: \"Bar\" is not a message type.\n");
-}
-
-TEST_F(ValidationErrorTest, NotAnExtensionNumber) {
-  BuildFileWithErrors(
-      "name: \"foo.proto\" "
-      "message_type {"
-      "  name: \"Bar\""
-      "}"
-      "message_type {"
-      "  name: \"Foo\""
-      "  extension { name:\"foo\" number:1 label:LABEL_OPTIONAL type:TYPE_INT32"
-      "              extendee: \"Bar\" }"
-      "}",
-
-      "foo.proto: Foo.foo: NUMBER: \"Bar\" does not declare 1 as an extension "
-      "number.\n");
-}
-
-TEST_F(ValidationErrorTest, RequiredExtension) {
-  BuildFileWithErrors(
-      "name: \"foo.proto\" "
-      "message_type {"
-      "  name: \"Bar\""
-      "  extension_range { start: 1000 end: 10000 }"
-      "}"
-      "message_type {"
-      "  name: \"Foo\""
-      "  extension {"
-      "    name:\"foo\""
-      "    number:1000"
-      "    label:LABEL_REQUIRED"
-      "    type:TYPE_INT32"
-      "    extendee: \"Bar\""
-      "  }"
-      "}",
-
-      "foo.proto: Foo.foo: TYPE: The extension Foo.foo cannot be required.\n");
-}
-
-TEST_F(ValidationErrorTest, UndefinedFieldType) {
-  BuildFileWithErrors(
-      "name: \"foo.proto\" "
-      "message_type {"
-      "  name: \"Foo\""
-      "  field { name:\"foo\" number:1 label:LABEL_OPTIONAL type_name:\"Bar\" }"
-      "}",
-
-      "foo.proto: Foo.foo: TYPE: \"Bar\" is not defined.\n");
-}
-
-TEST_F(ValidationErrorTest, UndefinedFieldTypeWithDefault) {
-  // See b/12533582. Previously this failed because the default value was not
-  // accepted by the parser, which assumed an enum type, leading to an unclear
-  // error message. We want this input to yield a validation error instead,
-  // since the unknown type is the primary problem.
-  BuildFileWithErrors(
-      "name: \"foo.proto\" "
-      "message_type {"
-      "  name: \"Foo\""
-      "  field { name:\"foo\" number:1 label:LABEL_OPTIONAL type_name:\"int\" "
-      "          default_value:\"1\" }"
-      "}",
-
-      "foo.proto: Foo.foo: TYPE: \"int\" is not defined.\n");
-}
-
-TEST_F(ValidationErrorTest, UndefinedNestedFieldType) {
-  BuildFileWithErrors(
-      "name: \"foo.proto\" "
-      "message_type {"
-      "  name: \"Foo\""
-      "  nested_type { name:\"Baz\" }"
-      "  field { name:\"foo\" number:1"
-      "          label:LABEL_OPTIONAL"
-      "          type_name:\"Foo.Baz.Bar\" }"
-      "}",
-
-      "foo.proto: Foo.foo: TYPE: \"Foo.Baz.Bar\" is not defined.\n");
-}
-
-TEST_F(ValidationErrorTest, FieldTypeDefinedInUndeclaredDependency) {
-  BuildFile(
-      "name: \"bar.proto\" "
-      "message_type { name: \"Bar\" } ");
-
-  BuildFileWithErrors(
-      "name: \"foo.proto\" "
-      "message_type {"
-      "  name: \"Foo\""
-      "  field { name:\"foo\" number:1 label:LABEL_OPTIONAL type_name:\"Bar\" }"
-      "}",
-      "foo.proto: Foo.foo: TYPE: \"Bar\" seems to be defined in \"bar.proto\", "
-      "which is not imported by \"foo.proto\".  To use it here, please add the "
-      "necessary import.\n");
-}
-
-TEST_F(ValidationErrorTest, FieldTypeDefinedInIndirectDependency) {
-  // Test for hidden dependencies.
-  //
-  // // bar.proto
-  // message Bar{}
-  //
-  // // forward.proto
-  // import "bar.proto"
-  //
-  // // foo.proto
-  // import "forward.proto"
-  // message Foo {
-  //   optional Bar foo = 1;  // Error, needs to import bar.proto explicitly.
-  // }
-  //
-  BuildFile(
-      "name: \"bar.proto\" "
-      "message_type { name: \"Bar\" }");
-
-  BuildFile(
-      "name: \"forward.proto\""
-      "dependency: \"bar.proto\"");
-
-  BuildFileWithErrors(
-      "name: \"foo.proto\" "
-      "dependency: \"forward.proto\" "
-      "message_type {"
-      "  name: \"Foo\""
-      "  field { name:\"foo\" number:1 label:LABEL_OPTIONAL type_name:\"Bar\" }"
-      "}",
-      "foo.proto: Foo.foo: TYPE: \"Bar\" seems to be defined in \"bar.proto\", "
-      "which is not imported by \"foo.proto\".  To use it here, please add the "
-      "necessary import.\n");
-}
-
-TEST_F(ValidationErrorTest, FieldTypeDefinedInPublicDependency) {
-  // Test for public dependencies.
-  //
-  // // bar.proto
-  // message Bar{}
-  //
-  // // forward.proto
-  // import public "bar.proto"
-  //
-  // // foo.proto
-  // import "forward.proto"
-  // message Foo {
-  //   optional Bar foo = 1;  // Correct. "bar.proto" is public imported into
-  //                          // forward.proto, so when "foo.proto" imports
-  //                          // "forward.proto", it imports "bar.proto" too.
-  // }
-  //
-  BuildFile(
-      "name: \"bar.proto\" "
-      "message_type { name: \"Bar\" }");
-
-  BuildFile(
-      "name: \"forward.proto\""
-      "dependency: \"bar.proto\" "
-      "public_dependency: 0");
-
-  BuildFile(
-      "name: \"foo.proto\" "
-      "dependency: \"forward.proto\" "
-      "message_type {"
-      "  name: \"Foo\""
-      "  field { name:\"foo\" number:1 label:LABEL_OPTIONAL type_name:\"Bar\" }"
-      "}");
-}
-
-TEST_F(ValidationErrorTest, FieldTypeDefinedInTransitivePublicDependency) {
-  // Test for public dependencies.
-  //
-  // // bar.proto
-  // message Bar{}
-  //
-  // // forward.proto
-  // import public "bar.proto"
-  //
-  // // forward2.proto
-  // import public "forward.proto"
-  //
-  // // foo.proto
-  // import "forward2.proto"
-  // message Foo {
-  //   optional Bar foo = 1;  // Correct, public imports are transitive.
-  // }
-  //
-  BuildFile(
-      "name: \"bar.proto\" "
-      "message_type { name: \"Bar\" }");
-
-  BuildFile(
-      "name: \"forward.proto\""
-      "dependency: \"bar.proto\" "
-      "public_dependency: 0");
-
-  BuildFile(
-      "name: \"forward2.proto\""
-      "dependency: \"forward.proto\" "
-      "public_dependency: 0");
-
-  BuildFile(
-      "name: \"foo.proto\" "
-      "dependency: \"forward2.proto\" "
-      "message_type {"
-      "  name: \"Foo\""
-      "  field { name:\"foo\" number:1 label:LABEL_OPTIONAL type_name:\"Bar\" }"
-      "}");
-}
-
-TEST_F(ValidationErrorTest,
-       FieldTypeDefinedInPrivateDependencyOfPublicDependency) {
-  // Test for public dependencies.
-  //
-  // // bar.proto
-  // message Bar{}
-  //
-  // // forward.proto
-  // import "bar.proto"
-  //
-  // // forward2.proto
-  // import public "forward.proto"
-  //
-  // // foo.proto
-  // import "forward2.proto"
-  // message Foo {
-  //   optional Bar foo = 1;  // Error, the "bar.proto" is not public imported
-  //                          // into "forward.proto", so will not be imported
-  //                          // into either "forward2.proto" or "foo.proto".
-  // }
-  //
-  BuildFile(
-      "name: \"bar.proto\" "
-      "message_type { name: \"Bar\" }");
-
-  BuildFile(
-      "name: \"forward.proto\""
-      "dependency: \"bar.proto\"");
-
-  BuildFile(
-      "name: \"forward2.proto\""
-      "dependency: \"forward.proto\" "
-      "public_dependency: 0");
-
-  BuildFileWithErrors(
-      "name: \"foo.proto\" "
-      "dependency: \"forward2.proto\" "
-      "message_type {"
-      "  name: \"Foo\""
-      "  field { name:\"foo\" number:1 label:LABEL_OPTIONAL type_name:\"Bar\" }"
-      "}",
-      "foo.proto: Foo.foo: TYPE: \"Bar\" seems to be defined in \"bar.proto\", "
-      "which is not imported by \"foo.proto\".  To use it here, please add the "
-      "necessary import.\n");
-}
-
-
-TEST_F(ValidationErrorTest, SearchMostLocalFirst) {
-  // The following should produce an error that Bar.Baz is resolved but
-  // not defined:
-  //   message Bar { message Baz {} }
-  //   message Foo {
-  //     message Bar {
-  //       // Placing "message Baz{}" here, or removing Foo.Bar altogether,
-  //       // would fix the error.
-  //     }
-  //     optional Bar.Baz baz = 1;
-  //   }
-  // An one point the lookup code incorrectly did not produce an error in this
-  // case, because when looking for Bar.Baz, it would try "Foo.Bar.Baz" first,
-  // fail, and ten try "Bar.Baz" and succeed, even though "Bar" should actually
-  // refer to the inner Bar, not the outer one.
-  BuildFileWithErrors(
-      "name: \"foo.proto\" "
-      "message_type {"
-      "  name: \"Bar\""
-      "  nested_type { name: \"Baz\" }"
-      "}"
-      "message_type {"
-      "  name: \"Foo\""
-      "  nested_type { name: \"Bar\" }"
-      "  field { name:\"baz\" number:1 label:LABEL_OPTIONAL"
-      "          type_name:\"Bar.Baz\" }"
-      "}",
-
-      "foo.proto: Foo.baz: TYPE: \"Bar.Baz\" is resolved to \"Foo.Bar.Baz\","
-      " which is not defined. The innermost scope is searched first in name "
-      "resolution. Consider using a leading '.'(i.e., \".Bar.Baz\") to start "
-      "from the outermost scope.\n");
-}
-
-TEST_F(ValidationErrorTest, SearchMostLocalFirst2) {
-  // This test would find the most local "Bar" first, and does, but
-  // proceeds to find the outer one because the inner one's not an
-  // aggregate.
-  BuildFile(
-      "name: \"foo.proto\" "
-      "message_type {"
-      "  name: \"Bar\""
-      "  nested_type { name: \"Baz\" }"
-      "}"
-      "message_type {"
-      "  name: \"Foo\""
-      "  field { name: \"Bar\" number:1 type:TYPE_BYTES } "
-      "  field { name:\"baz\" number:2 label:LABEL_OPTIONAL"
-      "          type_name:\"Bar.Baz\" }"
-      "}");
-}
-
-TEST_F(ValidationErrorTest, PackageOriginallyDeclaredInTransitiveDependent) {
-  // Imagine we have the following:
-  //
-  // foo.proto:
-  //   package foo.bar;
-  // bar.proto:
-  //   package foo.bar;
-  //   import "foo.proto";
-  //   message Bar {}
-  // baz.proto:
-  //   package foo;
-  //   import "bar.proto"
-  //   message Baz { optional bar.Bar moo = 1; }
-  //
-  // When validating baz.proto, we will look up "bar.Bar".  As part of this
-  // lookup, we first lookup "bar" then try to find "Bar" within it.  "bar"
-  // should resolve to "foo.bar".  Note, though, that "foo.bar" was originally
-  // defined in foo.proto, which is not a direct dependency of baz.proto.  The
-  // implementation of FindSymbol() normally only returns symbols in direct
-  // dependencies, not indirect ones.  This test insures that this does not
-  // prevent it from finding "foo.bar".
-
-  BuildFile(
-      "name: \"foo.proto\" "
-      "package: \"foo.bar\" ");
-  BuildFile(
-      "name: \"bar.proto\" "
-      "package: \"foo.bar\" "
-      "dependency: \"foo.proto\" "
-      "message_type { name: \"Bar\" }");
-  BuildFile(
-      "name: \"baz.proto\" "
-      "package: \"foo\" "
-      "dependency: \"bar.proto\" "
-      "message_type { "
-      "  name: \"Baz\" "
-      "  field { name:\"moo\" number:1 label:LABEL_OPTIONAL "
-      "          type_name:\"bar.Bar\" }"
-      "}");
-}
-
-TEST_F(ValidationErrorTest, FieldTypeNotAType) {
-  BuildFileWithErrors(
-      "name: \"foo.proto\" "
-      "message_type {"
-      "  name: \"Foo\""
-      "  field { name:\"foo\" number:1 label:LABEL_OPTIONAL "
-      "          type_name:\".Foo.bar\" }"
-      "  field { name:\"bar\" number:2 label:LABEL_OPTIONAL type:TYPE_INT32 }"
-      "}",
-
-      "foo.proto: Foo.foo: TYPE: \".Foo.bar\" is not a type.\n");
-}
-
-TEST_F(ValidationErrorTest, RelativeFieldTypeNotAType) {
-  BuildFileWithErrors(
-      "name: \"foo.proto\" "
-      "message_type {"
-      "  nested_type {"
-      "    name: \"Bar\""
-      "    field { name:\"Baz\" number:2 label:LABEL_OPTIONAL type:TYPE_INT32 }"
-      "  }"
-      "  name: \"Foo\""
-      "  field { name:\"foo\" number:1 label:LABEL_OPTIONAL "
-      "          type_name:\"Bar.Baz\" }"
-      "}",
-      "foo.proto: Foo.foo: TYPE: \"Bar.Baz\" is not a type.\n");
-}
-
-TEST_F(ValidationErrorTest, FieldTypeMayBeItsName) {
-  BuildFile(
-      "name: \"foo.proto\" "
-      "message_type {"
-      "  name: \"Bar\""
-      "}"
-      "message_type {"
-      "  name: \"Foo\""
-      "  field { name:\"Bar\" number:1 label:LABEL_OPTIONAL type_name:\"Bar\" }"
-      "}");
-}
-
-TEST_F(ValidationErrorTest, EnumFieldTypeIsMessage) {
-  BuildFileWithErrors(
-      "name: \"foo.proto\" "
-      "message_type { name: \"Bar\" } "
-      "message_type {"
-      "  name: \"Foo\""
-      "  field { name:\"foo\" number:1 label:LABEL_OPTIONAL type:TYPE_ENUM"
-      "          type_name:\"Bar\" }"
-      "}",
-
-      "foo.proto: Foo.foo: TYPE: \"Bar\" is not an enum type.\n");
-}
-
-TEST_F(ValidationErrorTest, MessageFieldTypeIsEnum) {
-  BuildFileWithErrors(
-      "name: \"foo.proto\" "
-      "enum_type { name: \"Bar\" value { name:\"DUMMY\" number:0 } } "
-      "message_type {"
-      "  name: \"Foo\""
-      "  field { name:\"foo\" number:1 label:LABEL_OPTIONAL type:TYPE_MESSAGE"
-      "          type_name:\"Bar\" }"
-      "}",
-
-      "foo.proto: Foo.foo: TYPE: \"Bar\" is not a message type.\n");
-}
-
-TEST_F(ValidationErrorTest, BadEnumDefaultValue) {
-  BuildFileWithErrors(
-      "name: \"foo.proto\" "
-      "enum_type { name: \"Bar\" value { name:\"DUMMY\" number:0 } } "
-      "message_type {"
-      "  name: \"Foo\""
-      "  field { name:\"foo\" number:1 label:LABEL_OPTIONAL type_name:\"Bar\""
-      "          default_value:\"NO_SUCH_VALUE\" }"
-      "}",
-
-      "foo.proto: Foo.foo: DEFAULT_VALUE: Enum type \"Bar\" has no value named "
-      "\"NO_SUCH_VALUE\".\n");
-}
-
-TEST_F(ValidationErrorTest, EnumDefaultValueIsInteger) {
-  BuildFileWithErrors(
-      "name: \"foo.proto\" "
-      "enum_type { name: \"Bar\" value { name:\"DUMMY\" number:0 } } "
-      "message_type {"
-      "  name: \"Foo\""
-      "  field { name:\"foo\" number:1 label:LABEL_OPTIONAL type_name:\"Bar\""
-      "          default_value:\"0\" }"
-      "}",
-
-      "foo.proto: Foo.foo: DEFAULT_VALUE: Default value for an enum field must "
-      "be an identifier.\n");
-}
-
-TEST_F(ValidationErrorTest, PrimitiveWithTypeName) {
-  BuildFileWithErrors(
-      "name: \"foo.proto\" "
-      "message_type {"
-      "  name: \"Foo\""
-      "  field { name:\"foo\" number:1 label:LABEL_OPTIONAL type:TYPE_INT32"
-      "          type_name:\"Foo\" }"
-      "}",
-
-      "foo.proto: Foo.foo: TYPE: Field with primitive type has type_name.\n");
-}
-
-TEST_F(ValidationErrorTest, NonPrimitiveWithoutTypeName) {
-  BuildFileWithErrors(
-      "name: \"foo.proto\" "
-      "message_type {"
-      "  name: \"Foo\""
-      "  field { name:\"foo\" number:1 label:LABEL_OPTIONAL type:TYPE_MESSAGE }"
-      "}",
-
-      "foo.proto: Foo.foo: TYPE: Field with message or enum type missing "
-      "type_name.\n");
-}
-
-TEST_F(ValidationErrorTest, OneofWithNoFields) {
-  BuildFileWithErrors(
-      "name: \"foo.proto\" "
-      "message_type {"
-      "  name: \"Foo\""
-      "  oneof_decl { name:\"bar\" }"
-      "}",
-
-      "foo.proto: Foo.bar: NAME: Oneof must have at least one field.\n");
-}
-
-TEST_F(ValidationErrorTest, OneofLabelMismatch) {
-  BuildFileWithErrors(
-      "name: \"foo.proto\" "
-      "message_type {"
-      "  name: \"Foo\""
-      "  field { name:\"foo\" number:1 label:LABEL_REPEATED type:TYPE_INT32 "
-      "          oneof_index:0 }"
-      "  oneof_decl { name:\"bar\" }"
-      "}",
-
-      "foo.proto: Foo.foo: NAME: Fields of oneofs must themselves have label "
-      "LABEL_OPTIONAL.\n");
-}
-
-TEST_F(ValidationErrorTest, InputTypeNotDefined) {
-  BuildFileWithErrors(
-      "name: \"foo.proto\" "
-      "message_type { name: \"Foo\" } "
-      "service {"
-      "  name: \"TestService\""
-      "  method { name: \"A\" input_type: \"Bar\" output_type: \"Foo\" }"
-      "}",
-
-      "foo.proto: TestService.A: INPUT_TYPE: \"Bar\" is not defined.\n"
-  );
-}
-
-TEST_F(ValidationErrorTest, InputTypeNotAMessage) {
-  BuildFileWithErrors(
-      "name: \"foo.proto\" "
-      "message_type { name: \"Foo\" } "
-      "enum_type { name: \"Bar\" value { name:\"DUMMY\" number:0 } } "
-      "service {"
-      "  name: \"TestService\""
-      "  method { name: \"A\" input_type: \"Bar\" output_type: \"Foo\" }"
-      "}",
-
-      "foo.proto: TestService.A: INPUT_TYPE: \"Bar\" is not a message type.\n"
-  );
-}
-
-TEST_F(ValidationErrorTest, OutputTypeNotDefined) {
-  BuildFileWithErrors(
-      "name: \"foo.proto\" "
-      "message_type { name: \"Foo\" } "
-      "service {"
-      "  name: \"TestService\""
-      "  method { name: \"A\" input_type: \"Foo\" output_type: \"Bar\" }"
-      "}",
-
-      "foo.proto: TestService.A: OUTPUT_TYPE: \"Bar\" is not defined.\n"
-  );
-}
-
-TEST_F(ValidationErrorTest, OutputTypeNotAMessage) {
-  BuildFileWithErrors(
-      "name: \"foo.proto\" "
-      "message_type { name: \"Foo\" } "
-      "enum_type { name: \"Bar\" value { name:\"DUMMY\" number:0 } } "
-      "service {"
-      "  name: \"TestService\""
-      "  method { name: \"A\" input_type: \"Foo\" output_type: \"Bar\" }"
-      "}",
-
-      "foo.proto: TestService.A: OUTPUT_TYPE: \"Bar\" is not a message type.\n"
-  );
-}
-
-
-TEST_F(ValidationErrorTest, IllegalPackedField) {
-  BuildFileWithErrors(
-      "name: \"foo.proto\" "
-      "message_type {\n"
-      "  name: \"Foo\""
-      "  field { name:\"packed_string\" number:1 label:LABEL_REPEATED "
-      "          type:TYPE_STRING "
-      "          options { uninterpreted_option {"
-      "            name { name_part: \"packed\" is_extension: false }"
-      "            identifier_value: \"true\" }}}\n"
-      "  field { name:\"packed_message\" number:3 label:LABEL_REPEATED "
-      "          type_name: \"Foo\""
-      "          options { uninterpreted_option {"
-      "            name { name_part: \"packed\" is_extension: false }"
-      "            identifier_value: \"true\" }}}\n"
-      "  field { name:\"optional_int32\" number: 4 label: LABEL_OPTIONAL "
-      "          type:TYPE_INT32 "
-      "          options { uninterpreted_option {"
-      "            name { name_part: \"packed\" is_extension: false }"
-      "            identifier_value: \"true\" }}}\n"
-      "}",
-
-      "foo.proto: Foo.packed_string: TYPE: [packed = true] can only be "
-      "specified for repeated primitive fields.\n"
-      "foo.proto: Foo.packed_message: TYPE: [packed = true] can only be "
-      "specified for repeated primitive fields.\n"
-      "foo.proto: Foo.optional_int32: TYPE: [packed = true] can only be "
-      "specified for repeated primitive fields.\n");
-}
-
-TEST_F(ValidationErrorTest, OptionWrongType) {
-  BuildFileWithErrors(
-      "name: \"foo.proto\" "
-      "message_type { "
-      "  name: \"TestMessage\" "
-      "  field { name:\"foo\" number:1 label:LABEL_OPTIONAL type:TYPE_STRING "
-      "          options { uninterpreted_option { name { name_part: \"ctype\" "
-      "                                                  is_extension: false }"
-      "                                           positive_int_value: 1 }"
-      "          }"
-      "  }"
-      "}\n",
-
-      "foo.proto: TestMessage.foo: OPTION_VALUE: Value must be identifier for "
-      "enum-valued option \"google.protobuf.FieldOptions.ctype\".\n");
-}
-
-TEST_F(ValidationErrorTest, OptionExtendsAtomicType) {
-  BuildFileWithErrors(
-      "name: \"foo.proto\" "
-      "message_type { "
-      "  name: \"TestMessage\" "
-      "  field { name:\"foo\" number:1 label:LABEL_OPTIONAL type:TYPE_STRING "
-      "          options { uninterpreted_option { name { name_part: \"ctype\" "
-      "                                                  is_extension: false }"
-      "                                           name { name_part: \"foo\" "
-      "                                                  is_extension: true }"
-      "                                           positive_int_value: 1 }"
-      "          }"
-      "  }"
-      "}\n",
-
-      "foo.proto: TestMessage.foo: OPTION_NAME: Option \"ctype\" is an "
-      "atomic type, not a message.\n");
-}
-
-TEST_F(ValidationErrorTest, DupOption) {
-  BuildFileWithErrors(
-      "name: \"foo.proto\" "
-      "message_type { "
-      "  name: \"TestMessage\" "
-      "  field { name:\"foo\" number:1 label:LABEL_OPTIONAL type:TYPE_UINT32 "
-      "          options { uninterpreted_option { name { name_part: \"ctype\" "
-      "                                                  is_extension: false }"
-      "                                           identifier_value: \"CORD\" }"
-      "                    uninterpreted_option { name { name_part: \"ctype\" "
-      "                                                  is_extension: false }"
-      "                                           identifier_value: \"CORD\" }"
-      "          }"
-      "  }"
-      "}\n",
-
-      "foo.proto: TestMessage.foo: OPTION_NAME: Option \"ctype\" was "
-      "already set.\n");
-}
-
-TEST_F(ValidationErrorTest, InvalidOptionName) {
-  BuildFileWithErrors(
-      "name: \"foo.proto\" "
-      "message_type { "
-      "  name: \"TestMessage\" "
-      "  field { name:\"foo\" number:1 label:LABEL_OPTIONAL type:TYPE_BOOL "
-      "          options { uninterpreted_option { "
-      "                      name { name_part: \"uninterpreted_option\" "
-      "                             is_extension: false }"
-      "                      positive_int_value: 1 "
-      "                    }"
-      "          }"
-      "  }"
-      "}\n",
-
-      "foo.proto: TestMessage.foo: OPTION_NAME: Option must not use "
-      "reserved name \"uninterpreted_option\".\n");
-}
-
-TEST_F(ValidationErrorTest, RepeatedMessageOption) {
-  BuildDescriptorMessagesInTestPool();
-
-  BuildFileWithErrors(
-      "name: \"foo.proto\" "
-      "dependency: \"google/protobuf/descriptor.proto\" "
-      "message_type: { name: \"Bar\" field: { "
-      "  name: \"foo\" number: 1 label: LABEL_OPTIONAL type: TYPE_INT32 } "
-      "} "
-      "extension { name: \"bar\" number: 7672757 label: LABEL_REPEATED "
-      "            type: TYPE_MESSAGE type_name: \"Bar\" "
-      "            extendee: \"google.protobuf.FileOptions\" }"
-      "options { uninterpreted_option { name { name_part: \"bar\" "
-      "                                        is_extension: true } "
-      "                                 name { name_part: \"foo\" "
-      "                                        is_extension: false } "
-      "                                 positive_int_value: 1 } }",
-
-      "foo.proto: foo.proto: OPTION_NAME: Option field \"(bar)\" is a "
-      "repeated message. Repeated message options must be initialized "
-      "using an aggregate value.\n");
-}
-
-TEST_F(ValidationErrorTest, ResolveUndefinedOption) {
-  // The following should produce an error that baz.bar is resolved but not
-  // defined.
-  // foo.proto:
-  //   package baz
-  //   import google/protobuf/descriptor.proto
-  //   message Bar { optional int32 foo = 1; }
-  //   extend FileOptions { optional Bar bar = 7672757; }
-  //
-  // moo.proto:
-  //   package moo.baz
-  //   option (baz.bar).foo = 1;
-  //
-  // Although "baz.bar" is already defined, the lookup code will try
-  // "moo.baz.bar", since it's the match from the innermost scope, which will
-  // cause a symbol not defined error.
-  BuildDescriptorMessagesInTestPool();
-
-  BuildFile(
-      "name: \"foo.proto\" "
-      "package: \"baz\" "
-      "dependency: \"google/protobuf/descriptor.proto\" "
-      "message_type: { name: \"Bar\" field: { "
-      "  name: \"foo\" number: 1 label: LABEL_OPTIONAL type: TYPE_INT32 } "
-      "} "
-      "extension { name: \"bar\" number: 7672757 label: LABEL_OPTIONAL "
-      "            type: TYPE_MESSAGE type_name: \"Bar\" "
-      "            extendee: \"google.protobuf.FileOptions\" }");
-
-  BuildFileWithErrors(
-      "name: \"moo.proto\" "
-      "package: \"moo.baz\" "
-      "options { uninterpreted_option { name { name_part: \"baz.bar\" "
-      "                                        is_extension: true } "
-      "                                 name { name_part: \"foo\" "
-      "                                        is_extension: false } "
-      "                                 positive_int_value: 1 } }",
-
-      "moo.proto: moo.proto: OPTION_NAME: Option \"(baz.bar)\" is resolved to "
-      "\"(moo.baz.bar)\","
-      " which is not defined. The innermost scope is searched first in name "
-      "resolution. Consider using a leading '.'(i.e., \"(.baz.bar)\") to start "
-      "from the outermost scope.\n");
-}
-
-TEST_F(ValidationErrorTest, UnknownOption) {
-  BuildFileWithErrors(
-      "name: \"moo.proto\" "
-      "package: \"moo.baz\" "
-      "options { uninterpreted_option { name { name_part: \"baaz.bar\" "
-      "                                        is_extension: true } "
-      "                                 name { name_part: \"foo\" "
-      "                                        is_extension: false } "
-      "                                 positive_int_value: 1 } }",
-
-      "moo.proto: moo.proto: OPTION_NAME: Option \"(baaz.bar)\" unknown. "
-      "Ensure "
-      "that your proto definition file imports the proto which defines the "
-      "option.\n");
-}
-
-TEST_F(ValidationErrorTest, CustomOptionConflictingFieldNumber) {
-  BuildDescriptorMessagesInTestPool();
-
-  BuildFileWithErrors(
-      "name: \"foo.proto\" "
-      "dependency: \"google/protobuf/descriptor.proto\" "
-      "extension { name: \"foo1\" number: 7672757 label: LABEL_OPTIONAL "
-      "            type: TYPE_INT32 extendee: \"google.protobuf.FieldOptions\" }"
-      "extension { name: \"foo2\" number: 7672757 label: LABEL_OPTIONAL "
-      "            type: TYPE_INT32 extendee: \"google.protobuf.FieldOptions\" }",
-
-      "foo.proto: foo2: NUMBER: Extension number 7672757 has already been used "
-      "in \"google.protobuf.FieldOptions\" by extension \"foo1\".\n");
-}
-
-TEST_F(ValidationErrorTest, Int32OptionValueOutOfPositiveRange) {
-  BuildDescriptorMessagesInTestPool();
-
-  BuildFileWithErrors(
-      "name: \"foo.proto\" "
-      "dependency: \"google/protobuf/descriptor.proto\" "
-      "extension { name: \"foo\" number: 7672757 label: LABEL_OPTIONAL "
-      "            type: TYPE_INT32 extendee: \"google.protobuf.FileOptions\" }"
-      "options { uninterpreted_option { name { name_part: \"foo\" "
-      "                                        is_extension: true } "
-      "                                 positive_int_value: 0x80000000 } "
-      "}",
-
-      "foo.proto: foo.proto: OPTION_VALUE: Value out of range "
-      "for int32 option \"foo\".\n");
-}
-
-TEST_F(ValidationErrorTest, Int32OptionValueOutOfNegativeRange) {
-  BuildDescriptorMessagesInTestPool();
-
-  BuildFileWithErrors(
-      "name: \"foo.proto\" "
-      "dependency: \"google/protobuf/descriptor.proto\" "
-      "extension { name: \"foo\" number: 7672757 label: LABEL_OPTIONAL "
-      "            type: TYPE_INT32 extendee: \"google.protobuf.FileOptions\" }"
-      "options { uninterpreted_option { name { name_part: \"foo\" "
-      "                                        is_extension: true } "
-      "                                 negative_int_value: -0x80000001 } "
-      "}",
-
-      "foo.proto: foo.proto: OPTION_VALUE: Value out of range "
-      "for int32 option \"foo\".\n");
-}
-
-TEST_F(ValidationErrorTest, Int32OptionValueIsNotPositiveInt) {
-  BuildDescriptorMessagesInTestPool();
-
-  BuildFileWithErrors(
-      "name: \"foo.proto\" "
-      "dependency: \"google/protobuf/descriptor.proto\" "
-      "extension { name: \"foo\" number: 7672757 label: LABEL_OPTIONAL "
-      "            type: TYPE_INT32 extendee: \"google.protobuf.FileOptions\" }"
-      "options { uninterpreted_option { name { name_part: \"foo\" "
-      "                                        is_extension: true } "
-      "                                 string_value: \"5\" } }",
-
-      "foo.proto: foo.proto: OPTION_VALUE: Value must be integer "
-      "for int32 option \"foo\".\n");
-}
-
-TEST_F(ValidationErrorTest, Int64OptionValueOutOfRange) {
-  BuildDescriptorMessagesInTestPool();
-
-  BuildFileWithErrors(
-      "name: \"foo.proto\" "
-      "dependency: \"google/protobuf/descriptor.proto\" "
-      "extension { name: \"foo\" number: 7672757 label: LABEL_OPTIONAL "
-      "            type: TYPE_INT64 extendee: \"google.protobuf.FileOptions\" }"
-      "options { uninterpreted_option { name { name_part: \"foo\" "
-      "                                        is_extension: true } "
-      "                                 positive_int_value: 0x8000000000000000 "
-      "} "
-      "}",
-
-      "foo.proto: foo.proto: OPTION_VALUE: Value out of range "
-      "for int64 option \"foo\".\n");
-}
-
-TEST_F(ValidationErrorTest, Int64OptionValueIsNotPositiveInt) {
-  BuildDescriptorMessagesInTestPool();
-
-  BuildFileWithErrors(
-      "name: \"foo.proto\" "
-      "dependency: \"google/protobuf/descriptor.proto\" "
-      "extension { name: \"foo\" number: 7672757 label: LABEL_OPTIONAL "
-      "            type: TYPE_INT64 extendee: \"google.protobuf.FileOptions\" }"
-      "options { uninterpreted_option { name { name_part: \"foo\" "
-      "                                        is_extension: true } "
-      "                                 identifier_value: \"5\" } }",
-
-      "foo.proto: foo.proto: OPTION_VALUE: Value must be integer "
-      "for int64 option \"foo\".\n");
-}
-
-TEST_F(ValidationErrorTest, UInt32OptionValueOutOfRange) {
-  BuildDescriptorMessagesInTestPool();
-
-  BuildFileWithErrors(
-      "name: \"foo.proto\" "
-      "dependency: \"google/protobuf/descriptor.proto\" "
-      "extension { name: \"foo\" number: 7672757 label: LABEL_OPTIONAL "
-      "            type: TYPE_UINT32 extendee: \"google.protobuf.FileOptions\" }"
-      "options { uninterpreted_option { name { name_part: \"foo\" "
-      "                                        is_extension: true } "
-      "                                 positive_int_value: 0x100000000 } }",
-
-      "foo.proto: foo.proto: OPTION_VALUE: Value out of range "
-      "for uint32 option \"foo\".\n");
-}
-
-TEST_F(ValidationErrorTest, UInt32OptionValueIsNotPositiveInt) {
-  BuildDescriptorMessagesInTestPool();
-
-  BuildFileWithErrors(
-      "name: \"foo.proto\" "
-      "dependency: \"google/protobuf/descriptor.proto\" "
-      "extension { name: \"foo\" number: 7672757 label: LABEL_OPTIONAL "
-      "            type: TYPE_UINT32 extendee: \"google.protobuf.FileOptions\" }"
-      "options { uninterpreted_option { name { name_part: \"foo\" "
-      "                                        is_extension: true } "
-      "                                 double_value: -5.6 } }",
-
-      "foo.proto: foo.proto: OPTION_VALUE: Value must be non-negative integer "
-      "for uint32 option \"foo\".\n");
-}
-
-TEST_F(ValidationErrorTest, UInt64OptionValueIsNotPositiveInt) {
-  BuildDescriptorMessagesInTestPool();
-
-  BuildFileWithErrors(
-      "name: \"foo.proto\" "
-      "dependency: \"google/protobuf/descriptor.proto\" "
-      "extension { name: \"foo\" number: 7672757 label: LABEL_OPTIONAL "
-      "            type: TYPE_UINT64 extendee: \"google.protobuf.FileOptions\" }"
-      "options { uninterpreted_option { name { name_part: \"foo\" "
-      "                                        is_extension: true } "
-      "                                 negative_int_value: -5 } }",
-
-      "foo.proto: foo.proto: OPTION_VALUE: Value must be non-negative integer "
-      "for uint64 option \"foo\".\n");
-}
-
-TEST_F(ValidationErrorTest, FloatOptionValueIsNotNumber) {
-  BuildDescriptorMessagesInTestPool();
-
-  BuildFileWithErrors(
-      "name: \"foo.proto\" "
-      "dependency: \"google/protobuf/descriptor.proto\" "
-      "extension { name: \"foo\" number: 7672757 label: LABEL_OPTIONAL "
-      "            type: TYPE_FLOAT extendee: \"google.protobuf.FileOptions\" }"
-      "options { uninterpreted_option { name { name_part: \"foo\" "
-      "                                        is_extension: true } "
-      "                                 string_value: \"bar\" } }",
-
-      "foo.proto: foo.proto: OPTION_VALUE: Value must be number "
-      "for float option \"foo\".\n");
-}
-
-TEST_F(ValidationErrorTest, DoubleOptionValueIsNotNumber) {
-  BuildDescriptorMessagesInTestPool();
-
-  BuildFileWithErrors(
-      "name: \"foo.proto\" "
-      "dependency: \"google/protobuf/descriptor.proto\" "
-      "extension { name: \"foo\" number: 7672757 label: LABEL_OPTIONAL "
-      "            type: TYPE_DOUBLE extendee: \"google.protobuf.FileOptions\" }"
-      "options { uninterpreted_option { name { name_part: \"foo\" "
-      "                                        is_extension: true } "
-      "                                 string_value: \"bar\" } }",
-
-      "foo.proto: foo.proto: OPTION_VALUE: Value must be number "
-      "for double option \"foo\".\n");
-}
-
-TEST_F(ValidationErrorTest, BoolOptionValueIsNotTrueOrFalse) {
-  BuildDescriptorMessagesInTestPool();
-
-  BuildFileWithErrors(
-      "name: \"foo.proto\" "
-      "dependency: \"google/protobuf/descriptor.proto\" "
-      "extension { name: \"foo\" number: 7672757 label: LABEL_OPTIONAL "
-      "            type: TYPE_BOOL extendee: \"google.protobuf.FileOptions\" }"
-      "options { uninterpreted_option { name { name_part: \"foo\" "
-      "                                        is_extension: true } "
-      "                                 identifier_value: \"bar\" } }",
-
-      "foo.proto: foo.proto: OPTION_VALUE: Value must be \"true\" or \"false\" "
-      "for boolean option \"foo\".\n");
-}
-
-TEST_F(ValidationErrorTest, EnumOptionValueIsNotIdentifier) {
-  BuildDescriptorMessagesInTestPool();
-
-  BuildFileWithErrors(
-      "name: \"foo.proto\" "
-      "dependency: \"google/protobuf/descriptor.proto\" "
-      "enum_type { name: \"FooEnum\" value { name: \"BAR\" number: 1 } "
-      "                              value { name: \"BAZ\" number: 2 } }"
-      "extension { name: \"foo\" number: 7672757 label: LABEL_OPTIONAL "
-      "            type: TYPE_ENUM type_name: \"FooEnum\" "
-      "            extendee: \"google.protobuf.FileOptions\" }"
-      "options { uninterpreted_option { name { name_part: \"foo\" "
-      "                                        is_extension: true } "
-      "                                 string_value: \"MOOO\" } }",
-
-      "foo.proto: foo.proto: OPTION_VALUE: Value must be identifier for "
-      "enum-valued option \"foo\".\n");
-}
-
-TEST_F(ValidationErrorTest, EnumOptionValueIsNotEnumValueName) {
-  BuildDescriptorMessagesInTestPool();
-
-  BuildFileWithErrors(
-      "name: \"foo.proto\" "
-      "dependency: \"google/protobuf/descriptor.proto\" "
-      "enum_type { name: \"FooEnum\" value { name: \"BAR\" number: 1 } "
-      "                              value { name: \"BAZ\" number: 2 } }"
-      "extension { name: \"foo\" number: 7672757 label: LABEL_OPTIONAL "
-      "            type: TYPE_ENUM type_name: \"FooEnum\" "
-      "            extendee: \"google.protobuf.FileOptions\" }"
-      "options { uninterpreted_option { name { name_part: \"foo\" "
-      "                                        is_extension: true } "
-      "                                 identifier_value: \"MOOO\" } }",
-
-      "foo.proto: foo.proto: OPTION_VALUE: Enum type \"FooEnum\" has no value "
-      "named \"MOOO\" for option \"foo\".\n");
-}
-
-TEST_F(ValidationErrorTest, EnumOptionValueIsSiblingEnumValueName) {
-  BuildDescriptorMessagesInTestPool();
-
-  BuildFileWithErrors(
-      "name: \"foo.proto\" "
-      "dependency: \"google/protobuf/descriptor.proto\" "
-      "enum_type { name: \"FooEnum1\" value { name: \"BAR\" number: 1 } "
-      "                               value { name: \"BAZ\" number: 2 } }"
-      "enum_type { name: \"FooEnum2\" value { name: \"MOO\" number: 1 } "
-      "                               value { name: \"MOOO\" number: 2 } }"
-      "extension { name: \"foo\" number: 7672757 label: LABEL_OPTIONAL "
-      "            type: TYPE_ENUM type_name: \"FooEnum1\" "
-      "            extendee: \"google.protobuf.FileOptions\" }"
-      "options { uninterpreted_option { name { name_part: \"foo\" "
-      "                                        is_extension: true } "
-      "                                 identifier_value: \"MOOO\" } }",
-
-      "foo.proto: foo.proto: OPTION_VALUE: Enum type \"FooEnum1\" has no value "
-      "named \"MOOO\" for option \"foo\". This appears to be a value from a "
-      "sibling type.\n");
-}
-
-TEST_F(ValidationErrorTest, StringOptionValueIsNotString) {
-  BuildDescriptorMessagesInTestPool();
-
-  BuildFileWithErrors(
-      "name: \"foo.proto\" "
-      "dependency: \"google/protobuf/descriptor.proto\" "
-      "extension { name: \"foo\" number: 7672757 label: LABEL_OPTIONAL "
-      "            type: TYPE_STRING extendee: \"google.protobuf.FileOptions\" }"
-      "options { uninterpreted_option { name { name_part: \"foo\" "
-      "                                        is_extension: true } "
-      "                                 identifier_value: \"MOOO\" } }",
-
-      "foo.proto: foo.proto: OPTION_VALUE: Value must be quoted string "
-      "for "
-      "string option \"foo\".\n");
-}
-
-TEST_F(ValidationErrorTest, JsonNameOptionOnExtensions) {
-  BuildFileWithErrors(
-      "name: \"foo.proto\" "
-      "package: \"foo\" "
-      "message_type {"
-      "  name: \"Foo\""
-      "  extension_range { start: 10 end: 20 }"
-      "}"
-      "extension {"
-      "  name: \"value\""
-      "  number: 10"
-      "  label: LABEL_OPTIONAL"
-      "  type: TYPE_INT32"
-      "  extendee: \"foo.Foo\""
-      "  json_name: \"myName\""
-      "}",
-      "foo.proto: foo.value: OPTION_NAME: option json_name is not allowed on "
-      "extension fields.\n");
-}
-
-TEST_F(ValidationErrorTest, DuplicateExtensionFieldNumber) {
-  BuildDescriptorMessagesInTestPool();
-
-  BuildFile(
-      "name: \"foo.proto\" "
-      "dependency: \"google/protobuf/descriptor.proto\" "
-      "extension { name: \"option1\" number: 1000 label: LABEL_OPTIONAL "
-      "            type: TYPE_INT32 extendee: \"google.protobuf.FileOptions\" }");
-
-  BuildFileWithWarnings(
-      "name: \"bar.proto\" "
-      "dependency: \"google/protobuf/descriptor.proto\" "
-      "extension { name: \"option2\" number: 1000 label: LABEL_OPTIONAL "
-      "            type: TYPE_INT32 extendee: \"google.protobuf.FileOptions\" }",
-      "bar.proto: option2: NUMBER: Extension number 1000 has already been used "
-      "in \"google.protobuf.FileOptions\" by extension \"option1\" defined in "
-      "foo.proto.\n");
-}
-
-// Helper function for tests that check for aggregate value parsing
-// errors.  The "value" argument is embedded inside the
-// "uninterpreted_option" portion of the result.
-static std::string EmbedAggregateValue(const char* value) {
-  return strings::Substitute(
-      "name: \"foo.proto\" "
-      "dependency: \"google/protobuf/descriptor.proto\" "
-      "message_type { name: \"Foo\" } "
-      "extension { name: \"foo\" number: 7672757 label: LABEL_OPTIONAL "
-      "            type: TYPE_MESSAGE type_name: \"Foo\" "
-      "            extendee: \"google.protobuf.FileOptions\" }"
-      "options { uninterpreted_option { name { name_part: \"foo\" "
-      "                                        is_extension: true } "
-      "                                 $0 } }",
-      value);
-}
-
-TEST_F(ValidationErrorTest, AggregateValueNotFound) {
-  BuildDescriptorMessagesInTestPool();
-
-  BuildFileWithErrors(
-      EmbedAggregateValue("string_value: \"\""),
-      "foo.proto: foo.proto: OPTION_VALUE: Option \"foo\" is a message. "
-      "To set the entire message, use syntax like "
-      "\"foo = { <proto text format> }\". To set fields within it, use "
-      "syntax like \"foo.foo = value\".\n");
-}
-
-TEST_F(ValidationErrorTest, AggregateValueParseError) {
-  BuildDescriptorMessagesInTestPool();
-
-  BuildFileWithErrors(
-      EmbedAggregateValue("aggregate_value: \"1+2\""),
-      "foo.proto: foo.proto: OPTION_VALUE: Error while parsing option "
-      "value for \"foo\": Expected identifier, got: 1\n");
-}
-
-TEST_F(ValidationErrorTest, AggregateValueUnknownFields) {
-  BuildDescriptorMessagesInTestPool();
-
-  BuildFileWithErrors(
-      EmbedAggregateValue("aggregate_value: \"x:100\""),
-      "foo.proto: foo.proto: OPTION_VALUE: Error while parsing option "
-      "value for \"foo\": Message type \"Foo\" has no field named \"x\".\n");
-}
-
-TEST_F(ValidationErrorTest, NotLiteImportsLite) {
-  BuildFile(
-      "name: \"bar.proto\" "
-      "options { optimize_for: LITE_RUNTIME } ");
-
-  BuildFileWithErrors(
-      "name: \"foo.proto\" "
-      "dependency: \"bar.proto\" ",
-
-      "foo.proto: bar.proto: IMPORT: Files that do not use optimize_for = "
-      "LITE_RUNTIME cannot import files which do use this option.  This file "
-      "is not lite, but it imports \"bar.proto\" which is.\n");
-}
-
-TEST_F(ValidationErrorTest, LiteExtendsNotLite) {
-  BuildFile(
-      "name: \"bar.proto\" "
-      "message_type: {"
-      "  name: \"Bar\""
-      "  extension_range { start: 1 end: 1000 }"
-      "}");
-
-  BuildFileWithErrors(
-      "name: \"foo.proto\" "
-      "dependency: \"bar.proto\" "
-      "options { optimize_for: LITE_RUNTIME } "
-      "extension { name: \"ext\" number: 123 label: LABEL_OPTIONAL "
-      "            type: TYPE_INT32 extendee: \"Bar\" }",
-
-      "foo.proto: ext: EXTENDEE: Extensions to non-lite types can only be "
-      "declared in non-lite files.  Note that you cannot extend a non-lite "
-      "type to contain a lite type, but the reverse is allowed.\n");
-}
-
-TEST_F(ValidationErrorTest, NoLiteServices) {
-  BuildFileWithErrors(
-      "name: \"foo.proto\" "
-      "options {"
-      "  optimize_for: LITE_RUNTIME"
-      "  cc_generic_services: true"
-      "  java_generic_services: true"
-      "} "
-      "service { name: \"Foo\" }",
-
-      "foo.proto: Foo: NAME: Files with optimize_for = LITE_RUNTIME cannot "
-      "define services unless you set both options cc_generic_services and "
-      "java_generic_services to false.\n");
-
-  BuildFile(
-      "name: \"bar.proto\" "
-      "options {"
-      "  optimize_for: LITE_RUNTIME"
-      "  cc_generic_services: false"
-      "  java_generic_services: false"
-      "} "
-      "service { name: \"Bar\" }");
-}
-
-TEST_F(ValidationErrorTest, RollbackAfterError) {
-  // Build a file which contains every kind of construct but references an
-  // undefined type.  All these constructs will be added to the symbol table
-  // before the undefined type error is noticed.  The DescriptorPool will then
-  // have to roll everything back.
-  BuildFileWithErrors(
-      "name: \"foo.proto\" "
-      "message_type {"
-      "  name: \"TestMessage\""
-      "  field { name:\"foo\" label:LABEL_OPTIONAL type:TYPE_INT32 number:1 }"
-      "} "
-      "enum_type {"
-      "  name: \"TestEnum\""
-      "  value { name:\"BAR\" number:1 }"
-      "} "
-      "service {"
-      "  name: \"TestService\""
-      "  method {"
-      "    name: \"Baz\""
-      "    input_type: \"NoSuchType\""  // error
-      "    output_type: \"TestMessage\""
-      "  }"
-      "}",
-
-      "foo.proto: TestService.Baz: INPUT_TYPE: \"NoSuchType\" is not defined.\n"
-  );
-
-  // Make sure that if we build the same file again with the error fixed,
-  // it works.  If the above rollback was incomplete, then some symbols will
-  // be left defined, and this second attempt will fail since it tries to
-  // re-define the same symbols.
-  BuildFile(
-      "name: \"foo.proto\" "
-      "message_type {"
-      "  name: \"TestMessage\""
-      "  field { name:\"foo\" label:LABEL_OPTIONAL type:TYPE_INT32 number:1 }"
-      "} "
-      "enum_type {"
-      "  name: \"TestEnum\""
-      "  value { name:\"BAR\" number:1 }"
-      "} "
-      "service {"
-      "  name: \"TestService\""
-      "  method { name:\"Baz\""
-      "           input_type:\"TestMessage\""
-      "           output_type:\"TestMessage\" }"
-      "}");
-}
-
-TEST_F(ValidationErrorTest, ErrorsReportedToLogError) {
-  // Test that errors are reported to GOOGLE_LOG(ERROR) if no error collector is
-  // provided.
-
-  FileDescriptorProto file_proto;
-  ASSERT_TRUE(
-      TextFormat::ParseFromString("name: \"foo.proto\" "
-                                  "message_type { name: \"Foo\" } "
-                                  "message_type { name: \"Foo\" } ",
-                                  &file_proto));
-
-  std::vector<std::string> errors;
-
-  {
-    ScopedMemoryLog log;
-    EXPECT_TRUE(pool_.BuildFile(file_proto) == nullptr);
-    errors = log.GetMessages(ERROR);
-  }
-
-  ASSERT_EQ(2, errors.size());
-
-  EXPECT_EQ("Invalid proto descriptor for file \"foo.proto\":", errors[0]);
-  EXPECT_EQ("  Foo: \"Foo\" is already defined.", errors[1]);
-}
-
-TEST_F(ValidationErrorTest, DisallowEnumAlias) {
-  BuildFileWithErrors(
-      "name: \"foo.proto\" "
-      "enum_type {"
-      "  name: \"Bar\""
-      "  value { name:\"ENUM_A\" number:0 }"
-      "  value { name:\"ENUM_B\" number:0 }"
-      "}",
-      "foo.proto: Bar: NUMBER: "
-      "\"ENUM_B\" uses the same enum value as \"ENUM_A\". "
-      "If this is intended, set 'option allow_alias = true;' to the enum "
-      "definition.\n");
-}
-
-TEST_F(ValidationErrorTest, AllowEnumAlias) {
-  BuildFile(
-      "name: \"foo.proto\" "
-      "enum_type {"
-      "  name: \"Bar\""
-      "  value { name:\"ENUM_A\" number:0 }"
-      "  value { name:\"ENUM_B\" number:0 }"
-      "  options { allow_alias: true }"
-      "}");
-}
-
-TEST_F(ValidationErrorTest, UnusedImportWarning) {
-  pool_.AddUnusedImportTrackFile("bar.proto");
-  BuildFile(
-      "name: \"bar.proto\" "
-      "message_type { name: \"Bar\" }");
-
-  pool_.AddUnusedImportTrackFile("base.proto");
-  BuildFile(
-      "name: \"base.proto\" "
-      "message_type { name: \"Base\" }");
-
-  pool_.AddUnusedImportTrackFile("baz.proto");
-  BuildFile(
-      "name: \"baz.proto\" "
-      "message_type { name: \"Baz\" }");
-
-  pool_.AddUnusedImportTrackFile("public.proto");
-  BuildFile(
-      "name: \"public.proto\" "
-      "dependency: \"bar.proto\""
-      "public_dependency: 0");
-
-  // // forward.proto
-  // import "base.proto"       // No warning: Base message is used.
-  // import "bar.proto"        // Will log a warning.
-  // import public "baz.proto" // No warning: Do not track import public.
-  // import "public.proto"     // No warning: public.proto has import public.
-  // message Forward {
-  //   optional Base base = 1;
-  // }
-  //
-  pool_.AddUnusedImportTrackFile("forward.proto");
-  BuildFileWithWarnings(
-      "name: \"forward.proto\""
-      "dependency: \"base.proto\""
-      "dependency: \"bar.proto\""
-      "dependency: \"baz.proto\""
-      "dependency: \"public.proto\""
-      "public_dependency: 2 "
-      "message_type {"
-      "  name: \"Forward\""
-      "  field { name:\"base\" number:1 label:LABEL_OPTIONAL "
-      "type_name:\"Base\" }"
-      "}",
-      "forward.proto: bar.proto: IMPORT: Import bar.proto is unused.\n");
-}
-
-namespace {
-void FillValidMapEntry(FileDescriptorProto* file_proto) {
-  ASSERT_TRUE(TextFormat::ParseFromString(
-      "name: 'foo.proto' "
-      "message_type { "
-      "  name: 'Foo' "
-      "  field { "
-      "    name: 'foo_map' number: 1 label:LABEL_REPEATED "
-      "    type_name: 'FooMapEntry' "
-      "  } "
-      "  nested_type { "
-      "    name: 'FooMapEntry' "
-      "    options {  map_entry: true } "
-      "    field { "
-      "      name: 'key' number: 1 type:TYPE_INT32 label:LABEL_OPTIONAL "
-      "    } "
-      "    field { "
-      "      name: 'value' number: 2 type:TYPE_INT32 label:LABEL_OPTIONAL "
-      "    } "
-      "  } "
-      "} "
-      "message_type { "
-      "  name: 'Bar' "
-      "  extension_range { start: 1 end: 10 }"
-      "} ",
-      file_proto));
-}
-static const char* kMapEntryErrorMessage =
-    "foo.proto: Foo.foo_map: TYPE: map_entry should not be set explicitly. "
-    "Use map<KeyType, ValueType> instead.\n";
-static const char* kMapEntryKeyTypeErrorMessage =
-    "foo.proto: Foo.foo_map: TYPE: Key in map fields cannot be float/double, "
-    "bytes or message types.\n";
-
-}  // namespace
-
-TEST_F(ValidationErrorTest, MapEntryBase) {
-  FileDescriptorProto file_proto;
-  FillValidMapEntry(&file_proto);
-  BuildFile(file_proto.DebugString());
-}
-
-TEST_F(ValidationErrorTest, MapEntryExtensionRange) {
-  FileDescriptorProto file_proto;
-  FillValidMapEntry(&file_proto);
-  TextFormat::MergeFromString(
-      "extension_range { "
-      "  start: 10 end: 20 "
-      "} ",
-      file_proto.mutable_message_type(0)->mutable_nested_type(0));
-  BuildFileWithErrors(file_proto.DebugString(), kMapEntryErrorMessage);
-}
-
-TEST_F(ValidationErrorTest, MapEntryExtension) {
-  FileDescriptorProto file_proto;
-  FillValidMapEntry(&file_proto);
-  TextFormat::MergeFromString(
-      "extension { "
-      "  name: 'foo_ext' extendee: '.Bar' number: 5"
-      "} ",
-      file_proto.mutable_message_type(0)->mutable_nested_type(0));
-  BuildFileWithErrors(file_proto.DebugString(), kMapEntryErrorMessage);
-}
-
-TEST_F(ValidationErrorTest, MapEntryNestedType) {
-  FileDescriptorProto file_proto;
-  FillValidMapEntry(&file_proto);
-  TextFormat::MergeFromString(
-      "nested_type { "
-      "  name: 'Bar' "
-      "} ",
-      file_proto.mutable_message_type(0)->mutable_nested_type(0));
-  BuildFileWithErrors(file_proto.DebugString(), kMapEntryErrorMessage);
-}
-
-TEST_F(ValidationErrorTest, MapEntryEnumTypes) {
-  FileDescriptorProto file_proto;
-  FillValidMapEntry(&file_proto);
-  TextFormat::MergeFromString(
-      "enum_type { "
-      "  name: 'BarEnum' "
-      "  value { name: 'BAR_BAR' number:0 } "
-      "} ",
-      file_proto.mutable_message_type(0)->mutable_nested_type(0));
-  BuildFileWithErrors(file_proto.DebugString(), kMapEntryErrorMessage);
-}
-
-TEST_F(ValidationErrorTest, MapEntryExtraField) {
-  FileDescriptorProto file_proto;
-  FillValidMapEntry(&file_proto);
-  TextFormat::MergeFromString(
-      "field { "
-      "  name: 'other_field' "
-      "  label: LABEL_OPTIONAL "
-      "  type: TYPE_INT32 "
-      "  number: 3 "
-      "} ",
-      file_proto.mutable_message_type(0)->mutable_nested_type(0));
-  BuildFileWithErrors(file_proto.DebugString(), kMapEntryErrorMessage);
-}
-
-TEST_F(ValidationErrorTest, MapEntryMessageName) {
-  FileDescriptorProto file_proto;
-  FillValidMapEntry(&file_proto);
-  file_proto.mutable_message_type(0)->mutable_nested_type(0)->set_name(
-      "OtherMapEntry");
-  file_proto.mutable_message_type(0)->mutable_field(0)->set_type_name(
-      "OtherMapEntry");
-  BuildFileWithErrors(file_proto.DebugString(), kMapEntryErrorMessage);
-}
-
-TEST_F(ValidationErrorTest, MapEntryNoneRepeatedMapEntry) {
-  FileDescriptorProto file_proto;
-  FillValidMapEntry(&file_proto);
-  file_proto.mutable_message_type(0)->mutable_field(0)->set_label(
-      FieldDescriptorProto::LABEL_OPTIONAL);
-  BuildFileWithErrors(file_proto.DebugString(), kMapEntryErrorMessage);
-}
-
-TEST_F(ValidationErrorTest, MapEntryDifferentContainingType) {
-  FileDescriptorProto file_proto;
-  FillValidMapEntry(&file_proto);
-  // Move the nested MapEntry message into the top level, which should not pass
-  // the validation.
-  file_proto.mutable_message_type()->AddAllocated(
-      file_proto.mutable_message_type(0)->mutable_nested_type()->ReleaseLast());
-  BuildFileWithErrors(file_proto.DebugString(), kMapEntryErrorMessage);
-}
-
-TEST_F(ValidationErrorTest, MapEntryKeyName) {
-  FileDescriptorProto file_proto;
-  FillValidMapEntry(&file_proto);
-  FieldDescriptorProto* key =
-      file_proto.mutable_message_type(0)->mutable_nested_type(0)->mutable_field(
-          0);
-  key->set_name("Key");
-  BuildFileWithErrors(file_proto.DebugString(), kMapEntryErrorMessage);
-}
-
-TEST_F(ValidationErrorTest, MapEntryKeyLabel) {
-  FileDescriptorProto file_proto;
-  FillValidMapEntry(&file_proto);
-  FieldDescriptorProto* key =
-      file_proto.mutable_message_type(0)->mutable_nested_type(0)->mutable_field(
-          0);
-  key->set_label(FieldDescriptorProto::LABEL_REQUIRED);
-  BuildFileWithErrors(file_proto.DebugString(), kMapEntryErrorMessage);
-}
-
-TEST_F(ValidationErrorTest, MapEntryKeyNumber) {
-  FileDescriptorProto file_proto;
-  FillValidMapEntry(&file_proto);
-  FieldDescriptorProto* key =
-      file_proto.mutable_message_type(0)->mutable_nested_type(0)->mutable_field(
-          0);
-  key->set_number(3);
-  BuildFileWithErrors(file_proto.DebugString(), kMapEntryErrorMessage);
-}
-
-TEST_F(ValidationErrorTest, MapEntryValueName) {
-  FileDescriptorProto file_proto;
-  FillValidMapEntry(&file_proto);
-  FieldDescriptorProto* value =
-      file_proto.mutable_message_type(0)->mutable_nested_type(0)->mutable_field(
-          1);
-  value->set_name("Value");
-  BuildFileWithErrors(file_proto.DebugString(), kMapEntryErrorMessage);
-}
-
-TEST_F(ValidationErrorTest, MapEntryValueLabel) {
-  FileDescriptorProto file_proto;
-  FillValidMapEntry(&file_proto);
-  FieldDescriptorProto* value =
-      file_proto.mutable_message_type(0)->mutable_nested_type(0)->mutable_field(
-          1);
-  value->set_label(FieldDescriptorProto::LABEL_REQUIRED);
-  BuildFileWithErrors(file_proto.DebugString(), kMapEntryErrorMessage);
-}
-
-TEST_F(ValidationErrorTest, MapEntryValueNumber) {
-  FileDescriptorProto file_proto;
-  FillValidMapEntry(&file_proto);
-  FieldDescriptorProto* value =
-      file_proto.mutable_message_type(0)->mutable_nested_type(0)->mutable_field(
-          1);
-  value->set_number(3);
-  BuildFileWithErrors(file_proto.DebugString(), kMapEntryErrorMessage);
-}
-
-TEST_F(ValidationErrorTest, MapEntryKeyTypeFloat) {
-  FileDescriptorProto file_proto;
-  FillValidMapEntry(&file_proto);
-  FieldDescriptorProto* key =
-      file_proto.mutable_message_type(0)->mutable_nested_type(0)->mutable_field(
-          0);
-  key->set_type(FieldDescriptorProto::TYPE_FLOAT);
-  BuildFileWithErrors(file_proto.DebugString(), kMapEntryKeyTypeErrorMessage);
-}
-
-TEST_F(ValidationErrorTest, MapEntryKeyTypeDouble) {
-  FileDescriptorProto file_proto;
-  FillValidMapEntry(&file_proto);
-  FieldDescriptorProto* key =
-      file_proto.mutable_message_type(0)->mutable_nested_type(0)->mutable_field(
-          0);
-  key->set_type(FieldDescriptorProto::TYPE_DOUBLE);
-  BuildFileWithErrors(file_proto.DebugString(), kMapEntryKeyTypeErrorMessage);
-}
-
-TEST_F(ValidationErrorTest, MapEntryKeyTypeBytes) {
-  FileDescriptorProto file_proto;
-  FillValidMapEntry(&file_proto);
-  FieldDescriptorProto* key =
-      file_proto.mutable_message_type(0)->mutable_nested_type(0)->mutable_field(
-          0);
-  key->set_type(FieldDescriptorProto::TYPE_BYTES);
-  BuildFileWithErrors(file_proto.DebugString(), kMapEntryKeyTypeErrorMessage);
-}
-
-TEST_F(ValidationErrorTest, MapEntryKeyTypeEnum) {
-  FileDescriptorProto file_proto;
-  FillValidMapEntry(&file_proto);
-  FieldDescriptorProto* key =
-      file_proto.mutable_message_type(0)->mutable_nested_type(0)->mutable_field(
-          0);
-  key->clear_type();
-  key->set_type_name("BarEnum");
-  EnumDescriptorProto* enum_proto = file_proto.add_enum_type();
-  enum_proto->set_name("BarEnum");
-  EnumValueDescriptorProto* enum_value_proto = enum_proto->add_value();
-  enum_value_proto->set_name("BAR_VALUE0");
-  enum_value_proto->set_number(0);
-  BuildFileWithErrors(file_proto.DebugString(),
-                      "foo.proto: Foo.foo_map: TYPE: Key in map fields cannot "
-                      "be enum types.\n");
-  // Enum keys are not allowed in proto3 as well.
-  // Get rid of extensions for proto3 to make it proto3 compatible.
-  file_proto.mutable_message_type()->RemoveLast();
-  file_proto.set_syntax("proto3");
-  BuildFileWithErrors(file_proto.DebugString(),
-                      "foo.proto: Foo.foo_map: TYPE: Key in map fields cannot "
-                      "be enum types.\n");
-}
-
-TEST_F(ValidationErrorTest, MapEntryKeyTypeMessage) {
-  FileDescriptorProto file_proto;
-  FillValidMapEntry(&file_proto);
-  FieldDescriptorProto* key =
-      file_proto.mutable_message_type(0)->mutable_nested_type(0)->mutable_field(
-          0);
-  key->clear_type();
-  key->set_type_name(".Bar");
-  BuildFileWithErrors(file_proto.DebugString(), kMapEntryKeyTypeErrorMessage);
-}
-
-TEST_F(ValidationErrorTest, MapEntryConflictsWithField) {
-  FileDescriptorProto file_proto;
-  FillValidMapEntry(&file_proto);
-  TextFormat::MergeFromString(
-      "field { "
-      "  name: 'FooMapEntry' "
-      "  type: TYPE_INT32 "
-      "  label: LABEL_OPTIONAL "
-      "  number: 100 "
-      "}",
-      file_proto.mutable_message_type(0));
-  BuildFileWithErrors(
-      file_proto.DebugString(),
-      "foo.proto: Foo.FooMapEntry: NAME: \"FooMapEntry\" is already defined in "
-      "\"Foo\".\n"
-      "foo.proto: Foo.foo_map: TYPE: \"FooMapEntry\" is not defined.\n"
-      "foo.proto: Foo: NAME: Expanded map entry type FooMapEntry conflicts "
-      "with an existing field.\n");
-}
-
-TEST_F(ValidationErrorTest, MapEntryConflictsWithMessage) {
-  FileDescriptorProto file_proto;
-  FillValidMapEntry(&file_proto);
-  TextFormat::MergeFromString(
-      "nested_type { "
-      "  name: 'FooMapEntry' "
-      "}",
-      file_proto.mutable_message_type(0));
-  BuildFileWithErrors(
-      file_proto.DebugString(),
-      "foo.proto: Foo.FooMapEntry: NAME: \"FooMapEntry\" is already defined in "
-      "\"Foo\".\n"
-      "foo.proto: Foo: NAME: Expanded map entry type FooMapEntry conflicts "
-      "with an existing nested message type.\n");
-}
-
-TEST_F(ValidationErrorTest, MapEntryConflictsWithEnum) {
-  FileDescriptorProto file_proto;
-  FillValidMapEntry(&file_proto);
-  TextFormat::MergeFromString(
-      "enum_type { "
-      "  name: 'FooMapEntry' "
-      "  value { name: 'ENTRY_FOO' number: 0 }"
-      "}",
-      file_proto.mutable_message_type(0));
-  BuildFileWithErrors(
-      file_proto.DebugString(),
-      "foo.proto: Foo.FooMapEntry: NAME: \"FooMapEntry\" is already defined in "
-      "\"Foo\".\n"
-      "foo.proto: Foo: NAME: Expanded map entry type FooMapEntry conflicts "
-      "with an existing enum type.\n");
-}
-
-TEST_F(ValidationErrorTest, EnumValuesConflictWithDifferentCasing) {
-  BuildFileWithErrors(
-      "syntax: 'proto3'"
-      "name: 'foo.proto' "
-      "enum_type {"
-      "  name: 'FooEnum' "
-      "  value { name: 'BAR' number: 0 }"
-      "  value { name: 'bar' number: 1 }"
-      "}",
-      "foo.proto: bar: NAME: Enum name bar has the same name as BAR "
-      "if you ignore case and strip out the enum name prefix (if any). "
-      "This is error-prone and can lead to undefined behavior. "
-      "Please avoid doing this. If you are using allow_alias, please assign "
-      "the same numeric value to both enums.\n");
-
-  // Not an error because both enums are mapped to the same value.
-  BuildFile(
-      "syntax: 'proto3'"
-      "name: 'foo.proto' "
-      "enum_type {"
-      "  name: 'FooEnum' "
-      "  options { allow_alias: true }"
-      "  value { name: 'UNKNOWN' number: 0 }"
-      "  value { name: 'BAR' number: 1 }"
-      "  value { name: 'bar' number: 1 }"
-      "}");
-}
-
-TEST_F(ValidationErrorTest, EnumValuesConflictWhenPrefixesStripped) {
-  BuildFileWithErrors(
-      "syntax: 'proto3'"
-      "name: 'foo.proto' "
-      "enum_type {"
-      "  name: 'FooEnum' "
-      "  value { name: 'FOO_ENUM_BAZ' number: 0 }"
-      "  value { name: 'BAZ' number: 1 }"
-      "}",
-      "foo.proto: BAZ: NAME: Enum name BAZ has the same name as FOO_ENUM_BAZ "
-      "if you ignore case and strip out the enum name prefix (if any). "
-      "This is error-prone and can lead to undefined behavior. "
-      "Please avoid doing this. If you are using allow_alias, please assign "
-      "the same numeric value to both enums.\n");
-
-  BuildFileWithErrors(
-      "syntax: 'proto3'"
-      "name: 'foo.proto' "
-      "enum_type {"
-      "  name: 'FooEnum' "
-      "  value { name: 'FOOENUM_BAZ' number: 0 }"
-      "  value { name: 'BAZ' number: 1 }"
-      "}",
-      "foo.proto: BAZ: NAME: Enum name BAZ has the same name as FOOENUM_BAZ "
-      "if you ignore case and strip out the enum name prefix (if any). "
-      "This is error-prone and can lead to undefined behavior. "
-      "Please avoid doing this. If you are using allow_alias, please assign "
-      "the same numeric value to both enums.\n");
-
-  BuildFileWithErrors(
-      "syntax: 'proto3'"
-      "name: 'foo.proto' "
-      "enum_type {"
-      "  name: 'FooEnum' "
-      "  value { name: 'FOO_ENUM_BAR_BAZ' number: 0 }"
-      "  value { name: 'BAR__BAZ' number: 1 }"
-      "}",
-      "foo.proto: BAR__BAZ: NAME: Enum name BAR__BAZ has the same name as "
-      "FOO_ENUM_BAR_BAZ if you ignore case and strip out the enum name prefix "
-      "(if any). This is error-prone and can lead to undefined behavior. "
-      "Please avoid doing this. If you are using allow_alias, please assign "
-      "the same numeric value to both enums.\n");
-
-  BuildFileWithErrors(
-      "syntax: 'proto3'"
-      "name: 'foo.proto' "
-      "enum_type {"
-      "  name: 'FooEnum' "
-      "  value { name: 'FOO_ENUM__BAR_BAZ' number: 0 }"
-      "  value { name: 'BAR_BAZ' number: 1 }"
-      "}",
-      "foo.proto: BAR_BAZ: NAME: Enum name BAR_BAZ has the same name as "
-      "FOO_ENUM__BAR_BAZ if you ignore case and strip out the enum name prefix "
-      "(if any). This is error-prone and can lead to undefined behavior. "
-      "Please avoid doing this. If you are using allow_alias, please assign "
-      "the same numeric value to both enums.\n");
-
-  // This isn't an error because the underscore will cause the PascalCase to
-  // differ by case (BarBaz vs. Barbaz).
-  BuildFile(
-      "syntax: 'proto3'"
-      "name: 'foo.proto' "
-      "enum_type {"
-      "  name: 'FooEnum' "
-      "  value { name: 'BAR_BAZ' number: 0 }"
-      "  value { name: 'BARBAZ' number: 1 }"
-      "}");
-}
-
-TEST_F(ValidationErrorTest, MapEntryConflictsWithOneof) {
-  FileDescriptorProto file_proto;
-  FillValidMapEntry(&file_proto);
-  TextFormat::MergeFromString(
-      "oneof_decl { "
-      "  name: 'FooMapEntry' "
-      "}"
-      "field { "
-      "  name: 'int_field' "
-      "  type: TYPE_INT32 "
-      "  label: LABEL_OPTIONAL "
-      "  oneof_index: 0 "
-      "  number: 100 "
-      "} ",
-      file_proto.mutable_message_type(0));
-  BuildFileWithErrors(
-      file_proto.DebugString(),
-      "foo.proto: Foo.FooMapEntry: NAME: \"FooMapEntry\" is already defined in "
-      "\"Foo\".\n"
-      "foo.proto: Foo.foo_map: TYPE: \"FooMapEntry\" is not defined.\n"
-      "foo.proto: Foo: NAME: Expanded map entry type FooMapEntry conflicts "
-      "with an existing oneof type.\n");
-}
-
-TEST_F(ValidationErrorTest, MapEntryUsesNoneZeroEnumDefaultValue) {
-  BuildFileWithErrors(
-      "name: \"foo.proto\" "
-      "enum_type {"
-      "  name: \"Bar\""
-      "  value { name:\"ENUM_A\" number:1 }"
-      "  value { name:\"ENUM_B\" number:2 }"
-      "}"
-      "message_type {"
-      "  name: 'Foo' "
-      "  field { "
-      "    name: 'foo_map' number: 1 label:LABEL_REPEATED "
-      "    type_name: 'FooMapEntry' "
-      "  } "
-      "  nested_type { "
-      "    name: 'FooMapEntry' "
-      "    options {  map_entry: true } "
-      "    field { "
-      "      name: 'key' number: 1 type:TYPE_INT32 label:LABEL_OPTIONAL "
-      "    } "
-      "    field { "
-      "      name: 'value' number: 2 type_name:\"Bar\" label:LABEL_OPTIONAL "
-      "    } "
-      "  } "
-      "}",
-      "foo.proto: Foo.foo_map: "
-      "TYPE: Enum value in map must define 0 as the first value.\n");
-}
-
-TEST_F(ValidationErrorTest, Proto3RequiredFields) {
-  BuildFileWithErrors(
-      "name: 'foo.proto' "
-      "syntax: 'proto3' "
-      "message_type { "
-      "  name: 'Foo' "
-      "  field { name:'foo' number:1 label:LABEL_REQUIRED type:TYPE_INT32 } "
-      "}",
-      "foo.proto: Foo.foo: TYPE: Required fields are not allowed in "
-      "proto3.\n");
-
-  // applied to nested types as well.
-  BuildFileWithErrors(
-      "name: 'foo.proto' "
-      "syntax: 'proto3' "
-      "message_type { "
-      "  name: 'Foo' "
-      "  nested_type { "
-      "    name : 'Bar' "
-      "    field { name:'bar' number:1 label:LABEL_REQUIRED type:TYPE_INT32 } "
-      "  } "
-      "}",
-      "foo.proto: Foo.Bar.bar: TYPE: Required fields are not allowed in "
-      "proto3.\n");
-
-  // optional and repeated fields are OK.
-  BuildFile(
-      "name: 'foo.proto' "
-      "syntax: 'proto3' "
-      "message_type { "
-      "  name: 'Foo' "
-      "  field { name:'foo' number:1 label:LABEL_OPTIONAL type:TYPE_INT32 } "
-      "  field { name:'bar' number:2 label:LABEL_REPEATED type:TYPE_INT32 } "
-      "}");
-}
-
-TEST_F(ValidationErrorTest, ValidateProto3DefaultValue) {
-  BuildFileWithErrors(
-      "name: 'foo.proto' "
-      "syntax: 'proto3' "
-      "message_type { "
-      "  name: 'Foo' "
-      "  field { name:'foo' number:1 label:LABEL_OPTIONAL type:TYPE_INT32 "
-      "          default_value: '1' }"
-      "}",
-      "foo.proto: Foo.foo: DEFAULT_VALUE: Explicit default values are not "
-      "allowed in proto3.\n");
-
-  BuildFileWithErrors(
-      "name: 'foo.proto' "
-      "syntax: 'proto3' "
-      "message_type { "
-      "  name: 'Foo' "
-      "  nested_type { "
-      "    name : 'Bar' "
-      "    field { name:'bar' number:1 label:LABEL_OPTIONAL type:TYPE_INT32 "
-      "            default_value: '1' }"
-      "  } "
-      "}",
-      "foo.proto: Foo.Bar.bar: DEFAULT_VALUE: Explicit default values are not "
-      "allowed in proto3.\n");
-}
-
-TEST_F(ValidationErrorTest, ValidateProto3ExtensionRange) {
-  BuildFileWithErrors(
-      "name: 'foo.proto' "
-      "syntax: 'proto3' "
-      "message_type { "
-      "  name: 'Foo' "
-      "  field { name:'foo' number:1 label:LABEL_OPTIONAL type:TYPE_INT32 } "
-      "  extension_range { start:10 end:100 } "
-      "}",
-      "foo.proto: Foo: NUMBER: Extension ranges are not allowed in "
-      "proto3.\n");
-
-  BuildFileWithErrors(
-      "name: 'foo.proto' "
-      "syntax: 'proto3' "
-      "message_type { "
-      "  name: 'Foo' "
-      "  nested_type { "
-      "    name : 'Bar' "
-      "    field { name:'bar' number:1 label:LABEL_OPTIONAL type:TYPE_INT32 } "
-      "    extension_range { start:10 end:100 } "
-      "  } "
-      "}",
-      "foo.proto: Foo.Bar: NUMBER: Extension ranges are not allowed in "
-      "proto3.\n");
-}
-
-TEST_F(ValidationErrorTest, ValidateProto3MessageSetWireFormat) {
-  BuildFileWithErrors(
-      "name: 'foo.proto' "
-      "syntax: 'proto3' "
-      "message_type { "
-      "  name: 'Foo' "
-      "  options { message_set_wire_format: true } "
-      "}",
-      "foo.proto: Foo: NAME: MessageSet is not supported "
-      "in proto3.\n");
-}
-
-TEST_F(ValidationErrorTest, ValidateProto3Enum) {
-  BuildFileWithErrors(
-      "name: 'foo.proto' "
-      "syntax: 'proto3' "
-      "enum_type { "
-      "  name: 'FooEnum' "
-      "  value { name: 'FOO_FOO' number:1 } "
-      "}",
-      "foo.proto: FooEnum: NUMBER: The first enum value must be "
-      "zero in proto3.\n");
-
-  BuildFileWithErrors(
-      "name: 'foo.proto' "
-      "syntax: 'proto3' "
-      "message_type { "
-      "  name: 'Foo' "
-      "  enum_type { "
-      "    name: 'FooEnum' "
-      "    value { name: 'FOO_FOO' number:1 } "
-      "  } "
-      "}",
-      "foo.proto: Foo.FooEnum: NUMBER: The first enum value must be "
-      "zero in proto3.\n");
-
-  // valid case.
-  BuildFile(
-      "name: 'foo.proto' "
-      "syntax: 'proto3' "
-      "enum_type { "
-      "  name: 'FooEnum' "
-      "  value { name: 'FOO_FOO' number:0 } "
-      "}");
-}
-
-TEST_F(ValidationErrorTest, ValidateProto3Group) {
-  BuildFileWithErrors(
-      "name: 'foo.proto' "
-      "syntax: 'proto3' "
-      "message_type { "
-      "  name: 'Foo' "
-      "  nested_type { "
-      "    name: 'FooGroup' "
-      "  } "
-      "  field { name:'foo_group' number: 1 label:LABEL_OPTIONAL "
-      "          type: TYPE_GROUP type_name:'FooGroup' } "
-      "}",
-      "foo.proto: Foo.foo_group: TYPE: Groups are not supported in proto3 "
-      "syntax.\n");
-}
-
-
-TEST_F(ValidationErrorTest, ValidateProto3EnumFromProto2) {
-  // Define an enum in a proto2 file.
-  BuildFile(
-      "name: 'foo.proto' "
-      "package: 'foo' "
-      "syntax: 'proto2' "
-      "enum_type { "
-      "  name: 'FooEnum' "
-      "  value { name: 'DEFAULT_OPTION' number:0 } "
-      "}");
-
-  // Now try to refer to it. (All tests in the fixture use the same pool, so we
-  // can refer to the enum above in this definition.)
-  BuildFileWithErrors(
-      "name: 'bar.proto' "
-      "dependency: 'foo.proto' "
-      "syntax: 'proto3' "
-      "message_type { "
-      "  name: 'Foo' "
-      "    field { name:'bar' number:1 label:LABEL_OPTIONAL type:TYPE_ENUM "
-      "            type_name: 'foo.FooEnum' }"
-      "}",
-      "bar.proto: Foo.bar: TYPE: Enum type \"foo.FooEnum\" is not a proto3 "
-      "enum, but is used in \"Foo\" which is a proto3 message type.\n");
-}
-
-TEST_F(ValidationErrorTest, ValidateProto3Extension) {
-  // Valid for options.
-  DescriptorPool pool;
-  FileDescriptorProto file_proto;
-  // Add "google/protobuf/descriptor.proto".
-  FileDescriptorProto::descriptor()->file()->CopyTo(&file_proto);
-  ASSERT_TRUE(pool.BuildFile(file_proto) != nullptr);
-  // Add "foo.proto":
-  //   import "google/protobuf/descriptor.proto";
-  //   extend google.protobuf.FileOptions {
-  //     optional string test_file_opt = 1001;
-  //   }
-  //   extend google.protobuf.MessageOptions {
-  //     optional string test_msg_opt = 1002;
-  //   }
-  //   extend google.protobuf.FieldOptions {
-  //     optional string test_field_opt = 1003;
-  //   }
-  //   extend google.protobuf.EnumOptions {
-  //     repeated int32 test_enum_opt = 1004;
-  //   }
-  //   extend google.protobuf.EnumValueOptions {
-  //     optional int32 test_enumval_opt = 1005;
-  //   }
-  //   extend google.protobuf.ServiceOptions {
-  //     repeated int32 test_svc_opt = 1006;
-  //   }
-  //   extend google.protobuf.MethodOptions {
-  //     optional string test_method_opt = 1007;
-  //   }
-  //   extend google.protobuf.OneofOptions {
-  //     optional string test_oneof_opt = 1008;
-  //   }
-  //   extend google.protobuf.ExtensionRangeOptions {
-  //     optional string test_ext_opt = 1009;
-  //   }
-  file_proto.Clear();
-  file_proto.set_name("foo.proto");
-  file_proto.set_syntax("proto3");
-  file_proto.add_dependency("google/protobuf/descriptor.proto");
-  AddExtension(&file_proto, "google.protobuf.FileOptions", "test_file_opt", 1001,
-               FieldDescriptorProto::LABEL_OPTIONAL,
-               FieldDescriptorProto::TYPE_STRING);
-  AddExtension(&file_proto, "google.protobuf.MessageOptions", "test_msg_opt", 1001,
-               FieldDescriptorProto::LABEL_OPTIONAL,
-               FieldDescriptorProto::TYPE_STRING);
-  AddExtension(&file_proto, "google.protobuf.FieldOptions", "test_field_opt", 1003,
-               FieldDescriptorProto::LABEL_OPTIONAL,
-               FieldDescriptorProto::TYPE_STRING);
-  AddExtension(&file_proto, "google.protobuf.EnumOptions", "test_enum_opt", 1004,
-               FieldDescriptorProto::LABEL_REPEATED,
-               FieldDescriptorProto::TYPE_INT32);
-  AddExtension(&file_proto, "google.protobuf.EnumValueOptions", "test_enumval_opt", 1005,
-               FieldDescriptorProto::LABEL_OPTIONAL,
-               FieldDescriptorProto::TYPE_INT32);
-  AddExtension(&file_proto, "google.protobuf.ServiceOptions", "test_svc_opt", 1006,
-               FieldDescriptorProto::LABEL_REPEATED,
-               FieldDescriptorProto::TYPE_INT32);
-  AddExtension(&file_proto, "google.protobuf.MethodOptions", "test_method_opt", 1007,
-               FieldDescriptorProto::LABEL_OPTIONAL,
-               FieldDescriptorProto::TYPE_STRING);
-  AddExtension(&file_proto, "google.protobuf.OneofOptions", "test_oneof_opt", 1008,
-               FieldDescriptorProto::LABEL_OPTIONAL,
-               FieldDescriptorProto::TYPE_STRING);
-  AddExtension(&file_proto, "google.protobuf.ExtensionRangeOptions", "test_ext_opt",
-               1009, FieldDescriptorProto::LABEL_OPTIONAL,
-               FieldDescriptorProto::TYPE_STRING);
-  ASSERT_TRUE(pool.BuildFile(file_proto) != nullptr);
-
-  // Copy and change the package of the descriptor.proto
-  BuildFile(
-      "name: 'google.protobuf.proto' "
-      "syntax: 'proto2' "
-      "message_type { "
-      "  name: 'Container' extension_range { start: 1 end: 1000 } "
-      "}");
-  BuildFileWithErrors(
-      "name: 'bar.proto' "
-      "syntax: 'proto3' "
-      "dependency: 'google.protobuf.proto' "
-      "extension { "
-      "  name: 'bar' number: 1 label: LABEL_OPTIONAL type: TYPE_INT32 "
-      "  extendee: 'Container' "
-      "}",
-      "bar.proto: bar: EXTENDEE: Extensions in proto3 are only allowed for "
-      "defining options.\n");
-}
-
-// Test that field names that may conflict in JSON is not allowed by protoc.
-TEST_F(ValidationErrorTest, ValidateProto3JsonName) {
-  // The comparison is case-insensitive.
-  BuildFileWithErrors(
-      "name: 'foo.proto' "
-      "syntax: 'proto3' "
-      "message_type {"
-      "  name: 'Foo'"
-      "  field { name:'name' number:1 label:LABEL_OPTIONAL type:TYPE_INT32 }"
-      "  field { name:'Name' number:2 label:LABEL_OPTIONAL type:TYPE_INT32 }"
-      "}",
-      "foo.proto: Foo: NAME: The JSON camel-case name of field \"Name\" "
-      "conflicts with field \"name\". This is not allowed in proto3.\n");
-  // Underscores are ignored.
-  BuildFileWithErrors(
-      "name: 'foo.proto' "
-      "syntax: 'proto3' "
-      "message_type {"
-      "  name: 'Foo'"
-      "  field { name:'ab' number:1 label:LABEL_OPTIONAL type:TYPE_INT32 }"
-      "  field { name:'_a__b_' number:2 label:LABEL_OPTIONAL type:TYPE_INT32 }"
-      "}",
-      "foo.proto: Foo: NAME: The JSON camel-case name of field \"_a__b_\" "
-      "conflicts with field \"ab\". This is not allowed in proto3.\n");
-}
-
-
-TEST_F(ValidationErrorTest, UnusedImportWithOtherError) {
-  BuildFile(
-      "name: 'bar.proto' "
-      "message_type {"
-      "  name: 'Bar'"
-      "}");
-
-  pool_.AddUnusedImportTrackFile("foo.proto", true);
-  BuildFileWithErrors(
-      "name: 'foo.proto' "
-      "dependency: 'bar.proto' "
-      "message_type {"
-      "  name: 'Foo'"
-      "  extension { name:'foo' number:1 label:LABEL_OPTIONAL type:TYPE_INT32"
-      "              extendee: 'Baz' }"
-      "}",
-
-      // Should not also contain unused import error.
-      "foo.proto: Foo.foo: EXTENDEE: \"Baz\" is not defined.\n");
-}
-
-
-TEST_F(ValidationErrorTest, PackageTooLong) {
-  BuildFileWithErrors(
-      "name: \"foo.proto\" "
-      "syntax: \"proto3\" "
-      "package: "
-      "\"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
-      "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
-      "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
-      "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
-      "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
-      "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
-      "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
-      "aaaaaaaaaa\"",
-      "foo.proto: "
-      "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
-      "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
-      "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
-      "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
-      "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
-      "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
-      "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
-      "aaaaaaaa: NAME: Package name is too long\n");
-}
-
-// ===================================================================
-// DescriptorDatabase
-
-static void AddToDatabase(SimpleDescriptorDatabase* database,
-                          const char* file_text) {
-  FileDescriptorProto file_proto;
-  EXPECT_TRUE(TextFormat::ParseFromString(file_text, &file_proto));
-  database->Add(file_proto);
-}
-
-class DatabaseBackedPoolTest : public testing::Test {
- protected:
-  DatabaseBackedPoolTest() {}
-
-  SimpleDescriptorDatabase database_;
-
-  void SetUp() override {
-    AddToDatabase(
-        &database_,
-        "name: 'foo.proto' "
-        "message_type { name:'Foo' extension_range { start: 1 end: 100 } } "
-        "enum_type { name:'TestEnum' value { name:'DUMMY' number:0 } } "
-        "service { name:'TestService' } ");
-    AddToDatabase(&database_,
-                  "name: 'bar.proto' "
-                  "dependency: 'foo.proto' "
-                  "message_type { name:'Bar' } "
-                  "extension { name:'foo_ext' extendee: '.Foo' number:5 "
-                  "            label:LABEL_OPTIONAL type:TYPE_INT32 } ");
-    // Baz has an undeclared dependency on Foo.
-    AddToDatabase(
-        &database_,
-        "name: 'baz.proto' "
-        "message_type { "
-        "  name:'Baz' "
-        "  field { name:'foo' number:1 label:LABEL_OPTIONAL type_name:'Foo' } "
-        "}");
-  }
-
-  // We can't inject a file containing errors into a DescriptorPool, so we
-  // need an actual mock DescriptorDatabase to test errors.
-  class ErrorDescriptorDatabase : public DescriptorDatabase {
-   public:
-    ErrorDescriptorDatabase() {}
-    ~ErrorDescriptorDatabase() override {}
-
-    // implements DescriptorDatabase ---------------------------------
-    bool FindFileByName(const std::string& filename,
-                        FileDescriptorProto* output) override {
-      // error.proto and error2.proto cyclically import each other.
-      if (filename == "error.proto") {
-        output->Clear();
-        output->set_name("error.proto");
-        output->add_dependency("error2.proto");
-        return true;
-      } else if (filename == "error2.proto") {
-        output->Clear();
-        output->set_name("error2.proto");
-        output->add_dependency("error.proto");
-        return true;
-      } else {
-        return false;
-      }
-    }
-    bool FindFileContainingSymbol(const std::string& symbol_name,
-                                  FileDescriptorProto* output) override {
-      return false;
-    }
-    bool FindFileContainingExtension(const std::string& containing_type,
-                                     int field_number,
-                                     FileDescriptorProto* output) override {
-      return false;
-    }
-  };
-
-  // A DescriptorDatabase that counts how many times each method has been
-  // called and forwards to some other DescriptorDatabase.
-  class CallCountingDatabase : public DescriptorDatabase {
-   public:
-    CallCountingDatabase(DescriptorDatabase* wrapped_db)
-        : wrapped_db_(wrapped_db) {
-      Clear();
-    }
-    ~CallCountingDatabase() override {}
-
-    DescriptorDatabase* wrapped_db_;
-
-    int call_count_;
-
-    void Clear() { call_count_ = 0; }
-
-    // implements DescriptorDatabase ---------------------------------
-    bool FindFileByName(const std::string& filename,
-                        FileDescriptorProto* output) override {
-      ++call_count_;
-      return wrapped_db_->FindFileByName(filename, output);
-    }
-    bool FindFileContainingSymbol(const std::string& symbol_name,
-                                  FileDescriptorProto* output) override {
-      ++call_count_;
-      return wrapped_db_->FindFileContainingSymbol(symbol_name, output);
-    }
-    bool FindFileContainingExtension(const std::string& containing_type,
-                                     int field_number,
-                                     FileDescriptorProto* output) override {
-      ++call_count_;
-      return wrapped_db_->FindFileContainingExtension(containing_type,
-                                                      field_number, output);
-    }
-  };
-
-  // A DescriptorDatabase which falsely always returns foo.proto when searching
-  // for any symbol or extension number.  This shouldn't cause the
-  // DescriptorPool to reload foo.proto if it is already loaded.
-  class FalsePositiveDatabase : public DescriptorDatabase {
-   public:
-    FalsePositiveDatabase(DescriptorDatabase* wrapped_db)
-        : wrapped_db_(wrapped_db) {}
-    ~FalsePositiveDatabase() override {}
-
-    DescriptorDatabase* wrapped_db_;
-
-    // implements DescriptorDatabase ---------------------------------
-    bool FindFileByName(const std::string& filename,
-                        FileDescriptorProto* output) override {
-      return wrapped_db_->FindFileByName(filename, output);
-    }
-    bool FindFileContainingSymbol(const std::string& symbol_name,
-                                  FileDescriptorProto* output) override {
-      return FindFileByName("foo.proto", output);
-    }
-    bool FindFileContainingExtension(const std::string& containing_type,
-                                     int field_number,
-                                     FileDescriptorProto* output) override {
-      return FindFileByName("foo.proto", output);
-    }
-  };
-};
-
-TEST_F(DatabaseBackedPoolTest, FindFileByName) {
-  DescriptorPool pool(&database_);
-
-  const FileDescriptor* foo = pool.FindFileByName("foo.proto");
-  ASSERT_TRUE(foo != nullptr);
-  EXPECT_EQ("foo.proto", foo->name());
-  ASSERT_EQ(1, foo->message_type_count());
-  EXPECT_EQ("Foo", foo->message_type(0)->name());
-
-  EXPECT_EQ(foo, pool.FindFileByName("foo.proto"));
-
-  EXPECT_TRUE(pool.FindFileByName("no_such_file.proto") == nullptr);
-}
-
-TEST_F(DatabaseBackedPoolTest, FindDependencyBeforeDependent) {
-  DescriptorPool pool(&database_);
-
-  const FileDescriptor* foo = pool.FindFileByName("foo.proto");
-  ASSERT_TRUE(foo != nullptr);
-  EXPECT_EQ("foo.proto", foo->name());
-  ASSERT_EQ(1, foo->message_type_count());
-  EXPECT_EQ("Foo", foo->message_type(0)->name());
-
-  const FileDescriptor* bar = pool.FindFileByName("bar.proto");
-  ASSERT_TRUE(bar != nullptr);
-  EXPECT_EQ("bar.proto", bar->name());
-  ASSERT_EQ(1, bar->message_type_count());
-  EXPECT_EQ("Bar", bar->message_type(0)->name());
-
-  ASSERT_EQ(1, bar->dependency_count());
-  EXPECT_EQ(foo, bar->dependency(0));
-}
-
-TEST_F(DatabaseBackedPoolTest, FindDependentBeforeDependency) {
-  DescriptorPool pool(&database_);
-
-  const FileDescriptor* bar = pool.FindFileByName("bar.proto");
-  ASSERT_TRUE(bar != nullptr);
-  EXPECT_EQ("bar.proto", bar->name());
-  ASSERT_EQ(1, bar->message_type_count());
-  ASSERT_EQ("Bar", bar->message_type(0)->name());
-
-  const FileDescriptor* foo = pool.FindFileByName("foo.proto");
-  ASSERT_TRUE(foo != nullptr);
-  EXPECT_EQ("foo.proto", foo->name());
-  ASSERT_EQ(1, foo->message_type_count());
-  ASSERT_EQ("Foo", foo->message_type(0)->name());
-
-  ASSERT_EQ(1, bar->dependency_count());
-  EXPECT_EQ(foo, bar->dependency(0));
-}
-
-TEST_F(DatabaseBackedPoolTest, FindFileContainingSymbol) {
-  DescriptorPool pool(&database_);
-
-  const FileDescriptor* file = pool.FindFileContainingSymbol("Foo");
-  ASSERT_TRUE(file != nullptr);
-  EXPECT_EQ("foo.proto", file->name());
-  EXPECT_EQ(file, pool.FindFileByName("foo.proto"));
-
-  EXPECT_TRUE(pool.FindFileContainingSymbol("NoSuchSymbol") == nullptr);
-}
-
-TEST_F(DatabaseBackedPoolTest, FindMessageTypeByName) {
-  DescriptorPool pool(&database_);
-
-  const Descriptor* type = pool.FindMessageTypeByName("Foo");
-  ASSERT_TRUE(type != nullptr);
-  EXPECT_EQ("Foo", type->name());
-  EXPECT_EQ(type->file(), pool.FindFileByName("foo.proto"));
-
-  EXPECT_TRUE(pool.FindMessageTypeByName("NoSuchType") == nullptr);
-}
-
-TEST_F(DatabaseBackedPoolTest, FindExtensionByNumber) {
-  DescriptorPool pool(&database_);
-
-  const Descriptor* foo = pool.FindMessageTypeByName("Foo");
-  ASSERT_TRUE(foo != nullptr);
-
-  const FieldDescriptor* extension = pool.FindExtensionByNumber(foo, 5);
-  ASSERT_TRUE(extension != nullptr);
-  EXPECT_EQ("foo_ext", extension->name());
-  EXPECT_EQ(extension->file(), pool.FindFileByName("bar.proto"));
-
-  EXPECT_TRUE(pool.FindExtensionByNumber(foo, 12) == nullptr);
-}
-
-TEST_F(DatabaseBackedPoolTest, FindAllExtensions) {
-  DescriptorPool pool(&database_);
-
-  const Descriptor* foo = pool.FindMessageTypeByName("Foo");
-
-  for (int i = 0; i < 2; ++i) {
-    // Repeat the lookup twice, to check that we get consistent
-    // results despite the fallback database lookup mutating the pool.
-    std::vector<const FieldDescriptor*> extensions;
-    pool.FindAllExtensions(foo, &extensions);
-    ASSERT_EQ(1, extensions.size());
-    EXPECT_EQ(5, extensions[0]->number());
-  }
-}
-
-TEST_F(DatabaseBackedPoolTest, ErrorWithoutErrorCollector) {
-  ErrorDescriptorDatabase error_database;
-  DescriptorPool pool(&error_database);
-
-  std::vector<std::string> errors;
-
-  {
-    ScopedMemoryLog log;
-    EXPECT_TRUE(pool.FindFileByName("error.proto") == nullptr);
-    errors = log.GetMessages(ERROR);
-  }
-
-  EXPECT_FALSE(errors.empty());
-}
-
-TEST_F(DatabaseBackedPoolTest, ErrorWithErrorCollector) {
-  ErrorDescriptorDatabase error_database;
-  MockErrorCollector error_collector;
-  DescriptorPool pool(&error_database, &error_collector);
-
-  EXPECT_TRUE(pool.FindFileByName("error.proto") == nullptr);
-  EXPECT_EQ(
-      "error.proto: error2.proto: IMPORT: File recursively imports itself: "
-      "error.proto -> error2.proto -> error.proto\n"
-      "error2.proto: error.proto: IMPORT: Import \"error.proto\" was not "
-      "found or had errors.\n"
-      "error.proto: error2.proto: IMPORT: Import \"error2.proto\" was not "
-      "found or had errors.\n",
-      error_collector.text_);
-}
-
-TEST_F(DatabaseBackedPoolTest, UndeclaredDependencyOnUnbuiltType) {
-  // Check that we find and report undeclared dependencies on types that exist
-  // in the descriptor database but that have not not been built yet.
-  MockErrorCollector error_collector;
-  DescriptorPool pool(&database_, &error_collector);
-  EXPECT_TRUE(pool.FindMessageTypeByName("Baz") == nullptr);
-  EXPECT_EQ(
-      "baz.proto: Baz.foo: TYPE: \"Foo\" seems to be defined in \"foo.proto\", "
-      "which is not imported by \"baz.proto\".  To use it here, please add "
-      "the necessary import.\n",
-      error_collector.text_);
-}
-
-TEST_F(DatabaseBackedPoolTest, RollbackAfterError) {
-  // Make sure that all traces of bad types are removed from the pool. This used
-  // to be b/4529436, due to the fact that a symbol resolution failure could
-  // potentially cause another file to be recursively built, which would trigger
-  // a checkpoint _past_ possibly invalid symbols.
-  // Baz is defined in the database, but the file is invalid because it is
-  // missing a necessary import.
-  DescriptorPool pool(&database_);
-  EXPECT_TRUE(pool.FindMessageTypeByName("Baz") == nullptr);
-  // Make sure that searching again for the file or the type fails.
-  EXPECT_TRUE(pool.FindFileByName("baz.proto") == nullptr);
-  EXPECT_TRUE(pool.FindMessageTypeByName("Baz") == nullptr);
-}
-
-TEST_F(DatabaseBackedPoolTest, UnittestProto) {
-  // Try to load all of unittest.proto from a DescriptorDatabase.  This should
-  // thoroughly test all paths through DescriptorBuilder to insure that there
-  // are no deadlocking problems when pool_->mutex_ is non-null.
-  const FileDescriptor* original_file =
-      protobuf_unittest::TestAllTypes::descriptor()->file();
-
-  DescriptorPoolDatabase database(*DescriptorPool::generated_pool());
-  DescriptorPool pool(&database);
-  const FileDescriptor* file_from_database =
-      pool.FindFileByName(original_file->name());
-
-  ASSERT_TRUE(file_from_database != nullptr);
-
-  FileDescriptorProto original_file_proto;
-  original_file->CopyTo(&original_file_proto);
-
-  FileDescriptorProto file_from_database_proto;
-  file_from_database->CopyTo(&file_from_database_proto);
-
-  EXPECT_EQ(original_file_proto.DebugString(),
-            file_from_database_proto.DebugString());
-
-  // Also verify that CopyTo() did not omit any information.
-  EXPECT_EQ(original_file->DebugString(), file_from_database->DebugString());
-}
-
-TEST_F(DatabaseBackedPoolTest, DoesntRetryDbUnnecessarily) {
-  // Searching for a child of an existing descriptor should never fall back
-  // to the DescriptorDatabase even if it isn't found, because we know all
-  // children are already loaded.
-  CallCountingDatabase call_counter(&database_);
-  DescriptorPool pool(&call_counter);
-
-  const FileDescriptor* file = pool.FindFileByName("foo.proto");
-  ASSERT_TRUE(file != nullptr);
-  const Descriptor* foo = pool.FindMessageTypeByName("Foo");
-  ASSERT_TRUE(foo != nullptr);
-  const EnumDescriptor* test_enum = pool.FindEnumTypeByName("TestEnum");
-  ASSERT_TRUE(test_enum != nullptr);
-  const ServiceDescriptor* test_service = pool.FindServiceByName("TestService");
-  ASSERT_TRUE(test_service != nullptr);
-
-  EXPECT_NE(0, call_counter.call_count_);
-  call_counter.Clear();
-
-  EXPECT_TRUE(foo->FindFieldByName("no_such_field") == nullptr);
-  EXPECT_TRUE(foo->FindExtensionByName("no_such_extension") == nullptr);
-  EXPECT_TRUE(foo->FindNestedTypeByName("NoSuchMessageType") == nullptr);
-  EXPECT_TRUE(foo->FindEnumTypeByName("NoSuchEnumType") == nullptr);
-  EXPECT_TRUE(foo->FindEnumValueByName("NO_SUCH_VALUE") == nullptr);
-  EXPECT_TRUE(test_enum->FindValueByName("NO_SUCH_VALUE") == nullptr);
-  EXPECT_TRUE(test_service->FindMethodByName("NoSuchMethod") == nullptr);
-
-  EXPECT_TRUE(file->FindMessageTypeByName("NoSuchMessageType") == nullptr);
-  EXPECT_TRUE(file->FindEnumTypeByName("NoSuchEnumType") == nullptr);
-  EXPECT_TRUE(file->FindEnumValueByName("NO_SUCH_VALUE") == nullptr);
-  EXPECT_TRUE(file->FindServiceByName("NO_SUCH_VALUE") == nullptr);
-  EXPECT_TRUE(file->FindExtensionByName("no_such_extension") == nullptr);
-
-  EXPECT_TRUE(pool.FindFileContainingSymbol("Foo.no.such.field") == nullptr);
-  EXPECT_TRUE(pool.FindFileContainingSymbol("Foo.no_such_field") == nullptr);
-  EXPECT_TRUE(pool.FindMessageTypeByName("Foo.NoSuchMessageType") == nullptr);
-  EXPECT_TRUE(pool.FindFieldByName("Foo.no_such_field") == nullptr);
-  EXPECT_TRUE(pool.FindExtensionByName("Foo.no_such_extension") == nullptr);
-  EXPECT_TRUE(pool.FindEnumTypeByName("Foo.NoSuchEnumType") == nullptr);
-  EXPECT_TRUE(pool.FindEnumValueByName("Foo.NO_SUCH_VALUE") == nullptr);
-  EXPECT_TRUE(pool.FindMethodByName("TestService.NoSuchMethod") == nullptr);
-
-  EXPECT_EQ(0, call_counter.call_count_);
-}
-
-TEST_F(DatabaseBackedPoolTest, DoesntReloadFilesUncesessarily) {
-  // If FindFileContainingSymbol() or FindFileContainingExtension() return a
-  // file that is already in the DescriptorPool, it should not attempt to
-  // reload the file.
-  FalsePositiveDatabase false_positive_database(&database_);
-  MockErrorCollector error_collector;
-  DescriptorPool pool(&false_positive_database, &error_collector);
-
-  // First make sure foo.proto is loaded.
-  const Descriptor* foo = pool.FindMessageTypeByName("Foo");
-  ASSERT_TRUE(foo != nullptr);
-
-  // Try inducing false positives.
-  EXPECT_TRUE(pool.FindMessageTypeByName("NoSuchSymbol") == nullptr);
-  EXPECT_TRUE(pool.FindExtensionByNumber(foo, 22) == nullptr);
-
-  // No errors should have been reported.  (If foo.proto was incorrectly
-  // loaded multiple times, errors would have been reported.)
-  EXPECT_EQ("", error_collector.text_);
-}
-
-// DescriptorDatabase that attempts to induce exponentially-bad performance
-// in DescriptorPool. For every positive N, the database contains a file
-// fileN.proto, which defines a message MessageN, which contains fields of
-// type MessageK for all K in [0,N). Message0 is not defined anywhere
-// (file0.proto exists, but is empty), so every other file and message type
-// will fail to build.
-//
-// If the DescriptorPool is not careful to memoize errors, an attempt to
-// build a descriptor for MessageN can require O(2^N) time.
-class ExponentialErrorDatabase : public DescriptorDatabase {
- public:
-  ExponentialErrorDatabase() {}
-  ~ExponentialErrorDatabase() override {}
-
-  // implements DescriptorDatabase ---------------------------------
-  bool FindFileByName(const std::string& filename,
-                      FileDescriptorProto* output) override {
-    int file_num = -1;
-    FullMatch(filename, "file", ".proto", &file_num);
-    if (file_num > -1) {
-      return PopulateFile(file_num, output);
-    } else {
-      return false;
-    }
-  }
-  bool FindFileContainingSymbol(const std::string& symbol_name,
-                                FileDescriptorProto* output) override {
-    int file_num = -1;
-    FullMatch(symbol_name, "Message", "", &file_num);
-    if (file_num > 0) {
-      return PopulateFile(file_num, output);
-    } else {
-      return false;
-    }
-  }
-  bool FindFileContainingExtension(const std::string& containing_type,
-                                   int field_number,
-                                   FileDescriptorProto* output) override {
-    return false;
-  }
-
- private:
-  void FullMatch(const std::string& name, const std::string& begin_with,
-                 const std::string& end_with, int* file_num) {
-    int begin_size = begin_with.size();
-    int end_size = end_with.size();
-    if (name.substr(0, begin_size) != begin_with ||
-        name.substr(name.size() - end_size, end_size) != end_with) {
-      return;
-    }
-    safe_strto32(
-        name.substr(begin_size, name.size() - end_size - begin_size), file_num);
-  }
-
-  bool PopulateFile(int file_num, FileDescriptorProto* output) {
-    GOOGLE_CHECK_GE(file_num, 0);
-    output->Clear();
-    output->set_name(strings::Substitute("file$0.proto", file_num));
-    // file0.proto doesn't define Message0
-    if (file_num > 0) {
-      DescriptorProto* message = output->add_message_type();
-      message->set_name(strings::Substitute("Message$0", file_num));
-      for (int i = 0; i < file_num; ++i) {
-        output->add_dependency(strings::Substitute("file$0.proto", i));
-        FieldDescriptorProto* field = message->add_field();
-        field->set_name(strings::Substitute("field$0", i));
-        field->set_number(i);
-        field->set_label(FieldDescriptorProto::LABEL_OPTIONAL);
-        field->set_type(FieldDescriptorProto::TYPE_MESSAGE);
-        field->set_type_name(strings::Substitute("Message$0", i));
-      }
-    }
-    return true;
-  }
-};
-
-TEST_F(DatabaseBackedPoolTest, DoesntReloadKnownBadFiles) {
-  ExponentialErrorDatabase error_database;
-  DescriptorPool pool(&error_database);
-
-  GOOGLE_LOG(INFO) << "A timeout in this test probably indicates a real bug.";
-
-  EXPECT_TRUE(pool.FindFileByName("file40.proto") == nullptr);
-  EXPECT_TRUE(pool.FindMessageTypeByName("Message40") == nullptr);
-}
-
-TEST_F(DatabaseBackedPoolTest, DoesntFallbackOnWrongType) {
-  // If a lookup finds a symbol of the wrong type (e.g. we pass a type name
-  // to FindFieldByName()), we should fail fast, without checking the fallback
-  // database.
-  CallCountingDatabase call_counter(&database_);
-  DescriptorPool pool(&call_counter);
-
-  const FileDescriptor* file = pool.FindFileByName("foo.proto");
-  ASSERT_TRUE(file != nullptr);
-  const Descriptor* foo = pool.FindMessageTypeByName("Foo");
-  ASSERT_TRUE(foo != nullptr);
-  const EnumDescriptor* test_enum = pool.FindEnumTypeByName("TestEnum");
-  ASSERT_TRUE(test_enum != nullptr);
-
-  EXPECT_NE(0, call_counter.call_count_);
-  call_counter.Clear();
-
-  EXPECT_TRUE(pool.FindMessageTypeByName("TestEnum") == nullptr);
-  EXPECT_TRUE(pool.FindFieldByName("Foo") == nullptr);
-  EXPECT_TRUE(pool.FindExtensionByName("Foo") == nullptr);
-  EXPECT_TRUE(pool.FindEnumTypeByName("Foo") == nullptr);
-  EXPECT_TRUE(pool.FindEnumValueByName("Foo") == nullptr);
-  EXPECT_TRUE(pool.FindServiceByName("Foo") == nullptr);
-  EXPECT_TRUE(pool.FindMethodByName("Foo") == nullptr);
-
-  EXPECT_EQ(0, call_counter.call_count_);
-}
-
-// ===================================================================
-
-class AbortingErrorCollector : public DescriptorPool::ErrorCollector {
- public:
-  AbortingErrorCollector() {}
-
-  void AddError(const std::string& filename, const std::string& element_name,
-                const Message* message, ErrorLocation location,
-                const std::string& error_message) override {
-    GOOGLE_LOG(FATAL) << "AddError() called unexpectedly: " << filename << " ["
-               << element_name << "]: " << error_message;
-  }
-
- private:
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(AbortingErrorCollector);
-};
-
-// A source tree containing only one file.
-class SingletonSourceTree : public compiler::SourceTree {
- public:
-  SingletonSourceTree(const std::string& filename, const std::string& contents)
-      : filename_(filename), contents_(contents) {}
-
-  io::ZeroCopyInputStream* Open(const std::string& filename) override {
-    return filename == filename_
-               ? new io::ArrayInputStream(contents_.data(), contents_.size())
-               : nullptr;
-  }
-
- private:
-  const std::string filename_;
-  const std::string contents_;
-
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(SingletonSourceTree);
-};
-
-const char* const kSourceLocationTestInput =
-    "syntax = \"proto2\";\n"
-    "option java_package = \"com.foo.bar\";\n"
-    "option (test_file_opt) = \"foobar\";\n"
-    "message A {\n"
-    "  option (test_msg_opt) = \"foobar\";\n"
-    "  optional int32 a = 1 [deprecated = true];\n"
-    "  message B {\n"
-    "    required double b = 1 [(test_field_opt) = \"foobar\"];\n"
-    "  }\n"
-    "  oneof c {\n"
-    "    option (test_oneof_opt) = \"foobar\";\n"
-    "    string d = 2;\n"
-    "    string e = 3;\n"
-    "    string f = 4;\n"
-    "  }\n"
-    "}\n"
-    "enum Indecision {\n"
-    "  option (test_enum_opt) = 21;\n"
-    "  option (test_enum_opt) = 42;\n"
-    "  option (test_enum_opt) = 63;\n"
-    "  YES   = 1 [(test_enumval_opt).a = 100];\n"
-    "  NO    = 2 [(test_enumval_opt) = {a:200}];\n"
-    "  MAYBE = 3;\n"
-    "}\n"
-    "service S {\n"
-    "  option (test_svc_opt) = {a:100};\n"
-    "  option (test_svc_opt) = {a:200};\n"
-    "  option (test_svc_opt) = {a:300};\n"
-    "  rpc Method(A) returns (A.B);\n"
-    // Put an empty line here to make the source location range match.
-    "\n"
-    "  rpc OtherMethod(A) returns (A) {\n"
-    "    option deprecated = true;\n"
-    "    option (test_method_opt) = \"foobar\";\n"
-    "  }\n"
-    "}\n"
-    "message MessageWithExtensions {\n"
-    "  extensions 1000 to 2000, 2001 to max [(test_ext_opt) = \"foobar\"];\n"
-    "}\n"
-    "extend MessageWithExtensions {\n"
-    "  repeated int32 int32_extension = 1001 [packed=true];\n"
-    "}\n"
-    "message C {\n"
-    "  extend MessageWithExtensions {\n"
-    "    optional C message_extension = 1002;\n"
-    "  }\n"
-    "}\n"
-    "import \"google/protobuf/descriptor.proto\";\n"
-    "extend google.protobuf.FileOptions {\n"
-    "  optional string test_file_opt = 10101;\n"
-    "}\n"
-    "extend google.protobuf.MessageOptions {\n"
-    "  optional string test_msg_opt = 10101;\n"
-    "}\n"
-    "extend google.protobuf.FieldOptions {\n"
-    "  optional string test_field_opt = 10101;\n"
-    "}\n"
-    "extend google.protobuf.EnumOptions {\n"
-    "  repeated int32 test_enum_opt = 10101;\n"
-    "}\n"
-    "extend google.protobuf.EnumValueOptions {\n"
-    "  optional A test_enumval_opt = 10101;\n"
-    "}\n"
-    "extend google.protobuf.ServiceOptions {\n"
-    "  repeated A test_svc_opt = 10101;\n"
-    "}\n"
-    "extend google.protobuf.MethodOptions {\n"
-    "  optional string test_method_opt = 10101;\n"
-    "}\n"
-    "extend google.protobuf.OneofOptions {\n"
-    "  optional string test_oneof_opt = 10101;\n"
-    "}\n"
-    "extend google.protobuf.ExtensionRangeOptions {\n"
-    "  optional string test_ext_opt = 10101;\n"
-    "}\n";
-
-class SourceLocationTest : public testing::Test {
- public:
-  SourceLocationTest()
-      : source_tree_("/test/test.proto", kSourceLocationTestInput),
-        simple_db_(),
-        source_tree_db_(&source_tree_),
-        merged_db_(&simple_db_, &source_tree_db_),
-        pool_(&merged_db_, &collector_) {
-    // we need descriptor.proto to be accessible by the pool
-    // since our test file imports it
-    FileDescriptorProto::descriptor()->file()->CopyTo(&file_proto_);
-    simple_db_.Add(file_proto_);
-  }
-
-  static std::string PrintSourceLocation(const SourceLocation& loc) {
-    return strings::Substitute("$0:$1-$2:$3", 1 + loc.start_line,
-                            1 + loc.start_column, 1 + loc.end_line,
-                            1 + loc.end_column);
-  }
-
- private:
-  FileDescriptorProto file_proto_;
-  AbortingErrorCollector collector_;
-  SingletonSourceTree source_tree_;
-  SimpleDescriptorDatabase simple_db_;  // contains descriptor.proto
-  compiler::SourceTreeDescriptorDatabase source_tree_db_;  // loads test.proto
-  MergedDescriptorDatabase merged_db_;  // combines above two dbs
-
- protected:
-  DescriptorPool pool_;
-
-  // tag number of all custom options in above test file
-  static constexpr int kCustomOptionFieldNumber = 10101;
-  // tag number of field "a" in message type "A" in above test file
-  static constexpr int kAFieldNumber = 1;
-};
-
-// TODO(adonovan): implement support for option fields and for
-// subparts of declarations.
-
-TEST_F(SourceLocationTest, GetSourceLocation) {
-  SourceLocation loc;
-
-  const FileDescriptor* file_desc =
-      GOOGLE_CHECK_NOTNULL(pool_.FindFileByName("/test/test.proto"));
-
-  const Descriptor* a_desc = file_desc->FindMessageTypeByName("A");
-  EXPECT_TRUE(a_desc->GetSourceLocation(&loc));
-  EXPECT_EQ("4:1-16:2", PrintSourceLocation(loc));
-
-  const Descriptor* a_b_desc = a_desc->FindNestedTypeByName("B");
-  EXPECT_TRUE(a_b_desc->GetSourceLocation(&loc));
-  EXPECT_EQ("7:3-9:4", PrintSourceLocation(loc));
-
-  const EnumDescriptor* e_desc = file_desc->FindEnumTypeByName("Indecision");
-  EXPECT_TRUE(e_desc->GetSourceLocation(&loc));
-  EXPECT_EQ("17:1-24:2", PrintSourceLocation(loc));
-
-  const EnumValueDescriptor* yes_desc = e_desc->FindValueByName("YES");
-  EXPECT_TRUE(yes_desc->GetSourceLocation(&loc));
-  EXPECT_EQ("21:3-21:42", PrintSourceLocation(loc));
-
-  const ServiceDescriptor* s_desc = file_desc->FindServiceByName("S");
-  EXPECT_TRUE(s_desc->GetSourceLocation(&loc));
-  EXPECT_EQ("25:1-35:2", PrintSourceLocation(loc));
-
-  const MethodDescriptor* m_desc = s_desc->FindMethodByName("Method");
-  EXPECT_TRUE(m_desc->GetSourceLocation(&loc));
-  EXPECT_EQ("29:3-29:31", PrintSourceLocation(loc));
-}
-
-TEST_F(SourceLocationTest, ExtensionSourceLocation) {
-  SourceLocation loc;
-
-  const FileDescriptor* file_desc =
-      GOOGLE_CHECK_NOTNULL(pool_.FindFileByName("/test/test.proto"));
-
-  const FieldDescriptor* int32_extension_desc =
-      file_desc->FindExtensionByName("int32_extension");
-  EXPECT_TRUE(int32_extension_desc->GetSourceLocation(&loc));
-  EXPECT_EQ("40:3-40:55", PrintSourceLocation(loc));
-
-  const Descriptor* c_desc = file_desc->FindMessageTypeByName("C");
-  EXPECT_TRUE(c_desc->GetSourceLocation(&loc));
-  EXPECT_EQ("42:1-46:2", PrintSourceLocation(loc));
-
-  const FieldDescriptor* message_extension_desc =
-      c_desc->FindExtensionByName("message_extension");
-  EXPECT_TRUE(message_extension_desc->GetSourceLocation(&loc));
-  EXPECT_EQ("44:5-44:41", PrintSourceLocation(loc));
-}
-TEST_F(SourceLocationTest, InterpretedOptionSourceLocation) {
-  // This one's a doozy. It checks every kind of option, including
-  // extension range options.
-
-  // We are verifying that the file's source info contains correct
-  // info for interpreted options and that it does *not* contain
-  // any info for corresponding uninterpreted option path.
-
-  SourceLocation loc;
-
-  const FileDescriptor* file_desc =
-      GOOGLE_CHECK_NOTNULL(pool_.FindFileByName("/test/test.proto"));
-
-  // File options
-  {
-    int path[] = {FileDescriptorProto::kOptionsFieldNumber,
-                  FileOptions::kJavaPackageFieldNumber};
-    int unint[] = {FileDescriptorProto::kOptionsFieldNumber,
-                   FileOptions::kUninterpretedOptionFieldNumber, 0};
-
-    std::vector<int> vpath(path, path + 2);
-    EXPECT_TRUE(file_desc->GetSourceLocation(vpath, &loc));
-    EXPECT_EQ("2:1-2:37", PrintSourceLocation(loc));
-
-    std::vector<int> vunint(unint, unint + 3);
-    EXPECT_FALSE(file_desc->GetSourceLocation(vunint, &loc));
-  }
-  {
-    int path[] = {FileDescriptorProto::kOptionsFieldNumber,
-                  kCustomOptionFieldNumber};
-    int unint[] = {FileDescriptorProto::kOptionsFieldNumber,
-                   FileOptions::kUninterpretedOptionFieldNumber, 1};
-    std::vector<int> vpath(path, path + 2);
-    EXPECT_TRUE(file_desc->GetSourceLocation(vpath, &loc));
-    EXPECT_EQ("3:1-3:35", PrintSourceLocation(loc));
-
-    std::vector<int> vunint(unint, unint + 3);
-    EXPECT_FALSE(file_desc->GetSourceLocation(vunint, &loc));
-  }
-
-  // Message option
-  {
-    int path[] = {FileDescriptorProto::kMessageTypeFieldNumber, 0,
-                  DescriptorProto::kOptionsFieldNumber,
-                  kCustomOptionFieldNumber};
-    int unint[] = {FileDescriptorProto::kMessageTypeFieldNumber, 0,
-                   DescriptorProto::kOptionsFieldNumber,
-                   MessageOptions::kUninterpretedOptionFieldNumber, 0};
-    std::vector<int> vpath(path, path + 4);
-    EXPECT_TRUE(file_desc->GetSourceLocation(vpath, &loc));
-    EXPECT_EQ("5:3-5:36", PrintSourceLocation(loc));
-
-    std::vector<int> vunint(unint, unint + 5);
-    EXPECT_FALSE(file_desc->GetSourceLocation(vunint, &loc));
-  }
-
-  // Field option
-  {
-    int path[] = {FileDescriptorProto::kMessageTypeFieldNumber,
-                  0,
-                  DescriptorProto::kFieldFieldNumber,
-                  0,
-                  FieldDescriptorProto::kOptionsFieldNumber,
-                  FieldOptions::kDeprecatedFieldNumber};
-    int unint[] = {FileDescriptorProto::kMessageTypeFieldNumber,
-                   0,
-                   DescriptorProto::kFieldFieldNumber,
-                   0,
-                   FieldDescriptorProto::kOptionsFieldNumber,
-                   FieldOptions::kUninterpretedOptionFieldNumber,
-                   0};
-    std::vector<int> vpath(path, path + 6);
-    EXPECT_TRUE(file_desc->GetSourceLocation(vpath, &loc));
-    EXPECT_EQ("6:25-6:42", PrintSourceLocation(loc));
-
-    std::vector<int> vunint(unint, unint + 7);
-    EXPECT_FALSE(file_desc->GetSourceLocation(vunint, &loc));
-  }
-
-  // Nested message option
-  {
-    int path[] = {
-        FileDescriptorProto::kMessageTypeFieldNumber, 0,
-        DescriptorProto::kNestedTypeFieldNumber,      0,
-        DescriptorProto::kFieldFieldNumber,           0,
-        FieldDescriptorProto::kOptionsFieldNumber,    kCustomOptionFieldNumber};
-    int unint[] = {FileDescriptorProto::kMessageTypeFieldNumber,
-                   0,
-                   DescriptorProto::kNestedTypeFieldNumber,
-                   0,
-                   DescriptorProto::kFieldFieldNumber,
-                   0,
-                   FieldDescriptorProto::kOptionsFieldNumber,
-                   FieldOptions::kUninterpretedOptionFieldNumber,
-                   0};
-    std::vector<int> vpath(path, path + 8);
-    EXPECT_TRUE(file_desc->GetSourceLocation(vpath, &loc));
-    EXPECT_EQ("8:28-8:55", PrintSourceLocation(loc));
-
-    std::vector<int> vunint(unint, unint + 9);
-    EXPECT_FALSE(file_desc->GetSourceLocation(vunint, &loc));
-  }
-
-  // One-of option
-  {
-    int path[] = {
-        FileDescriptorProto::kMessageTypeFieldNumber, 0,
-        DescriptorProto::kOneofDeclFieldNumber,       0,
-        OneofDescriptorProto::kOptionsFieldNumber,    kCustomOptionFieldNumber};
-    int unint[] = {FileDescriptorProto::kMessageTypeFieldNumber,
-                   0,
-                   DescriptorProto::kOneofDeclFieldNumber,
-                   0,
-                   OneofDescriptorProto::kOptionsFieldNumber,
-                   OneofOptions::kUninterpretedOptionFieldNumber,
-                   0};
-    std::vector<int> vpath(path, path + 6);
-    EXPECT_TRUE(file_desc->GetSourceLocation(vpath, &loc));
-    EXPECT_EQ("11:5-11:40", PrintSourceLocation(loc));
-
-    std::vector<int> vunint(unint, unint + 7);
-    EXPECT_FALSE(file_desc->GetSourceLocation(vunint, &loc));
-  }
-
-  // Enum option, repeated options
-  {
-    int path[] = {FileDescriptorProto::kEnumTypeFieldNumber, 0,
-                  EnumDescriptorProto::kOptionsFieldNumber,
-                  kCustomOptionFieldNumber, 0};
-    int unint[] = {FileDescriptorProto::kEnumTypeFieldNumber, 0,
-                   EnumDescriptorProto::kOptionsFieldNumber,
-                   EnumOptions::kUninterpretedOptionFieldNumber, 0};
-    std::vector<int> vpath(path, path + 5);
-    EXPECT_TRUE(file_desc->GetSourceLocation(vpath, &loc));
-    EXPECT_EQ("18:3-18:31", PrintSourceLocation(loc));
-
-    std::vector<int> vunint(unint, unint + 5);
-    EXPECT_FALSE(file_desc->GetSourceLocation(vunint, &loc));
-  }
-  {
-    int path[] = {FileDescriptorProto::kEnumTypeFieldNumber, 0,
-                  EnumDescriptorProto::kOptionsFieldNumber,
-                  kCustomOptionFieldNumber, 1};
-    int unint[] = {FileDescriptorProto::kEnumTypeFieldNumber, 0,
-                   EnumDescriptorProto::kOptionsFieldNumber,
-                   EnumOptions::kUninterpretedOptionFieldNumber, 1};
-    std::vector<int> vpath(path, path + 5);
-    EXPECT_TRUE(file_desc->GetSourceLocation(vpath, &loc));
-    EXPECT_EQ("19:3-19:31", PrintSourceLocation(loc));
-
-    std::vector<int> vunint(unint, unint + 5);
-    EXPECT_FALSE(file_desc->GetSourceLocation(vunint, &loc));
-  }
-  {
-    int path[] = {FileDescriptorProto::kEnumTypeFieldNumber, 0,
-                  EnumDescriptorProto::kOptionsFieldNumber,
-                  kCustomOptionFieldNumber, 2};
-    int unint[] = {FileDescriptorProto::kEnumTypeFieldNumber, 0,
-                   EnumDescriptorProto::kOptionsFieldNumber,
-                   OneofOptions::kUninterpretedOptionFieldNumber, 2};
-    std::vector<int> vpath(path, path + 5);
-    EXPECT_TRUE(file_desc->GetSourceLocation(vpath, &loc));
-    EXPECT_EQ("20:3-20:31", PrintSourceLocation(loc));
-
-    std::vector<int> vunint(unint, unint + 5);
-    EXPECT_FALSE(file_desc->GetSourceLocation(vunint, &loc));
-  }
-
-  // Enum value options
-  {
-    // option w/ message type that directly sets field
-    int path[] = {FileDescriptorProto::kEnumTypeFieldNumber,
-                  0,
-                  EnumDescriptorProto::kValueFieldNumber,
-                  0,
-                  EnumValueDescriptorProto::kOptionsFieldNumber,
-                  kCustomOptionFieldNumber,
-                  kAFieldNumber};
-    int unint[] = {FileDescriptorProto::kEnumTypeFieldNumber,
-                   0,
-                   EnumDescriptorProto::kValueFieldNumber,
-                   0,
-                   EnumValueDescriptorProto::kOptionsFieldNumber,
-                   EnumValueOptions::kUninterpretedOptionFieldNumber,
-                   0};
-    std::vector<int> vpath(path, path + 7);
-    EXPECT_TRUE(file_desc->GetSourceLocation(vpath, &loc));
-    EXPECT_EQ("21:14-21:40", PrintSourceLocation(loc));
-
-    std::vector<int> vunint(unint, unint + 7);
-    EXPECT_FALSE(file_desc->GetSourceLocation(vunint, &loc));
-  }
-  {
-    int path[] = {FileDescriptorProto::kEnumTypeFieldNumber,
-                  0,
-                  EnumDescriptorProto::kValueFieldNumber,
-                  1,
-                  EnumValueDescriptorProto::kOptionsFieldNumber,
-                  kCustomOptionFieldNumber};
-    int unint[] = {FileDescriptorProto::kEnumTypeFieldNumber,
-                   0,
-                   EnumDescriptorProto::kValueFieldNumber,
-                   1,
-                   EnumValueDescriptorProto::kOptionsFieldNumber,
-                   EnumValueOptions::kUninterpretedOptionFieldNumber,
-                   0};
-    std::vector<int> vpath(path, path + 6);
-    EXPECT_TRUE(file_desc->GetSourceLocation(vpath, &loc));
-    EXPECT_EQ("22:14-22:42", PrintSourceLocation(loc));
-
-    std::vector<int> vunint(unint, unint + 7);
-    EXPECT_FALSE(file_desc->GetSourceLocation(vunint, &loc));
-  }
-
-  // Service option, repeated options
-  {
-    int path[] = {FileDescriptorProto::kServiceFieldNumber, 0,
-                  ServiceDescriptorProto::kOptionsFieldNumber,
-                  kCustomOptionFieldNumber, 0};
-    int unint[] = {FileDescriptorProto::kServiceFieldNumber, 0,
-                   ServiceDescriptorProto::kOptionsFieldNumber,
-                   ServiceOptions::kUninterpretedOptionFieldNumber, 0};
-    std::vector<int> vpath(path, path + 5);
-    EXPECT_TRUE(file_desc->GetSourceLocation(vpath, &loc));
-    EXPECT_EQ("26:3-26:35", PrintSourceLocation(loc));
-
-    std::vector<int> vunint(unint, unint + 5);
-    EXPECT_FALSE(file_desc->GetSourceLocation(vunint, &loc));
-  }
-  {
-    int path[] = {FileDescriptorProto::kServiceFieldNumber, 0,
-                  ServiceDescriptorProto::kOptionsFieldNumber,
-                  kCustomOptionFieldNumber, 1};
-    int unint[] = {FileDescriptorProto::kServiceFieldNumber, 0,
-                   ServiceDescriptorProto::kOptionsFieldNumber,
-                   ServiceOptions::kUninterpretedOptionFieldNumber, 1};
-    std::vector<int> vpath(path, path + 5);
-    EXPECT_TRUE(file_desc->GetSourceLocation(vpath, &loc));
-    EXPECT_EQ("27:3-27:35", PrintSourceLocation(loc));
-
-    std::vector<int> vunint(unint, unint + 5);
-    EXPECT_FALSE(file_desc->GetSourceLocation(vunint, &loc));
-  }
-  {
-    int path[] = {FileDescriptorProto::kServiceFieldNumber, 0,
-                  ServiceDescriptorProto::kOptionsFieldNumber,
-                  kCustomOptionFieldNumber, 2};
-    int unint[] = {FileDescriptorProto::kServiceFieldNumber, 0,
-                   ServiceDescriptorProto::kOptionsFieldNumber,
-                   ServiceOptions::kUninterpretedOptionFieldNumber, 2};
-    std::vector<int> vpath(path, path + 5);
-    EXPECT_TRUE(file_desc->GetSourceLocation(vpath, &loc));
-    EXPECT_EQ("28:3-28:35", PrintSourceLocation(loc));
-
-    std::vector<int> vunint(unint, unint + 5);
-    EXPECT_FALSE(file_desc->GetSourceLocation(vunint, &loc));
-  }
-
-  // Method options
-  {
-    int path[] = {FileDescriptorProto::kServiceFieldNumber,
-                  0,
-                  ServiceDescriptorProto::kMethodFieldNumber,
-                  1,
-                  MethodDescriptorProto::kOptionsFieldNumber,
-                  MethodOptions::kDeprecatedFieldNumber};
-    int unint[] = {FileDescriptorProto::kServiceFieldNumber,
-                   0,
-                   ServiceDescriptorProto::kMethodFieldNumber,
-                   1,
-                   MethodDescriptorProto::kOptionsFieldNumber,
-                   MethodOptions::kUninterpretedOptionFieldNumber,
-                   0};
-    std::vector<int> vpath(path, path + 6);
-    EXPECT_TRUE(file_desc->GetSourceLocation(vpath, &loc));
-    EXPECT_EQ("32:5-32:30", PrintSourceLocation(loc));
-
-    std::vector<int> vunint(unint, unint + 7);
-    EXPECT_FALSE(file_desc->GetSourceLocation(vunint, &loc));
-  }
-  {
-    int path[] = {
-        FileDescriptorProto::kServiceFieldNumber,   0,
-        ServiceDescriptorProto::kMethodFieldNumber, 1,
-        MethodDescriptorProto::kOptionsFieldNumber, kCustomOptionFieldNumber};
-    int unint[] = {FileDescriptorProto::kServiceFieldNumber,
-                   0,
-                   ServiceDescriptorProto::kMethodFieldNumber,
-                   1,
-                   MethodDescriptorProto::kOptionsFieldNumber,
-                   MethodOptions::kUninterpretedOptionFieldNumber,
-                   1};
-    std::vector<int> vpath(path, path + 6);
-    EXPECT_TRUE(file_desc->GetSourceLocation(vpath, &loc));
-    EXPECT_EQ("33:5-33:41", PrintSourceLocation(loc));
-
-    std::vector<int> vunint(unint, unint + 7);
-    EXPECT_FALSE(file_desc->GetSourceLocation(vunint, &loc));
-  }
-
-  // Extension range options
-  {
-    int path[] = {FileDescriptorProto::kMessageTypeFieldNumber, 1,
-                  DescriptorProto::kExtensionRangeFieldNumber, 0,
-                  DescriptorProto_ExtensionRange::kOptionsFieldNumber};
-    std::vector<int> vpath(path, path + 5);
-    EXPECT_TRUE(file_desc->GetSourceLocation(vpath, &loc));
-    EXPECT_EQ("37:40-37:67", PrintSourceLocation(loc));
-  }
-  {
-    int path[] = {FileDescriptorProto::kMessageTypeFieldNumber,
-                  1,
-                  DescriptorProto::kExtensionRangeFieldNumber,
-                  0,
-                  DescriptorProto_ExtensionRange::kOptionsFieldNumber,
-                  kCustomOptionFieldNumber};
-    int unint[] = {FileDescriptorProto::kMessageTypeFieldNumber,
-                   1,
-                   DescriptorProto::kExtensionRangeFieldNumber,
-                   0,
-                   DescriptorProto_ExtensionRange::kOptionsFieldNumber,
-                   ExtensionRangeOptions::kUninterpretedOptionFieldNumber,
-                   0};
-    std::vector<int> vpath(path, path + 6);
-    EXPECT_TRUE(file_desc->GetSourceLocation(vpath, &loc));
-    EXPECT_EQ("37:41-37:66", PrintSourceLocation(loc));
-
-    std::vector<int> vunint(unint, unint + 7);
-    EXPECT_FALSE(file_desc->GetSourceLocation(vunint, &loc));
-  }
-  {
-    int path[] = {FileDescriptorProto::kMessageTypeFieldNumber,
-                  1,
-                  DescriptorProto::kExtensionRangeFieldNumber,
-                  1,
-                  DescriptorProto_ExtensionRange::kOptionsFieldNumber,
-                  kCustomOptionFieldNumber};
-    int unint[] = {FileDescriptorProto::kMessageTypeFieldNumber,
-                   1,
-                   DescriptorProto::kExtensionRangeFieldNumber,
-                   1,
-                   DescriptorProto_ExtensionRange::kOptionsFieldNumber,
-                   ExtensionRangeOptions::kUninterpretedOptionFieldNumber,
-                   0};
-    std::vector<int> vpath(path, path + 6);
-    EXPECT_TRUE(file_desc->GetSourceLocation(vpath, &loc));
-    EXPECT_EQ("37:41-37:66", PrintSourceLocation(loc));
-
-    std::vector<int> vunint(unint, unint + 7);
-    EXPECT_FALSE(file_desc->GetSourceLocation(vunint, &loc));
-  }
-
-  // Field option on extension
-  {
-    int path[] = {FileDescriptorProto::kExtensionFieldNumber, 0,
-                  FieldDescriptorProto::kOptionsFieldNumber,
-                  FieldOptions::kPackedFieldNumber};
-    int unint[] = {FileDescriptorProto::kExtensionFieldNumber, 0,
-                   FieldDescriptorProto::kOptionsFieldNumber,
-                   FieldOptions::kUninterpretedOptionFieldNumber, 0};
-    std::vector<int> vpath(path, path + 4);
-    EXPECT_TRUE(file_desc->GetSourceLocation(vpath, &loc));
-    EXPECT_EQ("40:42-40:53", PrintSourceLocation(loc));
-
-    std::vector<int> vunint(unint, unint + 5);
-    EXPECT_FALSE(file_desc->GetSourceLocation(vunint, &loc));
-  }
-}
-
-// Missing SourceCodeInfo doesn't cause crash:
-TEST_F(SourceLocationTest, GetSourceLocation_MissingSourceCodeInfo) {
-  SourceLocation loc;
-
-  const FileDescriptor* file_desc =
-      GOOGLE_CHECK_NOTNULL(pool_.FindFileByName("/test/test.proto"));
-
-  FileDescriptorProto proto;
-  file_desc->CopyTo(&proto);  // Note, this discards the SourceCodeInfo.
-  EXPECT_FALSE(proto.has_source_code_info());
-
-  DescriptorPool bad1_pool(&pool_);
-  const FileDescriptor* bad1_file_desc =
-      GOOGLE_CHECK_NOTNULL(bad1_pool.BuildFile(proto));
-  const Descriptor* bad1_a_desc = bad1_file_desc->FindMessageTypeByName("A");
-  EXPECT_FALSE(bad1_a_desc->GetSourceLocation(&loc));
-}
-
-// Corrupt SourceCodeInfo doesn't cause crash:
-TEST_F(SourceLocationTest, GetSourceLocation_BogusSourceCodeInfo) {
-  SourceLocation loc;
-
-  const FileDescriptor* file_desc =
-      GOOGLE_CHECK_NOTNULL(pool_.FindFileByName("/test/test.proto"));
-
-  FileDescriptorProto proto;
-  file_desc->CopyTo(&proto);  // Note, this discards the SourceCodeInfo.
-  EXPECT_FALSE(proto.has_source_code_info());
-  SourceCodeInfo_Location* loc_msg =
-      proto.mutable_source_code_info()->add_location();
-  loc_msg->add_path(1);
-  loc_msg->add_path(2);
-  loc_msg->add_path(3);
-  loc_msg->add_span(4);
-  loc_msg->add_span(5);
-  loc_msg->add_span(6);
-
-  DescriptorPool bad2_pool(&pool_);
-  const FileDescriptor* bad2_file_desc =
-      GOOGLE_CHECK_NOTNULL(bad2_pool.BuildFile(proto));
-  const Descriptor* bad2_a_desc = bad2_file_desc->FindMessageTypeByName("A");
-  EXPECT_FALSE(bad2_a_desc->GetSourceLocation(&loc));
-}
-
-// ===================================================================
-
-const char* const kCopySourceCodeInfoToTestInput =
-    "syntax = \"proto2\";\n"
-    "message Foo {}\n";
-
-// Required since source code information is not preserved by
-// FileDescriptorTest.
-class CopySourceCodeInfoToTest : public testing::Test {
- public:
-  CopySourceCodeInfoToTest()
-      : source_tree_("/test/test.proto", kCopySourceCodeInfoToTestInput),
-        db_(&source_tree_),
-        pool_(&db_, &collector_) {}
-
- private:
-  AbortingErrorCollector collector_;
-  SingletonSourceTree source_tree_;
-  compiler::SourceTreeDescriptorDatabase db_;
-
- protected:
-  DescriptorPool pool_;
-};
-
-TEST_F(CopySourceCodeInfoToTest, CopyTo_DoesNotCopySourceCodeInfo) {
-  const FileDescriptor* file_desc =
-      GOOGLE_CHECK_NOTNULL(pool_.FindFileByName("/test/test.proto"));
-  FileDescriptorProto file_desc_proto;
-  ASSERT_FALSE(file_desc_proto.has_source_code_info());
-
-  file_desc->CopyTo(&file_desc_proto);
-  EXPECT_FALSE(file_desc_proto.has_source_code_info());
-}
-
-TEST_F(CopySourceCodeInfoToTest, CopySourceCodeInfoTo) {
-  const FileDescriptor* file_desc =
-      GOOGLE_CHECK_NOTNULL(pool_.FindFileByName("/test/test.proto"));
-  FileDescriptorProto file_desc_proto;
-  ASSERT_FALSE(file_desc_proto.has_source_code_info());
-
-  file_desc->CopySourceCodeInfoTo(&file_desc_proto);
-  const SourceCodeInfo& info = file_desc_proto.source_code_info();
-  ASSERT_EQ(4, info.location_size());
-  // Get the Foo message location
-  const SourceCodeInfo_Location& foo_location = info.location(2);
-  ASSERT_EQ(2, foo_location.path_size());
-  EXPECT_EQ(FileDescriptorProto::kMessageTypeFieldNumber, foo_location.path(0));
-  EXPECT_EQ(0, foo_location.path(1));      // Foo is the first message defined
-  ASSERT_EQ(3, foo_location.span_size());  // Foo spans one line
-  EXPECT_EQ(1, foo_location.span(0));      // Foo is declared on line 1
-  EXPECT_EQ(0, foo_location.span(1));      // Foo starts at column 0
-  EXPECT_EQ(14, foo_location.span(2));     // Foo ends on column 14
-}
-
-// ===================================================================
-
-class LazilyBuildDependenciesTest : public testing::Test {
- public:
-  LazilyBuildDependenciesTest() : pool_(&db_, nullptr) {
-    pool_.InternalSetLazilyBuildDependencies();
-  }
-
-  void ParseProtoAndAddToDb(const char* proto) {
-    FileDescriptorProto tmp;
-    ASSERT_TRUE(TextFormat::ParseFromString(proto, &tmp));
-    db_.Add(tmp);
-  }
-
-  void ParseProtoAndAddToDb(const std::string& proto) {
-    FileDescriptorProto tmp;
-    ASSERT_TRUE(TextFormat::ParseFromString(proto, &tmp));
-    db_.Add(tmp);
-  }
-
-  void AddSimpleMessageProtoFileToDb(const char* file_name,
-                                     const char* message_name) {
-    ParseProtoAndAddToDb("name: '" + std::string(file_name) +
-                         ".proto' "
-                         "package: \"protobuf_unittest\" "
-                         "message_type { "
-                         "  name:'" +
-                         std::string(message_name) +
-                         "' "
-                         "  field { name:'a' number:1 "
-                         "  label:LABEL_OPTIONAL "
-                         "  type_name:'int32' } "
-                         "}");
-  }
-
-  void AddSimpleEnumProtoFileToDb(const char* file_name, const char* enum_name,
-                                  const char* enum_value_name) {
-    ParseProtoAndAddToDb("name: '" + std::string(file_name) +
-                         ".proto' "
-                         "package: 'protobuf_unittest' "
-                         "enum_type { "
-                         "  name:'" +
-                         std::string(enum_name) +
-                         "' "
-                         "  value { name:'" +
-                         std::string(enum_value_name) +
-                         "' number:1 } "
-                         "}");
-  }
-
- protected:
-  SimpleDescriptorDatabase db_;
-  DescriptorPool pool_;
-};
-
-TEST_F(LazilyBuildDependenciesTest, Message) {
-  ParseProtoAndAddToDb(
-      "name: 'foo.proto' "
-      "package: 'protobuf_unittest' "
-      "dependency: 'bar.proto' "
-      "message_type { "
-      "  name:'Foo' "
-      "  field { name:'bar' number:1 label:LABEL_OPTIONAL "
-      "type_name:'.protobuf_unittest.Bar' } "
-      "}");
-  AddSimpleMessageProtoFileToDb("bar", "Bar");
-
-  // Verify neither has been built yet.
-  EXPECT_FALSE(pool_.InternalIsFileLoaded("foo.proto"));
-  EXPECT_FALSE(pool_.InternalIsFileLoaded("bar.proto"));
-
-  const FileDescriptor* file = pool_.FindFileByName("foo.proto");
-
-  // Verify only foo gets built when asking for foo.proto
-  EXPECT_TRUE(file != nullptr);
-  EXPECT_TRUE(pool_.InternalIsFileLoaded("foo.proto"));
-  EXPECT_FALSE(pool_.InternalIsFileLoaded("bar.proto"));
-
-  // Verify calling FindFieldBy* works when the type of the field was
-  // not built at cross link time. Verify this doesn't build the file
-  // the field's type is defined in, as well.
-  const Descriptor* desc = file->FindMessageTypeByName("Foo");
-  const FieldDescriptor* field = desc->FindFieldByName("bar");
-  EXPECT_TRUE(field != nullptr);
-  EXPECT_EQ(field, desc->FindFieldByNumber(1));
-  EXPECT_EQ(field, desc->FindFieldByLowercaseName("bar"));
-  EXPECT_EQ(field, desc->FindFieldByCamelcaseName("bar"));
-  EXPECT_FALSE(pool_.InternalIsFileLoaded("bar.proto"));
-
-  // Finally, verify that if we call message_type() on the field, we will
-  // build the file where the message is defined, and get a valid descriptor
-  EXPECT_TRUE(field->message_type() != nullptr);
-  EXPECT_TRUE(pool_.InternalIsFileLoaded("bar.proto"));
-}
-
-TEST_F(LazilyBuildDependenciesTest, Enum) {
-  ParseProtoAndAddToDb(
-      "name: 'foo.proto' "
-      "package: 'protobuf_unittest' "
-      "dependency: 'enum1.proto' "
-      "dependency: 'enum2.proto' "
-      "message_type { "
-      "  name:'Lazy' "
-      "  field { name:'enum1' number:1 label:LABEL_OPTIONAL "
-      "type_name:'.protobuf_unittest.Enum1' } "
-      "  field { name:'enum2' number:1 label:LABEL_OPTIONAL "
-      "type_name:'.protobuf_unittest.Enum2' } "
-      "}");
-  AddSimpleEnumProtoFileToDb("enum1", "Enum1", "ENUM1");
-  AddSimpleEnumProtoFileToDb("enum2", "Enum2", "ENUM2");
-
-  const FileDescriptor* file = pool_.FindFileByName("foo.proto");
-
-  // Verify calling enum_type() on a field whose definition is not
-  // yet built will build the file and return a descriptor.
-  EXPECT_FALSE(pool_.InternalIsFileLoaded("enum1.proto"));
-  const Descriptor* desc = file->FindMessageTypeByName("Lazy");
-  EXPECT_TRUE(desc != nullptr);
-  const FieldDescriptor* field = desc->FindFieldByName("enum1");
-  EXPECT_TRUE(field != nullptr);
-  EXPECT_TRUE(field->enum_type() != nullptr);
-  EXPECT_TRUE(pool_.InternalIsFileLoaded("enum1.proto"));
-
-  // Verify calling default_value_enum() on a field whose definition is not
-  // yet built will build the file and return a descriptor to the value.
-  EXPECT_FALSE(pool_.InternalIsFileLoaded("enum2.proto"));
-  field = desc->FindFieldByName("enum2");
-  EXPECT_TRUE(field != nullptr);
-  EXPECT_TRUE(field->default_value_enum() != nullptr);
-  EXPECT_TRUE(pool_.InternalIsFileLoaded("enum2.proto"));
-}
-
-TEST_F(LazilyBuildDependenciesTest, Type) {
-  ParseProtoAndAddToDb(
-      "name: 'foo.proto' "
-      "package: 'protobuf_unittest' "
-      "dependency: 'message1.proto' "
-      "dependency: 'message2.proto' "
-      "dependency: 'enum1.proto' "
-      "dependency: 'enum2.proto' "
-      "message_type { "
-      "  name:'Lazy' "
-      "  field { name:'message1' number:1 label:LABEL_OPTIONAL "
-      "type_name:'.protobuf_unittest.Message1' } "
-      "  field { name:'message2' number:1 label:LABEL_OPTIONAL "
-      "type_name:'.protobuf_unittest.Message2' } "
-      "  field { name:'enum1' number:1 label:LABEL_OPTIONAL "
-      "type_name:'.protobuf_unittest.Enum1' } "
-      "  field { name:'enum2' number:1 label:LABEL_OPTIONAL "
-      "type_name:'.protobuf_unittest.Enum2' } "
-      "}");
-  AddSimpleMessageProtoFileToDb("message1", "Message1");
-  AddSimpleMessageProtoFileToDb("message2", "Message2");
-  AddSimpleEnumProtoFileToDb("enum1", "Enum1", "ENUM1");
-  AddSimpleEnumProtoFileToDb("enum2", "Enum2", "ENUM2");
-
-  const FileDescriptor* file = pool_.FindFileByName("foo.proto");
-
-  // Verify calling type() on a field that is a message type will
-  // build the type defined in another file.
-  EXPECT_FALSE(pool_.InternalIsFileLoaded("message1.proto"));
-  const Descriptor* desc = file->FindMessageTypeByName("Lazy");
-  EXPECT_TRUE(desc != nullptr);
-  const FieldDescriptor* field = desc->FindFieldByName("message1");
-  EXPECT_TRUE(field != nullptr);
-  EXPECT_EQ(field->type(), FieldDescriptor::TYPE_MESSAGE);
-  EXPECT_TRUE(pool_.InternalIsFileLoaded("message1.proto"));
-
-  // Verify calling cpp_type() on a field that is a message type will
-  // build the type defined in another file.
-  EXPECT_FALSE(pool_.InternalIsFileLoaded("message2.proto"));
-  field = desc->FindFieldByName("message2");
-  EXPECT_TRUE(field != nullptr);
-  EXPECT_EQ(field->cpp_type(), FieldDescriptor::CPPTYPE_MESSAGE);
-  EXPECT_TRUE(pool_.InternalIsFileLoaded("message2.proto"));
-
-  // Verify calling type() on a field that is an enum type will
-  // build the type defined in another file.
-  EXPECT_FALSE(pool_.InternalIsFileLoaded("enum1.proto"));
-  field = desc->FindFieldByName("enum1");
-  EXPECT_TRUE(field != nullptr);
-  EXPECT_EQ(field->type(), FieldDescriptor::TYPE_ENUM);
-  EXPECT_TRUE(pool_.InternalIsFileLoaded("enum1.proto"));
-
-  // Verify calling cpp_type() on a field that is an enum type will
-  // build the type defined in another file.
-  EXPECT_FALSE(pool_.InternalIsFileLoaded("enum2.proto"));
-  field = desc->FindFieldByName("enum2");
-  EXPECT_TRUE(field != nullptr);
-  EXPECT_EQ(field->cpp_type(), FieldDescriptor::CPPTYPE_ENUM);
-  EXPECT_TRUE(pool_.InternalIsFileLoaded("enum2.proto"));
-}
-
-TEST_F(LazilyBuildDependenciesTest, Extension) {
-  ParseProtoAndAddToDb(
-      "name: 'foo.proto' "
-      "package: 'protobuf_unittest' "
-      "dependency: 'bar.proto' "
-      "dependency: 'baz.proto' "
-      "extension { extendee: '.protobuf_unittest.Bar' name:'bar' number:11"
-      "            label:LABEL_OPTIONAL type_name:'.protobuf_unittest.Baz' }");
-  ParseProtoAndAddToDb(
-      "name: 'bar.proto' "
-      "package: 'protobuf_unittest' "
-      "message_type { "
-      "  name:'Bar' "
-      "  extension_range { start: 10 end: 20 }"
-      "}");
-  AddSimpleMessageProtoFileToDb("baz", "Baz");
-
-  // Verify none have been built yet.
-  EXPECT_FALSE(pool_.InternalIsFileLoaded("foo.proto"));
-  EXPECT_FALSE(pool_.InternalIsFileLoaded("bar.proto"));
-  EXPECT_FALSE(pool_.InternalIsFileLoaded("baz.proto"));
-
-  const FileDescriptor* file = pool_.FindFileByName("foo.proto");
-
-  // Verify foo.bar gets loaded, and bar.proto gets loaded
-  // to register the extension. baz.proto should not get loaded.
-  EXPECT_TRUE(file != nullptr);
-  EXPECT_TRUE(pool_.InternalIsFileLoaded("foo.proto"));
-  EXPECT_TRUE(pool_.InternalIsFileLoaded("bar.proto"));
-  EXPECT_FALSE(pool_.InternalIsFileLoaded("baz.proto"));
-}
-
-TEST_F(LazilyBuildDependenciesTest, Service) {
-  ParseProtoAndAddToDb(
-      "name: 'foo.proto' "
-      "package: 'protobuf_unittest' "
-      "dependency: 'message1.proto' "
-      "dependency: 'message2.proto' "
-      "dependency: 'message3.proto' "
-      "dependency: 'message4.proto' "
-      "service {"
-      "  name: 'LazyService'"
-      "  method { name: 'A' input_type:  '.protobuf_unittest.Message1' "
-      "                     output_type: '.protobuf_unittest.Message2' }"
-      "}");
-  AddSimpleMessageProtoFileToDb("message1", "Message1");
-  AddSimpleMessageProtoFileToDb("message2", "Message2");
-  AddSimpleMessageProtoFileToDb("message3", "Message3");
-  AddSimpleMessageProtoFileToDb("message4", "Message4");
-
-  const FileDescriptor* file = pool_.FindFileByName("foo.proto");
-
-  // Verify calling FindServiceByName or FindMethodByName doesn't build the
-  // files defining the input and output type, and input_type() and
-  // output_type() does indeed build the appropriate files.
-  const ServiceDescriptor* service = file->FindServiceByName("LazyService");
-  EXPECT_TRUE(service != nullptr);
-  const MethodDescriptor* method = service->FindMethodByName("A");
-  EXPECT_FALSE(pool_.InternalIsFileLoaded("message1.proto"));
-  EXPECT_FALSE(pool_.InternalIsFileLoaded("message2.proto"));
-  EXPECT_TRUE(method != nullptr);
-  EXPECT_TRUE(method->input_type() != nullptr);
-  EXPECT_TRUE(pool_.InternalIsFileLoaded("message1.proto"));
-  EXPECT_FALSE(pool_.InternalIsFileLoaded("message2.proto"));
-  EXPECT_TRUE(method->output_type() != nullptr);
-  EXPECT_TRUE(pool_.InternalIsFileLoaded("message2.proto"));
-}
-
-
-TEST_F(LazilyBuildDependenciesTest, GeneratedFile) {
-  // Most testing is done with custom pools with lazy dependencies forced on,
-  // do some sanity checking that lazy imports is on by default for the
-  // generated pool, and do custom options testing with generated to
-  // be able to use the GetExtension ids for the custom options.
-
-  // Verify none of the files are loaded yet.
-  EXPECT_FALSE(DescriptorPool::generated_pool()->InternalIsFileLoaded(
-      "google/protobuf/unittest_lazy_dependencies.proto"));
-  EXPECT_FALSE(DescriptorPool::generated_pool()->InternalIsFileLoaded(
-      "google/protobuf/unittest_lazy_dependencies_custom_option.proto"));
-  EXPECT_FALSE(DescriptorPool::generated_pool()->InternalIsFileLoaded(
-      "google/protobuf/unittest_lazy_dependencies_enum.proto"));
-
-  // Verify calling autogenerated function to get a descriptor in the base
-  // file will build that file but none of it's imports. This verifies that
-  // lazily_build_dependencies_ is set on the generated pool, and also that
-  // the generated function "descriptor()" doesn't somehow subvert the laziness
-  // by manually loading the dependencies or something.
-  EXPECT_TRUE(protobuf_unittest::lazy_imports::ImportedMessage::descriptor() !=
-              nullptr);
-  EXPECT_TRUE(DescriptorPool::generated_pool()->InternalIsFileLoaded(
-      "google/protobuf/unittest_lazy_dependencies.proto"));
-  EXPECT_FALSE(DescriptorPool::generated_pool()->InternalIsFileLoaded(
-      "google/protobuf/unittest_lazy_dependencies_custom_option.proto"));
-  EXPECT_FALSE(DescriptorPool::generated_pool()->InternalIsFileLoaded(
-      "google/protobuf/unittest_lazy_dependencies_enum.proto"));
-
-  // Verify custom options work when defined in an import that isn't loaded,
-  // and that a non-default value of a custom option doesn't load the file
-  // where that enum is defined.
-  const MessageOptions& options =
-      protobuf_unittest::lazy_imports::MessageCustomOption::descriptor()
-          ->options();
-  protobuf_unittest::lazy_imports::LazyEnum custom_option_value =
-      options.GetExtension(protobuf_unittest::lazy_imports::lazy_enum_option);
-
-  EXPECT_FALSE(DescriptorPool::generated_pool()->InternalIsFileLoaded(
-      "google/protobuf/unittest_lazy_dependencies_custom_option.proto"));
-  EXPECT_FALSE(DescriptorPool::generated_pool()->InternalIsFileLoaded(
-      "google/protobuf/unittest_lazy_dependencies_enum.proto"));
-  EXPECT_EQ(custom_option_value, protobuf_unittest::lazy_imports::LAZY_ENUM_1);
-
-  const MessageOptions& options2 =
-      protobuf_unittest::lazy_imports::MessageCustomOption2::descriptor()
-          ->options();
-  custom_option_value =
-      options2.GetExtension(protobuf_unittest::lazy_imports::lazy_enum_option);
-
-  EXPECT_FALSE(DescriptorPool::generated_pool()->InternalIsFileLoaded(
-      "google/protobuf/unittest_lazy_dependencies_custom_option.proto"));
-  EXPECT_FALSE(DescriptorPool::generated_pool()->InternalIsFileLoaded(
-      "google/protobuf/unittest_lazy_dependencies_enum.proto"));
-  EXPECT_EQ(custom_option_value, protobuf_unittest::lazy_imports::LAZY_ENUM_0);
-}
-
-TEST_F(LazilyBuildDependenciesTest, Dependency) {
-  ParseProtoAndAddToDb(
-      "name: 'foo.proto' "
-      "package: 'protobuf_unittest' "
-      "dependency: 'bar.proto' "
-      "message_type { "
-      "  name:'Foo' "
-      "  field { name:'bar' number:1 label:LABEL_OPTIONAL "
-      "type_name:'.protobuf_unittest.Bar' } "
-      "}");
-  ParseProtoAndAddToDb(
-      "name: 'bar.proto' "
-      "package: 'protobuf_unittest' "
-      "dependency: 'baz.proto' "
-      "message_type { "
-      "  name:'Bar' "
-      "  field { name:'baz' number:1 label:LABEL_OPTIONAL "
-      "type_name:'.protobuf_unittest.Baz' } "
-      "}");
-  AddSimpleMessageProtoFileToDb("baz", "Baz");
-
-  const FileDescriptor* foo_file = pool_.FindFileByName("foo.proto");
-  EXPECT_TRUE(foo_file != nullptr);
-  // As expected, requesting foo.proto shouldn't build it's dependencies
-  EXPECT_TRUE(pool_.InternalIsFileLoaded("foo.proto"));
-  EXPECT_FALSE(pool_.InternalIsFileLoaded("bar.proto"));
-  EXPECT_FALSE(pool_.InternalIsFileLoaded("baz.proto"));
-
-  // Verify calling dependency(N) will build the dependency, but
-  // not that file's dependencies.
-  const FileDescriptor* bar_file = foo_file->dependency(0);
-  EXPECT_TRUE(bar_file != nullptr);
-  EXPECT_TRUE(pool_.InternalIsFileLoaded("bar.proto"));
-  EXPECT_FALSE(pool_.InternalIsFileLoaded("baz.proto"));
-}
-
-// ===================================================================
-
-
-}  // namespace descriptor_unittest
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
diff --git a/libs/protobuf/src/google/protobuf/drop_unknown_fields_test.cc b/libs/protobuf/src/google/protobuf/drop_unknown_fields_test.cc
deleted file mode 100644
index 55c6b67..0000000
--- a/libs/protobuf/src/google/protobuf/drop_unknown_fields_test.cc
+++ /dev/null
@@ -1,83 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <memory>
-
-#include <google/protobuf/unittest_drop_unknown_fields.pb.h>
-#include <google/protobuf/dynamic_message.h>
-#include <google/protobuf/message_lite.h>
-#include <gtest/gtest.h>
-
-using unittest_drop_unknown_fields::Foo;
-using unittest_drop_unknown_fields::FooWithExtraFields;
-
-namespace google {
-namespace protobuf {
-
-TEST(DropUnknownFieldsTest, GeneratedMessage) {
-  FooWithExtraFields foo_with_extra_fields;
-  foo_with_extra_fields.set_int32_value(1);
-  foo_with_extra_fields.set_enum_value(FooWithExtraFields::MOO);
-  foo_with_extra_fields.set_extra_int32_value(2);
-
-  Foo foo;
-  ASSERT_TRUE(foo.ParseFromString(foo_with_extra_fields.SerializeAsString()));
-  EXPECT_EQ(1, foo.int32_value());
-  EXPECT_EQ(static_cast<int>(FooWithExtraFields::MOO),
-            static_cast<int>(foo.enum_value()));
-  EXPECT_FALSE(foo.GetReflection()->GetUnknownFields(foo).empty());
-
-  ASSERT_TRUE(foo_with_extra_fields.ParseFromString(foo.SerializeAsString()));
-  EXPECT_EQ(1, foo_with_extra_fields.int32_value());
-  EXPECT_EQ(FooWithExtraFields::MOO, foo_with_extra_fields.enum_value());
-  // The "extra_int32_value" field should not be lost.
-  EXPECT_EQ(2, foo_with_extra_fields.extra_int32_value());
-}
-
-TEST(DropUnknownFieldsTest, DynamicMessage) {
-  FooWithExtraFields foo_with_extra_fields;
-  foo_with_extra_fields.set_int32_value(1);
-  foo_with_extra_fields.set_enum_value(FooWithExtraFields::MOO);
-  foo_with_extra_fields.set_extra_int32_value(2);
-
-  DynamicMessageFactory factory;
-  std::unique_ptr<Message> foo(factory.GetPrototype(Foo::descriptor())->New());
-  ASSERT_TRUE(foo->ParseFromString(foo_with_extra_fields.SerializeAsString()));
-  EXPECT_FALSE(foo->GetReflection()->GetUnknownFields(*foo).empty());
-
-  ASSERT_TRUE(foo_with_extra_fields.ParseFromString(foo->SerializeAsString()));
-  EXPECT_EQ(1, foo_with_extra_fields.int32_value());
-  EXPECT_EQ(FooWithExtraFields::MOO, foo_with_extra_fields.enum_value());
-  // The "extra_int32_value" field should not be lost.
-  EXPECT_EQ(2, foo_with_extra_fields.extra_int32_value());
-}
-
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/duration.pb.cc b/libs/protobuf/src/google/protobuf/duration.pb.cc
deleted file mode 100644
index 72766bd..0000000
--- a/libs/protobuf/src/google/protobuf/duration.pb.cc
+++ /dev/null
@@ -1,307 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/protobuf/duration.proto
-
-#include <google/protobuf/duration.pb.h>
-
-#include <algorithm>
-
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/extension_set.h>
-#include <google/protobuf/wire_format_lite.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/generated_message_reflection.h>
-#include <google/protobuf/reflection_ops.h>
-#include <google/protobuf/wire_format.h>
-// @@protoc_insertion_point(includes)
-#include <google/protobuf/port_def.inc>
-
-PROTOBUF_PRAGMA_INIT_SEG
-
-namespace _pb = ::PROTOBUF_NAMESPACE_ID;
-namespace _pbi = _pb::internal;
-
-PROTOBUF_NAMESPACE_OPEN
-PROTOBUF_CONSTEXPR Duration::Duration(
-    ::_pbi::ConstantInitialized): _impl_{
-    /*decltype(_impl_.seconds_)*/int64_t{0}
-  , /*decltype(_impl_.nanos_)*/0
-  , /*decltype(_impl_._cached_size_)*/{}} {}
-struct DurationDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR DurationDefaultTypeInternal()
-      : _instance(::_pbi::ConstantInitialized{}) {}
-  ~DurationDefaultTypeInternal() {}
-  union {
-    Duration _instance;
-  };
-};
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 DurationDefaultTypeInternal _Duration_default_instance_;
-PROTOBUF_NAMESPACE_CLOSE
-static ::_pb::Metadata file_level_metadata_google_2fprotobuf_2fduration_2eproto[1];
-static constexpr ::_pb::EnumDescriptor const** file_level_enum_descriptors_google_2fprotobuf_2fduration_2eproto = nullptr;
-static constexpr ::_pb::ServiceDescriptor const** file_level_service_descriptors_google_2fprotobuf_2fduration_2eproto = nullptr;
-
-const uint32_t TableStruct_google_2fprotobuf_2fduration_2eproto::offsets[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = {
-  ~0u,  // no _has_bits_
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Duration, _internal_metadata_),
-  ~0u,  // no _extensions_
-  ~0u,  // no _oneof_case_
-  ~0u,  // no _weak_field_map_
-  ~0u,  // no _inlined_string_donated_
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Duration, _impl_.seconds_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Duration, _impl_.nanos_),
-};
-static const ::_pbi::MigrationSchema schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = {
-  { 0, -1, -1, sizeof(::PROTOBUF_NAMESPACE_ID::Duration)},
-};
-
-static const ::_pb::Message* const file_default_instances[] = {
-  &::PROTOBUF_NAMESPACE_ID::_Duration_default_instance_._instance,
-};
-
-const char descriptor_table_protodef_google_2fprotobuf_2fduration_2eproto[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) =
-  "\n\036google/protobuf/duration.proto\022\017google"
-  ".protobuf\"*\n\010Duration\022\017\n\007seconds\030\001 \001(\003\022\r"
-  "\n\005nanos\030\002 \001(\005B\203\001\n\023com.google.protobufB\rD"
-  "urationProtoP\001Z1google.golang.org/protob"
-  "uf/types/known/durationpb\370\001\001\242\002\003GPB\252\002\036Goo"
-  "gle.Protobuf.WellKnownTypesb\006proto3"
-  ;
-static ::_pbi::once_flag descriptor_table_google_2fprotobuf_2fduration_2eproto_once;
-const ::_pbi::DescriptorTable descriptor_table_google_2fprotobuf_2fduration_2eproto = {
-    false, false, 235, descriptor_table_protodef_google_2fprotobuf_2fduration_2eproto,
-    "google/protobuf/duration.proto",
-    &descriptor_table_google_2fprotobuf_2fduration_2eproto_once, nullptr, 0, 1,
-    schemas, file_default_instances, TableStruct_google_2fprotobuf_2fduration_2eproto::offsets,
-    file_level_metadata_google_2fprotobuf_2fduration_2eproto, file_level_enum_descriptors_google_2fprotobuf_2fduration_2eproto,
-    file_level_service_descriptors_google_2fprotobuf_2fduration_2eproto,
-};
-PROTOBUF_ATTRIBUTE_WEAK const ::_pbi::DescriptorTable* descriptor_table_google_2fprotobuf_2fduration_2eproto_getter() {
-  return &descriptor_table_google_2fprotobuf_2fduration_2eproto;
-}
-
-// Force running AddDescriptors() at dynamic initialization time.
-PROTOBUF_ATTRIBUTE_INIT_PRIORITY2 static ::_pbi::AddDescriptorsRunner dynamic_init_dummy_google_2fprotobuf_2fduration_2eproto(&descriptor_table_google_2fprotobuf_2fduration_2eproto);
-PROTOBUF_NAMESPACE_OPEN
-
-// ===================================================================
-
-class Duration::_Internal {
- public:
-};
-
-Duration::Duration(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                         bool is_message_owned)
-  : ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned) {
-  SharedCtor(arena, is_message_owned);
-  // @@protoc_insertion_point(arena_constructor:google.protobuf.Duration)
-}
-Duration::Duration(const Duration& from)
-  : ::PROTOBUF_NAMESPACE_ID::Message() {
-  Duration* const _this = this; (void)_this;
-  new (&_impl_) Impl_{
-      decltype(_impl_.seconds_){}
-    , decltype(_impl_.nanos_){}
-    , /*decltype(_impl_._cached_size_)*/{}};
-
-  _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-  ::memcpy(&_impl_.seconds_, &from._impl_.seconds_,
-    static_cast<size_t>(reinterpret_cast<char*>(&_impl_.nanos_) -
-    reinterpret_cast<char*>(&_impl_.seconds_)) + sizeof(_impl_.nanos_));
-  // @@protoc_insertion_point(copy_constructor:google.protobuf.Duration)
-}
-
-inline void Duration::SharedCtor(
-    ::_pb::Arena* arena, bool is_message_owned) {
-  (void)arena;
-  (void)is_message_owned;
-  new (&_impl_) Impl_{
-      decltype(_impl_.seconds_){int64_t{0}}
-    , decltype(_impl_.nanos_){0}
-    , /*decltype(_impl_._cached_size_)*/{}
-  };
-}
-
-Duration::~Duration() {
-  // @@protoc_insertion_point(destructor:google.protobuf.Duration)
-  if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) {
-  (void)arena;
-    return;
-  }
-  SharedDtor();
-}
-
-inline void Duration::SharedDtor() {
-  GOOGLE_DCHECK(GetArenaForAllocation() == nullptr);
-}
-
-void Duration::SetCachedSize(int size) const {
-  _impl_._cached_size_.Set(size);
-}
-
-void Duration::Clear() {
-// @@protoc_insertion_point(message_clear_start:google.protobuf.Duration)
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  ::memset(&_impl_.seconds_, 0, static_cast<size_t>(
-      reinterpret_cast<char*>(&_impl_.nanos_) -
-      reinterpret_cast<char*>(&_impl_.seconds_)) + sizeof(_impl_.nanos_));
-  _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>();
-}
-
-const char* Duration::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) {
-#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure
-  while (!ctx->Done(&ptr)) {
-    uint32_t tag;
-    ptr = ::_pbi::ReadTag(ptr, &tag);
-    switch (tag >> 3) {
-      // int64 seconds = 1;
-      case 1:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 8)) {
-          _impl_.seconds_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr);
-          CHK_(ptr);
-        } else
-          goto handle_unusual;
-        continue;
-      // int32 nanos = 2;
-      case 2:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 16)) {
-          _impl_.nanos_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr);
-          CHK_(ptr);
-        } else
-          goto handle_unusual;
-        continue;
-      default:
-        goto handle_unusual;
-    }  // switch
-  handle_unusual:
-    if ((tag == 0) || ((tag & 7) == 4)) {
-      CHK_(ptr);
-      ctx->SetLastTag(tag);
-      goto message_done;
-    }
-    ptr = UnknownFieldParse(
-        tag,
-        _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(),
-        ptr, ctx);
-    CHK_(ptr != nullptr);
-  }  // while
-message_done:
-  return ptr;
-failure:
-  ptr = nullptr;
-  goto message_done;
-#undef CHK_
-}
-
-uint8_t* Duration::_InternalSerialize(
-    uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.Duration)
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  // int64 seconds = 1;
-  if (this->_internal_seconds() != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteInt64ToArray(1, this->_internal_seconds(), target);
-  }
-
-  // int32 nanos = 2;
-  if (this->_internal_nanos() != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteInt32ToArray(2, this->_internal_nanos(), target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-        _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.Duration)
-  return target;
-}
-
-size_t Duration::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:google.protobuf.Duration)
-  size_t total_size = 0;
-
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // int64 seconds = 1;
-  if (this->_internal_seconds() != 0) {
-    total_size += ::_pbi::WireFormatLite::Int64SizePlusOne(this->_internal_seconds());
-  }
-
-  // int32 nanos = 2;
-  if (this->_internal_nanos() != 0) {
-    total_size += ::_pbi::WireFormatLite::Int32SizePlusOne(this->_internal_nanos());
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData Duration::_class_data_ = {
-    ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck,
-    Duration::MergeImpl
-};
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*Duration::GetClassData() const { return &_class_data_; }
-
-
-void Duration::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) {
-  auto* const _this = static_cast<Duration*>(&to_msg);
-  auto& from = static_cast<const Duration&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.Duration)
-  GOOGLE_DCHECK_NE(&from, _this);
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if (from._internal_seconds() != 0) {
-    _this->_internal_set_seconds(from._internal_seconds());
-  }
-  if (from._internal_nanos() != 0) {
-    _this->_internal_set_nanos(from._internal_nanos());
-  }
-  _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void Duration::CopyFrom(const Duration& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.Duration)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool Duration::IsInitialized() const {
-  return true;
-}
-
-void Duration::InternalSwap(Duration* other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  ::PROTOBUF_NAMESPACE_ID::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(Duration, _impl_.nanos_)
-      + sizeof(Duration::_impl_.nanos_)
-      - PROTOBUF_FIELD_OFFSET(Duration, _impl_.seconds_)>(
-          reinterpret_cast<char*>(&_impl_.seconds_),
-          reinterpret_cast<char*>(&other->_impl_.seconds_));
-}
-
-::PROTOBUF_NAMESPACE_ID::Metadata Duration::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_google_2fprotobuf_2fduration_2eproto_getter, &descriptor_table_google_2fprotobuf_2fduration_2eproto_once,
-      file_level_metadata_google_2fprotobuf_2fduration_2eproto[0]);
-}
-
-// @@protoc_insertion_point(namespace_scope)
-PROTOBUF_NAMESPACE_CLOSE
-PROTOBUF_NAMESPACE_OPEN
-template<> PROTOBUF_NOINLINE ::PROTOBUF_NAMESPACE_ID::Duration*
-Arena::CreateMaybeMessage< ::PROTOBUF_NAMESPACE_ID::Duration >(Arena* arena) {
-  return Arena::CreateMessageInternal< ::PROTOBUF_NAMESPACE_ID::Duration >(arena);
-}
-PROTOBUF_NAMESPACE_CLOSE
-
-// @@protoc_insertion_point(global_scope)
-#include <google/protobuf/port_undef.inc>
diff --git a/libs/protobuf/src/google/protobuf/duration.pb.h b/libs/protobuf/src/google/protobuf/duration.pb.h
deleted file mode 100644
index a5272c8..0000000
--- a/libs/protobuf/src/google/protobuf/duration.pb.h
+++ /dev/null
@@ -1,278 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/protobuf/duration.proto
-
-#ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fduration_2eproto
-#define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fduration_2eproto
-
-#include <limits>
-#include <string>
-
-#include <google/protobuf/port_def.inc>
-#if PROTOBUF_VERSION < 3021000
-#error This file was generated by a newer version of protoc which is
-#error incompatible with your Protocol Buffer headers. Please update
-#error your headers.
-#endif
-#if 3021012 < PROTOBUF_MIN_PROTOC_VERSION
-#error This file was generated by an older version of protoc which is
-#error incompatible with your Protocol Buffer headers. Please
-#error regenerate this file with a newer version of protoc.
-#endif
-
-#include <google/protobuf/port_undef.inc>
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/arena.h>
-#include <google/protobuf/arenastring.h>
-#include <google/protobuf/generated_message_util.h>
-#include <google/protobuf/metadata_lite.h>
-#include <google/protobuf/generated_message_reflection.h>
-#include <google/protobuf/message.h>
-#include <google/protobuf/repeated_field.h>  // IWYU pragma: export
-#include <google/protobuf/extension_set.h>  // IWYU pragma: export
-#include <google/protobuf/unknown_field_set.h>
-// @@protoc_insertion_point(includes)
-#include <google/protobuf/port_def.inc>
-#define PROTOBUF_INTERNAL_EXPORT_google_2fprotobuf_2fduration_2eproto PROTOBUF_EXPORT
-PROTOBUF_NAMESPACE_OPEN
-namespace internal {
-class AnyMetadata;
-}  // namespace internal
-PROTOBUF_NAMESPACE_CLOSE
-
-// Internal implementation detail -- do not use these members.
-struct PROTOBUF_EXPORT TableStruct_google_2fprotobuf_2fduration_2eproto {
-  static const uint32_t offsets[];
-};
-PROTOBUF_EXPORT extern const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable descriptor_table_google_2fprotobuf_2fduration_2eproto;
-PROTOBUF_NAMESPACE_OPEN
-class Duration;
-struct DurationDefaultTypeInternal;
-PROTOBUF_EXPORT extern DurationDefaultTypeInternal _Duration_default_instance_;
-PROTOBUF_NAMESPACE_CLOSE
-PROTOBUF_NAMESPACE_OPEN
-template<> PROTOBUF_EXPORT ::PROTOBUF_NAMESPACE_ID::Duration* Arena::CreateMaybeMessage<::PROTOBUF_NAMESPACE_ID::Duration>(Arena*);
-PROTOBUF_NAMESPACE_CLOSE
-PROTOBUF_NAMESPACE_OPEN
-
-// ===================================================================
-
-class PROTOBUF_EXPORT Duration final :
-    public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:google.protobuf.Duration) */ {
- public:
-  inline Duration() : Duration(nullptr) {}
-  ~Duration() override;
-  explicit PROTOBUF_CONSTEXPR Duration(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
-
-  Duration(const Duration& from);
-  Duration(Duration&& from) noexcept
-    : Duration() {
-    *this = ::std::move(from);
-  }
-
-  inline Duration& operator=(const Duration& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline Duration& operator=(Duration&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetOwningArena() == from.GetOwningArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetOwningArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const Duration& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const Duration* internal_default_instance() {
-    return reinterpret_cast<const Duration*>(
-               &_Duration_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    0;
-
-  friend void swap(Duration& a, Duration& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(Duration* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() != nullptr &&
-        GetOwningArena() == other->GetOwningArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() == other->GetOwningArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(Duration* other) {
-    if (other == this) return;
-    GOOGLE_DCHECK(GetOwningArena() == other->GetOwningArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  Duration* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<Duration>(arena);
-  }
-  using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
-  void CopyFrom(const Duration& from);
-  using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom( const Duration& from) {
-    Duration::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  uint8_t* _InternalSerialize(
-      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
-
-  private:
-  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
-  void SharedDtor();
-  void SetCachedSize(int size) const final;
-  void InternalSwap(Duration* other);
-
-  private:
-  friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
-  static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
-    return "google.protobuf.Duration";
-  }
-  protected:
-  explicit Duration(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                       bool is_message_owned = false);
-  public:
-
-  static const ClassData _class_data_;
-  const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*GetClassData() const final;
-
-  ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kSecondsFieldNumber = 1,
-    kNanosFieldNumber = 2,
-  };
-  // int64 seconds = 1;
-  void clear_seconds();
-  int64_t seconds() const;
-  void set_seconds(int64_t value);
-  private:
-  int64_t _internal_seconds() const;
-  void _internal_set_seconds(int64_t value);
-  public:
-
-  // int32 nanos = 2;
-  void clear_nanos();
-  int32_t nanos() const;
-  void set_nanos(int32_t value);
-  private:
-  int32_t _internal_nanos() const;
-  void _internal_set_nanos(int32_t value);
-  public:
-
-  // @@protoc_insertion_point(class_scope:google.protobuf.Duration)
- private:
-  class _Internal;
-
-  template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
-  typedef void InternalArenaConstructable_;
-  typedef void DestructorSkippable_;
-  struct Impl_ {
-    int64_t seconds_;
-    int32_t nanos_;
-    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_google_2fprotobuf_2fduration_2eproto;
-};
-// ===================================================================
-
-
-// ===================================================================
-
-#ifdef __GNUC__
-  #pragma GCC diagnostic push
-  #pragma GCC diagnostic ignored "-Wstrict-aliasing"
-#endif  // __GNUC__
-// Duration
-
-// int64 seconds = 1;
-inline void Duration::clear_seconds() {
-  _impl_.seconds_ = int64_t{0};
-}
-inline int64_t Duration::_internal_seconds() const {
-  return _impl_.seconds_;
-}
-inline int64_t Duration::seconds() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.Duration.seconds)
-  return _internal_seconds();
-}
-inline void Duration::_internal_set_seconds(int64_t value) {
-  
-  _impl_.seconds_ = value;
-}
-inline void Duration::set_seconds(int64_t value) {
-  _internal_set_seconds(value);
-  // @@protoc_insertion_point(field_set:google.protobuf.Duration.seconds)
-}
-
-// int32 nanos = 2;
-inline void Duration::clear_nanos() {
-  _impl_.nanos_ = 0;
-}
-inline int32_t Duration::_internal_nanos() const {
-  return _impl_.nanos_;
-}
-inline int32_t Duration::nanos() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.Duration.nanos)
-  return _internal_nanos();
-}
-inline void Duration::_internal_set_nanos(int32_t value) {
-  
-  _impl_.nanos_ = value;
-}
-inline void Duration::set_nanos(int32_t value) {
-  _internal_set_nanos(value);
-  // @@protoc_insertion_point(field_set:google.protobuf.Duration.nanos)
-}
-
-#ifdef __GNUC__
-  #pragma GCC diagnostic pop
-#endif  // __GNUC__
-
-// @@protoc_insertion_point(namespace_scope)
-
-PROTOBUF_NAMESPACE_CLOSE
-
-// @@protoc_insertion_point(global_scope)
-
-#include <google/protobuf/port_undef.inc>
-#endif  // GOOGLE_PROTOBUF_INCLUDED_GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fduration_2eproto
diff --git a/libs/protobuf/src/google/protobuf/duration.proto b/libs/protobuf/src/google/protobuf/duration.proto
deleted file mode 100644
index 81c3e36..0000000
--- a/libs/protobuf/src/google/protobuf/duration.proto
+++ /dev/null
@@ -1,116 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto3";
-
-package google.protobuf;
-
-option csharp_namespace = "Google.Protobuf.WellKnownTypes";
-option cc_enable_arenas = true;
-option go_package = "google.golang.org/protobuf/types/known/durationpb";
-option java_package = "com.google.protobuf";
-option java_outer_classname = "DurationProto";
-option java_multiple_files = true;
-option objc_class_prefix = "GPB";
-
-// A Duration represents a signed, fixed-length span of time represented
-// as a count of seconds and fractions of seconds at nanosecond
-// resolution. It is independent of any calendar and concepts like "day"
-// or "month". It is related to Timestamp in that the difference between
-// two Timestamp values is a Duration and it can be added or subtracted
-// from a Timestamp. Range is approximately +-10,000 years.
-//
-// # Examples
-//
-// Example 1: Compute Duration from two Timestamps in pseudo code.
-//
-//     Timestamp start = ...;
-//     Timestamp end = ...;
-//     Duration duration = ...;
-//
-//     duration.seconds = end.seconds - start.seconds;
-//     duration.nanos = end.nanos - start.nanos;
-//
-//     if (duration.seconds < 0 && duration.nanos > 0) {
-//       duration.seconds += 1;
-//       duration.nanos -= 1000000000;
-//     } else if (duration.seconds > 0 && duration.nanos < 0) {
-//       duration.seconds -= 1;
-//       duration.nanos += 1000000000;
-//     }
-//
-// Example 2: Compute Timestamp from Timestamp + Duration in pseudo code.
-//
-//     Timestamp start = ...;
-//     Duration duration = ...;
-//     Timestamp end = ...;
-//
-//     end.seconds = start.seconds + duration.seconds;
-//     end.nanos = start.nanos + duration.nanos;
-//
-//     if (end.nanos < 0) {
-//       end.seconds -= 1;
-//       end.nanos += 1000000000;
-//     } else if (end.nanos >= 1000000000) {
-//       end.seconds += 1;
-//       end.nanos -= 1000000000;
-//     }
-//
-// Example 3: Compute Duration from datetime.timedelta in Python.
-//
-//     td = datetime.timedelta(days=3, minutes=10)
-//     duration = Duration()
-//     duration.FromTimedelta(td)
-//
-// # JSON Mapping
-//
-// In JSON format, the Duration type is encoded as a string rather than an
-// object, where the string ends in the suffix "s" (indicating seconds) and
-// is preceded by the number of seconds, with nanoseconds expressed as
-// fractional seconds. For example, 3 seconds with 0 nanoseconds should be
-// encoded in JSON format as "3s", while 3 seconds and 1 nanosecond should
-// be expressed in JSON format as "3.000000001s", and 3 seconds and 1
-// microsecond should be expressed in JSON format as "3.000001s".
-//
-//
-message Duration {
-  // Signed seconds of the span of time. Must be from -315,576,000,000
-  // to +315,576,000,000 inclusive. Note: these bounds are computed from:
-  // 60 sec/min * 60 min/hr * 24 hr/day * 365.25 days/year * 10000 years
-  int64 seconds = 1;
-
-  // Signed fractions of a second at nanosecond resolution of the span
-  // of time. Durations less than one second are represented with a 0
-  // `seconds` field and a positive or negative `nanos` field. For durations
-  // of one second or more, a non-zero value for the `nanos` field must be
-  // of the same sign as the `seconds` field. Must be from -999,999,999
-  // to +999,999,999 inclusive.
-  int32 nanos = 2;
-}
diff --git a/libs/protobuf/src/google/protobuf/dynamic_message.cc b/libs/protobuf/src/google/protobuf/dynamic_message.cc
deleted file mode 100644
index 1c96ca2..0000000
--- a/libs/protobuf/src/google/protobuf/dynamic_message.cc
+++ /dev/null
@@ -1,826 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-//
-// DynamicMessage is implemented by constructing a data structure which
-// has roughly the same memory layout as a generated message would have.
-// Then, we use Reflection to implement our reflection interface.  All
-// the other operations we need to implement (e.g.  parsing, copying,
-// etc.) are already implemented in terms of Reflection, so the rest is
-// easy.
-//
-// The up side of this strategy is that it's very efficient.  We don't
-// need to use hash_maps or generic representations of fields.  The
-// down side is that this is a low-level memory management hack which
-// can be tricky to get right.
-//
-// As mentioned in the header, we only expose a DynamicMessageFactory
-// publicly, not the DynamicMessage class itself.  This is because
-// GenericMessageReflection wants to have a pointer to a "default"
-// copy of the class, with all fields initialized to their default
-// values.  We only want to construct one of these per message type,
-// so DynamicMessageFactory stores a cache of default messages for
-// each type it sees (each unique Descriptor pointer).  The code
-// refers to the "default" copy of the class as the "prototype".
-//
-// Note on memory allocation:  This module often calls "operator new()"
-// to allocate untyped memory, rather than calling something like
-// "new uint8_t[]".  This is because "operator new()" means "Give me some
-// space which I can use as I please." while "new uint8_t[]" means "Give
-// me an array of 8-bit integers.".  In practice, the later may return
-// a pointer that is not aligned correctly for general use.  I believe
-// Item 8 of "More Effective C++" discusses this in more detail, though
-// I don't have the book on me right now so I'm not sure.
-
-#include <google/protobuf/dynamic_message.h>
-
-#include <algorithm>
-#include <cstddef>
-#include <memory>
-#include <new>
-#include <unordered_map>
-
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/descriptor.pb.h>
-#include <google/protobuf/generated_message_reflection.h>
-#include <google/protobuf/generated_message_util.h>
-#include <google/protobuf/unknown_field_set.h>
-#include <google/protobuf/stubs/hash.h>
-#include <google/protobuf/arenastring.h>
-#include <google/protobuf/extension_set.h>
-#include <google/protobuf/map_field.h>
-#include <google/protobuf/map_field_inl.h>
-#include <google/protobuf/map_type_handler.h>
-#include <google/protobuf/reflection_ops.h>
-#include <google/protobuf/repeated_field.h>
-#include <google/protobuf/wire_format.h>
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-
-using internal::DynamicMapField;
-using internal::ExtensionSet;
-using internal::MapField;
-
-
-using internal::ArenaStringPtr;
-
-// ===================================================================
-// Some helper tables and functions...
-
-namespace {
-
-bool IsMapFieldInApi(const FieldDescriptor* field) { return field->is_map(); }
-
-// Sync with helpers.h.
-inline bool HasHasbit(const FieldDescriptor* field) {
-  // This predicate includes proto3 message fields only if they have "optional".
-  //   Foo submsg1 = 1;           // HasHasbit() == false
-  //   optional Foo submsg2 = 2;  // HasHasbit() == true
-  // This is slightly odd, as adding "optional" to a singular proto3 field does
-  // not change the semantics or API. However whenever any field in a message
-  // has a hasbit, it forces reflection to include hasbit offsets for *all*
-  // fields, even if almost all of them are set to -1 (no hasbit). So to avoid
-  // causing a sudden size regression for ~all proto3 messages, we give proto3
-  // message fields a hasbit only if "optional" is present. If the user is
-  // explicitly writing "optional", it is likely they are writing it on
-  // primitive fields also.
-  return (field->has_optional_keyword() || field->is_required()) &&
-         !field->options().weak();
-}
-
-inline bool InRealOneof(const FieldDescriptor* field) {
-  return field->containing_oneof() &&
-         !field->containing_oneof()->is_synthetic();
-}
-
-// Compute the byte size of the in-memory representation of the field.
-int FieldSpaceUsed(const FieldDescriptor* field) {
-  typedef FieldDescriptor FD;  // avoid line wrapping
-  if (field->label() == FD::LABEL_REPEATED) {
-    switch (field->cpp_type()) {
-      case FD::CPPTYPE_INT32:
-        return sizeof(RepeatedField<int32_t>);
-      case FD::CPPTYPE_INT64:
-        return sizeof(RepeatedField<int64_t>);
-      case FD::CPPTYPE_UINT32:
-        return sizeof(RepeatedField<uint32_t>);
-      case FD::CPPTYPE_UINT64:
-        return sizeof(RepeatedField<uint64_t>);
-      case FD::CPPTYPE_DOUBLE:
-        return sizeof(RepeatedField<double>);
-      case FD::CPPTYPE_FLOAT:
-        return sizeof(RepeatedField<float>);
-      case FD::CPPTYPE_BOOL:
-        return sizeof(RepeatedField<bool>);
-      case FD::CPPTYPE_ENUM:
-        return sizeof(RepeatedField<int>);
-      case FD::CPPTYPE_MESSAGE:
-        if (IsMapFieldInApi(field)) {
-          return sizeof(DynamicMapField);
-        } else {
-          return sizeof(RepeatedPtrField<Message>);
-        }
-
-      case FD::CPPTYPE_STRING:
-        switch (field->options().ctype()) {
-          default:  // TODO(kenton):  Support other string reps.
-          case FieldOptions::STRING:
-            return sizeof(RepeatedPtrField<std::string>);
-        }
-        break;
-    }
-  } else {
-    switch (field->cpp_type()) {
-      case FD::CPPTYPE_INT32:
-        return sizeof(int32_t);
-      case FD::CPPTYPE_INT64:
-        return sizeof(int64_t);
-      case FD::CPPTYPE_UINT32:
-        return sizeof(uint32_t);
-      case FD::CPPTYPE_UINT64:
-        return sizeof(uint64_t);
-      case FD::CPPTYPE_DOUBLE:
-        return sizeof(double);
-      case FD::CPPTYPE_FLOAT:
-        return sizeof(float);
-      case FD::CPPTYPE_BOOL:
-        return sizeof(bool);
-      case FD::CPPTYPE_ENUM:
-        return sizeof(int);
-
-      case FD::CPPTYPE_MESSAGE:
-        return sizeof(Message*);
-
-      case FD::CPPTYPE_STRING:
-        switch (field->options().ctype()) {
-          default:  // TODO(kenton):  Support other string reps.
-          case FieldOptions::STRING:
-            return sizeof(ArenaStringPtr);
-        }
-        break;
-    }
-  }
-
-  GOOGLE_LOG(DFATAL) << "Can't get here.";
-  return 0;
-}
-
-inline int DivideRoundingUp(int i, int j) { return (i + (j - 1)) / j; }
-
-static const int kSafeAlignment = sizeof(uint64_t);
-static const int kMaxOneofUnionSize = sizeof(uint64_t);
-
-inline int AlignTo(int offset, int alignment) {
-  return DivideRoundingUp(offset, alignment) * alignment;
-}
-
-// Rounds the given byte offset up to the next offset aligned such that any
-// type may be stored at it.
-inline int AlignOffset(int offset) { return AlignTo(offset, kSafeAlignment); }
-
-#define bitsizeof(T) (sizeof(T) * 8)
-
-}  // namespace
-
-// ===================================================================
-
-class DynamicMessage : public Message {
- public:
-  explicit DynamicMessage(const DynamicMessageFactory::TypeInfo* type_info);
-
-  // This should only be used by GetPrototypeNoLock() to avoid dead lock.
-  DynamicMessage(DynamicMessageFactory::TypeInfo* type_info, bool lock_factory);
-
-  ~DynamicMessage() override;
-
-  // Called on the prototype after construction to initialize message fields.
-  // Cross linking the default instances allows for fast reflection access of
-  // unset message fields. Without it we would have to go to the MessageFactory
-  // to get the prototype, which is a much more expensive operation.
-  //
-  // Generated messages do not cross-link to avoid dynamic initialization of the
-  // global instances.
-  // Instead, they keep the default instances in the FieldDescriptor objects.
-  void CrossLinkPrototypes();
-
-  // implements Message ----------------------------------------------
-
-  Message* New(Arena* arena) const override;
-
-  int GetCachedSize() const override;
-  void SetCachedSize(int size) const override;
-
-  Metadata GetMetadata() const override;
-
-#if defined(__cpp_lib_destroying_delete) && defined(__cpp_sized_deallocation)
-  static void operator delete(DynamicMessage* msg, std::destroying_delete_t);
-#else
-  // We actually allocate more memory than sizeof(*this) when this
-  // class's memory is allocated via the global operator new. Thus, we need to
-  // manually call the global operator delete. Calling the destructor is taken
-  // care of for us. This makes DynamicMessage compatible with -fsized-delete.
-  // It doesn't work for MSVC though.
-#ifndef _MSC_VER
-  static void operator delete(void* ptr) { ::operator delete(ptr); }
-#endif  // !_MSC_VER
-#endif
-
- private:
-  DynamicMessage(const DynamicMessageFactory::TypeInfo* type_info,
-                 Arena* arena);
-
-  void SharedCtor(bool lock_factory);
-
-  // Needed to get the offset of the internal metadata member.
-  friend class DynamicMessageFactory;
-
-  bool is_prototype() const;
-
-  inline void* OffsetToPointer(int offset) {
-    return reinterpret_cast<uint8_t*>(this) + offset;
-  }
-  inline const void* OffsetToPointer(int offset) const {
-    return reinterpret_cast<const uint8_t*>(this) + offset;
-  }
-
-  void* MutableRaw(int i);
-  void* MutableExtensionsRaw();
-  void* MutableWeakFieldMapRaw();
-  void* MutableOneofCaseRaw(int i);
-  void* MutableOneofFieldRaw(const FieldDescriptor* f);
-
-  const DynamicMessageFactory::TypeInfo* type_info_;
-  mutable std::atomic<int> cached_byte_size_;
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(DynamicMessage);
-};
-
-struct DynamicMessageFactory::TypeInfo {
-  int size;
-  int has_bits_offset;
-  int oneof_case_offset;
-  int extensions_offset;
-
-  // Not owned by the TypeInfo.
-  DynamicMessageFactory* factory;  // The factory that created this object.
-  const DescriptorPool* pool;      // The factory's DescriptorPool.
-  const Descriptor* type;          // Type of this DynamicMessage.
-
-  // Warning:  The order in which the following pointers are defined is
-  //   important (the prototype must be deleted *before* the offsets).
-  std::unique_ptr<uint32_t[]> offsets;
-  std::unique_ptr<uint32_t[]> has_bits_indices;
-  std::unique_ptr<const Reflection> reflection;
-  // Don't use a unique_ptr to hold the prototype: the destructor for
-  // DynamicMessage needs to know whether it is the prototype, and does so by
-  // looking back at this field. This would assume details about the
-  // implementation of unique_ptr.
-  const DynamicMessage* prototype;
-  int weak_field_map_offset;  // The offset for the weak_field_map;
-
-  TypeInfo() : prototype(nullptr) {}
-
-  ~TypeInfo() { delete prototype; }
-};
-
-DynamicMessage::DynamicMessage(const DynamicMessageFactory::TypeInfo* type_info)
-    : type_info_(type_info), cached_byte_size_(0) {
-  SharedCtor(true);
-}
-
-DynamicMessage::DynamicMessage(const DynamicMessageFactory::TypeInfo* type_info,
-                               Arena* arena)
-    : Message(arena), type_info_(type_info), cached_byte_size_(0) {
-  SharedCtor(true);
-}
-
-DynamicMessage::DynamicMessage(DynamicMessageFactory::TypeInfo* type_info,
-                               bool lock_factory)
-    : type_info_(type_info), cached_byte_size_(0) {
-  // The prototype in type_info has to be set before creating the prototype
-  // instance on memory. e.g., message Foo { map<int32_t, Foo> a = 1; }. When
-  // creating prototype for Foo, prototype of the map entry will also be
-  // created, which needs the address of the prototype of Foo (the value in
-  // map). To break the cyclic dependency, we have to assign the address of
-  // prototype into type_info first.
-  type_info->prototype = this;
-  SharedCtor(lock_factory);
-}
-
-inline void* DynamicMessage::MutableRaw(int i) {
-  return OffsetToPointer(type_info_->offsets[i]);
-}
-inline void* DynamicMessage::MutableExtensionsRaw() {
-  return OffsetToPointer(type_info_->extensions_offset);
-}
-inline void* DynamicMessage::MutableWeakFieldMapRaw() {
-  return OffsetToPointer(type_info_->weak_field_map_offset);
-}
-inline void* DynamicMessage::MutableOneofCaseRaw(int i) {
-  return OffsetToPointer(type_info_->oneof_case_offset + sizeof(uint32_t) * i);
-}
-inline void* DynamicMessage::MutableOneofFieldRaw(const FieldDescriptor* f) {
-  return OffsetToPointer(type_info_->offsets[type_info_->type->field_count() +
-                                             f->containing_oneof()->index()]);
-}
-
-void DynamicMessage::SharedCtor(bool lock_factory) {
-  // We need to call constructors for various fields manually and set
-  // default values where appropriate.  We use placement new to call
-  // constructors.  If you haven't heard of placement new, I suggest Googling
-  // it now.  We use placement new even for primitive types that don't have
-  // constructors for consistency.  (In theory, placement new should be used
-  // any time you are trying to convert untyped memory to typed memory, though
-  // in practice that's not strictly necessary for types that don't have a
-  // constructor.)
-
-  const Descriptor* descriptor = type_info_->type;
-  // Initialize oneof cases.
-  int oneof_count = 0;
-  for (int i = 0; i < descriptor->oneof_decl_count(); ++i) {
-    if (descriptor->oneof_decl(i)->is_synthetic()) continue;
-    new (MutableOneofCaseRaw(oneof_count++)) uint32_t{0};
-  }
-
-  if (type_info_->extensions_offset != -1) {
-    new (MutableExtensionsRaw()) ExtensionSet(GetArenaForAllocation());
-  }
-  for (int i = 0; i < descriptor->field_count(); i++) {
-    const FieldDescriptor* field = descriptor->field(i);
-    void* field_ptr = MutableRaw(i);
-    if (InRealOneof(field)) {
-      continue;
-    }
-    switch (field->cpp_type()) {
-#define HANDLE_TYPE(CPPTYPE, TYPE)                                  \
-  case FieldDescriptor::CPPTYPE_##CPPTYPE:                          \
-    if (!field->is_repeated()) {                                    \
-      new (field_ptr) TYPE(field->default_value_##TYPE());          \
-    } else {                                                        \
-      new (field_ptr) RepeatedField<TYPE>(GetArenaForAllocation()); \
-    }                                                               \
-    break;
-
-      HANDLE_TYPE(INT32, int32_t);
-      HANDLE_TYPE(INT64, int64_t);
-      HANDLE_TYPE(UINT32, uint32_t);
-      HANDLE_TYPE(UINT64, uint64_t);
-      HANDLE_TYPE(DOUBLE, double);
-      HANDLE_TYPE(FLOAT, float);
-      HANDLE_TYPE(BOOL, bool);
-#undef HANDLE_TYPE
-
-      case FieldDescriptor::CPPTYPE_ENUM:
-        if (!field->is_repeated()) {
-          new (field_ptr) int{field->default_value_enum()->number()};
-        } else {
-          new (field_ptr) RepeatedField<int>(GetArenaForAllocation());
-        }
-        break;
-
-      case FieldDescriptor::CPPTYPE_STRING:
-        switch (field->options().ctype()) {
-          default:  // TODO(kenton):  Support other string reps.
-          case FieldOptions::STRING:
-            if (!field->is_repeated()) {
-              ArenaStringPtr* asp = new (field_ptr) ArenaStringPtr();
-              asp->InitDefault();
-            } else {
-              new (field_ptr)
-                  RepeatedPtrField<std::string>(GetArenaForAllocation());
-            }
-            break;
-        }
-        break;
-
-      case FieldDescriptor::CPPTYPE_MESSAGE: {
-        if (!field->is_repeated()) {
-          new (field_ptr) Message*(nullptr);
-        } else {
-          if (IsMapFieldInApi(field)) {
-            // We need to lock in most cases to avoid data racing. Only not lock
-            // when the constructor is called inside GetPrototype(), in which
-            // case we have already locked the factory.
-            if (lock_factory) {
-              if (GetArenaForAllocation() != nullptr) {
-                new (field_ptr) DynamicMapField(
-                    type_info_->factory->GetPrototype(field->message_type()),
-                    GetArenaForAllocation());
-                if (GetOwningArena() != nullptr) {
-                  // Needs to destroy the mutex member.
-                  GetOwningArena()->OwnDestructor(
-                      static_cast<DynamicMapField*>(field_ptr));
-                }
-              } else {
-                new (field_ptr) DynamicMapField(
-                    type_info_->factory->GetPrototype(field->message_type()));
-              }
-            } else {
-              if (GetArenaForAllocation() != nullptr) {
-                new (field_ptr)
-                    DynamicMapField(type_info_->factory->GetPrototypeNoLock(
-                                        field->message_type()),
-                                    GetArenaForAllocation());
-                if (GetOwningArena() != nullptr) {
-                  // Needs to destroy the mutex member.
-                  GetOwningArena()->OwnDestructor(
-                      static_cast<DynamicMapField*>(field_ptr));
-                }
-              } else {
-                new (field_ptr)
-                    DynamicMapField(type_info_->factory->GetPrototypeNoLock(
-                        field->message_type()));
-              }
-            }
-          } else {
-            new (field_ptr) RepeatedPtrField<Message>(GetArenaForAllocation());
-          }
-        }
-        break;
-      }
-    }
-  }
-}
-
-bool DynamicMessage::is_prototype() const {
-  return type_info_->prototype == this ||
-         // If type_info_->prototype is nullptr, then we must be constructing
-         // the prototype now, which means we must be the prototype.
-         type_info_->prototype == nullptr;
-}
-
-#if defined(__cpp_lib_destroying_delete) && defined(__cpp_sized_deallocation)
-void DynamicMessage::operator delete(DynamicMessage* msg,
-                                     std::destroying_delete_t) {
-  const size_t size = msg->type_info_->size;
-  msg->~DynamicMessage();
-  ::operator delete(msg, size);
-}
-#endif
-
-DynamicMessage::~DynamicMessage() {
-  const Descriptor* descriptor = type_info_->type;
-
-  _internal_metadata_.Delete<UnknownFieldSet>();
-
-  if (type_info_->extensions_offset != -1) {
-    reinterpret_cast<ExtensionSet*>(MutableExtensionsRaw())->~ExtensionSet();
-  }
-
-  // We need to manually run the destructors for repeated fields and strings,
-  // just as we ran their constructors in the DynamicMessage constructor.
-  // We also need to manually delete oneof fields if it is set and is string
-  // or message.
-  // Additionally, if any singular embedded messages have been allocated, we
-  // need to delete them, UNLESS we are the prototype message of this type,
-  // in which case any embedded messages are other prototypes and shouldn't
-  // be touched.
-  for (int i = 0; i < descriptor->field_count(); i++) {
-    const FieldDescriptor* field = descriptor->field(i);
-    if (InRealOneof(field)) {
-      void* field_ptr = MutableOneofCaseRaw(field->containing_oneof()->index());
-      if (*(reinterpret_cast<const int32_t*>(field_ptr)) == field->number()) {
-        field_ptr = MutableOneofFieldRaw(field);
-        if (field->cpp_type() == FieldDescriptor::CPPTYPE_STRING) {
-          switch (field->options().ctype()) {
-            default:
-            case FieldOptions::STRING: {
-              reinterpret_cast<ArenaStringPtr*>(field_ptr)->Destroy();
-              break;
-            }
-          }
-        } else if (field->cpp_type() == FieldDescriptor::CPPTYPE_MESSAGE) {
-            delete *reinterpret_cast<Message**>(field_ptr);
-        }
-      }
-      continue;
-    }
-    void* field_ptr = MutableRaw(i);
-
-    if (field->is_repeated()) {
-      switch (field->cpp_type()) {
-#define HANDLE_TYPE(UPPERCASE, LOWERCASE)                  \
-  case FieldDescriptor::CPPTYPE_##UPPERCASE:               \
-    reinterpret_cast<RepeatedField<LOWERCASE>*>(field_ptr) \
-        ->~RepeatedField<LOWERCASE>();                     \
-    break
-
-        HANDLE_TYPE(INT32, int32_t);
-        HANDLE_TYPE(INT64, int64_t);
-        HANDLE_TYPE(UINT32, uint32_t);
-        HANDLE_TYPE(UINT64, uint64_t);
-        HANDLE_TYPE(DOUBLE, double);
-        HANDLE_TYPE(FLOAT, float);
-        HANDLE_TYPE(BOOL, bool);
-        HANDLE_TYPE(ENUM, int);
-#undef HANDLE_TYPE
-
-        case FieldDescriptor::CPPTYPE_STRING:
-          switch (field->options().ctype()) {
-            default:  // TODO(kenton):  Support other string reps.
-            case FieldOptions::STRING:
-              reinterpret_cast<RepeatedPtrField<std::string>*>(field_ptr)
-                  ->~RepeatedPtrField<std::string>();
-              break;
-          }
-          break;
-
-        case FieldDescriptor::CPPTYPE_MESSAGE:
-          if (IsMapFieldInApi(field)) {
-            reinterpret_cast<DynamicMapField*>(field_ptr)->~DynamicMapField();
-          } else {
-            reinterpret_cast<RepeatedPtrField<Message>*>(field_ptr)
-                ->~RepeatedPtrField<Message>();
-          }
-          break;
-      }
-
-    } else if (field->cpp_type() == FieldDescriptor::CPPTYPE_STRING) {
-      switch (field->options().ctype()) {
-        default:  // TODO(kenton):  Support other string reps.
-        case FieldOptions::STRING: {
-          reinterpret_cast<ArenaStringPtr*>(field_ptr)->Destroy();
-          break;
-        }
-      }
-    } else if (field->cpp_type() == FieldDescriptor::CPPTYPE_MESSAGE) {
-          if (!is_prototype()) {
-        Message* message = *reinterpret_cast<Message**>(field_ptr);
-        if (message != nullptr) {
-          delete message;
-        }
-      }
-    }
-  }
-}
-
-void DynamicMessage::CrossLinkPrototypes() {
-  // This should only be called on the prototype message.
-  GOOGLE_CHECK(is_prototype());
-
-  DynamicMessageFactory* factory = type_info_->factory;
-  const Descriptor* descriptor = type_info_->type;
-
-  // Cross-link default messages.
-  for (int i = 0; i < descriptor->field_count(); i++) {
-    const FieldDescriptor* field = descriptor->field(i);
-    if (field->cpp_type() == FieldDescriptor::CPPTYPE_MESSAGE &&
-        !field->options().weak() && !InRealOneof(field) &&
-        !field->is_repeated()) {
-      void* field_ptr = MutableRaw(i);
-      // For fields with message types, we need to cross-link with the
-      // prototype for the field's type.
-      // For singular fields, the field is just a pointer which should
-      // point to the prototype.
-      *reinterpret_cast<const Message**>(field_ptr) =
-          factory->GetPrototypeNoLock(field->message_type());
-    }
-  }
-}
-
-Message* DynamicMessage::New(Arena* arena) const {
-  if (arena != nullptr) {
-    void* new_base = Arena::CreateArray<char>(arena, type_info_->size);
-    memset(new_base, 0, type_info_->size);
-    return new (new_base) DynamicMessage(type_info_, arena);
-  } else {
-    void* new_base = operator new(type_info_->size);
-    memset(new_base, 0, type_info_->size);
-    return new (new_base) DynamicMessage(type_info_);
-  }
-}
-
-int DynamicMessage::GetCachedSize() const {
-  return cached_byte_size_.load(std::memory_order_relaxed);
-}
-
-void DynamicMessage::SetCachedSize(int size) const {
-  cached_byte_size_.store(size, std::memory_order_relaxed);
-}
-
-Metadata DynamicMessage::GetMetadata() const {
-  Metadata metadata;
-  metadata.descriptor = type_info_->type;
-  metadata.reflection = type_info_->reflection.get();
-  return metadata;
-}
-
-// ===================================================================
-
-DynamicMessageFactory::DynamicMessageFactory()
-    : pool_(nullptr), delegate_to_generated_factory_(false) {}
-
-DynamicMessageFactory::DynamicMessageFactory(const DescriptorPool* pool)
-    : pool_(pool), delegate_to_generated_factory_(false) {}
-
-DynamicMessageFactory::~DynamicMessageFactory() {
-  for (auto iter = prototypes_.begin(); iter != prototypes_.end(); ++iter) {
-    delete iter->second;
-  }
-}
-
-const Message* DynamicMessageFactory::GetPrototype(const Descriptor* type) {
-  MutexLock lock(&prototypes_mutex_);
-  return GetPrototypeNoLock(type);
-}
-
-const Message* DynamicMessageFactory::GetPrototypeNoLock(
-    const Descriptor* type) {
-  if (delegate_to_generated_factory_ &&
-      type->file()->pool() == DescriptorPool::generated_pool()) {
-    return MessageFactory::generated_factory()->GetPrototype(type);
-  }
-
-  const TypeInfo** target = &prototypes_[type];
-  if (*target != nullptr) {
-    // Already exists.
-    return (*target)->prototype;
-  }
-
-  TypeInfo* type_info = new TypeInfo;
-  *target = type_info;
-
-  type_info->type = type;
-  type_info->pool = (pool_ == nullptr) ? type->file()->pool() : pool_;
-  type_info->factory = this;
-
-  // We need to construct all the structures passed to Reflection's constructor.
-  // This includes:
-  // - A block of memory that contains space for all the message's fields.
-  // - An array of integers indicating the byte offset of each field within
-  //   this block.
-  // - A big bitfield containing a bit for each field indicating whether
-  //   or not that field is set.
-  int real_oneof_count = 0;
-  for (int i = 0; i < type->oneof_decl_count(); i++) {
-    if (!type->oneof_decl(i)->is_synthetic()) {
-      real_oneof_count++;
-    }
-  }
-
-  // Compute size and offsets.
-  uint32_t* offsets = new uint32_t[type->field_count() + real_oneof_count];
-  type_info->offsets.reset(offsets);
-
-  // Decide all field offsets by packing in order.
-  // We place the DynamicMessage object itself at the beginning of the allocated
-  // space.
-  int size = sizeof(DynamicMessage);
-  size = AlignOffset(size);
-
-  // Next the has_bits, which is an array of uint32s.
-  type_info->has_bits_offset = -1;
-  int max_hasbit = 0;
-  for (int i = 0; i < type->field_count(); i++) {
-    if (HasHasbit(type->field(i))) {
-      if (type_info->has_bits_offset == -1) {
-        // At least one field in the message requires a hasbit, so allocate
-        // hasbits.
-        type_info->has_bits_offset = size;
-        uint32_t* has_bits_indices = new uint32_t[type->field_count()];
-        for (int j = 0; j < type->field_count(); j++) {
-          // Initialize to -1, fields that need a hasbit will overwrite.
-          has_bits_indices[j] = static_cast<uint32_t>(-1);
-        }
-        type_info->has_bits_indices.reset(has_bits_indices);
-      }
-      type_info->has_bits_indices[i] = max_hasbit++;
-    }
-  }
-
-  if (max_hasbit > 0) {
-    int has_bits_array_size = DivideRoundingUp(max_hasbit, bitsizeof(uint32_t));
-    size += has_bits_array_size * sizeof(uint32_t);
-    size = AlignOffset(size);
-  }
-
-  // The oneof_case, if any. It is an array of uint32s.
-  if (real_oneof_count > 0) {
-    type_info->oneof_case_offset = size;
-    size += real_oneof_count * sizeof(uint32_t);
-    size = AlignOffset(size);
-  }
-
-  // The ExtensionSet, if any.
-  if (type->extension_range_count() > 0) {
-    type_info->extensions_offset = size;
-    size += sizeof(ExtensionSet);
-    size = AlignOffset(size);
-  } else {
-    // No extensions.
-    type_info->extensions_offset = -1;
-  }
-
-  // All the fields.
-  //
-  // TODO(b/31226269):  Optimize the order of fields to minimize padding.
-  for (int i = 0; i < type->field_count(); i++) {
-    // Make sure field is aligned to avoid bus errors.
-    // Oneof fields do not use any space.
-    if (!InRealOneof(type->field(i))) {
-      int field_size = FieldSpaceUsed(type->field(i));
-      size = AlignTo(size, std::min(kSafeAlignment, field_size));
-      offsets[i] = size;
-      size += field_size;
-    }
-  }
-
-  // The oneofs.
-  for (int i = 0; i < type->oneof_decl_count(); i++) {
-    if (!type->oneof_decl(i)->is_synthetic()) {
-      size = AlignTo(size, kSafeAlignment);
-      offsets[type->field_count() + i] = size;
-      size += kMaxOneofUnionSize;
-    }
-  }
-
-  type_info->weak_field_map_offset = -1;
-
-  // Align the final size to make sure no clever allocators think that
-  // alignment is not necessary.
-  type_info->size = size;
-
-  // Construct the reflection object.
-
-  // Compute the size of default oneof instance and offsets of default
-  // oneof fields.
-  for (int i = 0; i < type->oneof_decl_count(); i++) {
-    if (type->oneof_decl(i)->is_synthetic()) continue;
-    for (int j = 0; j < type->oneof_decl(i)->field_count(); j++) {
-      const FieldDescriptor* field = type->oneof_decl(i)->field(j);
-      // oneof fields are not accessed through offsets, but we still have the
-      // entry from a legacy implementation. This should be removed at some
-      // point.
-      // Mark the field to prevent unintentional access through reflection.
-      // Don't use the top bit because that is for unused fields.
-      offsets[field->index()] = internal::kInvalidFieldOffsetTag;
-    }
-  }
-
-  // Allocate the prototype fields.
-  void* base = operator new(size);
-  memset(base, 0, size);
-
-  // We have already locked the factory so we should not lock in the constructor
-  // of dynamic message to avoid dead lock.
-  DynamicMessage* prototype = new (base) DynamicMessage(type_info, false);
-
-  internal::ReflectionSchema schema = {
-      type_info->prototype,
-      type_info->offsets.get(),
-      type_info->has_bits_indices.get(),
-      type_info->has_bits_offset,
-      PROTOBUF_FIELD_OFFSET(DynamicMessage, _internal_metadata_),
-      type_info->extensions_offset,
-      type_info->oneof_case_offset,
-      type_info->size,
-      type_info->weak_field_map_offset,
-      nullptr /* inlined_string_indices_ */,
-      0 /* inlined_string_donated_offset_ */};
-
-  type_info->reflection.reset(
-      new Reflection(type_info->type, schema, type_info->pool, this));
-
-  // Cross link prototypes.
-  prototype->CrossLinkPrototypes();
-
-  return prototype;
-}
-
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>  // NOLINT
diff --git a/libs/protobuf/src/google/protobuf/dynamic_message.h b/libs/protobuf/src/google/protobuf/dynamic_message.h
deleted file mode 100644
index 6fa6425..0000000
--- a/libs/protobuf/src/google/protobuf/dynamic_message.h
+++ /dev/null
@@ -1,227 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-//
-// Defines an implementation of Message which can emulate types which are not
-// known at compile-time.
-
-#ifndef GOOGLE_PROTOBUF_DYNAMIC_MESSAGE_H__
-#define GOOGLE_PROTOBUF_DYNAMIC_MESSAGE_H__
-
-
-#include <algorithm>
-#include <memory>
-#include <unordered_map>
-#include <vector>
-
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/stubs/mutex.h>
-#include <google/protobuf/message.h>
-#include <google/protobuf/reflection.h>
-#include <google/protobuf/repeated_field.h>
-
-#ifdef SWIG
-#error "You cannot SWIG proto headers"
-#endif
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-
-// Defined in other files.
-class Descriptor;      // descriptor.h
-class DescriptorPool;  // descriptor.h
-
-// Constructs implementations of Message which can emulate types which are not
-// known at compile-time.
-//
-// Sometimes you want to be able to manipulate protocol types that you don't
-// know about at compile time.  It would be nice to be able to construct
-// a Message object which implements the message type given by any arbitrary
-// Descriptor.  DynamicMessage provides this.
-//
-// As it turns out, a DynamicMessage needs to construct extra
-// information about its type in order to operate.  Most of this information
-// can be shared between all DynamicMessages of the same type.  But, caching
-// this information in some sort of global map would be a bad idea, since
-// the cached information for a particular descriptor could outlive the
-// descriptor itself.  To avoid this problem, DynamicMessageFactory
-// encapsulates this "cache".  All DynamicMessages of the same type created
-// from the same factory will share the same support data.  Any Descriptors
-// used with a particular factory must outlive the factory.
-class PROTOBUF_EXPORT DynamicMessageFactory : public MessageFactory {
- public:
-  // Construct a DynamicMessageFactory that will search for extensions in
-  // the DescriptorPool in which the extendee is defined.
-  DynamicMessageFactory();
-
-  // Construct a DynamicMessageFactory that will search for extensions in
-  // the given DescriptorPool.
-  //
-  // DEPRECATED:  Use CodedInputStream::SetExtensionRegistry() to tell the
-  //   parser to look for extensions in an alternate pool.  However, note that
-  //   this is almost never what you want to do.  Almost all users should use
-  //   the zero-arg constructor.
-  DynamicMessageFactory(const DescriptorPool* pool);
-
-  ~DynamicMessageFactory() override;
-
-  // Call this to tell the DynamicMessageFactory that if it is given a
-  // Descriptor d for which:
-  //   d->file()->pool() == DescriptorPool::generated_pool(),
-  // then it should delegate to MessageFactory::generated_factory() instead
-  // of constructing a dynamic implementation of the message.  In theory there
-  // is no down side to doing this, so it may become the default in the future.
-  void SetDelegateToGeneratedFactory(bool enable) {
-    delegate_to_generated_factory_ = enable;
-  }
-
-  // implements MessageFactory ---------------------------------------
-
-  // Given a Descriptor, constructs the default (prototype) Message of that
-  // type.  You can then call that message's New() method to construct a
-  // mutable message of that type.
-  //
-  // Calling this method twice with the same Descriptor returns the same
-  // object.  The returned object remains property of the factory and will
-  // be destroyed when the factory is destroyed.  Also, any objects created
-  // by calling the prototype's New() method share some data with the
-  // prototype, so these must be destroyed before the DynamicMessageFactory
-  // is destroyed.
-  //
-  // The given descriptor must outlive the returned message, and hence must
-  // outlive the DynamicMessageFactory.
-  //
-  // The method is thread-safe.
-  const Message* GetPrototype(const Descriptor* type) override;
-
- private:
-  const DescriptorPool* pool_;
-  bool delegate_to_generated_factory_;
-
-  struct TypeInfo;
-  std::unordered_map<const Descriptor*, const TypeInfo*> prototypes_;
-  mutable internal::WrappedMutex prototypes_mutex_;
-
-  friend class DynamicMessage;
-  const Message* GetPrototypeNoLock(const Descriptor* type);
-
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(DynamicMessageFactory);
-};
-
-// Helper for computing a sorted list of map entries via reflection.
-class PROTOBUF_EXPORT DynamicMapSorter {
- public:
-  static std::vector<const Message*> Sort(const Message& message, int map_size,
-                                          const Reflection* reflection,
-                                          const FieldDescriptor* field) {
-    std::vector<const Message*> result;
-    result.reserve(map_size);
-    RepeatedFieldRef<Message> map_field =
-        reflection->GetRepeatedFieldRef<Message>(message, field);
-    for (auto it = map_field.begin(); it != map_field.end(); ++it) {
-      result.push_back(&*it);
-    }
-    MapEntryMessageComparator comparator(field->message_type());
-    std::stable_sort(result.begin(), result.end(), comparator);
-    // Complain if the keys aren't in ascending order.
-#ifndef NDEBUG
-    for (size_t j = 1; j < static_cast<size_t>(map_size); j++) {
-      if (!comparator(result[j - 1], result[j])) {
-        GOOGLE_LOG(ERROR) << (comparator(result[j], result[j - 1])
-                           ? "internal error in map key sorting"
-                           : "map keys are not unique");
-      }
-    }
-#endif
-    return result;
-  }
-
- private:
-  class PROTOBUF_EXPORT MapEntryMessageComparator {
-   public:
-    explicit MapEntryMessageComparator(const Descriptor* descriptor)
-        : field_(descriptor->field(0)) {}
-
-    bool operator()(const Message* a, const Message* b) {
-      const Reflection* reflection = a->GetReflection();
-      switch (field_->cpp_type()) {
-        case FieldDescriptor::CPPTYPE_BOOL: {
-          bool first = reflection->GetBool(*a, field_);
-          bool second = reflection->GetBool(*b, field_);
-          return first < second;
-        }
-        case FieldDescriptor::CPPTYPE_INT32: {
-          int32_t first = reflection->GetInt32(*a, field_);
-          int32_t second = reflection->GetInt32(*b, field_);
-          return first < second;
-        }
-        case FieldDescriptor::CPPTYPE_INT64: {
-          int64_t first = reflection->GetInt64(*a, field_);
-          int64_t second = reflection->GetInt64(*b, field_);
-          return first < second;
-        }
-        case FieldDescriptor::CPPTYPE_UINT32: {
-          uint32_t first = reflection->GetUInt32(*a, field_);
-          uint32_t second = reflection->GetUInt32(*b, field_);
-          return first < second;
-        }
-        case FieldDescriptor::CPPTYPE_UINT64: {
-          uint64_t first = reflection->GetUInt64(*a, field_);
-          uint64_t second = reflection->GetUInt64(*b, field_);
-          return first < second;
-        }
-        case FieldDescriptor::CPPTYPE_STRING: {
-          std::string first = reflection->GetString(*a, field_);
-          std::string second = reflection->GetString(*b, field_);
-          return first < second;
-        }
-        default:
-          GOOGLE_LOG(DFATAL) << "Invalid key for map field.";
-          return true;
-      }
-    }
-
-   private:
-    const FieldDescriptor* field_;
-  };
-};
-
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
-
-#endif  // GOOGLE_PROTOBUF_DYNAMIC_MESSAGE_H__
diff --git a/libs/protobuf/src/google/protobuf/dynamic_message_unittest.cc b/libs/protobuf/src/google/protobuf/dynamic_message_unittest.cc
deleted file mode 100644
index 7ac2029..0000000
--- a/libs/protobuf/src/google/protobuf/dynamic_message_unittest.cc
+++ /dev/null
@@ -1,327 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-//
-// Since the reflection interface for DynamicMessage is implemented by
-// GenericMessageReflection, the only thing we really have to test is
-// that DynamicMessage correctly sets up the information that
-// GenericMessageReflection needs to use.  So, we focus on that in this
-// test.  Other tests, such as generic_message_reflection_unittest and
-// reflection_ops_unittest, cover the rest of the functionality used by
-// DynamicMessage.
-
-#include <google/protobuf/dynamic_message.h>
-
-#include <memory>
-
-#include <google/protobuf/stubs/logging.h>
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/unittest.pb.h>
-#include <google/protobuf/unittest_no_field_presence.pb.h>
-#include <google/protobuf/descriptor.pb.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/testing/googletest.h>
-#include <gtest/gtest.h>
-#include <google/protobuf/test_util.h>
-
-namespace google {
-namespace protobuf {
-
-class DynamicMessageTest : public ::testing::TestWithParam<bool> {
- protected:
-  DescriptorPool pool_;
-  DynamicMessageFactory factory_;
-  const Descriptor* descriptor_;
-  const Message* prototype_;
-  const Descriptor* extensions_descriptor_;
-  const Message* extensions_prototype_;
-  const Descriptor* packed_descriptor_;
-  const Message* packed_prototype_;
-  const Descriptor* oneof_descriptor_;
-  const Message* oneof_prototype_;
-  const Descriptor* proto3_descriptor_;
-  const Message* proto3_prototype_;
-
-  DynamicMessageTest() : factory_(&pool_) {}
-
-  void SetUp() override {
-    // We want to make sure that DynamicMessage works (particularly with
-    // extensions) even if we use descriptors that are *not* from compiled-in
-    // types, so we make copies of the descriptors for unittest.proto and
-    // unittest_import.proto.
-    FileDescriptorProto unittest_file;
-    FileDescriptorProto unittest_import_file;
-    FileDescriptorProto unittest_import_public_file;
-    FileDescriptorProto unittest_no_field_presence_file;
-
-    unittest::TestAllTypes::descriptor()->file()->CopyTo(&unittest_file);
-    unittest_import::ImportMessage::descriptor()->file()->CopyTo(
-        &unittest_import_file);
-    unittest_import::PublicImportMessage::descriptor()->file()->CopyTo(
-        &unittest_import_public_file);
-    proto2_nofieldpresence_unittest::TestAllTypes::descriptor()->file()->CopyTo(
-        &unittest_no_field_presence_file);
-
-    ASSERT_TRUE(pool_.BuildFile(unittest_import_public_file) != nullptr);
-    ASSERT_TRUE(pool_.BuildFile(unittest_import_file) != nullptr);
-    ASSERT_TRUE(pool_.BuildFile(unittest_file) != nullptr);
-    ASSERT_TRUE(pool_.BuildFile(unittest_no_field_presence_file) != nullptr);
-
-    descriptor_ = pool_.FindMessageTypeByName("protobuf_unittest.TestAllTypes");
-    ASSERT_TRUE(descriptor_ != nullptr);
-    prototype_ = factory_.GetPrototype(descriptor_);
-
-    extensions_descriptor_ =
-        pool_.FindMessageTypeByName("protobuf_unittest.TestAllExtensions");
-    ASSERT_TRUE(extensions_descriptor_ != nullptr);
-    extensions_prototype_ = factory_.GetPrototype(extensions_descriptor_);
-
-    packed_descriptor_ =
-        pool_.FindMessageTypeByName("protobuf_unittest.TestPackedTypes");
-    ASSERT_TRUE(packed_descriptor_ != nullptr);
-    packed_prototype_ = factory_.GetPrototype(packed_descriptor_);
-
-    oneof_descriptor_ =
-        pool_.FindMessageTypeByName("protobuf_unittest.TestOneof2");
-    ASSERT_TRUE(oneof_descriptor_ != nullptr);
-    oneof_prototype_ = factory_.GetPrototype(oneof_descriptor_);
-
-    proto3_descriptor_ = pool_.FindMessageTypeByName(
-        "proto2_nofieldpresence_unittest.TestAllTypes");
-    ASSERT_TRUE(proto3_descriptor_ != nullptr);
-    proto3_prototype_ = factory_.GetPrototype(proto3_descriptor_);
-  }
-};
-
-TEST_F(DynamicMessageTest, Descriptor) {
-  // Check that the descriptor on the DynamicMessage matches the descriptor
-  // passed to GetPrototype().
-  EXPECT_EQ(prototype_->GetDescriptor(), descriptor_);
-}
-
-TEST_F(DynamicMessageTest, OnePrototype) {
-  // Check that requesting the same prototype twice produces the same object.
-  EXPECT_EQ(prototype_, factory_.GetPrototype(descriptor_));
-}
-
-TEST_F(DynamicMessageTest, Defaults) {
-  // Check that all default values are set correctly in the initial message.
-  TestUtil::ReflectionTester reflection_tester(descriptor_);
-  reflection_tester.ExpectClearViaReflection(*prototype_);
-}
-
-TEST_P(DynamicMessageTest, IndependentOffsets) {
-  // Check that all fields have independent offsets by setting each
-  // one to a unique value then checking that they all still have those
-  // unique values (i.e. they don't stomp each other).
-  Arena arena;
-  Message* message = prototype_->New(GetParam() ? &arena : nullptr);
-  TestUtil::ReflectionTester reflection_tester(descriptor_);
-
-  reflection_tester.SetAllFieldsViaReflection(message);
-  reflection_tester.ExpectAllFieldsSetViaReflection(*message);
-
-  if (!GetParam()) {
-    delete message;
-  }
-}
-
-TEST_P(DynamicMessageTest, Extensions) {
-  // Check that extensions work.
-  Arena arena;
-  Message* message = extensions_prototype_->New(GetParam() ? &arena : nullptr);
-  TestUtil::ReflectionTester reflection_tester(extensions_descriptor_);
-
-  reflection_tester.SetAllFieldsViaReflection(message);
-  reflection_tester.ExpectAllFieldsSetViaReflection(*message);
-
-  if (!GetParam()) {
-    delete message;
-  }
-}
-
-TEST_P(DynamicMessageTest, PackedFields) {
-  // Check that packed fields work properly.
-  Arena arena;
-  Message* message = packed_prototype_->New(GetParam() ? &arena : nullptr);
-  TestUtil::ReflectionTester reflection_tester(packed_descriptor_);
-
-  reflection_tester.SetPackedFieldsViaReflection(message);
-  reflection_tester.ExpectPackedFieldsSetViaReflection(*message);
-
-  if (!GetParam()) {
-    delete message;
-  }
-}
-
-TEST_P(DynamicMessageTest, Oneof) {
-  // Check that oneof fields work properly.
-  Arena arena;
-  Message* message = oneof_prototype_->New(GetParam() ? &arena : nullptr);
-
-  // Check default values.
-  const Descriptor* descriptor = message->GetDescriptor();
-  const Reflection* reflection = message->GetReflection();
-  EXPECT_EQ(0, reflection->GetInt32(*message,
-                                    descriptor->FindFieldByName("foo_int")));
-  EXPECT_EQ("", reflection->GetString(
-                    *message, descriptor->FindFieldByName("foo_string")));
-  EXPECT_EQ("", reflection->GetString(*message,
-                                      descriptor->FindFieldByName("foo_cord")));
-  EXPECT_EQ("", reflection->GetString(
-                    *message, descriptor->FindFieldByName("foo_string_piece")));
-  EXPECT_EQ("", reflection->GetString(
-                    *message, descriptor->FindFieldByName("foo_bytes")));
-  EXPECT_EQ(
-      unittest::TestOneof2::FOO,
-      reflection->GetEnum(*message, descriptor->FindFieldByName("foo_enum"))
-          ->number());
-  const Descriptor* nested_descriptor;
-  const Message* nested_prototype;
-  nested_descriptor =
-      pool_.FindMessageTypeByName("protobuf_unittest.TestOneof2.NestedMessage");
-  nested_prototype = factory_.GetPrototype(nested_descriptor);
-  EXPECT_EQ(nested_prototype,
-            &reflection->GetMessage(
-                *message, descriptor->FindFieldByName("foo_message")));
-  const Descriptor* foogroup_descriptor;
-  const Message* foogroup_prototype;
-  foogroup_descriptor =
-      pool_.FindMessageTypeByName("protobuf_unittest.TestOneof2.FooGroup");
-  foogroup_prototype = factory_.GetPrototype(foogroup_descriptor);
-  EXPECT_EQ(foogroup_prototype,
-            &reflection->GetMessage(*message,
-                                    descriptor->FindFieldByName("foogroup")));
-  EXPECT_NE(foogroup_prototype,
-            &reflection->GetMessage(
-                *message, descriptor->FindFieldByName("foo_lazy_message")));
-  EXPECT_EQ(5, reflection->GetInt32(*message,
-                                    descriptor->FindFieldByName("bar_int")));
-  EXPECT_EQ("STRING", reflection->GetString(
-                          *message, descriptor->FindFieldByName("bar_string")));
-  EXPECT_EQ("CORD", reflection->GetString(
-                        *message, descriptor->FindFieldByName("bar_cord")));
-  EXPECT_EQ("SPIECE",
-            reflection->GetString(
-                *message, descriptor->FindFieldByName("bar_string_piece")));
-  EXPECT_EQ("BYTES", reflection->GetString(
-                         *message, descriptor->FindFieldByName("bar_bytes")));
-  EXPECT_EQ(
-      unittest::TestOneof2::BAR,
-      reflection->GetEnum(*message, descriptor->FindFieldByName("bar_enum"))
-          ->number());
-
-  // Check set functions.
-  TestUtil::ReflectionTester reflection_tester(oneof_descriptor_);
-  reflection_tester.SetOneofViaReflection(message);
-  reflection_tester.ExpectOneofSetViaReflection(*message);
-
-  if (!GetParam()) {
-    delete message;
-  }
-}
-
-TEST_P(DynamicMessageTest, SpaceUsed) {
-  // Test that SpaceUsedLong() works properly
-
-  // Since we share the implementation with generated messages, we don't need
-  // to test very much here.  Just make sure it appears to be working.
-
-  Arena arena;
-  Message* message = prototype_->New(GetParam() ? &arena : nullptr);
-  TestUtil::ReflectionTester reflection_tester(descriptor_);
-
-  size_t initial_space_used = message->SpaceUsedLong();
-
-  reflection_tester.SetAllFieldsViaReflection(message);
-  EXPECT_LT(initial_space_used, message->SpaceUsedLong());
-
-  if (!GetParam()) {
-    delete message;
-  }
-}
-
-TEST_F(DynamicMessageTest, Arena) {
-  Arena arena;
-  Message* message = prototype_->New(&arena);
-  Message* extension_message = extensions_prototype_->New(&arena);
-  Message* packed_message = packed_prototype_->New(&arena);
-  Message* oneof_message = oneof_prototype_->New(&arena);
-
-  // avoid unused-variable error.
-  (void)message;
-  (void)extension_message;
-  (void)packed_message;
-  (void)oneof_message;
-  // Return without freeing: should not leak.
-}
-
-
-TEST_F(DynamicMessageTest, Proto3) {
-  Message* message = proto3_prototype_->New();
-  const Reflection* refl = message->GetReflection();
-  const Descriptor* desc = message->GetDescriptor();
-
-  // Just test a single primitive and single message field here to make sure we
-  // are getting the no-field-presence semantics elsewhere. DynamicMessage uses
-  // GeneratedMessageReflection under the hood, so the rest should be fine as
-  // long as GMR recognizes that we're using a proto3 message.
-  const FieldDescriptor* optional_int32 =
-      desc->FindFieldByName("optional_int32");
-  const FieldDescriptor* optional_msg =
-      desc->FindFieldByName("optional_nested_message");
-  EXPECT_TRUE(optional_int32 != nullptr);
-  EXPECT_TRUE(optional_msg != nullptr);
-
-  EXPECT_EQ(false, refl->HasField(*message, optional_int32));
-  refl->SetInt32(message, optional_int32, 42);
-  EXPECT_EQ(true, refl->HasField(*message, optional_int32));
-  refl->SetInt32(message, optional_int32, 0);
-  EXPECT_EQ(false, refl->HasField(*message, optional_int32));
-
-  EXPECT_EQ(false, refl->HasField(*message, optional_msg));
-  refl->MutableMessage(message, optional_msg);
-  EXPECT_EQ(true, refl->HasField(*message, optional_msg));
-  delete refl->ReleaseMessage(message, optional_msg);
-  EXPECT_EQ(false, refl->HasField(*message, optional_msg));
-
-  // Also ensure that the default instance handles field presence properly.
-  EXPECT_EQ(false, refl->HasField(*proto3_prototype_, optional_msg));
-
-  delete message;
-}
-
-INSTANTIATE_TEST_SUITE_P(UseArena, DynamicMessageTest, ::testing::Bool());
-
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/empty.pb.cc b/libs/protobuf/src/google/protobuf/empty.pb.cc
deleted file mode 100644
index 3a30776..0000000
--- a/libs/protobuf/src/google/protobuf/empty.pb.cc
+++ /dev/null
@@ -1,130 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/protobuf/empty.proto
-
-#include <google/protobuf/empty.pb.h>
-
-#include <algorithm>
-
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/extension_set.h>
-#include <google/protobuf/wire_format_lite.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/generated_message_reflection.h>
-#include <google/protobuf/reflection_ops.h>
-#include <google/protobuf/wire_format.h>
-// @@protoc_insertion_point(includes)
-#include <google/protobuf/port_def.inc>
-
-PROTOBUF_PRAGMA_INIT_SEG
-
-namespace _pb = ::PROTOBUF_NAMESPACE_ID;
-namespace _pbi = _pb::internal;
-
-PROTOBUF_NAMESPACE_OPEN
-PROTOBUF_CONSTEXPR Empty::Empty(
-    ::_pbi::ConstantInitialized) {}
-struct EmptyDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR EmptyDefaultTypeInternal()
-      : _instance(::_pbi::ConstantInitialized{}) {}
-  ~EmptyDefaultTypeInternal() {}
-  union {
-    Empty _instance;
-  };
-};
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 EmptyDefaultTypeInternal _Empty_default_instance_;
-PROTOBUF_NAMESPACE_CLOSE
-static ::_pb::Metadata file_level_metadata_google_2fprotobuf_2fempty_2eproto[1];
-static constexpr ::_pb::EnumDescriptor const** file_level_enum_descriptors_google_2fprotobuf_2fempty_2eproto = nullptr;
-static constexpr ::_pb::ServiceDescriptor const** file_level_service_descriptors_google_2fprotobuf_2fempty_2eproto = nullptr;
-
-const uint32_t TableStruct_google_2fprotobuf_2fempty_2eproto::offsets[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = {
-  ~0u,  // no _has_bits_
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Empty, _internal_metadata_),
-  ~0u,  // no _extensions_
-  ~0u,  // no _oneof_case_
-  ~0u,  // no _weak_field_map_
-  ~0u,  // no _inlined_string_donated_
-};
-static const ::_pbi::MigrationSchema schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = {
-  { 0, -1, -1, sizeof(::PROTOBUF_NAMESPACE_ID::Empty)},
-};
-
-static const ::_pb::Message* const file_default_instances[] = {
-  &::PROTOBUF_NAMESPACE_ID::_Empty_default_instance_._instance,
-};
-
-const char descriptor_table_protodef_google_2fprotobuf_2fempty_2eproto[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) =
-  "\n\033google/protobuf/empty.proto\022\017google.pr"
-  "otobuf\"\007\n\005EmptyB}\n\023com.google.protobufB\n"
-  "EmptyProtoP\001Z.google.golang.org/protobuf"
-  "/types/known/emptypb\370\001\001\242\002\003GPB\252\002\036Google.P"
-  "rotobuf.WellKnownTypesb\006proto3"
-  ;
-static ::_pbi::once_flag descriptor_table_google_2fprotobuf_2fempty_2eproto_once;
-const ::_pbi::DescriptorTable descriptor_table_google_2fprotobuf_2fempty_2eproto = {
-    false, false, 190, descriptor_table_protodef_google_2fprotobuf_2fempty_2eproto,
-    "google/protobuf/empty.proto",
-    &descriptor_table_google_2fprotobuf_2fempty_2eproto_once, nullptr, 0, 1,
-    schemas, file_default_instances, TableStruct_google_2fprotobuf_2fempty_2eproto::offsets,
-    file_level_metadata_google_2fprotobuf_2fempty_2eproto, file_level_enum_descriptors_google_2fprotobuf_2fempty_2eproto,
-    file_level_service_descriptors_google_2fprotobuf_2fempty_2eproto,
-};
-PROTOBUF_ATTRIBUTE_WEAK const ::_pbi::DescriptorTable* descriptor_table_google_2fprotobuf_2fempty_2eproto_getter() {
-  return &descriptor_table_google_2fprotobuf_2fempty_2eproto;
-}
-
-// Force running AddDescriptors() at dynamic initialization time.
-PROTOBUF_ATTRIBUTE_INIT_PRIORITY2 static ::_pbi::AddDescriptorsRunner dynamic_init_dummy_google_2fprotobuf_2fempty_2eproto(&descriptor_table_google_2fprotobuf_2fempty_2eproto);
-PROTOBUF_NAMESPACE_OPEN
-
-// ===================================================================
-
-class Empty::_Internal {
- public:
-};
-
-Empty::Empty(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                         bool is_message_owned)
-  : ::PROTOBUF_NAMESPACE_ID::internal::ZeroFieldsBase(arena, is_message_owned) {
-  // @@protoc_insertion_point(arena_constructor:google.protobuf.Empty)
-}
-Empty::Empty(const Empty& from)
-  : ::PROTOBUF_NAMESPACE_ID::internal::ZeroFieldsBase() {
-  Empty* const _this = this; (void)_this;
-  _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-  // @@protoc_insertion_point(copy_constructor:google.protobuf.Empty)
-}
-
-
-
-
-
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData Empty::_class_data_ = {
-    ::PROTOBUF_NAMESPACE_ID::internal::ZeroFieldsBase::CopyImpl,
-    ::PROTOBUF_NAMESPACE_ID::internal::ZeroFieldsBase::MergeImpl,
-};
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*Empty::GetClassData() const { return &_class_data_; }
-
-
-
-
-
-
-
-::PROTOBUF_NAMESPACE_ID::Metadata Empty::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_google_2fprotobuf_2fempty_2eproto_getter, &descriptor_table_google_2fprotobuf_2fempty_2eproto_once,
-      file_level_metadata_google_2fprotobuf_2fempty_2eproto[0]);
-}
-
-// @@protoc_insertion_point(namespace_scope)
-PROTOBUF_NAMESPACE_CLOSE
-PROTOBUF_NAMESPACE_OPEN
-template<> PROTOBUF_NOINLINE ::PROTOBUF_NAMESPACE_ID::Empty*
-Arena::CreateMaybeMessage< ::PROTOBUF_NAMESPACE_ID::Empty >(Arena* arena) {
-  return Arena::CreateMessageInternal< ::PROTOBUF_NAMESPACE_ID::Empty >(arena);
-}
-PROTOBUF_NAMESPACE_CLOSE
-
-// @@protoc_insertion_point(global_scope)
-#include <google/protobuf/port_undef.inc>
diff --git a/libs/protobuf/src/google/protobuf/empty.pb.h b/libs/protobuf/src/google/protobuf/empty.pb.h
deleted file mode 100644
index bcb6478..0000000
--- a/libs/protobuf/src/google/protobuf/empty.pb.h
+++ /dev/null
@@ -1,198 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/protobuf/empty.proto
-
-#ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fempty_2eproto
-#define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fempty_2eproto
-
-#include <limits>
-#include <string>
-
-#include <google/protobuf/port_def.inc>
-#if PROTOBUF_VERSION < 3021000
-#error This file was generated by a newer version of protoc which is
-#error incompatible with your Protocol Buffer headers. Please update
-#error your headers.
-#endif
-#if 3021012 < PROTOBUF_MIN_PROTOC_VERSION
-#error This file was generated by an older version of protoc which is
-#error incompatible with your Protocol Buffer headers. Please
-#error regenerate this file with a newer version of protoc.
-#endif
-
-#include <google/protobuf/port_undef.inc>
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/arena.h>
-#include <google/protobuf/arenastring.h>
-#include <google/protobuf/generated_message_bases.h>
-#include <google/protobuf/generated_message_util.h>
-#include <google/protobuf/metadata_lite.h>
-#include <google/protobuf/generated_message_reflection.h>
-#include <google/protobuf/message.h>
-#include <google/protobuf/repeated_field.h>  // IWYU pragma: export
-#include <google/protobuf/extension_set.h>  // IWYU pragma: export
-#include <google/protobuf/unknown_field_set.h>
-// @@protoc_insertion_point(includes)
-#include <google/protobuf/port_def.inc>
-#define PROTOBUF_INTERNAL_EXPORT_google_2fprotobuf_2fempty_2eproto PROTOBUF_EXPORT
-PROTOBUF_NAMESPACE_OPEN
-namespace internal {
-class AnyMetadata;
-}  // namespace internal
-PROTOBUF_NAMESPACE_CLOSE
-
-// Internal implementation detail -- do not use these members.
-struct PROTOBUF_EXPORT TableStruct_google_2fprotobuf_2fempty_2eproto {
-  static const uint32_t offsets[];
-};
-PROTOBUF_EXPORT extern const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable descriptor_table_google_2fprotobuf_2fempty_2eproto;
-PROTOBUF_NAMESPACE_OPEN
-class Empty;
-struct EmptyDefaultTypeInternal;
-PROTOBUF_EXPORT extern EmptyDefaultTypeInternal _Empty_default_instance_;
-PROTOBUF_NAMESPACE_CLOSE
-PROTOBUF_NAMESPACE_OPEN
-template<> PROTOBUF_EXPORT ::PROTOBUF_NAMESPACE_ID::Empty* Arena::CreateMaybeMessage<::PROTOBUF_NAMESPACE_ID::Empty>(Arena*);
-PROTOBUF_NAMESPACE_CLOSE
-PROTOBUF_NAMESPACE_OPEN
-
-// ===================================================================
-
-class PROTOBUF_EXPORT Empty final :
-    public ::PROTOBUF_NAMESPACE_ID::internal::ZeroFieldsBase /* @@protoc_insertion_point(class_definition:google.protobuf.Empty) */ {
- public:
-  inline Empty() : Empty(nullptr) {}
-  explicit PROTOBUF_CONSTEXPR Empty(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
-
-  Empty(const Empty& from);
-  Empty(Empty&& from) noexcept
-    : Empty() {
-    *this = ::std::move(from);
-  }
-
-  inline Empty& operator=(const Empty& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline Empty& operator=(Empty&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetOwningArena() == from.GetOwningArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetOwningArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const Empty& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const Empty* internal_default_instance() {
-    return reinterpret_cast<const Empty*>(
-               &_Empty_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    0;
-
-  friend void swap(Empty& a, Empty& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(Empty* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() != nullptr &&
-        GetOwningArena() == other->GetOwningArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() == other->GetOwningArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(Empty* other) {
-    if (other == this) return;
-    GOOGLE_DCHECK(GetOwningArena() == other->GetOwningArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  Empty* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<Empty>(arena);
-  }
-  using ::PROTOBUF_NAMESPACE_ID::internal::ZeroFieldsBase::CopyFrom;
-  inline void CopyFrom(const Empty& from) {
-    ::PROTOBUF_NAMESPACE_ID::internal::ZeroFieldsBase::CopyImpl(*this, from);
-  }
-  using ::PROTOBUF_NAMESPACE_ID::internal::ZeroFieldsBase::MergeFrom;
-  void MergeFrom(const Empty& from) {
-    ::PROTOBUF_NAMESPACE_ID::internal::ZeroFieldsBase::MergeImpl(*this, from);
-  }
-  public:
-
-  private:
-  friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
-  static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
-    return "google.protobuf.Empty";
-  }
-  protected:
-  explicit Empty(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                       bool is_message_owned = false);
-  public:
-
-  static const ClassData _class_data_;
-  const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*GetClassData() const final;
-
-  ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  // @@protoc_insertion_point(class_scope:google.protobuf.Empty)
- private:
-  class _Internal;
-
-  template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
-  typedef void InternalArenaConstructable_;
-  typedef void DestructorSkippable_;
-  struct Impl_ {
-  };
-  friend struct ::TableStruct_google_2fprotobuf_2fempty_2eproto;
-};
-// ===================================================================
-
-
-// ===================================================================
-
-#ifdef __GNUC__
-  #pragma GCC diagnostic push
-  #pragma GCC diagnostic ignored "-Wstrict-aliasing"
-#endif  // __GNUC__
-// Empty
-
-#ifdef __GNUC__
-  #pragma GCC diagnostic pop
-#endif  // __GNUC__
-
-// @@protoc_insertion_point(namespace_scope)
-
-PROTOBUF_NAMESPACE_CLOSE
-
-// @@protoc_insertion_point(global_scope)
-
-#include <google/protobuf/port_undef.inc>
-#endif  // GOOGLE_PROTOBUF_INCLUDED_GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fempty_2eproto
diff --git a/libs/protobuf/src/google/protobuf/empty.proto b/libs/protobuf/src/google/protobuf/empty.proto
deleted file mode 100644
index 2227462..0000000
--- a/libs/protobuf/src/google/protobuf/empty.proto
+++ /dev/null
@@ -1,51 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto3";
-
-package google.protobuf;
-
-option csharp_namespace = "Google.Protobuf.WellKnownTypes";
-option go_package = "google.golang.org/protobuf/types/known/emptypb";
-option java_package = "com.google.protobuf";
-option java_outer_classname = "EmptyProto";
-option java_multiple_files = true;
-option objc_class_prefix = "GPB";
-option cc_enable_arenas = true;
-
-// A generic empty message that you can re-use to avoid defining duplicated
-// empty messages in your APIs. A typical example is to use it as the request
-// or the response type of an API method. For instance:
-//
-//     service Foo {
-//       rpc Bar(google.protobuf.Empty) returns (google.protobuf.Empty);
-//     }
-//
-message Empty {}
diff --git a/libs/protobuf/src/google/protobuf/endian.h b/libs/protobuf/src/google/protobuf/endian.h
deleted file mode 100644
index e0ee6cd..0000000
--- a/libs/protobuf/src/google/protobuf/endian.h
+++ /dev/null
@@ -1,198 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef GOOGLE_PROTOBUF_ENDIAN_H__
-#define GOOGLE_PROTOBUF_ENDIAN_H__
-
-#if defined(_MSC_VER)
-#include <stdlib.h>
-#endif
-
-#include <cstdint>
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-namespace internal {
-
-inline uint64_t BSwap64(uint64_t host_int) {
-#if defined(PROTOBUF_BUILTIN_BSWAP64)
-  return PROTOBUF_BUILTIN_BSWAP64(host_int);
-#elif defined(_MSC_VER)
-  return _byteswap_uint64(host_int);
-#else
-  return (((host_int & uint64_t{0xFF}) << 56) |
-          ((host_int & uint64_t{0xFF00}) << 40) |
-          ((host_int & uint64_t{0xFF0000}) << 24) |
-          ((host_int & uint64_t{0xFF000000}) << 8) |
-          ((host_int & uint64_t{0xFF00000000}) >> 8) |
-          ((host_int & uint64_t{0xFF0000000000}) >> 24) |
-          ((host_int & uint64_t{0xFF000000000000}) >> 40) |
-          ((host_int & uint64_t{0xFF00000000000000}) >> 56));
-#endif
-}
-
-inline uint32_t BSwap32(uint32_t host_int) {
-#if defined(PROTOBUF_BUILTIN_BSWAP32)
-  return PROTOBUF_BUILTIN_BSWAP32(host_int);
-#elif defined(_MSC_VER)
-  return _byteswap_ulong(host_int);
-#else
-  return (((host_int & uint32_t{0xFF}) << 24) |
-          ((host_int & uint32_t{0xFF00}) << 8) |
-          ((host_int & uint32_t{0xFF0000}) >> 8) |
-          ((host_int & uint32_t{0xFF000000}) >> 24));
-#endif
-}
-
-inline uint16_t BSwap16(uint16_t host_int) {
-#if defined(PROTOBUF_BUILTIN_BSWAP16)
-  return PROTOBUF_BUILTIN_BSWAP16(host_int);
-#elif defined(_MSC_VER)
-  return _byteswap_ushort(host_int);
-#else
-  return (((host_int & uint16_t{0xFF}) << 8) |
-          ((host_int & uint16_t{0xFF00}) >> 8));
-#endif
-}
-
-namespace little_endian {
-
-inline uint16_t FromHost(uint16_t value) {
-#if defined(PROTOBUF_BIG_ENDIAN)
-  return BSwap16(value);
-#else
-  return value;
-#endif
-}
-
-inline uint32_t FromHost(uint32_t value) {
-#if defined(PROTOBUF_BIG_ENDIAN)
-  return BSwap32(value);
-#else
-  return value;
-#endif
-}
-
-inline uint64_t FromHost(uint64_t value) {
-#if defined(PROTOBUF_BIG_ENDIAN)
-  return BSwap64(value);
-#else
-  return value;
-#endif
-}
-
-inline uint16_t ToHost(uint16_t value) {
-#if defined(PROTOBUF_BIG_ENDIAN)
-  return BSwap16(value);
-#else
-  return value;
-#endif
-}
-
-inline uint32_t ToHost(uint32_t value) {
-#if defined(PROTOBUF_BIG_ENDIAN)
-  return BSwap32(value);
-#else
-  return value;
-#endif
-}
-
-inline uint64_t ToHost(uint64_t value) {
-#if defined(PROTOBUF_BIG_ENDIAN)
-  return BSwap64(value);
-#else
-  return value;
-#endif
-}
-
-}  // namespace little_endian
-
-namespace big_endian {
-
-inline uint16_t FromHost(uint16_t value) {
-#if defined(PROTOBUF_BIG_ENDIAN)
-  return value;
-#else
-  return BSwap16(value);
-#endif
-}
-
-inline uint32_t FromHost(uint32_t value) {
-#if defined(PROTOBUF_BIG_ENDIAN)
-  return value;
-#else
-  return BSwap32(value);
-#endif
-}
-
-inline uint64_t FromHost(uint64_t value) {
-#if defined(PROTOBUF_BIG_ENDIAN)
-  return value;
-#else
-  return BSwap64(value);
-#endif
-}
-
-inline uint16_t ToHost(uint16_t value) {
-#if defined(PROTOBUF_BIG_ENDIAN)
-  return value;
-#else
-  return BSwap16(value);
-#endif
-}
-
-inline uint32_t ToHost(uint32_t value) {
-#if defined(PROTOBUF_BIG_ENDIAN)
-  return value;
-#else
-  return BSwap32(value);
-#endif
-}
-
-inline uint64_t ToHost(uint64_t value) {
-#if defined(PROTOBUF_BIG_ENDIAN)
-  return value;
-#else
-  return BSwap64(value);
-#endif
-}
-
-}  // namespace big_endian
-
-}  // namespace internal
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
-
-#endif  // GOOGLE_PROTOBUF_ENDIAN_H__
diff --git a/libs/protobuf/src/google/protobuf/explicitly_constructed.h b/libs/protobuf/src/google/protobuf/explicitly_constructed.h
deleted file mode 100644
index 174c59a..0000000
--- a/libs/protobuf/src/google/protobuf/explicitly_constructed.h
+++ /dev/null
@@ -1,97 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef GOOGLE_PROTOBUF_EXPLICITLY_CONSTRUCTED_H__
-#define GOOGLE_PROTOBUF_EXPLICITLY_CONSTRUCTED_H__
-
-#include <stdint.h>
-
-#include <utility>
-
-#include <google/protobuf/stubs/logging.h>
-#include <google/protobuf/stubs/common.h>
-
-// clang-format off
-#include <google/protobuf/port_def.inc>
-// clang-format on
-
-namespace google {
-namespace protobuf {
-namespace internal {
-
-// Wraps a variable whose constructor and destructor are explicitly
-// called. It is particularly useful for a global variable, without its
-// constructor and destructor run on start and end of the program lifetime.
-// This circumvents the initial construction order fiasco, while keeping
-// the address of the empty string a compile time constant.
-//
-// Pay special attention to the initialization state of the object.
-// 1. The object is "uninitialized" to begin with.
-// 2. Call Construct() or DefaultConstruct() only if the object is
-//    uninitialized. After the call, the object becomes "initialized".
-// 3. Call get() and get_mutable() only if the object is initialized.
-// 4. Call Destruct() only if the object is initialized.
-//    After the call, the object becomes uninitialized.
-template <typename T, size_t min_align = 1>
-class ExplicitlyConstructed {
- public:
-  void DefaultConstruct() { new (&union_) T(); }
-
-  template <typename... Args>
-  void Construct(Args&&... args) {
-    new (&union_) T(std::forward<Args>(args)...);
-  }
-
-  void Destruct() { get_mutable()->~T(); }
-
-  constexpr const T& get() const { return reinterpret_cast<const T&>(union_); }
-  T* get_mutable() { return reinterpret_cast<T*>(&union_); }
-
- private:
-  union AlignedUnion {
-    alignas(min_align > alignof(T) ? min_align
-                                   : alignof(T)) char space[sizeof(T)];
-    int64_t align_to_int64;
-    void* align_to_ptr;
-  } union_;
-};
-
-// ArenaStringPtr compatible explicitly constructed string type.
-// This empty string type is aligned with a minimum alignment of 8 bytes
-// which is the minimum requirement of ArenaStringPtr
-using ExplicitlyConstructedArenaString = ExplicitlyConstructed<std::string, 8>;
-
-}  // namespace internal
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
-
-#endif  // GOOGLE_PROTOBUF_EXPLICITLY_CONSTRUCTED_H__
diff --git a/libs/protobuf/src/google/protobuf/extension_set.cc b/libs/protobuf/src/google/protobuf/extension_set.cc
deleted file mode 100644
index fada4f5..0000000
--- a/libs/protobuf/src/google/protobuf/extension_set.cc
+++ /dev/null
@@ -1,1967 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-
-#include <google/protobuf/extension_set.h>
-
-#include <tuple>
-#include <unordered_set>
-#include <utility>
-
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/io/zero_copy_stream_impl_lite.h>
-#include <google/protobuf/arena.h>
-#include <google/protobuf/extension_set_inl.h>
-#include <google/protobuf/message_lite.h>
-#include <google/protobuf/metadata_lite.h>
-#include <google/protobuf/parse_context.h>
-#include <google/protobuf/port.h>
-#include <google/protobuf/repeated_field.h>
-#include <google/protobuf/stubs/map_util.h>
-#include <google/protobuf/stubs/hash.h>
-
-// clang-format off
-#include <google/protobuf/port_def.inc>  // must be last.
-// clang-format on
-namespace google {
-namespace protobuf {
-namespace internal {
-
-namespace {
-
-inline WireFormatLite::FieldType real_type(FieldType type) {
-  GOOGLE_DCHECK(type > 0 && type <= WireFormatLite::MAX_FIELD_TYPE);
-  return static_cast<WireFormatLite::FieldType>(type);
-}
-
-inline WireFormatLite::CppType cpp_type(FieldType type) {
-  return WireFormatLite::FieldTypeToCppType(real_type(type));
-}
-
-// Registry stuff.
-
-// Note that we cannot use hetererogeneous lookup for std containers since we
-// need to support C++11.
-struct ExtensionEq {
-  bool operator()(const ExtensionInfo& lhs, const ExtensionInfo& rhs) const {
-    return lhs.message == rhs.message && lhs.number == rhs.number;
-  }
-};
-
-struct ExtensionHasher {
-  std::size_t operator()(const ExtensionInfo& info) const {
-    return std::hash<const MessageLite*>{}(info.message) ^
-           std::hash<int>{}(info.number);
-  }
-};
-
-using ExtensionRegistry =
-    std::unordered_set<ExtensionInfo, ExtensionHasher, ExtensionEq>;
-
-static const ExtensionRegistry* global_registry = nullptr;
-
-// This function is only called at startup, so there is no need for thread-
-// safety.
-void Register(const ExtensionInfo& info) {
-  static auto local_static_registry = OnShutdownDelete(new ExtensionRegistry);
-  global_registry = local_static_registry;
-  if (!InsertIfNotPresent(local_static_registry, info)) {
-    GOOGLE_LOG(FATAL) << "Multiple extension registrations for type \""
-               << info.message->GetTypeName() << "\", field number "
-               << info.number << ".";
-  }
-}
-
-const ExtensionInfo* FindRegisteredExtension(const MessageLite* extendee,
-                                             int number) {
-  if (!global_registry) return nullptr;
-
-  ExtensionInfo info;
-  info.message = extendee;
-  info.number = number;
-
-  auto it = global_registry->find(info);
-  if (it == global_registry->end()) {
-    return nullptr;
-  } else {
-    return &*it;
-  }
-}
-
-}  // namespace
-
-bool GeneratedExtensionFinder::Find(int number, ExtensionInfo* output) {
-  const ExtensionInfo* extension = FindRegisteredExtension(extendee_, number);
-  if (extension == nullptr) {
-    return false;
-  } else {
-    *output = *extension;
-    return true;
-  }
-}
-
-void ExtensionSet::RegisterExtension(const MessageLite* extendee, int number,
-                                     FieldType type, bool is_repeated,
-                                     bool is_packed,
-                                     LazyEagerVerifyFnType verify_func) {
-  GOOGLE_CHECK_NE(type, WireFormatLite::TYPE_ENUM);
-  GOOGLE_CHECK_NE(type, WireFormatLite::TYPE_MESSAGE);
-  GOOGLE_CHECK_NE(type, WireFormatLite::TYPE_GROUP);
-  ExtensionInfo info(extendee, number, type, is_repeated, is_packed,
-                     verify_func);
-  Register(info);
-}
-
-static bool CallNoArgValidityFunc(const void* arg, int number) {
-  // Note:  Must use C-style cast here rather than reinterpret_cast because
-  //   the C++ standard at one point did not allow casts between function and
-  //   data pointers and some compilers enforce this for C++-style casts.  No
-  //   compiler enforces it for C-style casts since lots of C-style code has
-  //   relied on these kinds of casts for a long time, despite being
-  //   technically undefined.  See:
-  //     http://www.open-std.org/jtc1/sc22/wg21/docs/cwg_defects.html#195
-  // Also note:  Some compilers do not allow function pointers to be "const".
-  //   Which makes sense, I suppose, because it's meaningless.
-  return ((EnumValidityFunc*)arg)(number);
-}
-
-void ExtensionSet::RegisterEnumExtension(const MessageLite* extendee,
-                                         int number, FieldType type,
-                                         bool is_repeated, bool is_packed,
-                                         EnumValidityFunc* is_valid) {
-  GOOGLE_CHECK_EQ(type, WireFormatLite::TYPE_ENUM);
-  ExtensionInfo info(extendee, number, type, is_repeated, is_packed, nullptr);
-  info.enum_validity_check.func = CallNoArgValidityFunc;
-  // See comment in CallNoArgValidityFunc() about why we use a c-style cast.
-  info.enum_validity_check.arg = (void*)is_valid;
-  Register(info);
-}
-
-void ExtensionSet::RegisterMessageExtension(const MessageLite* extendee,
-                                            int number, FieldType type,
-                                            bool is_repeated, bool is_packed,
-                                            const MessageLite* prototype,
-                                            LazyEagerVerifyFnType verify_func) {
-  GOOGLE_CHECK(type == WireFormatLite::TYPE_MESSAGE ||
-        type == WireFormatLite::TYPE_GROUP);
-  ExtensionInfo info(extendee, number, type, is_repeated, is_packed,
-                     verify_func);
-  info.message_info = {prototype};
-  Register(info);
-}
-
-// ===================================================================
-// Constructors and basic methods.
-
-ExtensionSet::ExtensionSet(Arena* arena)
-    : arena_(arena),
-      flat_capacity_(0),
-      flat_size_(0),
-      map_{flat_capacity_ == 0
-               ? nullptr
-               : Arena::CreateArray<KeyValue>(arena_, flat_capacity_)} {}
-
-ExtensionSet::~ExtensionSet() {
-  // Deletes all allocated extensions.
-  if (arena_ == nullptr) {
-    ForEach([](int /* number */, Extension& ext) { ext.Free(); });
-    if (PROTOBUF_PREDICT_FALSE(is_large())) {
-      delete map_.large;
-    } else {
-      DeleteFlatMap(map_.flat, flat_capacity_);
-    }
-  }
-}
-
-void ExtensionSet::DeleteFlatMap(const ExtensionSet::KeyValue* flat,
-                                 uint16_t flat_capacity) {
-  // Arena::CreateArray already requires a trivially destructible type, but
-  // ensure this constraint is not violated in the future.
-  static_assert(std::is_trivially_destructible<KeyValue>::value,
-                "CreateArray requires a trivially destructible type");
-  // A const-cast is needed, but this is safe as we are about to deallocate the
-  // array.
-  internal::SizedArrayDelete(const_cast<KeyValue*>(flat),
-                             sizeof(*flat) * flat_capacity);
-}
-
-// Defined in extension_set_heavy.cc.
-// void ExtensionSet::AppendToList(const Descriptor* extendee,
-//                                 const DescriptorPool* pool,
-//                                 vector<const FieldDescriptor*>* output) const
-
-bool ExtensionSet::Has(int number) const {
-  const Extension* ext = FindOrNull(number);
-  if (ext == nullptr) return false;
-  GOOGLE_DCHECK(!ext->is_repeated);
-  return !ext->is_cleared;
-}
-
-bool ExtensionSet::HasLazy(int number) const {
-  return Has(number) && FindOrNull(number)->is_lazy;
-}
-
-int ExtensionSet::NumExtensions() const {
-  int result = 0;
-  ForEach([&result](int /* number */, const Extension& ext) {
-    if (!ext.is_cleared) {
-      ++result;
-    }
-  });
-  return result;
-}
-
-int ExtensionSet::ExtensionSize(int number) const {
-  const Extension* ext = FindOrNull(number);
-  return ext == nullptr ? 0 : ext->GetSize();
-}
-
-FieldType ExtensionSet::ExtensionType(int number) const {
-  const Extension* ext = FindOrNull(number);
-  if (ext == nullptr) {
-    GOOGLE_LOG(DFATAL) << "Don't lookup extension types if they aren't present (1). ";
-    return 0;
-  }
-  if (ext->is_cleared) {
-    GOOGLE_LOG(DFATAL) << "Don't lookup extension types if they aren't present (2). ";
-  }
-  return ext->type;
-}
-
-void ExtensionSet::ClearExtension(int number) {
-  Extension* ext = FindOrNull(number);
-  if (ext == nullptr) return;
-  ext->Clear();
-}
-
-// ===================================================================
-// Field accessors
-
-namespace {
-
-enum { REPEATED_FIELD, OPTIONAL_FIELD };
-
-}  // namespace
-
-#define GOOGLE_DCHECK_TYPE(EXTENSION, LABEL, CPPTYPE)                                 \
-  GOOGLE_DCHECK_EQ((EXTENSION).is_repeated ? REPEATED_FIELD : OPTIONAL_FIELD, LABEL); \
-  GOOGLE_DCHECK_EQ(cpp_type((EXTENSION).type), WireFormatLite::CPPTYPE_##CPPTYPE)
-
-// -------------------------------------------------------------------
-// Primitives
-
-#define PRIMITIVE_ACCESSORS(UPPERCASE, LOWERCASE, CAMELCASE)                  \
-                                                                              \
-  LOWERCASE ExtensionSet::Get##CAMELCASE(int number, LOWERCASE default_value) \
-      const {                                                                 \
-    const Extension* extension = FindOrNull(number);                          \
-    if (extension == nullptr || extension->is_cleared) {                      \
-      return default_value;                                                   \
-    } else {                                                                  \
-      GOOGLE_DCHECK_TYPE(*extension, OPTIONAL_FIELD, UPPERCASE);                     \
-      return extension->LOWERCASE##_value;                                    \
-    }                                                                         \
-  }                                                                           \
-                                                                              \
-  const LOWERCASE& ExtensionSet::GetRef##CAMELCASE(                           \
-      int number, const LOWERCASE& default_value) const {                     \
-    const Extension* extension = FindOrNull(number);                          \
-    if (extension == nullptr || extension->is_cleared) {                      \
-      return default_value;                                                   \
-    } else {                                                                  \
-      GOOGLE_DCHECK_TYPE(*extension, OPTIONAL_FIELD, UPPERCASE);                     \
-      return extension->LOWERCASE##_value;                                    \
-    }                                                                         \
-  }                                                                           \
-                                                                              \
-  void ExtensionSet::Set##CAMELCASE(int number, FieldType type,               \
-                                    LOWERCASE value,                          \
-                                    const FieldDescriptor* descriptor) {      \
-    Extension* extension;                                                     \
-    if (MaybeNewExtension(number, descriptor, &extension)) {                  \
-      extension->type = type;                                                 \
-      GOOGLE_DCHECK_EQ(cpp_type(extension->type),                                    \
-                WireFormatLite::CPPTYPE_##UPPERCASE);                         \
-      extension->is_repeated = false;                                         \
-    } else {                                                                  \
-      GOOGLE_DCHECK_TYPE(*extension, OPTIONAL_FIELD, UPPERCASE);                     \
-    }                                                                         \
-    extension->is_cleared = false;                                            \
-    extension->LOWERCASE##_value = value;                                     \
-  }                                                                           \
-                                                                              \
-  LOWERCASE ExtensionSet::GetRepeated##CAMELCASE(int number, int index)       \
-      const {                                                                 \
-    const Extension* extension = FindOrNull(number);                          \
-    GOOGLE_CHECK(extension != nullptr) << "Index out-of-bounds (field is empty).";   \
-    GOOGLE_DCHECK_TYPE(*extension, REPEATED_FIELD, UPPERCASE);                       \
-    return extension->repeated_##LOWERCASE##_value->Get(index);               \
-  }                                                                           \
-                                                                              \
-  const LOWERCASE& ExtensionSet::GetRefRepeated##CAMELCASE(int number,        \
-                                                           int index) const { \
-    const Extension* extension = FindOrNull(number);                          \
-    GOOGLE_CHECK(extension != nullptr) << "Index out-of-bounds (field is empty).";   \
-    GOOGLE_DCHECK_TYPE(*extension, REPEATED_FIELD, UPPERCASE);                       \
-    return extension->repeated_##LOWERCASE##_value->Get(index);               \
-  }                                                                           \
-                                                                              \
-  void ExtensionSet::SetRepeated##CAMELCASE(int number, int index,            \
-                                            LOWERCASE value) {                \
-    Extension* extension = FindOrNull(number);                                \
-    GOOGLE_CHECK(extension != nullptr) << "Index out-of-bounds (field is empty).";   \
-    GOOGLE_DCHECK_TYPE(*extension, REPEATED_FIELD, UPPERCASE);                       \
-    extension->repeated_##LOWERCASE##_value->Set(index, value);               \
-  }                                                                           \
-                                                                              \
-  void ExtensionSet::Add##CAMELCASE(int number, FieldType type, bool packed,  \
-                                    LOWERCASE value,                          \
-                                    const FieldDescriptor* descriptor) {      \
-    Extension* extension;                                                     \
-    if (MaybeNewExtension(number, descriptor, &extension)) {                  \
-      extension->type = type;                                                 \
-      GOOGLE_DCHECK_EQ(cpp_type(extension->type),                                    \
-                WireFormatLite::CPPTYPE_##UPPERCASE);                         \
-      extension->is_repeated = true;                                          \
-      extension->is_packed = packed;                                          \
-      extension->repeated_##LOWERCASE##_value =                               \
-          Arena::CreateMessage<RepeatedField<LOWERCASE>>(arena_);             \
-    } else {                                                                  \
-      GOOGLE_DCHECK_TYPE(*extension, REPEATED_FIELD, UPPERCASE);                     \
-      GOOGLE_DCHECK_EQ(extension->is_packed, packed);                                \
-    }                                                                         \
-    extension->repeated_##LOWERCASE##_value->Add(value);                      \
-  }
-
-PRIMITIVE_ACCESSORS(INT32, int32_t, Int32)
-PRIMITIVE_ACCESSORS(INT64, int64_t, Int64)
-PRIMITIVE_ACCESSORS(UINT32, uint32_t, UInt32)
-PRIMITIVE_ACCESSORS(UINT64, uint64_t, UInt64)
-PRIMITIVE_ACCESSORS(FLOAT, float, Float)
-PRIMITIVE_ACCESSORS(DOUBLE, double, Double)
-PRIMITIVE_ACCESSORS(BOOL, bool, Bool)
-
-#undef PRIMITIVE_ACCESSORS
-
-const void* ExtensionSet::GetRawRepeatedField(int number,
-                                              const void* default_value) const {
-  const Extension* extension = FindOrNull(number);
-  if (extension == nullptr) {
-    return default_value;
-  }
-  // We assume that all the RepeatedField<>* pointers have the same
-  // size and alignment within the anonymous union in Extension.
-  return extension->repeated_int32_t_value;
-}
-
-void* ExtensionSet::MutableRawRepeatedField(int number, FieldType field_type,
-                                            bool packed,
-                                            const FieldDescriptor* desc) {
-  Extension* extension;
-
-  // We instantiate an empty Repeated{,Ptr}Field if one doesn't exist for this
-  // extension.
-  if (MaybeNewExtension(number, desc, &extension)) {
-    extension->is_repeated = true;
-    extension->type = field_type;
-    extension->is_packed = packed;
-
-    switch (WireFormatLite::FieldTypeToCppType(
-        static_cast<WireFormatLite::FieldType>(field_type))) {
-      case WireFormatLite::CPPTYPE_INT32:
-        extension->repeated_int32_t_value =
-            Arena::CreateMessage<RepeatedField<int32_t>>(arena_);
-        break;
-      case WireFormatLite::CPPTYPE_INT64:
-        extension->repeated_int64_t_value =
-            Arena::CreateMessage<RepeatedField<int64_t>>(arena_);
-        break;
-      case WireFormatLite::CPPTYPE_UINT32:
-        extension->repeated_uint32_t_value =
-            Arena::CreateMessage<RepeatedField<uint32_t>>(arena_);
-        break;
-      case WireFormatLite::CPPTYPE_UINT64:
-        extension->repeated_uint64_t_value =
-            Arena::CreateMessage<RepeatedField<uint64_t>>(arena_);
-        break;
-      case WireFormatLite::CPPTYPE_DOUBLE:
-        extension->repeated_double_value =
-            Arena::CreateMessage<RepeatedField<double>>(arena_);
-        break;
-      case WireFormatLite::CPPTYPE_FLOAT:
-        extension->repeated_float_value =
-            Arena::CreateMessage<RepeatedField<float>>(arena_);
-        break;
-      case WireFormatLite::CPPTYPE_BOOL:
-        extension->repeated_bool_value =
-            Arena::CreateMessage<RepeatedField<bool>>(arena_);
-        break;
-      case WireFormatLite::CPPTYPE_ENUM:
-        extension->repeated_enum_value =
-            Arena::CreateMessage<RepeatedField<int>>(arena_);
-        break;
-      case WireFormatLite::CPPTYPE_STRING:
-        extension->repeated_string_value =
-            Arena::CreateMessage<RepeatedPtrField<std::string>>(arena_);
-        break;
-      case WireFormatLite::CPPTYPE_MESSAGE:
-        extension->repeated_message_value =
-            Arena::CreateMessage<RepeatedPtrField<MessageLite>>(arena_);
-        break;
-    }
-  }
-
-  // We assume that all the RepeatedField<>* pointers have the same
-  // size and alignment within the anonymous union in Extension.
-  return extension->repeated_int32_t_value;
-}
-
-// Compatible version using old call signature. Does not create extensions when
-// the don't already exist; instead, just GOOGLE_CHECK-fails.
-void* ExtensionSet::MutableRawRepeatedField(int number) {
-  Extension* extension = FindOrNull(number);
-  GOOGLE_CHECK(extension != nullptr) << "Extension not found.";
-  // We assume that all the RepeatedField<>* pointers have the same
-  // size and alignment within the anonymous union in Extension.
-  return extension->repeated_int32_t_value;
-}
-
-// -------------------------------------------------------------------
-// Enums
-
-int ExtensionSet::GetEnum(int number, int default_value) const {
-  const Extension* extension = FindOrNull(number);
-  if (extension == nullptr || extension->is_cleared) {
-    // Not present.  Return the default value.
-    return default_value;
-  } else {
-    GOOGLE_DCHECK_TYPE(*extension, OPTIONAL_FIELD, ENUM);
-    return extension->enum_value;
-  }
-}
-
-const int& ExtensionSet::GetRefEnum(int number,
-                                    const int& default_value) const {
-  const Extension* extension = FindOrNull(number);
-  if (extension == nullptr || extension->is_cleared) {
-    // Not present.  Return the default value.
-    return default_value;
-  } else {
-    GOOGLE_DCHECK_TYPE(*extension, OPTIONAL_FIELD, ENUM);
-    return extension->enum_value;
-  }
-}
-
-void ExtensionSet::SetEnum(int number, FieldType type, int value,
-                           const FieldDescriptor* descriptor) {
-  Extension* extension;
-  if (MaybeNewExtension(number, descriptor, &extension)) {
-    extension->type = type;
-    GOOGLE_DCHECK_EQ(cpp_type(extension->type), WireFormatLite::CPPTYPE_ENUM);
-    extension->is_repeated = false;
-  } else {
-    GOOGLE_DCHECK_TYPE(*extension, OPTIONAL_FIELD, ENUM);
-  }
-  extension->is_cleared = false;
-  extension->enum_value = value;
-}
-
-int ExtensionSet::GetRepeatedEnum(int number, int index) const {
-  const Extension* extension = FindOrNull(number);
-  GOOGLE_CHECK(extension != nullptr) << "Index out-of-bounds (field is empty).";
-  GOOGLE_DCHECK_TYPE(*extension, REPEATED_FIELD, ENUM);
-  return extension->repeated_enum_value->Get(index);
-}
-
-const int& ExtensionSet::GetRefRepeatedEnum(int number, int index) const {
-  const Extension* extension = FindOrNull(number);
-  GOOGLE_CHECK(extension != nullptr) << "Index out-of-bounds (field is empty).";
-  GOOGLE_DCHECK_TYPE(*extension, REPEATED_FIELD, ENUM);
-  return extension->repeated_enum_value->Get(index);
-}
-
-void ExtensionSet::SetRepeatedEnum(int number, int index, int value) {
-  Extension* extension = FindOrNull(number);
-  GOOGLE_CHECK(extension != nullptr) << "Index out-of-bounds (field is empty).";
-  GOOGLE_DCHECK_TYPE(*extension, REPEATED_FIELD, ENUM);
-  extension->repeated_enum_value->Set(index, value);
-}
-
-void ExtensionSet::AddEnum(int number, FieldType type, bool packed, int value,
-                           const FieldDescriptor* descriptor) {
-  Extension* extension;
-  if (MaybeNewExtension(number, descriptor, &extension)) {
-    extension->type = type;
-    GOOGLE_DCHECK_EQ(cpp_type(extension->type), WireFormatLite::CPPTYPE_ENUM);
-    extension->is_repeated = true;
-    extension->is_packed = packed;
-    extension->repeated_enum_value =
-        Arena::CreateMessage<RepeatedField<int>>(arena_);
-  } else {
-    GOOGLE_DCHECK_TYPE(*extension, REPEATED_FIELD, ENUM);
-    GOOGLE_DCHECK_EQ(extension->is_packed, packed);
-  }
-  extension->repeated_enum_value->Add(value);
-}
-
-// -------------------------------------------------------------------
-// Strings
-
-const std::string& ExtensionSet::GetString(
-    int number, const std::string& default_value) const {
-  const Extension* extension = FindOrNull(number);
-  if (extension == nullptr || extension->is_cleared) {
-    // Not present.  Return the default value.
-    return default_value;
-  } else {
-    GOOGLE_DCHECK_TYPE(*extension, OPTIONAL_FIELD, STRING);
-    return *extension->string_value;
-  }
-}
-
-std::string* ExtensionSet::MutableString(int number, FieldType type,
-                                         const FieldDescriptor* descriptor) {
-  Extension* extension;
-  if (MaybeNewExtension(number, descriptor, &extension)) {
-    extension->type = type;
-    GOOGLE_DCHECK_EQ(cpp_type(extension->type), WireFormatLite::CPPTYPE_STRING);
-    extension->is_repeated = false;
-    extension->string_value = Arena::Create<std::string>(arena_);
-  } else {
-    GOOGLE_DCHECK_TYPE(*extension, OPTIONAL_FIELD, STRING);
-  }
-  extension->is_cleared = false;
-  return extension->string_value;
-}
-
-const std::string& ExtensionSet::GetRepeatedString(int number,
-                                                   int index) const {
-  const Extension* extension = FindOrNull(number);
-  GOOGLE_CHECK(extension != nullptr) << "Index out-of-bounds (field is empty).";
-  GOOGLE_DCHECK_TYPE(*extension, REPEATED_FIELD, STRING);
-  return extension->repeated_string_value->Get(index);
-}
-
-std::string* ExtensionSet::MutableRepeatedString(int number, int index) {
-  Extension* extension = FindOrNull(number);
-  GOOGLE_CHECK(extension != nullptr) << "Index out-of-bounds (field is empty).";
-  GOOGLE_DCHECK_TYPE(*extension, REPEATED_FIELD, STRING);
-  return extension->repeated_string_value->Mutable(index);
-}
-
-std::string* ExtensionSet::AddString(int number, FieldType type,
-                                     const FieldDescriptor* descriptor) {
-  Extension* extension;
-  if (MaybeNewExtension(number, descriptor, &extension)) {
-    extension->type = type;
-    GOOGLE_DCHECK_EQ(cpp_type(extension->type), WireFormatLite::CPPTYPE_STRING);
-    extension->is_repeated = true;
-    extension->is_packed = false;
-    extension->repeated_string_value =
-        Arena::CreateMessage<RepeatedPtrField<std::string>>(arena_);
-  } else {
-    GOOGLE_DCHECK_TYPE(*extension, REPEATED_FIELD, STRING);
-  }
-  return extension->repeated_string_value->Add();
-}
-
-// -------------------------------------------------------------------
-// Messages
-
-const MessageLite& ExtensionSet::GetMessage(
-    int number, const MessageLite& default_value) const {
-  const Extension* extension = FindOrNull(number);
-  if (extension == nullptr) {
-    // Not present.  Return the default value.
-    return default_value;
-  } else {
-    GOOGLE_DCHECK_TYPE(*extension, OPTIONAL_FIELD, MESSAGE);
-    if (extension->is_lazy) {
-      return extension->lazymessage_value->GetMessage(default_value, arena_);
-    } else {
-      return *extension->message_value;
-    }
-  }
-}
-
-// Defined in extension_set_heavy.cc.
-// const MessageLite& ExtensionSet::GetMessage(int number,
-//                                             const Descriptor* message_type,
-//                                             MessageFactory* factory) const
-
-MessageLite* ExtensionSet::MutableMessage(int number, FieldType type,
-                                          const MessageLite& prototype,
-                                          const FieldDescriptor* descriptor) {
-  Extension* extension;
-  if (MaybeNewExtension(number, descriptor, &extension)) {
-    extension->type = type;
-    GOOGLE_DCHECK_EQ(cpp_type(extension->type), WireFormatLite::CPPTYPE_MESSAGE);
-    extension->is_repeated = false;
-    extension->is_lazy = false;
-    extension->message_value = prototype.New(arena_);
-    extension->is_cleared = false;
-    return extension->message_value;
-  } else {
-    GOOGLE_DCHECK_TYPE(*extension, OPTIONAL_FIELD, MESSAGE);
-    extension->is_cleared = false;
-    if (extension->is_lazy) {
-      return extension->lazymessage_value->MutableMessage(prototype, arena_);
-    } else {
-      return extension->message_value;
-    }
-  }
-}
-
-// Defined in extension_set_heavy.cc.
-// MessageLite* ExtensionSet::MutableMessage(int number, FieldType type,
-//                                           const Descriptor* message_type,
-//                                           MessageFactory* factory)
-
-void ExtensionSet::SetAllocatedMessage(int number, FieldType type,
-                                       const FieldDescriptor* descriptor,
-                                       MessageLite* message) {
-  if (message == nullptr) {
-    ClearExtension(number);
-    return;
-  }
-  GOOGLE_DCHECK(message->GetOwningArena() == nullptr ||
-         message->GetOwningArena() == arena_);
-  Arena* message_arena = message->GetOwningArena();
-  Extension* extension;
-  if (MaybeNewExtension(number, descriptor, &extension)) {
-    extension->type = type;
-    GOOGLE_DCHECK_EQ(cpp_type(extension->type), WireFormatLite::CPPTYPE_MESSAGE);
-    extension->is_repeated = false;
-    extension->is_lazy = false;
-    if (message_arena == arena_) {
-      extension->message_value = message;
-    } else if (message_arena == nullptr) {
-      extension->message_value = message;
-      arena_->Own(message);  // not nullptr because not equal to message_arena
-    } else {
-      extension->message_value = message->New(arena_);
-      extension->message_value->CheckTypeAndMergeFrom(*message);
-    }
-  } else {
-    GOOGLE_DCHECK_TYPE(*extension, OPTIONAL_FIELD, MESSAGE);
-    if (extension->is_lazy) {
-      extension->lazymessage_value->SetAllocatedMessage(message, arena_);
-    } else {
-      if (arena_ == nullptr) {
-        delete extension->message_value;
-      }
-      if (message_arena == arena_) {
-        extension->message_value = message;
-      } else if (message_arena == nullptr) {
-        extension->message_value = message;
-        arena_->Own(message);  // not nullptr because not equal to message_arena
-      } else {
-        extension->message_value = message->New(arena_);
-        extension->message_value->CheckTypeAndMergeFrom(*message);
-      }
-    }
-  }
-  extension->is_cleared = false;
-}
-
-void ExtensionSet::UnsafeArenaSetAllocatedMessage(
-    int number, FieldType type, const FieldDescriptor* descriptor,
-    MessageLite* message) {
-  if (message == nullptr) {
-    ClearExtension(number);
-    return;
-  }
-  Extension* extension;
-  if (MaybeNewExtension(number, descriptor, &extension)) {
-    extension->type = type;
-    GOOGLE_DCHECK_EQ(cpp_type(extension->type), WireFormatLite::CPPTYPE_MESSAGE);
-    extension->is_repeated = false;
-    extension->is_lazy = false;
-    extension->message_value = message;
-  } else {
-    GOOGLE_DCHECK_TYPE(*extension, OPTIONAL_FIELD, MESSAGE);
-    if (extension->is_lazy) {
-      extension->lazymessage_value->UnsafeArenaSetAllocatedMessage(message,
-                                                                   arena_);
-    } else {
-      if (arena_ == nullptr) {
-        delete extension->message_value;
-      }
-      extension->message_value = message;
-    }
-  }
-  extension->is_cleared = false;
-}
-
-MessageLite* ExtensionSet::ReleaseMessage(int number,
-                                          const MessageLite& prototype) {
-  Extension* extension = FindOrNull(number);
-  if (extension == nullptr) {
-    // Not present.  Return nullptr.
-    return nullptr;
-  } else {
-    GOOGLE_DCHECK_TYPE(*extension, OPTIONAL_FIELD, MESSAGE);
-    MessageLite* ret = nullptr;
-    if (extension->is_lazy) {
-      ret = extension->lazymessage_value->ReleaseMessage(prototype, arena_);
-      if (arena_ == nullptr) {
-        delete extension->lazymessage_value;
-      }
-    } else {
-      if (arena_ == nullptr) {
-        ret = extension->message_value;
-      } else {
-        // ReleaseMessage() always returns a heap-allocated message, and we are
-        // on an arena, so we need to make a copy of this message to return.
-        ret = extension->message_value->New();
-        ret->CheckTypeAndMergeFrom(*extension->message_value);
-      }
-    }
-    Erase(number);
-    return ret;
-  }
-}
-
-MessageLite* ExtensionSet::UnsafeArenaReleaseMessage(
-    int number, const MessageLite& prototype) {
-  Extension* extension = FindOrNull(number);
-  if (extension == nullptr) {
-    // Not present.  Return nullptr.
-    return nullptr;
-  } else {
-    GOOGLE_DCHECK_TYPE(*extension, OPTIONAL_FIELD, MESSAGE);
-    MessageLite* ret = nullptr;
-    if (extension->is_lazy) {
-      ret = extension->lazymessage_value->UnsafeArenaReleaseMessage(prototype,
-                                                                    arena_);
-      if (arena_ == nullptr) {
-        delete extension->lazymessage_value;
-      }
-    } else {
-      ret = extension->message_value;
-    }
-    Erase(number);
-    return ret;
-  }
-}
-
-// Defined in extension_set_heavy.cc.
-// MessageLite* ExtensionSet::ReleaseMessage(const FieldDescriptor* descriptor,
-//                                           MessageFactory* factory);
-
-const MessageLite& ExtensionSet::GetRepeatedMessage(int number,
-                                                    int index) const {
-  const Extension* extension = FindOrNull(number);
-  GOOGLE_CHECK(extension != nullptr) << "Index out-of-bounds (field is empty).";
-  GOOGLE_DCHECK_TYPE(*extension, REPEATED_FIELD, MESSAGE);
-  return extension->repeated_message_value->Get(index);
-}
-
-MessageLite* ExtensionSet::MutableRepeatedMessage(int number, int index) {
-  Extension* extension = FindOrNull(number);
-  GOOGLE_CHECK(extension != nullptr) << "Index out-of-bounds (field is empty).";
-  GOOGLE_DCHECK_TYPE(*extension, REPEATED_FIELD, MESSAGE);
-  return extension->repeated_message_value->Mutable(index);
-}
-
-MessageLite* ExtensionSet::AddMessage(int number, FieldType type,
-                                      const MessageLite& prototype,
-                                      const FieldDescriptor* descriptor) {
-  Extension* extension;
-  if (MaybeNewExtension(number, descriptor, &extension)) {
-    extension->type = type;
-    GOOGLE_DCHECK_EQ(cpp_type(extension->type), WireFormatLite::CPPTYPE_MESSAGE);
-    extension->is_repeated = true;
-    extension->repeated_message_value =
-        Arena::CreateMessage<RepeatedPtrField<MessageLite>>(arena_);
-  } else {
-    GOOGLE_DCHECK_TYPE(*extension, REPEATED_FIELD, MESSAGE);
-  }
-
-  // RepeatedPtrField<MessageLite> does not know how to Add() since it cannot
-  // allocate an abstract object, so we have to be tricky.
-  MessageLite* result = reinterpret_cast<internal::RepeatedPtrFieldBase*>(
-                            extension->repeated_message_value)
-                            ->AddFromCleared<GenericTypeHandler<MessageLite>>();
-  if (result == nullptr) {
-    result = prototype.New(arena_);
-    extension->repeated_message_value->AddAllocated(result);
-  }
-  return result;
-}
-
-// Defined in extension_set_heavy.cc.
-// MessageLite* ExtensionSet::AddMessage(int number, FieldType type,
-//                                       const Descriptor* message_type,
-//                                       MessageFactory* factory)
-
-#undef GOOGLE_DCHECK_TYPE
-
-void ExtensionSet::RemoveLast(int number) {
-  Extension* extension = FindOrNull(number);
-  GOOGLE_CHECK(extension != nullptr) << "Index out-of-bounds (field is empty).";
-  GOOGLE_DCHECK(extension->is_repeated);
-
-  switch (cpp_type(extension->type)) {
-    case WireFormatLite::CPPTYPE_INT32:
-      extension->repeated_int32_t_value->RemoveLast();
-      break;
-    case WireFormatLite::CPPTYPE_INT64:
-      extension->repeated_int64_t_value->RemoveLast();
-      break;
-    case WireFormatLite::CPPTYPE_UINT32:
-      extension->repeated_uint32_t_value->RemoveLast();
-      break;
-    case WireFormatLite::CPPTYPE_UINT64:
-      extension->repeated_uint64_t_value->RemoveLast();
-      break;
-    case WireFormatLite::CPPTYPE_FLOAT:
-      extension->repeated_float_value->RemoveLast();
-      break;
-    case WireFormatLite::CPPTYPE_DOUBLE:
-      extension->repeated_double_value->RemoveLast();
-      break;
-    case WireFormatLite::CPPTYPE_BOOL:
-      extension->repeated_bool_value->RemoveLast();
-      break;
-    case WireFormatLite::CPPTYPE_ENUM:
-      extension->repeated_enum_value->RemoveLast();
-      break;
-    case WireFormatLite::CPPTYPE_STRING:
-      extension->repeated_string_value->RemoveLast();
-      break;
-    case WireFormatLite::CPPTYPE_MESSAGE:
-      extension->repeated_message_value->RemoveLast();
-      break;
-  }
-}
-
-MessageLite* ExtensionSet::ReleaseLast(int number) {
-  Extension* extension = FindOrNull(number);
-  GOOGLE_CHECK(extension != nullptr) << "Index out-of-bounds (field is empty).";
-  GOOGLE_DCHECK(extension->is_repeated);
-  GOOGLE_DCHECK(cpp_type(extension->type) == WireFormatLite::CPPTYPE_MESSAGE);
-  return extension->repeated_message_value->ReleaseLast();
-}
-
-MessageLite* ExtensionSet::UnsafeArenaReleaseLast(int number) {
-  Extension* extension = FindOrNull(number);
-  GOOGLE_CHECK(extension != nullptr) << "Index out-of-bounds (field is empty).";
-  GOOGLE_DCHECK(extension->is_repeated);
-  GOOGLE_DCHECK(cpp_type(extension->type) == WireFormatLite::CPPTYPE_MESSAGE);
-  return extension->repeated_message_value->UnsafeArenaReleaseLast();
-}
-
-void ExtensionSet::SwapElements(int number, int index1, int index2) {
-  Extension* extension = FindOrNull(number);
-  GOOGLE_CHECK(extension != nullptr) << "Index out-of-bounds (field is empty).";
-  GOOGLE_DCHECK(extension->is_repeated);
-
-  switch (cpp_type(extension->type)) {
-    case WireFormatLite::CPPTYPE_INT32:
-      extension->repeated_int32_t_value->SwapElements(index1, index2);
-      break;
-    case WireFormatLite::CPPTYPE_INT64:
-      extension->repeated_int64_t_value->SwapElements(index1, index2);
-      break;
-    case WireFormatLite::CPPTYPE_UINT32:
-      extension->repeated_uint32_t_value->SwapElements(index1, index2);
-      break;
-    case WireFormatLite::CPPTYPE_UINT64:
-      extension->repeated_uint64_t_value->SwapElements(index1, index2);
-      break;
-    case WireFormatLite::CPPTYPE_FLOAT:
-      extension->repeated_float_value->SwapElements(index1, index2);
-      break;
-    case WireFormatLite::CPPTYPE_DOUBLE:
-      extension->repeated_double_value->SwapElements(index1, index2);
-      break;
-    case WireFormatLite::CPPTYPE_BOOL:
-      extension->repeated_bool_value->SwapElements(index1, index2);
-      break;
-    case WireFormatLite::CPPTYPE_ENUM:
-      extension->repeated_enum_value->SwapElements(index1, index2);
-      break;
-    case WireFormatLite::CPPTYPE_STRING:
-      extension->repeated_string_value->SwapElements(index1, index2);
-      break;
-    case WireFormatLite::CPPTYPE_MESSAGE:
-      extension->repeated_message_value->SwapElements(index1, index2);
-      break;
-  }
-}
-
-// ===================================================================
-
-void ExtensionSet::Clear() {
-  ForEach([](int /* number */, Extension& ext) { ext.Clear(); });
-}
-
-namespace {
-// Computes the size of an ExtensionSet union without actually constructing the
-// union. Note that we do not count cleared extensions from the source to be
-// part of the total, because there is no need to allocate space for those. We
-// do include cleared extensions in the destination, though, because those are
-// already allocated and will not be going away.
-template <typename ItX, typename ItY>
-size_t SizeOfUnion(ItX it_dest, ItX end_dest, ItY it_source, ItY end_source) {
-  size_t result = 0;
-  while (it_dest != end_dest && it_source != end_source) {
-    if (it_dest->first < it_source->first) {
-      ++result;
-      ++it_dest;
-    } else if (it_dest->first == it_source->first) {
-      ++result;
-      ++it_dest;
-      ++it_source;
-    } else {
-      if (!it_source->second.is_cleared) {
-        ++result;
-      }
-      ++it_source;
-    }
-  }
-  result += std::distance(it_dest, end_dest);
-  for (; it_source != end_source; ++it_source) {
-    if (!it_source->second.is_cleared) {
-      ++result;
-    }
-  }
-  return result;
-}
-}  // namespace
-
-void ExtensionSet::MergeFrom(const MessageLite* extendee,
-                             const ExtensionSet& other) {
-  if (PROTOBUF_PREDICT_TRUE(!is_large())) {
-    if (PROTOBUF_PREDICT_TRUE(!other.is_large())) {
-      GrowCapacity(SizeOfUnion(flat_begin(), flat_end(), other.flat_begin(),
-                               other.flat_end()));
-    } else {
-      GrowCapacity(SizeOfUnion(flat_begin(), flat_end(),
-                               other.map_.large->begin(),
-                               other.map_.large->end()));
-    }
-  }
-  other.ForEach([extendee, this, &other](int number, const Extension& ext) {
-    this->InternalExtensionMergeFrom(extendee, number, ext, other.arena_);
-  });
-}
-
-void ExtensionSet::InternalExtensionMergeFrom(const MessageLite* extendee,
-                                              int number,
-                                              const Extension& other_extension,
-                                              Arena* other_arena) {
-  if (other_extension.is_repeated) {
-    Extension* extension;
-    bool is_new =
-        MaybeNewExtension(number, other_extension.descriptor, &extension);
-    if (is_new) {
-      // Extension did not already exist in set.
-      extension->type = other_extension.type;
-      extension->is_packed = other_extension.is_packed;
-      extension->is_repeated = true;
-    } else {
-      GOOGLE_DCHECK_EQ(extension->type, other_extension.type);
-      GOOGLE_DCHECK_EQ(extension->is_packed, other_extension.is_packed);
-      GOOGLE_DCHECK(extension->is_repeated);
-    }
-
-    switch (cpp_type(other_extension.type)) {
-#define HANDLE_TYPE(UPPERCASE, LOWERCASE, REPEATED_TYPE) \
-  case WireFormatLite::CPPTYPE_##UPPERCASE:              \
-    if (is_new) {                                        \
-      extension->repeated_##LOWERCASE##_value =          \
-          Arena::CreateMessage<REPEATED_TYPE>(arena_);   \
-    }                                                    \
-    extension->repeated_##LOWERCASE##_value->MergeFrom(  \
-        *other_extension.repeated_##LOWERCASE##_value);  \
-    break;
-
-      HANDLE_TYPE(INT32, int32_t, RepeatedField<int32_t>);
-      HANDLE_TYPE(INT64, int64_t, RepeatedField<int64_t>);
-      HANDLE_TYPE(UINT32, uint32_t, RepeatedField<uint32_t>);
-      HANDLE_TYPE(UINT64, uint64_t, RepeatedField<uint64_t>);
-      HANDLE_TYPE(FLOAT, float, RepeatedField<float>);
-      HANDLE_TYPE(DOUBLE, double, RepeatedField<double>);
-      HANDLE_TYPE(BOOL, bool, RepeatedField<bool>);
-      HANDLE_TYPE(ENUM, enum, RepeatedField<int>);
-      HANDLE_TYPE(STRING, string, RepeatedPtrField<std::string>);
-#undef HANDLE_TYPE
-
-      case WireFormatLite::CPPTYPE_MESSAGE:
-        if (is_new) {
-          extension->repeated_message_value =
-              Arena::CreateMessage<RepeatedPtrField<MessageLite>>(arena_);
-        }
-        // We can't call RepeatedPtrField<MessageLite>::MergeFrom() because
-        // it would attempt to allocate new objects.
-        RepeatedPtrField<MessageLite>* other_repeated_message =
-            other_extension.repeated_message_value;
-        for (int i = 0; i < other_repeated_message->size(); i++) {
-          const MessageLite& other_message = other_repeated_message->Get(i);
-          MessageLite* target =
-              reinterpret_cast<internal::RepeatedPtrFieldBase*>(
-                  extension->repeated_message_value)
-                  ->AddFromCleared<GenericTypeHandler<MessageLite>>();
-          if (target == nullptr) {
-            target = other_message.New(arena_);
-            extension->repeated_message_value->AddAllocated(target);
-          }
-          target->CheckTypeAndMergeFrom(other_message);
-        }
-        break;
-    }
-  } else {
-    if (!other_extension.is_cleared) {
-      switch (cpp_type(other_extension.type)) {
-#define HANDLE_TYPE(UPPERCASE, LOWERCASE, CAMELCASE)  \
-  case WireFormatLite::CPPTYPE_##UPPERCASE:           \
-    Set##CAMELCASE(number, other_extension.type,      \
-                   other_extension.LOWERCASE##_value, \
-                   other_extension.descriptor);       \
-    break;
-
-        HANDLE_TYPE(INT32, int32_t, Int32);
-        HANDLE_TYPE(INT64, int64_t, Int64);
-        HANDLE_TYPE(UINT32, uint32_t, UInt32);
-        HANDLE_TYPE(UINT64, uint64_t, UInt64);
-        HANDLE_TYPE(FLOAT, float, Float);
-        HANDLE_TYPE(DOUBLE, double, Double);
-        HANDLE_TYPE(BOOL, bool, Bool);
-        HANDLE_TYPE(ENUM, enum, Enum);
-#undef HANDLE_TYPE
-        case WireFormatLite::CPPTYPE_STRING:
-          SetString(number, other_extension.type, *other_extension.string_value,
-                    other_extension.descriptor);
-          break;
-        case WireFormatLite::CPPTYPE_MESSAGE: {
-          Extension* extension;
-          bool is_new =
-              MaybeNewExtension(number, other_extension.descriptor, &extension);
-          if (is_new) {
-            extension->type = other_extension.type;
-            extension->is_packed = other_extension.is_packed;
-            extension->is_repeated = false;
-            if (other_extension.is_lazy) {
-              extension->is_lazy = true;
-              extension->lazymessage_value =
-                  other_extension.lazymessage_value->New(arena_);
-              extension->lazymessage_value->MergeFrom(
-                  GetPrototypeForLazyMessage(extendee, number),
-                  *other_extension.lazymessage_value, arena_);
-            } else {
-              extension->is_lazy = false;
-              extension->message_value =
-                  other_extension.message_value->New(arena_);
-              extension->message_value->CheckTypeAndMergeFrom(
-                  *other_extension.message_value);
-            }
-          } else {
-            GOOGLE_DCHECK_EQ(extension->type, other_extension.type);
-            GOOGLE_DCHECK_EQ(extension->is_packed, other_extension.is_packed);
-            GOOGLE_DCHECK(!extension->is_repeated);
-            if (other_extension.is_lazy) {
-              if (extension->is_lazy) {
-                extension->lazymessage_value->MergeFrom(
-                    GetPrototypeForLazyMessage(extendee, number),
-                    *other_extension.lazymessage_value, arena_);
-              } else {
-                extension->message_value->CheckTypeAndMergeFrom(
-                    other_extension.lazymessage_value->GetMessage(
-                        *extension->message_value, other_arena));
-              }
-            } else {
-              if (extension->is_lazy) {
-                extension->lazymessage_value
-                    ->MutableMessage(*other_extension.message_value, arena_)
-                    ->CheckTypeAndMergeFrom(*other_extension.message_value);
-              } else {
-                extension->message_value->CheckTypeAndMergeFrom(
-                    *other_extension.message_value);
-              }
-            }
-          }
-          extension->is_cleared = false;
-          break;
-        }
-      }
-    }
-  }
-}
-
-void ExtensionSet::Swap(const MessageLite* extendee, ExtensionSet* other) {
-#ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-  if (GetArena() != nullptr && GetArena() == other->GetArena()) {
-#else   // PROTOBUF_FORCE_COPY_IN_SWAP
-  if (GetArena() == other->GetArena()) {
-#endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-    InternalSwap(other);
-  } else {
-    // TODO(cfallin, rohananil): We maybe able to optimize a case where we are
-    // swapping from heap to arena-allocated extension set, by just Own()'ing
-    // the extensions.
-    ExtensionSet extension_set;
-    extension_set.MergeFrom(extendee, *other);
-    other->Clear();
-    other->MergeFrom(extendee, *this);
-    Clear();
-    MergeFrom(extendee, extension_set);
-  }
-}
-
-void ExtensionSet::InternalSwap(ExtensionSet* other) {
-  using std::swap;
-  swap(arena_, other->arena_);
-  swap(flat_capacity_, other->flat_capacity_);
-  swap(flat_size_, other->flat_size_);
-  swap(map_, other->map_);
-}
-
-void ExtensionSet::SwapExtension(const MessageLite* extendee,
-                                 ExtensionSet* other, int number) {
-  if (this == other) return;
-
-  if (GetArena() == other->GetArena()) {
-    UnsafeShallowSwapExtension(other, number);
-    return;
-  }
-
-  Extension* this_ext = FindOrNull(number);
-  Extension* other_ext = other->FindOrNull(number);
-
-  if (this_ext == other_ext) return;
-
-  if (this_ext != nullptr && other_ext != nullptr) {
-    // TODO(cfallin, rohananil): We could further optimize these cases,
-    // especially avoid creation of ExtensionSet, and move MergeFrom logic
-    // into Extensions itself (which takes arena as an argument).
-    // We do it this way to reuse the copy-across-arenas logic already
-    // implemented in ExtensionSet's MergeFrom.
-    ExtensionSet temp;
-    temp.InternalExtensionMergeFrom(extendee, number, *other_ext,
-                                    other->GetArena());
-    Extension* temp_ext = temp.FindOrNull(number);
-
-    other_ext->Clear();
-    other->InternalExtensionMergeFrom(extendee, number, *this_ext,
-                                      this->GetArena());
-    this_ext->Clear();
-    InternalExtensionMergeFrom(extendee, number, *temp_ext, temp.GetArena());
-  } else if (this_ext == nullptr) {
-    InternalExtensionMergeFrom(extendee, number, *other_ext, other->GetArena());
-    if (other->GetArena() == nullptr) other_ext->Free();
-    other->Erase(number);
-  } else {
-    other->InternalExtensionMergeFrom(extendee, number, *this_ext,
-                                      this->GetArena());
-    if (GetArena() == nullptr) this_ext->Free();
-    Erase(number);
-  }
-}
-
-void ExtensionSet::UnsafeShallowSwapExtension(ExtensionSet* other, int number) {
-  if (this == other) return;
-
-  Extension* this_ext = FindOrNull(number);
-  Extension* other_ext = other->FindOrNull(number);
-
-  if (this_ext == other_ext) return;
-
-  GOOGLE_DCHECK_EQ(GetArena(), other->GetArena());
-
-  if (this_ext != nullptr && other_ext != nullptr) {
-    std::swap(*this_ext, *other_ext);
-  } else if (this_ext == nullptr) {
-    *Insert(number).first = *other_ext;
-    other->Erase(number);
-  } else {
-    *other->Insert(number).first = *this_ext;
-    Erase(number);
-  }
-}
-
-bool ExtensionSet::IsInitialized() const {
-  // Extensions are never required.  However, we need to check that all
-  // embedded messages are initialized.
-  if (PROTOBUF_PREDICT_FALSE(is_large())) {
-    for (const auto& kv : *map_.large) {
-      if (!kv.second.IsInitialized()) return false;
-    }
-    return true;
-  }
-  for (const KeyValue* it = flat_begin(); it != flat_end(); ++it) {
-    if (!it->second.IsInitialized()) return false;
-  }
-  return true;
-}
-
-const char* ExtensionSet::ParseField(uint64_t tag, const char* ptr,
-                                     const MessageLite* extendee,
-                                     internal::InternalMetadata* metadata,
-                                     internal::ParseContext* ctx) {
-  GeneratedExtensionFinder finder(extendee);
-  int number = tag >> 3;
-  bool was_packed_on_wire;
-  ExtensionInfo extension;
-  if (!FindExtensionInfoFromFieldNumber(tag & 7, number, &finder, &extension,
-                                        &was_packed_on_wire)) {
-    return UnknownFieldParse(
-        tag, metadata->mutable_unknown_fields<std::string>(), ptr, ctx);
-  }
-  return ParseFieldWithExtensionInfo<std::string>(
-      number, was_packed_on_wire, extension, metadata, ptr, ctx);
-}
-
-const char* ExtensionSet::ParseMessageSetItem(
-    const char* ptr, const MessageLite* extendee,
-    internal::InternalMetadata* metadata, internal::ParseContext* ctx) {
-  return ParseMessageSetItemTmpl<MessageLite, std::string>(ptr, extendee,
-                                                           metadata, ctx);
-}
-
-uint8_t* ExtensionSet::_InternalSerializeImpl(
-    const MessageLite* extendee, int start_field_number, int end_field_number,
-    uint8_t* target, io::EpsCopyOutputStream* stream) const {
-  if (PROTOBUF_PREDICT_FALSE(is_large())) {
-    const auto& end = map_.large->end();
-    for (auto it = map_.large->lower_bound(start_field_number);
-         it != end && it->first < end_field_number; ++it) {
-      target = it->second.InternalSerializeFieldWithCachedSizesToArray(
-          extendee, this, it->first, target, stream);
-    }
-    return target;
-  }
-  const KeyValue* end = flat_end();
-  for (const KeyValue* it = std::lower_bound(
-           flat_begin(), end, start_field_number, KeyValue::FirstComparator());
-       it != end && it->first < end_field_number; ++it) {
-    target = it->second.InternalSerializeFieldWithCachedSizesToArray(
-        extendee, this, it->first, target, stream);
-  }
-  return target;
-}
-
-uint8_t* ExtensionSet::InternalSerializeMessageSetWithCachedSizesToArray(
-    const MessageLite* extendee, uint8_t* target,
-    io::EpsCopyOutputStream* stream) const {
-  const ExtensionSet* extension_set = this;
-  ForEach([&target, extendee, stream, extension_set](int number,
-                                                     const Extension& ext) {
-    target = ext.InternalSerializeMessageSetItemWithCachedSizesToArray(
-        extendee, extension_set, number, target, stream);
-  });
-  return target;
-}
-
-size_t ExtensionSet::ByteSize() const {
-  size_t total_size = 0;
-  ForEach([&total_size](int number, const Extension& ext) {
-    total_size += ext.ByteSize(number);
-  });
-  return total_size;
-}
-
-// Defined in extension_set_heavy.cc.
-// int ExtensionSet::SpaceUsedExcludingSelf() const
-
-bool ExtensionSet::MaybeNewExtension(int number,
-                                     const FieldDescriptor* descriptor,
-                                     Extension** result) {
-  bool extension_is_new = false;
-  std::tie(*result, extension_is_new) = Insert(number);
-  (*result)->descriptor = descriptor;
-  return extension_is_new;
-}
-
-// ===================================================================
-// Methods of ExtensionSet::Extension
-
-void ExtensionSet::Extension::Clear() {
-  if (is_repeated) {
-    switch (cpp_type(type)) {
-#define HANDLE_TYPE(UPPERCASE, LOWERCASE)   \
-  case WireFormatLite::CPPTYPE_##UPPERCASE: \
-    repeated_##LOWERCASE##_value->Clear();  \
-    break
-
-      HANDLE_TYPE(INT32, int32_t);
-      HANDLE_TYPE(INT64, int64_t);
-      HANDLE_TYPE(UINT32, uint32_t);
-      HANDLE_TYPE(UINT64, uint64_t);
-      HANDLE_TYPE(FLOAT, float);
-      HANDLE_TYPE(DOUBLE, double);
-      HANDLE_TYPE(BOOL, bool);
-      HANDLE_TYPE(ENUM, enum);
-      HANDLE_TYPE(STRING, string);
-      HANDLE_TYPE(MESSAGE, message);
-#undef HANDLE_TYPE
-    }
-  } else {
-    if (!is_cleared) {
-      switch (cpp_type(type)) {
-        case WireFormatLite::CPPTYPE_STRING:
-          string_value->clear();
-          break;
-        case WireFormatLite::CPPTYPE_MESSAGE:
-          if (is_lazy) {
-            lazymessage_value->Clear();
-          } else {
-            message_value->Clear();
-          }
-          break;
-        default:
-          // No need to do anything.  Get*() will return the default value
-          // as long as is_cleared is true and Set*() will overwrite the
-          // previous value.
-          break;
-      }
-
-      is_cleared = true;
-    }
-  }
-}
-
-size_t ExtensionSet::Extension::ByteSize(int number) const {
-  size_t result = 0;
-
-  if (is_repeated) {
-    if (is_packed) {
-      switch (real_type(type)) {
-#define HANDLE_TYPE(UPPERCASE, CAMELCASE, LOWERCASE)                 \
-  case WireFormatLite::TYPE_##UPPERCASE:                             \
-    for (int i = 0; i < repeated_##LOWERCASE##_value->size(); i++) { \
-      result += WireFormatLite::CAMELCASE##Size(                     \
-          repeated_##LOWERCASE##_value->Get(i));                     \
-    }                                                                \
-    break
-
-        HANDLE_TYPE(INT32, Int32, int32_t);
-        HANDLE_TYPE(INT64, Int64, int64_t);
-        HANDLE_TYPE(UINT32, UInt32, uint32_t);
-        HANDLE_TYPE(UINT64, UInt64, uint64_t);
-        HANDLE_TYPE(SINT32, SInt32, int32_t);
-        HANDLE_TYPE(SINT64, SInt64, int64_t);
-        HANDLE_TYPE(ENUM, Enum, enum);
-#undef HANDLE_TYPE
-
-        // Stuff with fixed size.
-#define HANDLE_TYPE(UPPERCASE, CAMELCASE, LOWERCASE)             \
-  case WireFormatLite::TYPE_##UPPERCASE:                         \
-    result += WireFormatLite::k##CAMELCASE##Size *               \
-              FromIntSize(repeated_##LOWERCASE##_value->size()); \
-    break
-        HANDLE_TYPE(FIXED32, Fixed32, uint32_t);
-        HANDLE_TYPE(FIXED64, Fixed64, uint64_t);
-        HANDLE_TYPE(SFIXED32, SFixed32, int32_t);
-        HANDLE_TYPE(SFIXED64, SFixed64, int64_t);
-        HANDLE_TYPE(FLOAT, Float, float);
-        HANDLE_TYPE(DOUBLE, Double, double);
-        HANDLE_TYPE(BOOL, Bool, bool);
-#undef HANDLE_TYPE
-
-        case WireFormatLite::TYPE_STRING:
-        case WireFormatLite::TYPE_BYTES:
-        case WireFormatLite::TYPE_GROUP:
-        case WireFormatLite::TYPE_MESSAGE:
-          GOOGLE_LOG(FATAL) << "Non-primitive types can't be packed.";
-          break;
-      }
-
-      cached_size = ToCachedSize(result);
-      if (result > 0) {
-        result += io::CodedOutputStream::VarintSize32(result);
-        result += io::CodedOutputStream::VarintSize32(WireFormatLite::MakeTag(
-            number, WireFormatLite::WIRETYPE_LENGTH_DELIMITED));
-      }
-    } else {
-      size_t tag_size = WireFormatLite::TagSize(number, real_type(type));
-
-      switch (real_type(type)) {
-#define HANDLE_TYPE(UPPERCASE, CAMELCASE, LOWERCASE)                        \
-  case WireFormatLite::TYPE_##UPPERCASE:                                    \
-    result += tag_size * FromIntSize(repeated_##LOWERCASE##_value->size()); \
-    for (int i = 0; i < repeated_##LOWERCASE##_value->size(); i++) {        \
-      result += WireFormatLite::CAMELCASE##Size(                            \
-          repeated_##LOWERCASE##_value->Get(i));                            \
-    }                                                                       \
-    break
-
-        HANDLE_TYPE(INT32, Int32, int32_t);
-        HANDLE_TYPE(INT64, Int64, int64_t);
-        HANDLE_TYPE(UINT32, UInt32, uint32_t);
-        HANDLE_TYPE(UINT64, UInt64, uint64_t);
-        HANDLE_TYPE(SINT32, SInt32, int32_t);
-        HANDLE_TYPE(SINT64, SInt64, int64_t);
-        HANDLE_TYPE(STRING, String, string);
-        HANDLE_TYPE(BYTES, Bytes, string);
-        HANDLE_TYPE(ENUM, Enum, enum);
-        HANDLE_TYPE(GROUP, Group, message);
-        HANDLE_TYPE(MESSAGE, Message, message);
-#undef HANDLE_TYPE
-
-        // Stuff with fixed size.
-#define HANDLE_TYPE(UPPERCASE, CAMELCASE, LOWERCASE)             \
-  case WireFormatLite::TYPE_##UPPERCASE:                         \
-    result += (tag_size + WireFormatLite::k##CAMELCASE##Size) *  \
-              FromIntSize(repeated_##LOWERCASE##_value->size()); \
-    break
-        HANDLE_TYPE(FIXED32, Fixed32, uint32_t);
-        HANDLE_TYPE(FIXED64, Fixed64, uint64_t);
-        HANDLE_TYPE(SFIXED32, SFixed32, int32_t);
-        HANDLE_TYPE(SFIXED64, SFixed64, int64_t);
-        HANDLE_TYPE(FLOAT, Float, float);
-        HANDLE_TYPE(DOUBLE, Double, double);
-        HANDLE_TYPE(BOOL, Bool, bool);
-#undef HANDLE_TYPE
-      }
-    }
-  } else if (!is_cleared) {
-    result += WireFormatLite::TagSize(number, real_type(type));
-    switch (real_type(type)) {
-#define HANDLE_TYPE(UPPERCASE, CAMELCASE, LOWERCASE)      \
-  case WireFormatLite::TYPE_##UPPERCASE:                  \
-    result += WireFormatLite::CAMELCASE##Size(LOWERCASE); \
-    break
-
-      HANDLE_TYPE(INT32, Int32, int32_t_value);
-      HANDLE_TYPE(INT64, Int64, int64_t_value);
-      HANDLE_TYPE(UINT32, UInt32, uint32_t_value);
-      HANDLE_TYPE(UINT64, UInt64, uint64_t_value);
-      HANDLE_TYPE(SINT32, SInt32, int32_t_value);
-      HANDLE_TYPE(SINT64, SInt64, int64_t_value);
-      HANDLE_TYPE(STRING, String, *string_value);
-      HANDLE_TYPE(BYTES, Bytes, *string_value);
-      HANDLE_TYPE(ENUM, Enum, enum_value);
-      HANDLE_TYPE(GROUP, Group, *message_value);
-#undef HANDLE_TYPE
-      case WireFormatLite::TYPE_MESSAGE: {
-        if (is_lazy) {
-          size_t size = lazymessage_value->ByteSizeLong();
-          result += io::CodedOutputStream::VarintSize32(size) + size;
-        } else {
-          result += WireFormatLite::MessageSize(*message_value);
-        }
-        break;
-      }
-
-      // Stuff with fixed size.
-#define HANDLE_TYPE(UPPERCASE, CAMELCASE)         \
-  case WireFormatLite::TYPE_##UPPERCASE:          \
-    result += WireFormatLite::k##CAMELCASE##Size; \
-    break
-        HANDLE_TYPE(FIXED32, Fixed32);
-        HANDLE_TYPE(FIXED64, Fixed64);
-        HANDLE_TYPE(SFIXED32, SFixed32);
-        HANDLE_TYPE(SFIXED64, SFixed64);
-        HANDLE_TYPE(FLOAT, Float);
-        HANDLE_TYPE(DOUBLE, Double);
-        HANDLE_TYPE(BOOL, Bool);
-#undef HANDLE_TYPE
-    }
-  }
-
-  return result;
-}
-
-int ExtensionSet::Extension::GetSize() const {
-  GOOGLE_DCHECK(is_repeated);
-  switch (cpp_type(type)) {
-#define HANDLE_TYPE(UPPERCASE, LOWERCASE)   \
-  case WireFormatLite::CPPTYPE_##UPPERCASE: \
-    return repeated_##LOWERCASE##_value->size()
-
-    HANDLE_TYPE(INT32, int32_t);
-    HANDLE_TYPE(INT64, int64_t);
-    HANDLE_TYPE(UINT32, uint32_t);
-    HANDLE_TYPE(UINT64, uint64_t);
-    HANDLE_TYPE(FLOAT, float);
-    HANDLE_TYPE(DOUBLE, double);
-    HANDLE_TYPE(BOOL, bool);
-    HANDLE_TYPE(ENUM, enum);
-    HANDLE_TYPE(STRING, string);
-    HANDLE_TYPE(MESSAGE, message);
-#undef HANDLE_TYPE
-  }
-
-  GOOGLE_LOG(FATAL) << "Can't get here.";
-  return 0;
-}
-
-// This function deletes all allocated objects. This function should be only
-// called if the Extension was created without an arena.
-void ExtensionSet::Extension::Free() {
-  if (is_repeated) {
-    switch (cpp_type(type)) {
-#define HANDLE_TYPE(UPPERCASE, LOWERCASE)   \
-  case WireFormatLite::CPPTYPE_##UPPERCASE: \
-    delete repeated_##LOWERCASE##_value;    \
-    break
-
-      HANDLE_TYPE(INT32, int32_t);
-      HANDLE_TYPE(INT64, int64_t);
-      HANDLE_TYPE(UINT32, uint32_t);
-      HANDLE_TYPE(UINT64, uint64_t);
-      HANDLE_TYPE(FLOAT, float);
-      HANDLE_TYPE(DOUBLE, double);
-      HANDLE_TYPE(BOOL, bool);
-      HANDLE_TYPE(ENUM, enum);
-      HANDLE_TYPE(STRING, string);
-      HANDLE_TYPE(MESSAGE, message);
-#undef HANDLE_TYPE
-    }
-  } else {
-    switch (cpp_type(type)) {
-      case WireFormatLite::CPPTYPE_STRING:
-        delete string_value;
-        break;
-      case WireFormatLite::CPPTYPE_MESSAGE:
-        if (is_lazy) {
-          delete lazymessage_value;
-        } else {
-          delete message_value;
-        }
-        break;
-      default:
-        break;
-    }
-  }
-}
-
-// Defined in extension_set_heavy.cc.
-// int ExtensionSet::Extension::SpaceUsedExcludingSelf() const
-
-bool ExtensionSet::Extension::IsInitialized() const {
-  if (cpp_type(type) == WireFormatLite::CPPTYPE_MESSAGE) {
-    if (is_repeated) {
-      for (int i = 0; i < repeated_message_value->size(); i++) {
-        if (!repeated_message_value->Get(i).IsInitialized()) {
-          return false;
-        }
-      }
-    } else {
-      if (!is_cleared) {
-        if (is_lazy) {
-          if (!lazymessage_value->IsInitialized()) return false;
-        } else {
-          if (!message_value->IsInitialized()) return false;
-        }
-      }
-    }
-  }
-  return true;
-}
-
-// Dummy key method to avoid weak vtable.
-void ExtensionSet::LazyMessageExtension::UnusedKeyMethod() {}
-
-const ExtensionSet::Extension* ExtensionSet::FindOrNull(int key) const {
-  if (flat_size_ == 0) {
-    return nullptr;
-  } else if (PROTOBUF_PREDICT_TRUE(!is_large())) {
-    auto it = std::lower_bound(flat_begin(), flat_end() - 1, key,
-                               KeyValue::FirstComparator());
-    return it->first == key ? &it->second : nullptr;
-  } else {
-    return FindOrNullInLargeMap(key);
-  }
-}
-
-const ExtensionSet::Extension* ExtensionSet::FindOrNullInLargeMap(
-    int key) const {
-  assert(is_large());
-  LargeMap::const_iterator it = map_.large->find(key);
-  if (it != map_.large->end()) {
-    return &it->second;
-  }
-  return nullptr;
-}
-
-ExtensionSet::Extension* ExtensionSet::FindOrNull(int key) {
-  const auto* const_this = this;
-  return const_cast<ExtensionSet::Extension*>(const_this->FindOrNull(key));
-}
-
-ExtensionSet::Extension* ExtensionSet::FindOrNullInLargeMap(int key) {
-  const auto* const_this = this;
-  return const_cast<ExtensionSet::Extension*>(
-      const_this->FindOrNullInLargeMap(key));
-}
-
-std::pair<ExtensionSet::Extension*, bool> ExtensionSet::Insert(int key) {
-  if (PROTOBUF_PREDICT_FALSE(is_large())) {
-    auto maybe = map_.large->insert({key, Extension()});
-    return {&maybe.first->second, maybe.second};
-  }
-  KeyValue* end = flat_end();
-  KeyValue* it =
-      std::lower_bound(flat_begin(), end, key, KeyValue::FirstComparator());
-  if (it != end && it->first == key) {
-    return {&it->second, false};
-  }
-  if (flat_size_ < flat_capacity_) {
-    std::copy_backward(it, end, end + 1);
-    ++flat_size_;
-    it->first = key;
-    it->second = Extension();
-    return {&it->second, true};
-  }
-  GrowCapacity(flat_size_ + 1);
-  return Insert(key);
-}
-
-void ExtensionSet::GrowCapacity(size_t minimum_new_capacity) {
-  if (PROTOBUF_PREDICT_FALSE(is_large())) {
-    return;  // LargeMap does not have a "reserve" method.
-  }
-  if (flat_capacity_ >= minimum_new_capacity) {
-    return;
-  }
-
-  auto new_flat_capacity = flat_capacity_;
-  do {
-    new_flat_capacity = new_flat_capacity == 0 ? 1 : new_flat_capacity * 4;
-  } while (new_flat_capacity < minimum_new_capacity);
-
-  const KeyValue* begin = flat_begin();
-  const KeyValue* end = flat_end();
-  AllocatedData new_map;
-  if (new_flat_capacity > kMaximumFlatCapacity) {
-    new_map.large = Arena::Create<LargeMap>(arena_);
-    LargeMap::iterator hint = new_map.large->begin();
-    for (const KeyValue* it = begin; it != end; ++it) {
-      hint = new_map.large->insert(hint, {it->first, it->second});
-    }
-    flat_size_ = static_cast<uint16_t>(-1);
-    GOOGLE_DCHECK(is_large());
-  } else {
-    new_map.flat = Arena::CreateArray<KeyValue>(arena_, new_flat_capacity);
-    std::copy(begin, end, new_map.flat);
-  }
-
-  if (arena_ == nullptr) {
-    DeleteFlatMap(begin, flat_capacity_);
-  }
-  flat_capacity_ = new_flat_capacity;
-  map_ = new_map;
-}
-
-#if (__cplusplus < 201703) && \
-    (!defined(_MSC_VER) || (_MSC_VER >= 1900 && _MSC_VER < 1912))
-// static
-constexpr uint16_t ExtensionSet::kMaximumFlatCapacity;
-#endif  //  (__cplusplus < 201703) && (!defined(_MSC_VER) || (_MSC_VER >= 1900
-        //  && _MSC_VER < 1912))
-
-void ExtensionSet::Erase(int key) {
-  if (PROTOBUF_PREDICT_FALSE(is_large())) {
-    map_.large->erase(key);
-    return;
-  }
-  KeyValue* end = flat_end();
-  KeyValue* it =
-      std::lower_bound(flat_begin(), end, key, KeyValue::FirstComparator());
-  if (it != end && it->first == key) {
-    std::copy(it + 1, end, it);
-    --flat_size_;
-  }
-}
-
-// ==================================================================
-// Default repeated field instances for iterator-compatible accessors
-
-const RepeatedPrimitiveDefaults* RepeatedPrimitiveDefaults::default_instance() {
-  static auto instance = OnShutdownDelete(new RepeatedPrimitiveDefaults);
-  return instance;
-}
-
-const RepeatedStringTypeTraits::RepeatedFieldType*
-RepeatedStringTypeTraits::GetDefaultRepeatedField() {
-  static auto instance = OnShutdownDelete(new RepeatedFieldType);
-  return instance;
-}
-
-uint8_t* ExtensionSet::Extension::InternalSerializeFieldWithCachedSizesToArray(
-    const MessageLite* extendee, const ExtensionSet* extension_set, int number,
-    uint8_t* target, io::EpsCopyOutputStream* stream) const {
-  if (is_repeated) {
-    if (is_packed) {
-      if (cached_size == 0) return target;
-
-      target = stream->EnsureSpace(target);
-      target = WireFormatLite::WriteTagToArray(
-          number, WireFormatLite::WIRETYPE_LENGTH_DELIMITED, target);
-      target = WireFormatLite::WriteInt32NoTagToArray(cached_size, target);
-
-      switch (real_type(type)) {
-#define HANDLE_TYPE(UPPERCASE, CAMELCASE, LOWERCASE)                 \
-  case WireFormatLite::TYPE_##UPPERCASE:                             \
-    for (int i = 0; i < repeated_##LOWERCASE##_value->size(); i++) { \
-      target = stream->EnsureSpace(target);                          \
-      target = WireFormatLite::Write##CAMELCASE##NoTagToArray(       \
-          repeated_##LOWERCASE##_value->Get(i), target);             \
-    }                                                                \
-    break
-
-        HANDLE_TYPE(INT32, Int32, int32_t);
-        HANDLE_TYPE(INT64, Int64, int64_t);
-        HANDLE_TYPE(UINT32, UInt32, uint32_t);
-        HANDLE_TYPE(UINT64, UInt64, uint64_t);
-        HANDLE_TYPE(SINT32, SInt32, int32_t);
-        HANDLE_TYPE(SINT64, SInt64, int64_t);
-        HANDLE_TYPE(FIXED32, Fixed32, uint32_t);
-        HANDLE_TYPE(FIXED64, Fixed64, uint64_t);
-        HANDLE_TYPE(SFIXED32, SFixed32, int32_t);
-        HANDLE_TYPE(SFIXED64, SFixed64, int64_t);
-        HANDLE_TYPE(FLOAT, Float, float);
-        HANDLE_TYPE(DOUBLE, Double, double);
-        HANDLE_TYPE(BOOL, Bool, bool);
-        HANDLE_TYPE(ENUM, Enum, enum);
-#undef HANDLE_TYPE
-
-        case WireFormatLite::TYPE_STRING:
-        case WireFormatLite::TYPE_BYTES:
-        case WireFormatLite::TYPE_GROUP:
-        case WireFormatLite::TYPE_MESSAGE:
-          GOOGLE_LOG(FATAL) << "Non-primitive types can't be packed.";
-          break;
-      }
-    } else {
-      switch (real_type(type)) {
-#define HANDLE_TYPE(UPPERCASE, CAMELCASE, LOWERCASE)                 \
-  case WireFormatLite::TYPE_##UPPERCASE:                             \
-    for (int i = 0; i < repeated_##LOWERCASE##_value->size(); i++) { \
-      target = stream->EnsureSpace(target);                          \
-      target = WireFormatLite::Write##CAMELCASE##ToArray(            \
-          number, repeated_##LOWERCASE##_value->Get(i), target);     \
-    }                                                                \
-    break
-
-        HANDLE_TYPE(INT32, Int32, int32_t);
-        HANDLE_TYPE(INT64, Int64, int64_t);
-        HANDLE_TYPE(UINT32, UInt32, uint32_t);
-        HANDLE_TYPE(UINT64, UInt64, uint64_t);
-        HANDLE_TYPE(SINT32, SInt32, int32_t);
-        HANDLE_TYPE(SINT64, SInt64, int64_t);
-        HANDLE_TYPE(FIXED32, Fixed32, uint32_t);
-        HANDLE_TYPE(FIXED64, Fixed64, uint64_t);
-        HANDLE_TYPE(SFIXED32, SFixed32, int32_t);
-        HANDLE_TYPE(SFIXED64, SFixed64, int64_t);
-        HANDLE_TYPE(FLOAT, Float, float);
-        HANDLE_TYPE(DOUBLE, Double, double);
-        HANDLE_TYPE(BOOL, Bool, bool);
-        HANDLE_TYPE(ENUM, Enum, enum);
-#undef HANDLE_TYPE
-#define HANDLE_TYPE(UPPERCASE, CAMELCASE, LOWERCASE)                 \
-  case WireFormatLite::TYPE_##UPPERCASE:                             \
-    for (int i = 0; i < repeated_##LOWERCASE##_value->size(); i++) { \
-      target = stream->EnsureSpace(target);                          \
-      target = stream->WriteString(                                  \
-          number, repeated_##LOWERCASE##_value->Get(i), target);     \
-    }                                                                \
-    break
-        HANDLE_TYPE(STRING, String, string);
-        HANDLE_TYPE(BYTES, Bytes, string);
-#undef HANDLE_TYPE
-        case WireFormatLite::TYPE_GROUP:
-          for (int i = 0; i < repeated_message_value->size(); i++) {
-            target = stream->EnsureSpace(target);
-            target = WireFormatLite::InternalWriteGroup(
-                number, repeated_message_value->Get(i), target, stream);
-          }
-          break;
-        case WireFormatLite::TYPE_MESSAGE:
-          for (int i = 0; i < repeated_message_value->size(); i++) {
-            auto& msg = repeated_message_value->Get(i);
-            target = WireFormatLite::InternalWriteMessage(
-                number, msg, msg.GetCachedSize(), target, stream);
-          }
-          break;
-      }
-    }
-  } else if (!is_cleared) {
-    switch (real_type(type)) {
-#define HANDLE_TYPE(UPPERCASE, CAMELCASE, VALUE)                               \
-  case WireFormatLite::TYPE_##UPPERCASE:                                       \
-    target = stream->EnsureSpace(target);                                      \
-    target = WireFormatLite::Write##CAMELCASE##ToArray(number, VALUE, target); \
-    break
-
-      HANDLE_TYPE(INT32, Int32, int32_t_value);
-      HANDLE_TYPE(INT64, Int64, int64_t_value);
-      HANDLE_TYPE(UINT32, UInt32, uint32_t_value);
-      HANDLE_TYPE(UINT64, UInt64, uint64_t_value);
-      HANDLE_TYPE(SINT32, SInt32, int32_t_value);
-      HANDLE_TYPE(SINT64, SInt64, int64_t_value);
-      HANDLE_TYPE(FIXED32, Fixed32, uint32_t_value);
-      HANDLE_TYPE(FIXED64, Fixed64, uint64_t_value);
-      HANDLE_TYPE(SFIXED32, SFixed32, int32_t_value);
-      HANDLE_TYPE(SFIXED64, SFixed64, int64_t_value);
-      HANDLE_TYPE(FLOAT, Float, float_value);
-      HANDLE_TYPE(DOUBLE, Double, double_value);
-      HANDLE_TYPE(BOOL, Bool, bool_value);
-      HANDLE_TYPE(ENUM, Enum, enum_value);
-#undef HANDLE_TYPE
-#define HANDLE_TYPE(UPPERCASE, CAMELCASE, VALUE)         \
-  case WireFormatLite::TYPE_##UPPERCASE:                 \
-    target = stream->EnsureSpace(target);                \
-    target = stream->WriteString(number, VALUE, target); \
-    break
-      HANDLE_TYPE(STRING, String, *string_value);
-      HANDLE_TYPE(BYTES, Bytes, *string_value);
-#undef HANDLE_TYPE
-      case WireFormatLite::TYPE_GROUP:
-        target = stream->EnsureSpace(target);
-        target = WireFormatLite::InternalWriteGroup(number, *message_value,
-                                                    target, stream);
-        break;
-      case WireFormatLite::TYPE_MESSAGE:
-        if (is_lazy) {
-          const auto* prototype =
-              extension_set->GetPrototypeForLazyMessage(extendee, number);
-          target = lazymessage_value->WriteMessageToArray(prototype, number,
-                                                          target, stream);
-        } else {
-          target = WireFormatLite::InternalWriteMessage(
-              number, *message_value, message_value->GetCachedSize(), target,
-              stream);
-        }
-        break;
-    }
-  }
-  return target;
-}
-
-const MessageLite* ExtensionSet::GetPrototypeForLazyMessage(
-    const MessageLite* extendee, int number) const {
-  GeneratedExtensionFinder finder(extendee);
-  bool was_packed_on_wire = false;
-  ExtensionInfo extension_info;
-  if (!FindExtensionInfoFromFieldNumber(
-          WireFormatLite::WireType::WIRETYPE_LENGTH_DELIMITED, number, &finder,
-          &extension_info, &was_packed_on_wire)) {
-    return nullptr;
-  }
-  return extension_info.message_info.prototype;
-}
-
-uint8_t*
-ExtensionSet::Extension::InternalSerializeMessageSetItemWithCachedSizesToArray(
-    const MessageLite* extendee, const ExtensionSet* extension_set, int number,
-    uint8_t* target, io::EpsCopyOutputStream* stream) const {
-  if (type != WireFormatLite::TYPE_MESSAGE || is_repeated) {
-    // Not a valid MessageSet extension, but serialize it the normal way.
-    GOOGLE_LOG(WARNING) << "Invalid message set extension.";
-    return InternalSerializeFieldWithCachedSizesToArray(extendee, extension_set,
-                                                        number, target, stream);
-  }
-
-  if (is_cleared) return target;
-
-  target = stream->EnsureSpace(target);
-  // Start group.
-  target = io::CodedOutputStream::WriteTagToArray(
-      WireFormatLite::kMessageSetItemStartTag, target);
-  // Write type ID.
-  target = WireFormatLite::WriteUInt32ToArray(
-      WireFormatLite::kMessageSetTypeIdNumber, number, target);
-  // Write message.
-  if (is_lazy) {
-    const auto* prototype =
-        extension_set->GetPrototypeForLazyMessage(extendee, number);
-    target = lazymessage_value->WriteMessageToArray(
-        prototype, WireFormatLite::kMessageSetMessageNumber, target, stream);
-  } else {
-    target = WireFormatLite::InternalWriteMessage(
-        WireFormatLite::kMessageSetMessageNumber, *message_value,
-        message_value->GetCachedSize(), target, stream);
-  }
-  // End group.
-  target = stream->EnsureSpace(target);
-  target = io::CodedOutputStream::WriteTagToArray(
-      WireFormatLite::kMessageSetItemEndTag, target);
-  return target;
-}
-
-size_t ExtensionSet::Extension::MessageSetItemByteSize(int number) const {
-  if (type != WireFormatLite::TYPE_MESSAGE || is_repeated) {
-    // Not a valid MessageSet extension, but compute the byte size for it the
-    // normal way.
-    return ByteSize(number);
-  }
-
-  if (is_cleared) return 0;
-
-  size_t our_size = WireFormatLite::kMessageSetItemTagsSize;
-
-  // type_id
-  our_size += io::CodedOutputStream::VarintSize32(number);
-
-  // message
-  size_t message_size = 0;
-  if (is_lazy) {
-    message_size = lazymessage_value->ByteSizeLong();
-  } else {
-    message_size = message_value->ByteSizeLong();
-  }
-
-  our_size += io::CodedOutputStream::VarintSize32(message_size);
-  our_size += message_size;
-
-  return our_size;
-}
-
-size_t ExtensionSet::MessageSetByteSize() const {
-  size_t total_size = 0;
-  ForEach([&total_size](int number, const Extension& ext) {
-    total_size += ext.MessageSetItemByteSize(number);
-  });
-  return total_size;
-}
-
-LazyEagerVerifyFnType FindExtensionLazyEagerVerifyFn(
-    const MessageLite* extendee, int number) {
-  const ExtensionInfo* registered = FindRegisteredExtension(extendee, number);
-  if (registered != nullptr) {
-    return registered->lazy_eager_verify_func;
-  }
-  return nullptr;
-}
-
-
-}  // namespace internal
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
diff --git a/libs/protobuf/src/google/protobuf/extension_set.h b/libs/protobuf/src/google/protobuf/extension_set.h
deleted file mode 100644
index 0e6d052..0000000
--- a/libs/protobuf/src/google/protobuf/extension_set.h
+++ /dev/null
@@ -1,1561 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-//
-// This header is logically internal, but is made public because it is used
-// from protocol-compiler-generated code, which may reside in other components.
-
-#ifndef GOOGLE_PROTOBUF_EXTENSION_SET_H__
-#define GOOGLE_PROTOBUF_EXTENSION_SET_H__
-
-
-#include <algorithm>
-#include <cassert>
-#include <map>
-#include <string>
-#include <utility>
-#include <vector>
-
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/stubs/logging.h>
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/port.h>
-#include <google/protobuf/parse_context.h>
-#include <google/protobuf/repeated_field.h>
-#include <google/protobuf/wire_format_lite.h>
-
-// clang-format off
-#include <google/protobuf/port_def.inc>  // Must be last
-// clang-format on
-
-#ifdef SWIG
-#error "You cannot SWIG proto headers"
-#endif
-
-namespace google {
-namespace protobuf {
-class Arena;
-class Descriptor;       // descriptor.h
-class FieldDescriptor;  // descriptor.h
-class DescriptorPool;   // descriptor.h
-class MessageLite;      // message_lite.h
-class Message;          // message.h
-class MessageFactory;   // message.h
-class Reflection;       // message.h
-class UnknownFieldSet;  // unknown_field_set.h
-namespace internal {
-class FieldSkipper;  // wire_format_lite.h
-enum class LazyVerifyOption;
-}  // namespace internal
-}  // namespace protobuf
-}  // namespace google
-
-namespace google {
-namespace protobuf {
-namespace internal {
-
-class InternalMetadata;
-
-// Used to store values of type WireFormatLite::FieldType without having to
-// #include wire_format_lite.h.  Also, ensures that we use only one byte to
-// store these values, which is important to keep the layout of
-// ExtensionSet::Extension small.
-typedef uint8_t FieldType;
-
-// A function which, given an integer value, returns true if the number
-// matches one of the defined values for the corresponding enum type.  This
-// is used with RegisterEnumExtension, below.
-typedef bool EnumValidityFunc(int number);
-
-// Version of the above which takes an argument.  This is needed to deal with
-// extensions that are not compiled in.
-typedef bool EnumValidityFuncWithArg(const void* arg, int number);
-
-// Information about a registered extension.
-struct ExtensionInfo {
-  constexpr ExtensionInfo() : enum_validity_check() {}
-  constexpr ExtensionInfo(const MessageLite* extendee, int param_number,
-                          FieldType type_param, bool isrepeated, bool ispacked,
-                          LazyEagerVerifyFnType verify_func)
-      : message(extendee),
-        number(param_number),
-        type(type_param),
-        is_repeated(isrepeated),
-        is_packed(ispacked),
-        enum_validity_check(),
-        lazy_eager_verify_func(verify_func) {}
-
-  const MessageLite* message = nullptr;
-  int number = 0;
-
-  FieldType type = 0;
-  bool is_repeated = false;
-  bool is_packed = false;
-
-  struct EnumValidityCheck {
-    EnumValidityFuncWithArg* func;
-    const void* arg;
-  };
-
-  struct MessageInfo {
-    const MessageLite* prototype;
-  };
-
-  union {
-    EnumValidityCheck enum_validity_check;
-    MessageInfo message_info;
-  };
-
-  // The descriptor for this extension, if one exists and is known.  May be
-  // nullptr.  Must not be nullptr if the descriptor for the extension does not
-  // live in the same pool as the descriptor for the containing type.
-  const FieldDescriptor* descriptor = nullptr;
-
-  // If this field is potentially lazy this function can be used as a cheap
-  // verification of the raw bytes.
-  // If nullptr then no verification is performed.
-  LazyEagerVerifyFnType lazy_eager_verify_func = nullptr;
-};
-
-// An ExtensionFinder is an object which looks up extension definitions.  It
-// must implement this method:
-//
-// bool Find(int number, ExtensionInfo* output);
-
-// GeneratedExtensionFinder is an ExtensionFinder which finds extensions
-// defined in .proto files which have been compiled into the binary.
-class PROTOBUF_EXPORT GeneratedExtensionFinder {
- public:
-  explicit GeneratedExtensionFinder(const MessageLite* extendee)
-      : extendee_(extendee) {}
-
-  // Returns true and fills in *output if found, otherwise returns false.
-  bool Find(int number, ExtensionInfo* output);
-
- private:
-  const MessageLite* extendee_;
-};
-
-// Note:  extension_set_heavy.cc defines DescriptorPoolExtensionFinder for
-// finding extensions from a DescriptorPool.
-
-// This is an internal helper class intended for use within the protocol buffer
-// library and generated classes.  Clients should not use it directly.  Instead,
-// use the generated accessors such as GetExtension() of the class being
-// extended.
-//
-// This class manages extensions for a protocol message object.  The
-// message's HasExtension(), GetExtension(), MutableExtension(), and
-// ClearExtension() methods are just thin wrappers around the embedded
-// ExtensionSet.  When parsing, if a tag number is encountered which is
-// inside one of the message type's extension ranges, the tag is passed
-// off to the ExtensionSet for parsing.  Etc.
-class PROTOBUF_EXPORT ExtensionSet {
- public:
-  constexpr ExtensionSet();
-  explicit ExtensionSet(Arena* arena);
-  ExtensionSet(ArenaInitialized, Arena* arena) : ExtensionSet(arena) {}
-  ~ExtensionSet();
-
-  // These are called at startup by protocol-compiler-generated code to
-  // register known extensions.  The registrations are used by ParseField()
-  // to look up extensions for parsed field numbers.  Note that dynamic parsing
-  // does not use ParseField(); only protocol-compiler-generated parsing
-  // methods do.
-  static void RegisterExtension(const MessageLite* extendee, int number,
-                                FieldType type, bool is_repeated,
-                                bool is_packed,
-                                LazyEagerVerifyFnType verify_func);
-  static void RegisterEnumExtension(const MessageLite* extendee, int number,
-                                    FieldType type, bool is_repeated,
-                                    bool is_packed, EnumValidityFunc* is_valid);
-  static void RegisterMessageExtension(const MessageLite* extendee, int number,
-                                       FieldType type, bool is_repeated,
-                                       bool is_packed,
-                                       const MessageLite* prototype,
-                                       LazyEagerVerifyFnType verify_func);
-
-  // =================================================================
-
-  // Add all fields which are currently present to the given vector.  This
-  // is useful to implement Reflection::ListFields().
-  void AppendToList(const Descriptor* extendee, const DescriptorPool* pool,
-                    std::vector<const FieldDescriptor*>* output) const;
-
-  // =================================================================
-  // Accessors
-  //
-  // Generated message classes include type-safe templated wrappers around
-  // these methods.  Generally you should use those rather than call these
-  // directly, unless you are doing low-level memory management.
-  //
-  // When calling any of these accessors, the extension number requested
-  // MUST exist in the DescriptorPool provided to the constructor.  Otherwise,
-  // the method will fail an assert.  Normally, though, you would not call
-  // these directly; you would either call the generated accessors of your
-  // message class (e.g. GetExtension()) or you would call the accessors
-  // of the reflection interface.  In both cases, it is impossible to
-  // trigger this assert failure:  the generated accessors only accept
-  // linked-in extension types as parameters, while the Reflection interface
-  // requires you to provide the FieldDescriptor describing the extension.
-  //
-  // When calling any of these accessors, a protocol-compiler-generated
-  // implementation of the extension corresponding to the number MUST
-  // be linked in, and the FieldDescriptor used to refer to it MUST be
-  // the one generated by that linked-in code.  Otherwise, the method will
-  // die on an assert failure.  The message objects returned by the message
-  // accessors are guaranteed to be of the correct linked-in type.
-  //
-  // These methods pretty much match Reflection except that:
-  // - They're not virtual.
-  // - They identify fields by number rather than FieldDescriptors.
-  // - They identify enum values using integers rather than descriptors.
-  // - Strings provide Mutable() in addition to Set() accessors.
-
-  bool Has(int number) const;
-  int ExtensionSize(int number) const;  // Size of a repeated extension.
-  int NumExtensions() const;            // The number of extensions
-  FieldType ExtensionType(int number) const;
-  void ClearExtension(int number);
-
-  // singular fields -------------------------------------------------
-
-  int32_t GetInt32(int number, int32_t default_value) const;
-  int64_t GetInt64(int number, int64_t default_value) const;
-  uint32_t GetUInt32(int number, uint32_t default_value) const;
-  uint64_t GetUInt64(int number, uint64_t default_value) const;
-  float GetFloat(int number, float default_value) const;
-  double GetDouble(int number, double default_value) const;
-  bool GetBool(int number, bool default_value) const;
-  int GetEnum(int number, int default_value) const;
-  const std::string& GetString(int number,
-                               const std::string& default_value) const;
-  const MessageLite& GetMessage(int number,
-                                const MessageLite& default_value) const;
-  const MessageLite& GetMessage(int number, const Descriptor* message_type,
-                                MessageFactory* factory) const;
-
-  // |descriptor| may be nullptr so long as it is known that the descriptor for
-  // the extension lives in the same pool as the descriptor for the containing
-  // type.
-#define desc const FieldDescriptor* descriptor  // avoid line wrapping
-  void SetInt32(int number, FieldType type, int32_t value, desc);
-  void SetInt64(int number, FieldType type, int64_t value, desc);
-  void SetUInt32(int number, FieldType type, uint32_t value, desc);
-  void SetUInt64(int number, FieldType type, uint64_t value, desc);
-  void SetFloat(int number, FieldType type, float value, desc);
-  void SetDouble(int number, FieldType type, double value, desc);
-  void SetBool(int number, FieldType type, bool value, desc);
-  void SetEnum(int number, FieldType type, int value, desc);
-  void SetString(int number, FieldType type, std::string value, desc);
-  std::string* MutableString(int number, FieldType type, desc);
-  MessageLite* MutableMessage(int number, FieldType type,
-                              const MessageLite& prototype, desc);
-  MessageLite* MutableMessage(const FieldDescriptor* descriptor,
-                              MessageFactory* factory);
-  // Adds the given message to the ExtensionSet, taking ownership of the
-  // message object. Existing message with the same number will be deleted.
-  // If "message" is nullptr, this is equivalent to "ClearExtension(number)".
-  void SetAllocatedMessage(int number, FieldType type,
-                           const FieldDescriptor* descriptor,
-                           MessageLite* message);
-  void UnsafeArenaSetAllocatedMessage(int number, FieldType type,
-                                      const FieldDescriptor* descriptor,
-                                      MessageLite* message);
-  PROTOBUF_NODISCARD MessageLite* ReleaseMessage(int number,
-                                                 const MessageLite& prototype);
-  MessageLite* UnsafeArenaReleaseMessage(int number,
-                                         const MessageLite& prototype);
-
-  PROTOBUF_NODISCARD MessageLite* ReleaseMessage(
-      const FieldDescriptor* descriptor, MessageFactory* factory);
-  MessageLite* UnsafeArenaReleaseMessage(const FieldDescriptor* descriptor,
-                                         MessageFactory* factory);
-#undef desc
-  Arena* GetArena() const { return arena_; }
-
-  // repeated fields -------------------------------------------------
-
-  // Fetches a RepeatedField extension by number; returns |default_value|
-  // if no such extension exists. User should not touch this directly; it is
-  // used by the GetRepeatedExtension() method.
-  const void* GetRawRepeatedField(int number, const void* default_value) const;
-  // Fetches a mutable version of a RepeatedField extension by number,
-  // instantiating one if none exists. Similar to above, user should not use
-  // this directly; it underlies MutableRepeatedExtension().
-  void* MutableRawRepeatedField(int number, FieldType field_type, bool packed,
-                                const FieldDescriptor* desc);
-
-  // This is an overload of MutableRawRepeatedField to maintain compatibility
-  // with old code using a previous API. This version of
-  // MutableRawRepeatedField() will GOOGLE_CHECK-fail on a missing extension.
-  // (E.g.: borg/clients/internal/proto1/proto2_reflection.cc.)
-  void* MutableRawRepeatedField(int number);
-
-  int32_t GetRepeatedInt32(int number, int index) const;
-  int64_t GetRepeatedInt64(int number, int index) const;
-  uint32_t GetRepeatedUInt32(int number, int index) const;
-  uint64_t GetRepeatedUInt64(int number, int index) const;
-  float GetRepeatedFloat(int number, int index) const;
-  double GetRepeatedDouble(int number, int index) const;
-  bool GetRepeatedBool(int number, int index) const;
-  int GetRepeatedEnum(int number, int index) const;
-  const std::string& GetRepeatedString(int number, int index) const;
-  const MessageLite& GetRepeatedMessage(int number, int index) const;
-
-  void SetRepeatedInt32(int number, int index, int32_t value);
-  void SetRepeatedInt64(int number, int index, int64_t value);
-  void SetRepeatedUInt32(int number, int index, uint32_t value);
-  void SetRepeatedUInt64(int number, int index, uint64_t value);
-  void SetRepeatedFloat(int number, int index, float value);
-  void SetRepeatedDouble(int number, int index, double value);
-  void SetRepeatedBool(int number, int index, bool value);
-  void SetRepeatedEnum(int number, int index, int value);
-  void SetRepeatedString(int number, int index, std::string value);
-  std::string* MutableRepeatedString(int number, int index);
-  MessageLite* MutableRepeatedMessage(int number, int index);
-
-#define desc const FieldDescriptor* descriptor  // avoid line wrapping
-  void AddInt32(int number, FieldType type, bool packed, int32_t value, desc);
-  void AddInt64(int number, FieldType type, bool packed, int64_t value, desc);
-  void AddUInt32(int number, FieldType type, bool packed, uint32_t value, desc);
-  void AddUInt64(int number, FieldType type, bool packed, uint64_t value, desc);
-  void AddFloat(int number, FieldType type, bool packed, float value, desc);
-  void AddDouble(int number, FieldType type, bool packed, double value, desc);
-  void AddBool(int number, FieldType type, bool packed, bool value, desc);
-  void AddEnum(int number, FieldType type, bool packed, int value, desc);
-  void AddString(int number, FieldType type, std::string value, desc);
-  std::string* AddString(int number, FieldType type, desc);
-  MessageLite* AddMessage(int number, FieldType type,
-                          const MessageLite& prototype, desc);
-  MessageLite* AddMessage(const FieldDescriptor* descriptor,
-                          MessageFactory* factory);
-  void AddAllocatedMessage(const FieldDescriptor* descriptor,
-                           MessageLite* new_entry);
-  void UnsafeArenaAddAllocatedMessage(const FieldDescriptor* descriptor,
-                                      MessageLite* new_entry);
-#undef desc
-
-  void RemoveLast(int number);
-  PROTOBUF_NODISCARD MessageLite* ReleaseLast(int number);
-  MessageLite* UnsafeArenaReleaseLast(int number);
-  void SwapElements(int number, int index1, int index2);
-
-  // =================================================================
-  // convenience methods for implementing methods of Message
-  //
-  // These could all be implemented in terms of the other methods of this
-  // class, but providing them here helps keep the generated code size down.
-
-  void Clear();
-  void MergeFrom(const MessageLite* extendee, const ExtensionSet& other);
-  void Swap(const MessageLite* extendee, ExtensionSet* other);
-  void InternalSwap(ExtensionSet* other);
-  void SwapExtension(const MessageLite* extendee, ExtensionSet* other,
-                     int number);
-  void UnsafeShallowSwapExtension(ExtensionSet* other, int number);
-  bool IsInitialized() const;
-
-  // Lite parser
-  const char* ParseField(uint64_t tag, const char* ptr,
-                         const MessageLite* extendee,
-                         internal::InternalMetadata* metadata,
-                         internal::ParseContext* ctx);
-  // Full parser
-  const char* ParseField(uint64_t tag, const char* ptr, const Message* extendee,
-                         internal::InternalMetadata* metadata,
-                         internal::ParseContext* ctx);
-  template <typename Msg>
-  const char* ParseMessageSet(const char* ptr, const Msg* extendee,
-                              InternalMetadata* metadata,
-                              internal::ParseContext* ctx) {
-    struct MessageSetItem {
-      const char* _InternalParse(const char* ptr, ParseContext* ctx) {
-        return me->ParseMessageSetItem(ptr, extendee, metadata, ctx);
-      }
-      ExtensionSet* me;
-      const Msg* extendee;
-      InternalMetadata* metadata;
-    } item{this, extendee, metadata};
-    while (!ctx->Done(&ptr)) {
-      uint32_t tag;
-      ptr = ReadTag(ptr, &tag);
-      GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
-      if (tag == WireFormatLite::kMessageSetItemStartTag) {
-        ptr = ctx->ParseGroup(&item, ptr, tag);
-        GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
-      } else {
-        if (tag == 0 || (tag & 7) == 4) {
-          ctx->SetLastTag(tag);
-          return ptr;
-        }
-        ptr = ParseField(tag, ptr, extendee, metadata, ctx);
-        GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
-      }
-    }
-    return ptr;
-  }
-
-  // Write all extension fields with field numbers in the range
-  //   [start_field_number, end_field_number)
-  // to the output stream, using the cached sizes computed when ByteSize() was
-  // last called.  Note that the range bounds are inclusive-exclusive.
-  void SerializeWithCachedSizes(const MessageLite* extendee,
-                                int start_field_number, int end_field_number,
-                                io::CodedOutputStream* output) const {
-    output->SetCur(_InternalSerialize(extendee, start_field_number,
-                                      end_field_number, output->Cur(),
-                                      output->EpsCopy()));
-  }
-
-  // Same as SerializeWithCachedSizes, but without any bounds checking.
-  // The caller must ensure that target has sufficient capacity for the
-  // serialized extensions.
-  //
-  // Returns a pointer past the last written byte.
-
-  uint8_t* _InternalSerialize(const MessageLite* extendee,
-                              int start_field_number, int end_field_number,
-                              uint8_t* target,
-                              io::EpsCopyOutputStream* stream) const {
-    if (flat_size_ == 0) {
-      assert(!is_large());
-      return target;
-    }
-    return _InternalSerializeImpl(extendee, start_field_number,
-                                  end_field_number, target, stream);
-  }
-
-  // Like above but serializes in MessageSet format.
-  void SerializeMessageSetWithCachedSizes(const MessageLite* extendee,
-                                          io::CodedOutputStream* output) const {
-    output->SetCur(InternalSerializeMessageSetWithCachedSizesToArray(
-        extendee, output->Cur(), output->EpsCopy()));
-  }
-  uint8_t* InternalSerializeMessageSetWithCachedSizesToArray(
-      const MessageLite* extendee, uint8_t* target,
-      io::EpsCopyOutputStream* stream) const;
-
-  // For backward-compatibility, versions of two of the above methods that
-  // serialize deterministically iff SetDefaultSerializationDeterministic()
-  // has been called.
-  uint8_t* SerializeWithCachedSizesToArray(int start_field_number,
-                                           int end_field_number,
-                                           uint8_t* target) const;
-  uint8_t* SerializeMessageSetWithCachedSizesToArray(
-      const MessageLite* extendee, uint8_t* target) const;
-
-  // Returns the total serialized size of all the extensions.
-  size_t ByteSize() const;
-
-  // Like ByteSize() but uses MessageSet format.
-  size_t MessageSetByteSize() const;
-
-  // Returns (an estimate of) the total number of bytes used for storing the
-  // extensions in memory, excluding sizeof(*this).  If the ExtensionSet is
-  // for a lite message (and thus possibly contains lite messages), the results
-  // are undefined (might work, might crash, might corrupt data, might not even
-  // be linked in).  It's up to the protocol compiler to avoid calling this on
-  // such ExtensionSets (easy enough since lite messages don't implement
-  // SpaceUsed()).
-  size_t SpaceUsedExcludingSelfLong() const;
-
-  // This method just calls SpaceUsedExcludingSelfLong() but it can not be
-  // inlined because the definition of SpaceUsedExcludingSelfLong() is not
-  // included in lite runtime and when an inline method refers to it MSVC
-  // will complain about unresolved symbols when building the lite runtime
-  // as .dll.
-  int SpaceUsedExcludingSelf() const;
-
- private:
-  template <typename Type>
-  friend class PrimitiveTypeTraits;
-
-  template <typename Type>
-  friend class RepeatedPrimitiveTypeTraits;
-
-  template <typename Type, bool IsValid(int)>
-  friend class EnumTypeTraits;
-
-  template <typename Type, bool IsValid(int)>
-  friend class RepeatedEnumTypeTraits;
-
-  friend class google::protobuf::Reflection;
-
-  const int32_t& GetRefInt32(int number, const int32_t& default_value) const;
-  const int64_t& GetRefInt64(int number, const int64_t& default_value) const;
-  const uint32_t& GetRefUInt32(int number, const uint32_t& default_value) const;
-  const uint64_t& GetRefUInt64(int number, const uint64_t& default_value) const;
-  const float& GetRefFloat(int number, const float& default_value) const;
-  const double& GetRefDouble(int number, const double& default_value) const;
-  const bool& GetRefBool(int number, const bool& default_value) const;
-  const int& GetRefEnum(int number, const int& default_value) const;
-  const int32_t& GetRefRepeatedInt32(int number, int index) const;
-  const int64_t& GetRefRepeatedInt64(int number, int index) const;
-  const uint32_t& GetRefRepeatedUInt32(int number, int index) const;
-  const uint64_t& GetRefRepeatedUInt64(int number, int index) const;
-  const float& GetRefRepeatedFloat(int number, int index) const;
-  const double& GetRefRepeatedDouble(int number, int index) const;
-  const bool& GetRefRepeatedBool(int number, int index) const;
-  const int& GetRefRepeatedEnum(int number, int index) const;
-
-  // Implementation of _InternalSerialize for non-empty map_.
-  uint8_t* _InternalSerializeImpl(const MessageLite* extendee,
-                                  int start_field_number, int end_field_number,
-                                  uint8_t* target,
-                                  io::EpsCopyOutputStream* stream) const;
-  // Interface of a lazily parsed singular message extension.
-  class PROTOBUF_EXPORT LazyMessageExtension {
-   public:
-    LazyMessageExtension() {}
-    virtual ~LazyMessageExtension() {}
-
-    virtual LazyMessageExtension* New(Arena* arena) const = 0;
-    virtual const MessageLite& GetMessage(const MessageLite& prototype,
-                                          Arena* arena) const = 0;
-    virtual MessageLite* MutableMessage(const MessageLite& prototype,
-                                        Arena* arena) = 0;
-    virtual void SetAllocatedMessage(MessageLite* message, Arena* arena) = 0;
-    virtual void UnsafeArenaSetAllocatedMessage(MessageLite* message,
-                                                Arena* arena) = 0;
-    PROTOBUF_NODISCARD virtual MessageLite* ReleaseMessage(
-        const MessageLite& prototype, Arena* arena) = 0;
-    virtual MessageLite* UnsafeArenaReleaseMessage(const MessageLite& prototype,
-                                                   Arena* arena) = 0;
-
-    virtual bool IsInitialized() const = 0;
-
-    PROTOBUF_DEPRECATED_MSG("Please use ByteSizeLong() instead")
-    virtual int ByteSize() const { return internal::ToIntSize(ByteSizeLong()); }
-    virtual size_t ByteSizeLong() const = 0;
-    virtual size_t SpaceUsedLong() const = 0;
-
-    virtual void MergeFrom(const MessageLite* prototype,
-                           const LazyMessageExtension& other, Arena* arena) = 0;
-    virtual void MergeFromMessage(const MessageLite& msg, Arena* arena) = 0;
-    virtual void Clear() = 0;
-
-    virtual const char* _InternalParse(const Message& prototype, Arena* arena,
-                                       LazyVerifyOption option, const char* ptr,
-                                       ParseContext* ctx) = 0;
-    virtual uint8_t* WriteMessageToArray(
-        const MessageLite* prototype, int number, uint8_t* target,
-        io::EpsCopyOutputStream* stream) const = 0;
-
-   private:
-    virtual void UnusedKeyMethod();  // Dummy key method to avoid weak vtable.
-
-    GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(LazyMessageExtension);
-  };
-  // Give access to function defined below to see LazyMessageExtension.
-  friend LazyMessageExtension* MaybeCreateLazyExtension(Arena* arena);
-  struct Extension {
-    // The order of these fields packs Extension into 24 bytes when using 8
-    // byte alignment. Consider this when adding or removing fields here.
-    union {
-      int32_t int32_t_value;
-      int64_t int64_t_value;
-      uint32_t uint32_t_value;
-      uint64_t uint64_t_value;
-      float float_value;
-      double double_value;
-      bool bool_value;
-      int enum_value;
-      std::string* string_value;
-      MessageLite* message_value;
-      LazyMessageExtension* lazymessage_value;
-
-      RepeatedField<int32_t>* repeated_int32_t_value;
-      RepeatedField<int64_t>* repeated_int64_t_value;
-      RepeatedField<uint32_t>* repeated_uint32_t_value;
-      RepeatedField<uint64_t>* repeated_uint64_t_value;
-      RepeatedField<float>* repeated_float_value;
-      RepeatedField<double>* repeated_double_value;
-      RepeatedField<bool>* repeated_bool_value;
-      RepeatedField<int>* repeated_enum_value;
-      RepeatedPtrField<std::string>* repeated_string_value;
-      RepeatedPtrField<MessageLite>* repeated_message_value;
-    };
-
-    FieldType type;
-    bool is_repeated;
-
-    // For singular types, indicates if the extension is "cleared".  This
-    // happens when an extension is set and then later cleared by the caller.
-    // We want to keep the Extension object around for reuse, so instead of
-    // removing it from the map, we just set is_cleared = true.  This has no
-    // meaning for repeated types; for those, the size of the RepeatedField
-    // simply becomes zero when cleared.
-    bool is_cleared : 4;
-
-    // For singular message types, indicates whether lazy parsing is enabled
-    // for this extension. This field is only valid when type == TYPE_MESSAGE
-    // and !is_repeated because we only support lazy parsing for singular
-    // message types currently. If is_lazy = true, the extension is stored in
-    // lazymessage_value. Otherwise, the extension will be message_value.
-    bool is_lazy : 4;
-
-    // For repeated types, this indicates if the [packed=true] option is set.
-    bool is_packed;
-
-    // For packed fields, the size of the packed data is recorded here when
-    // ByteSize() is called then used during serialization.
-    // TODO(kenton):  Use atomic<int> when C++ supports it.
-    mutable int cached_size;
-
-    // The descriptor for this extension, if one exists and is known.  May be
-    // nullptr.  Must not be nullptr if the descriptor for the extension does
-    // not live in the same pool as the descriptor for the containing type.
-    const FieldDescriptor* descriptor;
-
-    // Some helper methods for operations on a single Extension.
-    uint8_t* InternalSerializeFieldWithCachedSizesToArray(
-        const MessageLite* extendee, const ExtensionSet* extension_set,
-        int number, uint8_t* target, io::EpsCopyOutputStream* stream) const;
-    uint8_t* InternalSerializeMessageSetItemWithCachedSizesToArray(
-        const MessageLite* extendee, const ExtensionSet* extension_set,
-        int number, uint8_t* target, io::EpsCopyOutputStream* stream) const;
-    size_t ByteSize(int number) const;
-    size_t MessageSetItemByteSize(int number) const;
-    void Clear();
-    int GetSize() const;
-    void Free();
-    size_t SpaceUsedExcludingSelfLong() const;
-    bool IsInitialized() const;
-  };
-
-  // The Extension struct is small enough to be passed by value, so we use it
-  // directly as the value type in mappings rather than use pointers.  We use
-  // sorted maps rather than hash-maps because we expect most ExtensionSets will
-  // only contain a small number of extension.  Also, we want AppendToList and
-  // deterministic serialization to order fields by field number.
-
-  struct KeyValue {
-    int first;
-    Extension second;
-
-    struct FirstComparator {
-      bool operator()(const KeyValue& lhs, const KeyValue& rhs) const {
-        return lhs.first < rhs.first;
-      }
-      bool operator()(const KeyValue& lhs, int key) const {
-        return lhs.first < key;
-      }
-      bool operator()(int key, const KeyValue& rhs) const {
-        return key < rhs.first;
-      }
-    };
-  };
-
-  typedef std::map<int, Extension> LargeMap;
-
-  // Wrapper API that switches between flat-map and LargeMap.
-
-  // Finds a key (if present) in the ExtensionSet.
-  const Extension* FindOrNull(int key) const;
-  Extension* FindOrNull(int key);
-
-  // Helper-functions that only inspect the LargeMap.
-  const Extension* FindOrNullInLargeMap(int key) const;
-  Extension* FindOrNullInLargeMap(int key);
-
-  // Inserts a new (key, Extension) into the ExtensionSet (and returns true), or
-  // finds the already-existing Extension for that key (returns false).
-  // The Extension* will point to the new-or-found Extension.
-  std::pair<Extension*, bool> Insert(int key);
-
-  // Grows the flat_capacity_.
-  // If flat_capacity_ > kMaximumFlatCapacity, converts to LargeMap.
-  void GrowCapacity(size_t minimum_new_capacity);
-  static constexpr uint16_t kMaximumFlatCapacity = 256;
-  bool is_large() const { return static_cast<int16_t>(flat_size_) < 0; }
-
-  // Removes a key from the ExtensionSet.
-  void Erase(int key);
-
-  size_t Size() const {
-    return PROTOBUF_PREDICT_FALSE(is_large()) ? map_.large->size() : flat_size_;
-  }
-
-  // Similar to std::for_each.
-  // Each Iterator is decomposed into ->first and ->second fields, so
-  // that the KeyValueFunctor can be agnostic vis-a-vis KeyValue-vs-std::pair.
-  template <typename Iterator, typename KeyValueFunctor>
-  static KeyValueFunctor ForEach(Iterator begin, Iterator end,
-                                 KeyValueFunctor func) {
-    for (Iterator it = begin; it != end; ++it) func(it->first, it->second);
-    return std::move(func);
-  }
-
-  // Applies a functor to the <int, Extension&> pairs in sorted order.
-  template <typename KeyValueFunctor>
-  KeyValueFunctor ForEach(KeyValueFunctor func) {
-    if (PROTOBUF_PREDICT_FALSE(is_large())) {
-      return ForEach(map_.large->begin(), map_.large->end(), std::move(func));
-    }
-    return ForEach(flat_begin(), flat_end(), std::move(func));
-  }
-
-  // Applies a functor to the <int, const Extension&> pairs in sorted order.
-  template <typename KeyValueFunctor>
-  KeyValueFunctor ForEach(KeyValueFunctor func) const {
-    if (PROTOBUF_PREDICT_FALSE(is_large())) {
-      return ForEach(map_.large->begin(), map_.large->end(), std::move(func));
-    }
-    return ForEach(flat_begin(), flat_end(), std::move(func));
-  }
-
-  // Merges existing Extension from other_extension
-  void InternalExtensionMergeFrom(const MessageLite* extendee, int number,
-                                  const Extension& other_extension,
-                                  Arena* other_arena);
-
-  inline static bool is_packable(WireFormatLite::WireType type) {
-    switch (type) {
-      case WireFormatLite::WIRETYPE_VARINT:
-      case WireFormatLite::WIRETYPE_FIXED64:
-      case WireFormatLite::WIRETYPE_FIXED32:
-        return true;
-      case WireFormatLite::WIRETYPE_LENGTH_DELIMITED:
-      case WireFormatLite::WIRETYPE_START_GROUP:
-      case WireFormatLite::WIRETYPE_END_GROUP:
-        return false;
-
-        // Do not add a default statement. Let the compiler complain when
-        // someone
-        // adds a new wire type.
-    }
-    PROTOBUF_ASSUME(false);  // switch handles all possible enum values
-    return false;
-  }
-
-  // Returns true and fills field_number and extension if extension is found.
-  // Note to support packed repeated field compatibility, it also fills whether
-  // the tag on wire is packed, which can be different from
-  // extension->is_packed (whether packed=true is specified).
-  template <typename ExtensionFinder>
-  bool FindExtensionInfoFromTag(uint32_t tag, ExtensionFinder* extension_finder,
-                                int* field_number, ExtensionInfo* extension,
-                                bool* was_packed_on_wire) {
-    *field_number = WireFormatLite::GetTagFieldNumber(tag);
-    WireFormatLite::WireType wire_type = WireFormatLite::GetTagWireType(tag);
-    return FindExtensionInfoFromFieldNumber(wire_type, *field_number,
-                                            extension_finder, extension,
-                                            was_packed_on_wire);
-  }
-
-  // Returns true and fills extension if extension is found.
-  // Note to support packed repeated field compatibility, it also fills whether
-  // the tag on wire is packed, which can be different from
-  // extension->is_packed (whether packed=true is specified).
-  template <typename ExtensionFinder>
-  bool FindExtensionInfoFromFieldNumber(int wire_type, int field_number,
-                                        ExtensionFinder* extension_finder,
-                                        ExtensionInfo* extension,
-                                        bool* was_packed_on_wire) const {
-    if (!extension_finder->Find(field_number, extension)) {
-      return false;
-    }
-
-    GOOGLE_DCHECK(extension->type > 0 &&
-           extension->type <= WireFormatLite::MAX_FIELD_TYPE);
-    auto real_type = static_cast<WireFormatLite::FieldType>(extension->type);
-
-    WireFormatLite::WireType expected_wire_type =
-        WireFormatLite::WireTypeForFieldType(real_type);
-
-    // Check if this is a packed field.
-    *was_packed_on_wire = false;
-    if (extension->is_repeated &&
-        wire_type == WireFormatLite::WIRETYPE_LENGTH_DELIMITED &&
-        is_packable(expected_wire_type)) {
-      *was_packed_on_wire = true;
-      return true;
-    }
-    // Otherwise the wire type must match.
-    return expected_wire_type == wire_type;
-  }
-
-  // Find the prototype for a LazyMessage from the extension registry. Returns
-  // null if the extension is not found.
-  const MessageLite* GetPrototypeForLazyMessage(const MessageLite* extendee,
-                                                int number) const;
-
-  // Returns true if extension is present and lazy.
-  bool HasLazy(int number) const;
-
-  // Gets the extension with the given number, creating it if it does not
-  // already exist.  Returns true if the extension did not already exist.
-  bool MaybeNewExtension(int number, const FieldDescriptor* descriptor,
-                         Extension** result);
-
-  // Gets the repeated extension for the given descriptor, creating it if
-  // it does not exist.
-  Extension* MaybeNewRepeatedExtension(const FieldDescriptor* descriptor);
-
-  bool FindExtension(int wire_type, uint32_t field, const MessageLite* extendee,
-                     const internal::ParseContext* /*ctx*/,
-                     ExtensionInfo* extension, bool* was_packed_on_wire) {
-    GeneratedExtensionFinder finder(extendee);
-    return FindExtensionInfoFromFieldNumber(wire_type, field, &finder,
-                                            extension, was_packed_on_wire);
-  }
-  inline bool FindExtension(int wire_type, uint32_t field,
-                            const Message* extendee,
-                            const internal::ParseContext* ctx,
-                            ExtensionInfo* extension, bool* was_packed_on_wire);
-  // Used for MessageSet only
-  const char* ParseFieldMaybeLazily(uint64_t tag, const char* ptr,
-                                    const MessageLite* extendee,
-                                    internal::InternalMetadata* metadata,
-                                    internal::ParseContext* ctx) {
-    // Lite MessageSet doesn't implement lazy.
-    return ParseField(tag, ptr, extendee, metadata, ctx);
-  }
-  const char* ParseFieldMaybeLazily(uint64_t tag, const char* ptr,
-                                    const Message* extendee,
-                                    internal::InternalMetadata* metadata,
-                                    internal::ParseContext* ctx);
-  const char* ParseMessageSetItem(const char* ptr, const MessageLite* extendee,
-                                  internal::InternalMetadata* metadata,
-                                  internal::ParseContext* ctx);
-  const char* ParseMessageSetItem(const char* ptr, const Message* extendee,
-                                  internal::InternalMetadata* metadata,
-                                  internal::ParseContext* ctx);
-
-  // Implemented in extension_set_inl.h to keep code out of the header file.
-  template <typename T>
-  const char* ParseFieldWithExtensionInfo(int number, bool was_packed_on_wire,
-                                          const ExtensionInfo& info,
-                                          internal::InternalMetadata* metadata,
-                                          const char* ptr,
-                                          internal::ParseContext* ctx);
-  template <typename Msg, typename T>
-  const char* ParseMessageSetItemTmpl(const char* ptr, const Msg* extendee,
-                                      internal::InternalMetadata* metadata,
-                                      internal::ParseContext* ctx);
-
-  // Hack:  RepeatedPtrFieldBase declares ExtensionSet as a friend.  This
-  //   friendship should automatically extend to ExtensionSet::Extension, but
-  //   unfortunately some older compilers (e.g. GCC 3.4.4) do not implement this
-  //   correctly.  So, we must provide helpers for calling methods of that
-  //   class.
-
-  // Defined in extension_set_heavy.cc.
-  static inline size_t RepeatedMessage_SpaceUsedExcludingSelfLong(
-      RepeatedPtrFieldBase* field);
-
-  KeyValue* flat_begin() {
-    assert(!is_large());
-    return map_.flat;
-  }
-  const KeyValue* flat_begin() const {
-    assert(!is_large());
-    return map_.flat;
-  }
-  KeyValue* flat_end() {
-    assert(!is_large());
-    return map_.flat + flat_size_;
-  }
-  const KeyValue* flat_end() const {
-    assert(!is_large());
-    return map_.flat + flat_size_;
-  }
-
-  Arena* arena_;
-
-  // Manual memory-management:
-  // map_.flat is an allocated array of flat_capacity_ elements.
-  // [map_.flat, map_.flat + flat_size_) is the currently-in-use prefix.
-  uint16_t flat_capacity_;
-  uint16_t flat_size_;  // negative int16_t(flat_size_) indicates is_large()
-  union AllocatedData {
-    KeyValue* flat;
-
-    // If flat_capacity_ > kMaximumFlatCapacity, switch to LargeMap,
-    // which guarantees O(n lg n) CPU but larger constant factors.
-    LargeMap* large;
-  } map_;
-
-  static void DeleteFlatMap(const KeyValue* flat, uint16_t flat_capacity);
-
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(ExtensionSet);
-};
-
-constexpr ExtensionSet::ExtensionSet()
-    : arena_(nullptr), flat_capacity_(0), flat_size_(0), map_{nullptr} {}
-
-// These are just for convenience...
-inline void ExtensionSet::SetString(int number, FieldType type,
-                                    std::string value,
-                                    const FieldDescriptor* descriptor) {
-  MutableString(number, type, descriptor)->assign(std::move(value));
-}
-inline void ExtensionSet::SetRepeatedString(int number, int index,
-                                            std::string value) {
-  MutableRepeatedString(number, index)->assign(std::move(value));
-}
-inline void ExtensionSet::AddString(int number, FieldType type,
-                                    std::string value,
-                                    const FieldDescriptor* descriptor) {
-  AddString(number, type, descriptor)->assign(std::move(value));
-}
-// ===================================================================
-// Glue for generated extension accessors
-
-// -------------------------------------------------------------------
-// Template magic
-
-// First we have a set of classes representing "type traits" for different
-// field types.  A type traits class knows how to implement basic accessors
-// for extensions of a particular type given an ExtensionSet.  The signature
-// for a type traits class looks like this:
-//
-//   class TypeTraits {
-//    public:
-//     typedef ? ConstType;
-//     typedef ? MutableType;
-//     // TypeTraits for singular fields and repeated fields will define the
-//     // symbol "Singular" or "Repeated" respectively. These two symbols will
-//     // be used in extension accessors to distinguish between singular
-//     // extensions and repeated extensions. If the TypeTraits for the passed
-//     // in extension doesn't have the expected symbol defined, it means the
-//     // user is passing a repeated extension to a singular accessor, or the
-//     // opposite. In that case the C++ compiler will generate an error
-//     // message "no matching member function" to inform the user.
-//     typedef ? Singular
-//     typedef ? Repeated
-//
-//     static inline ConstType Get(int number, const ExtensionSet& set);
-//     static inline void Set(int number, ConstType value, ExtensionSet* set);
-//     static inline MutableType Mutable(int number, ExtensionSet* set);
-//
-//     // Variants for repeated fields.
-//     static inline ConstType Get(int number, const ExtensionSet& set,
-//                                 int index);
-//     static inline void Set(int number, int index,
-//                            ConstType value, ExtensionSet* set);
-//     static inline MutableType Mutable(int number, int index,
-//                                       ExtensionSet* set);
-//     static inline void Add(int number, ConstType value, ExtensionSet* set);
-//     static inline MutableType Add(int number, ExtensionSet* set);
-//     This is used by the ExtensionIdentifier constructor to register
-//     the extension at dynamic initialization.
-//     template <typename ExtendeeT>
-//     static void Register(int number, FieldType type, bool is_packed);
-//   };
-//
-// Not all of these methods make sense for all field types.  For example, the
-// "Mutable" methods only make sense for strings and messages, and the
-// repeated methods only make sense for repeated types.  So, each type
-// traits class implements only the set of methods from this signature that it
-// actually supports.  This will cause a compiler error if the user tries to
-// access an extension using a method that doesn't make sense for its type.
-// For example, if "foo" is an extension of type "optional int32", then if you
-// try to write code like:
-//   my_message.MutableExtension(foo)
-// you will get a compile error because PrimitiveTypeTraits<int32_t> does not
-// have a "Mutable()" method.
-
-// -------------------------------------------------------------------
-// PrimitiveTypeTraits
-
-// Since the ExtensionSet has different methods for each primitive type,
-// we must explicitly define the methods of the type traits class for each
-// known type.
-template <typename Type>
-class PrimitiveTypeTraits {
- public:
-  typedef Type ConstType;
-  typedef Type MutableType;
-  typedef PrimitiveTypeTraits<Type> Singular;
-
-  static inline ConstType Get(int number, const ExtensionSet& set,
-                              ConstType default_value);
-
-  static inline const ConstType* GetPtr(int number, const ExtensionSet& set,
-                                        const ConstType& default_value);
-  static inline void Set(int number, FieldType field_type, ConstType value,
-                         ExtensionSet* set);
-  template <typename ExtendeeT>
-  static void Register(int number, FieldType type, bool is_packed,
-                       LazyEagerVerifyFnType verify_func) {
-    ExtensionSet::RegisterExtension(&ExtendeeT::default_instance(), number,
-                                    type, false, is_packed, verify_func);
-  }
-};
-
-template <typename Type>
-class RepeatedPrimitiveTypeTraits {
- public:
-  typedef Type ConstType;
-  typedef Type MutableType;
-  typedef RepeatedPrimitiveTypeTraits<Type> Repeated;
-
-  typedef RepeatedField<Type> RepeatedFieldType;
-
-  static inline Type Get(int number, const ExtensionSet& set, int index);
-  static inline const Type* GetPtr(int number, const ExtensionSet& set,
-                                   int index);
-  static inline const RepeatedField<ConstType>* GetRepeatedPtr(
-      int number, const ExtensionSet& set);
-  static inline void Set(int number, int index, Type value, ExtensionSet* set);
-  static inline void Add(int number, FieldType field_type, bool is_packed,
-                         Type value, ExtensionSet* set);
-
-  static inline const RepeatedField<ConstType>& GetRepeated(
-      int number, const ExtensionSet& set);
-  static inline RepeatedField<Type>* MutableRepeated(int number,
-                                                     FieldType field_type,
-                                                     bool is_packed,
-                                                     ExtensionSet* set);
-
-  static const RepeatedFieldType* GetDefaultRepeatedField();
-  template <typename ExtendeeT>
-  static void Register(int number, FieldType type, bool is_packed,
-                       LazyEagerVerifyFnType verify_func) {
-    ExtensionSet::RegisterExtension(&ExtendeeT::default_instance(), number,
-                                    type, true, is_packed, verify_func);
-  }
-};
-
-class PROTOBUF_EXPORT RepeatedPrimitiveDefaults {
- private:
-  template <typename Type>
-  friend class RepeatedPrimitiveTypeTraits;
-  static const RepeatedPrimitiveDefaults* default_instance();
-  RepeatedField<int32_t> default_repeated_field_int32_t_;
-  RepeatedField<int64_t> default_repeated_field_int64_t_;
-  RepeatedField<uint32_t> default_repeated_field_uint32_t_;
-  RepeatedField<uint64_t> default_repeated_field_uint64_t_;
-  RepeatedField<double> default_repeated_field_double_;
-  RepeatedField<float> default_repeated_field_float_;
-  RepeatedField<bool> default_repeated_field_bool_;
-};
-
-#define PROTOBUF_DEFINE_PRIMITIVE_TYPE(TYPE, METHOD)                           \
-  template <>                                                                  \
-  inline TYPE PrimitiveTypeTraits<TYPE>::Get(                                  \
-      int number, const ExtensionSet& set, TYPE default_value) {               \
-    return set.Get##METHOD(number, default_value);                             \
-  }                                                                            \
-  template <>                                                                  \
-  inline const TYPE* PrimitiveTypeTraits<TYPE>::GetPtr(                        \
-      int number, const ExtensionSet& set, const TYPE& default_value) {        \
-    return &set.GetRef##METHOD(number, default_value);                         \
-  }                                                                            \
-  template <>                                                                  \
-  inline void PrimitiveTypeTraits<TYPE>::Set(int number, FieldType field_type, \
-                                             TYPE value, ExtensionSet* set) {  \
-    set->Set##METHOD(number, field_type, value, nullptr);                      \
-  }                                                                            \
-                                                                               \
-  template <>                                                                  \
-  inline TYPE RepeatedPrimitiveTypeTraits<TYPE>::Get(                          \
-      int number, const ExtensionSet& set, int index) {                        \
-    return set.GetRepeated##METHOD(number, index);                             \
-  }                                                                            \
-  template <>                                                                  \
-  inline const TYPE* RepeatedPrimitiveTypeTraits<TYPE>::GetPtr(                \
-      int number, const ExtensionSet& set, int index) {                        \
-    return &set.GetRefRepeated##METHOD(number, index);                         \
-  }                                                                            \
-  template <>                                                                  \
-  inline void RepeatedPrimitiveTypeTraits<TYPE>::Set(                          \
-      int number, int index, TYPE value, ExtensionSet* set) {                  \
-    set->SetRepeated##METHOD(number, index, value);                            \
-  }                                                                            \
-  template <>                                                                  \
-  inline void RepeatedPrimitiveTypeTraits<TYPE>::Add(                          \
-      int number, FieldType field_type, bool is_packed, TYPE value,            \
-      ExtensionSet* set) {                                                     \
-    set->Add##METHOD(number, field_type, is_packed, value, nullptr);           \
-  }                                                                            \
-  template <>                                                                  \
-  inline const RepeatedField<TYPE>*                                            \
-  RepeatedPrimitiveTypeTraits<TYPE>::GetDefaultRepeatedField() {               \
-    return &RepeatedPrimitiveDefaults::default_instance()                      \
-                ->default_repeated_field_##TYPE##_;                            \
-  }                                                                            \
-  template <>                                                                  \
-  inline const RepeatedField<TYPE>&                                            \
-  RepeatedPrimitiveTypeTraits<TYPE>::GetRepeated(int number,                   \
-                                                 const ExtensionSet& set) {    \
-    return *reinterpret_cast<const RepeatedField<TYPE>*>(                      \
-        set.GetRawRepeatedField(number, GetDefaultRepeatedField()));           \
-  }                                                                            \
-  template <>                                                                  \
-  inline const RepeatedField<TYPE>*                                            \
-  RepeatedPrimitiveTypeTraits<TYPE>::GetRepeatedPtr(int number,                \
-                                                    const ExtensionSet& set) { \
-    return &GetRepeated(number, set);                                          \
-  }                                                                            \
-  template <>                                                                  \
-  inline RepeatedField<TYPE>*                                                  \
-  RepeatedPrimitiveTypeTraits<TYPE>::MutableRepeated(                          \
-      int number, FieldType field_type, bool is_packed, ExtensionSet* set) {   \
-    return reinterpret_cast<RepeatedField<TYPE>*>(                             \
-        set->MutableRawRepeatedField(number, field_type, is_packed, nullptr)); \
-  }
-
-PROTOBUF_DEFINE_PRIMITIVE_TYPE(int32_t, Int32)
-PROTOBUF_DEFINE_PRIMITIVE_TYPE(int64_t, Int64)
-PROTOBUF_DEFINE_PRIMITIVE_TYPE(uint32_t, UInt32)
-PROTOBUF_DEFINE_PRIMITIVE_TYPE(uint64_t, UInt64)
-PROTOBUF_DEFINE_PRIMITIVE_TYPE(float, Float)
-PROTOBUF_DEFINE_PRIMITIVE_TYPE(double, Double)
-PROTOBUF_DEFINE_PRIMITIVE_TYPE(bool, Bool)
-
-#undef PROTOBUF_DEFINE_PRIMITIVE_TYPE
-
-// -------------------------------------------------------------------
-// StringTypeTraits
-
-// Strings support both Set() and Mutable().
-class PROTOBUF_EXPORT StringTypeTraits {
- public:
-  typedef const std::string& ConstType;
-  typedef std::string* MutableType;
-  typedef StringTypeTraits Singular;
-
-  static inline const std::string& Get(int number, const ExtensionSet& set,
-                                       ConstType default_value) {
-    return set.GetString(number, default_value);
-  }
-  static inline const std::string* GetPtr(int number, const ExtensionSet& set,
-                                          ConstType default_value) {
-    return &Get(number, set, default_value);
-  }
-  static inline void Set(int number, FieldType field_type,
-                         const std::string& value, ExtensionSet* set) {
-    set->SetString(number, field_type, value, nullptr);
-  }
-  static inline std::string* Mutable(int number, FieldType field_type,
-                                     ExtensionSet* set) {
-    return set->MutableString(number, field_type, nullptr);
-  }
-  template <typename ExtendeeT>
-  static void Register(int number, FieldType type, bool is_packed,
-                       LazyEagerVerifyFnType verify_func) {
-    ExtensionSet::RegisterExtension(&ExtendeeT::default_instance(), number,
-                                    type, false, is_packed, verify_func);
-  }
-};
-
-class PROTOBUF_EXPORT RepeatedStringTypeTraits {
- public:
-  typedef const std::string& ConstType;
-  typedef std::string* MutableType;
-  typedef RepeatedStringTypeTraits Repeated;
-
-  typedef RepeatedPtrField<std::string> RepeatedFieldType;
-
-  static inline const std::string& Get(int number, const ExtensionSet& set,
-                                       int index) {
-    return set.GetRepeatedString(number, index);
-  }
-  static inline const std::string* GetPtr(int number, const ExtensionSet& set,
-                                          int index) {
-    return &Get(number, set, index);
-  }
-  static inline const RepeatedPtrField<std::string>* GetRepeatedPtr(
-      int number, const ExtensionSet& set) {
-    return &GetRepeated(number, set);
-  }
-  static inline void Set(int number, int index, const std::string& value,
-                         ExtensionSet* set) {
-    set->SetRepeatedString(number, index, value);
-  }
-  static inline std::string* Mutable(int number, int index, ExtensionSet* set) {
-    return set->MutableRepeatedString(number, index);
-  }
-  static inline void Add(int number, FieldType field_type, bool /*is_packed*/,
-                         const std::string& value, ExtensionSet* set) {
-    set->AddString(number, field_type, value, nullptr);
-  }
-  static inline std::string* Add(int number, FieldType field_type,
-                                 ExtensionSet* set) {
-    return set->AddString(number, field_type, nullptr);
-  }
-  static inline const RepeatedPtrField<std::string>& GetRepeated(
-      int number, const ExtensionSet& set) {
-    return *reinterpret_cast<const RepeatedPtrField<std::string>*>(
-        set.GetRawRepeatedField(number, GetDefaultRepeatedField()));
-  }
-
-  static inline RepeatedPtrField<std::string>* MutableRepeated(
-      int number, FieldType field_type, bool is_packed, ExtensionSet* set) {
-    return reinterpret_cast<RepeatedPtrField<std::string>*>(
-        set->MutableRawRepeatedField(number, field_type, is_packed, nullptr));
-  }
-
-  static const RepeatedFieldType* GetDefaultRepeatedField();
-
-  template <typename ExtendeeT>
-  static void Register(int number, FieldType type, bool is_packed,
-                       LazyEagerVerifyFnType fn) {
-    ExtensionSet::RegisterExtension(&ExtendeeT::default_instance(), number,
-                                    type, true, is_packed, fn);
-  }
-
- private:
-  static void InitializeDefaultRepeatedFields();
-  static void DestroyDefaultRepeatedFields();
-};
-
-// -------------------------------------------------------------------
-// EnumTypeTraits
-
-// ExtensionSet represents enums using integers internally, so we have to
-// static_cast around.
-template <typename Type, bool IsValid(int)>
-class EnumTypeTraits {
- public:
-  typedef Type ConstType;
-  typedef Type MutableType;
-  typedef EnumTypeTraits<Type, IsValid> Singular;
-
-  static inline ConstType Get(int number, const ExtensionSet& set,
-                              ConstType default_value) {
-    return static_cast<Type>(set.GetEnum(number, default_value));
-  }
-  static inline const ConstType* GetPtr(int number, const ExtensionSet& set,
-                                        const ConstType& default_value) {
-    return reinterpret_cast<const Type*>(
-        &set.GetRefEnum(number, default_value));
-  }
-  static inline void Set(int number, FieldType field_type, ConstType value,
-                         ExtensionSet* set) {
-    GOOGLE_DCHECK(IsValid(value));
-    set->SetEnum(number, field_type, value, nullptr);
-  }
-  template <typename ExtendeeT>
-  static void Register(int number, FieldType type, bool is_packed,
-                       LazyEagerVerifyFnType fn) {
-    ExtensionSet::RegisterEnumExtension(&ExtendeeT::default_instance(), number,
-                                        type, false, is_packed, IsValid);
-  }
-};
-
-template <typename Type, bool IsValid(int)>
-class RepeatedEnumTypeTraits {
- public:
-  typedef Type ConstType;
-  typedef Type MutableType;
-  typedef RepeatedEnumTypeTraits<Type, IsValid> Repeated;
-
-  typedef RepeatedField<Type> RepeatedFieldType;
-
-  static inline ConstType Get(int number, const ExtensionSet& set, int index) {
-    return static_cast<Type>(set.GetRepeatedEnum(number, index));
-  }
-  static inline const ConstType* GetPtr(int number, const ExtensionSet& set,
-                                        int index) {
-    return reinterpret_cast<const Type*>(
-        &set.GetRefRepeatedEnum(number, index));
-  }
-  static inline void Set(int number, int index, ConstType value,
-                         ExtensionSet* set) {
-    GOOGLE_DCHECK(IsValid(value));
-    set->SetRepeatedEnum(number, index, value);
-  }
-  static inline void Add(int number, FieldType field_type, bool is_packed,
-                         ConstType value, ExtensionSet* set) {
-    GOOGLE_DCHECK(IsValid(value));
-    set->AddEnum(number, field_type, is_packed, value, nullptr);
-  }
-  static inline const RepeatedField<Type>& GetRepeated(
-      int number, const ExtensionSet& set) {
-    // Hack: the `Extension` struct stores a RepeatedField<int> for enums.
-    // RepeatedField<int> cannot implicitly convert to RepeatedField<EnumType>
-    // so we need to do some casting magic. See message.h for similar
-    // contortions for non-extension fields.
-    return *reinterpret_cast<const RepeatedField<Type>*>(
-        set.GetRawRepeatedField(number, GetDefaultRepeatedField()));
-  }
-  static inline const RepeatedField<Type>* GetRepeatedPtr(
-      int number, const ExtensionSet& set) {
-    return &GetRepeated(number, set);
-  }
-  static inline RepeatedField<Type>* MutableRepeated(int number,
-                                                     FieldType field_type,
-                                                     bool is_packed,
-                                                     ExtensionSet* set) {
-    return reinterpret_cast<RepeatedField<Type>*>(
-        set->MutableRawRepeatedField(number, field_type, is_packed, nullptr));
-  }
-
-  static const RepeatedFieldType* GetDefaultRepeatedField() {
-    // Hack: as noted above, repeated enum fields are internally stored as a
-    // RepeatedField<int>. We need to be able to instantiate global static
-    // objects to return as default (empty) repeated fields on non-existent
-    // extensions. We would not be able to know a-priori all of the enum types
-    // (values of |Type|) to instantiate all of these, so we just re-use
-    // int32_t's default repeated field object.
-    return reinterpret_cast<const RepeatedField<Type>*>(
-        RepeatedPrimitiveTypeTraits<int32_t>::GetDefaultRepeatedField());
-  }
-  template <typename ExtendeeT>
-  static void Register(int number, FieldType type, bool is_packed,
-                       LazyEagerVerifyFnType fn) {
-    ExtensionSet::RegisterEnumExtension(&ExtendeeT::default_instance(), number,
-                                        type, true, is_packed, IsValid);
-  }
-};
-
-// -------------------------------------------------------------------
-// MessageTypeTraits
-
-// ExtensionSet guarantees that when manipulating extensions with message
-// types, the implementation used will be the compiled-in class representing
-// that type.  So, we can static_cast down to the exact type we expect.
-template <typename Type>
-class MessageTypeTraits {
- public:
-  typedef const Type& ConstType;
-  typedef Type* MutableType;
-  typedef MessageTypeTraits<Type> Singular;
-
-  static inline ConstType Get(int number, const ExtensionSet& set,
-                              ConstType default_value) {
-    return static_cast<const Type&>(set.GetMessage(number, default_value));
-  }
-  static inline std::nullptr_t GetPtr(int /* number */,
-                                      const ExtensionSet& /* set */,
-                                      ConstType /* default_value */) {
-    // Cannot be implemented because of forward declared messages?
-    return nullptr;
-  }
-  static inline MutableType Mutable(int number, FieldType field_type,
-                                    ExtensionSet* set) {
-    return static_cast<Type*>(set->MutableMessage(
-        number, field_type, Type::default_instance(), nullptr));
-  }
-  static inline void SetAllocated(int number, FieldType field_type,
-                                  MutableType message, ExtensionSet* set) {
-    set->SetAllocatedMessage(number, field_type, nullptr, message);
-  }
-  static inline void UnsafeArenaSetAllocated(int number, FieldType field_type,
-                                             MutableType message,
-                                             ExtensionSet* set) {
-    set->UnsafeArenaSetAllocatedMessage(number, field_type, nullptr, message);
-  }
-  PROTOBUF_NODISCARD static inline MutableType Release(
-      int number, FieldType /* field_type */, ExtensionSet* set) {
-    return static_cast<Type*>(
-        set->ReleaseMessage(number, Type::default_instance()));
-  }
-  static inline MutableType UnsafeArenaRelease(int number,
-                                               FieldType /* field_type */,
-                                               ExtensionSet* set) {
-    return static_cast<Type*>(
-        set->UnsafeArenaReleaseMessage(number, Type::default_instance()));
-  }
-  template <typename ExtendeeT>
-  static void Register(int number, FieldType type, bool is_packed,
-                       LazyEagerVerifyFnType fn) {
-    ExtensionSet::RegisterMessageExtension(&ExtendeeT::default_instance(),
-                                           number, type, false, is_packed,
-                                           &Type::default_instance(), fn);
-  }
-};
-
-// Used by WireFormatVerify to extract the verify function from the registry.
-LazyEagerVerifyFnType FindExtensionLazyEagerVerifyFn(
-    const MessageLite* extendee, int number);
-
-// forward declaration.
-class RepeatedMessageGenericTypeTraits;
-
-template <typename Type>
-class RepeatedMessageTypeTraits {
- public:
-  typedef const Type& ConstType;
-  typedef Type* MutableType;
-  typedef RepeatedMessageTypeTraits<Type> Repeated;
-
-  typedef RepeatedPtrField<Type> RepeatedFieldType;
-
-  static inline ConstType Get(int number, const ExtensionSet& set, int index) {
-    return static_cast<const Type&>(set.GetRepeatedMessage(number, index));
-  }
-  static inline std::nullptr_t GetPtr(int /* number */,
-                                      const ExtensionSet& /* set */,
-                                      int /* index */) {
-    // Cannot be implemented because of forward declared messages?
-    return nullptr;
-  }
-  static inline std::nullptr_t GetRepeatedPtr(int /* number */,
-                                              const ExtensionSet& /* set */) {
-    // Cannot be implemented because of forward declared messages?
-    return nullptr;
-  }
-  static inline MutableType Mutable(int number, int index, ExtensionSet* set) {
-    return static_cast<Type*>(set->MutableRepeatedMessage(number, index));
-  }
-  static inline MutableType Add(int number, FieldType field_type,
-                                ExtensionSet* set) {
-    return static_cast<Type*>(
-        set->AddMessage(number, field_type, Type::default_instance(), nullptr));
-  }
-  static inline const RepeatedPtrField<Type>& GetRepeated(
-      int number, const ExtensionSet& set) {
-    // See notes above in RepeatedEnumTypeTraits::GetRepeated(): same
-    // casting hack applies here, because a RepeatedPtrField<MessageLite>
-    // cannot naturally become a RepeatedPtrType<Type> even though Type is
-    // presumably a message. google::protobuf::Message goes through similar contortions
-    // with a reinterpret_cast<>.
-    return *reinterpret_cast<const RepeatedPtrField<Type>*>(
-        set.GetRawRepeatedField(number, GetDefaultRepeatedField()));
-  }
-  static inline RepeatedPtrField<Type>* MutableRepeated(int number,
-                                                        FieldType field_type,
-                                                        bool is_packed,
-                                                        ExtensionSet* set) {
-    return reinterpret_cast<RepeatedPtrField<Type>*>(
-        set->MutableRawRepeatedField(number, field_type, is_packed, nullptr));
-  }
-
-  static const RepeatedFieldType* GetDefaultRepeatedField();
-  template <typename ExtendeeT>
-  static void Register(int number, FieldType type, bool is_packed,
-                       LazyEagerVerifyFnType fn) {
-    ExtensionSet::RegisterMessageExtension(&ExtendeeT::default_instance(),
-                                           number, type, true, is_packed,
-                                           &Type::default_instance(), fn);
-  }
-};
-
-template <typename Type>
-inline const typename RepeatedMessageTypeTraits<Type>::RepeatedFieldType*
-RepeatedMessageTypeTraits<Type>::GetDefaultRepeatedField() {
-  static auto instance = OnShutdownDelete(new RepeatedFieldType);
-  return instance;
-}
-
-// -------------------------------------------------------------------
-// ExtensionIdentifier
-
-// This is the type of actual extension objects.  E.g. if you have:
-//   extend Foo {
-//     optional int32 bar = 1234;
-//   }
-// then "bar" will be defined in C++ as:
-//   ExtensionIdentifier<Foo, PrimitiveTypeTraits<int32_t>, 5, false> bar(1234);
-//
-// Note that we could, in theory, supply the field number as a template
-// parameter, and thus make an instance of ExtensionIdentifier have no
-// actual contents.  However, if we did that, then using an extension
-// identifier would not necessarily cause the compiler to output any sort
-// of reference to any symbol defined in the extension's .pb.o file.  Some
-// linkers will actually drop object files that are not explicitly referenced,
-// but that would be bad because it would cause this extension to not be
-// registered at static initialization, and therefore using it would crash.
-
-template <typename ExtendeeType, typename TypeTraitsType, FieldType field_type,
-          bool is_packed>
-class ExtensionIdentifier {
- public:
-  typedef TypeTraitsType TypeTraits;
-  typedef ExtendeeType Extendee;
-
-  ExtensionIdentifier(int number, typename TypeTraits::ConstType default_value,
-                      LazyEagerVerifyFnType verify_func = nullptr)
-      : number_(number), default_value_(default_value) {
-    Register(number, verify_func);
-  }
-  inline int number() const { return number_; }
-  typename TypeTraits::ConstType default_value() const {
-    return default_value_;
-  }
-
-  static void Register(int number, LazyEagerVerifyFnType verify_func) {
-    TypeTraits::template Register<ExtendeeType>(number, field_type, is_packed,
-                                                verify_func);
-  }
-
-  typename TypeTraits::ConstType const& default_value_ref() const {
-    return default_value_;
-  }
-
- private:
-  const int number_;
-  typename TypeTraits::ConstType default_value_;
-};
-
-// -------------------------------------------------------------------
-// Generated accessors
-
-
-// Used to retrieve a lazy extension, may return nullptr in some environments.
-extern PROTOBUF_ATTRIBUTE_WEAK ExtensionSet::LazyMessageExtension*
-MaybeCreateLazyExtension(Arena* arena);
-
-}  // namespace internal
-
-// Call this function to ensure that this extensions's reflection is linked into
-// the binary:
-//
-//   google::protobuf::LinkExtensionReflection(Foo::my_extension);
-//
-// This will ensure that the following lookup will succeed:
-//
-//   DescriptorPool::generated_pool()->FindExtensionByName("Foo.my_extension");
-//
-// This is often relevant for parsing extensions in text mode.
-//
-// As a side-effect, it will also guarantee that anything else from the same
-// .proto file will also be available for lookup in the generated pool.
-//
-// This function does not actually register the extension, so it does not need
-// to be called before the lookup.  However it does need to occur in a function
-// that cannot be stripped from the binary (ie. it must be reachable from main).
-//
-// Best practice is to call this function as close as possible to where the
-// reflection is actually needed.  This function is very cheap to call, so you
-// should not need to worry about its runtime overhead except in tight loops (on
-// x86-64 it compiles into two "mov" instructions).
-template <typename ExtendeeType, typename TypeTraitsType,
-          internal::FieldType field_type, bool is_packed>
-void LinkExtensionReflection(
-    const google::protobuf::internal::ExtensionIdentifier<
-        ExtendeeType, TypeTraitsType, field_type, is_packed>& extension) {
-  internal::StrongReference(extension);
-}
-
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
-
-#endif  // GOOGLE_PROTOBUF_EXTENSION_SET_H__
diff --git a/libs/protobuf/src/google/protobuf/extension_set_heavy.cc b/libs/protobuf/src/google/protobuf/extension_set_heavy.cc
deleted file mode 100644
index a4bb948..0000000
--- a/libs/protobuf/src/google/protobuf/extension_set_heavy.cc
+++ /dev/null
@@ -1,440 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-//
-// Contains methods defined in extension_set.h which cannot be part of the
-// lite library because they use descriptors or reflection.
-
-#include <google/protobuf/stubs/casts.h>
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/arena.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/descriptor.pb.h>
-#include <google/protobuf/extension_set.h>
-#include <google/protobuf/extension_set_inl.h>
-#include <google/protobuf/message.h>
-#include <google/protobuf/message_lite.h>
-#include <google/protobuf/parse_context.h>
-#include <google/protobuf/repeated_field.h>
-#include <google/protobuf/unknown_field_set.h>
-#include <google/protobuf/wire_format.h>
-#include <google/protobuf/wire_format_lite.h>
-
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-namespace internal {
-
-// Implementation of ExtensionFinder which finds extensions in a given
-// DescriptorPool, using the given MessageFactory to construct sub-objects.
-// This class is implemented in extension_set_heavy.cc.
-class DescriptorPoolExtensionFinder {
- public:
-  DescriptorPoolExtensionFinder(const DescriptorPool* pool,
-                                MessageFactory* factory,
-                                const Descriptor* containing_type)
-      : pool_(pool), factory_(factory), containing_type_(containing_type) {}
-
-  bool Find(int number, ExtensionInfo* output);
-
- private:
-  const DescriptorPool* pool_;
-  MessageFactory* factory_;
-  const Descriptor* containing_type_;
-};
-
-void ExtensionSet::AppendToList(
-    const Descriptor* containing_type, const DescriptorPool* pool,
-    std::vector<const FieldDescriptor*>* output) const {
-  ForEach([containing_type, pool, &output](int number, const Extension& ext) {
-    bool has = false;
-    if (ext.is_repeated) {
-      has = ext.GetSize() > 0;
-    } else {
-      has = !ext.is_cleared;
-    }
-
-    if (has) {
-      // TODO(kenton): Looking up each field by number is somewhat unfortunate.
-      //   Is there a better way?  The problem is that descriptors are lazily-
-      //   initialized, so they might not even be constructed until
-      //   AppendToList() is called.
-
-      if (ext.descriptor == nullptr) {
-        output->push_back(pool->FindExtensionByNumber(containing_type, number));
-      } else {
-        output->push_back(ext.descriptor);
-      }
-    }
-  });
-}
-
-inline FieldDescriptor::Type real_type(FieldType type) {
-  GOOGLE_DCHECK(type > 0 && type <= FieldDescriptor::MAX_TYPE);
-  return static_cast<FieldDescriptor::Type>(type);
-}
-
-inline FieldDescriptor::CppType cpp_type(FieldType type) {
-  return FieldDescriptor::TypeToCppType(
-      static_cast<FieldDescriptor::Type>(type));
-}
-
-inline WireFormatLite::FieldType field_type(FieldType type) {
-  GOOGLE_DCHECK(type > 0 && type <= WireFormatLite::MAX_FIELD_TYPE);
-  return static_cast<WireFormatLite::FieldType>(type);
-}
-
-#define GOOGLE_DCHECK_TYPE(EXTENSION, LABEL, CPPTYPE)                         \
-  GOOGLE_DCHECK_EQ((EXTENSION).is_repeated ? FieldDescriptor::LABEL_REPEATED  \
-                                    : FieldDescriptor::LABEL_OPTIONAL, \
-            FieldDescriptor::LABEL_##LABEL);                           \
-  GOOGLE_DCHECK_EQ(cpp_type((EXTENSION).type), FieldDescriptor::CPPTYPE_##CPPTYPE)
-
-const MessageLite& ExtensionSet::GetMessage(int number,
-                                            const Descriptor* message_type,
-                                            MessageFactory* factory) const {
-  const Extension* extension = FindOrNull(number);
-  if (extension == nullptr || extension->is_cleared) {
-    // Not present.  Return the default value.
-    return *factory->GetPrototype(message_type);
-  } else {
-    GOOGLE_DCHECK_TYPE(*extension, OPTIONAL, MESSAGE);
-    if (extension->is_lazy) {
-      return extension->lazymessage_value->GetMessage(
-          *factory->GetPrototype(message_type), arena_);
-    } else {
-      return *extension->message_value;
-    }
-  }
-}
-
-MessageLite* ExtensionSet::MutableMessage(const FieldDescriptor* descriptor,
-                                          MessageFactory* factory) {
-  Extension* extension;
-  if (MaybeNewExtension(descriptor->number(), descriptor, &extension)) {
-    extension->type = descriptor->type();
-    GOOGLE_DCHECK_EQ(cpp_type(extension->type), FieldDescriptor::CPPTYPE_MESSAGE);
-    extension->is_repeated = false;
-    extension->is_packed = false;
-    const MessageLite* prototype =
-        factory->GetPrototype(descriptor->message_type());
-    extension->is_lazy = false;
-    extension->message_value = prototype->New(arena_);
-    extension->is_cleared = false;
-    return extension->message_value;
-  } else {
-    GOOGLE_DCHECK_TYPE(*extension, OPTIONAL, MESSAGE);
-    extension->is_cleared = false;
-    if (extension->is_lazy) {
-      return extension->lazymessage_value->MutableMessage(
-          *factory->GetPrototype(descriptor->message_type()), arena_);
-    } else {
-      return extension->message_value;
-    }
-  }
-}
-
-MessageLite* ExtensionSet::ReleaseMessage(const FieldDescriptor* descriptor,
-                                          MessageFactory* factory) {
-  Extension* extension = FindOrNull(descriptor->number());
-  if (extension == nullptr) {
-    // Not present.  Return nullptr.
-    return nullptr;
-  } else {
-    GOOGLE_DCHECK_TYPE(*extension, OPTIONAL, MESSAGE);
-    MessageLite* ret = nullptr;
-    if (extension->is_lazy) {
-      ret = extension->lazymessage_value->ReleaseMessage(
-          *factory->GetPrototype(descriptor->message_type()), arena_);
-      if (arena_ == nullptr) {
-        delete extension->lazymessage_value;
-      }
-    } else {
-      if (arena_ != nullptr) {
-        ret = extension->message_value->New();
-        ret->CheckTypeAndMergeFrom(*extension->message_value);
-      } else {
-        ret = extension->message_value;
-      }
-    }
-    Erase(descriptor->number());
-    return ret;
-  }
-}
-
-MessageLite* ExtensionSet::UnsafeArenaReleaseMessage(
-    const FieldDescriptor* descriptor, MessageFactory* factory) {
-  Extension* extension = FindOrNull(descriptor->number());
-  if (extension == nullptr) {
-    // Not present.  Return nullptr.
-    return nullptr;
-  } else {
-    GOOGLE_DCHECK_TYPE(*extension, OPTIONAL, MESSAGE);
-    MessageLite* ret = nullptr;
-    if (extension->is_lazy) {
-      ret = extension->lazymessage_value->UnsafeArenaReleaseMessage(
-          *factory->GetPrototype(descriptor->message_type()), arena_);
-      if (arena_ == nullptr) {
-        delete extension->lazymessage_value;
-      }
-    } else {
-      ret = extension->message_value;
-    }
-    Erase(descriptor->number());
-    return ret;
-  }
-}
-
-ExtensionSet::Extension* ExtensionSet::MaybeNewRepeatedExtension(
-    const FieldDescriptor* descriptor) {
-  Extension* extension;
-  if (MaybeNewExtension(descriptor->number(), descriptor, &extension)) {
-    extension->type = descriptor->type();
-    GOOGLE_DCHECK_EQ(cpp_type(extension->type), FieldDescriptor::CPPTYPE_MESSAGE);
-    extension->is_repeated = true;
-    extension->repeated_message_value =
-        Arena::CreateMessage<RepeatedPtrField<MessageLite> >(arena_);
-  } else {
-    GOOGLE_DCHECK_TYPE(*extension, REPEATED, MESSAGE);
-  }
-  return extension;
-}
-
-MessageLite* ExtensionSet::AddMessage(const FieldDescriptor* descriptor,
-                                      MessageFactory* factory) {
-  Extension* extension = MaybeNewRepeatedExtension(descriptor);
-
-  // RepeatedPtrField<Message> does not know how to Add() since it cannot
-  // allocate an abstract object, so we have to be tricky.
-  MessageLite* result =
-      reinterpret_cast<internal::RepeatedPtrFieldBase*>(
-          extension->repeated_message_value)
-          ->AddFromCleared<GenericTypeHandler<MessageLite> >();
-  if (result == nullptr) {
-    const MessageLite* prototype;
-    if (extension->repeated_message_value->empty()) {
-      prototype = factory->GetPrototype(descriptor->message_type());
-      GOOGLE_CHECK(prototype != nullptr);
-    } else {
-      prototype = &extension->repeated_message_value->Get(0);
-    }
-    result = prototype->New(arena_);
-    extension->repeated_message_value->AddAllocated(result);
-  }
-  return result;
-}
-
-void ExtensionSet::AddAllocatedMessage(const FieldDescriptor* descriptor,
-                                       MessageLite* new_entry) {
-  Extension* extension = MaybeNewRepeatedExtension(descriptor);
-
-  extension->repeated_message_value->AddAllocated(new_entry);
-}
-
-void ExtensionSet::UnsafeArenaAddAllocatedMessage(
-    const FieldDescriptor* descriptor, MessageLite* new_entry) {
-  Extension* extension = MaybeNewRepeatedExtension(descriptor);
-
-  extension->repeated_message_value->UnsafeArenaAddAllocated(new_entry);
-}
-
-static bool ValidateEnumUsingDescriptor(const void* arg, int number) {
-  return reinterpret_cast<const EnumDescriptor*>(arg)->FindValueByNumber(
-             number) != nullptr;
-}
-
-bool DescriptorPoolExtensionFinder::Find(int number, ExtensionInfo* output) {
-  const FieldDescriptor* extension =
-      pool_->FindExtensionByNumber(containing_type_, number);
-  if (extension == nullptr) {
-    return false;
-  } else {
-    output->type = extension->type();
-    output->is_repeated = extension->is_repeated();
-    output->is_packed = extension->options().packed();
-    output->descriptor = extension;
-    if (extension->cpp_type() == FieldDescriptor::CPPTYPE_MESSAGE) {
-      output->message_info.prototype =
-          factory_->GetPrototype(extension->message_type());
-      GOOGLE_CHECK(output->message_info.prototype != nullptr)
-          << "Extension factory's GetPrototype() returned nullptr; extension: "
-          << extension->full_name();
-    } else if (extension->cpp_type() == FieldDescriptor::CPPTYPE_ENUM) {
-      output->enum_validity_check.func = ValidateEnumUsingDescriptor;
-      output->enum_validity_check.arg = extension->enum_type();
-    }
-
-    return true;
-  }
-}
-
-
-bool ExtensionSet::FindExtension(int wire_type, uint32_t field,
-                                 const Message* containing_type,
-                                 const internal::ParseContext* ctx,
-                                 ExtensionInfo* extension,
-                                 bool* was_packed_on_wire) {
-  if (ctx->data().pool == nullptr) {
-    GeneratedExtensionFinder finder(containing_type);
-    if (!FindExtensionInfoFromFieldNumber(wire_type, field, &finder, extension,
-                                          was_packed_on_wire)) {
-      return false;
-    }
-  } else {
-    DescriptorPoolExtensionFinder finder(ctx->data().pool, ctx->data().factory,
-                                         containing_type->GetDescriptor());
-    if (!FindExtensionInfoFromFieldNumber(wire_type, field, &finder, extension,
-                                          was_packed_on_wire)) {
-      return false;
-    }
-  }
-  return true;
-}
-
-const char* ExtensionSet::ParseField(uint64_t tag, const char* ptr,
-                                     const Message* containing_type,
-                                     internal::InternalMetadata* metadata,
-                                     internal::ParseContext* ctx) {
-  int number = tag >> 3;
-  bool was_packed_on_wire;
-  ExtensionInfo extension;
-  if (!FindExtension(tag & 7, number, containing_type, ctx, &extension,
-                     &was_packed_on_wire)) {
-    return UnknownFieldParse(
-        tag, metadata->mutable_unknown_fields<UnknownFieldSet>(), ptr, ctx);
-  }
-  return ParseFieldWithExtensionInfo<UnknownFieldSet>(
-      number, was_packed_on_wire, extension, metadata, ptr, ctx);
-}
-
-const char* ExtensionSet::ParseFieldMaybeLazily(
-    uint64_t tag, const char* ptr, const Message* containing_type,
-    internal::InternalMetadata* metadata, internal::ParseContext* ctx) {
-  return ParseField(tag, ptr, containing_type, metadata, ctx);
-}
-
-const char* ExtensionSet::ParseMessageSetItem(
-    const char* ptr, const Message* containing_type,
-    internal::InternalMetadata* metadata, internal::ParseContext* ctx) {
-  return ParseMessageSetItemTmpl<Message, UnknownFieldSet>(ptr, containing_type,
-                                                           metadata, ctx);
-}
-
-int ExtensionSet::SpaceUsedExcludingSelf() const {
-  return internal::FromIntSize(SpaceUsedExcludingSelfLong());
-}
-
-size_t ExtensionSet::SpaceUsedExcludingSelfLong() const {
-  size_t total_size =
-      (is_large() ? map_.large->size() : flat_capacity_) * sizeof(KeyValue);
-  ForEach([&total_size](int /* number */, const Extension& ext) {
-    total_size += ext.SpaceUsedExcludingSelfLong();
-  });
-  return total_size;
-}
-
-inline size_t ExtensionSet::RepeatedMessage_SpaceUsedExcludingSelfLong(
-    RepeatedPtrFieldBase* field) {
-  return field->SpaceUsedExcludingSelfLong<GenericTypeHandler<Message> >();
-}
-
-size_t ExtensionSet::Extension::SpaceUsedExcludingSelfLong() const {
-  size_t total_size = 0;
-  if (is_repeated) {
-    switch (cpp_type(type)) {
-#define HANDLE_TYPE(UPPERCASE, LOWERCASE)                                     \
-  case FieldDescriptor::CPPTYPE_##UPPERCASE:                                  \
-    total_size += sizeof(*repeated_##LOWERCASE##_value) +                     \
-                  repeated_##LOWERCASE##_value->SpaceUsedExcludingSelfLong(); \
-    break
-
-      HANDLE_TYPE(INT32, int32_t);
-      HANDLE_TYPE(INT64, int64_t);
-      HANDLE_TYPE(UINT32, uint32_t);
-      HANDLE_TYPE(UINT64, uint64_t);
-      HANDLE_TYPE(FLOAT, float);
-      HANDLE_TYPE(DOUBLE, double);
-      HANDLE_TYPE(BOOL, bool);
-      HANDLE_TYPE(ENUM, enum);
-      HANDLE_TYPE(STRING, string);
-#undef HANDLE_TYPE
-
-      case FieldDescriptor::CPPTYPE_MESSAGE:
-        // repeated_message_value is actually a RepeatedPtrField<MessageLite>,
-        // but MessageLite has no SpaceUsedLong(), so we must directly call
-        // RepeatedPtrFieldBase::SpaceUsedExcludingSelfLong() with a different
-        // type handler.
-        total_size += sizeof(*repeated_message_value) +
-                      RepeatedMessage_SpaceUsedExcludingSelfLong(
-                          reinterpret_cast<internal::RepeatedPtrFieldBase*>(
-                              repeated_message_value));
-        break;
-    }
-  } else {
-    switch (cpp_type(type)) {
-      case FieldDescriptor::CPPTYPE_STRING:
-        total_size += sizeof(*string_value) +
-                      StringSpaceUsedExcludingSelfLong(*string_value);
-        break;
-      case FieldDescriptor::CPPTYPE_MESSAGE:
-        if (is_lazy) {
-          total_size += lazymessage_value->SpaceUsedLong();
-        } else {
-          total_size += down_cast<Message*>(message_value)->SpaceUsedLong();
-        }
-        break;
-      default:
-        // No extra storage costs for primitive types.
-        break;
-    }
-  }
-  return total_size;
-}
-
-uint8_t* ExtensionSet::SerializeMessageSetWithCachedSizesToArray(
-    const MessageLite* extendee, uint8_t* target) const {
-  io::EpsCopyOutputStream stream(
-      target, MessageSetByteSize(),
-      io::CodedOutputStream::IsDefaultSerializationDeterministic());
-  return InternalSerializeMessageSetWithCachedSizesToArray(extendee, target,
-                                                           &stream);
-}
-
-}  // namespace internal
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
diff --git a/libs/protobuf/src/google/protobuf/extension_set_inl.h b/libs/protobuf/src/google/protobuf/extension_set_inl.h
deleted file mode 100644
index e4e7117..0000000
--- a/libs/protobuf/src/google/protobuf/extension_set_inl.h
+++ /dev/null
@@ -1,285 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef GOOGLE_PROTOBUF_EXTENSION_SET_INL_H__
-#define GOOGLE_PROTOBUF_EXTENSION_SET_INL_H__
-
-#include <google/protobuf/extension_set.h>
-#include <google/protobuf/metadata_lite.h>
-#include <google/protobuf/parse_context.h>
-
-namespace google {
-namespace protobuf {
-namespace internal {
-
-template <typename T>
-const char* ExtensionSet::ParseFieldWithExtensionInfo(
-    int number, bool was_packed_on_wire, const ExtensionInfo& extension,
-    InternalMetadata* metadata, const char* ptr, internal::ParseContext* ctx) {
-  if (was_packed_on_wire) {
-    switch (extension.type) {
-#define HANDLE_TYPE(UPPERCASE, CPP_CAMELCASE)                                \
-  case WireFormatLite::TYPE_##UPPERCASE:                                     \
-    return internal::Packed##CPP_CAMELCASE##Parser(                          \
-        MutableRawRepeatedField(number, extension.type, extension.is_packed, \
-                                extension.descriptor),                       \
-        ptr, ctx);
-      HANDLE_TYPE(INT32, Int32);
-      HANDLE_TYPE(INT64, Int64);
-      HANDLE_TYPE(UINT32, UInt32);
-      HANDLE_TYPE(UINT64, UInt64);
-      HANDLE_TYPE(SINT32, SInt32);
-      HANDLE_TYPE(SINT64, SInt64);
-      HANDLE_TYPE(FIXED32, Fixed32);
-      HANDLE_TYPE(FIXED64, Fixed64);
-      HANDLE_TYPE(SFIXED32, SFixed32);
-      HANDLE_TYPE(SFIXED64, SFixed64);
-      HANDLE_TYPE(FLOAT, Float);
-      HANDLE_TYPE(DOUBLE, Double);
-      HANDLE_TYPE(BOOL, Bool);
-#undef HANDLE_TYPE
-
-      case WireFormatLite::TYPE_ENUM:
-        return internal::PackedEnumParserArg<T>(
-            MutableRawRepeatedField(number, extension.type, extension.is_packed,
-                                    extension.descriptor),
-            ptr, ctx, extension.enum_validity_check.func,
-            extension.enum_validity_check.arg, metadata, number);
-      case WireFormatLite::TYPE_STRING:
-      case WireFormatLite::TYPE_BYTES:
-      case WireFormatLite::TYPE_GROUP:
-      case WireFormatLite::TYPE_MESSAGE:
-        GOOGLE_LOG(FATAL) << "Non-primitive types can't be packed.";
-        break;
-    }
-  } else {
-    switch (extension.type) {
-#define HANDLE_VARINT_TYPE(UPPERCASE, CPP_CAMELCASE)                        \
-  case WireFormatLite::TYPE_##UPPERCASE: {                                  \
-    uint64_t value;                                                         \
-    ptr = VarintParse(ptr, &value);                                         \
-    GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);                                    \
-    if (extension.is_repeated) {                                            \
-      Add##CPP_CAMELCASE(number, WireFormatLite::TYPE_##UPPERCASE,          \
-                         extension.is_packed, value, extension.descriptor); \
-    } else {                                                                \
-      Set##CPP_CAMELCASE(number, WireFormatLite::TYPE_##UPPERCASE, value,   \
-                         extension.descriptor);                             \
-    }                                                                       \
-  } break
-
-      HANDLE_VARINT_TYPE(INT32, Int32);
-      HANDLE_VARINT_TYPE(INT64, Int64);
-      HANDLE_VARINT_TYPE(UINT32, UInt32);
-      HANDLE_VARINT_TYPE(UINT64, UInt64);
-      HANDLE_VARINT_TYPE(BOOL, Bool);
-#undef HANDLE_VARINT_TYPE
-#define HANDLE_SVARINT_TYPE(UPPERCASE, CPP_CAMELCASE, SIZE)                 \
-  case WireFormatLite::TYPE_##UPPERCASE: {                                  \
-    uint64_t val;                                                           \
-    ptr = VarintParse(ptr, &val);                                           \
-    GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);                                    \
-    auto value = WireFormatLite::ZigZagDecode##SIZE(val);                   \
-    if (extension.is_repeated) {                                            \
-      Add##CPP_CAMELCASE(number, WireFormatLite::TYPE_##UPPERCASE,          \
-                         extension.is_packed, value, extension.descriptor); \
-    } else {                                                                \
-      Set##CPP_CAMELCASE(number, WireFormatLite::TYPE_##UPPERCASE, value,   \
-                         extension.descriptor);                             \
-    }                                                                       \
-  } break
-
-      HANDLE_SVARINT_TYPE(SINT32, Int32, 32);
-      HANDLE_SVARINT_TYPE(SINT64, Int64, 64);
-#undef HANDLE_SVARINT_TYPE
-#define HANDLE_FIXED_TYPE(UPPERCASE, CPP_CAMELCASE, CPPTYPE)                \
-  case WireFormatLite::TYPE_##UPPERCASE: {                                  \
-    auto value = UnalignedLoad<CPPTYPE>(ptr);                               \
-    ptr += sizeof(CPPTYPE);                                                 \
-    if (extension.is_repeated) {                                            \
-      Add##CPP_CAMELCASE(number, WireFormatLite::TYPE_##UPPERCASE,          \
-                         extension.is_packed, value, extension.descriptor); \
-    } else {                                                                \
-      Set##CPP_CAMELCASE(number, WireFormatLite::TYPE_##UPPERCASE, value,   \
-                         extension.descriptor);                             \
-    }                                                                       \
-  } break
-
-      HANDLE_FIXED_TYPE(FIXED32, UInt32, uint32_t);
-      HANDLE_FIXED_TYPE(FIXED64, UInt64, uint64_t);
-      HANDLE_FIXED_TYPE(SFIXED32, Int32, int32_t);
-      HANDLE_FIXED_TYPE(SFIXED64, Int64, int64_t);
-      HANDLE_FIXED_TYPE(FLOAT, Float, float);
-      HANDLE_FIXED_TYPE(DOUBLE, Double, double);
-#undef HANDLE_FIXED_TYPE
-
-      case WireFormatLite::TYPE_ENUM: {
-        uint64_t val;
-        ptr = VarintParse(ptr, &val);
-        GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
-        int value = val;
-
-        if (!extension.enum_validity_check.func(
-                extension.enum_validity_check.arg, value)) {
-          WriteVarint(number, val, metadata->mutable_unknown_fields<T>());
-        } else if (extension.is_repeated) {
-          AddEnum(number, WireFormatLite::TYPE_ENUM, extension.is_packed, value,
-                  extension.descriptor);
-        } else {
-          SetEnum(number, WireFormatLite::TYPE_ENUM, value,
-                  extension.descriptor);
-        }
-        break;
-      }
-
-      case WireFormatLite::TYPE_BYTES:
-      case WireFormatLite::TYPE_STRING: {
-        std::string* value =
-            extension.is_repeated
-                ? AddString(number, WireFormatLite::TYPE_STRING,
-                            extension.descriptor)
-                : MutableString(number, WireFormatLite::TYPE_STRING,
-                                extension.descriptor);
-        int size = ReadSize(&ptr);
-        GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
-        return ctx->ReadString(ptr, size, value);
-      }
-
-      case WireFormatLite::TYPE_GROUP: {
-        MessageLite* value =
-            extension.is_repeated
-                ? AddMessage(number, WireFormatLite::TYPE_GROUP,
-                             *extension.message_info.prototype,
-                             extension.descriptor)
-                : MutableMessage(number, WireFormatLite::TYPE_GROUP,
-                                 *extension.message_info.prototype,
-                                 extension.descriptor);
-        uint32_t tag = (number << 3) + WireFormatLite::WIRETYPE_START_GROUP;
-        return ctx->ParseGroup(value, ptr, tag);
-      }
-
-      case WireFormatLite::TYPE_MESSAGE: {
-        MessageLite* value =
-            extension.is_repeated
-                ? AddMessage(number, WireFormatLite::TYPE_MESSAGE,
-                             *extension.message_info.prototype,
-                             extension.descriptor)
-                : MutableMessage(number, WireFormatLite::TYPE_MESSAGE,
-                                 *extension.message_info.prototype,
-                                 extension.descriptor);
-        return ctx->ParseMessage(value, ptr);
-      }
-    }
-  }
-  return ptr;
-}
-
-template <typename Msg, typename T>
-const char* ExtensionSet::ParseMessageSetItemTmpl(
-    const char* ptr, const Msg* extendee, internal::InternalMetadata* metadata,
-    internal::ParseContext* ctx) {
-  std::string payload;
-  uint32_t type_id;
-  enum class State { kNoTag, kHasType, kHasPayload, kDone };
-  State state = State::kNoTag;
-
-  while (!ctx->Done(&ptr)) {
-    uint32_t tag = static_cast<uint8_t>(*ptr++);
-    if (tag == WireFormatLite::kMessageSetTypeIdTag) {
-      uint64_t tmp;
-      ptr = ParseBigVarint(ptr, &tmp);
-      GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
-      if (state == State::kNoTag) {
-        type_id = tmp;
-        state = State::kHasType;
-      } else if (state == State::kHasPayload) {
-        type_id = tmp;
-        ExtensionInfo extension;
-        bool was_packed_on_wire;
-        if (!FindExtension(2, type_id, extendee, ctx, &extension,
-                           &was_packed_on_wire)) {
-          WriteLengthDelimited(type_id, payload,
-                               metadata->mutable_unknown_fields<T>());
-        } else {
-          MessageLite* value =
-              extension.is_repeated
-                  ? AddMessage(type_id, WireFormatLite::TYPE_MESSAGE,
-                               *extension.message_info.prototype,
-                               extension.descriptor)
-                  : MutableMessage(type_id, WireFormatLite::TYPE_MESSAGE,
-                                   *extension.message_info.prototype,
-                                   extension.descriptor);
-
-          const char* p;
-          // We can't use regular parse from string as we have to track
-          // proper recursion depth and descriptor pools.
-          ParseContext tmp_ctx(ctx->depth(), false, &p, payload);
-          tmp_ctx.data().pool = ctx->data().pool;
-          tmp_ctx.data().factory = ctx->data().factory;
-          GOOGLE_PROTOBUF_PARSER_ASSERT(value->_InternalParse(p, &tmp_ctx) &&
-                                         tmp_ctx.EndedAtLimit());
-        }
-        state = State::kDone;
-      }
-    } else if (tag == WireFormatLite::kMessageSetMessageTag) {
-      if (state == State::kHasType) {
-        ptr = ParseFieldMaybeLazily(static_cast<uint64_t>(type_id) * 8 + 2, ptr,
-                                    extendee, metadata, ctx);
-        GOOGLE_PROTOBUF_PARSER_ASSERT(ptr != nullptr);
-        state = State::kDone;
-      } else {
-        std::string tmp;
-        int32_t size = ReadSize(&ptr);
-        GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
-        ptr = ctx->ReadString(ptr, size, &tmp);
-        GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
-        if (state == State::kNoTag) {
-          payload = std::move(tmp);
-          state = State::kHasPayload;
-        }
-      }
-    } else {
-      ptr = ReadTag(ptr - 1, &tag);
-      if (tag == 0 || (tag & 7) == 4) {
-        ctx->SetLastTag(tag);
-        return ptr;
-      }
-      ptr = ParseField(tag, ptr, extendee, metadata, ctx);
-      GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
-    }
-  }
-  return ptr;
-}
-
-}  // namespace internal
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // GOOGLE_PROTOBUF_EXTENSION_SET_INL_H__
diff --git a/libs/protobuf/src/google/protobuf/extension_set_unittest.cc b/libs/protobuf/src/google/protobuf/extension_set_unittest.cc
deleted file mode 100644
index 207e10c..0000000
--- a/libs/protobuf/src/google/protobuf/extension_set_unittest.cc
+++ /dev/null
@@ -1,1385 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-
-#include <google/protobuf/stubs/casts.h>
-#include <google/protobuf/stubs/strutil.h>
-#include <google/protobuf/stubs/logging.h>
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/unittest.pb.h>
-#include <google/protobuf/unittest_mset.pb.h>
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/io/zero_copy_stream_impl.h>
-#include <google/protobuf/descriptor.pb.h>
-#include <google/protobuf/arena.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/dynamic_message.h>
-#include <google/protobuf/extension_set.h>
-#include <google/protobuf/text_format.h>
-#include <google/protobuf/wire_format.h>
-#include <google/protobuf/testing/googletest.h>
-#include <gtest/gtest.h>
-#include <google/protobuf/test_util.h>
-#include <google/protobuf/test_util2.h>
-#include <google/protobuf/stubs/stl_util.h>
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-
-namespace google {
-namespace protobuf {
-namespace internal {
-namespace {
-
-using TestUtil::EqualsToSerialized;
-
-// This test closely mirrors third_party/protobuf/compiler/cpp/unittest.cc
-// except that it uses extensions rather than regular fields.
-
-TEST(ExtensionSetTest, Defaults) {
-  // Check that all default values are set correctly in the initial message.
-  unittest::TestAllExtensions message;
-
-  TestUtil::ExpectExtensionsClear(message);
-
-  // Messages should return pointers to default instances until first use.
-  // (This is not checked by ExpectClear() since it is not actually true after
-  // the fields have been set and then cleared.)
-  EXPECT_EQ(&unittest::OptionalGroup_extension::default_instance(),
-            &message.GetExtension(unittest::optionalgroup_extension));
-  EXPECT_EQ(&unittest::TestAllTypes::NestedMessage::default_instance(),
-            &message.GetExtension(unittest::optional_nested_message_extension));
-  EXPECT_EQ(
-      &unittest::ForeignMessage::default_instance(),
-      &message.GetExtension(unittest::optional_foreign_message_extension));
-  EXPECT_EQ(&unittest_import::ImportMessage::default_instance(),
-            &message.GetExtension(unittest::optional_import_message_extension));
-}
-
-TEST(ExtensionSetTest, Accessors) {
-  // Set every field to a unique value then go back and check all those
-  // values.
-  unittest::TestAllExtensions message;
-
-  TestUtil::SetAllExtensions(&message);
-  TestUtil::ExpectAllExtensionsSet(message);
-
-  TestUtil::ModifyRepeatedExtensions(&message);
-  TestUtil::ExpectRepeatedExtensionsModified(message);
-}
-
-TEST(ExtensionSetTest, Clear) {
-  // Set every field to a unique value, clear the message, then check that
-  // it is cleared.
-  unittest::TestAllExtensions message;
-
-  TestUtil::SetAllExtensions(&message);
-  message.Clear();
-  TestUtil::ExpectExtensionsClear(message);
-
-  // Make sure setting stuff again after clearing works.  (This takes slightly
-  // different code paths since the objects are reused.)
-  TestUtil::SetAllExtensions(&message);
-  TestUtil::ExpectAllExtensionsSet(message);
-}
-
-TEST(ExtensionSetTest, ClearOneField) {
-  // Set every field to a unique value, then clear one value and insure that
-  // only that one value is cleared.
-  unittest::TestAllExtensions message;
-
-  TestUtil::SetAllExtensions(&message);
-  int64_t original_value =
-      message.GetExtension(unittest::optional_int64_extension);
-
-  // Clear the field and make sure it shows up as cleared.
-  message.ClearExtension(unittest::optional_int64_extension);
-  EXPECT_FALSE(message.HasExtension(unittest::optional_int64_extension));
-  EXPECT_EQ(0, message.GetExtension(unittest::optional_int64_extension));
-
-  // Other adjacent fields should not be cleared.
-  EXPECT_TRUE(message.HasExtension(unittest::optional_int32_extension));
-  EXPECT_TRUE(message.HasExtension(unittest::optional_uint32_extension));
-
-  // Make sure if we set it again, then all fields are set.
-  message.SetExtension(unittest::optional_int64_extension, original_value);
-  TestUtil::ExpectAllExtensionsSet(message);
-}
-
-TEST(ExtensionSetTest, SetAllocatedExtension) {
-  unittest::TestAllExtensions message;
-  EXPECT_FALSE(
-      message.HasExtension(unittest::optional_foreign_message_extension));
-  // Add a extension using SetAllocatedExtension
-  unittest::ForeignMessage* foreign_message = new unittest::ForeignMessage();
-  message.SetAllocatedExtension(unittest::optional_foreign_message_extension,
-                                foreign_message);
-  EXPECT_TRUE(
-      message.HasExtension(unittest::optional_foreign_message_extension));
-  EXPECT_EQ(foreign_message, message.MutableExtension(
-                                 unittest::optional_foreign_message_extension));
-  EXPECT_EQ(foreign_message, &message.GetExtension(
-                                 unittest::optional_foreign_message_extension));
-
-  // SetAllocatedExtension should delete the previously existing extension.
-  // (We reply on unittest to check memory leaks for this case)
-  message.SetAllocatedExtension(unittest::optional_foreign_message_extension,
-                                new unittest::ForeignMessage());
-
-  // SetAllocatedExtension with nullptr is equivalent to ClearExtenion.
-  message.SetAllocatedExtension(unittest::optional_foreign_message_extension,
-                                nullptr);
-  EXPECT_FALSE(
-      message.HasExtension(unittest::optional_foreign_message_extension));
-}
-
-TEST(ExtensionSetTest, ReleaseExtension) {
-  proto2_wireformat_unittest::TestMessageSet message;
-  EXPECT_FALSE(message.HasExtension(
-      unittest::TestMessageSetExtension1::message_set_extension));
-  // Add a extension using SetAllocatedExtension
-  unittest::TestMessageSetExtension1* extension =
-      new unittest::TestMessageSetExtension1();
-  message.SetAllocatedExtension(
-      unittest::TestMessageSetExtension1::message_set_extension, extension);
-  EXPECT_TRUE(message.HasExtension(
-      unittest::TestMessageSetExtension1::message_set_extension));
-  // Release the extension using ReleaseExtension
-  unittest::TestMessageSetExtension1* released_extension =
-      message.ReleaseExtension(
-          unittest::TestMessageSetExtension1::message_set_extension);
-  EXPECT_EQ(extension, released_extension);
-  EXPECT_FALSE(message.HasExtension(
-      unittest::TestMessageSetExtension1::message_set_extension));
-  // ReleaseExtension will return the underlying object even after
-  // ClearExtension is called.
-  message.SetAllocatedExtension(
-      unittest::TestMessageSetExtension1::message_set_extension,
-      released_extension);
-  message.ClearExtension(
-      unittest::TestMessageSetExtension1::message_set_extension);
-  released_extension = message.ReleaseExtension(
-      unittest::TestMessageSetExtension1::message_set_extension);
-  EXPECT_TRUE(released_extension != nullptr);
-  delete released_extension;
-}
-
-TEST(ExtensionSetTest, ArenaUnsafeArenaSetAllocatedAndRelease) {
-  Arena arena;
-  unittest::TestAllExtensions* message =
-      Arena::CreateMessage<unittest::TestAllExtensions>(&arena);
-  unittest::ForeignMessage extension;
-  message->UnsafeArenaSetAllocatedExtension(
-      unittest::optional_foreign_message_extension, &extension);
-  // No copy when set.
-  unittest::ForeignMessage* mutable_extension =
-      message->MutableExtension(unittest::optional_foreign_message_extension);
-  EXPECT_EQ(&extension, mutable_extension);
-  // No copy when unsafe released.
-  unittest::ForeignMessage* released_extension =
-      message->UnsafeArenaReleaseExtension(
-          unittest::optional_foreign_message_extension);
-  EXPECT_EQ(&extension, released_extension);
-  EXPECT_FALSE(
-      message->HasExtension(unittest::optional_foreign_message_extension));
-  // Set the ownership back and let the destructors run.  It should not take
-  // ownership, so this should not crash.
-  message->UnsafeArenaSetAllocatedExtension(
-      unittest::optional_foreign_message_extension, &extension);
-}
-
-TEST(ExtensionSetTest, UnsafeArenaSetAllocatedAndRelease) {
-  unittest::TestAllExtensions message;
-  unittest::ForeignMessage* extension = new unittest::ForeignMessage();
-  message.UnsafeArenaSetAllocatedExtension(
-      unittest::optional_foreign_message_extension, extension);
-  // No copy when set.
-  unittest::ForeignMessage* mutable_extension =
-      message.MutableExtension(unittest::optional_foreign_message_extension);
-  EXPECT_EQ(extension, mutable_extension);
-  // No copy when unsafe released.
-  unittest::ForeignMessage* released_extension =
-      message.UnsafeArenaReleaseExtension(
-          unittest::optional_foreign_message_extension);
-  EXPECT_EQ(extension, released_extension);
-  EXPECT_FALSE(
-      message.HasExtension(unittest::optional_foreign_message_extension));
-  // Set the ownership back and let the destructors run.  It should take
-  // ownership, so this should not leak.
-  message.UnsafeArenaSetAllocatedExtension(
-      unittest::optional_foreign_message_extension, extension);
-}
-
-TEST(ExtensionSetTest, ArenaUnsafeArenaReleaseOfHeapAlloc) {
-  Arena arena;
-  unittest::TestAllExtensions* message =
-      Arena::CreateMessage<unittest::TestAllExtensions>(&arena);
-  unittest::ForeignMessage* extension = new unittest::ForeignMessage;
-  message->SetAllocatedExtension(unittest::optional_foreign_message_extension,
-                                 extension);
-  // The arena should maintain ownership of the heap allocated proto because we
-  // used UnsafeArenaReleaseExtension.  The leak checker will ensure this.
-  unittest::ForeignMessage* released_extension =
-      message->UnsafeArenaReleaseExtension(
-          unittest::optional_foreign_message_extension);
-  EXPECT_EQ(extension, released_extension);
-  EXPECT_FALSE(
-      message->HasExtension(unittest::optional_foreign_message_extension));
-}
-
-
-TEST(ExtensionSetTest, CopyFrom) {
-  unittest::TestAllExtensions message1, message2;
-
-  TestUtil::SetAllExtensions(&message1);
-  message2.CopyFrom(message1);
-  TestUtil::ExpectAllExtensionsSet(message2);
-  message2.CopyFrom(message1);  // exercise copy when fields already exist
-  TestUtil::ExpectAllExtensionsSet(message2);
-}
-
-TEST(ExtensionSetTest, CopyFromPacked) {
-  unittest::TestPackedExtensions message1, message2;
-
-  TestUtil::SetPackedExtensions(&message1);
-  message2.CopyFrom(message1);
-  TestUtil::ExpectPackedExtensionsSet(message2);
-  message2.CopyFrom(message1);  // exercise copy when fields already exist
-  TestUtil::ExpectPackedExtensionsSet(message2);
-}
-
-TEST(ExtensionSetTest, CopyFromUpcasted) {
-  unittest::TestAllExtensions message1, message2;
-  const Message& upcasted_message = message1;
-
-  TestUtil::SetAllExtensions(&message1);
-  message2.CopyFrom(upcasted_message);
-  TestUtil::ExpectAllExtensionsSet(message2);
-  // exercise copy when fields already exist
-  message2.CopyFrom(upcasted_message);
-  TestUtil::ExpectAllExtensionsSet(message2);
-}
-
-TEST(ExtensionSetTest, SwapWithEmpty) {
-  unittest::TestAllExtensions message1, message2;
-  TestUtil::SetAllExtensions(&message1);
-
-  TestUtil::ExpectAllExtensionsSet(message1);
-  TestUtil::ExpectExtensionsClear(message2);
-  message1.Swap(&message2);
-  TestUtil::ExpectAllExtensionsSet(message2);
-  TestUtil::ExpectExtensionsClear(message1);
-}
-
-TEST(ExtensionSetTest, SwapWithSelf) {
-  unittest::TestAllExtensions message;
-  TestUtil::SetAllExtensions(&message);
-
-  TestUtil::ExpectAllExtensionsSet(message);
-  message.Swap(&message);
-  TestUtil::ExpectAllExtensionsSet(message);
-}
-
-TEST(ExtensionSetTest, SwapExtension) {
-  unittest::TestAllExtensions message1;
-  unittest::TestAllExtensions message2;
-
-  TestUtil::SetAllExtensions(&message1);
-  std::vector<const FieldDescriptor*> fields;
-
-  // Swap empty fields.
-  const Reflection* reflection = message1.GetReflection();
-  reflection->SwapFields(&message1, &message2, fields);
-  TestUtil::ExpectAllExtensionsSet(message1);
-  TestUtil::ExpectExtensionsClear(message2);
-
-  // Swap two extensions.
-  fields.push_back(reflection->FindKnownExtensionByNumber(12));
-  fields.push_back(reflection->FindKnownExtensionByNumber(25));
-  reflection->SwapFields(&message1, &message2, fields);
-
-  EXPECT_TRUE(message1.HasExtension(unittest::optional_int32_extension));
-  EXPECT_FALSE(message1.HasExtension(unittest::optional_double_extension));
-  EXPECT_FALSE(message1.HasExtension(unittest::optional_cord_extension));
-
-  EXPECT_FALSE(message2.HasExtension(unittest::optional_int32_extension));
-  EXPECT_TRUE(message2.HasExtension(unittest::optional_double_extension));
-  EXPECT_TRUE(message2.HasExtension(unittest::optional_cord_extension));
-}
-
-TEST(ExtensionSetTest, SwapExtensionWithEmpty) {
-  unittest::TestAllExtensions message1;
-  unittest::TestAllExtensions message2;
-  unittest::TestAllExtensions message3;
-
-  TestUtil::SetAllExtensions(&message3);
-
-  const Reflection* reflection = message3.GetReflection();
-  std::vector<const FieldDescriptor*> fields;
-  reflection->ListFields(message3, &fields);
-
-  reflection->SwapFields(&message1, &message2, fields);
-
-  TestUtil::ExpectExtensionsClear(message1);
-  TestUtil::ExpectExtensionsClear(message2);
-}
-
-TEST(ExtensionSetTest, SwapExtensionBothFull) {
-  unittest::TestAllExtensions message1;
-  unittest::TestAllExtensions message2;
-
-  TestUtil::SetAllExtensions(&message1);
-  TestUtil::SetAllExtensions(&message2);
-
-  const Reflection* reflection = message1.GetReflection();
-  std::vector<const FieldDescriptor*> fields;
-  reflection->ListFields(message1, &fields);
-
-  reflection->SwapFields(&message1, &message2, fields);
-
-  TestUtil::ExpectAllExtensionsSet(message1);
-  TestUtil::ExpectAllExtensionsSet(message2);
-}
-
-TEST(ExtensionSetTest, ArenaSetAllExtension) {
-  Arena arena1;
-  unittest::TestAllExtensions* message1 =
-      Arena::CreateMessage<unittest::TestAllExtensions>(&arena1);
-  TestUtil::SetAllExtensions(message1);
-  TestUtil::ExpectAllExtensionsSet(*message1);
-}
-
-TEST(ExtensionSetTest, ArenaCopyConstructor) {
-  Arena arena1;
-  unittest::TestAllExtensions* message1 =
-      Arena::CreateMessage<unittest::TestAllExtensions>(&arena1);
-  TestUtil::SetAllExtensions(message1);
-  unittest::TestAllExtensions message2(*message1);
-  arena1.Reset();
-  TestUtil::ExpectAllExtensionsSet(message2);
-}
-
-TEST(ExtensionSetTest, ArenaMergeFrom) {
-  Arena arena1;
-  unittest::TestAllExtensions* message1 =
-      Arena::CreateMessage<unittest::TestAllExtensions>(&arena1);
-  TestUtil::SetAllExtensions(message1);
-  unittest::TestAllExtensions message2;
-  message2.MergeFrom(*message1);
-  arena1.Reset();
-  TestUtil::ExpectAllExtensionsSet(message2);
-}
-
-TEST(ExtensionSetTest, ArenaMergeFromWithClearedExtensions) {
-  Arena arena;
-  {
-    auto* message1 = Arena::CreateMessage<unittest::TestAllExtensions>(&arena);
-    auto* message2 = Arena::CreateMessage<unittest::TestAllExtensions>(&arena);
-
-    // Set an extension and then clear it
-    message1->SetExtension(unittest::optional_int32_extension, 1);
-    message1->ClearExtension(unittest::optional_int32_extension);
-
-    // Since all extensions in message1 have been cleared, we should be able to
-    // merge it into message2 without allocating any additional memory.
-    uint64_t space_used_before_merge = arena.SpaceUsed();
-    message2->MergeFrom(*message1);
-    EXPECT_EQ(space_used_before_merge, arena.SpaceUsed());
-  }
-  {
-    // As more complicated case, let's have message1 and message2 share some
-    // uncleared extensions in common.
-    auto* message1 = Arena::CreateMessage<unittest::TestAllExtensions>(&arena);
-    auto* message2 = Arena::CreateMessage<unittest::TestAllExtensions>(&arena);
-
-    // Set int32 and uint32 on both messages.
-    message1->SetExtension(unittest::optional_int32_extension, 1);
-    message2->SetExtension(unittest::optional_int32_extension, 2);
-    message1->SetExtension(unittest::optional_uint32_extension, 1);
-    message2->SetExtension(unittest::optional_uint32_extension, 2);
-
-    // Set and clear int64 and uint64 on message1.
-    message1->SetExtension(unittest::optional_int64_extension, 0);
-    message1->ClearExtension(unittest::optional_int64_extension);
-    message1->SetExtension(unittest::optional_uint64_extension, 0);
-    message1->ClearExtension(unittest::optional_uint64_extension);
-
-    uint64_t space_used_before_merge = arena.SpaceUsed();
-    message2->MergeFrom(*message1);
-    EXPECT_EQ(space_used_before_merge, arena.SpaceUsed());
-  }
-}
-
-TEST(ExtensionSetTest, ArenaSetAllocatedMessageAndRelease) {
-  Arena arena;
-  unittest::TestAllExtensions* message =
-      Arena::CreateMessage<unittest::TestAllExtensions>(&arena);
-  EXPECT_FALSE(
-      message->HasExtension(unittest::optional_foreign_message_extension));
-  // Add a extension using SetAllocatedExtension
-  unittest::ForeignMessage* foreign_message = new unittest::ForeignMessage();
-  message->SetAllocatedExtension(unittest::optional_foreign_message_extension,
-                                 foreign_message);
-  // foreign_message is now owned by the arena.
-  EXPECT_EQ(foreign_message, message->MutableExtension(
-                                 unittest::optional_foreign_message_extension));
-
-  // Underlying message is copied, and returned.
-  unittest::ForeignMessage* released_message =
-      message->ReleaseExtension(unittest::optional_foreign_message_extension);
-  delete released_message;
-  EXPECT_FALSE(
-      message->HasExtension(unittest::optional_foreign_message_extension));
-}
-
-TEST(ExtensionSetTest, SwapExtensionBothFullWithArena) {
-  Arena arena1;
-  std::unique_ptr<Arena> arena2(new Arena());
-
-  unittest::TestAllExtensions* message1 =
-      Arena::CreateMessage<unittest::TestAllExtensions>(&arena1);
-  unittest::TestAllExtensions* message2 =
-      Arena::CreateMessage<unittest::TestAllExtensions>(arena2.get());
-
-  TestUtil::SetAllExtensions(message1);
-  TestUtil::SetAllExtensions(message2);
-  message1->SetExtension(unittest::optional_int32_extension, 1);
-  message2->SetExtension(unittest::optional_int32_extension, 2);
-  message1->Swap(message2);
-  EXPECT_EQ(2, message1->GetExtension(unittest::optional_int32_extension));
-  EXPECT_EQ(1, message2->GetExtension(unittest::optional_int32_extension));
-  // Re-set the original values so ExpectAllExtensionsSet is happy.
-  message1->SetExtension(unittest::optional_int32_extension, 101);
-  message2->SetExtension(unittest::optional_int32_extension, 101);
-  TestUtil::ExpectAllExtensionsSet(*message1);
-  TestUtil::ExpectAllExtensionsSet(*message2);
-  arena2.reset(nullptr);
-  TestUtil::ExpectAllExtensionsSet(*message1);
-  // Test corner cases, when one is empty and other is not.
-  Arena arena3, arena4;
-
-  unittest::TestAllExtensions* message3 =
-      Arena::CreateMessage<unittest::TestAllExtensions>(&arena3);
-  unittest::TestAllExtensions* message4 =
-      Arena::CreateMessage<unittest::TestAllExtensions>(&arena4);
-  TestUtil::SetAllExtensions(message3);
-  message3->Swap(message4);
-  arena3.Reset();
-  TestUtil::ExpectAllExtensionsSet(*message4);
-}
-
-TEST(ExtensionSetTest, SwapFieldsOfExtensionBothFullWithArena) {
-  Arena arena1;
-  Arena* arena2 = new Arena();
-
-  unittest::TestAllExtensions* message1 =
-      Arena::CreateMessage<unittest::TestAllExtensions>(&arena1);
-  unittest::TestAllExtensions* message2 =
-      Arena::CreateMessage<unittest::TestAllExtensions>(arena2);
-
-  TestUtil::SetAllExtensions(message1);
-  TestUtil::SetAllExtensions(message2);
-
-  const Reflection* reflection = message1->GetReflection();
-  std::vector<const FieldDescriptor*> fields;
-  reflection->ListFields(*message1, &fields);
-  reflection->SwapFields(message1, message2, fields);
-  TestUtil::ExpectAllExtensionsSet(*message1);
-  TestUtil::ExpectAllExtensionsSet(*message2);
-  delete arena2;
-  TestUtil::ExpectAllExtensionsSet(*message1);
-}
-
-TEST(ExtensionSetTest, SwapExtensionWithSelf) {
-  unittest::TestAllExtensions message1;
-
-  TestUtil::SetAllExtensions(&message1);
-
-  std::vector<const FieldDescriptor*> fields;
-  const Reflection* reflection = message1.GetReflection();
-  reflection->ListFields(message1, &fields);
-  reflection->SwapFields(&message1, &message1, fields);
-
-  TestUtil::ExpectAllExtensionsSet(message1);
-}
-
-TEST(ExtensionSetTest, SerializationToArray) {
-  // Serialize as TestAllExtensions and parse as TestAllTypes to insure wire
-  // compatibility of extensions.
-  //
-  // This checks serialization to a flat array by explicitly reserving space in
-  // the string and calling the generated message's
-  // SerializeWithCachedSizesToArray.
-  unittest::TestAllExtensions source;
-  unittest::TestAllTypes destination;
-  TestUtil::SetAllExtensions(&source);
-  size_t size = source.ByteSizeLong();
-  std::string data;
-  data.resize(size);
-  uint8_t* target = reinterpret_cast<uint8_t*>(::google::protobuf::string_as_array(&data));
-  uint8_t* end = source.SerializeWithCachedSizesToArray(target);
-  EXPECT_EQ(size, end - target);
-  EXPECT_TRUE(destination.ParseFromString(data));
-  TestUtil::ExpectAllFieldsSet(destination);
-}
-
-TEST(ExtensionSetTest, SerializationToStream) {
-  // Serialize as TestAllExtensions and parse as TestAllTypes to insure wire
-  // compatibility of extensions.
-  //
-  // This checks serialization to an output stream by creating an array output
-  // stream that can only buffer 1 byte at a time - this prevents the message
-  // from ever jumping to the fast path, ensuring that serialization happens via
-  // the CodedOutputStream.
-  unittest::TestAllExtensions source;
-  unittest::TestAllTypes destination;
-  TestUtil::SetAllExtensions(&source);
-  size_t size = source.ByteSizeLong();
-  std::string data;
-  data.resize(size);
-  {
-    io::ArrayOutputStream array_stream(::google::protobuf::string_as_array(&data), size, 1);
-    io::CodedOutputStream output_stream(&array_stream);
-    source.SerializeWithCachedSizes(&output_stream);
-    ASSERT_FALSE(output_stream.HadError());
-  }
-  EXPECT_TRUE(destination.ParseFromString(data));
-  TestUtil::ExpectAllFieldsSet(destination);
-}
-
-TEST(ExtensionSetTest, PackedSerializationToArray) {
-  // Serialize as TestPackedExtensions and parse as TestPackedTypes to insure
-  // wire compatibility of extensions.
-  //
-  // This checks serialization to a flat array by explicitly reserving space in
-  // the string and calling the generated message's
-  // SerializeWithCachedSizesToArray.
-  unittest::TestPackedExtensions source;
-  unittest::TestPackedTypes destination;
-  TestUtil::SetPackedExtensions(&source);
-  size_t size = source.ByteSizeLong();
-  std::string data;
-  data.resize(size);
-  uint8_t* target = reinterpret_cast<uint8_t*>(::google::protobuf::string_as_array(&data));
-  uint8_t* end = source.SerializeWithCachedSizesToArray(target);
-  EXPECT_EQ(size, end - target);
-  EXPECT_TRUE(destination.ParseFromString(data));
-  TestUtil::ExpectPackedFieldsSet(destination);
-}
-
-TEST(ExtensionSetTest, PackedSerializationToStream) {
-  // Serialize as TestPackedExtensions and parse as TestPackedTypes to insure
-  // wire compatibility of extensions.
-  //
-  // This checks serialization to an output stream by creating an array output
-  // stream that can only buffer 1 byte at a time - this prevents the message
-  // from ever jumping to the fast path, ensuring that serialization happens via
-  // the CodedOutputStream.
-  unittest::TestPackedExtensions source;
-  unittest::TestPackedTypes destination;
-  TestUtil::SetPackedExtensions(&source);
-  size_t size = source.ByteSizeLong();
-  std::string data;
-  data.resize(size);
-  {
-    io::ArrayOutputStream array_stream(::google::protobuf::string_as_array(&data), size, 1);
-    io::CodedOutputStream output_stream(&array_stream);
-    source.SerializeWithCachedSizes(&output_stream);
-    ASSERT_FALSE(output_stream.HadError());
-  }
-  EXPECT_TRUE(destination.ParseFromString(data));
-  TestUtil::ExpectPackedFieldsSet(destination);
-}
-
-TEST(ExtensionSetTest, NestedExtensionGroup) {
-  // Serialize as TestGroup and parse as TestGroupExtension.
-  unittest::TestGroup source;
-  unittest::TestGroupExtension destination;
-  std::string data;
-
-  source.mutable_optionalgroup()->set_a(117);
-  source.set_optional_foreign_enum(unittest::FOREIGN_BAZ);
-  source.SerializeToString(&data);
-  EXPECT_TRUE(destination.ParseFromString(data));
-  EXPECT_TRUE(
-      destination
-          .GetExtension(unittest::TestNestedExtension::optionalgroup_extension)
-          .has_a());
-  EXPECT_EQ(117, destination
-                     .GetExtension(
-                         unittest::TestNestedExtension::optionalgroup_extension)
-                     .a());
-  EXPECT_TRUE(destination.HasExtension(
-      unittest::TestNestedExtension::optional_foreign_enum_extension));
-  EXPECT_EQ(
-      unittest::FOREIGN_BAZ,
-      destination.GetExtension(
-          unittest::TestNestedExtension::optional_foreign_enum_extension));
-}
-
-TEST(ExtensionSetTest, Parsing) {
-  // Serialize as TestAllTypes and parse as TestAllExtensions.
-  unittest::TestAllTypes source;
-  unittest::TestAllExtensions destination;
-  std::string data;
-
-  TestUtil::SetAllFields(&source);
-  source.SerializeToString(&data);
-  EXPECT_TRUE(destination.ParseFromString(data));
-  TestUtil::SetOneofFields(&destination);
-  TestUtil::ExpectAllExtensionsSet(destination);
-}
-
-TEST(ExtensionSetTest, PackedParsing) {
-  // Serialize as TestPackedTypes and parse as TestPackedExtensions.
-  unittest::TestPackedTypes source;
-  unittest::TestPackedExtensions destination;
-  std::string data;
-
-  TestUtil::SetPackedFields(&source);
-  source.SerializeToString(&data);
-  EXPECT_TRUE(destination.ParseFromString(data));
-  TestUtil::ExpectPackedExtensionsSet(destination);
-}
-
-TEST(ExtensionSetTest, PackedToUnpackedParsing) {
-  unittest::TestPackedTypes source;
-  unittest::TestUnpackedExtensions destination;
-  std::string data;
-
-  TestUtil::SetPackedFields(&source);
-  source.SerializeToString(&data);
-  EXPECT_TRUE(destination.ParseFromString(data));
-  TestUtil::ExpectUnpackedExtensionsSet(destination);
-
-  // Reserialize
-  unittest::TestUnpackedTypes unpacked;
-  TestUtil::SetUnpackedFields(&unpacked);
-  // Serialized proto has to be the same size and parsed to the same message.
-  EXPECT_EQ(unpacked.SerializeAsString().size(),
-            destination.SerializeAsString().size());
-  EXPECT_TRUE(EqualsToSerialized(unpacked, destination.SerializeAsString()));
-
-  // Make sure we can add extensions.
-  destination.AddExtension(unittest::unpacked_int32_extension, 1);
-  destination.AddExtension(unittest::unpacked_enum_extension,
-                           protobuf_unittest::FOREIGN_BAR);
-}
-
-TEST(ExtensionSetTest, UnpackedToPackedParsing) {
-  unittest::TestUnpackedTypes source;
-  unittest::TestPackedExtensions destination;
-  std::string data;
-
-  TestUtil::SetUnpackedFields(&source);
-  source.SerializeToString(&data);
-  EXPECT_TRUE(destination.ParseFromString(data));
-  TestUtil::ExpectPackedExtensionsSet(destination);
-
-  // Reserialize
-  unittest::TestPackedTypes packed;
-  TestUtil::SetPackedFields(&packed);
-  // Serialized proto has to be the same size and parsed to the same message.
-  EXPECT_EQ(packed.SerializeAsString().size(),
-            destination.SerializeAsString().size());
-  EXPECT_TRUE(EqualsToSerialized(packed, destination.SerializeAsString()));
-
-  // Make sure we can add extensions.
-  destination.AddExtension(unittest::packed_int32_extension, 1);
-  destination.AddExtension(unittest::packed_enum_extension,
-                           protobuf_unittest::FOREIGN_BAR);
-}
-
-TEST(ExtensionSetTest, IsInitialized) {
-  // Test that IsInitialized() returns false if required fields in nested
-  // extensions are missing.
-  unittest::TestAllExtensions message;
-
-  EXPECT_TRUE(message.IsInitialized());
-
-  message.MutableExtension(unittest::TestRequired::single);
-  EXPECT_FALSE(message.IsInitialized());
-
-  message.MutableExtension(unittest::TestRequired::single)->set_a(1);
-  EXPECT_FALSE(message.IsInitialized());
-  message.MutableExtension(unittest::TestRequired::single)->set_b(2);
-  EXPECT_FALSE(message.IsInitialized());
-  message.MutableExtension(unittest::TestRequired::single)->set_c(3);
-  EXPECT_TRUE(message.IsInitialized());
-
-  message.AddExtension(unittest::TestRequired::multi);
-  EXPECT_FALSE(message.IsInitialized());
-
-  message.MutableExtension(unittest::TestRequired::multi, 0)->set_a(1);
-  EXPECT_FALSE(message.IsInitialized());
-  message.MutableExtension(unittest::TestRequired::multi, 0)->set_b(2);
-  EXPECT_FALSE(message.IsInitialized());
-  message.MutableExtension(unittest::TestRequired::multi, 0)->set_c(3);
-  EXPECT_TRUE(message.IsInitialized());
-}
-
-TEST(ExtensionSetTest, MutableString) {
-  // Test the mutable string accessors.
-  unittest::TestAllExtensions message;
-
-  message.MutableExtension(unittest::optional_string_extension)->assign("foo");
-  EXPECT_TRUE(message.HasExtension(unittest::optional_string_extension));
-  EXPECT_EQ("foo", message.GetExtension(unittest::optional_string_extension));
-
-  message.AddExtension(unittest::repeated_string_extension)->assign("bar");
-  ASSERT_EQ(1, message.ExtensionSize(unittest::repeated_string_extension));
-  EXPECT_EQ("bar",
-            message.GetExtension(unittest::repeated_string_extension, 0));
-}
-
-TEST(ExtensionSetTest, SpaceUsedExcludingSelf) {
-  // Scalar primitive extensions should increase the extension set size by a
-  // minimum of the size of the primitive type.
-#define TEST_SCALAR_EXTENSIONS_SPACE_USED(type, value)                       \
-  do {                                                                       \
-    unittest::TestAllExtensions message;                                     \
-    const int base_size = message.SpaceUsedLong();                           \
-    message.SetExtension(unittest::optional_##type##_extension, value);      \
-    int min_expected_size =                                                  \
-        base_size +                                                          \
-        sizeof(message.GetExtension(unittest::optional_##type##_extension)); \
-    EXPECT_LE(min_expected_size, message.SpaceUsedLong());                   \
-  } while (0)
-
-  TEST_SCALAR_EXTENSIONS_SPACE_USED(int32, 101);
-  TEST_SCALAR_EXTENSIONS_SPACE_USED(int64, 102);
-  TEST_SCALAR_EXTENSIONS_SPACE_USED(uint32, 103);
-  TEST_SCALAR_EXTENSIONS_SPACE_USED(uint64, 104);
-  TEST_SCALAR_EXTENSIONS_SPACE_USED(sint32, 105);
-  TEST_SCALAR_EXTENSIONS_SPACE_USED(sint64, 106);
-  TEST_SCALAR_EXTENSIONS_SPACE_USED(fixed32, 107);
-  TEST_SCALAR_EXTENSIONS_SPACE_USED(fixed64, 108);
-  TEST_SCALAR_EXTENSIONS_SPACE_USED(sfixed32, 109);
-  TEST_SCALAR_EXTENSIONS_SPACE_USED(sfixed64, 110);
-  TEST_SCALAR_EXTENSIONS_SPACE_USED(float, 111);
-  TEST_SCALAR_EXTENSIONS_SPACE_USED(double, 112);
-  TEST_SCALAR_EXTENSIONS_SPACE_USED(bool, true);
-#undef TEST_SCALAR_EXTENSIONS_SPACE_USED
-  {
-    unittest::TestAllExtensions message;
-    const int base_size = message.SpaceUsedLong();
-    message.SetExtension(unittest::optional_nested_enum_extension,
-                         unittest::TestAllTypes::FOO);
-    int min_expected_size =
-        base_size +
-        sizeof(message.GetExtension(unittest::optional_nested_enum_extension));
-    EXPECT_LE(min_expected_size, message.SpaceUsedLong());
-  }
-  {
-    // Strings may cause extra allocations depending on their length; ensure
-    // that gets included as well.
-    unittest::TestAllExtensions message;
-    const int base_size = message.SpaceUsedLong();
-    const std::string s(
-        "this is a fairly large string that will cause some "
-        "allocation in order to store it in the extension");
-    message.SetExtension(unittest::optional_string_extension, s);
-    int min_expected_size = base_size + s.length();
-    EXPECT_LE(min_expected_size, message.SpaceUsedLong());
-  }
-  {
-    // Messages also have additional allocation that need to be counted.
-    unittest::TestAllExtensions message;
-    const int base_size = message.SpaceUsedLong();
-    unittest::ForeignMessage foreign;
-    foreign.set_c(42);
-    message.MutableExtension(unittest::optional_foreign_message_extension)
-        ->CopyFrom(foreign);
-    int min_expected_size = base_size + foreign.SpaceUsedLong();
-    EXPECT_LE(min_expected_size, message.SpaceUsedLong());
-  }
-
-  // Repeated primitive extensions will increase space used by at least a
-  // RepeatedField<T>, and will cause additional allocations when the array
-  // gets too big for the initial space.  Note, we explicitly allocate on the
-  // heap to avoid message-owned arenas.
-  // This macro:
-  //   - Adds a value to the repeated extension, then clears it, establishing
-  //     the base size.
-  //   - Adds a small number of values, testing that it doesn't increase the
-  //     SpaceUsedLong()
-  //   - Adds a large number of values (requiring allocation in the repeated
-  //     field), and ensures that that allocation is included in SpaceUsedLong()
-#define TEST_REPEATED_EXTENSIONS_SPACE_USED(type, cpptype, value)              \
-  do {                                                                         \
-    std::unique_ptr<unittest::TestAllExtensions> message(                      \
-        Arena::CreateMessage<unittest::TestAllExtensions>(nullptr));           \
-    const size_t base_size = message->SpaceUsedLong();                         \
-    size_t min_expected_size = sizeof(RepeatedField<cpptype>) + base_size;     \
-    message->AddExtension(unittest::repeated_##type##_extension, value);       \
-    message->ClearExtension(unittest::repeated_##type##_extension);            \
-    const size_t empty_repeated_field_size = message->SpaceUsedLong();         \
-    EXPECT_LE(min_expected_size, empty_repeated_field_size) << #type;          \
-    message->AddExtension(unittest::repeated_##type##_extension, value);       \
-    EXPECT_EQ(empty_repeated_field_size, message->SpaceUsedLong()) << #type;   \
-    message->ClearExtension(unittest::repeated_##type##_extension);            \
-    const size_t old_capacity =                                                \
-        message->GetRepeatedExtension(unittest::repeated_##type##_extension)   \
-            .Capacity();                                                       \
-    EXPECT_GE(old_capacity,                                                    \
-              (RepeatedFieldLowerClampLimit<cpptype, sizeof(void*)>()));       \
-    for (int i = 0; i < 16; ++i) {                                             \
-      message->AddExtension(unittest::repeated_##type##_extension, value);     \
-    }                                                                          \
-    int expected_size =                                                        \
-        sizeof(cpptype) *                                                      \
-            (message                                                           \
-                 ->GetRepeatedExtension(unittest::repeated_##type##_extension) \
-                 .Capacity() -                                                 \
-             old_capacity) +                                                   \
-        empty_repeated_field_size;                                             \
-    EXPECT_LE(expected_size, message->SpaceUsedLong()) << #type;               \
-  } while (0)
-
-  TEST_REPEATED_EXTENSIONS_SPACE_USED(int32, int32_t, 101);
-  TEST_REPEATED_EXTENSIONS_SPACE_USED(int64, int64_t, 102);
-  TEST_REPEATED_EXTENSIONS_SPACE_USED(uint32, uint32_t, 103);
-  TEST_REPEATED_EXTENSIONS_SPACE_USED(uint64, uint64_t, 104);
-  TEST_REPEATED_EXTENSIONS_SPACE_USED(sint32, int32_t, 105);
-  TEST_REPEATED_EXTENSIONS_SPACE_USED(sint64, int64_t, 106);
-  TEST_REPEATED_EXTENSIONS_SPACE_USED(fixed32, uint32_t, 107);
-  TEST_REPEATED_EXTENSIONS_SPACE_USED(fixed64, uint64_t, 108);
-  TEST_REPEATED_EXTENSIONS_SPACE_USED(sfixed32, int32_t, 109);
-  TEST_REPEATED_EXTENSIONS_SPACE_USED(sfixed64, int64_t, 110);
-  TEST_REPEATED_EXTENSIONS_SPACE_USED(float, float, 111);
-  TEST_REPEATED_EXTENSIONS_SPACE_USED(double, double, 112);
-  TEST_REPEATED_EXTENSIONS_SPACE_USED(bool, bool, true);
-  TEST_REPEATED_EXTENSIONS_SPACE_USED(nested_enum, int,
-                                      unittest::TestAllTypes::FOO);
-#undef TEST_REPEATED_EXTENSIONS_SPACE_USED
-  // Repeated strings
-  {
-    std::unique_ptr<unittest::TestAllExtensions> message(
-        Arena::CreateMessage<unittest::TestAllExtensions>(nullptr));
-    const size_t base_size = message->SpaceUsedLong();
-    size_t min_expected_size =
-        sizeof(RepeatedPtrField<std::string>) + base_size;
-    const std::string value(256, 'x');
-    // Once items are allocated, they may stick around even when cleared so
-    // without the hardcore memory management accessors there isn't a notion of
-    // the empty repeated field memory usage as there is with primitive types.
-    for (int i = 0; i < 16; ++i) {
-      message->AddExtension(unittest::repeated_string_extension, value);
-    }
-    min_expected_size +=
-        (sizeof(value) + value.size()) *
-        (16 - RepeatedFieldLowerClampLimit<void*, sizeof(void*)>());
-    EXPECT_LE(min_expected_size, message->SpaceUsedLong());
-  }
-  // Repeated messages
-  {
-    std::unique_ptr<unittest::TestAllExtensions> message(
-        Arena::CreateMessage<unittest::TestAllExtensions>(nullptr));
-    const size_t base_size = message->SpaceUsedLong();
-    size_t min_expected_size =
-        sizeof(RepeatedPtrField<unittest::ForeignMessage>) + base_size;
-    unittest::ForeignMessage prototype;
-    prototype.set_c(2);
-    for (int i = 0; i < 16; ++i) {
-      *message->AddExtension(unittest::repeated_foreign_message_extension) =
-          prototype;
-    }
-    min_expected_size +=
-        (16 - RepeatedFieldLowerClampLimit<void*, sizeof(void*)>()) *
-        prototype.SpaceUsedLong();
-    EXPECT_LE(min_expected_size, message->SpaceUsedLong());
-  }
-}
-
-// N.B.: We do not test range-based for here because we remain C++03 compatible.
-template <typename T, typename M, typename ID>
-inline T SumAllExtensions(const M& message, ID extension, T zero) {
-  T sum = zero;
-  typename RepeatedField<T>::const_iterator iter =
-      message.GetRepeatedExtension(extension).begin();
-  typename RepeatedField<T>::const_iterator end =
-      message.GetRepeatedExtension(extension).end();
-  for (; iter != end; ++iter) {
-    sum += *iter;
-  }
-  return sum;
-}
-
-template <typename T, typename M, typename ID>
-inline void IncAllExtensions(M* message, ID extension, T val) {
-  typename RepeatedField<T>::iterator iter =
-      message->MutableRepeatedExtension(extension)->begin();
-  typename RepeatedField<T>::iterator end =
-      message->MutableRepeatedExtension(extension)->end();
-  for (; iter != end; ++iter) {
-    *iter += val;
-  }
-}
-
-TEST(ExtensionSetTest, RepeatedFields) {
-  unittest::TestAllExtensions message;
-
-  // Test empty repeated-field case (b/12926163)
-  ASSERT_EQ(
-      0,
-      message.GetRepeatedExtension(unittest::repeated_int32_extension).size());
-  ASSERT_EQ(
-      0, message.GetRepeatedExtension(unittest::repeated_nested_enum_extension)
-             .size());
-  ASSERT_EQ(
-      0,
-      message.GetRepeatedExtension(unittest::repeated_string_extension).size());
-  ASSERT_EQ(
-      0,
-      message.GetRepeatedExtension(unittest::repeated_nested_message_extension)
-          .size());
-
-  unittest::TestAllTypes::NestedMessage nested_message;
-  nested_message.set_bb(42);
-  unittest::TestAllTypes::NestedEnum nested_enum =
-      unittest::TestAllTypes::NestedEnum_MIN;
-
-  for (int i = 0; i < 10; ++i) {
-    message.AddExtension(unittest::repeated_int32_extension, 1);
-    message.AddExtension(unittest::repeated_int64_extension, 2);
-    message.AddExtension(unittest::repeated_uint32_extension, 3);
-    message.AddExtension(unittest::repeated_uint64_extension, 4);
-    message.AddExtension(unittest::repeated_sint32_extension, 5);
-    message.AddExtension(unittest::repeated_sint64_extension, 6);
-    message.AddExtension(unittest::repeated_fixed32_extension, 7);
-    message.AddExtension(unittest::repeated_fixed64_extension, 8);
-    message.AddExtension(unittest::repeated_sfixed32_extension, 7);
-    message.AddExtension(unittest::repeated_sfixed64_extension, 8);
-    message.AddExtension(unittest::repeated_float_extension, 9.0);
-    message.AddExtension(unittest::repeated_double_extension, 10.0);
-    message.AddExtension(unittest::repeated_bool_extension, true);
-    message.AddExtension(unittest::repeated_nested_enum_extension, nested_enum);
-    message.AddExtension(unittest::repeated_string_extension,
-                         std::string("test"));
-    message.AddExtension(unittest::repeated_bytes_extension,
-                         std::string("test\xFF"));
-    message.AddExtension(unittest::repeated_nested_message_extension)
-        ->CopyFrom(nested_message);
-    message.AddExtension(unittest::repeated_nested_enum_extension, nested_enum);
-  }
-
-  ASSERT_EQ(10, SumAllExtensions<int32_t>(
-                    message, unittest::repeated_int32_extension, 0));
-  IncAllExtensions<int32_t>(&message, unittest::repeated_int32_extension, 1);
-  ASSERT_EQ(20, SumAllExtensions<int32_t>(
-                    message, unittest::repeated_int32_extension, 0));
-
-  ASSERT_EQ(20, SumAllExtensions<int64_t>(
-                    message, unittest::repeated_int64_extension, 0));
-  IncAllExtensions<int64_t>(&message, unittest::repeated_int64_extension, 1);
-  ASSERT_EQ(30, SumAllExtensions<int64_t>(
-                    message, unittest::repeated_int64_extension, 0));
-
-  ASSERT_EQ(30, SumAllExtensions<uint32_t>(
-                    message, unittest::repeated_uint32_extension, 0));
-  IncAllExtensions<uint32_t>(&message, unittest::repeated_uint32_extension, 1);
-  ASSERT_EQ(40, SumAllExtensions<uint32_t>(
-                    message, unittest::repeated_uint32_extension, 0));
-
-  ASSERT_EQ(40, SumAllExtensions<uint64_t>(
-                    message, unittest::repeated_uint64_extension, 0));
-  IncAllExtensions<uint64_t>(&message, unittest::repeated_uint64_extension, 1);
-  ASSERT_EQ(50, SumAllExtensions<uint64_t>(
-                    message, unittest::repeated_uint64_extension, 0));
-
-  ASSERT_EQ(50, SumAllExtensions<int32_t>(
-                    message, unittest::repeated_sint32_extension, 0));
-  IncAllExtensions<int32_t>(&message, unittest::repeated_sint32_extension, 1);
-  ASSERT_EQ(60, SumAllExtensions<int32_t>(
-                    message, unittest::repeated_sint32_extension, 0));
-
-  ASSERT_EQ(60, SumAllExtensions<int64_t>(
-                    message, unittest::repeated_sint64_extension, 0));
-  IncAllExtensions<int64_t>(&message, unittest::repeated_sint64_extension, 1);
-  ASSERT_EQ(70, SumAllExtensions<int64_t>(
-                    message, unittest::repeated_sint64_extension, 0));
-
-  ASSERT_EQ(70, SumAllExtensions<uint32_t>(
-                    message, unittest::repeated_fixed32_extension, 0));
-  IncAllExtensions<uint32_t>(&message, unittest::repeated_fixed32_extension, 1);
-  ASSERT_EQ(80, SumAllExtensions<uint32_t>(
-                    message, unittest::repeated_fixed32_extension, 0));
-
-  ASSERT_EQ(80, SumAllExtensions<uint64_t>(
-                    message, unittest::repeated_fixed64_extension, 0));
-  IncAllExtensions<uint64_t>(&message, unittest::repeated_fixed64_extension, 1);
-  ASSERT_EQ(90, SumAllExtensions<uint64_t>(
-                    message, unittest::repeated_fixed64_extension, 0));
-
-  // Usually, floating-point arithmetic cannot be trusted to be exact, so it is
-  // a Bad Idea to assert equality in a test like this. However, we're dealing
-  // with integers with a small number of significant mantissa bits, so we
-  // should actually have exact precision here.
-  ASSERT_EQ(90, SumAllExtensions<float>(message,
-                                        unittest::repeated_float_extension, 0));
-  IncAllExtensions<float>(&message, unittest::repeated_float_extension, 1);
-  ASSERT_EQ(100, SumAllExtensions<float>(
-                     message, unittest::repeated_float_extension, 0));
-
-  ASSERT_EQ(100, SumAllExtensions<double>(
-                     message, unittest::repeated_double_extension, 0));
-  IncAllExtensions<double>(&message, unittest::repeated_double_extension, 1);
-  ASSERT_EQ(110, SumAllExtensions<double>(
-                     message, unittest::repeated_double_extension, 0));
-
-  RepeatedPtrField<std::string>::iterator string_iter;
-  RepeatedPtrField<std::string>::iterator string_end;
-  for (string_iter =
-           message
-               .MutableRepeatedExtension(unittest::repeated_string_extension)
-               ->begin(),
-      string_end =
-           message
-               .MutableRepeatedExtension(unittest::repeated_string_extension)
-               ->end();
-       string_iter != string_end; ++string_iter) {
-    *string_iter += "test";
-  }
-  RepeatedPtrField<std::string>::const_iterator string_const_iter;
-  RepeatedPtrField<std::string>::const_iterator string_const_end;
-  for (string_const_iter =
-           message.GetRepeatedExtension(unittest::repeated_string_extension)
-               .begin(),
-      string_const_end =
-           message.GetRepeatedExtension(unittest::repeated_string_extension)
-               .end();
-       string_iter != string_end; ++string_iter) {
-    ASSERT_TRUE(*string_iter == "testtest");
-  }
-
-  RepeatedField<unittest::TestAllTypes_NestedEnum>::iterator enum_iter;
-  RepeatedField<unittest::TestAllTypes_NestedEnum>::iterator enum_end;
-  for (enum_iter = message
-                       .MutableRepeatedExtension(
-                           unittest::repeated_nested_enum_extension)
-                       ->begin(),
-      enum_end = message
-                     .MutableRepeatedExtension(
-                         unittest::repeated_nested_enum_extension)
-                     ->end();
-       enum_iter != enum_end; ++enum_iter) {
-    *enum_iter = unittest::TestAllTypes::NestedEnum_MAX;
-  }
-  RepeatedField<unittest::TestAllTypes_NestedEnum>::const_iterator
-      enum_const_iter;
-  RepeatedField<unittest::TestAllTypes_NestedEnum>::const_iterator
-      enum_const_end;
-  for (enum_const_iter =
-           message
-               .GetRepeatedExtension(unittest::repeated_nested_enum_extension)
-               .begin(),
-      enum_const_end =
-           message
-               .GetRepeatedExtension(unittest::repeated_nested_enum_extension)
-               .end();
-       enum_const_iter != enum_const_end; ++enum_const_iter) {
-    ASSERT_EQ(*enum_const_iter, unittest::TestAllTypes::NestedEnum_MAX);
-  }
-
-  RepeatedPtrField<unittest::TestAllTypes_NestedMessage>::iterator msg_iter;
-  RepeatedPtrField<unittest::TestAllTypes_NestedMessage>::iterator msg_end;
-  for (msg_iter = message
-                      .MutableRepeatedExtension(
-                          unittest::repeated_nested_message_extension)
-                      ->begin(),
-      msg_end = message
-                    .MutableRepeatedExtension(
-                        unittest::repeated_nested_message_extension)
-                    ->end();
-       msg_iter != msg_end; ++msg_iter) {
-    msg_iter->set_bb(1234);
-  }
-  RepeatedPtrField<unittest::TestAllTypes_NestedMessage>::const_iterator
-      msg_const_iter;
-  RepeatedPtrField<unittest::TestAllTypes_NestedMessage>::const_iterator
-      msg_const_end;
-  for (msg_const_iter = message
-                            .GetRepeatedExtension(
-                                unittest::repeated_nested_message_extension)
-                            .begin(),
-      msg_const_end = message
-                          .GetRepeatedExtension(
-                              unittest::repeated_nested_message_extension)
-                          .end();
-       msg_const_iter != msg_const_end; ++msg_const_iter) {
-    ASSERT_EQ(msg_const_iter->bb(), 1234);
-  }
-
-  // Test one primitive field.
-  for (auto& x :
-       *message.MutableRepeatedExtension(unittest::repeated_int32_extension)) {
-    x = 4321;
-  }
-  for (const auto& x :
-       message.GetRepeatedExtension(unittest::repeated_int32_extension)) {
-    ASSERT_EQ(x, 4321);
-  }
-  // Test one string field.
-  for (auto& x :
-       *message.MutableRepeatedExtension(unittest::repeated_string_extension)) {
-    x = "test_range_based_for";
-  }
-  for (const auto& x :
-       message.GetRepeatedExtension(unittest::repeated_string_extension)) {
-    ASSERT_TRUE(x == "test_range_based_for");
-  }
-  // Test one message field.
-  for (auto& x : *message.MutableRepeatedExtension(
-           unittest::repeated_nested_message_extension)) {
-    x.set_bb(4321);
-  }
-  for (const auto& x : *message.MutableRepeatedExtension(
-           unittest::repeated_nested_message_extension)) {
-    ASSERT_EQ(x.bb(), 4321);
-  }
-}
-
-// From b/12926163
-TEST(ExtensionSetTest, AbsentExtension) {
-  unittest::TestAllExtensions message;
-  message.MutableRepeatedExtension(unittest::repeated_nested_message_extension)
-      ->Add()
-      ->set_bb(123);
-  ASSERT_EQ(1,
-            message.ExtensionSize(unittest::repeated_nested_message_extension));
-  EXPECT_EQ(123,
-            message.GetExtension(unittest::repeated_nested_message_extension, 0)
-                .bb());
-}
-
-#ifdef PROTOBUF_HAS_DEATH_TEST
-
-TEST(ExtensionSetTest, InvalidEnumDeath) {
-  unittest::TestAllExtensions message;
-  EXPECT_DEBUG_DEATH(
-      message.SetExtension(unittest::optional_foreign_enum_extension,
-                           static_cast<unittest::ForeignEnum>(53)),
-      "IsValid");
-}
-
-#endif  // PROTOBUF_HAS_DEATH_TEST
-
-TEST(ExtensionSetTest, DynamicExtensions) {
-  // Test adding a dynamic extension to a compiled-in message object.
-
-  FileDescriptorProto dynamic_proto;
-  dynamic_proto.set_name("dynamic_extensions_test.proto");
-  dynamic_proto.add_dependency(
-      unittest::TestAllExtensions::descriptor()->file()->name());
-  dynamic_proto.set_package("dynamic_extensions");
-
-  // Copy the fields and nested types from TestDynamicExtensions into our new
-  // proto, converting the fields into extensions.
-  const Descriptor* template_descriptor =
-      unittest::TestDynamicExtensions::descriptor();
-  DescriptorProto template_descriptor_proto;
-  template_descriptor->CopyTo(&template_descriptor_proto);
-  dynamic_proto.mutable_message_type()->MergeFrom(
-      template_descriptor_proto.nested_type());
-  dynamic_proto.mutable_enum_type()->MergeFrom(
-      template_descriptor_proto.enum_type());
-  dynamic_proto.mutable_extension()->MergeFrom(
-      template_descriptor_proto.field());
-
-  // For each extension that we added...
-  for (int i = 0; i < dynamic_proto.extension_size(); i++) {
-    // Set its extendee to TestAllExtensions.
-    FieldDescriptorProto* extension = dynamic_proto.mutable_extension(i);
-    extension->set_extendee(
-        unittest::TestAllExtensions::descriptor()->full_name());
-
-    // If the field refers to one of the types nested in TestDynamicExtensions,
-    // make it refer to the type in our dynamic proto instead.
-    std::string prefix = "." + template_descriptor->full_name() + ".";
-    if (extension->has_type_name()) {
-      std::string* type_name = extension->mutable_type_name();
-      if (HasPrefixString(*type_name, prefix)) {
-        type_name->replace(0, prefix.size(), ".dynamic_extensions.");
-      }
-    }
-  }
-
-  // Now build the file, using the generated pool as an underlay.
-  DescriptorPool dynamic_pool(DescriptorPool::generated_pool());
-  const FileDescriptor* file = dynamic_pool.BuildFile(dynamic_proto);
-  ASSERT_TRUE(file != nullptr);
-  DynamicMessageFactory dynamic_factory(&dynamic_pool);
-  dynamic_factory.SetDelegateToGeneratedFactory(true);
-
-  // Construct a message that we can parse with the extensions we defined.
-  // Since the extensions were based off of the fields of TestDynamicExtensions,
-  // we can use that message to create this test message.
-  std::string data;
-  unittest::TestDynamicExtensions dynamic_extension;
-  {
-    unittest::TestDynamicExtensions message;
-    message.set_scalar_extension(123);
-    message.set_enum_extension(unittest::FOREIGN_BAR);
-    message.set_dynamic_enum_extension(
-        unittest::TestDynamicExtensions::DYNAMIC_BAZ);
-    message.mutable_message_extension()->set_c(456);
-    message.mutable_dynamic_message_extension()->set_dynamic_field(789);
-    message.add_repeated_extension("foo");
-    message.add_repeated_extension("bar");
-    message.add_packed_extension(12);
-    message.add_packed_extension(-34);
-    message.add_packed_extension(56);
-    message.add_packed_extension(-78);
-
-    // Also add some unknown fields.
-
-    // An unknown enum value (for a known field).
-    message.mutable_unknown_fields()->AddVarint(
-        unittest::TestDynamicExtensions::kDynamicEnumExtensionFieldNumber,
-        12345);
-    // A regular unknown field.
-    message.mutable_unknown_fields()->AddLengthDelimited(54321, "unknown");
-
-    message.SerializeToString(&data);
-    dynamic_extension = message;
-  }
-
-  // Now we can parse this using our dynamic extension definitions...
-  unittest::TestAllExtensions message;
-  {
-    io::ArrayInputStream raw_input(data.data(), data.size());
-    io::CodedInputStream input(&raw_input);
-    input.SetExtensionRegistry(&dynamic_pool, &dynamic_factory);
-    ASSERT_TRUE(message.ParseFromCodedStream(&input));
-    ASSERT_TRUE(input.ConsumedEntireMessage());
-  }
-
-  // Can we print it?
-  std::string message_text;
-  TextFormat::PrintToString(message, &message_text);
-  EXPECT_EQ(
-      "[dynamic_extensions.scalar_extension]: 123\n"
-      "[dynamic_extensions.enum_extension]: FOREIGN_BAR\n"
-      "[dynamic_extensions.dynamic_enum_extension]: DYNAMIC_BAZ\n"
-      "[dynamic_extensions.message_extension] {\n"
-      "  c: 456\n"
-      "}\n"
-      "[dynamic_extensions.dynamic_message_extension] {\n"
-      "  dynamic_field: 789\n"
-      "}\n"
-      "[dynamic_extensions.repeated_extension]: \"foo\"\n"
-      "[dynamic_extensions.repeated_extension]: \"bar\"\n"
-      "[dynamic_extensions.packed_extension]: 12\n"
-      "[dynamic_extensions.packed_extension]: -34\n"
-      "[dynamic_extensions.packed_extension]: 56\n"
-      "[dynamic_extensions.packed_extension]: -78\n"
-      "2002: 12345\n"
-      "54321: \"unknown\"\n",
-      message_text);
-
-  // Can we serialize it?
-  EXPECT_TRUE(
-      EqualsToSerialized(dynamic_extension, message.SerializeAsString()));
-
-  // What if we parse using the reflection-based parser?
-  {
-    unittest::TestAllExtensions message2;
-    io::ArrayInputStream raw_input(data.data(), data.size());
-    io::CodedInputStream input(&raw_input);
-    input.SetExtensionRegistry(&dynamic_pool, &dynamic_factory);
-    ASSERT_TRUE(WireFormat::ParseAndMergePartial(&input, &message2));
-    ASSERT_TRUE(input.ConsumedEntireMessage());
-    EXPECT_EQ(message.DebugString(), message2.DebugString());
-  }
-
-  // Are the embedded generated types actually using the generated objects?
-  {
-    const FieldDescriptor* message_extension =
-        file->FindExtensionByName("message_extension");
-    ASSERT_TRUE(message_extension != nullptr);
-    const Message& sub_message =
-        message.GetReflection()->GetMessage(message, message_extension);
-    const unittest::ForeignMessage* typed_sub_message =
-#if PROTOBUF_RTTI
-        dynamic_cast<const unittest::ForeignMessage*>(&sub_message);
-#else
-        static_cast<const unittest::ForeignMessage*>(&sub_message);
-#endif
-    ASSERT_TRUE(typed_sub_message != nullptr);
-    EXPECT_EQ(456, typed_sub_message->c());
-  }
-
-  // What does GetMessage() return for the embedded dynamic type if it isn't
-  // present?
-  {
-    const FieldDescriptor* dynamic_message_extension =
-        file->FindExtensionByName("dynamic_message_extension");
-    ASSERT_TRUE(dynamic_message_extension != nullptr);
-    const Message& parent = unittest::TestAllExtensions::default_instance();
-    const Message& sub_message = parent.GetReflection()->GetMessage(
-        parent, dynamic_message_extension, &dynamic_factory);
-    const Message* prototype =
-        dynamic_factory.GetPrototype(dynamic_message_extension->message_type());
-    EXPECT_EQ(prototype, &sub_message);
-  }
-}
-
-TEST(ExtensionSetTest, BoolExtension) {
-  unittest::TestAllExtensions msg;
-  uint8_t wire_bytes[2] = {13 * 8, 42 /* out of bounds payload for bool */};
-  EXPECT_TRUE(msg.ParseFromArray(wire_bytes, 2));
-  EXPECT_TRUE(msg.GetExtension(protobuf_unittest::optional_bool_extension));
-}
-
-TEST(ExtensionSetTest, ConstInit) {
-  PROTOBUF_CONSTINIT static ExtensionSet set{};
-  EXPECT_EQ(set.NumExtensions(), 0);
-}
-
-TEST(ExtensionSetTest, ExtensionSetSpaceUsed) {
-  unittest::TestAllExtensions msg;
-  size_t l = msg.SpaceUsedLong();
-  msg.SetExtension(unittest::optional_int32_extension, 100);
-  unittest::TestAllExtensions msg2(msg);
-  size_t l2 = msg2.SpaceUsedLong();
-  msg.ClearExtension(unittest::optional_int32_extension);
-  unittest::TestAllExtensions msg3(msg);
-  size_t l3 = msg3.SpaceUsedLong();
-  EXPECT_TRUE((l2 - l) > (l3 - l));
-}
-
-}  // namespace
-}  // namespace internal
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/field_access_listener.h b/libs/protobuf/src/google/protobuf/field_access_listener.h
deleted file mode 100644
index 47422e6..0000000
--- a/libs/protobuf/src/google/protobuf/field_access_listener.h
+++ /dev/null
@@ -1,172 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef GOOGLE_PROTOBUF_FIELD_ACCESS_LISTENER_H__
-#define GOOGLE_PROTOBUF_FIELD_ACCESS_LISTENER_H__
-
-#include <cstddef>
-
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/message_lite.h>
-
-
-namespace google {
-namespace protobuf {
-
-// A default/no-op implementation of message hooks.
-//
-// See go/statically-dispatched-message-hooks for details.
-template <typename Proto>
-struct NoOpAccessListener {
-  // Number of fields are provided at compile time for the trackers to be able
-  // to have stack allocated bitmaps for the fields. This is useful for
-  // performance critical trackers. This is also to avoid cyclic dependencies
-  // if the number of fields is needed.
-  static constexpr int kFields = Proto::_kInternalFieldNumber;
-  // Default constructor is called during the static global initialization of
-  // the program.
-  // We provide a pointer to extract the name of the proto not to get cyclic
-  // dependencies on GetDescriptor() and OnGetMetadata() calls. If you want
-  // to differentiate the protos during the runtime before the start of the
-  // program, use this functor to get its name. We either way need it for
-  // LITE_RUNTIME protos as they don't have descriptors at all.
-  explicit NoOpAccessListener(StringPiece (*name_extractor)()) {}
-  // called repeatedly during serialization/deserialization/ByteSize of
-  // Reflection as:
-  //   AccessListener<MessageT>::OnSerialize(this);
-  static void OnSerialize(const MessageLite* msg) {}
-  static void OnDeserialize(const MessageLite* msg) {}
-  static void OnByteSize(const MessageLite* msg) {}
-  static void OnMergeFrom(const MessageLite* to, const MessageLite* from) {}
-
-  // NOTE: This function can be called pre-main. Make sure it does not make
-  // the state of the listener invalid.
-  static void OnGetMetadata() {}
-
-  // called from accessors as:
-  //   AccessListener<MessageT>::On$operation(this, &field_storage_);
-  // If you need to override this with type, in your hook implementation
-  // introduce
-  // template <int kFieldNum, typename T>
-  // static void On$operation(const MessageLite* msg,
-  //                          const T* field) {}
-  // And overloads for std::nullptr_t for incomplete types such as Messages,
-  // Maps. Extract them using reflection if you need. Consequently, second
-  // argument can be null pointer.
-  // For an example, see proto_hooks/testing/memory_test_field_listener.h
-  // And argument template deduction will deduce the type itself without
-  // changing the generated code.
-
-  // add_<field>(f)
-  template <int kFieldNum>
-  static void OnAdd(const MessageLite* msg, const void* field) {}
-
-  // add_<field>()
-  template <int kFieldNum>
-  static void OnAddMutable(const MessageLite* msg, const void* field) {}
-
-  // <field>() and <repeated_field>(i)
-  template <int kFieldNum>
-  static void OnGet(const MessageLite* msg, const void* field) {}
-
-  // clear_<field>()
-  template <int kFieldNum>
-  static void OnClear(const MessageLite* msg, const void* field) {}
-
-  // has_<field>()
-  template <int kFieldNum>
-  static void OnHas(const MessageLite* msg, const void* field) {}
-
-  // <repeated_field>()
-  template <int kFieldNum>
-  static void OnList(const MessageLite* msg, const void* field) {}
-
-  // mutable_<field>()
-  template <int kFieldNum>
-  static void OnMutable(const MessageLite* msg, const void* field) {}
-
-  // mutable_<repeated_field>()
-  template <int kFieldNum>
-  static void OnMutableList(const MessageLite* msg, const void* field) {}
-
-  // release_<field>()
-  template <int kFieldNum>
-  static void OnRelease(const MessageLite* msg, const void* field) {}
-
-  // set_<field>() and set_<repeated_field>(i)
-  template <int kFieldNum>
-  static void OnSet(const MessageLite* msg, const void* field) {}
-
-  // <repeated_field>_size()
-  template <int kFieldNum>
-  static void OnSize(const MessageLite* msg, const void* field) {}
-
-  static void OnHasExtension(const MessageLite* msg, int extension_tag,
-                             const void* field) {}
-  // TODO(b/190614678): Support clear in the proto compiler.
-  static void OnClearExtension(const MessageLite* msg, int extension_tag,
-                               const void* field) {}
-  static void OnExtensionSize(const MessageLite* msg, int extension_tag,
-                              const void* field) {}
-  static void OnGetExtension(const MessageLite* msg, int extension_tag,
-                             const void* field) {}
-  static void OnMutableExtension(const MessageLite* msg, int extension_tag,
-                                 const void* field) {}
-  static void OnSetExtension(const MessageLite* msg, int extension_tag,
-                             const void* field) {}
-  static void OnReleaseExtension(const MessageLite* msg, int extension_tag,
-                                 const void* field) {}
-  static void OnAddExtension(const MessageLite* msg, int extension_tag,
-                             const void* field) {}
-  static void OnAddMutableExtension(const MessageLite* msg, int extension_tag,
-                                    const void* field) {}
-  static void OnListExtension(const MessageLite* msg, int extension_tag,
-                              const void* field) {}
-  static void OnMutableListExtension(const MessageLite* msg, int extension_tag,
-                                     const void* field) {}
-};
-
-}  // namespace protobuf
-}  // namespace google
-
-#ifndef REPLACE_PROTO_LISTENER_IMPL
-namespace google {
-namespace protobuf {
-template <class T>
-using AccessListener = NoOpAccessListener<T>;
-}  // namespace protobuf
-}  // namespace google
-#else
-// You can put your implementations of hooks/listeners here.
-// All hooks are subject to approval by protobuf-team@.
-
-#endif  // !REPLACE_PROTO_LISTENER_IMPL
-
-#endif  // GOOGLE_PROTOBUF_FIELD_ACCESS_LISTENER_H__
diff --git a/libs/protobuf/src/google/protobuf/field_mask.pb.cc b/libs/protobuf/src/google/protobuf/field_mask.pb.cc
deleted file mode 100644
index 7860bfb..0000000
--- a/libs/protobuf/src/google/protobuf/field_mask.pb.cc
+++ /dev/null
@@ -1,284 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/protobuf/field_mask.proto
-
-#include <google/protobuf/field_mask.pb.h>
-
-#include <algorithm>
-
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/extension_set.h>
-#include <google/protobuf/wire_format_lite.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/generated_message_reflection.h>
-#include <google/protobuf/reflection_ops.h>
-#include <google/protobuf/wire_format.h>
-// @@protoc_insertion_point(includes)
-#include <google/protobuf/port_def.inc>
-
-PROTOBUF_PRAGMA_INIT_SEG
-
-namespace _pb = ::PROTOBUF_NAMESPACE_ID;
-namespace _pbi = _pb::internal;
-
-PROTOBUF_NAMESPACE_OPEN
-PROTOBUF_CONSTEXPR FieldMask::FieldMask(
-    ::_pbi::ConstantInitialized): _impl_{
-    /*decltype(_impl_.paths_)*/{}
-  , /*decltype(_impl_._cached_size_)*/{}} {}
-struct FieldMaskDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR FieldMaskDefaultTypeInternal()
-      : _instance(::_pbi::ConstantInitialized{}) {}
-  ~FieldMaskDefaultTypeInternal() {}
-  union {
-    FieldMask _instance;
-  };
-};
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 FieldMaskDefaultTypeInternal _FieldMask_default_instance_;
-PROTOBUF_NAMESPACE_CLOSE
-static ::_pb::Metadata file_level_metadata_google_2fprotobuf_2ffield_5fmask_2eproto[1];
-static constexpr ::_pb::EnumDescriptor const** file_level_enum_descriptors_google_2fprotobuf_2ffield_5fmask_2eproto = nullptr;
-static constexpr ::_pb::ServiceDescriptor const** file_level_service_descriptors_google_2fprotobuf_2ffield_5fmask_2eproto = nullptr;
-
-const uint32_t TableStruct_google_2fprotobuf_2ffield_5fmask_2eproto::offsets[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = {
-  ~0u,  // no _has_bits_
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::FieldMask, _internal_metadata_),
-  ~0u,  // no _extensions_
-  ~0u,  // no _oneof_case_
-  ~0u,  // no _weak_field_map_
-  ~0u,  // no _inlined_string_donated_
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::FieldMask, _impl_.paths_),
-};
-static const ::_pbi::MigrationSchema schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = {
-  { 0, -1, -1, sizeof(::PROTOBUF_NAMESPACE_ID::FieldMask)},
-};
-
-static const ::_pb::Message* const file_default_instances[] = {
-  &::PROTOBUF_NAMESPACE_ID::_FieldMask_default_instance_._instance,
-};
-
-const char descriptor_table_protodef_google_2fprotobuf_2ffield_5fmask_2eproto[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) =
-  "\n google/protobuf/field_mask.proto\022\017goog"
-  "le.protobuf\"\032\n\tFieldMask\022\r\n\005paths\030\001 \003(\tB"
-  "\205\001\n\023com.google.protobufB\016FieldMaskProtoP"
-  "\001Z2google.golang.org/protobuf/types/know"
-  "n/fieldmaskpb\370\001\001\242\002\003GPB\252\002\036Google.Protobuf"
-  ".WellKnownTypesb\006proto3"
-  ;
-static ::_pbi::once_flag descriptor_table_google_2fprotobuf_2ffield_5fmask_2eproto_once;
-const ::_pbi::DescriptorTable descriptor_table_google_2fprotobuf_2ffield_5fmask_2eproto = {
-    false, false, 223, descriptor_table_protodef_google_2fprotobuf_2ffield_5fmask_2eproto,
-    "google/protobuf/field_mask.proto",
-    &descriptor_table_google_2fprotobuf_2ffield_5fmask_2eproto_once, nullptr, 0, 1,
-    schemas, file_default_instances, TableStruct_google_2fprotobuf_2ffield_5fmask_2eproto::offsets,
-    file_level_metadata_google_2fprotobuf_2ffield_5fmask_2eproto, file_level_enum_descriptors_google_2fprotobuf_2ffield_5fmask_2eproto,
-    file_level_service_descriptors_google_2fprotobuf_2ffield_5fmask_2eproto,
-};
-PROTOBUF_ATTRIBUTE_WEAK const ::_pbi::DescriptorTable* descriptor_table_google_2fprotobuf_2ffield_5fmask_2eproto_getter() {
-  return &descriptor_table_google_2fprotobuf_2ffield_5fmask_2eproto;
-}
-
-// Force running AddDescriptors() at dynamic initialization time.
-PROTOBUF_ATTRIBUTE_INIT_PRIORITY2 static ::_pbi::AddDescriptorsRunner dynamic_init_dummy_google_2fprotobuf_2ffield_5fmask_2eproto(&descriptor_table_google_2fprotobuf_2ffield_5fmask_2eproto);
-PROTOBUF_NAMESPACE_OPEN
-
-// ===================================================================
-
-class FieldMask::_Internal {
- public:
-};
-
-FieldMask::FieldMask(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                         bool is_message_owned)
-  : ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned) {
-  SharedCtor(arena, is_message_owned);
-  // @@protoc_insertion_point(arena_constructor:google.protobuf.FieldMask)
-}
-FieldMask::FieldMask(const FieldMask& from)
-  : ::PROTOBUF_NAMESPACE_ID::Message() {
-  FieldMask* const _this = this; (void)_this;
-  new (&_impl_) Impl_{
-      decltype(_impl_.paths_){from._impl_.paths_}
-    , /*decltype(_impl_._cached_size_)*/{}};
-
-  _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-  // @@protoc_insertion_point(copy_constructor:google.protobuf.FieldMask)
-}
-
-inline void FieldMask::SharedCtor(
-    ::_pb::Arena* arena, bool is_message_owned) {
-  (void)arena;
-  (void)is_message_owned;
-  new (&_impl_) Impl_{
-      decltype(_impl_.paths_){arena}
-    , /*decltype(_impl_._cached_size_)*/{}
-  };
-}
-
-FieldMask::~FieldMask() {
-  // @@protoc_insertion_point(destructor:google.protobuf.FieldMask)
-  if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) {
-  (void)arena;
-    return;
-  }
-  SharedDtor();
-}
-
-inline void FieldMask::SharedDtor() {
-  GOOGLE_DCHECK(GetArenaForAllocation() == nullptr);
-  _impl_.paths_.~RepeatedPtrField();
-}
-
-void FieldMask::SetCachedSize(int size) const {
-  _impl_._cached_size_.Set(size);
-}
-
-void FieldMask::Clear() {
-// @@protoc_insertion_point(message_clear_start:google.protobuf.FieldMask)
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.paths_.Clear();
-  _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>();
-}
-
-const char* FieldMask::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) {
-#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure
-  while (!ctx->Done(&ptr)) {
-    uint32_t tag;
-    ptr = ::_pbi::ReadTag(ptr, &tag);
-    switch (tag >> 3) {
-      // repeated string paths = 1;
-      case 1:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 10)) {
-          ptr -= 1;
-          do {
-            ptr += 1;
-            auto str = _internal_add_paths();
-            ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx);
-            CHK_(ptr);
-            CHK_(::_pbi::VerifyUTF8(str, "google.protobuf.FieldMask.paths"));
-            if (!ctx->DataAvailable(ptr)) break;
-          } while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<10>(ptr));
-        } else
-          goto handle_unusual;
-        continue;
-      default:
-        goto handle_unusual;
-    }  // switch
-  handle_unusual:
-    if ((tag == 0) || ((tag & 7) == 4)) {
-      CHK_(ptr);
-      ctx->SetLastTag(tag);
-      goto message_done;
-    }
-    ptr = UnknownFieldParse(
-        tag,
-        _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(),
-        ptr, ctx);
-    CHK_(ptr != nullptr);
-  }  // while
-message_done:
-  return ptr;
-failure:
-  ptr = nullptr;
-  goto message_done;
-#undef CHK_
-}
-
-uint8_t* FieldMask::_InternalSerialize(
-    uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.FieldMask)
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  // repeated string paths = 1;
-  for (int i = 0, n = this->_internal_paths_size(); i < n; i++) {
-    const auto& s = this->_internal_paths(i);
-    ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String(
-      s.data(), static_cast<int>(s.length()),
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE,
-      "google.protobuf.FieldMask.paths");
-    target = stream->WriteString(1, s, target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-        _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.FieldMask)
-  return target;
-}
-
-size_t FieldMask::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:google.protobuf.FieldMask)
-  size_t total_size = 0;
-
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // repeated string paths = 1;
-  total_size += 1 *
-      ::PROTOBUF_NAMESPACE_ID::internal::FromIntSize(_impl_.paths_.size());
-  for (int i = 0, n = _impl_.paths_.size(); i < n; i++) {
-    total_size += ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize(
-      _impl_.paths_.Get(i));
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData FieldMask::_class_data_ = {
-    ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck,
-    FieldMask::MergeImpl
-};
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*FieldMask::GetClassData() const { return &_class_data_; }
-
-
-void FieldMask::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) {
-  auto* const _this = static_cast<FieldMask*>(&to_msg);
-  auto& from = static_cast<const FieldMask&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.FieldMask)
-  GOOGLE_DCHECK_NE(&from, _this);
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  _this->_impl_.paths_.MergeFrom(from._impl_.paths_);
-  _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void FieldMask::CopyFrom(const FieldMask& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.FieldMask)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool FieldMask::IsInitialized() const {
-  return true;
-}
-
-void FieldMask::InternalSwap(FieldMask* other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  _impl_.paths_.InternalSwap(&other->_impl_.paths_);
-}
-
-::PROTOBUF_NAMESPACE_ID::Metadata FieldMask::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_google_2fprotobuf_2ffield_5fmask_2eproto_getter, &descriptor_table_google_2fprotobuf_2ffield_5fmask_2eproto_once,
-      file_level_metadata_google_2fprotobuf_2ffield_5fmask_2eproto[0]);
-}
-
-// @@protoc_insertion_point(namespace_scope)
-PROTOBUF_NAMESPACE_CLOSE
-PROTOBUF_NAMESPACE_OPEN
-template<> PROTOBUF_NOINLINE ::PROTOBUF_NAMESPACE_ID::FieldMask*
-Arena::CreateMaybeMessage< ::PROTOBUF_NAMESPACE_ID::FieldMask >(Arena* arena) {
-  return Arena::CreateMessageInternal< ::PROTOBUF_NAMESPACE_ID::FieldMask >(arena);
-}
-PROTOBUF_NAMESPACE_CLOSE
-
-// @@protoc_insertion_point(global_scope)
-#include <google/protobuf/port_undef.inc>
diff --git a/libs/protobuf/src/google/protobuf/field_mask.pb.h b/libs/protobuf/src/google/protobuf/field_mask.pb.h
deleted file mode 100644
index 8f90e4c..0000000
--- a/libs/protobuf/src/google/protobuf/field_mask.pb.h
+++ /dev/null
@@ -1,317 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/protobuf/field_mask.proto
-
-#ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2ffield_5fmask_2eproto
-#define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2ffield_5fmask_2eproto
-
-#include <limits>
-#include <string>
-
-#include <google/protobuf/port_def.inc>
-#if PROTOBUF_VERSION < 3021000
-#error This file was generated by a newer version of protoc which is
-#error incompatible with your Protocol Buffer headers. Please update
-#error your headers.
-#endif
-#if 3021012 < PROTOBUF_MIN_PROTOC_VERSION
-#error This file was generated by an older version of protoc which is
-#error incompatible with your Protocol Buffer headers. Please
-#error regenerate this file with a newer version of protoc.
-#endif
-
-#include <google/protobuf/port_undef.inc>
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/arena.h>
-#include <google/protobuf/arenastring.h>
-#include <google/protobuf/generated_message_util.h>
-#include <google/protobuf/metadata_lite.h>
-#include <google/protobuf/generated_message_reflection.h>
-#include <google/protobuf/message.h>
-#include <google/protobuf/repeated_field.h>  // IWYU pragma: export
-#include <google/protobuf/extension_set.h>  // IWYU pragma: export
-#include <google/protobuf/unknown_field_set.h>
-// @@protoc_insertion_point(includes)
-#include <google/protobuf/port_def.inc>
-#define PROTOBUF_INTERNAL_EXPORT_google_2fprotobuf_2ffield_5fmask_2eproto PROTOBUF_EXPORT
-PROTOBUF_NAMESPACE_OPEN
-namespace internal {
-class AnyMetadata;
-}  // namespace internal
-PROTOBUF_NAMESPACE_CLOSE
-
-// Internal implementation detail -- do not use these members.
-struct PROTOBUF_EXPORT TableStruct_google_2fprotobuf_2ffield_5fmask_2eproto {
-  static const uint32_t offsets[];
-};
-PROTOBUF_EXPORT extern const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable descriptor_table_google_2fprotobuf_2ffield_5fmask_2eproto;
-PROTOBUF_NAMESPACE_OPEN
-class FieldMask;
-struct FieldMaskDefaultTypeInternal;
-PROTOBUF_EXPORT extern FieldMaskDefaultTypeInternal _FieldMask_default_instance_;
-PROTOBUF_NAMESPACE_CLOSE
-PROTOBUF_NAMESPACE_OPEN
-template<> PROTOBUF_EXPORT ::PROTOBUF_NAMESPACE_ID::FieldMask* Arena::CreateMaybeMessage<::PROTOBUF_NAMESPACE_ID::FieldMask>(Arena*);
-PROTOBUF_NAMESPACE_CLOSE
-PROTOBUF_NAMESPACE_OPEN
-
-// ===================================================================
-
-class PROTOBUF_EXPORT FieldMask final :
-    public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:google.protobuf.FieldMask) */ {
- public:
-  inline FieldMask() : FieldMask(nullptr) {}
-  ~FieldMask() override;
-  explicit PROTOBUF_CONSTEXPR FieldMask(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
-
-  FieldMask(const FieldMask& from);
-  FieldMask(FieldMask&& from) noexcept
-    : FieldMask() {
-    *this = ::std::move(from);
-  }
-
-  inline FieldMask& operator=(const FieldMask& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline FieldMask& operator=(FieldMask&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetOwningArena() == from.GetOwningArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetOwningArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const FieldMask& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const FieldMask* internal_default_instance() {
-    return reinterpret_cast<const FieldMask*>(
-               &_FieldMask_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    0;
-
-  friend void swap(FieldMask& a, FieldMask& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(FieldMask* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() != nullptr &&
-        GetOwningArena() == other->GetOwningArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() == other->GetOwningArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(FieldMask* other) {
-    if (other == this) return;
-    GOOGLE_DCHECK(GetOwningArena() == other->GetOwningArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  FieldMask* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<FieldMask>(arena);
-  }
-  using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
-  void CopyFrom(const FieldMask& from);
-  using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom( const FieldMask& from) {
-    FieldMask::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  uint8_t* _InternalSerialize(
-      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
-
-  private:
-  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
-  void SharedDtor();
-  void SetCachedSize(int size) const final;
-  void InternalSwap(FieldMask* other);
-
-  private:
-  friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
-  static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
-    return "google.protobuf.FieldMask";
-  }
-  protected:
-  explicit FieldMask(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                       bool is_message_owned = false);
-  public:
-
-  static const ClassData _class_data_;
-  const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*GetClassData() const final;
-
-  ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kPathsFieldNumber = 1,
-  };
-  // repeated string paths = 1;
-  int paths_size() const;
-  private:
-  int _internal_paths_size() const;
-  public:
-  void clear_paths();
-  const std::string& paths(int index) const;
-  std::string* mutable_paths(int index);
-  void set_paths(int index, const std::string& value);
-  void set_paths(int index, std::string&& value);
-  void set_paths(int index, const char* value);
-  void set_paths(int index, const char* value, size_t size);
-  std::string* add_paths();
-  void add_paths(const std::string& value);
-  void add_paths(std::string&& value);
-  void add_paths(const char* value);
-  void add_paths(const char* value, size_t size);
-  const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string>& paths() const;
-  ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string>* mutable_paths();
-  private:
-  const std::string& _internal_paths(int index) const;
-  std::string* _internal_add_paths();
-  public:
-
-  // @@protoc_insertion_point(class_scope:google.protobuf.FieldMask)
- private:
-  class _Internal;
-
-  template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
-  typedef void InternalArenaConstructable_;
-  typedef void DestructorSkippable_;
-  struct Impl_ {
-    ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string> paths_;
-    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_google_2fprotobuf_2ffield_5fmask_2eproto;
-};
-// ===================================================================
-
-
-// ===================================================================
-
-#ifdef __GNUC__
-  #pragma GCC diagnostic push
-  #pragma GCC diagnostic ignored "-Wstrict-aliasing"
-#endif  // __GNUC__
-// FieldMask
-
-// repeated string paths = 1;
-inline int FieldMask::_internal_paths_size() const {
-  return _impl_.paths_.size();
-}
-inline int FieldMask::paths_size() const {
-  return _internal_paths_size();
-}
-inline void FieldMask::clear_paths() {
-  _impl_.paths_.Clear();
-}
-inline std::string* FieldMask::add_paths() {
-  std::string* _s = _internal_add_paths();
-  // @@protoc_insertion_point(field_add_mutable:google.protobuf.FieldMask.paths)
-  return _s;
-}
-inline const std::string& FieldMask::_internal_paths(int index) const {
-  return _impl_.paths_.Get(index);
-}
-inline const std::string& FieldMask::paths(int index) const {
-  // @@protoc_insertion_point(field_get:google.protobuf.FieldMask.paths)
-  return _internal_paths(index);
-}
-inline std::string* FieldMask::mutable_paths(int index) {
-  // @@protoc_insertion_point(field_mutable:google.protobuf.FieldMask.paths)
-  return _impl_.paths_.Mutable(index);
-}
-inline void FieldMask::set_paths(int index, const std::string& value) {
-  _impl_.paths_.Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set:google.protobuf.FieldMask.paths)
-}
-inline void FieldMask::set_paths(int index, std::string&& value) {
-  _impl_.paths_.Mutable(index)->assign(std::move(value));
-  // @@protoc_insertion_point(field_set:google.protobuf.FieldMask.paths)
-}
-inline void FieldMask::set_paths(int index, const char* value) {
-  GOOGLE_DCHECK(value != nullptr);
-  _impl_.paths_.Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set_char:google.protobuf.FieldMask.paths)
-}
-inline void FieldMask::set_paths(int index, const char* value, size_t size) {
-  _impl_.paths_.Mutable(index)->assign(
-    reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_set_pointer:google.protobuf.FieldMask.paths)
-}
-inline std::string* FieldMask::_internal_add_paths() {
-  return _impl_.paths_.Add();
-}
-inline void FieldMask::add_paths(const std::string& value) {
-  _impl_.paths_.Add()->assign(value);
-  // @@protoc_insertion_point(field_add:google.protobuf.FieldMask.paths)
-}
-inline void FieldMask::add_paths(std::string&& value) {
-  _impl_.paths_.Add(std::move(value));
-  // @@protoc_insertion_point(field_add:google.protobuf.FieldMask.paths)
-}
-inline void FieldMask::add_paths(const char* value) {
-  GOOGLE_DCHECK(value != nullptr);
-  _impl_.paths_.Add()->assign(value);
-  // @@protoc_insertion_point(field_add_char:google.protobuf.FieldMask.paths)
-}
-inline void FieldMask::add_paths(const char* value, size_t size) {
-  _impl_.paths_.Add()->assign(reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_add_pointer:google.protobuf.FieldMask.paths)
-}
-inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string>&
-FieldMask::paths() const {
-  // @@protoc_insertion_point(field_list:google.protobuf.FieldMask.paths)
-  return _impl_.paths_;
-}
-inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string>*
-FieldMask::mutable_paths() {
-  // @@protoc_insertion_point(field_mutable_list:google.protobuf.FieldMask.paths)
-  return &_impl_.paths_;
-}
-
-#ifdef __GNUC__
-  #pragma GCC diagnostic pop
-#endif  // __GNUC__
-
-// @@protoc_insertion_point(namespace_scope)
-
-PROTOBUF_NAMESPACE_CLOSE
-
-// @@protoc_insertion_point(global_scope)
-
-#include <google/protobuf/port_undef.inc>
-#endif  // GOOGLE_PROTOBUF_INCLUDED_GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2ffield_5fmask_2eproto
diff --git a/libs/protobuf/src/google/protobuf/field_mask.proto b/libs/protobuf/src/google/protobuf/field_mask.proto
deleted file mode 100644
index 6b5104f..0000000
--- a/libs/protobuf/src/google/protobuf/field_mask.proto
+++ /dev/null
@@ -1,245 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto3";
-
-package google.protobuf;
-
-option csharp_namespace = "Google.Protobuf.WellKnownTypes";
-option java_package = "com.google.protobuf";
-option java_outer_classname = "FieldMaskProto";
-option java_multiple_files = true;
-option objc_class_prefix = "GPB";
-option go_package = "google.golang.org/protobuf/types/known/fieldmaskpb";
-option cc_enable_arenas = true;
-
-// `FieldMask` represents a set of symbolic field paths, for example:
-//
-//     paths: "f.a"
-//     paths: "f.b.d"
-//
-// Here `f` represents a field in some root message, `a` and `b`
-// fields in the message found in `f`, and `d` a field found in the
-// message in `f.b`.
-//
-// Field masks are used to specify a subset of fields that should be
-// returned by a get operation or modified by an update operation.
-// Field masks also have a custom JSON encoding (see below).
-//
-// # Field Masks in Projections
-//
-// When used in the context of a projection, a response message or
-// sub-message is filtered by the API to only contain those fields as
-// specified in the mask. For example, if the mask in the previous
-// example is applied to a response message as follows:
-//
-//     f {
-//       a : 22
-//       b {
-//         d : 1
-//         x : 2
-//       }
-//       y : 13
-//     }
-//     z: 8
-//
-// The result will not contain specific values for fields x,y and z
-// (their value will be set to the default, and omitted in proto text
-// output):
-//
-//
-//     f {
-//       a : 22
-//       b {
-//         d : 1
-//       }
-//     }
-//
-// A repeated field is not allowed except at the last position of a
-// paths string.
-//
-// If a FieldMask object is not present in a get operation, the
-// operation applies to all fields (as if a FieldMask of all fields
-// had been specified).
-//
-// Note that a field mask does not necessarily apply to the
-// top-level response message. In case of a REST get operation, the
-// field mask applies directly to the response, but in case of a REST
-// list operation, the mask instead applies to each individual message
-// in the returned resource list. In case of a REST custom method,
-// other definitions may be used. Where the mask applies will be
-// clearly documented together with its declaration in the API.  In
-// any case, the effect on the returned resource/resources is required
-// behavior for APIs.
-//
-// # Field Masks in Update Operations
-//
-// A field mask in update operations specifies which fields of the
-// targeted resource are going to be updated. The API is required
-// to only change the values of the fields as specified in the mask
-// and leave the others untouched. If a resource is passed in to
-// describe the updated values, the API ignores the values of all
-// fields not covered by the mask.
-//
-// If a repeated field is specified for an update operation, new values will
-// be appended to the existing repeated field in the target resource. Note that
-// a repeated field is only allowed in the last position of a `paths` string.
-//
-// If a sub-message is specified in the last position of the field mask for an
-// update operation, then new value will be merged into the existing sub-message
-// in the target resource.
-//
-// For example, given the target message:
-//
-//     f {
-//       b {
-//         d: 1
-//         x: 2
-//       }
-//       c: [1]
-//     }
-//
-// And an update message:
-//
-//     f {
-//       b {
-//         d: 10
-//       }
-//       c: [2]
-//     }
-//
-// then if the field mask is:
-//
-//  paths: ["f.b", "f.c"]
-//
-// then the result will be:
-//
-//     f {
-//       b {
-//         d: 10
-//         x: 2
-//       }
-//       c: [1, 2]
-//     }
-//
-// An implementation may provide options to override this default behavior for
-// repeated and message fields.
-//
-// In order to reset a field's value to the default, the field must
-// be in the mask and set to the default value in the provided resource.
-// Hence, in order to reset all fields of a resource, provide a default
-// instance of the resource and set all fields in the mask, or do
-// not provide a mask as described below.
-//
-// If a field mask is not present on update, the operation applies to
-// all fields (as if a field mask of all fields has been specified).
-// Note that in the presence of schema evolution, this may mean that
-// fields the client does not know and has therefore not filled into
-// the request will be reset to their default. If this is unwanted
-// behavior, a specific service may require a client to always specify
-// a field mask, producing an error if not.
-//
-// As with get operations, the location of the resource which
-// describes the updated values in the request message depends on the
-// operation kind. In any case, the effect of the field mask is
-// required to be honored by the API.
-//
-// ## Considerations for HTTP REST
-//
-// The HTTP kind of an update operation which uses a field mask must
-// be set to PATCH instead of PUT in order to satisfy HTTP semantics
-// (PUT must only be used for full updates).
-//
-// # JSON Encoding of Field Masks
-//
-// In JSON, a field mask is encoded as a single string where paths are
-// separated by a comma. Fields name in each path are converted
-// to/from lower-camel naming conventions.
-//
-// As an example, consider the following message declarations:
-//
-//     message Profile {
-//       User user = 1;
-//       Photo photo = 2;
-//     }
-//     message User {
-//       string display_name = 1;
-//       string address = 2;
-//     }
-//
-// In proto a field mask for `Profile` may look as such:
-//
-//     mask {
-//       paths: "user.display_name"
-//       paths: "photo"
-//     }
-//
-// In JSON, the same mask is represented as below:
-//
-//     {
-//       mask: "user.displayName,photo"
-//     }
-//
-// # Field Masks and Oneof Fields
-//
-// Field masks treat fields in oneofs just as regular fields. Consider the
-// following message:
-//
-//     message SampleMessage {
-//       oneof test_oneof {
-//         string name = 4;
-//         SubMessage sub_message = 9;
-//       }
-//     }
-//
-// The field mask can be:
-//
-//     mask {
-//       paths: "name"
-//     }
-//
-// Or:
-//
-//     mask {
-//       paths: "sub_message"
-//     }
-//
-// Note that oneof type names ("test_oneof" in this case) cannot be used in
-// paths.
-//
-// ## Field Mask Verification
-//
-// The implementation of any API method which has a FieldMask type field in the
-// request should verify the included field paths, and return an
-// `INVALID_ARGUMENT` error if any path is unmappable.
-message FieldMask {
-  // The set of field mask paths.
-  repeated string paths = 1;
-}
diff --git a/libs/protobuf/src/google/protobuf/generated_enum_reflection.h b/libs/protobuf/src/google/protobuf/generated_enum_reflection.h
deleted file mode 100644
index b96a9c6..0000000
--- a/libs/protobuf/src/google/protobuf/generated_enum_reflection.h
+++ /dev/null
@@ -1,100 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: jasonh@google.com (Jason Hsueh)
-//
-// This header is logically internal, but is made public because it is used
-// from protocol-compiler-generated code, which may reside in other components.
-// It provides reflection support for generated enums, and is included in
-// generated .pb.h files and should have minimal dependencies. The methods are
-// implemented in generated_message_reflection.cc.
-
-#ifndef GOOGLE_PROTOBUF_GENERATED_ENUM_REFLECTION_H__
-#define GOOGLE_PROTOBUF_GENERATED_ENUM_REFLECTION_H__
-
-
-#include <string>
-
-#include <google/protobuf/port.h>
-#include <google/protobuf/stubs/strutil.h>
-#include <google/protobuf/generated_enum_util.h>
-
-#ifdef SWIG
-#error "You cannot SWIG proto headers"
-#endif
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-class EnumDescriptor;
-}  // namespace protobuf
-}  // namespace google
-
-namespace google {
-namespace protobuf {
-
-// Returns the EnumDescriptor for enum type E, which must be a
-// proto-declared enum type.  Code generated by the protocol compiler
-// will include specializations of this template for each enum type declared.
-template <typename E>
-const EnumDescriptor* GetEnumDescriptor();
-
-namespace internal {
-
-// Helper for EnumType_Parse functions: try to parse the string 'name' as
-// an enum name of the given type, returning true and filling in value on
-// success, or returning false and leaving value unchanged on failure.
-PROTOBUF_EXPORT bool ParseNamedEnum(const EnumDescriptor* descriptor,
-                                    ConstStringParam name, int* value);
-
-template <typename EnumType>
-bool ParseNamedEnum(const EnumDescriptor* descriptor, ConstStringParam name,
-                    EnumType* value) {
-  int tmp;
-  if (!ParseNamedEnum(descriptor, name, &tmp)) return false;
-  *value = static_cast<EnumType>(tmp);
-  return true;
-}
-
-// Just a wrapper around printing the name of a value. The main point of this
-// function is not to be inlined, so that you can do this without including
-// descriptor.h.
-PROTOBUF_EXPORT const std::string& NameOfEnum(const EnumDescriptor* descriptor,
-                                              int value);
-
-}  // namespace internal
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
-
-#endif  // GOOGLE_PROTOBUF_GENERATED_ENUM_REFLECTION_H__
diff --git a/libs/protobuf/src/google/protobuf/generated_enum_util.cc b/libs/protobuf/src/google/protobuf/generated_enum_util.cc
deleted file mode 100644
index df7583e..0000000
--- a/libs/protobuf/src/google/protobuf/generated_enum_util.cc
+++ /dev/null
@@ -1,95 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <google/protobuf/generated_enum_util.h>
-
-#include <algorithm>
-
-#include <google/protobuf/generated_message_util.h>
-
-namespace google {
-namespace protobuf {
-namespace internal {
-namespace {
-
-bool EnumCompareByName(const EnumEntry& a, const EnumEntry& b) {
-  return StringPiece(a.name) < StringPiece(b.name);
-}
-
-// Gets the numeric value of the EnumEntry at the given index, but returns a
-// special value for the index -1. This gives a way to use std::lower_bound on a
-// sorted array of indices while searching for value that we associate with -1.
-int GetValue(const EnumEntry* enums, int i, int target) {
-  if (i == -1) {
-    return target;
-  } else {
-    return enums[i].value;
-  }
-}
-
-}  // namespace
-
-bool LookUpEnumValue(const EnumEntry* enums, size_t size,
-                     StringPiece name, int* value) {
-  EnumEntry target{name, 0};
-  auto it = std::lower_bound(enums, enums + size, target, EnumCompareByName);
-  if (it != enums + size && it->name == name) {
-    *value = it->value;
-    return true;
-  }
-  return false;
-}
-
-int LookUpEnumName(const EnumEntry* enums, const int* sorted_indices,
-                   size_t size, int value) {
-  auto comparator = [enums, value](int a, int b) {
-    return GetValue(enums, a, value) < GetValue(enums, b, value);
-  };
-  auto it =
-      std::lower_bound(sorted_indices, sorted_indices + size, -1, comparator);
-  if (it != sorted_indices + size && enums[*it].value == value) {
-    return it - sorted_indices;
-  }
-  return -1;
-}
-
-bool InitializeEnumStrings(
-    const EnumEntry* enums, const int* sorted_indices, size_t size,
-    internal::ExplicitlyConstructed<std::string>* enum_strings) {
-  for (size_t i = 0; i < size; ++i) {
-    enum_strings[i].Construct(enums[sorted_indices[i]].name);
-    internal::OnShutdownDestroyString(enum_strings[i].get_mutable());
-  }
-  return true;
-}
-
-}  // namespace internal
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/generated_enum_util.h b/libs/protobuf/src/google/protobuf/generated_enum_util.h
deleted file mode 100644
index 5d10ac0..0000000
--- a/libs/protobuf/src/google/protobuf/generated_enum_util.h
+++ /dev/null
@@ -1,85 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef GOOGLE_PROTOBUF_GENERATED_ENUM_UTIL_H__
-#define GOOGLE_PROTOBUF_GENERATED_ENUM_UTIL_H__
-
-
-#include <type_traits>
-
-#include <google/protobuf/stubs/strutil.h>
-#include <google/protobuf/message_lite.h>
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-#ifdef SWIG
-#error "You cannot SWIG proto headers"
-#endif
-
-namespace google {
-namespace protobuf {
-
-// This type trait can be used to cause templates to only match proto2 enum
-// types.
-template <typename T>
-struct is_proto_enum : ::std::false_type {};
-
-namespace internal {
-
-// The table entry format for storing enum name-to-value mapping used with lite
-// protos. This struct and the following related functions should only be used
-// by protobuf generated code.
-struct EnumEntry {
-  StringPiece name;
-  int value;
-};
-
-// Looks up a numeric enum value given the string name.
-PROTOBUF_EXPORT bool LookUpEnumValue(const EnumEntry* enums, size_t size,
-                                     StringPiece name, int* value);
-
-// Looks up an enum name given the numeric value.
-PROTOBUF_EXPORT int LookUpEnumName(const EnumEntry* enums,
-                                   const int* sorted_indices, size_t size,
-                                   int value);
-
-// Initializes the list of enum names in std::string form.
-PROTOBUF_EXPORT bool InitializeEnumStrings(
-    const EnumEntry* enums, const int* sorted_indices, size_t size,
-    internal::ExplicitlyConstructed<std::string>* enum_strings);
-
-}  // namespace internal
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
-
-#endif  // GOOGLE_PROTOBUF_GENERATED_ENUM_UTIL_H__
diff --git a/libs/protobuf/src/google/protobuf/generated_message_bases.cc b/libs/protobuf/src/google/protobuf/generated_message_bases.cc
deleted file mode 100644
index 306a38e..0000000
--- a/libs/protobuf/src/google/protobuf/generated_message_bases.cc
+++ /dev/null
@@ -1,124 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <google/protobuf/generated_message_bases.h>
-
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/io/zero_copy_stream_impl.h>
-#include <google/protobuf/parse_context.h>
-#include <google/protobuf/unknown_field_set.h>
-#include <google/protobuf/wire_format.h>
-#include <google/protobuf/wire_format_lite.h>
-
-// Must be last:
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-namespace internal {
-
-// =============================================================================
-// ZeroFieldsBase
-
-void ZeroFieldsBase::Clear() {
-  _internal_metadata_.Clear<UnknownFieldSet>();  //
-}
-
-ZeroFieldsBase::~ZeroFieldsBase() {
-  (void)_internal_metadata_.DeleteReturnArena<UnknownFieldSet>();
-}
-
-size_t ZeroFieldsBase::ByteSizeLong() const {
-  return MaybeComputeUnknownFieldsSize(0, &_cached_size_);
-}
-
-const char* ZeroFieldsBase::_InternalParse(const char* ptr,
-                                           internal::ParseContext* ctx) {
-#define CHK_(x)                       \
-  if (PROTOBUF_PREDICT_FALSE(!(x))) { \
-    goto failure;                     \
-  }
-
-  while (!ctx->Done(&ptr)) {
-    uint32_t tag;
-    ptr = internal::ReadTag(ptr, &tag);
-    if ((tag == 0) || ((tag & 7) == 4)) {
-      CHK_(ptr);
-      ctx->SetLastTag(tag);
-      goto message_done;
-    }
-    ptr = UnknownFieldParse(
-        tag, _internal_metadata_.mutable_unknown_fields<UnknownFieldSet>(), ptr,
-        ctx);
-    CHK_(ptr);
-  }  // while
-message_done:
-  return ptr;
-failure:
-  ptr = nullptr;
-  goto message_done;
-#undef CHK_
-}
-
-::uint8_t* ZeroFieldsBase::_InternalSerialize(
-    ::uint8_t* target, io::EpsCopyOutputStream* stream) const {
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target = internal::WireFormat::InternalSerializeUnknownFieldsToArray(
-        _internal_metadata_.unknown_fields<UnknownFieldSet>(
-            UnknownFieldSet::default_instance),
-        target, stream);
-  }
-  return target;
-}
-
-void ZeroFieldsBase::MergeImpl(Message& to_param, const Message& from_param) {
-  auto* to = static_cast<ZeroFieldsBase*>(&to_param);
-  const auto* from = static_cast<const ZeroFieldsBase*>(&from_param);
-  GOOGLE_DCHECK_NE(from, to);
-  to->_internal_metadata_.MergeFrom<UnknownFieldSet>(from->_internal_metadata_);
-}
-
-void ZeroFieldsBase::CopyImpl(Message& to_param, const Message& from_param) {
-  auto* to = static_cast<ZeroFieldsBase*>(&to_param);
-  const auto* from = static_cast<const ZeroFieldsBase*>(&from_param);
-  if (from == to) return;
-  to->_internal_metadata_.Clear<UnknownFieldSet>();
-  to->_internal_metadata_.MergeFrom<UnknownFieldSet>(from->_internal_metadata_);
-}
-
-void ZeroFieldsBase::InternalSwap(ZeroFieldsBase* other) {
-  _internal_metadata_.Swap<UnknownFieldSet>(&other->_internal_metadata_);
-}
-
-}  // namespace internal
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
diff --git a/libs/protobuf/src/google/protobuf/generated_message_bases.h b/libs/protobuf/src/google/protobuf/generated_message_bases.h
deleted file mode 100644
index b295218..0000000
--- a/libs/protobuf/src/google/protobuf/generated_message_bases.h
+++ /dev/null
@@ -1,87 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// This file contains helpers for generated code.
-//
-//  Nothing in this file should be directly referenced by users of protobufs.
-
-#ifndef GOOGLE_PROTOBUF_GENERATED_MESSAGE_BASES_H__
-#define GOOGLE_PROTOBUF_GENERATED_MESSAGE_BASES_H__
-
-#include <google/protobuf/io/zero_copy_stream_impl.h>
-#include <google/protobuf/arena.h>
-#include <google/protobuf/generated_message_util.h>
-#include <google/protobuf/message.h>
-#include <google/protobuf/parse_context.h>
-
-// Must come last:
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-namespace internal {
-
-// To save code size, protos without any fields are derived from ZeroFieldsBase
-// rather than Message.
-class PROTOBUF_EXPORT ZeroFieldsBase : public Message {
- public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final { return true; }
-  size_t ByteSizeLong() const final;
-  int GetCachedSize() const final { return _cached_size_.Get(); }
-  const char* _InternalParse(const char* ptr,
-                             internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(::uint8_t* target,
-                                io::EpsCopyOutputStream* stream) const final;
-
- protected:
-  constexpr ZeroFieldsBase() {}
-  explicit ZeroFieldsBase(Arena* arena, bool is_message_owned)
-      : Message(arena, is_message_owned) {}
-  ZeroFieldsBase(const ZeroFieldsBase&) = delete;
-  ZeroFieldsBase& operator=(const ZeroFieldsBase&) = delete;
-  ~ZeroFieldsBase() override;
-
-  void SetCachedSize(int size) const final { _cached_size_.Set(size); }
-
-  static void MergeImpl(Message& to, const Message& from);
-  static void CopyImpl(Message& to, const Message& from);
-  void InternalSwap(ZeroFieldsBase* other);
-
-  mutable internal::CachedSize _cached_size_;
-};
-
-}  // namespace internal
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
-
-#endif  // GOOGLE_PROTOBUF_GENERATED_MESSAGE_BASES_H__
diff --git a/libs/protobuf/src/google/protobuf/generated_message_reflection.cc b/libs/protobuf/src/google/protobuf/generated_message_reflection.cc
deleted file mode 100644
index 2a807e0..0000000
--- a/libs/protobuf/src/google/protobuf/generated_message_reflection.cc
+++ /dev/null
@@ -1,3168 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-
-#include <google/protobuf/generated_message_reflection.h>
-
-#include <algorithm>
-#include <set>
-
-#include <google/protobuf/stubs/logging.h>
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/stubs/mutex.h>
-#include <google/protobuf/stubs/casts.h>
-#include <google/protobuf/stubs/strutil.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/descriptor.pb.h>
-#include <google/protobuf/extension_set.h>
-#include <google/protobuf/generated_message_util.h>
-#include <google/protobuf/inlined_string_field.h>
-#include <google/protobuf/map_field.h>
-#include <google/protobuf/map_field_inl.h>
-#include <google/protobuf/repeated_field.h>
-#include <google/protobuf/unknown_field_set.h>
-
-
-// clang-format off
-#include <google/protobuf/port_def.inc>
-// clang-format on
-
-#define GOOGLE_PROTOBUF_HAS_ONEOF
-
-using google::protobuf::internal::ArenaStringPtr;
-using google::protobuf::internal::DescriptorTable;
-using google::protobuf::internal::ExtensionSet;
-using google::protobuf::internal::GenericTypeHandler;
-using google::protobuf::internal::GetEmptyString;
-using google::protobuf::internal::InlinedStringField;
-using google::protobuf::internal::InternalMetadata;
-using google::protobuf::internal::LazyField;
-using google::protobuf::internal::MapFieldBase;
-using google::protobuf::internal::MigrationSchema;
-using google::protobuf::internal::OnShutdownDelete;
-using google::protobuf::internal::ReflectionSchema;
-using google::protobuf::internal::RepeatedPtrFieldBase;
-using google::protobuf::internal::StringSpaceUsedExcludingSelfLong;
-using google::protobuf::internal::WrappedMutex;
-
-namespace google {
-namespace protobuf {
-
-namespace {
-bool IsMapFieldInApi(const FieldDescriptor* field) { return field->is_map(); }
-
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-Message* MaybeForceCopy(Arena* arena, Message* msg) {
-  if (arena != nullptr || msg == nullptr) return msg;
-
-  Message* copy = msg->New();
-  copy->MergeFrom(*msg);
-  delete msg;
-  return copy;
-}
-#endif  // PROTOBUF_FORCE_COPY_IN_RELEASE
-}  // anonymous namespace
-
-namespace internal {
-
-bool ParseNamedEnum(const EnumDescriptor* descriptor, ConstStringParam name,
-                    int* value) {
-  const EnumValueDescriptor* d = descriptor->FindValueByName(name);
-  if (d == nullptr) return false;
-  *value = d->number();
-  return true;
-}
-
-const std::string& NameOfEnum(const EnumDescriptor* descriptor, int value) {
-  const EnumValueDescriptor* d = descriptor->FindValueByNumber(value);
-  return (d == nullptr ? GetEmptyString() : d->name());
-}
-
-}  // namespace internal
-
-// ===================================================================
-// Helpers for reporting usage errors (e.g. trying to use GetInt32() on
-// a string field).
-
-namespace {
-
-using internal::GetConstPointerAtOffset;
-using internal::GetConstRefAtOffset;
-using internal::GetPointerAtOffset;
-
-void ReportReflectionUsageError(const Descriptor* descriptor,
-                                const FieldDescriptor* field,
-                                const char* method, const char* description) {
-  GOOGLE_LOG(FATAL) << "Protocol Buffer reflection usage error:\n"
-                "  Method      : google::protobuf::Reflection::"
-             << method
-             << "\n"
-                "  Message type: "
-             << descriptor->full_name()
-             << "\n"
-                "  Field       : "
-             << field->full_name()
-             << "\n"
-                "  Problem     : "
-             << description;
-}
-
-const char* cpptype_names_[FieldDescriptor::MAX_CPPTYPE + 1] = {
-    "INVALID_CPPTYPE", "CPPTYPE_INT32",  "CPPTYPE_INT64",  "CPPTYPE_UINT32",
-    "CPPTYPE_UINT64",  "CPPTYPE_DOUBLE", "CPPTYPE_FLOAT",  "CPPTYPE_BOOL",
-    "CPPTYPE_ENUM",    "CPPTYPE_STRING", "CPPTYPE_MESSAGE"};
-
-static void ReportReflectionUsageTypeError(
-    const Descriptor* descriptor, const FieldDescriptor* field,
-    const char* method, FieldDescriptor::CppType expected_type) {
-  GOOGLE_LOG(FATAL)
-      << "Protocol Buffer reflection usage error:\n"
-         "  Method      : google::protobuf::Reflection::"
-      << method
-      << "\n"
-         "  Message type: "
-      << descriptor->full_name()
-      << "\n"
-         "  Field       : "
-      << field->full_name()
-      << "\n"
-         "  Problem     : Field is not the right type for this message:\n"
-         "    Expected  : "
-      << cpptype_names_[expected_type]
-      << "\n"
-         "    Field type: "
-      << cpptype_names_[field->cpp_type()];
-}
-
-static void ReportReflectionUsageEnumTypeError(
-    const Descriptor* descriptor, const FieldDescriptor* field,
-    const char* method, const EnumValueDescriptor* value) {
-  GOOGLE_LOG(FATAL) << "Protocol Buffer reflection usage error:\n"
-                "  Method      : google::protobuf::Reflection::"
-             << method
-             << "\n"
-                "  Message type: "
-             << descriptor->full_name()
-             << "\n"
-                "  Field       : "
-             << field->full_name()
-             << "\n"
-                "  Problem     : Enum value did not match field type:\n"
-                "    Expected  : "
-             << field->enum_type()->full_name()
-             << "\n"
-                "    Actual    : "
-             << value->full_name();
-}
-
-inline void CheckInvalidAccess(const internal::ReflectionSchema& schema,
-                               const FieldDescriptor* field) {
-  GOOGLE_CHECK(!schema.IsFieldStripped(field))
-      << "invalid access to a stripped field " << field->full_name();
-}
-
-#define USAGE_CHECK(CONDITION, METHOD, ERROR_DESCRIPTION) \
-  if (!(CONDITION))                                       \
-  ReportReflectionUsageError(descriptor_, field, #METHOD, ERROR_DESCRIPTION)
-#define USAGE_CHECK_EQ(A, B, METHOD, ERROR_DESCRIPTION) \
-  USAGE_CHECK((A) == (B), METHOD, ERROR_DESCRIPTION)
-#define USAGE_CHECK_NE(A, B, METHOD, ERROR_DESCRIPTION) \
-  USAGE_CHECK((A) != (B), METHOD, ERROR_DESCRIPTION)
-
-#define USAGE_CHECK_TYPE(METHOD, CPPTYPE)                      \
-  if (field->cpp_type() != FieldDescriptor::CPPTYPE_##CPPTYPE) \
-  ReportReflectionUsageTypeError(descriptor_, field, #METHOD,  \
-                                 FieldDescriptor::CPPTYPE_##CPPTYPE)
-
-#define USAGE_CHECK_ENUM_VALUE(METHOD)     \
-  if (value->type() != field->enum_type()) \
-  ReportReflectionUsageEnumTypeError(descriptor_, field, #METHOD, value)
-
-#define USAGE_CHECK_MESSAGE_TYPE(METHOD)                        \
-  USAGE_CHECK_EQ(field->containing_type(), descriptor_, METHOD, \
-                 "Field does not match message type.");
-#define USAGE_CHECK_SINGULAR(METHOD)                                      \
-  USAGE_CHECK_NE(field->label(), FieldDescriptor::LABEL_REPEATED, METHOD, \
-                 "Field is repeated; the method requires a singular field.")
-#define USAGE_CHECK_REPEATED(METHOD)                                      \
-  USAGE_CHECK_EQ(field->label(), FieldDescriptor::LABEL_REPEATED, METHOD, \
-                 "Field is singular; the method requires a repeated field.")
-
-#define USAGE_CHECK_ALL(METHOD, LABEL, CPPTYPE) \
-  USAGE_CHECK_MESSAGE_TYPE(METHOD);             \
-  USAGE_CHECK_##LABEL(METHOD);                  \
-  USAGE_CHECK_TYPE(METHOD, CPPTYPE)
-
-}  // namespace
-
-// ===================================================================
-
-Reflection::Reflection(const Descriptor* descriptor,
-                       const internal::ReflectionSchema& schema,
-                       const DescriptorPool* pool, MessageFactory* factory)
-    : descriptor_(descriptor),
-      schema_(schema),
-      descriptor_pool_(
-          (pool == nullptr) ? DescriptorPool::internal_generated_pool() : pool),
-      message_factory_(factory),
-      last_non_weak_field_index_(-1) {
-  last_non_weak_field_index_ = descriptor_->field_count() - 1;
-}
-
-const UnknownFieldSet& Reflection::GetUnknownFields(
-    const Message& message) const {
-  return GetInternalMetadata(message).unknown_fields<UnknownFieldSet>(
-      UnknownFieldSet::default_instance);
-}
-
-UnknownFieldSet* Reflection::MutableUnknownFields(Message* message) const {
-  return MutableInternalMetadata(message)
-      ->mutable_unknown_fields<UnknownFieldSet>();
-}
-
-bool Reflection::IsLazyExtension(const Message& message,
-                                 const FieldDescriptor* field) const {
-  return field->is_extension() &&
-         GetExtensionSet(message).HasLazy(field->number());
-}
-
-bool Reflection::IsLazilyVerifiedLazyField(const FieldDescriptor* field) const {
-  if (field->options().unverified_lazy()) return true;
-
-  // Message fields with [lazy=true] will be eagerly verified
-  // (go/verified-lazy).
-  return field->options().lazy() && !IsEagerlyVerifiedLazyField(field);
-}
-
-bool Reflection::IsEagerlyVerifiedLazyField(
-    const FieldDescriptor* field) const {
-  return (field->type() == FieldDescriptor::TYPE_MESSAGE &&
-          schema_.IsEagerlyVerifiedLazyField(field));
-}
-
-bool Reflection::IsInlined(const FieldDescriptor* field) const {
-  return schema_.IsFieldInlined(field);
-}
-
-size_t Reflection::SpaceUsedLong(const Message& message) const {
-  // object_size_ already includes the in-memory representation of each field
-  // in the message, so we only need to account for additional memory used by
-  // the fields.
-  size_t total_size = schema_.GetObjectSize();
-
-  total_size += GetUnknownFields(message).SpaceUsedExcludingSelfLong();
-
-  // If this message owns an arena, add any unused space that's been allocated.
-  auto* arena = Arena::InternalGetArenaForAllocation(&message);
-  if (arena != nullptr && Arena::InternalGetOwningArena(&message) == nullptr &&
-      arena->InternalIsMessageOwnedArena()) {
-    total_size += arena->SpaceAllocated() - arena->SpaceUsed();
-  }
-
-  if (schema_.HasExtensionSet()) {
-    total_size += GetExtensionSet(message).SpaceUsedExcludingSelfLong();
-  }
-  for (int i = 0; i <= last_non_weak_field_index_; i++) {
-    const FieldDescriptor* field = descriptor_->field(i);
-    if (field->is_repeated()) {
-      switch (field->cpp_type()) {
-#define HANDLE_TYPE(UPPERCASE, LOWERCASE)                           \
-  case FieldDescriptor::CPPTYPE_##UPPERCASE:                        \
-    total_size += GetRaw<RepeatedField<LOWERCASE> >(message, field) \
-                      .SpaceUsedExcludingSelfLong();                \
-    break
-
-        HANDLE_TYPE(INT32, int32_t);
-        HANDLE_TYPE(INT64, int64_t);
-        HANDLE_TYPE(UINT32, uint32_t);
-        HANDLE_TYPE(UINT64, uint64_t);
-        HANDLE_TYPE(DOUBLE, double);
-        HANDLE_TYPE(FLOAT, float);
-        HANDLE_TYPE(BOOL, bool);
-        HANDLE_TYPE(ENUM, int);
-#undef HANDLE_TYPE
-
-        case FieldDescriptor::CPPTYPE_STRING:
-          switch (field->options().ctype()) {
-            default:  // TODO(kenton):  Support other string reps.
-            case FieldOptions::STRING:
-              total_size +=
-                  GetRaw<RepeatedPtrField<std::string> >(message, field)
-                      .SpaceUsedExcludingSelfLong();
-              break;
-          }
-          break;
-
-        case FieldDescriptor::CPPTYPE_MESSAGE:
-          if (IsMapFieldInApi(field)) {
-            total_size += GetRaw<internal::MapFieldBase>(message, field)
-                              .SpaceUsedExcludingSelfLong();
-          } else {
-            // We don't know which subclass of RepeatedPtrFieldBase the type is,
-            // so we use RepeatedPtrFieldBase directly.
-            total_size +=
-                GetRaw<RepeatedPtrFieldBase>(message, field)
-                    .SpaceUsedExcludingSelfLong<GenericTypeHandler<Message> >();
-          }
-
-          break;
-      }
-    } else {
-      if (schema_.InRealOneof(field) && !HasOneofField(message, field)) {
-        continue;
-      }
-      switch (field->cpp_type()) {
-        case FieldDescriptor::CPPTYPE_INT32:
-        case FieldDescriptor::CPPTYPE_INT64:
-        case FieldDescriptor::CPPTYPE_UINT32:
-        case FieldDescriptor::CPPTYPE_UINT64:
-        case FieldDescriptor::CPPTYPE_DOUBLE:
-        case FieldDescriptor::CPPTYPE_FLOAT:
-        case FieldDescriptor::CPPTYPE_BOOL:
-        case FieldDescriptor::CPPTYPE_ENUM:
-          // Field is inline, so we've already counted it.
-          break;
-
-        case FieldDescriptor::CPPTYPE_STRING: {
-          switch (field->options().ctype()) {
-            default:  // TODO(kenton):  Support other string reps.
-            case FieldOptions::STRING:
-              if (IsInlined(field)) {
-                const std::string* ptr =
-                    &GetField<InlinedStringField>(message, field).GetNoArena();
-                total_size += StringSpaceUsedExcludingSelfLong(*ptr);
-              } else {
-                // Initially, the string points to the default value stored
-                // in the prototype. Only count the string if it has been
-                // changed from the default value.
-                // Except oneof fields, those never point to a default instance,
-                // and there is no default instance to point to.
-                const auto& str = GetField<ArenaStringPtr>(message, field);
-                if (!str.IsDefault() || schema_.InRealOneof(field)) {
-                  // string fields are represented by just a pointer, so also
-                  // include sizeof(string) as well.
-                  total_size += sizeof(std::string) +
-                                StringSpaceUsedExcludingSelfLong(str.Get());
-                }
-              }
-              break;
-          }
-          break;
-        }
-
-        case FieldDescriptor::CPPTYPE_MESSAGE:
-          if (schema_.IsDefaultInstance(message)) {
-            // For singular fields, the prototype just stores a pointer to the
-            // external type's prototype, so there is no extra memory usage.
-          } else {
-            const Message* sub_message = GetRaw<const Message*>(message, field);
-            if (sub_message != nullptr) {
-              total_size += sub_message->SpaceUsedLong();
-            }
-          }
-          break;
-      }
-    }
-  }
-  return total_size;
-}
-
-namespace {
-
-template <bool unsafe_shallow_swap>
-struct OneofFieldMover {
-  template <typename FromType, typename ToType>
-  void operator()(const FieldDescriptor* field, FromType* from, ToType* to) {
-    switch (field->cpp_type()) {
-      case FieldDescriptor::CPPTYPE_INT32:
-        to->SetInt32(from->GetInt32());
-        break;
-      case FieldDescriptor::CPPTYPE_INT64:
-        to->SetInt64(from->GetInt64());
-        break;
-      case FieldDescriptor::CPPTYPE_UINT32:
-        to->SetUint32(from->GetUint32());
-        break;
-      case FieldDescriptor::CPPTYPE_UINT64:
-        to->SetUint64(from->GetUint64());
-        break;
-      case FieldDescriptor::CPPTYPE_FLOAT:
-        to->SetFloat(from->GetFloat());
-        break;
-      case FieldDescriptor::CPPTYPE_DOUBLE:
-        to->SetDouble(from->GetDouble());
-        break;
-      case FieldDescriptor::CPPTYPE_BOOL:
-        to->SetBool(from->GetBool());
-        break;
-      case FieldDescriptor::CPPTYPE_ENUM:
-        to->SetEnum(from->GetEnum());
-        break;
-      case FieldDescriptor::CPPTYPE_MESSAGE:
-        if (!unsafe_shallow_swap) {
-          to->SetMessage(from->GetMessage());
-        } else {
-          to->UnsafeSetMessage(from->UnsafeGetMessage());
-        }
-        break;
-      case FieldDescriptor::CPPTYPE_STRING:
-        if (!unsafe_shallow_swap) {
-          to->SetString(from->GetString());
-          break;
-        }
-        switch (field->options().ctype()) {
-          default:
-          case FieldOptions::STRING: {
-            to->SetArenaStringPtr(from->GetArenaStringPtr());
-            break;
-          }
-        }
-        break;
-      default:
-        GOOGLE_LOG(FATAL) << "unimplemented type: " << field->cpp_type();
-    }
-    if (unsafe_shallow_swap) {
-      // Not clearing oneof case after move may cause unwanted "ClearOneof"
-      // where the residual message or string value is deleted and causes
-      // use-after-free (only for unsafe swap).
-      from->ClearOneofCase();
-    }
-  }
-};
-
-}  // namespace
-
-namespace internal {
-
-class SwapFieldHelper {
- public:
-  template <bool unsafe_shallow_swap>
-  static void SwapRepeatedStringField(const Reflection* r, Message* lhs,
-                                      Message* rhs,
-                                      const FieldDescriptor* field);
-
-  template <bool unsafe_shallow_swap>
-  static void SwapInlinedStrings(const Reflection* r, Message* lhs,
-                                 Message* rhs, const FieldDescriptor* field);
-
-  template <bool unsafe_shallow_swap>
-  static void SwapNonInlinedStrings(const Reflection* r, Message* lhs,
-                                    Message* rhs, const FieldDescriptor* field);
-
-  template <bool unsafe_shallow_swap>
-  static void SwapStringField(const Reflection* r, Message* lhs, Message* rhs,
-                              const FieldDescriptor* field);
-
-  static void SwapArenaStringPtr(ArenaStringPtr* lhs, Arena* lhs_arena,
-                                 ArenaStringPtr* rhs, Arena* rhs_arena);
-
-  template <bool unsafe_shallow_swap>
-  static void SwapRepeatedMessageField(const Reflection* r, Message* lhs,
-                                       Message* rhs,
-                                       const FieldDescriptor* field);
-
-  template <bool unsafe_shallow_swap>
-  static void SwapMessageField(const Reflection* r, Message* lhs, Message* rhs,
-                               const FieldDescriptor* field);
-
-  static void SwapMessage(const Reflection* r, Message* lhs, Arena* lhs_arena,
-                          Message* rhs, Arena* rhs_arena,
-                          const FieldDescriptor* field);
-
-  static void SwapNonMessageNonStringField(const Reflection* r, Message* lhs,
-                                           Message* rhs,
-                                           const FieldDescriptor* field);
-};
-
-template <bool unsafe_shallow_swap>
-void SwapFieldHelper::SwapRepeatedStringField(const Reflection* r, Message* lhs,
-                                              Message* rhs,
-                                              const FieldDescriptor* field) {
-  switch (field->options().ctype()) {
-    default:
-    case FieldOptions::STRING: {
-      auto* lhs_string = r->MutableRaw<RepeatedPtrFieldBase>(lhs, field);
-      auto* rhs_string = r->MutableRaw<RepeatedPtrFieldBase>(rhs, field);
-      if (unsafe_shallow_swap) {
-        lhs_string->InternalSwap(rhs_string);
-      } else {
-        lhs_string->Swap<GenericTypeHandler<std::string>>(rhs_string);
-      }
-      break;
-    }
-  }
-}
-
-template <bool unsafe_shallow_swap>
-void SwapFieldHelper::SwapInlinedStrings(const Reflection* r, Message* lhs,
-                                         Message* rhs,
-                                         const FieldDescriptor* field) {
-  // Inlined string field.
-  Arena* lhs_arena = lhs->GetArenaForAllocation();
-  Arena* rhs_arena = rhs->GetArenaForAllocation();
-  auto* lhs_string = r->MutableRaw<InlinedStringField>(lhs, field);
-  auto* rhs_string = r->MutableRaw<InlinedStringField>(rhs, field);
-  uint32_t index = r->schema_.InlinedStringIndex(field);
-  GOOGLE_DCHECK_GT(index, 0);
-  uint32_t* lhs_array = r->MutableInlinedStringDonatedArray(lhs);
-  uint32_t* rhs_array = r->MutableInlinedStringDonatedArray(rhs);
-  uint32_t* lhs_state = &lhs_array[index / 32];
-  uint32_t* rhs_state = &rhs_array[index / 32];
-  bool lhs_arena_dtor_registered = (lhs_array[0] & 0x1u) == 0;
-  bool rhs_arena_dtor_registered = (rhs_array[0] & 0x1u) == 0;
-  const uint32_t mask = ~(static_cast<uint32_t>(1) << (index % 32));
-  if (unsafe_shallow_swap || lhs_arena == rhs_arena) {
-    InlinedStringField::InternalSwap(lhs_string, lhs_arena,
-                                     lhs_arena_dtor_registered, lhs, rhs_string,
-                                     rhs_arena, rhs_arena_dtor_registered, rhs);
-  } else {
-    const std::string temp = lhs_string->Get();
-    lhs_string->Set(rhs_string->Get(), lhs_arena,
-                    r->IsInlinedStringDonated(*lhs, field), lhs_state, mask,
-                    lhs);
-    rhs_string->Set(temp, rhs_arena, r->IsInlinedStringDonated(*rhs, field),
-                    rhs_state, mask, rhs);
-  }
-}
-
-template <bool unsafe_shallow_swap>
-void SwapFieldHelper::SwapNonInlinedStrings(const Reflection* r, Message* lhs,
-                                            Message* rhs,
-                                            const FieldDescriptor* field) {
-  ArenaStringPtr* lhs_string = r->MutableRaw<ArenaStringPtr>(lhs, field);
-  ArenaStringPtr* rhs_string = r->MutableRaw<ArenaStringPtr>(rhs, field);
-  if (unsafe_shallow_swap) {
-    ArenaStringPtr::UnsafeShallowSwap(lhs_string, rhs_string);
-  } else {
-    SwapFieldHelper::SwapArenaStringPtr(
-        lhs_string, lhs->GetArenaForAllocation(),  //
-        rhs_string, rhs->GetArenaForAllocation());
-  }
-}
-
-template <bool unsafe_shallow_swap>
-void SwapFieldHelper::SwapStringField(const Reflection* r, Message* lhs,
-                                      Message* rhs,
-                                      const FieldDescriptor* field) {
-  switch (field->options().ctype()) {
-    default:
-    case FieldOptions::STRING: {
-      if (r->IsInlined(field)) {
-        SwapFieldHelper::SwapInlinedStrings<unsafe_shallow_swap>(r, lhs, rhs,
-                                                                 field);
-      } else {
-        SwapFieldHelper::SwapNonInlinedStrings<unsafe_shallow_swap>(r, lhs, rhs,
-                                                                    field);
-      }
-      break;
-    }
-  }
-}
-
-void SwapFieldHelper::SwapArenaStringPtr(ArenaStringPtr* lhs, Arena* lhs_arena,
-                                         ArenaStringPtr* rhs,
-                                         Arena* rhs_arena) {
-  if (lhs_arena == rhs_arena) {
-    ArenaStringPtr::InternalSwap(lhs, lhs_arena, rhs, rhs_arena);
-  } else if (lhs->IsDefault() && rhs->IsDefault()) {
-    // Nothing to do.
-  } else if (lhs->IsDefault()) {
-    lhs->Set(rhs->Get(), lhs_arena);
-    // rhs needs to be destroyed before overwritten.
-    rhs->Destroy();
-    rhs->InitDefault();
-  } else if (rhs->IsDefault()) {
-    rhs->Set(lhs->Get(), rhs_arena);
-    // lhs needs to be destroyed before overwritten.
-    lhs->Destroy();
-    lhs->InitDefault();
-  } else {
-    std::string temp = lhs->Get();
-    lhs->Set(rhs->Get(), lhs_arena);
-    rhs->Set(std::move(temp), rhs_arena);
-  }
-}
-
-template <bool unsafe_shallow_swap>
-void SwapFieldHelper::SwapRepeatedMessageField(const Reflection* r,
-                                               Message* lhs, Message* rhs,
-                                               const FieldDescriptor* field) {
-  if (IsMapFieldInApi(field)) {
-    auto* lhs_map = r->MutableRaw<MapFieldBase>(lhs, field);
-    auto* rhs_map = r->MutableRaw<MapFieldBase>(rhs, field);
-    if (unsafe_shallow_swap) {
-      lhs_map->UnsafeShallowSwap(rhs_map);
-    } else {
-      lhs_map->Swap(rhs_map);
-    }
-  } else {
-    auto* lhs_rm = r->MutableRaw<RepeatedPtrFieldBase>(lhs, field);
-    auto* rhs_rm = r->MutableRaw<RepeatedPtrFieldBase>(rhs, field);
-    if (unsafe_shallow_swap) {
-      lhs_rm->InternalSwap(rhs_rm);
-    } else {
-      lhs_rm->Swap<GenericTypeHandler<Message>>(rhs_rm);
-    }
-  }
-}
-
-template <bool unsafe_shallow_swap>
-void SwapFieldHelper::SwapMessageField(const Reflection* r, Message* lhs,
-                                       Message* rhs,
-                                       const FieldDescriptor* field) {
-  if (unsafe_shallow_swap) {
-    std::swap(*r->MutableRaw<Message*>(lhs, field),
-              *r->MutableRaw<Message*>(rhs, field));
-  } else {
-    SwapMessage(r, lhs, lhs->GetArenaForAllocation(), rhs,
-                rhs->GetArenaForAllocation(), field);
-  }
-}
-
-void SwapFieldHelper::SwapMessage(const Reflection* r, Message* lhs,
-                                  Arena* lhs_arena, Message* rhs,
-                                  Arena* rhs_arena,
-                                  const FieldDescriptor* field) {
-  Message** lhs_sub = r->MutableRaw<Message*>(lhs, field);
-  Message** rhs_sub = r->MutableRaw<Message*>(rhs, field);
-
-  if (*lhs_sub == *rhs_sub) return;
-
-#ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-  if (lhs_arena != nullptr && lhs_arena == rhs_arena) {
-#else   // PROTOBUF_FORCE_COPY_IN_SWAP
-  if (lhs_arena == rhs_arena) {
-#endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-    std::swap(*lhs_sub, *rhs_sub);
-    return;
-  }
-
-  if (*lhs_sub != nullptr && *rhs_sub != nullptr) {
-    (*lhs_sub)->GetReflection()->Swap(*lhs_sub, *rhs_sub);
-  } else if (*lhs_sub == nullptr && r->HasBit(*rhs, field)) {
-    *lhs_sub = (*rhs_sub)->New(lhs_arena);
-    (*lhs_sub)->CopyFrom(**rhs_sub);
-    r->ClearField(rhs, field);
-    // Ensures has bit is unchanged after ClearField.
-    r->SetBit(rhs, field);
-  } else if (*rhs_sub == nullptr && r->HasBit(*lhs, field)) {
-    *rhs_sub = (*lhs_sub)->New(rhs_arena);
-    (*rhs_sub)->CopyFrom(**lhs_sub);
-    r->ClearField(lhs, field);
-    // Ensures has bit is unchanged after ClearField.
-    r->SetBit(lhs, field);
-  }
-}
-
-void SwapFieldHelper::SwapNonMessageNonStringField(
-    const Reflection* r, Message* lhs, Message* rhs,
-    const FieldDescriptor* field) {
-  switch (field->cpp_type()) {
-#define SWAP_VALUES(CPPTYPE, TYPE)               \
-  case FieldDescriptor::CPPTYPE_##CPPTYPE:       \
-    std::swap(*r->MutableRaw<TYPE>(lhs, field),  \
-              *r->MutableRaw<TYPE>(rhs, field)); \
-    break;
-
-    SWAP_VALUES(INT32, int32_t);
-    SWAP_VALUES(INT64, int64_t);
-    SWAP_VALUES(UINT32, uint32_t);
-    SWAP_VALUES(UINT64, uint64_t);
-    SWAP_VALUES(FLOAT, float);
-    SWAP_VALUES(DOUBLE, double);
-    SWAP_VALUES(BOOL, bool);
-    SWAP_VALUES(ENUM, int);
-#undef SWAP_VALUES
-    default:
-      GOOGLE_LOG(FATAL) << "Unimplemented type: " << field->cpp_type();
-  }
-}
-
-}  // namespace internal
-
-void Reflection::SwapField(Message* message1, Message* message2,
-                           const FieldDescriptor* field) const {
-  if (field->is_repeated()) {
-    switch (field->cpp_type()) {
-#define SWAP_ARRAYS(CPPTYPE, TYPE)                                 \
-  case FieldDescriptor::CPPTYPE_##CPPTYPE:                         \
-    MutableRaw<RepeatedField<TYPE> >(message1, field)              \
-        ->Swap(MutableRaw<RepeatedField<TYPE> >(message2, field)); \
-    break;
-
-      SWAP_ARRAYS(INT32, int32_t);
-      SWAP_ARRAYS(INT64, int64_t);
-      SWAP_ARRAYS(UINT32, uint32_t);
-      SWAP_ARRAYS(UINT64, uint64_t);
-      SWAP_ARRAYS(FLOAT, float);
-      SWAP_ARRAYS(DOUBLE, double);
-      SWAP_ARRAYS(BOOL, bool);
-      SWAP_ARRAYS(ENUM, int);
-#undef SWAP_ARRAYS
-
-      case FieldDescriptor::CPPTYPE_STRING:
-        internal::SwapFieldHelper::SwapRepeatedStringField<false>(
-            this, message1, message2, field);
-        break;
-      case FieldDescriptor::CPPTYPE_MESSAGE:
-        internal::SwapFieldHelper::SwapRepeatedMessageField<false>(
-            this, message1, message2, field);
-        break;
-
-      default:
-        GOOGLE_LOG(FATAL) << "Unimplemented type: " << field->cpp_type();
-    }
-  } else {
-    switch (field->cpp_type()) {
-      case FieldDescriptor::CPPTYPE_MESSAGE:
-        internal::SwapFieldHelper::SwapMessageField<false>(this, message1,
-                                                           message2, field);
-        break;
-
-      case FieldDescriptor::CPPTYPE_STRING:
-        internal::SwapFieldHelper::SwapStringField<false>(this, message1,
-                                                          message2, field);
-        break;
-      default:
-        internal::SwapFieldHelper::SwapNonMessageNonStringField(
-            this, message1, message2, field);
-    }
-  }
-}
-
-void Reflection::UnsafeShallowSwapField(Message* message1, Message* message2,
-                                        const FieldDescriptor* field) const {
-  if (!field->is_repeated()) {
-    if (field->cpp_type() == FieldDescriptor::CPPTYPE_MESSAGE) {
-      internal::SwapFieldHelper::SwapMessageField<true>(this, message1,
-                                                        message2, field);
-    } else if (field->cpp_type() == FieldDescriptor::CPPTYPE_STRING) {
-      internal::SwapFieldHelper::SwapStringField<true>(this, message1, message2,
-                                                       field);
-    } else {
-      internal::SwapFieldHelper::SwapNonMessageNonStringField(this, message1,
-                                                              message2, field);
-    }
-    return;
-  }
-
-  switch (field->cpp_type()) {
-#define SHALLOW_SWAP_ARRAYS(CPPTYPE, TYPE)                                \
-  case FieldDescriptor::CPPTYPE_##CPPTYPE:                                \
-    MutableRaw<RepeatedField<TYPE>>(message1, field)                      \
-        ->InternalSwap(MutableRaw<RepeatedField<TYPE>>(message2, field)); \
-    break;
-
-    SHALLOW_SWAP_ARRAYS(INT32, int32_t);
-    SHALLOW_SWAP_ARRAYS(INT64, int64_t);
-    SHALLOW_SWAP_ARRAYS(UINT32, uint32_t);
-    SHALLOW_SWAP_ARRAYS(UINT64, uint64_t);
-    SHALLOW_SWAP_ARRAYS(FLOAT, float);
-    SHALLOW_SWAP_ARRAYS(DOUBLE, double);
-    SHALLOW_SWAP_ARRAYS(BOOL, bool);
-    SHALLOW_SWAP_ARRAYS(ENUM, int);
-#undef SHALLOW_SWAP_ARRAYS
-
-    case FieldDescriptor::CPPTYPE_STRING:
-      internal::SwapFieldHelper::SwapRepeatedStringField<true>(this, message1,
-                                                               message2, field);
-      break;
-    case FieldDescriptor::CPPTYPE_MESSAGE:
-      internal::SwapFieldHelper::SwapRepeatedMessageField<true>(
-          this, message1, message2, field);
-      break;
-
-    default:
-      GOOGLE_LOG(FATAL) << "Unimplemented type: " << field->cpp_type();
-  }
-}
-
-// Swaps oneof field between lhs and rhs. If unsafe_shallow_swap is true, it
-// directly swaps oneof values; otherwise, it may involve copy/delete. Note that
-// two messages may have different oneof cases. So, it has to be done in three
-// steps (i.e. lhs -> temp, rhs -> lhs, temp -> rhs).
-template <bool unsafe_shallow_swap>
-void Reflection::SwapOneofField(Message* lhs, Message* rhs,
-                                const OneofDescriptor* oneof_descriptor) const {
-  // Wraps a local variable to temporarily store oneof value.
-  struct LocalVarWrapper {
-#define LOCAL_VAR_ACCESSOR(type, var, name)               \
-  type Get##name() const { return oneof_val.type_##var; } \
-  void Set##name(type v) { oneof_val.type_##var = v; }
-
-    LOCAL_VAR_ACCESSOR(int32_t, int32, Int32);
-    LOCAL_VAR_ACCESSOR(int64_t, int64, Int64);
-    LOCAL_VAR_ACCESSOR(uint32_t, uint32, Uint32);
-    LOCAL_VAR_ACCESSOR(uint64_t, uint64, Uint64);
-    LOCAL_VAR_ACCESSOR(float, float, Float);
-    LOCAL_VAR_ACCESSOR(double, double, Double);
-    LOCAL_VAR_ACCESSOR(bool, bool, Bool);
-    LOCAL_VAR_ACCESSOR(int, enum, Enum);
-    LOCAL_VAR_ACCESSOR(Message*, message, Message);
-    LOCAL_VAR_ACCESSOR(ArenaStringPtr, arena_string_ptr, ArenaStringPtr);
-    const std::string& GetString() const { return string_val; }
-    void SetString(const std::string& v) { string_val = v; }
-    Message* UnsafeGetMessage() const { return GetMessage(); }
-    void UnsafeSetMessage(Message* v) { SetMessage(v); }
-    void ClearOneofCase() {}
-
-    union {
-      int32_t type_int32;
-      int64_t type_int64;
-      uint32_t type_uint32;
-      uint64_t type_uint64;
-      float type_float;
-      double type_double;
-      bool type_bool;
-      int type_enum;
-      Message* type_message;
-      internal::ArenaStringPtr type_arena_string_ptr;
-    } oneof_val;
-
-    // std::string cannot be in union.
-    std::string string_val;
-  };
-
-  // Wraps a message pointer to read and write a field.
-  struct MessageWrapper {
-#define MESSAGE_FIELD_ACCESSOR(type, var, name)         \
-  type Get##name() const {                              \
-    return reflection->GetField<type>(*message, field); \
-  }                                                     \
-  void Set##name(type v) { reflection->SetField<type>(message, field, v); }
-
-    MESSAGE_FIELD_ACCESSOR(int32_t, int32, Int32);
-    MESSAGE_FIELD_ACCESSOR(int64_t, int64, Int64);
-    MESSAGE_FIELD_ACCESSOR(uint32_t, uint32, Uint32);
-    MESSAGE_FIELD_ACCESSOR(uint64_t, uint64, Uint64);
-    MESSAGE_FIELD_ACCESSOR(float, float, Float);
-    MESSAGE_FIELD_ACCESSOR(double, double, Double);
-    MESSAGE_FIELD_ACCESSOR(bool, bool, Bool);
-    MESSAGE_FIELD_ACCESSOR(int, enum, Enum);
-    MESSAGE_FIELD_ACCESSOR(ArenaStringPtr, arena_string_ptr, ArenaStringPtr);
-    std::string GetString() const {
-      return reflection->GetString(*message, field);
-    }
-    void SetString(const std::string& v) {
-      reflection->SetString(message, field, v);
-    }
-    Message* GetMessage() const {
-      return reflection->ReleaseMessage(message, field);
-    }
-    void SetMessage(Message* v) {
-      reflection->SetAllocatedMessage(message, v, field);
-    }
-    Message* UnsafeGetMessage() const {
-      return reflection->UnsafeArenaReleaseMessage(message, field);
-    }
-    void UnsafeSetMessage(Message* v) {
-      reflection->UnsafeArenaSetAllocatedMessage(message, v, field);
-    }
-    void ClearOneofCase() {
-      *reflection->MutableOneofCase(message, field->containing_oneof()) = 0;
-    }
-
-    const Reflection* reflection;
-    Message* message;
-    const FieldDescriptor* field;
-  };
-
-  GOOGLE_DCHECK(!oneof_descriptor->is_synthetic());
-  uint32_t oneof_case_lhs = GetOneofCase(*lhs, oneof_descriptor);
-  uint32_t oneof_case_rhs = GetOneofCase(*rhs, oneof_descriptor);
-
-  LocalVarWrapper temp;
-  MessageWrapper lhs_wrapper, rhs_wrapper;
-  const FieldDescriptor* field_lhs = nullptr;
-  OneofFieldMover<unsafe_shallow_swap> mover;
-  // lhs --> temp
-  if (oneof_case_lhs > 0) {
-    field_lhs = descriptor_->FindFieldByNumber(oneof_case_lhs);
-    lhs_wrapper = {this, lhs, field_lhs};
-    mover(field_lhs, &lhs_wrapper, &temp);
-  }
-  // rhs --> lhs
-  if (oneof_case_rhs > 0) {
-    const FieldDescriptor* f = descriptor_->FindFieldByNumber(oneof_case_rhs);
-    lhs_wrapper = {this, lhs, f};
-    rhs_wrapper = {this, rhs, f};
-    mover(f, &rhs_wrapper, &lhs_wrapper);
-  } else if (!unsafe_shallow_swap) {
-    ClearOneof(lhs, oneof_descriptor);
-  }
-  // temp --> rhs
-  if (oneof_case_lhs > 0) {
-    rhs_wrapper = {this, rhs, field_lhs};
-    mover(field_lhs, &temp, &rhs_wrapper);
-  } else if (!unsafe_shallow_swap) {
-    ClearOneof(rhs, oneof_descriptor);
-  }
-
-  if (unsafe_shallow_swap) {
-    *MutableOneofCase(lhs, oneof_descriptor) = oneof_case_rhs;
-    *MutableOneofCase(rhs, oneof_descriptor) = oneof_case_lhs;
-  }
-}
-
-void Reflection::Swap(Message* message1, Message* message2) const {
-  if (message1 == message2) return;
-
-  // TODO(kenton):  Other Reflection methods should probably check this too.
-  GOOGLE_CHECK_EQ(message1->GetReflection(), this)
-      << "First argument to Swap() (of type \""
-      << message1->GetDescriptor()->full_name()
-      << "\") is not compatible with this reflection object (which is for type "
-         "\""
-      << descriptor_->full_name()
-      << "\").  Note that the exact same class is required; not just the same "
-         "descriptor.";
-  GOOGLE_CHECK_EQ(message2->GetReflection(), this)
-      << "Second argument to Swap() (of type \""
-      << message2->GetDescriptor()->full_name()
-      << "\") is not compatible with this reflection object (which is for type "
-         "\""
-      << descriptor_->full_name()
-      << "\").  Note that the exact same class is required; not just the same "
-         "descriptor.";
-
-  // Check that both messages are in the same arena (or both on the heap). We
-  // need to copy all data if not, due to ownership semantics.
-#ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-  if (message1->GetOwningArena() == nullptr ||
-      message1->GetOwningArena() != message2->GetOwningArena()) {
-#else   // PROTOBUF_FORCE_COPY_IN_SWAP
-  if (message1->GetOwningArena() != message2->GetOwningArena()) {
-#endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-    // One of the two is guaranteed to have an arena.  Switch things around
-    // to guarantee that message1 has an arena.
-    Arena* arena = message1->GetOwningArena();
-    if (arena == nullptr) {
-      arena = message2->GetOwningArena();
-      std::swap(message1, message2);  // Swapping names for pointers!
-    }
-
-    Message* temp = message1->New(arena);
-    temp->MergeFrom(*message2);
-    message2->CopyFrom(*message1);
-#ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    message1->CopyFrom(*temp);
-    if (arena == nullptr) delete temp;
-#else   // PROTOBUF_FORCE_COPY_IN_SWAP
-    Swap(message1, temp);
-#endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-    return;
-  }
-
-  GOOGLE_DCHECK_EQ(message1->GetOwningArena(), message2->GetOwningArena());
-
-  UnsafeArenaSwap(message1, message2);
-}
-
-template <bool unsafe_shallow_swap>
-void Reflection::SwapFieldsImpl(
-    Message* message1, Message* message2,
-    const std::vector<const FieldDescriptor*>& fields) const {
-  if (message1 == message2) return;
-
-  // TODO(kenton):  Other Reflection methods should probably check this too.
-  GOOGLE_CHECK_EQ(message1->GetReflection(), this)
-      << "First argument to SwapFields() (of type \""
-      << message1->GetDescriptor()->full_name()
-      << "\") is not compatible with this reflection object (which is for type "
-         "\""
-      << descriptor_->full_name()
-      << "\").  Note that the exact same class is required; not just the same "
-         "descriptor.";
-  GOOGLE_CHECK_EQ(message2->GetReflection(), this)
-      << "Second argument to SwapFields() (of type \""
-      << message2->GetDescriptor()->full_name()
-      << "\") is not compatible with this reflection object (which is for type "
-         "\""
-      << descriptor_->full_name()
-      << "\").  Note that the exact same class is required; not just the same "
-         "descriptor.";
-
-  std::set<int> swapped_oneof;
-
-  GOOGLE_DCHECK(!unsafe_shallow_swap || message1->GetArenaForAllocation() ==
-                                     message2->GetArenaForAllocation());
-
-  const Message* prototype =
-      message_factory_->GetPrototype(message1->GetDescriptor());
-  for (const auto* field : fields) {
-    CheckInvalidAccess(schema_, field);
-    if (field->is_extension()) {
-      if (unsafe_shallow_swap) {
-        MutableExtensionSet(message1)->UnsafeShallowSwapExtension(
-            MutableExtensionSet(message2), field->number());
-      } else {
-        MutableExtensionSet(message1)->SwapExtension(
-            prototype, MutableExtensionSet(message2), field->number());
-      }
-    } else {
-      if (schema_.InRealOneof(field)) {
-        int oneof_index = field->containing_oneof()->index();
-        // Only swap the oneof field once.
-        if (swapped_oneof.find(oneof_index) != swapped_oneof.end()) {
-          continue;
-        }
-        swapped_oneof.insert(oneof_index);
-        SwapOneofField<unsafe_shallow_swap>(message1, message2,
-                                            field->containing_oneof());
-      } else {
-        // Swap field.
-        if (unsafe_shallow_swap) {
-          UnsafeShallowSwapField(message1, message2, field);
-        } else {
-          SwapField(message1, message2, field);
-        }
-        // Swap has bit for non-repeated fields.  We have already checked for
-        // oneof already. This has to be done after SwapField, because SwapField
-        // may depend on the information in has bits.
-        if (!field->is_repeated()) {
-          SwapBit(message1, message2, field);
-          if (field->options().ctype() == FieldOptions::STRING &&
-              IsInlined(field)) {
-            GOOGLE_DCHECK(!unsafe_shallow_swap ||
-                   message1->GetArenaForAllocation() ==
-                       message2->GetArenaForAllocation());
-            SwapInlinedStringDonated(message1, message2, field);
-          }
-        }
-      }
-    }
-  }
-}
-
-void Reflection::SwapFields(
-    Message* message1, Message* message2,
-    const std::vector<const FieldDescriptor*>& fields) const {
-  SwapFieldsImpl<false>(message1, message2, fields);
-}
-
-void Reflection::UnsafeShallowSwapFields(
-    Message* message1, Message* message2,
-    const std::vector<const FieldDescriptor*>& fields) const {
-  SwapFieldsImpl<true>(message1, message2, fields);
-}
-
-void Reflection::UnsafeArenaSwapFields(
-    Message* lhs, Message* rhs,
-    const std::vector<const FieldDescriptor*>& fields) const {
-  GOOGLE_DCHECK_EQ(lhs->GetArenaForAllocation(), rhs->GetArenaForAllocation());
-  UnsafeShallowSwapFields(lhs, rhs, fields);
-}
-
-// -------------------------------------------------------------------
-
-bool Reflection::HasField(const Message& message,
-                          const FieldDescriptor* field) const {
-  USAGE_CHECK_MESSAGE_TYPE(HasField);
-  USAGE_CHECK_SINGULAR(HasField);
-  CheckInvalidAccess(schema_, field);
-
-  if (field->is_extension()) {
-    return GetExtensionSet(message).Has(field->number());
-  } else {
-    if (schema_.InRealOneof(field)) {
-      return HasOneofField(message, field);
-    } else {
-      return HasBit(message, field);
-    }
-  }
-}
-
-void Reflection::UnsafeArenaSwap(Message* lhs, Message* rhs) const {
-  if (lhs == rhs) return;
-
-  MutableInternalMetadata(lhs)->InternalSwap(MutableInternalMetadata(rhs));
-
-  for (int i = 0; i <= last_non_weak_field_index_; i++) {
-    const FieldDescriptor* field = descriptor_->field(i);
-    if (schema_.InRealOneof(field)) continue;
-    if (schema_.IsFieldStripped(field)) continue;
-    UnsafeShallowSwapField(lhs, rhs, field);
-  }
-  const int oneof_decl_count = descriptor_->oneof_decl_count();
-  for (int i = 0; i < oneof_decl_count; i++) {
-    const OneofDescriptor* oneof = descriptor_->oneof_decl(i);
-    if (!oneof->is_synthetic()) {
-      SwapOneofField<true>(lhs, rhs, oneof);
-    }
-  }
-
-  // Swapping bits need to happen after swapping fields, because the latter may
-  // depend on the has bit information.
-  if (schema_.HasHasbits()) {
-    uint32_t* lhs_has_bits = MutableHasBits(lhs);
-    uint32_t* rhs_has_bits = MutableHasBits(rhs);
-
-    int fields_with_has_bits = 0;
-    for (int i = 0; i < descriptor_->field_count(); i++) {
-      const FieldDescriptor* field = descriptor_->field(i);
-      if (field->is_repeated() || schema_.InRealOneof(field)) {
-        continue;
-      }
-      fields_with_has_bits++;
-    }
-
-    int has_bits_size = (fields_with_has_bits + 31) / 32;
-
-    for (int i = 0; i < has_bits_size; i++) {
-      std::swap(lhs_has_bits[i], rhs_has_bits[i]);
-    }
-  }
-
-  if (schema_.HasInlinedString()) {
-    uint32_t* lhs_donated_array = MutableInlinedStringDonatedArray(lhs);
-    uint32_t* rhs_donated_array = MutableInlinedStringDonatedArray(rhs);
-    int inlined_string_count = 0;
-    for (int i = 0; i < descriptor_->field_count(); i++) {
-      const FieldDescriptor* field = descriptor_->field(i);
-      if (field->is_extension() || field->is_repeated() ||
-          schema_.InRealOneof(field) ||
-          field->options().ctype() != FieldOptions::STRING ||
-          !IsInlined(field)) {
-        continue;
-      }
-      inlined_string_count++;
-    }
-
-    int donated_array_size = inlined_string_count == 0
-                                 ? 0
-                                 // One extra bit for the arena dtor tracking.
-                                 : (inlined_string_count + 1 + 31) / 32;
-    GOOGLE_CHECK_EQ((lhs_donated_array[0] & 0x1u) == 0,
-             (rhs_donated_array[0] & 0x1u) == 0);
-    for (int i = 0; i < donated_array_size; i++) {
-      std::swap(lhs_donated_array[i], rhs_donated_array[i]);
-    }
-  }
-
-  if (schema_.HasExtensionSet()) {
-    MutableExtensionSet(lhs)->InternalSwap(MutableExtensionSet(rhs));
-  }
-}
-
-int Reflection::FieldSize(const Message& message,
-                          const FieldDescriptor* field) const {
-  USAGE_CHECK_MESSAGE_TYPE(FieldSize);
-  USAGE_CHECK_REPEATED(FieldSize);
-  CheckInvalidAccess(schema_, field);
-
-  if (field->is_extension()) {
-    return GetExtensionSet(message).ExtensionSize(field->number());
-  } else {
-    switch (field->cpp_type()) {
-#define HANDLE_TYPE(UPPERCASE, LOWERCASE)    \
-  case FieldDescriptor::CPPTYPE_##UPPERCASE: \
-    return GetRaw<RepeatedField<LOWERCASE> >(message, field).size()
-
-      HANDLE_TYPE(INT32, int32_t);
-      HANDLE_TYPE(INT64, int64_t);
-      HANDLE_TYPE(UINT32, uint32_t);
-      HANDLE_TYPE(UINT64, uint64_t);
-      HANDLE_TYPE(DOUBLE, double);
-      HANDLE_TYPE(FLOAT, float);
-      HANDLE_TYPE(BOOL, bool);
-      HANDLE_TYPE(ENUM, int);
-#undef HANDLE_TYPE
-
-      case FieldDescriptor::CPPTYPE_STRING:
-      case FieldDescriptor::CPPTYPE_MESSAGE:
-        if (IsMapFieldInApi(field)) {
-          const internal::MapFieldBase& map =
-              GetRaw<MapFieldBase>(message, field);
-          if (map.IsRepeatedFieldValid()) {
-            return map.GetRepeatedField().size();
-          } else {
-            // No need to materialize the repeated field if it is out of sync:
-            // its size will be the same as the map's size.
-            return map.size();
-          }
-        } else {
-          return GetRaw<RepeatedPtrFieldBase>(message, field).size();
-        }
-    }
-
-    GOOGLE_LOG(FATAL) << "Can't get here.";
-    return 0;
-  }
-}
-
-void Reflection::ClearField(Message* message,
-                            const FieldDescriptor* field) const {
-  USAGE_CHECK_MESSAGE_TYPE(ClearField);
-  CheckInvalidAccess(schema_, field);
-
-  if (field->is_extension()) {
-    MutableExtensionSet(message)->ClearExtension(field->number());
-  } else if (!field->is_repeated()) {
-    if (schema_.InRealOneof(field)) {
-      ClearOneofField(message, field);
-      return;
-    }
-    if (HasBit(*message, field)) {
-      ClearBit(message, field);
-
-      // We need to set the field back to its default value.
-      switch (field->cpp_type()) {
-#define CLEAR_TYPE(CPPTYPE, TYPE)                                      \
-  case FieldDescriptor::CPPTYPE_##CPPTYPE:                             \
-    *MutableRaw<TYPE>(message, field) = field->default_value_##TYPE(); \
-    break;
-
-        CLEAR_TYPE(INT32, int32_t);
-        CLEAR_TYPE(INT64, int64_t);
-        CLEAR_TYPE(UINT32, uint32_t);
-        CLEAR_TYPE(UINT64, uint64_t);
-        CLEAR_TYPE(FLOAT, float);
-        CLEAR_TYPE(DOUBLE, double);
-        CLEAR_TYPE(BOOL, bool);
-#undef CLEAR_TYPE
-
-        case FieldDescriptor::CPPTYPE_ENUM:
-          *MutableRaw<int>(message, field) =
-              field->default_value_enum()->number();
-          break;
-
-        case FieldDescriptor::CPPTYPE_STRING: {
-          switch (field->options().ctype()) {
-            default:  // TODO(kenton):  Support other string reps.
-            case FieldOptions::STRING:
-              if (IsInlined(field)) {
-                // Currently, string with default value can't be inlined. So we
-                // don't have to handle default value here.
-                MutableRaw<InlinedStringField>(message, field)->ClearToEmpty();
-              } else {
-                auto* str = MutableRaw<ArenaStringPtr>(message, field);
-                str->Destroy();
-                str->InitDefault();
-              }
-              break;
-          }
-          break;
-        }
-
-        case FieldDescriptor::CPPTYPE_MESSAGE:
-          if (schema_.HasBitIndex(field) == static_cast<uint32_t>(-1)) {
-            // Proto3 does not have has-bits and we need to set a message field
-            // to nullptr in order to indicate its un-presence.
-            if (message->GetArenaForAllocation() == nullptr) {
-              delete *MutableRaw<Message*>(message, field);
-            }
-            *MutableRaw<Message*>(message, field) = nullptr;
-          } else {
-            (*MutableRaw<Message*>(message, field))->Clear();
-          }
-          break;
-      }
-    }
-  } else {
-    switch (field->cpp_type()) {
-#define HANDLE_TYPE(UPPERCASE, LOWERCASE)                           \
-  case FieldDescriptor::CPPTYPE_##UPPERCASE:                        \
-    MutableRaw<RepeatedField<LOWERCASE> >(message, field)->Clear(); \
-    break
-
-      HANDLE_TYPE(INT32, int32_t);
-      HANDLE_TYPE(INT64, int64_t);
-      HANDLE_TYPE(UINT32, uint32_t);
-      HANDLE_TYPE(UINT64, uint64_t);
-      HANDLE_TYPE(DOUBLE, double);
-      HANDLE_TYPE(FLOAT, float);
-      HANDLE_TYPE(BOOL, bool);
-      HANDLE_TYPE(ENUM, int);
-#undef HANDLE_TYPE
-
-      case FieldDescriptor::CPPTYPE_STRING: {
-        switch (field->options().ctype()) {
-          default:  // TODO(kenton):  Support other string reps.
-          case FieldOptions::STRING:
-            MutableRaw<RepeatedPtrField<std::string> >(message, field)->Clear();
-            break;
-        }
-        break;
-      }
-
-      case FieldDescriptor::CPPTYPE_MESSAGE: {
-        if (IsMapFieldInApi(field)) {
-          MutableRaw<MapFieldBase>(message, field)->Clear();
-        } else {
-          // We don't know which subclass of RepeatedPtrFieldBase the type is,
-          // so we use RepeatedPtrFieldBase directly.
-          MutableRaw<RepeatedPtrFieldBase>(message, field)
-              ->Clear<GenericTypeHandler<Message> >();
-        }
-        break;
-      }
-    }
-  }
-}
-
-void Reflection::RemoveLast(Message* message,
-                            const FieldDescriptor* field) const {
-  USAGE_CHECK_MESSAGE_TYPE(RemoveLast);
-  USAGE_CHECK_REPEATED(RemoveLast);
-  CheckInvalidAccess(schema_, field);
-
-  if (field->is_extension()) {
-    MutableExtensionSet(message)->RemoveLast(field->number());
-  } else {
-    switch (field->cpp_type()) {
-#define HANDLE_TYPE(UPPERCASE, LOWERCASE)                                \
-  case FieldDescriptor::CPPTYPE_##UPPERCASE:                             \
-    MutableRaw<RepeatedField<LOWERCASE> >(message, field)->RemoveLast(); \
-    break
-
-      HANDLE_TYPE(INT32, int32_t);
-      HANDLE_TYPE(INT64, int64_t);
-      HANDLE_TYPE(UINT32, uint32_t);
-      HANDLE_TYPE(UINT64, uint64_t);
-      HANDLE_TYPE(DOUBLE, double);
-      HANDLE_TYPE(FLOAT, float);
-      HANDLE_TYPE(BOOL, bool);
-      HANDLE_TYPE(ENUM, int);
-#undef HANDLE_TYPE
-
-      case FieldDescriptor::CPPTYPE_STRING:
-        switch (field->options().ctype()) {
-          default:  // TODO(kenton):  Support other string reps.
-          case FieldOptions::STRING:
-            MutableRaw<RepeatedPtrField<std::string> >(message, field)
-                ->RemoveLast();
-            break;
-        }
-        break;
-
-      case FieldDescriptor::CPPTYPE_MESSAGE:
-        if (IsMapFieldInApi(field)) {
-          MutableRaw<MapFieldBase>(message, field)
-              ->MutableRepeatedField()
-              ->RemoveLast<GenericTypeHandler<Message> >();
-        } else {
-          MutableRaw<RepeatedPtrFieldBase>(message, field)
-              ->RemoveLast<GenericTypeHandler<Message> >();
-        }
-        break;
-    }
-  }
-}
-
-Message* Reflection::ReleaseLast(Message* message,
-                                 const FieldDescriptor* field) const {
-  USAGE_CHECK_ALL(ReleaseLast, REPEATED, MESSAGE);
-  CheckInvalidAccess(schema_, field);
-
-  Message* released;
-  if (field->is_extension()) {
-    released = static_cast<Message*>(
-        MutableExtensionSet(message)->ReleaseLast(field->number()));
-  } else {
-    if (IsMapFieldInApi(field)) {
-      released = MutableRaw<MapFieldBase>(message, field)
-                     ->MutableRepeatedField()
-                     ->ReleaseLast<GenericTypeHandler<Message>>();
-    } else {
-      released = MutableRaw<RepeatedPtrFieldBase>(message, field)
-                     ->ReleaseLast<GenericTypeHandler<Message>>();
-    }
-  }
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  return MaybeForceCopy(message->GetArenaForAllocation(), released);
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-}
-
-Message* Reflection::UnsafeArenaReleaseLast(
-    Message* message, const FieldDescriptor* field) const {
-  USAGE_CHECK_ALL(UnsafeArenaReleaseLast, REPEATED, MESSAGE);
-  CheckInvalidAccess(schema_, field);
-
-  if (field->is_extension()) {
-    return static_cast<Message*>(
-        MutableExtensionSet(message)->UnsafeArenaReleaseLast(field->number()));
-  } else {
-    if (IsMapFieldInApi(field)) {
-      return MutableRaw<MapFieldBase>(message, field)
-          ->MutableRepeatedField()
-          ->UnsafeArenaReleaseLast<GenericTypeHandler<Message>>();
-    } else {
-      return MutableRaw<RepeatedPtrFieldBase>(message, field)
-          ->UnsafeArenaReleaseLast<GenericTypeHandler<Message>>();
-    }
-  }
-}
-
-void Reflection::SwapElements(Message* message, const FieldDescriptor* field,
-                              int index1, int index2) const {
-  USAGE_CHECK_MESSAGE_TYPE(Swap);
-  USAGE_CHECK_REPEATED(Swap);
-  CheckInvalidAccess(schema_, field);
-
-  if (field->is_extension()) {
-    MutableExtensionSet(message)->SwapElements(field->number(), index1, index2);
-  } else {
-    switch (field->cpp_type()) {
-#define HANDLE_TYPE(UPPERCASE, LOWERCASE)                 \
-  case FieldDescriptor::CPPTYPE_##UPPERCASE:              \
-    MutableRaw<RepeatedField<LOWERCASE> >(message, field) \
-        ->SwapElements(index1, index2);                   \
-    break
-
-      HANDLE_TYPE(INT32, int32_t);
-      HANDLE_TYPE(INT64, int64_t);
-      HANDLE_TYPE(UINT32, uint32_t);
-      HANDLE_TYPE(UINT64, uint64_t);
-      HANDLE_TYPE(DOUBLE, double);
-      HANDLE_TYPE(FLOAT, float);
-      HANDLE_TYPE(BOOL, bool);
-      HANDLE_TYPE(ENUM, int);
-#undef HANDLE_TYPE
-
-      case FieldDescriptor::CPPTYPE_STRING:
-      case FieldDescriptor::CPPTYPE_MESSAGE:
-        if (IsMapFieldInApi(field)) {
-          MutableRaw<MapFieldBase>(message, field)
-              ->MutableRepeatedField()
-              ->SwapElements(index1, index2);
-        } else {
-          MutableRaw<RepeatedPtrFieldBase>(message, field)
-              ->SwapElements(index1, index2);
-        }
-        break;
-    }
-  }
-}
-
-namespace {
-// Comparison functor for sorting FieldDescriptors by field number.
-struct FieldNumberSorter {
-  bool operator()(const FieldDescriptor* left,
-                  const FieldDescriptor* right) const {
-    return left->number() < right->number();
-  }
-};
-
-bool IsIndexInHasBitSet(const uint32_t* has_bit_set, uint32_t has_bit_index) {
-  GOOGLE_DCHECK_NE(has_bit_index, ~0u);
-  return ((has_bit_set[has_bit_index / 32] >> (has_bit_index % 32)) &
-          static_cast<uint32_t>(1)) != 0;
-}
-
-bool CreateUnknownEnumValues(const FileDescriptor* file) {
-  return file->syntax() == FileDescriptor::SYNTAX_PROTO3;
-}
-}  // namespace
-
-namespace internal {
-bool CreateUnknownEnumValues(const FieldDescriptor* field) {
-  bool open_enum = false;
-  return field->file()->syntax() == FileDescriptor::SYNTAX_PROTO3 || open_enum;
-}
-}  // namespace internal
-using internal::CreateUnknownEnumValues;
-
-void Reflection::ListFieldsMayFailOnStripped(
-    const Message& message, bool should_fail,
-    std::vector<const FieldDescriptor*>* output) const {
-  output->clear();
-
-  // Optimization:  The default instance never has any fields set.
-  if (schema_.IsDefaultInstance(message)) return;
-
-  // Optimization: Avoid calling GetHasBits() and HasOneofField() many times
-  // within the field loop.  We allow this violation of ReflectionSchema
-  // encapsulation because this function takes a noticeable about of CPU
-  // fleetwide and properly allowing this optimization through public interfaces
-  // seems more trouble than it is worth.
-  const uint32_t* const has_bits =
-      schema_.HasHasbits() ? GetHasBits(message) : nullptr;
-  const uint32_t* const has_bits_indices = schema_.has_bit_indices_;
-  output->reserve(descriptor_->field_count());
-  const int last_non_weak_field_index = last_non_weak_field_index_;
-  for (int i = 0; i <= last_non_weak_field_index; i++) {
-    const FieldDescriptor* field = descriptor_->field(i);
-    if (!should_fail && schema_.IsFieldStripped(field)) {
-      continue;
-    }
-    if (field->is_repeated()) {
-      if (FieldSize(message, field) > 0) {
-        output->push_back(field);
-      }
-    } else {
-      const OneofDescriptor* containing_oneof = field->containing_oneof();
-      if (schema_.InRealOneof(field)) {
-        const uint32_t* const oneof_case_array =
-            GetConstPointerAtOffset<uint32_t>(&message,
-                                              schema_.oneof_case_offset_);
-        // Equivalent to: HasOneofField(message, field)
-        if (static_cast<int64_t>(oneof_case_array[containing_oneof->index()]) ==
-            field->number()) {
-          output->push_back(field);
-        }
-      } else if (has_bits && has_bits_indices[i] != static_cast<uint32_t>(-1)) {
-        CheckInvalidAccess(schema_, field);
-        // Equivalent to: HasBit(message, field)
-        if (IsIndexInHasBitSet(has_bits, has_bits_indices[i])) {
-          output->push_back(field);
-        }
-      } else if (HasBit(message, field)) {  // Fall back on proto3-style HasBit.
-        output->push_back(field);
-      }
-    }
-  }
-  if (schema_.HasExtensionSet()) {
-    GetExtensionSet(message).AppendToList(descriptor_, descriptor_pool_,
-                                          output);
-  }
-
-  // ListFields() must sort output by field number.
-  std::sort(output->begin(), output->end(), FieldNumberSorter());
-}
-
-void Reflection::ListFields(const Message& message,
-                            std::vector<const FieldDescriptor*>* output) const {
-  ListFieldsMayFailOnStripped(message, true, output);
-}
-
-void Reflection::ListFieldsOmitStripped(
-    const Message& message, std::vector<const FieldDescriptor*>* output) const {
-  ListFieldsMayFailOnStripped(message, false, output);
-}
-
-// -------------------------------------------------------------------
-
-#undef DEFINE_PRIMITIVE_ACCESSORS
-#define DEFINE_PRIMITIVE_ACCESSORS(TYPENAME, TYPE, PASSTYPE, CPPTYPE)          \
-  PASSTYPE Reflection::Get##TYPENAME(const Message& message,                   \
-                                     const FieldDescriptor* field) const {     \
-    USAGE_CHECK_ALL(Get##TYPENAME, SINGULAR, CPPTYPE);                         \
-    if (field->is_extension()) {                                               \
-      return GetExtensionSet(message).Get##TYPENAME(                           \
-          field->number(), field->default_value_##PASSTYPE());                 \
-    } else if (schema_.InRealOneof(field) && !HasOneofField(message, field)) { \
-      return field->default_value_##PASSTYPE();                                \
-    } else {                                                                   \
-      return GetField<TYPE>(message, field);                                   \
-    }                                                                          \
-  }                                                                            \
-                                                                               \
-  void Reflection::Set##TYPENAME(                                              \
-      Message* message, const FieldDescriptor* field, PASSTYPE value) const {  \
-    USAGE_CHECK_ALL(Set##TYPENAME, SINGULAR, CPPTYPE);                         \
-    if (field->is_extension()) {                                               \
-      return MutableExtensionSet(message)->Set##TYPENAME(                      \
-          field->number(), field->type(), value, field);                       \
-    } else {                                                                   \
-      SetField<TYPE>(message, field, value);                                   \
-    }                                                                          \
-  }                                                                            \
-                                                                               \
-  PASSTYPE Reflection::GetRepeated##TYPENAME(                                  \
-      const Message& message, const FieldDescriptor* field, int index) const { \
-    USAGE_CHECK_ALL(GetRepeated##TYPENAME, REPEATED, CPPTYPE);                 \
-    if (field->is_extension()) {                                               \
-      return GetExtensionSet(message).GetRepeated##TYPENAME(field->number(),   \
-                                                            index);            \
-    } else {                                                                   \
-      return GetRepeatedField<TYPE>(message, field, index);                    \
-    }                                                                          \
-  }                                                                            \
-                                                                               \
-  void Reflection::SetRepeated##TYPENAME(Message* message,                     \
-                                         const FieldDescriptor* field,         \
-                                         int index, PASSTYPE value) const {    \
-    USAGE_CHECK_ALL(SetRepeated##TYPENAME, REPEATED, CPPTYPE);                 \
-    if (field->is_extension()) {                                               \
-      MutableExtensionSet(message)->SetRepeated##TYPENAME(field->number(),     \
-                                                          index, value);       \
-    } else {                                                                   \
-      SetRepeatedField<TYPE>(message, field, index, value);                    \
-    }                                                                          \
-  }                                                                            \
-                                                                               \
-  void Reflection::Add##TYPENAME(                                              \
-      Message* message, const FieldDescriptor* field, PASSTYPE value) const {  \
-    USAGE_CHECK_ALL(Add##TYPENAME, REPEATED, CPPTYPE);                         \
-    if (field->is_extension()) {                                               \
-      MutableExtensionSet(message)->Add##TYPENAME(                             \
-          field->number(), field->type(), field->options().packed(), value,    \
-          field);                                                              \
-    } else {                                                                   \
-      AddField<TYPE>(message, field, value);                                   \
-    }                                                                          \
-  }
-
-DEFINE_PRIMITIVE_ACCESSORS(Int32, int32_t, int32_t, INT32)
-DEFINE_PRIMITIVE_ACCESSORS(Int64, int64_t, int64_t, INT64)
-DEFINE_PRIMITIVE_ACCESSORS(UInt32, uint32_t, uint32_t, UINT32)
-DEFINE_PRIMITIVE_ACCESSORS(UInt64, uint64_t, uint64_t, UINT64)
-DEFINE_PRIMITIVE_ACCESSORS(Float, float, float, FLOAT)
-DEFINE_PRIMITIVE_ACCESSORS(Double, double, double, DOUBLE)
-DEFINE_PRIMITIVE_ACCESSORS(Bool, bool, bool, BOOL)
-#undef DEFINE_PRIMITIVE_ACCESSORS
-
-// -------------------------------------------------------------------
-
-std::string Reflection::GetString(const Message& message,
-                                  const FieldDescriptor* field) const {
-  USAGE_CHECK_ALL(GetString, SINGULAR, STRING);
-  if (field->is_extension()) {
-    return GetExtensionSet(message).GetString(field->number(),
-                                              field->default_value_string());
-  } else {
-    if (schema_.InRealOneof(field) && !HasOneofField(message, field)) {
-      return field->default_value_string();
-    }
-    switch (field->options().ctype()) {
-      default:  // TODO(kenton):  Support other string reps.
-      case FieldOptions::STRING:
-        if (IsInlined(field)) {
-          return GetField<InlinedStringField>(message, field).GetNoArena();
-        } else {
-          const auto& str = GetField<ArenaStringPtr>(message, field);
-          return str.IsDefault() ? field->default_value_string() : str.Get();
-        }
-    }
-  }
-}
-
-const std::string& Reflection::GetStringReference(const Message& message,
-                                                  const FieldDescriptor* field,
-                                                  std::string* scratch) const {
-  (void)scratch;  // Parameter is used by Google-internal code.
-  USAGE_CHECK_ALL(GetStringReference, SINGULAR, STRING);
-  if (field->is_extension()) {
-    return GetExtensionSet(message).GetString(field->number(),
-                                              field->default_value_string());
-  } else {
-    if (schema_.InRealOneof(field) && !HasOneofField(message, field)) {
-      return field->default_value_string();
-    }
-    switch (field->options().ctype()) {
-      default:  // TODO(kenton):  Support other string reps.
-      case FieldOptions::STRING:
-        if (IsInlined(field)) {
-          return GetField<InlinedStringField>(message, field).GetNoArena();
-        } else {
-          const auto& str = GetField<ArenaStringPtr>(message, field);
-          return str.IsDefault() ? field->default_value_string() : str.Get();
-        }
-    }
-  }
-}
-
-
-void Reflection::SetString(Message* message, const FieldDescriptor* field,
-                           std::string value) const {
-  USAGE_CHECK_ALL(SetString, SINGULAR, STRING);
-  if (field->is_extension()) {
-    return MutableExtensionSet(message)->SetString(
-        field->number(), field->type(), std::move(value), field);
-  } else {
-    switch (field->options().ctype()) {
-      default:  // TODO(kenton):  Support other string reps.
-      case FieldOptions::STRING: {
-        if (IsInlined(field)) {
-          const uint32_t index = schema_.InlinedStringIndex(field);
-          GOOGLE_DCHECK_GT(index, 0);
-          uint32_t* states =
-              &MutableInlinedStringDonatedArray(message)[index / 32];
-          uint32_t mask = ~(static_cast<uint32_t>(1) << (index % 32));
-          MutableField<InlinedStringField>(message, field)
-              ->Set(value, message->GetArenaForAllocation(),
-                    IsInlinedStringDonated(*message, field), states, mask,
-                    message);
-          break;
-        }
-
-        // Oneof string fields are never set as a default instance.
-        // We just need to pass some arbitrary default string to make it work.
-        // This allows us to not have the real default accessible from
-        // reflection.
-        if (schema_.InRealOneof(field) && !HasOneofField(*message, field)) {
-          ClearOneof(message, field->containing_oneof());
-          MutableField<ArenaStringPtr>(message, field)->InitDefault();
-        }
-        MutableField<ArenaStringPtr>(message, field)
-            ->Set(std::move(value), message->GetArenaForAllocation());
-        break;
-      }
-    }
-  }
-}
-
-
-std::string Reflection::GetRepeatedString(const Message& message,
-                                          const FieldDescriptor* field,
-                                          int index) const {
-  USAGE_CHECK_ALL(GetRepeatedString, REPEATED, STRING);
-  if (field->is_extension()) {
-    return GetExtensionSet(message).GetRepeatedString(field->number(), index);
-  } else {
-    switch (field->options().ctype()) {
-      default:  // TODO(kenton):  Support other string reps.
-      case FieldOptions::STRING:
-        return GetRepeatedPtrField<std::string>(message, field, index);
-    }
-  }
-}
-
-const std::string& Reflection::GetRepeatedStringReference(
-    const Message& message, const FieldDescriptor* field, int index,
-    std::string* scratch) const {
-  (void)scratch;  // Parameter is used by Google-internal code.
-  USAGE_CHECK_ALL(GetRepeatedStringReference, REPEATED, STRING);
-  if (field->is_extension()) {
-    return GetExtensionSet(message).GetRepeatedString(field->number(), index);
-  } else {
-    switch (field->options().ctype()) {
-      default:  // TODO(kenton):  Support other string reps.
-      case FieldOptions::STRING:
-        return GetRepeatedPtrField<std::string>(message, field, index);
-    }
-  }
-}
-
-
-void Reflection::SetRepeatedString(Message* message,
-                                   const FieldDescriptor* field, int index,
-                                   std::string value) const {
-  USAGE_CHECK_ALL(SetRepeatedString, REPEATED, STRING);
-  if (field->is_extension()) {
-    MutableExtensionSet(message)->SetRepeatedString(field->number(), index,
-                                                    std::move(value));
-  } else {
-    switch (field->options().ctype()) {
-      default:  // TODO(kenton):  Support other string reps.
-      case FieldOptions::STRING:
-        MutableRepeatedField<std::string>(message, field, index)
-            ->assign(std::move(value));
-        break;
-    }
-  }
-}
-
-
-void Reflection::AddString(Message* message, const FieldDescriptor* field,
-                           std::string value) const {
-  USAGE_CHECK_ALL(AddString, REPEATED, STRING);
-  if (field->is_extension()) {
-    MutableExtensionSet(message)->AddString(field->number(), field->type(),
-                                            std::move(value), field);
-  } else {
-    switch (field->options().ctype()) {
-      default:  // TODO(kenton):  Support other string reps.
-      case FieldOptions::STRING:
-        AddField<std::string>(message, field)->assign(std::move(value));
-        break;
-    }
-  }
-}
-
-
-// -------------------------------------------------------------------
-
-const EnumValueDescriptor* Reflection::GetEnum(
-    const Message& message, const FieldDescriptor* field) const {
-  // Usage checked by GetEnumValue.
-  int value = GetEnumValue(message, field);
-  return field->enum_type()->FindValueByNumberCreatingIfUnknown(value);
-}
-
-int Reflection::GetEnumValue(const Message& message,
-                             const FieldDescriptor* field) const {
-  USAGE_CHECK_ALL(GetEnumValue, SINGULAR, ENUM);
-
-  int32_t value;
-  if (field->is_extension()) {
-    value = GetExtensionSet(message).GetEnum(
-        field->number(), field->default_value_enum()->number());
-  } else if (schema_.InRealOneof(field) && !HasOneofField(message, field)) {
-    value = field->default_value_enum()->number();
-  } else {
-    value = GetField<int>(message, field);
-  }
-  return value;
-}
-
-void Reflection::SetEnum(Message* message, const FieldDescriptor* field,
-                         const EnumValueDescriptor* value) const {
-  // Usage checked by SetEnumValue.
-  USAGE_CHECK_ENUM_VALUE(SetEnum);
-  SetEnumValueInternal(message, field, value->number());
-}
-
-void Reflection::SetEnumValue(Message* message, const FieldDescriptor* field,
-                              int value) const {
-  USAGE_CHECK_ALL(SetEnumValue, SINGULAR, ENUM);
-  if (!CreateUnknownEnumValues(field)) {
-    // Check that the value is valid if we don't support direct storage of
-    // unknown enum values.
-    const EnumValueDescriptor* value_desc =
-        field->enum_type()->FindValueByNumber(value);
-    if (value_desc == nullptr) {
-      MutableUnknownFields(message)->AddVarint(field->number(), value);
-      return;
-    }
-  }
-  SetEnumValueInternal(message, field, value);
-}
-
-void Reflection::SetEnumValueInternal(Message* message,
-                                      const FieldDescriptor* field,
-                                      int value) const {
-  if (field->is_extension()) {
-    MutableExtensionSet(message)->SetEnum(field->number(), field->type(), value,
-                                          field);
-  } else {
-    SetField<int>(message, field, value);
-  }
-}
-
-const EnumValueDescriptor* Reflection::GetRepeatedEnum(
-    const Message& message, const FieldDescriptor* field, int index) const {
-  // Usage checked by GetRepeatedEnumValue.
-  int value = GetRepeatedEnumValue(message, field, index);
-  return field->enum_type()->FindValueByNumberCreatingIfUnknown(value);
-}
-
-int Reflection::GetRepeatedEnumValue(const Message& message,
-                                     const FieldDescriptor* field,
-                                     int index) const {
-  USAGE_CHECK_ALL(GetRepeatedEnumValue, REPEATED, ENUM);
-
-  int value;
-  if (field->is_extension()) {
-    value = GetExtensionSet(message).GetRepeatedEnum(field->number(), index);
-  } else {
-    value = GetRepeatedField<int>(message, field, index);
-  }
-  return value;
-}
-
-void Reflection::SetRepeatedEnum(Message* message, const FieldDescriptor* field,
-                                 int index,
-                                 const EnumValueDescriptor* value) const {
-  // Usage checked by SetRepeatedEnumValue.
-  USAGE_CHECK_ENUM_VALUE(SetRepeatedEnum);
-  SetRepeatedEnumValueInternal(message, field, index, value->number());
-}
-
-void Reflection::SetRepeatedEnumValue(Message* message,
-                                      const FieldDescriptor* field, int index,
-                                      int value) const {
-  USAGE_CHECK_ALL(SetRepeatedEnum, REPEATED, ENUM);
-  if (!CreateUnknownEnumValues(field)) {
-    // Check that the value is valid if we don't support direct storage of
-    // unknown enum values.
-    const EnumValueDescriptor* value_desc =
-        field->enum_type()->FindValueByNumber(value);
-    if (value_desc == nullptr) {
-      MutableUnknownFields(message)->AddVarint(field->number(), value);
-      return;
-    }
-  }
-  SetRepeatedEnumValueInternal(message, field, index, value);
-}
-
-void Reflection::SetRepeatedEnumValueInternal(Message* message,
-                                              const FieldDescriptor* field,
-                                              int index, int value) const {
-  if (field->is_extension()) {
-    MutableExtensionSet(message)->SetRepeatedEnum(field->number(), index,
-                                                  value);
-  } else {
-    SetRepeatedField<int>(message, field, index, value);
-  }
-}
-
-void Reflection::AddEnum(Message* message, const FieldDescriptor* field,
-                         const EnumValueDescriptor* value) const {
-  // Usage checked by AddEnumValue.
-  USAGE_CHECK_ENUM_VALUE(AddEnum);
-  AddEnumValueInternal(message, field, value->number());
-}
-
-void Reflection::AddEnumValue(Message* message, const FieldDescriptor* field,
-                              int value) const {
-  USAGE_CHECK_ALL(AddEnum, REPEATED, ENUM);
-  if (!CreateUnknownEnumValues(field)) {
-    // Check that the value is valid if we don't support direct storage of
-    // unknown enum values.
-    const EnumValueDescriptor* value_desc =
-        field->enum_type()->FindValueByNumber(value);
-    if (value_desc == nullptr) {
-      MutableUnknownFields(message)->AddVarint(field->number(), value);
-      return;
-    }
-  }
-  AddEnumValueInternal(message, field, value);
-}
-
-void Reflection::AddEnumValueInternal(Message* message,
-                                      const FieldDescriptor* field,
-                                      int value) const {
-  if (field->is_extension()) {
-    MutableExtensionSet(message)->AddEnum(field->number(), field->type(),
-                                          field->options().packed(), value,
-                                          field);
-  } else {
-    AddField<int>(message, field, value);
-  }
-}
-
-// -------------------------------------------------------------------
-
-const Message* Reflection::GetDefaultMessageInstance(
-    const FieldDescriptor* field) const {
-  // If we are using the generated factory, we cache the prototype in the field
-  // descriptor for faster access.
-  // The default instances of generated messages are not cross-linked, which
-  // means they contain null pointers on their message fields and can't be used
-  // to get the default of submessages.
-  if (message_factory_ == MessageFactory::generated_factory()) {
-    auto& ptr = field->default_generated_instance_;
-    auto* res = ptr.load(std::memory_order_acquire);
-    if (res == nullptr) {
-      // First time asking for this field's default. Load it and cache it.
-      res = message_factory_->GetPrototype(field->message_type());
-      ptr.store(res, std::memory_order_release);
-    }
-    return res;
-  }
-
-  // For other factories, we try the default's object field.
-  // In particular, the DynamicMessageFactory will cross link the default
-  // instances to allow for this. But only do this for real fields.
-  // This is an optimization to avoid going to GetPrototype() below, as that
-  // requires a lock and a map lookup.
-  if (!field->is_extension() && !field->options().weak() &&
-      !IsLazyField(field) && !schema_.InRealOneof(field)) {
-    auto* res = DefaultRaw<const Message*>(field);
-    if (res != nullptr) {
-      return res;
-    }
-  }
-  // Otherwise, just go to the factory.
-  return message_factory_->GetPrototype(field->message_type());
-}
-
-const Message& Reflection::GetMessage(const Message& message,
-                                      const FieldDescriptor* field,
-                                      MessageFactory* factory) const {
-  USAGE_CHECK_ALL(GetMessage, SINGULAR, MESSAGE);
-  CheckInvalidAccess(schema_, field);
-
-  if (factory == nullptr) factory = message_factory_;
-
-  if (field->is_extension()) {
-    return static_cast<const Message&>(GetExtensionSet(message).GetMessage(
-        field->number(), field->message_type(), factory));
-  } else {
-    if (schema_.InRealOneof(field) && !HasOneofField(message, field)) {
-      return *GetDefaultMessageInstance(field);
-    }
-    const Message* result = GetRaw<const Message*>(message, field);
-    if (result == nullptr) {
-      result = GetDefaultMessageInstance(field);
-    }
-    return *result;
-  }
-}
-
-Message* Reflection::MutableMessage(Message* message,
-                                    const FieldDescriptor* field,
-                                    MessageFactory* factory) const {
-  USAGE_CHECK_ALL(MutableMessage, SINGULAR, MESSAGE);
-  CheckInvalidAccess(schema_, field);
-
-  if (factory == nullptr) factory = message_factory_;
-
-  if (field->is_extension()) {
-    return static_cast<Message*>(
-        MutableExtensionSet(message)->MutableMessage(field, factory));
-  } else {
-    Message* result;
-
-    Message** result_holder = MutableRaw<Message*>(message, field);
-
-    if (schema_.InRealOneof(field)) {
-      if (!HasOneofField(*message, field)) {
-        ClearOneof(message, field->containing_oneof());
-        result_holder = MutableField<Message*>(message, field);
-        const Message* default_message = GetDefaultMessageInstance(field);
-        *result_holder = default_message->New(message->GetArenaForAllocation());
-      }
-    } else {
-      SetBit(message, field);
-    }
-
-    if (*result_holder == nullptr) {
-      const Message* default_message = GetDefaultMessageInstance(field);
-      *result_holder = default_message->New(message->GetArenaForAllocation());
-    }
-    result = *result_holder;
-    return result;
-  }
-}
-
-void Reflection::UnsafeArenaSetAllocatedMessage(
-    Message* message, Message* sub_message,
-    const FieldDescriptor* field) const {
-  USAGE_CHECK_ALL(SetAllocatedMessage, SINGULAR, MESSAGE);
-  CheckInvalidAccess(schema_, field);
-
-
-  if (field->is_extension()) {
-    MutableExtensionSet(message)->UnsafeArenaSetAllocatedMessage(
-        field->number(), field->type(), field, sub_message);
-  } else {
-    if (schema_.InRealOneof(field)) {
-      if (sub_message == nullptr) {
-        ClearOneof(message, field->containing_oneof());
-        return;
-      }
-        ClearOneof(message, field->containing_oneof());
-        *MutableRaw<Message*>(message, field) = sub_message;
-      SetOneofCase(message, field);
-      return;
-    }
-
-    if (sub_message == nullptr) {
-      ClearBit(message, field);
-    } else {
-      SetBit(message, field);
-    }
-    Message** sub_message_holder = MutableRaw<Message*>(message, field);
-    if (message->GetArenaForAllocation() == nullptr) {
-      delete *sub_message_holder;
-    }
-    *sub_message_holder = sub_message;
-  }
-}
-
-void Reflection::SetAllocatedMessage(Message* message, Message* sub_message,
-                                     const FieldDescriptor* field) const {
-  GOOGLE_DCHECK(sub_message == nullptr || sub_message->GetOwningArena() == nullptr ||
-         sub_message->GetOwningArena() == message->GetArenaForAllocation());
-  CheckInvalidAccess(schema_, field);
-
-  // If message and sub-message are in different memory ownership domains
-  // (different arenas, or one is on heap and one is not), then we may need to
-  // do a copy.
-  if (sub_message != nullptr &&
-      sub_message->GetOwningArena() != message->GetArenaForAllocation()) {
-    if (sub_message->GetOwningArena() == nullptr &&
-        message->GetArenaForAllocation() != nullptr) {
-      // Case 1: parent is on an arena and child is heap-allocated. We can add
-      // the child to the arena's Own() list to free on arena destruction, then
-      // set our pointer.
-      message->GetArenaForAllocation()->Own(sub_message);
-      UnsafeArenaSetAllocatedMessage(message, sub_message, field);
-    } else {
-      // Case 2: all other cases. We need to make a copy. MutableMessage() will
-      // either get the existing message object, or instantiate a new one as
-      // appropriate w.r.t. our arena.
-      Message* sub_message_copy = MutableMessage(message, field);
-      sub_message_copy->CopyFrom(*sub_message);
-    }
-  } else {
-    // Same memory ownership domains.
-    UnsafeArenaSetAllocatedMessage(message, sub_message, field);
-  }
-}
-
-Message* Reflection::UnsafeArenaReleaseMessage(Message* message,
-                                               const FieldDescriptor* field,
-                                               MessageFactory* factory) const {
-  USAGE_CHECK_ALL(ReleaseMessage, SINGULAR, MESSAGE);
-  CheckInvalidAccess(schema_, field);
-
-  if (factory == nullptr) factory = message_factory_;
-
-  if (field->is_extension()) {
-    return static_cast<Message*>(
-        MutableExtensionSet(message)->UnsafeArenaReleaseMessage(field,
-                                                                factory));
-  } else {
-    if (!(field->is_repeated() || schema_.InRealOneof(field))) {
-      ClearBit(message, field);
-    }
-    if (schema_.InRealOneof(field)) {
-      if (HasOneofField(*message, field)) {
-        *MutableOneofCase(message, field->containing_oneof()) = 0;
-      } else {
-        return nullptr;
-      }
-    }
-    Message** result = MutableRaw<Message*>(message, field);
-    Message* ret = *result;
-    *result = nullptr;
-    return ret;
-  }
-}
-
-Message* Reflection::ReleaseMessage(Message* message,
-                                    const FieldDescriptor* field,
-                                    MessageFactory* factory) const {
-  CheckInvalidAccess(schema_, field);
-
-  Message* released = UnsafeArenaReleaseMessage(message, field, factory);
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  released = MaybeForceCopy(message->GetArenaForAllocation(), released);
-#endif  // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (message->GetArenaForAllocation() != nullptr && released != nullptr) {
-    Message* copy_from_arena = released->New();
-    copy_from_arena->CopyFrom(*released);
-    released = copy_from_arena;
-  }
-  return released;
-}
-
-const Message& Reflection::GetRepeatedMessage(const Message& message,
-                                              const FieldDescriptor* field,
-                                              int index) const {
-  USAGE_CHECK_ALL(GetRepeatedMessage, REPEATED, MESSAGE);
-  CheckInvalidAccess(schema_, field);
-
-  if (field->is_extension()) {
-    return static_cast<const Message&>(
-        GetExtensionSet(message).GetRepeatedMessage(field->number(), index));
-  } else {
-    if (IsMapFieldInApi(field)) {
-      return GetRaw<MapFieldBase>(message, field)
-          .GetRepeatedField()
-          .Get<GenericTypeHandler<Message> >(index);
-    } else {
-      return GetRaw<RepeatedPtrFieldBase>(message, field)
-          .Get<GenericTypeHandler<Message> >(index);
-    }
-  }
-}
-
-Message* Reflection::MutableRepeatedMessage(Message* message,
-                                            const FieldDescriptor* field,
-                                            int index) const {
-  USAGE_CHECK_ALL(MutableRepeatedMessage, REPEATED, MESSAGE);
-  CheckInvalidAccess(schema_, field);
-
-  if (field->is_extension()) {
-    return static_cast<Message*>(
-        MutableExtensionSet(message)->MutableRepeatedMessage(field->number(),
-                                                             index));
-  } else {
-    if (IsMapFieldInApi(field)) {
-      return MutableRaw<MapFieldBase>(message, field)
-          ->MutableRepeatedField()
-          ->Mutable<GenericTypeHandler<Message> >(index);
-    } else {
-      return MutableRaw<RepeatedPtrFieldBase>(message, field)
-          ->Mutable<GenericTypeHandler<Message> >(index);
-    }
-  }
-}
-
-Message* Reflection::AddMessage(Message* message, const FieldDescriptor* field,
-                                MessageFactory* factory) const {
-  USAGE_CHECK_ALL(AddMessage, REPEATED, MESSAGE);
-  CheckInvalidAccess(schema_, field);
-
-  if (factory == nullptr) factory = message_factory_;
-
-  if (field->is_extension()) {
-    return static_cast<Message*>(
-        MutableExtensionSet(message)->AddMessage(field, factory));
-  } else {
-    Message* result = nullptr;
-
-    // We can't use AddField<Message>() because RepeatedPtrFieldBase doesn't
-    // know how to allocate one.
-    RepeatedPtrFieldBase* repeated = nullptr;
-    if (IsMapFieldInApi(field)) {
-      repeated =
-          MutableRaw<MapFieldBase>(message, field)->MutableRepeatedField();
-    } else {
-      repeated = MutableRaw<RepeatedPtrFieldBase>(message, field);
-    }
-    result = repeated->AddFromCleared<GenericTypeHandler<Message> >();
-    if (result == nullptr) {
-      // We must allocate a new object.
-      const Message* prototype;
-      if (repeated->size() == 0) {
-        prototype = factory->GetPrototype(field->message_type());
-      } else {
-        prototype = &repeated->Get<GenericTypeHandler<Message> >(0);
-      }
-      result = prototype->New(message->GetArenaForAllocation());
-      // We can guarantee here that repeated and result are either both heap
-      // allocated or arena owned. So it is safe to call the unsafe version
-      // of AddAllocated.
-      repeated->UnsafeArenaAddAllocated<GenericTypeHandler<Message> >(result);
-    }
-
-    return result;
-  }
-}
-
-void Reflection::AddAllocatedMessage(Message* message,
-                                     const FieldDescriptor* field,
-                                     Message* new_entry) const {
-  USAGE_CHECK_ALL(AddAllocatedMessage, REPEATED, MESSAGE);
-  CheckInvalidAccess(schema_, field);
-
-  if (field->is_extension()) {
-    MutableExtensionSet(message)->AddAllocatedMessage(field, new_entry);
-  } else {
-    RepeatedPtrFieldBase* repeated = nullptr;
-    if (IsMapFieldInApi(field)) {
-      repeated =
-          MutableRaw<MapFieldBase>(message, field)->MutableRepeatedField();
-    } else {
-      repeated = MutableRaw<RepeatedPtrFieldBase>(message, field);
-    }
-    repeated->AddAllocated<GenericTypeHandler<Message> >(new_entry);
-  }
-}
-
-void Reflection::UnsafeArenaAddAllocatedMessage(Message* message,
-                                                const FieldDescriptor* field,
-                                                Message* new_entry) const {
-  USAGE_CHECK_ALL(UnsafeArenaAddAllocatedMessage, REPEATED, MESSAGE);
-  CheckInvalidAccess(schema_, field);
-
-  if (field->is_extension()) {
-    MutableExtensionSet(message)->UnsafeArenaAddAllocatedMessage(field,
-                                                                 new_entry);
-  } else {
-    RepeatedPtrFieldBase* repeated = nullptr;
-    if (IsMapFieldInApi(field)) {
-      repeated =
-          MutableRaw<MapFieldBase>(message, field)->MutableRepeatedField();
-    } else {
-      repeated = MutableRaw<RepeatedPtrFieldBase>(message, field);
-    }
-    repeated->UnsafeArenaAddAllocated<GenericTypeHandler<Message>>(new_entry);
-  }
-}
-
-void* Reflection::MutableRawRepeatedField(Message* message,
-                                          const FieldDescriptor* field,
-                                          FieldDescriptor::CppType cpptype,
-                                          int ctype,
-                                          const Descriptor* desc) const {
-  (void)ctype;  // Parameter is used by Google-internal code.
-  USAGE_CHECK_REPEATED("MutableRawRepeatedField");
-  CheckInvalidAccess(schema_, field);
-
-  if (field->cpp_type() != cpptype &&
-      (field->cpp_type() != FieldDescriptor::CPPTYPE_ENUM ||
-       cpptype != FieldDescriptor::CPPTYPE_INT32))
-    ReportReflectionUsageTypeError(descriptor_, field,
-                                   "MutableRawRepeatedField", cpptype);
-  if (desc != nullptr)
-    GOOGLE_CHECK_EQ(field->message_type(), desc) << "wrong submessage type";
-  if (field->is_extension()) {
-    return MutableExtensionSet(message)->MutableRawRepeatedField(
-        field->number(), field->type(), field->is_packed(), field);
-  } else {
-    // Trigger transform for MapField
-    if (IsMapFieldInApi(field)) {
-      return MutableRawNonOneof<MapFieldBase>(message, field)
-          ->MutableRepeatedField();
-    }
-    return MutableRawNonOneof<void>(message, field);
-  }
-}
-
-const void* Reflection::GetRawRepeatedField(const Message& message,
-                                            const FieldDescriptor* field,
-                                            FieldDescriptor::CppType cpptype,
-                                            int ctype,
-                                            const Descriptor* desc) const {
-  USAGE_CHECK_REPEATED("GetRawRepeatedField");
-  if (field->cpp_type() != cpptype)
-    ReportReflectionUsageTypeError(descriptor_, field, "GetRawRepeatedField",
-                                   cpptype);
-  if (ctype >= 0)
-    GOOGLE_CHECK_EQ(field->options().ctype(), ctype) << "subtype mismatch";
-  if (desc != nullptr)
-    GOOGLE_CHECK_EQ(field->message_type(), desc) << "wrong submessage type";
-  if (field->is_extension()) {
-    // Should use extension_set::GetRawRepeatedField. However, the required
-    // parameter "default repeated value" is not very easy to get here.
-    // Map is not supported in extensions, it is acceptable to use
-    // extension_set::MutableRawRepeatedField which does not change the message.
-    return MutableExtensionSet(const_cast<Message*>(&message))
-        ->MutableRawRepeatedField(field->number(), field->type(),
-                                  field->is_packed(), field);
-  } else {
-    // Trigger transform for MapField
-    if (IsMapFieldInApi(field)) {
-      return &(GetRawNonOneof<MapFieldBase>(message, field).GetRepeatedField());
-    }
-    return &GetRawNonOneof<char>(message, field);
-  }
-}
-
-const FieldDescriptor* Reflection::GetOneofFieldDescriptor(
-    const Message& message, const OneofDescriptor* oneof_descriptor) const {
-  if (oneof_descriptor->is_synthetic()) {
-    const FieldDescriptor* field = oneof_descriptor->field(0);
-    return HasField(message, field) ? field : nullptr;
-  }
-  uint32_t field_number = GetOneofCase(message, oneof_descriptor);
-  if (field_number == 0) {
-    return nullptr;
-  }
-  return descriptor_->FindFieldByNumber(field_number);
-}
-
-bool Reflection::ContainsMapKey(const Message& message,
-                                const FieldDescriptor* field,
-                                const MapKey& key) const {
-  USAGE_CHECK(IsMapFieldInApi(field), "LookupMapValue",
-              "Field is not a map field.");
-  return GetRaw<MapFieldBase>(message, field).ContainsMapKey(key);
-}
-
-bool Reflection::InsertOrLookupMapValue(Message* message,
-                                        const FieldDescriptor* field,
-                                        const MapKey& key,
-                                        MapValueRef* val) const {
-  USAGE_CHECK(IsMapFieldInApi(field), "InsertOrLookupMapValue",
-              "Field is not a map field.");
-  val->SetType(field->message_type()->map_value()->cpp_type());
-  return MutableRaw<MapFieldBase>(message, field)
-      ->InsertOrLookupMapValue(key, val);
-}
-
-bool Reflection::LookupMapValue(const Message& message,
-                                const FieldDescriptor* field, const MapKey& key,
-                                MapValueConstRef* val) const {
-  USAGE_CHECK(IsMapFieldInApi(field), "LookupMapValue",
-              "Field is not a map field.");
-  val->SetType(field->message_type()->map_value()->cpp_type());
-  return GetRaw<MapFieldBase>(message, field).LookupMapValue(key, val);
-}
-
-bool Reflection::DeleteMapValue(Message* message, const FieldDescriptor* field,
-                                const MapKey& key) const {
-  USAGE_CHECK(IsMapFieldInApi(field), "DeleteMapValue",
-              "Field is not a map field.");
-  return MutableRaw<MapFieldBase>(message, field)->DeleteMapValue(key);
-}
-
-MapIterator Reflection::MapBegin(Message* message,
-                                 const FieldDescriptor* field) const {
-  USAGE_CHECK(IsMapFieldInApi(field), "MapBegin", "Field is not a map field.");
-  MapIterator iter(message, field);
-  GetRaw<MapFieldBase>(*message, field).MapBegin(&iter);
-  return iter;
-}
-
-MapIterator Reflection::MapEnd(Message* message,
-                               const FieldDescriptor* field) const {
-  USAGE_CHECK(IsMapFieldInApi(field), "MapEnd", "Field is not a map field.");
-  MapIterator iter(message, field);
-  GetRaw<MapFieldBase>(*message, field).MapEnd(&iter);
-  return iter;
-}
-
-int Reflection::MapSize(const Message& message,
-                        const FieldDescriptor* field) const {
-  USAGE_CHECK(IsMapFieldInApi(field), "MapSize", "Field is not a map field.");
-  return GetRaw<MapFieldBase>(message, field).size();
-}
-
-// -----------------------------------------------------------------------------
-
-const FieldDescriptor* Reflection::FindKnownExtensionByName(
-    const std::string& name) const {
-  if (!schema_.HasExtensionSet()) return nullptr;
-  return descriptor_pool_->FindExtensionByPrintableName(descriptor_, name);
-}
-
-const FieldDescriptor* Reflection::FindKnownExtensionByNumber(
-    int number) const {
-  if (!schema_.HasExtensionSet()) return nullptr;
-  return descriptor_pool_->FindExtensionByNumber(descriptor_, number);
-}
-
-bool Reflection::SupportsUnknownEnumValues() const {
-  return CreateUnknownEnumValues(descriptor_->file());
-}
-
-// ===================================================================
-// Some private helpers.
-
-// These simple template accessors obtain pointers (or references) to
-// the given field.
-
-template <class Type>
-const Type& Reflection::GetRawNonOneof(const Message& message,
-                                       const FieldDescriptor* field) const {
-  return GetConstRefAtOffset<Type>(message,
-                                   schema_.GetFieldOffsetNonOneof(field));
-}
-
-template <class Type>
-Type* Reflection::MutableRawNonOneof(Message* message,
-                                     const FieldDescriptor* field) const {
-  return GetPointerAtOffset<Type>(message,
-                                  schema_.GetFieldOffsetNonOneof(field));
-}
-
-template <typename Type>
-Type* Reflection::MutableRaw(Message* message,
-                             const FieldDescriptor* field) const {
-  return GetPointerAtOffset<Type>(message, schema_.GetFieldOffset(field));
-}
-
-const uint32_t* Reflection::GetHasBits(const Message& message) const {
-  GOOGLE_DCHECK(schema_.HasHasbits());
-  return &GetConstRefAtOffset<uint32_t>(message, schema_.HasBitsOffset());
-}
-
-uint32_t* Reflection::MutableHasBits(Message* message) const {
-  GOOGLE_DCHECK(schema_.HasHasbits());
-  return GetPointerAtOffset<uint32_t>(message, schema_.HasBitsOffset());
-}
-
-uint32_t* Reflection::MutableOneofCase(
-    Message* message, const OneofDescriptor* oneof_descriptor) const {
-  GOOGLE_DCHECK(!oneof_descriptor->is_synthetic());
-  return GetPointerAtOffset<uint32_t>(
-      message, schema_.GetOneofCaseOffset(oneof_descriptor));
-}
-
-const ExtensionSet& Reflection::GetExtensionSet(const Message& message) const {
-  return GetConstRefAtOffset<ExtensionSet>(message,
-                                           schema_.GetExtensionSetOffset());
-}
-
-ExtensionSet* Reflection::MutableExtensionSet(Message* message) const {
-  return GetPointerAtOffset<ExtensionSet>(message,
-                                          schema_.GetExtensionSetOffset());
-}
-
-const InternalMetadata& Reflection::GetInternalMetadata(
-    const Message& message) const {
-  return GetConstRefAtOffset<InternalMetadata>(message,
-                                               schema_.GetMetadataOffset());
-}
-
-InternalMetadata* Reflection::MutableInternalMetadata(Message* message) const {
-  return GetPointerAtOffset<InternalMetadata>(message,
-                                              schema_.GetMetadataOffset());
-}
-
-const uint32_t* Reflection::GetInlinedStringDonatedArray(
-    const Message& message) const {
-  GOOGLE_DCHECK(schema_.HasInlinedString());
-  return &GetConstRefAtOffset<uint32_t>(message,
-                                        schema_.InlinedStringDonatedOffset());
-}
-
-uint32_t* Reflection::MutableInlinedStringDonatedArray(Message* message) const {
-  GOOGLE_DCHECK(schema_.HasInlinedString());
-  return GetPointerAtOffset<uint32_t>(message,
-                                      schema_.InlinedStringDonatedOffset());
-}
-
-// Simple accessors for manipulating _inlined_string_donated_;
-bool Reflection::IsInlinedStringDonated(const Message& message,
-                                        const FieldDescriptor* field) const {
-  uint32_t index = schema_.InlinedStringIndex(field);
-  GOOGLE_DCHECK_GT(index, 0);
-  return IsIndexInHasBitSet(GetInlinedStringDonatedArray(message), index);
-}
-
-inline void SetInlinedStringDonated(uint32_t index, uint32_t* array) {
-  array[index / 32] |= (static_cast<uint32_t>(1) << (index % 32));
-}
-
-inline void ClearInlinedStringDonated(uint32_t index, uint32_t* array) {
-  array[index / 32] &= ~(static_cast<uint32_t>(1) << (index % 32));
-}
-
-void Reflection::SwapInlinedStringDonated(Message* lhs, Message* rhs,
-                                          const FieldDescriptor* field) const {
-  Arena* lhs_arena = lhs->GetArenaForAllocation();
-  Arena* rhs_arena = rhs->GetArenaForAllocation();
-  // If arenas differ, inined string fields are swapped by copying values.
-  // Donation status should not be swapped.
-  if (lhs_arena != rhs_arena) {
-    return;
-  }
-  bool lhs_donated = IsInlinedStringDonated(*lhs, field);
-  bool rhs_donated = IsInlinedStringDonated(*rhs, field);
-  if (lhs_donated == rhs_donated) {
-    return;
-  }
-  // If one is undonated, both must have already registered ArenaDtor.
-  uint32_t* lhs_array = MutableInlinedStringDonatedArray(lhs);
-  uint32_t* rhs_array = MutableInlinedStringDonatedArray(rhs);
-  GOOGLE_CHECK_EQ(lhs_array[0] & 0x1u, 0u);
-  GOOGLE_CHECK_EQ(rhs_array[0] & 0x1u, 0u);
-  // Swap donation status bit.
-  uint32_t index = schema_.InlinedStringIndex(field);
-  GOOGLE_DCHECK_GT(index, 0);
-  if (rhs_donated) {
-    SetInlinedStringDonated(index, lhs_array);
-    ClearInlinedStringDonated(index, rhs_array);
-  } else {  // lhs_donated
-    ClearInlinedStringDonated(index, lhs_array);
-    SetInlinedStringDonated(index, rhs_array);
-  }
-}
-
-// Simple accessors for manipulating has_bits_.
-bool Reflection::HasBit(const Message& message,
-                        const FieldDescriptor* field) const {
-  GOOGLE_DCHECK(!field->options().weak());
-  if (schema_.HasBitIndex(field) != static_cast<uint32_t>(-1)) {
-    return IsIndexInHasBitSet(GetHasBits(message), schema_.HasBitIndex(field));
-  }
-
-  // Intentionally check here because HasBitIndex(field) != -1 means valid.
-  CheckInvalidAccess(schema_, field);
-
-  // proto3: no has-bits. All fields present except messages, which are
-  // present only if their message-field pointer is non-null.
-  if (field->cpp_type() == FieldDescriptor::CPPTYPE_MESSAGE) {
-    return !schema_.IsDefaultInstance(message) &&
-           GetRaw<const Message*>(message, field) != nullptr;
-  } else {
-    // Non-message field (and non-oneof, since that was handled in HasField()
-    // before calling us), and singular (again, checked in HasField). So, this
-    // field must be a scalar.
-
-    // Scalar primitive (numeric or string/bytes) fields are present if
-    // their value is non-zero (numeric) or non-empty (string/bytes). N.B.:
-    // we must use this definition here, rather than the "scalar fields
-    // always present" in the proto3 docs, because MergeFrom() semantics
-    // require presence as "present on wire", and reflection-based merge
-    // (which uses HasField()) needs to be consistent with this.
-    switch (field->cpp_type()) {
-      case FieldDescriptor::CPPTYPE_STRING:
-        switch (field->options().ctype()) {
-          default: {
-            if (IsInlined(field)) {
-              return !GetField<InlinedStringField>(message, field)
-                          .GetNoArena()
-                          .empty();
-            }
-
-            return GetField<ArenaStringPtr>(message, field).Get().size() > 0;
-          }
-        }
-        return false;
-      case FieldDescriptor::CPPTYPE_BOOL:
-        return GetRaw<bool>(message, field) != false;
-      case FieldDescriptor::CPPTYPE_INT32:
-        return GetRaw<int32_t>(message, field) != 0;
-      case FieldDescriptor::CPPTYPE_INT64:
-        return GetRaw<int64_t>(message, field) != 0;
-      case FieldDescriptor::CPPTYPE_UINT32:
-        return GetRaw<uint32_t>(message, field) != 0;
-      case FieldDescriptor::CPPTYPE_UINT64:
-        return GetRaw<uint64_t>(message, field) != 0;
-      case FieldDescriptor::CPPTYPE_FLOAT:
-        static_assert(sizeof(uint32_t) == sizeof(float),
-                      "Code assumes uint32_t and float are the same size.");
-        return GetRaw<uint32_t>(message, field) != 0;
-      case FieldDescriptor::CPPTYPE_DOUBLE:
-        static_assert(sizeof(uint64_t) == sizeof(double),
-                      "Code assumes uint64_t and double are the same size.");
-        return GetRaw<uint64_t>(message, field) != 0;
-      case FieldDescriptor::CPPTYPE_ENUM:
-        return GetRaw<int>(message, field) != 0;
-      case FieldDescriptor::CPPTYPE_MESSAGE:
-        // handled above; avoid warning
-        break;
-    }
-    GOOGLE_LOG(FATAL) << "Reached impossible case in HasBit().";
-    return false;
-  }
-}
-
-void Reflection::SetBit(Message* message, const FieldDescriptor* field) const {
-  GOOGLE_DCHECK(!field->options().weak());
-  const uint32_t index = schema_.HasBitIndex(field);
-  if (index == static_cast<uint32_t>(-1)) return;
-  MutableHasBits(message)[index / 32] |=
-      (static_cast<uint32_t>(1) << (index % 32));
-}
-
-void Reflection::ClearBit(Message* message,
-                          const FieldDescriptor* field) const {
-  GOOGLE_DCHECK(!field->options().weak());
-  const uint32_t index = schema_.HasBitIndex(field);
-  if (index == static_cast<uint32_t>(-1)) return;
-  MutableHasBits(message)[index / 32] &=
-      ~(static_cast<uint32_t>(1) << (index % 32));
-}
-
-void Reflection::SwapBit(Message* message1, Message* message2,
-                         const FieldDescriptor* field) const {
-  GOOGLE_DCHECK(!field->options().weak());
-  if (!schema_.HasHasbits()) {
-    return;
-  }
-  bool temp_has_bit = HasBit(*message1, field);
-  if (HasBit(*message2, field)) {
-    SetBit(message1, field);
-  } else {
-    ClearBit(message1, field);
-  }
-  if (temp_has_bit) {
-    SetBit(message2, field);
-  } else {
-    ClearBit(message2, field);
-  }
-}
-
-bool Reflection::HasOneof(const Message& message,
-                          const OneofDescriptor* oneof_descriptor) const {
-  if (oneof_descriptor->is_synthetic()) {
-    return HasField(message, oneof_descriptor->field(0));
-  }
-  return (GetOneofCase(message, oneof_descriptor) > 0);
-}
-
-void Reflection::SetOneofCase(Message* message,
-                              const FieldDescriptor* field) const {
-  *MutableOneofCase(message, field->containing_oneof()) = field->number();
-}
-
-void Reflection::ClearOneofField(Message* message,
-                                 const FieldDescriptor* field) const {
-  if (HasOneofField(*message, field)) {
-    ClearOneof(message, field->containing_oneof());
-  }
-}
-
-void Reflection::ClearOneof(Message* message,
-                            const OneofDescriptor* oneof_descriptor) const {
-  if (oneof_descriptor->is_synthetic()) {
-    ClearField(message, oneof_descriptor->field(0));
-    return;
-  }
-  // TODO(jieluo): Consider to cache the unused object instead of deleting
-  // it. It will be much faster if an application switches a lot from
-  // a few oneof fields.  Time/space tradeoff
-  uint32_t oneof_case = GetOneofCase(*message, oneof_descriptor);
-  if (oneof_case > 0) {
-    const FieldDescriptor* field = descriptor_->FindFieldByNumber(oneof_case);
-    if (message->GetArenaForAllocation() == nullptr) {
-      switch (field->cpp_type()) {
-        case FieldDescriptor::CPPTYPE_STRING: {
-          switch (field->options().ctype()) {
-            default:  // TODO(kenton):  Support other string reps.
-            case FieldOptions::STRING: {
-              // Oneof string fields are never set as a default instance.
-              // We just need to pass some arbitrary default string to make it
-              // work. This allows us to not have the real default accessible
-              // from reflection.
-              MutableField<ArenaStringPtr>(message, field)->Destroy();
-              break;
-            }
-          }
-          break;
-        }
-
-        case FieldDescriptor::CPPTYPE_MESSAGE:
-          delete *MutableRaw<Message*>(message, field);
-          break;
-        default:
-          break;
-      }
-    } else {
-    }
-
-    *MutableOneofCase(message, oneof_descriptor) = 0;
-  }
-}
-
-#define HANDLE_TYPE(TYPE, CPPTYPE, CTYPE)                                  \
-  template <>                                                              \
-  const RepeatedField<TYPE>& Reflection::GetRepeatedFieldInternal<TYPE>(   \
-      const Message& message, const FieldDescriptor* field) const {        \
-    return *static_cast<RepeatedField<TYPE>*>(MutableRawRepeatedField(     \
-        const_cast<Message*>(&message), field, CPPTYPE, CTYPE, nullptr));  \
-  }                                                                        \
-                                                                           \
-  template <>                                                              \
-  RepeatedField<TYPE>* Reflection::MutableRepeatedFieldInternal<TYPE>(     \
-      Message * message, const FieldDescriptor* field) const {             \
-    return static_cast<RepeatedField<TYPE>*>(                              \
-        MutableRawRepeatedField(message, field, CPPTYPE, CTYPE, nullptr)); \
-  }
-
-HANDLE_TYPE(int32_t, FieldDescriptor::CPPTYPE_INT32, -1);
-HANDLE_TYPE(int64_t, FieldDescriptor::CPPTYPE_INT64, -1);
-HANDLE_TYPE(uint32_t, FieldDescriptor::CPPTYPE_UINT32, -1);
-HANDLE_TYPE(uint64_t, FieldDescriptor::CPPTYPE_UINT64, -1);
-HANDLE_TYPE(float, FieldDescriptor::CPPTYPE_FLOAT, -1);
-HANDLE_TYPE(double, FieldDescriptor::CPPTYPE_DOUBLE, -1);
-HANDLE_TYPE(bool, FieldDescriptor::CPPTYPE_BOOL, -1);
-
-
-#undef HANDLE_TYPE
-
-void* Reflection::MutableRawRepeatedString(Message* message,
-                                           const FieldDescriptor* field,
-                                           bool is_string) const {
-  (void)is_string;  // Parameter is used by Google-internal code.
-  return MutableRawRepeatedField(message, field,
-                                 FieldDescriptor::CPPTYPE_STRING,
-                                 FieldOptions::STRING, nullptr);
-}
-
-// Template implementations of basic accessors.  Inline because each
-// template instance is only called from one location.  These are
-// used for all types except messages.
-template <typename Type>
-const Type& Reflection::GetField(const Message& message,
-                                 const FieldDescriptor* field) const {
-  return GetRaw<Type>(message, field);
-}
-
-template <typename Type>
-void Reflection::SetField(Message* message, const FieldDescriptor* field,
-                          const Type& value) const {
-  bool real_oneof = schema_.InRealOneof(field);
-  if (real_oneof && !HasOneofField(*message, field)) {
-    ClearOneof(message, field->containing_oneof());
-  }
-  *MutableRaw<Type>(message, field) = value;
-  real_oneof ? SetOneofCase(message, field) : SetBit(message, field);
-}
-
-template <typename Type>
-Type* Reflection::MutableField(Message* message,
-                               const FieldDescriptor* field) const {
-  schema_.InRealOneof(field) ? SetOneofCase(message, field)
-                             : SetBit(message, field);
-  return MutableRaw<Type>(message, field);
-}
-
-template <typename Type>
-const Type& Reflection::GetRepeatedField(const Message& message,
-                                         const FieldDescriptor* field,
-                                         int index) const {
-  return GetRaw<RepeatedField<Type> >(message, field).Get(index);
-}
-
-template <typename Type>
-const Type& Reflection::GetRepeatedPtrField(const Message& message,
-                                            const FieldDescriptor* field,
-                                            int index) const {
-  return GetRaw<RepeatedPtrField<Type> >(message, field).Get(index);
-}
-
-template <typename Type>
-void Reflection::SetRepeatedField(Message* message,
-                                  const FieldDescriptor* field, int index,
-                                  Type value) const {
-  MutableRaw<RepeatedField<Type> >(message, field)->Set(index, value);
-}
-
-template <typename Type>
-Type* Reflection::MutableRepeatedField(Message* message,
-                                       const FieldDescriptor* field,
-                                       int index) const {
-  RepeatedPtrField<Type>* repeated =
-      MutableRaw<RepeatedPtrField<Type> >(message, field);
-  return repeated->Mutable(index);
-}
-
-template <typename Type>
-void Reflection::AddField(Message* message, const FieldDescriptor* field,
-                          const Type& value) const {
-  MutableRaw<RepeatedField<Type> >(message, field)->Add(value);
-}
-
-template <typename Type>
-Type* Reflection::AddField(Message* message,
-                           const FieldDescriptor* field) const {
-  RepeatedPtrField<Type>* repeated =
-      MutableRaw<RepeatedPtrField<Type> >(message, field);
-  return repeated->Add();
-}
-
-MessageFactory* Reflection::GetMessageFactory() const {
-  return message_factory_;
-}
-
-void* Reflection::RepeatedFieldData(Message* message,
-                                    const FieldDescriptor* field,
-                                    FieldDescriptor::CppType cpp_type,
-                                    const Descriptor* message_type) const {
-  GOOGLE_CHECK(field->is_repeated());
-  GOOGLE_CHECK(field->cpp_type() == cpp_type ||
-        (field->cpp_type() == FieldDescriptor::CPPTYPE_ENUM &&
-         cpp_type == FieldDescriptor::CPPTYPE_INT32))
-      << "The type parameter T in RepeatedFieldRef<T> API doesn't match "
-      << "the actual field type (for enums T should be the generated enum "
-      << "type or int32_t).";
-  if (message_type != nullptr) {
-    GOOGLE_CHECK_EQ(message_type, field->message_type());
-  }
-  if (field->is_extension()) {
-    return MutableExtensionSet(message)->MutableRawRepeatedField(
-        field->number(), field->type(), field->is_packed(), field);
-  } else {
-    return MutableRawNonOneof<char>(message, field);
-  }
-}
-
-MapFieldBase* Reflection::MutableMapData(Message* message,
-                                         const FieldDescriptor* field) const {
-  USAGE_CHECK(IsMapFieldInApi(field), "GetMapData",
-              "Field is not a map field.");
-  return MutableRaw<MapFieldBase>(message, field);
-}
-
-const MapFieldBase* Reflection::GetMapData(const Message& message,
-                                           const FieldDescriptor* field) const {
-  USAGE_CHECK(IsMapFieldInApi(field), "GetMapData",
-              "Field is not a map field.");
-  return &(GetRaw<MapFieldBase>(message, field));
-}
-
-namespace {
-
-// Helper function to transform migration schema into reflection schema.
-ReflectionSchema MigrationToReflectionSchema(
-    const Message* const* default_instance, const uint32_t* offsets,
-    MigrationSchema migration_schema) {
-  ReflectionSchema result;
-  result.default_instance_ = *default_instance;
-  // First 7 offsets are offsets to the special fields. The following offsets
-  // are the proto fields.
-  result.offsets_ = offsets + migration_schema.offsets_index + 6;
-  result.has_bit_indices_ = offsets + migration_schema.has_bit_indices_index;
-  result.has_bits_offset_ = offsets[migration_schema.offsets_index + 0];
-  result.metadata_offset_ = offsets[migration_schema.offsets_index + 1];
-  result.extensions_offset_ = offsets[migration_schema.offsets_index + 2];
-  result.oneof_case_offset_ = offsets[migration_schema.offsets_index + 3];
-  result.object_size_ = migration_schema.object_size;
-  result.weak_field_map_offset_ = offsets[migration_schema.offsets_index + 4];
-  result.inlined_string_donated_offset_ =
-      offsets[migration_schema.offsets_index + 5];
-  result.inlined_string_indices_ =
-      offsets + migration_schema.inlined_string_indices_index;
-  return result;
-}
-
-}  // namespace
-
-class AssignDescriptorsHelper {
- public:
-  AssignDescriptorsHelper(MessageFactory* factory,
-                          Metadata* file_level_metadata,
-                          const EnumDescriptor** file_level_enum_descriptors,
-                          const MigrationSchema* schemas,
-                          const Message* const* default_instance_data,
-                          const uint32_t* offsets)
-      : factory_(factory),
-        file_level_metadata_(file_level_metadata),
-        file_level_enum_descriptors_(file_level_enum_descriptors),
-        schemas_(schemas),
-        default_instance_data_(default_instance_data),
-        offsets_(offsets) {}
-
-  void AssignMessageDescriptor(const Descriptor* descriptor) {
-    for (int i = 0; i < descriptor->nested_type_count(); i++) {
-      AssignMessageDescriptor(descriptor->nested_type(i));
-    }
-
-    file_level_metadata_->descriptor = descriptor;
-
-    file_level_metadata_->reflection =
-        new Reflection(descriptor,
-                       MigrationToReflectionSchema(default_instance_data_,
-                                                   offsets_, *schemas_),
-                       DescriptorPool::internal_generated_pool(), factory_);
-    for (int i = 0; i < descriptor->enum_type_count(); i++) {
-      AssignEnumDescriptor(descriptor->enum_type(i));
-    }
-    schemas_++;
-    default_instance_data_++;
-    file_level_metadata_++;
-  }
-
-  void AssignEnumDescriptor(const EnumDescriptor* descriptor) {
-    *file_level_enum_descriptors_ = descriptor;
-    file_level_enum_descriptors_++;
-  }
-
-  const Metadata* GetCurrentMetadataPtr() const { return file_level_metadata_; }
-
- private:
-  MessageFactory* factory_;
-  Metadata* file_level_metadata_;
-  const EnumDescriptor** file_level_enum_descriptors_;
-  const MigrationSchema* schemas_;
-  const Message* const* default_instance_data_;
-  const uint32_t* offsets_;
-};
-
-namespace {
-
-// We have the routines that assign descriptors and build reflection
-// automatically delete the allocated reflection. MetadataOwner owns
-// all the allocated reflection instances.
-struct MetadataOwner {
-  ~MetadataOwner() {
-    for (auto range : metadata_arrays_) {
-      for (const Metadata* m = range.first; m < range.second; m++) {
-        delete m->reflection;
-      }
-    }
-  }
-
-  void AddArray(const Metadata* begin, const Metadata* end) {
-    mu_.Lock();
-    metadata_arrays_.push_back(std::make_pair(begin, end));
-    mu_.Unlock();
-  }
-
-  static MetadataOwner* Instance() {
-    static MetadataOwner* res = OnShutdownDelete(new MetadataOwner);
-    return res;
-  }
-
- private:
-  MetadataOwner() = default;  // private because singleton
-
-  WrappedMutex mu_;
-  std::vector<std::pair<const Metadata*, const Metadata*> > metadata_arrays_;
-};
-
-void AddDescriptors(const DescriptorTable* table);
-
-void AssignDescriptorsImpl(const DescriptorTable* table, bool eager) {
-  // Ensure the file descriptor is added to the pool.
-  {
-    // This only happens once per proto file. So a global mutex to serialize
-    // calls to AddDescriptors.
-    static WrappedMutex mu{GOOGLE_PROTOBUF_LINKER_INITIALIZED};
-    mu.Lock();
-    AddDescriptors(table);
-    mu.Unlock();
-  }
-  if (eager) {
-    // Normally we do not want to eagerly build descriptors of our deps.
-    // However if this proto is optimized for code size (ie using reflection)
-    // and it has a message extending a custom option of a descriptor with that
-    // message being optimized for code size as well. Building the descriptors
-    // in this file requires parsing the serialized file descriptor, which now
-    // requires parsing the message extension, which potentially requires
-    // building the descriptor of the message extending one of the options.
-    // However we are already updating descriptor pool under a lock. To prevent
-    // this the compiler statically looks for this case and we just make sure we
-    // first build the descriptors of all our dependencies, preventing the
-    // deadlock.
-    int num_deps = table->num_deps;
-    for (int i = 0; i < num_deps; i++) {
-      // In case of weak fields deps[i] could be null.
-      if (table->deps[i]) AssignDescriptors(table->deps[i], true);
-    }
-  }
-
-  // Fill the arrays with pointers to descriptors and reflection classes.
-  const FileDescriptor* file =
-      DescriptorPool::internal_generated_pool()->FindFileByName(
-          table->filename);
-  GOOGLE_CHECK(file != nullptr);
-
-  MessageFactory* factory = MessageFactory::generated_factory();
-
-  AssignDescriptorsHelper helper(
-      factory, table->file_level_metadata, table->file_level_enum_descriptors,
-      table->schemas, table->default_instances, table->offsets);
-
-  for (int i = 0; i < file->message_type_count(); i++) {
-    helper.AssignMessageDescriptor(file->message_type(i));
-  }
-
-  for (int i = 0; i < file->enum_type_count(); i++) {
-    helper.AssignEnumDescriptor(file->enum_type(i));
-  }
-  if (file->options().cc_generic_services()) {
-    for (int i = 0; i < file->service_count(); i++) {
-      table->file_level_service_descriptors[i] = file->service(i);
-    }
-  }
-  MetadataOwner::Instance()->AddArray(table->file_level_metadata,
-                                      helper.GetCurrentMetadataPtr());
-}
-
-void AddDescriptorsImpl(const DescriptorTable* table) {
-  // Reflection refers to the default fields so make sure they are initialized.
-  internal::InitProtobufDefaults();
-
-  // Ensure all dependent descriptors are registered to the generated descriptor
-  // pool and message factory.
-  int num_deps = table->num_deps;
-  for (int i = 0; i < num_deps; i++) {
-    // In case of weak fields deps[i] could be null.
-    if (table->deps[i]) AddDescriptors(table->deps[i]);
-  }
-
-  // Register the descriptor of this file.
-  DescriptorPool::InternalAddGeneratedFile(table->descriptor, table->size);
-  MessageFactory::InternalRegisterGeneratedFile(table);
-}
-
-void AddDescriptors(const DescriptorTable* table) {
-  // AddDescriptors is not thread safe. Callers need to ensure calls are
-  // properly serialized. This function is only called pre-main by global
-  // descriptors and we can assume single threaded access or it's called
-  // by AssignDescriptorImpl which uses a mutex to sequence calls.
-  if (table->is_initialized) return;
-  table->is_initialized = true;
-  AddDescriptorsImpl(table);
-}
-
-}  // namespace
-
-// Separate function because it needs to be a friend of
-// Reflection
-void RegisterAllTypesInternal(const Metadata* file_level_metadata, int size) {
-  for (int i = 0; i < size; i++) {
-    const Reflection* reflection = file_level_metadata[i].reflection;
-    MessageFactory::InternalRegisterGeneratedMessage(
-        file_level_metadata[i].descriptor,
-        reflection->schema_.default_instance_);
-  }
-}
-
-namespace internal {
-
-Metadata AssignDescriptors(const DescriptorTable* (*table)(),
-                           internal::once_flag* once,
-                           const Metadata& metadata) {
-  call_once(*once, [=] {
-    auto* t = table();
-    AssignDescriptorsImpl(t, t->is_eager);
-  });
-
-  return metadata;
-}
-
-void AssignDescriptors(const DescriptorTable* table, bool eager) {
-  if (!eager) eager = table->is_eager;
-  call_once(*table->once, AssignDescriptorsImpl, table, eager);
-}
-
-AddDescriptorsRunner::AddDescriptorsRunner(const DescriptorTable* table) {
-  AddDescriptors(table);
-}
-
-void RegisterFileLevelMetadata(const DescriptorTable* table) {
-  AssignDescriptors(table);
-  RegisterAllTypesInternal(table->file_level_metadata, table->num_messages);
-}
-
-void UnknownFieldSetSerializer(const uint8_t* base, uint32_t offset,
-                               uint32_t /*tag*/, uint32_t /*has_offset*/,
-                               io::CodedOutputStream* output) {
-  const void* ptr = base + offset;
-  const InternalMetadata* metadata = static_cast<const InternalMetadata*>(ptr);
-  if (metadata->have_unknown_fields()) {
-    metadata->unknown_fields<UnknownFieldSet>(UnknownFieldSet::default_instance)
-        .SerializeToCodedStream(output);
-  }
-}
-
-bool IsDescendant(Message& root, const Message& message) {
-  const Reflection* reflection = root.GetReflection();
-  std::vector<const FieldDescriptor*> fields;
-  reflection->ListFieldsOmitStripped(root, &fields);
-
-  for (const auto* field : fields) {
-    // Skip non-message fields.
-    if (field->cpp_type() != FieldDescriptor::CPPTYPE_MESSAGE) continue;
-
-    // Optional messages.
-    if (!field->is_repeated()) {
-      Message* sub_message = reflection->MutableMessage(&root, field);
-      if (sub_message == &message || IsDescendant(*sub_message, message)) {
-        return true;
-      }
-      continue;
-    }
-
-    // Repeated messages.
-    if (!IsMapFieldInApi(field)) {
-      int count = reflection->FieldSize(root, field);
-      for (int i = 0; i < count; i++) {
-        Message* sub_message =
-            reflection->MutableRepeatedMessage(&root, field, i);
-        if (sub_message == &message || IsDescendant(*sub_message, message)) {
-          return true;
-        }
-      }
-      continue;
-    }
-
-    // Map field: if accessed as repeated fields, messages are *copied* and
-    // matching pointer won't work. Must directly access map.
-    constexpr int kValIdx = 1;
-    const FieldDescriptor* val_field = field->message_type()->field(kValIdx);
-    // Skip map fields whose value type is not message.
-    if (val_field->cpp_type() != FieldDescriptor::CPPTYPE_MESSAGE) continue;
-
-    MapIterator end = reflection->MapEnd(&root, field);
-    for (auto iter = reflection->MapBegin(&root, field); iter != end; ++iter) {
-      Message* sub_message = iter.MutableValueRef()->MutableMessageValue();
-      if (sub_message == &message || IsDescendant(*sub_message, message)) {
-        return true;
-      }
-    }
-  }
-
-  return false;
-}
-
-}  // namespace internal
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
diff --git a/libs/protobuf/src/google/protobuf/generated_message_reflection.h b/libs/protobuf/src/google/protobuf/generated_message_reflection.h
deleted file mode 100644
index 334b2cc..0000000
--- a/libs/protobuf/src/google/protobuf/generated_message_reflection.h
+++ /dev/null
@@ -1,354 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-//
-// This header is logically internal, but is made public because it is used
-// from protocol-compiler-generated code, which may reside in other components.
-
-#ifndef GOOGLE_PROTOBUF_GENERATED_MESSAGE_REFLECTION_H__
-#define GOOGLE_PROTOBUF_GENERATED_MESSAGE_REFLECTION_H__
-
-#include <google/protobuf/stubs/casts.h>
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/stubs/once.h>
-#include <google/protobuf/port.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/generated_enum_reflection.h>
-#include <google/protobuf/unknown_field_set.h>
-
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-#ifdef SWIG
-#error "You cannot SWIG proto headers"
-#endif
-
-namespace google {
-namespace protobuf {
-class MapKey;
-class MapValueRef;
-class MessageLayoutInspector;
-class Message;
-struct Metadata;
-}  // namespace protobuf
-}  // namespace google
-
-namespace google {
-namespace protobuf {
-namespace internal {
-class DefaultEmptyOneof;
-// Defined in other files.
-class ExtensionSet;  // extension_set.h
-class WeakFieldMap;  // weak_field_map.h
-
-// This struct describes the internal layout of the message, hence this is
-// used to act on the message reflectively.
-//   default_instance:  The default instance of the message.  This is only
-//                  used to obtain pointers to default instances of embedded
-//                  messages, which GetMessage() will return if the particular
-//                  sub-message has not been initialized yet.  (Thus, all
-//                  embedded message fields *must* have non-null pointers
-//                  in the default instance.)
-//   offsets:       An array of ints giving the byte offsets.
-//                  For each oneof or weak field, the offset is relative to the
-//                  default_instance. These can be computed at compile time
-//                  using the
-//                  PROTO2_GENERATED_DEFAULT_ONEOF_FIELD_OFFSET()
-//                  macro. For each none oneof field, the offset is related to
-//                  the start of the message object.  These can be computed at
-//                  compile time using the
-//                  PROTO2_GENERATED_MESSAGE_FIELD_OFFSET() macro.
-//                  Besides offsets for all fields, this array also contains
-//                  offsets for oneof unions. The offset of the i-th oneof union
-//                  is offsets[descriptor->field_count() + i].
-//   has_bit_indices:  Mapping from field indexes to their index in the has
-//                  bit array.
-//   has_bits_offset:  Offset in the message of an array of uint32s of size
-//                  descriptor->field_count()/32, rounded up.  This is a
-//                  bitfield where each bit indicates whether or not the
-//                  corresponding field of the message has been initialized.
-//                  The bit for field index i is obtained by the expression:
-//                    has_bits[i / 32] & (1 << (i % 32))
-//   unknown_fields_offset:  Offset in the message of the UnknownFieldSet for
-//                  the message.
-//   extensions_offset:  Offset in the message of the ExtensionSet for the
-//                  message, or -1 if the message type has no extension
-//                  ranges.
-//   oneof_case_offset:  Offset in the message of an array of uint32s of
-//                  size descriptor->oneof_decl_count().  Each uint32_t
-//                  indicates what field is set for each oneof.
-//   object_size:   The size of a message object of this type, as measured
-//                  by sizeof().
-//   arena_offset:  If a message doesn't have a unknown_field_set that stores
-//                  the arena, it must have a direct pointer to the arena.
-//   weak_field_map_offset: If the message proto has weak fields, this is the
-//                  offset of _weak_field_map_ in the generated proto. Otherwise
-//                  -1.
-struct ReflectionSchema {
- public:
-  // Size of a google::protobuf::Message object of this type.
-  uint32_t GetObjectSize() const { return static_cast<uint32_t>(object_size_); }
-
-  bool InRealOneof(const FieldDescriptor* field) const {
-    return field->containing_oneof() &&
-           !field->containing_oneof()->is_synthetic();
-  }
-
-  // Offset of a non-oneof field.  Getting a field offset is slightly more
-  // efficient when we know statically that it is not a oneof field.
-  uint32_t GetFieldOffsetNonOneof(const FieldDescriptor* field) const {
-    GOOGLE_DCHECK(!InRealOneof(field));
-    return OffsetValue(offsets_[field->index()], field->type());
-  }
-
-  // Offset of any field.
-  uint32_t GetFieldOffset(const FieldDescriptor* field) const {
-    if (InRealOneof(field)) {
-      size_t offset =
-          static_cast<size_t>(field->containing_type()->field_count()) +
-          field->containing_oneof()->index();
-      return OffsetValue(offsets_[offset], field->type());
-    } else {
-      return GetFieldOffsetNonOneof(field);
-    }
-  }
-
-  bool IsFieldInlined(const FieldDescriptor* field) const {
-    return Inlined(offsets_[field->index()], field->type());
-  }
-
-  uint32_t GetOneofCaseOffset(const OneofDescriptor* oneof_descriptor) const {
-    return static_cast<uint32_t>(oneof_case_offset_) +
-           static_cast<uint32_t>(
-               static_cast<size_t>(oneof_descriptor->index()) *
-               sizeof(uint32_t));
-  }
-
-  bool HasHasbits() const { return has_bits_offset_ != -1; }
-
-  // Bit index within the bit array of hasbits.  Bit order is low-to-high.
-  uint32_t HasBitIndex(const FieldDescriptor* field) const {
-    if (has_bits_offset_ == -1) return static_cast<uint32_t>(-1);
-    GOOGLE_DCHECK(HasHasbits());
-    return has_bit_indices_[field->index()];
-  }
-
-  // Byte offset of the hasbits array.
-  uint32_t HasBitsOffset() const {
-    GOOGLE_DCHECK(HasHasbits());
-    return static_cast<uint32_t>(has_bits_offset_);
-  }
-
-  bool HasInlinedString() const { return inlined_string_donated_offset_ != -1; }
-
-  // Bit index within the bit array of _inlined_string_donated_.  Bit order is
-  // low-to-high.
-  uint32_t InlinedStringIndex(const FieldDescriptor* field) const {
-    GOOGLE_DCHECK(HasInlinedString());
-    return inlined_string_indices_[field->index()];
-  }
-
-  // Byte offset of the _inlined_string_donated_ array.
-  uint32_t InlinedStringDonatedOffset() const {
-    GOOGLE_DCHECK(HasInlinedString());
-    return static_cast<uint32_t>(inlined_string_donated_offset_);
-  }
-
-  // The offset of the InternalMetadataWithArena member.
-  // For Lite this will actually be an InternalMetadataWithArenaLite.
-  // The schema doesn't contain enough information to distinguish between
-  // these two cases.
-  uint32_t GetMetadataOffset() const {
-    return static_cast<uint32_t>(metadata_offset_);
-  }
-
-  // Whether this message has an ExtensionSet.
-  bool HasExtensionSet() const { return extensions_offset_ != -1; }
-
-  // The offset of the ExtensionSet in this message.
-  uint32_t GetExtensionSetOffset() const {
-    GOOGLE_DCHECK(HasExtensionSet());
-    return static_cast<uint32_t>(extensions_offset_);
-  }
-
-  // The off set of WeakFieldMap when the message contains weak fields.
-  // The default is 0 for now.
-  int GetWeakFieldMapOffset() const { return weak_field_map_offset_; }
-
-  bool IsDefaultInstance(const Message& message) const {
-    return &message == default_instance_;
-  }
-
-  // Returns a pointer to the default value for this field.  The size and type
-  // of the underlying data depends on the field's type.
-  const void* GetFieldDefault(const FieldDescriptor* field) const {
-    return reinterpret_cast<const uint8_t*>(default_instance_) +
-           OffsetValue(offsets_[field->index()], field->type());
-  }
-
-  // Returns true if the field is implicitly backed by LazyField.
-  bool IsEagerlyVerifiedLazyField(const FieldDescriptor* field) const {
-    GOOGLE_DCHECK_EQ(field->type(), FieldDescriptor::TYPE_MESSAGE);
-    (void)field;
-    return false;
-  }
-
-  bool IsFieldStripped(const FieldDescriptor* field) const {
-    (void)field;
-    return false;
-  }
-
-  bool IsMessageStripped(const Descriptor* descriptor) const {
-    (void)descriptor;
-    return false;
-  }
-
-
-  bool HasWeakFields() const { return weak_field_map_offset_ > 0; }
-
-  // These members are intended to be private, but we cannot actually make them
-  // private because this prevents us from using aggregate initialization of
-  // them, ie.
-  //
-  //   ReflectionSchema schema = {a, b, c, d, e, ...};
-  // private:
-  const Message* default_instance_;
-  const uint32_t* offsets_;
-  const uint32_t* has_bit_indices_;
-  int has_bits_offset_;
-  int metadata_offset_;
-  int extensions_offset_;
-  int oneof_case_offset_;
-  int object_size_;
-  int weak_field_map_offset_;
-  const uint32_t* inlined_string_indices_;
-  int inlined_string_donated_offset_;
-
-  // We tag offset values to provide additional data about fields (such as
-  // "unused" or "lazy" or "inlined").
-  static uint32_t OffsetValue(uint32_t v, FieldDescriptor::Type type) {
-    if (type == FieldDescriptor::TYPE_MESSAGE ||
-        type == FieldDescriptor::TYPE_STRING ||
-        type == FieldDescriptor::TYPE_BYTES) {
-      return v & 0xFFFFFFFEu;
-    }
-    return v;
-  }
-
-  static bool Inlined(uint32_t v, FieldDescriptor::Type type) {
-    if (type == FieldDescriptor::TYPE_STRING ||
-        type == FieldDescriptor::TYPE_BYTES) {
-      return (v & 1u) != 0u;
-    } else {
-      // Non string/byte fields are not inlined.
-      return false;
-    }
-  }
-};
-
-// Structs that the code generator emits directly to describe a message.
-// These should never used directly except to build a ReflectionSchema
-// object.
-//
-// EXPERIMENTAL: these are changing rapidly, and may completely disappear
-// or merge with ReflectionSchema.
-struct MigrationSchema {
-  int32_t offsets_index;
-  int32_t has_bit_indices_index;
-  int32_t inlined_string_indices_index;
-  int object_size;
-};
-
-// This struct tries to reduce unnecessary padding.
-// The num_xxx might not be close to their respective pointer, but this saves
-// padding.
-struct PROTOBUF_EXPORT DescriptorTable {
-  mutable bool is_initialized;
-  bool is_eager;
-  int size;  // of serialized descriptor
-  const char* descriptor;
-  const char* filename;
-  once_flag* once;
-  const DescriptorTable* const* deps;
-  int num_deps;
-  int num_messages;
-  const MigrationSchema* schemas;
-  const Message* const* default_instances;
-  const uint32_t* offsets;
-  // update the following descriptor arrays.
-  Metadata* file_level_metadata;
-  const EnumDescriptor** file_level_enum_descriptors;
-  const ServiceDescriptor** file_level_service_descriptors;
-};
-
-enum {
-  // Tag used on offsets for fields that don't have a real offset.
-  // For example, weak message fields go into the WeakFieldMap and not in an
-  // actual field.
-  kInvalidFieldOffsetTag = 0x40000000u,
-};
-
-// AssignDescriptors() pulls the compiled FileDescriptor from the DescriptorPool
-// and uses it to populate all of the global variables which store pointers to
-// the descriptor objects.  It also constructs the reflection objects.  It is
-// called the first time anyone calls descriptor() or GetReflection() on one of
-// the types defined in the file.  AssignDescriptors() is thread-safe.
-void PROTOBUF_EXPORT AssignDescriptors(const DescriptorTable* table,
-                                       bool eager = false);
-
-// Overload used to implement GetMetadataStatic in the generated code.
-// See comments in compiler/cpp/internal/file.cc as to why.
-// It takes a `Metadata` and returns it to allow for tail calls and reduce
-// binary size.
-Metadata PROTOBUF_EXPORT AssignDescriptors(const DescriptorTable* (*table)(),
-                                           internal::once_flag* once,
-                                           const Metadata& metadata);
-
-// These cannot be in lite so we put them in the reflection.
-PROTOBUF_EXPORT void UnknownFieldSetSerializer(const uint8_t* base,
-                                               uint32_t offset, uint32_t tag,
-                                               uint32_t has_offset,
-                                               io::CodedOutputStream* output);
-
-struct PROTOBUF_EXPORT AddDescriptorsRunner {
-  explicit AddDescriptorsRunner(const DescriptorTable* table);
-};
-
-}  // namespace internal
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
-
-#endif  // GOOGLE_PROTOBUF_GENERATED_MESSAGE_REFLECTION_H__
diff --git a/libs/protobuf/src/google/protobuf/generated_message_reflection_unittest.cc b/libs/protobuf/src/google/protobuf/generated_message_reflection_unittest.cc
deleted file mode 100644
index 50ce399..0000000
--- a/libs/protobuf/src/google/protobuf/generated_message_reflection_unittest.cc
+++ /dev/null
@@ -1,1373 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-//
-// To test GeneratedMessageReflection, we actually let the protocol compiler
-// generate a full protocol message implementation and then test its
-// reflection interface.  This is much easier and more maintainable than
-// trying to create our own Message class for GeneratedMessageReflection
-// to wrap.
-//
-// The tests here closely mirror some of the tests in
-// compiler/cpp/unittest, except using the reflection interface
-// rather than generated accessors.
-
-#include <google/protobuf/generated_message_reflection.h>
-
-#include <memory>
-
-#include <google/protobuf/stubs/logging.h>
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/map_unittest.pb.h>
-#include <google/protobuf/unittest.pb.h>
-#include <google/protobuf/unittest_mset.pb.h>
-#include <google/protobuf/unittest_mset_wire_format.pb.h>
-#include <google/protobuf/arena.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/testing/googletest.h>
-#include <gtest/gtest.h>
-#include <google/protobuf/map_test_util.h>
-#include <google/protobuf/test_util.h>
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-
-class GeneratedMessageReflectionTestHelper {
- public:
-  static void UnsafeShallowSwapFields(
-      Message* lhs, Message* rhs,
-      const std::vector<const FieldDescriptor*>& fields) {
-    lhs->GetReflection()->UnsafeShallowSwapFields(lhs, rhs, fields);
-  }
-  static bool IsLazyExtension(const Message& msg, const FieldDescriptor* ext) {
-    return msg.GetReflection()->IsLazyExtension(msg, ext);
-  }
-  static bool IsLazyField(const Message& msg, const FieldDescriptor* field) {
-    return msg.GetReflection()->IsLazyField(field);
-  }
-  static bool IsEagerlyVerifiedLazyField(const Message& msg,
-                                         const FieldDescriptor* field) {
-    return msg.GetReflection()->IsEagerlyVerifiedLazyField(field);
-  }
-  static bool IsLazilyVerifiedLazyField(const Message& msg,
-                                        const FieldDescriptor* field) {
-    return msg.GetReflection()->IsLazilyVerifiedLazyField(field);
-  }
-};
-
-namespace {
-
-// Shorthand to get a FieldDescriptor for a field of unittest::TestAllTypes.
-const FieldDescriptor* F(const std::string& name) {
-  const FieldDescriptor* result =
-      unittest::TestAllTypes::descriptor()->FindFieldByName(name);
-  GOOGLE_CHECK(result != nullptr);
-  return result;
-}
-
-TEST(GeneratedMessageReflectionTest, Defaults) {
-  // Check that all default values are set correctly in the initial message.
-  unittest::TestAllTypes message;
-  TestUtil::ReflectionTester reflection_tester(
-      unittest::TestAllTypes::descriptor());
-
-  reflection_tester.ExpectClearViaReflection(message);
-
-  const Reflection* reflection = message.GetReflection();
-
-  // Messages should return pointers to default instances until first use.
-  // (This is not checked by ExpectClear() since it is not actually true after
-  // the fields have been set and then cleared.)
-  EXPECT_EQ(&unittest::TestAllTypes::OptionalGroup::default_instance(),
-            &reflection->GetMessage(message, F("optionalgroup")));
-  EXPECT_EQ(&unittest::TestAllTypes::NestedMessage::default_instance(),
-            &reflection->GetMessage(message, F("optional_nested_message")));
-  EXPECT_EQ(&unittest::ForeignMessage::default_instance(),
-            &reflection->GetMessage(message, F("optional_foreign_message")));
-  EXPECT_EQ(&unittest_import::ImportMessage::default_instance(),
-            &reflection->GetMessage(message, F("optional_import_message")));
-}
-
-TEST(GeneratedMessageReflectionTest, Accessors) {
-  // Set every field to a unique value then go back and check all those
-  // values.
-  unittest::TestAllTypes message;
-  TestUtil::ReflectionTester reflection_tester(
-      unittest::TestAllTypes::descriptor());
-
-  reflection_tester.SetAllFieldsViaReflection(&message);
-  TestUtil::ExpectAllFieldsSet(message);
-  reflection_tester.ExpectAllFieldsSetViaReflection(message);
-
-  reflection_tester.ModifyRepeatedFieldsViaReflection(&message);
-  TestUtil::ExpectRepeatedFieldsModified(message);
-}
-
-TEST(GeneratedMessageReflectionTest, GetStringReference) {
-  // Test that GetStringReference() returns the underlying string when it
-  // is a normal string field.
-  unittest::TestAllTypes message;
-  message.set_optional_string("foo");
-  message.add_repeated_string("foo");
-
-  const Reflection* reflection = message.GetReflection();
-  std::string scratch;
-
-  EXPECT_EQ(
-      &message.optional_string(),
-      &reflection->GetStringReference(message, F("optional_string"), &scratch))
-      << "For simple string fields, GetStringReference() should return a "
-         "reference to the underlying string.";
-  EXPECT_EQ(&message.repeated_string(0),
-            &reflection->GetRepeatedStringReference(
-                message, F("repeated_string"), 0, &scratch))
-      << "For simple string fields, GetRepeatedStringReference() should "
-         "return "
-         "a reference to the underlying string.";
-}
-
-
-class GeneratedMessageReflectionSwapTest : public testing::TestWithParam<bool> {
- protected:
-  void Swap(const Reflection* reflection, Message* lhs, Message* rhs) {
-    if (GetParam()) {
-      reflection->UnsafeArenaSwap(lhs, rhs);
-    } else {
-      reflection->Swap(lhs, rhs);
-    }
-  }
-  void SwapFields(const Reflection* reflection, Message* lhs, Message* rhs,
-                  const std::vector<const FieldDescriptor*>& fields) {
-    if (GetParam()) {
-      reflection->UnsafeArenaSwapFields(lhs, rhs, fields);
-    } else {
-      reflection->SwapFields(lhs, rhs, fields);
-    }
-  }
-};
-
-// unsafe_shallow_swap: true -> UnsafeArena* API.
-INSTANTIATE_TEST_SUITE_P(ReflectionSwap, GeneratedMessageReflectionSwapTest,
-                         testing::Bool());
-
-TEST_P(GeneratedMessageReflectionSwapTest, LhsSet) {
-  unittest::TestAllTypes lhs;
-  unittest::TestAllTypes rhs;
-
-  TestUtil::SetAllFields(&lhs);
-
-  Swap(lhs.GetReflection(), &lhs, &rhs);
-
-  TestUtil::ExpectClear(lhs);
-  TestUtil::ExpectAllFieldsSet(rhs);
-}
-
-TEST_P(GeneratedMessageReflectionSwapTest, BothSet) {
-  unittest::TestAllTypes lhs;
-  unittest::TestAllTypes rhs;
-
-  TestUtil::SetAllFields(&lhs);
-  TestUtil::SetAllFields(&rhs);
-  TestUtil::ModifyRepeatedFields(&rhs);
-
-  const Reflection* reflection = lhs.GetReflection();
-  Swap(reflection, &lhs, &rhs);
-
-  TestUtil::ExpectRepeatedFieldsModified(lhs);
-  TestUtil::ExpectAllFieldsSet(rhs);
-
-  lhs.set_optional_int32(532819);
-
-  Swap(reflection, &lhs, &rhs);
-
-  EXPECT_EQ(532819, rhs.optional_int32());
-}
-
-TEST_P(GeneratedMessageReflectionSwapTest, LhsCleared) {
-  unittest::TestAllTypes lhs;
-  unittest::TestAllTypes rhs;
-
-  TestUtil::SetAllFields(&lhs);
-
-  // For proto2 message, for message field, Clear only reset hasbits, but
-  // doesn't delete the underlying field.
-  lhs.Clear();
-
-  Swap(lhs.GetReflection(), &lhs, &rhs);
-
-  TestUtil::ExpectClear(rhs);
-}
-
-TEST_P(GeneratedMessageReflectionSwapTest, RhsCleared) {
-  unittest::TestAllTypes lhs;
-  unittest::TestAllTypes rhs;
-
-  TestUtil::SetAllFields(&rhs);
-
-  // For proto2 message, for message field, Clear only reset hasbits, but
-  // doesn't delete the underlying field.
-  rhs.Clear();
-
-  Swap(lhs.GetReflection(), &lhs, &rhs);
-
-  TestUtil::ExpectClear(lhs);
-}
-
-TEST_P(GeneratedMessageReflectionSwapTest, Extensions) {
-  unittest::TestAllExtensions lhs;
-  unittest::TestAllExtensions rhs;
-
-  TestUtil::SetAllExtensions(&lhs);
-
-  Swap(lhs.GetReflection(), &lhs, &rhs);
-
-  TestUtil::ExpectExtensionsClear(lhs);
-  TestUtil::ExpectAllExtensionsSet(rhs);
-}
-
-TEST_P(GeneratedMessageReflectionSwapTest, Unknown) {
-  unittest::TestEmptyMessage lhs, rhs;
-
-  lhs.mutable_unknown_fields()->AddVarint(1234, 1);
-
-  EXPECT_EQ(1, lhs.unknown_fields().field_count());
-  EXPECT_EQ(0, rhs.unknown_fields().field_count());
-  Swap(lhs.GetReflection(), &lhs, &rhs);
-  EXPECT_EQ(0, lhs.unknown_fields().field_count());
-  EXPECT_EQ(1, rhs.unknown_fields().field_count());
-}
-
-TEST_P(GeneratedMessageReflectionSwapTest, Oneof) {
-  unittest::TestOneof2 lhs, rhs;
-  TestUtil::SetOneof1(&lhs);
-
-  Swap(lhs.GetReflection(), &lhs, &rhs);
-
-  TestUtil::ExpectOneofClear(lhs);
-  TestUtil::ExpectOneofSet1(rhs);
-}
-
-TEST_P(GeneratedMessageReflectionSwapTest, OneofBothSet) {
-  unittest::TestOneof2 lhs, rhs;
-  TestUtil::SetOneof1(&lhs);
-  TestUtil::SetOneof2(&rhs);
-
-  Swap(lhs.GetReflection(), &lhs, &rhs);
-
-  TestUtil::ExpectOneofSet2(lhs);
-  TestUtil::ExpectOneofSet1(rhs);
-}
-
-TEST_P(GeneratedMessageReflectionSwapTest, SwapFields) {
-  std::unique_ptr<unittest::TestAllTypes> lhs(
-      Arena::CreateMessage<unittest::TestAllTypes>(nullptr));
-  std::unique_ptr<unittest::TestAllTypes> rhs(
-      Arena::CreateMessage<unittest::TestAllTypes>(nullptr));
-  lhs->set_optional_double(12.3);
-  lhs->mutable_repeated_int32()->Add(10);
-  lhs->mutable_repeated_int32()->Add(20);
-
-  rhs->set_optional_string("hello");
-  rhs->mutable_repeated_int64()->Add(30);
-
-  std::vector<const FieldDescriptor*> fields;
-  const Descriptor* descriptor = lhs->GetDescriptor();
-  fields.push_back(descriptor->FindFieldByName("optional_double"));
-  fields.push_back(descriptor->FindFieldByName("repeated_int32"));
-  fields.push_back(descriptor->FindFieldByName("optional_string"));
-  fields.push_back(descriptor->FindFieldByName("optional_uint64"));
-
-  SwapFields(lhs->GetReflection(), lhs.get(), rhs.get(), fields);
-
-  EXPECT_FALSE(lhs->has_optional_double());
-  EXPECT_EQ(0, lhs->repeated_int32_size());
-  EXPECT_TRUE(lhs->has_optional_string());
-  EXPECT_EQ("hello", lhs->optional_string());
-  EXPECT_EQ(0, lhs->repeated_int64_size());
-  EXPECT_FALSE(lhs->has_optional_uint64());
-
-  EXPECT_TRUE(rhs->has_optional_double());
-  EXPECT_EQ(12.3, rhs->optional_double());
-  EXPECT_EQ(2, rhs->repeated_int32_size());
-  EXPECT_EQ(10, rhs->repeated_int32(0));
-  EXPECT_EQ(20, rhs->repeated_int32(1));
-  EXPECT_FALSE(rhs->has_optional_string());
-  EXPECT_EQ(1, rhs->repeated_int64_size());
-  EXPECT_FALSE(rhs->has_optional_uint64());
-}
-
-TEST_P(GeneratedMessageReflectionSwapTest, SwapFieldsAll) {
-  std::unique_ptr<unittest::TestAllTypes> lhs(
-      Arena::CreateMessage<unittest::TestAllTypes>(nullptr));
-  std::unique_ptr<unittest::TestAllTypes> rhs(
-      Arena::CreateMessage<unittest::TestAllTypes>(nullptr));
-
-  TestUtil::SetAllFields(rhs.get());
-
-  std::vector<const FieldDescriptor*> fields;
-  const Reflection* reflection = lhs->GetReflection();
-  reflection->ListFields(*rhs, &fields);
-  SwapFields(reflection, lhs.get(), rhs.get(), fields);
-
-  TestUtil::ExpectAllFieldsSet(*lhs);
-  TestUtil::ExpectClear(*rhs);
-}
-
-TEST(GeneratedMessageReflectionTest, SwapFieldsAllOnDifferentArena) {
-  Arena arena1, arena2;
-  auto* message1 = Arena::CreateMessage<unittest::TestAllTypes>(&arena1);
-  auto* message2 = Arena::CreateMessage<unittest::TestAllTypes>(&arena2);
-
-  TestUtil::SetAllFields(message2);
-
-  std::vector<const FieldDescriptor*> fields;
-  const Reflection* reflection = message1->GetReflection();
-  reflection->ListFields(*message2, &fields);
-  reflection->SwapFields(message1, message2, fields);
-
-  TestUtil::ExpectAllFieldsSet(*message1);
-  TestUtil::ExpectClear(*message2);
-}
-
-TEST(GeneratedMessageReflectionTest, SwapFieldsAllOnArenaHeap) {
-  Arena arena;
-  auto* message1 = Arena::CreateMessage<unittest::TestAllTypes>(&arena);
-  std::unique_ptr<unittest::TestAllTypes> message2(
-      Arena::CreateMessage<unittest::TestAllTypes>(nullptr));
-
-  TestUtil::SetAllFields(message2.get());
-
-  std::vector<const FieldDescriptor*> fields;
-  const Reflection* reflection = message1->GetReflection();
-  reflection->ListFields(*message2, &fields);
-  reflection->SwapFields(message1, message2.get(), fields);
-
-  TestUtil::ExpectAllFieldsSet(*message1);
-  TestUtil::ExpectClear(*message2);
-}
-
-TEST(GeneratedMessageReflectionTest, SwapFieldsAllExtension) {
-  unittest::TestAllExtensions message1;
-  unittest::TestAllExtensions message2;
-
-  TestUtil::SetAllExtensions(&message1);
-
-  std::vector<const FieldDescriptor*> fields;
-  const Reflection* reflection = message1.GetReflection();
-  reflection->ListFields(message1, &fields);
-  reflection->SwapFields(&message1, &message2, fields);
-
-  TestUtil::ExpectExtensionsClear(message1);
-  TestUtil::ExpectAllExtensionsSet(message2);
-}
-
-TEST(GeneratedMessageReflectionTest, SwapFieldsAllExtensionArenaHeap) {
-  Arena arena;
-
-  std::unique_ptr<unittest::TestAllExtensions> message1(
-      Arena::CreateMessage<unittest::TestAllExtensions>(nullptr));
-  auto* message2 = Arena::CreateMessage<unittest::TestAllExtensions>(&arena);
-
-  TestUtil::SetAllExtensions(message1.get());
-
-  std::vector<const FieldDescriptor*> fields;
-  const Reflection* reflection = message1->GetReflection();
-  reflection->ListFields(*message1, &fields);
-  reflection->SwapFields(message1.get(), message2, fields);
-
-  TestUtil::ExpectExtensionsClear(*message1);
-  TestUtil::ExpectAllExtensionsSet(*message2);
-}
-
-TEST(GeneratedMessageReflectionTest, UnsafeShallowSwapFieldsAll) {
-  Arena arena;
-  auto* message1 = Arena::CreateMessage<unittest::TestAllTypes>(&arena);
-  auto* message2 = Arena::CreateMessage<unittest::TestAllTypes>(&arena);
-
-  TestUtil::SetAllFields(message2);
-
-  auto* kept_nested_message_ptr = message2->mutable_optional_nested_message();
-  auto* kept_foreign_message_ptr = message2->mutable_optional_foreign_message();
-  auto* kept_repeated_nested_message_ptr =
-      message2->mutable_repeated_nested_message(0);
-  auto* kept_repeated_foreign_message_ptr =
-      message2->mutable_repeated_foreign_message(0);
-
-  std::vector<const FieldDescriptor*> fields;
-  const Reflection* reflection = message1->GetReflection();
-  reflection->ListFields(*message2, &fields);
-  GeneratedMessageReflectionTestHelper::UnsafeShallowSwapFields(
-      message1, message2, fields);
-
-  TestUtil::ExpectAllFieldsSet(*message1);
-  TestUtil::ExpectClear(*message2);
-
-  // Expects the swap to be shallow. Expects pointer stability to the element of
-  // the repeated fields (not the container).
-  EXPECT_EQ(kept_nested_message_ptr,
-            message1->mutable_optional_nested_message());
-  EXPECT_EQ(kept_foreign_message_ptr,
-            message1->mutable_optional_foreign_message());
-  EXPECT_EQ(kept_repeated_nested_message_ptr,
-            message1->mutable_repeated_nested_message(0));
-  EXPECT_EQ(kept_repeated_foreign_message_ptr,
-            message1->mutable_repeated_foreign_message(0));
-}
-
-TEST(GeneratedMessageReflectionTest, UnsafeShallowSwapFieldsMap) {
-  Arena arena;
-  auto* message1 = Arena::CreateMessage<unittest::TestMap>(&arena);
-  auto* message2 = Arena::CreateMessage<unittest::TestMap>(&arena);
-
-  MapTestUtil::SetMapFields(message2);
-
-  auto* kept_map_int32_fm_ptr =
-      &(*message2->mutable_map_int32_foreign_message())[0];
-
-  std::vector<const FieldDescriptor*> fields;
-  const Reflection* reflection = message1->GetReflection();
-  reflection->ListFields(*message2, &fields);
-  GeneratedMessageReflectionTestHelper::UnsafeShallowSwapFields(
-      message1, message2, fields);
-
-  MapTestUtil::ExpectMapFieldsSet(*message1);
-  MapTestUtil::ExpectClear(*message2);
-
-  // Expects the swap to be shallow.
-  EXPECT_EQ(kept_map_int32_fm_ptr,
-            &(*message1->mutable_map_int32_foreign_message())[0]);
-}
-
-TEST(GeneratedMessageReflectionTest, UnsafeShallowSwapFieldsAllExtension) {
-  Arena arena;
-  auto* message1 = Arena::CreateMessage<unittest::TestAllExtensions>(&arena);
-  auto* message2 = Arena::CreateMessage<unittest::TestAllExtensions>(&arena);
-
-  TestUtil::SetAllExtensions(message1);
-
-  auto* kept_nested_message_ext_ptr =
-      message1->MutableExtension(unittest::optional_nested_message_extension);
-  auto* kept_foreign_message_ext_ptr =
-      message1->MutableExtension(unittest::optional_foreign_message_extension);
-  auto* kept_repeated_nested_message_ext_ptr =
-      message1->MutableRepeatedExtension(
-          unittest::repeated_nested_message_extension);
-  auto* kept_repeated_foreign_message_ext_ptr =
-      message1->MutableRepeatedExtension(
-          unittest::repeated_foreign_message_extension);
-
-  std::vector<const FieldDescriptor*> fields;
-  const Reflection* reflection = message1->GetReflection();
-  reflection->ListFields(*message1, &fields);
-  GeneratedMessageReflectionTestHelper::UnsafeShallowSwapFields(
-      message1, message2, fields);
-
-  TestUtil::ExpectExtensionsClear(*message1);
-  TestUtil::ExpectAllExtensionsSet(*message2);
-
-  // Expects the swap to be shallow.
-  EXPECT_EQ(
-      kept_nested_message_ext_ptr,
-      message2->MutableExtension(unittest::optional_nested_message_extension));
-  EXPECT_EQ(
-      kept_foreign_message_ext_ptr,
-      message2->MutableExtension(unittest::optional_foreign_message_extension));
-  EXPECT_EQ(kept_repeated_nested_message_ext_ptr,
-            message2->MutableRepeatedExtension(
-                unittest::repeated_nested_message_extension));
-  EXPECT_EQ(kept_repeated_foreign_message_ext_ptr,
-            message2->MutableRepeatedExtension(
-                unittest::repeated_foreign_message_extension));
-}
-
-TEST(GeneratedMessageReflectionTest, SwapFieldsOneof) {
-  unittest::TestOneof2 message1, message2;
-  TestUtil::SetOneof1(&message1);
-
-  std::vector<const FieldDescriptor*> fields;
-  const Descriptor* descriptor = message1.GetDescriptor();
-  for (int i = 0; i < descriptor->field_count(); i++) {
-    fields.push_back(descriptor->field(i));
-  }
-  const Reflection* reflection = message1.GetReflection();
-  reflection->SwapFields(&message1, &message2, fields);
-
-  TestUtil::ExpectOneofClear(message1);
-  TestUtil::ExpectOneofSet1(message2);
-}
-
-TEST(GeneratedMessageReflectionTest, UnsafeShallowSwapFieldsOneof) {
-  Arena arena;
-  auto* message1 = Arena::CreateMessage<unittest::TestOneof2>(&arena);
-  auto* message2 = Arena::CreateMessage<unittest::TestOneof2>(&arena);
-  TestUtil::SetOneof1(message1);
-
-  std::vector<const FieldDescriptor*> fields;
-  const Descriptor* descriptor = message1->GetDescriptor();
-  for (int i = 0; i < descriptor->field_count(); i++) {
-    fields.push_back(descriptor->field(i));
-  }
-  GeneratedMessageReflectionTestHelper::UnsafeShallowSwapFields(
-      message1, message2, fields);
-
-  TestUtil::ExpectOneofClear(*message1);
-  TestUtil::ExpectOneofSet1(*message2);
-}
-
-TEST(GeneratedMessageReflectionTest,
-     UnsafeShallowSwapFieldsOneofExpectShallow) {
-  Arena arena;
-  auto* message1 = Arena::CreateMessage<unittest::TestOneof2>(&arena);
-  auto* message2 = Arena::CreateMessage<unittest::TestOneof2>(&arena);
-  TestUtil::SetOneof1(message1);
-  message1->mutable_foo_message()->set_moo_int(1000);
-  auto* kept_foo_ptr = message1->mutable_foo_message();
-
-  std::vector<const FieldDescriptor*> fields;
-  const Descriptor* descriptor = message1->GetDescriptor();
-  for (int i = 0; i < descriptor->field_count(); i++) {
-    fields.push_back(descriptor->field(i));
-  }
-  GeneratedMessageReflectionTestHelper::UnsafeShallowSwapFields(
-      message1, message2, fields);
-
-  EXPECT_TRUE(message2->has_foo_message());
-  EXPECT_EQ(message2->foo_message().moo_int(), 1000);
-  EXPECT_EQ(kept_foo_ptr, message2->mutable_foo_message());
-}
-
-TEST(GeneratedMessageReflectionTest, RemoveLast) {
-  unittest::TestAllTypes message;
-  TestUtil::ReflectionTester reflection_tester(
-      unittest::TestAllTypes::descriptor());
-
-  TestUtil::SetAllFields(&message);
-
-  reflection_tester.RemoveLastRepeatedsViaReflection(&message);
-
-  TestUtil::ExpectLastRepeatedsRemoved(message);
-}
-
-TEST(GeneratedMessageReflectionTest, RemoveLastExtensions) {
-  unittest::TestAllExtensions message;
-  TestUtil::ReflectionTester reflection_tester(
-      unittest::TestAllExtensions::descriptor());
-
-  TestUtil::SetAllExtensions(&message);
-
-  reflection_tester.RemoveLastRepeatedsViaReflection(&message);
-
-  TestUtil::ExpectLastRepeatedExtensionsRemoved(message);
-}
-
-TEST(GeneratedMessageReflectionTest, ReleaseLast) {
-  unittest::TestAllTypes message;
-  const Descriptor* descriptor = message.GetDescriptor();
-  TestUtil::ReflectionTester reflection_tester(descriptor);
-
-  TestUtil::SetAllFields(&message);
-
-  reflection_tester.ReleaseLastRepeatedsViaReflection(&message, false);
-
-  TestUtil::ExpectLastRepeatedsReleased(message);
-
-  // Now test that we actually release the right message.
-  message.Clear();
-  TestUtil::SetAllFields(&message);
-  ASSERT_EQ(2, message.repeated_foreign_message_size());
-  const protobuf_unittest::ForeignMessage* expected =
-      message.mutable_repeated_foreign_message(1);
-  (void)expected;  // unused in somce configurations
-  std::unique_ptr<Message> released(message.GetReflection()->ReleaseLast(
-      &message, descriptor->FindFieldByName("repeated_foreign_message")));
-  EXPECT_EQ(expected, released.get());
-}
-
-TEST(GeneratedMessageReflectionTest, ReleaseLastExtensions) {
-  unittest::TestAllExtensions message;
-  const Descriptor* descriptor = message.GetDescriptor();
-  TestUtil::ReflectionTester reflection_tester(descriptor);
-
-  TestUtil::SetAllExtensions(&message);
-
-  reflection_tester.ReleaseLastRepeatedsViaReflection(&message, true);
-
-  TestUtil::ExpectLastRepeatedExtensionsReleased(message);
-
-  // Now test that we actually release the right message.
-  message.Clear();
-  TestUtil::SetAllExtensions(&message);
-  ASSERT_EQ(
-      2, message.ExtensionSize(unittest::repeated_foreign_message_extension));
-  const protobuf_unittest::ForeignMessage* expected =
-      message.MutableExtension(unittest::repeated_foreign_message_extension, 1);
-  std::unique_ptr<Message> released(message.GetReflection()->ReleaseLast(
-      &message, descriptor->file()->FindExtensionByName(
-                    "repeated_foreign_message_extension")));
-  EXPECT_EQ(expected, released.get());
-}
-
-TEST(GeneratedMessageReflectionTest, SwapRepeatedElements) {
-  unittest::TestAllTypes message;
-  TestUtil::ReflectionTester reflection_tester(
-      unittest::TestAllTypes::descriptor());
-
-  TestUtil::SetAllFields(&message);
-
-  // Swap and test that fields are all swapped.
-  reflection_tester.SwapRepeatedsViaReflection(&message);
-  TestUtil::ExpectRepeatedsSwapped(message);
-
-  // Swap back and test that fields are all back to original values.
-  reflection_tester.SwapRepeatedsViaReflection(&message);
-  TestUtil::ExpectAllFieldsSet(message);
-}
-
-TEST(GeneratedMessageReflectionTest, SwapRepeatedElementsExtension) {
-  unittest::TestAllExtensions message;
-  TestUtil::ReflectionTester reflection_tester(
-      unittest::TestAllExtensions::descriptor());
-
-  TestUtil::SetAllExtensions(&message);
-
-  // Swap and test that fields are all swapped.
-  reflection_tester.SwapRepeatedsViaReflection(&message);
-  TestUtil::ExpectRepeatedExtensionsSwapped(message);
-
-  // Swap back and test that fields are all back to original values.
-  reflection_tester.SwapRepeatedsViaReflection(&message);
-  TestUtil::ExpectAllExtensionsSet(message);
-}
-
-TEST(GeneratedMessageReflectionTest, Extensions) {
-  // Set every extension to a unique value then go back and check all those
-  // values.
-  unittest::TestAllExtensions message;
-  TestUtil::ReflectionTester reflection_tester(
-      unittest::TestAllExtensions::descriptor());
-
-  reflection_tester.SetAllFieldsViaReflection(&message);
-  TestUtil::ExpectAllExtensionsSet(message);
-  reflection_tester.ExpectAllFieldsSetViaReflection(message);
-
-  reflection_tester.ModifyRepeatedFieldsViaReflection(&message);
-  TestUtil::ExpectRepeatedExtensionsModified(message);
-}
-
-TEST(GeneratedMessageReflectionTest, FindExtensionTypeByNumber) {
-  const Reflection* reflection =
-      unittest::TestAllExtensions::default_instance().GetReflection();
-
-  const FieldDescriptor* extension1 =
-      unittest::TestAllExtensions::descriptor()->file()->FindExtensionByName(
-          "optional_int32_extension");
-  const FieldDescriptor* extension2 =
-      unittest::TestAllExtensions::descriptor()->file()->FindExtensionByName(
-          "repeated_string_extension");
-
-  EXPECT_EQ(extension1,
-            reflection->FindKnownExtensionByNumber(extension1->number()));
-  EXPECT_EQ(extension2,
-            reflection->FindKnownExtensionByNumber(extension2->number()));
-
-  // Non-existent extension.
-  EXPECT_TRUE(reflection->FindKnownExtensionByNumber(62341) == nullptr);
-
-  // Extensions of TestAllExtensions should not show up as extensions of
-  // other types.
-  EXPECT_TRUE(unittest::TestAllTypes::default_instance()
-                  .GetReflection()
-                  ->FindKnownExtensionByNumber(extension1->number()) ==
-              nullptr);
-}
-
-TEST(GeneratedMessageReflectionTest, FindKnownExtensionByName) {
-  const Reflection* reflection =
-      unittest::TestAllExtensions::default_instance().GetReflection();
-
-  const FieldDescriptor* extension1 =
-      unittest::TestAllExtensions::descriptor()->file()->FindExtensionByName(
-          "optional_int32_extension");
-  const FieldDescriptor* extension2 =
-      unittest::TestAllExtensions::descriptor()->file()->FindExtensionByName(
-          "repeated_string_extension");
-
-  EXPECT_EQ(extension1,
-            reflection->FindKnownExtensionByName(extension1->full_name()));
-  EXPECT_EQ(extension2,
-            reflection->FindKnownExtensionByName(extension2->full_name()));
-
-  // Non-existent extension.
-  EXPECT_TRUE(reflection->FindKnownExtensionByName("no_such_ext") == nullptr);
-
-  // Extensions of TestAllExtensions should not show up as extensions of
-  // other types.
-  EXPECT_TRUE(unittest::TestAllTypes::default_instance()
-                  .GetReflection()
-                  ->FindKnownExtensionByName(extension1->full_name()) ==
-              nullptr);
-}
-
-
-TEST(GeneratedMessageReflectionTest, SetAllocatedMessageTest) {
-  unittest::TestAllTypes from_message1;
-  unittest::TestAllTypes from_message2;
-  unittest::TestAllTypes to_message;
-  TestUtil::ReflectionTester reflection_tester(
-      unittest::TestAllTypes::descriptor());
-  reflection_tester.SetAllFieldsViaReflection(&from_message1);
-  reflection_tester.SetAllFieldsViaReflection(&from_message2);
-
-  // Before moving fields, we expect the nested messages to be nullptr.
-  reflection_tester.ExpectMessagesReleasedViaReflection(
-      &to_message, TestUtil::ReflectionTester::IS_NULL);
-
-  // After fields are moved we should get non-nullptr releases.
-  reflection_tester.SetAllocatedOptionalMessageFieldsToMessageViaReflection(
-      &from_message1, &to_message);
-  reflection_tester.ExpectMessagesReleasedViaReflection(
-      &to_message, TestUtil::ReflectionTester::NOT_NULL);
-
-  // Another move to make sure that we can SetAllocated several times.
-  reflection_tester.SetAllocatedOptionalMessageFieldsToMessageViaReflection(
-      &from_message2, &to_message);
-  reflection_tester.ExpectMessagesReleasedViaReflection(
-      &to_message, TestUtil::ReflectionTester::NOT_NULL);
-
-  // After SetAllocatedOptionalMessageFieldsToNullViaReflection() we expect the
-  // releases to be nullptr again.
-  reflection_tester.SetAllocatedOptionalMessageFieldsToNullViaReflection(
-      &to_message);
-  reflection_tester.ExpectMessagesReleasedViaReflection(
-      &to_message, TestUtil::ReflectionTester::IS_NULL);
-}
-
-TEST(GeneratedMessageReflectionTest, SetAllocatedMessageOnArenaTest) {
-  unittest::TestAllTypes from_message1;
-  unittest::TestAllTypes from_message2;
-  Arena arena;
-  unittest::TestAllTypes* to_message =
-      Arena::CreateMessage<unittest::TestAllTypes>(&arena);
-  TestUtil::ReflectionTester reflection_tester(
-      unittest::TestAllTypes::descriptor());
-  reflection_tester.SetAllFieldsViaReflection(&from_message1);
-  reflection_tester.SetAllFieldsViaReflection(&from_message2);
-
-  // Before moving fields, we expect the nested messages to be nullptr.
-  reflection_tester.ExpectMessagesReleasedViaReflection(
-      to_message, TestUtil::ReflectionTester::IS_NULL);
-
-  // After fields are moved we should get non-nullptr releases.
-  reflection_tester.SetAllocatedOptionalMessageFieldsToMessageViaReflection(
-      &from_message1, to_message);
-  reflection_tester.ExpectMessagesReleasedViaReflection(
-      to_message, TestUtil::ReflectionTester::NOT_NULL);
-
-  // Another move to make sure that we can SetAllocated several times.
-  reflection_tester.SetAllocatedOptionalMessageFieldsToMessageViaReflection(
-      &from_message2, to_message);
-  reflection_tester.ExpectMessagesReleasedViaReflection(
-      to_message, TestUtil::ReflectionTester::NOT_NULL);
-
-  // After SetAllocatedOptionalMessageFieldsToNullViaReflection() we expect the
-  // releases to be nullptr again.
-  reflection_tester.SetAllocatedOptionalMessageFieldsToNullViaReflection(
-      to_message);
-  reflection_tester.ExpectMessagesReleasedViaReflection(
-      to_message, TestUtil::ReflectionTester::IS_NULL);
-}
-
-TEST(GeneratedMessageReflectionTest, SetAllocatedExtensionMessageTest) {
-  unittest::TestAllExtensions from_message1;
-  unittest::TestAllExtensions from_message2;
-  unittest::TestAllExtensions to_message;
-  TestUtil::ReflectionTester reflection_tester(
-      unittest::TestAllExtensions::descriptor());
-  reflection_tester.SetAllFieldsViaReflection(&from_message1);
-  reflection_tester.SetAllFieldsViaReflection(&from_message2);
-
-  // Before moving fields, we expect the nested messages to be nullptr.
-  reflection_tester.ExpectMessagesReleasedViaReflection(
-      &to_message, TestUtil::ReflectionTester::IS_NULL);
-
-  // After fields are moved we should get non-nullptr releases.
-  reflection_tester.SetAllocatedOptionalMessageFieldsToMessageViaReflection(
-      &from_message1, &to_message);
-  reflection_tester.ExpectMessagesReleasedViaReflection(
-      &to_message, TestUtil::ReflectionTester::NOT_NULL);
-
-  // Another move to make sure that we can SetAllocated several times.
-  reflection_tester.SetAllocatedOptionalMessageFieldsToMessageViaReflection(
-      &from_message2, &to_message);
-  reflection_tester.ExpectMessagesReleasedViaReflection(
-      &to_message, TestUtil::ReflectionTester::NOT_NULL);
-
-  // After SetAllocatedOptionalMessageFieldsToNullViaReflection() we expect the
-  // releases to be nullptr again.
-  reflection_tester.SetAllocatedOptionalMessageFieldsToNullViaReflection(
-      &to_message);
-  reflection_tester.ExpectMessagesReleasedViaReflection(
-      &to_message, TestUtil::ReflectionTester::IS_NULL);
-}
-
-TEST(GeneratedMessageReflectionTest, SetAllocatedExtensionMessageOnArenaTest) {
-  Arena arena;
-  unittest::TestAllExtensions* to_message =
-      Arena::CreateMessage<unittest::TestAllExtensions>(&arena);
-  unittest::TestAllExtensions from_message1;
-  unittest::TestAllExtensions from_message2;
-  TestUtil::ReflectionTester reflection_tester(
-      unittest::TestAllExtensions::descriptor());
-  reflection_tester.SetAllFieldsViaReflection(&from_message1);
-  reflection_tester.SetAllFieldsViaReflection(&from_message2);
-
-  // Before moving fields, we expect the nested messages to be nullptr.
-  reflection_tester.ExpectMessagesReleasedViaReflection(
-      to_message, TestUtil::ReflectionTester::IS_NULL);
-
-  // After fields are moved we should get non-nullptr releases.
-  reflection_tester.SetAllocatedOptionalMessageFieldsToMessageViaReflection(
-      &from_message1, to_message);
-  reflection_tester.ExpectMessagesReleasedViaReflection(
-      to_message, TestUtil::ReflectionTester::NOT_NULL);
-
-  // Another move to make sure that we can SetAllocated several times.
-  reflection_tester.SetAllocatedOptionalMessageFieldsToMessageViaReflection(
-      &from_message2, to_message);
-  reflection_tester.ExpectMessagesReleasedViaReflection(
-      to_message, TestUtil::ReflectionTester::NOT_NULL);
-
-  // After SetAllocatedOptionalMessageFieldsToNullViaReflection() we expect the
-  // releases to be nullptr again.
-  reflection_tester.SetAllocatedOptionalMessageFieldsToNullViaReflection(
-      to_message);
-  reflection_tester.ExpectMessagesReleasedViaReflection(
-      to_message, TestUtil::ReflectionTester::IS_NULL);
-}
-
-TEST(GeneratedMessageReflectionTest, AddRepeatedMessage) {
-  unittest::TestAllTypes message;
-
-  const Reflection* reflection = message.GetReflection();
-  const Reflection* nested_reflection =
-      unittest::TestAllTypes::NestedMessage::default_instance().GetReflection();
-
-  const FieldDescriptor* nested_bb =
-      unittest::TestAllTypes::NestedMessage::descriptor()->FindFieldByName(
-          "bb");
-
-  Message* nested =
-      reflection->AddMessage(&message, F("repeated_nested_message"));
-  nested_reflection->SetInt32(nested, nested_bb, 11);
-
-  EXPECT_EQ(11, message.repeated_nested_message(0).bb());
-}
-
-TEST(GeneratedMessageReflectionTest, MutableRepeatedMessage) {
-  unittest::TestAllTypes message;
-
-  const Reflection* reflection = message.GetReflection();
-  const Reflection* nested_reflection =
-      unittest::TestAllTypes::NestedMessage::default_instance().GetReflection();
-
-  const FieldDescriptor* nested_bb =
-      unittest::TestAllTypes::NestedMessage::descriptor()->FindFieldByName(
-          "bb");
-
-  message.add_repeated_nested_message()->set_bb(12);
-
-  Message* nested = reflection->MutableRepeatedMessage(
-      &message, F("repeated_nested_message"), 0);
-  EXPECT_EQ(12, nested_reflection->GetInt32(*nested, nested_bb));
-  nested_reflection->SetInt32(nested, nested_bb, 13);
-  EXPECT_EQ(13, message.repeated_nested_message(0).bb());
-}
-
-TEST(GeneratedMessageReflectionTest, AddAllocatedMessage) {
-  unittest::TestAllTypes message;
-
-  const Reflection* reflection = message.GetReflection();
-
-  unittest::TestAllTypes::NestedMessage* nested =
-      new unittest::TestAllTypes::NestedMessage();
-  nested->set_bb(11);
-  reflection->AddAllocatedMessage(&message, F("repeated_nested_message"),
-                                  nested);
-  EXPECT_EQ(1, message.repeated_nested_message_size());
-  EXPECT_EQ(11, message.repeated_nested_message(0).bb());
-}
-
-TEST(GeneratedMessageReflectionTest, ListFieldsOneOf) {
-  unittest::TestOneof2 message;
-  TestUtil::SetOneof1(&message);
-
-  const Reflection* reflection = message.GetReflection();
-  std::vector<const FieldDescriptor*> fields;
-  reflection->ListFields(message, &fields);
-  EXPECT_EQ(4, fields.size());
-}
-
-TEST(GeneratedMessageReflectionTest, Oneof) {
-  unittest::TestOneof2 message;
-  const Descriptor* descriptor = message.GetDescriptor();
-  const Reflection* reflection = message.GetReflection();
-
-  // Check default values.
-  EXPECT_EQ(
-      0, reflection->GetInt32(message, descriptor->FindFieldByName("foo_int")));
-  EXPECT_EQ("", reflection->GetString(
-                    message, descriptor->FindFieldByName("foo_string")));
-  EXPECT_EQ("", reflection->GetString(message,
-                                      descriptor->FindFieldByName("foo_cord")));
-  EXPECT_EQ("", reflection->GetString(
-                    message, descriptor->FindFieldByName("foo_string_piece")));
-  EXPECT_EQ("", reflection->GetString(
-                    message, descriptor->FindFieldByName("foo_bytes")));
-  EXPECT_EQ(
-      unittest::TestOneof2::FOO,
-      reflection->GetEnum(message, descriptor->FindFieldByName("foo_enum"))
-          ->number());
-  EXPECT_EQ(&unittest::TestOneof2::NestedMessage::default_instance(),
-            &reflection->GetMessage(
-                message, descriptor->FindFieldByName("foo_message")));
-  EXPECT_EQ(&unittest::TestOneof2::FooGroup::default_instance(),
-            &reflection->GetMessage(message,
-                                    descriptor->FindFieldByName("foogroup")));
-  EXPECT_NE(&unittest::TestOneof2::FooGroup::default_instance(),
-            &reflection->GetMessage(
-                message, descriptor->FindFieldByName("foo_lazy_message")));
-  EXPECT_EQ(
-      5, reflection->GetInt32(message, descriptor->FindFieldByName("bar_int")));
-  EXPECT_EQ("STRING", reflection->GetString(
-                          message, descriptor->FindFieldByName("bar_string")));
-  EXPECT_EQ("CORD", reflection->GetString(
-                        message, descriptor->FindFieldByName("bar_cord")));
-  EXPECT_EQ("SPIECE",
-            reflection->GetString(
-                message, descriptor->FindFieldByName("bar_string_piece")));
-  EXPECT_EQ("BYTES", reflection->GetString(
-                         message, descriptor->FindFieldByName("bar_bytes")));
-  EXPECT_EQ(
-      unittest::TestOneof2::BAR,
-      reflection->GetEnum(message, descriptor->FindFieldByName("bar_enum"))
-          ->number());
-
-  // Check Set functions.
-  reflection->SetInt32(&message, descriptor->FindFieldByName("foo_int"), 123);
-  EXPECT_EQ(123, reflection->GetInt32(message,
-                                      descriptor->FindFieldByName("foo_int")));
-  reflection->SetString(&message, descriptor->FindFieldByName("foo_string"),
-                        "abc");
-  EXPECT_EQ("abc", reflection->GetString(
-                       message, descriptor->FindFieldByName("foo_string")));
-  reflection->SetString(&message, descriptor->FindFieldByName("foo_bytes"),
-                        "bytes");
-  EXPECT_EQ("bytes", reflection->GetString(
-                         message, descriptor->FindFieldByName("foo_bytes")));
-  reflection->SetString(&message, descriptor->FindFieldByName("bar_cord"),
-                        "change_cord");
-  EXPECT_EQ(
-      "change_cord",
-      reflection->GetString(message, descriptor->FindFieldByName("bar_cord")));
-  reflection->SetString(&message,
-                        descriptor->FindFieldByName("bar_string_piece"),
-                        "change_spiece");
-  EXPECT_EQ("change_spiece",
-            reflection->GetString(
-                message, descriptor->FindFieldByName("bar_string_piece")));
-
-  message.clear_foo();
-  message.clear_bar();
-  TestUtil::ExpectOneofClear(message);
-}
-
-TEST(GeneratedMessageReflectionTest, SetAllocatedOneofMessageTest) {
-  unittest::TestOneof2 from_message1;
-  unittest::TestOneof2 from_message2;
-  unittest::TestOneof2 to_message;
-  const Descriptor* descriptor = unittest::TestOneof2::descriptor();
-  const Reflection* reflection = to_message.GetReflection();
-
-  Message* released = reflection->ReleaseMessage(
-      &to_message, descriptor->FindFieldByName("foo_lazy_message"));
-  EXPECT_TRUE(released == nullptr);
-  released = reflection->ReleaseMessage(
-      &to_message, descriptor->FindFieldByName("foo_message"));
-  EXPECT_TRUE(released == nullptr);
-
-  TestUtil::ReflectionTester::SetOneofViaReflection(&from_message1);
-  TestUtil::ReflectionTester::ExpectOneofSetViaReflection(from_message1);
-
-  TestUtil::ReflectionTester::
-      SetAllocatedOptionalMessageFieldsToMessageViaReflection(&from_message1,
-                                                              &to_message);
-  const Message& sub_message = reflection->GetMessage(
-      to_message, descriptor->FindFieldByName("foo_lazy_message"));
-  (void)sub_message;  // unused in somce configurations
-  released = reflection->ReleaseMessage(
-      &to_message, descriptor->FindFieldByName("foo_lazy_message"));
-  EXPECT_TRUE(released != nullptr);
-  EXPECT_EQ(&sub_message, released);
-  delete released;
-
-  TestUtil::ReflectionTester::SetOneofViaReflection(&from_message2);
-
-  reflection->MutableMessage(&from_message2,
-                             descriptor->FindFieldByName("foo_message"));
-
-  TestUtil::ReflectionTester::
-      SetAllocatedOptionalMessageFieldsToMessageViaReflection(&from_message2,
-                                                              &to_message);
-
-  const Message& sub_message2 = reflection->GetMessage(
-      to_message, descriptor->FindFieldByName("foo_message"));
-  (void)sub_message2;  // unused in somce configurations
-  released = reflection->ReleaseMessage(
-      &to_message, descriptor->FindFieldByName("foo_message"));
-  EXPECT_TRUE(released != nullptr);
-  EXPECT_EQ(&sub_message2, released);
-  delete released;
-}
-
-TEST(GeneratedMessageReflectionTest, SetAllocatedOneofMessageOnArenaTest) {
-  unittest::TestOneof2 from_message1;
-  unittest::TestOneof2 from_message2;
-  Arena arena;
-  unittest::TestOneof2* to_message =
-      Arena::CreateMessage<unittest::TestOneof2>(&arena);
-  const Descriptor* descriptor = unittest::TestOneof2::descriptor();
-  const Reflection* reflection = to_message->GetReflection();
-
-  Message* released = reflection->ReleaseMessage(
-      to_message, descriptor->FindFieldByName("foo_lazy_message"));
-  EXPECT_TRUE(released == nullptr);
-  released = reflection->ReleaseMessage(
-      to_message, descriptor->FindFieldByName("foo_message"));
-  EXPECT_TRUE(released == nullptr);
-
-  TestUtil::ReflectionTester::SetOneofViaReflection(&from_message1);
-  TestUtil::ReflectionTester::ExpectOneofSetViaReflection(from_message1);
-
-  TestUtil::ReflectionTester::
-      SetAllocatedOptionalMessageFieldsToMessageViaReflection(&from_message1,
-                                                              to_message);
-  const Message& sub_message = reflection->GetMessage(
-      *to_message, descriptor->FindFieldByName("foo_lazy_message"));
-  released = reflection->ReleaseMessage(
-      to_message, descriptor->FindFieldByName("foo_lazy_message"));
-  EXPECT_TRUE(released != nullptr);
-  // Since sub_message is arena allocated, releasing it results in copying it
-  // into new heap-allocated memory.
-  EXPECT_NE(&sub_message, released);
-  delete released;
-
-  TestUtil::ReflectionTester::SetOneofViaReflection(&from_message2);
-
-  reflection->MutableMessage(&from_message2,
-                             descriptor->FindFieldByName("foo_message"));
-
-  TestUtil::ReflectionTester::
-      SetAllocatedOptionalMessageFieldsToMessageViaReflection(&from_message2,
-                                                              to_message);
-
-  const Message& sub_message2 = reflection->GetMessage(
-      *to_message, descriptor->FindFieldByName("foo_message"));
-  released = reflection->ReleaseMessage(
-      to_message, descriptor->FindFieldByName("foo_message"));
-  EXPECT_TRUE(released != nullptr);
-  // Since sub_message2 is arena allocated, releasing it results in copying it
-  // into new heap-allocated memory.
-  EXPECT_NE(&sub_message2, released);
-  delete released;
-}
-
-TEST(GeneratedMessageReflectionTest, ReleaseMessageTest) {
-  unittest::TestAllTypes message;
-  TestUtil::ReflectionTester reflection_tester(
-      unittest::TestAllTypes::descriptor());
-
-  // When nothing is set, we expect all released messages to be nullptr.
-  reflection_tester.ExpectMessagesReleasedViaReflection(
-      &message, TestUtil::ReflectionTester::IS_NULL);
-
-  // After fields are set we should get non-nullptr releases.
-  reflection_tester.SetAllFieldsViaReflection(&message);
-  reflection_tester.ExpectMessagesReleasedViaReflection(
-      &message, TestUtil::ReflectionTester::NOT_NULL);
-
-  // After Clear() we may or may not get a message from ReleaseMessage().
-  // This is implementation specific.
-  reflection_tester.SetAllFieldsViaReflection(&message);
-  message.Clear();
-  reflection_tester.ExpectMessagesReleasedViaReflection(
-      &message, TestUtil::ReflectionTester::CAN_BE_NULL);
-
-  // Test a different code path for setting after releasing.
-  TestUtil::SetAllFields(&message);
-  TestUtil::ExpectAllFieldsSet(message);
-}
-
-TEST(GeneratedMessageReflectionTest, ReleaseExtensionMessageTest) {
-  unittest::TestAllExtensions message;
-  TestUtil::ReflectionTester reflection_tester(
-      unittest::TestAllExtensions::descriptor());
-
-  // When nothing is set, we expect all released messages to be nullptr.
-  reflection_tester.ExpectMessagesReleasedViaReflection(
-      &message, TestUtil::ReflectionTester::IS_NULL);
-
-  // After fields are set we should get non-nullptr releases.
-  reflection_tester.SetAllFieldsViaReflection(&message);
-  reflection_tester.ExpectMessagesReleasedViaReflection(
-      &message, TestUtil::ReflectionTester::NOT_NULL);
-
-  // After Clear() we may or may not get a message from ReleaseMessage().
-  // This is implementation specific.
-  reflection_tester.SetAllFieldsViaReflection(&message);
-  message.Clear();
-  reflection_tester.ExpectMessagesReleasedViaReflection(
-      &message, TestUtil::ReflectionTester::CAN_BE_NULL);
-
-  // Test a different code path for setting after releasing.
-  TestUtil::SetAllExtensions(&message);
-  TestUtil::ExpectAllExtensionsSet(message);
-}
-
-TEST(GeneratedMessageReflectionTest, ReleaseOneofMessageTest) {
-  unittest::TestOneof2 message;
-  TestUtil::ReflectionTester::SetOneofViaReflection(&message);
-
-  const Descriptor* descriptor = unittest::TestOneof2::descriptor();
-  const Reflection* reflection = message.GetReflection();
-  const Message& sub_message = reflection->GetMessage(
-      message, descriptor->FindFieldByName("foo_lazy_message"));
-  (void)sub_message;  // unused in somce configurations
-  Message* released = reflection->ReleaseMessage(
-      &message, descriptor->FindFieldByName("foo_lazy_message"));
-
-  EXPECT_TRUE(released != nullptr);
-  EXPECT_EQ(&sub_message, released);
-  delete released;
-
-  released = reflection->ReleaseMessage(
-      &message, descriptor->FindFieldByName("foo_lazy_message"));
-  EXPECT_TRUE(released == nullptr);
-}
-
-TEST(GeneratedMessageReflectionTest, ArenaReleaseMessageTest) {
-  Arena arena;
-  unittest::TestAllTypes* message =
-      Arena::CreateMessage<unittest::TestAllTypes>(&arena);
-  TestUtil::ReflectionTester reflection_tester(
-      unittest::TestAllTypes::descriptor());
-
-  // When nothing is set, we expect all released messages to be nullptr.
-  reflection_tester.ExpectMessagesReleasedViaReflection(
-      message, TestUtil::ReflectionTester::IS_NULL);
-
-  // After fields are set we should get non-nullptr releases.
-  reflection_tester.SetAllFieldsViaReflection(message);
-  reflection_tester.ExpectMessagesReleasedViaReflection(
-      message, TestUtil::ReflectionTester::NOT_NULL);
-
-  // After Clear() we may or may not get a message from ReleaseMessage().
-  // This is implementation specific.
-  reflection_tester.SetAllFieldsViaReflection(message);
-  message->Clear();
-  reflection_tester.ExpectMessagesReleasedViaReflection(
-      message, TestUtil::ReflectionTester::CAN_BE_NULL);
-}
-
-TEST(GeneratedMessageReflectionTest, ArenaReleaseExtensionMessageTest) {
-  Arena arena;
-  unittest::TestAllExtensions* message =
-      Arena::CreateMessage<unittest::TestAllExtensions>(&arena);
-  TestUtil::ReflectionTester reflection_tester(
-      unittest::TestAllExtensions::descriptor());
-
-  // When nothing is set, we expect all released messages to be nullptr.
-  reflection_tester.ExpectMessagesReleasedViaReflection(
-      message, TestUtil::ReflectionTester::IS_NULL);
-
-  // After fields are set we should get non-nullptr releases.
-  reflection_tester.SetAllFieldsViaReflection(message);
-  reflection_tester.ExpectMessagesReleasedViaReflection(
-      message, TestUtil::ReflectionTester::NOT_NULL);
-
-  // After Clear() we may or may not get a message from ReleaseMessage().
-  // This is implementation specific.
-  reflection_tester.SetAllFieldsViaReflection(message);
-  message->Clear();
-  reflection_tester.ExpectMessagesReleasedViaReflection(
-      message, TestUtil::ReflectionTester::CAN_BE_NULL);
-}
-
-TEST(GeneratedMessageReflectionTest, ArenaReleaseOneofMessageTest) {
-  Arena arena;
-  unittest::TestOneof2* message =
-      Arena::CreateMessage<unittest::TestOneof2>(&arena);
-  TestUtil::ReflectionTester::SetOneofViaReflection(message);
-
-  const Descriptor* descriptor = unittest::TestOneof2::descriptor();
-  const Reflection* reflection = message->GetReflection();
-  Message* released = reflection->ReleaseMessage(
-      message, descriptor->FindFieldByName("foo_lazy_message"));
-
-  EXPECT_TRUE(released != nullptr);
-  delete released;
-
-  released = reflection->ReleaseMessage(
-      message, descriptor->FindFieldByName("foo_lazy_message"));
-  EXPECT_TRUE(released == nullptr);
-}
-
-#ifdef PROTOBUF_HAS_DEATH_TEST
-
-TEST(GeneratedMessageReflectionTest, UsageErrors) {
-  unittest::TestAllTypes message;
-  const Reflection* reflection = message.GetReflection();
-  const Descriptor* descriptor = message.GetDescriptor();
-
-#define f(NAME) descriptor->FindFieldByName(NAME)
-
-  // Testing every single failure mode would be too much work.  Let's just
-  // check a few.
-  EXPECT_DEATH(
-      reflection->GetInt32(message,
-                           descriptor->FindFieldByName("optional_int64")),
-      "Protocol Buffer reflection usage error:\n"
-      "  Method      : google::protobuf::Reflection::GetInt32\n"
-      "  Message type: protobuf_unittest\\.TestAllTypes\n"
-      "  Field       : protobuf_unittest\\.TestAllTypes\\.optional_int64\n"
-      "  Problem     : Field is not the right type for this message:\n"
-      "    Expected  : CPPTYPE_INT32\n"
-      "    Field type: CPPTYPE_INT64");
-  EXPECT_DEATH(reflection->GetInt32(
-                   message, descriptor->FindFieldByName("repeated_int32")),
-               "Protocol Buffer reflection usage error:\n"
-               "  Method      : google::protobuf::Reflection::GetInt32\n"
-               "  Message type: protobuf_unittest.TestAllTypes\n"
-               "  Field       : protobuf_unittest.TestAllTypes.repeated_int32\n"
-               "  Problem     : Field is repeated; the method requires a "
-               "singular field.");
-  EXPECT_DEATH(
-      reflection->GetInt32(
-          message,
-          unittest::ForeignMessage::descriptor()->FindFieldByName("c")),
-      "Protocol Buffer reflection usage error:\n"
-      "  Method      : google::protobuf::Reflection::GetInt32\n"
-      "  Message type: protobuf_unittest.TestAllTypes\n"
-      "  Field       : protobuf_unittest.ForeignMessage.c\n"
-      "  Problem     : Field does not match message type.");
-  EXPECT_DEATH(
-      reflection->HasField(
-          message,
-          unittest::ForeignMessage::descriptor()->FindFieldByName("c")),
-      "Protocol Buffer reflection usage error:\n"
-      "  Method      : google::protobuf::Reflection::HasField\n"
-      "  Message type: protobuf_unittest.TestAllTypes\n"
-      "  Field       : protobuf_unittest.ForeignMessage.c\n"
-      "  Problem     : Field does not match message type.");
-
-#undef f
-}
-
-#endif  // PROTOBUF_HAS_DEATH_TEST
-
-
-using internal::IsDescendant;
-
-TEST(GeneratedMessageReflection, IsDescendantMessage) {
-  unittest::TestAllTypes msg1, msg2;
-  TestUtil::SetAllFields(&msg1);
-  msg2 = msg1;
-
-  EXPECT_TRUE(IsDescendant(msg1, msg1.optional_nested_message()));
-  EXPECT_TRUE(IsDescendant(msg1, msg1.repeated_foreign_message(0)));
-
-  EXPECT_FALSE(IsDescendant(msg1, msg2.optional_nested_message()));
-  EXPECT_FALSE(IsDescendant(msg1, msg2.repeated_foreign_message(0)));
-}
-
-TEST(GeneratedMessageReflection, IsDescendantMap) {
-  unittest::TestMap msg1, msg2;
-  (*msg1.mutable_map_int32_foreign_message())[0].set_c(100);
-  TestUtil::SetAllFields(&(*msg1.mutable_map_int32_all_types())[0]);
-  msg2 = msg1;
-
-  EXPECT_TRUE(IsDescendant(msg1, msg1.map_int32_foreign_message().at(0)));
-  EXPECT_TRUE(IsDescendant(msg1, msg1.map_int32_all_types().at(0)));
-
-  EXPECT_FALSE(IsDescendant(msg1, msg2.map_int32_foreign_message().at(0)));
-  EXPECT_FALSE(IsDescendant(msg1, msg2.map_int32_all_types().at(0)));
-}
-
-TEST(GeneratedMessageReflection, IsDescendantExtension) {
-  unittest::TestAllExtensions msg1, msg2;
-  TestUtil::SetAllExtensions(&msg1);
-  msg2 = msg1;
-
-  EXPECT_TRUE(IsDescendant(
-      msg1, msg1.GetExtension(unittest::optional_nested_message_extension)));
-  EXPECT_TRUE(IsDescendant(
-      msg1,
-      msg1.GetExtension(unittest::repeated_foreign_message_extension, 0)));
-
-  EXPECT_FALSE(IsDescendant(
-      msg1, msg2.GetExtension(unittest::optional_nested_message_extension)));
-  EXPECT_FALSE(IsDescendant(
-      msg1,
-      msg2.GetExtension(unittest::repeated_foreign_message_extension, 0)));
-}
-
-TEST(GeneratedMessageReflection, IsDescendantOneof) {
-  unittest::TestOneof msg1, msg2;
-  TestUtil::SetAllFields(msg1.mutable_foo_message());
-  msg2 = msg1;
-
-  EXPECT_TRUE(IsDescendant(msg1, msg1.foo_message().optional_nested_message()));
-  EXPECT_TRUE(
-      IsDescendant(msg1, msg1.foo_message().repeated_foreign_message(0)));
-
-  EXPECT_FALSE(
-      IsDescendant(msg1, msg2.foo_message().optional_nested_message()));
-  EXPECT_FALSE(
-      IsDescendant(msg1, msg2.foo_message().repeated_foreign_message(0)));
-}
-
-}  // namespace
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/generated_message_tctable_decl.h b/libs/protobuf/src/google/protobuf/generated_message_tctable_decl.h
deleted file mode 100644
index b1bb1de..0000000
--- a/libs/protobuf/src/google/protobuf/generated_message_tctable_decl.h
+++ /dev/null
@@ -1,312 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// This file contains declarations needed in generated headers for messages
-// that use tail-call table parsing. Everything in this file is for internal
-// use only.
-
-#ifndef GOOGLE_PROTOBUF_GENERATED_MESSAGE_TCTABLE_DECL_H__
-#define GOOGLE_PROTOBUF_GENERATED_MESSAGE_TCTABLE_DECL_H__
-
-#include <array>
-#include <cstddef>
-#include <cstdint>
-#include <type_traits>
-
-#include <google/protobuf/message_lite.h>
-#include <google/protobuf/parse_context.h>
-
-// Must come last:
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-namespace internal {
-
-// Additional information about this field:
-struct TcFieldData {
-  constexpr TcFieldData() : data(0) {}
-
-  // Fast table entry constructor:
-  constexpr TcFieldData(uint16_t coded_tag, uint8_t hasbit_idx, uint8_t aux_idx,
-                        uint16_t offset)
-      : data(uint64_t{offset} << 48 |      //
-             uint64_t{aux_idx} << 24 |     //
-             uint64_t{hasbit_idx} << 16 |  //
-             uint64_t{coded_tag}) {}
-
-  // Fields used in fast table parsing:
-  //
-  //     Bit:
-  //     +-----------+-------------------+
-  //     |63    ..     32|31     ..     0|
-  //     +---------------+---------------+
-  //     :   .   :   .   :   . 16|=======| [16] coded_tag()
-  //     :   .   :   .   : 24|===|   .   : [ 8] hasbit_idx()
-  //     :   .   :   . 32|===|   :   .   : [ 8] aux_idx()
-  //     :   . 48:---.---:   .   :   .   : [16] (unused)
-  //     |=======|   .   :   .   :   .   : [16] offset()
-  //     +-----------+-------------------+
-  //     |63    ..     32|31     ..     0|
-  //     +---------------+---------------+
-
-  template <typename TagType = uint16_t>
-  TagType coded_tag() const {
-    return static_cast<TagType>(data);
-  }
-  uint8_t hasbit_idx() const { return static_cast<uint8_t>(data >> 16); }
-  uint8_t aux_idx() const { return static_cast<uint8_t>(data >> 24); }
-  uint16_t offset() const { return static_cast<uint16_t>(data >> 48); }
-
-  // Fields used in mini table parsing:
-  //
-  //     Bit:
-  //     +-----------+-------------------+
-  //     |63    ..     32|31     ..     0|
-  //     +---------------+---------------+
-  //     :   .   :   .   |===============| [32] tag() (decoded)
-  //     |===============|   .   :   .   : [32] entry_offset()
-  //     +-----------+-------------------+
-  //     |63    ..     32|31     ..     0|
-  //     +---------------+---------------+
-
-  uint32_t tag() const { return static_cast<uint32_t>(data); }
-  uint32_t entry_offset() const { return static_cast<uint32_t>(data >> 32); }
-
-  uint64_t data;
-};
-
-struct TcParseTableBase;
-
-// TailCallParseFunc is the function pointer type used in the tailcall table.
-typedef const char* (*TailCallParseFunc)(PROTOBUF_TC_PARAM_DECL);
-
-namespace field_layout {
-struct Offset {
-  uint32_t off;
-};
-}  // namespace field_layout
-
-#if defined(_MSC_VER) && !defined(_WIN64)
-#pragma warning(push)
-// TcParseTableBase is intentionally overaligned on 32 bit targets.
-#pragma warning(disable : 4324)
-#endif
-
-// Base class for message-level table with info for the tail-call parser.
-struct alignas(uint64_t) TcParseTableBase {
-  // Common attributes for message layout:
-  uint16_t has_bits_offset;
-  uint16_t extension_offset;
-  uint32_t extension_range_low;
-  uint32_t extension_range_high;
-  uint32_t max_field_number;
-  uint8_t fast_idx_mask;
-  uint16_t lookup_table_offset;
-  uint32_t skipmap32;
-  uint32_t field_entries_offset;
-  uint16_t num_field_entries;
-
-  uint16_t num_aux_entries;
-  uint32_t aux_offset;
-
-  const MessageLite* default_instance;
-
-  // Handler for fields which are not handled by table dispatch.
-  TailCallParseFunc fallback;
-
-  // This constructor exactly follows the field layout, so it's technically
-  // not necessary.  However, it makes it much much easier to add or re-arrange
-  // fields, because it can be overloaded with an additional constructor,
-  // temporarily allowing both old and new protocol buffer headers to be
-  // compiled.
-  constexpr TcParseTableBase(
-      uint16_t has_bits_offset, uint16_t extension_offset,
-      uint32_t extension_range_low, uint32_t extension_range_high,
-      uint32_t max_field_number, uint8_t fast_idx_mask,
-      uint16_t lookup_table_offset, uint32_t skipmap32,
-      uint32_t field_entries_offset, uint16_t num_field_entries,
-      uint16_t num_aux_entries, uint32_t aux_offset,
-      const MessageLite* default_instance, TailCallParseFunc fallback)
-      : has_bits_offset(has_bits_offset),
-        extension_offset(extension_offset),
-        extension_range_low(extension_range_low),
-        extension_range_high(extension_range_high),
-        max_field_number(max_field_number),
-        fast_idx_mask(fast_idx_mask),
-        lookup_table_offset(lookup_table_offset),
-        skipmap32(skipmap32),
-        field_entries_offset(field_entries_offset),
-        num_field_entries(num_field_entries),
-        num_aux_entries(num_aux_entries),
-        aux_offset(aux_offset),
-        default_instance(default_instance),
-        fallback(fallback) {}
-
-  // Table entry for fast-path tailcall dispatch handling.
-  struct FastFieldEntry {
-    // Target function for dispatch:
-    TailCallParseFunc target;
-    // Field data used during parse:
-    TcFieldData bits;
-  };
-  // There is always at least one table entry.
-  const FastFieldEntry* fast_entry(size_t idx) const {
-    return reinterpret_cast<const FastFieldEntry*>(this + 1) + idx;
-  }
-
-  // Returns a begin iterator (pointer) to the start of the field lookup table.
-  const uint16_t* field_lookup_begin() const {
-    return reinterpret_cast<const uint16_t*>(reinterpret_cast<uintptr_t>(this) +
-                                             lookup_table_offset);
-  }
-
-  // Field entry for all fields.
-  struct FieldEntry {
-    uint32_t offset;     // offset in the message object
-    int32_t has_idx;     // has-bit index
-    uint16_t aux_idx;    // index for `field_aux`.
-    uint16_t type_card;  // `FieldType` and `Cardinality` (see _impl.h)
-  };
-
-  // Returns a begin iterator (pointer) to the start of the field entries array.
-  const FieldEntry* field_entries_begin() const {
-    return reinterpret_cast<const FieldEntry*>(
-        reinterpret_cast<uintptr_t>(this) + field_entries_offset);
-  }
-
-  // Auxiliary entries for field types that need extra information.
-  union FieldAux {
-    constexpr FieldAux() : message_default(nullptr) {}
-    constexpr FieldAux(bool (*enum_validator)(int))
-        : enum_validator(enum_validator) {}
-    constexpr FieldAux(field_layout::Offset off) : offset(off.off) {}
-    constexpr FieldAux(int16_t range_start, uint16_t range_length)
-        : enum_range{range_start, range_length} {}
-    constexpr FieldAux(const MessageLite* msg) : message_default(msg) {}
-    bool (*enum_validator)(int);
-    struct {
-      int16_t start;    // minimum enum number (if it fits)
-      uint16_t length;  // length of range (i.e., max = start + length - 1)
-    } enum_range;
-    uint32_t offset;
-    const MessageLite* message_default;
-  };
-  const FieldAux* field_aux(uint32_t idx) const {
-    return reinterpret_cast<const FieldAux*>(reinterpret_cast<uintptr_t>(this) +
-                                             aux_offset) +
-           idx;
-  }
-  const FieldAux* field_aux(const FieldEntry* entry) const {
-    return field_aux(entry->aux_idx);
-  }
-
-  // Field name data
-  const char* name_data() const {
-    return reinterpret_cast<const char*>(reinterpret_cast<uintptr_t>(this) +
-                                         aux_offset +
-                                         num_aux_entries * sizeof(FieldAux));
-  }
-};
-
-#if defined(_MSC_VER) && !defined(_WIN64)
-#pragma warning(pop)
-#endif
-
-static_assert(sizeof(TcParseTableBase::FastFieldEntry) <= 16,
-              "Fast field entry is too big.");
-static_assert(sizeof(TcParseTableBase::FieldEntry) <= 16,
-              "Field entry is too big.");
-
-template <size_t kFastTableSizeLog2, size_t kNumFieldEntries = 0,
-          size_t kNumFieldAux = 0, size_t kNameTableSize = 0,
-          size_t kFieldLookupSize = 2>
-struct TcParseTable {
-  TcParseTableBase header;
-
-  // Entries for each field.
-  //
-  // Fields are indexed by the lowest bits of their field number. The field
-  // number is masked to fit inside the table. Note that the parsing logic
-  // generally calls `TailCallParseTableBase::fast_entry()` instead of accessing
-  // this field directly.
-  std::array<TcParseTableBase::FastFieldEntry, (1 << kFastTableSizeLog2)>
-      fast_entries;
-
-  // Just big enough to find all the field entries.
-  std::array<uint16_t, kFieldLookupSize> field_lookup_table;
-  // Entries for all fields:
-  std::array<TcParseTableBase::FieldEntry, kNumFieldEntries> field_entries;
-  std::array<TcParseTableBase::FieldAux, kNumFieldAux> aux_entries;
-  std::array<char, kNameTableSize> field_names;
-};
-
-// Partial specialization: if there are no aux entries, there will be no array.
-// In C++, arrays cannot have length 0, but (C++11) std::array<T, 0> is valid.
-// However, different implementations have different sizeof(std::array<T, 0>).
-// Skipping the member makes offset computations portable.
-template <size_t kFastTableSizeLog2, size_t kNumFieldEntries,
-          size_t kNameTableSize, size_t kFieldLookupSize>
-struct TcParseTable<kFastTableSizeLog2, kNumFieldEntries, 0, kNameTableSize,
-                    kFieldLookupSize> {
-  TcParseTableBase header;
-  std::array<TcParseTableBase::FastFieldEntry, (1 << kFastTableSizeLog2)>
-      fast_entries;
-  std::array<uint16_t, kFieldLookupSize> field_lookup_table;
-  std::array<TcParseTableBase::FieldEntry, kNumFieldEntries> field_entries;
-  std::array<char, kNameTableSize> field_names;
-};
-
-// Partial specialization: if there are no fields at all, then we can save space
-// by skipping the field numbers and entries.
-template <size_t kNameTableSize, size_t kFieldLookupSize>
-struct TcParseTable<0, 0, 0, kNameTableSize, kFieldLookupSize> {
-  TcParseTableBase header;
-  // N.B.: the fast entries are sized by log2, so 2**0 fields = 1 entry.
-  // The fast parsing loop will always use this entry, so it must be present.
-  std::array<TcParseTableBase::FastFieldEntry, 1> fast_entries;
-  std::array<uint16_t, kFieldLookupSize> field_lookup_table;
-  std::array<char, kNameTableSize> field_names;
-};
-
-static_assert(std::is_standard_layout<TcParseTable<1>>::value,
-              "TcParseTable must be standard layout.");
-
-static_assert(offsetof(TcParseTable<1>, fast_entries) ==
-                  sizeof(TcParseTableBase),
-              "Table entries must be laid out after TcParseTableBase.");
-
-}  // namespace internal
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
-
-#endif  // GOOGLE_PROTOBUF_GENERATED_MESSAGE_TCTABLE_DECL_H__
diff --git a/libs/protobuf/src/google/protobuf/generated_message_tctable_full.cc b/libs/protobuf/src/google/protobuf/generated_message_tctable_full.cc
deleted file mode 100644
index b77bb8d..0000000
--- a/libs/protobuf/src/google/protobuf/generated_message_tctable_full.cc
+++ /dev/null
@@ -1,53 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <cstdint>
-
-#include <google/protobuf/extension_set.h>
-#include <google/protobuf/generated_message_tctable_impl.h>
-#include <google/protobuf/message.h>
-#include <google/protobuf/parse_context.h>
-#include <google/protobuf/unknown_field_set.h>
-
-// clang-format off
-#include <google/protobuf/port_def.inc>
-// clang-format on
-
-namespace google {
-namespace protobuf {
-namespace internal {
-
-const char* TcParser::GenericFallback(PROTOBUF_TC_PARAM_DECL) {
-  return GenericFallbackImpl<Message, UnknownFieldSet>(PROTOBUF_TC_PARAM_PASS);
-}
-
-}  // namespace internal
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/generated_message_tctable_impl.h b/libs/protobuf/src/google/protobuf/generated_message_tctable_impl.h
deleted file mode 100644
index 21fa533..0000000
--- a/libs/protobuf/src/google/protobuf/generated_message_tctable_impl.h
+++ /dev/null
@@ -1,553 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef GOOGLE_PROTOBUF_GENERATED_MESSAGE_TCTABLE_IMPL_H__
-#define GOOGLE_PROTOBUF_GENERATED_MESSAGE_TCTABLE_IMPL_H__
-
-#include <cstdint>
-#include <type_traits>
-
-#include <google/protobuf/port.h>
-#include <google/protobuf/extension_set.h>
-#include <google/protobuf/generated_message_tctable_decl.h>
-#include <google/protobuf/message_lite.h>
-#include <google/protobuf/metadata_lite.h>
-#include <google/protobuf/parse_context.h>
-#include <google/protobuf/wire_format_lite.h>
-
-// Must come last:
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-
-class Message;
-class UnknownFieldSet;
-
-namespace internal {
-
-// Field layout enums.
-//
-// Structural information about fields is packed into a 16-bit value. The enum
-// types below represent bitwise fields, along with their respective widths,
-// shifts, and masks.
-//
-//     Bit:
-//     +-----------------------+-----------------------+
-//     |15        ..          8|7         ..          0|
-//     +-----------------------+-----------------------+
-//     :  .  :  .  :  .  :  .  :  .  :  .  : 3|========| [3] FieldType
-//     :     :     :     :     :     : 5|=====|  :     : [2] FieldCardinality
-//     :  .  :  .  :  .  :  . 8|========|  :  .  :  .  : [3] FieldRep
-//     :     :     :   10|=====|     :     :     :     : [2] TransformValidation
-//     :  .  :  .12|=====|  .  :  .  :  .  :  .  :  .  : [2] FormatDiscriminator
-//     +-----------------------+-----------------------+
-//     |15        ..          8|7         ..          0|
-//     +-----------------------+-----------------------+
-//
-namespace field_layout {
-// clang-format off
-
-// Field kind (3 bits):
-// These values broadly represent a wire type and an in-memory storage class.
-enum FieldKind : uint16_t {
-  kFkShift = 0,
-  kFkBits = 3,
-  kFkMask = ((1 << kFkBits) - 1) << kFkShift,
-
-  kFkNone = 0,
-  kFkVarint,        // WT=0     rep=8,32,64 bits
-  kFkPackedVarint,  // WT=2     rep=8,32,64 bits
-  kFkFixed,         // WT=1,5   rep=32,64 bits
-  kFkPackedFixed,   // WT=2     rep=32,64 bits
-  kFkString,        // WT=2     rep=various
-  kFkMessage,       // WT=2,3,4 rep=MessageLite*
-  // Maps are a special case of Message, but use different parsing logic.
-  kFkMap,           // WT=2     rep=Map(Lite)<various, various>
-};
-
-static_assert(kFkMap < (1 << kFkBits), "too many types");
-
-// Cardinality (2 bits):
-// These values determine how many values a field can have and its presence.
-// Packed fields are represented in FieldType.
-enum Cardinality : uint16_t {
-  kFcShift    = kFkShift + kFkBits,
-  kFcBits     = 2,
-  kFcMask     = ((1 << kFcBits) - 1) << kFcShift,
-
-  kFcSingular = 0,
-  kFcOptional = 1 << kFcShift,
-  kFcRepeated = 2 << kFcShift,
-  kFcOneof    = 3 << kFcShift,
-};
-
-// Field representation (3 bits):
-// These values are the specific refinements of storage classes in FieldType.
-enum FieldRep : uint16_t {
-  kRepShift    = kFcShift + kFcBits,
-  kRepBits     = 3,
-  kRepMask     = ((1 << kRepBits) - 1) << kRepShift,
-
-  // Numeric types (used for optional and repeated fields):
-  kRep8Bits    = 0,
-  kRep32Bits   = 2 << kRepShift,
-  kRep64Bits   = 3 << kRepShift,
-  // String types:
-  kRepAString  = 0,               // ArenaStringPtr
-  kRepIString  = 1 << kRepShift,  // InlinedString
-  kRepCord     = 2 << kRepShift,  // absl::Cord
-  kRepSPiece   = 3 << kRepShift,  // StringPieceField
-  kRepSString  = 4 << kRepShift,  // std::string*
-  // Message types (WT=2 unless otherwise noted):
-  kRepMessage  = 0,               // MessageLite*
-  kRepGroup    = 1 << kRepShift,  // MessageLite* (WT=3,4)
-  kRepLazy     = 2 << kRepShift,  // LazyField*
-  kRepIWeak    = 3 << kRepShift,  // ImplicitWeak
-};
-
-// Transform/validation (2 bits):
-// These values determine transforms or validation to/from wire format.
-enum TransformValidation : uint16_t {
-  kTvShift     = kRepShift + kRepBits,
-  kTvBits      = 2,
-  kTvMask      = ((1 << kTvBits) - 1) << kTvShift,
-
-  // Varint fields:
-  kTvZigZag    = 1 << kTvShift,
-  kTvEnum      = 2 << kTvShift,  // validate using generated _IsValid()
-  kTvRange     = 3 << kTvShift,  // validate using FieldAux::enum_range
-  // String fields:
-  kTvUtf8Debug = 1 << kTvShift,  // proto2
-  kTvUtf8      = 2 << kTvShift,  // proto3
-};
-
-static_assert((kTvEnum & kTvRange) != 0,
-              "enum validation types must share a bit");
-static_assert((kTvEnum & kTvRange & kTvZigZag) == 0,
-              "zigzag encoding is not enum validation");
-
-// Format discriminators (2 bits):
-enum FormatDiscriminator : uint16_t {
-  kFmtShift      = kTvShift + kTvBits,
-  kFmtBits       = 2,
-  kFmtMask       = ((1 << kFmtBits) - 1) << kFmtShift,
-
-  // Numeric:
-  kFmtUnsigned   = 1 << kFmtShift,  // fixed, varint
-  kFmtSigned     = 2 << kFmtShift,  // fixed, varint
-  kFmtFloating   = 3 << kFmtShift,  // fixed
-  kFmtEnum       = 3 << kFmtShift,  // varint
-  // Strings:
-  kFmtUtf8       = 1 << kFmtShift,  // string (proto3, enforce_utf8=true)
-  kFmtUtf8Escape = 2 << kFmtShift,  // string (proto2, enforce_utf8=false)
-  // Bytes:
-  kFmtArray      = 1 << kFmtShift,  // bytes
-  // Messages:
-  kFmtShow       = 1 << kFmtShift,  // message, map
-};
-
-// Update this assertion (and comments above) when adding or removing bits:
-static_assert(kFmtShift + kFmtBits == 12, "number of bits changed");
-
-// This assertion should not change unless the storage width changes:
-static_assert(kFmtShift + kFmtBits <= 16, "too many bits");
-
-// Convenience aliases (16 bits, with format):
-enum FieldType : uint16_t {
-  // Numeric types:
-  kBool            = kFkVarint | kRep8Bits,
-
-  kFixed32         = kFkFixed  | kRep32Bits | kFmtUnsigned,
-  kUInt32          = kFkVarint | kRep32Bits | kFmtUnsigned,
-  kSFixed32        = kFkFixed  | kRep32Bits | kFmtSigned,
-  kInt32           = kFkVarint | kRep32Bits | kFmtSigned,
-  kSInt32          = kFkVarint | kRep32Bits | kFmtSigned | kTvZigZag,
-  kFloat           = kFkFixed  | kRep32Bits | kFmtFloating,
-  kEnum            = kFkVarint | kRep32Bits | kFmtEnum   | kTvEnum,
-  kEnumRange       = kFkVarint | kRep32Bits | kFmtEnum   | kTvRange,
-  kOpenEnum        = kFkVarint | kRep32Bits | kFmtEnum,
-
-  kFixed64         = kFkFixed  | kRep64Bits | kFmtUnsigned,
-  kUInt64          = kFkVarint | kRep64Bits | kFmtUnsigned,
-  kSFixed64        = kFkFixed  | kRep64Bits | kFmtSigned,
-  kInt64           = kFkVarint | kRep64Bits | kFmtSigned,
-  kSInt64          = kFkVarint | kRep64Bits | kFmtSigned | kTvZigZag,
-  kDouble          = kFkFixed  | kRep64Bits | kFmtFloating,
-
-  kPackedBool      = kFkPackedVarint | kRep8Bits,
-
-  kPackedFixed32   = kFkPackedFixed  | kRep32Bits | kFmtUnsigned,
-  kPackedUInt32    = kFkPackedVarint | kRep32Bits | kFmtUnsigned,
-  kPackedSFixed32  = kFkPackedFixed  | kRep32Bits | kFmtSigned,
-  kPackedInt32     = kFkPackedVarint | kRep32Bits | kFmtSigned,
-  kPackedSInt32    = kFkPackedVarint | kRep32Bits | kFmtSigned | kTvZigZag,
-  kPackedFloat     = kFkPackedFixed  | kRep32Bits | kFmtFloating,
-  kPackedEnum      = kFkPackedVarint | kRep32Bits | kFmtEnum   | kTvEnum,
-  kPackedEnumRange = kFkPackedVarint | kRep32Bits | kFmtEnum   | kTvRange,
-  kPackedOpenEnum  = kFkPackedVarint | kRep32Bits | kFmtEnum,
-
-  kPackedFixed64   = kFkPackedFixed  | kRep64Bits | kFmtUnsigned,
-  kPackedUInt64    = kFkPackedVarint | kRep64Bits | kFmtUnsigned,
-  kPackedSFixed64  = kFkPackedFixed  | kRep64Bits | kFmtSigned,
-  kPackedInt64     = kFkPackedVarint | kRep64Bits | kFmtSigned,
-  kPackedSInt64    = kFkPackedVarint | kRep64Bits | kFmtSigned | kTvZigZag,
-  kPackedDouble    = kFkPackedFixed  | kRep64Bits | kFmtFloating,
-
-  // String types:
-  kBytes           = kFkString | kFmtArray,
-  kRawString       = kFkString | kFmtUtf8  | kTvUtf8Debug,
-  kUtf8String      = kFkString | kFmtUtf8  | kTvUtf8,
-
-  // Message types:
-  kMessage         = kFkMessage,
-
-  // Map types:
-  kMap             = kFkMap,
-};
-
-// clang-format on
-}  // namespace field_layout
-
-// PROTOBUF_TC_PARAM_DECL are the parameters for tailcall functions, it is
-// defined in port_def.inc.
-//
-// Note that this is performance sensitive: changing the parameters will change
-// the registers used by the ABI calling convention, which subsequently affects
-// register selection logic inside the function.
-
-// PROTOBUF_TC_PARAM_PASS passes values to match PROTOBUF_TC_PARAM_DECL.
-#define PROTOBUF_TC_PARAM_PASS msg, ptr, ctx, table, hasbits, data
-
-#ifndef NDEBUG
-template <size_t align>
-#ifndef _MSC_VER
-[[noreturn]]
-#endif
-void AlignFail(uintptr_t address) {
-  GOOGLE_LOG(FATAL) << "Unaligned (" << align << ") access at " << address;
-}
-
-extern template void AlignFail<4>(uintptr_t);
-extern template void AlignFail<8>(uintptr_t);
-#endif
-
-// TcParser implements most of the parsing logic for tailcall tables.
-class PROTOBUF_EXPORT TcParser final {
- public:
-  static const char* GenericFallback(PROTOBUF_TC_PARAM_DECL);
-  static const char* GenericFallbackLite(PROTOBUF_TC_PARAM_DECL);
-
-  static const char* ParseLoop(MessageLite* msg, const char* ptr,
-                               ParseContext* ctx,
-                               const TcParseTableBase* table);
-
-  // Functions referenced by generated fast tables (numeric types):
-  //   F: fixed      V: varint     Z: zigzag
-  //   8/32/64: storage type width (bits)
-  //   S: singular   R: repeated   P: packed
-  //   1/2: tag length (bytes)
-
-  // Fixed:
-  static const char* FastF32S1(PROTOBUF_TC_PARAM_DECL);
-  static const char* FastF32S2(PROTOBUF_TC_PARAM_DECL);
-  static const char* FastF32R1(PROTOBUF_TC_PARAM_DECL);
-  static const char* FastF32R2(PROTOBUF_TC_PARAM_DECL);
-  static const char* FastF32P1(PROTOBUF_TC_PARAM_DECL);
-  static const char* FastF32P2(PROTOBUF_TC_PARAM_DECL);
-  static const char* FastF64S1(PROTOBUF_TC_PARAM_DECL);
-  static const char* FastF64S2(PROTOBUF_TC_PARAM_DECL);
-  static const char* FastF64R1(PROTOBUF_TC_PARAM_DECL);
-  static const char* FastF64R2(PROTOBUF_TC_PARAM_DECL);
-  static const char* FastF64P1(PROTOBUF_TC_PARAM_DECL);
-  static const char* FastF64P2(PROTOBUF_TC_PARAM_DECL);
-
-  // Varint:
-  static const char* FastV8S1(PROTOBUF_TC_PARAM_DECL);
-  static const char* FastV8S2(PROTOBUF_TC_PARAM_DECL);
-  static const char* FastV8R1(PROTOBUF_TC_PARAM_DECL);
-  static const char* FastV8R2(PROTOBUF_TC_PARAM_DECL);
-  static const char* FastV8P1(PROTOBUF_TC_PARAM_DECL);
-  static const char* FastV8P2(PROTOBUF_TC_PARAM_DECL);
-  static const char* FastV32S1(PROTOBUF_TC_PARAM_DECL);
-  static const char* FastV32S2(PROTOBUF_TC_PARAM_DECL);
-  static const char* FastV32R1(PROTOBUF_TC_PARAM_DECL);
-  static const char* FastV32R2(PROTOBUF_TC_PARAM_DECL);
-  static const char* FastV32P1(PROTOBUF_TC_PARAM_DECL);
-  static const char* FastV32P2(PROTOBUF_TC_PARAM_DECL);
-  static const char* FastV64S1(PROTOBUF_TC_PARAM_DECL);
-  static const char* FastV64S2(PROTOBUF_TC_PARAM_DECL);
-  static const char* FastV64R1(PROTOBUF_TC_PARAM_DECL);
-  static const char* FastV64R2(PROTOBUF_TC_PARAM_DECL);
-  static const char* FastV64P1(PROTOBUF_TC_PARAM_DECL);
-  static const char* FastV64P2(PROTOBUF_TC_PARAM_DECL);
-
-  // Varint (with zigzag):
-  static const char* FastZ32S1(PROTOBUF_TC_PARAM_DECL);
-  static const char* FastZ32S2(PROTOBUF_TC_PARAM_DECL);
-  static const char* FastZ32R1(PROTOBUF_TC_PARAM_DECL);
-  static const char* FastZ32R2(PROTOBUF_TC_PARAM_DECL);
-  static const char* FastZ32P1(PROTOBUF_TC_PARAM_DECL);
-  static const char* FastZ32P2(PROTOBUF_TC_PARAM_DECL);
-  static const char* FastZ64S1(PROTOBUF_TC_PARAM_DECL);
-  static const char* FastZ64S2(PROTOBUF_TC_PARAM_DECL);
-  static const char* FastZ64R1(PROTOBUF_TC_PARAM_DECL);
-  static const char* FastZ64R2(PROTOBUF_TC_PARAM_DECL);
-  static const char* FastZ64P1(PROTOBUF_TC_PARAM_DECL);
-  static const char* FastZ64P2(PROTOBUF_TC_PARAM_DECL);
-
-  // Functions referenced by generated fast tables (closed enum):
-  //   E: closed enum (N.B.: open enums use V32, above)
-  //   r: enum range  v: enum validator (_IsValid function)
-  //   S: singular   R: repeated
-  //   1/2: tag length (bytes)
-  static const char* FastErS1(PROTOBUF_TC_PARAM_DECL);
-  static const char* FastErS2(PROTOBUF_TC_PARAM_DECL);
-  static const char* FastErR1(PROTOBUF_TC_PARAM_DECL);
-  static const char* FastErR2(PROTOBUF_TC_PARAM_DECL);
-  static const char* FastEvS1(PROTOBUF_TC_PARAM_DECL);
-  static const char* FastEvS2(PROTOBUF_TC_PARAM_DECL);
-  static const char* FastEvR1(PROTOBUF_TC_PARAM_DECL);
-  static const char* FastEvR2(PROTOBUF_TC_PARAM_DECL);
-
-  // Functions referenced by generated fast tables (string types):
-  //   B: bytes      S: string     U: UTF-8 string
-  //   (empty): ArenaStringPtr     i: InlinedString
-  //   S: singular   R: repeated
-  //   1/2: tag length (bytes)
-  static const char* FastBS1(PROTOBUF_TC_PARAM_DECL);
-  static const char* FastBS2(PROTOBUF_TC_PARAM_DECL);
-  static const char* FastBR1(PROTOBUF_TC_PARAM_DECL);
-  static const char* FastBR2(PROTOBUF_TC_PARAM_DECL);
-  static const char* FastSS1(PROTOBUF_TC_PARAM_DECL);
-  static const char* FastSS2(PROTOBUF_TC_PARAM_DECL);
-  static const char* FastSR1(PROTOBUF_TC_PARAM_DECL);
-  static const char* FastSR2(PROTOBUF_TC_PARAM_DECL);
-  static const char* FastUS1(PROTOBUF_TC_PARAM_DECL);
-  static const char* FastUS2(PROTOBUF_TC_PARAM_DECL);
-  static const char* FastUR1(PROTOBUF_TC_PARAM_DECL);
-  static const char* FastUR2(PROTOBUF_TC_PARAM_DECL);
-
-  static const char* FastBiS1(PROTOBUF_TC_PARAM_DECL);
-  static const char* FastBiS2(PROTOBUF_TC_PARAM_DECL);
-  static const char* FastSiS1(PROTOBUF_TC_PARAM_DECL);
-  static const char* FastSiS2(PROTOBUF_TC_PARAM_DECL);
-  static const char* FastUiS1(PROTOBUF_TC_PARAM_DECL);
-  static const char* FastUiS2(PROTOBUF_TC_PARAM_DECL);
-
-  // Functions referenced by generated fast tables (message types):
-  //   M: message    G: group
-  //   S: singular   R: repeated
-  //   1/2: tag length (bytes)
-  static const char* FastMS1(PROTOBUF_TC_PARAM_DECL);
-  static const char* FastMS2(PROTOBUF_TC_PARAM_DECL);
-  static const char* FastMR1(PROTOBUF_TC_PARAM_DECL);
-  static const char* FastMR2(PROTOBUF_TC_PARAM_DECL);
-  static const char* FastGS1(PROTOBUF_TC_PARAM_DECL);
-  static const char* FastGS2(PROTOBUF_TC_PARAM_DECL);
-  static const char* FastGR1(PROTOBUF_TC_PARAM_DECL);
-  static const char* FastGR2(PROTOBUF_TC_PARAM_DECL);
-
-  template <typename T>
-  static inline T& RefAt(void* x, size_t offset) {
-    T* target = reinterpret_cast<T*>(static_cast<char*>(x) + offset);
-#ifndef NDEBUG
-    if (PROTOBUF_PREDICT_FALSE(
-            reinterpret_cast<uintptr_t>(target) % alignof(T) != 0)) {
-      AlignFail<alignof(T)>(reinterpret_cast<uintptr_t>(target));
-    }
-#endif
-    return *target;
-  }
-
-  template <typename T>
-  static inline const T& RefAt(const void* x, size_t offset) {
-    const T* target =
-        reinterpret_cast<const T*>(static_cast<const char*>(x) + offset);
-#ifndef NDEBUG
-    if (PROTOBUF_PREDICT_FALSE(
-            reinterpret_cast<uintptr_t>(target) % alignof(T) != 0)) {
-      AlignFail<alignof(T)>(reinterpret_cast<uintptr_t>(target));
-    }
-#endif
-    return *target;
-  }
-
-  template <typename T>
-  static inline T ReadAt(const void* x, size_t offset) {
-    T out;
-    memcpy(&out, static_cast<const char*>(x) + offset, sizeof(T));
-    return out;
-  }
-
-  // Mini parsing:
-  //
-  // This function parses a field from incoming data based on metadata stored in
-  // the message definition. If the field is not defined in the message, it is
-  // stored in either the ExtensionSet (if applicable) or the UnknownFieldSet.
-  //
-  // NOTE: Currently, this function only calls the table-level fallback
-  // function, so it should only be called as the fallback from fast table
-  // parsing.
-  static const char* MiniParse(PROTOBUF_TC_PARAM_DECL);
-
- private:
-  friend class GeneratedTcTableLiteTest;
-
-  template <typename TagType, bool group_coding>
-  static inline const char* SingularParseMessageAuxImpl(PROTOBUF_TC_PARAM_DECL);
-  template <typename TagType, bool group_coding>
-  static inline const char* RepeatedParseMessageAuxImpl(PROTOBUF_TC_PARAM_DECL);
-
-  static inline PROTOBUF_ALWAYS_INLINE void SyncHasbits(
-      MessageLite* msg, uint64_t hasbits, const TcParseTableBase* table) {
-    const uint32_t has_bits_offset = table->has_bits_offset;
-    if (has_bits_offset) {
-      // Only the first 32 has-bits are updated. Nothing above those is stored,
-      // but e.g. messages without has-bits update the upper bits.
-      RefAt<uint32_t>(msg, has_bits_offset) = static_cast<uint32_t>(hasbits);
-    }
-  }
-
-  static const char* TagDispatch(PROTOBUF_TC_PARAM_DECL);
-  static const char* ToTagDispatch(PROTOBUF_TC_PARAM_DECL);
-  static const char* ToParseLoop(PROTOBUF_TC_PARAM_DECL);
-  static const char* Error(PROTOBUF_TC_PARAM_DECL);
-
-  static const char* FastUnknownEnumFallback(PROTOBUF_TC_PARAM_DECL);
-
-  class ScopedArenaSwap;
-
-  template <class MessageBaseT, class UnknownFieldsT>
-  static const char* GenericFallbackImpl(PROTOBUF_TC_PARAM_DECL) {
-#define CHK_(x) \
-  if (PROTOBUF_PREDICT_FALSE(!(x))) return nullptr /* NOLINT */
-
-    SyncHasbits(msg, hasbits, table);
-    CHK_(ptr);
-    uint32_t tag = data.tag();
-    if ((tag & 7) == WireFormatLite::WIRETYPE_END_GROUP || tag == 0) {
-      ctx->SetLastTag(tag);
-      return ptr;
-    }
-    uint32_t num = tag >> 3;
-    if (table->extension_range_low <= num &&
-        num <= table->extension_range_high) {
-      return RefAt<ExtensionSet>(msg, table->extension_offset)
-          .ParseField(tag, ptr,
-                      static_cast<const MessageBaseT*>(table->default_instance),
-                      &msg->_internal_metadata_, ctx);
-    }
-    return UnknownFieldParse(
-        tag, msg->_internal_metadata_.mutable_unknown_fields<UnknownFieldsT>(),
-        ptr, ctx);
-#undef CHK_
-  }
-
-  // Note: `inline` is needed on template function declarations below to avoid
-  // -Wattributes diagnostic in GCC.
-
-  // Implementations for fast fixed field parsing functions:
-  template <typename LayoutType, typename TagType>
-  static inline const char* SingularFixed(PROTOBUF_TC_PARAM_DECL);
-  template <typename LayoutType, typename TagType>
-  static inline const char* RepeatedFixed(PROTOBUF_TC_PARAM_DECL);
-  template <typename LayoutType, typename TagType>
-  static inline const char* PackedFixed(PROTOBUF_TC_PARAM_DECL);
-
-  // Implementations for fast varint field parsing functions:
-  template <typename FieldType, typename TagType, bool zigzag = false>
-  static inline const char* SingularVarint(PROTOBUF_TC_PARAM_DECL);
-  template <typename FieldType, typename TagType, bool zigzag = false>
-  static inline const char* RepeatedVarint(PROTOBUF_TC_PARAM_DECL);
-  template <typename FieldType, typename TagType, bool zigzag = false>
-  static inline const char* PackedVarint(PROTOBUF_TC_PARAM_DECL);
-
-  // Helper for ints > 127:
-  template <typename FieldType, typename TagType, bool zigzag = false>
-  static const char* SingularVarBigint(PROTOBUF_TC_PARAM_DECL);
-
-  // Implementations for fast enum field parsing functions:
-  template <typename TagType, uint16_t xform_val>
-  static inline const char* SingularEnum(PROTOBUF_TC_PARAM_DECL);
-  template <typename TagType, uint16_t xform_val>
-  static inline const char* RepeatedEnum(PROTOBUF_TC_PARAM_DECL);
-
-  // Implementations for fast string field parsing functions:
-  enum Utf8Type { kNoUtf8 = 0, kUtf8 = 1, kUtf8ValidateOnly = 2 };
-  template <typename TagType, Utf8Type utf8>
-  static inline const char* SingularString(PROTOBUF_TC_PARAM_DECL);
-  template <typename TagType, Utf8Type utf8>
-  static inline const char* RepeatedString(PROTOBUF_TC_PARAM_DECL);
-
-  // Mini field lookup:
-  static const TcParseTableBase::FieldEntry* FindFieldEntry(
-      const TcParseTableBase* table, uint32_t field_num);
-  static StringPiece MessageName(const TcParseTableBase* table);
-  static StringPiece FieldName(const TcParseTableBase* table,
-                                     const TcParseTableBase::FieldEntry*);
-  static bool ChangeOneof(const TcParseTableBase* table,
-                          const TcParseTableBase::FieldEntry& entry,
-                          uint32_t field_num, ParseContext* ctx,
-                          MessageLite* msg);
-
-  // UTF-8 validation:
-  static void ReportFastUtf8Error(uint32_t decoded_tag,
-                                  const TcParseTableBase* table);
-  static bool MpVerifyUtf8(StringPiece wire_bytes,
-                           const TcParseTableBase* table,
-                           const TcParseTableBase::FieldEntry& entry,
-                           uint16_t xform_val);
-
-  // For FindFieldEntry tests:
-  friend class FindFieldEntryTest;
-  static constexpr const uint32_t kMtSmallScanSize = 4;
-
-  // Mini parsing:
-  static const char* MpVarint(PROTOBUF_TC_PARAM_DECL);
-  static const char* MpRepeatedVarint(PROTOBUF_TC_PARAM_DECL);
-  static const char* MpPackedVarint(PROTOBUF_TC_PARAM_DECL);
-  static const char* MpFixed(PROTOBUF_TC_PARAM_DECL);
-  static const char* MpRepeatedFixed(PROTOBUF_TC_PARAM_DECL);
-  static const char* MpPackedFixed(PROTOBUF_TC_PARAM_DECL);
-  static const char* MpString(PROTOBUF_TC_PARAM_DECL);
-  static const char* MpRepeatedString(PROTOBUF_TC_PARAM_DECL);
-  static const char* MpMessage(PROTOBUF_TC_PARAM_DECL);
-  static const char* MpRepeatedMessage(PROTOBUF_TC_PARAM_DECL);
-  static const char* MpMap(PROTOBUF_TC_PARAM_DECL);
-};
-
-}  // namespace internal
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
-
-#endif  // GOOGLE_PROTOBUF_GENERATED_MESSAGE_TCTABLE_IMPL_H__
diff --git a/libs/protobuf/src/google/protobuf/generated_message_tctable_lite.cc b/libs/protobuf/src/google/protobuf/generated_message_tctable_lite.cc
deleted file mode 100644
index 9993811..0000000
--- a/libs/protobuf/src/google/protobuf/generated_message_tctable_lite.cc
+++ /dev/null
@@ -1,1859 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <cstdint>
-#include <numeric>
-
-#include <google/protobuf/extension_set.h>
-#include <google/protobuf/generated_message_tctable_decl.h>
-#include <google/protobuf/generated_message_tctable_impl.h>
-#include <google/protobuf/inlined_string_field.h>
-#include <google/protobuf/message_lite.h>
-#include <google/protobuf/parse_context.h>
-#include <google/protobuf/wire_format_lite.h>
-
-// clang-format off
-#include <google/protobuf/port_def.inc>
-// clang-format on
-
-namespace google {
-namespace protobuf {
-namespace internal {
-
-using FieldEntry = TcParseTableBase::FieldEntry;
-
-//////////////////////////////////////////////////////////////////////////////
-// Template instantiations:
-//////////////////////////////////////////////////////////////////////////////
-
-#ifndef NDEBUG
-template void AlignFail<4>(uintptr_t);
-template void AlignFail<8>(uintptr_t);
-#endif
-
-const char* TcParser::GenericFallbackLite(PROTOBUF_TC_PARAM_DECL) {
-  return GenericFallbackImpl<MessageLite, std::string>(PROTOBUF_TC_PARAM_PASS);
-}
-
-//////////////////////////////////////////////////////////////////////////////
-// Core fast parsing implementation:
-//////////////////////////////////////////////////////////////////////////////
-
-class TcParser::ScopedArenaSwap final {
- public:
-  ScopedArenaSwap(MessageLite* msg, ParseContext* ctx)
-      : ctx_(ctx), saved_(ctx->data().arena) {
-    ctx_->data().arena = msg->GetArenaForAllocation();
-  }
-  ScopedArenaSwap(const ScopedArenaSwap&) = delete;
-  ~ScopedArenaSwap() { ctx_->data().arena = saved_; }
-
- private:
-  ParseContext* const ctx_;
-  Arena* const saved_;
-};
-
-PROTOBUF_NOINLINE const char* TcParser::ParseLoop(
-    MessageLite* msg, const char* ptr, ParseContext* ctx,
-    const TcParseTableBase* table) {
-  ScopedArenaSwap saved(msg, ctx);
-  while (!ctx->Done(&ptr)) {
-    // Unconditionally read has bits, even if we don't have has bits.
-    // has_bits_offset will be 0 and we will just read something valid.
-    uint64_t hasbits = ReadAt<uint32_t>(msg, table->has_bits_offset);
-    ptr = TagDispatch(msg, ptr, ctx, table, hasbits, {});
-    if (ptr == nullptr) break;
-    if (ctx->LastTag() != 1) break;  // Ended on terminating tag
-  }
-  return ptr;
-}
-
-  // Dispatch to the designated parse function
-inline PROTOBUF_ALWAYS_INLINE const char* TcParser::TagDispatch(
-    PROTOBUF_TC_PARAM_DECL) {
-  const auto coded_tag = UnalignedLoad<uint16_t>(ptr);
-  const size_t idx = coded_tag & table->fast_idx_mask;
-  PROTOBUF_ASSUME((idx & 7) == 0);
-  auto* fast_entry = table->fast_entry(idx >> 3);
-  data = fast_entry->bits;
-  data.data ^= coded_tag;
-  PROTOBUF_MUSTTAIL return fast_entry->target(PROTOBUF_TC_PARAM_PASS);
-}
-
-// We can only safely call from field to next field if the call is optimized
-// to a proper tail call. Otherwise we blow through stack. Clang and gcc
-// reliably do this optimization in opt mode, but do not perform this in debug
-// mode. Luckily the structure of the algorithm is such that it's always
-// possible to just return and use the enclosing parse loop as a trampoline.
-inline PROTOBUF_ALWAYS_INLINE const char* TcParser::ToTagDispatch(
-    PROTOBUF_TC_PARAM_DECL) {
-  constexpr bool always_return = !PROTOBUF_TAILCALL;
-  if (always_return || !ctx->DataAvailable(ptr)) {
-    PROTOBUF_MUSTTAIL return ToParseLoop(PROTOBUF_TC_PARAM_PASS);
-  }
-  PROTOBUF_MUSTTAIL return TagDispatch(PROTOBUF_TC_PARAM_PASS);
-}
-
-inline PROTOBUF_ALWAYS_INLINE const char* TcParser::ToParseLoop(
-    PROTOBUF_TC_PARAM_DECL) {
-  (void)data;
-  (void)ctx;
-  SyncHasbits(msg, hasbits, table);
-  return ptr;
-}
-
-inline PROTOBUF_ALWAYS_INLINE const char* TcParser::Error(
-    PROTOBUF_TC_PARAM_DECL) {
-  (void)data;
-  (void)ctx;
-  (void)ptr;
-  SyncHasbits(msg, hasbits, table);
-  return nullptr;
-}
-
-// On the fast path, a (matching) 1-byte tag already has the decoded value.
-static uint32_t FastDecodeTag(uint8_t coded_tag) {
-  return coded_tag;
-}
-
-// On the fast path, a (matching) 2-byte tag always needs to be decoded.
-static uint32_t FastDecodeTag(uint16_t coded_tag) {
-  uint32_t result = coded_tag;
-  result += static_cast<int8_t>(coded_tag);
-  return result >> 1;
-}
-
-//////////////////////////////////////////////////////////////////////////////
-// Core mini parsing implementation:
-//////////////////////////////////////////////////////////////////////////////
-
-// Field lookup table layout:
-//
-// Because it consists of a series of variable-length segments, the lookuup
-// table is organized within an array of uint16_t, and each element is either
-// a uint16_t or a uint32_t stored little-endian as a pair of uint16_t.
-//
-// Its fundamental building block maps 16 contiguously ascending field numbers
-// to their locations within the field entry table:
-
-struct SkipEntry16 {
-  uint16_t skipmap;
-  uint16_t field_entry_offset;
-};
-
-// The skipmap is a bitfield of which of those field numbers do NOT have a
-// field entry.  The lowest bit of the skipmap corresponds to the lowest of
-// the 16 field numbers, so if a proto had only fields 1, 2, 3, and 7, the
-// skipmap would contain 0b11111111'10111000.
-//
-// The field lookup table begins with a single 32-bit skipmap that maps the
-// field numbers 1 through 32.  This is because the majority of proto
-// messages only contain fields numbered 1 to 32.
-//
-// The rest of the lookup table is a repeated series of
-// { 32-bit field #,  #SkipEntry16s,  {SkipEntry16...} }
-// That is, the next thing is a pair of uint16_t that form the next
-// lowest field number that the lookup table handles.  If this number is -1,
-// that is the end of the table.  Then there is a uint16_t that is
-// the number of contiguous SkipEntry16 entries that follow, and then of
-// course the SkipEntry16s themselves.
-
-// Originally developed and tested at https://godbolt.org/z/vbc7enYcf
-
-// Returns the address of the field for `tag` in the table's field entries.
-// Returns nullptr if the field was not found.
-const TcParseTableBase::FieldEntry* TcParser::FindFieldEntry(
-    const TcParseTableBase* table, uint32_t field_num) {
-  const FieldEntry* const field_entries = table->field_entries_begin();
-
-  uint32_t fstart = 1;
-  uint32_t adj_fnum = field_num - fstart;
-
-  if (PROTOBUF_PREDICT_TRUE(adj_fnum < 32)) {
-    uint32_t skipmap = table->skipmap32;
-    uint32_t skipbit = 1 << adj_fnum;
-    if (PROTOBUF_PREDICT_FALSE(skipmap & skipbit)) return nullptr;
-    skipmap &= skipbit - 1;
-#if (__GNUC__ || __clang__) && __POPCNT__
-    // Note: here and below, skipmap typically has very few set bits
-    // (31 in the worst case, but usually zero) so a loop isn't that
-    // bad, and a compiler-generated popcount is typically only
-    // worthwhile if the processor itself has hardware popcount support.
-    adj_fnum -= __builtin_popcount(skipmap);
-#else
-    while (skipmap) {
-      --adj_fnum;
-      skipmap &= skipmap - 1;
-    }
-#endif
-    auto* entry = field_entries + adj_fnum;
-    PROTOBUF_ASSUME(entry != nullptr);
-    return entry;
-  }
-  const uint16_t* lookup_table = table->field_lookup_begin();
-  for (;;) {
-#ifdef PROTOBUF_LITTLE_ENDIAN
-    memcpy(&fstart, lookup_table, sizeof(fstart));
-#else
-    fstart = lookup_table[0] | (lookup_table[1] << 16);
-#endif
-    lookup_table += sizeof(fstart) / sizeof(*lookup_table);
-    uint32_t num_skip_entries = *lookup_table++;
-    if (field_num < fstart) return nullptr;
-    adj_fnum = field_num - fstart;
-    uint32_t skip_num = adj_fnum / 16;
-    if (PROTOBUF_PREDICT_TRUE(skip_num < num_skip_entries)) {
-      // for each group of 16 fields we have:
-      // a bitmap of 16 bits
-      // a 16-bit field-entry offset for the first of them.
-      auto* skip_data = lookup_table + (adj_fnum / 16) * (sizeof(SkipEntry16) /
-                                                          sizeof(uint16_t));
-      SkipEntry16 se = {skip_data[0], skip_data[1]};
-      adj_fnum &= 15;
-      uint32_t skipmap = se.skipmap;
-      uint16_t skipbit = 1 << adj_fnum;
-      if (PROTOBUF_PREDICT_FALSE(skipmap & skipbit)) return nullptr;
-      skipmap &= skipbit - 1;
-      adj_fnum += se.field_entry_offset;
-#if (__GNUC__ || __clang__) && __POPCNT__
-      adj_fnum -= __builtin_popcount(skipmap);
-#else
-      while (skipmap) {
-        --adj_fnum;
-        skipmap &= skipmap - 1;
-      }
-#endif
-      auto* entry = field_entries + adj_fnum;
-      PROTOBUF_ASSUME(entry != nullptr);
-      return entry;
-    }
-    lookup_table +=
-        num_skip_entries * (sizeof(SkipEntry16) / sizeof(*lookup_table));
-  }
-}
-
-// Field names are stored in a format of:
-//
-// 1) A table of name sizes, one byte each, from 1 to 255 per name.
-//    `entries` is the size of this first table.
-// 1a) padding bytes, so the table of name sizes is a multiple of
-//     eight bytes in length. They are zero.
-//
-// 2) All the names, concatenated, with neither separation nor termination.
-//
-// This is designed to be compact but not particularly fast to retrieve.
-// In particular, it takes O(n) to retrieve the name of the n'th field,
-// which is usually fine because most protos have fewer than 10 fields.
-static StringPiece FindName(const char* name_data, size_t entries,
-                                  size_t index) {
-  // The compiler unrolls these... if this isn't fast enough,
-  // there's an AVX version at https://godbolt.org/z/eojrjqzfr
-  // ARM-compatible version at https://godbolt.org/z/n5YT5Ee85
-
-  // The field name sizes are padded up to a multiple of 8, so we
-  // must pad them here.
-  size_t num_sizes = (entries + 7) & -8;
-  auto* uint8s = reinterpret_cast<const uint8_t*>(name_data);
-  size_t pos = std::accumulate(uint8s, uint8s + index, num_sizes);
-  size_t size = name_data[index];
-  auto* start = &name_data[pos];
-  return {start, size};
-}
-
-StringPiece TcParser::MessageName(const TcParseTableBase* table) {
-  return FindName(table->name_data(), table->num_field_entries + 1, 0);
-}
-
-StringPiece TcParser::FieldName(const TcParseTableBase* table,
-                                      const FieldEntry* field_entry) {
-  const FieldEntry* const field_entries = table->field_entries_begin();
-  auto field_index = static_cast<size_t>(field_entry - field_entries);
-  return FindName(table->name_data(), table->num_field_entries + 1,
-                  field_index + 1);
-}
-
-const char* TcParser::MiniParse(PROTOBUF_TC_PARAM_DECL) {
-  uint32_t tag;
-  ptr = ReadTagInlined(ptr, &tag);
-  if (PROTOBUF_PREDICT_FALSE(ptr == nullptr)) return nullptr;
-
-  auto* entry = FindFieldEntry(table, tag >> 3);
-  if (entry == nullptr) {
-    data.data = tag;
-    PROTOBUF_MUSTTAIL return table->fallback(PROTOBUF_TC_PARAM_PASS);
-  }
-
-  // The handler may need the tag and the entry to resolve fallback logic. Both
-  // of these are 32 bits, so pack them into (the 64-bit) `data`. Since we can't
-  // pack the entry pointer itself, just pack its offset from `table`.
-  uint64_t entry_offset = reinterpret_cast<const char*>(entry) -
-                          reinterpret_cast<const char*>(table);
-  data.data = entry_offset << 32 | tag;
-
-  using field_layout::FieldKind;
-  auto field_type = entry->type_card & FieldKind::kFkMask;
-  switch (field_type) {
-    case FieldKind::kFkNone:
-      PROTOBUF_MUSTTAIL return table->fallback(PROTOBUF_TC_PARAM_PASS);
-    case FieldKind::kFkVarint:
-      PROTOBUF_MUSTTAIL return MpVarint(PROTOBUF_TC_PARAM_PASS);
-    case FieldKind::kFkPackedVarint:
-      PROTOBUF_MUSTTAIL return MpPackedVarint(PROTOBUF_TC_PARAM_PASS);
-    case FieldKind::kFkFixed:
-      PROTOBUF_MUSTTAIL return MpFixed(PROTOBUF_TC_PARAM_PASS);
-    case FieldKind::kFkPackedFixed:
-      PROTOBUF_MUSTTAIL return MpPackedFixed(PROTOBUF_TC_PARAM_PASS);
-    case FieldKind::kFkString:
-      PROTOBUF_MUSTTAIL return MpString(PROTOBUF_TC_PARAM_PASS);
-    case FieldKind::kFkMessage:
-      PROTOBUF_MUSTTAIL return MpMessage(PROTOBUF_TC_PARAM_PASS);
-    case FieldKind::kFkMap:
-      PROTOBUF_MUSTTAIL return MpMap(PROTOBUF_TC_PARAM_PASS);
-    default:
-      return Error(PROTOBUF_TC_PARAM_PASS);
-  }
-}
-
-namespace {
-
-// Offset returns the address `offset` bytes after `base`.
-inline void* Offset(void* base, uint32_t offset) {
-  return static_cast<uint8_t*>(base) + offset;
-}
-
-// InvertPacked changes tag bits from the given wire type to length
-// delimited. This is the difference expected between packed and non-packed
-// repeated fields.
-template <WireFormatLite::WireType Wt>
-inline PROTOBUF_ALWAYS_INLINE void InvertPacked(TcFieldData& data) {
-  data.data ^= Wt ^ WireFormatLite::WIRETYPE_LENGTH_DELIMITED;
-}
-
-}  // namespace
-
-//////////////////////////////////////////////////////////////////////////////
-// Message fields
-//////////////////////////////////////////////////////////////////////////////
-
-template <typename TagType, bool group_coding>
-inline PROTOBUF_ALWAYS_INLINE
-const char* TcParser::SingularParseMessageAuxImpl(PROTOBUF_TC_PARAM_DECL) {
-  if (PROTOBUF_PREDICT_FALSE(data.coded_tag<TagType>() != 0)) {
-    PROTOBUF_MUSTTAIL return MiniParse(PROTOBUF_TC_PARAM_PASS);
-  }
-  auto saved_tag = UnalignedLoad<TagType>(ptr);
-  ptr += sizeof(TagType);
-  hasbits |= (uint64_t{1} << data.hasbit_idx());
-  SyncHasbits(msg, hasbits, table);
-  auto& field = RefAt<MessageLite*>(msg, data.offset());
-  if (field == nullptr) {
-    const MessageLite* default_instance =
-        table->field_aux(data.aux_idx())->message_default;
-    field = default_instance->New(ctx->data().arena);
-  }
-  if (group_coding) {
-    return ctx->ParseGroup(field, ptr, FastDecodeTag(saved_tag));
-  }
-  return ctx->ParseMessage(field, ptr);
-}
-
-const char* TcParser::FastMS1(PROTOBUF_TC_PARAM_DECL) {
-  PROTOBUF_MUSTTAIL return SingularParseMessageAuxImpl<uint8_t, false>(
-      PROTOBUF_TC_PARAM_PASS);
-}
-
-const char* TcParser::FastMS2(PROTOBUF_TC_PARAM_DECL) {
-  PROTOBUF_MUSTTAIL return SingularParseMessageAuxImpl<uint16_t, false>(
-      PROTOBUF_TC_PARAM_PASS);
-}
-
-const char* TcParser::FastGS1(PROTOBUF_TC_PARAM_DECL) {
-  PROTOBUF_MUSTTAIL return SingularParseMessageAuxImpl<uint8_t, true>(
-      PROTOBUF_TC_PARAM_PASS);
-}
-
-const char* TcParser::FastGS2(PROTOBUF_TC_PARAM_DECL) {
-  PROTOBUF_MUSTTAIL return SingularParseMessageAuxImpl<uint16_t, true>(
-      PROTOBUF_TC_PARAM_PASS);
-}
-
-template <typename TagType, bool group_coding>
-inline PROTOBUF_ALWAYS_INLINE
-const char* TcParser::RepeatedParseMessageAuxImpl(PROTOBUF_TC_PARAM_DECL) {
-  if (PROTOBUF_PREDICT_FALSE(data.coded_tag<TagType>() != 0)) {
-    PROTOBUF_MUSTTAIL return MiniParse(PROTOBUF_TC_PARAM_PASS);
-  }
-  auto saved_tag = UnalignedLoad<TagType>(ptr);
-  ptr += sizeof(TagType);
-  SyncHasbits(msg, hasbits, table);
-  const MessageLite* default_instance =
-      table->field_aux(data.aux_idx())->message_default;
-  auto& field = RefAt<RepeatedPtrFieldBase>(msg, data.offset());
-  MessageLite* submsg =
-      field.Add<GenericTypeHandler<MessageLite>>(default_instance);
-  if (group_coding) {
-    return ctx->ParseGroup(submsg, ptr, FastDecodeTag(saved_tag));
-  }
-  return ctx->ParseMessage(submsg, ptr);
-}
-
-const char* TcParser::FastMR1(PROTOBUF_TC_PARAM_DECL) {
-  PROTOBUF_MUSTTAIL return RepeatedParseMessageAuxImpl<uint8_t, false>(
-      PROTOBUF_TC_PARAM_PASS);
-}
-
-const char* TcParser::FastMR2(PROTOBUF_TC_PARAM_DECL) {
-  PROTOBUF_MUSTTAIL return RepeatedParseMessageAuxImpl<uint16_t, false>(
-      PROTOBUF_TC_PARAM_PASS);
-}
-
-const char* TcParser::FastGR1(PROTOBUF_TC_PARAM_DECL) {
-  PROTOBUF_MUSTTAIL return RepeatedParseMessageAuxImpl<uint8_t, true>(
-      PROTOBUF_TC_PARAM_PASS);
-}
-
-const char* TcParser::FastGR2(PROTOBUF_TC_PARAM_DECL) {
-  PROTOBUF_MUSTTAIL return RepeatedParseMessageAuxImpl<uint16_t, true>(
-      PROTOBUF_TC_PARAM_PASS);
-}
-
-//////////////////////////////////////////////////////////////////////////////
-// Fixed fields
-//////////////////////////////////////////////////////////////////////////////
-
-template <typename LayoutType, typename TagType>
-PROTOBUF_ALWAYS_INLINE const char* TcParser::SingularFixed(
-    PROTOBUF_TC_PARAM_DECL) {
-  if (PROTOBUF_PREDICT_FALSE(data.coded_tag<TagType>() != 0)) {
-    PROTOBUF_MUSTTAIL return MiniParse(PROTOBUF_TC_PARAM_PASS);
-  }
-  ptr += sizeof(TagType);  // Consume tag
-  hasbits |= (uint64_t{1} << data.hasbit_idx());
-  RefAt<LayoutType>(msg, data.offset()) = UnalignedLoad<LayoutType>(ptr);
-  ptr += sizeof(LayoutType);
-  PROTOBUF_MUSTTAIL return ToTagDispatch(PROTOBUF_TC_PARAM_PASS);
-}
-
-const char* TcParser::FastF32S1(PROTOBUF_TC_PARAM_DECL) {
-  PROTOBUF_MUSTTAIL return SingularFixed<uint32_t, uint8_t>(
-      PROTOBUF_TC_PARAM_PASS);
-}
-const char* TcParser::FastF32S2(PROTOBUF_TC_PARAM_DECL) {
-  PROTOBUF_MUSTTAIL return SingularFixed<uint32_t, uint16_t>(
-      PROTOBUF_TC_PARAM_PASS);
-}
-const char* TcParser::FastF64S1(PROTOBUF_TC_PARAM_DECL) {
-  PROTOBUF_MUSTTAIL return SingularFixed<uint64_t, uint8_t>(
-      PROTOBUF_TC_PARAM_PASS);
-}
-const char* TcParser::FastF64S2(PROTOBUF_TC_PARAM_DECL) {
-  PROTOBUF_MUSTTAIL return SingularFixed<uint64_t, uint16_t>(
-      PROTOBUF_TC_PARAM_PASS);
-}
-
-template <typename LayoutType, typename TagType>
-PROTOBUF_ALWAYS_INLINE const char* TcParser::RepeatedFixed(
-    PROTOBUF_TC_PARAM_DECL) {
-  if (PROTOBUF_PREDICT_FALSE(data.coded_tag<TagType>() != 0)) {
-    // Check if the field can be parsed as packed repeated:
-    constexpr WireFormatLite::WireType fallback_wt =
-        sizeof(LayoutType) == 4 ? WireFormatLite::WIRETYPE_FIXED32
-                                : WireFormatLite::WIRETYPE_FIXED64;
-    InvertPacked<fallback_wt>(data);
-    if (data.coded_tag<TagType>() == 0) {
-      return PackedFixed<LayoutType, TagType>(PROTOBUF_TC_PARAM_PASS);
-    } else {
-      PROTOBUF_MUSTTAIL return MiniParse(PROTOBUF_TC_PARAM_PASS);
-    }
-  }
-  auto& field = RefAt<RepeatedField<LayoutType>>(msg, data.offset());
-  int idx = field.size();
-  auto elem = field.Add();
-  int space = field.Capacity() - idx;
-  idx = 0;
-  auto expected_tag = UnalignedLoad<TagType>(ptr);
-  do {
-    ptr += sizeof(TagType);
-    elem[idx++] = UnalignedLoad<LayoutType>(ptr);
-    ptr += sizeof(LayoutType);
-    if (idx >= space) break;
-    if (!ctx->DataAvailable(ptr)) break;
-  } while (UnalignedLoad<TagType>(ptr) == expected_tag);
-  field.AddNAlreadyReserved(idx - 1);
-  return ToParseLoop(PROTOBUF_TC_PARAM_PASS);
-}
-
-const char* TcParser::FastF32R1(PROTOBUF_TC_PARAM_DECL) {
-  PROTOBUF_MUSTTAIL return RepeatedFixed<uint32_t, uint8_t>(
-      PROTOBUF_TC_PARAM_PASS);
-}
-const char* TcParser::FastF32R2(PROTOBUF_TC_PARAM_DECL) {
-  PROTOBUF_MUSTTAIL return RepeatedFixed<uint32_t, uint16_t>(
-      PROTOBUF_TC_PARAM_PASS);
-}
-const char* TcParser::FastF64R1(PROTOBUF_TC_PARAM_DECL) {
-  PROTOBUF_MUSTTAIL return RepeatedFixed<uint64_t, uint8_t>(
-      PROTOBUF_TC_PARAM_PASS);
-}
-const char* TcParser::FastF64R2(PROTOBUF_TC_PARAM_DECL) {
-  PROTOBUF_MUSTTAIL return RepeatedFixed<uint64_t, uint16_t>(
-      PROTOBUF_TC_PARAM_PASS);
-}
-
-// Note: some versions of GCC will fail with error "function not inlinable" if
-// corecursive functions are both marked with PROTOBUF_ALWAYS_INLINE (Clang
-// accepts this). We can still apply the attribute to one of the two functions,
-// just not both (so we do mark the Repeated variant as always inlined). This
-// also applies to PackedVarint, below.
-template <typename LayoutType, typename TagType>
-const char* TcParser::PackedFixed(PROTOBUF_TC_PARAM_DECL) {
-  if (PROTOBUF_PREDICT_FALSE(data.coded_tag<TagType>() != 0)) {
-    // Try parsing as non-packed repeated:
-    constexpr WireFormatLite::WireType fallback_wt =
-        sizeof(LayoutType) == 4 ? WireFormatLite::WIRETYPE_FIXED32
-        : WireFormatLite::WIRETYPE_FIXED64;
-    InvertPacked<fallback_wt>(data);
-    if (data.coded_tag<TagType>() == 0) {
-      return RepeatedFixed<LayoutType, TagType>(PROTOBUF_TC_PARAM_PASS);
-    } else {
-      PROTOBUF_MUSTTAIL return MiniParse(PROTOBUF_TC_PARAM_PASS);
-    }
-  }
-  ptr += sizeof(TagType);
-  // Since ctx->ReadPackedFixed does not use TailCall<> or Return<>, sync any
-  // pending hasbits now:
-  SyncHasbits(msg, hasbits, table);
-  auto& field = RefAt<RepeatedField<LayoutType>>(msg, data.offset());
-  int size = ReadSize(&ptr);
-  // TODO(dlj): add a tailcalling variant of ReadPackedFixed.
-  return ctx->ReadPackedFixed(ptr, size,
-                              static_cast<RepeatedField<LayoutType>*>(&field));
-}
-
-const char* TcParser::FastF32P1(PROTOBUF_TC_PARAM_DECL) {
-  PROTOBUF_MUSTTAIL return PackedFixed<uint32_t, uint8_t>(
-      PROTOBUF_TC_PARAM_PASS);
-}
-const char* TcParser::FastF32P2(PROTOBUF_TC_PARAM_DECL) {
-  PROTOBUF_MUSTTAIL return PackedFixed<uint32_t, uint16_t>(
-      PROTOBUF_TC_PARAM_PASS);
-}
-const char* TcParser::FastF64P1(PROTOBUF_TC_PARAM_DECL) {
-  PROTOBUF_MUSTTAIL return PackedFixed<uint64_t, uint8_t>(
-      PROTOBUF_TC_PARAM_PASS);
-}
-const char* TcParser::FastF64P2(PROTOBUF_TC_PARAM_DECL) {
-  PROTOBUF_MUSTTAIL return PackedFixed<uint64_t, uint16_t>(
-      PROTOBUF_TC_PARAM_PASS);
-}
-
-//////////////////////////////////////////////////////////////////////////////
-// Varint fields
-//////////////////////////////////////////////////////////////////////////////
-
-namespace {
-
-// Shift "byte" left by n * 7 bits, filling vacated bits with ones.
-template <int n>
-inline PROTOBUF_ALWAYS_INLINE uint64_t
-shift_left_fill_with_ones(uint64_t byte, uint64_t ones) {
-  return (byte << (n * 7)) | (ones >> (64 - (n * 7)));
-}
-
-// Shift "byte" left by n * 7 bits, filling vacated bits with ones, and
-// put the new value in res.  Return whether the result was negative.
-template <int n>
-inline PROTOBUF_ALWAYS_INLINE bool shift_left_fill_with_ones_was_negative(
-    uint64_t byte, uint64_t ones, int64_t& res) {
-#if defined(__GCC_ASM_FLAG_OUTPUTS__) && defined(__x86_64__)
-  // For the first two rounds (ptr[1] and ptr[2]), micro benchmarks show a
-  // substantial improvement from capturing the sign from the condition code
-  // register on x86-64.
-  bool sign_bit;
-  asm("shldq %3, %2, %1"
-      : "=@ccs"(sign_bit), "+r"(byte)
-      : "r"(ones), "i"(n * 7));
-  res = byte;
-  return sign_bit;
-#else
-  // Generic fallback:
-  res = (byte << (n * 7)) | (ones >> (64 - (n * 7)));
-  return static_cast<int64_t>(res) < 0;
-#endif
-}
-
-inline PROTOBUF_ALWAYS_INLINE std::pair<const char*, uint64_t>
-Parse64FallbackPair(const char* p, int64_t res1) {
-  auto ptr = reinterpret_cast<const int8_t*>(p);
-
-  // The algorithm relies on sign extension for each byte to set all high bits
-  // when the varint continues. It also relies on asserting all of the lower
-  // bits for each successive byte read. This allows the result to be aggregated
-  // using a bitwise AND. For example:
-  //
-  //          8       1          64     57 ... 24     17  16      9  8       1
-  // ptr[0] = 1aaa aaaa ; res1 = 1111 1111 ... 1111 1111  1111 1111  1aaa aaaa
-  // ptr[1] = 1bbb bbbb ; res2 = 1111 1111 ... 1111 1111  11bb bbbb  b111 1111
-  // ptr[2] = 1ccc cccc ; res3 = 0000 0000 ... 000c cccc  cc11 1111  1111 1111
-  //                             ---------------------------------------------
-  //        res1 & res2 & res3 = 0000 0000 ... 000c cccc  ccbb bbbb  baaa aaaa
-  //
-  // On x86-64, a shld from a single register filled with enough 1s in the high
-  // bits can accomplish all this in one instruction. It so happens that res1
-  // has 57 high bits of ones, which is enough for the largest shift done.
-  GOOGLE_DCHECK_EQ(res1 >> 7, -1);
-  uint64_t ones = res1;  // save the high 1 bits from res1 (input to SHLD)
-  int64_t res2, res3;    // accumulated result chunks
-
-  if (!shift_left_fill_with_ones_was_negative<1>(ptr[1], ones, res2))
-    goto done2;
-  if (!shift_left_fill_with_ones_was_negative<2>(ptr[2], ones, res3))
-    goto done3;
-
-  // For the remainder of the chunks, check the sign of the AND result.
-  res1 &= shift_left_fill_with_ones<3>(ptr[3], ones);
-  if (res1 >= 0) goto done4;
-  res2 &= shift_left_fill_with_ones<4>(ptr[4], ones);
-  if (res2 >= 0) goto done5;
-  res3 &= shift_left_fill_with_ones<5>(ptr[5], ones);
-  if (res3 >= 0) goto done6;
-  res1 &= shift_left_fill_with_ones<6>(ptr[6], ones);
-  if (res1 >= 0) goto done7;
-  res2 &= shift_left_fill_with_ones<7>(ptr[7], ones);
-  if (res2 >= 0) goto done8;
-  res3 &= shift_left_fill_with_ones<8>(ptr[8], ones);
-  if (res3 >= 0) goto done9;
-
-  // For valid 64bit varints, the 10th byte/ptr[9] should be exactly 1. In this
-  // case, the continuation bit of ptr[8] already set the top bit of res3
-  // correctly, so all we have to do is check that the expected case is true.
-  if (PROTOBUF_PREDICT_TRUE(ptr[9] == 1)) goto done10;
-
-  // A value of 0, however, represents an over-serialized varint. This case
-  // should not happen, but if does (say, due to a nonconforming serializer),
-  // deassert the continuation bit that came from ptr[8].
-  if (ptr[9] == 0) {
-#if defined(__GCC_ASM_FLAG_OUTPUTS__) && defined(__x86_64__)
-    // Use a small instruction since this is an uncommon code path.
-    asm("btcq $63,%0" : "+r"(res3));
-#else
-    res3 ^= static_cast<uint64_t>(1) << 63;
-#endif
-    goto done10;
-  }
-
-  // If the 10th byte/ptr[9] itself has any other value, then it is too big to
-  // fit in 64 bits. If the continue bit is set, it is an unterminated varint.
-  return {nullptr, 0};
-
-done2:
-  return {p + 2, res1 & res2};
-done3:
-  return {p + 3, res1 & res2 & res3};
-done4:
-  return {p + 4, res1 & res2 & res3};
-done5:
-  return {p + 5, res1 & res2 & res3};
-done6:
-  return {p + 6, res1 & res2 & res3};
-done7:
-  return {p + 7, res1 & res2 & res3};
-done8:
-  return {p + 8, res1 & res2 & res3};
-done9:
-  return {p + 9, res1 & res2 & res3};
-done10:
-  return {p + 10, res1 & res2 & res3};
-}
-
-inline PROTOBUF_ALWAYS_INLINE const char* ParseVarint(const char* p,
-                                                      uint64_t* value) {
-  int64_t byte = static_cast<int8_t>(*p);
-  if (PROTOBUF_PREDICT_TRUE(byte >= 0)) {
-    *value = byte;
-    return p + 1;
-  } else {
-    auto tmp = Parse64FallbackPair(p, byte);
-    if (PROTOBUF_PREDICT_TRUE(tmp.first)) *value = tmp.second;
-    return tmp.first;
-  }
-}
-
-template <typename FieldType, bool zigzag = false>
-inline FieldType ZigZagDecodeHelper(uint64_t value) {
-  return static_cast<FieldType>(value);
-}
-
-template <>
-inline int32_t ZigZagDecodeHelper<int32_t, true>(uint64_t value) {
-  return WireFormatLite::ZigZagDecode32(value);
-}
-
-template <>
-inline int64_t ZigZagDecodeHelper<int64_t, true>(uint64_t value) {
-  return WireFormatLite::ZigZagDecode64(value);
-}
-
-bool EnumIsValidAux(int32_t val, uint16_t xform_val,
-                    TcParseTableBase::FieldAux aux) {
-  if (xform_val == field_layout::kTvRange) {
-    auto lo = aux.enum_range.start;
-    return lo <= val && val < (lo + aux.enum_range.length);
-  }
-  return aux.enum_validator(val);
-}
-
-}  // namespace
-
-template <typename FieldType, typename TagType, bool zigzag>
-PROTOBUF_ALWAYS_INLINE const char* TcParser::SingularVarint(
-    PROTOBUF_TC_PARAM_DECL) {
-  if (PROTOBUF_PREDICT_FALSE(data.coded_tag<TagType>() != 0)) {
-    PROTOBUF_MUSTTAIL return MiniParse(PROTOBUF_TC_PARAM_PASS);
-  }
-  ptr += sizeof(TagType);  // Consume tag
-  hasbits |= (uint64_t{1} << data.hasbit_idx());
-
-  // clang isn't smart enough to be able to only conditionally save
-  // registers to the stack, so we turn the integer-greater-than-128
-  // case into a separate routine.
-  if (PROTOBUF_PREDICT_FALSE(static_cast<int8_t>(*ptr) < 0)) {
-    PROTOBUF_MUSTTAIL return SingularVarBigint<FieldType, TagType, zigzag>(
-        PROTOBUF_TC_PARAM_PASS);
-  }
-
-  RefAt<FieldType>(msg, data.offset()) =
-      ZigZagDecodeHelper<FieldType, zigzag>(static_cast<uint8_t>(*ptr++));
-  PROTOBUF_MUSTTAIL return ToTagDispatch(PROTOBUF_TC_PARAM_PASS);
-}
-
-template <typename FieldType, typename TagType, bool zigzag>
-PROTOBUF_NOINLINE const char* TcParser::SingularVarBigint(
-    PROTOBUF_TC_PARAM_DECL) {
-  // For some reason clang wants to save 5 registers to the stack here,
-  // but we only need four for this code, so save the data we don't need
-  // to the stack.  Happily, saving them this way uses regular store
-  // instructions rather than PUSH/POP, which saves time at the cost of greater
-  // code size, but for this heavily-used piece of code, that's fine.
-  struct Spill {
-    uint64_t field_data;
-    ::google::protobuf::MessageLite* msg;
-    const ::google::protobuf::internal::TcParseTableBase* table;
-    uint64_t hasbits;
-  };
-  volatile Spill spill = {data.data, msg, table, hasbits};
-
-  uint64_t tmp;
-  PROTOBUF_ASSUME(static_cast<int8_t>(*ptr) < 0);
-  ptr = ParseVarint(ptr, &tmp);
-
-  data.data = spill.field_data;
-  msg = spill.msg;
-  table = spill.table;
-  hasbits = spill.hasbits;
-
-  if (PROTOBUF_PREDICT_FALSE(ptr == nullptr)) {
-    return Error(PROTOBUF_TC_PARAM_PASS);
-  }
-  RefAt<FieldType>(msg, data.offset()) =
-      ZigZagDecodeHelper<FieldType, zigzag>(tmp);
-  PROTOBUF_MUSTTAIL return ToTagDispatch(PROTOBUF_TC_PARAM_PASS);
-}
-
-const char* TcParser::FastV8S1(PROTOBUF_TC_PARAM_DECL) {
-  PROTOBUF_MUSTTAIL return SingularVarint<bool, uint8_t>(
-      PROTOBUF_TC_PARAM_PASS);
-}
-const char* TcParser::FastV8S2(PROTOBUF_TC_PARAM_DECL) {
-  PROTOBUF_MUSTTAIL return SingularVarint<bool, uint16_t>(
-      PROTOBUF_TC_PARAM_PASS);
-}
-const char* TcParser::FastV32S1(PROTOBUF_TC_PARAM_DECL) {
-  PROTOBUF_MUSTTAIL return SingularVarint<uint32_t, uint8_t>(
-      PROTOBUF_TC_PARAM_PASS);
-}
-const char* TcParser::FastV32S2(PROTOBUF_TC_PARAM_DECL) {
-  PROTOBUF_MUSTTAIL return SingularVarint<uint32_t, uint16_t>(
-      PROTOBUF_TC_PARAM_PASS);
-}
-const char* TcParser::FastV64S1(PROTOBUF_TC_PARAM_DECL) {
-  PROTOBUF_MUSTTAIL return SingularVarint<uint64_t, uint8_t>(
-      PROTOBUF_TC_PARAM_PASS);
-}
-const char* TcParser::FastV64S2(PROTOBUF_TC_PARAM_DECL) {
-  PROTOBUF_MUSTTAIL return SingularVarint<uint64_t, uint16_t>(
-      PROTOBUF_TC_PARAM_PASS);
-}
-
-const char* TcParser::FastZ32S1(PROTOBUF_TC_PARAM_DECL) {
-  PROTOBUF_MUSTTAIL return SingularVarint<int32_t, uint8_t, true>(
-      PROTOBUF_TC_PARAM_PASS);
-}
-const char* TcParser::FastZ32S2(PROTOBUF_TC_PARAM_DECL) {
-  PROTOBUF_MUSTTAIL return SingularVarint<int32_t, uint16_t, true>(
-      PROTOBUF_TC_PARAM_PASS);
-}
-const char* TcParser::FastZ64S1(PROTOBUF_TC_PARAM_DECL) {
-  PROTOBUF_MUSTTAIL return SingularVarint<int64_t, uint8_t, true>(
-      PROTOBUF_TC_PARAM_PASS);
-}
-const char* TcParser::FastZ64S2(PROTOBUF_TC_PARAM_DECL) {
-  PROTOBUF_MUSTTAIL return SingularVarint<int64_t, uint16_t, true>(
-      PROTOBUF_TC_PARAM_PASS);
-}
-
-template <typename FieldType, typename TagType, bool zigzag>
-PROTOBUF_ALWAYS_INLINE const char* TcParser::RepeatedVarint(
-    PROTOBUF_TC_PARAM_DECL) {
-  if (PROTOBUF_PREDICT_FALSE(data.coded_tag<TagType>() != 0)) {
-    // Try parsing as non-packed repeated:
-    InvertPacked<WireFormatLite::WIRETYPE_VARINT>(data);
-    if (data.coded_tag<TagType>() == 0) {
-      return PackedVarint<FieldType, TagType, zigzag>(PROTOBUF_TC_PARAM_PASS);
-    } else {
-      PROTOBUF_MUSTTAIL return MiniParse(PROTOBUF_TC_PARAM_PASS);
-    }
-  }
-  auto& field = RefAt<RepeatedField<FieldType>>(msg, data.offset());
-  auto expected_tag = UnalignedLoad<TagType>(ptr);
-  do {
-    ptr += sizeof(TagType);
-    uint64_t tmp;
-    ptr = ParseVarint(ptr, &tmp);
-    if (ptr == nullptr) {
-      return Error(PROTOBUF_TC_PARAM_PASS);
-    }
-    field.Add(ZigZagDecodeHelper<FieldType, zigzag>(tmp));
-    if (!ctx->DataAvailable(ptr)) {
-      break;
-    }
-  } while (UnalignedLoad<TagType>(ptr) == expected_tag);
-  return ToParseLoop(PROTOBUF_TC_PARAM_PASS);
-}
-
-const char* TcParser::FastV8R1(PROTOBUF_TC_PARAM_DECL) {
-  PROTOBUF_MUSTTAIL return RepeatedVarint<bool, uint8_t>(
-      PROTOBUF_TC_PARAM_PASS);
-}
-const char* TcParser::FastV8R2(PROTOBUF_TC_PARAM_DECL) {
-  PROTOBUF_MUSTTAIL return RepeatedVarint<bool, uint16_t>(
-      PROTOBUF_TC_PARAM_PASS);
-}
-const char* TcParser::FastV32R1(PROTOBUF_TC_PARAM_DECL) {
-  PROTOBUF_MUSTTAIL return RepeatedVarint<uint32_t, uint8_t>(
-      PROTOBUF_TC_PARAM_PASS);
-}
-const char* TcParser::FastV32R2(PROTOBUF_TC_PARAM_DECL) {
-  PROTOBUF_MUSTTAIL return RepeatedVarint<uint32_t, uint16_t>(
-      PROTOBUF_TC_PARAM_PASS);
-}
-const char* TcParser::FastV64R1(PROTOBUF_TC_PARAM_DECL) {
-  PROTOBUF_MUSTTAIL return RepeatedVarint<uint64_t, uint8_t>(
-      PROTOBUF_TC_PARAM_PASS);
-}
-const char* TcParser::FastV64R2(PROTOBUF_TC_PARAM_DECL) {
-  PROTOBUF_MUSTTAIL return RepeatedVarint<uint64_t, uint16_t>(
-      PROTOBUF_TC_PARAM_PASS);
-}
-
-const char* TcParser::FastZ32R1(PROTOBUF_TC_PARAM_DECL) {
-  PROTOBUF_MUSTTAIL return RepeatedVarint<int32_t, uint8_t, true>(
-      PROTOBUF_TC_PARAM_PASS);
-}
-const char* TcParser::FastZ32R2(PROTOBUF_TC_PARAM_DECL) {
-  PROTOBUF_MUSTTAIL return RepeatedVarint<int32_t, uint16_t, true>(
-      PROTOBUF_TC_PARAM_PASS);
-}
-const char* TcParser::FastZ64R1(PROTOBUF_TC_PARAM_DECL) {
-  PROTOBUF_MUSTTAIL return RepeatedVarint<int64_t, uint8_t, true>(
-      PROTOBUF_TC_PARAM_PASS);
-}
-const char* TcParser::FastZ64R2(PROTOBUF_TC_PARAM_DECL) {
-  PROTOBUF_MUSTTAIL return RepeatedVarint<int64_t, uint16_t, true>(
-      PROTOBUF_TC_PARAM_PASS);
-}
-
-// See comment on PackedFixed for why this is not PROTOBUF_ALWAYS_INLINE.
-template <typename FieldType, typename TagType, bool zigzag>
-const char* TcParser::PackedVarint(PROTOBUF_TC_PARAM_DECL) {
-  if (PROTOBUF_PREDICT_FALSE(data.coded_tag<TagType>() != 0)) {
-    InvertPacked<WireFormatLite::WIRETYPE_VARINT>(data);
-    if (data.coded_tag<TagType>() == 0) {
-      return RepeatedVarint<FieldType, TagType, zigzag>(PROTOBUF_TC_PARAM_PASS);
-    } else {
-      PROTOBUF_MUSTTAIL return MiniParse(PROTOBUF_TC_PARAM_PASS);
-    }
-  }
-  ptr += sizeof(TagType);
-  // Since ctx->ReadPackedVarint does not use TailCall or Return, sync any
-  // pending hasbits now:
-  SyncHasbits(msg, hasbits, table);
-  auto* field = &RefAt<RepeatedField<FieldType>>(msg, data.offset());
-  return ctx->ReadPackedVarint(ptr, [field](uint64_t varint) {
-    FieldType val;
-    if (zigzag) {
-      if (sizeof(FieldType) == 8) {
-        val = WireFormatLite::ZigZagDecode64(varint);
-      } else {
-        val = WireFormatLite::ZigZagDecode32(varint);
-      }
-    } else {
-      val = varint;
-    }
-    field->Add(val);
-  });
-}
-
-const char* TcParser::FastV8P1(PROTOBUF_TC_PARAM_DECL) {
-  PROTOBUF_MUSTTAIL return PackedVarint<bool, uint8_t>(PROTOBUF_TC_PARAM_PASS);
-}
-const char* TcParser::FastV8P2(PROTOBUF_TC_PARAM_DECL) {
-  PROTOBUF_MUSTTAIL return PackedVarint<bool, uint16_t>(PROTOBUF_TC_PARAM_PASS);
-}
-const char* TcParser::FastV32P1(PROTOBUF_TC_PARAM_DECL) {
-  PROTOBUF_MUSTTAIL return PackedVarint<uint32_t, uint8_t>(
-      PROTOBUF_TC_PARAM_PASS);
-}
-const char* TcParser::FastV32P2(PROTOBUF_TC_PARAM_DECL) {
-  PROTOBUF_MUSTTAIL return PackedVarint<uint32_t, uint16_t>(
-      PROTOBUF_TC_PARAM_PASS);
-}
-const char* TcParser::FastV64P1(PROTOBUF_TC_PARAM_DECL) {
-  PROTOBUF_MUSTTAIL return PackedVarint<uint64_t, uint8_t>(
-      PROTOBUF_TC_PARAM_PASS);
-}
-const char* TcParser::FastV64P2(PROTOBUF_TC_PARAM_DECL) {
-  PROTOBUF_MUSTTAIL return PackedVarint<uint64_t, uint16_t>(
-      PROTOBUF_TC_PARAM_PASS);
-}
-
-const char* TcParser::FastZ32P1(PROTOBUF_TC_PARAM_DECL) {
-  PROTOBUF_MUSTTAIL return PackedVarint<int32_t, uint8_t, true>(
-      PROTOBUF_TC_PARAM_PASS);
-}
-const char* TcParser::FastZ32P2(PROTOBUF_TC_PARAM_DECL) {
-  PROTOBUF_MUSTTAIL return PackedVarint<int32_t, uint16_t, true>(
-      PROTOBUF_TC_PARAM_PASS);
-}
-const char* TcParser::FastZ64P1(PROTOBUF_TC_PARAM_DECL) {
-  PROTOBUF_MUSTTAIL return PackedVarint<int64_t, uint8_t, true>(
-      PROTOBUF_TC_PARAM_PASS);
-}
-const char* TcParser::FastZ64P2(PROTOBUF_TC_PARAM_DECL) {
-  PROTOBUF_MUSTTAIL return PackedVarint<int64_t, uint16_t, true>(
-      PROTOBUF_TC_PARAM_PASS);
-}
-
-//////////////////////////////////////////////////////////////////////////////
-// Enum fields
-//////////////////////////////////////////////////////////////////////////////
-
-PROTOBUF_NOINLINE const char* TcParser::FastUnknownEnumFallback(
-    PROTOBUF_TC_PARAM_DECL) {
-  (void)msg;
-  (void)ctx;
-  (void)hasbits;
-
-  // If we know we want to put this field directly into the unknown field set,
-  // then we can skip the call to MiniParse and directly call table->fallback.
-  // However, we first have to update `data` to contain the decoded tag.
-  uint32_t tag;
-  ptr = ReadTag(ptr, &tag);
-  if (PROTOBUF_PREDICT_FALSE(ptr == nullptr)) {
-    return Error(PROTOBUF_TC_PARAM_PASS);
-  }
-  data.data = tag;
-  PROTOBUF_MUSTTAIL return table->fallback(PROTOBUF_TC_PARAM_PASS);
-}
-
-template <typename TagType, uint16_t xform_val>
-PROTOBUF_ALWAYS_INLINE const char* TcParser::SingularEnum(
-    PROTOBUF_TC_PARAM_DECL) {
-  if (PROTOBUF_PREDICT_FALSE(data.coded_tag<TagType>() != 0)) {
-    PROTOBUF_MUSTTAIL return MiniParse(PROTOBUF_TC_PARAM_PASS);
-  }
-  const char* ptr2 = ptr;  // Save for unknown enum case
-  ptr += sizeof(TagType);  // Consume tag
-  uint64_t tmp;
-  ptr = ParseVarint(ptr, &tmp);
-  if (ptr == nullptr) {
-    return Error(PROTOBUF_TC_PARAM_PASS);
-  }
-  const TcParseTableBase::FieldAux aux = *table->field_aux(data.aux_idx());
-  if (PROTOBUF_PREDICT_FALSE(
-          !EnumIsValidAux(static_cast<int32_t>(tmp), xform_val, aux))) {
-    ptr = ptr2;
-    PROTOBUF_MUSTTAIL return FastUnknownEnumFallback(PROTOBUF_TC_PARAM_PASS);
-  }
-  hasbits |= (uint64_t{1} << data.hasbit_idx());
-  RefAt<int32_t>(msg, data.offset()) = tmp;
-  PROTOBUF_MUSTTAIL return ToTagDispatch(PROTOBUF_TC_PARAM_PASS);
-}
-
-const char* TcParser::FastErS1(PROTOBUF_TC_PARAM_DECL) {
-  PROTOBUF_MUSTTAIL return SingularEnum<uint8_t, field_layout::kTvRange>(
-      PROTOBUF_TC_PARAM_PASS);
-}
-const char* TcParser::FastErS2(PROTOBUF_TC_PARAM_DECL) {
-  PROTOBUF_MUSTTAIL return SingularEnum<uint16_t, field_layout::kTvRange>(
-      PROTOBUF_TC_PARAM_PASS);
-}
-const char* TcParser::FastEvS1(PROTOBUF_TC_PARAM_DECL) {
-  PROTOBUF_MUSTTAIL return SingularEnum<uint8_t, field_layout::kTvEnum>(
-      PROTOBUF_TC_PARAM_PASS);
-}
-const char* TcParser::FastEvS2(PROTOBUF_TC_PARAM_DECL) {
-  PROTOBUF_MUSTTAIL return SingularEnum<uint16_t, field_layout::kTvEnum>(
-      PROTOBUF_TC_PARAM_PASS);
-}
-
-template <typename TagType, uint16_t xform_val>
-PROTOBUF_ALWAYS_INLINE const char* TcParser::RepeatedEnum(
-    PROTOBUF_TC_PARAM_DECL) {
-  if (PROTOBUF_PREDICT_FALSE(data.coded_tag<TagType>() != 0)) {
-    InvertPacked<WireFormatLite::WIRETYPE_VARINT>(data);
-    if (data.coded_tag<TagType>() == 0) {
-      // Packed parsing is handled by generated fallback.
-      PROTOBUF_MUSTTAIL return FastUnknownEnumFallback(PROTOBUF_TC_PARAM_PASS);
-    } else {
-      PROTOBUF_MUSTTAIL return MiniParse(PROTOBUF_TC_PARAM_PASS);
-    }
-  }
-  auto& field = RefAt<RepeatedField<int32_t>>(msg, data.offset());
-  auto expected_tag = UnalignedLoad<TagType>(ptr);
-  const TcParseTableBase::FieldAux aux = *table->field_aux(data.aux_idx());
-  do {
-    const char* ptr2 = ptr;  // save for unknown enum case
-    ptr += sizeof(TagType);
-    uint64_t tmp;
-    ptr = ParseVarint(ptr, &tmp);
-    if (ptr == nullptr) {
-      return Error(PROTOBUF_TC_PARAM_PASS);
-    }
-    if (PROTOBUF_PREDICT_FALSE(
-            !EnumIsValidAux(static_cast<int32_t>(tmp), xform_val, aux))) {
-      // We can avoid duplicate work in MiniParse by directly calling
-      // table->fallback.
-      ptr = ptr2;
-      PROTOBUF_MUSTTAIL return FastUnknownEnumFallback(PROTOBUF_TC_PARAM_PASS);
-    }
-    field.Add(static_cast<int32_t>(tmp));
-    if (!ctx->DataAvailable(ptr)) {
-      break;
-    }
-  } while (UnalignedLoad<TagType>(ptr) == expected_tag);
-  return ToParseLoop(PROTOBUF_TC_PARAM_PASS);
-}
-
-const char* TcParser::FastErR1(PROTOBUF_TC_PARAM_DECL) {
-  PROTOBUF_MUSTTAIL return RepeatedEnum<uint8_t, field_layout::kTvRange>(
-      PROTOBUF_TC_PARAM_PASS);
-}
-const char* TcParser::FastErR2(PROTOBUF_TC_PARAM_DECL) {
-  PROTOBUF_MUSTTAIL return RepeatedEnum<uint16_t, field_layout::kTvRange>(
-      PROTOBUF_TC_PARAM_PASS);
-}
-const char* TcParser::FastEvR1(PROTOBUF_TC_PARAM_DECL) {
-  PROTOBUF_MUSTTAIL return RepeatedEnum<uint8_t, field_layout::kTvEnum>(
-      PROTOBUF_TC_PARAM_PASS);
-}
-const char* TcParser::FastEvR2(PROTOBUF_TC_PARAM_DECL) {
-  PROTOBUF_MUSTTAIL return RepeatedEnum<uint16_t, field_layout::kTvEnum>(
-      PROTOBUF_TC_PARAM_PASS);
-}
-
-//////////////////////////////////////////////////////////////////////////////
-// String/bytes fields
-//////////////////////////////////////////////////////////////////////////////
-
-// Defined in wire_format_lite.cc
-void PrintUTF8ErrorLog(StringPiece message_name,
-                       StringPiece field_name, const char* operation_str,
-                       bool emit_stacktrace);
-
-void TcParser::ReportFastUtf8Error(uint32_t decoded_tag,
-                                   const TcParseTableBase* table) {
-  uint32_t field_num = decoded_tag >> 3;
-  const auto* entry = FindFieldEntry(table, field_num);
-  PrintUTF8ErrorLog(MessageName(table), FieldName(table, entry), "parsing",
-                    false);
-}
-
-namespace {
-
-PROTOBUF_NOINLINE
-const char* SingularStringParserFallback(ArenaStringPtr* s, const char* ptr,
-                                         EpsCopyInputStream* stream) {
-  int size = ReadSize(&ptr);
-  if (!ptr) return nullptr;
-  return stream->ReadString(ptr, size, s->MutableNoCopy(nullptr));
-}
-
-}  // namespace
-
-template <typename TagType, TcParser::Utf8Type utf8>
-PROTOBUF_ALWAYS_INLINE const char* TcParser::SingularString(
-    PROTOBUF_TC_PARAM_DECL) {
-  if (PROTOBUF_PREDICT_FALSE(data.coded_tag<TagType>() != 0)) {
-    PROTOBUF_MUSTTAIL return MiniParse(PROTOBUF_TC_PARAM_PASS);
-  }
-  auto saved_tag = UnalignedLoad<TagType>(ptr);
-  ptr += sizeof(TagType);
-  hasbits |= (uint64_t{1} << data.hasbit_idx());
-  auto& field = RefAt<ArenaStringPtr>(msg, data.offset());
-  auto arena = ctx->data().arena;
-  if (arena) {
-    ptr = ctx->ReadArenaString(ptr, &field, arena);
-  } else {
-    ptr = SingularStringParserFallback(&field, ptr, ctx);
-  }
-  if (ptr == nullptr) return Error(PROTOBUF_TC_PARAM_PASS);
-  switch (utf8) {
-    case kNoUtf8:
-#ifdef NDEBUG
-    case kUtf8ValidateOnly:
-#endif
-      return ToParseLoop(PROTOBUF_TC_PARAM_PASS);
-    default:
-      if (PROTOBUF_PREDICT_TRUE(IsStructurallyValidUTF8(field.Get()))) {
-        return ToParseLoop(PROTOBUF_TC_PARAM_PASS);
-      }
-      ReportFastUtf8Error(FastDecodeTag(saved_tag), table);
-      return utf8 == kUtf8 ? Error(PROTOBUF_TC_PARAM_PASS)
-                           : ToParseLoop(PROTOBUF_TC_PARAM_PASS);
-  }
-}
-
-const char* TcParser::FastBS1(PROTOBUF_TC_PARAM_DECL) {
-  PROTOBUF_MUSTTAIL return SingularString<uint8_t, kNoUtf8>(
-      PROTOBUF_TC_PARAM_PASS);
-}
-const char* TcParser::FastBS2(PROTOBUF_TC_PARAM_DECL) {
-  PROTOBUF_MUSTTAIL return SingularString<uint16_t, kNoUtf8>(
-      PROTOBUF_TC_PARAM_PASS);
-}
-const char* TcParser::FastSS1(PROTOBUF_TC_PARAM_DECL) {
-  PROTOBUF_MUSTTAIL return SingularString<uint8_t, kUtf8ValidateOnly>(
-      PROTOBUF_TC_PARAM_PASS);
-}
-const char* TcParser::FastSS2(PROTOBUF_TC_PARAM_DECL) {
-  PROTOBUF_MUSTTAIL return SingularString<uint16_t, kUtf8ValidateOnly>(
-      PROTOBUF_TC_PARAM_PASS);
-}
-const char* TcParser::FastUS1(PROTOBUF_TC_PARAM_DECL) {
-  PROTOBUF_MUSTTAIL return SingularString<uint8_t, kUtf8>(
-      PROTOBUF_TC_PARAM_PASS);
-}
-const char* TcParser::FastUS2(PROTOBUF_TC_PARAM_DECL) {
-  PROTOBUF_MUSTTAIL return SingularString<uint16_t, kUtf8>(
-      PROTOBUF_TC_PARAM_PASS);
-}
-
-// Inlined string variants:
-
-const char* TcParser::FastBiS1(PROTOBUF_TC_PARAM_DECL) {
-  PROTOBUF_MUSTTAIL return MiniParse(PROTOBUF_TC_PARAM_PASS);
-}
-const char* TcParser::FastBiS2(PROTOBUF_TC_PARAM_DECL) {
-  PROTOBUF_MUSTTAIL return MiniParse(PROTOBUF_TC_PARAM_PASS);
-}
-const char* TcParser::FastSiS1(PROTOBUF_TC_PARAM_DECL) {
-  PROTOBUF_MUSTTAIL return MiniParse(PROTOBUF_TC_PARAM_PASS);
-}
-const char* TcParser::FastSiS2(PROTOBUF_TC_PARAM_DECL) {
-  PROTOBUF_MUSTTAIL return MiniParse(PROTOBUF_TC_PARAM_PASS);
-}
-const char* TcParser::FastUiS1(PROTOBUF_TC_PARAM_DECL) {
-  PROTOBUF_MUSTTAIL return MiniParse(PROTOBUF_TC_PARAM_PASS);
-}
-const char* TcParser::FastUiS2(PROTOBUF_TC_PARAM_DECL) {
-  PROTOBUF_MUSTTAIL return MiniParse(PROTOBUF_TC_PARAM_PASS);
-}
-
-template <typename TagType, TcParser::Utf8Type utf8>
-PROTOBUF_ALWAYS_INLINE const char* TcParser::RepeatedString(
-    PROTOBUF_TC_PARAM_DECL) {
-  if (PROTOBUF_PREDICT_FALSE(data.coded_tag<TagType>() != 0)) {
-    PROTOBUF_MUSTTAIL return MiniParse(PROTOBUF_TC_PARAM_PASS);
-  }
-  auto expected_tag = UnalignedLoad<TagType>(ptr);
-  auto& field = RefAt<RepeatedPtrField<std::string>>(msg, data.offset());
-  do {
-    ptr += sizeof(TagType);
-    std::string* str = field.Add();
-    ptr = InlineGreedyStringParser(str, ptr, ctx);
-    if (ptr == nullptr) {
-      return Error(PROTOBUF_TC_PARAM_PASS);
-    }
-    switch (utf8) {
-      case kNoUtf8:
-#ifdef NDEBUG
-      case kUtf8ValidateOnly:
-#endif
-        break;
-      default:
-        if (PROTOBUF_PREDICT_TRUE(IsStructurallyValidUTF8(*str))) {
-          break;
-        }
-        ReportFastUtf8Error(FastDecodeTag(expected_tag), table);
-        if (utf8 == kUtf8) return Error(PROTOBUF_TC_PARAM_PASS);
-        break;
-    }
-    if (!ctx->DataAvailable(ptr)) break;
-  } while (UnalignedLoad<TagType>(ptr) == expected_tag);
-  return ToParseLoop(PROTOBUF_TC_PARAM_PASS);
-}
-
-const char* TcParser::FastBR1(PROTOBUF_TC_PARAM_DECL) {
-  PROTOBUF_MUSTTAIL return RepeatedString<uint8_t, kNoUtf8>(
-      PROTOBUF_TC_PARAM_PASS);
-}
-const char* TcParser::FastBR2(PROTOBUF_TC_PARAM_DECL) {
-  PROTOBUF_MUSTTAIL return RepeatedString<uint16_t, kNoUtf8>(
-      PROTOBUF_TC_PARAM_PASS);
-}
-const char* TcParser::FastSR1(PROTOBUF_TC_PARAM_DECL) {
-  PROTOBUF_MUSTTAIL return RepeatedString<uint8_t, kUtf8ValidateOnly>(
-      PROTOBUF_TC_PARAM_PASS);
-}
-const char* TcParser::FastSR2(PROTOBUF_TC_PARAM_DECL) {
-  PROTOBUF_MUSTTAIL return RepeatedString<uint16_t, kUtf8ValidateOnly>(
-      PROTOBUF_TC_PARAM_PASS);
-}
-const char* TcParser::FastUR1(PROTOBUF_TC_PARAM_DECL) {
-  PROTOBUF_MUSTTAIL return RepeatedString<uint8_t, kUtf8>(
-      PROTOBUF_TC_PARAM_PASS);
-}
-const char* TcParser::FastUR2(PROTOBUF_TC_PARAM_DECL) {
-  PROTOBUF_MUSTTAIL return RepeatedString<uint16_t, kUtf8>(
-      PROTOBUF_TC_PARAM_PASS);
-}
-
-//////////////////////////////////////////////////////////////////////////////
-// Mini parsing
-//////////////////////////////////////////////////////////////////////////////
-
-namespace {
-inline void SetHas(const TcParseTableBase* table, const FieldEntry& entry,
-                   MessageLite* msg, uint64_t& hasbits) {
-  int32_t has_idx = entry.has_idx;
-  if (has_idx < 32) {
-    hasbits |= uint64_t{1} << has_idx;
-  } else {
-    auto* hasblocks = &TcParser::RefAt<uint32_t>(msg, table->has_bits_offset);
-#if defined(__x86_64__) && defined(__GNUC__)
-    asm("bts %1, %0\n" : "+m"(*hasblocks) : "r"(has_idx));
-#else
-    auto& hasblock = hasblocks[has_idx / 32];
-    hasblock |= uint32_t{1} << (has_idx % 32);
-#endif
-  }
-}
-}  // namespace
-
-// Destroys any existing oneof union member (if necessary). Returns true if the
-// caller is responsible for initializing the object, or false if the field
-// already has the desired case.
-bool TcParser::ChangeOneof(const TcParseTableBase* table,
-                           const TcParseTableBase::FieldEntry& entry,
-                           uint32_t field_num, ParseContext* ctx,
-                           MessageLite* msg) {
-  // The _oneof_case_ array offset is stored in the first aux entry.
-  uint32_t oneof_case_offset = table->field_aux(0u)->offset;
-  // The _oneof_case_ array index is stored in the has-bit index.
-  uint32_t* oneof_case =
-      &TcParser::RefAt<uint32_t>(msg, oneof_case_offset) + entry.has_idx;
-  uint32_t current_case = *oneof_case;
-  *oneof_case = field_num;
-
-  if (current_case == 0) {
-    // If the member is empty, we don't have anything to clear. Caller is
-    // responsible for creating a new member object.
-    return true;
-  }
-  if (current_case == field_num) {
-    // If the member is already active, then it should be merged. We're done.
-    return false;
-  }
-  // Look up the value that is already stored, and dispose of it if necessary.
-  const FieldEntry* current_entry = FindFieldEntry(table, current_case);
-  uint16_t current_kind = current_entry->type_card & field_layout::kFkMask;
-  uint16_t current_rep = current_entry->type_card & field_layout::kRepMask;
-  if (current_kind == field_layout::kFkString) {
-    switch (current_rep) {
-      case field_layout::kRepAString: {
-        auto& field = RefAt<ArenaStringPtr>(msg, current_entry->offset);
-        field.Destroy();
-        break;
-      }
-      case field_layout::kRepSString:
-      case field_layout::kRepIString:
-      default:
-        GOOGLE_LOG(DFATAL) << "string rep not handled: "
-                    << (current_rep >> field_layout::kRepShift);
-        return true;
-    }
-  } else if (current_kind == field_layout::kFkMessage) {
-    switch (current_rep) {
-      case field_layout::kRepMessage:
-      case field_layout::kRepGroup:
-      case field_layout::kRepIWeak: {
-        auto& field = RefAt<MessageLite*>(msg, current_entry->offset);
-        if (!ctx->data().arena) {
-          delete field;
-        }
-        break;
-      }
-      default:
-        GOOGLE_LOG(DFATAL) << "message rep not handled: "
-                    << (current_rep >> field_layout::kRepShift);
-        break;
-    }
-  }
-  return true;
-}
-
-const char* TcParser::MpFixed(PROTOBUF_TC_PARAM_DECL) {
-  const auto& entry = RefAt<FieldEntry>(table, data.entry_offset());
-  const uint16_t type_card = entry.type_card;
-  const uint16_t card = type_card & field_layout::kFcMask;
-
-  // Check for repeated parsing (wiretype fallback is handled there):
-  if (card == field_layout::kFcRepeated) {
-    PROTOBUF_MUSTTAIL return MpRepeatedFixed(PROTOBUF_TC_PARAM_PASS);
-  }
-  // Check for mismatched wiretype:
-  const uint16_t rep = type_card & field_layout::kRepMask;
-  const uint32_t decoded_wiretype = data.tag() & 7;
-  if (rep == field_layout::kRep64Bits) {
-    if (decoded_wiretype != WireFormatLite::WIRETYPE_FIXED64) {
-      PROTOBUF_MUSTTAIL return table->fallback(PROTOBUF_TC_PARAM_PASS);
-    }
-  } else {
-    GOOGLE_DCHECK_EQ(rep, static_cast<uint16_t>(field_layout::kRep32Bits));
-    if (decoded_wiretype != WireFormatLite::WIRETYPE_FIXED32) {
-      PROTOBUF_MUSTTAIL return table->fallback(PROTOBUF_TC_PARAM_PASS);
-    }
-  }
-  // Set the field present:
-  if (card == field_layout::kFcOptional) {
-    SetHas(table, entry, msg, hasbits);
-  } else if (card == field_layout::kFcOneof) {
-    ChangeOneof(table, entry, data.tag() >> 3, ctx, msg);
-  }
-  // Copy the value:
-  if (rep == field_layout::kRep64Bits) {
-    RefAt<uint64_t>(msg, entry.offset) = UnalignedLoad<uint64_t>(ptr);
-    ptr += sizeof(uint64_t);
-  } else {
-    RefAt<uint32_t>(msg, entry.offset) = UnalignedLoad<uint32_t>(ptr);
-    ptr += sizeof(uint32_t);
-  }
-  PROTOBUF_MUSTTAIL return ToTagDispatch(PROTOBUF_TC_PARAM_PASS);
-}
-
-const char* TcParser::MpRepeatedFixed(PROTOBUF_TC_PARAM_DECL) {
-  const auto& entry = RefAt<FieldEntry>(table, data.entry_offset());
-  const uint32_t decoded_tag = data.tag();
-  const uint32_t decoded_wiretype = decoded_tag & 7;
-
-  // Check for packed repeated fallback:
-  if (decoded_wiretype == WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-    PROTOBUF_MUSTTAIL return MpPackedFixed(PROTOBUF_TC_PARAM_PASS);
-  }
-
-  const uint16_t type_card = entry.type_card;
-  const uint16_t rep = type_card & field_layout::kRepMask;
-  if (rep == field_layout::kRep64Bits) {
-    if (decoded_wiretype != WireFormatLite::WIRETYPE_FIXED64) {
-      PROTOBUF_MUSTTAIL return table->fallback(PROTOBUF_TC_PARAM_PASS);
-    }
-    auto& field = RefAt<RepeatedField<uint64_t>>(msg, entry.offset);
-    constexpr auto size = sizeof(uint64_t);
-    const char* ptr2 = ptr;
-    uint32_t next_tag;
-    do {
-      ptr = ptr2;
-      *field.Add() = UnalignedLoad<uint64_t>(ptr);
-      ptr += size;
-      if (!ctx->DataAvailable(ptr)) break;
-      ptr2 = ReadTag(ptr, &next_tag);
-    } while (next_tag == decoded_tag);
-  } else {
-    GOOGLE_DCHECK_EQ(rep, static_cast<uint16_t>(field_layout::kRep32Bits));
-    if (decoded_wiretype != WireFormatLite::WIRETYPE_FIXED32) {
-      PROTOBUF_MUSTTAIL return table->fallback(PROTOBUF_TC_PARAM_PASS);
-    }
-    auto& field = RefAt<RepeatedField<uint32_t>>(msg, entry.offset);
-    constexpr auto size = sizeof(uint32_t);
-    const char* ptr2 = ptr;
-    uint32_t next_tag;
-    do {
-      ptr = ptr2;
-      *field.Add() = UnalignedLoad<uint32_t>(ptr);
-      ptr += size;
-      if (!ctx->DataAvailable(ptr)) break;
-      ptr2 = ReadTag(ptr, &next_tag);
-    } while (next_tag == decoded_tag);
-  }
-
-  PROTOBUF_MUSTTAIL return ToTagDispatch(PROTOBUF_TC_PARAM_PASS);
-}
-
-const char* TcParser::MpPackedFixed(PROTOBUF_TC_PARAM_DECL) {
-  const auto& entry = RefAt<FieldEntry>(table, data.entry_offset());
-  const uint16_t type_card = entry.type_card;
-  const uint32_t decoded_wiretype = data.tag() & 7;
-
-  // Check for non-packed repeated fallback:
-  if (decoded_wiretype != WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-    PROTOBUF_MUSTTAIL return MpRepeatedFixed(PROTOBUF_TC_PARAM_PASS);
-  }
-
-  // Since ctx->ReadPackedFixed does not use TailCall<> or Return<>, sync any
-  // pending hasbits now:
-  SyncHasbits(msg, hasbits, table);
-
-  int size = ReadSize(&ptr);
-  uint16_t rep = type_card & field_layout::kRepMask;
-  if (rep == field_layout::kRep64Bits) {
-    auto& field = RefAt<RepeatedField<uint64_t>>(msg, entry.offset);
-    ptr = ctx->ReadPackedFixed(ptr, size, &field);
-  } else {
-    GOOGLE_DCHECK_EQ(rep, static_cast<uint16_t>(field_layout::kRep32Bits));
-    auto& field = RefAt<RepeatedField<uint32_t>>(msg, entry.offset);
-    ptr = ctx->ReadPackedFixed(ptr, size, &field);
-  }
-
-  if (ptr == nullptr) {
-    return Error(PROTOBUF_TC_PARAM_PASS);
-  }
-  PROTOBUF_MUSTTAIL return ToTagDispatch(PROTOBUF_TC_PARAM_PASS);
-}
-
-const char* TcParser::MpVarint(PROTOBUF_TC_PARAM_DECL) {
-  const auto& entry = RefAt<FieldEntry>(table, data.entry_offset());
-  const uint16_t type_card = entry.type_card;
-  const uint16_t card = type_card & field_layout::kFcMask;
-
-  // Check for repeated parsing:
-  if (card == field_layout::kFcRepeated) {
-    PROTOBUF_MUSTTAIL return MpRepeatedVarint(PROTOBUF_TC_PARAM_PASS);
-  }
-  // Check for wire type mismatch:
-  if ((data.tag() & 7) != WireFormatLite::WIRETYPE_VARINT) {
-    PROTOBUF_MUSTTAIL return table->fallback(PROTOBUF_TC_PARAM_PASS);
-  }
-  const uint16_t xform_val = type_card & field_layout::kTvMask;
-  const bool is_zigzag = xform_val == field_layout::kTvZigZag;
-  const bool is_validated_enum = xform_val & field_layout::kTvEnum;
-
-  // Parse the value:
-  const char* ptr2 = ptr;  // save for unknown enum case
-  uint64_t tmp;
-  ptr = ParseVarint(ptr, &tmp);
-  if (ptr == nullptr) return Error(PROTOBUF_TC_PARAM_PASS);
-
-  // Transform and/or validate the value
-  uint16_t rep = type_card & field_layout::kRepMask;
-  if (rep == field_layout::kRep64Bits) {
-    if (is_zigzag) {
-      tmp = WireFormatLite::ZigZagDecode64(tmp);
-    }
-  } else if (rep == field_layout::kRep32Bits) {
-    if (is_validated_enum) {
-      if (!EnumIsValidAux(tmp, xform_val, *table->field_aux(&entry))) {
-        ptr = ptr2;
-        PROTOBUF_MUSTTAIL return table->fallback(PROTOBUF_TC_PARAM_PASS);
-      }
-    } else if (is_zigzag) {
-      tmp = WireFormatLite::ZigZagDecode32(static_cast<uint32_t>(tmp));
-    }
-  }
-
-  // Mark the field as present:
-  const bool is_oneof = card == field_layout::kFcOneof;
-  if (card == field_layout::kFcOptional) {
-    SetHas(table, entry, msg, hasbits);
-  } else if (is_oneof) {
-    ChangeOneof(table, entry, data.tag() >> 3, ctx, msg);
-  }
-
-  if (rep == field_layout::kRep64Bits) {
-    RefAt<uint64_t>(msg, entry.offset) = tmp;
-  } else if (rep == field_layout::kRep32Bits) {
-    RefAt<uint32_t>(msg, entry.offset) = static_cast<uint32_t>(tmp);
-  } else {
-    GOOGLE_DCHECK_EQ(rep, static_cast<uint16_t>(field_layout::kRep8Bits));
-    RefAt<bool>(msg, entry.offset) = static_cast<bool>(tmp);
-  }
-
-  PROTOBUF_MUSTTAIL return ToTagDispatch(PROTOBUF_TC_PARAM_PASS);
-}
-
-const char* TcParser::MpRepeatedVarint(PROTOBUF_TC_PARAM_DECL) {
-  const auto& entry = RefAt<FieldEntry>(table, data.entry_offset());
-  auto type_card = entry.type_card;
-  const uint32_t decoded_tag = data.tag();
-  auto decoded_wiretype = decoded_tag & 7;
-
-  // Check for packed repeated fallback:
-  if (decoded_wiretype == WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-    PROTOBUF_MUSTTAIL return MpPackedVarint(PROTOBUF_TC_PARAM_PASS);
-  }
-  // Check for wire type mismatch:
-  if (decoded_wiretype != WireFormatLite::WIRETYPE_VARINT) {
-    PROTOBUF_MUSTTAIL return table->fallback(PROTOBUF_TC_PARAM_PASS);
-  }
-  uint16_t xform_val = (type_card & field_layout::kTvMask);
-  const bool is_zigzag = xform_val == field_layout::kTvZigZag;
-  const bool is_validated_enum = xform_val & field_layout::kTvEnum;
-
-  uint16_t rep = type_card & field_layout::kRepMask;
-  if (rep == field_layout::kRep64Bits) {
-    auto& field = RefAt<RepeatedField<uint64_t>>(msg, entry.offset);
-    const char* ptr2 = ptr;
-    uint32_t next_tag;
-    do {
-      uint64_t tmp;
-      ptr = ParseVarint(ptr2, &tmp);
-      if (ptr == nullptr) return Error(PROTOBUF_TC_PARAM_PASS);
-      field.Add(is_zigzag ? WireFormatLite::ZigZagDecode64(tmp) : tmp);
-      if (!ctx->DataAvailable(ptr)) break;
-      ptr2 = ReadTag(ptr, &next_tag);
-    } while (next_tag == decoded_tag);
-  } else if (rep == field_layout::kRep32Bits) {
-    auto& field = RefAt<RepeatedField<uint32_t>>(msg, entry.offset);
-    const char* ptr2 = ptr;
-    uint32_t next_tag;
-    do {
-      uint64_t tmp;
-      ptr = ParseVarint(ptr2, &tmp);
-      if (ptr == nullptr) return Error(PROTOBUF_TC_PARAM_PASS);
-      if (is_validated_enum) {
-        if (!EnumIsValidAux(tmp, xform_val, *table->field_aux(&entry))) {
-          ptr = ptr2;
-          PROTOBUF_MUSTTAIL return table->fallback(PROTOBUF_TC_PARAM_PASS);
-        }
-      } else if (is_zigzag) {
-        tmp = WireFormatLite::ZigZagDecode32(tmp);
-      }
-      field.Add(tmp);
-      if (!ctx->DataAvailable(ptr)) break;
-      ptr2 = ReadTag(ptr, &next_tag);
-    } while (next_tag == decoded_tag);
-  } else {
-    GOOGLE_DCHECK_EQ(rep, static_cast<uint16_t>(field_layout::kRep8Bits));
-    auto& field = RefAt<RepeatedField<bool>>(msg, entry.offset);
-    const char* ptr2 = ptr;
-    uint32_t next_tag;
-    do {
-      uint64_t tmp;
-      ptr = ParseVarint(ptr2, &tmp);
-      if (ptr == nullptr) return Error(PROTOBUF_TC_PARAM_PASS);
-      field.Add(static_cast<bool>(tmp));
-      if (!ctx->DataAvailable(ptr)) break;
-      ptr2 = ReadTag(ptr, &next_tag);
-    } while (next_tag == decoded_tag);
-  }
-
-  PROTOBUF_MUSTTAIL return ToTagDispatch(PROTOBUF_TC_PARAM_PASS);
-}
-
-const char* TcParser::MpPackedVarint(PROTOBUF_TC_PARAM_DECL) {
-  const auto& entry = RefAt<FieldEntry>(table, data.entry_offset());
-  auto type_card = entry.type_card;
-  auto decoded_wiretype = data.tag() & 7;
-
-  // Check for non-packed repeated fallback:
-  if (decoded_wiretype != WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-    PROTOBUF_MUSTTAIL return MpRepeatedVarint(PROTOBUF_TC_PARAM_PASS);
-  }
-  uint16_t xform_val = (type_card & field_layout::kTvMask);
-  const bool is_zigzag = xform_val == field_layout::kTvZigZag;
-  const bool is_validated_enum = xform_val & field_layout::kTvEnum;
-  if (is_validated_enum) {
-    // TODO(b/206890171): handle enums
-    PROTOBUF_MUSTTAIL return table->fallback(PROTOBUF_TC_PARAM_PASS);
-  }
-
-  // Since ctx->ReadPackedFixed does not use TailCall<> or Return<>, sync any
-  // pending hasbits now:
-  SyncHasbits(msg, hasbits, table);
-
-  uint16_t rep = type_card & field_layout::kRepMask;
-  if (rep == field_layout::kRep64Bits) {
-    auto* field = &RefAt<RepeatedField<uint64_t>>(msg, entry.offset);
-    return ctx->ReadPackedVarint(ptr, [field, is_zigzag](uint64_t value) {
-      field->Add(is_zigzag ? WireFormatLite::ZigZagDecode64(value) : value);
-    });
-  } else if (rep == field_layout::kRep32Bits) {
-    auto* field = &RefAt<RepeatedField<uint32_t>>(msg, entry.offset);
-    return ctx->ReadPackedVarint(ptr, [field, is_zigzag](uint64_t value) {
-      field->Add(is_zigzag ? WireFormatLite::ZigZagDecode32(
-                                 static_cast<uint32_t>(value))
-                           : value);
-    });
-  } else {
-    GOOGLE_DCHECK_EQ(rep, static_cast<uint16_t>(field_layout::kRep8Bits));
-    auto* field = &RefAt<RepeatedField<bool>>(msg, entry.offset);
-    return ctx->ReadPackedVarint(
-        ptr, [field](uint64_t value) { field->Add(value); });
-  }
-
-  return Error(PROTOBUF_TC_PARAM_PASS);
-}
-
-bool TcParser::MpVerifyUtf8(StringPiece wire_bytes,
-                            const TcParseTableBase* table,
-                            const FieldEntry& entry, uint16_t xform_val) {
-  if (xform_val == field_layout::kTvUtf8) {
-    if (!IsStructurallyValidUTF8(wire_bytes)) {
-      PrintUTF8ErrorLog(MessageName(table), FieldName(table, &entry), "parsing",
-                        false);
-      return false;
-    }
-    return true;
-  }
-#ifndef NDEBUG
-  if (xform_val == field_layout::kTvUtf8Debug) {
-    if (!IsStructurallyValidUTF8(wire_bytes)) {
-      PrintUTF8ErrorLog(MessageName(table), FieldName(table, &entry), "parsing",
-                        false);
-    }
-  }
-#endif  // NDEBUG
-  return true;
-}
-
-const char* TcParser::MpString(PROTOBUF_TC_PARAM_DECL) {
-  const auto& entry = RefAt<FieldEntry>(table, data.entry_offset());
-  const uint16_t type_card = entry.type_card;
-  const uint16_t card = type_card & field_layout::kFcMask;
-  const uint32_t decoded_wiretype = data.tag() & 7;
-
-  if (decoded_wiretype != WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-    PROTOBUF_MUSTTAIL return table->fallback(PROTOBUF_TC_PARAM_PASS);
-  }
-  if (card == field_layout::kFcRepeated) {
-    PROTOBUF_MUSTTAIL return MpRepeatedString(PROTOBUF_TC_PARAM_PASS);
-  }
-  const uint16_t xform_val = type_card & field_layout::kTvMask;
-  const uint16_t rep = type_card & field_layout::kRepMask;
-  if (rep == field_layout::kRepIString) {
-    // TODO(b/198211897): support InilnedStringField.
-    PROTOBUF_MUSTTAIL return table->fallback(PROTOBUF_TC_PARAM_PASS);
-  }
-
-  // Mark the field as present:
-  const bool is_oneof = card == field_layout::kFcOneof;
-  bool need_init = false;
-  if (card == field_layout::kFcOptional) {
-    SetHas(table, entry, msg, hasbits);
-  } else if (is_oneof) {
-    need_init = ChangeOneof(table, entry, data.tag() >> 3, ctx, msg);
-  }
-
-  bool is_valid = false;
-  Arena* arena = ctx->data().arena;
-  switch (rep) {
-    case field_layout::kRepAString: {
-      auto& field = RefAt<ArenaStringPtr>(msg, entry.offset);
-      if (need_init) field.InitDefault();
-      if (arena) {
-        ptr = ctx->ReadArenaString(ptr, &field, arena);
-      } else {
-        std::string* str = field.MutableNoCopy(nullptr);
-        ptr = InlineGreedyStringParser(str, ptr, ctx);
-      }
-      if (!ptr) break;
-      is_valid = MpVerifyUtf8(field.Get(), table, entry, xform_val);
-      break;
-    }
-
-    case field_layout::kRepIString: {
-      break;
-    }
-  }
-
-  if (ptr == nullptr || !is_valid) {
-    return Error(PROTOBUF_TC_PARAM_PASS);
-  }
-  return ToParseLoop(PROTOBUF_TC_PARAM_PASS);
-}
-
-const char* TcParser::MpRepeatedString(PROTOBUF_TC_PARAM_DECL) {
-  const auto& entry = RefAt<FieldEntry>(table, data.entry_offset());
-  const uint16_t type_card = entry.type_card;
-  const uint32_t decoded_tag = data.tag();
-  const uint32_t decoded_wiretype = decoded_tag & 7;
-
-  if (decoded_wiretype != WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-    PROTOBUF_MUSTTAIL return table->fallback(PROTOBUF_TC_PARAM_PASS);
-  }
-
-  const uint16_t rep = type_card & field_layout::kRepMask;
-  const uint16_t xform_val = type_card & field_layout::kTvMask;
-  switch (rep) {
-    case field_layout::kRepSString: {
-      auto& field = RefAt<RepeatedPtrField<std::string>>(msg, entry.offset);
-      const char* ptr2 = ptr;
-      uint32_t next_tag;
-      do {
-        ptr = ptr2;
-        std::string* str = field.Add();
-        ptr = InlineGreedyStringParser(str, ptr, ctx);
-        if (PROTOBUF_PREDICT_FALSE(
-                ptr == nullptr ||
-                !MpVerifyUtf8(*str, table, entry, xform_val))) {
-          return Error(PROTOBUF_TC_PARAM_PASS);
-        }
-        if (!ctx->DataAvailable(ptr)) break;
-        ptr2 = ReadTag(ptr, &next_tag);
-      } while (next_tag == decoded_tag);
-      break;
-    }
-
-#ifndef NDEBUG
-    default:
-      GOOGLE_LOG(FATAL) << "Unsupported repeated string rep: " << rep;
-      break;
-#endif
-  }
-
-  return ToParseLoop(PROTOBUF_TC_PARAM_PASS);
-}
-
-const char* TcParser::MpMessage(PROTOBUF_TC_PARAM_DECL) {
-  const auto& entry = RefAt<FieldEntry>(table, data.entry_offset());
-  const uint16_t type_card = entry.type_card;
-  const uint16_t card = type_card & field_layout::kFcMask;
-
-  // Check for repeated parsing:
-  if (card == field_layout::kFcRepeated) {
-    PROTOBUF_MUSTTAIL return MpRepeatedMessage(PROTOBUF_TC_PARAM_PASS);
-  }
-
-  const uint32_t decoded_tag = data.tag();
-  const uint32_t decoded_wiretype = decoded_tag & 7;
-  const uint16_t rep = type_card & field_layout::kRepMask;
-  const bool is_group = rep == field_layout::kRepGroup;
-
-  // Validate wiretype:
-  switch (rep) {
-    case field_layout::kRepMessage:
-      if (decoded_wiretype != WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-        goto fallback;
-      }
-      break;
-    case field_layout::kRepGroup:
-      if (decoded_wiretype != WireFormatLite::WIRETYPE_START_GROUP) {
-        goto fallback;
-      }
-      break;
-    default: {
-    fallback:
-      // Lazy and implicit weak fields are handled by generated code:
-      // TODO(b/210762816): support these.
-      PROTOBUF_MUSTTAIL return table->fallback(PROTOBUF_TC_PARAM_PASS);
-    }
-  }
-
-  const bool is_oneof = card == field_layout::kFcOneof;
-  bool need_init = false;
-  if (card == field_layout::kFcOptional) {
-    SetHas(table, entry, msg, hasbits);
-  } else if (is_oneof) {
-    need_init = ChangeOneof(table, entry, data.tag() >> 3, ctx, msg);
-  }
-  MessageLite*& field = RefAt<MessageLite*>(msg, entry.offset);
-  if (need_init || field == nullptr) {
-    const MessageLite* default_instance =
-        table->field_aux(&entry)->message_default;
-    field = default_instance->New(ctx->data().arena);
-  }
-  SyncHasbits(msg, hasbits, table);
-  if (is_group) {
-    return ctx->ParseGroup(field, ptr, decoded_tag);
-  }
-  return ctx->ParseMessage(field, ptr);
-}
-
-const char* TcParser::MpRepeatedMessage(PROTOBUF_TC_PARAM_DECL) {
-  const auto& entry = RefAt<FieldEntry>(table, data.entry_offset());
-  const uint16_t type_card = entry.type_card;
-  GOOGLE_DCHECK_EQ(type_card & field_layout::kFcMask,
-            static_cast<uint16_t>(field_layout::kFcRepeated));
-  const uint32_t decoded_tag = data.tag();
-  const uint32_t decoded_wiretype = decoded_tag & 7;
-  const uint16_t rep = type_card & field_layout::kRepMask;
-  const bool is_group = rep == field_layout::kRepGroup;
-
-  // Validate wiretype:
-  switch (rep) {
-    case field_layout::kRepMessage:
-      if (decoded_wiretype != WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-        goto fallback;
-      }
-      break;
-    case field_layout::kRepGroup:
-      if (decoded_wiretype != WireFormatLite::WIRETYPE_START_GROUP) {
-        goto fallback;
-      }
-      break;
-    default: {
-    fallback:
-      // Lazy and implicit weak fields are handled by generated code:
-      // TODO(b/210762816): support these.
-      PROTOBUF_MUSTTAIL return table->fallback(PROTOBUF_TC_PARAM_PASS);
-    }
-  }
-
-  SyncHasbits(msg, hasbits, table);
-  const MessageLite* default_instance =
-      table->field_aux(&entry)->message_default;
-  auto& field = RefAt<RepeatedPtrFieldBase>(msg, entry.offset);
-  MessageLite* value =
-      field.Add<GenericTypeHandler<MessageLite>>(default_instance);
-  if (is_group) {
-    return ctx->ParseGroup(value, ptr, decoded_tag);
-  }
-  return ctx->ParseMessage(value, ptr);
-}
-
-const char* TcParser::MpMap(PROTOBUF_TC_PARAM_DECL) {
-  const auto& entry = RefAt<FieldEntry>(table, data.entry_offset());
-  (void)entry;
-  PROTOBUF_MUSTTAIL return table->fallback(PROTOBUF_TC_PARAM_PASS);
-}
-
-}  // namespace internal
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/generated_message_tctable_lite_test.cc b/libs/protobuf/src/google/protobuf/generated_message_tctable_lite_test.cc
deleted file mode 100644
index 4310803..0000000
--- a/libs/protobuf/src/google/protobuf/generated_message_tctable_lite_test.cc
+++ /dev/null
@@ -1,607 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <cstddef>
-
-#include <google/protobuf/generated_message_tctable_impl.h>
-#include <google/protobuf/wire_format_lite.h>
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
-namespace google {
-namespace protobuf {
-namespace internal {
-
-namespace {
-
-using ::testing::Eq;
-using ::testing::Not;
-
-MATCHER_P3(IsEntryForFieldNum, table, field_num, field_numbers_table,
-           StrCat(negation ? "isn't " : "",
-                        "the field entry for field number ", field_num)) {
-  if (arg == nullptr) {
-    *result_listener << "which is nullptr";
-    return false;
-  }
-  // Use the entry's index to compare field numbers.
-  size_t index = static_cast<const TcParseTableBase::FieldEntry*>(arg) -
-                 &table->field_entries[0];
-  uint32_t actual_field_num = field_numbers_table[index];
-  if (actual_field_num != field_num) {
-    *result_listener << "which is the entry for " << actual_field_num;
-    return false;
-  }
-  return true;
-}
-
-TEST(IsEntryForFieldNumTest, Matcher) {
-  // clang-format off
-  TcParseTable<0, 3, 0, 0, 2> table = {
-      // header:
-      {
-          0, 0, 0, 0,  // has_bits_offset, extensions
-          0,           // max_field_number
-          0,           // fast_idx_mask,
-          offsetof(decltype(table), field_lookup_table),
-          0xFFFFFFFF - 7,  // 7 = fields 1, 2, and 3.
-          offsetof(decltype(table), field_names),
-          0,           // num_field_entries
-          0, 0,        // num_aux_entries, aux_offset,
-          nullptr,     // default instance
-          nullptr,     // fallback function
-      }};
-  // clang-format on
-  int table_field_numbers[] = {1, 2, 3};
-  table.field_lookup_table = {65535, 65535};
-
-  auto& entries = table.field_entries;
-  EXPECT_THAT(&entries[0], IsEntryForFieldNum(&table, 1, table_field_numbers));
-  EXPECT_THAT(&entries[2], IsEntryForFieldNum(&table, 3, table_field_numbers));
-  EXPECT_THAT(&entries[1],
-              Not(IsEntryForFieldNum(&table, 3, table_field_numbers)));
-
-  EXPECT_THAT(nullptr, Not(IsEntryForFieldNum(&table, 1, table_field_numbers)));
-}
-
-}  // namespace
-
-class FindFieldEntryTest : public ::testing::Test {
- public:
-  // Calls the private `FindFieldEntry` function.
-  template <size_t kFastTableSizeLog2, size_t kNumEntries, size_t kNumFieldAux,
-            size_t kNameTableSize, size_t kFieldLookupTableSize>
-  static const TcParseTableBase::FieldEntry* FindFieldEntry(
-      const TcParseTable<kFastTableSizeLog2, kNumEntries, kNumFieldAux,
-                         kNameTableSize, kFieldLookupTableSize>& table,
-      uint32_t tag) {
-    return TcParser::FindFieldEntry(&table.header, tag);
-  }
-
-  // Calls the private `FieldName` function.
-  template <size_t kFastTableSizeLog2, size_t kNumEntries, size_t kNumFieldAux,
-            size_t kNameTableSize, size_t kFieldLookupTableSize>
-  static StringPiece FieldName(
-      const TcParseTable<kFastTableSizeLog2, kNumEntries, kNumFieldAux,
-                         kNameTableSize, kFieldLookupTableSize>& table,
-      const TcParseTableBase::FieldEntry* entry) {
-    return TcParser::FieldName(&table.header, entry);
-  }
-
-  // Calls the private `MessageName` function.
-  template <size_t kFastTableSizeLog2, size_t kNumEntries, size_t kNumFieldAux,
-            size_t kNameTableSize, size_t kFieldLookupTableSize>
-  static StringPiece MessageName(
-      const TcParseTable<kFastTableSizeLog2, kNumEntries, kNumFieldAux,
-                         kNameTableSize, kFieldLookupTableSize>& table) {
-    return TcParser::MessageName(&table.header);
-  }
-
-  // Returns the number of fields scanned during a small scan.
-  static constexpr int small_scan_size() { return TcParser::kMtSmallScanSize; }
-};
-
-TEST_F(FindFieldEntryTest, SequentialFieldRange) {
-  // Look up fields that are within the range of `lookup_table_offset`.
-  // clang-format off
-  TcParseTable<0, 5, 0, 0, 8> table = {
-      // header:
-      {
-          0, 0, 0, 0,  // has_bits_offset, extensions
-          111,         // max_field_number
-          0,           // fast_idx_mask,
-          offsetof(decltype(table), field_lookup_table),
-          0xFFFFFFFF - (1 << 1) - (1 << 2)   // fields 2, 3
-                     - (1 << 3) - (1 << 4),  // fields 4, 5
-          offsetof(decltype(table), field_entries),
-          5,           // num_field_entries
-          0, 0,        // num_aux_entries, aux_offset,
-          nullptr,     // default instance
-          {},          // fallback function
-      },
-      {},  // fast_entries
-      // field_lookup_table for 2, 3, 4, 5, 111:
-      {{
-        111,      0,                  // field 111
-        1,                            // 1 skip entry
-        0xFFFE,   4,                  // 1 field, entry 4.
-        65535, 65535,                 // end of table
-      }},
-  };
-  // clang-format on
-  int table_field_numbers[] = {2, 3, 4, 5, 111};
-
-  for (int i : table_field_numbers) {
-    EXPECT_THAT(FindFieldEntry(table, i),
-                IsEntryForFieldNum(&table, i, table_field_numbers));
-  }
-  for (int i : {0, 1, 6, 7, 110, 112, 500000000}) {
-    GOOGLE_LOG(WARNING) << "Field " << i;
-    EXPECT_THAT(FindFieldEntry(table, i), Eq(nullptr));
-  }
-}
-
-TEST_F(FindFieldEntryTest, SmallScanRange) {
-  // Look up fields past `lookup_table_offset`, but before binary search.
-  ASSERT_THAT(small_scan_size(), Eq(4)) << "test needs to be updated";
-  // clang-format off
-  TcParseTable<0, 6, 0, 0, 8> table = {
-      // header:
-      {
-          0, 0, 0, 0,  // has_bits_offset, extensions
-          111,         // max_field_number
-          0,           // fast_idx_mask,
-          offsetof(decltype(table), field_lookup_table),
-          0xFFFFFFFF - (1<<0) - (1<<2) - (1<<3) - (1<<4) - (1<<6),  // 1,3-5,7
-          offsetof(decltype(table), field_entries),
-          6,           // num_field_entries
-          0, 0,        // num_aux_entries, aux_offset,
-          nullptr,     // default instance
-          {},          // fallback function
-      },
-      {},  // fast_entries
-      // field_lookup_table for 1, 3, 4, 5, 7, 111:
-      {{
-        111, 0,                                              // field 111
-        1,                                                   // 1 skip entry
-        0xFFFE, 5,                                           // 1 field, entry 5
-        65535, 65535                                         // end of table
-      }},
-  };
-  // clang-format on
-  int table_field_numbers[] = {// Sequential entries:
-                               1,
-                               // Small scan range:
-                               3, 4, 5, 7,
-                               // Binary search range:
-                               111};
-
-  for (int i : table_field_numbers) {
-    EXPECT_THAT(FindFieldEntry(table, i),
-                IsEntryForFieldNum(&table, i, table_field_numbers));
-  }
-  for (int i : {0, 2, 6, 8, 9, 110, 112, 500000000}) {
-    EXPECT_THAT(FindFieldEntry(table, i), Eq(nullptr));
-  }
-}
-
-TEST_F(FindFieldEntryTest, BinarySearchRange) {
-  // Fields after the sequential and small-scan ranges are looked up using
-  // binary search.
-  ASSERT_THAT(small_scan_size(), Eq(4)) << "test needs to be updated";
-
-  // clang-format off
-  TcParseTable<0, 10, 0, 0, 8> table = {
-      // header:
-      {
-          0, 0, 0, 0,  // has_bits_offset, extensions
-          70,          // max_field_number
-          0,           // fast_idx_mask,
-          offsetof(decltype(table), field_lookup_table),
-          0xFFFFFFFF - (1<<0) - (1<<2) - (1<<3) - (1<<4)   // 1, 3, 4, 5, 6
-                     - (1<<5) - (1<<7) - (1<<8) - (1<<10)  // 8, 9, 11, 12
-                     - (1<<11),
-          offsetof(decltype(table), field_entries),
-          10,          // num_field_entries
-          0, 0,        // num_aux_entries, aux_offset,
-          nullptr,     // default instance
-          {},          // fallback function
-      },
-      {},  // fast_entries
-      // field_lookup_table for 1, 3, 4, 5, 6, 8, 9, 11, 12, 70
-      {{
-        70, 0,                                              // field 70
-        1,                                                  // 1 skip entry
-        0xFFFE, 9,                                          // 1 field, entry 9
-        65535, 65535                                        // end of table
-      }},
-  };
-  int table_field_numbers[] = {
-        // Sequential entries:
-        1,
-        // Small scan range:
-        3, 4, 5, 6,
-        // Binary search range:
-        8, 9, 11, 12, 70
-  };
-  // clang-format on
-  for (int i : table_field_numbers) {
-    EXPECT_THAT(FindFieldEntry(table, i),
-                IsEntryForFieldNum(&table, i, table_field_numbers));
-  }
-  for (int i : {0, 2, 7, 10, 13, 69, 71, 112, 500000000}) {
-    EXPECT_THAT(FindFieldEntry(table, i), Eq(nullptr));
-  }
-}
-
-TEST_F(FindFieldEntryTest, OutOfRange) {
-  // Look up tags that are larger than the maximum in the message.
-  // clang-format off
-  TcParseTable<0, 3, 0, 15, 2> table = {
-      // header:
-      {
-          0, 0, 0, 0,  // has_bits_offset, extensions
-          3,           // max_field_number
-          0,           // fast_idx_mask,
-          offsetof(decltype(table), field_lookup_table),
-          0xFFFFFFFF - (1<<0) - (1<<1) - (1<<2),  // fields 1, 2, 3
-          offsetof(decltype(table), field_entries),
-          3,           // num_field_entries
-          0,           // num_aux_entries
-          offsetof(decltype(table), field_names),  // no aux_entries
-          nullptr,     // default instance
-          {},          // fallback function
-      },
-      {},  // fast_entries
-      {{// field lookup table
-        65535, 65535                       // end of table
-      }},
-    {},  // "mini" table
-    // auxiliary entries (none in this test)
-    {{  // name lengths
-        "\0\1\2\3\0\0\0\0"
-          // names
-        "1"
-        "02"
-        "003"}},
-  };
-  // clang-format on
-  int table_field_numbers[] = {1, 2, 3};
-
-  for (int field_num : table_field_numbers) {
-    auto* entry = FindFieldEntry(table, field_num);
-    EXPECT_THAT(entry,
-                IsEntryForFieldNum(&table, field_num, table_field_numbers));
-
-    StringPiece name = FieldName(table, entry);
-    EXPECT_EQ(name.length(), field_num);
-    while (name[0] == '0') name.remove_prefix(1);  // strip leading zeores
-    EXPECT_EQ(name, StrCat(field_num));
-  }
-  for (int field_num : {0, 4, 112, 500000000}) {
-    EXPECT_THAT(FindFieldEntry(table, field_num), Eq(nullptr));
-  }
-}
-
-TEST_F(FindFieldEntryTest, EmptyMessage) {
-  // Ensure that tables with no fields are handled correctly.
-  using TableType = TcParseTable<0, 0, 0, 20, 2>;
-  // clang-format off
-  TableType table = {
-      // header:
-      {
-          0, 0, 0, 0,  // has_bits_offset, extensions
-          0,           // max_field_number
-          0,           // fast_idx_mask,
-          offsetof(decltype(table), field_lookup_table),
-          0xFFFFFFFF,       // no fields
-          offsetof(decltype(table), field_names),  // no field_entries
-          0,           // num_field_entries
-          0,           // num_aux_entries
-          offsetof(TableType, field_names),
-          nullptr,     // default instance
-          nullptr,     // fallback function
-      },
-      {},  // fast_entries
-      {{// empty field lookup table
-        65535, 65535
-      }},
-      {{
-          "\13\0\0\0\0\0\0\0"
-          "MessageName"
-      }},
-  };
-  // clang-format on
-
-  for (int i : {0, 4, 112, 500000000}) {
-    EXPECT_THAT(FindFieldEntry(table, i), Eq(nullptr));
-  }
-  EXPECT_THAT(MessageName(table), Eq("MessageName"));
-}
-
-// Make a monster with lots of field numbers
-
-int32_t test_all_types_table_field_numbers[] = {
-    1,   2,   3,   4,   5,   6,   7,   8,   9,   10,   //
-    11,  12,  13,  14,  15,  18,  19,  21,  22,  24,   //
-    25,  27,  31,  32,  33,  34,  35,  36,  37,  38,   //
-    39,  40,  41,  42,  43,  44,  45,  48,  49,  51,   //
-    52,  54,  55,  56,  57,  58,  59,  60,  61,  62,   //
-    63,  64,  65,  66,  67,  68,  69,  70,  71,  72,   //
-    73,  74,  75,  76,  77,  78,  79,  80,  81,  82,   //
-    83,  84,  85,  86,  87,  88,  89,  90,  91,  92,   //
-    93,  94,  95,  96,  97,  98,  99,  100, 101, 102,  //
-    111, 112, 113, 114, 115, 116, 117, 118, 119, 201,  //
-    241, 242, 243, 244, 245, 246, 247, 248, 249, 250,  //
-    251, 252, 253, 254, 255, 321, 322, 401, 402, 403,  //
-    404, 405, 406, 407, 408, 409, 410, 411, 412, 413,  //
-    414, 415, 416, 417};
-
-// clang-format off
-const TcParseTable<5, 134, 5, 2176, 55> test_all_types_table = {
-    // header:
-    {
-        0, 0, 0, 0,  // has_bits_offset, extensions
-        418, 248,    // max_field_number, fast_idx_mask
-        offsetof(decltype(test_all_types_table), field_lookup_table),
-        977895424,  // skipmap for fields 1-15,18-19,21-22,24-25,27,31-32
-        offsetof(decltype(test_all_types_table), field_entries),
-        135,         // num_field_entries
-        5,           // num_aux_entries
-        offsetof(decltype(test_all_types_table), aux_entries),
-        nullptr,     // default instance
-        nullptr,     // fallback function
-    },
-    {{
-        // tail-call table
-    }},
-    {{  // field lookup table
-        //
-        // fields 33-417, over 25 skipmap / offset pairs
-      33, 0, 25,
-      24576,  24,   18,     38,   0,      52,   0,      68,   16320,  84,
-      65408,  92,   65535,  99,   65535,  99,   65535,  99,   65535,  99,
-      65279,  99,   65535,  100,  65535,  100,  32768,  100,  65535,  115,
-      65535,  115,  65535,  115,  65535,  115,  65532,  115,  65535,  117,
-      65535,  117,  65535,  117,  65535,  117,  0,      117,  65532,  133,
-      // end of table
-      65535, 65535
-  }},
-  {{
-      // "mini" table
-  }},
-  {{  // auxiliary entries (not used in this test)
-      {-1, 4},
-      {-1, 4},
-      {-1, 4},
-      {-1, 4},
-      {-1, 4},
-    }}, {{  // name lengths
-      "\1"  // message name
-      "\16\16\17\17\17\17\20\20\21\21\16\17\15\17\16\27\30\24\25\25"
-      "\15\21\16\16\17\17\17\17\20\20\21\21\16\17\15\17\16\27\30\24"
-      "\25\25\15\17\17\21\21\21\21\23\23\25\25\17\20\15\21\20\31\32"
-      "\26\27\14\14\15\15\15\15\16\16\17\17\14\15\13\22\16\16\17\17"
-      "\17\17\20\20\21\21\16\17\15\24\14\24\14\13\12\14\13\14\12\4"
-      "\15\15\16\16\16\16\17\17\20\20\15\16\14\16\15\25\25\12\13\14"
-      "\15\13\15\12\12\13\14\14\14\16\16\15\15\16\0"
-        // names
-      "M"
-      "optional_int32"
-      "optional_int64"
-      "optional_uint32"
-      "optional_uint64"
-      "optional_sint32"
-      "optional_sint64"
-      "optional_fixed32"
-      "optional_fixed64"
-      "optional_sfixed32"
-      "optional_sfixed64"
-      "optional_float"
-      "optional_double"
-      "optional_bool"
-      "optional_string"
-      "optional_bytes"
-      "optional_nested_message"
-      "optional_foreign_message"
-      "optional_nested_enum"
-      "optional_foreign_enum"
-      "optional_string_piece"
-      "optional_cord"
-      "recursive_message"
-      "repeated_int32"
-      "repeated_int64"
-      "repeated_uint32"
-      "repeated_uint64"
-      "repeated_sint32"
-      "repeated_sint64"
-      "repeated_fixed32"
-      "repeated_fixed64"
-      "repeated_sfixed32"
-      "repeated_sfixed64"
-      "repeated_float"
-      "repeated_double"
-      "repeated_bool"
-      "repeated_string"
-      "repeated_bytes"
-      "repeated_nested_message"
-      "repeated_foreign_message"
-      "repeated_nested_enum"
-      "repeated_foreign_enum"
-      "repeated_string_piece"
-      "repeated_cord"
-      "map_int32_int32"
-      "map_int64_int64"
-      "map_uint32_uint32"
-      "map_uint64_uint64"
-      "map_sint32_sint32"
-      "map_sint64_sint64"
-      "map_fixed32_fixed32"
-      "map_fixed64_fixed64"
-      "map_sfixed32_sfixed32"
-      "map_sfixed64_sfixed64"
-      "map_int32_float"
-      "map_int32_double"
-      "map_bool_bool"
-      "map_string_string"
-      "map_string_bytes"
-      "map_string_nested_message"
-      "map_string_foreign_message"
-      "map_string_nested_enum"
-      "map_string_foreign_enum"
-      "packed_int32"
-      "packed_int64"
-      "packed_uint32"
-      "packed_uint64"
-      "packed_sint32"
-      "packed_sint64"
-      "packed_fixed32"
-      "packed_fixed64"
-      "packed_sfixed32"
-      "packed_sfixed64"
-      "packed_float"
-      "packed_double"
-      "packed_bool"
-      "packed_nested_enum"
-      "unpacked_int32"
-      "unpacked_int64"
-      "unpacked_uint32"
-      "unpacked_uint64"
-      "unpacked_sint32"
-      "unpacked_sint64"
-      "unpacked_fixed32"
-      "unpacked_fixed64"
-      "unpacked_sfixed32"
-      "unpacked_sfixed64"
-      "unpacked_float"
-      "unpacked_double"
-      "unpacked_bool"
-      "unpacked_nested_enum"
-      "oneof_uint32"
-      "oneof_nested_message"
-      "oneof_string"
-      "oneof_bytes"
-      "oneof_bool"
-      "oneof_uint64"
-      "oneof_float"
-      "oneof_double"
-      "oneof_enum"
-      "data"
-      "default_int32"
-      "default_int64"
-      "default_uint32"
-      "default_uint64"
-      "default_sint32"
-      "default_sint64"
-      "default_fixed32"
-      "default_fixed64"
-      "default_sfixed32"
-      "default_sfixed64"
-      "default_float"
-      "default_double"
-      "default_bool"
-      "default_string"
-      "default_bytes"
-      "optional_lazy_message"
-      "repeated_lazy_message"
-      "fieldname1"
-      "field_name2"
-      "_field_name3"
-      "field__name4_"
-      "field0name5"
-      "field_0_name6"
-      "fieldName7"
-      "FieldName8"
-      "field_Name9"
-      "Field_Name10"
-      "FIELD_NAME11"
-      "FIELD_name12"
-      "__field_name13"
-      "__Field_name14"
-      "field__name15"
-      "field__Name16"
-      "field_name17__"
-  }},
-};
-// clang-format on
-
-TEST_F(FindFieldEntryTest, BigMessage) {
-  EXPECT_THAT(MessageName(test_all_types_table), Eq("M"));
-  for (int field_num :
-       {1, 12, 31, 42, 57, 68, 79, 90, 101, 119, 249, 402, 412}) {
-    auto* entry = FindFieldEntry(test_all_types_table, field_num);
-    StringPiece name = FieldName(test_all_types_table, entry);
-    switch (field_num) {
-      case 1:
-        EXPECT_THAT(name, Eq("optional_int32"));
-        break;
-      case 12:
-        EXPECT_THAT(name, Eq("optional_double"));
-        break;
-      case 31:
-        EXPECT_THAT(name, Eq("repeated_int32"));
-        break;
-      case 42:
-        EXPECT_THAT(name, Eq("repeated_double"));
-        break;
-      case 57:
-        EXPECT_THAT(name, Eq("map_int64_int64"));
-        break;
-      case 68:
-        EXPECT_THAT(name, Eq("map_bool_bool"));
-        break;
-      case 79:
-        EXPECT_THAT(name, Eq("packed_sint32"));
-        break;
-      case 90:
-        EXPECT_THAT(name, Eq("unpacked_int64"));
-        break;
-      case 101:
-        EXPECT_THAT(name, Eq("unpacked_bool"));
-        break;
-      case 119:
-        EXPECT_THAT(name, Eq("oneof_enum"));
-        break;
-      case 249:
-        EXPECT_THAT(name, Eq("default_sfixed32"));
-        break;
-      case 402:
-        EXPECT_THAT(name, Eq("field_name2"));
-        break;
-      case 412:
-        EXPECT_THAT(name, Eq("FIELD_name12"));
-        break;
-    }
-  }
-}
-
-}  // namespace internal
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/generated_message_util.cc b/libs/protobuf/src/google/protobuf/generated_message_util.cc
deleted file mode 100644
index cad12a3..0000000
--- a/libs/protobuf/src/google/protobuf/generated_message_util.cc
+++ /dev/null
@@ -1,409 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-
-#include <google/protobuf/generated_message_util.h>
-
-#include <atomic>
-#include <limits>
-#include <vector>
-
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/io/zero_copy_stream_impl_lite.h>
-#include <google/protobuf/arenastring.h>
-#include <google/protobuf/extension_set.h>
-#include <google/protobuf/message_lite.h>
-#include <google/protobuf/metadata_lite.h>
-#include <google/protobuf/repeated_field.h>
-#include <google/protobuf/wire_format_lite.h>
-
-// Must be included last
-#include <google/protobuf/port_def.inc>
-
-PROTOBUF_PRAGMA_INIT_SEG
-
-
-namespace google {
-namespace protobuf {
-namespace internal {
-
-void DestroyMessage(const void* message) {
-  static_cast<const MessageLite*>(message)->~MessageLite();
-}
-void DestroyString(const void* s) {
-  static_cast<const std::string*>(s)->~basic_string();
-}
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 ExplicitlyConstructedArenaString
-        fixed_address_empty_string{};  // NOLINT
-
-
-PROTOBUF_CONSTINIT std::atomic<bool> init_protobuf_defaults_state{false};
-static bool InitProtobufDefaultsImpl() {
-  fixed_address_empty_string.DefaultConstruct();
-  OnShutdownDestroyString(fixed_address_empty_string.get_mutable());
-
-
-  init_protobuf_defaults_state.store(true, std::memory_order_release);
-  return true;
-}
-
-void InitProtobufDefaultsSlow() {
-  static bool is_inited = InitProtobufDefaultsImpl();
-  (void)is_inited;
-}
-// Force the initialization of the empty string.
-// Normally, registration would do it, but we don't have any guarantee that
-// there is any object with reflection.
-PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 static std::true_type init_empty_string =
-    (InitProtobufDefaultsSlow(), std::true_type{});
-
-size_t StringSpaceUsedExcludingSelfLong(const std::string& str) {
-  const void* start = &str;
-  const void* end = &str + 1;
-  if (start <= str.data() && str.data() < end) {
-    // The string's data is stored inside the string object itself.
-    return 0;
-  } else {
-    return str.capacity();
-  }
-}
-
-template <typename T>
-const T& Get(const void* ptr) {
-  return *static_cast<const T*>(ptr);
-}
-
-// PrimitiveTypeHelper is a wrapper around the interface of WireFormatLite.
-// WireFormatLite has a very inconvenient interface with respect to template
-// meta-programming. This class wraps the different named functions into
-// a single Serialize / SerializeToArray interface.
-template <int type>
-struct PrimitiveTypeHelper;
-
-template <>
-struct PrimitiveTypeHelper<WireFormatLite::TYPE_BOOL> {
-  typedef bool Type;
-  static void Serialize(const void* ptr, io::CodedOutputStream* output) {
-    WireFormatLite::WriteBoolNoTag(Get<bool>(ptr), output);
-  }
-  static uint8_t* SerializeToArray(const void* ptr, uint8_t* buffer) {
-    return WireFormatLite::WriteBoolNoTagToArray(Get<Type>(ptr), buffer);
-  }
-};
-
-template <>
-struct PrimitiveTypeHelper<WireFormatLite::TYPE_INT32> {
-  typedef int32_t Type;
-  static void Serialize(const void* ptr, io::CodedOutputStream* output) {
-    WireFormatLite::WriteInt32NoTag(Get<int32_t>(ptr), output);
-  }
-  static uint8_t* SerializeToArray(const void* ptr, uint8_t* buffer) {
-    return WireFormatLite::WriteInt32NoTagToArray(Get<Type>(ptr), buffer);
-  }
-};
-
-template <>
-struct PrimitiveTypeHelper<WireFormatLite::TYPE_SINT32> {
-  typedef int32_t Type;
-  static void Serialize(const void* ptr, io::CodedOutputStream* output) {
-    WireFormatLite::WriteSInt32NoTag(Get<int32_t>(ptr), output);
-  }
-  static uint8_t* SerializeToArray(const void* ptr, uint8_t* buffer) {
-    return WireFormatLite::WriteSInt32NoTagToArray(Get<Type>(ptr), buffer);
-  }
-};
-
-template <>
-struct PrimitiveTypeHelper<WireFormatLite::TYPE_UINT32> {
-  typedef uint32_t Type;
-  static void Serialize(const void* ptr, io::CodedOutputStream* output) {
-    WireFormatLite::WriteUInt32NoTag(Get<uint32_t>(ptr), output);
-  }
-  static uint8_t* SerializeToArray(const void* ptr, uint8_t* buffer) {
-    return WireFormatLite::WriteUInt32NoTagToArray(Get<Type>(ptr), buffer);
-  }
-};
-template <>
-struct PrimitiveTypeHelper<WireFormatLite::TYPE_INT64> {
-  typedef int64_t Type;
-  static void Serialize(const void* ptr, io::CodedOutputStream* output) {
-    WireFormatLite::WriteInt64NoTag(Get<int64_t>(ptr), output);
-  }
-  static uint8_t* SerializeToArray(const void* ptr, uint8_t* buffer) {
-    return WireFormatLite::WriteInt64NoTagToArray(Get<Type>(ptr), buffer);
-  }
-};
-
-template <>
-struct PrimitiveTypeHelper<WireFormatLite::TYPE_SINT64> {
-  typedef int64_t Type;
-  static void Serialize(const void* ptr, io::CodedOutputStream* output) {
-    WireFormatLite::WriteSInt64NoTag(Get<int64_t>(ptr), output);
-  }
-  static uint8_t* SerializeToArray(const void* ptr, uint8_t* buffer) {
-    return WireFormatLite::WriteSInt64NoTagToArray(Get<Type>(ptr), buffer);
-  }
-};
-template <>
-struct PrimitiveTypeHelper<WireFormatLite::TYPE_UINT64> {
-  typedef uint64_t Type;
-  static void Serialize(const void* ptr, io::CodedOutputStream* output) {
-    WireFormatLite::WriteUInt64NoTag(Get<uint64_t>(ptr), output);
-  }
-  static uint8_t* SerializeToArray(const void* ptr, uint8_t* buffer) {
-    return WireFormatLite::WriteUInt64NoTagToArray(Get<Type>(ptr), buffer);
-  }
-};
-
-template <>
-struct PrimitiveTypeHelper<WireFormatLite::TYPE_FIXED32> {
-  typedef uint32_t Type;
-  static void Serialize(const void* ptr, io::CodedOutputStream* output) {
-    WireFormatLite::WriteFixed32NoTag(Get<uint32_t>(ptr), output);
-  }
-  static uint8_t* SerializeToArray(const void* ptr, uint8_t* buffer) {
-    return WireFormatLite::WriteFixed32NoTagToArray(Get<Type>(ptr), buffer);
-  }
-};
-
-template <>
-struct PrimitiveTypeHelper<WireFormatLite::TYPE_FIXED64> {
-  typedef uint64_t Type;
-  static void Serialize(const void* ptr, io::CodedOutputStream* output) {
-    WireFormatLite::WriteFixed64NoTag(Get<uint64_t>(ptr), output);
-  }
-  static uint8_t* SerializeToArray(const void* ptr, uint8_t* buffer) {
-    return WireFormatLite::WriteFixed64NoTagToArray(Get<Type>(ptr), buffer);
-  }
-};
-
-template <>
-struct PrimitiveTypeHelper<WireFormatLite::TYPE_ENUM>
-    : PrimitiveTypeHelper<WireFormatLite::TYPE_INT32> {};
-
-template <>
-struct PrimitiveTypeHelper<WireFormatLite::TYPE_SFIXED32>
-    : PrimitiveTypeHelper<WireFormatLite::TYPE_FIXED32> {
-  typedef int32_t Type;
-};
-template <>
-struct PrimitiveTypeHelper<WireFormatLite::TYPE_SFIXED64>
-    : PrimitiveTypeHelper<WireFormatLite::TYPE_FIXED64> {
-  typedef int64_t Type;
-};
-template <>
-struct PrimitiveTypeHelper<WireFormatLite::TYPE_FLOAT>
-    : PrimitiveTypeHelper<WireFormatLite::TYPE_FIXED32> {
-  typedef float Type;
-};
-template <>
-struct PrimitiveTypeHelper<WireFormatLite::TYPE_DOUBLE>
-    : PrimitiveTypeHelper<WireFormatLite::TYPE_FIXED64> {
-  typedef double Type;
-};
-
-template <>
-struct PrimitiveTypeHelper<WireFormatLite::TYPE_STRING> {
-  typedef std::string Type;
-  static void Serialize(const void* ptr, io::CodedOutputStream* output) {
-    const Type& value = *static_cast<const Type*>(ptr);
-    output->WriteVarint32(value.size());
-    output->WriteRawMaybeAliased(value.data(), value.size());
-  }
-  static uint8_t* SerializeToArray(const void* ptr, uint8_t* buffer) {
-    const Type& value = *static_cast<const Type*>(ptr);
-    return io::CodedOutputStream::WriteStringWithSizeToArray(value, buffer);
-  }
-};
-
-template <>
-struct PrimitiveTypeHelper<WireFormatLite::TYPE_BYTES>
-    : PrimitiveTypeHelper<WireFormatLite::TYPE_STRING> {};
-
-// We want to serialize to both CodedOutputStream and directly into byte arrays
-// without duplicating the code. In fact we might want extra output channels in
-// the future.
-template <typename O, int type>
-struct OutputHelper;
-
-template <int type, typename O>
-void SerializeTo(const void* ptr, O* output) {
-  OutputHelper<O, type>::Serialize(ptr, output);
-}
-
-template <typename O>
-void WriteTagTo(uint32_t tag, O* output) {
-  SerializeTo<WireFormatLite::TYPE_UINT32>(&tag, output);
-}
-
-template <typename O>
-void WriteLengthTo(uint32_t length, O* output) {
-  SerializeTo<WireFormatLite::TYPE_UINT32>(&length, output);
-}
-
-// Specialization for coded output stream
-template <int type>
-struct OutputHelper<io::CodedOutputStream, type> {
-  static void Serialize(const void* ptr, io::CodedOutputStream* output) {
-    PrimitiveTypeHelper<type>::Serialize(ptr, output);
-  }
-};
-
-// Specialization for writing into a plain array
-struct ArrayOutput {
-  uint8_t* ptr;
-  bool is_deterministic;
-};
-
-template <int type>
-struct OutputHelper<ArrayOutput, type> {
-  static void Serialize(const void* ptr, ArrayOutput* output) {
-    output->ptr = PrimitiveTypeHelper<type>::SerializeToArray(ptr, output->ptr);
-  }
-};
-
-void SerializeMessageNoTable(const MessageLite* msg,
-                             io::CodedOutputStream* output) {
-  msg->SerializeWithCachedSizes(output);
-}
-
-void SerializeMessageNoTable(const MessageLite* msg, ArrayOutput* output) {
-  io::ArrayOutputStream array_stream(output->ptr, INT_MAX);
-  io::CodedOutputStream o(&array_stream);
-  o.SetSerializationDeterministic(output->is_deterministic);
-  msg->SerializeWithCachedSizes(&o);
-  output->ptr += o.ByteCount();
-}
-
-// We need to use a helper class to get access to the private members
-class AccessorHelper {
- public:
-  static int Size(const RepeatedPtrFieldBase& x) { return x.size(); }
-  static void const* Get(const RepeatedPtrFieldBase& x, int idx) {
-    return x.raw_data()[idx];
-  }
-};
-
-void SerializeNotImplemented(int field) {
-  GOOGLE_LOG(FATAL) << "Not implemented field number " << field;
-}
-
-// When switching to c++11 we should make these constexpr functions
-#define SERIALIZE_TABLE_OP(type, type_class) \
-  ((type - 1) + static_cast<int>(type_class) * FieldMetadata::kNumTypes)
-
-template <int type>
-bool IsNull(const void* ptr) {
-  return *static_cast<const typename PrimitiveTypeHelper<type>::Type*>(ptr) ==
-         0;
-}
-
-template <>
-bool IsNull<WireFormatLite::TYPE_STRING>(const void* ptr) {
-  return static_cast<const ArenaStringPtr*>(ptr)->Get().size() == 0;
-}
-
-template <>
-bool IsNull<WireFormatLite::TYPE_BYTES>(const void* ptr) {
-  return static_cast<const ArenaStringPtr*>(ptr)->Get().size() == 0;
-}
-
-template <>
-bool IsNull<WireFormatLite::TYPE_GROUP>(const void* ptr) {
-  return Get<const MessageLite*>(ptr) == nullptr;
-}
-
-template <>
-bool IsNull<WireFormatLite::TYPE_MESSAGE>(const void* ptr) {
-  return Get<const MessageLite*>(ptr) == nullptr;
-}
-
-void ExtensionSerializer(const MessageLite* extendee, const uint8_t* ptr,
-                         uint32_t offset, uint32_t tag, uint32_t has_offset,
-                         io::CodedOutputStream* output) {
-  reinterpret_cast<const ExtensionSet*>(ptr + offset)
-      ->SerializeWithCachedSizes(extendee, tag, has_offset, output);
-}
-
-void UnknownFieldSerializerLite(const uint8_t* ptr, uint32_t offset,
-                                uint32_t /*tag*/, uint32_t /*has_offset*/,
-                                io::CodedOutputStream* output) {
-  output->WriteString(
-      reinterpret_cast<const InternalMetadata*>(ptr + offset)
-          ->unknown_fields<std::string>(&internal::GetEmptyString));
-}
-
-MessageLite* DuplicateIfNonNullInternal(MessageLite* message) {
-  if (message) {
-    MessageLite* ret = message->New();
-    ret->CheckTypeAndMergeFrom(*message);
-    return ret;
-  } else {
-    return nullptr;
-  }
-}
-
-void GenericSwap(MessageLite* m1, MessageLite* m2) {
-  std::unique_ptr<MessageLite> tmp(m1->New());
-  tmp->CheckTypeAndMergeFrom(*m1);
-  m1->Clear();
-  m1->CheckTypeAndMergeFrom(*m2);
-  m2->Clear();
-  m2->CheckTypeAndMergeFrom(*tmp);
-}
-
-// Returns a message owned by this Arena.  This may require Own()ing or
-// duplicating the message.
-MessageLite* GetOwnedMessageInternal(Arena* message_arena,
-                                     MessageLite* submessage,
-                                     Arena* submessage_arena) {
-  GOOGLE_DCHECK(Arena::InternalGetOwningArena(submessage) == submessage_arena);
-  GOOGLE_DCHECK(message_arena != submessage_arena);
-  GOOGLE_DCHECK_EQ(submessage_arena, nullptr);
-  if (message_arena != nullptr && submessage_arena == nullptr) {
-    message_arena->Own(submessage);
-    return submessage;
-  } else {
-    MessageLite* ret = submessage->New(message_arena);
-    ret->CheckTypeAndMergeFrom(*submessage);
-    return ret;
-  }
-}
-
-}  // namespace internal
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
diff --git a/libs/protobuf/src/google/protobuf/generated_message_util.h b/libs/protobuf/src/google/protobuf/generated_message_util.h
deleted file mode 100644
index 71d15cd..0000000
--- a/libs/protobuf/src/google/protobuf/generated_message_util.h
+++ /dev/null
@@ -1,214 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-//
-// This file contains miscellaneous helper code used by generated code --
-// including lite types -- but which should not be used directly by users.
-
-#ifndef GOOGLE_PROTOBUF_GENERATED_MESSAGE_UTIL_H__
-#define GOOGLE_PROTOBUF_GENERATED_MESSAGE_UTIL_H__
-
-#include <assert.h>
-
-#include <atomic>
-#include <climits>
-#include <string>
-#include <vector>
-
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/stubs/once.h>  // Add direct dep on port for pb.cc
-#include <google/protobuf/port.h>
-#include <google/protobuf/stubs/strutil.h>
-#include <google/protobuf/any.h>
-#include <google/protobuf/has_bits.h>
-#include <google/protobuf/implicit_weak_message.h>
-#include <google/protobuf/message_lite.h>
-#include <google/protobuf/repeated_field.h>
-#include <google/protobuf/wire_format_lite.h>
-#include <google/protobuf/stubs/casts.h>
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-#ifdef SWIG
-#error "You cannot SWIG proto headers"
-#endif
-
-namespace google {
-namespace protobuf {
-
-class Arena;
-class Message;
-
-namespace io {
-class CodedInputStream;
-}
-
-namespace internal {
-
-template <typename To, typename From>
-inline To DownCast(From* f) {
-  return PROTOBUF_NAMESPACE_ID::internal::down_cast<To>(f);
-}
-template <typename To, typename From>
-inline To DownCast(From& f) {
-  return PROTOBUF_NAMESPACE_ID::internal::down_cast<To>(f);
-}
-
-
-// This fastpath inlines a single branch instead of having to make the
-// InitProtobufDefaults function call.
-// It also generates less inlined code than a function-scope static initializer.
-PROTOBUF_EXPORT extern std::atomic<bool> init_protobuf_defaults_state;
-PROTOBUF_EXPORT void InitProtobufDefaultsSlow();
-PROTOBUF_EXPORT inline void InitProtobufDefaults() {
-  if (PROTOBUF_PREDICT_FALSE(
-          !init_protobuf_defaults_state.load(std::memory_order_acquire))) {
-    InitProtobufDefaultsSlow();
-  }
-}
-
-// This used by proto1
-PROTOBUF_EXPORT inline const std::string& GetEmptyString() {
-  InitProtobufDefaults();
-  return GetEmptyStringAlreadyInited();
-}
-
-
-// True if IsInitialized() is true for all elements of t.  Type is expected
-// to be a RepeatedPtrField<some message type>.  It's useful to have this
-// helper here to keep the protobuf compiler from ever having to emit loops in
-// IsInitialized() methods.  We want the C++ compiler to inline this or not
-// as it sees fit.
-template <typename Msg>
-bool AllAreInitialized(const RepeatedPtrField<Msg>& t) {
-  for (int i = t.size(); --i >= 0;) {
-    if (!t.Get(i).IsInitialized()) return false;
-  }
-  return true;
-}
-
-// "Weak" variant of AllAreInitialized, used to implement implicit weak fields.
-// This version operates on MessageLite to avoid introducing a dependency on the
-// concrete message type.
-template <class T>
-bool AllAreInitializedWeak(const RepeatedPtrField<T>& t) {
-  for (int i = t.size(); --i >= 0;) {
-    if (!reinterpret_cast<const RepeatedPtrFieldBase&>(t)
-             .Get<ImplicitWeakTypeHandler<T> >(i)
-             .IsInitialized()) {
-      return false;
-    }
-  }
-  return true;
-}
-
-inline bool IsPresent(const void* base, uint32_t hasbit) {
-  const uint32_t* has_bits_array = static_cast<const uint32_t*>(base);
-  return (has_bits_array[hasbit / 32] & (1u << (hasbit & 31))) != 0;
-}
-
-inline bool IsOneofPresent(const void* base, uint32_t offset, uint32_t tag) {
-  const uint32_t* oneof = reinterpret_cast<const uint32_t*>(
-      static_cast<const uint8_t*>(base) + offset);
-  return *oneof == tag >> 3;
-}
-
-typedef void (*SpecialSerializer)(const uint8_t* base, uint32_t offset,
-                                  uint32_t tag, uint32_t has_offset,
-                                  io::CodedOutputStream* output);
-
-PROTOBUF_EXPORT void ExtensionSerializer(const MessageLite* extendee,
-                                         const uint8_t* ptr, uint32_t offset,
-                                         uint32_t tag, uint32_t has_offset,
-                                         io::CodedOutputStream* output);
-PROTOBUF_EXPORT void UnknownFieldSerializerLite(const uint8_t* base,
-                                                uint32_t offset, uint32_t tag,
-                                                uint32_t has_offset,
-                                                io::CodedOutputStream* output);
-
-PROTOBUF_EXPORT MessageLite* DuplicateIfNonNullInternal(MessageLite* message);
-PROTOBUF_EXPORT MessageLite* GetOwnedMessageInternal(Arena* message_arena,
-                                                     MessageLite* submessage,
-                                                     Arena* submessage_arena);
-PROTOBUF_EXPORT void GenericSwap(MessageLite* m1, MessageLite* m2);
-// We specialize GenericSwap for non-lite messages to benefit from reflection.
-PROTOBUF_EXPORT void GenericSwap(Message* m1, Message* m2);
-
-template <typename T>
-T* DuplicateIfNonNull(T* message) {
-  // The casts must be reinterpret_cast<> because T might be a forward-declared
-  // type that the compiler doesn't know is related to MessageLite.
-  return reinterpret_cast<T*>(
-      DuplicateIfNonNullInternal(reinterpret_cast<MessageLite*>(message)));
-}
-
-template <typename T>
-T* GetOwnedMessage(Arena* message_arena, T* submessage,
-                   Arena* submessage_arena) {
-  // The casts must be reinterpret_cast<> because T might be a forward-declared
-  // type that the compiler doesn't know is related to MessageLite.
-  return reinterpret_cast<T*>(GetOwnedMessageInternal(
-      message_arena, reinterpret_cast<MessageLite*>(submessage),
-      submessage_arena));
-}
-
-// Hide atomic from the public header and allow easy change to regular int
-// on platforms where the atomic might have a perf impact.
-class PROTOBUF_EXPORT CachedSize {
- public:
-  int Get() const { return size_.load(std::memory_order_relaxed); }
-  void Set(int size) { size_.store(size, std::memory_order_relaxed); }
-
- private:
-  std::atomic<int> size_{0};
-};
-
-PROTOBUF_EXPORT void DestroyMessage(const void* message);
-PROTOBUF_EXPORT void DestroyString(const void* s);
-// Destroy (not delete) the message
-inline void OnShutdownDestroyMessage(const void* ptr) {
-  OnShutdownRun(DestroyMessage, ptr);
-}
-// Destroy the string (call std::string destructor)
-inline void OnShutdownDestroyString(const std::string* ptr) {
-  OnShutdownRun(DestroyString, ptr);
-}
-
-}  // namespace internal
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
-
-#endif  // GOOGLE_PROTOBUF_GENERATED_MESSAGE_UTIL_H__
diff --git a/libs/protobuf/src/google/protobuf/has_bits.h b/libs/protobuf/src/google/protobuf/has_bits.h
deleted file mode 100644
index f8a4587..0000000
--- a/libs/protobuf/src/google/protobuf/has_bits.h
+++ /dev/null
@@ -1,117 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef GOOGLE_PROTOBUF_HAS_BITS_H__
-#define GOOGLE_PROTOBUF_HAS_BITS_H__
-
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/port.h>
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-#ifdef SWIG
-#error "You cannot SWIG proto headers"
-#endif
-
-namespace google {
-namespace protobuf {
-namespace internal {
-
-template <size_t doublewords>
-class HasBits {
- public:
-  PROTOBUF_NDEBUG_INLINE constexpr HasBits() : has_bits_{} {}
-
-  PROTOBUF_NDEBUG_INLINE void Clear() {
-    memset(has_bits_, 0, sizeof(has_bits_));
-  }
-
-  PROTOBUF_NDEBUG_INLINE uint32_t& operator[](int index) {
-    return has_bits_[index];
-  }
-
-  PROTOBUF_NDEBUG_INLINE const uint32_t& operator[](int index) const {
-    return has_bits_[index];
-  }
-
-  bool operator==(const HasBits<doublewords>& rhs) const {
-    return memcmp(has_bits_, rhs.has_bits_, sizeof(has_bits_)) == 0;
-  }
-
-  bool operator!=(const HasBits<doublewords>& rhs) const {
-    return !(*this == rhs);
-  }
-
-  void Or(const HasBits<doublewords>& rhs) {
-    for (size_t i = 0; i < doublewords; i++) has_bits_[i] |= rhs[i];
-  }
-
-  bool empty() const;
-
- private:
-  uint32_t has_bits_[doublewords];
-};
-
-template <>
-inline bool HasBits<1>::empty() const {
-  return !has_bits_[0];
-}
-
-template <>
-inline bool HasBits<2>::empty() const {
-  return !(has_bits_[0] | has_bits_[1]);
-}
-
-template <>
-inline bool HasBits<3>::empty() const {
-  return !(has_bits_[0] | has_bits_[1] | has_bits_[2]);
-}
-
-template <>
-inline bool HasBits<4>::empty() const {
-  return !(has_bits_[0] | has_bits_[1] | has_bits_[2] | has_bits_[3]);
-}
-
-template <size_t doublewords>
-inline bool HasBits<doublewords>::empty() const {
-  for (size_t i = 0; i < doublewords; ++i) {
-    if (has_bits_[i]) return false;
-  }
-  return true;
-}
-
-}  // namespace internal
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
-
-#endif  // GOOGLE_PROTOBUF_HAS_BITS_H__
diff --git a/libs/protobuf/src/google/protobuf/implicit_weak_message.cc b/libs/protobuf/src/google/protobuf/implicit_weak_message.cc
deleted file mode 100644
index 27ed6b6..0000000
--- a/libs/protobuf/src/google/protobuf/implicit_weak_message.cc
+++ /dev/null
@@ -1,72 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <google/protobuf/implicit_weak_message.h>
-
-#include <google/protobuf/io/zero_copy_stream_impl_lite.h>
-#include <google/protobuf/parse_context.h>
-#include <google/protobuf/wire_format_lite.h>
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-PROTOBUF_PRAGMA_INIT_SEG
-
-namespace google {
-namespace protobuf {
-namespace internal {
-
-const char* ImplicitWeakMessage::_InternalParse(const char* ptr,
-                                                ParseContext* ctx) {
-  return ctx->AppendString(ptr, data_);
-}
-
-struct ImplicitWeakMessageDefaultType {
-  constexpr ImplicitWeakMessageDefaultType()
-      : instance(ConstantInitialized{}) {}
-  ~ImplicitWeakMessageDefaultType() {}
-  union {
-    ImplicitWeakMessage instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT ImplicitWeakMessageDefaultType
-    implicit_weak_message_default_instance;
-
-const ImplicitWeakMessage* ImplicitWeakMessage::default_instance() {
-  return reinterpret_cast<ImplicitWeakMessage*>(
-      &implicit_weak_message_default_instance);
-}
-
-}  // namespace internal
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
diff --git a/libs/protobuf/src/google/protobuf/implicit_weak_message.h b/libs/protobuf/src/google/protobuf/implicit_weak_message.h
deleted file mode 100644
index b894ab4..0000000
--- a/libs/protobuf/src/google/protobuf/implicit_weak_message.h
+++ /dev/null
@@ -1,213 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef GOOGLE_PROTOBUF_IMPLICIT_WEAK_MESSAGE_H__
-#define GOOGLE_PROTOBUF_IMPLICIT_WEAK_MESSAGE_H__
-
-#include <string>
-
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/arena.h>
-#include <google/protobuf/message_lite.h>
-#include <google/protobuf/repeated_field.h>
-
-#ifdef SWIG
-#error "You cannot SWIG proto headers"
-#endif
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-// This file is logically internal-only and should only be used by protobuf
-// generated code.
-
-namespace google {
-namespace protobuf {
-namespace internal {
-
-// An implementation of MessageLite that treats all data as unknown. This type
-// acts as a placeholder for an implicit weak field in the case where the true
-// message type does not get linked into the binary.
-class PROTOBUF_EXPORT ImplicitWeakMessage : public MessageLite {
- public:
-  ImplicitWeakMessage() : data_(new std::string) {}
-  explicit constexpr ImplicitWeakMessage(ConstantInitialized)
-      : data_(nullptr) {}
-  explicit ImplicitWeakMessage(Arena* arena)
-      : MessageLite(arena), data_(new std::string) {}
-
-  ~ImplicitWeakMessage() override {
-    // data_ will be null in the default instance, but we can safely call delete
-    // here because the default instance will never be destroyed.
-    delete data_;
-  }
-
-  static const ImplicitWeakMessage* default_instance();
-
-  std::string GetTypeName() const override { return ""; }
-
-  MessageLite* New(Arena* arena) const override {
-    return Arena::CreateMessage<ImplicitWeakMessage>(arena);
-  }
-
-  void Clear() override { data_->clear(); }
-
-  bool IsInitialized() const override { return true; }
-
-  void CheckTypeAndMergeFrom(const MessageLite& other) override {
-    const std::string* other_data =
-        static_cast<const ImplicitWeakMessage&>(other).data_;
-    if (other_data != nullptr) {
-      data_->append(*other_data);
-    }
-  }
-
-  const char* _InternalParse(const char* ptr, ParseContext* ctx) final;
-
-  size_t ByteSizeLong() const override {
-    return data_ == nullptr ? 0 : data_->size();
-  }
-
-  uint8_t* _InternalSerialize(uint8_t* target,
-                              io::EpsCopyOutputStream* stream) const final {
-    if (data_ == nullptr) {
-      return target;
-    }
-    return stream->WriteRaw(data_->data(), static_cast<int>(data_->size()),
-                            target);
-  }
-
-  int GetCachedSize() const override {
-    return data_ == nullptr ? 0 : static_cast<int>(data_->size());
-  }
-
-  typedef void InternalArenaConstructable_;
-
- private:
-  // This std::string is allocated on the heap, but we use a raw pointer so that
-  // the default instance can be constant-initialized. In the const methods, we
-  // have to handle the possibility of data_ being null.
-  std::string* data_;
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(ImplicitWeakMessage);
-};
-
-struct ImplicitWeakMessageDefaultType;
-extern ImplicitWeakMessageDefaultType implicit_weak_message_default_instance;
-
-// A type handler for use with implicit weak repeated message fields.
-template <typename ImplicitWeakType>
-class ImplicitWeakTypeHandler {
- public:
-  typedef MessageLite Type;
-  static constexpr bool Moveable = false;
-
-  static inline MessageLite* NewFromPrototype(const MessageLite* prototype,
-                                              Arena* arena = nullptr) {
-    return prototype->New(arena);
-  }
-
-  static inline void Delete(MessageLite* value, Arena* arena) {
-    if (arena == nullptr) {
-      delete value;
-    }
-  }
-  static inline Arena* GetArena(MessageLite* value) {
-    return value->GetArena();
-  }
-  static inline void Clear(MessageLite* value) { value->Clear(); }
-  static void Merge(const MessageLite& from, MessageLite* to) {
-    to->CheckTypeAndMergeFrom(from);
-  }
-};
-
-}  // namespace internal
-
-template <typename T>
-struct WeakRepeatedPtrField {
-  using TypeHandler = internal::ImplicitWeakTypeHandler<T>;
-  constexpr WeakRepeatedPtrField() : weak() {}
-  explicit WeakRepeatedPtrField(Arena* arena) : weak(arena) {}
-  ~WeakRepeatedPtrField() { weak.template Destroy<TypeHandler>(); }
-
-  typedef internal::RepeatedPtrIterator<MessageLite> iterator;
-  typedef internal::RepeatedPtrIterator<const MessageLite> const_iterator;
-  typedef internal::RepeatedPtrOverPtrsIterator<MessageLite*, void*>
-      pointer_iterator;
-  typedef internal::RepeatedPtrOverPtrsIterator<const MessageLite* const,
-                                                const void* const>
-      const_pointer_iterator;
-
-  iterator begin() { return iterator(base().raw_data()); }
-  const_iterator begin() const { return iterator(base().raw_data()); }
-  const_iterator cbegin() const { return begin(); }
-  iterator end() { return begin() + base().size(); }
-  const_iterator end() const { return begin() + base().size(); }
-  const_iterator cend() const { return end(); }
-  pointer_iterator pointer_begin() {
-    return pointer_iterator(base().raw_mutable_data());
-  }
-  const_pointer_iterator pointer_begin() const {
-    return const_pointer_iterator(base().raw_mutable_data());
-  }
-  pointer_iterator pointer_end() {
-    return pointer_iterator(base().raw_mutable_data() + base().size());
-  }
-  const_pointer_iterator pointer_end() const {
-    return const_pointer_iterator(base().raw_mutable_data() + base().size());
-  }
-
-  MessageLite* AddWeak(const MessageLite* prototype) {
-    return base().AddWeak(prototype);
-  }
-  T* Add() { return weak.Add(); }
-  void Clear() { base().template Clear<TypeHandler>(); }
-  void MergeFrom(const WeakRepeatedPtrField& other) {
-    base().template MergeFrom<TypeHandler>(other.base());
-  }
-  void InternalSwap(WeakRepeatedPtrField* other) {
-    base().InternalSwap(&other->base());
-  }
-
-  const internal::RepeatedPtrFieldBase& base() const { return weak; }
-  internal::RepeatedPtrFieldBase& base() { return weak; }
-  // Union disables running the destructor. Which would create a strong link.
-  // Instead we explicitly destroy the underlying base through the virtual
-  // destructor.
-  union {
-    RepeatedPtrField<T> weak;
-  };
-};
-
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
-
-#endif  // GOOGLE_PROTOBUF_IMPLICIT_WEAK_MESSAGE_H__
diff --git a/libs/protobuf/src/google/protobuf/inlined_string_field.cc b/libs/protobuf/src/google/protobuf/inlined_string_field.cc
deleted file mode 100644
index 0c3e476..0000000
--- a/libs/protobuf/src/google/protobuf/inlined_string_field.cc
+++ /dev/null
@@ -1,118 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <google/protobuf/inlined_string_field.h>
-
-#include <google/protobuf/arena.h>
-#include <google/protobuf/arenastring.h>
-#include <google/protobuf/generated_message_util.h>
-#include <google/protobuf/message_lite.h>
-#include <google/protobuf/parse_context.h>
-
-// clang-format off
-#include <google/protobuf/port_def.inc>
-// clang-format on
-
-namespace google {
-namespace protobuf {
-namespace internal {
-
-
-std::string* InlinedStringField::Mutable(const LazyString& /*default_value*/,
-                                         Arena* arena, bool donated,
-                                         uint32_t* donating_states,
-                                         uint32_t mask, MessageLite* msg) {
-  if (arena == nullptr || !donated) {
-    return UnsafeMutablePointer();
-  }
-  return MutableSlow(arena, donated, donating_states, mask, msg);
-}
-
-std::string* InlinedStringField::Mutable(Arena* arena, bool donated,
-                                         uint32_t* donating_states,
-                                         uint32_t mask, MessageLite* msg) {
-  if (arena == nullptr || !donated) {
-    return UnsafeMutablePointer();
-  }
-  return MutableSlow(arena, donated, donating_states, mask, msg);
-}
-
-std::string* InlinedStringField::MutableSlow(::google::protobuf::Arena* arena,
-                                             bool donated,
-                                             uint32_t* donating_states,
-                                             uint32_t mask, MessageLite* msg) {
-  (void)mask;
-  (void)msg;
-  return UnsafeMutablePointer();
-}
-
-void InlinedStringField::SetAllocated(const std::string* default_value,
-                                      std::string* value, Arena* arena,
-                                      bool donated, uint32_t* donating_states,
-                                      uint32_t mask, MessageLite* msg) {
-  (void)mask;
-  (void)msg;
-  SetAllocatedNoArena(default_value, value);
-}
-
-void InlinedStringField::Set(std::string&& value, Arena* arena, bool donated,
-                             uint32_t* donating_states, uint32_t mask,
-                             MessageLite* msg) {
-  (void)donating_states;
-  (void)mask;
-  (void)msg;
-  SetNoArena(std::move(value));
-}
-
-std::string* InlinedStringField::Release() {
-  auto* released = new std::string(std::move(*get_mutable()));
-  get_mutable()->clear();
-  return released;
-}
-
-std::string* InlinedStringField::Release(Arena* arena, bool donated) {
-  // We can not steal donated arena strings.
-  std::string* released = (arena != nullptr && donated)
-                              ? new std::string(*get_mutable())
-                              : new std::string(std::move(*get_mutable()));
-  get_mutable()->clear();
-  return released;
-}
-
-void InlinedStringField::ClearToDefault(const LazyString& default_value,
-                                        Arena* arena, bool donated) {
-  (void)arena;
-  get_mutable()->assign(default_value.get());
-}
-
-
-}  // namespace internal
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/inlined_string_field.h b/libs/protobuf/src/google/protobuf/inlined_string_field.h
deleted file mode 100644
index 79e37d4..0000000
--- a/libs/protobuf/src/google/protobuf/inlined_string_field.h
+++ /dev/null
@@ -1,532 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef GOOGLE_PROTOBUF_INLINED_STRING_FIELD_H__
-#define GOOGLE_PROTOBUF_INLINED_STRING_FIELD_H__
-
-#include <string>
-#include <utility>
-
-#include <google/protobuf/stubs/logging.h>
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/port.h>
-#include <google/protobuf/stubs/strutil.h>
-#include <google/protobuf/arenastring.h>
-#include <google/protobuf/message_lite.h>
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-#ifdef SWIG
-#error "You cannot SWIG proto headers"
-#endif
-
-namespace google {
-namespace protobuf {
-
-class Arena;
-
-namespace internal {
-
-// InlinedStringField wraps a std::string instance and exposes an API similar to
-// ArenaStringPtr's wrapping of a std::string* instance.
-//
-// default_value parameters are taken for consistency with ArenaStringPtr, but
-// are not used for most methods. With inlining, these should be removed from
-// the generated binary.
-//
-// InlinedStringField has a donating mechanism that allows string buffer
-// allocated on arena. A string is donated means both the string container and
-// the data buffer are on arena. The donating mechanism here is similar to the
-// one in ArenaStringPtr with some differences:
-//
-// When an InlinedStringField is constructed, the donating state is true. This
-// is because the string container is directly stored in the message on the
-// arena:
-//
-//   Construction: donated=true
-//   Arena:
-//   +-----------------------+
-//   |Message foo:           |
-//   | +-------------------+ |
-//   | |InlinedStringField:| |
-//   | | +-----+           | |
-//   | | | | | |           | |
-//   | | +-----+           | |
-//   | +-------------------+ |
-//   +-----------------------+
-//
-// When lvalue Set is called, the donating state is still true. String data will
-// be allocated on the arena:
-//
-//   Lvalue Set: donated=true
-//   Arena:
-//   +-----------------------+
-//   |Message foo:           |
-//   | +-------------------+ |
-//   | |InlinedStringField:| |
-//   | | +-----+           | |
-//   | | | | | |           | |
-//   | | +|----+           | |
-//   | +--|----------------+ |
-//   |    V                  |
-//   |  +----------------+   |
-//   |  |'f','o','o',... |   |
-//   |  +----------------+   |
-//   +-----------------------+
-//
-// Some operations will undonate a donated string, including: Mutable,
-// SetAllocated, Rvalue Set, and Swap with a non-donated string.
-//
-// For more details of the donating states transitions, go/pd-inlined-string.
-class PROTOBUF_EXPORT InlinedStringField {
- public:
-  InlinedStringField() { Init(); }
-  inline void Init() { new (get_mutable()) std::string(); }
-  // Add the dummy parameter just to make InlinedStringField(nullptr)
-  // unambiguous.
-  constexpr InlinedStringField(
-      const ExplicitlyConstructed<std::string>* /*default_value*/,
-      bool /*dummy*/)
-      : value_{} {}
-  explicit InlinedStringField(const std::string& default_value);
-  explicit InlinedStringField(Arena* arena);
-  ~InlinedStringField() { Destruct(); }
-
-  // Lvalue Set. To save space, we pack the donating states of multiple
-  // InlinedStringFields into an uint32_t `donating_states`. The `mask`
-  // indicates the position of the bit for this InlinedStringField. `donated` is
-  // whether this field is donated.
-  //
-  // The caller should guarantee that:
-  //
-  //   `donated == ((donating_states & ~mask) != 0)`
-  //
-  // This method never changes the `donating_states`.
-  void Set(ConstStringParam value, Arena* arena, bool donated,
-           uint32_t* donating_states, uint32_t mask, MessageLite* msg);
-
-  // Rvalue Set. If this field is donated, this method will undonate this field
-  // by mutating the `donating_states` according to `mask`.
-  void Set(std::string&& value, Arena* arena, bool donated,
-           uint32_t* donating_states, uint32_t mask, MessageLite* msg);
-
-  void Set(const char* str, ::google::protobuf::Arena* arena, bool donated,
-           uint32_t* donating_states, uint32_t mask, MessageLite* msg);
-
-  void Set(const char* str, size_t size, ::google::protobuf::Arena* arena, bool donated,
-           uint32_t* donating_states, uint32_t mask, MessageLite* msg);
-
-  template <typename RefWrappedType>
-  void Set(std::reference_wrapper<RefWrappedType> const_string_ref,
-           ::google::protobuf::Arena* arena, bool donated, uint32_t* donating_states,
-           uint32_t mask, MessageLite* msg);
-
-  void SetBytes(ConstStringParam value, Arena* arena, bool donated,
-                uint32_t* donating_states, uint32_t mask, MessageLite* msg);
-
-  void SetBytes(std::string&& value, Arena* arena, bool donated,
-                uint32_t* donating_states, uint32_t mask, MessageLite* msg);
-
-  void SetBytes(const char* str, ::google::protobuf::Arena* arena, bool donated,
-                uint32_t* donating_states, uint32_t mask, MessageLite* msg);
-
-  void SetBytes(const void* p, size_t size, ::google::protobuf::Arena* arena,
-                bool donated, uint32_t* donating_states, uint32_t mask,
-                MessageLite* msg);
-
-  template <typename RefWrappedType>
-  void SetBytes(std::reference_wrapper<RefWrappedType> const_string_ref,
-                ::google::protobuf::Arena* arena, bool donated, uint32_t* donating_states,
-                uint32_t mask, MessageLite* msg);
-
-  PROTOBUF_NDEBUG_INLINE void SetNoArena(StringPiece value);
-  PROTOBUF_NDEBUG_INLINE void SetNoArena(std::string&& value);
-
-  // Basic accessors.
-  PROTOBUF_NDEBUG_INLINE const std::string& Get() const { return GetNoArena(); }
-  PROTOBUF_NDEBUG_INLINE const std::string& GetNoArena() const;
-
-  // Mutable returns a std::string* instance that is heap-allocated. If this
-  // field is donated, this method undonates this field by mutating the
-  // `donating_states` according to `mask`, and copies the content of the
-  // original string to the returning string.
-  std::string* Mutable(Arena* arena, bool donated, uint32_t* donating_states,
-                       uint32_t mask, MessageLite* msg);
-  std::string* Mutable(const LazyString& default_value, Arena* arena,
-                       bool donated, uint32_t* donating_states, uint32_t mask,
-                       MessageLite* msg);
-
-  // Mutable(nullptr_t) is an overload to explicitly support Mutable(nullptr)
-  // calls used by the internal parser logic. This provides API equivalence with
-  // ArenaStringPtr, while still protecting against calls with arena pointers.
-  std::string* Mutable(std::nullptr_t);
-  std::string* MutableNoCopy(std::nullptr_t);
-
-  // Takes a std::string that is heap-allocated, and takes ownership. The
-  // std::string's destructor is registered with the arena. Used to implement
-  // set_allocated_<field> in generated classes.
-  //
-  // If this field is donated, this method undonates this field by mutating the
-  // `donating_states` according to `mask`.
-  void SetAllocated(const std::string* default_value, std::string* value,
-                    Arena* arena, bool donated, uint32_t* donating_states,
-                    uint32_t mask, MessageLite* msg);
-
-  void SetAllocatedNoArena(const std::string* default_value,
-                           std::string* value);
-
-  // Release returns a std::string* instance that is heap-allocated and is not
-  // Own()'d by any arena. If the field is not set, this returns nullptr. The
-  // caller retains ownership. Clears this field back to nullptr state. Used to
-  // implement release_<field>() methods on generated classes.
-  PROTOBUF_NODISCARD std::string* Release(Arena* arena, bool donated);
-  PROTOBUF_NODISCARD std::string* Release();
-
-  // --------------------------------------------------------
-  // Below functions will be removed in subsequent code change
-  // --------------------------------------------------------
-#ifdef DEPRECATED_METHODS_TO_BE_DELETED
-  PROTOBUF_NODISCARD std::string* Release(const std::string*, Arena* arena,
-                                          bool donated) {
-    return Release(arena, donated);
-  }
-
-  PROTOBUF_NODISCARD std::string* ReleaseNonDefault(const std::string*,
-                                                    Arena* arena) {
-    return Release();
-  }
-
-  std::string* ReleaseNonDefaultNoArena(const std::string* default_value) {
-    return Release();
-  }
-
-  void Set(const std::string*, ConstStringParam value, Arena* arena,
-           bool donated, uint32_t* donating_states, uint32_t mask,
-           MessageLite* msg) {
-    Set(value, arena, donated, donating_states, mask, msg);
-  }
-
-  void Set(const std::string*, std::string&& value, Arena* arena, bool donated,
-           uint32_t* donating_states, uint32_t mask, MessageLite* msg) {
-    Set(std::move(value), arena, donated, donating_states, mask, msg);
-  }
-
-
-  template <typename FirstParam>
-  void Set(FirstParam, const char* str, ::google::protobuf::Arena* arena, bool donated,
-           uint32_t* donating_states, uint32_t mask, MessageLite* msg) {
-    Set(str, arena, donated, donating_states, mask, msg);
-  }
-
-  template <typename FirstParam>
-  void Set(FirstParam p1, const char* str, size_t size, ::google::protobuf::Arena* arena,
-           bool donated, uint32_t* donating_states, uint32_t mask,
-           MessageLite* msg) {
-    Set(str, size, arena, donated, donating_states, mask, msg);
-  }
-
-  template <typename FirstParam, typename RefWrappedType>
-  void Set(FirstParam p1,
-           std::reference_wrapper<RefWrappedType> const_string_ref,
-           ::google::protobuf::Arena* arena, bool donated, uint32_t* donating_states,
-           uint32_t mask, MessageLite* msg) {
-    Set(const_string_ref, arena, donated, donating_states, mask, msg);
-  }
-
-  void SetBytes(const std::string*, ConstStringParam value, Arena* arena,
-                bool donated, uint32_t* donating_states, uint32_t mask,
-                MessageLite* msg) {
-    Set(value, arena, donated, donating_states, mask, msg);
-  }
-
-
-  void SetBytes(const std::string*, std::string&& value, Arena* arena,
-                bool donated, uint32_t* donating_states, uint32_t mask,
-                MessageLite* msg) {
-    Set(std::move(value), arena, donated, donating_states, mask, msg);
-  }
-
-  template <typename FirstParam>
-  void SetBytes(FirstParam p1, const char* str, ::google::protobuf::Arena* arena,
-                bool donated, uint32_t* donating_states, uint32_t mask,
-                MessageLite* msg) {
-    SetBytes(str, arena, donated, donating_states, mask, msg);
-  }
-
-  template <typename FirstParam>
-  void SetBytes(FirstParam p1, const void* p, size_t size,
-                ::google::protobuf::Arena* arena, bool donated, uint32_t* donating_states,
-                uint32_t mask, MessageLite* msg) {
-    SetBytes(p, size, arena, donated, donating_states, mask, msg);
-  }
-
-  template <typename FirstParam, typename RefWrappedType>
-  void SetBytes(FirstParam p1,
-                std::reference_wrapper<RefWrappedType> const_string_ref,
-                ::google::protobuf::Arena* arena, bool donated, uint32_t* donating_states,
-                uint32_t mask, MessageLite* msg) {
-    SetBytes(const_string_ref.get(), arena, donated, donating_states, mask,
-             msg);
-  }
-
-  void SetNoArena(const std::string*, StringPiece value) {
-    SetNoArena(value);
-  }
-  void SetNoArena(const std::string*, std::string&& value) {
-    SetNoArena(std::move(value));
-  }
-
-  std::string* Mutable(ArenaStringPtr::EmptyDefault, Arena* arena, bool donated,
-                       uint32_t* donating_states, uint32_t mask,
-                       MessageLite* msg) {
-    return Mutable(arena, donated, donating_states, mask, msg);
-  }
-
-  PROTOBUF_NDEBUG_INLINE std::string* MutableNoArenaNoDefault(
-      const std::string* /*default_value*/) {
-    return MutableNoCopy(nullptr);
-  }
-
-#endif  // DEPRECATED_METHODS_TO_BE_DELETED
-
-  // Arena-safety semantics: this is guarded by the logic in
-  // Swap()/UnsafeArenaSwap() at the message level, so this method is
-  // 'unsafe' if called directly.
-  inline PROTOBUF_NDEBUG_INLINE static void InternalSwap(
-      InlinedStringField* lhs, Arena* lhs_arena, bool lhs_arena_dtor_registered,
-      MessageLite* lhs_msg,  //
-      InlinedStringField* rhs, Arena* rhs_arena, bool rhs_arena_dtor_registered,
-      MessageLite* rhs_msg);
-
-  // Frees storage (if not on an arena).
-  PROTOBUF_NDEBUG_INLINE void Destroy(const std::string* default_value,
-                                      Arena* arena) {
-    if (arena == nullptr) {
-      DestroyNoArena(default_value);
-    }
-  }
-  PROTOBUF_NDEBUG_INLINE void DestroyNoArena(const std::string* default_value);
-
-  // Clears content, but keeps allocated std::string, to avoid the overhead of
-  // heap operations. After this returns, the content (as seen by the user) will
-  // always be the empty std::string.
-  PROTOBUF_NDEBUG_INLINE void ClearToEmpty() { ClearNonDefaultToEmpty(); }
-  PROTOBUF_NDEBUG_INLINE void ClearNonDefaultToEmpty() {
-    get_mutable()->clear();
-  }
-
-  // Clears content, but keeps allocated std::string if arena != nullptr, to
-  // avoid the overhead of heap operations. After this returns, the content (as
-  // seen by the user) will always be equal to |default_value|.
-  void ClearToDefault(const LazyString& default_value, Arena* arena,
-                      bool donated);
-
-  // Generated code / reflection only! Returns a mutable pointer to the string.
-  PROTOBUF_NDEBUG_INLINE std::string* UnsafeMutablePointer();
-
-  // InlinedStringField doesn't have things like the `default_value` pointer in
-  // ArenaStringPtr.
-  static constexpr bool IsDefault() { return false; }
-  static constexpr bool IsDefault(const std::string*) { return false; }
-
- private:
-  void Destruct() { get_mutable()->~basic_string(); }
-
-  PROTOBUF_NDEBUG_INLINE std::string* get_mutable();
-  PROTOBUF_NDEBUG_INLINE const std::string* get_const() const;
-
-  alignas(std::string) char value_[sizeof(std::string)];
-
-  std::string* MutableSlow(::google::protobuf::Arena* arena, bool donated,
-                           uint32_t* donating_states, uint32_t mask,
-                           MessageLite* msg);
-
-
-  // When constructed in an Arena, we want our destructor to be skipped.
-  friend class ::google::protobuf::Arena;
-  typedef void InternalArenaConstructable_;
-  typedef void DestructorSkippable_;
-};
-
-inline std::string* InlinedStringField::get_mutable() {
-  return reinterpret_cast<std::string*>(&value_);
-}
-
-inline const std::string* InlinedStringField::get_const() const {
-  return reinterpret_cast<const std::string*>(&value_);
-}
-
-inline InlinedStringField::InlinedStringField(
-    const std::string& default_value) {
-  new (get_mutable()) std::string(default_value);
-}
-
-
-inline InlinedStringField::InlinedStringField(Arena* /*arena*/) { Init(); }
-
-inline const std::string& InlinedStringField::GetNoArena() const {
-  return *get_const();
-}
-
-inline void InlinedStringField::SetAllocatedNoArena(
-    const std::string* /*default_value*/, std::string* value) {
-  if (value == nullptr) {
-    // Currently, inlined string field can't have non empty default.
-    get_mutable()->clear();
-  } else {
-    get_mutable()->assign(std::move(*value));
-    delete value;
-  }
-}
-
-inline void InlinedStringField::DestroyNoArena(const std::string*) {
-  // This is invoked from the generated message's ArenaDtor, which is used to
-  // clean up objects not allocated on the Arena.
-  this->~InlinedStringField();
-}
-
-inline void InlinedStringField::SetNoArena(StringPiece value) {
-  get_mutable()->assign(value.data(), value.length());
-}
-
-inline void InlinedStringField::SetNoArena(std::string&& value) {
-  get_mutable()->assign(std::move(value));
-}
-
-// Caller should make sure rhs_arena allocated rhs, and lhs_arena allocated lhs.
-inline PROTOBUF_NDEBUG_INLINE void InlinedStringField::InternalSwap(
-    InlinedStringField* lhs, Arena* lhs_arena, bool lhs_arena_dtor_registered,
-    MessageLite* lhs_msg,  //
-    InlinedStringField* rhs, Arena* rhs_arena, bool rhs_arena_dtor_registered,
-    MessageLite* rhs_msg) {
-#if GOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE
-  lhs->get_mutable()->swap(*rhs->get_mutable());
-  if (!lhs_arena_dtor_registered && rhs_arena_dtor_registered) {
-    lhs_msg->OnDemandRegisterArenaDtor(lhs_arena);
-  } else if (lhs_arena_dtor_registered && !rhs_arena_dtor_registered) {
-    rhs_msg->OnDemandRegisterArenaDtor(rhs_arena);
-  }
-#else
-  (void)lhs_arena;
-  (void)rhs_arena;
-  (void)lhs_arena_dtor_registered;
-  (void)rhs_arena_dtor_registered;
-  (void)lhs_msg;
-  (void)rhs_msg;
-  lhs->get_mutable()->swap(*rhs->get_mutable());
-#endif
-}
-
-inline void InlinedStringField::Set(ConstStringParam value, Arena* arena,
-                                    bool donated, uint32_t* /*donating_states*/,
-                                    uint32_t /*mask*/, MessageLite* /*msg*/) {
-  (void)arena;
-  (void)donated;
-  SetNoArena(value);
-}
-
-inline void InlinedStringField::Set(const char* str, ::google::protobuf::Arena* arena,
-                                    bool donated, uint32_t* donating_states,
-                                    uint32_t mask, MessageLite* msg) {
-  Set(ConstStringParam(str), arena, donated, donating_states, mask, msg);
-}
-
-inline void InlinedStringField::Set(const char* str, size_t size,
-                                    ::google::protobuf::Arena* arena, bool donated,
-                                    uint32_t* donating_states, uint32_t mask,
-                                    MessageLite* msg) {
-  Set(ConstStringParam{str, size}, arena, donated, donating_states, mask, msg);
-}
-
-inline void InlinedStringField::SetBytes(ConstStringParam value, Arena* arena,
-                                         bool donated,
-                                         uint32_t* donating_states,
-                                         uint32_t mask, MessageLite* msg) {
-  Set(value, arena, donated, donating_states, mask, msg);
-}
-
-inline void InlinedStringField::SetBytes(std::string&& value, Arena* arena,
-                                         bool donated,
-                                         uint32_t* donating_states,
-                                         uint32_t mask, MessageLite* msg) {
-  Set(std::move(value), arena, donated, donating_states, mask, msg);
-}
-
-inline void InlinedStringField::SetBytes(const char* str,
-                                         ::google::protobuf::Arena* arena, bool donated,
-                                         uint32_t* donating_states,
-                                         uint32_t mask, MessageLite* msg) {
-  Set(str, arena, donated, donating_states, mask, msg);
-}
-
-inline void InlinedStringField::SetBytes(const void* p, size_t size,
-                                         ::google::protobuf::Arena* arena, bool donated,
-                                         uint32_t* donating_states,
-                                         uint32_t mask, MessageLite* msg) {
-  Set(static_cast<const char*>(p), size, arena, donated, donating_states, mask,
-      msg);
-}
-
-template <typename RefWrappedType>
-inline void InlinedStringField::Set(
-    std::reference_wrapper<RefWrappedType> const_string_ref,
-    ::google::protobuf::Arena* arena, bool donated, uint32_t* donating_states,
-    uint32_t mask, MessageLite* msg) {
-  Set(const_string_ref.get(), arena, donated, donating_states, mask, msg);
-}
-
-template <typename RefWrappedType>
-inline void InlinedStringField::SetBytes(
-    std::reference_wrapper<RefWrappedType> const_string_ref,
-    ::google::protobuf::Arena* arena, bool donated, uint32_t* donating_states,
-    uint32_t mask, MessageLite* msg) {
-  Set(const_string_ref.get(), arena, donated, donating_states, mask, msg);
-}
-
-inline std::string* InlinedStringField::UnsafeMutablePointer() {
-  return get_mutable();
-}
-
-inline std::string* InlinedStringField::Mutable(std::nullptr_t) {
-  return get_mutable();
-}
-
-inline std::string* InlinedStringField::MutableNoCopy(std::nullptr_t) {
-  return get_mutable();
-}
-
-}  // namespace internal
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
-
-#endif  // GOOGLE_PROTOBUF_INLINED_STRING_FIELD_H__
diff --git a/libs/protobuf/src/google/protobuf/inlined_string_field_unittest.cc b/libs/protobuf/src/google/protobuf/inlined_string_field_unittest.cc
deleted file mode 100644
index 9efe6e9..0000000
--- a/libs/protobuf/src/google/protobuf/inlined_string_field_unittest.cc
+++ /dev/null
@@ -1,59 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <google/protobuf/inlined_string_field.h>
-
-#include <algorithm>
-#include <cstdlib>
-#include <cstring>
-#include <memory>
-#include <string>
-#include <utility>
-#include <vector>
-
-#include <google/protobuf/stubs/logging.h>
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/io/zero_copy_stream_impl.h>
-#include <google/protobuf/arenastring.h>
-#include <gtest/gtest.h>
-#include <google/protobuf/stubs/strutil.h>
-
-
-namespace google {
-namespace protobuf {
-
-using internal::ArenaStringPtr;
-using internal::InlinedStringField;
-
-namespace {
-}  // namespace
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/io/coded_stream.cc b/libs/protobuf/src/google/protobuf/io/coded_stream.cc
deleted file mode 100644
index 487e1b8..0000000
--- a/libs/protobuf/src/google/protobuf/io/coded_stream.cc
+++ /dev/null
@@ -1,967 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-//
-// This implementation is heavily optimized to make reads and writes
-// of small values (especially varints) as fast as possible.  In
-// particular, we optimize for the common case that a read or a write
-// will not cross the end of the buffer, since we can avoid a lot
-// of branching in this case.
-
-#include <google/protobuf/io/coded_stream.h>
-
-#include <limits.h>
-
-#include <algorithm>
-#include <cstring>
-#include <utility>
-
-#include <google/protobuf/stubs/logging.h>
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/arena.h>
-#include <google/protobuf/io/zero_copy_stream.h>
-#include <google/protobuf/io/zero_copy_stream_impl_lite.h>
-#include <google/protobuf/stubs/stl_util.h>
-
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-namespace io {
-
-namespace {
-
-static const int kMaxVarintBytes = 10;
-static const int kMaxVarint32Bytes = 5;
-
-
-inline bool NextNonEmpty(ZeroCopyInputStream* input, const void** data,
-                         int* size) {
-  bool success;
-  do {
-    success = input->Next(data, size);
-  } while (success && *size == 0);
-  return success;
-}
-
-}  // namespace
-
-// CodedInputStream ==================================================
-
-CodedInputStream::~CodedInputStream() {
-  if (input_ != NULL) {
-    BackUpInputToCurrentPosition();
-  }
-}
-
-// Static.
-int CodedInputStream::default_recursion_limit_ = 100;
-
-
-void CodedInputStream::BackUpInputToCurrentPosition() {
-  int backup_bytes = BufferSize() + buffer_size_after_limit_ + overflow_bytes_;
-  if (backup_bytes > 0) {
-    input_->BackUp(backup_bytes);
-
-    // total_bytes_read_ doesn't include overflow_bytes_.
-    total_bytes_read_ -= BufferSize() + buffer_size_after_limit_;
-    buffer_end_ = buffer_;
-    buffer_size_after_limit_ = 0;
-    overflow_bytes_ = 0;
-  }
-}
-
-inline void CodedInputStream::RecomputeBufferLimits() {
-  buffer_end_ += buffer_size_after_limit_;
-  int closest_limit = std::min(current_limit_, total_bytes_limit_);
-  if (closest_limit < total_bytes_read_) {
-    // The limit position is in the current buffer.  We must adjust
-    // the buffer size accordingly.
-    buffer_size_after_limit_ = total_bytes_read_ - closest_limit;
-    buffer_end_ -= buffer_size_after_limit_;
-  } else {
-    buffer_size_after_limit_ = 0;
-  }
-}
-
-CodedInputStream::Limit CodedInputStream::PushLimit(int byte_limit) {
-  // Current position relative to the beginning of the stream.
-  int current_position = CurrentPosition();
-
-  Limit old_limit = current_limit_;
-
-  // security: byte_limit is possibly evil, so check for negative values
-  // and overflow. Also check that the new requested limit is before the
-  // previous limit; otherwise we continue to enforce the previous limit.
-  if (PROTOBUF_PREDICT_TRUE(byte_limit >= 0 &&
-                            byte_limit <= INT_MAX - current_position &&
-                            byte_limit < current_limit_ - current_position)) {
-    current_limit_ = current_position + byte_limit;
-    RecomputeBufferLimits();
-  }
-
-  return old_limit;
-}
-
-void CodedInputStream::PopLimit(Limit limit) {
-  // The limit passed in is actually the *old* limit, which we returned from
-  // PushLimit().
-  current_limit_ = limit;
-  RecomputeBufferLimits();
-
-  // We may no longer be at a legitimate message end.  ReadTag() needs to be
-  // called again to find out.
-  legitimate_message_end_ = false;
-}
-
-std::pair<CodedInputStream::Limit, int>
-CodedInputStream::IncrementRecursionDepthAndPushLimit(int byte_limit) {
-  return std::make_pair(PushLimit(byte_limit), --recursion_budget_);
-}
-
-CodedInputStream::Limit CodedInputStream::ReadLengthAndPushLimit() {
-  uint32_t length;
-  return PushLimit(ReadVarint32(&length) ? length : 0);
-}
-
-bool CodedInputStream::DecrementRecursionDepthAndPopLimit(Limit limit) {
-  bool result = ConsumedEntireMessage();
-  PopLimit(limit);
-  GOOGLE_DCHECK_LT(recursion_budget_, recursion_limit_);
-  ++recursion_budget_;
-  return result;
-}
-
-bool CodedInputStream::CheckEntireMessageConsumedAndPopLimit(Limit limit) {
-  bool result = ConsumedEntireMessage();
-  PopLimit(limit);
-  return result;
-}
-
-int CodedInputStream::BytesUntilLimit() const {
-  if (current_limit_ == INT_MAX) return -1;
-  int current_position = CurrentPosition();
-
-  return current_limit_ - current_position;
-}
-
-void CodedInputStream::SetTotalBytesLimit(int total_bytes_limit) {
-  // Make sure the limit isn't already past, since this could confuse other
-  // code.
-  int current_position = CurrentPosition();
-  total_bytes_limit_ = std::max(current_position, total_bytes_limit);
-  RecomputeBufferLimits();
-}
-
-int CodedInputStream::BytesUntilTotalBytesLimit() const {
-  if (total_bytes_limit_ == INT_MAX) return -1;
-  return total_bytes_limit_ - CurrentPosition();
-}
-
-void CodedInputStream::PrintTotalBytesLimitError() {
-  GOOGLE_LOG(ERROR)
-      << "A protocol message was rejected because it was too "
-         "big (more than "
-      << total_bytes_limit_
-      << " bytes).  To increase the limit (or to disable these "
-         "warnings), see CodedInputStream::SetTotalBytesLimit() "
-         "in third_party/protobuf/io/coded_stream.h.";
-}
-
-bool CodedInputStream::SkipFallback(int count, int original_buffer_size) {
-  if (buffer_size_after_limit_ > 0) {
-    // We hit a limit inside this buffer.  Advance to the limit and fail.
-    Advance(original_buffer_size);
-    return false;
-  }
-
-  count -= original_buffer_size;
-  buffer_ = NULL;
-  buffer_end_ = buffer_;
-
-  // Make sure this skip doesn't try to skip past the current limit.
-  int closest_limit = std::min(current_limit_, total_bytes_limit_);
-  int bytes_until_limit = closest_limit - total_bytes_read_;
-  if (bytes_until_limit < count) {
-    // We hit the limit.  Skip up to it then fail.
-    if (bytes_until_limit > 0) {
-      total_bytes_read_ = closest_limit;
-      input_->Skip(bytes_until_limit);
-    }
-    return false;
-  }
-
-  if (!input_->Skip(count)) {
-    total_bytes_read_ = input_->ByteCount();
-    return false;
-  }
-  total_bytes_read_ += count;
-  return true;
-}
-
-bool CodedInputStream::GetDirectBufferPointer(const void** data, int* size) {
-  if (BufferSize() == 0 && !Refresh()) return false;
-
-  *data = buffer_;
-  *size = BufferSize();
-  return true;
-}
-
-bool CodedInputStream::ReadRaw(void* buffer, int size) {
-  int current_buffer_size;
-  while ((current_buffer_size = BufferSize()) < size) {
-    // Reading past end of buffer.  Copy what we have, then refresh.
-    memcpy(buffer, buffer_, current_buffer_size);
-    buffer = reinterpret_cast<uint8_t*>(buffer) + current_buffer_size;
-    size -= current_buffer_size;
-    Advance(current_buffer_size);
-    if (!Refresh()) return false;
-  }
-
-  memcpy(buffer, buffer_, size);
-  Advance(size);
-
-  return true;
-}
-
-bool CodedInputStream::ReadString(std::string* buffer, int size) {
-  if (size < 0) return false;  // security: size is often user-supplied
-
-  if (BufferSize() >= size) {
-    STLStringResizeUninitialized(buffer, size);
-    std::pair<char*, bool> z = as_string_data(buffer);
-    if (z.second) {
-      // Oddly enough, memcpy() requires its first two args to be non-NULL even
-      // if we copy 0 bytes.  So, we have ensured that z.first is non-NULL here.
-      GOOGLE_DCHECK(z.first != NULL);
-      memcpy(z.first, buffer_, size);
-      Advance(size);
-    }
-    return true;
-  }
-
-  return ReadStringFallback(buffer, size);
-}
-
-bool CodedInputStream::ReadStringFallback(std::string* buffer, int size) {
-  if (!buffer->empty()) {
-    buffer->clear();
-  }
-
-  int closest_limit = std::min(current_limit_, total_bytes_limit_);
-  if (closest_limit != INT_MAX) {
-    int bytes_to_limit = closest_limit - CurrentPosition();
-    if (bytes_to_limit > 0 && size > 0 && size <= bytes_to_limit) {
-      buffer->reserve(size);
-    }
-  }
-
-  int current_buffer_size;
-  while ((current_buffer_size = BufferSize()) < size) {
-    // Some STL implementations "helpfully" crash on buffer->append(NULL, 0).
-    if (current_buffer_size != 0) {
-      // Note:  string1.append(string2) is O(string2.size()) (as opposed to
-      //   O(string1.size() + string2.size()), which would be bad).
-      buffer->append(reinterpret_cast<const char*>(buffer_),
-                     current_buffer_size);
-    }
-    size -= current_buffer_size;
-    Advance(current_buffer_size);
-    if (!Refresh()) return false;
-  }
-
-  buffer->append(reinterpret_cast<const char*>(buffer_), size);
-  Advance(size);
-
-  return true;
-}
-
-
-bool CodedInputStream::ReadLittleEndian32Fallback(uint32_t* value) {
-  uint8_t bytes[sizeof(*value)];
-
-  const uint8_t* ptr;
-  if (BufferSize() >= static_cast<int64_t>(sizeof(*value))) {
-    // Fast path:  Enough bytes in the buffer to read directly.
-    ptr = buffer_;
-    Advance(sizeof(*value));
-  } else {
-    // Slow path:  Had to read past the end of the buffer.
-    if (!ReadRaw(bytes, sizeof(*value))) return false;
-    ptr = bytes;
-  }
-  ReadLittleEndian32FromArray(ptr, value);
-  return true;
-}
-
-bool CodedInputStream::ReadLittleEndian64Fallback(uint64_t* value) {
-  uint8_t bytes[sizeof(*value)];
-
-  const uint8_t* ptr;
-  if (BufferSize() >= static_cast<int64_t>(sizeof(*value))) {
-    // Fast path:  Enough bytes in the buffer to read directly.
-    ptr = buffer_;
-    Advance(sizeof(*value));
-  } else {
-    // Slow path:  Had to read past the end of the buffer.
-    if (!ReadRaw(bytes, sizeof(*value))) return false;
-    ptr = bytes;
-  }
-  ReadLittleEndian64FromArray(ptr, value);
-  return true;
-}
-
-namespace {
-
-// Decodes varint64 with known size, N, and returns next pointer. Knowing N at
-// compile time, compiler can generate optimal code. For example, instead of
-// subtracting 0x80 at each iteration, it subtracts properly shifted mask once.
-template <size_t N>
-const uint8_t* DecodeVarint64KnownSize(const uint8_t* buffer, uint64_t* value) {
-  GOOGLE_DCHECK_GT(N, 0);
-  uint64_t result = static_cast<uint64_t>(buffer[N - 1]) << (7 * (N - 1));
-  for (size_t i = 0, offset = 0; i < N - 1; i++, offset += 7) {
-    result += static_cast<uint64_t>(buffer[i] - 0x80) << offset;
-  }
-  *value = result;
-  return buffer + N;
-}
-
-// Read a varint from the given buffer, write it to *value, and return a pair.
-// The first part of the pair is true iff the read was successful.  The second
-// part is buffer + (number of bytes read).  This function is always inlined,
-// so returning a pair is costless.
-PROTOBUF_ALWAYS_INLINE
-::std::pair<bool, const uint8_t*> ReadVarint32FromArray(uint32_t first_byte,
-                                                      const uint8_t* buffer,
-                                                      uint32_t* value);
-inline ::std::pair<bool, const uint8_t*> ReadVarint32FromArray(
-    uint32_t first_byte, const uint8_t* buffer, uint32_t* value) {
-  // Fast path:  We have enough bytes left in the buffer to guarantee that
-  // this read won't cross the end, so we can skip the checks.
-  GOOGLE_DCHECK_EQ(*buffer, first_byte);
-  GOOGLE_DCHECK_EQ(first_byte & 0x80, 0x80) << first_byte;
-  const uint8_t* ptr = buffer;
-  uint32_t b;
-  uint32_t result = first_byte - 0x80;
-  ++ptr;  // We just processed the first byte.  Move on to the second.
-  b = *(ptr++);
-  result += b << 7;
-  if (!(b & 0x80)) goto done;
-  result -= 0x80 << 7;
-  b = *(ptr++);
-  result += b << 14;
-  if (!(b & 0x80)) goto done;
-  result -= 0x80 << 14;
-  b = *(ptr++);
-  result += b << 21;
-  if (!(b & 0x80)) goto done;
-  result -= 0x80 << 21;
-  b = *(ptr++);
-  result += b << 28;
-  if (!(b & 0x80)) goto done;
-  // "result -= 0x80 << 28" is irrelevant.
-
-  // If the input is larger than 32 bits, we still need to read it all
-  // and discard the high-order bits.
-  for (int i = 0; i < kMaxVarintBytes - kMaxVarint32Bytes; i++) {
-    b = *(ptr++);
-    if (!(b & 0x80)) goto done;
-  }
-
-  // We have overrun the maximum size of a varint (10 bytes).  Assume
-  // the data is corrupt.
-  return std::make_pair(false, ptr);
-
-done:
-  *value = result;
-  return std::make_pair(true, ptr);
-}
-
-PROTOBUF_ALWAYS_INLINE::std::pair<bool, const uint8_t*> ReadVarint64FromArray(
-    const uint8_t* buffer, uint64_t* value);
-inline ::std::pair<bool, const uint8_t*> ReadVarint64FromArray(
-    const uint8_t* buffer, uint64_t* value) {
-  // Assumes varint64 is at least 2 bytes.
-  GOOGLE_DCHECK_GE(buffer[0], 128);
-
-  const uint8_t* next;
-  if (buffer[1] < 128) {
-    next = DecodeVarint64KnownSize<2>(buffer, value);
-  } else if (buffer[2] < 128) {
-    next = DecodeVarint64KnownSize<3>(buffer, value);
-  } else if (buffer[3] < 128) {
-    next = DecodeVarint64KnownSize<4>(buffer, value);
-  } else if (buffer[4] < 128) {
-    next = DecodeVarint64KnownSize<5>(buffer, value);
-  } else if (buffer[5] < 128) {
-    next = DecodeVarint64KnownSize<6>(buffer, value);
-  } else if (buffer[6] < 128) {
-    next = DecodeVarint64KnownSize<7>(buffer, value);
-  } else if (buffer[7] < 128) {
-    next = DecodeVarint64KnownSize<8>(buffer, value);
-  } else if (buffer[8] < 128) {
-    next = DecodeVarint64KnownSize<9>(buffer, value);
-  } else if (buffer[9] < 128) {
-    next = DecodeVarint64KnownSize<10>(buffer, value);
-  } else {
-    // We have overrun the maximum size of a varint (10 bytes). Assume
-    // the data is corrupt.
-    return std::make_pair(false, buffer + 11);
-  }
-
-  return std::make_pair(true, next);
-}
-
-}  // namespace
-
-bool CodedInputStream::ReadVarint32Slow(uint32_t* value) {
-  // Directly invoke ReadVarint64Fallback, since we already tried to optimize
-  // for one-byte varints.
-  std::pair<uint64_t, bool> p = ReadVarint64Fallback();
-  *value = static_cast<uint32_t>(p.first);
-  return p.second;
-}
-
-int64_t CodedInputStream::ReadVarint32Fallback(uint32_t first_byte_or_zero) {
-  if (BufferSize() >= kMaxVarintBytes ||
-      // Optimization:  We're also safe if the buffer is non-empty and it ends
-      // with a byte that would terminate a varint.
-      (buffer_end_ > buffer_ && !(buffer_end_[-1] & 0x80))) {
-    GOOGLE_DCHECK_NE(first_byte_or_zero, 0)
-        << "Caller should provide us with *buffer_ when buffer is non-empty";
-    uint32_t temp;
-    ::std::pair<bool, const uint8_t*> p =
-        ReadVarint32FromArray(first_byte_or_zero, buffer_, &temp);
-    if (!p.first) return -1;
-    buffer_ = p.second;
-    return temp;
-  } else {
-    // Really slow case: we will incur the cost of an extra function call here,
-    // but moving this out of line reduces the size of this function, which
-    // improves the common case. In micro benchmarks, this is worth about 10-15%
-    uint32_t temp;
-    return ReadVarint32Slow(&temp) ? static_cast<int64_t>(temp) : -1;
-  }
-}
-
-int CodedInputStream::ReadVarintSizeAsIntSlow() {
-  // Directly invoke ReadVarint64Fallback, since we already tried to optimize
-  // for one-byte varints.
-  std::pair<uint64_t, bool> p = ReadVarint64Fallback();
-  if (!p.second || p.first > static_cast<uint64_t>(INT_MAX)) return -1;
-  return p.first;
-}
-
-int CodedInputStream::ReadVarintSizeAsIntFallback() {
-  if (BufferSize() >= kMaxVarintBytes ||
-      // Optimization:  We're also safe if the buffer is non-empty and it ends
-      // with a byte that would terminate a varint.
-      (buffer_end_ > buffer_ && !(buffer_end_[-1] & 0x80))) {
-    uint64_t temp;
-    ::std::pair<bool, const uint8_t*> p = ReadVarint64FromArray(buffer_, &temp);
-    if (!p.first || temp > static_cast<uint64_t>(INT_MAX)) return -1;
-    buffer_ = p.second;
-    return temp;
-  } else {
-    // Really slow case: we will incur the cost of an extra function call here,
-    // but moving this out of line reduces the size of this function, which
-    // improves the common case. In micro benchmarks, this is worth about 10-15%
-    return ReadVarintSizeAsIntSlow();
-  }
-}
-
-uint32_t CodedInputStream::ReadTagSlow() {
-  if (buffer_ == buffer_end_) {
-    // Call refresh.
-    if (!Refresh()) {
-      // Refresh failed.  Make sure that it failed due to EOF, not because
-      // we hit total_bytes_limit_, which, unlike normal limits, is not a
-      // valid place to end a message.
-      int current_position = total_bytes_read_ - buffer_size_after_limit_;
-      if (current_position >= total_bytes_limit_) {
-        // Hit total_bytes_limit_.  But if we also hit the normal limit,
-        // we're still OK.
-        legitimate_message_end_ = current_limit_ == total_bytes_limit_;
-      } else {
-        legitimate_message_end_ = true;
-      }
-      return 0;
-    }
-  }
-
-  // For the slow path, just do a 64-bit read. Try to optimize for one-byte tags
-  // again, since we have now refreshed the buffer.
-  uint64_t result = 0;
-  if (!ReadVarint64(&result)) return 0;
-  return static_cast<uint32_t>(result);
-}
-
-uint32_t CodedInputStream::ReadTagFallback(uint32_t first_byte_or_zero) {
-  const int buf_size = BufferSize();
-  if (buf_size >= kMaxVarintBytes ||
-      // Optimization:  We're also safe if the buffer is non-empty and it ends
-      // with a byte that would terminate a varint.
-      (buf_size > 0 && !(buffer_end_[-1] & 0x80))) {
-    GOOGLE_DCHECK_EQ(first_byte_or_zero, buffer_[0]);
-    if (first_byte_or_zero == 0) {
-      ++buffer_;
-      return 0;
-    }
-    uint32_t tag;
-    ::std::pair<bool, const uint8_t*> p =
-        ReadVarint32FromArray(first_byte_or_zero, buffer_, &tag);
-    if (!p.first) {
-      return 0;
-    }
-    buffer_ = p.second;
-    return tag;
-  } else {
-    // We are commonly at a limit when attempting to read tags. Try to quickly
-    // detect this case without making another function call.
-    if ((buf_size == 0) &&
-        ((buffer_size_after_limit_ > 0) ||
-         (total_bytes_read_ == current_limit_)) &&
-        // Make sure that the limit we hit is not total_bytes_limit_, since
-        // in that case we still need to call Refresh() so that it prints an
-        // error.
-        total_bytes_read_ - buffer_size_after_limit_ < total_bytes_limit_) {
-      // We hit a byte limit.
-      legitimate_message_end_ = true;
-      return 0;
-    }
-    return ReadTagSlow();
-  }
-}
-
-bool CodedInputStream::ReadVarint64Slow(uint64_t* value) {
-  // Slow path:  This read might cross the end of the buffer, so we
-  // need to check and refresh the buffer if and when it does.
-
-  uint64_t result = 0;
-  int count = 0;
-  uint32_t b;
-
-  do {
-    if (count == kMaxVarintBytes) {
-      *value = 0;
-      return false;
-    }
-    while (buffer_ == buffer_end_) {
-      if (!Refresh()) {
-        *value = 0;
-        return false;
-      }
-    }
-    b = *buffer_;
-    result |= static_cast<uint64_t>(b & 0x7F) << (7 * count);
-    Advance(1);
-    ++count;
-  } while (b & 0x80);
-
-  *value = result;
-  return true;
-}
-
-std::pair<uint64_t, bool> CodedInputStream::ReadVarint64Fallback() {
-  if (BufferSize() >= kMaxVarintBytes ||
-      // Optimization:  We're also safe if the buffer is non-empty and it ends
-      // with a byte that would terminate a varint.
-      (buffer_end_ > buffer_ && !(buffer_end_[-1] & 0x80))) {
-    uint64_t temp;
-    ::std::pair<bool, const uint8_t*> p = ReadVarint64FromArray(buffer_, &temp);
-    if (!p.first) {
-      return std::make_pair(0, false);
-    }
-    buffer_ = p.second;
-    return std::make_pair(temp, true);
-  } else {
-    uint64_t temp;
-    bool success = ReadVarint64Slow(&temp);
-    return std::make_pair(temp, success);
-  }
-}
-
-bool CodedInputStream::Refresh() {
-  GOOGLE_DCHECK_EQ(0, BufferSize());
-
-  if (buffer_size_after_limit_ > 0 || overflow_bytes_ > 0 ||
-      total_bytes_read_ == current_limit_) {
-    // We've hit a limit.  Stop.
-    int current_position = total_bytes_read_ - buffer_size_after_limit_;
-
-    if (current_position >= total_bytes_limit_ &&
-        total_bytes_limit_ != current_limit_) {
-      // Hit total_bytes_limit_.
-      PrintTotalBytesLimitError();
-    }
-
-    return false;
-  }
-
-  const void* void_buffer;
-  int buffer_size;
-  if (NextNonEmpty(input_, &void_buffer, &buffer_size)) {
-    buffer_ = reinterpret_cast<const uint8_t*>(void_buffer);
-    buffer_end_ = buffer_ + buffer_size;
-    GOOGLE_CHECK_GE(buffer_size, 0);
-
-    if (total_bytes_read_ <= INT_MAX - buffer_size) {
-      total_bytes_read_ += buffer_size;
-    } else {
-      // Overflow.  Reset buffer_end_ to not include the bytes beyond INT_MAX.
-      // We can't get that far anyway, because total_bytes_limit_ is guaranteed
-      // to be less than it.  We need to keep track of the number of bytes
-      // we discarded, though, so that we can call input_->BackUp() to back
-      // up over them on destruction.
-
-      // The following line is equivalent to:
-      //   overflow_bytes_ = total_bytes_read_ + buffer_size - INT_MAX;
-      // except that it avoids overflows.  Signed integer overflow has
-      // undefined results according to the C standard.
-      overflow_bytes_ = total_bytes_read_ - (INT_MAX - buffer_size);
-      buffer_end_ -= overflow_bytes_;
-      total_bytes_read_ = INT_MAX;
-    }
-
-    RecomputeBufferLimits();
-    return true;
-  } else {
-    buffer_ = NULL;
-    buffer_end_ = NULL;
-    return false;
-  }
-}
-
-// CodedOutputStream =================================================
-
-void EpsCopyOutputStream::EnableAliasing(bool enabled) {
-  aliasing_enabled_ = enabled && stream_->AllowsAliasing();
-}
-
-int64_t EpsCopyOutputStream::ByteCount(uint8_t* ptr) const {
-  // Calculate the current offset relative to the end of the stream buffer.
-  int delta = (end_ - ptr) + (buffer_end_ ? 0 : kSlopBytes);
-  return stream_->ByteCount() - delta;
-}
-
-// Flushes what's written out to the underlying ZeroCopyOutputStream buffers.
-// Returns the size remaining in the buffer and sets buffer_end_ to the start
-// of the remaining buffer, ie. [buffer_end_, buffer_end_ + return value)
-int EpsCopyOutputStream::Flush(uint8_t* ptr) {
-  while (buffer_end_ && ptr > end_) {
-    int overrun = ptr - end_;
-    GOOGLE_DCHECK(!had_error_);
-    GOOGLE_DCHECK(overrun <= kSlopBytes);  // NOLINT
-    ptr = Next() + overrun;
-    if (had_error_) return 0;
-  }
-  int s;
-  if (buffer_end_) {
-    std::memcpy(buffer_end_, buffer_, ptr - buffer_);
-    buffer_end_ += ptr - buffer_;
-    s = end_ - ptr;
-  } else {
-    // The stream is writing directly in the ZeroCopyOutputStream buffer.
-    s = end_ + kSlopBytes - ptr;
-    buffer_end_ = ptr;
-  }
-  GOOGLE_DCHECK(s >= 0);  // NOLINT
-  return s;
-}
-
-uint8_t* EpsCopyOutputStream::Trim(uint8_t* ptr) {
-  if (had_error_) return ptr;
-  int s = Flush(ptr);
-  stream_->BackUp(s);
-  // Reset to initial state (expecting new buffer)
-  buffer_end_ = end_ = buffer_;
-  return buffer_;
-}
-
-
-uint8_t* EpsCopyOutputStream::FlushAndResetBuffer(uint8_t* ptr) {
-  if (had_error_) return buffer_;
-  int s = Flush(ptr);
-  if (had_error_) return buffer_;
-  return SetInitialBuffer(buffer_end_, s);
-}
-
-bool EpsCopyOutputStream::Skip(int count, uint8_t** pp) {
-  if (count < 0) return false;
-  if (had_error_) {
-    *pp = buffer_;
-    return false;
-  }
-  int size = Flush(*pp);
-  if (had_error_) {
-    *pp = buffer_;
-    return false;
-  }
-  void* data = buffer_end_;
-  while (count > size) {
-    count -= size;
-    if (!stream_->Next(&data, &size)) {
-      *pp = Error();
-      return false;
-    }
-  }
-  *pp = SetInitialBuffer(static_cast<uint8_t*>(data) + count, size - count);
-  return true;
-}
-
-bool EpsCopyOutputStream::GetDirectBufferPointer(void** data, int* size,
-                                                 uint8_t** pp) {
-  if (had_error_) {
-    *pp = buffer_;
-    return false;
-  }
-  *size = Flush(*pp);
-  if (had_error_) {
-    *pp = buffer_;
-    return false;
-  }
-  *data = buffer_end_;
-  while (*size == 0) {
-    if (!stream_->Next(data, size)) {
-      *pp = Error();
-      return false;
-    }
-  }
-  *pp = SetInitialBuffer(*data, *size);
-  return true;
-}
-
-uint8_t* EpsCopyOutputStream::GetDirectBufferForNBytesAndAdvance(int size,
-                                                               uint8_t** pp) {
-  if (had_error_) {
-    *pp = buffer_;
-    return nullptr;
-  }
-  int s = Flush(*pp);
-  if (had_error_) {
-    *pp = buffer_;
-    return nullptr;
-  }
-  if (s >= size) {
-    auto res = buffer_end_;
-    *pp = SetInitialBuffer(buffer_end_ + size, s - size);
-    return res;
-  } else {
-    *pp = SetInitialBuffer(buffer_end_, s);
-    return nullptr;
-  }
-}
-
-uint8_t* EpsCopyOutputStream::Next() {
-  GOOGLE_DCHECK(!had_error_);  // NOLINT
-  if (PROTOBUF_PREDICT_FALSE(stream_ == nullptr)) return Error();
-  if (buffer_end_) {
-    // We're in the patch buffer and need to fill up the previous buffer.
-    std::memcpy(buffer_end_, buffer_, end_ - buffer_);
-    uint8_t* ptr;
-    int size;
-    do {
-      void* data;
-      if (PROTOBUF_PREDICT_FALSE(!stream_->Next(&data, &size))) {
-        // Stream has an error, we use the patch buffer to continue to be
-        // able to write.
-        return Error();
-      }
-      ptr = static_cast<uint8_t*>(data);
-    } while (size == 0);
-    if (PROTOBUF_PREDICT_TRUE(size > kSlopBytes)) {
-      std::memcpy(ptr, end_, kSlopBytes);
-      end_ = ptr + size - kSlopBytes;
-      buffer_end_ = nullptr;
-      return ptr;
-    } else {
-      GOOGLE_DCHECK(size > 0);  // NOLINT
-      // Buffer to small
-      std::memmove(buffer_, end_, kSlopBytes);
-      buffer_end_ = ptr;
-      end_ = buffer_ + size;
-      return buffer_;
-    }
-  } else {
-    std::memcpy(buffer_, end_, kSlopBytes);
-    buffer_end_ = end_;
-    end_ = buffer_ + kSlopBytes;
-    return buffer_;
-  }
-}
-
-uint8_t* EpsCopyOutputStream::EnsureSpaceFallback(uint8_t* ptr) {
-  do {
-    if (PROTOBUF_PREDICT_FALSE(had_error_)) return buffer_;
-    int overrun = ptr - end_;
-    GOOGLE_DCHECK(overrun >= 0);           // NOLINT
-    GOOGLE_DCHECK(overrun <= kSlopBytes);  // NOLINT
-    ptr = Next() + overrun;
-  } while (ptr >= end_);
-  GOOGLE_DCHECK(ptr < end_);  // NOLINT
-  return ptr;
-}
-
-uint8_t* EpsCopyOutputStream::WriteRawFallback(const void* data, int size,
-                                             uint8_t* ptr) {
-  int s = GetSize(ptr);
-  while (s < size) {
-    std::memcpy(ptr, data, s);
-    size -= s;
-    data = static_cast<const uint8_t*>(data) + s;
-    ptr = EnsureSpaceFallback(ptr + s);
-    s = GetSize(ptr);
-  }
-  std::memcpy(ptr, data, size);
-  return ptr + size;
-}
-
-uint8_t* EpsCopyOutputStream::WriteAliasedRaw(const void* data, int size,
-                                            uint8_t* ptr) {
-  if (size < GetSize(ptr)
-  ) {
-    return WriteRaw(data, size, ptr);
-  } else {
-    ptr = Trim(ptr);
-    if (stream_->WriteAliasedRaw(data, size)) return ptr;
-    return Error();
-  }
-}
-
-#ifndef PROTOBUF_LITTLE_ENDIAN
-uint8_t* EpsCopyOutputStream::WriteRawLittleEndian32(const void* data, int size,
-                                                   uint8_t* ptr) {
-  auto p = static_cast<const uint8_t*>(data);
-  auto end = p + size;
-  while (end - p >= kSlopBytes) {
-    ptr = EnsureSpace(ptr);
-    uint32_t buffer[4];
-    static_assert(sizeof(buffer) == kSlopBytes, "Buffer must be kSlopBytes");
-    std::memcpy(buffer, p, kSlopBytes);
-    p += kSlopBytes;
-    for (auto x : buffer)
-      ptr = CodedOutputStream::WriteLittleEndian32ToArray(x, ptr);
-  }
-  while (p < end) {
-    ptr = EnsureSpace(ptr);
-    uint32_t buffer;
-    std::memcpy(&buffer, p, 4);
-    p += 4;
-    ptr = CodedOutputStream::WriteLittleEndian32ToArray(buffer, ptr);
-  }
-  return ptr;
-}
-
-uint8_t* EpsCopyOutputStream::WriteRawLittleEndian64(const void* data, int size,
-                                                   uint8_t* ptr) {
-  auto p = static_cast<const uint8_t*>(data);
-  auto end = p + size;
-  while (end - p >= kSlopBytes) {
-    ptr = EnsureSpace(ptr);
-    uint64_t buffer[2];
-    static_assert(sizeof(buffer) == kSlopBytes, "Buffer must be kSlopBytes");
-    std::memcpy(buffer, p, kSlopBytes);
-    p += kSlopBytes;
-    for (auto x : buffer)
-      ptr = CodedOutputStream::WriteLittleEndian64ToArray(x, ptr);
-  }
-  while (p < end) {
-    ptr = EnsureSpace(ptr);
-    uint64_t buffer;
-    std::memcpy(&buffer, p, 8);
-    p += 8;
-    ptr = CodedOutputStream::WriteLittleEndian64ToArray(buffer, ptr);
-  }
-  return ptr;
-}
-#endif
-
-
-uint8_t* EpsCopyOutputStream::WriteStringMaybeAliasedOutline(uint32_t num,
-                                                           const std::string& s,
-                                                           uint8_t* ptr) {
-  ptr = EnsureSpace(ptr);
-  uint32_t size = s.size();
-  ptr = WriteLengthDelim(num, size, ptr);
-  return WriteRawMaybeAliased(s.data(), size, ptr);
-}
-
-uint8_t* EpsCopyOutputStream::WriteStringOutline(uint32_t num, const std::string& s,
-                                               uint8_t* ptr) {
-  ptr = EnsureSpace(ptr);
-  uint32_t size = s.size();
-  ptr = WriteLengthDelim(num, size, ptr);
-  return WriteRaw(s.data(), size, ptr);
-}
-
-std::atomic<bool> CodedOutputStream::default_serialization_deterministic_{
-    false};
-
-CodedOutputStream::~CodedOutputStream() { Trim(); }
-
-
-uint8_t* CodedOutputStream::WriteStringWithSizeToArray(const std::string& str,
-                                                     uint8_t* target) {
-  GOOGLE_DCHECK_LE(str.size(), std::numeric_limits<uint32_t>::max());
-  target = WriteVarint32ToArray(str.size(), target);
-  return WriteStringToArray(str, target);
-}
-
-uint8_t* CodedOutputStream::WriteVarint32ToArrayOutOfLineHelper(uint32_t value,
-                                                              uint8_t* target) {
-  GOOGLE_DCHECK_GE(value, 0x80);
-  target[0] |= static_cast<uint8_t>(0x80);
-  value >>= 7;
-  target[1] = static_cast<uint8_t>(value);
-  if (value < 0x80) {
-    return target + 2;
-  }
-  target += 2;
-  do {
-    // Turn on continuation bit in the byte we just wrote.
-    target[-1] |= static_cast<uint8_t>(0x80);
-    value >>= 7;
-    *target = static_cast<uint8_t>(value);
-    ++target;
-  } while (value >= 0x80);
-  return target;
-}
-
-}  // namespace io
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
diff --git a/libs/protobuf/src/google/protobuf/io/coded_stream.h b/libs/protobuf/src/google/protobuf/io/coded_stream.h
deleted file mode 100644
index c8fc994..0000000
--- a/libs/protobuf/src/google/protobuf/io/coded_stream.h
+++ /dev/null
@@ -1,1799 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-//
-// This file contains the CodedInputStream and CodedOutputStream classes,
-// which wrap a ZeroCopyInputStream or ZeroCopyOutputStream, respectively,
-// and allow you to read or write individual pieces of data in various
-// formats.  In particular, these implement the varint encoding for
-// integers, a simple variable-length encoding in which smaller numbers
-// take fewer bytes.
-//
-// Typically these classes will only be used internally by the protocol
-// buffer library in order to encode and decode protocol buffers.  Clients
-// of the library only need to know about this class if they wish to write
-// custom message parsing or serialization procedures.
-//
-// CodedOutputStream example:
-//   // Write some data to "myfile".  First we write a 4-byte "magic number"
-//   // to identify the file type, then write a length-delimited string.  The
-//   // string is composed of a varint giving the length followed by the raw
-//   // bytes.
-//   int fd = open("myfile", O_CREAT | O_WRONLY);
-//   ZeroCopyOutputStream* raw_output = new FileOutputStream(fd);
-//   CodedOutputStream* coded_output = new CodedOutputStream(raw_output);
-//
-//   int magic_number = 1234;
-//   char text[] = "Hello world!";
-//   coded_output->WriteLittleEndian32(magic_number);
-//   coded_output->WriteVarint32(strlen(text));
-//   coded_output->WriteRaw(text, strlen(text));
-//
-//   delete coded_output;
-//   delete raw_output;
-//   close(fd);
-//
-// CodedInputStream example:
-//   // Read a file created by the above code.
-//   int fd = open("myfile", O_RDONLY);
-//   ZeroCopyInputStream* raw_input = new FileInputStream(fd);
-//   CodedInputStream* coded_input = new CodedInputStream(raw_input);
-//
-//   coded_input->ReadLittleEndian32(&magic_number);
-//   if (magic_number != 1234) {
-//     cerr << "File not in expected format." << endl;
-//     return;
-//   }
-//
-//   uint32_t size;
-//   coded_input->ReadVarint32(&size);
-//
-//   char* text = new char[size + 1];
-//   coded_input->ReadRaw(buffer, size);
-//   text[size] = '\0';
-//
-//   delete coded_input;
-//   delete raw_input;
-//   close(fd);
-//
-//   cout << "Text is: " << text << endl;
-//   delete [] text;
-//
-// For those who are interested, varint encoding is defined as follows:
-//
-// The encoding operates on unsigned integers of up to 64 bits in length.
-// Each byte of the encoded value has the format:
-// * bits 0-6: Seven bits of the number being encoded.
-// * bit 7: Zero if this is the last byte in the encoding (in which
-//   case all remaining bits of the number are zero) or 1 if
-//   more bytes follow.
-// The first byte contains the least-significant 7 bits of the number, the
-// second byte (if present) contains the next-least-significant 7 bits,
-// and so on.  So, the binary number 1011000101011 would be encoded in two
-// bytes as "10101011 00101100".
-//
-// In theory, varint could be used to encode integers of any length.
-// However, for practicality we set a limit at 64 bits.  The maximum encoded
-// length of a number is thus 10 bytes.
-
-#ifndef GOOGLE_PROTOBUF_IO_CODED_STREAM_H__
-#define GOOGLE_PROTOBUF_IO_CODED_STREAM_H__
-
-
-#include <assert.h>
-
-#include <atomic>
-#include <climits>
-#include <cstddef>
-#include <cstring>
-#include <limits>
-#include <string>
-#include <type_traits>
-#include <utility>
-
-#if defined(_MSC_VER) && _MSC_VER >= 1300 && !defined(__INTEL_COMPILER)
-// If MSVC has "/RTCc" set, it will complain about truncating casts at
-// runtime.  This file contains some intentional truncating casts.
-#pragma runtime_checks("c", off)
-#endif
-
-
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/stubs/logging.h>
-#include <google/protobuf/stubs/strutil.h>
-#include <google/protobuf/port.h>
-#include <google/protobuf/stubs/port.h>
-
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-
-class DescriptorPool;
-class MessageFactory;
-class ZeroCopyCodedInputStream;
-
-namespace internal {
-void MapTestForceDeterministic();
-class EpsCopyByteStream;
-}  // namespace internal
-
-namespace io {
-
-// Defined in this file.
-class CodedInputStream;
-class CodedOutputStream;
-
-// Defined in other files.
-class ZeroCopyInputStream;   // zero_copy_stream.h
-class ZeroCopyOutputStream;  // zero_copy_stream.h
-
-// Class which reads and decodes binary data which is composed of varint-
-// encoded integers and fixed-width pieces.  Wraps a ZeroCopyInputStream.
-// Most users will not need to deal with CodedInputStream.
-//
-// Most methods of CodedInputStream that return a bool return false if an
-// underlying I/O error occurs or if the data is malformed.  Once such a
-// failure occurs, the CodedInputStream is broken and is no longer useful.
-// After a failure, callers also should assume writes to "out" args may have
-// occurred, though nothing useful can be determined from those writes.
-class PROTOBUF_EXPORT CodedInputStream {
- public:
-  // Create a CodedInputStream that reads from the given ZeroCopyInputStream.
-  explicit CodedInputStream(ZeroCopyInputStream* input);
-
-  // Create a CodedInputStream that reads from the given flat array.  This is
-  // faster than using an ArrayInputStream.  PushLimit(size) is implied by
-  // this constructor.
-  explicit CodedInputStream(const uint8_t* buffer, int size);
-
-  // Destroy the CodedInputStream and position the underlying
-  // ZeroCopyInputStream at the first unread byte.  If an error occurred while
-  // reading (causing a method to return false), then the exact position of
-  // the input stream may be anywhere between the last value that was read
-  // successfully and the stream's byte limit.
-  ~CodedInputStream();
-
-  // Return true if this CodedInputStream reads from a flat array instead of
-  // a ZeroCopyInputStream.
-  inline bool IsFlat() const;
-
-  // Skips a number of bytes.  Returns false if an underlying read error
-  // occurs.
-  inline bool Skip(int count);
-
-  // Sets *data to point directly at the unread part of the CodedInputStream's
-  // underlying buffer, and *size to the size of that buffer, but does not
-  // advance the stream's current position.  This will always either produce
-  // a non-empty buffer or return false.  If the caller consumes any of
-  // this data, it should then call Skip() to skip over the consumed bytes.
-  // This may be useful for implementing external fast parsing routines for
-  // types of data not covered by the CodedInputStream interface.
-  bool GetDirectBufferPointer(const void** data, int* size);
-
-  // Like GetDirectBufferPointer, but this method is inlined, and does not
-  // attempt to Refresh() if the buffer is currently empty.
-  PROTOBUF_ALWAYS_INLINE
-  void GetDirectBufferPointerInline(const void** data, int* size);
-
-  // Read raw bytes, copying them into the given buffer.
-  bool ReadRaw(void* buffer, int size);
-
-  // Like ReadRaw, but reads into a string.
-  bool ReadString(std::string* buffer, int size);
-
-
-  // Read a 32-bit little-endian integer.
-  bool ReadLittleEndian32(uint32_t* value);
-  // Read a 64-bit little-endian integer.
-  bool ReadLittleEndian64(uint64_t* value);
-
-  // These methods read from an externally provided buffer. The caller is
-  // responsible for ensuring that the buffer has sufficient space.
-  // Read a 32-bit little-endian integer.
-  static const uint8_t* ReadLittleEndian32FromArray(const uint8_t* buffer,
-                                                    uint32_t* value);
-  // Read a 64-bit little-endian integer.
-  static const uint8_t* ReadLittleEndian64FromArray(const uint8_t* buffer,
-                                                    uint64_t* value);
-
-  // Read an unsigned integer with Varint encoding, truncating to 32 bits.
-  // Reading a 32-bit value is equivalent to reading a 64-bit one and casting
-  // it to uint32_t, but may be more efficient.
-  bool ReadVarint32(uint32_t* value);
-  // Read an unsigned integer with Varint encoding.
-  bool ReadVarint64(uint64_t* value);
-
-  // Reads a varint off the wire into an "int". This should be used for reading
-  // sizes off the wire (sizes of strings, submessages, bytes fields, etc).
-  //
-  // The value from the wire is interpreted as unsigned.  If its value exceeds
-  // the representable value of an integer on this platform, instead of
-  // truncating we return false. Truncating (as performed by ReadVarint32()
-  // above) is an acceptable approach for fields representing an integer, but
-  // when we are parsing a size from the wire, truncating the value would result
-  // in us misparsing the payload.
-  bool ReadVarintSizeAsInt(int* value);
-
-  // Read a tag.  This calls ReadVarint32() and returns the result, or returns
-  // zero (which is not a valid tag) if ReadVarint32() fails.  Also, ReadTag
-  // (but not ReadTagNoLastTag) updates the last tag value, which can be checked
-  // with LastTagWas().
-  //
-  // Always inline because this is only called in one place per parse loop
-  // but it is called for every iteration of said loop, so it should be fast.
-  // GCC doesn't want to inline this by default.
-  PROTOBUF_ALWAYS_INLINE uint32_t ReadTag() {
-    return last_tag_ = ReadTagNoLastTag();
-  }
-
-  PROTOBUF_ALWAYS_INLINE uint32_t ReadTagNoLastTag();
-
-  // This usually a faster alternative to ReadTag() when cutoff is a manifest
-  // constant.  It does particularly well for cutoff >= 127.  The first part
-  // of the return value is the tag that was read, though it can also be 0 in
-  // the cases where ReadTag() would return 0.  If the second part is true
-  // then the tag is known to be in [0, cutoff].  If not, the tag either is
-  // above cutoff or is 0.  (There's intentional wiggle room when tag is 0,
-  // because that can arise in several ways, and for best performance we want
-  // to avoid an extra "is tag == 0?" check here.)
-  PROTOBUF_ALWAYS_INLINE
-  std::pair<uint32_t, bool> ReadTagWithCutoff(uint32_t cutoff) {
-    std::pair<uint32_t, bool> result = ReadTagWithCutoffNoLastTag(cutoff);
-    last_tag_ = result.first;
-    return result;
-  }
-
-  PROTOBUF_ALWAYS_INLINE
-  std::pair<uint32_t, bool> ReadTagWithCutoffNoLastTag(uint32_t cutoff);
-
-  // Usually returns true if calling ReadVarint32() now would produce the given
-  // value.  Will always return false if ReadVarint32() would not return the
-  // given value.  If ExpectTag() returns true, it also advances past
-  // the varint.  For best performance, use a compile-time constant as the
-  // parameter.
-  // Always inline because this collapses to a small number of instructions
-  // when given a constant parameter, but GCC doesn't want to inline by default.
-  PROTOBUF_ALWAYS_INLINE bool ExpectTag(uint32_t expected);
-
-  // Like above, except this reads from the specified buffer. The caller is
-  // responsible for ensuring that the buffer is large enough to read a varint
-  // of the expected size. For best performance, use a compile-time constant as
-  // the expected tag parameter.
-  //
-  // Returns a pointer beyond the expected tag if it was found, or NULL if it
-  // was not.
-  PROTOBUF_ALWAYS_INLINE
-  static const uint8_t* ExpectTagFromArray(const uint8_t* buffer,
-                                           uint32_t expected);
-
-  // Usually returns true if no more bytes can be read.  Always returns false
-  // if more bytes can be read.  If ExpectAtEnd() returns true, a subsequent
-  // call to LastTagWas() will act as if ReadTag() had been called and returned
-  // zero, and ConsumedEntireMessage() will return true.
-  bool ExpectAtEnd();
-
-  // If the last call to ReadTag() or ReadTagWithCutoff() returned the given
-  // value, returns true.  Otherwise, returns false.
-  // ReadTagNoLastTag/ReadTagWithCutoffNoLastTag do not preserve the last
-  // returned value.
-  //
-  // This is needed because parsers for some types of embedded messages
-  // (with field type TYPE_GROUP) don't actually know that they've reached the
-  // end of a message until they see an ENDGROUP tag, which was actually part
-  // of the enclosing message.  The enclosing message would like to check that
-  // tag to make sure it had the right number, so it calls LastTagWas() on
-  // return from the embedded parser to check.
-  bool LastTagWas(uint32_t expected);
-  void SetLastTag(uint32_t tag) { last_tag_ = tag; }
-
-  // When parsing message (but NOT a group), this method must be called
-  // immediately after MergeFromCodedStream() returns (if it returns true)
-  // to further verify that the message ended in a legitimate way.  For
-  // example, this verifies that parsing did not end on an end-group tag.
-  // It also checks for some cases where, due to optimizations,
-  // MergeFromCodedStream() can incorrectly return true.
-  bool ConsumedEntireMessage();
-  void SetConsumed() { legitimate_message_end_ = true; }
-
-  // Limits ----------------------------------------------------------
-  // Limits are used when parsing length-delimited embedded messages.
-  // After the message's length is read, PushLimit() is used to prevent
-  // the CodedInputStream from reading beyond that length.  Once the
-  // embedded message has been parsed, PopLimit() is called to undo the
-  // limit.
-
-  // Opaque type used with PushLimit() and PopLimit().  Do not modify
-  // values of this type yourself.  The only reason that this isn't a
-  // struct with private internals is for efficiency.
-  typedef int Limit;
-
-  // Places a limit on the number of bytes that the stream may read,
-  // starting from the current position.  Once the stream hits this limit,
-  // it will act like the end of the input has been reached until PopLimit()
-  // is called.
-  //
-  // As the names imply, the stream conceptually has a stack of limits.  The
-  // shortest limit on the stack is always enforced, even if it is not the
-  // top limit.
-  //
-  // The value returned by PushLimit() is opaque to the caller, and must
-  // be passed unchanged to the corresponding call to PopLimit().
-  Limit PushLimit(int byte_limit);
-
-  // Pops the last limit pushed by PushLimit().  The input must be the value
-  // returned by that call to PushLimit().
-  void PopLimit(Limit limit);
-
-  // Returns the number of bytes left until the nearest limit on the
-  // stack is hit, or -1 if no limits are in place.
-  int BytesUntilLimit() const;
-
-  // Returns current position relative to the beginning of the input stream.
-  int CurrentPosition() const;
-
-  // Total Bytes Limit -----------------------------------------------
-  // To prevent malicious users from sending excessively large messages
-  // and causing memory exhaustion, CodedInputStream imposes a hard limit on
-  // the total number of bytes it will read.
-
-  // Sets the maximum number of bytes that this CodedInputStream will read
-  // before refusing to continue.  To prevent servers from allocating enormous
-  // amounts of memory to hold parsed messages, the maximum message length
-  // should be limited to the shortest length that will not harm usability.
-  // The default limit is INT_MAX (~2GB) and apps should set shorter limits
-  // if possible. An error will always be printed to stderr if the limit is
-  // reached.
-  //
-  // Note: setting a limit less than the current read position is interpreted
-  // as a limit on the current position.
-  //
-  // This is unrelated to PushLimit()/PopLimit().
-  void SetTotalBytesLimit(int total_bytes_limit);
-
-  // The Total Bytes Limit minus the Current Position, or -1 if the total bytes
-  // limit is INT_MAX.
-  int BytesUntilTotalBytesLimit() const;
-
-  // Recursion Limit -------------------------------------------------
-  // To prevent corrupt or malicious messages from causing stack overflows,
-  // we must keep track of the depth of recursion when parsing embedded
-  // messages and groups.  CodedInputStream keeps track of this because it
-  // is the only object that is passed down the stack during parsing.
-
-  // Sets the maximum recursion depth.  The default is 100.
-  void SetRecursionLimit(int limit);
-  int RecursionBudget() { return recursion_budget_; }
-
-  static int GetDefaultRecursionLimit() { return default_recursion_limit_; }
-
-  // Increments the current recursion depth.  Returns true if the depth is
-  // under the limit, false if it has gone over.
-  bool IncrementRecursionDepth();
-
-  // Decrements the recursion depth if possible.
-  void DecrementRecursionDepth();
-
-  // Decrements the recursion depth blindly.  This is faster than
-  // DecrementRecursionDepth().  It should be used only if all previous
-  // increments to recursion depth were successful.
-  void UnsafeDecrementRecursionDepth();
-
-  // Shorthand for make_pair(PushLimit(byte_limit), --recursion_budget_).
-  // Using this can reduce code size and complexity in some cases.  The caller
-  // is expected to check that the second part of the result is non-negative (to
-  // bail out if the depth of recursion is too high) and, if all is well, to
-  // later pass the first part of the result to PopLimit() or similar.
-  std::pair<CodedInputStream::Limit, int> IncrementRecursionDepthAndPushLimit(
-      int byte_limit);
-
-  // Shorthand for PushLimit(ReadVarint32(&length) ? length : 0).
-  Limit ReadLengthAndPushLimit();
-
-  // Helper that is equivalent to: {
-  //  bool result = ConsumedEntireMessage();
-  //  PopLimit(limit);
-  //  UnsafeDecrementRecursionDepth();
-  //  return result; }
-  // Using this can reduce code size and complexity in some cases.
-  // Do not use unless the current recursion depth is greater than zero.
-  bool DecrementRecursionDepthAndPopLimit(Limit limit);
-
-  // Helper that is equivalent to: {
-  //  bool result = ConsumedEntireMessage();
-  //  PopLimit(limit);
-  //  return result; }
-  // Using this can reduce code size and complexity in some cases.
-  bool CheckEntireMessageConsumedAndPopLimit(Limit limit);
-
-  // Extension Registry ----------------------------------------------
-  // ADVANCED USAGE:  99.9% of people can ignore this section.
-  //
-  // By default, when parsing extensions, the parser looks for extension
-  // definitions in the pool which owns the outer message's Descriptor.
-  // However, you may call SetExtensionRegistry() to provide an alternative
-  // pool instead.  This makes it possible, for example, to parse a message
-  // using a generated class, but represent some extensions using
-  // DynamicMessage.
-
-  // Set the pool used to look up extensions.  Most users do not need to call
-  // this as the correct pool will be chosen automatically.
-  //
-  // WARNING:  It is very easy to misuse this.  Carefully read the requirements
-  //   below.  Do not use this unless you are sure you need it.  Almost no one
-  //   does.
-  //
-  // Let's say you are parsing a message into message object m, and you want
-  // to take advantage of SetExtensionRegistry().  You must follow these
-  // requirements:
-  //
-  // The given DescriptorPool must contain m->GetDescriptor().  It is not
-  // sufficient for it to simply contain a descriptor that has the same name
-  // and content -- it must be the *exact object*.  In other words:
-  //   assert(pool->FindMessageTypeByName(m->GetDescriptor()->full_name()) ==
-  //          m->GetDescriptor());
-  // There are two ways to satisfy this requirement:
-  // 1) Use m->GetDescriptor()->pool() as the pool.  This is generally useless
-  //    because this is the pool that would be used anyway if you didn't call
-  //    SetExtensionRegistry() at all.
-  // 2) Use a DescriptorPool which has m->GetDescriptor()->pool() as an
-  //    "underlay".  Read the documentation for DescriptorPool for more
-  //    information about underlays.
-  //
-  // You must also provide a MessageFactory.  This factory will be used to
-  // construct Message objects representing extensions.  The factory's
-  // GetPrototype() MUST return non-NULL for any Descriptor which can be found
-  // through the provided pool.
-  //
-  // If the provided factory might return instances of protocol-compiler-
-  // generated (i.e. compiled-in) types, or if the outer message object m is
-  // a generated type, then the given factory MUST have this property:  If
-  // GetPrototype() is given a Descriptor which resides in
-  // DescriptorPool::generated_pool(), the factory MUST return the same
-  // prototype which MessageFactory::generated_factory() would return.  That
-  // is, given a descriptor for a generated type, the factory must return an
-  // instance of the generated class (NOT DynamicMessage).  However, when
-  // given a descriptor for a type that is NOT in generated_pool, the factory
-  // is free to return any implementation.
-  //
-  // The reason for this requirement is that generated sub-objects may be
-  // accessed via the standard (non-reflection) extension accessor methods,
-  // and these methods will down-cast the object to the generated class type.
-  // If the object is not actually of that type, the results would be undefined.
-  // On the other hand, if an extension is not compiled in, then there is no
-  // way the code could end up accessing it via the standard accessors -- the
-  // only way to access the extension is via reflection.  When using reflection,
-  // DynamicMessage and generated messages are indistinguishable, so it's fine
-  // if these objects are represented using DynamicMessage.
-  //
-  // Using DynamicMessageFactory on which you have called
-  // SetDelegateToGeneratedFactory(true) should be sufficient to satisfy the
-  // above requirement.
-  //
-  // If either pool or factory is NULL, both must be NULL.
-  //
-  // Note that this feature is ignored when parsing "lite" messages as they do
-  // not have descriptors.
-  void SetExtensionRegistry(const DescriptorPool* pool,
-                            MessageFactory* factory);
-
-  // Get the DescriptorPool set via SetExtensionRegistry(), or NULL if no pool
-  // has been provided.
-  const DescriptorPool* GetExtensionPool();
-
-  // Get the MessageFactory set via SetExtensionRegistry(), or NULL if no
-  // factory has been provided.
-  MessageFactory* GetExtensionFactory();
-
- private:
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(CodedInputStream);
-
-  const uint8_t* buffer_;
-  const uint8_t* buffer_end_;  // pointer to the end of the buffer.
-  ZeroCopyInputStream* input_;
-  int total_bytes_read_;  // total bytes read from input_, including
-                          // the current buffer
-
-  // If total_bytes_read_ surpasses INT_MAX, we record the extra bytes here
-  // so that we can BackUp() on destruction.
-  int overflow_bytes_;
-
-  // LastTagWas() stuff.
-  uint32_t last_tag_;  // result of last ReadTag() or ReadTagWithCutoff().
-
-  // This is set true by ReadTag{Fallback/Slow}() if it is called when exactly
-  // at EOF, or by ExpectAtEnd() when it returns true.  This happens when we
-  // reach the end of a message and attempt to read another tag.
-  bool legitimate_message_end_;
-
-  // See EnableAliasing().
-  bool aliasing_enabled_;
-
-  // Limits
-  Limit current_limit_;  // if position = -1, no limit is applied
-
-  // For simplicity, if the current buffer crosses a limit (either a normal
-  // limit created by PushLimit() or the total bytes limit), buffer_size_
-  // only tracks the number of bytes before that limit.  This field
-  // contains the number of bytes after it.  Note that this implies that if
-  // buffer_size_ == 0 and buffer_size_after_limit_ > 0, we know we've
-  // hit a limit.  However, if both are zero, it doesn't necessarily mean
-  // we aren't at a limit -- the buffer may have ended exactly at the limit.
-  int buffer_size_after_limit_;
-
-  // Maximum number of bytes to read, period.  This is unrelated to
-  // current_limit_.  Set using SetTotalBytesLimit().
-  int total_bytes_limit_;
-
-  // Current recursion budget, controlled by IncrementRecursionDepth() and
-  // similar.  Starts at recursion_limit_ and goes down: if this reaches
-  // -1 we are over budget.
-  int recursion_budget_;
-  // Recursion depth limit, set by SetRecursionLimit().
-  int recursion_limit_;
-
-  // See SetExtensionRegistry().
-  const DescriptorPool* extension_pool_;
-  MessageFactory* extension_factory_;
-
-  // Private member functions.
-
-  // Fallback when Skip() goes past the end of the current buffer.
-  bool SkipFallback(int count, int original_buffer_size);
-
-  // Advance the buffer by a given number of bytes.
-  void Advance(int amount);
-
-  // Back up input_ to the current buffer position.
-  void BackUpInputToCurrentPosition();
-
-  // Recomputes the value of buffer_size_after_limit_.  Must be called after
-  // current_limit_ or total_bytes_limit_ changes.
-  void RecomputeBufferLimits();
-
-  // Writes an error message saying that we hit total_bytes_limit_.
-  void PrintTotalBytesLimitError();
-
-  // Called when the buffer runs out to request more data.  Implies an
-  // Advance(BufferSize()).
-  bool Refresh();
-
-  // When parsing varints, we optimize for the common case of small values, and
-  // then optimize for the case when the varint fits within the current buffer
-  // piece. The Fallback method is used when we can't use the one-byte
-  // optimization. The Slow method is yet another fallback when the buffer is
-  // not large enough. Making the slow path out-of-line speeds up the common
-  // case by 10-15%. The slow path is fairly uncommon: it only triggers when a
-  // message crosses multiple buffers.  Note: ReadVarint32Fallback() and
-  // ReadVarint64Fallback() are called frequently and generally not inlined, so
-  // they have been optimized to avoid "out" parameters.  The former returns -1
-  // if it fails and the uint32_t it read otherwise.  The latter has a bool
-  // indicating success or failure as part of its return type.
-  int64_t ReadVarint32Fallback(uint32_t first_byte_or_zero);
-  int ReadVarintSizeAsIntFallback();
-  std::pair<uint64_t, bool> ReadVarint64Fallback();
-  bool ReadVarint32Slow(uint32_t* value);
-  bool ReadVarint64Slow(uint64_t* value);
-  int ReadVarintSizeAsIntSlow();
-  bool ReadLittleEndian32Fallback(uint32_t* value);
-  bool ReadLittleEndian64Fallback(uint64_t* value);
-
-  // Fallback/slow methods for reading tags. These do not update last_tag_,
-  // but will set legitimate_message_end_ if we are at the end of the input
-  // stream.
-  uint32_t ReadTagFallback(uint32_t first_byte_or_zero);
-  uint32_t ReadTagSlow();
-  bool ReadStringFallback(std::string* buffer, int size);
-
-  // Return the size of the buffer.
-  int BufferSize() const;
-
-  static const int kDefaultTotalBytesLimit = INT_MAX;
-
-  static int default_recursion_limit_;  // 100 by default.
-
-  friend class google::protobuf::ZeroCopyCodedInputStream;
-  friend class google::protobuf::internal::EpsCopyByteStream;
-};
-
-// EpsCopyOutputStream wraps a ZeroCopyOutputStream and exposes a new stream,
-// which has the property you can write kSlopBytes (16 bytes) from the current
-// position without bounds checks. The cursor into the stream is managed by
-// the user of the class and is an explicit parameter in the methods. Careful
-// use of this class, ie. keep ptr a local variable, eliminates the need to
-// for the compiler to sync the ptr value between register and memory.
-class PROTOBUF_EXPORT EpsCopyOutputStream {
- public:
-  enum { kSlopBytes = 16 };
-
-  // Initialize from a stream.
-  EpsCopyOutputStream(ZeroCopyOutputStream* stream, bool deterministic,
-                      uint8_t** pp)
-      : end_(buffer_),
-        stream_(stream),
-        is_serialization_deterministic_(deterministic) {
-    *pp = buffer_;
-  }
-
-  // Only for array serialization. No overflow protection, end_ will be the
-  // pointed to the end of the array. When using this the total size is already
-  // known, so no need to maintain the slop region.
-  EpsCopyOutputStream(void* data, int size, bool deterministic)
-      : end_(static_cast<uint8_t*>(data) + size),
-        buffer_end_(nullptr),
-        stream_(nullptr),
-        is_serialization_deterministic_(deterministic) {}
-
-  // Initialize from stream but with the first buffer already given (eager).
-  EpsCopyOutputStream(void* data, int size, ZeroCopyOutputStream* stream,
-                      bool deterministic, uint8_t** pp)
-      : stream_(stream), is_serialization_deterministic_(deterministic) {
-    *pp = SetInitialBuffer(data, size);
-  }
-
-  // Flush everything that's written into the underlying ZeroCopyOutputStream
-  // and trims the underlying stream to the location of ptr.
-  uint8_t* Trim(uint8_t* ptr);
-
-  // After this it's guaranteed you can safely write kSlopBytes to ptr. This
-  // will never fail! The underlying stream can produce an error. Use HadError
-  // to check for errors.
-  PROTOBUF_NODISCARD uint8_t* EnsureSpace(uint8_t* ptr) {
-    if (PROTOBUF_PREDICT_FALSE(ptr >= end_)) {
-      return EnsureSpaceFallback(ptr);
-    }
-    return ptr;
-  }
-
-  uint8_t* WriteRaw(const void* data, int size, uint8_t* ptr) {
-    if (PROTOBUF_PREDICT_FALSE(end_ - ptr < size)) {
-      return WriteRawFallback(data, size, ptr);
-    }
-    std::memcpy(ptr, data, size);
-    return ptr + size;
-  }
-  // Writes the buffer specified by data, size to the stream. Possibly by
-  // aliasing the buffer (ie. not copying the data). The caller is responsible
-  // to make sure the buffer is alive for the duration of the
-  // ZeroCopyOutputStream.
-#ifndef NDEBUG
-  PROTOBUF_NOINLINE
-#endif
-  uint8_t* WriteRawMaybeAliased(const void* data, int size, uint8_t* ptr) {
-    if (aliasing_enabled_) {
-      return WriteAliasedRaw(data, size, ptr);
-    } else {
-      return WriteRaw(data, size, ptr);
-    }
-  }
-
-
-#ifndef NDEBUG
-  PROTOBUF_NOINLINE
-#endif
-  uint8_t* WriteStringMaybeAliased(uint32_t num, const std::string& s,
-                                   uint8_t* ptr) {
-    std::ptrdiff_t size = s.size();
-    if (PROTOBUF_PREDICT_FALSE(
-            size >= 128 || end_ - ptr + 16 - TagSize(num << 3) - 1 < size)) {
-      return WriteStringMaybeAliasedOutline(num, s, ptr);
-    }
-    ptr = UnsafeVarint((num << 3) | 2, ptr);
-    *ptr++ = static_cast<uint8_t>(size);
-    std::memcpy(ptr, s.data(), size);
-    return ptr + size;
-  }
-  uint8_t* WriteBytesMaybeAliased(uint32_t num, const std::string& s,
-                                  uint8_t* ptr) {
-    return WriteStringMaybeAliased(num, s, ptr);
-  }
-
-  template <typename T>
-  PROTOBUF_ALWAYS_INLINE uint8_t* WriteString(uint32_t num, const T& s,
-                                              uint8_t* ptr) {
-    std::ptrdiff_t size = s.size();
-    if (PROTOBUF_PREDICT_FALSE(
-            size >= 128 || end_ - ptr + 16 - TagSize(num << 3) - 1 < size)) {
-      return WriteStringOutline(num, s, ptr);
-    }
-    ptr = UnsafeVarint((num << 3) | 2, ptr);
-    *ptr++ = static_cast<uint8_t>(size);
-    std::memcpy(ptr, s.data(), size);
-    return ptr + size;
-  }
-  template <typename T>
-#ifndef NDEBUG
-  PROTOBUF_NOINLINE
-#endif
-  uint8_t* WriteBytes(uint32_t num, const T& s, uint8_t* ptr) {
-    return WriteString(num, s, ptr);
-  }
-
-  template <typename T>
-  PROTOBUF_ALWAYS_INLINE uint8_t* WriteInt32Packed(int num, const T& r,
-                                                   int size, uint8_t* ptr) {
-    return WriteVarintPacked(num, r, size, ptr, Encode64);
-  }
-  template <typename T>
-  PROTOBUF_ALWAYS_INLINE uint8_t* WriteUInt32Packed(int num, const T& r,
-                                                    int size, uint8_t* ptr) {
-    return WriteVarintPacked(num, r, size, ptr, Encode32);
-  }
-  template <typename T>
-  PROTOBUF_ALWAYS_INLINE uint8_t* WriteSInt32Packed(int num, const T& r,
-                                                    int size, uint8_t* ptr) {
-    return WriteVarintPacked(num, r, size, ptr, ZigZagEncode32);
-  }
-  template <typename T>
-  PROTOBUF_ALWAYS_INLINE uint8_t* WriteInt64Packed(int num, const T& r,
-                                                   int size, uint8_t* ptr) {
-    return WriteVarintPacked(num, r, size, ptr, Encode64);
-  }
-  template <typename T>
-  PROTOBUF_ALWAYS_INLINE uint8_t* WriteUInt64Packed(int num, const T& r,
-                                                    int size, uint8_t* ptr) {
-    return WriteVarintPacked(num, r, size, ptr, Encode64);
-  }
-  template <typename T>
-  PROTOBUF_ALWAYS_INLINE uint8_t* WriteSInt64Packed(int num, const T& r,
-                                                    int size, uint8_t* ptr) {
-    return WriteVarintPacked(num, r, size, ptr, ZigZagEncode64);
-  }
-  template <typename T>
-  PROTOBUF_ALWAYS_INLINE uint8_t* WriteEnumPacked(int num, const T& r, int size,
-                                                  uint8_t* ptr) {
-    return WriteVarintPacked(num, r, size, ptr, Encode64);
-  }
-
-  template <typename T>
-  PROTOBUF_ALWAYS_INLINE uint8_t* WriteFixedPacked(int num, const T& r,
-                                                   uint8_t* ptr) {
-    ptr = EnsureSpace(ptr);
-    constexpr auto element_size = sizeof(typename T::value_type);
-    auto size = r.size() * element_size;
-    ptr = WriteLengthDelim(num, size, ptr);
-    return WriteRawLittleEndian<element_size>(r.data(), static_cast<int>(size),
-                                              ptr);
-  }
-
-  // Returns true if there was an underlying I/O error since this object was
-  // created.
-  bool HadError() const { return had_error_; }
-
-  // Instructs the EpsCopyOutputStream to allow the underlying
-  // ZeroCopyOutputStream to hold pointers to the original structure instead of
-  // copying, if it supports it (i.e. output->AllowsAliasing() is true).  If the
-  // underlying stream does not support aliasing, then enabling it has no
-  // affect.  For now, this only affects the behavior of
-  // WriteRawMaybeAliased().
-  //
-  // NOTE: It is caller's responsibility to ensure that the chunk of memory
-  // remains live until all of the data has been consumed from the stream.
-  void EnableAliasing(bool enabled);
-
-  // See documentation on CodedOutputStream::SetSerializationDeterministic.
-  void SetSerializationDeterministic(bool value) {
-    is_serialization_deterministic_ = value;
-  }
-
-  // See documentation on CodedOutputStream::IsSerializationDeterministic.
-  bool IsSerializationDeterministic() const {
-    return is_serialization_deterministic_;
-  }
-
-  // The number of bytes written to the stream at position ptr, relative to the
-  // stream's overall position.
-  int64_t ByteCount(uint8_t* ptr) const;
-
-
- private:
-  uint8_t* end_;
-  uint8_t* buffer_end_ = buffer_;
-  uint8_t buffer_[2 * kSlopBytes];
-  ZeroCopyOutputStream* stream_;
-  bool had_error_ = false;
-  bool aliasing_enabled_ = false;  // See EnableAliasing().
-  bool is_serialization_deterministic_;
-  bool skip_check_consistency = false;
-
-  uint8_t* EnsureSpaceFallback(uint8_t* ptr);
-  inline uint8_t* Next();
-  int Flush(uint8_t* ptr);
-  std::ptrdiff_t GetSize(uint8_t* ptr) const {
-    GOOGLE_DCHECK(ptr <= end_ + kSlopBytes);  // NOLINT
-    return end_ + kSlopBytes - ptr;
-  }
-
-  uint8_t* Error() {
-    had_error_ = true;
-    // We use the patch buffer to always guarantee space to write to.
-    end_ = buffer_ + kSlopBytes;
-    return buffer_;
-  }
-
-  static constexpr int TagSize(uint32_t tag) {
-    return (tag < (1 << 7))    ? 1
-           : (tag < (1 << 14)) ? 2
-           : (tag < (1 << 21)) ? 3
-           : (tag < (1 << 28)) ? 4
-                               : 5;
-  }
-
-  PROTOBUF_ALWAYS_INLINE uint8_t* WriteTag(uint32_t num, uint32_t wt,
-                                           uint8_t* ptr) {
-    GOOGLE_DCHECK(ptr < end_);  // NOLINT
-    return UnsafeVarint((num << 3) | wt, ptr);
-  }
-
-  PROTOBUF_ALWAYS_INLINE uint8_t* WriteLengthDelim(int num, uint32_t size,
-                                                   uint8_t* ptr) {
-    ptr = WriteTag(num, 2, ptr);
-    return UnsafeWriteSize(size, ptr);
-  }
-
-  uint8_t* WriteRawFallback(const void* data, int size, uint8_t* ptr);
-
-  uint8_t* WriteAliasedRaw(const void* data, int size, uint8_t* ptr);
-
-  uint8_t* WriteStringMaybeAliasedOutline(uint32_t num, const std::string& s,
-                                          uint8_t* ptr);
-  uint8_t* WriteStringOutline(uint32_t num, const std::string& s, uint8_t* ptr);
-
-  template <typename T, typename E>
-  PROTOBUF_ALWAYS_INLINE uint8_t* WriteVarintPacked(int num, const T& r,
-                                                    int size, uint8_t* ptr,
-                                                    const E& encode) {
-    ptr = EnsureSpace(ptr);
-    ptr = WriteLengthDelim(num, size, ptr);
-    auto it = r.data();
-    auto end = it + r.size();
-    do {
-      ptr = EnsureSpace(ptr);
-      ptr = UnsafeVarint(encode(*it++), ptr);
-    } while (it < end);
-    return ptr;
-  }
-
-  static uint32_t Encode32(uint32_t v) { return v; }
-  static uint64_t Encode64(uint64_t v) { return v; }
-  static uint32_t ZigZagEncode32(int32_t v) {
-    return (static_cast<uint32_t>(v) << 1) ^ static_cast<uint32_t>(v >> 31);
-  }
-  static uint64_t ZigZagEncode64(int64_t v) {
-    return (static_cast<uint64_t>(v) << 1) ^ static_cast<uint64_t>(v >> 63);
-  }
-
-  template <typename T>
-  PROTOBUF_ALWAYS_INLINE static uint8_t* UnsafeVarint(T value, uint8_t* ptr) {
-    static_assert(std::is_unsigned<T>::value,
-                  "Varint serialization must be unsigned");
-    ptr[0] = static_cast<uint8_t>(value);
-    if (value < 0x80) {
-      return ptr + 1;
-    }
-    // Turn on continuation bit in the byte we just wrote.
-    ptr[0] |= static_cast<uint8_t>(0x80);
-    value >>= 7;
-    ptr[1] = static_cast<uint8_t>(value);
-    if (value < 0x80) {
-      return ptr + 2;
-    }
-    ptr += 2;
-    do {
-      // Turn on continuation bit in the byte we just wrote.
-      ptr[-1] |= static_cast<uint8_t>(0x80);
-      value >>= 7;
-      *ptr = static_cast<uint8_t>(value);
-      ++ptr;
-    } while (value >= 0x80);
-    return ptr;
-  }
-
-  PROTOBUF_ALWAYS_INLINE static uint8_t* UnsafeWriteSize(uint32_t value,
-                                                         uint8_t* ptr) {
-    while (PROTOBUF_PREDICT_FALSE(value >= 0x80)) {
-      *ptr = static_cast<uint8_t>(value | 0x80);
-      value >>= 7;
-      ++ptr;
-    }
-    *ptr++ = static_cast<uint8_t>(value);
-    return ptr;
-  }
-
-  template <int S>
-  uint8_t* WriteRawLittleEndian(const void* data, int size, uint8_t* ptr);
-#if !defined(PROTOBUF_LITTLE_ENDIAN) || \
-    defined(PROTOBUF_DISABLE_LITTLE_ENDIAN_OPT_FOR_TEST)
-  uint8_t* WriteRawLittleEndian32(const void* data, int size, uint8_t* ptr);
-  uint8_t* WriteRawLittleEndian64(const void* data, int size, uint8_t* ptr);
-#endif
-
-  // These methods are for CodedOutputStream. Ideally they should be private
-  // but to match current behavior of CodedOutputStream as close as possible
-  // we allow it some functionality.
- public:
-  uint8_t* SetInitialBuffer(void* data, int size) {
-    auto ptr = static_cast<uint8_t*>(data);
-    if (size > kSlopBytes) {
-      end_ = ptr + size - kSlopBytes;
-      buffer_end_ = nullptr;
-      return ptr;
-    } else {
-      end_ = buffer_ + size;
-      buffer_end_ = ptr;
-      return buffer_;
-    }
-  }
-
- private:
-  // Needed by CodedOutputStream HadError. HadError needs to flush the patch
-  // buffers to ensure there is no error as of yet.
-  uint8_t* FlushAndResetBuffer(uint8_t*);
-
-  // The following functions mimic the old CodedOutputStream behavior as close
-  // as possible. They flush the current state to the stream, behave as
-  // the old CodedOutputStream and then return to normal operation.
-  bool Skip(int count, uint8_t** pp);
-  bool GetDirectBufferPointer(void** data, int* size, uint8_t** pp);
-  uint8_t* GetDirectBufferForNBytesAndAdvance(int size, uint8_t** pp);
-
-  friend class CodedOutputStream;
-};
-
-template <>
-inline uint8_t* EpsCopyOutputStream::WriteRawLittleEndian<1>(const void* data,
-                                                             int size,
-                                                             uint8_t* ptr) {
-  return WriteRaw(data, size, ptr);
-}
-template <>
-inline uint8_t* EpsCopyOutputStream::WriteRawLittleEndian<4>(const void* data,
-                                                             int size,
-                                                             uint8_t* ptr) {
-#if defined(PROTOBUF_LITTLE_ENDIAN) && \
-    !defined(PROTOBUF_DISABLE_LITTLE_ENDIAN_OPT_FOR_TEST)
-  return WriteRaw(data, size, ptr);
-#else
-  return WriteRawLittleEndian32(data, size, ptr);
-#endif
-}
-template <>
-inline uint8_t* EpsCopyOutputStream::WriteRawLittleEndian<8>(const void* data,
-                                                             int size,
-                                                             uint8_t* ptr) {
-#if defined(PROTOBUF_LITTLE_ENDIAN) && \
-    !defined(PROTOBUF_DISABLE_LITTLE_ENDIAN_OPT_FOR_TEST)
-  return WriteRaw(data, size, ptr);
-#else
-  return WriteRawLittleEndian64(data, size, ptr);
-#endif
-}
-
-// Class which encodes and writes binary data which is composed of varint-
-// encoded integers and fixed-width pieces.  Wraps a ZeroCopyOutputStream.
-// Most users will not need to deal with CodedOutputStream.
-//
-// Most methods of CodedOutputStream which return a bool return false if an
-// underlying I/O error occurs.  Once such a failure occurs, the
-// CodedOutputStream is broken and is no longer useful. The Write* methods do
-// not return the stream status, but will invalidate the stream if an error
-// occurs. The client can probe HadError() to determine the status.
-//
-// Note that every method of CodedOutputStream which writes some data has
-// a corresponding static "ToArray" version. These versions write directly
-// to the provided buffer, returning a pointer past the last written byte.
-// They require that the buffer has sufficient capacity for the encoded data.
-// This allows an optimization where we check if an output stream has enough
-// space for an entire message before we start writing and, if there is, we
-// call only the ToArray methods to avoid doing bound checks for each
-// individual value.
-// i.e., in the example above:
-//
-//   CodedOutputStream* coded_output = new CodedOutputStream(raw_output);
-//   int magic_number = 1234;
-//   char text[] = "Hello world!";
-//
-//   int coded_size = sizeof(magic_number) +
-//                    CodedOutputStream::VarintSize32(strlen(text)) +
-//                    strlen(text);
-//
-//   uint8_t* buffer =
-//       coded_output->GetDirectBufferForNBytesAndAdvance(coded_size);
-//   if (buffer != nullptr) {
-//     // The output stream has enough space in the buffer: write directly to
-//     // the array.
-//     buffer = CodedOutputStream::WriteLittleEndian32ToArray(magic_number,
-//                                                            buffer);
-//     buffer = CodedOutputStream::WriteVarint32ToArray(strlen(text), buffer);
-//     buffer = CodedOutputStream::WriteRawToArray(text, strlen(text), buffer);
-//   } else {
-//     // Make bound-checked writes, which will ask the underlying stream for
-//     // more space as needed.
-//     coded_output->WriteLittleEndian32(magic_number);
-//     coded_output->WriteVarint32(strlen(text));
-//     coded_output->WriteRaw(text, strlen(text));
-//   }
-//
-//   delete coded_output;
-class PROTOBUF_EXPORT CodedOutputStream {
- public:
-  // Creates a CodedOutputStream that writes to the given `stream`.
-  // The provided stream must publicly derive from `ZeroCopyOutputStream`.
-  template <class Stream, class = typename std::enable_if<std::is_base_of<
-                              ZeroCopyOutputStream, Stream>::value>::type>
-  explicit CodedOutputStream(Stream* stream);
-
-  // Creates a CodedOutputStream that writes to the given `stream`, and does
-  // an 'eager initialization' of the internal state if `eager_init` is true.
-  // The provided stream must publicly derive from `ZeroCopyOutputStream`.
-  template <class Stream, class = typename std::enable_if<std::is_base_of<
-                              ZeroCopyOutputStream, Stream>::value>::type>
-  CodedOutputStream(Stream* stream, bool eager_init);
-
-  // Destroy the CodedOutputStream and position the underlying
-  // ZeroCopyOutputStream immediately after the last byte written.
-  ~CodedOutputStream();
-
-  // Returns true if there was an underlying I/O error since this object was
-  // created. On should call Trim before this function in order to catch all
-  // errors.
-  bool HadError() {
-    cur_ = impl_.FlushAndResetBuffer(cur_);
-    GOOGLE_DCHECK(cur_);
-    return impl_.HadError();
-  }
-
-  // Trims any unused space in the underlying buffer so that its size matches
-  // the number of bytes written by this stream. The underlying buffer will
-  // automatically be trimmed when this stream is destroyed; this call is only
-  // necessary if the underlying buffer is accessed *before* the stream is
-  // destroyed.
-  void Trim() { cur_ = impl_.Trim(cur_); }
-
-  // Skips a number of bytes, leaving the bytes unmodified in the underlying
-  // buffer.  Returns false if an underlying write error occurs.  This is
-  // mainly useful with GetDirectBufferPointer().
-  // Note of caution, the skipped bytes may contain uninitialized data. The
-  // caller must make sure that the skipped bytes are properly initialized,
-  // otherwise you might leak bytes from your heap.
-  bool Skip(int count) { return impl_.Skip(count, &cur_); }
-
-  // Sets *data to point directly at the unwritten part of the
-  // CodedOutputStream's underlying buffer, and *size to the size of that
-  // buffer, but does not advance the stream's current position.  This will
-  // always either produce a non-empty buffer or return false.  If the caller
-  // writes any data to this buffer, it should then call Skip() to skip over
-  // the consumed bytes.  This may be useful for implementing external fast
-  // serialization routines for types of data not covered by the
-  // CodedOutputStream interface.
-  bool GetDirectBufferPointer(void** data, int* size) {
-    return impl_.GetDirectBufferPointer(data, size, &cur_);
-  }
-
-  // If there are at least "size" bytes available in the current buffer,
-  // returns a pointer directly into the buffer and advances over these bytes.
-  // The caller may then write directly into this buffer (e.g. using the
-  // *ToArray static methods) rather than go through CodedOutputStream.  If
-  // there are not enough bytes available, returns NULL.  The return pointer is
-  // invalidated as soon as any other non-const method of CodedOutputStream
-  // is called.
-  inline uint8_t* GetDirectBufferForNBytesAndAdvance(int size) {
-    return impl_.GetDirectBufferForNBytesAndAdvance(size, &cur_);
-  }
-
-  // Write raw bytes, copying them from the given buffer.
-  void WriteRaw(const void* buffer, int size) {
-    cur_ = impl_.WriteRaw(buffer, size, cur_);
-  }
-  // Like WriteRaw()  but will try to write aliased data if aliasing is
-  // turned on.
-  void WriteRawMaybeAliased(const void* data, int size);
-  // Like WriteRaw()  but writing directly to the target array.
-  // This is _not_ inlined, as the compiler often optimizes memcpy into inline
-  // copy loops. Since this gets called by every field with string or bytes
-  // type, inlining may lead to a significant amount of code bloat, with only a
-  // minor performance gain.
-  static uint8_t* WriteRawToArray(const void* buffer, int size,
-                                  uint8_t* target);
-
-  // Equivalent to WriteRaw(str.data(), str.size()).
-  void WriteString(const std::string& str);
-  // Like WriteString()  but writing directly to the target array.
-  static uint8_t* WriteStringToArray(const std::string& str, uint8_t* target);
-  // Write the varint-encoded size of str followed by str.
-  static uint8_t* WriteStringWithSizeToArray(const std::string& str,
-                                             uint8_t* target);
-
-
-  // Write a 32-bit little-endian integer.
-  void WriteLittleEndian32(uint32_t value) {
-    cur_ = impl_.EnsureSpace(cur_);
-    SetCur(WriteLittleEndian32ToArray(value, Cur()));
-  }
-  // Like WriteLittleEndian32()  but writing directly to the target array.
-  static uint8_t* WriteLittleEndian32ToArray(uint32_t value, uint8_t* target);
-  // Write a 64-bit little-endian integer.
-  void WriteLittleEndian64(uint64_t value) {
-    cur_ = impl_.EnsureSpace(cur_);
-    SetCur(WriteLittleEndian64ToArray(value, Cur()));
-  }
-  // Like WriteLittleEndian64()  but writing directly to the target array.
-  static uint8_t* WriteLittleEndian64ToArray(uint64_t value, uint8_t* target);
-
-  // Write an unsigned integer with Varint encoding.  Writing a 32-bit value
-  // is equivalent to casting it to uint64_t and writing it as a 64-bit value,
-  // but may be more efficient.
-  void WriteVarint32(uint32_t value);
-  // Like WriteVarint32()  but writing directly to the target array.
-  static uint8_t* WriteVarint32ToArray(uint32_t value, uint8_t* target);
-  // Like WriteVarint32()  but writing directly to the target array, and with
-  // the less common-case paths being out of line rather than inlined.
-  static uint8_t* WriteVarint32ToArrayOutOfLine(uint32_t value,
-                                                uint8_t* target);
-  // Write an unsigned integer with Varint encoding.
-  void WriteVarint64(uint64_t value);
-  // Like WriteVarint64()  but writing directly to the target array.
-  static uint8_t* WriteVarint64ToArray(uint64_t value, uint8_t* target);
-
-  // Equivalent to WriteVarint32() except when the value is negative,
-  // in which case it must be sign-extended to a full 10 bytes.
-  void WriteVarint32SignExtended(int32_t value);
-  // Like WriteVarint32SignExtended()  but writing directly to the target array.
-  static uint8_t* WriteVarint32SignExtendedToArray(int32_t value,
-                                                   uint8_t* target);
-
-  // This is identical to WriteVarint32(), but optimized for writing tags.
-  // In particular, if the input is a compile-time constant, this method
-  // compiles down to a couple instructions.
-  // Always inline because otherwise the aforementioned optimization can't work,
-  // but GCC by default doesn't want to inline this.
-  void WriteTag(uint32_t value);
-  // Like WriteTag()  but writing directly to the target array.
-  PROTOBUF_ALWAYS_INLINE
-  static uint8_t* WriteTagToArray(uint32_t value, uint8_t* target);
-
-  // Returns the number of bytes needed to encode the given value as a varint.
-  static size_t VarintSize32(uint32_t value);
-  // Returns the number of bytes needed to encode the given value as a varint.
-  static size_t VarintSize64(uint64_t value);
-
-  // If negative, 10 bytes.  Otherwise, same as VarintSize32().
-  static size_t VarintSize32SignExtended(int32_t value);
-
-  // Same as above, plus one.  The additional one comes at no compute cost.
-  static size_t VarintSize32PlusOne(uint32_t value);
-  static size_t VarintSize64PlusOne(uint64_t value);
-  static size_t VarintSize32SignExtendedPlusOne(int32_t value);
-
-  // Compile-time equivalent of VarintSize32().
-  template <uint32_t Value>
-  struct StaticVarintSize32 {
-    static const size_t value = (Value < (1 << 7))    ? 1
-                                : (Value < (1 << 14)) ? 2
-                                : (Value < (1 << 21)) ? 3
-                                : (Value < (1 << 28)) ? 4
-                                                      : 5;
-  };
-
-  // Returns the total number of bytes written since this object was created.
-  int ByteCount() const {
-    return static_cast<int>(impl_.ByteCount(cur_) - start_count_);
-  }
-
-  // Instructs the CodedOutputStream to allow the underlying
-  // ZeroCopyOutputStream to hold pointers to the original structure instead of
-  // copying, if it supports it (i.e. output->AllowsAliasing() is true).  If the
-  // underlying stream does not support aliasing, then enabling it has no
-  // affect.  For now, this only affects the behavior of
-  // WriteRawMaybeAliased().
-  //
-  // NOTE: It is caller's responsibility to ensure that the chunk of memory
-  // remains live until all of the data has been consumed from the stream.
-  void EnableAliasing(bool enabled) { impl_.EnableAliasing(enabled); }
-
-  // Indicate to the serializer whether the user wants deterministic
-  // serialization. The default when this is not called comes from the global
-  // default, controlled by SetDefaultSerializationDeterministic.
-  //
-  // What deterministic serialization means is entirely up to the driver of the
-  // serialization process (i.e. the caller of methods like WriteVarint32). In
-  // the case of serializing a proto buffer message using one of the methods of
-  // MessageLite, this means that for a given binary equal messages will always
-  // be serialized to the same bytes. This implies:
-  //
-  //   * Repeated serialization of a message will return the same bytes.
-  //
-  //   * Different processes running the same binary (including on different
-  //     machines) will serialize equal messages to the same bytes.
-  //
-  // Note that this is *not* canonical across languages. It is also unstable
-  // across different builds with intervening message definition changes, due to
-  // unknown fields. Users who need canonical serialization (e.g. persistent
-  // storage in a canonical form, fingerprinting) should define their own
-  // canonicalization specification and implement the serializer using
-  // reflection APIs rather than relying on this API.
-  void SetSerializationDeterministic(bool value) {
-    impl_.SetSerializationDeterministic(value);
-  }
-
-  // Return whether the user wants deterministic serialization. See above.
-  bool IsSerializationDeterministic() const {
-    return impl_.IsSerializationDeterministic();
-  }
-
-  static bool IsDefaultSerializationDeterministic() {
-    return default_serialization_deterministic_.load(
-               std::memory_order_relaxed) != 0;
-  }
-
-  template <typename Func>
-  void Serialize(const Func& func);
-
-  uint8_t* Cur() const { return cur_; }
-  void SetCur(uint8_t* ptr) { cur_ = ptr; }
-  EpsCopyOutputStream* EpsCopy() { return &impl_; }
-
- private:
-  template <class Stream>
-  void InitEagerly(Stream* stream);
-
-  EpsCopyOutputStream impl_;
-  uint8_t* cur_;
-  int64_t start_count_;
-  static std::atomic<bool> default_serialization_deterministic_;
-
-  // See above.  Other projects may use "friend" to allow them to call this.
-  // After SetDefaultSerializationDeterministic() completes, all protocol
-  // buffer serializations will be deterministic by default.  Thread safe.
-  // However, the meaning of "after" is subtle here: to be safe, each thread
-  // that wants deterministic serialization by default needs to call
-  // SetDefaultSerializationDeterministic() or ensure on its own that another
-  // thread has done so.
-  friend void internal::MapTestForceDeterministic();
-  static void SetDefaultSerializationDeterministic() {
-    default_serialization_deterministic_.store(true, std::memory_order_relaxed);
-  }
-  // REQUIRES: value >= 0x80, and that (value & 7f) has been written to *target.
-  static uint8_t* WriteVarint32ToArrayOutOfLineHelper(uint32_t value,
-                                                      uint8_t* target);
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(CodedOutputStream);
-};
-
-// inline methods ====================================================
-// The vast majority of varints are only one byte.  These inline
-// methods optimize for that case.
-
-inline bool CodedInputStream::ReadVarint32(uint32_t* value) {
-  uint32_t v = 0;
-  if (PROTOBUF_PREDICT_TRUE(buffer_ < buffer_end_)) {
-    v = *buffer_;
-    if (v < 0x80) {
-      *value = v;
-      Advance(1);
-      return true;
-    }
-  }
-  int64_t result = ReadVarint32Fallback(v);
-  *value = static_cast<uint32_t>(result);
-  return result >= 0;
-}
-
-inline bool CodedInputStream::ReadVarint64(uint64_t* value) {
-  if (PROTOBUF_PREDICT_TRUE(buffer_ < buffer_end_) && *buffer_ < 0x80) {
-    *value = *buffer_;
-    Advance(1);
-    return true;
-  }
-  std::pair<uint64_t, bool> p = ReadVarint64Fallback();
-  *value = p.first;
-  return p.second;
-}
-
-inline bool CodedInputStream::ReadVarintSizeAsInt(int* value) {
-  if (PROTOBUF_PREDICT_TRUE(buffer_ < buffer_end_)) {
-    int v = *buffer_;
-    if (v < 0x80) {
-      *value = v;
-      Advance(1);
-      return true;
-    }
-  }
-  *value = ReadVarintSizeAsIntFallback();
-  return *value >= 0;
-}
-
-// static
-inline const uint8_t* CodedInputStream::ReadLittleEndian32FromArray(
-    const uint8_t* buffer, uint32_t* value) {
-#if defined(PROTOBUF_LITTLE_ENDIAN) && \
-    !defined(PROTOBUF_DISABLE_LITTLE_ENDIAN_OPT_FOR_TEST)
-  memcpy(value, buffer, sizeof(*value));
-  return buffer + sizeof(*value);
-#else
-  *value = (static_cast<uint32_t>(buffer[0])) |
-           (static_cast<uint32_t>(buffer[1]) << 8) |
-           (static_cast<uint32_t>(buffer[2]) << 16) |
-           (static_cast<uint32_t>(buffer[3]) << 24);
-  return buffer + sizeof(*value);
-#endif
-}
-// static
-inline const uint8_t* CodedInputStream::ReadLittleEndian64FromArray(
-    const uint8_t* buffer, uint64_t* value) {
-#if defined(PROTOBUF_LITTLE_ENDIAN) && \
-    !defined(PROTOBUF_DISABLE_LITTLE_ENDIAN_OPT_FOR_TEST)
-  memcpy(value, buffer, sizeof(*value));
-  return buffer + sizeof(*value);
-#else
-  uint32_t part0 = (static_cast<uint32_t>(buffer[0])) |
-                   (static_cast<uint32_t>(buffer[1]) << 8) |
-                   (static_cast<uint32_t>(buffer[2]) << 16) |
-                   (static_cast<uint32_t>(buffer[3]) << 24);
-  uint32_t part1 = (static_cast<uint32_t>(buffer[4])) |
-                   (static_cast<uint32_t>(buffer[5]) << 8) |
-                   (static_cast<uint32_t>(buffer[6]) << 16) |
-                   (static_cast<uint32_t>(buffer[7]) << 24);
-  *value = static_cast<uint64_t>(part0) | (static_cast<uint64_t>(part1) << 32);
-  return buffer + sizeof(*value);
-#endif
-}
-
-inline bool CodedInputStream::ReadLittleEndian32(uint32_t* value) {
-#if defined(PROTOBUF_LITTLE_ENDIAN) && \
-    !defined(PROTOBUF_DISABLE_LITTLE_ENDIAN_OPT_FOR_TEST)
-  if (PROTOBUF_PREDICT_TRUE(BufferSize() >= static_cast<int>(sizeof(*value)))) {
-    buffer_ = ReadLittleEndian32FromArray(buffer_, value);
-    return true;
-  } else {
-    return ReadLittleEndian32Fallback(value);
-  }
-#else
-  return ReadLittleEndian32Fallback(value);
-#endif
-}
-
-inline bool CodedInputStream::ReadLittleEndian64(uint64_t* value) {
-#if defined(PROTOBUF_LITTLE_ENDIAN) && \
-    !defined(PROTOBUF_DISABLE_LITTLE_ENDIAN_OPT_FOR_TEST)
-  if (PROTOBUF_PREDICT_TRUE(BufferSize() >= static_cast<int>(sizeof(*value)))) {
-    buffer_ = ReadLittleEndian64FromArray(buffer_, value);
-    return true;
-  } else {
-    return ReadLittleEndian64Fallback(value);
-  }
-#else
-  return ReadLittleEndian64Fallback(value);
-#endif
-}
-
-inline uint32_t CodedInputStream::ReadTagNoLastTag() {
-  uint32_t v = 0;
-  if (PROTOBUF_PREDICT_TRUE(buffer_ < buffer_end_)) {
-    v = *buffer_;
-    if (v < 0x80) {
-      Advance(1);
-      return v;
-    }
-  }
-  v = ReadTagFallback(v);
-  return v;
-}
-
-inline std::pair<uint32_t, bool> CodedInputStream::ReadTagWithCutoffNoLastTag(
-    uint32_t cutoff) {
-  // In performance-sensitive code we can expect cutoff to be a compile-time
-  // constant, and things like "cutoff >= kMax1ByteVarint" to be evaluated at
-  // compile time.
-  uint32_t first_byte_or_zero = 0;
-  if (PROTOBUF_PREDICT_TRUE(buffer_ < buffer_end_)) {
-    // Hot case: buffer_ non_empty, buffer_[0] in [1, 128).
-    // TODO(gpike): Is it worth rearranging this? E.g., if the number of fields
-    // is large enough then is it better to check for the two-byte case first?
-    first_byte_or_zero = buffer_[0];
-    if (static_cast<int8_t>(buffer_[0]) > 0) {
-      const uint32_t kMax1ByteVarint = 0x7f;
-      uint32_t tag = buffer_[0];
-      Advance(1);
-      return std::make_pair(tag, cutoff >= kMax1ByteVarint || tag <= cutoff);
-    }
-    // Other hot case: cutoff >= 0x80, buffer_ has at least two bytes available,
-    // and tag is two bytes.  The latter is tested by bitwise-and-not of the
-    // first byte and the second byte.
-    if (cutoff >= 0x80 && PROTOBUF_PREDICT_TRUE(buffer_ + 1 < buffer_end_) &&
-        PROTOBUF_PREDICT_TRUE((buffer_[0] & ~buffer_[1]) >= 0x80)) {
-      const uint32_t kMax2ByteVarint = (0x7f << 7) + 0x7f;
-      uint32_t tag = (1u << 7) * buffer_[1] + (buffer_[0] - 0x80);
-      Advance(2);
-      // It might make sense to test for tag == 0 now, but it is so rare that
-      // that we don't bother.  A varint-encoded 0 should be one byte unless
-      // the encoder lost its mind.  The second part of the return value of
-      // this function is allowed to be either true or false if the tag is 0,
-      // so we don't have to check for tag == 0.  We may need to check whether
-      // it exceeds cutoff.
-      bool at_or_below_cutoff = cutoff >= kMax2ByteVarint || tag <= cutoff;
-      return std::make_pair(tag, at_or_below_cutoff);
-    }
-  }
-  // Slow path
-  const uint32_t tag = ReadTagFallback(first_byte_or_zero);
-  return std::make_pair(tag, static_cast<uint32_t>(tag - 1) < cutoff);
-}
-
-inline bool CodedInputStream::LastTagWas(uint32_t expected) {
-  return last_tag_ == expected;
-}
-
-inline bool CodedInputStream::ConsumedEntireMessage() {
-  return legitimate_message_end_;
-}
-
-inline bool CodedInputStream::ExpectTag(uint32_t expected) {
-  if (expected < (1 << 7)) {
-    if (PROTOBUF_PREDICT_TRUE(buffer_ < buffer_end_) &&
-        buffer_[0] == expected) {
-      Advance(1);
-      return true;
-    } else {
-      return false;
-    }
-  } else if (expected < (1 << 14)) {
-    if (PROTOBUF_PREDICT_TRUE(BufferSize() >= 2) &&
-        buffer_[0] == static_cast<uint8_t>(expected | 0x80) &&
-        buffer_[1] == static_cast<uint8_t>(expected >> 7)) {
-      Advance(2);
-      return true;
-    } else {
-      return false;
-    }
-  } else {
-    // Don't bother optimizing for larger values.
-    return false;
-  }
-}
-
-inline const uint8_t* CodedInputStream::ExpectTagFromArray(
-    const uint8_t* buffer, uint32_t expected) {
-  if (expected < (1 << 7)) {
-    if (buffer[0] == expected) {
-      return buffer + 1;
-    }
-  } else if (expected < (1 << 14)) {
-    if (buffer[0] == static_cast<uint8_t>(expected | 0x80) &&
-        buffer[1] == static_cast<uint8_t>(expected >> 7)) {
-      return buffer + 2;
-    }
-  }
-  return nullptr;
-}
-
-inline void CodedInputStream::GetDirectBufferPointerInline(const void** data,
-                                                           int* size) {
-  *data = buffer_;
-  *size = static_cast<int>(buffer_end_ - buffer_);
-}
-
-inline bool CodedInputStream::ExpectAtEnd() {
-  // If we are at a limit we know no more bytes can be read.  Otherwise, it's
-  // hard to say without calling Refresh(), and we'd rather not do that.
-
-  if (buffer_ == buffer_end_ && ((buffer_size_after_limit_ != 0) ||
-                                 (total_bytes_read_ == current_limit_))) {
-    last_tag_ = 0;                   // Pretend we called ReadTag()...
-    legitimate_message_end_ = true;  // ... and it hit EOF.
-    return true;
-  } else {
-    return false;
-  }
-}
-
-inline int CodedInputStream::CurrentPosition() const {
-  return total_bytes_read_ - (BufferSize() + buffer_size_after_limit_);
-}
-
-inline void CodedInputStream::Advance(int amount) { buffer_ += amount; }
-
-inline void CodedInputStream::SetRecursionLimit(int limit) {
-  recursion_budget_ += limit - recursion_limit_;
-  recursion_limit_ = limit;
-}
-
-inline bool CodedInputStream::IncrementRecursionDepth() {
-  --recursion_budget_;
-  return recursion_budget_ >= 0;
-}
-
-inline void CodedInputStream::DecrementRecursionDepth() {
-  if (recursion_budget_ < recursion_limit_) ++recursion_budget_;
-}
-
-inline void CodedInputStream::UnsafeDecrementRecursionDepth() {
-  assert(recursion_budget_ < recursion_limit_);
-  ++recursion_budget_;
-}
-
-inline void CodedInputStream::SetExtensionRegistry(const DescriptorPool* pool,
-                                                   MessageFactory* factory) {
-  extension_pool_ = pool;
-  extension_factory_ = factory;
-}
-
-inline const DescriptorPool* CodedInputStream::GetExtensionPool() {
-  return extension_pool_;
-}
-
-inline MessageFactory* CodedInputStream::GetExtensionFactory() {
-  return extension_factory_;
-}
-
-inline int CodedInputStream::BufferSize() const {
-  return static_cast<int>(buffer_end_ - buffer_);
-}
-
-inline CodedInputStream::CodedInputStream(ZeroCopyInputStream* input)
-    : buffer_(nullptr),
-      buffer_end_(nullptr),
-      input_(input),
-      total_bytes_read_(0),
-      overflow_bytes_(0),
-      last_tag_(0),
-      legitimate_message_end_(false),
-      aliasing_enabled_(false),
-      current_limit_(std::numeric_limits<int32_t>::max()),
-      buffer_size_after_limit_(0),
-      total_bytes_limit_(kDefaultTotalBytesLimit),
-      recursion_budget_(default_recursion_limit_),
-      recursion_limit_(default_recursion_limit_),
-      extension_pool_(nullptr),
-      extension_factory_(nullptr) {
-  // Eagerly Refresh() so buffer space is immediately available.
-  Refresh();
-}
-
-inline CodedInputStream::CodedInputStream(const uint8_t* buffer, int size)
-    : buffer_(buffer),
-      buffer_end_(buffer + size),
-      input_(nullptr),
-      total_bytes_read_(size),
-      overflow_bytes_(0),
-      last_tag_(0),
-      legitimate_message_end_(false),
-      aliasing_enabled_(false),
-      current_limit_(size),
-      buffer_size_after_limit_(0),
-      total_bytes_limit_(kDefaultTotalBytesLimit),
-      recursion_budget_(default_recursion_limit_),
-      recursion_limit_(default_recursion_limit_),
-      extension_pool_(nullptr),
-      extension_factory_(nullptr) {
-  // Note that setting current_limit_ == size is important to prevent some
-  // code paths from trying to access input_ and segfaulting.
-}
-
-inline bool CodedInputStream::IsFlat() const { return input_ == nullptr; }
-
-inline bool CodedInputStream::Skip(int count) {
-  if (count < 0) return false;  // security: count is often user-supplied
-
-  const int original_buffer_size = BufferSize();
-
-  if (count <= original_buffer_size) {
-    // Just skipping within the current buffer.  Easy.
-    Advance(count);
-    return true;
-  }
-
-  return SkipFallback(count, original_buffer_size);
-}
-
-template <class Stream, class>
-inline CodedOutputStream::CodedOutputStream(Stream* stream)
-    : impl_(stream, IsDefaultSerializationDeterministic(), &cur_),
-      start_count_(stream->ByteCount()) {
-  InitEagerly(stream);
-}
-
-template <class Stream, class>
-inline CodedOutputStream::CodedOutputStream(Stream* stream, bool eager_init)
-    : impl_(stream, IsDefaultSerializationDeterministic(), &cur_),
-      start_count_(stream->ByteCount()) {
-  if (eager_init) {
-    InitEagerly(stream);
-  }
-}
-
-template <class Stream>
-inline void CodedOutputStream::InitEagerly(Stream* stream) {
-  void* data;
-  int size;
-  if (PROTOBUF_PREDICT_TRUE(stream->Next(&data, &size) && size > 0)) {
-    cur_ = impl_.SetInitialBuffer(data, size);
-  }
-}
-
-inline uint8_t* CodedOutputStream::WriteVarint32ToArray(uint32_t value,
-                                                        uint8_t* target) {
-  return EpsCopyOutputStream::UnsafeVarint(value, target);
-}
-
-inline uint8_t* CodedOutputStream::WriteVarint32ToArrayOutOfLine(
-    uint32_t value, uint8_t* target) {
-  target[0] = static_cast<uint8_t>(value);
-  if (value < 0x80) {
-    return target + 1;
-  } else {
-    return WriteVarint32ToArrayOutOfLineHelper(value, target);
-  }
-}
-
-inline uint8_t* CodedOutputStream::WriteVarint64ToArray(uint64_t value,
-                                                        uint8_t* target) {
-  return EpsCopyOutputStream::UnsafeVarint(value, target);
-}
-
-inline void CodedOutputStream::WriteVarint32SignExtended(int32_t value) {
-  WriteVarint64(static_cast<uint64_t>(value));
-}
-
-inline uint8_t* CodedOutputStream::WriteVarint32SignExtendedToArray(
-    int32_t value, uint8_t* target) {
-  return WriteVarint64ToArray(static_cast<uint64_t>(value), target);
-}
-
-inline uint8_t* CodedOutputStream::WriteLittleEndian32ToArray(uint32_t value,
-                                                              uint8_t* target) {
-#if defined(PROTOBUF_LITTLE_ENDIAN) && \
-    !defined(PROTOBUF_DISABLE_LITTLE_ENDIAN_OPT_FOR_TEST)
-  memcpy(target, &value, sizeof(value));
-#else
-  target[0] = static_cast<uint8_t>(value);
-  target[1] = static_cast<uint8_t>(value >> 8);
-  target[2] = static_cast<uint8_t>(value >> 16);
-  target[3] = static_cast<uint8_t>(value >> 24);
-#endif
-  return target + sizeof(value);
-}
-
-inline uint8_t* CodedOutputStream::WriteLittleEndian64ToArray(uint64_t value,
-                                                              uint8_t* target) {
-#if defined(PROTOBUF_LITTLE_ENDIAN) && \
-    !defined(PROTOBUF_DISABLE_LITTLE_ENDIAN_OPT_FOR_TEST)
-  memcpy(target, &value, sizeof(value));
-#else
-  uint32_t part0 = static_cast<uint32_t>(value);
-  uint32_t part1 = static_cast<uint32_t>(value >> 32);
-
-  target[0] = static_cast<uint8_t>(part0);
-  target[1] = static_cast<uint8_t>(part0 >> 8);
-  target[2] = static_cast<uint8_t>(part0 >> 16);
-  target[3] = static_cast<uint8_t>(part0 >> 24);
-  target[4] = static_cast<uint8_t>(part1);
-  target[5] = static_cast<uint8_t>(part1 >> 8);
-  target[6] = static_cast<uint8_t>(part1 >> 16);
-  target[7] = static_cast<uint8_t>(part1 >> 24);
-#endif
-  return target + sizeof(value);
-}
-
-inline void CodedOutputStream::WriteVarint32(uint32_t value) {
-  cur_ = impl_.EnsureSpace(cur_);
-  SetCur(WriteVarint32ToArray(value, Cur()));
-}
-
-inline void CodedOutputStream::WriteVarint64(uint64_t value) {
-  cur_ = impl_.EnsureSpace(cur_);
-  SetCur(WriteVarint64ToArray(value, Cur()));
-}
-
-inline void CodedOutputStream::WriteTag(uint32_t value) {
-  WriteVarint32(value);
-}
-
-inline uint8_t* CodedOutputStream::WriteTagToArray(uint32_t value,
-                                                   uint8_t* target) {
-  return WriteVarint32ToArray(value, target);
-}
-
-inline size_t CodedOutputStream::VarintSize32(uint32_t value) {
-  // This computes value == 0 ? 1 : floor(log2(value)) / 7 + 1
-  // Use an explicit multiplication to implement the divide of
-  // a number in the 1..31 range.
-  // Explicit OR 0x1 to avoid calling Bits::Log2FloorNonZero(0), which is
-  // undefined.
-  uint32_t log2value = Bits::Log2FloorNonZero(value | 0x1);
-  return static_cast<size_t>((log2value * 9 + 73) / 64);
-}
-
-inline size_t CodedOutputStream::VarintSize32PlusOne(uint32_t value) {
-  // Same as above, but one more.
-  uint32_t log2value = Bits::Log2FloorNonZero(value | 0x1);
-  return static_cast<size_t>((log2value * 9 + 73 + 64) / 64);
-}
-
-inline size_t CodedOutputStream::VarintSize64(uint64_t value) {
-  // This computes value == 0 ? 1 : floor(log2(value)) / 7 + 1
-  // Use an explicit multiplication to implement the divide of
-  // a number in the 1..63 range.
-  // Explicit OR 0x1 to avoid calling Bits::Log2FloorNonZero(0), which is
-  // undefined.
-  uint32_t log2value = Bits::Log2FloorNonZero64(value | 0x1);
-  return static_cast<size_t>((log2value * 9 + 73) / 64);
-}
-
-inline size_t CodedOutputStream::VarintSize64PlusOne(uint64_t value) {
-  // Same as above, but one more.
-  uint32_t log2value = Bits::Log2FloorNonZero64(value | 0x1);
-  return static_cast<size_t>((log2value * 9 + 73 + 64) / 64);
-}
-
-inline size_t CodedOutputStream::VarintSize32SignExtended(int32_t value) {
-  return VarintSize64(static_cast<uint64_t>(int64_t{value}));
-}
-
-inline size_t CodedOutputStream::VarintSize32SignExtendedPlusOne(
-    int32_t value) {
-  return VarintSize64PlusOne(static_cast<uint64_t>(int64_t{value}));
-}
-
-inline void CodedOutputStream::WriteString(const std::string& str) {
-  WriteRaw(str.data(), static_cast<int>(str.size()));
-}
-
-inline void CodedOutputStream::WriteRawMaybeAliased(const void* data,
-                                                    int size) {
-  cur_ = impl_.WriteRawMaybeAliased(data, size, cur_);
-}
-
-inline uint8_t* CodedOutputStream::WriteRawToArray(const void* data, int size,
-                                                   uint8_t* target) {
-  memcpy(target, data, size);
-  return target + size;
-}
-
-inline uint8_t* CodedOutputStream::WriteStringToArray(const std::string& str,
-                                                      uint8_t* target) {
-  return WriteRawToArray(str.data(), static_cast<int>(str.size()), target);
-}
-
-}  // namespace io
-}  // namespace protobuf
-}  // namespace google
-
-#if defined(_MSC_VER) && _MSC_VER >= 1300 && !defined(__INTEL_COMPILER)
-#pragma runtime_checks("c", restore)
-#endif  // _MSC_VER && !defined(__INTEL_COMPILER)
-
-#include <google/protobuf/port_undef.inc>
-
-#endif  // GOOGLE_PROTOBUF_IO_CODED_STREAM_H__
diff --git a/libs/protobuf/src/google/protobuf/io/coded_stream_unittest.cc b/libs/protobuf/src/google/protobuf/io/coded_stream_unittest.cc
deleted file mode 100644
index b32bf45..0000000
--- a/libs/protobuf/src/google/protobuf/io/coded_stream_unittest.cc
+++ /dev/null
@@ -1,1348 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-//
-// This file contains tests and benchmarks.
-
-#include <google/protobuf/io/coded_stream.h>
-
-#include <limits.h>
-
-#include <algorithm>
-#include <memory>
-#include <string>
-#include <vector>
-
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/stubs/logging.h>
-#include <google/protobuf/stubs/logging.h>
-#include <google/protobuf/io/zero_copy_stream_impl.h>
-#include <google/protobuf/testing/googletest.h>
-#include <gtest/gtest.h>
-#include <google/protobuf/stubs/casts.h>
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-
-namespace google {
-namespace protobuf {
-namespace io {
-namespace {
-
-
-// ===================================================================
-// Data-Driven Test Infrastructure
-
-// TEST_1D and TEST_2D are macros I'd eventually like to see added to
-// gTest.  These macros can be used to declare tests which should be
-// run multiple times, once for each item in some input array.  TEST_1D
-// tests all cases in a single input array.  TEST_2D tests all
-// combinations of cases from two arrays.  The arrays must be statically
-// defined such that the GOOGLE_ARRAYSIZE() macro works on them.  Example:
-//
-// int kCases[] = {1, 2, 3, 4}
-// TEST_1D(MyFixture, MyTest, kCases) {
-//   EXPECT_GT(kCases_case, 0);
-// }
-//
-// This test iterates through the numbers 1, 2, 3, and 4 and tests that
-// they are all grater than zero.  In case of failure, the exact case
-// which failed will be printed.  The case type must be printable using
-// ostream::operator<<.
-
-// TODO(kenton):  gTest now supports "parameterized tests" which would be
-//   a better way to accomplish this.  Rewrite when time permits.
-
-#define TEST_1D(FIXTURE, NAME, CASES)                             \
-  class FIXTURE##_##NAME##_DD : public FIXTURE {                  \
-   protected:                                                     \
-    template <typename CaseType>                                  \
-    void DoSingleCase(const CaseType& CASES##_case);              \
-  };                                                              \
-                                                                  \
-  TEST_F(FIXTURE##_##NAME##_DD, NAME) {                           \
-    for (size_t i = 0; i < GOOGLE_ARRAYSIZE(CASES); i++) {               \
-      SCOPED_TRACE(testing::Message()                             \
-                   << #CASES " case #" << i << ": " << CASES[i]); \
-      DoSingleCase(CASES[i]);                                     \
-    }                                                             \
-  }                                                               \
-                                                                  \
-  template <typename CaseType>                                    \
-  void FIXTURE##_##NAME##_DD::DoSingleCase(const CaseType& CASES##_case)
-
-#define TEST_2D(FIXTURE, NAME, CASES1, CASES2)                              \
-  class FIXTURE##_##NAME##_DD : public FIXTURE {                            \
-   protected:                                                               \
-    template <typename CaseType1, typename CaseType2>                       \
-    void DoSingleCase(const CaseType1& CASES1##_case,                       \
-                      const CaseType2& CASES2##_case);                      \
-  };                                                                        \
-                                                                            \
-  TEST_F(FIXTURE##_##NAME##_DD, NAME) {                                     \
-    for (size_t i = 0; i < GOOGLE_ARRAYSIZE(CASES1); i++) {                        \
-      for (size_t j = 0; j < GOOGLE_ARRAYSIZE(CASES2); j++) {                      \
-        SCOPED_TRACE(testing::Message()                                     \
-                     << #CASES1 " case #" << i << ": " << CASES1[i] << ", " \
-                     << #CASES2 " case #" << j << ": " << CASES2[j]);       \
-        DoSingleCase(CASES1[i], CASES2[j]);                                 \
-      }                                                                     \
-    }                                                                       \
-  }                                                                         \
-                                                                            \
-  template <typename CaseType1, typename CaseType2>                         \
-  void FIXTURE##_##NAME##_DD::DoSingleCase(const CaseType1& CASES1##_case,  \
-                                           const CaseType2& CASES2##_case)
-
-// ===================================================================
-
-class CodedStreamTest : public testing::Test {
- protected:
-  // Buffer used during most of the tests. This assumes tests run sequentially.
-  static constexpr int kBufferSize = 1024 * 64;
-  static uint8_t buffer_[kBufferSize];
-};
-
-uint8_t CodedStreamTest::buffer_[CodedStreamTest::kBufferSize];
-
-// We test each operation over a variety of block sizes to insure that
-// we test cases where reads or writes cross buffer boundaries, cases
-// where they don't, and cases where there is so much buffer left that
-// we can use special optimized paths that don't worry about bounds
-// checks.
-const int kBlockSizes[] = {1, 2, 3, 5, 7, 13, 32, 1024};
-
-
-// -------------------------------------------------------------------
-// Varint tests.
-
-struct VarintCase {
-  uint8_t bytes[10];  // Encoded bytes.
-  size_t size;        // Encoded size, in bytes.
-  uint64_t value;     // Parsed value.
-};
-
-inline std::ostream& operator<<(std::ostream& os, const VarintCase& c) {
-  return os << c.value;
-}
-
-VarintCase kVarintCases[] = {
-    // 32-bit values
-    {{0x00}, 1, 0},
-    {{0x01}, 1, 1},
-    {{0x7f}, 1, 127},
-    {{0xa2, 0x74}, 2, (0x22 << 0) | (0x74 << 7)},  // 14882
-    {{0xbe, 0xf7, 0x92, 0x84, 0x0b},
-     5,  // 2961488830
-     (0x3e << 0) | (0x77 << 7) | (0x12 << 14) | (0x04 << 21) |
-         (uint64_t{0x0bu} << 28)},
-
-    // 64-bit
-    {{0xbe, 0xf7, 0x92, 0x84, 0x1b},
-     5,  // 7256456126
-     (0x3e << 0) | (0x77 << 7) | (0x12 << 14) | (0x04 << 21) |
-         (uint64_t{0x1bu} << 28)},
-    {{0x80, 0xe6, 0xeb, 0x9c, 0xc3, 0xc9, 0xa4, 0x49},
-     8,  // 41256202580718336
-     (0x00 << 0) | (0x66 << 7) | (0x6b << 14) | (0x1c << 21) |
-         (uint64_t{0x43u} << 28) | (uint64_t{0x49u} << 35) |
-         (uint64_t{0x24u} << 42) | (uint64_t{0x49u} << 49)},
-    // 11964378330978735131
-    {{0x9b, 0xa8, 0xf9, 0xc2, 0xbb, 0xd6, 0x80, 0x85, 0xa6, 0x01},
-     10,
-     (0x1b << 0) | (0x28 << 7) | (0x79 << 14) | (0x42 << 21) |
-         (uint64_t{0x3bu} << 28) | (uint64_t{0x56u} << 35) |
-         (uint64_t{0x00u} << 42) | (uint64_t{0x05u} << 49) |
-         (uint64_t{0x26u} << 56) | (uint64_t{0x01u} << 63)},
-};
-
-TEST_2D(CodedStreamTest, ReadVarint32, kVarintCases, kBlockSizes) {
-  memcpy(buffer_, kVarintCases_case.bytes, kVarintCases_case.size);
-  ArrayInputStream input(buffer_, sizeof(buffer_), kBlockSizes_case);
-
-  {
-    CodedInputStream coded_input(&input);
-
-    uint32_t value;
-    EXPECT_TRUE(coded_input.ReadVarint32(&value));
-    EXPECT_EQ(static_cast<uint32_t>(kVarintCases_case.value), value);
-  }
-
-  EXPECT_EQ(kVarintCases_case.size, input.ByteCount());
-}
-
-TEST_2D(CodedStreamTest, ReadTag, kVarintCases, kBlockSizes) {
-  memcpy(buffer_, kVarintCases_case.bytes, kVarintCases_case.size);
-  ArrayInputStream input(buffer_, sizeof(buffer_), kBlockSizes_case);
-
-  {
-    CodedInputStream coded_input(&input);
-
-    uint32_t expected_value = static_cast<uint32_t>(kVarintCases_case.value);
-    EXPECT_EQ(expected_value, coded_input.ReadTag());
-
-    EXPECT_TRUE(coded_input.LastTagWas(expected_value));
-    EXPECT_FALSE(coded_input.LastTagWas(expected_value + 1));
-  }
-
-  EXPECT_EQ(kVarintCases_case.size, input.ByteCount());
-}
-
-// This is the regression test that verifies that there is no issues
-// with the empty input buffers handling.
-TEST_F(CodedStreamTest, EmptyInputBeforeEos) {
-  class In : public ZeroCopyInputStream {
-   public:
-    In() : count_(0) {}
-
-   private:
-    bool Next(const void** data, int* size) override {
-      *data = nullptr;
-      *size = 0;
-      return count_++ < 2;
-    }
-    void BackUp(int count) override { GOOGLE_LOG(FATAL) << "Tests never call this."; }
-    bool Skip(int count) override {
-      GOOGLE_LOG(FATAL) << "Tests never call this.";
-      return false;
-    }
-    int64_t ByteCount() const override { return 0; }
-    int count_;
-  } in;
-  CodedInputStream input(&in);
-  input.ReadTagNoLastTag();
-  EXPECT_TRUE(input.ConsumedEntireMessage());
-}
-
-TEST_1D(CodedStreamTest, ExpectTag, kVarintCases) {
-  // Leave one byte at the beginning of the buffer so we can read it
-  // to force the first buffer to be loaded.
-  buffer_[0] = '\0';
-  memcpy(buffer_ + 1, kVarintCases_case.bytes, kVarintCases_case.size);
-  ArrayInputStream input(buffer_, sizeof(buffer_));
-
-  {
-    CodedInputStream coded_input(&input);
-
-    // Read one byte to force coded_input.Refill() to be called.  Otherwise,
-    // ExpectTag() will return a false negative.
-    uint8_t dummy;
-    coded_input.ReadRaw(&dummy, 1);
-    EXPECT_EQ((uint)'\0', (uint)dummy);
-
-    uint32_t expected_value = static_cast<uint32_t>(kVarintCases_case.value);
-
-    // ExpectTag() produces false negatives for large values.
-    if (kVarintCases_case.size <= 2) {
-      EXPECT_FALSE(coded_input.ExpectTag(expected_value + 1));
-      EXPECT_TRUE(coded_input.ExpectTag(expected_value));
-    } else {
-      EXPECT_FALSE(coded_input.ExpectTag(expected_value));
-    }
-  }
-
-  if (kVarintCases_case.size <= 2) {
-    EXPECT_EQ(kVarintCases_case.size + 1, input.ByteCount());
-  } else {
-    EXPECT_EQ(1, input.ByteCount());
-  }
-}
-
-TEST_1D(CodedStreamTest, ExpectTagFromArray, kVarintCases) {
-  memcpy(buffer_, kVarintCases_case.bytes, kVarintCases_case.size);
-
-  const uint32_t expected_value =
-      static_cast<uint32_t>(kVarintCases_case.value);
-
-  // If the expectation succeeds, it should return a pointer past the tag.
-  if (kVarintCases_case.size <= 2) {
-    EXPECT_TRUE(nullptr == CodedInputStream::ExpectTagFromArray(
-                            buffer_, expected_value + 1));
-    EXPECT_TRUE(buffer_ + kVarintCases_case.size ==
-                CodedInputStream::ExpectTagFromArray(buffer_, expected_value));
-  } else {
-    EXPECT_TRUE(nullptr ==
-                CodedInputStream::ExpectTagFromArray(buffer_, expected_value));
-  }
-}
-
-TEST_2D(CodedStreamTest, ReadVarint64, kVarintCases, kBlockSizes) {
-  memcpy(buffer_, kVarintCases_case.bytes, kVarintCases_case.size);
-  ArrayInputStream input(buffer_, sizeof(buffer_), kBlockSizes_case);
-
-  {
-    CodedInputStream coded_input(&input);
-
-    uint64_t value;
-    EXPECT_TRUE(coded_input.ReadVarint64(&value));
-    EXPECT_EQ(kVarintCases_case.value, value);
-  }
-
-  EXPECT_EQ(kVarintCases_case.size, input.ByteCount());
-}
-
-TEST_2D(CodedStreamTest, WriteVarint32, kVarintCases, kBlockSizes) {
-  if (kVarintCases_case.value > uint64_t{0x00000000FFFFFFFFu}) {
-    // Skip this test for the 64-bit values.
-    return;
-  }
-
-  ArrayOutputStream output(buffer_, sizeof(buffer_), kBlockSizes_case);
-
-  {
-    CodedOutputStream coded_output(&output);
-
-    coded_output.WriteVarint32(static_cast<uint32_t>(kVarintCases_case.value));
-    EXPECT_FALSE(coded_output.HadError());
-
-    EXPECT_EQ(kVarintCases_case.size, coded_output.ByteCount());
-  }
-
-  EXPECT_EQ(kVarintCases_case.size, output.ByteCount());
-  EXPECT_EQ(0,
-            memcmp(buffer_, kVarintCases_case.bytes, kVarintCases_case.size));
-}
-
-TEST_2D(CodedStreamTest, WriteVarint64, kVarintCases, kBlockSizes) {
-  ArrayOutputStream output(buffer_, sizeof(buffer_), kBlockSizes_case);
-
-  {
-    CodedOutputStream coded_output(&output);
-
-    coded_output.WriteVarint64(kVarintCases_case.value);
-    EXPECT_FALSE(coded_output.HadError());
-
-    EXPECT_EQ(kVarintCases_case.size, coded_output.ByteCount());
-  }
-
-  EXPECT_EQ(kVarintCases_case.size, output.ByteCount());
-  EXPECT_EQ(0,
-            memcmp(buffer_, kVarintCases_case.bytes, kVarintCases_case.size));
-}
-
-// This test causes gcc 3.3.5 (and earlier?) to give the cryptic error:
-//   "sorry, unimplemented: `method_call_expr' not supported by dump_expr"
-#if !defined(__GNUC__) || __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 3)
-
-int32_t kSignExtendedVarintCases[] = {0, 1, -1, 1237894, -37895138};
-
-TEST_2D(CodedStreamTest, WriteVarint32SignExtended, kSignExtendedVarintCases,
-        kBlockSizes) {
-  ArrayOutputStream output(buffer_, sizeof(buffer_), kBlockSizes_case);
-
-  {
-    CodedOutputStream coded_output(&output);
-
-    coded_output.WriteVarint32SignExtended(kSignExtendedVarintCases_case);
-    EXPECT_FALSE(coded_output.HadError());
-
-    if (kSignExtendedVarintCases_case < 0) {
-      EXPECT_EQ(10, coded_output.ByteCount());
-    } else {
-      EXPECT_LE(coded_output.ByteCount(), 5);
-    }
-  }
-
-  if (kSignExtendedVarintCases_case < 0) {
-    EXPECT_EQ(10, output.ByteCount());
-  } else {
-    EXPECT_LE(output.ByteCount(), 5);
-  }
-
-  // Read value back in as a varint64 and insure it matches.
-  ArrayInputStream input(buffer_, sizeof(buffer_));
-
-  {
-    CodedInputStream coded_input(&input);
-
-    uint64_t value;
-    EXPECT_TRUE(coded_input.ReadVarint64(&value));
-
-    EXPECT_EQ(kSignExtendedVarintCases_case, static_cast<int64_t>(value));
-  }
-
-  EXPECT_EQ(output.ByteCount(), input.ByteCount());
-}
-
-#endif
-
-
-// -------------------------------------------------------------------
-// Varint failure test.
-
-struct VarintErrorCase {
-  uint8_t bytes[12];
-  size_t size;
-  bool can_parse;
-};
-
-inline std::ostream& operator<<(std::ostream& os, const VarintErrorCase& c) {
-  return os << "size " << c.size;
-}
-
-const VarintErrorCase kVarintErrorCases[] = {
-    // Control case.  (Insures that there isn't something else wrong that
-    // makes parsing always fail.)
-    {{0x00}, 1, true},
-
-    // No input data.
-    {{}, 0, false},
-
-    // Input ends unexpectedly.
-    {{0xf0, 0xab}, 2, false},
-
-    // Input ends unexpectedly after 32 bits.
-    {{0xf0, 0xab, 0xc9, 0x9a, 0xf8, 0xb2}, 6, false},
-
-    // Longer than 10 bytes.
-    {{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x01},
-     11,
-     false},
-};
-
-TEST_2D(CodedStreamTest, ReadVarint32Error, kVarintErrorCases, kBlockSizes) {
-  memcpy(buffer_, kVarintErrorCases_case.bytes, kVarintErrorCases_case.size);
-  ArrayInputStream input(buffer_, static_cast<int>(kVarintErrorCases_case.size),
-                         kBlockSizes_case);
-  CodedInputStream coded_input(&input);
-
-  uint32_t value;
-  EXPECT_EQ(kVarintErrorCases_case.can_parse, coded_input.ReadVarint32(&value));
-}
-
-TEST_2D(CodedStreamTest, ReadVarint32Error_LeavesValueInInitializedState,
-        kVarintErrorCases, kBlockSizes) {
-  memcpy(buffer_, kVarintErrorCases_case.bytes, kVarintErrorCases_case.size);
-  ArrayInputStream input(buffer_, static_cast<int>(kVarintErrorCases_case.size),
-                         kBlockSizes_case);
-  CodedInputStream coded_input(&input);
-
-  uint32_t value = 0;
-  EXPECT_EQ(kVarintErrorCases_case.can_parse, coded_input.ReadVarint32(&value));
-  // While the specific value following a failure is not critical, we do want to
-  // ensure that it doesn't get set to an uninitialized value. (This check fails
-  // in MSAN mode if value has been set to an uninitialized value.)
-  EXPECT_EQ(value, value);
-}
-
-TEST_2D(CodedStreamTest, ReadVarint64Error, kVarintErrorCases, kBlockSizes) {
-  memcpy(buffer_, kVarintErrorCases_case.bytes, kVarintErrorCases_case.size);
-  ArrayInputStream input(buffer_, static_cast<int>(kVarintErrorCases_case.size),
-                         kBlockSizes_case);
-  CodedInputStream coded_input(&input);
-
-  uint64_t value;
-  EXPECT_EQ(kVarintErrorCases_case.can_parse, coded_input.ReadVarint64(&value));
-}
-
-TEST_2D(CodedStreamTest, ReadVarint64Error_LeavesValueInInitializedState,
-        kVarintErrorCases, kBlockSizes) {
-  memcpy(buffer_, kVarintErrorCases_case.bytes, kVarintErrorCases_case.size);
-  ArrayInputStream input(buffer_, static_cast<int>(kVarintErrorCases_case.size),
-                         kBlockSizes_case);
-  CodedInputStream coded_input(&input);
-
-  uint64_t value = 0;
-  EXPECT_EQ(kVarintErrorCases_case.can_parse, coded_input.ReadVarint64(&value));
-  // While the specific value following a failure is not critical, we do want to
-  // ensure that it doesn't get set to an uninitialized value. (This check fails
-  // in MSAN mode if value has been set to an uninitialized value.)
-  EXPECT_EQ(value, value);
-}
-
-// -------------------------------------------------------------------
-// VarintSize
-
-struct VarintSizeCase {
-  uint64_t value;
-  int size;
-};
-
-inline std::ostream& operator<<(std::ostream& os, const VarintSizeCase& c) {
-  return os << c.value;
-}
-
-VarintSizeCase kVarintSizeCases[] = {
-    {0u, 1},
-    {1u, 1},
-    {127u, 1},
-    {128u, 2},
-    {758923u, 3},
-    {4000000000u, 5},
-    {uint64_t{41256202580718336u}, 8},
-    {uint64_t{11964378330978735131u}, 10},
-};
-
-TEST_1D(CodedStreamTest, VarintSize32, kVarintSizeCases) {
-  if (kVarintSizeCases_case.value > 0xffffffffu) {
-    // Skip 64-bit values.
-    return;
-  }
-
-  EXPECT_EQ(kVarintSizeCases_case.size,
-            CodedOutputStream::VarintSize32(
-                static_cast<uint32_t>(kVarintSizeCases_case.value)));
-}
-
-TEST_1D(CodedStreamTest, VarintSize64, kVarintSizeCases) {
-  EXPECT_EQ(kVarintSizeCases_case.size,
-            CodedOutputStream::VarintSize64(kVarintSizeCases_case.value));
-}
-
-TEST_F(CodedStreamTest, VarintSize32PowersOfTwo) {
-  int expected = 1;
-  for (int i = 1; i < 32; i++) {
-    if (i % 7 == 0) {
-      expected += 1;
-    }
-    EXPECT_EQ(expected, CodedOutputStream::VarintSize32(
-                            static_cast<uint32_t>(0x1u << i)));
-  }
-}
-
-TEST_F(CodedStreamTest, VarintSize64PowersOfTwo) {
-  int expected = 1;
-  for (int i = 1; i < 64; i++) {
-    if (i % 7 == 0) {
-      expected += 1;
-    }
-    EXPECT_EQ(expected, CodedOutputStream::VarintSize64(uint64_t{1} << i));
-  }
-}
-
-// -------------------------------------------------------------------
-// Fixed-size int tests
-
-struct Fixed32Case {
-  uint8_t bytes[sizeof(uint32_t)];  // Encoded bytes.
-  uint32_t value;                   // Parsed value.
-};
-
-struct Fixed64Case {
-  uint8_t bytes[sizeof(uint64_t)];  // Encoded bytes.
-  uint64_t value;                   // Parsed value.
-};
-
-inline std::ostream& operator<<(std::ostream& os, const Fixed32Case& c) {
-  return os << "0x" << std::hex << c.value << std::dec;
-}
-
-inline std::ostream& operator<<(std::ostream& os, const Fixed64Case& c) {
-  return os << "0x" << std::hex << c.value << std::dec;
-}
-
-Fixed32Case kFixed32Cases[] = {
-    {{0xef, 0xcd, 0xab, 0x90}, 0x90abcdefu},
-    {{0x12, 0x34, 0x56, 0x78}, 0x78563412u},
-};
-
-Fixed64Case kFixed64Cases[] = {
-    {{0xef, 0xcd, 0xab, 0x90, 0x12, 0x34, 0x56, 0x78},
-     uint64_t{0x7856341290abcdefu}},
-    {{0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88},
-     uint64_t{0x8877665544332211u}},
-};
-
-TEST_2D(CodedStreamTest, ReadLittleEndian32, kFixed32Cases, kBlockSizes) {
-  memcpy(buffer_, kFixed32Cases_case.bytes, sizeof(kFixed32Cases_case.bytes));
-  ArrayInputStream input(buffer_, sizeof(buffer_), kBlockSizes_case);
-
-  {
-    CodedInputStream coded_input(&input);
-
-    uint32_t value;
-    EXPECT_TRUE(coded_input.ReadLittleEndian32(&value));
-    EXPECT_EQ(kFixed32Cases_case.value, value);
-  }
-
-  EXPECT_EQ(sizeof(uint32_t), input.ByteCount());
-}
-
-TEST_2D(CodedStreamTest, ReadLittleEndian64, kFixed64Cases, kBlockSizes) {
-  memcpy(buffer_, kFixed64Cases_case.bytes, sizeof(kFixed64Cases_case.bytes));
-  ArrayInputStream input(buffer_, sizeof(buffer_), kBlockSizes_case);
-
-  {
-    CodedInputStream coded_input(&input);
-
-    uint64_t value;
-    EXPECT_TRUE(coded_input.ReadLittleEndian64(&value));
-    EXPECT_EQ(kFixed64Cases_case.value, value);
-  }
-
-  EXPECT_EQ(sizeof(uint64_t), input.ByteCount());
-}
-
-TEST_2D(CodedStreamTest, WriteLittleEndian32, kFixed32Cases, kBlockSizes) {
-  ArrayOutputStream output(buffer_, sizeof(buffer_), kBlockSizes_case);
-
-  {
-    CodedOutputStream coded_output(&output);
-
-    coded_output.WriteLittleEndian32(kFixed32Cases_case.value);
-    EXPECT_FALSE(coded_output.HadError());
-
-    EXPECT_EQ(sizeof(uint32_t), coded_output.ByteCount());
-  }
-
-  EXPECT_EQ(sizeof(uint32_t), output.ByteCount());
-  EXPECT_EQ(0, memcmp(buffer_, kFixed32Cases_case.bytes, sizeof(uint32_t)));
-}
-
-TEST_2D(CodedStreamTest, WriteLittleEndian64, kFixed64Cases, kBlockSizes) {
-  ArrayOutputStream output(buffer_, sizeof(buffer_), kBlockSizes_case);
-
-  {
-    CodedOutputStream coded_output(&output);
-
-    coded_output.WriteLittleEndian64(kFixed64Cases_case.value);
-    EXPECT_FALSE(coded_output.HadError());
-
-    EXPECT_EQ(sizeof(uint64_t), coded_output.ByteCount());
-  }
-
-  EXPECT_EQ(sizeof(uint64_t), output.ByteCount());
-  EXPECT_EQ(0, memcmp(buffer_, kFixed64Cases_case.bytes, sizeof(uint64_t)));
-}
-
-// Tests using the static methods to read fixed-size values from raw arrays.
-
-TEST_1D(CodedStreamTest, ReadLittleEndian32FromArray, kFixed32Cases) {
-  memcpy(buffer_, kFixed32Cases_case.bytes, sizeof(kFixed32Cases_case.bytes));
-
-  uint32_t value;
-  const uint8_t* end =
-      CodedInputStream::ReadLittleEndian32FromArray(buffer_, &value);
-  EXPECT_EQ(kFixed32Cases_case.value, value);
-  EXPECT_TRUE(end == buffer_ + sizeof(value));
-}
-
-TEST_1D(CodedStreamTest, ReadLittleEndian64FromArray, kFixed64Cases) {
-  memcpy(buffer_, kFixed64Cases_case.bytes, sizeof(kFixed64Cases_case.bytes));
-
-  uint64_t value;
-  const uint8_t* end =
-      CodedInputStream::ReadLittleEndian64FromArray(buffer_, &value);
-  EXPECT_EQ(kFixed64Cases_case.value, value);
-  EXPECT_TRUE(end == buffer_ + sizeof(value));
-}
-
-// -------------------------------------------------------------------
-// Raw reads and writes
-
-const char kRawBytes[] = "Some bytes which will be written and read raw.";
-
-TEST_1D(CodedStreamTest, ReadRaw, kBlockSizes) {
-  memcpy(buffer_, kRawBytes, sizeof(kRawBytes));
-  ArrayInputStream input(buffer_, sizeof(buffer_), kBlockSizes_case);
-  char read_buffer[sizeof(kRawBytes)];
-
-  {
-    CodedInputStream coded_input(&input);
-
-    EXPECT_TRUE(coded_input.ReadRaw(read_buffer, sizeof(kRawBytes)));
-    EXPECT_EQ(0, memcmp(kRawBytes, read_buffer, sizeof(kRawBytes)));
-  }
-
-  EXPECT_EQ(sizeof(kRawBytes), input.ByteCount());
-}
-
-TEST_1D(CodedStreamTest, WriteRaw, kBlockSizes) {
-  ArrayOutputStream output(buffer_, sizeof(buffer_), kBlockSizes_case);
-
-  {
-    CodedOutputStream coded_output(&output);
-
-    coded_output.WriteRaw(kRawBytes, sizeof(kRawBytes));
-    EXPECT_FALSE(coded_output.HadError());
-
-    EXPECT_EQ(sizeof(kRawBytes), coded_output.ByteCount());
-  }
-
-  EXPECT_EQ(sizeof(kRawBytes), output.ByteCount());
-  EXPECT_EQ(0, memcmp(buffer_, kRawBytes, sizeof(kRawBytes)));
-}
-
-TEST_1D(CodedStreamTest, ReadString, kBlockSizes) {
-  memcpy(buffer_, kRawBytes, sizeof(kRawBytes));
-  ArrayInputStream input(buffer_, sizeof(buffer_), kBlockSizes_case);
-
-  {
-    CodedInputStream coded_input(&input);
-
-    std::string str;
-    EXPECT_TRUE(coded_input.ReadString(&str, strlen(kRawBytes)));
-    EXPECT_EQ(kRawBytes, str);
-  }
-
-  EXPECT_EQ(strlen(kRawBytes), input.ByteCount());
-}
-
-// Check to make sure ReadString doesn't crash on impossibly large strings.
-TEST_1D(CodedStreamTest, ReadStringImpossiblyLarge, kBlockSizes) {
-  ArrayInputStream input(buffer_, sizeof(buffer_), kBlockSizes_case);
-
-  {
-    CodedInputStream coded_input(&input);
-
-    std::string str;
-    // Try to read a gigabyte.
-    EXPECT_FALSE(coded_input.ReadString(&str, 1 << 30));
-  }
-}
-
-TEST_F(CodedStreamTest, ReadStringImpossiblyLargeFromStringOnStack) {
-  // Same test as above, except directly use a buffer. This used to cause
-  // crashes while the above did not.
-  uint8_t buffer[8];
-  CodedInputStream coded_input(buffer, 8);
-  std::string str;
-  EXPECT_FALSE(coded_input.ReadString(&str, 1 << 30));
-}
-
-TEST_F(CodedStreamTest, ReadStringImpossiblyLargeFromStringOnHeap) {
-  std::unique_ptr<uint8_t[]> buffer(new uint8_t[8]);
-  CodedInputStream coded_input(buffer.get(), 8);
-  std::string str;
-  EXPECT_FALSE(coded_input.ReadString(&str, 1 << 30));
-}
-
-TEST_1D(CodedStreamTest, ReadStringReservesMemoryOnTotalLimit, kBlockSizes) {
-  memcpy(buffer_, kRawBytes, sizeof(kRawBytes));
-  ArrayInputStream input(buffer_, sizeof(buffer_), kBlockSizes_case);
-
-  {
-    CodedInputStream coded_input(&input);
-    coded_input.SetTotalBytesLimit(sizeof(kRawBytes));
-    EXPECT_EQ(sizeof(kRawBytes), coded_input.BytesUntilTotalBytesLimit());
-
-    std::string str;
-    EXPECT_TRUE(coded_input.ReadString(&str, strlen(kRawBytes)));
-    EXPECT_EQ(sizeof(kRawBytes) - strlen(kRawBytes),
-              coded_input.BytesUntilTotalBytesLimit());
-    EXPECT_EQ(kRawBytes, str);
-    // TODO(liujisi): Replace with a more meaningful test (see cl/60966023).
-    EXPECT_GE(str.capacity(), strlen(kRawBytes));
-  }
-
-  EXPECT_EQ(strlen(kRawBytes), input.ByteCount());
-}
-
-TEST_1D(CodedStreamTest, ReadStringReservesMemoryOnPushedLimit, kBlockSizes) {
-  memcpy(buffer_, kRawBytes, sizeof(kRawBytes));
-  ArrayInputStream input(buffer_, sizeof(buffer_), kBlockSizes_case);
-
-  {
-    CodedInputStream coded_input(&input);
-    coded_input.PushLimit(sizeof(buffer_));
-
-    std::string str;
-    EXPECT_TRUE(coded_input.ReadString(&str, strlen(kRawBytes)));
-    EXPECT_EQ(kRawBytes, str);
-    // TODO(liujisi): Replace with a more meaningful test (see cl/60966023).
-    EXPECT_GE(str.capacity(), strlen(kRawBytes));
-  }
-
-  EXPECT_EQ(strlen(kRawBytes), input.ByteCount());
-}
-
-TEST_F(CodedStreamTest, ReadStringNoReservationIfLimitsNotSet) {
-  memcpy(buffer_, kRawBytes, sizeof(kRawBytes));
-  // Buffer size in the input must be smaller than sizeof(kRawBytes),
-  // otherwise check against capacity will fail as ReadStringInline()
-  // will handle the reading and will reserve the memory as needed.
-  ArrayInputStream input(buffer_, sizeof(buffer_), 32);
-
-  {
-    CodedInputStream coded_input(&input);
-
-    std::string str;
-    EXPECT_TRUE(coded_input.ReadString(&str, strlen(kRawBytes)));
-    EXPECT_EQ(kRawBytes, str);
-    // Note: this check depends on string class implementation. It
-    // expects that string will allocate more than strlen(kRawBytes)
-    // if the content of kRawBytes is appended to string in small
-    // chunks.
-    // TODO(liujisi): Replace with a more meaningful test (see cl/60966023).
-    EXPECT_GE(str.capacity(), strlen(kRawBytes));
-  }
-
-  EXPECT_EQ(strlen(kRawBytes), input.ByteCount());
-}
-
-TEST_F(CodedStreamTest, ReadStringNoReservationSizeIsNegative) {
-  memcpy(buffer_, kRawBytes, sizeof(kRawBytes));
-  // Buffer size in the input must be smaller than sizeof(kRawBytes),
-  // otherwise check against capacity will fail as ReadStringInline()
-  // will handle the reading and will reserve the memory as needed.
-  ArrayInputStream input(buffer_, sizeof(buffer_), 32);
-
-  {
-    CodedInputStream coded_input(&input);
-    coded_input.PushLimit(sizeof(buffer_));
-
-    std::string str;
-    EXPECT_FALSE(coded_input.ReadString(&str, -1));
-    // Note: this check depends on string class implementation. It
-    // expects that string will always allocate the same amount of
-    // memory for an empty string.
-    EXPECT_EQ(std::string().capacity(), str.capacity());
-  }
-}
-
-TEST_F(CodedStreamTest, ReadStringNoReservationSizeIsLarge) {
-  memcpy(buffer_, kRawBytes, sizeof(kRawBytes));
-  // Buffer size in the input must be smaller than sizeof(kRawBytes),
-  // otherwise check against capacity will fail as ReadStringInline()
-  // will handle the reading and will reserve the memory as needed.
-  ArrayInputStream input(buffer_, sizeof(buffer_), 32);
-
-  {
-    CodedInputStream coded_input(&input);
-    coded_input.PushLimit(sizeof(buffer_));
-
-    std::string str;
-    EXPECT_FALSE(coded_input.ReadString(&str, 1 << 30));
-    EXPECT_GT(1 << 30, str.capacity());
-  }
-}
-
-TEST_F(CodedStreamTest, ReadStringNoReservationSizeIsOverTheLimit) {
-  memcpy(buffer_, kRawBytes, sizeof(kRawBytes));
-  // Buffer size in the input must be smaller than sizeof(kRawBytes),
-  // otherwise check against capacity will fail as ReadStringInline()
-  // will handle the reading and will reserve the memory as needed.
-  ArrayInputStream input(buffer_, sizeof(buffer_), 32);
-
-  {
-    CodedInputStream coded_input(&input);
-    coded_input.PushLimit(16);
-
-    std::string str;
-    EXPECT_FALSE(coded_input.ReadString(&str, strlen(kRawBytes)));
-    // Note: this check depends on string class implementation. It
-    // expects that string will allocate less than strlen(kRawBytes)
-    // for an empty string.
-    EXPECT_GT(strlen(kRawBytes), str.capacity());
-  }
-}
-
-TEST_F(CodedStreamTest, ReadStringNoReservationSizeIsOverTheTotalBytesLimit) {
-  memcpy(buffer_, kRawBytes, sizeof(kRawBytes));
-  // Buffer size in the input must be smaller than sizeof(kRawBytes),
-  // otherwise check against capacity will fail as ReadStringInline()
-  // will handle the reading and will reserve the memory as needed.
-  ArrayInputStream input(buffer_, sizeof(buffer_), 32);
-
-  {
-    CodedInputStream coded_input(&input);
-    coded_input.SetTotalBytesLimit(16);
-
-    std::string str;
-    EXPECT_FALSE(coded_input.ReadString(&str, strlen(kRawBytes)));
-    // Note: this check depends on string class implementation. It
-    // expects that string will allocate less than strlen(kRawBytes)
-    // for an empty string.
-    EXPECT_GT(strlen(kRawBytes), str.capacity());
-  }
-}
-
-TEST_F(CodedStreamTest,
-       ReadStringNoReservationSizeIsOverTheClosestLimit_GlobalLimitIsCloser) {
-  memcpy(buffer_, kRawBytes, sizeof(kRawBytes));
-  // Buffer size in the input must be smaller than sizeof(kRawBytes),
-  // otherwise check against capacity will fail as ReadStringInline()
-  // will handle the reading and will reserve the memory as needed.
-  ArrayInputStream input(buffer_, sizeof(buffer_), 32);
-
-  {
-    CodedInputStream coded_input(&input);
-    coded_input.PushLimit(sizeof(buffer_));
-    coded_input.SetTotalBytesLimit(16);
-
-    std::string str;
-    EXPECT_FALSE(coded_input.ReadString(&str, strlen(kRawBytes)));
-    // Note: this check depends on string class implementation. It
-    // expects that string will allocate less than strlen(kRawBytes)
-    // for an empty string.
-    EXPECT_GT(strlen(kRawBytes), str.capacity());
-  }
-}
-
-TEST_F(CodedStreamTest,
-       ReadStringNoReservationSizeIsOverTheClosestLimit_LocalLimitIsCloser) {
-  memcpy(buffer_, kRawBytes, sizeof(kRawBytes));
-  // Buffer size in the input must be smaller than sizeof(kRawBytes),
-  // otherwise check against capacity will fail as ReadStringInline()
-  // will handle the reading and will reserve the memory as needed.
-  ArrayInputStream input(buffer_, sizeof(buffer_), 32);
-
-  {
-    CodedInputStream coded_input(&input);
-    coded_input.PushLimit(16);
-    coded_input.SetTotalBytesLimit(sizeof(buffer_));
-    EXPECT_EQ(sizeof(buffer_), coded_input.BytesUntilTotalBytesLimit());
-
-    std::string str;
-    EXPECT_FALSE(coded_input.ReadString(&str, strlen(kRawBytes)));
-    // Note: this check depends on string class implementation. It
-    // expects that string will allocate less than strlen(kRawBytes)
-    // for an empty string.
-    EXPECT_GT(strlen(kRawBytes), str.capacity());
-  }
-}
-
-
-// -------------------------------------------------------------------
-// Skip
-
-const char kSkipTestBytes[] =
-    "<Before skipping><To be skipped><After skipping>";
-
-TEST_1D(CodedStreamTest, SkipInput, kBlockSizes) {
-  memcpy(buffer_, kSkipTestBytes, sizeof(kSkipTestBytes));
-  ArrayInputStream input(buffer_, sizeof(buffer_), kBlockSizes_case);
-
-  {
-    CodedInputStream coded_input(&input);
-
-    std::string str;
-    EXPECT_TRUE(coded_input.ReadString(&str, strlen("<Before skipping>")));
-    EXPECT_EQ("<Before skipping>", str);
-    EXPECT_TRUE(coded_input.Skip(strlen("<To be skipped>")));
-    EXPECT_TRUE(coded_input.ReadString(&str, strlen("<After skipping>")));
-    EXPECT_EQ("<After skipping>", str);
-  }
-
-  EXPECT_EQ(strlen(kSkipTestBytes), input.ByteCount());
-}
-
-// -------------------------------------------------------------------
-// GetDirectBufferPointer
-
-TEST_F(CodedStreamTest, GetDirectBufferPointerInput) {
-  ArrayInputStream input(buffer_, sizeof(buffer_), 8);
-  CodedInputStream coded_input(&input);
-
-  const void* ptr;
-  int size;
-
-  EXPECT_TRUE(coded_input.GetDirectBufferPointer(&ptr, &size));
-  EXPECT_EQ(buffer_, ptr);
-  EXPECT_EQ(8, size);
-
-  // Peeking again should return the same pointer.
-  EXPECT_TRUE(coded_input.GetDirectBufferPointer(&ptr, &size));
-  EXPECT_EQ(buffer_, ptr);
-  EXPECT_EQ(8, size);
-
-  // Skip forward in the same buffer then peek again.
-  EXPECT_TRUE(coded_input.Skip(3));
-  EXPECT_TRUE(coded_input.GetDirectBufferPointer(&ptr, &size));
-  EXPECT_EQ(buffer_ + 3, ptr);
-  EXPECT_EQ(5, size);
-
-  // Skip to end of buffer and peek -- should get next buffer.
-  EXPECT_TRUE(coded_input.Skip(5));
-  EXPECT_TRUE(coded_input.GetDirectBufferPointer(&ptr, &size));
-  EXPECT_EQ(buffer_ + 8, ptr);
-  EXPECT_EQ(8, size);
-}
-
-TEST_F(CodedStreamTest, GetDirectBufferPointerInlineInput) {
-  ArrayInputStream input(buffer_, sizeof(buffer_), 8);
-  CodedInputStream coded_input(&input);
-
-  const void* ptr;
-  int size;
-
-  coded_input.GetDirectBufferPointerInline(&ptr, &size);
-  EXPECT_EQ(buffer_, ptr);
-  EXPECT_EQ(8, size);
-
-  // Peeking again should return the same pointer.
-  coded_input.GetDirectBufferPointerInline(&ptr, &size);
-  EXPECT_EQ(buffer_, ptr);
-  EXPECT_EQ(8, size);
-
-  // Skip forward in the same buffer then peek again.
-  EXPECT_TRUE(coded_input.Skip(3));
-  coded_input.GetDirectBufferPointerInline(&ptr, &size);
-  EXPECT_EQ(buffer_ + 3, ptr);
-  EXPECT_EQ(5, size);
-
-  // Skip to end of buffer and peek -- should return false and provide an empty
-  // buffer. It does not try to Refresh().
-  EXPECT_TRUE(coded_input.Skip(5));
-  coded_input.GetDirectBufferPointerInline(&ptr, &size);
-  EXPECT_EQ(buffer_ + 8, ptr);
-  EXPECT_EQ(0, size);
-}
-
-// -------------------------------------------------------------------
-// Limits
-
-TEST_1D(CodedStreamTest, BasicLimit, kBlockSizes) {
-  ArrayInputStream input(buffer_, sizeof(buffer_), kBlockSizes_case);
-
-  {
-    CodedInputStream coded_input(&input);
-
-    EXPECT_EQ(-1, coded_input.BytesUntilLimit());
-    CodedInputStream::Limit limit = coded_input.PushLimit(8);
-
-    // Read until we hit the limit.
-    uint32_t value;
-    EXPECT_EQ(8, coded_input.BytesUntilLimit());
-    EXPECT_TRUE(coded_input.ReadLittleEndian32(&value));
-    EXPECT_EQ(4, coded_input.BytesUntilLimit());
-    EXPECT_TRUE(coded_input.ReadLittleEndian32(&value));
-    EXPECT_EQ(0, coded_input.BytesUntilLimit());
-    EXPECT_FALSE(coded_input.ReadLittleEndian32(&value));
-    EXPECT_EQ(0, coded_input.BytesUntilLimit());
-
-    coded_input.PopLimit(limit);
-
-    EXPECT_EQ(-1, coded_input.BytesUntilLimit());
-    EXPECT_TRUE(coded_input.ReadLittleEndian32(&value));
-  }
-
-  EXPECT_EQ(12, input.ByteCount());
-}
-
-// Test what happens when we push two limits where the second (top) one is
-// shorter.
-TEST_1D(CodedStreamTest, SmallLimitOnTopOfBigLimit, kBlockSizes) {
-  ArrayInputStream input(buffer_, sizeof(buffer_), kBlockSizes_case);
-
-  {
-    CodedInputStream coded_input(&input);
-
-    EXPECT_EQ(-1, coded_input.BytesUntilLimit());
-    CodedInputStream::Limit limit1 = coded_input.PushLimit(8);
-    EXPECT_EQ(8, coded_input.BytesUntilLimit());
-    CodedInputStream::Limit limit2 = coded_input.PushLimit(4);
-
-    uint32_t value;
-
-    // Read until we hit limit2, the top and shortest limit.
-    EXPECT_EQ(4, coded_input.BytesUntilLimit());
-    EXPECT_TRUE(coded_input.ReadLittleEndian32(&value));
-    EXPECT_EQ(0, coded_input.BytesUntilLimit());
-    EXPECT_FALSE(coded_input.ReadLittleEndian32(&value));
-    EXPECT_EQ(0, coded_input.BytesUntilLimit());
-
-    coded_input.PopLimit(limit2);
-
-    // Read until we hit limit1.
-    EXPECT_EQ(4, coded_input.BytesUntilLimit());
-    EXPECT_TRUE(coded_input.ReadLittleEndian32(&value));
-    EXPECT_EQ(0, coded_input.BytesUntilLimit());
-    EXPECT_FALSE(coded_input.ReadLittleEndian32(&value));
-    EXPECT_EQ(0, coded_input.BytesUntilLimit());
-
-    coded_input.PopLimit(limit1);
-
-    // No more limits.
-    EXPECT_EQ(-1, coded_input.BytesUntilLimit());
-    EXPECT_TRUE(coded_input.ReadLittleEndian32(&value));
-  }
-
-  EXPECT_EQ(12, input.ByteCount());
-}
-
-// Test what happens when we push two limits where the second (top) one is
-// longer.  In this case, the top limit is shortened to match the previous
-// limit.
-TEST_1D(CodedStreamTest, BigLimitOnTopOfSmallLimit, kBlockSizes) {
-  ArrayInputStream input(buffer_, sizeof(buffer_), kBlockSizes_case);
-
-  {
-    CodedInputStream coded_input(&input);
-
-    EXPECT_EQ(-1, coded_input.BytesUntilLimit());
-    CodedInputStream::Limit limit1 = coded_input.PushLimit(4);
-    EXPECT_EQ(4, coded_input.BytesUntilLimit());
-    CodedInputStream::Limit limit2 = coded_input.PushLimit(8);
-
-    uint32_t value;
-
-    // Read until we hit limit2.  Except, wait!  limit1 is shorter, so
-    // we end up hitting that first, despite having 4 bytes to go on
-    // limit2.
-    EXPECT_EQ(4, coded_input.BytesUntilLimit());
-    EXPECT_TRUE(coded_input.ReadLittleEndian32(&value));
-    EXPECT_EQ(0, coded_input.BytesUntilLimit());
-    EXPECT_FALSE(coded_input.ReadLittleEndian32(&value));
-    EXPECT_EQ(0, coded_input.BytesUntilLimit());
-
-    coded_input.PopLimit(limit2);
-
-    // OK, popped limit2, now limit1 is on top, which we've already hit.
-    EXPECT_EQ(0, coded_input.BytesUntilLimit());
-    EXPECT_FALSE(coded_input.ReadLittleEndian32(&value));
-    EXPECT_EQ(0, coded_input.BytesUntilLimit());
-
-    coded_input.PopLimit(limit1);
-
-    // No more limits.
-    EXPECT_EQ(-1, coded_input.BytesUntilLimit());
-    EXPECT_TRUE(coded_input.ReadLittleEndian32(&value));
-  }
-
-  EXPECT_EQ(8, input.ByteCount());
-}
-
-TEST_F(CodedStreamTest, ExpectAtEnd) {
-  // Test ExpectAtEnd(), which is based on limits.
-  ArrayInputStream input(buffer_, sizeof(buffer_));
-  CodedInputStream coded_input(&input);
-
-  EXPECT_FALSE(coded_input.ExpectAtEnd());
-
-  CodedInputStream::Limit limit = coded_input.PushLimit(4);
-
-  uint32_t value;
-  EXPECT_TRUE(coded_input.ReadLittleEndian32(&value));
-  EXPECT_TRUE(coded_input.ExpectAtEnd());
-
-  coded_input.PopLimit(limit);
-  EXPECT_FALSE(coded_input.ExpectAtEnd());
-}
-
-TEST_F(CodedStreamTest, NegativeLimit) {
-  // Check what happens when we push a negative limit.
-  ArrayInputStream input(buffer_, sizeof(buffer_));
-  CodedInputStream coded_input(&input);
-
-  CodedInputStream::Limit limit = coded_input.PushLimit(-1234);
-  // BytesUntilLimit() returns -1 to mean "no limit", which actually means
-  // "the limit is INT_MAX relative to the beginning of the stream".
-  EXPECT_EQ(-1, coded_input.BytesUntilLimit());
-  coded_input.PopLimit(limit);
-}
-
-TEST_F(CodedStreamTest, NegativeLimitAfterReading) {
-  // Check what happens when we push a negative limit.
-  ArrayInputStream input(buffer_, sizeof(buffer_));
-  CodedInputStream coded_input(&input);
-  ASSERT_TRUE(coded_input.Skip(128));
-
-  CodedInputStream::Limit limit = coded_input.PushLimit(-64);
-  // BytesUntilLimit() returns -1 to mean "no limit", which actually means
-  // "the limit is INT_MAX relative to the beginning of the stream".
-  EXPECT_EQ(-1, coded_input.BytesUntilLimit());
-  coded_input.PopLimit(limit);
-}
-
-TEST_F(CodedStreamTest, OverflowLimit) {
-  // Check what happens when we push a limit large enough that its absolute
-  // position is more than 2GB into the stream.
-  ArrayInputStream input(buffer_, sizeof(buffer_));
-  CodedInputStream coded_input(&input);
-  ASSERT_TRUE(coded_input.Skip(128));
-
-  CodedInputStream::Limit limit = coded_input.PushLimit(INT_MAX);
-  // BytesUntilLimit() returns -1 to mean "no limit", which actually means
-  // "the limit is INT_MAX relative to the beginning of the stream".
-  EXPECT_EQ(-1, coded_input.BytesUntilLimit());
-  coded_input.PopLimit(limit);
-}
-
-TEST_F(CodedStreamTest, TotalBytesLimit) {
-  ArrayInputStream input(buffer_, sizeof(buffer_));
-  CodedInputStream coded_input(&input);
-  coded_input.SetTotalBytesLimit(16);
-  EXPECT_EQ(16, coded_input.BytesUntilTotalBytesLimit());
-
-  std::string str;
-  EXPECT_TRUE(coded_input.ReadString(&str, 16));
-  EXPECT_EQ(0, coded_input.BytesUntilTotalBytesLimit());
-
-  std::vector<std::string> errors;
-
-  {
-    ScopedMemoryLog error_log;
-    EXPECT_FALSE(coded_input.ReadString(&str, 1));
-    errors = error_log.GetMessages(ERROR);
-  }
-
-  ASSERT_EQ(1, errors.size());
-  EXPECT_PRED_FORMAT2(testing::IsSubstring,
-                      "A protocol message was rejected because it was too big",
-                      errors[0]);
-
-  coded_input.SetTotalBytesLimit(32);
-  EXPECT_EQ(16, coded_input.BytesUntilTotalBytesLimit());
-  EXPECT_TRUE(coded_input.ReadString(&str, 16));
-  EXPECT_EQ(0, coded_input.BytesUntilTotalBytesLimit());
-}
-
-TEST_F(CodedStreamTest, TotalBytesLimitNotValidMessageEnd) {
-  // total_bytes_limit_ is not a valid place for a message to end.
-
-  ArrayInputStream input(buffer_, sizeof(buffer_));
-  CodedInputStream coded_input(&input);
-
-  // Set both total_bytes_limit and a regular limit at 16 bytes.
-  coded_input.SetTotalBytesLimit(16);
-  CodedInputStream::Limit limit = coded_input.PushLimit(16);
-
-  // Read 16 bytes.
-  std::string str;
-  EXPECT_TRUE(coded_input.ReadString(&str, 16));
-
-  // Read a tag.  Should fail, but report being a valid endpoint since it's
-  // a regular limit.
-  EXPECT_EQ(0, coded_input.ReadTagNoLastTag());
-  EXPECT_TRUE(coded_input.ConsumedEntireMessage());
-
-  // Pop the limit.
-  coded_input.PopLimit(limit);
-
-  // Read a tag.  Should fail, and report *not* being a valid endpoint, since
-  // this time we're hitting the total bytes limit.
-  EXPECT_EQ(0, coded_input.ReadTagNoLastTag());
-  EXPECT_FALSE(coded_input.ConsumedEntireMessage());
-}
-
-TEST_F(CodedStreamTest, RecursionLimit) {
-  ArrayInputStream input(buffer_, sizeof(buffer_));
-  CodedInputStream coded_input(&input);
-  coded_input.SetRecursionLimit(4);
-
-  // This is way too much testing for a counter.
-  EXPECT_TRUE(coded_input.IncrementRecursionDepth());   // 1
-  EXPECT_TRUE(coded_input.IncrementRecursionDepth());   // 2
-  EXPECT_TRUE(coded_input.IncrementRecursionDepth());   // 3
-  EXPECT_TRUE(coded_input.IncrementRecursionDepth());   // 4
-  EXPECT_FALSE(coded_input.IncrementRecursionDepth());  // 5
-  EXPECT_FALSE(coded_input.IncrementRecursionDepth());  // 6
-  coded_input.DecrementRecursionDepth();                // 5
-  EXPECT_FALSE(coded_input.IncrementRecursionDepth());  // 6
-  coded_input.DecrementRecursionDepth();                // 5
-  coded_input.DecrementRecursionDepth();                // 4
-  coded_input.DecrementRecursionDepth();                // 3
-  EXPECT_TRUE(coded_input.IncrementRecursionDepth());   // 4
-  EXPECT_FALSE(coded_input.IncrementRecursionDepth());  // 5
-  coded_input.DecrementRecursionDepth();                // 4
-  coded_input.DecrementRecursionDepth();                // 3
-  coded_input.DecrementRecursionDepth();                // 2
-  coded_input.DecrementRecursionDepth();                // 1
-  coded_input.DecrementRecursionDepth();                // 0
-  coded_input.DecrementRecursionDepth();                // 0
-  coded_input.DecrementRecursionDepth();                // 0
-  EXPECT_TRUE(coded_input.IncrementRecursionDepth());   // 1
-  EXPECT_TRUE(coded_input.IncrementRecursionDepth());   // 2
-  EXPECT_TRUE(coded_input.IncrementRecursionDepth());   // 3
-  EXPECT_TRUE(coded_input.IncrementRecursionDepth());   // 4
-  EXPECT_FALSE(coded_input.IncrementRecursionDepth());  // 5
-
-  coded_input.SetRecursionLimit(6);
-  EXPECT_TRUE(coded_input.IncrementRecursionDepth());   // 6
-  EXPECT_FALSE(coded_input.IncrementRecursionDepth());  // 7
-}
-
-
-class ReallyBigInputStream : public ZeroCopyInputStream {
- public:
-  ReallyBigInputStream() : backup_amount_(0), buffer_count_(0) {}
-
-  // implements ZeroCopyInputStream ----------------------------------
-  bool Next(const void** data, int* size) override {
-    // We only expect BackUp() to be called at the end.
-    EXPECT_EQ(0, backup_amount_);
-
-    switch (buffer_count_++) {
-      case 0:
-        *data = buffer_;
-        *size = sizeof(buffer_);
-        return true;
-      case 1:
-        // Return an enormously large buffer that, when combined with the 1k
-        // returned already, should overflow the total_bytes_read_ counter in
-        // CodedInputStream.  Note that we'll only read the first 1024 bytes
-        // of this buffer so it's OK that we have it point at buffer_.
-        *data = buffer_;
-        *size = INT_MAX;
-        return true;
-      default:
-        return false;
-    }
-  }
-
-  void BackUp(int count) override { backup_amount_ = count; }
-
-  bool Skip(int count) override {
-    GOOGLE_LOG(FATAL) << "Not implemented.";
-    return false;
-  }
-  int64_t ByteCount() const override {
-    GOOGLE_LOG(FATAL) << "Not implemented.";
-    return 0;
-  }
-
-  int backup_amount_;
-
- private:
-  char buffer_[1024];
-  int64_t buffer_count_;
-};
-
-TEST_F(CodedStreamTest, InputOver2G) {
-  // CodedInputStream should gracefully handle input over 2G and call
-  // input.BackUp() with the correct number of bytes on destruction.
-  ReallyBigInputStream input;
-
-  std::vector<std::string> errors;
-
-  {
-    ScopedMemoryLog error_log;
-    CodedInputStream coded_input(&input);
-    std::string str;
-    EXPECT_TRUE(coded_input.ReadString(&str, 512));
-    EXPECT_TRUE(coded_input.ReadString(&str, 1024));
-    errors = error_log.GetMessages(ERROR);
-  }
-
-  EXPECT_EQ(INT_MAX - 512, input.backup_amount_);
-  EXPECT_EQ(0, errors.size());
-}
-
-}  // namespace
-}  // namespace io
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
diff --git a/libs/protobuf/src/google/protobuf/io/gzip_stream.cc b/libs/protobuf/src/google/protobuf/io/gzip_stream.cc
deleted file mode 100644
index a5284b3..0000000
--- a/libs/protobuf/src/google/protobuf/io/gzip_stream.cc
+++ /dev/null
@@ -1,334 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: brianolson@google.com (Brian Olson)
-//
-// This file contains the implementation of classes GzipInputStream and
-// GzipOutputStream.
-
-
-#if HAVE_ZLIB
-#include <google/protobuf/io/gzip_stream.h>
-#include <google/protobuf/port.h>
-
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/stubs/logging.h>
-
-namespace google {
-namespace protobuf {
-namespace io {
-
-static const int kDefaultBufferSize = 65536;
-
-GzipInputStream::GzipInputStream(ZeroCopyInputStream* sub_stream, Format format,
-                                 int buffer_size)
-    : format_(format), sub_stream_(sub_stream), zerror_(Z_OK), byte_count_(0) {
-  zcontext_.state = Z_NULL;
-  zcontext_.zalloc = Z_NULL;
-  zcontext_.zfree = Z_NULL;
-  zcontext_.opaque = Z_NULL;
-  zcontext_.total_out = 0;
-  zcontext_.next_in = NULL;
-  zcontext_.avail_in = 0;
-  zcontext_.total_in = 0;
-  zcontext_.msg = NULL;
-  if (buffer_size == -1) {
-    output_buffer_length_ = kDefaultBufferSize;
-  } else {
-    output_buffer_length_ = buffer_size;
-  }
-  output_buffer_ = operator new(output_buffer_length_);
-  GOOGLE_CHECK(output_buffer_ != NULL);
-  zcontext_.next_out = static_cast<Bytef*>(output_buffer_);
-  zcontext_.avail_out = output_buffer_length_;
-  output_position_ = output_buffer_;
-}
-GzipInputStream::~GzipInputStream() {
-  internal::SizedDelete(output_buffer_, output_buffer_length_);
-  zerror_ = inflateEnd(&zcontext_);
-}
-
-static inline int internalInflateInit2(z_stream* zcontext,
-                                       GzipInputStream::Format format) {
-  int windowBitsFormat = 0;
-  switch (format) {
-    case GzipInputStream::GZIP:
-      windowBitsFormat = 16;
-      break;
-    case GzipInputStream::AUTO:
-      windowBitsFormat = 32;
-      break;
-    case GzipInputStream::ZLIB:
-      windowBitsFormat = 0;
-      break;
-  }
-  return inflateInit2(zcontext, /* windowBits */ 15 | windowBitsFormat);
-}
-
-int GzipInputStream::Inflate(int flush) {
-  if ((zerror_ == Z_OK) && (zcontext_.avail_out == 0)) {
-    // previous inflate filled output buffer. don't change input params yet.
-  } else if (zcontext_.avail_in == 0) {
-    const void* in;
-    int in_size;
-    bool first = zcontext_.next_in == NULL;
-    bool ok = sub_stream_->Next(&in, &in_size);
-    if (!ok) {
-      zcontext_.next_out = NULL;
-      zcontext_.avail_out = 0;
-      return Z_STREAM_END;
-    }
-    zcontext_.next_in = static_cast<Bytef*>(const_cast<void*>(in));
-    zcontext_.avail_in = in_size;
-    if (first) {
-      int error = internalInflateInit2(&zcontext_, format_);
-      if (error != Z_OK) {
-        return error;
-      }
-    }
-  }
-  zcontext_.next_out = static_cast<Bytef*>(output_buffer_);
-  zcontext_.avail_out = output_buffer_length_;
-  output_position_ = output_buffer_;
-  int error = inflate(&zcontext_, flush);
-  return error;
-}
-
-void GzipInputStream::DoNextOutput(const void** data, int* size) {
-  *data = output_position_;
-  *size = ((uintptr_t)zcontext_.next_out) - ((uintptr_t)output_position_);
-  output_position_ = zcontext_.next_out;
-}
-
-// implements ZeroCopyInputStream ----------------------------------
-bool GzipInputStream::Next(const void** data, int* size) {
-  bool ok = (zerror_ == Z_OK) || (zerror_ == Z_STREAM_END) ||
-            (zerror_ == Z_BUF_ERROR);
-  if ((!ok) || (zcontext_.next_out == NULL)) {
-    return false;
-  }
-  if (zcontext_.next_out != output_position_) {
-    DoNextOutput(data, size);
-    return true;
-  }
-  if (zerror_ == Z_STREAM_END) {
-    if (zcontext_.next_out != NULL) {
-      // sub_stream_ may have concatenated streams to follow
-      zerror_ = inflateEnd(&zcontext_);
-      byte_count_ += zcontext_.total_out;
-      if (zerror_ != Z_OK) {
-        return false;
-      }
-      zerror_ = internalInflateInit2(&zcontext_, format_);
-      if (zerror_ != Z_OK) {
-        return false;
-      }
-    } else {
-      *data = NULL;
-      *size = 0;
-      return false;
-    }
-  }
-  zerror_ = Inflate(Z_NO_FLUSH);
-  if ((zerror_ == Z_STREAM_END) && (zcontext_.next_out == NULL)) {
-    // The underlying stream's Next returned false inside Inflate.
-    return false;
-  }
-  ok = (zerror_ == Z_OK) || (zerror_ == Z_STREAM_END) ||
-       (zerror_ == Z_BUF_ERROR);
-  if (!ok) {
-    return false;
-  }
-  DoNextOutput(data, size);
-  return true;
-}
-void GzipInputStream::BackUp(int count) {
-  output_position_ = reinterpret_cast<void*>(
-      reinterpret_cast<uintptr_t>(output_position_) - count);
-}
-bool GzipInputStream::Skip(int count) {
-  const void* data;
-  int size = 0;
-  bool ok = Next(&data, &size);
-  while (ok && (size < count)) {
-    count -= size;
-    ok = Next(&data, &size);
-  }
-  if (size > count) {
-    BackUp(size - count);
-  }
-  return ok;
-}
-int64_t GzipInputStream::ByteCount() const {
-  int64_t ret = byte_count_ + zcontext_.total_out;
-  if (zcontext_.next_out != NULL && output_position_ != NULL) {
-    ret += reinterpret_cast<uintptr_t>(zcontext_.next_out) -
-           reinterpret_cast<uintptr_t>(output_position_);
-  }
-  return ret;
-}
-
-// =========================================================================
-
-GzipOutputStream::Options::Options()
-    : format(GZIP),
-      buffer_size(kDefaultBufferSize),
-      compression_level(Z_DEFAULT_COMPRESSION),
-      compression_strategy(Z_DEFAULT_STRATEGY) {}
-
-GzipOutputStream::GzipOutputStream(ZeroCopyOutputStream* sub_stream) {
-  Init(sub_stream, Options());
-}
-
-GzipOutputStream::GzipOutputStream(ZeroCopyOutputStream* sub_stream,
-                                   const Options& options) {
-  Init(sub_stream, options);
-}
-
-void GzipOutputStream::Init(ZeroCopyOutputStream* sub_stream,
-                            const Options& options) {
-  sub_stream_ = sub_stream;
-  sub_data_ = NULL;
-  sub_data_size_ = 0;
-
-  input_buffer_length_ = options.buffer_size;
-  input_buffer_ = operator new(input_buffer_length_);
-  GOOGLE_CHECK(input_buffer_ != NULL);
-
-  zcontext_.zalloc = Z_NULL;
-  zcontext_.zfree = Z_NULL;
-  zcontext_.opaque = Z_NULL;
-  zcontext_.next_out = NULL;
-  zcontext_.avail_out = 0;
-  zcontext_.total_out = 0;
-  zcontext_.next_in = NULL;
-  zcontext_.avail_in = 0;
-  zcontext_.total_in = 0;
-  zcontext_.msg = NULL;
-  // default to GZIP format
-  int windowBitsFormat = 16;
-  if (options.format == ZLIB) {
-    windowBitsFormat = 0;
-  }
-  zerror_ =
-      deflateInit2(&zcontext_, options.compression_level, Z_DEFLATED,
-                   /* windowBits */ 15 | windowBitsFormat,
-                   /* memLevel (default) */ 8, options.compression_strategy);
-}
-
-GzipOutputStream::~GzipOutputStream() {
-  Close();
-  internal::SizedDelete(input_buffer_, input_buffer_length_);
-}
-
-// private
-int GzipOutputStream::Deflate(int flush) {
-  int error = Z_OK;
-  do {
-    if ((sub_data_ == NULL) || (zcontext_.avail_out == 0)) {
-      bool ok = sub_stream_->Next(&sub_data_, &sub_data_size_);
-      if (!ok) {
-        sub_data_ = NULL;
-        sub_data_size_ = 0;
-        return Z_BUF_ERROR;
-      }
-      GOOGLE_CHECK_GT(sub_data_size_, 0);
-      zcontext_.next_out = static_cast<Bytef*>(sub_data_);
-      zcontext_.avail_out = sub_data_size_;
-    }
-    error = deflate(&zcontext_, flush);
-  } while (error == Z_OK && zcontext_.avail_out == 0);
-  if ((flush == Z_FULL_FLUSH) || (flush == Z_FINISH)) {
-    // Notify lower layer of data.
-    sub_stream_->BackUp(zcontext_.avail_out);
-    // We don't own the buffer anymore.
-    sub_data_ = NULL;
-    sub_data_size_ = 0;
-  }
-  return error;
-}
-
-// implements ZeroCopyOutputStream ---------------------------------
-bool GzipOutputStream::Next(void** data, int* size) {
-  if ((zerror_ != Z_OK) && (zerror_ != Z_BUF_ERROR)) {
-    return false;
-  }
-  if (zcontext_.avail_in != 0) {
-    zerror_ = Deflate(Z_NO_FLUSH);
-    if (zerror_ != Z_OK) {
-      return false;
-    }
-  }
-  if (zcontext_.avail_in == 0) {
-    // all input was consumed. reset the buffer.
-    zcontext_.next_in = static_cast<Bytef*>(input_buffer_);
-    zcontext_.avail_in = input_buffer_length_;
-    *data = input_buffer_;
-    *size = input_buffer_length_;
-  } else {
-    // The loop in Deflate should consume all avail_in
-    GOOGLE_LOG(DFATAL) << "Deflate left bytes unconsumed";
-  }
-  return true;
-}
-void GzipOutputStream::BackUp(int count) {
-  GOOGLE_CHECK_GE(zcontext_.avail_in, static_cast<uInt>(count));
-  zcontext_.avail_in -= count;
-}
-int64_t GzipOutputStream::ByteCount() const {
-  return zcontext_.total_in + zcontext_.avail_in;
-}
-
-bool GzipOutputStream::Flush() {
-  zerror_ = Deflate(Z_FULL_FLUSH);
-  // Return true if the flush succeeded or if it was a no-op.
-  return (zerror_ == Z_OK) ||
-         (zerror_ == Z_BUF_ERROR && zcontext_.avail_in == 0 &&
-          zcontext_.avail_out != 0);
-}
-
-bool GzipOutputStream::Close() {
-  if ((zerror_ != Z_OK) && (zerror_ != Z_BUF_ERROR)) {
-    return false;
-  }
-  do {
-    zerror_ = Deflate(Z_FINISH);
-  } while (zerror_ == Z_OK);
-  zerror_ = deflateEnd(&zcontext_);
-  bool ok = zerror_ == Z_OK;
-  zerror_ = Z_STREAM_END;
-  return ok;
-}
-
-}  // namespace io
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // HAVE_ZLIB
diff --git a/libs/protobuf/src/google/protobuf/io/gzip_stream.h b/libs/protobuf/src/google/protobuf/io/gzip_stream.h
deleted file mode 100644
index 4cf71b6..0000000
--- a/libs/protobuf/src/google/protobuf/io/gzip_stream.h
+++ /dev/null
@@ -1,205 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: brianolson@google.com (Brian Olson)
-//
-// This file contains the definition for classes GzipInputStream and
-// GzipOutputStream.
-//
-// GzipInputStream decompresses data from an underlying
-// ZeroCopyInputStream and provides the decompressed data as a
-// ZeroCopyInputStream.
-//
-// GzipOutputStream is an ZeroCopyOutputStream that compresses data to
-// an underlying ZeroCopyOutputStream.
-
-#ifndef GOOGLE_PROTOBUF_IO_GZIP_STREAM_H__
-#define GOOGLE_PROTOBUF_IO_GZIP_STREAM_H__
-
-
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/io/zero_copy_stream.h>
-#include <google/protobuf/port.h>
-#include "zlib.h"
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-namespace io {
-
-// A ZeroCopyInputStream that reads compressed data through zlib
-class PROTOBUF_EXPORT GzipInputStream PROTOBUF_FUTURE_FINAL
-    : public ZeroCopyInputStream {
- public:
-  // Format key for constructor
-  enum Format {
-    // zlib will autodetect gzip header or deflate stream
-    AUTO = 0,
-
-    // GZIP streams have some extra header data for file attributes.
-    GZIP = 1,
-
-    // Simpler zlib stream format.
-    ZLIB = 2,
-  };
-
-  // buffer_size and format may be -1 for default of 64kB and GZIP format
-  explicit GzipInputStream(ZeroCopyInputStream* sub_stream,
-                           Format format = AUTO, int buffer_size = -1);
-  virtual ~GzipInputStream();
-
-  // Return last error message or NULL if no error.
-  inline const char* ZlibErrorMessage() const { return zcontext_.msg; }
-  inline int ZlibErrorCode() const { return zerror_; }
-
-  // implements ZeroCopyInputStream ----------------------------------
-  bool Next(const void** data, int* size) override;
-  void BackUp(int count) override;
-  bool Skip(int count) override;
-  int64_t ByteCount() const override;
-
- private:
-  Format format_;
-
-  ZeroCopyInputStream* sub_stream_;
-
-  z_stream zcontext_;
-  int zerror_;
-
-  void* output_buffer_;
-  void* output_position_;
-  size_t output_buffer_length_;
-  int64_t byte_count_;
-
-  int Inflate(int flush);
-  void DoNextOutput(const void** data, int* size);
-
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(GzipInputStream);
-};
-
-class PROTOBUF_EXPORT GzipOutputStream PROTOBUF_FUTURE_FINAL
-    : public ZeroCopyOutputStream {
- public:
-  // Format key for constructor
-  enum Format {
-    // GZIP streams have some extra header data for file attributes.
-    GZIP = 1,
-
-    // Simpler zlib stream format.
-    ZLIB = 2,
-  };
-
-  struct PROTOBUF_EXPORT Options {
-    // Defaults to GZIP.
-    Format format;
-
-    // What size buffer to use internally.  Defaults to 64kB.
-    int buffer_size;
-
-    // A number between 0 and 9, where 0 is no compression and 9 is best
-    // compression.  Defaults to Z_DEFAULT_COMPRESSION (see zlib.h).
-    int compression_level;
-
-    // Defaults to Z_DEFAULT_STRATEGY.  Can also be set to Z_FILTERED,
-    // Z_HUFFMAN_ONLY, or Z_RLE.  See the documentation for deflateInit2 in
-    // zlib.h for definitions of these constants.
-    int compression_strategy;
-
-    Options();  // Initializes with default values.
-  };
-
-  // Create a GzipOutputStream with default options.
-  explicit GzipOutputStream(ZeroCopyOutputStream* sub_stream);
-
-  // Create a GzipOutputStream with the given options.
-  GzipOutputStream(ZeroCopyOutputStream* sub_stream, const Options& options);
-
-  virtual ~GzipOutputStream();
-
-  // Return last error message or NULL if no error.
-  inline const char* ZlibErrorMessage() const { return zcontext_.msg; }
-  inline int ZlibErrorCode() const { return zerror_; }
-
-  // Flushes data written so far to zipped data in the underlying stream.
-  // It is the caller's responsibility to flush the underlying stream if
-  // necessary.
-  // Compression may be less efficient stopping and starting around flushes.
-  // Returns true if no error.
-  //
-  // Please ensure that block size is > 6. Here is an excerpt from the zlib
-  // doc that explains why:
-  //
-  // In the case of a Z_FULL_FLUSH or Z_SYNC_FLUSH, make sure that avail_out
-  // is greater than six to avoid repeated flush markers due to
-  // avail_out == 0 on return.
-  bool Flush();
-
-  // Writes out all data and closes the gzip stream.
-  // It is the caller's responsibility to close the underlying stream if
-  // necessary.
-  // Returns true if no error.
-  bool Close();
-
-  // implements ZeroCopyOutputStream ---------------------------------
-  bool Next(void** data, int* size) override;
-  void BackUp(int count) override;
-  int64_t ByteCount() const override;
-
- private:
-  ZeroCopyOutputStream* sub_stream_;
-  // Result from calling Next() on sub_stream_
-  void* sub_data_;
-  int sub_data_size_;
-
-  z_stream zcontext_;
-  int zerror_;
-  void* input_buffer_;
-  size_t input_buffer_length_;
-
-  // Shared constructor code.
-  void Init(ZeroCopyOutputStream* sub_stream, const Options& options);
-
-  // Do some compression.
-  // Takes zlib flush mode.
-  // Returns zlib error code.
-  int Deflate(int flush);
-
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(GzipOutputStream);
-};
-
-}  // namespace io
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
-
-#endif  // GOOGLE_PROTOBUF_IO_GZIP_STREAM_H__
diff --git a/libs/protobuf/src/google/protobuf/io/gzip_stream_unittest.sh b/libs/protobuf/src/google/protobuf/io/gzip_stream_unittest.sh
deleted file mode 100755
index 16251a9..0000000
--- a/libs/protobuf/src/google/protobuf/io/gzip_stream_unittest.sh
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/sh -x
-#
-# Protocol Buffers - Google's data interchange format
-# Copyright 2009 Google Inc.  All rights reserved.
-# https://developers.google.com/protocol-buffers/
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-# Author: brianolson@google.com (Brian Olson)
-#
-# Test compatibility between command line gzip/gunzip binaries and
-# ZeroCopyStream versions.
-
-TESTFILE=Makefile
-
-(./zcgzip < ${TESTFILE} | gunzip | cmp - ${TESTFILE}) && \
-(gzip < ${TESTFILE} | ./zcgunzip | cmp - ${TESTFILE})
-
-# Result of "(cmd) && (cmd)" implicitly becomes result of this script
-# and thus the test.
diff --git a/libs/protobuf/src/google/protobuf/io/io_win32.cc b/libs/protobuf/src/google/protobuf/io/io_win32.cc
deleted file mode 100644
index 4e81908..0000000
--- a/libs/protobuf/src/google/protobuf/io/io_win32.cc
+++ /dev/null
@@ -1,471 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: laszlocsomor@google.com (Laszlo Csomor)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-
-// Implementation for long-path-aware open/mkdir/access/etc. on Windows, as well
-// as for the supporting utility functions.
-//
-// These functions convert the input path to an absolute Windows path
-// with "\\?\" prefix, then pass that to _wopen/_wmkdir/_waccess/etc.
-// (declared in <io.h>) respectively. This allows working with files/directories
-// whose paths are longer than MAX_PATH (260 chars).
-//
-// This file is only used on Windows, it's empty on other platforms.
-
-#if defined(_WIN32) && !defined(_XBOX_ONE)
-
-// Comment this out to fall back to using the ANSI versions (open, mkdir, ...)
-// instead of the Unicode ones (_wopen, _wmkdir, ...). Doing so can be useful to
-// debug failing tests if that's caused by the long path support.
-#define SUPPORT_LONGPATHS
-
-#include <google/protobuf/io/io_win32.h>
-
-#include <ctype.h>
-#include <direct.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <io.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <wctype.h>
-
-#ifndef WIN32_LEAN_AND_MEAN
-#define WIN32_LEAN_AND_MEAN 1
-#endif
-
-#include <windows.h>
-
-#include <memory>
-#include <sstream>
-#include <string>
-#include <vector>
-
-namespace google {
-namespace protobuf {
-namespace io {
-namespace win32 {
-namespace {
-
-using std::string;
-using std::wstring;
-
-template <typename char_type>
-struct CharTraits {
-  static bool is_alpha(char_type ch);
-};
-
-template <>
-struct CharTraits<char> {
-  static bool is_alpha(char ch) { return isalpha(ch); }
-};
-
-template <>
-struct CharTraits<wchar_t> {
-  static bool is_alpha(wchar_t ch) { return iswalpha(ch); }
-};
-
-template <typename char_type>
-bool null_or_empty(const char_type* s) {
-  return s == nullptr || *s == 0;
-}
-
-// Returns true if the path starts with a drive letter, e.g. "c:".
-// Note that this won't check for the "\" after the drive letter, so this also
-// returns true for "c:foo" (which is "c:\${PWD}\foo").
-// This check requires that a path not have a longpath prefix ("\\?\").
-template <typename char_type>
-bool has_drive_letter(const char_type* ch) {
-  return CharTraits<char_type>::is_alpha(ch[0]) && ch[1] == ':';
-}
-
-// Returns true if the path starts with a longpath prefix ("\\?\").
-template <typename char_type>
-bool has_longpath_prefix(const char_type* path) {
-  return path[0] == '\\' && path[1] == '\\' && path[2] == '?' &&
-         path[3] == '\\';
-}
-
-template <typename char_type>
-bool is_separator(char_type c) {
-  return c == '/' || c == '\\';
-}
-
-// Returns true if the path starts with a drive specifier (e.g. "c:\").
-template <typename char_type>
-bool is_path_absolute(const char_type* path) {
-  return has_drive_letter(path) && is_separator(path[2]);
-}
-
-template <typename char_type>
-bool is_drive_relative(const char_type* path) {
-  return has_drive_letter(path) && (path[2] == 0 || !is_separator(path[2]));
-}
-
-wstring join_paths(const wstring& path1, const wstring& path2) {
-  if (path1.empty() || is_path_absolute(path2.c_str()) ||
-      has_longpath_prefix(path2.c_str())) {
-    return path2;
-  }
-  if (path2.empty()) {
-    return path1;
-  }
-
-  if (is_separator(path1[path1.size() - 1])) {
-    return is_separator(path2[0]) ? (path1 + path2.substr(1))
-                                       : (path1 + path2);
-  } else {
-    return is_separator(path2[0]) ? (path1 + path2)
-                                       : (path1 + L'\\' + path2);
-  }
-}
-
-wstring normalize(wstring path) {
-  if (has_longpath_prefix(path.c_str())) {
-    path = path.substr(4);
-  }
-
-  static const wstring dot(L".");
-  static const wstring dotdot(L"..");
-  const WCHAR* p = path.c_str();
-
-  std::vector<wstring> segments;
-  int segment_start = -1;
-  // Find the path segments in `path` (separated by "/").
-  for (int i = 0;; ++i) {
-    if (!is_separator(p[i]) && p[i] != L'\0') {
-      // The current character does not end a segment, so start one unless it's
-      // already started.
-      if (segment_start < 0) {
-        segment_start = i;
-      }
-    } else if (segment_start >= 0 && i > segment_start) {
-      // The current character is "/" or "\0", so this ends a segment.
-      // Add that to `segments` if there's anything to add; handle "." and "..".
-      wstring segment(p, segment_start, i - segment_start);
-      segment_start = -1;
-      if (segment == dotdot) {
-        if (!segments.empty() &&
-            (!has_drive_letter(segments[0].c_str()) || segments.size() > 1)) {
-          segments.pop_back();
-        }
-      } else if (segment != dot && !segment.empty()) {
-        segments.push_back(segment);
-      }
-    }
-    if (p[i] == L'\0') {
-      break;
-    }
-  }
-
-  // Handle the case when `path` is just a drive specifier (or some degenerate
-  // form of it, e.g. "c:\..").
-  if (segments.size() == 1 && segments[0].size() == 2 &&
-      has_drive_letter(segments[0].c_str())) {
-    return segments[0] + L'\\';
-  }
-
-  // Join all segments.
-  bool first = true;
-  std::wstringstream result;
-  for (int i = 0; i < segments.size(); ++i) {
-    if (!first) {
-      result << L'\\';
-    }
-    first = false;
-    result << segments[i];
-  }
-  // Preserve trailing separator if the input contained it.
-  if (!path.empty() && is_separator(p[path.size() - 1])) {
-    result << L'\\';
-  }
-  return result.str();
-}
-
-bool as_windows_path(const char* path, wstring* result) {
-  if (null_or_empty(path)) {
-    result->clear();
-    return true;
-  }
-  wstring wpath;
-  if (!strings::utf8_to_wcs(path, &wpath)) {
-    return false;
-  }
-  if (has_longpath_prefix(wpath.c_str())) {
-    *result = wpath;
-    return true;
-  }
-  if (is_separator(path[0]) || is_drive_relative(path)) {
-    return false;
-  }
-
-
-  if (!is_path_absolute(wpath.c_str())) {
-    int size = ::GetCurrentDirectoryW(0, nullptr);
-    if (size == 0 && GetLastError() != ERROR_INSUFFICIENT_BUFFER) {
-      return false;
-    }
-    std::unique_ptr<WCHAR[]> wcwd(new WCHAR[size]);
-    ::GetCurrentDirectoryW(size, wcwd.get());
-    wpath = join_paths(wcwd.get(), wpath);
-  }
-  wpath = normalize(wpath);
-  if (!has_longpath_prefix(wpath.c_str())) {
-    // Add the "\\?\" prefix unconditionally. This way we prevent the Win32 API
-    // from processing the path and "helpfully" removing trailing dots from the
-    // path, for example.
-    // See https://github.com/bazelbuild/bazel/issues/2935
-    wpath = wstring(L"\\\\?\\") + wpath;
-  }
-  *result = wpath;
-  return true;
-}
-
-}  // namespace
-
-int open(const char* path, int flags, int mode) {
-#ifdef SUPPORT_LONGPATHS
-  wstring wpath;
-  if (!as_windows_path(path, &wpath)) {
-    errno = ENOENT;
-    return -1;
-  }
-  return ::_wopen(wpath.c_str(), flags, mode);
-#else
-  return ::_open(path, flags, mode);
-#endif
-}
-
-int mkdir(const char* path, int /*_mode*/) {
-#ifdef SUPPORT_LONGPATHS
-  wstring wpath;
-  if (!as_windows_path(path, &wpath)) {
-    errno = ENOENT;
-    return -1;
-  }
-  return ::_wmkdir(wpath.c_str());
-#else   // not SUPPORT_LONGPATHS
-  return ::_mkdir(path);
-#endif  // not SUPPORT_LONGPATHS
-}
-
-int access(const char* path, int mode) {
-#ifdef SUPPORT_LONGPATHS
-  wstring wpath;
-  if (!as_windows_path(path, &wpath)) {
-    errno = ENOENT;
-    return -1;
-  }
-  return ::_waccess(wpath.c_str(), mode);
-#else
-  return ::_access(path, mode);
-#endif
-}
-
-int chdir(const char* path) {
-#ifdef SUPPORT_LONGPATHS
-  wstring wpath;
-  if (!as_windows_path(path, &wpath)) {
-    errno = ENOENT;
-    return -1;
-  }
-  return ::_wchdir(wpath.c_str());
-#else
-  return ::_chdir(path);
-#endif
-}
-
-int stat(const char* path, struct _stat* buffer) {
-#ifdef SUPPORT_LONGPATHS
-  wstring wpath;
-  if (!as_windows_path(path, &wpath)) {
-    errno = ENOENT;
-    return -1;
-  }
-  return ::_wstat(wpath.c_str(), buffer);
-#else   // not SUPPORT_LONGPATHS
-  return ::_stat(path, buffer);
-#endif  // not SUPPORT_LONGPATHS
-}
-
-FILE* fopen(const char* path, const char* mode) {
-#ifdef SUPPORT_LONGPATHS
-  if (null_or_empty(path)) {
-    errno = EINVAL;
-    return nullptr;
-  }
-  wstring wpath;
-  if (!as_windows_path(path, &wpath)) {
-    errno = ENOENT;
-    return nullptr;
-  }
-  wstring wmode;
-  if (!strings::utf8_to_wcs(mode, &wmode)) {
-    errno = EINVAL;
-    return nullptr;
-  }
-  return ::_wfopen(wpath.c_str(), wmode.c_str());
-#else
-  return ::fopen(path, mode);
-#endif
-}
-
-int close(int fd) { return ::_close(fd); }
-
-int dup(int fd) { return ::_dup(fd); }
-
-int dup2(int fd1, int fd2) { return ::_dup2(fd1, fd2); }
-
-int read(int fd, void* buffer, size_t size) {
-  return ::_read(fd, buffer, size);
-}
-
-int setmode(int fd, int mode) { return ::_setmode(fd, mode); }
-
-int write(int fd, const void* buffer, size_t size) {
-  return ::_write(fd, buffer, size);
-}
-
-wstring testonly_utf8_to_winpath(const char* path) {
-  wstring wpath;
-  return as_windows_path(path, &wpath) ? wpath : wstring();
-}
-
-ExpandWildcardsResult ExpandWildcards(
-    const string& path, std::function<void(const string&)> consume) {
-  if (path.find_first_of("*?") == string::npos) {
-    // There are no wildcards in the path, we don't need to expand it.
-    consume(path);
-    return ExpandWildcardsResult::kSuccess;
-  }
-
-  wstring wpath;
-  if (!as_windows_path(path.c_str(), &wpath)) {
-    return ExpandWildcardsResult::kErrorInputPathConversion;
-  }
-
-  static const wstring kDot = L".";
-  static const wstring kDotDot = L"..";
-  WIN32_FIND_DATAW metadata;
-  HANDLE handle = ::FindFirstFileW(wpath.c_str(), &metadata);
-  if (handle == INVALID_HANDLE_VALUE) {
-    // The pattern does not match any files (or directories).
-    return ExpandWildcardsResult::kErrorNoMatchingFile;
-  }
-
-  string::size_type pos = path.find_last_of("\\/");
-  string dirname;
-  if (pos != string::npos) {
-    dirname = path.substr(0, pos + 1);
-  }
-
-  ExpandWildcardsResult matched = ExpandWildcardsResult::kErrorNoMatchingFile;
-  do {
-    // Ignore ".", "..", and directories.
-    if ((metadata.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) == 0 &&
-        kDot != metadata.cFileName && kDotDot != metadata.cFileName) {
-      matched = ExpandWildcardsResult::kSuccess;
-      string filename;
-      if (!strings::wcs_to_utf8(metadata.cFileName, &filename)) {
-        matched = ExpandWildcardsResult::kErrorOutputPathConversion;
-        break;
-      }
-
-      if (dirname.empty()) {
-        consume(filename);
-      } else {
-        consume(dirname + filename);
-      }
-    }
-  } while (::FindNextFileW(handle, &metadata));
-  FindClose(handle);
-  return matched;
-}
-
-namespace strings {
-
-bool wcs_to_mbs(const WCHAR* s, string* out, bool outUtf8) {
-  if (null_or_empty(s)) {
-    out->clear();
-    return true;
-  }
-  BOOL usedDefaultChar = FALSE;
-  SetLastError(0);
-  int size = WideCharToMultiByte(
-      outUtf8 ? CP_UTF8 : CP_ACP, 0, s, -1, nullptr, 0, nullptr,
-      outUtf8 ? nullptr : &usedDefaultChar);
-  if ((size == 0 && GetLastError() != ERROR_INSUFFICIENT_BUFFER)
-      || usedDefaultChar) {
-    return false;
-  }
-  std::unique_ptr<CHAR[]> astr(new CHAR[size]);
-  WideCharToMultiByte(
-      outUtf8 ? CP_UTF8 : CP_ACP, 0, s, -1, astr.get(), size, nullptr, nullptr);
-  out->assign(astr.get());
-  return true;
-}
-
-bool mbs_to_wcs(const char* s, wstring* out, bool inUtf8) {
-  if (null_or_empty(s)) {
-    out->clear();
-    return true;
-  }
-
-  SetLastError(0);
-  int size =
-      MultiByteToWideChar(inUtf8 ? CP_UTF8 : CP_ACP, 0, s, -1, nullptr, 0);
-  if (size == 0 && GetLastError() != ERROR_INSUFFICIENT_BUFFER) {
-    return false;
-  }
-  std::unique_ptr<WCHAR[]> wstr(new WCHAR[size]);
-  MultiByteToWideChar(
-      inUtf8 ? CP_UTF8 : CP_ACP, 0, s, -1, wstr.get(), size + 1);
-  out->assign(wstr.get());
-  return true;
-}
-
-bool utf8_to_wcs(const char* input, wstring* out) {
-  return mbs_to_wcs(input, out, true);
-}
-
-bool wcs_to_utf8(const wchar_t* input, string* out) {
-  return wcs_to_mbs(input, out, true);
-}
-
-}  // namespace strings
-}  // namespace win32
-}  // namespace io
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // defined(_WIN32)
diff --git a/libs/protobuf/src/google/protobuf/io/io_win32.h b/libs/protobuf/src/google/protobuf/io/io_win32.h
deleted file mode 100644
index a72b4ea..0000000
--- a/libs/protobuf/src/google/protobuf/io/io_win32.h
+++ /dev/null
@@ -1,141 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: laszlocsomor@google.com (Laszlo Csomor)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-
-// This file contains the declarations for Windows implementations of
-// commonly used POSIX functions such as open(2) and access(2), as well
-// as macro definitions for flags of these functions.
-//
-// By including this file you'll redefine open/access/etc. to
-// ::google::protobuf::io::win32::{open/access/etc.}.
-// Make sure you don't include a header that attempts to redeclare or
-// redefine these functions, that'll lead to confusing compilation
-// errors. It's best to #include this file as the last one to ensure that.
-//
-// This file is only used on Windows, it's empty on other platforms.
-
-#ifndef GOOGLE_PROTOBUF_IO_IO_WIN32_H__
-#define GOOGLE_PROTOBUF_IO_IO_WIN32_H__
-
-#if defined(_WIN32)
-
-#include <functional>
-#include <string>
-
-#include <google/protobuf/port.h>
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-// Compilers on Windows other than MSVC (e.g. Cygwin, MinGW32) define the
-// following functions already, except for mkdir.
-namespace google {
-namespace protobuf {
-namespace io {
-namespace win32 {
-
-PROTOBUF_EXPORT FILE* fopen(const char* path, const char* mode);
-PROTOBUF_EXPORT int access(const char* path, int mode);
-PROTOBUF_EXPORT int chdir(const char* path);
-PROTOBUF_EXPORT int close(int fd);
-PROTOBUF_EXPORT int dup(int fd);
-PROTOBUF_EXPORT int dup2(int fd1, int fd2);
-PROTOBUF_EXPORT int mkdir(const char* path, int _mode);
-PROTOBUF_EXPORT int open(const char* path, int flags, int mode = 0);
-PROTOBUF_EXPORT int read(int fd, void* buffer, size_t size);
-PROTOBUF_EXPORT int setmode(int fd, int mode);
-PROTOBUF_EXPORT int stat(const char* path, struct _stat* buffer);
-PROTOBUF_EXPORT int write(int fd, const void* buffer, size_t size);
-PROTOBUF_EXPORT std::wstring testonly_utf8_to_winpath(const char* path);
-
-enum class ExpandWildcardsResult {
-  kSuccess = 0,
-  kErrorNoMatchingFile = 1,
-  kErrorInputPathConversion = 2,
-  kErrorOutputPathConversion = 3,
-};
-
-// Expand wildcards in a path pattern, feed the result to a consumer function.
-//
-// `path` must be a valid, Windows-style path. It may be absolute, or relative
-// to the current working directory, and it may contain wildcards ("*" and "?")
-// in the last path segment. This function passes all matching file names to
-// `consume`. The resulting paths may not be absolute nor normalized.
-//
-// The function returns a value from `ExpandWildcardsResult`.
-PROTOBUF_EXPORT ExpandWildcardsResult ExpandWildcards(
-    const std::string& path, std::function<void(const std::string&)> consume);
-
-namespace strings {
-
-// Convert from UTF-16 to Active-Code-Page-encoded or to UTF-8-encoded text.
-PROTOBUF_EXPORT bool wcs_to_mbs(const wchar_t* s, std::string* out,
-                                bool outUtf8);
-
-// Convert from Active-Code-Page-encoded or UTF-8-encoded text to UTF-16.
-PROTOBUF_EXPORT bool mbs_to_wcs(const char* s, std::wstring* out, bool inUtf8);
-
-// Convert from UTF-8-encoded text to UTF-16.
-PROTOBUF_EXPORT bool utf8_to_wcs(const char* input, std::wstring* out);
-
-// Convert from UTF-16-encoded text to UTF-8.
-PROTOBUF_EXPORT bool wcs_to_utf8(const wchar_t* input, std::string* out);
-
-}  // namespace strings
-
-}  // namespace win32
-}  // namespace io
-}  // namespace protobuf
-}  // namespace google
-
-#ifndef W_OK
-#define W_OK 02  // not defined by MSVC for whatever reason
-#endif
-
-#ifndef F_OK
-#define F_OK 00  // not defined by MSVC for whatever reason
-#endif
-
-#ifndef STDIN_FILENO
-#define STDIN_FILENO 0
-#endif
-
-#ifndef STDOUT_FILENO
-#define STDOUT_FILENO 1
-#endif
-
-#include <google/protobuf/port_undef.inc>
-
-#endif  // defined(_WIN32)
-
-#endif  // GOOGLE_PROTOBUF_IO_IO_WIN32_H__
diff --git a/libs/protobuf/src/google/protobuf/io/io_win32_unittest.cc b/libs/protobuf/src/google/protobuf/io/io_win32_unittest.cc
deleted file mode 100644
index e8f378f..0000000
--- a/libs/protobuf/src/google/protobuf/io/io_win32_unittest.cc
+++ /dev/null
@@ -1,631 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: laszlocsomor@google.com (Laszlo Csomor)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-
-// Unit tests for long-path-aware open/mkdir/access/etc. on Windows, as well as
-// for the supporting utility functions.
-//
-// This file is only used on Windows, it's empty on other platforms.
-
-#if defined(_WIN32)
-
-#define WIN32_LEAN_AND_MEAN
-#include <google/protobuf/io/io_win32.h>
-
-#include <errno.h>
-#include <fcntl.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <wchar.h>
-#include <windows.h>
-
-#include <memory>
-#include <sstream>
-#include <string>
-#include <vector>
-
-#include <gtest/gtest.h>
-
-namespace google {
-namespace protobuf {
-namespace io {
-namespace win32 {
-namespace {
-
-const char kUtf8Text[] = {
-    'h', 'i', ' ',
-    // utf-8: 11010000 10011111, utf-16: 100 0001 1111 = 0x041F
-    static_cast<char>(0xd0), static_cast<char>(0x9f),
-    // utf-8: 11010001 10000000, utf-16: 100 0100 0000 = 0x0440
-    static_cast<char>(0xd1), static_cast<char>(0x80),
-    // utf-8: 11010000 10111000, utf-16: 100 0011 1000 = 0x0438
-    static_cast<char>(0xd0), static_cast<char>(0xb8),
-    // utf-8: 11010000 10110010, utf-16: 100 0011 0010 = 0x0432
-    static_cast<char>(0xd0), static_cast<char>(0xb2),
-    // utf-8: 11010000 10110101, utf-16: 100 0011 0101 = 0x0435
-    static_cast<char>(0xd0), static_cast<char>(0xb5),
-    // utf-8: 11010001 10000010, utf-16: 100 0100 0010 = 0x0442
-    static_cast<char>(0xd1), static_cast<char>(0x82), 0
-};
-
-const wchar_t kUtf16Text[] = {
-  L'h', L'i', L' ',
-  L'\x41f', L'\x440', L'\x438', L'\x432', L'\x435', L'\x442', 0
-};
-
-using std::string;
-using std::vector;
-using std::wstring;
-
-class IoWin32Test : public ::testing::Test {
- public:
-  void SetUp();
-  void TearDown();
-
- protected:
-  bool CreateAllUnder(wstring path);
-  bool DeleteAllUnder(wstring path);
-
-  WCHAR working_directory[MAX_PATH];
-  string test_tmpdir;
-  wstring wtest_tmpdir;
-};
-
-#define ASSERT_INITIALIZED              \
-  {                                     \
-    EXPECT_FALSE(test_tmpdir.empty());  \
-    EXPECT_FALSE(wtest_tmpdir.empty()); \
-  }
-
-namespace {
-void StripTrailingSlashes(string* str) {
-  int i = str->size() - 1;
-  for (; i >= 0 && ((*str)[i] == '/' || (*str)[i] == '\\'); --i) {}
-  str->resize(i+1);
-}
-
-bool GetEnvVarAsUtf8(const WCHAR* name, string* result) {
-  DWORD size = ::GetEnvironmentVariableW(name, nullptr, 0);
-  if (size > 0 && GetLastError() != ERROR_ENVVAR_NOT_FOUND) {
-    std::unique_ptr<WCHAR[]> wcs(new WCHAR[size]);
-    ::GetEnvironmentVariableW(name, wcs.get(), size);
-    // GetEnvironmentVariableA retrieves an Active-Code-Page-encoded text which
-    // we'd first need to convert to UTF-16 then to UTF-8, because there seems
-    // to be no API function to do that conversion directly.
-    // GetEnvironmentVariableW retrieves an UTF-16-encoded text, which we need
-    // to convert to UTF-8.
-    return strings::wcs_to_utf8(wcs.get(), result);
-  } else {
-    return false;
-  }
-}
-
-bool GetCwdAsUtf8(string* result) {
-  DWORD size = ::GetCurrentDirectoryW(0, nullptr);
-  if (size > 0) {
-    std::unique_ptr<WCHAR[]> wcs(new WCHAR[size]);
-    ::GetCurrentDirectoryW(size, wcs.get());
-    // GetCurrentDirectoryA retrieves an Active-Code-Page-encoded text which
-    // we'd first need to convert to UTF-16 then to UTF-8, because there seems
-    // to be no API function to do that conversion directly.
-    // GetCurrentDirectoryW retrieves an UTF-16-encoded text, which we need
-    // to convert to UTF-8.
-    return strings::wcs_to_utf8(wcs.get(), result);
-  } else {
-    return false;
-  }
-}
-
-bool CreateEmptyFile(const wstring& path) {
-  HANDLE h = CreateFileW(path.c_str(), GENERIC_WRITE, 0, NULL, CREATE_ALWAYS,
-                         FILE_ATTRIBUTE_NORMAL, NULL);
-  if (h == INVALID_HANDLE_VALUE) {
-    return false;
-  }
-  CloseHandle(h);
-  return true;
-}
-
-}  // namespace
-
-void IoWin32Test::SetUp() {
-  test_tmpdir.clear();
-  wtest_tmpdir.clear();
-  DWORD size = ::GetCurrentDirectoryW(MAX_PATH, working_directory);
-  EXPECT_GT(size, 0U);
-  EXPECT_LT(size, static_cast<DWORD>(MAX_PATH));
-
-  string tmp;
-  bool ok = false;
-  if (!ok) {
-    // Bazel sets this environment variable when it runs tests.
-    ok = GetEnvVarAsUtf8(L"TEST_TMPDIR", &tmp);
-  }
-  if (!ok) {
-    // Bazel 0.8.0 sets this environment for every build and test action.
-    ok = GetEnvVarAsUtf8(L"TEMP", &tmp);
-  }
-  if (!ok) {
-    // Bazel 0.8.0 sets this environment for every build and test action.
-    ok = GetEnvVarAsUtf8(L"TMP", &tmp);
-  }
-  if (!ok) {
-    // Fall back to using the current directory.
-    ok = GetCwdAsUtf8(&tmp);
-  }
-  if (!ok || tmp.empty()) {
-    FAIL() << "Cannot find a temp directory.";
-  }
-
-  StripTrailingSlashes(&tmp);
-  std::stringstream result;
-  // Deleting files and directories is asynchronous on Windows, and if TearDown
-  // just deleted the previous temp directory, sometimes we cannot recreate the
-  // same directory.
-  // Use a counter so every test method gets its own temp directory.
-  static unsigned int counter = 0;
-  result << tmp << "\\w32tst" << counter++ << ".tmp";
-  test_tmpdir = result.str();
-  wtest_tmpdir = testonly_utf8_to_winpath(test_tmpdir.c_str());
-  ASSERT_FALSE(wtest_tmpdir.empty());
-  ASSERT_TRUE(DeleteAllUnder(wtest_tmpdir));
-  ASSERT_TRUE(CreateAllUnder(wtest_tmpdir));
-}
-
-void IoWin32Test::TearDown() {
-  if (!wtest_tmpdir.empty()) {
-    DeleteAllUnder(wtest_tmpdir);
-  }
-  ::SetCurrentDirectoryW(working_directory);
-}
-
-bool IoWin32Test::CreateAllUnder(wstring path) {
-  // Prepend UNC prefix if the path doesn't have it already. Don't bother
-  // checking if the path is shorter than MAX_PATH, let's just do it
-  // unconditionally.
-  if (path.find(L"\\\\?\\") != 0) {
-    path = wstring(L"\\\\?\\") + path;
-  }
-  if (::CreateDirectoryW(path.c_str(), nullptr) ||
-      GetLastError() == ERROR_ALREADY_EXISTS ||
-      GetLastError() == ERROR_ACCESS_DENIED) {
-    return true;
-  }
-  if (GetLastError() == ERROR_PATH_NOT_FOUND) {
-    size_t pos = path.find_last_of(L'\\');
-    if (pos != wstring::npos) {
-      wstring parent(path, 0, pos);
-      if (CreateAllUnder(parent) && CreateDirectoryW(path.c_str(), nullptr)) {
-        return true;
-      }
-    }
-  }
-  return false;
-}
-
-bool IoWin32Test::DeleteAllUnder(wstring path) {
-  static const wstring kDot(L".");
-  static const wstring kDotDot(L"..");
-
-  // Prepend UNC prefix if the path doesn't have it already. Don't bother
-  // checking if the path is shorter than MAX_PATH, let's just do it
-  // unconditionally.
-  if (path.find(L"\\\\?\\") != 0) {
-    path = wstring(L"\\\\?\\") + path;
-  }
-  // Append "\" if necessary.
-  if (path[path.size() - 1] != L'\\') {
-    path.push_back(L'\\');
-  }
-
-  WIN32_FIND_DATAW metadata;
-  HANDLE handle = ::FindFirstFileW((path + L"*").c_str(), &metadata);
-  if (handle == INVALID_HANDLE_VALUE) {
-    return true;  // directory doesn't exist
-  }
-
-  bool result = true;
-  do {
-    wstring childname = metadata.cFileName;
-    if (kDot != childname && kDotDot != childname) {
-      wstring childpath = path + childname;
-      if ((metadata.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) != 0) {
-        // If this is not a junction, delete its contents recursively.
-        // Finally delete this directory/junction too.
-        if (((metadata.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) == 0 &&
-             !DeleteAllUnder(childpath)) ||
-            !::RemoveDirectoryW(childpath.c_str())) {
-          result = false;
-          break;
-        }
-      } else {
-        if (!::DeleteFileW(childpath.c_str())) {
-          result = false;
-          break;
-        }
-      }
-    }
-  } while (::FindNextFileW(handle, &metadata));
-  ::FindClose(handle);
-  return result;
-}
-
-TEST_F(IoWin32Test, AccessTest) {
-  ASSERT_INITIALIZED;
-
-  string path = test_tmpdir;
-  while (path.size() < MAX_PATH - 30) {
-    path += "\\accesstest";
-    EXPECT_EQ(mkdir(path.c_str(), 0644), 0);
-  }
-  string file = path + "\\file.txt";
-  int fd = open(file.c_str(), O_CREAT | O_WRONLY, 0644);
-  if (fd > 0) {
-    EXPECT_EQ(close(fd), 0);
-  } else {
-    EXPECT_TRUE(false);
-  }
-
-  EXPECT_EQ(access(test_tmpdir.c_str(), F_OK), 0);
-  EXPECT_EQ(access(path.c_str(), F_OK), 0);
-  EXPECT_EQ(access(path.c_str(), W_OK), 0);
-  EXPECT_EQ(access(file.c_str(), F_OK | W_OK), 0);
-  EXPECT_NE(access((file + ".blah").c_str(), F_OK), 0);
-  EXPECT_NE(access((file + ".blah").c_str(), W_OK), 0);
-
-  EXPECT_EQ(access(".", F_OK), 0);
-  EXPECT_EQ(access(".", W_OK), 0);
-  EXPECT_EQ(access((test_tmpdir + "/accesstest").c_str(), F_OK | W_OK), 0);
-  ASSERT_EQ(access((test_tmpdir + "/./normalize_me/.././accesstest").c_str(),
-                   F_OK | W_OK),
-            0);
-  EXPECT_NE(access("io_win32_unittest.AccessTest.nonexistent", F_OK), 0);
-  EXPECT_NE(access("io_win32_unittest.AccessTest.nonexistent", W_OK), 0);
-
-  ASSERT_EQ(access("c:bad", F_OK), -1);
-  ASSERT_EQ(errno, ENOENT);
-  ASSERT_EQ(access("/tmp/bad", F_OK), -1);
-  ASSERT_EQ(errno, ENOENT);
-  ASSERT_EQ(access("\\bad", F_OK), -1);
-  ASSERT_EQ(errno, ENOENT);
-}
-
-TEST_F(IoWin32Test, OpenTest) {
-  ASSERT_INITIALIZED;
-
-  string path = test_tmpdir;
-  while (path.size() < MAX_PATH) {
-    path += "\\opentest";
-    EXPECT_EQ(mkdir(path.c_str(), 0644), 0);
-  }
-  string file = path + "\\file.txt";
-  int fd = open(file.c_str(), O_CREAT | O_WRONLY, 0644);
-  if (fd > 0) {
-    EXPECT_EQ(write(fd, "hello", 5), 5);
-    EXPECT_EQ(close(fd), 0);
-  } else {
-    EXPECT_TRUE(false);
-  }
-
-  ASSERT_EQ(open("c:bad.txt", O_CREAT | O_WRONLY, 0644), -1);
-  ASSERT_EQ(errno, ENOENT);
-  ASSERT_EQ(open("/tmp/bad.txt", O_CREAT | O_WRONLY, 0644), -1);
-  ASSERT_EQ(errno, ENOENT);
-  ASSERT_EQ(open("\\bad.txt", O_CREAT | O_WRONLY, 0644), -1);
-  ASSERT_EQ(errno, ENOENT);
-}
-
-TEST_F(IoWin32Test, MkdirTest) {
-  ASSERT_INITIALIZED;
-
-  string path = test_tmpdir;
-  do {
-    path += "\\mkdirtest";
-    ASSERT_EQ(mkdir(path.c_str(), 0644), 0);
-  } while (path.size() <= MAX_PATH);
-
-  ASSERT_EQ(mkdir("c:bad", 0644), -1);
-  ASSERT_EQ(errno, ENOENT);
-  ASSERT_EQ(mkdir("/tmp/bad", 0644), -1);
-  ASSERT_EQ(errno, ENOENT);
-  ASSERT_EQ(mkdir("\\bad", 0644), -1);
-  ASSERT_EQ(errno, ENOENT);
-}
-
-TEST_F(IoWin32Test, MkdirTestNonAscii) {
-  ASSERT_INITIALIZED;
-
-  // Create a non-ASCII path.
-  // Ensure that we can create the directory using CreateDirectoryW.
-  EXPECT_TRUE(CreateDirectoryW((wtest_tmpdir + L"\\1").c_str(), nullptr));
-  EXPECT_TRUE(CreateDirectoryW((wtest_tmpdir + L"\\1\\" + kUtf16Text).c_str(), nullptr));
-  // Ensure that we can create a very similarly named directory using mkdir.
-  // We don't attempt to delete and recreate the same directory, because on
-  // Windows, deleting files and directories seems to be asynchronous.
-  EXPECT_EQ(mkdir((test_tmpdir + "\\2").c_str(), 0644), 0);
-  EXPECT_EQ(mkdir((test_tmpdir + "\\2\\" + kUtf8Text).c_str(), 0644), 0);
-}
-
-TEST_F(IoWin32Test, ChdirTest) {
-  string path("C:\\");
-  EXPECT_EQ(access(path.c_str(), F_OK), 0);
-  ASSERT_EQ(chdir(path.c_str()), 0);
-
-  // Do not try to chdir into the test_tmpdir, it may already contain directory
-  // names with trailing dots.
-  // Instead test here with an obviously dot-trailed path. If the win32_chdir
-  // function would not convert the path to absolute and prefix with "\\?\" then
-  // the Win32 API would ignore the trailing dot, but because of the prefixing
-  // there'll be no path processing done, so we'll actually attempt to chdir
-  // into "C:\some\path\foo."
-  path = test_tmpdir + "/foo.";
-  EXPECT_EQ(mkdir(path.c_str(), 644), 0);
-  EXPECT_EQ(access(path.c_str(), F_OK), 0);
-  ASSERT_NE(chdir(path.c_str()), 0);
-}
-
-TEST_F(IoWin32Test, ChdirTestNonAscii) {
-  ASSERT_INITIALIZED;
-
-  // Create a directory with a non-ASCII path and ensure we can cd into it.
-  wstring wNonAscii(wtest_tmpdir + L"\\" + kUtf16Text);
-  string nonAscii;
-  EXPECT_TRUE(strings::wcs_to_utf8(wNonAscii.c_str(), &nonAscii));
-  EXPECT_TRUE(CreateDirectoryW(wNonAscii.c_str(), nullptr));
-  WCHAR cwd[MAX_PATH];
-  EXPECT_TRUE(GetCurrentDirectoryW(MAX_PATH, cwd));
-  // Ensure that we can cd into the path using SetCurrentDirectoryW.
-  EXPECT_TRUE(SetCurrentDirectoryW(wNonAscii.c_str()));
-  EXPECT_TRUE(SetCurrentDirectoryW(cwd));
-  // Ensure that we can cd into the path using chdir.
-  ASSERT_EQ(chdir(nonAscii.c_str()), 0);
-  // Ensure that the GetCurrentDirectoryW returns the desired path.
-  EXPECT_TRUE(GetCurrentDirectoryW(MAX_PATH, cwd));
-  ASSERT_EQ(wNonAscii, cwd);
-}
-
-TEST_F(IoWin32Test, ExpandWildcardsInRelativePathTest) {
-  wstring wNonAscii(wtest_tmpdir + L"\\" + kUtf16Text);
-  EXPECT_TRUE(CreateDirectoryW(wNonAscii.c_str(), nullptr));
-  // Create mock files we will test pattern matching on.
-  EXPECT_TRUE(CreateEmptyFile(wNonAscii + L"\\foo_a.proto"));
-  EXPECT_TRUE(CreateEmptyFile(wNonAscii + L"\\foo_b.proto"));
-  EXPECT_TRUE(CreateEmptyFile(wNonAscii + L"\\bar.proto"));
-  // `cd` into `wtest_tmpdir`.
-  EXPECT_TRUE(SetCurrentDirectoryW(wtest_tmpdir.c_str()));
-
-  int found_a = 0;
-  int found_b = 0;
-  vector<string> found_bad;
-  // Assert matching a relative path pattern. Results should also be relative.
-  ExpandWildcardsResult result =
-      ExpandWildcards(string(kUtf8Text) + "\\foo*.proto",
-                      [&found_a, &found_b, &found_bad](const string& p) {
-                        if (p == string(kUtf8Text) + "\\foo_a.proto") {
-                          found_a++;
-                        } else if (p == string(kUtf8Text) + "\\foo_b.proto") {
-                          found_b++;
-                        } else {
-                          found_bad.push_back(p);
-                        }
-                      });
-  EXPECT_EQ(result, ExpandWildcardsResult::kSuccess);
-  EXPECT_EQ(found_a, 1);
-  EXPECT_EQ(found_b, 1);
-  if (!found_bad.empty()) {
-    FAIL() << found_bad[0];
-  }
-
-  // Assert matching the exact filename.
-  found_a = 0;
-  found_bad.clear();
-  result = ExpandWildcards(string(kUtf8Text) + "\\foo_a.proto",
-                           [&found_a, &found_bad](const string& p) {
-                             if (p == string(kUtf8Text) + "\\foo_a.proto") {
-                               found_a++;
-                             } else {
-                               found_bad.push_back(p);
-                             }
-                           });
-  EXPECT_EQ(result, ExpandWildcardsResult::kSuccess);
-  EXPECT_EQ(found_a, 1);
-  if (!found_bad.empty()) {
-    FAIL() << found_bad[0];
-  }
-}
-
-TEST_F(IoWin32Test, ExpandWildcardsInAbsolutePathTest) {
-  wstring wNonAscii(wtest_tmpdir + L"\\" + kUtf16Text);
-  EXPECT_TRUE(CreateDirectoryW(wNonAscii.c_str(), nullptr));
-  // Create mock files we will test pattern matching on.
-  EXPECT_TRUE(CreateEmptyFile(wNonAscii + L"\\foo_a.proto"));
-  EXPECT_TRUE(CreateEmptyFile(wNonAscii + L"\\foo_b.proto"));
-  EXPECT_TRUE(CreateEmptyFile(wNonAscii + L"\\bar.proto"));
-
-  int found_a = 0;
-  int found_b = 0;
-  vector<string> found_bad;
-  // Assert matching an absolute path. The results should also use absolute
-  // path.
-  ExpandWildcardsResult result =
-      ExpandWildcards(string(test_tmpdir) + "\\" + kUtf8Text + "\\foo*.proto",
-                      [this, &found_a, &found_b, &found_bad](const string& p) {
-                        if (p == string(this->test_tmpdir) + "\\" + kUtf8Text +
-                                     "\\foo_a.proto") {
-                          found_a++;
-                        } else if (p == string(this->test_tmpdir) + "\\" +
-                                            kUtf8Text + "\\foo_b.proto") {
-                          found_b++;
-                        } else {
-                          found_bad.push_back(p);
-                        }
-                      });
-  EXPECT_EQ(result, ExpandWildcardsResult::kSuccess);
-  EXPECT_EQ(found_a, 1);
-  EXPECT_EQ(found_b, 1);
-  if (!found_bad.empty()) {
-    FAIL() << found_bad[0];
-  }
-
-  // Assert matching the exact filename.
-  found_a = 0;
-  found_bad.clear();
-  result =
-      ExpandWildcards(string(test_tmpdir) + "\\" + kUtf8Text + "\\foo_a.proto",
-                      [this, &found_a, &found_bad](const string& p) {
-                        if (p == string(this->test_tmpdir) + "\\" + kUtf8Text +
-                                     "\\foo_a.proto") {
-                          found_a++;
-                        } else {
-                          found_bad.push_back(p);
-                        }
-                      });
-  EXPECT_EQ(result, ExpandWildcardsResult::kSuccess);
-  EXPECT_EQ(found_a, 1);
-  if (!found_bad.empty()) {
-    FAIL() << found_bad[0];
-  }
-}
-
-TEST_F(IoWin32Test, ExpandWildcardsIgnoresDirectoriesTest) {
-  wstring wNonAscii(wtest_tmpdir + L"\\" + kUtf16Text);
-  EXPECT_TRUE(CreateDirectoryW(wNonAscii.c_str(), nullptr));
-  // Create mock files we will test pattern matching on.
-  EXPECT_TRUE(CreateEmptyFile(wNonAscii + L"\\foo_a.proto"));
-  EXPECT_TRUE(
-      CreateDirectoryW((wNonAscii + L"\\foo_b.proto").c_str(), nullptr));
-  EXPECT_TRUE(CreateEmptyFile(wNonAscii + L"\\foo_c.proto"));
-  // `cd` into `wtest_tmpdir`.
-  EXPECT_TRUE(SetCurrentDirectoryW(wtest_tmpdir.c_str()));
-
-  int found_a = 0;
-  int found_c = 0;
-  vector<string> found_bad;
-  // Assert that the pattern matches exactly the expected files, and using the
-  // absolute path as did the input pattern.
-  ExpandWildcardsResult result =
-      ExpandWildcards(string(kUtf8Text) + "\\foo*.proto",
-                      [&found_a, &found_c, &found_bad](const string& p) {
-                        if (p == string(kUtf8Text) + "\\foo_a.proto") {
-                          found_a++;
-                        } else if (p == string(kUtf8Text) + "\\foo_c.proto") {
-                          found_c++;
-                        } else {
-                          found_bad.push_back(p);
-                        }
-                      });
-  EXPECT_EQ(result, ExpandWildcardsResult::kSuccess);
-  EXPECT_EQ(found_a, 1);
-  EXPECT_EQ(found_c, 1);
-  if (!found_bad.empty()) {
-    FAIL() << found_bad[0];
-  }
-}
-
-TEST_F(IoWin32Test, ExpandWildcardsFailsIfNoFileMatchesTest) {
-  wstring wNonAscii(wtest_tmpdir + L"\\" + kUtf16Text);
-  EXPECT_TRUE(CreateDirectoryW(wNonAscii.c_str(), nullptr));
-  // Create mock files we will test pattern matching on.
-  EXPECT_TRUE(CreateEmptyFile(wNonAscii + L"\\foo_a.proto"));
-  // `cd` into `wtest_tmpdir`.
-  EXPECT_TRUE(SetCurrentDirectoryW(wtest_tmpdir.c_str()));
-
-  // Control test: should match foo*.proto
-  ExpandWildcardsResult result =
-      ExpandWildcards(string(kUtf8Text) + "\\foo*.proto", [](const string&) {});
-  EXPECT_EQ(result, ExpandWildcardsResult::kSuccess);
-
-  // Control test: should match foo_a.proto
-  result = ExpandWildcards(string(kUtf8Text) + "\\foo_a.proto",
-                           [](const string&) {});
-  EXPECT_EQ(result, ExpandWildcardsResult::kSuccess);
-
-  // Actual test: should not match anything.
-  result =
-      ExpandWildcards(string(kUtf8Text) + "\\bar*.proto", [](const string&) {});
-  ASSERT_EQ(result, ExpandWildcardsResult::kErrorNoMatchingFile);
-}
-
-TEST_F(IoWin32Test, AsWindowsPathTest) {
-  DWORD size = GetCurrentDirectoryW(0, nullptr);
-  std::unique_ptr<wchar_t[]> cwd_str(new wchar_t[size]);
-  EXPECT_GT(GetCurrentDirectoryW(size, cwd_str.get()), 0U);
-  wstring cwd = wstring(L"\\\\?\\") + cwd_str.get();
-
-  ASSERT_EQ(testonly_utf8_to_winpath("relative_mkdirtest"),
-            cwd + L"\\relative_mkdirtest");
-  ASSERT_EQ(testonly_utf8_to_winpath("preserve//\\trailing///"),
-            cwd + L"\\preserve\\trailing\\");
-  ASSERT_EQ(testonly_utf8_to_winpath("./normalize_me\\/../blah"),
-            cwd + L"\\blah");
-  std::ostringstream relpath;
-  for (wchar_t* p = cwd_str.get(); *p; ++p) {
-    if (*p == '/' || *p == '\\') {
-      relpath << "../";
-    }
-  }
-  relpath << ".\\/../\\./beyond-toplevel";
-  ASSERT_EQ(testonly_utf8_to_winpath(relpath.str().c_str()),
-            wstring(L"\\\\?\\") + cwd_str.get()[0] + L":\\beyond-toplevel");
-
-  // Absolute unix paths lack drive letters, driveless absolute windows paths
-  // do too. Neither can be converted to a drive-specifying absolute Windows
-  // path.
-  ASSERT_EQ(testonly_utf8_to_winpath("/absolute/unix/path"), L"");
-  // Though valid on Windows, we also don't support UNC paths (\\UNC\\blah).
-  ASSERT_EQ(testonly_utf8_to_winpath("\\driveless\\absolute"), L"");
-  // Though valid in cmd.exe, drive-relative paths are not supported.
-  ASSERT_EQ(testonly_utf8_to_winpath("c:foo"), L"");
-  ASSERT_EQ(testonly_utf8_to_winpath("c:/foo"), L"\\\\?\\c:\\foo");
-  ASSERT_EQ(testonly_utf8_to_winpath("\\\\?\\C:\\foo"), L"\\\\?\\C:\\foo");
-}
-
-TEST_F(IoWin32Test, Utf8Utf16ConversionTest) {
-  string mbs;
-  wstring wcs;
-  ASSERT_TRUE(strings::utf8_to_wcs(kUtf8Text, &wcs));
-  ASSERT_TRUE(strings::wcs_to_utf8(kUtf16Text, &mbs));
-  ASSERT_EQ(wcs, kUtf16Text);
-  ASSERT_EQ(mbs, kUtf8Text);
-}
-
-}  // namespace
-}  // namespace win32
-}  // namespace io
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // defined(_WIN32)
-
diff --git a/libs/protobuf/src/google/protobuf/io/package_info.h b/libs/protobuf/src/google/protobuf/io/package_info.h
deleted file mode 100644
index 46c3dac..0000000
--- a/libs/protobuf/src/google/protobuf/io/package_info.h
+++ /dev/null
@@ -1,53 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-//
-// This file exists solely to document the google::protobuf::io namespace.
-// It is not compiled into anything, but it may be read by an automated
-// documentation generator.
-
-namespace google {
-namespace protobuf {
-
-// Auxiliary classes used for I/O.
-//
-// The Protocol Buffer library uses the classes in this package to deal with
-// I/O and encoding/decoding raw bytes.  Most users will not need to
-// deal with this package.  However, users who want to adapt the system to
-// work with their own I/O abstractions -- e.g., to allow Protocol Buffers
-// to be read from a different kind of input stream without the need for a
-// temporary buffer -- should take a closer look.
-namespace io {}
-
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/io/printer.cc b/libs/protobuf/src/google/protobuf/io/printer.cc
deleted file mode 100644
index 47bd00b..0000000
--- a/libs/protobuf/src/google/protobuf/io/printer.cc
+++ /dev/null
@@ -1,403 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-
-#include <google/protobuf/io/printer.h>
-
-#include <cctype>
-
-#include <google/protobuf/stubs/logging.h>
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/io/zero_copy_stream.h>
-
-namespace google {
-namespace protobuf {
-namespace io {
-
-Printer::Printer(ZeroCopyOutputStream* output, char variable_delimiter)
-    : variable_delimiter_(variable_delimiter),
-      output_(output),
-      buffer_(NULL),
-      buffer_size_(0),
-      offset_(0),
-      at_start_of_line_(true),
-      failed_(false),
-      annotation_collector_(NULL) {}
-
-Printer::Printer(ZeroCopyOutputStream* output, char variable_delimiter,
-                 AnnotationCollector* annotation_collector)
-    : variable_delimiter_(variable_delimiter),
-      output_(output),
-      buffer_(NULL),
-      buffer_size_(0),
-      offset_(0),
-      at_start_of_line_(true),
-      failed_(false),
-      annotation_collector_(annotation_collector) {}
-
-Printer::~Printer() {
-  // Only BackUp() if we invoked Next() at least once, and we have never failed.
-  // Note that we always call `Backup`, i.e. we call BackUp(0) as some output
-  // streams have buffered output, and BackUp() serves as a flush event in such
-  // implementations.
-  if (buffer_ != nullptr && !failed_) {
-    output_->BackUp(buffer_size_);
-  }
-}
-
-bool Printer::GetSubstitutionRange(const char* varname,
-                                   std::pair<size_t, size_t>* range) {
-  std::map<std::string, std::pair<size_t, size_t> >::const_iterator iter =
-      substitutions_.find(varname);
-  if (iter == substitutions_.end()) {
-    GOOGLE_LOG(DFATAL) << " Undefined variable in annotation: " << varname;
-    return false;
-  }
-  if (iter->second.first > iter->second.second) {
-    GOOGLE_LOG(DFATAL) << " Variable used for annotation used multiple times: "
-                << varname;
-    return false;
-  }
-  *range = iter->second;
-  return true;
-}
-
-void Printer::Annotate(const char* begin_varname, const char* end_varname,
-                       const std::string& file_path,
-                       const std::vector<int>& path) {
-  if (annotation_collector_ == NULL) {
-    // Can't generate signatures with this Printer.
-    return;
-  }
-  std::pair<size_t, size_t> begin, end;
-  if (!GetSubstitutionRange(begin_varname, &begin) ||
-      !GetSubstitutionRange(end_varname, &end)) {
-    return;
-  }
-  if (begin.first > end.second) {
-    GOOGLE_LOG(DFATAL) << "  Annotation has negative length from " << begin_varname
-                << " to " << end_varname;
-  } else {
-    annotation_collector_->AddAnnotation(begin.first, end.second, file_path,
-                                         path);
-  }
-}
-
-void Printer::Print(const std::map<std::string, std::string>& variables,
-                    const char* text) {
-  int size = strlen(text);
-  int pos = 0;  // The number of bytes we've written so far.
-  substitutions_.clear();
-  line_start_variables_.clear();
-
-  for (int i = 0; i < size; i++) {
-    if (text[i] == '\n') {
-      // Saw newline.  If there is more text, we may need to insert an indent
-      // here.  So, write what we have so far, including the '\n'.
-      WriteRaw(text + pos, i - pos + 1);
-      pos = i + 1;
-
-      // Setting this true will cause the next WriteRaw() to insert an indent
-      // first.
-      at_start_of_line_ = true;
-      line_start_variables_.clear();
-
-    } else if (text[i] == variable_delimiter_) {
-      // Saw the start of a variable name.
-
-      // Write what we have so far.
-      WriteRaw(text + pos, i - pos);
-      pos = i + 1;
-
-      // Find closing delimiter.
-      const char* end = strchr(text + pos, variable_delimiter_);
-      if (end == NULL) {
-        GOOGLE_LOG(DFATAL) << " Unclosed variable name.";
-        end = text + pos;
-      }
-      int endpos = end - text;
-
-      std::string varname(text + pos, endpos - pos);
-      if (varname.empty()) {
-        // Two delimiters in a row reduce to a literal delimiter character.
-        WriteRaw(&variable_delimiter_, 1);
-      } else {
-        // Replace with the variable's value.
-        std::map<std::string, std::string>::const_iterator iter =
-            variables.find(varname);
-        if (iter == variables.end()) {
-          GOOGLE_LOG(DFATAL) << " Undefined variable: " << varname;
-        } else {
-          if (at_start_of_line_ && iter->second.empty()) {
-            line_start_variables_.push_back(varname);
-          }
-          WriteRaw(iter->second.data(), iter->second.size());
-          std::pair<std::map<std::string, std::pair<size_t, size_t> >::iterator,
-                    bool>
-              inserted = substitutions_.insert(std::make_pair(
-                  varname,
-                  std::make_pair(offset_ - iter->second.size(), offset_)));
-          if (!inserted.second) {
-            // This variable was used multiple times.  Make its span have
-            // negative length so we can detect it if it gets used in an
-            // annotation.
-            inserted.first->second = std::make_pair(1, 0);
-          }
-        }
-      }
-
-      // Advance past this variable.
-      i = endpos;
-      pos = endpos + 1;
-    }
-  }
-
-  // Write the rest.
-  WriteRaw(text + pos, size - pos);
-}
-
-void Printer::Indent() { indent_ += "  "; }
-
-void Printer::Outdent() {
-  if (indent_.empty()) {
-    GOOGLE_LOG(DFATAL) << " Outdent() without matching Indent().";
-    return;
-  }
-
-  indent_.resize(indent_.size() - 2);
-}
-
-void Printer::PrintRaw(const std::string& data) {
-  WriteRaw(data.data(), data.size());
-}
-
-void Printer::PrintRaw(const char* data) {
-  if (failed_) return;
-  WriteRaw(data, strlen(data));
-}
-
-void Printer::WriteRaw(const char* data, int size) {
-  if (failed_) return;
-  if (size == 0) return;
-
-  if (at_start_of_line_ && (size > 0) && (data[0] != '\n')) {
-    // Insert an indent.
-    at_start_of_line_ = false;
-    CopyToBuffer(indent_.data(), indent_.size());
-    if (failed_) return;
-    // Fix up empty variables (e.g., "{") that should be annotated as
-    // coming after the indent.
-    for (std::vector<std::string>::iterator i = line_start_variables_.begin();
-         i != line_start_variables_.end(); ++i) {
-      substitutions_[*i].first += indent_.size();
-      substitutions_[*i].second += indent_.size();
-    }
-  }
-
-  // If we're going to write any data, clear line_start_variables_, since
-  // we've either updated them in the block above or they no longer refer to
-  // the current line.
-  line_start_variables_.clear();
-
-  CopyToBuffer(data, size);
-}
-
-bool Printer::Next() {
-  do {
-    void* void_buffer;
-    if (!output_->Next(&void_buffer, &buffer_size_)) {
-      failed_ = true;
-      return false;
-    }
-    buffer_ = reinterpret_cast<char*>(void_buffer);
-  } while (buffer_size_ == 0);
-  return true;
-}
-
-void Printer::CopyToBuffer(const char* data, int size) {
-  if (failed_) return;
-  if (size == 0) return;
-
-  while (size > buffer_size_) {
-    // Data exceeds space in the buffer.  Copy what we can and request a
-    // new buffer.
-    if (buffer_size_ > 0) {
-      memcpy(buffer_, data, buffer_size_);
-      offset_ += buffer_size_;
-      data += buffer_size_;
-      size -= buffer_size_;
-    }
-    void* void_buffer;
-    failed_ = !output_->Next(&void_buffer, &buffer_size_);
-    if (failed_) return;
-    buffer_ = reinterpret_cast<char*>(void_buffer);
-  }
-
-  // Buffer is big enough to receive the data; copy it.
-  memcpy(buffer_, data, size);
-  buffer_ += size;
-  buffer_size_ -= size;
-  offset_ += size;
-}
-
-void Printer::IndentIfAtStart() {
-  if (at_start_of_line_) {
-    CopyToBuffer(indent_.data(), indent_.size());
-    at_start_of_line_ = false;
-  }
-}
-
-void Printer::FormatInternal(const std::vector<std::string>& args,
-                             const std::map<std::string, std::string>& vars,
-                             const char* format) {
-  auto save = format;
-  int arg_index = 0;
-  std::vector<AnnotationCollector::Annotation> annotations;
-  while (*format) {
-    char c = *format++;
-    switch (c) {
-      case '$':
-        format = WriteVariable(args, vars, format, &arg_index, &annotations);
-        continue;
-      case '\n':
-        at_start_of_line_ = true;
-        line_start_variables_.clear();
-        break;
-      default:
-        IndentIfAtStart();
-        break;
-    }
-    push_back(c);
-  }
-  if (arg_index != static_cast<int>(args.size())) {
-    GOOGLE_LOG(FATAL) << " Unused arguments. " << save;
-  }
-  if (!annotations.empty()) {
-    GOOGLE_LOG(FATAL) << " Annotation range is not-closed, expect $}$. " << save;
-  }
-}
-
-const char* Printer::WriteVariable(
-    const std::vector<std::string>& args,
-    const std::map<std::string, std::string>& vars, const char* format,
-    int* arg_index, std::vector<AnnotationCollector::Annotation>* annotations) {
-  auto start = format;
-  auto end = strchr(format, '$');
-  if (!end) {
-    GOOGLE_LOG(FATAL) << " Unclosed variable name.";
-  }
-  format = end + 1;
-  if (end == start) {
-    // "$$" is an escape for just '$'
-    IndentIfAtStart();
-    push_back('$');
-    return format;
-  }
-  if (*start == '{') {
-    GOOGLE_CHECK(std::isdigit(start[1]));
-    GOOGLE_CHECK_EQ(end - start, 2);
-    int idx = start[1] - '1';
-    if (idx < 0 || static_cast<size_t>(idx) >= args.size()) {
-      GOOGLE_LOG(FATAL) << "Annotation ${" << idx + 1 << "$ is out of bounds.";
-    }
-    if (idx > *arg_index) {
-      GOOGLE_LOG(FATAL) << "Annotation arg must be in correct order as given. Expected"
-                 << " ${" << (*arg_index) + 1 << "$ got ${" << idx + 1 << "$.";
-    } else if (idx == *arg_index) {
-      (*arg_index)++;
-    }
-    IndentIfAtStart();
-    annotations->push_back({{offset_, 0}, args[idx]});
-    return format;
-  } else if (*start == '}') {
-    GOOGLE_CHECK(annotations);
-    if (annotations->empty()) {
-      GOOGLE_LOG(FATAL) << "Unexpected end of annotation found.";
-    }
-    auto& a = annotations->back();
-    a.first.second = offset_;
-    if (annotation_collector_) annotation_collector_->AddAnnotationNew(a);
-    annotations->pop_back();
-    return format;
-  }
-  auto start_var = start;
-  while (start_var < end && *start_var == ' ') start_var++;
-  if (start_var == end) {
-    GOOGLE_LOG(FATAL) << " Empty variable.";
-  }
-  auto end_var = end;
-  while (start_var < end_var && *(end_var - 1) == ' ') end_var--;
-  std::string var_name{
-      start_var, static_cast<std::string::size_type>(end_var - start_var)};
-  std::string sub;
-  if (std::isdigit(var_name[0])) {
-    GOOGLE_CHECK_EQ(var_name.size(), 1U);  // No need for multi-digits
-    int idx = var_name[0] - '1';   // Start counting at 1
-    GOOGLE_CHECK_GE(idx, 0);
-    if (static_cast<size_t>(idx) >= args.size()) {
-      GOOGLE_LOG(FATAL) << "Argument $" << idx + 1 << "$ is out of bounds.";
-    }
-    if (idx > *arg_index) {
-      GOOGLE_LOG(FATAL) << "Arguments must be used in same order as given. Expected $"
-                 << (*arg_index) + 1 << "$ got $" << idx + 1 << "$.";
-    } else if (idx == *arg_index) {
-      (*arg_index)++;
-    }
-    sub = args[idx];
-  } else {
-    auto it = vars.find(var_name);
-    if (it == vars.end()) {
-      GOOGLE_LOG(FATAL) << " Unknown variable: " << var_name << ".";
-    }
-    sub = it->second;
-  }
-
-  // By returning here in case of empty we also skip possible spaces inside
-  // the $...$, i.e. "void$ dllexpor$ f();" -> "void f();" in the empty case.
-  if (sub.empty()) return format;
-
-  // We're going to write something non-empty so we need a possible indent.
-  IndentIfAtStart();
-
-  // Write the possible spaces in front.
-  CopyToBuffer(start, start_var - start);
-  // Write a non-empty substituted variable.
-  CopyToBuffer(sub.c_str(), sub.size());
-  // Finish off with writing possible trailing spaces.
-  CopyToBuffer(end_var, end - end_var);
-  return format;
-}
-
-}  // namespace io
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/io/printer.h b/libs/protobuf/src/google/protobuf/io/printer.h
deleted file mode 100644
index 92a4321..0000000
--- a/libs/protobuf/src/google/protobuf/io/printer.h
+++ /dev/null
@@ -1,387 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-//
-// Utility class for writing text to a ZeroCopyOutputStream.
-
-#ifndef GOOGLE_PROTOBUF_IO_PRINTER_H__
-#define GOOGLE_PROTOBUF_IO_PRINTER_H__
-
-
-#include <map>
-#include <string>
-#include <vector>
-
-#include <google/protobuf/stubs/common.h>
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-namespace io {
-
-class ZeroCopyOutputStream;  // zero_copy_stream.h
-
-// Records annotations about a Printer's output.
-class PROTOBUF_EXPORT AnnotationCollector {
- public:
-  // Annotation is a offset range and a payload pair.
-  typedef std::pair<std::pair<size_t, size_t>, std::string> Annotation;
-
-  // Records that the bytes in file_path beginning with begin_offset and ending
-  // before end_offset are associated with the SourceCodeInfo-style path.
-  virtual void AddAnnotation(size_t begin_offset, size_t end_offset,
-                             const std::string& file_path,
-                             const std::vector<int>& path) = 0;
-
-  // TODO(gerbens) I don't see why we need virtuals here. Just a vector of
-  // range, payload pairs stored in a context should suffice.
-  virtual void AddAnnotationNew(Annotation& /* a */) {}
-
-  virtual ~AnnotationCollector() {}
-};
-
-// Records annotations about a Printer's output to the given protocol buffer,
-// assuming that the buffer has an ::Annotation message exposing path,
-// source_file, begin and end fields.
-template <typename AnnotationProto>
-class AnnotationProtoCollector : public AnnotationCollector {
- public:
-  // annotation_proto is the protocol buffer to which new Annotations should be
-  // added. It is not owned by the AnnotationProtoCollector.
-  explicit AnnotationProtoCollector(AnnotationProto* annotation_proto)
-      : annotation_proto_(annotation_proto) {}
-
-  // Override for AnnotationCollector::AddAnnotation.
-  void AddAnnotation(size_t begin_offset, size_t end_offset,
-                     const std::string& file_path,
-                     const std::vector<int>& path) override {
-    typename AnnotationProto::Annotation* annotation =
-        annotation_proto_->add_annotation();
-    for (int i = 0; i < path.size(); ++i) {
-      annotation->add_path(path[i]);
-    }
-    annotation->set_source_file(file_path);
-    annotation->set_begin(begin_offset);
-    annotation->set_end(end_offset);
-  }
-  // Override for AnnotationCollector::AddAnnotation.
-  void AddAnnotationNew(Annotation& a) override {
-    auto* annotation = annotation_proto_->add_annotation();
-    annotation->ParseFromString(a.second);
-    annotation->set_begin(a.first.first);
-    annotation->set_end(a.first.second);
-  }
-
- private:
-  // The protocol buffer to which new annotations should be added.
-  AnnotationProto* const annotation_proto_;
-};
-
-// This simple utility class assists in code generation.  It basically
-// allows the caller to define a set of variables and then output some
-// text with variable substitutions.  Example usage:
-//
-//   Printer printer(output, '$');
-//   map<string, string> vars;
-//   vars["name"] = "Bob";
-//   printer.Print(vars, "My name is $name$.");
-//
-// The above writes "My name is Bob." to the output stream.
-//
-// Printer aggressively enforces correct usage, crashing (with assert failures)
-// in the case of undefined variables in debug builds. This helps greatly in
-// debugging code which uses it.
-//
-// If a Printer is constructed with an AnnotationCollector, it will provide it
-// with annotations that connect the Printer's output to paths that can identify
-// various descriptors.  In the above example, if person_ is a descriptor that
-// identifies Bob, we can associate the output string "My name is Bob." with
-// a source path pointing to that descriptor with:
-//
-//   printer.Annotate("name", person_);
-//
-// The AnnotationCollector will be sent an annotation linking the output range
-// covering "Bob" to the logical path provided by person_.  Tools may use
-// this association to (for example) link "Bob" in the output back to the
-// source file that defined the person_ descriptor identifying Bob.
-//
-// Annotate can only examine variables substituted during the last call to
-// Print.  It is invalid to refer to a variable that was used multiple times
-// in a single Print call.
-//
-// In full generality, one may specify a range of output text using a beginning
-// substitution variable and an ending variable.  The resulting annotation will
-// span from the first character of the substituted value for the beginning
-// variable to the last character of the substituted value for the ending
-// variable.  For example, the Annotate call above is equivalent to this one:
-//
-//   printer.Annotate("name", "name", person_);
-//
-// This is useful if multiple variables combine to form a single span of output
-// that should be annotated with the same source path.  For example:
-//
-//   Printer printer(output, '$');
-//   map<string, string> vars;
-//   vars["first"] = "Alice";
-//   vars["last"] = "Smith";
-//   printer.Print(vars, "My name is $first$ $last$.");
-//   printer.Annotate("first", "last", person_);
-//
-// This code would associate the span covering "Alice Smith" in the output with
-// the person_ descriptor.
-//
-// Note that the beginning variable must come before (or overlap with, in the
-// case of zero-sized substitution values) the ending variable.
-//
-// It is also sometimes useful to use variables with zero-sized values as
-// markers.  This avoids issues with multiple references to the same variable
-// and also allows annotation ranges to span literal text from the Print
-// templates:
-//
-//   Printer printer(output, '$');
-//   map<string, string> vars;
-//   vars["foo"] = "bar";
-//   vars["function"] = "call";
-//   vars["mark"] = "";
-//   printer.Print(vars, "$function$($foo$,$foo$)$mark$");
-//   printer.Annotate("function", "mark", call_);
-//
-// This code associates the span covering "call(bar,bar)" in the output with the
-// call_ descriptor.
-
-class PROTOBUF_EXPORT Printer {
- public:
-  // Create a printer that writes text to the given output stream.  Use the
-  // given character as the delimiter for variables.
-  Printer(ZeroCopyOutputStream* output, char variable_delimiter);
-
-  // Create a printer that writes text to the given output stream.  Use the
-  // given character as the delimiter for variables.  If annotation_collector
-  // is not null, Printer will provide it with annotations about code written
-  // to the stream.  annotation_collector is not owned by Printer.
-  Printer(ZeroCopyOutputStream* output, char variable_delimiter,
-          AnnotationCollector* annotation_collector);
-
-  ~Printer();
-
-  // Link a substitution variable emitted by the last call to Print to the
-  // object described by descriptor.
-  template <typename SomeDescriptor>
-  void Annotate(const char* varname, const SomeDescriptor* descriptor) {
-    Annotate(varname, varname, descriptor);
-  }
-
-  // Link the output range defined by the substitution variables as emitted by
-  // the last call to Print to the object described by descriptor. The range
-  // begins at begin_varname's value and ends after the last character of the
-  // value substituted for end_varname.
-  template <typename SomeDescriptor>
-  void Annotate(const char* begin_varname, const char* end_varname,
-                const SomeDescriptor* descriptor) {
-    if (annotation_collector_ == NULL) {
-      // Annotations aren't turned on for this Printer, so don't pay the cost
-      // of building the location path.
-      return;
-    }
-    std::vector<int> path;
-    descriptor->GetLocationPath(&path);
-    Annotate(begin_varname, end_varname, descriptor->file()->name(), path);
-  }
-
-  // Link a substitution variable emitted by the last call to Print to the file
-  // with path file_name.
-  void Annotate(const char* varname, const std::string& file_name) {
-    Annotate(varname, varname, file_name);
-  }
-
-  // Link the output range defined by the substitution variables as emitted by
-  // the last call to Print to the file with path file_name. The range begins
-  // at begin_varname's value and ends after the last character of the value
-  // substituted for end_varname.
-  void Annotate(const char* begin_varname, const char* end_varname,
-                const std::string& file_name) {
-    if (annotation_collector_ == NULL) {
-      // Annotations aren't turned on for this Printer.
-      return;
-    }
-    std::vector<int> empty_path;
-    Annotate(begin_varname, end_varname, file_name, empty_path);
-  }
-
-  // Print some text after applying variable substitutions.  If a particular
-  // variable in the text is not defined, this will crash.  Variables to be
-  // substituted are identified by their names surrounded by delimiter
-  // characters (as given to the constructor).  The variable bindings are
-  // defined by the given map.
-  void Print(const std::map<std::string, std::string>& variables,
-             const char* text);
-
-  // Like the first Print(), except the substitutions are given as parameters.
-  template <typename... Args>
-  void Print(const char* text, const Args&... args) {
-    std::map<std::string, std::string> vars;
-    PrintInternal(&vars, text, args...);
-  }
-
-  // Indent text by two spaces.  After calling Indent(), two spaces will be
-  // inserted at the beginning of each line of text.  Indent() may be called
-  // multiple times to produce deeper indents.
-  void Indent();
-
-  // Reduces the current indent level by two spaces, or crashes if the indent
-  // level is zero.
-  void Outdent();
-
-  // Write a string to the output buffer.
-  // This method does not look for newlines to add indentation.
-  void PrintRaw(const std::string& data);
-
-  // Write a zero-delimited string to output buffer.
-  // This method does not look for newlines to add indentation.
-  void PrintRaw(const char* data);
-
-  // Write some bytes to the output buffer.
-  // This method does not look for newlines to add indentation.
-  void WriteRaw(const char* data, int size);
-
-  // FormatInternal is a helper function not meant to use directly, use
-  // compiler::cpp::Formatter instead. This function is meant to support
-  // formatting text using named variables (eq. "$foo$) from a lookup map (vars)
-  // and variables directly supplied by arguments (eq "$1$" meaning first
-  // argument which is the zero index element of args).
-  void FormatInternal(const std::vector<std::string>& args,
-                      const std::map<std::string, std::string>& vars,
-                      const char* format);
-
-  // True if any write to the underlying stream failed.  (We don't just
-  // crash in this case because this is an I/O failure, not a programming
-  // error.)
-  bool failed() const { return failed_; }
-
- private:
-  // Link the output range defined by the substitution variables as emitted by
-  // the last call to Print to the object found at the SourceCodeInfo-style path
-  // in a file with path file_path. The range begins at the start of
-  // begin_varname's value and ends after the last character of the value
-  // substituted for end_varname. Note that begin_varname and end_varname
-  // may refer to the same variable.
-  void Annotate(const char* begin_varname, const char* end_varname,
-                const std::string& file_path, const std::vector<int>& path);
-
-  // Base case
-  void PrintInternal(std::map<std::string, std::string>* vars,
-                     const char* text) {
-    Print(*vars, text);
-  }
-
-  template <typename... Args>
-  void PrintInternal(std::map<std::string, std::string>* vars, const char* text,
-                     const char* key, const std::string& value,
-                     const Args&... args) {
-    (*vars)[key] = value;
-    PrintInternal(vars, text, args...);
-  }
-
-  // Copy size worth of bytes from data to buffer_.
-  void CopyToBuffer(const char* data, int size);
-
-  void push_back(char c) {
-    if (failed_) return;
-    if (buffer_size_ == 0) {
-      if (!Next()) return;
-    }
-    *buffer_++ = c;
-    buffer_size_--;
-    offset_++;
-  }
-
-  bool Next();
-
-  inline void IndentIfAtStart();
-  const char* WriteVariable(
-      const std::vector<std::string>& args,
-      const std::map<std::string, std::string>& vars, const char* format,
-      int* arg_index,
-      std::vector<AnnotationCollector::Annotation>* annotations);
-
-  const char variable_delimiter_;
-
-  ZeroCopyOutputStream* const output_;
-  char* buffer_;
-  int buffer_size_;
-  // The current position, in bytes, in the output stream.  This is equivalent
-  // to the total number of bytes that have been written so far.  This value is
-  // used to calculate annotation ranges in the substitutions_ map below.
-  size_t offset_;
-
-  std::string indent_;
-  bool at_start_of_line_;
-  bool failed_;
-
-  // A map from variable name to [start, end) offsets in the output buffer.
-  // These refer to the offsets used for a variable after the last call to
-  // Print.  If a variable was used more than once, the entry used in
-  // this map is set to a negative-length span.  For singly-used variables, the
-  // start offset is the beginning of the substitution; the end offset is the
-  // last byte of the substitution plus one (such that (end - start) is the
-  // length of the substituted string).
-  std::map<std::string, std::pair<size_t, size_t> > substitutions_;
-
-  // Keeps track of the keys in substitutions_ that need to be updated when
-  // indents are inserted. These are keys that refer to the beginning of the
-  // current line.
-  std::vector<std::string> line_start_variables_;
-
-  // Returns true and sets range to the substitution range in the output for
-  // varname if varname was used once in the last call to Print. If varname
-  // was not used, or if it was used multiple times, returns false (and
-  // fails a debug assertion).
-  bool GetSubstitutionRange(const char* varname,
-                            std::pair<size_t, size_t>* range);
-
-  // If non-null, annotation_collector_ is used to store annotations about
-  // generated code.
-  AnnotationCollector* const annotation_collector_;
-
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(Printer);
-};
-
-}  // namespace io
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
-
-#endif  // GOOGLE_PROTOBUF_IO_PRINTER_H__
diff --git a/libs/protobuf/src/google/protobuf/io/printer_unittest.cc b/libs/protobuf/src/google/protobuf/io/printer_unittest.cc
deleted file mode 100644
index ed54d1d..0000000
--- a/libs/protobuf/src/google/protobuf/io/printer_unittest.cc
+++ /dev/null
@@ -1,735 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-
-#include <google/protobuf/io/printer.h>
-
-#include <vector>
-
-#include <google/protobuf/stubs/logging.h>
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/descriptor.pb.h>
-#include <google/protobuf/testing/googletest.h>
-#include <gtest/gtest.h>
-#include <google/protobuf/io/zero_copy_stream_impl.h>
-
-namespace google {
-namespace protobuf {
-namespace io {
-
-// Each test repeats over several block sizes in order to test both cases
-// where particular writes cross a buffer boundary and cases where they do
-// not.
-
-TEST(Printer, EmptyPrinter) {
-  char buffer[8192];
-  const int block_size = 100;
-  ArrayOutputStream output(buffer, GOOGLE_ARRAYSIZE(buffer), block_size);
-  Printer printer(&output, '\0');
-  EXPECT_TRUE(!printer.failed());
-}
-
-TEST(Printer, BasicPrinting) {
-  char buffer[8192];
-
-  for (int block_size = 1; block_size < 512; block_size *= 2) {
-    ArrayOutputStream output(buffer, sizeof(buffer), block_size);
-
-    {
-      Printer printer(&output, '\0');
-
-      printer.Print("Hello World!");
-      printer.Print("  This is the same line.\n");
-      printer.Print("But this is a new one.\nAnd this is another one.");
-
-      EXPECT_FALSE(printer.failed());
-    }
-
-    buffer[output.ByteCount()] = '\0';
-
-    EXPECT_STREQ(
-        "Hello World!  This is the same line.\n"
-        "But this is a new one.\n"
-        "And this is another one.",
-        buffer);
-  }
-}
-
-TEST(Printer, WriteRaw) {
-  char buffer[8192];
-
-  for (int block_size = 1; block_size < 512; block_size *= 2) {
-    ArrayOutputStream output(buffer, sizeof(buffer), block_size);
-
-    {
-      std::string string_obj = "From an object\n";
-      Printer printer(&output, '$');
-      printer.WriteRaw("Hello World!", 12);
-      printer.PrintRaw("  This is the same line.\n");
-      printer.PrintRaw("But this is a new one.\nAnd this is another one.");
-      printer.WriteRaw("\n", 1);
-      printer.PrintRaw(string_obj);
-      EXPECT_FALSE(printer.failed());
-    }
-
-    buffer[output.ByteCount()] = '\0';
-
-    EXPECT_STREQ(
-        "Hello World!  This is the same line.\n"
-        "But this is a new one.\n"
-        "And this is another one."
-        "\n"
-        "From an object\n",
-        buffer);
-  }
-}
-
-TEST(Printer, VariableSubstitution) {
-  char buffer[8192];
-
-  for (int block_size = 1; block_size < 512; block_size *= 2) {
-    ArrayOutputStream output(buffer, sizeof(buffer), block_size);
-
-    {
-      Printer printer(&output, '$');
-      std::map<std::string, std::string> vars;
-
-      vars["foo"] = "World";
-      vars["bar"] = "$foo$";
-      vars["abcdefg"] = "1234";
-
-      printer.Print(vars, "Hello $foo$!\nbar = $bar$\n");
-      printer.PrintRaw("RawBit\n");
-      printer.Print(vars, "$abcdefg$\nA literal dollar sign:  $$");
-
-      vars["foo"] = "blah";
-      printer.Print(vars, "\nNow foo = $foo$.");
-
-      EXPECT_FALSE(printer.failed());
-    }
-
-    buffer[output.ByteCount()] = '\0';
-
-    EXPECT_STREQ(
-        "Hello World!\n"
-        "bar = $foo$\n"
-        "RawBit\n"
-        "1234\n"
-        "A literal dollar sign:  $\n"
-        "Now foo = blah.",
-        buffer);
-  }
-}
-
-TEST(Printer, InlineVariableSubstitution) {
-  char buffer[8192];
-
-  ArrayOutputStream output(buffer, sizeof(buffer));
-
-  {
-    Printer printer(&output, '$');
-    printer.Print("Hello $foo$!\n", "foo", "World");
-    printer.PrintRaw("RawBit\n");
-    printer.Print("$foo$ $bar$\n", "foo", "one", "bar", "two");
-    EXPECT_FALSE(printer.failed());
-  }
-
-  buffer[output.ByteCount()] = '\0';
-
-  EXPECT_STREQ(
-      "Hello World!\n"
-      "RawBit\n"
-      "one two\n",
-      buffer);
-}
-
-// MockDescriptorFile defines only those members that Printer uses to write out
-// annotations.
-class MockDescriptorFile {
- public:
-  explicit MockDescriptorFile(const std::string& file) : file_(file) {}
-
-  // The mock filename for this file.
-  const std::string& name() const { return file_; }
-
- private:
-  std::string file_;
-};
-
-// MockDescriptor defines only those members that Printer uses to write out
-// annotations.
-class MockDescriptor {
- public:
-  MockDescriptor(const std::string& file, const std::vector<int>& path)
-      : file_(file), path_(path) {}
-
-  // The mock file in which this descriptor was defined.
-  const MockDescriptorFile* file() const { return &file_; }
-
- private:
-  // Allows access to GetLocationPath.
-  friend class Printer;
-
-  // Copies the pre-stored path to output.
-  void GetLocationPath(std::vector<int>* output) const { *output = path_; }
-
-  MockDescriptorFile file_;
-  std::vector<int> path_;
-};
-
-TEST(Printer, AnnotateMap) {
-  char buffer[8192];
-  ArrayOutputStream output(buffer, sizeof(buffer));
-  GeneratedCodeInfo info;
-  AnnotationProtoCollector<GeneratedCodeInfo> info_collector(&info);
-  {
-    Printer printer(&output, '$', &info_collector);
-    std::map<std::string, std::string> vars;
-    vars["foo"] = "3";
-    vars["bar"] = "5";
-    printer.Print(vars, "012$foo$4$bar$\n");
-    std::vector<int> path_1;
-    path_1.push_back(33);
-    std::vector<int> path_2;
-    path_2.push_back(11);
-    path_2.push_back(22);
-    MockDescriptor descriptor_1("path_1", path_1);
-    MockDescriptor descriptor_2("path_2", path_2);
-    printer.Annotate("foo", "foo", &descriptor_1);
-    printer.Annotate("bar", "bar", &descriptor_2);
-  }
-  buffer[output.ByteCount()] = '\0';
-  EXPECT_STREQ("012345\n", buffer);
-  ASSERT_EQ(2, info.annotation_size());
-  const GeneratedCodeInfo::Annotation* foo = info.annotation(0).path_size() == 1
-                                                 ? &info.annotation(0)
-                                                 : &info.annotation(1);
-  const GeneratedCodeInfo::Annotation* bar = info.annotation(0).path_size() == 1
-                                                 ? &info.annotation(1)
-                                                 : &info.annotation(0);
-  ASSERT_EQ(1, foo->path_size());
-  ASSERT_EQ(2, bar->path_size());
-  EXPECT_EQ(33, foo->path(0));
-  EXPECT_EQ(11, bar->path(0));
-  EXPECT_EQ(22, bar->path(1));
-  EXPECT_EQ("path_1", foo->source_file());
-  EXPECT_EQ("path_2", bar->source_file());
-  EXPECT_EQ(3, foo->begin());
-  EXPECT_EQ(4, foo->end());
-  EXPECT_EQ(5, bar->begin());
-  EXPECT_EQ(6, bar->end());
-}
-
-TEST(Printer, AnnotateInline) {
-  char buffer[8192];
-  ArrayOutputStream output(buffer, sizeof(buffer));
-  GeneratedCodeInfo info;
-  AnnotationProtoCollector<GeneratedCodeInfo> info_collector(&info);
-  {
-    Printer printer(&output, '$', &info_collector);
-    printer.Print("012$foo$4$bar$\n", "foo", "3", "bar", "5");
-    std::vector<int> path_1;
-    path_1.push_back(33);
-    std::vector<int> path_2;
-    path_2.push_back(11);
-    path_2.push_back(22);
-    MockDescriptor descriptor_1("path_1", path_1);
-    MockDescriptor descriptor_2("path_2", path_2);
-    printer.Annotate("foo", "foo", &descriptor_1);
-    printer.Annotate("bar", "bar", &descriptor_2);
-  }
-  buffer[output.ByteCount()] = '\0';
-  EXPECT_STREQ("012345\n", buffer);
-  ASSERT_EQ(2, info.annotation_size());
-  const GeneratedCodeInfo::Annotation* foo = info.annotation(0).path_size() == 1
-                                                 ? &info.annotation(0)
-                                                 : &info.annotation(1);
-  const GeneratedCodeInfo::Annotation* bar = info.annotation(0).path_size() == 1
-                                                 ? &info.annotation(1)
-                                                 : &info.annotation(0);
-  ASSERT_EQ(1, foo->path_size());
-  ASSERT_EQ(2, bar->path_size());
-  EXPECT_EQ(33, foo->path(0));
-  EXPECT_EQ(11, bar->path(0));
-  EXPECT_EQ(22, bar->path(1));
-  EXPECT_EQ("path_1", foo->source_file());
-  EXPECT_EQ("path_2", bar->source_file());
-  EXPECT_EQ(3, foo->begin());
-  EXPECT_EQ(4, foo->end());
-  EXPECT_EQ(5, bar->begin());
-  EXPECT_EQ(6, bar->end());
-}
-
-TEST(Printer, AnnotateRange) {
-  char buffer[8192];
-  ArrayOutputStream output(buffer, sizeof(buffer));
-  GeneratedCodeInfo info;
-  AnnotationProtoCollector<GeneratedCodeInfo> info_collector(&info);
-  {
-    Printer printer(&output, '$', &info_collector);
-    printer.Print("012$foo$4$bar$\n", "foo", "3", "bar", "5");
-    std::vector<int> path;
-    path.push_back(33);
-    MockDescriptor descriptor("path", path);
-    printer.Annotate("foo", "bar", &descriptor);
-  }
-  buffer[output.ByteCount()] = '\0';
-  EXPECT_STREQ("012345\n", buffer);
-  ASSERT_EQ(1, info.annotation_size());
-  const GeneratedCodeInfo::Annotation* foobar = &info.annotation(0);
-  ASSERT_EQ(1, foobar->path_size());
-  EXPECT_EQ(33, foobar->path(0));
-  EXPECT_EQ("path", foobar->source_file());
-  EXPECT_EQ(3, foobar->begin());
-  EXPECT_EQ(6, foobar->end());
-}
-
-TEST(Printer, AnnotateEmptyRange) {
-  char buffer[8192];
-  ArrayOutputStream output(buffer, sizeof(buffer));
-  GeneratedCodeInfo info;
-  AnnotationProtoCollector<GeneratedCodeInfo> info_collector(&info);
-  {
-    Printer printer(&output, '$', &info_collector);
-    printer.Print("012$foo$4$baz$$bam$$bar$\n", "foo", "3", "bar", "5", "baz",
-                  "", "bam", "");
-    std::vector<int> path;
-    path.push_back(33);
-    MockDescriptor descriptor("path", path);
-    printer.Annotate("baz", "bam", &descriptor);
-  }
-  buffer[output.ByteCount()] = '\0';
-  EXPECT_STREQ("012345\n", buffer);
-  ASSERT_EQ(1, info.annotation_size());
-  const GeneratedCodeInfo::Annotation* bazbam = &info.annotation(0);
-  ASSERT_EQ(1, bazbam->path_size());
-  EXPECT_EQ(33, bazbam->path(0));
-  EXPECT_EQ("path", bazbam->source_file());
-  EXPECT_EQ(5, bazbam->begin());
-  EXPECT_EQ(5, bazbam->end());
-}
-
-TEST(Printer, AnnotateDespiteUnrelatedMultipleUses) {
-  char buffer[8192];
-  ArrayOutputStream output(buffer, sizeof(buffer));
-  GeneratedCodeInfo info;
-  AnnotationProtoCollector<GeneratedCodeInfo> info_collector(&info);
-  {
-    Printer printer(&output, '$', &info_collector);
-    printer.Print("012$foo$4$foo$$bar$\n", "foo", "3", "bar", "5");
-    std::vector<int> path;
-    path.push_back(33);
-    MockDescriptor descriptor("path", path);
-    printer.Annotate("bar", "bar", &descriptor);
-  }
-  buffer[output.ByteCount()] = '\0';
-  EXPECT_STREQ("0123435\n", buffer);
-  ASSERT_EQ(1, info.annotation_size());
-  const GeneratedCodeInfo::Annotation* bar = &info.annotation(0);
-  ASSERT_EQ(1, bar->path_size());
-  EXPECT_EQ(33, bar->path(0));
-  EXPECT_EQ("path", bar->source_file());
-  EXPECT_EQ(6, bar->begin());
-  EXPECT_EQ(7, bar->end());
-}
-
-TEST(Printer, AnnotateIndent) {
-  char buffer[8192];
-  ArrayOutputStream output(buffer, sizeof(buffer));
-  GeneratedCodeInfo info;
-  AnnotationProtoCollector<GeneratedCodeInfo> info_collector(&info);
-  {
-    Printer printer(&output, '$', &info_collector);
-    printer.Print("0\n");
-    printer.Indent();
-    printer.Print("$foo$", "foo", "4");
-    std::vector<int> path;
-    path.push_back(44);
-    MockDescriptor descriptor("path", path);
-    printer.Annotate("foo", &descriptor);
-    printer.Print(",\n");
-    printer.Print("$bar$", "bar", "9");
-    path[0] = 99;
-    MockDescriptor descriptor_two("path", path);
-    printer.Annotate("bar", &descriptor_two);
-    printer.Print("\n${$$D$$}$\n", "{", "", "}", "", "D", "d");
-    path[0] = 1313;
-    MockDescriptor descriptor_three("path", path);
-    printer.Annotate("{", "}", &descriptor_three);
-    printer.Outdent();
-    printer.Print("\n");
-  }
-  buffer[output.ByteCount()] = '\0';
-  EXPECT_STREQ("0\n  4,\n  9\n  d\n\n", buffer);
-  ASSERT_EQ(3, info.annotation_size());
-  const GeneratedCodeInfo::Annotation* foo = &info.annotation(0);
-  ASSERT_EQ(1, foo->path_size());
-  EXPECT_EQ(44, foo->path(0));
-  EXPECT_EQ("path", foo->source_file());
-  EXPECT_EQ(4, foo->begin());
-  EXPECT_EQ(5, foo->end());
-  const GeneratedCodeInfo::Annotation* bar = &info.annotation(1);
-  ASSERT_EQ(1, bar->path_size());
-  EXPECT_EQ(99, bar->path(0));
-  EXPECT_EQ("path", bar->source_file());
-  EXPECT_EQ(9, bar->begin());
-  EXPECT_EQ(10, bar->end());
-  const GeneratedCodeInfo::Annotation* braces = &info.annotation(2);
-  ASSERT_EQ(1, braces->path_size());
-  EXPECT_EQ(1313, braces->path(0));
-  EXPECT_EQ("path", braces->source_file());
-  EXPECT_EQ(13, braces->begin());
-  EXPECT_EQ(14, braces->end());
-}
-
-TEST(Printer, AnnotateIndentNewline) {
-  char buffer[8192];
-  ArrayOutputStream output(buffer, sizeof(buffer));
-  GeneratedCodeInfo info;
-  AnnotationProtoCollector<GeneratedCodeInfo> info_collector(&info);
-  {
-    Printer printer(&output, '$', &info_collector);
-    printer.Indent();
-    printer.Print("$A$$N$$B$C\n", "A", "", "N", "\nz", "B", "");
-    std::vector<int> path;
-    path.push_back(0);
-    MockDescriptor descriptor("path", path);
-    printer.Annotate("A", "B", &descriptor);
-    printer.Outdent();
-    printer.Print("\n");
-  }
-  buffer[output.ByteCount()] = '\0';
-  EXPECT_STREQ("\nz  C\n\n", buffer);
-  ASSERT_EQ(1, info.annotation_size());
-  const GeneratedCodeInfo::Annotation* ab = &info.annotation(0);
-  ASSERT_EQ(1, ab->path_size());
-  EXPECT_EQ(0, ab->path(0));
-  EXPECT_EQ("path", ab->source_file());
-  EXPECT_EQ(0, ab->begin());
-  EXPECT_EQ(4, ab->end());
-}
-
-TEST(Printer, Indenting) {
-  char buffer[8192];
-
-  for (int block_size = 1; block_size < 512; block_size *= 2) {
-    ArrayOutputStream output(buffer, sizeof(buffer), block_size);
-
-    {
-      Printer printer(&output, '$');
-      std::map<std::string, std::string> vars;
-
-      vars["newline"] = "\n";
-
-      printer.Print("This is not indented.\n");
-      printer.Indent();
-      printer.Print("This is indented\nAnd so is this\n");
-      printer.Outdent();
-      printer.Print("But this is not.");
-      printer.Indent();
-      printer.Print(
-          "  And this is still the same line.\n"
-          "But this is indented.\n");
-      printer.PrintRaw("RawBit has indent at start\n");
-      printer.PrintRaw("but not after a raw newline\n");
-      printer.Print(vars,
-                    "Note that a newline in a variable will break "
-                    "indenting, as we see$newline$here.\n");
-      printer.Indent();
-      printer.Print("And this");
-      printer.Outdent();
-      printer.Outdent();
-      printer.Print(" is double-indented\nBack to normal.");
-
-      EXPECT_FALSE(printer.failed());
-    }
-
-    buffer[output.ByteCount()] = '\0';
-
-    EXPECT_STREQ(
-        "This is not indented.\n"
-        "  This is indented\n"
-        "  And so is this\n"
-        "But this is not.  And this is still the same line.\n"
-        "  But this is indented.\n"
-        "  RawBit has indent at start\n"
-        "but not after a raw newline\n"
-        "Note that a newline in a variable will break indenting, as we see\n"
-        "here.\n"
-        "    And this is double-indented\n"
-        "Back to normal.",
-        buffer);
-  }
-}
-
-// Death tests do not work on Windows as of yet.
-#ifdef PROTOBUF_HAS_DEATH_TEST
-TEST(Printer, Death) {
-  char buffer[8192];
-
-  ArrayOutputStream output(buffer, sizeof(buffer));
-  Printer printer(&output, '$');
-
-  EXPECT_DEBUG_DEATH(printer.Print("$nosuchvar$"), "Undefined variable");
-  EXPECT_DEBUG_DEATH(printer.Print("$unclosed"), "Unclosed variable name");
-  EXPECT_DEBUG_DEATH(printer.Outdent(), "without matching Indent");
-}
-
-TEST(Printer, AnnotateMultipleUsesDeath) {
-  char buffer[8192];
-  ArrayOutputStream output(buffer, sizeof(buffer));
-  GeneratedCodeInfo info;
-  AnnotationProtoCollector<GeneratedCodeInfo> info_collector(&info);
-  {
-    Printer printer(&output, '$', &info_collector);
-    printer.Print("012$foo$4$foo$\n", "foo", "3");
-    std::vector<int> path;
-    path.push_back(33);
-    MockDescriptor descriptor("path", path);
-    EXPECT_DEBUG_DEATH(printer.Annotate("foo", "foo", &descriptor), "multiple");
-  }
-}
-
-TEST(Printer, AnnotateNegativeLengthDeath) {
-  char buffer[8192];
-  ArrayOutputStream output(buffer, sizeof(buffer));
-  GeneratedCodeInfo info;
-  AnnotationProtoCollector<GeneratedCodeInfo> info_collector(&info);
-  {
-    Printer printer(&output, '$', &info_collector);
-    printer.Print("012$foo$4$bar$\n", "foo", "3", "bar", "5");
-    std::vector<int> path;
-    path.push_back(33);
-    MockDescriptor descriptor("path", path);
-    EXPECT_DEBUG_DEATH(printer.Annotate("bar", "foo", &descriptor), "negative");
-  }
-}
-
-TEST(Printer, AnnotateUndefinedDeath) {
-  char buffer[8192];
-  ArrayOutputStream output(buffer, sizeof(buffer));
-  GeneratedCodeInfo info;
-  AnnotationProtoCollector<GeneratedCodeInfo> info_collector(&info);
-  {
-    Printer printer(&output, '$', &info_collector);
-    printer.Print("012$foo$4$foo$\n", "foo", "3");
-    std::vector<int> path;
-    path.push_back(33);
-    MockDescriptor descriptor("path", path);
-    EXPECT_DEBUG_DEATH(printer.Annotate("bar", "bar", &descriptor),
-                       "Undefined");
-  }
-}
-#endif  // PROTOBUF_HAS_DEATH_TEST
-
-TEST(Printer, WriteFailurePartial) {
-  char buffer[17];
-
-  ArrayOutputStream output(buffer, sizeof(buffer));
-  Printer printer(&output, '$');
-
-  // Print 16 bytes to almost fill the buffer (should not fail).
-  printer.Print("0123456789abcdef");
-  EXPECT_FALSE(printer.failed());
-
-  // Try to print 2 chars. Only one fits.
-  printer.Print("<>");
-  EXPECT_TRUE(printer.failed());
-
-  // Anything else should fail too.
-  printer.Print(" ");
-  EXPECT_TRUE(printer.failed());
-  printer.Print("blah");
-  EXPECT_TRUE(printer.failed());
-
-  // Buffer should contain the first 17 bytes written.
-  EXPECT_EQ("0123456789abcdef<", std::string(buffer, sizeof(buffer)));
-}
-
-TEST(Printer, WriteFailureExact) {
-  char buffer[16];
-
-  ArrayOutputStream output(buffer, sizeof(buffer));
-  Printer printer(&output, '$');
-
-  // Print 16 bytes to fill the buffer exactly (should not fail).
-  printer.Print("0123456789abcdef");
-  EXPECT_FALSE(printer.failed());
-
-  // Try to print one more byte (should fail).
-  printer.Print(" ");
-  EXPECT_TRUE(printer.failed());
-
-  // Should not crash
-  printer.Print("blah");
-  EXPECT_TRUE(printer.failed());
-
-  // Buffer should contain the first 16 bytes written.
-  EXPECT_EQ("0123456789abcdef", std::string(buffer, sizeof(buffer)));
-}
-
-TEST(Printer, FormatInternal) {
-  std::vector<std::string> args{"arg1", "arg2"};
-  std::map<std::string, std::string> vars{
-      {"foo", "bar"}, {"baz", "bla"}, {"empty", ""}};
-  // Substitution tests
-  {
-    // Direct arg substitution
-    std::string s;
-    {
-      StringOutputStream output(&s);
-      Printer printer(&output, '$');
-      printer.FormatInternal(args, vars, "$1$ $2$");
-    }
-    EXPECT_EQ("arg1 arg2", s);
-  }
-  {
-    // Variable substitution including spaces left
-    std::string s;
-    {
-      StringOutputStream output(&s);
-      Printer printer(&output, '$');
-      printer.FormatInternal({}, vars, "$foo$$ baz$$ empty$");
-    }
-    EXPECT_EQ("bar bla", s);
-  }
-  {
-    // Variable substitution including spaces right
-    std::string s;
-    {
-      StringOutputStream output(&s);
-      Printer printer(&output, '$');
-      printer.FormatInternal({}, vars, "$empty $$foo $$baz$");
-    }
-    EXPECT_EQ("bar bla", s);
-  }
-  {
-    // Mixed variable substitution
-    std::string s;
-    {
-      StringOutputStream output(&s);
-      Printer printer(&output, '$');
-      printer.FormatInternal(args, vars, "$empty $$1$ $foo $$2$ $baz$");
-    }
-    EXPECT_EQ("arg1 bar arg2 bla", s);
-  }
-
-  // Indentation tests
-  {
-    // Empty lines shouldn't indent.
-    std::string s;
-    {
-      StringOutputStream output(&s);
-      Printer printer(&output, '$');
-      printer.Indent();
-      printer.FormatInternal(args, vars, "$empty $\n\n$1$ $foo $$2$\n$baz$");
-      printer.Outdent();
-    }
-    EXPECT_EQ("\n\n  arg1 bar arg2\n  bla", s);
-  }
-  {
-    // Annotations should respect indentation.
-    std::string s;
-    GeneratedCodeInfo info;
-    {
-      StringOutputStream output(&s);
-      AnnotationProtoCollector<GeneratedCodeInfo> info_collector(&info);
-      Printer printer(&output, '$', &info_collector);
-      printer.Indent();
-      GeneratedCodeInfo::Annotation annotation;
-      annotation.set_source_file("file.proto");
-      annotation.add_path(33);
-      std::vector<std::string> args{annotation.SerializeAsString(), "arg1",
-                                    "arg2"};
-      printer.FormatInternal(args, vars, "$empty $\n\n${1$$2$$}$ $3$\n$baz$");
-      printer.Outdent();
-    }
-    EXPECT_EQ("\n\n  arg1 arg2\n  bla", s);
-    ASSERT_EQ(1, info.annotation_size());
-    const GeneratedCodeInfo::Annotation* arg1 = &info.annotation(0);
-    ASSERT_EQ(1, arg1->path_size());
-    EXPECT_EQ(33, arg1->path(0));
-    EXPECT_EQ("file.proto", arg1->source_file());
-    EXPECT_EQ(4, arg1->begin());
-    EXPECT_EQ(8, arg1->end());
-  }
-#ifdef PROTOBUF_HAS_DEATH_TEST
-  // Death tests in case of illegal format strings.
-  {
-    // Unused arguments
-    std::string s;
-    StringOutputStream output(&s);
-    Printer printer(&output, '$');
-    EXPECT_DEATH(printer.FormatInternal(args, vars, "$empty $$1$"), "Unused");
-  }
-  {
-    // Wrong order arguments
-    std::string s;
-    StringOutputStream output(&s);
-    Printer printer(&output, '$');
-    EXPECT_DEATH(printer.FormatInternal(args, vars, "$2$ $1$"), "order");
-  }
-  {
-    // Zero is illegal argument
-    std::string s;
-    StringOutputStream output(&s);
-    Printer printer(&output, '$');
-    EXPECT_DEATH(printer.FormatInternal(args, vars, "$0$"), "failed");
-  }
-  {
-    // Argument out of bounds
-    std::string s;
-    StringOutputStream output(&s);
-    Printer printer(&output, '$');
-    EXPECT_DEATH(printer.FormatInternal(args, vars, "$1$ $2$ $3$"), "bounds");
-  }
-  {
-    // Unknown variable
-    std::string s;
-    StringOutputStream output(&s);
-    Printer printer(&output, '$');
-    EXPECT_DEATH(printer.FormatInternal(args, vars, "$huh$ $1$$2$"), "Unknown");
-  }
-  {
-    // Illegal variable
-    std::string s;
-    StringOutputStream output(&s);
-    Printer printer(&output, '$');
-    EXPECT_DEATH(printer.FormatInternal({}, vars, "$ $"), "Empty");
-  }
-#endif  // PROTOBUF_HAS_DEATH_TEST
-}
-
-}  // namespace io
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/io/strtod.cc b/libs/protobuf/src/google/protobuf/io/strtod.cc
deleted file mode 100644
index 03acb5b..0000000
--- a/libs/protobuf/src/google/protobuf/io/strtod.cc
+++ /dev/null
@@ -1,82 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <google/protobuf/io/strtod.h>
-
-#include <cstdio>
-#include <cstring>
-#include <limits>
-#include <string>
-
-#include <google/protobuf/stubs/logging.h>
-#include <google/protobuf/stubs/common.h>
-
-#include <google/protobuf/stubs/strutil.h>
-
-namespace google {
-namespace protobuf {
-namespace io {
-
-// This approximately 0x1.ffffffp127, but we don't use 0x1.ffffffp127 because
-// it won't compile in MSVC.
-const double MAX_FLOAT_AS_DOUBLE_ROUNDED = 3.4028235677973366e+38;
-
-float SafeDoubleToFloat(double value) {
-  // static_cast<float> on a number larger than float can result in illegal
-  // instruction error, so we need to manually convert it to infinity or max.
-  if (value > std::numeric_limits<float>::max()) {
-    // Max float value is about 3.4028234664E38 when represented as a double.
-    // However, when printing float as text, it will be rounded as
-    // 3.4028235e+38. If we parse the value of 3.4028235e+38 from text and
-    // compare it to 3.4028234664E38, we may think that it is larger, but
-    // actually, any number between these two numbers could only be represented
-    // as the same max float number in float, so we should treat them the same
-    // as max float.
-    if (value <= MAX_FLOAT_AS_DOUBLE_ROUNDED) {
-      return std::numeric_limits<float>::max();
-    }
-    return std::numeric_limits<float>::infinity();
-  } else if (value < -std::numeric_limits<float>::max()) {
-    if (value >= -MAX_FLOAT_AS_DOUBLE_ROUNDED) {
-      return -std::numeric_limits<float>::max();
-    }
-    return -std::numeric_limits<float>::infinity();
-  } else {
-    return static_cast<float>(value);
-  }
-}
-
-double NoLocaleStrtod(const char* str, char** endptr) {
-  return google::protobuf::internal::NoLocaleStrtod(str, endptr);
-}
-
-}  // namespace io
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/io/strtod.h b/libs/protobuf/src/google/protobuf/io/strtod.h
deleted file mode 100644
index 38f544a..0000000
--- a/libs/protobuf/src/google/protobuf/io/strtod.h
+++ /dev/null
@@ -1,55 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// A locale-independent version of strtod(), used to parse floating
-// point default values in .proto files, where the decimal separator
-// is always a dot.
-
-#ifndef GOOGLE_PROTOBUF_IO_STRTOD_H__
-#define GOOGLE_PROTOBUF_IO_STRTOD_H__
-
-namespace google {
-namespace protobuf {
-namespace io {
-
-// A locale-independent version of the standard strtod(), which always
-// uses a dot as the decimal separator.
-double NoLocaleStrtod(const char* str, char** endptr);
-
-// Casts a double value to a float value. If the value is outside of the
-// representable range of float, it will be converted to positive or negative
-// infinity.
-float SafeDoubleToFloat(double value);
-
-}  // namespace io
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // GOOGLE_PROTOBUF_IO_STRTOD_H__
diff --git a/libs/protobuf/src/google/protobuf/io/tokenizer.cc b/libs/protobuf/src/google/protobuf/io/tokenizer.cc
deleted file mode 100644
index f9e0776..0000000
--- a/libs/protobuf/src/google/protobuf/io/tokenizer.cc
+++ /dev/null
@@ -1,1239 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-//
-// Here we have a hand-written lexer.  At first you might ask yourself,
-// "Hand-written text processing?  Is Kenton crazy?!"  Well, first of all,
-// yes I am crazy, but that's beside the point.  There are actually reasons
-// why I ended up writing this this way.
-//
-// The traditional approach to lexing is to use lex to generate a lexer for
-// you.  Unfortunately, lex's output is ridiculously ugly and difficult to
-// integrate cleanly with C++ code, especially abstract code or code meant
-// as a library.  Better parser-generators exist but would add dependencies
-// which most users won't already have, which we'd like to avoid.  (GNU flex
-// has a C++ output option, but it's still ridiculously ugly, non-abstract,
-// and not library-friendly.)
-//
-// The next approach that any good software engineer should look at is to
-// use regular expressions.  And, indeed, I did.  I have code which
-// implements this same class using regular expressions.  It's about 200
-// lines shorter.  However:
-// - Rather than error messages telling you "This string has an invalid
-//   escape sequence at line 5, column 45", you get error messages like
-//   "Parse error on line 5".  Giving more precise errors requires adding
-//   a lot of code that ends up basically as complex as the hand-coded
-//   version anyway.
-// - The regular expression to match a string literal looks like this:
-//     kString  = new RE("(\"([^\"\\\\]|"              // non-escaped
-//                       "\\\\[abfnrtv?\"'\\\\0-7]|"   // normal escape
-//                       "\\\\x[0-9a-fA-F])*\"|"       // hex escape
-//                       "\'([^\'\\\\]|"        // Also support single-quotes.
-//                       "\\\\[abfnrtv?\"'\\\\0-7]|"
-//                       "\\\\x[0-9a-fA-F])*\')");
-//   Verifying the correctness of this line noise is actually harder than
-//   verifying the correctness of ConsumeString(), defined below.  I'm not
-//   even confident that the above is correct, after staring at it for some
-//   time.
-// - PCRE is fast, but there's still more overhead involved than the code
-//   below.
-// - Sadly, regular expressions are not part of the C standard library, so
-//   using them would require depending on some other library.  For the
-//   open source release, this could be really annoying.  Nobody likes
-//   downloading one piece of software just to find that they need to
-//   download something else to make it work, and in all likelihood
-//   people downloading Protocol Buffers will already be doing so just
-//   to make something else work.  We could include a copy of PCRE with
-//   our code, but that obligates us to keep it up-to-date and just seems
-//   like a big waste just to save 200 lines of code.
-//
-// On a similar but unrelated note, I'm even scared to use ctype.h.
-// Apparently functions like isalpha() are locale-dependent.  So, if we used
-// that, then if this code is being called from some program that doesn't
-// have its locale set to "C", it would behave strangely.  We can't just set
-// the locale to "C" ourselves since we might break the calling program that
-// way, particularly if it is multi-threaded.  WTF?  Someone please let me
-// (Kenton) know if I'm missing something here...
-//
-// I'd love to hear about other alternatives, though, as this code isn't
-// exactly pretty.
-
-#include <google/protobuf/io/tokenizer.h>
-
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/stubs/logging.h>
-#include <google/protobuf/stubs/strutil.h>
-#include <google/protobuf/stubs/stringprintf.h>
-#include <google/protobuf/io/strtod.h>
-#include <google/protobuf/io/zero_copy_stream.h>
-#include <google/protobuf/stubs/stl_util.h>
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-namespace io {
-namespace {
-
-// As mentioned above, I don't trust ctype.h due to the presence of "locales".
-// So, I have written replacement functions here.  Someone please smack me if
-// this is a bad idea or if there is some way around this.
-//
-// These "character classes" are designed to be used in template methods.
-// For instance, Tokenizer::ConsumeZeroOrMore<Whitespace>() will eat
-// whitespace.
-
-// Note:  No class is allowed to contain '\0', since this is used to mark end-
-//   of-input and is handled specially.
-
-#define CHARACTER_CLASS(NAME, EXPRESSION)                     \
-  class NAME {                                                \
-   public:                                                    \
-    static inline bool InClass(char c) { return EXPRESSION; } \
-  }
-
-CHARACTER_CLASS(Whitespace, c == ' ' || c == '\n' || c == '\t' || c == '\r' ||
-                                c == '\v' || c == '\f');
-CHARACTER_CLASS(WhitespaceNoNewline,
-                c == ' ' || c == '\t' || c == '\r' || c == '\v' || c == '\f');
-
-CHARACTER_CLASS(Unprintable, c<' ' && c> '\0');
-
-CHARACTER_CLASS(Digit, '0' <= c && c <= '9');
-CHARACTER_CLASS(OctalDigit, '0' <= c && c <= '7');
-CHARACTER_CLASS(HexDigit, ('0' <= c && c <= '9') || ('a' <= c && c <= 'f') ||
-                              ('A' <= c && c <= 'F'));
-
-CHARACTER_CLASS(Letter,
-                ('a' <= c && c <= 'z') || ('A' <= c && c <= 'Z') || (c == '_'));
-
-CHARACTER_CLASS(Alphanumeric, ('a' <= c && c <= 'z') ||
-                                  ('A' <= c && c <= 'Z') ||
-                                  ('0' <= c && c <= '9') || (c == '_'));
-
-CHARACTER_CLASS(Escape, c == 'a' || c == 'b' || c == 'f' || c == 'n' ||
-                            c == 'r' || c == 't' || c == 'v' || c == '\\' ||
-                            c == '?' || c == '\'' || c == '\"');
-
-#undef CHARACTER_CLASS
-
-// Given a char, interpret it as a numeric digit and return its value.
-// This supports any number base up to 36.
-// Represents integer values of digits.
-// Uses 36 to indicate an invalid character since we support
-// bases up to 36.
-static const int8_t kAsciiToInt[256] = {
-    36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,  // 00-0F
-    36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,  // 10-1F
-    36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,  // ' '-'/'
-    0,  1,  2,  3,  4,  5,  6,  7,  8,  9,                           // '0'-'9'
-    36, 36, 36, 36, 36, 36, 36,                                      // ':'-'@'
-    10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,  // 'A'-'P'
-    26, 27, 28, 29, 30, 31, 32, 33, 34, 35,                          // 'Q'-'Z'
-    36, 36, 36, 36, 36, 36,                                          // '['-'`'
-    10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,  // 'a'-'p'
-    26, 27, 28, 29, 30, 31, 32, 33, 34, 35,                          // 'q'-'z'
-    36, 36, 36, 36, 36,                                              // '{'-DEL
-    36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,  // 80-8F
-    36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,  // 90-9F
-    36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,  // A0-AF
-    36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,  // B0-BF
-    36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,  // C0-CF
-    36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,  // D0-DF
-    36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,  // E0-EF
-    36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,  // F0-FF
-};
-
-inline int DigitValue(char digit) { return kAsciiToInt[digit & 0xFF]; }
-
-// Inline because it's only used in one place.
-inline char TranslateEscape(char c) {
-  switch (c) {
-    case 'a':
-      return '\a';
-    case 'b':
-      return '\b';
-    case 'f':
-      return '\f';
-    case 'n':
-      return '\n';
-    case 'r':
-      return '\r';
-    case 't':
-      return '\t';
-    case 'v':
-      return '\v';
-    case '\\':
-      return '\\';
-    case '?':
-      return '\?';  // Trigraphs = :(
-    case '\'':
-      return '\'';
-    case '"':
-      return '\"';
-
-    // We expect escape sequences to have been validated separately.
-    default:
-      return '?';
-  }
-}
-
-}  // anonymous namespace
-
-ErrorCollector::~ErrorCollector() {}
-
-// ===================================================================
-
-Tokenizer::Tokenizer(ZeroCopyInputStream* input,
-                     ErrorCollector* error_collector)
-    : input_(input),
-      error_collector_(error_collector),
-      buffer_(NULL),
-      buffer_size_(0),
-      buffer_pos_(0),
-      read_error_(false),
-      line_(0),
-      column_(0),
-      record_target_(NULL),
-      record_start_(-1),
-      allow_f_after_float_(false),
-      comment_style_(CPP_COMMENT_STYLE),
-      require_space_after_number_(true),
-      allow_multiline_strings_(false) {
-  current_.line = 0;
-  current_.column = 0;
-  current_.end_column = 0;
-  current_.type = TYPE_START;
-
-  Refresh();
-}
-
-Tokenizer::~Tokenizer() {
-  // If we had any buffer left unread, return it to the underlying stream
-  // so that someone else can read it.
-  if (buffer_size_ > buffer_pos_) {
-    input_->BackUp(buffer_size_ - buffer_pos_);
-  }
-}
-
-bool Tokenizer::report_whitespace() const { return report_whitespace_; }
-// Note: `set_report_whitespace(false)` implies `set_report_newlines(false)`.
-void Tokenizer::set_report_whitespace(bool report) {
-  report_whitespace_ = report;
-  report_newlines_ &= report;
-}
-
-// If true, newline tokens are reported by Next().
-bool Tokenizer::report_newlines() const { return report_newlines_; }
-// Note: `set_report_newlines(true)` implies `set_report_whitespace(true)`.
-void Tokenizer::set_report_newlines(bool report) {
-  report_newlines_ = report;
-  report_whitespace_ |= report;  // enable report_whitespace if necessary
-}
-
-// -------------------------------------------------------------------
-// Internal helpers.
-
-void Tokenizer::NextChar() {
-  // Update our line and column counters based on the character being
-  // consumed.
-  if (current_char_ == '\n') {
-    ++line_;
-    column_ = 0;
-  } else if (current_char_ == '\t') {
-    column_ += kTabWidth - column_ % kTabWidth;
-  } else {
-    ++column_;
-  }
-
-  // Advance to the next character.
-  ++buffer_pos_;
-  if (buffer_pos_ < buffer_size_) {
-    current_char_ = buffer_[buffer_pos_];
-  } else {
-    Refresh();
-  }
-}
-
-void Tokenizer::Refresh() {
-  if (read_error_) {
-    current_char_ = '\0';
-    return;
-  }
-
-  // If we're in a token, append the rest of the buffer to it.
-  if (record_target_ != NULL && record_start_ < buffer_size_) {
-    record_target_->append(buffer_ + record_start_,
-                           buffer_size_ - record_start_);
-    record_start_ = 0;
-  }
-
-  const void* data = NULL;
-  buffer_ = NULL;
-  buffer_pos_ = 0;
-  do {
-    if (!input_->Next(&data, &buffer_size_)) {
-      // end of stream (or read error)
-      buffer_size_ = 0;
-      read_error_ = true;
-      current_char_ = '\0';
-      return;
-    }
-  } while (buffer_size_ == 0);
-
-  buffer_ = static_cast<const char*>(data);
-
-  current_char_ = buffer_[0];
-}
-
-inline void Tokenizer::RecordTo(std::string* target) {
-  record_target_ = target;
-  record_start_ = buffer_pos_;
-}
-
-inline void Tokenizer::StopRecording() {
-  // Note:  The if() is necessary because some STL implementations crash when
-  //   you call string::append(NULL, 0), presumably because they are trying to
-  //   be helpful by detecting the NULL pointer, even though there's nothing
-  //   wrong with reading zero bytes from NULL.
-  if (buffer_pos_ != record_start_) {
-    record_target_->append(buffer_ + record_start_,
-                           buffer_pos_ - record_start_);
-  }
-  record_target_ = NULL;
-  record_start_ = -1;
-}
-
-inline void Tokenizer::StartToken() {
-  current_.type = TYPE_START;  // Just for the sake of initializing it.
-  current_.text.clear();
-  current_.line = line_;
-  current_.column = column_;
-  RecordTo(&current_.text);
-}
-
-inline void Tokenizer::EndToken() {
-  StopRecording();
-  current_.end_column = column_;
-}
-
-// -------------------------------------------------------------------
-// Helper methods that consume characters.
-
-template <typename CharacterClass>
-inline bool Tokenizer::LookingAt() {
-  return CharacterClass::InClass(current_char_);
-}
-
-template <typename CharacterClass>
-inline bool Tokenizer::TryConsumeOne() {
-  if (CharacterClass::InClass(current_char_)) {
-    NextChar();
-    return true;
-  } else {
-    return false;
-  }
-}
-
-inline bool Tokenizer::TryConsume(char c) {
-  if (current_char_ == c) {
-    NextChar();
-    return true;
-  } else {
-    return false;
-  }
-}
-
-template <typename CharacterClass>
-inline void Tokenizer::ConsumeZeroOrMore() {
-  while (CharacterClass::InClass(current_char_)) {
-    NextChar();
-  }
-}
-
-template <typename CharacterClass>
-inline void Tokenizer::ConsumeOneOrMore(const char* error) {
-  if (!CharacterClass::InClass(current_char_)) {
-    AddError(error);
-  } else {
-    do {
-      NextChar();
-    } while (CharacterClass::InClass(current_char_));
-  }
-}
-
-// -------------------------------------------------------------------
-// Methods that read whole patterns matching certain kinds of tokens
-// or comments.
-
-void Tokenizer::ConsumeString(char delimiter) {
-  while (true) {
-    switch (current_char_) {
-      case '\0':
-        AddError("Unexpected end of string.");
-        return;
-
-      case '\n': {
-        if (!allow_multiline_strings_) {
-          AddError("String literals cannot cross line boundaries.");
-          return;
-        }
-        NextChar();
-        break;
-      }
-
-      case '\\': {
-        // An escape sequence.
-        NextChar();
-        if (TryConsumeOne<Escape>()) {
-          // Valid escape sequence.
-        } else if (TryConsumeOne<OctalDigit>()) {
-          // Possibly followed by two more octal digits, but these will
-          // just be consumed by the main loop anyway so we don't need
-          // to do so explicitly here.
-        } else if (TryConsume('x')) {
-          if (!TryConsumeOne<HexDigit>()) {
-            AddError("Expected hex digits for escape sequence.");
-          }
-          // Possibly followed by another hex digit, but again we don't care.
-        } else if (TryConsume('u')) {
-          if (!TryConsumeOne<HexDigit>() || !TryConsumeOne<HexDigit>() ||
-              !TryConsumeOne<HexDigit>() || !TryConsumeOne<HexDigit>()) {
-            AddError("Expected four hex digits for \\u escape sequence.");
-          }
-        } else if (TryConsume('U')) {
-          // We expect 8 hex digits; but only the range up to 0x10ffff is
-          // legal.
-          if (!TryConsume('0') || !TryConsume('0') ||
-              !(TryConsume('0') || TryConsume('1')) ||
-              !TryConsumeOne<HexDigit>() || !TryConsumeOne<HexDigit>() ||
-              !TryConsumeOne<HexDigit>() || !TryConsumeOne<HexDigit>() ||
-              !TryConsumeOne<HexDigit>()) {
-            AddError(
-                "Expected eight hex digits up to 10ffff for \\U escape "
-                "sequence");
-          }
-        } else {
-          AddError("Invalid escape sequence in string literal.");
-        }
-        break;
-      }
-
-      default: {
-        if (current_char_ == delimiter) {
-          NextChar();
-          return;
-        }
-        NextChar();
-        break;
-      }
-    }
-  }
-}
-
-Tokenizer::TokenType Tokenizer::ConsumeNumber(bool started_with_zero,
-                                              bool started_with_dot) {
-  bool is_float = false;
-
-  if (started_with_zero && (TryConsume('x') || TryConsume('X'))) {
-    // A hex number (started with "0x").
-    ConsumeOneOrMore<HexDigit>("\"0x\" must be followed by hex digits.");
-
-  } else if (started_with_zero && LookingAt<Digit>()) {
-    // An octal number (had a leading zero).
-    ConsumeZeroOrMore<OctalDigit>();
-    if (LookingAt<Digit>()) {
-      AddError("Numbers starting with leading zero must be in octal.");
-      ConsumeZeroOrMore<Digit>();
-    }
-
-  } else {
-    // A decimal number.
-    if (started_with_dot) {
-      is_float = true;
-      ConsumeZeroOrMore<Digit>();
-    } else {
-      ConsumeZeroOrMore<Digit>();
-
-      if (TryConsume('.')) {
-        is_float = true;
-        ConsumeZeroOrMore<Digit>();
-      }
-    }
-
-    if (TryConsume('e') || TryConsume('E')) {
-      is_float = true;
-      TryConsume('-') || TryConsume('+');
-      ConsumeOneOrMore<Digit>("\"e\" must be followed by exponent.");
-    }
-
-    if (allow_f_after_float_ && (TryConsume('f') || TryConsume('F'))) {
-      is_float = true;
-    }
-  }
-
-  if (LookingAt<Letter>() && require_space_after_number_) {
-    AddError("Need space between number and identifier.");
-  } else if (current_char_ == '.') {
-    if (is_float) {
-      AddError(
-          "Already saw decimal point or exponent; can't have another one.");
-    } else {
-      AddError("Hex and octal numbers must be integers.");
-    }
-  }
-
-  return is_float ? TYPE_FLOAT : TYPE_INTEGER;
-}
-
-void Tokenizer::ConsumeLineComment(std::string* content) {
-  if (content != NULL) RecordTo(content);
-
-  while (current_char_ != '\0' && current_char_ != '\n') {
-    NextChar();
-  }
-  TryConsume('\n');
-
-  if (content != NULL) StopRecording();
-}
-
-void Tokenizer::ConsumeBlockComment(std::string* content) {
-  int start_line = line_;
-  int start_column = column_ - 2;
-
-  if (content != NULL) RecordTo(content);
-
-  while (true) {
-    while (current_char_ != '\0' && current_char_ != '*' &&
-           current_char_ != '/' && current_char_ != '\n') {
-      NextChar();
-    }
-
-    if (TryConsume('\n')) {
-      if (content != NULL) StopRecording();
-
-      // Consume leading whitespace and asterisk;
-      ConsumeZeroOrMore<WhitespaceNoNewline>();
-      if (TryConsume('*')) {
-        if (TryConsume('/')) {
-          // End of comment.
-          break;
-        }
-      }
-
-      if (content != NULL) RecordTo(content);
-    } else if (TryConsume('*') && TryConsume('/')) {
-      // End of comment.
-      if (content != NULL) {
-        StopRecording();
-        // Strip trailing "*/".
-        content->erase(content->size() - 2);
-      }
-      break;
-    } else if (TryConsume('/') && current_char_ == '*') {
-      // Note:  We didn't consume the '*' because if there is a '/' after it
-      //   we want to interpret that as the end of the comment.
-      AddError(
-          "\"/*\" inside block comment.  Block comments cannot be nested.");
-    } else if (current_char_ == '\0') {
-      AddError("End-of-file inside block comment.");
-      error_collector_->AddError(start_line, start_column,
-                                 "  Comment started here.");
-      if (content != NULL) StopRecording();
-      break;
-    }
-  }
-}
-
-Tokenizer::NextCommentStatus Tokenizer::TryConsumeCommentStart() {
-  if (comment_style_ == CPP_COMMENT_STYLE && TryConsume('/')) {
-    if (TryConsume('/')) {
-      return LINE_COMMENT;
-    } else if (TryConsume('*')) {
-      return BLOCK_COMMENT;
-    } else {
-      // Oops, it was just a slash.  Return it.
-      current_.type = TYPE_SYMBOL;
-      current_.text = "/";
-      current_.line = line_;
-      current_.column = column_ - 1;
-      current_.end_column = column_;
-      return SLASH_NOT_COMMENT;
-    }
-  } else if (comment_style_ == SH_COMMENT_STYLE && TryConsume('#')) {
-    return LINE_COMMENT;
-  } else {
-    return NO_COMMENT;
-  }
-}
-
-bool Tokenizer::TryConsumeWhitespace() {
-  if (report_newlines_) {
-    if (TryConsumeOne<WhitespaceNoNewline>()) {
-      ConsumeZeroOrMore<WhitespaceNoNewline>();
-      current_.type = TYPE_WHITESPACE;
-      return true;
-    }
-    return false;
-  }
-  if (TryConsumeOne<Whitespace>()) {
-    ConsumeZeroOrMore<Whitespace>();
-    current_.type = TYPE_WHITESPACE;
-    return report_whitespace_;
-  }
-  return false;
-}
-
-bool Tokenizer::TryConsumeNewline() {
-  if (!report_whitespace_ || !report_newlines_) {
-    return false;
-  }
-  if (TryConsume('\n')) {
-    current_.type = TYPE_NEWLINE;
-    return true;
-  }
-  return false;
-}
-
-// -------------------------------------------------------------------
-
-bool Tokenizer::Next() {
-  previous_ = current_;
-
-  while (!read_error_) {
-    StartToken();
-    bool report_token = TryConsumeWhitespace() || TryConsumeNewline();
-    EndToken();
-    if (report_token) {
-      return true;
-    }
-
-    switch (TryConsumeCommentStart()) {
-      case LINE_COMMENT:
-        ConsumeLineComment(NULL);
-        continue;
-      case BLOCK_COMMENT:
-        ConsumeBlockComment(NULL);
-        continue;
-      case SLASH_NOT_COMMENT:
-        return true;
-      case NO_COMMENT:
-        break;
-    }
-
-    // Check for EOF before continuing.
-    if (read_error_) break;
-
-    if (LookingAt<Unprintable>() || current_char_ == '\0') {
-      AddError("Invalid control characters encountered in text.");
-      NextChar();
-      // Skip more unprintable characters, too.  But, remember that '\0' is
-      // also what current_char_ is set to after EOF / read error.  We have
-      // to be careful not to go into an infinite loop of trying to consume
-      // it, so make sure to check read_error_ explicitly before consuming
-      // '\0'.
-      while (TryConsumeOne<Unprintable>() ||
-             (!read_error_ && TryConsume('\0'))) {
-        // Ignore.
-      }
-
-    } else {
-      // Reading some sort of token.
-      StartToken();
-
-      if (TryConsumeOne<Letter>()) {
-        ConsumeZeroOrMore<Alphanumeric>();
-        current_.type = TYPE_IDENTIFIER;
-      } else if (TryConsume('0')) {
-        current_.type = ConsumeNumber(true, false);
-      } else if (TryConsume('.')) {
-        // This could be the beginning of a floating-point number, or it could
-        // just be a '.' symbol.
-
-        if (TryConsumeOne<Digit>()) {
-          // It's a floating-point number.
-          if (previous_.type == TYPE_IDENTIFIER &&
-              current_.line == previous_.line &&
-              current_.column == previous_.end_column) {
-            // We don't accept syntax like "blah.123".
-            error_collector_->AddError(
-                line_, column_ - 2,
-                "Need space between identifier and decimal point.");
-          }
-          current_.type = ConsumeNumber(false, true);
-        } else {
-          current_.type = TYPE_SYMBOL;
-        }
-      } else if (TryConsumeOne<Digit>()) {
-        current_.type = ConsumeNumber(false, false);
-      } else if (TryConsume('\"')) {
-        ConsumeString('\"');
-        current_.type = TYPE_STRING;
-      } else if (TryConsume('\'')) {
-        ConsumeString('\'');
-        current_.type = TYPE_STRING;
-      } else {
-        // Check if the high order bit is set.
-        if (current_char_ & 0x80) {
-          error_collector_->AddError(
-              line_, column_,
-              StringPrintf("Interpreting non ascii codepoint %d.",
-                              static_cast<unsigned char>(current_char_)));
-        }
-        NextChar();
-        current_.type = TYPE_SYMBOL;
-      }
-
-      EndToken();
-      return true;
-    }
-  }
-
-  // EOF
-  current_.type = TYPE_END;
-  current_.text.clear();
-  current_.line = line_;
-  current_.column = column_;
-  current_.end_column = column_;
-  return false;
-}
-
-namespace {
-
-// Helper class for collecting comments and putting them in the right places.
-//
-// This basically just buffers the most recent comment until it can be decided
-// exactly where that comment should be placed.  When Flush() is called, the
-// current comment goes into either prev_trailing_comments or detached_comments.
-// When the CommentCollector is destroyed, the last buffered comment goes into
-// next_leading_comments.
-class CommentCollector {
- public:
-  CommentCollector(std::string* prev_trailing_comments,
-                   std::vector<std::string>* detached_comments,
-                   std::string* next_leading_comments)
-      : prev_trailing_comments_(prev_trailing_comments),
-        detached_comments_(detached_comments),
-        next_leading_comments_(next_leading_comments),
-        has_comment_(false),
-        is_line_comment_(false),
-        can_attach_to_prev_(true) {
-    if (prev_trailing_comments != NULL) prev_trailing_comments->clear();
-    if (detached_comments != NULL) detached_comments->clear();
-    if (next_leading_comments != NULL) next_leading_comments->clear();
-  }
-
-  ~CommentCollector() {
-    // Whatever is in the buffer is a leading comment.
-    if (next_leading_comments_ != NULL && has_comment_) {
-      comment_buffer_.swap(*next_leading_comments_);
-    }
-  }
-
-  // About to read a line comment.  Get the comment buffer pointer in order to
-  // read into it.
-  std::string* GetBufferForLineComment() {
-    // We want to combine with previous line comments, but not block comments.
-    if (has_comment_ && !is_line_comment_) {
-      Flush();
-    }
-    has_comment_ = true;
-    is_line_comment_ = true;
-    return &comment_buffer_;
-  }
-
-  // About to read a block comment.  Get the comment buffer pointer in order to
-  // read into it.
-  std::string* GetBufferForBlockComment() {
-    if (has_comment_) {
-      Flush();
-    }
-    has_comment_ = true;
-    is_line_comment_ = false;
-    return &comment_buffer_;
-  }
-
-  void ClearBuffer() {
-    comment_buffer_.clear();
-    has_comment_ = false;
-  }
-
-  // Called once we know that the comment buffer is complete and is *not*
-  // connected to the next token.
-  void Flush() {
-    if (has_comment_) {
-      if (can_attach_to_prev_) {
-        if (prev_trailing_comments_ != NULL) {
-          prev_trailing_comments_->append(comment_buffer_);
-        }
-        can_attach_to_prev_ = false;
-      } else {
-        if (detached_comments_ != NULL) {
-          detached_comments_->push_back(comment_buffer_);
-        }
-      }
-      ClearBuffer();
-    }
-  }
-
-  void DetachFromPrev() { can_attach_to_prev_ = false; }
-
- private:
-  std::string* prev_trailing_comments_;
-  std::vector<std::string>* detached_comments_;
-  std::string* next_leading_comments_;
-
-  std::string comment_buffer_;
-
-  // True if any comments were read into comment_buffer_.  This can be true even
-  // if comment_buffer_ is empty, namely if the comment was "/**/".
-  bool has_comment_;
-
-  // Is the comment in the comment buffer a line comment?
-  bool is_line_comment_;
-
-  // Is it still possible that we could be reading a comment attached to the
-  // previous token?
-  bool can_attach_to_prev_;
-};
-
-}  // namespace
-
-bool Tokenizer::NextWithComments(std::string* prev_trailing_comments,
-                                 std::vector<std::string>* detached_comments,
-                                 std::string* next_leading_comments) {
-  CommentCollector collector(prev_trailing_comments, detached_comments,
-                             next_leading_comments);
-
-  if (current_.type == TYPE_START) {
-    // Ignore unicode byte order mark(BOM) if it appears at the file
-    // beginning. Only UTF-8 BOM (0xEF 0xBB 0xBF) is accepted.
-    if (TryConsume(static_cast<char>(0xEF))) {
-      if (!TryConsume(static_cast<char>(0xBB)) ||
-          !TryConsume(static_cast<char>(0xBF))) {
-        AddError(
-            "Proto file starts with 0xEF but not UTF-8 BOM. "
-            "Only UTF-8 is accepted for proto file.");
-        return false;
-      }
-    }
-    collector.DetachFromPrev();
-  } else {
-    // A comment appearing on the same line must be attached to the previous
-    // declaration.
-    ConsumeZeroOrMore<WhitespaceNoNewline>();
-    switch (TryConsumeCommentStart()) {
-      case LINE_COMMENT:
-        ConsumeLineComment(collector.GetBufferForLineComment());
-
-        // Don't allow comments on subsequent lines to be attached to a trailing
-        // comment.
-        collector.Flush();
-        break;
-      case BLOCK_COMMENT:
-        ConsumeBlockComment(collector.GetBufferForBlockComment());
-
-        ConsumeZeroOrMore<WhitespaceNoNewline>();
-        if (!TryConsume('\n')) {
-          // Oops, the next token is on the same line.  If we recorded a comment
-          // we really have no idea which token it should be attached to.
-          collector.ClearBuffer();
-          return Next();
-        }
-
-        // Don't allow comments on subsequent lines to be attached to a trailing
-        // comment.
-        collector.Flush();
-        break;
-      case SLASH_NOT_COMMENT:
-        return true;
-      case NO_COMMENT:
-        if (!TryConsume('\n')) {
-          // The next token is on the same line.  There are no comments.
-          return Next();
-        }
-        break;
-    }
-  }
-
-  // OK, we are now on the line *after* the previous token.
-  while (true) {
-    ConsumeZeroOrMore<WhitespaceNoNewline>();
-
-    switch (TryConsumeCommentStart()) {
-      case LINE_COMMENT:
-        ConsumeLineComment(collector.GetBufferForLineComment());
-        break;
-      case BLOCK_COMMENT:
-        ConsumeBlockComment(collector.GetBufferForBlockComment());
-
-        // Consume the rest of the line so that we don't interpret it as a
-        // blank line the next time around the loop.
-        ConsumeZeroOrMore<WhitespaceNoNewline>();
-        TryConsume('\n');
-        break;
-      case SLASH_NOT_COMMENT:
-        return true;
-      case NO_COMMENT:
-        if (TryConsume('\n')) {
-          // Completely blank line.
-          collector.Flush();
-          collector.DetachFromPrev();
-        } else {
-          bool result = Next();
-          if (!result || current_.text == "}" || current_.text == "]" ||
-              current_.text == ")") {
-            // It looks like we're at the end of a scope.  In this case it
-            // makes no sense to attach a comment to the following token.
-            collector.Flush();
-          }
-          return result;
-        }
-        break;
-    }
-  }
-}
-
-// -------------------------------------------------------------------
-// Token-parsing helpers.  Remember that these don't need to report
-// errors since any errors should already have been reported while
-// tokenizing.  Also, these can assume that whatever text they
-// are given is text that the tokenizer actually parsed as a token
-// of the given type.
-
-bool Tokenizer::ParseInteger(const std::string& text, uint64_t max_value,
-                             uint64_t* output) {
-  // We can't just use strtoull() because (a) it accepts negative numbers,
-  // (b) We want additional range checks, (c) it reports overflows via errno.
-
-#if 0
-  const char *str_begin = text.c_str();
-  if (*str_begin == '-') return false;
-  char *str_end = nullptr;
-  errno = 0;
-  *output = std::strtoull(str_begin, &str_end, 0);
-  return (errno == 0 && str_end && *str_end == '\0' && *output <= max_value);
-#endif
-
-  const char* ptr = text.c_str();
-  int base = 10;
-  uint64_t overflow_if_mul_base = (kuint64max / 10) + 1;
-  if (ptr[0] == '0') {
-    if (ptr[1] == 'x' || ptr[1] == 'X') {
-      // This is hex.
-      base = 16;
-      overflow_if_mul_base = (kuint64max / 16) + 1;
-      ptr += 2;
-    } else {
-      // This is octal.
-      base = 8;
-      overflow_if_mul_base = (kuint64max / 8) + 1;
-    }
-  }
-
-  uint64_t result = 0;
-  // For all the leading '0's, and also the first non-zero character, we
-  // don't need to multiply.
-  while (*ptr != '\0') {
-    int digit = DigitValue(*ptr++);
-    if (digit >= base) {
-      // The token provided by Tokenizer is invalid. i.e., 099 is an invalid
-      // token, but Tokenizer still think it's integer.
-      return false;
-    }
-    if (digit != 0) {
-      result = digit;
-      break;
-    }
-  }
-  for (; *ptr != '\0'; ptr++) {
-    int digit = DigitValue(*ptr);
-    if (digit < 0 || digit >= base) {
-      // The token provided by Tokenizer is invalid. i.e., 099 is an invalid
-      // token, but Tokenizer still think it's integer.
-      return false;
-    }
-    if (result >= overflow_if_mul_base) {
-      // We know the multiply we're about to do will overflow, so exit now.
-      return false;
-    }
-    // We know that result * base won't overflow, but adding digit might...
-    result = result * base + digit;
-    // C++ guarantees defined "wrap" semantics when unsigned integer
-    // operations overflow, making this a fast way to check if adding
-    // digit made result overflow, and thus, wrap around.
-    if (result < static_cast<uint64_t>(base)) return false;
-  }
-  if (result > max_value) return false;
-
-  *output = result;
-  return true;
-}
-
-double Tokenizer::ParseFloat(const std::string& text) {
-  const char* start = text.c_str();
-  char* end;
-  double result = NoLocaleStrtod(start, &end);
-
-  // "1e" is not a valid float, but if the tokenizer reads it, it will
-  // report an error but still return it as a valid token.  We need to
-  // accept anything the tokenizer could possibly return, error or not.
-  if (*end == 'e' || *end == 'E') {
-    ++end;
-    if (*end == '-' || *end == '+') ++end;
-  }
-
-  // If the Tokenizer had allow_f_after_float_ enabled, the float may be
-  // suffixed with the letter 'f'.
-  if (*end == 'f' || *end == 'F') {
-    ++end;
-  }
-
-  GOOGLE_LOG_IF(DFATAL,
-         static_cast<size_t>(end - start) != text.size() || *start == '-')
-      << " Tokenizer::ParseFloat() passed text that could not have been"
-         " tokenized as a float: "
-      << CEscape(text);
-  return result;
-}
-
-// Helper to append a Unicode code point to a string as UTF8, without bringing
-// in any external dependencies.
-static void AppendUTF8(uint32_t code_point, std::string* output) {
-  uint32_t tmp = 0;
-  int len = 0;
-  if (code_point <= 0x7f) {
-    tmp = code_point;
-    len = 1;
-  } else if (code_point <= 0x07ff) {
-    tmp = 0x0000c080 | ((code_point & 0x07c0) << 2) | (code_point & 0x003f);
-    len = 2;
-  } else if (code_point <= 0xffff) {
-    tmp = 0x00e08080 | ((code_point & 0xf000) << 4) |
-          ((code_point & 0x0fc0) << 2) | (code_point & 0x003f);
-    len = 3;
-  } else if (code_point <= 0x10ffff) {
-    tmp = 0xf0808080 | ((code_point & 0x1c0000) << 6) |
-          ((code_point & 0x03f000) << 4) | ((code_point & 0x000fc0) << 2) |
-          (code_point & 0x003f);
-    len = 4;
-  } else {
-    // Unicode code points end at 0x10FFFF, so this is out-of-range.
-    // ConsumeString permits hex values up to 0x1FFFFF, and FetchUnicodePoint
-    // doesn't perform a range check.
-    StringAppendF(output, "\\U%08x", code_point);
-    return;
-  }
-  tmp = ghtonl(tmp);
-  output->append(reinterpret_cast<const char*>(&tmp) + sizeof(tmp) - len, len);
-}
-
-// Try to read <len> hex digits from ptr, and stuff the numeric result into
-// *result. Returns true if that many digits were successfully consumed.
-static bool ReadHexDigits(const char* ptr, int len, uint32_t* result) {
-  *result = 0;
-  if (len == 0) return false;
-  for (const char* end = ptr + len; ptr < end; ++ptr) {
-    if (*ptr == '\0') return false;
-    *result = (*result << 4) + DigitValue(*ptr);
-  }
-  return true;
-}
-
-// Handling UTF-16 surrogate pairs. UTF-16 encodes code points in the range
-// 0x10000...0x10ffff as a pair of numbers, a head surrogate followed by a trail
-// surrogate. These numbers are in a reserved range of Unicode code points, so
-// if we encounter such a pair we know how to parse it and convert it into a
-// single code point.
-static const uint32_t kMinHeadSurrogate = 0xd800;
-static const uint32_t kMaxHeadSurrogate = 0xdc00;
-static const uint32_t kMinTrailSurrogate = 0xdc00;
-static const uint32_t kMaxTrailSurrogate = 0xe000;
-
-static inline bool IsHeadSurrogate(uint32_t code_point) {
-  return (code_point >= kMinHeadSurrogate) && (code_point < kMaxHeadSurrogate);
-}
-
-static inline bool IsTrailSurrogate(uint32_t code_point) {
-  return (code_point >= kMinTrailSurrogate) &&
-         (code_point < kMaxTrailSurrogate);
-}
-
-// Combine a head and trail surrogate into a single Unicode code point.
-static uint32_t AssembleUTF16(uint32_t head_surrogate,
-                              uint32_t trail_surrogate) {
-  GOOGLE_DCHECK(IsHeadSurrogate(head_surrogate));
-  GOOGLE_DCHECK(IsTrailSurrogate(trail_surrogate));
-  return 0x10000 + (((head_surrogate - kMinHeadSurrogate) << 10) |
-                    (trail_surrogate - kMinTrailSurrogate));
-}
-
-// Convert the escape sequence parameter to a number of expected hex digits.
-static inline int UnicodeLength(char key) {
-  if (key == 'u') return 4;
-  if (key == 'U') return 8;
-  return 0;
-}
-
-// Given a pointer to the 'u' or 'U' starting a Unicode escape sequence, attempt
-// to parse that sequence. On success, returns a pointer to the first char
-// beyond that sequence, and fills in *code_point. On failure, returns ptr
-// itself.
-static const char* FetchUnicodePoint(const char* ptr, uint32_t* code_point) {
-  const char* p = ptr;
-  // Fetch the code point.
-  const int len = UnicodeLength(*p++);
-  if (!ReadHexDigits(p, len, code_point)) return ptr;
-  p += len;
-
-  // Check if the code point we read is a "head surrogate." If so, then we
-  // expect it to be immediately followed by another code point which is a valid
-  // "trail surrogate," and together they form a UTF-16 pair which decodes into
-  // a single Unicode point. Trail surrogates may only use \u, not \U.
-  if (IsHeadSurrogate(*code_point) && *p == '\\' && *(p + 1) == 'u') {
-    uint32_t trail_surrogate;
-    if (ReadHexDigits(p + 2, 4, &trail_surrogate) &&
-        IsTrailSurrogate(trail_surrogate)) {
-      *code_point = AssembleUTF16(*code_point, trail_surrogate);
-      p += 6;
-    }
-    // If this failed, then we just emit the head surrogate as a code point.
-    // It's bogus, but so is the string.
-  }
-
-  return p;
-}
-
-// The text string must begin and end with single or double quote
-// characters.
-void Tokenizer::ParseStringAppend(const std::string& text,
-                                  std::string* output) {
-  // Reminder: text[0] is always a quote character.  (If text is
-  // empty, it's invalid, so we'll just return).
-  const size_t text_size = text.size();
-  if (text_size == 0) {
-    GOOGLE_LOG(DFATAL) << " Tokenizer::ParseStringAppend() passed text that could not"
-                   " have been tokenized as a string: "
-                << CEscape(text);
-    return;
-  }
-
-  // Reserve room for new string. The branch is necessary because if
-  // there is already space available the reserve() call might
-  // downsize the output.
-  const size_t new_len = text_size + output->size();
-  if (new_len > output->capacity()) {
-    output->reserve(new_len);
-  }
-
-  // Loop through the string copying characters to "output" and
-  // interpreting escape sequences.  Note that any invalid escape
-  // sequences or other errors were already reported while tokenizing.
-  // In this case we do not need to produce valid results.
-  for (const char* ptr = text.c_str() + 1; *ptr != '\0'; ptr++) {
-    if (*ptr == '\\' && ptr[1] != '\0') {
-      // An escape sequence.
-      ++ptr;
-
-      if (OctalDigit::InClass(*ptr)) {
-        // An octal escape.  May one, two, or three digits.
-        int code = DigitValue(*ptr);
-        if (OctalDigit::InClass(ptr[1])) {
-          ++ptr;
-          code = code * 8 + DigitValue(*ptr);
-        }
-        if (OctalDigit::InClass(ptr[1])) {
-          ++ptr;
-          code = code * 8 + DigitValue(*ptr);
-        }
-        output->push_back(static_cast<char>(code));
-
-      } else if (*ptr == 'x') {
-        // A hex escape.  May zero, one, or two digits.  (The zero case
-        // will have been caught as an error earlier.)
-        int code = 0;
-        if (HexDigit::InClass(ptr[1])) {
-          ++ptr;
-          code = DigitValue(*ptr);
-        }
-        if (HexDigit::InClass(ptr[1])) {
-          ++ptr;
-          code = code * 16 + DigitValue(*ptr);
-        }
-        output->push_back(static_cast<char>(code));
-
-      } else if (*ptr == 'u' || *ptr == 'U') {
-        uint32_t unicode;
-        const char* end = FetchUnicodePoint(ptr, &unicode);
-        if (end == ptr) {
-          // Failure: Just dump out what we saw, don't try to parse it.
-          output->push_back(*ptr);
-        } else {
-          AppendUTF8(unicode, output);
-          ptr = end - 1;  // Because we're about to ++ptr.
-        }
-      } else {
-        // Some other escape code.
-        output->push_back(TranslateEscape(*ptr));
-      }
-
-    } else if (*ptr == text[0] && ptr[1] == '\0') {
-      // Ignore final quote matching the starting quote.
-    } else {
-      output->push_back(*ptr);
-    }
-  }
-}
-
-template <typename CharacterClass>
-static bool AllInClass(const std::string& s) {
-  for (const char character : s) {
-    if (!CharacterClass::InClass(character)) return false;
-  }
-  return true;
-}
-
-bool Tokenizer::IsIdentifier(const std::string& text) {
-  // Mirrors IDENTIFIER definition in Tokenizer::Next() above.
-  if (text.size() == 0) return false;
-  if (!Letter::InClass(text.at(0))) return false;
-  if (!AllInClass<Alphanumeric>(text.substr(1))) return false;
-  return true;
-}
-
-}  // namespace io
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
diff --git a/libs/protobuf/src/google/protobuf/io/tokenizer.h b/libs/protobuf/src/google/protobuf/io/tokenizer.h
deleted file mode 100644
index 4abab7e..0000000
--- a/libs/protobuf/src/google/protobuf/io/tokenizer.h
+++ /dev/null
@@ -1,442 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-//
-// Class for parsing tokenized text from a ZeroCopyInputStream.
-
-#ifndef GOOGLE_PROTOBUF_IO_TOKENIZER_H__
-#define GOOGLE_PROTOBUF_IO_TOKENIZER_H__
-
-
-#include <string>
-#include <vector>
-
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/stubs/logging.h>
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-namespace io {
-
-class ZeroCopyInputStream;  // zero_copy_stream.h
-
-// Defined in this file.
-class ErrorCollector;
-class Tokenizer;
-
-// By "column number", the proto compiler refers to a count of the number
-// of bytes before a given byte, except that a tab character advances to
-// the next multiple of 8 bytes.  Note in particular that column numbers
-// are zero-based, while many user interfaces use one-based column numbers.
-typedef int ColumnNumber;
-
-// Abstract interface for an object which collects the errors that occur
-// during parsing.  A typical implementation might simply print the errors
-// to stdout.
-class PROTOBUF_EXPORT ErrorCollector {
- public:
-  inline ErrorCollector() {}
-  virtual ~ErrorCollector();
-
-  // Indicates that there was an error in the input at the given line and
-  // column numbers.  The numbers are zero-based, so you may want to add
-  // 1 to each before printing them.
-  virtual void AddError(int line, ColumnNumber column,
-                        const std::string& message) = 0;
-
-  // Indicates that there was a warning in the input at the given line and
-  // column numbers.  The numbers are zero-based, so you may want to add
-  // 1 to each before printing them.
-  virtual void AddWarning(int /* line */, ColumnNumber /* column */,
-                          const std::string& /* message */) {}
-
- private:
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(ErrorCollector);
-};
-
-// This class converts a stream of raw text into a stream of tokens for
-// the protocol definition parser to parse.  The tokens recognized are
-// similar to those that make up the C language; see the TokenType enum for
-// precise descriptions.  Whitespace and comments are skipped.  By default,
-// C- and C++-style comments are recognized, but other styles can be used by
-// calling set_comment_style().
-class PROTOBUF_EXPORT Tokenizer {
- public:
-  // Construct a Tokenizer that reads and tokenizes text from the given
-  // input stream and writes errors to the given error_collector.
-  // The caller keeps ownership of input and error_collector.
-  Tokenizer(ZeroCopyInputStream* input, ErrorCollector* error_collector);
-  ~Tokenizer();
-
-  enum TokenType {
-    TYPE_START,  // Next() has not yet been called.
-    TYPE_END,    // End of input reached.  "text" is empty.
-
-    TYPE_IDENTIFIER,  // A sequence of letters, digits, and underscores, not
-                      // starting with a digit.  It is an error for a number
-                      // to be followed by an identifier with no space in
-                      // between.
-    TYPE_INTEGER,     // A sequence of digits representing an integer.  Normally
-                      // the digits are decimal, but a prefix of "0x" indicates
-                      // a hex number and a leading zero indicates octal, just
-                      // like with C numeric literals.  A leading negative sign
-                      // is NOT included in the token; it's up to the parser to
-                      // interpret the unary minus operator on its own.
-    TYPE_FLOAT,       // A floating point literal, with a fractional part and/or
-                      // an exponent.  Always in decimal.  Again, never
-                      // negative.
-    TYPE_STRING,      // A quoted sequence of escaped characters.  Either single
-                      // or double quotes can be used, but they must match.
-                      // A string literal cannot cross a line break.
-    TYPE_SYMBOL,      // Any other printable character, like '!' or '+'.
-                      // Symbols are always a single character, so "!+$%" is
-                      // four tokens.
-    TYPE_WHITESPACE,  // A sequence of whitespace.  This token type is only
-                      // produced if report_whitespace() is true.  It is not
-                      // reported for whitespace within comments or strings.
-    TYPE_NEWLINE,     // A newline (\n).  This token type is only
-                      // produced if report_whitespace() is true and
-                      // report_newlines() is true.  It is not reported for
-                      // newlines in comments or strings.
-  };
-
-  // Structure representing a token read from the token stream.
-  struct Token {
-    TokenType type;
-    std::string text;  // The exact text of the token as it appeared in
-                       // the input.  e.g. tokens of TYPE_STRING will still
-                       // be escaped and in quotes.
-
-    // "line" and "column" specify the position of the first character of
-    // the token within the input stream.  They are zero-based.
-    int line;
-    ColumnNumber column;
-    ColumnNumber end_column;
-  };
-
-  // Get the current token.  This is updated when Next() is called.  Before
-  // the first call to Next(), current() has type TYPE_START and no contents.
-  const Token& current();
-
-  // Return the previous token -- i.e. what current() returned before the
-  // previous call to Next().
-  const Token& previous();
-
-  // Advance to the next token.  Returns false if the end of the input is
-  // reached.
-  bool Next();
-
-  // Like Next(), but also collects comments which appear between the previous
-  // and next tokens.
-  //
-  // Comments which appear to be attached to the previous token are stored
-  // in *prev_tailing_comments.  Comments which appear to be attached to the
-  // next token are stored in *next_leading_comments.  Comments appearing in
-  // between which do not appear to be attached to either will be added to
-  // detached_comments.  Any of these parameters can be NULL to simply discard
-  // the comments.
-  //
-  // A series of line comments appearing on consecutive lines, with no other
-  // tokens appearing on those lines, will be treated as a single comment.
-  //
-  // Only the comment content is returned; comment markers (e.g. //) are
-  // stripped out.  For block comments, leading whitespace and an asterisk will
-  // be stripped from the beginning of each line other than the first.  Newlines
-  // are included in the output.
-  //
-  // Examples:
-  //
-  //   optional int32 foo = 1;  // Comment attached to foo.
-  //   // Comment attached to bar.
-  //   optional int32 bar = 2;
-  //
-  //   optional string baz = 3;
-  //   // Comment attached to baz.
-  //   // Another line attached to baz.
-  //
-  //   // Comment attached to qux.
-  //   //
-  //   // Another line attached to qux.
-  //   optional double qux = 4;
-  //
-  //   // Detached comment.  This is not attached to qux or corge
-  //   // because there are blank lines separating it from both.
-  //
-  //   optional string corge = 5;
-  //   /* Block comment attached
-  //    * to corge.  Leading asterisks
-  //    * will be removed. */
-  //   /* Block comment attached to
-  //    * grault. */
-  //   optional int32 grault = 6;
-  bool NextWithComments(std::string* prev_trailing_comments,
-                        std::vector<std::string>* detached_comments,
-                        std::string* next_leading_comments);
-
-  // Parse helpers ---------------------------------------------------
-
-  // Parses a TYPE_FLOAT token.  This never fails, so long as the text actually
-  // comes from a TYPE_FLOAT token parsed by Tokenizer.  If it doesn't, the
-  // result is undefined (possibly an assert failure).
-  static double ParseFloat(const std::string& text);
-
-  // Parses a TYPE_STRING token.  This never fails, so long as the text actually
-  // comes from a TYPE_STRING token parsed by Tokenizer.  If it doesn't, the
-  // result is undefined (possibly an assert failure).
-  static void ParseString(const std::string& text, std::string* output);
-
-  // Identical to ParseString, but appends to output.
-  static void ParseStringAppend(const std::string& text, std::string* output);
-
-  // Parses a TYPE_INTEGER token.  Returns false if the result would be
-  // greater than max_value.  Otherwise, returns true and sets *output to the
-  // result.  If the text is not from a Token of type TYPE_INTEGER originally
-  // parsed by a Tokenizer, the result is undefined (possibly an assert
-  // failure).
-  static bool ParseInteger(const std::string& text, uint64_t max_value,
-                           uint64_t* output);
-
-  // Options ---------------------------------------------------------
-
-  // Set true to allow floats to be suffixed with the letter 'f'.  Tokens
-  // which would otherwise be integers but which have the 'f' suffix will be
-  // forced to be interpreted as floats.  For all other purposes, the 'f' is
-  // ignored.
-  void set_allow_f_after_float(bool value) { allow_f_after_float_ = value; }
-
-  // Valid values for set_comment_style().
-  enum CommentStyle {
-    // Line comments begin with "//", block comments are delimited by "/*" and
-    // "*/".
-    CPP_COMMENT_STYLE,
-    // Line comments begin with "#".  No way to write block comments.
-    SH_COMMENT_STYLE
-  };
-
-  // Sets the comment style.
-  void set_comment_style(CommentStyle style) { comment_style_ = style; }
-
-  // Whether to require whitespace between a number and a field name.
-  // Default is true. Do not use this; for Google-internal cleanup only.
-  void set_require_space_after_number(bool require) {
-    require_space_after_number_ = require;
-  }
-
-  // Whether to allow string literals to span multiple lines. Default is false.
-  // Do not use this; for Google-internal cleanup only.
-  void set_allow_multiline_strings(bool allow) {
-    allow_multiline_strings_ = allow;
-  }
-
-  // If true, whitespace tokens are reported by Next().
-  // Note: `set_report_whitespace(false)` implies `set_report_newlines(false)`.
-  bool report_whitespace() const;
-  void set_report_whitespace(bool report);
-
-  // If true, newline tokens are reported by Next().
-  // Note: `set_report_newlines(true)` implies `set_report_whitespace(true)`.
-  bool report_newlines() const;
-  void set_report_newlines(bool report);
-
-  // External helper: validate an identifier.
-  static bool IsIdentifier(const std::string& text);
-
-  // -----------------------------------------------------------------
- private:
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(Tokenizer);
-
-  Token current_;   // Returned by current().
-  Token previous_;  // Returned by previous().
-
-  ZeroCopyInputStream* input_;
-  ErrorCollector* error_collector_;
-
-  char current_char_;   // == buffer_[buffer_pos_], updated by NextChar().
-  const char* buffer_;  // Current buffer returned from input_.
-  int buffer_size_;     // Size of buffer_.
-  int buffer_pos_;      // Current position within the buffer.
-  bool read_error_;     // Did we previously encounter a read error?
-
-  // Line and column number of current_char_ within the whole input stream.
-  int line_;
-  ColumnNumber column_;
-
-  // String to which text should be appended as we advance through it.
-  // Call RecordTo(&str) to start recording and StopRecording() to stop.
-  // E.g. StartToken() calls RecordTo(&current_.text).  record_start_ is the
-  // position within the current buffer where recording started.
-  std::string* record_target_;
-  int record_start_;
-
-  // Options.
-  bool allow_f_after_float_;
-  CommentStyle comment_style_;
-  bool require_space_after_number_;
-  bool allow_multiline_strings_;
-  bool report_whitespace_ = false;
-  bool report_newlines_ = false;
-
-  // Since we count columns we need to interpret tabs somehow.  We'll take
-  // the standard 8-character definition for lack of any way to do better.
-  // This must match the documentation of ColumnNumber.
-  static const int kTabWidth = 8;
-
-  // -----------------------------------------------------------------
-  // Helper methods.
-
-  // Consume this character and advance to the next one.
-  void NextChar();
-
-  // Read a new buffer from the input.
-  void Refresh();
-
-  inline void RecordTo(std::string* target);
-  inline void StopRecording();
-
-  // Called when the current character is the first character of a new
-  // token (not including whitespace or comments).
-  inline void StartToken();
-  // Called when the current character is the first character after the
-  // end of the last token.  After this returns, current_.text will
-  // contain all text consumed since StartToken() was called.
-  inline void EndToken();
-
-  // Convenience method to add an error at the current line and column.
-  void AddError(const std::string& message) {
-    error_collector_->AddError(line_, column_, message);
-  }
-
-  // -----------------------------------------------------------------
-  // The following four methods are used to consume tokens of specific
-  // types.  They are actually used to consume all characters *after*
-  // the first, since the calling function consumes the first character
-  // in order to decide what kind of token is being read.
-
-  // Read and consume a string, ending when the given delimiter is
-  // consumed.
-  void ConsumeString(char delimiter);
-
-  // Read and consume a number, returning TYPE_FLOAT or TYPE_INTEGER
-  // depending on what was read.  This needs to know if the first
-  // character was a zero in order to correctly recognize hex and octal
-  // numbers.
-  // It also needs to know if the first character was a . to parse floating
-  // point correctly.
-  TokenType ConsumeNumber(bool started_with_zero, bool started_with_dot);
-
-  // Consume the rest of a line.
-  void ConsumeLineComment(std::string* content);
-  // Consume until "*/".
-  void ConsumeBlockComment(std::string* content);
-
-  enum NextCommentStatus {
-    // Started a line comment.
-    LINE_COMMENT,
-
-    // Started a block comment.
-    BLOCK_COMMENT,
-
-    // Consumed a slash, then realized it wasn't a comment.  current_ has
-    // been filled in with a slash token.  The caller should return it.
-    SLASH_NOT_COMMENT,
-
-    // We do not appear to be starting a comment here.
-    NO_COMMENT
-  };
-
-  // If we're at the start of a new comment, consume it and return what kind
-  // of comment it is.
-  NextCommentStatus TryConsumeCommentStart();
-
-  // If we're looking at a TYPE_WHITESPACE token and `report_whitespace_` is
-  // true, consume it and return true.
-  bool TryConsumeWhitespace();
-
-  // If we're looking at a TYPE_NEWLINE token and `report_newlines_` is true,
-  // consume it and return true.
-  bool TryConsumeNewline();
-
-  // -----------------------------------------------------------------
-  // These helper methods make the parsing code more readable.  The
-  // "character classes" referred to are defined at the top of the .cc file.
-  // Basically it is a C++ class with one method:
-  //   static bool InClass(char c);
-  // The method returns true if c is a member of this "class", like "Letter"
-  // or "Digit".
-
-  // Returns true if the current character is of the given character
-  // class, but does not consume anything.
-  template <typename CharacterClass>
-  inline bool LookingAt();
-
-  // If the current character is in the given class, consume it and return
-  // true.  Otherwise return false.
-  // e.g. TryConsumeOne<Letter>()
-  template <typename CharacterClass>
-  inline bool TryConsumeOne();
-
-  // Like above, but try to consume the specific character indicated.
-  inline bool TryConsume(char c);
-
-  // Consume zero or more of the given character class.
-  template <typename CharacterClass>
-  inline void ConsumeZeroOrMore();
-
-  // Consume one or more of the given character class or log the given
-  // error message.
-  // e.g. ConsumeOneOrMore<Digit>("Expected digits.");
-  template <typename CharacterClass>
-  inline void ConsumeOneOrMore(const char* error);
-};
-
-// inline methods ====================================================
-inline const Tokenizer::Token& Tokenizer::current() { return current_; }
-
-inline const Tokenizer::Token& Tokenizer::previous() { return previous_; }
-
-inline void Tokenizer::ParseString(const std::string& text,
-                                   std::string* output) {
-  output->clear();
-  ParseStringAppend(text, output);
-}
-
-}  // namespace io
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
-
-#endif  // GOOGLE_PROTOBUF_IO_TOKENIZER_H__
diff --git a/libs/protobuf/src/google/protobuf/io/tokenizer_unittest.cc b/libs/protobuf/src/google/protobuf/io/tokenizer_unittest.cc
deleted file mode 100644
index 16ba940..0000000
--- a/libs/protobuf/src/google/protobuf/io/tokenizer_unittest.cc
+++ /dev/null
@@ -1,1175 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-
-#include <google/protobuf/io/tokenizer.h>
-
-#include <limits.h>
-#include <math.h>
-
-#include <vector>
-
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/stubs/logging.h>
-#include <google/protobuf/stubs/strutil.h>
-#include <google/protobuf/stubs/substitute.h>
-#include <google/protobuf/io/zero_copy_stream_impl.h>
-#include <google/protobuf/testing/googletest.h>
-#include <gtest/gtest.h>
-
-namespace google {
-namespace protobuf {
-namespace io {
-namespace {
-
-// ===================================================================
-// Data-Driven Test Infrastructure
-
-// TODO(kenton):  This is copied from coded_stream_unittest.  This is
-//   temporary until these features are integrated into gTest itself.
-
-// TEST_1D and TEST_2D are macros I'd eventually like to see added to
-// gTest.  These macros can be used to declare tests which should be
-// run multiple times, once for each item in some input array.  TEST_1D
-// tests all cases in a single input array.  TEST_2D tests all
-// combinations of cases from two arrays.  The arrays must be statically
-// defined such that the GOOGLE_ARRAYSIZE() macro works on them.  Example:
-//
-// int kCases[] = {1, 2, 3, 4}
-// TEST_1D(MyFixture, MyTest, kCases) {
-//   EXPECT_GT(kCases_case, 0);
-// }
-//
-// This test iterates through the numbers 1, 2, 3, and 4 and tests that
-// they are all grater than zero.  In case of failure, the exact case
-// which failed will be printed.  The case type must be printable using
-// ostream::operator<<.
-
-#define TEST_1D(FIXTURE, NAME, CASES)                             \
-  class FIXTURE##_##NAME##_DD : public FIXTURE {                  \
-   protected:                                                     \
-    template <typename CaseType>                                  \
-    void DoSingleCase(const CaseType& CASES##_case);              \
-  };                                                              \
-                                                                  \
-  TEST_F(FIXTURE##_##NAME##_DD, NAME) {                           \
-    for (int i = 0; i < GOOGLE_ARRAYSIZE(CASES); i++) {                  \
-      SCOPED_TRACE(testing::Message()                             \
-                   << #CASES " case #" << i << ": " << CASES[i]); \
-      DoSingleCase(CASES[i]);                                     \
-    }                                                             \
-  }                                                               \
-                                                                  \
-  template <typename CaseType>                                    \
-  void FIXTURE##_##NAME##_DD::DoSingleCase(const CaseType& CASES##_case)
-
-#define TEST_2D(FIXTURE, NAME, CASES1, CASES2)                              \
-  class FIXTURE##_##NAME##_DD : public FIXTURE {                            \
-   protected:                                                               \
-    template <typename CaseType1, typename CaseType2>                       \
-    void DoSingleCase(const CaseType1& CASES1##_case,                       \
-                      const CaseType2& CASES2##_case);                      \
-  };                                                                        \
-                                                                            \
-  TEST_F(FIXTURE##_##NAME##_DD, NAME) {                                     \
-    for (int i = 0; i < GOOGLE_ARRAYSIZE(CASES1); i++) {                           \
-      for (int j = 0; j < GOOGLE_ARRAYSIZE(CASES2); j++) {                         \
-        SCOPED_TRACE(testing::Message()                                     \
-                     << #CASES1 " case #" << i << ": " << CASES1[i] << ", " \
-                     << #CASES2 " case #" << j << ": " << CASES2[j]);       \
-        DoSingleCase(CASES1[i], CASES2[j]);                                 \
-      }                                                                     \
-    }                                                                       \
-  }                                                                         \
-                                                                            \
-  template <typename CaseType1, typename CaseType2>                         \
-  void FIXTURE##_##NAME##_DD::DoSingleCase(const CaseType1& CASES1##_case,  \
-                                           const CaseType2& CASES2##_case)
-
-// -------------------------------------------------------------------
-
-// An input stream that is basically like an ArrayInputStream but sometimes
-// returns empty buffers, just to throw us off.
-class TestInputStream : public ZeroCopyInputStream {
- public:
-  TestInputStream(const void* data, int size, int block_size)
-      : array_stream_(data, size, block_size), counter_(0) {}
-  ~TestInputStream() {}
-
-  // implements ZeroCopyInputStream ----------------------------------
-  bool Next(const void** data, int* size) override {
-    // We'll return empty buffers starting with the first buffer, and every
-    // 3 and 5 buffers after that.
-    if (counter_ % 3 == 0 || counter_ % 5 == 0) {
-      *data = NULL;
-      *size = 0;
-      ++counter_;
-      return true;
-    } else {
-      ++counter_;
-      return array_stream_.Next(data, size);
-    }
-  }
-
-  void BackUp(int count) override { return array_stream_.BackUp(count); }
-  bool Skip(int count) override { return array_stream_.Skip(count); }
-  int64_t ByteCount() const override { return array_stream_.ByteCount(); }
-
- private:
-  ArrayInputStream array_stream_;
-  int counter_;
-};
-
-// -------------------------------------------------------------------
-
-// An error collector which simply concatenates all its errors into a big
-// block of text which can be checked.
-class TestErrorCollector : public ErrorCollector {
- public:
-  TestErrorCollector() {}
-  ~TestErrorCollector() {}
-
-  std::string text_;
-
-  // implements ErrorCollector ---------------------------------------
-  void AddError(int line, int column, const std::string& message) {
-    strings::SubstituteAndAppend(&text_, "$0:$1: $2\n", line, column, message);
-  }
-};
-
-// -------------------------------------------------------------------
-
-// We test each operation over a variety of block sizes to insure that
-// we test cases where reads cross buffer boundaries as well as cases
-// where they don't.  This is sort of a brute-force approach to this,
-// but it's easy to write and easy to understand.
-const int kBlockSizes[] = {1, 2, 3, 5, 7, 13, 32, 1024};
-
-class TokenizerTest : public testing::Test {
- protected:
-  // For easy testing.
-  uint64_t ParseInteger(const std::string& text) {
-    uint64_t result;
-    EXPECT_TRUE(Tokenizer::ParseInteger(text, kuint64max, &result))
-        << "'" << text << "'";
-    return result;
-  }
-};
-
-// ===================================================================
-
-// These tests causes gcc 3.3.5 (and earlier?) to give the cryptic error:
-//   "sorry, unimplemented: `method_call_expr' not supported by dump_expr"
-#if !defined(__GNUC__) || __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 3)
-
-// In each test case, the entire input text should parse as a single token
-// of the given type.
-struct SimpleTokenCase {
-  std::string input;
-  Tokenizer::TokenType type;
-};
-
-inline std::ostream& operator<<(std::ostream& out,
-                                const SimpleTokenCase& test_case) {
-  return out << CEscape(test_case.input);
-}
-
-SimpleTokenCase kSimpleTokenCases[] = {
-    // Test identifiers.
-    {"hello", Tokenizer::TYPE_IDENTIFIER},
-
-    // Test integers.
-    {"123", Tokenizer::TYPE_INTEGER},
-    {"0xab6", Tokenizer::TYPE_INTEGER},
-    {"0XAB6", Tokenizer::TYPE_INTEGER},
-    {"0X1234567", Tokenizer::TYPE_INTEGER},
-    {"0x89abcdef", Tokenizer::TYPE_INTEGER},
-    {"0x89ABCDEF", Tokenizer::TYPE_INTEGER},
-    {"01234567", Tokenizer::TYPE_INTEGER},
-
-    // Test floats.
-    {"123.45", Tokenizer::TYPE_FLOAT},
-    {"1.", Tokenizer::TYPE_FLOAT},
-    {"1e3", Tokenizer::TYPE_FLOAT},
-    {"1E3", Tokenizer::TYPE_FLOAT},
-    {"1e-3", Tokenizer::TYPE_FLOAT},
-    {"1e+3", Tokenizer::TYPE_FLOAT},
-    {"1.e3", Tokenizer::TYPE_FLOAT},
-    {"1.2e3", Tokenizer::TYPE_FLOAT},
-    {".1", Tokenizer::TYPE_FLOAT},
-    {".1e3", Tokenizer::TYPE_FLOAT},
-    {".1e-3", Tokenizer::TYPE_FLOAT},
-    {".1e+3", Tokenizer::TYPE_FLOAT},
-
-    // Test strings.
-    {"'hello'", Tokenizer::TYPE_STRING},
-    {"\"foo\"", Tokenizer::TYPE_STRING},
-    {"'a\"b'", Tokenizer::TYPE_STRING},
-    {"\"a'b\"", Tokenizer::TYPE_STRING},
-    {"'a\\'b'", Tokenizer::TYPE_STRING},
-    {"\"a\\\"b\"", Tokenizer::TYPE_STRING},
-    {"'\\xf'", Tokenizer::TYPE_STRING},
-    {"'\\0'", Tokenizer::TYPE_STRING},
-
-    // Test symbols.
-    {"+", Tokenizer::TYPE_SYMBOL},
-    {".", Tokenizer::TYPE_SYMBOL},
-};
-
-TEST_2D(TokenizerTest, SimpleTokens, kSimpleTokenCases, kBlockSizes) {
-  // Set up the tokenizer.
-  TestInputStream input(kSimpleTokenCases_case.input.data(),
-                        kSimpleTokenCases_case.input.size(), kBlockSizes_case);
-  TestErrorCollector error_collector;
-  Tokenizer tokenizer(&input, &error_collector);
-
-  // Before Next() is called, the initial token should always be TYPE_START.
-  EXPECT_EQ(Tokenizer::TYPE_START, tokenizer.current().type);
-  EXPECT_EQ("", tokenizer.current().text);
-  EXPECT_EQ(0, tokenizer.current().line);
-  EXPECT_EQ(0, tokenizer.current().column);
-  EXPECT_EQ(0, tokenizer.current().end_column);
-
-  // Parse the token.
-  ASSERT_TRUE(tokenizer.Next());
-
-  // Check that it has the right type.
-  EXPECT_EQ(kSimpleTokenCases_case.type, tokenizer.current().type);
-  // Check that it contains the complete input text.
-  EXPECT_EQ(kSimpleTokenCases_case.input, tokenizer.current().text);
-  // Check that it is located at the beginning of the input
-  EXPECT_EQ(0, tokenizer.current().line);
-  EXPECT_EQ(0, tokenizer.current().column);
-  EXPECT_EQ(kSimpleTokenCases_case.input.size(),
-            tokenizer.current().end_column);
-
-  // There should be no more input.
-  EXPECT_FALSE(tokenizer.Next());
-
-  // After Next() returns false, the token should have type TYPE_END.
-  EXPECT_EQ(Tokenizer::TYPE_END, tokenizer.current().type);
-  EXPECT_EQ("", tokenizer.current().text);
-  EXPECT_EQ(0, tokenizer.current().line);
-  EXPECT_EQ(kSimpleTokenCases_case.input.size(), tokenizer.current().column);
-  EXPECT_EQ(kSimpleTokenCases_case.input.size(),
-            tokenizer.current().end_column);
-
-  // There should be no errors.
-  EXPECT_TRUE(error_collector.text_.empty());
-}
-
-TEST_1D(TokenizerTest, FloatSuffix, kBlockSizes) {
-  // Test the "allow_f_after_float" option.
-
-  // Set up the tokenizer.
-  const char* text = "1f 2.5f 6e3f 7F";
-  TestInputStream input(text, strlen(text), kBlockSizes_case);
-  TestErrorCollector error_collector;
-  Tokenizer tokenizer(&input, &error_collector);
-  tokenizer.set_allow_f_after_float(true);
-
-  // Advance through tokens and check that they are parsed as expected.
-  ASSERT_TRUE(tokenizer.Next());
-  EXPECT_EQ(tokenizer.current().text, "1f");
-  EXPECT_EQ(tokenizer.current().type, Tokenizer::TYPE_FLOAT);
-  ASSERT_TRUE(tokenizer.Next());
-  EXPECT_EQ(tokenizer.current().text, "2.5f");
-  EXPECT_EQ(tokenizer.current().type, Tokenizer::TYPE_FLOAT);
-  ASSERT_TRUE(tokenizer.Next());
-  EXPECT_EQ(tokenizer.current().text, "6e3f");
-  EXPECT_EQ(tokenizer.current().type, Tokenizer::TYPE_FLOAT);
-  ASSERT_TRUE(tokenizer.Next());
-  EXPECT_EQ(tokenizer.current().text, "7F");
-  EXPECT_EQ(tokenizer.current().type, Tokenizer::TYPE_FLOAT);
-
-  // There should be no more input.
-  EXPECT_FALSE(tokenizer.Next());
-  // There should be no errors.
-  EXPECT_TRUE(error_collector.text_.empty());
-}
-
-SimpleTokenCase kWhitespaceTokenCases[] = {
-    {" ", Tokenizer::TYPE_WHITESPACE},
-    {"    ", Tokenizer::TYPE_WHITESPACE},
-    {"\t", Tokenizer::TYPE_WHITESPACE},
-    {"\v", Tokenizer::TYPE_WHITESPACE},
-    {"\t ", Tokenizer::TYPE_WHITESPACE},
-    {"\v\t", Tokenizer::TYPE_WHITESPACE},
-    {"   \t\r", Tokenizer::TYPE_WHITESPACE},
-    // Newlines:
-    {"\n", Tokenizer::TYPE_NEWLINE},
-};
-
-TEST_2D(TokenizerTest, Whitespace, kWhitespaceTokenCases, kBlockSizes) {
-  {
-    TestInputStream input(kWhitespaceTokenCases_case.input.data(),
-                          kWhitespaceTokenCases_case.input.size(),
-                          kBlockSizes_case);
-    TestErrorCollector error_collector;
-    Tokenizer tokenizer(&input, &error_collector);
-
-    EXPECT_FALSE(tokenizer.Next());
-  }
-  {
-    TestInputStream input(kWhitespaceTokenCases_case.input.data(),
-                          kWhitespaceTokenCases_case.input.size(),
-                          kBlockSizes_case);
-    TestErrorCollector error_collector;
-    Tokenizer tokenizer(&input, &error_collector);
-    tokenizer.set_report_whitespace(true);
-    tokenizer.set_report_newlines(true);
-
-    ASSERT_TRUE(tokenizer.Next());
-    EXPECT_EQ(tokenizer.current().text, kWhitespaceTokenCases_case.input);
-    EXPECT_EQ(tokenizer.current().type, kWhitespaceTokenCases_case.type);
-
-    EXPECT_FALSE(tokenizer.Next());
-  }
-}
-
-#endif
-
-// -------------------------------------------------------------------
-
-// In each case, the input is parsed to produce a list of tokens.  The
-// last token in "output" must have type TYPE_END.
-struct MultiTokenCase {
-  std::string input;
-  std::vector<Tokenizer::Token> output;
-};
-
-inline std::ostream& operator<<(std::ostream& out,
-                                const MultiTokenCase& test_case) {
-  return out << CEscape(test_case.input);
-}
-
-MultiTokenCase kMultiTokenCases[] = {
-    // Test empty input.
-    {"",
-     {
-         {Tokenizer::TYPE_END, "", 0, 0, 0},
-     }},
-
-    // Test all token types at the same time.
-    {"foo 1 1.2 + 'bar'",
-     {
-         {Tokenizer::TYPE_IDENTIFIER, "foo", 0, 0, 3},
-         {Tokenizer::TYPE_INTEGER, "1", 0, 4, 5},
-         {Tokenizer::TYPE_FLOAT, "1.2", 0, 6, 9},
-         {Tokenizer::TYPE_SYMBOL, "+", 0, 10, 11},
-         {Tokenizer::TYPE_STRING, "'bar'", 0, 12, 17},
-         {Tokenizer::TYPE_END, "", 0, 17, 17},
-     }},
-
-    // Test that consecutive symbols are parsed as separate tokens.
-    {"!@+%",
-     {
-         {Tokenizer::TYPE_SYMBOL, "!", 0, 0, 1},
-         {Tokenizer::TYPE_SYMBOL, "@", 0, 1, 2},
-         {Tokenizer::TYPE_SYMBOL, "+", 0, 2, 3},
-         {Tokenizer::TYPE_SYMBOL, "%", 0, 3, 4},
-         {Tokenizer::TYPE_END, "", 0, 4, 4},
-     }},
-
-    // Test that newlines affect line numbers correctly.
-    {"foo bar\nrab oof",
-     {
-         {Tokenizer::TYPE_IDENTIFIER, "foo", 0, 0, 3},
-         {Tokenizer::TYPE_IDENTIFIER, "bar", 0, 4, 7},
-         {Tokenizer::TYPE_IDENTIFIER, "rab", 1, 0, 3},
-         {Tokenizer::TYPE_IDENTIFIER, "oof", 1, 4, 7},
-         {Tokenizer::TYPE_END, "", 1, 7, 7},
-     }},
-
-    // Test that tabs affect column numbers correctly.
-    {"foo\tbar  \tbaz",
-     {
-         {Tokenizer::TYPE_IDENTIFIER, "foo", 0, 0, 3},
-         {Tokenizer::TYPE_IDENTIFIER, "bar", 0, 8, 11},
-         {Tokenizer::TYPE_IDENTIFIER, "baz", 0, 16, 19},
-         {Tokenizer::TYPE_END, "", 0, 19, 19},
-     }},
-
-    // Test that tabs in string literals affect column numbers correctly.
-    {"\"foo\tbar\" baz",
-     {
-         {Tokenizer::TYPE_STRING, "\"foo\tbar\"", 0, 0, 12},
-         {Tokenizer::TYPE_IDENTIFIER, "baz", 0, 13, 16},
-         {Tokenizer::TYPE_END, "", 0, 16, 16},
-     }},
-
-    // Test that line comments are ignored.
-    {"foo // This is a comment\n"
-     "bar // This is another comment",
-     {
-         {Tokenizer::TYPE_IDENTIFIER, "foo", 0, 0, 3},
-         {Tokenizer::TYPE_IDENTIFIER, "bar", 1, 0, 3},
-         {Tokenizer::TYPE_END, "", 1, 30, 30},
-     }},
-
-    // Test that block comments are ignored.
-    {"foo /* This is a block comment */ bar",
-     {
-         {Tokenizer::TYPE_IDENTIFIER, "foo", 0, 0, 3},
-         {Tokenizer::TYPE_IDENTIFIER, "bar", 0, 34, 37},
-         {Tokenizer::TYPE_END, "", 0, 37, 37},
-     }},
-
-    // Test that sh-style comments are not ignored by default.
-    {"foo # bar\n"
-     "baz",
-     {
-         {Tokenizer::TYPE_IDENTIFIER, "foo", 0, 0, 3},
-         {Tokenizer::TYPE_SYMBOL, "#", 0, 4, 5},
-         {Tokenizer::TYPE_IDENTIFIER, "bar", 0, 6, 9},
-         {Tokenizer::TYPE_IDENTIFIER, "baz", 1, 0, 3},
-         {Tokenizer::TYPE_END, "", 1, 3, 3},
-     }},
-
-    // Test all whitespace chars
-    {"foo\n\t\r\v\fbar",
-     {
-         {Tokenizer::TYPE_IDENTIFIER, "foo", 0, 0, 3},
-         {Tokenizer::TYPE_IDENTIFIER, "bar", 1, 11, 14},
-         {Tokenizer::TYPE_END, "", 1, 14, 14},
-     }},
-};
-
-TEST_2D(TokenizerTest, MultipleTokens, kMultiTokenCases, kBlockSizes) {
-  // Set up the tokenizer.
-  TestInputStream input(kMultiTokenCases_case.input.data(),
-                        kMultiTokenCases_case.input.size(), kBlockSizes_case);
-  TestErrorCollector error_collector;
-  Tokenizer tokenizer(&input, &error_collector);
-
-  // Before Next() is called, the initial token should always be TYPE_START.
-  EXPECT_EQ(Tokenizer::TYPE_START, tokenizer.current().type);
-  EXPECT_EQ("", tokenizer.current().text);
-  EXPECT_EQ(0, tokenizer.current().line);
-  EXPECT_EQ(0, tokenizer.current().column);
-  EXPECT_EQ(0, tokenizer.current().end_column);
-
-  // Loop through all expected tokens.
-  int i = 0;
-  Tokenizer::Token token;
-  do {
-    token = kMultiTokenCases_case.output[i++];
-
-    SCOPED_TRACE(testing::Message() << "Token #" << i << ": " << token.text);
-
-    Tokenizer::Token previous = tokenizer.current();
-
-    // Next() should only return false when it hits the end token.
-    if (token.type != Tokenizer::TYPE_END) {
-      ASSERT_TRUE(tokenizer.Next());
-    } else {
-      ASSERT_FALSE(tokenizer.Next());
-    }
-
-    // Check that the previous token is set correctly.
-    EXPECT_EQ(previous.type, tokenizer.previous().type);
-    EXPECT_EQ(previous.text, tokenizer.previous().text);
-    EXPECT_EQ(previous.line, tokenizer.previous().line);
-    EXPECT_EQ(previous.column, tokenizer.previous().column);
-    EXPECT_EQ(previous.end_column, tokenizer.previous().end_column);
-
-    // Check that the token matches the expected one.
-    EXPECT_EQ(token.type, tokenizer.current().type);
-    EXPECT_EQ(token.text, tokenizer.current().text);
-    EXPECT_EQ(token.line, tokenizer.current().line);
-    EXPECT_EQ(token.column, tokenizer.current().column);
-    EXPECT_EQ(token.end_column, tokenizer.current().end_column);
-
-  } while (token.type != Tokenizer::TYPE_END);
-
-  // There should be no errors.
-  EXPECT_TRUE(error_collector.text_.empty());
-}
-
-MultiTokenCase kMultiWhitespaceTokenCases[] = {
-    // Test all token types at the same time.
-    {"foo 1 \t1.2  \n   +\v'bar'",
-     {
-         {Tokenizer::TYPE_IDENTIFIER, "foo", 0, 0, 3},
-         {Tokenizer::TYPE_WHITESPACE, " ", 0, 3, 4},
-         {Tokenizer::TYPE_INTEGER, "1", 0, 4, 5},
-         {Tokenizer::TYPE_WHITESPACE, " \t", 0, 5, 8},
-         {Tokenizer::TYPE_FLOAT, "1.2", 0, 8, 11},
-         {Tokenizer::TYPE_WHITESPACE, "  ", 0, 11, 13},
-         {Tokenizer::TYPE_NEWLINE, "\n", 0, 13, 0},
-         {Tokenizer::TYPE_WHITESPACE, "   ", 1, 0, 3},
-         {Tokenizer::TYPE_SYMBOL, "+", 1, 3, 4},
-         {Tokenizer::TYPE_WHITESPACE, "\v", 1, 4, 5},
-         {Tokenizer::TYPE_STRING, "'bar'", 1, 5, 10},
-         {Tokenizer::TYPE_END, "", 1, 10, 10},
-     }},
-
-};
-
-TEST_2D(TokenizerTest, MultipleWhitespaceTokens, kMultiWhitespaceTokenCases,
-        kBlockSizes) {
-  // Set up the tokenizer.
-  TestInputStream input(kMultiWhitespaceTokenCases_case.input.data(),
-                        kMultiWhitespaceTokenCases_case.input.size(),
-                        kBlockSizes_case);
-  TestErrorCollector error_collector;
-  Tokenizer tokenizer(&input, &error_collector);
-  tokenizer.set_report_whitespace(true);
-  tokenizer.set_report_newlines(true);
-
-  // Before Next() is called, the initial token should always be TYPE_START.
-  EXPECT_EQ(Tokenizer::TYPE_START, tokenizer.current().type);
-  EXPECT_EQ("", tokenizer.current().text);
-  EXPECT_EQ(0, tokenizer.current().line);
-  EXPECT_EQ(0, tokenizer.current().column);
-  EXPECT_EQ(0, tokenizer.current().end_column);
-
-  // Loop through all expected tokens.
-  int i = 0;
-  Tokenizer::Token token;
-  do {
-    token = kMultiWhitespaceTokenCases_case.output[i++];
-
-    SCOPED_TRACE(testing::Message() << "Token #" << i << ": " << token.text);
-
-    Tokenizer::Token previous = tokenizer.current();
-
-    // Next() should only return false when it hits the end token.
-    if (token.type != Tokenizer::TYPE_END) {
-      ASSERT_TRUE(tokenizer.Next());
-    } else {
-      ASSERT_FALSE(tokenizer.Next());
-    }
-
-    // Check that the previous token is set correctly.
-    EXPECT_EQ(previous.type, tokenizer.previous().type);
-    EXPECT_EQ(previous.text, tokenizer.previous().text);
-    EXPECT_EQ(previous.line, tokenizer.previous().line);
-    EXPECT_EQ(previous.column, tokenizer.previous().column);
-    EXPECT_EQ(previous.end_column, tokenizer.previous().end_column);
-
-    // Check that the token matches the expected one.
-    EXPECT_EQ(token.type, tokenizer.current().type);
-    EXPECT_EQ(token.text, tokenizer.current().text);
-    EXPECT_EQ(token.line, tokenizer.current().line);
-    EXPECT_EQ(token.column, tokenizer.current().column);
-    EXPECT_EQ(token.end_column, tokenizer.current().end_column);
-
-  } while (token.type != Tokenizer::TYPE_END);
-
-  // There should be no errors.
-  EXPECT_TRUE(error_collector.text_.empty());
-}
-
-// This test causes gcc 3.3.5 (and earlier?) to give the cryptic error:
-//   "sorry, unimplemented: `method_call_expr' not supported by dump_expr"
-#if !defined(__GNUC__) || __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 3)
-
-TEST_1D(TokenizerTest, ShCommentStyle, kBlockSizes) {
-  // Test the "comment_style" option.
-
-  const char* text =
-      "foo # bar\n"
-      "baz // qux\n"
-      "corge /* grault */\n"
-      "garply";
-  const char* const kTokens[] = {"foo",  // "# bar" is ignored
-                                 "baz", "/",      "/", "qux", "corge", "/",
-                                 "*",   "grault", "*", "/",   "garply"};
-
-  // Set up the tokenizer.
-  TestInputStream input(text, strlen(text), kBlockSizes_case);
-  TestErrorCollector error_collector;
-  Tokenizer tokenizer(&input, &error_collector);
-  tokenizer.set_comment_style(Tokenizer::SH_COMMENT_STYLE);
-
-  // Advance through tokens and check that they are parsed as expected.
-  for (int i = 0; i < GOOGLE_ARRAYSIZE(kTokens); i++) {
-    EXPECT_TRUE(tokenizer.Next());
-    EXPECT_EQ(tokenizer.current().text, kTokens[i]);
-  }
-
-  // There should be no more input.
-  EXPECT_FALSE(tokenizer.Next());
-  // There should be no errors.
-  EXPECT_TRUE(error_collector.text_.empty());
-}
-
-#endif
-
-// -------------------------------------------------------------------
-
-// In each case, the input is expected to have two tokens named "prev" and
-// "next" with comments in between.
-struct DocCommentCase {
-  std::string input;
-
-  const char* prev_trailing_comments;
-  const char* detached_comments[10];
-  const char* next_leading_comments;
-};
-
-inline std::ostream& operator<<(std::ostream& out,
-                                const DocCommentCase& test_case) {
-  return out << CEscape(test_case.input);
-}
-
-DocCommentCase kDocCommentCases[] = {
-    {"prev next",
-
-     "",
-     {},
-     ""},
-
-    {"prev /* ignored */ next",
-
-     "",
-     {},
-     ""},
-
-    {"prev // trailing comment\n"
-     "next",
-
-     " trailing comment\n",
-     {},
-     ""},
-
-    {"prev\n"
-     "// leading comment\n"
-     "// line 2\n"
-     "next",
-
-     "",
-     {},
-     " leading comment\n"
-     " line 2\n"},
-
-    {"prev\n"
-     "// trailing comment\n"
-     "// line 2\n"
-     "\n"
-     "next",
-
-     " trailing comment\n"
-     " line 2\n",
-     {},
-     ""},
-
-    {"prev // trailing comment\n"
-     "// leading comment\n"
-     "// line 2\n"
-     "next",
-
-     " trailing comment\n",
-     {},
-     " leading comment\n"
-     " line 2\n"},
-
-    {"prev /* trailing block comment */\n"
-     "/* leading block comment\n"
-     " * line 2\n"
-     " * line 3 */"
-     "next",
-
-     " trailing block comment ",
-     {},
-     " leading block comment\n"
-     " line 2\n"
-     " line 3 "},
-
-    {"prev\n"
-     "/* trailing block comment\n"
-     " * line 2\n"
-     " * line 3\n"
-     " */\n"
-     "/* leading block comment\n"
-     " * line 2\n"
-     " * line 3 */"
-     "next",
-
-     " trailing block comment\n"
-     " line 2\n"
-     " line 3\n",
-     {},
-     " leading block comment\n"
-     " line 2\n"
-     " line 3 "},
-
-    {"prev\n"
-     "// trailing comment\n"
-     "\n"
-     "// detached comment\n"
-     "// line 2\n"
-     "\n"
-     "// second detached comment\n"
-     "/* third detached comment\n"
-     " * line 2 */\n"
-     "// leading comment\n"
-     "next",
-
-     " trailing comment\n",
-     {" detached comment\n"
-      " line 2\n",
-      " second detached comment\n",
-      " third detached comment\n"
-      " line 2 "},
-     " leading comment\n"},
-
-    {"prev /**/\n"
-     "\n"
-     "// detached comment\n"
-     "\n"
-     "// leading comment\n"
-     "next",
-
-     "",
-     {" detached comment\n"},
-     " leading comment\n"},
-
-    {"prev /**/\n"
-     "// leading comment\n"
-     "next",
-
-     "",
-     {},
-     " leading comment\n"},
-};
-
-TEST_2D(TokenizerTest, DocComments, kDocCommentCases, kBlockSizes) {
-  // Set up the tokenizer.
-  TestInputStream input(kDocCommentCases_case.input.data(),
-                        kDocCommentCases_case.input.size(), kBlockSizes_case);
-  TestErrorCollector error_collector;
-  Tokenizer tokenizer(&input, &error_collector);
-
-  // Set up a second tokenizer where we'll pass all NULLs to NextWithComments().
-  TestInputStream input2(kDocCommentCases_case.input.data(),
-                         kDocCommentCases_case.input.size(), kBlockSizes_case);
-  Tokenizer tokenizer2(&input2, &error_collector);
-
-  tokenizer.Next();
-  tokenizer2.Next();
-
-  EXPECT_EQ("prev", tokenizer.current().text);
-  EXPECT_EQ("prev", tokenizer2.current().text);
-
-  std::string prev_trailing_comments;
-  std::vector<std::string> detached_comments;
-  std::string next_leading_comments;
-  tokenizer.NextWithComments(&prev_trailing_comments, &detached_comments,
-                             &next_leading_comments);
-  tokenizer2.NextWithComments(NULL, NULL, NULL);
-  EXPECT_EQ("next", tokenizer.current().text);
-  EXPECT_EQ("next", tokenizer2.current().text);
-
-  EXPECT_EQ(kDocCommentCases_case.prev_trailing_comments,
-            prev_trailing_comments);
-
-  for (int i = 0; i < detached_comments.size(); i++) {
-    ASSERT_LT(i, GOOGLE_ARRAYSIZE(kDocCommentCases));
-    ASSERT_TRUE(kDocCommentCases_case.detached_comments[i] != NULL);
-    EXPECT_EQ(kDocCommentCases_case.detached_comments[i], detached_comments[i]);
-  }
-
-  // Verify that we matched all the detached comments.
-  EXPECT_EQ(NULL,
-            kDocCommentCases_case.detached_comments[detached_comments.size()]);
-
-  EXPECT_EQ(kDocCommentCases_case.next_leading_comments, next_leading_comments);
-}
-
-// -------------------------------------------------------------------
-
-// Test parse helpers.
-// TODO(b/225783758): Add a fuzz test for this.
-TEST_F(TokenizerTest, ParseInteger) {
-  EXPECT_EQ(0, ParseInteger("0"));
-  EXPECT_EQ(123, ParseInteger("123"));
-  EXPECT_EQ(0xabcdef12u, ParseInteger("0xabcdef12"));
-  EXPECT_EQ(0xabcdef12u, ParseInteger("0xABCDEF12"));
-  EXPECT_EQ(kuint64max, ParseInteger("0xFFFFFFFFFFFFFFFF"));
-  EXPECT_EQ(01234567, ParseInteger("01234567"));
-  EXPECT_EQ(0X123, ParseInteger("0X123"));
-
-  // Test invalid integers that may still be tokenized as integers.
-  EXPECT_EQ(0, ParseInteger("0x"));
-
-  uint64_t i;
-
-  // Test invalid integers that will never be tokenized as integers.
-  EXPECT_FALSE(Tokenizer::ParseInteger("zxy", kuint64max, &i));
-  EXPECT_FALSE(Tokenizer::ParseInteger("1.2", kuint64max, &i));
-  EXPECT_FALSE(Tokenizer::ParseInteger("08", kuint64max, &i));
-  EXPECT_FALSE(Tokenizer::ParseInteger("0xg", kuint64max, &i));
-  EXPECT_FALSE(Tokenizer::ParseInteger("-1", kuint64max, &i));
-
-  // Test overflows.
-  EXPECT_TRUE(Tokenizer::ParseInteger("0", 0, &i));
-  EXPECT_FALSE(Tokenizer::ParseInteger("1", 0, &i));
-  EXPECT_TRUE(Tokenizer::ParseInteger("1", 1, &i));
-  EXPECT_TRUE(Tokenizer::ParseInteger("12345", 12345, &i));
-  EXPECT_FALSE(Tokenizer::ParseInteger("12346", 12345, &i));
-  EXPECT_TRUE(Tokenizer::ParseInteger("0xFFFFFFFFFFFFFFFF", kuint64max, &i));
-  EXPECT_FALSE(Tokenizer::ParseInteger("0x10000000000000000", kuint64max, &i));
-
-  // Test near the limits of signed parsing (values in kint64max +/- 1600)
-  for (int64_t offset = -1600; offset <= 1600; ++offset) {
-    // We make sure to perform an unsigned addition so that we avoid signed
-    // overflow, which would be undefined behavior.
-    uint64_t i = 0x7FFFFFFFFFFFFFFFu + static_cast<uint64_t>(offset);
-    char decimal[32];
-    snprintf(decimal, 32, "%llu", static_cast<unsigned long long>(i));
-    if (offset > 0) {
-      uint64_t parsed = -1;
-      EXPECT_FALSE(Tokenizer::ParseInteger(decimal, kint64max, &parsed))
-          << decimal << "=>" << parsed;
-    } else {
-      uint64_t parsed = -1;
-      EXPECT_TRUE(Tokenizer::ParseInteger(decimal, kint64max, &parsed))
-          << decimal << "=>" << parsed;
-      EXPECT_EQ(parsed, i);
-    }
-    char octal[32];
-    snprintf(octal, 32, "0%llo", static_cast<unsigned long long>(i));
-    if (offset > 0) {
-      uint64_t parsed = -1;
-      EXPECT_FALSE(Tokenizer::ParseInteger(octal, kint64max, &parsed))
-          << octal << "=>" << parsed;
-    } else {
-      uint64_t parsed = -1;
-      EXPECT_TRUE(Tokenizer::ParseInteger(octal, kint64max, &parsed))
-          << octal << "=>" << parsed;
-      EXPECT_EQ(parsed, i);
-    }
-    char hex[32];
-    snprintf(hex, 32, "0x%llx", static_cast<unsigned long long>(i));
-    if (offset > 0) {
-      uint64_t parsed = -1;
-      EXPECT_FALSE(Tokenizer::ParseInteger(hex, kint64max, &parsed))
-          << hex << "=>" << parsed;
-    } else {
-      uint64_t parsed = -1;
-      EXPECT_TRUE(Tokenizer::ParseInteger(hex, kint64max, &parsed)) << hex;
-      EXPECT_EQ(parsed, i);
-    }
-    // EXPECT_NE(offset, -237);
-  }
-
-  // Test near the limits of unsigned parsing (values in kuint64max +/- 1600)
-  // By definition, values greater than kuint64max cannot be held in a uint64_t
-  // variable, so printing them is a little tricky; fortunately all but the
-  // last four digits are known, so we can hard-code them in the printf string,
-  // and we only need to format the last 4.
-  for (int64_t offset = -1600; offset <= 1600; ++offset) {
-    {
-      uint64_t i = 18446744073709551615u + offset;
-      char decimal[32];
-      snprintf(decimal, 32, "1844674407370955%04llu",
-               static_cast<unsigned long long>(1615 + offset));
-      if (offset > 0) {
-        uint64_t parsed = -1;
-        EXPECT_FALSE(Tokenizer::ParseInteger(decimal, kuint64max, &parsed))
-            << decimal << "=>" << parsed;
-      } else {
-        uint64_t parsed = -1;
-        EXPECT_TRUE(Tokenizer::ParseInteger(decimal, kuint64max, &parsed))
-            << decimal;
-        EXPECT_EQ(parsed, i);
-      }
-    }
-    {
-      uint64_t i = 01777777777777777777777u + offset;
-      if (offset > 0) {
-        char octal[32];
-        snprintf(octal, 32, "0200000000000000000%04llo",
-                 static_cast<unsigned long long>(offset - 1));
-        uint64_t parsed = -1;
-        EXPECT_FALSE(Tokenizer::ParseInteger(octal, kuint64max, &parsed))
-            << octal << "=>" << parsed;
-      } else {
-        char octal[32];
-        snprintf(octal, 32, "0%llo", static_cast<unsigned long long>(i));
-        uint64_t parsed = -1;
-        EXPECT_TRUE(Tokenizer::ParseInteger(octal, kuint64max, &parsed))
-            << octal;
-        EXPECT_EQ(parsed, i);
-      }
-    }
-    {
-      uint64_t ui = 0xffffffffffffffffu + offset;
-      char hex[32];
-      if (offset > 0) {
-        snprintf(hex, 32, "0x1000000000000%04llx",
-                 static_cast<unsigned long long>(offset - 1));
-        uint64_t parsed = -1;
-        EXPECT_FALSE(Tokenizer::ParseInteger(hex, kuint64max, &parsed))
-            << hex << "=>" << parsed;
-      } else {
-        snprintf(hex, 32, "0x%llx", static_cast<unsigned long long>(ui));
-        uint64_t parsed = -1;
-        EXPECT_TRUE(Tokenizer::ParseInteger(hex, kuint64max, &parsed)) << hex;
-        EXPECT_EQ(parsed, ui);
-      }
-    }
-  }
-}
-
-TEST_F(TokenizerTest, ParseFloat) {
-  EXPECT_DOUBLE_EQ(1, Tokenizer::ParseFloat("1."));
-  EXPECT_DOUBLE_EQ(1e3, Tokenizer::ParseFloat("1e3"));
-  EXPECT_DOUBLE_EQ(1e3, Tokenizer::ParseFloat("1E3"));
-  EXPECT_DOUBLE_EQ(1.5e3, Tokenizer::ParseFloat("1.5e3"));
-  EXPECT_DOUBLE_EQ(.1, Tokenizer::ParseFloat(".1"));
-  EXPECT_DOUBLE_EQ(.25, Tokenizer::ParseFloat(".25"));
-  EXPECT_DOUBLE_EQ(.1e3, Tokenizer::ParseFloat(".1e3"));
-  EXPECT_DOUBLE_EQ(.25e3, Tokenizer::ParseFloat(".25e3"));
-  EXPECT_DOUBLE_EQ(.1e+3, Tokenizer::ParseFloat(".1e+3"));
-  EXPECT_DOUBLE_EQ(.1e-3, Tokenizer::ParseFloat(".1e-3"));
-  EXPECT_DOUBLE_EQ(5, Tokenizer::ParseFloat("5"));
-  EXPECT_DOUBLE_EQ(6e-12, Tokenizer::ParseFloat("6e-12"));
-  EXPECT_DOUBLE_EQ(1.2, Tokenizer::ParseFloat("1.2"));
-  EXPECT_DOUBLE_EQ(1.e2, Tokenizer::ParseFloat("1.e2"));
-
-  // Test invalid integers that may still be tokenized as integers.
-  EXPECT_DOUBLE_EQ(1, Tokenizer::ParseFloat("1e"));
-  EXPECT_DOUBLE_EQ(1, Tokenizer::ParseFloat("1e-"));
-  EXPECT_DOUBLE_EQ(1, Tokenizer::ParseFloat("1.e"));
-
-  // Test 'f' suffix.
-  EXPECT_DOUBLE_EQ(1, Tokenizer::ParseFloat("1f"));
-  EXPECT_DOUBLE_EQ(1, Tokenizer::ParseFloat("1.0f"));
-  EXPECT_DOUBLE_EQ(1, Tokenizer::ParseFloat("1F"));
-
-  // These should parse successfully even though they are out of range.
-  // Overflows become infinity and underflows become zero.
-  EXPECT_EQ(0.0, Tokenizer::ParseFloat("1e-9999999999999999999999999999"));
-  EXPECT_EQ(HUGE_VAL, Tokenizer::ParseFloat("1e+9999999999999999999999999999"));
-
-#ifdef PROTOBUF_HAS_DEATH_TEST  // death tests do not work on Windows yet
-  // Test invalid integers that will never be tokenized as integers.
-  EXPECT_DEBUG_DEATH(
-      Tokenizer::ParseFloat("zxy"),
-      "passed text that could not have been tokenized as a float");
-  EXPECT_DEBUG_DEATH(
-      Tokenizer::ParseFloat("1-e0"),
-      "passed text that could not have been tokenized as a float");
-  EXPECT_DEBUG_DEATH(
-      Tokenizer::ParseFloat("-1.0"),
-      "passed text that could not have been tokenized as a float");
-#endif  // PROTOBUF_HAS_DEATH_TEST
-}
-
-TEST_F(TokenizerTest, ParseString) {
-  std::string output;
-  Tokenizer::ParseString("'hello'", &output);
-  EXPECT_EQ("hello", output);
-  Tokenizer::ParseString("\"blah\\nblah2\"", &output);
-  EXPECT_EQ("blah\nblah2", output);
-  Tokenizer::ParseString("'\\1x\\1\\123\\739\\52\\334n\\3'", &output);
-  EXPECT_EQ("\1x\1\123\739\52\334n\3", output);
-  Tokenizer::ParseString("'\\x20\\x4'", &output);
-  EXPECT_EQ("\x20\x4", output);
-
-  // Test invalid strings that may still be tokenized as strings.
-  Tokenizer::ParseString("\"\\a\\l\\v\\t", &output);  // \l is invalid
-  EXPECT_EQ("\a?\v\t", output);
-  Tokenizer::ParseString("'", &output);
-  EXPECT_EQ("", output);
-  Tokenizer::ParseString("'\\", &output);
-  EXPECT_EQ("\\", output);
-
-  // Experiment with Unicode escapes. Here are one-, two- and three-byte Unicode
-  // characters.
-  Tokenizer::ParseString("'\\u0024\\u00a2\\u20ac\\U00024b62XX'", &output);
-  EXPECT_EQ("$¢€𤭢XX", output);
-  // Same thing encoded using UTF16.
-  Tokenizer::ParseString("'\\u0024\\u00a2\\u20ac\\ud852\\udf62XX'", &output);
-  EXPECT_EQ("$¢€𤭢XX", output);
-  // Here's some broken UTF16; there's a head surrogate with no tail surrogate.
-  // We just output this as if it were UTF8; it's not a defined code point, but
-  // it has a defined encoding.
-  Tokenizer::ParseString("'\\ud852XX'", &output);
-  EXPECT_EQ("\xed\xa1\x92XX", output);
-  // Malformed escape: Demons may fly out of the nose.
-  Tokenizer::ParseString("'\\u0'", &output);
-  EXPECT_EQ("u0", output);
-  // Beyond the range of valid UTF-32 code units.
-  Tokenizer::ParseString("'\\U00110000\\U00200000\\UFFFFFFFF'", &output);
-  EXPECT_EQ("\\U00110000\\U00200000\\Uffffffff", output);
-
-  // Test invalid strings that will never be tokenized as strings.
-#ifdef PROTOBUF_HAS_DEATH_TEST  // death tests do not work on Windows yet
-  EXPECT_DEBUG_DEATH(
-      Tokenizer::ParseString("", &output),
-      "passed text that could not have been tokenized as a string");
-#endif  // PROTOBUF_HAS_DEATH_TEST
-}
-
-TEST_F(TokenizerTest, ParseStringAppend) {
-  // Check that ParseString and ParseStringAppend differ.
-  std::string output("stuff+");
-  Tokenizer::ParseStringAppend("'hello'", &output);
-  EXPECT_EQ("stuff+hello", output);
-  Tokenizer::ParseString("'hello'", &output);
-  EXPECT_EQ("hello", output);
-}
-
-// -------------------------------------------------------------------
-
-// Each case parses some input text, ignoring the tokens produced, and
-// checks that the error output matches what is expected.
-struct ErrorCase {
-  std::string input;
-  bool recoverable;  // True if the tokenizer should be able to recover and
-                     // parse more tokens after seeing this error.  Cases
-                     // for which this is true must end with "foo" as
-                     // the last token, which the test will check for.
-  const char* errors;
-};
-
-inline std::ostream& operator<<(std::ostream& out, const ErrorCase& test_case) {
-  return out << CEscape(test_case.input);
-}
-
-ErrorCase kErrorCases[] = {
-    // String errors.
-    {"'\\l' foo", true, "0:2: Invalid escape sequence in string literal.\n"},
-    {"'\\X' foo", true, "0:2: Invalid escape sequence in string literal.\n"},
-    {"'\\x' foo", true, "0:3: Expected hex digits for escape sequence.\n"},
-    {"'foo", false, "0:4: Unexpected end of string.\n"},
-    {"'bar\nfoo", true, "0:4: String literals cannot cross line boundaries.\n"},
-    {"'\\u01' foo", true,
-     "0:5: Expected four hex digits for \\u escape sequence.\n"},
-    {"'\\u01' foo", true,
-     "0:5: Expected four hex digits for \\u escape sequence.\n"},
-    {"'\\uXYZ' foo", true,
-     "0:3: Expected four hex digits for \\u escape sequence.\n"},
-
-    // Integer errors.
-    {"123foo", true, "0:3: Need space between number and identifier.\n"},
-
-    // Hex/octal errors.
-    {"0x foo", true, "0:2: \"0x\" must be followed by hex digits.\n"},
-    {"0541823 foo", true,
-     "0:4: Numbers starting with leading zero must be in octal.\n"},
-    {"0x123z foo", true, "0:5: Need space between number and identifier.\n"},
-    {"0x123.4 foo", true, "0:5: Hex and octal numbers must be integers.\n"},
-    {"0123.4 foo", true, "0:4: Hex and octal numbers must be integers.\n"},
-
-    // Float errors.
-    {"1e foo", true, "0:2: \"e\" must be followed by exponent.\n"},
-    {"1e- foo", true, "0:3: \"e\" must be followed by exponent.\n"},
-    {"1.2.3 foo", true,
-     "0:3: Already saw decimal point or exponent; can't have another one.\n"},
-    {"1e2.3 foo", true,
-     "0:3: Already saw decimal point or exponent; can't have another one.\n"},
-    {"a.1 foo", true,
-     "0:1: Need space between identifier and decimal point.\n"},
-    // allow_f_after_float not enabled, so this should be an error.
-    {"1.0f foo", true, "0:3: Need space between number and identifier.\n"},
-
-    // Block comment errors.
-    {"/*", false,
-     "0:2: End-of-file inside block comment.\n"
-     "0:0:   Comment started here.\n"},
-    {"/*/*/ foo", true,
-     "0:3: \"/*\" inside block comment.  Block comments cannot be nested.\n"},
-
-    // Control characters.  Multiple consecutive control characters should only
-    // produce one error.
-    {"\b foo", true, "0:0: Invalid control characters encountered in text.\n"},
-    {"\b\b foo", true,
-     "0:0: Invalid control characters encountered in text.\n"},
-
-    // Check that control characters at end of input don't result in an
-    // infinite loop.
-    {"\b", false, "0:0: Invalid control characters encountered in text.\n"},
-
-    // Check recovery from '\0'.  We have to explicitly specify the length of
-    // these strings because otherwise the string constructor will just call
-    // strlen() which will see the first '\0' and think that is the end of the
-    // string.
-    {std::string("\0foo", 4), true,
-     "0:0: Invalid control characters encountered in text.\n"},
-    {std::string("\0\0foo", 5), true,
-     "0:0: Invalid control characters encountered in text.\n"},
-
-    // Check error from high order bits set
-    {"\300foo", true, "0:0: Interpreting non ascii codepoint 192.\n"},
-};
-
-TEST_2D(TokenizerTest, Errors, kErrorCases, kBlockSizes) {
-  // Set up the tokenizer.
-  TestInputStream input(kErrorCases_case.input.data(),
-                        kErrorCases_case.input.size(), kBlockSizes_case);
-  TestErrorCollector error_collector;
-  Tokenizer tokenizer(&input, &error_collector);
-
-  // Ignore all input, except remember if the last token was "foo".
-  bool last_was_foo = false;
-  while (tokenizer.Next()) {
-    last_was_foo = tokenizer.current().text == "foo";
-  }
-
-  // Check that the errors match what was expected.
-  EXPECT_EQ(kErrorCases_case.errors, error_collector.text_);
-
-  // If the error was recoverable, make sure we saw "foo" after it.
-  if (kErrorCases_case.recoverable) {
-    EXPECT_TRUE(last_was_foo);
-  }
-}
-
-// -------------------------------------------------------------------
-
-TEST_1D(TokenizerTest, BackUpOnDestruction, kBlockSizes) {
-  std::string text = "foo bar";
-  TestInputStream input(text.data(), text.size(), kBlockSizes_case);
-
-  // Create a tokenizer, read one token, then destroy it.
-  {
-    TestErrorCollector error_collector;
-    Tokenizer tokenizer(&input, &error_collector);
-
-    tokenizer.Next();
-  }
-
-  // Only "foo" should have been read.
-  EXPECT_EQ(strlen("foo"), input.ByteCount());
-}
-
-
-}  // namespace
-}  // namespace io
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/io/zero_copy_stream.cc b/libs/protobuf/src/google/protobuf/io/zero_copy_stream.cc
deleted file mode 100644
index f81555e..0000000
--- a/libs/protobuf/src/google/protobuf/io/zero_copy_stream.cc
+++ /dev/null
@@ -1,55 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-
-#include <google/protobuf/io/zero_copy_stream.h>
-
-#include <google/protobuf/stubs/logging.h>
-#include <google/protobuf/stubs/common.h>
-
-namespace google {
-namespace protobuf {
-namespace io {
-
-
-bool ZeroCopyOutputStream::WriteAliasedRaw(const void* /* data */,
-                                           int /* size */) {
-  GOOGLE_LOG(FATAL) << "This ZeroCopyOutputStream doesn't support aliasing. "
-                "Reaching here usually means a ZeroCopyOutputStream "
-                "implementation bug.";
-  return false;
-}
-
-}  // namespace io
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/io/zero_copy_stream.h b/libs/protobuf/src/google/protobuf/io/zero_copy_stream.h
deleted file mode 100644
index 2041cbf..0000000
--- a/libs/protobuf/src/google/protobuf/io/zero_copy_stream.h
+++ /dev/null
@@ -1,260 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-//
-// This file contains the ZeroCopyInputStream and ZeroCopyOutputStream
-// interfaces, which represent abstract I/O streams to and from which
-// protocol buffers can be read and written.  For a few simple
-// implementations of these interfaces, see zero_copy_stream_impl.h.
-//
-// These interfaces are different from classic I/O streams in that they
-// try to minimize the amount of data copying that needs to be done.
-// To accomplish this, responsibility for allocating buffers is moved to
-// the stream object, rather than being the responsibility of the caller.
-// So, the stream can return a buffer which actually points directly into
-// the final data structure where the bytes are to be stored, and the caller
-// can interact directly with that buffer, eliminating an intermediate copy
-// operation.
-//
-// As an example, consider the common case in which you are reading bytes
-// from an array that is already in memory (or perhaps an mmap()ed file).
-// With classic I/O streams, you would do something like:
-//   char buffer[BUFFER_SIZE];
-//   input->Read(buffer, BUFFER_SIZE);
-//   DoSomething(buffer, BUFFER_SIZE);
-// Then, the stream basically just calls memcpy() to copy the data from
-// the array into your buffer.  With a ZeroCopyInputStream, you would do
-// this instead:
-//   const void* buffer;
-//   int size;
-//   input->Next(&buffer, &size);
-//   DoSomething(buffer, size);
-// Here, no copy is performed.  The input stream returns a pointer directly
-// into the backing array, and the caller ends up reading directly from it.
-//
-// If you want to be able to read the old-fashion way, you can create
-// a CodedInputStream or CodedOutputStream wrapping these objects and use
-// their ReadRaw()/WriteRaw() methods.  These will, of course, add a copy
-// step, but Coded*Stream will handle buffering so at least it will be
-// reasonably efficient.
-//
-// ZeroCopyInputStream example:
-//   // Read in a file and print its contents to stdout.
-//   int fd = open("myfile", O_RDONLY);
-//   ZeroCopyInputStream* input = new FileInputStream(fd);
-//
-//   const void* buffer;
-//   int size;
-//   while (input->Next(&buffer, &size)) {
-//     cout.write(buffer, size);
-//   }
-//
-//   delete input;
-//   close(fd);
-//
-// ZeroCopyOutputStream example:
-//   // Copy the contents of "infile" to "outfile", using plain read() for
-//   // "infile" but a ZeroCopyOutputStream for "outfile".
-//   int infd = open("infile", O_RDONLY);
-//   int outfd = open("outfile", O_WRONLY);
-//   ZeroCopyOutputStream* output = new FileOutputStream(outfd);
-//
-//   void* buffer;
-//   int size;
-//   while (output->Next(&buffer, &size)) {
-//     int bytes = read(infd, buffer, size);
-//     if (bytes < size) {
-//       // Reached EOF.
-//       output->BackUp(size - bytes);
-//       break;
-//     }
-//   }
-//
-//   delete output;
-//   close(infd);
-//   close(outfd);
-
-#ifndef GOOGLE_PROTOBUF_IO_ZERO_COPY_STREAM_H__
-#define GOOGLE_PROTOBUF_IO_ZERO_COPY_STREAM_H__
-
-
-#include <google/protobuf/stubs/common.h>
-
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-namespace io {
-
-// Defined in this file.
-class ZeroCopyInputStream;
-class ZeroCopyOutputStream;
-
-// Abstract interface similar to an input stream but designed to minimize
-// copying.
-class PROTOBUF_EXPORT ZeroCopyInputStream {
- public:
-  ZeroCopyInputStream() {}
-  virtual ~ZeroCopyInputStream() {}
-
-  // Obtains a chunk of data from the stream.
-  //
-  // Preconditions:
-  // * "size" and "data" are not NULL.
-  //
-  // Postconditions:
-  // * If the returned value is false, there is no more data to return or
-  //   an error occurred.  All errors are permanent.
-  // * Otherwise, "size" points to the actual number of bytes read and "data"
-  //   points to a pointer to a buffer containing these bytes.
-  // * Ownership of this buffer remains with the stream, and the buffer
-  //   remains valid only until some other method of the stream is called
-  //   or the stream is destroyed.
-  // * It is legal for the returned buffer to have zero size, as long
-  //   as repeatedly calling Next() eventually yields a buffer with non-zero
-  //   size.
-  virtual bool Next(const void** data, int* size) = 0;
-
-  // Backs up a number of bytes, so that the next call to Next() returns
-  // data again that was already returned by the last call to Next().  This
-  // is useful when writing procedures that are only supposed to read up
-  // to a certain point in the input, then return.  If Next() returns a
-  // buffer that goes beyond what you wanted to read, you can use BackUp()
-  // to return to the point where you intended to finish.
-  //
-  // This method can be called with `count = 0` to finalize (flush) any
-  // previously returned buffer. For example, a file output stream can
-  // flush buffers returned from a previous call to Next() upon such
-  // BackUp(0) invocations. ZeroCopyOutputStream callers should always
-  // invoke BackUp() after a final Next() call, even if there is no
-  // excess buffer data to be backed up to indicate a flush point.
-  //
-  // Preconditions:
-  // * The last method called must have been Next().
-  // * count must be less than or equal to the size of the last buffer
-  //   returned by Next().
-  //
-  // Postconditions:
-  // * The last "count" bytes of the last buffer returned by Next() will be
-  //   pushed back into the stream.  Subsequent calls to Next() will return
-  //   the same data again before producing new data.
-  virtual void BackUp(int count) = 0;
-
-  // Skips a number of bytes.  Returns false if the end of the stream is
-  // reached or some input error occurred.  In the end-of-stream case, the
-  // stream is advanced to the end of the stream (so ByteCount() will return
-  // the total size of the stream).
-  virtual bool Skip(int count) = 0;
-
-  // Returns the total number of bytes read since this object was created.
-  virtual int64_t ByteCount() const = 0;
-
-
- private:
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(ZeroCopyInputStream);
-};
-
-// Abstract interface similar to an output stream but designed to minimize
-// copying.
-class PROTOBUF_EXPORT ZeroCopyOutputStream {
- public:
-  ZeroCopyOutputStream() {}
-  virtual ~ZeroCopyOutputStream() {}
-
-  // Obtains a buffer into which data can be written.  Any data written
-  // into this buffer will eventually (maybe instantly, maybe later on)
-  // be written to the output.
-  //
-  // Preconditions:
-  // * "size" and "data" are not NULL.
-  //
-  // Postconditions:
-  // * If the returned value is false, an error occurred.  All errors are
-  //   permanent.
-  // * Otherwise, "size" points to the actual number of bytes in the buffer
-  //   and "data" points to the buffer.
-  // * Ownership of this buffer remains with the stream, and the buffer
-  //   remains valid only until some other method of the stream is called
-  //   or the stream is destroyed.
-  // * Any data which the caller stores in this buffer will eventually be
-  //   written to the output (unless BackUp() is called).
-  // * It is legal for the returned buffer to have zero size, as long
-  //   as repeatedly calling Next() eventually yields a buffer with non-zero
-  //   size.
-  virtual bool Next(void** data, int* size) = 0;
-
-  // Backs up a number of bytes, so that the end of the last buffer returned
-  // by Next() is not actually written.  This is needed when you finish
-  // writing all the data you want to write, but the last buffer was bigger
-  // than you needed.  You don't want to write a bunch of garbage after the
-  // end of your data, so you use BackUp() to back up.
-  //
-  // Preconditions:
-  // * The last method called must have been Next().
-  // * count must be less than or equal to the size of the last buffer
-  //   returned by Next().
-  // * The caller must not have written anything to the last "count" bytes
-  //   of that buffer.
-  //
-  // Postconditions:
-  // * The last "count" bytes of the last buffer returned by Next() will be
-  //   ignored.
-  virtual void BackUp(int count) = 0;
-
-  // Returns the total number of bytes written since this object was created.
-  virtual int64_t ByteCount() const = 0;
-
-  // Write a given chunk of data to the output.  Some output streams may
-  // implement this in a way that avoids copying. Check AllowsAliasing() before
-  // calling WriteAliasedRaw(). It will GOOGLE_CHECK fail if WriteAliasedRaw() is
-  // called on a stream that does not allow aliasing.
-  //
-  // NOTE: It is caller's responsibility to ensure that the chunk of memory
-  // remains live until all of the data has been consumed from the stream.
-  virtual bool WriteAliasedRaw(const void* data, int size);
-  virtual bool AllowsAliasing() const { return false; }
-
-
- private:
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(ZeroCopyOutputStream);
-};
-
-}  // namespace io
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
-
-#endif  // GOOGLE_PROTOBUF_IO_ZERO_COPY_STREAM_H__
diff --git a/libs/protobuf/src/google/protobuf/io/zero_copy_stream_impl.cc b/libs/protobuf/src/google/protobuf/io/zero_copy_stream_impl.cc
deleted file mode 100644
index c66bc86..0000000
--- a/libs/protobuf/src/google/protobuf/io/zero_copy_stream_impl.cc
+++ /dev/null
@@ -1,372 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-
-#ifndef _MSC_VER
-#include <fcntl.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <unistd.h>
-#endif
-#include <errno.h>
-
-#include <algorithm>
-#include <iostream>
-
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/stubs/logging.h>
-#include <google/protobuf/io/io_win32.h>
-#include <google/protobuf/io/zero_copy_stream_impl.h>
-#include <google/protobuf/stubs/stl_util.h>
-
-
-namespace google {
-namespace protobuf {
-namespace io {
-
-#ifdef _WIN32
-// Win32 lseek is broken:  If invoked on a non-seekable file descriptor, its
-// return value is undefined.  We re-define it to always produce an error.
-#define lseek(fd, offset, origin) ((off_t)-1)
-// DO NOT include <io.h>, instead create functions in io_win32.{h,cc} and import
-// them like we do below.
-using google::protobuf::io::win32::access;
-using google::protobuf::io::win32::close;
-using google::protobuf::io::win32::open;
-using google::protobuf::io::win32::read;
-using google::protobuf::io::win32::write;
-#endif
-
-namespace {
-
-// EINTR sucks.
-int close_no_eintr(int fd) {
-  int result;
-  do {
-    result = close(fd);
-  } while (result < 0 && errno == EINTR);
-  return result;
-}
-
-}  // namespace
-
-// ===================================================================
-
-FileInputStream::FileInputStream(int file_descriptor, int block_size)
-    : copying_input_(file_descriptor), impl_(&copying_input_, block_size) {}
-
-bool FileInputStream::Close() { return copying_input_.Close(); }
-
-bool FileInputStream::Next(const void** data, int* size) {
-  return impl_.Next(data, size);
-}
-
-void FileInputStream::BackUp(int count) { impl_.BackUp(count); }
-
-bool FileInputStream::Skip(int count) { return impl_.Skip(count); }
-
-int64_t FileInputStream::ByteCount() const { return impl_.ByteCount(); }
-
-FileInputStream::CopyingFileInputStream::CopyingFileInputStream(
-    int file_descriptor)
-    : file_(file_descriptor),
-      close_on_delete_(false),
-      is_closed_(false),
-      errno_(0),
-      previous_seek_failed_(false) {
-#ifndef _WIN32
-  int flags = fcntl(file_, F_GETFL);
-  flags &= ~O_NONBLOCK;
-  fcntl(file_, F_SETFL, flags);
-#endif
-}
-
-FileInputStream::CopyingFileInputStream::~CopyingFileInputStream() {
-  if (close_on_delete_) {
-    if (!Close()) {
-      GOOGLE_LOG(ERROR) << "close() failed: " << strerror(errno_);
-    }
-  }
-}
-
-bool FileInputStream::CopyingFileInputStream::Close() {
-  GOOGLE_CHECK(!is_closed_);
-
-  is_closed_ = true;
-  if (close_no_eintr(file_) != 0) {
-    // The docs on close() do not specify whether a file descriptor is still
-    // open after close() fails with EIO.  However, the glibc source code
-    // seems to indicate that it is not.
-    errno_ = errno;
-    return false;
-  }
-
-  return true;
-}
-
-int FileInputStream::CopyingFileInputStream::Read(void* buffer, int size) {
-  GOOGLE_CHECK(!is_closed_);
-
-  int result;
-  do {
-    result = read(file_, buffer, size);
-  } while (result < 0 && errno == EINTR);
-
-  if (result < 0) {
-    // Read error (not EOF).
-    errno_ = errno;
-  }
-
-  return result;
-}
-
-int FileInputStream::CopyingFileInputStream::Skip(int count) {
-  GOOGLE_CHECK(!is_closed_);
-
-  if (!previous_seek_failed_ && lseek(file_, count, SEEK_CUR) != (off_t)-1) {
-    // Seek succeeded.
-    return count;
-  } else {
-    // Failed to seek.
-
-    // Note to self:  Don't seek again.  This file descriptor doesn't
-    // support it.
-    previous_seek_failed_ = true;
-
-    // Use the default implementation.
-    return CopyingInputStream::Skip(count);
-  }
-}
-
-// ===================================================================
-
-FileOutputStream::FileOutputStream(int file_descriptor, int /*block_size*/)
-    : CopyingOutputStreamAdaptor(&copying_output_),
-      copying_output_(file_descriptor) {}
-
-bool FileOutputStream::Close() {
-  bool flush_succeeded = Flush();
-  return copying_output_.Close() && flush_succeeded;
-}
-
-FileOutputStream::CopyingFileOutputStream::CopyingFileOutputStream(
-    int file_descriptor)
-    : file_(file_descriptor),
-      close_on_delete_(false),
-      is_closed_(false),
-      errno_(0) {}
-
-FileOutputStream::~FileOutputStream() { Flush(); }
-
-FileOutputStream::CopyingFileOutputStream::~CopyingFileOutputStream() {
-  if (close_on_delete_) {
-    if (!Close()) {
-      GOOGLE_LOG(ERROR) << "close() failed: " << strerror(errno_);
-    }
-  }
-}
-
-bool FileOutputStream::CopyingFileOutputStream::Close() {
-  GOOGLE_CHECK(!is_closed_);
-
-  is_closed_ = true;
-  if (close_no_eintr(file_) != 0) {
-    // The docs on close() do not specify whether a file descriptor is still
-    // open after close() fails with EIO.  However, the glibc source code
-    // seems to indicate that it is not.
-    errno_ = errno;
-    return false;
-  }
-
-  return true;
-}
-
-bool FileOutputStream::CopyingFileOutputStream::Write(const void* buffer,
-                                                      int size) {
-  GOOGLE_CHECK(!is_closed_);
-  int total_written = 0;
-
-  const uint8_t* buffer_base = reinterpret_cast<const uint8_t*>(buffer);
-
-  while (total_written < size) {
-    int bytes;
-    do {
-      bytes = write(file_, buffer_base + total_written, size - total_written);
-    } while (bytes < 0 && errno == EINTR);
-
-    if (bytes <= 0) {
-      // Write error.
-
-      // FIXME(kenton):  According to the man page, if write() returns zero,
-      //   there was no error; write() simply did not write anything.  It's
-      //   unclear under what circumstances this might happen, but presumably
-      //   errno won't be set in this case.  I am confused as to how such an
-      //   event should be handled.  For now I'm treating it as an error, since
-      //   retrying seems like it could lead to an infinite loop.  I suspect
-      //   this never actually happens anyway.
-
-      if (bytes < 0) {
-        errno_ = errno;
-      }
-      return false;
-    }
-    total_written += bytes;
-  }
-
-  return true;
-}
-
-// ===================================================================
-
-IstreamInputStream::IstreamInputStream(std::istream* input, int block_size)
-    : copying_input_(input), impl_(&copying_input_, block_size) {}
-
-bool IstreamInputStream::Next(const void** data, int* size) {
-  return impl_.Next(data, size);
-}
-
-void IstreamInputStream::BackUp(int count) { impl_.BackUp(count); }
-
-bool IstreamInputStream::Skip(int count) { return impl_.Skip(count); }
-
-int64_t IstreamInputStream::ByteCount() const { return impl_.ByteCount(); }
-
-IstreamInputStream::CopyingIstreamInputStream::CopyingIstreamInputStream(
-    std::istream* input)
-    : input_(input) {}
-
-IstreamInputStream::CopyingIstreamInputStream::~CopyingIstreamInputStream() {}
-
-int IstreamInputStream::CopyingIstreamInputStream::Read(void* buffer,
-                                                        int size) {
-  input_->read(reinterpret_cast<char*>(buffer), size);
-  int result = input_->gcount();
-  if (result == 0 && input_->fail() && !input_->eof()) {
-    return -1;
-  }
-  return result;
-}
-
-// ===================================================================
-
-OstreamOutputStream::OstreamOutputStream(std::ostream* output, int block_size)
-    : copying_output_(output), impl_(&copying_output_, block_size) {}
-
-OstreamOutputStream::~OstreamOutputStream() { impl_.Flush(); }
-
-bool OstreamOutputStream::Next(void** data, int* size) {
-  return impl_.Next(data, size);
-}
-
-void OstreamOutputStream::BackUp(int count) { impl_.BackUp(count); }
-
-int64_t OstreamOutputStream::ByteCount() const { return impl_.ByteCount(); }
-
-OstreamOutputStream::CopyingOstreamOutputStream::CopyingOstreamOutputStream(
-    std::ostream* output)
-    : output_(output) {}
-
-OstreamOutputStream::CopyingOstreamOutputStream::~CopyingOstreamOutputStream() {
-}
-
-bool OstreamOutputStream::CopyingOstreamOutputStream::Write(const void* buffer,
-                                                            int size) {
-  output_->write(reinterpret_cast<const char*>(buffer), size);
-  return output_->good();
-}
-
-// ===================================================================
-
-ConcatenatingInputStream::ConcatenatingInputStream(
-    ZeroCopyInputStream* const streams[], int count)
-    : streams_(streams), stream_count_(count), bytes_retired_(0) {
-}
-
-bool ConcatenatingInputStream::Next(const void** data, int* size) {
-  while (stream_count_ > 0) {
-    if (streams_[0]->Next(data, size)) return true;
-
-    // That stream is done.  Advance to the next one.
-    bytes_retired_ += streams_[0]->ByteCount();
-    ++streams_;
-    --stream_count_;
-  }
-
-  // No more streams.
-  return false;
-}
-
-void ConcatenatingInputStream::BackUp(int count) {
-  if (stream_count_ > 0) {
-    streams_[0]->BackUp(count);
-  } else {
-    GOOGLE_LOG(DFATAL) << "Can't BackUp() after failed Next().";
-  }
-}
-
-bool ConcatenatingInputStream::Skip(int count) {
-  while (stream_count_ > 0) {
-    // Assume that ByteCount() can be used to find out how much we actually
-    // skipped when Skip() fails.
-    int64_t target_byte_count = streams_[0]->ByteCount() + count;
-    if (streams_[0]->Skip(count)) return true;
-
-    // Hit the end of the stream.  Figure out how many more bytes we still have
-    // to skip.
-    int64_t final_byte_count = streams_[0]->ByteCount();
-    GOOGLE_DCHECK_LT(final_byte_count, target_byte_count);
-    count = target_byte_count - final_byte_count;
-
-    // That stream is done.  Advance to the next one.
-    bytes_retired_ += final_byte_count;
-    ++streams_;
-    --stream_count_;
-  }
-
-  return false;
-}
-
-int64_t ConcatenatingInputStream::ByteCount() const {
-  if (stream_count_ == 0) {
-    return bytes_retired_;
-  } else {
-    return bytes_retired_ + streams_[0]->ByteCount();
-  }
-}
-
-
-// ===================================================================
-
-}  // namespace io
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h b/libs/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h
deleted file mode 100644
index a385992..0000000
--- a/libs/protobuf/src/google/protobuf/io/zero_copy_stream_impl.h
+++ /dev/null
@@ -1,336 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-//
-// This file contains common implementations of the interfaces defined in
-// zero_copy_stream.h which are only included in the full (non-lite)
-// protobuf library.  These implementations include Unix file descriptors
-// and C++ iostreams.  See also:  zero_copy_stream_impl_lite.h
-
-#ifndef GOOGLE_PROTOBUF_IO_ZERO_COPY_STREAM_IMPL_H__
-#define GOOGLE_PROTOBUF_IO_ZERO_COPY_STREAM_IMPL_H__
-
-
-#include <iosfwd>
-#include <string>
-
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/io/zero_copy_stream.h>
-#include <google/protobuf/io/zero_copy_stream_impl_lite.h>
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-namespace io {
-
-// ===================================================================
-
-// A ZeroCopyInputStream which reads from a file descriptor.
-//
-// FileInputStream is preferred over using an ifstream with IstreamInputStream.
-// The latter will introduce an extra layer of buffering, harming performance.
-// Also, it's conceivable that FileInputStream could someday be enhanced
-// to use zero-copy file descriptors on OSs which support them.
-class PROTOBUF_EXPORT FileInputStream PROTOBUF_FUTURE_FINAL
-    : public ZeroCopyInputStream {
- public:
-  // Creates a stream that reads from the given Unix file descriptor.
-  // If a block_size is given, it specifies the number of bytes that
-  // should be read and returned with each call to Next().  Otherwise,
-  // a reasonable default is used.
-  explicit FileInputStream(int file_descriptor, int block_size = -1);
-
-  // Flushes any buffers and closes the underlying file.  Returns false if
-  // an error occurs during the process; use GetErrno() to examine the error.
-  // Even if an error occurs, the file descriptor is closed when this returns.
-  bool Close();
-
-  // By default, the file descriptor is not closed when the stream is
-  // destroyed.  Call SetCloseOnDelete(true) to change that.  WARNING:
-  // This leaves no way for the caller to detect if close() fails.  If
-  // detecting close() errors is important to you, you should arrange
-  // to close the descriptor yourself.
-  void SetCloseOnDelete(bool value) { copying_input_.SetCloseOnDelete(value); }
-
-  // If an I/O error has occurred on this file descriptor, this is the
-  // errno from that error.  Otherwise, this is zero.  Once an error
-  // occurs, the stream is broken and all subsequent operations will
-  // fail.
-  int GetErrno() const { return copying_input_.GetErrno(); }
-
-  // implements ZeroCopyInputStream ----------------------------------
-  bool Next(const void** data, int* size) override;
-  void BackUp(int count) override;
-  bool Skip(int count) override;
-  int64_t ByteCount() const override;
-
- private:
-  class PROTOBUF_EXPORT CopyingFileInputStream PROTOBUF_FUTURE_FINAL
-      : public CopyingInputStream {
-   public:
-    CopyingFileInputStream(int file_descriptor);
-    ~CopyingFileInputStream() override;
-
-    bool Close();
-    void SetCloseOnDelete(bool value) { close_on_delete_ = value; }
-    int GetErrno() const { return errno_; }
-
-    // implements CopyingInputStream ---------------------------------
-    int Read(void* buffer, int size) override;
-    int Skip(int count) override;
-
-   private:
-    // The file descriptor.
-    const int file_;
-    bool close_on_delete_;
-    bool is_closed_;
-
-    // The errno of the I/O error, if one has occurred.  Otherwise, zero.
-    int errno_;
-
-    // Did we try to seek once and fail?  If so, we assume this file descriptor
-    // doesn't support seeking and won't try again.
-    bool previous_seek_failed_;
-
-    GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(CopyingFileInputStream);
-  };
-
-  CopyingFileInputStream copying_input_;
-  CopyingInputStreamAdaptor impl_;
-
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(FileInputStream);
-};
-
-// ===================================================================
-
-// A ZeroCopyOutputStream which writes to a file descriptor.
-//
-// FileOutputStream is preferred over using an ofstream with
-// OstreamOutputStream.  The latter will introduce an extra layer of buffering,
-// harming performance.  Also, it's conceivable that FileOutputStream could
-// someday be enhanced to use zero-copy file descriptors on OSs which
-// support them.
-class PROTOBUF_EXPORT FileOutputStream PROTOBUF_FUTURE_FINAL
-    : public CopyingOutputStreamAdaptor {
- public:
-  // Creates a stream that writes to the given Unix file descriptor.
-  // If a block_size is given, it specifies the size of the buffers
-  // that should be returned by Next().  Otherwise, a reasonable default
-  // is used.
-  explicit FileOutputStream(int file_descriptor, int block_size = -1);
-
-  ~FileOutputStream() override;
-
-  // Flushes any buffers and closes the underlying file.  Returns false if
-  // an error occurs during the process; use GetErrno() to examine the error.
-  // Even if an error occurs, the file descriptor is closed when this returns.
-  bool Close();
-
-  // By default, the file descriptor is not closed when the stream is
-  // destroyed.  Call SetCloseOnDelete(true) to change that.  WARNING:
-  // This leaves no way for the caller to detect if close() fails.  If
-  // detecting close() errors is important to you, you should arrange
-  // to close the descriptor yourself.
-  void SetCloseOnDelete(bool value) { copying_output_.SetCloseOnDelete(value); }
-
-  // If an I/O error has occurred on this file descriptor, this is the
-  // errno from that error.  Otherwise, this is zero.  Once an error
-  // occurs, the stream is broken and all subsequent operations will
-  // fail.
-  int GetErrno() const { return copying_output_.GetErrno(); }
-
- private:
-  class PROTOBUF_EXPORT CopyingFileOutputStream PROTOBUF_FUTURE_FINAL
-      : public CopyingOutputStream {
-   public:
-    CopyingFileOutputStream(int file_descriptor);
-    ~CopyingFileOutputStream() override;
-
-    bool Close();
-    void SetCloseOnDelete(bool value) { close_on_delete_ = value; }
-    int GetErrno() const { return errno_; }
-
-    // implements CopyingOutputStream --------------------------------
-    bool Write(const void* buffer, int size) override;
-
-   private:
-    // The file descriptor.
-    const int file_;
-    bool close_on_delete_;
-    bool is_closed_;
-
-    // The errno of the I/O error, if one has occurred.  Otherwise, zero.
-    int errno_;
-
-    GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(CopyingFileOutputStream);
-  };
-
-  CopyingFileOutputStream copying_output_;
-
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(FileOutputStream);
-};
-
-// ===================================================================
-
-// A ZeroCopyInputStream which reads from a C++ istream.
-//
-// Note that for reading files (or anything represented by a file descriptor),
-// FileInputStream is more efficient.
-class PROTOBUF_EXPORT IstreamInputStream PROTOBUF_FUTURE_FINAL
-    : public ZeroCopyInputStream {
- public:
-  // Creates a stream that reads from the given C++ istream.
-  // If a block_size is given, it specifies the number of bytes that
-  // should be read and returned with each call to Next().  Otherwise,
-  // a reasonable default is used.
-  explicit IstreamInputStream(std::istream* stream, int block_size = -1);
-
-  // implements ZeroCopyInputStream ----------------------------------
-  bool Next(const void** data, int* size) override;
-  void BackUp(int count) override;
-  bool Skip(int count) override;
-  int64_t ByteCount() const override;
-
- private:
-  class PROTOBUF_EXPORT CopyingIstreamInputStream PROTOBUF_FUTURE_FINAL
-      : public CopyingInputStream {
-   public:
-    CopyingIstreamInputStream(std::istream* input);
-    ~CopyingIstreamInputStream() override;
-
-    // implements CopyingInputStream ---------------------------------
-    int Read(void* buffer, int size) override;
-    // (We use the default implementation of Skip().)
-
-   private:
-    // The stream.
-    std::istream* input_;
-
-    GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(CopyingIstreamInputStream);
-  };
-
-  CopyingIstreamInputStream copying_input_;
-  CopyingInputStreamAdaptor impl_;
-
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(IstreamInputStream);
-};
-
-// ===================================================================
-
-// A ZeroCopyOutputStream which writes to a C++ ostream.
-//
-// Note that for writing files (or anything represented by a file descriptor),
-// FileOutputStream is more efficient.
-class PROTOBUF_EXPORT OstreamOutputStream PROTOBUF_FUTURE_FINAL
-    : public ZeroCopyOutputStream {
- public:
-  // Creates a stream that writes to the given C++ ostream.
-  // If a block_size is given, it specifies the size of the buffers
-  // that should be returned by Next().  Otherwise, a reasonable default
-  // is used.
-  explicit OstreamOutputStream(std::ostream* stream, int block_size = -1);
-  ~OstreamOutputStream() override;
-
-  // implements ZeroCopyOutputStream ---------------------------------
-  bool Next(void** data, int* size) override;
-  void BackUp(int count) override;
-  int64_t ByteCount() const override;
-
- private:
-  class PROTOBUF_EXPORT CopyingOstreamOutputStream PROTOBUF_FUTURE_FINAL
-      : public CopyingOutputStream {
-   public:
-    CopyingOstreamOutputStream(std::ostream* output);
-    ~CopyingOstreamOutputStream() override;
-
-    // implements CopyingOutputStream --------------------------------
-    bool Write(const void* buffer, int size) override;
-
-   private:
-    // The stream.
-    std::ostream* output_;
-
-    GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(CopyingOstreamOutputStream);
-  };
-
-  CopyingOstreamOutputStream copying_output_;
-  CopyingOutputStreamAdaptor impl_;
-
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(OstreamOutputStream);
-};
-
-// ===================================================================
-
-// A ZeroCopyInputStream which reads from several other streams in sequence.
-// ConcatenatingInputStream is unable to distinguish between end-of-stream
-// and read errors in the underlying streams, so it assumes any errors mean
-// end-of-stream.  So, if the underlying streams fail for any other reason,
-// ConcatenatingInputStream may do odd things.  It is suggested that you do
-// not use ConcatenatingInputStream on streams that might produce read errors
-// other than end-of-stream.
-class PROTOBUF_EXPORT ConcatenatingInputStream PROTOBUF_FUTURE_FINAL
-    : public ZeroCopyInputStream {
- public:
-  // All streams passed in as well as the array itself must remain valid
-  // until the ConcatenatingInputStream is destroyed.
-  ConcatenatingInputStream(ZeroCopyInputStream* const streams[], int count);
-  ~ConcatenatingInputStream() override = default;
-
-  // implements ZeroCopyInputStream ----------------------------------
-  bool Next(const void** data, int* size) override;
-  void BackUp(int count) override;
-  bool Skip(int count) override;
-  int64_t ByteCount() const override;
-
-
- private:
-  // As streams are retired, streams_ is incremented and count_ is
-  // decremented.
-  ZeroCopyInputStream* const* streams_;
-  int stream_count_;
-  int64_t bytes_retired_;  // Bytes read from previous streams.
-
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(ConcatenatingInputStream);
-};
-
-// ===================================================================
-
-}  // namespace io
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
-
-#endif  // GOOGLE_PROTOBUF_IO_ZERO_COPY_STREAM_IMPL_H__
diff --git a/libs/protobuf/src/google/protobuf/io/zero_copy_stream_impl_lite.cc b/libs/protobuf/src/google/protobuf/io/zero_copy_stream_impl_lite.cc
deleted file mode 100644
index b3dfd84..0000000
--- a/libs/protobuf/src/google/protobuf/io/zero_copy_stream_impl_lite.cc
+++ /dev/null
@@ -1,470 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-
-#include <google/protobuf/io/zero_copy_stream_impl_lite.h>
-
-#include <algorithm>
-#include <limits>
-
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/stubs/logging.h>
-#include <google/protobuf/stubs/casts.h>
-#include <google/protobuf/stubs/stl_util.h>
-
-namespace google {
-namespace protobuf {
-namespace io {
-
-namespace {
-
-// Default block size for Copying{In,Out}putStreamAdaptor.
-static const int kDefaultBlockSize = 8192;
-
-}  // namespace
-
-// ===================================================================
-
-ArrayInputStream::ArrayInputStream(const void* data, int size, int block_size)
-    : data_(reinterpret_cast<const uint8_t*>(data)),
-      size_(size),
-      block_size_(block_size > 0 ? block_size : size),
-      position_(0),
-      last_returned_size_(0) {}
-
-bool ArrayInputStream::Next(const void** data, int* size) {
-  if (position_ < size_) {
-    last_returned_size_ = std::min(block_size_, size_ - position_);
-    *data = data_ + position_;
-    *size = last_returned_size_;
-    position_ += last_returned_size_;
-    return true;
-  } else {
-    // We're at the end of the array.
-    last_returned_size_ = 0;  // Don't let caller back up.
-    return false;
-  }
-}
-
-void ArrayInputStream::BackUp(int count) {
-  GOOGLE_CHECK_GT(last_returned_size_, 0)
-      << "BackUp() can only be called after a successful Next().";
-  GOOGLE_CHECK_LE(count, last_returned_size_);
-  GOOGLE_CHECK_GE(count, 0);
-  position_ -= count;
-  last_returned_size_ = 0;  // Don't let caller back up further.
-}
-
-bool ArrayInputStream::Skip(int count) {
-  GOOGLE_CHECK_GE(count, 0);
-  last_returned_size_ = 0;  // Don't let caller back up.
-  if (count > size_ - position_) {
-    position_ = size_;
-    return false;
-  } else {
-    position_ += count;
-    return true;
-  }
-}
-
-int64_t ArrayInputStream::ByteCount() const { return position_; }
-
-
-// ===================================================================
-
-ArrayOutputStream::ArrayOutputStream(void* data, int size, int block_size)
-    : data_(reinterpret_cast<uint8_t*>(data)),
-      size_(size),
-      block_size_(block_size > 0 ? block_size : size),
-      position_(0),
-      last_returned_size_(0) {}
-
-bool ArrayOutputStream::Next(void** data, int* size) {
-  if (position_ < size_) {
-    last_returned_size_ = std::min(block_size_, size_ - position_);
-    *data = data_ + position_;
-    *size = last_returned_size_;
-    position_ += last_returned_size_;
-    return true;
-  } else {
-    // We're at the end of the array.
-    last_returned_size_ = 0;  // Don't let caller back up.
-    return false;
-  }
-}
-
-void ArrayOutputStream::BackUp(int count) {
-  GOOGLE_CHECK_LE(count, last_returned_size_)
-      << "BackUp() can not exceed the size of the last Next() call.";
-  GOOGLE_CHECK_GE(count, 0);
-  position_ -= count;
-  last_returned_size_ -= count;
-}
-
-int64_t ArrayOutputStream::ByteCount() const { return position_; }
-
-// ===================================================================
-
-StringOutputStream::StringOutputStream(std::string* target) : target_(target) {}
-
-bool StringOutputStream::Next(void** data, int* size) {
-  GOOGLE_CHECK(target_ != NULL);
-  size_t old_size = target_->size();
-
-  // Grow the string.
-  size_t new_size;
-  if (old_size < target_->capacity()) {
-    // Resize the string to match its capacity, since we can get away
-    // without a memory allocation this way.
-    new_size = target_->capacity();
-  } else {
-    // Size has reached capacity, try to double it.
-    new_size = old_size * 2;
-  }
-  // Avoid integer overflow in returned '*size'.
-  new_size = std::min(new_size, old_size + std::numeric_limits<int>::max());
-  // Increase the size, also make sure that it is at least kMinimumSize.
-  STLStringResizeUninitialized(
-      target_,
-      std::max(new_size,
-               kMinimumSize + 0));  // "+ 0" works around GCC4 weirdness.
-
-  *data = mutable_string_data(target_) + old_size;
-  *size = target_->size() - old_size;
-  return true;
-}
-
-void StringOutputStream::BackUp(int count) {
-  GOOGLE_CHECK_GE(count, 0);
-  GOOGLE_CHECK(target_ != NULL);
-  GOOGLE_CHECK_LE(static_cast<size_t>(count), target_->size());
-  target_->resize(target_->size() - count);
-}
-
-int64_t StringOutputStream::ByteCount() const {
-  GOOGLE_CHECK(target_ != NULL);
-  return target_->size();
-}
-
-// ===================================================================
-
-int CopyingInputStream::Skip(int count) {
-  char junk[4096];
-  int skipped = 0;
-  while (skipped < count) {
-    int bytes = Read(junk, std::min(count - skipped,
-                                    implicit_cast<int>(sizeof(junk))));
-    if (bytes <= 0) {
-      // EOF or read error.
-      return skipped;
-    }
-    skipped += bytes;
-  }
-  return skipped;
-}
-
-CopyingInputStreamAdaptor::CopyingInputStreamAdaptor(
-    CopyingInputStream* copying_stream, int block_size)
-    : copying_stream_(copying_stream),
-      owns_copying_stream_(false),
-      failed_(false),
-      position_(0),
-      buffer_size_(block_size > 0 ? block_size : kDefaultBlockSize),
-      buffer_used_(0),
-      backup_bytes_(0) {}
-
-CopyingInputStreamAdaptor::~CopyingInputStreamAdaptor() {
-  if (owns_copying_stream_) {
-    delete copying_stream_;
-  }
-}
-
-bool CopyingInputStreamAdaptor::Next(const void** data, int* size) {
-  if (failed_) {
-    // Already failed on a previous read.
-    return false;
-  }
-
-  AllocateBufferIfNeeded();
-
-  if (backup_bytes_ > 0) {
-    // We have data left over from a previous BackUp(), so just return that.
-    *data = buffer_.get() + buffer_used_ - backup_bytes_;
-    *size = backup_bytes_;
-    backup_bytes_ = 0;
-    return true;
-  }
-
-  // Read new data into the buffer.
-  buffer_used_ = copying_stream_->Read(buffer_.get(), buffer_size_);
-  if (buffer_used_ <= 0) {
-    // EOF or read error.  We don't need the buffer anymore.
-    if (buffer_used_ < 0) {
-      // Read error (not EOF).
-      failed_ = true;
-    }
-    FreeBuffer();
-    return false;
-  }
-  position_ += buffer_used_;
-
-  *size = buffer_used_;
-  *data = buffer_.get();
-  return true;
-}
-
-void CopyingInputStreamAdaptor::BackUp(int count) {
-  GOOGLE_CHECK(backup_bytes_ == 0 && buffer_.get() != NULL)
-      << " BackUp() can only be called after Next().";
-  GOOGLE_CHECK_LE(count, buffer_used_)
-      << " Can't back up over more bytes than were returned by the last call"
-         " to Next().";
-  GOOGLE_CHECK_GE(count, 0) << " Parameter to BackUp() can't be negative.";
-
-  backup_bytes_ = count;
-}
-
-bool CopyingInputStreamAdaptor::Skip(int count) {
-  GOOGLE_CHECK_GE(count, 0);
-
-  if (failed_) {
-    // Already failed on a previous read.
-    return false;
-  }
-
-  // First skip any bytes left over from a previous BackUp().
-  if (backup_bytes_ >= count) {
-    // We have more data left over than we're trying to skip.  Just chop it.
-    backup_bytes_ -= count;
-    return true;
-  }
-
-  count -= backup_bytes_;
-  backup_bytes_ = 0;
-
-  int skipped = copying_stream_->Skip(count);
-  position_ += skipped;
-  return skipped == count;
-}
-
-int64_t CopyingInputStreamAdaptor::ByteCount() const {
-  return position_ - backup_bytes_;
-}
-
-void CopyingInputStreamAdaptor::AllocateBufferIfNeeded() {
-  if (buffer_.get() == NULL) {
-    buffer_.reset(new uint8_t[buffer_size_]);
-  }
-}
-
-void CopyingInputStreamAdaptor::FreeBuffer() {
-  GOOGLE_CHECK_EQ(backup_bytes_, 0);
-  buffer_used_ = 0;
-  buffer_.reset();
-}
-
-// ===================================================================
-
-CopyingOutputStreamAdaptor::CopyingOutputStreamAdaptor(
-    CopyingOutputStream* copying_stream, int block_size)
-    : copying_stream_(copying_stream),
-      owns_copying_stream_(false),
-      failed_(false),
-      position_(0),
-      buffer_size_(block_size > 0 ? block_size : kDefaultBlockSize),
-      buffer_used_(0) {}
-
-CopyingOutputStreamAdaptor::~CopyingOutputStreamAdaptor() {
-  WriteBuffer();
-  if (owns_copying_stream_) {
-    delete copying_stream_;
-  }
-}
-
-bool CopyingOutputStreamAdaptor::Flush() { return WriteBuffer(); }
-
-bool CopyingOutputStreamAdaptor::Next(void** data, int* size) {
-  if (buffer_used_ == buffer_size_) {
-    if (!WriteBuffer()) return false;
-  }
-
-  AllocateBufferIfNeeded();
-
-  *data = buffer_.get() + buffer_used_;
-  *size = buffer_size_ - buffer_used_;
-  buffer_used_ = buffer_size_;
-  return true;
-}
-
-void CopyingOutputStreamAdaptor::BackUp(int count) {
-  if (count == 0) {
-    Flush();
-    return;
-  }
-  GOOGLE_CHECK_GE(count, 0);
-  GOOGLE_CHECK_EQ(buffer_used_, buffer_size_)
-      << " BackUp() can only be called after Next().";
-  GOOGLE_CHECK_LE(count, buffer_used_)
-      << " Can't back up over more bytes than were returned by the last call"
-         " to Next().";
-
-  buffer_used_ -= count;
-}
-
-int64_t CopyingOutputStreamAdaptor::ByteCount() const {
-  return position_ + buffer_used_;
-}
-
-bool CopyingOutputStreamAdaptor::WriteAliasedRaw(const void* data, int size) {
-  if (size >= buffer_size_) {
-    if (!Flush() || !copying_stream_->Write(data, size)) {
-      return false;
-    }
-    GOOGLE_DCHECK_EQ(buffer_used_, 0);
-    position_ += size;
-    return true;
-  }
-
-  void* out;
-  int out_size;
-  while (true) {
-    if (!Next(&out, &out_size)) {
-      return false;
-    }
-
-    if (size <= out_size) {
-      std::memcpy(out, data, size);
-      BackUp(out_size - size);
-      return true;
-    }
-
-    std::memcpy(out, data, out_size);
-    data = static_cast<const char*>(data) + out_size;
-    size -= out_size;
-  }
-  return true;
-}
-
-
-bool CopyingOutputStreamAdaptor::WriteBuffer() {
-  if (failed_) {
-    // Already failed on a previous write.
-    return false;
-  }
-
-  if (buffer_used_ == 0) return true;
-
-  if (copying_stream_->Write(buffer_.get(), buffer_used_)) {
-    position_ += buffer_used_;
-    buffer_used_ = 0;
-    return true;
-  } else {
-    failed_ = true;
-    FreeBuffer();
-    return false;
-  }
-}
-
-void CopyingOutputStreamAdaptor::AllocateBufferIfNeeded() {
-  if (buffer_ == NULL) {
-    buffer_.reset(new uint8_t[buffer_size_]);
-  }
-}
-
-void CopyingOutputStreamAdaptor::FreeBuffer() {
-  buffer_used_ = 0;
-  buffer_.reset();
-}
-
-// ===================================================================
-
-LimitingInputStream::LimitingInputStream(ZeroCopyInputStream* input,
-                                         int64_t limit)
-    : input_(input), limit_(limit) {
-  prior_bytes_read_ = input_->ByteCount();
-}
-
-LimitingInputStream::~LimitingInputStream() {
-  // If we overshot the limit, back up.
-  if (limit_ < 0) input_->BackUp(-limit_);
-}
-
-bool LimitingInputStream::Next(const void** data, int* size) {
-  if (limit_ <= 0) return false;
-  if (!input_->Next(data, size)) return false;
-
-  limit_ -= *size;
-  if (limit_ < 0) {
-    // We overshot the limit.  Reduce *size to hide the rest of the buffer.
-    *size += limit_;
-  }
-  return true;
-}
-
-void LimitingInputStream::BackUp(int count) {
-  if (limit_ < 0) {
-    input_->BackUp(count - limit_);
-    limit_ = count;
-  } else {
-    input_->BackUp(count);
-    limit_ += count;
-  }
-}
-
-bool LimitingInputStream::Skip(int count) {
-  if (count > limit_) {
-    if (limit_ < 0) return false;
-    input_->Skip(limit_);
-    limit_ = 0;
-    return false;
-  } else {
-    if (!input_->Skip(count)) return false;
-    limit_ -= count;
-    return true;
-  }
-}
-
-int64_t LimitingInputStream::ByteCount() const {
-  if (limit_ < 0) {
-    return input_->ByteCount() + limit_ - prior_bytes_read_;
-  } else {
-    return input_->ByteCount() - prior_bytes_read_;
-  }
-}
-
-
-// ===================================================================
-
-}  // namespace io
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/io/zero_copy_stream_impl_lite.h b/libs/protobuf/src/google/protobuf/io/zero_copy_stream_impl_lite.h
deleted file mode 100644
index cbda328..0000000
--- a/libs/protobuf/src/google/protobuf/io/zero_copy_stream_impl_lite.h
+++ /dev/null
@@ -1,413 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-//
-// This file contains common implementations of the interfaces defined in
-// zero_copy_stream.h which are included in the "lite" protobuf library.
-// These implementations cover I/O on raw arrays and strings, as well as
-// adaptors which make it easy to implement streams based on traditional
-// streams.  Of course, many users will probably want to write their own
-// implementations of these interfaces specific to the particular I/O
-// abstractions they prefer to use, but these should cover the most common
-// cases.
-
-#ifndef GOOGLE_PROTOBUF_IO_ZERO_COPY_STREAM_IMPL_LITE_H__
-#define GOOGLE_PROTOBUF_IO_ZERO_COPY_STREAM_IMPL_LITE_H__
-
-
-#include <iosfwd>
-#include <memory>
-#include <string>
-
-#include <google/protobuf/stubs/callback.h>
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/io/zero_copy_stream.h>
-#include <google/protobuf/stubs/stl_util.h>
-
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-namespace io {
-
-// ===================================================================
-
-// A ZeroCopyInputStream backed by an in-memory array of bytes.
-class PROTOBUF_EXPORT ArrayInputStream PROTOBUF_FUTURE_FINAL
-    : public ZeroCopyInputStream {
- public:
-  // Create an InputStream that returns the bytes pointed to by "data".
-  // "data" remains the property of the caller but must remain valid until
-  // the stream is destroyed.  If a block_size is given, calls to Next()
-  // will return data blocks no larger than the given size.  Otherwise, the
-  // first call to Next() returns the entire array.  block_size is mainly
-  // useful for testing; in production you would probably never want to set
-  // it.
-  ArrayInputStream(const void* data, int size, int block_size = -1);
-  ~ArrayInputStream() override = default;
-
-  // implements ZeroCopyInputStream ----------------------------------
-  bool Next(const void** data, int* size) override;
-  void BackUp(int count) override;
-  bool Skip(int count) override;
-  int64_t ByteCount() const override;
-
-
- private:
-  const uint8_t* const data_;  // The byte array.
-  const int size_;           // Total size of the array.
-  const int block_size_;     // How many bytes to return at a time.
-
-  int position_;
-  int last_returned_size_;  // How many bytes we returned last time Next()
-                            // was called (used for error checking only).
-
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(ArrayInputStream);
-};
-
-// ===================================================================
-
-// A ZeroCopyOutputStream backed by an in-memory array of bytes.
-class PROTOBUF_EXPORT ArrayOutputStream PROTOBUF_FUTURE_FINAL
-    : public ZeroCopyOutputStream {
- public:
-  // Create an OutputStream that writes to the bytes pointed to by "data".
-  // "data" remains the property of the caller but must remain valid until
-  // the stream is destroyed.  If a block_size is given, calls to Next()
-  // will return data blocks no larger than the given size.  Otherwise, the
-  // first call to Next() returns the entire array.  block_size is mainly
-  // useful for testing; in production you would probably never want to set
-  // it.
-  ArrayOutputStream(void* data, int size, int block_size = -1);
-  ~ArrayOutputStream() override = default;
-
-  // implements ZeroCopyOutputStream ---------------------------------
-  bool Next(void** data, int* size) override;
-  void BackUp(int count) override;
-  int64_t ByteCount() const override;
-
- private:
-  uint8_t* const data_;     // The byte array.
-  const int size_;        // Total size of the array.
-  const int block_size_;  // How many bytes to return at a time.
-
-  int position_;
-  int last_returned_size_;  // How many bytes we returned last time Next()
-                            // was called (used for error checking only).
-
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(ArrayOutputStream);
-};
-
-// ===================================================================
-
-// A ZeroCopyOutputStream which appends bytes to a string.
-class PROTOBUF_EXPORT StringOutputStream PROTOBUF_FUTURE_FINAL
-    : public ZeroCopyOutputStream {
- public:
-  // Create a StringOutputStream which appends bytes to the given string.
-  // The string remains property of the caller, but it is mutated in arbitrary
-  // ways and MUST NOT be accessed in any way until you're done with the
-  // stream. Either be sure there's no further usage, or (safest) destroy the
-  // stream before using the contents.
-  //
-  // Hint:  If you call target->reserve(n) before creating the stream,
-  //   the first call to Next() will return at least n bytes of buffer
-  //   space.
-  explicit StringOutputStream(std::string* target);
-  ~StringOutputStream() override = default;
-
-  // implements ZeroCopyOutputStream ---------------------------------
-  bool Next(void** data, int* size) override;
-  void BackUp(int count) override;
-  int64_t ByteCount() const override;
-
- private:
-  static constexpr size_t kMinimumSize = 16;
-
-  std::string* target_;
-
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(StringOutputStream);
-};
-
-// Note:  There is no StringInputStream.  Instead, just create an
-// ArrayInputStream as follows:
-//   ArrayInputStream input(str.data(), str.size());
-
-// ===================================================================
-
-// A generic traditional input stream interface.
-//
-// Lots of traditional input streams (e.g. file descriptors, C stdio
-// streams, and C++ iostreams) expose an interface where every read
-// involves copying bytes into a buffer.  If you want to take such an
-// interface and make a ZeroCopyInputStream based on it, simply implement
-// CopyingInputStream and then use CopyingInputStreamAdaptor.
-//
-// CopyingInputStream implementations should avoid buffering if possible.
-// CopyingInputStreamAdaptor does its own buffering and will read data
-// in large blocks.
-class PROTOBUF_EXPORT CopyingInputStream {
- public:
-  virtual ~CopyingInputStream() {}
-
-  // Reads up to "size" bytes into the given buffer.  Returns the number of
-  // bytes read.  Read() waits until at least one byte is available, or
-  // returns zero if no bytes will ever become available (EOF), or -1 if a
-  // permanent read error occurred.
-  virtual int Read(void* buffer, int size) = 0;
-
-  // Skips the next "count" bytes of input.  Returns the number of bytes
-  // actually skipped.  This will always be exactly equal to "count" unless
-  // EOF was reached or a permanent read error occurred.
-  //
-  // The default implementation just repeatedly calls Read() into a scratch
-  // buffer.
-  virtual int Skip(int count);
-};
-
-// A ZeroCopyInputStream which reads from a CopyingInputStream.  This is
-// useful for implementing ZeroCopyInputStreams that read from traditional
-// streams.  Note that this class is not really zero-copy.
-//
-// If you want to read from file descriptors or C++ istreams, this is
-// already implemented for you:  use FileInputStream or IstreamInputStream
-// respectively.
-class PROTOBUF_EXPORT CopyingInputStreamAdaptor : public ZeroCopyInputStream {
- public:
-  // Creates a stream that reads from the given CopyingInputStream.
-  // If a block_size is given, it specifies the number of bytes that
-  // should be read and returned with each call to Next().  Otherwise,
-  // a reasonable default is used.  The caller retains ownership of
-  // copying_stream unless SetOwnsCopyingStream(true) is called.
-  explicit CopyingInputStreamAdaptor(CopyingInputStream* copying_stream,
-                                     int block_size = -1);
-  ~CopyingInputStreamAdaptor() override;
-
-  // Call SetOwnsCopyingStream(true) to tell the CopyingInputStreamAdaptor to
-  // delete the underlying CopyingInputStream when it is destroyed.
-  void SetOwnsCopyingStream(bool value) { owns_copying_stream_ = value; }
-
-  // implements ZeroCopyInputStream ----------------------------------
-  bool Next(const void** data, int* size) override;
-  void BackUp(int count) override;
-  bool Skip(int count) override;
-  int64_t ByteCount() const override;
-
- private:
-  // Insures that buffer_ is not NULL.
-  void AllocateBufferIfNeeded();
-  // Frees the buffer and resets buffer_used_.
-  void FreeBuffer();
-
-  // The underlying copying stream.
-  CopyingInputStream* copying_stream_;
-  bool owns_copying_stream_;
-
-  // True if we have seen a permanent error from the underlying stream.
-  bool failed_;
-
-  // The current position of copying_stream_, relative to the point where
-  // we started reading.
-  int64_t position_;
-
-  // Data is read into this buffer.  It may be NULL if no buffer is currently
-  // in use.  Otherwise, it points to an array of size buffer_size_.
-  std::unique_ptr<uint8_t[]> buffer_;
-  const int buffer_size_;
-
-  // Number of valid bytes currently in the buffer (i.e. the size last
-  // returned by Next()).  0 <= buffer_used_ <= buffer_size_.
-  int buffer_used_;
-
-  // Number of bytes in the buffer which were backed up over by a call to
-  // BackUp().  These need to be returned again.
-  // 0 <= backup_bytes_ <= buffer_used_
-  int backup_bytes_;
-
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(CopyingInputStreamAdaptor);
-};
-
-// ===================================================================
-
-// A generic traditional output stream interface.
-//
-// Lots of traditional output streams (e.g. file descriptors, C stdio
-// streams, and C++ iostreams) expose an interface where every write
-// involves copying bytes from a buffer.  If you want to take such an
-// interface and make a ZeroCopyOutputStream based on it, simply implement
-// CopyingOutputStream and then use CopyingOutputStreamAdaptor.
-//
-// CopyingOutputStream implementations should avoid buffering if possible.
-// CopyingOutputStreamAdaptor does its own buffering and will write data
-// in large blocks.
-class PROTOBUF_EXPORT CopyingOutputStream {
- public:
-  virtual ~CopyingOutputStream() {}
-
-  // Writes "size" bytes from the given buffer to the output.  Returns true
-  // if successful, false on a write error.
-  virtual bool Write(const void* buffer, int size) = 0;
-};
-
-// A ZeroCopyOutputStream which writes to a CopyingOutputStream.  This is
-// useful for implementing ZeroCopyOutputStreams that write to traditional
-// streams.  Note that this class is not really zero-copy.
-//
-// If you want to write to file descriptors or C++ ostreams, this is
-// already implemented for you:  use FileOutputStream or OstreamOutputStream
-// respectively.
-class PROTOBUF_EXPORT CopyingOutputStreamAdaptor : public ZeroCopyOutputStream {
- public:
-  // Creates a stream that writes to the given Unix file descriptor.
-  // If a block_size is given, it specifies the size of the buffers
-  // that should be returned by Next().  Otherwise, a reasonable default
-  // is used.
-  explicit CopyingOutputStreamAdaptor(CopyingOutputStream* copying_stream,
-                                      int block_size = -1);
-  ~CopyingOutputStreamAdaptor() override;
-
-  // Writes all pending data to the underlying stream.  Returns false if a
-  // write error occurred on the underlying stream.  (The underlying
-  // stream itself is not necessarily flushed.)
-  bool Flush();
-
-  // Call SetOwnsCopyingStream(true) to tell the CopyingOutputStreamAdaptor to
-  // delete the underlying CopyingOutputStream when it is destroyed.
-  void SetOwnsCopyingStream(bool value) { owns_copying_stream_ = value; }
-
-  // implements ZeroCopyOutputStream ---------------------------------
-  bool Next(void** data, int* size) override;
-  void BackUp(int count) override;
-  int64_t ByteCount() const override;
-  bool WriteAliasedRaw(const void* data, int size) override;
-  bool AllowsAliasing() const override { return true; }
-
- private:
-  // Write the current buffer, if it is present.
-  bool WriteBuffer();
-  // Insures that buffer_ is not NULL.
-  void AllocateBufferIfNeeded();
-  // Frees the buffer.
-  void FreeBuffer();
-
-  // The underlying copying stream.
-  CopyingOutputStream* copying_stream_;
-  bool owns_copying_stream_;
-
-  // True if we have seen a permanent error from the underlying stream.
-  bool failed_;
-
-  // The current position of copying_stream_, relative to the point where
-  // we started writing.
-  int64_t position_;
-
-  // Data is written from this buffer.  It may be NULL if no buffer is
-  // currently in use.  Otherwise, it points to an array of size buffer_size_.
-  std::unique_ptr<uint8_t[]> buffer_;
-  const int buffer_size_;
-
-  // Number of valid bytes currently in the buffer (i.e. the size last
-  // returned by Next()).  When BackUp() is called, we just reduce this.
-  // 0 <= buffer_used_ <= buffer_size_.
-  int buffer_used_;
-
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(CopyingOutputStreamAdaptor);
-};
-
-// ===================================================================
-
-// A ZeroCopyInputStream which wraps some other stream and limits it to
-// a particular byte count.
-class PROTOBUF_EXPORT LimitingInputStream PROTOBUF_FUTURE_FINAL
-    : public ZeroCopyInputStream {
- public:
-  LimitingInputStream(ZeroCopyInputStream* input, int64_t limit);
-  ~LimitingInputStream() override;
-
-  // implements ZeroCopyInputStream ----------------------------------
-  bool Next(const void** data, int* size) override;
-  void BackUp(int count) override;
-  bool Skip(int count) override;
-  int64_t ByteCount() const override;
-
-
- private:
-  ZeroCopyInputStream* input_;
-  int64_t limit_;  // Decreases as we go, becomes negative if we overshoot.
-  int64_t prior_bytes_read_;  // Bytes read on underlying stream at construction
-
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(LimitingInputStream);
-};
-
-
-// ===================================================================
-
-// mutable_string_data() and as_string_data() are workarounds to improve
-// the performance of writing new data to an existing string.  Unfortunately
-// the methods provided by the string class are suboptimal, and using memcpy()
-// is mildly annoying because it requires its pointer args to be non-NULL even
-// if we ask it to copy 0 bytes.  Furthermore, string_as_array() has the
-// property that it always returns NULL if its arg is the empty string, exactly
-// what we want to avoid if we're using it in conjunction with memcpy()!
-// With C++11, the desired memcpy() boils down to memcpy(..., &(*s)[0], size),
-// where s is a string*.  Without C++11, &(*s)[0] is not guaranteed to be safe,
-// so we use string_as_array(), and live with the extra logic that tests whether
-// *s is empty.
-
-// Return a pointer to mutable characters underlying the given string.  The
-// return value is valid until the next time the string is resized.  We
-// trust the caller to treat the return value as an array of length s->size().
-inline char* mutable_string_data(std::string* s) {
-  // This should be simpler & faster than string_as_array() because the latter
-  // is guaranteed to return NULL when *s is empty, so it has to check for that.
-  return &(*s)[0];
-}
-
-// as_string_data(s) is equivalent to
-//  ({ char* p = mutable_string_data(s); make_pair(p, p != NULL); })
-// Sometimes it's faster: in some scenarios p cannot be NULL, and then the
-// code can avoid that check.
-inline std::pair<char*, bool> as_string_data(std::string* s) {
-  char* p = mutable_string_data(s);
-  return std::make_pair(p, true);
-}
-
-}  // namespace io
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
-
-#endif  // GOOGLE_PROTOBUF_IO_ZERO_COPY_STREAM_IMPL_LITE_H__
diff --git a/libs/protobuf/src/google/protobuf/io/zero_copy_stream_unittest.cc b/libs/protobuf/src/google/protobuf/io/zero_copy_stream_unittest.cc
deleted file mode 100644
index d4e5b54..0000000
--- a/libs/protobuf/src/google/protobuf/io/zero_copy_stream_unittest.cc
+++ /dev/null
@@ -1,1088 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-//
-// Testing strategy:  For each type of I/O (array, string, file, etc.) we
-// create an output stream and write some data to it, then create a
-// corresponding input stream to read the same data back and expect it to
-// match.  When the data is written, it is written in several small chunks
-// of varying sizes, with a BackUp() after each chunk.  It is read back
-// similarly, but with chunks separated at different points.  The whole
-// process is run with a variety of block sizes for both the input and
-// the output.
-//
-// TODO(kenton):  Rewrite this test to bring it up to the standards of all
-//   the other proto2 tests.  May want to wait for gTest to implement
-//   "parametized tests" so that one set of tests can be used on all the
-//   implementations.
-
-#include <chrono>
-#include <thread>
-
-#ifndef _WIN32
-#include <sys/socket.h>
-#include <unistd.h>
-#endif
-#include <errno.h>
-#include <fcntl.h>
-#include <stdlib.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-
-#include <memory>
-#include <sstream>
-
-#include <google/protobuf/testing/file.h>
-#include <google/protobuf/test_util2.h>
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/io/io_win32.h>
-#include <google/protobuf/io/zero_copy_stream_impl.h>
-
-#if HAVE_ZLIB
-#include <google/protobuf/io/gzip_stream.h>
-#endif
-
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/stubs/logging.h>
-#include <google/protobuf/testing/file.h>
-#include <google/protobuf/testing/googletest.h>
-#include <gtest/gtest.h>
-
-namespace google {
-namespace protobuf {
-namespace io {
-namespace {
-
-#ifdef _WIN32
-#define pipe(fds) _pipe(fds, 4096, O_BINARY)
-// DO NOT include <io.h>, instead create functions in io_win32.{h,cc} and import
-// them like we do below.
-using google::protobuf::io::win32::access;
-using google::protobuf::io::win32::close;
-using google::protobuf::io::win32::mkdir;
-using google::protobuf::io::win32::open;
-#endif
-
-#ifndef O_BINARY
-#ifdef _O_BINARY
-#define O_BINARY _O_BINARY
-#else
-#define O_BINARY 0  // If this isn't defined, the platform doesn't need it.
-#endif
-#endif
-
-class IoTest : public testing::Test {
- protected:
-  // Test helpers.
-
-  // Helper to write an array of data to an output stream.
-  bool WriteToOutput(ZeroCopyOutputStream* output, const void* data, int size);
-  // Helper to read a fixed-length array of data from an input stream.
-  int ReadFromInput(ZeroCopyInputStream* input, void* data, int size);
-  // Write a string to the output stream.
-  void WriteString(ZeroCopyOutputStream* output, const std::string& str);
-  // Read a number of bytes equal to the size of the given string and checks
-  // that it matches the string.
-  void ReadString(ZeroCopyInputStream* input, const std::string& str);
-  // Writes some text to the output stream in a particular order.  Returns
-  // the number of bytes written, in case the caller needs that to set up an
-  // input stream.
-  int WriteStuff(ZeroCopyOutputStream* output);
-  // Reads text from an input stream and expects it to match what
-  // WriteStuff() writes.
-  void ReadStuff(ZeroCopyInputStream* input, bool read_eof = true);
-
-  // Similar to WriteStuff, but performs more sophisticated testing.
-  int WriteStuffLarge(ZeroCopyOutputStream* output);
-  // Reads and tests a stream that should have been written to
-  // via WriteStuffLarge().
-  void ReadStuffLarge(ZeroCopyInputStream* input);
-
-#if HAVE_ZLIB
-  std::string Compress(const std::string& data,
-                       const GzipOutputStream::Options& options);
-  std::string Uncompress(const std::string& data);
-#endif
-
-  static const int kBlockSizes[];
-  static const int kBlockSizeCount;
-};
-
-const int IoTest::kBlockSizes[] = {-1, 1, 2, 5, 7, 10, 23, 64};
-const int IoTest::kBlockSizeCount = GOOGLE_ARRAYSIZE(IoTest::kBlockSizes);
-
-bool IoTest::WriteToOutput(ZeroCopyOutputStream* output, const void* data,
-                           int size) {
-  const uint8* in = reinterpret_cast<const uint8*>(data);
-  int in_size = size;
-
-  void* out;
-  int out_size;
-
-  while (true) {
-    if (!output->Next(&out, &out_size)) {
-      return false;
-    }
-    EXPECT_GT(out_size, 0);
-
-    if (in_size <= out_size) {
-      memcpy(out, in, in_size);
-      output->BackUp(out_size - in_size);
-      return true;
-    }
-
-    memcpy(out, in, out_size);
-    in += out_size;
-    in_size -= out_size;
-  }
-}
-
-#define MAX_REPEATED_ZEROS 100
-
-int IoTest::ReadFromInput(ZeroCopyInputStream* input, void* data, int size) {
-  uint8* out = reinterpret_cast<uint8*>(data);
-  int out_size = size;
-
-  const void* in;
-  int in_size = 0;
-
-  int repeated_zeros = 0;
-
-  while (true) {
-    if (!input->Next(&in, &in_size)) {
-      return size - out_size;
-    }
-    EXPECT_GT(in_size, -1);
-    if (in_size == 0) {
-      repeated_zeros++;
-    } else {
-      repeated_zeros = 0;
-    }
-    EXPECT_LT(repeated_zeros, MAX_REPEATED_ZEROS);
-
-    if (out_size <= in_size) {
-      memcpy(out, in, out_size);
-      if (in_size > out_size) {
-        input->BackUp(in_size - out_size);
-      }
-      return size;  // Copied all of it.
-    }
-
-    memcpy(out, in, in_size);
-    out += in_size;
-    out_size -= in_size;
-  }
-}
-
-void IoTest::WriteString(ZeroCopyOutputStream* output, const std::string& str) {
-  EXPECT_TRUE(WriteToOutput(output, str.c_str(), str.size()));
-}
-
-void IoTest::ReadString(ZeroCopyInputStream* input, const std::string& str) {
-  std::unique_ptr<char[]> buffer(new char[str.size() + 1]);
-  buffer[str.size()] = '\0';
-  EXPECT_EQ(ReadFromInput(input, buffer.get(), str.size()), str.size());
-  EXPECT_STREQ(str.c_str(), buffer.get());
-}
-
-int IoTest::WriteStuff(ZeroCopyOutputStream* output) {
-  WriteString(output, "Hello world!\n");
-  WriteString(output, "Some te");
-  WriteString(output, "xt.  Blah blah.");
-  WriteString(output, "abcdefg");
-  WriteString(output, "01234567890123456789");
-  WriteString(output, "foobar");
-
-  EXPECT_EQ(output->ByteCount(), 68);
-
-  int result = output->ByteCount();
-  return result;
-}
-
-// Reads text from an input stream and expects it to match what WriteStuff()
-// writes.
-void IoTest::ReadStuff(ZeroCopyInputStream* input, bool read_eof) {
-  ReadString(input, "Hello world!\n");
-  ReadString(input, "Some text.  ");
-  ReadString(input, "Blah ");
-  ReadString(input, "blah.");
-  ReadString(input, "abcdefg");
-  EXPECT_TRUE(input->Skip(20));
-  ReadString(input, "foo");
-  ReadString(input, "bar");
-
-  EXPECT_EQ(input->ByteCount(), 68);
-
-  if (read_eof) {
-    uint8 byte;
-    EXPECT_EQ(ReadFromInput(input, &byte, 1), 0);
-  }
-}
-
-int IoTest::WriteStuffLarge(ZeroCopyOutputStream* output) {
-  WriteString(output, "Hello world!\n");
-  WriteString(output, "Some te");
-  WriteString(output, "xt.  Blah blah.");
-  WriteString(output, std::string(100000, 'x'));  // A very long string
-  WriteString(output, std::string(100000, 'y'));  // A very long string
-  WriteString(output, "01234567890123456789");
-
-  EXPECT_EQ(output->ByteCount(), 200055);
-
-  int result = output->ByteCount();
-  return result;
-}
-
-// Reads text from an input stream and expects it to match what WriteStuff()
-// writes.
-void IoTest::ReadStuffLarge(ZeroCopyInputStream* input) {
-  ReadString(input, "Hello world!\nSome text.  ");
-  EXPECT_TRUE(input->Skip(5));
-  ReadString(input, "blah.");
-  EXPECT_TRUE(input->Skip(100000 - 10));
-  ReadString(input, std::string(10, 'x') + std::string(100000 - 20000, 'y'));
-  EXPECT_TRUE(input->Skip(20000 - 10));
-  ReadString(input, "yyyyyyyyyy01234567890123456789");
-
-  EXPECT_EQ(input->ByteCount(), 200055);
-
-  uint8 byte;
-  EXPECT_EQ(ReadFromInput(input, &byte, 1), 0);
-}
-
-// ===================================================================
-
-TEST_F(IoTest, ArrayIo) {
-  const int kBufferSize = 256;
-  uint8 buffer[kBufferSize];
-
-  for (int i = 0; i < kBlockSizeCount; i++) {
-    for (int j = 0; j < kBlockSizeCount; j++) {
-      int size;
-      {
-        ArrayOutputStream output(buffer, kBufferSize, kBlockSizes[i]);
-        size = WriteStuff(&output);
-      }
-      {
-        ArrayInputStream input(buffer, size, kBlockSizes[j]);
-        ReadStuff(&input);
-      }
-    }
-  }
-}
-
-TEST_F(IoTest, TwoSessionWrite) {
-  // Test that two concatenated write sessions read correctly
-
-  static const char* strA = "0123456789";
-  static const char* strB = "WhirledPeas";
-  const int kBufferSize = 2 * 1024;
-  uint8* buffer = new uint8[kBufferSize];
-  char* temp_buffer = new char[40];
-
-  for (int i = 0; i < kBlockSizeCount; i++) {
-    for (int j = 0; j < kBlockSizeCount; j++) {
-      ArrayOutputStream* output =
-          new ArrayOutputStream(buffer, kBufferSize, kBlockSizes[i]);
-      CodedOutputStream* coded_output = new CodedOutputStream(output);
-      coded_output->WriteVarint32(strlen(strA));
-      coded_output->WriteRaw(strA, strlen(strA));
-      delete coded_output;  // flush
-      int64 pos = output->ByteCount();
-      delete output;
-      output = new ArrayOutputStream(buffer + pos, kBufferSize - pos,
-                                     kBlockSizes[i]);
-      coded_output = new CodedOutputStream(output);
-      coded_output->WriteVarint32(strlen(strB));
-      coded_output->WriteRaw(strB, strlen(strB));
-      delete coded_output;  // flush
-      int64 size = pos + output->ByteCount();
-      delete output;
-
-      ArrayInputStream* input =
-          new ArrayInputStream(buffer, size, kBlockSizes[j]);
-      CodedInputStream* coded_input = new CodedInputStream(input);
-      uint32 insize;
-      EXPECT_TRUE(coded_input->ReadVarint32(&insize));
-      EXPECT_EQ(strlen(strA), insize);
-      EXPECT_TRUE(coded_input->ReadRaw(temp_buffer, insize));
-      EXPECT_EQ(0, memcmp(temp_buffer, strA, insize));
-
-      EXPECT_TRUE(coded_input->ReadVarint32(&insize));
-      EXPECT_EQ(strlen(strB), insize);
-      EXPECT_TRUE(coded_input->ReadRaw(temp_buffer, insize));
-      EXPECT_EQ(0, memcmp(temp_buffer, strB, insize));
-
-      delete coded_input;
-      delete input;
-    }
-  }
-
-  delete[] temp_buffer;
-  delete[] buffer;
-}
-
-#if HAVE_ZLIB
-TEST_F(IoTest, GzipIo) {
-  const int kBufferSize = 2 * 1024;
-  uint8* buffer = new uint8[kBufferSize];
-  for (int i = 0; i < kBlockSizeCount; i++) {
-    for (int j = 0; j < kBlockSizeCount; j++) {
-      for (int z = 0; z < kBlockSizeCount; z++) {
-        int gzip_buffer_size = kBlockSizes[z];
-        int size;
-        {
-          ArrayOutputStream output(buffer, kBufferSize, kBlockSizes[i]);
-          GzipOutputStream::Options options;
-          options.format = GzipOutputStream::GZIP;
-          if (gzip_buffer_size != -1) {
-            options.buffer_size = gzip_buffer_size;
-          }
-          GzipOutputStream gzout(&output, options);
-          WriteStuff(&gzout);
-          gzout.Close();
-          size = output.ByteCount();
-        }
-        {
-          ArrayInputStream input(buffer, size, kBlockSizes[j]);
-          GzipInputStream gzin(&input, GzipInputStream::GZIP, gzip_buffer_size);
-          ReadStuff(&gzin);
-        }
-      }
-    }
-  }
-  delete[] buffer;
-}
-
-TEST_F(IoTest, GzipIoWithFlush) {
-  const int kBufferSize = 2 * 1024;
-  uint8* buffer = new uint8[kBufferSize];
-  // We start with i = 4 as we want a block size > 6. With block size <= 6
-  // Flush() fills up the entire 2K buffer with flush markers and the test
-  // fails. See documentation for Flush() for more detail.
-  for (int i = 4; i < kBlockSizeCount; i++) {
-    for (int j = 0; j < kBlockSizeCount; j++) {
-      for (int z = 0; z < kBlockSizeCount; z++) {
-        int gzip_buffer_size = kBlockSizes[z];
-        int size;
-        {
-          ArrayOutputStream output(buffer, kBufferSize, kBlockSizes[i]);
-          GzipOutputStream::Options options;
-          options.format = GzipOutputStream::GZIP;
-          if (gzip_buffer_size != -1) {
-            options.buffer_size = gzip_buffer_size;
-          }
-          GzipOutputStream gzout(&output, options);
-          WriteStuff(&gzout);
-          EXPECT_TRUE(gzout.Flush());
-          gzout.Close();
-          size = output.ByteCount();
-        }
-        {
-          ArrayInputStream input(buffer, size, kBlockSizes[j]);
-          GzipInputStream gzin(&input, GzipInputStream::GZIP, gzip_buffer_size);
-          ReadStuff(&gzin);
-        }
-      }
-    }
-  }
-  delete[] buffer;
-}
-
-TEST_F(IoTest, GzipIoContiguousFlushes) {
-  const int kBufferSize = 2 * 1024;
-  uint8* buffer = new uint8[kBufferSize];
-
-  int block_size = kBlockSizes[4];
-  int gzip_buffer_size = block_size;
-  int size;
-
-  ArrayOutputStream output(buffer, kBufferSize, block_size);
-  GzipOutputStream::Options options;
-  options.format = GzipOutputStream::GZIP;
-  if (gzip_buffer_size != -1) {
-    options.buffer_size = gzip_buffer_size;
-  }
-  GzipOutputStream gzout(&output, options);
-  WriteStuff(&gzout);
-  EXPECT_TRUE(gzout.Flush());
-  EXPECT_TRUE(gzout.Flush());
-  gzout.Close();
-  size = output.ByteCount();
-
-  ArrayInputStream input(buffer, size, block_size);
-  GzipInputStream gzin(&input, GzipInputStream::GZIP, gzip_buffer_size);
-  ReadStuff(&gzin);
-
-  delete[] buffer;
-}
-
-TEST_F(IoTest, GzipIoReadAfterFlush) {
-  const int kBufferSize = 2 * 1024;
-  uint8* buffer = new uint8[kBufferSize];
-
-  int block_size = kBlockSizes[4];
-  int gzip_buffer_size = block_size;
-  int size;
-  ArrayOutputStream output(buffer, kBufferSize, block_size);
-  GzipOutputStream::Options options;
-  options.format = GzipOutputStream::GZIP;
-  if (gzip_buffer_size != -1) {
-    options.buffer_size = gzip_buffer_size;
-  }
-
-  GzipOutputStream gzout(&output, options);
-  WriteStuff(&gzout);
-  EXPECT_TRUE(gzout.Flush());
-  size = output.ByteCount();
-
-  ArrayInputStream input(buffer, size, block_size);
-  GzipInputStream gzin(&input, GzipInputStream::GZIP, gzip_buffer_size);
-  ReadStuff(&gzin);
-
-  gzout.Close();
-
-  delete[] buffer;
-}
-
-TEST_F(IoTest, ZlibIo) {
-  const int kBufferSize = 2 * 1024;
-  uint8* buffer = new uint8[kBufferSize];
-  for (int i = 0; i < kBlockSizeCount; i++) {
-    for (int j = 0; j < kBlockSizeCount; j++) {
-      for (int z = 0; z < kBlockSizeCount; z++) {
-        int gzip_buffer_size = kBlockSizes[z];
-        int size;
-        {
-          ArrayOutputStream output(buffer, kBufferSize, kBlockSizes[i]);
-          GzipOutputStream::Options options;
-          options.format = GzipOutputStream::ZLIB;
-          if (gzip_buffer_size != -1) {
-            options.buffer_size = gzip_buffer_size;
-          }
-          GzipOutputStream gzout(&output, options);
-          WriteStuff(&gzout);
-          gzout.Close();
-          size = output.ByteCount();
-        }
-        {
-          ArrayInputStream input(buffer, size, kBlockSizes[j]);
-          GzipInputStream gzin(&input, GzipInputStream::ZLIB, gzip_buffer_size);
-          ReadStuff(&gzin);
-        }
-      }
-    }
-  }
-  delete[] buffer;
-}
-
-TEST_F(IoTest, ZlibIoInputAutodetect) {
-  const int kBufferSize = 2 * 1024;
-  uint8* buffer = new uint8[kBufferSize];
-  int size;
-  {
-    ArrayOutputStream output(buffer, kBufferSize);
-    GzipOutputStream::Options options;
-    options.format = GzipOutputStream::ZLIB;
-    GzipOutputStream gzout(&output, options);
-    WriteStuff(&gzout);
-    gzout.Close();
-    size = output.ByteCount();
-  }
-  {
-    ArrayInputStream input(buffer, size);
-    GzipInputStream gzin(&input, GzipInputStream::AUTO);
-    ReadStuff(&gzin);
-  }
-  {
-    ArrayOutputStream output(buffer, kBufferSize);
-    GzipOutputStream::Options options;
-    options.format = GzipOutputStream::GZIP;
-    GzipOutputStream gzout(&output, options);
-    WriteStuff(&gzout);
-    gzout.Close();
-    size = output.ByteCount();
-  }
-  {
-    ArrayInputStream input(buffer, size);
-    GzipInputStream gzin(&input, GzipInputStream::AUTO);
-    ReadStuff(&gzin);
-  }
-  delete[] buffer;
-}
-
-std::string IoTest::Compress(const std::string& data,
-                             const GzipOutputStream::Options& options) {
-  std::string result;
-  {
-    StringOutputStream output(&result);
-    GzipOutputStream gzout(&output, options);
-    WriteToOutput(&gzout, data.data(), data.size());
-  }
-  return result;
-}
-
-std::string IoTest::Uncompress(const std::string& data) {
-  std::string result;
-  {
-    ArrayInputStream input(data.data(), data.size());
-    GzipInputStream gzin(&input);
-    const void* buffer;
-    int size;
-    while (gzin.Next(&buffer, &size)) {
-      result.append(reinterpret_cast<const char*>(buffer), size);
-    }
-  }
-  return result;
-}
-
-TEST_F(IoTest, CompressionOptions) {
-  // Some ad-hoc testing of compression options.
-
-  std::string golden_filename =
-      TestUtil::GetTestDataPath("net/proto2/internal/testdata/golden_message");
-  std::string golden;
-  GOOGLE_CHECK_OK(File::GetContents(golden_filename, &golden, true));
-
-  GzipOutputStream::Options options;
-  std::string gzip_compressed = Compress(golden, options);
-
-  options.compression_level = 0;
-  std::string not_compressed = Compress(golden, options);
-
-  // Try zlib compression for fun.
-  options = GzipOutputStream::Options();
-  options.format = GzipOutputStream::ZLIB;
-  std::string zlib_compressed = Compress(golden, options);
-
-  // Uncompressed should be bigger than the original since it should have some
-  // sort of header.
-  EXPECT_GT(not_compressed.size(), golden.size());
-
-  // Higher compression levels should result in smaller sizes.
-  EXPECT_LT(zlib_compressed.size(), not_compressed.size());
-
-  // ZLIB format should differ from GZIP format.
-  EXPECT_TRUE(zlib_compressed != gzip_compressed);
-
-  // Everything should decompress correctly.
-  EXPECT_TRUE(Uncompress(not_compressed) == golden);
-  EXPECT_TRUE(Uncompress(gzip_compressed) == golden);
-  EXPECT_TRUE(Uncompress(zlib_compressed) == golden);
-}
-
-TEST_F(IoTest, TwoSessionWriteGzip) {
-  // Test that two concatenated gzip streams can be read correctly
-
-  static const char* strA = "0123456789";
-  static const char* strB = "QuickBrownFox";
-  const int kBufferSize = 2 * 1024;
-  uint8* buffer = new uint8[kBufferSize];
-  char* temp_buffer = new char[40];
-
-  for (int i = 0; i < kBlockSizeCount; i++) {
-    for (int j = 0; j < kBlockSizeCount; j++) {
-      ArrayOutputStream* output =
-          new ArrayOutputStream(buffer, kBufferSize, kBlockSizes[i]);
-      GzipOutputStream* gzout = new GzipOutputStream(output);
-      CodedOutputStream* coded_output = new CodedOutputStream(gzout);
-      int32 outlen = strlen(strA) + 1;
-      coded_output->WriteVarint32(outlen);
-      coded_output->WriteRaw(strA, outlen);
-      delete coded_output;  // flush
-      delete gzout;         // flush
-      int64 pos = output->ByteCount();
-      delete output;
-      output = new ArrayOutputStream(buffer + pos, kBufferSize - pos,
-                                     kBlockSizes[i]);
-      gzout = new GzipOutputStream(output);
-      coded_output = new CodedOutputStream(gzout);
-      outlen = strlen(strB) + 1;
-      coded_output->WriteVarint32(outlen);
-      coded_output->WriteRaw(strB, outlen);
-      delete coded_output;  // flush
-      delete gzout;         // flush
-      int64 size = pos + output->ByteCount();
-      delete output;
-
-      ArrayInputStream* input =
-          new ArrayInputStream(buffer, size, kBlockSizes[j]);
-      GzipInputStream* gzin = new GzipInputStream(input);
-      CodedInputStream* coded_input = new CodedInputStream(gzin);
-      uint32 insize;
-      EXPECT_TRUE(coded_input->ReadVarint32(&insize));
-      EXPECT_EQ(strlen(strA) + 1, insize);
-      EXPECT_TRUE(coded_input->ReadRaw(temp_buffer, insize));
-      EXPECT_EQ(0, memcmp(temp_buffer, strA, insize))
-          << "strA=" << strA << " in=" << temp_buffer;
-
-      EXPECT_TRUE(coded_input->ReadVarint32(&insize));
-      EXPECT_EQ(strlen(strB) + 1, insize);
-      EXPECT_TRUE(coded_input->ReadRaw(temp_buffer, insize));
-      EXPECT_EQ(0, memcmp(temp_buffer, strB, insize))
-          << " out_block_size=" << kBlockSizes[i]
-          << " in_block_size=" << kBlockSizes[j] << " pos=" << pos
-          << " size=" << size << " strB=" << strB << " in=" << temp_buffer;
-
-      delete coded_input;
-      delete gzin;
-      delete input;
-    }
-  }
-
-  delete[] temp_buffer;
-  delete[] buffer;
-}
-
-TEST_F(IoTest, GzipInputByteCountAfterClosed) {
-  std::string golden = "abcdefghijklmnopqrstuvwxyz";
-  std::string compressed = Compress(golden, GzipOutputStream::Options());
-
-  for (int i = 0; i < kBlockSizeCount; i++) {
-    ArrayInputStream arr_input(compressed.data(), compressed.size(),
-                               kBlockSizes[i]);
-    GzipInputStream gz_input(&arr_input);
-    const void* buffer;
-    int size;
-    while (gz_input.Next(&buffer, &size)) {
-      EXPECT_LE(gz_input.ByteCount(), golden.size());
-    }
-    EXPECT_EQ(golden.size(), gz_input.ByteCount());
-  }
-}
-
-TEST_F(IoTest, GzipInputByteCountAfterClosedConcatenatedStreams) {
-  std::string golden1 = "abcdefghijklmnopqrstuvwxyz";
-  std::string golden2 = "the quick brown fox jumps over the lazy dog";
-  const size_t total_size = golden1.size() + golden2.size();
-  std::string compressed = Compress(golden1, GzipOutputStream::Options()) +
-                           Compress(golden2, GzipOutputStream::Options());
-
-  for (int i = 0; i < kBlockSizeCount; i++) {
-    ArrayInputStream arr_input(compressed.data(), compressed.size(),
-                               kBlockSizes[i]);
-    GzipInputStream gz_input(&arr_input);
-    const void* buffer;
-    int size;
-    while (gz_input.Next(&buffer, &size)) {
-      EXPECT_LE(gz_input.ByteCount(), total_size);
-    }
-    EXPECT_EQ(total_size, gz_input.ByteCount());
-  }
-}
-#endif
-
-// There is no string input, only string output.  Also, it doesn't support
-// explicit block sizes.  So, we'll only run one test and we'll use
-// ArrayInput to read back the results.
-TEST_F(IoTest, StringIo) {
-  std::string str;
-  {
-    StringOutputStream output(&str);
-    WriteStuff(&output);
-  }
-  {
-    ArrayInputStream input(str.data(), str.size());
-    ReadStuff(&input);
-  }
-}
-
-// Verifies that outputs up to kint32max can be created.
-TEST_F(IoTest, LargeOutput) {
-  std::string str;
-  StringOutputStream output(&str);
-  void* unused_data;
-  int size;
-  // Repeatedly calling Next should eventually grow the buffer to kint32max.
-  do {
-    EXPECT_TRUE(output.Next(&unused_data, &size));
-  } while (str.size() < std::numeric_limits<int>::max());
-  // Further increases should be possible.
-  output.Next(&unused_data, &size);
-  EXPECT_GT(size, 0);
-}
-
-
-// To test files, we create a temporary file, write, read, truncate, repeat.
-TEST_F(IoTest, FileIo) {
-  std::string filename = TestTempDir() + "/zero_copy_stream_test_file";
-
-  for (int i = 0; i < kBlockSizeCount; i++) {
-    for (int j = 0; j < kBlockSizeCount; j++) {
-      // Make a temporary file.
-      int file =
-          open(filename.c_str(), O_RDWR | O_CREAT | O_TRUNC | O_BINARY, 0777);
-      ASSERT_GE(file, 0);
-
-      {
-        FileOutputStream output(file, kBlockSizes[i]);
-        WriteStuff(&output);
-        EXPECT_EQ(0, output.GetErrno());
-      }
-
-      // Rewind.
-      ASSERT_NE(lseek(file, 0, SEEK_SET), (off_t)-1);
-
-      {
-        FileInputStream input(file, kBlockSizes[j]);
-        ReadStuff(&input);
-        EXPECT_EQ(0, input.GetErrno());
-      }
-
-      close(file);
-    }
-  }
-}
-
-#ifndef _WIN32
-// This tests the FileInputStream with a non blocking file. It opens a pipe in
-// non blocking mode, then starts reading it. The writing thread starts writing
-// 100ms after that.
-TEST_F(IoTest, NonBlockingFileIo) {
-  for (int i = 0; i < kBlockSizeCount; i++) {
-    for (int j = 0; j < kBlockSizeCount; j++) {
-      int fd[2];
-      // On Linux we could use pipe2 to make the pipe non-blocking in one step,
-      // but we instead use pipe and fcntl because pipe2 is not available on
-      // Mac OS.
-      ASSERT_EQ(pipe(fd), 0);
-      ASSERT_EQ(fcntl(fd[0], F_SETFL, O_NONBLOCK), 0);
-      ASSERT_EQ(fcntl(fd[1], F_SETFL, O_NONBLOCK), 0);
-
-      std::mutex go_write;
-      go_write.lock();
-
-      bool done_reading = false;
-
-      std::thread write_thread([this, fd, &go_write, i]() {
-        go_write.lock();
-        go_write.unlock();
-        FileOutputStream output(fd[1], kBlockSizes[i]);
-        WriteStuff(&output);
-        EXPECT_EQ(0, output.GetErrno());
-      });
-
-      std::thread read_thread([this, fd, &done_reading, j]() {
-        FileInputStream input(fd[0], kBlockSizes[j]);
-        ReadStuff(&input, false /* read_eof */);
-        done_reading = true;
-        close(fd[0]);
-        close(fd[1]);
-        EXPECT_EQ(0, input.GetErrno());
-      });
-
-      // Sleeping is not necessary but makes the next expectation relevant: the
-      // reading thread waits for the data to be available before returning.
-      std::this_thread::sleep_for(std::chrono::milliseconds(100));
-      EXPECT_FALSE(done_reading);
-      go_write.unlock();
-      write_thread.join();
-      read_thread.join();
-      EXPECT_TRUE(done_reading);
-    }
-  }
-}
-
-TEST_F(IoTest, BlockingFileIoWithTimeout) {
-  int fd[2];
-
-  for (int i = 0; i < kBlockSizeCount; i++) {
-    ASSERT_EQ(socketpair(AF_UNIX, SOCK_STREAM, 0, fd), 0);
-    struct timeval tv {
-      .tv_sec = 0, .tv_usec = 5000
-    };
-    ASSERT_EQ(setsockopt(fd[0], SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(tv)), 0);
-    FileInputStream input(fd[0], kBlockSizes[i]);
-    uint8 byte;
-    EXPECT_EQ(ReadFromInput(&input, &byte, 1), 0);
-    EXPECT_EQ(EAGAIN, input.GetErrno());
-  }
-}
-#endif
-
-#if HAVE_ZLIB
-TEST_F(IoTest, GzipFileIo) {
-  std::string filename = TestTempDir() + "/zero_copy_stream_test_file";
-
-  for (int i = 0; i < kBlockSizeCount; i++) {
-    for (int j = 0; j < kBlockSizeCount; j++) {
-      // Make a temporary file.
-      int file =
-          open(filename.c_str(), O_RDWR | O_CREAT | O_TRUNC | O_BINARY, 0777);
-      ASSERT_GE(file, 0);
-      {
-        FileOutputStream output(file, kBlockSizes[i]);
-        GzipOutputStream gzout(&output);
-        WriteStuffLarge(&gzout);
-        gzout.Close();
-        output.Flush();
-        EXPECT_EQ(0, output.GetErrno());
-      }
-
-      // Rewind.
-      ASSERT_NE(lseek(file, 0, SEEK_SET), (off_t)-1);
-
-      {
-        FileInputStream input(file, kBlockSizes[j]);
-        GzipInputStream gzin(&input);
-        ReadStuffLarge(&gzin);
-        EXPECT_EQ(0, input.GetErrno());
-      }
-
-      close(file);
-    }
-  }
-}
-#endif
-
-// MSVC raises various debugging exceptions if we try to use a file
-// descriptor of -1, defeating our tests below.  This class will disable
-// these debug assertions while in scope.
-class MsvcDebugDisabler {
- public:
-#if defined(_MSC_VER) && _MSC_VER >= 1400
-  MsvcDebugDisabler() {
-    old_handler_ = _set_invalid_parameter_handler(MyHandler);
-    old_mode_ = _CrtSetReportMode(_CRT_ASSERT, 0);
-  }
-  ~MsvcDebugDisabler() {
-    old_handler_ = _set_invalid_parameter_handler(old_handler_);
-    old_mode_ = _CrtSetReportMode(_CRT_ASSERT, old_mode_);
-  }
-
-  static void MyHandler(const wchar_t* expr, const wchar_t* func,
-                        const wchar_t* file, unsigned int line,
-                        uintptr_t pReserved) {
-    // do nothing
-  }
-
-  _invalid_parameter_handler old_handler_;
-  int old_mode_;
-#else
-  // Dummy constructor and destructor to ensure that GCC doesn't complain
-  // that debug_disabler is an unused variable.
-  MsvcDebugDisabler() {}
-  ~MsvcDebugDisabler() {}
-#endif
-};
-
-// Test that FileInputStreams report errors correctly.
-TEST_F(IoTest, FileReadError) {
-  MsvcDebugDisabler debug_disabler;
-
-  // -1 = invalid file descriptor.
-  FileInputStream input(-1);
-
-  const void* buffer;
-  int size;
-  EXPECT_FALSE(input.Next(&buffer, &size));
-  EXPECT_EQ(EBADF, input.GetErrno());
-}
-
-// Test that FileOutputStreams report errors correctly.
-TEST_F(IoTest, FileWriteError) {
-  MsvcDebugDisabler debug_disabler;
-
-  // -1 = invalid file descriptor.
-  FileOutputStream input(-1);
-
-  void* buffer;
-  int size;
-
-  // The first call to Next() succeeds because it doesn't have anything to
-  // write yet.
-  EXPECT_TRUE(input.Next(&buffer, &size));
-
-  // Second call fails.
-  EXPECT_FALSE(input.Next(&buffer, &size));
-
-  EXPECT_EQ(EBADF, input.GetErrno());
-}
-
-// Pipes are not seekable, so File{Input,Output}Stream ends up doing some
-// different things to handle them.  We'll test by writing to a pipe and
-// reading back from it.
-TEST_F(IoTest, PipeIo) {
-  int files[2];
-
-  for (int i = 0; i < kBlockSizeCount; i++) {
-    for (int j = 0; j < kBlockSizeCount; j++) {
-      // Need to create a new pipe each time because ReadStuff() expects
-      // to see EOF at the end.
-      ASSERT_EQ(pipe(files), 0);
-
-      {
-        FileOutputStream output(files[1], kBlockSizes[i]);
-        WriteStuff(&output);
-        EXPECT_EQ(0, output.GetErrno());
-      }
-      close(files[1]);  // Send EOF.
-
-      {
-        FileInputStream input(files[0], kBlockSizes[j]);
-        ReadStuff(&input);
-        EXPECT_EQ(0, input.GetErrno());
-      }
-      close(files[0]);
-    }
-  }
-}
-
-// Test using C++ iostreams.
-TEST_F(IoTest, IostreamIo) {
-  for (int i = 0; i < kBlockSizeCount; i++) {
-    for (int j = 0; j < kBlockSizeCount; j++) {
-      {
-        std::stringstream stream;
-
-        {
-          OstreamOutputStream output(&stream, kBlockSizes[i]);
-          WriteStuff(&output);
-          EXPECT_FALSE(stream.fail());
-        }
-
-        {
-          IstreamInputStream input(&stream, kBlockSizes[j]);
-          ReadStuff(&input);
-          EXPECT_TRUE(stream.eof());
-        }
-      }
-
-      {
-        std::stringstream stream;
-
-        {
-          OstreamOutputStream output(&stream, kBlockSizes[i]);
-          WriteStuffLarge(&output);
-          EXPECT_FALSE(stream.fail());
-        }
-
-        {
-          IstreamInputStream input(&stream, kBlockSizes[j]);
-          ReadStuffLarge(&input);
-          EXPECT_TRUE(stream.eof());
-        }
-      }
-    }
-  }
-}
-
-// To test ConcatenatingInputStream, we create several ArrayInputStreams
-// covering a buffer and then concatenate them.
-TEST_F(IoTest, ConcatenatingInputStream) {
-  const int kBufferSize = 256;
-  uint8 buffer[kBufferSize];
-
-  // Fill the buffer.
-  ArrayOutputStream output(buffer, kBufferSize);
-  WriteStuff(&output);
-
-  // Now split it up into multiple streams of varying sizes.
-  ASSERT_EQ(68, output.ByteCount());  // Test depends on this.
-  ArrayInputStream input1(buffer, 12);
-  ArrayInputStream input2(buffer + 12, 7);
-  ArrayInputStream input3(buffer + 19, 6);
-  ArrayInputStream input4(buffer + 25, 15);
-  ArrayInputStream input5(buffer + 40, 0);
-  // Note:  We want to make sure we have a stream boundary somewhere between
-  // bytes 42 and 62, which is the range that it Skip()ed by ReadStuff().  This
-  // tests that a bug that existed in the original code for Skip() is fixed.
-  ArrayInputStream input6(buffer + 40, 10);
-  ArrayInputStream input7(buffer + 50, 18);  // Total = 68 bytes.
-
-  ZeroCopyInputStream* streams[] = {&input1, &input2, &input3, &input4,
-                                    &input5, &input6, &input7};
-
-  // Create the concatenating stream and read.
-  ConcatenatingInputStream input(streams, GOOGLE_ARRAYSIZE(streams));
-  ReadStuff(&input);
-}
-
-// To test LimitingInputStream, we write our golden text to a buffer, then
-// create an ArrayInputStream that contains the whole buffer (not just the
-// bytes written), then use a LimitingInputStream to limit it just to the
-// bytes written.
-TEST_F(IoTest, LimitingInputStream) {
-  const int kBufferSize = 256;
-  uint8 buffer[kBufferSize];
-
-  // Fill the buffer.
-  ArrayOutputStream output(buffer, kBufferSize);
-  WriteStuff(&output);
-
-  // Set up input.
-  ArrayInputStream array_input(buffer, kBufferSize);
-  LimitingInputStream input(&array_input, output.ByteCount());
-
-  ReadStuff(&input);
-}
-
-// Checks that ByteCount works correctly for LimitingInputStreams where the
-// underlying stream has already been read.
-TEST_F(IoTest, LimitingInputStreamByteCount) {
-  const int kHalfBufferSize = 128;
-  const int kBufferSize = kHalfBufferSize * 2;
-  uint8 buffer[kBufferSize];
-
-  // Set up input. Only allow half to be read at once.
-  ArrayInputStream array_input(buffer, kBufferSize, kHalfBufferSize);
-  const void* data;
-  int size;
-  EXPECT_TRUE(array_input.Next(&data, &size));
-  EXPECT_EQ(kHalfBufferSize, array_input.ByteCount());
-  // kHalfBufferSize - 1 to test limiting logic as well.
-  LimitingInputStream input(&array_input, kHalfBufferSize - 1);
-  EXPECT_EQ(0, input.ByteCount());
-  EXPECT_TRUE(input.Next(&data, &size));
-  EXPECT_EQ(kHalfBufferSize - 1, input.ByteCount());
-}
-
-// Check that a zero-size array doesn't confuse the code.
-TEST(ZeroSizeArray, Input) {
-  ArrayInputStream input(NULL, 0);
-  const void* data;
-  int size;
-  EXPECT_FALSE(input.Next(&data, &size));
-}
-
-TEST(ZeroSizeArray, Output) {
-  ArrayOutputStream output(NULL, 0);
-  void* data;
-  int size;
-  EXPECT_FALSE(output.Next(&data, &size));
-}
-
-}  // namespace
-}  // namespace io
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/lite_arena_unittest.cc b/libs/protobuf/src/google/protobuf/lite_arena_unittest.cc
deleted file mode 100644
index d68c6c9..0000000
--- a/libs/protobuf/src/google/protobuf/lite_arena_unittest.cc
+++ /dev/null
@@ -1,90 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <google/protobuf/arena_test_util.h>
-#include <google/protobuf/map_lite_test_util.h>
-#include <gtest/gtest.h>
-
-namespace google {
-namespace protobuf {
-namespace {
-
-class LiteArenaTest : public testing::Test {
- protected:
-  LiteArenaTest() {
-    ArenaOptions options;
-    options.start_block_size = 128 * 1024;
-    options.max_block_size = 128 * 1024;
-    arena_.reset(new Arena(options));
-    // Trigger the allocation of the first arena block, so that further use of
-    // the arena will not require any heap allocations.
-    Arena::CreateArray<char>(arena_.get(), 1);
-  }
-
-  std::unique_ptr<Arena> arena_;
-};
-
-TEST_F(LiteArenaTest, MapNoHeapAllocation) {
-  std::string data;
-  data.reserve(128 * 1024);
-
-  {
-    // TODO(teboring): Enable no heap check when ArenaStringPtr is used in
-    // Map.
-    // internal::NoHeapChecker no_heap;
-
-    protobuf_unittest::TestArenaMapLite* from =
-        Arena::CreateMessage<protobuf_unittest::TestArenaMapLite>(arena_.get());
-    MapLiteTestUtil::SetArenaMapFields(from);
-    from->SerializeToString(&data);
-
-    protobuf_unittest::TestArenaMapLite* to =
-        Arena::CreateMessage<protobuf_unittest::TestArenaMapLite>(arena_.get());
-    to->ParseFromString(data);
-    MapLiteTestUtil::ExpectArenaMapFieldsSet(*to);
-  }
-}
-
-TEST_F(LiteArenaTest, UnknownFieldMemLeak) {
-  protobuf_unittest::ForeignMessageArenaLite* message =
-      Arena::CreateMessage<protobuf_unittest::ForeignMessageArenaLite>(
-          arena_.get());
-  std::string data = "\012\000";
-  int original_capacity = data.capacity();
-  while (data.capacity() <= original_capacity) {
-    data.append("a");
-  }
-  data[1] = data.size() - 2;
-  message->ParseFromString(data);
-}
-
-}  // namespace
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/lite_unittest.cc b/libs/protobuf/src/google/protobuf/lite_unittest.cc
deleted file mode 100644
index 583d325..0000000
--- a/libs/protobuf/src/google/protobuf/lite_unittest.cc
+++ /dev/null
@@ -1,1333 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-
-#include <climits>
-#include <iostream>
-#include <string>
-
-#include <google/protobuf/stubs/logging.h>
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/map_lite_unittest.pb.h>
-#include <google/protobuf/unittest_lite.pb.h>
-#include <gtest/gtest.h>
-#include <google/protobuf/stubs/strutil.h>
-#include <google/protobuf/arena_test_util.h>
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/io/zero_copy_stream.h>
-#include <google/protobuf/io/zero_copy_stream_impl.h>
-#include <google/protobuf/io/zero_copy_stream_impl_lite.h>
-#include <google/protobuf/map_lite_test_util.h>
-#include <google/protobuf/parse_context.h>
-#include <google/protobuf/test_util_lite.h>
-#include <google/protobuf/wire_format_lite.h>
-
-namespace google {
-namespace protobuf {
-
-// Helper methods to test parsing merge behavior.
-void ExpectMessageMerged(const unittest::TestAllTypesLite& message) {
-  EXPECT_EQ(message.optional_int32(), 3);
-  EXPECT_EQ(message.optional_int64(), 2);
-  EXPECT_EQ(message.optional_string(), "hello");
-}
-
-void AssignParsingMergeMessages(unittest::TestAllTypesLite* msg1,
-                                unittest::TestAllTypesLite* msg2,
-                                unittest::TestAllTypesLite* msg3) {
-  msg1->set_optional_int32(1);
-  msg2->set_optional_int64(2);
-  msg3->set_optional_int32(3);
-  msg3->set_optional_string("hello");
-}
-
-void SetAllTypesInEmptyMessageUnknownFields(
-    unittest::TestEmptyMessageLite* empty_message) {
-  protobuf_unittest::TestAllTypesLite message;
-  TestUtilLite::ExpectClear(message);
-  TestUtilLite::SetAllFields(&message);
-  std::string data = message.SerializeAsString();
-  empty_message->ParseFromString(data);
-}
-
-void SetSomeTypesInEmptyMessageUnknownFields(
-    unittest::TestEmptyMessageLite* empty_message) {
-  protobuf_unittest::TestAllTypesLite message;
-  TestUtilLite::ExpectClear(message);
-  message.set_optional_int32(101);
-  message.set_optional_int64(102);
-  message.set_optional_uint32(103);
-  message.set_optional_uint64(104);
-  std::string data = message.SerializeAsString();
-  empty_message->ParseFromString(data);
-}
-
-
-TEST(ParseVarintTest, Varint32) {
-  auto test_value = [](uint32_t value, int varint_length) {
-    uint8_t buffer[10];
-    uint8_t* p = io::CodedOutputStream::WriteVarint32ToArray(value, buffer);
-    ASSERT_EQ(p - buffer, varint_length) << "Value = " << value;
-
-    const char* cbuffer = reinterpret_cast<const char*>(buffer);
-    uint32_t parsed = ~value;
-    const char* r = internal::VarintParse(cbuffer, &parsed);
-    ASSERT_EQ(r - cbuffer, varint_length) << "Value = " << value;
-    ASSERT_EQ(parsed, value);
-  };
-
-  uint32_t base = 73;  // 1001011b
-  for (int varint_length = 1; varint_length <= 5; ++varint_length) {
-    uint32_t values[] = {
-        base - 73, base - 72, base, base + 126 - 73, base + 126 - 72,
-    };
-    for (uint32_t value : values) {
-      test_value(value, varint_length);
-    }
-    base = (base << 7) + 73;
-  }
-
-  test_value(std::numeric_limits<uint32_t>::max(), 5);
-}
-
-TEST(ParseVarintTest, Varint64) {
-  auto test_value = [](uint64_t value, int varint_length) {
-    uint8_t buffer[10];
-    uint8_t* p = io::CodedOutputStream::WriteVarint64ToArray(value, buffer);
-    ASSERT_EQ(p - buffer, varint_length) << "Value = " << value;
-
-    const char* cbuffer = reinterpret_cast<const char*>(buffer);
-    uint64_t parsed = ~value;
-    const char* r = internal::VarintParse(cbuffer, &parsed);
-    ASSERT_EQ(r - cbuffer, varint_length) << "Value = " << value;
-    ASSERT_EQ(parsed, value);
-  };
-
-  uint64_t base = 73;  // 1001011b
-  for (int varint_length = 1; varint_length <= 10; ++varint_length) {
-    uint64_t values[] = {
-        base - 73, base - 72, base, base + 126 - 73, base + 126 - 72,
-    };
-    for (uint64_t value : values) {
-      test_value(value, varint_length);
-    }
-    base = (base << 7) + 73;
-  }
-
-  test_value(std::numeric_limits<uint64_t>::max(), 10);
-}
-
-TEST(Lite, AllLite1) {
-  std::string data;
-
-  {
-    protobuf_unittest::TestAllTypesLite message, message2, message3;
-    TestUtilLite::ExpectClear(message);
-    TestUtilLite::SetAllFields(&message);
-    message2.CopyFrom(message);
-    data = message.SerializeAsString();
-    message3.ParseFromString(data);
-    TestUtilLite::ExpectAllFieldsSet(message);
-    TestUtilLite::ExpectAllFieldsSet(message2);
-    TestUtilLite::ExpectAllFieldsSet(message3);
-    TestUtilLite::ModifyRepeatedFields(&message);
-    TestUtilLite::ExpectRepeatedFieldsModified(message);
-    message.Clear();
-    TestUtilLite::ExpectClear(message);
-  }
-}
-
-TEST(Lite, AllLite2) {
-  std::string data;
-  {
-    protobuf_unittest::TestAllExtensionsLite message, message2, message3;
-    TestUtilLite::ExpectExtensionsClear(message);
-    TestUtilLite::SetAllExtensions(&message);
-    message2.CopyFrom(message);
-    std::string extensions_data = message.SerializeAsString();
-    message3.ParseFromString(extensions_data);
-    TestUtilLite::ExpectAllExtensionsSet(message);
-    TestUtilLite::ExpectAllExtensionsSet(message2);
-    TestUtilLite::ExpectAllExtensionsSet(message3);
-    TestUtilLite::ModifyRepeatedExtensions(&message);
-    TestUtilLite::ExpectRepeatedExtensionsModified(message);
-    message.Clear();
-    TestUtilLite::ExpectExtensionsClear(message);
-  }
-}
-
-TEST(Lite, AllLite3) {
-  std::string data, packed_data;
-
-  {
-    protobuf_unittest::TestPackedTypesLite message, message2, message3;
-    TestUtilLite::ExpectPackedClear(message);
-    TestUtilLite::SetPackedFields(&message);
-    message2.CopyFrom(message);
-    packed_data = message.SerializeAsString();
-    message3.ParseFromString(packed_data);
-    TestUtilLite::ExpectPackedFieldsSet(message);
-    TestUtilLite::ExpectPackedFieldsSet(message2);
-    TestUtilLite::ExpectPackedFieldsSet(message3);
-    TestUtilLite::ModifyPackedFields(&message);
-    TestUtilLite::ExpectPackedFieldsModified(message);
-    message.Clear();
-    TestUtilLite::ExpectPackedClear(message);
-  }
-
-  {
-    protobuf_unittest::TestPackedExtensionsLite message, message2, message3;
-    TestUtilLite::ExpectPackedExtensionsClear(message);
-    TestUtilLite::SetPackedExtensions(&message);
-    message2.CopyFrom(message);
-    std::string packed_extensions_data = message.SerializeAsString();
-    EXPECT_EQ(packed_extensions_data, packed_data);
-    message3.ParseFromString(packed_extensions_data);
-    TestUtilLite::ExpectPackedExtensionsSet(message);
-    TestUtilLite::ExpectPackedExtensionsSet(message2);
-    TestUtilLite::ExpectPackedExtensionsSet(message3);
-    TestUtilLite::ModifyPackedExtensions(&message);
-    TestUtilLite::ExpectPackedExtensionsModified(message);
-    message.Clear();
-    TestUtilLite::ExpectPackedExtensionsClear(message);
-  }
-}
-
-TEST(Lite, AllLite5) {
-  std::string data;
-
-  {
-    // Test that if an optional or required message/group field appears multiple
-    // times in the input, they need to be merged.
-    unittest::TestParsingMergeLite::RepeatedFieldsGenerator generator;
-    unittest::TestAllTypesLite* msg1;
-    unittest::TestAllTypesLite* msg2;
-    unittest::TestAllTypesLite* msg3;
-
-#define ASSIGN_REPEATED_FIELD(FIELD) \
-  msg1 = generator.add_##FIELD();    \
-  msg2 = generator.add_##FIELD();    \
-  msg3 = generator.add_##FIELD();    \
-  AssignParsingMergeMessages(msg1, msg2, msg3)
-
-    ASSIGN_REPEATED_FIELD(field1);
-    ASSIGN_REPEATED_FIELD(field2);
-    ASSIGN_REPEATED_FIELD(field3);
-    ASSIGN_REPEATED_FIELD(ext1);
-    ASSIGN_REPEATED_FIELD(ext2);
-
-#undef ASSIGN_REPEATED_FIELD
-#define ASSIGN_REPEATED_GROUP(FIELD)                \
-  msg1 = generator.add_##FIELD()->mutable_field1(); \
-  msg2 = generator.add_##FIELD()->mutable_field1(); \
-  msg3 = generator.add_##FIELD()->mutable_field1(); \
-  AssignParsingMergeMessages(msg1, msg2, msg3)
-
-    ASSIGN_REPEATED_GROUP(group1);
-    ASSIGN_REPEATED_GROUP(group2);
-
-#undef ASSIGN_REPEATED_GROUP
-
-    std::string buffer;
-    generator.SerializeToString(&buffer);
-    unittest::TestParsingMergeLite parsing_merge;
-    parsing_merge.ParseFromString(buffer);
-
-    // Required and optional fields should be merged.
-    ExpectMessageMerged(parsing_merge.required_all_types());
-    ExpectMessageMerged(parsing_merge.optional_all_types());
-    ExpectMessageMerged(
-        parsing_merge.optionalgroup().optional_group_all_types());
-    ExpectMessageMerged(parsing_merge.GetExtension(
-        unittest::TestParsingMergeLite::optional_ext));
-
-    // Repeated fields should not be merged.
-    EXPECT_EQ(parsing_merge.repeated_all_types_size(), 3);
-    EXPECT_EQ(parsing_merge.repeatedgroup_size(), 3);
-    EXPECT_EQ(parsing_merge.ExtensionSize(
-                  unittest::TestParsingMergeLite::repeated_ext),
-              3);
-  }
-}
-
-TEST(Lite, AllLite6) {
-  std::string data;
-
-  // Test unknown fields support for lite messages.
-  {
-    protobuf_unittest::TestAllTypesLite message, message2;
-    protobuf_unittest::TestEmptyMessageLite empty_message;
-    TestUtilLite::ExpectClear(message);
-    TestUtilLite::SetAllFields(&message);
-    data = message.SerializeAsString();
-    ASSERT_TRUE(empty_message.ParseFromString(data));
-    data.clear();
-    data = empty_message.SerializeAsString();
-    EXPECT_TRUE(message2.ParseFromString(data));
-    data = message2.SerializeAsString();
-    TestUtilLite::ExpectAllFieldsSet(message2);
-    message.Clear();
-    TestUtilLite::ExpectClear(message);
-  }
-}
-
-TEST(Lite, AllLite7) {
-  std::string data;
-
-  {
-    protobuf_unittest::TestAllExtensionsLite message, message2;
-    protobuf_unittest::TestEmptyMessageLite empty_message;
-    TestUtilLite::ExpectExtensionsClear(message);
-    TestUtilLite::SetAllExtensions(&message);
-    data = message.SerializeAsString();
-    empty_message.ParseFromString(data);
-    data.clear();
-    data = empty_message.SerializeAsString();
-    message2.ParseFromString(data);
-    data = message2.SerializeAsString();
-    TestUtilLite::ExpectAllExtensionsSet(message2);
-    message.Clear();
-    TestUtilLite::ExpectExtensionsClear(message);
-  }
-}
-
-TEST(Lite, AllLite8) {
-  std::string data;
-
-  {
-    protobuf_unittest::TestPackedTypesLite message, message2;
-    protobuf_unittest::TestEmptyMessageLite empty_message;
-    TestUtilLite::ExpectPackedClear(message);
-    TestUtilLite::SetPackedFields(&message);
-    data = message.SerializeAsString();
-    empty_message.ParseFromString(data);
-    data.clear();
-    data = empty_message.SerializeAsString();
-    message2.ParseFromString(data);
-    data = message2.SerializeAsString();
-    TestUtilLite::ExpectPackedFieldsSet(message2);
-    message.Clear();
-    TestUtilLite::ExpectPackedClear(message);
-  }
-}
-
-TEST(Lite, AllLite9) {
-  std::string data;
-
-  {
-    protobuf_unittest::TestPackedExtensionsLite message, message2;
-    protobuf_unittest::TestEmptyMessageLite empty_message;
-    TestUtilLite::ExpectPackedExtensionsClear(message);
-    TestUtilLite::SetPackedExtensions(&message);
-    data = message.SerializeAsString();
-    empty_message.ParseFromString(data);
-    data.clear();
-    data = empty_message.SerializeAsString();
-    message2.ParseFromString(data);
-    data = message2.SerializeAsString();
-    TestUtilLite::ExpectPackedExtensionsSet(message2);
-    message.Clear();
-    TestUtilLite::ExpectPackedExtensionsClear(message);
-  }
-}
-
-TEST(Lite, AllLite10) {
-  std::string data;
-
-  {
-    // Test Unknown fields swap
-    protobuf_unittest::TestEmptyMessageLite empty_message, empty_message2;
-    SetAllTypesInEmptyMessageUnknownFields(&empty_message);
-    SetSomeTypesInEmptyMessageUnknownFields(&empty_message2);
-    data = empty_message.SerializeAsString();
-    std::string data2 = empty_message2.SerializeAsString();
-    empty_message.Swap(&empty_message2);
-    EXPECT_EQ(data, empty_message2.SerializeAsString());
-    EXPECT_EQ(data2, empty_message.SerializeAsString());
-  }
-}
-
-TEST(Lite, AllLite11) {
-  std::string data;
-
-  {
-    // Test unknown fields swap with self
-    protobuf_unittest::TestEmptyMessageLite empty_message;
-    SetAllTypesInEmptyMessageUnknownFields(&empty_message);
-    data = empty_message.SerializeAsString();
-    empty_message.Swap(&empty_message);
-    EXPECT_EQ(data, empty_message.SerializeAsString());
-  }
-}
-
-TEST(Lite, AllLite12) {
-  std::string data;
-
-  {
-    // Test MergeFrom with unknown fields
-    protobuf_unittest::TestAllTypesLite message, message2;
-    protobuf_unittest::TestEmptyMessageLite empty_message, empty_message2;
-    message.set_optional_int32(101);
-    message.add_repeated_int32(201);
-    message.set_optional_nested_enum(unittest::TestAllTypesLite::BAZ);
-    message2.set_optional_int64(102);
-    message2.add_repeated_int64(202);
-    message2.set_optional_foreign_enum(unittest::FOREIGN_LITE_BAZ);
-
-    data = message.SerializeAsString();
-    empty_message.ParseFromString(data);
-    data = message2.SerializeAsString();
-    empty_message2.ParseFromString(data);
-    message.MergeFrom(message2);
-    empty_message.MergeFrom(empty_message2);
-
-    data = empty_message.SerializeAsString();
-    message2.ParseFromString(data);
-    // We do not compare the serialized output of a normal message and a lite
-    // message because the order of fields do not match. We convert lite message
-    // back into normal message, then compare.
-    EXPECT_EQ(message.SerializeAsString(), message2.SerializeAsString());
-  }
-}
-
-TEST(Lite, AllLite13) {
-  std::string data;
-
-  {
-    // Test unknown enum value
-    protobuf_unittest::TestAllTypesLite message;
-    std::string buffer;
-    {
-      io::StringOutputStream output_stream(&buffer);
-      io::CodedOutputStream coded_output(&output_stream);
-      internal::WireFormatLite::WriteTag(
-          protobuf_unittest::TestAllTypesLite::kOptionalNestedEnumFieldNumber,
-          internal::WireFormatLite::WIRETYPE_VARINT, &coded_output);
-      coded_output.WriteVarint32(10);
-      internal::WireFormatLite::WriteTag(
-          protobuf_unittest::TestAllTypesLite::kRepeatedNestedEnumFieldNumber,
-          internal::WireFormatLite::WIRETYPE_VARINT, &coded_output);
-      coded_output.WriteVarint32(20);
-    }
-    message.ParseFromString(buffer);
-    data = message.SerializeAsString();
-    EXPECT_EQ(data, buffer);
-  }
-}
-
-TEST(Lite, AllLite14) {
-  std::string data;
-
-  {
-    // Test Clear with unknown fields
-    protobuf_unittest::TestEmptyMessageLite empty_message;
-    SetAllTypesInEmptyMessageUnknownFields(&empty_message);
-    empty_message.Clear();
-    EXPECT_EQ(0, empty_message.unknown_fields().size());
-  }
-}
-
-// Tests for map lite =============================================
-
-TEST(Lite, AllLite15) {
-  std::string data;
-
-  {
-    // Accessors
-    protobuf_unittest::TestMapLite message;
-
-    MapLiteTestUtil::SetMapFields(&message);
-    MapLiteTestUtil::ExpectMapFieldsSet(message);
-
-    MapLiteTestUtil::ModifyMapFields(&message);
-    MapLiteTestUtil::ExpectMapFieldsModified(message);
-  }
-}
-
-TEST(Lite, AllLite16) {
-  std::string data;
-
-  {
-    // SetMapFieldsInitialized
-    protobuf_unittest::TestMapLite message;
-
-    MapLiteTestUtil::SetMapFieldsInitialized(&message);
-    MapLiteTestUtil::ExpectMapFieldsSetInitialized(message);
-  }
-}
-
-TEST(Lite, AllLite17) {
-  std::string data;
-
-  {
-    // Clear
-    protobuf_unittest::TestMapLite message;
-
-    MapLiteTestUtil::SetMapFields(&message);
-    message.Clear();
-    MapLiteTestUtil::ExpectClear(message);
-  }
-}
-
-TEST(Lite, AllLite18) {
-  std::string data;
-
-  {
-    // ClearMessageMap
-    protobuf_unittest::TestMessageMapLite message;
-
-    // Creates a TestAllTypes with default value
-    TestUtilLite::ExpectClear((*message.mutable_map_int32_message())[0]);
-  }
-}
-
-TEST(Lite, AllLite19) {
-  std::string data;
-
-  {
-    // CopyFrom
-    protobuf_unittest::TestMapLite message1, message2;
-
-    MapLiteTestUtil::SetMapFields(&message1);
-    message2.CopyFrom(message1);
-    MapLiteTestUtil::ExpectMapFieldsSet(message2);
-
-    // Copying from self should be a no-op.
-    message2.CopyFrom(message2);
-    MapLiteTestUtil::ExpectMapFieldsSet(message2);
-  }
-}
-
-TEST(Lite, AllLite20) {
-  std::string data;
-
-  {
-    // CopyFromMessageMap
-    protobuf_unittest::TestMessageMapLite message1, message2;
-
-    (*message1.mutable_map_int32_message())[0].add_repeated_int32(100);
-    (*message2.mutable_map_int32_message())[0].add_repeated_int32(101);
-
-    message1.CopyFrom(message2);
-
-    // Checks repeated field is overwritten.
-    EXPECT_EQ(1, message1.map_int32_message().at(0).repeated_int32_size());
-    EXPECT_EQ(101, message1.map_int32_message().at(0).repeated_int32(0));
-  }
-}
-
-TEST(Lite, AllLite21) {
-  std::string data;
-
-  {
-    // SwapWithEmpty
-    protobuf_unittest::TestMapLite message1, message2;
-
-    MapLiteTestUtil::SetMapFields(&message1);
-    MapLiteTestUtil::ExpectMapFieldsSet(message1);
-    MapLiteTestUtil::ExpectClear(message2);
-
-    message1.Swap(&message2);
-    MapLiteTestUtil::ExpectMapFieldsSet(message2);
-    MapLiteTestUtil::ExpectClear(message1);
-  }
-}
-
-TEST(Lite, AllLite22) {
-  std::string data;
-
-  {
-    // SwapWithSelf
-    protobuf_unittest::TestMapLite message;
-
-    MapLiteTestUtil::SetMapFields(&message);
-    MapLiteTestUtil::ExpectMapFieldsSet(message);
-
-    message.Swap(&message);
-    MapLiteTestUtil::ExpectMapFieldsSet(message);
-  }
-}
-
-TEST(Lite, AllLite23) {
-  std::string data;
-
-  {
-    // SwapWithOther
-    protobuf_unittest::TestMapLite message1, message2;
-
-    MapLiteTestUtil::SetMapFields(&message1);
-    MapLiteTestUtil::SetMapFields(&message2);
-    MapLiteTestUtil::ModifyMapFields(&message2);
-
-    message1.Swap(&message2);
-    MapLiteTestUtil::ExpectMapFieldsModified(message1);
-    MapLiteTestUtil::ExpectMapFieldsSet(message2);
-  }
-}
-
-TEST(Lite, AllLite24) {
-  std::string data;
-
-  {
-    // CopyConstructor
-    protobuf_unittest::TestMapLite message1;
-    MapLiteTestUtil::SetMapFields(&message1);
-
-    protobuf_unittest::TestMapLite message2(message1);
-    MapLiteTestUtil::ExpectMapFieldsSet(message2);
-  }
-}
-
-TEST(Lite, AllLite25) {
-  std::string data;
-
-  {
-    // CopyAssignmentOperator
-    protobuf_unittest::TestMapLite message1;
-    MapLiteTestUtil::SetMapFields(&message1);
-
-    protobuf_unittest::TestMapLite message2;
-    message2 = message1;
-    MapLiteTestUtil::ExpectMapFieldsSet(message2);
-
-    // Make sure that self-assignment does something sane.
-    message2.operator=(message2);
-    MapLiteTestUtil::ExpectMapFieldsSet(message2);
-  }
-}
-
-TEST(Lite, AllLite26) {
-  std::string data;
-
-  {
-    // NonEmptyMergeFrom
-    protobuf_unittest::TestMapLite message1, message2;
-
-    MapLiteTestUtil::SetMapFields(&message1);
-
-    // This field will test merging into an empty spot.
-    (*message2.mutable_map_int32_int32())[1] = 1;
-    message1.mutable_map_int32_int32()->erase(1);
-
-    // This tests overwriting.
-    (*message2.mutable_map_int32_double())[1] = 1;
-    (*message1.mutable_map_int32_double())[1] = 2;
-
-    message1.MergeFrom(message2);
-    MapLiteTestUtil::ExpectMapFieldsSet(message1);
-  }
-}
-
-TEST(Lite, AllLite27) {
-  std::string data;
-
-  {
-    // MergeFromMessageMap
-    protobuf_unittest::TestMessageMapLite message1, message2;
-
-    (*message1.mutable_map_int32_message())[0].add_repeated_int32(100);
-    (*message2.mutable_map_int32_message())[0].add_repeated_int32(101);
-
-    message1.MergeFrom(message2);
-
-    // Checks repeated field is overwritten.
-    EXPECT_EQ(1, message1.map_int32_message().at(0).repeated_int32_size());
-    EXPECT_EQ(101, message1.map_int32_message().at(0).repeated_int32(0));
-  }
-}
-
-TEST(Lite, AllLite28) {
-  std::string data;
-
-  {
-    // Test the generated SerializeWithCachedSizesToArray()
-    protobuf_unittest::TestMapLite message1, message2;
-    std::string data;
-    MapLiteTestUtil::SetMapFields(&message1);
-    size_t size = message1.ByteSizeLong();
-    data.resize(size);
-    ::uint8_t* start =
-        reinterpret_cast<::uint8_t*>(::google::protobuf::string_as_array(&data));
-    ::uint8_t* end = message1.SerializeWithCachedSizesToArray(start);
-    EXPECT_EQ(size, end - start);
-    EXPECT_TRUE(message2.ParseFromString(data));
-    MapLiteTestUtil::ExpectMapFieldsSet(message2);
-  }
-}
-
-TEST(Lite, AllLite29) {
-  std::string data;
-
-  {
-    // Test the generated SerializeWithCachedSizes()
-    protobuf_unittest::TestMapLite message1, message2;
-    MapLiteTestUtil::SetMapFields(&message1);
-    size_t size = message1.ByteSizeLong();
-    std::string data;
-    data.resize(size);
-    {
-      // Allow the output stream to buffer only one byte at a time.
-      io::ArrayOutputStream array_stream(::google::protobuf::string_as_array(&data), size, 1);
-      io::CodedOutputStream output_stream(&array_stream);
-      message1.SerializeWithCachedSizes(&output_stream);
-      EXPECT_FALSE(output_stream.HadError());
-      EXPECT_EQ(size, output_stream.ByteCount());
-    }
-    EXPECT_TRUE(message2.ParseFromString(data));
-    MapLiteTestUtil::ExpectMapFieldsSet(message2);
-  }
-}
-
-
-TEST(Lite, AllLite32) {
-  std::string data;
-
-  {
-    // Proto2UnknownEnum
-    protobuf_unittest::TestEnumMapPlusExtraLite from;
-    (*from.mutable_known_map_field())[0] =
-        protobuf_unittest::E_PROTO2_MAP_ENUM_FOO_LITE;
-    (*from.mutable_unknown_map_field())[0] =
-        protobuf_unittest::E_PROTO2_MAP_ENUM_EXTRA_LITE;
-    std::string data;
-    from.SerializeToString(&data);
-
-    protobuf_unittest::TestEnumMapLite to;
-    EXPECT_TRUE(to.ParseFromString(data));
-    EXPECT_EQ(0, to.unknown_map_field().size());
-    EXPECT_FALSE(to.mutable_unknown_fields()->empty());
-    ASSERT_EQ(1, to.known_map_field().size());
-    EXPECT_EQ(protobuf_unittest::PROTO2_MAP_ENUM_FOO_LITE,
-              to.known_map_field().at(0));
-
-    data.clear();
-    from.Clear();
-    to.SerializeToString(&data);
-    EXPECT_TRUE(from.ParseFromString(data));
-    ASSERT_EQ(1, from.known_map_field().size());
-    EXPECT_EQ(protobuf_unittest::E_PROTO2_MAP_ENUM_FOO_LITE,
-              from.known_map_field().at(0));
-    ASSERT_EQ(1, from.unknown_map_field().size());
-    EXPECT_EQ(protobuf_unittest::E_PROTO2_MAP_ENUM_EXTRA_LITE,
-              from.unknown_map_field().at(0));
-  }
-}
-
-TEST(Lite, AllLite33) {
-  std::string data;
-
-  {
-    // StandardWireFormat
-    protobuf_unittest::TestMapLite message;
-    std::string data = "\x0A\x04\x08\x01\x10\x01";
-
-    EXPECT_TRUE(message.ParseFromString(data));
-    ASSERT_EQ(1, message.map_int32_int32().size());
-    EXPECT_EQ(1, message.map_int32_int32().at(1));
-  }
-}
-
-TEST(Lite, AllLite34) {
-  std::string data;
-
-  {
-    // UnorderedWireFormat
-    protobuf_unittest::TestMapLite message;
-
-    // put value before key in wire format
-    std::string data = "\x0A\x04\x10\x01\x08\x02";
-
-    EXPECT_TRUE(message.ParseFromString(data));
-    ASSERT_EQ(1, message.map_int32_int32().size());
-    ASSERT_NE(message.map_int32_int32().find(2),
-              message.map_int32_int32().end());
-    EXPECT_EQ(1, message.map_int32_int32().at(2));
-  }
-}
-
-TEST(Lite, AllLite35) {
-  std::string data;
-
-  {
-    // DuplicatedKeyWireFormat
-    protobuf_unittest::TestMapLite message;
-
-    // Two key fields in wire format
-    std::string data = "\x0A\x06\x08\x01\x08\x02\x10\x01";
-
-    EXPECT_TRUE(message.ParseFromString(data));
-    ASSERT_EQ(1, message.map_int32_int32().size());
-    EXPECT_EQ(1, message.map_int32_int32().at(2));
-  }
-}
-
-TEST(Lite, AllLite36) {
-  std::string data;
-
-  {
-    // DuplicatedValueWireFormat
-    protobuf_unittest::TestMapLite message;
-
-    // Two value fields in wire format
-    std::string data = "\x0A\x06\x08\x01\x10\x01\x10\x02";
-
-    EXPECT_TRUE(message.ParseFromString(data));
-    ASSERT_EQ(1, message.map_int32_int32().size());
-    EXPECT_EQ(2, message.map_int32_int32().at(1));
-  }
-}
-
-TEST(Lite, AllLite37) {
-  std::string data;
-
-  {
-    // MissedKeyWireFormat
-    protobuf_unittest::TestMapLite message;
-
-    // No key field in wire format
-    std::string data = "\x0A\x02\x10\x01";
-
-    EXPECT_TRUE(message.ParseFromString(data));
-    ASSERT_EQ(1, message.map_int32_int32().size());
-    ASSERT_NE(message.map_int32_int32().find(0),
-              message.map_int32_int32().end());
-    EXPECT_EQ(1, message.map_int32_int32().at(0));
-  }
-}
-
-TEST(Lite, AllLite38) {
-  std::string data;
-
-  {
-    // MissedValueWireFormat
-    protobuf_unittest::TestMapLite message;
-
-    // No value field in wire format
-    std::string data = "\x0A\x02\x08\x01";
-
-    EXPECT_TRUE(message.ParseFromString(data));
-    ASSERT_EQ(1, message.map_int32_int32().size());
-    ASSERT_NE(message.map_int32_int32().find(1),
-              message.map_int32_int32().end());
-    EXPECT_EQ(0, message.map_int32_int32().at(1));
-  }
-}
-
-TEST(Lite, AllLite39) {
-  std::string data;
-
-  {
-    // UnknownFieldWireFormat
-    protobuf_unittest::TestMapLite message;
-
-    // Unknown field in wire format
-    std::string data = "\x0A\x06\x08\x02\x10\x03\x18\x01";
-
-    EXPECT_TRUE(message.ParseFromString(data));
-    ASSERT_EQ(1, message.map_int32_int32().size());
-    EXPECT_EQ(3, message.map_int32_int32().at(2));
-  }
-}
-
-TEST(Lite, AllLite40) {
-  std::string data;
-
-  {
-    // CorruptedWireFormat
-    protobuf_unittest::TestMapLite message;
-
-    // corrupted data in wire format
-    std::string data = "\x0A\x06\x08\x02\x11\x03";
-
-    EXPECT_FALSE(message.ParseFromString(data));
-  }
-}
-
-TEST(Lite, AllLite41) {
-  std::string data;
-
-  {
-    // IsInitialized
-    protobuf_unittest::TestRequiredMessageMapLite map_message;
-
-    // Add an uninitialized message.
-    (*map_message.mutable_map_field())[0];
-    EXPECT_FALSE(map_message.IsInitialized());
-
-    // Initialize uninitialized message
-    (*map_message.mutable_map_field())[0].set_a(0);
-    (*map_message.mutable_map_field())[0].set_b(0);
-    (*map_message.mutable_map_field())[0].set_c(0);
-    EXPECT_TRUE(map_message.IsInitialized());
-  }
-}
-
-TEST(Lite, AllLite42) {
-  std::string data;
-
-  {
-    // Check that adding more values to enum does not corrupt message
-    // when passed through an old client.
-    protobuf_unittest::V2MessageLite v2_message;
-    v2_message.set_int_field(800);
-    // Set enum field to the value not understood by the old client.
-    v2_message.set_enum_field(protobuf_unittest::V2_SECOND);
-    std::string v2_bytes = v2_message.SerializeAsString();
-
-    protobuf_unittest::V1MessageLite v1_message;
-    v1_message.ParseFromString(v2_bytes);
-    EXPECT_TRUE(v1_message.IsInitialized());
-    EXPECT_EQ(v1_message.int_field(), v2_message.int_field());
-    // V1 client does not understand V2_SECOND value, so it discards it and
-    // uses default value instead.
-    EXPECT_EQ(v1_message.enum_field(), protobuf_unittest::V1_FIRST);
-
-    // However, when re-serialized, it should preserve enum value.
-    std::string v1_bytes = v1_message.SerializeAsString();
-
-    protobuf_unittest::V2MessageLite same_v2_message;
-    same_v2_message.ParseFromString(v1_bytes);
-
-    EXPECT_EQ(v2_message.int_field(), same_v2_message.int_field());
-    EXPECT_EQ(v2_message.enum_field(), same_v2_message.enum_field());
-  }
-}
-
-// Test that when parsing a oneof, we can successfully clear whatever already
-// happened to be stored in the oneof.
-TEST(Lite, AllLite43) {
-  protobuf_unittest::TestOneofParsingLite message1;
-
-  message1.set_oneof_int32(17);
-  std::string serialized;
-  EXPECT_TRUE(message1.SerializeToString(&serialized));
-
-  // Submessage
-  {
-    protobuf_unittest::TestOneofParsingLite message2;
-    message2.mutable_oneof_submessage();
-    io::CodedInputStream input_stream(
-        reinterpret_cast<const ::uint8_t*>(serialized.data()),
-        serialized.size());
-    EXPECT_TRUE(message2.MergeFromCodedStream(&input_stream));
-    EXPECT_EQ(17, message2.oneof_int32());
-  }
-
-  // String
-  {
-    protobuf_unittest::TestOneofParsingLite message2;
-    message2.set_oneof_string("string");
-    io::CodedInputStream input_stream(
-        reinterpret_cast<const ::uint8_t*>(serialized.data()),
-        serialized.size());
-    EXPECT_TRUE(message2.MergeFromCodedStream(&input_stream));
-    EXPECT_EQ(17, message2.oneof_int32());
-  }
-
-  // Bytes
-  {
-    protobuf_unittest::TestOneofParsingLite message2;
-    message2.set_oneof_bytes("bytes");
-    io::CodedInputStream input_stream(
-        reinterpret_cast<const ::uint8_t*>(serialized.data()),
-        serialized.size());
-    EXPECT_TRUE(message2.MergeFromCodedStream(&input_stream));
-    EXPECT_EQ(17, message2.oneof_int32());
-  }
-}
-
-// Verify that we can successfully parse fields of various types within oneof
-// fields. We also verify that we can parse the same data twice into the same
-// message.
-TEST(Lite, AllLite44) {
-  // Int32
-  {
-    protobuf_unittest::TestOneofParsingLite original;
-    original.set_oneof_int32(17);
-    std::string serialized;
-    EXPECT_TRUE(original.SerializeToString(&serialized));
-    protobuf_unittest::TestOneofParsingLite parsed;
-    for (int i = 0; i < 2; ++i) {
-      io::CodedInputStream input_stream(
-          reinterpret_cast<const ::uint8_t*>(serialized.data()),
-          serialized.size());
-      EXPECT_TRUE(parsed.MergeFromCodedStream(&input_stream));
-      EXPECT_EQ(17, parsed.oneof_int32());
-    }
-  }
-
-  // Submessage
-  {
-    protobuf_unittest::TestOneofParsingLite original;
-    original.mutable_oneof_submessage()->set_optional_int32(5);
-    std::string serialized;
-    EXPECT_TRUE(original.SerializeToString(&serialized));
-    protobuf_unittest::TestOneofParsingLite parsed;
-    for (int i = 0; i < 2; ++i) {
-      io::CodedInputStream input_stream(
-          reinterpret_cast<const ::uint8_t*>(serialized.data()),
-          serialized.size());
-      EXPECT_TRUE(parsed.MergeFromCodedStream(&input_stream));
-      EXPECT_EQ(5, parsed.oneof_submessage().optional_int32());
-    }
-  }
-
-  // String
-  {
-    protobuf_unittest::TestOneofParsingLite original;
-    original.set_oneof_string("string");
-    std::string serialized;
-    EXPECT_TRUE(original.SerializeToString(&serialized));
-    protobuf_unittest::TestOneofParsingLite parsed;
-    for (int i = 0; i < 2; ++i) {
-      io::CodedInputStream input_stream(
-          reinterpret_cast<const ::uint8_t*>(serialized.data()),
-          serialized.size());
-      EXPECT_TRUE(parsed.MergeFromCodedStream(&input_stream));
-      EXPECT_EQ("string", parsed.oneof_string());
-    }
-  }
-
-  // Bytes
-  {
-    protobuf_unittest::TestOneofParsingLite original;
-    original.set_oneof_bytes("bytes");
-    std::string serialized;
-    EXPECT_TRUE(original.SerializeToString(&serialized));
-    protobuf_unittest::TestOneofParsingLite parsed;
-    for (int i = 0; i < 2; ++i) {
-      io::CodedInputStream input_stream(
-          reinterpret_cast<const ::uint8_t*>(serialized.data()),
-          serialized.size());
-      EXPECT_TRUE(parsed.MergeFromCodedStream(&input_stream));
-      EXPECT_EQ("bytes", parsed.oneof_bytes());
-    }
-  }
-
-  // Enum
-  {
-    protobuf_unittest::TestOneofParsingLite original;
-    original.set_oneof_enum(protobuf_unittest::V2_SECOND);
-    std::string serialized;
-    EXPECT_TRUE(original.SerializeToString(&serialized));
-    protobuf_unittest::TestOneofParsingLite parsed;
-    for (int i = 0; i < 2; ++i) {
-      io::CodedInputStream input_stream(
-          reinterpret_cast<const ::uint8_t*>(serialized.data()),
-          serialized.size());
-      EXPECT_TRUE(parsed.MergeFromCodedStream(&input_stream));
-      EXPECT_EQ(protobuf_unittest::V2_SECOND, parsed.oneof_enum());
-    }
-  }
-
-  std::cout << "PASS" << std::endl;
-}
-
-TEST(Lite, AllLite45) {
-  // Test unknown fields are not discarded upon parsing.
-  std::string data = "\20\1";  // varint 1 with field number 2
-
-  protobuf_unittest::ForeignMessageLite a;
-  EXPECT_TRUE(a.ParseFromString(data));
-  io::CodedInputStream input_stream(
-      reinterpret_cast<const ::uint8_t*>(data.data()), data.size());
-  EXPECT_TRUE(a.MergePartialFromCodedStream(&input_stream));
-
-  std::string serialized = a.SerializeAsString();
-  EXPECT_EQ(serialized.substr(0, 2), data);
-  EXPECT_EQ(serialized.substr(2), data);
-}
-
-// The following two tests check for wire compatibility between packed and
-// unpacked repeated fields. There used to be a bug in the generated parsing
-// code that caused us to calculate the highest possible tag number without
-// taking into account that a repeated field might not be in the packed (or
-// unpacked) state we expect. These tests specifically check for that issue by
-// making sure we can parse repeated fields when the tag is higher than we would
-// expect.
-TEST(Lite, AllLite46) {
-  protobuf_unittest::PackedInt32 packed;
-  packed.add_repeated_int32(42);
-  std::string serialized;
-  ASSERT_TRUE(packed.SerializeToString(&serialized));
-
-  protobuf_unittest::NonPackedInt32 non_packed;
-  ASSERT_TRUE(non_packed.ParseFromString(serialized));
-  ASSERT_EQ(1, non_packed.repeated_int32_size());
-  EXPECT_EQ(42, non_packed.repeated_int32(0));
-}
-
-TEST(Lite, AllLite47) {
-  protobuf_unittest::NonPackedFixed32 non_packed;
-  non_packed.add_repeated_fixed32(42);
-  std::string serialized;
-  ASSERT_TRUE(non_packed.SerializeToString(&serialized));
-
-  protobuf_unittest::PackedFixed32 packed;
-  ASSERT_TRUE(packed.ParseFromString(serialized));
-  ASSERT_EQ(1, packed.repeated_fixed32_size());
-  EXPECT_EQ(42, packed.repeated_fixed32(0));
-}
-
-TEST(Lite, MapCrash) {
-  // See b/113635730
-  Arena arena;
-  auto msg = Arena::CreateMessage<protobuf_unittest::TestMapLite>(&arena);
-  // Payload for the map<string, Enum> with a enum varint that's longer >
-  // 10 bytes. This causes a parse fail and a subsequent delete. field 16
-  // (map<int32, MapEnumLite>) tag = 128+2 = \202 \1
-  //   13 long \15
-  //   int32 key = 1  (\10 \1)
-  //   MapEnumLite value = too long varint (parse error)
-  EXPECT_FALSE(msg->ParseFromString(
-      "\202\1\15\10\1\200\200\200\200\200\200\200\200\200\200\1"));
-}
-
-TEST(Lite, CorrectEnding) {
-  protobuf_unittest::TestAllTypesLite msg;
-  {
-    // All proto wireformat parsers should act the same on parsing data in as
-    // much as it concerns the parsing, ie. not the interpretation of the data.
-    // TestAllTypesLite is not a group inside another message. So in practice
-    // will not encounter an end-group tag. However the parser should behave
-    // like any wire format parser should.
-    static const char kWireFormat[] = "\204\1";
-    io::CodedInputStream cis(reinterpret_cast<const uint8_t*>(kWireFormat), 2);
-    // The old CodedInputStream parser got an optimization (ReadTagNoLastTag)
-    // for non-group messages (like TestAllTypesLite) which made it not accept
-    // end-group. This is not a real big deal, but I think going forward its
-    // good to have all parse loops behave 'exactly' the same.
-    EXPECT_TRUE(msg.MergePartialFromCodedStream(&cis));
-    EXPECT_FALSE(cis.ConsumedEntireMessage());
-    EXPECT_TRUE(cis.LastTagWas(132));
-  }
-  {
-    // This is an incomplete end-group tag. This should be a genuine parse
-    // failure.
-    static const char kWireFormat[] = "\214";
-    io::CodedInputStream cis(reinterpret_cast<const uint8_t*>(kWireFormat), 1);
-    // Unfortunately the old parser detects a parse error in ReadTag and returns
-    // 0 (as it states 0 is an invalid tag). However 0 is not an invalid tag
-    // as it can be used to terminate the stream, so this returns true.
-    EXPECT_FALSE(msg.MergePartialFromCodedStream(&cis));
-  }
-}
-
-TEST(Lite, DebugString) {
-  protobuf_unittest::TestAllTypesLite message1, message2;
-  EXPECT_TRUE(HasPrefixString(message1.DebugString(), "MessageLite at 0x"));
-  EXPECT_TRUE(HasPrefixString(message2.DebugString(), "MessageLite at 0x"));
-
-  // DebugString() and ShortDebugString() are the same for now.
-  EXPECT_EQ(message1.DebugString(), message1.ShortDebugString());
-
-  // Even identical lite protos should have different DebugString() output. Part
-  // of the reason for including the memory address is so that we get some
-  // non-determinism, which should make it easier for us to change the output
-  // later without breaking any code.
-  EXPECT_NE(message1.DebugString(), message2.DebugString());
-}
-
-TEST(Lite, EnumValueToName) {
-  EXPECT_EQ("FOREIGN_LITE_FOO", protobuf_unittest::ForeignEnumLite_Name(
-                                    protobuf_unittest::FOREIGN_LITE_FOO));
-  EXPECT_EQ("FOREIGN_LITE_BAR", protobuf_unittest::ForeignEnumLite_Name(
-                                    protobuf_unittest::FOREIGN_LITE_BAR));
-  EXPECT_EQ("FOREIGN_LITE_BAZ", protobuf_unittest::ForeignEnumLite_Name(
-                                    protobuf_unittest::FOREIGN_LITE_BAZ));
-  EXPECT_EQ("", protobuf_unittest::ForeignEnumLite_Name(0));
-  EXPECT_EQ("", protobuf_unittest::ForeignEnumLite_Name(999));
-}
-
-TEST(Lite, NestedEnumValueToName) {
-  EXPECT_EQ("FOO", protobuf_unittest::TestAllTypesLite::NestedEnum_Name(
-                       protobuf_unittest::TestAllTypesLite::FOO));
-  EXPECT_EQ("BAR", protobuf_unittest::TestAllTypesLite::NestedEnum_Name(
-                       protobuf_unittest::TestAllTypesLite::BAR));
-  EXPECT_EQ("BAZ", protobuf_unittest::TestAllTypesLite::NestedEnum_Name(
-                       protobuf_unittest::TestAllTypesLite::BAZ));
-  EXPECT_EQ("", protobuf_unittest::TestAllTypesLite::NestedEnum_Name(0));
-  EXPECT_EQ("", protobuf_unittest::TestAllTypesLite::NestedEnum_Name(999));
-}
-
-TEST(Lite, EnumNameToValue) {
-  protobuf_unittest::ForeignEnumLite value;
-
-  ASSERT_TRUE(
-      protobuf_unittest::ForeignEnumLite_Parse("FOREIGN_LITE_FOO", &value));
-  EXPECT_EQ(protobuf_unittest::FOREIGN_LITE_FOO, value);
-
-  ASSERT_TRUE(
-      protobuf_unittest::ForeignEnumLite_Parse("FOREIGN_LITE_BAR", &value));
-  EXPECT_EQ(protobuf_unittest::FOREIGN_LITE_BAR, value);
-
-  ASSERT_TRUE(
-      protobuf_unittest::ForeignEnumLite_Parse("FOREIGN_LITE_BAZ", &value));
-  EXPECT_EQ(protobuf_unittest::FOREIGN_LITE_BAZ, value);
-
-  // Non-existent values
-  EXPECT_FALSE(protobuf_unittest::ForeignEnumLite_Parse("E", &value));
-  EXPECT_FALSE(
-      protobuf_unittest::ForeignEnumLite_Parse("FOREIGN_LITE_C", &value));
-  EXPECT_FALSE(protobuf_unittest::ForeignEnumLite_Parse("G", &value));
-}
-
-TEST(Lite, NestedEnumNameToValue) {
-  protobuf_unittest::TestAllTypesLite::NestedEnum value;
-
-  ASSERT_TRUE(
-      protobuf_unittest::TestAllTypesLite::NestedEnum_Parse("FOO", &value));
-  EXPECT_EQ(protobuf_unittest::TestAllTypesLite::FOO, value);
-
-  ASSERT_TRUE(
-      protobuf_unittest::TestAllTypesLite::NestedEnum_Parse("BAR", &value));
-  EXPECT_EQ(protobuf_unittest::TestAllTypesLite::BAR, value);
-
-  ASSERT_TRUE(
-      protobuf_unittest::TestAllTypesLite::NestedEnum_Parse("BAZ", &value));
-  EXPECT_EQ(protobuf_unittest::TestAllTypesLite::BAZ, value);
-
-  // Non-existent values
-  EXPECT_FALSE(
-      protobuf_unittest::TestAllTypesLite::NestedEnum_Parse("A", &value));
-  EXPECT_FALSE(
-      protobuf_unittest::TestAllTypesLite::NestedEnum_Parse("C", &value));
-  EXPECT_FALSE(
-      protobuf_unittest::TestAllTypesLite::NestedEnum_Parse("G", &value));
-}
-
-TEST(Lite, AliasedEnum) {
-  // Enums with allow_alias = true can have multiple entries with the same
-  // value.
-  EXPECT_EQ("FOO1", protobuf_unittest::DupEnum::TestEnumWithDupValueLite_Name(
-                        protobuf_unittest::DupEnum::FOO1));
-  EXPECT_EQ("FOO1", protobuf_unittest::DupEnum::TestEnumWithDupValueLite_Name(
-                        protobuf_unittest::DupEnum::FOO2));
-  EXPECT_EQ("BAR1", protobuf_unittest::DupEnum::TestEnumWithDupValueLite_Name(
-                        protobuf_unittest::DupEnum::BAR1));
-  EXPECT_EQ("BAR1", protobuf_unittest::DupEnum::TestEnumWithDupValueLite_Name(
-                        protobuf_unittest::DupEnum::BAR2));
-  EXPECT_EQ("BAZ", protobuf_unittest::DupEnum::TestEnumWithDupValueLite_Name(
-                       protobuf_unittest::DupEnum::BAZ));
-  EXPECT_EQ("", protobuf_unittest::DupEnum::TestEnumWithDupValueLite_Name(999));
-
-  protobuf_unittest::DupEnum::TestEnumWithDupValueLite value;
-  ASSERT_TRUE(
-      protobuf_unittest::DupEnum::TestEnumWithDupValueLite_Parse("FOO1", &value));
-  EXPECT_EQ(protobuf_unittest::DupEnum::FOO1, value);
-
-  value = static_cast<protobuf_unittest::DupEnum::TestEnumWithDupValueLite>(0);
-  ASSERT_TRUE(
-      protobuf_unittest::DupEnum::TestEnumWithDupValueLite_Parse("FOO2", &value));
-  EXPECT_EQ(protobuf_unittest::DupEnum::FOO2, value);
-}
-
-
-TEST(Lite, CodedInputStreamRollback) {
-  {
-    protobuf_unittest::TestAllTypesLite m;
-    m.set_optional_bytes(std::string(30, 'a'));
-    std::string serialized = m.SerializeAsString();
-    serialized += '\014';
-    serialized += std::string(3, ' ');
-    io::ArrayInputStream is(serialized.data(), serialized.size(),
-                            serialized.size() - 6);
-    {
-      io::CodedInputStream cis(&is);
-      m.Clear();
-      m.MergePartialFromCodedStream(&cis);
-      EXPECT_TRUE(cis.LastTagWas(12));
-      EXPECT_FALSE(cis.ConsumedEntireMessage());
-      // Should leave is with 3 spaces;
-    }
-    const void* data;
-    int size;
-    ASSERT_TRUE(is.Next(&data, &size));
-    ASSERT_EQ(size, 3);
-    EXPECT_EQ(memcmp(data, "   ", 3), 0);
-  }
-  {
-    protobuf_unittest::TestPackedTypesLite m;
-    constexpr int kCount = 30;
-    for (int i = 0; i < kCount; i++) m.add_packed_fixed32(i);
-    std::string serialized = m.SerializeAsString();
-    serialized += '\014';
-    serialized += std::string(3, ' ');
-    // Buffer breaks in middle of a fixed32.
-    io::ArrayInputStream is(serialized.data(), serialized.size(),
-                            serialized.size() - 7);
-    {
-      io::CodedInputStream cis(&is);
-      m.Clear();
-      m.MergePartialFromCodedStream(&cis);
-      EXPECT_TRUE(cis.LastTagWas(12));
-      EXPECT_FALSE(cis.ConsumedEntireMessage());
-      // Should leave is with 3 spaces;
-    }
-    ASSERT_EQ(m.packed_fixed32_size(), kCount);
-    for (int i = 0; i < kCount; i++) EXPECT_EQ(m.packed_fixed32(i), i);
-    const void* data;
-    int size;
-    ASSERT_TRUE(is.Next(&data, &size));
-    ASSERT_EQ(size, 3);
-    EXPECT_EQ(memcmp(data, "   ", 3), 0);
-  }
-  {
-    protobuf_unittest::TestPackedTypesLite m;
-    constexpr int kCount = 30;
-    // Make sure we output 2 byte varints
-    for (int i = 0; i < kCount; i++) m.add_packed_fixed32(128 + i);
-    std::string serialized = m.SerializeAsString();
-    serialized += '\014';
-    serialized += std::string(3, ' ');
-    // Buffer breaks in middle of a 2 byte varint.
-    io::ArrayInputStream is(serialized.data(), serialized.size(),
-                            serialized.size() - 5);
-    {
-      io::CodedInputStream cis(&is);
-      m.Clear();
-      m.MergePartialFromCodedStream(&cis);
-      EXPECT_TRUE(cis.LastTagWas(12));
-      EXPECT_FALSE(cis.ConsumedEntireMessage());
-      // Should leave is with 3 spaces;
-    }
-    ASSERT_EQ(m.packed_fixed32_size(), kCount);
-    for (int i = 0; i < kCount; i++) EXPECT_EQ(m.packed_fixed32(i), i + 128);
-    const void* data;
-    int size;
-    ASSERT_TRUE(is.Next(&data, &size));
-    ASSERT_EQ(size, 3);
-    EXPECT_EQ(memcmp(data, "   ", 3), 0);
-  }
-}
-
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/map.cc b/libs/protobuf/src/google/protobuf/map.cc
deleted file mode 100644
index d60a9a2..0000000
--- a/libs/protobuf/src/google/protobuf/map.cc
+++ /dev/null
@@ -1,41 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <google/protobuf/map.h>
-
-namespace google {
-namespace protobuf {
-namespace internal {
-
-void* const kGlobalEmptyTable[kGlobalEmptyTableSize] = {nullptr};
-
-}  // namespace internal
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/map.h b/libs/protobuf/src/google/protobuf/map.h
deleted file mode 100644
index 008c192..0000000
--- a/libs/protobuf/src/google/protobuf/map.h
+++ /dev/null
@@ -1,1448 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// This file defines the map container and its helpers to support protobuf maps.
-//
-// The Map and MapIterator types are provided by this header file.
-// Please avoid using other types defined here, unless they are public
-// types within Map or MapIterator, such as Map::value_type.
-
-#ifndef GOOGLE_PROTOBUF_MAP_H__
-#define GOOGLE_PROTOBUF_MAP_H__
-
-
-#include <functional>
-#include <initializer_list>
-#include <iterator>
-#include <limits>  // To support Visual Studio 2008
-#include <map>
-#include <string>
-#include <type_traits>
-#include <utility>
-
-#if defined(__cpp_lib_string_view)
-#include <string_view>
-#endif  // defined(__cpp_lib_string_view)
-
-#if !defined(GOOGLE_PROTOBUF_NO_RDTSC) && defined(__APPLE__)
-#include <mach/mach_time.h>
-#endif
-
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/arena.h>
-#include <google/protobuf/generated_enum_util.h>
-#include <google/protobuf/map_type_handler.h>
-#include <google/protobuf/port.h>
-#include <google/protobuf/stubs/hash.h>
-
-#ifdef SWIG
-#error "You cannot SWIG proto headers"
-#endif
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-
-template <typename Key, typename T>
-class Map;
-
-class MapIterator;
-
-template <typename Enum>
-struct is_proto_enum;
-
-namespace internal {
-template <typename Derived, typename Key, typename T,
-          WireFormatLite::FieldType key_wire_type,
-          WireFormatLite::FieldType value_wire_type>
-class MapFieldLite;
-
-template <typename Derived, typename Key, typename T,
-          WireFormatLite::FieldType key_wire_type,
-          WireFormatLite::FieldType value_wire_type>
-class MapField;
-
-template <typename Key, typename T>
-class TypeDefinedMapFieldBase;
-
-class DynamicMapField;
-
-class GeneratedMessageReflection;
-
-// re-implement std::allocator to use arena allocator for memory allocation.
-// Used for Map implementation. Users should not use this class
-// directly.
-template <typename U>
-class MapAllocator {
- public:
-  using value_type = U;
-  using pointer = value_type*;
-  using const_pointer = const value_type*;
-  using reference = value_type&;
-  using const_reference = const value_type&;
-  using size_type = size_t;
-  using difference_type = ptrdiff_t;
-
-  constexpr MapAllocator() : arena_(nullptr) {}
-  explicit constexpr MapAllocator(Arena* arena) : arena_(arena) {}
-  template <typename X>
-  MapAllocator(const MapAllocator<X>& allocator)  // NOLINT(runtime/explicit)
-      : arena_(allocator.arena()) {}
-
-  // MapAllocator does not support alignments beyond 8. Technically we should
-  // support up to std::max_align_t, but this fails with ubsan and tcmalloc
-  // debug allocation logic which assume 8 as default alignment.
-  static_assert(alignof(value_type) <= 8, "");
-
-  pointer allocate(size_type n, const void* /* hint */ = nullptr) {
-    // If arena is not given, malloc needs to be called which doesn't
-    // construct element object.
-    if (arena_ == nullptr) {
-      return static_cast<pointer>(::operator new(n * sizeof(value_type)));
-    } else {
-      return reinterpret_cast<pointer>(
-          Arena::CreateArray<uint8_t>(arena_, n * sizeof(value_type)));
-    }
-  }
-
-  void deallocate(pointer p, size_type n) {
-    if (arena_ == nullptr) {
-      internal::SizedDelete(p, n * sizeof(value_type));
-    }
-  }
-
-#if !defined(GOOGLE_PROTOBUF_OS_APPLE) && !defined(GOOGLE_PROTOBUF_OS_NACL) && \
-    !defined(GOOGLE_PROTOBUF_OS_EMSCRIPTEN)
-  template <class NodeType, class... Args>
-  void construct(NodeType* p, Args&&... args) {
-    // Clang 3.6 doesn't compile static casting to void* directly. (Issue
-    // #1266) According C++ standard 5.2.9/1: "The static_cast operator shall
-    // not cast away constness". So first the maybe const pointer is casted to
-    // const void* and after the const void* is const casted.
-    new (const_cast<void*>(static_cast<const void*>(p)))
-        NodeType(std::forward<Args>(args)...);
-  }
-
-  template <class NodeType>
-  void destroy(NodeType* p) {
-    p->~NodeType();
-  }
-#else
-  void construct(pointer p, const_reference t) { new (p) value_type(t); }
-
-  void destroy(pointer p) { p->~value_type(); }
-#endif
-
-  template <typename X>
-  struct rebind {
-    using other = MapAllocator<X>;
-  };
-
-  template <typename X>
-  bool operator==(const MapAllocator<X>& other) const {
-    return arena_ == other.arena_;
-  }
-
-  template <typename X>
-  bool operator!=(const MapAllocator<X>& other) const {
-    return arena_ != other.arena_;
-  }
-
-  // To support Visual Studio 2008
-  size_type max_size() const {
-    // parentheses around (std::...:max) prevents macro warning of max()
-    return (std::numeric_limits<size_type>::max)();
-  }
-
-  // To support gcc-4.4, which does not properly
-  // support templated friend classes
-  Arena* arena() const { return arena_; }
-
- private:
-  using DestructorSkippable_ = void;
-  Arena* arena_;
-};
-
-template <typename T>
-using KeyForTree =
-    typename std::conditional<std::is_scalar<T>::value, T,
-                              std::reference_wrapper<const T>>::type;
-
-// Default case: Not transparent.
-// We use std::hash<key_type>/std::less<key_type> and all the lookup functions
-// only accept `key_type`.
-template <typename key_type>
-struct TransparentSupport {
-  using hash = std::hash<key_type>;
-  using less = std::less<key_type>;
-
-  static bool Equals(const key_type& a, const key_type& b) { return a == b; }
-
-  template <typename K>
-  using key_arg = key_type;
-};
-
-#if defined(__cpp_lib_string_view)
-// If std::string_view is available, we add transparent support for std::string
-// keys. We use std::hash<std::string_view> as it supports the input types we
-// care about. The lookup functions accept arbitrary `K`. This will include any
-// key type that is convertible to std::string_view.
-template <>
-struct TransparentSupport<std::string> {
-  static std::string_view ImplicitConvert(std::string_view str) { return str; }
-  // If the element is not convertible to std::string_view, try to convert to
-  // std::string first.
-  // The template makes this overload lose resolution when both have the same
-  // rank otherwise.
-  template <typename = void>
-  static std::string_view ImplicitConvert(const std::string& str) {
-    return str;
-  }
-
-  struct hash : private std::hash<std::string_view> {
-    using is_transparent = void;
-
-    template <typename T>
-    size_t operator()(const T& str) const {
-      return base()(ImplicitConvert(str));
-    }
-
-   private:
-    const std::hash<std::string_view>& base() const { return *this; }
-  };
-  struct less {
-    using is_transparent = void;
-
-    template <typename T, typename U>
-    bool operator()(const T& t, const U& u) const {
-      return ImplicitConvert(t) < ImplicitConvert(u);
-    }
-  };
-
-  template <typename T, typename U>
-  static bool Equals(const T& t, const U& u) {
-    return ImplicitConvert(t) == ImplicitConvert(u);
-  }
-
-  template <typename K>
-  using key_arg = K;
-};
-#endif  // defined(__cpp_lib_string_view)
-
-template <typename Key>
-using TreeForMap =
-    std::map<KeyForTree<Key>, void*, typename TransparentSupport<Key>::less,
-             MapAllocator<std::pair<const KeyForTree<Key>, void*>>>;
-
-inline bool TableEntryIsEmpty(void* const* table, size_t b) {
-  return table[b] == nullptr;
-}
-inline bool TableEntryIsNonEmptyList(void* const* table, size_t b) {
-  return table[b] != nullptr && table[b] != table[b ^ 1];
-}
-inline bool TableEntryIsTree(void* const* table, size_t b) {
-  return !TableEntryIsEmpty(table, b) && !TableEntryIsNonEmptyList(table, b);
-}
-inline bool TableEntryIsList(void* const* table, size_t b) {
-  return !TableEntryIsTree(table, b);
-}
-
-// This captures all numeric types.
-inline size_t MapValueSpaceUsedExcludingSelfLong(bool) { return 0; }
-inline size_t MapValueSpaceUsedExcludingSelfLong(const std::string& str) {
-  return StringSpaceUsedExcludingSelfLong(str);
-}
-template <typename T,
-          typename = decltype(std::declval<const T&>().SpaceUsedLong())>
-size_t MapValueSpaceUsedExcludingSelfLong(const T& message) {
-  return message.SpaceUsedLong() - sizeof(T);
-}
-
-constexpr size_t kGlobalEmptyTableSize = 1;
-PROTOBUF_EXPORT extern void* const kGlobalEmptyTable[kGlobalEmptyTableSize];
-
-// Space used for the table, trees, and nodes.
-// Does not include the indirect space used. Eg the data of a std::string.
-template <typename Key>
-PROTOBUF_NOINLINE size_t SpaceUsedInTable(void** table, size_t num_buckets,
-                                          size_t num_elements,
-                                          size_t sizeof_node) {
-  size_t size = 0;
-  // The size of the table.
-  size += sizeof(void*) * num_buckets;
-  // All the nodes.
-  size += sizeof_node * num_elements;
-  // For each tree, count the overhead of the those nodes.
-  // Two buckets at a time because we only care about trees.
-  for (size_t b = 0; b < num_buckets; b += 2) {
-    if (internal::TableEntryIsTree(table, b)) {
-      using Tree = TreeForMap<Key>;
-      Tree* tree = static_cast<Tree*>(table[b]);
-      // Estimated cost of the red-black tree nodes, 3 pointers plus a
-      // bool (plus alignment, so 4 pointers).
-      size += tree->size() *
-              (sizeof(typename Tree::value_type) + sizeof(void*) * 4);
-    }
-  }
-  return size;
-}
-
-template <typename Map,
-          typename = typename std::enable_if<
-              !std::is_scalar<typename Map::key_type>::value ||
-              !std::is_scalar<typename Map::mapped_type>::value>::type>
-size_t SpaceUsedInValues(const Map* map) {
-  size_t size = 0;
-  for (const auto& v : *map) {
-    size += internal::MapValueSpaceUsedExcludingSelfLong(v.first) +
-            internal::MapValueSpaceUsedExcludingSelfLong(v.second);
-  }
-  return size;
-}
-
-inline size_t SpaceUsedInValues(const void*) { return 0; }
-
-}  // namespace internal
-
-// This is the class for Map's internal value_type. Instead of using
-// std::pair as value_type, we use this class which provides us more control of
-// its process of construction and destruction.
-template <typename Key, typename T>
-struct PROTOBUF_ATTRIBUTE_STANDALONE_DEBUG MapPair {
-  using first_type = const Key;
-  using second_type = T;
-
-  MapPair(const Key& other_first, const T& other_second)
-      : first(other_first), second(other_second) {}
-  explicit MapPair(const Key& other_first) : first(other_first), second() {}
-  explicit MapPair(Key&& other_first)
-      : first(std::move(other_first)), second() {}
-  MapPair(const MapPair& other) : first(other.first), second(other.second) {}
-
-  ~MapPair() {}
-
-  // Implicitly convertible to std::pair of compatible types.
-  template <typename T1, typename T2>
-  operator std::pair<T1, T2>() const {  // NOLINT(runtime/explicit)
-    return std::pair<T1, T2>(first, second);
-  }
-
-  const Key first;
-  T second;
-
- private:
-  friend class Arena;
-  friend class Map<Key, T>;
-};
-
-// Map is an associative container type used to store protobuf map
-// fields.  Each Map instance may or may not use a different hash function, a
-// different iteration order, and so on.  E.g., please don't examine
-// implementation details to decide if the following would work:
-//  Map<int, int> m0, m1;
-//  m0[0] = m1[0] = m0[1] = m1[1] = 0;
-//  assert(m0.begin()->first == m1.begin()->first);  // Bug!
-//
-// Map's interface is similar to std::unordered_map, except that Map is not
-// designed to play well with exceptions.
-template <typename Key, typename T>
-class Map {
- public:
-  using key_type = Key;
-  using mapped_type = T;
-  using value_type = MapPair<Key, T>;
-
-  using pointer = value_type*;
-  using const_pointer = const value_type*;
-  using reference = value_type&;
-  using const_reference = const value_type&;
-
-  using size_type = size_t;
-  using hasher = typename internal::TransparentSupport<Key>::hash;
-
-  constexpr Map() : elements_(nullptr) {}
-  explicit Map(Arena* arena) : elements_(arena) {}
-
-  Map(const Map& other) : Map() { insert(other.begin(), other.end()); }
-
-  Map(Map&& other) noexcept : Map() {
-    if (other.arena() != nullptr) {
-      *this = other;
-    } else {
-      swap(other);
-    }
-  }
-
-  Map& operator=(Map&& other) noexcept {
-    if (this != &other) {
-      if (arena() != other.arena()) {
-        *this = other;
-      } else {
-        swap(other);
-      }
-    }
-    return *this;
-  }
-
-  template <class InputIt>
-  Map(const InputIt& first, const InputIt& last) : Map() {
-    insert(first, last);
-  }
-
-  ~Map() {}
-
- private:
-  using Allocator = internal::MapAllocator<void*>;
-
-  // InnerMap is a generic hash-based map.  It doesn't contain any
-  // protocol-buffer-specific logic.  It is a chaining hash map with the
-  // additional feature that some buckets can be converted to use an ordered
-  // container.  This ensures O(lg n) bounds on find, insert, and erase, while
-  // avoiding the overheads of ordered containers most of the time.
-  //
-  // The implementation doesn't need the full generality of unordered_map,
-  // and it doesn't have it.  More bells and whistles can be added as needed.
-  // Some implementation details:
-  // 1. The hash function has type hasher and the equality function
-  //    equal_to<Key>.  We inherit from hasher to save space
-  //    (empty-base-class optimization).
-  // 2. The number of buckets is a power of two.
-  // 3. Buckets are converted to trees in pairs: if we convert bucket b then
-  //    buckets b and b^1 will share a tree.  Invariant: buckets b and b^1 have
-  //    the same non-null value iff they are sharing a tree.  (An alternative
-  //    implementation strategy would be to have a tag bit per bucket.)
-  // 4. As is typical for hash_map and such, the Keys and Values are always
-  //    stored in linked list nodes.  Pointers to elements are never invalidated
-  //    until the element is deleted.
-  // 5. The trees' payload type is pointer to linked-list node.  Tree-converting
-  //    a bucket doesn't copy Key-Value pairs.
-  // 6. Once we've tree-converted a bucket, it is never converted back. However,
-  //    the items a tree contains may wind up assigned to trees or lists upon a
-  //    rehash.
-  // 7. The code requires no C++ features from C++14 or later.
-  // 8. Mutations to a map do not invalidate the map's iterators, pointers to
-  //    elements, or references to elements.
-  // 9. Except for erase(iterator), any non-const method can reorder iterators.
-  // 10. InnerMap uses KeyForTree<Key> when using the Tree representation, which
-  //    is either `Key`, if Key is a scalar, or `reference_wrapper<const Key>`
-  //    otherwise. This avoids unnecessary copies of string keys, for example.
-  class InnerMap : private hasher {
-   public:
-    explicit constexpr InnerMap(Arena* arena)
-        : hasher(),
-          num_elements_(0),
-          num_buckets_(internal::kGlobalEmptyTableSize),
-          seed_(0),
-          index_of_first_non_null_(internal::kGlobalEmptyTableSize),
-          table_(const_cast<void**>(internal::kGlobalEmptyTable)),
-          alloc_(arena) {}
-
-    ~InnerMap() {
-      if (alloc_.arena() == nullptr &&
-          num_buckets_ != internal::kGlobalEmptyTableSize) {
-        clear();
-        Dealloc<void*>(table_, num_buckets_);
-      }
-    }
-
-   private:
-    enum { kMinTableSize = 8 };
-
-    // Linked-list nodes, as one would expect for a chaining hash table.
-    struct Node {
-      value_type kv;
-      Node* next;
-    };
-
-    // Trees. The payload type is a copy of Key, so that we can query the tree
-    // with Keys that are not in any particular data structure.
-    // The value is a void* pointing to Node. We use void* instead of Node* to
-    // avoid code bloat. That way there is only one instantiation of the tree
-    // class per key type.
-    using Tree = internal::TreeForMap<Key>;
-    using TreeIterator = typename Tree::iterator;
-
-    static Node* NodeFromTreeIterator(TreeIterator it) {
-      return static_cast<Node*>(it->second);
-    }
-
-    // iterator and const_iterator are instantiations of iterator_base.
-    template <typename KeyValueType>
-    class iterator_base {
-     public:
-      using reference = KeyValueType&;
-      using pointer = KeyValueType*;
-
-      // Invariants:
-      // node_ is always correct. This is handy because the most common
-      // operations are operator* and operator-> and they only use node_.
-      // When node_ is set to a non-null value, all the other non-const fields
-      // are updated to be correct also, but those fields can become stale
-      // if the underlying map is modified.  When those fields are needed they
-      // are rechecked, and updated if necessary.
-      iterator_base() : node_(nullptr), m_(nullptr), bucket_index_(0) {}
-
-      explicit iterator_base(const InnerMap* m) : m_(m) {
-        SearchFrom(m->index_of_first_non_null_);
-      }
-
-      // Any iterator_base can convert to any other.  This is overkill, and we
-      // rely on the enclosing class to use it wisely.  The standard "iterator
-      // can convert to const_iterator" is OK but the reverse direction is not.
-      template <typename U>
-      explicit iterator_base(const iterator_base<U>& it)
-          : node_(it.node_), m_(it.m_), bucket_index_(it.bucket_index_) {}
-
-      iterator_base(Node* n, const InnerMap* m, size_type index)
-          : node_(n), m_(m), bucket_index_(index) {}
-
-      iterator_base(TreeIterator tree_it, const InnerMap* m, size_type index)
-          : node_(NodeFromTreeIterator(tree_it)), m_(m), bucket_index_(index) {
-        // Invariant: iterators that use buckets with trees have an even
-        // bucket_index_.
-        GOOGLE_DCHECK_EQ(bucket_index_ % 2, 0u);
-      }
-
-      // Advance through buckets, looking for the first that isn't empty.
-      // If nothing non-empty is found then leave node_ == nullptr.
-      void SearchFrom(size_type start_bucket) {
-        GOOGLE_DCHECK(m_->index_of_first_non_null_ == m_->num_buckets_ ||
-               m_->table_[m_->index_of_first_non_null_] != nullptr);
-        node_ = nullptr;
-        for (bucket_index_ = start_bucket; bucket_index_ < m_->num_buckets_;
-             bucket_index_++) {
-          if (m_->TableEntryIsNonEmptyList(bucket_index_)) {
-            node_ = static_cast<Node*>(m_->table_[bucket_index_]);
-            break;
-          } else if (m_->TableEntryIsTree(bucket_index_)) {
-            Tree* tree = static_cast<Tree*>(m_->table_[bucket_index_]);
-            GOOGLE_DCHECK(!tree->empty());
-            node_ = NodeFromTreeIterator(tree->begin());
-            break;
-          }
-        }
-      }
-
-      reference operator*() const { return node_->kv; }
-      pointer operator->() const { return &(operator*()); }
-
-      friend bool operator==(const iterator_base& a, const iterator_base& b) {
-        return a.node_ == b.node_;
-      }
-      friend bool operator!=(const iterator_base& a, const iterator_base& b) {
-        return a.node_ != b.node_;
-      }
-
-      iterator_base& operator++() {
-        if (node_->next == nullptr) {
-          TreeIterator tree_it;
-          const bool is_list = revalidate_if_necessary(&tree_it);
-          if (is_list) {
-            SearchFrom(bucket_index_ + 1);
-          } else {
-            GOOGLE_DCHECK_EQ(bucket_index_ & 1, 0u);
-            Tree* tree = static_cast<Tree*>(m_->table_[bucket_index_]);
-            if (++tree_it == tree->end()) {
-              SearchFrom(bucket_index_ + 2);
-            } else {
-              node_ = NodeFromTreeIterator(tree_it);
-            }
-          }
-        } else {
-          node_ = node_->next;
-        }
-        return *this;
-      }
-
-      iterator_base operator++(int /* unused */) {
-        iterator_base tmp = *this;
-        ++*this;
-        return tmp;
-      }
-
-      // Assumes node_ and m_ are correct and non-null, but other fields may be
-      // stale.  Fix them as needed.  Then return true iff node_ points to a
-      // Node in a list.  If false is returned then *it is modified to be
-      // a valid iterator for node_.
-      bool revalidate_if_necessary(TreeIterator* it) {
-        GOOGLE_DCHECK(node_ != nullptr && m_ != nullptr);
-        // Force bucket_index_ to be in range.
-        bucket_index_ &= (m_->num_buckets_ - 1);
-        // Common case: the bucket we think is relevant points to node_.
-        if (m_->table_[bucket_index_] == static_cast<void*>(node_)) return true;
-        // Less common: the bucket is a linked list with node_ somewhere in it,
-        // but not at the head.
-        if (m_->TableEntryIsNonEmptyList(bucket_index_)) {
-          Node* l = static_cast<Node*>(m_->table_[bucket_index_]);
-          while ((l = l->next) != nullptr) {
-            if (l == node_) {
-              return true;
-            }
-          }
-        }
-        // Well, bucket_index_ still might be correct, but probably
-        // not.  Revalidate just to be sure.  This case is rare enough that we
-        // don't worry about potential optimizations, such as having a custom
-        // find-like method that compares Node* instead of the key.
-        iterator_base i(m_->find(node_->kv.first, it));
-        bucket_index_ = i.bucket_index_;
-        return m_->TableEntryIsList(bucket_index_);
-      }
-
-      Node* node_;
-      const InnerMap* m_;
-      size_type bucket_index_;
-    };
-
-   public:
-    using iterator = iterator_base<value_type>;
-    using const_iterator = iterator_base<const value_type>;
-
-    Arena* arena() const { return alloc_.arena(); }
-
-    void Swap(InnerMap* other) {
-      std::swap(num_elements_, other->num_elements_);
-      std::swap(num_buckets_, other->num_buckets_);
-      std::swap(seed_, other->seed_);
-      std::swap(index_of_first_non_null_, other->index_of_first_non_null_);
-      std::swap(table_, other->table_);
-      std::swap(alloc_, other->alloc_);
-    }
-
-    iterator begin() { return iterator(this); }
-    iterator end() { return iterator(); }
-    const_iterator begin() const { return const_iterator(this); }
-    const_iterator end() const { return const_iterator(); }
-
-    void clear() {
-      for (size_type b = 0; b < num_buckets_; b++) {
-        if (TableEntryIsNonEmptyList(b)) {
-          Node* node = static_cast<Node*>(table_[b]);
-          table_[b] = nullptr;
-          do {
-            Node* next = node->next;
-            DestroyNode(node);
-            node = next;
-          } while (node != nullptr);
-        } else if (TableEntryIsTree(b)) {
-          Tree* tree = static_cast<Tree*>(table_[b]);
-          GOOGLE_DCHECK(table_[b] == table_[b + 1] && (b & 1) == 0);
-          table_[b] = table_[b + 1] = nullptr;
-          typename Tree::iterator tree_it = tree->begin();
-          do {
-            Node* node = NodeFromTreeIterator(tree_it);
-            typename Tree::iterator next = tree_it;
-            ++next;
-            tree->erase(tree_it);
-            DestroyNode(node);
-            tree_it = next;
-          } while (tree_it != tree->end());
-          DestroyTree(tree);
-          b++;
-        }
-      }
-      num_elements_ = 0;
-      index_of_first_non_null_ = num_buckets_;
-    }
-
-    const hasher& hash_function() const { return *this; }
-
-    static size_type max_size() {
-      return static_cast<size_type>(1) << (sizeof(void**) >= 8 ? 60 : 28);
-    }
-    size_type size() const { return num_elements_; }
-    bool empty() const { return size() == 0; }
-
-    template <typename K>
-    iterator find(const K& k) {
-      return iterator(FindHelper(k).first);
-    }
-
-    template <typename K>
-    const_iterator find(const K& k) const {
-      return FindHelper(k).first;
-    }
-
-    // Inserts a new element into the container if there is no element with the
-    // key in the container.
-    // The new element is:
-    //  (1) Constructed in-place with the given args, if mapped_type is not
-    //      arena constructible.
-    //  (2) Constructed in-place with the arena and then assigned with a
-    //      mapped_type temporary constructed with the given args, otherwise.
-    template <typename K, typename... Args>
-    std::pair<iterator, bool> try_emplace(K&& k, Args&&... args) {
-      return ArenaAwareTryEmplace(Arena::is_arena_constructable<mapped_type>(),
-                                  std::forward<K>(k),
-                                  std::forward<Args>(args)...);
-    }
-
-    // Inserts the key into the map, if not present. In that case, the value
-    // will be value initialized.
-    template <typename K>
-    std::pair<iterator, bool> insert(K&& k) {
-      return try_emplace(std::forward<K>(k));
-    }
-
-    template <typename K>
-    value_type& operator[](K&& k) {
-      return *try_emplace(std::forward<K>(k)).first;
-    }
-
-    void erase(iterator it) {
-      GOOGLE_DCHECK_EQ(it.m_, this);
-      typename Tree::iterator tree_it;
-      const bool is_list = it.revalidate_if_necessary(&tree_it);
-      size_type b = it.bucket_index_;
-      Node* const item = it.node_;
-      if (is_list) {
-        GOOGLE_DCHECK(TableEntryIsNonEmptyList(b));
-        Node* head = static_cast<Node*>(table_[b]);
-        head = EraseFromLinkedList(item, head);
-        table_[b] = static_cast<void*>(head);
-      } else {
-        GOOGLE_DCHECK(TableEntryIsTree(b));
-        Tree* tree = static_cast<Tree*>(table_[b]);
-        tree->erase(tree_it);
-        if (tree->empty()) {
-          // Force b to be the minimum of b and b ^ 1.  This is important
-          // only because we want index_of_first_non_null_ to be correct.
-          b &= ~static_cast<size_type>(1);
-          DestroyTree(tree);
-          table_[b] = table_[b + 1] = nullptr;
-        }
-      }
-      DestroyNode(item);
-      --num_elements_;
-      if (PROTOBUF_PREDICT_FALSE(b == index_of_first_non_null_)) {
-        while (index_of_first_non_null_ < num_buckets_ &&
-               table_[index_of_first_non_null_] == nullptr) {
-          ++index_of_first_non_null_;
-        }
-      }
-    }
-
-    size_t SpaceUsedInternal() const {
-      return internal::SpaceUsedInTable<Key>(table_, num_buckets_,
-                                             num_elements_, sizeof(Node));
-    }
-
-   private:
-    template <typename K, typename... Args>
-    std::pair<iterator, bool> TryEmplaceInternal(K&& k, Args&&... args) {
-      std::pair<const_iterator, size_type> p = FindHelper(k);
-      // Case 1: key was already present.
-      if (p.first.node_ != nullptr)
-        return std::make_pair(iterator(p.first), false);
-      // Case 2: insert.
-      if (ResizeIfLoadIsOutOfRange(num_elements_ + 1)) {
-        p = FindHelper(k);
-      }
-      const size_type b = p.second;  // bucket number
-      // If K is not key_type, make the conversion to key_type explicit.
-      using TypeToInit = typename std::conditional<
-          std::is_same<typename std::decay<K>::type, key_type>::value, K&&,
-          key_type>::type;
-      Node* node = Alloc<Node>(1);
-      // Even when arena is nullptr, CreateInArenaStorage is still used to
-      // ensure the arena of submessage will be consistent. Otherwise,
-      // submessage may have its own arena when message-owned arena is enabled.
-      // Note: This only works if `Key` is not arena constructible.
-      Arena::CreateInArenaStorage(const_cast<Key*>(&node->kv.first),
-                                  alloc_.arena(),
-                                  static_cast<TypeToInit>(std::forward<K>(k)));
-      // Note: if `T` is arena constructible, `Args` needs to be empty.
-      Arena::CreateInArenaStorage(&node->kv.second, alloc_.arena(),
-                                  std::forward<Args>(args)...);
-
-      iterator result = InsertUnique(b, node);
-      ++num_elements_;
-      return std::make_pair(result, true);
-    }
-
-    // A helper function to perform an assignment of `mapped_type`.
-    // If the first argument is true, then it is a regular assignment.
-    // Otherwise, we first create a temporary and then perform an assignment.
-    template <typename V>
-    static void AssignMapped(std::true_type, mapped_type& mapped, V&& v) {
-      mapped = std::forward<V>(v);
-    }
-    template <typename... Args>
-    static void AssignMapped(std::false_type, mapped_type& mapped,
-                             Args&&... args) {
-      mapped = mapped_type(std::forward<Args>(args)...);
-    }
-
-    // Case 1: `mapped_type` is arena constructible. A temporary object is
-    // created and then (if `Args` are not empty) assigned to a mapped value
-    // that was created with the arena.
-    template <typename K>
-    std::pair<iterator, bool> ArenaAwareTryEmplace(std::true_type, K&& k) {
-      // case 1.1: "default" constructed (e.g. from arena only).
-      return TryEmplaceInternal(std::forward<K>(k));
-    }
-    template <typename K, typename... Args>
-    std::pair<iterator, bool> ArenaAwareTryEmplace(std::true_type, K&& k,
-                                                   Args&&... args) {
-      // case 1.2: "default" constructed + copy/move assignment
-      auto p = TryEmplaceInternal(std::forward<K>(k));
-      if (p.second) {
-        AssignMapped(std::is_same<void(typename std::decay<Args>::type...),
-                                  void(mapped_type)>(),
-                     p.first->second, std::forward<Args>(args)...);
-      }
-      return p;
-    }
-    // Case 2: `mapped_type` is not arena constructible. Using in-place
-    // construction.
-    template <typename... Args>
-    std::pair<iterator, bool> ArenaAwareTryEmplace(std::false_type,
-                                                   Args&&... args) {
-      return TryEmplaceInternal(std::forward<Args>(args)...);
-    }
-
-    const_iterator find(const Key& k, TreeIterator* it) const {
-      return FindHelper(k, it).first;
-    }
-    template <typename K>
-    std::pair<const_iterator, size_type> FindHelper(const K& k) const {
-      return FindHelper(k, nullptr);
-    }
-    template <typename K>
-    std::pair<const_iterator, size_type> FindHelper(const K& k,
-                                                    TreeIterator* it) const {
-      size_type b = BucketNumber(k);
-      if (TableEntryIsNonEmptyList(b)) {
-        Node* node = static_cast<Node*>(table_[b]);
-        do {
-          if (internal::TransparentSupport<Key>::Equals(node->kv.first, k)) {
-            return std::make_pair(const_iterator(node, this, b), b);
-          } else {
-            node = node->next;
-          }
-        } while (node != nullptr);
-      } else if (TableEntryIsTree(b)) {
-        GOOGLE_DCHECK_EQ(table_[b], table_[b ^ 1]);
-        b &= ~static_cast<size_t>(1);
-        Tree* tree = static_cast<Tree*>(table_[b]);
-        auto tree_it = tree->find(k);
-        if (tree_it != tree->end()) {
-          if (it != nullptr) *it = tree_it;
-          return std::make_pair(const_iterator(tree_it, this, b), b);
-        }
-      }
-      return std::make_pair(end(), b);
-    }
-
-    // Insert the given Node in bucket b.  If that would make bucket b too big,
-    // and bucket b is not a tree, create a tree for buckets b and b^1 to share.
-    // Requires count(*KeyPtrFromNodePtr(node)) == 0 and that b is the correct
-    // bucket.  num_elements_ is not modified.
-    iterator InsertUnique(size_type b, Node* node) {
-      GOOGLE_DCHECK(index_of_first_non_null_ == num_buckets_ ||
-             table_[index_of_first_non_null_] != nullptr);
-      // In practice, the code that led to this point may have already
-      // determined whether we are inserting into an empty list, a short list,
-      // or whatever.  But it's probably cheap enough to recompute that here;
-      // it's likely that we're inserting into an empty or short list.
-      iterator result;
-      GOOGLE_DCHECK(find(node->kv.first) == end());
-      if (TableEntryIsEmpty(b)) {
-        result = InsertUniqueInList(b, node);
-      } else if (TableEntryIsNonEmptyList(b)) {
-        if (PROTOBUF_PREDICT_FALSE(TableEntryIsTooLong(b))) {
-          TreeConvert(b);
-          result = InsertUniqueInTree(b, node);
-          GOOGLE_DCHECK_EQ(result.bucket_index_, b & ~static_cast<size_type>(1));
-        } else {
-          // Insert into a pre-existing list.  This case cannot modify
-          // index_of_first_non_null_, so we skip the code to update it.
-          return InsertUniqueInList(b, node);
-        }
-      } else {
-        // Insert into a pre-existing tree.  This case cannot modify
-        // index_of_first_non_null_, so we skip the code to update it.
-        return InsertUniqueInTree(b, node);
-      }
-      // parentheses around (std::min) prevents macro expansion of min(...)
-      index_of_first_non_null_ =
-          (std::min)(index_of_first_non_null_, result.bucket_index_);
-      return result;
-    }
-
-    // Returns whether we should insert after the head of the list. For
-    // non-optimized builds, we randomly decide whether to insert right at the
-    // head of the list or just after the head. This helps add a little bit of
-    // non-determinism to the map ordering.
-    bool ShouldInsertAfterHead(void* node) {
-#ifdef NDEBUG
-      (void)node;
-      return false;
-#else
-      // Doing modulo with a prime mixes the bits more.
-      return (reinterpret_cast<uintptr_t>(node) ^ seed_) % 13 > 6;
-#endif
-    }
-
-    // Helper for InsertUnique.  Handles the case where bucket b is a
-    // not-too-long linked list.
-    iterator InsertUniqueInList(size_type b, Node* node) {
-      if (table_[b] != nullptr && ShouldInsertAfterHead(node)) {
-        Node* first = static_cast<Node*>(table_[b]);
-        node->next = first->next;
-        first->next = node;
-        return iterator(node, this, b);
-      }
-
-      node->next = static_cast<Node*>(table_[b]);
-      table_[b] = static_cast<void*>(node);
-      return iterator(node, this, b);
-    }
-
-    // Helper for InsertUnique.  Handles the case where bucket b points to a
-    // Tree.
-    iterator InsertUniqueInTree(size_type b, Node* node) {
-      GOOGLE_DCHECK_EQ(table_[b], table_[b ^ 1]);
-      // Maintain the invariant that node->next is null for all Nodes in Trees.
-      node->next = nullptr;
-      return iterator(
-          static_cast<Tree*>(table_[b])->insert({node->kv.first, node}).first,
-          this, b & ~static_cast<size_t>(1));
-    }
-
-    // Returns whether it did resize.  Currently this is only used when
-    // num_elements_ increases, though it could be used in other situations.
-    // It checks for load too low as well as load too high: because any number
-    // of erases can occur between inserts, the load could be as low as 0 here.
-    // Resizing to a lower size is not always helpful, but failing to do so can
-    // destroy the expected big-O bounds for some operations. By having the
-    // policy that sometimes we resize down as well as up, clients can easily
-    // keep O(size()) = O(number of buckets) if they want that.
-    bool ResizeIfLoadIsOutOfRange(size_type new_size) {
-      const size_type kMaxMapLoadTimes16 = 12;  // controls RAM vs CPU tradeoff
-      const size_type hi_cutoff = num_buckets_ * kMaxMapLoadTimes16 / 16;
-      const size_type lo_cutoff = hi_cutoff / 4;
-      // We don't care how many elements are in trees.  If a lot are,
-      // we may resize even though there are many empty buckets.  In
-      // practice, this seems fine.
-      if (PROTOBUF_PREDICT_FALSE(new_size >= hi_cutoff)) {
-        if (num_buckets_ <= max_size() / 2) {
-          Resize(num_buckets_ * 2);
-          return true;
-        }
-      } else if (PROTOBUF_PREDICT_FALSE(new_size <= lo_cutoff &&
-                                        num_buckets_ > kMinTableSize)) {
-        size_type lg2_of_size_reduction_factor = 1;
-        // It's possible we want to shrink a lot here... size() could even be 0.
-        // So, estimate how much to shrink by making sure we don't shrink so
-        // much that we would need to grow the table after a few inserts.
-        const size_type hypothetical_size = new_size * 5 / 4 + 1;
-        while ((hypothetical_size << lg2_of_size_reduction_factor) <
-               hi_cutoff) {
-          ++lg2_of_size_reduction_factor;
-        }
-        size_type new_num_buckets = std::max<size_type>(
-            kMinTableSize, num_buckets_ >> lg2_of_size_reduction_factor);
-        if (new_num_buckets != num_buckets_) {
-          Resize(new_num_buckets);
-          return true;
-        }
-      }
-      return false;
-    }
-
-    // Resize to the given number of buckets.
-    void Resize(size_t new_num_buckets) {
-      if (num_buckets_ == internal::kGlobalEmptyTableSize) {
-        // This is the global empty array.
-        // Just overwrite with a new one. No need to transfer or free anything.
-        num_buckets_ = index_of_first_non_null_ = kMinTableSize;
-        table_ = CreateEmptyTable(num_buckets_);
-        seed_ = Seed();
-        return;
-      }
-
-      GOOGLE_DCHECK_GE(new_num_buckets, kMinTableSize);
-      void** const old_table = table_;
-      const size_type old_table_size = num_buckets_;
-      num_buckets_ = new_num_buckets;
-      table_ = CreateEmptyTable(num_buckets_);
-      const size_type start = index_of_first_non_null_;
-      index_of_first_non_null_ = num_buckets_;
-      for (size_type i = start; i < old_table_size; i++) {
-        if (internal::TableEntryIsNonEmptyList(old_table, i)) {
-          TransferList(old_table, i);
-        } else if (internal::TableEntryIsTree(old_table, i)) {
-          TransferTree(old_table, i++);
-        }
-      }
-      Dealloc<void*>(old_table, old_table_size);
-    }
-
-    void TransferList(void* const* table, size_type index) {
-      Node* node = static_cast<Node*>(table[index]);
-      do {
-        Node* next = node->next;
-        InsertUnique(BucketNumber(node->kv.first), node);
-        node = next;
-      } while (node != nullptr);
-    }
-
-    void TransferTree(void* const* table, size_type index) {
-      Tree* tree = static_cast<Tree*>(table[index]);
-      typename Tree::iterator tree_it = tree->begin();
-      do {
-        InsertUnique(BucketNumber(std::cref(tree_it->first).get()),
-                     NodeFromTreeIterator(tree_it));
-      } while (++tree_it != tree->end());
-      DestroyTree(tree);
-    }
-
-    Node* EraseFromLinkedList(Node* item, Node* head) {
-      if (head == item) {
-        return head->next;
-      } else {
-        head->next = EraseFromLinkedList(item, head->next);
-        return head;
-      }
-    }
-
-    bool TableEntryIsEmpty(size_type b) const {
-      return internal::TableEntryIsEmpty(table_, b);
-    }
-    bool TableEntryIsNonEmptyList(size_type b) const {
-      return internal::TableEntryIsNonEmptyList(table_, b);
-    }
-    bool TableEntryIsTree(size_type b) const {
-      return internal::TableEntryIsTree(table_, b);
-    }
-    bool TableEntryIsList(size_type b) const {
-      return internal::TableEntryIsList(table_, b);
-    }
-
-    void TreeConvert(size_type b) {
-      GOOGLE_DCHECK(!TableEntryIsTree(b) && !TableEntryIsTree(b ^ 1));
-      Tree* tree =
-          Arena::Create<Tree>(alloc_.arena(), typename Tree::key_compare(),
-                              typename Tree::allocator_type(alloc_));
-      size_type count = CopyListToTree(b, tree) + CopyListToTree(b ^ 1, tree);
-      GOOGLE_DCHECK_EQ(count, tree->size());
-      table_[b] = table_[b ^ 1] = static_cast<void*>(tree);
-    }
-
-    // Copy a linked list in the given bucket to a tree.
-    // Returns the number of things it copied.
-    size_type CopyListToTree(size_type b, Tree* tree) {
-      size_type count = 0;
-      Node* node = static_cast<Node*>(table_[b]);
-      while (node != nullptr) {
-        tree->insert({node->kv.first, node});
-        ++count;
-        Node* next = node->next;
-        node->next = nullptr;
-        node = next;
-      }
-      return count;
-    }
-
-    // Return whether table_[b] is a linked list that seems awfully long.
-    // Requires table_[b] to point to a non-empty linked list.
-    bool TableEntryIsTooLong(size_type b) {
-      const size_type kMaxLength = 8;
-      size_type count = 0;
-      Node* node = static_cast<Node*>(table_[b]);
-      do {
-        ++count;
-        node = node->next;
-      } while (node != nullptr);
-      // Invariant: no linked list ever is more than kMaxLength in length.
-      GOOGLE_DCHECK_LE(count, kMaxLength);
-      return count >= kMaxLength;
-    }
-
-    template <typename K>
-    size_type BucketNumber(const K& k) const {
-      // We xor the hash value against the random seed so that we effectively
-      // have a random hash function.
-      uint64_t h = hash_function()(k) ^ seed_;
-
-      // We use the multiplication method to determine the bucket number from
-      // the hash value. The constant kPhi (suggested by Knuth) is roughly
-      // (sqrt(5) - 1) / 2 * 2^64.
-      constexpr uint64_t kPhi = uint64_t{0x9e3779b97f4a7c15};
-      return ((kPhi * h) >> 32) & (num_buckets_ - 1);
-    }
-
-    // Return a power of two no less than max(kMinTableSize, n).
-    // Assumes either n < kMinTableSize or n is a power of two.
-    size_type TableSize(size_type n) {
-      return n < static_cast<size_type>(kMinTableSize)
-                 ? static_cast<size_type>(kMinTableSize)
-                 : n;
-    }
-
-    // Use alloc_ to allocate an array of n objects of type U.
-    template <typename U>
-    U* Alloc(size_type n) {
-      using alloc_type = typename Allocator::template rebind<U>::other;
-      return alloc_type(alloc_).allocate(n);
-    }
-
-    // Use alloc_ to deallocate an array of n objects of type U.
-    template <typename U>
-    void Dealloc(U* t, size_type n) {
-      using alloc_type = typename Allocator::template rebind<U>::other;
-      alloc_type(alloc_).deallocate(t, n);
-    }
-
-    void DestroyNode(Node* node) {
-      if (alloc_.arena() == nullptr) {
-        delete node;
-      }
-    }
-
-    void DestroyTree(Tree* tree) {
-      if (alloc_.arena() == nullptr) {
-        delete tree;
-      }
-    }
-
-    void** CreateEmptyTable(size_type n) {
-      GOOGLE_DCHECK(n >= kMinTableSize);
-      GOOGLE_DCHECK_EQ(n & (n - 1), 0u);
-      void** result = Alloc<void*>(n);
-      memset(result, 0, n * sizeof(result[0]));
-      return result;
-    }
-
-    // Return a randomish value.
-    size_type Seed() const {
-      // We get a little bit of randomness from the address of the map. The
-      // lower bits are not very random, due to alignment, so we discard them
-      // and shift the higher bits into their place.
-      size_type s = reinterpret_cast<uintptr_t>(this) >> 4;
-#if !defined(GOOGLE_PROTOBUF_NO_RDTSC)
-#if defined(__APPLE__)
-      // Use a commpage-based fast time function on Apple environments (MacOS,
-      // iOS, tvOS, watchOS, etc).
-      s += mach_absolute_time();
-#elif defined(__x86_64__) && defined(__GNUC__)
-      uint32_t hi, lo;
-      asm volatile("rdtsc" : "=a"(lo), "=d"(hi));
-      s += ((static_cast<uint64_t>(hi) << 32) | lo);
-#elif defined(__aarch64__) && defined(__GNUC__)
-      // There is no rdtsc on ARMv8. CNTVCT_EL0 is the virtual counter of the
-      // system timer. It runs at a different frequency than the CPU's, but is
-      // the best source of time-based entropy we get.
-      uint64_t virtual_timer_value;
-      asm volatile("mrs %0, cntvct_el0" : "=r"(virtual_timer_value));
-      s += virtual_timer_value;
-#endif
-#endif  // !defined(GOOGLE_PROTOBUF_NO_RDTSC)
-      return s;
-    }
-
-    friend class Arena;
-    using InternalArenaConstructable_ = void;
-    using DestructorSkippable_ = void;
-
-    size_type num_elements_;
-    size_type num_buckets_;
-    size_type seed_;
-    size_type index_of_first_non_null_;
-    void** table_;  // an array with num_buckets_ entries
-    Allocator alloc_;
-    GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(InnerMap);
-  };  // end of class InnerMap
-
-  template <typename LookupKey>
-  using key_arg = typename internal::TransparentSupport<
-      key_type>::template key_arg<LookupKey>;
-
- public:
-  // Iterators
-  class const_iterator {
-    using InnerIt = typename InnerMap::const_iterator;
-
-   public:
-    using iterator_category = std::forward_iterator_tag;
-    using value_type = typename Map::value_type;
-    using difference_type = ptrdiff_t;
-    using pointer = const value_type*;
-    using reference = const value_type&;
-
-    const_iterator() {}
-    explicit const_iterator(const InnerIt& it) : it_(it) {}
-
-    const_reference operator*() const { return *it_; }
-    const_pointer operator->() const { return &(operator*()); }
-
-    const_iterator& operator++() {
-      ++it_;
-      return *this;
-    }
-    const_iterator operator++(int) { return const_iterator(it_++); }
-
-    friend bool operator==(const const_iterator& a, const const_iterator& b) {
-      return a.it_ == b.it_;
-    }
-    friend bool operator!=(const const_iterator& a, const const_iterator& b) {
-      return !(a == b);
-    }
-
-   private:
-    InnerIt it_;
-  };
-
-  class iterator {
-    using InnerIt = typename InnerMap::iterator;
-
-   public:
-    using iterator_category = std::forward_iterator_tag;
-    using value_type = typename Map::value_type;
-    using difference_type = ptrdiff_t;
-    using pointer = value_type*;
-    using reference = value_type&;
-
-    iterator() {}
-    explicit iterator(const InnerIt& it) : it_(it) {}
-
-    reference operator*() const { return *it_; }
-    pointer operator->() const { return &(operator*()); }
-
-    iterator& operator++() {
-      ++it_;
-      return *this;
-    }
-    iterator operator++(int) { return iterator(it_++); }
-
-    // Allow implicit conversion to const_iterator.
-    operator const_iterator() const {  // NOLINT(runtime/explicit)
-      return const_iterator(typename InnerMap::const_iterator(it_));
-    }
-
-    friend bool operator==(const iterator& a, const iterator& b) {
-      return a.it_ == b.it_;
-    }
-    friend bool operator!=(const iterator& a, const iterator& b) {
-      return !(a == b);
-    }
-
-   private:
-    friend class Map;
-
-    InnerIt it_;
-  };
-
-  iterator begin() { return iterator(elements_.begin()); }
-  iterator end() { return iterator(elements_.end()); }
-  const_iterator begin() const { return const_iterator(elements_.begin()); }
-  const_iterator end() const { return const_iterator(elements_.end()); }
-  const_iterator cbegin() const { return begin(); }
-  const_iterator cend() const { return end(); }
-
-  // Capacity
-  size_type size() const { return elements_.size(); }
-  bool empty() const { return size() == 0; }
-
-  // Element access
-  template <typename K = key_type>
-  T& operator[](const key_arg<K>& key) {
-    return elements_[key].second;
-  }
-  template <
-      typename K = key_type,
-      // Disable for integral types to reduce code bloat.
-      typename = typename std::enable_if<!std::is_integral<K>::value>::type>
-  T& operator[](key_arg<K>&& key) {
-    return elements_[std::forward<K>(key)].second;
-  }
-
-  template <typename K = key_type>
-  const T& at(const key_arg<K>& key) const {
-    const_iterator it = find(key);
-    GOOGLE_CHECK(it != end()) << "key not found: " << static_cast<Key>(key);
-    return it->second;
-  }
-
-  template <typename K = key_type>
-  T& at(const key_arg<K>& key) {
-    iterator it = find(key);
-    GOOGLE_CHECK(it != end()) << "key not found: " << static_cast<Key>(key);
-    return it->second;
-  }
-
-  // Lookup
-  template <typename K = key_type>
-  size_type count(const key_arg<K>& key) const {
-    return find(key) == end() ? 0 : 1;
-  }
-
-  template <typename K = key_type>
-  const_iterator find(const key_arg<K>& key) const {
-    return const_iterator(elements_.find(key));
-  }
-  template <typename K = key_type>
-  iterator find(const key_arg<K>& key) {
-    return iterator(elements_.find(key));
-  }
-
-  template <typename K = key_type>
-  bool contains(const key_arg<K>& key) const {
-    return find(key) != end();
-  }
-
-  template <typename K = key_type>
-  std::pair<const_iterator, const_iterator> equal_range(
-      const key_arg<K>& key) const {
-    const_iterator it = find(key);
-    if (it == end()) {
-      return std::pair<const_iterator, const_iterator>(it, it);
-    } else {
-      const_iterator begin = it++;
-      return std::pair<const_iterator, const_iterator>(begin, it);
-    }
-  }
-
-  template <typename K = key_type>
-  std::pair<iterator, iterator> equal_range(const key_arg<K>& key) {
-    iterator it = find(key);
-    if (it == end()) {
-      return std::pair<iterator, iterator>(it, it);
-    } else {
-      iterator begin = it++;
-      return std::pair<iterator, iterator>(begin, it);
-    }
-  }
-
-  // insert
-  template <typename K, typename... Args>
-  std::pair<iterator, bool> try_emplace(K&& k, Args&&... args) {
-    auto p =
-        elements_.try_emplace(std::forward<K>(k), std::forward<Args>(args)...);
-    return std::pair<iterator, bool>(iterator(p.first), p.second);
-  }
-  std::pair<iterator, bool> insert(const value_type& value) {
-    return try_emplace(value.first, value.second);
-  }
-  std::pair<iterator, bool> insert(value_type&& value) {
-    return try_emplace(value.first, std::move(value.second));
-  }
-  template <typename... Args>
-  std::pair<iterator, bool> emplace(Args&&... args) {
-    return insert(value_type(std::forward<Args>(args)...));
-  }
-  template <class InputIt>
-  void insert(InputIt first, InputIt last) {
-    for (; first != last; ++first) {
-      try_emplace(first->first, first->second);
-    }
-  }
-  void insert(std::initializer_list<value_type> values) {
-    insert(values.begin(), values.end());
-  }
-
-  // Erase and clear
-  template <typename K = key_type>
-  size_type erase(const key_arg<K>& key) {
-    iterator it = find(key);
-    if (it == end()) {
-      return 0;
-    } else {
-      erase(it);
-      return 1;
-    }
-  }
-  iterator erase(iterator pos) {
-    iterator i = pos++;
-    elements_.erase(i.it_);
-    return pos;
-  }
-  void erase(iterator first, iterator last) {
-    while (first != last) {
-      first = erase(first);
-    }
-  }
-  void clear() { elements_.clear(); }
-
-  // Assign
-  Map& operator=(const Map& other) {
-    if (this != &other) {
-      clear();
-      insert(other.begin(), other.end());
-    }
-    return *this;
-  }
-
-  void swap(Map& other) {
-    if (arena() == other.arena()) {
-      InternalSwap(other);
-    } else {
-      // TODO(zuguang): optimize this. The temporary copy can be allocated
-      // in the same arena as the other message, and the "other = copy" can
-      // be replaced with the fast-path swap above.
-      Map copy = *this;
-      *this = other;
-      other = copy;
-    }
-  }
-
-  void InternalSwap(Map& other) { elements_.Swap(&other.elements_); }
-
-  // Access to hasher.  Currently this returns a copy, but it may
-  // be modified to return a const reference in the future.
-  hasher hash_function() const { return elements_.hash_function(); }
-
-  size_t SpaceUsedExcludingSelfLong() const {
-    if (empty()) return 0;
-    return elements_.SpaceUsedInternal() + internal::SpaceUsedInValues(this);
-  }
-
- private:
-  Arena* arena() const { return elements_.arena(); }
-  InnerMap elements_;
-
-  friend class Arena;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  template <typename Derived, typename K, typename V,
-            internal::WireFormatLite::FieldType key_wire_type,
-            internal::WireFormatLite::FieldType value_wire_type>
-  friend class internal::MapFieldLite;
-};
-
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
-
-#endif  // GOOGLE_PROTOBUF_MAP_H__
diff --git a/libs/protobuf/src/google/protobuf/map_entry.h b/libs/protobuf/src/google/protobuf/map_entry.h
deleted file mode 100644
index 536dec9..0000000
--- a/libs/protobuf/src/google/protobuf/map_entry.h
+++ /dev/null
@@ -1,134 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef GOOGLE_PROTOBUF_MAP_ENTRY_H__
-#define GOOGLE_PROTOBUF_MAP_ENTRY_H__
-
-#include <google/protobuf/port.h>
-#include <google/protobuf/generated_message_reflection.h>
-#include <google/protobuf/map_entry_lite.h>
-#include <google/protobuf/map_type_handler.h>
-#include <google/protobuf/reflection_ops.h>
-#include <google/protobuf/unknown_field_set.h>
-#include <google/protobuf/wire_format_lite.h>
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-#ifdef SWIG
-#error "You cannot SWIG proto headers"
-#endif
-
-namespace google {
-namespace protobuf {
-class Arena;
-namespace internal {
-template <typename Derived, typename Key, typename Value,
-          WireFormatLite::FieldType kKeyFieldType,
-          WireFormatLite::FieldType kValueFieldType>
-class MapField;
-}
-}  // namespace protobuf
-}  // namespace google
-
-namespace google {
-namespace protobuf {
-namespace internal {
-
-// MapEntry is the returned google::protobuf::Message when calling AddMessage of
-// google::protobuf::Reflection. In order to let it work with generated message
-// reflection, its in-memory type is the same as generated message with the same
-// fields. However, in order to decide the in-memory type of key/value, we need
-// to know both their cpp type in generated api and proto type. In
-// implementation, all in-memory types have related wire format functions to
-// support except ArenaStringPtr. Therefore, we need to define another type with
-// supporting wire format functions. Since this type is only used as return type
-// of MapEntry accessors, it's named MapEntry accessor type.
-//
-// cpp type:               the type visible to users in public API.
-// proto type:             WireFormatLite::FieldType of the field.
-// in-memory type:         type of the data member used to stored this field.
-// MapEntry accessor type: type used in MapEntry getters/mutators to access the
-//                         field.
-//
-// cpp type | proto type  | in-memory type | MapEntry accessor type
-// int32_t    TYPE_INT32    int32_t          int32_t
-// int32_t    TYPE_FIXED32  int32_t          int32_t
-// string     TYPE_STRING   ArenaStringPtr   string
-// FooEnum    TYPE_ENUM     int              int
-// FooMessage TYPE_MESSAGE  FooMessage*      FooMessage
-//
-// The in-memory types of primitive types can be inferred from its proto type,
-// while we need to explicitly specify the cpp type if proto type is
-// TYPE_MESSAGE to infer the in-memory type.
-template <typename Derived, typename Key, typename Value,
-          WireFormatLite::FieldType kKeyFieldType,
-          WireFormatLite::FieldType kValueFieldType>
-class MapEntry : public MapEntryImpl<Derived, Message, Key, Value,
-                                     kKeyFieldType, kValueFieldType> {
- public:
-  constexpr MapEntry() {}
-  explicit MapEntry(Arena* arena)
-      : MapEntryImpl<Derived, Message, Key, Value, kKeyFieldType,
-                     kValueFieldType>(arena) {}
-  ~MapEntry() override {
-    Message::_internal_metadata_.template Delete<UnknownFieldSet>();
-  }
-  typedef void InternalArenaConstructable_;
-  typedef void DestructorSkippable_;
-
-  typedef typename MapEntryImpl<Derived, Message, Key, Value, kKeyFieldType,
-                                kValueFieldType>::KeyTypeHandler KeyTypeHandler;
-  typedef
-      typename MapEntryImpl<Derived, Message, Key, Value, kKeyFieldType,
-                            kValueFieldType>::ValueTypeHandler ValueTypeHandler;
-  size_t SpaceUsedLong() const override {
-    size_t size = sizeof(Derived);
-    size += KeyTypeHandler::SpaceUsedInMapEntryLong(this->key_);
-    size += ValueTypeHandler::SpaceUsedInMapEntryLong(this->value_);
-    return size;
-  }
-
- private:
-  friend class ::PROTOBUF_NAMESPACE_ID::Arena;
-  template <typename C, typename K, typename V,
-            WireFormatLite::FieldType k_wire_type, WireFormatLite::FieldType>
-  friend class internal::MapField;
-
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(MapEntry);
-};
-
-}  // namespace internal
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
-
-#endif  // GOOGLE_PROTOBUF_MAP_ENTRY_H__
diff --git a/libs/protobuf/src/google/protobuf/map_entry_lite.h b/libs/protobuf/src/google/protobuf/map_entry_lite.h
deleted file mode 100644
index 6b08cd9..0000000
--- a/libs/protobuf/src/google/protobuf/map_entry_lite.h
+++ /dev/null
@@ -1,563 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef GOOGLE_PROTOBUF_MAP_ENTRY_LITE_H__
-#define GOOGLE_PROTOBUF_MAP_ENTRY_LITE_H__
-
-#include <assert.h>
-
-#include <algorithm>
-#include <string>
-#include <utility>
-
-#include <google/protobuf/stubs/casts.h>
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/arena.h>
-#include <google/protobuf/port.h>
-#include <google/protobuf/arenastring.h>
-#include <google/protobuf/generated_message_util.h>
-#include <google/protobuf/map.h>
-#include <google/protobuf/map_type_handler.h>
-#include <google/protobuf/parse_context.h>
-#include <google/protobuf/wire_format_lite.h>
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-#ifdef SWIG
-#error "You cannot SWIG proto headers"
-#endif
-
-namespace google {
-namespace protobuf {
-namespace internal {
-template <typename Derived, typename Key, typename Value,
-          WireFormatLite::FieldType kKeyFieldType,
-          WireFormatLite::FieldType kValueFieldType>
-class MapEntry;
-template <typename Derived, typename Key, typename Value,
-          WireFormatLite::FieldType kKeyFieldType,
-          WireFormatLite::FieldType kValueFieldType>
-class MapFieldLite;
-}  // namespace internal
-}  // namespace protobuf
-}  // namespace google
-
-namespace google {
-namespace protobuf {
-namespace internal {
-
-// MoveHelper::Move is used to set *dest.  It copies *src, or moves it (in
-// the C++11 sense), or swaps it. *src is left in a sane state for
-// subsequent destruction, but shouldn't be used for anything.
-template <bool is_enum, bool is_message, bool is_stringlike, typename T>
-struct MoveHelper {  // primitives
-  static void Move(T* src, T* dest) { *dest = *src; }
-};
-
-template <bool is_message, bool is_stringlike, typename T>
-struct MoveHelper<true, is_message, is_stringlike, T> {  // enums
-  static void Move(T* src, T* dest) { *dest = *src; }
-  // T is an enum here, so allow conversions to and from int.
-  static void Move(T* src, int* dest) { *dest = static_cast<int>(*src); }
-  static void Move(int* src, T* dest) { *dest = static_cast<T>(*src); }
-};
-
-template <bool is_stringlike, typename T>
-struct MoveHelper<false, true, is_stringlike, T> {  // messages
-  static void Move(T* src, T* dest) { dest->Swap(src); }
-};
-
-template <typename T>
-struct MoveHelper<false, false, true, T> {  // strings and similar
-  static void Move(T* src, T* dest) {
-    *dest = std::move(*src);
-  }
-};
-
-// MapEntryImpl is used to implement parsing and serialization of map entries.
-// It uses Curious Recursive Template Pattern (CRTP) to provide the type of
-// the eventual code to the template code.
-template <typename Derived, typename Base, typename Key, typename Value,
-          WireFormatLite::FieldType kKeyFieldType,
-          WireFormatLite::FieldType kValueFieldType>
-class MapEntryImpl : public Base {
- public:
-  typedef MapEntryFuncs<Key, Value, kKeyFieldType, kValueFieldType> Funcs;
-
- protected:
-  // Provide utilities to parse/serialize key/value.  Provide utilities to
-  // manipulate internal stored type.
-  typedef MapTypeHandler<kKeyFieldType, Key> KeyTypeHandler;
-  typedef MapTypeHandler<kValueFieldType, Value> ValueTypeHandler;
-
-  // Define internal memory layout. Strings and messages are stored as
-  // pointers, while other types are stored as values.
-  typedef typename KeyTypeHandler::TypeOnMemory KeyOnMemory;
-  typedef typename ValueTypeHandler::TypeOnMemory ValueOnMemory;
-
-  // Enum type cannot be used for MapTypeHandler::Read. Define a type
-  // which will replace Enum with int.
-  typedef typename KeyTypeHandler::MapEntryAccessorType KeyMapEntryAccessorType;
-  typedef
-      typename ValueTypeHandler::MapEntryAccessorType ValueMapEntryAccessorType;
-
-  // Constants for field number.
-  static const int kKeyFieldNumber = 1;
-  static const int kValueFieldNumber = 2;
-
-  // Constants for field tag.
-  static const uint8_t kKeyTag =
-      GOOGLE_PROTOBUF_WIRE_FORMAT_MAKE_TAG(kKeyFieldNumber, KeyTypeHandler::kWireType);
-  static const uint8_t kValueTag = GOOGLE_PROTOBUF_WIRE_FORMAT_MAKE_TAG(
-      kValueFieldNumber, ValueTypeHandler::kWireType);
-  static const size_t kTagSize = 1;
-
- public:
-  // Work-around for a compiler bug (see repeated_field.h).
-  typedef void MapEntryHasMergeTypeTrait;
-  typedef Derived EntryType;
-  typedef Key EntryKeyType;
-  typedef Value EntryValueType;
-  static const WireFormatLite::FieldType kEntryKeyFieldType = kKeyFieldType;
-  static const WireFormatLite::FieldType kEntryValueFieldType = kValueFieldType;
-
-  constexpr MapEntryImpl()
-      : key_(KeyTypeHandler::Constinit()),
-        value_(ValueTypeHandler::Constinit()),
-        _has_bits_{} {}
-
-  explicit MapEntryImpl(Arena* arena)
-      : Base(arena),
-        key_(KeyTypeHandler::Constinit()),
-        value_(ValueTypeHandler::Constinit()),
-        _has_bits_{} {}
-
-  ~MapEntryImpl() override {
-    if (Base::GetArenaForAllocation() != nullptr) return;
-    KeyTypeHandler::DeleteNoArena(key_);
-    ValueTypeHandler::DeleteNoArena(value_);
-  }
-
-  // accessors ======================================================
-
-  virtual inline const KeyMapEntryAccessorType& key() const {
-    return KeyTypeHandler::GetExternalReference(key_);
-  }
-  virtual inline const ValueMapEntryAccessorType& value() const {
-    return ValueTypeHandler::DefaultIfNotInitialized(value_);
-  }
-  inline KeyMapEntryAccessorType* mutable_key() {
-    set_has_key();
-    return KeyTypeHandler::EnsureMutable(&key_, Base::GetArenaForAllocation());
-  }
-  inline ValueMapEntryAccessorType* mutable_value() {
-    set_has_value();
-    return ValueTypeHandler::EnsureMutable(&value_,
-                                           Base::GetArenaForAllocation());
-  }
-
-  // implements MessageLite =========================================
-
-  // MapEntryImpl is for implementation only and this function isn't called
-  // anywhere. Just provide a fake implementation here for MessageLite.
-  std::string GetTypeName() const override { return ""; }
-
-  void CheckTypeAndMergeFrom(const MessageLite& other) override {
-    MergeFromInternal(*::google::protobuf::internal::DownCast<const Derived*>(&other));
-  }
-
-  const char* _InternalParse(const char* ptr, ParseContext* ctx) final {
-    while (!ctx->Done(&ptr)) {
-      uint32_t tag;
-      ptr = ReadTag(ptr, &tag);
-      GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
-      if (tag == kKeyTag) {
-        set_has_key();
-        KeyMapEntryAccessorType* key = mutable_key();
-        ptr = KeyTypeHandler::Read(ptr, ctx, key);
-        if (!Derived::ValidateKey(key)) return nullptr;
-      } else if (tag == kValueTag) {
-        set_has_value();
-        ValueMapEntryAccessorType* value = mutable_value();
-        ptr = ValueTypeHandler::Read(ptr, ctx, value);
-        if (!Derived::ValidateValue(value)) return nullptr;
-      } else {
-        if (tag == 0 || WireFormatLite::GetTagWireType(tag) ==
-                            WireFormatLite::WIRETYPE_END_GROUP) {
-          ctx->SetLastTag(tag);
-          return ptr;
-        }
-        ptr = UnknownFieldParse(tag, static_cast<std::string*>(nullptr), ptr,
-                                ctx);
-      }
-      GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
-    }
-    return ptr;
-  }
-
-  size_t ByteSizeLong() const override {
-    size_t size = 0;
-    size += kTagSize + static_cast<size_t>(KeyTypeHandler::ByteSize(key()));
-    size += kTagSize + static_cast<size_t>(ValueTypeHandler::ByteSize(value()));
-    return size;
-  }
-
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* ptr, io::EpsCopyOutputStream* stream) const override {
-    ptr = KeyTypeHandler::Write(kKeyFieldNumber, key(), ptr, stream);
-    return ValueTypeHandler::Write(kValueFieldNumber, value(), ptr, stream);
-  }
-
-  // Don't override SerializeWithCachedSizesToArray.  Use MessageLite's.
-
-  int GetCachedSize() const override {
-    int size = 0;
-    size += has_key() ? static_cast<int>(kTagSize) +
-                            KeyTypeHandler::GetCachedSize(key())
-                      : 0;
-    size += has_value() ? static_cast<int>(kTagSize) +
-                              ValueTypeHandler::GetCachedSize(value())
-                        : 0;
-    return size;
-  }
-
-  bool IsInitialized() const override {
-    return ValueTypeHandler::IsInitialized(value_);
-  }
-
-  Base* New(Arena* arena) const override {
-    Derived* entry = Arena::CreateMessage<Derived>(arena);
-    return entry;
-  }
-
- protected:
-  // We can't declare this function directly here as it would hide the other
-  // overload (const Message&).
-  void MergeFromInternal(const MapEntryImpl& from) {
-    if (from._has_bits_[0]) {
-      if (from.has_key()) {
-        KeyTypeHandler::EnsureMutable(&key_, Base::GetArenaForAllocation());
-        KeyTypeHandler::Merge(from.key(), &key_, Base::GetArenaForAllocation());
-        set_has_key();
-      }
-      if (from.has_value()) {
-        ValueTypeHandler::EnsureMutable(&value_, Base::GetArenaForAllocation());
-        ValueTypeHandler::Merge(from.value(), &value_,
-                                Base::GetArenaForAllocation());
-        set_has_value();
-      }
-    }
-  }
-
- public:
-  void Clear() override {
-    KeyTypeHandler::Clear(&key_, Base::GetArenaForAllocation());
-    ValueTypeHandler::Clear(&value_, Base::GetArenaForAllocation());
-    clear_has_key();
-    clear_has_value();
-  }
-
-  // Parsing using MergePartialFromCodedStream, above, is not as
-  // efficient as it could be.  This helper class provides a speedier way.
-  template <typename MapField, typename Map>
-  class Parser {
-   public:
-    explicit Parser(MapField* mf) : mf_(mf), map_(mf->MutableMap()) {}
-    ~Parser() {
-      if (entry_ != nullptr && entry_->GetArenaForAllocation() == nullptr)
-        delete entry_;
-    }
-
-    const char* _InternalParse(const char* ptr, ParseContext* ctx) {
-      if (PROTOBUF_PREDICT_TRUE(!ctx->Done(&ptr) && *ptr == kKeyTag)) {
-        ptr = KeyTypeHandler::Read(ptr + 1, ctx, &key_);
-        if (PROTOBUF_PREDICT_FALSE(!ptr || !Derived::ValidateKey(&key_))) {
-          return nullptr;
-        }
-        if (PROTOBUF_PREDICT_TRUE(!ctx->Done(&ptr) && *ptr == kValueTag)) {
-          typename Map::size_type map_size = map_->size();
-          value_ptr_ = &(*map_)[key_];
-          if (PROTOBUF_PREDICT_TRUE(map_size != map_->size())) {
-            using T =
-                typename MapIf<ValueTypeHandler::kIsEnum, int*, Value*>::type;
-            ptr = ValueTypeHandler::Read(ptr + 1, ctx,
-                                         reinterpret_cast<T>(value_ptr_));
-            if (PROTOBUF_PREDICT_FALSE(!ptr ||
-                                       !Derived::ValidateValue(value_ptr_))) {
-              map_->erase(key_);  // Failure! Undo insertion.
-              return nullptr;
-            }
-            if (PROTOBUF_PREDICT_TRUE(ctx->Done(&ptr))) return ptr;
-            if (!ptr) return nullptr;
-            NewEntry();
-            ValueMover::Move(value_ptr_, entry_->mutable_value());
-            map_->erase(key_);
-            goto move_key;
-          }
-        } else {
-          if (!ptr) return nullptr;
-        }
-        NewEntry();
-      move_key:
-        KeyMover::Move(&key_, entry_->mutable_key());
-      } else {
-        if (!ptr) return nullptr;
-        NewEntry();
-      }
-      ptr = entry_->_InternalParse(ptr, ctx);
-      if (ptr) UseKeyAndValueFromEntry();
-      return ptr;
-    }
-
-    template <typename UnknownType>
-    const char* ParseWithEnumValidation(const char* ptr, ParseContext* ctx,
-                                        bool (*is_valid)(int),
-                                        uint32_t field_num,
-                                        InternalMetadata* metadata) {
-      auto entry = NewEntry();
-      ptr = entry->_InternalParse(ptr, ctx);
-      if (!ptr) return nullptr;
-      if (is_valid(entry->value())) {
-        UseKeyAndValueFromEntry();
-      } else {
-        WriteLengthDelimited(field_num, entry->SerializeAsString(),
-                             metadata->mutable_unknown_fields<UnknownType>());
-      }
-      return ptr;
-    }
-
-    MapEntryImpl* NewEntry() { return entry_ = mf_->NewEntry(); }
-
-    const Key& key() const { return key_; }
-    const Value& value() const { return *value_ptr_; }
-
-    const Key& entry_key() const { return entry_->key(); }
-    const Value& entry_value() const { return entry_->value(); }
-
-   private:
-    void UseKeyAndValueFromEntry() {
-      // Update key_ in case we need it later (because key() is called).
-      // This is potentially inefficient, especially if the key is
-      // expensive to copy (e.g., a long string), but this is a cold
-      // path, so it's not a big deal.
-      key_ = entry_->key();
-      value_ptr_ = &(*map_)[key_];
-      ValueMover::Move(entry_->mutable_value(), value_ptr_);
-    }
-
-    // After reading a key and value successfully, and inserting that data
-    // into map_, we are not at the end of the input.  This is unusual, but
-    // allowed by the spec.
-    bool ReadBeyondKeyValuePair(io::CodedInputStream* input) PROTOBUF_COLD {
-      NewEntry();
-      ValueMover::Move(value_ptr_, entry_->mutable_value());
-      map_->erase(key_);
-      KeyMover::Move(&key_, entry_->mutable_key());
-      const bool result = entry_->MergePartialFromCodedStream(input);
-      if (result) UseKeyAndValueFromEntry();
-      return result;
-    }
-
-    typedef MoveHelper<KeyTypeHandler::kIsEnum, KeyTypeHandler::kIsMessage,
-                       KeyTypeHandler::kWireType ==
-                           WireFormatLite::WIRETYPE_LENGTH_DELIMITED,
-                       Key>
-        KeyMover;
-    typedef MoveHelper<ValueTypeHandler::kIsEnum, ValueTypeHandler::kIsMessage,
-                       ValueTypeHandler::kWireType ==
-                           WireFormatLite::WIRETYPE_LENGTH_DELIMITED,
-                       Value>
-        ValueMover;
-
-    MapField* const mf_;
-    Map* const map_;
-    Key key_;
-    Value* value_ptr_;
-    MapEntryImpl* entry_ = nullptr;
-  };
-
- protected:
-  void set_has_key() { _has_bits_[0] |= 0x00000001u; }
-  bool has_key() const { return (_has_bits_[0] & 0x00000001u) != 0; }
-  void clear_has_key() { _has_bits_[0] &= ~0x00000001u; }
-  void set_has_value() { _has_bits_[0] |= 0x00000002u; }
-  bool has_value() const { return (_has_bits_[0] & 0x00000002u) != 0; }
-  void clear_has_value() { _has_bits_[0] &= ~0x00000002u; }
-
- public:
-  inline Arena* GetArena() const { return Base::GetArena(); }
-
- protected:  // Needed for constructing tables
-  KeyOnMemory key_;
-  ValueOnMemory value_;
-  uint32_t _has_bits_[1];
-
- private:
-  friend class ::PROTOBUF_NAMESPACE_ID::Arena;
-  typedef void InternalArenaConstructable_;
-  typedef void DestructorSkippable_;
-  template <typename C, typename K, typename V, WireFormatLite::FieldType,
-            WireFormatLite::FieldType>
-  friend class internal::MapEntry;
-  template <typename C, typename K, typename V, WireFormatLite::FieldType,
-            WireFormatLite::FieldType>
-  friend class internal::MapFieldLite;
-
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(MapEntryImpl);
-};
-
-template <typename T, typename Key, typename Value,
-          WireFormatLite::FieldType kKeyFieldType,
-          WireFormatLite::FieldType kValueFieldType>
-class MapEntryLite : public MapEntryImpl<T, MessageLite, Key, Value,
-                                         kKeyFieldType, kValueFieldType> {
- public:
-  typedef MapEntryImpl<T, MessageLite, Key, Value, kKeyFieldType,
-                       kValueFieldType>
-      SuperType;
-  constexpr MapEntryLite() {}
-  explicit MapEntryLite(Arena* arena) : SuperType(arena) {}
-  ~MapEntryLite() override {
-    MessageLite::_internal_metadata_.template Delete<std::string>();
-  }
-  void MergeFrom(const MapEntryLite& other) { MergeFromInternal(other); }
-
- private:
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(MapEntryLite);
-};
-
-// Helpers for deterministic serialization =============================
-
-// Iterator base for MapSorterFlat and MapSorterPtr.
-template <typename storage_type>
-struct MapSorterIt {
-  storage_type* ptr;
-  MapSorterIt(storage_type* ptr) : ptr(ptr) {}
-  bool operator==(const MapSorterIt& other) const { return ptr == other.ptr; }
-  bool operator!=(const MapSorterIt& other) const { return !(*this == other); }
-  MapSorterIt& operator++() { ++ptr; return *this; }
-  MapSorterIt operator++(int) { auto other = *this; ++ptr; return other; }
-  MapSorterIt operator+(int v) { return MapSorterIt{ptr + v}; }
-};
-
-// MapSorterFlat stores keys inline with pointers to map entries, so that
-// keys can be compared without indirection. This type is used for maps with
-// keys that are not strings.
-template <typename MapT>
-class MapSorterFlat {
- public:
-  using value_type = typename MapT::value_type;
-  using storage_type = std::pair<typename MapT::key_type, const value_type*>;
-
-  // This const_iterator dereferenes to the map entry stored in the sorting
-  // array pairs. This is the same interface as the Map::const_iterator type,
-  // and allows generated code to use the same loop body with either form:
-  //   for (const auto& entry : map) { ... }
-  //   for (const auto& entry : MapSorterFlat(map)) { ... }
-  struct const_iterator : public MapSorterIt<storage_type> {
-    using pointer = const typename MapT::value_type*;
-    using reference = const typename MapT::value_type&;
-    using MapSorterIt<storage_type>::MapSorterIt;
-
-    pointer operator->() const { return this->ptr->second; }
-    reference operator*() const { return *this->operator->(); }
-  };
-
-  explicit MapSorterFlat(const MapT& m)
-      : size_(m.size()), items_(size_ ? new storage_type[size_] : nullptr) {
-    if (!size_) return;
-    storage_type* it = &items_[0];
-    for (const auto& entry : m) {
-      *it++ = {entry.first, &entry};
-    }
-    std::sort(&items_[0], &items_[size_],
-              [](const storage_type& a, const storage_type& b) {
-                return a.first < b.first;
-              });
-  }
-  size_t size() const { return size_; }
-  const_iterator begin() const { return {items_.get()}; }
-  const_iterator end() const { return {items_.get() + size_}; }
-
- private:
-  size_t size_;
-  std::unique_ptr<storage_type[]> items_;
-};
-
-// MapSorterPtr stores and sorts pointers to map entries. This type is used for
-// maps with keys that are strings.
-template <typename MapT>
-class MapSorterPtr {
- public:
-  using value_type = typename MapT::value_type;
-  using storage_type = const typename MapT::value_type*;
-
-  // This const_iterator dereferenes the map entry pointer stored in the sorting
-  // array. This is the same interface as the Map::const_iterator type, and
-  // allows generated code to use the same loop body with either form:
-  //   for (const auto& entry : map) { ... }
-  //   for (const auto& entry : MapSorterPtr(map)) { ... }
-  struct const_iterator : public MapSorterIt<storage_type> {
-    using pointer = const typename MapT::value_type*;
-    using reference = const typename MapT::value_type&;
-    using MapSorterIt<storage_type>::MapSorterIt;
-
-    pointer operator->() const { return *this->ptr; }
-    reference operator*() const { return *this->operator->(); }
-  };
-
-  explicit MapSorterPtr(const MapT& m)
-      : size_(m.size()), items_(size_ ? new storage_type[size_] : nullptr) {
-    if (!size_) return;
-    storage_type* it = &items_[0];
-    for (const auto& entry : m) {
-      *it++ = &entry;
-    }
-    std::sort(&items_[0], &items_[size_],
-              [](const storage_type& a, const storage_type& b) {
-                return a->first < b->first;
-              });
-  }
-  size_t size() const { return size_; }
-  const_iterator begin() const { return {items_.get()}; }
-  const_iterator end() const { return {items_.get() + size_}; }
-
- private:
-  size_t size_;
-  std::unique_ptr<storage_type[]> items_;
-};
-
-}  // namespace internal
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
-
-#endif  // GOOGLE_PROTOBUF_MAP_ENTRY_LITE_H__
diff --git a/libs/protobuf/src/google/protobuf/map_field.cc b/libs/protobuf/src/google/protobuf/map_field.cc
deleted file mode 100644
index ed662df..0000000
--- a/libs/protobuf/src/google/protobuf/map_field.cc
+++ /dev/null
@@ -1,654 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <google/protobuf/map_field.h>
-
-#include <vector>
-
-#include <google/protobuf/map_field_inl.h>
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-namespace internal {
-
-void MapFieldBase::Destruct() {
-  if (arena_ == nullptr) {
-    delete repeated_field_;
-  }
-  repeated_field_ = nullptr;
-}
-
-const RepeatedPtrFieldBase& MapFieldBase::GetRepeatedField() const {
-  ConstAccess();
-  SyncRepeatedFieldWithMap();
-  return *reinterpret_cast<RepeatedPtrFieldBase*>(repeated_field_);
-}
-
-RepeatedPtrFieldBase* MapFieldBase::MutableRepeatedField() {
-  MutableAccess();
-  SyncRepeatedFieldWithMap();
-  SetRepeatedDirty();
-  return reinterpret_cast<RepeatedPtrFieldBase*>(repeated_field_);
-}
-
-void MapFieldBase::SwapState(MapFieldBase* other) {
-  // a relaxed swap of the atomic
-  auto other_state = other->state_.load(std::memory_order_relaxed);
-  auto this_state = state_.load(std::memory_order_relaxed);
-  other->state_.store(this_state, std::memory_order_relaxed);
-  state_.store(other_state, std::memory_order_relaxed);
-}
-
-void SwapRepeatedPtrToNull(RepeatedPtrField<Message>** from,
-                           RepeatedPtrField<Message>** to, Arena* from_arena,
-                           Arena* to_arena) {
-  GOOGLE_DCHECK(*from != nullptr);
-  GOOGLE_DCHECK(*to == nullptr);
-  *to = Arena::CreateMessage<RepeatedPtrField<Message> >(to_arena);
-  **to = std::move(**from);
-  if (from_arena == nullptr) {
-    delete *from;
-  }
-  *from = nullptr;
-}
-
-void MapFieldBase::Swap(MapFieldBase* other) {
-  if (arena_ == other->arena_) {
-    InternalSwap(other);
-    return;
-  }
-  if (repeated_field_ != nullptr || other->repeated_field_ != nullptr) {
-    if (repeated_field_ == nullptr) {
-      SwapRepeatedPtrToNull(&other->repeated_field_, &repeated_field_,
-                            other->arena_, arena_);
-    } else if (other->repeated_field_ == nullptr) {
-      SwapRepeatedPtrToNull(&repeated_field_, &other->repeated_field_, arena_,
-                            other->arena_);
-    } else {
-      repeated_field_->Swap(other->repeated_field_);
-    }
-  }
-  SwapState(other);
-}
-
-void MapFieldBase::UnsafeShallowSwap(MapFieldBase* other) {
-  GOOGLE_DCHECK_EQ(arena_, other->arena_);
-  InternalSwap(other);
-}
-
-void MapFieldBase::InternalSwap(MapFieldBase* other) {
-  std::swap(arena_, other->arena_);
-  std::swap(repeated_field_, other->repeated_field_);
-  SwapState(other);
-}
-
-size_t MapFieldBase::SpaceUsedExcludingSelfLong() const {
-  ConstAccess();
-  mutex_.Lock();
-  size_t size = SpaceUsedExcludingSelfNoLock();
-  mutex_.Unlock();
-  ConstAccess();
-  return size;
-}
-
-size_t MapFieldBase::SpaceUsedExcludingSelfNoLock() const {
-  if (repeated_field_ != nullptr) {
-    return repeated_field_->SpaceUsedExcludingSelfLong();
-  } else {
-    return 0;
-  }
-}
-
-bool MapFieldBase::IsMapValid() const {
-  ConstAccess();
-  // "Acquire" insures the operation after SyncRepeatedFieldWithMap won't get
-  // executed before state_ is checked.
-  int state = state_.load(std::memory_order_acquire);
-  return state != STATE_MODIFIED_REPEATED;
-}
-
-bool MapFieldBase::IsRepeatedFieldValid() const {
-  ConstAccess();
-  int state = state_.load(std::memory_order_acquire);
-  return state != STATE_MODIFIED_MAP;
-}
-
-void MapFieldBase::SetMapDirty() {
-  MutableAccess();
-  // These are called by (non-const) mutator functions. So by our API it's the
-  // callers responsibility to have these calls properly ordered.
-  state_.store(STATE_MODIFIED_MAP, std::memory_order_relaxed);
-}
-
-void MapFieldBase::SetRepeatedDirty() {
-  MutableAccess();
-  // These are called by (non-const) mutator functions. So by our API it's the
-  // callers responsibility to have these calls properly ordered.
-  state_.store(STATE_MODIFIED_REPEATED, std::memory_order_relaxed);
-}
-
-void MapFieldBase::SyncRepeatedFieldWithMap() const {
-  ConstAccess();
-  // acquire here matches with release below to ensure that we can only see a
-  // value of CLEAN after all previous changes have been synced.
-  switch (state_.load(std::memory_order_acquire)) {
-    case STATE_MODIFIED_MAP:
-      mutex_.Lock();
-      // Double check state, because another thread may have seen the same
-      // state and done the synchronization before the current thread.
-      if (state_.load(std::memory_order_relaxed) == STATE_MODIFIED_MAP) {
-        SyncRepeatedFieldWithMapNoLock();
-        state_.store(CLEAN, std::memory_order_release);
-      }
-      mutex_.Unlock();
-      ConstAccess();
-      break;
-    case CLEAN:
-      mutex_.Lock();
-      // Double check state
-      if (state_.load(std::memory_order_relaxed) == CLEAN) {
-        if (repeated_field_ == nullptr) {
-          repeated_field_ =
-              Arena::CreateMessage<RepeatedPtrField<Message> >(arena_);
-        }
-        state_.store(CLEAN, std::memory_order_release);
-      }
-      mutex_.Unlock();
-      ConstAccess();
-      break;
-    default:
-      break;
-  }
-}
-
-void MapFieldBase::SyncRepeatedFieldWithMapNoLock() const {
-  if (repeated_field_ == nullptr) {
-    repeated_field_ = Arena::CreateMessage<RepeatedPtrField<Message> >(arena_);
-  }
-}
-
-void MapFieldBase::SyncMapWithRepeatedField() const {
-  ConstAccess();
-  // acquire here matches with release below to ensure that we can only see a
-  // value of CLEAN after all previous changes have been synced.
-  if (state_.load(std::memory_order_acquire) == STATE_MODIFIED_REPEATED) {
-    mutex_.Lock();
-    // Double check state, because another thread may have seen the same state
-    // and done the synchronization before the current thread.
-    if (state_.load(std::memory_order_relaxed) == STATE_MODIFIED_REPEATED) {
-      SyncMapWithRepeatedFieldNoLock();
-      state_.store(CLEAN, std::memory_order_release);
-    }
-    mutex_.Unlock();
-    ConstAccess();
-  }
-}
-
-// ------------------DynamicMapField------------------
-DynamicMapField::DynamicMapField(const Message* default_entry)
-    : default_entry_(default_entry) {}
-
-DynamicMapField::DynamicMapField(const Message* default_entry, Arena* arena)
-    : TypeDefinedMapFieldBase<MapKey, MapValueRef>(arena),
-      map_(arena),
-      default_entry_(default_entry) {}
-
-DynamicMapField::~DynamicMapField() {
-  if (arena_ == nullptr) {
-    // DynamicMapField owns map values. Need to delete them before clearing the
-    // map.
-    for (auto& kv : map_) {
-      kv.second.DeleteData();
-    }
-    map_.clear();
-  }
-  Destruct();
-}
-
-int DynamicMapField::size() const { return GetMap().size(); }
-
-void DynamicMapField::Clear() {
-  Map<MapKey, MapValueRef>* map = &const_cast<DynamicMapField*>(this)->map_;
-  if (MapFieldBase::arena_ == nullptr) {
-    for (Map<MapKey, MapValueRef>::iterator iter = map->begin();
-         iter != map->end(); ++iter) {
-      iter->second.DeleteData();
-    }
-  }
-
-  map->clear();
-
-  if (MapFieldBase::repeated_field_ != nullptr) {
-    MapFieldBase::repeated_field_->Clear();
-  }
-  // Data in map and repeated field are both empty, but we can't set status
-  // CLEAN which will invalidate previous reference to map.
-  MapFieldBase::SetMapDirty();
-}
-
-bool DynamicMapField::ContainsMapKey(const MapKey& map_key) const {
-  const Map<MapKey, MapValueRef>& map = GetMap();
-  Map<MapKey, MapValueRef>::const_iterator iter = map.find(map_key);
-  return iter != map.end();
-}
-
-void DynamicMapField::AllocateMapValue(MapValueRef* map_val) {
-  const FieldDescriptor* val_des = default_entry_->GetDescriptor()->map_value();
-  map_val->SetType(val_des->cpp_type());
-  // Allocate memory for the MapValueRef, and initialize to
-  // default value.
-  switch (val_des->cpp_type()) {
-#define HANDLE_TYPE(CPPTYPE, TYPE)                           \
-  case FieldDescriptor::CPPTYPE_##CPPTYPE: {                 \
-    TYPE* value = Arena::Create<TYPE>(MapFieldBase::arena_); \
-    map_val->SetValue(value);                                \
-    break;                                                   \
-  }
-    HANDLE_TYPE(INT32, int32_t);
-    HANDLE_TYPE(INT64, int64_t);
-    HANDLE_TYPE(UINT32, uint32_t);
-    HANDLE_TYPE(UINT64, uint64_t);
-    HANDLE_TYPE(DOUBLE, double);
-    HANDLE_TYPE(FLOAT, float);
-    HANDLE_TYPE(BOOL, bool);
-    HANDLE_TYPE(STRING, std::string);
-    HANDLE_TYPE(ENUM, int32_t);
-#undef HANDLE_TYPE
-    case FieldDescriptor::CPPTYPE_MESSAGE: {
-      const Message& message =
-          default_entry_->GetReflection()->GetMessage(*default_entry_, val_des);
-      Message* value = message.New(MapFieldBase::arena_);
-      map_val->SetValue(value);
-      break;
-    }
-  }
-}
-
-bool DynamicMapField::InsertOrLookupMapValue(const MapKey& map_key,
-                                             MapValueRef* val) {
-  // Always use mutable map because users may change the map value by
-  // MapValueRef.
-  Map<MapKey, MapValueRef>* map = MutableMap();
-  Map<MapKey, MapValueRef>::iterator iter = map->find(map_key);
-  if (iter == map->end()) {
-    MapValueRef& map_val = map_[map_key];
-    AllocateMapValue(&map_val);
-    val->CopyFrom(map_val);
-    return true;
-  }
-  // map_key is already in the map. Make sure (*map)[map_key] is not called.
-  // [] may reorder the map and iterators.
-  val->CopyFrom(iter->second);
-  return false;
-}
-
-bool DynamicMapField::LookupMapValue(const MapKey& map_key,
-                                     MapValueConstRef* val) const {
-  const Map<MapKey, MapValueRef>& map = GetMap();
-  Map<MapKey, MapValueRef>::const_iterator iter = map.find(map_key);
-  if (iter == map.end()) {
-    return false;
-  }
-  // map_key is already in the map. Make sure (*map)[map_key] is not called.
-  // [] may reorder the map and iterators.
-  val->CopyFrom(iter->second);
-  return true;
-}
-
-bool DynamicMapField::DeleteMapValue(const MapKey& map_key) {
-  MapFieldBase::SyncMapWithRepeatedField();
-  Map<MapKey, MapValueRef>::iterator iter = map_.find(map_key);
-  if (iter == map_.end()) {
-    return false;
-  }
-  // Set map dirty only if the delete is successful.
-  MapFieldBase::SetMapDirty();
-  if (MapFieldBase::arena_ == nullptr) {
-    iter->second.DeleteData();
-  }
-  map_.erase(iter);
-  return true;
-}
-
-const Map<MapKey, MapValueRef>& DynamicMapField::GetMap() const {
-  MapFieldBase::SyncMapWithRepeatedField();
-  return map_;
-}
-
-Map<MapKey, MapValueRef>* DynamicMapField::MutableMap() {
-  MapFieldBase::SyncMapWithRepeatedField();
-  MapFieldBase::SetMapDirty();
-  return &map_;
-}
-
-void DynamicMapField::SetMapIteratorValue(MapIterator* map_iter) const {
-  Map<MapKey, MapValueRef>::const_iterator iter =
-      TypeDefinedMapFieldBase<MapKey, MapValueRef>::InternalGetIterator(
-          map_iter);
-  if (iter == map_.end()) return;
-  map_iter->key_.CopyFrom(iter->first);
-  map_iter->value_.CopyFrom(iter->second);
-}
-
-void DynamicMapField::MergeFrom(const MapFieldBase& other) {
-  GOOGLE_DCHECK(IsMapValid() && other.IsMapValid());
-  Map<MapKey, MapValueRef>* map = MutableMap();
-  const DynamicMapField& other_field =
-      reinterpret_cast<const DynamicMapField&>(other);
-  for (Map<MapKey, MapValueRef>::const_iterator other_it =
-           other_field.map_.begin();
-       other_it != other_field.map_.end(); ++other_it) {
-    Map<MapKey, MapValueRef>::iterator iter = map->find(other_it->first);
-    MapValueRef* map_val;
-    if (iter == map->end()) {
-      map_val = &map_[other_it->first];
-      AllocateMapValue(map_val);
-    } else {
-      map_val = &iter->second;
-    }
-
-    // Copy map value
-    const FieldDescriptor* field_descriptor =
-        default_entry_->GetDescriptor()->map_value();
-    switch (field_descriptor->cpp_type()) {
-      case FieldDescriptor::CPPTYPE_INT32: {
-        map_val->SetInt32Value(other_it->second.GetInt32Value());
-        break;
-      }
-      case FieldDescriptor::CPPTYPE_INT64: {
-        map_val->SetInt64Value(other_it->second.GetInt64Value());
-        break;
-      }
-      case FieldDescriptor::CPPTYPE_UINT32: {
-        map_val->SetUInt32Value(other_it->second.GetUInt32Value());
-        break;
-      }
-      case FieldDescriptor::CPPTYPE_UINT64: {
-        map_val->SetUInt64Value(other_it->second.GetUInt64Value());
-        break;
-      }
-      case FieldDescriptor::CPPTYPE_FLOAT: {
-        map_val->SetFloatValue(other_it->second.GetFloatValue());
-        break;
-      }
-      case FieldDescriptor::CPPTYPE_DOUBLE: {
-        map_val->SetDoubleValue(other_it->second.GetDoubleValue());
-        break;
-      }
-      case FieldDescriptor::CPPTYPE_BOOL: {
-        map_val->SetBoolValue(other_it->second.GetBoolValue());
-        break;
-      }
-      case FieldDescriptor::CPPTYPE_STRING: {
-        map_val->SetStringValue(other_it->second.GetStringValue());
-        break;
-      }
-      case FieldDescriptor::CPPTYPE_ENUM: {
-        map_val->SetEnumValue(other_it->second.GetEnumValue());
-        break;
-      }
-      case FieldDescriptor::CPPTYPE_MESSAGE: {
-        map_val->MutableMessageValue()->CopyFrom(
-            other_it->second.GetMessageValue());
-        break;
-      }
-    }
-  }
-}
-
-void DynamicMapField::Swap(MapFieldBase* other) {
-  DynamicMapField* other_field = down_cast<DynamicMapField*>(other);
-  std::swap(this->MapFieldBase::repeated_field_, other_field->repeated_field_);
-  map_.swap(other_field->map_);
-  // a relaxed swap of the atomic
-  auto other_state = other_field->state_.load(std::memory_order_relaxed);
-  auto this_state = this->MapFieldBase::state_.load(std::memory_order_relaxed);
-  other_field->state_.store(this_state, std::memory_order_relaxed);
-  this->MapFieldBase::state_.store(other_state, std::memory_order_relaxed);
-}
-
-void DynamicMapField::SyncRepeatedFieldWithMapNoLock() const {
-  const Reflection* reflection = default_entry_->GetReflection();
-  const FieldDescriptor* key_des = default_entry_->GetDescriptor()->map_key();
-  const FieldDescriptor* val_des = default_entry_->GetDescriptor()->map_value();
-  if (MapFieldBase::repeated_field_ == nullptr) {
-    MapFieldBase::repeated_field_ =
-        Arena::CreateMessage<RepeatedPtrField<Message> >(MapFieldBase::arena_);
-  }
-
-  MapFieldBase::repeated_field_->Clear();
-
-  for (Map<MapKey, MapValueRef>::const_iterator it = map_.begin();
-       it != map_.end(); ++it) {
-    Message* new_entry = default_entry_->New(MapFieldBase::arena_);
-    MapFieldBase::repeated_field_->AddAllocated(new_entry);
-    const MapKey& map_key = it->first;
-    switch (key_des->cpp_type()) {
-      case FieldDescriptor::CPPTYPE_STRING:
-        reflection->SetString(new_entry, key_des, map_key.GetStringValue());
-        break;
-      case FieldDescriptor::CPPTYPE_INT64:
-        reflection->SetInt64(new_entry, key_des, map_key.GetInt64Value());
-        break;
-      case FieldDescriptor::CPPTYPE_INT32:
-        reflection->SetInt32(new_entry, key_des, map_key.GetInt32Value());
-        break;
-      case FieldDescriptor::CPPTYPE_UINT64:
-        reflection->SetUInt64(new_entry, key_des, map_key.GetUInt64Value());
-        break;
-      case FieldDescriptor::CPPTYPE_UINT32:
-        reflection->SetUInt32(new_entry, key_des, map_key.GetUInt32Value());
-        break;
-      case FieldDescriptor::CPPTYPE_BOOL:
-        reflection->SetBool(new_entry, key_des, map_key.GetBoolValue());
-        break;
-      case FieldDescriptor::CPPTYPE_DOUBLE:
-      case FieldDescriptor::CPPTYPE_FLOAT:
-      case FieldDescriptor::CPPTYPE_ENUM:
-      case FieldDescriptor::CPPTYPE_MESSAGE:
-        GOOGLE_LOG(FATAL) << "Can't get here.";
-        break;
-    }
-    const MapValueRef& map_val = it->second;
-    switch (val_des->cpp_type()) {
-      case FieldDescriptor::CPPTYPE_STRING:
-        reflection->SetString(new_entry, val_des, map_val.GetStringValue());
-        break;
-      case FieldDescriptor::CPPTYPE_INT64:
-        reflection->SetInt64(new_entry, val_des, map_val.GetInt64Value());
-        break;
-      case FieldDescriptor::CPPTYPE_INT32:
-        reflection->SetInt32(new_entry, val_des, map_val.GetInt32Value());
-        break;
-      case FieldDescriptor::CPPTYPE_UINT64:
-        reflection->SetUInt64(new_entry, val_des, map_val.GetUInt64Value());
-        break;
-      case FieldDescriptor::CPPTYPE_UINT32:
-        reflection->SetUInt32(new_entry, val_des, map_val.GetUInt32Value());
-        break;
-      case FieldDescriptor::CPPTYPE_BOOL:
-        reflection->SetBool(new_entry, val_des, map_val.GetBoolValue());
-        break;
-      case FieldDescriptor::CPPTYPE_DOUBLE:
-        reflection->SetDouble(new_entry, val_des, map_val.GetDoubleValue());
-        break;
-      case FieldDescriptor::CPPTYPE_FLOAT:
-        reflection->SetFloat(new_entry, val_des, map_val.GetFloatValue());
-        break;
-      case FieldDescriptor::CPPTYPE_ENUM:
-        reflection->SetEnumValue(new_entry, val_des, map_val.GetEnumValue());
-        break;
-      case FieldDescriptor::CPPTYPE_MESSAGE: {
-        const Message& message = map_val.GetMessageValue();
-        reflection->MutableMessage(new_entry, val_des)->CopyFrom(message);
-        break;
-      }
-    }
-  }
-}
-
-void DynamicMapField::SyncMapWithRepeatedFieldNoLock() const {
-  Map<MapKey, MapValueRef>* map = &const_cast<DynamicMapField*>(this)->map_;
-  const Reflection* reflection = default_entry_->GetReflection();
-  const FieldDescriptor* key_des = default_entry_->GetDescriptor()->map_key();
-  const FieldDescriptor* val_des = default_entry_->GetDescriptor()->map_value();
-  // DynamicMapField owns map values. Need to delete them before clearing
-  // the map.
-  if (MapFieldBase::arena_ == nullptr) {
-    for (Map<MapKey, MapValueRef>::iterator iter = map->begin();
-         iter != map->end(); ++iter) {
-      iter->second.DeleteData();
-    }
-  }
-  map->clear();
-  for (RepeatedPtrField<Message>::iterator it =
-           MapFieldBase::repeated_field_->begin();
-       it != MapFieldBase::repeated_field_->end(); ++it) {
-    // MapKey type will be set later.
-    MapKey map_key;
-    switch (key_des->cpp_type()) {
-      case FieldDescriptor::CPPTYPE_STRING:
-        map_key.SetStringValue(reflection->GetString(*it, key_des));
-        break;
-      case FieldDescriptor::CPPTYPE_INT64:
-        map_key.SetInt64Value(reflection->GetInt64(*it, key_des));
-        break;
-      case FieldDescriptor::CPPTYPE_INT32:
-        map_key.SetInt32Value(reflection->GetInt32(*it, key_des));
-        break;
-      case FieldDescriptor::CPPTYPE_UINT64:
-        map_key.SetUInt64Value(reflection->GetUInt64(*it, key_des));
-        break;
-      case FieldDescriptor::CPPTYPE_UINT32:
-        map_key.SetUInt32Value(reflection->GetUInt32(*it, key_des));
-        break;
-      case FieldDescriptor::CPPTYPE_BOOL:
-        map_key.SetBoolValue(reflection->GetBool(*it, key_des));
-        break;
-      case FieldDescriptor::CPPTYPE_DOUBLE:
-      case FieldDescriptor::CPPTYPE_FLOAT:
-      case FieldDescriptor::CPPTYPE_ENUM:
-      case FieldDescriptor::CPPTYPE_MESSAGE:
-        GOOGLE_LOG(FATAL) << "Can't get here.";
-        break;
-    }
-
-    if (MapFieldBase::arena_ == nullptr) {
-      // Remove existing map value with same key.
-      Map<MapKey, MapValueRef>::iterator iter = map->find(map_key);
-      if (iter != map->end()) {
-        iter->second.DeleteData();
-      }
-    }
-
-    MapValueRef& map_val = (*map)[map_key];
-    map_val.SetType(val_des->cpp_type());
-    switch (val_des->cpp_type()) {
-#define HANDLE_TYPE(CPPTYPE, TYPE, METHOD)                   \
-  case FieldDescriptor::CPPTYPE_##CPPTYPE: {                 \
-    TYPE* value = Arena::Create<TYPE>(MapFieldBase::arena_); \
-    *value = reflection->Get##METHOD(*it, val_des);          \
-    map_val.SetValue(value);                                 \
-    break;                                                   \
-  }
-      HANDLE_TYPE(INT32, int32_t, Int32);
-      HANDLE_TYPE(INT64, int64_t, Int64);
-      HANDLE_TYPE(UINT32, uint32_t, UInt32);
-      HANDLE_TYPE(UINT64, uint64_t, UInt64);
-      HANDLE_TYPE(DOUBLE, double, Double);
-      HANDLE_TYPE(FLOAT, float, Float);
-      HANDLE_TYPE(BOOL, bool, Bool);
-      HANDLE_TYPE(STRING, std::string, String);
-      HANDLE_TYPE(ENUM, int32_t, EnumValue);
-#undef HANDLE_TYPE
-      case FieldDescriptor::CPPTYPE_MESSAGE: {
-        const Message& message = reflection->GetMessage(*it, val_des);
-        Message* value = message.New(MapFieldBase::arena_);
-        value->CopyFrom(message);
-        map_val.SetValue(value);
-        break;
-      }
-    }
-  }
-}
-
-size_t DynamicMapField::SpaceUsedExcludingSelfNoLock() const {
-  size_t size = 0;
-  if (MapFieldBase::repeated_field_ != nullptr) {
-    size += MapFieldBase::repeated_field_->SpaceUsedExcludingSelfLong();
-  }
-  size += sizeof(map_);
-  size_t map_size = map_.size();
-  if (map_size) {
-    Map<MapKey, MapValueRef>::const_iterator it = map_.begin();
-    size += sizeof(it->first) * map_size;
-    size += sizeof(it->second) * map_size;
-    // If key is string, add the allocated space.
-    if (it->first.type() == FieldDescriptor::CPPTYPE_STRING) {
-      size += sizeof(std::string) * map_size;
-    }
-    // Add the allocated space in MapValueRef.
-    switch (it->second.type()) {
-#define HANDLE_TYPE(CPPTYPE, TYPE)           \
-  case FieldDescriptor::CPPTYPE_##CPPTYPE: { \
-    size += sizeof(TYPE) * map_size;         \
-    break;                                   \
-  }
-      HANDLE_TYPE(INT32, int32_t);
-      HANDLE_TYPE(INT64, int64_t);
-      HANDLE_TYPE(UINT32, uint32_t);
-      HANDLE_TYPE(UINT64, uint64_t);
-      HANDLE_TYPE(DOUBLE, double);
-      HANDLE_TYPE(FLOAT, float);
-      HANDLE_TYPE(BOOL, bool);
-      HANDLE_TYPE(STRING, std::string);
-      HANDLE_TYPE(ENUM, int32_t);
-#undef HANDLE_TYPE
-      case FieldDescriptor::CPPTYPE_MESSAGE: {
-        while (it != map_.end()) {
-          const Message& message = it->second.GetMessageValue();
-          size += message.GetReflection()->SpaceUsedLong(message);
-          ++it;
-        }
-        break;
-      }
-    }
-  }
-  return size;
-}
-
-}  // namespace internal
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
diff --git a/libs/protobuf/src/google/protobuf/map_field.h b/libs/protobuf/src/google/protobuf/map_field.h
deleted file mode 100644
index 287d58f..0000000
--- a/libs/protobuf/src/google/protobuf/map_field.h
+++ /dev/null
@@ -1,946 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef GOOGLE_PROTOBUF_MAP_FIELD_H__
-#define GOOGLE_PROTOBUF_MAP_FIELD_H__
-
-#include <atomic>
-#include <functional>
-
-#include <google/protobuf/arena.h>
-#include <google/protobuf/stubs/mutex.h>
-#include <google/protobuf/port.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/generated_message_reflection.h>
-#include <google/protobuf/generated_message_util.h>
-#include <google/protobuf/map_entry.h>
-#include <google/protobuf/map_field_lite.h>
-#include <google/protobuf/map_type_handler.h>
-#include <google/protobuf/message.h>
-#include <google/protobuf/repeated_field.h>
-#include <google/protobuf/unknown_field_set.h>
-
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-#ifdef SWIG
-#error "You cannot SWIG proto headers"
-#endif
-
-namespace google {
-namespace protobuf {
-class DynamicMessage;
-class MapIterator;
-
-// Microsoft compiler complains about non-virtual destructor,
-// even when the destructor is private.
-#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable : 4265)
-#endif  // _MSC_VER
-
-#define TYPE_CHECK(EXPECTEDTYPE, METHOD)                                   \
-  if (type() != EXPECTEDTYPE) {                                            \
-    GOOGLE_LOG(FATAL) << "Protocol Buffer map usage error:\n"                     \
-               << METHOD << " type does not match\n"                       \
-               << "  Expected : "                                          \
-               << FieldDescriptor::CppTypeName(EXPECTEDTYPE) << "\n"       \
-               << "  Actual   : " << FieldDescriptor::CppTypeName(type()); \
-  }
-
-// MapKey is an union type for representing any possible
-// map key.
-class PROTOBUF_EXPORT MapKey {
- public:
-  MapKey() : type_() {}
-  MapKey(const MapKey& other) : type_() { CopyFrom(other); }
-
-  MapKey& operator=(const MapKey& other) {
-    CopyFrom(other);
-    return *this;
-  }
-
-  ~MapKey() {
-    if (type_ == FieldDescriptor::CPPTYPE_STRING) {
-      val_.string_value_.Destruct();
-    }
-  }
-
-  FieldDescriptor::CppType type() const {
-    if (type_ == FieldDescriptor::CppType()) {
-      GOOGLE_LOG(FATAL) << "Protocol Buffer map usage error:\n"
-                 << "MapKey::type MapKey is not initialized. "
-                 << "Call set methods to initialize MapKey.";
-    }
-    return type_;
-  }
-
-  void SetInt64Value(int64_t value) {
-    SetType(FieldDescriptor::CPPTYPE_INT64);
-    val_.int64_value_ = value;
-  }
-  void SetUInt64Value(uint64_t value) {
-    SetType(FieldDescriptor::CPPTYPE_UINT64);
-    val_.uint64_value_ = value;
-  }
-  void SetInt32Value(int32_t value) {
-    SetType(FieldDescriptor::CPPTYPE_INT32);
-    val_.int32_value_ = value;
-  }
-  void SetUInt32Value(uint32_t value) {
-    SetType(FieldDescriptor::CPPTYPE_UINT32);
-    val_.uint32_value_ = value;
-  }
-  void SetBoolValue(bool value) {
-    SetType(FieldDescriptor::CPPTYPE_BOOL);
-    val_.bool_value_ = value;
-  }
-  void SetStringValue(std::string val) {
-    SetType(FieldDescriptor::CPPTYPE_STRING);
-    *val_.string_value_.get_mutable() = std::move(val);
-  }
-
-  int64_t GetInt64Value() const {
-    TYPE_CHECK(FieldDescriptor::CPPTYPE_INT64, "MapKey::GetInt64Value");
-    return val_.int64_value_;
-  }
-  uint64_t GetUInt64Value() const {
-    TYPE_CHECK(FieldDescriptor::CPPTYPE_UINT64, "MapKey::GetUInt64Value");
-    return val_.uint64_value_;
-  }
-  int32_t GetInt32Value() const {
-    TYPE_CHECK(FieldDescriptor::CPPTYPE_INT32, "MapKey::GetInt32Value");
-    return val_.int32_value_;
-  }
-  uint32_t GetUInt32Value() const {
-    TYPE_CHECK(FieldDescriptor::CPPTYPE_UINT32, "MapKey::GetUInt32Value");
-    return val_.uint32_value_;
-  }
-  bool GetBoolValue() const {
-    TYPE_CHECK(FieldDescriptor::CPPTYPE_BOOL, "MapKey::GetBoolValue");
-    return val_.bool_value_;
-  }
-  const std::string& GetStringValue() const {
-    TYPE_CHECK(FieldDescriptor::CPPTYPE_STRING, "MapKey::GetStringValue");
-    return val_.string_value_.get();
-  }
-
-  bool operator<(const MapKey& other) const {
-    if (type_ != other.type_) {
-      // We could define a total order that handles this case, but
-      // there currently no need.  So, for now, fail.
-      GOOGLE_LOG(FATAL) << "Unsupported: type mismatch";
-    }
-    switch (type()) {
-      case FieldDescriptor::CPPTYPE_DOUBLE:
-      case FieldDescriptor::CPPTYPE_FLOAT:
-      case FieldDescriptor::CPPTYPE_ENUM:
-      case FieldDescriptor::CPPTYPE_MESSAGE:
-        GOOGLE_LOG(FATAL) << "Unsupported";
-        return false;
-      case FieldDescriptor::CPPTYPE_STRING:
-        return val_.string_value_.get() < other.val_.string_value_.get();
-      case FieldDescriptor::CPPTYPE_INT64:
-        return val_.int64_value_ < other.val_.int64_value_;
-      case FieldDescriptor::CPPTYPE_INT32:
-        return val_.int32_value_ < other.val_.int32_value_;
-      case FieldDescriptor::CPPTYPE_UINT64:
-        return val_.uint64_value_ < other.val_.uint64_value_;
-      case FieldDescriptor::CPPTYPE_UINT32:
-        return val_.uint32_value_ < other.val_.uint32_value_;
-      case FieldDescriptor::CPPTYPE_BOOL:
-        return val_.bool_value_ < other.val_.bool_value_;
-    }
-    return false;
-  }
-
-  bool operator==(const MapKey& other) const {
-    if (type_ != other.type_) {
-      // To be consistent with operator<, we don't allow this either.
-      GOOGLE_LOG(FATAL) << "Unsupported: type mismatch";
-    }
-    switch (type()) {
-      case FieldDescriptor::CPPTYPE_DOUBLE:
-      case FieldDescriptor::CPPTYPE_FLOAT:
-      case FieldDescriptor::CPPTYPE_ENUM:
-      case FieldDescriptor::CPPTYPE_MESSAGE:
-        GOOGLE_LOG(FATAL) << "Unsupported";
-        break;
-      case FieldDescriptor::CPPTYPE_STRING:
-        return val_.string_value_.get() == other.val_.string_value_.get();
-      case FieldDescriptor::CPPTYPE_INT64:
-        return val_.int64_value_ == other.val_.int64_value_;
-      case FieldDescriptor::CPPTYPE_INT32:
-        return val_.int32_value_ == other.val_.int32_value_;
-      case FieldDescriptor::CPPTYPE_UINT64:
-        return val_.uint64_value_ == other.val_.uint64_value_;
-      case FieldDescriptor::CPPTYPE_UINT32:
-        return val_.uint32_value_ == other.val_.uint32_value_;
-      case FieldDescriptor::CPPTYPE_BOOL:
-        return val_.bool_value_ == other.val_.bool_value_;
-    }
-    GOOGLE_LOG(FATAL) << "Can't get here.";
-    return false;
-  }
-
-  void CopyFrom(const MapKey& other) {
-    SetType(other.type());
-    switch (type_) {
-      case FieldDescriptor::CPPTYPE_DOUBLE:
-      case FieldDescriptor::CPPTYPE_FLOAT:
-      case FieldDescriptor::CPPTYPE_ENUM:
-      case FieldDescriptor::CPPTYPE_MESSAGE:
-        GOOGLE_LOG(FATAL) << "Unsupported";
-        break;
-      case FieldDescriptor::CPPTYPE_STRING:
-        *val_.string_value_.get_mutable() = other.val_.string_value_.get();
-        break;
-      case FieldDescriptor::CPPTYPE_INT64:
-        val_.int64_value_ = other.val_.int64_value_;
-        break;
-      case FieldDescriptor::CPPTYPE_INT32:
-        val_.int32_value_ = other.val_.int32_value_;
-        break;
-      case FieldDescriptor::CPPTYPE_UINT64:
-        val_.uint64_value_ = other.val_.uint64_value_;
-        break;
-      case FieldDescriptor::CPPTYPE_UINT32:
-        val_.uint32_value_ = other.val_.uint32_value_;
-        break;
-      case FieldDescriptor::CPPTYPE_BOOL:
-        val_.bool_value_ = other.val_.bool_value_;
-        break;
-    }
-  }
-
- private:
-  template <typename K, typename V>
-  friend class internal::TypeDefinedMapFieldBase;
-  friend class ::PROTOBUF_NAMESPACE_ID::MapIterator;
-  friend class internal::DynamicMapField;
-
-  union KeyValue {
-    KeyValue() {}
-    internal::ExplicitlyConstructed<std::string> string_value_;
-    int64_t int64_value_;
-    int32_t int32_value_;
-    uint64_t uint64_value_;
-    uint32_t uint32_value_;
-    bool bool_value_;
-  } val_;
-
-  void SetType(FieldDescriptor::CppType type) {
-    if (type_ == type) return;
-    if (type_ == FieldDescriptor::CPPTYPE_STRING) {
-      val_.string_value_.Destruct();
-    }
-    type_ = type;
-    if (type_ == FieldDescriptor::CPPTYPE_STRING) {
-      val_.string_value_.DefaultConstruct();
-    }
-  }
-
-  // type_ is 0 or a valid FieldDescriptor::CppType.
-  // Use "CppType()" to indicate zero.
-  FieldDescriptor::CppType type_;
-};
-
-}  // namespace protobuf
-}  // namespace google
-namespace std {
-template <>
-struct hash<::PROTOBUF_NAMESPACE_ID::MapKey> {
-  size_t operator()(const ::PROTOBUF_NAMESPACE_ID::MapKey& map_key) const {
-    switch (map_key.type()) {
-      case ::PROTOBUF_NAMESPACE_ID::FieldDescriptor::CPPTYPE_DOUBLE:
-      case ::PROTOBUF_NAMESPACE_ID::FieldDescriptor::CPPTYPE_FLOAT:
-      case ::PROTOBUF_NAMESPACE_ID::FieldDescriptor::CPPTYPE_ENUM:
-      case ::PROTOBUF_NAMESPACE_ID::FieldDescriptor::CPPTYPE_MESSAGE:
-        GOOGLE_LOG(FATAL) << "Unsupported";
-        break;
-      case ::PROTOBUF_NAMESPACE_ID::FieldDescriptor::CPPTYPE_STRING:
-        return hash<std::string>()(map_key.GetStringValue());
-      case ::PROTOBUF_NAMESPACE_ID::FieldDescriptor::CPPTYPE_INT64: {
-        auto value = map_key.GetInt64Value();
-        return hash<decltype(value)>()(value);
-      }
-      case ::PROTOBUF_NAMESPACE_ID::FieldDescriptor::CPPTYPE_INT32: {
-        auto value = map_key.GetInt32Value();
-        return hash<decltype(value)>()(map_key.GetInt32Value());
-      }
-      case ::PROTOBUF_NAMESPACE_ID::FieldDescriptor::CPPTYPE_UINT64: {
-        auto value = map_key.GetUInt64Value();
-        return hash<decltype(value)>()(map_key.GetUInt64Value());
-      }
-      case ::PROTOBUF_NAMESPACE_ID::FieldDescriptor::CPPTYPE_UINT32: {
-        auto value = map_key.GetUInt32Value();
-        return hash<decltype(value)>()(map_key.GetUInt32Value());
-      }
-      case ::PROTOBUF_NAMESPACE_ID::FieldDescriptor::CPPTYPE_BOOL: {
-        return hash<bool>()(map_key.GetBoolValue());
-      }
-    }
-    GOOGLE_LOG(FATAL) << "Can't get here.";
-    return 0;
-  }
-  bool operator()(const ::PROTOBUF_NAMESPACE_ID::MapKey& map_key1,
-                  const ::PROTOBUF_NAMESPACE_ID::MapKey& map_key2) const {
-    return map_key1 < map_key2;
-  }
-};
-}  // namespace std
-
-namespace google {
-namespace protobuf {
-namespace internal {
-
-class ContendedMapCleanTest;
-class GeneratedMessageReflection;
-class MapFieldAccessor;
-
-// This class provides access to map field using reflection, which is the same
-// as those provided for RepeatedPtrField<Message>. It is used for internal
-// reflection implementation only. Users should never use this directly.
-class PROTOBUF_EXPORT MapFieldBase {
- public:
-  MapFieldBase()
-      : arena_(nullptr), repeated_field_(nullptr), state_(STATE_MODIFIED_MAP) {}
-
-  // This constructor is for constant initialized global instances.
-  // It uses a linker initialized mutex, so it is not compatible with regular
-  // runtime instances.
-  // Except in MSVC, where we can't have a constinit mutex.
-  // NOLINTNEXTLINE(google-explicit-constructor)
-  constexpr MapFieldBase(ConstantInitialized)
-      : arena_(nullptr),
-        repeated_field_(nullptr),
-        mutex_(GOOGLE_PROTOBUF_LINKER_INITIALIZED),
-        state_(STATE_MODIFIED_MAP) {}
-  explicit MapFieldBase(Arena* arena)
-      : arena_(arena), repeated_field_(nullptr), state_(STATE_MODIFIED_MAP) {}
-
- protected:
-  ~MapFieldBase() {  // "protected" stops users from deleting a `MapFieldBase *`
-    GOOGLE_DCHECK(repeated_field_ == nullptr);
-  }
-  void Destruct();
-
- public:
-  // Returns reference to internal repeated field. Data written using
-  // Map's api prior to calling this function is guarantted to be
-  // included in repeated field.
-  const RepeatedPtrFieldBase& GetRepeatedField() const;
-
-  // Like above. Returns mutable pointer to the internal repeated field.
-  RepeatedPtrFieldBase* MutableRepeatedField();
-
-  // Pure virtual map APIs for Map Reflection.
-  virtual bool ContainsMapKey(const MapKey& map_key) const = 0;
-  virtual bool InsertOrLookupMapValue(const MapKey& map_key,
-                                      MapValueRef* val) = 0;
-  virtual bool LookupMapValue(const MapKey& map_key,
-                              MapValueConstRef* val) const = 0;
-  bool LookupMapValue(const MapKey&, MapValueRef*) const = delete;
-
-  // Returns whether changes to the map are reflected in the repeated field.
-  bool IsRepeatedFieldValid() const;
-  // Insures operations after won't get executed before calling this.
-  bool IsMapValid() const;
-  virtual bool DeleteMapValue(const MapKey& map_key) = 0;
-  virtual bool EqualIterator(const MapIterator& a,
-                             const MapIterator& b) const = 0;
-  virtual void MapBegin(MapIterator* map_iter) const = 0;
-  virtual void MapEnd(MapIterator* map_iter) const = 0;
-  virtual void MergeFrom(const MapFieldBase& other) = 0;
-  virtual void Swap(MapFieldBase* other);
-  virtual void UnsafeShallowSwap(MapFieldBase* other);
-  // Sync Map with repeated field and returns the size of map.
-  virtual int size() const = 0;
-  virtual void Clear() = 0;
-
-  // Returns the number of bytes used by the repeated field, excluding
-  // sizeof(*this)
-  size_t SpaceUsedExcludingSelfLong() const;
-
-  int SpaceUsedExcludingSelf() const {
-    return internal::ToIntSize(SpaceUsedExcludingSelfLong());
-  }
-
- protected:
-  // Gets the size of space used by map field.
-  virtual size_t SpaceUsedExcludingSelfNoLock() const;
-
-  // Synchronizes the content in Map to RepeatedPtrField if there is any change
-  // to Map after last synchronization.
-  void SyncRepeatedFieldWithMap() const;
-  virtual void SyncRepeatedFieldWithMapNoLock() const;
-
-  // Synchronizes the content in RepeatedPtrField to Map if there is any change
-  // to RepeatedPtrField after last synchronization.
-  void SyncMapWithRepeatedField() const;
-  virtual void SyncMapWithRepeatedFieldNoLock() const {}
-
-  // Tells MapFieldBase that there is new change to Map.
-  void SetMapDirty();
-
-  // Tells MapFieldBase that there is new change to RepeatedPtrField.
-  void SetRepeatedDirty();
-
-  // Provides derived class the access to repeated field.
-  void* MutableRepeatedPtrField() const;
-
-  void InternalSwap(MapFieldBase* other);
-
-  // Support thread sanitizer (tsan) by making const / mutable races
-  // more apparent.  If one thread calls MutableAccess() while another
-  // thread calls either ConstAccess() or MutableAccess(), on the same
-  // MapFieldBase-derived object, and there is no synchronization going
-  // on between them, tsan will alert.
-#if defined(__SANITIZE_THREAD__) || defined(THREAD_SANITIZER)
-  void ConstAccess() const { GOOGLE_CHECK_EQ(seq1_, seq2_); }
-  void MutableAccess() {
-    if (seq1_ & 1) {
-      seq2_ = ++seq1_;
-    } else {
-      seq1_ = ++seq2_;
-    }
-  }
-  unsigned int seq1_ = 0, seq2_ = 0;
-#else
-  void ConstAccess() const {}
-  void MutableAccess() {}
-#endif
-  enum State {
-    STATE_MODIFIED_MAP = 0,       // map has newly added data that has not been
-                                  // synchronized to repeated field
-    STATE_MODIFIED_REPEATED = 1,  // repeated field has newly added data that
-                                  // has not been synchronized to map
-    CLEAN = 2,                    // data in map and repeated field are same
-  };
-
-  Arena* arena_;
-  mutable RepeatedPtrField<Message>* repeated_field_;
-
-  mutable internal::WrappedMutex
-      mutex_;  // The thread to synchronize map and repeated field
-               // needs to get lock first;
-  mutable std::atomic<State> state_;
-
- private:
-  friend class ContendedMapCleanTest;
-  friend class GeneratedMessageReflection;
-  friend class MapFieldAccessor;
-  friend class ::PROTOBUF_NAMESPACE_ID::Reflection;
-  friend class ::PROTOBUF_NAMESPACE_ID::DynamicMessage;
-
-  // Virtual helper methods for MapIterator. MapIterator doesn't have the
-  // type helper for key and value. Call these help methods to deal with
-  // different types. Real helper methods are implemented in
-  // TypeDefinedMapFieldBase.
-  friend class ::PROTOBUF_NAMESPACE_ID::MapIterator;
-  // Allocate map<...>::iterator for MapIterator.
-  virtual void InitializeIterator(MapIterator* map_iter) const = 0;
-
-  // DeleteIterator() is called by the destructor of MapIterator only.
-  // It deletes map<...>::iterator for MapIterator.
-  virtual void DeleteIterator(MapIterator* map_iter) const = 0;
-
-  // Copy the map<...>::iterator from other_iterator to
-  // this_iterator.
-  virtual void CopyIterator(MapIterator* this_iterator,
-                            const MapIterator& other_iterator) const = 0;
-
-  // IncreaseIterator() is called by operator++() of MapIterator only.
-  // It implements the ++ operator of MapIterator.
-  virtual void IncreaseIterator(MapIterator* map_iter) const = 0;
-
-  // Swaps state_ with another MapFieldBase
-  void SwapState(MapFieldBase* other);
-
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(MapFieldBase);
-};
-
-// This class provides common Map Reflection implementations for generated
-// message and dynamic message.
-template <typename Key, typename T>
-class TypeDefinedMapFieldBase : public MapFieldBase {
- public:
-  TypeDefinedMapFieldBase() {}
-
-  // This constructor is for constant initialized global instances.
-  // It uses a linker initialized mutex, so it is not compatible with regular
-  // runtime instances.
-  // NOLINTNEXTLINE(google-explicit-constructor)
-  constexpr TypeDefinedMapFieldBase(ConstantInitialized tag)
-      : MapFieldBase(tag) {}
-  explicit TypeDefinedMapFieldBase(Arena* arena) : MapFieldBase(arena) {}
-  TypeDefinedMapFieldBase(ArenaInitialized, Arena* arena)
-      : TypeDefinedMapFieldBase(arena) {}
-
- protected:
-  ~TypeDefinedMapFieldBase() {}
-  using MapFieldBase::Destruct;
-
- public:
-  void MapBegin(MapIterator* map_iter) const override;
-  void MapEnd(MapIterator* map_iter) const override;
-  bool EqualIterator(const MapIterator& a, const MapIterator& b) const override;
-
-  virtual const Map<Key, T>& GetMap() const = 0;
-  virtual Map<Key, T>* MutableMap() = 0;
-
- protected:
-  typename Map<Key, T>::const_iterator& InternalGetIterator(
-      const MapIterator* map_iter) const;
-
- private:
-  void InitializeIterator(MapIterator* map_iter) const override;
-  void DeleteIterator(MapIterator* map_iter) const override;
-  void CopyIterator(MapIterator* this_iteratorm,
-                    const MapIterator& that_iterator) const override;
-  void IncreaseIterator(MapIterator* map_iter) const override;
-
-  virtual void SetMapIteratorValue(MapIterator* map_iter) const = 0;
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(TypeDefinedMapFieldBase);
-};
-
-// This class provides access to map field using generated api. It is used for
-// internal generated message implementation only. Users should never use this
-// directly.
-template <typename Derived, typename Key, typename T,
-          WireFormatLite::FieldType kKeyFieldType,
-          WireFormatLite::FieldType kValueFieldType>
-class MapField : public TypeDefinedMapFieldBase<Key, T> {
-  // Provide utilities to parse/serialize key/value.  Provide utilities to
-  // manipulate internal stored type.
-  typedef MapTypeHandler<kKeyFieldType, Key> KeyTypeHandler;
-  typedef MapTypeHandler<kValueFieldType, T> ValueTypeHandler;
-
-  // Define message type for internal repeated field.
-  typedef Derived EntryType;
-
-  // Define abbreviation for parent MapFieldLite
-  typedef MapFieldLite<Derived, Key, T, kKeyFieldType, kValueFieldType>
-      MapFieldLiteType;
-
-  // Enum needs to be handled differently from other types because it has
-  // different exposed type in Map's api and repeated field's api. For
-  // details see the comment in the implementation of
-  // SyncMapWithRepeatedFieldNoLock.
-  static constexpr bool kIsValueEnum = ValueTypeHandler::kIsEnum;
-  typedef typename MapIf<kIsValueEnum, T, const T&>::type CastValueType;
-
- public:
-  typedef Map<Key, T> MapType;
-
-  MapField() : impl_() {}
-  virtual ~MapField() {}  // Destruct() must already have been called!
-  void Destruct() {
-    impl_.Destruct();
-    TypeDefinedMapFieldBase<Key, T>::Destruct();
-  }
-
-  // This constructor is for constant initialized global instances.
-  // It uses a linker initialized mutex, so it is not compatible with regular
-  // runtime instances.
-  // NOLINTNEXTLINE(google-explicit-constructor)
-  constexpr MapField(ConstantInitialized tag)
-      : TypeDefinedMapFieldBase<Key, T>(tag), impl_() {}
-  explicit MapField(Arena* arena)
-      : TypeDefinedMapFieldBase<Key, T>(arena), impl_(arena) {}
-  MapField(ArenaInitialized, Arena* arena) : MapField(arena) {}
-
-  // Implement MapFieldBase
-  bool ContainsMapKey(const MapKey& map_key) const override;
-  bool InsertOrLookupMapValue(const MapKey& map_key, MapValueRef* val) override;
-  bool LookupMapValue(const MapKey& map_key,
-                      MapValueConstRef* val) const override;
-  bool LookupMapValue(const MapKey&, MapValueRef*) const = delete;
-  bool DeleteMapValue(const MapKey& map_key) override;
-
-  const Map<Key, T>& GetMap() const override {
-    MapFieldBase::SyncMapWithRepeatedField();
-    return impl_.GetMap();
-  }
-
-  Map<Key, T>* MutableMap() override {
-    MapFieldBase::SyncMapWithRepeatedField();
-    Map<Key, T>* result = impl_.MutableMap();
-    MapFieldBase::SetMapDirty();
-    return result;
-  }
-
-  int size() const override;
-  void Clear() override;
-  void MergeFrom(const MapFieldBase& other) override;
-  void Swap(MapFieldBase* other) override;
-  void UnsafeShallowSwap(MapFieldBase* other) override;
-  void InternalSwap(MapField* other);
-
-  // Used in the implementation of parsing. Caller should take the ownership iff
-  // arena_ is nullptr.
-  EntryType* NewEntry() const { return impl_.NewEntry(); }
-
-  const char* _InternalParse(const char* ptr, ParseContext* ctx) {
-    return impl_._InternalParse(ptr, ctx);
-  }
-  template <typename UnknownType>
-  const char* ParseWithEnumValidation(const char* ptr, ParseContext* ctx,
-                                      bool (*is_valid)(int), uint32_t field_num,
-                                      InternalMetadata* metadata) {
-    return impl_.template ParseWithEnumValidation<UnknownType>(
-        ptr, ctx, is_valid, field_num, metadata);
-  }
-
- private:
-  MapFieldLiteType impl_;
-
-  typedef void InternalArenaConstructable_;
-  typedef void DestructorSkippable_;
-
-  // Implements MapFieldBase
-  void SyncRepeatedFieldWithMapNoLock() const override;
-  void SyncMapWithRepeatedFieldNoLock() const override;
-  size_t SpaceUsedExcludingSelfNoLock() const override;
-
-  void SetMapIteratorValue(MapIterator* map_iter) const override;
-
-  friend class ::PROTOBUF_NAMESPACE_ID::Arena;
-  friend class MapFieldStateTest;  // For testing, it needs raw access to impl_
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(MapField);
-};
-
-template <typename Derived, typename Key, typename T,
-          WireFormatLite::FieldType key_wire_type,
-          WireFormatLite::FieldType value_wire_type>
-bool AllAreInitialized(
-    const MapField<Derived, Key, T, key_wire_type, value_wire_type>& field) {
-  const auto& t = field.GetMap();
-  for (typename Map<Key, T>::const_iterator it = t.begin(); it != t.end();
-       ++it) {
-    if (!it->second.IsInitialized()) return false;
-  }
-  return true;
-}
-
-template <typename T, typename Key, typename Value,
-          WireFormatLite::FieldType kKeyFieldType,
-          WireFormatLite::FieldType kValueFieldType>
-struct MapEntryToMapField<
-    MapEntry<T, Key, Value, kKeyFieldType, kValueFieldType>> {
-  typedef MapField<T, Key, Value, kKeyFieldType, kValueFieldType> MapFieldType;
-};
-
-class PROTOBUF_EXPORT DynamicMapField
-    : public TypeDefinedMapFieldBase<MapKey, MapValueRef> {
- public:
-  explicit DynamicMapField(const Message* default_entry);
-  DynamicMapField(const Message* default_entry, Arena* arena);
-  virtual ~DynamicMapField();
-
-  // Implement MapFieldBase
-  bool ContainsMapKey(const MapKey& map_key) const override;
-  bool InsertOrLookupMapValue(const MapKey& map_key, MapValueRef* val) override;
-  bool LookupMapValue(const MapKey& map_key,
-                      MapValueConstRef* val) const override;
-  bool LookupMapValue(const MapKey&, MapValueRef*) const = delete;
-  bool DeleteMapValue(const MapKey& map_key) override;
-  void MergeFrom(const MapFieldBase& other) override;
-  void Swap(MapFieldBase* other) override;
-  void UnsafeShallowSwap(MapFieldBase* other) override { Swap(other); }
-
-  const Map<MapKey, MapValueRef>& GetMap() const override;
-  Map<MapKey, MapValueRef>* MutableMap() override;
-
-  int size() const override;
-  void Clear() override;
-
- private:
-  Map<MapKey, MapValueRef> map_;
-  const Message* default_entry_;
-
-  void AllocateMapValue(MapValueRef* map_val);
-
-  // Implements MapFieldBase
-  void SyncRepeatedFieldWithMapNoLock() const override;
-  void SyncMapWithRepeatedFieldNoLock() const override;
-  size_t SpaceUsedExcludingSelfNoLock() const override;
-  void SetMapIteratorValue(MapIterator* map_iter) const override;
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(DynamicMapField);
-};
-
-}  // namespace internal
-
-// MapValueConstRef points to a map value. Users can NOT modify
-// the map value.
-class PROTOBUF_EXPORT MapValueConstRef {
- public:
-  MapValueConstRef() : data_(nullptr), type_() {}
-
-  int64_t GetInt64Value() const {
-    TYPE_CHECK(FieldDescriptor::CPPTYPE_INT64,
-               "MapValueConstRef::GetInt64Value");
-    return *reinterpret_cast<int64_t*>(data_);
-  }
-  uint64_t GetUInt64Value() const {
-    TYPE_CHECK(FieldDescriptor::CPPTYPE_UINT64,
-               "MapValueConstRef::GetUInt64Value");
-    return *reinterpret_cast<uint64_t*>(data_);
-  }
-  int32_t GetInt32Value() const {
-    TYPE_CHECK(FieldDescriptor::CPPTYPE_INT32,
-               "MapValueConstRef::GetInt32Value");
-    return *reinterpret_cast<int32_t*>(data_);
-  }
-  uint32_t GetUInt32Value() const {
-    TYPE_CHECK(FieldDescriptor::CPPTYPE_UINT32,
-               "MapValueConstRef::GetUInt32Value");
-    return *reinterpret_cast<uint32_t*>(data_);
-  }
-  bool GetBoolValue() const {
-    TYPE_CHECK(FieldDescriptor::CPPTYPE_BOOL, "MapValueConstRef::GetBoolValue");
-    return *reinterpret_cast<bool*>(data_);
-  }
-  int GetEnumValue() const {
-    TYPE_CHECK(FieldDescriptor::CPPTYPE_ENUM, "MapValueConstRef::GetEnumValue");
-    return *reinterpret_cast<int*>(data_);
-  }
-  const std::string& GetStringValue() const {
-    TYPE_CHECK(FieldDescriptor::CPPTYPE_STRING,
-               "MapValueConstRef::GetStringValue");
-    return *reinterpret_cast<std::string*>(data_);
-  }
-  float GetFloatValue() const {
-    TYPE_CHECK(FieldDescriptor::CPPTYPE_FLOAT,
-               "MapValueConstRef::GetFloatValue");
-    return *reinterpret_cast<float*>(data_);
-  }
-  double GetDoubleValue() const {
-    TYPE_CHECK(FieldDescriptor::CPPTYPE_DOUBLE,
-               "MapValueConstRef::GetDoubleValue");
-    return *reinterpret_cast<double*>(data_);
-  }
-
-  const Message& GetMessageValue() const {
-    TYPE_CHECK(FieldDescriptor::CPPTYPE_MESSAGE,
-               "MapValueConstRef::GetMessageValue");
-    return *reinterpret_cast<Message*>(data_);
-  }
-
- protected:
-  // data_ point to a map value. MapValueConstRef does not
-  // own this value.
-  void* data_;
-  // type_ is 0 or a valid FieldDescriptor::CppType.
-  // Use "CppType()" to indicate zero.
-  FieldDescriptor::CppType type_;
-
-  FieldDescriptor::CppType type() const {
-    if (type_ == FieldDescriptor::CppType() || data_ == nullptr) {
-      GOOGLE_LOG(FATAL)
-          << "Protocol Buffer map usage error:\n"
-          << "MapValueConstRef::type MapValueConstRef is not initialized.";
-    }
-    return type_;
-  }
-
- private:
-  template <typename Derived, typename K, typename V,
-            internal::WireFormatLite::FieldType key_wire_type,
-            internal::WireFormatLite::FieldType value_wire_type>
-  friend class internal::MapField;
-  template <typename K, typename V>
-  friend class internal::TypeDefinedMapFieldBase;
-  friend class ::PROTOBUF_NAMESPACE_ID::MapIterator;
-  friend class Reflection;
-  friend class internal::DynamicMapField;
-
-  void SetType(FieldDescriptor::CppType type) { type_ = type; }
-  void SetValue(const void* val) { data_ = const_cast<void*>(val); }
-  void CopyFrom(const MapValueConstRef& other) {
-    type_ = other.type_;
-    data_ = other.data_;
-  }
-};
-
-// MapValueRef points to a map value. Users are able to modify
-// the map value.
-class PROTOBUF_EXPORT MapValueRef final : public MapValueConstRef {
- public:
-  MapValueRef() {}
-
-  void SetInt64Value(int64_t value) {
-    TYPE_CHECK(FieldDescriptor::CPPTYPE_INT64, "MapValueRef::SetInt64Value");
-    *reinterpret_cast<int64_t*>(data_) = value;
-  }
-  void SetUInt64Value(uint64_t value) {
-    TYPE_CHECK(FieldDescriptor::CPPTYPE_UINT64, "MapValueRef::SetUInt64Value");
-    *reinterpret_cast<uint64_t*>(data_) = value;
-  }
-  void SetInt32Value(int32_t value) {
-    TYPE_CHECK(FieldDescriptor::CPPTYPE_INT32, "MapValueRef::SetInt32Value");
-    *reinterpret_cast<int32_t*>(data_) = value;
-  }
-  void SetUInt32Value(uint32_t value) {
-    TYPE_CHECK(FieldDescriptor::CPPTYPE_UINT32, "MapValueRef::SetUInt32Value");
-    *reinterpret_cast<uint32_t*>(data_) = value;
-  }
-  void SetBoolValue(bool value) {
-    TYPE_CHECK(FieldDescriptor::CPPTYPE_BOOL, "MapValueRef::SetBoolValue");
-    *reinterpret_cast<bool*>(data_) = value;
-  }
-  // TODO(jieluo) - Checks that enum is member.
-  void SetEnumValue(int value) {
-    TYPE_CHECK(FieldDescriptor::CPPTYPE_ENUM, "MapValueRef::SetEnumValue");
-    *reinterpret_cast<int*>(data_) = value;
-  }
-  void SetStringValue(const std::string& value) {
-    TYPE_CHECK(FieldDescriptor::CPPTYPE_STRING, "MapValueRef::SetStringValue");
-    *reinterpret_cast<std::string*>(data_) = value;
-  }
-  void SetFloatValue(float value) {
-    TYPE_CHECK(FieldDescriptor::CPPTYPE_FLOAT, "MapValueRef::SetFloatValue");
-    *reinterpret_cast<float*>(data_) = value;
-  }
-  void SetDoubleValue(double value) {
-    TYPE_CHECK(FieldDescriptor::CPPTYPE_DOUBLE, "MapValueRef::SetDoubleValue");
-    *reinterpret_cast<double*>(data_) = value;
-  }
-
-  Message* MutableMessageValue() {
-    TYPE_CHECK(FieldDescriptor::CPPTYPE_MESSAGE,
-               "MapValueRef::MutableMessageValue");
-    return reinterpret_cast<Message*>(data_);
-  }
-
- private:
-  friend class internal::DynamicMapField;
-
-  // Only used in DynamicMapField
-  void DeleteData() {
-    switch (type_) {
-#define HANDLE_TYPE(CPPTYPE, TYPE)           \
-  case FieldDescriptor::CPPTYPE_##CPPTYPE: { \
-    delete reinterpret_cast<TYPE*>(data_);   \
-    break;                                   \
-  }
-      HANDLE_TYPE(INT32, int32_t);
-      HANDLE_TYPE(INT64, int64_t);
-      HANDLE_TYPE(UINT32, uint32_t);
-      HANDLE_TYPE(UINT64, uint64_t);
-      HANDLE_TYPE(DOUBLE, double);
-      HANDLE_TYPE(FLOAT, float);
-      HANDLE_TYPE(BOOL, bool);
-      HANDLE_TYPE(STRING, std::string);
-      HANDLE_TYPE(ENUM, int32_t);
-      HANDLE_TYPE(MESSAGE, Message);
-#undef HANDLE_TYPE
-    }
-  }
-};
-
-#undef TYPE_CHECK
-
-class PROTOBUF_EXPORT MapIterator {
- public:
-  MapIterator(Message* message, const FieldDescriptor* field) {
-    const Reflection* reflection = message->GetReflection();
-    map_ = reflection->MutableMapData(message, field);
-    key_.SetType(field->message_type()->map_key()->cpp_type());
-    value_.SetType(field->message_type()->map_value()->cpp_type());
-    map_->InitializeIterator(this);
-  }
-  MapIterator(const MapIterator& other) {
-    map_ = other.map_;
-    map_->InitializeIterator(this);
-    map_->CopyIterator(this, other);
-  }
-  ~MapIterator() { map_->DeleteIterator(this); }
-  MapIterator& operator=(const MapIterator& other) {
-    map_ = other.map_;
-    map_->CopyIterator(this, other);
-    return *this;
-  }
-  friend bool operator==(const MapIterator& a, const MapIterator& b) {
-    return a.map_->EqualIterator(a, b);
-  }
-  friend bool operator!=(const MapIterator& a, const MapIterator& b) {
-    return !a.map_->EqualIterator(a, b);
-  }
-  MapIterator& operator++() {
-    map_->IncreaseIterator(this);
-    return *this;
-  }
-  MapIterator operator++(int) {
-    // iter_ is copied from Map<...>::iterator, no need to
-    // copy from its self again. Use the same implementation
-    // with operator++()
-    map_->IncreaseIterator(this);
-    return *this;
-  }
-  const MapKey& GetKey() { return key_; }
-  const MapValueRef& GetValueRef() { return value_; }
-  MapValueRef* MutableValueRef() {
-    map_->SetMapDirty();
-    return &value_;
-  }
-
- private:
-  template <typename Key, typename T>
-  friend class internal::TypeDefinedMapFieldBase;
-  friend class internal::DynamicMapField;
-  template <typename Derived, typename Key, typename T,
-            internal::WireFormatLite::FieldType kKeyFieldType,
-            internal::WireFormatLite::FieldType kValueFieldType>
-  friend class internal::MapField;
-
-  // reinterpret_cast from heap-allocated Map<...>::iterator*. MapIterator owns
-  // the iterator. It is allocated by MapField<...>::InitializeIterator() called
-  // in constructor and deleted by MapField<...>::DeleteIterator() called in
-  // destructor.
-  void* iter_;
-  // Point to a MapField to call helper methods implemented in MapField.
-  // MapIterator does not own this object.
-  internal::MapFieldBase* map_;
-  MapKey key_;
-  MapValueRef value_;
-};
-
-}  // namespace protobuf
-}  // namespace google
-
-#ifdef _MSC_VER
-#pragma warning(pop)  // restore warning C4265
-#endif                // _MSC_VER
-
-#include <google/protobuf/port_undef.inc>
-
-#endif  // GOOGLE_PROTOBUF_MAP_FIELD_H__
diff --git a/libs/protobuf/src/google/protobuf/map_field_inl.h b/libs/protobuf/src/google/protobuf/map_field_inl.h
deleted file mode 100644
index 7c4c232..0000000
--- a/libs/protobuf/src/google/protobuf/map_field_inl.h
+++ /dev/null
@@ -1,375 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef GOOGLE_PROTOBUF_MAP_FIELD_INL_H__
-#define GOOGLE_PROTOBUF_MAP_FIELD_INL_H__
-
-#include <memory>
-
-#include <google/protobuf/stubs/casts.h>
-#include <google/protobuf/map.h>
-#include <google/protobuf/map_field.h>
-#include <google/protobuf/map_type_handler.h>
-
-#ifdef SWIG
-#error "You cannot SWIG proto headers"
-#endif
-
-namespace google {
-namespace protobuf {
-namespace internal {
-// UnwrapMapKey template
-template <typename T>
-T UnwrapMapKey(const MapKey& map_key);
-template <>
-inline int32_t UnwrapMapKey<int32_t>(const MapKey& map_key) {
-  return map_key.GetInt32Value();
-}
-template <>
-inline uint32_t UnwrapMapKey<uint32_t>(const MapKey& map_key) {
-  return map_key.GetUInt32Value();
-}
-template <>
-inline int64_t UnwrapMapKey<int64_t>(const MapKey& map_key) {
-  return map_key.GetInt64Value();
-}
-template <>
-inline uint64_t UnwrapMapKey<uint64_t>(const MapKey& map_key) {
-  return map_key.GetUInt64Value();
-}
-template <>
-inline bool UnwrapMapKey<bool>(const MapKey& map_key) {
-  return map_key.GetBoolValue();
-}
-template <>
-inline std::string UnwrapMapKey<std::string>(const MapKey& map_key) {
-  return map_key.GetStringValue();
-}
-
-// SetMapKey template
-template <typename T>
-inline void SetMapKey(MapKey* map_key, const T& value);
-template <>
-inline void SetMapKey<int32_t>(MapKey* map_key, const int32_t& value) {
-  map_key->SetInt32Value(value);
-}
-template <>
-inline void SetMapKey<uint32_t>(MapKey* map_key, const uint32_t& value) {
-  map_key->SetUInt32Value(value);
-}
-template <>
-inline void SetMapKey<int64_t>(MapKey* map_key, const int64_t& value) {
-  map_key->SetInt64Value(value);
-}
-template <>
-inline void SetMapKey<uint64_t>(MapKey* map_key, const uint64_t& value) {
-  map_key->SetUInt64Value(value);
-}
-template <>
-inline void SetMapKey<bool>(MapKey* map_key, const bool& value) {
-  map_key->SetBoolValue(value);
-}
-template <>
-inline void SetMapKey<std::string>(MapKey* map_key, const std::string& value) {
-  map_key->SetStringValue(value);
-}
-
-// ------------------------TypeDefinedMapFieldBase---------------
-template <typename Key, typename T>
-typename Map<Key, T>::const_iterator&
-TypeDefinedMapFieldBase<Key, T>::InternalGetIterator(
-    const MapIterator* map_iter) const {
-  return *reinterpret_cast<typename Map<Key, T>::const_iterator*>(
-      map_iter->iter_);
-}
-
-template <typename Key, typename T>
-void TypeDefinedMapFieldBase<Key, T>::MapBegin(MapIterator* map_iter) const {
-  InternalGetIterator(map_iter) = GetMap().begin();
-  SetMapIteratorValue(map_iter);
-}
-
-template <typename Key, typename T>
-void TypeDefinedMapFieldBase<Key, T>::MapEnd(MapIterator* map_iter) const {
-  InternalGetIterator(map_iter) = GetMap().end();
-}
-
-template <typename Key, typename T>
-bool TypeDefinedMapFieldBase<Key, T>::EqualIterator(
-    const MapIterator& a, const MapIterator& b) const {
-  return InternalGetIterator(&a) == InternalGetIterator(&b);
-}
-
-template <typename Key, typename T>
-void TypeDefinedMapFieldBase<Key, T>::IncreaseIterator(
-    MapIterator* map_iter) const {
-  ++InternalGetIterator(map_iter);
-  SetMapIteratorValue(map_iter);
-}
-
-template <typename Key, typename T>
-void TypeDefinedMapFieldBase<Key, T>::InitializeIterator(
-    MapIterator* map_iter) const {
-  map_iter->iter_ = new typename Map<Key, T>::const_iterator;
-  GOOGLE_CHECK(map_iter->iter_ != nullptr);
-}
-
-template <typename Key, typename T>
-void TypeDefinedMapFieldBase<Key, T>::DeleteIterator(
-    MapIterator* map_iter) const {
-  delete reinterpret_cast<typename Map<Key, T>::const_iterator*>(
-      map_iter->iter_);
-}
-
-template <typename Key, typename T>
-void TypeDefinedMapFieldBase<Key, T>::CopyIterator(
-    MapIterator* this_iter, const MapIterator& that_iter) const {
-  InternalGetIterator(this_iter) = InternalGetIterator(&that_iter);
-  this_iter->key_.SetType(that_iter.key_.type());
-  // MapValueRef::type() fails when containing data is null. However, if
-  // this_iter points to MapEnd, data can be null.
-  this_iter->value_.SetType(
-      static_cast<FieldDescriptor::CppType>(that_iter.value_.type_));
-  SetMapIteratorValue(this_iter);
-}
-
-// ----------------------------------------------------------------------
-
-template <typename Derived, typename Key, typename T,
-          WireFormatLite::FieldType kKeyFieldType,
-          WireFormatLite::FieldType kValueFieldType>
-int MapField<Derived, Key, T, kKeyFieldType, kValueFieldType>::size() const {
-  MapFieldBase::SyncMapWithRepeatedField();
-  return static_cast<int>(impl_.GetMap().size());
-}
-
-template <typename Derived, typename Key, typename T,
-          WireFormatLite::FieldType kKeyFieldType,
-          WireFormatLite::FieldType kValueFieldType>
-void MapField<Derived, Key, T, kKeyFieldType, kValueFieldType>::Clear() {
-  if (this->MapFieldBase::repeated_field_ != nullptr) {
-    RepeatedPtrField<EntryType>* repeated_field =
-        reinterpret_cast<RepeatedPtrField<EntryType>*>(
-            this->MapFieldBase::repeated_field_);
-    repeated_field->Clear();
-  }
-
-  impl_.MutableMap()->clear();
-  // Data in map and repeated field are both empty, but we can't set status
-  // CLEAN. Because clear is a generated API, we cannot invalidate previous
-  // reference to map.
-  MapFieldBase::SetMapDirty();
-}
-
-template <typename Derived, typename Key, typename T,
-          WireFormatLite::FieldType kKeyFieldType,
-          WireFormatLite::FieldType kValueFieldType>
-void MapField<Derived, Key, T, kKeyFieldType,
-              kValueFieldType>::SetMapIteratorValue(MapIterator* map_iter)
-    const {
-  const Map<Key, T>& map = impl_.GetMap();
-  typename Map<Key, T>::const_iterator iter =
-      TypeDefinedMapFieldBase<Key, T>::InternalGetIterator(map_iter);
-  if (iter == map.end()) return;
-  SetMapKey(&map_iter->key_, iter->first);
-  map_iter->value_.SetValue(&iter->second);
-}
-
-template <typename Derived, typename Key, typename T,
-          WireFormatLite::FieldType kKeyFieldType,
-          WireFormatLite::FieldType kValueFieldType>
-bool MapField<Derived, Key, T, kKeyFieldType, kValueFieldType>::ContainsMapKey(
-    const MapKey& map_key) const {
-  const Map<Key, T>& map = impl_.GetMap();
-  const Key& key = UnwrapMapKey<Key>(map_key);
-  typename Map<Key, T>::const_iterator iter = map.find(key);
-  return iter != map.end();
-}
-
-template <typename Derived, typename Key, typename T,
-          WireFormatLite::FieldType kKeyFieldType,
-          WireFormatLite::FieldType kValueFieldType>
-bool MapField<Derived, Key, T, kKeyFieldType,
-              kValueFieldType>::InsertOrLookupMapValue(const MapKey& map_key,
-                                                       MapValueRef* val) {
-  // Always use mutable map because users may change the map value by
-  // MapValueRef.
-  Map<Key, T>* map = MutableMap();
-  const Key& key = UnwrapMapKey<Key>(map_key);
-  typename Map<Key, T>::iterator iter = map->find(key);
-  if (map->end() == iter) {
-    val->SetValue(&((*map)[key]));
-    return true;
-  }
-  // Key is already in the map. Make sure (*map)[key] is not called.
-  // [] may reorder the map and iterators.
-  val->SetValue(&(iter->second));
-  return false;
-}
-
-template <typename Derived, typename Key, typename T,
-          WireFormatLite::FieldType kKeyFieldType,
-          WireFormatLite::FieldType kValueFieldType>
-bool MapField<Derived, Key, T, kKeyFieldType, kValueFieldType>::LookupMapValue(
-    const MapKey& map_key, MapValueConstRef* val) const {
-  const Map<Key, T>& map = GetMap();
-  const Key& key = UnwrapMapKey<Key>(map_key);
-  typename Map<Key, T>::const_iterator iter = map.find(key);
-  if (map.end() == iter) {
-    return false;
-  }
-  // Key is already in the map. Make sure (*map)[key] is not called.
-  // [] may reorder the map and iterators.
-  val->SetValue(&(iter->second));
-  return true;
-}
-
-template <typename Derived, typename Key, typename T,
-          WireFormatLite::FieldType kKeyFieldType,
-          WireFormatLite::FieldType kValueFieldType>
-bool MapField<Derived, Key, T, kKeyFieldType, kValueFieldType>::DeleteMapValue(
-    const MapKey& map_key) {
-  const Key& key = UnwrapMapKey<Key>(map_key);
-  return MutableMap()->erase(key);
-}
-
-template <typename Derived, typename Key, typename T,
-          WireFormatLite::FieldType kKeyFieldType,
-          WireFormatLite::FieldType kValueFieldType>
-void MapField<Derived, Key, T, kKeyFieldType, kValueFieldType>::MergeFrom(
-    const MapFieldBase& other) {
-  MapFieldBase::SyncMapWithRepeatedField();
-  const MapField& other_field = static_cast<const MapField&>(other);
-  other_field.SyncMapWithRepeatedField();
-  impl_.MergeFrom(other_field.impl_);
-  MapFieldBase::SetMapDirty();
-}
-
-template <typename Derived, typename Key, typename T,
-          WireFormatLite::FieldType kKeyFieldType,
-          WireFormatLite::FieldType kValueFieldType>
-void MapField<Derived, Key, T, kKeyFieldType, kValueFieldType>::Swap(
-    MapFieldBase* other) {
-  MapFieldBase::Swap(other);
-  MapField* other_field = down_cast<MapField*>(other);
-  impl_.Swap(&other_field->impl_);
-}
-
-template <typename Derived, typename Key, typename T,
-          WireFormatLite::FieldType kKeyFieldType,
-          WireFormatLite::FieldType kValueFieldType>
-void MapField<Derived, Key, T, kKeyFieldType,
-              kValueFieldType>::UnsafeShallowSwap(MapFieldBase* other) {
-  InternalSwap(down_cast<MapField*>(other));
-}
-
-template <typename Derived, typename Key, typename T,
-          WireFormatLite::FieldType kKeyFieldType,
-          WireFormatLite::FieldType kValueFieldType>
-void MapField<Derived, Key, T, kKeyFieldType, kValueFieldType>::InternalSwap(
-    MapField* other) {
-  MapFieldBase::InternalSwap(other);
-  impl_.InternalSwap(&other->impl_);
-}
-
-template <typename Derived, typename Key, typename T,
-          WireFormatLite::FieldType kKeyFieldType,
-          WireFormatLite::FieldType kValueFieldType>
-void MapField<Derived, Key, T, kKeyFieldType,
-              kValueFieldType>::SyncRepeatedFieldWithMapNoLock() const {
-  if (this->MapFieldBase::repeated_field_ == nullptr) {
-    this->MapFieldBase::repeated_field_ =
-        Arena::CreateMessage<RepeatedPtrField<Message> >(
-            this->MapFieldBase::arena_);
-  }
-  const Map<Key, T>& map = impl_.GetMap();
-  RepeatedPtrField<EntryType>* repeated_field =
-      reinterpret_cast<RepeatedPtrField<EntryType>*>(
-          this->MapFieldBase::repeated_field_);
-
-  repeated_field->Clear();
-
-  // The only way we can get at this point is through reflection and the
-  // only way we can get the reflection object is by having called GetReflection
-  // on the encompassing field. So that type must have existed and hence we
-  // know that this MapEntry default_type has also already been constructed.
-  // So it's safe to just call internal_default_instance().
-  const Message* default_entry = Derived::internal_default_instance();
-  for (typename Map<Key, T>::const_iterator it = map.begin(); it != map.end();
-       ++it) {
-    EntryType* new_entry =
-        down_cast<EntryType*>(default_entry->New(this->MapFieldBase::arena_));
-    repeated_field->AddAllocated(new_entry);
-    (*new_entry->mutable_key()) = it->first;
-    (*new_entry->mutable_value()) = it->second;
-  }
-}
-
-template <typename Derived, typename Key, typename T,
-          WireFormatLite::FieldType kKeyFieldType,
-          WireFormatLite::FieldType kValueFieldType>
-void MapField<Derived, Key, T, kKeyFieldType,
-              kValueFieldType>::SyncMapWithRepeatedFieldNoLock() const {
-  Map<Key, T>* map = const_cast<MapField*>(this)->impl_.MutableMap();
-  RepeatedPtrField<EntryType>* repeated_field =
-      reinterpret_cast<RepeatedPtrField<EntryType>*>(
-          this->MapFieldBase::repeated_field_);
-  GOOGLE_CHECK(this->MapFieldBase::repeated_field_ != nullptr);
-  map->clear();
-  for (typename RepeatedPtrField<EntryType>::iterator it =
-           repeated_field->begin();
-       it != repeated_field->end(); ++it) {
-    // Cast is needed because Map's api and internal storage is different when
-    // value is enum. For enum, we cannot cast an int to enum. Thus, we have to
-    // copy value. For other types, they have same exposed api type and internal
-    // stored type. We should not introduce value copy for them. We achieve this
-    // by casting to value for enum while casting to reference for other types.
-    (*map)[it->key()] = static_cast<CastValueType>(it->value());
-  }
-}
-
-template <typename Derived, typename Key, typename T,
-          WireFormatLite::FieldType kKeyFieldType,
-          WireFormatLite::FieldType kValueFieldType>
-size_t MapField<Derived, Key, T, kKeyFieldType,
-                kValueFieldType>::SpaceUsedExcludingSelfNoLock() const {
-  size_t size = 0;
-  if (this->MapFieldBase::repeated_field_ != nullptr) {
-    size += this->MapFieldBase::repeated_field_->SpaceUsedExcludingSelfLong();
-  }
-  size += impl_.GetMap().SpaceUsedExcludingSelfLong();
-
-  return size;
-}
-}  // namespace internal
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // GOOGLE_PROTOBUF_MAP_FIELD_INL_H__
diff --git a/libs/protobuf/src/google/protobuf/map_field_lite.h b/libs/protobuf/src/google/protobuf/map_field_lite.h
deleted file mode 100644
index 53bf7a0..0000000
--- a/libs/protobuf/src/google/protobuf/map_field_lite.h
+++ /dev/null
@@ -1,209 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef GOOGLE_PROTOBUF_MAP_FIELD_LITE_H__
-#define GOOGLE_PROTOBUF_MAP_FIELD_LITE_H__
-
-#include <type_traits>
-
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/port.h>
-#include <google/protobuf/map.h>
-#include <google/protobuf/map_entry_lite.h>
-#include <google/protobuf/parse_context.h>
-#include <google/protobuf/wire_format_lite.h>
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-#ifdef SWIG
-#error "You cannot SWIG proto headers"
-#endif
-
-namespace google {
-namespace protobuf {
-namespace internal {
-
-#ifndef NDEBUG
-void MapFieldLiteNotDestructed(void* map_field_lite);
-#endif
-
-// This class provides access to map field using generated api. It is used for
-// internal generated message implementation only. Users should never use this
-// directly.
-template <typename Derived, typename Key, typename T,
-          WireFormatLite::FieldType key_wire_type,
-          WireFormatLite::FieldType value_wire_type>
-class MapFieldLite {
-  // Define message type for internal repeated field.
-  typedef Derived EntryType;
-
- public:
-  typedef Map<Key, T> MapType;
-
-  constexpr MapFieldLite() : map_() {}
-  explicit MapFieldLite(Arena* arena) : map_(arena) {}
-  MapFieldLite(ArenaInitialized, Arena* arena) : MapFieldLite(arena) {}
-
-#ifdef NDEBUG
-  void Destruct() { map_.~Map(); }
-  ~MapFieldLite() {}
-#else
-  void Destruct() {
-    // We want to destruct the map in such a way that we can verify
-    // that we've done that, but also be sure that we've deallocated
-    // everything (as opposed to leaving an allocation behind with no
-    // data in it, as would happen if a vector was resize'd to zero.
-    // Map::Swap with an empty map accomplishes that.
-    decltype(map_) swapped_map(map_.arena());
-    map_.InternalSwap(swapped_map);
-  }
-  ~MapFieldLite() {
-    if (map_.arena() == nullptr && !map_.empty()) {
-      MapFieldLiteNotDestructed(this);
-    }
-  }
-#endif
-  // Accessors
-  const Map<Key, T>& GetMap() const { return map_; }
-  Map<Key, T>* MutableMap() { return &map_; }
-
-  // Convenient methods for generated message implementation.
-  int size() const { return static_cast<int>(map_.size()); }
-  void Clear() { return map_.clear(); }
-  void MergeFrom(const MapFieldLite& other) {
-    for (typename Map<Key, T>::const_iterator it = other.map_.begin();
-         it != other.map_.end(); ++it) {
-      map_[it->first] = it->second;
-    }
-  }
-  void Swap(MapFieldLite* other) { map_.swap(other->map_); }
-  void InternalSwap(MapFieldLite* other) { map_.InternalSwap(other->map_); }
-
-  // Used in the implementation of parsing. Caller should take the ownership iff
-  // arena_ is nullptr.
-  EntryType* NewEntry() const {
-    return Arena::CreateMessage<EntryType>(map_.arena());
-  }
-
-  const char* _InternalParse(const char* ptr, ParseContext* ctx) {
-    typename Derived::template Parser<MapFieldLite, Map<Key, T>> parser(this);
-    return parser._InternalParse(ptr, ctx);
-  }
-
-  template <typename UnknownType>
-  const char* ParseWithEnumValidation(const char* ptr, ParseContext* ctx,
-                                      bool (*is_valid)(int), uint32_t field_num,
-                                      InternalMetadata* metadata) {
-    typename Derived::template Parser<MapFieldLite, Map<Key, T>> parser(this);
-    return parser.template ParseWithEnumValidation<UnknownType>(
-        ptr, ctx, is_valid, field_num, metadata);
-  }
-
- private:
-  typedef void DestructorSkippable_;
-
-  // map_ is inside an anonymous union so we can explicitly control its
-  // destruction
-  union {
-    Map<Key, T> map_;
-  };
-
-  friend class ::PROTOBUF_NAMESPACE_ID::Arena;
-};
-
-template <typename UnknownType, typename T>
-struct EnumParseWrapper {
-  const char* _InternalParse(const char* ptr, ParseContext* ctx) {
-    return map_field->template ParseWithEnumValidation<UnknownType>(
-        ptr, ctx, is_valid, field_num, metadata);
-  }
-  T* map_field;
-  bool (*is_valid)(int);
-  uint32_t field_num;
-  InternalMetadata* metadata;
-};
-
-// Helper function because the typenames of maps are horrendous to print. This
-// leverages compiler type deduction, to keep all type data out of the
-// generated code
-template <typename UnknownType, typename T>
-EnumParseWrapper<UnknownType, T> InitEnumParseWrapper(
-    T* map_field, bool (*is_valid)(int), uint32_t field_num,
-    InternalMetadata* metadata) {
-  return EnumParseWrapper<UnknownType, T>{map_field, is_valid, field_num,
-                                          metadata};
-}
-
-// True if IsInitialized() is true for value field in all elements of t. T is
-// expected to be message.  It's useful to have this helper here to keep the
-// protobuf compiler from ever having to emit loops in IsInitialized() methods.
-// We want the C++ compiler to inline this or not as it sees fit.
-template <typename Derived, typename Key, typename T,
-          WireFormatLite::FieldType key_wire_type,
-          WireFormatLite::FieldType value_wire_type>
-bool AllAreInitialized(const MapFieldLite<Derived, Key, T, key_wire_type,
-                                          value_wire_type>& field) {
-  const auto& t = field.GetMap();
-  for (typename Map<Key, T>::const_iterator it = t.begin(); it != t.end();
-       ++it) {
-    if (!it->second.IsInitialized()) return false;
-  }
-  return true;
-}
-
-template <typename MEntry>
-struct MapEntryToMapField : MapEntryToMapField<typename MEntry::SuperType> {};
-
-template <typename T, typename Key, typename Value,
-          WireFormatLite::FieldType kKeyFieldType,
-          WireFormatLite::FieldType kValueFieldType>
-struct MapEntryToMapField<
-    MapEntryLite<T, Key, Value, kKeyFieldType, kValueFieldType>> {
-  typedef MapFieldLite<
-      MapEntryLite<T, Key, Value, kKeyFieldType, kValueFieldType>, Key, Value,
-      kKeyFieldType, kValueFieldType>
-      MapFieldType;
-};
-
-#ifndef NDEBUG
-inline PROTOBUF_NOINLINE void MapFieldLiteNotDestructed(void* map_field_lite) {
-  bool proper_destruct = false;
-  GOOGLE_CHECK(proper_destruct) << map_field_lite;
-}
-#endif
-
-}  // namespace internal
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
-
-#endif  // GOOGLE_PROTOBUF_MAP_FIELD_LITE_H__
diff --git a/libs/protobuf/src/google/protobuf/map_field_test.cc b/libs/protobuf/src/google/protobuf/map_field_test.cc
deleted file mode 100644
index 1659c95..0000000
--- a/libs/protobuf/src/google/protobuf/map_field_test.cc
+++ /dev/null
@@ -1,538 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <map>
-#include <memory>
-#include <unordered_map>
-
-#include <google/protobuf/stubs/logging.h>
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/map_unittest.pb.h>
-#include <google/protobuf/unittest.pb.h>
-#include <google/protobuf/arena.h>
-#include <google/protobuf/map.h>
-#include <google/protobuf/map_field_inl.h>
-#include <google/protobuf/message.h>
-#include <google/protobuf/repeated_field.h>
-#include <gtest/gtest.h>
-#include <google/protobuf/arena_test_util.h>
-#include <google/protobuf/map_test_util.h>
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-
-namespace internal {
-
-using unittest::TestAllTypes;
-
-// ArenaHolder from map_test_util.h works fine for fields other than map
-// fields.  For map fields, the Destruct() call must be made before the
-// actual destructor is called.
-template <typename MapType>
-struct ArenaDestructor : ArenaHolder<MapType> {
-  using ArenaHolder<MapType>::ArenaHolder;
-  ~ArenaDestructor() { ArenaHolder<MapType>::get()->Destruct(); }
-};
-
-class MapFieldBaseStub : public MapFieldBase {
- public:
-  typedef void InternalArenaConstructable_;
-  typedef void DestructorSkippable_;
-  MapFieldBaseStub() {}
-  virtual ~MapFieldBaseStub() { MapFieldBase::Destruct(); }
-  explicit MapFieldBaseStub(Arena* arena) : MapFieldBase(arena) {}
-  // Get underlined repeated field without synchronizing map.
-  RepeatedPtrField<Message>* InternalRepeatedField() { return repeated_field_; }
-  bool IsMapClean() {
-    return state_.load(std::memory_order_relaxed) != STATE_MODIFIED_MAP;
-  }
-  bool IsRepeatedClean() {
-    return state_.load(std::memory_order_relaxed) != STATE_MODIFIED_REPEATED;
-  }
-  void SetMapDirty() {
-    state_.store(STATE_MODIFIED_MAP, std::memory_order_relaxed);
-  }
-  void SetRepeatedDirty() {
-    state_.store(STATE_MODIFIED_REPEATED, std::memory_order_relaxed);
-  }
-  bool ContainsMapKey(const MapKey& map_key) const override { return false; }
-  bool InsertOrLookupMapValue(const MapKey& map_key,
-                              MapValueRef* val) override {
-    return false;
-  }
-  bool LookupMapValue(const MapKey& map_key,
-                      MapValueConstRef* val) const override {
-    return false;
-  }
-  bool DeleteMapValue(const MapKey& map_key) override { return false; }
-  bool EqualIterator(const MapIterator& a,
-                     const MapIterator& b) const override {
-    return false;
-  }
-  int size() const override { return 0; }
-  void Clear() override {}
-  void MapBegin(MapIterator* map_iter) const override {}
-  void MapEnd(MapIterator* map_iter) const override {}
-  void MergeFrom(const MapFieldBase& other) override {}
-  void Swap(MapFieldBase* other) override {}
-  void InitializeIterator(MapIterator* map_iter) const override {}
-  void DeleteIterator(MapIterator* map_iter) const override {}
-  void CopyIterator(MapIterator* this_iterator,
-                    const MapIterator& other_iterator) const override {}
-  void IncreaseIterator(MapIterator* map_iter) const override {}
-
-  Arena* GetArenaForInternalRepeatedField() {
-    auto* repeated_field = MutableRepeatedField();
-    return repeated_field->GetArena();
-  }
-};
-
-class MapFieldBasePrimitiveTest : public testing::TestWithParam<bool> {
- protected:
-  typedef unittest::TestMap_MapInt32Int32Entry_DoNotUse EntryType;
-  typedef MapField<EntryType, int32_t, int32_t, WireFormatLite::TYPE_INT32,
-                   WireFormatLite::TYPE_INT32>
-      MapFieldType;
-
-  MapFieldBasePrimitiveTest()
-      : arena_(GetParam() ? new Arena() : nullptr),
-        map_field_(arena_.get()),
-        map_field_base_(map_field_.get()) {
-    // Get descriptors
-    map_descriptor_ = unittest::TestMap::descriptor()
-                          ->FindFieldByName("map_int32_int32")
-                          ->message_type();
-    key_descriptor_ = map_descriptor_->map_key();
-    value_descriptor_ = map_descriptor_->map_value();
-
-    // Build map field
-    map_field_base_ = map_field_.get();
-    map_ = map_field_->MutableMap();
-    initial_value_map_[0] = 100;
-    initial_value_map_[1] = 101;
-    map_->insert(initial_value_map_.begin(), initial_value_map_.end());
-    EXPECT_EQ(2, map_->size());
-  }
-
-  std::unique_ptr<Arena> arena_;
-  ArenaDestructor<MapFieldType> map_field_;
-  MapFieldBase* map_field_base_;
-  Map<int32_t, int32_t>* map_;
-  const Descriptor* map_descriptor_;
-  const FieldDescriptor* key_descriptor_;
-  const FieldDescriptor* value_descriptor_;
-  std::map<int32_t, int32_t>
-      initial_value_map_;  // copy of initial values inserted
-};
-
-INSTANTIATE_TEST_SUITE_P(MapFieldBasePrimitiveTestInstance,
-                         MapFieldBasePrimitiveTest,
-                         testing::Values(true, false));
-
-TEST_P(MapFieldBasePrimitiveTest, SpaceUsedExcludingSelf) {
-  EXPECT_LT(0, map_field_base_->SpaceUsedExcludingSelf());
-}
-
-TEST_P(MapFieldBasePrimitiveTest, GetRepeatedField) {
-  const RepeatedPtrField<Message>& repeated =
-      reinterpret_cast<const RepeatedPtrField<Message>&>(
-          map_field_base_->GetRepeatedField());
-  EXPECT_EQ(2, repeated.size());
-  for (int i = 0; i < repeated.size(); i++) {
-    const Message& message = repeated.Get(i);
-    int key = message.GetReflection()->GetInt32(message, key_descriptor_);
-    int value = message.GetReflection()->GetInt32(message, value_descriptor_);
-    EXPECT_EQ(value, initial_value_map_[key]);
-  }
-}
-
-TEST_P(MapFieldBasePrimitiveTest, MutableRepeatedField) {
-  RepeatedPtrField<Message>* repeated =
-      reinterpret_cast<RepeatedPtrField<Message>*>(
-          map_field_base_->MutableRepeatedField());
-  EXPECT_EQ(2, repeated->size());
-  for (int i = 0; i < repeated->size(); i++) {
-    const Message& message = repeated->Get(i);
-    int key = message.GetReflection()->GetInt32(message, key_descriptor_);
-    int value = message.GetReflection()->GetInt32(message, value_descriptor_);
-    EXPECT_EQ(value, initial_value_map_[key]);
-  }
-}
-
-TEST_P(MapFieldBasePrimitiveTest, Arena) {
-  // Allocate a large initial block to avoid mallocs during hooked test.
-  std::vector<char> arena_block(128 * 1024);
-  ArenaOptions options;
-  options.initial_block = &arena_block[0];
-  options.initial_block_size = arena_block.size();
-  Arena arena(options);
-
-  {
-    // TODO(liujisi): Re-write the test to ensure the memory for the map and
-    // repeated fields are allocated from arenas.
-    // NoHeapChecker no_heap;
-
-    MapFieldType* map_field = Arena::CreateMessage<MapFieldType>(&arena);
-
-    // Set content in map
-    (*map_field->MutableMap())[100] = 101;
-
-    // Trigger conversion to repeated field.
-    map_field->GetRepeatedField();
-  }
-
-  {
-    // TODO(liujisi): Re-write the test to ensure the memory for the map and
-    // repeated fields are allocated from arenas.
-    // NoHeapChecker no_heap;
-
-    MapFieldBaseStub* map_field =
-        Arena::CreateMessage<MapFieldBaseStub>(&arena);
-
-    // Trigger conversion to repeated field.
-    EXPECT_TRUE(map_field->MutableRepeatedField() != nullptr);
-
-    EXPECT_EQ(map_field->GetArenaForInternalRepeatedField(), &arena);
-  }
-}
-
-TEST_P(MapFieldBasePrimitiveTest, EnforceNoArena) {
-  std::unique_ptr<MapFieldBaseStub> map_field(
-      Arena::CreateMessage<MapFieldBaseStub>(nullptr));
-  EXPECT_EQ(map_field->GetArenaForInternalRepeatedField(), nullptr);
-}
-
-namespace {
-enum State { CLEAN, MAP_DIRTY, REPEATED_DIRTY };
-}  // anonymous namespace
-
-class MapFieldStateTest
-    : public testing::TestWithParam<std::tuple<State, bool>> {
- protected:
-  typedef unittest::TestMap_MapInt32Int32Entry_DoNotUse EntryType;
-  typedef MapField<EntryType, int32_t, int32_t, WireFormatLite::TYPE_INT32,
-                   WireFormatLite::TYPE_INT32>
-      MapFieldType;
-  MapFieldStateTest()
-      : arena_(std::get<1>(GetParam()) ? new Arena() : nullptr),
-        map_field_(arena_.get()),
-        map_field_base_(map_field_.get()),
-        state_(std::get<0>(GetParam())) {
-    // Build map field
-    Expect(map_field_.get(), MAP_DIRTY, 0, 0, true);
-    switch (state_) {
-      case CLEAN:
-        AddOneStillClean(map_field_.get());
-        break;
-      case MAP_DIRTY:
-        MakeMapDirty(map_field_.get());
-        break;
-      case REPEATED_DIRTY:
-        MakeRepeatedDirty(map_field_.get());
-        break;
-      default:
-        break;
-    }
-  }
-
-  void AddOneStillClean(MapFieldType* map_field) {
-    MapFieldBase* map_field_base = map_field;
-    Map<int32_t, int32_t>* map = map_field->MutableMap();
-    (*map)[0] = 0;
-    map_field_base->GetRepeatedField();
-    Expect(map_field, CLEAN, 1, 1, false);
-  }
-
-  void MakeMapDirty(MapFieldType* map_field) {
-    Map<int32_t, int32_t>* map = map_field->MutableMap();
-    (*map)[0] = 0;
-    Expect(map_field, MAP_DIRTY, 1, 0, true);
-  }
-
-  void MakeRepeatedDirty(MapFieldType* map_field) {
-    MakeMapDirty(map_field);
-    MapFieldBase* map_field_base = map_field;
-    map_field_base->MutableRepeatedField();
-    // We use MutableMap on impl_ because we don't want to disturb the syncing
-    Map<int32_t, int32_t>* map = map_field->impl_.MutableMap();
-    map->clear();
-
-    Expect(map_field, REPEATED_DIRTY, 0, 1, false);
-  }
-
-  void Expect(MapFieldType* map_field, State state, int map_size,
-              int repeated_size, bool is_repeated_null) {
-    MapFieldBase* map_field_base = map_field;
-    MapFieldBaseStub* stub =
-        reinterpret_cast<MapFieldBaseStub*>(map_field_base);
-
-    // We use MutableMap on impl_ because we don't want to disturb the syncing
-    Map<int32_t, int32_t>* map = map_field->impl_.MutableMap();
-    RepeatedPtrField<Message>* repeated_field = stub->InternalRepeatedField();
-
-    switch (state) {
-      case MAP_DIRTY:
-        EXPECT_FALSE(stub->IsMapClean());
-        EXPECT_TRUE(stub->IsRepeatedClean());
-        break;
-      case REPEATED_DIRTY:
-        EXPECT_TRUE(stub->IsMapClean());
-        EXPECT_FALSE(stub->IsRepeatedClean());
-        break;
-      case CLEAN:
-        EXPECT_TRUE(stub->IsMapClean());
-        EXPECT_TRUE(stub->IsRepeatedClean());
-        break;
-      default:
-        FAIL();
-    }
-
-    EXPECT_EQ(map_size, map->size());
-    if (is_repeated_null) {
-      EXPECT_TRUE(repeated_field == nullptr);
-    } else {
-      if (repeated_field == nullptr) {
-        EXPECT_EQ(repeated_size, 0);
-      } else {
-        EXPECT_EQ(repeated_size, repeated_field->size());
-      }
-    }
-  }
-
-  std::unique_ptr<Arena> arena_;
-  ArenaDestructor<MapFieldType> map_field_;
-  MapFieldBase* map_field_base_;
-  State state_;
-};
-
-INSTANTIATE_TEST_SUITE_P(MapFieldStateTestInstance, MapFieldStateTest,
-                         testing::Combine(testing::Values(CLEAN, MAP_DIRTY,
-                                                          REPEATED_DIRTY),
-                                          testing::Values(true, false)));
-
-TEST_P(MapFieldStateTest, GetMap) {
-  map_field_->GetMap();
-  if (state_ != MAP_DIRTY) {
-    Expect(map_field_.get(), CLEAN, 1, 1, false);
-  } else {
-    Expect(map_field_.get(), MAP_DIRTY, 1, 0, true);
-  }
-}
-
-TEST_P(MapFieldStateTest, MutableMap) {
-  map_field_->MutableMap();
-  if (state_ != MAP_DIRTY) {
-    Expect(map_field_.get(), MAP_DIRTY, 1, 1, false);
-  } else {
-    Expect(map_field_.get(), MAP_DIRTY, 1, 0, true);
-  }
-}
-
-TEST_P(MapFieldStateTest, MergeFromClean) {
-  ArenaDestructor<MapFieldType> other(arena_.get());
-  AddOneStillClean(other.get());
-
-  map_field_->MergeFrom(*other);
-
-  if (state_ != MAP_DIRTY) {
-    Expect(map_field_.get(), MAP_DIRTY, 1, 1, false);
-  } else {
-    Expect(map_field_.get(), MAP_DIRTY, 1, 0, true);
-  }
-
-  Expect(other.get(), CLEAN, 1, 1, false);
-}
-
-TEST_P(MapFieldStateTest, MergeFromMapDirty) {
-  ArenaDestructor<MapFieldType> other(arena_.get());
-  MakeMapDirty(other.get());
-
-  map_field_->MergeFrom(*other);
-
-  if (state_ != MAP_DIRTY) {
-    Expect(map_field_.get(), MAP_DIRTY, 1, 1, false);
-  } else {
-    Expect(map_field_.get(), MAP_DIRTY, 1, 0, true);
-  }
-
-  Expect(other.get(), MAP_DIRTY, 1, 0, true);
-}
-
-TEST_P(MapFieldStateTest, MergeFromRepeatedDirty) {
-  ArenaDestructor<MapFieldType> other(arena_.get());
-  MakeRepeatedDirty(other.get());
-
-  map_field_->MergeFrom(*other);
-
-  if (state_ != MAP_DIRTY) {
-    Expect(map_field_.get(), MAP_DIRTY, 1, 1, false);
-  } else {
-    Expect(map_field_.get(), MAP_DIRTY, 1, 0, true);
-  }
-
-  Expect(other.get(), CLEAN, 1, 1, false);
-}
-
-TEST_P(MapFieldStateTest, SwapClean) {
-  ArenaDestructor<MapFieldType> other(arena_.get());
-  AddOneStillClean(other.get());
-
-  map_field_->Swap(other.get());
-
-  Expect(map_field_.get(), CLEAN, 1, 1, false);
-
-  switch (state_) {
-    case CLEAN:
-      Expect(other.get(), CLEAN, 1, 1, false);
-      break;
-    case MAP_DIRTY:
-      Expect(other.get(), MAP_DIRTY, 1, 0, true);
-      break;
-    case REPEATED_DIRTY:
-      Expect(other.get(), REPEATED_DIRTY, 0, 1, false);
-      break;
-    default:
-      break;
-  }
-}
-
-TEST_P(MapFieldStateTest, SwapMapDirty) {
-  ArenaDestructor<MapFieldType> other(arena_.get());
-  MakeMapDirty(other.get());
-
-  map_field_->Swap(other.get());
-
-  Expect(map_field_.get(), MAP_DIRTY, 1, 0, true);
-
-  switch (state_) {
-    case CLEAN:
-      Expect(other.get(), CLEAN, 1, 1, false);
-      break;
-    case MAP_DIRTY:
-      Expect(other.get(), MAP_DIRTY, 1, 0, true);
-      break;
-    case REPEATED_DIRTY:
-      Expect(other.get(), REPEATED_DIRTY, 0, 1, false);
-      break;
-    default:
-      break;
-  }
-}
-
-TEST_P(MapFieldStateTest, SwapRepeatedDirty) {
-  ArenaDestructor<MapFieldType> other(arena_.get());
-  MakeRepeatedDirty(other.get());
-
-  map_field_->Swap(other.get());
-
-  Expect(map_field_.get(), REPEATED_DIRTY, 0, 1, false);
-
-  switch (state_) {
-    case CLEAN:
-      Expect(other.get(), CLEAN, 1, 1, false);
-      break;
-    case MAP_DIRTY:
-      Expect(other.get(), MAP_DIRTY, 1, 0, true);
-      break;
-    case REPEATED_DIRTY:
-      Expect(other.get(), REPEATED_DIRTY, 0, 1, false);
-      break;
-    default:
-      break;
-  }
-}
-
-TEST_P(MapFieldStateTest, Clear) {
-  map_field_->Clear();
-
-  Expect(map_field_.get(), MAP_DIRTY, 0, 0, false);
-}
-
-TEST_P(MapFieldStateTest, SpaceUsedExcludingSelf) {
-  map_field_base_->SpaceUsedExcludingSelf();
-
-  switch (state_) {
-    case CLEAN:
-      Expect(map_field_.get(), CLEAN, 1, 1, false);
-      break;
-    case MAP_DIRTY:
-      Expect(map_field_.get(), MAP_DIRTY, 1, 0, true);
-      break;
-    case REPEATED_DIRTY:
-      Expect(map_field_.get(), REPEATED_DIRTY, 0, 1, false);
-      break;
-    default:
-      break;
-  }
-}
-
-TEST_P(MapFieldStateTest, GetMapField) {
-  map_field_base_->GetRepeatedField();
-
-  if (state_ != REPEATED_DIRTY) {
-    Expect(map_field_.get(), CLEAN, 1, 1, false);
-  } else {
-    Expect(map_field_.get(), REPEATED_DIRTY, 0, 1, false);
-  }
-}
-
-TEST_P(MapFieldStateTest, MutableMapField) {
-  map_field_base_->MutableRepeatedField();
-
-  if (state_ != REPEATED_DIRTY) {
-    Expect(map_field_.get(), REPEATED_DIRTY, 1, 1, false);
-  } else {
-    Expect(map_field_.get(), REPEATED_DIRTY, 0, 1, false);
-  }
-}
-
-class MyMapField
-    : public MapField<unittest::TestMap_MapInt32Int32Entry_DoNotUse, int32_t,
-                      int32_t, internal::WireFormatLite::TYPE_INT32,
-                      internal::WireFormatLite::TYPE_INT32> {
- public:
-  constexpr MyMapField()
-      : MyMapField::MapField(internal::ConstantInitialized{}) {}
-};
-
-TEST(MapFieldTest, ConstInit) {
-  // This tests that `MapField` and all its base classes can be constant
-  // initialized.
-  PROTOBUF_CONSTINIT static MyMapField field;  // NOLINT
-  EXPECT_EQ(field.size(), 0);
-}
-
-
-}  // namespace internal
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/map_lite_test_util.cc b/libs/protobuf/src/google/protobuf/map_lite_test_util.cc
deleted file mode 100644
index 121f267..0000000
--- a/libs/protobuf/src/google/protobuf/map_lite_test_util.cc
+++ /dev/null
@@ -1,94 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <google/protobuf/map_lite_test_util.h>
-
-#include <google/protobuf/map_lite_unittest.pb.h>
-#include <google/protobuf/map_test_util_impl.h>
-
-namespace google {
-namespace protobuf {
-
-void MapLiteTestUtil::SetMapFields(unittest::TestMapLite* message) {
-  MapTestUtilImpl::SetMapFields<unittest::MapEnumLite,
-                                unittest::MAP_ENUM_BAR_LITE,
-                                unittest::MAP_ENUM_BAZ_LITE>(message);
-}
-
-void MapLiteTestUtil::SetArenaMapFields(unittest::TestArenaMapLite* message) {
-  MapTestUtilImpl::SetArenaMapFields<unittest::MapEnumLite,
-                                     unittest::MAP_ENUM_BAR_LITE,
-                                     unittest::MAP_ENUM_BAZ_LITE>(message);
-}
-
-void MapLiteTestUtil::SetMapFieldsInitialized(unittest::TestMapLite* message) {
-  MapTestUtilImpl::SetMapFieldsInitialized(message);
-}
-
-void MapLiteTestUtil::ModifyMapFields(unittest::TestMapLite* message) {
-  MapTestUtilImpl::ModifyMapFields<unittest::MapEnumLite,
-                                   unittest::MAP_ENUM_FOO_LITE>(message);
-}
-
-void MapLiteTestUtil::ExpectClear(const unittest::TestMapLite& message) {
-  MapTestUtilImpl::ExpectClear(message);
-}
-
-void MapLiteTestUtil::ExpectMapFieldsSet(const unittest::TestMapLite& message) {
-  MapTestUtilImpl::ExpectMapFieldsSet<unittest::MapEnumLite,
-                                      unittest::MAP_ENUM_BAR_LITE,
-                                      unittest::MAP_ENUM_BAZ_LITE>(message);
-}
-
-void MapLiteTestUtil::ExpectArenaMapFieldsSet(
-    const unittest::TestArenaMapLite& message) {
-  MapTestUtilImpl::ExpectArenaMapFieldsSet<unittest::MapEnumLite,
-                                           unittest::MAP_ENUM_BAR_LITE,
-                                           unittest::MAP_ENUM_BAZ_LITE>(
-      message);
-}
-
-void MapLiteTestUtil::ExpectMapFieldsSetInitialized(
-    const unittest::TestMapLite& message) {
-  MapTestUtilImpl::ExpectMapFieldsSetInitialized<unittest::MapEnumLite,
-                                                 unittest::MAP_ENUM_FOO_LITE>(
-      message);
-}
-
-void MapLiteTestUtil::ExpectMapFieldsModified(
-    const unittest::TestMapLite& message) {
-  MapTestUtilImpl::ExpectMapFieldsModified<unittest::MapEnumLite,
-                                           unittest::MAP_ENUM_BAR_LITE,
-                                           unittest::MAP_ENUM_FOO_LITE>(
-      message);
-}
-
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/map_lite_test_util.h b/libs/protobuf/src/google/protobuf/map_lite_test_util.h
deleted file mode 100644
index 573de7b..0000000
--- a/libs/protobuf/src/google/protobuf/map_lite_test_util.h
+++ /dev/null
@@ -1,80 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef GOOGLE_PROTOBUF_MAP_LITE_TEST_UTIL_H__
-#define GOOGLE_PROTOBUF_MAP_LITE_TEST_UTIL_H__
-
-#include <google/protobuf/map_lite_unittest.pb.h>
-
-namespace google {
-namespace protobuf {
-
-class MapLiteTestUtil {
- public:
-  // Set every field in the TestMapLite message to a unique value.
-  static void SetMapFields(protobuf_unittest::TestMapLite* message);
-
-  // Set every field in the TestArenaMapLite message to a unique value.
-  static void SetArenaMapFields(protobuf_unittest::TestArenaMapLite* message);
-
-  // Set every field in the message to a default value.
-  static void SetMapFieldsInitialized(protobuf_unittest::TestMapLite* message);
-
-  // Modify all the map fields of the message (which should already have been
-  // initialized with SetMapFields()).
-  static void ModifyMapFields(protobuf_unittest::TestMapLite* message);
-
-  // Check that all fields have the values that they should have after
-  // SetMapFields() is called.
-  static void ExpectMapFieldsSet(const protobuf_unittest::TestMapLite& message);
-
-  // Check that all fields have the values that they should have after
-  // SetMapFields() is called for TestArenaMapLite.
-  static void ExpectArenaMapFieldsSet(
-      const protobuf_unittest::TestArenaMapLite& message);
-
-  // Check that all fields have the values that they should have after
-  // SetMapFieldsInitialized() is called.
-  static void ExpectMapFieldsSetInitialized(
-      const protobuf_unittest::TestMapLite& message);
-
-  // Expect that the message is modified as would be expected from
-  // ModifyMapFields().
-  static void ExpectMapFieldsModified(
-      const protobuf_unittest::TestMapLite& message);
-
-  // Check that all fields are empty.
-  static void ExpectClear(const protobuf_unittest::TestMapLite& message);
-};
-
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // GOOGLE_PROTOBUF_MAP_LITE_TEST_UTIL_H__
diff --git a/libs/protobuf/src/google/protobuf/map_lite_unittest.proto b/libs/protobuf/src/google/protobuf/map_lite_unittest.proto
deleted file mode 100644
index 7f10431..0000000
--- a/libs/protobuf/src/google/protobuf/map_lite_unittest.proto
+++ /dev/null
@@ -1,131 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto2";
-
-package protobuf_unittest;
-
-import "google/protobuf/unittest_lite.proto";
-
-option cc_enable_arenas = true;
-option optimize_for = LITE_RUNTIME;
-
-message TestMapLite {
-  map<int32, int32> map_int32_int32 = 1;
-  map<int64, int64> map_int64_int64 = 2;
-  map<uint32, uint32> map_uint32_uint32 = 3;
-  map<uint64, uint64> map_uint64_uint64 = 4;
-  map<sint32, sint32> map_sint32_sint32 = 5;
-  map<sint64, sint64> map_sint64_sint64 = 6;
-  map<fixed32, fixed32> map_fixed32_fixed32 = 7;
-  map<fixed64, fixed64> map_fixed64_fixed64 = 8;
-  map<sfixed32, sfixed32> map_sfixed32_sfixed32 = 9;
-  map<sfixed64, sfixed64> map_sfixed64_sfixed64 = 10;
-  map<int32, float> map_int32_float = 11;
-  map<int32, double> map_int32_double = 12;
-  map<bool, bool> map_bool_bool = 13;
-  map<string, string> map_string_string = 14;
-  map<int32, bytes> map_int32_bytes = 15;
-  map<int32, MapEnumLite> map_int32_enum = 16;
-  map<int32, ForeignMessageLite> map_int32_foreign_message = 17;
-  map<int32, int32> teboring = 18;
-}
-
-message TestArenaMapLite {
-  map<int32, int32> map_int32_int32 = 1;
-  map<int64, int64> map_int64_int64 = 2;
-  map<uint32, uint32> map_uint32_uint32 = 3;
-  map<uint64, uint64> map_uint64_uint64 = 4;
-  map<sint32, sint32> map_sint32_sint32 = 5;
-  map<sint64, sint64> map_sint64_sint64 = 6;
-  map<fixed32, fixed32> map_fixed32_fixed32 = 7;
-  map<fixed64, fixed64> map_fixed64_fixed64 = 8;
-  map<sfixed32, sfixed32> map_sfixed32_sfixed32 = 9;
-  map<sfixed64, sfixed64> map_sfixed64_sfixed64 = 10;
-  map<int32, float> map_int32_float = 11;
-  map<int32, double> map_int32_double = 12;
-  map<bool, bool> map_bool_bool = 13;
-  map<string, string> map_string_string = 14;
-  map<int32, bytes> map_int32_bytes = 15;
-  map<int32, MapEnumLite> map_int32_enum = 16;
-  map<int32, ForeignMessageArenaLite> map_int32_foreign_message = 17;
-}
-
-// Test embedded message with required fields
-message TestRequiredMessageMapLite {
-  map<int32, TestRequiredLite> map_field = 1;
-}
-
-message TestEnumMapLite {
-  map<int32, Proto2MapEnumLite> known_map_field = 101;
-  map<int32, Proto2MapEnumLite> unknown_map_field = 102;
-}
-
-message TestEnumMapPlusExtraLite {
-  map<int32, Proto2MapEnumPlusExtraLite> known_map_field = 101;
-  map<int32, Proto2MapEnumPlusExtraLite> unknown_map_field = 102;
-}
-
-message TestMessageMapLite {
-  map<int32, TestAllTypesLite> map_int32_message = 1;
-}
-
-enum Proto2MapEnumLite {
-  PROTO2_MAP_ENUM_FOO_LITE = 0;
-  PROTO2_MAP_ENUM_BAR_LITE = 1;
-  PROTO2_MAP_ENUM_BAZ_LITE = 2;
-}
-
-enum Proto2MapEnumPlusExtraLite {
-  E_PROTO2_MAP_ENUM_FOO_LITE = 0;
-  E_PROTO2_MAP_ENUM_BAR_LITE = 1;
-  E_PROTO2_MAP_ENUM_BAZ_LITE = 2;
-  E_PROTO2_MAP_ENUM_EXTRA_LITE = 3;
-}
-
-enum MapEnumLite {
-  MAP_ENUM_FOO_LITE = 0;
-  MAP_ENUM_BAR_LITE = 1;
-  MAP_ENUM_BAZ_LITE = 2;
-}
-
-message TestRequiredLite {
-  required int32 a = 1;
-  required int32 b = 2;
-  required int32 c = 3;
-
-  extend TestAllExtensionsLite {
-    optional TestRequiredLite single = 1000;
-  }
-}
-
-message ForeignMessageArenaLite {
-  optional int32 c = 1;
-}
diff --git a/libs/protobuf/src/google/protobuf/map_proto2_unittest.proto b/libs/protobuf/src/google/protobuf/map_proto2_unittest.proto
deleted file mode 100644
index 20d58f9..0000000
--- a/libs/protobuf/src/google/protobuf/map_proto2_unittest.proto
+++ /dev/null
@@ -1,91 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto2";
-option cc_enable_arenas = true;
-
-import "google/protobuf/unittest_import.proto";
-
-// We don't put this in a package within proto2 because we need to make sure
-// that the generated code doesn't depend on being in the proto2 namespace.
-// In map_test_util.h we do "using namespace unittest = protobuf_unittest".
-package protobuf_unittest;
-
-enum Proto2MapEnum {
-  PROTO2_MAP_ENUM_FOO   = 0;
-  PROTO2_MAP_ENUM_BAR   = 1;
-  PROTO2_MAP_ENUM_BAZ   = 2;
-}
-
-enum Proto2MapEnumPlusExtra {
-  E_PROTO2_MAP_ENUM_FOO   = 0;
-  E_PROTO2_MAP_ENUM_BAR   = 1;
-  E_PROTO2_MAP_ENUM_BAZ   = 2;
-  E_PROTO2_MAP_ENUM_EXTRA = 3;
-}
-
-message TestEnumMap {
-  map<int32, Proto2MapEnum> known_map_field = 101;
-  map<int32, Proto2MapEnum> unknown_map_field = 102;
-}
-
-message TestEnumMapPlusExtra {
-  map<int32, Proto2MapEnumPlusExtra> known_map_field = 101;
-  map<int32, Proto2MapEnumPlusExtra> unknown_map_field = 102;
-}
-
-message TestImportEnumMap {
-  map<int32, protobuf_unittest_import.ImportEnumForMap> import_enum_amp = 1;
-}
-
-message TestIntIntMap {
-  map<int32, int32> m = 1;
-}
-
-// Test all key types: string, plus the non-floating-point scalars.
-message TestMaps {
-  map<int32, TestIntIntMap> m_int32 = 1;
-  map<int64, TestIntIntMap> m_int64 = 2;
-  map<uint32, TestIntIntMap> m_uint32 = 3;
-  map<uint64, TestIntIntMap> m_uint64 = 4;
-  map<sint32, TestIntIntMap> m_sint32 = 5;
-  map<sint64, TestIntIntMap> m_sint64 = 6;
-  map<fixed32, TestIntIntMap> m_fixed32 = 7;
-  map<fixed64, TestIntIntMap> m_fixed64 = 8;
-  map<sfixed32, TestIntIntMap> m_sfixed32 = 9;
-  map<sfixed64, TestIntIntMap> m_sfixed64 = 10;
-  map<bool, TestIntIntMap> m_bool = 11;
-  map<string, TestIntIntMap> m_string = 12;
-}
-
-// Test maps in submessages.
-message TestSubmessageMaps {
-  optional TestMaps m = 1;
-}
diff --git a/libs/protobuf/src/google/protobuf/map_test.cc b/libs/protobuf/src/google/protobuf/map_test.cc
deleted file mode 100644
index f7c024c..0000000
--- a/libs/protobuf/src/google/protobuf/map_test.cc
+++ /dev/null
@@ -1,86 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <google/protobuf/map_proto2_unittest.pb.h>
-#include <google/protobuf/map_unittest.pb.h>
-#include <google/protobuf/reflection_tester.h>
-#include <google/protobuf/test_util2.h>
-
-
-#define BRIDGE_UNITTEST ::google::protobuf::bridge_unittest
-#define UNITTEST ::protobuf_unittest
-#define UNITTEST_IMPORT ::protobuf_unittest_import
-#define UNITTEST_PACKAGE_NAME "protobuf_unittest"
-
-// Must include after defining UNITTEST, etc.
-// clang-format off
-#include <google/protobuf/test_util.inc>
-#include <google/protobuf/map_test_util.inc>
-#include <google/protobuf/map_test.inc>
-// clang-format on
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-namespace internal {
-namespace {
-
-
-struct AlignedAsDefault {
-  int x;
-};
-struct alignas(8) AlignedAs8 {
-  int x;
-};
-
-template <typename Aligned, bool on_arena = false>
-void MapTest_Aligned() {
-  Arena arena;
-  constexpr size_t align_mask = alignof(Aligned) - 1;
-  Map<int, Aligned> map(on_arena ? &arena : nullptr);
-  map.insert({1, Aligned{}});
-  auto it = map.find(1);
-  ASSERT_NE(it, map.end());
-  ASSERT_EQ(reinterpret_cast<intptr_t>(&it->second) & align_mask, 0);
-  map.clear();
-}
-
-TEST(MapTest, Aligned) { MapTest_Aligned<AlignedAsDefault>(); }
-TEST(MapTest, AlignedOnArena) { MapTest_Aligned<AlignedAsDefault, true>(); }
-TEST(MapTest, Aligned8) { MapTest_Aligned<AlignedAs8>(); }
-TEST(MapTest, Aligned8OnArena) { MapTest_Aligned<AlignedAs8, true>(); }
-
-
-}  // namespace
-}  // namespace internal
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/map_test.inc b/libs/protobuf/src/google/protobuf/map_test.inc
deleted file mode 100644
index 18a7bfb..0000000
--- a/libs/protobuf/src/google/protobuf/map_test.inc
+++ /dev/null
@@ -1,4071 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// A hack to include windows.h first, which ensures the GetMessage macro can
-// be undefined when we include <google/protobuf/stubs/common.h>
-#if defined(_MSC_VER)
-#define _WINSOCKAPI_  // to avoid re-definition in WinSock2.h
-#define NOMINMAX      // to avoid defining min/max macros
-#include <windows.h>
-#endif  // _WIN32
-
-#include <algorithm>
-#include <map>
-#include <memory>
-#include <random>
-#include <set>
-#include <sstream>
-#include <unordered_map>
-#include <unordered_set>
-#include <vector>
-
-#include <google/protobuf/stubs/logging.h>
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/testing/file.h>
-#include <google/protobuf/descriptor.pb.h>
-#include <gmock/gmock.h>
-#include <google/protobuf/testing/googletest.h>
-#include <gtest/gtest.h>
-#include <google/protobuf/stubs/casts.h>
-#include <google/protobuf/stubs/substitute.h>
-#include <google/protobuf/arena_test_util.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/descriptor_database.h>
-#include <google/protobuf/dynamic_message.h>
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/io/tokenizer.h>
-#include <google/protobuf/io/zero_copy_stream_impl.h>
-#include <google/protobuf/map.h>
-#include <google/protobuf/map_field_inl.h>
-#include <google/protobuf/message.h>
-#include <google/protobuf/reflection.h>
-#include <google/protobuf/reflection_ops.h>
-#include <google/protobuf/test_util2.h>
-#include <google/protobuf/text_format.h>
-#include <google/protobuf/util/message_differencer.h>
-#include <google/protobuf/util/time_util.h>
-#include <google/protobuf/wire_format.h>
-
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-
-using UNITTEST::ForeignMessage;
-using UNITTEST::TestAllTypes;
-using UNITTEST::TestMap;
-using UNITTEST::TestRecursiveMapMessage;
-
-namespace internal {
-
-void MapTestForceDeterministic() {
-  io::CodedOutputStream::SetDefaultSerializationDeterministic();
-}
-
-namespace {
-
-// Map API Test =====================================================
-
-class MapImplTest : public ::testing::Test {
- protected:
-  MapImplTest()
-      : map_ptr_(new Map<int32_t, int32_t>()),
-        map_(*map_ptr_),
-        const_map_(*map_ptr_) {
-    EXPECT_TRUE(map_.empty());
-    EXPECT_EQ(0, map_.size());
-  }
-
-  void ExpectSingleElement(int32_t key, int32_t value) {
-    EXPECT_FALSE(map_.empty());
-    EXPECT_EQ(1, map_.size());
-    ExpectElement(key, value);
-  }
-
-  void ExpectElements(const std::map<int32_t, int32_t>& map) {
-    EXPECT_FALSE(map_.empty());
-    EXPECT_EQ(map.size(), map_.size());
-    for (std::map<int32_t, int32_t>::const_iterator it = map.begin();
-         it != map.end(); ++it) {
-      ExpectElement(it->first, it->second);
-    }
-  }
-
-  void ExpectElement(int32_t key, int32_t value) {
-    // Test map size is correct.
-    EXPECT_EQ(value, map_[key]);
-    EXPECT_EQ(1, map_.count(key));
-    EXPECT_TRUE(map_.contains(key));
-
-    // Check mutable at and find work correctly.
-    EXPECT_EQ(value, map_.at(key));
-    Map<int32_t, int32_t>::iterator it = map_.find(key);
-
-    // iterator dereferenceable
-    EXPECT_EQ(key, (*it).first);
-    EXPECT_EQ(value, (*it).second);
-    EXPECT_EQ(key, it->first);
-    EXPECT_EQ(value, it->second);
-
-    // iterator mutable
-    ((*it).second) = value + 1;
-    EXPECT_EQ(value + 1, map_[key]);
-    ((*it).second) = value;
-    EXPECT_EQ(value, map_[key]);
-
-    it->second = value + 1;
-    EXPECT_EQ(value + 1, map_[key]);
-    it->second = value;
-    EXPECT_EQ(value, map_[key]);
-
-    // copy constructor
-    Map<int32_t, int32_t>::iterator it_copy = it;
-    EXPECT_EQ(key, it_copy->first);
-    EXPECT_EQ(value, it_copy->second);
-
-    // Immutable API ================================================
-
-    // Check immutable at and find work correctly.
-    EXPECT_EQ(value, const_map_.at(key));
-    Map<int32_t, int32_t>::const_iterator const_it = const_map_.find(key);
-
-    // iterator dereferenceable
-    EXPECT_EQ(key, (*const_it).first);
-    EXPECT_EQ(value, (*const_it).second);
-    EXPECT_EQ(key, const_it->first);
-    EXPECT_EQ(value, const_it->second);
-
-    // copy constructor
-    Map<int32_t, int32_t>::const_iterator const_it_copy = const_it;
-    EXPECT_EQ(key, const_it_copy->first);
-    EXPECT_EQ(value, const_it_copy->second);
-  }
-
-  std::unique_ptr<Map<int32_t, int32_t>> map_ptr_;
-  Map<int32_t, int32_t>& map_;
-  const Map<int32_t, int32_t>& const_map_;
-};
-
-TEST_F(MapImplTest, OperatorBracket) {
-  int32_t key = 0;
-  int32_t value1 = 100;
-  int32_t value2 = 101;
-
-  EXPECT_EQ(0, map_[key]);
-
-  map_[key] = value1;
-  ExpectSingleElement(key, value1);
-
-  map_[key] = value2;
-  ExpectSingleElement(key, value2);
-}
-
-struct MoveTestKey {
-  MoveTestKey(int data, int* copies) : data(data), copies(copies) {}
-
-  MoveTestKey(const MoveTestKey& other)
-      : data(other.data), copies(other.copies) {
-    ++*copies;
-  }
-
-  MoveTestKey(MoveTestKey&& other) noexcept
-      : data(other.data), copies(other.copies) {}
-
-  friend bool operator==(const MoveTestKey& lhs, const MoveTestKey& rhs) {
-    return lhs.data == rhs.data;
-  }
-  friend bool operator<(const MoveTestKey& lhs, const MoveTestKey& rhs) {
-    return lhs.data < rhs.data;
-  }
-
-  int data;
-  int* copies;
-};
-
-}  // namespace
-}  // namespace internal
-}  // namespace protobuf
-}  // namespace google
-
-namespace std {
-
-template <>  // NOLINT
-struct hash<google::protobuf::internal::MoveTestKey> {
-  size_t operator()(const google::protobuf::internal::MoveTestKey& key) const {
-    return hash<int>{}(key.data);
-  }
-};
-}  // namespace std
-
-namespace google {
-namespace protobuf {
-namespace internal {
-namespace {
-
-TEST_F(MapImplTest, OperatorBracketRValue) {
-  Arena arena;
-  for (Arena* arena_to_use : {&arena, static_cast<Arena*>(nullptr)}) {
-    int copies = 0;
-    Map<MoveTestKey, int> map(arena_to_use);
-    MoveTestKey key1(1, &copies);
-    EXPECT_EQ(copies, 0);
-    map[key1] = 0;
-    EXPECT_EQ(copies, 1);
-    map[MoveTestKey(2, &copies)] = 2;
-    EXPECT_EQ(copies, 1);
-  }
-}
-
-TEST_F(MapImplTest, OperatorBracketNonExist) {
-  int32_t key = 0;
-  int32_t default_value = 0;
-
-  EXPECT_EQ(default_value, map_[key]);
-  ExpectSingleElement(key, default_value);
-}
-
-TEST_F(MapImplTest, MutableAt) {
-  int32_t key = 0;
-  int32_t value1 = 100;
-  int32_t value2 = 101;
-
-  map_[key] = value1;
-  ExpectSingleElement(key, value1);
-
-  map_.at(key) = value2;
-  ExpectSingleElement(key, value2);
-}
-
-#ifdef PROTOBUF_HAS_DEATH_TEST
-
-TEST_F(MapImplTest, MutableAtNonExistDeathTest) {
-  EXPECT_DEATH(map_.at(0), "");
-}
-
-TEST_F(MapImplTest, ImmutableAtNonExistDeathTest) {
-  EXPECT_DEATH(const_map_.at(0), "");
-}
-
-TEST_F(MapImplTest, UsageErrors) {
-  MapKey key;
-  key.SetInt64Value(1);
-  EXPECT_DEATH(key.GetUInt64Value(),
-               "Protocol Buffer map usage error:\n"
-               "MapKey::GetUInt64Value type does not match\n"
-               "  Expected : uint64\n"
-               "  Actual   : int64");
-
-  MapValueRef value;
-  EXPECT_DEATH(
-      value.SetFloatValue(0.1),
-      "Protocol Buffer map usage error:\n"
-      "MapValue[Const]*Ref::type MapValue[Const]*Ref is not initialized.");
-}
-
-#endif  // PROTOBUF_HAS_DEATH_TEST
-
-TEST_F(MapImplTest, MapKeyAssignment) {
-  MapKey from, to;
-  from.SetStringValue("abc");
-  to = from;
-  EXPECT_EQ("abc", to.GetStringValue());
-}
-
-TEST_F(MapImplTest, CountNonExist) { EXPECT_EQ(0, map_.count(0)); }
-
-TEST_F(MapImplTest, ContainNotExist) { EXPECT_FALSE(map_.contains(0)); }
-
-TEST_F(MapImplTest, ImmutableContainNotExist) {
-  EXPECT_FALSE(const_map_.contains(0));
-}
-
-TEST_F(MapImplTest, MutableFindNonExist) {
-  EXPECT_TRUE(map_.end() == map_.find(0));
-}
-
-TEST_F(MapImplTest, ImmutableFindNonExist) {
-  EXPECT_TRUE(const_map_.end() == const_map_.find(0));
-}
-
-TEST_F(MapImplTest, ConstEnd) {
-  EXPECT_TRUE(const_map_.end() == const_map_.cend());
-}
-
-TEST_F(MapImplTest, GetReferenceFromIterator) {
-  for (int i = 0; i < 10; i++) {
-    map_[i] = i;
-  }
-
-  for (Map<int32_t, int32_t>::const_iterator it = map_.cbegin();
-       it != map_.cend();) {
-    Map<int32_t, int32_t>::const_reference entry = *it++;
-    EXPECT_EQ(entry.first, entry.second);
-  }
-
-  for (Map<int32_t, int32_t>::const_iterator it = const_map_.begin();
-       it != const_map_.end();) {
-    Map<int32_t, int32_t>::const_reference entry = *it++;
-    EXPECT_EQ(entry.first, entry.second);
-  }
-
-  for (Map<int32_t, int32_t>::iterator it = map_.begin(); it != map_.end();) {
-    Map<int32_t, int32_t>::reference entry = *it++;
-    EXPECT_EQ(entry.first + 1, ++entry.second);
-  }
-}
-
-TEST_F(MapImplTest, IteratorBasic) {
-  map_[0] = 0;
-
-  // Default constructible (per forward iterator requirements).
-  Map<int, int>::const_iterator cit;
-  Map<int, int>::iterator it;
-
-  it = map_.begin();
-  cit = it;  // Converts to const_iterator
-
-  // Can compare between them.
-  EXPECT_TRUE(it == cit);
-  EXPECT_FALSE(cit != it);
-
-  // Pre increment.
-  EXPECT_FALSE(it == ++cit);
-
-  // Post increment.
-  EXPECT_FALSE(it++ == cit);
-  EXPECT_TRUE(it == cit);
-}
-
-template <typename Iterator>
-static int64_t median(Iterator i0, Iterator i1) {
-  std::vector<int64_t> v(i0, i1);
-  std::nth_element(v.begin(), v.begin() + v.size() / 2, v.end());
-  return v[v.size() / 2];
-}
-
-static int64_t Now() {
-  return util::TimeUtil::TimestampToNanoseconds(
-      util::TimeUtil::GetCurrentTime());
-}
-
-// Arbitrary odd integers for creating test data.
-static int k0 = 812398771;
-static int k1 = 1312938717;
-static int k2 = 1321555333;
-
-// A naive begin() implementation will cause begin() to get slower and slower
-// if one erases elements at the "front" of the hash map, and we'd like to
-// avoid that, as std::unordered_map does.
-TEST_F(MapImplTest, BeginIsFast) {
-  if (true) return;  // TODO(gpike): make this less flaky and re-enable it.
-  Map<int32_t, int32_t> map;
-  const int kTestSize = 250000;
-  // Create a random-looking map of size n.  Use non-negative integer keys.
-  uint32_t frog = 123983;
-  int last_key = 0;
-  int counter = 0;
-  while (map.size() < kTestSize) {
-    frog *= static_cast<uint32_t>(k0);
-    frog ^= frog >> 17;
-    frog += counter++;
-    last_key =
-        static_cast<int>(frog) >= 0 ? static_cast<int>(frog) : last_key ^ 1;
-    GOOGLE_DCHECK_GE(last_key, 0);
-    map[last_key] = last_key ^ 1;
-  }
-  std::vector<int64_t> times;
-  // We're going to do map.erase(map.begin()) over and over again.  But,
-  // just in case one iteration is fast compared to the granularity of
-  // our time keeping, we measure kChunkSize iterations per outer-loop iter.
-  const int kChunkSize = 1000;
-  GOOGLE_CHECK_EQ(kTestSize % kChunkSize, 0);
-  do {
-    const int64_t start = Now();
-    for (int i = 0; i < kChunkSize; i++) {
-      map.erase(map.begin());
-    }
-    const int64_t end = Now();
-    if (end > start) {
-      times.push_back(end - start);
-    }
-  } while (!map.empty());
-  if (times.size() < .99 * kTestSize / kChunkSize) {
-    GOOGLE_LOG(WARNING) << "Now() isn't helping us measure time";
-    return;
-  }
-  int64_t x0 = median(times.begin(), times.begin() + 9);
-  int64_t x1 = median(times.begin() + times.size() - 9, times.end());
-  GOOGLE_LOG(INFO) << "x0=" << x0 << ", x1=" << x1;
-  // x1 will greatly exceed x0 if the code we just executed took O(n^2) time.
-  // And we'll probably time out and never get here.  So, this test is
-  // intentionally loose: we check that x0 and x1 are within a factor of 8.
-  EXPECT_GE(x1, x0 / 8);
-  EXPECT_GE(x0, x1 / 8);
-}
-
-// Try to create kTestSize keys that will land in just a few buckets, and
-// time the insertions, to get a rough estimate of whether an O(n^2) worst case
-// was triggered.  This test is a hacky, but probably better than nothing.
-TEST_F(MapImplTest, HashFlood) {
-  const int kTestSize = 1024;  // must be a power of 2
-  std::set<int> s;
-  for (int i = 0; s.size() < kTestSize; i++) {
-    if ((map_.hash_function()(i) & (kTestSize - 1)) < 3) {
-      s.insert(i);
-    }
-  }
-  // Create hash table with kTestSize entries that hash flood a table with
-  // 1024 (or 512 or 2048 or ...) entries.  This assumes that map_ uses powers
-  // of 2 for table sizes, and that it's sufficient to "flood" with respect to
-  // the low bits of the output of map_.hash_function().
-  std::vector<int64_t> times;
-  std::set<int>::iterator it = s.begin();
-  int count = 0;
-  do {
-    const int64_t start = Now();
-    map_[*it] = 0;
-    const int64_t end = Now();
-    if (end > start) {
-      times.push_back(end - start);
-    }
-    ++count;
-    ++it;
-  } while (it != s.end());
-  if (times.size() < .99 * count) return;
-  int64_t x0 = median(times.begin(), times.begin() + 9);
-  int64_t x1 = median(times.begin() + times.size() - 9, times.end());
-  // x1 will greatly exceed x0 if the code we just executed took O(n^2) time.
-  // But we want to allow O(n log n).  A factor of 20 should be generous enough.
-  EXPECT_LE(x1, x0 * 20);
-}
-
-TEST_F(MapImplTest, CopyIteratorStressTest) {
-  std::vector<Map<int32_t, int32_t>::iterator> v;
-  const int kIters = 1e5;
-  for (uint32_t i = 0; i < kIters; i++) {
-    int32_t key = (3 + i * (5 + i * (-8 + i * (62 + i)))) & 0x77777777;
-    map_[key] = i;
-    v.push_back(map_.find(key));
-  }
-  for (std::vector<Map<int32_t, int32_t>::iterator>::const_iterator it =
-           v.begin();
-       it != v.end(); it++) {
-    Map<int32_t, int32_t>::iterator i = *it;
-    ASSERT_EQ(i->first, (*it)->first);
-    ASSERT_EQ(i->second, (*it)->second);
-  }
-}
-
-template <typename T, typename U>
-static void TestValidityForAllKeysExcept(int key_to_avoid, const T& check_map,
-                                         const U& map) {
-  typedef typename U::value_type value_type;  // a key-value pair
-  for (typename U::const_iterator it = map.begin(); it != map.end(); ++it) {
-    const int key = it->first;
-    if (key == key_to_avoid) continue;
-    // All iterators relevant to this key, whether old (from check_map) or new,
-    // must point to the same memory.  So, test pointer equality here.
-    const value_type* check_val = &*check_map.find(key)->second;
-    EXPECT_EQ(check_val, &*it);
-    EXPECT_EQ(check_val, &*map.find(key));
-  }
-}
-
-// EXPECT i0 and i1 to be the same.  Advancing them should have the same effect,
-// too.
-template <typename Iter>
-static void TestEqualIterators(Iter i0, Iter i1, Iter end) {
-  const int kMaxAdvance = 10;
-  for (int i = 0; i < kMaxAdvance; i++) {
-    EXPECT_EQ(i0 == end, i1 == end);
-    if (i0 == end) return;
-    EXPECT_EQ(&*i0, &*i1) << "iter " << i;
-    ++i0;
-    ++i1;
-  }
-}
-
-template <typename IteratorType>
-static void TestOldVersusNewIterator(int skip, Map<int, int>* m) {
-  const int initial_size = m->size();
-  IteratorType it = m->begin();
-  for (int i = 0; i < skip && it != m->end(); it++, i++) {
-  }
-  if (it == m->end()) return;
-  const IteratorType old = it;
-  GOOGLE_LOG(INFO) << "skip=" << skip << ", old->first=" << old->first;
-  const int target_size =
-      initial_size < 100 ? initial_size * 5 : initial_size * 5 / 4;
-  for (int i = 0; m->size() <= target_size; i++) {
-    (*m)[i] = 0;
-  }
-  // Iterator 'old' should still work just fine despite the growth of *m.
-  const IteratorType after_growth = m->find(old->first);
-  TestEqualIterators<IteratorType>(old, after_growth, m->end());
-
-  // Now shrink the number of elements.  Do this with a mix of erases and
-  // inserts to increase the chance that the hashtable will resize to a lower
-  // number of buckets.  (But, in any case, the test is still useful.)
-  for (int i = 0; i < 2 * (target_size - initial_size); i++) {
-    if (i != old->first) {
-      m->erase(i);
-    }
-    if (((i ^ m->begin()->first) & 15) == 0) {
-      (*m)[i * 342] = i;
-    }
-  }
-  // Now, the table has grown and shrunk; test again.
-  TestEqualIterators<IteratorType>(old, m->find(old->first), m->end());
-  TestEqualIterators<IteratorType>(old, after_growth, m->end());
-}
-
-// Create and test an n-element Map, with emphasis on iterator correctness.
-static void StressTestIterators(int n) {
-  GOOGLE_LOG(INFO) << "StressTestIterators " << n;
-  GOOGLE_CHECK_GT(n, 0);
-  // Create a random-looking map of size n.  Use non-negative integer keys.
-  Map<int, int> m;
-  uint32_t frog = 123987 + n;
-  int last_key = 0;
-  int counter = 0;
-  while (m.size() < n) {
-    frog *= static_cast<uint32_t>(k0);
-    frog ^= frog >> 17;
-    frog += counter++;
-    last_key =
-        static_cast<int>(frog) >= 0 ? static_cast<int>(frog) : last_key ^ 1;
-    GOOGLE_DCHECK_GE(last_key, 0);
-    m[last_key] = last_key ^ 1;
-  }
-  // Test it.
-  ASSERT_EQ(n, m.size());
-  // Create maps of pointers and iterators.
-  // These should remain valid even if we modify m.
-  std::unordered_map<int, Map<int, int>::value_type*> mp(n);
-  std::unordered_map<int, Map<int, int>::iterator> mi(n);
-  for (Map<int, int>::iterator it = m.begin(); it != m.end(); ++it) {
-    mp[it->first] = &*it;
-    mi[it->first] = it;
-  }
-  ASSERT_EQ(m.size(), mi.size());
-  ASSERT_EQ(m.size(), mp.size());
-  m.erase(last_key);
-  ASSERT_EQ(n - 1, m.size());
-  TestValidityForAllKeysExcept(last_key, mp, m);
-  TestValidityForAllKeysExcept(last_key, mi, m);
-
-  m[last_key] = 0;
-  ASSERT_EQ(n, m.size());
-  // Test old iterator vs new iterator, with table modification in between.
-  TestOldVersusNewIterator<Map<int, int>::const_iterator>(n % 3, &m);
-  TestOldVersusNewIterator<Map<int, int>::iterator>(n % (1 + (n / 40)), &m);
-  // Finally, ensure erase(iterator) doesn't reorder anything, because that is
-  // what its documentation says.
-  m[last_key] = m[last_key ^ 999] = 0;
-  std::vector<Map<int, int>::iterator> v;
-  v.reserve(m.size());
-  int position_of_last_key = 0;
-  for (Map<int, int>::iterator it = m.begin(); it != m.end(); ++it) {
-    if (it->first == last_key) {
-      position_of_last_key = v.size();
-    }
-    v.push_back(it);
-  }
-  ASSERT_EQ(m.size(), v.size());
-  const Map<int, int>::iterator erase_result = m.erase(m.find(last_key));
-  int index = 0;
-  for (Map<int, int>::iterator it = m.begin(); it != m.end(); ++it, ++index) {
-    if (index == position_of_last_key) {
-      EXPECT_EQ(&*erase_result, &*v[++index]);
-    }
-    ASSERT_EQ(&*it, &*v[index]);
-  }
-}
-
-TEST_F(MapImplTest, IteratorInvalidation) {
-  // Create a set of pseudo-random sizes to test.
-#ifndef NDEBUG
-  const int kMaxSizeToTest = 100 * 1000;
-#else
-  const int kMaxSizeToTest = 1000 * 1000;
-#endif
-  std::set<int> s;
-  int n = kMaxSizeToTest;
-  unsigned int frog = k1 + n;
-  while (n > 1 && s.size() < 25) {
-    s.insert(n);
-    n = static_cast<int>(n * 100 / (101.0 + (frog & 63)));
-    frog *= k2;
-    frog ^= frog >> 17;
-  }
-  // Ensure we test a few small sizes.
-  s.insert(1);
-  s.insert(2);
-  s.insert(3);
-  // Now, the real work.
-  for (std::set<int>::iterator i = s.begin(); i != s.end(); ++i) {
-    StressTestIterators(*i);
-  }
-}
-
-// Test that erase() revalidates iterators.
-TEST_F(MapImplTest, EraseRevalidates) {
-  map_[3] = map_[13] = map_[20] = 0;
-  const int initial_size = map_.size();
-  EXPECT_EQ(3, initial_size);
-  std::vector<Map<int, int>::iterator> v;
-  for (Map<int, int>::iterator it = map_.begin(); it != map_.end(); ++it) {
-    v.push_back(it);
-  }
-  EXPECT_EQ(initial_size, v.size());
-  for (int i = 0; map_.size() <= initial_size * 20; i++) {
-    map_[i] = 0;
-  }
-  const int larger_size = map_.size();
-  // We've greatly increased the size of the map, so it is highly likely that
-  // the following will corrupt m if erase() doesn't properly revalidate
-  // iterators passed to it.  Finishing this routine without crashing indicates
-  // success.
-  for (int i = 0; i < v.size(); i++) {
-    map_.erase(v[i]);
-  }
-  EXPECT_EQ(larger_size - v.size(), map_.size());
-}
-
-template <typename T>
-bool IsConstHelper(T& /*t*/) {  // NOLINT. We want to catch non-const refs here.
-  return false;
-}
-template <typename T>
-bool IsConstHelper(const T& /*t*/) {
-  return true;
-}
-
-TEST_F(MapImplTest, IteratorConstness) {
-  map_[0] = 0;
-  EXPECT_TRUE(IsConstHelper(*map_.cbegin()));
-  EXPECT_TRUE(IsConstHelper(*const_map_.begin()));
-  EXPECT_FALSE(IsConstHelper(*map_.begin()));
-}
-
-bool IsForwardIteratorHelper(std::forward_iterator_tag /*tag*/) { return true; }
-
-TEST_F(MapImplTest, IteratorCategory) {
-  EXPECT_TRUE(IsForwardIteratorHelper(
-      std::iterator_traits<Map<int, int>::iterator>::iterator_category()));
-  EXPECT_TRUE(IsForwardIteratorHelper(
-      std::iterator_traits<
-          Map<int, int>::const_iterator>::iterator_category()));
-}
-
-TEST_F(MapImplTest, InsertSingleLValue) {
-  int32_t key = 0;
-  int32_t value1 = 100;
-  int32_t value2 = 101;
-
-  // Insert a non-existing key.
-  Map<int32_t, int32_t>::value_type v1(key, value1);
-  std::pair<Map<int32_t, int32_t>::iterator, bool> result1 = map_.insert(v1);
-  ExpectSingleElement(key, value1);
-
-  Map<int32_t, int32_t>::iterator it1 = result1.first;
-  EXPECT_EQ(key, it1->first);
-  EXPECT_EQ(value1, it1->second);
-  EXPECT_TRUE(result1.second);
-
-  // Insert an existing key.
-  Map<int32_t, int32_t>::value_type v2(key, value2);
-  std::pair<Map<int32_t, int32_t>::iterator, bool> result2 = map_.insert(v2);
-  ExpectSingleElement(key, value1);
-
-  Map<int32_t, int32_t>::iterator it2 = result2.first;
-  EXPECT_TRUE(it1 == it2);
-  EXPECT_FALSE(result2.second);
-}
-
-TEST_F(MapImplTest, InsertSingleRValue) {
-  int32_t key = 0;
-  int32_t value1 = 100;
-  int32_t value2 = 101;
-
-  // Insert a non-existing key.
-  std::pair<Map<int32_t, int32_t>::iterator, bool> result1 =
-      map_.insert(Map<int32_t, int32_t>::value_type(key, value1));
-  ExpectSingleElement(key, value1);
-
-  Map<int32_t, int32_t>::iterator it1 = result1.first;
-  EXPECT_EQ(key, it1->first);
-  EXPECT_EQ(value1, it1->second);
-  EXPECT_TRUE(result1.second);
-
-  // Insert an existing key.
-  std::pair<Map<int32_t, int32_t>::iterator, bool> result2 =
-      map_.insert(Map<int32_t, int32_t>::value_type(key, value2));
-  ExpectSingleElement(key, value1);
-
-  Map<int32_t, int32_t>::iterator it2 = result2.first;
-  EXPECT_TRUE(it1 == it2);
-  EXPECT_FALSE(result2.second);
-}
-
-TEST_F(MapImplTest, TryEmplace) {
-  using ::testing::Pair;
-  using ::testing::UnorderedElementsAre;
-
-  Map<int32_t, std::string> m;
-
-  m.try_emplace(1, "one");
-  EXPECT_EQ(m.size(), 1);
-
-  const int32_t key = 42;
-  m.try_emplace(key, 3, 'a');
-  m.try_emplace(2, std::string("two"));
-  EXPECT_THAT(
-      m, UnorderedElementsAre(Pair(1, "one"), Pair(2, "two"), Pair(42, "aaa")));
-}
-
-TEST_F(MapImplTest, Emplace) {
-  using ::testing::Pair;
-  using ::testing::UnorderedElementsAre;
-
-  Map<int32_t, std::string> m;
-
-  m.emplace(1, "one");
-  EXPECT_EQ(m.size(), 1);
-
-  const int32_t key = 42;
-  m.emplace(key, "aaa");
-  m.emplace(2, std::string("two"));
-  EXPECT_THAT(
-      m, UnorderedElementsAre(Pair(1, "one"), Pair(2, "two"), Pair(42, "aaa")));
-}
-
-struct CountedInstance {
-  CountedInstance() { ++num_created; }
-  CountedInstance(const CountedInstance&) : CountedInstance() {}
-  CountedInstance(CountedInstance&&) : CountedInstance() {}
-
-  CountedInstance& operator=(const CountedInstance&) {
-    ++num_assigned;
-    return *this;
-  }
-
-  explicit CountedInstance(int x) : CountedInstance() {}
-
-  static int num_created;
-  static int num_assigned;
-};
-
-int CountedInstance::num_created = 0;
-int CountedInstance::num_assigned = 0;
-
-TEST_F(MapImplTest, TryEmplaceExisting) {
-  Map<int32_t, CountedInstance> m;
-
-  m.try_emplace(1, 1);
-  ASSERT_EQ(m.size(), 1);
-
-  CountedInstance::num_created = 0;
-  CountedInstance::num_assigned = 0;
-  m.try_emplace(1, 123);
-  EXPECT_EQ(m.size(), 1);
-  EXPECT_EQ(CountedInstance::num_created, 0);
-  EXPECT_EQ(CountedInstance::num_assigned, 0);
-}
-
-struct ArenaConstructible {
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-
-  ArenaConstructible() = default;
-  ArenaConstructible(const ArenaConstructible&) = default;
-  ArenaConstructible(Arena*) : ArenaConstructible() {}
-
-  ArenaConstructible& operator=(const ArenaConstructible&) = default;
-
-  explicit ArenaConstructible(int) : ArenaConstructible() {}
-
-  Arena* arena() const { return nullptr; }
-
-  CountedInstance unused;
-};
-
-TEST_F(MapImplTest, TryEmplaceArenaConstructible) {
-  ASSERT_TRUE(Arena::is_arena_constructable<ArenaConstructible>::value);
-
-  ArenaConstructible v1, v2;
-
-  Map<int32_t, ArenaConstructible> m;
-
-  // "default" construction
-  CountedInstance::num_created = 0;
-  CountedInstance::num_assigned = 0;
-  m.try_emplace(1);
-  EXPECT_EQ(m.size(), 1);
-  EXPECT_EQ(CountedInstance::num_created, 1);
-  EXPECT_EQ(CountedInstance::num_assigned, 0);
-
-  // "default" construction + copy assignment
-  CountedInstance::num_created = 0;
-  CountedInstance::num_assigned = 0;
-  m.try_emplace(2, v1);
-  EXPECT_EQ(m.size(), 2);
-  EXPECT_EQ(CountedInstance::num_created, 1);
-  EXPECT_EQ(CountedInstance::num_assigned, 1);
-
-  // "default" construction + move assignment
-  CountedInstance::num_created = 0;
-  CountedInstance::num_assigned = 0;
-  m.try_emplace(3, std::move(v2));
-  EXPECT_EQ(m.size(), 3);
-  EXPECT_EQ(CountedInstance::num_created, 1);
-  EXPECT_EQ(CountedInstance::num_assigned, 1);
-
-  // "default" construction + in-place temporary + move assignment
-  CountedInstance::num_created = 0;
-  CountedInstance::num_assigned = 0;
-  m.try_emplace(4, 239);
-  EXPECT_EQ(m.size(), 4);
-  EXPECT_EQ(CountedInstance::num_created, 2);
-  EXPECT_EQ(CountedInstance::num_assigned, 1);
-}
-
-TEST_F(MapImplTest, TryEmplaceExistingArenaConstructible) {
-  ASSERT_TRUE(Arena::is_arena_constructable<ArenaConstructible>::value);
-
-  Map<int32_t, ArenaConstructible> m;
-
-  m.try_emplace(1, 1);
-  ASSERT_EQ(m.size(), 1);
-
-  CountedInstance::num_created = 0;
-  CountedInstance::num_assigned = 0;
-  m.try_emplace(1, 123);
-  EXPECT_EQ(m.size(), 1);
-  EXPECT_EQ(CountedInstance::num_created, 0);
-  EXPECT_EQ(CountedInstance::num_assigned, 0);
-}
-
-TEST_F(MapImplTest, EmplaceSingle) {
-  int32_t key = 0;
-  int32_t value1 = 100;
-  int32_t value2 = 101;
-
-  // Emplace a non-existing key.
-  auto result1 = map_.emplace(key, value1);
-  ExpectSingleElement(key, value1);
-
-  Map<int32_t, int32_t>::iterator it1 = result1.first;
-  EXPECT_EQ(key, it1->first);
-  EXPECT_EQ(value1, it1->second);
-  EXPECT_TRUE(result1.second);
-
-  // Emplace an existing key.
-  auto result2 = map_.emplace(key, value2);
-  ExpectSingleElement(key, value1);
-
-  Map<int32_t, int32_t>::iterator it2 = result2.first;
-  EXPECT_TRUE(it1 == it2);
-  EXPECT_FALSE(result2.second);
-}
-
-TEST_F(MapImplTest, InsertByIterator) {
-  int32_t key1 = 0;
-  int32_t key2 = 1;
-  int32_t value1a = 100;
-  int32_t value1b = 101;
-  int32_t value2a = 200;
-  int32_t value2b = 201;
-
-  std::map<int32_t, int32_t> map1;
-  map1[key1] = value1a;
-  map1[key2] = value2a;
-
-  map_.insert(map1.begin(), map1.end());
-  ExpectElements(map1);
-
-  std::map<int32_t, int32_t> map2;
-  map2[key1] = value1b;
-  map2[key2] = value2b;
-
-  map_.insert(map2.begin(), map2.end());
-  ExpectElements(map1);
-}
-
-TEST_F(MapImplTest, InsertByInitializerList) {
-  map_.insert({{1, 100}, {2, 200}});
-  ExpectElements({{1, 100}, {2, 200}});
-
-  map_.insert({{2, 201}, {3, 301}});
-  ExpectElements({{1, 100}, {2, 200}, {3, 301}});
-}
-
-TEST_F(MapImplTest, EraseSingleByKey) {
-  int32_t key = 0;
-  int32_t value = 100;
-
-  map_[key] = value;
-  ExpectSingleElement(key, value);
-
-  // Erase an existing key.
-  EXPECT_EQ(1, map_.erase(key));
-  EXPECT_TRUE(map_.empty());
-  EXPECT_EQ(0, map_.size());
-  EXPECT_TRUE(map_.end() == map_.find(key));
-  EXPECT_TRUE(map_.begin() == map_.end());
-
-  // Erase a non-existing key.
-  EXPECT_EQ(0, map_.erase(key));
-}
-
-TEST_F(MapImplTest, EraseMutipleByKey) {
-  // erase in one specific order to trigger corner cases
-  for (int i = 0; i < 5; i++) {
-    map_[i] = i;
-  }
-
-  map_.erase(0);
-  EXPECT_EQ(4, map_.size());
-  EXPECT_TRUE(map_.end() == map_.find(0));
-
-  map_.erase(1);
-  EXPECT_EQ(3, map_.size());
-  EXPECT_TRUE(map_.end() == map_.find(1));
-
-  map_.erase(3);
-  EXPECT_EQ(2, map_.size());
-  EXPECT_TRUE(map_.end() == map_.find(3));
-
-  map_.erase(4);
-  EXPECT_EQ(1, map_.size());
-  EXPECT_TRUE(map_.end() == map_.find(4));
-
-  map_.erase(2);
-  EXPECT_EQ(0, map_.size());
-  EXPECT_TRUE(map_.end() == map_.find(2));
-}
-
-TEST_F(MapImplTest, EraseSingleByIterator) {
-  int32_t key = 0;
-  int32_t value = 100;
-
-  map_[key] = value;
-  ExpectSingleElement(key, value);
-
-  Map<int32_t, int32_t>::iterator it = map_.find(key);
-  map_.erase(it);
-  EXPECT_TRUE(map_.empty());
-  EXPECT_EQ(0, map_.size());
-  EXPECT_TRUE(map_.end() == map_.find(key));
-  EXPECT_TRUE(map_.begin() == map_.end());
-}
-
-TEST_F(MapImplTest, ValidIteratorAfterErase) {
-  for (int i = 0; i < 10; i++) {
-    map_[i] = i;
-  }
-
-  int count = 0;
-
-  for (Map<int32_t, int32_t>::iterator it = map_.begin(); it != map_.end();) {
-    count++;
-    if (it->first % 2 == 1) {
-      map_.erase(it++);
-    } else {
-      ++it;
-    }
-  }
-
-  EXPECT_EQ(10, count);
-  EXPECT_EQ(5, map_.size());
-}
-
-TEST_F(MapImplTest, EraseByIterator) {
-  int32_t key1 = 0;
-  int32_t key2 = 1;
-  int32_t value1 = 100;
-  int32_t value2 = 101;
-
-  std::map<int32_t, int32_t> map;
-  map[key1] = value1;
-  map[key2] = value2;
-
-  map_.insert(map.begin(), map.end());
-  ExpectElements(map);
-
-  map_.erase(map_.begin(), map_.end());
-  EXPECT_TRUE(map_.empty());
-  EXPECT_EQ(0, map_.size());
-  EXPECT_TRUE(map_.end() == map_.find(key1));
-  EXPECT_TRUE(map_.end() == map_.find(key2));
-  EXPECT_TRUE(map_.begin() == map_.end());
-}
-
-TEST_F(MapImplTest, Clear) {
-  int32_t key = 0;
-  int32_t value = 100;
-
-  map_[key] = value;
-  ExpectSingleElement(key, value);
-
-  map_.clear();
-
-  EXPECT_TRUE(map_.empty());
-  EXPECT_EQ(0, map_.size());
-  EXPECT_TRUE(map_.end() == map_.find(key));
-  EXPECT_TRUE(map_.begin() == map_.end());
-}
-
-static void CopyConstructorHelper(Arena* arena, Map<int32_t, int32_t>* m) {
-  int32_t key1 = 0;
-  int32_t key2 = 1;
-  int32_t value1 = 100;
-  int32_t value2 = 101;
-
-  std::map<int32_t, int32_t> map;
-  map[key1] = value1;
-  map[key2] = value2;
-
-  m->insert(map.begin(), map.end());
-
-  Map<int32_t, int32_t> other(*m);
-
-  EXPECT_EQ(2, other.size());
-  EXPECT_EQ(value1, other.at(key1));
-  EXPECT_EQ(value2, other.at(key2));
-}
-
-TEST_F(MapImplTest, CopyConstructorWithArena) {
-  Arena a;
-  CopyConstructorHelper(&a, &map_);
-}
-
-TEST_F(MapImplTest, CopyConstructorWithoutArena) {
-  CopyConstructorHelper(nullptr, &map_);
-}
-
-TEST_F(MapImplTest, IterConstructor) {
-  int32_t key1 = 0;
-  int32_t key2 = 1;
-  int32_t value1 = 100;
-  int32_t value2 = 101;
-
-  std::map<int32_t, int32_t> map;
-  map[key1] = value1;
-  map[key2] = value2;
-
-  Map<int32_t, int32_t> new_map(map.begin(), map.end());
-
-  EXPECT_EQ(2, new_map.size());
-  EXPECT_EQ(value1, new_map.at(key1));
-  EXPECT_EQ(value2, new_map.at(key2));
-}
-
-TEST_F(MapImplTest, Assigner) {
-  int32_t key1 = 0;
-  int32_t key2 = 1;
-  int32_t value1 = 100;
-  int32_t value2 = 101;
-
-  std::map<int32_t, int32_t> map;
-  map[key1] = value1;
-  map[key2] = value2;
-
-  map_.insert(map.begin(), map.end());
-
-  Map<int32_t, int32_t> other;
-  int32_t key_other = 123;
-  int32_t value_other = 321;
-  other[key_other] = value_other;
-  EXPECT_EQ(1, other.size());
-
-  other = map_;
-
-  EXPECT_EQ(2, other.size());
-  EXPECT_EQ(value1, other.at(key1));
-  EXPECT_EQ(value2, other.at(key2));
-  EXPECT_TRUE(other.find(key_other) == other.end());
-
-  // Self assign
-  other = *&other;  // Avoid -Wself-assign.
-  EXPECT_EQ(2, other.size());
-  EXPECT_EQ(value1, other.at(key1));
-  EXPECT_EQ(value2, other.at(key2));
-}
-
-TEST_F(MapImplTest, Rehash) {
-  const int test_size = 50;
-  std::map<int32_t, int32_t> reference_map;
-  for (int i = 0; i < test_size; i++) {
-    reference_map[i] = i;
-  }
-  for (int i = 0; i < test_size; i++) {
-    map_[i] = reference_map[i];
-    EXPECT_EQ(reference_map[i], map_[i]);
-  }
-  for (int i = 0; i < test_size; i++) {
-    map_.erase(i);
-    EXPECT_TRUE(map_.end() == map_.find(i));
-  }
-  EXPECT_TRUE(map_.empty());
-}
-
-TEST_F(MapImplTest, EqualRange) {
-  int key = 100, key_missing = 101;
-  map_[key] = 100;
-
-  std::pair<Map<int32_t, int32_t>::iterator, Map<int32_t, int32_t>::iterator>
-      range = map_.equal_range(key);
-  EXPECT_TRUE(map_.find(key) == range.first);
-  EXPECT_TRUE(++map_.find(key) == range.second);
-
-  range = map_.equal_range(key_missing);
-  EXPECT_TRUE(map_.end() == range.first);
-  EXPECT_TRUE(map_.end() == range.second);
-
-  std::pair<Map<int32_t, int32_t>::const_iterator,
-            Map<int32_t, int32_t>::const_iterator>
-      const_range = const_map_.equal_range(key);
-  EXPECT_TRUE(const_map_.find(key) == const_range.first);
-  EXPECT_TRUE(++const_map_.find(key) == const_range.second);
-
-  const_range = const_map_.equal_range(key_missing);
-  EXPECT_TRUE(const_map_.end() == const_range.first);
-  EXPECT_TRUE(const_map_.end() == const_range.second);
-}
-
-TEST_F(MapImplTest, ConvertToStdMap) {
-  map_[100] = 101;
-  std::map<int32_t, int32_t> std_map(map_.begin(), map_.end());
-  EXPECT_EQ(1, std_map.size());
-  EXPECT_EQ(101, std_map[100]);
-}
-
-TEST_F(MapImplTest, ConvertToStdVectorOfPairs) {
-  map_[100] = 101;
-  std::vector<std::pair<int32_t, int32_t>> std_vec(map_.begin(), map_.end());
-  EXPECT_EQ(1, std_vec.size());
-  EXPECT_EQ(100, std_vec[0].first);
-  EXPECT_EQ(101, std_vec[0].second);
-}
-
-TEST_F(MapImplTest, SwapBasic) {
-  Map<int32_t, int32_t> another;
-  map_[9398] = 41999;
-  another[9398] = 41999;
-  another[8070] = 42056;
-  another.swap(map_);
-  EXPECT_THAT(another,
-              testing::UnorderedElementsAre(testing::Pair(9398, 41999)));
-  EXPECT_THAT(map_, testing::UnorderedElementsAre(testing::Pair(8070, 42056),
-                                                  testing::Pair(9398, 41999)));
-}
-
-TEST_F(MapImplTest, SwapArena) {
-  Arena arena1, arena2;
-  Map<int32_t, int32_t> m1(&arena1);
-  Map<int32_t, int32_t> m2(&arena2);
-  map_[9398] = 41999;
-  m1[9398] = 41999;
-  m1[8070] = 42056;
-  m2[10244] = 10247;
-  m2[8070] = 42056;
-  m1.swap(map_);
-  EXPECT_THAT(m1, testing::UnorderedElementsAre(testing::Pair(9398, 41999)));
-  EXPECT_THAT(map_, testing::UnorderedElementsAre(testing::Pair(8070, 42056),
-                                                  testing::Pair(9398, 41999)));
-  m2.swap(m1);
-  EXPECT_THAT(m1, testing::UnorderedElementsAre(testing::Pair(8070, 42056),
-                                                testing::Pair(10244, 10247)));
-  EXPECT_THAT(m2, testing::UnorderedElementsAre(testing::Pair(9398, 41999)));
-}
-
-TEST_F(MapImplTest, SwapFieldArenaReflection) {
-  MapReflectionTester reflection_tester(UNITTEST::TestMap::descriptor());
-  Arena arena;
-
-  {
-    // Tests filled lfs and empty rhs.
-    TestMap rhs;
-
-    {
-      // Use local_arena to allocate lhs to trigger use-after-free error.
-      Arena local_arena;
-      auto* lhs = Arena::CreateMessage<TestMap>(&local_arena);
-      const auto* reflection = lhs->GetReflection();
-      std::vector<const FieldDescriptor*> fields;
-
-      reflection_tester.SetMapFieldsViaReflection(lhs);
-      reflection->ListFields(*lhs, &fields);
-
-      reflection->SwapFields(lhs, &rhs, fields);
-
-      reflection_tester.ExpectClearViaReflection(*lhs);
-    }
-
-    reflection_tester.ExpectMapFieldsSetViaReflection(rhs);
-  }
-}
-
-TEST_F(MapImplTest, CopyAssignMapIterator) {
-  TestMap message;
-  MapReflectionTester reflection_tester(UNITTEST::TestMap::descriptor());
-  reflection_tester.SetMapFieldsViaMapReflection(&message);
-  MapIterator it1 = reflection_tester.MapBegin(&message, "map_int32_int32");
-  MapIterator it2 = reflection_tester.MapEnd(&message, "map_int32_int32");
-  it2 = it1;
-  EXPECT_EQ(it1.GetKey().GetInt32Value(), it2.GetKey().GetInt32Value());
-}
-
-TEST_F(MapImplTest, SpaceUsed) {
-  constexpr size_t kMinCap = 8;
-
-  Map<int32_t, int32_t> m;
-  // An newly constructed map should have no space used.
-  EXPECT_EQ(m.SpaceUsedExcludingSelfLong(), 0);
-
-  size_t capacity = kMinCap;
-  for (int i = 0; i < 100; ++i) {
-    m[i];
-    static constexpr double kMaxLoadFactor = .75;
-    if (m.size() >= capacity * kMaxLoadFactor) {
-      capacity *= 2;
-    }
-    EXPECT_EQ(
-        m.SpaceUsedExcludingSelfLong(),
-        sizeof(void*) * capacity +
-            m.size() * sizeof(std::pair<std::pair<int32_t, int32_t>, void*>));
-  }
-
-  // Test string, and non-scalar keys.
-  Map<std::string, int32_t> m2;
-  std::string str = "Some arbitrarily large string";
-  m2[str] = 1;
-  EXPECT_EQ(m2.SpaceUsedExcludingSelfLong(),
-            sizeof(void*) * kMinCap +
-                sizeof(std::pair<std::pair<std::string, int32_t>, void*>) +
-                internal::StringSpaceUsedExcludingSelfLong(str));
-
-  // Test messages, and non-scalar values.
-  Map<int32_t, TestAllTypes> m3;
-  m3[0].set_optional_string(str);
-  EXPECT_EQ(m3.SpaceUsedExcludingSelfLong(),
-            sizeof(void*) * kMinCap +
-                sizeof(std::pair<std::pair<int32_t, TestAllTypes>, void*>) +
-                m3[0].SpaceUsedLong() - sizeof(m3[0]));
-}
-
-// Attempts to verify that a map with keys a and b has a random ordering. This
-// function returns true if it succeeds in observing both possible orderings.
-bool MapOrderingIsRandom(int a, int b) {
-  bool saw_a_first = false;
-  bool saw_b_first = false;
-  std::vector<Map<int32_t, int32_t>> v(50);
-  for (int i = 0; i < 50; ++i) {
-    Map<int32_t, int32_t>& m = v[i];
-    m[a] = 0;
-    m[b] = 0;
-    int32_t first_element = m.begin()->first;
-    if (first_element == a) saw_a_first = true;
-    if (first_element == b) saw_b_first = true;
-    if (saw_a_first && saw_b_first) {
-      return true;
-    }
-  }
-  return false;
-}
-
-// This test verifies that the iteration order is reasonably random even for
-// small maps.
-TEST_F(MapImplTest, RandomOrdering) {
-  for (int i = 0; i < 10; ++i) {
-    for (int j = i + 1; j < 10; ++j) {
-      EXPECT_TRUE(MapOrderingIsRandom(i, j))
-          << "Map with keys " << i << " and " << j
-          << " has deterministic ordering";
-    }
-  }
-}
-
-template <typename Key>
-void TestTransparent(const Key& key, const Key& miss_key) {
-  Map<std::string, int> m;
-  const auto& cm = m;
-
-  m.insert({"ABC", 1});
-
-  const auto abc_it = m.begin();
-
-  m.insert({"DEF", 2});
-
-  using testing::Pair;
-  using testing::UnorderedElementsAre;
-
-  EXPECT_EQ(m.at(key), 1);
-  EXPECT_EQ(cm.at(key), 1);
-
-#ifdef PROTOBUF_HAS_DEATH_TEST
-  EXPECT_DEATH(m.at(miss_key), "");
-  EXPECT_DEATH(cm.at(miss_key), "");
-#endif  // PROTOBUF_HAS_DEATH_TEST
-
-  EXPECT_EQ(m.count(key), 1);
-  EXPECT_EQ(cm.count(key), 1);
-  EXPECT_EQ(m.count(miss_key), 0);
-  EXPECT_EQ(cm.count(miss_key), 0);
-
-  EXPECT_EQ(m.find(key), abc_it);
-  EXPECT_EQ(cm.find(key), abc_it);
-  EXPECT_EQ(m.find(miss_key), m.end());
-  EXPECT_EQ(cm.find(miss_key), cm.end());
-
-  EXPECT_TRUE(m.contains(key));
-  EXPECT_TRUE(cm.contains(key));
-  EXPECT_FALSE(m.contains(miss_key));
-  EXPECT_FALSE(cm.contains(miss_key));
-
-  EXPECT_THAT(m.equal_range(key), Pair(abc_it, std::next(abc_it)));
-  EXPECT_THAT(cm.equal_range(key), Pair(abc_it, std::next(abc_it)));
-  EXPECT_THAT(m.equal_range(miss_key), Pair(m.end(), m.end()));
-  EXPECT_THAT(cm.equal_range(miss_key), Pair(m.end(), m.end()));
-
-  EXPECT_THAT(m, UnorderedElementsAre(Pair("ABC", 1), Pair("DEF", 2)));
-  EXPECT_EQ(m.erase(key), 1);
-  EXPECT_THAT(m, UnorderedElementsAre(Pair("DEF", 2)));
-  EXPECT_EQ(m.erase(key), 0);
-  EXPECT_EQ(m.erase(miss_key), 0);
-  EXPECT_THAT(m, UnorderedElementsAre(Pair("DEF", 2)));
-
-  m[key];
-  EXPECT_THAT(m, UnorderedElementsAre(Pair("ABC", 0), Pair("DEF", 2)));
-  m[key] = 1;
-  EXPECT_THAT(m, UnorderedElementsAre(Pair("ABC", 1), Pair("DEF", 2)));
-}
-
-TEST_F(MapImplTest, TransparentLookupForString) {
-  TestTransparent("ABC", "LKJ");
-  TestTransparent(std::string("ABC"), std::string("LKJ"));
-#if defined(__cpp_lib_string_view)
-  TestTransparent(std::string_view("ABC"), std::string_view("LKJ"));
-#endif  // defined(__cpp_lib_string_view)
-
-  // std::reference_wrapper
-  std::string abc = "ABC", lkj = "LKJ";
-  TestTransparent(std::ref(abc), std::ref(lkj));
-  TestTransparent(std::cref(abc), std::cref(lkj));
-}
-
-TEST_F(MapImplTest, ConstInit) {
-  PROTOBUF_CONSTINIT static Map<int, int> map;  // NOLINT
-  EXPECT_TRUE(map.empty());
-}
-
-// Map Field Reflection Test ========================================
-
-static int Func(int i, int j) { return i * j; }
-
-static std::string StrFunc(int i, int j) { return StrCat(Func(i, j)); }
-
-static int Int(const std::string& value) {
-  int result = 0;
-  std::istringstream(value) >> result;
-  return result;
-}
-
-}  // namespace
-
-// This class is a friend, so no anonymous namespace.
-class MapFieldReflectionTest : public testing::Test {
- protected:
-  typedef FieldDescriptor FD;
-
-  int MapSize(const Reflection* reflection, const FieldDescriptor* field,
-              const Message& message) {
-    return reflection->MapSize(message, field);
-  }
-};
-
-namespace {
-
-TEST_F(MapFieldReflectionTest, RegularFields) {
-  TestMap message;
-  const Reflection* refl = message.GetReflection();
-  const Descriptor* desc = message.GetDescriptor();
-
-  Map<int32_t, int32_t>* map_int32_int32 = message.mutable_map_int32_int32();
-  Map<int32_t, double>* map_int32_double = message.mutable_map_int32_double();
-  Map<std::string, std::string>* map_string_string =
-      message.mutable_map_string_string();
-  Map<int32_t, ForeignMessage>* map_int32_foreign_message =
-      message.mutable_map_int32_foreign_message();
-
-  for (int i = 0; i < 10; ++i) {
-    (*map_int32_int32)[i] = Func(i, 1);
-    (*map_int32_double)[i] = Func(i, 2);
-    (*map_string_string)[StrFunc(i, 1)] = StrFunc(i, 5);
-    (*map_int32_foreign_message)[i].set_c(Func(i, 6));
-  }
-
-  // Get FieldDescriptors for all the fields of interest.
-  const FieldDescriptor* fd_map_int32_int32 =
-      desc->FindFieldByName("map_int32_int32");
-  const FieldDescriptor* fd_map_int32_double =
-      desc->FindFieldByName("map_int32_double");
-  const FieldDescriptor* fd_map_string_string =
-      desc->FindFieldByName("map_string_string");
-  const FieldDescriptor* fd_map_int32_foreign_message =
-      desc->FindFieldByName("map_int32_foreign_message");
-
-  const FieldDescriptor* fd_map_int32_in32_key =
-      fd_map_int32_int32->message_type()->map_key();
-  const FieldDescriptor* fd_map_int32_in32_value =
-      fd_map_int32_int32->message_type()->map_value();
-  const FieldDescriptor* fd_map_int32_double_key =
-      fd_map_int32_double->message_type()->map_key();
-  const FieldDescriptor* fd_map_int32_double_value =
-      fd_map_int32_double->message_type()->map_value();
-  const FieldDescriptor* fd_map_string_string_key =
-      fd_map_string_string->message_type()->map_key();
-  const FieldDescriptor* fd_map_string_string_value =
-      fd_map_string_string->message_type()->map_value();
-  const FieldDescriptor* fd_map_int32_foreign_message_key =
-      fd_map_int32_foreign_message->message_type()->map_key();
-  const FieldDescriptor* fd_map_int32_foreign_message_value =
-      fd_map_int32_foreign_message->message_type()->map_value();
-
-  // Get RepeatedPtrField objects for all fields of interest.
-  const RepeatedPtrField<Message>& mf_int32_int32 =
-      refl->GetRepeatedPtrField<Message>(message, fd_map_int32_int32);
-  const RepeatedPtrField<Message>& mf_int32_double =
-      refl->GetRepeatedPtrField<Message>(message, fd_map_int32_double);
-  const RepeatedPtrField<Message>& mf_string_string =
-      refl->GetRepeatedPtrField<Message>(message, fd_map_string_string);
-  const RepeatedPtrField<Message>& mf_int32_foreign_message =
-      refl->GetRepeatedPtrField<Message>(message, fd_map_int32_foreign_message);
-
-  // Get mutable RepeatedPtrField objects for all fields of interest.
-  RepeatedPtrField<Message>* mmf_int32_int32 =
-      refl->MutableRepeatedPtrField<Message>(&message, fd_map_int32_int32);
-  RepeatedPtrField<Message>* mmf_int32_double =
-      refl->MutableRepeatedPtrField<Message>(&message, fd_map_int32_double);
-  RepeatedPtrField<Message>* mmf_string_string =
-      refl->MutableRepeatedPtrField<Message>(&message, fd_map_string_string);
-  RepeatedPtrField<Message>* mmf_int32_foreign_message =
-      refl->MutableRepeatedPtrField<Message>(&message,
-                                             fd_map_int32_foreign_message);
-
-  // Make sure we can do gets through the RepeatedPtrField objects.
-  for (int i = 0; i < 10; ++i) {
-    {
-      // Check gets through const objects.
-      const Message& message_int32_int32 = mf_int32_int32.Get(i);
-      int32_t key_int32_int32 = message_int32_int32.GetReflection()->GetInt32(
-          message_int32_int32, fd_map_int32_in32_key);
-      int32_t value_int32_int32 = message_int32_int32.GetReflection()->GetInt32(
-          message_int32_int32, fd_map_int32_in32_value);
-      EXPECT_EQ(value_int32_int32, Func(key_int32_int32, 1));
-
-      const Message& message_int32_double = mf_int32_double.Get(i);
-      int32_t key_int32_double = message_int32_double.GetReflection()->GetInt32(
-          message_int32_double, fd_map_int32_double_key);
-      double value_int32_double =
-          message_int32_double.GetReflection()->GetDouble(
-              message_int32_double, fd_map_int32_double_value);
-      EXPECT_EQ(value_int32_double, Func(key_int32_double, 2));
-
-      const Message& message_string_string = mf_string_string.Get(i);
-      std::string key_string_string =
-          message_string_string.GetReflection()->GetString(
-              message_string_string, fd_map_string_string_key);
-      std::string value_string_string =
-          message_string_string.GetReflection()->GetString(
-              message_string_string, fd_map_string_string_value);
-      EXPECT_EQ(value_string_string, StrFunc(Int(key_string_string), 5));
-
-      const Message& message_int32_message = mf_int32_foreign_message.Get(i);
-      int32_t key_int32_message =
-          message_int32_message.GetReflection()->GetInt32(
-              message_int32_message, fd_map_int32_foreign_message_key);
-      const ForeignMessage& value_int32_message =
-          down_cast<const ForeignMessage&>(
-              message_int32_message.GetReflection()->GetMessage(
-                  message_int32_message, fd_map_int32_foreign_message_value));
-      EXPECT_EQ(value_int32_message.c(), Func(key_int32_message, 6));
-    }
-
-    {
-      // Check gets through mutable objects.
-      const Message& message_int32_int32 = mmf_int32_int32->Get(i);
-      int32_t key_int32_int32 = message_int32_int32.GetReflection()->GetInt32(
-          message_int32_int32, fd_map_int32_in32_key);
-      int32_t value_int32_int32 = message_int32_int32.GetReflection()->GetInt32(
-          message_int32_int32, fd_map_int32_in32_value);
-      EXPECT_EQ(value_int32_int32, Func(key_int32_int32, 1));
-
-      const Message& message_int32_double = mmf_int32_double->Get(i);
-      int32_t key_int32_double = message_int32_double.GetReflection()->GetInt32(
-          message_int32_double, fd_map_int32_double_key);
-      double value_int32_double =
-          message_int32_double.GetReflection()->GetDouble(
-              message_int32_double, fd_map_int32_double_value);
-      EXPECT_EQ(value_int32_double, Func(key_int32_double, 2));
-
-      const Message& message_string_string = mmf_string_string->Get(i);
-      std::string key_string_string =
-          message_string_string.GetReflection()->GetString(
-              message_string_string, fd_map_string_string_key);
-      std::string value_string_string =
-          message_string_string.GetReflection()->GetString(
-              message_string_string, fd_map_string_string_value);
-      EXPECT_EQ(value_string_string, StrFunc(Int(key_string_string), 5));
-
-      const Message& message_int32_message = mmf_int32_foreign_message->Get(i);
-      int32_t key_int32_message =
-          message_int32_message.GetReflection()->GetInt32(
-              message_int32_message, fd_map_int32_foreign_message_key);
-      const ForeignMessage& value_int32_message =
-          down_cast<const ForeignMessage&>(
-              message_int32_message.GetReflection()->GetMessage(
-                  message_int32_message, fd_map_int32_foreign_message_value));
-      EXPECT_EQ(value_int32_message.c(), Func(key_int32_message, 6));
-    }
-  }
-
-  // Do sets through the RepeatedPtrField objects.
-  for (int i = 0; i < 10; i++) {
-    {
-      Message* message_int32_int32 = mmf_int32_int32->Mutable(i);
-      int32_t key_int32_int32 = message_int32_int32->GetReflection()->GetInt32(
-          *message_int32_int32, fd_map_int32_in32_key);
-      message_int32_int32->GetReflection()->SetInt32(message_int32_int32,
-                                                     fd_map_int32_in32_value,
-                                                     Func(key_int32_int32, -1));
-
-      Message* message_int32_double = mmf_int32_double->Mutable(i);
-      int32_t key_int32_double =
-          message_int32_double->GetReflection()->GetInt32(
-              *message_int32_double, fd_map_int32_double_key);
-      message_int32_double->GetReflection()->SetDouble(
-          message_int32_double, fd_map_int32_double_value,
-          Func(key_int32_double, -2));
-
-      Message* message_string_string = mmf_string_string->Mutable(i);
-      std::string key_string_string =
-          message_string_string->GetReflection()->GetString(
-              *message_string_string, fd_map_string_string_key);
-      message_string_string->GetReflection()->SetString(
-          message_string_string, fd_map_string_string_value,
-          StrFunc(Int(key_string_string), -5));
-
-      Message* message_int32_message = mmf_int32_foreign_message->Mutable(i);
-      int32_t key_int32_message =
-          message_int32_message->GetReflection()->GetInt32(
-              *message_int32_message, fd_map_int32_foreign_message_key);
-      ForeignMessage* value_int32_message = down_cast<ForeignMessage*>(
-          message_int32_message->GetReflection()->MutableMessage(
-              message_int32_message, fd_map_int32_foreign_message_value));
-      value_int32_message->set_c(Func(key_int32_message, -6));
-    }
-  }
-
-  // Check gets through mutable objects.
-  for (int i = 0; i < 10; i++) {
-    EXPECT_EQ(Func(i, -1), message.map_int32_int32().at(i));
-    EXPECT_EQ(Func(i, -2), message.map_int32_double().at(i));
-    EXPECT_EQ(StrFunc(i, -5), message.map_string_string().at(StrFunc(i, 1)));
-    EXPECT_EQ(Func(i, -6), message.map_int32_foreign_message().at(i).c());
-  }
-}
-
-TEST_F(MapFieldReflectionTest, RepeatedFieldRefForRegularFields) {
-  TestMap message;
-  const Reflection* refl = message.GetReflection();
-  const Descriptor* desc = message.GetDescriptor();
-
-  Map<int32_t, int32_t>* map_int32_int32 = message.mutable_map_int32_int32();
-  Map<int32_t, double>* map_int32_double = message.mutable_map_int32_double();
-  Map<std::string, std::string>* map_string_string =
-      message.mutable_map_string_string();
-  Map<int32_t, ForeignMessage>* map_int32_foreign_message =
-      message.mutable_map_int32_foreign_message();
-
-  for (int i = 0; i < 10; ++i) {
-    (*map_int32_int32)[i] = Func(i, 1);
-    (*map_int32_double)[i] = Func(i, 2);
-    (*map_string_string)[StrFunc(i, 1)] = StrFunc(i, 5);
-    (*map_int32_foreign_message)[i].set_c(Func(i, 6));
-  }
-
-  // Get FieldDescriptors for all the fields of interest.
-  const FieldDescriptor* fd_map_int32_int32 =
-      desc->FindFieldByName("map_int32_int32");
-  const FieldDescriptor* fd_map_int32_double =
-      desc->FindFieldByName("map_int32_double");
-  const FieldDescriptor* fd_map_string_string =
-      desc->FindFieldByName("map_string_string");
-  const FieldDescriptor* fd_map_int32_foreign_message =
-      desc->FindFieldByName("map_int32_foreign_message");
-
-  const FieldDescriptor* fd_map_int32_in32_key =
-      fd_map_int32_int32->message_type()->map_key();
-  const FieldDescriptor* fd_map_int32_in32_value =
-      fd_map_int32_int32->message_type()->map_value();
-  const FieldDescriptor* fd_map_int32_double_key =
-      fd_map_int32_double->message_type()->map_key();
-  const FieldDescriptor* fd_map_int32_double_value =
-      fd_map_int32_double->message_type()->map_value();
-  const FieldDescriptor* fd_map_string_string_key =
-      fd_map_string_string->message_type()->map_key();
-  const FieldDescriptor* fd_map_string_string_value =
-      fd_map_string_string->message_type()->map_value();
-  const FieldDescriptor* fd_map_int32_foreign_message_key =
-      fd_map_int32_foreign_message->message_type()->map_key();
-  const FieldDescriptor* fd_map_int32_foreign_message_value =
-      fd_map_int32_foreign_message->message_type()->map_value();
-
-  // Get RepeatedFieldRef objects for all fields of interest.
-  const RepeatedFieldRef<Message> mf_int32_int32 =
-      refl->GetRepeatedFieldRef<Message>(message, fd_map_int32_int32);
-  const RepeatedFieldRef<Message> mf_int32_double =
-      refl->GetRepeatedFieldRef<Message>(message, fd_map_int32_double);
-  const RepeatedFieldRef<Message> mf_string_string =
-      refl->GetRepeatedFieldRef<Message>(message, fd_map_string_string);
-  const RepeatedFieldRef<Message> mf_int32_foreign_message =
-      refl->GetRepeatedFieldRef<Message>(message, fd_map_int32_foreign_message);
-
-  // Get mutable RepeatedFieldRef objects for all fields of interest.
-  const MutableRepeatedFieldRef<Message> mmf_int32_int32 =
-      refl->GetMutableRepeatedFieldRef<Message>(&message, fd_map_int32_int32);
-  const MutableRepeatedFieldRef<Message> mmf_int32_double =
-      refl->GetMutableRepeatedFieldRef<Message>(&message, fd_map_int32_double);
-  const MutableRepeatedFieldRef<Message> mmf_string_string =
-      refl->GetMutableRepeatedFieldRef<Message>(&message, fd_map_string_string);
-  const MutableRepeatedFieldRef<Message> mmf_int32_foreign_message =
-      refl->GetMutableRepeatedFieldRef<Message>(&message,
-                                                fd_map_int32_foreign_message);
-
-  // Get entry default instances
-  std::unique_ptr<Message> entry_int32_int32(
-      MessageFactory::generated_factory()
-          ->GetPrototype(fd_map_int32_int32->message_type())
-          ->New(message.GetArena()));
-  std::unique_ptr<Message> entry_int32_double(
-      MessageFactory::generated_factory()
-          ->GetPrototype(fd_map_int32_double->message_type())
-          ->New(message.GetArena()));
-  std::unique_ptr<Message> entry_string_string(
-      MessageFactory::generated_factory()
-          ->GetPrototype(fd_map_string_string->message_type())
-          ->New(message.GetArena()));
-  std::unique_ptr<Message> entry_int32_foreign_message(
-      MessageFactory::generated_factory()
-          ->GetPrototype(fd_map_int32_foreign_message->message_type())
-          ->New(message.GetArena()));
-
-  EXPECT_EQ(10, mf_int32_int32.size());
-  EXPECT_EQ(10, mmf_int32_int32.size());
-  EXPECT_EQ(10, mf_int32_double.size());
-  EXPECT_EQ(10, mmf_int32_double.size());
-  EXPECT_EQ(10, mf_string_string.size());
-  EXPECT_EQ(10, mmf_string_string.size());
-  EXPECT_EQ(10, mf_int32_foreign_message.size());
-  EXPECT_EQ(10, mmf_int32_foreign_message.size());
-
-  EXPECT_FALSE(mf_int32_int32.empty());
-  EXPECT_FALSE(mmf_int32_int32.empty());
-  EXPECT_FALSE(mf_int32_double.empty());
-  EXPECT_FALSE(mmf_int32_double.empty());
-  EXPECT_FALSE(mf_string_string.empty());
-  EXPECT_FALSE(mmf_string_string.empty());
-  EXPECT_FALSE(mf_int32_foreign_message.empty());
-  EXPECT_FALSE(mmf_int32_foreign_message.empty());
-
-  // Make sure we can do gets through the RepeatedFieldRef objects.
-  for (int i = 0; i < 10; ++i) {
-    {
-      // Check gets through const objects.
-      const Message& message_int32_int32 =
-          mf_int32_int32.Get(i, entry_int32_int32.get());
-      int32_t key_int32_int32 = message_int32_int32.GetReflection()->GetInt32(
-          message_int32_int32, fd_map_int32_in32_key);
-      int32_t value_int32_int32 = message_int32_int32.GetReflection()->GetInt32(
-          message_int32_int32, fd_map_int32_in32_value);
-      EXPECT_EQ(value_int32_int32, Func(key_int32_int32, 1));
-
-      const Message& message_int32_double =
-          mf_int32_double.Get(i, entry_int32_double.get());
-      int32_t key_int32_double = message_int32_double.GetReflection()->GetInt32(
-          message_int32_double, fd_map_int32_double_key);
-      double value_int32_double =
-          message_int32_double.GetReflection()->GetDouble(
-              message_int32_double, fd_map_int32_double_value);
-      EXPECT_EQ(value_int32_double, Func(key_int32_double, 2));
-
-      const Message& message_string_string =
-          mf_string_string.Get(i, entry_string_string.get());
-      std::string key_string_string =
-          message_string_string.GetReflection()->GetString(
-              message_string_string, fd_map_string_string_key);
-      std::string value_string_string =
-          message_string_string.GetReflection()->GetString(
-              message_string_string, fd_map_string_string_value);
-      EXPECT_EQ(value_string_string, StrFunc(Int(key_string_string), 5));
-
-      const Message& message_int32_message =
-          mf_int32_foreign_message.Get(i, entry_int32_foreign_message.get());
-      int32_t key_int32_message =
-          message_int32_message.GetReflection()->GetInt32(
-              message_int32_message, fd_map_int32_foreign_message_key);
-      const ForeignMessage& value_int32_message =
-          down_cast<const ForeignMessage&>(
-              message_int32_message.GetReflection()->GetMessage(
-                  message_int32_message, fd_map_int32_foreign_message_value));
-      EXPECT_EQ(value_int32_message.c(), Func(key_int32_message, 6));
-    }
-
-    {
-      // Check gets through mutable objects.
-      const Message& message_int32_int32 =
-          mmf_int32_int32.Get(i, entry_int32_int32.get());
-      int32_t key_int32_int32 = message_int32_int32.GetReflection()->GetInt32(
-          message_int32_int32, fd_map_int32_in32_key);
-      int32_t value_int32_int32 = message_int32_int32.GetReflection()->GetInt32(
-          message_int32_int32, fd_map_int32_in32_value);
-      EXPECT_EQ(value_int32_int32, Func(key_int32_int32, 1));
-
-      const Message& message_int32_double =
-          mmf_int32_double.Get(i, entry_int32_double.get());
-      int32_t key_int32_double = message_int32_double.GetReflection()->GetInt32(
-          message_int32_double, fd_map_int32_double_key);
-      double value_int32_double =
-          message_int32_double.GetReflection()->GetDouble(
-              message_int32_double, fd_map_int32_double_value);
-      EXPECT_EQ(value_int32_double, Func(key_int32_double, 2));
-
-      const Message& message_string_string =
-          mmf_string_string.Get(i, entry_string_string.get());
-      std::string key_string_string =
-          message_string_string.GetReflection()->GetString(
-              message_string_string, fd_map_string_string_key);
-      std::string value_string_string =
-          message_string_string.GetReflection()->GetString(
-              message_string_string, fd_map_string_string_value);
-      EXPECT_EQ(value_string_string, StrFunc(Int(key_string_string), 5));
-
-      const Message& message_int32_message =
-          mmf_int32_foreign_message.Get(i, entry_int32_foreign_message.get());
-      int32_t key_int32_message =
-          message_int32_message.GetReflection()->GetInt32(
-              message_int32_message, fd_map_int32_foreign_message_key);
-      const ForeignMessage& value_int32_message =
-          down_cast<const ForeignMessage&>(
-              message_int32_message.GetReflection()->GetMessage(
-                  message_int32_message, fd_map_int32_foreign_message_value));
-      EXPECT_EQ(value_int32_message.c(), Func(key_int32_message, 6));
-    }
-  }
-
-  // Make sure we can do sets through the RepeatedFieldRef objects.
-  for (int i = 0; i < 10; i++) {
-    const Message& message_int32_int32 =
-        mmf_int32_int32.Get(i, entry_int32_int32.get());
-    int key = message_int32_int32.GetReflection()->GetInt32(
-        message_int32_int32, fd_map_int32_in32_key);
-
-    entry_int32_int32->GetReflection()->SetInt32(
-        entry_int32_int32.get(), fd_map_int32_int32->message_type()->field(0),
-        key);
-    entry_int32_int32->GetReflection()->SetInt32(
-        entry_int32_int32.get(), fd_map_int32_int32->message_type()->field(1),
-        Func(key, -1));
-    entry_int32_double->GetReflection()->SetInt32(
-        entry_int32_double.get(), fd_map_int32_double->message_type()->field(0),
-        key);
-    entry_int32_double->GetReflection()->SetDouble(
-        entry_int32_double.get(), fd_map_int32_double->message_type()->field(1),
-        Func(key, -2));
-    entry_string_string->GetReflection()->SetString(
-        entry_string_string.get(),
-        fd_map_string_string->message_type()->field(0), StrFunc(key, 1));
-    entry_string_string->GetReflection()->SetString(
-        entry_string_string.get(),
-        fd_map_string_string->message_type()->field(1), StrFunc(key, -5));
-    entry_int32_foreign_message->GetReflection()->SetInt32(
-        entry_int32_foreign_message.get(),
-        fd_map_int32_foreign_message->message_type()->field(0), key);
-    Message* value_message =
-        entry_int32_foreign_message->GetReflection()->MutableMessage(
-            entry_int32_foreign_message.get(),
-            fd_map_int32_foreign_message->message_type()->field(1));
-    value_message->GetReflection()->SetInt32(
-        value_message, value_message->GetDescriptor()->FindFieldByName("c"),
-        Func(key, -6));
-
-    mmf_int32_int32.Set(i, *entry_int32_int32);
-    mmf_int32_double.Set(i, *entry_int32_double);
-    mmf_string_string.Set(i, *entry_string_string);
-    mmf_int32_foreign_message.Set(i, *entry_int32_foreign_message);
-  }
-
-  for (int i = 0; i < 10; i++) {
-    EXPECT_EQ(Func(i, -1), message.map_int32_int32().at(i));
-    EXPECT_EQ(Func(i, -2), message.map_int32_double().at(i));
-    EXPECT_EQ(StrFunc(i, -5), message.map_string_string().at(StrFunc(i, 1)));
-    EXPECT_EQ(Func(i, -6), message.map_int32_foreign_message().at(i).c());
-  }
-
-  // Test iterators.
-  {
-    int index = 0;
-    std::unordered_map<int32_t, int32_t> result;
-    for (RepeatedFieldRef<Message>::iterator it = mf_int32_int32.begin();
-         it != mf_int32_int32.end(); ++it) {
-      const Message& message = *it;
-      int32_t key =
-          message.GetReflection()->GetInt32(message, fd_map_int32_in32_key);
-      int32_t value =
-          message.GetReflection()->GetInt32(message, fd_map_int32_in32_value);
-      result[key] = value;
-      ++index;
-    }
-    EXPECT_EQ(10, index);
-    for (std::unordered_map<int32_t, int32_t>::const_iterator it =
-             result.begin();
-         it != result.end(); ++it) {
-      EXPECT_EQ(message.map_int32_int32().at(it->first), it->second);
-    }
-  }
-
-  {
-    int index = 0;
-    std::unordered_map<int32_t, double> result;
-    for (RepeatedFieldRef<Message>::iterator it = mf_int32_double.begin();
-         it != mf_int32_double.end(); ++it) {
-      const Message& message = *it;
-      int32_t key =
-          message.GetReflection()->GetInt32(message, fd_map_int32_double_key);
-      double value = message.GetReflection()->GetDouble(
-          message, fd_map_int32_double_value);
-      result[key] = value;
-      ++index;
-    }
-    EXPECT_EQ(10, index);
-    for (std::unordered_map<int32_t, double>::const_iterator it =
-             result.begin();
-         it != result.end(); ++it) {
-      EXPECT_EQ(message.map_int32_double().at(it->first), it->second);
-    }
-  }
-
-  {
-    int index = 0;
-    std::unordered_map<std::string, std::string> result;
-    for (RepeatedFieldRef<Message>::iterator it = mf_string_string.begin();
-         it != mf_string_string.end(); ++it) {
-      const Message& message = *it;
-      std::string key =
-          message.GetReflection()->GetString(message, fd_map_string_string_key);
-      std::string value = message.GetReflection()->GetString(
-          message, fd_map_string_string_value);
-      result[key] = value;
-      ++index;
-    }
-    EXPECT_EQ(10, index);
-    for (std::unordered_map<std::string, std::string>::const_iterator it =
-             result.begin();
-         it != result.end(); ++it) {
-      EXPECT_EQ(message.map_string_string().at(it->first), it->second);
-    }
-  }
-
-  {
-    int index = 0;
-    std::map<int32_t, ForeignMessage> result;
-    for (RepeatedFieldRef<Message>::iterator it =
-             mf_int32_foreign_message.begin();
-         it != mf_int32_foreign_message.end(); ++it) {
-      const Message& message = *it;
-      int32_t key = message.GetReflection()->GetInt32(
-          message, fd_map_int32_foreign_message_key);
-      const ForeignMessage& sub_message =
-          down_cast<const ForeignMessage&>(message.GetReflection()->GetMessage(
-              message, fd_map_int32_foreign_message_value));
-      result[key].MergeFrom(sub_message);
-      ++index;
-    }
-    EXPECT_EQ(10, index);
-    for (std::map<int32_t, ForeignMessage>::const_iterator it = result.begin();
-         it != result.end(); ++it) {
-      EXPECT_EQ(message.map_int32_foreign_message().at(it->first).c(),
-                it->second.c());
-    }
-  }
-
-  // Test MutableRepeatedFieldRef::Add()
-  entry_int32_int32->GetReflection()->SetInt32(
-      entry_int32_int32.get(), fd_map_int32_int32->message_type()->field(0),
-      4321);
-  entry_int32_int32->GetReflection()->SetInt32(
-      entry_int32_int32.get(), fd_map_int32_int32->message_type()->field(1),
-      1234);
-  mmf_int32_int32.Add(*entry_int32_int32);
-  EXPECT_EQ(1234, message.map_int32_int32().at(4321));
-
-  entry_int32_double->GetReflection()->SetInt32(
-      entry_int32_double.get(), fd_map_int32_double->message_type()->field(0),
-      4321);
-  entry_int32_double->GetReflection()->SetDouble(
-      entry_int32_double.get(), fd_map_int32_double->message_type()->field(1),
-      1234.0);
-  mmf_int32_double.Add(*entry_int32_double);
-  EXPECT_EQ(1234.0, message.map_int32_double().at(4321));
-
-  entry_string_string->GetReflection()->SetString(
-      entry_string_string.get(), fd_map_string_string->message_type()->field(0),
-      "4321");
-  entry_string_string->GetReflection()->SetString(
-      entry_string_string.get(), fd_map_string_string->message_type()->field(1),
-      "1234");
-  mmf_string_string.Add(*entry_string_string);
-  EXPECT_EQ("1234", message.map_string_string().at("4321"));
-
-  entry_int32_foreign_message->GetReflection()->SetInt32(
-      entry_int32_foreign_message.get(),
-      fd_map_int32_foreign_message->message_type()->field(0), 4321);
-  Message* value_message =
-      entry_int32_foreign_message->GetReflection()->MutableMessage(
-          entry_int32_foreign_message.get(),
-          fd_map_int32_foreign_message->message_type()->field(1));
-  ForeignMessage foreign_message;
-  foreign_message.set_c(1234);
-  value_message->CopyFrom(foreign_message);
-
-  mmf_int32_foreign_message.Add(*entry_int32_foreign_message);
-  EXPECT_EQ(1234, message.map_int32_foreign_message().at(4321).c());
-
-  // Test Reflection::AddAllocatedMessage
-  Message* free_entry_string_string =
-      MessageFactory::generated_factory()
-          ->GetPrototype(fd_map_string_string->message_type())
-          ->New();
-  entry_string_string->GetReflection()->SetString(
-      free_entry_string_string, fd_map_string_string->message_type()->field(0),
-      "4321");
-  entry_string_string->GetReflection()->SetString(
-      free_entry_string_string, fd_map_string_string->message_type()->field(1),
-      "1234");
-  refl->AddAllocatedMessage(&message, fd_map_string_string,
-                            free_entry_string_string);
-
-  // Test MutableRepeatedFieldRef::RemoveLast()
-  mmf_int32_int32.RemoveLast();
-  mmf_int32_double.RemoveLast();
-  mmf_string_string.RemoveLast();
-  mmf_int32_foreign_message.RemoveLast();
-  EXPECT_EQ(10, message.map_int32_int32().size());
-  EXPECT_EQ(10, message.map_int32_double().size());
-  EXPECT_EQ(11, message.map_string_string().size());
-  EXPECT_EQ(10, message.map_int32_foreign_message().size());
-
-  // Test MutableRepeatedFieldRef::SwapElements()
-  {
-    const Message& message0a = mmf_int32_int32.Get(0, entry_int32_int32.get());
-    int32_t int32_value0a =
-        message0a.GetReflection()->GetInt32(message0a, fd_map_int32_in32_value);
-    const Message& message9a = mmf_int32_int32.Get(9, entry_int32_int32.get());
-    int32_t int32_value9a =
-        message9a.GetReflection()->GetInt32(message9a, fd_map_int32_in32_value);
-
-    mmf_int32_int32.SwapElements(0, 9);
-
-    const Message& message0b = mmf_int32_int32.Get(0, entry_int32_int32.get());
-    int32_t int32_value0b =
-        message0b.GetReflection()->GetInt32(message0b, fd_map_int32_in32_value);
-    const Message& message9b = mmf_int32_int32.Get(9, entry_int32_int32.get());
-    int32_t int32_value9b =
-        message9b.GetReflection()->GetInt32(message9b, fd_map_int32_in32_value);
-
-    EXPECT_EQ(int32_value9a, int32_value0b);
-    EXPECT_EQ(int32_value0a, int32_value9b);
-  }
-
-  {
-    const Message& message0a =
-        mmf_int32_double.Get(0, entry_int32_double.get());
-    double double_value0a = message0a.GetReflection()->GetDouble(
-        message0a, fd_map_int32_double_value);
-    const Message& message9a =
-        mmf_int32_double.Get(9, entry_int32_double.get());
-    double double_value9a = message9a.GetReflection()->GetDouble(
-        message9a, fd_map_int32_double_value);
-
-    mmf_int32_double.SwapElements(0, 9);
-
-    const Message& message0b =
-        mmf_int32_double.Get(0, entry_int32_double.get());
-    double double_value0b = message0b.GetReflection()->GetDouble(
-        message0b, fd_map_int32_double_value);
-    const Message& message9b =
-        mmf_int32_double.Get(9, entry_int32_double.get());
-    double double_value9b = message9b.GetReflection()->GetDouble(
-        message9b, fd_map_int32_double_value);
-
-    EXPECT_EQ(double_value9a, double_value0b);
-    EXPECT_EQ(double_value0a, double_value9b);
-  }
-
-  {
-    const Message& message0a =
-        mmf_string_string.Get(0, entry_string_string.get());
-    std::string string_value0a = message0a.GetReflection()->GetString(
-        message0a, fd_map_string_string_value);
-    const Message& message9a =
-        mmf_string_string.Get(9, entry_string_string.get());
-    std::string string_value9a = message9a.GetReflection()->GetString(
-        message9a, fd_map_string_string_value);
-
-    mmf_string_string.SwapElements(0, 9);
-
-    const Message& message0b =
-        mmf_string_string.Get(0, entry_string_string.get());
-    std::string string_value0b = message0b.GetReflection()->GetString(
-        message0b, fd_map_string_string_value);
-    const Message& message9b =
-        mmf_string_string.Get(9, entry_string_string.get());
-    std::string string_value9b = message9b.GetReflection()->GetString(
-        message9b, fd_map_string_string_value);
-
-    EXPECT_EQ(string_value9a, string_value0b);
-    EXPECT_EQ(string_value0a, string_value9b);
-  }
-
-  {
-    const Message& message0a =
-        mmf_int32_foreign_message.Get(0, entry_int32_foreign_message.get());
-    const ForeignMessage& sub_message0a =
-        down_cast<const ForeignMessage&>(message0a.GetReflection()->GetMessage(
-            message0a, fd_map_int32_foreign_message_value));
-    int32_t int32_value0a = sub_message0a.c();
-    const Message& message9a =
-        mmf_int32_foreign_message.Get(9, entry_int32_foreign_message.get());
-    const ForeignMessage& sub_message9a =
-        down_cast<const ForeignMessage&>(message9a.GetReflection()->GetMessage(
-            message9a, fd_map_int32_foreign_message_value));
-    int32_t int32_value9a = sub_message9a.c();
-
-    mmf_int32_foreign_message.SwapElements(0, 9);
-
-    const Message& message0b =
-        mmf_int32_foreign_message.Get(0, entry_int32_foreign_message.get());
-    const ForeignMessage& sub_message0b =
-        down_cast<const ForeignMessage&>(message0b.GetReflection()->GetMessage(
-            message0b, fd_map_int32_foreign_message_value));
-    int32_t int32_value0b = sub_message0b.c();
-    const Message& message9b =
-        mmf_int32_foreign_message.Get(9, entry_int32_foreign_message.get());
-    const ForeignMessage& sub_message9b =
-        down_cast<const ForeignMessage&>(message9b.GetReflection()->GetMessage(
-            message9b, fd_map_int32_foreign_message_value));
-    int32_t int32_value9b = sub_message9b.c();
-
-    EXPECT_EQ(int32_value9a, int32_value0b);
-    EXPECT_EQ(int32_value0a, int32_value9b);
-  }
-
-  // TODO(b/181148674): After supporting arena agnostic delete or let map entry
-  // handle heap allocation, this could be removed.
-  if (message.GetArena() != nullptr) {
-    entry_int32_int32.release();
-    entry_int32_double.release();
-    entry_string_string.release();
-    entry_int32_foreign_message.release();
-  }
-}
-
-TEST_F(MapFieldReflectionTest, RepeatedFieldRefMergeFromAndSwap) {
-  // Set-up message content.
-  TestMap m0, m1, m2;
-  for (int i = 0; i < 10; ++i) {
-    (*m0.mutable_map_int32_int32())[i] = Func(i, 1);
-    (*m0.mutable_map_int32_double())[i] = Func(i, 2);
-    (*m0.mutable_map_string_string())[StrFunc(i, 1)] = StrFunc(i, 5);
-    (*m0.mutable_map_int32_foreign_message())[i].set_c(Func(i, 6));
-    (*m1.mutable_map_int32_int32())[i + 10] = Func(i, 11);
-    (*m1.mutable_map_int32_double())[i + 10] = Func(i, 12);
-    (*m1.mutable_map_string_string())[StrFunc(i + 10, 1)] = StrFunc(i, 15);
-    (*m1.mutable_map_int32_foreign_message())[i + 10].set_c(Func(i, 16));
-    (*m2.mutable_map_int32_int32())[i + 20] = Func(i, 21);
-    (*m2.mutable_map_int32_double())[i + 20] = Func(i, 22);
-    (*m2.mutable_map_string_string())[StrFunc(i + 20, 1)] = StrFunc(i, 25);
-    (*m2.mutable_map_int32_foreign_message())[i + 20].set_c(Func(i, 26));
-  }
-
-  const Reflection* refl = m0.GetReflection();
-  const Descriptor* desc = m0.GetDescriptor();
-
-  // Get FieldDescriptors for all the fields of interest.
-  const FieldDescriptor* fd_map_int32_int32 =
-      desc->FindFieldByName("map_int32_int32");
-  const FieldDescriptor* fd_map_int32_double =
-      desc->FindFieldByName("map_int32_double");
-  const FieldDescriptor* fd_map_string_string =
-      desc->FindFieldByName("map_string_string");
-  const FieldDescriptor* fd_map_int32_foreign_message =
-      desc->FindFieldByName("map_int32_foreign_message");
-
-  // Get MutableRepeatedFieldRef objects for all fields of interest.
-  const MutableRepeatedFieldRef<Message> mmf_int32_int32 =
-      refl->GetMutableRepeatedFieldRef<Message>(&m0, fd_map_int32_int32);
-  const MutableRepeatedFieldRef<Message> mmf_int32_double =
-      refl->GetMutableRepeatedFieldRef<Message>(&m0, fd_map_int32_double);
-  const MutableRepeatedFieldRef<Message> mmf_string_string =
-      refl->GetMutableRepeatedFieldRef<Message>(&m0, fd_map_string_string);
-  const MutableRepeatedFieldRef<Message> mmf_int32_foreign_message =
-      refl->GetMutableRepeatedFieldRef<Message>(&m0,
-                                                fd_map_int32_foreign_message);
-
-  // Test MutableRepeatedRef::CopyFrom
-  mmf_int32_int32.CopyFrom(
-      refl->GetRepeatedFieldRef<Message>(m1, fd_map_int32_int32));
-  mmf_int32_double.CopyFrom(
-      refl->GetRepeatedFieldRef<Message>(m1, fd_map_int32_double));
-  mmf_string_string.CopyFrom(
-      refl->GetRepeatedFieldRef<Message>(m1, fd_map_string_string));
-  mmf_int32_foreign_message.CopyFrom(
-      refl->GetRepeatedFieldRef<Message>(m1, fd_map_int32_foreign_message));
-
-  for (int i = 0; i < 10; ++i) {
-    EXPECT_EQ(Func(i, 11), m0.map_int32_int32().at(i + 10));
-    EXPECT_EQ(Func(i, 12), m0.map_int32_double().at(i + 10));
-    EXPECT_EQ(StrFunc(i, 15), m0.map_string_string().at(StrFunc(i + 10, 1)));
-    EXPECT_EQ(Func(i, 16), m0.map_int32_foreign_message().at(i + 10).c());
-  }
-
-  // Test MutableRepeatedRef::MergeFrom
-  mmf_int32_int32.MergeFrom(
-      refl->GetRepeatedFieldRef<Message>(m2, fd_map_int32_int32));
-  mmf_int32_double.MergeFrom(
-      refl->GetRepeatedFieldRef<Message>(m2, fd_map_int32_double));
-  mmf_string_string.MergeFrom(
-      refl->GetRepeatedFieldRef<Message>(m2, fd_map_string_string));
-  mmf_int32_foreign_message.MergeFrom(
-      refl->GetRepeatedFieldRef<Message>(m2, fd_map_int32_foreign_message));
-  for (int i = 0; i < 10; ++i) {
-    EXPECT_EQ(Func(i, 21), m0.map_int32_int32().at(i + 20));
-    EXPECT_EQ(Func(i, 22), m0.map_int32_double().at(i + 20));
-    EXPECT_EQ(StrFunc(i, 25), m0.map_string_string().at(StrFunc(i + 20, 1)));
-    EXPECT_EQ(Func(i, 26), m0.map_int32_foreign_message().at(i + 20).c());
-  }
-
-  // Test MutableRepeatedRef::Swap
-  // Swap between m0 and m2.
-  mmf_int32_int32.Swap(
-      refl->GetMutableRepeatedFieldRef<Message>(&m2, fd_map_int32_int32));
-  mmf_int32_double.Swap(
-      refl->GetMutableRepeatedFieldRef<Message>(&m2, fd_map_int32_double));
-  mmf_string_string.Swap(
-      refl->GetMutableRepeatedFieldRef<Message>(&m2, fd_map_string_string));
-  mmf_int32_foreign_message.Swap(refl->GetMutableRepeatedFieldRef<Message>(
-      &m2, fd_map_int32_foreign_message));
-  for (int i = 0; i < 10; ++i) {
-    // Check the content of m0.
-    EXPECT_EQ(Func(i, 21), m0.map_int32_int32().at(i + 20));
-    EXPECT_EQ(Func(i, 22), m0.map_int32_double().at(i + 20));
-    EXPECT_EQ(StrFunc(i, 25), m0.map_string_string().at(StrFunc(i + 20, 1)));
-    EXPECT_EQ(Func(i, 26), m0.map_int32_foreign_message().at(i + 20).c());
-
-    // Check the content of m2.
-    EXPECT_EQ(Func(i, 11), m2.map_int32_int32().at(i + 10));
-    EXPECT_EQ(Func(i, 12), m2.map_int32_double().at(i + 10));
-    EXPECT_EQ(StrFunc(i, 15), m2.map_string_string().at(StrFunc(i + 10, 1)));
-    EXPECT_EQ(Func(i, 16), m2.map_int32_foreign_message().at(i + 10).c());
-    EXPECT_EQ(Func(i, 21), m2.map_int32_int32().at(i + 20));
-    EXPECT_EQ(Func(i, 22), m2.map_int32_double().at(i + 20));
-    EXPECT_EQ(StrFunc(i, 25), m2.map_string_string().at(StrFunc(i + 20, 1)));
-    EXPECT_EQ(Func(i, 26), m2.map_int32_foreign_message().at(i + 20).c());
-  }
-
-  // TODO(teboring): add test for duplicated key
-}
-
-TEST_F(MapFieldReflectionTest, MapSizeWithDuplicatedKey) {
-  // Dynamic Message
-  {
-    DynamicMessageFactory factory;
-    std::unique_ptr<Message> message(
-        factory.GetPrototype(UNITTEST::TestMap::descriptor())->New());
-    const Reflection* reflection = message->GetReflection();
-    const FieldDescriptor* field =
-        UNITTEST::TestMap::descriptor()->FindFieldByName("map_int32_int32");
-
-    Message* entry1 = reflection->AddMessage(message.get(), field);
-    Message* entry2 = reflection->AddMessage(message.get(), field);
-
-    const Reflection* entry_reflection = entry1->GetReflection();
-    const FieldDescriptor* key_field = entry1->GetDescriptor()->map_key();
-    entry_reflection->SetInt32(entry1, key_field, 1);
-    entry_reflection->SetInt32(entry2, key_field, 1);
-
-    EXPECT_EQ(2, reflection->FieldSize(*message, field));
-    EXPECT_EQ(1, MapSize(reflection, field, *message));
-    EXPECT_EQ(2, reflection->FieldSize(*message, field));
-  }
-
-  // Generated Message
-  {
-    UNITTEST::TestMap message;
-    const Reflection* reflection = message.GetReflection();
-    const FieldDescriptor* field =
-        message.GetDescriptor()->FindFieldByName("map_int32_int32");
-
-    Message* entry1 = reflection->AddMessage(&message, field);
-    Message* entry2 = reflection->AddMessage(&message, field);
-
-    const Reflection* entry_reflection = entry1->GetReflection();
-    const FieldDescriptor* key_field = entry1->GetDescriptor()->map_key();
-    entry_reflection->SetInt32(entry1, key_field, 1);
-    entry_reflection->SetInt32(entry2, key_field, 1);
-
-    EXPECT_EQ(2, reflection->FieldSize(message, field));
-    EXPECT_EQ(1, MapSize(reflection, field, message));
-  }
-}
-
-TEST_F(MapFieldReflectionTest, UninitializedEntry) {
-  UNITTEST::TestRequiredMessageMap message;
-  const Reflection* reflection = message.GetReflection();
-  const FieldDescriptor* field =
-      message.GetDescriptor()->FindFieldByName("map_field");
-  auto entry = reflection->AddMessage(&message, field);
-  EXPECT_FALSE(entry->IsInitialized());
-  EXPECT_FALSE(message.IsInitialized());
-}
-
-class MyMapEntry
-    : public internal::MapEntry<MyMapEntry, ::int32_t, ::int32_t,
-                                internal::WireFormatLite::TYPE_INT32,
-                                internal::WireFormatLite::TYPE_INT32> {
- public:
-  constexpr MyMapEntry() {}
-  MyMapEntry(Arena*) { std::abort(); }
-  Metadata GetMetadata() const override { std::abort(); }
-  static bool ValidateKey(void*) { return true; }
-  static bool ValidateValue(void*) { return true; }
-};
-
-class MyMapEntryLite
-    : public internal::MapEntryLite<MyMapEntryLite, ::int32_t, ::int32_t,
-                                    internal::WireFormatLite::TYPE_INT32,
-                                    internal::WireFormatLite::TYPE_INT32> {
- public:
-  constexpr MyMapEntryLite() {}
-  explicit MyMapEntryLite(Arena*) { std::abort(); }
-  static bool ValidateKey(void*) { return true; }
-  static bool ValidateValue(void*) { return true; }
-};
-
-TEST(MapEntryTest, ConstInit) {
-  // This verifies that `MapEntry`, `MapEntryLite` and `MapEntryImpl` can be
-  // constant initialized.
-  PROTOBUF_CONSTINIT static MyMapEntry entry{};
-  EXPECT_NE(entry.SpaceUsed(), 0);
-
-  PROTOBUF_CONSTINIT static MyMapEntryLite entry_lite{};  // NOLINT
-  EXPECT_TRUE(entry_lite.IsInitialized());
-}
-
-// Generated Message Test ===========================================
-
-TEST(GeneratedMapFieldTest, Accessors) {
-  UNITTEST::TestMap message;
-
-  MapTestUtil::SetMapFields(&message);
-  MapTestUtil::ExpectMapFieldsSet(message);
-
-  MapTestUtil::ModifyMapFields(&message);
-  MapTestUtil::ExpectMapFieldsModified(message);
-}
-
-TEST(GeneratedMapFieldTest, SetMapFieldsInitialized) {
-  UNITTEST::TestMap message;
-
-  MapTestUtil::SetMapFieldsInitialized(&message);
-  MapTestUtil::ExpectMapFieldsSetInitialized(message);
-}
-
-TEST(GeneratedMapFieldTest, Proto2SetMapFieldsInitialized) {
-  UNITTEST::TestEnumMap message;
-  EXPECT_EQ(UNITTEST::PROTO2_MAP_ENUM_FOO,
-            (*message.mutable_known_map_field())[0]);
-}
-
-TEST(GeneratedMapFieldTest, Clear) {
-  UNITTEST::TestMap message;
-
-  MapTestUtil::SetMapFields(&message);
-  message.Clear();
-  MapTestUtil::ExpectClear(message);
-}
-
-TEST(GeneratedMapFieldTest, ClearMessageMap) {
-  UNITTEST::TestMessageMap message;
-
-  // Creates a TestAllTypes with default value
-  TestUtil::ExpectClear((*message.mutable_map_int32_message())[0]);
-}
-
-TEST(GeneratedMapFieldTest, CopyFrom) {
-  UNITTEST::TestMap message1, message2;
-
-  MapTestUtil::SetMapFields(&message1);
-  message2.CopyFrom(message1);
-  MapTestUtil::ExpectMapFieldsSet(message2);
-
-  // Copying from self should be a no-op.
-  message2.CopyFrom(message2);
-  MapTestUtil::ExpectMapFieldsSet(message2);
-}
-
-TEST(GeneratedMapFieldTest, CopyFromMessageMap) {
-  UNITTEST::TestMessageMap message1, message2;
-
-  (*message1.mutable_map_int32_message())[0].add_repeated_int32(100);
-  (*message2.mutable_map_int32_message())[0].add_repeated_int32(101);
-
-  message1.CopyFrom(message2);
-
-  // Checks repeated field is overwritten.
-  EXPECT_EQ(1, message1.map_int32_message().at(0).repeated_int32_size());
-  EXPECT_EQ(101, message1.map_int32_message().at(0).repeated_int32(0));
-}
-
-TEST(GeneratedMapFieldTest, SwapWithEmpty) {
-  UNITTEST::TestMap message1, message2;
-
-  MapTestUtil::SetMapFields(&message1);
-  MapTestUtil::ExpectMapFieldsSet(message1);
-  MapTestUtil::ExpectClear(message2);
-
-  message1.Swap(&message2);
-  MapTestUtil::ExpectMapFieldsSet(message2);
-  MapTestUtil::ExpectClear(message1);
-}
-
-TEST(GeneratedMapFieldTest, SwapWithSelf) {
-  UNITTEST::TestMap message;
-
-  MapTestUtil::SetMapFields(&message);
-  MapTestUtil::ExpectMapFieldsSet(message);
-
-  message.Swap(&message);
-  MapTestUtil::ExpectMapFieldsSet(message);
-}
-
-TEST(GeneratedMapFieldTest, SwapWithOther) {
-  UNITTEST::TestMap message1, message2;
-
-  MapTestUtil::SetMapFields(&message1);
-  MapTestUtil::SetMapFields(&message2);
-  MapTestUtil::ModifyMapFields(&message2);
-
-  message1.Swap(&message2);
-  MapTestUtil::ExpectMapFieldsModified(message1);
-  MapTestUtil::ExpectMapFieldsSet(message2);
-}
-
-TEST(GeneratedMapFieldTest, CopyConstructor) {
-  UNITTEST::TestMap message1;
-  MapTestUtil::SetMapFields(&message1);
-
-  UNITTEST::TestMap message2(message1);
-  MapTestUtil::ExpectMapFieldsSet(message2);
-}
-
-TEST(GeneratedMapFieldTest, CopyAssignmentOperator) {
-  UNITTEST::TestMap message1;
-  MapTestUtil::SetMapFields(&message1);
-
-  UNITTEST::TestMap message2;
-  message2 = message1;
-  MapTestUtil::ExpectMapFieldsSet(message2);
-
-  // Make sure that self-assignment does something sane.
-  message2.operator=(message2);
-  MapTestUtil::ExpectMapFieldsSet(message2);
-}
-
-#if !defined(PROTOBUF_TEST_NO_DESCRIPTORS) || PROTOBUF_RTTI
-TEST(GeneratedMapFieldTest, UpcastCopyFrom) {
-  // Test the CopyFrom method that takes in the generic const Message&
-  // parameter.
-  UNITTEST::TestMap message1, message2;
-
-  MapTestUtil::SetMapFields(&message1);
-
-  const Message* source = implicit_cast<const Message*>(&message1);
-  message2.CopyFrom(*source);
-
-  MapTestUtil::ExpectMapFieldsSet(message2);
-}
-#endif
-
-#ifndef PROTOBUF_TEST_NO_DESCRIPTORS
-
-TEST(GeneratedMapFieldTest, CopyFromDynamicMessage) {
-  // Test copying from a DynamicMessage, which must fall back to using
-  // reflection.
-  UNITTEST::TestMap message2;
-
-  // Construct a new version of the dynamic message via the factory.
-  DynamicMessageFactory factory;
-  std::unique_ptr<Message> message1;
-  message1.reset(factory.GetPrototype(UNITTEST::TestMap::descriptor())->New());
-  MapReflectionTester reflection_tester(UNITTEST::TestMap::descriptor());
-  reflection_tester.SetMapFieldsViaReflection(message1.get());
-  reflection_tester.ExpectMapFieldsSetViaReflection(*message1);
-  reflection_tester.ExpectMapFieldsSetViaReflectionIterator(message1.get());
-  message2.CopyFrom(*message1);
-  MapTestUtil::ExpectMapFieldsSet(message2);
-}
-
-TEST(GeneratedMapFieldTest, CopyFromDynamicMessageMapReflection) {
-  UNITTEST::TestMap message2;
-
-  // Construct a new version of the dynamic message via the factory.
-  DynamicMessageFactory factory;
-  std::unique_ptr<Message> message1;
-  message1.reset(factory.GetPrototype(UNITTEST::TestMap::descriptor())->New());
-  MapReflectionTester reflection_tester(UNITTEST::TestMap::descriptor());
-  reflection_tester.SetMapFieldsViaMapReflection(message1.get());
-  reflection_tester.ExpectMapFieldsSetViaReflection(*message1);
-  reflection_tester.ExpectMapFieldsSetViaReflectionIterator(message1.get());
-  message2.CopyFrom(*message1);
-  MapTestUtil::ExpectMapFieldsSet(message2);
-}
-
-TEST(GeneratedMapFieldTest, DynamicMessageMergeFromDynamicMessage) {
-  // Construct two dynamic message and sets via map reflection.
-  DynamicMessageFactory factory;
-  std::unique_ptr<Message> message1;
-  message1.reset(factory.GetPrototype(UNITTEST::TestMap::descriptor())->New());
-  MapReflectionTester reflection_tester(UNITTEST::TestMap::descriptor());
-  reflection_tester.SetMapFieldsViaMapReflection(message1.get());
-
-  // message2 is created by same factory.
-  std::unique_ptr<Message> message2;
-  message2.reset(factory.GetPrototype(UNITTEST::TestMap::descriptor())->New());
-  reflection_tester.SetMapFieldsViaMapReflection(message2.get());
-
-  // message3 is created by different factory.
-  DynamicMessageFactory factory3;
-  std::unique_ptr<Message> message3;
-  message3.reset(factory3.GetPrototype(UNITTEST::TestMap::descriptor())->New());
-  reflection_tester.SetMapFieldsViaMapReflection(message3.get());
-
-  message2->MergeFrom(*message1);
-  message3->MergeFrom(*message1);
-
-  // Test MergeFrom does not sync to repeated fields and
-  // there is no duplicate keys in text format.
-  std::string output1, output2, output3;
-  TextFormat::PrintToString(*message1, &output1);
-  TextFormat::PrintToString(*message2, &output2);
-  TextFormat::PrintToString(*message3, &output3);
-  EXPECT_EQ(output1, output2);
-  EXPECT_EQ(output1, output3);
-}
-
-TEST(GeneratedMapFieldTest, DynamicMessageCopyFrom) {
-  // Test copying to a DynamicMessage, which must fall back to using reflection.
-  UNITTEST::TestMap message2;
-  MapTestUtil::SetMapFields(&message2);
-
-  // Construct a new version of the dynamic message via the factory.
-  DynamicMessageFactory factory;
-  std::unique_ptr<Message> message1;
-  message1.reset(factory.GetPrototype(UNITTEST::TestMap::descriptor())->New());
-
-  MapReflectionTester reflection_tester(UNITTEST::TestMap::descriptor());
-  message1->MergeFrom(message2);
-  reflection_tester.ExpectMapFieldsSetViaReflection(*message1);
-  reflection_tester.ExpectMapFieldsSetViaReflectionIterator(message1.get());
-}
-
-TEST(GeneratedMapFieldTest, DynamicMessageCopyFromMapReflection) {
-  MapReflectionTester reflection_tester(UNITTEST::TestMap::descriptor());
-  UNITTEST::TestMap message2;
-  reflection_tester.SetMapFieldsViaMapReflection(&message2);
-
-  // Construct a dynamic message via the factory.
-  DynamicMessageFactory factory;
-  std::unique_ptr<Message> message1;
-  message1.reset(factory.GetPrototype(UNITTEST::TestMap::descriptor())->New());
-
-  message1->MergeFrom(message2);
-  reflection_tester.ExpectMapFieldsSetViaReflectionIterator(message1.get());
-  reflection_tester.ExpectMapFieldsSetViaReflection(*message1);
-}
-
-TEST(GeneratedMapFieldTest, SyncDynamicMapWithRepeatedField) {
-  // Construct a dynamic message via the factory.
-  MapReflectionTester reflection_tester(UNITTEST::TestMap::descriptor());
-  DynamicMessageFactory factory;
-  std::unique_ptr<Message> message;
-  message.reset(factory.GetPrototype(UNITTEST::TestMap::descriptor())->New());
-  reflection_tester.SetMapFieldsViaReflection(message.get());
-  reflection_tester.ExpectMapFieldsSetViaReflectionIterator(message.get());
-  reflection_tester.ExpectMapFieldsSetViaReflection(*message);
-}
-
-#endif  // !PROTOBUF_TEST_NO_DESCRIPTORS
-
-TEST(GeneratedMapFieldTest, NonEmptyMergeFrom) {
-  UNITTEST::TestMap message1, message2;
-
-  MapTestUtil::SetMapFields(&message1);
-
-  // This field will test merging into an empty spot.
-  (*message2.mutable_map_int32_int32())[1] = 1;
-  message1.mutable_map_int32_int32()->erase(1);
-
-  // This tests overwriting.
-  (*message2.mutable_map_int32_double())[1] = 1;
-  (*message1.mutable_map_int32_double())[1] = 2;
-
-  message1.MergeFrom(message2);
-  MapTestUtil::ExpectMapFieldsSet(message1);
-
-  // Test reflection MergeFrom does not sync to repeated field
-  // and there is no duplicated keys.
-  MapTestUtil::SetMapFields(&message1);
-  MapTestUtil::SetMapFields(&message2);
-
-  message2.MergeFrom(message1);
-
-  std::string output1, output2;
-  TextFormat::PrintToString(message1, &output1);
-  TextFormat::PrintToString(message2, &output2);
-  EXPECT_EQ(output1, output2);
-}
-
-TEST(GeneratedMapFieldTest, MergeFromMessageMap) {
-  UNITTEST::TestMessageMap message1, message2;
-
-  (*message1.mutable_map_int32_message())[0].add_repeated_int32(100);
-  (*message2.mutable_map_int32_message())[0].add_repeated_int32(101);
-
-  message1.MergeFrom(message2);
-
-  // Checks repeated field is overwritten.
-  EXPECT_EQ(1, message1.map_int32_message().at(0).repeated_int32_size());
-  EXPECT_EQ(101, message1.map_int32_message().at(0).repeated_int32(0));
-}
-
-// Test the generated SerializeWithCachedSizesToArray()
-TEST(GeneratedMapFieldTest, SerializationToArray) {
-  UNITTEST::TestMap message1, message2;
-  std::string data;
-  MapTestUtil::SetMapFields(&message1);
-  size_t size = message1.ByteSizeLong();
-  data.resize(size);
-  uint8_t* start = reinterpret_cast<uint8_t*>(::google::protobuf::string_as_array(&data));
-  uint8_t* end = message1.SerializeWithCachedSizesToArray(start);
-  EXPECT_EQ(size, end - start);
-  EXPECT_TRUE(message2.ParseFromString(data));
-  MapTestUtil::ExpectMapFieldsSet(message2);
-}
-
-// Test the generated SerializeWithCachedSizes()
-TEST(GeneratedMapFieldTest, SerializationToStream) {
-  UNITTEST::TestMap message1, message2;
-  MapTestUtil::SetMapFields(&message1);
-  size_t size = message1.ByteSizeLong();
-  std::string data;
-  data.resize(size);
-  {
-    // Allow the output stream to buffer only one byte at a time.
-    io::ArrayOutputStream array_stream(::google::protobuf::string_as_array(&data), size, 1);
-    io::CodedOutputStream output_stream(&array_stream);
-    message1.SerializeWithCachedSizes(&output_stream);
-    EXPECT_FALSE(output_stream.HadError());
-    EXPECT_EQ(size, output_stream.ByteCount());
-  }
-  EXPECT_TRUE(message2.ParseFromString(data));
-  MapTestUtil::ExpectMapFieldsSet(message2);
-}
-
-TEST(GeneratedMapFieldTest, ParseFailsIfMalformed) {
-  UNITTEST::TestMapSubmessage o, p;
-  auto m = o.mutable_test_map()->mutable_map_int32_foreign_message();
-  (*m)[0].set_c(-1);
-  std::string serialized;
-  EXPECT_TRUE(o.SerializeToString(&serialized));
-
-  // Should parse correctly.
-  EXPECT_TRUE(p.ParseFromString(serialized));
-
-  // Overwriting the last byte to 0xFF results in malformed wire.
-  serialized[serialized.size() - 1] = 0xFF;
-  EXPECT_FALSE(p.ParseFromString(serialized));
-}
-
-
-TEST(GeneratedMapFieldTest, SameTypeMaps) {
-  const Descriptor* map1 = UNITTEST::TestSameTypeMap::descriptor()
-                               ->FindFieldByName("map1")
-                               ->message_type();
-  const Descriptor* map2 = UNITTEST::TestSameTypeMap::descriptor()
-                               ->FindFieldByName("map2")
-                               ->message_type();
-
-  const Message* map1_entry =
-      MessageFactory::generated_factory()->GetPrototype(map1);
-  const Message* map2_entry =
-      MessageFactory::generated_factory()->GetPrototype(map2);
-
-  EXPECT_EQ(map1, map1_entry->GetDescriptor());
-  EXPECT_EQ(map2, map2_entry->GetDescriptor());
-}
-
-TEST(GeneratedMapFieldTest, Proto2UnknownEnum) {
-  UNITTEST::TestEnumMapPlusExtra from;
-  (*from.mutable_known_map_field())[0] = UNITTEST::E_PROTO2_MAP_ENUM_FOO;
-  (*from.mutable_unknown_map_field())[0] = UNITTEST::E_PROTO2_MAP_ENUM_EXTRA;
-  std::string data;
-  from.SerializeToString(&data);
-
-  UNITTEST::TestEnumMap to;
-  EXPECT_TRUE(to.ParseFromString(data));
-  EXPECT_EQ(0, to.unknown_map_field().size());
-  const UnknownFieldSet& unknown_field_set =
-      to.GetReflection()->GetUnknownFields(to);
-  EXPECT_EQ(1, unknown_field_set.field_count());
-  EXPECT_EQ(1, to.known_map_field().size());
-  EXPECT_EQ(UNITTEST::PROTO2_MAP_ENUM_FOO, to.known_map_field().at(0));
-
-  data.clear();
-  from.Clear();
-  to.SerializeToString(&data);
-  EXPECT_TRUE(from.ParseFromString(data));
-  EXPECT_EQ(0, from.GetReflection()->GetUnknownFields(from).field_count());
-  EXPECT_EQ(1, from.known_map_field().size());
-  EXPECT_EQ(UNITTEST::E_PROTO2_MAP_ENUM_FOO, from.known_map_field().at(0));
-  EXPECT_EQ(1, from.unknown_map_field().size());
-  EXPECT_EQ(UNITTEST::E_PROTO2_MAP_ENUM_EXTRA, from.unknown_map_field().at(0));
-}
-
-TEST(GeneratedMapFieldTest, StandardWireFormat) {
-  UNITTEST::TestMap message;
-  std::string data = "\x0A\x04\x08\x01\x10\x01";
-
-  EXPECT_TRUE(message.ParseFromString(data));
-  EXPECT_EQ(1, message.map_int32_int32().size());
-  EXPECT_EQ(1, message.map_int32_int32().at(1));
-}
-
-TEST(GeneratedMapFieldTest, UnorderedWireFormat) {
-  UNITTEST::TestMap message;
-
-  // put value before key in wire format
-  std::string data = "\x0A\x04\x10\x01\x08\x02";
-
-  EXPECT_TRUE(message.ParseFromString(data));
-  EXPECT_EQ(1, message.map_int32_int32().size());
-  ASSERT_NE(message.map_int32_int32().find(2), message.map_int32_int32().end());
-  EXPECT_EQ(1, message.map_int32_int32().at(2));
-}
-
-TEST(GeneratedMapFieldTest, DuplicatedKeyWireFormat) {
-  UNITTEST::TestMap message;
-
-  // Two key fields in wire format
-  std::string data = "\x0A\x06\x08\x01\x08\x02\x10\x01";
-
-  EXPECT_TRUE(message.ParseFromString(data));
-  EXPECT_EQ(1, message.map_int32_int32().size());
-  EXPECT_EQ(1, message.map_int32_int32().at(2));
-
-  // A similar test, but with a map from int to a message type.
-  // Again, we want to be sure that the "second one wins" when
-  // there are two separate entries with the same key.
-  const int key = 99;
-  UNITTEST::TestRequiredMessageMap map_message;
-  UNITTEST::TestRequired with_dummy4;
-  with_dummy4.set_a(0);
-  with_dummy4.set_b(0);
-  with_dummy4.set_c(0);
-  with_dummy4.set_dummy4(11);
-  (*map_message.mutable_map_field())[key] = with_dummy4;
-  std::string s = map_message.SerializeAsString();
-  UNITTEST::TestRequired with_dummy5;
-  with_dummy5.set_a(0);
-  with_dummy5.set_b(0);
-  with_dummy5.set_c(0);
-  with_dummy5.set_dummy5(12);
-  (*map_message.mutable_map_field())[key] = with_dummy5;
-  std::string both = s + map_message.SerializeAsString();
-  // We don't expect a merge now.  The "second one wins."
-  ASSERT_TRUE(map_message.ParseFromString(both));
-  ASSERT_EQ(1, map_message.map_field().size());
-  ASSERT_EQ(1, map_message.map_field().count(key));
-  EXPECT_EQ(0, map_message.map_field().find(key)->second.a());
-  EXPECT_EQ(0, map_message.map_field().find(key)->second.b());
-  EXPECT_EQ(0, map_message.map_field().find(key)->second.c());
-  EXPECT_FALSE(map_message.map_field().find(key)->second.has_dummy4());
-  ASSERT_TRUE(map_message.map_field().find(key)->second.has_dummy5());
-  EXPECT_EQ(12, map_message.map_field().find(key)->second.dummy5());
-}
-
-// Exhaustive combinations of keys, values, and junk in any order.
-// This re-tests some of the things tested above, but if it fails
-// it's more work to determine what went wrong, so it isn't necessarily
-// bad that we have the simpler tests too.
-TEST(GeneratedMapFieldTest, KeysValuesUnknownsWireFormat) {
-  UNITTEST::TestMap message;
-  const int kMaxNumKeysAndValuesAndJunk = 4;
-  const char kKeyTag = 0x08;
-  const char kValueTag = 0x10;
-  const char kJunkTag = 0x20;
-  for (int items = 0; items <= kMaxNumKeysAndValuesAndJunk; items++) {
-    std::string data = "\x0A";
-    // Encode length of what will follow.
-    data.push_back(items * 2);
-    static const int kBitsOfIPerItem = 4;
-    static const int mask = (1 << kBitsOfIPerItem) - 1;
-    // Each iteration of the following is a test.  It uses i as bit vector
-    // encoding the keys and values to put in the wire format.
-    for (int i = 0; i < (1 << (items * kBitsOfIPerItem)); i++) {
-      std::string wire_format = data;
-      int expected_key = 0;
-      int expected_value = 0;
-      for (int k = i, j = 0; j < items; j++, k >>= kBitsOfIPerItem) {
-        bool is_key = k & 0x1;
-        bool is_value = !is_key && (k & 0x2);
-        wire_format.push_back(is_key ? kKeyTag
-                                     : is_value ? kValueTag : kJunkTag);
-        char c = static_cast<char>(k & mask) >> 2;  // One char after the tag.
-        wire_format.push_back(c);
-        if (is_key) expected_key = static_cast<int>(c);
-        if (is_value) expected_value = static_cast<int>(c);
-        bool res = message.ParseFromString(wire_format);
-        bool expect_success = true;
-        // Unfortunately the old map parser accepts malformed input, the new
-        // parser accepts only correct input.
-        if (j != items - 1) expect_success = false;
-        if (expect_success) {
-          ASSERT_TRUE(res);
-          ASSERT_EQ(1, message.map_int32_int32().size());
-          ASSERT_EQ(expected_key, message.map_int32_int32().begin()->first);
-          ASSERT_EQ(expected_value, message.map_int32_int32().begin()->second);
-        } else {
-          ASSERT_FALSE(res);
-        }
-      }
-    }
-  }
-}
-
-TEST(GeneratedMapFieldTest, DuplicatedValueWireFormat) {
-  UNITTEST::TestMap message;
-
-  // Two value fields in wire format
-  std::string data = "\x0A\x06\x08\x01\x10\x01\x10\x02";
-
-  EXPECT_TRUE(message.ParseFromString(data));
-  EXPECT_EQ(1, message.map_int32_int32().size());
-  EXPECT_EQ(2, message.map_int32_int32().at(1));
-}
-
-TEST(GeneratedMapFieldTest, MissedKeyWireFormat) {
-  UNITTEST::TestMap message;
-
-  // No key field in wire format
-  std::string data = "\x0A\x02\x10\x01";
-
-  EXPECT_TRUE(message.ParseFromString(data));
-  EXPECT_EQ(1, message.map_int32_int32().size());
-  ASSERT_NE(message.map_int32_int32().find(0), message.map_int32_int32().end());
-  EXPECT_EQ(1, message.map_int32_int32().at(0));
-}
-
-TEST(GeneratedMapFieldTest, MissedValueWireFormat) {
-  UNITTEST::TestMap message;
-
-  // No value field in wire format
-  std::string data = "\x0A\x02\x08\x01";
-
-  EXPECT_TRUE(message.ParseFromString(data));
-  EXPECT_EQ(1, message.map_int32_int32().size());
-  ASSERT_NE(message.map_int32_int32().find(1), message.map_int32_int32().end());
-  EXPECT_EQ(0, message.map_int32_int32().at(1));
-}
-
-TEST(GeneratedMapFieldTest, MissedValueTextFormat) {
-  UNITTEST::TestMap message;
-
-  // No value field in text format
-  std::string text =
-      "map_int32_foreign_message {\n"
-      "  key: 1234567890\n"
-      "}";
-
-  EXPECT_TRUE(TextFormat::ParseFromString(text, &message));
-  EXPECT_EQ(1, message.map_int32_foreign_message().size());
-  EXPECT_EQ(11, message.ByteSizeLong());
-}
-
-TEST(GeneratedMapFieldTest, UnknownFieldWireFormat) {
-  UNITTEST::TestMap message;
-
-  // Unknown field in wire format
-  std::string data = "\x0A\x06\x08\x02\x10\x03\x18\x01";
-
-  EXPECT_TRUE(message.ParseFromString(data));
-  EXPECT_EQ(1, message.map_int32_int32().size());
-  EXPECT_EQ(3, message.map_int32_int32().at(2));
-}
-
-TEST(GeneratedMapFieldTest, CorruptedWireFormat) {
-  UNITTEST::TestMap message;
-
-  // corrupted data in wire format
-  std::string data = "\x0A\x06\x08\x02\x11\x03";
-
-  EXPECT_FALSE(message.ParseFromString(data));
-}
-
-TEST(GeneratedMapFieldTest, IsInitialized) {
-  UNITTEST::TestRequiredMessageMap map_message;
-
-  // Add an uninitialized message.
-  (*map_message.mutable_map_field())[0];
-  EXPECT_FALSE(map_message.IsInitialized());
-
-  // Initialize uninitialized message
-  (*map_message.mutable_map_field())[0].set_a(0);
-  (*map_message.mutable_map_field())[0].set_b(0);
-  (*map_message.mutable_map_field())[0].set_c(0);
-  EXPECT_TRUE(map_message.IsInitialized());
-}
-
-TEST(GeneratedMapFieldTest, SpaceUsed) {
-  UNITTEST::TestRequiredMessageMap map_message;
-  const size_t initial = map_message.SpaceUsed();
-  const size_t space_used_message = UNITTEST::TestRequired().SpaceUsed();
-
-  auto& m = *map_message.mutable_map_field();
-  constexpr int kNumValues = 100;
-  for (int i = 0; i < kNumValues; ++i) {
-    m[i];
-  }
-
-  // The exact value will depend on internal state, like collisions,
-  // so we can't predict it. But we can predict a lower bound.
-  size_t lower_bound =
-      initial + kNumValues * (space_used_message + sizeof(int32_t) +
-                              /* Node::next */ sizeof(void*) +
-                              /* table entry */ sizeof(void*));
-
-  EXPECT_LE(lower_bound, map_message.SpaceUsed());
-}
-
-TEST(GeneratedMapFieldTest, MessagesMustMerge) {
-  UNITTEST::TestRequiredMessageMap map_message;
-
-  UNITTEST::TestRequired with_dummy4;
-  with_dummy4.set_a(97);
-  with_dummy4.set_b(91);
-  with_dummy4.set_dummy4(98);
-  EXPECT_FALSE(with_dummy4.IsInitialized());
-  (*map_message.mutable_map_field())[0] = with_dummy4;
-  EXPECT_FALSE(map_message.IsInitialized());
-
-  UNITTEST::TestRequired with_dummy5;
-  with_dummy5.set_b(0);
-  with_dummy5.set_c(33);
-  with_dummy5.set_dummy5(99);
-  EXPECT_FALSE(with_dummy5.IsInitialized());
-  (*map_message.mutable_map_field())[0] = with_dummy5;
-  EXPECT_FALSE(map_message.IsInitialized());
-
-  // The wire format of MapEntry is straightforward (*) and can be manually
-  // constructed to force merging of two uninitialized messages that would
-  // result in an initialized message.
-  //
-  // (*) http://google3/net/proto2/internal/map_test.cc?l=2433&rcl=310012028
-  std::string dummy4_s = with_dummy4.SerializePartialAsString();
-  std::string dummy5_s = with_dummy5.SerializePartialAsString();
-  int payload_size = dummy4_s.size() + dummy5_s.size();
-  // Makes sure the payload size fits into one byte.
-  ASSERT_LT(payload_size, 128);
-
-  std::string s(6, 0);
-  char* p = &s[0];
-  *p++ = WireFormatLite::MakeTag(1, WireFormatLite::WIRETYPE_LENGTH_DELIMITED);
-  // Length: 2B for key tag & val and 2B for val tag and length of the following
-  // payload.
-  *p++ = 4 + payload_size;
-  *p++ = WireFormatLite::MakeTag(1, WireFormatLite::WIRETYPE_VARINT);
-  *p++ = 0;
-  *p++ = WireFormatLite::MakeTag(2, WireFormatLite::WIRETYPE_LENGTH_DELIMITED);
-  *p++ = payload_size;
-  StrAppend(&s, dummy4_s, dummy5_s);
-
-  // Test key then value then value.
-  int key = 0;
-  ASSERT_TRUE(map_message.ParseFromString(s));
-  ASSERT_EQ(1, map_message.map_field().size());
-  ASSERT_EQ(1, map_message.map_field().count(key));
-  EXPECT_EQ(97, map_message.map_field().find(key)->second.a());
-  EXPECT_EQ(0, map_message.map_field().find(key)->second.b());
-  EXPECT_EQ(33, map_message.map_field().find(key)->second.c());
-  EXPECT_EQ(98, map_message.map_field().find(key)->second.dummy4());
-  EXPECT_EQ(99, map_message.map_field().find(key)->second.dummy5());
-
-  // Test key then value then value then key.
-  s.push_back(s[2]);  // Copy the key's tag.
-  key = 19;
-  s.push_back(key);  // Second key is 19 instead of 0.
-  s[1] += 2;         // Adjust encoded size.
-  ASSERT_TRUE(map_message.ParseFromString(s));
-  ASSERT_EQ(1, map_message.map_field().size());
-  ASSERT_EQ(1, map_message.map_field().count(key));
-  EXPECT_EQ(97, map_message.map_field().find(key)->second.a());
-  EXPECT_EQ(0, map_message.map_field().find(key)->second.b());
-  EXPECT_EQ(33, map_message.map_field().find(key)->second.c());
-  EXPECT_EQ(98, map_message.map_field().find(key)->second.dummy4());
-  EXPECT_EQ(99, map_message.map_field().find(key)->second.dummy5());
-}
-
-// Generated Message Reflection Test ================================
-
-TEST(GeneratedMapFieldReflectionTest, SpaceUsed) {
-  UNITTEST::TestMap message;
-  MapReflectionTester reflection_tester(UNITTEST::TestMap::descriptor());
-  reflection_tester.SetMapFieldsViaReflection(&message);
-
-  EXPECT_LT(0, message.GetReflection()->SpaceUsedLong(message));
-}
-
-TEST(GeneratedMapFieldReflectionTest, Accessors) {
-  // Set every field to a unique value then go back and check all those
-  // values.
-  UNITTEST::TestMap message;
-  MapReflectionTester reflection_tester(UNITTEST::TestMap::descriptor());
-  reflection_tester.SetMapFieldsViaReflection(&message);
-  MapTestUtil::ExpectMapFieldsSet(message);
-  reflection_tester.ExpectMapFieldsSetViaReflection(message);
-  reflection_tester.ExpectMapFieldsSetViaReflectionIterator(&message);
-
-  reflection_tester.ModifyMapFieldsViaReflection(&message);
-  MapTestUtil::ExpectMapFieldsModified(message);
-}
-
-TEST(GeneratedMapFieldReflectionTest, Swap) {
-  UNITTEST::TestMap message1;
-  UNITTEST::TestMap message2;
-
-  MapTestUtil::SetMapFields(&message1);
-
-  const Reflection* reflection = message1.GetReflection();
-  reflection->Swap(&message1, &message2);
-
-  MapTestUtil::ExpectClear(message1);
-  MapTestUtil::ExpectMapFieldsSet(message2);
-}
-
-TEST(GeneratedMapFieldReflectionTest, SwapWithBothSet) {
-  UNITTEST::TestMap message1;
-  UNITTEST::TestMap message2;
-
-  MapTestUtil::SetMapFields(&message1);
-  MapTestUtil::SetMapFields(&message2);
-  MapTestUtil::ModifyMapFields(&message2);
-
-  const Reflection* reflection = message1.GetReflection();
-  reflection->Swap(&message1, &message2);
-
-  MapTestUtil::ExpectMapFieldsModified(message1);
-  MapTestUtil::ExpectMapFieldsSet(message2);
-}
-
-TEST(GeneratedMapFieldReflectionTest, SwapFields) {
-  UNITTEST::TestMap message1;
-  UNITTEST::TestMap message2;
-
-  MapTestUtil::SetMapFields(&message2);
-
-  std::vector<const FieldDescriptor*> fields;
-  const Reflection* reflection = message1.GetReflection();
-  reflection->ListFields(message2, &fields);
-  reflection->SwapFields(&message1, &message2, fields);
-
-  MapTestUtil::ExpectMapFieldsSet(message1);
-  MapTestUtil::ExpectClear(message2);
-}
-
-TEST(GeneratedMapFieldReflectionTest, ClearField) {
-  UNITTEST::TestMap message;
-  MapTestUtil::SetMapFields(&message);
-  MapTestUtil::ExpectMapFieldsSet(message);
-
-  MapReflectionTester reflection_tester(UNITTEST::TestMap::descriptor());
-  reflection_tester.ClearMapFieldsViaReflection(&message);
-  reflection_tester.ExpectClearViaReflection(message);
-  reflection_tester.ExpectClearViaReflectionIterator(&message);
-}
-
-TEST(GeneratedMapFieldReflectionTest, RemoveLast) {
-  UNITTEST::TestMap message;
-  MapReflectionTester reflection_tester(UNITTEST::TestMap::descriptor());
-
-  MapTestUtil::SetMapFields(&message);
-  MapTestUtil::ExpectMapsSize(message, 2);
-  std::vector<const Message*> expected_entries =
-      MapTestUtil::GetMapEntries(message, 0);
-
-  reflection_tester.RemoveLastMapsViaReflection(&message);
-
-  MapTestUtil::ExpectMapsSize(message, 1);
-  std::vector<const Message*> remained_entries =
-      MapTestUtil::GetMapEntries(message, 0);
-  EXPECT_TRUE(expected_entries == remained_entries);
-}
-
-TEST(GeneratedMapFieldReflectionTest, ReleaseLast) {
-  UNITTEST::TestMap message;
-  const Descriptor* descriptor = message.GetDescriptor();
-  MapReflectionTester reflection_tester(descriptor);
-
-  MapTestUtil::SetMapFields(&message);
-
-  MapTestUtil::ExpectMapsSize(message, 2);
-
-  reflection_tester.ReleaseLastMapsViaReflection(&message);
-
-  MapTestUtil::ExpectMapsSize(message, 1);
-
-  // Now test that we actually release the right message.
-  message.Clear();
-  MapTestUtil::SetMapFields(&message);
-
-  MapTestUtil::ExpectMapsSize(message, 2);
-  std::vector<const Message*> expect_last =
-      MapTestUtil::GetMapEntries(message, 1);
-  std::vector<const Message*> release_last =
-      MapTestUtil::GetMapEntriesFromRelease(&message);
-  MapTestUtil::ExpectMapsSize(message, 1);
-  EXPECT_TRUE(expect_last == release_last);
-  for (std::vector<const Message*>::iterator it = release_last.begin();
-       it != release_last.end(); ++it) {
-    delete *it;
-  }
-}
-
-TEST(GeneratedMapFieldReflectionTest, SwapElements) {
-  UNITTEST::TestMap message;
-  MapReflectionTester reflection_tester(UNITTEST::TestMap::descriptor());
-
-  MapTestUtil::SetMapFields(&message);
-
-  // Get pointers of map entries at their original position
-  std::vector<const Message*> entries0 = MapTestUtil::GetMapEntries(message, 0);
-  std::vector<const Message*> entries1 = MapTestUtil::GetMapEntries(message, 1);
-
-  // Swap the first time.
-  reflection_tester.SwapMapsViaReflection(&message);
-
-  // Get pointer of map entry after swap once.
-  std::vector<const Message*> entries0_once =
-      MapTestUtil::GetMapEntries(message, 0);
-  std::vector<const Message*> entries1_once =
-      MapTestUtil::GetMapEntries(message, 1);
-
-  // Test map entries are swapped.
-  MapTestUtil::ExpectMapsSize(message, 2);
-  EXPECT_TRUE(entries0 == entries1_once);
-  EXPECT_TRUE(entries1 == entries0_once);
-
-  // Swap the second time.
-  reflection_tester.SwapMapsViaReflection(&message);
-
-  // Get pointer of map entry after swap once.
-  std::vector<const Message*> entries0_twice =
-      MapTestUtil::GetMapEntries(message, 0);
-  std::vector<const Message*> entries1_twice =
-      MapTestUtil::GetMapEntries(message, 1);
-
-  // Test map entries are swapped back.
-  MapTestUtil::ExpectMapsSize(message, 2);
-  EXPECT_TRUE(entries0 == entries0_twice);
-  EXPECT_TRUE(entries1 == entries1_twice);
-}
-
-TEST(GeneratedMapFieldReflectionTest, MutableUnknownFields) {
-  UNITTEST::TestMap message;
-  MapReflectionTester reflection_tester(UNITTEST::TestMap::descriptor());
-  reflection_tester.MutableUnknownFieldsOfMapFieldsViaReflection(&message);
-}
-
-TEST(GeneratedMapFieldReflectionTest, EmbedProto2Message) {
-  UNITTEST::TestMessageMap message;
-
-  const FieldDescriptor* map_field =
-      UNITTEST::TestMessageMap::descriptor()->FindFieldByName(
-          "map_int32_message");
-  const FieldDescriptor* value = map_field->message_type()->map_value();
-
-  Message* entry_message =
-      message.GetReflection()->AddMessage(&message, map_field);
-  EXPECT_EQ(
-      &entry_message->GetReflection()->GetMessage(*entry_message, value),
-      reinterpret_cast<const Message*>(&TestAllTypes::default_instance()));
-
-  Message* proto2_message =
-      entry_message->GetReflection()->MutableMessage(entry_message, value);
-  EXPECT_EQ(UNITTEST::TestAllTypes::descriptor(),
-            proto2_message->GetDescriptor());
-  ASSERT_EQ(1, message.map_int32_message().size());
-}
-
-TEST(GeneratedMapFieldReflectionTest, MergeFromClearMapEntry) {
-  UNITTEST::TestMap message;
-  const FieldDescriptor* map_field =
-      UNITTEST::TestMap::descriptor()->FindFieldByName("map_int32_int32");
-  const FieldDescriptor* key = map_field->message_type()->map_key();
-  const FieldDescriptor* value = map_field->message_type()->map_value();
-
-  Message* entry_message1 =
-      message.GetReflection()->AddMessage(&message, map_field);
-  EXPECT_FALSE(entry_message1->GetReflection()->HasField(*entry_message1, key));
-  EXPECT_FALSE(
-      entry_message1->GetReflection()->HasField(*entry_message1, value));
-
-  Message* entry_message2 =
-      message.GetReflection()->AddMessage(&message, map_field);
-  EXPECT_FALSE(entry_message2->GetReflection()->HasField(*entry_message2, key));
-  EXPECT_FALSE(
-      entry_message2->GetReflection()->HasField(*entry_message2, value));
-
-  entry_message1->MergeFrom(*entry_message2);
-  EXPECT_FALSE(entry_message1->GetReflection()->HasField(*entry_message1, key));
-  EXPECT_FALSE(
-      entry_message1->GetReflection()->HasField(*entry_message1, value));
-}
-
-TEST(GeneratedMapFieldReflectionTest, MapEntryClear) {
-  UNITTEST::TestMap message;
-  MapReflectionTester reflection_tester(UNITTEST::TestMap::descriptor());
-  reflection_tester.MutableUnknownFieldsOfMapFieldsViaReflection(&message);
-}
-
-TEST(GeneratedMapFieldReflectionTest, Proto2MapEntryClear) {
-  UNITTEST::TestEnumMap message;
-  const Descriptor* descriptor = message.GetDescriptor();
-  const FieldDescriptor* field_descriptor =
-      descriptor->FindFieldByName("known_map_field");
-  const FieldDescriptor* value_descriptor =
-      field_descriptor->message_type()->map_value();
-  Message* sub_message =
-      message.GetReflection()->AddMessage(&message, field_descriptor);
-  EXPECT_EQ(0, sub_message->GetReflection()->GetEnumValue(*sub_message,
-                                                          value_descriptor));
-}
-
-// Map Reflection API Test =========================================
-
-TEST(GeneratedMapFieldReflectionTest, SetViaMapReflection) {
-  UNITTEST::TestMap message;
-  MapReflectionTester reflection_tester(UNITTEST::TestMap::descriptor());
-  reflection_tester.SetMapFieldsViaMapReflection(&message);
-  reflection_tester.ExpectMapFieldsSetViaReflection(message);
-  reflection_tester.ExpectMapFieldsSetViaReflectionIterator(&message);
-}
-
-// Dynamic Message Test =============================================
-
-class MapFieldInDynamicMessageTest : public testing::Test {
- protected:
-  const DescriptorPool* pool_;
-  DynamicMessageFactory factory_;
-  const Descriptor* map_descriptor_;
-  const Descriptor* recursive_map_descriptor_;
-  const Message* map_prototype_;
-
-  MapFieldInDynamicMessageTest()
-      : pool_(DescriptorPool::generated_pool()), factory_(pool_) {}
-
-  void SetUp() override {
-    map_descriptor_ = pool_->FindMessageTypeByName(
-        std::string(UNITTEST_PACKAGE_NAME) + ".TestMap");
-    recursive_map_descriptor_ = pool_->FindMessageTypeByName(
-        std::string(UNITTEST_PACKAGE_NAME) + ".TestRecursiveMapMessage");
-    ASSERT_TRUE(map_descriptor_ != nullptr);
-    ASSERT_TRUE(recursive_map_descriptor_ != nullptr);
-    map_prototype_ = factory_.GetPrototype(map_descriptor_);
-  }
-};
-
-TEST_F(MapFieldInDynamicMessageTest, MapIndependentOffsets) {
-  // Check that all fields have independent offsets by setting each
-  // one to a unique value then checking that they all still have those
-  // unique values (i.e. they don't stomp each other).
-  std::unique_ptr<Message> message(map_prototype_->New());
-  MapReflectionTester reflection_tester(map_descriptor_);
-
-  reflection_tester.SetMapFieldsViaReflection(message.get());
-  reflection_tester.ExpectMapFieldsSetViaReflection(*message);
-}
-
-TEST_F(MapFieldInDynamicMessageTest, DynamicMapReflection) {
-  // Check that map fields work properly.
-  std::unique_ptr<Message> message(map_prototype_->New());
-
-  // Check set functions.
-  MapReflectionTester reflection_tester(map_descriptor_);
-  reflection_tester.SetMapFieldsViaMapReflection(message.get());
-  reflection_tester.ExpectMapFieldsSetViaReflection(*message);
-}
-
-TEST_F(MapFieldInDynamicMessageTest, MapSpaceUsed) {
-  // Test that SpaceUsedLong() works properly
-
-  // Since we share the implementation with generated messages, we don't need
-  // to test very much here.  Just make sure it appears to be working.
-
-  std::unique_ptr<Message> message(map_prototype_->New());
-  MapReflectionTester reflection_tester(map_descriptor_);
-
-  int initial_space_used = message->SpaceUsedLong();
-
-  reflection_tester.SetMapFieldsViaReflection(message.get());
-  EXPECT_LT(initial_space_used, message->SpaceUsedLong());
-}
-
-TEST_F(MapFieldInDynamicMessageTest, RecursiveMap) {
-  TestRecursiveMapMessage from;
-  (*from.mutable_a())[""];
-  std::string data = from.SerializeAsString();
-  std::unique_ptr<Message> to(
-      factory_.GetPrototype(recursive_map_descriptor_)->New());
-  ASSERT_TRUE(to->ParseFromString(data));
-}
-
-TEST_F(MapFieldInDynamicMessageTest, MapValueReferernceValidAfterSerialize) {
-  std::unique_ptr<Message> message(map_prototype_->New());
-  MapReflectionTester reflection_tester(map_descriptor_);
-  reflection_tester.SetMapFieldsViaMapReflection(message.get());
-
-  // Get value reference before serialization, so that we know the value is from
-  // map.
-  MapKey map_key;
-  MapValueRef map_val;
-  map_key.SetInt32Value(0);
-  reflection_tester.GetMapValueViaMapReflection(
-      message.get(), "map_int32_foreign_message", map_key, &map_val);
-  Message* submsg = map_val.MutableMessageValue();
-
-  // In previous implementation, calling SerializeToString will cause syncing
-  // from map to repeated field, which will invalidate the submsg we previously
-  // got.
-  std::string data;
-  message->SerializeToString(&data);
-
-  const Reflection* submsg_reflection = submsg->GetReflection();
-  const Descriptor* submsg_desc = submsg->GetDescriptor();
-  const FieldDescriptor* submsg_field = submsg_desc->FindFieldByName("c");
-  submsg_reflection->SetInt32(submsg, submsg_field, 128);
-
-  message->SerializeToString(&data);
-  TestMap to;
-  to.ParseFromString(data);
-  EXPECT_EQ(128, to.map_int32_foreign_message().at(0).c());
-}
-
-TEST_F(MapFieldInDynamicMessageTest, MapEntryReferernceValidAfterSerialize) {
-  std::unique_ptr<Message> message(map_prototype_->New());
-  MapReflectionTester reflection_tester(map_descriptor_);
-  reflection_tester.SetMapFieldsViaReflection(message.get());
-
-  // Get map entry before serialization, so that we know the it is from
-  // repeated field.
-  Message* map_entry = reflection_tester.GetMapEntryViaReflection(
-      message.get(), "map_int32_foreign_message", 0);
-  const Reflection* map_entry_reflection = map_entry->GetReflection();
-  const Descriptor* map_entry_desc = map_entry->GetDescriptor();
-  const FieldDescriptor* value_field = map_entry_desc->map_value();
-  Message* submsg =
-      map_entry_reflection->MutableMessage(map_entry, value_field);
-
-  // In previous implementation, calling SerializeToString will cause syncing
-  // from repeated field to map, which will invalidate the map_entry we
-  // previously got.
-  std::string data;
-  message->SerializeToString(&data);
-
-  const Reflection* submsg_reflection = submsg->GetReflection();
-  const Descriptor* submsg_desc = submsg->GetDescriptor();
-  const FieldDescriptor* submsg_field = submsg_desc->FindFieldByName("c");
-  submsg_reflection->SetInt32(submsg, submsg_field, 128);
-
-  message->SerializeToString(&data);
-  TestMap to;
-  to.ParseFromString(data);
-  EXPECT_EQ(128, to.map_int32_foreign_message().at(0).c());
-}
-
-// ReflectionOps Test ===============================================
-
-TEST(ReflectionOpsForMapFieldTest, MapSanityCheck) {
-  UNITTEST::TestMap message;
-
-  MapTestUtil::SetMapFields(&message);
-  MapTestUtil::ExpectMapFieldsSet(message);
-}
-
-TEST(ReflectionOpsForMapFieldTest, MapCopy) {
-  UNITTEST::TestMap message, message2;
-
-  MapTestUtil::SetMapFields(&message);
-
-  ReflectionOps::Copy(message, &message2);
-
-  MapTestUtil::ExpectMapFieldsSet(message2);
-
-  // Copying from self should be a no-op.
-  ReflectionOps::Copy(message2, &message2);
-  MapTestUtil::ExpectMapFieldsSet(message2);
-}
-
-TEST(ReflectionOpsForMapFieldTest, MergeMap) {
-  // Note:  Copy is implemented in terms of Merge() so technically the Copy
-  //   test already tested most of this.
-
-  UNITTEST::TestMap message, message2;
-
-  MapTestUtil::SetMapFields(&message);
-
-  ReflectionOps::Merge(message2, &message);
-
-  MapTestUtil::ExpectMapFieldsSet(message);
-}
-
-TEST(ReflectionOpsForMapFieldTest, ClearMap) {
-  UNITTEST::TestMap message;
-
-  MapTestUtil::SetMapFields(&message);
-
-  ReflectionOps::Clear(&message);
-
-  MapTestUtil::ExpectClear(message);
-}
-
-TEST(ReflectionOpsForMapFieldTest, MapDiscardUnknownFields) {
-  UNITTEST::TestMap message;
-  MapTestUtil::SetMapFields(&message);
-
-  // Set some unknown fields in message.
-  message.GetReflection()->MutableUnknownFields(&message)->AddVarint(123456,
-                                                                     654321);
-
-  // Discard them.
-  ReflectionOps::DiscardUnknownFields(&message);
-  MapTestUtil::ExpectMapFieldsSet(message);
-
-  EXPECT_EQ(0,
-            message.GetReflection()->GetUnknownFields(message).field_count());
-}
-
-TEST(ReflectionOpsForMapFieldTest, IsInitialized) {
-  UNITTEST::TestRequiredMessageMap map_message;
-
-  // Add an uninitialized message.
-  (*map_message.mutable_map_field())[0];
-  EXPECT_FALSE(ReflectionOps::IsInitialized(map_message));
-
-  // Initialize uninitialized message
-  (*map_message.mutable_map_field())[0].set_a(0);
-  (*map_message.mutable_map_field())[0].set_b(0);
-  (*map_message.mutable_map_field())[0].set_c(0);
-  EXPECT_TRUE(ReflectionOps::IsInitialized(map_message));
-}
-
-// Wire Format Test =================================================
-
-TEST(WireFormatForMapFieldTest, ParseMap) {
-  UNITTEST::TestMap source, dest;
-  std::string data;
-
-  // Serialize using the generated code.
-  MapTestUtil::SetMapFields(&source);
-  source.SerializeToString(&data);
-
-  // Parse using WireFormat.
-  io::ArrayInputStream raw_input(data.data(), data.size());
-  io::CodedInputStream input(&raw_input);
-  WireFormat::ParseAndMergePartial(&input, &dest);
-
-  // Check.
-  MapTestUtil::ExpectMapFieldsSet(dest);
-}
-
-TEST(WireFormatForMapFieldTest, MapByteSize) {
-  UNITTEST::TestMap message;
-  MapTestUtil::SetMapFields(&message);
-
-  EXPECT_EQ(message.ByteSizeLong(), WireFormat::ByteSize(message));
-  message.Clear();
-  EXPECT_EQ(0, message.ByteSizeLong());
-  EXPECT_EQ(0, WireFormat::ByteSize(message));
-}
-
-TEST(WireFormatForMapFieldTest, SerializeMap) {
-  UNITTEST::TestMap message;
-  std::string generated_data;
-  std::string dynamic_data;
-
-  MapTestUtil::SetMapFields(&message);
-
-  // Serialize using the generated code.
-  {
-    message.ByteSizeLong();
-    io::StringOutputStream raw_output(&generated_data);
-    io::CodedOutputStream output(&raw_output);
-    message.SerializeWithCachedSizes(&output);
-    ASSERT_FALSE(output.HadError());
-  }
-
-  // Serialize using WireFormat.
-  {
-    io::StringOutputStream raw_output(&dynamic_data);
-    io::CodedOutputStream output(&raw_output);
-    size_t size = WireFormat::ByteSize(message);
-    WireFormat::SerializeWithCachedSizes(message, size, &output);
-    ASSERT_FALSE(output.HadError());
-  }
-
-  // Should parse to the same message.
-  EXPECT_TRUE(TestUtil::EqualsToSerialized(message, generated_data));
-  EXPECT_TRUE(TestUtil::EqualsToSerialized(message, dynamic_data));
-}
-
-TEST(WireFormatForMapFieldTest, SerializeMapDynamicMessage) {
-  DynamicMessageFactory factory;
-  std::unique_ptr<Message> dynamic_message;
-  dynamic_message.reset(
-      factory.GetPrototype(UNITTEST::TestMap::descriptor())->New());
-  MapReflectionTester reflection_tester(UNITTEST::TestMap::descriptor());
-  reflection_tester.SetMapFieldsViaReflection(dynamic_message.get());
-  reflection_tester.ExpectMapFieldsSetViaReflection(*dynamic_message);
-
-  UNITTEST::TestMap generated_message;
-  MapTestUtil::SetMapFields(&generated_message);
-  MapTestUtil::ExpectMapFieldsSet(generated_message);
-
-  std::string generated_data;
-  std::string dynamic_data;
-
-  // Serialize.
-  generated_message.SerializeToString(&generated_data);
-  dynamic_message->SerializeToString(&dynamic_data);
-
-  // Because map serialization doesn't guarantee order, we just compare
-  // serialized size here. This is enough to tell dynamic message doesn't miss
-  // anything in serialization.
-  EXPECT_TRUE(dynamic_data.size() == generated_data.size());
-}
-
-TEST(WireFormatForMapFieldTest, MapByteSizeDynamicMessage) {
-  DynamicMessageFactory factory;
-  std::unique_ptr<Message> dynamic_message;
-  dynamic_message.reset(
-      factory.GetPrototype(UNITTEST::TestMap::descriptor())->New());
-  MapReflectionTester reflection_tester(UNITTEST::TestMap::descriptor());
-  reflection_tester.SetMapFieldsViaReflection(dynamic_message.get());
-  reflection_tester.ExpectMapFieldsSetViaReflection(*dynamic_message);
-  std::string expected_serialized_data;
-  dynamic_message->SerializeToString(&expected_serialized_data);
-  int expected_size = expected_serialized_data.size();
-  EXPECT_EQ(dynamic_message->ByteSizeLong(), expected_size);
-  TestMap expected_message;
-  expected_message.ParseFromString(expected_serialized_data);
-
-  std::unique_ptr<Message> message2;
-  message2.reset(factory.GetPrototype(UNITTEST::TestMap::descriptor())->New());
-  reflection_tester.SetMapFieldsViaMapReflection(message2.get());
-
-  const FieldDescriptor* field =
-      UNITTEST::TestMap::descriptor()->FindFieldByName("map_int32_int32");
-  const Reflection* reflection = dynamic_message->GetReflection();
-
-  // Force the map field to mark with STATE_MODIFIED_REPEATED
-  reflection->RemoveLast(dynamic_message.get(), field);
-  dynamic_message->MergeFrom(*message2);
-  dynamic_message->MergeFrom(*message2);
-  // The map field is marked as STATE_MODIFIED_REPEATED, ByteSizeLong() will use
-  // repeated field which have duplicate keys to calculate.
-  size_t duplicate_size = dynamic_message->ByteSizeLong();
-  EXPECT_TRUE(duplicate_size > expected_size);
-  std::string duplicate_serialized_data;
-  dynamic_message->SerializeToString(&duplicate_serialized_data);
-  EXPECT_EQ(dynamic_message->ByteSizeLong(), duplicate_serialized_data.size());
-
-  // Force the map field to mark with map CLEAN
-  EXPECT_EQ(reflection_tester.MapSize(
-      *dynamic_message, "map_int32_int32"), 2);
-  EXPECT_EQ(reflection_tester.MapSize(
-      *dynamic_message, "map_int32_int32"), 2);
-  EXPECT_EQ(reflection_tester.MapSize(
-      *dynamic_message, "map_int64_int64"), 2);
-  EXPECT_EQ(reflection_tester.MapSize(
-      *dynamic_message, "map_uint32_uint32"), 2);
-  EXPECT_EQ(reflection_tester.MapSize(
-      *dynamic_message, "map_uint64_uint64"), 2);
-  EXPECT_EQ(reflection_tester.MapSize(
-      *dynamic_message, "map_sint32_sint32"), 2);
-  EXPECT_EQ(reflection_tester.MapSize(
-      *dynamic_message, "map_sint64_sint64"), 2);
-  EXPECT_EQ(reflection_tester.MapSize(
-      *dynamic_message, "map_fixed32_fixed32"), 2);
-  EXPECT_EQ(reflection_tester.MapSize(
-      *dynamic_message, "map_fixed64_fixed64"), 2);
-  EXPECT_EQ(reflection_tester.MapSize(
-      *dynamic_message, "map_sfixed32_sfixed32"), 2);
-  EXPECT_EQ(reflection_tester.MapSize(
-      *dynamic_message, "map_sfixed64_sfixed64"), 2);
-  EXPECT_EQ(reflection_tester.MapSize(
-      *dynamic_message, "map_int32_float"), 2);
-  EXPECT_EQ(reflection_tester.MapSize(
-      *dynamic_message, "map_int32_double"), 2);
-  EXPECT_EQ(reflection_tester.MapSize(
-      *dynamic_message, "map_bool_bool"), 2);
-  EXPECT_EQ(reflection_tester.MapSize(
-      *dynamic_message, "map_string_string"), 2);
-  EXPECT_EQ(reflection_tester.MapSize(
-      *dynamic_message, "map_int32_bytes"), 2);
-  EXPECT_EQ(reflection_tester.MapSize(
-      *dynamic_message, "map_int32_enum"), 2);
-  EXPECT_EQ(reflection_tester.MapSize(*dynamic_message, "map_int32_foreign_message"), 2);
-  // The map field is marked as CLEAN, ByteSizeLong() will use map which do not
-  // have duplicate keys to calculate.
-  int size = dynamic_message->ByteSizeLong();
-  EXPECT_EQ(expected_size, size);
-
-  // Protobuf used to have a bug for serialize when map it marked CLEAN. It used
-  // repeated field to calculate ByteSizeLong but use map to serialize the real
-  // data, thus the ByteSizeLong may bigger than real serialized size. A crash
-  // might be happen at SerializeToString(). Or an "unexpected end group"
-  // warning was raised at parse back if user use SerializeWithCachedSizes()
-  // which avoids size check at serialize.
-  std::string serialized_data;
-  dynamic_message->SerializeToString(&serialized_data);
-  EXPECT_TRUE(dynamic_message->ParseFromString(serialized_data));
-}
-
-TEST(WireFormatForMapFieldTest, MapParseHelpers) {
-  std::string data;
-
-  {
-    // Set up.
-    UNITTEST::TestMap message;
-    MapTestUtil::SetMapFields(&message);
-    message.SerializeToString(&data);
-  }
-
-  {
-    // Test ParseFromString.
-    UNITTEST::TestMap message;
-    EXPECT_TRUE(message.ParseFromString(data));
-    MapTestUtil::ExpectMapFieldsSet(message);
-  }
-
-  {
-    // Test ParseFromIstream.
-    UNITTEST::TestMap message;
-    std::stringstream stream(data);
-    EXPECT_TRUE(message.ParseFromIstream(&stream));
-    EXPECT_TRUE(stream.eof());
-    MapTestUtil::ExpectMapFieldsSet(message);
-  }
-
-  {
-    // Test ParseFromBoundedZeroCopyStream.
-    std::string data_with_junk(data);
-    data_with_junk.append("some junk on the end");
-    io::ArrayInputStream stream(data_with_junk.data(), data_with_junk.size());
-    UNITTEST::TestMap message;
-    EXPECT_TRUE(message.ParseFromBoundedZeroCopyStream(&stream, data.size()));
-    MapTestUtil::ExpectMapFieldsSet(message);
-  }
-
-  {
-    // Test that ParseFromBoundedZeroCopyStream fails (but doesn't crash) if
-    // EOF is reached before the expected number of bytes.
-    io::ArrayInputStream stream(data.data(), data.size());
-    UNITTEST::TestAllTypes message;
-    EXPECT_FALSE(
-        message.ParseFromBoundedZeroCopyStream(&stream, data.size() + 1));
-  }
-}
-
-// Deterministic Serialization Test ==========================================
-
-template <typename T>
-static std::string DeterministicSerializationWithSerializePartialToCodedStream(
-    const T& t) {
-  const size_t size = t.ByteSizeLong();
-  std::string result(size, '\0');
-  io::ArrayOutputStream array_stream(::google::protobuf::string_as_array(&result), size);
-  io::CodedOutputStream output_stream(&array_stream);
-  output_stream.SetSerializationDeterministic(true);
-  t.SerializePartialToCodedStream(&output_stream);
-  EXPECT_FALSE(output_stream.HadError());
-  EXPECT_EQ(size, output_stream.ByteCount());
-  return result;
-}
-
-template <typename T>
-static std::string DeterministicSerializationWithSerializeToCodedStream(
-    const T& t) {
-  const size_t size = t.ByteSizeLong();
-  std::string result(size, '\0');
-  io::ArrayOutputStream array_stream(::google::protobuf::string_as_array(&result), size);
-  io::CodedOutputStream output_stream(&array_stream);
-  output_stream.SetSerializationDeterministic(true);
-  t.SerializeToCodedStream(&output_stream);
-  EXPECT_FALSE(output_stream.HadError());
-  EXPECT_EQ(size, output_stream.ByteCount());
-  return result;
-}
-
-template <typename T>
-static std::string DeterministicSerialization(const T& t) {
-  const size_t size = t.ByteSizeLong();
-  std::string result(size, '\0');
-  io::ArrayOutputStream array_stream(::google::protobuf::string_as_array(&result), size);
-  {
-    io::CodedOutputStream output_stream(&array_stream);
-    output_stream.SetSerializationDeterministic(true);
-    t.SerializeWithCachedSizes(&output_stream);
-    EXPECT_FALSE(output_stream.HadError());
-    EXPECT_EQ(size, output_stream.ByteCount());
-  }
-  EXPECT_EQ(result, DeterministicSerializationWithSerializeToCodedStream(t));
-  EXPECT_EQ(result,
-            DeterministicSerializationWithSerializePartialToCodedStream(t));
-  return result;
-}
-
-// Helper for MapSerializationTest.  Return a 7-bit ASCII string.
-static std::string ConstructKey(uint64_t n) {
-  std::string s(n % static_cast<uint64_t>(9), '\0');
-  if (s.empty()) {
-    return StrCat(n);
-  } else {
-    while (n != 0) {
-      s[n % s.size()] = (n >> 10) & 0x7f;
-      n /= 888;
-    }
-    return s;
-  }
-}
-
-TEST(MapSerializationTest, Deterministic) {
-  const int kIters = 25;
-  UNITTEST::TestMaps t;
-  UNITTEST::TestIntIntMap inner;
-  (*inner.mutable_m())[0] = (*inner.mutable_m())[10] =
-      (*inner.mutable_m())[-200] = 0;
-  uint64_t frog = 9;
-  const uint64_t multiplier = 0xa29cd16f;
-  for (int i = 0; i < kIters; i++) {
-    const int32_t i32 = static_cast<int32_t>(frog & 0xffffffff);
-    const uint32_t u32 = static_cast<uint32_t>(i32) * 91919;
-    const int64_t i64 = static_cast<int64_t>(frog);
-    const uint64_t u64 = frog * static_cast<uint64_t>(187321);
-    const bool b = i32 > 0;
-    const std::string s = ConstructKey(frog);
-    (*inner.mutable_m())[i] = i32;
-    (*t.mutable_m_int32())[i32] = (*t.mutable_m_sint32())[i32] =
-        (*t.mutable_m_sfixed32())[i32] = inner;
-    (*t.mutable_m_uint32())[u32] = (*t.mutable_m_fixed32())[u32] = inner;
-    (*t.mutable_m_int64())[i64] = (*t.mutable_m_sint64())[i64] =
-        (*t.mutable_m_sfixed64())[i64] = inner;
-    (*t.mutable_m_uint64())[u64] = (*t.mutable_m_fixed64())[u64] = inner;
-    (*t.mutable_m_bool())[b] = inner;
-    (*t.mutable_m_string())[s] = inner;
-    (*t.mutable_m_string())[s + std::string(
-                                    1 << (u32 % static_cast<uint32_t>(9)), b)] =
-        inner;
-    inner.mutable_m()->erase(i);
-    frog = frog * multiplier + i;
-    frog ^= (frog >> 41);
-  }
-
-  // Verifies if two consecutive calls to deterministic serialization produce
-  // the same bytes. Deterministic serialization means the same serialization
-  // bytes in the same binary.
-  const std::string s1 = DeterministicSerialization(t);
-  const std::string s2 = DeterministicSerialization(t);
-  EXPECT_EQ(s1, s2);
-
-  UNITTEST::TestMaps u;
-  EXPECT_TRUE(u.ParseFromString(s1));
-  EXPECT_TRUE(util::MessageDifferencer::Equals(u, t));
-}
-
-TEST(MapSerializationTest, DeterministicSubmessage) {
-  UNITTEST::TestSubmessageMaps p;
-  UNITTEST::TestMaps t;
-  const std::string filename = "golden_message_maps";
-  std::string golden;
-  GOOGLE_CHECK_OK(File::GetContents(
-      TestUtil::GetTestDataPath("net/proto2/internal/testdata/" + filename),
-      &golden, true));
-  t.ParseFromString(golden);
-  *(p.mutable_m()) = t;
-  std::vector<std::string> v;
-  // Use multiple attempts to increase the chance of a failure if something is
-  // buggy.  For example, each separate copy of a map might use a different
-  // randomly-chosen hash function.
-  const int kAttempts = 10;
-  for (int i = 0; i < kAttempts; i++) {
-    // NOLINTNEXTLINE(performance-unnecessary-copy-initialization)
-    UNITTEST::TestSubmessageMaps q(p);
-    ASSERT_EQ(DeterministicSerialization(q), DeterministicSerialization(p));
-  }
-}
-
-// Text Format Test =================================================
-
-TEST(TextFormatMapTest, SerializeAndParse) {
-  UNITTEST::TestMap source;
-  UNITTEST::TestMap dest;
-  MapTestUtil::SetMapFields(&source);
-  std::string output;
-
-  // Test compact ASCII
-  TextFormat::Printer printer;
-  printer.PrintToString(source, &output);
-  TextFormat::Parser parser;
-  EXPECT_TRUE(parser.ParseFromString(output, &dest));
-  MapTestUtil::ExpectMapFieldsSet(dest);
-}
-
-TEST(TextFormatMapTest, DynamicMessage) {
-  TestMap prototype;
-  DynamicMessageFactory factory;
-  std::unique_ptr<Message> message(
-      factory.GetPrototype(prototype.GetDescriptor())->New());
-  MapReflectionTester tester(message->GetDescriptor());
-  tester.SetMapFieldsViaReflection(message.get());
-
-  std::string expected_text;
-  GOOGLE_CHECK_OK(
-      File::GetContents(TestUtil::GetTestDataPath("net/proto2/internal/"
-                                                  "testdata/map_test_data.txt"),
-                        &expected_text, true));
-
-  CleanStringLineEndings(&expected_text, false);
-  std::string actual_text;
-  TextFormat::PrintToString(*message, &actual_text);
-  EXPECT_EQ(actual_text, expected_text);
-}
-
-TEST(TextFormatMapTest, Sorted) {
-  UNITTEST::TestMap message;
-  MapReflectionTester tester(message.GetDescriptor());
-  tester.SetMapFieldsViaReflection(&message);
-
-  std::string expected_text;
-  GOOGLE_CHECK_OK(
-      File::GetContents(TestUtil::GetTestDataPath("net/proto2/internal/"
-                                                  "testdata/map_test_data.txt"),
-                        &expected_text, true));
-
-  CleanStringLineEndings(&expected_text, false);
-  TextFormat::Printer printer;
-  std::string actual_text;
-  printer.PrintToString(message, &actual_text);
-  EXPECT_EQ(actual_text, expected_text);
-
-  // Test again on the reverse order.
-  UNITTEST::TestMap message2;
-  tester.SetMapFieldsViaReflection(&message2);
-  tester.SwapMapsViaReflection(&message2);
-  printer.PrintToString(message2, &actual_text);
-  EXPECT_EQ(actual_text, expected_text);
-}
-
-TEST(TextFormatMapTest, ParseCorruptedString) {
-  std::string serialized_message;
-  GOOGLE_CHECK_OK(
-      File::GetContents(TestUtil::GetTestDataPath(
-                            "net/proto2/internal/testdata/golden_message_maps"),
-                        &serialized_message, true));
-  UNITTEST::TestMaps message;
-  GOOGLE_CHECK(message.ParseFromString(serialized_message));
-  TestParseCorruptedString<UNITTEST::TestMaps, true>(message);
-  TestParseCorruptedString<UNITTEST::TestMaps, false>(message);
-}
-
-// Previously, serializing to text format will disable iterator from generated
-// API. Now, the iterator can be still used even after serializing to text
-// format.
-TEST(TextFormatMapTest, NoDisableIterator) {
-  UNITTEST::TestMap source;
-  (*source.mutable_map_int32_int32())[1] = 1;
-
-  // Get iterator.
-  Map<int32_t, int32_t>::iterator iter =
-      source.mutable_map_int32_int32()->find(1);
-
-  // Serialize message to text format, which will invalidate the previous
-  // iterator previously.
-  std::string output;
-  TextFormat::Printer printer;
-  printer.PrintToString(source, &output);
-
-  // Modify map via the iterator (invalidated in previous implementation.).
-  iter->second = 2;
-
-  // In previous implementation, the new change won't be reflected in text
-  // format, because the previous iterator has been invalidated.
-  output.clear();
-  printer.PrintToString(source, &output);
-  std::string expected =
-      "map_int32_int32 {\n"
-      "  key: 1\n"
-      "  value: 2\n"
-      "}\n";
-  EXPECT_EQ(output, expected);
-}
-
-// Previously, serializing to text format will disable iterator from reflection
-// API.
-TEST(TextFormatMapTest, NoDisableReflectionIterator) {
-  UNITTEST::TestMap source;
-  (*source.mutable_map_int32_int32())[1] = 1;
-
-  // Get iterator. This will also sync internal repeated field with map inside
-  // of MapField.
-  const Reflection* reflection = source.GetReflection();
-  const FieldDescriptor* field_desc =
-      source.GetDescriptor()->FindFieldByName("map_int32_int32");
-  RepeatedPtrField<Message>* map_field =
-      reflection->MutableRepeatedPtrField<Message>(&source, field_desc);
-  RepeatedPtrField<Message>::iterator iter = map_field->begin();
-
-  // Serialize message to text format, which will invalidate the previous
-  // iterator previously.
-  std::string output;
-  TextFormat::Printer printer;
-  printer.PrintToString(source, &output);
-
-  // Modify map via the iterator (invalidated in previous implementation.).
-  const Reflection* map_entry_reflection = iter->GetReflection();
-  const FieldDescriptor* value_field_desc = iter->GetDescriptor()->map_value();
-  map_entry_reflection->SetInt32(&(*iter), value_field_desc, 2);
-  GOOGLE_LOG(INFO) << iter->DebugString();
-
-  // In previous implementation, the new change won't be reflected in text
-  // format, because the previous iterator has been invalidated.
-  output.clear();
-  printer.PrintToString(source, &output);
-  std::string expected =
-      "map_int32_int32 {\n"
-      "  key: 1\n"
-      "  value: 2\n"
-      "}\n";
-  EXPECT_EQ(output, expected);
-}
-
-// arena support =================================================
-TEST(ArenaTest, ParsingAndSerializingNoHeapAllocation) {
-  // Allocate a large initial block to avoid mallocs during hooked test.
-  std::vector<char> arena_block(128 * 1024);
-  ArenaOptions options;
-  options.initial_block = &arena_block[0];
-  options.initial_block_size = arena_block.size();
-  Arena arena(options);
-  std::string data;
-  data.reserve(128 * 1024);
-
-  {
-    // TODO(teboring): Enable no heap check when ArenaStringPtr is used in map.
-    // NoHeapChecker no_heap;
-
-    UNITTEST::TestArenaMap* from =
-        Arena::CreateMessage<UNITTEST::TestArenaMap>(&arena);
-    MapTestUtil::SetArenaMapFields(from);
-    from->SerializeToString(&data);
-
-    UNITTEST::TestArenaMap* to =
-        Arena::CreateMessage<UNITTEST::TestArenaMap>(&arena);
-    to->ParseFromString(data);
-    MapTestUtil::ExpectArenaMapFieldsSet(*to);
-  }
-}
-
-TEST(ArenaTest, SubmessageOnSameArena) {
-  Arena arena;
-  for (Arena* arena_to_use : {&arena, static_cast<Arena*>(nullptr)}) {
-    ArenaHolder<UNITTEST::TestArenaMap> m(arena_to_use);
-    auto* subm = &(*m->mutable_map_int32_foreign_message())[0];
-    EXPECT_EQ(subm->GetArena(), arena_to_use);
-  }
-}
-
-// Use text format parsing and serializing to test reflection api.
-TEST(ArenaTest, ReflectionInTextFormat) {
-  Arena arena;
-  std::string data;
-
-  TextFormat::Printer printer;
-  TextFormat::Parser parser;
-
-  UNITTEST::TestArenaMap* from =
-      Arena::CreateMessage<UNITTEST::TestArenaMap>(&arena);
-  UNITTEST::TestArenaMap* to =
-      Arena::CreateMessage<UNITTEST::TestArenaMap>(&arena);
-
-  MapTestUtil::SetArenaMapFields(from);
-  printer.PrintToString(*from, &data);
-
-  EXPECT_TRUE(parser.ParseFromString(data, to));
-  MapTestUtil::ExpectArenaMapFieldsSet(*to);
-}
-
-// Make sure the memory allocated for string in map is deallocated.
-TEST(ArenaTest, StringMapNoLeak) {
-  Arena arena;
-  UNITTEST::TestArenaMap* message =
-      Arena::CreateMessage<UNITTEST::TestArenaMap>(&arena);
-  std::string data;
-  // String with length less than 16 will not be allocated from heap.
-  int original_capacity = data.capacity();
-  while (data.capacity() <= original_capacity) {
-    data.append("a");
-  }
-  (*message->mutable_map_string_string())[data] = data;
-  // We rely on heap checkers to detect memory leak for us.
-  ASSERT_FALSE(message == nullptr);
-}
-
-TEST(ArenaTest, IsInitialized) {
-  // Allocate a large initial polluted block.
-  std::vector<char> arena_block(128 * 1024);
-  std::fill(arena_block.begin(), arena_block.end(), '\xff');
-
-  ArenaOptions options;
-  options.initial_block = &arena_block[0];
-  options.initial_block_size = arena_block.size();
-  Arena arena(options);
-
-  UNITTEST::TestArenaMap* message =
-      Arena::CreateMessage<UNITTEST::TestArenaMap>(&arena);
-  EXPECT_EQ(0, (*message->mutable_map_int32_int32())[0]);
-}
-
-TEST(ArenaTest, DynamicMapFieldOnArena) {
-  Arena arena;
-  UNITTEST::TestMap message2;
-
-  DynamicMessageFactory factory;
-  Message* message1 =
-      factory.GetPrototype(UNITTEST::TestMap::descriptor())->New(&arena);
-  MapReflectionTester reflection_tester(UNITTEST::TestMap::descriptor());
-  reflection_tester.SetMapFieldsViaReflection(message1);
-  reflection_tester.ExpectMapFieldsSetViaReflection(*message1);
-  reflection_tester.ExpectMapFieldsSetViaReflectionIterator(message1);
-  message2.CopyFrom(*message1);
-  MapTestUtil::ExpectMapFieldsSet(message2);
-}
-
-TEST(ArenaTest, DynamicMapFieldOnArenaMemoryLeak) {
-  auto* desc = UNITTEST::TestMap::descriptor();
-  auto* field = desc->FindFieldByName("map_int32_int32");
-
-  Arena arena;
-  DynamicMessageFactory factory;
-  auto* message = factory.GetPrototype(desc)->New(&arena);
-  auto* reflection = message->GetReflection();
-  reflection->AddMessage(message, field);
-
-  // Force internal syncing, which initializes the mutex.
-  MapReflectionTester reflection_tester(UNITTEST::TestMap::descriptor());
-  int size = reflection_tester.MapSize(*message, "map_int32_int32");
-  EXPECT_EQ(size, 1);
-}
-
-TEST(MoveTest, MoveConstructorWorks) {
-  Map<int32_t, TestAllTypes> original_map;
-  original_map[42].mutable_optional_nested_message()->set_bb(42);
-  original_map[43].mutable_optional_nested_message()->set_bb(43);
-  const auto* nested_msg42_ptr = &original_map[42].optional_nested_message();
-  const auto* nested_msg43_ptr = &original_map[43].optional_nested_message();
-
-  Map<int32_t, TestAllTypes> moved_to_map(std::move(original_map));
-  EXPECT_TRUE(original_map.empty());
-  EXPECT_EQ(2, moved_to_map.size());
-  EXPECT_EQ(42, moved_to_map[42].optional_nested_message().bb());
-  EXPECT_EQ(43, moved_to_map[43].optional_nested_message().bb());
-  // This test takes advantage of the fact that pointers are swapped, so there
-  // should be pointer stability.
-  EXPECT_EQ(nested_msg42_ptr, &moved_to_map[42].optional_nested_message());
-  EXPECT_EQ(nested_msg43_ptr, &moved_to_map[43].optional_nested_message());
-}
-
-TEST(MoveTest, MoveAssignmentWorks) {
-  Map<int32_t, TestAllTypes> original_map;
-  original_map[42].mutable_optional_nested_message()->set_bb(42);
-  original_map[43].mutable_optional_nested_message()->set_bb(43);
-  const auto* nested_msg42_ptr = &original_map[42].optional_nested_message();
-  const auto* nested_msg43_ptr = &original_map[43].optional_nested_message();
-
-  Map<int32_t, TestAllTypes> moved_to_map = std::move(original_map);
-  EXPECT_TRUE(original_map.empty());
-  EXPECT_EQ(2, moved_to_map.size());
-  EXPECT_EQ(42, moved_to_map[42].optional_nested_message().bb());
-  EXPECT_EQ(43, moved_to_map[43].optional_nested_message().bb());
-  // This test takes advantage of the fact that pointers are swapped, so there
-  // should be pointer stability.
-  EXPECT_EQ(nested_msg42_ptr, &moved_to_map[42].optional_nested_message());
-  EXPECT_EQ(nested_msg43_ptr, &moved_to_map[43].optional_nested_message());
-}
-
-}  // namespace
-}  // namespace internal
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
diff --git a/libs/protobuf/src/google/protobuf/map_test_util.h b/libs/protobuf/src/google/protobuf/map_test_util.h
deleted file mode 100644
index f3215db..0000000
--- a/libs/protobuf/src/google/protobuf/map_test_util.h
+++ /dev/null
@@ -1,46 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef GOOGLE_PROTOBUF_MAP_TEST_UTIL_H__
-#define GOOGLE_PROTOBUF_MAP_TEST_UTIL_H__
-
-#include <google/protobuf/map_unittest.pb.h>
-#include <google/protobuf/reflection_tester.h>
-
-#define UNITTEST ::protobuf_unittest
-#define BRIDGE_UNITTEST ::google::protobuf::bridge_unittest
-
-// Must be included after defining UNITTEST, etc.
-#include <google/protobuf/map_test_util.inc>
-
-#undef UNITTEST
-#undef BRIDGE_UNITTEST
-
-#endif  // GOOGLE_PROTOBUF_MAP_TEST_UTIL_H__
diff --git a/libs/protobuf/src/google/protobuf/map_test_util.inc b/libs/protobuf/src/google/protobuf/map_test_util.inc
deleted file mode 100644
index 5b12c76..0000000
--- a/libs/protobuf/src/google/protobuf/map_test_util.inc
+++ /dev/null
@@ -1,271 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/map_test_util_impl.h>
-#include <google/protobuf/message.h>
-
-namespace google {
-namespace protobuf {
-
-class MapTestUtil {
- public:
-  // Set every field in the TestMap message to a unique value.
-  static void SetMapFields(UNITTEST::TestMap* message);
-
-  // Set every field in the TestArenaMap message to a unique value.
-  static void SetArenaMapFields(UNITTEST::TestArenaMap* message);
-
-  // Set every field in the message to a default value.
-  static void SetMapFieldsInitialized(UNITTEST::TestMap* message);
-
-  // Modify all the map fields of the message (which should already have been
-  // initialized with SetMapFields()).
-  static void ModifyMapFields(UNITTEST::TestMap* message);
-
-  // Check that all fields have the values that they should have after
-  // SetMapFields() is called.
-  static void ExpectMapFieldsSet(const UNITTEST::TestMap& message);
-
-  // Check that all fields have the values that they should have after
-  // SetMapFields() is called for TestArenaMap.
-  static void ExpectArenaMapFieldsSet(const UNITTEST::TestArenaMap& message);
-
-  // Check that all fields have the values that they should have after
-  // SetMapFieldsInitialized() is called.
-  static void ExpectMapFieldsSetInitialized(const UNITTEST::TestMap& message);
-
-  // Expect that the message is modified as would be expected from
-  // ModifyMapFields().
-  static void ExpectMapFieldsModified(const UNITTEST::TestMap& message);
-
-  // Check that all fields are empty.
-  static void ExpectClear(const UNITTEST::TestMap& message);
-
-  // Check that all map fields have the given size.
-  static void ExpectMapsSize(const UNITTEST::TestMap& message, int size);
-
-  // Get pointers of map entries at given index.
-  static std::vector<const Message*> GetMapEntries(
-      const UNITTEST::TestMap& message, int index);
-
-  // Get pointers of map entries from release.
-  static std::vector<const Message*> GetMapEntriesFromRelease(
-      UNITTEST::TestMap* message);
-};
-
-inline void MapTestUtil::SetMapFields(UNITTEST::TestMap* message) {
-  MapTestUtilImpl::SetMapFields<UNITTEST::MapEnum, UNITTEST::MAP_ENUM_BAR,
-                                UNITTEST::MAP_ENUM_BAZ>(message);
-}
-
-inline void MapTestUtil::SetArenaMapFields(UNITTEST::TestArenaMap* message) {
-  MapTestUtilImpl::SetArenaMapFields<UNITTEST::MapEnum, UNITTEST::MAP_ENUM_BAR,
-                                     UNITTEST::MAP_ENUM_BAZ>(message);
-}
-
-inline void MapTestUtil::SetMapFieldsInitialized(UNITTEST::TestMap* message) {
-  MapTestUtilImpl::SetMapFieldsInitialized(message);
-}
-
-inline void MapTestUtil::ModifyMapFields(UNITTEST::TestMap* message) {
-  MapTestUtilImpl::ModifyMapFields<UNITTEST::MapEnum, UNITTEST::MAP_ENUM_FOO>(
-      message);
-}
-
-inline void MapTestUtil::ExpectClear(const UNITTEST::TestMap& message) {
-  MapTestUtilImpl::ExpectClear(message);
-}
-
-inline void MapTestUtil::ExpectMapFieldsSet(const UNITTEST::TestMap& message) {
-  MapTestUtilImpl::ExpectMapFieldsSet<UNITTEST::MapEnum, UNITTEST::MAP_ENUM_BAR,
-                                      UNITTEST::MAP_ENUM_BAZ>(message);
-}
-
-inline void MapTestUtil::ExpectArenaMapFieldsSet(
-    const UNITTEST::TestArenaMap& message) {
-  MapTestUtilImpl::ExpectArenaMapFieldsSet<
-      UNITTEST::MapEnum, UNITTEST::MAP_ENUM_BAR, UNITTEST::MAP_ENUM_BAZ>(
-      message);
-}
-
-inline void MapTestUtil::ExpectMapFieldsSetInitialized(
-    const UNITTEST::TestMap& message) {
-  MapTestUtilImpl::ExpectMapFieldsSetInitialized<UNITTEST::MapEnum,
-                                                 UNITTEST::MAP_ENUM_FOO>(
-      message);
-}
-
-inline void MapTestUtil::ExpectMapFieldsModified(
-    const UNITTEST::TestMap& message) {
-  MapTestUtilImpl::ExpectMapFieldsModified<
-      UNITTEST::MapEnum, UNITTEST::MAP_ENUM_BAR, UNITTEST::MAP_ENUM_FOO>(
-      message);
-}
-
-inline void MapTestUtil::ExpectMapsSize(const UNITTEST::TestMap& message,
-                                        int size) {
-  const Descriptor* descriptor = message.GetDescriptor();
-
-  EXPECT_EQ(size, message.GetReflection()->FieldSize(
-                      message, descriptor->FindFieldByName("map_int32_int32")));
-  EXPECT_EQ(size, message.GetReflection()->FieldSize(
-                      message, descriptor->FindFieldByName("map_int64_int64")));
-  EXPECT_EQ(size,
-            message.GetReflection()->FieldSize(
-                message, descriptor->FindFieldByName("map_uint32_uint32")));
-  EXPECT_EQ(size,
-            message.GetReflection()->FieldSize(
-                message, descriptor->FindFieldByName("map_uint64_uint64")));
-  EXPECT_EQ(size,
-            message.GetReflection()->FieldSize(
-                message, descriptor->FindFieldByName("map_sint32_sint32")));
-  EXPECT_EQ(size,
-            message.GetReflection()->FieldSize(
-                message, descriptor->FindFieldByName("map_sint64_sint64")));
-  EXPECT_EQ(size,
-            message.GetReflection()->FieldSize(
-                message, descriptor->FindFieldByName("map_fixed32_fixed32")));
-  EXPECT_EQ(size,
-            message.GetReflection()->FieldSize(
-                message, descriptor->FindFieldByName("map_fixed64_fixed64")));
-  EXPECT_EQ(size,
-            message.GetReflection()->FieldSize(
-                message, descriptor->FindFieldByName("map_sfixed32_sfixed32")));
-  EXPECT_EQ(size,
-            message.GetReflection()->FieldSize(
-                message, descriptor->FindFieldByName("map_sfixed64_sfixed64")));
-  EXPECT_EQ(size, message.GetReflection()->FieldSize(
-                      message, descriptor->FindFieldByName("map_int32_float")));
-  EXPECT_EQ(size,
-            message.GetReflection()->FieldSize(
-                message, descriptor->FindFieldByName("map_int32_double")));
-  EXPECT_EQ(size, message.GetReflection()->FieldSize(
-                      message, descriptor->FindFieldByName("map_bool_bool")));
-  EXPECT_EQ(size,
-            message.GetReflection()->FieldSize(
-                message, descriptor->FindFieldByName("map_string_string")));
-  EXPECT_EQ(size, message.GetReflection()->FieldSize(
-                      message, descriptor->FindFieldByName("map_int32_bytes")));
-  EXPECT_EQ(
-      size,
-      message.GetReflection()->FieldSize(
-          message, descriptor->FindFieldByName("map_int32_foreign_message")));
-}
-
-inline std::vector<const Message*> MapTestUtil::GetMapEntries(
-    const UNITTEST::TestMap& message, int index) {
-  const Descriptor* descriptor = message.GetDescriptor();
-  std::vector<const Message*> result;
-
-  result.push_back(&message.GetReflection()->GetRepeatedMessage(
-      message, descriptor->FindFieldByName("map_int32_int32"), index));
-  result.push_back(&message.GetReflection()->GetRepeatedMessage(
-      message, descriptor->FindFieldByName("map_int64_int64"), index));
-  result.push_back(&message.GetReflection()->GetRepeatedMessage(
-      message, descriptor->FindFieldByName("map_uint32_uint32"), index));
-  result.push_back(&message.GetReflection()->GetRepeatedMessage(
-      message, descriptor->FindFieldByName("map_uint64_uint64"), index));
-  result.push_back(&message.GetReflection()->GetRepeatedMessage(
-      message, descriptor->FindFieldByName("map_sint32_sint32"), index));
-  result.push_back(&message.GetReflection()->GetRepeatedMessage(
-      message, descriptor->FindFieldByName("map_sint64_sint64"), index));
-  result.push_back(&message.GetReflection()->GetRepeatedMessage(
-      message, descriptor->FindFieldByName("map_fixed32_fixed32"), index));
-  result.push_back(&message.GetReflection()->GetRepeatedMessage(
-      message, descriptor->FindFieldByName("map_fixed64_fixed64"), index));
-  result.push_back(&message.GetReflection()->GetRepeatedMessage(
-      message, descriptor->FindFieldByName("map_sfixed32_sfixed32"), index));
-  result.push_back(&message.GetReflection()->GetRepeatedMessage(
-      message, descriptor->FindFieldByName("map_sfixed64_sfixed64"), index));
-  result.push_back(&message.GetReflection()->GetRepeatedMessage(
-      message, descriptor->FindFieldByName("map_int32_float"), index));
-  result.push_back(&message.GetReflection()->GetRepeatedMessage(
-      message, descriptor->FindFieldByName("map_int32_double"), index));
-  result.push_back(&message.GetReflection()->GetRepeatedMessage(
-      message, descriptor->FindFieldByName("map_bool_bool"), index));
-  result.push_back(&message.GetReflection()->GetRepeatedMessage(
-      message, descriptor->FindFieldByName("map_string_string"), index));
-  result.push_back(&message.GetReflection()->GetRepeatedMessage(
-      message, descriptor->FindFieldByName("map_int32_bytes"), index));
-  result.push_back(&message.GetReflection()->GetRepeatedMessage(
-      message, descriptor->FindFieldByName("map_int32_enum"), index));
-  result.push_back(&message.GetReflection()->GetRepeatedMessage(
-      message, descriptor->FindFieldByName("map_int32_foreign_message"),
-      index));
-
-  return result;
-}
-
-inline std::vector<const Message*> MapTestUtil::GetMapEntriesFromRelease(
-    UNITTEST::TestMap* message) {
-  const Descriptor* descriptor = message->GetDescriptor();
-  std::vector<const Message*> result;
-
-  result.push_back(message->GetReflection()->ReleaseLast(
-      message, descriptor->FindFieldByName("map_int32_int32")));
-  result.push_back(message->GetReflection()->ReleaseLast(
-      message, descriptor->FindFieldByName("map_int64_int64")));
-  result.push_back(message->GetReflection()->ReleaseLast(
-      message, descriptor->FindFieldByName("map_uint32_uint32")));
-  result.push_back(message->GetReflection()->ReleaseLast(
-      message, descriptor->FindFieldByName("map_uint64_uint64")));
-  result.push_back(message->GetReflection()->ReleaseLast(
-      message, descriptor->FindFieldByName("map_sint32_sint32")));
-  result.push_back(message->GetReflection()->ReleaseLast(
-      message, descriptor->FindFieldByName("map_sint64_sint64")));
-  result.push_back(message->GetReflection()->ReleaseLast(
-      message, descriptor->FindFieldByName("map_fixed32_fixed32")));
-  result.push_back(message->GetReflection()->ReleaseLast(
-      message, descriptor->FindFieldByName("map_fixed64_fixed64")));
-  result.push_back(message->GetReflection()->ReleaseLast(
-      message, descriptor->FindFieldByName("map_sfixed32_sfixed32")));
-  result.push_back(message->GetReflection()->ReleaseLast(
-      message, descriptor->FindFieldByName("map_sfixed64_sfixed64")));
-  result.push_back(message->GetReflection()->ReleaseLast(
-      message, descriptor->FindFieldByName("map_int32_float")));
-  result.push_back(message->GetReflection()->ReleaseLast(
-      message, descriptor->FindFieldByName("map_int32_double")));
-  result.push_back(message->GetReflection()->ReleaseLast(
-      message, descriptor->FindFieldByName("map_bool_bool")));
-  result.push_back(message->GetReflection()->ReleaseLast(
-      message, descriptor->FindFieldByName("map_string_string")));
-  result.push_back(message->GetReflection()->ReleaseLast(
-      message, descriptor->FindFieldByName("map_int32_bytes")));
-  result.push_back(message->GetReflection()->ReleaseLast(
-      message, descriptor->FindFieldByName("map_int32_enum")));
-  result.push_back(message->GetReflection()->ReleaseLast(
-      message, descriptor->FindFieldByName("map_int32_foreign_message")));
-
-  return result;
-}
-
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/map_test_util_impl.h b/libs/protobuf/src/google/protobuf/map_test_util_impl.h
deleted file mode 100644
index 655aec8..0000000
--- a/libs/protobuf/src/google/protobuf/map_test_util_impl.h
+++ /dev/null
@@ -1,476 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef GOOGLE_PROTOBUF_MAP_TEST_UTIL_IMPL_H__
-#define GOOGLE_PROTOBUF_MAP_TEST_UTIL_IMPL_H__
-
-#include <google/protobuf/stubs/logging.h>
-#include <google/protobuf/stubs/common.h>
-#include <gtest/gtest.h>
-
-
-namespace protobuf_unittest {}  // namespace protobuf_unittest
-
-namespace google {
-namespace protobuf {
-
-namespace unittest = ::protobuf_unittest;
-
-class MapTestUtilImpl {
- public:
-  // Set every field in the TestMap message to a unique value.
-  template <typename EnumType, EnumType enum_value0, EnumType enum_value1,
-            typename MapMessage>
-  static void SetMapFields(MapMessage* message);
-
-  // Set every field in the TestArenaMap message to a unique value.
-  template <typename EnumType, EnumType enum_value0, EnumType enum_value1,
-            typename MapMessage>
-  static void SetArenaMapFields(MapMessage* message);
-
-  // Set every field in the message to a default value.
-  template <typename MapMessage>
-  static void SetMapFieldsInitialized(MapMessage* message);
-
-  // Modify all the map fields of the message (which should already have been
-  // initialized with SetMapFields()).
-  template <typename EnumType, EnumType enum_value, typename MapMessage>
-  static void ModifyMapFields(MapMessage* message);
-
-  // Check that all fields have the values that they should have after
-  // SetMapFields() is called.
-  template <typename EnumType, EnumType enum_value0, EnumType enum_value1,
-            typename MapMessage>
-  static void ExpectMapFieldsSet(const MapMessage& message);
-
-  // Check that all fields have the values that they should have after
-  // SetMapFields() is called for TestArenaMap.
-  template <typename EnumType, EnumType enum_value0, EnumType enum_value1,
-            typename MapMessage>
-  static void ExpectArenaMapFieldsSet(const MapMessage& message);
-
-  // Check that all fields have the values that they should have after
-  // SetMapFieldsInitialized() is called.
-  template <typename EnumType, EnumType enum_value, typename MapMessage>
-  static void ExpectMapFieldsSetInitialized(const MapMessage& message);
-
-  // Expect that the message is modified as would be expected from
-  // ModifyMapFields().
-  template <typename EnumType, EnumType enum_value0, EnumType enum_value1,
-            typename MapMessage>
-  static void ExpectMapFieldsModified(const MapMessage& message);
-
-  // Check that all fields are empty.
-  template <typename MapMessage>
-  static void ExpectClear(const MapMessage& message);
-
-  // // Check that all map fields have the given size.
-  // template <typename MapMessage>
-  // static void ExpectMapsSize(const MapMessage& message, int size);
-
-  // // Get pointers of map entries at given index.
-  // static std::vector<const Message*> GetMapEntries(
-  //     const MapMessage& message, int index);
-
-  // // Get pointers of map entries from release.
-  // static std::vector<const Message*> GetMapEntriesFromRelease(
-  //     MapMessage* message);
-};
-
-template <typename EnumType, EnumType enum_value0, EnumType enum_value1,
-          typename MapMessage>
-void MapTestUtilImpl::SetMapFields(MapMessage* message) {
-  // Add first element.
-  (*message->mutable_map_int32_int32())[0] = 0;
-  (*message->mutable_map_int64_int64())[0] = 0;
-  (*message->mutable_map_uint32_uint32())[0] = 0;
-  (*message->mutable_map_uint64_uint64())[0] = 0;
-  (*message->mutable_map_sint32_sint32())[0] = 0;
-  (*message->mutable_map_sint64_sint64())[0] = 0;
-  (*message->mutable_map_fixed32_fixed32())[0] = 0;
-  (*message->mutable_map_fixed64_fixed64())[0] = 0;
-  (*message->mutable_map_sfixed32_sfixed32())[0] = 0;
-  (*message->mutable_map_sfixed64_sfixed64())[0] = 0;
-  (*message->mutable_map_int32_float())[0] = 0.0;
-  (*message->mutable_map_int32_double())[0] = 0.0;
-  (*message->mutable_map_bool_bool())[0] = false;
-  (*message->mutable_map_string_string())["0"] = "0";
-  (*message->mutable_map_int32_bytes())[0] = "0";
-  (*message->mutable_map_int32_enum())[0] = enum_value0;
-  (*message->mutable_map_int32_foreign_message())[0].set_c(0);
-
-  // Add second element
-  (*message->mutable_map_int32_int32())[1] = 1;
-  (*message->mutable_map_int64_int64())[1] = 1;
-  (*message->mutable_map_uint32_uint32())[1] = 1;
-  (*message->mutable_map_uint64_uint64())[1] = 1;
-  (*message->mutable_map_sint32_sint32())[1] = 1;
-  (*message->mutable_map_sint64_sint64())[1] = 1;
-  (*message->mutable_map_fixed32_fixed32())[1] = 1;
-  (*message->mutable_map_fixed64_fixed64())[1] = 1;
-  (*message->mutable_map_sfixed32_sfixed32())[1] = 1;
-  (*message->mutable_map_sfixed64_sfixed64())[1] = 1;
-  (*message->mutable_map_int32_float())[1] = 1.0;
-  (*message->mutable_map_int32_double())[1] = 1.0;
-  (*message->mutable_map_bool_bool())[1] = true;
-  (*message->mutable_map_string_string())["1"] = "1";
-  (*message->mutable_map_int32_bytes())[1] = "1";
-  (*message->mutable_map_int32_enum())[1] = enum_value1;
-  (*message->mutable_map_int32_foreign_message())[1].set_c(1);
-}
-
-template <typename EnumType, EnumType enum_value0, EnumType enum_value1,
-          typename MapMessage>
-void MapTestUtilImpl::SetArenaMapFields(MapMessage* message) {
-  // Add first element.
-  (*message->mutable_map_int32_int32())[0] = 0;
-  (*message->mutable_map_int64_int64())[0] = 0;
-  (*message->mutable_map_uint32_uint32())[0] = 0;
-  (*message->mutable_map_uint64_uint64())[0] = 0;
-  (*message->mutable_map_sint32_sint32())[0] = 0;
-  (*message->mutable_map_sint64_sint64())[0] = 0;
-  (*message->mutable_map_fixed32_fixed32())[0] = 0;
-  (*message->mutable_map_fixed64_fixed64())[0] = 0;
-  (*message->mutable_map_sfixed32_sfixed32())[0] = 0;
-  (*message->mutable_map_sfixed64_sfixed64())[0] = 0;
-  (*message->mutable_map_int32_float())[0] = 0.0;
-  (*message->mutable_map_int32_double())[0] = 0.0;
-  (*message->mutable_map_bool_bool())[0] = false;
-  (*message->mutable_map_string_string())["0"] = "0";
-  (*message->mutable_map_int32_bytes())[0] = "0";
-  (*message->mutable_map_int32_enum())[0] = enum_value0;
-  (*message->mutable_map_int32_foreign_message())[0].set_c(0);
-
-  // Add second element
-  (*message->mutable_map_int32_int32())[1] = 1;
-  (*message->mutable_map_int64_int64())[1] = 1;
-  (*message->mutable_map_uint32_uint32())[1] = 1;
-  (*message->mutable_map_uint64_uint64())[1] = 1;
-  (*message->mutable_map_sint32_sint32())[1] = 1;
-  (*message->mutable_map_sint64_sint64())[1] = 1;
-  (*message->mutable_map_fixed32_fixed32())[1] = 1;
-  (*message->mutable_map_fixed64_fixed64())[1] = 1;
-  (*message->mutable_map_sfixed32_sfixed32())[1] = 1;
-  (*message->mutable_map_sfixed64_sfixed64())[1] = 1;
-  (*message->mutable_map_int32_float())[1] = 1.0;
-  (*message->mutable_map_int32_double())[1] = 1.0;
-  (*message->mutable_map_bool_bool())[1] = true;
-  (*message->mutable_map_string_string())["1"] = "1";
-  (*message->mutable_map_int32_bytes())[1] = "1";
-  (*message->mutable_map_int32_enum())[1] = enum_value1;
-  (*message->mutable_map_int32_foreign_message())[1].set_c(1);
-}
-
-template <typename MapMessage>
-void MapTestUtilImpl::SetMapFieldsInitialized(MapMessage* message) {
-  // Add first element using bracket operator, which should assign default
-  // value automatically.
-  (*message->mutable_map_int32_int32())[0];
-  (*message->mutable_map_int64_int64())[0];
-  (*message->mutable_map_uint32_uint32())[0];
-  (*message->mutable_map_uint64_uint64())[0];
-  (*message->mutable_map_sint32_sint32())[0];
-  (*message->mutable_map_sint64_sint64())[0];
-  (*message->mutable_map_fixed32_fixed32())[0];
-  (*message->mutable_map_fixed64_fixed64())[0];
-  (*message->mutable_map_sfixed32_sfixed32())[0];
-  (*message->mutable_map_sfixed64_sfixed64())[0];
-  (*message->mutable_map_int32_float())[0];
-  (*message->mutable_map_int32_double())[0];
-  (*message->mutable_map_bool_bool())[0];
-  (*message->mutable_map_string_string())["0"];
-  (*message->mutable_map_int32_bytes())[0];
-  (*message->mutable_map_int32_enum())[0];
-  (*message->mutable_map_int32_foreign_message())[0];
-}
-
-template <typename EnumType, EnumType enum_value, typename MapMessage>
-void MapTestUtilImpl::ModifyMapFields(MapMessage* message) {
-  (*message->mutable_map_int32_int32())[1] = 2;
-  (*message->mutable_map_int64_int64())[1] = 2;
-  (*message->mutable_map_uint32_uint32())[1] = 2;
-  (*message->mutable_map_uint64_uint64())[1] = 2;
-  (*message->mutable_map_sint32_sint32())[1] = 2;
-  (*message->mutable_map_sint64_sint64())[1] = 2;
-  (*message->mutable_map_fixed32_fixed32())[1] = 2;
-  (*message->mutable_map_fixed64_fixed64())[1] = 2;
-  (*message->mutable_map_sfixed32_sfixed32())[1] = 2;
-  (*message->mutable_map_sfixed64_sfixed64())[1] = 2;
-  (*message->mutable_map_int32_float())[1] = 2.0;
-  (*message->mutable_map_int32_double())[1] = 2.0;
-  (*message->mutable_map_bool_bool())[1] = false;
-  (*message->mutable_map_string_string())["1"] = "2";
-  (*message->mutable_map_int32_bytes())[1] = "2";
-  (*message->mutable_map_int32_enum())[1] = enum_value;
-  (*message->mutable_map_int32_foreign_message())[1].set_c(2);
-}
-
-template <typename MapMessage>
-void MapTestUtilImpl::ExpectClear(const MapMessage& message) {
-  EXPECT_EQ(0, message.map_int32_int32().size());
-  EXPECT_EQ(0, message.map_int64_int64().size());
-  EXPECT_EQ(0, message.map_uint32_uint32().size());
-  EXPECT_EQ(0, message.map_uint64_uint64().size());
-  EXPECT_EQ(0, message.map_sint32_sint32().size());
-  EXPECT_EQ(0, message.map_sint64_sint64().size());
-  EXPECT_EQ(0, message.map_fixed32_fixed32().size());
-  EXPECT_EQ(0, message.map_fixed64_fixed64().size());
-  EXPECT_EQ(0, message.map_sfixed32_sfixed32().size());
-  EXPECT_EQ(0, message.map_sfixed64_sfixed64().size());
-  EXPECT_EQ(0, message.map_int32_float().size());
-  EXPECT_EQ(0, message.map_int32_double().size());
-  EXPECT_EQ(0, message.map_bool_bool().size());
-  EXPECT_EQ(0, message.map_string_string().size());
-  EXPECT_EQ(0, message.map_int32_bytes().size());
-  EXPECT_EQ(0, message.map_int32_enum().size());
-  EXPECT_EQ(0, message.map_int32_foreign_message().size());
-}
-
-template <typename EnumType, EnumType enum_value0, EnumType enum_value1,
-          typename MapMessage>
-void MapTestUtilImpl::ExpectMapFieldsSet(const MapMessage& message) {
-  ASSERT_EQ(2, message.map_int32_int32().size());
-  ASSERT_EQ(2, message.map_int64_int64().size());
-  ASSERT_EQ(2, message.map_uint32_uint32().size());
-  ASSERT_EQ(2, message.map_uint64_uint64().size());
-  ASSERT_EQ(2, message.map_sint32_sint32().size());
-  ASSERT_EQ(2, message.map_sint64_sint64().size());
-  ASSERT_EQ(2, message.map_fixed32_fixed32().size());
-  ASSERT_EQ(2, message.map_fixed64_fixed64().size());
-  ASSERT_EQ(2, message.map_sfixed32_sfixed32().size());
-  ASSERT_EQ(2, message.map_sfixed64_sfixed64().size());
-  ASSERT_EQ(2, message.map_int32_float().size());
-  ASSERT_EQ(2, message.map_int32_double().size());
-  ASSERT_EQ(2, message.map_bool_bool().size());
-  ASSERT_EQ(2, message.map_string_string().size());
-  ASSERT_EQ(2, message.map_int32_bytes().size());
-  ASSERT_EQ(2, message.map_int32_enum().size());
-  ASSERT_EQ(2, message.map_int32_foreign_message().size());
-
-  EXPECT_EQ(0, message.map_int32_int32().at(0));
-  EXPECT_EQ(0, message.map_int64_int64().at(0));
-  EXPECT_EQ(0, message.map_uint32_uint32().at(0));
-  EXPECT_EQ(0, message.map_uint64_uint64().at(0));
-  EXPECT_EQ(0, message.map_sint32_sint32().at(0));
-  EXPECT_EQ(0, message.map_sint64_sint64().at(0));
-  EXPECT_EQ(0, message.map_fixed32_fixed32().at(0));
-  EXPECT_EQ(0, message.map_fixed64_fixed64().at(0));
-  EXPECT_EQ(0, message.map_sfixed32_sfixed32().at(0));
-  EXPECT_EQ(0, message.map_sfixed64_sfixed64().at(0));
-  EXPECT_EQ(0, message.map_int32_float().at(0));
-  EXPECT_EQ(0, message.map_int32_double().at(0));
-  EXPECT_EQ(false, message.map_bool_bool().at(0));
-  EXPECT_EQ("0", message.map_string_string().at("0"));
-  EXPECT_EQ("0", message.map_int32_bytes().at(0));
-  EXPECT_EQ(enum_value0, message.map_int32_enum().at(0));
-  EXPECT_EQ(0, message.map_int32_foreign_message().at(0).c());
-
-  EXPECT_EQ(1, message.map_int32_int32().at(1));
-  EXPECT_EQ(1, message.map_int64_int64().at(1));
-  EXPECT_EQ(1, message.map_uint32_uint32().at(1));
-  EXPECT_EQ(1, message.map_uint64_uint64().at(1));
-  EXPECT_EQ(1, message.map_sint32_sint32().at(1));
-  EXPECT_EQ(1, message.map_sint64_sint64().at(1));
-  EXPECT_EQ(1, message.map_fixed32_fixed32().at(1));
-  EXPECT_EQ(1, message.map_fixed64_fixed64().at(1));
-  EXPECT_EQ(1, message.map_sfixed32_sfixed32().at(1));
-  EXPECT_EQ(1, message.map_sfixed64_sfixed64().at(1));
-  EXPECT_EQ(1, message.map_int32_float().at(1));
-  EXPECT_EQ(1, message.map_int32_double().at(1));
-  EXPECT_EQ(true, message.map_bool_bool().at(1));
-  EXPECT_EQ("1", message.map_string_string().at("1"));
-  EXPECT_EQ("1", message.map_int32_bytes().at(1));
-  EXPECT_EQ(enum_value1, message.map_int32_enum().at(1));
-  EXPECT_EQ(1, message.map_int32_foreign_message().at(1).c());
-}
-
-template <typename EnumType, EnumType enum_value0, EnumType enum_value1,
-          typename MapMessage>
-void MapTestUtilImpl::ExpectArenaMapFieldsSet(const MapMessage& message) {
-  EXPECT_EQ(2, message.map_int32_int32().size());
-  EXPECT_EQ(2, message.map_int64_int64().size());
-  EXPECT_EQ(2, message.map_uint32_uint32().size());
-  EXPECT_EQ(2, message.map_uint64_uint64().size());
-  EXPECT_EQ(2, message.map_sint32_sint32().size());
-  EXPECT_EQ(2, message.map_sint64_sint64().size());
-  EXPECT_EQ(2, message.map_fixed32_fixed32().size());
-  EXPECT_EQ(2, message.map_fixed64_fixed64().size());
-  EXPECT_EQ(2, message.map_sfixed32_sfixed32().size());
-  EXPECT_EQ(2, message.map_sfixed64_sfixed64().size());
-  EXPECT_EQ(2, message.map_int32_float().size());
-  EXPECT_EQ(2, message.map_int32_double().size());
-  EXPECT_EQ(2, message.map_bool_bool().size());
-  EXPECT_EQ(2, message.map_string_string().size());
-  EXPECT_EQ(2, message.map_int32_bytes().size());
-  EXPECT_EQ(2, message.map_int32_enum().size());
-  EXPECT_EQ(2, message.map_int32_foreign_message().size());
-
-  EXPECT_EQ(0, message.map_int32_int32().at(0));
-  EXPECT_EQ(0, message.map_int64_int64().at(0));
-  EXPECT_EQ(0, message.map_uint32_uint32().at(0));
-  EXPECT_EQ(0, message.map_uint64_uint64().at(0));
-  EXPECT_EQ(0, message.map_sint32_sint32().at(0));
-  EXPECT_EQ(0, message.map_sint64_sint64().at(0));
-  EXPECT_EQ(0, message.map_fixed32_fixed32().at(0));
-  EXPECT_EQ(0, message.map_fixed64_fixed64().at(0));
-  EXPECT_EQ(0, message.map_sfixed32_sfixed32().at(0));
-  EXPECT_EQ(0, message.map_sfixed64_sfixed64().at(0));
-  EXPECT_EQ(0, message.map_int32_float().at(0));
-  EXPECT_EQ(0, message.map_int32_double().at(0));
-  EXPECT_EQ(false, message.map_bool_bool().at(0));
-  EXPECT_EQ("0", message.map_string_string().at("0"));
-  EXPECT_EQ("0", message.map_int32_bytes().at(0));
-  EXPECT_EQ(enum_value0, message.map_int32_enum().at(0));
-  EXPECT_EQ(0, message.map_int32_foreign_message().at(0).c());
-
-  EXPECT_EQ(1, message.map_int32_int32().at(1));
-  EXPECT_EQ(1, message.map_int64_int64().at(1));
-  EXPECT_EQ(1, message.map_uint32_uint32().at(1));
-  EXPECT_EQ(1, message.map_uint64_uint64().at(1));
-  EXPECT_EQ(1, message.map_sint32_sint32().at(1));
-  EXPECT_EQ(1, message.map_sint64_sint64().at(1));
-  EXPECT_EQ(1, message.map_fixed32_fixed32().at(1));
-  EXPECT_EQ(1, message.map_fixed64_fixed64().at(1));
-  EXPECT_EQ(1, message.map_sfixed32_sfixed32().at(1));
-  EXPECT_EQ(1, message.map_sfixed64_sfixed64().at(1));
-  EXPECT_EQ(1, message.map_int32_float().at(1));
-  EXPECT_EQ(1, message.map_int32_double().at(1));
-  EXPECT_EQ(true, message.map_bool_bool().at(1));
-  EXPECT_EQ("1", message.map_string_string().at("1"));
-  EXPECT_EQ("1", message.map_int32_bytes().at(1));
-  EXPECT_EQ(enum_value1, message.map_int32_enum().at(1));
-  EXPECT_EQ(1, message.map_int32_foreign_message().at(1).c());
-}
-
-template <typename EnumType, EnumType enum_value, typename MapMessage>
-void MapTestUtilImpl::ExpectMapFieldsSetInitialized(const MapMessage& message) {
-  EXPECT_EQ(1, message.map_int32_int32().size());
-  EXPECT_EQ(1, message.map_int64_int64().size());
-  EXPECT_EQ(1, message.map_uint32_uint32().size());
-  EXPECT_EQ(1, message.map_uint64_uint64().size());
-  EXPECT_EQ(1, message.map_sint32_sint32().size());
-  EXPECT_EQ(1, message.map_sint64_sint64().size());
-  EXPECT_EQ(1, message.map_fixed32_fixed32().size());
-  EXPECT_EQ(1, message.map_fixed64_fixed64().size());
-  EXPECT_EQ(1, message.map_sfixed32_sfixed32().size());
-  EXPECT_EQ(1, message.map_sfixed64_sfixed64().size());
-  EXPECT_EQ(1, message.map_int32_float().size());
-  EXPECT_EQ(1, message.map_int32_double().size());
-  EXPECT_EQ(1, message.map_bool_bool().size());
-  EXPECT_EQ(1, message.map_string_string().size());
-  EXPECT_EQ(1, message.map_int32_bytes().size());
-  EXPECT_EQ(1, message.map_int32_enum().size());
-  EXPECT_EQ(1, message.map_int32_foreign_message().size());
-
-  EXPECT_EQ(0, message.map_int32_int32().at(0));
-  EXPECT_EQ(0, message.map_int64_int64().at(0));
-  EXPECT_EQ(0, message.map_uint32_uint32().at(0));
-  EXPECT_EQ(0, message.map_uint64_uint64().at(0));
-  EXPECT_EQ(0, message.map_sint32_sint32().at(0));
-  EXPECT_EQ(0, message.map_sint64_sint64().at(0));
-  EXPECT_EQ(0, message.map_fixed32_fixed32().at(0));
-  EXPECT_EQ(0, message.map_fixed64_fixed64().at(0));
-  EXPECT_EQ(0, message.map_sfixed32_sfixed32().at(0));
-  EXPECT_EQ(0, message.map_sfixed64_sfixed64().at(0));
-  EXPECT_EQ(0, message.map_int32_float().at(0));
-  EXPECT_EQ(0, message.map_int32_double().at(0));
-  EXPECT_EQ(false, message.map_bool_bool().at(0));
-  EXPECT_EQ("", message.map_string_string().at("0"));
-  EXPECT_EQ("", message.map_int32_bytes().at(0));
-  EXPECT_EQ(enum_value, message.map_int32_enum().at(0));
-  EXPECT_EQ(0, message.map_int32_foreign_message().at(0).ByteSizeLong());
-}
-
-template <typename EnumType, EnumType enum_value0, EnumType enum_value1,
-          typename MapMessage>
-void MapTestUtilImpl::ExpectMapFieldsModified(const MapMessage& message) {
-  // ModifyMapFields only sets the second element of each field.  In addition to
-  // verifying this, we also verify that the first element and size were *not*
-  // modified.
-  EXPECT_EQ(2, message.map_int32_int32().size());
-  EXPECT_EQ(2, message.map_int64_int64().size());
-  EXPECT_EQ(2, message.map_uint32_uint32().size());
-  EXPECT_EQ(2, message.map_uint64_uint64().size());
-  EXPECT_EQ(2, message.map_sint32_sint32().size());
-  EXPECT_EQ(2, message.map_sint64_sint64().size());
-  EXPECT_EQ(2, message.map_fixed32_fixed32().size());
-  EXPECT_EQ(2, message.map_fixed64_fixed64().size());
-  EXPECT_EQ(2, message.map_sfixed32_sfixed32().size());
-  EXPECT_EQ(2, message.map_sfixed64_sfixed64().size());
-  EXPECT_EQ(2, message.map_int32_float().size());
-  EXPECT_EQ(2, message.map_int32_double().size());
-  EXPECT_EQ(2, message.map_bool_bool().size());
-  EXPECT_EQ(2, message.map_string_string().size());
-  EXPECT_EQ(2, message.map_int32_bytes().size());
-  EXPECT_EQ(2, message.map_int32_enum().size());
-  EXPECT_EQ(2, message.map_int32_foreign_message().size());
-
-  EXPECT_EQ(0, message.map_int32_int32().at(0));
-  EXPECT_EQ(0, message.map_int64_int64().at(0));
-  EXPECT_EQ(0, message.map_uint32_uint32().at(0));
-  EXPECT_EQ(0, message.map_uint64_uint64().at(0));
-  EXPECT_EQ(0, message.map_sint32_sint32().at(0));
-  EXPECT_EQ(0, message.map_sint64_sint64().at(0));
-  EXPECT_EQ(0, message.map_fixed32_fixed32().at(0));
-  EXPECT_EQ(0, message.map_fixed64_fixed64().at(0));
-  EXPECT_EQ(0, message.map_sfixed32_sfixed32().at(0));
-  EXPECT_EQ(0, message.map_sfixed64_sfixed64().at(0));
-  EXPECT_EQ(0, message.map_int32_float().at(0));
-  EXPECT_EQ(0, message.map_int32_double().at(0));
-  EXPECT_EQ(false, message.map_bool_bool().at(0));
-  EXPECT_EQ("0", message.map_string_string().at("0"));
-  EXPECT_EQ("0", message.map_int32_bytes().at(0));
-  EXPECT_EQ(enum_value0, message.map_int32_enum().at(0));
-  EXPECT_EQ(0, message.map_int32_foreign_message().at(0).c());
-
-  // Actually verify the second (modified) elements now.
-  EXPECT_EQ(2, message.map_int32_int32().at(1));
-  EXPECT_EQ(2, message.map_int64_int64().at(1));
-  EXPECT_EQ(2, message.map_uint32_uint32().at(1));
-  EXPECT_EQ(2, message.map_uint64_uint64().at(1));
-  EXPECT_EQ(2, message.map_sint32_sint32().at(1));
-  EXPECT_EQ(2, message.map_sint64_sint64().at(1));
-  EXPECT_EQ(2, message.map_fixed32_fixed32().at(1));
-  EXPECT_EQ(2, message.map_fixed64_fixed64().at(1));
-  EXPECT_EQ(2, message.map_sfixed32_sfixed32().at(1));
-  EXPECT_EQ(2, message.map_sfixed64_sfixed64().at(1));
-  EXPECT_EQ(2, message.map_int32_float().at(1));
-  EXPECT_EQ(2, message.map_int32_double().at(1));
-  EXPECT_EQ(false, message.map_bool_bool().at(1));
-  EXPECT_EQ("2", message.map_string_string().at("1"));
-  EXPECT_EQ("2", message.map_int32_bytes().at(1));
-  EXPECT_EQ(enum_value1, message.map_int32_enum().at(1));
-  EXPECT_EQ(2, message.map_int32_foreign_message().at(1).c());
-}
-
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // GOOGLE_PROTOBUF_MAP_TEST_UTIL_IMPL_H__
diff --git a/libs/protobuf/src/google/protobuf/map_type_handler.h b/libs/protobuf/src/google/protobuf/map_type_handler.h
deleted file mode 100644
index c210c63..0000000
--- a/libs/protobuf/src/google/protobuf/map_type_handler.h
+++ /dev/null
@@ -1,736 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef GOOGLE_PROTOBUF_MAP_TYPE_HANDLER_H__
-#define GOOGLE_PROTOBUF_MAP_TYPE_HANDLER_H__
-
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/arena.h>
-#include <google/protobuf/arenastring.h>
-#include <google/protobuf/parse_context.h>
-#include <google/protobuf/wire_format_lite.h>
-
-#ifdef SWIG
-#error "You cannot SWIG proto headers"
-#endif
-
-namespace google {
-namespace protobuf {
-namespace internal {
-
-// Used for compile time type selection. MapIf::type will be TrueType if Flag is
-// true and FalseType otherwise.
-template <bool Flag, typename TrueType, typename FalseType>
-struct MapIf;
-
-template <typename TrueType, typename FalseType>
-struct MapIf<true, TrueType, FalseType> {
-  typedef TrueType type;
-};
-
-template <typename TrueType, typename FalseType>
-struct MapIf<false, TrueType, FalseType> {
-  typedef FalseType type;
-};
-
-template <typename Type, bool is_arena_constructable>
-class MapArenaMessageCreator {
- public:
-  // Use arena to create message if Type is arena constructable. Otherwise,
-  // create the message on heap.
-  static inline Type* CreateMessage(Arena* arena);
-};
-template <typename Type>
-class MapArenaMessageCreator<Type, true> {
- public:
-  static inline Type* CreateMessage(Arena* arena) {
-    return Arena::CreateMessage<Type>(arena);
-  }
-};
-template <typename Type>
-class MapArenaMessageCreator<Type, false> {
- public:
-  static inline Type* CreateMessage(Arena* arena) {
-    return Arena::Create<Type>(arena);
-  }
-};
-
-// Define constants for given wire field type
-template <WireFormatLite::FieldType field_type, typename Type>
-class MapWireFieldTypeTraits {};
-
-#define TYPE_TRAITS(FieldType, CType, WireFormatType, IsMessage, IsEnum)   \
-  template <typename Type>                                                 \
-  class MapWireFieldTypeTraits<WireFormatLite::TYPE_##FieldType, Type> {   \
-   public:                                                                 \
-    static const bool kIsMessage = IsMessage;                              \
-    static const bool kIsEnum = IsEnum;                                    \
-    typedef typename MapIf<kIsMessage, Type*, CType>::type TypeOnMemory;   \
-    typedef typename MapIf<kIsEnum, int, Type>::type MapEntryAccessorType; \
-    static const WireFormatLite::WireType kWireType =                      \
-        WireFormatLite::WIRETYPE_##WireFormatType;                         \
-  };
-
-TYPE_TRAITS(MESSAGE, Type, LENGTH_DELIMITED, true, false)
-TYPE_TRAITS(STRING, ArenaStringPtr, LENGTH_DELIMITED, false, false)
-TYPE_TRAITS(BYTES, ArenaStringPtr, LENGTH_DELIMITED, false, false)
-TYPE_TRAITS(INT64, int64_t, VARINT, false, false)
-TYPE_TRAITS(UINT64, uint64_t, VARINT, false, false)
-TYPE_TRAITS(INT32, int32_t, VARINT, false, false)
-TYPE_TRAITS(UINT32, uint32_t, VARINT, false, false)
-TYPE_TRAITS(SINT64, int64_t, VARINT, false, false)
-TYPE_TRAITS(SINT32, int32_t, VARINT, false, false)
-TYPE_TRAITS(ENUM, int, VARINT, false, true)
-TYPE_TRAITS(DOUBLE, double, FIXED64, false, false)
-TYPE_TRAITS(FLOAT, float, FIXED32, false, false)
-TYPE_TRAITS(FIXED64, uint64_t, FIXED64, false, false)
-TYPE_TRAITS(FIXED32, uint32_t, FIXED32, false, false)
-TYPE_TRAITS(SFIXED64, int64_t, FIXED64, false, false)
-TYPE_TRAITS(SFIXED32, int32_t, FIXED32, false, false)
-TYPE_TRAITS(BOOL, bool, VARINT, false, false)
-
-#undef TYPE_TRAITS
-
-template <WireFormatLite::FieldType field_type, typename Type>
-class MapTypeHandler {};
-
-template <typename Type>
-class MapTypeHandler<WireFormatLite::TYPE_MESSAGE, Type> {
- public:
-  // Enum type cannot be used for MapTypeHandler::Read. Define a type which will
-  // replace Enum with int.
-  typedef typename MapWireFieldTypeTraits<WireFormatLite::TYPE_MESSAGE,
-                                          Type>::MapEntryAccessorType
-      MapEntryAccessorType;
-  // Internal stored type in MapEntryLite for given wire field type.
-  typedef typename MapWireFieldTypeTraits<WireFormatLite::TYPE_MESSAGE,
-                                          Type>::TypeOnMemory TypeOnMemory;
-  // Corresponding wire type for field type.
-  static constexpr WireFormatLite::WireType kWireType =
-      MapWireFieldTypeTraits<WireFormatLite::TYPE_MESSAGE, Type>::kWireType;
-  // Whether wire type is for message.
-  static constexpr bool kIsMessage =
-      MapWireFieldTypeTraits<WireFormatLite::TYPE_MESSAGE, Type>::kIsMessage;
-  // Whether wire type is for enum.
-  static constexpr bool kIsEnum =
-      MapWireFieldTypeTraits<WireFormatLite::TYPE_MESSAGE, Type>::kIsEnum;
-
-  // Functions used in parsing and serialization. ===================
-  static inline size_t ByteSize(const MapEntryAccessorType& value);
-  static inline int GetCachedSize(const MapEntryAccessorType& value);
-  static inline bool Read(io::CodedInputStream* input,
-                          MapEntryAccessorType* value);
-  static inline const char* Read(const char* ptr, ParseContext* ctx,
-                                 MapEntryAccessorType* value);
-
-  static inline uint8_t* Write(int field, const MapEntryAccessorType& value,
-                               uint8_t* ptr, io::EpsCopyOutputStream* stream);
-
-  // Functions to manipulate data on memory. ========================
-  static inline const Type& GetExternalReference(const Type* value);
-  static inline void DeleteNoArena(const Type* x);
-  static inline void Merge(const Type& from, Type** to, Arena* arena);
-  static inline void Clear(Type** value, Arena* arena);
-  static constexpr TypeOnMemory Constinit();
-
-  static inline Type* EnsureMutable(Type** value, Arena* arena);
-  // SpaceUsedInMapEntry: Return bytes used by value in MapEntry, excluding
-  // those already calculate in sizeof(MapField).
-  static inline size_t SpaceUsedInMapEntryLong(const Type* value);
-  // Return default instance if value is not initialized when calling const
-  // reference accessor.
-  static inline const Type& DefaultIfNotInitialized(const Type* value);
-  // Check if all required fields have values set.
-  static inline bool IsInitialized(Type* value);
-};
-
-#define MAP_HANDLER(FieldType)                                                 \
-  template <typename Type>                                                     \
-  class MapTypeHandler<WireFormatLite::TYPE_##FieldType, Type> {               \
-   public:                                                                     \
-    typedef typename MapWireFieldTypeTraits<WireFormatLite::TYPE_##FieldType,  \
-                                            Type>::MapEntryAccessorType        \
-        MapEntryAccessorType;                                                  \
-    typedef typename MapWireFieldTypeTraits<WireFormatLite::TYPE_##FieldType,  \
-                                            Type>::TypeOnMemory TypeOnMemory;  \
-    static const WireFormatLite::WireType kWireType =                          \
-        MapWireFieldTypeTraits<WireFormatLite::TYPE_##FieldType,               \
-                               Type>::kWireType;                               \
-    static const bool kIsMessage =                                             \
-        MapWireFieldTypeTraits<WireFormatLite::TYPE_##FieldType,               \
-                               Type>::kIsMessage;                              \
-    static const bool kIsEnum =                                                \
-        MapWireFieldTypeTraits<WireFormatLite::TYPE_##FieldType,               \
-                               Type>::kIsEnum;                                 \
-    static inline int ByteSize(const MapEntryAccessorType& value);             \
-    static inline int GetCachedSize(const MapEntryAccessorType& value);        \
-    static inline bool Read(io::CodedInputStream* input,                       \
-                            MapEntryAccessorType* value);                      \
-    static inline const char* Read(const char* begin, ParseContext* ctx,       \
-                                   MapEntryAccessorType* value);               \
-    static inline uint8_t* Write(int field, const MapEntryAccessorType& value, \
-                                 uint8_t* ptr,                                 \
-                                 io::EpsCopyOutputStream* stream);             \
-    static inline const MapEntryAccessorType& GetExternalReference(            \
-        const TypeOnMemory& value);                                            \
-    static inline void DeleteNoArena(const TypeOnMemory& x);                   \
-    static inline void Merge(const MapEntryAccessorType& from,                 \
-                             TypeOnMemory* to, Arena* arena);                  \
-    static inline void Clear(TypeOnMemory* value, Arena* arena);               \
-    static inline size_t SpaceUsedInMapEntryLong(const TypeOnMemory& value);   \
-    static inline const MapEntryAccessorType& DefaultIfNotInitialized(         \
-        const TypeOnMemory& value);                                            \
-    static inline bool IsInitialized(const TypeOnMemory& value);               \
-    static void DeleteNoArena(TypeOnMemory& value);                            \
-    static constexpr TypeOnMemory Constinit();                                 \
-    static inline MapEntryAccessorType* EnsureMutable(TypeOnMemory* value,     \
-                                                      Arena* arena);           \
-  };
-MAP_HANDLER(STRING)
-MAP_HANDLER(BYTES)
-MAP_HANDLER(INT64)
-MAP_HANDLER(UINT64)
-MAP_HANDLER(INT32)
-MAP_HANDLER(UINT32)
-MAP_HANDLER(SINT64)
-MAP_HANDLER(SINT32)
-MAP_HANDLER(ENUM)
-MAP_HANDLER(DOUBLE)
-MAP_HANDLER(FLOAT)
-MAP_HANDLER(FIXED64)
-MAP_HANDLER(FIXED32)
-MAP_HANDLER(SFIXED64)
-MAP_HANDLER(SFIXED32)
-MAP_HANDLER(BOOL)
-#undef MAP_HANDLER
-
-template <typename Type>
-inline size_t MapTypeHandler<WireFormatLite::TYPE_MESSAGE, Type>::ByteSize(
-    const MapEntryAccessorType& value) {
-  return WireFormatLite::MessageSizeNoVirtual(value);
-}
-
-#define GOOGLE_PROTOBUF_BYTE_SIZE(FieldType, DeclaredType)                     \
-  template <typename Type>                                                     \
-  inline int MapTypeHandler<WireFormatLite::TYPE_##FieldType, Type>::ByteSize( \
-      const MapEntryAccessorType& value) {                                     \
-    return static_cast<int>(WireFormatLite::DeclaredType##Size(value));        \
-  }
-
-GOOGLE_PROTOBUF_BYTE_SIZE(STRING, String)
-GOOGLE_PROTOBUF_BYTE_SIZE(BYTES, Bytes)
-GOOGLE_PROTOBUF_BYTE_SIZE(INT64, Int64)
-GOOGLE_PROTOBUF_BYTE_SIZE(UINT64, UInt64)
-GOOGLE_PROTOBUF_BYTE_SIZE(INT32, Int32)
-GOOGLE_PROTOBUF_BYTE_SIZE(UINT32, UInt32)
-GOOGLE_PROTOBUF_BYTE_SIZE(SINT64, SInt64)
-GOOGLE_PROTOBUF_BYTE_SIZE(SINT32, SInt32)
-GOOGLE_PROTOBUF_BYTE_SIZE(ENUM, Enum)
-
-#undef GOOGLE_PROTOBUF_BYTE_SIZE
-
-#define FIXED_BYTE_SIZE(FieldType, DeclaredType)                               \
-  template <typename Type>                                                     \
-  inline int MapTypeHandler<WireFormatLite::TYPE_##FieldType, Type>::ByteSize( \
-      const MapEntryAccessorType& /* value */) {                               \
-    return WireFormatLite::k##DeclaredType##Size;                              \
-  }
-
-FIXED_BYTE_SIZE(DOUBLE, Double)
-FIXED_BYTE_SIZE(FLOAT, Float)
-FIXED_BYTE_SIZE(FIXED64, Fixed64)
-FIXED_BYTE_SIZE(FIXED32, Fixed32)
-FIXED_BYTE_SIZE(SFIXED64, SFixed64)
-FIXED_BYTE_SIZE(SFIXED32, SFixed32)
-FIXED_BYTE_SIZE(BOOL, Bool)
-
-#undef FIXED_BYTE_SIZE
-
-template <typename Type>
-inline int MapTypeHandler<WireFormatLite::TYPE_MESSAGE, Type>::GetCachedSize(
-    const MapEntryAccessorType& value) {
-  return static_cast<int>(WireFormatLite::LengthDelimitedSize(
-      static_cast<size_t>(value.GetCachedSize())));
-}
-
-#define GET_CACHED_SIZE(FieldType, DeclaredType)                         \
-  template <typename Type>                                               \
-  inline int                                                             \
-  MapTypeHandler<WireFormatLite::TYPE_##FieldType, Type>::GetCachedSize( \
-      const MapEntryAccessorType& value) {                               \
-    return static_cast<int>(WireFormatLite::DeclaredType##Size(value));  \
-  }
-
-GET_CACHED_SIZE(STRING, String)
-GET_CACHED_SIZE(BYTES, Bytes)
-GET_CACHED_SIZE(INT64, Int64)
-GET_CACHED_SIZE(UINT64, UInt64)
-GET_CACHED_SIZE(INT32, Int32)
-GET_CACHED_SIZE(UINT32, UInt32)
-GET_CACHED_SIZE(SINT64, SInt64)
-GET_CACHED_SIZE(SINT32, SInt32)
-GET_CACHED_SIZE(ENUM, Enum)
-
-#undef GET_CACHED_SIZE
-
-#define GET_FIXED_CACHED_SIZE(FieldType, DeclaredType)                   \
-  template <typename Type>                                               \
-  inline int                                                             \
-  MapTypeHandler<WireFormatLite::TYPE_##FieldType, Type>::GetCachedSize( \
-      const MapEntryAccessorType& /* value */) {                         \
-    return WireFormatLite::k##DeclaredType##Size;                        \
-  }
-
-GET_FIXED_CACHED_SIZE(DOUBLE, Double)
-GET_FIXED_CACHED_SIZE(FLOAT, Float)
-GET_FIXED_CACHED_SIZE(FIXED64, Fixed64)
-GET_FIXED_CACHED_SIZE(FIXED32, Fixed32)
-GET_FIXED_CACHED_SIZE(SFIXED64, SFixed64)
-GET_FIXED_CACHED_SIZE(SFIXED32, SFixed32)
-GET_FIXED_CACHED_SIZE(BOOL, Bool)
-
-#undef GET_FIXED_CACHED_SIZE
-
-template <typename Type>
-inline uint8_t* MapTypeHandler<WireFormatLite::TYPE_MESSAGE, Type>::Write(
-    int field, const MapEntryAccessorType& value, uint8_t* ptr,
-    io::EpsCopyOutputStream* stream) {
-  ptr = stream->EnsureSpace(ptr);
-  return WireFormatLite::InternalWriteMessage(
-      field, value, value.GetCachedSize(), ptr, stream);
-}
-
-#define WRITE_METHOD(FieldType, DeclaredType)                     \
-  template <typename Type>                                        \
-  inline uint8_t*                                                 \
-  MapTypeHandler<WireFormatLite::TYPE_##FieldType, Type>::Write(  \
-      int field, const MapEntryAccessorType& value, uint8_t* ptr, \
-      io::EpsCopyOutputStream* stream) {                          \
-    ptr = stream->EnsureSpace(ptr);                               \
-    return stream->Write##DeclaredType(field, value, ptr);        \
-  }
-
-WRITE_METHOD(STRING, String)
-WRITE_METHOD(BYTES, Bytes)
-
-#undef WRITE_METHOD
-#define WRITE_METHOD(FieldType, DeclaredType)                               \
-  template <typename Type>                                                  \
-  inline uint8_t*                                                           \
-  MapTypeHandler<WireFormatLite::TYPE_##FieldType, Type>::Write(            \
-      int field, const MapEntryAccessorType& value, uint8_t* ptr,           \
-      io::EpsCopyOutputStream* stream) {                                    \
-    ptr = stream->EnsureSpace(ptr);                                         \
-    return WireFormatLite::Write##DeclaredType##ToArray(field, value, ptr); \
-  }
-
-WRITE_METHOD(INT64, Int64)
-WRITE_METHOD(UINT64, UInt64)
-WRITE_METHOD(INT32, Int32)
-WRITE_METHOD(UINT32, UInt32)
-WRITE_METHOD(SINT64, SInt64)
-WRITE_METHOD(SINT32, SInt32)
-WRITE_METHOD(ENUM, Enum)
-WRITE_METHOD(DOUBLE, Double)
-WRITE_METHOD(FLOAT, Float)
-WRITE_METHOD(FIXED64, Fixed64)
-WRITE_METHOD(FIXED32, Fixed32)
-WRITE_METHOD(SFIXED64, SFixed64)
-WRITE_METHOD(SFIXED32, SFixed32)
-WRITE_METHOD(BOOL, Bool)
-
-#undef WRITE_METHOD
-
-template <typename Type>
-inline bool MapTypeHandler<WireFormatLite::TYPE_MESSAGE, Type>::Read(
-    io::CodedInputStream* input, MapEntryAccessorType* value) {
-  return WireFormatLite::ReadMessageNoVirtual(input, value);
-}
-
-template <typename Type>
-inline bool MapTypeHandler<WireFormatLite::TYPE_STRING, Type>::Read(
-    io::CodedInputStream* input, MapEntryAccessorType* value) {
-  return WireFormatLite::ReadString(input, value);
-}
-
-template <typename Type>
-inline bool MapTypeHandler<WireFormatLite::TYPE_BYTES, Type>::Read(
-    io::CodedInputStream* input, MapEntryAccessorType* value) {
-  return WireFormatLite::ReadBytes(input, value);
-}
-
-template <typename Type>
-const char* MapTypeHandler<WireFormatLite::TYPE_MESSAGE, Type>::Read(
-    const char* ptr, ParseContext* ctx, MapEntryAccessorType* value) {
-  return ctx->ParseMessage(value, ptr);
-}
-
-template <typename Type>
-const char* MapTypeHandler<WireFormatLite::TYPE_STRING, Type>::Read(
-    const char* ptr, ParseContext* ctx, MapEntryAccessorType* value) {
-  int size = ReadSize(&ptr);
-  GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
-  return ctx->ReadString(ptr, size, value);
-}
-
-template <typename Type>
-const char* MapTypeHandler<WireFormatLite::TYPE_BYTES, Type>::Read(
-    const char* ptr, ParseContext* ctx, MapEntryAccessorType* value) {
-  int size = ReadSize(&ptr);
-  GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
-  return ctx->ReadString(ptr, size, value);
-}
-
-inline const char* ReadINT64(const char* ptr, int64_t* value) {
-  return VarintParse(ptr, reinterpret_cast<uint64_t*>(value));
-}
-inline const char* ReadUINT64(const char* ptr, uint64_t* value) {
-  return VarintParse(ptr, value);
-}
-inline const char* ReadINT32(const char* ptr, int32_t* value) {
-  return VarintParse(ptr, reinterpret_cast<uint32_t*>(value));
-}
-inline const char* ReadUINT32(const char* ptr, uint32_t* value) {
-  return VarintParse(ptr, value);
-}
-inline const char* ReadSINT64(const char* ptr, int64_t* value) {
-  *value = ReadVarintZigZag64(&ptr);
-  return ptr;
-}
-inline const char* ReadSINT32(const char* ptr, int32_t* value) {
-  *value = ReadVarintZigZag32(&ptr);
-  return ptr;
-}
-template <typename E>
-inline const char* ReadENUM(const char* ptr, E* value) {
-  *value = static_cast<E>(ReadVarint32(&ptr));
-  return ptr;
-}
-inline const char* ReadBOOL(const char* ptr, bool* value) {
-  *value = static_cast<bool>(ReadVarint32(&ptr));
-  return ptr;
-}
-
-template <typename F>
-inline const char* ReadUnaligned(const char* ptr, F* value) {
-  *value = UnalignedLoad<F>(ptr);
-  return ptr + sizeof(F);
-}
-inline const char* ReadFLOAT(const char* ptr, float* value) {
-  return ReadUnaligned(ptr, value);
-}
-inline const char* ReadDOUBLE(const char* ptr, double* value) {
-  return ReadUnaligned(ptr, value);
-}
-inline const char* ReadFIXED64(const char* ptr, uint64_t* value) {
-  return ReadUnaligned(ptr, value);
-}
-inline const char* ReadFIXED32(const char* ptr, uint32_t* value) {
-  return ReadUnaligned(ptr, value);
-}
-inline const char* ReadSFIXED64(const char* ptr, int64_t* value) {
-  return ReadUnaligned(ptr, value);
-}
-inline const char* ReadSFIXED32(const char* ptr, int32_t* value) {
-  return ReadUnaligned(ptr, value);
-}
-
-#define READ_METHOD(FieldType)                                              \
-  template <typename Type>                                                  \
-  inline bool MapTypeHandler<WireFormatLite::TYPE_##FieldType, Type>::Read( \
-      io::CodedInputStream* input, MapEntryAccessorType* value) {           \
-    return WireFormatLite::ReadPrimitive<TypeOnMemory,                      \
-                                         WireFormatLite::TYPE_##FieldType>( \
-        input, value);                                                      \
-  }                                                                         \
-  template <typename Type>                                                  \
-  const char* MapTypeHandler<WireFormatLite::TYPE_##FieldType, Type>::Read( \
-      const char* begin, ParseContext* ctx, MapEntryAccessorType* value) {  \
-    (void)ctx;                                                              \
-    return Read##FieldType(begin, value);                                   \
-  }
-
-READ_METHOD(INT64)
-READ_METHOD(UINT64)
-READ_METHOD(INT32)
-READ_METHOD(UINT32)
-READ_METHOD(SINT64)
-READ_METHOD(SINT32)
-READ_METHOD(ENUM)
-READ_METHOD(DOUBLE)
-READ_METHOD(FLOAT)
-READ_METHOD(FIXED64)
-READ_METHOD(FIXED32)
-READ_METHOD(SFIXED64)
-READ_METHOD(SFIXED32)
-READ_METHOD(BOOL)
-
-#undef READ_METHOD
-
-// Definition for message handler
-
-template <typename Type>
-inline const Type&
-MapTypeHandler<WireFormatLite::TYPE_MESSAGE, Type>::GetExternalReference(
-    const Type* value) {
-  return *value;
-}
-
-template <typename Type>
-inline size_t MapTypeHandler<WireFormatLite::TYPE_MESSAGE,
-                             Type>::SpaceUsedInMapEntryLong(const Type* value) {
-  return value->SpaceUsedLong();
-}
-
-template <typename Type>
-inline void MapTypeHandler<WireFormatLite::TYPE_MESSAGE, Type>::Clear(
-    Type** value, Arena* /* arena */) {
-  if (*value != nullptr) (*value)->Clear();
-}
-template <typename Type>
-inline void MapTypeHandler<WireFormatLite::TYPE_MESSAGE, Type>::Merge(
-    const Type& from, Type** to, Arena* /* arena */) {
-  (*to)->MergeFrom(from);
-}
-
-template <typename Type>
-void MapTypeHandler<WireFormatLite::TYPE_MESSAGE, Type>::DeleteNoArena(
-    const Type* ptr) {
-  delete ptr;
-}
-
-template <typename Type>
-constexpr auto MapTypeHandler<WireFormatLite::TYPE_MESSAGE, Type>::Constinit()
-    -> TypeOnMemory {
-  return nullptr;
-}
-
-template <typename Type>
-inline Type* MapTypeHandler<WireFormatLite::TYPE_MESSAGE, Type>::EnsureMutable(
-    Type** value, Arena* arena) {
-  if (*value == nullptr) {
-    *value = MapArenaMessageCreator<
-        Type,
-        Arena::is_arena_constructable<Type>::type::value>::CreateMessage(arena);
-  }
-  return *value;
-}
-
-template <typename Type>
-inline const Type&
-MapTypeHandler<WireFormatLite::TYPE_MESSAGE, Type>::DefaultIfNotInitialized(
-    const Type* value) {
-  return value != nullptr ? *value : *Type::internal_default_instance();
-}
-
-template <typename Type>
-inline bool MapTypeHandler<WireFormatLite::TYPE_MESSAGE, Type>::IsInitialized(
-    Type* value) {
-  return value ? value->IsInitialized() : false;
-}
-
-// Definition for string/bytes handler
-
-#define STRING_OR_BYTES_HANDLER_FUNCTIONS(FieldType)                          \
-  template <typename Type>                                                    \
-  inline const typename MapTypeHandler<WireFormatLite::TYPE_##FieldType,      \
-                                       Type>::MapEntryAccessorType&           \
-  MapTypeHandler<WireFormatLite::TYPE_##FieldType,                            \
-                 Type>::GetExternalReference(const TypeOnMemory& value) {     \
-    return value.Get();                                                       \
-  }                                                                           \
-  template <typename Type>                                                    \
-  inline size_t                                                               \
-  MapTypeHandler<WireFormatLite::TYPE_##FieldType,                            \
-                 Type>::SpaceUsedInMapEntryLong(const TypeOnMemory& value) {  \
-    return sizeof(value);                                                     \
-  }                                                                           \
-  template <typename Type>                                                    \
-  inline void MapTypeHandler<WireFormatLite::TYPE_##FieldType, Type>::Clear(  \
-      TypeOnMemory* value, Arena* /* arena */) {                              \
-    value->ClearToEmpty();                                                    \
-  }                                                                           \
-  template <typename Type>                                                    \
-  inline void MapTypeHandler<WireFormatLite::TYPE_##FieldType, Type>::Merge(  \
-      const MapEntryAccessorType& from, TypeOnMemory* to, Arena* arena) {     \
-    to->Set(from, arena);                                                     \
-  }                                                                           \
-  template <typename Type>                                                    \
-  void MapTypeHandler<WireFormatLite::TYPE_##FieldType, Type>::DeleteNoArena( \
-      TypeOnMemory& value) {                                                  \
-    value.Destroy();                                                          \
-  }                                                                           \
-  template <typename Type>                                                    \
-  constexpr auto                                                              \
-  MapTypeHandler<WireFormatLite::TYPE_##FieldType, Type>::Constinit()         \
-      ->TypeOnMemory {                                                        \
-    return TypeOnMemory(&internal::fixed_address_empty_string,                \
-                        ConstantInitialized{});                               \
-  }                                                                           \
-  template <typename Type>                                                    \
-  inline typename MapTypeHandler<WireFormatLite::TYPE_##FieldType,            \
-                                 Type>::MapEntryAccessorType*                 \
-  MapTypeHandler<WireFormatLite::TYPE_##FieldType, Type>::EnsureMutable(      \
-      TypeOnMemory* value, Arena* arena) {                                    \
-    return value->Mutable(arena);                                             \
-  }                                                                           \
-  template <typename Type>                                                    \
-  inline const typename MapTypeHandler<WireFormatLite::TYPE_##FieldType,      \
-                                       Type>::MapEntryAccessorType&           \
-  MapTypeHandler<WireFormatLite::TYPE_##FieldType,                            \
-                 Type>::DefaultIfNotInitialized(const TypeOnMemory& value) {  \
-    return value.Get();                                                       \
-  }                                                                           \
-  template <typename Type>                                                    \
-  inline bool                                                                 \
-  MapTypeHandler<WireFormatLite::TYPE_##FieldType, Type>::IsInitialized(      \
-      const TypeOnMemory& /* value */) {                                      \
-    return true;                                                              \
-  }
-STRING_OR_BYTES_HANDLER_FUNCTIONS(STRING)
-STRING_OR_BYTES_HANDLER_FUNCTIONS(BYTES)
-#undef STRING_OR_BYTES_HANDLER_FUNCTIONS
-
-#define PRIMITIVE_HANDLER_FUNCTIONS(FieldType)                               \
-  template <typename Type>                                                   \
-  inline const typename MapTypeHandler<WireFormatLite::TYPE_##FieldType,     \
-                                       Type>::MapEntryAccessorType&          \
-  MapTypeHandler<WireFormatLite::TYPE_##FieldType,                           \
-                 Type>::GetExternalReference(const TypeOnMemory& value) {    \
-    return value;                                                            \
-  }                                                                          \
-  template <typename Type>                                                   \
-  inline size_t MapTypeHandler<WireFormatLite::TYPE_##FieldType, Type>::     \
-      SpaceUsedInMapEntryLong(const TypeOnMemory& /* value */) {             \
-    return 0;                                                                \
-  }                                                                          \
-  template <typename Type>                                                   \
-  inline void MapTypeHandler<WireFormatLite::TYPE_##FieldType, Type>::Clear( \
-      TypeOnMemory* value, Arena* /* arena */) {                             \
-    *value = 0;                                                              \
-  }                                                                          \
-  template <typename Type>                                                   \
-  inline void MapTypeHandler<WireFormatLite::TYPE_##FieldType, Type>::Merge( \
-      const MapEntryAccessorType& from, TypeOnMemory* to,                    \
-      Arena* /* arena */) {                                                  \
-    *to = from;                                                              \
-  }                                                                          \
-  template <typename Type>                                                   \
-  inline void MapTypeHandler<WireFormatLite::TYPE_##FieldType,               \
-                             Type>::DeleteNoArena(TypeOnMemory& /* x */) {}  \
-  template <typename Type>                                                   \
-  constexpr auto                                                             \
-  MapTypeHandler<WireFormatLite::TYPE_##FieldType, Type>::Constinit()        \
-      ->TypeOnMemory {                                                       \
-    return 0;                                                                \
-  }                                                                          \
-  template <typename Type>                                                   \
-  inline typename MapTypeHandler<WireFormatLite::TYPE_##FieldType,           \
-                                 Type>::MapEntryAccessorType*                \
-  MapTypeHandler<WireFormatLite::TYPE_##FieldType, Type>::EnsureMutable(     \
-      TypeOnMemory* value, Arena* /* arena */) {                             \
-    return value;                                                            \
-  }                                                                          \
-  template <typename Type>                                                   \
-  inline const typename MapTypeHandler<WireFormatLite::TYPE_##FieldType,     \
-                                       Type>::MapEntryAccessorType&          \
-  MapTypeHandler<WireFormatLite::TYPE_##FieldType,                           \
-                 Type>::DefaultIfNotInitialized(const TypeOnMemory& value) { \
-    return value;                                                            \
-  }                                                                          \
-  template <typename Type>                                                   \
-  inline bool                                                                \
-  MapTypeHandler<WireFormatLite::TYPE_##FieldType, Type>::IsInitialized(     \
-      const TypeOnMemory& /* value */) {                                     \
-    return true;                                                             \
-  }
-PRIMITIVE_HANDLER_FUNCTIONS(INT64)
-PRIMITIVE_HANDLER_FUNCTIONS(UINT64)
-PRIMITIVE_HANDLER_FUNCTIONS(INT32)
-PRIMITIVE_HANDLER_FUNCTIONS(UINT32)
-PRIMITIVE_HANDLER_FUNCTIONS(SINT64)
-PRIMITIVE_HANDLER_FUNCTIONS(SINT32)
-PRIMITIVE_HANDLER_FUNCTIONS(ENUM)
-PRIMITIVE_HANDLER_FUNCTIONS(DOUBLE)
-PRIMITIVE_HANDLER_FUNCTIONS(FLOAT)
-PRIMITIVE_HANDLER_FUNCTIONS(FIXED64)
-PRIMITIVE_HANDLER_FUNCTIONS(FIXED32)
-PRIMITIVE_HANDLER_FUNCTIONS(SFIXED64)
-PRIMITIVE_HANDLER_FUNCTIONS(SFIXED32)
-PRIMITIVE_HANDLER_FUNCTIONS(BOOL)
-#undef PRIMITIVE_HANDLER_FUNCTIONS
-
-// Functions for operating on a map entry using type handlers.
-//
-// Does not contain any representation (this class is not intended to be
-// instantiated).
-template <typename Key, typename Value, WireFormatLite::FieldType kKeyFieldType,
-          WireFormatLite::FieldType kValueFieldType>
-struct MapEntryFuncs {
-  typedef MapTypeHandler<kKeyFieldType, Key> KeyTypeHandler;
-  typedef MapTypeHandler<kValueFieldType, Value> ValueTypeHandler;
-  enum : int {
-    kKeyFieldNumber = 1,
-    kValueFieldNumber = 2
-  };
-
-  static uint8_t* InternalSerialize(int field_number, const Key& key,
-                                    const Value& value, uint8_t* ptr,
-                                    io::EpsCopyOutputStream* stream) {
-    ptr = stream->EnsureSpace(ptr);
-    ptr = WireFormatLite::WriteTagToArray(
-        field_number, WireFormatLite::WIRETYPE_LENGTH_DELIMITED, ptr);
-    ptr = io::CodedOutputStream::WriteVarint32ToArray(GetCachedSize(key, value),
-                                                      ptr);
-
-    ptr = KeyTypeHandler::Write(kKeyFieldNumber, key, ptr, stream);
-    return ValueTypeHandler::Write(kValueFieldNumber, value, ptr, stream);
-  }
-
-  static size_t ByteSizeLong(const Key& key, const Value& value) {
-    // Tags for key and value will both be one byte (field numbers 1 and 2).
-    size_t inner_length =
-        2 + KeyTypeHandler::ByteSize(key) + ValueTypeHandler::ByteSize(value);
-    return inner_length + io::CodedOutputStream::VarintSize32(
-                              static_cast<uint32_t>(inner_length));
-  }
-
-  static int GetCachedSize(const Key& key, const Value& value) {
-    // Tags for key and value will both be one byte (field numbers 1 and 2).
-    return 2 + KeyTypeHandler::GetCachedSize(key) +
-           ValueTypeHandler::GetCachedSize(value);
-  }
-};
-
-}  // namespace internal
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // GOOGLE_PROTOBUF_MAP_TYPE_HANDLER_H__
diff --git a/libs/protobuf/src/google/protobuf/map_unittest.proto b/libs/protobuf/src/google/protobuf/map_unittest.proto
deleted file mode 100644
index 263ef61..0000000
--- a/libs/protobuf/src/google/protobuf/map_unittest.proto
+++ /dev/null
@@ -1,125 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto3";
-
-option cc_enable_arenas = true;
-
-import "google/protobuf/unittest.proto";
-
-// We don't put this in a package within proto2 because we need to make sure
-// that the generated code doesn't depend on being in the proto2 namespace.
-// In map_test_util.h we do "using namespace unittest = protobuf_unittest".
-package protobuf_unittest;
-
-// Tests maps.
-message TestMap {
-  map<int32, int32> map_int32_int32 = 1;
-  map<int64, int64> map_int64_int64 = 2;
-  map<uint32, uint32> map_uint32_uint32 = 3;
-  map<uint64, uint64> map_uint64_uint64 = 4;
-  map<sint32, sint32> map_sint32_sint32 = 5;
-  map<sint64, sint64> map_sint64_sint64 = 6;
-  map<fixed32, fixed32> map_fixed32_fixed32 = 7;
-  map<fixed64, fixed64> map_fixed64_fixed64 = 8;
-  map<sfixed32, sfixed32> map_sfixed32_sfixed32 = 9;
-  map<sfixed64, sfixed64> map_sfixed64_sfixed64 = 10;
-  map<int32, float> map_int32_float = 11;
-  map<int32, double> map_int32_double = 12;
-  map<bool, bool> map_bool_bool = 13;
-  map<string, string> map_string_string = 14;
-  map<int32, bytes> map_int32_bytes = 15;
-  map<int32, MapEnum> map_int32_enum = 16;
-  map<int32, ForeignMessage> map_int32_foreign_message = 17;
-  map<string, ForeignMessage> map_string_foreign_message = 18;
-  map<int32, TestAllTypes> map_int32_all_types = 19;
-}
-
-message TestMapSubmessage {
-  TestMap test_map = 1;
-}
-
-message TestMessageMap {
-  map<int32, TestAllTypes> map_int32_message = 1;
-}
-
-// Two map fields share the same entry default instance.
-message TestSameTypeMap {
-  map<int32, int32> map1 = 1;
-  map<int32, int32> map2 = 2;
-}
-
-
-enum MapEnum {
-  MAP_ENUM_FOO = 0;
-  MAP_ENUM_BAR = 1;
-  MAP_ENUM_BAZ = 2;
-}
-
-// Test embedded message with required fields
-message TestRequiredMessageMap {
-  map<int32, TestRequired> map_field = 1;
-}
-
-message TestArenaMap {
-  map<int32, int32> map_int32_int32 = 1;
-  map<int64, int64> map_int64_int64 = 2;
-  map<uint32, uint32> map_uint32_uint32 = 3;
-  map<uint64, uint64> map_uint64_uint64 = 4;
-  map<sint32, sint32> map_sint32_sint32 = 5;
-  map<sint64, sint64> map_sint64_sint64 = 6;
-  map<fixed32, fixed32> map_fixed32_fixed32 = 7;
-  map<fixed64, fixed64> map_fixed64_fixed64 = 8;
-  map<sfixed32, sfixed32> map_sfixed32_sfixed32 = 9;
-  map<sfixed64, sfixed64> map_sfixed64_sfixed64 = 10;
-  map<int32, float> map_int32_float = 11;
-  map<int32, double> map_int32_double = 12;
-  map<bool, bool> map_bool_bool = 13;
-  map<string, string> map_string_string = 14;
-  map<int32, bytes> map_int32_bytes = 15;
-  map<int32, MapEnum> map_int32_enum = 16;
-  map<int32, ForeignMessage> map_int32_foreign_message = 17;
-}
-
-// Previously, message containing enum called Type cannot be used as value of
-// map field.
-message MessageContainingEnumCalledType {
-  enum Type { TYPE_FOO = 0; }
-  map<string, MessageContainingEnumCalledType> type = 1;
-}
-
-// Previously, message cannot contain map field called "entry".
-message MessageContainingMapCalledEntry {
-  map<int32, int32> entry = 1;
-}
-
-message TestRecursiveMapMessage {
-  map<string, TestRecursiveMapMessage> a = 1;
-}
diff --git a/libs/protobuf/src/google/protobuf/message.cc b/libs/protobuf/src/google/protobuf/message.cc
deleted file mode 100644
index 6cdc6c8..0000000
--- a/libs/protobuf/src/google/protobuf/message.cc
+++ /dev/null
@@ -1,404 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-
-#include <google/protobuf/message.h>
-
-#include <iostream>
-#include <stack>
-#include <unordered_map>
-
-#include <google/protobuf/stubs/casts.h>
-#include <google/protobuf/stubs/logging.h>
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/io/zero_copy_stream_impl.h>
-#include <google/protobuf/stubs/strutil.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/descriptor.pb.h>
-#include <google/protobuf/generated_message_reflection.h>
-#include <google/protobuf/generated_message_util.h>
-#include <google/protobuf/map_field.h>
-#include <google/protobuf/map_field_inl.h>
-#include <google/protobuf/parse_context.h>
-#include <google/protobuf/reflection_internal.h>
-#include <google/protobuf/reflection_ops.h>
-#include <google/protobuf/unknown_field_set.h>
-#include <google/protobuf/wire_format.h>
-#include <google/protobuf/wire_format_lite.h>
-#include <google/protobuf/stubs/map_util.h>
-#include <google/protobuf/stubs/stl_util.h>
-#include <google/protobuf/stubs/hash.h>
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-
-namespace internal {
-
-// TODO(gerbens) make this factorized better. This should not have to hop
-// to reflection. Currently uses GeneratedMessageReflection and thus is
-// defined in generated_message_reflection.cc
-void RegisterFileLevelMetadata(const DescriptorTable* descriptor_table);
-
-}  // namespace internal
-
-using internal::ReflectionOps;
-using internal::WireFormat;
-using internal::WireFormatLite;
-
-void Message::MergeFrom(const Message& from) {
-  auto* class_to = GetClassData();
-  auto* class_from = from.GetClassData();
-  auto* merge_to_from = class_to ? class_to->merge_to_from : nullptr;
-  if (class_to == nullptr || class_to != class_from) {
-    merge_to_from = [](Message& to, const Message& from) {
-      ReflectionOps::Merge(from, &to);
-    };
-  }
-  merge_to_from(*this, from);
-}
-
-void Message::CheckTypeAndMergeFrom(const MessageLite& other) {
-  MergeFrom(*down_cast<const Message*>(&other));
-}
-
-void Message::CopyFrom(const Message& from) {
-  if (&from == this) return;
-
-  auto* class_to = GetClassData();
-  auto* class_from = from.GetClassData();
-  auto* copy_to_from = class_to ? class_to->copy_to_from : nullptr;
-
-  if (class_to == nullptr || class_to != class_from) {
-    const Descriptor* descriptor = GetDescriptor();
-    GOOGLE_CHECK_EQ(from.GetDescriptor(), descriptor)
-        << ": Tried to copy from a message with a different type. "
-           "to: "
-        << descriptor->full_name()
-        << ", "
-           "from: "
-        << from.GetDescriptor()->full_name();
-    copy_to_from = [](Message& to, const Message& from) {
-      ReflectionOps::Copy(from, &to);
-    };
-  }
-  copy_to_from(*this, from);
-}
-
-void Message::CopyWithSourceCheck(Message& to, const Message& from) {
-#ifndef NDEBUG
-  FailIfCopyFromDescendant(to, from);
-#endif
-  to.Clear();
-  to.GetClassData()->merge_to_from(to, from);
-}
-
-void Message::FailIfCopyFromDescendant(Message& to, const Message& from) {
-  auto* arena = to.GetArenaForAllocation();
-  bool same_message_owned_arena = to.GetOwningArena() == nullptr &&
-                                  arena != nullptr &&
-                                  arena == from.GetOwningArena();
-  GOOGLE_CHECK(!same_message_owned_arena && !internal::IsDescendant(to, from))
-      << "Source of CopyFrom cannot be a descendant of the target.";
-}
-
-std::string Message::GetTypeName() const {
-  return GetDescriptor()->full_name();
-}
-
-void Message::Clear() { ReflectionOps::Clear(this); }
-
-bool Message::IsInitialized() const {
-  return ReflectionOps::IsInitialized(*this);
-}
-
-void Message::FindInitializationErrors(std::vector<std::string>* errors) const {
-  return ReflectionOps::FindInitializationErrors(*this, "", errors);
-}
-
-std::string Message::InitializationErrorString() const {
-  std::vector<std::string> errors;
-  FindInitializationErrors(&errors);
-  return Join(errors, ", ");
-}
-
-void Message::CheckInitialized() const {
-  GOOGLE_CHECK(IsInitialized()) << "Message of type \"" << GetDescriptor()->full_name()
-                         << "\" is missing required fields: "
-                         << InitializationErrorString();
-}
-
-void Message::DiscardUnknownFields() {
-  return ReflectionOps::DiscardUnknownFields(this);
-}
-
-const char* Message::_InternalParse(const char* ptr,
-                                    internal::ParseContext* ctx) {
-  return WireFormat::_InternalParse(this, ptr, ctx);
-}
-
-uint8_t* Message::_InternalSerialize(uint8_t* target,
-                                     io::EpsCopyOutputStream* stream) const {
-  return WireFormat::_InternalSerialize(*this, target, stream);
-}
-
-size_t Message::ByteSizeLong() const {
-  size_t size = WireFormat::ByteSize(*this);
-  SetCachedSize(internal::ToCachedSize(size));
-  return size;
-}
-
-void Message::SetCachedSize(int /* size */) const {
-  GOOGLE_LOG(FATAL) << "Message class \"" << GetDescriptor()->full_name()
-             << "\" implements neither SetCachedSize() nor ByteSize().  "
-                "Must implement one or the other.";
-}
-
-size_t Message::ComputeUnknownFieldsSize(
-    size_t total_size, internal::CachedSize* cached_size) const {
-  total_size += WireFormat::ComputeUnknownFieldsSize(
-      _internal_metadata_.unknown_fields<UnknownFieldSet>(
-          UnknownFieldSet::default_instance));
-  cached_size->Set(internal::ToCachedSize(total_size));
-  return total_size;
-}
-
-size_t Message::MaybeComputeUnknownFieldsSize(
-    size_t total_size, internal::CachedSize* cached_size) const {
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    return ComputeUnknownFieldsSize(total_size, cached_size);
-  }
-  cached_size->Set(internal::ToCachedSize(total_size));
-  return total_size;
-}
-
-size_t Message::SpaceUsedLong() const {
-  return GetReflection()->SpaceUsedLong(*this);
-}
-
-uint64_t Message::GetInvariantPerBuild(uint64_t salt) {
-  return salt;
-}
-
-// =============================================================================
-// MessageFactory
-
-MessageFactory::~MessageFactory() {}
-
-namespace {
-
-
-#define HASH_MAP std::unordered_map
-#define STR_HASH_FXN hash<::google::protobuf::StringPiece>
-
-
-class GeneratedMessageFactory final : public MessageFactory {
- public:
-  static GeneratedMessageFactory* singleton();
-
-  void RegisterFile(const google::protobuf::internal::DescriptorTable* table);
-  void RegisterType(const Descriptor* descriptor, const Message* prototype);
-
-  // implements MessageFactory ---------------------------------------
-  const Message* GetPrototype(const Descriptor* type) override;
-
- private:
-  // Only written at static init time, so does not require locking.
-  HASH_MAP<StringPiece, const google::protobuf::internal::DescriptorTable*,
-           STR_HASH_FXN>
-      file_map_;
-
-  internal::WrappedMutex mutex_;
-  // Initialized lazily, so requires locking.
-  std::unordered_map<const Descriptor*, const Message*> type_map_;
-};
-
-GeneratedMessageFactory* GeneratedMessageFactory::singleton() {
-  static auto instance =
-      internal::OnShutdownDelete(new GeneratedMessageFactory);
-  return instance;
-}
-
-void GeneratedMessageFactory::RegisterFile(
-    const google::protobuf::internal::DescriptorTable* table) {
-  if (!InsertIfNotPresent(&file_map_, table->filename, table)) {
-    GOOGLE_LOG(FATAL) << "File is already registered: " << table->filename;
-  }
-}
-
-void GeneratedMessageFactory::RegisterType(const Descriptor* descriptor,
-                                           const Message* prototype) {
-  GOOGLE_DCHECK_EQ(descriptor->file()->pool(), DescriptorPool::generated_pool())
-      << "Tried to register a non-generated type with the generated "
-         "type registry.";
-
-  // This should only be called as a result of calling a file registration
-  // function during GetPrototype(), in which case we already have locked
-  // the mutex.
-  mutex_.AssertHeld();
-  if (!InsertIfNotPresent(&type_map_, descriptor, prototype)) {
-    GOOGLE_LOG(DFATAL) << "Type is already registered: " << descriptor->full_name();
-  }
-}
-
-
-const Message* GeneratedMessageFactory::GetPrototype(const Descriptor* type) {
-  {
-    ReaderMutexLock lock(&mutex_);
-    const Message* result = FindPtrOrNull(type_map_, type);
-    if (result != nullptr) return result;
-  }
-
-  // If the type is not in the generated pool, then we can't possibly handle
-  // it.
-  if (type->file()->pool() != DescriptorPool::generated_pool()) return nullptr;
-
-  // Apparently the file hasn't been registered yet.  Let's do that now.
-  const internal::DescriptorTable* registration_data =
-      FindPtrOrNull(file_map_, type->file()->name().c_str());
-  if (registration_data == nullptr) {
-    GOOGLE_LOG(DFATAL) << "File appears to be in generated pool but wasn't "
-                   "registered: "
-                << type->file()->name();
-    return nullptr;
-  }
-
-  WriterMutexLock lock(&mutex_);
-
-  // Check if another thread preempted us.
-  const Message* result = FindPtrOrNull(type_map_, type);
-  if (result == nullptr) {
-    // Nope.  OK, register everything.
-    internal::RegisterFileLevelMetadata(registration_data);
-    // Should be here now.
-    result = FindPtrOrNull(type_map_, type);
-  }
-
-  if (result == nullptr) {
-    GOOGLE_LOG(DFATAL) << "Type appears to be in generated pool but wasn't "
-                << "registered: " << type->full_name();
-  }
-
-  return result;
-}
-
-}  // namespace
-
-MessageFactory* MessageFactory::generated_factory() {
-  return GeneratedMessageFactory::singleton();
-}
-
-void MessageFactory::InternalRegisterGeneratedFile(
-    const google::protobuf::internal::DescriptorTable* table) {
-  GeneratedMessageFactory::singleton()->RegisterFile(table);
-}
-
-void MessageFactory::InternalRegisterGeneratedMessage(
-    const Descriptor* descriptor, const Message* prototype) {
-  GeneratedMessageFactory::singleton()->RegisterType(descriptor, prototype);
-}
-
-
-namespace {
-template <typename T>
-T* GetSingleton() {
-  static T singleton;
-  return &singleton;
-}
-}  // namespace
-
-const internal::RepeatedFieldAccessor* Reflection::RepeatedFieldAccessor(
-    const FieldDescriptor* field) const {
-  GOOGLE_CHECK(field->is_repeated());
-  switch (field->cpp_type()) {
-#define HANDLE_PRIMITIVE_TYPE(TYPE, type) \
-  case FieldDescriptor::CPPTYPE_##TYPE:   \
-    return GetSingleton<internal::RepeatedFieldPrimitiveAccessor<type> >();
-    HANDLE_PRIMITIVE_TYPE(INT32, int32_t)
-    HANDLE_PRIMITIVE_TYPE(UINT32, uint32_t)
-    HANDLE_PRIMITIVE_TYPE(INT64, int64_t)
-    HANDLE_PRIMITIVE_TYPE(UINT64, uint64_t)
-    HANDLE_PRIMITIVE_TYPE(FLOAT, float)
-    HANDLE_PRIMITIVE_TYPE(DOUBLE, double)
-    HANDLE_PRIMITIVE_TYPE(BOOL, bool)
-    HANDLE_PRIMITIVE_TYPE(ENUM, int32_t)
-#undef HANDLE_PRIMITIVE_TYPE
-    case FieldDescriptor::CPPTYPE_STRING:
-      switch (field->options().ctype()) {
-        default:
-        case FieldOptions::STRING:
-          return GetSingleton<internal::RepeatedPtrFieldStringAccessor>();
-      }
-      break;
-    case FieldDescriptor::CPPTYPE_MESSAGE:
-      if (field->is_map()) {
-        return GetSingleton<internal::MapFieldAccessor>();
-      } else {
-        return GetSingleton<internal::RepeatedPtrFieldMessageAccessor>();
-      }
-  }
-  GOOGLE_LOG(FATAL) << "Should not reach here.";
-  return nullptr;
-}
-
-namespace internal {
-template <>
-#if defined(_MSC_VER) && (_MSC_VER >= 1800)
-// Note: force noinline to workaround MSVC compiler bug with /Zc:inline, issue
-// #240
-PROTOBUF_NOINLINE
-#endif
-    Message*
-    GenericTypeHandler<Message>::NewFromPrototype(const Message* prototype,
-                                                  Arena* arena) {
-  return prototype->New(arena);
-}
-template <>
-#if defined(_MSC_VER) && (_MSC_VER >= 1800)
-// Note: force noinline to workaround MSVC compiler bug with /Zc:inline, issue
-// #240
-PROTOBUF_NOINLINE
-#endif
-    Arena*
-    GenericTypeHandler<Message>::GetOwningArena(Message* value) {
-  return value->GetOwningArena();
-}
-}  // namespace internal
-
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
diff --git a/libs/protobuf/src/google/protobuf/message.h b/libs/protobuf/src/google/protobuf/message.h
deleted file mode 100644
index 39ec154..0000000
--- a/libs/protobuf/src/google/protobuf/message.h
+++ /dev/null
@@ -1,1497 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-//
-// Defines Message, the abstract interface implemented by non-lite
-// protocol message objects.  Although it's possible to implement this
-// interface manually, most users will use the protocol compiler to
-// generate implementations.
-//
-// Example usage:
-//
-// Say you have a message defined as:
-//
-//   message Foo {
-//     optional string text = 1;
-//     repeated int32 numbers = 2;
-//   }
-//
-// Then, if you used the protocol compiler to generate a class from the above
-// definition, you could use it like so:
-//
-//   std::string data;  // Will store a serialized version of the message.
-//
-//   {
-//     // Create a message and serialize it.
-//     Foo foo;
-//     foo.set_text("Hello World!");
-//     foo.add_numbers(1);
-//     foo.add_numbers(5);
-//     foo.add_numbers(42);
-//
-//     foo.SerializeToString(&data);
-//   }
-//
-//   {
-//     // Parse the serialized message and check that it contains the
-//     // correct data.
-//     Foo foo;
-//     foo.ParseFromString(data);
-//
-//     assert(foo.text() == "Hello World!");
-//     assert(foo.numbers_size() == 3);
-//     assert(foo.numbers(0) == 1);
-//     assert(foo.numbers(1) == 5);
-//     assert(foo.numbers(2) == 42);
-//   }
-//
-//   {
-//     // Same as the last block, but do it dynamically via the Message
-//     // reflection interface.
-//     Message* foo = new Foo;
-//     const Descriptor* descriptor = foo->GetDescriptor();
-//
-//     // Get the descriptors for the fields we're interested in and verify
-//     // their types.
-//     const FieldDescriptor* text_field = descriptor->FindFieldByName("text");
-//     assert(text_field != nullptr);
-//     assert(text_field->type() == FieldDescriptor::TYPE_STRING);
-//     assert(text_field->label() == FieldDescriptor::LABEL_OPTIONAL);
-//     const FieldDescriptor* numbers_field = descriptor->
-//                                            FindFieldByName("numbers");
-//     assert(numbers_field != nullptr);
-//     assert(numbers_field->type() == FieldDescriptor::TYPE_INT32);
-//     assert(numbers_field->label() == FieldDescriptor::LABEL_REPEATED);
-//
-//     // Parse the message.
-//     foo->ParseFromString(data);
-//
-//     // Use the reflection interface to examine the contents.
-//     const Reflection* reflection = foo->GetReflection();
-//     assert(reflection->GetString(*foo, text_field) == "Hello World!");
-//     assert(reflection->FieldSize(*foo, numbers_field) == 3);
-//     assert(reflection->GetRepeatedInt32(*foo, numbers_field, 0) == 1);
-//     assert(reflection->GetRepeatedInt32(*foo, numbers_field, 1) == 5);
-//     assert(reflection->GetRepeatedInt32(*foo, numbers_field, 2) == 42);
-//
-//     delete foo;
-//   }
-
-#ifndef GOOGLE_PROTOBUF_MESSAGE_H__
-#define GOOGLE_PROTOBUF_MESSAGE_H__
-
-
-#include <iosfwd>
-#include <string>
-#include <type_traits>
-#include <vector>
-
-#include <google/protobuf/stubs/casts.h>
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/arena.h>
-#include <google/protobuf/port.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/generated_message_reflection.h>
-#include <google/protobuf/generated_message_util.h>
-#include <google/protobuf/map.h>  // TODO(b/211442718): cleanup
-#include <google/protobuf/message_lite.h>
-
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-#ifdef SWIG
-#error "You cannot SWIG proto headers"
-#endif
-
-namespace google {
-namespace protobuf {
-
-// Defined in this file.
-class Message;
-class Reflection;
-class MessageFactory;
-
-// Defined in other files.
-class AssignDescriptorsHelper;
-class DynamicMessageFactory;
-class GeneratedMessageReflectionTestHelper;
-class MapKey;
-class MapValueConstRef;
-class MapValueRef;
-class MapIterator;
-class MapReflectionTester;
-
-namespace internal {
-struct DescriptorTable;
-class MapFieldBase;
-class SwapFieldHelper;
-class CachedSize;
-}  // namespace internal
-class UnknownFieldSet;  // unknown_field_set.h
-namespace io {
-class ZeroCopyInputStream;   // zero_copy_stream.h
-class ZeroCopyOutputStream;  // zero_copy_stream.h
-class CodedInputStream;      // coded_stream.h
-class CodedOutputStream;     // coded_stream.h
-}  // namespace io
-namespace python {
-class MapReflectionFriend;  // scalar_map_container.h
-class MessageReflectionFriend;
-}  // namespace python
-namespace expr {
-class CelMapReflectionFriend;  // field_backed_map_impl.cc
-}
-
-namespace internal {
-class MapFieldPrinterHelper;  // text_format.cc
-}
-namespace util {
-class MessageDifferencer;
-}
-
-
-namespace internal {
-class ReflectionAccessor;      // message.cc
-class ReflectionOps;           // reflection_ops.h
-class MapKeySorter;            // wire_format.cc
-class WireFormat;              // wire_format.h
-class MapFieldReflectionTest;  // map_test.cc
-}  // namespace internal
-
-template <typename T>
-class RepeatedField;  // repeated_field.h
-
-template <typename T>
-class RepeatedPtrField;  // repeated_field.h
-
-// A container to hold message metadata.
-struct Metadata {
-  const Descriptor* descriptor;
-  const Reflection* reflection;
-};
-
-namespace internal {
-template <class To>
-inline To* GetPointerAtOffset(Message* message, uint32_t offset) {
-  return reinterpret_cast<To*>(reinterpret_cast<char*>(message) + offset);
-}
-
-template <class To>
-const To* GetConstPointerAtOffset(const Message* message, uint32_t offset) {
-  return reinterpret_cast<const To*>(reinterpret_cast<const char*>(message) +
-                                     offset);
-}
-
-template <class To>
-const To& GetConstRefAtOffset(const Message& message, uint32_t offset) {
-  return *GetConstPointerAtOffset<To>(&message, offset);
-}
-
-bool CreateUnknownEnumValues(const FieldDescriptor* field);
-
-// Returns true if "message" is a descendant of "root".
-PROTOBUF_EXPORT bool IsDescendant(Message& root, const Message& message);
-}  // namespace internal
-
-// Abstract interface for protocol messages.
-//
-// See also MessageLite, which contains most every-day operations.  Message
-// adds descriptors and reflection on top of that.
-//
-// The methods of this class that are virtual but not pure-virtual have
-// default implementations based on reflection.  Message classes which are
-// optimized for speed will want to override these with faster implementations,
-// but classes optimized for code size may be happy with keeping them.  See
-// the optimize_for option in descriptor.proto.
-//
-// Users must not derive from this class. Only the protocol compiler and
-// the internal library are allowed to create subclasses.
-class PROTOBUF_EXPORT Message : public MessageLite {
- public:
-  constexpr Message() {}
-
-  // Basic Operations ------------------------------------------------
-
-  // Construct a new instance of the same type.  Ownership is passed to the
-  // caller.  (This is also defined in MessageLite, but is defined again here
-  // for return-type covariance.)
-  Message* New() const { return New(nullptr); }
-
-  // Construct a new instance on the arena. Ownership is passed to the caller
-  // if arena is a nullptr.
-  Message* New(Arena* arena) const override = 0;
-
-  // Make this message into a copy of the given message.  The given message
-  // must have the same descriptor, but need not necessarily be the same class.
-  // By default this is just implemented as "Clear(); MergeFrom(from);".
-  void CopyFrom(const Message& from);
-
-  // Merge the fields from the given message into this message.  Singular
-  // fields will be overwritten, if specified in from, except for embedded
-  // messages which will be merged.  Repeated fields will be concatenated.
-  // The given message must be of the same type as this message (i.e. the
-  // exact same class).
-  virtual void MergeFrom(const Message& from);
-
-  // Verifies that IsInitialized() returns true.  GOOGLE_CHECK-fails otherwise, with
-  // a nice error message.
-  void CheckInitialized() const;
-
-  // Slowly build a list of all required fields that are not set.
-  // This is much, much slower than IsInitialized() as it is implemented
-  // purely via reflection.  Generally, you should not call this unless you
-  // have already determined that an error exists by calling IsInitialized().
-  void FindInitializationErrors(std::vector<std::string>* errors) const;
-
-  // Like FindInitializationErrors, but joins all the strings, delimited by
-  // commas, and returns them.
-  std::string InitializationErrorString() const override;
-
-  // Clears all unknown fields from this message and all embedded messages.
-  // Normally, if unknown tag numbers are encountered when parsing a message,
-  // the tag and value are stored in the message's UnknownFieldSet and
-  // then written back out when the message is serialized.  This allows servers
-  // which simply route messages to other servers to pass through messages
-  // that have new field definitions which they don't yet know about.  However,
-  // this behavior can have security implications.  To avoid it, call this
-  // method after parsing.
-  //
-  // See Reflection::GetUnknownFields() for more on unknown fields.
-  void DiscardUnknownFields();
-
-  // Computes (an estimate of) the total number of bytes currently used for
-  // storing the message in memory.  The default implementation calls the
-  // Reflection object's SpaceUsed() method.
-  //
-  // SpaceUsed() is noticeably slower than ByteSize(), as it is implemented
-  // using reflection (rather than the generated code implementation for
-  // ByteSize()). Like ByteSize(), its CPU time is linear in the number of
-  // fields defined for the proto.
-  virtual size_t SpaceUsedLong() const;
-
-  PROTOBUF_DEPRECATED_MSG("Please use SpaceUsedLong() instead")
-  int SpaceUsed() const { return internal::ToIntSize(SpaceUsedLong()); }
-
-  // Debugging & Testing----------------------------------------------
-
-  // Generates a human-readable form of this message for debugging purposes.
-  // Note that the format and content of a debug string is not guaranteed, may
-  // change without notice, and should not be depended on. Code that does
-  // anything except display a string to assist in debugging should use
-  // TextFormat instead.
-  std::string DebugString() const;
-  // Like DebugString(), but with less whitespace.
-  std::string ShortDebugString() const;
-  // Like DebugString(), but do not escape UTF-8 byte sequences.
-  std::string Utf8DebugString() const;
-  // Convenience function useful in GDB.  Prints DebugString() to stdout.
-  void PrintDebugString() const;
-
-  // Reflection-based methods ----------------------------------------
-  // These methods are pure-virtual in MessageLite, but Message provides
-  // reflection-based default implementations.
-
-  std::string GetTypeName() const override;
-  void Clear() override;
-
-  // Returns whether all required fields have been set. Note that required
-  // fields no longer exist starting in proto3.
-  bool IsInitialized() const override;
-
-  void CheckTypeAndMergeFrom(const MessageLite& other) override;
-  // Reflective parser
-  const char* _InternalParse(const char* ptr,
-                             internal::ParseContext* ctx) override;
-  size_t ByteSizeLong() const override;
-  uint8_t* _InternalSerialize(uint8_t* target,
-                              io::EpsCopyOutputStream* stream) const override;
-
- private:
-  // This is called only by the default implementation of ByteSize(), to
-  // update the cached size.  If you override ByteSize(), you do not need
-  // to override this.  If you do not override ByteSize(), you MUST override
-  // this; the default implementation will crash.
-  //
-  // The method is private because subclasses should never call it; only
-  // override it.  Yes, C++ lets you do that.  Crazy, huh?
-  virtual void SetCachedSize(int size) const;
-
- public:
-  // Introspection ---------------------------------------------------
-
-
-  // Get a non-owning pointer to a Descriptor for this message's type.  This
-  // describes what fields the message contains, the types of those fields, etc.
-  // This object remains property of the Message.
-  const Descriptor* GetDescriptor() const { return GetMetadata().descriptor; }
-
-  // Get a non-owning pointer to the Reflection interface for this Message,
-  // which can be used to read and modify the fields of the Message dynamically
-  // (in other words, without knowing the message type at compile time).  This
-  // object remains property of the Message.
-  const Reflection* GetReflection() const { return GetMetadata().reflection; }
-
- protected:
-  // Get a struct containing the metadata for the Message, which is used in turn
-  // to implement GetDescriptor() and GetReflection() above.
-  virtual Metadata GetMetadata() const = 0;
-
-  struct ClassData {
-    // Note: The order of arguments (to, then from) is chosen so that the ABI
-    // of this function is the same as the CopyFrom method.  That is, the
-    // hidden "this" parameter comes first.
-    void (*copy_to_from)(Message& to, const Message& from_msg);
-    void (*merge_to_from)(Message& to, const Message& from_msg);
-  };
-  // GetClassData() returns a pointer to a ClassData struct which
-  // exists in global memory and is unique to each subclass.  This uniqueness
-  // property is used in order to quickly determine whether two messages are
-  // of the same type.
-  // TODO(jorg): change to pure virtual
-  virtual const ClassData* GetClassData() const { return nullptr; }
-
-  // CopyWithSourceCheck calls Clear() and then MergeFrom(), and in debug
-  // builds, checks that calling Clear() on the destination message doesn't
-  // alter the source.  It assumes the messages are known to be of the same
-  // type, and thus uses GetClassData().
-  static void CopyWithSourceCheck(Message& to, const Message& from);
-
-  // Fail if "from" is a descendant of "to" as such copy is not allowed.
-  static void FailIfCopyFromDescendant(Message& to, const Message& from);
-
-  inline explicit Message(Arena* arena, bool is_message_owned = false)
-      : MessageLite(arena, is_message_owned) {}
-  size_t ComputeUnknownFieldsSize(size_t total_size,
-                                  internal::CachedSize* cached_size) const;
-  size_t MaybeComputeUnknownFieldsSize(size_t total_size,
-                                       internal::CachedSize* cached_size) const;
-
-
- protected:
-  static uint64_t GetInvariantPerBuild(uint64_t salt);
-
- private:
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(Message);
-};
-
-namespace internal {
-// Forward-declare interfaces used to implement RepeatedFieldRef.
-// These are protobuf internals that users shouldn't care about.
-class RepeatedFieldAccessor;
-}  // namespace internal
-
-// Forward-declare RepeatedFieldRef templates. The second type parameter is
-// used for SFINAE tricks. Users should ignore it.
-template <typename T, typename Enable = void>
-class RepeatedFieldRef;
-
-template <typename T, typename Enable = void>
-class MutableRepeatedFieldRef;
-
-// This interface contains methods that can be used to dynamically access
-// and modify the fields of a protocol message.  Their semantics are
-// similar to the accessors the protocol compiler generates.
-//
-// To get the Reflection for a given Message, call Message::GetReflection().
-//
-// This interface is separate from Message only for efficiency reasons;
-// the vast majority of implementations of Message will share the same
-// implementation of Reflection (GeneratedMessageReflection,
-// defined in generated_message.h), and all Messages of a particular class
-// should share the same Reflection object (though you should not rely on
-// the latter fact).
-//
-// There are several ways that these methods can be used incorrectly.  For
-// example, any of the following conditions will lead to undefined
-// results (probably assertion failures):
-// - The FieldDescriptor is not a field of this message type.
-// - The method called is not appropriate for the field's type.  For
-//   each field type in FieldDescriptor::TYPE_*, there is only one
-//   Get*() method, one Set*() method, and one Add*() method that is
-//   valid for that type.  It should be obvious which (except maybe
-//   for TYPE_BYTES, which are represented using strings in C++).
-// - A Get*() or Set*() method for singular fields is called on a repeated
-//   field.
-// - GetRepeated*(), SetRepeated*(), or Add*() is called on a non-repeated
-//   field.
-// - The Message object passed to any method is not of the right type for
-//   this Reflection object (i.e. message.GetReflection() != reflection).
-//
-// You might wonder why there is not any abstract representation for a field
-// of arbitrary type.  E.g., why isn't there just a "GetField()" method that
-// returns "const Field&", where "Field" is some class with accessors like
-// "GetInt32Value()".  The problem is that someone would have to deal with
-// allocating these Field objects.  For generated message classes, having to
-// allocate space for an additional object to wrap every field would at least
-// double the message's memory footprint, probably worse.  Allocating the
-// objects on-demand, on the other hand, would be expensive and prone to
-// memory leaks.  So, instead we ended up with this flat interface.
-class PROTOBUF_EXPORT Reflection final {
- public:
-  // Get the UnknownFieldSet for the message.  This contains fields which
-  // were seen when the Message was parsed but were not recognized according
-  // to the Message's definition.
-  const UnknownFieldSet& GetUnknownFields(const Message& message) const;
-  // Get a mutable pointer to the UnknownFieldSet for the message.  This
-  // contains fields which were seen when the Message was parsed but were not
-  // recognized according to the Message's definition.
-  UnknownFieldSet* MutableUnknownFields(Message* message) const;
-
-  // Estimate the amount of memory used by the message object.
-  size_t SpaceUsedLong(const Message& message) const;
-
-  PROTOBUF_DEPRECATED_MSG("Please use SpaceUsedLong() instead")
-  int SpaceUsed(const Message& message) const {
-    return internal::ToIntSize(SpaceUsedLong(message));
-  }
-
-  // Check if the given non-repeated field is set.
-  bool HasField(const Message& message, const FieldDescriptor* field) const;
-
-  // Get the number of elements of a repeated field.
-  int FieldSize(const Message& message, const FieldDescriptor* field) const;
-
-  // Clear the value of a field, so that HasField() returns false or
-  // FieldSize() returns zero.
-  void ClearField(Message* message, const FieldDescriptor* field) const;
-
-  // Check if the oneof is set. Returns true if any field in oneof
-  // is set, false otherwise.
-  bool HasOneof(const Message& message,
-                const OneofDescriptor* oneof_descriptor) const;
-
-  void ClearOneof(Message* message,
-                  const OneofDescriptor* oneof_descriptor) const;
-
-  // Returns the field descriptor if the oneof is set. nullptr otherwise.
-  const FieldDescriptor* GetOneofFieldDescriptor(
-      const Message& message, const OneofDescriptor* oneof_descriptor) const;
-
-  // Removes the last element of a repeated field.
-  // We don't provide a way to remove any element other than the last
-  // because it invites inefficient use, such as O(n^2) filtering loops
-  // that should have been O(n).  If you want to remove an element other
-  // than the last, the best way to do it is to re-arrange the elements
-  // (using Swap()) so that the one you want removed is at the end, then
-  // call RemoveLast().
-  void RemoveLast(Message* message, const FieldDescriptor* field) const;
-  // Removes the last element of a repeated message field, and returns the
-  // pointer to the caller.  Caller takes ownership of the returned pointer.
-  PROTOBUF_NODISCARD Message* ReleaseLast(Message* message,
-                                          const FieldDescriptor* field) const;
-
-  // Similar to ReleaseLast() without internal safety and ownershp checks. This
-  // method should only be used when the objects are on the same arena or paired
-  // with a call to `UnsafeArenaAddAllocatedMessage`.
-  Message* UnsafeArenaReleaseLast(Message* message,
-                                  const FieldDescriptor* field) const;
-
-  // Swap the complete contents of two messages.
-  void Swap(Message* message1, Message* message2) const;
-
-  // Swap fields listed in fields vector of two messages.
-  void SwapFields(Message* message1, Message* message2,
-                  const std::vector<const FieldDescriptor*>& fields) const;
-
-  // Swap two elements of a repeated field.
-  void SwapElements(Message* message, const FieldDescriptor* field, int index1,
-                    int index2) const;
-
-  // Swap without internal safety and ownership checks. This method should only
-  // be used when the objects are on the same arena.
-  void UnsafeArenaSwap(Message* lhs, Message* rhs) const;
-
-  // SwapFields without internal safety and ownership checks. This method should
-  // only be used when the objects are on the same arena.
-  void UnsafeArenaSwapFields(
-      Message* lhs, Message* rhs,
-      const std::vector<const FieldDescriptor*>& fields) const;
-
-  // List all fields of the message which are currently set, except for unknown
-  // fields, but including extension known to the parser (i.e. compiled in).
-  // Singular fields will only be listed if HasField(field) would return true
-  // and repeated fields will only be listed if FieldSize(field) would return
-  // non-zero.  Fields (both normal fields and extension fields) will be listed
-  // ordered by field number.
-  // Use Reflection::GetUnknownFields() or message.unknown_fields() to also get
-  // access to fields/extensions unknown to the parser.
-  void ListFields(const Message& message,
-                  std::vector<const FieldDescriptor*>* output) const;
-
-  // Singular field getters ------------------------------------------
-  // These get the value of a non-repeated field.  They return the default
-  // value for fields that aren't set.
-
-  int32_t GetInt32(const Message& message, const FieldDescriptor* field) const;
-  int64_t GetInt64(const Message& message, const FieldDescriptor* field) const;
-  uint32_t GetUInt32(const Message& message,
-                     const FieldDescriptor* field) const;
-  uint64_t GetUInt64(const Message& message,
-                     const FieldDescriptor* field) const;
-  float GetFloat(const Message& message, const FieldDescriptor* field) const;
-  double GetDouble(const Message& message, const FieldDescriptor* field) const;
-  bool GetBool(const Message& message, const FieldDescriptor* field) const;
-  std::string GetString(const Message& message,
-                        const FieldDescriptor* field) const;
-  const EnumValueDescriptor* GetEnum(const Message& message,
-                                     const FieldDescriptor* field) const;
-
-  // GetEnumValue() returns an enum field's value as an integer rather than
-  // an EnumValueDescriptor*. If the integer value does not correspond to a
-  // known value descriptor, a new value descriptor is created. (Such a value
-  // will only be present when the new unknown-enum-value semantics are enabled
-  // for a message.)
-  int GetEnumValue(const Message& message, const FieldDescriptor* field) const;
-
-  // See MutableMessage() for the meaning of the "factory" parameter.
-  const Message& GetMessage(const Message& message,
-                            const FieldDescriptor* field,
-                            MessageFactory* factory = nullptr) const;
-
-  // Get a string value without copying, if possible.
-  //
-  // GetString() necessarily returns a copy of the string.  This can be
-  // inefficient when the std::string is already stored in a std::string object
-  // in the underlying message.  GetStringReference() will return a reference to
-  // the underlying std::string in this case.  Otherwise, it will copy the
-  // string into *scratch and return that.
-  //
-  // Note:  It is perfectly reasonable and useful to write code like:
-  //     str = reflection->GetStringReference(message, field, &str);
-  //   This line would ensure that only one copy of the string is made
-  //   regardless of the field's underlying representation.  When initializing
-  //   a newly-constructed string, though, it's just as fast and more
-  //   readable to use code like:
-  //     std::string str = reflection->GetString(message, field);
-  const std::string& GetStringReference(const Message& message,
-                                        const FieldDescriptor* field,
-                                        std::string* scratch) const;
-
-
-  // Singular field mutators -----------------------------------------
-  // These mutate the value of a non-repeated field.
-
-  void SetInt32(Message* message, const FieldDescriptor* field,
-                int32_t value) const;
-  void SetInt64(Message* message, const FieldDescriptor* field,
-                int64_t value) const;
-  void SetUInt32(Message* message, const FieldDescriptor* field,
-                 uint32_t value) const;
-  void SetUInt64(Message* message, const FieldDescriptor* field,
-                 uint64_t value) const;
-  void SetFloat(Message* message, const FieldDescriptor* field,
-                float value) const;
-  void SetDouble(Message* message, const FieldDescriptor* field,
-                 double value) const;
-  void SetBool(Message* message, const FieldDescriptor* field,
-               bool value) const;
-  void SetString(Message* message, const FieldDescriptor* field,
-                 std::string value) const;
-  void SetEnum(Message* message, const FieldDescriptor* field,
-               const EnumValueDescriptor* value) const;
-  // Set an enum field's value with an integer rather than EnumValueDescriptor.
-  // For proto3 this is just setting the enum field to the value specified, for
-  // proto2 it's more complicated. If value is a known enum value the field is
-  // set as usual. If the value is unknown then it is added to the unknown field
-  // set. Note this matches the behavior of parsing unknown enum values.
-  // If multiple calls with unknown values happen than they are all added to the
-  // unknown field set in order of the calls.
-  void SetEnumValue(Message* message, const FieldDescriptor* field,
-                    int value) const;
-
-  // Get a mutable pointer to a field with a message type.  If a MessageFactory
-  // is provided, it will be used to construct instances of the sub-message;
-  // otherwise, the default factory is used.  If the field is an extension that
-  // does not live in the same pool as the containing message's descriptor (e.g.
-  // it lives in an overlay pool), then a MessageFactory must be provided.
-  // If you have no idea what that meant, then you probably don't need to worry
-  // about it (don't provide a MessageFactory).  WARNING:  If the
-  // FieldDescriptor is for a compiled-in extension, then
-  // factory->GetPrototype(field->message_type()) MUST return an instance of
-  // the compiled-in class for this type, NOT DynamicMessage.
-  Message* MutableMessage(Message* message, const FieldDescriptor* field,
-                          MessageFactory* factory = nullptr) const;
-
-  // Replaces the message specified by 'field' with the already-allocated object
-  // sub_message, passing ownership to the message.  If the field contained a
-  // message, that message is deleted.  If sub_message is nullptr, the field is
-  // cleared.
-  void SetAllocatedMessage(Message* message, Message* sub_message,
-                           const FieldDescriptor* field) const;
-
-  // Similar to `SetAllocatedMessage`, but omits all internal safety and
-  // ownership checks.  This method should only be used when the objects are on
-  // the same arena or paired with a call to `UnsafeArenaReleaseMessage`.
-  void UnsafeArenaSetAllocatedMessage(Message* message, Message* sub_message,
-                                      const FieldDescriptor* field) const;
-
-  // Releases the message specified by 'field' and returns the pointer,
-  // ReleaseMessage() will return the message the message object if it exists.
-  // Otherwise, it may or may not return nullptr.  In any case, if the return
-  // value is non-null, the caller takes ownership of the pointer.
-  // If the field existed (HasField() is true), then the returned pointer will
-  // be the same as the pointer returned by MutableMessage().
-  // This function has the same effect as ClearField().
-  PROTOBUF_NODISCARD Message* ReleaseMessage(
-      Message* message, const FieldDescriptor* field,
-      MessageFactory* factory = nullptr) const;
-
-  // Similar to `ReleaseMessage`, but omits all internal safety and ownership
-  // checks.  This method should only be used when the objects are on the same
-  // arena or paired with a call to `UnsafeArenaSetAllocatedMessage`.
-  Message* UnsafeArenaReleaseMessage(Message* message,
-                                     const FieldDescriptor* field,
-                                     MessageFactory* factory = nullptr) const;
-
-
-  // Repeated field getters ------------------------------------------
-  // These get the value of one element of a repeated field.
-
-  int32_t GetRepeatedInt32(const Message& message, const FieldDescriptor* field,
-                           int index) const;
-  int64_t GetRepeatedInt64(const Message& message, const FieldDescriptor* field,
-                           int index) const;
-  uint32_t GetRepeatedUInt32(const Message& message,
-                             const FieldDescriptor* field, int index) const;
-  uint64_t GetRepeatedUInt64(const Message& message,
-                             const FieldDescriptor* field, int index) const;
-  float GetRepeatedFloat(const Message& message, const FieldDescriptor* field,
-                         int index) const;
-  double GetRepeatedDouble(const Message& message, const FieldDescriptor* field,
-                           int index) const;
-  bool GetRepeatedBool(const Message& message, const FieldDescriptor* field,
-                       int index) const;
-  std::string GetRepeatedString(const Message& message,
-                                const FieldDescriptor* field, int index) const;
-  const EnumValueDescriptor* GetRepeatedEnum(const Message& message,
-                                             const FieldDescriptor* field,
-                                             int index) const;
-  // GetRepeatedEnumValue() returns an enum field's value as an integer rather
-  // than an EnumValueDescriptor*. If the integer value does not correspond to a
-  // known value descriptor, a new value descriptor is created. (Such a value
-  // will only be present when the new unknown-enum-value semantics are enabled
-  // for a message.)
-  int GetRepeatedEnumValue(const Message& message, const FieldDescriptor* field,
-                           int index) const;
-  const Message& GetRepeatedMessage(const Message& message,
-                                    const FieldDescriptor* field,
-                                    int index) const;
-
-  // See GetStringReference(), above.
-  const std::string& GetRepeatedStringReference(const Message& message,
-                                                const FieldDescriptor* field,
-                                                int index,
-                                                std::string* scratch) const;
-
-
-  // Repeated field mutators -----------------------------------------
-  // These mutate the value of one element of a repeated field.
-
-  void SetRepeatedInt32(Message* message, const FieldDescriptor* field,
-                        int index, int32_t value) const;
-  void SetRepeatedInt64(Message* message, const FieldDescriptor* field,
-                        int index, int64_t value) const;
-  void SetRepeatedUInt32(Message* message, const FieldDescriptor* field,
-                         int index, uint32_t value) const;
-  void SetRepeatedUInt64(Message* message, const FieldDescriptor* field,
-                         int index, uint64_t value) const;
-  void SetRepeatedFloat(Message* message, const FieldDescriptor* field,
-                        int index, float value) const;
-  void SetRepeatedDouble(Message* message, const FieldDescriptor* field,
-                         int index, double value) const;
-  void SetRepeatedBool(Message* message, const FieldDescriptor* field,
-                       int index, bool value) const;
-  void SetRepeatedString(Message* message, const FieldDescriptor* field,
-                         int index, std::string value) const;
-  void SetRepeatedEnum(Message* message, const FieldDescriptor* field,
-                       int index, const EnumValueDescriptor* value) const;
-  // Set an enum field's value with an integer rather than EnumValueDescriptor.
-  // For proto3 this is just setting the enum field to the value specified, for
-  // proto2 it's more complicated. If value is a known enum value the field is
-  // set as usual. If the value is unknown then it is added to the unknown field
-  // set. Note this matches the behavior of parsing unknown enum values.
-  // If multiple calls with unknown values happen than they are all added to the
-  // unknown field set in order of the calls.
-  void SetRepeatedEnumValue(Message* message, const FieldDescriptor* field,
-                            int index, int value) const;
-  // Get a mutable pointer to an element of a repeated field with a message
-  // type.
-  Message* MutableRepeatedMessage(Message* message,
-                                  const FieldDescriptor* field,
-                                  int index) const;
-
-
-  // Repeated field adders -------------------------------------------
-  // These add an element to a repeated field.
-
-  void AddInt32(Message* message, const FieldDescriptor* field,
-                int32_t value) const;
-  void AddInt64(Message* message, const FieldDescriptor* field,
-                int64_t value) const;
-  void AddUInt32(Message* message, const FieldDescriptor* field,
-                 uint32_t value) const;
-  void AddUInt64(Message* message, const FieldDescriptor* field,
-                 uint64_t value) const;
-  void AddFloat(Message* message, const FieldDescriptor* field,
-                float value) const;
-  void AddDouble(Message* message, const FieldDescriptor* field,
-                 double value) const;
-  void AddBool(Message* message, const FieldDescriptor* field,
-               bool value) const;
-  void AddString(Message* message, const FieldDescriptor* field,
-                 std::string value) const;
-  void AddEnum(Message* message, const FieldDescriptor* field,
-               const EnumValueDescriptor* value) const;
-  // Add an integer value to a repeated enum field rather than
-  // EnumValueDescriptor. For proto3 this is just setting the enum field to the
-  // value specified, for proto2 it's more complicated. If value is a known enum
-  // value the field is set as usual. If the value is unknown then it is added
-  // to the unknown field set. Note this matches the behavior of parsing unknown
-  // enum values. If multiple calls with unknown values happen than they are all
-  // added to the unknown field set in order of the calls.
-  void AddEnumValue(Message* message, const FieldDescriptor* field,
-                    int value) const;
-  // See MutableMessage() for comments on the "factory" parameter.
-  Message* AddMessage(Message* message, const FieldDescriptor* field,
-                      MessageFactory* factory = nullptr) const;
-
-  // Appends an already-allocated object 'new_entry' to the repeated field
-  // specified by 'field' passing ownership to the message.
-  void AddAllocatedMessage(Message* message, const FieldDescriptor* field,
-                           Message* new_entry) const;
-
-  // Similar to AddAllocatedMessage() without internal safety and ownership
-  // checks. This method should only be used when the objects are on the same
-  // arena or paired with a call to `UnsafeArenaReleaseLast`.
-  void UnsafeArenaAddAllocatedMessage(Message* message,
-                                      const FieldDescriptor* field,
-                                      Message* new_entry) const;
-
-
-  // Get a RepeatedFieldRef object that can be used to read the underlying
-  // repeated field. The type parameter T must be set according to the
-  // field's cpp type. The following table shows the mapping from cpp type
-  // to acceptable T.
-  //
-  //   field->cpp_type()      T
-  //   CPPTYPE_INT32        int32_t
-  //   CPPTYPE_UINT32       uint32_t
-  //   CPPTYPE_INT64        int64_t
-  //   CPPTYPE_UINT64       uint64_t
-  //   CPPTYPE_DOUBLE       double
-  //   CPPTYPE_FLOAT        float
-  //   CPPTYPE_BOOL         bool
-  //   CPPTYPE_ENUM         generated enum type or int32_t
-  //   CPPTYPE_STRING       std::string
-  //   CPPTYPE_MESSAGE      generated message type or google::protobuf::Message
-  //
-  // A RepeatedFieldRef object can be copied and the resulted object will point
-  // to the same repeated field in the same message. The object can be used as
-  // long as the message is not destroyed.
-  //
-  // Note that to use this method users need to include the header file
-  // "reflection.h" (which defines the RepeatedFieldRef class templates).
-  template <typename T>
-  RepeatedFieldRef<T> GetRepeatedFieldRef(const Message& message,
-                                          const FieldDescriptor* field) const;
-
-  // Like GetRepeatedFieldRef() but return an object that can also be used
-  // manipulate the underlying repeated field.
-  template <typename T>
-  MutableRepeatedFieldRef<T> GetMutableRepeatedFieldRef(
-      Message* message, const FieldDescriptor* field) const;
-
-  // DEPRECATED. Please use Get(Mutable)RepeatedFieldRef() for repeated field
-  // access. The following repeated field accessors will be removed in the
-  // future.
-  //
-  // Repeated field accessors  -------------------------------------------------
-  // The methods above, e.g. GetRepeatedInt32(msg, fd, index), provide singular
-  // access to the data in a RepeatedField.  The methods below provide aggregate
-  // access by exposing the RepeatedField object itself with the Message.
-  // Applying these templates to inappropriate types will lead to an undefined
-  // reference at link time (e.g. GetRepeatedField<***double>), or possibly a
-  // template matching error at compile time (e.g. GetRepeatedPtrField<File>).
-  //
-  // Usage example: my_doubs = refl->GetRepeatedField<double>(msg, fd);
-
-  // DEPRECATED. Please use GetRepeatedFieldRef().
-  //
-  // for T = Cord and all protobuf scalar types except enums.
-  template <typename T>
-  PROTOBUF_DEPRECATED_MSG("Please use GetRepeatedFieldRef() instead")
-  const RepeatedField<T>& GetRepeatedField(const Message& msg,
-                                           const FieldDescriptor* d) const {
-    return GetRepeatedFieldInternal<T>(msg, d);
-  }
-
-  // DEPRECATED. Please use GetMutableRepeatedFieldRef().
-  //
-  // for T = Cord and all protobuf scalar types except enums.
-  template <typename T>
-  PROTOBUF_DEPRECATED_MSG("Please use GetMutableRepeatedFieldRef() instead")
-  RepeatedField<T>* MutableRepeatedField(Message* msg,
-                                         const FieldDescriptor* d) const {
-    return MutableRepeatedFieldInternal<T>(msg, d);
-  }
-
-  // DEPRECATED. Please use GetRepeatedFieldRef().
-  //
-  // for T = std::string, google::protobuf::internal::StringPieceField
-  //         google::protobuf::Message & descendants.
-  template <typename T>
-  PROTOBUF_DEPRECATED_MSG("Please use GetRepeatedFieldRef() instead")
-  const RepeatedPtrField<T>& GetRepeatedPtrField(
-      const Message& msg, const FieldDescriptor* d) const {
-    return GetRepeatedPtrFieldInternal<T>(msg, d);
-  }
-
-  // DEPRECATED. Please use GetMutableRepeatedFieldRef().
-  //
-  // for T = std::string, google::protobuf::internal::StringPieceField
-  //         google::protobuf::Message & descendants.
-  template <typename T>
-  PROTOBUF_DEPRECATED_MSG("Please use GetMutableRepeatedFieldRef() instead")
-  RepeatedPtrField<T>* MutableRepeatedPtrField(Message* msg,
-                                               const FieldDescriptor* d) const {
-    return MutableRepeatedPtrFieldInternal<T>(msg, d);
-  }
-
-  // Extensions ----------------------------------------------------------------
-
-  // Try to find an extension of this message type by fully-qualified field
-  // name.  Returns nullptr if no extension is known for this name or number.
-  const FieldDescriptor* FindKnownExtensionByName(
-      const std::string& name) const;
-
-  // Try to find an extension of this message type by field number.
-  // Returns nullptr if no extension is known for this name or number.
-  const FieldDescriptor* FindKnownExtensionByNumber(int number) const;
-
-  // Feature Flags -------------------------------------------------------------
-
-  // Does this message support storing arbitrary integer values in enum fields?
-  // If |true|, GetEnumValue/SetEnumValue and associated repeated-field versions
-  // take arbitrary integer values, and the legacy GetEnum() getter will
-  // dynamically create an EnumValueDescriptor for any integer value without
-  // one. If |false|, setting an unknown enum value via the integer-based
-  // setters results in undefined behavior (in practice, GOOGLE_DCHECK-fails).
-  //
-  // Generic code that uses reflection to handle messages with enum fields
-  // should check this flag before using the integer-based setter, and either
-  // downgrade to a compatible value or use the UnknownFieldSet if not. For
-  // example:
-  //
-  //   int new_value = GetValueFromApplicationLogic();
-  //   if (reflection->SupportsUnknownEnumValues()) {
-  //     reflection->SetEnumValue(message, field, new_value);
-  //   } else {
-  //     if (field_descriptor->enum_type()->
-  //             FindValueByNumber(new_value) != nullptr) {
-  //       reflection->SetEnumValue(message, field, new_value);
-  //     } else if (emit_unknown_enum_values) {
-  //       reflection->MutableUnknownFields(message)->AddVarint(
-  //           field->number(), new_value);
-  //     } else {
-  //       // convert value to a compatible/default value.
-  //       new_value = CompatibleDowngrade(new_value);
-  //       reflection->SetEnumValue(message, field, new_value);
-  //     }
-  //   }
-  bool SupportsUnknownEnumValues() const;
-
-  // Returns the MessageFactory associated with this message.  This can be
-  // useful for determining if a message is a generated message or not, for
-  // example:
-  //   if (message->GetReflection()->GetMessageFactory() ==
-  //       google::protobuf::MessageFactory::generated_factory()) {
-  //     // This is a generated message.
-  //   }
-  // It can also be used to create more messages of this type, though
-  // Message::New() is an easier way to accomplish this.
-  MessageFactory* GetMessageFactory() const;
-
- private:
-  template <typename T>
-  const RepeatedField<T>& GetRepeatedFieldInternal(
-      const Message& message, const FieldDescriptor* field) const;
-  template <typename T>
-  RepeatedField<T>* MutableRepeatedFieldInternal(
-      Message* message, const FieldDescriptor* field) const;
-  template <typename T>
-  const RepeatedPtrField<T>& GetRepeatedPtrFieldInternal(
-      const Message& message, const FieldDescriptor* field) const;
-  template <typename T>
-  RepeatedPtrField<T>* MutableRepeatedPtrFieldInternal(
-      Message* message, const FieldDescriptor* field) const;
-  // Obtain a pointer to a Repeated Field Structure and do some type checking:
-  //   on field->cpp_type(),
-  //   on field->field_option().ctype() (if ctype >= 0)
-  //   of field->message_type() (if message_type != nullptr).
-  // We use 2 routine rather than 4 (const vs mutable) x (scalar vs pointer).
-  void* MutableRawRepeatedField(Message* message, const FieldDescriptor* field,
-                                FieldDescriptor::CppType, int ctype,
-                                const Descriptor* message_type) const;
-
-  const void* GetRawRepeatedField(const Message& message,
-                                  const FieldDescriptor* field,
-                                  FieldDescriptor::CppType cpptype, int ctype,
-                                  const Descriptor* message_type) const;
-
-  // The following methods are used to implement (Mutable)RepeatedFieldRef.
-  // A Ref object will store a raw pointer to the repeated field data (obtained
-  // from RepeatedFieldData()) and a pointer to a Accessor (obtained from
-  // RepeatedFieldAccessor) which will be used to access the raw data.
-
-  // Returns a raw pointer to the repeated field
-  //
-  // "cpp_type" and "message_type" are deduced from the type parameter T passed
-  // to Get(Mutable)RepeatedFieldRef. If T is a generated message type,
-  // "message_type" should be set to its descriptor. Otherwise "message_type"
-  // should be set to nullptr. Implementations of this method should check
-  // whether "cpp_type"/"message_type" is consistent with the actual type of the
-  // field. We use 1 routine rather than 2 (const vs mutable) because it is
-  // protected and it doesn't change the message.
-  void* RepeatedFieldData(Message* message, const FieldDescriptor* field,
-                          FieldDescriptor::CppType cpp_type,
-                          const Descriptor* message_type) const;
-
-  // The returned pointer should point to a singleton instance which implements
-  // the RepeatedFieldAccessor interface.
-  const internal::RepeatedFieldAccessor* RepeatedFieldAccessor(
-      const FieldDescriptor* field) const;
-
-  // Lists all fields of the message which are currently set, except for unknown
-  // fields and stripped fields. See ListFields for details.
-  void ListFieldsOmitStripped(
-      const Message& message,
-      std::vector<const FieldDescriptor*>* output) const;
-
-  bool IsMessageStripped(const Descriptor* descriptor) const {
-    return schema_.IsMessageStripped(descriptor);
-  }
-
-  friend class TextFormat;
-
-  void ListFieldsMayFailOnStripped(
-      const Message& message, bool should_fail,
-      std::vector<const FieldDescriptor*>* output) const;
-
-  // Returns true if the message field is backed by a LazyField.
-  //
-  // A message field may be backed by a LazyField without the user annotation
-  // ([lazy = true]). While the user-annotated LazyField is lazily verified on
-  // first touch (i.e. failure on access rather than parsing if the LazyField is
-  // not initialized), the inferred LazyField is eagerly verified to avoid lazy
-  // parsing error at the cost of lower efficiency. When reflecting a message
-  // field, use this API instead of checking field->options().lazy().
-  bool IsLazyField(const FieldDescriptor* field) const {
-    return IsLazilyVerifiedLazyField(field) ||
-           IsEagerlyVerifiedLazyField(field);
-  }
-
-  // Returns true if the field is lazy extension. It is meant to allow python
-  // reparse lazy field until b/157559327 is fixed.
-  bool IsLazyExtension(const Message& message,
-                       const FieldDescriptor* field) const;
-
-  bool IsLazilyVerifiedLazyField(const FieldDescriptor* field) const;
-  bool IsEagerlyVerifiedLazyField(const FieldDescriptor* field) const;
-
-  friend class FastReflectionMessageMutator;
-  friend bool internal::IsDescendant(Message& root, const Message& message);
-
-  const Descriptor* const descriptor_;
-  const internal::ReflectionSchema schema_;
-  const DescriptorPool* const descriptor_pool_;
-  MessageFactory* const message_factory_;
-
-  // Last non weak field index. This is an optimization when most weak fields
-  // are at the end of the containing message. If a message proto doesn't
-  // contain weak fields, then this field equals descriptor_->field_count().
-  int last_non_weak_field_index_;
-
-  template <typename T, typename Enable>
-  friend class RepeatedFieldRef;
-  template <typename T, typename Enable>
-  friend class MutableRepeatedFieldRef;
-  friend class ::PROTOBUF_NAMESPACE_ID::MessageLayoutInspector;
-  friend class ::PROTOBUF_NAMESPACE_ID::AssignDescriptorsHelper;
-  friend class DynamicMessageFactory;
-  friend class GeneratedMessageReflectionTestHelper;
-  friend class python::MapReflectionFriend;
-  friend class python::MessageReflectionFriend;
-  friend class util::MessageDifferencer;
-#define GOOGLE_PROTOBUF_HAS_CEL_MAP_REFLECTION_FRIEND
-  friend class expr::CelMapReflectionFriend;
-  friend class internal::MapFieldReflectionTest;
-  friend class internal::MapKeySorter;
-  friend class internal::WireFormat;
-  friend class internal::ReflectionOps;
-  friend class internal::SwapFieldHelper;
-  // Needed for implementing text format for map.
-  friend class internal::MapFieldPrinterHelper;
-
-  Reflection(const Descriptor* descriptor,
-             const internal::ReflectionSchema& schema,
-             const DescriptorPool* pool, MessageFactory* factory);
-
-  // Special version for specialized implementations of string.  We can't
-  // call MutableRawRepeatedField directly here because we don't have access to
-  // FieldOptions::* which are defined in descriptor.pb.h.  Including that
-  // file here is not possible because it would cause a circular include cycle.
-  // We use 1 routine rather than 2 (const vs mutable) because it is private
-  // and mutable a repeated string field doesn't change the message.
-  void* MutableRawRepeatedString(Message* message, const FieldDescriptor* field,
-                                 bool is_string) const;
-
-  friend class MapReflectionTester;
-  // Returns true if key is in map. Returns false if key is not in map field.
-  bool ContainsMapKey(const Message& message, const FieldDescriptor* field,
-                      const MapKey& key) const;
-
-  // If key is in map field: Saves the value pointer to val and returns
-  // false. If key in not in map field: Insert the key into map, saves
-  // value pointer to val and returns true. Users are able to modify the
-  // map value by MapValueRef.
-  bool InsertOrLookupMapValue(Message* message, const FieldDescriptor* field,
-                              const MapKey& key, MapValueRef* val) const;
-
-  // If key is in map field: Saves the value pointer to val and returns true.
-  // Returns false if key is not in map field. Users are NOT able to modify
-  // the value by MapValueConstRef.
-  bool LookupMapValue(const Message& message, const FieldDescriptor* field,
-                      const MapKey& key, MapValueConstRef* val) const;
-  bool LookupMapValue(const Message&, const FieldDescriptor*, const MapKey&,
-                      MapValueRef*) const = delete;
-
-  // Delete and returns true if key is in the map field. Returns false
-  // otherwise.
-  bool DeleteMapValue(Message* message, const FieldDescriptor* field,
-                      const MapKey& key) const;
-
-  // Returns a MapIterator referring to the first element in the map field.
-  // If the map field is empty, this function returns the same as
-  // reflection::MapEnd. Mutation to the field may invalidate the iterator.
-  MapIterator MapBegin(Message* message, const FieldDescriptor* field) const;
-
-  // Returns a MapIterator referring to the theoretical element that would
-  // follow the last element in the map field. It does not point to any
-  // real element. Mutation to the field may invalidate the iterator.
-  MapIterator MapEnd(Message* message, const FieldDescriptor* field) const;
-
-  // Get the number of <key, value> pair of a map field. The result may be
-  // different from FieldSize which can have duplicate keys.
-  int MapSize(const Message& message, const FieldDescriptor* field) const;
-
-  // Help method for MapIterator.
-  friend class MapIterator;
-  friend class WireFormatForMapFieldTest;
-  internal::MapFieldBase* MutableMapData(Message* message,
-                                         const FieldDescriptor* field) const;
-
-  const internal::MapFieldBase* GetMapData(const Message& message,
-                                           const FieldDescriptor* field) const;
-
-  template <class T>
-  const T& GetRawNonOneof(const Message& message,
-                          const FieldDescriptor* field) const;
-  template <class T>
-  T* MutableRawNonOneof(Message* message, const FieldDescriptor* field) const;
-
-  template <typename Type>
-  const Type& GetRaw(const Message& message,
-                     const FieldDescriptor* field) const;
-  template <typename Type>
-  inline Type* MutableRaw(Message* message, const FieldDescriptor* field) const;
-  template <typename Type>
-  const Type& DefaultRaw(const FieldDescriptor* field) const;
-
-  const Message* GetDefaultMessageInstance(const FieldDescriptor* field) const;
-
-  inline const uint32_t* GetHasBits(const Message& message) const;
-  inline uint32_t* MutableHasBits(Message* message) const;
-  inline uint32_t GetOneofCase(const Message& message,
-                               const OneofDescriptor* oneof_descriptor) const;
-  inline uint32_t* MutableOneofCase(
-      Message* message, const OneofDescriptor* oneof_descriptor) const;
-  inline bool HasExtensionSet(const Message& /* message */) const {
-    return schema_.HasExtensionSet();
-  }
-  const internal::ExtensionSet& GetExtensionSet(const Message& message) const;
-  internal::ExtensionSet* MutableExtensionSet(Message* message) const;
-
-  const internal::InternalMetadata& GetInternalMetadata(
-      const Message& message) const;
-
-  internal::InternalMetadata* MutableInternalMetadata(Message* message) const;
-
-  inline bool IsInlined(const FieldDescriptor* field) const;
-
-  inline bool HasBit(const Message& message,
-                     const FieldDescriptor* field) const;
-  inline void SetBit(Message* message, const FieldDescriptor* field) const;
-  inline void ClearBit(Message* message, const FieldDescriptor* field) const;
-  inline void SwapBit(Message* message1, Message* message2,
-                      const FieldDescriptor* field) const;
-
-  inline const uint32_t* GetInlinedStringDonatedArray(
-      const Message& message) const;
-  inline uint32_t* MutableInlinedStringDonatedArray(Message* message) const;
-  inline bool IsInlinedStringDonated(const Message& message,
-                                     const FieldDescriptor* field) const;
-  inline void SwapInlinedStringDonated(Message* lhs, Message* rhs,
-                                       const FieldDescriptor* field) const;
-
-  // Shallow-swap fields listed in fields vector of two messages. It is the
-  // caller's responsibility to make sure shallow swap is safe.
-  void UnsafeShallowSwapFields(
-      Message* message1, Message* message2,
-      const std::vector<const FieldDescriptor*>& fields) const;
-
-  // This function only swaps the field. Should swap corresponding has_bit
-  // before or after using this function.
-  void SwapField(Message* message1, Message* message2,
-                 const FieldDescriptor* field) const;
-
-  // Unsafe but shallow version of SwapField.
-  void UnsafeShallowSwapField(Message* message1, Message* message2,
-                              const FieldDescriptor* field) const;
-
-  template <bool unsafe_shallow_swap>
-  void SwapFieldsImpl(Message* message1, Message* message2,
-                      const std::vector<const FieldDescriptor*>& fields) const;
-
-  template <bool unsafe_shallow_swap>
-  void SwapOneofField(Message* lhs, Message* rhs,
-                      const OneofDescriptor* oneof_descriptor) const;
-
-  inline bool HasOneofField(const Message& message,
-                            const FieldDescriptor* field) const;
-  inline void SetOneofCase(Message* message,
-                           const FieldDescriptor* field) const;
-  inline void ClearOneofField(Message* message,
-                              const FieldDescriptor* field) const;
-
-  template <typename Type>
-  inline const Type& GetField(const Message& message,
-                              const FieldDescriptor* field) const;
-  template <typename Type>
-  inline void SetField(Message* message, const FieldDescriptor* field,
-                       const Type& value) const;
-  template <typename Type>
-  inline Type* MutableField(Message* message,
-                            const FieldDescriptor* field) const;
-  template <typename Type>
-  inline const Type& GetRepeatedField(const Message& message,
-                                      const FieldDescriptor* field,
-                                      int index) const;
-  template <typename Type>
-  inline const Type& GetRepeatedPtrField(const Message& message,
-                                         const FieldDescriptor* field,
-                                         int index) const;
-  template <typename Type>
-  inline void SetRepeatedField(Message* message, const FieldDescriptor* field,
-                               int index, Type value) const;
-  template <typename Type>
-  inline Type* MutableRepeatedField(Message* message,
-                                    const FieldDescriptor* field,
-                                    int index) const;
-  template <typename Type>
-  inline void AddField(Message* message, const FieldDescriptor* field,
-                       const Type& value) const;
-  template <typename Type>
-  inline Type* AddField(Message* message, const FieldDescriptor* field) const;
-
-  int GetExtensionNumberOrDie(const Descriptor* type) const;
-
-  // Internal versions of EnumValue API perform no checking. Called after checks
-  // by public methods.
-  void SetEnumValueInternal(Message* message, const FieldDescriptor* field,
-                            int value) const;
-  void SetRepeatedEnumValueInternal(Message* message,
-                                    const FieldDescriptor* field, int index,
-                                    int value) const;
-  void AddEnumValueInternal(Message* message, const FieldDescriptor* field,
-                            int value) const;
-
-  friend inline  // inline so nobody can call this function.
-      void
-      RegisterAllTypesInternal(const Metadata* file_level_metadata, int size);
-  friend inline const char* ParseLenDelim(int field_number,
-                                          const FieldDescriptor* field,
-                                          Message* msg,
-                                          const Reflection* reflection,
-                                          const char* ptr,
-                                          internal::ParseContext* ctx);
-  friend inline const char* ParsePackedField(const FieldDescriptor* field,
-                                             Message* msg,
-                                             const Reflection* reflection,
-                                             const char* ptr,
-                                             internal::ParseContext* ctx);
-
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(Reflection);
-};
-
-// Abstract interface for a factory for message objects.
-class PROTOBUF_EXPORT MessageFactory {
- public:
-  inline MessageFactory() {}
-  virtual ~MessageFactory();
-
-  // Given a Descriptor, gets or constructs the default (prototype) Message
-  // of that type.  You can then call that message's New() method to construct
-  // a mutable message of that type.
-  //
-  // Calling this method twice with the same Descriptor returns the same
-  // object.  The returned object remains property of the factory.  Also, any
-  // objects created by calling the prototype's New() method share some data
-  // with the prototype, so these must be destroyed before the MessageFactory
-  // is destroyed.
-  //
-  // The given descriptor must outlive the returned message, and hence must
-  // outlive the MessageFactory.
-  //
-  // Some implementations do not support all types.  GetPrototype() will
-  // return nullptr if the descriptor passed in is not supported.
-  //
-  // This method may or may not be thread-safe depending on the implementation.
-  // Each implementation should document its own degree thread-safety.
-  virtual const Message* GetPrototype(const Descriptor* type) = 0;
-
-  // Gets a MessageFactory which supports all generated, compiled-in messages.
-  // In other words, for any compiled-in type FooMessage, the following is true:
-  //   MessageFactory::generated_factory()->GetPrototype(
-  //     FooMessage::descriptor()) == FooMessage::default_instance()
-  // This factory supports all types which are found in
-  // DescriptorPool::generated_pool().  If given a descriptor from any other
-  // pool, GetPrototype() will return nullptr.  (You can also check if a
-  // descriptor is for a generated message by checking if
-  // descriptor->file()->pool() == DescriptorPool::generated_pool().)
-  //
-  // This factory is 100% thread-safe; calling GetPrototype() does not modify
-  // any shared data.
-  //
-  // This factory is a singleton.  The caller must not delete the object.
-  static MessageFactory* generated_factory();
-
-  // For internal use only:  Registers a .proto file at static initialization
-  // time, to be placed in generated_factory.  The first time GetPrototype()
-  // is called with a descriptor from this file, |register_messages| will be
-  // called, with the file name as the parameter.  It must call
-  // InternalRegisterGeneratedMessage() (below) to register each message type
-  // in the file.  This strange mechanism is necessary because descriptors are
-  // built lazily, so we can't register types by their descriptor until we
-  // know that the descriptor exists.  |filename| must be a permanent string.
-  static void InternalRegisterGeneratedFile(
-      const google::protobuf::internal::DescriptorTable* table);
-
-  // For internal use only:  Registers a message type.  Called only by the
-  // functions which are registered with InternalRegisterGeneratedFile(),
-  // above.
-  static void InternalRegisterGeneratedMessage(const Descriptor* descriptor,
-                                               const Message* prototype);
-
-
- private:
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(MessageFactory);
-};
-
-#define DECLARE_GET_REPEATED_FIELD(TYPE)                           \
-  template <>                                                      \
-  PROTOBUF_EXPORT const RepeatedField<TYPE>&                       \
-  Reflection::GetRepeatedFieldInternal<TYPE>(                      \
-      const Message& message, const FieldDescriptor* field) const; \
-                                                                   \
-  template <>                                                      \
-  PROTOBUF_EXPORT RepeatedField<TYPE>*                             \
-  Reflection::MutableRepeatedFieldInternal<TYPE>(                  \
-      Message * message, const FieldDescriptor* field) const;
-
-DECLARE_GET_REPEATED_FIELD(int32_t)
-DECLARE_GET_REPEATED_FIELD(int64_t)
-DECLARE_GET_REPEATED_FIELD(uint32_t)
-DECLARE_GET_REPEATED_FIELD(uint64_t)
-DECLARE_GET_REPEATED_FIELD(float)
-DECLARE_GET_REPEATED_FIELD(double)
-DECLARE_GET_REPEATED_FIELD(bool)
-
-#undef DECLARE_GET_REPEATED_FIELD
-
-// Tries to downcast this message to a generated message type.  Returns nullptr
-// if this class is not an instance of T.  This works even if RTTI is disabled.
-//
-// This also has the effect of creating a strong reference to T that will
-// prevent the linker from stripping it out at link time.  This can be important
-// if you are using a DynamicMessageFactory that delegates to the generated
-// factory.
-template <typename T>
-const T* DynamicCastToGenerated(const Message* from) {
-  // Compile-time assert that T is a generated type that has a
-  // default_instance() accessor, but avoid actually calling it.
-  const T& (*get_default_instance)() = &T::default_instance;
-  (void)get_default_instance;
-
-  // Compile-time assert that T is a subclass of google::protobuf::Message.
-  const Message* unused = static_cast<T*>(nullptr);
-  (void)unused;
-
-#if PROTOBUF_RTTI
-  return dynamic_cast<const T*>(from);
-#else
-  bool ok = from != nullptr &&
-            T::default_instance().GetReflection() == from->GetReflection();
-  return ok ? down_cast<const T*>(from) : nullptr;
-#endif
-}
-
-template <typename T>
-T* DynamicCastToGenerated(Message* from) {
-  const Message* message_const = from;
-  return const_cast<T*>(DynamicCastToGenerated<T>(message_const));
-}
-
-// Call this function to ensure that this message's reflection is linked into
-// the binary:
-//
-//   google::protobuf::LinkMessageReflection<pkg::FooMessage>();
-//
-// This will ensure that the following lookup will succeed:
-//
-//   DescriptorPool::generated_pool()->FindMessageTypeByName("pkg.FooMessage");
-//
-// As a side-effect, it will also guarantee that anything else from the same
-// .proto file will also be available for lookup in the generated pool.
-//
-// This function does not actually register the message, so it does not need
-// to be called before the lookup.  However it does need to occur in a function
-// that cannot be stripped from the binary (ie. it must be reachable from main).
-//
-// Best practice is to call this function as close as possible to where the
-// reflection is actually needed.  This function is very cheap to call, so you
-// should not need to worry about its runtime overhead except in the tightest
-// of loops (on x86-64 it compiles into two "mov" instructions).
-template <typename T>
-void LinkMessageReflection() {
-  internal::StrongReference(T::default_instance);
-}
-
-// =============================================================================
-// Implementation details for {Get,Mutable}RawRepeatedPtrField.  We provide
-// specializations for <std::string>, <StringPieceField> and <Message> and
-// handle everything else with the default template which will match any type
-// having a method with signature "static const google::protobuf::Descriptor*
-// descriptor()". Such a type presumably is a descendant of google::protobuf::Message.
-
-template <>
-inline const RepeatedPtrField<std::string>&
-Reflection::GetRepeatedPtrFieldInternal<std::string>(
-    const Message& message, const FieldDescriptor* field) const {
-  return *static_cast<RepeatedPtrField<std::string>*>(
-      MutableRawRepeatedString(const_cast<Message*>(&message), field, true));
-}
-
-template <>
-inline RepeatedPtrField<std::string>*
-Reflection::MutableRepeatedPtrFieldInternal<std::string>(
-    Message* message, const FieldDescriptor* field) const {
-  return static_cast<RepeatedPtrField<std::string>*>(
-      MutableRawRepeatedString(message, field, true));
-}
-
-
-// -----
-
-template <>
-inline const RepeatedPtrField<Message>& Reflection::GetRepeatedPtrFieldInternal(
-    const Message& message, const FieldDescriptor* field) const {
-  return *static_cast<const RepeatedPtrField<Message>*>(GetRawRepeatedField(
-      message, field, FieldDescriptor::CPPTYPE_MESSAGE, -1, nullptr));
-}
-
-template <>
-inline RepeatedPtrField<Message>* Reflection::MutableRepeatedPtrFieldInternal(
-    Message* message, const FieldDescriptor* field) const {
-  return static_cast<RepeatedPtrField<Message>*>(MutableRawRepeatedField(
-      message, field, FieldDescriptor::CPPTYPE_MESSAGE, -1, nullptr));
-}
-
-template <typename PB>
-inline const RepeatedPtrField<PB>& Reflection::GetRepeatedPtrFieldInternal(
-    const Message& message, const FieldDescriptor* field) const {
-  return *static_cast<const RepeatedPtrField<PB>*>(
-      GetRawRepeatedField(message, field, FieldDescriptor::CPPTYPE_MESSAGE, -1,
-                          PB::default_instance().GetDescriptor()));
-}
-
-template <typename PB>
-inline RepeatedPtrField<PB>* Reflection::MutableRepeatedPtrFieldInternal(
-    Message* message, const FieldDescriptor* field) const {
-  return static_cast<RepeatedPtrField<PB>*>(
-      MutableRawRepeatedField(message, field, FieldDescriptor::CPPTYPE_MESSAGE,
-                              -1, PB::default_instance().GetDescriptor()));
-}
-
-template <typename Type>
-const Type& Reflection::DefaultRaw(const FieldDescriptor* field) const {
-  return *reinterpret_cast<const Type*>(schema_.GetFieldDefault(field));
-}
-
-uint32_t Reflection::GetOneofCase(
-    const Message& message, const OneofDescriptor* oneof_descriptor) const {
-  GOOGLE_DCHECK(!oneof_descriptor->is_synthetic());
-  return internal::GetConstRefAtOffset<uint32_t>(
-      message, schema_.GetOneofCaseOffset(oneof_descriptor));
-}
-
-bool Reflection::HasOneofField(const Message& message,
-                               const FieldDescriptor* field) const {
-  return (GetOneofCase(message, field->containing_oneof()) ==
-          static_cast<uint32_t>(field->number()));
-}
-
-template <typename Type>
-const Type& Reflection::GetRaw(const Message& message,
-                               const FieldDescriptor* field) const {
-  GOOGLE_DCHECK(!schema_.InRealOneof(field) || HasOneofField(message, field))
-      << "Field = " << field->full_name();
-  return internal::GetConstRefAtOffset<Type>(message,
-                                             schema_.GetFieldOffset(field));
-}
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
-
-#endif  // GOOGLE_PROTOBUF_MESSAGE_H__
diff --git a/libs/protobuf/src/google/protobuf/message_lite.cc b/libs/protobuf/src/google/protobuf/message_lite.cc
deleted file mode 100644
index da66c19..0000000
--- a/libs/protobuf/src/google/protobuf/message_lite.cc
+++ /dev/null
@@ -1,602 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Authors: wink@google.com (Wink Saville),
-//          kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-
-#include <google/protobuf/message_lite.h>
-
-#include <climits>
-#include <cstdint>
-#include <string>
-
-#include <google/protobuf/stubs/logging.h>
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/parse_context.h>
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/io/zero_copy_stream.h>
-#include <google/protobuf/io/zero_copy_stream_impl.h>
-#include <google/protobuf/io/zero_copy_stream_impl_lite.h>
-#include <google/protobuf/arena.h>
-#include <google/protobuf/stubs/strutil.h>
-#include <google/protobuf/generated_message_util.h>
-#include <google/protobuf/repeated_field.h>
-#include <google/protobuf/stubs/stl_util.h>
-#include <google/protobuf/stubs/mutex.h>
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-
-std::string MessageLite::InitializationErrorString() const {
-  return "(cannot determine missing fields for lite message)";
-}
-
-std::string MessageLite::DebugString() const {
-  std::uintptr_t address = reinterpret_cast<std::uintptr_t>(this);
-  return StrCat("MessageLite at 0x", strings::Hex(address));
-}
-
-namespace {
-
-// When serializing, we first compute the byte size, then serialize the message.
-// If serialization produces a different number of bytes than expected, we
-// call this function, which crashes.  The problem could be due to a bug in the
-// protobuf implementation but is more likely caused by concurrent modification
-// of the message.  This function attempts to distinguish between the two and
-// provide a useful error message.
-void ByteSizeConsistencyError(size_t byte_size_before_serialization,
-                              size_t byte_size_after_serialization,
-                              size_t bytes_produced_by_serialization,
-                              const MessageLite& message) {
-  GOOGLE_CHECK_EQ(byte_size_before_serialization, byte_size_after_serialization)
-      << message.GetTypeName()
-      << " was modified concurrently during serialization.";
-  GOOGLE_CHECK_EQ(bytes_produced_by_serialization, byte_size_before_serialization)
-      << "Byte size calculation and serialization were inconsistent.  This "
-         "may indicate a bug in protocol buffers or it may be caused by "
-         "concurrent modification of "
-      << message.GetTypeName() << ".";
-  GOOGLE_LOG(FATAL) << "This shouldn't be called if all the sizes are equal.";
-}
-
-std::string InitializationErrorMessage(const char* action,
-                                       const MessageLite& message) {
-  // Note:  We want to avoid depending on strutil in the lite library, otherwise
-  //   we'd use:
-  //
-  // return strings::Substitute(
-  //   "Can't $0 message of type \"$1\" because it is missing required "
-  //   "fields: $2",
-  //   action, message.GetTypeName(),
-  //   message.InitializationErrorString());
-
-  std::string result;
-  result += "Can't ";
-  result += action;
-  result += " message of type \"";
-  result += message.GetTypeName();
-  result += "\" because it is missing required fields: ";
-  result += message.InitializationErrorString();
-  return result;
-}
-
-inline StringPiece as_string_view(const void* data, int size) {
-  return StringPiece(static_cast<const char*>(data), size);
-}
-
-// Returns true of all required fields are present / have values.
-inline bool CheckFieldPresence(const internal::ParseContext& ctx,
-                               const MessageLite& msg,
-                               MessageLite::ParseFlags parse_flags) {
-  (void)ctx;  // Parameter is used by Google-internal code.
-  if (PROTOBUF_PREDICT_FALSE((parse_flags & MessageLite::kMergePartial) != 0)) {
-    return true;
-  }
-  return msg.IsInitializedWithErrors();
-}
-
-}  // namespace
-
-void MessageLite::LogInitializationErrorMessage() const {
-  GOOGLE_LOG(ERROR) << InitializationErrorMessage("parse", *this);
-}
-
-namespace internal {
-
-template <bool aliasing>
-bool MergeFromImpl(StringPiece input, MessageLite* msg,
-                   MessageLite::ParseFlags parse_flags) {
-  const char* ptr;
-  internal::ParseContext ctx(io::CodedInputStream::GetDefaultRecursionLimit(),
-                             aliasing, &ptr, input);
-  ptr = msg->_InternalParse(ptr, &ctx);
-  // ctx has an explicit limit set (length of string_view).
-  if (PROTOBUF_PREDICT_TRUE(ptr && ctx.EndedAtLimit())) {
-    return CheckFieldPresence(ctx, *msg, parse_flags);
-  }
-  return false;
-}
-
-template <bool aliasing>
-bool MergeFromImpl(io::ZeroCopyInputStream* input, MessageLite* msg,
-                   MessageLite::ParseFlags parse_flags) {
-  const char* ptr;
-  internal::ParseContext ctx(io::CodedInputStream::GetDefaultRecursionLimit(),
-                             aliasing, &ptr, input);
-  ptr = msg->_InternalParse(ptr, &ctx);
-  // ctx has no explicit limit (hence we end on end of stream)
-  if (PROTOBUF_PREDICT_TRUE(ptr && ctx.EndedAtEndOfStream())) {
-    return CheckFieldPresence(ctx, *msg, parse_flags);
-  }
-  return false;
-}
-
-template <bool aliasing>
-bool MergeFromImpl(BoundedZCIS input, MessageLite* msg,
-                   MessageLite::ParseFlags parse_flags) {
-  const char* ptr;
-  internal::ParseContext ctx(io::CodedInputStream::GetDefaultRecursionLimit(),
-                             aliasing, &ptr, input.zcis, input.limit);
-  ptr = msg->_InternalParse(ptr, &ctx);
-  if (PROTOBUF_PREDICT_FALSE(!ptr)) return false;
-  ctx.BackUp(ptr);
-  if (PROTOBUF_PREDICT_TRUE(ctx.EndedAtLimit())) {
-    return CheckFieldPresence(ctx, *msg, parse_flags);
-  }
-  return false;
-}
-
-template bool MergeFromImpl<false>(StringPiece input, MessageLite* msg,
-                                   MessageLite::ParseFlags parse_flags);
-template bool MergeFromImpl<true>(StringPiece input, MessageLite* msg,
-                                  MessageLite::ParseFlags parse_flags);
-template bool MergeFromImpl<false>(io::ZeroCopyInputStream* input,
-                                   MessageLite* msg,
-                                   MessageLite::ParseFlags parse_flags);
-template bool MergeFromImpl<true>(io::ZeroCopyInputStream* input,
-                                  MessageLite* msg,
-                                  MessageLite::ParseFlags parse_flags);
-template bool MergeFromImpl<false>(BoundedZCIS input, MessageLite* msg,
-                                   MessageLite::ParseFlags parse_flags);
-template bool MergeFromImpl<true>(BoundedZCIS input, MessageLite* msg,
-                                  MessageLite::ParseFlags parse_flags);
-
-}  // namespace internal
-
-class ZeroCopyCodedInputStream : public io::ZeroCopyInputStream {
- public:
-  ZeroCopyCodedInputStream(io::CodedInputStream* cis) : cis_(cis) {}
-  bool Next(const void** data, int* size) final {
-    if (!cis_->GetDirectBufferPointer(data, size)) return false;
-    cis_->Skip(*size);
-    return true;
-  }
-  void BackUp(int count) final { cis_->Advance(-count); }
-  bool Skip(int count) final { return cis_->Skip(count); }
-  int64_t ByteCount() const final { return 0; }
-
-  bool aliasing_enabled() { return cis_->aliasing_enabled_; }
-
- private:
-  io::CodedInputStream* cis_;
-};
-
-bool MessageLite::MergeFromImpl(io::CodedInputStream* input,
-                                MessageLite::ParseFlags parse_flags) {
-  ZeroCopyCodedInputStream zcis(input);
-  const char* ptr;
-  internal::ParseContext ctx(input->RecursionBudget(), zcis.aliasing_enabled(),
-                             &ptr, &zcis);
-  // MergePartialFromCodedStream allows terminating the wireformat by 0 or
-  // end-group tag. Leaving it up to the caller to verify correct ending by
-  // calling LastTagWas on input. We need to maintain this behavior.
-  ctx.TrackCorrectEnding();
-  ctx.data().pool = input->GetExtensionPool();
-  ctx.data().factory = input->GetExtensionFactory();
-  ptr = _InternalParse(ptr, &ctx);
-  if (PROTOBUF_PREDICT_FALSE(!ptr)) return false;
-  ctx.BackUp(ptr);
-  if (!ctx.EndedAtEndOfStream()) {
-    GOOGLE_DCHECK_NE(ctx.LastTag(), 1);  // We can't end on a pushed limit.
-    if (ctx.IsExceedingLimit(ptr)) return false;
-    input->SetLastTag(ctx.LastTag());
-  } else {
-    input->SetConsumed();
-  }
-  return CheckFieldPresence(ctx, *this, parse_flags);
-}
-
-bool MessageLite::MergePartialFromCodedStream(io::CodedInputStream* input) {
-  return MergeFromImpl(input, kMergePartial);
-}
-
-bool MessageLite::MergeFromCodedStream(io::CodedInputStream* input) {
-  return MergeFromImpl(input, kMerge);
-}
-
-bool MessageLite::ParseFromCodedStream(io::CodedInputStream* input) {
-  Clear();
-  return MergeFromImpl(input, kParse);
-}
-
-bool MessageLite::ParsePartialFromCodedStream(io::CodedInputStream* input) {
-  Clear();
-  return MergeFromImpl(input, kParsePartial);
-}
-
-bool MessageLite::ParseFromZeroCopyStream(io::ZeroCopyInputStream* input) {
-  return ParseFrom<kParse>(input);
-}
-
-bool MessageLite::ParsePartialFromZeroCopyStream(
-    io::ZeroCopyInputStream* input) {
-  return ParseFrom<kParsePartial>(input);
-}
-
-bool MessageLite::ParseFromFileDescriptor(int file_descriptor) {
-  io::FileInputStream input(file_descriptor);
-  return ParseFromZeroCopyStream(&input) && input.GetErrno() == 0;
-}
-
-bool MessageLite::ParsePartialFromFileDescriptor(int file_descriptor) {
-  io::FileInputStream input(file_descriptor);
-  return ParsePartialFromZeroCopyStream(&input) && input.GetErrno() == 0;
-}
-
-bool MessageLite::ParseFromIstream(std::istream* input) {
-  io::IstreamInputStream zero_copy_input(input);
-  return ParseFromZeroCopyStream(&zero_copy_input) && input->eof();
-}
-
-bool MessageLite::ParsePartialFromIstream(std::istream* input) {
-  io::IstreamInputStream zero_copy_input(input);
-  return ParsePartialFromZeroCopyStream(&zero_copy_input) && input->eof();
-}
-
-bool MessageLite::MergePartialFromBoundedZeroCopyStream(
-    io::ZeroCopyInputStream* input, int size) {
-  return ParseFrom<kMergePartial>(internal::BoundedZCIS{input, size});
-}
-
-bool MessageLite::MergeFromBoundedZeroCopyStream(io::ZeroCopyInputStream* input,
-                                                 int size) {
-  return ParseFrom<kMerge>(internal::BoundedZCIS{input, size});
-}
-
-bool MessageLite::ParseFromBoundedZeroCopyStream(io::ZeroCopyInputStream* input,
-                                                 int size) {
-  return ParseFrom<kParse>(internal::BoundedZCIS{input, size});
-}
-
-bool MessageLite::ParsePartialFromBoundedZeroCopyStream(
-    io::ZeroCopyInputStream* input, int size) {
-  return ParseFrom<kParsePartial>(internal::BoundedZCIS{input, size});
-}
-
-bool MessageLite::ParseFromString(ConstStringParam data) {
-  return ParseFrom<kParse>(data);
-}
-
-bool MessageLite::ParsePartialFromString(ConstStringParam data) {
-  return ParseFrom<kParsePartial>(data);
-}
-
-bool MessageLite::ParseFromArray(const void* data, int size) {
-  return ParseFrom<kParse>(as_string_view(data, size));
-}
-
-bool MessageLite::ParsePartialFromArray(const void* data, int size) {
-  return ParseFrom<kParsePartial>(as_string_view(data, size));
-}
-
-bool MessageLite::MergeFromString(ConstStringParam data) {
-  return ParseFrom<kMerge>(data);
-}
-
-
-// ===================================================================
-
-inline uint8_t* SerializeToArrayImpl(const MessageLite& msg, uint8_t* target,
-                                     int size) {
-  constexpr bool debug = false;
-  if (debug) {
-    // Force serialization to a stream with a block size of 1, which forces
-    // all writes to the stream to cross buffers triggering all fallback paths
-    // in the unittests when serializing to string / array.
-    io::ArrayOutputStream stream(target, size, 1);
-    uint8_t* ptr;
-    io::EpsCopyOutputStream out(
-        &stream, io::CodedOutputStream::IsDefaultSerializationDeterministic(),
-        &ptr);
-    ptr = msg._InternalSerialize(ptr, &out);
-    out.Trim(ptr);
-    GOOGLE_DCHECK(!out.HadError() && stream.ByteCount() == size);
-    return target + size;
-  } else {
-    io::EpsCopyOutputStream out(
-        target, size,
-        io::CodedOutputStream::IsDefaultSerializationDeterministic());
-    auto res = msg._InternalSerialize(target, &out);
-    GOOGLE_DCHECK(target + size == res);
-    return res;
-  }
-}
-
-uint8_t* MessageLite::SerializeWithCachedSizesToArray(uint8_t* target) const {
-  // We only optimize this when using optimize_for = SPEED.  In other cases
-  // we just use the CodedOutputStream path.
-  return SerializeToArrayImpl(*this, target, GetCachedSize());
-}
-
-bool MessageLite::SerializeToCodedStream(io::CodedOutputStream* output) const {
-  GOOGLE_DCHECK(IsInitialized()) << InitializationErrorMessage("serialize", *this);
-  return SerializePartialToCodedStream(output);
-}
-
-bool MessageLite::SerializePartialToCodedStream(
-    io::CodedOutputStream* output) const {
-  const size_t size = ByteSizeLong();  // Force size to be cached.
-  if (size > INT_MAX) {
-    GOOGLE_LOG(ERROR) << GetTypeName()
-               << " exceeded maximum protobuf size of 2GB: " << size;
-    return false;
-  }
-
-  int original_byte_count = output->ByteCount();
-  SerializeWithCachedSizes(output);
-  if (output->HadError()) {
-    return false;
-  }
-  int final_byte_count = output->ByteCount();
-
-  if (final_byte_count - original_byte_count != static_cast<int64_t>(size)) {
-    ByteSizeConsistencyError(size, ByteSizeLong(),
-                             final_byte_count - original_byte_count, *this);
-  }
-
-  return true;
-}
-
-bool MessageLite::SerializeToZeroCopyStream(
-    io::ZeroCopyOutputStream* output) const {
-  GOOGLE_DCHECK(IsInitialized()) << InitializationErrorMessage("serialize", *this);
-  return SerializePartialToZeroCopyStream(output);
-}
-
-bool MessageLite::SerializePartialToZeroCopyStream(
-    io::ZeroCopyOutputStream* output) const {
-  const size_t size = ByteSizeLong();  // Force size to be cached.
-  if (size > INT_MAX) {
-    GOOGLE_LOG(ERROR) << GetTypeName()
-               << " exceeded maximum protobuf size of 2GB: " << size;
-    return false;
-  }
-
-  uint8_t* target;
-  io::EpsCopyOutputStream stream(
-      output, io::CodedOutputStream::IsDefaultSerializationDeterministic(),
-      &target);
-  target = _InternalSerialize(target, &stream);
-  stream.Trim(target);
-  if (stream.HadError()) return false;
-  return true;
-}
-
-bool MessageLite::SerializeToFileDescriptor(int file_descriptor) const {
-  io::FileOutputStream output(file_descriptor);
-  return SerializeToZeroCopyStream(&output) && output.Flush();
-}
-
-bool MessageLite::SerializePartialToFileDescriptor(int file_descriptor) const {
-  io::FileOutputStream output(file_descriptor);
-  return SerializePartialToZeroCopyStream(&output) && output.Flush();
-}
-
-bool MessageLite::SerializeToOstream(std::ostream* output) const {
-  {
-    io::OstreamOutputStream zero_copy_output(output);
-    if (!SerializeToZeroCopyStream(&zero_copy_output)) return false;
-  }
-  return output->good();
-}
-
-bool MessageLite::SerializePartialToOstream(std::ostream* output) const {
-  io::OstreamOutputStream zero_copy_output(output);
-  return SerializePartialToZeroCopyStream(&zero_copy_output);
-}
-
-bool MessageLite::AppendToString(std::string* output) const {
-  GOOGLE_DCHECK(IsInitialized()) << InitializationErrorMessage("serialize", *this);
-  return AppendPartialToString(output);
-}
-
-bool MessageLite::AppendPartialToString(std::string* output) const {
-  size_t old_size = output->size();
-  size_t byte_size = ByteSizeLong();
-  if (byte_size > INT_MAX) {
-    GOOGLE_LOG(ERROR) << GetTypeName()
-               << " exceeded maximum protobuf size of 2GB: " << byte_size;
-    return false;
-  }
-
-  STLStringResizeUninitializedAmortized(output, old_size + byte_size);
-  uint8_t* start =
-      reinterpret_cast<uint8_t*>(io::mutable_string_data(output) + old_size);
-  SerializeToArrayImpl(*this, start, byte_size);
-  return true;
-}
-
-bool MessageLite::SerializeToString(std::string* output) const {
-  output->clear();
-  return AppendToString(output);
-}
-
-bool MessageLite::SerializePartialToString(std::string* output) const {
-  output->clear();
-  return AppendPartialToString(output);
-}
-
-bool MessageLite::SerializeToArray(void* data, int size) const {
-  GOOGLE_DCHECK(IsInitialized()) << InitializationErrorMessage("serialize", *this);
-  return SerializePartialToArray(data, size);
-}
-
-bool MessageLite::SerializePartialToArray(void* data, int size) const {
-  const size_t byte_size = ByteSizeLong();
-  if (byte_size > INT_MAX) {
-    GOOGLE_LOG(ERROR) << GetTypeName()
-               << " exceeded maximum protobuf size of 2GB: " << byte_size;
-    return false;
-  }
-  if (size < static_cast<int64_t>(byte_size)) return false;
-  uint8_t* start = reinterpret_cast<uint8_t*>(data);
-  SerializeToArrayImpl(*this, start, byte_size);
-  return true;
-}
-
-std::string MessageLite::SerializeAsString() const {
-  // If the compiler implements the (Named) Return Value Optimization,
-  // the local variable 'output' will not actually reside on the stack
-  // of this function, but will be overlaid with the object that the
-  // caller supplied for the return value to be constructed in.
-  std::string output;
-  if (!AppendToString(&output)) output.clear();
-  return output;
-}
-
-std::string MessageLite::SerializePartialAsString() const {
-  std::string output;
-  if (!AppendPartialToString(&output)) output.clear();
-  return output;
-}
-
-
-namespace internal {
-
-MessageLite* NewFromPrototypeHelper(const MessageLite* prototype,
-                                    Arena* arena) {
-  return prototype->New(arena);
-}
-template <>
-void GenericTypeHandler<MessageLite>::Merge(const MessageLite& from,
-                                            MessageLite* to) {
-  to->CheckTypeAndMergeFrom(from);
-}
-template <>
-void GenericTypeHandler<std::string>::Merge(const std::string& from,
-                                            std::string* to) {
-  *to = from;
-}
-
-// Non-inline implementations of InternalMetadata destructor
-// This is moved out of the header because the GOOGLE_DCHECK produces a lot of code.
-void InternalMetadata::CheckedDestruct() {
-  if (HasMessageOwnedArenaTag()) {
-    GOOGLE_DCHECK(!HasUnknownFieldsTag());
-    delete reinterpret_cast<Arena*>(ptr_ - kMessageOwnedArenaTagMask);
-  }
-}
-
-// Non-inline variants of std::string specializations for
-// various InternalMetadata routines.
-template <>
-void InternalMetadata::DoClear<std::string>() {
-  mutable_unknown_fields<std::string>()->clear();
-}
-
-template <>
-void InternalMetadata::DoMergeFrom<std::string>(const std::string& other) {
-  mutable_unknown_fields<std::string>()->append(other);
-}
-
-template <>
-void InternalMetadata::DoSwap<std::string>(std::string* other) {
-  mutable_unknown_fields<std::string>()->swap(*other);
-}
-
-}  // namespace internal
-
-
-// ===================================================================
-// Shutdown support.
-
-namespace internal {
-
-struct ShutdownData {
-  ~ShutdownData() {
-    std::reverse(functions.begin(), functions.end());
-    for (auto pair : functions) pair.first(pair.second);
-  }
-
-  static ShutdownData* get() {
-    static auto* data = new ShutdownData;
-    return data;
-  }
-
-  std::vector<std::pair<void (*)(const void*), const void*>> functions;
-  Mutex mutex;
-};
-
-static void RunZeroArgFunc(const void* arg) {
-  void (*func)() = reinterpret_cast<void (*)()>(const_cast<void*>(arg));
-  func();
-}
-
-void OnShutdown(void (*func)()) {
-  OnShutdownRun(RunZeroArgFunc, reinterpret_cast<void*>(func));
-}
-
-void OnShutdownRun(void (*f)(const void*), const void* arg) {
-  auto shutdown_data = ShutdownData::get();
-  MutexLock lock(&shutdown_data->mutex);
-  shutdown_data->functions.push_back(std::make_pair(f, arg));
-}
-
-}  // namespace internal
-
-void ShutdownProtobufLibrary() {
-  // This function should be called only once, but accepts multiple calls.
-  static bool is_shutdown = false;
-  if (!is_shutdown) {
-    delete internal::ShutdownData::get();
-    is_shutdown = true;
-  }
-}
-
-
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
diff --git a/libs/protobuf/src/google/protobuf/message_lite.h b/libs/protobuf/src/google/protobuf/message_lite.h
deleted file mode 100644
index 950ae1a..0000000
--- a/libs/protobuf/src/google/protobuf/message_lite.h
+++ /dev/null
@@ -1,591 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Authors: wink@google.com (Wink Saville),
-//          kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-//
-// Defines MessageLite, the abstract interface implemented by all (lite
-// and non-lite) protocol message objects.
-
-#ifndef GOOGLE_PROTOBUF_MESSAGE_LITE_H__
-#define GOOGLE_PROTOBUF_MESSAGE_LITE_H__
-
-
-#include <climits>
-#include <string>
-
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/stubs/logging.h>
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/arena.h>
-#include <google/protobuf/stubs/once.h>
-#include <google/protobuf/port.h>
-#include <google/protobuf/stubs/strutil.h>
-#include <google/protobuf/explicitly_constructed.h>
-#include <google/protobuf/metadata_lite.h>
-#include <google/protobuf/stubs/hash.h>  // TODO(b/211442718): cleanup
-
-// clang-format off
-#include <google/protobuf/port_def.inc>
-// clang-format on
-
-#ifdef SWIG
-#error "You cannot SWIG proto headers"
-#endif
-
-namespace google {
-namespace protobuf {
-
-template <typename T>
-class RepeatedPtrField;
-
-class FastReflectionMessageMutator;
-class FastReflectionStringSetter;
-class Reflection;
-
-namespace io {
-
-class CodedInputStream;
-class CodedOutputStream;
-class ZeroCopyInputStream;
-class ZeroCopyOutputStream;
-
-}  // namespace io
-namespace internal {
-
-class SwapFieldHelper;
-
-// See parse_context.h for explanation
-class ParseContext;
-
-class ExtensionSet;
-class LazyField;
-class RepeatedPtrFieldBase;
-class TcParser;
-class WireFormatLite;
-class WeakFieldMap;
-
-template <typename Type>
-class GenericTypeHandler;  // defined in repeated_field.h
-
-// We compute sizes as size_t but cache them as int.  This function converts a
-// computed size to a cached size.  Since we don't proceed with serialization
-// if the total size was > INT_MAX, it is not important what this function
-// returns for inputs > INT_MAX.  However this case should not error or
-// GOOGLE_CHECK-fail, because the full size_t resolution is still returned from
-// ByteSizeLong() and checked against INT_MAX; we can catch the overflow
-// there.
-inline int ToCachedSize(size_t size) { return static_cast<int>(size); }
-
-// We mainly calculate sizes in terms of size_t, but some functions that
-// compute sizes return "int".  These int sizes are expected to always be
-// positive. This function is more efficient than casting an int to size_t
-// directly on 64-bit platforms because it avoids making the compiler emit a
-// sign extending instruction, which we don't want and don't want to pay for.
-inline size_t FromIntSize(int size) {
-  // Convert to unsigned before widening so sign extension is not necessary.
-  return static_cast<unsigned int>(size);
-}
-
-// For cases where a legacy function returns an integer size.  We GOOGLE_DCHECK()
-// that the conversion will fit within an integer; if this is false then we
-// are losing information.
-inline int ToIntSize(size_t size) {
-  GOOGLE_DCHECK_LE(size, static_cast<size_t>(INT_MAX));
-  return static_cast<int>(size);
-}
-
-// Default empty string object. Don't use this directly. Instead, call
-// GetEmptyString() to get the reference. This empty string is aligned with a
-// minimum alignment of 8 bytes to match the requirement of ArenaStringPtr.
-PROTOBUF_EXPORT extern ExplicitlyConstructedArenaString
-    fixed_address_empty_string;
-
-
-PROTOBUF_EXPORT constexpr const std::string& GetEmptyStringAlreadyInited() {
-  return fixed_address_empty_string.get();
-}
-
-PROTOBUF_EXPORT size_t StringSpaceUsedExcludingSelfLong(const std::string& str);
-
-}  // namespace internal
-
-// Interface to light weight protocol messages.
-//
-// This interface is implemented by all protocol message objects.  Non-lite
-// messages additionally implement the Message interface, which is a
-// subclass of MessageLite.  Use MessageLite instead when you only need
-// the subset of features which it supports -- namely, nothing that uses
-// descriptors or reflection.  You can instruct the protocol compiler
-// to generate classes which implement only MessageLite, not the full
-// Message interface, by adding the following line to the .proto file:
-//
-//   option optimize_for = LITE_RUNTIME;
-//
-// This is particularly useful on resource-constrained systems where
-// the full protocol buffers runtime library is too big.
-//
-// Note that on non-constrained systems (e.g. servers) when you need
-// to link in lots of protocol definitions, a better way to reduce
-// total code footprint is to use optimize_for = CODE_SIZE.  This
-// will make the generated code smaller while still supporting all the
-// same features (at the expense of speed).  optimize_for = LITE_RUNTIME
-// is best when you only have a small number of message types linked
-// into your binary, in which case the size of the protocol buffers
-// runtime itself is the biggest problem.
-//
-// Users must not derive from this class. Only the protocol compiler and
-// the internal library are allowed to create subclasses.
-class PROTOBUF_EXPORT MessageLite {
- public:
-  constexpr MessageLite() {}
-  virtual ~MessageLite() = default;
-
-  // Basic Operations ------------------------------------------------
-
-  // Get the name of this message type, e.g. "foo.bar.BazProto".
-  virtual std::string GetTypeName() const = 0;
-
-  // Construct a new instance of the same type.  Ownership is passed to the
-  // caller.
-  MessageLite* New() const { return New(nullptr); }
-
-  // Construct a new instance on the arena. Ownership is passed to the caller
-  // if arena is a nullptr.
-  virtual MessageLite* New(Arena* arena) const = 0;
-
-  // Returns user-owned arena; nullptr if it's message owned.
-  Arena* GetArena() const { return _internal_metadata_.user_arena(); }
-
-  // Clear all fields of the message and set them to their default values.
-  // Clear() assumes that any memory allocated to hold parts of the message
-  // will likely be needed again, so the memory used may not be freed.
-  // To ensure that all memory used by a Message is freed, you must delete it.
-  virtual void Clear() = 0;
-
-  // Quickly check if all required fields have values set.
-  virtual bool IsInitialized() const = 0;
-
-  // This is not implemented for Lite messages -- it just returns "(cannot
-  // determine missing fields for lite message)".  However, it is implemented
-  // for full messages.  See message.h.
-  virtual std::string InitializationErrorString() const;
-
-  // If |other| is the exact same class as this, calls MergeFrom(). Otherwise,
-  // results are undefined (probably crash).
-  virtual void CheckTypeAndMergeFrom(const MessageLite& other) = 0;
-
-  // These methods return a human-readable summary of the message. Note that
-  // since the MessageLite interface does not support reflection, there is very
-  // little information that these methods can provide. They are shadowed by
-  // methods of the same name on the Message interface which provide much more
-  // information. The methods here are intended primarily to facilitate code
-  // reuse for logic that needs to interoperate with both full and lite protos.
-  //
-  // The format of the returned string is subject to change, so please do not
-  // assume it will remain stable over time.
-  std::string DebugString() const;
-  std::string ShortDebugString() const { return DebugString(); }
-  // MessageLite::DebugString is already Utf8 Safe. This is to add compatibility
-  // with Message.
-  std::string Utf8DebugString() const { return DebugString(); }
-
-  // Parsing ---------------------------------------------------------
-  // Methods for parsing in protocol buffer format.  Most of these are
-  // just simple wrappers around MergeFromCodedStream().  Clear() will be
-  // called before merging the input.
-
-  // Fill the message with a protocol buffer parsed from the given input
-  // stream. Returns false on a read error or if the input is in the wrong
-  // format.  A successful return does not indicate the entire input is
-  // consumed, ensure you call ConsumedEntireMessage() to check that if
-  // applicable.
-  PROTOBUF_ATTRIBUTE_REINITIALIZES bool ParseFromCodedStream(
-      io::CodedInputStream* input);
-  // Like ParseFromCodedStream(), but accepts messages that are missing
-  // required fields.
-  PROTOBUF_ATTRIBUTE_REINITIALIZES bool ParsePartialFromCodedStream(
-      io::CodedInputStream* input);
-  // Read a protocol buffer from the given zero-copy input stream.  If
-  // successful, the entire input will be consumed.
-  PROTOBUF_ATTRIBUTE_REINITIALIZES bool ParseFromZeroCopyStream(
-      io::ZeroCopyInputStream* input);
-  // Like ParseFromZeroCopyStream(), but accepts messages that are missing
-  // required fields.
-  PROTOBUF_ATTRIBUTE_REINITIALIZES bool ParsePartialFromZeroCopyStream(
-      io::ZeroCopyInputStream* input);
-  // Parse a protocol buffer from a file descriptor.  If successful, the entire
-  // input will be consumed.
-  PROTOBUF_ATTRIBUTE_REINITIALIZES bool ParseFromFileDescriptor(
-      int file_descriptor);
-  // Like ParseFromFileDescriptor(), but accepts messages that are missing
-  // required fields.
-  PROTOBUF_ATTRIBUTE_REINITIALIZES bool ParsePartialFromFileDescriptor(
-      int file_descriptor);
-  // Parse a protocol buffer from a C++ istream.  If successful, the entire
-  // input will be consumed.
-  PROTOBUF_ATTRIBUTE_REINITIALIZES bool ParseFromIstream(std::istream* input);
-  // Like ParseFromIstream(), but accepts messages that are missing
-  // required fields.
-  PROTOBUF_ATTRIBUTE_REINITIALIZES bool ParsePartialFromIstream(
-      std::istream* input);
-  // Read a protocol buffer from the given zero-copy input stream, expecting
-  // the message to be exactly "size" bytes long.  If successful, exactly
-  // this many bytes will have been consumed from the input.
-  bool MergePartialFromBoundedZeroCopyStream(io::ZeroCopyInputStream* input,
-                                             int size);
-  // Like ParseFromBoundedZeroCopyStream(), but accepts messages that are
-  // missing required fields.
-  bool MergeFromBoundedZeroCopyStream(io::ZeroCopyInputStream* input, int size);
-  PROTOBUF_ATTRIBUTE_REINITIALIZES bool ParseFromBoundedZeroCopyStream(
-      io::ZeroCopyInputStream* input, int size);
-  // Like ParseFromBoundedZeroCopyStream(), but accepts messages that are
-  // missing required fields.
-  PROTOBUF_ATTRIBUTE_REINITIALIZES bool ParsePartialFromBoundedZeroCopyStream(
-      io::ZeroCopyInputStream* input, int size);
-  // Parses a protocol buffer contained in a string. Returns true on success.
-  // This function takes a string in the (non-human-readable) binary wire
-  // format, matching the encoding output by MessageLite::SerializeToString().
-  // If you'd like to convert a human-readable string into a protocol buffer
-  // object, see google::protobuf::TextFormat::ParseFromString().
-  PROTOBUF_ATTRIBUTE_REINITIALIZES bool ParseFromString(ConstStringParam data);
-  // Like ParseFromString(), but accepts messages that are missing
-  // required fields.
-  PROTOBUF_ATTRIBUTE_REINITIALIZES bool ParsePartialFromString(
-      ConstStringParam data);
-  // Parse a protocol buffer contained in an array of bytes.
-  PROTOBUF_ATTRIBUTE_REINITIALIZES bool ParseFromArray(const void* data,
-                                                       int size);
-  // Like ParseFromArray(), but accepts messages that are missing
-  // required fields.
-  PROTOBUF_ATTRIBUTE_REINITIALIZES bool ParsePartialFromArray(const void* data,
-                                                              int size);
-
-
-  // Reads a protocol buffer from the stream and merges it into this
-  // Message.  Singular fields read from the what is
-  // already in the Message and repeated fields are appended to those
-  // already present.
-  //
-  // It is the responsibility of the caller to call input->LastTagWas()
-  // (for groups) or input->ConsumedEntireMessage() (for non-groups) after
-  // this returns to verify that the message's end was delimited correctly.
-  //
-  // ParseFromCodedStream() is implemented as Clear() followed by
-  // MergeFromCodedStream().
-  bool MergeFromCodedStream(io::CodedInputStream* input);
-
-  // Like MergeFromCodedStream(), but succeeds even if required fields are
-  // missing in the input.
-  //
-  // MergeFromCodedStream() is just implemented as MergePartialFromCodedStream()
-  // followed by IsInitialized().
-  bool MergePartialFromCodedStream(io::CodedInputStream* input);
-
-  // Merge a protocol buffer contained in a string.
-  bool MergeFromString(ConstStringParam data);
-
-
-  // Serialization ---------------------------------------------------
-  // Methods for serializing in protocol buffer format.  Most of these
-  // are just simple wrappers around ByteSize() and SerializeWithCachedSizes().
-
-  // Write a protocol buffer of this message to the given output.  Returns
-  // false on a write error.  If the message is missing required fields,
-  // this may GOOGLE_CHECK-fail.
-  bool SerializeToCodedStream(io::CodedOutputStream* output) const;
-  // Like SerializeToCodedStream(), but allows missing required fields.
-  bool SerializePartialToCodedStream(io::CodedOutputStream* output) const;
-  // Write the message to the given zero-copy output stream.  All required
-  // fields must be set.
-  bool SerializeToZeroCopyStream(io::ZeroCopyOutputStream* output) const;
-  // Like SerializeToZeroCopyStream(), but allows missing required fields.
-  bool SerializePartialToZeroCopyStream(io::ZeroCopyOutputStream* output) const;
-  // Serialize the message and store it in the given string.  All required
-  // fields must be set.
-  bool SerializeToString(std::string* output) const;
-  // Like SerializeToString(), but allows missing required fields.
-  bool SerializePartialToString(std::string* output) const;
-  // Serialize the message and store it in the given byte array.  All required
-  // fields must be set.
-  bool SerializeToArray(void* data, int size) const;
-  // Like SerializeToArray(), but allows missing required fields.
-  bool SerializePartialToArray(void* data, int size) const;
-
-  // Make a string encoding the message. Is equivalent to calling
-  // SerializeToString() on a string and using that.  Returns the empty
-  // string if SerializeToString() would have returned an error.
-  // Note: If you intend to generate many such strings, you may
-  // reduce heap fragmentation by instead re-using the same string
-  // object with calls to SerializeToString().
-  std::string SerializeAsString() const;
-  // Like SerializeAsString(), but allows missing required fields.
-  std::string SerializePartialAsString() const;
-
-  // Serialize the message and write it to the given file descriptor.  All
-  // required fields must be set.
-  bool SerializeToFileDescriptor(int file_descriptor) const;
-  // Like SerializeToFileDescriptor(), but allows missing required fields.
-  bool SerializePartialToFileDescriptor(int file_descriptor) const;
-  // Serialize the message and write it to the given C++ ostream.  All
-  // required fields must be set.
-  bool SerializeToOstream(std::ostream* output) const;
-  // Like SerializeToOstream(), but allows missing required fields.
-  bool SerializePartialToOstream(std::ostream* output) const;
-
-  // Like SerializeToString(), but appends to the data to the string's
-  // existing contents.  All required fields must be set.
-  bool AppendToString(std::string* output) const;
-  // Like AppendToString(), but allows missing required fields.
-  bool AppendPartialToString(std::string* output) const;
-
-
-  // Computes the serialized size of the message.  This recursively calls
-  // ByteSizeLong() on all embedded messages.
-  //
-  // ByteSizeLong() is generally linear in the number of fields defined for the
-  // proto.
-  virtual size_t ByteSizeLong() const = 0;
-
-  // Legacy ByteSize() API.
-  PROTOBUF_DEPRECATED_MSG("Please use ByteSizeLong() instead")
-  int ByteSize() const { return internal::ToIntSize(ByteSizeLong()); }
-
-  // Serializes the message without recomputing the size.  The message must not
-  // have changed since the last call to ByteSize(), and the value returned by
-  // ByteSize must be non-negative.  Otherwise the results are undefined.
-  void SerializeWithCachedSizes(io::CodedOutputStream* output) const {
-    output->SetCur(_InternalSerialize(output->Cur(), output->EpsCopy()));
-  }
-
-  // Functions below here are not part of the public interface.  It isn't
-  // enforced, but they should be treated as private, and will be private
-  // at some future time.  Unfortunately the implementation of the "friend"
-  // keyword in GCC is broken at the moment, but we expect it will be fixed.
-
-  // Like SerializeWithCachedSizes, but writes directly to *target, returning
-  // a pointer to the byte immediately after the last byte written.  "target"
-  // must point at a byte array of at least ByteSize() bytes.  Whether to use
-  // deterministic serialization, e.g., maps in sorted order, is determined by
-  // CodedOutputStream::IsDefaultSerializationDeterministic().
-  uint8_t* SerializeWithCachedSizesToArray(uint8_t* target) const;
-
-  // Returns the result of the last call to ByteSize().  An embedded message's
-  // size is needed both to serialize it (because embedded messages are
-  // length-delimited) and to compute the outer message's size.  Caching
-  // the size avoids computing it multiple times.
-  //
-  // ByteSize() does not automatically use the cached size when available
-  // because this would require invalidating it every time the message was
-  // modified, which would be too hard and expensive.  (E.g. if a deeply-nested
-  // sub-message is changed, all of its parents' cached sizes would need to be
-  // invalidated, which is too much work for an otherwise inlined setter
-  // method.)
-  virtual int GetCachedSize() const = 0;
-
-  virtual const char* _InternalParse(const char* /*ptr*/,
-                                     internal::ParseContext* /*ctx*/) {
-    return nullptr;
-  }
-
-  virtual void OnDemandRegisterArenaDtor(Arena* /*arena*/) {}
-
- protected:
-  template <typename T>
-  static T* CreateMaybeMessage(Arena* arena) {
-    return Arena::CreateMaybeMessage<T>(arena);
-  }
-
-  inline explicit MessageLite(Arena* arena, bool is_message_owned = false)
-      : _internal_metadata_(arena, is_message_owned) {}
-
-  // Returns the arena, if any, that directly owns this message and its internal
-  // memory (Arena::Own is different in that the arena doesn't directly own the
-  // internal memory). This method is used in proto's implementation for
-  // swapping, moving and setting allocated, for deciding whether the ownership
-  // of this message or its internal memory could be changed.
-  Arena* GetOwningArena() const { return _internal_metadata_.owning_arena(); }
-
-  // Returns the arena, used for allocating internal objects(e.g., child
-  // messages, etc), or owning incoming objects (e.g., set allocated).
-  Arena* GetArenaForAllocation() const { return _internal_metadata_.arena(); }
-
-  // Returns true if this message is enabled for message-owned arena (MOA)
-  // trials. No lite messages are eligible for MOA.
-  static bool InMoaTrial() { return false; }
-
-  internal::InternalMetadata _internal_metadata_;
-
- public:
-  enum ParseFlags {
-    kMerge = 0,
-    kParse = 1,
-    kMergePartial = 2,
-    kParsePartial = 3,
-    kMergeWithAliasing = 4,
-    kParseWithAliasing = 5,
-    kMergePartialWithAliasing = 6,
-    kParsePartialWithAliasing = 7
-  };
-
-  template <ParseFlags flags, typename T>
-  bool ParseFrom(const T& input);
-
-  // Fast path when conditions match (ie. non-deterministic)
-  //  uint8_t* _InternalSerialize(uint8_t* ptr) const;
-  virtual uint8_t* _InternalSerialize(
-      uint8_t* ptr, io::EpsCopyOutputStream* stream) const = 0;
-
-  // Identical to IsInitialized() except that it logs an error message.
-  bool IsInitializedWithErrors() const {
-    if (IsInitialized()) return true;
-    LogInitializationErrorMessage();
-    return false;
-  }
-
- private:
-  friend class FastReflectionMessageMutator;
-  friend class FastReflectionStringSetter;
-  friend class Message;
-  friend class Reflection;
-  friend class internal::ExtensionSet;
-  friend class internal::LazyField;
-  friend class internal::SwapFieldHelper;
-  friend class internal::TcParser;
-  friend class internal::WeakFieldMap;
-  friend class internal::WireFormatLite;
-
-  template <typename Type>
-  friend class Arena::InternalHelper;
-  template <typename Type>
-  friend class internal::GenericTypeHandler;
-
-  void LogInitializationErrorMessage() const;
-
-  bool MergeFromImpl(io::CodedInputStream* input, ParseFlags parse_flags);
-
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(MessageLite);
-};
-
-namespace internal {
-
-template <bool alias>
-bool MergeFromImpl(StringPiece input, MessageLite* msg,
-                   MessageLite::ParseFlags parse_flags);
-extern template bool MergeFromImpl<false>(StringPiece input,
-                                          MessageLite* msg,
-                                          MessageLite::ParseFlags parse_flags);
-extern template bool MergeFromImpl<true>(StringPiece input,
-                                         MessageLite* msg,
-                                         MessageLite::ParseFlags parse_flags);
-
-template <bool alias>
-bool MergeFromImpl(io::ZeroCopyInputStream* input, MessageLite* msg,
-                   MessageLite::ParseFlags parse_flags);
-extern template bool MergeFromImpl<false>(io::ZeroCopyInputStream* input,
-                                          MessageLite* msg,
-                                          MessageLite::ParseFlags parse_flags);
-extern template bool MergeFromImpl<true>(io::ZeroCopyInputStream* input,
-                                         MessageLite* msg,
-                                         MessageLite::ParseFlags parse_flags);
-
-struct BoundedZCIS {
-  io::ZeroCopyInputStream* zcis;
-  int limit;
-};
-
-template <bool alias>
-bool MergeFromImpl(BoundedZCIS input, MessageLite* msg,
-                   MessageLite::ParseFlags parse_flags);
-extern template bool MergeFromImpl<false>(BoundedZCIS input, MessageLite* msg,
-                                          MessageLite::ParseFlags parse_flags);
-extern template bool MergeFromImpl<true>(BoundedZCIS input, MessageLite* msg,
-                                         MessageLite::ParseFlags parse_flags);
-
-template <typename T>
-struct SourceWrapper;
-
-template <bool alias, typename T>
-bool MergeFromImpl(const SourceWrapper<T>& input, MessageLite* msg,
-                   MessageLite::ParseFlags parse_flags) {
-  return input.template MergeInto<alias>(msg, parse_flags);
-}
-
-}  // namespace internal
-
-template <MessageLite::ParseFlags flags, typename T>
-bool MessageLite::ParseFrom(const T& input) {
-  if (flags & kParse) Clear();
-  constexpr bool alias = (flags & kMergeWithAliasing) != 0;
-  return internal::MergeFromImpl<alias>(input, this, flags);
-}
-
-// ===================================================================
-// Shutdown support.
-
-
-// Shut down the entire protocol buffers library, deleting all static-duration
-// objects allocated by the library or by generated .pb.cc files.
-//
-// There are two reasons you might want to call this:
-// * You use a draconian definition of "memory leak" in which you expect
-//   every single malloc() to have a corresponding free(), even for objects
-//   which live until program exit.
-// * You are writing a dynamically-loaded library which needs to clean up
-//   after itself when the library is unloaded.
-//
-// It is safe to call this multiple times.  However, it is not safe to use
-// any other part of the protocol buffers library after
-// ShutdownProtobufLibrary() has been called. Furthermore this call is not
-// thread safe, user needs to synchronize multiple calls.
-PROTOBUF_EXPORT void ShutdownProtobufLibrary();
-
-namespace internal {
-
-// Register a function to be called when ShutdownProtocolBuffers() is called.
-PROTOBUF_EXPORT void OnShutdown(void (*func)());
-// Run an arbitrary function on an arg
-PROTOBUF_EXPORT void OnShutdownRun(void (*f)(const void*), const void* arg);
-
-template <typename T>
-T* OnShutdownDelete(T* p) {
-  OnShutdownRun([](const void* pp) { delete static_cast<const T*>(pp); }, p);
-  return p;
-}
-
-}  // namespace internal
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
-
-#endif  // GOOGLE_PROTOBUF_MESSAGE_LITE_H__
diff --git a/libs/protobuf/src/google/protobuf/message_unittest.cc b/libs/protobuf/src/google/protobuf/message_unittest.cc
deleted file mode 100644
index f71f60c..0000000
--- a/libs/protobuf/src/google/protobuf/message_unittest.cc
+++ /dev/null
@@ -1,48 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-
-#include <google/protobuf/unittest.pb.h>
-
-#define MESSAGE_TEST_NAME MessageTest
-#define MESSAGE_FACTORY_TEST_NAME MessageFactoryTest
-#define UNITTEST_PACKAGE_NAME "protobuf_unittest"
-#define UNITTEST ::protobuf_unittest
-#define UNITTEST_IMPORT ::protobuf_unittest_import
-
-// Must include after the above macros.
-// clang-format off
-#include <google/protobuf/test_util.inc>
-#include <google/protobuf/message_unittest.inc>
-#include <google/protobuf/arena.h>
-// clang-format on
diff --git a/libs/protobuf/src/google/protobuf/message_unittest.inc b/libs/protobuf/src/google/protobuf/message_unittest.inc
deleted file mode 100644
index fa2bbbf..0000000
--- a/libs/protobuf/src/google/protobuf/message_unittest.inc
+++ /dev/null
@@ -1,1131 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-//
-// This file needs to be included as .inc as it depends on certain macros being
-// defined prior to its inclusion.
-
-#include <fcntl.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-
-#include <cmath>
-#include <limits>
-
-#include <google/protobuf/message.h>
-#ifndef _MSC_VER
-#include <unistd.h>
-#endif
-#include <fstream>
-#include <sstream>
-
-#include <google/protobuf/stubs/logging.h>
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/descriptor.pb.h>
-#include <gmock/gmock.h>
-#include <google/protobuf/testing/googletest.h>
-#include <gtest/gtest.h>
-#include <google/protobuf/stubs/logging.h>
-#include <google/protobuf/stubs/substitute.h>
-#include <google/protobuf/arena.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/io/io_win32.h>
-#include <google/protobuf/generated_message_reflection.h>
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/io/zero_copy_stream.h>
-#include <google/protobuf/io/zero_copy_stream_impl.h>
-#include <google/protobuf/test_util2.h>
-
-
-namespace google {
-namespace protobuf {
-
-#if defined(_WIN32)
-// DO NOT include <io.h>, instead create functions in io_win32.{h,cc} and import
-// them like we do below.
-using google::protobuf::io::win32::close;
-using google::protobuf::io::win32::open;
-#endif
-
-#ifndef O_BINARY
-#ifdef _O_BINARY
-#define O_BINARY _O_BINARY
-#else
-#define O_BINARY 0  // If this isn't defined, the platform doesn't need it.
-#endif
-#endif
-
-TEST(MESSAGE_TEST_NAME, SerializeHelpers) {
-  // TODO(kenton):  Test more helpers?  They're all two-liners so it seems
-  //   like a waste of time.
-
-  UNITTEST::TestAllTypes message;
-  TestUtil::SetAllFields(&message);
-  std::stringstream stream;
-
-  std::string str1("foo");
-  std::string str2("bar");
-
-  EXPECT_TRUE(message.SerializeToString(&str1));
-  EXPECT_TRUE(message.AppendToString(&str2));
-  EXPECT_TRUE(message.SerializeToOstream(&stream));
-
-  EXPECT_EQ(str1.size() + 3, str2.size());
-  EXPECT_EQ("bar", str2.substr(0, 3));
-  // Don't use EXPECT_EQ because we don't want to dump raw binary data to
-  // stdout.
-  EXPECT_TRUE(str2.substr(3) == str1);
-
-  // GCC gives some sort of error if we try to just do stream.str() == str1.
-  std::string temp = stream.str();
-  EXPECT_TRUE(temp == str1);
-
-  EXPECT_TRUE(message.SerializeAsString() == str1);
-
-}
-
-TEST(MESSAGE_TEST_NAME, SerializeToBrokenOstream) {
-  std::ofstream out;
-  UNITTEST::TestAllTypes message;
-  message.set_optional_int32(123);
-
-  EXPECT_FALSE(message.SerializeToOstream(&out));
-}
-
-TEST(MESSAGE_TEST_NAME, ParseFromFileDescriptor) {
-  std::string filename =
-      TestUtil::GetTestDataPath("net/proto2/internal/testdata/golden_message");
-  int file = open(filename.c_str(), O_RDONLY | O_BINARY);
-  ASSERT_GE(file, 0);
-
-  UNITTEST::TestAllTypes message;
-  EXPECT_TRUE(message.ParseFromFileDescriptor(file));
-  TestUtil::ExpectAllFieldsSet(message);
-
-  EXPECT_GE(close(file), 0);
-}
-
-TEST(MESSAGE_TEST_NAME, ParsePackedFromFileDescriptor) {
-  std::string filename = TestUtil::GetTestDataPath(
-      "net/proto2/internal/testdata/golden_packed_fields_message");
-  int file = open(filename.c_str(), O_RDONLY | O_BINARY);
-  ASSERT_GE(file, 0);
-
-  UNITTEST::TestPackedTypes message;
-  EXPECT_TRUE(message.ParseFromFileDescriptor(file));
-  TestUtil::ExpectPackedFieldsSet(message);
-
-  EXPECT_GE(close(file), 0);
-}
-
-TEST(MESSAGE_TEST_NAME, ParseHelpers) {
-  // TODO(kenton):  Test more helpers?  They're all two-liners so it seems
-  //   like a waste of time.
-  std::string data;
-
-  {
-    // Set up.
-    UNITTEST::TestAllTypes message;
-    TestUtil::SetAllFields(&message);
-    message.SerializeToString(&data);
-  }
-
-  {
-    // Test ParseFromString.
-    UNITTEST::TestAllTypes message;
-    EXPECT_TRUE(message.ParseFromString(data));
-    TestUtil::ExpectAllFieldsSet(message);
-  }
-
-  {
-    // Test ParseFromIstream.
-    UNITTEST::TestAllTypes message;
-    std::stringstream stream(data);
-    EXPECT_TRUE(message.ParseFromIstream(&stream));
-    EXPECT_TRUE(stream.eof());
-    TestUtil::ExpectAllFieldsSet(message);
-  }
-
-  {
-    // Test ParseFromBoundedZeroCopyStream.
-    std::string data_with_junk(data);
-    data_with_junk.append("some junk on the end");
-    io::ArrayInputStream stream(data_with_junk.data(), data_with_junk.size());
-    UNITTEST::TestAllTypes message;
-    EXPECT_TRUE(message.ParseFromBoundedZeroCopyStream(&stream, data.size()));
-    TestUtil::ExpectAllFieldsSet(message);
-  }
-
-  {
-    // Test that ParseFromBoundedZeroCopyStream fails (but doesn't crash) if
-    // EOF is reached before the expected number of bytes.
-    io::ArrayInputStream stream(data.data(), data.size());
-    UNITTEST::TestAllTypes message;
-    EXPECT_FALSE(
-        message.ParseFromBoundedZeroCopyStream(&stream, data.size() + 1));
-  }
-}
-
-TEST(MESSAGE_TEST_NAME, ParseFailsIfNotInitialized) {
-  UNITTEST::TestRequired message;
-  std::vector<std::string> errors;
-
-  {
-    ScopedMemoryLog log;
-    EXPECT_FALSE(message.ParseFromString(""));
-    errors = log.GetMessages(ERROR);
-  }
-
-  ASSERT_EQ(1, errors.size());
-  EXPECT_EQ(
-      "Can't parse message of type \"" + std::string(UNITTEST_PACKAGE_NAME) +
-          ".TestRequired\" because it is missing required fields: a, b, c",
-      errors[0]);
-}
-
-TEST(MESSAGE_TEST_NAME, ParseFailsIfSubmessageNotInitialized) {
-  UNITTEST::TestRequiredForeign source, message;
-  source.mutable_optional_message()->set_dummy2(100);
-  std::string serialized = source.SerializePartialAsString();
-
-  EXPECT_TRUE(message.ParsePartialFromString(serialized));
-  EXPECT_FALSE(message.IsInitialized());
-
-  std::vector<std::string> errors;
-  {
-    ScopedMemoryLog log;
-    EXPECT_FALSE(message.ParseFromString(source.SerializePartialAsString()));
-    errors = log.GetMessages(ERROR);
-  }
-
-  EXPECT_THAT(
-      errors,
-      testing::ElementsAre(
-          "Can't parse message of type \"" +
-          std::string(UNITTEST_PACKAGE_NAME) +
-          ".TestRequiredForeign\" because it is missing required fields: "
-          "optional_message.a, optional_message.b, optional_message.c"));
-}
-
-TEST(MESSAGE_TEST_NAME, ParseFailsIfExtensionNotInitialized) {
-  UNITTEST::TestChildExtension source, message;
-  auto* r = source.mutable_optional_extension()->MutableExtension(
-      UNITTEST::TestRequired::single);
-  r->set_dummy2(100);
-  std::string serialized = source.SerializePartialAsString();
-
-  EXPECT_TRUE(message.ParsePartialFromString(serialized));
-  EXPECT_FALSE(message.IsInitialized());
-
-  std::vector<std::string> errors;
-  {
-    ScopedMemoryLog log;
-    EXPECT_FALSE(message.ParseFromString(source.SerializePartialAsString()));
-    errors = log.GetMessages(ERROR);
-  }
-
-  EXPECT_THAT(errors,
-              testing::ElementsAre(strings::Substitute(
-                  "Can't parse message of type \"$0.TestChildExtension\" "
-                  "because it is missing required fields: "
-                  "optional_extension.($0.TestRequired.single).a, "
-                  "optional_extension.($0.TestRequired.single).b, "
-                  "optional_extension.($0.TestRequired.single).c",
-                  UNITTEST_PACKAGE_NAME)));
-}
-
-TEST(MESSAGE_TEST_NAME, MergeFromUninitialized) {
-  UNITTEST::TestNestedRequiredForeign o, p, q;
-  UNITTEST::TestNestedRequiredForeign* child = o.mutable_child();
-  constexpr int kDepth = 2;
-  for (int i = 0; i < kDepth; i++) {
-    child->set_dummy(i);
-    child = child->mutable_child();
-  }
-  UNITTEST::TestRequiredForeign* payload = child->mutable_payload();
-  payload->mutable_optional_message()->set_a(1);
-  payload->mutable_optional_message()->set_dummy2(100);
-  payload->mutable_optional_message()->set_dummy4(200);
-  ASSERT_TRUE(p.ParsePartialFromString(o.SerializePartialAsString()));
-
-  q.mutable_child()->set_dummy(500);
-  q = p;
-  q.ParsePartialFromString(q.SerializePartialAsString());
-  EXPECT_TRUE(TestUtil::EqualsToSerialized(q, o.SerializePartialAsString()));
-  EXPECT_TRUE(TestUtil::EqualsToSerialized(q, p.SerializePartialAsString()));
-}
-
-TEST(MESSAGE_TEST_NAME, ExplicitLazyExceedRecursionLimit) {
-  UNITTEST::NestedTestAllTypes original, parsed;
-  // Build proto with recursion depth of 3.
-  original.mutable_lazy_child()
-      ->mutable_child()
-      ->mutable_payload()
-      ->set_optional_int32(-1);
-  std::string serialized;
-  EXPECT_TRUE(original.SerializeToString(&serialized));
-
-  // User annotated LazyField ([lazy = true]) is eagerly verified and should
-  // catch the recursion limit violation.
-  io::ArrayInputStream array_stream(serialized.data(), serialized.size());
-  io::CodedInputStream input_stream(&array_stream);
-  input_stream.SetRecursionLimit(2);
-  EXPECT_FALSE(parsed.ParseFromCodedStream(&input_stream));
-
-  // Lazy read results in parsing error which can be verified by not having
-  // expected value.
-  EXPECT_NE(parsed.lazy_child().child().payload().optional_int32(), -1);
-}
-
-TEST(MESSAGE_TEST_NAME, NestedExplicitLazyExceedRecursionLimit) {
-  UNITTEST::NestedTestAllTypes original, parsed;
-  // Build proto with recursion depth of 5, with nested annotated LazyField.
-  original.mutable_lazy_child()
-      ->mutable_child()
-      ->mutable_lazy_child()
-      ->mutable_child()
-      ->mutable_payload()
-      ->set_optional_int32(-1);
-  std::string serialized;
-  EXPECT_TRUE(original.SerializeToString(&serialized));
-
-  // User annotated LazyField ([lazy = true]) is eagerly verified and should
-  // catch the recursion limit violation.
-  io::ArrayInputStream array_stream(serialized.data(), serialized.size());
-  io::CodedInputStream input_stream(&array_stream);
-  input_stream.SetRecursionLimit(4);
-  EXPECT_FALSE(parsed.ParseFromCodedStream(&input_stream));
-
-  // Lazy read results in parsing error which can be verified by not having
-  // expected value.
-  EXPECT_NE(parsed.lazy_child()
-                .child()
-                .lazy_child()
-                .child()
-                .payload()
-                .optional_int32(),
-            -1);
-}
-
-TEST(MESSAGE_TEST_NAME, ParseFailsIfSubmessageTruncated) {
-  UNITTEST::NestedTestAllTypes o, p;
-  constexpr int kDepth = 5;
-  auto* child = o.mutable_child();
-  for (int i = 0; i < kDepth; i++) {
-    child = child->mutable_child();
-  }
-  TestUtil::SetAllFields(child->mutable_payload());
-
-  std::string serialized;
-  EXPECT_TRUE(o.SerializeToString(&serialized));
-
-  // Should parse correctly.
-  EXPECT_TRUE(p.ParseFromString(serialized));
-
-  constexpr int kMaxTruncate = 50;
-  ASSERT_GT(serialized.size(), kMaxTruncate);
-
-  for (int i = 1; i < kMaxTruncate; i += 3) {
-    EXPECT_FALSE(
-        p.ParseFromString(serialized.substr(0, serialized.size() - i)));
-  }
-}
-
-TEST(MESSAGE_TEST_NAME, ParseFailsIfWireMalformed) {
-  UNITTEST::NestedTestAllTypes o, p;
-  constexpr int kDepth = 5;
-  auto* child = o.mutable_child();
-  for (int i = 0; i < kDepth; i++) {
-    child = child->mutable_child();
-  }
-  // -1 becomes \xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\x1
-  child->mutable_payload()->set_optional_int32(-1);
-
-  std::string serialized;
-  EXPECT_TRUE(o.SerializeToString(&serialized));
-
-  // Should parse correctly.
-  EXPECT_TRUE(p.ParseFromString(serialized));
-
-  // Overwriting the last byte to 0xFF results in malformed wire.
-  serialized[serialized.size() - 1] = 0xFF;
-  EXPECT_FALSE(p.ParseFromString(serialized));
-}
-
-TEST(MESSAGE_TEST_NAME, ParseFailsIfOneofWireMalformed) {
-  UNITTEST::NestedTestAllTypes o, p;
-  constexpr int kDepth = 5;
-  auto* child = o.mutable_child();
-  for (int i = 0; i < kDepth; i++) {
-    child = child->mutable_child();
-  }
-  // -1 becomes \xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\x1
-  child->mutable_payload()->mutable_oneof_nested_message()->set_bb(-1);
-
-  std::string serialized;
-  EXPECT_TRUE(o.SerializeToString(&serialized));
-
-  // Should parse correctly.
-  EXPECT_TRUE(p.ParseFromString(serialized));
-
-  // Overwriting the last byte to 0xFF results in malformed wire.
-  serialized[serialized.size() - 1] = 0xFF;
-  EXPECT_FALSE(p.ParseFromString(serialized));
-}
-
-TEST(MESSAGE_TEST_NAME, ParseFailsIfExtensionWireMalformed) {
-  UNITTEST::TestChildExtension o, p;
-  auto* m = o.mutable_optional_extension()->MutableExtension(
-      UNITTEST::optional_nested_message_extension);
-
-  // -1 becomes \xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\x1
-  m->set_bb(-1);
-
-  std::string serialized;
-  EXPECT_TRUE(o.SerializeToString(&serialized));
-
-  // Should parse correctly.
-  EXPECT_TRUE(p.ParseFromString(serialized));
-
-  // Overwriting the last byte to 0xFF results in malformed wire.
-  serialized[serialized.size() - 1] = 0xFF;
-  EXPECT_FALSE(p.ParseFromString(serialized));
-}
-
-TEST(MESSAGE_TEST_NAME, UninitializedAndMalformed) {
-  UNITTEST::TestRequiredForeign o, p1, p2;
-  o.mutable_optional_message()->set_a(-1);
-
-  // -1 becomes \xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\x1
-  std::string serialized;
-  EXPECT_TRUE(o.SerializePartialToString(&serialized));
-
-  // Should parse correctly.
-  EXPECT_TRUE(p1.ParsePartialFromString(serialized));
-  EXPECT_FALSE(p1.IsInitialized());
-
-  // Overwriting the last byte to 0xFF results in malformed wire.
-  serialized[serialized.size() - 1] = 0xFF;
-  EXPECT_FALSE(p2.ParseFromString(serialized));
-  EXPECT_FALSE(p2.IsInitialized());
-}
-
-inline UNITTEST::NestedTestAllTypes InitNestedProto(int depth) {
-  UNITTEST::NestedTestAllTypes p;
-  auto* child = p.mutable_child();
-  for (int i = 0; i < depth; i++) {
-    child->mutable_payload()->set_optional_int32(i);
-    child = child->mutable_child();
-  }
-  // -1 becomes \xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\x1
-  child->mutable_payload()->set_optional_int32(-1);
-  return p;
-}
-
-// Parsing proto must not access beyond the bound.
-TEST(MESSAGE_TEST_NAME, ParseStrictlyBoundedStream) {
-  UNITTEST::NestedTestAllTypes o, p;
-  constexpr int kDepth = 2;
-  o = InitNestedProto(kDepth);
-  TestUtil::SetAllFields(o.mutable_child()->mutable_payload());
-  o.mutable_child()->mutable_child()->mutable_payload()->set_optional_string(
-      std::string(1024, 'a'));
-
-  std::string data;
-  EXPECT_TRUE(o.SerializeToString(&data));
-
-  TestUtil::BoundedArrayInputStream stream(data.data(), data.size());
-  EXPECT_TRUE(p.ParseFromBoundedZeroCopyStream(&stream, data.size()));
-  TestUtil::ExpectAllFieldsSet(p.child().payload());
-}
-
-TEST(MESSAGE_TEST_NAME, AllSetMethodsOnStringField) {
-  UNITTEST::TestAllTypes msg;
-
-
-  msg.set_optional_string("Asciiz");
-  EXPECT_EQ(msg.optional_string(), "Asciiz");
-
-  msg.set_optional_string("Length delimited", 6);
-  EXPECT_EQ(msg.optional_string(), "Length");
-
-  std::string value = "std::string value 1";
-  msg.set_optional_string(value);
-  EXPECT_EQ(msg.optional_string(), "std::string value 1");
-
-  value = "std::string value 2";
-  msg.set_optional_string(std::cref(value));
-  EXPECT_EQ(msg.optional_string(), "std::string value 2");
-
-  value = "std::string value 3";
-  msg.set_optional_string(std::move(value));
-  EXPECT_EQ(msg.optional_string(), "std::string value 3");
-}
-
-TEST(MESSAGE_TEST_NAME, SuccessAfterParsingFailure) {
-  UNITTEST::NestedTestAllTypes o, p, q;
-  constexpr int kDepth = 5;
-  o = InitNestedProto(kDepth);
-  std::string serialized;
-  EXPECT_TRUE(o.SerializeToString(&serialized));
-
-  // Should parse correctly.
-  EXPECT_TRUE(p.ParseFromString(serialized));
-
-  // Overwriting the last byte to 0xFF results in malformed wire.
-  serialized[serialized.size() - 1] = 0xFF;
-  EXPECT_FALSE(p.ParseFromString(serialized));
-
-  // Subsequent serialization should be parsed correctly.
-  EXPECT_TRUE(q.ParseFromString(p.SerializeAsString()));
-}
-
-TEST(MESSAGE_TEST_NAME, ExceedRecursionLimit) {
-  UNITTEST::NestedTestAllTypes o, p;
-  const int kDepth = io::CodedInputStream::GetDefaultRecursionLimit() + 10;
-  o = InitNestedProto(kDepth);
-  std::string serialized;
-  EXPECT_TRUE(o.SerializeToString(&serialized));
-
-  // Recursion level deeper than the default.
-  EXPECT_FALSE(p.ParseFromString(serialized));
-}
-
-TEST(MESSAGE_TEST_NAME, SupportCustomRecursionLimitRead) {
-  UNITTEST::NestedTestAllTypes o, p;
-  const int kDepth = io::CodedInputStream::GetDefaultRecursionLimit() + 10;
-  o = InitNestedProto(kDepth);
-  std::string serialized;
-  EXPECT_TRUE(o.SerializeToString(&serialized));
-
-  // Should pass with custom limit + reads.
-  io::ArrayInputStream raw_input(serialized.data(), serialized.size());
-  io::CodedInputStream input(&raw_input);
-  input.SetRecursionLimit(kDepth + 10);
-  EXPECT_TRUE(p.ParseFromCodedStream(&input));
-
-  EXPECT_EQ(p.child().payload().optional_int32(), 0);
-  EXPECT_EQ(p.child().child().payload().optional_int32(), 1);
-
-  // Verify p serializes successfully (survives VerifyConsistency).
-  std::string result;
-  EXPECT_TRUE(p.SerializeToString(&result));
-}
-
-TEST(MESSAGE_TEST_NAME, SupportCustomRecursionLimitWrite) {
-  UNITTEST::NestedTestAllTypes o, p;
-  const int kDepth = io::CodedInputStream::GetDefaultRecursionLimit() + 10;
-  o = InitNestedProto(kDepth);
-  std::string serialized;
-  EXPECT_TRUE(o.SerializeToString(&serialized));
-
-  // Should pass with custom limit + writes.
-  io::ArrayInputStream raw_input(serialized.data(), serialized.size());
-  io::CodedInputStream input(&raw_input);
-  input.SetRecursionLimit(kDepth + 10);
-  EXPECT_TRUE(p.ParseFromCodedStream(&input));
-
-  EXPECT_EQ(p.mutable_child()->mutable_payload()->optional_int32(), 0);
-  EXPECT_EQ(
-      p.mutable_child()->mutable_child()->mutable_payload()->optional_int32(),
-      1);
-}
-
-// While deep recursion is never guaranteed, this test aims to catch potential
-// issues with very deep recursion.
-TEST(MESSAGE_TEST_NAME, SupportDeepRecursionLimit) {
-  UNITTEST::NestedTestAllTypes o, p;
-  constexpr int kDepth = 1000;
-  auto* child = o.mutable_child();
-  for (int i = 0; i < kDepth; i++) {
-    child = child->mutable_child();
-  }
-  child->mutable_payload()->set_optional_int32(100);
-
-  std::string serialized;
-  EXPECT_TRUE(o.SerializeToString(&serialized));
-
-  io::ArrayInputStream raw_input(serialized.data(), serialized.size());
-  io::CodedInputStream input(&raw_input);
-  input.SetRecursionLimit(1100);
-  EXPECT_TRUE(p.ParseFromCodedStream(&input));
-}
-
-TEST(MESSAGE_TEST_NAME, Swap) {
-  UNITTEST::NestedTestAllTypes o;
-  constexpr int kDepth = 5;
-  auto* child = o.mutable_child();
-  for (int i = 0; i < kDepth; i++) {
-    child = child->mutable_child();
-  }
-  TestUtil::SetAllFields(child->mutable_payload());
-
-  std::string serialized;
-  EXPECT_TRUE(o.SerializeToString(&serialized));
-
-  {
-    Arena arena;
-    UNITTEST::NestedTestAllTypes* p1 =
-        Arena::CreateMessage<UNITTEST::NestedTestAllTypes>(&arena);
-
-    // Should parse correctly.
-    EXPECT_TRUE(p1->ParseFromString(serialized));
-
-    UNITTEST::NestedTestAllTypes* p2 =
-        Arena::CreateMessage<UNITTEST::NestedTestAllTypes>(&arena);
-
-    p1->Swap(p2);
-
-    EXPECT_EQ(o.SerializeAsString(), p2->SerializeAsString());
-  }
-}
-
-TEST(MESSAGE_TEST_NAME, BypassInitializationCheckOnParse) {
-  UNITTEST::TestRequired message;
-  io::ArrayInputStream raw_input(nullptr, 0);
-  io::CodedInputStream input(&raw_input);
-  EXPECT_TRUE(message.MergePartialFromCodedStream(&input));
-}
-
-TEST(MESSAGE_TEST_NAME, InitializationErrorString) {
-  UNITTEST::TestRequired message;
-  EXPECT_EQ("a, b, c", message.InitializationErrorString());
-}
-
-TEST(MESSAGE_TEST_NAME, DynamicCastToGenerated) {
-  UNITTEST::TestAllTypes test_all_types;
-
-  Message* test_all_types_pointer = &test_all_types;
-  EXPECT_EQ(&test_all_types, DynamicCastToGenerated<UNITTEST::TestAllTypes>(
-                                 test_all_types_pointer));
-  EXPECT_EQ(nullptr, DynamicCastToGenerated<UNITTEST::TestRequired>(
-                         test_all_types_pointer));
-
-  const Message* test_all_types_pointer_const = &test_all_types;
-  EXPECT_EQ(&test_all_types,
-            DynamicCastToGenerated<const UNITTEST::TestAllTypes>(
-                test_all_types_pointer_const));
-  EXPECT_EQ(nullptr, DynamicCastToGenerated<const UNITTEST::TestRequired>(
-                         test_all_types_pointer_const));
-
-  Message* test_all_types_pointer_nullptr = nullptr;
-  EXPECT_EQ(nullptr, DynamicCastToGenerated<UNITTEST::TestAllTypes>(
-                         test_all_types_pointer_nullptr));
-}
-
-#ifdef PROTOBUF_HAS_DEATH_TEST  // death tests do not work on Windows yet.
-
-TEST(MESSAGE_TEST_NAME, SerializeFailsIfNotInitialized) {
-  UNITTEST::TestRequired message;
-  std::string data;
-  EXPECT_DEBUG_DEATH(EXPECT_TRUE(message.SerializeToString(&data)),
-                     "Can't serialize message of type \"" +
-                         std::string(UNITTEST_PACKAGE_NAME) +
-                         ".TestRequired\" because "
-                         "it is missing required fields: a, b, c");
-}
-
-TEST(MESSAGE_TEST_NAME, CheckInitialized) {
-  UNITTEST::TestRequired message;
-  EXPECT_DEATH(message.CheckInitialized(),
-               "Message of type \"" + std::string(UNITTEST_PACKAGE_NAME) +
-                   ".TestRequired\" is missing required "
-                   "fields: a, b, c");
-}
-
-#endif  // PROTOBUF_HAS_DEATH_TEST
-
-namespace {
-// An input stream that repeats a std::string's content for a number of times.
-// It helps us create a really large input without consuming too much memory.
-// Used to test the parsing behavior when the input size exceeds 2G or close to
-// it.
-class RepeatedInputStream : public io::ZeroCopyInputStream {
- public:
-  RepeatedInputStream(const std::string& data, size_t count)
-      : data_(data), count_(count), position_(0), total_byte_count_(0) {}
-
-  bool Next(const void** data, int* size) override {
-    if (position_ == data_.size()) {
-      if (--count_ == 0) {
-        return false;
-      }
-      position_ = 0;
-    }
-    *data = &data_[position_];
-    *size = static_cast<int>(data_.size() - position_);
-    position_ = data_.size();
-    total_byte_count_ += *size;
-    return true;
-  }
-
-  void BackUp(int count) override {
-    position_ -= static_cast<size_t>(count);
-    total_byte_count_ -= count;
-  }
-
-  bool Skip(int count) override {
-    while (count > 0) {
-      const void* data;
-      int size;
-      if (!Next(&data, &size)) {
-        break;
-      }
-      if (size >= count) {
-        BackUp(size - count);
-        return true;
-      } else {
-        count -= size;
-      }
-    }
-    return false;
-  }
-
-  int64_t ByteCount() const override { return total_byte_count_; }
-
- private:
-  std::string data_;
-  size_t count_;     // The number of strings that haven't been consumed.
-  size_t position_;  // Position in the std::string for the next read.
-  int64_t total_byte_count_;
-};
-}  // namespace
-
-TEST(MESSAGE_TEST_NAME, TestParseMessagesCloseTo2G) {
-  constexpr int32_t kint32max = std::numeric_limits<int32_t>::max();
-
-  // Create a message with a large std::string field.
-  std::string value = std::string(64 * 1024 * 1024, 'x');
-  UNITTEST::TestAllTypes message;
-  message.set_optional_string(value);
-
-  // Repeat this message in the input stream to make the total input size
-  // close to 2G.
-  std::string data = message.SerializeAsString();
-  size_t count = static_cast<size_t>(kint32max) / data.size();
-  RepeatedInputStream input(data, count);
-
-  // The parsing should succeed.
-  UNITTEST::TestAllTypes result;
-  EXPECT_TRUE(result.ParseFromZeroCopyStream(&input));
-
-  // When there are multiple occurrences of a singular field, the last one
-  // should win.
-  EXPECT_EQ(value, result.optional_string());
-}
-
-TEST(MESSAGE_TEST_NAME, TestParseMessagesOver2G) {
-  constexpr int32_t kint32max = std::numeric_limits<int32_t>::max();
-
-  // Create a message with a large std::string field.
-  std::string value = std::string(64 * 1024 * 1024, 'x');
-  UNITTEST::TestAllTypes message;
-  message.set_optional_string(value);
-
-  // Repeat this message in the input stream to make the total input size
-  // larger than 2G.
-  std::string data = message.SerializeAsString();
-  size_t count = static_cast<size_t>(kint32max) / data.size() + 1;
-  RepeatedInputStream input(data, count);
-
-  // The parsing should fail.
-  UNITTEST::TestAllTypes result;
-  EXPECT_FALSE(result.ParseFromZeroCopyStream(&input));
-}
-
-TEST(MESSAGE_TEST_NAME, BypassInitializationCheckOnSerialize) {
-  UNITTEST::TestRequired message;
-  io::ArrayOutputStream raw_output(nullptr, 0);
-  io::CodedOutputStream output(&raw_output);
-  EXPECT_TRUE(message.SerializePartialToCodedStream(&output));
-}
-
-TEST(MESSAGE_TEST_NAME, FindInitializationErrors) {
-  UNITTEST::TestRequired message;
-  std::vector<std::string> errors;
-  message.FindInitializationErrors(&errors);
-  ASSERT_EQ(3, errors.size());
-  EXPECT_EQ("a", errors[0]);
-  EXPECT_EQ("b", errors[1]);
-  EXPECT_EQ("c", errors[2]);
-}
-
-TEST(MESSAGE_TEST_NAME, ReleaseMustUseResult) {
-  UNITTEST::TestAllTypes message;
-  auto* f = new UNITTEST::ForeignMessage();
-  f->set_c(1000);
-  message.set_allocated_optional_foreign_message(f);
-  auto* mf = message.mutable_optional_foreign_message();
-  EXPECT_EQ(mf, f);
-  std::unique_ptr<UNITTEST::ForeignMessage> rf(
-      message.release_optional_foreign_message());
-  EXPECT_NE(rf.get(), nullptr);
-}
-
-TEST(MESSAGE_TEST_NAME, ParseFailsOnInvalidMessageEnd) {
-  UNITTEST::TestAllTypes message;
-
-  // Control case.
-  EXPECT_TRUE(message.ParseFromArray("", 0));
-
-  // The byte is a valid varint, but not a valid tag (zero).
-  EXPECT_FALSE(message.ParseFromArray("\0", 1));
-
-  // The byte is a malformed varint.
-  EXPECT_FALSE(message.ParseFromArray("\200", 1));
-
-  // The byte is an endgroup tag, but we aren't parsing a group.
-  EXPECT_FALSE(message.ParseFromArray("\014", 1));
-}
-
-// Regression test for b/23630858
-TEST(MESSAGE_TEST_NAME, MessageIsStillValidAfterParseFails) {
-  UNITTEST::TestAllTypes message;
-
-  // 9 0xFFs for the "optional_uint64" field.
-  std::string invalid_data = "\x20\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF";
-
-  EXPECT_FALSE(message.ParseFromString(invalid_data));
-  message.Clear();
-  EXPECT_EQ(0, message.optional_uint64());
-
-  // invalid data for field "optional_string". Length prefix is 1 but no
-  // payload.
-  std::string invalid_string_data = "\x72\x01";
-  {
-    Arena arena;
-    UNITTEST::TestAllTypes* arena_message =
-        Arena::CreateMessage<UNITTEST::TestAllTypes>(&arena);
-    EXPECT_FALSE(arena_message->ParseFromString(invalid_string_data));
-    arena_message->Clear();
-    EXPECT_EQ("", arena_message->optional_string());
-  }
-}
-
-
-namespace {
-
-void ExpectMessageMerged(const UNITTEST::TestAllTypes& message) {
-  EXPECT_EQ(3, message.optional_int32());
-  EXPECT_EQ(2, message.optional_int64());
-  EXPECT_EQ("hello", message.optional_string());
-}
-
-void AssignParsingMergeMessages(UNITTEST::TestAllTypes* msg1,
-                                UNITTEST::TestAllTypes* msg2,
-                                UNITTEST::TestAllTypes* msg3) {
-  msg1->set_optional_int32(1);
-  msg2->set_optional_int64(2);
-  msg3->set_optional_int32(3);
-  msg3->set_optional_string("hello");
-}
-
-}  // namespace
-
-// Test that if an optional or required message/group field appears multiple
-// times in the input, they need to be merged.
-TEST(MESSAGE_TEST_NAME, ParsingMerge) {
-  UNITTEST::TestParsingMerge::RepeatedFieldsGenerator generator;
-  UNITTEST::TestAllTypes* msg1;
-  UNITTEST::TestAllTypes* msg2;
-  UNITTEST::TestAllTypes* msg3;
-
-#define ASSIGN_REPEATED_FIELD(FIELD) \
-  msg1 = generator.add_##FIELD();    \
-  msg2 = generator.add_##FIELD();    \
-  msg3 = generator.add_##FIELD();    \
-  AssignParsingMergeMessages(msg1, msg2, msg3)
-
-  ASSIGN_REPEATED_FIELD(field1);
-  ASSIGN_REPEATED_FIELD(field2);
-  ASSIGN_REPEATED_FIELD(field3);
-  ASSIGN_REPEATED_FIELD(ext1);
-  ASSIGN_REPEATED_FIELD(ext2);
-
-#undef ASSIGN_REPEATED_FIELD
-#define ASSIGN_REPEATED_GROUP(FIELD)                \
-  msg1 = generator.add_##FIELD()->mutable_field1(); \
-  msg2 = generator.add_##FIELD()->mutable_field1(); \
-  msg3 = generator.add_##FIELD()->mutable_field1(); \
-  AssignParsingMergeMessages(msg1, msg2, msg3)
-
-  ASSIGN_REPEATED_GROUP(group1);
-  ASSIGN_REPEATED_GROUP(group2);
-
-#undef ASSIGN_REPEATED_GROUP
-
-  std::string buffer;
-  generator.SerializeToString(&buffer);
-  UNITTEST::TestParsingMerge parsing_merge;
-  parsing_merge.ParseFromString(buffer);
-
-  // Required and optional fields should be merged.
-  ExpectMessageMerged(parsing_merge.required_all_types());
-  ExpectMessageMerged(parsing_merge.optional_all_types());
-  ExpectMessageMerged(parsing_merge.optionalgroup().optional_group_all_types());
-  ExpectMessageMerged(
-      parsing_merge.GetExtension(UNITTEST::TestParsingMerge::optional_ext));
-
-  // Repeated fields should not be merged.
-  EXPECT_EQ(3, parsing_merge.repeated_all_types_size());
-  EXPECT_EQ(3, parsing_merge.repeatedgroup_size());
-  EXPECT_EQ(
-      3, parsing_merge.ExtensionSize(UNITTEST::TestParsingMerge::repeated_ext));
-}
-
-TEST(MESSAGE_TEST_NAME, MergeFrom) {
-  UNITTEST::TestAllTypes source, dest;
-
-  // Optional fields
-  source.set_optional_int32(1);  // only source
-  source.set_optional_int64(2);  // both source and dest
-  dest.set_optional_int64(3);
-  dest.set_optional_uint32(4);  // only dest
-
-  // Optional fields with defaults
-  source.set_default_int32(13);  // only source
-  source.set_default_int64(14);  // both source and dest
-  dest.set_default_int64(15);
-  dest.set_default_uint32(16);  // only dest
-
-  // Repeated fields
-  source.add_repeated_int32(5);  // only source
-  source.add_repeated_int32(6);
-  source.add_repeated_int64(7);  // both source and dest
-  source.add_repeated_int64(8);
-  dest.add_repeated_int64(9);
-  dest.add_repeated_int64(10);
-  dest.add_repeated_uint32(11);  // only dest
-  dest.add_repeated_uint32(12);
-
-  dest.MergeFrom(source);
-
-  // Optional fields: source overwrites dest if source is specified
-  EXPECT_EQ(1, dest.optional_int32());   // only source: use source
-  EXPECT_EQ(2, dest.optional_int64());   // source and dest: use source
-  EXPECT_EQ(4, dest.optional_uint32());  // only dest: use dest
-  EXPECT_EQ(0, dest.optional_uint64());  // neither: use default
-
-  // Optional fields with defaults
-  EXPECT_EQ(13, dest.default_int32());   // only source: use source
-  EXPECT_EQ(14, dest.default_int64());   // source and dest: use source
-  EXPECT_EQ(16, dest.default_uint32());  // only dest: use dest
-  EXPECT_EQ(44, dest.default_uint64());  // neither: use default
-
-  // Repeated fields: concatenate source onto the end of dest
-  ASSERT_EQ(2, dest.repeated_int32_size());
-  EXPECT_EQ(5, dest.repeated_int32(0));
-  EXPECT_EQ(6, dest.repeated_int32(1));
-  ASSERT_EQ(4, dest.repeated_int64_size());
-  EXPECT_EQ(9, dest.repeated_int64(0));
-  EXPECT_EQ(10, dest.repeated_int64(1));
-  EXPECT_EQ(7, dest.repeated_int64(2));
-  EXPECT_EQ(8, dest.repeated_int64(3));
-  ASSERT_EQ(2, dest.repeated_uint32_size());
-  EXPECT_EQ(11, dest.repeated_uint32(0));
-  EXPECT_EQ(12, dest.repeated_uint32(1));
-  ASSERT_EQ(0, dest.repeated_uint64_size());
-}
-
-TEST(MESSAGE_TEST_NAME, IsInitialized) {
-  UNITTEST::TestIsInitialized msg;
-  EXPECT_TRUE(msg.IsInitialized());
-  UNITTEST::TestIsInitialized::SubMessage* sub_message =
-      msg.mutable_sub_message();
-  EXPECT_TRUE(msg.IsInitialized());
-  UNITTEST::TestIsInitialized::SubMessage::SubGroup* sub_group =
-      sub_message->mutable_subgroup();
-  EXPECT_FALSE(msg.IsInitialized());
-  sub_group->set_i(1);
-  EXPECT_TRUE(msg.IsInitialized());
-}
-
-TEST(MESSAGE_TEST_NAME, IsInitializedSplitBytestream) {
-  UNITTEST::TestRequired ab, c;
-  ab.set_a(1);
-  ab.set_b(2);
-  c.set_c(3);
-
-  // The protobuf represented by the concatenated string has all required
-  // fields (a,b,c) set.
-  std::string bytes =
-      ab.SerializePartialAsString() + c.SerializePartialAsString();
-
-  UNITTEST::TestRequired concatenated;
-  EXPECT_TRUE(concatenated.ParsePartialFromString(bytes));
-  EXPECT_TRUE(concatenated.IsInitialized());
-
-  UNITTEST::TestRequiredForeign fab, fc;
-  fab.mutable_optional_message()->set_a(1);
-  fab.mutable_optional_message()->set_b(2);
-  fc.mutable_optional_message()->set_c(3);
-
-  bytes =
-      fab.SerializePartialAsString() + fc.SerializePartialAsString();
-
-  UNITTEST::TestRequiredForeign fconcatenated;
-  EXPECT_TRUE(fconcatenated.ParsePartialFromString(bytes));
-  EXPECT_TRUE(fconcatenated.IsInitialized());
-}
-
-TEST(MESSAGE_FACTORY_TEST_NAME, GeneratedFactoryLookup) {
-  EXPECT_EQ(MessageFactory::generated_factory()->GetPrototype(
-                UNITTEST::TestAllTypes::descriptor()),
-            &UNITTEST::TestAllTypes::default_instance());
-}
-
-TEST(MESSAGE_FACTORY_TEST_NAME, GeneratedFactoryUnknownType) {
-  // Construct a new descriptor.
-  DescriptorPool pool;
-  FileDescriptorProto file;
-  file.set_name("foo.proto");
-  file.add_message_type()->set_name("Foo");
-  const Descriptor* descriptor = pool.BuildFile(file)->message_type(0);
-
-  // Trying to construct it should return nullptr.
-  EXPECT_TRUE(MessageFactory::generated_factory()->GetPrototype(descriptor) ==
-              nullptr);
-}
-
-TEST(MESSAGE_TEST_NAME, MOMIParserEdgeCases) {
-  {
-    UNITTEST::TestAllTypes msg;
-    // Parser ends in last 16 bytes of buffer due to a 0.
-    std::string data;
-    // 12 bytes of data
-    for (int i = 0; i < 4; i++) data += "\370\1\1";
-    // 13 byte is terminator
-    data += '\0';  // Terminator
-    // followed by the rest of the stream
-    // space is ascii 32 so no end group
-    data += std::string(30, ' ');
-    io::ArrayInputStream zcis(data.data(), data.size(), 17);
-    io::CodedInputStream cis(&zcis);
-    EXPECT_TRUE(msg.MergePartialFromCodedStream(&cis));
-    EXPECT_EQ(cis.CurrentPosition(), 3 * 4 + 1);
-  }
-  {
-    // Parser ends in last 16 bytes of buffer due to a end-group.
-    // Must use a message that is a group. Otherwise ending on a group end is
-    // a failure.
-    UNITTEST::TestAllTypes::OptionalGroup msg;
-    std::string data;
-    for (int i = 0; i < 3; i++) data += "\370\1\1";
-    data += '\14';  // Octal end-group tag 12 (1 * 8 + 4(
-    data += std::string(30, ' ');
-    io::ArrayInputStream zcis(data.data(), data.size(), 17);
-    io::CodedInputStream cis(&zcis);
-    EXPECT_TRUE(msg.MergePartialFromCodedStream(&cis));
-    EXPECT_EQ(cis.CurrentPosition(), 3 * 3 + 1);
-    EXPECT_TRUE(cis.LastTagWas(12));
-  }
-  {
-    // Parser ends in last 16 bytes of buffer due to a end-group. But is inside
-    // a length delimited field.
-    // a failure.
-    UNITTEST::TestAllTypes::OptionalGroup msg;
-    std::string data;
-    data += "\22\3foo";
-    data += '\14';  // Octal end-group tag 12 (1 * 8 + 4(
-    data += std::string(30, ' ');
-    io::ArrayInputStream zcis(data.data(), data.size(), 17);
-    io::CodedInputStream cis(&zcis);
-    EXPECT_TRUE(msg.MergePartialFromCodedStream(&cis));
-    EXPECT_EQ(cis.CurrentPosition(), 6);
-    EXPECT_TRUE(cis.LastTagWas(12));
-  }
-  {
-    // Parser fails when ending on 0 if from ZeroCopyInputStream
-    UNITTEST::TestAllTypes msg;
-    std::string data;
-    // 12 bytes of data
-    for (int i = 0; i < 4; i++) data += "\370\1\1";
-    // 13 byte is terminator
-    data += '\0';  // Terminator
-    data += std::string(30, ' ');
-    io::ArrayInputStream zcis(data.data(), data.size(), 17);
-    EXPECT_FALSE(msg.ParsePartialFromZeroCopyStream(&zcis));
-  }
-}
-
-
-TEST(MESSAGE_TEST_NAME, CheckSerializationWhenInterleavedExtensions) {
-  UNITTEST::TestExtensionRangeSerialize in_message;
-
-  in_message.set_foo_one(1);
-  in_message.set_foo_two(2);
-  in_message.set_foo_three(3);
-  in_message.set_foo_four(4);
-
-  in_message.SetExtension(UNITTEST::TestExtensionRangeSerialize::bar_one, 1);
-  in_message.SetExtension(UNITTEST::TestExtensionRangeSerialize::bar_two, 2);
-  in_message.SetExtension(UNITTEST::TestExtensionRangeSerialize::bar_three, 3);
-  in_message.SetExtension(UNITTEST::TestExtensionRangeSerialize::bar_four, 4);
-  in_message.SetExtension(UNITTEST::TestExtensionRangeSerialize::bar_five, 5);
-
-  std::string buffer;
-  in_message.SerializeToString(&buffer);
-
-  UNITTEST::TestExtensionRangeSerialize out_message;
-  out_message.ParseFromString(buffer);
-
-  EXPECT_EQ(1, out_message.foo_one());
-  EXPECT_EQ(2, out_message.foo_two());
-  EXPECT_EQ(3, out_message.foo_three());
-  EXPECT_EQ(4, out_message.foo_four());
-
-  EXPECT_EQ(1, out_message.GetExtension(UNITTEST::TestExtensionRangeSerialize::bar_one));
-  EXPECT_EQ(2, out_message.GetExtension(UNITTEST::TestExtensionRangeSerialize::bar_two));
-  EXPECT_EQ(3, out_message.GetExtension(UNITTEST::TestExtensionRangeSerialize::bar_three));
-  EXPECT_EQ(4, out_message.GetExtension(UNITTEST::TestExtensionRangeSerialize::bar_four));
-  EXPECT_EQ(5, out_message.GetExtension(UNITTEST::TestExtensionRangeSerialize::bar_five));
-}
-
-TEST(MESSAGE_TEST_NAME, PreservesFloatingPointNegative0) {
-  UNITTEST::TestAllTypes in_message;
-  in_message.set_optional_float(-0.0f);
-  in_message.set_optional_double(-0.0);
-  std::string serialized;
-  EXPECT_TRUE(in_message.SerializeToString(&serialized));
-  UNITTEST::TestAllTypes out_message;
-  EXPECT_TRUE(out_message.ParseFromString(serialized));
-  EXPECT_EQ(in_message.optional_float(), out_message.optional_float());
-  EXPECT_EQ(std::signbit(in_message.optional_float()),
-            std::signbit(out_message.optional_float()));
-  EXPECT_EQ(in_message.optional_double(), out_message.optional_double());
-  EXPECT_EQ(std::signbit(in_message.optional_double()),
-            std::signbit(out_message.optional_double()));
-}
-
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/metadata.h b/libs/protobuf/src/google/protobuf/metadata.h
deleted file mode 100644
index 4e89648..0000000
--- a/libs/protobuf/src/google/protobuf/metadata.h
+++ /dev/null
@@ -1,36 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef GOOGLE_PROTOBUF_METADATA_H__
-#define GOOGLE_PROTOBUF_METADATA_H__
-
-// TODO(b/151117630): Remove this file and all instances where it gets imported.
-
-#endif  // GOOGLE_PROTOBUF_METADATA_H__
diff --git a/libs/protobuf/src/google/protobuf/metadata_lite.h b/libs/protobuf/src/google/protobuf/metadata_lite.h
deleted file mode 100644
index 0c31517..0000000
--- a/libs/protobuf/src/google/protobuf/metadata_lite.h
+++ /dev/null
@@ -1,316 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef GOOGLE_PROTOBUF_METADATA_LITE_H__
-#define GOOGLE_PROTOBUF_METADATA_LITE_H__
-
-#include <string>
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/arena.h>
-#include <google/protobuf/port.h>
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-#ifdef SWIG
-#error "You cannot SWIG proto headers"
-#endif
-
-namespace google {
-namespace protobuf {
-namespace internal {
-
-// This is the representation for messages that support arena allocation. It
-// uses a tagged pointer to either store the owning Arena pointer, if there are
-// no unknown fields, or a pointer to a block of memory with both the owning
-// Arena pointer and the UnknownFieldSet, if there are unknown fields. Besides,
-// it also uses the tag to distinguish whether the owning Arena pointer is also
-// used by sub-structure allocation. This optimization allows for
-// "zero-overhead" storage of the Arena pointer, relative to the above baseline
-// implementation.
-//
-// The tagged pointer uses the least two significant bits to disambiguate cases.
-// It uses bit 0 == 0 to indicate an arena pointer and bit 0 == 1 to indicate a
-// UFS+Arena-container pointer. Besides it uses bit 1 == 0 to indicate arena
-// allocation and bit 1 == 1 to indicate heap allocation.
-class PROTOBUF_EXPORT InternalMetadata {
- public:
-  constexpr InternalMetadata() : ptr_(0) {}
-  explicit InternalMetadata(Arena* arena, bool is_message_owned = false) {
-    SetArena(arena, is_message_owned);
-  }
-
-  void SetArena(Arena* arena, bool is_message_owned) {
-    ptr_ = is_message_owned
-               ? reinterpret_cast<intptr_t>(arena) | kMessageOwnedArenaTagMask
-               : reinterpret_cast<intptr_t>(arena);
-    GOOGLE_DCHECK(!is_message_owned || arena != nullptr);
-  }
-
-  // To keep the ABI identical between debug and non-debug builds,
-  // the destructor is always defined here even though it may delegate
-  // to a non-inline private method.
-  // (see https://github.com/protocolbuffers/protobuf/issues/9947)
-  ~InternalMetadata() {
-#if defined(NDEBUG) || defined(_MSC_VER)
-    if (HasMessageOwnedArenaTag()) {
-      delete reinterpret_cast<Arena*>(ptr_ - kMessageOwnedArenaTagMask);
-    }
-#else
-    CheckedDestruct();
-#endif
-  }
-
-  template <typename T>
-  void Delete() {
-    // Note that Delete<> should be called not more than once.
-    if (have_unknown_fields()) {
-      DeleteOutOfLineHelper<T>();
-    }
-  }
-
-  // DeleteReturnArena will delete the unknown fields only if they weren't
-  // allocated on an arena.  Then it updates the flags so that if you call
-  // have_unknown_fields(), it will return false.  Finally, it returns the
-  // current value of arena().  It is designed to be used as part of a
-  // Message class's destructor call, so that when control eventually gets
-  // to ~InternalMetadata(), we don't need to check for have_unknown_fields()
-  // again.
-  template <typename T>
-  Arena* DeleteReturnArena() {
-    if (have_unknown_fields()) {
-      return DeleteOutOfLineHelper<T>();
-    } else {
-      return PtrValue<Arena>();
-    }
-  }
-
-  PROTOBUF_NDEBUG_INLINE Arena* owning_arena() const {
-    return HasMessageOwnedArenaTag() ? nullptr : arena();
-  }
-
-  PROTOBUF_NDEBUG_INLINE Arena* user_arena() const {
-    Arena* a = arena();
-    return a && !a->IsMessageOwned() ? a : nullptr;
-  }
-
-  PROTOBUF_NDEBUG_INLINE Arena* arena() const {
-    if (PROTOBUF_PREDICT_FALSE(have_unknown_fields())) {
-      return PtrValue<ContainerBase>()->arena;
-    } else {
-      return PtrValue<Arena>();
-    }
-  }
-
-  PROTOBUF_NDEBUG_INLINE bool have_unknown_fields() const {
-    return HasUnknownFieldsTag();
-  }
-
-  PROTOBUF_NDEBUG_INLINE void* raw_arena_ptr() const {
-    return reinterpret_cast<void*>(ptr_);
-  }
-
-  template <typename T>
-  PROTOBUF_NDEBUG_INLINE const T& unknown_fields(
-      const T& (*default_instance)()) const {
-    if (PROTOBUF_PREDICT_FALSE(have_unknown_fields())) {
-      return PtrValue<Container<T>>()->unknown_fields;
-    } else {
-      return default_instance();
-    }
-  }
-
-  template <typename T>
-  PROTOBUF_NDEBUG_INLINE T* mutable_unknown_fields() {
-    if (PROTOBUF_PREDICT_TRUE(have_unknown_fields())) {
-      return &PtrValue<Container<T>>()->unknown_fields;
-    } else {
-      return mutable_unknown_fields_slow<T>();
-    }
-  }
-
-  template <typename T>
-  PROTOBUF_NDEBUG_INLINE void Swap(InternalMetadata* other) {
-    // Semantics here are that we swap only the unknown fields, not the arena
-    // pointer. We cannot simply swap ptr_ with other->ptr_ because we need to
-    // maintain our own arena ptr. Also, our ptr_ and other's ptr_ may be in
-    // different states (direct arena pointer vs. container with UFS) so we
-    // cannot simply swap ptr_ and then restore the arena pointers. We reuse
-    // UFS's swap implementation instead.
-    if (have_unknown_fields() || other->have_unknown_fields()) {
-      DoSwap<T>(other->mutable_unknown_fields<T>());
-    }
-  }
-
-  PROTOBUF_NDEBUG_INLINE void InternalSwap(InternalMetadata* other) {
-    std::swap(ptr_, other->ptr_);
-  }
-
-  template <typename T>
-  PROTOBUF_NDEBUG_INLINE void MergeFrom(const InternalMetadata& other) {
-    if (other.have_unknown_fields()) {
-      DoMergeFrom<T>(other.unknown_fields<T>(nullptr));
-    }
-  }
-
-  template <typename T>
-  PROTOBUF_NDEBUG_INLINE void Clear() {
-    if (have_unknown_fields()) {
-      DoClear<T>();
-    }
-  }
-
- private:
-  intptr_t ptr_;
-
-  // Tagged pointer implementation.
-  static constexpr intptr_t kUnknownFieldsTagMask = 1;
-  static constexpr intptr_t kMessageOwnedArenaTagMask = 2;
-  static constexpr intptr_t kPtrTagMask =
-      kUnknownFieldsTagMask | kMessageOwnedArenaTagMask;
-  static constexpr intptr_t kPtrValueMask = ~kPtrTagMask;
-
-  // Accessors for pointer tag and pointer value.
-  PROTOBUF_ALWAYS_INLINE bool HasUnknownFieldsTag() const {
-    return ptr_ & kUnknownFieldsTagMask;
-  }
-  PROTOBUF_ALWAYS_INLINE bool HasMessageOwnedArenaTag() const {
-    return ptr_ & kMessageOwnedArenaTagMask;
-  }
-
-  template <typename U>
-  U* PtrValue() const {
-    return reinterpret_cast<U*>(ptr_ & kPtrValueMask);
-  }
-
-  // If ptr_'s tag is kTagContainer, it points to an instance of this struct.
-  struct ContainerBase {
-    Arena* arena;
-  };
-
-  template <typename T>
-  struct Container : public ContainerBase {
-    T unknown_fields;
-  };
-
-  template <typename T>
-  PROTOBUF_NOINLINE Arena* DeleteOutOfLineHelper() {
-    if (auto* a = arena()) {
-      // Subtle: we want to preserve the message-owned arena flag, while at the
-      // same time replacing the pointer to Container<T> with a pointer to the
-      // arena.
-      intptr_t message_owned_arena_tag = ptr_ & kMessageOwnedArenaTagMask;
-      ptr_ = reinterpret_cast<intptr_t>(a) | message_owned_arena_tag;
-      return a;
-    } else {
-      delete PtrValue<Container<T>>();
-      ptr_ = 0;
-      return nullptr;
-    }
-  }
-
-  template <typename T>
-  PROTOBUF_NOINLINE T* mutable_unknown_fields_slow() {
-    Arena* my_arena = arena();
-    Container<T>* container = Arena::Create<Container<T>>(my_arena);
-    intptr_t message_owned_arena_tag = ptr_ & kMessageOwnedArenaTagMask;
-    // Two-step assignment works around a bug in clang's static analyzer:
-    // https://bugs.llvm.org/show_bug.cgi?id=34198.
-    ptr_ = reinterpret_cast<intptr_t>(container);
-    ptr_ |= kUnknownFieldsTagMask | message_owned_arena_tag;
-    container->arena = my_arena;
-    return &(container->unknown_fields);
-  }
-
-  // Templated functions.
-
-  template <typename T>
-  PROTOBUF_NOINLINE void DoClear() {
-    mutable_unknown_fields<T>()->Clear();
-  }
-
-  template <typename T>
-  PROTOBUF_NOINLINE void DoMergeFrom(const T& other) {
-    mutable_unknown_fields<T>()->MergeFrom(other);
-  }
-
-  template <typename T>
-  PROTOBUF_NOINLINE void DoSwap(T* other) {
-    mutable_unknown_fields<T>()->Swap(other);
-  }
-
-  // Private helper with debug checks for ~InternalMetadata()
-  void CheckedDestruct();
-};
-
-// String Template specializations.
-
-template <>
-PROTOBUF_EXPORT void InternalMetadata::DoClear<std::string>();
-template <>
-PROTOBUF_EXPORT void InternalMetadata::DoMergeFrom<std::string>(
-    const std::string& other);
-template <>
-PROTOBUF_EXPORT void InternalMetadata::DoSwap<std::string>(std::string* other);
-
-// This helper RAII class is needed to efficiently parse unknown fields. We
-// should only call mutable_unknown_fields if there are actual unknown fields.
-// The obvious thing to just use a stack string and swap it at the end of
-// the parse won't work, because the destructor of StringOutputStream needs to
-// be called before we can modify the string (it check-fails). Using
-// LiteUnknownFieldSetter setter(&_internal_metadata_);
-// StringOutputStream stream(setter.buffer());
-// guarantees that the string is only swapped after stream is destroyed.
-class PROTOBUF_EXPORT LiteUnknownFieldSetter {
- public:
-  explicit LiteUnknownFieldSetter(InternalMetadata* metadata)
-      : metadata_(metadata) {
-    if (metadata->have_unknown_fields()) {
-      buffer_.swap(*metadata->mutable_unknown_fields<std::string>());
-    }
-  }
-  ~LiteUnknownFieldSetter() {
-    if (!buffer_.empty())
-      metadata_->mutable_unknown_fields<std::string>()->swap(buffer_);
-  }
-  std::string* buffer() { return &buffer_; }
-
- private:
-  InternalMetadata* metadata_;
-  std::string buffer_;
-};
-
-}  // namespace internal
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
-
-#endif  // GOOGLE_PROTOBUF_METADATA_LITE_H__
diff --git a/libs/protobuf/src/google/protobuf/no_field_presence_test.cc b/libs/protobuf/src/google/protobuf/no_field_presence_test.cc
deleted file mode 100644
index 2582cfe..0000000
--- a/libs/protobuf/src/google/protobuf/no_field_presence_test.cc
+++ /dev/null
@@ -1,575 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <string>
-
-#include <google/protobuf/unittest.pb.h>
-#include <google/protobuf/unittest_no_field_presence.pb.h>
-#include <google/protobuf/descriptor.pb.h>
-#include <google/protobuf/descriptor.h>
-#include <gtest/gtest.h>
-
-namespace google {
-namespace protobuf {
-namespace {
-
-// Helper: checks that all fields have default (zero/empty) values.
-void CheckDefaultValues(
-    const proto2_nofieldpresence_unittest::TestAllTypes& m) {
-  EXPECT_EQ(0, m.optional_int32());
-  EXPECT_EQ(0, m.optional_int64());
-  EXPECT_EQ(0, m.optional_uint32());
-  EXPECT_EQ(0, m.optional_uint64());
-  EXPECT_EQ(0, m.optional_sint32());
-  EXPECT_EQ(0, m.optional_sint64());
-  EXPECT_EQ(0, m.optional_fixed32());
-  EXPECT_EQ(0, m.optional_fixed64());
-  EXPECT_EQ(0, m.optional_sfixed32());
-  EXPECT_EQ(0, m.optional_sfixed64());
-  EXPECT_EQ(0, m.optional_float());
-  EXPECT_EQ(0, m.optional_double());
-  EXPECT_EQ(false, m.optional_bool());
-  EXPECT_EQ(0, m.optional_string().size());
-  EXPECT_EQ(0, m.optional_bytes().size());
-
-  EXPECT_EQ(false, m.has_optional_nested_message());
-  // accessor for message fields returns default instance when not present
-  EXPECT_EQ(0, m.optional_nested_message().bb());
-  EXPECT_EQ(false, m.has_optional_proto2_message());
-  // Embedded proto2 messages still have proto2 semantics, e.g. non-zero default
-  // values. Here the submessage is not present but its accessor returns the
-  // default instance.
-  EXPECT_EQ(41, m.optional_proto2_message().default_int32());
-  EXPECT_EQ(false, m.has_optional_foreign_message());
-  EXPECT_EQ(proto2_nofieldpresence_unittest::TestAllTypes::FOO,
-            m.optional_nested_enum());
-  EXPECT_EQ(proto2_nofieldpresence_unittest::FOREIGN_FOO,
-            m.optional_foreign_enum());
-
-
-  EXPECT_EQ(0, m.repeated_int32_size());
-  EXPECT_EQ(0, m.repeated_int64_size());
-  EXPECT_EQ(0, m.repeated_uint32_size());
-  EXPECT_EQ(0, m.repeated_uint64_size());
-  EXPECT_EQ(0, m.repeated_sint32_size());
-  EXPECT_EQ(0, m.repeated_sint64_size());
-  EXPECT_EQ(0, m.repeated_fixed32_size());
-  EXPECT_EQ(0, m.repeated_fixed64_size());
-  EXPECT_EQ(0, m.repeated_sfixed32_size());
-  EXPECT_EQ(0, m.repeated_sfixed64_size());
-  EXPECT_EQ(0, m.repeated_float_size());
-  EXPECT_EQ(0, m.repeated_double_size());
-  EXPECT_EQ(0, m.repeated_bool_size());
-  EXPECT_EQ(0, m.repeated_string_size());
-  EXPECT_EQ(0, m.repeated_bytes_size());
-  EXPECT_EQ(0, m.repeated_nested_message_size());
-  EXPECT_EQ(0, m.repeated_foreign_message_size());
-  EXPECT_EQ(0, m.repeated_proto2_message_size());
-  EXPECT_EQ(0, m.repeated_nested_enum_size());
-  EXPECT_EQ(0, m.repeated_foreign_enum_size());
-  EXPECT_EQ(0, m.repeated_lazy_message_size());
-  EXPECT_EQ(proto2_nofieldpresence_unittest::TestAllTypes::ONEOF_FIELD_NOT_SET,
-            m.oneof_field_case());
-}
-
-void FillValues(proto2_nofieldpresence_unittest::TestAllTypes* m) {
-  m->set_optional_int32(100);
-  m->set_optional_int64(101);
-  m->set_optional_uint32(102);
-  m->set_optional_uint64(103);
-  m->set_optional_sint32(104);
-  m->set_optional_sint64(105);
-  m->set_optional_fixed32(106);
-  m->set_optional_fixed64(107);
-  m->set_optional_sfixed32(108);
-  m->set_optional_sfixed64(109);
-  m->set_optional_float(110.0);
-  m->set_optional_double(111.0);
-  m->set_optional_bool(true);
-  m->set_optional_string("asdf");
-  m->set_optional_bytes("jkl;");
-  m->mutable_optional_nested_message()->set_bb(42);
-  m->mutable_optional_foreign_message()->set_c(43);
-  m->mutable_optional_proto2_message()->set_optional_int32(44);
-  m->set_optional_nested_enum(
-      proto2_nofieldpresence_unittest::TestAllTypes::BAZ);
-  m->set_optional_foreign_enum(proto2_nofieldpresence_unittest::FOREIGN_BAZ);
-  m->mutable_optional_lazy_message()->set_bb(45);
-  m->add_repeated_int32(100);
-  m->add_repeated_int64(101);
-  m->add_repeated_uint32(102);
-  m->add_repeated_uint64(103);
-  m->add_repeated_sint32(104);
-  m->add_repeated_sint64(105);
-  m->add_repeated_fixed32(106);
-  m->add_repeated_fixed64(107);
-  m->add_repeated_sfixed32(108);
-  m->add_repeated_sfixed64(109);
-  m->add_repeated_float(110.0);
-  m->add_repeated_double(111.0);
-  m->add_repeated_bool(true);
-  m->add_repeated_string("asdf");
-  m->add_repeated_bytes("jkl;");
-  m->add_repeated_nested_message()->set_bb(46);
-  m->add_repeated_foreign_message()->set_c(47);
-  m->add_repeated_proto2_message()->set_optional_int32(48);
-  m->add_repeated_nested_enum(
-      proto2_nofieldpresence_unittest::TestAllTypes::BAZ);
-  m->add_repeated_foreign_enum(proto2_nofieldpresence_unittest::FOREIGN_BAZ);
-  m->add_repeated_lazy_message()->set_bb(49);
-
-  m->set_oneof_uint32(1);
-  m->mutable_oneof_nested_message()->set_bb(50);
-  m->set_oneof_string("test");  // only this one remains set
-}
-
-void CheckNonDefaultValues(
-    const proto2_nofieldpresence_unittest::TestAllTypes& m) {
-  EXPECT_EQ(100, m.optional_int32());
-  EXPECT_EQ(101, m.optional_int64());
-  EXPECT_EQ(102, m.optional_uint32());
-  EXPECT_EQ(103, m.optional_uint64());
-  EXPECT_EQ(104, m.optional_sint32());
-  EXPECT_EQ(105, m.optional_sint64());
-  EXPECT_EQ(106, m.optional_fixed32());
-  EXPECT_EQ(107, m.optional_fixed64());
-  EXPECT_EQ(108, m.optional_sfixed32());
-  EXPECT_EQ(109, m.optional_sfixed64());
-  EXPECT_EQ(110.0, m.optional_float());
-  EXPECT_EQ(111.0, m.optional_double());
-  EXPECT_EQ(true, m.optional_bool());
-  EXPECT_EQ("asdf", m.optional_string());
-  EXPECT_EQ("jkl;", m.optional_bytes());
-  EXPECT_EQ(true, m.has_optional_nested_message());
-  EXPECT_EQ(42, m.optional_nested_message().bb());
-  EXPECT_EQ(true, m.has_optional_foreign_message());
-  EXPECT_EQ(43, m.optional_foreign_message().c());
-  EXPECT_EQ(true, m.has_optional_proto2_message());
-  EXPECT_EQ(44, m.optional_proto2_message().optional_int32());
-  EXPECT_EQ(proto2_nofieldpresence_unittest::TestAllTypes::BAZ,
-            m.optional_nested_enum());
-  EXPECT_EQ(proto2_nofieldpresence_unittest::FOREIGN_BAZ,
-            m.optional_foreign_enum());
-  EXPECT_EQ(true, m.has_optional_lazy_message());
-  EXPECT_EQ(45, m.optional_lazy_message().bb());
-
-  EXPECT_EQ(1, m.repeated_int32_size());
-  EXPECT_EQ(100, m.repeated_int32(0));
-  EXPECT_EQ(1, m.repeated_int64_size());
-  EXPECT_EQ(101, m.repeated_int64(0));
-  EXPECT_EQ(1, m.repeated_uint32_size());
-  EXPECT_EQ(102, m.repeated_uint32(0));
-  EXPECT_EQ(1, m.repeated_uint64_size());
-  EXPECT_EQ(103, m.repeated_uint64(0));
-  EXPECT_EQ(1, m.repeated_sint32_size());
-  EXPECT_EQ(104, m.repeated_sint32(0));
-  EXPECT_EQ(1, m.repeated_sint64_size());
-  EXPECT_EQ(105, m.repeated_sint64(0));
-  EXPECT_EQ(1, m.repeated_fixed32_size());
-  EXPECT_EQ(106, m.repeated_fixed32(0));
-  EXPECT_EQ(1, m.repeated_fixed64_size());
-  EXPECT_EQ(107, m.repeated_fixed64(0));
-  EXPECT_EQ(1, m.repeated_sfixed32_size());
-  EXPECT_EQ(108, m.repeated_sfixed32(0));
-  EXPECT_EQ(1, m.repeated_sfixed64_size());
-  EXPECT_EQ(109, m.repeated_sfixed64(0));
-  EXPECT_EQ(1, m.repeated_float_size());
-  EXPECT_EQ(110.0, m.repeated_float(0));
-  EXPECT_EQ(1, m.repeated_double_size());
-  EXPECT_EQ(111.0, m.repeated_double(0));
-  EXPECT_EQ(1, m.repeated_bool_size());
-  EXPECT_EQ(true, m.repeated_bool(0));
-  EXPECT_EQ(1, m.repeated_string_size());
-  EXPECT_EQ("asdf", m.repeated_string(0));
-  EXPECT_EQ(1, m.repeated_bytes_size());
-  EXPECT_EQ("jkl;", m.repeated_bytes(0));
-  EXPECT_EQ(1, m.repeated_nested_message_size());
-  EXPECT_EQ(46, m.repeated_nested_message(0).bb());
-  EXPECT_EQ(1, m.repeated_foreign_message_size());
-  EXPECT_EQ(47, m.repeated_foreign_message(0).c());
-  EXPECT_EQ(1, m.repeated_proto2_message_size());
-  EXPECT_EQ(48, m.repeated_proto2_message(0).optional_int32());
-  EXPECT_EQ(1, m.repeated_nested_enum_size());
-  EXPECT_EQ(proto2_nofieldpresence_unittest::TestAllTypes::BAZ,
-            m.repeated_nested_enum(0));
-  EXPECT_EQ(1, m.repeated_foreign_enum_size());
-  EXPECT_EQ(proto2_nofieldpresence_unittest::FOREIGN_BAZ,
-            m.repeated_foreign_enum(0));
-  EXPECT_EQ(1, m.repeated_lazy_message_size());
-  EXPECT_EQ(49, m.repeated_lazy_message(0).bb());
-
-  EXPECT_EQ(proto2_nofieldpresence_unittest::TestAllTypes::kOneofString,
-            m.oneof_field_case());
-  EXPECT_EQ("test", m.oneof_string());
-}
-
-TEST(NoFieldPresenceTest, BasicMessageTest) {
-  proto2_nofieldpresence_unittest::TestAllTypes message;
-  // Check default values, fill all fields, check values. We just want to
-  // exercise the basic getters/setter paths here to make sure no
-  // field-presence-related changes broke these.
-  CheckDefaultValues(message);
-  FillValues(&message);
-  CheckNonDefaultValues(message);
-
-  // Clear() should be equivalent to getting a freshly-constructed message.
-  message.Clear();
-  CheckDefaultValues(message);
-}
-
-TEST(NoFieldPresenceTest, MessageFieldPresenceTest) {
-  // check that presence still works properly for message fields.
-  proto2_nofieldpresence_unittest::TestAllTypes message;
-  EXPECT_EQ(false, message.has_optional_nested_message());
-  // Getter should fetch default instance, and not cause the field to become
-  // present.
-  EXPECT_EQ(0, message.optional_nested_message().bb());
-  EXPECT_EQ(false, message.has_optional_nested_message());
-  message.mutable_optional_nested_message()->set_bb(42);
-  EXPECT_EQ(true, message.has_optional_nested_message());
-  message.clear_optional_nested_message();
-  EXPECT_EQ(false, message.has_optional_nested_message());
-
-  // Likewise for a lazy message field.
-  EXPECT_EQ(false, message.has_optional_lazy_message());
-  // Getter should fetch default instance, and not cause the field to become
-  // present.
-  EXPECT_EQ(0, message.optional_lazy_message().bb());
-  EXPECT_EQ(false, message.has_optional_lazy_message());
-  message.mutable_optional_lazy_message()->set_bb(42);
-  EXPECT_EQ(true, message.has_optional_lazy_message());
-  message.clear_optional_lazy_message();
-  EXPECT_EQ(false, message.has_optional_lazy_message());
-
-  // Test field presence of a message field on the default instance.
-  EXPECT_EQ(false,
-            proto2_nofieldpresence_unittest::TestAllTypes::default_instance()
-                .has_optional_nested_message());
-}
-
-TEST(NoFieldPresenceTest, ReflectionHasFieldTest) {
-  // check that HasField reports true on all scalar fields. Check that it
-  // behaves properly for message fields.
-
-  proto2_nofieldpresence_unittest::TestAllTypes message;
-  const Reflection* r = message.GetReflection();
-  const Descriptor* desc = message.GetDescriptor();
-
-  // Check initial state: scalars not present (due to need to be consistent with
-  // MergeFrom()), message fields not present, oneofs not present.
-  for (int i = 0; i < desc->field_count(); i++) {
-    const FieldDescriptor* field = desc->field(i);
-    if (field->is_repeated()) continue;
-    EXPECT_EQ(false, r->HasField(message, field));
-  }
-
-  // Test field presence of a message field on the default instance.
-  const FieldDescriptor* msg_field =
-      desc->FindFieldByName("optional_nested_message");
-  EXPECT_EQ(
-      false,
-      r->HasField(
-          proto2_nofieldpresence_unittest::TestAllTypes::default_instance(),
-          msg_field));
-
-  // Fill all fields, expect everything to report true (check oneofs below).
-  FillValues(&message);
-  for (int i = 0; i < desc->field_count(); i++) {
-    const FieldDescriptor* field = desc->field(i);
-    if (field->is_repeated() || field->containing_oneof()) {
-      continue;
-    }
-    if (field->options().ctype() != FieldOptions::STRING) {
-      continue;
-    }
-    EXPECT_EQ(true, r->HasField(message, field));
-  }
-
-  message.Clear();
-
-  // Check zero/empty-means-not-present semantics.
-  const FieldDescriptor* field_int32 = desc->FindFieldByName("optional_int32");
-  const FieldDescriptor* field_double =
-      desc->FindFieldByName("optional_double");
-  const FieldDescriptor* field_string =
-      desc->FindFieldByName("optional_string");
-
-  EXPECT_EQ(false, r->HasField(message, field_int32));
-  EXPECT_EQ(false, r->HasField(message, field_double));
-  EXPECT_EQ(false, r->HasField(message, field_string));
-
-  message.set_optional_int32(42);
-  EXPECT_EQ(true, r->HasField(message, field_int32));
-  message.set_optional_int32(0);
-  EXPECT_EQ(false, r->HasField(message, field_int32));
-
-  message.set_optional_double(42.0);
-  EXPECT_EQ(true, r->HasField(message, field_double));
-  message.set_optional_double(0.0);
-  EXPECT_EQ(false, r->HasField(message, field_double));
-
-  message.set_optional_string("test");
-  EXPECT_EQ(true, r->HasField(message, field_string));
-  message.set_optional_string("");
-  EXPECT_EQ(false, r->HasField(message, field_string));
-}
-
-TEST(NoFieldPresenceTest, ReflectionClearFieldTest) {
-  proto2_nofieldpresence_unittest::TestAllTypes message;
-
-  const Reflection* r = message.GetReflection();
-  const Descriptor* desc = message.GetDescriptor();
-
-  const FieldDescriptor* field_int32 = desc->FindFieldByName("optional_int32");
-  const FieldDescriptor* field_double =
-      desc->FindFieldByName("optional_double");
-  const FieldDescriptor* field_string =
-      desc->FindFieldByName("optional_string");
-  const FieldDescriptor* field_message =
-      desc->FindFieldByName("optional_nested_message");
-  const FieldDescriptor* field_lazy =
-      desc->FindFieldByName("optional_lazy_message");
-
-  message.set_optional_int32(42);
-  r->ClearField(&message, field_int32);
-  EXPECT_EQ(0, message.optional_int32());
-
-  message.set_optional_double(42.0);
-  r->ClearField(&message, field_double);
-  EXPECT_EQ(0.0, message.optional_double());
-
-  message.set_optional_string("test");
-  r->ClearField(&message, field_string);
-  EXPECT_EQ("", message.optional_string());
-
-  message.mutable_optional_nested_message()->set_bb(1234);
-  r->ClearField(&message, field_message);
-  EXPECT_FALSE(message.has_optional_nested_message());
-  EXPECT_EQ(0, message.optional_nested_message().bb());
-
-  message.mutable_optional_lazy_message()->set_bb(42);
-  r->ClearField(&message, field_lazy);
-  EXPECT_FALSE(message.has_optional_lazy_message());
-  EXPECT_EQ(0, message.optional_lazy_message().bb());
-}
-
-TEST(NoFieldPresenceTest, HasFieldOneofsTest) {
-  // check that HasField behaves properly for oneofs.
-  proto2_nofieldpresence_unittest::TestAllTypes message;
-
-  const Reflection* r = message.GetReflection();
-  const Descriptor* desc = message.GetDescriptor();
-  const FieldDescriptor* desc_oneof_uint32 =
-      desc->FindFieldByName("oneof_uint32");
-  const FieldDescriptor* desc_oneof_nested_message =
-      desc->FindFieldByName("oneof_nested_message");
-  const FieldDescriptor* desc_oneof_string =
-      desc->FindFieldByName("oneof_string");
-  GOOGLE_CHECK(desc_oneof_uint32 != nullptr);
-  GOOGLE_CHECK(desc_oneof_nested_message != nullptr);
-  GOOGLE_CHECK(desc_oneof_string != nullptr);
-
-  EXPECT_EQ(false, r->HasField(message, desc_oneof_uint32));
-  EXPECT_EQ(false, r->HasField(message, desc_oneof_nested_message));
-  EXPECT_EQ(false, r->HasField(message, desc_oneof_string));
-
-  message.set_oneof_string("test");
-  EXPECT_EQ(false, r->HasField(message, desc_oneof_uint32));
-  EXPECT_EQ(false, r->HasField(message, desc_oneof_nested_message));
-  EXPECT_EQ(true, r->HasField(message, desc_oneof_string));
-  message.mutable_oneof_nested_message()->set_bb(42);
-  EXPECT_EQ(false, r->HasField(message, desc_oneof_uint32));
-  EXPECT_EQ(true, r->HasField(message, desc_oneof_nested_message));
-  EXPECT_EQ(false, r->HasField(message, desc_oneof_string));
-
-  message.Clear();
-  EXPECT_EQ(false, r->HasField(message, desc_oneof_uint32));
-  EXPECT_EQ(false, r->HasField(message, desc_oneof_nested_message));
-  EXPECT_EQ(false, r->HasField(message, desc_oneof_string));
-}
-
-TEST(NoFieldPresenceTest, DontSerializeDefaultValuesTest) {
-  // check that serialized data contains only non-zero numeric fields/non-empty
-  // string/byte fields.
-  proto2_nofieldpresence_unittest::TestAllTypes message;
-  std::string output;
-
-  // All default values -> no output.
-  message.SerializeToString(&output);
-  EXPECT_EQ(0, output.size());
-
-  // Zero values -> still no output.
-  message.set_optional_int32(0);
-  message.set_optional_int64(0);
-  message.set_optional_uint32(0);
-  message.set_optional_uint64(0);
-  message.set_optional_sint32(0);
-  message.set_optional_sint64(0);
-  message.set_optional_fixed32(0);
-  message.set_optional_fixed64(0);
-  message.set_optional_sfixed32(0);
-  message.set_optional_sfixed64(0);
-  message.set_optional_float(0);
-  message.set_optional_double(0);
-  message.set_optional_bool(0);
-  message.set_optional_string("");
-  message.set_optional_bytes("");
-  message.set_optional_nested_enum(
-      proto2_nofieldpresence_unittest::TestAllTypes::FOO);  // first enum entry
-  message.set_optional_foreign_enum(
-      proto2_nofieldpresence_unittest::FOREIGN_FOO);  // first enum entry
-
-  message.SerializeToString(&output);
-  EXPECT_EQ(0, output.size());
-
-  message.set_optional_int32(1);
-  message.SerializeToString(&output);
-  EXPECT_EQ(2, output.size());
-  EXPECT_EQ("\x08\x01", output);
-
-  message.set_optional_int32(0);
-  message.SerializeToString(&output);
-  EXPECT_EQ(0, output.size());
-}
-
-TEST(NoFieldPresenceTest, MergeFromIfNonzeroTest) {
-  // check that MergeFrom copies if nonzero/nondefault only.
-  proto2_nofieldpresence_unittest::TestAllTypes source;
-  proto2_nofieldpresence_unittest::TestAllTypes dest;
-
-  dest.set_optional_int32(42);
-  dest.set_optional_string("test");
-  source.set_optional_int32(0);
-  source.set_optional_string("");
-  // MergeFrom() copies only if present in serialization, i.e., non-zero.
-  dest.MergeFrom(source);
-  EXPECT_EQ(42, dest.optional_int32());
-  EXPECT_EQ("test", dest.optional_string());
-
-  source.set_optional_int32(84);
-  source.set_optional_string("test2");
-  dest.MergeFrom(source);
-  EXPECT_EQ(84, dest.optional_int32());
-  EXPECT_EQ("test2", dest.optional_string());
-}
-
-TEST(NoFieldPresenceTest, IsInitializedTest) {
-  // Check that IsInitialized works properly.
-  proto2_nofieldpresence_unittest::TestProto2Required message;
-
-  EXPECT_EQ(true, message.IsInitialized());
-  message.mutable_proto2()->set_a(1);
-  EXPECT_EQ(false, message.IsInitialized());
-  message.mutable_proto2()->set_b(1);
-  EXPECT_EQ(false, message.IsInitialized());
-  message.mutable_proto2()->set_c(1);
-  EXPECT_EQ(true, message.IsInitialized());
-}
-
-TEST(NoFieldPresenceTest, LazyMessageFieldHasBit) {
-  // Check that has-bit interaction with lazy message works (has-bit before and
-  // after lazy decode).
-  proto2_nofieldpresence_unittest::TestAllTypes message;
-  const Reflection* r = message.GetReflection();
-  const Descriptor* desc = message.GetDescriptor();
-  const FieldDescriptor* field = desc->FindFieldByName("optional_lazy_message");
-  GOOGLE_CHECK(field != nullptr);
-
-  EXPECT_EQ(false, message.has_optional_lazy_message());
-  EXPECT_EQ(false, r->HasField(message, field));
-
-  message.mutable_optional_lazy_message()->set_bb(42);
-  EXPECT_EQ(true, message.has_optional_lazy_message());
-  EXPECT_EQ(true, r->HasField(message, field));
-
-  // Serialize and parse with a new message object so that lazy field on new
-  // object is in unparsed state.
-  std::string output;
-  message.SerializeToString(&output);
-  proto2_nofieldpresence_unittest::TestAllTypes message2;
-  message2.ParseFromString(output);
-
-  EXPECT_EQ(true, message2.has_optional_lazy_message());
-  EXPECT_EQ(true, r->HasField(message2, field));
-
-  // Access field to force lazy parse.
-  EXPECT_EQ(42, message.optional_lazy_message().bb());
-  EXPECT_EQ(true, message2.has_optional_lazy_message());
-  EXPECT_EQ(true, r->HasField(message2, field));
-}
-
-TEST(NoFieldPresenceTest, OneofPresence) {
-  proto2_nofieldpresence_unittest::TestAllTypes message;
-  // oneof fields still have field presence -- ensure that this goes on the wire
-  // even though its value is the empty string.
-  message.set_oneof_string("");
-  std::string serialized;
-  message.SerializeToString(&serialized);
-  // Tag: 113 --> tag is (113 << 3) | 2 (length delimited) = 906
-  // varint: 0x8a 0x07
-  // Length: 0x00
-  EXPECT_EQ(3, serialized.size());
-  EXPECT_EQ(static_cast<char>(0x8a), serialized.at(0));
-  EXPECT_EQ(static_cast<char>(0x07), serialized.at(1));
-  EXPECT_EQ(static_cast<char>(0x00), serialized.at(2));
-
-  message.Clear();
-  EXPECT_TRUE(message.ParseFromString(serialized));
-  EXPECT_EQ(proto2_nofieldpresence_unittest::TestAllTypes::kOneofString,
-            message.oneof_field_case());
-
-  // Also test int32 and enum fields.
-  message.Clear();
-  message.set_oneof_uint32(0);  // would not go on wire if ordinary field.
-  message.SerializeToString(&serialized);
-  EXPECT_EQ(3, serialized.size());
-  EXPECT_TRUE(message.ParseFromString(serialized));
-  EXPECT_EQ(proto2_nofieldpresence_unittest::TestAllTypes::kOneofUint32,
-            message.oneof_field_case());
-
-  message.Clear();
-  message.set_oneof_enum(
-      proto2_nofieldpresence_unittest::TestAllTypes::FOO);  // default
-                                                            // value.
-  message.SerializeToString(&serialized);
-  EXPECT_EQ(3, serialized.size());
-  EXPECT_TRUE(message.ParseFromString(serialized));
-  EXPECT_EQ(proto2_nofieldpresence_unittest::TestAllTypes::kOneofEnum,
-            message.oneof_field_case());
-
-  message.Clear();
-  message.set_oneof_string("test");
-  message.clear_oneof_string();
-  EXPECT_EQ(0, message.ByteSizeLong());
-}
-
-}  // namespace
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/package_info.h b/libs/protobuf/src/google/protobuf/package_info.h
deleted file mode 100644
index 2b61679..0000000
--- a/libs/protobuf/src/google/protobuf/package_info.h
+++ /dev/null
@@ -1,66 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-//
-// This file exists solely to document the google::protobuf namespace.
-// It is not compiled into anything, but it may be read by an automated
-// documentation generator.
-
-// Core components of the Protocol Buffers runtime library.
-//
-// The files in this package represent the core of the Protocol Buffer
-// system.  All of them are part of the libprotobuf library.
-//
-// A note on thread-safety:
-//
-// Thread-safety in the Protocol Buffer library follows a simple rule:
-// unless explicitly noted otherwise, it is always safe to use an object
-// from multiple threads simultaneously as long as the object is declared
-// const in all threads (or, it is only used in ways that would be allowed
-// if it were declared const).  However, if an object is accessed in one
-// thread in a way that would not be allowed if it were const, then it is
-// not safe to access that object in any other thread simultaneously.
-//
-// Put simply, read-only access to an object can happen in multiple threads
-// simultaneously, but write access can only happen in a single thread at
-// a time.
-//
-// The implementation does contain some "const" methods which actually modify
-// the object behind the scenes -- e.g., to cache results -- but in these cases
-// mutex locking is used to make the access thread-safe.
-namespace google {
-namespace protobuf {
-// TODO(gerbens) remove this comment, we need it to prevent clang-format
-// from combining the brackets. Which would mess with extract script
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/parse_context.cc b/libs/protobuf/src/google/protobuf/parse_context.cc
deleted file mode 100644
index 59852fd..0000000
--- a/libs/protobuf/src/google/protobuf/parse_context.cc
+++ /dev/null
@@ -1,548 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <google/protobuf/parse_context.h>
-
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/io/zero_copy_stream.h>
-#include <google/protobuf/arenastring.h>
-#include <google/protobuf/endian.h>
-#include <google/protobuf/message_lite.h>
-#include <google/protobuf/repeated_field.h>
-#include <google/protobuf/stubs/strutil.h>
-#include <google/protobuf/wire_format_lite.h>
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-namespace internal {
-
-namespace {
-
-// Only call if at start of tag.
-bool ParseEndsInSlopRegion(const char* begin, int overrun, int depth) {
-  constexpr int kSlopBytes = EpsCopyInputStream::kSlopBytes;
-  GOOGLE_DCHECK_GE(overrun, 0);
-  GOOGLE_DCHECK_LE(overrun, kSlopBytes);
-  auto ptr = begin + overrun;
-  auto end = begin + kSlopBytes;
-  while (ptr < end) {
-    uint32_t tag;
-    ptr = ReadTag(ptr, &tag);
-    if (ptr == nullptr || ptr > end) return false;
-    // ending on 0 tag is allowed and is the major reason for the necessity of
-    // this function.
-    if (tag == 0) return true;
-    switch (tag & 7) {
-      case 0: {  // Varint
-        uint64_t val;
-        ptr = VarintParse(ptr, &val);
-        if (ptr == nullptr) return false;
-        break;
-      }
-      case 1: {  // fixed64
-        ptr += 8;
-        break;
-      }
-      case 2: {  // len delim
-        int32_t size = ReadSize(&ptr);
-        if (ptr == nullptr || size > end - ptr) return false;
-        ptr += size;
-        break;
-      }
-      case 3: {  // start group
-        depth++;
-        break;
-      }
-      case 4: {                    // end group
-        if (--depth < 0) return true;  // We exit early
-        break;
-      }
-      case 5: {  // fixed32
-        ptr += 4;
-        break;
-      }
-      default:
-        return false;  // Unknown wireformat
-    }
-  }
-  return false;
-}
-
-}  // namespace
-
-const char* EpsCopyInputStream::NextBuffer(int overrun, int depth) {
-  if (next_chunk_ == nullptr) return nullptr;  // We've reached end of stream.
-  if (next_chunk_ != buffer_) {
-    GOOGLE_DCHECK(size_ > kSlopBytes);
-    // The chunk is large enough to be used directly
-    buffer_end_ = next_chunk_ + size_ - kSlopBytes;
-    auto res = next_chunk_;
-    next_chunk_ = buffer_;
-    if (aliasing_ == kOnPatch) aliasing_ = kNoDelta;
-    return res;
-  }
-  // Move the slop bytes of previous buffer to start of the patch buffer.
-  // Note we must use memmove because the previous buffer could be part of
-  // buffer_.
-  std::memmove(buffer_, buffer_end_, kSlopBytes);
-  if (overall_limit_ > 0 &&
-      (depth < 0 || !ParseEndsInSlopRegion(buffer_, overrun, depth))) {
-    const void* data;
-    // ZeroCopyInputStream indicates Next may return 0 size buffers. Hence
-    // we loop.
-    while (StreamNext(&data)) {
-      if (size_ > kSlopBytes) {
-        // We got a large chunk
-        std::memcpy(buffer_ + kSlopBytes, data, kSlopBytes);
-        next_chunk_ = static_cast<const char*>(data);
-        buffer_end_ = buffer_ + kSlopBytes;
-        if (aliasing_ >= kNoDelta) aliasing_ = kOnPatch;
-        return buffer_;
-      } else if (size_ > 0) {
-        std::memcpy(buffer_ + kSlopBytes, data, size_);
-        next_chunk_ = buffer_;
-        buffer_end_ = buffer_ + size_;
-        if (aliasing_ >= kNoDelta) aliasing_ = kOnPatch;
-        return buffer_;
-      }
-      GOOGLE_DCHECK(size_ == 0) << size_;
-    }
-    overall_limit_ = 0;  // Next failed, no more needs for next
-  }
-  // End of stream or array
-  if (aliasing_ == kNoDelta) {
-    // If there is no more block and aliasing is true, the previous block
-    // is still valid and we can alias. We have users relying on string_view's
-    // obtained from protos to outlive the proto, when the parse was from an
-    // array. This guarantees string_view's are always aliased if parsed from
-    // an array.
-    aliasing_ = reinterpret_cast<std::uintptr_t>(buffer_end_) -
-                reinterpret_cast<std::uintptr_t>(buffer_);
-  }
-  next_chunk_ = nullptr;
-  buffer_end_ = buffer_ + kSlopBytes;
-  size_ = 0;
-  return buffer_;
-}
-
-const char* EpsCopyInputStream::Next() {
-  GOOGLE_DCHECK(limit_ > kSlopBytes);
-  auto p = NextBuffer(0 /* immaterial */, -1);
-  if (p == nullptr) {
-    limit_end_ = buffer_end_;
-    // Distinguish ending on a pushed limit or ending on end-of-stream.
-    SetEndOfStream();
-    return nullptr;
-  }
-  limit_ -= buffer_end_ - p;  // Adjust limit_ relative to new anchor
-  limit_end_ = buffer_end_ + std::min(0, limit_);
-  return p;
-}
-
-std::pair<const char*, bool> EpsCopyInputStream::DoneFallback(int overrun,
-                                                              int depth) {
-  // Did we exceeded the limit (parse error).
-  if (PROTOBUF_PREDICT_FALSE(overrun > limit_)) return {nullptr, true};
-  GOOGLE_DCHECK(overrun != limit_);  // Guaranteed by caller.
-  GOOGLE_DCHECK(overrun < limit_);   // Follows from above
-  // TODO(gerbens) Instead of this dcheck we could just assign, and remove
-  // updating the limit_end from PopLimit, ie.
-  // limit_end_ = buffer_end_ + (std::min)(0, limit_);
-  // if (ptr < limit_end_) return {ptr, false};
-  GOOGLE_DCHECK(limit_end_ == buffer_end_ + (std::min)(0, limit_));
-  // At this point we know the following assertion holds.
-  GOOGLE_DCHECK_GT(limit_, 0);
-  GOOGLE_DCHECK(limit_end_ == buffer_end_);  // because limit_ > 0
-  const char* p;
-  do {
-    // We are past the end of buffer_end_, in the slop region.
-    GOOGLE_DCHECK_GE(overrun, 0);
-    p = NextBuffer(overrun, depth);
-    if (p == nullptr) {
-      // We are at the end of the stream
-      if (PROTOBUF_PREDICT_FALSE(overrun != 0)) return {nullptr, true};
-      GOOGLE_DCHECK_GT(limit_, 0);
-      limit_end_ = buffer_end_;
-      // Distinguish ending on a pushed limit or ending on end-of-stream.
-      SetEndOfStream();
-      return {buffer_end_, true};
-    }
-    limit_ -= buffer_end_ - p;  // Adjust limit_ relative to new anchor
-    p += overrun;
-    overrun = p - buffer_end_;
-  } while (overrun >= 0);
-  limit_end_ = buffer_end_ + std::min(0, limit_);
-  return {p, false};
-}
-
-const char* EpsCopyInputStream::SkipFallback(const char* ptr, int size) {
-  return AppendSize(ptr, size, [](const char* /*p*/, int /*s*/) {});
-}
-
-const char* EpsCopyInputStream::ReadStringFallback(const char* ptr, int size,
-                                                   std::string* str) {
-  str->clear();
-  if (PROTOBUF_PREDICT_TRUE(size <= buffer_end_ - ptr + limit_)) {
-    // Reserve the string up to a static safe size. If strings are bigger than
-    // this we proceed by growing the string as needed. This protects against
-    // malicious payloads making protobuf hold on to a lot of memory.
-    str->reserve(str->size() + std::min<int>(size, kSafeStringSize));
-  }
-  return AppendSize(ptr, size,
-                    [str](const char* p, int s) { str->append(p, s); });
-}
-
-const char* EpsCopyInputStream::AppendStringFallback(const char* ptr, int size,
-                                                     std::string* str) {
-  if (PROTOBUF_PREDICT_TRUE(size <= buffer_end_ - ptr + limit_)) {
-    // Reserve the string up to a static safe size. If strings are bigger than
-    // this we proceed by growing the string as needed. This protects against
-    // malicious payloads making protobuf hold on to a lot of memory.
-    str->reserve(str->size() + std::min<int>(size, kSafeStringSize));
-  }
-  return AppendSize(ptr, size,
-                    [str](const char* p, int s) { str->append(p, s); });
-}
-
-
-const char* EpsCopyInputStream::InitFrom(io::ZeroCopyInputStream* zcis) {
-  zcis_ = zcis;
-  const void* data;
-  int size;
-  limit_ = INT_MAX;
-  if (zcis->Next(&data, &size)) {
-    overall_limit_ -= size;
-    if (size > kSlopBytes) {
-      auto ptr = static_cast<const char*>(data);
-      limit_ -= size - kSlopBytes;
-      limit_end_ = buffer_end_ = ptr + size - kSlopBytes;
-      next_chunk_ = buffer_;
-      if (aliasing_ == kOnPatch) aliasing_ = kNoDelta;
-      return ptr;
-    } else {
-      limit_end_ = buffer_end_ = buffer_ + kSlopBytes;
-      next_chunk_ = buffer_;
-      auto ptr = buffer_ + 2 * kSlopBytes - size;
-      std::memcpy(ptr, data, size);
-      return ptr;
-    }
-  }
-  overall_limit_ = 0;
-  next_chunk_ = nullptr;
-  size_ = 0;
-  limit_end_ = buffer_end_ = buffer_;
-  return buffer_;
-}
-
-const char* ParseContext::ReadSizeAndPushLimitAndDepth(const char* ptr,
-                                                       int* old_limit) {
-  int size = ReadSize(&ptr);
-  if (PROTOBUF_PREDICT_FALSE(!ptr)) {
-    *old_limit = 0;  // Make sure this isn't uninitialized even on error return
-    return nullptr;
-  }
-  *old_limit = PushLimit(ptr, size);
-  if (--depth_ < 0) return nullptr;
-  return ptr;
-}
-
-const char* ParseContext::ParseMessage(MessageLite* msg, const char* ptr) {
-  int old;
-  ptr = ReadSizeAndPushLimitAndDepth(ptr, &old);
-  ptr = ptr ? msg->_InternalParse(ptr, this) : nullptr;
-  depth_++;
-  if (!PopLimit(old)) return nullptr;
-  return ptr;
-}
-
-inline void WriteVarint(uint64_t val, std::string* s) {
-  while (val >= 128) {
-    uint8_t c = val | 0x80;
-    s->push_back(c);
-    val >>= 7;
-  }
-  s->push_back(val);
-}
-
-void WriteVarint(uint32_t num, uint64_t val, std::string* s) {
-  WriteVarint(num << 3, s);
-  WriteVarint(val, s);
-}
-
-void WriteLengthDelimited(uint32_t num, StringPiece val, std::string* s) {
-  WriteVarint((num << 3) + 2, s);
-  WriteVarint(val.size(), s);
-  s->append(val.data(), val.size());
-}
-
-std::pair<const char*, uint32_t> VarintParseSlow32(const char* p,
-                                                   uint32_t res) {
-  for (std::uint32_t i = 2; i < 5; i++) {
-    uint32_t byte = static_cast<uint8_t>(p[i]);
-    res += (byte - 1) << (7 * i);
-    if (PROTOBUF_PREDICT_TRUE(byte < 128)) {
-      return {p + i + 1, res};
-    }
-  }
-  // Accept >5 bytes
-  for (std::uint32_t i = 5; i < 10; i++) {
-    uint32_t byte = static_cast<uint8_t>(p[i]);
-    if (PROTOBUF_PREDICT_TRUE(byte < 128)) {
-      return {p + i + 1, res};
-    }
-  }
-  return {nullptr, 0};
-}
-
-std::pair<const char*, uint64_t> VarintParseSlow64(const char* p,
-                                                   uint32_t res32) {
-  uint64_t res = res32;
-  for (std::uint32_t i = 2; i < 10; i++) {
-    uint64_t byte = static_cast<uint8_t>(p[i]);
-    res += (byte - 1) << (7 * i);
-    if (PROTOBUF_PREDICT_TRUE(byte < 128)) {
-      return {p + i + 1, res};
-    }
-  }
-  return {nullptr, 0};
-}
-
-std::pair<const char*, uint32_t> ReadTagFallback(const char* p, uint32_t res) {
-  for (std::uint32_t i = 2; i < 5; i++) {
-    uint32_t byte = static_cast<uint8_t>(p[i]);
-    res += (byte - 1) << (7 * i);
-    if (PROTOBUF_PREDICT_TRUE(byte < 128)) {
-      return {p + i + 1, res};
-    }
-  }
-  return {nullptr, 0};
-}
-
-std::pair<const char*, int32_t> ReadSizeFallback(const char* p, uint32_t res) {
-  for (std::uint32_t i = 1; i < 4; i++) {
-    uint32_t byte = static_cast<uint8_t>(p[i]);
-    res += (byte - 1) << (7 * i);
-    if (PROTOBUF_PREDICT_TRUE(byte < 128)) {
-      return {p + i + 1, res};
-    }
-  }
-  std::uint32_t byte = static_cast<uint8_t>(p[4]);
-  if (PROTOBUF_PREDICT_FALSE(byte >= 8)) return {nullptr, 0};  // size >= 2gb
-  res += (byte - 1) << 28;
-  // Protect against sign integer overflow in PushLimit. Limits are relative
-  // to buffer ends and ptr could potential be kSlopBytes beyond a buffer end.
-  // To protect against overflow we reject limits absurdly close to INT_MAX.
-  if (PROTOBUF_PREDICT_FALSE(res > INT_MAX - ParseContext::kSlopBytes)) {
-    return {nullptr, 0};
-  }
-  return {p + 5, res};
-}
-
-const char* StringParser(const char* begin, const char* end, void* object,
-                         ParseContext*) {
-  auto str = static_cast<std::string*>(object);
-  str->append(begin, end - begin);
-  return end;
-}
-
-// Defined in wire_format_lite.cc
-void PrintUTF8ErrorLog(StringPiece message_name,
-                       StringPiece field_name, const char* operation_str,
-                       bool emit_stacktrace);
-
-bool VerifyUTF8(StringPiece str, const char* field_name) {
-  if (!IsStructurallyValidUTF8(str)) {
-    PrintUTF8ErrorLog("", field_name, "parsing", false);
-    return false;
-  }
-  return true;
-}
-
-const char* InlineGreedyStringParser(std::string* s, const char* ptr,
-                                     ParseContext* ctx) {
-  int size = ReadSize(&ptr);
-  if (!ptr) return nullptr;
-  return ctx->ReadString(ptr, size, s);
-}
-
-
-template <typename T, bool sign>
-const char* VarintParser(void* object, const char* ptr, ParseContext* ctx) {
-  return ctx->ReadPackedVarint(ptr, [object](uint64_t varint) {
-    T val;
-    if (sign) {
-      if (sizeof(T) == 8) {
-        val = WireFormatLite::ZigZagDecode64(varint);
-      } else {
-        val = WireFormatLite::ZigZagDecode32(varint);
-      }
-    } else {
-      val = varint;
-    }
-    static_cast<RepeatedField<T>*>(object)->Add(val);
-  });
-}
-
-const char* PackedInt32Parser(void* object, const char* ptr,
-                              ParseContext* ctx) {
-  return VarintParser<int32_t, false>(object, ptr, ctx);
-}
-const char* PackedUInt32Parser(void* object, const char* ptr,
-                               ParseContext* ctx) {
-  return VarintParser<uint32_t, false>(object, ptr, ctx);
-}
-const char* PackedInt64Parser(void* object, const char* ptr,
-                              ParseContext* ctx) {
-  return VarintParser<int64_t, false>(object, ptr, ctx);
-}
-const char* PackedUInt64Parser(void* object, const char* ptr,
-                               ParseContext* ctx) {
-  return VarintParser<uint64_t, false>(object, ptr, ctx);
-}
-const char* PackedSInt32Parser(void* object, const char* ptr,
-                               ParseContext* ctx) {
-  return VarintParser<int32_t, true>(object, ptr, ctx);
-}
-const char* PackedSInt64Parser(void* object, const char* ptr,
-                               ParseContext* ctx) {
-  return VarintParser<int64_t, true>(object, ptr, ctx);
-}
-
-const char* PackedEnumParser(void* object, const char* ptr, ParseContext* ctx) {
-  return VarintParser<int, false>(object, ptr, ctx);
-}
-
-const char* PackedBoolParser(void* object, const char* ptr, ParseContext* ctx) {
-  return VarintParser<bool, false>(object, ptr, ctx);
-}
-
-template <typename T>
-const char* FixedParser(void* object, const char* ptr, ParseContext* ctx) {
-  int size = ReadSize(&ptr);
-  return ctx->ReadPackedFixed(ptr, size,
-                              static_cast<RepeatedField<T>*>(object));
-}
-
-const char* PackedFixed32Parser(void* object, const char* ptr,
-                                ParseContext* ctx) {
-  return FixedParser<uint32_t>(object, ptr, ctx);
-}
-const char* PackedSFixed32Parser(void* object, const char* ptr,
-                                 ParseContext* ctx) {
-  return FixedParser<int32_t>(object, ptr, ctx);
-}
-const char* PackedFixed64Parser(void* object, const char* ptr,
-                                ParseContext* ctx) {
-  return FixedParser<uint64_t>(object, ptr, ctx);
-}
-const char* PackedSFixed64Parser(void* object, const char* ptr,
-                                 ParseContext* ctx) {
-  return FixedParser<int64_t>(object, ptr, ctx);
-}
-const char* PackedFloatParser(void* object, const char* ptr,
-                              ParseContext* ctx) {
-  return FixedParser<float>(object, ptr, ctx);
-}
-const char* PackedDoubleParser(void* object, const char* ptr,
-                               ParseContext* ctx) {
-  return FixedParser<double>(object, ptr, ctx);
-}
-
-class UnknownFieldLiteParserHelper {
- public:
-  explicit UnknownFieldLiteParserHelper(std::string* unknown)
-      : unknown_(unknown) {}
-
-  void AddVarint(uint32_t num, uint64_t value) {
-    if (unknown_ == nullptr) return;
-    WriteVarint(num * 8, unknown_);
-    WriteVarint(value, unknown_);
-  }
-  void AddFixed64(uint32_t num, uint64_t value) {
-    if (unknown_ == nullptr) return;
-    WriteVarint(num * 8 + 1, unknown_);
-    char buffer[8];
-    io::CodedOutputStream::WriteLittleEndian64ToArray(
-        value, reinterpret_cast<uint8_t*>(buffer));
-    unknown_->append(buffer, 8);
-  }
-  const char* ParseLengthDelimited(uint32_t num, const char* ptr,
-                                   ParseContext* ctx) {
-    int size = ReadSize(&ptr);
-    GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
-    if (unknown_ == nullptr) return ctx->Skip(ptr, size);
-    WriteVarint(num * 8 + 2, unknown_);
-    WriteVarint(size, unknown_);
-    return ctx->AppendString(ptr, size, unknown_);
-  }
-  const char* ParseGroup(uint32_t num, const char* ptr, ParseContext* ctx) {
-    if (unknown_) WriteVarint(num * 8 + 3, unknown_);
-    ptr = ctx->ParseGroup(this, ptr, num * 8 + 3);
-    GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
-    if (unknown_) WriteVarint(num * 8 + 4, unknown_);
-    return ptr;
-  }
-  void AddFixed32(uint32_t num, uint32_t value) {
-    if (unknown_ == nullptr) return;
-    WriteVarint(num * 8 + 5, unknown_);
-    char buffer[4];
-    io::CodedOutputStream::WriteLittleEndian32ToArray(
-        value, reinterpret_cast<uint8_t*>(buffer));
-    unknown_->append(buffer, 4);
-  }
-
-  const char* _InternalParse(const char* ptr, ParseContext* ctx) {
-    return WireFormatParser(*this, ptr, ctx);
-  }
-
- private:
-  std::string* unknown_;
-};
-
-const char* UnknownGroupLiteParse(std::string* unknown, const char* ptr,
-                                  ParseContext* ctx) {
-  UnknownFieldLiteParserHelper field_parser(unknown);
-  return WireFormatParser(field_parser, ptr, ctx);
-}
-
-const char* UnknownFieldParse(uint32_t tag, std::string* unknown,
-                              const char* ptr, ParseContext* ctx) {
-  UnknownFieldLiteParserHelper field_parser(unknown);
-  return FieldParser(tag, field_parser, ptr, ctx);
-}
-
-}  // namespace internal
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
diff --git a/libs/protobuf/src/google/protobuf/parse_context.h b/libs/protobuf/src/google/protobuf/parse_context.h
deleted file mode 100644
index 7aea50c..0000000
--- a/libs/protobuf/src/google/protobuf/parse_context.h
+++ /dev/null
@@ -1,1025 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef GOOGLE_PROTOBUF_PARSE_CONTEXT_H__
-#define GOOGLE_PROTOBUF_PARSE_CONTEXT_H__
-
-#include <cstdint>
-#include <cstring>
-#include <string>
-#include <type_traits>
-
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/io/zero_copy_stream.h>
-#include <google/protobuf/arena.h>
-#include <google/protobuf/port.h>
-#include <google/protobuf/stubs/strutil.h>
-#include <google/protobuf/arenastring.h>
-#include <google/protobuf/endian.h>
-#include <google/protobuf/implicit_weak_message.h>
-#include <google/protobuf/inlined_string_field.h>
-#include <google/protobuf/metadata_lite.h>
-#include <google/protobuf/repeated_field.h>
-#include <google/protobuf/wire_format_lite.h>
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-
-namespace google {
-namespace protobuf {
-
-class UnknownFieldSet;
-class DescriptorPool;
-class MessageFactory;
-
-namespace internal {
-
-// Template code below needs to know about the existence of these functions.
-PROTOBUF_EXPORT void WriteVarint(uint32_t num, uint64_t val, std::string* s);
-PROTOBUF_EXPORT void WriteLengthDelimited(uint32_t num, StringPiece val,
-                                          std::string* s);
-// Inline because it is just forwarding to s->WriteVarint
-inline void WriteVarint(uint32_t num, uint64_t val, UnknownFieldSet* s);
-inline void WriteLengthDelimited(uint32_t num, StringPiece val,
-                                 UnknownFieldSet* s);
-
-
-// The basic abstraction the parser is designed for is a slight modification
-// of the ZeroCopyInputStream (ZCIS) abstraction. A ZCIS presents a serialized
-// stream as a series of buffers that concatenate to the full stream.
-// Pictorially a ZCIS presents a stream in chunks like so
-// [---------------------------------------------------------------]
-// [---------------------] chunk 1
-//                      [----------------------------] chunk 2
-//                                          chunk 3 [--------------]
-//
-// Where the '-' represent the bytes which are vertically lined up with the
-// bytes of the stream. The proto parser requires its input to be presented
-// similarly with the extra
-// property that each chunk has kSlopBytes past its end that overlaps with the
-// first kSlopBytes of the next chunk, or if there is no next chunk at least its
-// still valid to read those bytes. Again, pictorially, we now have
-//
-// [---------------------------------------------------------------]
-// [-------------------....] chunk 1
-//                    [------------------------....] chunk 2
-//                                    chunk 3 [------------------..**]
-//                                                      chunk 4 [--****]
-// Here '-' mean the bytes of the stream or chunk and '.' means bytes past the
-// chunk that match up with the start of the next chunk. Above each chunk has
-// 4 '.' after the chunk. In the case these 'overflow' bytes represents bytes
-// past the stream, indicated by '*' above, their values are unspecified. It is
-// still legal to read them (ie. should not segfault). Reading past the
-// end should be detected by the user and indicated as an error.
-//
-// The reason for this, admittedly, unconventional invariant is to ruthlessly
-// optimize the protobuf parser. Having an overlap helps in two important ways.
-// Firstly it alleviates having to performing bounds checks if a piece of code
-// is guaranteed to not read more than kSlopBytes. Secondly, and more
-// importantly, the protobuf wireformat is such that reading a key/value pair is
-// always less than 16 bytes. This removes the need to change to next buffer in
-// the middle of reading primitive values. Hence there is no need to store and
-// load the current position.
-
-class PROTOBUF_EXPORT EpsCopyInputStream {
- public:
-  enum { kSlopBytes = 16, kMaxCordBytesToCopy = 512 };
-
-  explicit EpsCopyInputStream(bool enable_aliasing)
-      : aliasing_(enable_aliasing ? kOnPatch : kNoAliasing) {}
-
-  void BackUp(const char* ptr) {
-    GOOGLE_DCHECK(ptr <= buffer_end_ + kSlopBytes);
-    int count;
-    if (next_chunk_ == buffer_) {
-      count = static_cast<int>(buffer_end_ + kSlopBytes - ptr);
-    } else {
-      count = size_ + static_cast<int>(buffer_end_ - ptr);
-    }
-    if (count > 0) StreamBackUp(count);
-  }
-
-  // If return value is negative it's an error
-  PROTOBUF_NODISCARD int PushLimit(const char* ptr, int limit) {
-    GOOGLE_DCHECK(limit >= 0 && limit <= INT_MAX - kSlopBytes);
-    // This add is safe due to the invariant above, because
-    // ptr - buffer_end_ <= kSlopBytes.
-    limit += static_cast<int>(ptr - buffer_end_);
-    limit_end_ = buffer_end_ + (std::min)(0, limit);
-    auto old_limit = limit_;
-    limit_ = limit;
-    return old_limit - limit;
-  }
-
-  PROTOBUF_NODISCARD bool PopLimit(int delta) {
-    if (PROTOBUF_PREDICT_FALSE(!EndedAtLimit())) return false;
-    limit_ = limit_ + delta;
-    // TODO(gerbens) We could remove this line and hoist the code to
-    // DoneFallback. Study the perf/bin-size effects.
-    limit_end_ = buffer_end_ + (std::min)(0, limit_);
-    return true;
-  }
-
-  PROTOBUF_NODISCARD const char* Skip(const char* ptr, int size) {
-    if (size <= buffer_end_ + kSlopBytes - ptr) {
-      return ptr + size;
-    }
-    return SkipFallback(ptr, size);
-  }
-  PROTOBUF_NODISCARD const char* ReadString(const char* ptr, int size,
-                                            std::string* s) {
-    if (size <= buffer_end_ + kSlopBytes - ptr) {
-      s->assign(ptr, size);
-      return ptr + size;
-    }
-    return ReadStringFallback(ptr, size, s);
-  }
-  PROTOBUF_NODISCARD const char* AppendString(const char* ptr, int size,
-                                              std::string* s) {
-    if (size <= buffer_end_ + kSlopBytes - ptr) {
-      s->append(ptr, size);
-      return ptr + size;
-    }
-    return AppendStringFallback(ptr, size, s);
-  }
-  // Implemented in arenastring.cc
-  PROTOBUF_NODISCARD const char* ReadArenaString(const char* ptr,
-                                                 ArenaStringPtr* s,
-                                                 Arena* arena);
-
-  template <typename Tag, typename T>
-  PROTOBUF_NODISCARD const char* ReadRepeatedFixed(const char* ptr,
-                                                   Tag expected_tag,
-                                                   RepeatedField<T>* out);
-
-  template <typename T>
-  PROTOBUF_NODISCARD const char* ReadPackedFixed(const char* ptr, int size,
-                                                 RepeatedField<T>* out);
-  template <typename Add>
-  PROTOBUF_NODISCARD const char* ReadPackedVarint(const char* ptr, Add add);
-
-  uint32_t LastTag() const { return last_tag_minus_1_ + 1; }
-  bool ConsumeEndGroup(uint32_t start_tag) {
-    bool res = last_tag_minus_1_ == start_tag;
-    last_tag_minus_1_ = 0;
-    return res;
-  }
-  bool EndedAtLimit() const { return last_tag_minus_1_ == 0; }
-  bool EndedAtEndOfStream() const { return last_tag_minus_1_ == 1; }
-  void SetLastTag(uint32_t tag) { last_tag_minus_1_ = tag - 1; }
-  void SetEndOfStream() { last_tag_minus_1_ = 1; }
-  bool IsExceedingLimit(const char* ptr) {
-    return ptr > limit_end_ &&
-           (next_chunk_ == nullptr || ptr - buffer_end_ > limit_);
-  }
-  bool AliasingEnabled() const { return aliasing_ != kNoAliasing; }
-  int BytesUntilLimit(const char* ptr) const {
-    return limit_ + static_cast<int>(buffer_end_ - ptr);
-  }
-  // Returns true if more data is available, if false is returned one has to
-  // call Done for further checks.
-  bool DataAvailable(const char* ptr) { return ptr < limit_end_; }
-
- protected:
-  // Returns true is limit (either an explicit limit or end of stream) is
-  // reached. It aligns *ptr across buffer seams.
-  // If limit is exceeded it returns true and ptr is set to null.
-  bool DoneWithCheck(const char** ptr, int d) {
-    GOOGLE_DCHECK(*ptr);
-    if (PROTOBUF_PREDICT_TRUE(*ptr < limit_end_)) return false;
-    int overrun = static_cast<int>(*ptr - buffer_end_);
-    GOOGLE_DCHECK_LE(overrun, kSlopBytes);  // Guaranteed by parse loop.
-    if (overrun ==
-        limit_) {  //  No need to flip buffers if we ended on a limit.
-      // If we actually overrun the buffer and next_chunk_ is null. It means
-      // the stream ended and we passed the stream end.
-      if (overrun > 0 && next_chunk_ == nullptr) *ptr = nullptr;
-      return true;
-    }
-    auto res = DoneFallback(overrun, d);
-    *ptr = res.first;
-    return res.second;
-  }
-
-  const char* InitFrom(StringPiece flat) {
-    overall_limit_ = 0;
-    if (flat.size() > kSlopBytes) {
-      limit_ = kSlopBytes;
-      limit_end_ = buffer_end_ = flat.data() + flat.size() - kSlopBytes;
-      next_chunk_ = buffer_;
-      if (aliasing_ == kOnPatch) aliasing_ = kNoDelta;
-      return flat.data();
-    } else {
-      std::memcpy(buffer_, flat.data(), flat.size());
-      limit_ = 0;
-      limit_end_ = buffer_end_ = buffer_ + flat.size();
-      next_chunk_ = nullptr;
-      if (aliasing_ == kOnPatch) {
-        aliasing_ = reinterpret_cast<std::uintptr_t>(flat.data()) -
-                    reinterpret_cast<std::uintptr_t>(buffer_);
-      }
-      return buffer_;
-    }
-  }
-
-  const char* InitFrom(io::ZeroCopyInputStream* zcis);
-
-  const char* InitFrom(io::ZeroCopyInputStream* zcis, int limit) {
-    if (limit == -1) return InitFrom(zcis);
-    overall_limit_ = limit;
-    auto res = InitFrom(zcis);
-    limit_ = limit - static_cast<int>(buffer_end_ - res);
-    limit_end_ = buffer_end_ + (std::min)(0, limit_);
-    return res;
-  }
-
- private:
-  const char* limit_end_;  // buffer_end_ + min(limit_, 0)
-  const char* buffer_end_;
-  const char* next_chunk_;
-  int size_;
-  int limit_;  // relative to buffer_end_;
-  io::ZeroCopyInputStream* zcis_ = nullptr;
-  char buffer_[2 * kSlopBytes] = {};
-  enum { kNoAliasing = 0, kOnPatch = 1, kNoDelta = 2 };
-  std::uintptr_t aliasing_ = kNoAliasing;
-  // This variable is used to communicate how the parse ended, in order to
-  // completely verify the parsed data. A wire-format parse can end because of
-  // one of the following conditions:
-  // 1) A parse can end on a pushed limit.
-  // 2) A parse can end on End Of Stream (EOS).
-  // 3) A parse can end on 0 tag (only valid for toplevel message).
-  // 4) A parse can end on an end-group tag.
-  // This variable should always be set to 0, which indicates case 1. If the
-  // parse terminated due to EOS (case 2), it's set to 1. In case the parse
-  // ended due to a terminating tag (case 3 and 4) it's set to (tag - 1).
-  // This var doesn't really belong in EpsCopyInputStream and should be part of
-  // the ParseContext, but case 2 is most easily and optimally implemented in
-  // DoneFallback.
-  uint32_t last_tag_minus_1_ = 0;
-  int overall_limit_ = INT_MAX;  // Overall limit independent of pushed limits.
-  // Pretty random large number that seems like a safe allocation on most
-  // systems. TODO(gerbens) do we need to set this as build flag?
-  enum { kSafeStringSize = 50000000 };
-
-  // Advances to next buffer chunk returns a pointer to the same logical place
-  // in the stream as set by overrun. Overrun indicates the position in the slop
-  // region the parse was left (0 <= overrun <= kSlopBytes). Returns true if at
-  // limit, at which point the returned pointer maybe null if there was an
-  // error. The invariant of this function is that it's guaranteed that
-  // kSlopBytes bytes can be accessed from the returned ptr. This function might
-  // advance more buffers than one in the underlying ZeroCopyInputStream.
-  std::pair<const char*, bool> DoneFallback(int overrun, int depth);
-  // Advances to the next buffer, at most one call to Next() on the underlying
-  // ZeroCopyInputStream is made. This function DOES NOT match the returned
-  // pointer to where in the slop region the parse ends, hence no overrun
-  // parameter. This is useful for string operations where you always copy
-  // to the end of the buffer (including the slop region).
-  const char* Next();
-  // overrun is the location in the slop region the stream currently is
-  // (0 <= overrun <= kSlopBytes). To prevent flipping to the next buffer of
-  // the ZeroCopyInputStream in the case the parse will end in the last
-  // kSlopBytes of the current buffer. depth is the current depth of nested
-  // groups (or negative if the use case does not need careful tracking).
-  inline const char* NextBuffer(int overrun, int depth);
-  const char* SkipFallback(const char* ptr, int size);
-  const char* AppendStringFallback(const char* ptr, int size, std::string* str);
-  const char* ReadStringFallback(const char* ptr, int size, std::string* str);
-  bool StreamNext(const void** data) {
-    bool res = zcis_->Next(data, &size_);
-    if (res) overall_limit_ -= size_;
-    return res;
-  }
-  void StreamBackUp(int count) {
-    zcis_->BackUp(count);
-    overall_limit_ += count;
-  }
-
-  template <typename A>
-  const char* AppendSize(const char* ptr, int size, const A& append) {
-    int chunk_size = buffer_end_ + kSlopBytes - ptr;
-    do {
-      GOOGLE_DCHECK(size > chunk_size);
-      if (next_chunk_ == nullptr) return nullptr;
-      append(ptr, chunk_size);
-      ptr += chunk_size;
-      size -= chunk_size;
-      // TODO(gerbens) Next calls NextBuffer which generates buffers with
-      // overlap and thus incurs cost of copying the slop regions. This is not
-      // necessary for reading strings. We should just call Next buffers.
-      if (limit_ <= kSlopBytes) return nullptr;
-      ptr = Next();
-      if (ptr == nullptr) return nullptr;  // passed the limit
-      ptr += kSlopBytes;
-      chunk_size = buffer_end_ + kSlopBytes - ptr;
-    } while (size > chunk_size);
-    append(ptr, size);
-    return ptr + size;
-  }
-
-  // AppendUntilEnd appends data until a limit (either a PushLimit or end of
-  // stream. Normal payloads are from length delimited fields which have an
-  // explicit size. Reading until limit only comes when the string takes
-  // the place of a protobuf, ie RawMessage/StringRawMessage, lazy fields and
-  // implicit weak messages. We keep these methods private and friend them.
-  template <typename A>
-  const char* AppendUntilEnd(const char* ptr, const A& append) {
-    if (ptr - buffer_end_ > limit_) return nullptr;
-    while (limit_ > kSlopBytes) {
-      size_t chunk_size = buffer_end_ + kSlopBytes - ptr;
-      append(ptr, chunk_size);
-      ptr = Next();
-      if (ptr == nullptr) return limit_end_;
-      ptr += kSlopBytes;
-    }
-    auto end = buffer_end_ + limit_;
-    GOOGLE_DCHECK(end >= ptr);
-    append(ptr, end - ptr);
-    return end;
-  }
-
-  PROTOBUF_NODISCARD const char* AppendString(const char* ptr,
-                                              std::string* str) {
-    return AppendUntilEnd(
-        ptr, [str](const char* p, ptrdiff_t s) { str->append(p, s); });
-  }
-  friend class ImplicitWeakMessage;
-};
-
-using LazyEagerVerifyFnType = const char* (*)(const char* ptr,
-                                              ParseContext* ctx);
-using LazyEagerVerifyFnRef = std::remove_pointer<LazyEagerVerifyFnType>::type&;
-
-// ParseContext holds all data that is global to the entire parse. Most
-// importantly it contains the input stream, but also recursion depth and also
-// stores the end group tag, in case a parser ended on a endgroup, to verify
-// matching start/end group tags.
-class PROTOBUF_EXPORT ParseContext : public EpsCopyInputStream {
- public:
-  struct Data {
-    const DescriptorPool* pool = nullptr;
-    MessageFactory* factory = nullptr;
-    Arena* arena = nullptr;
-  };
-
-  template <typename... T>
-  ParseContext(int depth, bool aliasing, const char** start, T&&... args)
-      : EpsCopyInputStream(aliasing), depth_(depth) {
-    *start = InitFrom(std::forward<T>(args)...);
-  }
-
-  void TrackCorrectEnding() { group_depth_ = 0; }
-
-  bool Done(const char** ptr) { return DoneWithCheck(ptr, group_depth_); }
-
-  int depth() const { return depth_; }
-
-  Data& data() { return data_; }
-  const Data& data() const { return data_; }
-
-  const char* ParseMessage(MessageLite* msg, const char* ptr);
-
-  // Spawns a child parsing context that inherits key properties. New context
-  // inherits the following:
-  // --depth_, data_, check_required_fields_, lazy_parse_mode_
-  // The spawned context always disables aliasing (different input).
-  template <typename... T>
-  ParseContext Spawn(const char** start, T&&... args) {
-    ParseContext spawned(depth_, false, start, std::forward<T>(args)...);
-    // Transfer key context states.
-    spawned.data_ = data_;
-    return spawned;
-  }
-
-  // This overload supports those few cases where ParseMessage is called
-  // on a class that is not actually a proto message.
-  // TODO(jorg): Eliminate this use case.
-  template <typename T,
-            typename std::enable_if<!std::is_base_of<MessageLite, T>::value,
-                                    bool>::type = true>
-  PROTOBUF_NODISCARD const char* ParseMessage(T* msg, const char* ptr);
-
-  template <typename T>
-  PROTOBUF_NODISCARD PROTOBUF_NDEBUG_INLINE const char* ParseGroup(
-      T* msg, const char* ptr, uint32_t tag) {
-    if (--depth_ < 0) return nullptr;
-    group_depth_++;
-    ptr = msg->_InternalParse(ptr, this);
-    group_depth_--;
-    depth_++;
-    if (PROTOBUF_PREDICT_FALSE(!ConsumeEndGroup(tag))) return nullptr;
-    return ptr;
-  }
-
- private:
-  // Out-of-line routine to save space in ParseContext::ParseMessage<T>
-  //   int old;
-  //   ptr = ReadSizeAndPushLimitAndDepth(ptr, &old)
-  // is equivalent to:
-  //   int size = ReadSize(&ptr);
-  //   if (!ptr) return nullptr;
-  //   int old = PushLimit(ptr, size);
-  //   if (--depth_ < 0) return nullptr;
-  PROTOBUF_NODISCARD const char* ReadSizeAndPushLimitAndDepth(const char* ptr,
-                                                              int* old_limit);
-
-  // The context keeps an internal stack to keep track of the recursive
-  // part of the parse state.
-  // Current depth of the active parser, depth counts down.
-  // This is used to limit recursion depth (to prevent overflow on malicious
-  // data), but is also used to index in stack_ to store the current state.
-  int depth_;
-  // Unfortunately necessary for the fringe case of ending on 0 or end-group tag
-  // in the last kSlopBytes of a ZeroCopyInputStream chunk.
-  int group_depth_ = INT_MIN;
-  Data data_;
-};
-
-template <uint32_t tag>
-bool ExpectTag(const char* ptr) {
-  if (tag < 128) {
-    return *ptr == static_cast<char>(tag);
-  } else {
-    static_assert(tag < 128 * 128, "We only expect tags for 1 or 2 bytes");
-    char buf[2] = {static_cast<char>(tag | 0x80), static_cast<char>(tag >> 7)};
-    return std::memcmp(ptr, buf, 2) == 0;
-  }
-}
-
-template <int>
-struct EndianHelper;
-
-template <>
-struct EndianHelper<1> {
-  static uint8_t Load(const void* p) { return *static_cast<const uint8_t*>(p); }
-};
-
-template <>
-struct EndianHelper<2> {
-  static uint16_t Load(const void* p) {
-    uint16_t tmp;
-    std::memcpy(&tmp, p, 2);
-    return little_endian::ToHost(tmp);
-  }
-};
-
-template <>
-struct EndianHelper<4> {
-  static uint32_t Load(const void* p) {
-    uint32_t tmp;
-    std::memcpy(&tmp, p, 4);
-    return little_endian::ToHost(tmp);
-  }
-};
-
-template <>
-struct EndianHelper<8> {
-  static uint64_t Load(const void* p) {
-    uint64_t tmp;
-    std::memcpy(&tmp, p, 8);
-    return little_endian::ToHost(tmp);
-  }
-};
-
-template <typename T>
-T UnalignedLoad(const char* p) {
-  auto tmp = EndianHelper<sizeof(T)>::Load(p);
-  T res;
-  memcpy(&res, &tmp, sizeof(T));
-  return res;
-}
-
-PROTOBUF_EXPORT
-std::pair<const char*, uint32_t> VarintParseSlow32(const char* p, uint32_t res);
-PROTOBUF_EXPORT
-std::pair<const char*, uint64_t> VarintParseSlow64(const char* p, uint32_t res);
-
-inline const char* VarintParseSlow(const char* p, uint32_t res, uint32_t* out) {
-  auto tmp = VarintParseSlow32(p, res);
-  *out = tmp.second;
-  return tmp.first;
-}
-
-inline const char* VarintParseSlow(const char* p, uint32_t res, uint64_t* out) {
-  auto tmp = VarintParseSlow64(p, res);
-  *out = tmp.second;
-  return tmp.first;
-}
-
-template <typename T>
-PROTOBUF_NODISCARD const char* VarintParse(const char* p, T* out) {
-  auto ptr = reinterpret_cast<const uint8_t*>(p);
-  uint32_t res = ptr[0];
-  if (!(res & 0x80)) {
-    *out = res;
-    return p + 1;
-  }
-  uint32_t byte = ptr[1];
-  res += (byte - 1) << 7;
-  if (!(byte & 0x80)) {
-    *out = res;
-    return p + 2;
-  }
-  return VarintParseSlow(p, res, out);
-}
-
-// Used for tags, could read up to 5 bytes which must be available.
-// Caller must ensure its safe to call.
-
-PROTOBUF_EXPORT
-std::pair<const char*, uint32_t> ReadTagFallback(const char* p, uint32_t res);
-
-// Same as ParseVarint but only accept 5 bytes at most.
-inline const char* ReadTag(const char* p, uint32_t* out,
-                           uint32_t /*max_tag*/ = 0) {
-  uint32_t res = static_cast<uint8_t>(p[0]);
-  if (res < 128) {
-    *out = res;
-    return p + 1;
-  }
-  uint32_t second = static_cast<uint8_t>(p[1]);
-  res += (second - 1) << 7;
-  if (second < 128) {
-    *out = res;
-    return p + 2;
-  }
-  auto tmp = ReadTagFallback(p, res);
-  *out = tmp.second;
-  return tmp.first;
-}
-
-// As above, but optimized to consume very few registers while still being fast,
-// ReadTagInlined is useful for callers that don't mind the extra code but would
-// like to avoid an extern function call causing spills into the stack.
-//
-// Two support routines for ReadTagInlined come first...
-template <class T>
-PROTOBUF_NODISCARD PROTOBUF_ALWAYS_INLINE constexpr T RotateLeft(
-    T x, int s) noexcept {
-  return static_cast<T>(x << (s & (std::numeric_limits<T>::digits - 1))) |
-         static_cast<T>(x >> ((-s) & (std::numeric_limits<T>::digits - 1)));
-}
-
-PROTOBUF_NODISCARD inline PROTOBUF_ALWAYS_INLINE uint64_t
-RotRight7AndReplaceLowByte(uint64_t res, const char& byte) {
-#if defined(__x86_64__) && defined(__GNUC__)
-  // This will only use one register for `res`.
-  // `byte` comes as a reference to allow the compiler to generate code like:
-  //
-  //   rorq    $7, %rcx
-  //   movb    1(%rax), %cl
-  //
-  // which avoids loading the incoming bytes into a separate register first.
-  asm("ror $7,%0\n\t"
-      "movb %1,%b0"
-      : "+r"(res)
-      : "m"(byte));
-#else
-  res = RotateLeft(res, -7);
-  res = res & ~0xFF;
-  res |= 0xFF & byte;
-#endif
-  return res;
-};
-
-inline PROTOBUF_ALWAYS_INLINE
-const char* ReadTagInlined(const char* ptr, uint32_t* out) {
-  uint64_t res = 0xFF & ptr[0];
-  if (PROTOBUF_PREDICT_FALSE(res >= 128)) {
-    res = RotRight7AndReplaceLowByte(res, ptr[1]);
-    if (PROTOBUF_PREDICT_FALSE(res & 0x80)) {
-      res = RotRight7AndReplaceLowByte(res, ptr[2]);
-      if (PROTOBUF_PREDICT_FALSE(res & 0x80)) {
-        res = RotRight7AndReplaceLowByte(res, ptr[3]);
-        if (PROTOBUF_PREDICT_FALSE(res & 0x80)) {
-          // Note: this wouldn't work if res were 32-bit,
-          // because then replacing the low byte would overwrite
-          // the bottom 4 bits of the result.
-          res = RotRight7AndReplaceLowByte(res, ptr[4]);
-          if (PROTOBUF_PREDICT_FALSE(res & 0x80)) {
-            // The proto format does not permit longer than 5-byte encodings for
-            // tags.
-            *out = 0;
-            return nullptr;
-          }
-          *out = static_cast<uint32_t>(RotateLeft(res, 28));
-#if defined(__GNUC__)
-          // Note: this asm statement prevents the compiler from
-          // trying to share the "return ptr + constant" among all
-          // branches.
-          asm("" : "+r"(ptr));
-#endif
-          return ptr + 5;
-        }
-        *out = static_cast<uint32_t>(RotateLeft(res, 21));
-        return ptr + 4;
-      }
-      *out = static_cast<uint32_t>(RotateLeft(res, 14));
-      return ptr + 3;
-    }
-    *out = static_cast<uint32_t>(RotateLeft(res, 7));
-    return ptr + 2;
-  }
-  *out = static_cast<uint32_t>(res);
-  return ptr + 1;
-}
-
-// Decode 2 consecutive bytes of a varint and returns the value, shifted left
-// by 1. It simultaneous updates *ptr to *ptr + 1 or *ptr + 2 depending if the
-// first byte's continuation bit is set.
-// If bit 15 of return value is set (equivalent to the continuation bits of both
-// bytes being set) the varint continues, otherwise the parse is done. On x86
-// movsx eax, dil
-// and edi, eax
-// add eax, edi
-// adc [rsi], 1
-inline uint32_t DecodeTwoBytes(const char** ptr) {
-  uint32_t value = UnalignedLoad<uint16_t>(*ptr);
-  // Sign extend the low byte continuation bit
-  uint32_t x = static_cast<int8_t>(value);
-  value &= x;  // Mask out the high byte iff no continuation
-  // This add is an amazing operation, it cancels the low byte continuation bit
-  // from y transferring it to the carry. Simultaneously it also shifts the 7
-  // LSB left by one tightly against high byte varint bits. Hence value now
-  // contains the unpacked value shifted left by 1.
-  value += x;
-  // Use the carry to update the ptr appropriately.
-  *ptr += value < x ? 2 : 1;
-  return value;
-}
-
-// More efficient varint parsing for big varints
-inline const char* ParseBigVarint(const char* p, uint64_t* out) {
-  auto pnew = p;
-  auto tmp = DecodeTwoBytes(&pnew);
-  uint64_t res = tmp >> 1;
-  if (PROTOBUF_PREDICT_TRUE(static_cast<std::int16_t>(tmp) >= 0)) {
-    *out = res;
-    return pnew;
-  }
-  for (std::uint32_t i = 1; i < 5; i++) {
-    pnew = p + 2 * i;
-    tmp = DecodeTwoBytes(&pnew);
-    res += (static_cast<std::uint64_t>(tmp) - 2) << (14 * i - 1);
-    if (PROTOBUF_PREDICT_TRUE(static_cast<std::int16_t>(tmp) >= 0)) {
-      *out = res;
-      return pnew;
-    }
-  }
-  return nullptr;
-}
-
-PROTOBUF_EXPORT
-std::pair<const char*, int32_t> ReadSizeFallback(const char* p, uint32_t first);
-// Used for tags, could read up to 5 bytes which must be available. Additionally
-// it makes sure the unsigned value fits a int32_t, otherwise returns nullptr.
-// Caller must ensure its safe to call.
-inline uint32_t ReadSize(const char** pp) {
-  auto p = *pp;
-  uint32_t res = static_cast<uint8_t>(p[0]);
-  if (res < 128) {
-    *pp = p + 1;
-    return res;
-  }
-  auto x = ReadSizeFallback(p, res);
-  *pp = x.first;
-  return x.second;
-}
-
-// Some convenience functions to simplify the generated parse loop code.
-// Returning the value and updating the buffer pointer allows for nicer
-// function composition. We rely on the compiler to inline this.
-// Also in debug compiles having local scoped variables tend to generated
-// stack frames that scale as O(num fields).
-inline uint64_t ReadVarint64(const char** p) {
-  uint64_t tmp;
-  *p = VarintParse(*p, &tmp);
-  return tmp;
-}
-
-inline uint32_t ReadVarint32(const char** p) {
-  uint32_t tmp;
-  *p = VarintParse(*p, &tmp);
-  return tmp;
-}
-
-inline int64_t ReadVarintZigZag64(const char** p) {
-  uint64_t tmp;
-  *p = VarintParse(*p, &tmp);
-  return WireFormatLite::ZigZagDecode64(tmp);
-}
-
-inline int32_t ReadVarintZigZag32(const char** p) {
-  uint64_t tmp;
-  *p = VarintParse(*p, &tmp);
-  return WireFormatLite::ZigZagDecode32(static_cast<uint32_t>(tmp));
-}
-
-template <typename T, typename std::enable_if<
-                          !std::is_base_of<MessageLite, T>::value, bool>::type>
-PROTOBUF_NODISCARD const char* ParseContext::ParseMessage(T* msg,
-                                                          const char* ptr) {
-  int old;
-  ptr = ReadSizeAndPushLimitAndDepth(ptr, &old);
-  ptr = ptr ? msg->_InternalParse(ptr, this) : nullptr;
-  depth_++;
-  if (!PopLimit(old)) return nullptr;
-  return ptr;
-}
-
-template <typename Tag, typename T>
-const char* EpsCopyInputStream::ReadRepeatedFixed(const char* ptr,
-                                                  Tag expected_tag,
-                                                  RepeatedField<T>* out) {
-  do {
-    out->Add(UnalignedLoad<T>(ptr));
-    ptr += sizeof(T);
-    if (PROTOBUF_PREDICT_FALSE(ptr >= limit_end_)) return ptr;
-  } while (UnalignedLoad<Tag>(ptr) == expected_tag && (ptr += sizeof(Tag)));
-  return ptr;
-}
-
-// Add any of the following lines to debug which parse function is failing.
-
-#define GOOGLE_PROTOBUF_ASSERT_RETURN(predicate, ret) \
-  if (!(predicate)) {                                  \
-    /*  ::raise(SIGINT);  */                           \
-    /*  GOOGLE_LOG(ERROR) << "Parse failure";  */             \
-    return ret;                                        \
-  }
-
-#define GOOGLE_PROTOBUF_PARSER_ASSERT(predicate) \
-  GOOGLE_PROTOBUF_ASSERT_RETURN(predicate, nullptr)
-
-template <typename T>
-const char* EpsCopyInputStream::ReadPackedFixed(const char* ptr, int size,
-                                                RepeatedField<T>* out) {
-  GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
-  int nbytes = buffer_end_ + kSlopBytes - ptr;
-  while (size > nbytes) {
-    int num = nbytes / sizeof(T);
-    int old_entries = out->size();
-    out->Reserve(old_entries + num);
-    int block_size = num * sizeof(T);
-    auto dst = out->AddNAlreadyReserved(num);
-#ifdef PROTOBUF_LITTLE_ENDIAN
-    std::memcpy(dst, ptr, block_size);
-#else
-    for (int i = 0; i < num; i++)
-      dst[i] = UnalignedLoad<T>(ptr + i * sizeof(T));
-#endif
-    size -= block_size;
-    if (limit_ <= kSlopBytes) return nullptr;
-    ptr = Next();
-    if (ptr == nullptr) return nullptr;
-    ptr += kSlopBytes - (nbytes - block_size);
-    nbytes = buffer_end_ + kSlopBytes - ptr;
-  }
-  int num = size / sizeof(T);
-  int old_entries = out->size();
-  out->Reserve(old_entries + num);
-  int block_size = num * sizeof(T);
-  auto dst = out->AddNAlreadyReserved(num);
-#ifdef PROTOBUF_LITTLE_ENDIAN
-  std::memcpy(dst, ptr, block_size);
-#else
-  for (int i = 0; i < num; i++) dst[i] = UnalignedLoad<T>(ptr + i * sizeof(T));
-#endif
-  ptr += block_size;
-  if (size != block_size) return nullptr;
-  return ptr;
-}
-
-template <typename Add>
-const char* ReadPackedVarintArray(const char* ptr, const char* end, Add add) {
-  while (ptr < end) {
-    uint64_t varint;
-    ptr = VarintParse(ptr, &varint);
-    if (ptr == nullptr) return nullptr;
-    add(varint);
-  }
-  return ptr;
-}
-
-template <typename Add>
-const char* EpsCopyInputStream::ReadPackedVarint(const char* ptr, Add add) {
-  int size = ReadSize(&ptr);
-  GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
-  int chunk_size = buffer_end_ - ptr;
-  while (size > chunk_size) {
-    ptr = ReadPackedVarintArray(ptr, buffer_end_, add);
-    if (ptr == nullptr) return nullptr;
-    int overrun = ptr - buffer_end_;
-    GOOGLE_DCHECK(overrun >= 0 && overrun <= kSlopBytes);
-    if (size - chunk_size <= kSlopBytes) {
-      // The current buffer contains all the information needed, we don't need
-      // to flip buffers. However we must parse from a buffer with enough space
-      // so we are not prone to a buffer overflow.
-      char buf[kSlopBytes + 10] = {};
-      std::memcpy(buf, buffer_end_, kSlopBytes);
-      GOOGLE_CHECK_LE(size - chunk_size, kSlopBytes);
-      auto end = buf + (size - chunk_size);
-      auto res = ReadPackedVarintArray(buf + overrun, end, add);
-      if (res == nullptr || res != end) return nullptr;
-      return buffer_end_ + (res - buf);
-    }
-    size -= overrun + chunk_size;
-    GOOGLE_DCHECK_GT(size, 0);
-    // We must flip buffers
-    if (limit_ <= kSlopBytes) return nullptr;
-    ptr = Next();
-    if (ptr == nullptr) return nullptr;
-    ptr += overrun;
-    chunk_size = buffer_end_ - ptr;
-  }
-  auto end = ptr + size;
-  ptr = ReadPackedVarintArray(ptr, end, add);
-  return end == ptr ? ptr : nullptr;
-}
-
-// Helper for verification of utf8
-PROTOBUF_EXPORT
-bool VerifyUTF8(StringPiece s, const char* field_name);
-
-inline bool VerifyUTF8(const std::string* s, const char* field_name) {
-  return VerifyUTF8(*s, field_name);
-}
-
-// All the string parsers with or without UTF checking and for all CTypes.
-PROTOBUF_NODISCARD PROTOBUF_EXPORT const char* InlineGreedyStringParser(
-    std::string* s, const char* ptr, ParseContext* ctx);
-
-
-template <typename T>
-PROTOBUF_NODISCARD const char* FieldParser(uint64_t tag, T& field_parser,
-                                           const char* ptr, ParseContext* ctx) {
-  uint32_t number = tag >> 3;
-  GOOGLE_PROTOBUF_PARSER_ASSERT(number != 0);
-  using WireType = internal::WireFormatLite::WireType;
-  switch (tag & 7) {
-    case WireType::WIRETYPE_VARINT: {
-      uint64_t value;
-      ptr = VarintParse(ptr, &value);
-      GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
-      field_parser.AddVarint(number, value);
-      break;
-    }
-    case WireType::WIRETYPE_FIXED64: {
-      uint64_t value = UnalignedLoad<uint64_t>(ptr);
-      ptr += 8;
-      field_parser.AddFixed64(number, value);
-      break;
-    }
-    case WireType::WIRETYPE_LENGTH_DELIMITED: {
-      ptr = field_parser.ParseLengthDelimited(number, ptr, ctx);
-      GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
-      break;
-    }
-    case WireType::WIRETYPE_START_GROUP: {
-      ptr = field_parser.ParseGroup(number, ptr, ctx);
-      GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
-      break;
-    }
-    case WireType::WIRETYPE_END_GROUP: {
-      GOOGLE_LOG(FATAL) << "Can't happen";
-      break;
-    }
-    case WireType::WIRETYPE_FIXED32: {
-      uint32_t value = UnalignedLoad<uint32_t>(ptr);
-      ptr += 4;
-      field_parser.AddFixed32(number, value);
-      break;
-    }
-    default:
-      return nullptr;
-  }
-  return ptr;
-}
-
-template <typename T>
-PROTOBUF_NODISCARD const char* WireFormatParser(T& field_parser,
-                                                const char* ptr,
-                                                ParseContext* ctx) {
-  while (!ctx->Done(&ptr)) {
-    uint32_t tag;
-    ptr = ReadTag(ptr, &tag);
-    GOOGLE_PROTOBUF_PARSER_ASSERT(ptr != nullptr);
-    if (tag == 0 || (tag & 7) == 4) {
-      ctx->SetLastTag(tag);
-      return ptr;
-    }
-    ptr = FieldParser(tag, field_parser, ptr, ctx);
-    GOOGLE_PROTOBUF_PARSER_ASSERT(ptr != nullptr);
-  }
-  return ptr;
-}
-
-// The packed parsers parse repeated numeric primitives directly into  the
-// corresponding field
-
-// These are packed varints
-PROTOBUF_NODISCARD PROTOBUF_EXPORT const char* PackedInt32Parser(
-    void* object, const char* ptr, ParseContext* ctx);
-PROTOBUF_NODISCARD PROTOBUF_EXPORT const char* PackedUInt32Parser(
-    void* object, const char* ptr, ParseContext* ctx);
-PROTOBUF_NODISCARD PROTOBUF_EXPORT const char* PackedInt64Parser(
-    void* object, const char* ptr, ParseContext* ctx);
-PROTOBUF_NODISCARD PROTOBUF_EXPORT const char* PackedUInt64Parser(
-    void* object, const char* ptr, ParseContext* ctx);
-PROTOBUF_NODISCARD PROTOBUF_EXPORT const char* PackedSInt32Parser(
-    void* object, const char* ptr, ParseContext* ctx);
-PROTOBUF_NODISCARD PROTOBUF_EXPORT const char* PackedSInt64Parser(
-    void* object, const char* ptr, ParseContext* ctx);
-PROTOBUF_NODISCARD PROTOBUF_EXPORT const char* PackedEnumParser(
-    void* object, const char* ptr, ParseContext* ctx);
-
-template <typename T>
-PROTOBUF_NODISCARD const char* PackedEnumParser(void* object, const char* ptr,
-                                                ParseContext* ctx,
-                                                bool (*is_valid)(int),
-                                                InternalMetadata* metadata,
-                                                int field_num) {
-  return ctx->ReadPackedVarint(
-      ptr, [object, is_valid, metadata, field_num](uint64_t val) {
-        if (is_valid(val)) {
-          static_cast<RepeatedField<int>*>(object)->Add(val);
-        } else {
-          WriteVarint(field_num, val, metadata->mutable_unknown_fields<T>());
-        }
-      });
-}
-
-template <typename T>
-PROTOBUF_NODISCARD const char* PackedEnumParserArg(
-    void* object, const char* ptr, ParseContext* ctx,
-    bool (*is_valid)(const void*, int), const void* data,
-    InternalMetadata* metadata, int field_num) {
-  return ctx->ReadPackedVarint(
-      ptr, [object, is_valid, data, metadata, field_num](uint64_t val) {
-        if (is_valid(data, val)) {
-          static_cast<RepeatedField<int>*>(object)->Add(val);
-        } else {
-          WriteVarint(field_num, val, metadata->mutable_unknown_fields<T>());
-        }
-      });
-}
-
-PROTOBUF_NODISCARD PROTOBUF_EXPORT const char* PackedBoolParser(
-    void* object, const char* ptr, ParseContext* ctx);
-PROTOBUF_NODISCARD PROTOBUF_EXPORT const char* PackedFixed32Parser(
-    void* object, const char* ptr, ParseContext* ctx);
-PROTOBUF_NODISCARD PROTOBUF_EXPORT const char* PackedSFixed32Parser(
-    void* object, const char* ptr, ParseContext* ctx);
-PROTOBUF_NODISCARD PROTOBUF_EXPORT const char* PackedFixed64Parser(
-    void* object, const char* ptr, ParseContext* ctx);
-PROTOBUF_NODISCARD PROTOBUF_EXPORT const char* PackedSFixed64Parser(
-    void* object, const char* ptr, ParseContext* ctx);
-PROTOBUF_NODISCARD PROTOBUF_EXPORT const char* PackedFloatParser(
-    void* object, const char* ptr, ParseContext* ctx);
-PROTOBUF_NODISCARD PROTOBUF_EXPORT const char* PackedDoubleParser(
-    void* object, const char* ptr, ParseContext* ctx);
-
-// This is the only recursive parser.
-PROTOBUF_NODISCARD PROTOBUF_EXPORT const char* UnknownGroupLiteParse(
-    std::string* unknown, const char* ptr, ParseContext* ctx);
-// This is a helper to for the UnknownGroupLiteParse but is actually also
-// useful in the generated code. It uses overload on std::string* vs
-// UnknownFieldSet* to make the generated code isomorphic between full and lite.
-PROTOBUF_NODISCARD PROTOBUF_EXPORT const char* UnknownFieldParse(
-    uint32_t tag, std::string* unknown, const char* ptr, ParseContext* ctx);
-
-}  // namespace internal
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
-
-#endif  // GOOGLE_PROTOBUF_PARSE_CONTEXT_H__
diff --git a/libs/protobuf/src/google/protobuf/port.h b/libs/protobuf/src/google/protobuf/port.h
deleted file mode 100644
index a5c060b..0000000
--- a/libs/protobuf/src/google/protobuf/port.h
+++ /dev/null
@@ -1,80 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// A common header that is included across all protobuf headers.  We do our best
-// to avoid #defining any macros here; instead we generally put macros in
-// port_def.inc and port_undef.inc so they are not visible from outside of
-// protobuf.
-
-#ifndef GOOGLE_PROTOBUF_PORT_H__
-#define GOOGLE_PROTOBUF_PORT_H__
-
-#include <cstddef>
-#include <new>
-
-
-namespace google {
-namespace protobuf {
-namespace internal {
-inline void SizedDelete(void* p, size_t size) {
-#if defined(__cpp_sized_deallocation)
-  ::operator delete(p, size);
-#else
-  ::operator delete(p);
-#endif
-}
-inline void SizedArrayDelete(void* p, size_t size) {
-#if defined(__cpp_sized_deallocation)
-  ::operator delete[](p, size);
-#else
-  ::operator delete[](p);
-#endif
-}
-
-// Tag type used to invoke the constinit constructor overload of classes
-// such as ArenaStringPtr and MapFieldBase. Such constructors are internal
-// implementation details of the library.
-struct ConstantInitialized {
-  explicit ConstantInitialized() = default;
-};
-
-// Tag type used to invoke the arena constructor overload of classes such
-// as ExtensionSet and MapFieldLite in aggregate initialization. These
-// classes typically don't have move/copy constructors, which rules out
-// explicit initialization in pre-C++17.
-struct ArenaInitialized {
-  explicit ArenaInitialized() = default;
-};
-
-}  // namespace internal
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // GOOGLE_PROTOBUF_PORT_H__
diff --git a/libs/protobuf/src/google/protobuf/port_def.inc b/libs/protobuf/src/google/protobuf/port_def.inc
deleted file mode 100644
index 6c6aa18..0000000
--- a/libs/protobuf/src/google/protobuf/port_def.inc
+++ /dev/null
@@ -1,928 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// This file defines common macros that are used in protobuf.
-//
-// To hide these definitions from the outside world (and to prevent collisions
-// if more than one version of protobuf is #included in the same project) you
-// must follow this pattern when #including port_def.inc in a header file:
-//
-// #include "other_header.h"
-// #include "message.h"
-// // etc.
-//
-// #include "port_def.inc"  // MUST be last header included
-//
-// // Definitions for this header.
-//
-// #include "port_undef.inc"
-//
-// This is a textual header with no include guard, because we want to
-// detect/prohibit anytime it is #included twice without a corresponding
-// #undef.
-
-// The definitions in this file are intended to be portable across Clang,
-// GCC, and MSVC. Function-like macros are usable without an #ifdef guard.
-// Syntax macros (for example, attributes) are always defined, although
-// they may be empty.
-//
-// Some definitions rely on the NDEBUG macro and/or (in MSVC) _DEBUG:
-// - https://en.cppreference.com/w/c/error/assert
-// - https://docs.microsoft.com/en-us/cpp/preprocessor/predefined-macros#microsoft-specific-predefined-macros
-//
-// References for predefined macros:
-// - Standard: https://en.cppreference.com/w/cpp/preprocessor/replace
-// - Clang: https://clang.llvm.org/docs/LanguageExtensions.html
-//          (see also GCC predefined macros)
-// - GCC: https://gcc.gnu.org/onlinedocs/cpp/Predefined-Macros.html
-// - MSVC: https://docs.microsoft.com/en-us/cpp/preprocessor/predefined-macros
-// - Interactive (Clang/GCC only): https://www.compiler-explorer.com/z/hc6jKd3sj
-//
-// References for attributes (and extension attributes):
-// - Standard: https://en.cppreference.com/w/cpp/language/attributes
-// - Clang: https://clang.llvm.org/docs/AttributeReference.html
-// - GCC: https://gcc.gnu.org/onlinedocs/gcc/Attribute-Syntax.html
-//        (see Clang attribute docs as well)
-//
-// References for standard C++ language conformance (and minimum versions):
-// - Clang: https://clang.llvm.org/cxx_status.html
-// - GCC: https://gcc.gnu.org/projects/cxx-status.html
-// - MSVC: https://docs.microsoft.com/en-us/cpp/overview/visual-cpp-language-conformance
-//
-// Historical release notes (which can help to determine minimum versions):
-// - Clang: https://releases.llvm.org/
-// - GCC: https://gcc.gnu.org/releases.html
-// - MSVC: https://docs.microsoft.com/en-us/visualstudio/releases/2019/release-notes-history
-//         https://docs.microsoft.com/en-us/visualstudio/releasenotes/vs2017-relnotes-history
-
-// Portable fallbacks for C++20 feature test macros:
-// https://en.cppreference.com/w/cpp/feature_test
-#ifndef __has_cpp_attribute
-#define __has_cpp_attribute(x) 0
-#define PROTOBUF_has_cpp_attribute_DEFINED_
-#endif
-
-// Portable fallback for Clang's __has_feature macro:
-// https://clang.llvm.org/docs/LanguageExtensions.html#has-feature-and-has-extension
-#ifndef __has_feature
-#define __has_feature(x) 0
-#define PROTOBUF_has_feature_DEFINED_
-#endif
-
-// Portable fallback for Clang's __has_warning macro:
-#ifndef __has_warning
-#define __has_warning(x) 0
-#define PROTOBUF_has_warning_DEFINED_
-#endif
-
-// Portable fallbacks for the __has_attribute macro (GCC and Clang):
-// https://clang.llvm.org/docs/LanguageExtensions.html#has-attribute
-// https://gcc.gnu.org/onlinedocs/cpp/_005f_005fhas_005fattribute.html
-#ifndef __has_attribute
-#define __has_attribute(x) 0
-#define PROTOBUF_has_attribute_DEFINED_
-#endif
-
-// Portable fallback for __has_builtin (GCC and Clang):
-// https://clang.llvm.org/docs/LanguageExtensions.html#has-builtin
-// https://gcc.gnu.org/onlinedocs/cpp/_005f_005fhas_005fbuiltin.html
-#ifndef __has_builtin
-#define __has_builtin(x) 0
-#define PROTOBUF_has_builtin_DEFINED_
-#endif
-
-// Portable PROTOBUF_BUILTIN_BSWAPxx definitions
-// Code must check for availability, e.g.: `defined(PROTOBUF_BUILTIN_BSWAP32)`
-#ifdef PROTOBUF_BUILTIN_BSWAP16
-#error PROTOBUF_BUILTIN_BSWAP16 was previously defined
-#endif
-#ifdef PROTOBUF_BUILTIN_BSWAP32
-#error PROTOBUF_BUILTIN_BSWAP32 was previously defined
-#endif
-#ifdef PROTOBUF_BUILTIN_BSWAP64
-#error PROTOBUF_BUILTIN_BSWAP64 was previously defined
-#endif
-#if defined(__GNUC__) || __has_builtin(__builtin_bswap16)
-#define PROTOBUF_BUILTIN_BSWAP16(x) __builtin_bswap16(x)
-#endif
-#if defined(__GNUC__) || __has_builtin(__builtin_bswap32)
-#define PROTOBUF_BUILTIN_BSWAP32(x) __builtin_bswap32(x)
-#endif
-#if defined(__GNUC__) || __has_builtin(__builtin_bswap64)
-#define PROTOBUF_BUILTIN_BSWAP64(x) __builtin_bswap64(x)
-#endif
-
-// Portable check for GCC minimum version:
-// https://gcc.gnu.org/onlinedocs/cpp/Common-Predefined-Macros.html
-#if defined(__GNUC__) && defined(__GNUC_MINOR__) \
-    && defined(__GNUC_PATCHLEVEL__)
-#  define PROTOBUF_GNUC_MIN(x, y) \
-  (__GNUC__ > (x) || __GNUC__ == (x) && __GNUC_MINOR__ >= (y))
-#else
-#  define PROTOBUF_GNUC_MIN(x, y) 0
-#endif
-
-// Portable check for MSVC minimum version:
-// https://docs.microsoft.com/en-us/cpp/preprocessor/predefined-macros
-#if defined(_MSC_VER)
-#define PROTOBUF_MSC_VER_MIN(x) (_MSC_VER >= x)
-#else
-#define PROTOBUF_MSC_VER_MIN(x) 0
-#endif
-
-// Portable check for minimum C++ language version:
-// https://en.cppreference.com/w/cpp/preprocessor/replace
-// https://docs.microsoft.com/en-us/cpp/preprocessor/predefined-macros
-#if !defined(_MSVC_LANG)
-#define PROTOBUF_CPLUSPLUS_MIN(x) (__cplusplus >= x)
-#else
-#define PROTOBUF_CPLUSPLUS_MIN(x) (_MSVC_LANG >= x)
-#endif
-
-// Future versions of protobuf will include breaking changes to some APIs.
-// This macro can be set to enable these API changes ahead of time, so that
-// user code can be updated before upgrading versions of protobuf.
-// PROTOBUF_FUTURE_FINAL is used on classes that are historically not marked as
-// final, but that may be marked final in future (breaking) releases.
-// #define PROTOBUF_FUTURE_BREAKING_CHANGES 1
-// #define PROTOBUF_FUTURE_FINAL final
-#define PROTOBUF_FUTURE_FINAL
-
-#ifdef PROTOBUF_VERSION
-#error PROTOBUF_VERSION was previously defined
-#endif
-#define PROTOBUF_VERSION 3021012
-
-#ifdef PROTOBUF_MIN_HEADER_VERSION_FOR_PROTOC
-#error PROTOBUF_MIN_HEADER_VERSION_FOR_PROTOC was previously defined
-#endif
-#define PROTOBUF_MIN_HEADER_VERSION_FOR_PROTOC 3021000
-
-#ifdef PROTOBUF_MIN_PROTOC_VERSION
-#error PROTOBUF_MIN_PROTOC_VERSION was previously defined
-#endif
-#define PROTOBUF_MIN_PROTOC_VERSION 3021000
-
-#ifdef PROTOBUF_VERSION_SUFFIX
-#error PROTOBUF_VERSION_SUFFIX was previously defined
-#endif
-#define PROTOBUF_VERSION_SUFFIX ""
-
-#if defined(PROTOBUF_NAMESPACE) || defined(PROTOBUF_NAMESPACE_ID)
-#error PROTOBUF_NAMESPACE or PROTOBUF_NAMESPACE_ID was previously defined
-#endif
-#define PROTOBUF_NAMESPACE "google::protobuf"
-#define PROTOBUF_NAMESPACE_ID google::protobuf
-#define PROTOBUF_NAMESPACE_OPEN \
-  namespace google {            \
-  namespace protobuf {
-#define PROTOBUF_NAMESPACE_CLOSE \
-  } /* namespace protobuf */     \
-  } /* namespace google */
-
-#ifdef PROTOBUF_ALWAYS_INLINE
-#error PROTOBUF_ALWAYS_INLINE was previously defined
-#endif
-// For functions we want to force inline.
-#if defined(PROTOBUF_NO_INLINE)
-# define PROTOBUF_ALWAYS_INLINE
-#elif PROTOBUF_GNUC_MIN(3, 1)
-# define PROTOBUF_ALWAYS_INLINE __attribute__((always_inline))
-#elif defined(_MSC_VER)
-# define PROTOBUF_ALWAYS_INLINE __forceinline
-#else
-# define PROTOBUF_ALWAYS_INLINE
-#endif
-
-#ifdef PROTOBUF_NDEBUG_INLINE
-#error PROTOBUF_NDEBUG_INLINE was previously defined
-#endif
-// Avoid excessive inlining in non-optimized builds. Without other optimizations
-// the inlining is not going to provide benefits anyway and the huge resulting
-// functions, especially in the proto-generated serialization functions, produce
-// stack frames so large that many tests run into stack overflows (b/32192897).
-#if defined(NDEBUG) || (defined(_MSC_VER) && !defined(_DEBUG))
-# define PROTOBUF_NDEBUG_INLINE PROTOBUF_ALWAYS_INLINE
-#else
-# define PROTOBUF_NDEBUG_INLINE
-#endif
-
-// Note that PROTOBUF_NOINLINE is an attribute applied to functions, to prevent
-// them from being inlined by the compiler. This is different from
-// PROTOBUF_NO_INLINE, which is a user-supplied macro that disables forced
-// inlining by PROTOBUF_(ALWAYS|NDEBUG)_INLINE.
-#ifdef PROTOBUF_NOINLINE
-#error PROTOBUF_NOINLINE was previously defined
-#endif
-#if PROTOBUF_GNUC_MIN(3, 1)
-# define PROTOBUF_NOINLINE __attribute__((noinline))
-#elif defined(_MSC_VER)
-// Seems to have been around since at least Visual Studio 2005
-# define PROTOBUF_NOINLINE __declspec(noinline)
-#endif
-
-#ifdef PROTOBUF_MUSTTAIL
-#error PROTOBUF_MUSTTAIL was previously defined
-#endif
-#ifdef PROTOBUF_TAILCALL
-#error PROTOBUF_TAILCALL was previously defined
-#endif
-#if __has_cpp_attribute(clang::musttail) && !defined(__arm__) && \
-    !defined(_ARCH_PPC) && !defined(__wasm__) &&                 \
-    !(defined(_MSC_VER) && defined(_M_IX86)) &&                  \
-    !(defined(__NDK_MAJOR__) && __NDK_MAJOR <= 24)
-#  ifndef PROTO2_OPENSOURCE
-// Compilation fails on ARM32: b/195943306
-// Compilation fails on powerpc64le: b/187985113
-// Compilation fails on X86 Windows:
-// https://github.com/llvm/llvm-project/issues/53271
-#  endif
-#define PROTOBUF_MUSTTAIL [[clang::musttail]]
-#define PROTOBUF_TAILCALL true
-#else
-#define PROTOBUF_MUSTTAIL
-#define PROTOBUF_TAILCALL false
-#endif
-
-#ifdef PROTOBUF_EXCLUSIVE_LOCKS_REQUIRED
-#error PROTOBUF_EXCLUSIVE_LOCKS_REQUIRED was previously defined
-#endif
-#if __has_attribute(exclusive_locks_required)
-#define PROTOBUF_EXCLUSIVE_LOCKS_REQUIRED(...) \
-  __attribute__((exclusive_locks_required(__VA_ARGS__)))
-#else
-#define PROTOBUF_EXCLUSIVE_LOCKS_REQUIRED(...)
-#endif
-
-#ifdef PROTOBUF_NO_THREAD_SAFETY_ANALYSIS
-#error PROTOBUF_NO_THREAD_SAFETY_ANALYSIS was previously defined
-#endif
-#if __has_attribute(no_thread_safety_analysis)
-#define PROTOBUF_NO_THREAD_SAFETY_ANALYSIS \
-  __attribute__((no_thread_safety_analysis))
-#else
-#define PROTOBUF_NO_THREAD_SAFETY_ANALYSIS
-#endif
-
-#ifdef PROTOBUF_GUARDED_BY
-#error PROTOBUF_GUARDED_BY was previously defined
-#endif
-#if __has_attribute(guarded_by)
-#define PROTOBUF_GUARDED_BY(x) __attribute__((guarded_by(x)))
-#else
-#define PROTOBUF_GUARDED_BY(x)
-#endif
-
-#ifdef PROTOBUF_LOCKS_EXCLUDED
-#error PROTOBUF_LOCKS_EXCLUDED was previously defined
-#endif
-#if __has_attribute(locks_excluded)
-#define PROTOBUF_LOCKS_EXCLUDED(...) \
-  __attribute__((locks_excluded(__VA_ARGS__)))
-#else
-#define PROTOBUF_LOCKS_EXCLUDED(...)
-#endif
-
-#ifdef PROTOBUF_COLD
-#error PROTOBUF_COLD was previously defined
-#endif
-#if __has_attribute(cold) || PROTOBUF_GNUC_MIN(4, 3)
-# define PROTOBUF_COLD __attribute__((cold))
-#else
-# define PROTOBUF_COLD
-#endif
-
-#ifdef PROTOBUF_SECTION_VARIABLE
-#error PROTOBUF_SECTION_VARIABLE was previously defined
-#endif
-#if (__has_attribute(section) || defined(__GNUC__)) && defined(__ELF__)
-// Place a variable in the given ELF section.
-# define PROTOBUF_SECTION_VARIABLE(x) __attribute__((section(#x)))
-#else
-# define PROTOBUF_SECTION_VARIABLE(x)
-#endif
-
-#if defined(PROTOBUF_DEPRECATED)
-#error PROTOBUF_DEPRECATED was previously defined
-#endif
-#if defined(PROTOBUF_DEPRECATED_MSG)
-#error PROTOBUF_DEPRECATED_MSG was previously defined
-#endif
-#if __has_attribute(deprecated) || PROTOBUF_GNUC_MIN(3, 0)
-# define PROTOBUF_DEPRECATED __attribute__((deprecated))
-# define PROTOBUF_DEPRECATED_MSG(msg) __attribute__((deprecated(msg)))
-#elif defined(_MSC_VER)
-# define PROTOBUF_DEPRECATED __declspec(deprecated)
-# define PROTOBUF_DEPRECATED_MSG(msg) __declspec(deprecated(msg))
-#else
-# define PROTOBUF_DEPRECATED
-# define PROTOBUF_DEPRECATED_MSG(msg)
-#endif
-
-#if defined(PROTOBUF_DEPRECATED_ENUM)
-#error PROTOBUF_DEPRECATED_ENUM was previously defined
-#endif
-#if defined(__clang__) || PROTOBUF_GNUC_MIN(6, 0)
-// https://gcc.gnu.org/gcc-6/changes.html
-# define PROTOBUF_DEPRECATED_ENUM __attribute__((deprecated))
-#else
-# define PROTOBUF_DEPRECATED_ENUM
-#endif
-
-#ifdef PROTOBUF_FUNC_ALIGN
-#error PROTOBUF_FUNC_ALIGN was previously defined
-#endif
-#if __has_attribute(aligned) || PROTOBUF_GNUC_MIN(4, 3)
-#define PROTOBUF_FUNC_ALIGN(bytes) __attribute__((aligned(bytes)))
-#else
-#define PROTOBUF_FUNC_ALIGN(bytes)
-#endif
-
-#ifdef PROTOBUF_RETURNS_NONNULL
-#error PROTOBUF_RETURNS_NONNULL was previously defined
-#endif
-#if __has_attribute(returns_nonnull) || PROTOBUF_GNUC_MIN(4, 9)
-#define PROTOBUF_RETURNS_NONNULL __attribute__((returns_nonnull))
-#else
-#define PROTOBUF_RETURNS_NONNULL
-#endif
-
-#ifdef PROTOBUF_ATTRIBUTE_REINITIALIZES
-#error PROTOBUF_ATTRIBUTE_REINITIALIZES was previously defined
-#endif
-#if __has_cpp_attribute(clang::reinitializes)
-#define PROTOBUF_ATTRIBUTE_REINITIALIZES [[clang::reinitializes]]
-#else
-#define PROTOBUF_ATTRIBUTE_REINITIALIZES
-#endif
-
-// The minimum library version which works with the current version of the
-// headers.
-#define GOOGLE_PROTOBUF_MIN_LIBRARY_VERSION 3021000
-
-#ifdef PROTOBUF_RTTI
-#error PROTOBUF_RTTI was previously defined
-#endif
-#if defined(GOOGLE_PROTOBUF_NO_RTTI) && GOOGLE_PROTOBUF_NO_RTTI
-// A user-provided definition GOOGLE_PROTOBUF_NO_RTTI=1 disables RTTI.
-#define PROTOBUF_RTTI 0
-#elif defined(__cpp_rtti)
-// https://en.cppreference.com/w/cpp/feature_test
-#define PROTOBUF_RTTI 1
-#elif __has_feature(cxx_rtti)
-// https://clang.llvm.org/docs/LanguageExtensions.html#c-rtti
-#define PROTOBUF_RTTI 1
-#elif defined(__GXX_RTTI)
-// https://gcc.gnu.org/onlinedocs/cpp/Common-Predefined-Macros.html
-#define PROTOBUF_RTTI 1
-#elif defined(_CPPRTTI)
-// https://docs.microsoft.com/en-us/cpp/build/reference/gr-enable-run-time-type-information
-#define PROTOBUF_RTTI 1
-#else
-#define PROTOBUF_RTTI 0
-#endif
-
-// Returns the offset of the given field within the given aggregate type.
-// This is equivalent to the ANSI C offsetof() macro.  However, according
-// to the C++ standard, offsetof() only works on POD types, and GCC
-// enforces this requirement with a warning.  In practice, this rule is
-// unnecessarily strict; there is probably no compiler or platform on
-// which the offsets of the direct fields of a class are non-constant.
-// Fields inherited from superclasses *can* have non-constant offsets,
-// but that's not what this macro will be used for.
-#ifdef PROTOBUF_FIELD_OFFSET
-#error PROTOBUF_FIELD_OFFSET was previously defined
-#endif
-#if defined(__clang__)
-// For Clang we use __builtin_offsetof() and suppress the warning,
-// to avoid Control Flow Integrity and UBSan vptr sanitizers from
-// crashing while trying to validate the invalid reinterpret_casts.
-#define PROTOBUF_FIELD_OFFSET(TYPE, FIELD)                   \
-  _Pragma("clang diagnostic push")                           \
-  _Pragma("clang diagnostic ignored \"-Winvalid-offsetof\"") \
-  __builtin_offsetof(TYPE, FIELD)                            \
-  _Pragma("clang diagnostic pop")
-#elif PROTOBUF_GNUC_MIN(4, 8)
-#define PROTOBUF_FIELD_OFFSET(TYPE, FIELD) __builtin_offsetof(TYPE, FIELD)
-#else  // defined(__clang__)
-// Note that we calculate relative to the pointer value 16 here since if we
-// just use zero, GCC complains about dereferencing a NULL pointer.  We
-// choose 16 rather than some other number just in case the compiler would
-// be confused by an unaligned pointer.
-#define PROTOBUF_FIELD_OFFSET(TYPE, FIELD)                                \
-  static_cast< ::uint32_t>(reinterpret_cast<const char*>(                   \
-                             &reinterpret_cast<const TYPE*>(16)->FIELD) - \
-                         reinterpret_cast<const char*>(16))
-#endif
-
-#ifdef PROTOBUF_EXPORT
-#error PROTOBUF_EXPORT was previously defined
-#endif
-
-#if defined(PROTOBUF_USE_DLLS) && defined(_MSC_VER)
-# if defined(LIBPROTOBUF_EXPORTS)
-#  define PROTOBUF_EXPORT __declspec(dllexport)
-#  define PROTOBUF_EXPORT_TEMPLATE_DECLARE
-#  define PROTOBUF_EXPORT_TEMPLATE_DEFINE __declspec(dllexport)
-# else
-#  define PROTOBUF_EXPORT __declspec(dllimport)
-#  define PROTOBUF_EXPORT_TEMPLATE_DECLARE
-#  define PROTOBUF_EXPORT_TEMPLATE_DEFINE __declspec(dllimport)
-# endif  // defined(LIBPROTOBUF_EXPORTS)
-#elif defined(PROTOBUF_USE_DLLS) && defined(LIBPROTOBUF_EXPORTS)
-# define PROTOBUF_EXPORT __attribute__((visibility("default")))
-# define PROTOBUF_EXPORT_TEMPLATE_DECLARE __attribute__((visibility("default")))
-# define PROTOBUF_EXPORT_TEMPLATE_DEFINE
-#else
-# define PROTOBUF_EXPORT
-# define PROTOBUF_EXPORT_TEMPLATE_DECLARE
-# define PROTOBUF_EXPORT_TEMPLATE_DEFINE
-#endif
-
-#ifdef PROTOC_EXPORT
-#error PROTOC_EXPORT was previously defined
-#endif
-
-#if defined(PROTOBUF_USE_DLLS) && defined(_MSC_VER)
-# if defined(LIBPROTOC_EXPORTS)
-#  define PROTOC_EXPORT __declspec(dllexport)
-# else
-#  define PROTOC_EXPORT __declspec(dllimport)
-# endif  // defined(LIBPROTOC_EXPORTS)
-#elif defined(PROTOBUF_USE_DLLS) && defined(LIBPROTOC_EXPORTS)
-# define PROTOC_EXPORT __attribute__((visibility("default")))
-#else
-# define PROTOC_EXPORT
-#endif
-
-#if defined(PROTOBUF_PREDICT_TRUE) || defined(PROTOBUF_PREDICT_FALSE)
-#error PROTOBUF_PREDICT_(TRUE|FALSE) was previously defined
-#endif
-#if PROTOBUF_GNUC_MIN(3, 0)
-# define PROTOBUF_PREDICT_TRUE(x) (__builtin_expect(false || (x), true))
-# define PROTOBUF_PREDICT_FALSE(x) (__builtin_expect(false || (x), false))
-#else
-# define PROTOBUF_PREDICT_TRUE(x) (x)
-# define PROTOBUF_PREDICT_FALSE(x) (x)
-#endif
-
-#ifdef PROTOBUF_NODISCARD
-#error PROTOBUF_NODISCARD was previously defined
-#endif
-#if __has_cpp_attribute(nodiscard) && PROTOBUF_CPLUSPLUS_MIN(201703L)
-#define PROTOBUF_NODISCARD [[nodiscard]]
-#elif __has_attribute(warn_unused_result) || PROTOBUF_GNUC_MIN(4, 8)
-#define PROTOBUF_NODISCARD __attribute__((warn_unused_result))
-#else
-#define PROTOBUF_NODISCARD
-#endif
-
-// Enable all stable experiments if this flag is set.  This allows us to group
-// all of these experiments under a single build flag, which can be enabled in
-// the protobuf.stable-experiments TAP project.
-#ifdef PROTOBUF_ENABLE_STABLE_EXPERIMENTS
-#define PROTOBUF_FORCE_MESSAGE_OWNED_ARENA
-#endif  // !PROTOBUF_ENABLE_STABLE_EXPERIMENTS
-
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-#error PROTOBUF_FORCE_COPY_IN_RELEASE was previously defined
-#endif
-
-#ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-#error PROTOBUF_FORCE_COPY_IN_SWAP was previously defined
-#endif
-
-#ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-#error PROTOBUF_FORCE_COPY_IN_MOVE was previously defined
-#endif
-
-#ifdef PROTOBUF_FORCE_RESET_IN_CLEAR
-#error PROTOBUF_FORCE_RESET_IN_CLEAR was previously defined
-#endif
-
-// Force copy the default string to a string field so that non-optimized builds
-// have harder-to-rely-on address stability.
-#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-#error PROTOBUF_FORCE_COPY_DEFAULT_STRING was previously defined
-#endif
-
-#ifdef PROTOBUF_FALLTHROUGH_INTENDED
-#error PROTOBUF_FALLTHROUGH_INTENDED was previously defined
-#endif
-#if __has_cpp_attribute(fallthrough)
-#define PROTOBUF_FALLTHROUGH_INTENDED [[fallthrough]]
-#elif __has_feature(cxx_attributes) && __has_warning("-Wimplicit-fallthrough")
-#define PROTOBUF_FALLTHROUGH_INTENDED [[clang::fallthrough]]
-#elif PROTOBUF_GNUC_MIN(7, 0)
-#define PROTOBUF_FALLTHROUGH_INTENDED [[gnu::fallthrough]]
-#else
-#define PROTOBUF_FALLTHROUGH_INTENDED
-#endif
-
-// PROTOBUF_ASSUME(pred) tells the compiler that it can assume pred is true. To
-// be safe, we also validate the assumption with a GOOGLE_DCHECK in unoptimized
-// builds. The macro does not do anything useful if the compiler does not
-// support __builtin_assume.
-#ifdef PROTOBUF_ASSUME
-#error PROTOBUF_ASSUME was previously defined
-#endif
-#if __has_builtin(__builtin_assume)
-#define PROTOBUF_ASSUME(pred) \
-  GOOGLE_DCHECK(pred);               \
-  __builtin_assume(pred)
-#else
-#define PROTOBUF_ASSUME(pred) GOOGLE_DCHECK(pred)
-#endif
-
-// Specify memory alignment for structs, classes, etc.
-// Use like:
-//   class PROTOBUF_ALIGNAS(16) MyClass { ... }
-//   PROTOBUF_ALIGNAS(16) int array[4];
-//
-// In most places you can use the C++11 keyword "alignas", which is preferred.
-//
-// But compilers have trouble mixing __attribute__((...)) syntax with
-// alignas(...) syntax.
-//
-// Doesn't work in clang or gcc:
-//   struct alignas(16) __attribute__((packed)) S { char c; };
-// Works in clang but not gcc:
-//   struct __attribute__((packed)) alignas(16) S2 { char c; };
-// Works in clang and gcc:
-//   struct alignas(16) S3 { char c; } __attribute__((packed));
-//
-// There are also some attributes that must be specified *before* a class
-// definition: visibility (used for exporting functions/classes) is one of
-// these attributes. This means that it is not possible to use alignas() with a
-// class that is marked as exported.
-#ifdef PROTOBUF_ALIGNAS
-#error PROTOBUF_ALIGNAS was previously defined
-#endif
-#if defined(_MSC_VER)
-#define PROTOBUF_ALIGNAS(byte_alignment) __declspec(align(byte_alignment))
-#elif PROTOBUF_GNUC_MIN(3, 0)
-#define PROTOBUF_ALIGNAS(byte_alignment) \
-  __attribute__((aligned(byte_alignment)))
-#else
-#define PROTOBUF_ALIGNAS(byte_alignment) alignas(byte_alignment)
-#endif
-
-#ifdef PROTOBUF_FINAL
-#error PROTOBUF_FINAL was previously defined
-#endif
-#define PROTOBUF_FINAL final
-
-#ifdef PROTOBUF_THREAD_LOCAL
-#error PROTOBUF_THREAD_LOCAL was previously defined
-#endif
-#if defined(_MSC_VER)
-#define PROTOBUF_THREAD_LOCAL __declspec(thread)
-#else
-#define PROTOBUF_THREAD_LOCAL __thread
-#endif
-
-// TODO(b/228173843): cleanup PROTOBUF_LITTLE_ENDIAN in various 3p forks.
-#if (defined(__BYTE_ORDER__) && defined(__ORDER_LITTLE_ENDIAN__) && \
-     __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
-#define PROTOBUF_LITTLE_ENDIAN 1
-#ifdef PROTOBUF_BIG_ENDIAN
-#error Conflicting PROTOBUF_BIG_ENDIAN was previously defined
-#endif
-#elif defined(__BYTE_ORDER__) && defined(__ORDER_BIG_ENDIAN__) && \
-    __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
-#define PROTOBUF_BIG_ENDIAN 1
-#elif defined(_WIN32) || defined(__x86_64__) || defined(__aarch64__)
-#define PROTOBUF_LITTLE_ENDIAN 1
-#else
-#error "endian detection failed for current compiler"
-#endif
-
-// For enabling message owned arena, one major blocker is semantic change from
-// moving to copying when there is ownership transfer (e.g., move ctor, swap,
-// set allocated, release). This change not only causes performance regression
-// but also breaks users code (e.g., dangling reference). For top-level
-// messages, since it owns the arena, we can mitigate the issue by transferring
-// ownership of arena. However, we cannot do that for nested messages. In order
-// to tell how many usages of nested messages affected by message owned arena,
-// we need to simulate the arena ownership.
-// This experiment is purely for the purpose of gathering data. All code guarded
-// by this flag is supposed to be removed after this experiment.
-#define PROTOBUF_MESSAGE_OWNED_ARENA_EXPERIMENT
-#ifdef PROTOBUF_CONSTINIT
-#error PROTOBUF_CONSTINIT was previously defined
-#endif
-#if defined(__cpp_constinit) && !defined(_MSC_VER)
-#define PROTOBUF_CONSTINIT constinit
-#define PROTOBUF_CONSTEXPR constexpr
-// Some older Clang versions incorrectly raise an error about
-// constant-initializing weak default instance pointers. Versions 12.0 and
-// higher seem to work, except that XCode 12.5.1 shows the error even though it
-// uses Clang 12.0.5.
-// Clang-cl on Windows raises error also.
-#elif !defined(_MSC_VER) && __has_cpp_attribute(clang::require_constant_initialization) && \
-    ((defined(__APPLE__) && __clang_major__ >= 13) ||                \
-     (!defined(__APPLE__) && __clang_major__ >= 12))
-#define PROTOBUF_CONSTINIT [[clang::require_constant_initialization]]
-#define PROTOBUF_CONSTEXPR constexpr
-#elif PROTOBUF_GNUC_MIN(12, 2)
-#define PROTOBUF_CONSTINIT __constinit
-#define PROTOBUF_CONSTEXPR constexpr
-// MSVC 17 currently seems to raise an error about constant-initialized pointers.
-#elif defined(_MSC_VER) && _MSC_VER >= 1930
-#define PROTOBUF_CONSTINIT
-#define PROTOBUF_CONSTEXPR constexpr
-#else
-#define PROTOBUF_CONSTINIT
-#define PROTOBUF_CONSTEXPR
-#endif
-
-// Some globals with an empty non-trivial destructor are annotated with
-// no_destroy for performance reasons. It reduces the cost of these globals in
-// non-opt mode and under sanitizers.
-#ifdef PROTOBUF_ATTRIBUTE_NO_DESTROY
-#error PROTOBUF_ATTRIBUTE_NO_DESTROY was previously defined
-#endif
-#if __has_cpp_attribute(clang::no_destroy)
-#define PROTOBUF_ATTRIBUTE_NO_DESTROY [[clang::no_destroy]]
-#else
-#define PROTOBUF_ATTRIBUTE_NO_DESTROY
-#endif
-
-// Force clang to always emit complete debug info for a type.
-// Clang uses constructor homing to determine when to emit debug info for a
-// type. If the constructor of a type is never used, which can happen in some
-// cases where member variables are constructed in place for optimization
-// purposes (see b/208803175 for an example), the type will have incomplete
-// debug info unless this attribute is used.
-#ifdef PROTOBUF_ATTRIBUTE_STANDALONE_DEBUG
-#error PROTOBUF_ATTRIBUTE_STANDALONE_DEBUG was previously defined
-#endif
-#if __has_cpp_attribute(clang::standalone_debug)
-#define PROTOBUF_ATTRIBUTE_STANDALONE_DEBUG [[clang::standalone_debug]]
-#else
-#define PROTOBUF_ATTRIBUTE_STANDALONE_DEBUG
-#endif
-
-// Protobuf extensions and reflection require registration of the protos linked
-// in the binary. Not until everything is registered does the runtime have a
-// complete view on all protos. When code is using reflection or extensions
-// in between registration calls this can lead to surprising behavior. By
-// having the registration run first we mitigate this scenario.
-// Highest priority is 101. We use 102 for registration, to allow code that
-// really wants to higher priority to still beat us. Some initialization happens
-// at higher priority, though, since it is needed before registration.
-#ifdef PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-#error PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 was previously defined
-#endif
-#ifdef PROTOBUF_ATTRIBUTE_INIT_PRIORITY2
-#error PROTOBUF_ATTRIBUTE_INIT_PRIORITY2 was previously defined
-#endif
-#if PROTOBUF_GNUC_MIN(3, 0) && (!defined(__APPLE__) || defined(__clang__)) && \
-    !((defined(sun) || defined(__sun)) &&                                     \
-      (defined(__SVR4) || defined(__svr4__)))
-#define PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 __attribute__((init_priority((101))))
-#define PROTOBUF_ATTRIBUTE_INIT_PRIORITY2 __attribute__((init_priority((102))))
-#else
-#define PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-#define PROTOBUF_ATTRIBUTE_INIT_PRIORITY2
-#endif
-
-#ifdef PROTOBUF_PRAGMA_INIT_SEG
-#error PROTOBUF_PRAGMA_INIT_SEG was previously defined
-#endif
-#ifdef _MSC_VER
-#define PROTOBUF_PRAGMA_INIT_SEG __pragma(init_seg(lib))
-#else
-#define PROTOBUF_PRAGMA_INIT_SEG
-#endif
-
-#ifdef PROTOBUF_ATTRIBUTE_WEAK
-#error PROTOBUF_ATTRIBUTE_WEAK was previously defined
-#endif
-#if __has_attribute(weak) && \
-    !defined(__APPLE__) && \
-    (!defined(_WIN32) || __clang_major__ < 9) && \
-    !defined(__MINGW32__)
-#define PROTOBUF_ATTRIBUTE_WEAK __attribute__((weak))
-#define PROTOBUF_HAVE_ATTRIBUTE_WEAK 1
-#else
-#define PROTOBUF_ATTRIBUTE_WEAK
-#define PROTOBUF_HAVE_ATTRIBUTE_WEAK 0
-#endif
-
-// Macros to detect sanitizers.
-#ifdef PROTOBUF_ASAN
-#error PROTOBUF_ASAN was previously defined
-#endif
-#ifdef PROTOBUF_MSAN
-#error PROTOBUF_MSAN was previously defined
-#endif
-#ifdef PROTOBUF_TSAN
-#error PROTOBUF_TSAN was previously defined
-#endif
-#if defined(__clang__)
-#  if __has_feature(address_sanitizer)
-#    define PROTOBUF_ASAN 1
-#  endif
-#  if __has_feature(thread_sanitizer)
-#    define PROTOBUF_TSAN 1
-#  endif
-#  if __has_feature(memory_sanitizer)
-#    define PROTOBUF_MSAN 1
-#  endif
-#elif PROTOBUF_GNUC_MIN(3, 0)
-// Double-guard is needed for -Wundef:
-#  ifdef __SANITIZE_ADDRESS__
-#  if    __SANITIZE_ADDRESS__
-#    define PROTOBUF_ASAN 1
-#  endif
-#  endif
-#  ifdef __SANITIZE_THREAD__
-#  if    __SANITIZE_THREAD__
-#    define PROTOBUF_TSAN 1
-#  endif
-#  endif
-#endif
-
-// Tail call table-driven parsing can be enabled by defining
-// PROTOBUF_EXPERIMENTAL_USE_TAIL_CALL_TABLE_PARSER at compilation time. Note
-// that this macro is for small-scale testing only, and is not supported.
-#ifdef PROTOBUF_TAIL_CALL_TABLE_PARSER_ENABLED
-#error PROTOBUF_TAIL_CALL_TABLE_PARSER_ENABLED was previously declared
-#endif
-#if defined(PROTOBUF_EXPERIMENTAL_USE_TAIL_CALL_TABLE_PARSER)
-#define PROTOBUF_TAIL_CALL_TABLE_PARSER_ENABLED 1
-#endif
-
-#define PROTOBUF_TC_PARAM_DECL                                 \
-  ::google::protobuf::MessageLite *msg, const char *ptr,                 \
-      ::google::protobuf::internal::ParseContext *ctx,                   \
-      const ::google::protobuf::internal::TcParseTableBase *table,       \
-      uint64_t hasbits, ::google::protobuf::internal::TcFieldData data
-
-#ifdef PROTOBUF_UNUSED
-#error PROTOBUF_UNUSED was previously defined
-#endif
-#if __has_cpp_attribute(maybe_unused) || \
-    (PROTOBUF_MSC_VER_MIN(1911) && PROTOBUF_CPLUSPLUS_MIN(201703L))
-#define PROTOBUF_UNUSED [[maybe_unused]]
-#elif __has_attribute(unused) || PROTOBUF_GNUC_MIN(3, 0)
-#define PROTOBUF_UNUSED __attribute__((__unused__))
-#else
-#define PROTOBUF_UNUSED
-#endif
-
-// ThreadSafeArenaz is turned off completely in opensource builds.
-
-// Windows declares several inconvenient macro names.  We #undef them and then
-// restore them in port_undef.inc.
-#ifdef _MSC_VER
-#pragma push_macro("CREATE_NEW")
-#undef CREATE_NEW
-#pragma push_macro("DELETE")
-#undef DELETE
-#pragma push_macro("DOUBLE_CLICK")
-#undef DOUBLE_CLICK
-#pragma push_macro("ERROR")
-#undef ERROR
-#pragma push_macro("ERROR_BUSY")
-#undef ERROR_BUSY
-#pragma push_macro("ERROR_INSTALL_FAILED")
-#undef ERROR_INSTALL_FAILED
-#pragma push_macro("ERROR_NOT_FOUND")
-#undef ERROR_NOT_FOUND
-#pragma push_macro("GetClassName")
-#undef GetClassName
-#pragma push_macro("GetMessage")
-#undef GetMessage
-#pragma push_macro("GetObject")
-#undef GetObject
-#pragma push_macro("IGNORE")
-#undef IGNORE
-#pragma push_macro("IN")
-#undef IN
-#pragma push_macro("INPUT_KEYBOARD")
-#undef INPUT_KEYBOARD
-#pragma push_macro("NO_ERROR")
-#undef NO_ERROR
-#pragma push_macro("OUT")
-#undef OUT
-#pragma push_macro("OPTIONAL")
-#undef OPTIONAL
-#pragma push_macro("min")
-#undef min
-#pragma push_macro("max")
-#undef max
-#pragma push_macro("NEAR")
-#undef NEAR
-#pragma push_macro("NO_DATA")
-#undef NO_DATA
-#pragma push_macro("REASON_UNKNOWN")
-#undef REASON_UNKNOWN
-#pragma push_macro("SERVICE_DISABLED")
-#undef SERVICE_DISABLED
-#pragma push_macro("SEVERITY_ERROR")
-#undef SEVERITY_ERROR
-#pragma push_macro("STATUS_PENDING")
-#undef STATUS_PENDING
-#pragma push_macro("STRICT")
-#undef STRICT
-#pragma push_macro("timezone")
-#undef timezone
-#endif  // _MSC_VER
-
-#ifdef __APPLE__
-// Inconvenient macro names from usr/include/math.h in some macOS SDKs.
-#pragma push_macro("DOMAIN")
-#undef DOMAIN
-// Inconvenient macro names from /usr/include/mach/boolean.h in some macOS SDKs.
-#pragma push_macro("TRUE")
-#undef TRUE
-#pragma push_macro("FALSE")
-#undef FALSE
-// Inconvenient macro names from usr/include/sys/syslimits.h in some macOS SDKs.
-#pragma push_macro("UID_MAX")
-#undef UID_MAX
-#endif  // __APPLE__
-
-#if defined(__clang__) || PROTOBUF_GNUC_MIN(3, 0) || defined(_MSC_VER)
-// Don't let Objective-C Macros interfere with proto identifiers with the same
-// name.
-#pragma push_macro("DEBUG")
-#undef DEBUG
-#endif // defined(__clang__) || PROTOBUF_GNUC_MIN(3, 0) || defined(_MSC_VER)
-
-#if PROTOBUF_GNUC_MIN(3, 0)
-// GCC does not allow disabling diagnostics within an expression:
-// https://gcc.gnu.org/bugzilla/show_bug.cgi?id=60875, so we disable this one
-// globally even though it's only used for PROTOBUF_FIELD_OFFSET.
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Winvalid-offsetof"
-#endif
-
-// Silence some MSVC warnings in all our code.
-#ifdef _MSC_VER
-#pragma warning(push)
-// For non-trivial unions
-#pragma warning(disable : 4582)
-#pragma warning(disable : 4583)
-// For init_seg(lib)
-#pragma warning(disable : 4073)
-// To silence the fact that we will pop this push from another file
-#pragma warning(disable : 5031)
-// Conditional expression is constant
-#pragma warning(disable: 4127)
-// decimal digit terminates octal escape sequence
-#pragma warning(disable: 4125)
-#endif
-
-// We don't want code outside port_def doing complex testing, so
-// remove our portable condition test macros to nudge folks away from
-// using it themselves.
-#ifdef PROTOBUF_has_cpp_attribute_DEFINED_
-#  undef __has_cpp_attribute
-#  undef PROTOBUF_has_cpp_attribute_DEFINED_
-#endif
-#ifdef PROTOBUF_has_feature_DEFINED_
-#  undef __has_feature
-#  undef PROTOBUF_has_feature_DEFINED_
-#endif
-#ifdef PROTOBUF_has_warning_DEFINED_
-#  undef __has_warning
-#  undef PROTOBUF_has_warning_DEFINED_
-#endif
-#ifdef PROTOBUF_has_attribute_DEFINED_
-#  undef __has_attribute
-#  undef PROTOBUF_has_attribute_DEFINED_
-#endif
-#ifdef PROTOBUF_has_builtin_DEFINED_
-#  undef __has_builtin
-#  undef PROTOBUF_has_builtin_DEFINED_
-#endif
diff --git a/libs/protobuf/src/google/protobuf/port_undef.inc b/libs/protobuf/src/google/protobuf/port_undef.inc
deleted file mode 100644
index e880fa5..0000000
--- a/libs/protobuf/src/google/protobuf/port_undef.inc
+++ /dev/null
@@ -1,160 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// #undefs all macros defined in port_def.inc.  See comments in port_def.inc
-// for more info.
-
-#ifndef PROTOBUF_NAMESPACE
-#error "port_undef.inc must be included after port_def.inc"
-#endif
-
-#undef PROTOBUF_BUILTIN_BSWAP16
-#undef PROTOBUF_BUILTIN_BSWAP32
-#undef PROTOBUF_BUILTIN_BSWAP64
-#undef PROTOBUF_GNUC_MIN
-#undef PROTOBUF_MSC_VER_MIN
-#undef PROTOBUF_CPLUSPLUS_MIN
-#undef PROTOBUF_NAMESPACE
-#undef PROTOBUF_NAMESPACE_ID
-#undef PROTOBUF_ALWAYS_INLINE
-#undef PROTOBUF_NDEBUG_INLINE
-#undef PROTOBUF_MUSTTAIL
-#undef PROTOBUF_TAILCALL
-#undef PROTOBUF_COLD
-#undef PROTOBUF_NOINLINE
-#undef PROTOBUF_SECTION_VARIABLE
-#undef PROTOBUF_DEPRECATED
-#undef PROTOBUF_DEPRECATED_ENUM
-#undef PROTOBUF_DEPRECATED_MSG
-#undef PROTOBUF_FUNC_ALIGN
-#undef PROTOBUF_RETURNS_NONNULL
-#undef PROTOBUF_ATTRIBUTE_REINITIALIZES
-#undef PROTOBUF_RTTI
-#undef PROTOBUF_VERSION
-#undef PROTOBUF_VERSION_SUFFIX
-#undef PROTOBUF_FIELD_OFFSET
-#undef PROTOBUF_MIN_HEADER_VERSION_FOR_PROTOC
-#undef PROTOBUF_MIN_PROTOC_VERSION
-#undef PROTOBUF_PREDICT_TRUE
-#undef PROTOBUF_PREDICT_FALSE
-#undef PROTOBUF_FALLTHROUGH_INTENDED
-#undef PROTOBUF_EXPORT
-#undef PROTOC_EXPORT
-#undef PROTOBUF_NODISCARD
-#undef PROTOBUF_FORCE_COPY_IN_RELEASE
-#undef PROTOBUF_FORCE_COPY_IN_SWAP
-#undef PROTOBUF_FORCE_COPY_IN_MOVE
-#undef PROTOBUF_FORCE_RESET_IN_CLEAR
-#undef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-#undef PROTOBUF_NAMESPACE_OPEN
-#undef PROTOBUF_NAMESPACE_CLOSE
-#undef PROTOBUF_UNUSED
-#undef PROTOBUF_ASSUME
-#undef PROTOBUF_EXPORT_TEMPLATE_DECLARE
-#undef PROTOBUF_EXPORT_TEMPLATE_DEFINE
-#undef PROTOBUF_ALIGNAS
-#undef PROTOBUF_FINAL
-#undef PROTOBUF_FUTURE_FINAL
-#undef PROTOBUF_THREAD_LOCAL
-#undef PROTOBUF_LITTLE_ENDIAN
-#undef PROTOBUF_BIG_ENDIAN
-#undef PROTOBUF_MESSAGE_OWNED_ARENA_EXPERIMENT
-#undef PROTOBUF_CONSTINIT
-#undef PROTOBUF_CONSTEXPR
-#undef PROTOBUF_ATTRIBUTE_WEAK
-#undef PROTOBUF_HAVE_ATTRIBUTE_WEAK
-#undef PROTOBUF_ATTRIBUTE_NO_DESTROY
-#undef PROTOBUF_ATTRIBUTE_STANDALONE_DEBUG
-#undef PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-#undef PROTOBUF_ATTRIBUTE_INIT_PRIORITY2
-#undef PROTOBUF_PRAGMA_INIT_SEG
-#undef PROTOBUF_ASAN
-#undef PROTOBUF_MSAN
-#undef PROTOBUF_TSAN
-#undef PROTOBUF_TAIL_CALL_TABLE_PARSER_ENABLED
-#undef PROTOBUF_TC_PARAM_DECL
-#undef PROTOBUF_EXCLUSIVE_LOCKS_REQUIRED
-#undef PROTOBUF_LOCKS_EXCLUDED
-#undef PROTOBUF_NO_THREAD_SAFETY_ANALYSIS
-#undef PROTOBUF_GUARDED_BY
-
-#ifdef PROTOBUF_FUTURE_BREAKING_CHANGES
-#undef PROTOBUF_FUTURE_BREAKING_CHANGES
-#endif
-
-// Restore macro that may have been #undef'd in port_def.inc.
-#ifdef _MSC_VER
-#pragma pop_macro("CREATE_NEW")
-#pragma pop_macro("DELETE")
-#pragma pop_macro("DOUBLE_CLICK")
-#pragma pop_macro("ERROR")
-#pragma pop_macro("ERROR_BUSY")
-#pragma pop_macro("ERROR_INSTALL_FAILED")
-#pragma pop_macro("ERROR_NOT_FOUND")
-#pragma pop_macro("GetClassName")
-#pragma pop_macro("GetMessage")
-#pragma pop_macro("GetObject")
-#pragma pop_macro("IGNORE")
-#pragma pop_macro("IN")
-#pragma pop_macro("INPUT_KEYBOARD")
-#pragma pop_macro("OUT")
-#pragma pop_macro("OPTIONAL")
-#pragma pop_macro("min")
-#pragma pop_macro("max")
-#pragma pop_macro("NEAR")
-#pragma pop_macro("NO_DATA")
-#pragma pop_macro("NO_ERROR")
-#pragma pop_macro("REASON_UNKNOWN")
-#pragma pop_macro("SERVICE_DISABLED")
-#pragma pop_macro("SEVERITY_ERROR")
-#pragma pop_macro("STRICT")
-#pragma pop_macro("STATUS_PENDING")
-#pragma pop_macro("timezone")
-#endif
-
-#ifdef __APPLE__
-#pragma pop_macro("DOMAIN")
-#pragma pop_macro("TRUE")
-#pragma pop_macro("FALSE")
-#pragma pop_macro("UID_MAX")
-#endif  // __APPLE__
-
-#if defined(__clang__) || defined(__GNUC__) || defined(_MSC_VER)
-#pragma pop_macro("DEBUG")
-#endif // defined(__clang__) || defined(__GNUC__) || defined(_MSC_VER)
-
-#if defined(__GNUC__)
-#pragma GCC diagnostic pop
-#endif
-
-// Pop the warning(push) from port_def.inc
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
diff --git a/libs/protobuf/src/google/protobuf/preserve_unknown_enum_test.cc b/libs/protobuf/src/google/protobuf/preserve_unknown_enum_test.cc
deleted file mode 100644
index 7e6bbf1..0000000
--- a/libs/protobuf/src/google/protobuf/preserve_unknown_enum_test.cc
+++ /dev/null
@@ -1,290 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <google/protobuf/unittest.pb.h>
-#include <google/protobuf/unittest_preserve_unknown_enum.pb.h>
-#include <google/protobuf/unittest_preserve_unknown_enum2.pb.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/dynamic_message.h>
-#include <gtest/gtest.h>
-
-namespace google {
-namespace protobuf {
-namespace {
-
-void FillMessage(
-    proto3_preserve_unknown_enum_unittest::MyMessagePlusExtra* message) {
-  message->set_e(proto3_preserve_unknown_enum_unittest::E_EXTRA);
-  message->add_repeated_e(proto3_preserve_unknown_enum_unittest::E_EXTRA);
-  message->add_repeated_packed_e(
-      proto3_preserve_unknown_enum_unittest::E_EXTRA);
-  message->add_repeated_packed_unexpected_e(
-      proto3_preserve_unknown_enum_unittest::E_EXTRA);
-  message->set_oneof_e_1(proto3_preserve_unknown_enum_unittest::E_EXTRA);
-}
-
-void CheckMessage(
-    const proto3_preserve_unknown_enum_unittest::MyMessagePlusExtra& message) {
-  EXPECT_EQ(proto3_preserve_unknown_enum_unittest::E_EXTRA, message.e());
-  EXPECT_EQ(1, message.repeated_e_size());
-  EXPECT_EQ(proto3_preserve_unknown_enum_unittest::E_EXTRA,
-            message.repeated_e(0));
-  EXPECT_EQ(1, message.repeated_packed_e_size());
-  EXPECT_EQ(proto3_preserve_unknown_enum_unittest::E_EXTRA,
-            message.repeated_packed_e(0));
-  EXPECT_EQ(1, message.repeated_packed_unexpected_e_size());
-  EXPECT_EQ(proto3_preserve_unknown_enum_unittest::E_EXTRA,
-            message.repeated_packed_unexpected_e(0));
-  EXPECT_EQ(proto3_preserve_unknown_enum_unittest::E_EXTRA,
-            message.oneof_e_1());
-}
-
-void CheckMessage(
-    const proto3_preserve_unknown_enum_unittest::MyMessage& message) {
-  EXPECT_EQ(static_cast<int>(proto3_preserve_unknown_enum_unittest::E_EXTRA),
-            static_cast<int>(message.e()));
-  EXPECT_EQ(1, message.repeated_e_size());
-  EXPECT_EQ(static_cast<int>(proto3_preserve_unknown_enum_unittest::E_EXTRA),
-            static_cast<int>(message.repeated_e(0)));
-  EXPECT_EQ(1, message.repeated_packed_e_size());
-  EXPECT_EQ(static_cast<int>(proto3_preserve_unknown_enum_unittest::E_EXTRA),
-            static_cast<int>(message.repeated_packed_e(0)));
-  EXPECT_EQ(1, message.repeated_packed_unexpected_e_size());
-  EXPECT_EQ(static_cast<int>(proto3_preserve_unknown_enum_unittest::E_EXTRA),
-            static_cast<int>(message.repeated_packed_unexpected_e(0)));
-  EXPECT_EQ(static_cast<int>(proto3_preserve_unknown_enum_unittest::E_EXTRA),
-            static_cast<int>(message.oneof_e_1()));
-}
-
-}  // anonymous namespace
-
-// Test that parsing preserves an unknown value in the enum field and does not
-// punt it to the UnknownFieldSet.
-TEST(PreserveUnknownEnumTest, PreserveParseAndSerialize) {
-  proto3_preserve_unknown_enum_unittest::MyMessagePlusExtra orig_message;
-  FillMessage(&orig_message);
-  std::string serialized;
-  orig_message.SerializeToString(&serialized);
-
-  proto3_preserve_unknown_enum_unittest::MyMessage message;
-  EXPECT_EQ(true, message.ParseFromString(serialized));
-  CheckMessage(message);
-
-  serialized.clear();
-  message.SerializeToString(&serialized);
-  EXPECT_EQ(true, orig_message.ParseFromString(serialized));
-  CheckMessage(orig_message);
-}
-
-// Test that reflection based implementation also keeps unknown enum values and
-// doesn't put them into UnknownFieldSet.
-TEST(PreserveUnknownEnumTest, PreserveParseAndSerializeDynamicMessage) {
-  proto3_preserve_unknown_enum_unittest::MyMessagePlusExtra orig_message;
-  FillMessage(&orig_message);
-  std::string serialized = orig_message.SerializeAsString();
-
-  DynamicMessageFactory factory;
-  std::unique_ptr<Message> message(
-      factory
-          .GetPrototype(
-              proto3_preserve_unknown_enum_unittest::MyMessage::descriptor())
-          ->New());
-  EXPECT_EQ(true, message->ParseFromString(serialized));
-  message->DiscardUnknownFields();
-
-  serialized = message->SerializeAsString();
-  EXPECT_EQ(true, orig_message.ParseFromString(serialized));
-  CheckMessage(orig_message);
-}
-
-// Test that for proto2 messages, unknown values are in unknown fields.
-TEST(PreserveUnknownEnumTest, Proto2HidesUnknownValues) {
-  proto3_preserve_unknown_enum_unittest::MyMessagePlusExtra orig_message;
-  FillMessage(&orig_message);
-
-  std::string serialized;
-  orig_message.SerializeToString(&serialized);
-
-  proto2_preserve_unknown_enum_unittest::MyMessage message;
-  EXPECT_EQ(true, message.ParseFromString(serialized));
-  // The intermediate message has everything in its "unknown fields".
-  proto2_preserve_unknown_enum_unittest::MyMessage message2 = message;
-  message2.DiscardUnknownFields();
-  EXPECT_EQ(0, message2.ByteSizeLong());
-
-  // But when we pass it to the correct structure, all values are there.
-  serialized.clear();
-  message.SerializeToString(&serialized);
-  EXPECT_EQ(true, orig_message.ParseFromString(serialized));
-  CheckMessage(orig_message);
-}
-
-// Same as before, for a dynamic message.
-TEST(PreserveUnknownEnumTest, DynamicProto2HidesUnknownValues) {
-  proto3_preserve_unknown_enum_unittest::MyMessagePlusExtra orig_message;
-  FillMessage(&orig_message);
-
-  std::string serialized;
-  orig_message.SerializeToString(&serialized);
-
-  DynamicMessageFactory factory;
-  std::unique_ptr<Message> message(
-      factory
-          .GetPrototype(
-              proto2_preserve_unknown_enum_unittest::MyMessage::descriptor())
-          ->New());
-  EXPECT_EQ(true, message->ParseFromString(serialized));
-  // The intermediate message has everything in its "unknown fields".
-  proto2_preserve_unknown_enum_unittest::MyMessage message2;
-  message2.CopyFrom(*message);
-  message2.DiscardUnknownFields();
-  EXPECT_EQ(0, message2.ByteSizeLong());
-
-  // But when we pass it to the correct structure, all values are there.
-  serialized.clear();
-  message->SerializeToString(&serialized);
-  EXPECT_EQ(true, orig_message.ParseFromString(serialized));
-  CheckMessage(orig_message);
-}
-
-// Test that reflection provides EnumValueDescriptors for unknown values.
-TEST(PreserveUnknownEnumTest, DynamicEnumValueDescriptors) {
-  proto3_preserve_unknown_enum_unittest::MyMessagePlusExtra orig_message;
-  FillMessage(&orig_message);
-  std::string serialized;
-  orig_message.SerializeToString(&serialized);
-
-  proto3_preserve_unknown_enum_unittest::MyMessage message;
-  EXPECT_EQ(true, message.ParseFromString(serialized));
-  CheckMessage(message);
-
-  const Reflection* r = message.GetReflection();
-  const Descriptor* d = message.GetDescriptor();
-  const FieldDescriptor* field = d->FindFieldByName("e");
-
-  // This should dynamically create an EnumValueDescriptor.
-  const EnumValueDescriptor* enum_value = r->GetEnum(message, field);
-  EXPECT_EQ(enum_value->number(),
-            static_cast<int>(proto3_preserve_unknown_enum_unittest::E_EXTRA));
-
-  // Fetching value for a second time should return the same pointer.
-  const EnumValueDescriptor* enum_value_second = r->GetEnum(message, field);
-  EXPECT_EQ(enum_value, enum_value_second);
-
-  // Check the repeated case too.
-  const FieldDescriptor* repeated_field = d->FindFieldByName("repeated_e");
-  enum_value = r->GetRepeatedEnum(message, repeated_field, 0);
-  EXPECT_EQ(enum_value->number(),
-            static_cast<int>(proto3_preserve_unknown_enum_unittest::E_EXTRA));
-  // Should reuse the same EnumValueDescriptor, even for a different field.
-  EXPECT_EQ(enum_value, enum_value_second);
-
-  // We should be able to use the returned value descriptor to set a value on
-  // another message.
-  Message* m = message.New();
-  r->SetEnum(m, field, enum_value);
-  EXPECT_EQ(enum_value, r->GetEnum(*m, field));
-  delete m;
-}
-
-// Test that the new integer-based enum reflection API works.
-TEST(PreserveUnknownEnumTest, IntegerEnumReflectionAPI) {
-  proto3_preserve_unknown_enum_unittest::MyMessage message;
-  const Reflection* r = message.GetReflection();
-  const Descriptor* d = message.GetDescriptor();
-
-  const FieldDescriptor* singular_field = d->FindFieldByName("e");
-  const FieldDescriptor* repeated_field = d->FindFieldByName("repeated_e");
-
-  r->SetEnumValue(&message, singular_field, 42);
-  EXPECT_EQ(42, r->GetEnumValue(message, singular_field));
-  r->AddEnumValue(&message, repeated_field, 42);
-  r->AddEnumValue(&message, repeated_field, 42);
-  EXPECT_EQ(42, r->GetRepeatedEnumValue(message, repeated_field, 0));
-  r->SetRepeatedEnumValue(&message, repeated_field, 1, 84);
-  EXPECT_EQ(84, r->GetRepeatedEnumValue(message, repeated_field, 1));
-  const EnumValueDescriptor* enum_value = r->GetEnum(message, singular_field);
-  EXPECT_EQ(42, enum_value->number());
-}
-
-// Test that the EnumValue API works properly for proto2 messages as well.
-TEST(PreserveUnknownEnumTest, Proto2CatchesUnknownValues) {
-  protobuf_unittest::TestAllTypes message;  // proto2 message
-  const Reflection* r = message.GetReflection();
-  const Descriptor* d = message.GetDescriptor();
-  const FieldDescriptor* repeated_field =
-      d->FindFieldByName("repeated_nested_enum");
-  // Add one element to the repeated field so that we can test
-  // SetRepeatedEnumValue.
-  const EnumValueDescriptor* enum_value =
-      repeated_field->enum_type()->FindValueByName("BAR");
-  EXPECT_TRUE(enum_value != nullptr);
-  r->AddEnum(&message, repeated_field, enum_value);
-
-  const FieldDescriptor* singular_field =
-      d->FindFieldByName("optional_nested_enum");
-  // Enum-field integer-based setters treat as unknown integer values as
-  // unknown fields.
-  r->SetEnumValue(&message, singular_field, 4242);
-  EXPECT_EQ(r->GetEnum(message, singular_field)->number(),
-            protobuf_unittest::TestAllTypes::FOO);
-  r->SetRepeatedEnumValue(&message, repeated_field, 0, 4242);
-  // repeated_nested_enum was set to bar above, this should not have changed.
-  EXPECT_EQ(r->GetRepeatedEnum(message, repeated_field, 0)->number(),
-            protobuf_unittest::TestAllTypes::BAR);
-  r->AddEnumValue(&message, repeated_field, 4242);
-  // No element should be added
-  EXPECT_EQ(message.repeated_nested_enum_size(), 1);
-
-  // We require the enums to end up in unknown field set
-  ASSERT_EQ(message.unknown_fields().field_count(), 3);
-  EXPECT_EQ(message.unknown_fields().field(0).number(),
-            singular_field->number());
-  EXPECT_EQ(message.unknown_fields().field(0).varint(), 4242);
-  EXPECT_EQ(message.unknown_fields().field(1).number(),
-            repeated_field->number());
-  EXPECT_EQ(message.unknown_fields().field(1).varint(), 4242);
-  EXPECT_EQ(message.unknown_fields().field(2).number(),
-            repeated_field->number());
-  EXPECT_EQ(message.unknown_fields().field(2).varint(), 4242);
-}
-
-TEST(PreserveUnknownEnumTest, SupportsUnknownEnumValuesAPI) {
-  protobuf_unittest::TestAllTypes proto2_message;
-  proto3_preserve_unknown_enum_unittest::MyMessage new_message;
-
-  const Reflection* proto2_reflection = proto2_message.GetReflection();
-  const Reflection* new_reflection = new_message.GetReflection();
-
-  EXPECT_FALSE(proto2_reflection->SupportsUnknownEnumValues());
-  EXPECT_TRUE(new_reflection->SupportsUnknownEnumValues());
-}
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/proto3_arena_lite_unittest.cc b/libs/protobuf/src/google/protobuf/proto3_arena_lite_unittest.cc
deleted file mode 100644
index 06b8d08..0000000
--- a/libs/protobuf/src/google/protobuf/proto3_arena_lite_unittest.cc
+++ /dev/null
@@ -1,152 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <memory>
-#include <string>
-#include <vector>
-
-#include <google/protobuf/unittest_proto3_arena.pb.h>
-#include <google/protobuf/arena.h>
-#include <google/protobuf/testing/googletest.h>
-#include <gtest/gtest.h>
-
-using proto3_arena_unittest::TestAllTypes;
-
-namespace google {
-namespace protobuf {
-namespace {
-// We selectively set/check a few representative fields rather than all fields
-// as this test is only expected to cover the basics of arena support.
-void SetAllFields(TestAllTypes* m) {
-  m->set_optional_int32(100);
-  m->set_optional_string("asdf");
-  m->set_optional_bytes("jkl;");
-  m->mutable_optional_nested_message()->set_bb(42);
-  m->mutable_optional_foreign_message()->set_c(43);
-  m->set_optional_nested_enum(proto3_arena_unittest::TestAllTypes::BAZ);
-  m->set_optional_foreign_enum(proto3_arena_unittest::FOREIGN_BAZ);
-  m->mutable_optional_lazy_message()->set_bb(45);
-  m->add_repeated_int32(100);
-  m->add_repeated_string("asdf");
-  m->add_repeated_bytes("jkl;");
-  m->add_repeated_nested_message()->set_bb(46);
-  m->add_repeated_foreign_message()->set_c(47);
-  m->add_repeated_nested_enum(proto3_arena_unittest::TestAllTypes::BAZ);
-  m->add_repeated_foreign_enum(proto3_arena_unittest::FOREIGN_BAZ);
-  m->add_repeated_lazy_message()->set_bb(49);
-
-  m->set_oneof_uint32(1);
-  m->mutable_oneof_nested_message()->set_bb(50);
-  m->set_oneof_string("test");  // only this one remains set
-}
-
-void ExpectAllFieldsSet(const TestAllTypes& m) {
-  EXPECT_EQ(100, m.optional_int32());
-  EXPECT_EQ("asdf", m.optional_string());
-  EXPECT_EQ("jkl;", m.optional_bytes());
-  EXPECT_EQ(true, m.has_optional_nested_message());
-  EXPECT_EQ(42, m.optional_nested_message().bb());
-  EXPECT_EQ(true, m.has_optional_foreign_message());
-  EXPECT_EQ(43, m.optional_foreign_message().c());
-  EXPECT_EQ(proto3_arena_unittest::TestAllTypes::BAZ, m.optional_nested_enum());
-  EXPECT_EQ(proto3_arena_unittest::FOREIGN_BAZ, m.optional_foreign_enum());
-  EXPECT_EQ(true, m.has_optional_lazy_message());
-  EXPECT_EQ(45, m.optional_lazy_message().bb());
-
-  EXPECT_EQ(1, m.repeated_int32_size());
-  EXPECT_EQ(100, m.repeated_int32(0));
-  EXPECT_EQ(1, m.repeated_string_size());
-  EXPECT_EQ("asdf", m.repeated_string(0));
-  EXPECT_EQ(1, m.repeated_bytes_size());
-  EXPECT_EQ("jkl;", m.repeated_bytes(0));
-  EXPECT_EQ(1, m.repeated_nested_message_size());
-  EXPECT_EQ(46, m.repeated_nested_message(0).bb());
-  EXPECT_EQ(1, m.repeated_foreign_message_size());
-  EXPECT_EQ(47, m.repeated_foreign_message(0).c());
-  EXPECT_EQ(1, m.repeated_nested_enum_size());
-  EXPECT_EQ(proto3_arena_unittest::TestAllTypes::BAZ,
-            m.repeated_nested_enum(0));
-  EXPECT_EQ(1, m.repeated_foreign_enum_size());
-  EXPECT_EQ(proto3_arena_unittest::FOREIGN_BAZ, m.repeated_foreign_enum(0));
-  EXPECT_EQ(1, m.repeated_lazy_message_size());
-  EXPECT_EQ(49, m.repeated_lazy_message(0).bb());
-
-  EXPECT_EQ(proto3_arena_unittest::TestAllTypes::kOneofString,
-            m.oneof_field_case());
-  EXPECT_EQ("test", m.oneof_string());
-}
-
-// In this file we only test some basic functionalities of arena support in
-// proto3 and expect the arena support to be fully tested in proto2 unittests
-// because proto3 shares most code with proto2.
-
-TEST(Proto3ArenaLiteTest, Parsing) {
-  TestAllTypes original;
-  SetAllFields(&original);
-
-  Arena arena;
-  TestAllTypes* arena_message = Arena::CreateMessage<TestAllTypes>(&arena);
-  arena_message->ParseFromString(original.SerializeAsString());
-  ExpectAllFieldsSet(*arena_message);
-}
-
-TEST(Proto3ArenaLiteTest, Swap) {
-  Arena arena1;
-  Arena arena2;
-
-  // Test Swap().
-  TestAllTypes* arena1_message = Arena::CreateMessage<TestAllTypes>(&arena1);
-  TestAllTypes* arena2_message = Arena::CreateMessage<TestAllTypes>(&arena2);
-  arena1_message->Swap(arena2_message);
-  EXPECT_EQ(&arena1, arena1_message->GetArena());
-  EXPECT_EQ(&arena2, arena2_message->GetArena());
-}
-
-TEST(Proto3ArenaLiteTest, SetAllocatedMessage) {
-  Arena arena;
-  TestAllTypes* arena_message = Arena::CreateMessage<TestAllTypes>(&arena);
-  TestAllTypes::NestedMessage* nested = new TestAllTypes::NestedMessage;
-  nested->set_bb(118);
-  arena_message->set_allocated_optional_nested_message(nested);
-  EXPECT_EQ(118, arena_message->optional_nested_message().bb());
-}
-
-TEST(Proto3ArenaLiteTest, ReleaseMessage) {
-  Arena arena;
-  TestAllTypes* arena_message = Arena::CreateMessage<TestAllTypes>(&arena);
-  arena_message->mutable_optional_nested_message()->set_bb(118);
-  std::unique_ptr<TestAllTypes::NestedMessage> nested(
-      arena_message->release_optional_nested_message());
-  EXPECT_EQ(118, nested->bb());
-}
-
-}  // namespace
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/proto3_arena_unittest.cc b/libs/protobuf/src/google/protobuf/proto3_arena_unittest.cc
deleted file mode 100644
index cfbe198..0000000
--- a/libs/protobuf/src/google/protobuf/proto3_arena_unittest.cc
+++ /dev/null
@@ -1,635 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <memory>
-#include <string>
-#include <vector>
-
-#include <google/protobuf/unittest.pb.h>
-#include <google/protobuf/unittest_proto3_arena.pb.h>
-#include <google/protobuf/unittest_proto3_optional.pb.h>
-#include <google/protobuf/arena.h>
-#include <google/protobuf/text_format.h>
-#include <google/protobuf/testing/googletest.h>
-#include <gtest/gtest.h>
-#include <google/protobuf/stubs/strutil.h>
-#include <google/protobuf/test_util.h>
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-using proto3_arena_unittest::ForeignMessage;
-using proto3_arena_unittest::TestAllTypes;
-
-namespace google {
-namespace protobuf {
-
-namespace internal {
-
-class Proto3ArenaTestHelper {
- public:
-  template <typename T>
-  static Arena* GetOwningArena(const T& msg) {
-    return msg.GetOwningArena();
-  }
-};
-
-}  // namespace internal
-
-namespace {
-// We selectively set/check a few representative fields rather than all fields
-// as this test is only expected to cover the basics of arena support.
-void SetAllFields(TestAllTypes* m) {
-  m->set_optional_int32(100);
-  m->set_optional_string("asdf");
-  m->set_optional_bytes("jkl;");
-  m->mutable_optional_nested_message()->set_bb(42);
-  m->mutable_optional_foreign_message()->set_c(43);
-  m->set_optional_nested_enum(proto3_arena_unittest::TestAllTypes::BAZ);
-  m->set_optional_foreign_enum(proto3_arena_unittest::FOREIGN_BAZ);
-  m->mutable_optional_lazy_message()->set_bb(45);
-  m->mutable_optional_unverified_lazy_message()->set_bb(46);
-  m->add_repeated_int32(100);
-  m->add_repeated_string("asdf");
-  m->add_repeated_bytes("jkl;");
-  m->add_repeated_nested_message()->set_bb(46);
-  m->add_repeated_foreign_message()->set_c(47);
-  m->add_repeated_nested_enum(proto3_arena_unittest::TestAllTypes::BAZ);
-  m->add_repeated_foreign_enum(proto3_arena_unittest::FOREIGN_BAZ);
-  m->add_repeated_lazy_message()->set_bb(49);
-
-  m->set_oneof_uint32(1);
-  m->mutable_oneof_nested_message()->set_bb(50);
-  m->set_oneof_string("test");  // only this one remains set
-}
-
-void ExpectAllFieldsSet(const TestAllTypes& m) {
-  EXPECT_EQ(100, m.optional_int32());
-  EXPECT_EQ("asdf", m.optional_string());
-  EXPECT_EQ("jkl;", m.optional_bytes());
-  EXPECT_EQ(true, m.has_optional_nested_message());
-  EXPECT_EQ(42, m.optional_nested_message().bb());
-  EXPECT_EQ(true, m.has_optional_foreign_message());
-  EXPECT_EQ(43, m.optional_foreign_message().c());
-  EXPECT_EQ(proto3_arena_unittest::TestAllTypes::BAZ, m.optional_nested_enum());
-  EXPECT_EQ(proto3_arena_unittest::FOREIGN_BAZ, m.optional_foreign_enum());
-  EXPECT_EQ(true, m.has_optional_lazy_message());
-  EXPECT_EQ(45, m.optional_lazy_message().bb());
-  EXPECT_EQ(true, m.has_optional_unverified_lazy_message());
-  EXPECT_EQ(46, m.optional_unverified_lazy_message().bb());
-
-  EXPECT_EQ(1, m.repeated_int32_size());
-  EXPECT_EQ(100, m.repeated_int32(0));
-  EXPECT_EQ(1, m.repeated_string_size());
-  EXPECT_EQ("asdf", m.repeated_string(0));
-  EXPECT_EQ(1, m.repeated_bytes_size());
-  EXPECT_EQ("jkl;", m.repeated_bytes(0));
-  EXPECT_EQ(1, m.repeated_nested_message_size());
-  EXPECT_EQ(46, m.repeated_nested_message(0).bb());
-  EXPECT_EQ(1, m.repeated_foreign_message_size());
-  EXPECT_EQ(47, m.repeated_foreign_message(0).c());
-  EXPECT_EQ(1, m.repeated_nested_enum_size());
-  EXPECT_EQ(proto3_arena_unittest::TestAllTypes::BAZ,
-            m.repeated_nested_enum(0));
-  EXPECT_EQ(1, m.repeated_foreign_enum_size());
-  EXPECT_EQ(proto3_arena_unittest::FOREIGN_BAZ, m.repeated_foreign_enum(0));
-  EXPECT_EQ(1, m.repeated_lazy_message_size());
-  EXPECT_EQ(49, m.repeated_lazy_message(0).bb());
-
-  EXPECT_EQ(proto3_arena_unittest::TestAllTypes::kOneofString,
-            m.oneof_field_case());
-  EXPECT_EQ("test", m.oneof_string());
-}
-
-// In this file we only test some basic functionalities of arena support in
-// proto3 and expect the arena support to be fully tested in proto2 unittests
-// because proto3 shares most code with proto2.
-
-TEST(Proto3ArenaTest, Parsing) {
-  TestAllTypes original;
-  SetAllFields(&original);
-
-  Arena arena;
-  TestAllTypes* arena_message = Arena::CreateMessage<TestAllTypes>(&arena);
-  arena_message->ParseFromString(original.SerializeAsString());
-  ExpectAllFieldsSet(*arena_message);
-}
-
-TEST(Proto3ArenaTest, UnknownFields) {
-  TestAllTypes original;
-  SetAllFields(&original);
-
-  Arena arena;
-  TestAllTypes* arena_message = Arena::CreateMessage<TestAllTypes>(&arena);
-  arena_message->ParseFromString(original.SerializeAsString());
-  ExpectAllFieldsSet(*arena_message);
-
-  // In proto3 we can still get a pointer to the UnknownFieldSet through
-  // reflection API.
-  UnknownFieldSet* unknown_fields =
-      arena_message->GetReflection()->MutableUnknownFields(arena_message);
-  // We can modify this UnknownFieldSet.
-  unknown_fields->AddVarint(1, 2);
-  // And the unknown fields should be changed.
-  ASSERT_NE(original.ByteSizeLong(), arena_message->ByteSizeLong());
-  ASSERT_FALSE(
-      arena_message->GetReflection()->GetUnknownFields(*arena_message).empty());
-}
-
-TEST(Proto3ArenaTest, GetArena) {
-  Arena arena;
-
-  // Tests arena-allocated message and submessages.
-  auto* arena_message1 = Arena::CreateMessage<TestAllTypes>(&arena);
-  auto* arena_submessage1 = arena_message1->mutable_optional_foreign_message();
-  auto* arena_repeated_submessage1 =
-      arena_message1->add_repeated_foreign_message();
-  EXPECT_EQ(&arena, arena_message1->GetArena());
-  EXPECT_EQ(&arena, arena_submessage1->GetArena());
-  EXPECT_EQ(&arena, arena_repeated_submessage1->GetArena());
-
-  // Tests attached heap-allocated messages.
-  auto* arena_message2 = Arena::CreateMessage<TestAllTypes>(&arena);
-  arena_message2->set_allocated_optional_foreign_message(new ForeignMessage());
-  arena_message2->mutable_repeated_foreign_message()->AddAllocated(
-      new ForeignMessage());
-  const auto& submessage2 = arena_message2->optional_foreign_message();
-  const auto& repeated_submessage2 =
-      arena_message2->repeated_foreign_message(0);
-  EXPECT_EQ(nullptr, submessage2.GetArena());
-  EXPECT_EQ(nullptr, repeated_submessage2.GetArena());
-
-  // Tests message created by Arena::Create.
-  auto* arena_message3 = Arena::Create<TestAllTypes>(&arena);
-  EXPECT_EQ(nullptr, arena_message3->GetArena());
-}
-
-TEST(Proto3ArenaTest, GetArenaWithUnknown) {
-  Arena arena;
-
-  // Tests arena-allocated message and submessages.
-  auto* arena_message1 = Arena::CreateMessage<TestAllTypes>(&arena);
-  arena_message1->GetReflection()->MutableUnknownFields(arena_message1);
-  auto* arena_submessage1 = arena_message1->mutable_optional_foreign_message();
-  arena_submessage1->GetReflection()->MutableUnknownFields(arena_submessage1);
-  auto* arena_repeated_submessage1 =
-      arena_message1->add_repeated_foreign_message();
-  arena_repeated_submessage1->GetReflection()->MutableUnknownFields(
-      arena_repeated_submessage1);
-  EXPECT_EQ(&arena, arena_message1->GetArena());
-  EXPECT_EQ(&arena, arena_submessage1->GetArena());
-  EXPECT_EQ(&arena, arena_repeated_submessage1->GetArena());
-
-  // Tests attached heap-allocated messages.
-  auto* arena_message2 = Arena::CreateMessage<TestAllTypes>(&arena);
-  arena_message2->set_allocated_optional_foreign_message(new ForeignMessage());
-  arena_message2->mutable_repeated_foreign_message()->AddAllocated(
-      new ForeignMessage());
-  auto* submessage2 = arena_message2->mutable_optional_foreign_message();
-  submessage2->GetReflection()->MutableUnknownFields(submessage2);
-  auto* repeated_submessage2 =
-      arena_message2->mutable_repeated_foreign_message(0);
-  repeated_submessage2->GetReflection()->MutableUnknownFields(
-      repeated_submessage2);
-  EXPECT_EQ(nullptr, submessage2->GetArena());
-  EXPECT_EQ(nullptr, repeated_submessage2->GetArena());
-}
-
-TEST(Proto3ArenaTest, Swap) {
-  Arena arena1;
-  Arena arena2;
-
-  // Test Swap().
-  TestAllTypes* arena1_message = Arena::CreateMessage<TestAllTypes>(&arena1);
-  TestAllTypes* arena2_message = Arena::CreateMessage<TestAllTypes>(&arena2);
-  arena1_message->Swap(arena2_message);
-  EXPECT_EQ(&arena1, arena1_message->GetArena());
-  EXPECT_EQ(&arena2, arena2_message->GetArena());
-}
-
-TEST(Proto3ArenaTest, SetAllocatedMessage) {
-  Arena arena;
-  TestAllTypes* arena_message = Arena::CreateMessage<TestAllTypes>(&arena);
-  TestAllTypes::NestedMessage* nested = new TestAllTypes::NestedMessage;
-  nested->set_bb(118);
-  arena_message->set_allocated_optional_nested_message(nested);
-  EXPECT_EQ(118, arena_message->optional_nested_message().bb());
-}
-
-TEST(Proto3ArenaTest, ReleaseMessage) {
-  Arena arena;
-  TestAllTypes* arena_message = Arena::CreateMessage<TestAllTypes>(&arena);
-  arena_message->mutable_optional_nested_message()->set_bb(118);
-  std::unique_ptr<TestAllTypes::NestedMessage> nested(
-      arena_message->release_optional_nested_message());
-  EXPECT_EQ(118, nested->bb());
-}
-
-TEST(Proto3ArenaTest, MessageFieldClear) {
-  // GitHub issue #310: https://github.com/protocolbuffers/protobuf/issues/310
-  Arena arena;
-  TestAllTypes* arena_message = Arena::CreateMessage<TestAllTypes>(&arena);
-  arena_message->mutable_optional_nested_message()->set_bb(118);
-  // This should not crash, but prior to the bugfix, it tried to use `operator
-  // delete` the nested message (which is on the arena):
-  arena_message->Clear();
-}
-
-TEST(Proto3ArenaTest, MessageFieldClearViaReflection) {
-  Arena arena;
-  TestAllTypes* message = Arena::CreateMessage<TestAllTypes>(&arena);
-  const Reflection* r = message->GetReflection();
-  const Descriptor* d = message->GetDescriptor();
-  const FieldDescriptor* msg_field =
-      d->FindFieldByName("optional_nested_message");
-
-  message->mutable_optional_nested_message()->set_bb(1);
-  r->ClearField(message, msg_field);
-  EXPECT_FALSE(message->has_optional_nested_message());
-  EXPECT_EQ(0, message->optional_nested_message().bb());
-}
-
-TEST(Proto3OptionalTest, OptionalFields) {
-  protobuf_unittest::TestProto3Optional msg;
-  EXPECT_FALSE(msg.has_optional_int32());
-  msg.set_optional_int32(0);
-  EXPECT_TRUE(msg.has_optional_int32());
-
-  std::string serialized;
-  msg.SerializeToString(&serialized);
-  EXPECT_GT(serialized.size(), 0);
-
-  msg.clear_optional_int32();
-  EXPECT_FALSE(msg.has_optional_int32());
-  msg.SerializeToString(&serialized);
-  EXPECT_EQ(serialized.size(), 0);
-}
-
-TEST(Proto3OptionalTest, OptionalFieldDescriptor) {
-  const Descriptor* d = protobuf_unittest::TestProto3Optional::descriptor();
-
-  for (int i = 0; i < d->field_count(); i++) {
-    const FieldDescriptor* f = d->field(i);
-    if (HasPrefixString(f->name(), "singular")) {
-      EXPECT_FALSE(f->has_optional_keyword()) << f->full_name();
-      EXPECT_FALSE(f->has_presence()) << f->full_name();
-      EXPECT_FALSE(f->containing_oneof()) << f->full_name();
-    } else {
-      EXPECT_TRUE(f->has_optional_keyword()) << f->full_name();
-      EXPECT_TRUE(f->has_presence()) << f->full_name();
-      EXPECT_TRUE(f->containing_oneof()) << f->full_name();
-    }
-  }
-}
-
-TEST(Proto3OptionalTest, Extensions) {
-  const DescriptorPool* p = DescriptorPool::generated_pool();
-  const FieldDescriptor* no_optional = p->FindExtensionByName(
-      "protobuf_unittest.Proto3OptionalExtensions.ext_no_optional");
-  const FieldDescriptor* with_optional = p->FindExtensionByName(
-      "protobuf_unittest.Proto3OptionalExtensions.ext_with_optional");
-  GOOGLE_CHECK(no_optional);
-  GOOGLE_CHECK(with_optional);
-  EXPECT_FALSE(no_optional->has_optional_keyword());
-  EXPECT_TRUE(with_optional->has_optional_keyword());
-
-  const Descriptor* d = protobuf_unittest::Proto3OptionalExtensions::descriptor();
-  EXPECT_TRUE(d->options().HasExtension(
-      protobuf_unittest::Proto3OptionalExtensions::ext_no_optional));
-  EXPECT_TRUE(d->options().HasExtension(
-      protobuf_unittest::Proto3OptionalExtensions::ext_with_optional));
-  EXPECT_EQ(8, d->options().GetExtension(
-                   protobuf_unittest::Proto3OptionalExtensions::ext_no_optional));
-  EXPECT_EQ(16,
-            d->options().GetExtension(
-                protobuf_unittest::Proto3OptionalExtensions::ext_with_optional));
-
-  const Descriptor* d2 = protobuf_unittest::TestProto3Optional::descriptor();
-  EXPECT_FALSE(d2->options().HasExtension(
-      protobuf_unittest::Proto3OptionalExtensions::ext_no_optional));
-  EXPECT_FALSE(d2->options().HasExtension(
-      protobuf_unittest::Proto3OptionalExtensions::ext_with_optional));
-}
-
-TEST(Proto3OptionalTest, OptionalField) {
-  protobuf_unittest::TestProto3Optional msg;
-  EXPECT_FALSE(msg.has_optional_int32());
-  msg.set_optional_int32(0);
-  EXPECT_TRUE(msg.has_optional_int32());
-
-  std::string serialized;
-  msg.SerializeToString(&serialized);
-  EXPECT_GT(serialized.size(), 0);
-
-  msg.clear_optional_int32();
-  EXPECT_FALSE(msg.has_optional_int32());
-  msg.SerializeToString(&serialized);
-  EXPECT_EQ(serialized.size(), 0);
-}
-
-TEST(Proto3OptionalTest, OptionalFieldReflection) {
-  // Tests that oneof reflection works on synthetic oneofs.
-  //
-  // We test this more deeply elsewhere by parsing/serializing TextFormat (which
-  // doesn't treat synthetic oneofs specially, so reflects over them normally).
-  protobuf_unittest::TestProto3Optional msg;
-  const google::protobuf::Descriptor* d = msg.GetDescriptor();
-  const google::protobuf::Reflection* r = msg.GetReflection();
-  const google::protobuf::FieldDescriptor* f = d->FindFieldByName("optional_int32");
-  const google::protobuf::OneofDescriptor* o = d->FindOneofByName("_optional_int32");
-  GOOGLE_CHECK(f);
-  GOOGLE_CHECK(o);
-  EXPECT_TRUE(o->is_synthetic());
-
-  EXPECT_FALSE(r->HasField(msg, f));
-  EXPECT_FALSE(r->HasOneof(msg, o));
-  EXPECT_TRUE(r->GetOneofFieldDescriptor(msg, o) == nullptr);
-
-  r->SetInt32(&msg, f, 123);
-  EXPECT_EQ(123, msg.optional_int32());
-  EXPECT_EQ(123, r->GetInt32(msg, f));
-  EXPECT_TRUE(r->HasField(msg, f));
-  EXPECT_TRUE(r->HasOneof(msg, o));
-  EXPECT_EQ(f, r->GetOneofFieldDescriptor(msg, o));
-
-  std::vector<const FieldDescriptor*> fields;
-  r->ListFields(msg, &fields);
-  EXPECT_EQ(1, fields.size());
-  EXPECT_EQ(f, fields[0]);
-
-  r->ClearOneof(&msg, o);
-  EXPECT_FALSE(r->HasField(msg, f));
-  EXPECT_FALSE(r->HasOneof(msg, o));
-  EXPECT_TRUE(r->GetOneofFieldDescriptor(msg, o) == nullptr);
-
-  msg.set_optional_int32(123);
-  EXPECT_EQ(123, r->GetInt32(msg, f));
-  EXPECT_TRUE(r->HasField(msg, f));
-  EXPECT_TRUE(r->HasOneof(msg, o));
-  EXPECT_EQ(f, r->GetOneofFieldDescriptor(msg, o));
-
-  r->ClearOneof(&msg, o);
-  EXPECT_FALSE(r->HasField(msg, f));
-  EXPECT_FALSE(r->HasOneof(msg, o));
-  EXPECT_TRUE(r->GetOneofFieldDescriptor(msg, o) == nullptr);
-}
-
-// It's a regression test for b/160665543.
-TEST(Proto3OptionalTest, ClearNonOptionalMessageField) {
-  protobuf_unittest::TestProto3OptionalMessage msg;
-  msg.mutable_nested_message();
-  const google::protobuf::Descriptor* d = msg.GetDescriptor();
-  const google::protobuf::Reflection* r = msg.GetReflection();
-  const google::protobuf::FieldDescriptor* f = d->FindFieldByName("nested_message");
-  r->ClearField(&msg, f);
-}
-
-TEST(Proto3OptionalTest, ClearOptionalMessageField) {
-  protobuf_unittest::TestProto3OptionalMessage msg;
-  msg.mutable_optional_nested_message();
-  const google::protobuf::Descriptor* d = msg.GetDescriptor();
-  const google::protobuf::Reflection* r = msg.GetReflection();
-  const google::protobuf::FieldDescriptor* f =
-      d->FindFieldByName("optional_nested_message");
-  r->ClearField(&msg, f);
-}
-
-TEST(Proto3OptionalTest, SwapNonOptionalMessageField) {
-  protobuf_unittest::TestProto3OptionalMessage msg1;
-  protobuf_unittest::TestProto3OptionalMessage msg2;
-  msg1.mutable_nested_message();
-  const google::protobuf::Descriptor* d = msg1.GetDescriptor();
-  const google::protobuf::Reflection* r = msg1.GetReflection();
-  const google::protobuf::FieldDescriptor* f = d->FindFieldByName("nested_message");
-  r->SwapFields(&msg1, &msg2, {f});
-}
-
-TEST(Proto3OptionalTest, SwapOptionalMessageField) {
-  protobuf_unittest::TestProto3OptionalMessage msg1;
-  protobuf_unittest::TestProto3OptionalMessage msg2;
-  msg1.mutable_optional_nested_message();
-  const google::protobuf::Descriptor* d = msg1.GetDescriptor();
-  const google::protobuf::Reflection* r = msg1.GetReflection();
-  const google::protobuf::FieldDescriptor* f =
-      d->FindFieldByName("optional_nested_message");
-  r->SwapFields(&msg1, &msg2, {f});
-}
-
-void SetAllFieldsZero(protobuf_unittest::TestProto3Optional* msg) {
-  msg->set_optional_int32(0);
-  msg->set_optional_int64(0);
-  msg->set_optional_uint32(0);
-  msg->set_optional_uint64(0);
-  msg->set_optional_sint32(0);
-  msg->set_optional_sint64(0);
-  msg->set_optional_fixed32(0);
-  msg->set_optional_fixed64(0);
-  msg->set_optional_sfixed32(0);
-  msg->set_optional_sfixed64(0);
-  msg->set_optional_float(0);
-  msg->set_optional_double(0);
-  msg->set_optional_bool(false);
-  msg->set_optional_string("");
-  msg->set_optional_bytes("");
-  msg->mutable_optional_nested_message();
-  msg->mutable_lazy_nested_message();
-  msg->set_optional_nested_enum(
-      protobuf_unittest::TestProto3Optional::UNSPECIFIED);
-}
-
-void SetAllFieldsNonZero(protobuf_unittest::TestProto3Optional* msg) {
-  msg->set_optional_int32(101);
-  msg->set_optional_int64(102);
-  msg->set_optional_uint32(103);
-  msg->set_optional_uint64(104);
-  msg->set_optional_sint32(105);
-  msg->set_optional_sint64(106);
-  msg->set_optional_fixed32(107);
-  msg->set_optional_fixed64(108);
-  msg->set_optional_sfixed32(109);
-  msg->set_optional_sfixed64(110);
-  msg->set_optional_float(111);
-  msg->set_optional_double(112);
-  msg->set_optional_bool(true);
-  msg->set_optional_string("abc");
-  msg->set_optional_bytes("def");
-  msg->mutable_optional_nested_message();
-  msg->mutable_lazy_nested_message();
-  msg->set_optional_nested_enum(protobuf_unittest::TestProto3Optional::BAZ);
-}
-
-void TestAllFieldsZero(const protobuf_unittest::TestProto3Optional& msg) {
-  EXPECT_EQ(0, msg.optional_int32());
-  EXPECT_EQ(0, msg.optional_int64());
-  EXPECT_EQ(0, msg.optional_uint32());
-  EXPECT_EQ(0, msg.optional_uint64());
-  EXPECT_EQ(0, msg.optional_sint32());
-  EXPECT_EQ(0, msg.optional_sint64());
-  EXPECT_EQ(0, msg.optional_fixed32());
-  EXPECT_EQ(0, msg.optional_fixed64());
-  EXPECT_EQ(0, msg.optional_sfixed32());
-  EXPECT_EQ(0, msg.optional_sfixed64());
-  EXPECT_EQ(0, msg.optional_float());
-  EXPECT_EQ(0, msg.optional_double());
-  EXPECT_EQ(0, msg.optional_bool());
-  EXPECT_EQ("", msg.optional_string());
-  EXPECT_EQ("", msg.optional_bytes());
-  EXPECT_EQ(protobuf_unittest::TestProto3Optional::UNSPECIFIED,
-            msg.optional_nested_enum());
-
-  const Reflection* r = msg.GetReflection();
-  const Descriptor* d = msg.GetDescriptor();
-  EXPECT_EQ("", r->GetString(msg, d->FindFieldByName("optional_string")));
-}
-
-void TestAllFieldsNonZero(const protobuf_unittest::TestProto3Optional& msg) {
-  EXPECT_EQ(101, msg.optional_int32());
-  EXPECT_EQ(102, msg.optional_int64());
-  EXPECT_EQ(103, msg.optional_uint32());
-  EXPECT_EQ(104, msg.optional_uint64());
-  EXPECT_EQ(105, msg.optional_sint32());
-  EXPECT_EQ(106, msg.optional_sint64());
-  EXPECT_EQ(107, msg.optional_fixed32());
-  EXPECT_EQ(108, msg.optional_fixed64());
-  EXPECT_EQ(109, msg.optional_sfixed32());
-  EXPECT_EQ(110, msg.optional_sfixed64());
-  EXPECT_EQ(111, msg.optional_float());
-  EXPECT_EQ(112, msg.optional_double());
-  EXPECT_EQ(true, msg.optional_bool());
-  EXPECT_EQ("abc", msg.optional_string());
-  EXPECT_EQ("def", msg.optional_bytes());
-  EXPECT_EQ(protobuf_unittest::TestProto3Optional::BAZ,
-            msg.optional_nested_enum());
-}
-
-void TestAllFieldsSet(const protobuf_unittest::TestProto3Optional& msg,
-                      bool set) {
-  EXPECT_EQ(set, msg.has_optional_int32());
-  EXPECT_EQ(set, msg.has_optional_int64());
-  EXPECT_EQ(set, msg.has_optional_uint32());
-  EXPECT_EQ(set, msg.has_optional_uint64());
-  EXPECT_EQ(set, msg.has_optional_sint32());
-  EXPECT_EQ(set, msg.has_optional_sint64());
-  EXPECT_EQ(set, msg.has_optional_fixed32());
-  EXPECT_EQ(set, msg.has_optional_fixed64());
-  EXPECT_EQ(set, msg.has_optional_sfixed32());
-  EXPECT_EQ(set, msg.has_optional_sfixed64());
-  EXPECT_EQ(set, msg.has_optional_float());
-  EXPECT_EQ(set, msg.has_optional_double());
-  EXPECT_EQ(set, msg.has_optional_bool());
-  EXPECT_EQ(set, msg.has_optional_string());
-  EXPECT_EQ(set, msg.has_optional_bytes());
-  EXPECT_EQ(set, msg.has_optional_nested_message());
-  EXPECT_EQ(set, msg.has_lazy_nested_message());
-  EXPECT_EQ(set, msg.has_optional_nested_enum());
-}
-
-TEST(Proto3OptionalTest, BinaryRoundTrip) {
-  protobuf_unittest::TestProto3Optional msg;
-  TestAllFieldsSet(msg, false);
-  SetAllFieldsZero(&msg);
-  TestAllFieldsZero(msg);
-  TestAllFieldsSet(msg, true);
-
-  protobuf_unittest::TestProto3Optional msg2;
-  std::string serialized;
-  msg.SerializeToString(&serialized);
-  EXPECT_TRUE(msg2.ParseFromString(serialized));
-  TestAllFieldsZero(msg2);
-  TestAllFieldsSet(msg2, true);
-}
-
-TEST(Proto3OptionalTest, TextFormatRoundTripZeros) {
-  protobuf_unittest::TestProto3Optional msg;
-  SetAllFieldsZero(&msg);
-
-  protobuf_unittest::TestProto3Optional msg2;
-  std::string text;
-  EXPECT_TRUE(TextFormat::PrintToString(msg, &text));
-  EXPECT_TRUE(TextFormat::ParseFromString(text, &msg2));
-  TestAllFieldsSet(msg2, true);
-  TestAllFieldsZero(msg2);
-}
-
-TEST(Proto3OptionalTest, TextFormatRoundTripNonZeros) {
-  protobuf_unittest::TestProto3Optional msg;
-  SetAllFieldsNonZero(&msg);
-
-  protobuf_unittest::TestProto3Optional msg2;
-  std::string text;
-  EXPECT_TRUE(TextFormat::PrintToString(msg, &text));
-  EXPECT_TRUE(TextFormat::ParseFromString(text, &msg2));
-  TestAllFieldsSet(msg2, true);
-  TestAllFieldsNonZero(msg2);
-}
-
-TEST(Proto3OptionalTest, SwapRoundTripZero) {
-  protobuf_unittest::TestProto3Optional msg;
-  SetAllFieldsZero(&msg);
-  TestAllFieldsSet(msg, true);
-
-  protobuf_unittest::TestProto3Optional msg2;
-  msg.Swap(&msg2);
-  TestAllFieldsSet(msg2, true);
-  TestAllFieldsZero(msg2);
-}
-
-TEST(Proto3OptionalTest, SwapRoundTripNonZero) {
-  protobuf_unittest::TestProto3Optional msg;
-  SetAllFieldsNonZero(&msg);
-  TestAllFieldsSet(msg, true);
-
-  protobuf_unittest::TestProto3Optional msg2;
-  msg.Swap(&msg2);
-  TestAllFieldsSet(msg2, true);
-  TestAllFieldsNonZero(msg2);
-}
-
-TEST(Proto3OptionalTest, ReflectiveSwapRoundTrip) {
-  protobuf_unittest::TestProto3Optional msg;
-  SetAllFieldsZero(&msg);
-  TestAllFieldsSet(msg, true);
-
-  protobuf_unittest::TestProto3Optional msg2;
-  msg2.GetReflection()->Swap(&msg, &msg2);
-  TestAllFieldsSet(msg2, true);
-  TestAllFieldsZero(msg2);
-}
-
-TEST(Proto3OptionalTest, PlainFields) {
-  const Descriptor* d = TestAllTypes::descriptor();
-
-  EXPECT_FALSE(d->FindFieldByName("optional_int32")->has_presence());
-  EXPECT_TRUE(d->FindFieldByName("oneof_nested_message")->has_presence());
-}
-
-}  // namespace
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/proto3_lite_unittest.cc b/libs/protobuf/src/google/protobuf/proto3_lite_unittest.cc
deleted file mode 100644
index abeeedb..0000000
--- a/libs/protobuf/src/google/protobuf/proto3_lite_unittest.cc
+++ /dev/null
@@ -1,43 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <google/protobuf/unittest_proto3.pb.h>
-
-#define LITE_TEST_NAME Proto3LiteTest
-#define UNITTEST ::proto3_unittest
-
-// Must include after the above macros.
-#include <google/protobuf/proto3_lite_unittest.inc>
-
-// Make extract script happy.
-namespace google {
-namespace protobuf {
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/proto3_lite_unittest.inc b/libs/protobuf/src/google/protobuf/proto3_lite_unittest.inc
deleted file mode 100644
index 5878163..0000000
--- a/libs/protobuf/src/google/protobuf/proto3_lite_unittest.inc
+++ /dev/null
@@ -1,149 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <memory>
-#include <string>
-#include <vector>
-
-#include <google/protobuf/arena.h>
-#include <google/protobuf/testing/googletest.h>
-#include <gtest/gtest.h>
-
-using UNITTEST::TestAllTypes;
-
-namespace google {
-namespace protobuf {
-namespace {
-// We selectively set/check a few representative fields rather than all fields
-// as this test is only expected to cover the basics of lite support.
-void SetAllFields(TestAllTypes* m) {
-  m->set_optional_int32(100);
-  m->set_optional_string("asdf");
-  m->set_optional_bytes("jkl;");
-  m->mutable_optional_nested_message()->set_bb(42);
-  m->mutable_optional_foreign_message()->set_c(43);
-  m->set_optional_nested_enum(UNITTEST::TestAllTypes::BAZ);
-  m->set_optional_foreign_enum(
-      UNITTEST::FOREIGN_BAZ);
-  m->mutable_optional_lazy_message()->set_bb(45);
-  m->mutable_optional_unverified_lazy_message()->set_bb(46);
-  m->add_repeated_int32(100);
-  m->add_repeated_string("asdf");
-  m->add_repeated_bytes("jkl;");
-  m->add_repeated_nested_message()->set_bb(46);
-  m->add_repeated_foreign_message()->set_c(47);
-  m->add_repeated_nested_enum(UNITTEST::TestAllTypes::BAZ);
-  m->add_repeated_foreign_enum(
-      UNITTEST::FOREIGN_BAZ);
-  m->add_repeated_lazy_message()->set_bb(49);
-
-  m->set_oneof_uint32(1);
-  m->mutable_oneof_nested_message()->set_bb(50);
-  m->set_oneof_string("test");  // only this one remains set
-}
-
-void ExpectAllFieldsSet(const TestAllTypes& m) {
-  EXPECT_EQ(100, m.optional_int32());
-  EXPECT_EQ("asdf", m.optional_string());
-  EXPECT_EQ("jkl;", m.optional_bytes());
-  EXPECT_EQ(true, m.has_optional_nested_message());
-  EXPECT_EQ(42, m.optional_nested_message().bb());
-  EXPECT_EQ(true, m.has_optional_foreign_message());
-  EXPECT_EQ(43, m.optional_foreign_message().c());
-  EXPECT_EQ(UNITTEST::TestAllTypes::BAZ, m.optional_nested_enum());
-  EXPECT_EQ(UNITTEST::FOREIGN_BAZ,
-            m.optional_foreign_enum());
-  EXPECT_EQ(true, m.has_optional_lazy_message());
-  EXPECT_EQ(45, m.optional_lazy_message().bb());
-  EXPECT_EQ(true, m.has_optional_unverified_lazy_message());
-  EXPECT_EQ(46, m.optional_unverified_lazy_message().bb());
-
-  EXPECT_EQ(1, m.repeated_int32_size());
-  EXPECT_EQ(100, m.repeated_int32(0));
-  EXPECT_EQ(1, m.repeated_string_size());
-  EXPECT_EQ("asdf", m.repeated_string(0));
-  EXPECT_EQ(1, m.repeated_bytes_size());
-  EXPECT_EQ("jkl;", m.repeated_bytes(0));
-  EXPECT_EQ(1, m.repeated_nested_message_size());
-  EXPECT_EQ(46, m.repeated_nested_message(0).bb());
-  EXPECT_EQ(1, m.repeated_foreign_message_size());
-  EXPECT_EQ(47, m.repeated_foreign_message(0).c());
-  EXPECT_EQ(1, m.repeated_nested_enum_size());
-  EXPECT_EQ(UNITTEST::TestAllTypes::BAZ, m.repeated_nested_enum(0));
-  EXPECT_EQ(1, m.repeated_foreign_enum_size());
-  EXPECT_EQ(UNITTEST::FOREIGN_BAZ,
-            m.repeated_foreign_enum(0));
-  EXPECT_EQ(1, m.repeated_lazy_message_size());
-  EXPECT_EQ(49, m.repeated_lazy_message(0).bb());
-
-  EXPECT_EQ(UNITTEST::TestAllTypes::kOneofString,
-            m.oneof_field_case());
-  EXPECT_EQ("test", m.oneof_string());
-}
-
-// In this file we only test some basic functionalities of in proto3 and expect
-// the rest is fully tested in proto2 unittests because proto3 shares most code
-// with proto2.
-
-TEST(LITE_TEST_NAME, Parsing) {
-  TestAllTypes original;
-  SetAllFields(&original);
-
-  TestAllTypes msg;
-  msg.ParseFromString(original.SerializeAsString());
-  ExpectAllFieldsSet(msg);
-}
-
-TEST(LITE_TEST_NAME, Swap) {
-  // Test Swap().
-  TestAllTypes msg1;
-  TestAllTypes msg2;
-  msg1.set_optional_string("123");
-  msg2.set_optional_string("3456");
-  msg1.Swap(&msg2);
-  EXPECT_EQ("3456", msg1.optional_string());
-  EXPECT_EQ("123", msg2.optional_string());
-  EXPECT_EQ(msg1.ByteSize(), msg2.ByteSize() + 1);
-}
-
-TEST(LITE_TEST_NAME, OneofHazzers) {
-  TestAllTypes msg;
-  msg.set_oneof_uint32(1);
-  msg.set_oneof_string("test");
-
-  EXPECT_EQ(true, msg.has_oneof_string());
-  EXPECT_EQ(false, msg.has_oneof_uint32());
-  EXPECT_EQ(false, msg.has_oneof_bytes());
-  EXPECT_EQ(false, msg.has_oneof_nested_message());
-}
-
-}  // namespace
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/reflection.h b/libs/protobuf/src/google/protobuf/reflection.h
deleted file mode 100644
index 7b75a43..0000000
--- a/libs/protobuf/src/google/protobuf/reflection.h
+++ /dev/null
@@ -1,570 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// This header defines the RepeatedFieldRef class template used to access
-// repeated fields with protobuf reflection API.
-#ifndef GOOGLE_PROTOBUF_REFLECTION_H__
-#define GOOGLE_PROTOBUF_REFLECTION_H__
-
-
-#include <memory>
-
-#include <google/protobuf/message.h>
-#include <google/protobuf/generated_enum_util.h>
-
-#ifdef SWIG
-#error "You cannot SWIG proto headers"
-#endif
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-namespace internal {
-template <typename T, typename Enable = void>
-struct RefTypeTraits;
-}  // namespace internal
-
-template <typename T>
-RepeatedFieldRef<T> Reflection::GetRepeatedFieldRef(
-    const Message& message, const FieldDescriptor* field) const {
-  return RepeatedFieldRef<T>(message, field);
-}
-
-template <typename T>
-MutableRepeatedFieldRef<T> Reflection::GetMutableRepeatedFieldRef(
-    Message* message, const FieldDescriptor* field) const {
-  return MutableRepeatedFieldRef<T>(message, field);
-}
-
-// RepeatedFieldRef definition for non-message types.
-template <typename T>
-class RepeatedFieldRef<
-    T, typename std::enable_if<!std::is_base_of<Message, T>::value>::type> {
-  typedef typename internal::RefTypeTraits<T>::iterator IteratorType;
-  typedef typename internal::RefTypeTraits<T>::AccessorType AccessorType;
-
- public:
-  bool empty() const { return accessor_->IsEmpty(data_); }
-  int size() const { return accessor_->Size(data_); }
-  T Get(int index) const { return accessor_->template Get<T>(data_, index); }
-
-  typedef IteratorType iterator;
-  typedef IteratorType const_iterator;
-  typedef T value_type;
-  typedef T& reference;
-  typedef const T& const_reference;
-  typedef int size_type;
-  typedef ptrdiff_t difference_type;
-
-  iterator begin() const { return iterator(data_, accessor_, true); }
-  iterator end() const { return iterator(data_, accessor_, false); }
-
- private:
-  friend class Reflection;
-  RepeatedFieldRef(const Message& message, const FieldDescriptor* field) {
-    const Reflection* reflection = message.GetReflection();
-    data_ = reflection->RepeatedFieldData(const_cast<Message*>(&message), field,
-                                          internal::RefTypeTraits<T>::cpp_type,
-                                          nullptr);
-    accessor_ = reflection->RepeatedFieldAccessor(field);
-  }
-
-  const void* data_;
-  const AccessorType* accessor_;
-};
-
-// MutableRepeatedFieldRef definition for non-message types.
-template <typename T>
-class MutableRepeatedFieldRef<
-    T, typename std::enable_if<!std::is_base_of<Message, T>::value>::type> {
-  typedef typename internal::RefTypeTraits<T>::AccessorType AccessorType;
-
- public:
-  bool empty() const { return accessor_->IsEmpty(data_); }
-  int size() const { return accessor_->Size(data_); }
-  T Get(int index) const { return accessor_->template Get<T>(data_, index); }
-
-  void Set(int index, const T& value) const {
-    accessor_->template Set<T>(data_, index, value);
-  }
-  void Add(const T& value) const { accessor_->template Add<T>(data_, value); }
-  void RemoveLast() const { accessor_->RemoveLast(data_); }
-  void SwapElements(int index1, int index2) const {
-    accessor_->SwapElements(data_, index1, index2);
-  }
-  void Clear() const { accessor_->Clear(data_); }
-
-  void Swap(const MutableRepeatedFieldRef& other) const {
-    accessor_->Swap(data_, other.accessor_, other.data_);
-  }
-
-  template <typename Container>
-  void MergeFrom(const Container& container) const {
-    typedef typename Container::const_iterator Iterator;
-    for (Iterator it = container.begin(); it != container.end(); ++it) {
-      Add(*it);
-    }
-  }
-  template <typename Container>
-  void CopyFrom(const Container& container) const {
-    Clear();
-    MergeFrom(container);
-  }
-
- private:
-  friend class Reflection;
-  MutableRepeatedFieldRef(Message* message, const FieldDescriptor* field) {
-    const Reflection* reflection = message->GetReflection();
-    data_ = reflection->RepeatedFieldData(
-        message, field, internal::RefTypeTraits<T>::cpp_type, nullptr);
-    accessor_ = reflection->RepeatedFieldAccessor(field);
-  }
-
-  void* data_;
-  const AccessorType* accessor_;
-};
-
-// RepeatedFieldRef definition for message types.
-template <typename T>
-class RepeatedFieldRef<
-    T, typename std::enable_if<std::is_base_of<Message, T>::value>::type> {
-  typedef typename internal::RefTypeTraits<T>::iterator IteratorType;
-  typedef typename internal::RefTypeTraits<T>::AccessorType AccessorType;
-
- public:
-  bool empty() const { return accessor_->IsEmpty(data_); }
-  int size() const { return accessor_->Size(data_); }
-  // This method returns a reference to the underlying message object if it
-  // exists. If a message object doesn't exist (e.g., data stored in serialized
-  // form), scratch_space will be filled with the data and a reference to it
-  // will be returned.
-  //
-  // Example:
-  //   RepeatedFieldRef<Message> h = ...
-  //   unique_ptr<Message> scratch_space(h.NewMessage());
-  //   const Message& item = h.Get(index, scratch_space.get());
-  const T& Get(int index, T* scratch_space) const {
-    return *static_cast<const T*>(accessor_->Get(data_, index, scratch_space));
-  }
-  // Create a new message of the same type as the messages stored in this
-  // repeated field. Caller takes ownership of the returned object.
-  T* NewMessage() const { return static_cast<T*>(default_instance_->New()); }
-
-  typedef IteratorType iterator;
-  typedef IteratorType const_iterator;
-  typedef T value_type;
-  typedef T& reference;
-  typedef const T& const_reference;
-  typedef int size_type;
-  typedef ptrdiff_t difference_type;
-
-  iterator begin() const {
-    return iterator(data_, accessor_, true, NewMessage());
-  }
-  iterator end() const {
-    // The end iterator must not be dereferenced, no need for scratch space.
-    return iterator(data_, accessor_, false, nullptr);
-  }
-
- private:
-  friend class Reflection;
-  RepeatedFieldRef(const Message& message, const FieldDescriptor* field) {
-    const Reflection* reflection = message.GetReflection();
-    data_ = reflection->RepeatedFieldData(
-        const_cast<Message*>(&message), field,
-        internal::RefTypeTraits<T>::cpp_type,
-        internal::RefTypeTraits<T>::GetMessageFieldDescriptor());
-    accessor_ = reflection->RepeatedFieldAccessor(field);
-    default_instance_ =
-        reflection->GetMessageFactory()->GetPrototype(field->message_type());
-  }
-
-  const void* data_;
-  const AccessorType* accessor_;
-  const Message* default_instance_;
-};
-
-// MutableRepeatedFieldRef definition for message types.
-template <typename T>
-class MutableRepeatedFieldRef<
-    T, typename std::enable_if<std::is_base_of<Message, T>::value>::type> {
-  typedef typename internal::RefTypeTraits<T>::AccessorType AccessorType;
-
- public:
-  bool empty() const { return accessor_->IsEmpty(data_); }
-  int size() const { return accessor_->Size(data_); }
-  // See comments for RepeatedFieldRef<Message>::Get()
-  const T& Get(int index, T* scratch_space) const {
-    return *static_cast<const T*>(accessor_->Get(data_, index, scratch_space));
-  }
-  // Create a new message of the same type as the messages stored in this
-  // repeated field. Caller takes ownership of the returned object.
-  T* NewMessage() const { return static_cast<T*>(default_instance_->New()); }
-
-  void Set(int index, const T& value) const {
-    accessor_->Set(data_, index, &value);
-  }
-  void Add(const T& value) const { accessor_->Add(data_, &value); }
-  void RemoveLast() const { accessor_->RemoveLast(data_); }
-  void SwapElements(int index1, int index2) const {
-    accessor_->SwapElements(data_, index1, index2);
-  }
-  void Clear() const { accessor_->Clear(data_); }
-
-  void Swap(const MutableRepeatedFieldRef& other) const {
-    accessor_->Swap(data_, other.accessor_, other.data_);
-  }
-
-  template <typename Container>
-  void MergeFrom(const Container& container) const {
-    typedef typename Container::const_iterator Iterator;
-    for (Iterator it = container.begin(); it != container.end(); ++it) {
-      Add(*it);
-    }
-  }
-  template <typename Container>
-  void CopyFrom(const Container& container) const {
-    Clear();
-    MergeFrom(container);
-  }
-
- private:
-  friend class Reflection;
-  MutableRepeatedFieldRef(Message* message, const FieldDescriptor* field) {
-    const Reflection* reflection = message->GetReflection();
-    data_ = reflection->RepeatedFieldData(
-        message, field, internal::RefTypeTraits<T>::cpp_type,
-        internal::RefTypeTraits<T>::GetMessageFieldDescriptor());
-    accessor_ = reflection->RepeatedFieldAccessor(field);
-    default_instance_ =
-        reflection->GetMessageFactory()->GetPrototype(field->message_type());
-  }
-
-  void* data_;
-  const AccessorType* accessor_;
-  const Message* default_instance_;
-};
-
-namespace internal {
-// Interfaces used to implement reflection RepeatedFieldRef API.
-// Reflection::GetRepeatedAccessor() should return a pointer to an singleton
-// object that implements the below interface.
-//
-// This interface passes/returns values using void pointers. The actual type
-// of the value depends on the field's cpp_type. Following is a mapping from
-// cpp_type to the type that should be used in this interface:
-//
-//   field->cpp_type()      T                Actual type of void*
-//   CPPTYPE_INT32        int32_t                 int32_t
-//   CPPTYPE_UINT32       uint32_t                uint32_t
-//   CPPTYPE_INT64        int64_t                 int64_t
-//   CPPTYPE_UINT64       uint64_t                uint64_t
-//   CPPTYPE_DOUBLE       double                  double
-//   CPPTYPE_FLOAT        float                   float
-//   CPPTYPE_BOOL         bool                    bool
-//   CPPTYPE_ENUM         generated enum type     int32_t
-//   CPPTYPE_STRING       string                  std::string
-//   CPPTYPE_MESSAGE      generated message type  google::protobuf::Message
-//                        or google::protobuf::Message
-//
-// Note that for enums we use int32_t in the interface.
-//
-// You can map from T to the actual type using RefTypeTraits:
-//   typedef RefTypeTraits<T>::AccessorValueType ActualType;
-class PROTOBUF_EXPORT RepeatedFieldAccessor {
- public:
-  // Typedefs for clarity.
-  typedef void Field;
-  typedef void Value;
-  typedef void Iterator;
-
-  virtual bool IsEmpty(const Field* data) const = 0;
-  virtual int Size(const Field* data) const = 0;
-  // Depends on the underlying representation of the repeated field, this
-  // method can return a pointer to the underlying object if such an object
-  // exists, or fill the data into scratch_space and return scratch_space.
-  // Callers of this method must ensure scratch_space is a valid pointer
-  // to a mutable object of the correct type.
-  virtual const Value* Get(const Field* data, int index,
-                           Value* scratch_space) const = 0;
-
-  virtual void Clear(Field* data) const = 0;
-  virtual void Set(Field* data, int index, const Value* value) const = 0;
-  virtual void Add(Field* data, const Value* value) const = 0;
-  virtual void RemoveLast(Field* data) const = 0;
-  virtual void SwapElements(Field* data, int index1, int index2) const = 0;
-  virtual void Swap(Field* data, const RepeatedFieldAccessor* other_mutator,
-                    Field* other_data) const = 0;
-
-  // Create an iterator that points at the beginning of the repeated field.
-  virtual Iterator* BeginIterator(const Field* data) const = 0;
-  // Create an iterator that points at the end of the repeated field.
-  virtual Iterator* EndIterator(const Field* data) const = 0;
-  // Make a copy of an iterator and return the new copy.
-  virtual Iterator* CopyIterator(const Field* data,
-                                 const Iterator* iterator) const = 0;
-  // Move an iterator to point to the next element.
-  virtual Iterator* AdvanceIterator(const Field* data,
-                                    Iterator* iterator) const = 0;
-  // Compare whether two iterators point to the same element.
-  virtual bool EqualsIterator(const Field* data, const Iterator* a,
-                              const Iterator* b) const = 0;
-  // Delete an iterator created by BeginIterator(), EndIterator() and
-  // CopyIterator().
-  virtual void DeleteIterator(const Field* data, Iterator* iterator) const = 0;
-  // Like Get() but for iterators.
-  virtual const Value* GetIteratorValue(const Field* data,
-                                        const Iterator* iterator,
-                                        Value* scratch_space) const = 0;
-
-  // Templated methods that make using this interface easier for non-message
-  // types.
-  template <typename T>
-  T Get(const Field* data, int index) const {
-    typedef typename RefTypeTraits<T>::AccessorValueType ActualType;
-    ActualType scratch_space;
-    return static_cast<T>(*reinterpret_cast<const ActualType*>(
-        Get(data, index, static_cast<Value*>(&scratch_space))));
-  }
-
-  template <typename T, typename ValueType>
-  void Set(Field* data, int index, const ValueType& value) const {
-    typedef typename RefTypeTraits<T>::AccessorValueType ActualType;
-    // In this RepeatedFieldAccessor interface we pass/return data using
-    // raw pointers. Type of the data these raw pointers point to should
-    // be ActualType. Here we have a ValueType object and want a ActualType
-    // pointer. We can't cast a ValueType pointer to an ActualType pointer
-    // directly because their type might be different (for enums ValueType
-    // may be a generated enum type while ActualType is int32_t). To be safe
-    // we make a copy to get a temporary ActualType object and use it.
-    ActualType tmp = static_cast<ActualType>(value);
-    Set(data, index, static_cast<const Value*>(&tmp));
-  }
-
-  template <typename T, typename ValueType>
-  void Add(Field* data, const ValueType& value) const {
-    typedef typename RefTypeTraits<T>::AccessorValueType ActualType;
-    // In this RepeatedFieldAccessor interface we pass/return data using
-    // raw pointers. Type of the data these raw pointers point to should
-    // be ActualType. Here we have a ValueType object and want a ActualType
-    // pointer. We can't cast a ValueType pointer to an ActualType pointer
-    // directly because their type might be different (for enums ValueType
-    // may be a generated enum type while ActualType is int32_t). To be safe
-    // we make a copy to get a temporary ActualType object and use it.
-    ActualType tmp = static_cast<ActualType>(value);
-    Add(data, static_cast<const Value*>(&tmp));
-  }
-
- protected:
-  // We want the destructor to be completely trivial as to allow it to be
-  // a function local static. Hence we make it non-virtual and protected,
-  // this class only live as part of a global singleton and should not be
-  // deleted.
-  ~RepeatedFieldAccessor() = default;
-};
-
-// Implement (Mutable)RepeatedFieldRef::iterator
-template <typename T>
-class RepeatedFieldRefIterator {
-  typedef typename RefTypeTraits<T>::AccessorValueType AccessorValueType;
-  typedef typename RefTypeTraits<T>::IteratorValueType IteratorValueType;
-  typedef typename RefTypeTraits<T>::IteratorPointerType IteratorPointerType;
-
- public:
-  using iterator_category = std::forward_iterator_tag;
-  using value_type = T;
-  using pointer = T*;
-  using reference = T&;
-  using difference_type = std::ptrdiff_t;
-
-  // Constructor for non-message fields.
-  RepeatedFieldRefIterator(const void* data,
-                           const RepeatedFieldAccessor* accessor, bool begin)
-      : data_(data),
-        accessor_(accessor),
-        iterator_(begin ? accessor->BeginIterator(data)
-                        : accessor->EndIterator(data)),
-        // The end iterator must not be dereferenced, no need for scratch space.
-        scratch_space_(begin ? new AccessorValueType : nullptr) {}
-  // Constructor for message fields.
-  RepeatedFieldRefIterator(const void* data,
-                           const RepeatedFieldAccessor* accessor, bool begin,
-                           AccessorValueType* scratch_space)
-      : data_(data),
-        accessor_(accessor),
-        iterator_(begin ? accessor->BeginIterator(data)
-                        : accessor->EndIterator(data)),
-        scratch_space_(scratch_space) {}
-  ~RepeatedFieldRefIterator() { accessor_->DeleteIterator(data_, iterator_); }
-  RepeatedFieldRefIterator operator++(int) {
-    RepeatedFieldRefIterator tmp(*this);
-    iterator_ = accessor_->AdvanceIterator(data_, iterator_);
-    return tmp;
-  }
-  RepeatedFieldRefIterator& operator++() {
-    iterator_ = accessor_->AdvanceIterator(data_, iterator_);
-    return *this;
-  }
-  IteratorValueType operator*() const {
-    return static_cast<IteratorValueType>(
-        *static_cast<const AccessorValueType*>(accessor_->GetIteratorValue(
-            data_, iterator_, scratch_space_.get())));
-  }
-  IteratorPointerType operator->() const {
-    return static_cast<IteratorPointerType>(
-        accessor_->GetIteratorValue(data_, iterator_, scratch_space_.get()));
-  }
-  bool operator!=(const RepeatedFieldRefIterator& other) const {
-    assert(data_ == other.data_);
-    assert(accessor_ == other.accessor_);
-    return !accessor_->EqualsIterator(data_, iterator_, other.iterator_);
-  }
-  bool operator==(const RepeatedFieldRefIterator& other) const {
-    return !this->operator!=(other);
-  }
-
-  RepeatedFieldRefIterator(const RepeatedFieldRefIterator& other)
-      : data_(other.data_),
-        accessor_(other.accessor_),
-        iterator_(accessor_->CopyIterator(data_, other.iterator_)) {}
-  RepeatedFieldRefIterator& operator=(const RepeatedFieldRefIterator& other) {
-    if (this != &other) {
-      accessor_->DeleteIterator(data_, iterator_);
-      data_ = other.data_;
-      accessor_ = other.accessor_;
-      iterator_ = accessor_->CopyIterator(data_, other.iterator_);
-    }
-    return *this;
-  }
-
- protected:
-  const void* data_;
-  const RepeatedFieldAccessor* accessor_;
-  void* iterator_;
-  std::unique_ptr<AccessorValueType> scratch_space_;
-};
-
-// TypeTraits that maps the type parameter T of RepeatedFieldRef or
-// MutableRepeatedFieldRef to corresponding iterator type,
-// RepeatedFieldAccessor type, etc.
-template <typename T>
-struct PrimitiveTraits {
-  static constexpr bool is_primitive = false;
-};
-#define DEFINE_PRIMITIVE(TYPE, type)                 \
-  template <>                                        \
-  struct PrimitiveTraits<type> {                     \
-    static const bool is_primitive = true;           \
-    static const FieldDescriptor::CppType cpp_type = \
-        FieldDescriptor::CPPTYPE_##TYPE;             \
-  };
-DEFINE_PRIMITIVE(INT32, int32_t)
-DEFINE_PRIMITIVE(UINT32, uint32_t)
-DEFINE_PRIMITIVE(INT64, int64_t)
-DEFINE_PRIMITIVE(UINT64, uint64_t)
-DEFINE_PRIMITIVE(FLOAT, float)
-DEFINE_PRIMITIVE(DOUBLE, double)
-DEFINE_PRIMITIVE(BOOL, bool)
-#undef DEFINE_PRIMITIVE
-
-template <typename T>
-struct RefTypeTraits<
-    T, typename std::enable_if<PrimitiveTraits<T>::is_primitive>::type> {
-  typedef RepeatedFieldRefIterator<T> iterator;
-  typedef RepeatedFieldAccessor AccessorType;
-  typedef T AccessorValueType;
-  typedef T IteratorValueType;
-  typedef T* IteratorPointerType;
-  static constexpr FieldDescriptor::CppType cpp_type =
-      PrimitiveTraits<T>::cpp_type;
-  static const Descriptor* GetMessageFieldDescriptor() { return nullptr; }
-};
-
-template <typename T>
-struct RefTypeTraits<
-    T, typename std::enable_if<is_proto_enum<T>::value>::type> {
-  typedef RepeatedFieldRefIterator<T> iterator;
-  typedef RepeatedFieldAccessor AccessorType;
-  // We use int32_t for repeated enums in RepeatedFieldAccessor.
-  typedef int32_t AccessorValueType;
-  typedef T IteratorValueType;
-  typedef int32_t* IteratorPointerType;
-  static constexpr FieldDescriptor::CppType cpp_type =
-      FieldDescriptor::CPPTYPE_ENUM;
-  static const Descriptor* GetMessageFieldDescriptor() { return nullptr; }
-};
-
-template <typename T>
-struct RefTypeTraits<
-    T, typename std::enable_if<std::is_same<std::string, T>::value>::type> {
-  typedef RepeatedFieldRefIterator<T> iterator;
-  typedef RepeatedFieldAccessor AccessorType;
-  typedef std::string AccessorValueType;
-  typedef const std::string IteratorValueType;
-  typedef const std::string* IteratorPointerType;
-  static constexpr FieldDescriptor::CppType cpp_type =
-      FieldDescriptor::CPPTYPE_STRING;
-  static const Descriptor* GetMessageFieldDescriptor() { return nullptr; }
-};
-
-template <typename T>
-struct MessageDescriptorGetter {
-  static const Descriptor* get() {
-    return T::default_instance().GetDescriptor();
-  }
-};
-template <>
-struct MessageDescriptorGetter<Message> {
-  static const Descriptor* get() { return nullptr; }
-};
-
-template <typename T>
-struct RefTypeTraits<
-    T, typename std::enable_if<std::is_base_of<Message, T>::value>::type> {
-  typedef RepeatedFieldRefIterator<T> iterator;
-  typedef RepeatedFieldAccessor AccessorType;
-  typedef Message AccessorValueType;
-  typedef const T& IteratorValueType;
-  typedef const T* IteratorPointerType;
-  static constexpr FieldDescriptor::CppType cpp_type =
-      FieldDescriptor::CPPTYPE_MESSAGE;
-  static const Descriptor* GetMessageFieldDescriptor() {
-    return MessageDescriptorGetter<T>::get();
-  }
-};
-}  // namespace internal
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
-
-#endif  // GOOGLE_PROTOBUF_REFLECTION_H__
diff --git a/libs/protobuf/src/google/protobuf/reflection_internal.h b/libs/protobuf/src/google/protobuf/reflection_internal.h
deleted file mode 100644
index f749c3e..0000000
--- a/libs/protobuf/src/google/protobuf/reflection_internal.h
+++ /dev/null
@@ -1,364 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef GOOGLE_PROTOBUF_REFLECTION_INTERNAL_H__
-#define GOOGLE_PROTOBUF_REFLECTION_INTERNAL_H__
-
-#include <google/protobuf/map_field.h>
-#include <google/protobuf/reflection.h>
-#include <google/protobuf/repeated_field.h>
-
-namespace google {
-namespace protobuf {
-namespace internal {
-// A base class for RepeatedFieldAccessor implementations that can support
-// random-access efficiently. All iterator methods delegates the work to
-// corresponding random-access methods.
-class RandomAccessRepeatedFieldAccessor : public RepeatedFieldAccessor {
- public:
-  Iterator* BeginIterator(const Field* /*data*/) const override {
-    return PositionToIterator(0);
-  }
-  Iterator* EndIterator(const Field* data) const override {
-    return PositionToIterator(this->Size(data));
-  }
-  Iterator* CopyIterator(const Field* /*data*/,
-                         const Iterator* iterator) const override {
-    return const_cast<Iterator*>(iterator);
-  }
-  Iterator* AdvanceIterator(const Field* /*data*/,
-                            Iterator* iterator) const override {
-    return PositionToIterator(IteratorToPosition(iterator) + 1);
-  }
-  bool EqualsIterator(const Field* /*data*/, const Iterator* a,
-                      const Iterator* b) const override {
-    return a == b;
-  }
-  void DeleteIterator(const Field* /*data*/,
-                      Iterator* /*iterator*/) const override {}
-  const Value* GetIteratorValue(const Field* data, const Iterator* iterator,
-                                Value* scratch_space) const override {
-    return Get(data, static_cast<int>(IteratorToPosition(iterator)),
-               scratch_space);
-  }
-
- protected:
-  ~RandomAccessRepeatedFieldAccessor() = default;
-
- private:
-  static intptr_t IteratorToPosition(const Iterator* iterator) {
-    return reinterpret_cast<intptr_t>(iterator);
-  }
-  static Iterator* PositionToIterator(intptr_t position) {
-    return reinterpret_cast<Iterator*>(position);
-  }
-};
-
-// Base class for RepeatedFieldAccessor implementations that manipulates
-// RepeatedField<T>.
-template <typename T>
-class RepeatedFieldWrapper : public RandomAccessRepeatedFieldAccessor {
- public:
-  RepeatedFieldWrapper() {}
-  bool IsEmpty(const Field* data) const override {
-    return GetRepeatedField(data)->empty();
-  }
-  int Size(const Field* data) const override {
-    return GetRepeatedField(data)->size();
-  }
-  const Value* Get(const Field* data, int index,
-                   Value* scratch_space) const override {
-    return ConvertFromT(GetRepeatedField(data)->Get(index), scratch_space);
-  }
-  void Clear(Field* data) const override {
-    MutableRepeatedField(data)->Clear();
-  }
-  void Set(Field* data, int index, const Value* value) const override {
-    MutableRepeatedField(data)->Set(index, ConvertToT(value));
-  }
-  void Add(Field* data, const Value* value) const override {
-    MutableRepeatedField(data)->Add(ConvertToT(value));
-  }
-  void RemoveLast(Field* data) const override {
-    MutableRepeatedField(data)->RemoveLast();
-  }
-  void SwapElements(Field* data, int index1, int index2) const override {
-    MutableRepeatedField(data)->SwapElements(index1, index2);
-  }
-
- protected:
-  ~RepeatedFieldWrapper() = default;
-  typedef RepeatedField<T> RepeatedFieldType;
-  static const RepeatedFieldType* GetRepeatedField(const Field* data) {
-    return reinterpret_cast<const RepeatedFieldType*>(data);
-  }
-  static RepeatedFieldType* MutableRepeatedField(Field* data) {
-    return reinterpret_cast<RepeatedFieldType*>(data);
-  }
-
-  // Convert an object received by this accessor to an object to be stored in
-  // the underlying RepeatedField.
-  virtual T ConvertToT(const Value* value) const = 0;
-
-  // Convert an object stored in RepeatedPtrField to an object that will be
-  // returned by this accessor. If the two objects have the same type (true for
-  // string fields with ctype=STRING), a pointer to the source object can be
-  // returned directly. Otherwise, data should be copied from value to
-  // scratch_space and scratch_space should be returned.
-  virtual const Value* ConvertFromT(const T& value,
-                                    Value* scratch_space) const = 0;
-};
-
-// Base class for RepeatedFieldAccessor implementations that manipulates
-// RepeatedPtrField<T>.
-template <typename T>
-class RepeatedPtrFieldWrapper : public RandomAccessRepeatedFieldAccessor {
- public:
-  bool IsEmpty(const Field* data) const override {
-    return GetRepeatedField(data)->empty();
-  }
-  int Size(const Field* data) const override {
-    return GetRepeatedField(data)->size();
-  }
-  const Value* Get(const Field* data, int index,
-                   Value* scratch_space) const override {
-    return ConvertFromT(GetRepeatedField(data)->Get(index), scratch_space);
-  }
-  void Clear(Field* data) const override {
-    MutableRepeatedField(data)->Clear();
-  }
-  void Set(Field* data, int index, const Value* value) const override {
-    ConvertToT(value, MutableRepeatedField(data)->Mutable(index));
-  }
-  void Add(Field* data, const Value* value) const override {
-    T* allocated = New(value);
-    ConvertToT(value, allocated);
-    MutableRepeatedField(data)->AddAllocated(allocated);
-  }
-  void RemoveLast(Field* data) const override {
-    MutableRepeatedField(data)->RemoveLast();
-  }
-  void SwapElements(Field* data, int index1, int index2) const override {
-    MutableRepeatedField(data)->SwapElements(index1, index2);
-  }
-
- protected:
-  ~RepeatedPtrFieldWrapper() = default;
-  typedef RepeatedPtrField<T> RepeatedFieldType;
-  static const RepeatedFieldType* GetRepeatedField(const Field* data) {
-    return reinterpret_cast<const RepeatedFieldType*>(data);
-  }
-  static RepeatedFieldType* MutableRepeatedField(Field* data) {
-    return reinterpret_cast<RepeatedFieldType*>(data);
-  }
-
-  // Create a new T instance. For repeated message fields, T can be specified
-  // as google::protobuf::Message so we can't use "new T()" directly. In that case, value
-  // should be a message of the same type (it's ensured by the caller) and a
-  // new message object will be created using it.
-  virtual T* New(const Value* value) const = 0;
-
-  // Convert an object received by this accessor to an object that will be
-  // stored in the underlying RepeatedPtrField.
-  virtual void ConvertToT(const Value* value, T* result) const = 0;
-
-  // Convert an object stored in RepeatedPtrField to an object that will be
-  // returned by this accessor. If the two objects have the same type (true for
-  // string fields with ctype=STRING), a pointer to the source object can be
-  // returned directly. Otherwise, data should be copied from value to
-  // scratch_space and scratch_space should be returned.
-  virtual const Value* ConvertFromT(const T& value,
-                                    Value* scratch_space) const = 0;
-};
-
-// An implementation of RandomAccessRepeatedFieldAccessor that manipulates
-// MapFieldBase.
-class MapFieldAccessor final : public RandomAccessRepeatedFieldAccessor {
- public:
-  MapFieldAccessor() {}
-  virtual ~MapFieldAccessor() {}
-  bool IsEmpty(const Field* data) const override {
-    return GetRepeatedField(data)->empty();
-  }
-  int Size(const Field* data) const override {
-    return GetRepeatedField(data)->size();
-  }
-  const Value* Get(const Field* data, int index,
-                   Value* scratch_space) const override {
-    return ConvertFromEntry(GetRepeatedField(data)->Get(index), scratch_space);
-  }
-  void Clear(Field* data) const override {
-    MutableRepeatedField(data)->Clear();
-  }
-  void Set(Field* data, int index, const Value* value) const override {
-    ConvertToEntry(value, MutableRepeatedField(data)->Mutable(index));
-  }
-  void Add(Field* data, const Value* value) const override {
-    Message* allocated = New(value);
-    ConvertToEntry(value, allocated);
-    MutableRepeatedField(data)->AddAllocated(allocated);
-  }
-  void RemoveLast(Field* data) const override {
-    MutableRepeatedField(data)->RemoveLast();
-  }
-  void SwapElements(Field* data, int index1, int index2) const override {
-    MutableRepeatedField(data)->SwapElements(index1, index2);
-  }
-  void Swap(Field* data, const internal::RepeatedFieldAccessor* other_mutator,
-            Field* other_data) const override {
-    GOOGLE_CHECK(this == other_mutator);
-    MutableRepeatedField(data)->Swap(MutableRepeatedField(other_data));
-  }
-
- protected:
-  typedef RepeatedPtrField<Message> RepeatedFieldType;
-  static const RepeatedFieldType* GetRepeatedField(const Field* data) {
-    return reinterpret_cast<const RepeatedFieldType*>(
-        (&reinterpret_cast<const MapFieldBase*>(data)->GetRepeatedField()));
-  }
-  static RepeatedFieldType* MutableRepeatedField(Field* data) {
-    return reinterpret_cast<RepeatedFieldType*>(
-        reinterpret_cast<MapFieldBase*>(data)->MutableRepeatedField());
-  }
-  virtual Message* New(const Value* value) const {
-    return static_cast<const Message*>(value)->New();
-  }
-  // Convert an object received by this accessor to an MapEntry message to be
-  // stored in the underlying MapFieldBase.
-  virtual void ConvertToEntry(const Value* value, Message* result) const {
-    result->CopyFrom(*static_cast<const Message*>(value));
-  }
-  // Convert a MapEntry message stored in the underlying MapFieldBase to an
-  // object that will be returned by this accessor.
-  virtual const Value* ConvertFromEntry(const Message& value,
-                                        Value* /*scratch_space*/) const {
-    return static_cast<const Value*>(&value);
-  }
-};
-
-// Default implementations of RepeatedFieldAccessor for primitive types.
-template <typename T>
-class RepeatedFieldPrimitiveAccessor final : public RepeatedFieldWrapper<T> {
-  typedef void Field;
-  typedef void Value;
-  using RepeatedFieldWrapper<T>::MutableRepeatedField;
-
- public:
-  RepeatedFieldPrimitiveAccessor() {}
-  void Swap(Field* data, const internal::RepeatedFieldAccessor* other_mutator,
-            Field* other_data) const override {
-    // Currently RepeatedFieldPrimitiveAccessor is the only implementation of
-    // RepeatedFieldAccessor for primitive types. As we are using singletons
-    // for these accessors, here "other_mutator" must be "this".
-    GOOGLE_CHECK(this == other_mutator);
-    MutableRepeatedField(data)->Swap(MutableRepeatedField(other_data));
-  }
-
- protected:
-  T ConvertToT(const Value* value) const override {
-    return *static_cast<const T*>(value);
-  }
-  const Value* ConvertFromT(const T& value,
-                            Value* /*scratch_space*/) const override {
-    return static_cast<const Value*>(&value);
-  }
-};
-
-// Default implementation of RepeatedFieldAccessor for string fields with
-// ctype=STRING.
-class RepeatedPtrFieldStringAccessor final
-    : public RepeatedPtrFieldWrapper<std::string> {
-  typedef void Field;
-  typedef void Value;
-  using RepeatedFieldAccessor::Add;
-
- public:
-  RepeatedPtrFieldStringAccessor() {}
-  void Swap(Field* data, const internal::RepeatedFieldAccessor* other_mutator,
-            Field* other_data) const override {
-    if (this == other_mutator) {
-      MutableRepeatedField(data)->Swap(MutableRepeatedField(other_data));
-    } else {
-      RepeatedPtrField<std::string> tmp;
-      tmp.Swap(MutableRepeatedField(data));
-      int other_size = other_mutator->Size(other_data);
-      for (int i = 0; i < other_size; ++i) {
-        Add<std::string>(data, other_mutator->Get<std::string>(other_data, i));
-      }
-      int size = Size(data);
-      other_mutator->Clear(other_data);
-      for (int i = 0; i < size; ++i) {
-        other_mutator->Add<std::string>(other_data, tmp.Get(i));
-      }
-    }
-  }
-
- protected:
-  std::string* New(const Value*) const override { return new std::string(); }
-  void ConvertToT(const Value* value, std::string* result) const override {
-    *result = *static_cast<const std::string*>(value);
-  }
-  const Value* ConvertFromT(const std::string& value,
-                            Value* /*scratch_space*/) const override {
-    return static_cast<const Value*>(&value);
-  }
-};
-
-
-class RepeatedPtrFieldMessageAccessor final
-    : public RepeatedPtrFieldWrapper<Message> {
-  typedef void Field;
-  typedef void Value;
-
- public:
-  RepeatedPtrFieldMessageAccessor() {}
-  void Swap(Field* data, const internal::RepeatedFieldAccessor* other_mutator,
-            Field* other_data) const override {
-    GOOGLE_CHECK(this == other_mutator);
-    MutableRepeatedField(data)->Swap(MutableRepeatedField(other_data));
-  }
-
- protected:
-  Message* New(const Value* value) const override {
-    return static_cast<const Message*>(value)->New();
-  }
-  void ConvertToT(const Value* value, Message* result) const override {
-    result->CopyFrom(*static_cast<const Message*>(value));
-  }
-  const Value* ConvertFromT(const Message& value,
-                            Value* /*scratch_space*/) const override {
-    return static_cast<const Value*>(&value);
-  }
-};
-}  // namespace internal
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // GOOGLE_PROTOBUF_REFLECTION_INTERNAL_H__
diff --git a/libs/protobuf/src/google/protobuf/reflection_ops.cc b/libs/protobuf/src/google/protobuf/reflection_ops.cc
deleted file mode 100644
index 3a1972e..0000000
--- a/libs/protobuf/src/google/protobuf/reflection_ops.cc
+++ /dev/null
@@ -1,459 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-#include <google/protobuf/reflection_ops.h>
-
-#include <string>
-#include <vector>
-
-#include <google/protobuf/stubs/logging.h>
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/descriptor.pb.h>
-#include <google/protobuf/map_field.h>
-#include <google/protobuf/map_field_inl.h>
-#include <google/protobuf/unknown_field_set.h>
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-namespace internal {
-
-static const Reflection* GetReflectionOrDie(const Message& m) {
-  const Reflection* r = m.GetReflection();
-  if (r == nullptr) {
-    const Descriptor* d = m.GetDescriptor();
-    const std::string& mtype = d ? d->name() : "unknown";
-    // RawMessage is one known type for which GetReflection() returns nullptr.
-    GOOGLE_LOG(FATAL) << "Message does not support reflection (type " << mtype << ").";
-  }
-  return r;
-}
-
-void ReflectionOps::Copy(const Message& from, Message* to) {
-  if (&from == to) return;
-  Clear(to);
-  Merge(from, to);
-}
-
-void ReflectionOps::Merge(const Message& from, Message* to) {
-  GOOGLE_CHECK_NE(&from, to);
-
-  const Descriptor* descriptor = from.GetDescriptor();
-  GOOGLE_CHECK_EQ(to->GetDescriptor(), descriptor)
-      << "Tried to merge messages of different types "
-      << "(merge " << descriptor->full_name() << " to "
-      << to->GetDescriptor()->full_name() << ")";
-
-  const Reflection* from_reflection = GetReflectionOrDie(from);
-  const Reflection* to_reflection = GetReflectionOrDie(*to);
-  bool is_from_generated = (from_reflection->GetMessageFactory() ==
-                            google::protobuf::MessageFactory::generated_factory());
-  bool is_to_generated = (to_reflection->GetMessageFactory() ==
-                          google::protobuf::MessageFactory::generated_factory());
-
-  std::vector<const FieldDescriptor*> fields;
-  from_reflection->ListFieldsOmitStripped(from, &fields);
-  for (const FieldDescriptor* field : fields) {
-    if (field->is_repeated()) {
-      // Use map reflection if both are in map status and have the
-      // same map type to avoid sync with repeated field.
-      // Note: As from and to messages have the same descriptor, the
-      // map field types are the same if they are both generated
-      // messages or both dynamic messages.
-      if (is_from_generated == is_to_generated && field->is_map()) {
-        const MapFieldBase* from_field =
-            from_reflection->GetMapData(from, field);
-        MapFieldBase* to_field = to_reflection->MutableMapData(to, field);
-        if (to_field->IsMapValid() && from_field->IsMapValid()) {
-          to_field->MergeFrom(*from_field);
-          continue;
-        }
-      }
-      int count = from_reflection->FieldSize(from, field);
-      for (int j = 0; j < count; j++) {
-        switch (field->cpp_type()) {
-#define HANDLE_TYPE(CPPTYPE, METHOD)                                      \
-  case FieldDescriptor::CPPTYPE_##CPPTYPE:                                \
-    to_reflection->Add##METHOD(                                           \
-        to, field, from_reflection->GetRepeated##METHOD(from, field, j)); \
-    break;
-
-          HANDLE_TYPE(INT32, Int32);
-          HANDLE_TYPE(INT64, Int64);
-          HANDLE_TYPE(UINT32, UInt32);
-          HANDLE_TYPE(UINT64, UInt64);
-          HANDLE_TYPE(FLOAT, Float);
-          HANDLE_TYPE(DOUBLE, Double);
-          HANDLE_TYPE(BOOL, Bool);
-          HANDLE_TYPE(STRING, String);
-          HANDLE_TYPE(ENUM, Enum);
-#undef HANDLE_TYPE
-
-          case FieldDescriptor::CPPTYPE_MESSAGE:
-            const Message& from_child =
-                from_reflection->GetRepeatedMessage(from, field, j);
-            if (from_reflection == to_reflection) {
-              to_reflection
-                  ->AddMessage(to, field,
-                               from_child.GetReflection()->GetMessageFactory())
-                  ->MergeFrom(from_child);
-            } else {
-              to_reflection->AddMessage(to, field)->MergeFrom(from_child);
-            }
-            break;
-        }
-      }
-    } else {
-      switch (field->cpp_type()) {
-#define HANDLE_TYPE(CPPTYPE, METHOD)                                       \
-  case FieldDescriptor::CPPTYPE_##CPPTYPE:                                 \
-    to_reflection->Set##METHOD(to, field,                                  \
-                               from_reflection->Get##METHOD(from, field)); \
-    break;
-
-        HANDLE_TYPE(INT32, Int32);
-        HANDLE_TYPE(INT64, Int64);
-        HANDLE_TYPE(UINT32, UInt32);
-        HANDLE_TYPE(UINT64, UInt64);
-        HANDLE_TYPE(FLOAT, Float);
-        HANDLE_TYPE(DOUBLE, Double);
-        HANDLE_TYPE(BOOL, Bool);
-        HANDLE_TYPE(STRING, String);
-        HANDLE_TYPE(ENUM, Enum);
-#undef HANDLE_TYPE
-
-        case FieldDescriptor::CPPTYPE_MESSAGE:
-          const Message& from_child = from_reflection->GetMessage(from, field);
-          if (from_reflection == to_reflection) {
-            to_reflection
-                ->MutableMessage(
-                    to, field, from_child.GetReflection()->GetMessageFactory())
-                ->MergeFrom(from_child);
-          } else {
-            to_reflection->MutableMessage(to, field)->MergeFrom(from_child);
-          }
-          break;
-      }
-    }
-  }
-
-  if (!from_reflection->GetUnknownFields(from).empty()) {
-    to_reflection->MutableUnknownFields(to)->MergeFrom(
-        from_reflection->GetUnknownFields(from));
-  }
-}
-
-void ReflectionOps::Clear(Message* message) {
-  const Reflection* reflection = GetReflectionOrDie(*message);
-
-  std::vector<const FieldDescriptor*> fields;
-  reflection->ListFieldsOmitStripped(*message, &fields);
-  for (const FieldDescriptor* field : fields) {
-    reflection->ClearField(message, field);
-  }
-
-  if (reflection->GetInternalMetadata(*message).have_unknown_fields()) {
-    reflection->MutableUnknownFields(message)->Clear();
-  }
-}
-
-bool ReflectionOps::IsInitialized(const Message& message, bool check_fields,
-                                  bool check_descendants) {
-  const Descriptor* descriptor = message.GetDescriptor();
-  const Reflection* reflection = GetReflectionOrDie(message);
-  if (const int field_count = descriptor->field_count()) {
-    const FieldDescriptor* begin = descriptor->field(0);
-    const FieldDescriptor* end = begin + field_count;
-    GOOGLE_DCHECK_EQ(descriptor->field(field_count - 1), end - 1);
-
-    if (check_fields) {
-      // Check required fields of this message.
-      for (const FieldDescriptor* field = begin; field != end; ++field) {
-        if (field->is_required() && !reflection->HasField(message, field)) {
-          return false;
-        }
-      }
-    }
-
-    if (check_descendants) {
-      for (const FieldDescriptor* field = begin; field != end; ++field) {
-        if (field->cpp_type() == FieldDescriptor::CPPTYPE_MESSAGE) {
-          const Descriptor* message_type = field->message_type();
-          if (PROTOBUF_PREDICT_FALSE(message_type->options().map_entry())) {
-            if (message_type->field(1)->cpp_type() ==
-                FieldDescriptor::CPPTYPE_MESSAGE) {
-              const MapFieldBase* map_field =
-                  reflection->GetMapData(message, field);
-              if (map_field->IsMapValid()) {
-                MapIterator it(const_cast<Message*>(&message), field);
-                MapIterator end_map(const_cast<Message*>(&message), field);
-                for (map_field->MapBegin(&it), map_field->MapEnd(&end_map);
-                     it != end_map; ++it) {
-                  if (!it.GetValueRef().GetMessageValue().IsInitialized()) {
-                    return false;
-                  }
-                }
-              }
-            }
-          } else if (field->is_repeated()) {
-            const int size = reflection->FieldSize(message, field);
-            for (int j = 0; j < size; j++) {
-              if (!reflection->GetRepeatedMessage(message, field, j)
-                       .IsInitialized()) {
-                return false;
-              }
-            }
-          } else if (reflection->HasField(message, field)) {
-            if (!reflection->GetMessage(message, field).IsInitialized()) {
-              return false;
-            }
-          }
-        }
-      }
-    }
-  }
-  if (check_descendants && reflection->HasExtensionSet(message) &&
-      !reflection->GetExtensionSet(message).IsInitialized()) {
-    return false;
-  }
-  return true;
-}
-
-bool ReflectionOps::IsInitialized(const Message& message) {
-  const Descriptor* descriptor = message.GetDescriptor();
-  const Reflection* reflection = GetReflectionOrDie(message);
-
-  // Check required fields of this message.
-  {
-    const int field_count = descriptor->field_count();
-    for (int i = 0; i < field_count; i++) {
-      if (descriptor->field(i)->is_required()) {
-        if (!reflection->HasField(message, descriptor->field(i))) {
-          return false;
-        }
-      }
-    }
-  }
-
-  // Check that sub-messages are initialized.
-  std::vector<const FieldDescriptor*> fields;
-  // Should be safe to skip stripped fields because required fields are not
-  // stripped.
-  reflection->ListFieldsOmitStripped(message, &fields);
-  for (const FieldDescriptor* field : fields) {
-    if (field->cpp_type() == FieldDescriptor::CPPTYPE_MESSAGE) {
-
-      if (field->is_map()) {
-        const FieldDescriptor* value_field = field->message_type()->field(1);
-        if (value_field->cpp_type() == FieldDescriptor::CPPTYPE_MESSAGE) {
-          const MapFieldBase* map_field =
-              reflection->GetMapData(message, field);
-          if (map_field->IsMapValid()) {
-            MapIterator iter(const_cast<Message*>(&message), field);
-            MapIterator end(const_cast<Message*>(&message), field);
-            for (map_field->MapBegin(&iter), map_field->MapEnd(&end);
-                 iter != end; ++iter) {
-              if (!iter.GetValueRef().GetMessageValue().IsInitialized()) {
-                return false;
-              }
-            }
-            continue;
-          }
-        } else {
-          continue;
-        }
-      }
-
-      if (field->is_repeated()) {
-        int size = reflection->FieldSize(message, field);
-
-        for (int j = 0; j < size; j++) {
-          if (!reflection->GetRepeatedMessage(message, field, j)
-                   .IsInitialized()) {
-            return false;
-          }
-        }
-      } else {
-        if (!reflection->GetMessage(message, field).IsInitialized()) {
-          return false;
-        }
-      }
-    }
-  }
-
-  return true;
-}
-
-static bool IsMapValueMessageTyped(const FieldDescriptor* map_field) {
-  return map_field->message_type()->field(1)->cpp_type() ==
-         FieldDescriptor::CPPTYPE_MESSAGE;
-}
-
-void ReflectionOps::DiscardUnknownFields(Message* message) {
-  const Reflection* reflection = GetReflectionOrDie(*message);
-
-  reflection->MutableUnknownFields(message)->Clear();
-
-  // Walk through the fields of this message and DiscardUnknownFields on any
-  // messages present.
-  std::vector<const FieldDescriptor*> fields;
-  reflection->ListFields(*message, &fields);
-  for (const FieldDescriptor* field : fields) {
-    // Skip over non-message fields.
-    if (field->cpp_type() != FieldDescriptor::CPPTYPE_MESSAGE) {
-      continue;
-    }
-    // Discard the unknown fields in maps that contain message values.
-    if (field->is_map() && IsMapValueMessageTyped(field)) {
-      const MapFieldBase* map_field =
-          reflection->MutableMapData(message, field);
-      if (map_field->IsMapValid()) {
-        MapIterator iter(message, field);
-        MapIterator end(message, field);
-        for (map_field->MapBegin(&iter), map_field->MapEnd(&end); iter != end;
-             ++iter) {
-          iter.MutableValueRef()->MutableMessageValue()->DiscardUnknownFields();
-        }
-      }
-      // Discard every unknown field inside messages in a repeated field.
-    } else if (field->is_repeated()) {
-      int size = reflection->FieldSize(*message, field);
-      for (int j = 0; j < size; j++) {
-        reflection->MutableRepeatedMessage(message, field, j)
-            ->DiscardUnknownFields();
-      }
-      // Discard the unknown fields inside an optional message.
-    } else {
-      reflection->MutableMessage(message, field)->DiscardUnknownFields();
-    }
-  }
-}
-
-static std::string SubMessagePrefix(const std::string& prefix,
-                                    const FieldDescriptor* field, int index) {
-  std::string result(prefix);
-  if (field->is_extension()) {
-    result.append("(");
-    result.append(field->full_name());
-    result.append(")");
-  } else {
-    result.append(field->name());
-  }
-  if (index != -1) {
-    result.append("[");
-    result.append(StrCat(index));
-    result.append("]");
-  }
-  result.append(".");
-  return result;
-}
-
-void ReflectionOps::FindInitializationErrors(const Message& message,
-                                             const std::string& prefix,
-                                             std::vector<std::string>* errors) {
-  const Descriptor* descriptor = message.GetDescriptor();
-  const Reflection* reflection = GetReflectionOrDie(message);
-
-  // Check required fields of this message.
-  {
-    const int field_count = descriptor->field_count();
-    for (int i = 0; i < field_count; i++) {
-      if (descriptor->field(i)->is_required()) {
-        if (!reflection->HasField(message, descriptor->field(i))) {
-          errors->push_back(prefix + descriptor->field(i)->name());
-        }
-      }
-    }
-  }
-
-  // Check sub-messages.
-  std::vector<const FieldDescriptor*> fields;
-  reflection->ListFieldsOmitStripped(message, &fields);
-  for (const FieldDescriptor* field : fields) {
-    if (field->cpp_type() == FieldDescriptor::CPPTYPE_MESSAGE) {
-
-      if (field->is_repeated()) {
-        int size = reflection->FieldSize(message, field);
-
-        for (int j = 0; j < size; j++) {
-          const Message& sub_message =
-              reflection->GetRepeatedMessage(message, field, j);
-          FindInitializationErrors(sub_message,
-                                   SubMessagePrefix(prefix, field, j), errors);
-        }
-      } else {
-        const Message& sub_message = reflection->GetMessage(message, field);
-        FindInitializationErrors(sub_message,
-                                 SubMessagePrefix(prefix, field, -1), errors);
-      }
-    }
-  }
-}
-
-void GenericSwap(Message* lhs, Message* rhs) {
-#ifndef PROTOBUF_FORCE_COPY_IN_SWAP
-  GOOGLE_DCHECK(Arena::InternalGetOwningArena(lhs) !=
-         Arena::InternalGetOwningArena(rhs));
-  GOOGLE_DCHECK(Arena::InternalGetOwningArena(lhs) != nullptr ||
-         Arena::InternalGetOwningArena(rhs) != nullptr);
-#endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-  // At least one of these must have an arena, so make `rhs` point to it.
-  Arena* arena = Arena::InternalGetOwningArena(rhs);
-  if (arena == nullptr) {
-    std::swap(lhs, rhs);
-    arena = Arena::InternalGetOwningArena(rhs);
-  }
-
-  // Improve efficiency by placing the temporary on an arena so that messages
-  // are copied twice rather than three times.
-  Message* tmp = rhs->New(arena);
-  tmp->CheckTypeAndMergeFrom(*lhs);
-  lhs->Clear();
-  lhs->CheckTypeAndMergeFrom(*rhs);
-#ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-  rhs->Clear();
-  rhs->CheckTypeAndMergeFrom(*tmp);
-  if (arena == nullptr) delete tmp;
-#else   // PROTOBUF_FORCE_COPY_IN_SWAP
-  rhs->GetReflection()->Swap(tmp, rhs);
-#endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-}
-
-}  // namespace internal
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
diff --git a/libs/protobuf/src/google/protobuf/reflection_ops.h b/libs/protobuf/src/google/protobuf/reflection_ops.h
deleted file mode 100644
index 0a45702..0000000
--- a/libs/protobuf/src/google/protobuf/reflection_ops.h
+++ /dev/null
@@ -1,92 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-//
-// This header is logically internal, but is made public because it is used
-// from protocol-compiler-generated code, which may reside in other components.
-
-#ifndef GOOGLE_PROTOBUF_REFLECTION_OPS_H__
-#define GOOGLE_PROTOBUF_REFLECTION_OPS_H__
-
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/message.h>
-
-#ifdef SWIG
-#error "You cannot SWIG proto headers"
-#endif
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-namespace internal {
-
-// Basic operations that can be performed using reflection.
-// These can be used as a cheap way to implement the corresponding
-// methods of the Message interface, though they are likely to be
-// slower than implementations tailored for the specific message type.
-//
-// This class should stay limited to operations needed to implement
-// the Message interface.
-//
-// This class is really a namespace that contains only static methods.
-class PROTOBUF_EXPORT ReflectionOps {
- public:
-  static void Copy(const Message& from, Message* to);
-  static void Merge(const Message& from, Message* to);
-  static void Clear(Message* message);
-  static bool IsInitialized(const Message& message);
-  static bool IsInitialized(const Message& message, bool check_fields,
-                            bool check_descendants);
-  static void DiscardUnknownFields(Message* message);
-
-  // Finds all unset required fields in the message and adds their full
-  // paths (e.g. "foo.bar[5].baz") to *names.  "prefix" will be attached to
-  // the front of each name.
-  static void FindInitializationErrors(const Message& message,
-                                       const std::string& prefix,
-                                       std::vector<std::string>* errors);
-
- private:
-  // All methods are static.  No need to construct.
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(ReflectionOps);
-};
-
-}  // namespace internal
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
-
-#endif  // GOOGLE_PROTOBUF_REFLECTION_OPS_H__
diff --git a/libs/protobuf/src/google/protobuf/reflection_ops_unittest.cc b/libs/protobuf/src/google/protobuf/reflection_ops_unittest.cc
deleted file mode 100644
index 513ce47..0000000
--- a/libs/protobuf/src/google/protobuf/reflection_ops_unittest.cc
+++ /dev/null
@@ -1,546 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-
-#include <google/protobuf/reflection_ops.h>
-
-#include <google/protobuf/stubs/logging.h>
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/unittest.pb.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/testing/googletest.h>
-#include <gtest/gtest.h>
-#include <google/protobuf/test_util.h>
-
-#include <google/protobuf/stubs/strutil.h>
-
-namespace google {
-namespace protobuf {
-namespace internal {
-namespace {
-
-TEST(ReflectionOpsTest, SanityCheck) {
-  unittest::TestAllTypes message;
-
-  TestUtil::SetAllFields(&message);
-  TestUtil::ExpectAllFieldsSet(message);
-}
-
-TEST(ReflectionOpsTest, Copy) {
-  unittest::TestAllTypes message, message2;
-
-  TestUtil::SetAllFields(&message);
-
-  ReflectionOps::Copy(message, &message2);
-
-  TestUtil::ExpectAllFieldsSet(message2);
-
-  // Copying from self should be a no-op.
-  ReflectionOps::Copy(message2, &message2);
-  TestUtil::ExpectAllFieldsSet(message2);
-}
-
-TEST(ReflectionOpsTest, CopyExtensions) {
-  unittest::TestAllExtensions message, message2;
-
-  TestUtil::SetAllExtensions(&message);
-
-  ReflectionOps::Copy(message, &message2);
-
-  TestUtil::ExpectAllExtensionsSet(message2);
-}
-
-TEST(ReflectionOpsTest, CopyOneof) {
-  unittest::TestOneof2 message, message2;
-  TestUtil::SetOneof1(&message);
-  ReflectionOps::Copy(message, &message2);
-  TestUtil::ExpectOneofSet1(message2);
-
-  TestUtil::SetOneof2(&message);
-  TestUtil::ExpectOneofSet2(message);
-  ReflectionOps::Copy(message, &message2);
-  TestUtil::ExpectOneofSet2(message2);
-}
-
-TEST(ReflectionOpsTest, Merge) {
-  // Note:  Copy is implemented in terms of Merge() so technically the Copy
-  //   test already tested most of this.
-
-  unittest::TestAllTypes message, message2;
-
-  TestUtil::SetAllFields(&message);
-
-  // This field will test merging into an empty spot.
-  message2.set_optional_int32(message.optional_int32());
-  message.clear_optional_int32();
-
-  // This tests overwriting.
-  message2.set_optional_string(message.optional_string());
-  message.set_optional_string("something else");
-
-  // This tests concatenating.
-  message2.add_repeated_int32(message.repeated_int32(1));
-  int32_t i = message.repeated_int32(0);
-  message.clear_repeated_int32();
-  message.add_repeated_int32(i);
-
-  ReflectionOps::Merge(message2, &message);
-
-  TestUtil::ExpectAllFieldsSet(message);
-}
-
-TEST(ReflectionOpsTest, MergeExtensions) {
-  // Note:  Copy is implemented in terms of Merge() so technically the Copy
-  //   test already tested most of this.
-
-  unittest::TestAllExtensions message, message2;
-
-  TestUtil::SetAllExtensions(&message);
-
-  // This field will test merging into an empty spot.
-  message2.SetExtension(
-      unittest::optional_int32_extension,
-      message.GetExtension(unittest::optional_int32_extension));
-  message.ClearExtension(unittest::optional_int32_extension);
-
-  // This tests overwriting.
-  message2.SetExtension(
-      unittest::optional_string_extension,
-      message.GetExtension(unittest::optional_string_extension));
-  message.SetExtension(unittest::optional_string_extension, "something else");
-
-  // This tests concatenating.
-  message2.AddExtension(
-      unittest::repeated_int32_extension,
-      message.GetExtension(unittest::repeated_int32_extension, 1));
-  int32_t i = message.GetExtension(unittest::repeated_int32_extension, 0);
-  message.ClearExtension(unittest::repeated_int32_extension);
-  message.AddExtension(unittest::repeated_int32_extension, i);
-
-  ReflectionOps::Merge(message2, &message);
-
-  TestUtil::ExpectAllExtensionsSet(message);
-}
-
-TEST(ReflectionOpsTest, MergeUnknown) {
-  // Test that the messages' UnknownFieldSets are correctly merged.
-  unittest::TestEmptyMessage message1, message2;
-  message1.mutable_unknown_fields()->AddVarint(1234, 1);
-  message2.mutable_unknown_fields()->AddVarint(1234, 2);
-
-  ReflectionOps::Merge(message2, &message1);
-
-  ASSERT_EQ(2, message1.unknown_fields().field_count());
-  ASSERT_EQ(UnknownField::TYPE_VARINT,
-            message1.unknown_fields().field(0).type());
-  EXPECT_EQ(1, message1.unknown_fields().field(0).varint());
-  ASSERT_EQ(UnknownField::TYPE_VARINT,
-            message1.unknown_fields().field(1).type());
-  EXPECT_EQ(2, message1.unknown_fields().field(1).varint());
-}
-
-TEST(ReflectionOpsTest, MergeOneof) {
-  unittest::TestOneof2 message1, message2;
-  TestUtil::SetOneof1(&message1);
-
-  // Merge to empty message
-  ReflectionOps::Merge(message1, &message2);
-  TestUtil::ExpectOneofSet1(message2);
-
-  // Merge with the same oneof fields
-  ReflectionOps::Merge(message1, &message2);
-  TestUtil::ExpectOneofSet1(message2);
-
-  // Merge with different oneof fields
-  TestUtil::SetOneof2(&message1);
-  ReflectionOps::Merge(message1, &message2);
-  TestUtil::ExpectOneofSet2(message2);
-}
-
-#ifdef PROTOBUF_HAS_DEATH_TEST
-
-TEST(ReflectionOpsTest, MergeFromSelf) {
-  // Note:  Copy is implemented in terms of Merge() so technically the Copy
-  //   test already tested most of this.
-
-  unittest::TestAllTypes message;
-
-  EXPECT_DEATH(ReflectionOps::Merge(message, &message), "&from");
-}
-
-#endif  // PROTOBUF_HAS_DEATH_TEST
-
-TEST(ReflectionOpsTest, Clear) {
-  unittest::TestAllTypes message;
-
-  TestUtil::SetAllFields(&message);
-
-  ReflectionOps::Clear(&message);
-
-  TestUtil::ExpectClear(message);
-
-  // Check that getting embedded messages returns the objects created during
-  // SetAllFields() rather than default instances.
-  EXPECT_NE(&unittest::TestAllTypes::OptionalGroup::default_instance(),
-            &message.optionalgroup());
-  EXPECT_NE(&unittest::TestAllTypes::NestedMessage::default_instance(),
-            &message.optional_nested_message());
-  EXPECT_NE(&unittest::ForeignMessage::default_instance(),
-            &message.optional_foreign_message());
-  EXPECT_NE(&unittest_import::ImportMessage::default_instance(),
-            &message.optional_import_message());
-}
-
-TEST(ReflectionOpsTest, ClearExtensions) {
-  unittest::TestAllExtensions message;
-
-  TestUtil::SetAllExtensions(&message);
-
-  ReflectionOps::Clear(&message);
-
-  TestUtil::ExpectExtensionsClear(message);
-
-  // Check that getting embedded messages returns the objects created during
-  // SetAllExtensions() rather than default instances.
-  EXPECT_NE(&unittest::OptionalGroup_extension::default_instance(),
-            &message.GetExtension(unittest::optionalgroup_extension));
-  EXPECT_NE(&unittest::TestAllTypes::NestedMessage::default_instance(),
-            &message.GetExtension(unittest::optional_nested_message_extension));
-  EXPECT_NE(
-      &unittest::ForeignMessage::default_instance(),
-      &message.GetExtension(unittest::optional_foreign_message_extension));
-  EXPECT_NE(&unittest_import::ImportMessage::default_instance(),
-            &message.GetExtension(unittest::optional_import_message_extension));
-}
-
-TEST(ReflectionOpsTest, ClearUnknown) {
-  // Test that the message's UnknownFieldSet is correctly cleared.
-  unittest::TestEmptyMessage message;
-  message.mutable_unknown_fields()->AddVarint(1234, 1);
-
-  ReflectionOps::Clear(&message);
-
-  EXPECT_EQ(0, message.unknown_fields().field_count());
-}
-
-TEST(ReflectionOpsTest, ClearOneof) {
-  unittest::TestOneof2 message;
-
-  TestUtil::ExpectOneofClear(message);
-  TestUtil::SetOneof1(&message);
-  TestUtil::ExpectOneofSet1(message);
-  ReflectionOps::Clear(&message);
-  TestUtil::ExpectOneofClear(message);
-
-  TestUtil::SetOneof1(&message);
-  TestUtil::ExpectOneofSet1(message);
-  TestUtil::SetOneof2(&message);
-  TestUtil::ExpectOneofSet2(message);
-  ReflectionOps::Clear(&message);
-  TestUtil::ExpectOneofClear(message);
-}
-
-TEST(ReflectionOpsTest, DiscardUnknownFields) {
-  unittest::TestAllTypes message;
-  TestUtil::SetAllFields(&message);
-
-  // Set some unknown fields in message.
-  message.mutable_unknown_fields()->AddVarint(123456, 654321);
-  message.mutable_optional_nested_message()
-      ->mutable_unknown_fields()
-      ->AddVarint(123456, 654321);
-  message.mutable_repeated_nested_message(0)
-      ->mutable_unknown_fields()
-      ->AddVarint(123456, 654321);
-
-  EXPECT_EQ(1, message.unknown_fields().field_count());
-  EXPECT_EQ(1,
-            message.optional_nested_message().unknown_fields().field_count());
-  EXPECT_EQ(1,
-            message.repeated_nested_message(0).unknown_fields().field_count());
-
-  // Discard them.
-  ReflectionOps::DiscardUnknownFields(&message);
-  TestUtil::ExpectAllFieldsSet(message);
-
-  EXPECT_EQ(0, message.unknown_fields().field_count());
-  EXPECT_EQ(0,
-            message.optional_nested_message().unknown_fields().field_count());
-  EXPECT_EQ(0,
-            message.repeated_nested_message(0).unknown_fields().field_count());
-}
-
-TEST(ReflectionOpsTest, DiscardUnknownExtensions) {
-  unittest::TestAllExtensions message;
-  TestUtil::SetAllExtensions(&message);
-
-  // Set some unknown fields.
-  message.mutable_unknown_fields()->AddVarint(123456, 654321);
-  message.MutableExtension(unittest::optional_nested_message_extension)
-      ->mutable_unknown_fields()
-      ->AddVarint(123456, 654321);
-  message.MutableExtension(unittest::repeated_nested_message_extension, 0)
-      ->mutable_unknown_fields()
-      ->AddVarint(123456, 654321);
-
-  EXPECT_EQ(1, message.unknown_fields().field_count());
-  EXPECT_EQ(1, message.GetExtension(unittest::optional_nested_message_extension)
-                   .unknown_fields()
-                   .field_count());
-  EXPECT_EQ(1,
-            message.GetExtension(unittest::repeated_nested_message_extension, 0)
-                .unknown_fields()
-                .field_count());
-
-  // Discard them.
-  ReflectionOps::DiscardUnknownFields(&message);
-  TestUtil::ExpectAllExtensionsSet(message);
-
-  EXPECT_EQ(0, message.unknown_fields().field_count());
-  EXPECT_EQ(0, message.GetExtension(unittest::optional_nested_message_extension)
-                   .unknown_fields()
-                   .field_count());
-  EXPECT_EQ(0,
-            message.GetExtension(unittest::repeated_nested_message_extension, 0)
-                .unknown_fields()
-                .field_count());
-}
-
-TEST(ReflectionOpsTest, IsInitialized) {
-  unittest::TestRequired message;
-
-  EXPECT_FALSE(ReflectionOps::IsInitialized(message));
-  EXPECT_FALSE(ReflectionOps::IsInitialized(message, true, false));
-  EXPECT_TRUE(ReflectionOps::IsInitialized(message, false, true));
-  message.set_a(1);
-  EXPECT_FALSE(ReflectionOps::IsInitialized(message));
-  EXPECT_FALSE(ReflectionOps::IsInitialized(message, true, true));
-  EXPECT_TRUE(ReflectionOps::IsInitialized(message, false, true));
-  message.set_b(2);
-  EXPECT_FALSE(ReflectionOps::IsInitialized(message));
-  EXPECT_FALSE(ReflectionOps::IsInitialized(message, true, true));
-  EXPECT_TRUE(ReflectionOps::IsInitialized(message, false, true));
-  message.set_c(3);
-  EXPECT_TRUE(ReflectionOps::IsInitialized(message));
-  EXPECT_TRUE(ReflectionOps::IsInitialized(message, true, false));
-  EXPECT_TRUE(ReflectionOps::IsInitialized(message, false, true));
-}
-
-TEST(ReflectionOpsTest, ForeignIsInitialized) {
-  unittest::TestRequiredForeign message;
-
-  // Starts out initialized because the foreign message is itself an optional
-  // field.
-  EXPECT_TRUE(ReflectionOps::IsInitialized(message));
-  EXPECT_TRUE(ReflectionOps::IsInitialized(message, false, true));
-
-  // Once we create that field, the message is no longer initialized.
-  message.mutable_optional_message();
-  EXPECT_FALSE(ReflectionOps::IsInitialized(message));
-  EXPECT_TRUE(ReflectionOps::IsInitialized(message, true, false));
-  EXPECT_FALSE(ReflectionOps::IsInitialized(message, false, true));
-
-  // Initialize it.  Now we're initialized.
-  message.mutable_optional_message()->set_a(1);
-  message.mutable_optional_message()->set_b(2);
-  message.mutable_optional_message()->set_c(3);
-  EXPECT_TRUE(ReflectionOps::IsInitialized(message));
-  EXPECT_TRUE(ReflectionOps::IsInitialized(message, true, false));
-  EXPECT_TRUE(ReflectionOps::IsInitialized(message, false, true));
-
-  // Add a repeated version of the message.  No longer initialized.
-  unittest::TestRequired* sub_message = message.add_repeated_message();
-  EXPECT_FALSE(ReflectionOps::IsInitialized(message));
-  EXPECT_TRUE(ReflectionOps::IsInitialized(message, true, false));
-  EXPECT_FALSE(ReflectionOps::IsInitialized(message, false, true));
-
-  // Initialize that repeated version.
-  sub_message->set_a(1);
-  sub_message->set_b(2);
-  sub_message->set_c(3);
-  EXPECT_TRUE(ReflectionOps::IsInitialized(message));
-  EXPECT_TRUE(ReflectionOps::IsInitialized(message, true, false));
-  EXPECT_TRUE(ReflectionOps::IsInitialized(message, false, true));
-}
-
-TEST(ReflectionOpsTest, ExtensionIsInitialized) {
-  unittest::TestAllExtensions message;
-
-  // Starts out initialized because the foreign message is itself an optional
-  // field.
-  EXPECT_TRUE(ReflectionOps::IsInitialized(message));
-  EXPECT_TRUE(ReflectionOps::IsInitialized(message, true, false));
-  EXPECT_TRUE(ReflectionOps::IsInitialized(message, false, true));
-
-  // Once we create that field, the message is no longer initialized.
-  message.MutableExtension(unittest::TestRequired::single);
-  EXPECT_FALSE(ReflectionOps::IsInitialized(message));
-  EXPECT_TRUE(ReflectionOps::IsInitialized(message, true, false));
-  EXPECT_FALSE(ReflectionOps::IsInitialized(message, false, true));
-
-  // Initialize it.  Now we're initialized.
-  message.MutableExtension(unittest::TestRequired::single)->set_a(1);
-  message.MutableExtension(unittest::TestRequired::single)->set_b(2);
-  message.MutableExtension(unittest::TestRequired::single)->set_c(3);
-  EXPECT_TRUE(ReflectionOps::IsInitialized(message));
-  EXPECT_TRUE(ReflectionOps::IsInitialized(message, true, false));
-  EXPECT_TRUE(ReflectionOps::IsInitialized(message, false, true));
-
-  // Add a repeated version of the message.  No longer initialized.
-  message.AddExtension(unittest::TestRequired::multi);
-  EXPECT_FALSE(ReflectionOps::IsInitialized(message));
-  EXPECT_TRUE(ReflectionOps::IsInitialized(message, true, false));
-  EXPECT_FALSE(ReflectionOps::IsInitialized(message, false, true));
-
-  // Initialize that repeated version.
-  message.MutableExtension(unittest::TestRequired::multi, 0)->set_a(1);
-  message.MutableExtension(unittest::TestRequired::multi, 0)->set_b(2);
-  message.MutableExtension(unittest::TestRequired::multi, 0)->set_c(3);
-  EXPECT_TRUE(ReflectionOps::IsInitialized(message));
-  EXPECT_TRUE(ReflectionOps::IsInitialized(message, true, false));
-  EXPECT_TRUE(ReflectionOps::IsInitialized(message, false, true));
-}
-
-TEST(ReflectionOpsTest, OneofIsInitialized) {
-  unittest::TestRequiredOneof message;
-  EXPECT_TRUE(ReflectionOps::IsInitialized(message));
-  EXPECT_TRUE(ReflectionOps::IsInitialized(message, true, false));
-  EXPECT_TRUE(ReflectionOps::IsInitialized(message, false, true));
-
-  message.mutable_foo_message();
-  EXPECT_FALSE(ReflectionOps::IsInitialized(message));
-  EXPECT_TRUE(ReflectionOps::IsInitialized(message, true, false));
-  EXPECT_FALSE(ReflectionOps::IsInitialized(message, false, true));
-
-  message.set_foo_int(1);
-  EXPECT_TRUE(ReflectionOps::IsInitialized(message));
-  EXPECT_TRUE(ReflectionOps::IsInitialized(message, true, false));
-  EXPECT_TRUE(ReflectionOps::IsInitialized(message, false, true));
-
-  message.mutable_foo_message();
-  EXPECT_FALSE(ReflectionOps::IsInitialized(message));
-  EXPECT_TRUE(ReflectionOps::IsInitialized(message, true, false));
-  EXPECT_FALSE(ReflectionOps::IsInitialized(message, false, true));
-  message.mutable_foo_message()->set_required_double(0.1);
-  EXPECT_TRUE(ReflectionOps::IsInitialized(message));
-  EXPECT_TRUE(ReflectionOps::IsInitialized(message, true, false));
-  EXPECT_TRUE(ReflectionOps::IsInitialized(message, false, true));
-}
-
-static std::string FindInitializationErrors(const Message& message) {
-  std::vector<std::string> errors;
-  ReflectionOps::FindInitializationErrors(message, "", &errors);
-  return Join(errors, ",");
-}
-
-TEST(ReflectionOpsTest, FindInitializationErrors) {
-  unittest::TestRequired message;
-  EXPECT_EQ("a,b,c", FindInitializationErrors(message));
-}
-
-TEST(ReflectionOpsTest, FindForeignInitializationErrors) {
-  unittest::TestRequiredForeign message;
-  message.mutable_optional_message();
-  message.add_repeated_message();
-  message.add_repeated_message();
-  EXPECT_EQ(
-      "optional_message.a,"
-      "optional_message.b,"
-      "optional_message.c,"
-      "repeated_message[0].a,"
-      "repeated_message[0].b,"
-      "repeated_message[0].c,"
-      "repeated_message[1].a,"
-      "repeated_message[1].b,"
-      "repeated_message[1].c",
-      FindInitializationErrors(message));
-}
-
-TEST(ReflectionOpsTest, FindExtensionInitializationErrors) {
-  unittest::TestAllExtensions message;
-  message.MutableExtension(unittest::TestRequired::single);
-  message.AddExtension(unittest::TestRequired::multi);
-  message.AddExtension(unittest::TestRequired::multi);
-  EXPECT_EQ(
-      "(protobuf_unittest.TestRequired.single).a,"
-      "(protobuf_unittest.TestRequired.single).b,"
-      "(protobuf_unittest.TestRequired.single).c,"
-      "(protobuf_unittest.TestRequired.multi)[0].a,"
-      "(protobuf_unittest.TestRequired.multi)[0].b,"
-      "(protobuf_unittest.TestRequired.multi)[0].c,"
-      "(protobuf_unittest.TestRequired.multi)[1].a,"
-      "(protobuf_unittest.TestRequired.multi)[1].b,"
-      "(protobuf_unittest.TestRequired.multi)[1].c",
-      FindInitializationErrors(message));
-}
-
-TEST(ReflectionOpsTest, FindOneofInitializationErrors) {
-  unittest::TestRequiredOneof message;
-  message.mutable_foo_message();
-  EXPECT_EQ("foo_message.required_double", FindInitializationErrors(message));
-}
-
-TEST(ReflectionOpsTest, GenericSwap) {
-  Arena arena;
-  {
-    unittest::TestAllTypes message;
-    auto* arena_message = Arena::CreateMessage<unittest::TestAllTypes>(&arena);
-    TestUtil::SetAllFields(arena_message);
-    const uint64_t initial_arena_size = arena.SpaceUsed();
-
-    GenericSwap(&message, arena_message);
-
-    TestUtil::ExpectAllFieldsSet(message);
-    TestUtil::ExpectClear(*arena_message);
-    // The temp should be allocated on the arena in this case.
-    EXPECT_GT(arena.SpaceUsed(), initial_arena_size);
-  }
-  {
-    unittest::TestAllTypes message;
-    auto* arena_message = Arena::CreateMessage<unittest::TestAllTypes>(&arena);
-    TestUtil::SetAllFields(arena_message);
-    const uint64_t initial_arena_size = arena.SpaceUsed();
-
-    GenericSwap(arena_message, &message);
-
-    TestUtil::ExpectAllFieldsSet(message);
-    TestUtil::ExpectClear(*arena_message);
-    // The temp should be allocated on the arena in this case.
-    EXPECT_GT(arena.SpaceUsed(), initial_arena_size);
-  }
-}
-
-}  // namespace
-}  // namespace internal
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/reflection_tester.cc b/libs/protobuf/src/google/protobuf/reflection_tester.cc
deleted file mode 100644
index 4c6db03..0000000
--- a/libs/protobuf/src/google/protobuf/reflection_tester.cc
+++ /dev/null
@@ -1,1673 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <google/protobuf/reflection_tester.h>
-
-#include <gtest/gtest.h>
-#include <google/protobuf/map_field.h>
-#include <google/protobuf/message.h>
-
-// Must include last.
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-
-MapReflectionTester::MapReflectionTester(const Descriptor* base_descriptor)
-    : base_descriptor_(base_descriptor) {
-  const DescriptorPool* pool = base_descriptor->file()->pool();
-  std::string package = base_descriptor->file()->package();
-
-  map_enum_foo_ = pool->FindEnumValueByName(package + ".MAP_ENUM_FOO");
-  map_enum_bar_ = pool->FindEnumValueByName(package + ".MAP_ENUM_BAR");
-  map_enum_baz_ = pool->FindEnumValueByName(package + ".MAP_ENUM_BAZ");
-
-  foreign_c_ = pool->FindFieldByName(package + ".ForeignMessage.c");
-  map_int32_int32_key_ =
-      pool->FindFieldByName(package + ".TestMap.MapInt32Int32Entry.key");
-  map_int32_int32_val_ =
-      pool->FindFieldByName(package + ".TestMap.MapInt32Int32Entry.value");
-  map_int64_int64_key_ =
-      pool->FindFieldByName(package + ".TestMap.MapInt64Int64Entry.key");
-  map_int64_int64_val_ =
-      pool->FindFieldByName(package + ".TestMap.MapInt64Int64Entry.value");
-  map_uint32_uint32_key_ =
-      pool->FindFieldByName(package + ".TestMap.MapUint32Uint32Entry.key");
-  map_uint32_uint32_val_ =
-      pool->FindFieldByName(package + ".TestMap.MapUint32Uint32Entry.value");
-  map_uint64_uint64_key_ =
-      pool->FindFieldByName(package + ".TestMap.MapUint64Uint64Entry.key");
-  map_uint64_uint64_val_ =
-      pool->FindFieldByName(package + ".TestMap.MapUint64Uint64Entry.value");
-  map_sint32_sint32_key_ =
-      pool->FindFieldByName(package + ".TestMap.MapSint32Sint32Entry.key");
-  map_sint32_sint32_val_ =
-      pool->FindFieldByName(package + ".TestMap.MapSint32Sint32Entry.value");
-  map_sint64_sint64_key_ =
-      pool->FindFieldByName(package + ".TestMap.MapSint64Sint64Entry.key");
-  map_sint64_sint64_val_ =
-      pool->FindFieldByName(package + ".TestMap.MapSint64Sint64Entry.value");
-  map_fixed32_fixed32_key_ =
-      pool->FindFieldByName(package + ".TestMap.MapFixed32Fixed32Entry.key");
-  map_fixed32_fixed32_val_ =
-      pool->FindFieldByName(package + ".TestMap.MapFixed32Fixed32Entry.value");
-  map_fixed64_fixed64_key_ =
-      pool->FindFieldByName(package + ".TestMap.MapFixed64Fixed64Entry.key");
-  map_fixed64_fixed64_val_ =
-      pool->FindFieldByName(package + ".TestMap.MapFixed64Fixed64Entry.value");
-  map_sfixed32_sfixed32_key_ =
-      pool->FindFieldByName(package + ".TestMap.MapSfixed32Sfixed32Entry.key");
-  map_sfixed32_sfixed32_val_ = pool->FindFieldByName(
-      package + ".TestMap.MapSfixed32Sfixed32Entry.value");
-  map_sfixed64_sfixed64_key_ =
-      pool->FindFieldByName(package + ".TestMap.MapSfixed64Sfixed64Entry.key");
-  map_sfixed64_sfixed64_val_ = pool->FindFieldByName(
-      package + ".TestMap.MapSfixed64Sfixed64Entry.value");
-  map_int32_float_key_ =
-      pool->FindFieldByName(package + ".TestMap.MapInt32FloatEntry.key");
-  map_int32_float_val_ =
-      pool->FindFieldByName(package + ".TestMap.MapInt32FloatEntry.value");
-  map_int32_double_key_ =
-      pool->FindFieldByName(package + ".TestMap.MapInt32DoubleEntry.key");
-  map_int32_double_val_ =
-      pool->FindFieldByName(package + ".TestMap.MapInt32DoubleEntry.value");
-  map_bool_bool_key_ =
-      pool->FindFieldByName(package + ".TestMap.MapBoolBoolEntry.key");
-  map_bool_bool_val_ =
-      pool->FindFieldByName(package + ".TestMap.MapBoolBoolEntry.value");
-  map_string_string_key_ =
-      pool->FindFieldByName(package + ".TestMap.MapStringStringEntry.key");
-  map_string_string_val_ =
-      pool->FindFieldByName(package + ".TestMap.MapStringStringEntry.value");
-  map_int32_bytes_key_ =
-      pool->FindFieldByName(package + ".TestMap.MapInt32BytesEntry.key");
-  map_int32_bytes_val_ =
-      pool->FindFieldByName(package + ".TestMap.MapInt32BytesEntry.value");
-  map_int32_enum_key_ =
-      pool->FindFieldByName(package + ".TestMap.MapInt32EnumEntry.key");
-  map_int32_enum_val_ =
-      pool->FindFieldByName(package + ".TestMap.MapInt32EnumEntry.value");
-  map_int32_foreign_message_key_ = pool->FindFieldByName(
-      package + ".TestMap.MapInt32ForeignMessageEntry.key");
-  map_int32_foreign_message_val_ = pool->FindFieldByName(
-      package + ".TestMap.MapInt32ForeignMessageEntry.value");
-
-  EXPECT_FALSE(map_enum_foo_ == nullptr);
-  EXPECT_FALSE(map_enum_bar_ == nullptr);
-  EXPECT_FALSE(map_enum_baz_ == nullptr);
-  EXPECT_FALSE(map_int32_int32_key_ == nullptr);
-  EXPECT_FALSE(map_int32_int32_val_ == nullptr);
-  EXPECT_FALSE(map_int64_int64_key_ == nullptr);
-  EXPECT_FALSE(map_int64_int64_val_ == nullptr);
-  EXPECT_FALSE(map_uint32_uint32_key_ == nullptr);
-  EXPECT_FALSE(map_uint32_uint32_val_ == nullptr);
-  EXPECT_FALSE(map_uint64_uint64_key_ == nullptr);
-  EXPECT_FALSE(map_uint64_uint64_val_ == nullptr);
-  EXPECT_FALSE(map_sint32_sint32_key_ == nullptr);
-  EXPECT_FALSE(map_sint32_sint32_val_ == nullptr);
-  EXPECT_FALSE(map_sint64_sint64_key_ == nullptr);
-  EXPECT_FALSE(map_sint64_sint64_val_ == nullptr);
-  EXPECT_FALSE(map_fixed32_fixed32_key_ == nullptr);
-  EXPECT_FALSE(map_fixed32_fixed32_val_ == nullptr);
-  EXPECT_FALSE(map_fixed64_fixed64_key_ == nullptr);
-  EXPECT_FALSE(map_fixed64_fixed64_val_ == nullptr);
-  EXPECT_FALSE(map_sfixed32_sfixed32_key_ == nullptr);
-  EXPECT_FALSE(map_sfixed32_sfixed32_val_ == nullptr);
-  EXPECT_FALSE(map_sfixed64_sfixed64_key_ == nullptr);
-  EXPECT_FALSE(map_sfixed64_sfixed64_val_ == nullptr);
-  EXPECT_FALSE(map_int32_float_key_ == nullptr);
-  EXPECT_FALSE(map_int32_float_val_ == nullptr);
-  EXPECT_FALSE(map_int32_double_key_ == nullptr);
-  EXPECT_FALSE(map_int32_double_val_ == nullptr);
-  EXPECT_FALSE(map_bool_bool_key_ == nullptr);
-  EXPECT_FALSE(map_bool_bool_val_ == nullptr);
-  EXPECT_FALSE(map_string_string_key_ == nullptr);
-  EXPECT_FALSE(map_string_string_val_ == nullptr);
-  EXPECT_FALSE(map_int32_bytes_key_ == nullptr);
-  EXPECT_FALSE(map_int32_bytes_val_ == nullptr);
-  EXPECT_FALSE(map_int32_enum_key_ == nullptr);
-  EXPECT_FALSE(map_int32_enum_val_ == nullptr);
-  EXPECT_FALSE(map_int32_foreign_message_key_ == nullptr);
-  EXPECT_FALSE(map_int32_foreign_message_val_ == nullptr);
-
-  std::vector<const FieldDescriptor*> all_map_descriptors = {
-      map_int32_int32_key_,
-      map_int32_int32_val_,
-      map_int64_int64_key_,
-      map_int64_int64_val_,
-      map_uint32_uint32_key_,
-      map_uint32_uint32_val_,
-      map_uint64_uint64_key_,
-      map_uint64_uint64_val_,
-      map_sint32_sint32_key_,
-      map_sint32_sint32_val_,
-      map_sint64_sint64_key_,
-      map_sint64_sint64_val_,
-      map_fixed32_fixed32_key_,
-      map_fixed32_fixed32_val_,
-      map_fixed64_fixed64_key_,
-      map_fixed64_fixed64_val_,
-      map_sfixed32_sfixed32_key_,
-      map_sfixed32_sfixed32_val_,
-      map_sfixed64_sfixed64_key_,
-      map_sfixed64_sfixed64_val_,
-      map_int32_float_key_,
-      map_int32_float_val_,
-      map_int32_double_key_,
-      map_int32_double_val_,
-      map_bool_bool_key_,
-      map_bool_bool_val_,
-      map_string_string_key_,
-      map_string_string_val_,
-      map_int32_bytes_key_,
-      map_int32_bytes_val_,
-      map_int32_enum_key_,
-      map_int32_enum_val_,
-      map_int32_foreign_message_key_,
-      map_int32_foreign_message_val_};
-  for (const FieldDescriptor* fdesc : all_map_descriptors) {
-    GOOGLE_CHECK(fdesc->containing_type() != nullptr) << fdesc->name();
-    if (fdesc->name() == "key") {
-      EXPECT_EQ(fdesc->containing_type()->map_key(), fdesc);
-    } else {
-      EXPECT_EQ(fdesc->name(), "value");
-      EXPECT_EQ(fdesc->containing_type()->map_value(), fdesc);
-    }
-  }
-}
-
-// Shorthand to get a FieldDescriptor for a field of unittest::TestMap.
-const FieldDescriptor* MapReflectionTester::F(const std::string& name) {
-  const FieldDescriptor* result = nullptr;
-  result = base_descriptor_->FindFieldByName(name);
-  GOOGLE_CHECK(result != nullptr);
-  return result;
-}
-
-void MapReflectionTester::SetMapFieldsViaReflection(Message* message) {
-  const Reflection* reflection = message->GetReflection();
-  Message* sub_message = nullptr;
-  Message* sub_foreign_message = nullptr;
-
-  // Add first element.
-  sub_message = reflection->AddMessage(message, F("map_int32_int32"));
-  sub_message->GetReflection()->SetInt32(sub_message, map_int32_int32_key_, 0);
-  sub_message->GetReflection()->SetInt32(sub_message, map_int32_int32_val_, 0);
-
-  sub_message = reflection->AddMessage(message, F("map_int64_int64"));
-  sub_message->GetReflection()->SetInt64(sub_message, map_int64_int64_key_, 0);
-  sub_message->GetReflection()->SetInt64(sub_message, map_int64_int64_val_, 0);
-
-  sub_message = reflection->AddMessage(message, F("map_uint32_uint32"));
-  sub_message->GetReflection()->SetUInt32(sub_message, map_uint32_uint32_key_,
-                                          0);
-  sub_message->GetReflection()->SetUInt32(sub_message, map_uint32_uint32_val_,
-                                          0);
-
-  sub_message = reflection->AddMessage(message, F("map_uint64_uint64"));
-  sub_message->GetReflection()->SetUInt64(sub_message, map_uint64_uint64_key_,
-                                          0);
-  sub_message->GetReflection()->SetUInt64(sub_message, map_uint64_uint64_val_,
-                                          0);
-
-  sub_message = reflection->AddMessage(message, F("map_sint32_sint32"));
-  sub_message->GetReflection()->SetInt32(sub_message, map_sint32_sint32_key_,
-                                         0);
-  sub_message->GetReflection()->SetInt32(sub_message, map_sint32_sint32_val_,
-                                         0);
-
-  sub_message = reflection->AddMessage(message, F("map_sint64_sint64"));
-  sub_message->GetReflection()->SetInt64(sub_message, map_sint64_sint64_key_,
-                                         0);
-  sub_message->GetReflection()->SetInt64(sub_message, map_sint64_sint64_val_,
-                                         0);
-
-  sub_message = reflection->AddMessage(message, F("map_fixed32_fixed32"));
-  sub_message->GetReflection()->SetUInt32(sub_message, map_fixed32_fixed32_key_,
-                                          0);
-  sub_message->GetReflection()->SetUInt32(sub_message, map_fixed32_fixed32_val_,
-                                          0);
-
-  sub_message = reflection->AddMessage(message, F("map_fixed64_fixed64"));
-  sub_message->GetReflection()->SetUInt64(sub_message, map_fixed64_fixed64_key_,
-                                          0);
-  sub_message->GetReflection()->SetUInt64(sub_message, map_fixed64_fixed64_val_,
-                                          0);
-
-  sub_message = reflection->AddMessage(message, F("map_sfixed32_sfixed32"));
-  sub_message->GetReflection()->SetInt32(sub_message,
-                                         map_sfixed32_sfixed32_key_, 0);
-  sub_message->GetReflection()->SetInt32(sub_message,
-                                         map_sfixed32_sfixed32_val_, 0);
-
-  sub_message = reflection->AddMessage(message, F("map_sfixed64_sfixed64"));
-  sub_message->GetReflection()->SetInt64(sub_message,
-                                         map_sfixed64_sfixed64_key_, 0);
-  sub_message->GetReflection()->SetInt64(sub_message,
-                                         map_sfixed64_sfixed64_val_, 0);
-
-  sub_message = reflection->AddMessage(message, F("map_int32_float"));
-  sub_message->GetReflection()->SetInt32(sub_message, map_int32_float_key_, 0);
-  sub_message->GetReflection()->SetFloat(sub_message, map_int32_float_val_,
-                                         0.0);
-
-  sub_message = reflection->AddMessage(message, F("map_int32_double"));
-  sub_message->GetReflection()->SetInt32(sub_message, map_int32_double_key_, 0);
-  sub_message->GetReflection()->SetDouble(sub_message, map_int32_double_val_,
-                                          0.0);
-
-  sub_message = reflection->AddMessage(message, F("map_bool_bool"));
-  sub_message->GetReflection()->SetBool(sub_message, map_bool_bool_key_, false);
-  sub_message->GetReflection()->SetBool(sub_message, map_bool_bool_val_, false);
-
-  sub_message = reflection->AddMessage(message, F("map_string_string"));
-  sub_message->GetReflection()->SetString(sub_message, map_string_string_key_,
-                                          "0");
-  sub_message->GetReflection()->SetString(sub_message, map_string_string_val_,
-                                          "0");
-
-  sub_message = reflection->AddMessage(message, F("map_int32_bytes"));
-  sub_message->GetReflection()->SetInt32(sub_message, map_int32_bytes_key_, 0);
-  sub_message->GetReflection()->SetString(sub_message, map_int32_bytes_val_,
-                                          "0");
-
-  sub_message = reflection->AddMessage(message, F("map_int32_enum"));
-  sub_message->GetReflection()->SetInt32(sub_message, map_int32_enum_key_, 0);
-  sub_message->GetReflection()->SetEnum(sub_message, map_int32_enum_val_,
-                                        map_enum_bar_);
-
-  sub_message = reflection->AddMessage(message, F("map_int32_foreign_message"));
-  sub_message->GetReflection()->SetInt32(sub_message,
-                                         map_int32_foreign_message_key_, 0);
-  sub_foreign_message = sub_message->GetReflection()->MutableMessage(
-      sub_message, map_int32_foreign_message_val_, nullptr);
-  sub_foreign_message->GetReflection()->SetInt32(sub_foreign_message,
-                                                 foreign_c_, 0);
-
-  // Add second element
-  sub_message = reflection->AddMessage(message, F("map_int32_int32"));
-  sub_message->GetReflection()->SetInt32(sub_message, map_int32_int32_key_, 1);
-  sub_message->GetReflection()->SetInt32(sub_message, map_int32_int32_val_, 1);
-
-  sub_message = reflection->AddMessage(message, F("map_int64_int64"));
-  sub_message->GetReflection()->SetInt64(sub_message, map_int64_int64_key_, 1);
-  sub_message->GetReflection()->SetInt64(sub_message, map_int64_int64_val_, 1);
-
-  sub_message = reflection->AddMessage(message, F("map_uint32_uint32"));
-  sub_message->GetReflection()->SetUInt32(sub_message, map_uint32_uint32_key_,
-                                          1);
-  sub_message->GetReflection()->SetUInt32(sub_message, map_uint32_uint32_val_,
-                                          1);
-
-  sub_message = reflection->AddMessage(message, F("map_uint64_uint64"));
-  sub_message->GetReflection()->SetUInt64(sub_message, map_uint64_uint64_key_,
-                                          1);
-  sub_message->GetReflection()->SetUInt64(sub_message, map_uint64_uint64_val_,
-                                          1);
-
-  sub_message = reflection->AddMessage(message, F("map_sint32_sint32"));
-  sub_message->GetReflection()->SetInt32(sub_message, map_sint32_sint32_key_,
-                                         1);
-  sub_message->GetReflection()->SetInt32(sub_message, map_sint32_sint32_val_,
-                                         1);
-
-  sub_message = reflection->AddMessage(message, F("map_sint64_sint64"));
-  sub_message->GetReflection()->SetInt64(sub_message, map_sint64_sint64_key_,
-                                         1);
-  sub_message->GetReflection()->SetInt64(sub_message, map_sint64_sint64_val_,
-                                         1);
-
-  sub_message = reflection->AddMessage(message, F("map_fixed32_fixed32"));
-  sub_message->GetReflection()->SetUInt32(sub_message, map_fixed32_fixed32_key_,
-                                          1);
-  sub_message->GetReflection()->SetUInt32(sub_message, map_fixed32_fixed32_val_,
-                                          1);
-
-  sub_message = reflection->AddMessage(message, F("map_fixed64_fixed64"));
-  sub_message->GetReflection()->SetUInt64(sub_message, map_fixed64_fixed64_key_,
-                                          1);
-  sub_message->GetReflection()->SetUInt64(sub_message, map_fixed64_fixed64_val_,
-                                          1);
-
-  sub_message = reflection->AddMessage(message, F("map_sfixed32_sfixed32"));
-  sub_message->GetReflection()->SetInt32(sub_message,
-                                         map_sfixed32_sfixed32_key_, 1);
-  sub_message->GetReflection()->SetInt32(sub_message,
-                                         map_sfixed32_sfixed32_val_, 1);
-
-  sub_message = reflection->AddMessage(message, F("map_sfixed64_sfixed64"));
-  sub_message->GetReflection()->SetInt64(sub_message,
-                                         map_sfixed64_sfixed64_key_, 1);
-  sub_message->GetReflection()->SetInt64(sub_message,
-                                         map_sfixed64_sfixed64_val_, 1);
-
-  sub_message = reflection->AddMessage(message, F("map_int32_float"));
-  sub_message->GetReflection()->SetInt32(sub_message, map_int32_float_key_, 1);
-  sub_message->GetReflection()->SetFloat(sub_message, map_int32_float_val_,
-                                         1.0);
-
-  sub_message = reflection->AddMessage(message, F("map_int32_double"));
-  sub_message->GetReflection()->SetInt32(sub_message, map_int32_double_key_, 1);
-  sub_message->GetReflection()->SetDouble(sub_message, map_int32_double_val_,
-                                          1.0);
-
-  sub_message = reflection->AddMessage(message, F("map_bool_bool"));
-  sub_message->GetReflection()->SetBool(sub_message, map_bool_bool_key_, true);
-  sub_message->GetReflection()->SetBool(sub_message, map_bool_bool_val_, true);
-
-  sub_message = reflection->AddMessage(message, F("map_string_string"));
-  sub_message->GetReflection()->SetString(sub_message, map_string_string_key_,
-                                          "1");
-  sub_message->GetReflection()->SetString(sub_message, map_string_string_val_,
-                                          "1");
-
-  sub_message = reflection->AddMessage(message, F("map_int32_bytes"));
-  sub_message->GetReflection()->SetInt32(sub_message, map_int32_bytes_key_, 1);
-  sub_message->GetReflection()->SetString(sub_message, map_int32_bytes_val_,
-                                          "1");
-
-  sub_message = reflection->AddMessage(message, F("map_int32_enum"));
-  sub_message->GetReflection()->SetInt32(sub_message, map_int32_enum_key_, 1);
-  sub_message->GetReflection()->SetEnum(sub_message, map_int32_enum_val_,
-                                        map_enum_baz_);
-
-  sub_message = reflection->AddMessage(message, F("map_int32_foreign_message"));
-  sub_message->GetReflection()->SetInt32(sub_message,
-                                         map_int32_foreign_message_key_, 1);
-  sub_foreign_message = sub_message->GetReflection()->MutableMessage(
-      sub_message, map_int32_foreign_message_val_, nullptr);
-  sub_foreign_message->GetReflection()->SetInt32(sub_foreign_message,
-                                                 foreign_c_, 1);
-}
-
-void MapReflectionTester::SetMapFieldsViaMapReflection(Message* message) {
-  const Reflection* reflection = message->GetReflection();
-
-  Message* sub_foreign_message = nullptr;
-  MapValueRef map_val;
-  MapValueConstRef map_val_const;
-
-  // Add first element.
-  MapKey map_key;
-  map_key.SetInt32Value(0);
-  EXPECT_FALSE(reflection->LookupMapValue(*message, F("map_int32_int32"),
-                                          map_key, &map_val_const));
-  EXPECT_TRUE(reflection->InsertOrLookupMapValue(message, F("map_int32_int32"),
-                                                 map_key, &map_val));
-  map_val.SetInt32Value(0);
-
-  map_key.SetInt64Value(0);
-  EXPECT_FALSE(reflection->LookupMapValue(*message, F("map_int64_int64"),
-                                          map_key, &map_val_const));
-  EXPECT_TRUE(reflection->InsertOrLookupMapValue(message, F("map_int64_int64"),
-                                                 map_key, &map_val));
-  map_val.SetInt64Value(0);
-
-  map_key.SetUInt32Value(0);
-  EXPECT_FALSE(reflection->LookupMapValue(*message, F("map_uint32_uint32"),
-                                          map_key, &map_val_const));
-  EXPECT_TRUE(reflection->InsertOrLookupMapValue(
-      message, F("map_uint32_uint32"), map_key, &map_val));
-  map_val.SetUInt32Value(0);
-
-  map_key.SetUInt64Value(0);
-  EXPECT_TRUE(reflection->InsertOrLookupMapValue(
-      message, F("map_uint64_uint64"), map_key, &map_val));
-  map_val.SetUInt64Value(0);
-
-  map_key.SetInt32Value(0);
-  EXPECT_TRUE(reflection->InsertOrLookupMapValue(
-      message, F("map_sint32_sint32"), map_key, &map_val));
-  map_val.SetInt32Value(0);
-
-  map_key.SetInt64Value(0);
-  EXPECT_TRUE(reflection->InsertOrLookupMapValue(
-      message, F("map_sint64_sint64"), map_key, &map_val));
-  map_val.SetInt64Value(0);
-
-  map_key.SetUInt32Value(0);
-  EXPECT_TRUE(reflection->InsertOrLookupMapValue(
-      message, F("map_fixed32_fixed32"), map_key, &map_val));
-  map_val.SetUInt32Value(0);
-
-  map_key.SetUInt64Value(0);
-  EXPECT_TRUE(reflection->InsertOrLookupMapValue(
-      message, F("map_fixed64_fixed64"), map_key, &map_val));
-  map_val.SetUInt64Value(0);
-
-  map_key.SetInt32Value(0);
-  EXPECT_TRUE(reflection->InsertOrLookupMapValue(
-      message, F("map_sfixed32_sfixed32"), map_key, &map_val));
-  map_val.SetInt32Value(0);
-
-  map_key.SetInt64Value(0);
-  EXPECT_TRUE(reflection->InsertOrLookupMapValue(
-      message, F("map_sfixed64_sfixed64"), map_key, &map_val));
-  map_val.SetInt64Value(0);
-
-  map_key.SetInt32Value(0);
-  EXPECT_TRUE(reflection->InsertOrLookupMapValue(message, F("map_int32_float"),
-                                                 map_key, &map_val));
-  map_val.SetFloatValue(0.0);
-
-  map_key.SetInt32Value(0);
-  EXPECT_TRUE(reflection->InsertOrLookupMapValue(message, F("map_int32_double"),
-                                                 map_key, &map_val));
-  map_val.SetDoubleValue(0.0);
-
-  map_key.SetBoolValue(false);
-  EXPECT_FALSE(reflection->LookupMapValue(*message, F("map_bool_bool"), map_key,
-                                          &map_val_const));
-  EXPECT_TRUE(reflection->InsertOrLookupMapValue(message, F("map_bool_bool"),
-                                                 map_key, &map_val));
-  map_val.SetBoolValue(false);
-
-  map_key.SetStringValue("0");
-  EXPECT_FALSE(reflection->LookupMapValue(*message, F("map_string_string"),
-                                          map_key, &map_val_const));
-  EXPECT_TRUE(reflection->InsertOrLookupMapValue(
-      message, F("map_string_string"), map_key, &map_val));
-  map_val.SetStringValue("0");
-
-  map_key.SetInt32Value(0);
-  EXPECT_FALSE(reflection->LookupMapValue(*message, F("map_int32_bytes"),
-                                          map_key, &map_val_const));
-  EXPECT_TRUE(reflection->InsertOrLookupMapValue(message, F("map_int32_bytes"),
-                                                 map_key, &map_val));
-  map_val.SetStringValue("0");
-
-  map_key.SetInt32Value(0);
-  EXPECT_FALSE(reflection->LookupMapValue(*message, F("map_int32_enum"),
-                                          map_key, &map_val_const));
-  EXPECT_TRUE(reflection->InsertOrLookupMapValue(message, F("map_int32_enum"),
-                                                 map_key, &map_val));
-  map_val.SetEnumValue(map_enum_bar_->number());
-
-  map_key.SetInt32Value(0);
-  EXPECT_FALSE(reflection->LookupMapValue(
-      *message, F("map_int32_foreign_message"), map_key, &map_val_const));
-  EXPECT_TRUE(reflection->InsertOrLookupMapValue(
-      message, F("map_int32_foreign_message"), map_key, &map_val));
-  sub_foreign_message = map_val.MutableMessageValue();
-  sub_foreign_message->GetReflection()->SetInt32(sub_foreign_message,
-                                                 foreign_c_, 0);
-
-  // Add second element
-  map_key.SetInt32Value(1);
-  EXPECT_TRUE(reflection->InsertOrLookupMapValue(message, F("map_int32_int32"),
-                                                 map_key, &map_val));
-  map_val.SetInt32Value(1);
-  EXPECT_FALSE(reflection->InsertOrLookupMapValue(message, F("map_int32_int32"),
-                                                  map_key, &map_val));
-
-  map_key.SetInt64Value(1);
-  EXPECT_TRUE(reflection->InsertOrLookupMapValue(message, F("map_int64_int64"),
-                                                 map_key, &map_val));
-  map_val.SetInt64Value(1);
-  EXPECT_FALSE(reflection->InsertOrLookupMapValue(message, F("map_int64_int64"),
-                                                  map_key, &map_val));
-
-  map_key.SetUInt32Value(1);
-  reflection->InsertOrLookupMapValue(message, F("map_uint32_uint32"), map_key,
-                                     &map_val);
-  map_val.SetUInt32Value(1);
-
-  map_key.SetUInt64Value(1);
-  reflection->InsertOrLookupMapValue(message, F("map_uint64_uint64"), map_key,
-                                     &map_val);
-  map_val.SetUInt64Value(1);
-
-  map_key.SetInt32Value(1);
-  reflection->InsertOrLookupMapValue(message, F("map_sint32_sint32"), map_key,
-                                     &map_val);
-  map_val.SetInt32Value(1);
-
-  map_key.SetInt64Value(1);
-  reflection->InsertOrLookupMapValue(message, F("map_sint64_sint64"), map_key,
-                                     &map_val);
-  map_val.SetInt64Value(1);
-
-  map_key.SetUInt32Value(1);
-  reflection->InsertOrLookupMapValue(message, F("map_fixed32_fixed32"), map_key,
-                                     &map_val);
-  map_val.SetUInt32Value(1);
-
-  map_key.SetUInt64Value(1);
-  reflection->InsertOrLookupMapValue(message, F("map_fixed64_fixed64"), map_key,
-                                     &map_val);
-  map_val.SetUInt64Value(1);
-
-  map_key.SetInt32Value(1);
-  reflection->InsertOrLookupMapValue(message, F("map_sfixed32_sfixed32"),
-                                     map_key, &map_val);
-  map_val.SetInt32Value(1);
-
-  map_key.SetInt64Value(1);
-  reflection->InsertOrLookupMapValue(message, F("map_sfixed64_sfixed64"),
-                                     map_key, &map_val);
-  map_val.SetInt64Value(1);
-
-  map_key.SetInt32Value(1);
-  reflection->InsertOrLookupMapValue(message, F("map_int32_float"), map_key,
-                                     &map_val);
-  map_val.SetFloatValue(1.0);
-
-  map_key.SetInt32Value(1);
-  reflection->InsertOrLookupMapValue(message, F("map_int32_double"), map_key,
-                                     &map_val);
-  map_val.SetDoubleValue(1.0);
-
-  map_key.SetBoolValue(true);
-  reflection->InsertOrLookupMapValue(message, F("map_bool_bool"), map_key,
-                                     &map_val);
-  map_val.SetBoolValue(true);
-
-  map_key.SetStringValue("1");
-  reflection->InsertOrLookupMapValue(message, F("map_string_string"), map_key,
-                                     &map_val);
-  map_val.SetStringValue("1");
-
-  map_key.SetInt32Value(1);
-  reflection->InsertOrLookupMapValue(message, F("map_int32_bytes"), map_key,
-                                     &map_val);
-  map_val.SetStringValue("1");
-
-  map_key.SetInt32Value(1);
-  reflection->InsertOrLookupMapValue(message, F("map_int32_enum"), map_key,
-                                     &map_val);
-  map_val.SetEnumValue(map_enum_baz_->number());
-
-  map_key.SetInt32Value(1);
-  EXPECT_TRUE(reflection->InsertOrLookupMapValue(
-      message, F("map_int32_foreign_message"), map_key, &map_val));
-  sub_foreign_message = map_val.MutableMessageValue();
-  sub_foreign_message->GetReflection()->SetInt32(sub_foreign_message,
-                                                 foreign_c_, 1);
-}
-
-void MapReflectionTester::GetMapValueViaMapReflection(
-    Message* message, const std::string& field_name, const MapKey& map_key,
-    MapValueRef* map_val) {
-  const Reflection* reflection = message->GetReflection();
-  EXPECT_FALSE(reflection->InsertOrLookupMapValue(message, F(field_name),
-                                                  map_key, map_val));
-}
-
-Message* MapReflectionTester::GetMapEntryViaReflection(
-    Message* message, const std::string& field_name, int index) {
-  const Reflection* reflection = message->GetReflection();
-  return reflection->MutableRepeatedMessage(message, F(field_name), index);
-}
-
-MapIterator MapReflectionTester::MapBegin(Message* message,
-                                          const std::string& field_name) {
-  const Reflection* reflection = message->GetReflection();
-  return reflection->MapBegin(message, F(field_name));
-}
-
-MapIterator MapReflectionTester::MapEnd(Message* message,
-                                        const std::string& field_name) {
-  const Reflection* reflection = message->GetReflection();
-  return reflection->MapEnd(message, F(field_name));
-}
-
-int MapReflectionTester::MapSize(const Message& message,
-                                 const std::string& field_name) {
-  const Reflection* reflection = message.GetReflection();
-  return reflection->MapSize(message, F(field_name));
-}
-
-void MapReflectionTester::ClearMapFieldsViaReflection(Message* message) {
-  const Reflection* reflection = message->GetReflection();
-
-  reflection->ClearField(message, F("map_int32_int32"));
-  reflection->ClearField(message, F("map_int64_int64"));
-  reflection->ClearField(message, F("map_uint32_uint32"));
-  reflection->ClearField(message, F("map_uint64_uint64"));
-  reflection->ClearField(message, F("map_sint32_sint32"));
-  reflection->ClearField(message, F("map_sint64_sint64"));
-  reflection->ClearField(message, F("map_fixed32_fixed32"));
-  reflection->ClearField(message, F("map_fixed64_fixed64"));
-  reflection->ClearField(message, F("map_sfixed32_sfixed32"));
-  reflection->ClearField(message, F("map_sfixed64_sfixed64"));
-  reflection->ClearField(message, F("map_int32_float"));
-  reflection->ClearField(message, F("map_int32_double"));
-  reflection->ClearField(message, F("map_bool_bool"));
-  reflection->ClearField(message, F("map_string_string"));
-  reflection->ClearField(message, F("map_int32_bytes"));
-  reflection->ClearField(message, F("map_int32_enum"));
-  reflection->ClearField(message, F("map_int32_foreign_message"));
-}
-
-void MapReflectionTester::ModifyMapFieldsViaReflection(Message* message) {
-  const Reflection* reflection = message->GetReflection();
-  MapValueRef map_val;
-  Message* sub_foreign_message;
-
-  // Modify the second element
-  MapKey map_key;
-  map_key.SetInt32Value(1);
-  EXPECT_FALSE(reflection->InsertOrLookupMapValue(message, F("map_int32_int32"),
-                                                  map_key, &map_val));
-  map_val.SetInt32Value(2);
-
-  map_key.SetInt64Value(1);
-  EXPECT_FALSE(reflection->InsertOrLookupMapValue(message, F("map_int64_int64"),
-                                                  map_key, &map_val));
-  map_val.SetInt64Value(2);
-
-  map_key.SetUInt32Value(1);
-  EXPECT_FALSE(reflection->InsertOrLookupMapValue(
-      message, F("map_uint32_uint32"), map_key, &map_val));
-  map_val.SetUInt32Value(2);
-
-  map_key.SetUInt64Value(1);
-  reflection->InsertOrLookupMapValue(message, F("map_uint64_uint64"), map_key,
-                                     &map_val);
-  map_val.SetUInt64Value(2);
-
-  map_key.SetInt32Value(1);
-  reflection->InsertOrLookupMapValue(message, F("map_sint32_sint32"), map_key,
-                                     &map_val);
-  map_val.SetInt32Value(2);
-
-  map_key.SetInt64Value(1);
-  reflection->InsertOrLookupMapValue(message, F("map_sint64_sint64"), map_key,
-                                     &map_val);
-  map_val.SetInt64Value(2);
-
-  map_key.SetUInt32Value(1);
-  reflection->InsertOrLookupMapValue(message, F("map_fixed32_fixed32"), map_key,
-                                     &map_val);
-  map_val.SetUInt32Value(2);
-
-  map_key.SetUInt64Value(1);
-  reflection->InsertOrLookupMapValue(message, F("map_fixed64_fixed64"), map_key,
-                                     &map_val);
-  map_val.SetUInt64Value(2);
-
-  map_key.SetInt32Value(1);
-  reflection->InsertOrLookupMapValue(message, F("map_sfixed32_sfixed32"),
-                                     map_key, &map_val);
-  map_val.SetInt32Value(2);
-
-  map_key.SetInt64Value(1);
-  reflection->InsertOrLookupMapValue(message, F("map_sfixed64_sfixed64"),
-                                     map_key, &map_val);
-  map_val.SetInt64Value(2);
-
-  map_key.SetInt32Value(1);
-  reflection->InsertOrLookupMapValue(message, F("map_int32_float"), map_key,
-                                     &map_val);
-  map_val.SetFloatValue(2.0);
-
-  map_key.SetInt32Value(1);
-  reflection->InsertOrLookupMapValue(message, F("map_int32_double"), map_key,
-                                     &map_val);
-  map_val.SetDoubleValue(2.0);
-
-  map_key.SetBoolValue(true);
-  reflection->InsertOrLookupMapValue(message, F("map_bool_bool"), map_key,
-                                     &map_val);
-  map_val.SetBoolValue(false);
-
-  map_key.SetStringValue("1");
-  reflection->InsertOrLookupMapValue(message, F("map_string_string"), map_key,
-                                     &map_val);
-  map_val.SetStringValue("2");
-
-  map_key.SetInt32Value(1);
-  reflection->InsertOrLookupMapValue(message, F("map_int32_bytes"), map_key,
-                                     &map_val);
-  map_val.SetStringValue("2");
-
-  map_key.SetInt32Value(1);
-  reflection->InsertOrLookupMapValue(message, F("map_int32_enum"), map_key,
-                                     &map_val);
-  map_val.SetEnumValue(map_enum_foo_->number());
-
-  map_key.SetInt32Value(1);
-  EXPECT_FALSE(reflection->InsertOrLookupMapValue(
-      message, F("map_int32_foreign_message"), map_key, &map_val));
-  sub_foreign_message = map_val.MutableMessageValue();
-  sub_foreign_message->GetReflection()->SetInt32(sub_foreign_message,
-                                                 foreign_c_, 2);
-}
-
-void MapReflectionTester::RemoveLastMapsViaReflection(Message* message) {
-  const Reflection* reflection = message->GetReflection();
-
-  std::vector<const FieldDescriptor*> output;
-  reflection->ListFields(*message, &output);
-  for (int i = 0; i < output.size(); ++i) {
-    const FieldDescriptor* field = output[i];
-    if (!field->is_repeated()) continue;
-    reflection->RemoveLast(message, field);
-  }
-}
-
-void MapReflectionTester::ReleaseLastMapsViaReflection(Message* message) {
-  const Reflection* reflection = message->GetReflection();
-
-  std::vector<const FieldDescriptor*> output;
-  reflection->ListFields(*message, &output);
-  for (int i = 0; i < output.size(); ++i) {
-    const FieldDescriptor* field = output[i];
-    if (!field->is_repeated()) continue;
-    if (field->cpp_type() != FieldDescriptor::CPPTYPE_MESSAGE) continue;
-
-    Message* released = reflection->ReleaseLast(message, field);
-    ASSERT_TRUE(released != nullptr)
-        << "ReleaseLast returned nullptr for: " << field->name();
-    delete released;
-  }
-}
-
-void MapReflectionTester::SwapMapsViaReflection(Message* message) {
-  const Reflection* reflection = message->GetReflection();
-  std::vector<const FieldDescriptor*> output;
-  reflection->ListFields(*message, &output);
-  for (int i = 0; i < output.size(); ++i) {
-    const FieldDescriptor* field = output[i];
-    if (!field->is_repeated()) continue;
-    reflection->SwapElements(message, field, 0, 1);
-  }
-}
-
-void MapReflectionTester::MutableUnknownFieldsOfMapFieldsViaReflection(
-    Message* message) {
-  const Reflection* reflection = message->GetReflection();
-  Message* sub_message = nullptr;
-
-  sub_message = reflection->AddMessage(message, F("map_int32_int32"));
-  EXPECT_TRUE(sub_message->GetReflection()->MutableUnknownFields(sub_message) !=
-              nullptr);
-  sub_message = reflection->AddMessage(message, F("map_int64_int64"));
-  EXPECT_TRUE(sub_message->GetReflection()->MutableUnknownFields(sub_message) !=
-              nullptr);
-  sub_message = reflection->AddMessage(message, F("map_uint32_uint32"));
-  EXPECT_TRUE(sub_message->GetReflection()->MutableUnknownFields(sub_message) !=
-              nullptr);
-  sub_message = reflection->AddMessage(message, F("map_uint64_uint64"));
-  EXPECT_TRUE(sub_message->GetReflection()->MutableUnknownFields(sub_message) !=
-              nullptr);
-  sub_message = reflection->AddMessage(message, F("map_sint32_sint32"));
-  EXPECT_TRUE(sub_message->GetReflection()->MutableUnknownFields(sub_message) !=
-              nullptr);
-  sub_message = reflection->AddMessage(message, F("map_sint64_sint64"));
-  EXPECT_TRUE(sub_message->GetReflection()->MutableUnknownFields(sub_message) !=
-              nullptr);
-  sub_message = reflection->AddMessage(message, F("map_fixed32_fixed32"));
-  EXPECT_TRUE(sub_message->GetReflection()->MutableUnknownFields(sub_message) !=
-              nullptr);
-  sub_message = reflection->AddMessage(message, F("map_fixed64_fixed64"));
-  EXPECT_TRUE(sub_message->GetReflection()->MutableUnknownFields(sub_message) !=
-              nullptr);
-  sub_message = reflection->AddMessage(message, F("map_sfixed32_sfixed32"));
-  EXPECT_TRUE(sub_message->GetReflection()->MutableUnknownFields(sub_message) !=
-              nullptr);
-  sub_message = reflection->AddMessage(message, F("map_sfixed64_sfixed64"));
-  EXPECT_TRUE(sub_message->GetReflection()->MutableUnknownFields(sub_message) !=
-              nullptr);
-  sub_message = reflection->AddMessage(message, F("map_int32_float"));
-  EXPECT_TRUE(sub_message->GetReflection()->MutableUnknownFields(sub_message) !=
-              nullptr);
-  sub_message = reflection->AddMessage(message, F("map_int32_double"));
-  EXPECT_TRUE(sub_message->GetReflection()->MutableUnknownFields(sub_message) !=
-              nullptr);
-  sub_message = reflection->AddMessage(message, F("map_bool_bool"));
-  EXPECT_TRUE(sub_message->GetReflection()->MutableUnknownFields(sub_message) !=
-              nullptr);
-  sub_message = reflection->AddMessage(message, F("map_string_string"));
-  EXPECT_TRUE(sub_message->GetReflection()->MutableUnknownFields(sub_message) !=
-              nullptr);
-  sub_message = reflection->AddMessage(message, F("map_int32_bytes"));
-  EXPECT_TRUE(sub_message->GetReflection()->MutableUnknownFields(sub_message) !=
-              nullptr);
-  sub_message = reflection->AddMessage(message, F("map_int32_enum"));
-  EXPECT_TRUE(sub_message->GetReflection()->MutableUnknownFields(sub_message) !=
-              nullptr);
-  sub_message = reflection->AddMessage(message, F("map_int32_foreign_message"));
-  EXPECT_TRUE(sub_message->GetReflection()->MutableUnknownFields(sub_message) !=
-              nullptr);
-}
-
-void MapReflectionTester::ExpectMapFieldsSetViaReflection(
-    const Message& message) {
-  std::string scratch;
-  const Reflection* reflection = message.GetReflection();
-  const Message* sub_message;
-  MapKey map_key;
-  MapValueConstRef map_value_const_ref;
-
-  // -----------------------------------------------------------------
-
-  ASSERT_EQ(2, reflection->FieldSize(message, F("map_int32_int32")));
-  ASSERT_EQ(2, reflection->FieldSize(message, F("map_int64_int64")));
-  ASSERT_EQ(2, reflection->FieldSize(message, F("map_uint32_uint32")));
-  ASSERT_EQ(2, reflection->FieldSize(message, F("map_uint64_uint64")));
-  ASSERT_EQ(2, reflection->FieldSize(message, F("map_sint32_sint32")));
-  ASSERT_EQ(2, reflection->FieldSize(message, F("map_sint64_sint64")));
-  ASSERT_EQ(2, reflection->FieldSize(message, F("map_fixed32_fixed32")));
-  ASSERT_EQ(2, reflection->FieldSize(message, F("map_fixed64_fixed64")));
-  ASSERT_EQ(2, reflection->FieldSize(message, F("map_sfixed32_sfixed32")));
-  ASSERT_EQ(2, reflection->FieldSize(message, F("map_sfixed64_sfixed64")));
-  ASSERT_EQ(2, reflection->FieldSize(message, F("map_int32_float")));
-  ASSERT_EQ(2, reflection->FieldSize(message, F("map_int32_double")));
-  ASSERT_EQ(2, reflection->FieldSize(message, F("map_bool_bool")));
-  ASSERT_EQ(2, reflection->FieldSize(message, F("map_string_string")));
-  ASSERT_EQ(2, reflection->FieldSize(message, F("map_int32_bytes")));
-  ASSERT_EQ(2, reflection->FieldSize(message, F("map_int32_enum")));
-  ASSERT_EQ(2, reflection->FieldSize(message, F("map_int32_foreign_message")));
-
-  {
-    std::map<int32_t, int32_t> map;
-    map[0] = 0;
-    map[1] = 1;
-    for (int i = 0; i < 2; i++) {
-      const internal::MapFieldBase& map_field =
-          reflection->GetRaw<internal::MapFieldBase>(message,
-                                                     F("map_int32_int32"));
-      if (map_field.IsRepeatedFieldValid()) {
-        // Check with RepeatedField Reflection
-        sub_message =
-            &reflection->GetRepeatedMessage(message, F("map_int32_int32"), i);
-        int32_t key = sub_message->GetReflection()->GetInt32(
-            *sub_message, map_int32_int32_key_);
-        int32_t val = sub_message->GetReflection()->GetInt32(
-            *sub_message, map_int32_int32_val_);
-        EXPECT_EQ(map[key], val);
-      } else {
-        // Check with Map Reflection
-        map_key.SetInt32Value(i);
-        EXPECT_TRUE(
-            reflection->ContainsMapKey(message, F("map_int32_int32"), map_key));
-        EXPECT_TRUE(reflection->LookupMapValue(message, F("map_int32_int32"),
-                                               map_key, &map_value_const_ref));
-        EXPECT_EQ(map_value_const_ref.GetInt32Value(), map[i]);
-      }
-    }
-  }
-  {
-    std::map<int64_t, int64_t> map;
-    map[0] = 0;
-    map[1] = 1;
-    for (int i = 0; i < 2; i++) {
-      const internal::MapFieldBase& map_field =
-          reflection->GetRaw<internal::MapFieldBase>(message,
-                                                     F("map_int64_int64"));
-      if (map_field.IsRepeatedFieldValid()) {
-        // Check with RepeatedField Reflection
-        sub_message =
-            &reflection->GetRepeatedMessage(message, F("map_int64_int64"), i);
-        int64_t key = sub_message->GetReflection()->GetInt64(
-            *sub_message, map_int64_int64_key_);
-        int64_t val = sub_message->GetReflection()->GetInt64(
-            *sub_message, map_int64_int64_val_);
-        EXPECT_EQ(map[key], val);
-      } else {
-        // Check with Map Reflection
-        map_key.SetInt64Value(i);
-        EXPECT_TRUE(
-            reflection->ContainsMapKey(message, F("map_int64_int64"), map_key));
-        EXPECT_TRUE(reflection->LookupMapValue(message, F("map_int64_int64"),
-                                               map_key, &map_value_const_ref));
-        EXPECT_EQ(map_value_const_ref.GetInt64Value(), map[i]);
-      }
-    }
-  }
-  {
-    std::map<uint32_t, uint32_t> map;
-    map[0] = 0;
-    map[1] = 1;
-    for (int i = 0; i < 2; i++) {
-      const internal::MapFieldBase& map_field =
-          reflection->GetRaw<internal::MapFieldBase>(message,
-                                                     F("map_uint32_uint32"));
-      if (map_field.IsRepeatedFieldValid()) {
-        // Check with RepeatedField Reflection
-        sub_message =
-            &reflection->GetRepeatedMessage(message, F("map_uint32_uint32"), i);
-        uint32_t key = sub_message->GetReflection()->GetUInt32(
-            *sub_message, map_uint32_uint32_key_);
-        uint32_t val = sub_message->GetReflection()->GetUInt32(
-            *sub_message, map_uint32_uint32_val_);
-        EXPECT_EQ(map[key], val);
-      } else {
-        // Check with Map Reflection
-        map_key.SetUInt32Value(i);
-        EXPECT_TRUE(reflection->ContainsMapKey(message, F("map_uint32_uint32"),
-                                               map_key));
-        EXPECT_TRUE(reflection->LookupMapValue(message, F("map_uint32_uint32"),
-                                               map_key, &map_value_const_ref));
-        EXPECT_EQ(map_value_const_ref.GetUInt32Value(), map[i]);
-      }
-    }
-  }
-  {
-    std::map<uint64_t, uint64_t> map;
-    map[0] = 0;
-    map[1] = 1;
-    for (int i = 0; i < 2; i++) {
-      const internal::MapFieldBase& map_field =
-          reflection->GetRaw<internal::MapFieldBase>(message,
-                                                     F("map_uint64_uint64"));
-      if (map_field.IsRepeatedFieldValid()) {
-        // Check with RepeatedField Reflection
-        sub_message =
-            &reflection->GetRepeatedMessage(message, F("map_uint64_uint64"), i);
-        uint64_t key = sub_message->GetReflection()->GetUInt64(
-            *sub_message, map_uint64_uint64_key_);
-        uint64_t val = sub_message->GetReflection()->GetUInt64(
-            *sub_message, map_uint64_uint64_val_);
-        EXPECT_EQ(map[key], val);
-      } else {
-        // Check with Map Reflection
-        map_key.SetUInt64Value(i);
-        EXPECT_TRUE(reflection->ContainsMapKey(message, F("map_uint64_uint64"),
-                                               map_key));
-        EXPECT_TRUE(reflection->LookupMapValue(message, F("map_uint64_uint64"),
-                                               map_key, &map_value_const_ref));
-        EXPECT_EQ(map_value_const_ref.GetUInt64Value(), map[i]);
-      }
-    }
-  }
-  {
-    std::map<int32_t, int32_t> map;
-    map[0] = 0;
-    map[1] = 1;
-    for (int i = 0; i < 2; i++) {
-      const internal::MapFieldBase& map_field =
-          reflection->GetRaw<internal::MapFieldBase>(message,
-                                                     F("map_sint32_sint32"));
-      if (map_field.IsRepeatedFieldValid()) {
-        // Check with RepeatedField Reflection
-        sub_message =
-            &reflection->GetRepeatedMessage(message, F("map_sint32_sint32"), i);
-        int32_t key = sub_message->GetReflection()->GetInt32(
-            *sub_message, map_sint32_sint32_key_);
-        int32_t val = sub_message->GetReflection()->GetInt32(
-            *sub_message, map_sint32_sint32_val_);
-        EXPECT_EQ(map[key], val);
-      } else {
-        // Check with Map Reflection
-        map_key.SetInt32Value(i);
-        EXPECT_EQ(true, reflection->ContainsMapKey(
-                            message, F("map_sint32_sint32"), map_key));
-        EXPECT_TRUE(reflection->LookupMapValue(message, F("map_sint32_sint32"),
-                                               map_key, &map_value_const_ref));
-        EXPECT_EQ(map_value_const_ref.GetInt32Value(), map[i]);
-      }
-    }
-  }
-  {
-    std::map<int64_t, int64_t> map;
-    map[0] = 0;
-    map[1] = 1;
-    for (int i = 0; i < 2; i++) {
-      const internal::MapFieldBase& map_field =
-          reflection->GetRaw<internal::MapFieldBase>(message,
-                                                     F("map_sint64_sint64"));
-      if (map_field.IsRepeatedFieldValid()) {
-        // Check with RepeatedField Reflection
-        sub_message =
-            &reflection->GetRepeatedMessage(message, F("map_sint64_sint64"), i);
-        int64_t key = sub_message->GetReflection()->GetInt64(
-            *sub_message, map_sint64_sint64_key_);
-        int64_t val = sub_message->GetReflection()->GetInt64(
-            *sub_message, map_sint64_sint64_val_);
-        EXPECT_EQ(map[key], val);
-      } else {
-        // Check with Map Reflection
-        map_key.SetInt64Value(i);
-        EXPECT_EQ(true, reflection->ContainsMapKey(
-                            message, F("map_sint64_sint64"), map_key));
-        EXPECT_TRUE(reflection->LookupMapValue(message, F("map_sint64_sint64"),
-                                               map_key, &map_value_const_ref));
-        EXPECT_EQ(map_value_const_ref.GetInt64Value(), map[i]);
-      }
-    }
-  }
-  {
-    std::map<uint32_t, uint32_t> map;
-    map[0] = 0;
-    map[1] = 1;
-    for (int i = 0; i < 2; i++) {
-      const internal::MapFieldBase& map_field =
-          reflection->GetRaw<internal::MapFieldBase>(message,
-                                                     F("map_fixed32_fixed32"));
-      if (map_field.IsRepeatedFieldValid()) {
-        // Check with RepeatedField Reflection
-        sub_message = &reflection->GetRepeatedMessage(
-            message, F("map_fixed32_fixed32"), i);
-        uint32_t key = sub_message->GetReflection()->GetUInt32(
-            *sub_message, map_fixed32_fixed32_key_);
-        uint32_t val = sub_message->GetReflection()->GetUInt32(
-            *sub_message, map_fixed32_fixed32_val_);
-        EXPECT_EQ(map[key], val);
-      } else {
-        // Check with Map Reflection
-        map_key.SetUInt32Value(i);
-        EXPECT_EQ(true, reflection->ContainsMapKey(
-                            message, F("map_fixed32_fixed32"), map_key));
-        EXPECT_TRUE(reflection->LookupMapValue(
-            message, F("map_fixed32_fixed32"), map_key, &map_value_const_ref));
-        EXPECT_EQ(map_value_const_ref.GetUInt32Value(), map[i]);
-      }
-    }
-  }
-  {
-    std::map<uint64_t, uint64_t> map;
-    map[0] = 0;
-    map[1] = 1;
-    for (int i = 0; i < 2; i++) {
-      const internal::MapFieldBase& map_field =
-          reflection->GetRaw<internal::MapFieldBase>(message,
-                                                     F("map_fixed64_fixed64"));
-      if (map_field.IsRepeatedFieldValid()) {
-        // Check with RepeatedField Reflection
-        sub_message = &reflection->GetRepeatedMessage(
-            message, F("map_fixed64_fixed64"), i);
-        uint64_t key = sub_message->GetReflection()->GetUInt64(
-            *sub_message, map_fixed64_fixed64_key_);
-        uint64_t val = sub_message->GetReflection()->GetUInt64(
-            *sub_message, map_fixed64_fixed64_val_);
-        EXPECT_EQ(map[key], val);
-      } else {
-        // Check with Map Reflection
-        map_key.SetUInt64Value(i);
-        EXPECT_EQ(true, reflection->ContainsMapKey(
-                            message, F("map_fixed64_fixed64"), map_key));
-        EXPECT_TRUE(reflection->LookupMapValue(
-            message, F("map_fixed64_fixed64"), map_key, &map_value_const_ref));
-        EXPECT_EQ(map_value_const_ref.GetUInt64Value(), map[i]);
-      }
-    }
-  }
-  {
-    std::map<int32_t, int32_t> map;
-    map[0] = 0;
-    map[1] = 1;
-    for (int i = 0; i < 2; i++) {
-      const internal::MapFieldBase& map_field =
-          reflection->GetRaw<internal::MapFieldBase>(
-              message, F("map_sfixed32_sfixed32"));
-      if (map_field.IsRepeatedFieldValid()) {
-        // Check with RepeatedField Reflection
-        sub_message = &reflection->GetRepeatedMessage(
-            message, F("map_sfixed32_sfixed32"), i);
-        int32_t key = sub_message->GetReflection()->GetInt32(
-            *sub_message, map_sfixed32_sfixed32_key_);
-        int32_t val = sub_message->GetReflection()->GetInt32(
-            *sub_message, map_sfixed32_sfixed32_val_);
-        EXPECT_EQ(map[key], val);
-      } else {
-        // Check with Map Reflection
-        map_key.SetInt32Value(i);
-        EXPECT_EQ(true, reflection->ContainsMapKey(
-                            message, F("map_sfixed32_sfixed32"), map_key));
-        EXPECT_TRUE(reflection->LookupMapValue(message,
-                                               F("map_sfixed32_sfixed32"),
-                                               map_key, &map_value_const_ref));
-        EXPECT_EQ(map_value_const_ref.GetInt32Value(), map[i]);
-      }
-    }
-  }
-  {
-    std::map<int64_t, int64_t> map;
-    map[0] = 0;
-    map[1] = 1;
-    for (int i = 0; i < 2; i++) {
-      const internal::MapFieldBase& map_field =
-          reflection->GetRaw<internal::MapFieldBase>(
-              message, F("map_sfixed64_sfixed64"));
-      if (map_field.IsRepeatedFieldValid()) {
-        // Check with RepeatedField Reflection
-        sub_message = &reflection->GetRepeatedMessage(
-            message, F("map_sfixed64_sfixed64"), i);
-        int64_t key = sub_message->GetReflection()->GetInt64(
-            *sub_message, map_sfixed64_sfixed64_key_);
-        int64_t val = sub_message->GetReflection()->GetInt64(
-            *sub_message, map_sfixed64_sfixed64_val_);
-        EXPECT_EQ(map[key], val);
-      } else {
-        // Check with Map Reflection
-        map_key.SetInt64Value(i);
-        EXPECT_EQ(true, reflection->ContainsMapKey(
-                            message, F("map_sfixed64_sfixed64"), map_key));
-        EXPECT_TRUE(reflection->LookupMapValue(message,
-                                               F("map_sfixed64_sfixed64"),
-                                               map_key, &map_value_const_ref));
-        EXPECT_EQ(map_value_const_ref.GetInt64Value(), map[i]);
-      }
-    }
-  }
-  {
-    std::map<int32_t, float> map;
-    map[0] = 0.0;
-    map[1] = 1.0;
-    for (int i = 0; i < 2; i++) {
-      const internal::MapFieldBase& map_field =
-          reflection->GetRaw<internal::MapFieldBase>(message,
-                                                     F("map_int32_float"));
-      if (map_field.IsRepeatedFieldValid()) {
-        // Check with RepeatedField Reflection
-        sub_message =
-            &reflection->GetRepeatedMessage(message, F("map_int32_float"), i);
-        int32_t key = sub_message->GetReflection()->GetInt32(
-            *sub_message, map_int32_float_key_);
-        float val = sub_message->GetReflection()->GetFloat(
-            *sub_message, map_int32_float_val_);
-        EXPECT_EQ(map[key], val);
-      } else {
-        // Check with Map Reflection
-        map_key.SetInt32Value(i);
-        EXPECT_EQ(true, reflection->ContainsMapKey(
-                            message, F("map_int32_float"), map_key));
-        EXPECT_TRUE(reflection->LookupMapValue(message, F("map_int32_float"),
-                                               map_key, &map_value_const_ref));
-        EXPECT_EQ(map_value_const_ref.GetFloatValue(), map[i]);
-      }
-    }
-  }
-  {
-    std::map<int32_t, double> map;
-    map[0] = 0.0;
-    map[1] = 1.0;
-    for (int i = 0; i < 2; i++) {
-      const internal::MapFieldBase& map_field =
-          reflection->GetRaw<internal::MapFieldBase>(message,
-                                                     F("map_int32_double"));
-      if (map_field.IsRepeatedFieldValid()) {
-        // Check with RepeatedField Reflection
-        sub_message =
-            &reflection->GetRepeatedMessage(message, F("map_int32_double"), i);
-        int32_t key = sub_message->GetReflection()->GetInt32(
-            *sub_message, map_int32_double_key_);
-        double val = sub_message->GetReflection()->GetDouble(
-            *sub_message, map_int32_double_val_);
-        EXPECT_EQ(map[key], val);
-      } else {
-        // Check with Map Reflection
-        map_key.SetInt32Value(i);
-        EXPECT_EQ(true, reflection->ContainsMapKey(
-                            message, F("map_int32_double"), map_key));
-        EXPECT_TRUE(reflection->LookupMapValue(message, F("map_int32_double"),
-                                               map_key, &map_value_const_ref));
-        EXPECT_EQ(map_value_const_ref.GetDoubleValue(), map[i]);
-      }
-    }
-  }
-  {
-    std::map<bool, bool> map;
-    map[false] = false;
-    map[true] = true;
-    std::vector<bool> keys = {false, true};
-    std::vector<bool> vals = {false, true};
-    for (int i = 0; i < 2; i++) {
-      const internal::MapFieldBase& map_field =
-          reflection->GetRaw<internal::MapFieldBase>(message,
-                                                     F("map_bool_bool"));
-      if (map_field.IsRepeatedFieldValid()) {
-        // Check with RepeatedField Reflection
-        sub_message =
-            &reflection->GetRepeatedMessage(message, F("map_bool_bool"), i);
-        bool key = sub_message->GetReflection()->GetBool(*sub_message,
-                                                         map_bool_bool_key_);
-        bool val = sub_message->GetReflection()->GetBool(*sub_message,
-                                                         map_bool_bool_val_);
-        EXPECT_EQ(map[key], val);
-      } else {
-        // Check with Map Reflection
-        map_key.SetBoolValue(keys[i]);
-        EXPECT_EQ(true, reflection->ContainsMapKey(message, F("map_bool_bool"),
-                                                   map_key));
-        EXPECT_TRUE(reflection->LookupMapValue(message, F("map_bool_bool"),
-                                               map_key, &map_value_const_ref));
-        EXPECT_EQ(map_value_const_ref.GetBoolValue(), vals[i]);
-      }
-    }
-  }
-  {
-    std::map<std::string, std::string> map;
-    map["0"] = "0";
-    map["1"] = "1";
-    std::vector<std::string> keys = {"0", "1"};
-    std::vector<std::string> vals = {"0", "1"};
-    for (int i = 0; i < 2; i++) {
-      const internal::MapFieldBase& map_field =
-          reflection->GetRaw<internal::MapFieldBase>(message,
-                                                     F("map_string_string"));
-      if (map_field.IsRepeatedFieldValid()) {
-        // Check with RepeatedField Reflection
-        sub_message =
-            &reflection->GetRepeatedMessage(message, F("map_string_string"), i);
-        std::string key = sub_message->GetReflection()->GetString(
-            *sub_message, map_string_string_key_);
-        std::string val = sub_message->GetReflection()->GetString(
-            *sub_message, map_string_string_val_);
-        EXPECT_EQ(map[key], val);
-      } else {
-        // Check with Map Reflection
-        map_key.SetStringValue(keys[i]);
-        EXPECT_EQ(true, reflection->ContainsMapKey(
-                            message, F("map_string_string"), map_key));
-        EXPECT_TRUE(reflection->LookupMapValue(message, F("map_string_string"),
-                                               map_key, &map_value_const_ref));
-        EXPECT_EQ(map_value_const_ref.GetStringValue(), vals[i]);
-      }
-    }
-  }
-  {
-    std::map<int32_t, std::string> map;
-    map[0] = "0";
-    map[1] = "1";
-    for (int i = 0; i < 2; i++) {
-      const internal::MapFieldBase& map_field =
-          reflection->GetRaw<internal::MapFieldBase>(message,
-                                                     F("map_int32_bytes"));
-      if (map_field.IsRepeatedFieldValid()) {
-        // Check with RepeatedField Reflection
-        sub_message =
-            &reflection->GetRepeatedMessage(message, F("map_int32_bytes"), i);
-        int32_t key = sub_message->GetReflection()->GetInt32(
-            *sub_message, map_int32_bytes_key_);
-        std::string val = sub_message->GetReflection()->GetString(
-            *sub_message, map_int32_bytes_val_);
-        EXPECT_EQ(map[key], val);
-      } else {
-        // Check with Map Reflection
-        map_key.SetInt32Value(i);
-        EXPECT_EQ(true, reflection->ContainsMapKey(
-                            message, F("map_int32_bytes"), map_key));
-        EXPECT_TRUE(reflection->LookupMapValue(message, F("map_int32_bytes"),
-                                               map_key, &map_value_const_ref));
-        EXPECT_EQ(map_value_const_ref.GetStringValue(), map[i]);
-      }
-    }
-  }
-  {
-    std::map<int32_t, const EnumValueDescriptor*> map;
-    map[0] = map_enum_bar_;
-    map[1] = map_enum_baz_;
-    for (int i = 0; i < 2; i++) {
-      const internal::MapFieldBase& map_field =
-          reflection->GetRaw<internal::MapFieldBase>(message,
-                                                     F("map_int32_enum"));
-      if (map_field.IsRepeatedFieldValid()) {
-        // Check with RepeatedField Reflection
-        sub_message =
-            &reflection->GetRepeatedMessage(message, F("map_int32_enum"), i);
-        int32_t key = sub_message->GetReflection()->GetInt32(
-            *sub_message, map_int32_enum_key_);
-        const EnumValueDescriptor* val = sub_message->GetReflection()->GetEnum(
-            *sub_message, map_int32_enum_val_);
-        EXPECT_EQ(map[key], val);
-      } else {
-        // Check with Map Reflection
-        map_key.SetInt32Value(i);
-        EXPECT_EQ(true, reflection->ContainsMapKey(message, F("map_int32_enum"),
-                                                   map_key));
-        EXPECT_TRUE(reflection->LookupMapValue(message, F("map_int32_enum"),
-                                               map_key, &map_value_const_ref));
-        EXPECT_EQ(map_value_const_ref.GetEnumValue(), map[i]->number());
-      }
-    }
-  }
-  {
-    std::map<int32_t, int32_t> map;
-    map[0] = 0;
-    map[1] = 1;
-    for (int i = 0; i < 2; i++) {
-      const internal::MapFieldBase& map_field =
-          reflection->GetRaw<internal::MapFieldBase>(
-              message, F("map_int32_foreign_message"));
-      if (map_field.IsRepeatedFieldValid()) {
-        // Check with RepeatedField Reflection
-        sub_message = &reflection->GetRepeatedMessage(
-            message, F("map_int32_foreign_message"), i);
-        int32_t key = sub_message->GetReflection()->GetInt32(
-            *sub_message, map_int32_foreign_message_key_);
-        const Message& foreign_message =
-            sub_message->GetReflection()->GetMessage(
-                *sub_message, map_int32_foreign_message_val_);
-        int32_t val = foreign_message.GetReflection()->GetInt32(foreign_message,
-                                                                foreign_c_);
-        EXPECT_EQ(map[key], val);
-      } else {
-        // Check with Map Reflection
-        map_key.SetInt32Value(i);
-        EXPECT_EQ(true, reflection->ContainsMapKey(
-                            message, F("map_int32_foreign_message"), map_key));
-        EXPECT_TRUE(reflection->LookupMapValue(message,
-                                               F("map_int32_foreign_message"),
-                                               map_key, &map_value_const_ref));
-        const Message& foreign_message = map_value_const_ref.GetMessageValue();
-        EXPECT_EQ(foreign_message.GetReflection()->GetInt32(foreign_message,
-                                                            foreign_c_),
-                  map[i]);
-      }
-    }
-  }
-}
-
-void MapReflectionTester::ExpectMapFieldsSetViaReflectionIterator(
-    Message* message) {
-  std::string scratch;
-  std::string serialized;
-  const Reflection* reflection = message->GetReflection();
-
-  ASSERT_EQ(2, reflection->FieldSize(*message, F("map_int32_int32")));
-  ASSERT_EQ(2, reflection->FieldSize(*message, F("map_int64_int64")));
-  ASSERT_EQ(2, reflection->FieldSize(*message, F("map_uint32_uint32")));
-  ASSERT_EQ(2, reflection->FieldSize(*message, F("map_uint64_uint64")));
-  ASSERT_EQ(2, reflection->FieldSize(*message, F("map_sint32_sint32")));
-  ASSERT_EQ(2, reflection->FieldSize(*message, F("map_sint64_sint64")));
-  ASSERT_EQ(2, reflection->FieldSize(*message, F("map_fixed32_fixed32")));
-  ASSERT_EQ(2, reflection->FieldSize(*message, F("map_fixed64_fixed64")));
-  ASSERT_EQ(2, reflection->FieldSize(*message, F("map_sfixed32_sfixed32")));
-  ASSERT_EQ(2, reflection->FieldSize(*message, F("map_sfixed64_sfixed64")));
-  ASSERT_EQ(2, reflection->FieldSize(*message, F("map_int32_float")));
-  ASSERT_EQ(2, reflection->FieldSize(*message, F("map_int32_double")));
-  ASSERT_EQ(2, reflection->FieldSize(*message, F("map_bool_bool")));
-  ASSERT_EQ(2, reflection->FieldSize(*message, F("map_string_string")));
-  ASSERT_EQ(2, reflection->FieldSize(*message, F("map_int32_bytes")));
-  ASSERT_EQ(2, reflection->FieldSize(*message, F("map_int32_enum")));
-  ASSERT_EQ(2, reflection->FieldSize(*message, F("map_int32_foreign_message")));
-
-  {
-    std::map<int32_t, int32_t> map;
-    map[0] = 0;
-    map[1] = 1;
-    int size = 0;
-    for (MapIterator iter = reflection->MapBegin(message, F("map_int32_int32"));
-         iter != reflection->MapEnd(message, F("map_int32_int32"));
-         ++iter, ++size) {
-      // Check const methods do not invalidate map.
-      message->DebugString();
-      message->ShortDebugString();
-      message->SerializeToString(&serialized);
-      message->SpaceUsedLong();
-      message->ByteSizeLong();
-      EXPECT_EQ(map[iter.GetKey().GetInt32Value()],
-                iter.GetValueRef().GetInt32Value());
-    }
-    EXPECT_EQ(size, 2);
-  }
-  {
-    std::map<int64_t, int64_t> map;
-    map[0] = 0;
-    map[1] = 1;
-    for (MapIterator iter = reflection->MapBegin(message, F("map_int64_int64"));
-         iter != reflection->MapEnd(message, F("map_int64_int64")); ++iter) {
-      EXPECT_EQ(map[iter.GetKey().GetInt64Value()],
-                iter.GetValueRef().GetInt64Value());
-    }
-  }
-  {
-    std::map<uint32_t, uint32_t> map;
-    map[0] = 0;
-    map[1] = 1;
-    for (MapIterator iter =
-             reflection->MapBegin(message, F("map_uint32_uint32"));
-         iter != reflection->MapEnd(message, F("map_uint32_uint32")); ++iter) {
-      EXPECT_EQ(map[iter.GetKey().GetUInt32Value()],
-                iter.GetValueRef().GetUInt32Value());
-    }
-  }
-  {
-    std::map<uint64_t, uint64_t> map;
-    map[0] = 0;
-    map[1] = 1;
-    for (MapIterator iter =
-             reflection->MapBegin(message, F("map_uint64_uint64"));
-         iter != reflection->MapEnd(message, F("map_uint64_uint64")); ++iter) {
-      EXPECT_EQ(map[iter.GetKey().GetUInt64Value()],
-                iter.GetValueRef().GetUInt64Value());
-    }
-  }
-  {
-    std::map<int32_t, int32_t> map;
-    map[0] = 0;
-    map[1] = 1;
-    for (MapIterator iter =
-             reflection->MapBegin(message, F("map_sint32_sint32"));
-         iter != reflection->MapEnd(message, F("map_sint32_sint32")); ++iter) {
-      EXPECT_EQ(map[iter.GetKey().GetInt32Value()],
-                iter.GetValueRef().GetInt32Value());
-    }
-  }
-  {
-    std::map<int64_t, int64_t> map;
-    map[0] = 0;
-    map[1] = 1;
-    for (MapIterator iter =
-             reflection->MapBegin(message, F("map_sint64_sint64"));
-         iter != reflection->MapEnd(message, F("map_sint64_sint64")); ++iter) {
-      EXPECT_EQ(map[iter.GetKey().GetInt64Value()],
-                iter.GetValueRef().GetInt64Value());
-    }
-  }
-  {
-    std::map<uint32_t, uint32_t> map;
-    map[0] = 0;
-    map[1] = 1;
-    for (MapIterator iter =
-             reflection->MapBegin(message, F("map_fixed32_fixed32"));
-         iter != reflection->MapEnd(message, F("map_fixed32_fixed32"));
-         ++iter) {
-      EXPECT_EQ(map[iter.GetKey().GetUInt32Value()],
-                iter.GetValueRef().GetUInt32Value());
-    }
-  }
-  {
-    std::map<uint64_t, uint64_t> map;
-    map[0] = 0;
-    map[1] = 1;
-    for (MapIterator iter =
-             reflection->MapBegin(message, F("map_fixed64_fixed64"));
-         iter != reflection->MapEnd(message, F("map_fixed64_fixed64"));
-         ++iter) {
-      EXPECT_EQ(map[iter.GetKey().GetUInt64Value()],
-                iter.GetValueRef().GetUInt64Value());
-    }
-  }
-  {
-    std::map<int32_t, int32_t> map;
-    map[0] = 0;
-    map[1] = 1;
-    for (MapIterator iter =
-             reflection->MapBegin(message, F("map_sfixed32_sfixed32"));
-         iter != reflection->MapEnd(message, F("map_sfixed32_sfixed32"));
-         ++iter) {
-      EXPECT_EQ(map[iter.GetKey().GetInt32Value()],
-                iter.GetValueRef().GetInt32Value());
-    }
-  }
-  {
-    std::map<int32_t, float> map;
-    map[0] = 0.0;
-    map[1] = 1.0;
-    for (MapIterator iter = reflection->MapBegin(message, F("map_int32_float"));
-         iter != reflection->MapEnd(message, F("map_int32_float")); ++iter) {
-      EXPECT_EQ(map[iter.GetKey().GetInt32Value()],
-                iter.GetValueRef().GetFloatValue());
-    }
-  }
-  {
-    std::map<int32_t, double> map;
-    map[0] = 0.0;
-    map[1] = 1.0;
-    for (MapIterator iter =
-             reflection->MapBegin(message, F("map_int32_double"));
-         iter != reflection->MapEnd(message, F("map_int32_double")); ++iter) {
-      EXPECT_EQ(map[iter.GetKey().GetInt32Value()],
-                iter.GetValueRef().GetDoubleValue());
-    }
-  }
-  {
-    std::map<bool, bool> map;
-    map[false] = false;
-    map[true] = true;
-    for (MapIterator iter = reflection->MapBegin(message, F("map_bool_bool"));
-         iter != reflection->MapEnd(message, F("map_bool_bool")); ++iter) {
-      EXPECT_EQ(map[iter.GetKey().GetBoolValue()],
-                iter.GetValueRef().GetBoolValue());
-    }
-  }
-  {
-    std::map<std::string, std::string> map;
-    map["0"] = "0";
-    map["1"] = "1";
-    int size = 0;
-    for (MapIterator iter =
-             reflection->MapBegin(message, F("map_string_string"));
-         iter != reflection->MapEnd(message, F("map_string_string"));
-         ++iter, ++size) {
-      // Check const methods do not invalidate map.
-      message->DebugString();
-      message->ShortDebugString();
-      message->SerializeToString(&serialized);
-      message->SpaceUsedLong();
-      message->ByteSizeLong();
-      EXPECT_EQ(map[iter.GetKey().GetStringValue()],
-                iter.GetValueRef().GetStringValue());
-    }
-    EXPECT_EQ(size, 2);
-  }
-  {
-    std::map<int32_t, std::string> map;
-    map[0] = "0";
-    map[1] = "1";
-    for (MapIterator iter = reflection->MapBegin(message, F("map_int32_bytes"));
-         iter != reflection->MapEnd(message, F("map_int32_bytes")); ++iter) {
-      EXPECT_EQ(map[iter.GetKey().GetInt32Value()],
-                iter.GetValueRef().GetStringValue());
-    }
-  }
-  {
-    std::map<int32_t, const EnumValueDescriptor*> map;
-    map[0] = map_enum_bar_;
-    map[1] = map_enum_baz_;
-    for (MapIterator iter = reflection->MapBegin(message, F("map_int32_enum"));
-         iter != reflection->MapEnd(message, F("map_int32_enum")); ++iter) {
-      EXPECT_EQ(map[iter.GetKey().GetInt32Value()]->number(),
-                iter.GetValueRef().GetEnumValue());
-    }
-  }
-  {
-    std::map<int32_t, int32_t> map;
-    map[0] = 0;
-    map[1] = 1;
-    int size = 0;
-    for (MapIterator iter =
-             reflection->MapBegin(message, F("map_int32_foreign_message"));
-         iter != reflection->MapEnd(message, F("map_int32_foreign_message"));
-         ++iter, ++size) {
-      // Check const methods do not invalidate map.
-      message->DebugString();
-      message->ShortDebugString();
-      message->SerializeToString(&serialized);
-      message->SpaceUsedLong();
-      message->ByteSizeLong();
-      const Message& sub_message = iter.GetValueRef().GetMessageValue();
-      EXPECT_EQ(map[iter.GetKey().GetInt32Value()],
-                sub_message.GetReflection()->GetInt32(sub_message, foreign_c_));
-    }
-    EXPECT_EQ(size, 2);
-  }
-}
-
-void MapReflectionTester::ExpectClearViaReflection(const Message& message) {
-  const Reflection* reflection = message.GetReflection();
-  // Map fields are empty.
-  EXPECT_EQ(0, reflection->FieldSize(message, F("map_int32_int32")));
-  EXPECT_EQ(0, reflection->FieldSize(message, F("map_int64_int64")));
-  EXPECT_EQ(0, reflection->FieldSize(message, F("map_uint32_uint32")));
-  EXPECT_EQ(0, reflection->FieldSize(message, F("map_uint64_uint64")));
-  EXPECT_EQ(0, reflection->FieldSize(message, F("map_sint32_sint32")));
-  EXPECT_EQ(0, reflection->FieldSize(message, F("map_sint64_sint64")));
-  EXPECT_EQ(0, reflection->FieldSize(message, F("map_fixed32_fixed32")));
-  EXPECT_EQ(0, reflection->FieldSize(message, F("map_fixed64_fixed64")));
-  EXPECT_EQ(0, reflection->FieldSize(message, F("map_sfixed32_sfixed32")));
-  EXPECT_EQ(0, reflection->FieldSize(message, F("map_sfixed64_sfixed64")));
-  EXPECT_EQ(0, reflection->FieldSize(message, F("map_int32_float")));
-  EXPECT_EQ(0, reflection->FieldSize(message, F("map_int32_double")));
-  EXPECT_EQ(0, reflection->FieldSize(message, F("map_bool_bool")));
-  EXPECT_EQ(0, reflection->FieldSize(message, F("map_string_string")));
-  EXPECT_EQ(0, reflection->FieldSize(message, F("map_int32_bytes")));
-  EXPECT_EQ(0, reflection->FieldSize(message, F("map_int32_enum")));
-  EXPECT_EQ(0, reflection->FieldSize(message, F("map_int32_foreign_message")));
-  EXPECT_TRUE(reflection->GetMapData(message, F("map_int32_foreign_message"))
-                  ->IsMapValid());
-}
-
-void MapReflectionTester::ExpectClearViaReflectionIterator(Message* message) {
-  const Reflection* reflection = message->GetReflection();
-  EXPECT_TRUE(reflection->MapBegin(message, F("map_int32_int32")) ==
-              reflection->MapEnd(message, F("map_int32_int32")));
-  EXPECT_TRUE(reflection->MapBegin(message, F("map_int64_int64")) ==
-              reflection->MapEnd(message, F("map_int64_int64")));
-  EXPECT_TRUE(reflection->MapBegin(message, F("map_uint32_uint32")) ==
-              reflection->MapEnd(message, F("map_uint32_uint32")));
-  EXPECT_TRUE(reflection->MapBegin(message, F("map_uint64_uint64")) ==
-              reflection->MapEnd(message, F("map_uint64_uint64")));
-  EXPECT_TRUE(reflection->MapBegin(message, F("map_sint32_sint32")) ==
-              reflection->MapEnd(message, F("map_sint32_sint32")));
-  EXPECT_TRUE(reflection->MapBegin(message, F("map_sint64_sint64")) ==
-              reflection->MapEnd(message, F("map_sint64_sint64")));
-  EXPECT_TRUE(reflection->MapBegin(message, F("map_fixed32_fixed32")) ==
-              reflection->MapEnd(message, F("map_fixed32_fixed32")));
-  EXPECT_TRUE(reflection->MapBegin(message, F("map_fixed64_fixed64")) ==
-              reflection->MapEnd(message, F("map_fixed64_fixed64")));
-  EXPECT_TRUE(reflection->MapBegin(message, F("map_sfixed32_sfixed32")) ==
-              reflection->MapEnd(message, F("map_sfixed32_sfixed32")));
-  EXPECT_TRUE(reflection->MapBegin(message, F("map_sfixed64_sfixed64")) ==
-              reflection->MapEnd(message, F("map_sfixed64_sfixed64")));
-  EXPECT_TRUE(reflection->MapBegin(message, F("map_int32_float")) ==
-              reflection->MapEnd(message, F("map_int32_float")));
-  EXPECT_TRUE(reflection->MapBegin(message, F("map_int32_double")) ==
-              reflection->MapEnd(message, F("map_int32_double")));
-  EXPECT_TRUE(reflection->MapBegin(message, F("map_bool_bool")) ==
-              reflection->MapEnd(message, F("map_bool_bool")));
-  EXPECT_TRUE(reflection->MapBegin(message, F("map_string_string")) ==
-              reflection->MapEnd(message, F("map_string_string")));
-  EXPECT_TRUE(reflection->MapBegin(message, F("map_int32_bytes")) ==
-              reflection->MapEnd(message, F("map_int32_bytes")));
-  EXPECT_TRUE(reflection->MapBegin(message, F("map_int32_enum")) ==
-              reflection->MapEnd(message, F("map_int32_enum")));
-  EXPECT_TRUE(reflection->MapBegin(message, F("map_int32_foreign_message")) ==
-              reflection->MapEnd(message, F("map_int32_foreign_message")));
-}
-
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
diff --git a/libs/protobuf/src/google/protobuf/reflection_tester.h b/libs/protobuf/src/google/protobuf/reflection_tester.h
deleted file mode 100644
index 3a2dc81..0000000
--- a/libs/protobuf/src/google/protobuf/reflection_tester.h
+++ /dev/null
@@ -1,122 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef GOOGLE_PROTOBUF_REFLECTION_TESTER_H__
-#define GOOGLE_PROTOBUF_REFLECTION_TESTER_H__
-
-#include <google/protobuf/message.h>
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-
-// Provides APIs to test protocol buffers reflectively.
-class MapReflectionTester {
- public:
-  // base_descriptor must be a descriptor for TestMap, which is used for
-  // MapReflectionTester to fetch the FieldDescriptors needed to use the
-  // reflection interface.
-  explicit MapReflectionTester(const Descriptor* base_descriptor);
-
-  void SetMapFieldsViaReflection(Message* message);
-  void SetMapFieldsViaMapReflection(Message* message);
-  void ClearMapFieldsViaReflection(Message* message);
-  void ModifyMapFieldsViaReflection(Message* message);
-  void RemoveLastMapsViaReflection(Message* message);
-  void ReleaseLastMapsViaReflection(Message* message);
-  void SwapMapsViaReflection(Message* message);
-  void MutableUnknownFieldsOfMapFieldsViaReflection(Message* message);
-  void ExpectMapFieldsSetViaReflection(const Message& message);
-  void ExpectMapFieldsSetViaReflectionIterator(Message* message);
-  void ExpectClearViaReflection(const Message& message);
-  void ExpectClearViaReflectionIterator(Message* message);
-  void GetMapValueViaMapReflection(Message* message,
-                                   const std::string& field_name,
-                                   const MapKey& map_key, MapValueRef* map_val);
-  Message* GetMapEntryViaReflection(Message* message,
-                                    const std::string& field_name, int index);
-  MapIterator MapBegin(Message* message, const std::string& field_name);
-  MapIterator MapEnd(Message* message, const std::string& field_name);
-  int MapSize(const Message& message, const std::string& field_name);
-
- private:
-  const FieldDescriptor* F(const std::string& name);
-
-  const Descriptor* base_descriptor_;
-
-  const EnumValueDescriptor* map_enum_bar_;
-  const EnumValueDescriptor* map_enum_baz_;
-  const EnumValueDescriptor* map_enum_foo_;
-
-  const FieldDescriptor* foreign_c_;
-  const FieldDescriptor* map_int32_int32_key_;
-  const FieldDescriptor* map_int32_int32_val_;
-  const FieldDescriptor* map_int64_int64_key_;
-  const FieldDescriptor* map_int64_int64_val_;
-  const FieldDescriptor* map_uint32_uint32_key_;
-  const FieldDescriptor* map_uint32_uint32_val_;
-  const FieldDescriptor* map_uint64_uint64_key_;
-  const FieldDescriptor* map_uint64_uint64_val_;
-  const FieldDescriptor* map_sint32_sint32_key_;
-  const FieldDescriptor* map_sint32_sint32_val_;
-  const FieldDescriptor* map_sint64_sint64_key_;
-  const FieldDescriptor* map_sint64_sint64_val_;
-  const FieldDescriptor* map_fixed32_fixed32_key_;
-  const FieldDescriptor* map_fixed32_fixed32_val_;
-  const FieldDescriptor* map_fixed64_fixed64_key_;
-  const FieldDescriptor* map_fixed64_fixed64_val_;
-  const FieldDescriptor* map_sfixed32_sfixed32_key_;
-  const FieldDescriptor* map_sfixed32_sfixed32_val_;
-  const FieldDescriptor* map_sfixed64_sfixed64_key_;
-  const FieldDescriptor* map_sfixed64_sfixed64_val_;
-  const FieldDescriptor* map_int32_float_key_;
-  const FieldDescriptor* map_int32_float_val_;
-  const FieldDescriptor* map_int32_double_key_;
-  const FieldDescriptor* map_int32_double_val_;
-  const FieldDescriptor* map_bool_bool_key_;
-  const FieldDescriptor* map_bool_bool_val_;
-  const FieldDescriptor* map_string_string_key_;
-  const FieldDescriptor* map_string_string_val_;
-  const FieldDescriptor* map_int32_bytes_key_;
-  const FieldDescriptor* map_int32_bytes_val_;
-  const FieldDescriptor* map_int32_enum_key_;
-  const FieldDescriptor* map_int32_enum_val_;
-  const FieldDescriptor* map_int32_foreign_message_key_;
-  const FieldDescriptor* map_int32_foreign_message_val_;
-};
-
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
-
-#endif  // GOOGLE_PROTOBUF_REFLECTION_TESTER_H__
diff --git a/libs/protobuf/src/google/protobuf/repeated_field.cc b/libs/protobuf/src/google/protobuf/repeated_field.cc
deleted file mode 100644
index 7264d0a..0000000
--- a/libs/protobuf/src/google/protobuf/repeated_field.cc
+++ /dev/null
@@ -1,71 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-
-#include <google/protobuf/repeated_field.h>
-
-#include <algorithm>
-
-#include <google/protobuf/stubs/logging.h>
-#include <google/protobuf/stubs/common.h>
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-
-
-template class PROTOBUF_EXPORT_TEMPLATE_DEFINE RepeatedField<bool>;
-template class PROTOBUF_EXPORT_TEMPLATE_DEFINE RepeatedField<int32_t>;
-template class PROTOBUF_EXPORT_TEMPLATE_DEFINE RepeatedField<uint32_t>;
-template class PROTOBUF_EXPORT_TEMPLATE_DEFINE RepeatedField<int64_t>;
-template class PROTOBUF_EXPORT_TEMPLATE_DEFINE RepeatedField<uint64_t>;
-template class PROTOBUF_EXPORT_TEMPLATE_DEFINE RepeatedField<float>;
-template class PROTOBUF_EXPORT_TEMPLATE_DEFINE RepeatedField<double>;
-template class PROTOBUF_EXPORT_TEMPLATE_DEFINE RepeatedPtrField<std::string>;
-
-namespace internal {
-template class PROTOBUF_EXPORT_TEMPLATE_DEFINE RepeatedIterator<bool>;
-template class PROTOBUF_EXPORT_TEMPLATE_DEFINE RepeatedIterator<int32_t>;
-template class PROTOBUF_EXPORT_TEMPLATE_DEFINE RepeatedIterator<uint32_t>;
-template class PROTOBUF_EXPORT_TEMPLATE_DEFINE RepeatedIterator<int64_t>;
-template class PROTOBUF_EXPORT_TEMPLATE_DEFINE RepeatedIterator<uint64_t>;
-template class PROTOBUF_EXPORT_TEMPLATE_DEFINE RepeatedIterator<float>;
-template class PROTOBUF_EXPORT_TEMPLATE_DEFINE RepeatedIterator<double>;
-}  // namespace internal
-
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
diff --git a/libs/protobuf/src/google/protobuf/repeated_field.h b/libs/protobuf/src/google/protobuf/repeated_field.h
deleted file mode 100644
index 3fb734e..0000000
--- a/libs/protobuf/src/google/protobuf/repeated_field.h
+++ /dev/null
@@ -1,1219 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-//
-// RepeatedField and RepeatedPtrField are used by generated protocol message
-// classes to manipulate repeated fields.  These classes are very similar to
-// STL's vector, but include a number of optimizations found to be useful
-// specifically in the case of Protocol Buffers.  RepeatedPtrField is
-// particularly different from STL vector as it manages ownership of the
-// pointers that it contains.
-//
-// This header covers RepeatedField.
-
-#ifndef GOOGLE_PROTOBUF_REPEATED_FIELD_H__
-#define GOOGLE_PROTOBUF_REPEATED_FIELD_H__
-
-
-#include <algorithm>
-#include <iterator>
-#include <limits>
-#include <string>
-#include <type_traits>
-#include <utility>
-
-#include <google/protobuf/stubs/logging.h>
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/arena.h>
-#include <google/protobuf/port.h>
-#include <google/protobuf/message_lite.h>
-#include <google/protobuf/repeated_ptr_field.h>
-
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-#ifdef SWIG
-#error "You cannot SWIG proto headers"
-#endif
-
-namespace google {
-namespace protobuf {
-
-class Message;
-
-namespace internal {
-
-template <typename T, int kRepHeaderSize>
-constexpr int RepeatedFieldLowerClampLimit() {
-  // The header is padded to be at least `sizeof(T)` when it would be smaller
-  // otherwise.
-  static_assert(sizeof(T) <= kRepHeaderSize, "");
-  // We want to pad the minimum size to be a power of two bytes, including the
-  // header.
-  // The first allocation is kRepHeaderSize bytes worth of elements for a total
-  // of 2*kRepHeaderSize bytes.
-  // For an 8-byte header, we allocate 8 bool, 2 ints, or 1 int64.
-  return kRepHeaderSize / sizeof(T);
-}
-
-// kRepeatedFieldUpperClampLimit is the lowest signed integer value that
-// overflows when multiplied by 2 (which is undefined behavior). Sizes above
-// this will clamp to the maximum int value instead of following exponential
-// growth when growing a repeated field.
-constexpr int kRepeatedFieldUpperClampLimit =
-    (std::numeric_limits<int>::max() / 2) + 1;
-
-template <typename Iter>
-inline int CalculateReserve(Iter begin, Iter end, std::forward_iterator_tag) {
-  return static_cast<int>(std::distance(begin, end));
-}
-
-template <typename Iter>
-inline int CalculateReserve(Iter /*begin*/, Iter /*end*/,
-                            std::input_iterator_tag /*unused*/) {
-  return -1;
-}
-
-template <typename Iter>
-inline int CalculateReserve(Iter begin, Iter end) {
-  typedef typename std::iterator_traits<Iter>::iterator_category Category;
-  return CalculateReserve(begin, end, Category());
-}
-
-// Swaps two blocks of memory of size sizeof(T).
-template <typename T>
-inline void SwapBlock(char* p, char* q) {
-  T tmp;
-  memcpy(&tmp, p, sizeof(T));
-  memcpy(p, q, sizeof(T));
-  memcpy(q, &tmp, sizeof(T));
-}
-
-// Swaps two blocks of memory of size kSize:
-//  template <int kSize> void memswap(char* p, char* q);
-template <int kSize>
-inline typename std::enable_if<(kSize == 0), void>::type memswap(char*, char*) {
-}
-
-#define PROTO_MEMSWAP_DEF_SIZE(reg_type, max_size)                           \
-  template <int kSize>                                                       \
-  typename std::enable_if<(kSize >= sizeof(reg_type) && kSize < (max_size)), \
-                          void>::type                                        \
-  memswap(char* p, char* q) {                                                \
-    SwapBlock<reg_type>(p, q);                                               \
-    memswap<kSize - sizeof(reg_type)>(p + sizeof(reg_type),                  \
-                                      q + sizeof(reg_type));                 \
-  }
-
-PROTO_MEMSWAP_DEF_SIZE(uint8_t, 2)
-PROTO_MEMSWAP_DEF_SIZE(uint16_t, 4)
-PROTO_MEMSWAP_DEF_SIZE(uint32_t, 8)
-
-#ifdef __SIZEOF_INT128__
-PROTO_MEMSWAP_DEF_SIZE(uint64_t, 16)
-PROTO_MEMSWAP_DEF_SIZE(__uint128_t, (1u << 31))
-#else
-PROTO_MEMSWAP_DEF_SIZE(uint64_t, (1u << 31))
-#endif
-
-#undef PROTO_MEMSWAP_DEF_SIZE
-
-template <typename Element>
-class RepeatedIterator;
-
-}  // namespace internal
-
-// RepeatedField is used to represent repeated fields of a primitive type (in
-// other words, everything except strings and nested Messages).  Most users will
-// not ever use a RepeatedField directly; they will use the get-by-index,
-// set-by-index, and add accessors that are generated for all repeated fields.
-template <typename Element>
-class RepeatedField final {
-  static_assert(
-      alignof(Arena) >= alignof(Element),
-      "We only support types that have an alignment smaller than Arena");
-
- public:
-  constexpr RepeatedField();
-  explicit RepeatedField(Arena* arena);
-
-  RepeatedField(const RepeatedField& other);
-
-  template <typename Iter,
-            typename = typename std::enable_if<std::is_constructible<
-                Element, decltype(*std::declval<Iter>())>::value>::type>
-  RepeatedField(Iter begin, Iter end);
-
-  ~RepeatedField();
-
-  RepeatedField& operator=(const RepeatedField& other);
-
-  RepeatedField(RepeatedField&& other) noexcept;
-  RepeatedField& operator=(RepeatedField&& other) noexcept;
-
-  bool empty() const;
-  int size() const;
-
-  const Element& Get(int index) const;
-  Element* Mutable(int index);
-
-  const Element& operator[](int index) const { return Get(index); }
-  Element& operator[](int index) { return *Mutable(index); }
-
-  const Element& at(int index) const;
-  Element& at(int index);
-
-  void Set(int index, const Element& value);
-  void Add(const Element& value);
-  // Appends a new element and returns a pointer to it.
-  // The new element is uninitialized if |Element| is a POD type.
-  Element* Add();
-  // Appends elements in the range [begin, end) after reserving
-  // the appropriate number of elements.
-  template <typename Iter>
-  void Add(Iter begin, Iter end);
-
-  // Removes the last element in the array.
-  void RemoveLast();
-
-  // Extracts elements with indices in "[start .. start+num-1]".
-  // Copies them into "elements[0 .. num-1]" if "elements" is not nullptr.
-  // Caution: also moves elements with indices [start+num ..].
-  // Calling this routine inside a loop can cause quadratic behavior.
-  void ExtractSubrange(int start, int num, Element* elements);
-
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear();
-  void MergeFrom(const RepeatedField& other);
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void CopyFrom(const RepeatedField& other);
-
-  // Replaces the contents with RepeatedField(begin, end).
-  template <typename Iter>
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Assign(Iter begin, Iter end);
-
-  // Reserves space to expand the field to at least the given size.  If the
-  // array is grown, it will always be at least doubled in size.
-  void Reserve(int new_size);
-
-  // Resizes the RepeatedField to a new, smaller size.  This is O(1).
-  void Truncate(int new_size);
-
-  void AddAlreadyReserved(const Element& value);
-  // Appends a new element and return a pointer to it.
-  // The new element is uninitialized if |Element| is a POD type.
-  // Should be called only if Capacity() > Size().
-  Element* AddAlreadyReserved();
-  Element* AddNAlreadyReserved(int elements);
-  int Capacity() const;
-
-  // Like STL resize.  Uses value to fill appended elements.
-  // Like Truncate() if new_size <= size(), otherwise this is
-  // O(new_size - size()).
-  void Resize(int new_size, const Element& value);
-
-  // Gets the underlying array.  This pointer is possibly invalidated by
-  // any add or remove operation.
-  Element* mutable_data();
-  const Element* data() const;
-
-  // Swaps entire contents with "other". If they are separate arenas then,
-  // copies data between each other.
-  void Swap(RepeatedField* other);
-
-  // Swaps entire contents with "other". Should be called only if the caller can
-  // guarantee that both repeated fields are on the same arena or are on the
-  // heap. Swapping between different arenas is disallowed and caught by a
-  // GOOGLE_DCHECK (see API docs for details).
-  void UnsafeArenaSwap(RepeatedField* other);
-
-  // Swaps two elements.
-  void SwapElements(int index1, int index2);
-
-  // STL-like iterator support
-  typedef internal::RepeatedIterator<Element> iterator;
-  typedef internal::RepeatedIterator<const Element> const_iterator;
-  typedef Element value_type;
-  typedef value_type& reference;
-  typedef const value_type& const_reference;
-  typedef value_type* pointer;
-  typedef const value_type* const_pointer;
-  typedef int size_type;
-  typedef ptrdiff_t difference_type;
-
-  iterator begin();
-  const_iterator begin() const;
-  const_iterator cbegin() const;
-  iterator end();
-  const_iterator end() const;
-  const_iterator cend() const;
-
-  // Reverse iterator support
-  typedef std::reverse_iterator<const_iterator> const_reverse_iterator;
-  typedef std::reverse_iterator<iterator> reverse_iterator;
-  reverse_iterator rbegin() { return reverse_iterator(end()); }
-  const_reverse_iterator rbegin() const {
-    return const_reverse_iterator(end());
-  }
-  reverse_iterator rend() { return reverse_iterator(begin()); }
-  const_reverse_iterator rend() const {
-    return const_reverse_iterator(begin());
-  }
-
-  // Returns the number of bytes used by the repeated field, excluding
-  // sizeof(*this)
-  size_t SpaceUsedExcludingSelfLong() const;
-
-  int SpaceUsedExcludingSelf() const {
-    return internal::ToIntSize(SpaceUsedExcludingSelfLong());
-  }
-
-  // Removes the element referenced by position.
-  //
-  // Returns an iterator to the element immediately following the removed
-  // element.
-  //
-  // Invalidates all iterators at or after the removed element, including end().
-  iterator erase(const_iterator position);
-
-  // Removes the elements in the range [first, last).
-  //
-  // Returns an iterator to the element immediately following the removed range.
-  //
-  // Invalidates all iterators at or after the removed range, including end().
-  iterator erase(const_iterator first, const_iterator last);
-
-  // Gets the Arena on which this RepeatedField stores its elements.
-  inline Arena* GetArena() const {
-    return GetOwningArena();
-  }
-
-  // For internal use only.
-  //
-  // This is public due to it being called by generated code.
-  inline void InternalSwap(RepeatedField* other);
-
- private:
-  template <typename T> friend class Arena::InternalHelper;
-
-  // Gets the Arena on which this RepeatedField stores its elements.
-  inline Arena* GetOwningArena() const {
-    return (total_size_ == 0) ? static_cast<Arena*>(arena_or_elements_)
-                              : rep()->arena;
-  }
-
-  static constexpr int kInitialSize = 0;
-  // A note on the representation here (see also comment below for
-  // RepeatedPtrFieldBase's struct Rep):
-  //
-  // We maintain the same sizeof(RepeatedField) as before we added arena support
-  // so that we do not degrade performance by bloating memory usage. Directly
-  // adding an arena_ element to RepeatedField is quite costly. By using
-  // indirection in this way, we keep the same size when the RepeatedField is
-  // empty (common case), and add only an 8-byte header to the elements array
-  // when non-empty. We make sure to place the size fields directly in the
-  // RepeatedField class to avoid costly cache misses due to the indirection.
-  int current_size_;
-  int total_size_;
-  // Pad the Rep after arena allow for power-of-two byte sizes when
-  // sizeof(Element) > sizeof(Arena*). eg for 16-byte objects.
-  static PROTOBUF_CONSTEXPR const size_t kRepHeaderSize =
-      sizeof(Arena*) < sizeof(Element) ? sizeof(Element) : sizeof(Arena*);
-  struct Rep {
-    Arena* arena;
-    Element* elements() {
-      return reinterpret_cast<Element*>(reinterpret_cast<char*>(this) +
-                                        kRepHeaderSize);
-    }
-  };
-
-  // If total_size_ == 0 this points to an Arena otherwise it points to the
-  // elements member of a Rep struct. Using this invariant allows the storage of
-  // the arena pointer without an extra allocation in the constructor.
-  void* arena_or_elements_;
-
-  // Returns a pointer to elements array.
-  // pre-condition: the array must have been allocated.
-  Element* elements() const {
-    GOOGLE_DCHECK_GT(total_size_, 0);
-    // Because of above pre-condition this cast is safe.
-    return unsafe_elements();
-  }
-
-  // Returns a pointer to elements array if it exists; otherwise either null or
-  // an invalid pointer is returned. This only happens for empty repeated
-  // fields, where you can't dereference this pointer anyway (it's empty).
-  Element* unsafe_elements() const {
-    return static_cast<Element*>(arena_or_elements_);
-  }
-
-  // Returns a pointer to the Rep struct.
-  // pre-condition: the Rep must have been allocated, ie elements() is safe.
-  Rep* rep() const {
-    return reinterpret_cast<Rep*>(reinterpret_cast<char*>(elements()) -
-                                  kRepHeaderSize);
-  }
-
-  friend class Arena;
-  typedef void InternalArenaConstructable_;
-
-  // Moves the contents of |from| into |to|, possibly clobbering |from| in the
-  // process.  For primitive types this is just a memcpy(), but it could be
-  // specialized for non-primitive types to, say, swap each element instead.
-  void MoveArray(Element* to, Element* from, int size);
-
-  // Copies the elements of |from| into |to|.
-  void CopyArray(Element* to, const Element* from, int size);
-
-  // Internal helper to delete all elements and deallocate the storage.
-  void InternalDeallocate(Rep* rep, int size, bool in_destructor) {
-    if (rep != nullptr) {
-      Element* e = &rep->elements()[0];
-      if (!std::is_trivial<Element>::value) {
-        Element* limit = &rep->elements()[size];
-        for (; e < limit; e++) {
-          e->~Element();
-        }
-      }
-      const size_t bytes = size * sizeof(*e) + kRepHeaderSize;
-      if (rep->arena == nullptr) {
-        internal::SizedDelete(rep, bytes);
-      } else if (!in_destructor) {
-        // If we are in the destructor, we might be being destroyed as part of
-        // the arena teardown. We can't try and return blocks to the arena then.
-        rep->arena->ReturnArrayMemory(rep, bytes);
-      }
-    }
-  }
-
-  // This class is a performance wrapper around RepeatedField::Add(const T&)
-  // function. In general unless a RepeatedField is a local stack variable LLVM
-  // has a hard time optimizing Add. The machine code tends to be
-  // loop:
-  // mov %size, dword ptr [%repeated_field]       // load
-  // cmp %size, dword ptr [%repeated_field + 4]
-  // jae fallback
-  // mov %buffer, qword ptr [%repeated_field + 8]
-  // mov dword [%buffer + %size * 4], %value
-  // inc %size                                    // increment
-  // mov dword ptr [%repeated_field], %size       // store
-  // jmp loop
-  //
-  // This puts a load/store in each iteration of the important loop variable
-  // size. It's a pretty bad compile that happens even in simple cases, but
-  // largely the presence of the fallback path disturbs the compilers mem-to-reg
-  // analysis.
-  //
-  // This class takes ownership of a repeated field for the duration of its
-  // lifetime. The repeated field should not be accessed during this time, ie.
-  // only access through this class is allowed. This class should always be a
-  // function local stack variable. Intended use
-  //
-  // void AddSequence(const int* begin, const int* end, RepeatedField<int>* out)
-  // {
-  //   RepeatedFieldAdder<int> adder(out);  // Take ownership of out
-  //   for (auto it = begin; it != end; ++it) {
-  //     adder.Add(*it);
-  //   }
-  // }
-  //
-  // Typically, due to the fact that adder is a local stack variable, the
-  // compiler will be successful in mem-to-reg transformation and the machine
-  // code will be loop: cmp %size, %capacity jae fallback mov dword ptr [%buffer
-  // + %size * 4], %val inc %size jmp loop
-  //
-  // The first version executes at 7 cycles per iteration while the second
-  // version executes at only 1 or 2 cycles.
-  template <int = 0, bool = std::is_trivial<Element>::value>
-  class FastAdderImpl {
-   public:
-    explicit FastAdderImpl(RepeatedField* rf) : repeated_field_(rf) {
-      index_ = repeated_field_->current_size_;
-      capacity_ = repeated_field_->total_size_;
-      buffer_ = repeated_field_->unsafe_elements();
-    }
-    ~FastAdderImpl() { repeated_field_->current_size_ = index_; }
-
-    void Add(Element val) {
-      if (index_ == capacity_) {
-        repeated_field_->current_size_ = index_;
-        repeated_field_->Reserve(index_ + 1);
-        capacity_ = repeated_field_->total_size_;
-        buffer_ = repeated_field_->unsafe_elements();
-      }
-      buffer_[index_++] = val;
-    }
-
-   private:
-    RepeatedField* repeated_field_;
-    int index_;
-    int capacity_;
-    Element* buffer_;
-
-    GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(FastAdderImpl);
-  };
-
-  // FastAdder is a wrapper for adding fields. The specialization above handles
-  // POD types more efficiently than RepeatedField.
-  template <int I>
-  class FastAdderImpl<I, false> {
-   public:
-    explicit FastAdderImpl(RepeatedField* rf) : repeated_field_(rf) {}
-    void Add(const Element& val) { repeated_field_->Add(val); }
-
-   private:
-    RepeatedField* repeated_field_;
-    GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(FastAdderImpl);
-  };
-
-  using FastAdder = FastAdderImpl<>;
-
-  friend class TestRepeatedFieldHelper;
-  friend class ::google::protobuf::internal::ParseContext;
-};
-
-namespace internal {
-
-// This is a helper template to copy an array of elements efficiently when they
-// have a trivial copy constructor, and correctly otherwise. This really
-// shouldn't be necessary, but our compiler doesn't optimize std::copy very
-// effectively.
-template <typename Element,
-          bool HasTrivialCopy = std::is_trivial<Element>::value>
-struct ElementCopier {
-  void operator()(Element* to, const Element* from, int array_size);
-};
-
-}  // namespace internal
-
-// implementation ====================================================
-
-template <typename Element>
-constexpr RepeatedField<Element>::RepeatedField()
-    : current_size_(0), total_size_(0), arena_or_elements_(nullptr) {}
-
-template <typename Element>
-inline RepeatedField<Element>::RepeatedField(Arena* arena)
-    : current_size_(0), total_size_(0), arena_or_elements_(arena) {}
-
-template <typename Element>
-inline RepeatedField<Element>::RepeatedField(const RepeatedField& other)
-    : current_size_(0), total_size_(0), arena_or_elements_(nullptr) {
-  if (other.current_size_ != 0) {
-    Reserve(other.size());
-    AddNAlreadyReserved(other.size());
-    CopyArray(Mutable(0), &other.Get(0), other.size());
-  }
-}
-
-template <typename Element>
-template <typename Iter, typename>
-RepeatedField<Element>::RepeatedField(Iter begin, Iter end)
-    : current_size_(0), total_size_(0), arena_or_elements_(nullptr) {
-  Add(begin, end);
-}
-
-template <typename Element>
-RepeatedField<Element>::~RepeatedField() {
-#ifndef NDEBUG
-  // Try to trigger segfault / asan failure in non-opt builds if arena_
-  // lifetime has ended before the destructor.
-  auto arena = GetOwningArena();
-  if (arena) (void)arena->SpaceAllocated();
-#endif
-  if (total_size_ > 0) {
-    InternalDeallocate(rep(), total_size_, true);
-  }
-}
-
-template <typename Element>
-inline RepeatedField<Element>& RepeatedField<Element>::operator=(
-    const RepeatedField& other) {
-  if (this != &other) CopyFrom(other);
-  return *this;
-}
-
-template <typename Element>
-inline RepeatedField<Element>::RepeatedField(RepeatedField&& other) noexcept
-    : RepeatedField() {
-#ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-  CopyFrom(other);
-#else   // PROTOBUF_FORCE_COPY_IN_MOVE
-  // We don't just call Swap(&other) here because it would perform 3 copies if
-  // other is on an arena. This field can't be on an arena because arena
-  // construction always uses the Arena* accepting constructor.
-  if (other.GetOwningArena()) {
-    CopyFrom(other);
-  } else {
-    InternalSwap(&other);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-}
-
-template <typename Element>
-inline RepeatedField<Element>& RepeatedField<Element>::operator=(
-    RepeatedField&& other) noexcept {
-  // We don't just call Swap(&other) here because it would perform 3 copies if
-  // the two fields are on different arenas.
-  if (this != &other) {
-    if (GetOwningArena() != other.GetOwningArena()
-#ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        || GetOwningArena() == nullptr
-#endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      CopyFrom(other);
-    } else {
-      InternalSwap(&other);
-    }
-  }
-  return *this;
-}
-
-template <typename Element>
-inline bool RepeatedField<Element>::empty() const {
-  return current_size_ == 0;
-}
-
-template <typename Element>
-inline int RepeatedField<Element>::size() const {
-  return current_size_;
-}
-
-template <typename Element>
-inline int RepeatedField<Element>::Capacity() const {
-  return total_size_;
-}
-
-template <typename Element>
-inline void RepeatedField<Element>::AddAlreadyReserved(const Element& value) {
-  GOOGLE_DCHECK_LT(current_size_, total_size_);
-  elements()[current_size_++] = value;
-}
-
-template <typename Element>
-inline Element* RepeatedField<Element>::AddAlreadyReserved() {
-  GOOGLE_DCHECK_LT(current_size_, total_size_);
-  return &elements()[current_size_++];
-}
-
-template <typename Element>
-inline Element* RepeatedField<Element>::AddNAlreadyReserved(int elements) {
-  GOOGLE_DCHECK_GE(total_size_ - current_size_, elements)
-      << total_size_ << ", " << current_size_;
-  // Warning: sometimes people call this when elements == 0 and
-  // total_size_ == 0. In this case the return pointer points to a zero size
-  // array (n == 0). Hence we can just use unsafe_elements(), because the user
-  // cannot dereference the pointer anyway.
-  Element* ret = unsafe_elements() + current_size_;
-  current_size_ += elements;
-  return ret;
-}
-
-template <typename Element>
-inline void RepeatedField<Element>::Resize(int new_size, const Element& value) {
-  GOOGLE_DCHECK_GE(new_size, 0);
-  if (new_size > current_size_) {
-    Reserve(new_size);
-    std::fill(&elements()[current_size_], &elements()[new_size], value);
-  }
-  current_size_ = new_size;
-}
-
-template <typename Element>
-inline const Element& RepeatedField<Element>::Get(int index) const {
-  GOOGLE_DCHECK_GE(index, 0);
-  GOOGLE_DCHECK_LT(index, current_size_);
-  return elements()[index];
-}
-
-template <typename Element>
-inline const Element& RepeatedField<Element>::at(int index) const {
-  GOOGLE_CHECK_GE(index, 0);
-  GOOGLE_CHECK_LT(index, current_size_);
-  return elements()[index];
-}
-
-template <typename Element>
-inline Element& RepeatedField<Element>::at(int index) {
-  GOOGLE_CHECK_GE(index, 0);
-  GOOGLE_CHECK_LT(index, current_size_);
-  return elements()[index];
-}
-
-template <typename Element>
-inline Element* RepeatedField<Element>::Mutable(int index) {
-  GOOGLE_DCHECK_GE(index, 0);
-  GOOGLE_DCHECK_LT(index, current_size_);
-  return &elements()[index];
-}
-
-template <typename Element>
-inline void RepeatedField<Element>::Set(int index, const Element& value) {
-  GOOGLE_DCHECK_GE(index, 0);
-  GOOGLE_DCHECK_LT(index, current_size_);
-  elements()[index] = value;
-}
-
-template <typename Element>
-inline void RepeatedField<Element>::Add(const Element& value) {
-  uint32_t size = current_size_;
-  if (static_cast<int>(size) == total_size_) {
-    // value could reference an element of the array. Reserving new space will
-    // invalidate the reference. So we must make a copy first.
-    auto tmp = value;
-    Reserve(total_size_ + 1);
-    elements()[size] = std::move(tmp);
-  } else {
-    elements()[size] = value;
-  }
-  current_size_ = size + 1;
-}
-
-template <typename Element>
-inline Element* RepeatedField<Element>::Add() {
-  uint32_t size = current_size_;
-  if (static_cast<int>(size) == total_size_) Reserve(total_size_ + 1);
-  auto ptr = &elements()[size];
-  current_size_ = size + 1;
-  return ptr;
-}
-
-template <typename Element>
-template <typename Iter>
-inline void RepeatedField<Element>::Add(Iter begin, Iter end) {
-  int reserve = internal::CalculateReserve(begin, end);
-  if (reserve != -1) {
-    if (reserve == 0) {
-      return;
-    }
-
-    Reserve(reserve + size());
-    // TODO(ckennelly):  The compiler loses track of the buffer freshly
-    // allocated by Reserve() by the time we call elements, so it cannot
-    // guarantee that elements does not alias [begin(), end()).
-    //
-    // If restrict is available, annotating the pointer obtained from elements()
-    // causes this to lower to memcpy instead of memmove.
-    std::copy(begin, end, elements() + size());
-    current_size_ = reserve + size();
-  } else {
-    FastAdder fast_adder(this);
-    for (; begin != end; ++begin) fast_adder.Add(*begin);
-  }
-}
-
-template <typename Element>
-inline void RepeatedField<Element>::RemoveLast() {
-  GOOGLE_DCHECK_GT(current_size_, 0);
-  current_size_--;
-}
-
-template <typename Element>
-void RepeatedField<Element>::ExtractSubrange(int start, int num,
-                                             Element* elements) {
-  GOOGLE_DCHECK_GE(start, 0);
-  GOOGLE_DCHECK_GE(num, 0);
-  GOOGLE_DCHECK_LE(start + num, this->current_size_);
-
-  // Save the values of the removed elements if requested.
-  if (elements != nullptr) {
-    for (int i = 0; i < num; ++i) elements[i] = this->Get(i + start);
-  }
-
-  // Slide remaining elements down to fill the gap.
-  if (num > 0) {
-    for (int i = start + num; i < this->current_size_; ++i)
-      this->Set(i - num, this->Get(i));
-    this->Truncate(this->current_size_ - num);
-  }
-}
-
-template <typename Element>
-inline void RepeatedField<Element>::Clear() {
-  current_size_ = 0;
-}
-
-template <typename Element>
-inline void RepeatedField<Element>::MergeFrom(const RepeatedField& other) {
-  GOOGLE_DCHECK_NE(&other, this);
-  if (other.current_size_ != 0) {
-    int existing_size = size();
-    Reserve(existing_size + other.size());
-    AddNAlreadyReserved(other.size());
-    CopyArray(Mutable(existing_size), &other.Get(0), other.size());
-  }
-}
-
-template <typename Element>
-inline void RepeatedField<Element>::CopyFrom(const RepeatedField& other) {
-  if (&other == this) return;
-  Clear();
-  MergeFrom(other);
-}
-
-template <typename Element>
-template <typename Iter>
-inline void RepeatedField<Element>::Assign(Iter begin, Iter end) {
-  Clear();
-  Add(begin, end);
-}
-
-template <typename Element>
-inline typename RepeatedField<Element>::iterator RepeatedField<Element>::erase(
-    const_iterator position) {
-  return erase(position, position + 1);
-}
-
-template <typename Element>
-inline typename RepeatedField<Element>::iterator RepeatedField<Element>::erase(
-    const_iterator first, const_iterator last) {
-  size_type first_offset = first - cbegin();
-  if (first != last) {
-    Truncate(std::copy(last, cend(), begin() + first_offset) - cbegin());
-  }
-  return begin() + first_offset;
-}
-
-template <typename Element>
-inline Element* RepeatedField<Element>::mutable_data() {
-  return unsafe_elements();
-}
-
-template <typename Element>
-inline const Element* RepeatedField<Element>::data() const {
-  return unsafe_elements();
-}
-
-template <typename Element>
-inline void RepeatedField<Element>::InternalSwap(RepeatedField* other) {
-  GOOGLE_DCHECK(this != other);
-
-  // Swap all fields at once.
-  static_assert(std::is_standard_layout<RepeatedField<Element>>::value,
-                "offsetof() requires standard layout before c++17");
-  internal::memswap<offsetof(RepeatedField, arena_or_elements_) +
-                    sizeof(this->arena_or_elements_) -
-                    offsetof(RepeatedField, current_size_)>(
-      reinterpret_cast<char*>(this) + offsetof(RepeatedField, current_size_),
-      reinterpret_cast<char*>(other) + offsetof(RepeatedField, current_size_));
-}
-
-template <typename Element>
-void RepeatedField<Element>::Swap(RepeatedField* other) {
-  if (this == other) return;
-#ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-  if (GetOwningArena() != nullptr &&
-      GetOwningArena() == other->GetOwningArena()) {
-#else   // PROTOBUF_FORCE_COPY_IN_SWAP
-  if (GetOwningArena() == other->GetOwningArena()) {
-#endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-    InternalSwap(other);
-  } else {
-    RepeatedField<Element> temp(other->GetOwningArena());
-    temp.MergeFrom(*this);
-    CopyFrom(*other);
-    other->UnsafeArenaSwap(&temp);
-  }
-}
-
-template <typename Element>
-void RepeatedField<Element>::UnsafeArenaSwap(RepeatedField* other) {
-  if (this == other) return;
-  GOOGLE_DCHECK_EQ(GetOwningArena(), other->GetOwningArena());
-  InternalSwap(other);
-}
-
-template <typename Element>
-void RepeatedField<Element>::SwapElements(int index1, int index2) {
-  using std::swap;  // enable ADL with fallback
-  swap(elements()[index1], elements()[index2]);
-}
-
-template <typename Element>
-inline typename RepeatedField<Element>::iterator
-RepeatedField<Element>::begin() {
-  return iterator(unsafe_elements());
-}
-template <typename Element>
-inline typename RepeatedField<Element>::const_iterator
-RepeatedField<Element>::begin() const {
-  return const_iterator(unsafe_elements());
-}
-template <typename Element>
-inline typename RepeatedField<Element>::const_iterator
-RepeatedField<Element>::cbegin() const {
-  return const_iterator(unsafe_elements());
-}
-template <typename Element>
-inline typename RepeatedField<Element>::iterator RepeatedField<Element>::end() {
-  return iterator(unsafe_elements() + current_size_);
-}
-template <typename Element>
-inline typename RepeatedField<Element>::const_iterator
-RepeatedField<Element>::end() const {
-  return const_iterator(unsafe_elements() + current_size_);
-}
-template <typename Element>
-inline typename RepeatedField<Element>::const_iterator
-RepeatedField<Element>::cend() const {
-  return const_iterator(unsafe_elements() + current_size_);
-}
-
-template <typename Element>
-inline size_t RepeatedField<Element>::SpaceUsedExcludingSelfLong() const {
-  return total_size_ > 0 ? (total_size_ * sizeof(Element) + kRepHeaderSize) : 0;
-}
-
-namespace internal {
-// Returns the new size for a reserved field based on its 'total_size' and the
-// requested 'new_size'. The result is clamped to the closed interval:
-//   [internal::kMinRepeatedFieldAllocationSize,
-//    std::numeric_limits<int>::max()]
-// Requires:
-//     new_size > total_size &&
-//     (total_size == 0 ||
-//      total_size >= kRepeatedFieldLowerClampLimit)
-template <typename T, int kRepHeaderSize>
-inline int CalculateReserveSize(int total_size, int new_size) {
-  constexpr int lower_limit = RepeatedFieldLowerClampLimit<T, kRepHeaderSize>();
-  if (new_size < lower_limit) {
-    // Clamp to smallest allowed size.
-    return lower_limit;
-  }
-  constexpr int kMaxSizeBeforeClamp =
-      (std::numeric_limits<int>::max() - kRepHeaderSize) / 2;
-  if (PROTOBUF_PREDICT_FALSE(total_size > kMaxSizeBeforeClamp)) {
-    return std::numeric_limits<int>::max();
-  }
-  // We want to double the number of bytes, not the number of elements, to try
-  // to stay within power-of-two allocations.
-  // The allocation has kRepHeaderSize + sizeof(T) * capacity.
-  int doubled_size = 2 * total_size + kRepHeaderSize / sizeof(T);
-  return std::max(doubled_size, new_size);
-}
-}  // namespace internal
-
-// Avoid inlining of Reserve(): new, copy, and delete[] lead to a significant
-// amount of code bloat.
-template <typename Element>
-void RepeatedField<Element>::Reserve(int new_size) {
-  if (total_size_ >= new_size) return;
-  Rep* old_rep = total_size_ > 0 ? rep() : nullptr;
-  Rep* new_rep;
-  Arena* arena = GetOwningArena();
-
-  new_size = internal::CalculateReserveSize<Element, kRepHeaderSize>(
-      total_size_, new_size);
-
-  GOOGLE_DCHECK_LE(
-      static_cast<size_t>(new_size),
-      (std::numeric_limits<size_t>::max() - kRepHeaderSize) / sizeof(Element))
-      << "Requested size is too large to fit into size_t.";
-  size_t bytes =
-      kRepHeaderSize + sizeof(Element) * static_cast<size_t>(new_size);
-  if (arena == nullptr) {
-    new_rep = static_cast<Rep*>(::operator new(bytes));
-  } else {
-    new_rep = reinterpret_cast<Rep*>(Arena::CreateArray<char>(arena, bytes));
-  }
-  new_rep->arena = arena;
-  int old_total_size = total_size_;
-  // Already known: new_size >= internal::kMinRepeatedFieldAllocationSize
-  // Maintain invariant:
-  //     total_size_ == 0 ||
-  //     total_size_ >= internal::kMinRepeatedFieldAllocationSize
-  total_size_ = new_size;
-  arena_or_elements_ = new_rep->elements();
-  // Invoke placement-new on newly allocated elements. We shouldn't have to do
-  // this, since Element is supposed to be POD, but a previous version of this
-  // code allocated storage with "new Element[size]" and some code uses
-  // RepeatedField with non-POD types, relying on constructor invocation. If
-  // Element has a trivial constructor (e.g., int32_t), gcc (tested with -O2)
-  // completely removes this loop because the loop body is empty, so this has no
-  // effect unless its side-effects are required for correctness.
-  // Note that we do this before MoveArray() below because Element's copy
-  // assignment implementation will want an initialized instance first.
-  Element* e = &elements()[0];
-  Element* limit = e + total_size_;
-  for (; e < limit; e++) {
-    new (e) Element;
-  }
-  if (current_size_ > 0) {
-    MoveArray(&elements()[0], old_rep->elements(), current_size_);
-  }
-
-  // Likewise, we need to invoke destructors on the old array.
-  InternalDeallocate(old_rep, old_total_size, false);
-
-}
-
-template <typename Element>
-inline void RepeatedField<Element>::Truncate(int new_size) {
-  GOOGLE_DCHECK_LE(new_size, current_size_);
-  if (current_size_ > 0) {
-    current_size_ = new_size;
-  }
-}
-
-template <typename Element>
-inline void RepeatedField<Element>::MoveArray(Element* to, Element* from,
-                                              int array_size) {
-  CopyArray(to, from, array_size);
-}
-
-template <typename Element>
-inline void RepeatedField<Element>::CopyArray(Element* to, const Element* from,
-                                              int array_size) {
-  internal::ElementCopier<Element>()(to, from, array_size);
-}
-
-namespace internal {
-
-template <typename Element, bool HasTrivialCopy>
-void ElementCopier<Element, HasTrivialCopy>::operator()(Element* to,
-                                                        const Element* from,
-                                                        int array_size) {
-  std::copy(from, from + array_size, to);
-}
-
-template <typename Element>
-struct ElementCopier<Element, true> {
-  void operator()(Element* to, const Element* from, int array_size) {
-    memcpy(to, from, static_cast<size_t>(array_size) * sizeof(Element));
-  }
-};
-
-}  // namespace internal
-
-
-// -------------------------------------------------------------------
-
-// Iterators and helper functions that follow the spirit of the STL
-// std::back_insert_iterator and std::back_inserter but are tailor-made
-// for RepeatedField and RepeatedPtrField. Typical usage would be:
-//
-//   std::copy(some_sequence.begin(), some_sequence.end(),
-//             RepeatedFieldBackInserter(proto.mutable_sequence()));
-//
-// Ported by johannes from util/gtl/proto-array-iterators.h
-
-namespace internal {
-
-// STL-like iterator implementation for RepeatedField.  You should not
-// refer to this class directly; use RepeatedField<T>::iterator instead.
-//
-// Note: All of the iterator operators *must* be inlined to avoid performance
-// regressions.  This is caused by the extern template declarations below (which
-// are required because of the RepeatedField extern template declarations).  If
-// any of these functions aren't explicitly inlined (e.g. defined in the class),
-// the compiler isn't allowed to inline them.
-template <typename Element>
-class RepeatedIterator {
- public:
-  using iterator_category = std::random_access_iterator_tag;
-  // Note: remove_const is necessary for std::partial_sum, which uses value_type
-  // to determine the summation variable type.
-  using value_type = typename std::remove_const<Element>::type;
-  using difference_type = std::ptrdiff_t;
-  using pointer = Element*;
-  using reference = Element&;
-
-  constexpr RepeatedIterator() noexcept : it_(nullptr) {}
-
-  // Allows "upcasting" from RepeatedIterator<T**> to
-  // RepeatedIterator<const T*const*>.
-  template <typename OtherElement,
-            typename std::enable_if<std::is_convertible<
-                OtherElement*, pointer>::value>::type* = nullptr>
-  constexpr RepeatedIterator(
-      const RepeatedIterator<OtherElement>& other) noexcept
-      : it_(other.it_) {}
-
-  // dereferenceable
-  constexpr reference operator*() const noexcept { return *it_; }
-  constexpr pointer operator->() const noexcept { return it_; }
-
- private:
-  // Helper alias to hide the internal type.
-  using iterator = RepeatedIterator<Element>;
-
- public:
-  // {inc,dec}rementable
-  iterator& operator++() noexcept {
-    ++it_;
-    return *this;
-  }
-  iterator operator++(int) noexcept { return iterator(it_++); }
-  iterator& operator--() noexcept {
-    --it_;
-    return *this;
-  }
-  iterator operator--(int) noexcept { return iterator(it_--); }
-
-  // equality_comparable
-  friend constexpr bool operator==(const iterator& x,
-                                   const iterator& y) noexcept {
-    return x.it_ == y.it_;
-  }
-  friend constexpr bool operator!=(const iterator& x,
-                                   const iterator& y) noexcept {
-    return x.it_ != y.it_;
-  }
-
-  // less_than_comparable
-  friend constexpr bool operator<(const iterator& x,
-                                  const iterator& y) noexcept {
-    return x.it_ < y.it_;
-  }
-  friend constexpr bool operator<=(const iterator& x,
-                                   const iterator& y) noexcept {
-    return x.it_ <= y.it_;
-  }
-  friend constexpr bool operator>(const iterator& x,
-                                  const iterator& y) noexcept {
-    return x.it_ > y.it_;
-  }
-  friend constexpr bool operator>=(const iterator& x,
-                                   const iterator& y) noexcept {
-    return x.it_ >= y.it_;
-  }
-
-  // addable, subtractable
-  iterator& operator+=(difference_type d) noexcept {
-    it_ += d;
-    return *this;
-  }
-  constexpr iterator operator+(difference_type d) const noexcept {
-    return iterator(it_ + d);
-  }
-  friend constexpr iterator operator+(const difference_type d,
-                                      iterator it) noexcept {
-    return it + d;
-  }
-
-  iterator& operator-=(difference_type d) noexcept {
-    it_ -= d;
-    return *this;
-  }
-  iterator constexpr operator-(difference_type d) const noexcept {
-    return iterator(it_ - d);
-  }
-
-  // indexable
-  constexpr reference operator[](difference_type d) const noexcept {
-    return it_[d];
-  }
-
-  // random access iterator
-  friend constexpr difference_type operator-(iterator it1,
-                                             iterator it2) noexcept {
-    return it1.it_ - it2.it_;
-  }
-
- private:
-  template <typename OtherElement>
-  friend class RepeatedIterator;
-
-  // Allow construction from RepeatedField.
-  friend class RepeatedField<value_type>;
-  explicit RepeatedIterator(Element* it) noexcept : it_(it) {}
-
-  // The internal iterator.
-  Element* it_;
-};
-
-// A back inserter for RepeatedField objects.
-template <typename T>
-class RepeatedFieldBackInsertIterator {
- public:
-  using iterator_category = std::output_iterator_tag;
-  using value_type = T;
-  using pointer = void;
-  using reference = void;
-  using difference_type = std::ptrdiff_t;
-
-  explicit RepeatedFieldBackInsertIterator(
-      RepeatedField<T>* const mutable_field)
-      : field_(mutable_field) {}
-  RepeatedFieldBackInsertIterator<T>& operator=(const T& value) {
-    field_->Add(value);
-    return *this;
-  }
-  RepeatedFieldBackInsertIterator<T>& operator*() { return *this; }
-  RepeatedFieldBackInsertIterator<T>& operator++() { return *this; }
-  RepeatedFieldBackInsertIterator<T>& operator++(int /* unused */) {
-    return *this;
-  }
-
- private:
-  RepeatedField<T>* field_;
-};
-
-}  // namespace internal
-
-// Provides a back insert iterator for RepeatedField instances,
-// similar to std::back_inserter().
-template <typename T>
-internal::RepeatedFieldBackInsertIterator<T> RepeatedFieldBackInserter(
-    RepeatedField<T>* const mutable_field) {
-  return internal::RepeatedFieldBackInsertIterator<T>(mutable_field);
-}
-
-// Extern declarations of common instantiations to reduce library bloat.
-extern template class PROTOBUF_EXPORT_TEMPLATE_DECLARE RepeatedField<bool>;
-extern template class PROTOBUF_EXPORT_TEMPLATE_DECLARE RepeatedField<int32_t>;
-extern template class PROTOBUF_EXPORT_TEMPLATE_DECLARE RepeatedField<uint32_t>;
-extern template class PROTOBUF_EXPORT_TEMPLATE_DECLARE RepeatedField<int64_t>;
-extern template class PROTOBUF_EXPORT_TEMPLATE_DECLARE RepeatedField<uint64_t>;
-extern template class PROTOBUF_EXPORT_TEMPLATE_DECLARE RepeatedField<float>;
-extern template class PROTOBUF_EXPORT_TEMPLATE_DECLARE RepeatedField<double>;
-
-namespace internal {
-extern template class PROTOBUF_EXPORT_TEMPLATE_DECLARE RepeatedIterator<bool>;
-extern template class PROTOBUF_EXPORT_TEMPLATE_DECLARE
-    RepeatedIterator<int32_t>;
-extern template class PROTOBUF_EXPORT_TEMPLATE_DECLARE
-    RepeatedIterator<uint32_t>;
-extern template class PROTOBUF_EXPORT_TEMPLATE_DECLARE
-    RepeatedIterator<int64_t>;
-extern template class PROTOBUF_EXPORT_TEMPLATE_DECLARE
-    RepeatedIterator<uint64_t>;
-extern template class PROTOBUF_EXPORT_TEMPLATE_DECLARE RepeatedIterator<float>;
-extern template class PROTOBUF_EXPORT_TEMPLATE_DECLARE RepeatedIterator<double>;
-}  // namespace internal
-
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
-
-#endif  // GOOGLE_PROTOBUF_REPEATED_FIELD_H__
diff --git a/libs/protobuf/src/google/protobuf/repeated_field_reflection_unittest.cc b/libs/protobuf/src/google/protobuf/repeated_field_reflection_unittest.cc
deleted file mode 100644
index 25e8200..0000000
--- a/libs/protobuf/src/google/protobuf/repeated_field_reflection_unittest.cc
+++ /dev/null
@@ -1,709 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: tgs@google.com (Tom Szymanski)
-//
-// Test reflection methods for aggregate access to Repeated[Ptr]Fields.
-// This test proto2 methods on a proto2 layout.
-
-#include <google/protobuf/stubs/casts.h>
-#include <google/protobuf/unittest.pb.h>
-#include <google/protobuf/dynamic_message.h>
-#include <google/protobuf/reflection.h>
-#include <gtest/gtest.h>
-#include <google/protobuf/test_util.h>
-
-namespace google {
-namespace protobuf {
-
-using unittest::ForeignMessage;
-using unittest::TestAllExtensions;
-using unittest::TestAllTypes;
-
-namespace {
-
-static int Func(int i, int j) { return i * j; }
-
-static std::string StrFunc(int i, int j) { return StrCat(Func(i, 4)); }
-
-TEST(RepeatedFieldReflectionTest, RegularFields) {
-  TestAllTypes message;
-  const Reflection* refl = message.GetReflection();
-  const Descriptor* desc = message.GetDescriptor();
-
-  for (int i = 0; i < 10; ++i) {
-    message.add_repeated_int32(Func(i, 1));
-    message.add_repeated_double(Func(i, 2));
-    message.add_repeated_string(StrFunc(i, 5));
-    message.add_repeated_foreign_message()->set_c(Func(i, 6));
-  }
-
-  // Get FieldDescriptors for all the fields of interest.
-  const FieldDescriptor* fd_repeated_int32 =
-      desc->FindFieldByName("repeated_int32");
-  const FieldDescriptor* fd_repeated_double =
-      desc->FindFieldByName("repeated_double");
-  const FieldDescriptor* fd_repeated_string =
-      desc->FindFieldByName("repeated_string");
-  const FieldDescriptor* fd_repeated_foreign_message =
-      desc->FindFieldByName("repeated_foreign_message");
-
-  // Get RepeatedField objects for all fields of interest.
-  const RepeatedField<int32_t>& rf_int32 =
-      refl->GetRepeatedField<int32_t>(message, fd_repeated_int32);
-  const RepeatedField<double>& rf_double =
-      refl->GetRepeatedField<double>(message, fd_repeated_double);
-
-  // Get mutable RepeatedField objects for all fields of interest.
-  RepeatedField<int32_t>* mrf_int32 =
-      refl->MutableRepeatedField<int32_t>(&message, fd_repeated_int32);
-  RepeatedField<double>* mrf_double =
-      refl->MutableRepeatedField<double>(&message, fd_repeated_double);
-
-  // Get RepeatedPtrField objects for all fields of interest.
-  const RepeatedPtrField<std::string>& rpf_string =
-      refl->GetRepeatedPtrField<std::string>(message, fd_repeated_string);
-  const RepeatedPtrField<ForeignMessage>& rpf_foreign_message =
-      refl->GetRepeatedPtrField<ForeignMessage>(message,
-                                                fd_repeated_foreign_message);
-  const RepeatedPtrField<Message>& rpf_message =
-      refl->GetRepeatedPtrField<Message>(message, fd_repeated_foreign_message);
-
-  // Get mutable RepeatedPtrField objects for all fields of interest.
-  RepeatedPtrField<std::string>* mrpf_string =
-      refl->MutableRepeatedPtrField<std::string>(&message, fd_repeated_string);
-  RepeatedPtrField<ForeignMessage>* mrpf_foreign_message =
-      refl->MutableRepeatedPtrField<ForeignMessage>(
-          &message, fd_repeated_foreign_message);
-  RepeatedPtrField<Message>* mrpf_message =
-      refl->MutableRepeatedPtrField<Message>(&message,
-                                             fd_repeated_foreign_message);
-
-  // Make sure we can do gets and sets through the Repeated[Ptr]Field objects.
-  for (int i = 0; i < 10; ++i) {
-    // Check gets through const objects.
-    EXPECT_EQ(rf_int32.Get(i), Func(i, 1));
-    EXPECT_EQ(rf_double.Get(i), Func(i, 2));
-    EXPECT_EQ(rpf_string.Get(i), StrFunc(i, 5));
-    EXPECT_EQ(rpf_foreign_message.Get(i).c(), Func(i, 6));
-    EXPECT_EQ(down_cast<const ForeignMessage*>(&rpf_message.Get(i))->c(),
-              Func(i, 6));
-
-    // Check gets through mutable objects.
-    EXPECT_EQ(mrf_int32->Get(i), Func(i, 1));
-    EXPECT_EQ(mrf_double->Get(i), Func(i, 2));
-    EXPECT_EQ(mrpf_string->Get(i), StrFunc(i, 5));
-    EXPECT_EQ(mrpf_foreign_message->Get(i).c(), Func(i, 6));
-    EXPECT_EQ(down_cast<const ForeignMessage*>(&mrpf_message->Get(i))->c(),
-              Func(i, 6));
-
-    // Check sets through mutable objects.
-    mrf_int32->Set(i, Func(i, -1));
-    mrf_double->Set(i, Func(i, -2));
-    mrpf_string->Mutable(i)->assign(StrFunc(i, -5));
-    mrpf_foreign_message->Mutable(i)->set_c(Func(i, -6));
-    EXPECT_EQ(message.repeated_int32(i), Func(i, -1));
-    EXPECT_EQ(message.repeated_double(i), Func(i, -2));
-    EXPECT_EQ(message.repeated_string(i), StrFunc(i, -5));
-    EXPECT_EQ(message.repeated_foreign_message(i).c(), Func(i, -6));
-    down_cast<ForeignMessage*>(mrpf_message->Mutable(i))->set_c(Func(i, 7));
-    EXPECT_EQ(message.repeated_foreign_message(i).c(), Func(i, 7));
-  }
-
-#ifdef PROTOBUF_HAS_DEATH_TEST
-  // Make sure types are checked correctly at runtime.
-  const FieldDescriptor* fd_optional_int32 =
-      desc->FindFieldByName("optional_int32");
-  EXPECT_DEATH(refl->GetRepeatedField<int32_t>(message, fd_optional_int32),
-               "requires a repeated field");
-  EXPECT_DEATH(refl->GetRepeatedField<double>(message, fd_repeated_int32),
-               "not the right type");
-  EXPECT_DEATH(refl->GetRepeatedPtrField<TestAllTypes>(
-                   message, fd_repeated_foreign_message),
-               "wrong submessage type");
-#endif  // PROTOBUF_HAS_DEATH_TEST
-}
-
-
-TEST(RepeatedFieldReflectionTest, ExtensionFields) {
-  TestAllExtensions extended_message;
-  const Reflection* refl = extended_message.GetReflection();
-  const Descriptor* desc = extended_message.GetDescriptor();
-
-  for (int i = 0; i < 10; ++i) {
-    extended_message.AddExtension(unittest::repeated_int64_extension,
-                                  Func(i, 1));
-  }
-
-  const FieldDescriptor* fd_repeated_int64_extension =
-      desc->file()->FindExtensionByName("repeated_int64_extension");
-  GOOGLE_CHECK(fd_repeated_int64_extension != nullptr);
-
-  const RepeatedField<int64_t>& rf_int64_extension =
-      refl->GetRepeatedField<int64_t>(extended_message,
-                                      fd_repeated_int64_extension);
-
-  RepeatedField<int64_t>* mrf_int64_extension =
-      refl->MutableRepeatedField<int64_t>(&extended_message,
-                                          fd_repeated_int64_extension);
-
-  for (int i = 0; i < 10; ++i) {
-    EXPECT_EQ(Func(i, 1), rf_int64_extension.Get(i));
-    mrf_int64_extension->Set(i, Func(i, -1));
-    EXPECT_EQ(Func(i, -1), extended_message.GetExtension(
-                               unittest::repeated_int64_extension, i));
-  }
-}
-
-template <typename Ref, typename MessageType, typename ValueType>
-void TestRepeatedFieldRefIteratorForPrimitive(
-    const Ref& handle, const MessageType& message,
-    ValueType (MessageType::*GetFunc)(int) const) {
-  int index = 0;
-  for (typename Ref::const_iterator it = handle.begin(); it != handle.end();
-       ++it) {
-    EXPECT_EQ((message.*GetFunc)(index), *it);
-    ++index;
-  }
-  EXPECT_EQ(handle.size(), index);
-}
-
-template <typename MessageType, typename ValueType>
-void TestRepeatedFieldRefIteratorForString(
-    const RepeatedFieldRef<std::string>& handle, const MessageType& message,
-    ValueType (MessageType::*GetFunc)(int) const) {
-  int index = 0;
-  for (typename RepeatedFieldRef<std::string>::const_iterator it =
-           handle.begin();
-       it != handle.end(); ++it) {
-    // Test both operator* and operator->
-    EXPECT_EQ((message.*GetFunc)(index), *it);
-    EXPECT_EQ((message.*GetFunc)(index).size(), it->size());
-    ++index;
-  }
-  EXPECT_EQ(handle.size(), index);
-}
-
-TEST(RepeatedFieldReflectionTest, RepeatedFieldRefForRegularFields) {
-  TestAllTypes message;
-  const Reflection* refl = message.GetReflection();
-  const Descriptor* desc = message.GetDescriptor();
-
-  for (int i = 0; i < 10; ++i) {
-    message.add_repeated_int32(Func(i, 1));
-    message.add_repeated_double(Func(i, 2));
-    message.add_repeated_string(StrFunc(i, 5));
-    message.add_repeated_foreign_message()->set_c(Func(i, 6));
-  }
-
-  // Get FieldDescriptors for all the fields of interest.
-  const FieldDescriptor* fd_repeated_int32 =
-      desc->FindFieldByName("repeated_int32");
-  const FieldDescriptor* fd_repeated_double =
-      desc->FindFieldByName("repeated_double");
-  const FieldDescriptor* fd_repeated_string =
-      desc->FindFieldByName("repeated_string");
-  const FieldDescriptor* fd_repeated_foreign_message =
-      desc->FindFieldByName("repeated_foreign_message");
-
-  // Get RepeatedFieldRef objects for all fields of interest.
-  const RepeatedFieldRef<int32_t> rf_int32 =
-      refl->GetRepeatedFieldRef<int32_t>(message, fd_repeated_int32);
-  const RepeatedFieldRef<double> rf_double =
-      refl->GetRepeatedFieldRef<double>(message, fd_repeated_double);
-  const RepeatedFieldRef<std::string> rf_string =
-      refl->GetRepeatedFieldRef<std::string>(message, fd_repeated_string);
-  const RepeatedFieldRef<ForeignMessage> rf_foreign_message =
-      refl->GetRepeatedFieldRef<ForeignMessage>(message,
-                                                fd_repeated_foreign_message);
-  const RepeatedFieldRef<Message> rf_message =
-      refl->GetRepeatedFieldRef<Message>(message, fd_repeated_foreign_message);
-
-  // Get MutableRepeatedFieldRef objects for all fields of interest.
-  const MutableRepeatedFieldRef<int32_t> mrf_int32 =
-      refl->GetMutableRepeatedFieldRef<int32_t>(&message, fd_repeated_int32);
-  const MutableRepeatedFieldRef<double> mrf_double =
-      refl->GetMutableRepeatedFieldRef<double>(&message, fd_repeated_double);
-  const MutableRepeatedFieldRef<std::string> mrf_string =
-      refl->GetMutableRepeatedFieldRef<std::string>(&message,
-                                                    fd_repeated_string);
-  const MutableRepeatedFieldRef<ForeignMessage> mrf_foreign_message =
-      refl->GetMutableRepeatedFieldRef<ForeignMessage>(
-          &message, fd_repeated_foreign_message);
-  const MutableRepeatedFieldRef<Message> mrf_message =
-      refl->GetMutableRepeatedFieldRef<Message>(&message,
-                                                fd_repeated_foreign_message);
-
-  EXPECT_EQ(message.repeated_int32_size(), rf_int32.size());
-  EXPECT_EQ(message.repeated_int32_size(), mrf_int32.size());
-  EXPECT_EQ(message.repeated_double_size(), rf_double.size());
-  EXPECT_EQ(message.repeated_double_size(), mrf_double.size());
-  EXPECT_EQ(message.repeated_string_size(), rf_string.size());
-  EXPECT_EQ(message.repeated_string_size(), mrf_string.size());
-  EXPECT_EQ(message.repeated_foreign_message_size(), rf_foreign_message.size());
-  EXPECT_EQ(message.repeated_foreign_message_size(),
-            mrf_foreign_message.size());
-  EXPECT_EQ(message.repeated_foreign_message_size(), rf_message.size());
-  EXPECT_EQ(message.repeated_foreign_message_size(), mrf_message.size());
-
-  EXPECT_FALSE(rf_int32.empty());
-  EXPECT_FALSE(mrf_int32.empty());
-  EXPECT_FALSE(rf_double.empty());
-  EXPECT_FALSE(mrf_double.empty());
-  EXPECT_FALSE(rf_string.empty());
-  EXPECT_FALSE(mrf_string.empty());
-  EXPECT_FALSE(rf_foreign_message.empty());
-  EXPECT_FALSE(mrf_foreign_message.empty());
-  EXPECT_FALSE(rf_message.empty());
-  EXPECT_FALSE(mrf_message.empty());
-
-  // Make sure we can do gets and sets through the RepeatedFieldRef objects.
-  for (int i = 0; i < 10; ++i) {
-    // Check gets through const objects.
-    EXPECT_EQ(rf_int32.Get(i), Func(i, 1));
-    EXPECT_EQ(rf_double.Get(i), Func(i, 2));
-    EXPECT_EQ(rf_string.Get(i), StrFunc(i, 5));
-    ForeignMessage scratch_space;
-    EXPECT_EQ(rf_foreign_message.Get(i, &scratch_space).c(), Func(i, 6));
-    EXPECT_EQ(
-        down_cast<const ForeignMessage&>(rf_message.Get(i, &scratch_space)).c(),
-        Func(i, 6));
-
-    // Check gets through mutable objects.
-    EXPECT_EQ(mrf_int32.Get(i), Func(i, 1));
-    EXPECT_EQ(mrf_double.Get(i), Func(i, 2));
-    EXPECT_EQ(mrf_string.Get(i), StrFunc(i, 5));
-    EXPECT_EQ(mrf_foreign_message.Get(i, &scratch_space).c(), Func(i, 6));
-    EXPECT_EQ(
-        down_cast<const ForeignMessage&>(mrf_message.Get(i, &scratch_space))
-            .c(),
-        Func(i, 6));
-
-    // Check sets through mutable objects.
-    mrf_int32.Set(i, Func(i, -1));
-    mrf_double.Set(i, Func(i, -2));
-    mrf_string.Set(i, StrFunc(i, -5));
-    ForeignMessage foreign_message;
-    foreign_message.set_c(Func(i, -6));
-    mrf_foreign_message.Set(i, foreign_message);
-    EXPECT_EQ(message.repeated_int32(i), Func(i, -1));
-    EXPECT_EQ(message.repeated_double(i), Func(i, -2));
-    EXPECT_EQ(message.repeated_string(i), StrFunc(i, -5));
-    EXPECT_EQ(message.repeated_foreign_message(i).c(), Func(i, -6));
-    foreign_message.set_c(Func(i, 7));
-    mrf_message.Set(i, foreign_message);
-    EXPECT_EQ(message.repeated_foreign_message(i).c(), Func(i, 7));
-  }
-
-  // Test iterators.
-  TestRepeatedFieldRefIteratorForPrimitive(rf_int32, message,
-                                           &TestAllTypes::repeated_int32);
-  TestRepeatedFieldRefIteratorForPrimitive(rf_double, message,
-                                           &TestAllTypes::repeated_double);
-  TestRepeatedFieldRefIteratorForString(rf_string, message,
-                                        &TestAllTypes::repeated_string);
-
-  // Test iterators for message fields.
-  typedef RepeatedFieldRef<ForeignMessage>::iterator MessageIterator;
-  int index = 0;
-  for (MessageIterator it = rf_foreign_message.begin();
-       it != rf_foreign_message.end(); ++it) {
-    EXPECT_EQ(message.repeated_foreign_message(index).c(), it->c());
-    ++index;
-  }
-  EXPECT_EQ(10, index);
-
-  // Test iterator operators that are not usually used in regular for-loops.
-  // Including: post increment, assign, ==.
-  MessageIterator old_it = rf_foreign_message.begin();
-  MessageIterator new_it = old_it++;
-  EXPECT_FALSE(old_it == new_it);
-  // Check that old_it++ increments old_it once.
-  for (index = 1; old_it != rf_foreign_message.end(); ++old_it, ++index) {
-    EXPECT_EQ(message.repeated_foreign_message(index).c(), old_it->c());
-  }
-  EXPECT_EQ(10, index);
-  // Test assign operator.
-  old_it = new_it;
-  for (index = 0; old_it != rf_foreign_message.end(); ++old_it, ++index) {
-    EXPECT_EQ(message.repeated_foreign_message(index).c(), old_it->c());
-  }
-  EXPECT_EQ(10, index);
-  // Check that the returned value of old_it++ is the one before increment.
-  for (index = 0; new_it != rf_foreign_message.end(); ++new_it, ++index) {
-    EXPECT_EQ(message.repeated_foreign_message(index).c(), new_it->c());
-  }
-  EXPECT_EQ(10, index);
-
-  // Test MutableRepeatedFieldRef::Add()
-  mrf_int32.Add(1234);
-  mrf_double.Add(1234.0);
-  mrf_string.Add("1234");
-  ForeignMessage foreign_message;
-  foreign_message.set_c(1234);
-  mrf_foreign_message.Add(foreign_message);
-  EXPECT_EQ(1234, message.repeated_int32(10));
-  EXPECT_EQ(1234.0, message.repeated_double(10));
-  EXPECT_EQ("1234", message.repeated_string(10));
-  EXPECT_EQ(1234, message.repeated_foreign_message(10).c());
-
-  // Test MutableRepeatedFieldRef::RemoveLast()
-  mrf_int32.RemoveLast();
-  mrf_double.RemoveLast();
-  mrf_string.RemoveLast();
-  mrf_foreign_message.RemoveLast();
-  EXPECT_EQ(10, message.repeated_int32_size());
-  EXPECT_EQ(10, message.repeated_double_size());
-  EXPECT_EQ(10, message.repeated_string_size());
-  EXPECT_EQ(10, message.repeated_foreign_message_size());
-
-  // Test MutableRepeatedFieldRef::SwapElements()
-  mrf_int32.SwapElements(0, 9);
-  mrf_double.SwapElements(0, 9);
-  mrf_string.SwapElements(0, 9);
-  mrf_foreign_message.SwapElements(0, 9);
-  EXPECT_EQ(Func(9, -1), message.repeated_int32(0));
-  EXPECT_EQ(Func(0, -1), message.repeated_int32(9));
-  EXPECT_EQ(Func(9, -2), message.repeated_double(0));
-  EXPECT_EQ(Func(0, -2), message.repeated_double(9));
-  EXPECT_EQ(StrFunc(9, -5), message.repeated_string(0));
-  EXPECT_EQ(StrFunc(0, -5), message.repeated_string(9));
-  EXPECT_EQ(Func(9, 7), message.repeated_foreign_message(0).c());
-  EXPECT_EQ(Func(0, 7), message.repeated_foreign_message(9).c());
-
-  // Test MutableRepeatedFieldRef::Clear()
-  mrf_int32.Clear();
-  mrf_double.Clear();
-  mrf_string.Clear();
-  mrf_foreign_message.Clear();
-  EXPECT_EQ(0, message.repeated_int32_size());
-  EXPECT_EQ(0, message.repeated_double_size());
-  EXPECT_EQ(0, message.repeated_string_size());
-  EXPECT_EQ(0, message.repeated_foreign_message_size());
-
-  // Test (Mutable)RepeatedFieldRef::empty()
-  EXPECT_TRUE(rf_int32.empty());
-  EXPECT_TRUE(mrf_int32.empty());
-  EXPECT_TRUE(rf_double.empty());
-  EXPECT_TRUE(mrf_double.empty());
-  EXPECT_TRUE(rf_string.empty());
-  EXPECT_TRUE(mrf_string.empty());
-  EXPECT_TRUE(rf_foreign_message.empty());
-  EXPECT_TRUE(mrf_foreign_message.empty());
-  EXPECT_TRUE(rf_message.empty());
-  EXPECT_TRUE(mrf_message.empty());
-
-#ifdef PROTOBUF_HAS_DEATH_TEST
-
-  // Make sure types are checked correctly at runtime.
-  const FieldDescriptor* fd_optional_int32 =
-      desc->FindFieldByName("optional_int32");
-  EXPECT_DEATH(refl->GetRepeatedFieldRef<int32_t>(message, fd_optional_int32),
-               "");
-  EXPECT_DEATH(refl->GetRepeatedFieldRef<double>(message, fd_repeated_int32),
-               "");
-  EXPECT_DEATH(refl->GetRepeatedFieldRef<TestAllTypes>(
-                   message, fd_repeated_foreign_message),
-               "");
-
-#endif  // PROTOBUF_HAS_DEATH_TEST
-}
-
-TEST(RepeatedFieldReflectionTest, RepeatedFieldRefForEnums) {
-  TestAllTypes message;
-  const Reflection* refl = message.GetReflection();
-  const Descriptor* desc = message.GetDescriptor();
-
-  for (int i = 0; i < 10; ++i) {
-    message.add_repeated_nested_enum(TestAllTypes::BAR);
-  }
-
-  const FieldDescriptor* fd_repeated_nested_enum =
-      desc->FindFieldByName("repeated_nested_enum");
-  const RepeatedFieldRef<TestAllTypes::NestedEnum> enum_ref =
-      refl->GetRepeatedFieldRef<TestAllTypes::NestedEnum>(
-          message, fd_repeated_nested_enum);
-  const MutableRepeatedFieldRef<TestAllTypes::NestedEnum> mutable_enum_ref =
-      refl->GetMutableRepeatedFieldRef<TestAllTypes::NestedEnum>(
-          &message, fd_repeated_nested_enum);
-  const RepeatedFieldRef<int32_t> int32_ref =
-      refl->GetRepeatedFieldRef<int32_t>(message, fd_repeated_nested_enum);
-  const MutableRepeatedFieldRef<int32_t> mutable_int32_ref =
-      refl->GetMutableRepeatedFieldRef<int32_t>(&message,
-                                                fd_repeated_nested_enum);
-
-  EXPECT_EQ(message.repeated_nested_enum_size(), enum_ref.size());
-  EXPECT_EQ(message.repeated_nested_enum_size(), mutable_enum_ref.size());
-  EXPECT_EQ(message.repeated_nested_enum_size(), int32_ref.size());
-  EXPECT_EQ(message.repeated_nested_enum_size(), mutable_int32_ref.size());
-
-  EXPECT_FALSE(enum_ref.empty());
-  EXPECT_FALSE(mutable_enum_ref.empty());
-  EXPECT_FALSE(int32_ref.empty());
-  EXPECT_FALSE(mutable_int32_ref.empty());
-
-  for (int i = 0; i < 10; ++i) {
-    EXPECT_EQ(TestAllTypes::BAR, enum_ref.Get(i));
-    EXPECT_EQ(TestAllTypes::BAR, mutable_enum_ref.Get(i));
-    mutable_enum_ref.Set(i, TestAllTypes::BAZ);
-    EXPECT_EQ(TestAllTypes::BAZ, enum_ref.Get(i));
-    EXPECT_EQ(TestAllTypes::BAZ, message.repeated_nested_enum(i));
-
-    message.set_repeated_nested_enum(i, TestAllTypes::BAR);
-    EXPECT_EQ(TestAllTypes::BAR, int32_ref.Get(i));
-    EXPECT_EQ(TestAllTypes::BAR, mutable_int32_ref.Get(i));
-    mutable_int32_ref.Set(i, TestAllTypes::BAZ);
-    EXPECT_EQ(TestAllTypes::BAZ, int32_ref.Get(i));
-    EXPECT_EQ(TestAllTypes::BAZ, message.repeated_nested_enum(i));
-  }
-
-  TestRepeatedFieldRefIteratorForPrimitive(enum_ref, message,
-                                           &TestAllTypes::repeated_nested_enum);
-  TestRepeatedFieldRefIteratorForPrimitive(int32_ref, message,
-                                           &TestAllTypes::repeated_nested_enum);
-
-  // Test Add()
-  mutable_enum_ref.Add(TestAllTypes::FOO);
-  EXPECT_EQ(TestAllTypes::FOO, message.repeated_nested_enum(10));
-  mutable_int32_ref.Add(TestAllTypes::BAR);
-  EXPECT_EQ(TestAllTypes::BAR, message.repeated_nested_enum(11));
-
-  // Test RemoveLast()
-  mutable_enum_ref.RemoveLast();
-  EXPECT_EQ(11, message.repeated_nested_enum_size());
-  mutable_int32_ref.RemoveLast();
-  EXPECT_EQ(10, message.repeated_nested_enum_size());
-
-  // Test SwapElements()
-  mutable_enum_ref.Set(0, TestAllTypes::BAR);
-  mutable_enum_ref.Set(9, TestAllTypes::BAZ);
-  mutable_enum_ref.SwapElements(0, 9);
-  EXPECT_EQ(TestAllTypes::BAZ, enum_ref.Get(0));
-  EXPECT_EQ(TestAllTypes::BAR, enum_ref.Get(9));
-  mutable_int32_ref.SwapElements(0, 9);
-  EXPECT_EQ(TestAllTypes::BAR, enum_ref.Get(0));
-  EXPECT_EQ(TestAllTypes::BAZ, enum_ref.Get(9));
-
-  // Test Clear()
-  mutable_enum_ref.Clear();
-  EXPECT_EQ(0, message.repeated_nested_enum_size());
-  mutable_enum_ref.Add(TestAllTypes::FOO);
-  EXPECT_EQ(1, message.repeated_nested_enum_size());
-  mutable_int32_ref.Clear();
-  EXPECT_EQ(0, message.repeated_nested_enum_size());
-
-  // Test empty()
-  EXPECT_TRUE(enum_ref.empty());
-  EXPECT_TRUE(mutable_enum_ref.empty());
-  EXPECT_TRUE(int32_ref.empty());
-  EXPECT_TRUE(mutable_int32_ref.empty());
-}
-
-TEST(RepeatedFieldReflectionTest, RepeatedFieldRefForExtensionFields) {
-  TestAllExtensions extended_message;
-  const Reflection* refl = extended_message.GetReflection();
-  const Descriptor* desc = extended_message.GetDescriptor();
-
-  for (int i = 0; i < 10; ++i) {
-    extended_message.AddExtension(unittest::repeated_int64_extension,
-                                  Func(i, 1));
-  }
-
-  const FieldDescriptor* fd_repeated_int64_extension =
-      desc->file()->FindExtensionByName("repeated_int64_extension");
-  GOOGLE_CHECK(fd_repeated_int64_extension != nullptr);
-
-  const RepeatedFieldRef<int64_t> rf_int64_extension =
-      refl->GetRepeatedFieldRef<int64_t>(extended_message,
-                                         fd_repeated_int64_extension);
-
-  const MutableRepeatedFieldRef<int64_t> mrf_int64_extension =
-      refl->GetMutableRepeatedFieldRef<int64_t>(&extended_message,
-                                                fd_repeated_int64_extension);
-
-  for (int i = 0; i < 10; ++i) {
-    EXPECT_EQ(Func(i, 1), rf_int64_extension.Get(i));
-    mrf_int64_extension.Set(i, Func(i, -1));
-    EXPECT_EQ(Func(i, -1), extended_message.GetExtension(
-                               unittest::repeated_int64_extension, i));
-  }
-}
-
-
-TEST(RepeatedFieldReflectionTest, RepeatedFieldRefMergeFromAndSwap) {
-  // Set-up message content.
-  TestAllTypes m0, m1, m2;
-  for (int i = 0; i < 10; ++i) {
-    m0.add_repeated_int32(Func(i, 1));
-    m0.add_repeated_double(Func(i, 2));
-    m0.add_repeated_string(StrFunc(i, 5));
-    m0.add_repeated_foreign_message()->set_c(Func(i, 6));
-    m0.add_repeated_nested_enum(TestAllTypes::FOO);
-    m1.add_repeated_int32(Func(i, 11));
-    m1.add_repeated_double(Func(i, 12));
-    m1.add_repeated_string(StrFunc(i, 15));
-    m1.add_repeated_foreign_message()->set_c(Func(i, 16));
-    m1.add_repeated_nested_enum(TestAllTypes::BAR);
-    m2.add_repeated_int32(Func(i, 21));
-    m2.add_repeated_double(Func(i, 22));
-    m2.add_repeated_string(StrFunc(i, 25));
-    m2.add_repeated_foreign_message()->set_c(Func(i, 26));
-    m2.add_repeated_nested_enum(TestAllTypes::BAZ);
-  }
-
-  const Reflection* refl = m0.GetReflection();
-  const Descriptor* desc = m0.GetDescriptor();
-
-  // Get FieldDescriptors for all the fields of interest.
-  const FieldDescriptor* fd_repeated_int32 =
-      desc->FindFieldByName("repeated_int32");
-  const FieldDescriptor* fd_repeated_double =
-      desc->FindFieldByName("repeated_double");
-  const FieldDescriptor* fd_repeated_string =
-      desc->FindFieldByName("repeated_string");
-  const FieldDescriptor* fd_repeated_foreign_message =
-      desc->FindFieldByName("repeated_foreign_message");
-  const FieldDescriptor* fd_repeated_nested_enum =
-      desc->FindFieldByName("repeated_nested_enum");
-
-  // Get MutableRepeatedFieldRef objects for all fields of interest.
-  const MutableRepeatedFieldRef<int32_t> mrf_int32 =
-      refl->GetMutableRepeatedFieldRef<int32_t>(&m0, fd_repeated_int32);
-  const MutableRepeatedFieldRef<double> mrf_double =
-      refl->GetMutableRepeatedFieldRef<double>(&m0, fd_repeated_double);
-  const MutableRepeatedFieldRef<std::string> mrf_string =
-      refl->GetMutableRepeatedFieldRef<std::string>(&m0, fd_repeated_string);
-  const MutableRepeatedFieldRef<ForeignMessage> mrf_foreign_message =
-      refl->GetMutableRepeatedFieldRef<ForeignMessage>(
-          &m0, fd_repeated_foreign_message);
-  const MutableRepeatedFieldRef<TestAllTypes::NestedEnum> mrf_nested_enum =
-      refl->GetMutableRepeatedFieldRef<TestAllTypes::NestedEnum>(
-          &m0, fd_repeated_nested_enum);
-
-  // Test MutableRepeatedRef::CopyFrom
-  mrf_int32.CopyFrom(refl->GetRepeatedFieldRef<int32_t>(m1, fd_repeated_int32));
-  mrf_double.CopyFrom(
-      refl->GetRepeatedFieldRef<double>(m1, fd_repeated_double));
-  mrf_string.CopyFrom(
-      refl->GetRepeatedFieldRef<std::string>(m1, fd_repeated_string));
-  mrf_foreign_message.CopyFrom(refl->GetRepeatedFieldRef<ForeignMessage>(
-      m1, fd_repeated_foreign_message));
-  mrf_nested_enum.CopyFrom(refl->GetRepeatedFieldRef<TestAllTypes::NestedEnum>(
-      m1, fd_repeated_nested_enum));
-  for (int i = 0; i < 10; ++i) {
-    EXPECT_EQ(Func(i, 11), m0.repeated_int32(i));
-    EXPECT_EQ(Func(i, 12), m0.repeated_double(i));
-    EXPECT_EQ(StrFunc(i, 15), m0.repeated_string(i));
-    EXPECT_EQ(Func(i, 16), m0.repeated_foreign_message(i).c());
-    EXPECT_EQ(TestAllTypes::BAR, m0.repeated_nested_enum(i));
-  }
-
-  // Test MutableRepeatedRef::MergeFrom
-  mrf_int32.MergeFrom(
-      refl->GetRepeatedFieldRef<int32_t>(m2, fd_repeated_int32));
-  mrf_double.MergeFrom(
-      refl->GetRepeatedFieldRef<double>(m2, fd_repeated_double));
-  mrf_string.MergeFrom(
-      refl->GetRepeatedFieldRef<std::string>(m2, fd_repeated_string));
-  mrf_foreign_message.MergeFrom(refl->GetRepeatedFieldRef<ForeignMessage>(
-      m2, fd_repeated_foreign_message));
-  mrf_nested_enum.MergeFrom(refl->GetRepeatedFieldRef<TestAllTypes::NestedEnum>(
-      m2, fd_repeated_nested_enum));
-  for (int i = 0; i < 10; ++i) {
-    EXPECT_EQ(Func(i, 21), m0.repeated_int32(i + 10));
-    EXPECT_EQ(Func(i, 22), m0.repeated_double(i + 10));
-    EXPECT_EQ(StrFunc(i, 25), m0.repeated_string(i + 10));
-    EXPECT_EQ(Func(i, 26), m0.repeated_foreign_message(i + 10).c());
-    EXPECT_EQ(TestAllTypes::BAZ, m0.repeated_nested_enum(i + 10));
-  }
-
-  // Test MutableRepeatedRef::Swap
-  // Swap between m0 and m2.
-  mrf_int32.Swap(
-      refl->GetMutableRepeatedFieldRef<int32_t>(&m2, fd_repeated_int32));
-  mrf_double.Swap(
-      refl->GetMutableRepeatedFieldRef<double>(&m2, fd_repeated_double));
-  mrf_string.Swap(
-      refl->GetMutableRepeatedFieldRef<std::string>(&m2, fd_repeated_string));
-  mrf_foreign_message.Swap(refl->GetMutableRepeatedFieldRef<ForeignMessage>(
-      &m2, fd_repeated_foreign_message));
-  mrf_nested_enum.Swap(
-      refl->GetMutableRepeatedFieldRef<TestAllTypes::NestedEnum>(
-          &m2, fd_repeated_nested_enum));
-  for (int i = 0; i < 10; ++i) {
-    // Check the content of m0.
-    EXPECT_EQ(Func(i, 21), m0.repeated_int32(i));
-    EXPECT_EQ(Func(i, 22), m0.repeated_double(i));
-    EXPECT_EQ(StrFunc(i, 25), m0.repeated_string(i));
-    EXPECT_EQ(Func(i, 26), m0.repeated_foreign_message(i).c());
-    EXPECT_EQ(TestAllTypes::BAZ, m0.repeated_nested_enum(i));
-
-    // Check the content of m2.
-    EXPECT_EQ(Func(i, 11), m2.repeated_int32(i));
-    EXPECT_EQ(Func(i, 12), m2.repeated_double(i));
-    EXPECT_EQ(StrFunc(i, 15), m2.repeated_string(i));
-    EXPECT_EQ(Func(i, 16), m2.repeated_foreign_message(i).c());
-    EXPECT_EQ(TestAllTypes::BAR, m2.repeated_nested_enum(i));
-    EXPECT_EQ(Func(i, 21), m2.repeated_int32(i + 10));
-    EXPECT_EQ(Func(i, 22), m2.repeated_double(i + 10));
-    EXPECT_EQ(StrFunc(i, 25), m2.repeated_string(i + 10));
-    EXPECT_EQ(Func(i, 26), m2.repeated_foreign_message(i + 10).c());
-    EXPECT_EQ(TestAllTypes::BAZ, m2.repeated_nested_enum(i + 10));
-  }
-}
-
-// Test that GetRepeatedFieldRef/MutableRepeatedFieldRef works with
-// DynamicMessage.
-TEST(RepeatedFieldReflectionTest, RepeatedFieldRefDynamicMessage) {
-  // DynamicMessage shares the same memory layout as generated message
-  // and use the same GeneratedMessageReflection code for reflection.
-  // All code paths should already be covered by the other tests for
-  // generated messages. Here we just test one field.
-
-  const Descriptor* desc = TestAllTypes::descriptor();
-  const FieldDescriptor* fd_repeated_int32 =
-      desc->FindFieldByName("repeated_int32");
-
-  DynamicMessageFactory factory;
-  std::unique_ptr<Message> dynamic_message(factory.GetPrototype(desc)->New());
-  const Reflection* refl = dynamic_message->GetReflection();
-
-  MutableRepeatedFieldRef<int32_t> rf_int32 =
-      refl->GetMutableRepeatedFieldRef<int32_t>(dynamic_message.get(),
-                                                fd_repeated_int32);
-  rf_int32.Add(1234);
-  EXPECT_EQ(1, refl->FieldSize(*dynamic_message, fd_repeated_int32));
-  EXPECT_EQ(1234,
-            refl->GetRepeatedInt32(*dynamic_message, fd_repeated_int32, 0));
-}
-
-}  // namespace
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/repeated_field_unittest.cc b/libs/protobuf/src/google/protobuf/repeated_field_unittest.cc
deleted file mode 100644
index d8a82bf..0000000
--- a/libs/protobuf/src/google/protobuf/repeated_field_unittest.cc
+++ /dev/null
@@ -1,2363 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-//
-// TODO(kenton):  Improve this unittest to bring it up to the standards of
-//   other proto2 unittests.
-
-#include <google/protobuf/repeated_field.h>
-
-#include <algorithm>
-#include <cstdlib>
-#include <iterator>
-#include <limits>
-#include <list>
-#include <sstream>
-#include <string>
-#include <type_traits>
-#include <vector>
-
-#include <google/protobuf/stubs/logging.h>
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/unittest.pb.h>
-#include <google/protobuf/stubs/strutil.h>
-#include <gmock/gmock.h>
-#include <google/protobuf/testing/googletest.h>
-#include <gtest/gtest.h>
-#include <google/protobuf/stubs/stl_util.h>
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-namespace {
-
-using ::protobuf_unittest::TestAllTypes;
-using ::testing::AllOf;
-using ::testing::ElementsAre;
-using ::testing::Ge;
-using ::testing::Le;
-
-TEST(RepeatedField, ConstInit) {
-  PROTOBUF_CONSTINIT static RepeatedField<int> field{};  // NOLINT
-  EXPECT_TRUE(field.empty());
-}
-
-// Test operations on a small RepeatedField.
-TEST(RepeatedField, Small) {
-  RepeatedField<int> field;
-
-  EXPECT_TRUE(field.empty());
-  EXPECT_EQ(field.size(), 0);
-
-  field.Add(5);
-
-  EXPECT_FALSE(field.empty());
-  EXPECT_EQ(field.size(), 1);
-  EXPECT_EQ(field.Get(0), 5);
-  EXPECT_EQ(field.at(0), 5);
-
-  field.Add(42);
-
-  EXPECT_FALSE(field.empty());
-  EXPECT_EQ(field.size(), 2);
-  EXPECT_EQ(field.Get(0), 5);
-  EXPECT_EQ(field.at(0), 5);
-  EXPECT_EQ(field.Get(1), 42);
-  EXPECT_EQ(field.at(1), 42);
-
-  field.Set(1, 23);
-
-  EXPECT_FALSE(field.empty());
-  EXPECT_EQ(field.size(), 2);
-  EXPECT_EQ(field.Get(0), 5);
-  EXPECT_EQ(field.at(0), 5);
-  EXPECT_EQ(field.Get(1), 23);
-  EXPECT_EQ(field.at(1), 23);
-
-  field.at(1) = 25;
-
-  EXPECT_FALSE(field.empty());
-  EXPECT_EQ(field.size(), 2);
-  EXPECT_EQ(field.Get(0), 5);
-  EXPECT_EQ(field.at(0), 5);
-  EXPECT_EQ(field.Get(1), 25);
-  EXPECT_EQ(field.at(1), 25);
-
-  field.RemoveLast();
-
-  EXPECT_FALSE(field.empty());
-  EXPECT_EQ(field.size(), 1);
-  EXPECT_EQ(field.Get(0), 5);
-  EXPECT_EQ(field.at(0), 5);
-
-  field.Clear();
-
-  EXPECT_TRUE(field.empty());
-  EXPECT_EQ(field.size(), 0);
-  // Additional bytes are for 'struct Rep' header.
-  int expected_usage =
-      (sizeof(Arena*) > sizeof(int) ? sizeof(Arena*) / sizeof(int) : 3) *
-          sizeof(int) +
-      sizeof(Arena*);
-  EXPECT_GE(field.SpaceUsedExcludingSelf(), expected_usage);
-}
-
-
-// Test operations on a RepeatedField which is large enough to allocate a
-// separate array.
-TEST(RepeatedField, Large) {
-  RepeatedField<int> field;
-
-  for (int i = 0; i < 16; i++) {
-    field.Add(i * i);
-  }
-
-  EXPECT_FALSE(field.empty());
-  EXPECT_EQ(field.size(), 16);
-
-  for (int i = 0; i < 16; i++) {
-    EXPECT_EQ(field.Get(i), i * i);
-  }
-
-  int expected_usage = 16 * sizeof(int);
-  EXPECT_GE(field.SpaceUsedExcludingSelf(), expected_usage);
-}
-
-template <typename Rep>
-void CheckAllocationSizes(bool is_ptr) {
-  using T = typename Rep::value_type;
-  // Use a large initial block to make the checks below easier to predict.
-  std::string buf(1 << 20, 0);
-
-  Arena arena(&buf[0], buf.size());
-  auto* rep = Arena::CreateMessage<Rep>(&arena);
-  size_t prev = arena.SpaceUsed();
-
-  for (int i = 0; i < 100; ++i) {
-    rep->Add(T{});
-    if (sizeof(void*) == 8) {
-      // For RepeatedPtrField we also allocate the T in the arena.
-      // Subtract those from the count.
-      size_t new_used = arena.SpaceUsed() - (is_ptr ? sizeof(T) * (i + 1) : 0);
-      size_t last_alloc = new_used - prev;
-      prev = new_used;
-
-      // When we actually allocated something, check the size.
-      if (last_alloc != 0) {
-        // Must be `>= 16`, as expected by the Arena.
-        ASSERT_GE(last_alloc, 16);
-        // Must be of a power of two.
-        size_t log2 = Bits::Log2FloorNonZero64(last_alloc);
-        ASSERT_EQ((1 << log2), last_alloc);
-      }
-
-      // The byte size must be a multiple of 8.
-      ASSERT_EQ(rep->Capacity() * sizeof(T) % 8, 0);
-    }
-  }
-}
-
-TEST(RepeatedField, ArenaAllocationSizesMatchExpectedValues) {
-  // RepeatedField guarantees that in 64-bit mode we never allocate anything
-  // smaller than 16 bytes from an arena.
-  // This is important to avoid a branch in the reallocation path.
-  // This is also important because allocating anything less would be wasting
-  // memory.
-  // If the allocation size is wrong, ReturnArrayMemory will GOOGLE_DCHECK.
-  CheckAllocationSizes<RepeatedField<bool>>(false);
-  CheckAllocationSizes<RepeatedField<uint8_t>>(false);
-  CheckAllocationSizes<RepeatedField<uint16_t>>(false);
-  CheckAllocationSizes<RepeatedField<uint32_t>>(false);
-  CheckAllocationSizes<RepeatedField<uint64_t>>(false);
-  CheckAllocationSizes<RepeatedField<std::pair<uint64_t, uint64_t>>>(false);
-}
-
-template <typename Rep>
-void CheckNaturalGrowthOnArenasReuseBlocks(bool is_ptr) {
-  Arena arena;
-  std::vector<Rep*> values;
-  using T = typename Rep::value_type;
-
-  static constexpr int kNumFields = 100;
-  static constexpr int kNumElems = 1000;
-  for (int i = 0; i < kNumFields; ++i) {
-    values.push_back(Arena::CreateMessage<Rep>(&arena));
-    auto& field = *values.back();
-    for (int j = 0; j < kNumElems; ++j) {
-      field.Add(T{});
-    }
-  }
-
-  size_t used_bytes_if_reusing =
-      values.size() * values[0]->Capacity() * (is_ptr ? sizeof(T*) : sizeof(T));
-  // Use a 2% slack for other overhead.
-  // If we were not reusing the blocks, the actual value would be ~2x the
-  // expected.
-  EXPECT_THAT(
-      arena.SpaceUsed() - (is_ptr ? sizeof(T) * kNumElems * kNumFields : 0),
-      AllOf(Ge(used_bytes_if_reusing), Le(1.02 * used_bytes_if_reusing)));
-}
-
-TEST(RepeatedField, NaturalGrowthOnArenasReuseBlocks) {
-  CheckNaturalGrowthOnArenasReuseBlocks<RepeatedField<int>>(false);
-}
-
-// Test swapping between various types of RepeatedFields.
-TEST(RepeatedField, SwapSmallSmall) {
-  RepeatedField<int> field1;
-  RepeatedField<int> field2;
-
-  field1.Add(5);
-  field1.Add(42);
-
-  EXPECT_FALSE(field1.empty());
-  EXPECT_EQ(field1.size(), 2);
-  EXPECT_EQ(field1.Get(0), 5);
-  EXPECT_EQ(field1.Get(1), 42);
-
-  EXPECT_TRUE(field2.empty());
-  EXPECT_EQ(field2.size(), 0);
-
-  field1.Swap(&field2);
-
-  EXPECT_TRUE(field1.empty());
-  EXPECT_EQ(field1.size(), 0);
-
-  EXPECT_FALSE(field2.empty());
-  EXPECT_EQ(field2.size(), 2);
-  EXPECT_EQ(field2.Get(0), 5);
-  EXPECT_EQ(field2.Get(1), 42);
-}
-
-TEST(RepeatedField, SwapLargeSmall) {
-  RepeatedField<int> field1;
-  RepeatedField<int> field2;
-
-  for (int i = 0; i < 16; i++) {
-    field1.Add(i * i);
-  }
-  field2.Add(5);
-  field2.Add(42);
-  field1.Swap(&field2);
-
-  EXPECT_EQ(field1.size(), 2);
-  EXPECT_EQ(field1.Get(0), 5);
-  EXPECT_EQ(field1.Get(1), 42);
-  EXPECT_EQ(field2.size(), 16);
-  for (int i = 0; i < 16; i++) {
-    EXPECT_EQ(field2.Get(i), i * i);
-  }
-}
-
-TEST(RepeatedField, SwapLargeLarge) {
-  RepeatedField<int> field1;
-  RepeatedField<int> field2;
-
-  field1.Add(5);
-  field1.Add(42);
-  for (int i = 0; i < 16; i++) {
-    field1.Add(i);
-    field2.Add(i * i);
-  }
-  field2.Swap(&field1);
-
-  EXPECT_EQ(field1.size(), 16);
-  for (int i = 0; i < 16; i++) {
-    EXPECT_EQ(field1.Get(i), i * i);
-  }
-  EXPECT_EQ(field2.size(), 18);
-  EXPECT_EQ(field2.Get(0), 5);
-  EXPECT_EQ(field2.Get(1), 42);
-  for (int i = 2; i < 18; i++) {
-    EXPECT_EQ(field2.Get(i), i - 2);
-  }
-}
-
-// Determines how much space was reserved by the given field by adding elements
-// to it until it re-allocates its space.
-static int ReservedSpace(RepeatedField<int>* field) {
-  const int* ptr = field->data();
-  do {
-    field->Add(0);
-  } while (field->data() == ptr);
-
-  return field->size() - 1;
-}
-
-TEST(RepeatedField, ReserveMoreThanDouble) {
-  // Reserve more than double the previous space in the field and expect the
-  // field to reserve exactly the amount specified.
-  RepeatedField<int> field;
-  field.Reserve(20);
-
-  EXPECT_LE(20, ReservedSpace(&field));
-}
-
-TEST(RepeatedField, ReserveLessThanDouble) {
-  // Reserve less than double the previous space in the field and expect the
-  // field to grow by double instead.
-  RepeatedField<int> field;
-  field.Reserve(20);
-  int capacity = field.Capacity();
-  field.Reserve(capacity * 1.5);
-
-  EXPECT_LE(2 * capacity, ReservedSpace(&field));
-}
-
-TEST(RepeatedField, ReserveLessThanExisting) {
-  // Reserve less than the previous space in the field and expect the
-  // field to not re-allocate at all.
-  RepeatedField<int> field;
-  field.Reserve(20);
-  const int* previous_ptr = field.data();
-  field.Reserve(10);
-
-  EXPECT_EQ(previous_ptr, field.data());
-  EXPECT_LE(20, ReservedSpace(&field));
-}
-
-TEST(RepeatedField, Resize) {
-  RepeatedField<int> field;
-  field.Resize(2, 1);
-  EXPECT_EQ(2, field.size());
-  field.Resize(5, 2);
-  EXPECT_EQ(5, field.size());
-  field.Resize(4, 3);
-  ASSERT_EQ(4, field.size());
-  EXPECT_EQ(1, field.Get(0));
-  EXPECT_EQ(1, field.Get(1));
-  EXPECT_EQ(2, field.Get(2));
-  EXPECT_EQ(2, field.Get(3));
-  field.Resize(0, 4);
-  EXPECT_TRUE(field.empty());
-}
-
-TEST(RepeatedField, ReserveNothing) {
-  RepeatedField<int> field;
-  EXPECT_EQ(0, field.Capacity());
-
-  field.Reserve(-1);
-  EXPECT_EQ(0, field.Capacity());
-}
-
-TEST(RepeatedField, ReserveLowerClamp) {
-  int clamped_value = internal::CalculateReserveSize<bool, sizeof(void*)>(0, 1);
-  EXPECT_GE(clamped_value, 8 / sizeof(bool));
-  EXPECT_EQ((internal::RepeatedFieldLowerClampLimit<bool, sizeof(void*)>()),
-            clamped_value);
-  // EXPECT_EQ(clamped_value, (internal::CalculateReserveSize<bool,
-  // sizeof(void*)>( clamped_value, 2)));
-
-  clamped_value = internal::CalculateReserveSize<int, sizeof(void*)>(0, 1);
-  EXPECT_GE(clamped_value, 8 / sizeof(int));
-  EXPECT_EQ((internal::RepeatedFieldLowerClampLimit<int, sizeof(void*)>()),
-            clamped_value);
-  // EXPECT_EQ(clamped_value, (internal::CalculateReserveSize<int,
-  // sizeof(void*)>( clamped_value, 2)));
-}
-
-TEST(RepeatedField, ReserveGrowth) {
-  // Make sure the field capacity doubles in size on repeated reservation.
-  for (int size = internal::RepeatedFieldLowerClampLimit<int, sizeof(void*)>(),
-           i = 0;
-       i < 4; ++i) {
-    int next =
-        sizeof(Arena*) >= sizeof(int)
-            ?
-            // for small enough elements, we double number of total bytes
-            ((2 * (size * sizeof(int) + sizeof(Arena*))) - sizeof(Arena*)) /
-                sizeof(int)
-            :
-            // we just double the number of elements if too large size.
-            size * 2;
-    EXPECT_EQ(next, (internal::CalculateReserveSize<int, sizeof(void*)>(
-                        size, size + 1)));
-    size = next;
-  }
-}
-
-TEST(RepeatedField, ReserveLarge) {
-  const int old_size = 10;
-  // This is a size we won't get by doubling:
-  const int new_size = old_size * 3 + 1;
-
-  // Reserving more than 2x current capacity should grow directly to that size.
-  EXPECT_EQ(new_size, (internal::CalculateReserveSize<int, sizeof(void*)>(
-                          old_size, new_size)));
-}
-
-TEST(RepeatedField, ReserveHuge) {
-  // Largest value that does not clamp to the large limit:
-  constexpr int non_clamping_limit =
-      (std::numeric_limits<int>::max() - sizeof(Arena*)) / 2;
-  ASSERT_LT(2 * non_clamping_limit, std::numeric_limits<int>::max());
-  EXPECT_LT((internal::CalculateReserveSize<int, sizeof(void*)>(
-                non_clamping_limit, non_clamping_limit + 1)),
-            std::numeric_limits<int>::max());
-
-  // Smallest size that *will* clamp to the upper limit:
-  constexpr int min_clamping_size = std::numeric_limits<int>::max() / 2 + 1;
-  EXPECT_EQ((internal::CalculateReserveSize<int, sizeof(void*)>(
-                min_clamping_size, min_clamping_size + 1)),
-            std::numeric_limits<int>::max());
-
-#ifdef PROTOBUF_TEST_ALLOW_LARGE_ALLOC
-  // The rest of this test may allocate several GB of memory, so it is only
-  // built if explicitly requested.
-  RepeatedField<int> huge_field;
-
-  // Reserve a size for huge_field that will clamp.
-  huge_field.Reserve(min_clamping_size);
-  EXPECT_GE(huge_field.Capacity(), min_clamping_size);
-  ASSERT_LT(huge_field.Capacity(), std::numeric_limits<int>::max() - 1);
-
-#ifndef PROTOBUF_ASAN
-  // The array containing all the fields is, in theory, up to MAXINT-1 in size.
-  // However, some compilers can't handle a struct whose size is larger
-  // than 2GB, and the protocol buffer format doesn't handle more than 2GB of
-  // data at once, either.  So we limit it, but the code below accesses beyond
-  // that limit.
-
-  // Allocation may return more memory than we requested. However, the updated
-  // size must still be clamped to a valid range.
-  huge_field.Reserve(huge_field.Capacity() + 1);
-  EXPECT_EQ(huge_field.Capacity(), std::numeric_limits<int>::max());
-#endif  // PROTOBUF_ASAN
-#endif  // PROTOBUF_TEST_ALLOW_LARGE_ALLOC
-}
-
-TEST(RepeatedField, MergeFrom) {
-  RepeatedField<int> source, destination;
-  source.Add(4);
-  source.Add(5);
-  destination.Add(1);
-  destination.Add(2);
-  destination.Add(3);
-
-  destination.MergeFrom(source);
-
-  ASSERT_EQ(5, destination.size());
-  EXPECT_EQ(1, destination.Get(0));
-  EXPECT_EQ(2, destination.Get(1));
-  EXPECT_EQ(3, destination.Get(2));
-  EXPECT_EQ(4, destination.Get(3));
-  EXPECT_EQ(5, destination.Get(4));
-}
-
-
-TEST(RepeatedField, CopyFrom) {
-  RepeatedField<int> source, destination;
-  source.Add(4);
-  source.Add(5);
-  destination.Add(1);
-  destination.Add(2);
-  destination.Add(3);
-
-  destination.CopyFrom(source);
-
-  ASSERT_EQ(2, destination.size());
-  EXPECT_EQ(4, destination.Get(0));
-  EXPECT_EQ(5, destination.Get(1));
-}
-
-TEST(RepeatedField, CopyFromSelf) {
-  RepeatedField<int> me;
-  me.Add(3);
-  me.CopyFrom(me);
-  ASSERT_EQ(1, me.size());
-  EXPECT_EQ(3, me.Get(0));
-}
-
-TEST(RepeatedField, Erase) {
-  RepeatedField<int> me;
-  RepeatedField<int>::iterator it = me.erase(me.begin(), me.end());
-  EXPECT_TRUE(me.begin() == it);
-  EXPECT_EQ(0, me.size());
-
-  me.Add(1);
-  me.Add(2);
-  me.Add(3);
-  it = me.erase(me.begin(), me.end());
-  EXPECT_TRUE(me.begin() == it);
-  EXPECT_EQ(0, me.size());
-
-  me.Add(4);
-  me.Add(5);
-  me.Add(6);
-  it = me.erase(me.begin() + 2, me.end());
-  EXPECT_TRUE(me.begin() + 2 == it);
-  EXPECT_EQ(2, me.size());
-  EXPECT_EQ(4, me.Get(0));
-  EXPECT_EQ(5, me.Get(1));
-
-  me.Add(6);
-  me.Add(7);
-  me.Add(8);
-  it = me.erase(me.begin() + 1, me.begin() + 3);
-  EXPECT_TRUE(me.begin() + 1 == it);
-  EXPECT_EQ(3, me.size());
-  EXPECT_EQ(4, me.Get(0));
-  EXPECT_EQ(7, me.Get(1));
-  EXPECT_EQ(8, me.Get(2));
-}
-
-// Add contents of empty container to an empty field.
-TEST(RepeatedField, AddRange1) {
-  RepeatedField<int> me;
-  std::vector<int> values;
-
-  me.Add(values.begin(), values.end());
-  ASSERT_EQ(me.size(), 0);
-}
-
-// Add contents of container with one thing to an empty field.
-TEST(RepeatedField, AddRange2) {
-  RepeatedField<int> me;
-  std::vector<int> values;
-  values.push_back(-1);
-
-  me.Add(values.begin(), values.end());
-  ASSERT_EQ(me.size(), 1);
-  ASSERT_EQ(me.Get(0), values[0]);
-}
-
-// Add contents of container with more than one thing to an empty field.
-TEST(RepeatedField, AddRange3) {
-  RepeatedField<int> me;
-  std::vector<int> values;
-  values.push_back(0);
-  values.push_back(1);
-
-  me.Add(values.begin(), values.end());
-  ASSERT_EQ(me.size(), 2);
-  ASSERT_EQ(me.Get(0), values[0]);
-  ASSERT_EQ(me.Get(1), values[1]);
-}
-
-// Add contents of container with more than one thing to a non-empty field.
-TEST(RepeatedField, AddRange4) {
-  RepeatedField<int> me;
-  me.Add(0);
-  me.Add(1);
-
-  std::vector<int> values;
-  values.push_back(2);
-  values.push_back(3);
-
-  me.Add(values.begin(), values.end());
-  ASSERT_EQ(me.size(), 4);
-  ASSERT_EQ(me.Get(0), 0);
-  ASSERT_EQ(me.Get(1), 1);
-  ASSERT_EQ(me.Get(2), values[0]);
-  ASSERT_EQ(me.Get(3), values[1]);
-}
-
-// Add contents of a stringstream in order to test code paths where there is
-// an input iterator.
-TEST(RepeatedField, AddRange5) {
-  RepeatedField<int> me;
-
-  std::stringstream ss;
-  ss << 1 << ' ' << 2;
-
-  me.Add(std::istream_iterator<int>(ss), std::istream_iterator<int>());
-  ASSERT_EQ(me.size(), 2);
-  ASSERT_EQ(me.Get(0), 1);
-  ASSERT_EQ(me.Get(1), 2);
-}
-
-TEST(RepeatedField, AddAndAssignRanges) {
-  RepeatedField<int> field;
-
-  int vals[] = {2, 27, 2875, 609250};
-  field.Assign(std::begin(vals), std::end(vals));
-
-  ASSERT_EQ(field.size(), 4);
-  EXPECT_EQ(field.Get(0), 2);
-  EXPECT_EQ(field.Get(1), 27);
-  EXPECT_EQ(field.Get(2), 2875);
-  EXPECT_EQ(field.Get(3), 609250);
-
-  field.Add(std::begin(vals), std::end(vals));
-  ASSERT_EQ(field.size(), 8);
-  EXPECT_EQ(field.Get(0), 2);
-  EXPECT_EQ(field.Get(1), 27);
-  EXPECT_EQ(field.Get(2), 2875);
-  EXPECT_EQ(field.Get(3), 609250);
-  EXPECT_EQ(field.Get(4), 2);
-  EXPECT_EQ(field.Get(5), 27);
-  EXPECT_EQ(field.Get(6), 2875);
-  EXPECT_EQ(field.Get(7), 609250);
-}
-
-TEST(RepeatedField, CopyConstruct) {
-  RepeatedField<int> source;
-  source.Add(1);
-  source.Add(2);
-
-  RepeatedField<int> destination(source);
-
-  ASSERT_EQ(2, destination.size());
-  EXPECT_EQ(1, destination.Get(0));
-  EXPECT_EQ(2, destination.Get(1));
-}
-
-TEST(RepeatedField, IteratorConstruct) {
-  std::vector<int> values;
-  RepeatedField<int> empty(values.begin(), values.end());
-  ASSERT_EQ(values.size(), empty.size());
-
-  values.push_back(1);
-  values.push_back(2);
-
-  RepeatedField<int> field(values.begin(), values.end());
-  ASSERT_EQ(values.size(), field.size());
-  EXPECT_EQ(values[0], field.Get(0));
-  EXPECT_EQ(values[1], field.Get(1));
-
-  RepeatedField<int> other(field.begin(), field.end());
-  ASSERT_EQ(values.size(), other.size());
-  EXPECT_EQ(values[0], other.Get(0));
-  EXPECT_EQ(values[1], other.Get(1));
-}
-
-TEST(RepeatedField, CopyAssign) {
-  RepeatedField<int> source, destination;
-  source.Add(4);
-  source.Add(5);
-  destination.Add(1);
-  destination.Add(2);
-  destination.Add(3);
-
-  destination = source;
-
-  ASSERT_EQ(2, destination.size());
-  EXPECT_EQ(4, destination.Get(0));
-  EXPECT_EQ(5, destination.Get(1));
-}
-
-TEST(RepeatedField, SelfAssign) {
-  // Verify that assignment to self does not destroy data.
-  RepeatedField<int> source, *p;
-  p = &source;
-  source.Add(7);
-  source.Add(8);
-
-  *p = source;
-
-  ASSERT_EQ(2, source.size());
-  EXPECT_EQ(7, source.Get(0));
-  EXPECT_EQ(8, source.Get(1));
-}
-
-TEST(RepeatedField, MoveConstruct) {
-  {
-    RepeatedField<int> source;
-    source.Add(1);
-    source.Add(2);
-    const int* data = source.data();
-    RepeatedField<int> destination = std::move(source);
-    EXPECT_EQ(data, destination.data());
-    EXPECT_THAT(destination, ElementsAre(1, 2));
-    // This property isn't guaranteed but it's useful to have a test that would
-    // catch changes in this area.
-    EXPECT_TRUE(source.empty());
-  }
-  {
-    Arena arena;
-    RepeatedField<int>* source =
-        Arena::CreateMessage<RepeatedField<int>>(&arena);
-    source->Add(1);
-    source->Add(2);
-    RepeatedField<int> destination = std::move(*source);
-    EXPECT_EQ(nullptr, destination.GetArena());
-    EXPECT_THAT(destination, ElementsAre(1, 2));
-    // This property isn't guaranteed but it's useful to have a test that would
-    // catch changes in this area.
-    EXPECT_THAT(*source, ElementsAre(1, 2));
-  }
-}
-
-TEST(RepeatedField, MoveAssign) {
-  {
-    RepeatedField<int> source;
-    source.Add(1);
-    source.Add(2);
-    RepeatedField<int> destination;
-    destination.Add(3);
-    const int* source_data = source.data();
-    const int* destination_data = destination.data();
-    destination = std::move(source);
-    EXPECT_EQ(source_data, destination.data());
-    EXPECT_THAT(destination, ElementsAre(1, 2));
-    // This property isn't guaranteed but it's useful to have a test that would
-    // catch changes in this area.
-    EXPECT_EQ(destination_data, source.data());
-    EXPECT_THAT(source, ElementsAre(3));
-  }
-  {
-    Arena arena;
-    RepeatedField<int>* source =
-        Arena::CreateMessage<RepeatedField<int>>(&arena);
-    source->Add(1);
-    source->Add(2);
-    RepeatedField<int>* destination =
-        Arena::CreateMessage<RepeatedField<int>>(&arena);
-    destination->Add(3);
-    const int* source_data = source->data();
-    const int* destination_data = destination->data();
-    *destination = std::move(*source);
-    EXPECT_EQ(source_data, destination->data());
-    EXPECT_THAT(*destination, ElementsAre(1, 2));
-    // This property isn't guaranteed but it's useful to have a test that would
-    // catch changes in this area.
-    EXPECT_EQ(destination_data, source->data());
-    EXPECT_THAT(*source, ElementsAre(3));
-  }
-  {
-    Arena source_arena;
-    RepeatedField<int>* source =
-        Arena::CreateMessage<RepeatedField<int>>(&source_arena);
-    source->Add(1);
-    source->Add(2);
-    Arena destination_arena;
-    RepeatedField<int>* destination =
-        Arena::CreateMessage<RepeatedField<int>>(&destination_arena);
-    destination->Add(3);
-    *destination = std::move(*source);
-    EXPECT_THAT(*destination, ElementsAre(1, 2));
-    // This property isn't guaranteed but it's useful to have a test that would
-    // catch changes in this area.
-    EXPECT_THAT(*source, ElementsAre(1, 2));
-  }
-  {
-    Arena arena;
-    RepeatedField<int>* source =
-        Arena::CreateMessage<RepeatedField<int>>(&arena);
-    source->Add(1);
-    source->Add(2);
-    RepeatedField<int> destination;
-    destination.Add(3);
-    destination = std::move(*source);
-    EXPECT_THAT(destination, ElementsAre(1, 2));
-    // This property isn't guaranteed but it's useful to have a test that would
-    // catch changes in this area.
-    EXPECT_THAT(*source, ElementsAre(1, 2));
-  }
-  {
-    RepeatedField<int> source;
-    source.Add(1);
-    source.Add(2);
-    Arena arena;
-    RepeatedField<int>* destination =
-        Arena::CreateMessage<RepeatedField<int>>(&arena);
-    destination->Add(3);
-    *destination = std::move(source);
-    EXPECT_THAT(*destination, ElementsAre(1, 2));
-    // This property isn't guaranteed but it's useful to have a test that would
-    // catch changes in this area.
-    EXPECT_THAT(source, ElementsAre(1, 2));
-  }
-  {
-    RepeatedField<int> field;
-    // An alias to defeat -Wself-move.
-    RepeatedField<int>& alias = field;
-    field.Add(1);
-    field.Add(2);
-    const int* data = field.data();
-    field = std::move(alias);
-    EXPECT_EQ(data, field.data());
-    EXPECT_THAT(field, ElementsAre(1, 2));
-  }
-  {
-    Arena arena;
-    RepeatedField<int>* field =
-        Arena::CreateMessage<RepeatedField<int>>(&arena);
-    field->Add(1);
-    field->Add(2);
-    const int* data = field->data();
-    *field = std::move(*field);
-    EXPECT_EQ(data, field->data());
-    EXPECT_THAT(*field, ElementsAre(1, 2));
-  }
-}
-
-TEST(Movable, Works) {
-  class NonMoveConstructible {
-   public:
-    NonMoveConstructible(NonMoveConstructible&&) = delete;
-    NonMoveConstructible& operator=(NonMoveConstructible&&) { return *this; }
-  };
-  class NonMoveAssignable {
-   public:
-    NonMoveAssignable(NonMoveAssignable&&) {}
-    NonMoveAssignable& operator=(NonMoveConstructible&&) = delete;
-  };
-  class NonMovable {
-   public:
-    NonMovable(NonMovable&&) = delete;
-    NonMovable& operator=(NonMovable&&) = delete;
-  };
-
-  EXPECT_TRUE(internal::IsMovable<std::string>::value);
-
-  EXPECT_FALSE(std::is_move_constructible<NonMoveConstructible>::value);
-  EXPECT_TRUE(std::is_move_assignable<NonMoveConstructible>::value);
-  EXPECT_FALSE(internal::IsMovable<NonMoveConstructible>::value);
-
-  EXPECT_TRUE(std::is_move_constructible<NonMoveAssignable>::value);
-  EXPECT_FALSE(std::is_move_assignable<NonMoveAssignable>::value);
-  EXPECT_FALSE(internal::IsMovable<NonMoveAssignable>::value);
-
-  EXPECT_FALSE(internal::IsMovable<NonMovable>::value);
-}
-
-TEST(RepeatedField, MoveAdd) {
-  RepeatedPtrField<TestAllTypes> field;
-  TestAllTypes test_all_types;
-  auto* optional_nested_message =
-      test_all_types.mutable_optional_nested_message();
-  optional_nested_message->set_bb(42);
-  field.Add(std::move(test_all_types));
-
-  EXPECT_EQ(optional_nested_message,
-            field.Mutable(0)->mutable_optional_nested_message());
-}
-
-TEST(RepeatedField, MutableDataIsMutable) {
-  RepeatedField<int> field;
-  field.Add(1);
-  EXPECT_EQ(1, field.Get(0));
-  // The fact that this line compiles would be enough, but we'll check the
-  // value anyway.
-  *field.mutable_data() = 2;
-  EXPECT_EQ(2, field.Get(0));
-}
-
-TEST(RepeatedField, SubscriptOperators) {
-  RepeatedField<int> field;
-  field.Add(1);
-  EXPECT_EQ(1, field.Get(0));
-  EXPECT_EQ(1, field[0]);
-  EXPECT_EQ(field.Mutable(0), &field[0]);
-  const RepeatedField<int>& const_field = field;
-  EXPECT_EQ(field.data(), &const_field[0]);
-}
-
-TEST(RepeatedField, Truncate) {
-  RepeatedField<int> field;
-
-  field.Add(12);
-  field.Add(34);
-  field.Add(56);
-  field.Add(78);
-  EXPECT_EQ(4, field.size());
-
-  field.Truncate(3);
-  EXPECT_EQ(3, field.size());
-
-  field.Add(90);
-  EXPECT_EQ(4, field.size());
-  EXPECT_EQ(90, field.Get(3));
-
-  // Truncations that don't change the size are allowed, but growing is not
-  // allowed.
-  field.Truncate(field.size());
-#ifdef PROTOBUF_HAS_DEATH_TEST
-  EXPECT_DEBUG_DEATH(field.Truncate(field.size() + 1), "new_size");
-#endif
-}
-
-
-TEST(RepeatedField, ExtractSubrange) {
-  // Exhaustively test every subrange in arrays of all sizes from 0 through 9.
-  for (int sz = 0; sz < 10; ++sz) {
-    for (int num = 0; num <= sz; ++num) {
-      for (int start = 0; start < sz - num; ++start) {
-        // Create RepeatedField with sz elements having values 0 through sz-1.
-        RepeatedField<int32_t> field;
-        for (int i = 0; i < sz; ++i) field.Add(i);
-        EXPECT_EQ(field.size(), sz);
-
-        // Create a catcher array and call ExtractSubrange.
-        int32_t catcher[10];
-        for (int i = 0; i < 10; ++i) catcher[i] = -1;
-        field.ExtractSubrange(start, num, catcher);
-
-        // Does the resulting array have the right size?
-        EXPECT_EQ(field.size(), sz - num);
-
-        // Were the removed elements extracted into the catcher array?
-        for (int i = 0; i < num; ++i) EXPECT_EQ(catcher[i], start + i);
-        EXPECT_EQ(catcher[num], -1);
-
-        // Does the resulting array contain the right values?
-        for (int i = 0; i < start; ++i) EXPECT_EQ(field.Get(i), i);
-        for (int i = start; i < field.size(); ++i)
-          EXPECT_EQ(field.Get(i), i + num);
-      }
-    }
-  }
-}
-
-TEST(RepeatedField, ClearThenReserveMore) {
-  // Test that Reserve properly destroys the old internal array when it's forced
-  // to allocate a new one, even when cleared-but-not-deleted objects are
-  // present. Use a 'string' and > 16 bytes length so that the elements are
-  // non-POD and allocate -- the leak checker will catch any skipped destructor
-  // calls here.
-  RepeatedField<std::string> field;
-  for (int i = 0; i < 32; i++) {
-    field.Add(std::string("abcdefghijklmnopqrstuvwxyz0123456789"));
-  }
-  EXPECT_EQ(32, field.size());
-  field.Clear();
-  EXPECT_EQ(0, field.size());
-  EXPECT_LE(32, field.Capacity());
-
-  field.Reserve(1024);
-  EXPECT_EQ(0, field.size());
-  EXPECT_LE(1024, field.Capacity());
-  // Finish test -- |field| should destroy the cleared-but-not-yet-destroyed
-  // strings.
-}
-
-TEST(RepeatedField, TestSAddFromSelf) {
-  RepeatedField<int> field;
-  field.Add(0);
-  for (int i = 0; i < 1000; i++) {
-    field.Add(field[0]);
-  }
-}
-
-// ===================================================================
-// RepeatedPtrField tests.  These pretty much just mirror the RepeatedField
-// tests above.
-
-TEST(RepeatedPtrField, ConstInit) {
-  PROTOBUF_CONSTINIT static RepeatedPtrField<std::string> field{};  // NOLINT
-  EXPECT_TRUE(field.empty());
-}
-
-// This helper overload set tests whether X::f can be called with a braced pair,
-// X::f({a, b}) of std::string iterators (specifically, pointers: That call is
-// ambiguous if and only if the call to ValidResolutionPointerRange is not.
-template <typename X>
-auto ValidResolutionPointerRange(const std::string* p)
-    -> decltype(X::f({p, p + 2}), std::true_type{});
-template <typename X>
-std::false_type ValidResolutionPointerRange(void*);
-
-TEST(RepeatedPtrField, UnambiguousConstructor) {
-  struct X {
-    static bool f(std::vector<std::string>) { return false; }
-    static bool f(google::protobuf::RepeatedPtrField<std::string>) { return true; }
-
-    static bool g(std::vector<int>) { return false; }
-    static bool g(google::protobuf::RepeatedPtrField<std::string>) { return true; }
-  };
-
-  // RepeatedPtrField has no initializer-list constructor, and a constructor
-  // from to const char* values is excluded by its constraints.
-  EXPECT_FALSE(X::f({"abc", "xyz"}));
-
-  // Construction from a pair of int* is also not ambiguous.
-  int a[5] = {};
-  EXPECT_FALSE(X::g({a, a + 5}));
-
-  // Construction from string iterators for the unique string overload "g"
-  // works.
-  // Disabling this for now, this is actually ambiguous with libstdc++.
-  // std::string b[2] = {"abc", "xyz"};
-  // EXPECT_TRUE(X::g({b, b + 2}));
-
-  // Construction from string iterators for "f" is ambiguous, since both
-  // containers are equally good.
-  //
-  // X::f({b, b + 2});  // error => ValidResolutionPointerRange is unambiguous.
-  EXPECT_FALSE(decltype(ValidResolutionPointerRange<X>(nullptr))::value);
-}
-
-TEST(RepeatedPtrField, Small) {
-  RepeatedPtrField<std::string> field;
-
-  EXPECT_TRUE(field.empty());
-  EXPECT_EQ(field.size(), 0);
-
-  field.Add()->assign("foo");
-
-  EXPECT_FALSE(field.empty());
-  EXPECT_EQ(field.size(), 1);
-  EXPECT_EQ(field.Get(0), "foo");
-  EXPECT_EQ(field.at(0), "foo");
-
-  field.Add()->assign("bar");
-
-  EXPECT_FALSE(field.empty());
-  EXPECT_EQ(field.size(), 2);
-  EXPECT_EQ(field.Get(0), "foo");
-  EXPECT_EQ(field.at(0), "foo");
-  EXPECT_EQ(field.Get(1), "bar");
-  EXPECT_EQ(field.at(1), "bar");
-
-  field.Mutable(1)->assign("baz");
-
-  EXPECT_FALSE(field.empty());
-  EXPECT_EQ(field.size(), 2);
-  EXPECT_EQ(field.Get(0), "foo");
-  EXPECT_EQ(field.at(0), "foo");
-  EXPECT_EQ(field.Get(1), "baz");
-  EXPECT_EQ(field.at(1), "baz");
-
-  field.RemoveLast();
-
-  EXPECT_FALSE(field.empty());
-  EXPECT_EQ(field.size(), 1);
-  EXPECT_EQ(field.Get(0), "foo");
-  EXPECT_EQ(field.at(0), "foo");
-
-  field.Clear();
-
-  EXPECT_TRUE(field.empty());
-  EXPECT_EQ(field.size(), 0);
-}
-
-TEST(RepeatedPtrField, Large) {
-  RepeatedPtrField<std::string> field;
-
-  for (int i = 0; i < 16; i++) {
-    *field.Add() += 'a' + i;
-  }
-
-  EXPECT_EQ(field.size(), 16);
-
-  for (int i = 0; i < 16; i++) {
-    EXPECT_EQ(field.Get(i).size(), 1);
-    EXPECT_EQ(field.Get(i)[0], 'a' + i);
-  }
-
-  int min_expected_usage = 16 * sizeof(std::string);
-  EXPECT_GE(field.SpaceUsedExcludingSelf(), min_expected_usage);
-}
-
-TEST(RepeatedPtrField, ArenaAllocationSizesMatchExpectedValues) {
-  CheckAllocationSizes<RepeatedPtrField<std::string>>(true);
-}
-
-TEST(RepeatedPtrField, NaturalGrowthOnArenasReuseBlocks) {
-  CheckNaturalGrowthOnArenasReuseBlocks<RepeatedPtrField<std::string>>(true);
-}
-
-TEST(RepeatedPtrField, AddAndAssignRanges) {
-  RepeatedPtrField<std::string> field;
-
-  const char* vals[] = {"abc", "x", "yz", "xyzzy"};
-  field.Assign(std::begin(vals), std::end(vals));
-
-  ASSERT_EQ(field.size(), 4);
-  EXPECT_EQ(field.Get(0), "abc");
-  EXPECT_EQ(field.Get(1), "x");
-  EXPECT_EQ(field.Get(2), "yz");
-  EXPECT_EQ(field.Get(3), "xyzzy");
-
-  field.Add(std::begin(vals), std::end(vals));
-  ASSERT_EQ(field.size(), 8);
-  EXPECT_EQ(field.Get(0), "abc");
-  EXPECT_EQ(field.Get(1), "x");
-  EXPECT_EQ(field.Get(2), "yz");
-  EXPECT_EQ(field.Get(3), "xyzzy");
-  EXPECT_EQ(field.Get(4), "abc");
-  EXPECT_EQ(field.Get(5), "x");
-  EXPECT_EQ(field.Get(6), "yz");
-  EXPECT_EQ(field.Get(7), "xyzzy");
-}
-
-TEST(RepeatedPtrField, SwapSmallSmall) {
-  RepeatedPtrField<std::string> field1;
-  RepeatedPtrField<std::string> field2;
-
-  EXPECT_TRUE(field1.empty());
-  EXPECT_EQ(field1.size(), 0);
-  EXPECT_TRUE(field2.empty());
-  EXPECT_EQ(field2.size(), 0);
-
-  field1.Add()->assign("foo");
-  field1.Add()->assign("bar");
-
-  EXPECT_FALSE(field1.empty());
-  EXPECT_EQ(field1.size(), 2);
-  EXPECT_EQ(field1.Get(0), "foo");
-  EXPECT_EQ(field1.Get(1), "bar");
-
-  EXPECT_TRUE(field2.empty());
-  EXPECT_EQ(field2.size(), 0);
-
-  field1.Swap(&field2);
-
-  EXPECT_TRUE(field1.empty());
-  EXPECT_EQ(field1.size(), 0);
-
-  EXPECT_EQ(field2.size(), 2);
-  EXPECT_EQ(field2.Get(0), "foo");
-  EXPECT_EQ(field2.Get(1), "bar");
-}
-
-TEST(RepeatedPtrField, SwapLargeSmall) {
-  RepeatedPtrField<std::string> field1;
-  RepeatedPtrField<std::string> field2;
-
-  field2.Add()->assign("foo");
-  field2.Add()->assign("bar");
-  for (int i = 0; i < 16; i++) {
-    *field1.Add() += 'a' + i;
-  }
-  field1.Swap(&field2);
-
-  EXPECT_EQ(field1.size(), 2);
-  EXPECT_EQ(field1.Get(0), "foo");
-  EXPECT_EQ(field1.Get(1), "bar");
-  EXPECT_EQ(field2.size(), 16);
-  for (int i = 0; i < 16; i++) {
-    EXPECT_EQ(field2.Get(i).size(), 1);
-    EXPECT_EQ(field2.Get(i)[0], 'a' + i);
-  }
-}
-
-TEST(RepeatedPtrField, SwapLargeLarge) {
-  RepeatedPtrField<std::string> field1;
-  RepeatedPtrField<std::string> field2;
-
-  field1.Add()->assign("foo");
-  field1.Add()->assign("bar");
-  for (int i = 0; i < 16; i++) {
-    *field1.Add() += 'A' + i;
-    *field2.Add() += 'a' + i;
-  }
-  field2.Swap(&field1);
-
-  EXPECT_EQ(field1.size(), 16);
-  for (int i = 0; i < 16; i++) {
-    EXPECT_EQ(field1.Get(i).size(), 1);
-    EXPECT_EQ(field1.Get(i)[0], 'a' + i);
-  }
-  EXPECT_EQ(field2.size(), 18);
-  EXPECT_EQ(field2.Get(0), "foo");
-  EXPECT_EQ(field2.Get(1), "bar");
-  for (int i = 2; i < 18; i++) {
-    EXPECT_EQ(field2.Get(i).size(), 1);
-    EXPECT_EQ(field2.Get(i)[0], 'A' + i - 2);
-  }
-}
-
-static int ReservedSpace(RepeatedPtrField<std::string>* field) {
-  const std::string* const* ptr = field->data();
-  do {
-    field->Add();
-  } while (field->data() == ptr);
-
-  return field->size() - 1;
-}
-
-TEST(RepeatedPtrField, ReserveMoreThanDouble) {
-  RepeatedPtrField<std::string> field;
-  field.Reserve(20);
-
-  EXPECT_LE(20, ReservedSpace(&field));
-}
-
-TEST(RepeatedPtrField, ReserveLessThanDouble) {
-  RepeatedPtrField<std::string> field;
-  field.Reserve(20);
-
-  int capacity = field.Capacity();
-  // Grow by 1.5x
-  field.Reserve(capacity + (capacity >> 2));
-
-  EXPECT_LE(2 * capacity, ReservedSpace(&field));
-}
-
-TEST(RepeatedPtrField, ReserveLessThanExisting) {
-  RepeatedPtrField<std::string> field;
-  field.Reserve(20);
-  const std::string* const* previous_ptr = field.data();
-  field.Reserve(10);
-
-  EXPECT_EQ(previous_ptr, field.data());
-  EXPECT_LE(20, ReservedSpace(&field));
-}
-
-TEST(RepeatedPtrField, ReserveDoesntLoseAllocated) {
-  // Check that a bug is fixed:  An earlier implementation of Reserve()
-  // failed to copy pointers to allocated-but-cleared objects, possibly
-  // leading to segfaults.
-  RepeatedPtrField<std::string> field;
-  std::string* first = field.Add();
-  field.RemoveLast();
-
-  field.Reserve(20);
-  EXPECT_EQ(first, field.Add());
-}
-
-// Clearing elements is tricky with RepeatedPtrFields since the memory for
-// the elements is retained and reused.
-TEST(RepeatedPtrField, ClearedElements) {
-  RepeatedPtrField<std::string> field;
-
-  std::string* original = field.Add();
-  *original = "foo";
-
-  EXPECT_EQ(field.ClearedCount(), 0);
-
-  field.RemoveLast();
-  EXPECT_TRUE(original->empty());
-  EXPECT_EQ(field.ClearedCount(), 1);
-
-  EXPECT_EQ(field.Add(),
-            original);  // Should return same string for reuse.
-  EXPECT_EQ(field.UnsafeArenaReleaseLast(), original);  // We take ownership.
-  EXPECT_EQ(field.ClearedCount(), 0);
-
-  EXPECT_NE(field.Add(), original);  // Should NOT return the same string.
-  EXPECT_EQ(field.ClearedCount(), 0);
-
-  field.UnsafeArenaAddAllocated(original);  // Give ownership back.
-  EXPECT_EQ(field.ClearedCount(), 0);
-  EXPECT_EQ(field.Mutable(1), original);
-
-  field.Clear();
-  EXPECT_EQ(field.ClearedCount(), 2);
-#ifndef PROTOBUF_FUTURE_BREAKING_CHANGES
-  EXPECT_EQ(field.ReleaseCleared(), original);  // Take ownership again.
-  EXPECT_EQ(field.ClearedCount(), 1);
-  EXPECT_NE(field.Add(), original);
-  EXPECT_EQ(field.ClearedCount(), 0);
-  EXPECT_NE(field.Add(), original);
-  EXPECT_EQ(field.ClearedCount(), 0);
-
-  field.AddCleared(original);  // Give ownership back, but as a cleared object.
-  EXPECT_EQ(field.ClearedCount(), 1);
-  EXPECT_EQ(field.Add(), original);
-  EXPECT_EQ(field.ClearedCount(), 0);
-#endif  // !PROTOBUF_FUTURE_BREAKING_CHANGES
-}
-
-// Test all code paths in AddAllocated().
-TEST(RepeatedPtrField, AddAllocated) {
-  RepeatedPtrField<std::string> field;
-  while (field.size() < field.Capacity()) {
-    field.Add()->assign("filler");
-  }
-
-  int index = field.size();
-
-  // First branch:  Field is at capacity with no cleared objects.
-  std::string* foo = new std::string("foo");
-  field.AddAllocated(foo);
-  EXPECT_EQ(index + 1, field.size());
-  EXPECT_EQ(0, field.ClearedCount());
-  EXPECT_EQ(foo, &field.Get(index));
-
-  // Last branch:  Field is not at capacity and there are no cleared objects.
-  std::string* bar = new std::string("bar");
-  field.AddAllocated(bar);
-  ++index;
-  EXPECT_EQ(index + 1, field.size());
-  EXPECT_EQ(0, field.ClearedCount());
-  EXPECT_EQ(bar, &field.Get(index));
-
-  // Third branch:  Field is not at capacity and there are no cleared objects.
-  field.RemoveLast();
-  std::string* baz = new std::string("baz");
-  field.AddAllocated(baz);
-  EXPECT_EQ(index + 1, field.size());
-  EXPECT_EQ(1, field.ClearedCount());
-  EXPECT_EQ(baz, &field.Get(index));
-
-  // Second branch:  Field is at capacity but has some cleared objects.
-  while (field.size() < field.Capacity()) {
-    field.Add()->assign("filler2");
-  }
-  field.RemoveLast();
-  index = field.size();
-  std::string* moo = new std::string("moo");
-  field.AddAllocated(moo);
-  EXPECT_EQ(index + 1, field.size());
-  // We should have discarded the cleared object.
-  EXPECT_EQ(0, field.ClearedCount());
-  EXPECT_EQ(moo, &field.Get(index));
-}
-
-TEST(RepeatedPtrField, AddAllocatedDifferentArena) {
-  RepeatedPtrField<TestAllTypes> field;
-  Arena arena;
-  auto* msg = Arena::CreateMessage<TestAllTypes>(&arena);
-  field.AddAllocated(msg);
-}
-
-TEST(RepeatedPtrField, MergeFrom) {
-  RepeatedPtrField<std::string> source, destination;
-  source.Add()->assign("4");
-  source.Add()->assign("5");
-  destination.Add()->assign("1");
-  destination.Add()->assign("2");
-  destination.Add()->assign("3");
-
-  destination.MergeFrom(source);
-
-  ASSERT_EQ(5, destination.size());
-  EXPECT_EQ("1", destination.Get(0));
-  EXPECT_EQ("2", destination.Get(1));
-  EXPECT_EQ("3", destination.Get(2));
-  EXPECT_EQ("4", destination.Get(3));
-  EXPECT_EQ("5", destination.Get(4));
-}
-
-
-TEST(RepeatedPtrField, CopyFrom) {
-  RepeatedPtrField<std::string> source, destination;
-  source.Add()->assign("4");
-  source.Add()->assign("5");
-  destination.Add()->assign("1");
-  destination.Add()->assign("2");
-  destination.Add()->assign("3");
-
-  destination.CopyFrom(source);
-
-  ASSERT_EQ(2, destination.size());
-  EXPECT_EQ("4", destination.Get(0));
-  EXPECT_EQ("5", destination.Get(1));
-}
-
-TEST(RepeatedPtrField, CopyFromSelf) {
-  RepeatedPtrField<std::string> me;
-  me.Add()->assign("1");
-  me.CopyFrom(me);
-  ASSERT_EQ(1, me.size());
-  EXPECT_EQ("1", me.Get(0));
-}
-
-TEST(RepeatedPtrField, Erase) {
-  RepeatedPtrField<std::string> me;
-  RepeatedPtrField<std::string>::iterator it = me.erase(me.begin(), me.end());
-  EXPECT_TRUE(me.begin() == it);
-  EXPECT_EQ(0, me.size());
-
-  *me.Add() = "1";
-  *me.Add() = "2";
-  *me.Add() = "3";
-  it = me.erase(me.begin(), me.end());
-  EXPECT_TRUE(me.begin() == it);
-  EXPECT_EQ(0, me.size());
-
-  *me.Add() = "4";
-  *me.Add() = "5";
-  *me.Add() = "6";
-  it = me.erase(me.begin() + 2, me.end());
-  EXPECT_TRUE(me.begin() + 2 == it);
-  EXPECT_EQ(2, me.size());
-  EXPECT_EQ("4", me.Get(0));
-  EXPECT_EQ("5", me.Get(1));
-
-  *me.Add() = "6";
-  *me.Add() = "7";
-  *me.Add() = "8";
-  it = me.erase(me.begin() + 1, me.begin() + 3);
-  EXPECT_TRUE(me.begin() + 1 == it);
-  EXPECT_EQ(3, me.size());
-  EXPECT_EQ("4", me.Get(0));
-  EXPECT_EQ("7", me.Get(1));
-  EXPECT_EQ("8", me.Get(2));
-}
-
-TEST(RepeatedPtrField, CopyConstruct) {
-  RepeatedPtrField<std::string> source;
-  source.Add()->assign("1");
-  source.Add()->assign("2");
-
-  RepeatedPtrField<std::string> destination(source);
-
-  ASSERT_EQ(2, destination.size());
-  EXPECT_EQ("1", destination.Get(0));
-  EXPECT_EQ("2", destination.Get(1));
-}
-
-TEST(RepeatedPtrField, IteratorConstruct_String) {
-  std::vector<std::string> values;
-  values.push_back("1");
-  values.push_back("2");
-
-  RepeatedPtrField<std::string> field(values.begin(), values.end());
-  ASSERT_EQ(values.size(), field.size());
-  EXPECT_EQ(values[0], field.Get(0));
-  EXPECT_EQ(values[1], field.Get(1));
-
-  RepeatedPtrField<std::string> other(field.begin(), field.end());
-  ASSERT_EQ(values.size(), other.size());
-  EXPECT_EQ(values[0], other.Get(0));
-  EXPECT_EQ(values[1], other.Get(1));
-}
-
-TEST(RepeatedPtrField, IteratorConstruct_Proto) {
-  typedef TestAllTypes::NestedMessage Nested;
-  std::vector<Nested> values;
-  values.push_back(Nested());
-  values.back().set_bb(1);
-  values.push_back(Nested());
-  values.back().set_bb(2);
-
-  RepeatedPtrField<Nested> field(values.begin(), values.end());
-  ASSERT_EQ(values.size(), field.size());
-  EXPECT_EQ(values[0].bb(), field.Get(0).bb());
-  EXPECT_EQ(values[1].bb(), field.Get(1).bb());
-
-  RepeatedPtrField<Nested> other(field.begin(), field.end());
-  ASSERT_EQ(values.size(), other.size());
-  EXPECT_EQ(values[0].bb(), other.Get(0).bb());
-  EXPECT_EQ(values[1].bb(), other.Get(1).bb());
-}
-
-TEST(RepeatedPtrField, CopyAssign) {
-  RepeatedPtrField<std::string> source, destination;
-  source.Add()->assign("4");
-  source.Add()->assign("5");
-  destination.Add()->assign("1");
-  destination.Add()->assign("2");
-  destination.Add()->assign("3");
-
-  destination = source;
-
-  ASSERT_EQ(2, destination.size());
-  EXPECT_EQ("4", destination.Get(0));
-  EXPECT_EQ("5", destination.Get(1));
-}
-
-TEST(RepeatedPtrField, SelfAssign) {
-  // Verify that assignment to self does not destroy data.
-  RepeatedPtrField<std::string> source, *p;
-  p = &source;
-  source.Add()->assign("7");
-  source.Add()->assign("8");
-
-  *p = source;
-
-  ASSERT_EQ(2, source.size());
-  EXPECT_EQ("7", source.Get(0));
-  EXPECT_EQ("8", source.Get(1));
-}
-
-TEST(RepeatedPtrField, MoveConstruct) {
-  {
-    RepeatedPtrField<std::string> source;
-    *source.Add() = "1";
-    *source.Add() = "2";
-    const std::string* const* data = source.data();
-    RepeatedPtrField<std::string> destination = std::move(source);
-    EXPECT_EQ(data, destination.data());
-    EXPECT_THAT(destination, ElementsAre("1", "2"));
-    // This property isn't guaranteed but it's useful to have a test that would
-    // catch changes in this area.
-    EXPECT_TRUE(source.empty());
-  }
-  {
-    Arena arena;
-    RepeatedPtrField<std::string>* source =
-        Arena::CreateMessage<RepeatedPtrField<std::string>>(&arena);
-    *source->Add() = "1";
-    *source->Add() = "2";
-    RepeatedPtrField<std::string> destination = std::move(*source);
-    EXPECT_EQ(nullptr, destination.GetArena());
-    EXPECT_THAT(destination, ElementsAre("1", "2"));
-    // This property isn't guaranteed but it's useful to have a test that would
-    // catch changes in this area.
-    EXPECT_THAT(*source, ElementsAre("1", "2"));
-  }
-}
-
-TEST(RepeatedPtrField, MoveAssign) {
-  {
-    RepeatedPtrField<std::string> source;
-    *source.Add() = "1";
-    *source.Add() = "2";
-    RepeatedPtrField<std::string> destination;
-    *destination.Add() = "3";
-    const std::string* const* source_data = source.data();
-    const std::string* const* destination_data = destination.data();
-    destination = std::move(source);
-    EXPECT_EQ(source_data, destination.data());
-    EXPECT_THAT(destination, ElementsAre("1", "2"));
-    // This property isn't guaranteed but it's useful to have a test that would
-    // catch changes in this area.
-    EXPECT_EQ(destination_data, source.data());
-    EXPECT_THAT(source, ElementsAre("3"));
-  }
-  {
-    Arena arena;
-    RepeatedPtrField<std::string>* source =
-        Arena::CreateMessage<RepeatedPtrField<std::string>>(&arena);
-    *source->Add() = "1";
-    *source->Add() = "2";
-    RepeatedPtrField<std::string>* destination =
-        Arena::CreateMessage<RepeatedPtrField<std::string>>(&arena);
-    *destination->Add() = "3";
-    const std::string* const* source_data = source->data();
-    const std::string* const* destination_data = destination->data();
-    *destination = std::move(*source);
-    EXPECT_EQ(source_data, destination->data());
-    EXPECT_THAT(*destination, ElementsAre("1", "2"));
-    // This property isn't guaranteed but it's useful to have a test that would
-    // catch changes in this area.
-    EXPECT_EQ(destination_data, source->data());
-    EXPECT_THAT(*source, ElementsAre("3"));
-  }
-  {
-    Arena source_arena;
-    RepeatedPtrField<std::string>* source =
-        Arena::CreateMessage<RepeatedPtrField<std::string>>(&source_arena);
-    *source->Add() = "1";
-    *source->Add() = "2";
-    Arena destination_arena;
-    RepeatedPtrField<std::string>* destination =
-        Arena::CreateMessage<RepeatedPtrField<std::string>>(&destination_arena);
-    *destination->Add() = "3";
-    *destination = std::move(*source);
-    EXPECT_THAT(*destination, ElementsAre("1", "2"));
-    // This property isn't guaranteed but it's useful to have a test that would
-    // catch changes in this area.
-    EXPECT_THAT(*source, ElementsAre("1", "2"));
-  }
-  {
-    Arena arena;
-    RepeatedPtrField<std::string>* source =
-        Arena::CreateMessage<RepeatedPtrField<std::string>>(&arena);
-    *source->Add() = "1";
-    *source->Add() = "2";
-    RepeatedPtrField<std::string> destination;
-    *destination.Add() = "3";
-    destination = std::move(*source);
-    EXPECT_THAT(destination, ElementsAre("1", "2"));
-    // This property isn't guaranteed but it's useful to have a test that would
-    // catch changes in this area.
-    EXPECT_THAT(*source, ElementsAre("1", "2"));
-  }
-  {
-    RepeatedPtrField<std::string> source;
-    *source.Add() = "1";
-    *source.Add() = "2";
-    Arena arena;
-    RepeatedPtrField<std::string>* destination =
-        Arena::CreateMessage<RepeatedPtrField<std::string>>(&arena);
-    *destination->Add() = "3";
-    *destination = std::move(source);
-    EXPECT_THAT(*destination, ElementsAre("1", "2"));
-    // This property isn't guaranteed but it's useful to have a test that would
-    // catch changes in this area.
-    EXPECT_THAT(source, ElementsAre("1", "2"));
-  }
-  {
-    RepeatedPtrField<std::string> field;
-    // An alias to defeat -Wself-move.
-    RepeatedPtrField<std::string>& alias = field;
-    *field.Add() = "1";
-    *field.Add() = "2";
-    const std::string* const* data = field.data();
-    field = std::move(alias);
-    EXPECT_EQ(data, field.data());
-    EXPECT_THAT(field, ElementsAre("1", "2"));
-  }
-  {
-    Arena arena;
-    RepeatedPtrField<std::string>* field =
-        Arena::CreateMessage<RepeatedPtrField<std::string>>(&arena);
-    *field->Add() = "1";
-    *field->Add() = "2";
-    const std::string* const* data = field->data();
-    *field = std::move(*field);
-    EXPECT_EQ(data, field->data());
-    EXPECT_THAT(*field, ElementsAre("1", "2"));
-  }
-}
-
-TEST(RepeatedPtrField, MutableDataIsMutable) {
-  RepeatedPtrField<std::string> field;
-  *field.Add() = "1";
-  EXPECT_EQ("1", field.Get(0));
-  // The fact that this line compiles would be enough, but we'll check the
-  // value anyway.
-  std::string** data = field.mutable_data();
-  **data = "2";
-  EXPECT_EQ("2", field.Get(0));
-}
-
-TEST(RepeatedPtrField, SubscriptOperators) {
-  RepeatedPtrField<std::string> field;
-  *field.Add() = "1";
-  EXPECT_EQ("1", field.Get(0));
-  EXPECT_EQ("1", field[0]);
-  EXPECT_EQ(field.Mutable(0), &field[0]);
-  const RepeatedPtrField<std::string>& const_field = field;
-  EXPECT_EQ(*field.data(), &const_field[0]);
-}
-
-TEST(RepeatedPtrField, ExtractSubrange) {
-  // Exhaustively test every subrange in arrays of all sizes from 0 through 9
-  // with 0 through 3 cleared elements at the end.
-  for (int sz = 0; sz < 10; ++sz) {
-    for (int num = 0; num <= sz; ++num) {
-      for (int start = 0; start < sz - num; ++start) {
-        for (int extra = 0; extra < 4; ++extra) {
-          std::vector<std::string*> subject;
-
-          // Create an array with "sz" elements and "extra" cleared elements.
-          // Use an arena to avoid copies from debug-build stability checks.
-          Arena arena;
-          RepeatedPtrField<std::string> field(&arena);
-          for (int i = 0; i < sz + extra; ++i) {
-            subject.push_back(new std::string());
-            field.AddAllocated(subject[i]);
-          }
-          EXPECT_EQ(field.size(), sz + extra);
-          for (int i = 0; i < extra; ++i) field.RemoveLast();
-          EXPECT_EQ(field.size(), sz);
-          EXPECT_EQ(field.ClearedCount(), extra);
-
-          // Create a catcher array and call ExtractSubrange.
-          std::string* catcher[10];
-          for (int i = 0; i < 10; ++i) catcher[i] = nullptr;
-          field.ExtractSubrange(start, num, catcher);
-
-          // Does the resulting array have the right size?
-          EXPECT_EQ(field.size(), sz - num);
-
-          // Were the removed elements extracted into the catcher array?
-          for (int i = 0; i < num; ++i)
-            EXPECT_EQ(*catcher[i], *subject[start + i]);
-          EXPECT_EQ(nullptr, catcher[num]);
-
-          // Does the resulting array contain the right values?
-          for (int i = 0; i < start; ++i)
-            EXPECT_EQ(field.Mutable(i), subject[i]);
-          for (int i = start; i < field.size(); ++i)
-            EXPECT_EQ(field.Mutable(i), subject[i + num]);
-
-          // Reinstate the cleared elements.
-          EXPECT_EQ(field.ClearedCount(), extra);
-          for (int i = 0; i < extra; ++i) field.Add();
-          EXPECT_EQ(field.ClearedCount(), 0);
-          EXPECT_EQ(field.size(), sz - num + extra);
-
-          // Make sure the extra elements are all there (in some order).
-          for (int i = sz; i < sz + extra; ++i) {
-            int count = 0;
-            for (int j = sz; j < sz + extra; ++j) {
-              if (field.Mutable(j - num) == subject[i]) count += 1;
-            }
-            EXPECT_EQ(count, 1);
-          }
-
-          // Release the caught elements.
-          for (int i = 0; i < num; ++i) delete catcher[i];
-        }
-      }
-    }
-  }
-}
-
-TEST(RepeatedPtrField, DeleteSubrange) {
-  // DeleteSubrange is a trivial extension of ExtendSubrange.
-}
-
-// ===================================================================
-
-// Iterator tests stolen from net/proto/proto-array_unittest.
-class RepeatedFieldIteratorTest : public testing::Test {
- protected:
-  void SetUp() override {
-    for (int i = 0; i < 3; ++i) {
-      proto_array_.Add(i);
-    }
-  }
-
-  RepeatedField<int> proto_array_;
-};
-
-TEST_F(RepeatedFieldIteratorTest, Convertible) {
-  RepeatedField<int>::iterator iter = proto_array_.begin();
-  RepeatedField<int>::const_iterator c_iter = iter;
-  RepeatedField<int>::value_type value = *c_iter;
-  EXPECT_EQ(0, value);
-}
-
-TEST_F(RepeatedFieldIteratorTest, MutableIteration) {
-  RepeatedField<int>::iterator iter = proto_array_.begin();
-  EXPECT_EQ(0, *iter);
-  ++iter;
-  EXPECT_EQ(1, *iter++);
-  EXPECT_EQ(2, *iter);
-  ++iter;
-  EXPECT_TRUE(proto_array_.end() == iter);
-
-  EXPECT_EQ(2, *(proto_array_.end() - 1));
-}
-
-TEST_F(RepeatedFieldIteratorTest, ConstIteration) {
-  const RepeatedField<int>& const_proto_array = proto_array_;
-  RepeatedField<int>::const_iterator iter = const_proto_array.begin();
-  EXPECT_EQ(0, *iter);
-  ++iter;
-  EXPECT_EQ(1, *iter++);
-  EXPECT_EQ(2, *iter);
-  ++iter;
-  EXPECT_TRUE(const_proto_array.end() == iter);
-  EXPECT_EQ(2, *(const_proto_array.end() - 1));
-}
-
-TEST_F(RepeatedFieldIteratorTest, Mutation) {
-  RepeatedField<int>::iterator iter = proto_array_.begin();
-  *iter = 7;
-  EXPECT_EQ(7, proto_array_.Get(0));
-}
-
-// -------------------------------------------------------------------
-
-class RepeatedPtrFieldIteratorTest : public testing::Test {
- protected:
-  void SetUp() override {
-    proto_array_.Add()->assign("foo");
-    proto_array_.Add()->assign("bar");
-    proto_array_.Add()->assign("baz");
-  }
-
-  RepeatedPtrField<std::string> proto_array_;
-};
-
-TEST_F(RepeatedPtrFieldIteratorTest, Convertible) {
-  RepeatedPtrField<std::string>::iterator iter = proto_array_.begin();
-  RepeatedPtrField<std::string>::const_iterator c_iter = iter;
-  RepeatedPtrField<std::string>::value_type value = *c_iter;
-  EXPECT_EQ("foo", value);
-}
-
-TEST_F(RepeatedPtrFieldIteratorTest, MutableIteration) {
-  RepeatedPtrField<std::string>::iterator iter = proto_array_.begin();
-  EXPECT_EQ("foo", *iter);
-  ++iter;
-  EXPECT_EQ("bar", *(iter++));
-  EXPECT_EQ("baz", *iter);
-  ++iter;
-  EXPECT_TRUE(proto_array_.end() == iter);
-  EXPECT_EQ("baz", *(--proto_array_.end()));
-}
-
-TEST_F(RepeatedPtrFieldIteratorTest, ConstIteration) {
-  const RepeatedPtrField<std::string>& const_proto_array = proto_array_;
-  RepeatedPtrField<std::string>::const_iterator iter =
-      const_proto_array.begin();
-  iter - const_proto_array.cbegin();
-  EXPECT_EQ("foo", *iter);
-  ++iter;
-  EXPECT_EQ("bar", *(iter++));
-  EXPECT_EQ("baz", *iter);
-  ++iter;
-  EXPECT_TRUE(const_proto_array.end() == iter);
-  EXPECT_EQ("baz", *(--const_proto_array.end()));
-}
-
-TEST_F(RepeatedPtrFieldIteratorTest, MutableReverseIteration) {
-  RepeatedPtrField<std::string>::reverse_iterator iter = proto_array_.rbegin();
-  EXPECT_EQ("baz", *iter);
-  ++iter;
-  EXPECT_EQ("bar", *(iter++));
-  EXPECT_EQ("foo", *iter);
-  ++iter;
-  EXPECT_TRUE(proto_array_.rend() == iter);
-  EXPECT_EQ("foo", *(--proto_array_.rend()));
-}
-
-TEST_F(RepeatedPtrFieldIteratorTest, ConstReverseIteration) {
-  const RepeatedPtrField<std::string>& const_proto_array = proto_array_;
-  RepeatedPtrField<std::string>::const_reverse_iterator iter =
-      const_proto_array.rbegin();
-  EXPECT_EQ("baz", *iter);
-  ++iter;
-  EXPECT_EQ("bar", *(iter++));
-  EXPECT_EQ("foo", *iter);
-  ++iter;
-  EXPECT_TRUE(const_proto_array.rend() == iter);
-  EXPECT_EQ("foo", *(--const_proto_array.rend()));
-}
-
-TEST_F(RepeatedPtrFieldIteratorTest, RandomAccess) {
-  RepeatedPtrField<std::string>::iterator iter = proto_array_.begin();
-  RepeatedPtrField<std::string>::iterator iter2 = iter;
-  ++iter2;
-  ++iter2;
-  EXPECT_TRUE(iter + 2 == iter2);
-  EXPECT_TRUE(iter == iter2 - 2);
-  EXPECT_EQ("baz", iter[2]);
-  EXPECT_EQ("baz", *(iter + 2));
-  EXPECT_EQ(3, proto_array_.end() - proto_array_.begin());
-}
-
-TEST_F(RepeatedPtrFieldIteratorTest, RandomAccessConst) {
-  RepeatedPtrField<std::string>::const_iterator iter = proto_array_.cbegin();
-  RepeatedPtrField<std::string>::const_iterator iter2 = iter;
-  ++iter2;
-  ++iter2;
-  EXPECT_TRUE(iter + 2 == iter2);
-  EXPECT_TRUE(iter == iter2 - 2);
-  EXPECT_EQ("baz", iter[2]);
-  EXPECT_EQ("baz", *(iter + 2));
-  EXPECT_EQ(3, proto_array_.cend() - proto_array_.cbegin());
-}
-
-TEST_F(RepeatedPtrFieldIteratorTest, DifferenceConstConversion) {
-  EXPECT_EQ(3, proto_array_.end() - proto_array_.cbegin());
-  EXPECT_EQ(3, proto_array_.cend() - proto_array_.begin());
-}
-
-TEST_F(RepeatedPtrFieldIteratorTest, Comparable) {
-  RepeatedPtrField<std::string>::const_iterator iter = proto_array_.begin();
-  RepeatedPtrField<std::string>::const_iterator iter2 = iter + 1;
-  EXPECT_TRUE(iter == iter);
-  EXPECT_TRUE(iter != iter2);
-  EXPECT_TRUE(iter < iter2);
-  EXPECT_TRUE(iter <= iter2);
-  EXPECT_TRUE(iter <= iter);
-  EXPECT_TRUE(iter2 > iter);
-  EXPECT_TRUE(iter2 >= iter);
-  EXPECT_TRUE(iter >= iter);
-}
-
-TEST_F(RepeatedPtrFieldIteratorTest, ComparableConstConversion) {
-  RepeatedPtrField<std::string>::iterator iter = proto_array_.begin();
-  RepeatedPtrField<std::string>::const_iterator iter2 = iter + 1;
-  EXPECT_TRUE(iter == iter);
-  EXPECT_TRUE(iter == proto_array_.cbegin());
-  EXPECT_TRUE(proto_array_.cbegin() == iter);
-  EXPECT_TRUE(iter != iter2);
-  EXPECT_TRUE(iter2 != iter);
-  EXPECT_TRUE(iter < iter2);
-  EXPECT_TRUE(iter <= iter2);
-  EXPECT_TRUE(iter <= iter);
-  EXPECT_TRUE(iter2 > iter);
-  EXPECT_TRUE(iter2 >= iter);
-  EXPECT_TRUE(iter >= iter);
-}
-
-// Uninitialized iterator does not point to any of the RepeatedPtrField.
-TEST_F(RepeatedPtrFieldIteratorTest, UninitializedIterator) {
-  RepeatedPtrField<std::string>::iterator iter;
-  EXPECT_TRUE(iter != proto_array_.begin());
-  EXPECT_TRUE(iter != proto_array_.begin() + 1);
-  EXPECT_TRUE(iter != proto_array_.begin() + 2);
-  EXPECT_TRUE(iter != proto_array_.begin() + 3);
-  EXPECT_TRUE(iter != proto_array_.end());
-}
-
-TEST_F(RepeatedPtrFieldIteratorTest, STLAlgorithms_lower_bound) {
-  proto_array_.Clear();
-  proto_array_.Add()->assign("a");
-  proto_array_.Add()->assign("c");
-  proto_array_.Add()->assign("d");
-  proto_array_.Add()->assign("n");
-  proto_array_.Add()->assign("p");
-  proto_array_.Add()->assign("x");
-  proto_array_.Add()->assign("y");
-
-  std::string v = "f";
-  RepeatedPtrField<std::string>::const_iterator it =
-      std::lower_bound(proto_array_.begin(), proto_array_.end(), v);
-
-  EXPECT_EQ(*it, "n");
-  EXPECT_TRUE(it == proto_array_.begin() + 3);
-}
-
-TEST_F(RepeatedPtrFieldIteratorTest, Mutation) {
-  RepeatedPtrField<std::string>::iterator iter = proto_array_.begin();
-  *iter = "moo";
-  EXPECT_EQ("moo", proto_array_.Get(0));
-}
-
-// -------------------------------------------------------------------
-
-class RepeatedPtrFieldPtrsIteratorTest : public testing::Test {
- protected:
-  void SetUp() override {
-    proto_array_.Add()->assign("foo");
-    proto_array_.Add()->assign("bar");
-    proto_array_.Add()->assign("baz");
-    const_proto_array_ = &proto_array_;
-  }
-
-  RepeatedPtrField<std::string> proto_array_;
-  const RepeatedPtrField<std::string>* const_proto_array_;
-};
-
-TEST_F(RepeatedPtrFieldPtrsIteratorTest, ConvertiblePtr) {
-  RepeatedPtrField<std::string>::pointer_iterator iter =
-      proto_array_.pointer_begin();
-  static_cast<void>(iter);
-}
-
-TEST_F(RepeatedPtrFieldPtrsIteratorTest, ConvertibleConstPtr) {
-  RepeatedPtrField<std::string>::const_pointer_iterator iter =
-      const_proto_array_->pointer_begin();
-  static_cast<void>(iter);
-}
-
-TEST_F(RepeatedPtrFieldPtrsIteratorTest, MutablePtrIteration) {
-  RepeatedPtrField<std::string>::pointer_iterator iter =
-      proto_array_.pointer_begin();
-  EXPECT_EQ("foo", **iter);
-  ++iter;
-  EXPECT_EQ("bar", **(iter++));
-  EXPECT_EQ("baz", **iter);
-  ++iter;
-  EXPECT_TRUE(proto_array_.pointer_end() == iter);
-  EXPECT_EQ("baz", **(--proto_array_.pointer_end()));
-}
-
-TEST_F(RepeatedPtrFieldPtrsIteratorTest, MutableConstPtrIteration) {
-  RepeatedPtrField<std::string>::const_pointer_iterator iter =
-      const_proto_array_->pointer_begin();
-  EXPECT_EQ("foo", **iter);
-  ++iter;
-  EXPECT_EQ("bar", **(iter++));
-  EXPECT_EQ("baz", **iter);
-  ++iter;
-  EXPECT_TRUE(const_proto_array_->pointer_end() == iter);
-  EXPECT_EQ("baz", **(--const_proto_array_->pointer_end()));
-}
-
-TEST_F(RepeatedPtrFieldPtrsIteratorTest, RandomPtrAccess) {
-  RepeatedPtrField<std::string>::pointer_iterator iter =
-      proto_array_.pointer_begin();
-  RepeatedPtrField<std::string>::pointer_iterator iter2 = iter;
-  ++iter2;
-  ++iter2;
-  EXPECT_TRUE(iter + 2 == iter2);
-  EXPECT_TRUE(iter == iter2 - 2);
-  EXPECT_EQ("baz", *iter[2]);
-  EXPECT_EQ("baz", **(iter + 2));
-  EXPECT_EQ(3, proto_array_.end() - proto_array_.begin());
-}
-
-TEST_F(RepeatedPtrFieldPtrsIteratorTest, RandomConstPtrAccess) {
-  RepeatedPtrField<std::string>::const_pointer_iterator iter =
-      const_proto_array_->pointer_begin();
-  RepeatedPtrField<std::string>::const_pointer_iterator iter2 = iter;
-  ++iter2;
-  ++iter2;
-  EXPECT_TRUE(iter + 2 == iter2);
-  EXPECT_TRUE(iter == iter2 - 2);
-  EXPECT_EQ("baz", *iter[2]);
-  EXPECT_EQ("baz", **(iter + 2));
-  EXPECT_EQ(3, const_proto_array_->end() - const_proto_array_->begin());
-}
-
-TEST_F(RepeatedPtrFieldPtrsIteratorTest, DifferenceConstConversion) {
-  EXPECT_EQ(3,
-            proto_array_.pointer_end() - const_proto_array_->pointer_begin());
-  EXPECT_EQ(3,
-            const_proto_array_->pointer_end() - proto_array_.pointer_begin());
-}
-
-TEST_F(RepeatedPtrFieldPtrsIteratorTest, ComparablePtr) {
-  RepeatedPtrField<std::string>::pointer_iterator iter =
-      proto_array_.pointer_begin();
-  RepeatedPtrField<std::string>::pointer_iterator iter2 = iter + 1;
-  EXPECT_TRUE(iter == iter);
-  EXPECT_TRUE(iter != iter2);
-  EXPECT_TRUE(iter < iter2);
-  EXPECT_TRUE(iter <= iter2);
-  EXPECT_TRUE(iter <= iter);
-  EXPECT_TRUE(iter2 > iter);
-  EXPECT_TRUE(iter2 >= iter);
-  EXPECT_TRUE(iter >= iter);
-}
-
-TEST_F(RepeatedPtrFieldPtrsIteratorTest, ComparableConstPtr) {
-  RepeatedPtrField<std::string>::const_pointer_iterator iter =
-      const_proto_array_->pointer_begin();
-  RepeatedPtrField<std::string>::const_pointer_iterator iter2 = iter + 1;
-  EXPECT_TRUE(iter == iter);
-  EXPECT_TRUE(iter != iter2);
-  EXPECT_TRUE(iter < iter2);
-  EXPECT_TRUE(iter <= iter2);
-  EXPECT_TRUE(iter <= iter);
-  EXPECT_TRUE(iter2 > iter);
-  EXPECT_TRUE(iter2 >= iter);
-  EXPECT_TRUE(iter >= iter);
-}
-
-TEST_F(RepeatedPtrFieldPtrsIteratorTest, ComparableConstConversion) {
-  RepeatedPtrField<std::string>::pointer_iterator iter =
-      proto_array_.pointer_begin();
-  RepeatedPtrField<std::string>::const_pointer_iterator iter2 = iter + 1;
-  EXPECT_TRUE(iter == iter);
-  EXPECT_TRUE(iter == const_proto_array_->pointer_begin());
-  EXPECT_TRUE(const_proto_array_->pointer_begin() == iter);
-  EXPECT_TRUE(iter != iter2);
-  EXPECT_TRUE(iter2 != iter);
-  EXPECT_TRUE(iter < iter2);
-  EXPECT_TRUE(iter <= iter2);
-  EXPECT_TRUE(iter <= iter);
-  EXPECT_TRUE(iter2 > iter);
-  EXPECT_TRUE(iter2 >= iter);
-  EXPECT_TRUE(iter >= iter);
-}
-
-// Uninitialized iterator does not point to any of the RepeatedPtrOverPtrs.
-// Dereferencing an uninitialized iterator crashes the process.
-TEST_F(RepeatedPtrFieldPtrsIteratorTest, UninitializedPtrIterator) {
-  RepeatedPtrField<std::string>::pointer_iterator iter;
-  EXPECT_TRUE(iter != proto_array_.pointer_begin());
-  EXPECT_TRUE(iter != proto_array_.pointer_begin() + 1);
-  EXPECT_TRUE(iter != proto_array_.pointer_begin() + 2);
-  EXPECT_TRUE(iter != proto_array_.pointer_begin() + 3);
-  EXPECT_TRUE(iter != proto_array_.pointer_end());
-}
-
-TEST_F(RepeatedPtrFieldPtrsIteratorTest, UninitializedConstPtrIterator) {
-  RepeatedPtrField<std::string>::const_pointer_iterator iter;
-  EXPECT_TRUE(iter != const_proto_array_->pointer_begin());
-  EXPECT_TRUE(iter != const_proto_array_->pointer_begin() + 1);
-  EXPECT_TRUE(iter != const_proto_array_->pointer_begin() + 2);
-  EXPECT_TRUE(iter != const_proto_array_->pointer_begin() + 3);
-  EXPECT_TRUE(iter != const_proto_array_->pointer_end());
-}
-
-// This comparison functor is required by the tests for RepeatedPtrOverPtrs.
-// They operate on strings and need to compare strings as strings in
-// any stl algorithm, even though the iterator returns a pointer to a
-// string
-// - i.e. *iter has type std::string*.
-struct StringLessThan {
-  bool operator()(const std::string* z, const std::string* y) const {
-    return *z < *y;
-  }
-};
-
-TEST_F(RepeatedPtrFieldPtrsIteratorTest, PtrSTLAlgorithms_lower_bound) {
-  proto_array_.Clear();
-  proto_array_.Add()->assign("a");
-  proto_array_.Add()->assign("c");
-  proto_array_.Add()->assign("d");
-  proto_array_.Add()->assign("n");
-  proto_array_.Add()->assign("p");
-  proto_array_.Add()->assign("x");
-  proto_array_.Add()->assign("y");
-
-  {
-    std::string v = "f";
-    RepeatedPtrField<std::string>::pointer_iterator it =
-        std::lower_bound(proto_array_.pointer_begin(),
-                         proto_array_.pointer_end(), &v, StringLessThan());
-
-    GOOGLE_CHECK(*it != nullptr);
-
-    EXPECT_EQ(**it, "n");
-    EXPECT_TRUE(it == proto_array_.pointer_begin() + 3);
-  }
-  {
-    std::string v = "f";
-    RepeatedPtrField<std::string>::const_pointer_iterator it = std::lower_bound(
-        const_proto_array_->pointer_begin(), const_proto_array_->pointer_end(),
-        &v, StringLessThan());
-
-    GOOGLE_CHECK(*it != nullptr);
-
-    EXPECT_EQ(**it, "n");
-    EXPECT_TRUE(it == const_proto_array_->pointer_begin() + 3);
-  }
-}
-
-TEST_F(RepeatedPtrFieldPtrsIteratorTest, PtrMutation) {
-  RepeatedPtrField<std::string>::pointer_iterator iter =
-      proto_array_.pointer_begin();
-  **iter = "moo";
-  EXPECT_EQ("moo", proto_array_.Get(0));
-
-  EXPECT_EQ("bar", proto_array_.Get(1));
-  EXPECT_EQ("baz", proto_array_.Get(2));
-  ++iter;
-  delete *iter;
-  *iter = new std::string("a");
-  ++iter;
-  delete *iter;
-  *iter = new std::string("b");
-  EXPECT_EQ("a", proto_array_.Get(1));
-  EXPECT_EQ("b", proto_array_.Get(2));
-}
-
-TEST_F(RepeatedPtrFieldPtrsIteratorTest, Sort) {
-  proto_array_.Add()->assign("c");
-  proto_array_.Add()->assign("d");
-  proto_array_.Add()->assign("n");
-  proto_array_.Add()->assign("p");
-  proto_array_.Add()->assign("a");
-  proto_array_.Add()->assign("y");
-  proto_array_.Add()->assign("x");
-  EXPECT_EQ("foo", proto_array_.Get(0));
-  EXPECT_EQ("n", proto_array_.Get(5));
-  EXPECT_EQ("x", proto_array_.Get(9));
-  std::sort(proto_array_.pointer_begin(), proto_array_.pointer_end(),
-            StringLessThan());
-  EXPECT_EQ("a", proto_array_.Get(0));
-  EXPECT_EQ("baz", proto_array_.Get(2));
-  EXPECT_EQ("y", proto_array_.Get(9));
-}
-
-// -----------------------------------------------------------------------------
-// Unit-tests for the insert iterators
-// google::protobuf::RepeatedFieldBackInserter,
-// google::protobuf::AllocatedRepeatedPtrFieldBackInserter
-// Ported from util/gtl/proto-array-iterators_unittest.
-
-class RepeatedFieldInsertionIteratorsTest : public testing::Test {
- protected:
-  std::list<double> halves;
-  std::list<int> fibonacci;
-  std::vector<std::string> words;
-  typedef TestAllTypes::NestedMessage Nested;
-  Nested nesteds[2];
-  std::vector<Nested*> nested_ptrs;
-  TestAllTypes protobuffer;
-
-  void SetUp() override {
-    fibonacci.push_back(1);
-    fibonacci.push_back(1);
-    fibonacci.push_back(2);
-    fibonacci.push_back(3);
-    fibonacci.push_back(5);
-    fibonacci.push_back(8);
-    std::copy(fibonacci.begin(), fibonacci.end(),
-              RepeatedFieldBackInserter(protobuffer.mutable_repeated_int32()));
-
-    halves.push_back(1.0);
-    halves.push_back(0.5);
-    halves.push_back(0.25);
-    halves.push_back(0.125);
-    halves.push_back(0.0625);
-    std::copy(halves.begin(), halves.end(),
-              RepeatedFieldBackInserter(protobuffer.mutable_repeated_double()));
-
-    words.push_back("Able");
-    words.push_back("was");
-    words.push_back("I");
-    words.push_back("ere");
-    words.push_back("I");
-    words.push_back("saw");
-    words.push_back("Elba");
-    std::copy(words.begin(), words.end(),
-              RepeatedFieldBackInserter(protobuffer.mutable_repeated_string()));
-
-    nesteds[0].set_bb(17);
-    nesteds[1].set_bb(4711);
-    std::copy(&nesteds[0], &nesteds[2],
-              RepeatedFieldBackInserter(
-                  protobuffer.mutable_repeated_nested_message()));
-
-    nested_ptrs.push_back(new Nested);
-    nested_ptrs.back()->set_bb(170);
-    nested_ptrs.push_back(new Nested);
-    nested_ptrs.back()->set_bb(47110);
-    std::copy(nested_ptrs.begin(), nested_ptrs.end(),
-              RepeatedFieldBackInserter(
-                  protobuffer.mutable_repeated_nested_message()));
-  }
-
-  void TearDown() override {
-    for (auto ptr : nested_ptrs) {
-      delete ptr;
-    }
-  }
-};
-
-TEST_F(RepeatedFieldInsertionIteratorsTest, Fibonacci) {
-  EXPECT_TRUE(std::equal(fibonacci.begin(), fibonacci.end(),
-                         protobuffer.repeated_int32().begin()));
-  EXPECT_TRUE(std::equal(protobuffer.repeated_int32().begin(),
-                         protobuffer.repeated_int32().end(),
-                         fibonacci.begin()));
-}
-
-TEST_F(RepeatedFieldInsertionIteratorsTest, Halves) {
-  EXPECT_TRUE(std::equal(halves.begin(), halves.end(),
-                         protobuffer.repeated_double().begin()));
-  EXPECT_TRUE(std::equal(protobuffer.repeated_double().begin(),
-                         protobuffer.repeated_double().end(), halves.begin()));
-}
-
-TEST_F(RepeatedFieldInsertionIteratorsTest, Words) {
-  ASSERT_EQ(words.size(), protobuffer.repeated_string_size());
-  for (int i = 0; i < words.size(); ++i)
-    EXPECT_EQ(words.at(i), protobuffer.repeated_string(i));
-}
-
-TEST_F(RepeatedFieldInsertionIteratorsTest, Words2) {
-  words.clear();
-  words.push_back("sing");
-  words.push_back("a");
-  words.push_back("song");
-  words.push_back("of");
-  words.push_back("six");
-  words.push_back("pence");
-  protobuffer.mutable_repeated_string()->Clear();
-  std::copy(
-      words.begin(), words.end(),
-      RepeatedPtrFieldBackInserter(protobuffer.mutable_repeated_string()));
-  ASSERT_EQ(words.size(), protobuffer.repeated_string_size());
-  for (int i = 0; i < words.size(); ++i)
-    EXPECT_EQ(words.at(i), protobuffer.repeated_string(i));
-}
-
-TEST_F(RepeatedFieldInsertionIteratorsTest, Nesteds) {
-  ASSERT_EQ(protobuffer.repeated_nested_message_size(), 4);
-  EXPECT_EQ(protobuffer.repeated_nested_message(0).bb(), 17);
-  EXPECT_EQ(protobuffer.repeated_nested_message(1).bb(), 4711);
-  EXPECT_EQ(protobuffer.repeated_nested_message(2).bb(), 170);
-  EXPECT_EQ(protobuffer.repeated_nested_message(3).bb(), 47110);
-}
-
-TEST_F(RepeatedFieldInsertionIteratorsTest,
-       AllocatedRepeatedPtrFieldWithStringIntData) {
-  std::vector<Nested*> data;
-  TestAllTypes goldenproto;
-  for (int i = 0; i < 10; ++i) {
-    Nested* new_data = new Nested;
-    new_data->set_bb(i);
-    data.push_back(new_data);
-
-    new_data = goldenproto.add_repeated_nested_message();
-    new_data->set_bb(i);
-  }
-  TestAllTypes testproto;
-  std::copy(data.begin(), data.end(),
-            AllocatedRepeatedPtrFieldBackInserter(
-                testproto.mutable_repeated_nested_message()));
-  EXPECT_EQ(testproto.DebugString(), goldenproto.DebugString());
-}
-
-TEST_F(RepeatedFieldInsertionIteratorsTest,
-       AllocatedRepeatedPtrFieldWithString) {
-  std::vector<std::string*> data;
-  TestAllTypes goldenproto;
-  for (int i = 0; i < 10; ++i) {
-    std::string* new_data = new std::string;
-    *new_data = "name-" + StrCat(i);
-    data.push_back(new_data);
-
-    new_data = goldenproto.add_repeated_string();
-    *new_data = "name-" + StrCat(i);
-  }
-  TestAllTypes testproto;
-  std::copy(data.begin(), data.end(),
-            AllocatedRepeatedPtrFieldBackInserter(
-                testproto.mutable_repeated_string()));
-  EXPECT_EQ(testproto.DebugString(), goldenproto.DebugString());
-}
-
-TEST_F(RepeatedFieldInsertionIteratorsTest,
-       UnsafeArenaAllocatedRepeatedPtrFieldWithStringIntData) {
-  std::vector<Nested*> data;
-  Arena arena;
-  auto* goldenproto = Arena::CreateMessage<TestAllTypes>(&arena);
-  for (int i = 0; i < 10; ++i) {
-    auto* new_data = goldenproto->add_repeated_nested_message();
-    new_data->set_bb(i);
-    data.push_back(new_data);
-  }
-  auto* testproto = Arena::CreateMessage<TestAllTypes>(&arena);
-  std::copy(data.begin(), data.end(),
-            UnsafeArenaAllocatedRepeatedPtrFieldBackInserter(
-                testproto->mutable_repeated_nested_message()));
-  EXPECT_EQ(testproto->DebugString(), goldenproto->DebugString());
-}
-
-TEST_F(RepeatedFieldInsertionIteratorsTest,
-       UnsafeArenaAllocatedRepeatedPtrFieldWithString) {
-  std::vector<std::string*> data;
-  Arena arena;
-  auto* goldenproto = Arena::CreateMessage<TestAllTypes>(&arena);
-  for (int i = 0; i < 10; ++i) {
-    auto* new_data = goldenproto->add_repeated_string();
-    *new_data = "name-" + StrCat(i);
-    data.push_back(new_data);
-  }
-  auto* testproto = Arena::CreateMessage<TestAllTypes>(&arena);
-  std::copy(data.begin(), data.end(),
-            UnsafeArenaAllocatedRepeatedPtrFieldBackInserter(
-                testproto->mutable_repeated_string()));
-  EXPECT_EQ(testproto->DebugString(), goldenproto->DebugString());
-}
-
-TEST_F(RepeatedFieldInsertionIteratorsTest, MoveStrings) {
-  std::vector<std::string> src = {"a", "b", "c", "d"};
-  std::vector<std::string> copy =
-      src;  // copy since move leaves in undefined state
-  TestAllTypes testproto;
-  std::move(copy.begin(), copy.end(),
-            RepeatedFieldBackInserter(testproto.mutable_repeated_string()));
-
-  ASSERT_THAT(testproto.repeated_string(), testing::ElementsAreArray(src));
-}
-
-TEST_F(RepeatedFieldInsertionIteratorsTest, MoveProtos) {
-  auto make_nested = [](int32_t x) {
-    Nested ret;
-    ret.set_bb(x);
-    return ret;
-  };
-  std::vector<Nested> src = {make_nested(3), make_nested(5), make_nested(7)};
-  std::vector<Nested> copy = src;  // copy since move leaves in undefined state
-  TestAllTypes testproto;
-  std::move(
-      copy.begin(), copy.end(),
-      RepeatedFieldBackInserter(testproto.mutable_repeated_nested_message()));
-
-  ASSERT_EQ(src.size(), testproto.repeated_nested_message_size());
-  for (int i = 0; i < src.size(); ++i) {
-    EXPECT_EQ(src[i].DebugString(),
-              testproto.repeated_nested_message(i).DebugString());
-  }
-}
-
-}  // namespace
-
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
diff --git a/libs/protobuf/src/google/protobuf/repeated_ptr_field.cc b/libs/protobuf/src/google/protobuf/repeated_ptr_field.cc
deleted file mode 100644
index 8e86727..0000000
--- a/libs/protobuf/src/google/protobuf/repeated_ptr_field.cc
+++ /dev/null
@@ -1,152 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-
-#include <algorithm>
-
-#include <google/protobuf/stubs/logging.h>
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/implicit_weak_message.h>
-#include <google/protobuf/repeated_field.h>
-#include <google/protobuf/port.h>
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-
-namespace internal {
-
-void** RepeatedPtrFieldBase::InternalExtend(int extend_amount) {
-  int new_size = current_size_ + extend_amount;
-  if (total_size_ >= new_size) {
-    // N.B.: rep_ is non-nullptr because extend_amount is always > 0, hence
-    // total_size must be non-zero since it is lower-bounded by new_size.
-    return &rep_->elements[current_size_];
-  }
-  Rep* old_rep = rep_;
-  Arena* arena = GetOwningArena();
-  new_size = internal::CalculateReserveSize<void*, kRepHeaderSize>(total_size_,
-                                                                   new_size);
-  GOOGLE_CHECK_LE(static_cast<int64_t>(new_size),
-           static_cast<int64_t>(
-               (std::numeric_limits<size_t>::max() - kRepHeaderSize) /
-               sizeof(old_rep->elements[0])))
-      << "Requested size is too large to fit into size_t.";
-  size_t bytes = kRepHeaderSize + sizeof(old_rep->elements[0]) * new_size;
-  if (arena == nullptr) {
-    rep_ = reinterpret_cast<Rep*>(::operator new(bytes));
-  } else {
-    rep_ = reinterpret_cast<Rep*>(Arena::CreateArray<char>(arena, bytes));
-  }
-  const int old_total_size = total_size_;
-  total_size_ = new_size;
-  if (old_rep) {
-    if (old_rep->allocated_size > 0) {
-      memcpy(rep_->elements, old_rep->elements,
-             old_rep->allocated_size * sizeof(rep_->elements[0]));
-    }
-    rep_->allocated_size = old_rep->allocated_size;
-
-    const size_t old_size =
-        old_total_size * sizeof(rep_->elements[0]) + kRepHeaderSize;
-    if (arena == nullptr) {
-      internal::SizedDelete(old_rep, old_size);
-    } else {
-      arena_->ReturnArrayMemory(old_rep, old_size);
-    }
-  } else {
-    rep_->allocated_size = 0;
-  }
-  return &rep_->elements[current_size_];
-}
-
-void RepeatedPtrFieldBase::Reserve(int new_size) {
-  if (new_size > current_size_) {
-    InternalExtend(new_size - current_size_);
-  }
-}
-
-void RepeatedPtrFieldBase::DestroyProtos() {
-  GOOGLE_DCHECK(rep_);
-  GOOGLE_DCHECK(arena_ == nullptr);
-  int n = rep_->allocated_size;
-  void* const* elements = rep_->elements;
-  for (int i = 0; i < n; i++) {
-    delete static_cast<MessageLite*>(elements[i]);
-  }
-  const size_t size = total_size_ * sizeof(elements[0]) + kRepHeaderSize;
-  internal::SizedDelete(rep_, size);
-  rep_ = nullptr;
-}
-
-void* RepeatedPtrFieldBase::AddOutOfLineHelper(void* obj) {
-  if (!rep_ || rep_->allocated_size == total_size_) {
-    InternalExtend(1);  // Equivalent to "Reserve(total_size_ + 1)"
-  }
-  ++rep_->allocated_size;
-  rep_->elements[current_size_++] = obj;
-  return obj;
-}
-
-void RepeatedPtrFieldBase::CloseGap(int start, int num) {
-  if (rep_ == nullptr) return;
-  // Close up a gap of "num" elements starting at offset "start".
-  for (int i = start + num; i < rep_->allocated_size; ++i)
-    rep_->elements[i - num] = rep_->elements[i];
-  current_size_ -= num;
-  rep_->allocated_size -= num;
-}
-
-MessageLite* RepeatedPtrFieldBase::AddWeak(const MessageLite* prototype) {
-  if (rep_ != nullptr && current_size_ < rep_->allocated_size) {
-    return reinterpret_cast<MessageLite*>(rep_->elements[current_size_++]);
-  }
-  if (!rep_ || rep_->allocated_size == total_size_) {
-    Reserve(total_size_ + 1);
-  }
-  ++rep_->allocated_size;
-  MessageLite* result = prototype
-                            ? prototype->New(arena_)
-                            : Arena::CreateMessage<ImplicitWeakMessage>(arena_);
-  rep_->elements[current_size_++] = result;
-  return result;
-}
-
-}  // namespace internal
-
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
diff --git a/libs/protobuf/src/google/protobuf/repeated_ptr_field.h b/libs/protobuf/src/google/protobuf/repeated_ptr_field.h
deleted file mode 100644
index 401230b..0000000
--- a/libs/protobuf/src/google/protobuf/repeated_ptr_field.h
+++ /dev/null
@@ -1,1970 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-//
-// RepeatedField and RepeatedPtrField are used by generated protocol message
-// classes to manipulate repeated fields.  These classes are very similar to
-// STL's vector, but include a number of optimizations found to be useful
-// specifically in the case of Protocol Buffers.  RepeatedPtrField is
-// particularly different from STL vector as it manages ownership of the
-// pointers that it contains.
-//
-// This header covers RepeatedPtrField.
-
-// IWYU pragma: private, include "net/proto2/public/repeated_field.h"
-
-#ifndef GOOGLE_PROTOBUF_REPEATED_PTR_FIELD_H__
-#define GOOGLE_PROTOBUF_REPEATED_PTR_FIELD_H__
-
-#include <utility>
-
-#ifdef _MSC_VER
-// This is required for min/max on VS2013 only.
-#include <algorithm>
-#endif
-
-#include <iterator>
-#include <limits>
-#include <string>
-#include <type_traits>
-
-#include <google/protobuf/stubs/logging.h>
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/arena.h>
-#include <google/protobuf/port.h>
-#include <google/protobuf/message_lite.h>
-
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-#ifdef SWIG
-#error "You cannot SWIG proto headers"
-#endif
-
-namespace google {
-namespace protobuf {
-
-class Message;
-class Reflection;
-
-template <typename T>
-struct WeakRepeatedPtrField;
-
-namespace internal {
-
-class MergePartialFromCodedStreamHelper;
-class SwapFieldHelper;
-
-
-}  // namespace internal
-
-namespace internal {
-template <typename It>
-class RepeatedPtrIterator;
-template <typename It, typename VoidPtr>
-class RepeatedPtrOverPtrsIterator;
-}  // namespace internal
-
-namespace internal {
-
-// type-traits helper for RepeatedPtrFieldBase: we only want to invoke
-// arena-related "copy if on different arena" behavior if the necessary methods
-// exist on the contained type. In particular, we rely on MergeFrom() existing
-// as a general proxy for the fact that a copy will work, and we also provide a
-// specific override for std::string*.
-template <typename T>
-struct TypeImplementsMergeBehaviorProbeForMergeFrom {
-  typedef char HasMerge;
-  typedef long HasNoMerge;
-
-  // We accept either of:
-  // - void MergeFrom(const T& other)
-  // - bool MergeFrom(const T& other)
-  //
-  // We mangle these names a bit to avoid compatibility issues in 'unclean'
-  // include environments that may have, e.g., "#define test ..." (yes, this
-  // exists).
-  template <typename U, typename RetType, RetType (U::*)(const U& arg)>
-  struct CheckType;
-  template <typename U>
-  static HasMerge Check(CheckType<U, void, &U::MergeFrom>*);
-  template <typename U>
-  static HasMerge Check(CheckType<U, bool, &U::MergeFrom>*);
-  template <typename U>
-  static HasNoMerge Check(...);
-
-  // Resolves to either std::true_type or std::false_type.
-  typedef std::integral_constant<bool,
-                                 (sizeof(Check<T>(0)) == sizeof(HasMerge))>
-      type;
-};
-
-template <typename T, typename = void>
-struct TypeImplementsMergeBehavior
-    : TypeImplementsMergeBehaviorProbeForMergeFrom<T> {};
-
-
-template <>
-struct TypeImplementsMergeBehavior<std::string> {
-  typedef std::true_type type;
-};
-
-template <typename T>
-struct IsMovable
-    : std::integral_constant<bool, std::is_move_constructible<T>::value &&
-                                       std::is_move_assignable<T>::value> {};
-
-// This is the common base class for RepeatedPtrFields.  It deals only in void*
-// pointers.  Users should not use this interface directly.
-//
-// The methods of this interface correspond to the methods of RepeatedPtrField,
-// but may have a template argument called TypeHandler.  Its signature is:
-//   class TypeHandler {
-//    public:
-//     typedef MyType Type;
-//     static Type* New();
-//     static Type* NewFromPrototype(const Type* prototype,
-//                                       Arena* arena);
-//     static void Delete(Type*);
-//     static void Clear(Type*);
-//     static void Merge(const Type& from, Type* to);
-//
-//     // Only needs to be implemented if SpaceUsedExcludingSelf() is called.
-//     static int SpaceUsedLong(const Type&);
-//   };
-class PROTOBUF_EXPORT RepeatedPtrFieldBase {
- protected:
-  constexpr RepeatedPtrFieldBase()
-      : arena_(nullptr), current_size_(0), total_size_(0), rep_(nullptr) {}
-  explicit RepeatedPtrFieldBase(Arena* arena)
-      : arena_(arena), current_size_(0), total_size_(0), rep_(nullptr) {}
-
-  RepeatedPtrFieldBase(const RepeatedPtrFieldBase&) = delete;
-  RepeatedPtrFieldBase& operator=(const RepeatedPtrFieldBase&) = delete;
-
-  ~RepeatedPtrFieldBase() {
-#ifndef NDEBUG
-    // Try to trigger segfault / asan failure in non-opt builds. If arena_
-    // lifetime has ended before the destructor.
-    if (arena_) (void)arena_->SpaceAllocated();
-#endif
-  }
-
-  bool empty() const { return current_size_ == 0; }
-  int size() const { return current_size_; }
-  int Capacity() const { return total_size_; }
-
-  template <typename TypeHandler>
-  const typename TypeHandler::Type& at(int index) const {
-    GOOGLE_CHECK_GE(index, 0);
-    GOOGLE_CHECK_LT(index, current_size_);
-    return *cast<TypeHandler>(rep_->elements[index]);
-  }
-
-  template <typename TypeHandler>
-  typename TypeHandler::Type& at(int index) {
-    GOOGLE_CHECK_GE(index, 0);
-    GOOGLE_CHECK_LT(index, current_size_);
-    return *cast<TypeHandler>(rep_->elements[index]);
-  }
-
-  template <typename TypeHandler>
-  typename TypeHandler::Type* Mutable(int index) {
-    GOOGLE_DCHECK_GE(index, 0);
-    GOOGLE_DCHECK_LT(index, current_size_);
-    return cast<TypeHandler>(rep_->elements[index]);
-  }
-
-  template <typename TypeHandler>
-  typename TypeHandler::Type* Add(
-      const typename TypeHandler::Type* prototype = nullptr) {
-    if (rep_ != nullptr && current_size_ < rep_->allocated_size) {
-      return cast<TypeHandler>(rep_->elements[current_size_++]);
-    }
-    typename TypeHandler::Type* result =
-        TypeHandler::NewFromPrototype(prototype, arena_);
-    return reinterpret_cast<typename TypeHandler::Type*>(
-        AddOutOfLineHelper(result));
-  }
-
-  template <
-      typename TypeHandler,
-      typename std::enable_if<TypeHandler::Movable::value>::type* = nullptr>
-  inline void Add(typename TypeHandler::Type&& value) {
-    if (rep_ != nullptr && current_size_ < rep_->allocated_size) {
-      *cast<TypeHandler>(rep_->elements[current_size_++]) = std::move(value);
-      return;
-    }
-    if (!rep_ || rep_->allocated_size == total_size_) {
-      Reserve(total_size_ + 1);
-    }
-    ++rep_->allocated_size;
-    typename TypeHandler::Type* result =
-        TypeHandler::New(arena_, std::move(value));
-    rep_->elements[current_size_++] = result;
-  }
-
-  template <typename TypeHandler>
-  void Delete(int index) {
-    GOOGLE_DCHECK_GE(index, 0);
-    GOOGLE_DCHECK_LT(index, current_size_);
-    TypeHandler::Delete(cast<TypeHandler>(rep_->elements[index]), arena_);
-  }
-
-  // Must be called from destructor.
-  template <typename TypeHandler>
-  void Destroy() {
-    if (rep_ != nullptr && arena_ == nullptr) {
-      int n = rep_->allocated_size;
-      void* const* elements = rep_->elements;
-      for (int i = 0; i < n; i++) {
-        TypeHandler::Delete(cast<TypeHandler>(elements[i]), nullptr);
-      }
-      const size_t size = total_size_ * sizeof(elements[0]) + kRepHeaderSize;
-      internal::SizedDelete(rep_, size);
-    }
-    rep_ = nullptr;
-  }
-
-  bool NeedsDestroy() const { return rep_ != nullptr && arena_ == nullptr; }
-  void DestroyProtos();  // implemented in the cc file
-
- public:
-  // The next few methods are public so that they can be called from generated
-  // code when implicit weak fields are used, but they should never be called by
-  // application code.
-
-  template <typename TypeHandler>
-  const typename TypeHandler::Type& Get(int index) const {
-    GOOGLE_DCHECK_GE(index, 0);
-    GOOGLE_DCHECK_LT(index, current_size_);
-    return *cast<TypeHandler>(rep_->elements[index]);
-  }
-
-  // Creates and adds an element using the given prototype, without introducing
-  // a link-time dependency on the concrete message type. This method is used to
-  // implement implicit weak fields. The prototype may be nullptr, in which case
-  // an ImplicitWeakMessage will be used as a placeholder.
-  MessageLite* AddWeak(const MessageLite* prototype);
-
-  template <typename TypeHandler>
-  void Clear() {
-    const int n = current_size_;
-    GOOGLE_DCHECK_GE(n, 0);
-    if (n > 0) {
-      void* const* elements = rep_->elements;
-      int i = 0;
-      do {
-        TypeHandler::Clear(cast<TypeHandler>(elements[i++]));
-      } while (i < n);
-      current_size_ = 0;
-    }
-  }
-
-  template <typename TypeHandler>
-  void MergeFrom(const RepeatedPtrFieldBase& other) {
-    // To avoid unnecessary code duplication and reduce binary size, we use a
-    // layered approach to implementing MergeFrom(). The toplevel method is
-    // templated, so we get a small thunk per concrete message type in the
-    // binary. This calls a shared implementation with most of the logic,
-    // passing a function pointer to another type-specific piece of code that
-    // calls the object-allocate and merge handlers.
-    GOOGLE_DCHECK_NE(&other, this);
-    if (other.current_size_ == 0) return;
-    MergeFromInternal(other,
-                      &RepeatedPtrFieldBase::MergeFromInnerLoop<TypeHandler>);
-  }
-
-  inline void InternalSwap(RepeatedPtrFieldBase* rhs) {
-    GOOGLE_DCHECK(this != rhs);
-
-    // Swap all fields at once.
-    auto temp = std::make_tuple(rhs->arena_, rhs->current_size_,
-                                rhs->total_size_, rhs->rep_);
-    std::tie(rhs->arena_, rhs->current_size_, rhs->total_size_, rhs->rep_) =
-        std::make_tuple(arena_, current_size_, total_size_, rep_);
-    std::tie(arena_, current_size_, total_size_, rep_) = temp;
-  }
-
- protected:
-  template <typename TypeHandler>
-  void RemoveLast() {
-    GOOGLE_DCHECK_GT(current_size_, 0);
-    TypeHandler::Clear(cast<TypeHandler>(rep_->elements[--current_size_]));
-  }
-
-  template <typename TypeHandler>
-  void CopyFrom(const RepeatedPtrFieldBase& other) {
-    if (&other == this) return;
-    RepeatedPtrFieldBase::Clear<TypeHandler>();
-    RepeatedPtrFieldBase::MergeFrom<TypeHandler>(other);
-  }
-
-  void CloseGap(int start, int num);  // implemented in the cc file
-
-  void Reserve(int new_size);  // implemented in the cc file
-
-  template <typename TypeHandler>
-  static inline typename TypeHandler::Type* copy(
-      typename TypeHandler::Type* value) {
-    auto* new_value = TypeHandler::NewFromPrototype(value, nullptr);
-    TypeHandler::Merge(*value, new_value);
-    return new_value;
-  }
-
-  // Used for constructing iterators.
-  void* const* raw_data() const { return rep_ ? rep_->elements : nullptr; }
-  void** raw_mutable_data() const {
-    return rep_ ? const_cast<void**>(rep_->elements) : nullptr;
-  }
-
-  template <typename TypeHandler>
-  typename TypeHandler::Type** mutable_data() {
-    // TODO(kenton):  Breaks C++ aliasing rules.  We should probably remove this
-    //   method entirely.
-    return reinterpret_cast<typename TypeHandler::Type**>(raw_mutable_data());
-  }
-
-  template <typename TypeHandler>
-  const typename TypeHandler::Type* const* data() const {
-    // TODO(kenton):  Breaks C++ aliasing rules.  We should probably remove this
-    //   method entirely.
-    return reinterpret_cast<const typename TypeHandler::Type* const*>(
-        raw_data());
-  }
-
-  template <typename TypeHandler>
-  PROTOBUF_NDEBUG_INLINE void Swap(RepeatedPtrFieldBase* other) {
-#ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() != nullptr &&
-        GetOwningArena() == other->GetOwningArena())
-#else   // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() == other->GetOwningArena())
-#endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-    {
-      InternalSwap(other);
-    } else {
-      SwapFallback<TypeHandler>(other);
-    }
-  }
-
-  void SwapElements(int index1, int index2) {
-    using std::swap;  // enable ADL with fallback
-    swap(rep_->elements[index1], rep_->elements[index2]);
-  }
-
-  template <typename TypeHandler>
-  size_t SpaceUsedExcludingSelfLong() const {
-    size_t allocated_bytes = static_cast<size_t>(total_size_) * sizeof(void*);
-    if (rep_ != nullptr) {
-      for (int i = 0; i < rep_->allocated_size; ++i) {
-        allocated_bytes +=
-            TypeHandler::SpaceUsedLong(*cast<TypeHandler>(rep_->elements[i]));
-      }
-      allocated_bytes += kRepHeaderSize;
-    }
-    return allocated_bytes;
-  }
-
-  // Advanced memory management --------------------------------------
-
-  // Like Add(), but if there are no cleared objects to use, returns nullptr.
-  template <typename TypeHandler>
-  typename TypeHandler::Type* AddFromCleared() {
-    if (rep_ != nullptr && current_size_ < rep_->allocated_size) {
-      return cast<TypeHandler>(rep_->elements[current_size_++]);
-    } else {
-      return nullptr;
-    }
-  }
-
-  template <typename TypeHandler>
-  void AddAllocated(typename TypeHandler::Type* value) {
-    typename TypeImplementsMergeBehavior<typename TypeHandler::Type>::type t;
-    AddAllocatedInternal<TypeHandler>(value, t);
-  }
-
-  template <typename TypeHandler>
-  void UnsafeArenaAddAllocated(typename TypeHandler::Type* value) {
-    // Make room for the new pointer.
-    if (!rep_ || current_size_ == total_size_) {
-      // The array is completely full with no cleared objects, so grow it.
-      Reserve(total_size_ + 1);
-      ++rep_->allocated_size;
-    } else if (rep_->allocated_size == total_size_) {
-      // There is no more space in the pointer array because it contains some
-      // cleared objects awaiting reuse.  We don't want to grow the array in
-      // this case because otherwise a loop calling AddAllocated() followed by
-      // Clear() would leak memory.
-      TypeHandler::Delete(cast<TypeHandler>(rep_->elements[current_size_]),
-                          arena_);
-    } else if (current_size_ < rep_->allocated_size) {
-      // We have some cleared objects.  We don't care about their order, so we
-      // can just move the first one to the end to make space.
-      rep_->elements[rep_->allocated_size] = rep_->elements[current_size_];
-      ++rep_->allocated_size;
-    } else {
-      // There are no cleared objects.
-      ++rep_->allocated_size;
-    }
-
-    rep_->elements[current_size_++] = value;
-  }
-
-  template <typename TypeHandler>
-  PROTOBUF_NODISCARD typename TypeHandler::Type* ReleaseLast() {
-    typename TypeImplementsMergeBehavior<typename TypeHandler::Type>::type t;
-    return ReleaseLastInternal<TypeHandler>(t);
-  }
-
-  // Releases and returns the last element, but does not do out-of-arena copy.
-  // Instead, just returns the raw pointer to the contained element in the
-  // arena.
-  template <typename TypeHandler>
-  typename TypeHandler::Type* UnsafeArenaReleaseLast() {
-    GOOGLE_DCHECK_GT(current_size_, 0);
-    typename TypeHandler::Type* result =
-        cast<TypeHandler>(rep_->elements[--current_size_]);
-    --rep_->allocated_size;
-    if (current_size_ < rep_->allocated_size) {
-      // There are cleared elements on the end; replace the removed element
-      // with the last allocated element.
-      rep_->elements[current_size_] = rep_->elements[rep_->allocated_size];
-    }
-    return result;
-  }
-
-  int ClearedCount() const {
-    return rep_ ? (rep_->allocated_size - current_size_) : 0;
-  }
-
-  template <typename TypeHandler>
-  void AddCleared(typename TypeHandler::Type* value) {
-    GOOGLE_DCHECK(GetOwningArena() == nullptr) << "AddCleared() can only be used on a "
-                                           "RepeatedPtrField not on an arena.";
-    GOOGLE_DCHECK(TypeHandler::GetOwningArena(value) == nullptr)
-        << "AddCleared() can only accept values not on an arena.";
-    if (!rep_ || rep_->allocated_size == total_size_) {
-      Reserve(total_size_ + 1);
-    }
-    rep_->elements[rep_->allocated_size++] = value;
-  }
-
-  template <typename TypeHandler>
-  PROTOBUF_NODISCARD typename TypeHandler::Type* ReleaseCleared() {
-    GOOGLE_DCHECK(GetOwningArena() == nullptr)
-        << "ReleaseCleared() can only be used on a RepeatedPtrField not on "
-        << "an arena.";
-    GOOGLE_DCHECK(GetOwningArena() == nullptr);
-    GOOGLE_DCHECK(rep_ != nullptr);
-    GOOGLE_DCHECK_GT(rep_->allocated_size, current_size_);
-    return cast<TypeHandler>(rep_->elements[--rep_->allocated_size]);
-  }
-
-  template <typename TypeHandler>
-  void AddAllocatedInternal(typename TypeHandler::Type* value, std::true_type) {
-    // AddAllocated version that implements arena-safe copying behavior.
-    Arena* element_arena =
-        reinterpret_cast<Arena*>(TypeHandler::GetOwningArena(value));
-    Arena* arena = GetOwningArena();
-    if (arena == element_arena && rep_ && rep_->allocated_size < total_size_) {
-      // Fast path: underlying arena representation (tagged pointer) is equal to
-      // our arena pointer, and we can add to array without resizing it (at
-      // least one slot that is not allocated).
-      void** elems = rep_->elements;
-      if (current_size_ < rep_->allocated_size) {
-        // Make space at [current] by moving first allocated element to end of
-        // allocated list.
-        elems[rep_->allocated_size] = elems[current_size_];
-      }
-      elems[current_size_] = value;
-      current_size_ = current_size_ + 1;
-      rep_->allocated_size = rep_->allocated_size + 1;
-    } else {
-      AddAllocatedSlowWithCopy<TypeHandler>(value, element_arena, arena);
-    }
-  }
-
-  template <typename TypeHandler>
-  void AddAllocatedInternal(
-      // AddAllocated version that does not implement arena-safe copying
-      // behavior.
-      typename TypeHandler::Type* value, std::false_type) {
-    if (rep_ && rep_->allocated_size < total_size_) {
-      // Fast path: underlying arena representation (tagged pointer) is equal to
-      // our arena pointer, and we can add to array without resizing it (at
-      // least one slot that is not allocated).
-      void** elems = rep_->elements;
-      if (current_size_ < rep_->allocated_size) {
-        // Make space at [current] by moving first allocated element to end of
-        // allocated list.
-        elems[rep_->allocated_size] = elems[current_size_];
-      }
-      elems[current_size_] = value;
-      current_size_ = current_size_ + 1;
-      ++rep_->allocated_size;
-    } else {
-      UnsafeArenaAddAllocated<TypeHandler>(value);
-    }
-  }
-
-  // Slowpath handles all cases, copying if necessary.
-  template <typename TypeHandler>
-  PROTOBUF_NOINLINE void AddAllocatedSlowWithCopy(
-      // Pass value_arena and my_arena to avoid duplicate virtual call (value)
-      // or load (mine).
-      typename TypeHandler::Type* value, Arena* value_arena, Arena* my_arena) {
-    // Ensure that either the value is in the same arena, or if not, we do the
-    // appropriate thing: Own() it (if it's on heap and we're in an arena) or
-    // copy it to our arena/heap (otherwise).
-    if (my_arena != nullptr && value_arena == nullptr) {
-      my_arena->Own(value);
-    } else if (my_arena != value_arena) {
-      typename TypeHandler::Type* new_value =
-          TypeHandler::NewFromPrototype(value, my_arena);
-      TypeHandler::Merge(*value, new_value);
-      TypeHandler::Delete(value, value_arena);
-      value = new_value;
-    }
-
-    UnsafeArenaAddAllocated<TypeHandler>(value);
-  }
-
-  template <typename TypeHandler>
-  typename TypeHandler::Type* ReleaseLastInternal(std::true_type) {
-    // ReleaseLast() for types that implement merge/copy behavior.
-    // First, release an element.
-    typename TypeHandler::Type* result = UnsafeArenaReleaseLast<TypeHandler>();
-    // Now perform a copy if we're on an arena.
-    Arena* arena = GetOwningArena();
-
-    typename TypeHandler::Type* new_result;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-    new_result = copy<TypeHandler>(result);
-    if (arena == nullptr) delete result;
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-    new_result = (arena == nullptr) ? result : copy<TypeHandler>(result);
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-    return new_result;
-  }
-
-  template <typename TypeHandler>
-  typename TypeHandler::Type* ReleaseLastInternal(std::false_type) {
-    // ReleaseLast() for types that *do not* implement merge/copy behavior --
-    // this is the same as UnsafeArenaReleaseLast(). Note that we GOOGLE_DCHECK-fail if
-    // we're on an arena, since the user really should implement the copy
-    // operation in this case.
-    GOOGLE_DCHECK(GetOwningArena() == nullptr)
-        << "ReleaseLast() called on a RepeatedPtrField that is on an arena, "
-        << "with a type that does not implement MergeFrom. This is unsafe; "
-        << "please implement MergeFrom for your type.";
-    return UnsafeArenaReleaseLast<TypeHandler>();
-  }
-
-  template <typename TypeHandler>
-  PROTOBUF_NOINLINE void SwapFallback(RepeatedPtrFieldBase* other) {
-#ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    GOOGLE_DCHECK(GetOwningArena() == nullptr ||
-           other->GetOwningArena() != GetOwningArena());
-#else   // PROTOBUF_FORCE_COPY_IN_SWAP
-    GOOGLE_DCHECK(other->GetOwningArena() != GetOwningArena());
-#endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-
-    // Copy semantics in this case. We try to improve efficiency by placing the
-    // temporary on |other|'s arena so that messages are copied twice rather
-    // than three times.
-    RepeatedPtrFieldBase temp(other->GetOwningArena());
-    temp.MergeFrom<TypeHandler>(*this);
-    this->Clear<TypeHandler>();
-    this->MergeFrom<TypeHandler>(*other);
-    other->InternalSwap(&temp);
-    temp.Destroy<TypeHandler>();  // Frees rep_ if `other` had no arena.
-  }
-
-  inline Arena* GetArena() const { return arena_; }
-
- protected:
-  inline Arena* GetOwningArena() const { return arena_; }
-
- private:
-  template <typename T> friend class Arena::InternalHelper;
-
-  static constexpr int kInitialSize = 0;
-  // A few notes on internal representation:
-  //
-  // We use an indirected approach, with struct Rep, to keep
-  // sizeof(RepeatedPtrFieldBase) equivalent to what it was before arena support
-  // was added; namely, 3 8-byte machine words on x86-64. An instance of Rep is
-  // allocated only when the repeated field is non-empty, and it is a
-  // dynamically-sized struct (the header is directly followed by elements[]).
-  // We place arena_ and current_size_ directly in the object to avoid cache
-  // misses due to the indirection, because these fields are checked frequently.
-  // Placing all fields directly in the RepeatedPtrFieldBase instance would cost
-  // significant performance for memory-sensitive workloads.
-  Arena* arena_;
-  int current_size_;
-  int total_size_;
-  struct Rep {
-    int allocated_size;
-    // Here we declare a huge array as a way of approximating C's "flexible
-    // array member" feature without relying on undefined behavior.
-    void* elements[(std::numeric_limits<int>::max() - 2 * sizeof(int)) /
-                   sizeof(void*)];
-  };
-  static constexpr size_t kRepHeaderSize = offsetof(Rep, elements);
-  Rep* rep_;
-
-  template <typename TypeHandler>
-  static inline typename TypeHandler::Type* cast(void* element) {
-    return reinterpret_cast<typename TypeHandler::Type*>(element);
-  }
-  template <typename TypeHandler>
-  static inline const typename TypeHandler::Type* cast(const void* element) {
-    return reinterpret_cast<const typename TypeHandler::Type*>(element);
-  }
-
-  // Non-templated inner function to avoid code duplication. Takes a function
-  // pointer to the type-specific (templated) inner allocate/merge loop.
-  void MergeFromInternal(const RepeatedPtrFieldBase& other,
-                         void (RepeatedPtrFieldBase::*inner_loop)(void**,
-                                                                  void**, int,
-                                                                  int)) {
-    // Note: wrapper has already guaranteed that other.rep_ != nullptr here.
-    int other_size = other.current_size_;
-    void** other_elements = other.rep_->elements;
-    void** new_elements = InternalExtend(other_size);
-    int allocated_elems = rep_->allocated_size - current_size_;
-    (this->*inner_loop)(new_elements, other_elements, other_size,
-                        allocated_elems);
-    current_size_ += other_size;
-    if (rep_->allocated_size < current_size_) {
-      rep_->allocated_size = current_size_;
-    }
-  }
-
-  // Merges other_elems to our_elems.
-  template <typename TypeHandler>
-  PROTOBUF_NOINLINE void MergeFromInnerLoop(void** our_elems,
-                                            void** other_elems, int length,
-                                            int already_allocated) {
-    if (already_allocated < length) {
-      Arena* arena = GetOwningArena();
-      typename TypeHandler::Type* elem_prototype =
-          reinterpret_cast<typename TypeHandler::Type*>(other_elems[0]);
-      for (int i = already_allocated; i < length; i++) {
-        // Allocate a new empty element that we'll merge into below
-        typename TypeHandler::Type* new_elem =
-            TypeHandler::NewFromPrototype(elem_prototype, arena);
-        our_elems[i] = new_elem;
-      }
-    }
-    // Main loop that does the actual merging
-    for (int i = 0; i < length; i++) {
-      // Already allocated: use existing element.
-      typename TypeHandler::Type* other_elem =
-          reinterpret_cast<typename TypeHandler::Type*>(other_elems[i]);
-      typename TypeHandler::Type* new_elem =
-          reinterpret_cast<typename TypeHandler::Type*>(our_elems[i]);
-      TypeHandler::Merge(*other_elem, new_elem);
-    }
-  }
-
-  // Internal helper: extends array space if necessary to contain
-  // |extend_amount| more elements, and returns a pointer to the element
-  // immediately following the old list of elements.  This interface factors out
-  // common behavior from Reserve() and MergeFrom() to reduce code size.
-  // |extend_amount| must be > 0.
-  void** InternalExtend(int extend_amount);
-
-  // Internal helper for Add: adds "obj" as the next element in the
-  // array, including potentially resizing the array with Reserve if
-  // needed
-  void* AddOutOfLineHelper(void* obj);
-
-  // The reflection implementation needs to call protected methods directly,
-  // reinterpreting pointers as being to Message instead of a specific Message
-  // subclass.
-  friend class ::PROTOBUF_NAMESPACE_ID::Reflection;
-  friend class ::PROTOBUF_NAMESPACE_ID::internal::SwapFieldHelper;
-
-  // ExtensionSet stores repeated message extensions as
-  // RepeatedPtrField<MessageLite>, but non-lite ExtensionSets need to implement
-  // SpaceUsedLong(), and thus need to call SpaceUsedExcludingSelfLong()
-  // reinterpreting MessageLite as Message.  ExtensionSet also needs to make use
-  // of AddFromCleared(), which is not part of the public interface.
-  friend class ExtensionSet;
-
-  // The MapFieldBase implementation needs to call protected methods directly,
-  // reinterpreting pointers as being to Message instead of a specific Message
-  // subclass.
-  friend class MapFieldBase;
-  friend class MapFieldBaseStub;
-
-  // The table-driven MergePartialFromCodedStream implementation needs to
-  // operate on RepeatedPtrField<MessageLite>.
-  friend class MergePartialFromCodedStreamHelper;
-  friend class AccessorHelper;
-  template <typename T>
-  friend struct google::protobuf::WeakRepeatedPtrField;
-  friend class internal::TcParser;  // TODO(jorg): Remove this friend.
-};
-
-template <typename GenericType>
-class GenericTypeHandler {
- public:
-  typedef GenericType Type;
-  using Movable = IsMovable<GenericType>;
-
-  static inline GenericType* New(Arena* arena) {
-    return Arena::CreateMaybeMessage<Type>(arena);
-  }
-  static inline GenericType* New(Arena* arena, GenericType&& value) {
-    return Arena::Create<GenericType>(arena, std::move(value));
-  }
-  static inline GenericType* NewFromPrototype(const GenericType* /*prototype*/,
-                                              Arena* arena = nullptr) {
-    return New(arena);
-  }
-  static inline void Delete(GenericType* value, Arena* arena) {
-    if (arena == nullptr) {
-      delete value;
-    }
-  }
-  static inline Arena* GetOwningArena(GenericType* value) {
-    return Arena::GetOwningArena<Type>(value);
-  }
-
-  static inline void Clear(GenericType* value) { value->Clear(); }
-  static void Merge(const GenericType& from, GenericType* to);
-  static inline size_t SpaceUsedLong(const GenericType& value) {
-    return value.SpaceUsedLong();
-  }
-};
-
-// NewFromPrototypeHelper() is not defined inline here, as we will need to do a
-// virtual function dispatch anyways to go from Message* to call New/Merge. (The
-// additional helper is needed as a workaround for MSVC.)
-MessageLite* NewFromPrototypeHelper(const MessageLite* prototype, Arena* arena);
-
-template <>
-inline MessageLite* GenericTypeHandler<MessageLite>::NewFromPrototype(
-    const MessageLite* prototype, Arena* arena) {
-  return NewFromPrototypeHelper(prototype, arena);
-}
-template <>
-inline Arena* GenericTypeHandler<MessageLite>::GetOwningArena(
-    MessageLite* value) {
-  return value->GetOwningArena();
-}
-
-template <typename GenericType>
-PROTOBUF_NOINLINE inline void GenericTypeHandler<GenericType>::Merge(
-    const GenericType& from, GenericType* to) {
-  to->MergeFrom(from);
-}
-template <>
-void GenericTypeHandler<MessageLite>::Merge(const MessageLite& from,
-                                            MessageLite* to);
-
-template <>
-inline void GenericTypeHandler<std::string>::Clear(std::string* value) {
-  value->clear();
-}
-template <>
-void GenericTypeHandler<std::string>::Merge(const std::string& from,
-                                            std::string* to);
-
-// Message specialization bodies defined in message.cc. This split is necessary
-// to allow proto2-lite (which includes this header) to be independent of
-// Message.
-template <>
-PROTOBUF_EXPORT Message* GenericTypeHandler<Message>::NewFromPrototype(
-    const Message* prototype, Arena* arena);
-template <>
-PROTOBUF_EXPORT Arena* GenericTypeHandler<Message>::GetOwningArena(
-    Message* value);
-
-class StringTypeHandler {
- public:
-  typedef std::string Type;
-  using Movable = IsMovable<Type>;
-
-  static inline std::string* New(Arena* arena) {
-    return Arena::Create<std::string>(arena);
-  }
-  static inline std::string* New(Arena* arena, std::string&& value) {
-    return Arena::Create<std::string>(arena, std::move(value));
-  }
-  static inline std::string* NewFromPrototype(const std::string*,
-                                              Arena* arena) {
-    return New(arena);
-  }
-  static inline Arena* GetOwningArena(std::string*) { return nullptr; }
-  static inline void Delete(std::string* value, Arena* arena) {
-    if (arena == nullptr) {
-      delete value;
-    }
-  }
-  static inline void Clear(std::string* value) { value->clear(); }
-  static inline void Merge(const std::string& from, std::string* to) {
-    *to = from;
-  }
-  static size_t SpaceUsedLong(const std::string& value) {
-    return sizeof(value) + StringSpaceUsedExcludingSelfLong(value);
-  }
-};
-
-}  // namespace internal
-
-// RepeatedPtrField is like RepeatedField, but used for repeated strings or
-// Messages.
-template <typename Element>
-class RepeatedPtrField final : private internal::RepeatedPtrFieldBase {
-
- public:
-  constexpr RepeatedPtrField();
-  explicit RepeatedPtrField(Arena* arena);
-
-  RepeatedPtrField(const RepeatedPtrField& other);
-
-  template <typename Iter,
-            typename = typename std::enable_if<std::is_constructible<
-                Element, decltype(*std::declval<Iter>())>::value>::type>
-  RepeatedPtrField(Iter begin, Iter end);
-
-  ~RepeatedPtrField();
-
-  RepeatedPtrField& operator=(const RepeatedPtrField& other);
-
-  RepeatedPtrField(RepeatedPtrField&& other) noexcept;
-  RepeatedPtrField& operator=(RepeatedPtrField&& other) noexcept;
-
-  bool empty() const;
-  int size() const;
-
-  const Element& Get(int index) const;
-  Element* Mutable(int index);
-
-  // Unlike std::vector, adding an element to a RepeatedPtrField doesn't always
-  // make a new element; it might re-use an element left over from when the
-  // field was Clear()'d or reize()'d smaller.  For this reason, Add() is the
-  // fastest API for adding a new element.
-  Element* Add();
-
-  // `Add(std::move(value));` is equivalent to `*Add() = std::move(value);`
-  // It will either move-construct to the end of this field, or swap value
-  // with the new-or-recycled element at the end of this field.  Note that
-  // this operation is very slow if this RepeatedPtrField is not on the
-  // same Arena, if any, as `value`.
-  void Add(Element&& value);
-
-  // Copying to the end of this RepeatedPtrField is slowest of all; it can't
-  // reliably copy-construct to the last element of this RepeatedPtrField, for
-  // example (unlike std::vector).
-  // We currently block this API.  The right way to add to the end is to call
-  // Add() and modify the element it points to.
-  // If you must add an existing value, call `*Add() = value;`
-  void Add(const Element& value) = delete;
-
-  // Append elements in the range [begin, end) after reserving
-  // the appropriate number of elements.
-  template <typename Iter>
-  void Add(Iter begin, Iter end);
-
-  const Element& operator[](int index) const { return Get(index); }
-  Element& operator[](int index) { return *Mutable(index); }
-
-  const Element& at(int index) const;
-  Element& at(int index);
-
-  // Removes the last element in the array.
-  // Ownership of the element is retained by the array.
-  void RemoveLast();
-
-  // Deletes elements with indices in the range [start .. start+num-1].
-  // Caution: moves all elements with indices [start+num .. ].
-  // Calling this routine inside a loop can cause quadratic behavior.
-  void DeleteSubrange(int start, int num);
-
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear();
-  void MergeFrom(const RepeatedPtrField& other);
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void CopyFrom(const RepeatedPtrField& other);
-
-  // Replaces the contents with RepeatedPtrField(begin, end).
-  template <typename Iter>
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Assign(Iter begin, Iter end);
-
-  // Reserves space to expand the field to at least the given size.  This only
-  // resizes the pointer array; it doesn't allocate any objects.  If the
-  // array is grown, it will always be at least doubled in size.
-  void Reserve(int new_size);
-
-  int Capacity() const;
-
-  // Gets the underlying array.  This pointer is possibly invalidated by
-  // any add or remove operation.
-  //
-  // This API is deprecated. Instead of directly working with element array,
-  // use APIs in repeated_field_util.h; e.g. sorting, etc.
-  PROTOBUF_DEPRECATED_MSG("Use APIs in repeated_field_util.h")
-  Element** mutable_data();
-  const Element* const* data() const;
-
-  // Swaps entire contents with "other". If they are on separate arenas, then
-  // copies data.
-  void Swap(RepeatedPtrField* other);
-
-  // Swaps entire contents with "other". Caller should guarantee that either
-  // both fields are on the same arena or both are on the heap. Swapping between
-  // different arenas with this function is disallowed and is caught via
-  // GOOGLE_DCHECK.
-  void UnsafeArenaSwap(RepeatedPtrField* other);
-
-  // Swaps two elements.
-  void SwapElements(int index1, int index2);
-
-  // STL-like iterator support
-  typedef internal::RepeatedPtrIterator<Element> iterator;
-  typedef internal::RepeatedPtrIterator<const Element> const_iterator;
-  typedef Element value_type;
-  typedef value_type& reference;
-  typedef const value_type& const_reference;
-  typedef value_type* pointer;
-  typedef const value_type* const_pointer;
-  typedef int size_type;
-  typedef ptrdiff_t difference_type;
-
-  iterator begin();
-  const_iterator begin() const;
-  const_iterator cbegin() const;
-  iterator end();
-  const_iterator end() const;
-  const_iterator cend() const;
-
-  // Reverse iterator support
-  typedef std::reverse_iterator<const_iterator> const_reverse_iterator;
-  typedef std::reverse_iterator<iterator> reverse_iterator;
-  reverse_iterator rbegin() { return reverse_iterator(end()); }
-  const_reverse_iterator rbegin() const {
-    return const_reverse_iterator(end());
-  }
-  reverse_iterator rend() { return reverse_iterator(begin()); }
-  const_reverse_iterator rend() const {
-    return const_reverse_iterator(begin());
-  }
-
-  // Custom STL-like iterator that iterates over and returns the underlying
-  // pointers to Element rather than Element itself.
-  typedef internal::RepeatedPtrOverPtrsIterator<Element*, void*>
-      pointer_iterator;
-  typedef internal::RepeatedPtrOverPtrsIterator<const Element* const,
-                                                const void* const>
-      const_pointer_iterator;
-  pointer_iterator pointer_begin();
-  const_pointer_iterator pointer_begin() const;
-  pointer_iterator pointer_end();
-  const_pointer_iterator pointer_end() const;
-
-  // Returns (an estimate of) the number of bytes used by the repeated field,
-  // excluding sizeof(*this).
-  size_t SpaceUsedExcludingSelfLong() const;
-
-  int SpaceUsedExcludingSelf() const {
-    return internal::ToIntSize(SpaceUsedExcludingSelfLong());
-  }
-
-  // Advanced memory management --------------------------------------
-  // When hardcore memory management becomes necessary -- as it sometimes
-  // does here at Google -- the following methods may be useful.
-
-  // Adds an already-allocated object, passing ownership to the
-  // RepeatedPtrField.
-  //
-  // Note that some special behavior occurs with respect to arenas:
-  //
-  //   (i) if this field holds submessages, the new submessage will be copied if
-  //   the original is in an arena and this RepeatedPtrField is either in a
-  //   different arena, or on the heap.
-  //   (ii) if this field holds strings, the passed-in string *must* be
-  //   heap-allocated, not arena-allocated. There is no way to dynamically check
-  //   this at runtime, so User Beware.
-  void AddAllocated(Element* value);
-
-  // Removes and returns the last element, passing ownership to the caller.
-  // Requires:  size() > 0
-  //
-  // If this RepeatedPtrField is on an arena, an object copy is required to pass
-  // ownership back to the user (for compatible semantics). Use
-  // UnsafeArenaReleaseLast() if this behavior is undesired.
-  PROTOBUF_NODISCARD Element* ReleaseLast();
-
-  // Adds an already-allocated object, skipping arena-ownership checks. The user
-  // must guarantee that the given object is in the same arena as this
-  // RepeatedPtrField.
-  // It is also useful in legacy code that uses temporary ownership to avoid
-  // copies. Example:
-  //   RepeatedPtrField<T> temp_field;
-  //   temp_field.UnsafeArenaAddAllocated(new T);
-  //   ... // Do something with temp_field
-  //   temp_field.UnsafeArenaExtractSubrange(0, temp_field.size(), nullptr);
-  // If you put temp_field on the arena this fails, because the ownership
-  // transfers to the arena at the "AddAllocated" call and is not released
-  // anymore, causing a double delete. UnsafeArenaAddAllocated prevents this.
-  void UnsafeArenaAddAllocated(Element* value);
-
-  // Removes and returns the last element.  Unlike ReleaseLast, the returned
-  // pointer is always to the original object.  This may be in an arena, in
-  // which case it would have the arena's lifetime.
-  // Requires: current_size_ > 0
-  Element* UnsafeArenaReleaseLast();
-
-  // Extracts elements with indices in the range "[start .. start+num-1]".
-  // The caller assumes ownership of the extracted elements and is responsible
-  // for deleting them when they are no longer needed.
-  // If "elements" is non-nullptr, then pointers to the extracted elements
-  // are stored in "elements[0 .. num-1]" for the convenience of the caller.
-  // If "elements" is nullptr, then the caller must use some other mechanism
-  // to perform any further operations (like deletion) on these elements.
-  // Caution: implementation also moves elements with indices [start+num ..].
-  // Calling this routine inside a loop can cause quadratic behavior.
-  //
-  // Memory copying behavior is identical to ReleaseLast(), described above: if
-  // this RepeatedPtrField is on an arena, an object copy is performed for each
-  // returned element, so that all returned element pointers are to
-  // heap-allocated copies. If this copy is not desired, the user should call
-  // UnsafeArenaExtractSubrange().
-  void ExtractSubrange(int start, int num, Element** elements);
-
-  // Identical to ExtractSubrange() described above, except that no object
-  // copies are ever performed. Instead, the raw object pointers are returned.
-  // Thus, if on an arena, the returned objects must not be freed, because they
-  // will not be heap-allocated objects.
-  void UnsafeArenaExtractSubrange(int start, int num, Element** elements);
-
-  // When elements are removed by calls to RemoveLast() or Clear(), they
-  // are not actually freed.  Instead, they are cleared and kept so that
-  // they can be reused later.  This can save lots of CPU time when
-  // repeatedly reusing a protocol message for similar purposes.
-  //
-  // Hardcore programs may choose to manipulate these cleared objects
-  // to better optimize memory management using the following routines.
-
-  // Gets the number of cleared objects that are currently being kept
-  // around for reuse.
-  int ClearedCount() const;
-#ifndef PROTOBUF_FUTURE_BREAKING_CHANGES
-  // Adds an element to the pool of cleared objects, passing ownership to
-  // the RepeatedPtrField.  The element must be cleared prior to calling
-  // this method.
-  //
-  // This method cannot be called when either the repeated field or |value| is
-  // on an arena; both cases will trigger a GOOGLE_DCHECK-failure.
-  void AddCleared(Element* value);
-  // Removes and returns a single element from the cleared pool, passing
-  // ownership to the caller.  The element is guaranteed to be cleared.
-  // Requires:  ClearedCount() > 0
-  //
-  // This method cannot be called when the repeated field is on an arena; doing
-  // so will trigger a GOOGLE_DCHECK-failure.
-  PROTOBUF_NODISCARD Element* ReleaseCleared();
-#endif  // !PROTOBUF_FUTURE_BREAKING_CHANGES
-
-  // Removes the element referenced by position.
-  //
-  // Returns an iterator to the element immediately following the removed
-  // element.
-  //
-  // Invalidates all iterators at or after the removed element, including end().
-  iterator erase(const_iterator position);
-
-  // Removes the elements in the range [first, last).
-  //
-  // Returns an iterator to the element immediately following the removed range.
-  //
-  // Invalidates all iterators at or after the removed range, including end().
-  iterator erase(const_iterator first, const_iterator last);
-
-  // Gets the arena on which this RepeatedPtrField stores its elements.
-  inline Arena* GetArena() const;
-
-  // For internal use only.
-  //
-  // This is public due to it being called by generated code.
-  void InternalSwap(RepeatedPtrField* other) {
-    internal::RepeatedPtrFieldBase::InternalSwap(other);
-  }
-
- private:
-  // Note:  RepeatedPtrField SHOULD NOT be subclassed by users.
-  class TypeHandler;
-
-  // Internal version of GetArena().
-  inline Arena* GetOwningArena() const;
-
-  // Implementations for ExtractSubrange(). The copying behavior must be
-  // included only if the type supports the necessary operations (e.g.,
-  // MergeFrom()), so we must resolve this at compile time. ExtractSubrange()
-  // uses SFINAE to choose one of the below implementations.
-  void ExtractSubrangeInternal(int start, int num, Element** elements,
-                               std::true_type);
-  void ExtractSubrangeInternal(int start, int num, Element** elements,
-                               std::false_type);
-
-  friend class Arena;
-
-  template <typename T>
-  friend struct WeakRepeatedPtrField;
-
-  typedef void InternalArenaConstructable_;
-
-};
-
-// -------------------------------------------------------------------
-
-template <typename Element>
-class RepeatedPtrField<Element>::TypeHandler
-    : public internal::GenericTypeHandler<Element> {};
-
-template <>
-class RepeatedPtrField<std::string>::TypeHandler
-    : public internal::StringTypeHandler {};
-
-template <typename Element>
-constexpr RepeatedPtrField<Element>::RepeatedPtrField()
-    : RepeatedPtrFieldBase() {}
-
-template <typename Element>
-inline RepeatedPtrField<Element>::RepeatedPtrField(Arena* arena)
-    : RepeatedPtrFieldBase(arena) {}
-
-template <typename Element>
-inline RepeatedPtrField<Element>::RepeatedPtrField(
-    const RepeatedPtrField& other)
-    : RepeatedPtrFieldBase() {
-  MergeFrom(other);
-}
-
-template <typename Element>
-template <typename Iter, typename>
-inline RepeatedPtrField<Element>::RepeatedPtrField(Iter begin, Iter end) {
-  Add(begin, end);
-}
-
-template <typename Element>
-RepeatedPtrField<Element>::~RepeatedPtrField() {
-#ifdef __cpp_if_constexpr
-  if constexpr (std::is_base_of<MessageLite, Element>::value) {
-#else
-  if (std::is_base_of<MessageLite, Element>::value) {
-#endif
-    if (NeedsDestroy()) DestroyProtos();
-  } else {
-    Destroy<TypeHandler>();
-  }
-}
-
-template <typename Element>
-inline RepeatedPtrField<Element>& RepeatedPtrField<Element>::operator=(
-    const RepeatedPtrField& other) {
-  if (this != &other) CopyFrom(other);
-  return *this;
-}
-
-template <typename Element>
-inline RepeatedPtrField<Element>::RepeatedPtrField(
-    RepeatedPtrField&& other) noexcept
-    : RepeatedPtrField() {
-#ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-  CopyFrom(other);
-#else   // PROTOBUF_FORCE_COPY_IN_MOVE
-  // We don't just call Swap(&other) here because it would perform 3 copies if
-  // other is on an arena. This field can't be on an arena because arena
-  // construction always uses the Arena* accepting constructor.
-  if (other.GetOwningArena()) {
-    CopyFrom(other);
-  } else {
-    InternalSwap(&other);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-}
-
-template <typename Element>
-inline RepeatedPtrField<Element>& RepeatedPtrField<Element>::operator=(
-    RepeatedPtrField&& other) noexcept {
-  // We don't just call Swap(&other) here because it would perform 3 copies if
-  // the two fields are on different arenas.
-  if (this != &other) {
-    if (GetOwningArena() != other.GetOwningArena()
-#ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        || GetOwningArena() == nullptr
-#endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      CopyFrom(other);
-    } else {
-      InternalSwap(&other);
-    }
-  }
-  return *this;
-}
-
-template <typename Element>
-inline bool RepeatedPtrField<Element>::empty() const {
-  return RepeatedPtrFieldBase::empty();
-}
-
-template <typename Element>
-inline int RepeatedPtrField<Element>::size() const {
-  return RepeatedPtrFieldBase::size();
-}
-
-template <typename Element>
-inline const Element& RepeatedPtrField<Element>::Get(int index) const {
-  return RepeatedPtrFieldBase::Get<TypeHandler>(index);
-}
-
-template <typename Element>
-inline const Element& RepeatedPtrField<Element>::at(int index) const {
-  return RepeatedPtrFieldBase::at<TypeHandler>(index);
-}
-
-template <typename Element>
-inline Element& RepeatedPtrField<Element>::at(int index) {
-  return RepeatedPtrFieldBase::at<TypeHandler>(index);
-}
-
-
-template <typename Element>
-inline Element* RepeatedPtrField<Element>::Mutable(int index) {
-  return RepeatedPtrFieldBase::Mutable<TypeHandler>(index);
-}
-
-template <typename Element>
-inline Element* RepeatedPtrField<Element>::Add() {
-  return RepeatedPtrFieldBase::Add<TypeHandler>();
-}
-
-template <typename Element>
-inline void RepeatedPtrField<Element>::Add(Element&& value) {
-  RepeatedPtrFieldBase::Add<TypeHandler>(std::move(value));
-}
-
-template <typename Element>
-template <typename Iter>
-inline void RepeatedPtrField<Element>::Add(Iter begin, Iter end) {
-  if (std::is_base_of<
-          std::forward_iterator_tag,
-          typename std::iterator_traits<Iter>::iterator_category>::value) {
-    int reserve = std::distance(begin, end);
-    Reserve(size() + reserve);
-  }
-  for (; begin != end; ++begin) {
-    *Add() = *begin;
-  }
-}
-
-template <typename Element>
-inline void RepeatedPtrField<Element>::RemoveLast() {
-  RepeatedPtrFieldBase::RemoveLast<TypeHandler>();
-}
-
-template <typename Element>
-inline void RepeatedPtrField<Element>::DeleteSubrange(int start, int num) {
-  GOOGLE_DCHECK_GE(start, 0);
-  GOOGLE_DCHECK_GE(num, 0);
-  GOOGLE_DCHECK_LE(start + num, size());
-  for (int i = 0; i < num; ++i) {
-    RepeatedPtrFieldBase::Delete<TypeHandler>(start + i);
-  }
-  UnsafeArenaExtractSubrange(start, num, nullptr);
-}
-
-template <typename Element>
-inline void RepeatedPtrField<Element>::ExtractSubrange(int start, int num,
-                                                       Element** elements) {
-  typename internal::TypeImplementsMergeBehavior<
-      typename TypeHandler::Type>::type t;
-  ExtractSubrangeInternal(start, num, elements, t);
-}
-
-// ExtractSubrange() implementation for types that implement merge/copy
-// behavior.
-template <typename Element>
-inline void RepeatedPtrField<Element>::ExtractSubrangeInternal(
-    int start, int num, Element** elements, std::true_type) {
-  GOOGLE_DCHECK_GE(start, 0);
-  GOOGLE_DCHECK_GE(num, 0);
-  GOOGLE_DCHECK_LE(start + num, size());
-
-  if (num == 0) return;
-
-  GOOGLE_DCHECK_NE(elements, nullptr)
-      << "Releasing elements without transferring ownership is an unsafe "
-         "operation.  Use UnsafeArenaExtractSubrange.";
-  if (elements == nullptr) {
-    CloseGap(start, num);
-    return;
-  }
-
-  Arena* arena = GetOwningArena();
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  // Always copy.
-  for (int i = 0; i < num; ++i) {
-    elements[i] = copy<TypeHandler>(
-        RepeatedPtrFieldBase::Mutable<TypeHandler>(i + start));
-  }
-  if (arena == nullptr) {
-    for (int i = 0; i < num; ++i) {
-      delete RepeatedPtrFieldBase::Mutable<TypeHandler>(i + start);
-    }
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  // If we're on an arena, we perform a copy for each element so that the
-  // returned elements are heap-allocated. Otherwise, just forward it.
-  if (arena != nullptr) {
-    for (int i = 0; i < num; ++i) {
-      elements[i] = copy<TypeHandler>(
-          RepeatedPtrFieldBase::Mutable<TypeHandler>(i + start));
-    }
-  } else {
-    for (int i = 0; i < num; ++i) {
-      elements[i] = RepeatedPtrFieldBase::Mutable<TypeHandler>(i + start);
-    }
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  CloseGap(start, num);
-}
-
-// ExtractSubrange() implementation for types that do not implement merge/copy
-// behavior.
-template <typename Element>
-inline void RepeatedPtrField<Element>::ExtractSubrangeInternal(
-    int start, int num, Element** elements, std::false_type) {
-  // This case is identical to UnsafeArenaExtractSubrange(). However, since
-  // ExtractSubrange() must return heap-allocated objects by contract, and we
-  // cannot fulfill this contract if we are an on arena, we must GOOGLE_DCHECK() that
-  // we are not on an arena.
-  GOOGLE_DCHECK(GetOwningArena() == nullptr)
-      << "ExtractSubrange() when arena is non-nullptr is only supported when "
-      << "the Element type supplies a MergeFrom() operation to make copies.";
-  UnsafeArenaExtractSubrange(start, num, elements);
-}
-
-template <typename Element>
-inline void RepeatedPtrField<Element>::UnsafeArenaExtractSubrange(
-    int start, int num, Element** elements) {
-  GOOGLE_DCHECK_GE(start, 0);
-  GOOGLE_DCHECK_GE(num, 0);
-  GOOGLE_DCHECK_LE(start + num, size());
-
-  if (num > 0) {
-    // Save the values of the removed elements if requested.
-    if (elements != nullptr) {
-      for (int i = 0; i < num; ++i) {
-        elements[i] = RepeatedPtrFieldBase::Mutable<TypeHandler>(i + start);
-      }
-    }
-    CloseGap(start, num);
-  }
-}
-
-template <typename Element>
-inline void RepeatedPtrField<Element>::Clear() {
-  RepeatedPtrFieldBase::Clear<TypeHandler>();
-}
-
-template <typename Element>
-inline void RepeatedPtrField<Element>::MergeFrom(
-    const RepeatedPtrField& other) {
-  RepeatedPtrFieldBase::MergeFrom<TypeHandler>(other);
-}
-
-template <typename Element>
-inline void RepeatedPtrField<Element>::CopyFrom(const RepeatedPtrField& other) {
-  RepeatedPtrFieldBase::CopyFrom<TypeHandler>(other);
-}
-
-template <typename Element>
-template <typename Iter>
-inline void RepeatedPtrField<Element>::Assign(Iter begin, Iter end) {
-  Clear();
-  Add(begin, end);
-}
-
-template <typename Element>
-inline typename RepeatedPtrField<Element>::iterator
-RepeatedPtrField<Element>::erase(const_iterator position) {
-  return erase(position, position + 1);
-}
-
-template <typename Element>
-inline typename RepeatedPtrField<Element>::iterator
-RepeatedPtrField<Element>::erase(const_iterator first, const_iterator last) {
-  size_type pos_offset = std::distance(cbegin(), first);
-  size_type last_offset = std::distance(cbegin(), last);
-  DeleteSubrange(pos_offset, last_offset - pos_offset);
-  return begin() + pos_offset;
-}
-
-template <typename Element>
-inline Element** RepeatedPtrField<Element>::mutable_data() {
-  return RepeatedPtrFieldBase::mutable_data<TypeHandler>();
-}
-
-template <typename Element>
-inline const Element* const* RepeatedPtrField<Element>::data() const {
-  return RepeatedPtrFieldBase::data<TypeHandler>();
-}
-
-template <typename Element>
-inline void RepeatedPtrField<Element>::Swap(RepeatedPtrField* other) {
-  if (this == other) return;
-  RepeatedPtrFieldBase::Swap<TypeHandler>(other);
-}
-
-template <typename Element>
-inline void RepeatedPtrField<Element>::UnsafeArenaSwap(
-    RepeatedPtrField* other) {
-  if (this == other) return;
-  GOOGLE_DCHECK_EQ(GetOwningArena(), other->GetOwningArena());
-  RepeatedPtrFieldBase::InternalSwap(other);
-}
-
-template <typename Element>
-inline void RepeatedPtrField<Element>::SwapElements(int index1, int index2) {
-  RepeatedPtrFieldBase::SwapElements(index1, index2);
-}
-
-template <typename Element>
-inline Arena* RepeatedPtrField<Element>::GetArena() const {
-  return RepeatedPtrFieldBase::GetArena();
-}
-
-template <typename Element>
-inline Arena* RepeatedPtrField<Element>::GetOwningArena() const {
-  return RepeatedPtrFieldBase::GetOwningArena();
-}
-
-template <typename Element>
-inline size_t RepeatedPtrField<Element>::SpaceUsedExcludingSelfLong() const {
-  return RepeatedPtrFieldBase::SpaceUsedExcludingSelfLong<TypeHandler>();
-}
-
-template <typename Element>
-inline void RepeatedPtrField<Element>::AddAllocated(Element* value) {
-  RepeatedPtrFieldBase::AddAllocated<TypeHandler>(value);
-}
-
-template <typename Element>
-inline void RepeatedPtrField<Element>::UnsafeArenaAddAllocated(Element* value) {
-  RepeatedPtrFieldBase::UnsafeArenaAddAllocated<TypeHandler>(value);
-}
-
-template <typename Element>
-inline Element* RepeatedPtrField<Element>::ReleaseLast() {
-  return RepeatedPtrFieldBase::ReleaseLast<TypeHandler>();
-}
-
-template <typename Element>
-inline Element* RepeatedPtrField<Element>::UnsafeArenaReleaseLast() {
-  return RepeatedPtrFieldBase::UnsafeArenaReleaseLast<TypeHandler>();
-}
-
-template <typename Element>
-inline int RepeatedPtrField<Element>::ClearedCount() const {
-  return RepeatedPtrFieldBase::ClearedCount();
-}
-
-#ifndef PROTOBUF_FUTURE_BREAKING_CHANGES
-template <typename Element>
-inline void RepeatedPtrField<Element>::AddCleared(Element* value) {
-  return RepeatedPtrFieldBase::AddCleared<TypeHandler>(value);
-}
-
-template <typename Element>
-inline Element* RepeatedPtrField<Element>::ReleaseCleared() {
-  return RepeatedPtrFieldBase::ReleaseCleared<TypeHandler>();
-}
-#endif  // !PROTOBUF_FUTURE_BREAKING_CHANGES
-
-template <typename Element>
-inline void RepeatedPtrField<Element>::Reserve(int new_size) {
-  return RepeatedPtrFieldBase::Reserve(new_size);
-}
-
-template <typename Element>
-inline int RepeatedPtrField<Element>::Capacity() const {
-  return RepeatedPtrFieldBase::Capacity();
-}
-
-// -------------------------------------------------------------------
-
-namespace internal {
-
-// STL-like iterator implementation for RepeatedPtrField.  You should not
-// refer to this class directly; use RepeatedPtrField<T>::iterator instead.
-//
-// The iterator for RepeatedPtrField<T>, RepeatedPtrIterator<T>, is
-// very similar to iterator_ptr<T**> in util/gtl/iterator_adaptors.h,
-// but adds random-access operators and is modified to wrap a void** base
-// iterator (since RepeatedPtrField stores its array as a void* array and
-// casting void** to T** would violate C++ aliasing rules).
-//
-// This code based on net/proto/proto-array-internal.h by Jeffrey Yasskin
-// (jyasskin@google.com).
-template <typename Element>
-class RepeatedPtrIterator {
- public:
-  using iterator = RepeatedPtrIterator<Element>;
-  using iterator_category = std::random_access_iterator_tag;
-  using value_type = typename std::remove_const<Element>::type;
-  using difference_type = std::ptrdiff_t;
-  using pointer = Element*;
-  using reference = Element&;
-
-  RepeatedPtrIterator() : it_(nullptr) {}
-  explicit RepeatedPtrIterator(void* const* it) : it_(it) {}
-
-  // Allows "upcasting" from RepeatedPtrIterator<T**> to
-  // RepeatedPtrIterator<const T*const*>.
-  template <typename OtherElement,
-            typename std::enable_if<std::is_convertible<
-                OtherElement*, pointer>::value>::type* = nullptr>
-  RepeatedPtrIterator(const RepeatedPtrIterator<OtherElement>& other)
-      : it_(other.it_) {}
-
-  // dereferenceable
-  reference operator*() const { return *reinterpret_cast<Element*>(*it_); }
-  pointer operator->() const { return &(operator*()); }
-
-  // {inc,dec}rementable
-  iterator& operator++() {
-    ++it_;
-    return *this;
-  }
-  iterator operator++(int) { return iterator(it_++); }
-  iterator& operator--() {
-    --it_;
-    return *this;
-  }
-  iterator operator--(int) { return iterator(it_--); }
-
-  // equality_comparable
-  friend bool operator==(const iterator& x, const iterator& y) {
-    return x.it_ == y.it_;
-  }
-  friend bool operator!=(const iterator& x, const iterator& y) {
-    return x.it_ != y.it_;
-  }
-
-  // less_than_comparable
-  friend bool operator<(const iterator& x, const iterator& y) {
-    return x.it_ < y.it_;
-  }
-  friend bool operator<=(const iterator& x, const iterator& y) {
-    return x.it_ <= y.it_;
-  }
-  friend bool operator>(const iterator& x, const iterator& y) {
-    return x.it_ > y.it_;
-  }
-  friend bool operator>=(const iterator& x, const iterator& y) {
-    return x.it_ >= y.it_;
-  }
-
-  // addable, subtractable
-  iterator& operator+=(difference_type d) {
-    it_ += d;
-    return *this;
-  }
-  friend iterator operator+(iterator it, const difference_type d) {
-    it += d;
-    return it;
-  }
-  friend iterator operator+(const difference_type d, iterator it) {
-    it += d;
-    return it;
-  }
-  iterator& operator-=(difference_type d) {
-    it_ -= d;
-    return *this;
-  }
-  friend iterator operator-(iterator it, difference_type d) {
-    it -= d;
-    return it;
-  }
-
-  // indexable
-  reference operator[](difference_type d) const { return *(*this + d); }
-
-  // random access iterator
-  friend difference_type operator-(iterator it1, iterator it2) {
-    return it1.it_ - it2.it_;
-  }
-
- private:
-  template <typename OtherElement>
-  friend class RepeatedPtrIterator;
-
-  // The internal iterator.
-  void* const* it_;
-};
-
-// Provides an iterator that operates on pointers to the underlying objects
-// rather than the objects themselves as RepeatedPtrIterator does.
-// Consider using this when working with stl algorithms that change
-// the array.
-// The VoidPtr template parameter holds the type-agnostic pointer value
-// referenced by the iterator.  It should either be "void *" for a mutable
-// iterator, or "const void* const" for a constant iterator.
-template <typename Element, typename VoidPtr>
-class RepeatedPtrOverPtrsIterator {
- public:
-  using iterator = RepeatedPtrOverPtrsIterator<Element, VoidPtr>;
-  using iterator_category = std::random_access_iterator_tag;
-  using value_type = typename std::remove_const<Element>::type;
-  using difference_type = std::ptrdiff_t;
-  using pointer = Element*;
-  using reference = Element&;
-
-  RepeatedPtrOverPtrsIterator() : it_(nullptr) {}
-  explicit RepeatedPtrOverPtrsIterator(VoidPtr* it) : it_(it) {}
-
-  // Allows "upcasting" from RepeatedPtrOverPtrsIterator<T**> to
-  // RepeatedPtrOverPtrsIterator<const T*const*>.
-  template <
-      typename OtherElement, typename OtherVoidPtr,
-      typename std::enable_if<
-          std::is_convertible<OtherElement*, pointer>::value &&
-          std::is_convertible<OtherVoidPtr*, VoidPtr>::value>::type* = nullptr>
-  RepeatedPtrOverPtrsIterator(
-      const RepeatedPtrOverPtrsIterator<OtherElement, OtherVoidPtr>& other)
-      : it_(other.it_) {}
-
-  // dereferenceable
-  reference operator*() const { return *reinterpret_cast<Element*>(it_); }
-  pointer operator->() const { return &(operator*()); }
-
-  // {inc,dec}rementable
-  iterator& operator++() {
-    ++it_;
-    return *this;
-  }
-  iterator operator++(int) { return iterator(it_++); }
-  iterator& operator--() {
-    --it_;
-    return *this;
-  }
-  iterator operator--(int) { return iterator(it_--); }
-
-  // equality_comparable
-  friend bool operator==(const iterator& x, const iterator& y) {
-    return x.it_ == y.it_;
-  }
-  friend bool operator!=(const iterator& x, const iterator& y) {
-    return x.it_ != y.it_;
-  }
-
-  // less_than_comparable
-  friend bool operator<(const iterator& x, const iterator& y) {
-    return x.it_ < y.it_;
-  }
-  friend bool operator<=(const iterator& x, const iterator& y) {
-    return x.it_ <= y.it_;
-  }
-  friend bool operator>(const iterator& x, const iterator& y) {
-    return x.it_ > y.it_;
-  }
-  friend bool operator>=(const iterator& x, const iterator& y) {
-    return x.it_ >= y.it_;
-  }
-
-  // addable, subtractable
-  iterator& operator+=(difference_type d) {
-    it_ += d;
-    return *this;
-  }
-  friend iterator operator+(iterator it, difference_type d) {
-    it += d;
-    return it;
-  }
-  friend iterator operator+(difference_type d, iterator it) {
-    it += d;
-    return it;
-  }
-  iterator& operator-=(difference_type d) {
-    it_ -= d;
-    return *this;
-  }
-  friend iterator operator-(iterator it, difference_type d) {
-    it -= d;
-    return it;
-  }
-
-  // indexable
-  reference operator[](difference_type d) const { return *(*this + d); }
-
-  // random access iterator
-  friend difference_type operator-(iterator it1, iterator it2) {
-    return it1.it_ - it2.it_;
-  }
-
- private:
-  template <typename OtherElement, typename OtherVoidPtr>
-  friend class RepeatedPtrOverPtrsIterator;
-
-  // The internal iterator.
-  VoidPtr* it_;
-};
-
-}  // namespace internal
-
-template <typename Element>
-inline typename RepeatedPtrField<Element>::iterator
-RepeatedPtrField<Element>::begin() {
-  return iterator(raw_data());
-}
-template <typename Element>
-inline typename RepeatedPtrField<Element>::const_iterator
-RepeatedPtrField<Element>::begin() const {
-  return iterator(raw_data());
-}
-template <typename Element>
-inline typename RepeatedPtrField<Element>::const_iterator
-RepeatedPtrField<Element>::cbegin() const {
-  return begin();
-}
-template <typename Element>
-inline typename RepeatedPtrField<Element>::iterator
-RepeatedPtrField<Element>::end() {
-  return iterator(raw_data() + size());
-}
-template <typename Element>
-inline typename RepeatedPtrField<Element>::const_iterator
-RepeatedPtrField<Element>::end() const {
-  return iterator(raw_data() + size());
-}
-template <typename Element>
-inline typename RepeatedPtrField<Element>::const_iterator
-RepeatedPtrField<Element>::cend() const {
-  return end();
-}
-
-template <typename Element>
-inline typename RepeatedPtrField<Element>::pointer_iterator
-RepeatedPtrField<Element>::pointer_begin() {
-  return pointer_iterator(raw_mutable_data());
-}
-template <typename Element>
-inline typename RepeatedPtrField<Element>::const_pointer_iterator
-RepeatedPtrField<Element>::pointer_begin() const {
-  return const_pointer_iterator(const_cast<const void* const*>(raw_data()));
-}
-template <typename Element>
-inline typename RepeatedPtrField<Element>::pointer_iterator
-RepeatedPtrField<Element>::pointer_end() {
-  return pointer_iterator(raw_mutable_data() + size());
-}
-template <typename Element>
-inline typename RepeatedPtrField<Element>::const_pointer_iterator
-RepeatedPtrField<Element>::pointer_end() const {
-  return const_pointer_iterator(
-      const_cast<const void* const*>(raw_data() + size()));
-}
-
-// Iterators and helper functions that follow the spirit of the STL
-// std::back_insert_iterator and std::back_inserter but are tailor-made
-// for RepeatedField and RepeatedPtrField. Typical usage would be:
-//
-//   std::copy(some_sequence.begin(), some_sequence.end(),
-//             RepeatedFieldBackInserter(proto.mutable_sequence()));
-//
-// Ported by johannes from util/gtl/proto-array-iterators.h
-
-namespace internal {
-
-// A back inserter for RepeatedPtrField objects.
-template <typename T>
-class RepeatedPtrFieldBackInsertIterator {
- public:
-  using iterator_category = std::output_iterator_tag;
-  using value_type = T;
-  using pointer = void;
-  using reference = void;
-  using difference_type = std::ptrdiff_t;
-
-  RepeatedPtrFieldBackInsertIterator(RepeatedPtrField<T>* const mutable_field)
-      : field_(mutable_field) {}
-  RepeatedPtrFieldBackInsertIterator<T>& operator=(const T& value) {
-    *field_->Add() = value;
-    return *this;
-  }
-  RepeatedPtrFieldBackInsertIterator<T>& operator=(
-      const T* const ptr_to_value) {
-    *field_->Add() = *ptr_to_value;
-    return *this;
-  }
-  RepeatedPtrFieldBackInsertIterator<T>& operator=(T&& value) {
-    *field_->Add() = std::move(value);
-    return *this;
-  }
-  RepeatedPtrFieldBackInsertIterator<T>& operator*() { return *this; }
-  RepeatedPtrFieldBackInsertIterator<T>& operator++() { return *this; }
-  RepeatedPtrFieldBackInsertIterator<T>& operator++(int /* unused */) {
-    return *this;
-  }
-
- private:
-  RepeatedPtrField<T>* field_;
-};
-
-// A back inserter for RepeatedPtrFields that inserts by transferring ownership
-// of a pointer.
-template <typename T>
-class AllocatedRepeatedPtrFieldBackInsertIterator {
- public:
-  using iterator_category = std::output_iterator_tag;
-  using value_type = T;
-  using pointer = void;
-  using reference = void;
-  using difference_type = std::ptrdiff_t;
-
-  explicit AllocatedRepeatedPtrFieldBackInsertIterator(
-      RepeatedPtrField<T>* const mutable_field)
-      : field_(mutable_field) {}
-  AllocatedRepeatedPtrFieldBackInsertIterator<T>& operator=(
-      T* const ptr_to_value) {
-    field_->AddAllocated(ptr_to_value);
-    return *this;
-  }
-  AllocatedRepeatedPtrFieldBackInsertIterator<T>& operator*() { return *this; }
-  AllocatedRepeatedPtrFieldBackInsertIterator<T>& operator++() { return *this; }
-  AllocatedRepeatedPtrFieldBackInsertIterator<T>& operator++(int /* unused */) {
-    return *this;
-  }
-
- private:
-  RepeatedPtrField<T>* field_;
-};
-
-// Almost identical to AllocatedRepeatedPtrFieldBackInsertIterator. This one
-// uses the UnsafeArenaAddAllocated instead.
-template <typename T>
-class UnsafeArenaAllocatedRepeatedPtrFieldBackInsertIterator {
- public:
-  using iterator_category = std::output_iterator_tag;
-  using value_type = T;
-  using pointer = void;
-  using reference = void;
-  using difference_type = std::ptrdiff_t;
-
-  explicit UnsafeArenaAllocatedRepeatedPtrFieldBackInsertIterator(
-      RepeatedPtrField<T>* const mutable_field)
-      : field_(mutable_field) {}
-  UnsafeArenaAllocatedRepeatedPtrFieldBackInsertIterator<T>& operator=(
-      T const* const ptr_to_value) {
-    field_->UnsafeArenaAddAllocated(const_cast<T*>(ptr_to_value));
-    return *this;
-  }
-  UnsafeArenaAllocatedRepeatedPtrFieldBackInsertIterator<T>& operator*() {
-    return *this;
-  }
-  UnsafeArenaAllocatedRepeatedPtrFieldBackInsertIterator<T>& operator++() {
-    return *this;
-  }
-  UnsafeArenaAllocatedRepeatedPtrFieldBackInsertIterator<T>& operator++(
-      int /* unused */) {
-    return *this;
-  }
-
- private:
-  RepeatedPtrField<T>* field_;
-};
-
-}  // namespace internal
-
-// Provides a back insert iterator for RepeatedPtrField instances,
-// similar to std::back_inserter().
-template <typename T>
-internal::RepeatedPtrFieldBackInsertIterator<T> RepeatedPtrFieldBackInserter(
-    RepeatedPtrField<T>* const mutable_field) {
-  return internal::RepeatedPtrFieldBackInsertIterator<T>(mutable_field);
-}
-
-// Special back insert iterator for RepeatedPtrField instances, just in
-// case someone wants to write generic template code that can access both
-// RepeatedFields and RepeatedPtrFields using a common name.
-template <typename T>
-internal::RepeatedPtrFieldBackInsertIterator<T> RepeatedFieldBackInserter(
-    RepeatedPtrField<T>* const mutable_field) {
-  return internal::RepeatedPtrFieldBackInsertIterator<T>(mutable_field);
-}
-
-// Provides a back insert iterator for RepeatedPtrField instances
-// similar to std::back_inserter() which transfers the ownership while
-// copying elements.
-template <typename T>
-internal::AllocatedRepeatedPtrFieldBackInsertIterator<T>
-AllocatedRepeatedPtrFieldBackInserter(
-    RepeatedPtrField<T>* const mutable_field) {
-  return internal::AllocatedRepeatedPtrFieldBackInsertIterator<T>(
-      mutable_field);
-}
-
-// Similar to AllocatedRepeatedPtrFieldBackInserter, using
-// UnsafeArenaAddAllocated instead of AddAllocated.
-// This is slightly faster if that matters. It is also useful in legacy code
-// that uses temporary ownership to avoid copies. Example:
-//   RepeatedPtrField<T> temp_field;
-//   temp_field.UnsafeArenaAddAllocated(new T);
-//   ... // Do something with temp_field
-//   temp_field.UnsafeArenaExtractSubrange(0, temp_field.size(), nullptr);
-// Putting temp_field on the arena fails because the ownership transfers to the
-// arena at the "AddAllocated" call and is not released anymore causing a
-// double delete. This function uses UnsafeArenaAddAllocated to prevent this.
-template <typename T>
-internal::UnsafeArenaAllocatedRepeatedPtrFieldBackInsertIterator<T>
-UnsafeArenaAllocatedRepeatedPtrFieldBackInserter(
-    RepeatedPtrField<T>* const mutable_field) {
-  return internal::UnsafeArenaAllocatedRepeatedPtrFieldBackInsertIterator<T>(
-      mutable_field);
-}
-
-extern template class PROTOBUF_EXPORT_TEMPLATE_DECLARE
-    RepeatedPtrField<std::string>;
-
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
-
-#endif  // GOOGLE_PROTOBUF_REPEATED_PTR_FIELD_H__
diff --git a/libs/protobuf/src/google/protobuf/service.cc b/libs/protobuf/src/google/protobuf/service.cc
deleted file mode 100644
index 5394568..0000000
--- a/libs/protobuf/src/google/protobuf/service.cc
+++ /dev/null
@@ -1,45 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-
-#include <google/protobuf/service.h>
-
-namespace google {
-namespace protobuf {
-
-Service::~Service() {}
-RpcChannel::~RpcChannel() {}
-RpcController::~RpcController() {}
-
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/service.h b/libs/protobuf/src/google/protobuf/service.h
deleted file mode 100644
index d288eb5..0000000
--- a/libs/protobuf/src/google/protobuf/service.h
+++ /dev/null
@@ -1,295 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-//
-// DEPRECATED:  This module declares the abstract interfaces underlying proto2
-// RPC services.  These are intended to be independent of any particular RPC
-// implementation, so that proto2 services can be used on top of a variety
-// of implementations.  Starting with version 2.3.0, RPC implementations should
-// not try to build on these, but should instead provide code generator plugins
-// which generate code specific to the particular RPC implementation.  This way
-// the generated code can be more appropriate for the implementation in use
-// and can avoid unnecessary layers of indirection.
-//
-//
-// When you use the protocol compiler to compile a service definition, it
-// generates two classes:  An abstract interface for the service (with
-// methods matching the service definition) and a "stub" implementation.
-// A stub is just a type-safe wrapper around an RpcChannel which emulates a
-// local implementation of the service.
-//
-// For example, the service definition:
-//   service MyService {
-//     rpc Foo(MyRequest) returns(MyResponse);
-//   }
-// will generate abstract interface "MyService" and class "MyService::Stub".
-// You could implement a MyService as follows:
-//   class MyServiceImpl : public MyService {
-//    public:
-//     MyServiceImpl() {}
-//     ~MyServiceImpl() {}
-//
-//     // implements MyService ---------------------------------------
-//
-//     void Foo(google::protobuf::RpcController* controller,
-//              const MyRequest* request,
-//              MyResponse* response,
-//              Closure* done) {
-//       // ... read request and fill in response ...
-//       done->Run();
-//     }
-//   };
-// You would then register an instance of MyServiceImpl with your RPC server
-// implementation.  (How to do that depends on the implementation.)
-//
-// To call a remote MyServiceImpl, first you need an RpcChannel connected to it.
-// How to construct a channel depends, again, on your RPC implementation.
-// Here we use a hypothetical "MyRpcChannel" as an example:
-//   MyRpcChannel channel("rpc:hostname:1234/myservice");
-//   MyRpcController controller;
-//   MyServiceImpl::Stub stub(&channel);
-//   FooRequest request;
-//   FooResponse response;
-//
-//   // ... fill in request ...
-//
-//   stub.Foo(&controller, request, &response, NewCallback(HandleResponse));
-//
-// On Thread-Safety:
-//
-// Different RPC implementations may make different guarantees about what
-// threads they may run callbacks on, and what threads the application is
-// allowed to use to call the RPC system.  Portable software should be ready
-// for callbacks to be called on any thread, but should not try to call the
-// RPC system from any thread except for the ones on which it received the
-// callbacks.  Realistically, though, simple software will probably want to
-// use a single-threaded RPC system while high-end software will want to
-// use multiple threads.  RPC implementations should provide multiple
-// choices.
-
-#ifndef GOOGLE_PROTOBUF_SERVICE_H__
-#define GOOGLE_PROTOBUF_SERVICE_H__
-
-
-#include <string>
-#include <google/protobuf/stubs/callback.h>
-#include <google/protobuf/stubs/common.h>
-
-#ifdef SWIG
-#error "You cannot SWIG proto headers"
-#endif
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-
-// Defined in this file.
-class Service;
-class RpcController;
-class RpcChannel;
-
-// Defined in other files.
-class Descriptor;         // descriptor.h
-class ServiceDescriptor;  // descriptor.h
-class MethodDescriptor;   // descriptor.h
-class Message;            // message.h
-
-// Abstract base interface for protocol-buffer-based RPC services.  Services
-// themselves are abstract interfaces (implemented either by servers or as
-// stubs), but they subclass this base interface.  The methods of this
-// interface can be used to call the methods of the Service without knowing
-// its exact type at compile time (analogous to Reflection).
-class PROTOBUF_EXPORT Service {
- public:
-  inline Service() {}
-  virtual ~Service();
-
-  // When constructing a stub, you may pass STUB_OWNS_CHANNEL as the second
-  // parameter to the constructor to tell it to delete its RpcChannel when
-  // destroyed.
-  enum ChannelOwnership { STUB_OWNS_CHANNEL, STUB_DOESNT_OWN_CHANNEL };
-
-  // Get the ServiceDescriptor describing this service and its methods.
-  virtual const ServiceDescriptor* GetDescriptor() = 0;
-
-  // Call a method of the service specified by MethodDescriptor.  This is
-  // normally implemented as a simple switch() that calls the standard
-  // definitions of the service's methods.
-  //
-  // Preconditions:
-  // * method->service() == GetDescriptor()
-  // * request and response are of the exact same classes as the objects
-  //   returned by GetRequestPrototype(method) and
-  //   GetResponsePrototype(method).
-  // * After the call has started, the request must not be modified and the
-  //   response must not be accessed at all until "done" is called.
-  // * "controller" is of the correct type for the RPC implementation being
-  //   used by this Service.  For stubs, the "correct type" depends on the
-  //   RpcChannel which the stub is using.  Server-side Service
-  //   implementations are expected to accept whatever type of RpcController
-  //   the server-side RPC implementation uses.
-  //
-  // Postconditions:
-  // * "done" will be called when the method is complete.  This may be
-  //   before CallMethod() returns or it may be at some point in the future.
-  // * If the RPC succeeded, "response" contains the response returned by
-  //   the server.
-  // * If the RPC failed, "response"'s contents are undefined.  The
-  //   RpcController can be queried to determine if an error occurred and
-  //   possibly to get more information about the error.
-  virtual void CallMethod(const MethodDescriptor* method,
-                          RpcController* controller, const Message* request,
-                          Message* response, Closure* done) = 0;
-
-  // CallMethod() requires that the request and response passed in are of a
-  // particular subclass of Message.  GetRequestPrototype() and
-  // GetResponsePrototype() get the default instances of these required types.
-  // You can then call Message::New() on these instances to construct mutable
-  // objects which you can then pass to CallMethod().
-  //
-  // Example:
-  //   const MethodDescriptor* method =
-  //     service->GetDescriptor()->FindMethodByName("Foo");
-  //   Message* request  = stub->GetRequestPrototype (method)->New();
-  //   Message* response = stub->GetResponsePrototype(method)->New();
-  //   request->ParseFromString(input);
-  //   service->CallMethod(method, *request, response, callback);
-  virtual const Message& GetRequestPrototype(
-      const MethodDescriptor* method) const = 0;
-  virtual const Message& GetResponsePrototype(
-      const MethodDescriptor* method) const = 0;
-
- private:
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(Service);
-};
-
-// An RpcController mediates a single method call.  The primary purpose of
-// the controller is to provide a way to manipulate settings specific to the
-// RPC implementation and to find out about RPC-level errors.
-//
-// The methods provided by the RpcController interface are intended to be a
-// "least common denominator" set of features which we expect all
-// implementations to support.  Specific implementations may provide more
-// advanced features (e.g. deadline propagation).
-class PROTOBUF_EXPORT RpcController {
- public:
-  inline RpcController() {}
-  virtual ~RpcController();
-
-  // Client-side methods ---------------------------------------------
-  // These calls may be made from the client side only.  Their results
-  // are undefined on the server side (may crash).
-
-  // Resets the RpcController to its initial state so that it may be reused in
-  // a new call.  Must not be called while an RPC is in progress.
-  virtual void Reset() = 0;
-
-  // After a call has finished, returns true if the call failed.  The possible
-  // reasons for failure depend on the RPC implementation.  Failed() must not
-  // be called before a call has finished.  If Failed() returns true, the
-  // contents of the response message are undefined.
-  virtual bool Failed() const = 0;
-
-  // If Failed() is true, returns a human-readable description of the error.
-  virtual std::string ErrorText() const = 0;
-
-  // Advises the RPC system that the caller desires that the RPC call be
-  // canceled.  The RPC system may cancel it immediately, may wait awhile and
-  // then cancel it, or may not even cancel the call at all.  If the call is
-  // canceled, the "done" callback will still be called and the RpcController
-  // will indicate that the call failed at that time.
-  virtual void StartCancel() = 0;
-
-  // Server-side methods ---------------------------------------------
-  // These calls may be made from the server side only.  Their results
-  // are undefined on the client side (may crash).
-
-  // Causes Failed() to return true on the client side.  "reason" will be
-  // incorporated into the message returned by ErrorText().  If you find
-  // you need to return machine-readable information about failures, you
-  // should incorporate it into your response protocol buffer and should
-  // NOT call SetFailed().
-  virtual void SetFailed(const std::string& reason) = 0;
-
-  // If true, indicates that the client canceled the RPC, so the server may
-  // as well give up on replying to it.  The server should still call the
-  // final "done" callback.
-  virtual bool IsCanceled() const = 0;
-
-  // Asks that the given callback be called when the RPC is canceled.  The
-  // callback will always be called exactly once.  If the RPC completes without
-  // being canceled, the callback will be called after completion.  If the RPC
-  // has already been canceled when NotifyOnCancel() is called, the callback
-  // will be called immediately.
-  //
-  // NotifyOnCancel() must be called no more than once per request.
-  virtual void NotifyOnCancel(Closure* callback) = 0;
-
- private:
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(RpcController);
-};
-
-// Abstract interface for an RPC channel.  An RpcChannel represents a
-// communication line to a Service which can be used to call that Service's
-// methods.  The Service may be running on another machine.  Normally, you
-// should not call an RpcChannel directly, but instead construct a stub Service
-// wrapping it.  Example:
-//   RpcChannel* channel = new MyRpcChannel("remotehost.example.com:1234");
-//   MyService* service = new MyService::Stub(channel);
-//   service->MyMethod(request, &response, callback);
-class PROTOBUF_EXPORT RpcChannel {
- public:
-  inline RpcChannel() {}
-  virtual ~RpcChannel();
-
-  // Call the given method of the remote service.  The signature of this
-  // procedure looks the same as Service::CallMethod(), but the requirements
-  // are less strict in one important way:  the request and response objects
-  // need not be of any specific class as long as their descriptors are
-  // method->input_type() and method->output_type().
-  virtual void CallMethod(const MethodDescriptor* method,
-                          RpcController* controller, const Message* request,
-                          Message* response, Closure* done) = 0;
-
- private:
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(RpcChannel);
-};
-
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
-
-#endif  // GOOGLE_PROTOBUF_SERVICE_H__
diff --git a/libs/protobuf/src/google/protobuf/source_context.pb.cc b/libs/protobuf/src/google/protobuf/source_context.pb.cc
deleted file mode 100644
index e7525e9..0000000
--- a/libs/protobuf/src/google/protobuf/source_context.pb.cc
+++ /dev/null
@@ -1,297 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/protobuf/source_context.proto
-
-#include <google/protobuf/source_context.pb.h>
-
-#include <algorithm>
-
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/extension_set.h>
-#include <google/protobuf/wire_format_lite.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/generated_message_reflection.h>
-#include <google/protobuf/reflection_ops.h>
-#include <google/protobuf/wire_format.h>
-// @@protoc_insertion_point(includes)
-#include <google/protobuf/port_def.inc>
-
-PROTOBUF_PRAGMA_INIT_SEG
-
-namespace _pb = ::PROTOBUF_NAMESPACE_ID;
-namespace _pbi = _pb::internal;
-
-PROTOBUF_NAMESPACE_OPEN
-PROTOBUF_CONSTEXPR SourceContext::SourceContext(
-    ::_pbi::ConstantInitialized): _impl_{
-    /*decltype(_impl_.file_name_)*/{&::_pbi::fixed_address_empty_string, ::_pbi::ConstantInitialized{}}
-  , /*decltype(_impl_._cached_size_)*/{}} {}
-struct SourceContextDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR SourceContextDefaultTypeInternal()
-      : _instance(::_pbi::ConstantInitialized{}) {}
-  ~SourceContextDefaultTypeInternal() {}
-  union {
-    SourceContext _instance;
-  };
-};
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 SourceContextDefaultTypeInternal _SourceContext_default_instance_;
-PROTOBUF_NAMESPACE_CLOSE
-static ::_pb::Metadata file_level_metadata_google_2fprotobuf_2fsource_5fcontext_2eproto[1];
-static constexpr ::_pb::EnumDescriptor const** file_level_enum_descriptors_google_2fprotobuf_2fsource_5fcontext_2eproto = nullptr;
-static constexpr ::_pb::ServiceDescriptor const** file_level_service_descriptors_google_2fprotobuf_2fsource_5fcontext_2eproto = nullptr;
-
-const uint32_t TableStruct_google_2fprotobuf_2fsource_5fcontext_2eproto::offsets[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = {
-  ~0u,  // no _has_bits_
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::SourceContext, _internal_metadata_),
-  ~0u,  // no _extensions_
-  ~0u,  // no _oneof_case_
-  ~0u,  // no _weak_field_map_
-  ~0u,  // no _inlined_string_donated_
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::SourceContext, _impl_.file_name_),
-};
-static const ::_pbi::MigrationSchema schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = {
-  { 0, -1, -1, sizeof(::PROTOBUF_NAMESPACE_ID::SourceContext)},
-};
-
-static const ::_pb::Message* const file_default_instances[] = {
-  &::PROTOBUF_NAMESPACE_ID::_SourceContext_default_instance_._instance,
-};
-
-const char descriptor_table_protodef_google_2fprotobuf_2fsource_5fcontext_2eproto[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) =
-  "\n$google/protobuf/source_context.proto\022\017"
-  "google.protobuf\"\"\n\rSourceContext\022\021\n\tfile"
-  "_name\030\001 \001(\tB\212\001\n\023com.google.protobufB\022Sou"
-  "rceContextProtoP\001Z6google.golang.org/pro"
-  "tobuf/types/known/sourcecontextpb\242\002\003GPB\252"
-  "\002\036Google.Protobuf.WellKnownTypesb\006proto3"
-  ;
-static ::_pbi::once_flag descriptor_table_google_2fprotobuf_2fsource_5fcontext_2eproto_once;
-const ::_pbi::DescriptorTable descriptor_table_google_2fprotobuf_2fsource_5fcontext_2eproto = {
-    false, false, 240, descriptor_table_protodef_google_2fprotobuf_2fsource_5fcontext_2eproto,
-    "google/protobuf/source_context.proto",
-    &descriptor_table_google_2fprotobuf_2fsource_5fcontext_2eproto_once, nullptr, 0, 1,
-    schemas, file_default_instances, TableStruct_google_2fprotobuf_2fsource_5fcontext_2eproto::offsets,
-    file_level_metadata_google_2fprotobuf_2fsource_5fcontext_2eproto, file_level_enum_descriptors_google_2fprotobuf_2fsource_5fcontext_2eproto,
-    file_level_service_descriptors_google_2fprotobuf_2fsource_5fcontext_2eproto,
-};
-PROTOBUF_ATTRIBUTE_WEAK const ::_pbi::DescriptorTable* descriptor_table_google_2fprotobuf_2fsource_5fcontext_2eproto_getter() {
-  return &descriptor_table_google_2fprotobuf_2fsource_5fcontext_2eproto;
-}
-
-// Force running AddDescriptors() at dynamic initialization time.
-PROTOBUF_ATTRIBUTE_INIT_PRIORITY2 static ::_pbi::AddDescriptorsRunner dynamic_init_dummy_google_2fprotobuf_2fsource_5fcontext_2eproto(&descriptor_table_google_2fprotobuf_2fsource_5fcontext_2eproto);
-PROTOBUF_NAMESPACE_OPEN
-
-// ===================================================================
-
-class SourceContext::_Internal {
- public:
-};
-
-SourceContext::SourceContext(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                         bool is_message_owned)
-  : ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned) {
-  SharedCtor(arena, is_message_owned);
-  // @@protoc_insertion_point(arena_constructor:google.protobuf.SourceContext)
-}
-SourceContext::SourceContext(const SourceContext& from)
-  : ::PROTOBUF_NAMESPACE_ID::Message() {
-  SourceContext* const _this = this; (void)_this;
-  new (&_impl_) Impl_{
-      decltype(_impl_.file_name_){}
-    , /*decltype(_impl_._cached_size_)*/{}};
-
-  _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-  _impl_.file_name_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.file_name_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (!from._internal_file_name().empty()) {
-    _this->_impl_.file_name_.Set(from._internal_file_name(), 
-      _this->GetArenaForAllocation());
-  }
-  // @@protoc_insertion_point(copy_constructor:google.protobuf.SourceContext)
-}
-
-inline void SourceContext::SharedCtor(
-    ::_pb::Arena* arena, bool is_message_owned) {
-  (void)arena;
-  (void)is_message_owned;
-  new (&_impl_) Impl_{
-      decltype(_impl_.file_name_){}
-    , /*decltype(_impl_._cached_size_)*/{}
-  };
-  _impl_.file_name_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.file_name_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-}
-
-SourceContext::~SourceContext() {
-  // @@protoc_insertion_point(destructor:google.protobuf.SourceContext)
-  if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) {
-  (void)arena;
-    return;
-  }
-  SharedDtor();
-}
-
-inline void SourceContext::SharedDtor() {
-  GOOGLE_DCHECK(GetArenaForAllocation() == nullptr);
-  _impl_.file_name_.Destroy();
-}
-
-void SourceContext::SetCachedSize(int size) const {
-  _impl_._cached_size_.Set(size);
-}
-
-void SourceContext::Clear() {
-// @@protoc_insertion_point(message_clear_start:google.protobuf.SourceContext)
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.file_name_.ClearToEmpty();
-  _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>();
-}
-
-const char* SourceContext::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) {
-#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure
-  while (!ctx->Done(&ptr)) {
-    uint32_t tag;
-    ptr = ::_pbi::ReadTag(ptr, &tag);
-    switch (tag >> 3) {
-      // string file_name = 1;
-      case 1:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 10)) {
-          auto str = _internal_mutable_file_name();
-          ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx);
-          CHK_(ptr);
-          CHK_(::_pbi::VerifyUTF8(str, "google.protobuf.SourceContext.file_name"));
-        } else
-          goto handle_unusual;
-        continue;
-      default:
-        goto handle_unusual;
-    }  // switch
-  handle_unusual:
-    if ((tag == 0) || ((tag & 7) == 4)) {
-      CHK_(ptr);
-      ctx->SetLastTag(tag);
-      goto message_done;
-    }
-    ptr = UnknownFieldParse(
-        tag,
-        _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(),
-        ptr, ctx);
-    CHK_(ptr != nullptr);
-  }  // while
-message_done:
-  return ptr;
-failure:
-  ptr = nullptr;
-  goto message_done;
-#undef CHK_
-}
-
-uint8_t* SourceContext::_InternalSerialize(
-    uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.SourceContext)
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  // string file_name = 1;
-  if (!this->_internal_file_name().empty()) {
-    ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String(
-      this->_internal_file_name().data(), static_cast<int>(this->_internal_file_name().length()),
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE,
-      "google.protobuf.SourceContext.file_name");
-    target = stream->WriteStringMaybeAliased(
-        1, this->_internal_file_name(), target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-        _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.SourceContext)
-  return target;
-}
-
-size_t SourceContext::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:google.protobuf.SourceContext)
-  size_t total_size = 0;
-
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // string file_name = 1;
-  if (!this->_internal_file_name().empty()) {
-    total_size += 1 +
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize(
-        this->_internal_file_name());
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData SourceContext::_class_data_ = {
-    ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck,
-    SourceContext::MergeImpl
-};
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*SourceContext::GetClassData() const { return &_class_data_; }
-
-
-void SourceContext::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) {
-  auto* const _this = static_cast<SourceContext*>(&to_msg);
-  auto& from = static_cast<const SourceContext&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.SourceContext)
-  GOOGLE_DCHECK_NE(&from, _this);
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if (!from._internal_file_name().empty()) {
-    _this->_internal_set_file_name(from._internal_file_name());
-  }
-  _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void SourceContext::CopyFrom(const SourceContext& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.SourceContext)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool SourceContext::IsInitialized() const {
-  return true;
-}
-
-void SourceContext::InternalSwap(SourceContext* other) {
-  using std::swap;
-  auto* lhs_arena = GetArenaForAllocation();
-  auto* rhs_arena = other->GetArenaForAllocation();
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::InternalSwap(
-      &_impl_.file_name_, lhs_arena,
-      &other->_impl_.file_name_, rhs_arena
-  );
-}
-
-::PROTOBUF_NAMESPACE_ID::Metadata SourceContext::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_google_2fprotobuf_2fsource_5fcontext_2eproto_getter, &descriptor_table_google_2fprotobuf_2fsource_5fcontext_2eproto_once,
-      file_level_metadata_google_2fprotobuf_2fsource_5fcontext_2eproto[0]);
-}
-
-// @@protoc_insertion_point(namespace_scope)
-PROTOBUF_NAMESPACE_CLOSE
-PROTOBUF_NAMESPACE_OPEN
-template<> PROTOBUF_NOINLINE ::PROTOBUF_NAMESPACE_ID::SourceContext*
-Arena::CreateMaybeMessage< ::PROTOBUF_NAMESPACE_ID::SourceContext >(Arena* arena) {
-  return Arena::CreateMessageInternal< ::PROTOBUF_NAMESPACE_ID::SourceContext >(arena);
-}
-PROTOBUF_NAMESPACE_CLOSE
-
-// @@protoc_insertion_point(global_scope)
-#include <google/protobuf/port_undef.inc>
diff --git a/libs/protobuf/src/google/protobuf/source_context.pb.h b/libs/protobuf/src/google/protobuf/source_context.pb.h
deleted file mode 100644
index 63e7d11..0000000
--- a/libs/protobuf/src/google/protobuf/source_context.pb.h
+++ /dev/null
@@ -1,282 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/protobuf/source_context.proto
-
-#ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fsource_5fcontext_2eproto
-#define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fsource_5fcontext_2eproto
-
-#include <limits>
-#include <string>
-
-#include <google/protobuf/port_def.inc>
-#if PROTOBUF_VERSION < 3021000
-#error This file was generated by a newer version of protoc which is
-#error incompatible with your Protocol Buffer headers. Please update
-#error your headers.
-#endif
-#if 3021012 < PROTOBUF_MIN_PROTOC_VERSION
-#error This file was generated by an older version of protoc which is
-#error incompatible with your Protocol Buffer headers. Please
-#error regenerate this file with a newer version of protoc.
-#endif
-
-#include <google/protobuf/port_undef.inc>
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/arena.h>
-#include <google/protobuf/arenastring.h>
-#include <google/protobuf/generated_message_util.h>
-#include <google/protobuf/metadata_lite.h>
-#include <google/protobuf/generated_message_reflection.h>
-#include <google/protobuf/message.h>
-#include <google/protobuf/repeated_field.h>  // IWYU pragma: export
-#include <google/protobuf/extension_set.h>  // IWYU pragma: export
-#include <google/protobuf/unknown_field_set.h>
-// @@protoc_insertion_point(includes)
-#include <google/protobuf/port_def.inc>
-#define PROTOBUF_INTERNAL_EXPORT_google_2fprotobuf_2fsource_5fcontext_2eproto PROTOBUF_EXPORT
-PROTOBUF_NAMESPACE_OPEN
-namespace internal {
-class AnyMetadata;
-}  // namespace internal
-PROTOBUF_NAMESPACE_CLOSE
-
-// Internal implementation detail -- do not use these members.
-struct PROTOBUF_EXPORT TableStruct_google_2fprotobuf_2fsource_5fcontext_2eproto {
-  static const uint32_t offsets[];
-};
-PROTOBUF_EXPORT extern const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable descriptor_table_google_2fprotobuf_2fsource_5fcontext_2eproto;
-PROTOBUF_NAMESPACE_OPEN
-class SourceContext;
-struct SourceContextDefaultTypeInternal;
-PROTOBUF_EXPORT extern SourceContextDefaultTypeInternal _SourceContext_default_instance_;
-PROTOBUF_NAMESPACE_CLOSE
-PROTOBUF_NAMESPACE_OPEN
-template<> PROTOBUF_EXPORT ::PROTOBUF_NAMESPACE_ID::SourceContext* Arena::CreateMaybeMessage<::PROTOBUF_NAMESPACE_ID::SourceContext>(Arena*);
-PROTOBUF_NAMESPACE_CLOSE
-PROTOBUF_NAMESPACE_OPEN
-
-// ===================================================================
-
-class PROTOBUF_EXPORT SourceContext final :
-    public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:google.protobuf.SourceContext) */ {
- public:
-  inline SourceContext() : SourceContext(nullptr) {}
-  ~SourceContext() override;
-  explicit PROTOBUF_CONSTEXPR SourceContext(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
-
-  SourceContext(const SourceContext& from);
-  SourceContext(SourceContext&& from) noexcept
-    : SourceContext() {
-    *this = ::std::move(from);
-  }
-
-  inline SourceContext& operator=(const SourceContext& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline SourceContext& operator=(SourceContext&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetOwningArena() == from.GetOwningArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetOwningArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const SourceContext& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const SourceContext* internal_default_instance() {
-    return reinterpret_cast<const SourceContext*>(
-               &_SourceContext_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    0;
-
-  friend void swap(SourceContext& a, SourceContext& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(SourceContext* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() != nullptr &&
-        GetOwningArena() == other->GetOwningArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() == other->GetOwningArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(SourceContext* other) {
-    if (other == this) return;
-    GOOGLE_DCHECK(GetOwningArena() == other->GetOwningArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  SourceContext* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<SourceContext>(arena);
-  }
-  using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
-  void CopyFrom(const SourceContext& from);
-  using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom( const SourceContext& from) {
-    SourceContext::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  uint8_t* _InternalSerialize(
-      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
-
-  private:
-  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
-  void SharedDtor();
-  void SetCachedSize(int size) const final;
-  void InternalSwap(SourceContext* other);
-
-  private:
-  friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
-  static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
-    return "google.protobuf.SourceContext";
-  }
-  protected:
-  explicit SourceContext(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                       bool is_message_owned = false);
-  public:
-
-  static const ClassData _class_data_;
-  const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*GetClassData() const final;
-
-  ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kFileNameFieldNumber = 1,
-  };
-  // string file_name = 1;
-  void clear_file_name();
-  const std::string& file_name() const;
-  template <typename ArgT0 = const std::string&, typename... ArgT>
-  void set_file_name(ArgT0&& arg0, ArgT... args);
-  std::string* mutable_file_name();
-  PROTOBUF_NODISCARD std::string* release_file_name();
-  void set_allocated_file_name(std::string* file_name);
-  private:
-  const std::string& _internal_file_name() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_file_name(const std::string& value);
-  std::string* _internal_mutable_file_name();
-  public:
-
-  // @@protoc_insertion_point(class_scope:google.protobuf.SourceContext)
- private:
-  class _Internal;
-
-  template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
-  typedef void InternalArenaConstructable_;
-  typedef void DestructorSkippable_;
-  struct Impl_ {
-    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr file_name_;
-    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_google_2fprotobuf_2fsource_5fcontext_2eproto;
-};
-// ===================================================================
-
-
-// ===================================================================
-
-#ifdef __GNUC__
-  #pragma GCC diagnostic push
-  #pragma GCC diagnostic ignored "-Wstrict-aliasing"
-#endif  // __GNUC__
-// SourceContext
-
-// string file_name = 1;
-inline void SourceContext::clear_file_name() {
-  _impl_.file_name_.ClearToEmpty();
-}
-inline const std::string& SourceContext::file_name() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.SourceContext.file_name)
-  return _internal_file_name();
-}
-template <typename ArgT0, typename... ArgT>
-inline PROTOBUF_ALWAYS_INLINE
-void SourceContext::set_file_name(ArgT0&& arg0, ArgT... args) {
- 
- _impl_.file_name_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
-  // @@protoc_insertion_point(field_set:google.protobuf.SourceContext.file_name)
-}
-inline std::string* SourceContext::mutable_file_name() {
-  std::string* _s = _internal_mutable_file_name();
-  // @@protoc_insertion_point(field_mutable:google.protobuf.SourceContext.file_name)
-  return _s;
-}
-inline const std::string& SourceContext::_internal_file_name() const {
-  return _impl_.file_name_.Get();
-}
-inline void SourceContext::_internal_set_file_name(const std::string& value) {
-  
-  _impl_.file_name_.Set(value, GetArenaForAllocation());
-}
-inline std::string* SourceContext::_internal_mutable_file_name() {
-  
-  return _impl_.file_name_.Mutable(GetArenaForAllocation());
-}
-inline std::string* SourceContext::release_file_name() {
-  // @@protoc_insertion_point(field_release:google.protobuf.SourceContext.file_name)
-  return _impl_.file_name_.Release();
-}
-inline void SourceContext::set_allocated_file_name(std::string* file_name) {
-  if (file_name != nullptr) {
-    
-  } else {
-    
-  }
-  _impl_.file_name_.SetAllocated(file_name, GetArenaForAllocation());
-#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (_impl_.file_name_.IsDefault()) {
-    _impl_.file_name_.Set("", GetArenaForAllocation());
-  }
-#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:google.protobuf.SourceContext.file_name)
-}
-
-#ifdef __GNUC__
-  #pragma GCC diagnostic pop
-#endif  // __GNUC__
-
-// @@protoc_insertion_point(namespace_scope)
-
-PROTOBUF_NAMESPACE_CLOSE
-
-// @@protoc_insertion_point(global_scope)
-
-#include <google/protobuf/port_undef.inc>
-#endif  // GOOGLE_PROTOBUF_INCLUDED_GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fsource_5fcontext_2eproto
diff --git a/libs/protobuf/src/google/protobuf/source_context.proto b/libs/protobuf/src/google/protobuf/source_context.proto
deleted file mode 100644
index 06bfc43..0000000
--- a/libs/protobuf/src/google/protobuf/source_context.proto
+++ /dev/null
@@ -1,48 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto3";
-
-package google.protobuf;
-
-option csharp_namespace = "Google.Protobuf.WellKnownTypes";
-option java_package = "com.google.protobuf";
-option java_outer_classname = "SourceContextProto";
-option java_multiple_files = true;
-option objc_class_prefix = "GPB";
-option go_package = "google.golang.org/protobuf/types/known/sourcecontextpb";
-
-// `SourceContext` represents information about the source of a
-// protobuf element, like the file in which it is defined.
-message SourceContext {
-  // The path-qualified name of the .proto file that contained the associated
-  // protobuf element.  For example: `"google/protobuf/source_context.proto"`.
-  string file_name = 1;
-}
diff --git a/libs/protobuf/src/google/protobuf/string_member_robber.h b/libs/protobuf/src/google/protobuf/string_member_robber.h
deleted file mode 100644
index a4c1051..0000000
--- a/libs/protobuf/src/google/protobuf/string_member_robber.h
+++ /dev/null
@@ -1,38 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef GOOGLE_PROTOBUF_STRING_MEMBER_ROBBER_H__
-#define GOOGLE_PROTOBUF_STRING_MEMBER_ROBBER_H__
-
-#include <string>
-#include <type_traits>
-
-
-#endif  // GOOGLE_PROTOBUF_STRING_MEMBER_ROBBER_H__
diff --git a/libs/protobuf/src/google/protobuf/struct.pb.cc b/libs/protobuf/src/google/protobuf/struct.pb.cc
deleted file mode 100644
index 87c72d4..0000000
--- a/libs/protobuf/src/google/protobuf/struct.pb.cc
+++ /dev/null
@@ -1,1057 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/protobuf/struct.proto
-
-#include <google/protobuf/struct.pb.h>
-
-#include <algorithm>
-
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/extension_set.h>
-#include <google/protobuf/wire_format_lite.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/generated_message_reflection.h>
-#include <google/protobuf/reflection_ops.h>
-#include <google/protobuf/wire_format.h>
-// @@protoc_insertion_point(includes)
-#include <google/protobuf/port_def.inc>
-
-PROTOBUF_PRAGMA_INIT_SEG
-
-namespace _pb = ::PROTOBUF_NAMESPACE_ID;
-namespace _pbi = _pb::internal;
-
-PROTOBUF_NAMESPACE_OPEN
-PROTOBUF_CONSTEXPR Struct_FieldsEntry_DoNotUse::Struct_FieldsEntry_DoNotUse(
-    ::_pbi::ConstantInitialized) {}
-struct Struct_FieldsEntry_DoNotUseDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR Struct_FieldsEntry_DoNotUseDefaultTypeInternal()
-      : _instance(::_pbi::ConstantInitialized{}) {}
-  ~Struct_FieldsEntry_DoNotUseDefaultTypeInternal() {}
-  union {
-    Struct_FieldsEntry_DoNotUse _instance;
-  };
-};
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 Struct_FieldsEntry_DoNotUseDefaultTypeInternal _Struct_FieldsEntry_DoNotUse_default_instance_;
-PROTOBUF_CONSTEXPR Struct::Struct(
-    ::_pbi::ConstantInitialized): _impl_{
-    /*decltype(_impl_.fields_)*/{::_pbi::ConstantInitialized()}
-  , /*decltype(_impl_._cached_size_)*/{}} {}
-struct StructDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR StructDefaultTypeInternal()
-      : _instance(::_pbi::ConstantInitialized{}) {}
-  ~StructDefaultTypeInternal() {}
-  union {
-    Struct _instance;
-  };
-};
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 StructDefaultTypeInternal _Struct_default_instance_;
-PROTOBUF_CONSTEXPR Value::Value(
-    ::_pbi::ConstantInitialized): _impl_{
-    /*decltype(_impl_.kind_)*/{}
-  , /*decltype(_impl_._cached_size_)*/{}
-  , /*decltype(_impl_._oneof_case_)*/{}} {}
-struct ValueDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR ValueDefaultTypeInternal()
-      : _instance(::_pbi::ConstantInitialized{}) {}
-  ~ValueDefaultTypeInternal() {}
-  union {
-    Value _instance;
-  };
-};
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 ValueDefaultTypeInternal _Value_default_instance_;
-PROTOBUF_CONSTEXPR ListValue::ListValue(
-    ::_pbi::ConstantInitialized): _impl_{
-    /*decltype(_impl_.values_)*/{}
-  , /*decltype(_impl_._cached_size_)*/{}} {}
-struct ListValueDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR ListValueDefaultTypeInternal()
-      : _instance(::_pbi::ConstantInitialized{}) {}
-  ~ListValueDefaultTypeInternal() {}
-  union {
-    ListValue _instance;
-  };
-};
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 ListValueDefaultTypeInternal _ListValue_default_instance_;
-PROTOBUF_NAMESPACE_CLOSE
-static ::_pb::Metadata file_level_metadata_google_2fprotobuf_2fstruct_2eproto[4];
-static const ::_pb::EnumDescriptor* file_level_enum_descriptors_google_2fprotobuf_2fstruct_2eproto[1];
-static constexpr ::_pb::ServiceDescriptor const** file_level_service_descriptors_google_2fprotobuf_2fstruct_2eproto = nullptr;
-
-const uint32_t TableStruct_google_2fprotobuf_2fstruct_2eproto::offsets[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = {
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Struct_FieldsEntry_DoNotUse, _has_bits_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Struct_FieldsEntry_DoNotUse, _internal_metadata_),
-  ~0u,  // no _extensions_
-  ~0u,  // no _oneof_case_
-  ~0u,  // no _weak_field_map_
-  ~0u,  // no _inlined_string_donated_
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Struct_FieldsEntry_DoNotUse, key_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Struct_FieldsEntry_DoNotUse, value_),
-  0,
-  1,
-  ~0u,  // no _has_bits_
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Struct, _internal_metadata_),
-  ~0u,  // no _extensions_
-  ~0u,  // no _oneof_case_
-  ~0u,  // no _weak_field_map_
-  ~0u,  // no _inlined_string_donated_
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Struct, _impl_.fields_),
-  ~0u,  // no _has_bits_
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Value, _internal_metadata_),
-  ~0u,  // no _extensions_
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Value, _impl_._oneof_case_[0]),
-  ~0u,  // no _weak_field_map_
-  ~0u,  // no _inlined_string_donated_
-  ::_pbi::kInvalidFieldOffsetTag,
-  ::_pbi::kInvalidFieldOffsetTag,
-  ::_pbi::kInvalidFieldOffsetTag,
-  ::_pbi::kInvalidFieldOffsetTag,
-  ::_pbi::kInvalidFieldOffsetTag,
-  ::_pbi::kInvalidFieldOffsetTag,
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Value, _impl_.kind_),
-  ~0u,  // no _has_bits_
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::ListValue, _internal_metadata_),
-  ~0u,  // no _extensions_
-  ~0u,  // no _oneof_case_
-  ~0u,  // no _weak_field_map_
-  ~0u,  // no _inlined_string_donated_
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::ListValue, _impl_.values_),
-};
-static const ::_pbi::MigrationSchema schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = {
-  { 0, 8, -1, sizeof(::PROTOBUF_NAMESPACE_ID::Struct_FieldsEntry_DoNotUse)},
-  { 10, -1, -1, sizeof(::PROTOBUF_NAMESPACE_ID::Struct)},
-  { 17, -1, -1, sizeof(::PROTOBUF_NAMESPACE_ID::Value)},
-  { 30, -1, -1, sizeof(::PROTOBUF_NAMESPACE_ID::ListValue)},
-};
-
-static const ::_pb::Message* const file_default_instances[] = {
-  &::PROTOBUF_NAMESPACE_ID::_Struct_FieldsEntry_DoNotUse_default_instance_._instance,
-  &::PROTOBUF_NAMESPACE_ID::_Struct_default_instance_._instance,
-  &::PROTOBUF_NAMESPACE_ID::_Value_default_instance_._instance,
-  &::PROTOBUF_NAMESPACE_ID::_ListValue_default_instance_._instance,
-};
-
-const char descriptor_table_protodef_google_2fprotobuf_2fstruct_2eproto[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) =
-  "\n\034google/protobuf/struct.proto\022\017google.p"
-  "rotobuf\"\204\001\n\006Struct\0223\n\006fields\030\001 \003(\0132#.goo"
-  "gle.protobuf.Struct.FieldsEntry\032E\n\013Field"
-  "sEntry\022\013\n\003key\030\001 \001(\t\022%\n\005value\030\002 \001(\0132\026.goo"
-  "gle.protobuf.Value:\0028\001\"\352\001\n\005Value\0220\n\nnull"
-  "_value\030\001 \001(\0162\032.google.protobuf.NullValue"
-  "H\000\022\026\n\014number_value\030\002 \001(\001H\000\022\026\n\014string_val"
-  "ue\030\003 \001(\tH\000\022\024\n\nbool_value\030\004 \001(\010H\000\022/\n\014stru"
-  "ct_value\030\005 \001(\0132\027.google.protobuf.StructH"
-  "\000\0220\n\nlist_value\030\006 \001(\0132\032.google.protobuf."
-  "ListValueH\000B\006\n\004kind\"3\n\tListValue\022&\n\006valu"
-  "es\030\001 \003(\0132\026.google.protobuf.Value*\033\n\tNull"
-  "Value\022\016\n\nNULL_VALUE\020\000B\177\n\023com.google.prot"
-  "obufB\013StructProtoP\001Z/google.golang.org/p"
-  "rotobuf/types/known/structpb\370\001\001\242\002\003GPB\252\002\036"
-  "Google.Protobuf.WellKnownTypesb\006proto3"
-  ;
-static ::_pbi::once_flag descriptor_table_google_2fprotobuf_2fstruct_2eproto_once;
-const ::_pbi::DescriptorTable descriptor_table_google_2fprotobuf_2fstruct_2eproto = {
-    false, false, 638, descriptor_table_protodef_google_2fprotobuf_2fstruct_2eproto,
-    "google/protobuf/struct.proto",
-    &descriptor_table_google_2fprotobuf_2fstruct_2eproto_once, nullptr, 0, 4,
-    schemas, file_default_instances, TableStruct_google_2fprotobuf_2fstruct_2eproto::offsets,
-    file_level_metadata_google_2fprotobuf_2fstruct_2eproto, file_level_enum_descriptors_google_2fprotobuf_2fstruct_2eproto,
-    file_level_service_descriptors_google_2fprotobuf_2fstruct_2eproto,
-};
-PROTOBUF_ATTRIBUTE_WEAK const ::_pbi::DescriptorTable* descriptor_table_google_2fprotobuf_2fstruct_2eproto_getter() {
-  return &descriptor_table_google_2fprotobuf_2fstruct_2eproto;
-}
-
-// Force running AddDescriptors() at dynamic initialization time.
-PROTOBUF_ATTRIBUTE_INIT_PRIORITY2 static ::_pbi::AddDescriptorsRunner dynamic_init_dummy_google_2fprotobuf_2fstruct_2eproto(&descriptor_table_google_2fprotobuf_2fstruct_2eproto);
-PROTOBUF_NAMESPACE_OPEN
-const ::PROTOBUF_NAMESPACE_ID::EnumDescriptor* NullValue_descriptor() {
-  ::PROTOBUF_NAMESPACE_ID::internal::AssignDescriptors(&descriptor_table_google_2fprotobuf_2fstruct_2eproto);
-  return file_level_enum_descriptors_google_2fprotobuf_2fstruct_2eproto[0];
-}
-bool NullValue_IsValid(int value) {
-  switch (value) {
-    case 0:
-      return true;
-    default:
-      return false;
-  }
-}
-
-
-// ===================================================================
-
-Struct_FieldsEntry_DoNotUse::Struct_FieldsEntry_DoNotUse() {}
-Struct_FieldsEntry_DoNotUse::Struct_FieldsEntry_DoNotUse(::PROTOBUF_NAMESPACE_ID::Arena* arena)
-    : SuperType(arena) {}
-void Struct_FieldsEntry_DoNotUse::MergeFrom(const Struct_FieldsEntry_DoNotUse& other) {
-  MergeFromInternal(other);
-}
-::PROTOBUF_NAMESPACE_ID::Metadata Struct_FieldsEntry_DoNotUse::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_google_2fprotobuf_2fstruct_2eproto_getter, &descriptor_table_google_2fprotobuf_2fstruct_2eproto_once,
-      file_level_metadata_google_2fprotobuf_2fstruct_2eproto[0]);
-}
-
-// ===================================================================
-
-class Struct::_Internal {
- public:
-};
-
-Struct::Struct(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                         bool is_message_owned)
-  : ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned) {
-  SharedCtor(arena, is_message_owned);
-  if (arena != nullptr && !is_message_owned) {
-    arena->OwnCustomDestructor(this, &Struct::ArenaDtor);
-  }
-  // @@protoc_insertion_point(arena_constructor:google.protobuf.Struct)
-}
-Struct::Struct(const Struct& from)
-  : ::PROTOBUF_NAMESPACE_ID::Message() {
-  Struct* const _this = this; (void)_this;
-  new (&_impl_) Impl_{
-      /*decltype(_impl_.fields_)*/{}
-    , /*decltype(_impl_._cached_size_)*/{}};
-
-  _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-  _this->_impl_.fields_.MergeFrom(from._impl_.fields_);
-  // @@protoc_insertion_point(copy_constructor:google.protobuf.Struct)
-}
-
-inline void Struct::SharedCtor(
-    ::_pb::Arena* arena, bool is_message_owned) {
-  (void)arena;
-  (void)is_message_owned;
-  new (&_impl_) Impl_{
-      /*decltype(_impl_.fields_)*/{::_pbi::ArenaInitialized(), arena}
-    , /*decltype(_impl_._cached_size_)*/{}
-  };
-}
-
-Struct::~Struct() {
-  // @@protoc_insertion_point(destructor:google.protobuf.Struct)
-  if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) {
-  (void)arena;
-    ArenaDtor(this);
-    return;
-  }
-  SharedDtor();
-}
-
-inline void Struct::SharedDtor() {
-  GOOGLE_DCHECK(GetArenaForAllocation() == nullptr);
-  _impl_.fields_.Destruct();
-  _impl_.fields_.~MapField();
-}
-
-void Struct::ArenaDtor(void* object) {
-  Struct* _this = reinterpret_cast< Struct* >(object);
-  _this->_impl_.fields_.Destruct();
-}
-void Struct::SetCachedSize(int size) const {
-  _impl_._cached_size_.Set(size);
-}
-
-void Struct::Clear() {
-// @@protoc_insertion_point(message_clear_start:google.protobuf.Struct)
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.fields_.Clear();
-  _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>();
-}
-
-const char* Struct::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) {
-#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure
-  while (!ctx->Done(&ptr)) {
-    uint32_t tag;
-    ptr = ::_pbi::ReadTag(ptr, &tag);
-    switch (tag >> 3) {
-      // map<string, .google.protobuf.Value> fields = 1;
-      case 1:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 10)) {
-          ptr -= 1;
-          do {
-            ptr += 1;
-            ptr = ctx->ParseMessage(&_impl_.fields_, ptr);
-            CHK_(ptr);
-            if (!ctx->DataAvailable(ptr)) break;
-          } while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<10>(ptr));
-        } else
-          goto handle_unusual;
-        continue;
-      default:
-        goto handle_unusual;
-    }  // switch
-  handle_unusual:
-    if ((tag == 0) || ((tag & 7) == 4)) {
-      CHK_(ptr);
-      ctx->SetLastTag(tag);
-      goto message_done;
-    }
-    ptr = UnknownFieldParse(
-        tag,
-        _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(),
-        ptr, ctx);
-    CHK_(ptr != nullptr);
-  }  // while
-message_done:
-  return ptr;
-failure:
-  ptr = nullptr;
-  goto message_done;
-#undef CHK_
-}
-
-uint8_t* Struct::_InternalSerialize(
-    uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.Struct)
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  // map<string, .google.protobuf.Value> fields = 1;
-  if (!this->_internal_fields().empty()) {
-    using MapType = ::_pb::Map<std::string, ::PROTOBUF_NAMESPACE_ID::Value>;
-    using WireHelper = Struct_FieldsEntry_DoNotUse::Funcs;
-    const auto& map_field = this->_internal_fields();
-    auto check_utf8 = [](const MapType::value_type& entry) {
-      (void)entry;
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String(
-        entry.first.data(), static_cast<int>(entry.first.length()),
-        ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE,
-        "google.protobuf.Struct.FieldsEntry.key");
-    };
-
-    if (stream->IsSerializationDeterministic() && map_field.size() > 1) {
-      for (const auto& entry : ::_pbi::MapSorterPtr<MapType>(map_field)) {
-        target = WireHelper::InternalSerialize(1, entry.first, entry.second, target, stream);
-        check_utf8(entry);
-      }
-    } else {
-      for (const auto& entry : map_field) {
-        target = WireHelper::InternalSerialize(1, entry.first, entry.second, target, stream);
-        check_utf8(entry);
-      }
-    }
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-        _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.Struct)
-  return target;
-}
-
-size_t Struct::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:google.protobuf.Struct)
-  size_t total_size = 0;
-
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // map<string, .google.protobuf.Value> fields = 1;
-  total_size += 1 *
-      ::PROTOBUF_NAMESPACE_ID::internal::FromIntSize(this->_internal_fields_size());
-  for (::PROTOBUF_NAMESPACE_ID::Map< std::string, ::PROTOBUF_NAMESPACE_ID::Value >::const_iterator
-      it = this->_internal_fields().begin();
-      it != this->_internal_fields().end(); ++it) {
-    total_size += Struct_FieldsEntry_DoNotUse::Funcs::ByteSizeLong(it->first, it->second);
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData Struct::_class_data_ = {
-    ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck,
-    Struct::MergeImpl
-};
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*Struct::GetClassData() const { return &_class_data_; }
-
-
-void Struct::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) {
-  auto* const _this = static_cast<Struct*>(&to_msg);
-  auto& from = static_cast<const Struct&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.Struct)
-  GOOGLE_DCHECK_NE(&from, _this);
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  _this->_impl_.fields_.MergeFrom(from._impl_.fields_);
-  _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void Struct::CopyFrom(const Struct& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.Struct)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool Struct::IsInitialized() const {
-  return true;
-}
-
-void Struct::InternalSwap(Struct* other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  _impl_.fields_.InternalSwap(&other->_impl_.fields_);
-}
-
-::PROTOBUF_NAMESPACE_ID::Metadata Struct::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_google_2fprotobuf_2fstruct_2eproto_getter, &descriptor_table_google_2fprotobuf_2fstruct_2eproto_once,
-      file_level_metadata_google_2fprotobuf_2fstruct_2eproto[1]);
-}
-
-// ===================================================================
-
-class Value::_Internal {
- public:
-  static const ::PROTOBUF_NAMESPACE_ID::Struct& struct_value(const Value* msg);
-  static const ::PROTOBUF_NAMESPACE_ID::ListValue& list_value(const Value* msg);
-};
-
-const ::PROTOBUF_NAMESPACE_ID::Struct&
-Value::_Internal::struct_value(const Value* msg) {
-  return *msg->_impl_.kind_.struct_value_;
-}
-const ::PROTOBUF_NAMESPACE_ID::ListValue&
-Value::_Internal::list_value(const Value* msg) {
-  return *msg->_impl_.kind_.list_value_;
-}
-void Value::set_allocated_struct_value(::PROTOBUF_NAMESPACE_ID::Struct* struct_value) {
-  ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
-  clear_kind();
-  if (struct_value) {
-    ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-      ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(struct_value);
-    if (message_arena != submessage_arena) {
-      struct_value = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
-          message_arena, struct_value, submessage_arena);
-    }
-    set_has_struct_value();
-    _impl_.kind_.struct_value_ = struct_value;
-  }
-  // @@protoc_insertion_point(field_set_allocated:google.protobuf.Value.struct_value)
-}
-void Value::set_allocated_list_value(::PROTOBUF_NAMESPACE_ID::ListValue* list_value) {
-  ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
-  clear_kind();
-  if (list_value) {
-    ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-      ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(list_value);
-    if (message_arena != submessage_arena) {
-      list_value = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
-          message_arena, list_value, submessage_arena);
-    }
-    set_has_list_value();
-    _impl_.kind_.list_value_ = list_value;
-  }
-  // @@protoc_insertion_point(field_set_allocated:google.protobuf.Value.list_value)
-}
-Value::Value(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                         bool is_message_owned)
-  : ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned) {
-  SharedCtor(arena, is_message_owned);
-  // @@protoc_insertion_point(arena_constructor:google.protobuf.Value)
-}
-Value::Value(const Value& from)
-  : ::PROTOBUF_NAMESPACE_ID::Message() {
-  Value* const _this = this; (void)_this;
-  new (&_impl_) Impl_{
-      decltype(_impl_.kind_){}
-    , /*decltype(_impl_._cached_size_)*/{}
-    , /*decltype(_impl_._oneof_case_)*/{}};
-
-  _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-  clear_has_kind();
-  switch (from.kind_case()) {
-    case kNullValue: {
-      _this->_internal_set_null_value(from._internal_null_value());
-      break;
-    }
-    case kNumberValue: {
-      _this->_internal_set_number_value(from._internal_number_value());
-      break;
-    }
-    case kStringValue: {
-      _this->_internal_set_string_value(from._internal_string_value());
-      break;
-    }
-    case kBoolValue: {
-      _this->_internal_set_bool_value(from._internal_bool_value());
-      break;
-    }
-    case kStructValue: {
-      _this->_internal_mutable_struct_value()->::PROTOBUF_NAMESPACE_ID::Struct::MergeFrom(
-          from._internal_struct_value());
-      break;
-    }
-    case kListValue: {
-      _this->_internal_mutable_list_value()->::PROTOBUF_NAMESPACE_ID::ListValue::MergeFrom(
-          from._internal_list_value());
-      break;
-    }
-    case KIND_NOT_SET: {
-      break;
-    }
-  }
-  // @@protoc_insertion_point(copy_constructor:google.protobuf.Value)
-}
-
-inline void Value::SharedCtor(
-    ::_pb::Arena* arena, bool is_message_owned) {
-  (void)arena;
-  (void)is_message_owned;
-  new (&_impl_) Impl_{
-      decltype(_impl_.kind_){}
-    , /*decltype(_impl_._cached_size_)*/{}
-    , /*decltype(_impl_._oneof_case_)*/{}
-  };
-  clear_has_kind();
-}
-
-Value::~Value() {
-  // @@protoc_insertion_point(destructor:google.protobuf.Value)
-  if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) {
-  (void)arena;
-    return;
-  }
-  SharedDtor();
-}
-
-inline void Value::SharedDtor() {
-  GOOGLE_DCHECK(GetArenaForAllocation() == nullptr);
-  if (has_kind()) {
-    clear_kind();
-  }
-}
-
-void Value::SetCachedSize(int size) const {
-  _impl_._cached_size_.Set(size);
-}
-
-void Value::clear_kind() {
-// @@protoc_insertion_point(one_of_clear_start:google.protobuf.Value)
-  switch (kind_case()) {
-    case kNullValue: {
-      // No need to clear
-      break;
-    }
-    case kNumberValue: {
-      // No need to clear
-      break;
-    }
-    case kStringValue: {
-      _impl_.kind_.string_value_.Destroy();
-      break;
-    }
-    case kBoolValue: {
-      // No need to clear
-      break;
-    }
-    case kStructValue: {
-      if (GetArenaForAllocation() == nullptr) {
-        delete _impl_.kind_.struct_value_;
-      }
-      break;
-    }
-    case kListValue: {
-      if (GetArenaForAllocation() == nullptr) {
-        delete _impl_.kind_.list_value_;
-      }
-      break;
-    }
-    case KIND_NOT_SET: {
-      break;
-    }
-  }
-  _impl_._oneof_case_[0] = KIND_NOT_SET;
-}
-
-
-void Value::Clear() {
-// @@protoc_insertion_point(message_clear_start:google.protobuf.Value)
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  clear_kind();
-  _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>();
-}
-
-const char* Value::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) {
-#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure
-  while (!ctx->Done(&ptr)) {
-    uint32_t tag;
-    ptr = ::_pbi::ReadTag(ptr, &tag);
-    switch (tag >> 3) {
-      // .google.protobuf.NullValue null_value = 1;
-      case 1:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 8)) {
-          uint64_t val = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr);
-          CHK_(ptr);
-          _internal_set_null_value(static_cast<::PROTOBUF_NAMESPACE_ID::NullValue>(val));
-        } else
-          goto handle_unusual;
-        continue;
-      // double number_value = 2;
-      case 2:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 17)) {
-          _internal_set_number_value(::PROTOBUF_NAMESPACE_ID::internal::UnalignedLoad<double>(ptr));
-          ptr += sizeof(double);
-        } else
-          goto handle_unusual;
-        continue;
-      // string string_value = 3;
-      case 3:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 26)) {
-          auto str = _internal_mutable_string_value();
-          ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx);
-          CHK_(ptr);
-          CHK_(::_pbi::VerifyUTF8(str, "google.protobuf.Value.string_value"));
-        } else
-          goto handle_unusual;
-        continue;
-      // bool bool_value = 4;
-      case 4:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 32)) {
-          _internal_set_bool_value(::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr));
-          CHK_(ptr);
-        } else
-          goto handle_unusual;
-        continue;
-      // .google.protobuf.Struct struct_value = 5;
-      case 5:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 42)) {
-          ptr = ctx->ParseMessage(_internal_mutable_struct_value(), ptr);
-          CHK_(ptr);
-        } else
-          goto handle_unusual;
-        continue;
-      // .google.protobuf.ListValue list_value = 6;
-      case 6:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 50)) {
-          ptr = ctx->ParseMessage(_internal_mutable_list_value(), ptr);
-          CHK_(ptr);
-        } else
-          goto handle_unusual;
-        continue;
-      default:
-        goto handle_unusual;
-    }  // switch
-  handle_unusual:
-    if ((tag == 0) || ((tag & 7) == 4)) {
-      CHK_(ptr);
-      ctx->SetLastTag(tag);
-      goto message_done;
-    }
-    ptr = UnknownFieldParse(
-        tag,
-        _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(),
-        ptr, ctx);
-    CHK_(ptr != nullptr);
-  }  // while
-message_done:
-  return ptr;
-failure:
-  ptr = nullptr;
-  goto message_done;
-#undef CHK_
-}
-
-uint8_t* Value::_InternalSerialize(
-    uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.Value)
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  // .google.protobuf.NullValue null_value = 1;
-  if (_internal_has_null_value()) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteEnumToArray(
-      1, this->_internal_null_value(), target);
-  }
-
-  // double number_value = 2;
-  if (_internal_has_number_value()) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteDoubleToArray(2, this->_internal_number_value(), target);
-  }
-
-  // string string_value = 3;
-  if (_internal_has_string_value()) {
-    ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String(
-      this->_internal_string_value().data(), static_cast<int>(this->_internal_string_value().length()),
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE,
-      "google.protobuf.Value.string_value");
-    target = stream->WriteStringMaybeAliased(
-        3, this->_internal_string_value(), target);
-  }
-
-  // bool bool_value = 4;
-  if (_internal_has_bool_value()) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteBoolToArray(4, this->_internal_bool_value(), target);
-  }
-
-  // .google.protobuf.Struct struct_value = 5;
-  if (_internal_has_struct_value()) {
-    target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
-      InternalWriteMessage(5, _Internal::struct_value(this),
-        _Internal::struct_value(this).GetCachedSize(), target, stream);
-  }
-
-  // .google.protobuf.ListValue list_value = 6;
-  if (_internal_has_list_value()) {
-    target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
-      InternalWriteMessage(6, _Internal::list_value(this),
-        _Internal::list_value(this).GetCachedSize(), target, stream);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-        _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.Value)
-  return target;
-}
-
-size_t Value::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:google.protobuf.Value)
-  size_t total_size = 0;
-
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  switch (kind_case()) {
-    // .google.protobuf.NullValue null_value = 1;
-    case kNullValue: {
-      total_size += 1 +
-        ::_pbi::WireFormatLite::EnumSize(this->_internal_null_value());
-      break;
-    }
-    // double number_value = 2;
-    case kNumberValue: {
-      total_size += 1 + 8;
-      break;
-    }
-    // string string_value = 3;
-    case kStringValue: {
-      total_size += 1 +
-        ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize(
-          this->_internal_string_value());
-      break;
-    }
-    // bool bool_value = 4;
-    case kBoolValue: {
-      total_size += 1 + 1;
-      break;
-    }
-    // .google.protobuf.Struct struct_value = 5;
-    case kStructValue: {
-      total_size += 1 +
-        ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(
-          *_impl_.kind_.struct_value_);
-      break;
-    }
-    // .google.protobuf.ListValue list_value = 6;
-    case kListValue: {
-      total_size += 1 +
-        ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(
-          *_impl_.kind_.list_value_);
-      break;
-    }
-    case KIND_NOT_SET: {
-      break;
-    }
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData Value::_class_data_ = {
-    ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck,
-    Value::MergeImpl
-};
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*Value::GetClassData() const { return &_class_data_; }
-
-
-void Value::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) {
-  auto* const _this = static_cast<Value*>(&to_msg);
-  auto& from = static_cast<const Value&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.Value)
-  GOOGLE_DCHECK_NE(&from, _this);
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  switch (from.kind_case()) {
-    case kNullValue: {
-      _this->_internal_set_null_value(from._internal_null_value());
-      break;
-    }
-    case kNumberValue: {
-      _this->_internal_set_number_value(from._internal_number_value());
-      break;
-    }
-    case kStringValue: {
-      _this->_internal_set_string_value(from._internal_string_value());
-      break;
-    }
-    case kBoolValue: {
-      _this->_internal_set_bool_value(from._internal_bool_value());
-      break;
-    }
-    case kStructValue: {
-      _this->_internal_mutable_struct_value()->::PROTOBUF_NAMESPACE_ID::Struct::MergeFrom(
-          from._internal_struct_value());
-      break;
-    }
-    case kListValue: {
-      _this->_internal_mutable_list_value()->::PROTOBUF_NAMESPACE_ID::ListValue::MergeFrom(
-          from._internal_list_value());
-      break;
-    }
-    case KIND_NOT_SET: {
-      break;
-    }
-  }
-  _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void Value::CopyFrom(const Value& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.Value)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool Value::IsInitialized() const {
-  return true;
-}
-
-void Value::InternalSwap(Value* other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_.kind_, other->_impl_.kind_);
-  swap(_impl_._oneof_case_[0], other->_impl_._oneof_case_[0]);
-}
-
-::PROTOBUF_NAMESPACE_ID::Metadata Value::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_google_2fprotobuf_2fstruct_2eproto_getter, &descriptor_table_google_2fprotobuf_2fstruct_2eproto_once,
-      file_level_metadata_google_2fprotobuf_2fstruct_2eproto[2]);
-}
-
-// ===================================================================
-
-class ListValue::_Internal {
- public:
-};
-
-ListValue::ListValue(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                         bool is_message_owned)
-  : ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned) {
-  SharedCtor(arena, is_message_owned);
-  // @@protoc_insertion_point(arena_constructor:google.protobuf.ListValue)
-}
-ListValue::ListValue(const ListValue& from)
-  : ::PROTOBUF_NAMESPACE_ID::Message() {
-  ListValue* const _this = this; (void)_this;
-  new (&_impl_) Impl_{
-      decltype(_impl_.values_){from._impl_.values_}
-    , /*decltype(_impl_._cached_size_)*/{}};
-
-  _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-  // @@protoc_insertion_point(copy_constructor:google.protobuf.ListValue)
-}
-
-inline void ListValue::SharedCtor(
-    ::_pb::Arena* arena, bool is_message_owned) {
-  (void)arena;
-  (void)is_message_owned;
-  new (&_impl_) Impl_{
-      decltype(_impl_.values_){arena}
-    , /*decltype(_impl_._cached_size_)*/{}
-  };
-}
-
-ListValue::~ListValue() {
-  // @@protoc_insertion_point(destructor:google.protobuf.ListValue)
-  if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) {
-  (void)arena;
-    return;
-  }
-  SharedDtor();
-}
-
-inline void ListValue::SharedDtor() {
-  GOOGLE_DCHECK(GetArenaForAllocation() == nullptr);
-  _impl_.values_.~RepeatedPtrField();
-}
-
-void ListValue::SetCachedSize(int size) const {
-  _impl_._cached_size_.Set(size);
-}
-
-void ListValue::Clear() {
-// @@protoc_insertion_point(message_clear_start:google.protobuf.ListValue)
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.values_.Clear();
-  _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>();
-}
-
-const char* ListValue::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) {
-#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure
-  while (!ctx->Done(&ptr)) {
-    uint32_t tag;
-    ptr = ::_pbi::ReadTag(ptr, &tag);
-    switch (tag >> 3) {
-      // repeated .google.protobuf.Value values = 1;
-      case 1:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 10)) {
-          ptr -= 1;
-          do {
-            ptr += 1;
-            ptr = ctx->ParseMessage(_internal_add_values(), ptr);
-            CHK_(ptr);
-            if (!ctx->DataAvailable(ptr)) break;
-          } while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<10>(ptr));
-        } else
-          goto handle_unusual;
-        continue;
-      default:
-        goto handle_unusual;
-    }  // switch
-  handle_unusual:
-    if ((tag == 0) || ((tag & 7) == 4)) {
-      CHK_(ptr);
-      ctx->SetLastTag(tag);
-      goto message_done;
-    }
-    ptr = UnknownFieldParse(
-        tag,
-        _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(),
-        ptr, ctx);
-    CHK_(ptr != nullptr);
-  }  // while
-message_done:
-  return ptr;
-failure:
-  ptr = nullptr;
-  goto message_done;
-#undef CHK_
-}
-
-uint8_t* ListValue::_InternalSerialize(
-    uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.ListValue)
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  // repeated .google.protobuf.Value values = 1;
-  for (unsigned i = 0,
-      n = static_cast<unsigned>(this->_internal_values_size()); i < n; i++) {
-    const auto& repfield = this->_internal_values(i);
-    target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
-        InternalWriteMessage(1, repfield, repfield.GetCachedSize(), target, stream);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-        _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.ListValue)
-  return target;
-}
-
-size_t ListValue::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:google.protobuf.ListValue)
-  size_t total_size = 0;
-
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // repeated .google.protobuf.Value values = 1;
-  total_size += 1UL * this->_internal_values_size();
-  for (const auto& msg : this->_impl_.values_) {
-    total_size +=
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(msg);
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData ListValue::_class_data_ = {
-    ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck,
-    ListValue::MergeImpl
-};
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*ListValue::GetClassData() const { return &_class_data_; }
-
-
-void ListValue::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) {
-  auto* const _this = static_cast<ListValue*>(&to_msg);
-  auto& from = static_cast<const ListValue&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.ListValue)
-  GOOGLE_DCHECK_NE(&from, _this);
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  _this->_impl_.values_.MergeFrom(from._impl_.values_);
-  _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void ListValue::CopyFrom(const ListValue& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.ListValue)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool ListValue::IsInitialized() const {
-  return true;
-}
-
-void ListValue::InternalSwap(ListValue* other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  _impl_.values_.InternalSwap(&other->_impl_.values_);
-}
-
-::PROTOBUF_NAMESPACE_ID::Metadata ListValue::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_google_2fprotobuf_2fstruct_2eproto_getter, &descriptor_table_google_2fprotobuf_2fstruct_2eproto_once,
-      file_level_metadata_google_2fprotobuf_2fstruct_2eproto[3]);
-}
-
-// @@protoc_insertion_point(namespace_scope)
-PROTOBUF_NAMESPACE_CLOSE
-PROTOBUF_NAMESPACE_OPEN
-template<> PROTOBUF_NOINLINE ::PROTOBUF_NAMESPACE_ID::Struct_FieldsEntry_DoNotUse*
-Arena::CreateMaybeMessage< ::PROTOBUF_NAMESPACE_ID::Struct_FieldsEntry_DoNotUse >(Arena* arena) {
-  return Arena::CreateMessageInternal< ::PROTOBUF_NAMESPACE_ID::Struct_FieldsEntry_DoNotUse >(arena);
-}
-template<> PROTOBUF_NOINLINE ::PROTOBUF_NAMESPACE_ID::Struct*
-Arena::CreateMaybeMessage< ::PROTOBUF_NAMESPACE_ID::Struct >(Arena* arena) {
-  return Arena::CreateMessageInternal< ::PROTOBUF_NAMESPACE_ID::Struct >(arena);
-}
-template<> PROTOBUF_NOINLINE ::PROTOBUF_NAMESPACE_ID::Value*
-Arena::CreateMaybeMessage< ::PROTOBUF_NAMESPACE_ID::Value >(Arena* arena) {
-  return Arena::CreateMessageInternal< ::PROTOBUF_NAMESPACE_ID::Value >(arena);
-}
-template<> PROTOBUF_NOINLINE ::PROTOBUF_NAMESPACE_ID::ListValue*
-Arena::CreateMaybeMessage< ::PROTOBUF_NAMESPACE_ID::ListValue >(Arena* arena) {
-  return Arena::CreateMessageInternal< ::PROTOBUF_NAMESPACE_ID::ListValue >(arena);
-}
-PROTOBUF_NAMESPACE_CLOSE
-
-// @@protoc_insertion_point(global_scope)
-#include <google/protobuf/port_undef.inc>
diff --git a/libs/protobuf/src/google/protobuf/struct.pb.h b/libs/protobuf/src/google/protobuf/struct.pb.h
deleted file mode 100644
index 002aa85..0000000
--- a/libs/protobuf/src/google/protobuf/struct.pb.h
+++ /dev/null
@@ -1,1177 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/protobuf/struct.proto
-
-#ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fstruct_2eproto
-#define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fstruct_2eproto
-
-#include <limits>
-#include <string>
-
-#include <google/protobuf/port_def.inc>
-#if PROTOBUF_VERSION < 3021000
-#error This file was generated by a newer version of protoc which is
-#error incompatible with your Protocol Buffer headers. Please update
-#error your headers.
-#endif
-#if 3021012 < PROTOBUF_MIN_PROTOC_VERSION
-#error This file was generated by an older version of protoc which is
-#error incompatible with your Protocol Buffer headers. Please
-#error regenerate this file with a newer version of protoc.
-#endif
-
-#include <google/protobuf/port_undef.inc>
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/arena.h>
-#include <google/protobuf/arenastring.h>
-#include <google/protobuf/generated_message_util.h>
-#include <google/protobuf/metadata_lite.h>
-#include <google/protobuf/generated_message_reflection.h>
-#include <google/protobuf/message.h>
-#include <google/protobuf/repeated_field.h>  // IWYU pragma: export
-#include <google/protobuf/extension_set.h>  // IWYU pragma: export
-#include <google/protobuf/map.h>  // IWYU pragma: export
-#include <google/protobuf/map_entry.h>
-#include <google/protobuf/map_field_inl.h>
-#include <google/protobuf/generated_enum_reflection.h>
-#include <google/protobuf/unknown_field_set.h>
-// @@protoc_insertion_point(includes)
-#include <google/protobuf/port_def.inc>
-#define PROTOBUF_INTERNAL_EXPORT_google_2fprotobuf_2fstruct_2eproto PROTOBUF_EXPORT
-PROTOBUF_NAMESPACE_OPEN
-namespace internal {
-class AnyMetadata;
-}  // namespace internal
-PROTOBUF_NAMESPACE_CLOSE
-
-// Internal implementation detail -- do not use these members.
-struct PROTOBUF_EXPORT TableStruct_google_2fprotobuf_2fstruct_2eproto {
-  static const uint32_t offsets[];
-};
-PROTOBUF_EXPORT extern const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable descriptor_table_google_2fprotobuf_2fstruct_2eproto;
-PROTOBUF_NAMESPACE_OPEN
-class ListValue;
-struct ListValueDefaultTypeInternal;
-PROTOBUF_EXPORT extern ListValueDefaultTypeInternal _ListValue_default_instance_;
-class Struct;
-struct StructDefaultTypeInternal;
-PROTOBUF_EXPORT extern StructDefaultTypeInternal _Struct_default_instance_;
-class Struct_FieldsEntry_DoNotUse;
-struct Struct_FieldsEntry_DoNotUseDefaultTypeInternal;
-PROTOBUF_EXPORT extern Struct_FieldsEntry_DoNotUseDefaultTypeInternal _Struct_FieldsEntry_DoNotUse_default_instance_;
-class Value;
-struct ValueDefaultTypeInternal;
-PROTOBUF_EXPORT extern ValueDefaultTypeInternal _Value_default_instance_;
-PROTOBUF_NAMESPACE_CLOSE
-PROTOBUF_NAMESPACE_OPEN
-template<> PROTOBUF_EXPORT ::PROTOBUF_NAMESPACE_ID::ListValue* Arena::CreateMaybeMessage<::PROTOBUF_NAMESPACE_ID::ListValue>(Arena*);
-template<> PROTOBUF_EXPORT ::PROTOBUF_NAMESPACE_ID::Struct* Arena::CreateMaybeMessage<::PROTOBUF_NAMESPACE_ID::Struct>(Arena*);
-template<> PROTOBUF_EXPORT ::PROTOBUF_NAMESPACE_ID::Struct_FieldsEntry_DoNotUse* Arena::CreateMaybeMessage<::PROTOBUF_NAMESPACE_ID::Struct_FieldsEntry_DoNotUse>(Arena*);
-template<> PROTOBUF_EXPORT ::PROTOBUF_NAMESPACE_ID::Value* Arena::CreateMaybeMessage<::PROTOBUF_NAMESPACE_ID::Value>(Arena*);
-PROTOBUF_NAMESPACE_CLOSE
-PROTOBUF_NAMESPACE_OPEN
-
-enum NullValue : int {
-  NULL_VALUE = 0,
-  NullValue_INT_MIN_SENTINEL_DO_NOT_USE_ = std::numeric_limits<int32_t>::min(),
-  NullValue_INT_MAX_SENTINEL_DO_NOT_USE_ = std::numeric_limits<int32_t>::max()
-};
-PROTOBUF_EXPORT bool NullValue_IsValid(int value);
-constexpr NullValue NullValue_MIN = NULL_VALUE;
-constexpr NullValue NullValue_MAX = NULL_VALUE;
-constexpr int NullValue_ARRAYSIZE = NullValue_MAX + 1;
-
-PROTOBUF_EXPORT const ::PROTOBUF_NAMESPACE_ID::EnumDescriptor* NullValue_descriptor();
-template<typename T>
-inline const std::string& NullValue_Name(T enum_t_value) {
-  static_assert(::std::is_same<T, NullValue>::value ||
-    ::std::is_integral<T>::value,
-    "Incorrect type passed to function NullValue_Name.");
-  return ::PROTOBUF_NAMESPACE_ID::internal::NameOfEnum(
-    NullValue_descriptor(), enum_t_value);
-}
-inline bool NullValue_Parse(
-    ::PROTOBUF_NAMESPACE_ID::ConstStringParam name, NullValue* value) {
-  return ::PROTOBUF_NAMESPACE_ID::internal::ParseNamedEnum<NullValue>(
-    NullValue_descriptor(), name, value);
-}
-// ===================================================================
-
-class Struct_FieldsEntry_DoNotUse : public ::PROTOBUF_NAMESPACE_ID::internal::MapEntry<Struct_FieldsEntry_DoNotUse, 
-    std::string, ::PROTOBUF_NAMESPACE_ID::Value,
-    ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::TYPE_STRING,
-    ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::TYPE_MESSAGE> {
-public:
-  typedef ::PROTOBUF_NAMESPACE_ID::internal::MapEntry<Struct_FieldsEntry_DoNotUse, 
-    std::string, ::PROTOBUF_NAMESPACE_ID::Value,
-    ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::TYPE_STRING,
-    ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::TYPE_MESSAGE> SuperType;
-  Struct_FieldsEntry_DoNotUse();
-  explicit PROTOBUF_CONSTEXPR Struct_FieldsEntry_DoNotUse(
-      ::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
-  explicit Struct_FieldsEntry_DoNotUse(::PROTOBUF_NAMESPACE_ID::Arena* arena);
-  void MergeFrom(const Struct_FieldsEntry_DoNotUse& other);
-  static const Struct_FieldsEntry_DoNotUse* internal_default_instance() { return reinterpret_cast<const Struct_FieldsEntry_DoNotUse*>(&_Struct_FieldsEntry_DoNotUse_default_instance_); }
-  static bool ValidateKey(std::string* s) {
-    return ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String(s->data(), static_cast<int>(s->size()), ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::PARSE, "google.protobuf.Struct.FieldsEntry.key");
- }
-  static bool ValidateValue(void*) { return true; }
-  using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final;
-  friend struct ::TableStruct_google_2fprotobuf_2fstruct_2eproto;
-};
-
-// -------------------------------------------------------------------
-
-class PROTOBUF_EXPORT Struct final :
-    public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:google.protobuf.Struct) */ {
- public:
-  inline Struct() : Struct(nullptr) {}
-  ~Struct() override;
-  explicit PROTOBUF_CONSTEXPR Struct(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
-
-  Struct(const Struct& from);
-  Struct(Struct&& from) noexcept
-    : Struct() {
-    *this = ::std::move(from);
-  }
-
-  inline Struct& operator=(const Struct& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline Struct& operator=(Struct&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetOwningArena() == from.GetOwningArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetOwningArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const Struct& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const Struct* internal_default_instance() {
-    return reinterpret_cast<const Struct*>(
-               &_Struct_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    1;
-
-  friend void swap(Struct& a, Struct& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(Struct* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() != nullptr &&
-        GetOwningArena() == other->GetOwningArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() == other->GetOwningArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(Struct* other) {
-    if (other == this) return;
-    GOOGLE_DCHECK(GetOwningArena() == other->GetOwningArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  Struct* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<Struct>(arena);
-  }
-  using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
-  void CopyFrom(const Struct& from);
-  using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom( const Struct& from) {
-    Struct::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  uint8_t* _InternalSerialize(
-      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
-
-  private:
-  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
-  void SharedDtor();
-  void SetCachedSize(int size) const final;
-  void InternalSwap(Struct* other);
-
-  private:
-  friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
-  static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
-    return "google.protobuf.Struct";
-  }
-  protected:
-  explicit Struct(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                       bool is_message_owned = false);
-  private:
-  static void ArenaDtor(void* object);
-  public:
-
-  static const ClassData _class_data_;
-  const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*GetClassData() const final;
-
-  ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kFieldsFieldNumber = 1,
-  };
-  // map<string, .google.protobuf.Value> fields = 1;
-  int fields_size() const;
-  private:
-  int _internal_fields_size() const;
-  public:
-  void clear_fields();
-  private:
-  const ::PROTOBUF_NAMESPACE_ID::Map< std::string, ::PROTOBUF_NAMESPACE_ID::Value >&
-      _internal_fields() const;
-  ::PROTOBUF_NAMESPACE_ID::Map< std::string, ::PROTOBUF_NAMESPACE_ID::Value >*
-      _internal_mutable_fields();
-  public:
-  const ::PROTOBUF_NAMESPACE_ID::Map< std::string, ::PROTOBUF_NAMESPACE_ID::Value >&
-      fields() const;
-  ::PROTOBUF_NAMESPACE_ID::Map< std::string, ::PROTOBUF_NAMESPACE_ID::Value >*
-      mutable_fields();
-
-  // @@protoc_insertion_point(class_scope:google.protobuf.Struct)
- private:
-  class _Internal;
-
-  template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
-  typedef void InternalArenaConstructable_;
-  typedef void DestructorSkippable_;
-  struct Impl_ {
-    ::PROTOBUF_NAMESPACE_ID::internal::MapField<
-        Struct_FieldsEntry_DoNotUse,
-        std::string, ::PROTOBUF_NAMESPACE_ID::Value,
-        ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::TYPE_STRING,
-        ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::TYPE_MESSAGE> fields_;
-    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_google_2fprotobuf_2fstruct_2eproto;
-};
-// -------------------------------------------------------------------
-
-class PROTOBUF_EXPORT Value final :
-    public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:google.protobuf.Value) */ {
- public:
-  inline Value() : Value(nullptr) {}
-  ~Value() override;
-  explicit PROTOBUF_CONSTEXPR Value(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
-
-  Value(const Value& from);
-  Value(Value&& from) noexcept
-    : Value() {
-    *this = ::std::move(from);
-  }
-
-  inline Value& operator=(const Value& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline Value& operator=(Value&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetOwningArena() == from.GetOwningArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetOwningArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const Value& default_instance() {
-    return *internal_default_instance();
-  }
-  enum KindCase {
-    kNullValue = 1,
-    kNumberValue = 2,
-    kStringValue = 3,
-    kBoolValue = 4,
-    kStructValue = 5,
-    kListValue = 6,
-    KIND_NOT_SET = 0,
-  };
-
-  static inline const Value* internal_default_instance() {
-    return reinterpret_cast<const Value*>(
-               &_Value_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    2;
-
-  friend void swap(Value& a, Value& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(Value* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() != nullptr &&
-        GetOwningArena() == other->GetOwningArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() == other->GetOwningArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(Value* other) {
-    if (other == this) return;
-    GOOGLE_DCHECK(GetOwningArena() == other->GetOwningArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  Value* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<Value>(arena);
-  }
-  using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
-  void CopyFrom(const Value& from);
-  using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom( const Value& from) {
-    Value::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  uint8_t* _InternalSerialize(
-      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
-
-  private:
-  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
-  void SharedDtor();
-  void SetCachedSize(int size) const final;
-  void InternalSwap(Value* other);
-
-  private:
-  friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
-  static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
-    return "google.protobuf.Value";
-  }
-  protected:
-  explicit Value(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                       bool is_message_owned = false);
-  public:
-
-  static const ClassData _class_data_;
-  const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*GetClassData() const final;
-
-  ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kNullValueFieldNumber = 1,
-    kNumberValueFieldNumber = 2,
-    kStringValueFieldNumber = 3,
-    kBoolValueFieldNumber = 4,
-    kStructValueFieldNumber = 5,
-    kListValueFieldNumber = 6,
-  };
-  // .google.protobuf.NullValue null_value = 1;
-  bool has_null_value() const;
-  private:
-  bool _internal_has_null_value() const;
-  public:
-  void clear_null_value();
-  ::PROTOBUF_NAMESPACE_ID::NullValue null_value() const;
-  void set_null_value(::PROTOBUF_NAMESPACE_ID::NullValue value);
-  private:
-  ::PROTOBUF_NAMESPACE_ID::NullValue _internal_null_value() const;
-  void _internal_set_null_value(::PROTOBUF_NAMESPACE_ID::NullValue value);
-  public:
-
-  // double number_value = 2;
-  bool has_number_value() const;
-  private:
-  bool _internal_has_number_value() const;
-  public:
-  void clear_number_value();
-  double number_value() const;
-  void set_number_value(double value);
-  private:
-  double _internal_number_value() const;
-  void _internal_set_number_value(double value);
-  public:
-
-  // string string_value = 3;
-  bool has_string_value() const;
-  private:
-  bool _internal_has_string_value() const;
-  public:
-  void clear_string_value();
-  const std::string& string_value() const;
-  template <typename ArgT0 = const std::string&, typename... ArgT>
-  void set_string_value(ArgT0&& arg0, ArgT... args);
-  std::string* mutable_string_value();
-  PROTOBUF_NODISCARD std::string* release_string_value();
-  void set_allocated_string_value(std::string* string_value);
-  private:
-  const std::string& _internal_string_value() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_string_value(const std::string& value);
-  std::string* _internal_mutable_string_value();
-  public:
-
-  // bool bool_value = 4;
-  bool has_bool_value() const;
-  private:
-  bool _internal_has_bool_value() const;
-  public:
-  void clear_bool_value();
-  bool bool_value() const;
-  void set_bool_value(bool value);
-  private:
-  bool _internal_bool_value() const;
-  void _internal_set_bool_value(bool value);
-  public:
-
-  // .google.protobuf.Struct struct_value = 5;
-  bool has_struct_value() const;
-  private:
-  bool _internal_has_struct_value() const;
-  public:
-  void clear_struct_value();
-  const ::PROTOBUF_NAMESPACE_ID::Struct& struct_value() const;
-  PROTOBUF_NODISCARD ::PROTOBUF_NAMESPACE_ID::Struct* release_struct_value();
-  ::PROTOBUF_NAMESPACE_ID::Struct* mutable_struct_value();
-  void set_allocated_struct_value(::PROTOBUF_NAMESPACE_ID::Struct* struct_value);
-  private:
-  const ::PROTOBUF_NAMESPACE_ID::Struct& _internal_struct_value() const;
-  ::PROTOBUF_NAMESPACE_ID::Struct* _internal_mutable_struct_value();
-  public:
-  void unsafe_arena_set_allocated_struct_value(
-      ::PROTOBUF_NAMESPACE_ID::Struct* struct_value);
-  ::PROTOBUF_NAMESPACE_ID::Struct* unsafe_arena_release_struct_value();
-
-  // .google.protobuf.ListValue list_value = 6;
-  bool has_list_value() const;
-  private:
-  bool _internal_has_list_value() const;
-  public:
-  void clear_list_value();
-  const ::PROTOBUF_NAMESPACE_ID::ListValue& list_value() const;
-  PROTOBUF_NODISCARD ::PROTOBUF_NAMESPACE_ID::ListValue* release_list_value();
-  ::PROTOBUF_NAMESPACE_ID::ListValue* mutable_list_value();
-  void set_allocated_list_value(::PROTOBUF_NAMESPACE_ID::ListValue* list_value);
-  private:
-  const ::PROTOBUF_NAMESPACE_ID::ListValue& _internal_list_value() const;
-  ::PROTOBUF_NAMESPACE_ID::ListValue* _internal_mutable_list_value();
-  public:
-  void unsafe_arena_set_allocated_list_value(
-      ::PROTOBUF_NAMESPACE_ID::ListValue* list_value);
-  ::PROTOBUF_NAMESPACE_ID::ListValue* unsafe_arena_release_list_value();
-
-  void clear_kind();
-  KindCase kind_case() const;
-  // @@protoc_insertion_point(class_scope:google.protobuf.Value)
- private:
-  class _Internal;
-  void set_has_null_value();
-  void set_has_number_value();
-  void set_has_string_value();
-  void set_has_bool_value();
-  void set_has_struct_value();
-  void set_has_list_value();
-
-  inline bool has_kind() const;
-  inline void clear_has_kind();
-
-  template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
-  typedef void InternalArenaConstructable_;
-  typedef void DestructorSkippable_;
-  struct Impl_ {
-    union KindUnion {
-      constexpr KindUnion() : _constinit_{} {}
-        ::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized _constinit_;
-      int null_value_;
-      double number_value_;
-      ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr string_value_;
-      bool bool_value_;
-      ::PROTOBUF_NAMESPACE_ID::Struct* struct_value_;
-      ::PROTOBUF_NAMESPACE_ID::ListValue* list_value_;
-    } kind_;
-    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-    uint32_t _oneof_case_[1];
-
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_google_2fprotobuf_2fstruct_2eproto;
-};
-// -------------------------------------------------------------------
-
-class PROTOBUF_EXPORT ListValue final :
-    public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:google.protobuf.ListValue) */ {
- public:
-  inline ListValue() : ListValue(nullptr) {}
-  ~ListValue() override;
-  explicit PROTOBUF_CONSTEXPR ListValue(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
-
-  ListValue(const ListValue& from);
-  ListValue(ListValue&& from) noexcept
-    : ListValue() {
-    *this = ::std::move(from);
-  }
-
-  inline ListValue& operator=(const ListValue& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline ListValue& operator=(ListValue&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetOwningArena() == from.GetOwningArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetOwningArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const ListValue& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const ListValue* internal_default_instance() {
-    return reinterpret_cast<const ListValue*>(
-               &_ListValue_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    3;
-
-  friend void swap(ListValue& a, ListValue& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(ListValue* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() != nullptr &&
-        GetOwningArena() == other->GetOwningArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() == other->GetOwningArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(ListValue* other) {
-    if (other == this) return;
-    GOOGLE_DCHECK(GetOwningArena() == other->GetOwningArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  ListValue* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<ListValue>(arena);
-  }
-  using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
-  void CopyFrom(const ListValue& from);
-  using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom( const ListValue& from) {
-    ListValue::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  uint8_t* _InternalSerialize(
-      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
-
-  private:
-  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
-  void SharedDtor();
-  void SetCachedSize(int size) const final;
-  void InternalSwap(ListValue* other);
-
-  private:
-  friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
-  static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
-    return "google.protobuf.ListValue";
-  }
-  protected:
-  explicit ListValue(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                       bool is_message_owned = false);
-  public:
-
-  static const ClassData _class_data_;
-  const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*GetClassData() const final;
-
-  ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kValuesFieldNumber = 1,
-  };
-  // repeated .google.protobuf.Value values = 1;
-  int values_size() const;
-  private:
-  int _internal_values_size() const;
-  public:
-  void clear_values();
-  ::PROTOBUF_NAMESPACE_ID::Value* mutable_values(int index);
-  ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::Value >*
-      mutable_values();
-  private:
-  const ::PROTOBUF_NAMESPACE_ID::Value& _internal_values(int index) const;
-  ::PROTOBUF_NAMESPACE_ID::Value* _internal_add_values();
-  public:
-  const ::PROTOBUF_NAMESPACE_ID::Value& values(int index) const;
-  ::PROTOBUF_NAMESPACE_ID::Value* add_values();
-  const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::Value >&
-      values() const;
-
-  // @@protoc_insertion_point(class_scope:google.protobuf.ListValue)
- private:
-  class _Internal;
-
-  template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
-  typedef void InternalArenaConstructable_;
-  typedef void DestructorSkippable_;
-  struct Impl_ {
-    ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::Value > values_;
-    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_google_2fprotobuf_2fstruct_2eproto;
-};
-// ===================================================================
-
-
-// ===================================================================
-
-#ifdef __GNUC__
-  #pragma GCC diagnostic push
-  #pragma GCC diagnostic ignored "-Wstrict-aliasing"
-#endif  // __GNUC__
-// -------------------------------------------------------------------
-
-// Struct
-
-// map<string, .google.protobuf.Value> fields = 1;
-inline int Struct::_internal_fields_size() const {
-  return _impl_.fields_.size();
-}
-inline int Struct::fields_size() const {
-  return _internal_fields_size();
-}
-inline void Struct::clear_fields() {
-  _impl_.fields_.Clear();
-}
-inline const ::PROTOBUF_NAMESPACE_ID::Map< std::string, ::PROTOBUF_NAMESPACE_ID::Value >&
-Struct::_internal_fields() const {
-  return _impl_.fields_.GetMap();
-}
-inline const ::PROTOBUF_NAMESPACE_ID::Map< std::string, ::PROTOBUF_NAMESPACE_ID::Value >&
-Struct::fields() const {
-  // @@protoc_insertion_point(field_map:google.protobuf.Struct.fields)
-  return _internal_fields();
-}
-inline ::PROTOBUF_NAMESPACE_ID::Map< std::string, ::PROTOBUF_NAMESPACE_ID::Value >*
-Struct::_internal_mutable_fields() {
-  return _impl_.fields_.MutableMap();
-}
-inline ::PROTOBUF_NAMESPACE_ID::Map< std::string, ::PROTOBUF_NAMESPACE_ID::Value >*
-Struct::mutable_fields() {
-  // @@protoc_insertion_point(field_mutable_map:google.protobuf.Struct.fields)
-  return _internal_mutable_fields();
-}
-
-// -------------------------------------------------------------------
-
-// Value
-
-// .google.protobuf.NullValue null_value = 1;
-inline bool Value::_internal_has_null_value() const {
-  return kind_case() == kNullValue;
-}
-inline bool Value::has_null_value() const {
-  return _internal_has_null_value();
-}
-inline void Value::set_has_null_value() {
-  _impl_._oneof_case_[0] = kNullValue;
-}
-inline void Value::clear_null_value() {
-  if (_internal_has_null_value()) {
-    _impl_.kind_.null_value_ = 0;
-    clear_has_kind();
-  }
-}
-inline ::PROTOBUF_NAMESPACE_ID::NullValue Value::_internal_null_value() const {
-  if (_internal_has_null_value()) {
-    return static_cast< ::PROTOBUF_NAMESPACE_ID::NullValue >(_impl_.kind_.null_value_);
-  }
-  return static_cast< ::PROTOBUF_NAMESPACE_ID::NullValue >(0);
-}
-inline ::PROTOBUF_NAMESPACE_ID::NullValue Value::null_value() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.Value.null_value)
-  return _internal_null_value();
-}
-inline void Value::_internal_set_null_value(::PROTOBUF_NAMESPACE_ID::NullValue value) {
-  if (!_internal_has_null_value()) {
-    clear_kind();
-    set_has_null_value();
-  }
-  _impl_.kind_.null_value_ = value;
-}
-inline void Value::set_null_value(::PROTOBUF_NAMESPACE_ID::NullValue value) {
-  _internal_set_null_value(value);
-  // @@protoc_insertion_point(field_set:google.protobuf.Value.null_value)
-}
-
-// double number_value = 2;
-inline bool Value::_internal_has_number_value() const {
-  return kind_case() == kNumberValue;
-}
-inline bool Value::has_number_value() const {
-  return _internal_has_number_value();
-}
-inline void Value::set_has_number_value() {
-  _impl_._oneof_case_[0] = kNumberValue;
-}
-inline void Value::clear_number_value() {
-  if (_internal_has_number_value()) {
-    _impl_.kind_.number_value_ = 0;
-    clear_has_kind();
-  }
-}
-inline double Value::_internal_number_value() const {
-  if (_internal_has_number_value()) {
-    return _impl_.kind_.number_value_;
-  }
-  return 0;
-}
-inline void Value::_internal_set_number_value(double value) {
-  if (!_internal_has_number_value()) {
-    clear_kind();
-    set_has_number_value();
-  }
-  _impl_.kind_.number_value_ = value;
-}
-inline double Value::number_value() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.Value.number_value)
-  return _internal_number_value();
-}
-inline void Value::set_number_value(double value) {
-  _internal_set_number_value(value);
-  // @@protoc_insertion_point(field_set:google.protobuf.Value.number_value)
-}
-
-// string string_value = 3;
-inline bool Value::_internal_has_string_value() const {
-  return kind_case() == kStringValue;
-}
-inline bool Value::has_string_value() const {
-  return _internal_has_string_value();
-}
-inline void Value::set_has_string_value() {
-  _impl_._oneof_case_[0] = kStringValue;
-}
-inline void Value::clear_string_value() {
-  if (_internal_has_string_value()) {
-    _impl_.kind_.string_value_.Destroy();
-    clear_has_kind();
-  }
-}
-inline const std::string& Value::string_value() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.Value.string_value)
-  return _internal_string_value();
-}
-template <typename ArgT0, typename... ArgT>
-inline void Value::set_string_value(ArgT0&& arg0, ArgT... args) {
-  if (!_internal_has_string_value()) {
-    clear_kind();
-    set_has_string_value();
-    _impl_.kind_.string_value_.InitDefault();
-  }
-  _impl_.kind_.string_value_.Set( static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
-  // @@protoc_insertion_point(field_set:google.protobuf.Value.string_value)
-}
-inline std::string* Value::mutable_string_value() {
-  std::string* _s = _internal_mutable_string_value();
-  // @@protoc_insertion_point(field_mutable:google.protobuf.Value.string_value)
-  return _s;
-}
-inline const std::string& Value::_internal_string_value() const {
-  if (_internal_has_string_value()) {
-    return _impl_.kind_.string_value_.Get();
-  }
-  return ::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited();
-}
-inline void Value::_internal_set_string_value(const std::string& value) {
-  if (!_internal_has_string_value()) {
-    clear_kind();
-    set_has_string_value();
-    _impl_.kind_.string_value_.InitDefault();
-  }
-  _impl_.kind_.string_value_.Set(value, GetArenaForAllocation());
-}
-inline std::string* Value::_internal_mutable_string_value() {
-  if (!_internal_has_string_value()) {
-    clear_kind();
-    set_has_string_value();
-    _impl_.kind_.string_value_.InitDefault();
-  }
-  return _impl_.kind_.string_value_.Mutable(      GetArenaForAllocation());
-}
-inline std::string* Value::release_string_value() {
-  // @@protoc_insertion_point(field_release:google.protobuf.Value.string_value)
-  if (_internal_has_string_value()) {
-    clear_has_kind();
-    return _impl_.kind_.string_value_.Release();
-  } else {
-    return nullptr;
-  }
-}
-inline void Value::set_allocated_string_value(std::string* string_value) {
-  if (has_kind()) {
-    clear_kind();
-  }
-  if (string_value != nullptr) {
-    set_has_string_value();
-    _impl_.kind_.string_value_.InitAllocated(string_value, GetArenaForAllocation());
-  }
-  // @@protoc_insertion_point(field_set_allocated:google.protobuf.Value.string_value)
-}
-
-// bool bool_value = 4;
-inline bool Value::_internal_has_bool_value() const {
-  return kind_case() == kBoolValue;
-}
-inline bool Value::has_bool_value() const {
-  return _internal_has_bool_value();
-}
-inline void Value::set_has_bool_value() {
-  _impl_._oneof_case_[0] = kBoolValue;
-}
-inline void Value::clear_bool_value() {
-  if (_internal_has_bool_value()) {
-    _impl_.kind_.bool_value_ = false;
-    clear_has_kind();
-  }
-}
-inline bool Value::_internal_bool_value() const {
-  if (_internal_has_bool_value()) {
-    return _impl_.kind_.bool_value_;
-  }
-  return false;
-}
-inline void Value::_internal_set_bool_value(bool value) {
-  if (!_internal_has_bool_value()) {
-    clear_kind();
-    set_has_bool_value();
-  }
-  _impl_.kind_.bool_value_ = value;
-}
-inline bool Value::bool_value() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.Value.bool_value)
-  return _internal_bool_value();
-}
-inline void Value::set_bool_value(bool value) {
-  _internal_set_bool_value(value);
-  // @@protoc_insertion_point(field_set:google.protobuf.Value.bool_value)
-}
-
-// .google.protobuf.Struct struct_value = 5;
-inline bool Value::_internal_has_struct_value() const {
-  return kind_case() == kStructValue;
-}
-inline bool Value::has_struct_value() const {
-  return _internal_has_struct_value();
-}
-inline void Value::set_has_struct_value() {
-  _impl_._oneof_case_[0] = kStructValue;
-}
-inline void Value::clear_struct_value() {
-  if (_internal_has_struct_value()) {
-    if (GetArenaForAllocation() == nullptr) {
-      delete _impl_.kind_.struct_value_;
-    }
-    clear_has_kind();
-  }
-}
-inline ::PROTOBUF_NAMESPACE_ID::Struct* Value::release_struct_value() {
-  // @@protoc_insertion_point(field_release:google.protobuf.Value.struct_value)
-  if (_internal_has_struct_value()) {
-    clear_has_kind();
-    ::PROTOBUF_NAMESPACE_ID::Struct* temp = _impl_.kind_.struct_value_;
-    if (GetArenaForAllocation() != nullptr) {
-      temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.kind_.struct_value_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::PROTOBUF_NAMESPACE_ID::Struct& Value::_internal_struct_value() const {
-  return _internal_has_struct_value()
-      ? *_impl_.kind_.struct_value_
-      : reinterpret_cast< ::PROTOBUF_NAMESPACE_ID::Struct&>(::PROTOBUF_NAMESPACE_ID::_Struct_default_instance_);
-}
-inline const ::PROTOBUF_NAMESPACE_ID::Struct& Value::struct_value() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.Value.struct_value)
-  return _internal_struct_value();
-}
-inline ::PROTOBUF_NAMESPACE_ID::Struct* Value::unsafe_arena_release_struct_value() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:google.protobuf.Value.struct_value)
-  if (_internal_has_struct_value()) {
-    clear_has_kind();
-    ::PROTOBUF_NAMESPACE_ID::Struct* temp = _impl_.kind_.struct_value_;
-    _impl_.kind_.struct_value_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void Value::unsafe_arena_set_allocated_struct_value(::PROTOBUF_NAMESPACE_ID::Struct* struct_value) {
-  clear_kind();
-  if (struct_value) {
-    set_has_struct_value();
-    _impl_.kind_.struct_value_ = struct_value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:google.protobuf.Value.struct_value)
-}
-inline ::PROTOBUF_NAMESPACE_ID::Struct* Value::_internal_mutable_struct_value() {
-  if (!_internal_has_struct_value()) {
-    clear_kind();
-    set_has_struct_value();
-    _impl_.kind_.struct_value_ = CreateMaybeMessage< ::PROTOBUF_NAMESPACE_ID::Struct >(GetArenaForAllocation());
-  }
-  return _impl_.kind_.struct_value_;
-}
-inline ::PROTOBUF_NAMESPACE_ID::Struct* Value::mutable_struct_value() {
-  ::PROTOBUF_NAMESPACE_ID::Struct* _msg = _internal_mutable_struct_value();
-  // @@protoc_insertion_point(field_mutable:google.protobuf.Value.struct_value)
-  return _msg;
-}
-
-// .google.protobuf.ListValue list_value = 6;
-inline bool Value::_internal_has_list_value() const {
-  return kind_case() == kListValue;
-}
-inline bool Value::has_list_value() const {
-  return _internal_has_list_value();
-}
-inline void Value::set_has_list_value() {
-  _impl_._oneof_case_[0] = kListValue;
-}
-inline void Value::clear_list_value() {
-  if (_internal_has_list_value()) {
-    if (GetArenaForAllocation() == nullptr) {
-      delete _impl_.kind_.list_value_;
-    }
-    clear_has_kind();
-  }
-}
-inline ::PROTOBUF_NAMESPACE_ID::ListValue* Value::release_list_value() {
-  // @@protoc_insertion_point(field_release:google.protobuf.Value.list_value)
-  if (_internal_has_list_value()) {
-    clear_has_kind();
-    ::PROTOBUF_NAMESPACE_ID::ListValue* temp = _impl_.kind_.list_value_;
-    if (GetArenaForAllocation() != nullptr) {
-      temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.kind_.list_value_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::PROTOBUF_NAMESPACE_ID::ListValue& Value::_internal_list_value() const {
-  return _internal_has_list_value()
-      ? *_impl_.kind_.list_value_
-      : reinterpret_cast< ::PROTOBUF_NAMESPACE_ID::ListValue&>(::PROTOBUF_NAMESPACE_ID::_ListValue_default_instance_);
-}
-inline const ::PROTOBUF_NAMESPACE_ID::ListValue& Value::list_value() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.Value.list_value)
-  return _internal_list_value();
-}
-inline ::PROTOBUF_NAMESPACE_ID::ListValue* Value::unsafe_arena_release_list_value() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:google.protobuf.Value.list_value)
-  if (_internal_has_list_value()) {
-    clear_has_kind();
-    ::PROTOBUF_NAMESPACE_ID::ListValue* temp = _impl_.kind_.list_value_;
-    _impl_.kind_.list_value_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void Value::unsafe_arena_set_allocated_list_value(::PROTOBUF_NAMESPACE_ID::ListValue* list_value) {
-  clear_kind();
-  if (list_value) {
-    set_has_list_value();
-    _impl_.kind_.list_value_ = list_value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:google.protobuf.Value.list_value)
-}
-inline ::PROTOBUF_NAMESPACE_ID::ListValue* Value::_internal_mutable_list_value() {
-  if (!_internal_has_list_value()) {
-    clear_kind();
-    set_has_list_value();
-    _impl_.kind_.list_value_ = CreateMaybeMessage< ::PROTOBUF_NAMESPACE_ID::ListValue >(GetArenaForAllocation());
-  }
-  return _impl_.kind_.list_value_;
-}
-inline ::PROTOBUF_NAMESPACE_ID::ListValue* Value::mutable_list_value() {
-  ::PROTOBUF_NAMESPACE_ID::ListValue* _msg = _internal_mutable_list_value();
-  // @@protoc_insertion_point(field_mutable:google.protobuf.Value.list_value)
-  return _msg;
-}
-
-inline bool Value::has_kind() const {
-  return kind_case() != KIND_NOT_SET;
-}
-inline void Value::clear_has_kind() {
-  _impl_._oneof_case_[0] = KIND_NOT_SET;
-}
-inline Value::KindCase Value::kind_case() const {
-  return Value::KindCase(_impl_._oneof_case_[0]);
-}
-// -------------------------------------------------------------------
-
-// ListValue
-
-// repeated .google.protobuf.Value values = 1;
-inline int ListValue::_internal_values_size() const {
-  return _impl_.values_.size();
-}
-inline int ListValue::values_size() const {
-  return _internal_values_size();
-}
-inline void ListValue::clear_values() {
-  _impl_.values_.Clear();
-}
-inline ::PROTOBUF_NAMESPACE_ID::Value* ListValue::mutable_values(int index) {
-  // @@protoc_insertion_point(field_mutable:google.protobuf.ListValue.values)
-  return _impl_.values_.Mutable(index);
-}
-inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::Value >*
-ListValue::mutable_values() {
-  // @@protoc_insertion_point(field_mutable_list:google.protobuf.ListValue.values)
-  return &_impl_.values_;
-}
-inline const ::PROTOBUF_NAMESPACE_ID::Value& ListValue::_internal_values(int index) const {
-  return _impl_.values_.Get(index);
-}
-inline const ::PROTOBUF_NAMESPACE_ID::Value& ListValue::values(int index) const {
-  // @@protoc_insertion_point(field_get:google.protobuf.ListValue.values)
-  return _internal_values(index);
-}
-inline ::PROTOBUF_NAMESPACE_ID::Value* ListValue::_internal_add_values() {
-  return _impl_.values_.Add();
-}
-inline ::PROTOBUF_NAMESPACE_ID::Value* ListValue::add_values() {
-  ::PROTOBUF_NAMESPACE_ID::Value* _add = _internal_add_values();
-  // @@protoc_insertion_point(field_add:google.protobuf.ListValue.values)
-  return _add;
-}
-inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::Value >&
-ListValue::values() const {
-  // @@protoc_insertion_point(field_list:google.protobuf.ListValue.values)
-  return _impl_.values_;
-}
-
-#ifdef __GNUC__
-  #pragma GCC diagnostic pop
-#endif  // __GNUC__
-// -------------------------------------------------------------------
-
-// -------------------------------------------------------------------
-
-// -------------------------------------------------------------------
-
-
-// @@protoc_insertion_point(namespace_scope)
-
-PROTOBUF_NAMESPACE_CLOSE
-
-PROTOBUF_NAMESPACE_OPEN
-
-template <> struct is_proto_enum< ::PROTOBUF_NAMESPACE_ID::NullValue> : ::std::true_type {};
-template <>
-inline const EnumDescriptor* GetEnumDescriptor< ::PROTOBUF_NAMESPACE_ID::NullValue>() {
-  return ::PROTOBUF_NAMESPACE_ID::NullValue_descriptor();
-}
-
-PROTOBUF_NAMESPACE_CLOSE
-
-// @@protoc_insertion_point(global_scope)
-
-#include <google/protobuf/port_undef.inc>
-#endif  // GOOGLE_PROTOBUF_INCLUDED_GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fstruct_2eproto
diff --git a/libs/protobuf/src/google/protobuf/struct.proto b/libs/protobuf/src/google/protobuf/struct.proto
deleted file mode 100644
index 0ac843c..0000000
--- a/libs/protobuf/src/google/protobuf/struct.proto
+++ /dev/null
@@ -1,95 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto3";
-
-package google.protobuf;
-
-option csharp_namespace = "Google.Protobuf.WellKnownTypes";
-option cc_enable_arenas = true;
-option go_package = "google.golang.org/protobuf/types/known/structpb";
-option java_package = "com.google.protobuf";
-option java_outer_classname = "StructProto";
-option java_multiple_files = true;
-option objc_class_prefix = "GPB";
-
-// `Struct` represents a structured data value, consisting of fields
-// which map to dynamically typed values. In some languages, `Struct`
-// might be supported by a native representation. For example, in
-// scripting languages like JS a struct is represented as an
-// object. The details of that representation are described together
-// with the proto support for the language.
-//
-// The JSON representation for `Struct` is JSON object.
-message Struct {
-  // Unordered map of dynamically typed values.
-  map<string, Value> fields = 1;
-}
-
-// `Value` represents a dynamically typed value which can be either
-// null, a number, a string, a boolean, a recursive struct value, or a
-// list of values. A producer of value is expected to set one of these
-// variants. Absence of any variant indicates an error.
-//
-// The JSON representation for `Value` is JSON value.
-message Value {
-  // The kind of value.
-  oneof kind {
-    // Represents a null value.
-    NullValue null_value = 1;
-    // Represents a double value.
-    double number_value = 2;
-    // Represents a string value.
-    string string_value = 3;
-    // Represents a boolean value.
-    bool bool_value = 4;
-    // Represents a structured value.
-    Struct struct_value = 5;
-    // Represents a repeated `Value`.
-    ListValue list_value = 6;
-  }
-}
-
-// `NullValue` is a singleton enumeration to represent the null value for the
-// `Value` type union.
-//
-//  The JSON representation for `NullValue` is JSON `null`.
-enum NullValue {
-  // Null value.
-  NULL_VALUE = 0;
-}
-
-// `ListValue` is a wrapper around a repeated field of values.
-//
-// The JSON representation for `ListValue` is JSON array.
-message ListValue {
-  // Repeated field of dynamically typed values.
-  repeated Value values = 1;
-}
diff --git a/libs/protobuf/src/google/protobuf/stubs/bytestream.cc b/libs/protobuf/src/google/protobuf/stubs/bytestream.cc
deleted file mode 100644
index 980d6f6..0000000
--- a/libs/protobuf/src/google/protobuf/stubs/bytestream.cc
+++ /dev/null
@@ -1,194 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <google/protobuf/stubs/bytestream.h>
-
-#include <string.h>
-#include <algorithm>
-
-#include <google/protobuf/stubs/logging.h>
-
-namespace google {
-namespace protobuf {
-namespace strings {
-
-void ByteSource::CopyTo(ByteSink* sink, size_t n) {
-  while (n > 0) {
-    StringPiece fragment = Peek();
-    if (fragment.empty()) {
-      GOOGLE_LOG(DFATAL) << "ByteSource::CopyTo() overran input.";
-      break;
-    }
-    std::size_t fragment_size = std::min<std::size_t>(n, fragment.size());
-    sink->Append(fragment.data(), fragment_size);
-    Skip(fragment_size);
-    n -= fragment_size;
-  }
-}
-
-void ByteSink::Flush() {}
-
-void UncheckedArrayByteSink::Append(const char* data, size_t n) {
-  if (data != dest_) {
-    // Catch cases where the pointer returned by GetAppendBuffer() was modified.
-    GOOGLE_DCHECK(!(dest_ <= data && data < (dest_ + n)))
-        << "Append() data[] overlaps with dest_[]";
-    memcpy(dest_, data, n);
-  }
-  dest_ += n;
-}
-
-CheckedArrayByteSink::CheckedArrayByteSink(char* outbuf, size_t capacity)
-    : outbuf_(outbuf), capacity_(capacity), size_(0), overflowed_(false) {
-}
-
-void CheckedArrayByteSink::Append(const char* bytes, size_t n) {
-  size_t available = capacity_ - size_;
-  if (n > available) {
-    n = available;
-    overflowed_ = true;
-  }
-  if (n > 0 && bytes != (outbuf_ + size_)) {
-    // Catch cases where the pointer returned by GetAppendBuffer() was modified.
-    GOOGLE_DCHECK(!(outbuf_ <= bytes && bytes < (outbuf_ + capacity_)))
-        << "Append() bytes[] overlaps with outbuf_[]";
-    memcpy(outbuf_ + size_, bytes, n);
-  }
-  size_ += n;
-}
-
-GrowingArrayByteSink::GrowingArrayByteSink(size_t estimated_size)
-    : capacity_(estimated_size),
-      buf_(new char[estimated_size]),
-      size_(0) {
-}
-
-GrowingArrayByteSink::~GrowingArrayByteSink() {
-  delete[] buf_;  // Just in case the user didn't call GetBuffer.
-}
-
-void GrowingArrayByteSink::Append(const char* bytes, size_t n) {
-  size_t available = capacity_ - size_;
-  if (bytes != (buf_ + size_)) {
-    // Catch cases where the pointer returned by GetAppendBuffer() was modified.
-    // We need to test for this before calling Expand() which may reallocate.
-    GOOGLE_DCHECK(!(buf_ <= bytes && bytes < (buf_ + capacity_)))
-        << "Append() bytes[] overlaps with buf_[]";
-  }
-  if (n > available) {
-    Expand(n - available);
-  }
-  if (n > 0 && bytes != (buf_ + size_)) {
-    memcpy(buf_ + size_, bytes, n);
-  }
-  size_ += n;
-}
-
-char* GrowingArrayByteSink::GetBuffer(size_t* nbytes) {
-  ShrinkToFit();
-  char* b = buf_;
-  *nbytes = size_;
-  buf_ = nullptr;
-  size_ = capacity_ = 0;
-  return b;
-}
-
-void GrowingArrayByteSink::Expand(size_t amount) {  // Expand by at least 50%.
-  size_t new_capacity = std::max(capacity_ + amount, (3 * capacity_) / 2);
-  char* bigger = new char[new_capacity];
-  memcpy(bigger, buf_, size_);
-  delete[] buf_;
-  buf_ = bigger;
-  capacity_ = new_capacity;
-}
-
-void GrowingArrayByteSink::ShrinkToFit() {
-  // Shrink only if the buffer is large and size_ is less than 3/4
-  // of capacity_.
-  if (capacity_ > 256 && size_ < (3 * capacity_) / 4) {
-    char* just_enough = new char[size_];
-    memcpy(just_enough, buf_, size_);
-    delete[] buf_;
-    buf_ = just_enough;
-    capacity_ = size_;
-  }
-}
-
-void StringByteSink::Append(const char* data, size_t n) {
-  dest_->append(data, n);
-}
-
-size_t ArrayByteSource::Available() const {
-  return input_.size();
-}
-
-StringPiece ArrayByteSource::Peek() {
-  return input_;
-}
-
-void ArrayByteSource::Skip(size_t n) {
-  GOOGLE_DCHECK_LE(n, input_.size());
-  input_.remove_prefix(n);
-}
-
-LimitByteSource::LimitByteSource(ByteSource *source, size_t limit)
-  : source_(source),
-    limit_(limit) {
-}
-
-size_t LimitByteSource::Available() const {
-  size_t available = source_->Available();
-  if (available > limit_) {
-    available = limit_;
-  }
-
-  return available;
-}
-
-StringPiece LimitByteSource::Peek() {
-  StringPiece piece = source_->Peek();
-  return StringPiece(piece.data(), std::min(piece.size(), limit_));
-}
-
-void LimitByteSource::Skip(size_t n) {
-  GOOGLE_DCHECK_LE(n, limit_);
-  source_->Skip(n);
-  limit_ -= n;
-}
-
-void LimitByteSource::CopyTo(ByteSink *sink, size_t n) {
-  GOOGLE_DCHECK_LE(n, limit_);
-  source_->CopyTo(sink, n);
-  limit_ -= n;
-}
-
-}  // namespace strings
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/stubs/bytestream.h b/libs/protobuf/src/google/protobuf/stubs/bytestream.h
deleted file mode 100644
index c7a48de..0000000
--- a/libs/protobuf/src/google/protobuf/stubs/bytestream.h
+++ /dev/null
@@ -1,351 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// This file declares the ByteSink and ByteSource abstract interfaces. These
-// interfaces represent objects that consume (ByteSink) or produce (ByteSource)
-// a sequence of bytes. Using these abstract interfaces in your APIs can help
-// make your code work with a variety of input and output types.
-//
-// This file also declares the following commonly used implementations of these
-// interfaces.
-//
-//   ByteSink:
-//      UncheckedArrayByteSink  Writes to an array, without bounds checking
-//      CheckedArrayByteSink    Writes to an array, with bounds checking
-//      GrowingArrayByteSink    Allocates and writes to a growable buffer
-//      StringByteSink          Writes to an STL string
-//      NullByteSink            Consumes a never-ending stream of bytes
-//
-//   ByteSource:
-//      ArrayByteSource         Reads from an array or string/StringPiece
-//      LimitedByteSource       Limits the number of bytes read from an
-
-#ifndef GOOGLE_PROTOBUF_STUBS_BYTESTREAM_H_
-#define GOOGLE_PROTOBUF_STUBS_BYTESTREAM_H_
-
-#include <stddef.h>
-#include <string>
-
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/stubs/stringpiece.h>
-
-#include <google/protobuf/port_def.inc>
-
-class CordByteSink;
-
-namespace google {
-namespace protobuf {
-namespace strings {
-
-// An abstract interface for an object that consumes a sequence of bytes. This
-// interface offers a way to append data as well as a Flush() function.
-//
-// Example:
-//
-//   string my_data;
-//   ...
-//   ByteSink* sink = ...
-//   sink->Append(my_data.data(), my_data.size());
-//   sink->Flush();
-//
-class PROTOBUF_EXPORT ByteSink {
- public:
-  ByteSink() {}
-  virtual ~ByteSink() {}
-
-  // Appends the "n" bytes starting at "bytes".
-  virtual void Append(const char* bytes, size_t n) = 0;
-
-  // Flushes internal buffers. The default implementation does nothing. ByteSink
-  // subclasses may use internal buffers that require calling Flush() at the end
-  // of the stream.
-  virtual void Flush();
-
- private:
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(ByteSink);
-};
-
-// An abstract interface for an object that produces a fixed-size sequence of
-// bytes.
-//
-// Example:
-//
-//   ByteSource* source = ...
-//   while (source->Available() > 0) {
-//     StringPiece data = source->Peek();
-//     ... do something with "data" ...
-//     source->Skip(data.length());
-//   }
-//
-class PROTOBUF_EXPORT ByteSource {
- public:
-  ByteSource() {}
-  virtual ~ByteSource() {}
-
-  // Returns the number of bytes left to read from the source. Available()
-  // should decrease by N each time Skip(N) is called. Available() may not
-  // increase. Available() returning 0 indicates that the ByteSource is
-  // exhausted.
-  //
-  // Note: Size() may have been a more appropriate name as it's more
-  //       indicative of the fixed-size nature of a ByteSource.
-  virtual size_t Available() const = 0;
-
-  // Returns a StringPiece of the next contiguous region of the source. Does not
-  // reposition the source. The returned region is empty iff Available() == 0.
-  //
-  // The returned region is valid until the next call to Skip() or until this
-  // object is destroyed, whichever occurs first.
-  //
-  // The length of the returned StringPiece will be <= Available().
-  virtual StringPiece Peek() = 0;
-
-  // Skips the next n bytes. Invalidates any StringPiece returned by a previous
-  // call to Peek().
-  //
-  // REQUIRES: Available() >= n
-  virtual void Skip(size_t n) = 0;
-
-  // Writes the next n bytes in this ByteSource to the given ByteSink, and
-  // advances this ByteSource past the copied bytes. The default implementation
-  // of this method just copies the bytes normally, but subclasses might
-  // override CopyTo to optimize certain cases.
-  //
-  // REQUIRES: Available() >= n
-  virtual void CopyTo(ByteSink* sink, size_t n);
-
- private:
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(ByteSource);
-};
-
-//
-// Some commonly used implementations of ByteSink
-//
-
-// Implementation of ByteSink that writes to an unsized byte array. No
-// bounds-checking is performed--it is the caller's responsibility to ensure
-// that the destination array is large enough.
-//
-// Example:
-//
-//   char buf[10];
-//   UncheckedArrayByteSink sink(buf);
-//   sink.Append("hi", 2);    // OK
-//   sink.Append(data, 100);  // WOOPS! Overflows buf[10].
-//
-class PROTOBUF_EXPORT UncheckedArrayByteSink : public ByteSink {
- public:
-  explicit UncheckedArrayByteSink(char* dest) : dest_(dest) {}
-  virtual void Append(const char* data, size_t n) override;
-
-  // Returns the current output pointer so that a caller can see how many bytes
-  // were produced.
-  //
-  // Note: this method is not part of the ByteSink interface.
-  char* CurrentDestination() const { return dest_; }
-
- private:
-  char* dest_;
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(UncheckedArrayByteSink);
-};
-
-// Implementation of ByteSink that writes to a sized byte array. This sink will
-// not write more than "capacity" bytes to outbuf. Once "capacity" bytes are
-// appended, subsequent bytes will be ignored and Overflowed() will return true.
-// Overflowed() does not cause a runtime error (i.e., it does not CHECK fail).
-//
-// Example:
-//
-//   char buf[10];
-//   CheckedArrayByteSink sink(buf, 10);
-//   sink.Append("hi", 2);    // OK
-//   sink.Append(data, 100);  // Will only write 8 more bytes
-//
-class PROTOBUF_EXPORT CheckedArrayByteSink : public ByteSink {
- public:
-  CheckedArrayByteSink(char* outbuf, size_t capacity);
-  virtual void Append(const char* bytes, size_t n) override;
-
-  // Returns the number of bytes actually written to the sink.
-  size_t NumberOfBytesWritten() const { return size_; }
-
-  // Returns true if any bytes were discarded, i.e., if there was an
-  // attempt to write more than 'capacity' bytes.
-  bool Overflowed() const { return overflowed_; }
-
- private:
-  char* outbuf_;
-  const size_t capacity_;
-  size_t size_;
-  bool overflowed_;
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(CheckedArrayByteSink);
-};
-
-// Implementation of ByteSink that allocates an internal buffer (a char array)
-// and expands it as needed to accommodate appended data (similar to a string),
-// and allows the caller to take ownership of the internal buffer via the
-// GetBuffer() method. The buffer returned from GetBuffer() must be deleted by
-// the caller with delete[]. GetBuffer() also sets the internal buffer to be
-// empty, and subsequent appends to the sink will create a new buffer. The
-// destructor will free the internal buffer if GetBuffer() was not called.
-//
-// Example:
-//
-//   GrowingArrayByteSink sink(10);
-//   sink.Append("hi", 2);
-//   sink.Append(data, n);
-//   const char* buf = sink.GetBuffer();  // Ownership transferred
-//   delete[] buf;
-//
-class PROTOBUF_EXPORT GrowingArrayByteSink : public strings::ByteSink {
- public:
-  explicit GrowingArrayByteSink(size_t estimated_size);
-  virtual ~GrowingArrayByteSink();
-  virtual void Append(const char* bytes, size_t n) override;
-
-  // Returns the allocated buffer, and sets nbytes to its size. The caller takes
-  // ownership of the buffer and must delete it with delete[].
-  char* GetBuffer(size_t* nbytes);
-
- private:
-  void Expand(size_t amount);
-  void ShrinkToFit();
-
-  size_t capacity_;
-  char* buf_;
-  size_t size_;
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(GrowingArrayByteSink);
-};
-
-// Implementation of ByteSink that appends to the given string.
-// Existing contents of "dest" are not modified; new data is appended.
-//
-// Example:
-//
-//   string dest = "Hello ";
-//   StringByteSink sink(&dest);
-//   sink.Append("World", 5);
-//   assert(dest == "Hello World");
-//
-class PROTOBUF_EXPORT StringByteSink : public ByteSink {
- public:
-  explicit StringByteSink(std::string* dest) : dest_(dest) {}
-  virtual void Append(const char* data, size_t n) override;
-
- private:
-  std::string* dest_;
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(StringByteSink);
-};
-
-// Implementation of ByteSink that discards all data.
-//
-// Example:
-//
-//   NullByteSink sink;
-//   sink.Append(data, data.size());  // All data ignored.
-//
-class PROTOBUF_EXPORT NullByteSink : public ByteSink {
- public:
-  NullByteSink() {}
-  void Append(const char* /*data*/, size_t /*n*/) override {}
-
- private:
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(NullByteSink);
-};
-
-//
-// Some commonly used implementations of ByteSource
-//
-
-// Implementation of ByteSource that reads from a StringPiece.
-//
-// Example:
-//
-//   string data = "Hello";
-//   ArrayByteSource source(data);
-//   assert(source.Available() == 5);
-//   assert(source.Peek() == "Hello");
-//
-class PROTOBUF_EXPORT ArrayByteSource : public ByteSource {
- public:
-  explicit ArrayByteSource(StringPiece s) : input_(s) {}
-
-  virtual size_t Available() const override;
-  virtual StringPiece Peek() override;
-  virtual void Skip(size_t n) override;
-
- private:
-  StringPiece   input_;
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(ArrayByteSource);
-};
-
-// Implementation of ByteSource that wraps another ByteSource, limiting the
-// number of bytes returned.
-//
-// The caller maintains ownership of the underlying source, and may not use the
-// underlying source while using the LimitByteSource object.  The underlying
-// source's pointer is advanced by n bytes every time this LimitByteSource
-// object is advanced by n.
-//
-// Example:
-//
-//   string data = "Hello World";
-//   ArrayByteSource abs(data);
-//   assert(abs.Available() == data.size());
-//
-//   LimitByteSource limit(abs, 5);
-//   assert(limit.Available() == 5);
-//   assert(limit.Peek() == "Hello");
-//
-class PROTOBUF_EXPORT LimitByteSource : public ByteSource {
- public:
-  // Returns at most "limit" bytes from "source".
-  LimitByteSource(ByteSource* source, size_t limit);
-
-  virtual size_t Available() const override;
-  virtual StringPiece Peek() override;
-  virtual void Skip(size_t n) override;
-
-  // We override CopyTo so that we can forward to the underlying source, in
-  // case it has an efficient implementation of CopyTo.
-  virtual void CopyTo(ByteSink* sink, size_t n) override;
-
- private:
-  ByteSource* source_;
-  size_t limit_;
-};
-
-}  // namespace strings
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
-
-#endif  // GOOGLE_PROTOBUF_STUBS_BYTESTREAM_H_
diff --git a/libs/protobuf/src/google/protobuf/stubs/bytestream_unittest.cc b/libs/protobuf/src/google/protobuf/stubs/bytestream_unittest.cc
deleted file mode 100644
index cb11825..0000000
--- a/libs/protobuf/src/google/protobuf/stubs/bytestream_unittest.cc
+++ /dev/null
@@ -1,146 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <google/protobuf/stubs/bytestream.h>
-
-#include <stdio.h>
-#include <string.h>
-#include <algorithm>
-
-#include <google/protobuf/testing/googletest.h>
-#include <gtest/gtest.h>
-
-namespace google {
-namespace protobuf {
-namespace strings {
-namespace {
-
-// We use this class instead of ArrayByteSource to simulate a ByteSource that
-// contains multiple fragments.  ArrayByteSource returns the entire array in
-// one fragment.
-class MockByteSource : public ByteSource {
- public:
-  MockByteSource(StringPiece data, int block_size)
-    : data_(data), block_size_(block_size) {}
-
-  size_t Available() const { return data_.size(); }
-  StringPiece Peek() {
-    return data_.substr(0, block_size_);
-  }
-  void Skip(size_t n) { data_.remove_prefix(n); }
-
- private:
-  StringPiece data_;
-  int block_size_;
-};
-
-TEST(ByteSourceTest, CopyTo) {
-  StringPiece data("Hello world!");
-  MockByteSource source(data, 3);
-  std::string str;
-  StringByteSink sink(&str);
-
-  source.CopyTo(&sink, data.size());
-  EXPECT_EQ(data, str);
-}
-
-TEST(ByteSourceTest, CopySubstringTo) {
-  StringPiece data("Hello world!");
-  MockByteSource source(data, 3);
-  source.Skip(1);
-  std::string str;
-  StringByteSink sink(&str);
-
-  source.CopyTo(&sink, data.size() - 2);
-  EXPECT_EQ(data.substr(1, data.size() - 2), str);
-  EXPECT_EQ("!", source.Peek());
-}
-
-TEST(ByteSourceTest, LimitByteSource) {
-  StringPiece data("Hello world!");
-  MockByteSource source(data, 3);
-  LimitByteSource limit_source(&source, 6);
-  EXPECT_EQ(6, limit_source.Available());
-  limit_source.Skip(1);
-  EXPECT_EQ(5, limit_source.Available());
-
-  {
-    std::string str;
-    StringByteSink sink(&str);
-    limit_source.CopyTo(&sink, limit_source.Available());
-    EXPECT_EQ("ello ", str);
-    EXPECT_EQ(0, limit_source.Available());
-    EXPECT_EQ(6, source.Available());
-  }
-
-  {
-    std::string str;
-    StringByteSink sink(&str);
-    source.CopyTo(&sink, source.Available());
-    EXPECT_EQ("world!", str);
-    EXPECT_EQ(0, source.Available());
-  }
-}
-
-TEST(ByteSourceTest, CopyToStringByteSink) {
-  StringPiece data("Hello world!");
-  MockByteSource source(data, 3);
-  std::string str;
-  StringByteSink sink(&str);
-  source.CopyTo(&sink, data.size());
-  EXPECT_EQ(data, str);
-}
-
-// Verify that ByteSink is subclassable and Flush() overridable.
-class FlushingByteSink : public StringByteSink {
- public:
-  explicit FlushingByteSink(std::string* dest) : StringByteSink(dest) {}
-  virtual void Flush() { Append("z", 1); }
- private:
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(FlushingByteSink);
-};
-
-// Write and Flush via the ByteSink superclass interface.
-void WriteAndFlush(ByteSink* s) {
-  s->Append("abc", 3);
-  s->Flush();
-}
-
-TEST(ByteSinkTest, Flush) {
-  std::string str;
-  FlushingByteSink f_sink(&str);
-  WriteAndFlush(&f_sink);
-  EXPECT_STREQ("abcz", str.c_str());
-}
-
-}  // namespace
-}  // namespace strings
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/stubs/callback.h b/libs/protobuf/src/google/protobuf/stubs/callback.h
deleted file mode 100644
index 43d546d..0000000
--- a/libs/protobuf/src/google/protobuf/stubs/callback.h
+++ /dev/null
@@ -1,583 +0,0 @@
-#ifndef GOOGLE_PROTOBUF_STUBS_CALLBACK_H_
-#define GOOGLE_PROTOBUF_STUBS_CALLBACK_H_
-
-#include <type_traits>
-
-#include <google/protobuf/stubs/macros.h>
-
-#include <google/protobuf/port_def.inc>
-
-// ===================================================================
-// emulates google3/base/callback.h
-
-namespace google {
-namespace protobuf {
-
-// Abstract interface for a callback.  When calling an RPC, you must provide
-// a Closure to call when the procedure completes.  See the Service interface
-// in service.h.
-//
-// To automatically construct a Closure which calls a particular function or
-// method with a particular set of parameters, use the NewCallback() function.
-// Example:
-//   void FooDone(const FooResponse* response) {
-//     ...
-//   }
-//
-//   void CallFoo() {
-//     ...
-//     // When done, call FooDone() and pass it a pointer to the response.
-//     Closure* callback = NewCallback(&FooDone, response);
-//     // Make the call.
-//     service->Foo(controller, request, response, callback);
-//   }
-//
-// Example that calls a method:
-//   class Handler {
-//    public:
-//     ...
-//
-//     void FooDone(const FooResponse* response) {
-//       ...
-//     }
-//
-//     void CallFoo() {
-//       ...
-//       // When done, call FooDone() and pass it a pointer to the response.
-//       Closure* callback = NewCallback(this, &Handler::FooDone, response);
-//       // Make the call.
-//       service->Foo(controller, request, response, callback);
-//     }
-//   };
-//
-// Currently NewCallback() supports binding zero, one, or two arguments.
-//
-// Callbacks created with NewCallback() automatically delete themselves when
-// executed.  They should be used when a callback is to be called exactly
-// once (usually the case with RPC callbacks).  If a callback may be called
-// a different number of times (including zero), create it with
-// NewPermanentCallback() instead.  You are then responsible for deleting the
-// callback (using the "delete" keyword as normal).
-//
-// Note that NewCallback() is a bit touchy regarding argument types.  Generally,
-// the values you provide for the parameter bindings must exactly match the
-// types accepted by the callback function.  For example:
-//   void Foo(std::string s);
-//   NewCallback(&Foo, "foo");          // WON'T WORK:  const char* != string
-//   NewCallback(&Foo, std::string("foo"));  // WORKS
-// Also note that the arguments cannot be references:
-//   void Foo(const std::string& s);
-//   std::string my_str;
-//   NewCallback(&Foo, my_str);  // WON'T WORK:  Can't use references.
-// However, correctly-typed pointers will work just fine.
-class PROTOBUF_EXPORT Closure {
- public:
-  Closure() {}
-  virtual ~Closure();
-
-  virtual void Run() = 0;
-
- private:
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(Closure);
-};
-
-template<typename R>
-class ResultCallback {
- public:
-  ResultCallback() {}
-  virtual ~ResultCallback() {}
-
-  virtual R Run() = 0;
-
- private:
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(ResultCallback);
-};
-
-template <typename R, typename A1>
-class PROTOBUF_EXPORT ResultCallback1 {
- public:
-  ResultCallback1() {}
-  virtual ~ResultCallback1() {}
-
-  virtual R Run(A1) = 0;
-
- private:
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(ResultCallback1);
-};
-
-template <typename R, typename A1, typename A2>
-class PROTOBUF_EXPORT ResultCallback2 {
- public:
-  ResultCallback2() {}
-  virtual ~ResultCallback2() {}
-
-  virtual R Run(A1,A2) = 0;
-
- private:
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(ResultCallback2);
-};
-
-namespace internal {
-
-class PROTOBUF_EXPORT FunctionClosure0 : public Closure {
- public:
-  typedef void (*FunctionType)();
-
-  FunctionClosure0(FunctionType function, bool self_deleting)
-    : function_(function), self_deleting_(self_deleting) {}
-  ~FunctionClosure0();
-
-  void Run() override {
-    bool needs_delete = self_deleting_;  // read in case callback deletes
-    function_();
-    if (needs_delete) delete this;
-  }
-
- private:
-  FunctionType function_;
-  bool self_deleting_;
-};
-
-template <typename Class>
-class MethodClosure0 : public Closure {
- public:
-  typedef void (Class::*MethodType)();
-
-  MethodClosure0(Class* object, MethodType method, bool self_deleting)
-    : object_(object), method_(method), self_deleting_(self_deleting) {}
-  ~MethodClosure0() {}
-
-  void Run() override {
-    bool needs_delete = self_deleting_;  // read in case callback deletes
-    (object_->*method_)();
-    if (needs_delete) delete this;
-  }
-
- private:
-  Class* object_;
-  MethodType method_;
-  bool self_deleting_;
-};
-
-template <typename Arg1>
-class FunctionClosure1 : public Closure {
- public:
-  typedef void (*FunctionType)(Arg1 arg1);
-
-  FunctionClosure1(FunctionType function, bool self_deleting,
-                   Arg1 arg1)
-    : function_(function), self_deleting_(self_deleting),
-      arg1_(arg1) {}
-  ~FunctionClosure1() {}
-
-  void Run() override {
-    bool needs_delete = self_deleting_;  // read in case callback deletes
-    function_(arg1_);
-    if (needs_delete) delete this;
-  }
-
- private:
-  FunctionType function_;
-  bool self_deleting_;
-  Arg1 arg1_;
-};
-
-template <typename Class, typename Arg1>
-class MethodClosure1 : public Closure {
- public:
-  typedef void (Class::*MethodType)(Arg1 arg1);
-
-  MethodClosure1(Class* object, MethodType method, bool self_deleting,
-                 Arg1 arg1)
-    : object_(object), method_(method), self_deleting_(self_deleting),
-      arg1_(arg1) {}
-  ~MethodClosure1() {}
-
-  void Run() override {
-    bool needs_delete = self_deleting_;  // read in case callback deletes
-    (object_->*method_)(arg1_);
-    if (needs_delete) delete this;
-  }
-
- private:
-  Class* object_;
-  MethodType method_;
-  bool self_deleting_;
-  Arg1 arg1_;
-};
-
-template <typename Arg1, typename Arg2>
-class FunctionClosure2 : public Closure {
- public:
-  typedef void (*FunctionType)(Arg1 arg1, Arg2 arg2);
-
-  FunctionClosure2(FunctionType function, bool self_deleting,
-                   Arg1 arg1, Arg2 arg2)
-    : function_(function), self_deleting_(self_deleting),
-      arg1_(arg1), arg2_(arg2) {}
-  ~FunctionClosure2() {}
-
-  void Run() override {
-    bool needs_delete = self_deleting_;  // read in case callback deletes
-    function_(arg1_, arg2_);
-    if (needs_delete) delete this;
-  }
-
- private:
-  FunctionType function_;
-  bool self_deleting_;
-  Arg1 arg1_;
-  Arg2 arg2_;
-};
-
-template <typename Class, typename Arg1, typename Arg2>
-class MethodClosure2 : public Closure {
- public:
-  typedef void (Class::*MethodType)(Arg1 arg1, Arg2 arg2);
-
-  MethodClosure2(Class* object, MethodType method, bool self_deleting,
-                 Arg1 arg1, Arg2 arg2)
-    : object_(object), method_(method), self_deleting_(self_deleting),
-      arg1_(arg1), arg2_(arg2) {}
-  ~MethodClosure2() {}
-
-  void Run() override {
-    bool needs_delete = self_deleting_;  // read in case callback deletes
-    (object_->*method_)(arg1_, arg2_);
-    if (needs_delete) delete this;
-  }
-
- private:
-  Class* object_;
-  MethodType method_;
-  bool self_deleting_;
-  Arg1 arg1_;
-  Arg2 arg2_;
-};
-
-template<typename R>
-class FunctionResultCallback_0_0 : public ResultCallback<R> {
- public:
-  typedef R (*FunctionType)();
-
-  FunctionResultCallback_0_0(FunctionType function, bool self_deleting)
-      : function_(function), self_deleting_(self_deleting) {}
-  ~FunctionResultCallback_0_0() {}
-
-  R Run() override {
-    bool needs_delete = self_deleting_;  // read in case callback deletes
-    R result = function_();
-    if (needs_delete) delete this;
-    return result;
-  }
-
- private:
-  FunctionType function_;
-  bool self_deleting_;
-};
-
-template<typename R, typename P1>
-class FunctionResultCallback_1_0 : public ResultCallback<R> {
- public:
-  typedef R (*FunctionType)(P1);
-
-  FunctionResultCallback_1_0(FunctionType function, bool self_deleting,
-                             P1 p1)
-      : function_(function), self_deleting_(self_deleting), p1_(p1) {}
-  ~FunctionResultCallback_1_0() {}
-
-  R Run() override {
-    bool needs_delete = self_deleting_;  // read in case callback deletes
-    R result = function_(p1_);
-    if (needs_delete) delete this;
-    return result;
-  }
-
- private:
-  FunctionType function_;
-  bool self_deleting_;
-  P1 p1_;
-};
-
-template<typename R, typename Arg1>
-class FunctionResultCallback_0_1 : public ResultCallback1<R, Arg1> {
- public:
-  typedef R (*FunctionType)(Arg1 arg1);
-
-  FunctionResultCallback_0_1(FunctionType function, bool self_deleting)
-      : function_(function), self_deleting_(self_deleting) {}
-  ~FunctionResultCallback_0_1() {}
-
-  R Run(Arg1 a1) override {
-    bool needs_delete = self_deleting_;  // read in case callback deletes
-    R result = function_(a1);
-    if (needs_delete) delete this;
-    return result;
-  }
-
- private:
-  FunctionType function_;
-  bool self_deleting_;
-};
-
-template<typename R, typename P1, typename A1>
-class FunctionResultCallback_1_1 : public ResultCallback1<R, A1> {
- public:
-  typedef R (*FunctionType)(P1, A1);
-
-  FunctionResultCallback_1_1(FunctionType function, bool self_deleting,
-                             P1 p1)
-      : function_(function), self_deleting_(self_deleting), p1_(p1) {}
-  ~FunctionResultCallback_1_1() {}
-
-  R Run(A1 a1) override {
-    bool needs_delete = self_deleting_;  // read in case callback deletes
-    R result = function_(p1_, a1);
-    if (needs_delete) delete this;
-    return result;
-  }
-
- private:
-  FunctionType function_;
-  bool self_deleting_;
-  P1 p1_;
-};
-
-template <typename T>
-struct InternalConstRef {
-  typedef typename std::remove_reference<T>::type base_type;
-  typedef const base_type& type;
-};
-
-template<typename R, typename T>
-class MethodResultCallback_0_0 : public ResultCallback<R> {
- public:
-  typedef R (T::*MethodType)();
-  MethodResultCallback_0_0(T* object, MethodType method, bool self_deleting)
-      : object_(object),
-        method_(method),
-        self_deleting_(self_deleting) {}
-  ~MethodResultCallback_0_0() {}
-
-  R Run() {
-    bool needs_delete = self_deleting_;
-    R result = (object_->*method_)();
-    if (needs_delete) delete this;
-    return result;
-  }
-
- private:
-  T* object_;
-  MethodType method_;
-  bool self_deleting_;
-};
-
-template <typename R, typename T, typename P1, typename P2, typename P3,
-          typename P4, typename P5, typename P6, typename A1, typename A2>
-class MethodResultCallback_6_2 : public ResultCallback2<R, A1, A2> {
- public:
-  typedef R (T::*MethodType)(P1, P2, P3, P4, P5, P6, A1, A2);
-  MethodResultCallback_6_2(T* object, MethodType method, bool self_deleting,
-                           P1 p1, P2 p2, P3 p3, P4 p4, P5 p5, P6 p6)
-      : object_(object),
-        method_(method),
-        self_deleting_(self_deleting),
-        p1_(p1),
-        p2_(p2),
-        p3_(p3),
-        p4_(p4),
-        p5_(p5),
-        p6_(p6) {}
-  ~MethodResultCallback_6_2() {}
-
-  R Run(A1 a1, A2 a2) override {
-    bool needs_delete = self_deleting_;
-    R result = (object_->*method_)(p1_, p2_, p3_, p4_, p5_, p6_, a1, a2);
-    if (needs_delete) delete this;
-    return result;
-  }
-
- private:
-  T* object_;
-  MethodType method_;
-  bool self_deleting_;
-  typename std::remove_reference<P1>::type p1_;
-  typename std::remove_reference<P2>::type p2_;
-  typename std::remove_reference<P3>::type p3_;
-  typename std::remove_reference<P4>::type p4_;
-  typename std::remove_reference<P5>::type p5_;
-  typename std::remove_reference<P6>::type p6_;
-};
-
-}  // namespace internal
-
-// See Closure.
-inline Closure* NewCallback(void (*function)()) {
-  return new internal::FunctionClosure0(function, true);
-}
-
-// See Closure.
-inline Closure* NewPermanentCallback(void (*function)()) {
-  return new internal::FunctionClosure0(function, false);
-}
-
-// See Closure.
-template <typename Class>
-inline Closure* NewCallback(Class* object, void (Class::*method)()) {
-  return new internal::MethodClosure0<Class>(object, method, true);
-}
-
-// See Closure.
-template <typename Class>
-inline Closure* NewPermanentCallback(Class* object, void (Class::*method)()) {
-  return new internal::MethodClosure0<Class>(object, method, false);
-}
-
-// See Closure.
-template <typename Arg1>
-inline Closure* NewCallback(void (*function)(Arg1),
-                            Arg1 arg1) {
-  return new internal::FunctionClosure1<Arg1>(function, true, arg1);
-}
-
-// See Closure.
-template <typename Arg1>
-inline Closure* NewPermanentCallback(void (*function)(Arg1),
-                                     Arg1 arg1) {
-  return new internal::FunctionClosure1<Arg1>(function, false, arg1);
-}
-
-// See Closure.
-template <typename Class, typename Arg1>
-inline Closure* NewCallback(Class* object, void (Class::*method)(Arg1),
-                            Arg1 arg1) {
-  return new internal::MethodClosure1<Class, Arg1>(object, method, true, arg1);
-}
-
-// See Closure.
-template <typename Class, typename Arg1>
-inline Closure* NewPermanentCallback(Class* object, void (Class::*method)(Arg1),
-                                     Arg1 arg1) {
-  return new internal::MethodClosure1<Class, Arg1>(object, method, false, arg1);
-}
-
-// See Closure.
-template <typename Arg1, typename Arg2>
-inline Closure* NewCallback(void (*function)(Arg1, Arg2),
-                            Arg1 arg1, Arg2 arg2) {
-  return new internal::FunctionClosure2<Arg1, Arg2>(
-    function, true, arg1, arg2);
-}
-
-// See Closure.
-template <typename Arg1, typename Arg2>
-inline Closure* NewPermanentCallback(void (*function)(Arg1, Arg2),
-                                     Arg1 arg1, Arg2 arg2) {
-  return new internal::FunctionClosure2<Arg1, Arg2>(
-    function, false, arg1, arg2);
-}
-
-// See Closure.
-template <typename Class, typename Arg1, typename Arg2>
-inline Closure* NewCallback(Class* object, void (Class::*method)(Arg1, Arg2),
-                            Arg1 arg1, Arg2 arg2) {
-  return new internal::MethodClosure2<Class, Arg1, Arg2>(
-    object, method, true, arg1, arg2);
-}
-
-// See Closure.
-template <typename Class, typename Arg1, typename Arg2>
-inline Closure* NewPermanentCallback(
-    Class* object, void (Class::*method)(Arg1, Arg2),
-    Arg1 arg1, Arg2 arg2) {
-  return new internal::MethodClosure2<Class, Arg1, Arg2>(
-    object, method, false, arg1, arg2);
-}
-
-// See ResultCallback
-template<typename R>
-inline ResultCallback<R>* NewCallback(R (*function)()) {
-  return new internal::FunctionResultCallback_0_0<R>(function, true);
-}
-
-// See ResultCallback
-template<typename R>
-inline ResultCallback<R>* NewPermanentCallback(R (*function)()) {
-  return new internal::FunctionResultCallback_0_0<R>(function, false);
-}
-
-// See ResultCallback
-template<typename R, typename P1>
-inline ResultCallback<R>* NewCallback(R (*function)(P1), P1 p1) {
-  return new internal::FunctionResultCallback_1_0<R, P1>(
-      function, true, p1);
-}
-
-// See ResultCallback
-template<typename R, typename P1>
-inline ResultCallback<R>* NewPermanentCallback(
-    R (*function)(P1), P1 p1) {
-  return new internal::FunctionResultCallback_1_0<R, P1>(
-      function, false, p1);
-}
-
-// See ResultCallback1
-template<typename R, typename A1>
-inline ResultCallback1<R, A1>* NewCallback(R (*function)(A1)) {
-  return new internal::FunctionResultCallback_0_1<R, A1>(function, true);
-}
-
-// See ResultCallback1
-template<typename R, typename A1>
-inline ResultCallback1<R, A1>* NewPermanentCallback(R (*function)(A1)) {
-  return new internal::FunctionResultCallback_0_1<R, A1>(function, false);
-}
-
-// See ResultCallback1
-template<typename R, typename P1, typename A1>
-inline ResultCallback1<R, A1>* NewCallback(R (*function)(P1, A1), P1 p1) {
-  return new internal::FunctionResultCallback_1_1<R, P1, A1>(
-      function, true, p1);
-}
-
-// See ResultCallback1
-template<typename R, typename P1, typename A1>
-inline ResultCallback1<R, A1>* NewPermanentCallback(
-    R (*function)(P1, A1), P1 p1) {
-  return new internal::FunctionResultCallback_1_1<R, P1, A1>(
-      function, false, p1);
-}
-
-// See MethodResultCallback_0_0
-template <typename R, typename T1, typename T2>
-inline ResultCallback<R>* NewPermanentCallback(
-    T1* object, R (T2::*function)()) {
-  return new internal::MethodResultCallback_0_0<R, T1>(object, function, false);
-}
-
-// See MethodResultCallback_6_2
-template <typename R, typename T, typename P1, typename P2, typename P3,
-          typename P4, typename P5, typename P6, typename A1, typename A2>
-inline ResultCallback2<R, A1, A2>* NewPermanentCallback(
-    T* object, R (T::*function)(P1, P2, P3, P4, P5, P6, A1, A2),
-    typename internal::InternalConstRef<P1>::type p1,
-    typename internal::InternalConstRef<P2>::type p2,
-    typename internal::InternalConstRef<P3>::type p3,
-    typename internal::InternalConstRef<P4>::type p4,
-    typename internal::InternalConstRef<P5>::type p5,
-    typename internal::InternalConstRef<P6>::type p6) {
-  return new internal::MethodResultCallback_6_2<R, T, P1, P2, P3, P4, P5, P6,
-                                                A1, A2>(object, function, false,
-                                                        p1, p2, p3, p4, p5, p6);
-}
-
-// A function which does nothing.  Useful for creating no-op callbacks, e.g.:
-//   Closure* nothing = NewCallback(&DoNothing);
-void PROTOBUF_EXPORT DoNothing();
-
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
-
-#endif  // GOOGLE_PROTOBUF_STUBS_CALLBACK_H_
diff --git a/libs/protobuf/src/google/protobuf/stubs/casts.h b/libs/protobuf/src/google/protobuf/stubs/casts.h
deleted file mode 100644
index ad29dac..0000000
--- a/libs/protobuf/src/google/protobuf/stubs/casts.h
+++ /dev/null
@@ -1,138 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2014 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef GOOGLE_PROTOBUF_CASTS_H__
-#define GOOGLE_PROTOBUF_CASTS_H__
-
-#include <google/protobuf/stubs/common.h>
-
-#include <google/protobuf/port_def.inc>
-#include <type_traits>
-
-namespace google {
-namespace protobuf {
-namespace internal {
-
-// Use implicit_cast as a safe version of static_cast or const_cast
-// for upcasting in the type hierarchy (i.e. casting a pointer to Foo
-// to a pointer to SuperclassOfFoo or casting a pointer to Foo to
-// a const pointer to Foo).
-// When you use implicit_cast, the compiler checks that the cast is safe.
-// Such explicit implicit_casts are necessary in surprisingly many
-// situations where C++ demands an exact type match instead of an
-// argument type convertible to a target type.
-//
-// The From type can be inferred, so the preferred syntax for using
-// implicit_cast is the same as for static_cast etc.:
-//
-//   implicit_cast<ToType>(expr)
-//
-// implicit_cast would have been part of the C++ standard library,
-// but the proposal was submitted too late.  It will probably make
-// its way into the language in the future.
-template<typename To, typename From>
-inline To implicit_cast(From const &f) {
-  return f;
-}
-
-// When you upcast (that is, cast a pointer from type Foo to type
-// SuperclassOfFoo), it's fine to use implicit_cast<>, since upcasts
-// always succeed.  When you downcast (that is, cast a pointer from
-// type Foo to type SubclassOfFoo), static_cast<> isn't safe, because
-// how do you know the pointer is really of type SubclassOfFoo?  It
-// could be a bare Foo, or of type DifferentSubclassOfFoo.  Thus,
-// when you downcast, you should use this macro.  In debug mode, we
-// use dynamic_cast<> to double-check the downcast is legal (we die
-// if it's not).  In normal mode, we do the efficient static_cast<>
-// instead.  Thus, it's important to test in debug mode to make sure
-// the cast is legal!
-//    This is the only place in the code we should use dynamic_cast<>.
-// In particular, you SHOULDN'T be using dynamic_cast<> in order to
-// do RTTI (eg code like this:
-//    if (dynamic_cast<Subclass1>(foo)) HandleASubclass1Object(foo);
-//    if (dynamic_cast<Subclass2>(foo)) HandleASubclass2Object(foo);
-// You should design the code some other way not to need this.
-
-template<typename To, typename From>     // use like this: down_cast<T*>(foo);
-inline To down_cast(From* f) {                   // so we only accept pointers
-  // Ensures that To is a sub-type of From *.  This test is here only
-  // for compile-time type checking, and has no overhead in an
-  // optimized build at run-time, as it will be optimized away
-  // completely.
-  if (false) {
-    implicit_cast<From*, To>(0);
-  }
-
-#if !defined(NDEBUG) && PROTOBUF_RTTI
-  assert(f == nullptr || dynamic_cast<To>(f) != nullptr);  // RTTI: debug mode only!
-#endif
-  return static_cast<To>(f);
-}
-
-template<typename To, typename From>    // use like this: down_cast<T&>(foo);
-inline To down_cast(From& f) {
-  typedef typename std::remove_reference<To>::type* ToAsPointer;
-  // Ensures that To is a sub-type of From *.  This test is here only
-  // for compile-time type checking, and has no overhead in an
-  // optimized build at run-time, as it will be optimized away
-  // completely.
-  if (false) {
-    implicit_cast<From*, ToAsPointer>(0);
-  }
-
-#if !defined(NDEBUG) && PROTOBUF_RTTI
-  // RTTI: debug mode only!
-  assert(dynamic_cast<ToAsPointer>(&f) != nullptr);
-#endif
-  return *static_cast<ToAsPointer>(&f);
-}
-
-template<typename To, typename From>
-inline To bit_cast(const From& from) {
-  static_assert(sizeof(From) == sizeof(To), "bit_cast_with_different_sizes");
-  To dest;
-  memcpy(&dest, &from, sizeof(dest));
-  return dest;
-}
-
-}  // namespace internal
-
-// We made these internal so that they would show up as such in the docs,
-// but we don't want to stick "internal::" in front of them everywhere.
-using internal::implicit_cast;
-using internal::down_cast;
-using internal::bit_cast;
-
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
-
-#endif  // GOOGLE_PROTOBUF_CASTS_H__
diff --git a/libs/protobuf/src/google/protobuf/stubs/common.cc b/libs/protobuf/src/google/protobuf/stubs/common.cc
deleted file mode 100644
index e0a807f..0000000
--- a/libs/protobuf/src/google/protobuf/stubs/common.cc
+++ /dev/null
@@ -1,324 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-
-#include <google/protobuf/stubs/common.h>
-
-#include <atomic>
-#include <errno.h>
-#include <sstream>
-#include <stdio.h>
-#include <vector>
-
-#ifdef _WIN32
-#ifndef WIN32_LEAN_AND_MEAN
-#define WIN32_LEAN_AND_MEAN  // We only need minimal includes
-#endif
-#include <windows.h>
-#define snprintf _snprintf    // see comment in strutil.cc
-#endif
-#if defined(__ANDROID__)
-#include <android/log.h>
-#endif
-
-#include <google/protobuf/stubs/callback.h>
-#include <google/protobuf/stubs/logging.h>
-#include <google/protobuf/stubs/once.h>
-#include <google/protobuf/stubs/status.h>
-#include <google/protobuf/stubs/stringpiece.h>
-#include <google/protobuf/stubs/strutil.h>
-#include <google/protobuf/stubs/int128.h>
-
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-
-namespace internal {
-
-void VerifyVersion(int headerVersion,
-                   int minLibraryVersion,
-                   const char* filename) {
-  if (GOOGLE_PROTOBUF_VERSION < minLibraryVersion) {
-    // Library is too old for headers.
-    GOOGLE_LOG(FATAL)
-      << "This program requires version " << VersionString(minLibraryVersion)
-      << " of the Protocol Buffer runtime library, but the installed version "
-         "is " << VersionString(GOOGLE_PROTOBUF_VERSION) << ".  Please update "
-         "your library.  If you compiled the program yourself, make sure that "
-         "your headers are from the same version of Protocol Buffers as your "
-         "link-time library.  (Version verification failed in \""
-      << filename << "\".)";
-  }
-  if (headerVersion < kMinHeaderVersionForLibrary) {
-    // Headers are too old for library.
-    GOOGLE_LOG(FATAL)
-      << "This program was compiled against version "
-      << VersionString(headerVersion) << " of the Protocol Buffer runtime "
-         "library, which is not compatible with the installed version ("
-      << VersionString(GOOGLE_PROTOBUF_VERSION) <<  ").  Contact the program "
-         "author for an update.  If you compiled the program yourself, make "
-         "sure that your headers are from the same version of Protocol Buffers "
-         "as your link-time library.  (Version verification failed in \""
-      << filename << "\".)";
-  }
-}
-
-std::string VersionString(int version) {
-  int major = version / 1000000;
-  int minor = (version / 1000) % 1000;
-  int micro = version % 1000;
-
-  // 128 bytes should always be enough, but we use snprintf() anyway to be
-  // safe.
-  char buffer[128];
-  snprintf(buffer, sizeof(buffer), "%d.%d.%d", major, minor, micro);
-
-  // Guard against broken MSVC snprintf().
-  buffer[sizeof(buffer)-1] = '\0';
-
-  return buffer;
-}
-
-}  // namespace internal
-
-// ===================================================================
-// emulates google3/base/logging.cc
-
-// If the minimum logging level is not set, we default to logging messages for
-// all levels.
-#ifndef GOOGLE_PROTOBUF_MIN_LOG_LEVEL
-#define GOOGLE_PROTOBUF_MIN_LOG_LEVEL LOGLEVEL_INFO
-#endif
-
-namespace internal {
-
-#if defined(__ANDROID__)
-inline void DefaultLogHandler(LogLevel level, const char* filename, int line,
-                              const std::string& message) {
-  if (level < GOOGLE_PROTOBUF_MIN_LOG_LEVEL) {
-    return;
-  }
-  static const char* level_names[] = {"INFO", "WARNING", "ERROR", "FATAL"};
-
-  static const int android_log_levels[] = {
-      ANDROID_LOG_INFO,   // LOG(INFO),
-      ANDROID_LOG_WARN,   // LOG(WARNING)
-      ANDROID_LOG_ERROR,  // LOG(ERROR)
-      ANDROID_LOG_FATAL,  // LOG(FATAL)
-  };
-
-  // Bound the logging level.
-  const int android_log_level = android_log_levels[level];
-  ::std::ostringstream ostr;
-  ostr << "[libprotobuf " << level_names[level] << " " << filename << ":"
-       << line << "] " << message.c_str();
-
-  // Output the log string the Android log at the appropriate level.
-  __android_log_write(android_log_level, "libprotobuf-native",
-                      ostr.str().c_str());
-  // Also output to std::cerr.
-  fprintf(stderr, "%s", ostr.str().c_str());
-  fflush(stderr);
-
-  // Indicate termination if needed.
-  if (android_log_level == ANDROID_LOG_FATAL) {
-    __android_log_write(ANDROID_LOG_FATAL, "libprotobuf-native",
-                        "terminating.\n");
-  }
-}
-
-#else
-void DefaultLogHandler(LogLevel level, const char* filename, int line,
-                       const std::string& message) {
-  if (level < GOOGLE_PROTOBUF_MIN_LOG_LEVEL) {
-    return;
-  }
-  static const char* level_names[] = { "INFO", "WARNING", "ERROR", "FATAL" };
-
-  // We use fprintf() instead of cerr because we want this to work at static
-  // initialization time.
-  fprintf(stderr, "[libprotobuf %s %s:%d] %s\n",
-          level_names[level], filename, line, message.c_str());
-  fflush(stderr);  // Needed on MSVC.
-}
-#endif
-
-void NullLogHandler(LogLevel /* level */, const char* /* filename */,
-                    int /* line */, const std::string& /* message */) {
-  // Nothing.
-}
-
-static LogHandler* log_handler_ = &DefaultLogHandler;
-static std::atomic<int> log_silencer_count_ = ATOMIC_VAR_INIT(0);
-
-LogMessage& LogMessage::operator<<(const std::string& value) {
-  message_ += value;
-  return *this;
-}
-
-LogMessage& LogMessage::operator<<(const char* value) {
-  message_ += value;
-  return *this;
-}
-
-LogMessage& LogMessage::operator<<(const StringPiece& value) {
-  message_ += value.ToString();
-  return *this;
-}
-
-LogMessage& LogMessage::operator<<(const util::Status& status) {
-  message_ += status.ToString();
-  return *this;
-}
-
-LogMessage& LogMessage::operator<<(const uint128& value) {
-  std::ostringstream str;
-  str << value;
-  message_ += str.str();
-  return *this;
-}
-
-LogMessage& LogMessage::operator<<(char value) {
-  return *this << StringPiece(&value, 1);
-}
-
-LogMessage& LogMessage::operator<<(void* value) {
-  StrAppend(&message_, strings::Hex(reinterpret_cast<uintptr_t>(value)));
-  return *this;
-}
-
-#undef DECLARE_STREAM_OPERATOR
-#define DECLARE_STREAM_OPERATOR(TYPE)              \
-  LogMessage& LogMessage::operator<<(TYPE value) { \
-    StrAppend(&message_, value);                   \
-    return *this;                                  \
-  }
-
-DECLARE_STREAM_OPERATOR(int)
-DECLARE_STREAM_OPERATOR(unsigned int)
-DECLARE_STREAM_OPERATOR(long)           // NOLINT(runtime/int)
-DECLARE_STREAM_OPERATOR(unsigned long)  // NOLINT(runtime/int)
-DECLARE_STREAM_OPERATOR(double)
-DECLARE_STREAM_OPERATOR(long long)           // NOLINT(runtime/int)
-DECLARE_STREAM_OPERATOR(unsigned long long)  // NOLINT(runtime/int)
-#undef DECLARE_STREAM_OPERATOR
-
-LogMessage::LogMessage(LogLevel level, const char* filename, int line)
-  : level_(level), filename_(filename), line_(line) {}
-LogMessage::~LogMessage() {}
-
-void LogMessage::Finish() {
-  bool suppress = false;
-
-  if (level_ != LOGLEVEL_FATAL) {
-    suppress = log_silencer_count_ > 0;
-  }
-
-  if (!suppress) {
-    log_handler_(level_, filename_, line_, message_);
-  }
-
-  if (level_ == LOGLEVEL_FATAL) {
-#if PROTOBUF_USE_EXCEPTIONS
-    throw FatalException(filename_, line_, message_);
-#else
-    abort();
-#endif
-  }
-}
-
-void LogFinisher::operator=(LogMessage& other) {
-  other.Finish();
-}
-
-}  // namespace internal
-
-LogHandler* SetLogHandler(LogHandler* new_func) {
-  LogHandler* old = internal::log_handler_;
-  if (old == &internal::NullLogHandler) {
-    old = nullptr;
-  }
-  if (new_func == nullptr) {
-    internal::log_handler_ = &internal::NullLogHandler;
-  } else {
-    internal::log_handler_ = new_func;
-  }
-  return old;
-}
-
-LogSilencer::LogSilencer() {
-  ++internal::log_silencer_count_;
-};
-
-LogSilencer::~LogSilencer() {
-  --internal::log_silencer_count_;
-};
-
-// ===================================================================
-// emulates google3/base/callback.cc
-
-Closure::~Closure() {}
-
-namespace internal { FunctionClosure0::~FunctionClosure0() {} }
-
-void DoNothing() {}
-
-// ===================================================================
-// emulates google3/util/endian/endian.h
-//
-// TODO(xiaofeng): PROTOBUF_LITTLE_ENDIAN is unfortunately defined in
-// google/protobuf/io/coded_stream.h and therefore can not be used here.
-// Maybe move that macro definition here in the future.
-uint32_t ghtonl(uint32_t x) {
-  union {
-    uint32_t result;
-    uint8_t result_array[4];
-  };
-  result_array[0] = static_cast<uint8_t>(x >> 24);
-  result_array[1] = static_cast<uint8_t>((x >> 16) & 0xFF);
-  result_array[2] = static_cast<uint8_t>((x >> 8) & 0xFF);
-  result_array[3] = static_cast<uint8_t>(x & 0xFF);
-  return result;
-}
-
-#if PROTOBUF_USE_EXCEPTIONS
-FatalException::~FatalException() throw() {}
-
-const char* FatalException::what() const throw() {
-  return message_.c_str();
-}
-#endif
-
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
diff --git a/libs/protobuf/src/google/protobuf/stubs/common.h b/libs/protobuf/src/google/protobuf/stubs/common.h
deleted file mode 100644
index 0b9fa81..0000000
--- a/libs/protobuf/src/google/protobuf/stubs/common.h
+++ /dev/null
@@ -1,197 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda) and others
-//
-// Contains basic types and utilities used by the rest of the library.
-
-#ifndef GOOGLE_PROTOBUF_COMMON_H__
-#define GOOGLE_PROTOBUF_COMMON_H__
-
-#include <algorithm>
-#include <iostream>
-#include <map>
-#include <memory>
-#include <set>
-#include <string>
-#include <vector>
-
-#include <google/protobuf/stubs/macros.h>
-#include <google/protobuf/stubs/platform_macros.h>
-#include <google/protobuf/stubs/port.h>
-#include <google/protobuf/stubs/stringpiece.h>
-
-#ifndef PROTOBUF_USE_EXCEPTIONS
-#if defined(_MSC_VER) && defined(_CPPUNWIND)
-  #define PROTOBUF_USE_EXCEPTIONS 1
-#elif defined(__EXCEPTIONS)
-  #define PROTOBUF_USE_EXCEPTIONS 1
-#else
-  #define PROTOBUF_USE_EXCEPTIONS 0
-#endif
-#endif
-
-#if PROTOBUF_USE_EXCEPTIONS
-#include <exception>
-#endif
-#if defined(__APPLE__)
-#include <TargetConditionals.h>  // for TARGET_OS_IPHONE
-#endif
-
-#if defined(__ANDROID__) || defined(GOOGLE_PROTOBUF_OS_ANDROID) || (defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE) || defined(GOOGLE_PROTOBUF_OS_IPHONE)
-#include <pthread.h>
-#endif
-
-#include <google/protobuf/port_def.inc>
-
-namespace std {}
-
-namespace google {
-namespace protobuf {
-namespace internal {
-
-// Some of these constants are macros rather than const ints so that they can
-// be used in #if directives.
-
-// The current version, represented as a single integer to make comparison
-// easier:  major * 10^6 + minor * 10^3 + micro
-#define GOOGLE_PROTOBUF_VERSION 3021012
-
-// A suffix string for alpha, beta or rc releases. Empty for stable releases.
-#define GOOGLE_PROTOBUF_VERSION_SUFFIX ""
-
-// The minimum header version which works with the current version of
-// the library.  This constant should only be used by protoc's C++ code
-// generator.
-static const int kMinHeaderVersionForLibrary = 3021000;
-
-// The minimum protoc version which works with the current version of the
-// headers.
-#define GOOGLE_PROTOBUF_MIN_PROTOC_VERSION 3021000
-
-// The minimum header version which works with the current version of
-// protoc.  This constant should only be used in VerifyVersion().
-static const int kMinHeaderVersionForProtoc = 3021000;
-
-// Verifies that the headers and libraries are compatible.  Use the macro
-// below to call this.
-void PROTOBUF_EXPORT VerifyVersion(int headerVersion, int minLibraryVersion,
-                                   const char* filename);
-
-// Converts a numeric version number to a string.
-std::string PROTOBUF_EXPORT VersionString(int version);
-
-}  // namespace internal
-
-// Place this macro in your main() function (or somewhere before you attempt
-// to use the protobuf library) to verify that the version you link against
-// matches the headers you compiled against.  If a version mismatch is
-// detected, the process will abort.
-#define GOOGLE_PROTOBUF_VERIFY_VERSION                                    \
-  ::google::protobuf::internal::VerifyVersion(                            \
-    GOOGLE_PROTOBUF_VERSION, GOOGLE_PROTOBUF_MIN_LIBRARY_VERSION,         \
-    __FILE__)
-
-
-// ===================================================================
-// from google3/util/utf8/public/unilib.h
-
-namespace internal {
-
-// Checks if the buffer contains structurally-valid UTF-8.  Implemented in
-// structurally_valid.cc.
-PROTOBUF_EXPORT bool IsStructurallyValidUTF8(const char* buf, int len);
-
-inline bool IsStructurallyValidUTF8(StringPiece str) {
-  return IsStructurallyValidUTF8(str.data(), static_cast<int>(str.length()));
-}
-
-// Returns initial number of bytes of structurally valid UTF-8.
-PROTOBUF_EXPORT int UTF8SpnStructurallyValid(StringPiece str);
-
-// Coerce UTF-8 byte string in src_str to be
-// a structurally-valid equal-length string by selectively
-// overwriting illegal bytes with replace_char (typically ' ' or '?').
-// replace_char must be legal printable 7-bit Ascii 0x20..0x7e.
-// src_str is read-only.
-//
-// Returns pointer to output buffer, src_str.data() if no changes were made,
-//  or idst if some bytes were changed. idst is allocated by the caller
-//  and must be at least as big as src_str
-//
-// Optimized for: all structurally valid and no byte copying is done.
-//
-PROTOBUF_EXPORT char* UTF8CoerceToStructurallyValid(StringPiece str, char* dst,
-                                                    char replace_char);
-
-}  // namespace internal
-
-// This lives in message_lite.h now, but we leave this here for any users that
-// #include common.h and not message_lite.h.
-PROTOBUF_EXPORT void ShutdownProtobufLibrary();
-
-namespace internal {
-
-// Strongly references the given variable such that the linker will be forced
-// to pull in this variable's translation unit.
-template <typename T>
-void StrongReference(const T& var) {
-  auto volatile unused = &var;
-  (void)&unused;  // Use address to avoid an extra load of "unused".
-}
-
-}  // namespace internal
-
-#if PROTOBUF_USE_EXCEPTIONS
-class FatalException : public std::exception {
- public:
-  FatalException(const char* filename, int line, const std::string& message)
-      : filename_(filename), line_(line), message_(message) {}
-  virtual ~FatalException() throw();
-
-  const char* what() const throw() override;
-
-  const char* filename() const { return filename_; }
-  int line() const { return line_; }
-  const std::string& message() const { return message_; }
-
- private:
-  const char* filename_;
-  const int line_;
-  const std::string message_;
-};
-#endif
-
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
-
-#endif  // GOOGLE_PROTOBUF_COMMON_H__
diff --git a/libs/protobuf/src/google/protobuf/stubs/common_unittest.cc b/libs/protobuf/src/google/protobuf/stubs/common_unittest.cc
deleted file mode 100644
index c55e452..0000000
--- a/libs/protobuf/src/google/protobuf/stubs/common_unittest.cc
+++ /dev/null
@@ -1,358 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-
-#include <vector>
-#include <google/protobuf/stubs/callback.h>
-#include <google/protobuf/stubs/casts.h>
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/stubs/logging.h>
-#include <google/protobuf/stubs/strutil.h>
-#include <google/protobuf/stubs/substitute.h>
-
-#include <google/protobuf/testing/googletest.h>
-#include <gtest/gtest.h>
-
-namespace google {
-namespace protobuf {
-namespace {
-
-// TODO(kenton):  More tests.
-
-#ifdef PACKAGE_VERSION  // only defined when using automake, not MSVC
-
-TEST(VersionTest, VersionMatchesConfig) {
-  // Verify that the version string specified in config.h matches the one
-  // in common.h.  The config.h version is a string which may have a suffix
-  // like "beta" or "rc1", so we remove that.
-  std::string version = PACKAGE_VERSION;
-  int pos = 0;
-  while (pos < version.size() &&
-         (ascii_isdigit(version[pos]) || version[pos] == '.')) {
-    ++pos;
-  }
-  version.erase(pos);
-
-  EXPECT_EQ(version, internal::VersionString(GOOGLE_PROTOBUF_VERSION));
-}
-
-#endif  // PACKAGE_VERSION
-
-TEST(CommonTest, IntMinMaxConstants) {
-  // kint32min was declared incorrectly in the first release of protobufs.
-  // Ugh.
-  EXPECT_LT(kint32min, kint32max);
-  EXPECT_EQ(static_cast<uint32>(kint32min), static_cast<uint32>(kint32max) + 1);
-  EXPECT_LT(kint64min, kint64max);
-  EXPECT_EQ(static_cast<uint64>(kint64min), static_cast<uint64>(kint64max) + 1);
-  EXPECT_EQ(0, kuint32max + 1);
-  EXPECT_EQ(0, kuint64max + 1);
-}
-
-std::vector<std::string> captured_messages_;
-
-void CaptureLog(LogLevel level, const char* filename, int line,
-                const std::string& message) {
-  captured_messages_.push_back(
-    strings::Substitute("$0 $1:$2: $3",
-      implicit_cast<int>(level), filename, line, message));
-}
-
-TEST(LoggingTest, DefaultLogging) {
-  CaptureTestStderr();
-  int line = __LINE__;
-  GOOGLE_LOG(INFO   ) << "A message.";
-  GOOGLE_LOG(WARNING) << "A warning.";
-  GOOGLE_LOG(ERROR  ) << "An error.";
-
-  std::string text = GetCapturedTestStderr();
-  EXPECT_EQ(
-    "[libprotobuf INFO " __FILE__ ":" + SimpleItoa(line + 1) + "] A message.\n"
-    "[libprotobuf WARNING " __FILE__ ":" + SimpleItoa(line + 2) + "] A warning.\n"
-    "[libprotobuf ERROR " __FILE__ ":" + SimpleItoa(line + 3) + "] An error.\n",
-    text);
-}
-
-TEST(LoggingTest, NullLogging) {
-  LogHandler* old_handler = SetLogHandler(nullptr);
-
-  CaptureTestStderr();
-  GOOGLE_LOG(INFO   ) << "A message.";
-  GOOGLE_LOG(WARNING) << "A warning.";
-  GOOGLE_LOG(ERROR  ) << "An error.";
-
-  EXPECT_TRUE(SetLogHandler(old_handler) == nullptr);
-
-  std::string text = GetCapturedTestStderr();
-  EXPECT_EQ("", text);
-}
-
-TEST(LoggingTest, CaptureLogging) {
-  captured_messages_.clear();
-
-  LogHandler* old_handler = SetLogHandler(&CaptureLog);
-
-  int start_line = __LINE__;
-  GOOGLE_LOG(ERROR) << "An error.";
-  GOOGLE_LOG(WARNING) << "A warning.";
-
-  EXPECT_TRUE(SetLogHandler(old_handler) == &CaptureLog);
-
-  ASSERT_EQ(2, captured_messages_.size());
-  EXPECT_EQ(
-    "2 " __FILE__ ":" + SimpleItoa(start_line + 1) + ": An error.",
-    captured_messages_[0]);
-  EXPECT_EQ(
-    "1 " __FILE__ ":" + SimpleItoa(start_line + 2) + ": A warning.",
-    captured_messages_[1]);
-}
-
-TEST(LoggingTest, SilenceLogging) {
-  captured_messages_.clear();
-
-  LogHandler* old_handler = SetLogHandler(&CaptureLog);
-
-  int line1 = __LINE__; GOOGLE_LOG(INFO) << "Visible1";
-  LogSilencer* silencer1 = new LogSilencer;
-  GOOGLE_LOG(INFO) << "Not visible.";
-  LogSilencer* silencer2 = new LogSilencer;
-  GOOGLE_LOG(INFO) << "Not visible.";
-  delete silencer1;
-  GOOGLE_LOG(INFO) << "Not visible.";
-  delete silencer2;
-  int line2 = __LINE__; GOOGLE_LOG(INFO) << "Visible2";
-
-  EXPECT_TRUE(SetLogHandler(old_handler) == &CaptureLog);
-
-  ASSERT_EQ(2, captured_messages_.size());
-  EXPECT_EQ(
-    "0 " __FILE__ ":" + SimpleItoa(line1) + ": Visible1",
-    captured_messages_[0]);
-  EXPECT_EQ(
-    "0 " __FILE__ ":" + SimpleItoa(line2) + ": Visible2",
-    captured_messages_[1]);
-}
-
-class ClosureTest : public testing::Test {
- public:
-  void SetA123Method()   { a_ = 123; }
-  static void SetA123Function() { current_instance_->a_ = 123; }
-
-  void SetAMethod(int a)         { a_ = a; }
-  void SetCMethod(std::string c) { c_ = c; }
-
-  static void SetAFunction(int a)         { current_instance_->a_ = a; }
-  static void SetCFunction(std::string c) { current_instance_->c_ = c; }
-
-  void SetABMethod(int a, const char* b)  { a_ = a; b_ = b; }
-  static void SetABFunction(int a, const char* b) {
-    current_instance_->a_ = a;
-    current_instance_->b_ = b;
-  }
-
-  virtual void SetUp() {
-    current_instance_ = this;
-    a_ = 0;
-    b_ = nullptr;
-    c_.clear();
-    permanent_closure_ = nullptr;
-  }
-
-  void DeleteClosureInCallback() {
-    delete permanent_closure_;
-  }
-
-  int a_;
-  const char* b_;
-  std::string c_;
-  Closure* permanent_closure_;
-
-  static ClosureTest* current_instance_;
-};
-
-ClosureTest* ClosureTest::current_instance_ = nullptr;
-
-TEST_F(ClosureTest, TestClosureFunction0) {
-  Closure* closure = NewCallback(&SetA123Function);
-  EXPECT_NE(123, a_);
-  closure->Run();
-  EXPECT_EQ(123, a_);
-}
-
-TEST_F(ClosureTest, TestClosureMethod0) {
-  Closure* closure = NewCallback(current_instance_,
-                                 &ClosureTest::SetA123Method);
-  EXPECT_NE(123, a_);
-  closure->Run();
-  EXPECT_EQ(123, a_);
-}
-
-TEST_F(ClosureTest, TestClosureFunction1) {
-  Closure* closure = NewCallback(&SetAFunction, 456);
-  EXPECT_NE(456, a_);
-  closure->Run();
-  EXPECT_EQ(456, a_);
-}
-
-TEST_F(ClosureTest, TestClosureMethod1) {
-  Closure* closure = NewCallback(current_instance_,
-                                 &ClosureTest::SetAMethod, 456);
-  EXPECT_NE(456, a_);
-  closure->Run();
-  EXPECT_EQ(456, a_);
-}
-
-TEST_F(ClosureTest, TestClosureFunction1String) {
-  Closure* closure = NewCallback(&SetCFunction, std::string("test"));
-  EXPECT_NE("test", c_);
-  closure->Run();
-  EXPECT_EQ("test", c_);
-}
-
-TEST_F(ClosureTest, TestClosureMethod1String) {
-  Closure* closure = NewCallback(current_instance_, &ClosureTest::SetCMethod,
-                                 std::string("test"));
-  EXPECT_NE("test", c_);
-  closure->Run();
-  EXPECT_EQ("test", c_);
-}
-
-TEST_F(ClosureTest, TestClosureFunction2) {
-  const char* cstr = "hello";
-  Closure* closure = NewCallback(&SetABFunction, 789, cstr);
-  EXPECT_NE(789, a_);
-  EXPECT_NE(cstr, b_);
-  closure->Run();
-  EXPECT_EQ(789, a_);
-  EXPECT_EQ(cstr, b_);
-}
-
-TEST_F(ClosureTest, TestClosureMethod2) {
-  const char* cstr = "hello";
-  Closure* closure = NewCallback(current_instance_,
-                                 &ClosureTest::SetABMethod, 789, cstr);
-  EXPECT_NE(789, a_);
-  EXPECT_NE(cstr, b_);
-  closure->Run();
-  EXPECT_EQ(789, a_);
-  EXPECT_EQ(cstr, b_);
-}
-
-// Repeat all of the above with NewPermanentCallback()
-
-TEST_F(ClosureTest, TestPermanentClosureFunction0) {
-  Closure* closure = NewPermanentCallback(&SetA123Function);
-  EXPECT_NE(123, a_);
-  closure->Run();
-  EXPECT_EQ(123, a_);
-  a_ = 0;
-  closure->Run();
-  EXPECT_EQ(123, a_);
-  delete closure;
-}
-
-TEST_F(ClosureTest, TestPermanentClosureMethod0) {
-  Closure* closure = NewPermanentCallback(current_instance_,
-                                          &ClosureTest::SetA123Method);
-  EXPECT_NE(123, a_);
-  closure->Run();
-  EXPECT_EQ(123, a_);
-  a_ = 0;
-  closure->Run();
-  EXPECT_EQ(123, a_);
-  delete closure;
-}
-
-TEST_F(ClosureTest, TestPermanentClosureFunction1) {
-  Closure* closure = NewPermanentCallback(&SetAFunction, 456);
-  EXPECT_NE(456, a_);
-  closure->Run();
-  EXPECT_EQ(456, a_);
-  a_ = 0;
-  closure->Run();
-  EXPECT_EQ(456, a_);
-  delete closure;
-}
-
-TEST_F(ClosureTest, TestPermanentClosureMethod1) {
-  Closure* closure = NewPermanentCallback(current_instance_,
-                                          &ClosureTest::SetAMethod, 456);
-  EXPECT_NE(456, a_);
-  closure->Run();
-  EXPECT_EQ(456, a_);
-  a_ = 0;
-  closure->Run();
-  EXPECT_EQ(456, a_);
-  delete closure;
-}
-
-TEST_F(ClosureTest, TestPermanentClosureFunction2) {
-  const char* cstr = "hello";
-  Closure* closure = NewPermanentCallback(&SetABFunction, 789, cstr);
-  EXPECT_NE(789, a_);
-  EXPECT_NE(cstr, b_);
-  closure->Run();
-  EXPECT_EQ(789, a_);
-  EXPECT_EQ(cstr, b_);
-  a_ = 0;
-  b_ = nullptr;
-  closure->Run();
-  EXPECT_EQ(789, a_);
-  EXPECT_EQ(cstr, b_);
-  delete closure;
-}
-
-TEST_F(ClosureTest, TestPermanentClosureMethod2) {
-  const char* cstr = "hello";
-  Closure* closure = NewPermanentCallback(current_instance_,
-                                          &ClosureTest::SetABMethod, 789, cstr);
-  EXPECT_NE(789, a_);
-  EXPECT_NE(cstr, b_);
-  closure->Run();
-  EXPECT_EQ(789, a_);
-  EXPECT_EQ(cstr, b_);
-  a_ = 0;
-  b_ = nullptr;
-  closure->Run();
-  EXPECT_EQ(789, a_);
-  EXPECT_EQ(cstr, b_);
-  delete closure;
-}
-
-TEST_F(ClosureTest, TestPermanentClosureDeleteInCallback) {
-  permanent_closure_ = NewPermanentCallback((ClosureTest*) this,
-      &ClosureTest::DeleteClosureInCallback);
-  permanent_closure_->Run();
-}
-
-}  // anonymous namespace
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/stubs/hash.h b/libs/protobuf/src/google/protobuf/stubs/hash.h
deleted file mode 100644
index a7ec068..0000000
--- a/libs/protobuf/src/google/protobuf/stubs/hash.h
+++ /dev/null
@@ -1,114 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-
-#ifndef GOOGLE_PROTOBUF_STUBS_HASH_H__
-#define GOOGLE_PROTOBUF_STUBS_HASH_H__
-
-#include <cstring>
-#include <string>
-#include <unordered_map>
-#include <unordered_set>
-
-# define GOOGLE_PROTOBUF_HASH_NAMESPACE_DECLARATION_START \
-  namespace google {                                      \
-  namespace protobuf {
-# define GOOGLE_PROTOBUF_HASH_NAMESPACE_DECLARATION_END }}
-
-namespace google {
-namespace protobuf {
-
-template <typename Key>
-struct hash : public std::hash<Key> {};
-
-template <typename Key>
-struct hash<const Key*> {
-  inline size_t operator()(const Key* key) const {
-    return reinterpret_cast<size_t>(key);
-  }
-};
-
-// Unlike the old SGI version, the TR1 "hash" does not special-case char*.  So,
-// we go ahead and provide our own implementation.
-template <>
-struct hash<const char*> {
-  inline size_t operator()(const char* str) const {
-    size_t result = 0;
-    for (; *str != '\0'; str++) {
-      result = 5 * result + static_cast<size_t>(*str);
-    }
-    return result;
-  }
-};
-
-template<>
-struct hash<bool> {
-  size_t operator()(bool x) const {
-    return static_cast<size_t>(x);
-  }
-};
-
-template <>
-struct hash<std::string> {
-  inline size_t operator()(const std::string& key) const {
-    return hash<const char*>()(key.c_str());
-  }
-
-  static const size_t bucket_size = 4;
-  static const size_t min_buckets = 8;
-  inline bool operator()(const std::string& a, const std::string& b) const {
-    return a < b;
-  }
-};
-
-template <typename First, typename Second>
-struct hash<std::pair<First, Second> > {
-  inline size_t operator()(const std::pair<First, Second>& key) const {
-    size_t first_hash = hash<First>()(key.first);
-    size_t second_hash = hash<Second>()(key.second);
-
-    // FIXME(kenton):  What is the best way to compute this hash?  I have
-    // no idea!  This seems a bit better than an XOR.
-    return first_hash * ((1 << 16) - 1) + second_hash;
-  }
-
-  static const size_t bucket_size = 4;
-  static const size_t min_buckets = 8;
-  inline bool operator()(const std::pair<First, Second>& a,
-                           const std::pair<First, Second>& b) const {
-    return a < b;
-  }
-};
-
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // GOOGLE_PROTOBUF_STUBS_HASH_H__
diff --git a/libs/protobuf/src/google/protobuf/stubs/int128.cc b/libs/protobuf/src/google/protobuf/stubs/int128.cc
deleted file mode 100644
index a151cfb..0000000
--- a/libs/protobuf/src/google/protobuf/stubs/int128.cc
+++ /dev/null
@@ -1,193 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <google/protobuf/stubs/int128.h>
-
-#include <iomanip>
-#include <ostream>  // NOLINT(readability/streams)
-#include <sstream>
-
-#include <google/protobuf/stubs/logging.h>
-
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-
-const uint128_pod kuint128max = {uint64_t{0xFFFFFFFFFFFFFFFFu},
-                                 uint64_t{0xFFFFFFFFFFFFFFFFu}};
-
-// Returns the 0-based position of the last set bit (i.e., most significant bit)
-// in the given uint64. The argument may not be 0.
-//
-// For example:
-//   Given: 5 (decimal) == 101 (binary)
-//   Returns: 2
-#define STEP(T, n, pos, sh)                   \
-  do {                                        \
-    if ((n) >= (static_cast<T>(1) << (sh))) { \
-      (n) = (n) >> (sh);                      \
-      (pos) |= (sh);                          \
-    }                                         \
-  } while (0)
-static inline int Fls64(uint64_t n) {
-  GOOGLE_DCHECK_NE(0, n);
-  int pos = 0;
-  STEP(uint64_t, n, pos, 0x20);
-  uint32_t n32 = n;
-  STEP(uint32_t, n32, pos, 0x10);
-  STEP(uint32_t, n32, pos, 0x08);
-  STEP(uint32_t, n32, pos, 0x04);
-  return pos + ((uint64_t{0x3333333322221100u} >> (n32 << 2)) & 0x3);
-}
-#undef STEP
-
-// Like Fls64() above, but returns the 0-based position of the last set bit
-// (i.e., most significant bit) in the given uint128. The argument may not be 0.
-static inline int Fls128(uint128 n) {
-  if (uint64_t hi = Uint128High64(n)) {
-    return Fls64(hi) + 64;
-  }
-  return Fls64(Uint128Low64(n));
-}
-
-void uint128::DivModImpl(uint128 dividend, uint128 divisor,
-                         uint128* quotient_ret, uint128* remainder_ret) {
-  if (divisor == 0) {
-    GOOGLE_LOG(FATAL) << "Division or mod by zero: dividend.hi=" << dividend.hi_
-                      << ", lo=" << dividend.lo_;
-  } else if (dividend < divisor) {
-    *quotient_ret = 0;
-    *remainder_ret = dividend;
-    return;
-  } else {
-    int dividend_bit_length = Fls128(dividend);
-    int divisor_bit_length = Fls128(divisor);
-    int difference = dividend_bit_length - divisor_bit_length;
-    uint128 quotient = 0;
-    while (difference >= 0) {
-      quotient <<= 1;
-      uint128 shifted_divisor = divisor << difference;
-      if (shifted_divisor <= dividend) {
-        dividend -= shifted_divisor;
-        quotient += 1;
-      }
-      difference -= 1;
-    }
-    //record the final quotient and remainder
-    *quotient_ret = quotient;
-    *remainder_ret = dividend;
-  }
-}
-
-
-uint128& uint128::operator/=(const uint128& divisor) {
-  uint128 quotient = 0;
-  uint128 remainder = 0;
-  DivModImpl(*this, divisor, &quotient, &remainder);
-  *this = quotient;
-  return *this;
-}
-uint128& uint128::operator%=(const uint128& divisor) {
-  uint128 quotient = 0;
-  uint128 remainder = 0;
-  DivModImpl(*this, divisor, &quotient, &remainder);
-  *this = remainder;
-  return *this;
-}
-
-std::ostream& operator<<(std::ostream& o, const uint128& b) {
-  std::ios_base::fmtflags flags = o.flags();
-
-  // Select a divisor which is the largest power of the base < 2^64.
-  uint128 div;
-  std::streamsize div_base_log;
-  switch (flags & std::ios::basefield) {
-    case std::ios::hex:
-      div =
-          static_cast<uint64_t>(uint64_t{0x1000000000000000u});  // 16^15
-      div_base_log = 15;
-      break;
-    case std::ios::oct:
-      div = static_cast<uint64_t>(
-          uint64_t{01000000000000000000000u});  // 8^21
-      div_base_log = 21;
-      break;
-    default:  // std::ios::dec
-      div = static_cast<uint64_t>(
-          uint64_t{10000000000000000000u});  // 10^19
-      div_base_log = 19;
-      break;
-  }
-
-  // Now piece together the uint128 representation from three chunks of
-  // the original value, each less than "div" and therefore representable
-  // as a uint64.
-  std::ostringstream os;
-  std::ios_base::fmtflags copy_mask =
-      std::ios::basefield | std::ios::showbase | std::ios::uppercase;
-  os.setf(flags & copy_mask, copy_mask);
-  uint128 high = b;
-  uint128 low;
-  uint128::DivModImpl(high, div, &high, &low);
-  uint128 mid;
-  uint128::DivModImpl(high, div, &high, &mid);
-  if (high.lo_ != 0) {
-    os << high.lo_;
-    os << std::noshowbase << std::setfill('0') << std::setw(div_base_log);
-    os << mid.lo_;
-    os << std::setw(div_base_log);
-  } else if (mid.lo_ != 0) {
-    os << mid.lo_;
-    os << std::noshowbase << std::setfill('0') << std::setw(div_base_log);
-  }
-  os << low.lo_;
-  std::string rep = os.str();
-
-  // Add the requisite padding.
-  std::streamsize width = o.width(0);
-  auto repSize = static_cast<std::streamsize>(rep.size());
-  if (width > repSize) {
-    if ((flags & std::ios::adjustfield) == std::ios::left) {
-      rep.append(width - repSize, o.fill());
-    } else {
-      rep.insert(static_cast<std::string::size_type>(0), width - repSize,
-                 o.fill());
-    }
-  }
-
-  // Stream the final representation in a single "<<" call.
-  return o << rep;
-}
-
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>  // NOLINT
diff --git a/libs/protobuf/src/google/protobuf/stubs/int128.h b/libs/protobuf/src/google/protobuf/stubs/int128.h
deleted file mode 100644
index 92d7bdf..0000000
--- a/libs/protobuf/src/google/protobuf/stubs/int128.h
+++ /dev/null
@@ -1,387 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#ifndef GOOGLE_PROTOBUF_STUBS_INT128_H_
-#define GOOGLE_PROTOBUF_STUBS_INT128_H_
-
-#include <google/protobuf/stubs/common.h>
-
-#include <iosfwd>
-
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-
-struct uint128_pod;
-
-// TODO(xiaofeng): Define GOOGLE_PROTOBUF_HAS_CONSTEXPR when constexpr is
-// available.
-#ifdef GOOGLE_PROTOBUF_HAS_CONSTEXPR
-# define UINT128_CONSTEXPR constexpr
-#else
-# define UINT128_CONSTEXPR
-#endif
-
-// An unsigned 128-bit integer type. Thread-compatible.
-class PROTOBUF_EXPORT uint128 {
- public:
-  UINT128_CONSTEXPR uint128();  // Sets to 0, but don't trust on this behavior.
-  UINT128_CONSTEXPR uint128(uint64_t top, uint64_t bottom);
-#ifndef SWIG
-  UINT128_CONSTEXPR uint128(int bottom);
-  UINT128_CONSTEXPR uint128(uint32_t bottom);   // Top 96 bits = 0
-#endif
-  UINT128_CONSTEXPR uint128(uint64_t bottom);   // hi_ = 0
-  UINT128_CONSTEXPR uint128(const uint128_pod &val);
-
-  // Trivial copy constructor, assignment operator and destructor.
-
-  void Initialize(uint64_t top, uint64_t bottom);
-
-  // Arithmetic operators.
-  uint128& operator+=(const uint128& b);
-  uint128& operator-=(const uint128& b);
-  uint128& operator*=(const uint128& b);
-  // Long division/modulo for uint128.
-  uint128& operator/=(const uint128& b);
-  uint128& operator%=(const uint128& b);
-  uint128 operator++(int);
-  uint128 operator--(int);
-  uint128& operator<<=(int);
-  uint128& operator>>=(int);
-  uint128& operator&=(const uint128& b);
-  uint128& operator|=(const uint128& b);
-  uint128& operator^=(const uint128& b);
-  uint128& operator++();
-  uint128& operator--();
-
-  friend uint64_t Uint128Low64(const uint128& v);
-  friend uint64_t Uint128High64(const uint128& v);
-
-  // We add "std::" to avoid including all of port.h.
-  PROTOBUF_EXPORT friend std::ostream& operator<<(std::ostream& o,
-                                                  const uint128& b);
-
- private:
-  static void DivModImpl(uint128 dividend, uint128 divisor,
-                         uint128* quotient_ret, uint128* remainder_ret);
-
-  // Little-endian memory order optimizations can benefit from
-  // having lo_ first, hi_ last.
-  // See util/endian/endian.h and Load128/Store128 for storing a uint128.
-  uint64_t lo_;
-  uint64_t hi_;
-
-  // Not implemented, just declared for catching automatic type conversions.
-  uint128(uint8_t);
-  uint128(uint16_t);
-  uint128(float v);
-  uint128(double v);
-};
-
-// This is a POD form of uint128 which can be used for static variables which
-// need to be operated on as uint128.
-struct uint128_pod {
-  // Note: The ordering of fields is different than 'class uint128' but the
-  // same as its 2-arg constructor.  This enables more obvious initialization
-  // of static instances, which is the primary reason for this struct in the
-  // first place.  This does not seem to defeat any optimizations wrt
-  // operations involving this struct.
-  uint64_t hi;
-  uint64_t lo;
-};
-
-PROTOBUF_EXPORT extern const uint128_pod kuint128max;
-
-// allow uint128 to be logged
-PROTOBUF_EXPORT extern std::ostream& operator<<(std::ostream& o,
-                                                const uint128& b);
-
-// Methods to access low and high pieces of 128-bit value.
-// Defined externally from uint128 to facilitate conversion
-// to native 128-bit types when compilers support them.
-inline uint64_t Uint128Low64(const uint128& v) { return v.lo_; }
-inline uint64_t Uint128High64(const uint128& v) { return v.hi_; }
-
-// TODO: perhaps it would be nice to have int128, a signed 128-bit type?
-
-// --------------------------------------------------------------------------
-//                      Implementation details follow
-// --------------------------------------------------------------------------
-inline bool operator==(const uint128& lhs, const uint128& rhs) {
-  return (Uint128Low64(lhs) == Uint128Low64(rhs) &&
-          Uint128High64(lhs) == Uint128High64(rhs));
-}
-inline bool operator!=(const uint128& lhs, const uint128& rhs) {
-  return !(lhs == rhs);
-}
-
-inline UINT128_CONSTEXPR uint128::uint128() : lo_(0), hi_(0) {}
-inline UINT128_CONSTEXPR uint128::uint128(uint64_t top, uint64_t bottom)
-    : lo_(bottom), hi_(top) {}
-inline UINT128_CONSTEXPR uint128::uint128(const uint128_pod& v)
-    : lo_(v.lo), hi_(v.hi) {}
-inline UINT128_CONSTEXPR uint128::uint128(uint64_t bottom)
-    : lo_(bottom), hi_(0) {}
-#ifndef SWIG
-inline UINT128_CONSTEXPR uint128::uint128(uint32_t bottom)
-    : lo_(bottom), hi_(0) {}
-inline UINT128_CONSTEXPR uint128::uint128(int bottom)
-    : lo_(bottom), hi_(static_cast<int64_t>((bottom < 0) ? -1 : 0)) {}
-#endif
-
-#undef UINT128_CONSTEXPR
-
-inline void uint128::Initialize(uint64_t top, uint64_t bottom) {
-  hi_ = top;
-  lo_ = bottom;
-}
-
-// Comparison operators.
-
-#define CMP128(op)                                                \
-inline bool operator op(const uint128& lhs, const uint128& rhs) { \
-  return (Uint128High64(lhs) == Uint128High64(rhs)) ?             \
-      (Uint128Low64(lhs) op Uint128Low64(rhs)) :                  \
-      (Uint128High64(lhs) op Uint128High64(rhs));                 \
-}
-
-CMP128(<)
-CMP128(>)
-CMP128(>=)
-CMP128(<=)
-
-#undef CMP128
-
-// Unary operators
-
-inline uint128 operator-(const uint128& val) {
-  const uint64_t hi_flip = ~Uint128High64(val);
-  const uint64_t lo_flip = ~Uint128Low64(val);
-  const uint64_t lo_add = lo_flip + 1;
-  if (lo_add < lo_flip) {
-    return uint128(hi_flip + 1, lo_add);
-  }
-  return uint128(hi_flip, lo_add);
-}
-
-inline bool operator!(const uint128& val) {
-  return !Uint128High64(val) && !Uint128Low64(val);
-}
-
-// Logical operators.
-
-inline uint128 operator~(const uint128& val) {
-  return uint128(~Uint128High64(val), ~Uint128Low64(val));
-}
-
-#define LOGIC128(op)                                                 \
-inline uint128 operator op(const uint128& lhs, const uint128& rhs) { \
-  return uint128(Uint128High64(lhs) op Uint128High64(rhs),           \
-                 Uint128Low64(lhs) op Uint128Low64(rhs));            \
-}
-
-LOGIC128(|)
-LOGIC128(&)
-LOGIC128(^)
-
-#undef LOGIC128
-
-#define LOGICASSIGN128(op)                                   \
-inline uint128& uint128::operator op(const uint128& other) { \
-  hi_ op other.hi_;                                          \
-  lo_ op other.lo_;                                          \
-  return *this;                                              \
-}
-
-LOGICASSIGN128(|=)
-LOGICASSIGN128(&=)
-LOGICASSIGN128(^=)
-
-#undef LOGICASSIGN128
-
-// Shift operators.
-
-inline uint128 operator<<(const uint128& val, int amount) {
-  // uint64 shifts of >= 64 are undefined, so we will need some special-casing.
-  if (amount < 64) {
-    if (amount == 0) {
-      return val;
-    }
-    uint64_t new_hi = (Uint128High64(val) << amount) |
-                      (Uint128Low64(val) >> (64 - amount));
-    uint64_t new_lo = Uint128Low64(val) << amount;
-    return uint128(new_hi, new_lo);
-  } else if (amount < 128) {
-    return uint128(Uint128Low64(val) << (amount - 64), 0);
-  } else {
-    return uint128(0, 0);
-  }
-}
-
-inline uint128 operator>>(const uint128& val, int amount) {
-  // uint64 shifts of >= 64 are undefined, so we will need some special-casing.
-  if (amount < 64) {
-    if (amount == 0) {
-      return val;
-    }
-    uint64_t new_hi = Uint128High64(val) >> amount;
-    uint64_t new_lo = (Uint128Low64(val) >> amount) |
-                      (Uint128High64(val) << (64 - amount));
-    return uint128(new_hi, new_lo);
-  } else if (amount < 128) {
-    return uint128(0, Uint128High64(val) >> (amount - 64));
-  } else {
-    return uint128(0, 0);
-  }
-}
-
-inline uint128& uint128::operator<<=(int amount) {
-  // uint64 shifts of >= 64 are undefined, so we will need some special-casing.
-  if (amount < 64) {
-    if (amount != 0) {
-      hi_ = (hi_ << amount) | (lo_ >> (64 - amount));
-      lo_ = lo_ << amount;
-    }
-  } else if (amount < 128) {
-    hi_ = lo_ << (amount - 64);
-    lo_ = 0;
-  } else {
-    hi_ = 0;
-    lo_ = 0;
-  }
-  return *this;
-}
-
-inline uint128& uint128::operator>>=(int amount) {
-  // uint64 shifts of >= 64 are undefined, so we will need some special-casing.
-  if (amount < 64) {
-    if (amount != 0) {
-      lo_ = (lo_ >> amount) | (hi_ << (64 - amount));
-      hi_ = hi_ >> amount;
-    }
-  } else if (amount < 128) {
-    lo_ = hi_ >> (amount - 64);
-    hi_ = 0;
-  } else {
-    lo_ = 0;
-    hi_ = 0;
-  }
-  return *this;
-}
-
-inline uint128 operator+(const uint128& lhs, const uint128& rhs) {
-  return uint128(lhs) += rhs;
-}
-
-inline uint128 operator-(const uint128& lhs, const uint128& rhs) {
-  return uint128(lhs) -= rhs;
-}
-
-inline uint128 operator*(const uint128& lhs, const uint128& rhs) {
-  return uint128(lhs) *= rhs;
-}
-
-inline uint128 operator/(const uint128& lhs, const uint128& rhs) {
-  return uint128(lhs) /= rhs;
-}
-
-inline uint128 operator%(const uint128& lhs, const uint128& rhs) {
-  return uint128(lhs) %= rhs;
-}
-
-inline uint128& uint128::operator+=(const uint128& b) {
-  hi_ += b.hi_;
-  uint64_t lolo = lo_ + b.lo_;
-  if (lolo < lo_)
-    ++hi_;
-  lo_ = lolo;
-  return *this;
-}
-
-inline uint128& uint128::operator-=(const uint128& b) {
-  hi_ -= b.hi_;
-  if (b.lo_ > lo_)
-    --hi_;
-  lo_ -= b.lo_;
-  return *this;
-}
-
-inline uint128& uint128::operator*=(const uint128& b) {
-  uint64_t a96 = hi_ >> 32;
-  uint64_t a64 = hi_ & 0xffffffffu;
-  uint64_t a32 = lo_ >> 32;
-  uint64_t a00 = lo_ & 0xffffffffu;
-  uint64_t b96 = b.hi_ >> 32;
-  uint64_t b64 = b.hi_ & 0xffffffffu;
-  uint64_t b32 = b.lo_ >> 32;
-  uint64_t b00 = b.lo_ & 0xffffffffu;
-  // multiply [a96 .. a00] x [b96 .. b00]
-  // terms higher than c96 disappear off the high side
-  // terms c96 and c64 are safe to ignore carry bit
-  uint64_t c96 = a96 * b00 + a64 * b32 + a32 * b64 + a00 * b96;
-  uint64_t c64 = a64 * b00 + a32 * b32 + a00 * b64;
-  this->hi_ = (c96 << 32) + c64;
-  this->lo_ = 0;
-  // add terms after this one at a time to capture carry
-  *this += uint128(a32 * b00) << 32;
-  *this += uint128(a00 * b32) << 32;
-  *this += a00 * b00;
-  return *this;
-}
-
-inline uint128 uint128::operator++(int) {
-  uint128 tmp(*this);
-  *this += 1;
-  return tmp;
-}
-
-inline uint128 uint128::operator--(int) {
-  uint128 tmp(*this);
-  *this -= 1;
-  return tmp;
-}
-
-inline uint128& uint128::operator++() {
-  *this += 1;
-  return *this;
-}
-
-inline uint128& uint128::operator--() {
-  *this -= 1;
-  return *this;
-}
-
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
-
-#endif  // GOOGLE_PROTOBUF_STUBS_INT128_H_
diff --git a/libs/protobuf/src/google/protobuf/stubs/int128_unittest.cc b/libs/protobuf/src/google/protobuf/stubs/int128_unittest.cc
deleted file mode 100644
index b1634f0..0000000
--- a/libs/protobuf/src/google/protobuf/stubs/int128_unittest.cc
+++ /dev/null
@@ -1,511 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <google/protobuf/stubs/int128.h>
-
-#include <algorithm>
-#include <sstream>
-#include <utility>
-
-#include <google/protobuf/testing/googletest.h>
-#include <gtest/gtest.h>
-
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-
-TEST(Int128, AllTests) {
-  uint128 zero(0);
-  uint128 one(1);
-  uint128 one_2arg(0, 1);
-  uint128 two(0, 2);
-  uint128 three(0, 3);
-  uint128 big(2000, 2);
-  uint128 big_minus_one(2000, 1);
-  uint128 bigger(2001, 1);
-  uint128 biggest(kuint128max);
-  uint128 high_low(1, 0);
-  uint128 low_high(0, std::numeric_limits<uint64_t>::max());
-  EXPECT_LT(one, two);
-  EXPECT_GT(two, one);
-  EXPECT_LT(one, big);
-  EXPECT_LT(one, big);
-  EXPECT_EQ(one, one_2arg);
-  EXPECT_NE(one, two);
-  EXPECT_GT(big, one);
-  EXPECT_GE(big, two);
-  EXPECT_GE(big, big_minus_one);
-  EXPECT_GT(big, big_minus_one);
-  EXPECT_LT(big_minus_one, big);
-  EXPECT_LE(big_minus_one, big);
-  EXPECT_NE(big_minus_one, big);
-  EXPECT_LT(big, biggest);
-  EXPECT_LE(big, biggest);
-  EXPECT_GT(biggest, big);
-  EXPECT_GE(biggest, big);
-  EXPECT_EQ(big, ~~big);
-  EXPECT_EQ(one, one | one);
-  EXPECT_EQ(big, big | big);
-  EXPECT_EQ(one, one | zero);
-  EXPECT_EQ(one, one & one);
-  EXPECT_EQ(big, big & big);
-  EXPECT_EQ(zero, one & zero);
-  EXPECT_EQ(zero, big & ~big);
-  EXPECT_EQ(zero, one ^ one);
-  EXPECT_EQ(zero, big ^ big);
-  EXPECT_EQ(one, one ^ zero);
-
-  // Shift operators.
-  EXPECT_EQ(big, big << 0);
-  EXPECT_EQ(big, big >> 0);
-  EXPECT_GT(big << 1, big);
-  EXPECT_LT(big >> 1, big);
-  EXPECT_EQ(big, (big << 10) >> 10);
-  EXPECT_EQ(big, (big >> 1) << 1);
-  EXPECT_EQ(one, (one << 80) >> 80);
-  EXPECT_EQ(zero, (one >> 80) << 80);
-  EXPECT_EQ(zero, big >> 128);
-  EXPECT_EQ(zero, big << 128);
-
-  // Shift assignments.
-  uint128 big_copy = big;
-  EXPECT_EQ(big << 0, big_copy <<= 0);
-  big_copy = big;
-  EXPECT_EQ(big >> 0, big_copy >>= 0);
-  big_copy = big;
-  EXPECT_EQ(big << 1, big_copy <<= 1);
-  big_copy = big;
-  EXPECT_EQ(big >> 1, big_copy >>= 1);
-  big_copy = big;
-  EXPECT_EQ(big << 10, big_copy <<= 10);
-  big_copy = big;
-  EXPECT_EQ(big >> 10, big_copy >>= 10);
-  big_copy = big;
-  EXPECT_EQ(big << 64, big_copy <<= 64);
-  big_copy = big;
-  EXPECT_EQ(big >> 64, big_copy >>= 64);
-  big_copy = big;
-  EXPECT_EQ(big << 73, big_copy <<= 73);
-  big_copy = big;
-  EXPECT_EQ(big >> 73, big_copy >>= 73);
-  big_copy = big;
-  EXPECT_EQ(big << 128, big_copy <<= 128);
-  big_copy = big;
-  EXPECT_EQ(big >> 128, big_copy >>= 128);
-
-  EXPECT_EQ(Uint128High64(biggest), std::numeric_limits<uint64_t>::max());
-  EXPECT_EQ(Uint128Low64(biggest), std::numeric_limits<uint64_t>::max());
-  EXPECT_EQ(zero + one, one);
-  EXPECT_EQ(one + one, two);
-  EXPECT_EQ(big_minus_one + one, big);
-  EXPECT_EQ(one - one, zero);
-  EXPECT_EQ(one - zero, one);
-  EXPECT_EQ(zero - one, biggest);
-  EXPECT_EQ(big - big, zero);
-  EXPECT_EQ(big - one, big_minus_one);
-  EXPECT_EQ(big + std::numeric_limits<uint64_t>::max(), bigger);
-  EXPECT_EQ(biggest + 1, zero);
-  EXPECT_EQ(zero - 1, biggest);
-  EXPECT_EQ(high_low - one, low_high);
-  EXPECT_EQ(low_high + one, high_low);
-  EXPECT_EQ(Uint128High64((uint128(1) << 64) - 1), 0);
-  EXPECT_EQ(Uint128Low64((uint128(1) << 64) - 1), std::numeric_limits<uint64_t>::max());
-  EXPECT_TRUE(!!one);
-  EXPECT_TRUE(!!high_low);
-  EXPECT_FALSE(!!zero);
-  EXPECT_FALSE(!one);
-  EXPECT_FALSE(!high_low);
-  EXPECT_TRUE(!zero);
-  EXPECT_TRUE(zero == 0);
-  EXPECT_FALSE(zero != 0);
-  EXPECT_FALSE(one == 0);
-  EXPECT_TRUE(one != 0);
-
-  uint128 test = zero;
-  EXPECT_EQ(++test, one);
-  EXPECT_EQ(test, one);
-  EXPECT_EQ(test++, one);
-  EXPECT_EQ(test, two);
-  EXPECT_EQ(test -= 2, zero);
-  EXPECT_EQ(test, zero);
-  EXPECT_EQ(test += 2, two);
-  EXPECT_EQ(test, two);
-  EXPECT_EQ(--test, one);
-  EXPECT_EQ(test, one);
-  EXPECT_EQ(test--, one);
-  EXPECT_EQ(test, zero);
-  EXPECT_EQ(test |= three, three);
-  EXPECT_EQ(test &= one, one);
-  EXPECT_EQ(test ^= three, two);
-  EXPECT_EQ(test >>= 1, one);
-  EXPECT_EQ(test <<= 1, two);
-
-  EXPECT_EQ(big, -(-big));
-  EXPECT_EQ(two, -((-one) - 1));
-  EXPECT_EQ(kuint128max, -one);
-  EXPECT_EQ(zero, -zero);
-
-  GOOGLE_LOG(INFO) << one;
-  GOOGLE_LOG(INFO) << big_minus_one;
-}
-
-TEST(Int128, PodTests) {
-  uint128_pod pod = { 12345, 67890 };
-  uint128 from_pod(pod);
-  EXPECT_EQ(12345, Uint128High64(from_pod));
-  EXPECT_EQ(67890, Uint128Low64(from_pod));
-
-  uint128 zero(0);
-  uint128_pod zero_pod = {0, 0};
-  uint128 one(1);
-  uint128_pod one_pod = {0, 1};
-  uint128 two(2);
-  uint128_pod two_pod = {0, 2};
-  uint128 three(3);
-  uint128_pod three_pod = {0, 3};
-  uint128 big(1, 0);
-  uint128_pod big_pod = {1, 0};
-
-  EXPECT_EQ(zero, zero_pod);
-  EXPECT_EQ(zero_pod, zero);
-  EXPECT_EQ(zero_pod, zero_pod);
-  EXPECT_EQ(one, one_pod);
-  EXPECT_EQ(one_pod, one);
-  EXPECT_EQ(one_pod, one_pod);
-  EXPECT_EQ(two, two_pod);
-  EXPECT_EQ(two_pod, two);
-  EXPECT_EQ(two_pod, two_pod);
-
-  EXPECT_NE(one, two_pod);
-  EXPECT_NE(one_pod, two);
-  EXPECT_NE(one_pod, two_pod);
-
-  EXPECT_LT(one, two_pod);
-  EXPECT_LT(one_pod, two);
-  EXPECT_LT(one_pod, two_pod);
-  EXPECT_LE(one, one_pod);
-  EXPECT_LE(one_pod, one);
-  EXPECT_LE(one_pod, one_pod);
-  EXPECT_LE(one, two_pod);
-  EXPECT_LE(one_pod, two);
-  EXPECT_LE(one_pod, two_pod);
-
-  EXPECT_GT(two, one_pod);
-  EXPECT_GT(two_pod, one);
-  EXPECT_GT(two_pod, one_pod);
-  EXPECT_GE(two, two_pod);
-  EXPECT_GE(two_pod, two);
-  EXPECT_GE(two_pod, two_pod);
-  EXPECT_GE(two, one_pod);
-  EXPECT_GE(two_pod, one);
-  EXPECT_GE(two_pod, one_pod);
-
-  EXPECT_EQ(three, one | two_pod);
-  EXPECT_EQ(three, one_pod | two);
-  EXPECT_EQ(three, one_pod | two_pod);
-  EXPECT_EQ(one, three & one_pod);
-  EXPECT_EQ(one, three_pod & one);
-  EXPECT_EQ(one, three_pod & one_pod);
-  EXPECT_EQ(two, three ^ one_pod);
-  EXPECT_EQ(two, three_pod ^ one);
-  EXPECT_EQ(two, three_pod ^ one_pod);
-  EXPECT_EQ(two, three & (~one));
-  EXPECT_EQ(three, ~~three);
-
-  EXPECT_EQ(two, two_pod << 0);
-  EXPECT_EQ(two, one_pod << 1);
-  EXPECT_EQ(big, one_pod << 64);
-  EXPECT_EQ(zero, one_pod << 128);
-  EXPECT_EQ(two, two_pod >> 0);
-  EXPECT_EQ(one, two_pod >> 1);
-  EXPECT_EQ(one, big_pod >> 64);
-
-  EXPECT_EQ(one, zero + one_pod);
-  EXPECT_EQ(one, zero_pod + one);
-  EXPECT_EQ(one, zero_pod + one_pod);
-  EXPECT_EQ(one, two - one_pod);
-  EXPECT_EQ(one, two_pod - one);
-  EXPECT_EQ(one, two_pod - one_pod);
-}
-
-TEST(Int128, OperatorAssignReturnRef) {
-  uint128 v(1);
-  (v += 4) -= 3;
-  EXPECT_EQ(2, v);
-}
-
-TEST(Int128, Multiply) {
-  uint128 a, b, c;
-
-  // Zero test.
-  a = 0;
-  b = 0;
-  c = a * b;
-  EXPECT_EQ(0, c);
-
-  // Max carries.
-  a = uint128(0) - 1;
-  b = uint128(0) - 1;
-  c = a * b;
-  EXPECT_EQ(1, c);
-
-  // Self-operation with max carries.
-  c = uint128(0) - 1;
-  c *= c;
-  EXPECT_EQ(1, c);
-
-  // 1-bit x 1-bit.
-  for (int i = 0; i < 64; ++i) {
-    for (int j = 0; j < 64; ++j) {
-      a = uint128(1) << i;
-      b = uint128(1) << j;
-      c = a * b;
-      EXPECT_EQ(uint128(1) << (i+j), c);
-    }
-  }
-
-  // Verified with dc.
-  a = uint128(uint64_t{0xffffeeeeddddccccu}, uint64_t{0xbbbbaaaa99998888u});
-  b = uint128(uint64_t{0x7777666655554444u}, uint64_t{0x3333222211110000u});
-  c = a * b;
-  EXPECT_EQ(
-      uint128(uint64_t{0x530EDA741C71D4C3u}, uint64_t{0xBF25975319080000u}), c);
-  EXPECT_EQ(0, c - b * a);
-  EXPECT_EQ(a * a - b * b, (a + b) * (a - b));
-
-  // Verified with dc.
-  a = uint128(uint64_t{0x0123456789abcdefu}, uint64_t{0xfedcba9876543210u});
-  b = uint128(uint64_t{0x02468ace13579bdfu}, uint64_t{0xfdb97531eca86420u});
-  c = a * b;
-  EXPECT_EQ(
-      uint128(uint64_t{0x97a87f4f261ba3f2u}, uint64_t{0x342d0bbf48948200u}), c);
-  EXPECT_EQ(0, c - b * a);
-  EXPECT_EQ(a*a - b*b, (a+b) * (a-b));
-}
-
-TEST(Int128, AliasTests) {
-  uint128 x1(1, 2);
-  uint128 x2(2, 4);
-  x1 += x1;
-  EXPECT_EQ(x2, x1);
-
-  uint128 x3(1, static_cast<uint64_t>(1) << 63);
-  uint128 x4(3, 0);
-  x3 += x3;
-  EXPECT_EQ(x4, x3);
-}
-
-#ifdef PROTOBUF_HAS_DEATH_TEST
-TEST(Int128, DivideByZeroCheckFails) {
-  uint128 a = 0;
-  uint128 b = 0;
-  EXPECT_DEATH(a / b, "Division or mod by zero:");
-  a = 123;
-  EXPECT_DEATH(a / b, "Division or mod by zero:");
-}
-
-TEST(Int128, ModByZeroCheckFails) {
-  uint128 a = 0;
-  uint128 b = 0;
-  EXPECT_DEATH(a % b, "Division or mod by zero:");
-  a = 123;
-  EXPECT_DEATH(a % b, "Division or mod by zero:");
-}
-#endif  // PROTOBUF_HAS_DEATH_TEST
-
-TEST(Int128, DivideAndMod) {
-  // a := q * b + r
-  uint128 a, b, q, r;
-
-  // Zero test.
-  a = 0;
-  b = 123;
-  q = a / b;
-  r = a % b;
-  EXPECT_EQ(0, q);
-  EXPECT_EQ(0, r);
-
-  a = uint128(uint64_t{0x530eda741c71d4c3u}, uint64_t{0xbf25975319080000u});
-  q = uint128(uint64_t{0x4de2cab081u}, uint64_t{0x14c34ab4676e4babu});
-  b = uint128(0x1110001);
-  r = uint128(0x3eb455);
-  ASSERT_EQ(a, q * b + r);  // Sanity-check.
-
-  uint128 result_q, result_r;
-  result_q = a / b;
-  result_r = a % b;
-  EXPECT_EQ(q, result_q);
-  EXPECT_EQ(r, result_r);
-
-  // Try the other way around.
-  std::swap(q, b);
-  result_q = a / b;
-  result_r = a % b;
-  EXPECT_EQ(q, result_q);
-  EXPECT_EQ(r, result_r);
-  // Restore.
-  std::swap(b, q);
-
-  // Dividend < divisor; result should be q:0 r:<dividend>.
-  std::swap(a, b);
-  result_q = a / b;
-  result_r = a % b;
-  EXPECT_EQ(0, result_q);
-  EXPECT_EQ(a, result_r);
-  // Try the other way around.
-  std::swap(a, q);
-  result_q = a / b;
-  result_r = a % b;
-  EXPECT_EQ(0, result_q);
-  EXPECT_EQ(a, result_r);
-  // Restore.
-  std::swap(q, a);
-  std::swap(b, a);
-
-  // Try a large remainder.
-  b = a / 2 + 1;
-  uint128 expected_r(uint64_t{0x29876d3a0e38ea61u},
-                     uint64_t{0xdf92cba98c83ffffu});
-  // Sanity checks.
-  ASSERT_EQ(a / 2 - 1, expected_r);
-  ASSERT_EQ(a, b + expected_r);
-  result_q = a / b;
-  result_r = a % b;
-  EXPECT_EQ(1, result_q);
-  EXPECT_EQ(expected_r, result_r);
-}
-
-static uint64_t RandomUint64() {
-  uint64_t v1 = rand();
-  uint64_t v2 = rand();
-  uint64_t v3 = rand();
-  return v1 * v2 + v3;
-}
-
-TEST(Int128, DivideAndModRandomInputs) {
-  const int kNumIters = 1 << 18;
-  for (int i = 0; i < kNumIters; ++i) {
-    const uint128 a(RandomUint64(), RandomUint64());
-    const uint128 b(RandomUint64(), RandomUint64());
-    if (b == 0) {
-      continue;  // Avoid a div-by-zero.
-    }
-    const uint128 q = a / b;
-    const uint128 r = a % b;
-    ASSERT_EQ(a, b * q + r);
-  }
-}
-
-#ifdef GOOGLE_PROTOBUF_HAS_CONSTEXPR
-TEST(Int128, ConstexprTest) {
-  constexpr uint128 zero;
-  constexpr uint128 one = 1;
-  constexpr uint128_pod pod = {2, 3};
-  constexpr uint128 from_pod = pod;
-  constexpr uint128 minus_two = -2;
-  EXPECT_EQ(one, uint128(1));
-  EXPECT_EQ(from_pod, uint128(2, 3));
-  EXPECT_EQ(minus_two, uint128(-1ULL, -2ULL));
-}
-
-TEST(Int128, Traits) {
-  EXPECT_TRUE(std::is_trivially_copy_constructible<uint128>::value);
-  EXPECT_TRUE(std::is_trivially_copy_assignable<uint128>::value);
-  EXPECT_TRUE(std::is_trivially_destructible<uint128>::value);
-}
-#endif  // GOOGLE_PROTOBUF_HAS_CONSTEXPR
-
-TEST(Int128, OStream) {
-  struct {
-    uint128 val;
-    std::ios_base::fmtflags flags;
-    std::streamsize width;
-    char fill;
-    const char* rep;
-  } cases[] = {
-      // zero with different bases
-      {uint128(0), std::ios::dec, 0, '_', "0"},
-      {uint128(0), std::ios::oct, 0, '_', "0"},
-      {uint128(0), std::ios::hex, 0, '_', "0"},
-      // crossover between lo_ and hi_
-      {uint128(0, -1), std::ios::dec, 0, '_', "18446744073709551615"},
-      {uint128(0, -1), std::ios::oct, 0, '_', "1777777777777777777777"},
-      {uint128(0, -1), std::ios::hex, 0, '_', "ffffffffffffffff"},
-      {uint128(1, 0), std::ios::dec, 0, '_', "18446744073709551616"},
-      {uint128(1, 0), std::ios::oct, 0, '_', "2000000000000000000000"},
-      {uint128(1, 0), std::ios::hex, 0, '_', "10000000000000000"},
-      // just the top bit
-      {uint128(uint64_t{0x8000000000000000u}, 0), std::ios::dec, 0, '_',
-       "170141183460469231731687303715884105728"},
-      {uint128(uint64_t{0x8000000000000000u}, 0), std::ios::oct, 0, '_',
-       "2000000000000000000000000000000000000000000"},
-      {uint128(uint64_t{0x8000000000000000u}, 0), std::ios::hex, 0, '_',
-       "80000000000000000000000000000000"},
-      // maximum uint128 value
-      {uint128(-1, -1), std::ios::dec, 0, '_',
-       "340282366920938463463374607431768211455"},
-      {uint128(-1, -1), std::ios::oct, 0, '_',
-       "3777777777777777777777777777777777777777777"},
-      {uint128(-1, -1), std::ios::hex, 0, '_',
-       "ffffffffffffffffffffffffffffffff"},
-      // uppercase
-      {uint128(-1, -1), std::ios::hex | std::ios::uppercase, 0, '_',
-       "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"},
-      // showbase
-      {uint128(1), std::ios::dec | std::ios::showbase, 0, '_', "1"},
-      {uint128(1), std::ios::oct | std::ios::showbase, 0, '_', "01"},
-      {uint128(1), std::ios::hex | std::ios::showbase, 0, '_', "0x1"},
-      // showbase does nothing on zero
-      {uint128(0), std::ios::dec | std::ios::showbase, 0, '_', "0"},
-      {uint128(0), std::ios::oct | std::ios::showbase, 0, '_', "0"},
-      {uint128(0), std::ios::hex | std::ios::showbase, 0, '_', "0"},
-      // showpos does nothing on unsigned types
-      {uint128(1), std::ios::dec | std::ios::showpos, 0, '_', "1"},
-      // padding
-      {uint128(9), std::ios::dec, 6, '_', "_____9"},
-      {uint128(12345), std::ios::dec, 6, '_', "_12345"},
-      // left adjustment
-      {uint128(9), std::ios::dec | std::ios::left, 6, '_', "9_____"},
-      {uint128(12345), std::ios::dec | std::ios::left, 6, '_', "12345_"},
-  };
-  for (size_t i = 0; i < GOOGLE_ARRAYSIZE(cases); ++i) {
-    std::ostringstream os;
-    os.flags(cases[i].flags);
-    os.width(cases[i].width);
-    os.fill(cases[i].fill);
-    os << cases[i].val;
-    EXPECT_EQ(cases[i].rep, os.str());
-  }
-}
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
diff --git a/libs/protobuf/src/google/protobuf/stubs/logging.h b/libs/protobuf/src/google/protobuf/stubs/logging.h
deleted file mode 100644
index 8ecc2fa..0000000
--- a/libs/protobuf/src/google/protobuf/stubs/logging.h
+++ /dev/null
@@ -1,239 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef GOOGLE_PROTOBUF_STUBS_LOGGING_H_
-#define GOOGLE_PROTOBUF_STUBS_LOGGING_H_
-
-#include <google/protobuf/stubs/macros.h>
-#include <google/protobuf/stubs/port.h>
-#include <google/protobuf/stubs/status.h>
-#include <google/protobuf/stubs/stringpiece.h>
-
-#include <google/protobuf/port_def.inc>
-
-// ===================================================================
-// emulates google3/base/logging.h
-
-namespace google {
-namespace protobuf {
-
-enum LogLevel {
-  LOGLEVEL_INFO,     // Informational.  This is never actually used by
-                     // libprotobuf.
-  LOGLEVEL_WARNING,  // Warns about issues that, although not technically a
-                     // problem now, could cause problems in the future.  For
-                     // example, a // warning will be printed when parsing a
-                     // message that is near the message size limit.
-  LOGLEVEL_ERROR,    // An error occurred which should never happen during
-                     // normal use.
-  LOGLEVEL_FATAL,    // An error occurred from which the library cannot
-                     // recover.  This usually indicates a programming error
-                     // in the code which calls the library, especially when
-                     // compiled in debug mode.
-
-#ifdef NDEBUG
-  LOGLEVEL_DFATAL = LOGLEVEL_ERROR
-#else
-  LOGLEVEL_DFATAL = LOGLEVEL_FATAL
-#endif
-};
-
-class uint128;
-namespace internal {
-
-class LogFinisher;
-
-class PROTOBUF_EXPORT LogMessage {
- public:
-  LogMessage(LogLevel level, const char* filename, int line);
-  ~LogMessage();
-
-  LogMessage& operator<<(const std::string& value);
-  LogMessage& operator<<(const char* value);
-  LogMessage& operator<<(char value);
-  LogMessage& operator<<(int value);
-  LogMessage& operator<<(uint value);
-  LogMessage& operator<<(long value);
-  LogMessage& operator<<(unsigned long value);
-  LogMessage& operator<<(long long value);
-  LogMessage& operator<<(unsigned long long value);
-  LogMessage& operator<<(double value);
-  LogMessage& operator<<(void* value);
-  LogMessage& operator<<(const StringPiece& value);
-  LogMessage& operator<<(const util::Status& status);
-  LogMessage& operator<<(const uint128& value);
-
- private:
-  friend class LogFinisher;
-  void Finish();
-
-  LogLevel level_;
-  const char* filename_;
-  int line_;
-  std::string message_;
-};
-
-// Used to make the entire "LOG(BLAH) << etc." expression have a void return
-// type and print a newline after each message.
-class PROTOBUF_EXPORT LogFinisher {
- public:
-  void operator=(LogMessage& other);
-};
-
-template<typename T>
-bool IsOk(T status) { return status.ok(); }
-template<>
-inline bool IsOk(bool status) { return status; }
-
-}  // namespace internal
-
-// Undef everything in case we're being mixed with some other Google library
-// which already defined them itself.  Presumably all Google libraries will
-// support the same syntax for these so it should not be a big deal if they
-// end up using our definitions instead.
-#undef GOOGLE_LOG
-#undef GOOGLE_LOG_IF
-
-#undef GOOGLE_CHECK
-#undef GOOGLE_CHECK_OK
-#undef GOOGLE_CHECK_EQ
-#undef GOOGLE_CHECK_NE
-#undef GOOGLE_CHECK_LT
-#undef GOOGLE_CHECK_LE
-#undef GOOGLE_CHECK_GT
-#undef GOOGLE_CHECK_GE
-#undef GOOGLE_CHECK_NOTNULL
-
-#undef GOOGLE_DLOG
-#undef GOOGLE_DCHECK
-#undef GOOGLE_DCHECK_OK
-#undef GOOGLE_DCHECK_EQ
-#undef GOOGLE_DCHECK_NE
-#undef GOOGLE_DCHECK_LT
-#undef GOOGLE_DCHECK_LE
-#undef GOOGLE_DCHECK_GT
-#undef GOOGLE_DCHECK_GE
-
-#define GOOGLE_LOG(LEVEL)                          \
-  ::google::protobuf::internal::LogFinisher() = \
-      ::google::protobuf::internal::LogMessage( \
-          ::google::protobuf::LOGLEVEL_##LEVEL, __FILE__, __LINE__)
-#define GOOGLE_LOG_IF(LEVEL, CONDITION) \
-  !(CONDITION) ? (void)0 : GOOGLE_LOG(LEVEL)
-
-#define GOOGLE_CHECK(EXPRESSION) \
-  GOOGLE_LOG_IF(FATAL, !(EXPRESSION)) << "CHECK failed: " #EXPRESSION ": "
-#define GOOGLE_CHECK_OK(A) GOOGLE_CHECK(::google::protobuf::internal::IsOk(A))
-#define GOOGLE_CHECK_EQ(A, B) GOOGLE_CHECK((A) == (B))
-#define GOOGLE_CHECK_NE(A, B) GOOGLE_CHECK((A) != (B))
-#define GOOGLE_CHECK_LT(A, B) GOOGLE_CHECK((A) <  (B))
-#define GOOGLE_CHECK_LE(A, B) GOOGLE_CHECK((A) <= (B))
-#define GOOGLE_CHECK_GT(A, B) GOOGLE_CHECK((A) >  (B))
-#define GOOGLE_CHECK_GE(A, B) GOOGLE_CHECK((A) >= (B))
-
-namespace internal {
-template<typename T>
-T* CheckNotNull(const char* /* file */, int /* line */,
-                const char* name, T* val) {
-  if (val == nullptr) {
-    GOOGLE_LOG(FATAL) << name;
-  }
-  return val;
-}
-}  // namespace internal
-#define GOOGLE_CHECK_NOTNULL(A)               \
-  ::google::protobuf::internal::CheckNotNull( \
-      __FILE__, __LINE__, "'" #A "' must not be nullptr", (A))
-
-#ifdef NDEBUG
-
-#define GOOGLE_DLOG(LEVEL) GOOGLE_LOG_IF(LEVEL, false)
-
-#define GOOGLE_DCHECK(EXPRESSION) while(false) GOOGLE_CHECK(EXPRESSION)
-#define GOOGLE_DCHECK_OK(E) GOOGLE_DCHECK(::google::protobuf::internal::IsOk(E))
-#define GOOGLE_DCHECK_EQ(A, B) GOOGLE_DCHECK((A) == (B))
-#define GOOGLE_DCHECK_NE(A, B) GOOGLE_DCHECK((A) != (B))
-#define GOOGLE_DCHECK_LT(A, B) GOOGLE_DCHECK((A) <  (B))
-#define GOOGLE_DCHECK_LE(A, B) GOOGLE_DCHECK((A) <= (B))
-#define GOOGLE_DCHECK_GT(A, B) GOOGLE_DCHECK((A) >  (B))
-#define GOOGLE_DCHECK_GE(A, B) GOOGLE_DCHECK((A) >= (B))
-
-#else  // NDEBUG
-
-#define GOOGLE_DLOG GOOGLE_LOG
-
-#define GOOGLE_DCHECK    GOOGLE_CHECK
-#define GOOGLE_DCHECK_OK GOOGLE_CHECK_OK
-#define GOOGLE_DCHECK_EQ GOOGLE_CHECK_EQ
-#define GOOGLE_DCHECK_NE GOOGLE_CHECK_NE
-#define GOOGLE_DCHECK_LT GOOGLE_CHECK_LT
-#define GOOGLE_DCHECK_LE GOOGLE_CHECK_LE
-#define GOOGLE_DCHECK_GT GOOGLE_CHECK_GT
-#define GOOGLE_DCHECK_GE GOOGLE_CHECK_GE
-
-#endif  // !NDEBUG
-
-typedef void LogHandler(LogLevel level, const char* filename, int line,
-                        const std::string& message);
-
-// The protobuf library sometimes writes warning and error messages to
-// stderr.  These messages are primarily useful for developers, but may
-// also help end users figure out a problem.  If you would prefer that
-// these messages be sent somewhere other than stderr, call SetLogHandler()
-// to set your own handler.  This returns the old handler.  Set the handler
-// to nullptr to ignore log messages (but see also LogSilencer, below).
-//
-// Obviously, SetLogHandler is not thread-safe.  You should only call it
-// at initialization time, and probably not from library code.  If you
-// simply want to suppress log messages temporarily (e.g. because you
-// have some code that tends to trigger them frequently and you know
-// the warnings are not important to you), use the LogSilencer class
-// below.
-PROTOBUF_EXPORT LogHandler* SetLogHandler(LogHandler* new_func);
-
-// Create a LogSilencer if you want to temporarily suppress all log
-// messages.  As long as any LogSilencer objects exist, non-fatal
-// log messages will be discarded (the current LogHandler will *not*
-// be called).  Constructing a LogSilencer is thread-safe.  You may
-// accidentally suppress log messages occurring in another thread, but
-// since messages are generally for debugging purposes only, this isn't
-// a big deal.  If you want to intercept log messages, use SetLogHandler().
-class PROTOBUF_EXPORT LogSilencer {
- public:
-  LogSilencer();
-  ~LogSilencer();
-};
-
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
-
-#endif  // GOOGLE_PROTOBUF_STUBS_LOGGING_H_
diff --git a/libs/protobuf/src/google/protobuf/stubs/macros.h b/libs/protobuf/src/google/protobuf/stubs/macros.h
deleted file mode 100644
index ae9a8b9..0000000
--- a/libs/protobuf/src/google/protobuf/stubs/macros.h
+++ /dev/null
@@ -1,93 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef GOOGLE_PROTOBUF_MACROS_H__
-#define GOOGLE_PROTOBUF_MACROS_H__
-
-namespace google {
-namespace protobuf {
-
-#undef GOOGLE_DISALLOW_EVIL_CONSTRUCTORS
-#define GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(TypeName) \
-  TypeName(const TypeName&) = delete;               \
-  void operator=(const TypeName&) = delete
-
-#undef GOOGLE_DISALLOW_IMPLICIT_CONSTRUCTORS
-#define GOOGLE_DISALLOW_IMPLICIT_CONSTRUCTORS(TypeName) \
-  TypeName() = delete;                                  \
-  TypeName(const TypeName&) = delete;                   \
-  void operator=(const TypeName&) = delete
-
-// ===================================================================
-// from google3/base/basictypes.h
-
-// The GOOGLE_ARRAYSIZE(arr) macro returns the # of elements in an array arr.
-// The expression is a compile-time constant, and therefore can be
-// used in defining new arrays, for example.
-//
-// GOOGLE_ARRAYSIZE catches a few type errors.  If you see a compiler error
-//
-//   "warning: division by zero in ..."
-//
-// when using GOOGLE_ARRAYSIZE, you are (wrongfully) giving it a pointer.
-// You should only use GOOGLE_ARRAYSIZE on statically allocated arrays.
-//
-// The following comments are on the implementation details, and can
-// be ignored by the users.
-//
-// ARRAYSIZE(arr) works by inspecting sizeof(arr) (the # of bytes in
-// the array) and sizeof(*(arr)) (the # of bytes in one array
-// element).  If the former is divisible by the latter, perhaps arr is
-// indeed an array, in which case the division result is the # of
-// elements in the array.  Otherwise, arr cannot possibly be an array,
-// and we generate a compiler error to prevent the code from
-// compiling.
-//
-// Since the size of bool is implementation-defined, we need to cast
-// !(sizeof(a) & sizeof(*(a))) to size_t in order to ensure the final
-// result has type size_t.
-//
-// This macro is not perfect as it wrongfully accepts certain
-// pointers, namely where the pointer size is divisible by the pointee
-// size.  Since all our code has to go through a 32-bit compiler,
-// where a pointer is 4 bytes, this means all pointers to a type whose
-// size is 3 or greater than 4 will be (righteously) rejected.
-//
-// Kudos to Jorg Brown for this simple and elegant implementation.
-
-#undef GOOGLE_ARRAYSIZE
-#define GOOGLE_ARRAYSIZE(a) \
-  ((sizeof(a) / sizeof(*(a))) / \
-   static_cast<size_t>(!(sizeof(a) % sizeof(*(a)))))
-
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // GOOGLE_PROTOBUF_MACROS_H__
diff --git a/libs/protobuf/src/google/protobuf/stubs/map_util.h b/libs/protobuf/src/google/protobuf/stubs/map_util.h
deleted file mode 100644
index 24e098a..0000000
--- a/libs/protobuf/src/google/protobuf/stubs/map_util.h
+++ /dev/null
@@ -1,769 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2014 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// from google3/util/gtl/map_util.h
-// Author: Anton Carver
-
-#ifndef GOOGLE_PROTOBUF_STUBS_MAP_UTIL_H__
-#define GOOGLE_PROTOBUF_STUBS_MAP_UTIL_H__
-
-#include <stddef.h>
-#include <iterator>
-#include <string>
-#include <utility>
-#include <vector>
-
-#include <google/protobuf/stubs/common.h>
-
-namespace google {
-namespace protobuf {
-namespace internal {
-// Local implementation of RemoveConst to avoid including base/type_traits.h.
-template <class T> struct RemoveConst { typedef T type; };
-template <class T> struct RemoveConst<const T> : RemoveConst<T> {};
-}  // namespace internal
-
-//
-// Find*()
-//
-
-// Returns a const reference to the value associated with the given key if it
-// exists. Crashes otherwise.
-//
-// This is intended as a replacement for operator[] as an rvalue (for reading)
-// when the key is guaranteed to exist.
-//
-// operator[] for lookup is discouraged for several reasons:
-//  * It has a side-effect of inserting missing keys
-//  * It is not thread-safe (even when it is not inserting, it can still
-//      choose to resize the underlying storage)
-//  * It invalidates iterators (when it chooses to resize)
-//  * It default constructs a value object even if it doesn't need to
-//
-// This version assumes the key is printable, and includes it in the fatal log
-// message.
-template <class Collection>
-const typename Collection::value_type::second_type&
-FindOrDie(const Collection& collection,
-          const typename Collection::value_type::first_type& key) {
-  typename Collection::const_iterator it = collection.find(key);
-  GOOGLE_CHECK(it != collection.end()) << "Map key not found: " << key;
-  return it->second;
-}
-
-// Same as above, but returns a non-const reference.
-template <class Collection>
-typename Collection::value_type::second_type&
-FindOrDie(Collection& collection,  // NOLINT
-          const typename Collection::value_type::first_type& key) {
-  typename Collection::iterator it = collection.find(key);
-  GOOGLE_CHECK(it != collection.end()) << "Map key not found: " << key;
-  return it->second;
-}
-
-// Same as FindOrDie above, but doesn't log the key on failure.
-template <class Collection>
-const typename Collection::value_type::second_type&
-FindOrDieNoPrint(const Collection& collection,
-                 const typename Collection::value_type::first_type& key) {
-  typename Collection::const_iterator it = collection.find(key);
-  GOOGLE_CHECK(it != collection.end()) << "Map key not found";
-  return it->second;
-}
-
-// Same as above, but returns a non-const reference.
-template <class Collection>
-typename Collection::value_type::second_type&
-FindOrDieNoPrint(Collection& collection,  // NOLINT
-                 const typename Collection::value_type::first_type& key) {
-  typename Collection::iterator it = collection.find(key);
-  GOOGLE_CHECK(it != collection.end()) << "Map key not found";
-  return it->second;
-}
-
-// Returns a const reference to the value associated with the given key if it
-// exists, otherwise returns a const reference to the provided default value.
-//
-// WARNING: If a temporary object is passed as the default "value,"
-// this function will return a reference to that temporary object,
-// which will be destroyed at the end of the statement. A common
-// example: if you have a map with string values, and you pass a char*
-// as the default "value," either use the returned value immediately
-// or store it in a string (not string&).
-// Details: http://go/findwithdefault
-template <class Collection>
-const typename Collection::value_type::second_type&
-FindWithDefault(const Collection& collection,
-                const typename Collection::value_type::first_type& key,
-                const typename Collection::value_type::second_type& value) {
-  typename Collection::const_iterator it = collection.find(key);
-  if (it == collection.end()) {
-    return value;
-  }
-  return it->second;
-}
-
-// Returns a pointer to the const value associated with the given key if it
-// exists, or nullptr otherwise.
-template <class Collection>
-const typename Collection::value_type::second_type*
-FindOrNull(const Collection& collection,
-           const typename Collection::value_type::first_type& key) {
-  typename Collection::const_iterator it = collection.find(key);
-  if (it == collection.end()) {
-    return 0;
-  }
-  return &it->second;
-}
-
-// Same as above but returns a pointer to the non-const value.
-template <class Collection>
-typename Collection::value_type::second_type*
-FindOrNull(Collection& collection,  // NOLINT
-           const typename Collection::value_type::first_type& key) {
-  typename Collection::iterator it = collection.find(key);
-  if (it == collection.end()) {
-    return 0;
-  }
-  return &it->second;
-}
-
-// Returns the pointer value associated with the given key. If none is found,
-// nullptr is returned. The function is designed to be used with a map of keys to
-// pointers.
-//
-// This function does not distinguish between a missing key and a key mapped
-// to nullptr.
-template <class Collection>
-typename Collection::value_type::second_type
-FindPtrOrNull(const Collection& collection,
-              const typename Collection::value_type::first_type& key) {
-  typename Collection::const_iterator it = collection.find(key);
-  if (it == collection.end()) {
-    return typename Collection::value_type::second_type();
-  }
-  return it->second;
-}
-
-// Same as above, except takes non-const reference to collection.
-//
-// This function is needed for containers that propagate constness to the
-// pointee, such as boost::ptr_map.
-template <class Collection>
-typename Collection::value_type::second_type
-FindPtrOrNull(Collection& collection,  // NOLINT
-              const typename Collection::value_type::first_type& key) {
-  typename Collection::iterator it = collection.find(key);
-  if (it == collection.end()) {
-    return typename Collection::value_type::second_type();
-  }
-  return it->second;
-}
-
-// Finds the pointer value associated with the given key in a map whose values
-// are linked_ptrs. Returns nullptr if key is not found.
-template <class Collection>
-typename Collection::value_type::second_type::element_type*
-FindLinkedPtrOrNull(const Collection& collection,
-                    const typename Collection::value_type::first_type& key) {
-  typename Collection::const_iterator it = collection.find(key);
-  if (it == collection.end()) {
-    return 0;
-  }
-  // Since linked_ptr::get() is a const member returning a non const,
-  // we do not need a version of this function taking a non const collection.
-  return it->second.get();
-}
-
-// Same as above, but dies if the key is not found.
-template <class Collection>
-typename Collection::value_type::second_type::element_type&
-FindLinkedPtrOrDie(const Collection& collection,
-                   const typename Collection::value_type::first_type& key) {
-  typename Collection::const_iterator it = collection.find(key);
-  GOOGLE_CHECK(it != collection.end()) <<  "key not found: " << key;
-  // Since linked_ptr::operator*() is a const member returning a non const,
-  // we do not need a version of this function taking a non const collection.
-  return *it->second;
-}
-
-// Finds the value associated with the given key and copies it to *value (if not
-// nullptr). Returns false if the key was not found, true otherwise.
-template <class Collection, class Key, class Value>
-bool FindCopy(const Collection& collection,
-              const Key& key,
-              Value* const value) {
-  typename Collection::const_iterator it = collection.find(key);
-  if (it == collection.end()) {
-    return false;
-  }
-  if (value) {
-    *value = it->second;
-  }
-  return true;
-}
-
-//
-// Contains*()
-//
-
-// Returns true if and only if the given collection contains the given key.
-template <class Collection, class Key>
-bool ContainsKey(const Collection& collection, const Key& key) {
-  return collection.find(key) != collection.end();
-}
-
-// Returns true if and only if the given collection contains the given key-value
-// pair.
-template <class Collection, class Key, class Value>
-bool ContainsKeyValuePair(const Collection& collection,
-                          const Key& key,
-                          const Value& value) {
-  typedef typename Collection::const_iterator const_iterator;
-  std::pair<const_iterator, const_iterator> range = collection.equal_range(key);
-  for (const_iterator it = range.first; it != range.second; ++it) {
-    if (it->second == value) {
-      return true;
-    }
-  }
-  return false;
-}
-
-//
-// Insert*()
-//
-
-// Inserts the given key-value pair into the collection. Returns true if and
-// only if the key from the given pair didn't previously exist. Otherwise, the
-// value in the map is replaced with the value from the given pair.
-template <class Collection>
-bool InsertOrUpdate(Collection* const collection,
-                    const typename Collection::value_type& vt) {
-  std::pair<typename Collection::iterator, bool> ret = collection->insert(vt);
-  if (!ret.second) {
-    // update
-    ret.first->second = vt.second;
-    return false;
-  }
-  return true;
-}
-
-// Same as above, except that the key and value are passed separately.
-template <class Collection>
-bool InsertOrUpdate(Collection* const collection,
-                    const typename Collection::value_type::first_type& key,
-                    const typename Collection::value_type::second_type& value) {
-  return InsertOrUpdate(
-      collection, typename Collection::value_type(key, value));
-}
-
-// Inserts/updates all the key-value pairs from the range defined by the
-// iterators "first" and "last" into the given collection.
-template <class Collection, class InputIterator>
-void InsertOrUpdateMany(Collection* const collection,
-                        InputIterator first, InputIterator last) {
-  for (; first != last; ++first) {
-    InsertOrUpdate(collection, *first);
-  }
-}
-
-// Change the value associated with a particular key in a map or hash_map
-// of the form map<Key, Value*> which owns the objects pointed to by the
-// value pointers.  If there was an existing value for the key, it is deleted.
-// True indicates an insert took place, false indicates an update + delete.
-template <class Collection>
-bool InsertAndDeleteExisting(
-    Collection* const collection,
-    const typename Collection::value_type::first_type& key,
-    const typename Collection::value_type::second_type& value) {
-  std::pair<typename Collection::iterator, bool> ret =
-      collection->insert(typename Collection::value_type(key, value));
-  if (!ret.second) {
-    delete ret.first->second;
-    ret.first->second = value;
-    return false;
-  }
-  return true;
-}
-
-// Inserts the given key and value into the given collection if and only if the
-// given key did NOT already exist in the collection. If the key previously
-// existed in the collection, the value is not changed. Returns true if the
-// key-value pair was inserted; returns false if the key was already present.
-template <class Collection>
-bool InsertIfNotPresent(Collection* const collection,
-                        const typename Collection::value_type& vt) {
-  return collection->insert(vt).second;
-}
-
-// Same as above except the key and value are passed separately.
-template <class Collection>
-bool InsertIfNotPresent(
-    Collection* const collection,
-    const typename Collection::value_type::first_type& key,
-    const typename Collection::value_type::second_type& value) {
-  return InsertIfNotPresent(
-      collection, typename Collection::value_type(key, value));
-}
-
-// Same as above except dies if the key already exists in the collection.
-template <class Collection>
-void InsertOrDie(Collection* const collection,
-                 const typename Collection::value_type& value) {
-  GOOGLE_CHECK(InsertIfNotPresent(collection, value))
-      << "duplicate value: " << value;
-}
-
-// Same as above except doesn't log the value on error.
-template <class Collection>
-void InsertOrDieNoPrint(Collection* const collection,
-                        const typename Collection::value_type& value) {
-  GOOGLE_CHECK(InsertIfNotPresent(collection, value)) << "duplicate value.";
-}
-
-// Inserts the key-value pair into the collection. Dies if key was already
-// present.
-template <class Collection>
-void InsertOrDie(Collection* const collection,
-                 const typename Collection::value_type::first_type& key,
-                 const typename Collection::value_type::second_type& data) {
-  GOOGLE_CHECK(InsertIfNotPresent(collection, key, data))
-      << "duplicate key: " << key;
-}
-
-// Same as above except doesn't log the key on error.
-template <class Collection>
-void InsertOrDieNoPrint(
-    Collection* const collection,
-    const typename Collection::value_type::first_type& key,
-    const typename Collection::value_type::second_type& data) {
-  GOOGLE_CHECK(InsertIfNotPresent(collection, key, data)) << "duplicate key.";
-}
-
-// Inserts a new key and default-initialized value. Dies if the key was already
-// present. Returns a reference to the value. Example usage:
-//
-// map<int, SomeProto> m;
-// SomeProto& proto = InsertKeyOrDie(&m, 3);
-// proto.set_field("foo");
-template <class Collection>
-typename Collection::value_type::second_type& InsertKeyOrDie(
-    Collection* const collection,
-    const typename Collection::value_type::first_type& key) {
-  typedef typename Collection::value_type value_type;
-  std::pair<typename Collection::iterator, bool> res =
-      collection->insert(value_type(key, typename value_type::second_type()));
-  GOOGLE_CHECK(res.second) << "duplicate key: " << key;
-  return res.first->second;
-}
-
-//
-// Lookup*()
-//
-
-// Looks up a given key and value pair in a collection and inserts the key-value
-// pair if it's not already present. Returns a reference to the value associated
-// with the key.
-template <class Collection>
-typename Collection::value_type::second_type&
-LookupOrInsert(Collection* const collection,
-               const typename Collection::value_type& vt) {
-  return collection->insert(vt).first->second;
-}
-
-// Same as above except the key-value are passed separately.
-template <class Collection>
-typename Collection::value_type::second_type&
-LookupOrInsert(Collection* const collection,
-               const typename Collection::value_type::first_type& key,
-               const typename Collection::value_type::second_type& value) {
-  return LookupOrInsert(
-      collection, typename Collection::value_type(key, value));
-}
-
-// Counts the number of equivalent elements in the given "sequence", and stores
-// the results in "count_map" with element as the key and count as the value.
-//
-// Example:
-//   vector<string> v = {"a", "b", "c", "a", "b"};
-//   map<string, int> m;
-//   AddTokenCounts(v, 1, &m);
-//   assert(m["a"] == 2);
-//   assert(m["b"] == 2);
-//   assert(m["c"] == 1);
-template <typename Sequence, typename Collection>
-void AddTokenCounts(
-    const Sequence& sequence,
-    const typename Collection::value_type::second_type& increment,
-    Collection* const count_map) {
-  for (typename Sequence::const_iterator it = sequence.begin();
-       it != sequence.end(); ++it) {
-    typename Collection::value_type::second_type& value =
-        LookupOrInsert(count_map, *it,
-                       typename Collection::value_type::second_type());
-    value += increment;
-  }
-}
-
-// Returns a reference to the value associated with key. If not found, a value
-// is default constructed on the heap and added to the map.
-//
-// This function is useful for containers of the form map<Key, Value*>, where
-// inserting a new key, value pair involves constructing a new heap-allocated
-// Value, and storing a pointer to that in the collection.
-template <class Collection>
-typename Collection::value_type::second_type&
-LookupOrInsertNew(Collection* const collection,
-                  const typename Collection::value_type::first_type& key) {
-  typedef typename std::iterator_traits<
-    typename Collection::value_type::second_type>::value_type Element;
-  std::pair<typename Collection::iterator, bool> ret =
-      collection->insert(typename Collection::value_type(
-          key,
-          static_cast<typename Collection::value_type::second_type>(nullptr)));
-  if (ret.second) {
-    ret.first->second = new Element();
-  }
-  return ret.first->second;
-}
-
-// Same as above but constructs the value using the single-argument constructor
-// and the given "arg".
-template <class Collection, class Arg>
-typename Collection::value_type::second_type&
-LookupOrInsertNew(Collection* const collection,
-                  const typename Collection::value_type::first_type& key,
-                  const Arg& arg) {
-  typedef typename std::iterator_traits<
-    typename Collection::value_type::second_type>::value_type Element;
-  std::pair<typename Collection::iterator, bool> ret =
-      collection->insert(typename Collection::value_type(
-          key,
-          static_cast<typename Collection::value_type::second_type>(nullptr)));
-  if (ret.second) {
-    ret.first->second = new Element(arg);
-  }
-  return ret.first->second;
-}
-
-// Lookup of linked/shared pointers is used in two scenarios:
-//
-// Use LookupOrInsertNewLinkedPtr if the container owns the elements.
-// In this case it is fine working with the raw pointer as long as it is
-// guaranteed that no other thread can delete/update an accessed element.
-// A mutex will need to lock the container operation as well as the use
-// of the returned elements. Finding an element may be performed using
-// FindLinkedPtr*().
-//
-// Use LookupOrInsertNewSharedPtr if the container does not own the elements
-// for their whole lifetime. This is typically the case when a reader allows
-// parallel updates to the container. In this case a Mutex only needs to lock
-// container operations, but all element operations must be performed on the
-// shared pointer. Finding an element must be performed using FindPtr*() and
-// cannot be done with FindLinkedPtr*() even though it compiles.
-
-// Lookup a key in a map or hash_map whose values are linked_ptrs.  If it is
-// missing, set collection[key].reset(new Value::element_type) and return that.
-// Value::element_type must be default constructable.
-template <class Collection>
-typename Collection::value_type::second_type::element_type*
-LookupOrInsertNewLinkedPtr(
-    Collection* const collection,
-    const typename Collection::value_type::first_type& key) {
-  typedef typename Collection::value_type::second_type Value;
-  std::pair<typename Collection::iterator, bool> ret =
-      collection->insert(typename Collection::value_type(key, Value()));
-  if (ret.second) {
-    ret.first->second.reset(new typename Value::element_type);
-  }
-  return ret.first->second.get();
-}
-
-// A variant of LookupOrInsertNewLinkedPtr where the value is constructed using
-// a single-parameter constructor.  Note: the constructor argument is computed
-// even if it will not be used, so only values cheap to compute should be passed
-// here.  On the other hand it does not matter how expensive the construction of
-// the actual stored value is, as that only occurs if necessary.
-template <class Collection, class Arg>
-typename Collection::value_type::second_type::element_type*
-LookupOrInsertNewLinkedPtr(
-    Collection* const collection,
-    const typename Collection::value_type::first_type& key,
-    const Arg& arg) {
-  typedef typename Collection::value_type::second_type Value;
-  std::pair<typename Collection::iterator, bool> ret =
-      collection->insert(typename Collection::value_type(key, Value()));
-  if (ret.second) {
-    ret.first->second.reset(new typename Value::element_type(arg));
-  }
-  return ret.first->second.get();
-}
-
-// Lookup a key in a map or hash_map whose values are shared_ptrs.  If it is
-// missing, set collection[key].reset(new Value::element_type). Unlike
-// LookupOrInsertNewLinkedPtr, this function returns the shared_ptr instead of
-// the raw pointer. Value::element_type must be default constructable.
-template <class Collection>
-typename Collection::value_type::second_type&
-LookupOrInsertNewSharedPtr(
-    Collection* const collection,
-    const typename Collection::value_type::first_type& key) {
-  typedef typename Collection::value_type::second_type SharedPtr;
-  typedef typename Collection::value_type::second_type::element_type Element;
-  std::pair<typename Collection::iterator, bool> ret =
-      collection->insert(typename Collection::value_type(key, SharedPtr()));
-  if (ret.second) {
-    ret.first->second.reset(new Element());
-  }
-  return ret.first->second;
-}
-
-// A variant of LookupOrInsertNewSharedPtr where the value is constructed using
-// a single-parameter constructor.  Note: the constructor argument is computed
-// even if it will not be used, so only values cheap to compute should be passed
-// here.  On the other hand it does not matter how expensive the construction of
-// the actual stored value is, as that only occurs if necessary.
-template <class Collection, class Arg>
-typename Collection::value_type::second_type&
-LookupOrInsertNewSharedPtr(
-    Collection* const collection,
-    const typename Collection::value_type::first_type& key,
-    const Arg& arg) {
-  typedef typename Collection::value_type::second_type SharedPtr;
-  typedef typename Collection::value_type::second_type::element_type Element;
-  std::pair<typename Collection::iterator, bool> ret =
-      collection->insert(typename Collection::value_type(key, SharedPtr()));
-  if (ret.second) {
-    ret.first->second.reset(new Element(arg));
-  }
-  return ret.first->second;
-}
-
-//
-// Misc Utility Functions
-//
-
-// Updates the value associated with the given key. If the key was not already
-// present, then the key-value pair are inserted and "previous" is unchanged. If
-// the key was already present, the value is updated and "*previous" will
-// contain a copy of the old value.
-//
-// InsertOrReturnExisting has complementary behavior that returns the
-// address of an already existing value, rather than updating it.
-template <class Collection>
-bool UpdateReturnCopy(Collection* const collection,
-                      const typename Collection::value_type::first_type& key,
-                      const typename Collection::value_type::second_type& value,
-                      typename Collection::value_type::second_type* previous) {
-  std::pair<typename Collection::iterator, bool> ret =
-      collection->insert(typename Collection::value_type(key, value));
-  if (!ret.second) {
-    // update
-    if (previous) {
-      *previous = ret.first->second;
-    }
-    ret.first->second = value;
-    return true;
-  }
-  return false;
-}
-
-// Same as above except that the key and value are passed as a pair.
-template <class Collection>
-bool UpdateReturnCopy(Collection* const collection,
-                      const typename Collection::value_type& vt,
-                      typename Collection::value_type::second_type* previous) {
-  std::pair<typename Collection::iterator, bool> ret = collection->insert(vt);
-  if (!ret.second) {
-    // update
-    if (previous) {
-      *previous = ret.first->second;
-    }
-    ret.first->second = vt.second;
-    return true;
-  }
-  return false;
-}
-
-// Tries to insert the given key-value pair into the collection. Returns nullptr if
-// the insert succeeds. Otherwise, returns a pointer to the existing value.
-//
-// This complements UpdateReturnCopy in that it allows to update only after
-// verifying the old value and still insert quickly without having to look up
-// twice. Unlike UpdateReturnCopy this also does not come with the issue of an
-// undefined previous* in case new data was inserted.
-template <class Collection>
-typename Collection::value_type::second_type* InsertOrReturnExisting(
-    Collection* const collection, const typename Collection::value_type& vt) {
-  std::pair<typename Collection::iterator, bool> ret = collection->insert(vt);
-  if (ret.second) {
-    return nullptr;  // Inserted, no existing previous value.
-  } else {
-    return &ret.first->second;  // Return address of already existing value.
-  }
-}
-
-// Same as above, except for explicit key and data.
-template <class Collection>
-typename Collection::value_type::second_type* InsertOrReturnExisting(
-    Collection* const collection,
-    const typename Collection::value_type::first_type& key,
-    const typename Collection::value_type::second_type& data) {
-  return InsertOrReturnExisting(collection,
-                                typename Collection::value_type(key, data));
-}
-
-// Erases the collection item identified by the given key, and returns the value
-// associated with that key. It is assumed that the value (i.e., the
-// mapped_type) is a pointer. Returns nullptr if the key was not found in the
-// collection.
-//
-// Examples:
-//   map<string, MyType*> my_map;
-//
-// One line cleanup:
-//     delete EraseKeyReturnValuePtr(&my_map, "abc");
-//
-// Use returned value:
-//     std::unique_ptr<MyType> value_ptr(
-//         EraseKeyReturnValuePtr(&my_map, "abc"));
-//     if (value_ptr.get())
-//       value_ptr->DoSomething();
-//
-template <class Collection>
-typename Collection::value_type::second_type EraseKeyReturnValuePtr(
-    Collection* const collection,
-    const typename Collection::value_type::first_type& key) {
-  typename Collection::iterator it = collection->find(key);
-  if (it == collection->end()) {
-    return nullptr;
-  }
-  typename Collection::value_type::second_type v = it->second;
-  collection->erase(it);
-  return v;
-}
-
-// Inserts all the keys from map_container into key_container, which must
-// support insert(MapContainer::key_type).
-//
-// Note: any initial contents of the key_container are not cleared.
-template <class MapContainer, class KeyContainer>
-void InsertKeysFromMap(const MapContainer& map_container,
-                       KeyContainer* key_container) {
-  GOOGLE_CHECK(key_container != nullptr);
-  for (typename MapContainer::const_iterator it = map_container.begin();
-       it != map_container.end(); ++it) {
-    key_container->insert(it->first);
-  }
-}
-
-// Appends all the keys from map_container into key_container, which must
-// support push_back(MapContainer::key_type).
-//
-// Note: any initial contents of the key_container are not cleared.
-template <class MapContainer, class KeyContainer>
-void AppendKeysFromMap(const MapContainer& map_container,
-                       KeyContainer* key_container) {
-  GOOGLE_CHECK(key_container != nullptr);
-  for (typename MapContainer::const_iterator it = map_container.begin();
-       it != map_container.end(); ++it) {
-    key_container->push_back(it->first);
-  }
-}
-
-// A more specialized overload of AppendKeysFromMap to optimize reallocations
-// for the common case in which we're appending keys to a vector and hence can
-// (and sometimes should) call reserve() first.
-//
-// (It would be possible to play SFINAE games to call reserve() for any
-// container that supports it, but this seems to get us 99% of what we need
-// without the complexity of a SFINAE-based solution.)
-template <class MapContainer, class KeyType>
-void AppendKeysFromMap(const MapContainer& map_container,
-                       std::vector<KeyType>* key_container) {
-  GOOGLE_CHECK(key_container != nullptr);
-  // We now have the opportunity to call reserve(). Calling reserve() every
-  // time is a bad idea for some use cases: libstdc++'s implementation of
-  // vector<>::reserve() resizes the vector's backing store to exactly the
-  // given size (unless it's already at least that big). Because of this,
-  // the use case that involves appending a lot of small maps (total size
-  // N) one by one to a vector would be O(N^2). But never calling reserve()
-  // loses the opportunity to improve the use case of adding from a large
-  // map to an empty vector (this improves performance by up to 33%). A
-  // number of heuristics are possible; see the discussion in
-  // cl/34081696. Here we use the simplest one.
-  if (key_container->empty()) {
-    key_container->reserve(map_container.size());
-  }
-  for (typename MapContainer::const_iterator it = map_container.begin();
-       it != map_container.end(); ++it) {
-    key_container->push_back(it->first);
-  }
-}
-
-// Inserts all the values from map_container into value_container, which must
-// support push_back(MapContainer::mapped_type).
-//
-// Note: any initial contents of the value_container are not cleared.
-template <class MapContainer, class ValueContainer>
-void AppendValuesFromMap(const MapContainer& map_container,
-                         ValueContainer* value_container) {
-  GOOGLE_CHECK(value_container != nullptr);
-  for (typename MapContainer::const_iterator it = map_container.begin();
-       it != map_container.end(); ++it) {
-    value_container->push_back(it->second);
-  }
-}
-
-// A more specialized overload of AppendValuesFromMap to optimize reallocations
-// for the common case in which we're appending values to a vector and hence
-// can (and sometimes should) call reserve() first.
-//
-// (It would be possible to play SFINAE games to call reserve() for any
-// container that supports it, but this seems to get us 99% of what we need
-// without the complexity of a SFINAE-based solution.)
-template <class MapContainer, class ValueType>
-void AppendValuesFromMap(const MapContainer& map_container,
-                         std::vector<ValueType>* value_container) {
-  GOOGLE_CHECK(value_container != nullptr);
-  // See AppendKeysFromMap for why this is done.
-  if (value_container->empty()) {
-    value_container->reserve(map_container.size());
-  }
-  for (typename MapContainer::const_iterator it = map_container.begin();
-       it != map_container.end(); ++it) {
-    value_container->push_back(it->second);
-  }
-}
-
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // GOOGLE_PROTOBUF_STUBS_MAP_UTIL_H__
diff --git a/libs/protobuf/src/google/protobuf/stubs/mathutil.h b/libs/protobuf/src/google/protobuf/stubs/mathutil.h
deleted file mode 100644
index 1d16bce..0000000
--- a/libs/protobuf/src/google/protobuf/stubs/mathutil.h
+++ /dev/null
@@ -1,162 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#ifndef GOOGLE_PROTOBUF_STUBS_MATHUTIL_H_
-#define GOOGLE_PROTOBUF_STUBS_MATHUTIL_H_
-
-#include <cmath>
-#include <float.h>
-#include <limits>
-
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/stubs/logging.h>
-
-namespace google {
-namespace protobuf {
-namespace internal {
-
-// Like std::make_unsigned_t except floating point types map to themselves.
-template <typename T>
-using MakeUnsignedT =
-    typename std::conditional<std::is_integral<T>::value, std::make_unsigned<T>,
-                              std::common_type<T>>::type::type;
-
-// Like std::isnan() except a template function that is defined for all numeric
-// types.
-template <typename T,
-          typename std::enable_if<std::is_integral<T>::value, int>::type = 0>
-bool IsNan(T /*val*/) {
-  return false;
-}
-
-template <typename T, typename std::enable_if<std::is_floating_point<T>::value,
-                                              int>::type = 0>
-bool IsNan(T val) {
-  return std::isnan(val);
-}
-
-template<typename T>
-bool AlmostEquals(T a, T b) {
-  return a == b;
-}
-template<>
-inline bool AlmostEquals(float a, float b) {
-  return fabs(a - b) < 32 * FLT_EPSILON;
-}
-
-template<>
-inline bool AlmostEquals(double a, double b) {
-  return fabs(a - b) < 32 * DBL_EPSILON;
-}
-
-}  // namespace internal
-
-class MathUtil {
- public:
-  template <typename T>
-  static T Sign(T value) {
-    if (value == T(0) || internal::IsNan(value)) {
-      return value;
-    }
-    return value > T(0) ? 1 : -1;
-  }
-
-  template <typename T>
-  static bool AlmostEquals(T a, T b) {
-    return internal::AlmostEquals(a, b);
-  }
-
-  // Largest of two values.
-  // Works correctly for special floating point values.
-  // Note: 0.0 and -0.0 are not differentiated by Max (Max(0.0, -0.0) is -0.0),
-  // which should be OK because, although they (can) have different
-  // bit representation, they are observably the same when examined
-  // with arithmetic and (in)equality operators.
-  template <typename T>
-  static T Max(const T x, const T y) {
-    return internal::IsNan(x) || x > y ? x : y;
-  }
-
-  // Absolute value of x
-  // Works correctly for unsigned types and
-  // for special floating point values.
-  // Note: 0.0 and -0.0 are not differentiated by Abs (Abs(0.0) is -0.0),
-  // which should be OK: see the comment for Max above.
-  template<typename T>
-  static T Abs(const T x) {
-    return x > T(0) ? x : -x;
-  }
-
-  // Absolute value of the difference between two numbers.
-  // Works correctly for signed types and special floating point values.
-  template <typename T>
-  static typename internal::MakeUnsignedT<T> AbsDiff(const T x, const T y) {
-    // Carries out arithmetic as unsigned to avoid overflow.
-    typedef typename internal::MakeUnsignedT<T> R;
-    return x > y ? R(x) - R(y) : R(y) - R(x);
-  }
-
-  // If two (usually floating point) numbers are within a certain
-  // fraction of their magnitude or within a certain absolute margin of error.
-  // This is the same as the following but faster:
-  //   WithinFraction(x, y, fraction)  ||  WithinMargin(x, y, margin)
-  // E.g. WithinFraction(0.0, 1e-10, 1e-5) is false but
-  //      WithinFractionOrMargin(0.0, 1e-10, 1e-5, 1e-5) is true.
-  template<typename T>
-  static bool WithinFractionOrMargin(const T x, const T y,
-                                     const T fraction, const T margin);
-};
-
-template<typename T>
-bool MathUtil::WithinFractionOrMargin(const T x, const T y,
-                                      const T fraction, const T margin) {
-  // Not just "0 <= fraction" to fool the compiler for unsigned types.
-  GOOGLE_DCHECK((T(0) < fraction || T(0) == fraction) &&
-         fraction < T(1) &&
-         margin >= T(0));
-
-  // Template specialization will convert the if() condition to a constant,
-  // which will cause the compiler to generate code for either the "if" part
-  // or the "then" part.  In this way we avoid a compiler warning
-  // about a potential integer overflow in crosstool v12 (gcc 4.3.1).
-  if (std::numeric_limits<T>::is_integer) {
-    return x == y;
-  } else {
-    if (!std::isfinite(x) || !std::isfinite(y)) {
-      return false;
-    }
-    T relative_margin = static_cast<T>(fraction * Max(Abs(x), Abs(y)));
-    return AbsDiff(x, y) <= Max(margin, relative_margin);
-  }
-}
-
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // GOOGLE_PROTOBUF_STUBS_MATHUTIL_H_
diff --git a/libs/protobuf/src/google/protobuf/stubs/mutex.h b/libs/protobuf/src/google/protobuf/stubs/mutex.h
deleted file mode 100644
index c459991..0000000
--- a/libs/protobuf/src/google/protobuf/stubs/mutex.h
+++ /dev/null
@@ -1,218 +0,0 @@
-// Copyright (c) 2006, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef GOOGLE_PROTOBUF_STUBS_MUTEX_H_
-#define GOOGLE_PROTOBUF_STUBS_MUTEX_H_
-
-#include <mutex>
-
-#ifdef GOOGLE_PROTOBUF_SUPPORT_WINDOWS_XP
-
-#include <windows.h>
-
-// GetMessage conflicts with GeneratedMessageReflection::GetMessage().
-#ifdef GetMessage
-#undef GetMessage
-#endif
-
-#endif
-
-#include <google/protobuf/stubs/macros.h>
-
-// Define thread-safety annotations for use below, if we are building with
-// Clang.
-#if defined(__clang__) && !defined(SWIG)
-#define GOOGLE_PROTOBUF_ACQUIRE(...) \
-  __attribute__((acquire_capability(__VA_ARGS__)))
-#define GOOGLE_PROTOBUF_RELEASE(...) \
-  __attribute__((release_capability(__VA_ARGS__)))
-#define GOOGLE_PROTOBUF_SCOPED_CAPABILITY __attribute__((scoped_lockable))
-#define GOOGLE_PROTOBUF_CAPABILITY(x) __attribute__((capability(x)))
-#else
-#define GOOGLE_PROTOBUF_ACQUIRE(...)
-#define GOOGLE_PROTOBUF_RELEASE(...)
-#define GOOGLE_PROTOBUF_SCOPED_CAPABILITY
-#define GOOGLE_PROTOBUF_CAPABILITY(x)
-#endif
-
-#include <google/protobuf/port_def.inc>
-
-// ===================================================================
-// emulates google3/base/mutex.h
-namespace google {
-namespace protobuf {
-namespace internal {
-
-#define GOOGLE_PROTOBUF_LINKER_INITIALIZED
-
-#ifdef GOOGLE_PROTOBUF_SUPPORT_WINDOWS_XP
-
-// This class is a lightweight replacement for std::mutex on Windows platforms.
-// std::mutex does not work on Windows XP SP2 with the latest VC++ libraries,
-// because it utilizes the Concurrency Runtime that is only supported on Windows
-// XP SP3 and above.
-class PROTOBUF_EXPORT CriticalSectionLock {
- public:
-  CriticalSectionLock() { InitializeCriticalSection(&critical_section_); }
-  ~CriticalSectionLock() { DeleteCriticalSection(&critical_section_); }
-  void lock() { EnterCriticalSection(&critical_section_); }
-  void unlock() { LeaveCriticalSection(&critical_section_); }
-
- private:
-  CRITICAL_SECTION critical_section_;
-
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(CriticalSectionLock);
-};
-
-#endif
-
-// In MSVC std::mutex does not have a constexpr constructor.
-// This wrapper makes the constructor constexpr.
-template <typename T>
-class CallOnceInitializedMutex {
- public:
-  constexpr CallOnceInitializedMutex() : flag_{}, buf_{} {}
-  ~CallOnceInitializedMutex() { get().~T(); }
-
-  void lock() { get().lock(); }
-  void unlock() { get().unlock(); }
-
- private:
-  T& get() {
-    std::call_once(flag_, [&] { ::new (static_cast<void*>(&buf_)) T(); });
-    return reinterpret_cast<T&>(buf_);
-  }
-
-  std::once_flag flag_;
-  alignas(T) char buf_[sizeof(T)];
-};
-
-// Mutex is a natural type to wrap. As both google and other organization have
-// specialized mutexes. gRPC also provides an injection mechanism for custom
-// mutexes.
-class GOOGLE_PROTOBUF_CAPABILITY("mutex") PROTOBUF_EXPORT WrappedMutex {
- public:
-#if defined(__QNX__)
-  constexpr WrappedMutex() = default;
-#else
-  constexpr WrappedMutex() {}
-#endif
-  void Lock() GOOGLE_PROTOBUF_ACQUIRE() { mu_.lock(); }
-  void Unlock() GOOGLE_PROTOBUF_RELEASE() { mu_.unlock(); }
-  // Crash if this Mutex is not held exclusively by this thread.
-  // May fail to crash when it should; will never crash when it should not.
-  void AssertHeld() const {}
-
- private:
-#if defined(GOOGLE_PROTOBUF_SUPPORT_WINDOWS_XP)
-  CallOnceInitializedMutex<CriticalSectionLock> mu_{};
-#elif defined(_WIN32)
-  CallOnceInitializedMutex<std::mutex> mu_{};
-#else
-  std::mutex mu_{};
-#endif
-};
-
-using Mutex = WrappedMutex;
-
-// MutexLock(mu) acquires mu when constructed and releases it when destroyed.
-class GOOGLE_PROTOBUF_SCOPED_CAPABILITY PROTOBUF_EXPORT MutexLock {
- public:
-  explicit MutexLock(Mutex* mu) GOOGLE_PROTOBUF_ACQUIRE(mu) : mu_(mu) {
-    this->mu_->Lock();
-  }
-  ~MutexLock() GOOGLE_PROTOBUF_RELEASE() { this->mu_->Unlock(); }
-
- private:
-  Mutex *const mu_;
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(MutexLock);
-};
-
-// TODO(kenton):  Implement these?  Hard to implement portably.
-typedef MutexLock ReaderMutexLock;
-typedef MutexLock WriterMutexLock;
-
-// MutexLockMaybe is like MutexLock, but is a no-op when mu is nullptr.
-class PROTOBUF_EXPORT MutexLockMaybe {
- public:
-  explicit MutexLockMaybe(Mutex *mu) :
-    mu_(mu) { if (this->mu_ != nullptr) { this->mu_->Lock(); } }
-  ~MutexLockMaybe() { if (this->mu_ != nullptr) { this->mu_->Unlock(); } }
- private:
-  Mutex *const mu_;
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(MutexLockMaybe);
-};
-
-#if defined(GOOGLE_PROTOBUF_NO_THREADLOCAL)
-template<typename T>
-class ThreadLocalStorage {
- public:
-  ThreadLocalStorage() {
-    pthread_key_create(&key_, &ThreadLocalStorage::Delete);
-  }
-  ~ThreadLocalStorage() {
-    pthread_key_delete(key_);
-  }
-  T* Get() {
-    T* result = static_cast<T*>(pthread_getspecific(key_));
-    if (result == nullptr) {
-      result = new T();
-      pthread_setspecific(key_, result);
-    }
-    return result;
-  }
- private:
-  static void Delete(void* value) {
-    delete static_cast<T*>(value);
-  }
-  pthread_key_t key_;
-
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(ThreadLocalStorage);
-};
-#endif
-
-}  // namespace internal
-
-// We made these internal so that they would show up as such in the docs,
-// but we don't want to stick "internal::" in front of them everywhere.
-using internal::Mutex;
-using internal::MutexLock;
-using internal::ReaderMutexLock;
-using internal::WriterMutexLock;
-using internal::MutexLockMaybe;
-
-}  // namespace protobuf
-}  // namespace google
-
-#undef GOOGLE_PROTOBUF_ACQUIRE
-#undef GOOGLE_PROTOBUF_RELEASE
-
-#include <google/protobuf/port_undef.inc>
-
-#endif  // GOOGLE_PROTOBUF_STUBS_MUTEX_H_
diff --git a/libs/protobuf/src/google/protobuf/stubs/once.h b/libs/protobuf/src/google/protobuf/stubs/once.h
deleted file mode 100644
index 070d36d..0000000
--- a/libs/protobuf/src/google/protobuf/stubs/once.h
+++ /dev/null
@@ -1,55 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef GOOGLE_PROTOBUF_STUBS_ONCE_H__
-#define GOOGLE_PROTOBUF_STUBS_ONCE_H__
-
-#include <mutex>
-#include <utility>
-
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-namespace internal {
-
-using once_flag = std::once_flag;
-template <typename... Args>
-void call_once(Args&&... args ) {
-  std::call_once(std::forward<Args>(args)...);
-}
-
-}  // namespace internal
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
-
-#endif  // GOOGLE_PROTOBUF_STUBS_ONCE_H__
diff --git a/libs/protobuf/src/google/protobuf/stubs/platform_macros.h b/libs/protobuf/src/google/protobuf/stubs/platform_macros.h
deleted file mode 100644
index d10faf9..0000000
--- a/libs/protobuf/src/google/protobuf/stubs/platform_macros.h
+++ /dev/null
@@ -1,138 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2012 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef GOOGLE_PROTOBUF_PLATFORM_MACROS_H_
-#define GOOGLE_PROTOBUF_PLATFORM_MACROS_H_
-
-#define GOOGLE_PROTOBUF_PLATFORM_ERROR \
-#error "Host platform was not detected as supported by protobuf"
-
-// Processor architecture detection.  For more info on what's defined, see:
-//   http://msdn.microsoft.com/en-us/library/b0084kay.aspx
-//   http://www.agner.org/optimize/calling_conventions.pdf
-//   or with gcc, run: "echo | gcc -E -dM -"
-#if defined(_M_X64) || defined(__x86_64__)
-#define GOOGLE_PROTOBUF_ARCH_X64 1
-#define GOOGLE_PROTOBUF_ARCH_64_BIT 1
-#elif defined(_M_IX86) || defined(__i386__)
-#define GOOGLE_PROTOBUF_ARCH_IA32 1
-#define GOOGLE_PROTOBUF_ARCH_32_BIT 1
-#elif defined(__QNX__)
-#define GOOGLE_PROTOBUF_ARCH_ARM_QNX 1
-#if defined(__aarch64__)
-#define GOOGLE_PROTOBUF_ARCH_64_BIT 1
-#else
-#define GOOGLE_PROTOBUF_ARCH_32_BIT 1
-#endif
-#elif defined(_M_ARM) || defined(__ARMEL__)
-#define GOOGLE_PROTOBUF_ARCH_ARM 1
-#define GOOGLE_PROTOBUF_ARCH_32_BIT 1
-#elif defined(_M_ARM64)
-#define GOOGLE_PROTOBUF_ARCH_ARM 1
-#define GOOGLE_PROTOBUF_ARCH_64_BIT 1
-#elif defined(__aarch64__)
-#define GOOGLE_PROTOBUF_ARCH_AARCH64 1
-#define GOOGLE_PROTOBUF_ARCH_64_BIT 1
-#elif defined(__mips__)
-#if defined(__LP64__)
-#define GOOGLE_PROTOBUF_ARCH_MIPS64 1
-#define GOOGLE_PROTOBUF_ARCH_64_BIT 1
-#else
-#define GOOGLE_PROTOBUF_ARCH_MIPS 1
-#define GOOGLE_PROTOBUF_ARCH_32_BIT 1
-#endif
-#elif defined(__pnacl__)
-#define GOOGLE_PROTOBUF_ARCH_32_BIT 1
-#elif defined(sparc)
-#define GOOGLE_PROTOBUF_ARCH_SPARC 1
-#if defined(__sparc_v9__) || defined(__sparcv9) || defined(__arch64__)
-#define GOOGLE_PROTOBUF_ARCH_64_BIT 1
-#else
-#define GOOGLE_PROTOBUF_ARCH_32_BIT 1
-#endif
-#elif defined(_POWER) || defined(__powerpc64__) || defined(__PPC64__)
-#define GOOGLE_PROTOBUF_ARCH_POWER 1
-#define GOOGLE_PROTOBUF_ARCH_64_BIT 1
-#elif defined(__PPC__)
-#define GOOGLE_PROTOBUF_ARCH_PPC 1
-#define GOOGLE_PROTOBUF_ARCH_32_BIT 1
-#elif defined(__GNUC__)
-# if (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 7)) || (__GNUC__ > 4))
-// We fallback to the generic Clang/GCC >= 4.7 implementation in atomicops.h
-# elif defined(__clang__)
-#  if !__has_extension(c_atomic)
-GOOGLE_PROTOBUF_PLATFORM_ERROR
-#  endif
-// We fallback to the generic Clang/GCC >= 4.7 implementation in atomicops.h
-# endif
-# if __LP64__
-#  define GOOGLE_PROTOBUF_ARCH_64_BIT 1
-# else
-#  define GOOGLE_PROTOBUF_ARCH_32_BIT 1
-# endif
-#else
-GOOGLE_PROTOBUF_PLATFORM_ERROR
-#endif
-
-#if defined(__APPLE__)
-#define GOOGLE_PROTOBUF_OS_APPLE
-#include <Availability.h>
-#include <TargetConditionals.h>
-#if TARGET_OS_IPHONE
-#define GOOGLE_PROTOBUF_OS_IPHONE
-#endif
-#elif defined(__EMSCRIPTEN__)
-#define GOOGLE_PROTOBUF_OS_EMSCRIPTEN
-#elif defined(__native_client__)
-#define GOOGLE_PROTOBUF_OS_NACL
-#elif defined(sun)
-#define GOOGLE_PROTOBUF_OS_SOLARIS
-#elif defined(_AIX)
-#define GOOGLE_PROTOBUF_OS_AIX
-#elif defined(__ANDROID__)
-#define GOOGLE_PROTOBUF_OS_ANDROID
-#endif
-
-#undef GOOGLE_PROTOBUF_PLATFORM_ERROR
-
-#if defined(GOOGLE_PROTOBUF_OS_ANDROID) || defined(GOOGLE_PROTOBUF_OS_IPHONE)
-// Android ndk does not support the __thread keyword very well yet. Here
-// we use pthread_key_create()/pthread_getspecific()/... methods for
-// TLS support on android.
-// iOS also does not support the __thread keyword.
-#define GOOGLE_PROTOBUF_NO_THREADLOCAL
-#endif
-
-#if defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED < 1070
-// __thread keyword requires at least 10.7
-#define GOOGLE_PROTOBUF_NO_THREADLOCAL
-#endif
-
-#endif  // GOOGLE_PROTOBUF_PLATFORM_MACROS_H_
diff --git a/libs/protobuf/src/google/protobuf/stubs/port.h b/libs/protobuf/src/google/protobuf/stubs/port.h
deleted file mode 100644
index b074cb1..0000000
--- a/libs/protobuf/src/google/protobuf/stubs/port.h
+++ /dev/null
@@ -1,413 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef GOOGLE_PROTOBUF_STUBS_PORT_H_
-#define GOOGLE_PROTOBUF_STUBS_PORT_H_
-
-#include <assert.h>
-#include <cstdint>
-#include <stdlib.h>
-#include <cstddef>
-#include <string>
-#include <string.h>
-
-#include <google/protobuf/stubs/platform_macros.h>
-
-#include <google/protobuf/port_def.inc>
-
-#undef PROTOBUF_LITTLE_ENDIAN
-#ifdef _WIN32
-  // Assuming windows is always little-endian.
-  // TODO(xiaofeng): The PROTOBUF_LITTLE_ENDIAN is not only used for
-  // optimization but also for correctness. We should define an
-  // different macro to test the big-endian code path in coded_stream.
-  #if !defined(PROTOBUF_DISABLE_LITTLE_ENDIAN_OPT_FOR_TEST)
-    #define PROTOBUF_LITTLE_ENDIAN 1
-  #endif
-#if defined(_MSC_VER) && _MSC_VER >= 1300 && !defined(__INTEL_COMPILER)
-// If MSVC has "/RTCc" set, it will complain about truncating casts at
-// runtime.  This file contains some intentional truncating casts.
-#pragma runtime_checks("c", off)
-#endif
-#else
-#ifdef __APPLE__
-#include <machine/endian.h>  // __BYTE_ORDER
-#elif defined(__FreeBSD__)
-#include <sys/endian.h>  // __BYTE_ORDER
-#elif (defined(sun) || defined(__sun)) && (defined(__SVR4) || defined(__svr4__))
-#include <sys/isa_defs.h>  // __BYTE_ORDER
-#elif defined(_AIX) || defined(__TOS_AIX__)
-#include <sys/machine.h>  // BYTE_ORDER
-#else
-#if !defined(__QNX__)
-#include <endian.h>  // __BYTE_ORDER
-#endif
-#endif
-#if ((defined(__LITTLE_ENDIAN__) && !defined(__BIG_ENDIAN__)) ||   \
-     (defined(__BYTE_ORDER) && __BYTE_ORDER == __LITTLE_ENDIAN) || \
-     (defined(BYTE_ORDER) && BYTE_ORDER == LITTLE_ENDIAN)) &&      \
-    !defined(PROTOBUF_DISABLE_LITTLE_ENDIAN_OPT_FOR_TEST)
-#define PROTOBUF_LITTLE_ENDIAN 1
-#endif
-#endif
-
-// These #includes are for the byte swap functions declared later on.
-#ifdef _MSC_VER
-#include <stdlib.h>  // NOLINT(build/include)
-#include <intrin.h>
-#elif defined(__APPLE__)
-#include <libkern/OSByteOrder.h>
-#elif defined(__linux__) || defined(__ANDROID__) || defined(__CYGWIN__)
-#include <byteswap.h>  // IWYU pragma: export
-#endif
-
-// Legacy: some users reference these (internal-only) macros even though we
-// don't need them any more.
-#if defined(_MSC_VER) && defined(PROTOBUF_USE_DLLS)
-  #ifdef LIBPROTOBUF_EXPORTS
-    #define LIBPROTOBUF_EXPORT __declspec(dllexport)
-  #else
-    #define LIBPROTOBUF_EXPORT __declspec(dllimport)
-  #endif
-  #ifdef LIBPROTOC_EXPORTS
-    #define LIBPROTOC_EXPORT   __declspec(dllexport)
-  #else
-    #define LIBPROTOC_EXPORT   __declspec(dllimport)
-  #endif
-#else
-  #define LIBPROTOBUF_EXPORT
-  #define LIBPROTOC_EXPORT
-#endif
-
-#define PROTOBUF_RUNTIME_DEPRECATED(message) PROTOBUF_DEPRECATED_MSG(message)
-#define GOOGLE_PROTOBUF_RUNTIME_DEPRECATED(message) \
-  PROTOBUF_DEPRECATED_MSG(message)
-
-// ===================================================================
-// from google3/base/port.h
-
-#if (defined(__GXX_EXPERIMENTAL_CXX0X__) || __cplusplus >= 201103L || \
-     (defined(_MSC_VER) && _MSC_VER >= 1900))
-// Define this to 1 if the code is compiled in C++11 mode; leave it
-// undefined otherwise.  Do NOT define it to 0 -- that causes
-// '#ifdef LANG_CXX11' to behave differently from '#if LANG_CXX11'.
-#define LANG_CXX11 1
-#else
-#error "Protobuf requires at least C++11."
-#endif
-
-namespace google {
-namespace protobuf {
-
-using ConstStringParam = const std::string &;
-
-typedef unsigned int uint;
-
-typedef int8_t int8;
-typedef int16_t int16;
-typedef int32_t int32;
-typedef int64_t int64;
-
-typedef uint8_t uint8;
-typedef uint16_t uint16;
-typedef uint32_t uint32;
-typedef uint64_t uint64;
-
-static const int32 kint32max = 0x7FFFFFFF;
-static const int32 kint32min = -kint32max - 1;
-static const int64 kint64max = int64_t{0x7FFFFFFFFFFFFFFF};
-static const int64 kint64min = -kint64max - 1;
-static const uint32 kuint32max = 0xFFFFFFFFu;
-static const uint64 kuint64max = uint64_t{0xFFFFFFFFFFFFFFFFu};
-
-#if defined(ADDRESS_SANITIZER) || defined(THREAD_SANITIZER) ||\
-    defined(MEMORY_SANITIZER)
-
-#ifdef __cplusplus
-extern "C" {
-#endif  // __cplusplus
-uint16_t __sanitizer_unaligned_load16(const void *p);
-uint32_t __sanitizer_unaligned_load32(const void *p);
-uint64_t __sanitizer_unaligned_load64(const void *p);
-void __sanitizer_unaligned_store16(void *p, uint16_t v);
-void __sanitizer_unaligned_store32(void *p, uint32_t v);
-void __sanitizer_unaligned_store64(void *p, uint64_t v);
-#ifdef __cplusplus
-}  // extern "C"
-#endif  // __cplusplus
-
-inline uint16_t GOOGLE_UNALIGNED_LOAD16(const void *p) {
-  return __sanitizer_unaligned_load16(p);
-}
-
-inline uint32_t GOOGLE_UNALIGNED_LOAD32(const void *p) {
-  return __sanitizer_unaligned_load32(p);
-}
-
-inline uint64_t GOOGLE_UNALIGNED_LOAD64(const void *p) {
-  return __sanitizer_unaligned_load64(p);
-}
-
-inline void GOOGLE_UNALIGNED_STORE16(void *p, uint16_t v) {
-  __sanitizer_unaligned_store16(p, v);
-}
-
-inline void GOOGLE_UNALIGNED_STORE32(void *p, uint32_t v) {
-  __sanitizer_unaligned_store32(p, v);
-}
-
-inline void GOOGLE_UNALIGNED_STORE64(void *p, uint64_t v) {
-  __sanitizer_unaligned_store64(p, v);
-}
-
-#elif defined(GOOGLE_PROTOBUF_USE_UNALIGNED) && GOOGLE_PROTOBUF_USE_UNALIGNED
-
-#define GOOGLE_UNALIGNED_LOAD16(_p) (*reinterpret_cast<const uint16_t *>(_p))
-#define GOOGLE_UNALIGNED_LOAD32(_p) (*reinterpret_cast<const uint32_t *>(_p))
-#define GOOGLE_UNALIGNED_LOAD64(_p) (*reinterpret_cast<const uint64_t *>(_p))
-
-#define GOOGLE_UNALIGNED_STORE16(_p, _val) (*reinterpret_cast<uint16_t *>(_p) = (_val))
-#define GOOGLE_UNALIGNED_STORE32(_p, _val) (*reinterpret_cast<uint32_t *>(_p) = (_val))
-#define GOOGLE_UNALIGNED_STORE64(_p, _val) (*reinterpret_cast<uint64_t *>(_p) = (_val))
-
-#else
-inline uint16_t GOOGLE_UNALIGNED_LOAD16(const void *p) {
-  uint16_t t;
-  memcpy(&t, p, sizeof t);
-  return t;
-}
-
-inline uint32_t GOOGLE_UNALIGNED_LOAD32(const void *p) {
-  uint32_t t;
-  memcpy(&t, p, sizeof t);
-  return t;
-}
-
-inline uint64_t GOOGLE_UNALIGNED_LOAD64(const void *p) {
-  uint64_t t;
-  memcpy(&t, p, sizeof t);
-  return t;
-}
-
-inline void GOOGLE_UNALIGNED_STORE16(void *p, uint16_t v) {
-  memcpy(p, &v, sizeof v);
-}
-
-inline void GOOGLE_UNALIGNED_STORE32(void *p, uint32_t v) {
-  memcpy(p, &v, sizeof v);
-}
-
-inline void GOOGLE_UNALIGNED_STORE64(void *p, uint64_t v) {
-  memcpy(p, &v, sizeof v);
-}
-#endif
-
-#if defined(GOOGLE_PROTOBUF_OS_NACL) \
-    || (defined(__ANDROID__) && defined(__clang__) \
-        && (__clang_major__ == 3 && __clang_minor__ == 8) \
-        && (__clang_patchlevel__ < 275480))
-# define GOOGLE_PROTOBUF_USE_PORTABLE_LOG2
-#endif
-
-// The following guarantees declaration of the byte swap functions.
-#ifdef _MSC_VER
-#define bswap_16(x) _byteswap_ushort(x)
-#define bswap_32(x) _byteswap_ulong(x)
-#define bswap_64(x) _byteswap_uint64(x)
-
-#elif defined(__APPLE__)
-// Mac OS X / Darwin features
-#define bswap_16(x) OSSwapInt16(x)
-#define bswap_32(x) OSSwapInt32(x)
-#define bswap_64(x) OSSwapInt64(x)
-
-#elif !defined(__linux__) && !defined(__ANDROID__) && !defined(__CYGWIN__)
-
-#ifndef bswap_16
-static inline uint16_t bswap_16(uint16_t x) {
-  return static_cast<uint16_t>(((x & 0xFF) << 8) | ((x & 0xFF00) >> 8));
-}
-#define bswap_16(x) bswap_16(x)
-#endif
-
-#ifndef bswap_32
-static inline uint32_t bswap_32(uint32_t x) {
-  return (((x & 0xFF) << 24) |
-          ((x & 0xFF00) << 8) |
-          ((x & 0xFF0000) >> 8) |
-          ((x & 0xFF000000) >> 24));
-}
-#define bswap_32(x) bswap_32(x)
-#endif
-
-#ifndef bswap_64
-static inline uint64_t bswap_64(uint64_t x) {
-  return (((x & uint64_t{0xFFu}) << 56) | ((x & uint64_t{0xFF00u}) << 40) |
-          ((x & uint64_t{0xFF0000u}) << 24) |
-          ((x & uint64_t{0xFF000000u}) << 8) |
-          ((x & uint64_t{0xFF00000000u}) >> 8) |
-          ((x & uint64_t{0xFF0000000000u}) >> 24) |
-          ((x & uint64_t{0xFF000000000000u}) >> 40) |
-          ((x & uint64_t{0xFF00000000000000u}) >> 56));
-}
-#define bswap_64(x) bswap_64(x)
-#endif
-
-#endif
-
-// ===================================================================
-// from google3/util/bits/bits.h
-
-class Bits {
- public:
-  static uint32_t Log2FloorNonZero(uint32_t n) {
-#if defined(__GNUC__)
-  return 31 ^ static_cast<uint32_t>(__builtin_clz(n));
-#elif defined(_MSC_VER)
-  unsigned long where;
-  _BitScanReverse(&where, n);
-  return where;
-#else
-  return Log2FloorNonZero_Portable(n);
-#endif
-  }
-
-  static uint32_t Log2FloorNonZero64(uint64_t n) {
-    // Older versions of clang run into an instruction-selection failure when
-    // it encounters __builtin_clzll:
-    // https://bugs.chromium.org/p/nativeclient/issues/detail?id=4395
-    // This includes arm-nacl-clang and clang in older Android NDK versions.
-    // To work around this, when we build with those we use the portable
-    // implementation instead.
-#if defined(__GNUC__) && !defined(GOOGLE_PROTOBUF_USE_PORTABLE_LOG2)
-  return 63 ^ static_cast<uint32_t>(__builtin_clzll(n));
-#elif defined(_MSC_VER) && defined(_M_X64)
-  unsigned long where;
-  _BitScanReverse64(&where, n);
-  return where;
-#else
-  return Log2FloorNonZero64_Portable(n);
-#endif
-  }
- private:
-  static int Log2FloorNonZero_Portable(uint32_t n) {
-    if (n == 0)
-      return -1;
-    int log = 0;
-    uint32_t value = n;
-    for (int i = 4; i >= 0; --i) {
-      int shift = (1 << i);
-      uint32_t x = value >> shift;
-      if (x != 0) {
-        value = x;
-        log += shift;
-      }
-    }
-    assert(value == 1);
-    return log;
-  }
-
-  static int Log2FloorNonZero64_Portable(uint64_t n) {
-    const uint32_t topbits = static_cast<uint32_t>(n >> 32);
-    if (topbits == 0) {
-      // Top bits are zero, so scan in bottom bits
-      return static_cast<int>(Log2FloorNonZero(static_cast<uint32_t>(n)));
-    } else {
-      return 32 + static_cast<int>(Log2FloorNonZero(topbits));
-    }
-  }
-};
-
-// ===================================================================
-// from google3/util/endian/endian.h
-PROTOBUF_EXPORT uint32_t ghtonl(uint32_t x);
-
-class BigEndian {
- public:
-#ifdef PROTOBUF_LITTLE_ENDIAN
-
-  static uint16_t FromHost16(uint16_t x) { return bswap_16(x); }
-  static uint16_t ToHost16(uint16_t x) { return bswap_16(x); }
-
-  static uint32_t FromHost32(uint32_t x) { return bswap_32(x); }
-  static uint32_t ToHost32(uint32_t x) { return bswap_32(x); }
-
-  static uint64_t FromHost64(uint64_t x) { return bswap_64(x); }
-  static uint64_t ToHost64(uint64_t x) { return bswap_64(x); }
-
-  static bool IsLittleEndian() { return true; }
-
-#else
-
-  static uint16_t FromHost16(uint16_t x) { return x; }
-  static uint16_t ToHost16(uint16_t x) { return x; }
-
-  static uint32_t FromHost32(uint32_t x) { return x; }
-  static uint32_t ToHost32(uint32_t x) { return x; }
-
-  static uint64_t FromHost64(uint64_t x) { return x; }
-  static uint64_t ToHost64(uint64_t x) { return x; }
-
-  static bool IsLittleEndian() { return false; }
-
-#endif /* ENDIAN */
-
-  // Functions to do unaligned loads and stores in big-endian order.
-  static uint16_t Load16(const void *p) {
-    return ToHost16(GOOGLE_UNALIGNED_LOAD16(p));
-  }
-
-  static void Store16(void *p, uint16_t v) {
-    GOOGLE_UNALIGNED_STORE16(p, FromHost16(v));
-  }
-
-  static uint32_t Load32(const void *p) {
-    return ToHost32(GOOGLE_UNALIGNED_LOAD32(p));
-  }
-
-  static void Store32(void *p, uint32_t v) {
-    GOOGLE_UNALIGNED_STORE32(p, FromHost32(v));
-  }
-
-  static uint64_t Load64(const void *p) {
-    return ToHost64(GOOGLE_UNALIGNED_LOAD64(p));
-  }
-
-  static void Store64(void *p, uint64_t v) {
-    GOOGLE_UNALIGNED_STORE64(p, FromHost64(v));
-  }
-};
-
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
-
-#endif  // GOOGLE_PROTOBUF_STUBS_PORT_H_
diff --git a/libs/protobuf/src/google/protobuf/stubs/status.cc b/libs/protobuf/src/google/protobuf/stubs/status.cc
deleted file mode 100644
index f5c0fa4..0000000
--- a/libs/protobuf/src/google/protobuf/stubs/status.cc
+++ /dev/null
@@ -1,262 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#include <google/protobuf/stubs/status.h>
-
-#include <ostream>
-#include <stdio.h>
-#include <string>
-#include <utility>
-
-namespace google {
-namespace protobuf {
-namespace util {
-namespace status_internal {
-namespace {
-
-inline std::string StatusCodeToString(StatusCode code) {
-  switch (code) {
-    case StatusCode::kOk:
-      return "OK";
-    case StatusCode::kCancelled:
-      return "CANCELLED";
-    case StatusCode::kUnknown:
-      return "UNKNOWN";
-    case StatusCode::kInvalidArgument:
-      return "INVALID_ARGUMENT";
-    case StatusCode::kDeadlineExceeded:
-      return "DEADLINE_EXCEEDED";
-    case StatusCode::kNotFound:
-      return "NOT_FOUND";
-    case StatusCode::kAlreadyExists:
-      return "ALREADY_EXISTS";
-    case StatusCode::kPermissionDenied:
-      return "PERMISSION_DENIED";
-    case StatusCode::kUnauthenticated:
-      return "UNAUTHENTICATED";
-    case StatusCode::kResourceExhausted:
-      return "RESOURCE_EXHAUSTED";
-    case StatusCode::kFailedPrecondition:
-      return "FAILED_PRECONDITION";
-    case StatusCode::kAborted:
-      return "ABORTED";
-    case StatusCode::kOutOfRange:
-      return "OUT_OF_RANGE";
-    case StatusCode::kUnimplemented:
-      return "UNIMPLEMENTED";
-    case StatusCode::kInternal:
-      return "INTERNAL";
-    case StatusCode::kUnavailable:
-      return "UNAVAILABLE";
-    case StatusCode::kDataLoss:
-      return "DATA_LOSS";
-  }
-
-  // No default clause, clang will abort if a code is missing from
-  // above switch.
-  return "UNKNOWN";
-}
-
-}  // namespace
-
-Status::Status() : error_code_(StatusCode::kOk) {}
-
-Status::Status(StatusCode error_code, StringPiece error_message)
-    : error_code_(error_code) {
-  if (error_code != StatusCode::kOk) {
-    error_message_ = error_message.ToString();
-  }
-}
-
-Status::Status(const Status& other)
-    : error_code_(other.error_code_), error_message_(other.error_message_) {
-}
-
-Status& Status::operator=(const Status& other) {
-  error_code_ = other.error_code_;
-  error_message_ = other.error_message_;
-  return *this;
-}
-
-bool Status::operator==(const Status& x) const {
-  return error_code_ == x.error_code_ &&
-      error_message_ == x.error_message_;
-}
-
-std::string Status::ToString() const {
-  if (error_code_ == StatusCode::kOk) {
-    return "OK";
-  } else {
-    if (error_message_.empty()) {
-      return StatusCodeToString(error_code_);
-    } else {
-      return StatusCodeToString(error_code_) + ":" + error_message_;
-    }
-  }
-}
-
-Status OkStatus() { return Status(); }
-
-std::ostream& operator<<(std::ostream& os, const Status& x) {
-  os << x.ToString();
-  return os;
-}
-
-bool IsAborted(const Status& status) {
-  return status.code() == StatusCode::kAborted;
-}
-
-bool IsAlreadyExists(const Status& status) {
-  return status.code() == StatusCode::kAlreadyExists;
-}
-
-bool IsCancelled(const Status& status) {
-  return status.code() == StatusCode::kCancelled;
-}
-
-bool IsDataLoss(const Status& status) {
-  return status.code() == StatusCode::kDataLoss;
-}
-
-bool IsDeadlineExceeded(const Status& status) {
-  return status.code() == StatusCode::kDeadlineExceeded;
-}
-
-bool IsFailedPrecondition(const Status& status) {
-  return status.code() == StatusCode::kFailedPrecondition;
-}
-
-bool IsInternal(const Status& status) {
-  return status.code() == StatusCode::kInternal;
-}
-
-bool IsInvalidArgument(const Status& status) {
-  return status.code() == StatusCode::kInvalidArgument;
-}
-
-bool IsNotFound(const Status& status) {
-  return status.code() == StatusCode::kNotFound;
-}
-
-bool IsOutOfRange(const Status& status) {
-  return status.code() == StatusCode::kOutOfRange;
-}
-
-bool IsPermissionDenied(const Status& status) {
-  return status.code() == StatusCode::kPermissionDenied;
-}
-
-bool IsResourceExhausted(const Status& status) {
-  return status.code() == StatusCode::kResourceExhausted;
-}
-
-bool IsUnauthenticated(const Status& status) {
-  return status.code() == StatusCode::kUnauthenticated;
-}
-
-bool IsUnavailable(const Status& status) {
-  return status.code() == StatusCode::kUnavailable;
-}
-
-bool IsUnimplemented(const Status& status) {
-  return status.code() == StatusCode::kUnimplemented;
-}
-
-bool IsUnknown(const Status& status) {
-  return status.code() == StatusCode::kUnknown;
-}
-
-Status AbortedError(StringPiece message) {
-  return Status(StatusCode::kAborted, message);
-}
-
-Status AlreadyExistsError(StringPiece message) {
-  return Status(StatusCode::kAlreadyExists, message);
-}
-
-Status CancelledError(StringPiece message) {
-  return Status(StatusCode::kCancelled, message);
-}
-
-Status DataLossError(StringPiece message) {
-  return Status(StatusCode::kDataLoss, message);
-}
-
-Status DeadlineExceededError(StringPiece message) {
-  return Status(StatusCode::kDeadlineExceeded, message);
-}
-
-Status FailedPreconditionError(StringPiece message) {
-  return Status(StatusCode::kFailedPrecondition, message);
-}
-
-Status InternalError(StringPiece message) {
-  return Status(StatusCode::kInternal, message);
-}
-
-Status InvalidArgumentError(StringPiece message) {
-  return Status(StatusCode::kInvalidArgument, message);
-}
-
-Status NotFoundError(StringPiece message) {
-  return Status(StatusCode::kNotFound, message);
-}
-
-Status OutOfRangeError(StringPiece message) {
-  return Status(StatusCode::kOutOfRange, message);
-}
-
-Status PermissionDeniedError(StringPiece message) {
-  return Status(StatusCode::kPermissionDenied, message);
-}
-
-Status ResourceExhaustedError(StringPiece message) {
-  return Status(StatusCode::kResourceExhausted, message);
-}
-
-Status UnauthenticatedError(StringPiece message) {
-  return Status(StatusCode::kUnauthenticated, message);
-}
-
-Status UnavailableError(StringPiece message) {
-  return Status(StatusCode::kUnavailable, message);
-}
-
-Status UnimplementedError(StringPiece message) {
-  return Status(StatusCode::kUnimplemented, message);
-}
-
-Status UnknownError(StringPiece message) {
-  return Status(StatusCode::kUnknown, message);
-}
-
-}  // namespace status_internal
-}  // namespace util
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/stubs/status.h b/libs/protobuf/src/google/protobuf/stubs/status.h
deleted file mode 100644
index c858cf6..0000000
--- a/libs/protobuf/src/google/protobuf/stubs/status.h
+++ /dev/null
@@ -1,196 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef GOOGLE_PROTOBUF_STUBS_STATUS_H_
-#define GOOGLE_PROTOBUF_STUBS_STATUS_H_
-
-#include <string>
-
-#include <google/protobuf/stubs/stringpiece.h>
-
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-namespace util {
-namespace status_internal {
-
-// These values must match error codes defined in google/rpc/code.proto.
-enum class StatusCode : int {
-  kOk = 0,
-  kCancelled = 1,
-  kUnknown = 2,
-  kInvalidArgument = 3,
-  kDeadlineExceeded = 4,
-  kNotFound = 5,
-  kAlreadyExists = 6,
-  kPermissionDenied = 7,
-  kUnauthenticated = 16,
-  kResourceExhausted = 8,
-  kFailedPrecondition = 9,
-  kAborted = 10,
-  kOutOfRange = 11,
-  kUnimplemented = 12,
-  kInternal = 13,
-  kUnavailable = 14,
-  kDataLoss = 15,
-};
-
-class PROTOBUF_EXPORT Status {
- public:
-  // Creates a "successful" status.
-  Status();
-
-  // Create a status in the canonical error space with the specified
-  // code, and error message.  If "code == 0", error_message is
-  // ignored and a Status object identical to Status::kOk is
-  // constructed.
-  Status(StatusCode error_code, StringPiece error_message);
-  Status(const Status&);
-  Status& operator=(const Status& x);
-  ~Status() {}
-
-  // Accessor
-  bool ok() const { return error_code_ == StatusCode::kOk; }
-  StatusCode code() const { return error_code_; }
-  StringPiece message() const {
-    return error_message_;
-  }
-
-  bool operator==(const Status& x) const;
-  bool operator!=(const Status& x) const {
-    return !operator==(x);
-  }
-
-  // Return a combination of the error code name and message.
-  std::string ToString() const;
-
- private:
-  StatusCode error_code_;
-  std::string error_message_;
-};
-
-// Returns an OK status, equivalent to a default constructed instance. Prefer
-// usage of `OkStatus()` when constructing such an OK status.
-PROTOBUF_EXPORT Status OkStatus();
-
-// Prints a human-readable representation of 'x' to 'os'.
-PROTOBUF_EXPORT std::ostream& operator<<(std::ostream& os, const Status& x);
-
-// These convenience functions return `true` if a given status matches the
-// `StatusCode` error code of its associated function.
-PROTOBUF_EXPORT bool IsAborted(const Status& status);
-PROTOBUF_EXPORT bool IsAlreadyExists(const Status& status);
-PROTOBUF_EXPORT bool IsCancelled(const Status& status);
-PROTOBUF_EXPORT bool IsDataLoss(const Status& status);
-PROTOBUF_EXPORT bool IsDeadlineExceeded(const Status& status);
-PROTOBUF_EXPORT bool IsFailedPrecondition(const Status& status);
-PROTOBUF_EXPORT bool IsInternal(const Status& status);
-PROTOBUF_EXPORT bool IsInvalidArgument(const Status& status);
-PROTOBUF_EXPORT bool IsNotFound(const Status& status);
-PROTOBUF_EXPORT bool IsOutOfRange(const Status& status);
-PROTOBUF_EXPORT bool IsPermissionDenied(const Status& status);
-PROTOBUF_EXPORT bool IsResourceExhausted(const Status& status);
-PROTOBUF_EXPORT bool IsUnauthenticated(const Status& status);
-PROTOBUF_EXPORT bool IsUnavailable(const Status& status);
-PROTOBUF_EXPORT bool IsUnimplemented(const Status& status);
-PROTOBUF_EXPORT bool IsUnknown(const Status& status);
-
-// These convenience functions create an `Status` object with an error code as
-// indicated by the associated function name, using the error message passed in
-// `message`.
-//
-// These functions are intentionally named `*Error` rather than `*Status` to
-// match the names from Abseil:
-// https://github.com/abseil/abseil-cpp/blob/2e9532cc6c701a8323d0cffb468999ab804095ab/absl/status/status.h#L716
-PROTOBUF_EXPORT Status AbortedError(StringPiece message);
-PROTOBUF_EXPORT Status AlreadyExistsError(StringPiece message);
-PROTOBUF_EXPORT Status CancelledError(StringPiece message);
-PROTOBUF_EXPORT Status DataLossError(StringPiece message);
-PROTOBUF_EXPORT Status DeadlineExceededError(StringPiece message);
-PROTOBUF_EXPORT Status FailedPreconditionError(StringPiece message);
-PROTOBUF_EXPORT Status InternalError(StringPiece message);
-PROTOBUF_EXPORT Status InvalidArgumentError(StringPiece message);
-PROTOBUF_EXPORT Status NotFoundError(StringPiece message);
-PROTOBUF_EXPORT Status OutOfRangeError(StringPiece message);
-PROTOBUF_EXPORT Status PermissionDeniedError(StringPiece message);
-PROTOBUF_EXPORT Status ResourceExhaustedError(StringPiece message);
-PROTOBUF_EXPORT Status UnauthenticatedError(StringPiece message);
-PROTOBUF_EXPORT Status UnavailableError(StringPiece message);
-PROTOBUF_EXPORT Status UnimplementedError(StringPiece message);
-PROTOBUF_EXPORT Status UnknownError(StringPiece message);
-
-}  // namespace status_internal
-
-using ::google::protobuf::util::status_internal::Status;
-using ::google::protobuf::util::status_internal::StatusCode;
-
-using ::google::protobuf::util::status_internal::IsAborted;
-using ::google::protobuf::util::status_internal::IsAlreadyExists;
-using ::google::protobuf::util::status_internal::IsCancelled;
-using ::google::protobuf::util::status_internal::IsDataLoss;
-using ::google::protobuf::util::status_internal::IsDeadlineExceeded;
-using ::google::protobuf::util::status_internal::IsFailedPrecondition;
-using ::google::protobuf::util::status_internal::IsInternal;
-using ::google::protobuf::util::status_internal::IsInvalidArgument;
-using ::google::protobuf::util::status_internal::IsNotFound;
-using ::google::protobuf::util::status_internal::IsOutOfRange;
-using ::google::protobuf::util::status_internal::IsPermissionDenied;
-using ::google::protobuf::util::status_internal::IsResourceExhausted;
-using ::google::protobuf::util::status_internal::IsUnauthenticated;
-using ::google::protobuf::util::status_internal::IsUnavailable;
-using ::google::protobuf::util::status_internal::IsUnimplemented;
-using ::google::protobuf::util::status_internal::IsUnknown;
-
-using ::google::protobuf::util::status_internal::AbortedError;
-using ::google::protobuf::util::status_internal::AlreadyExistsError;
-using ::google::protobuf::util::status_internal::CancelledError;
-using ::google::protobuf::util::status_internal::DataLossError;
-using ::google::protobuf::util::status_internal::DeadlineExceededError;
-using ::google::protobuf::util::status_internal::FailedPreconditionError;
-using ::google::protobuf::util::status_internal::InternalError;
-using ::google::protobuf::util::status_internal::InvalidArgumentError;
-using ::google::protobuf::util::status_internal::NotFoundError;
-using ::google::protobuf::util::status_internal::OkStatus;
-using ::google::protobuf::util::status_internal::OutOfRangeError;
-using ::google::protobuf::util::status_internal::PermissionDeniedError;
-using ::google::protobuf::util::status_internal::ResourceExhaustedError;
-using ::google::protobuf::util::status_internal::UnauthenticatedError;
-using ::google::protobuf::util::status_internal::UnavailableError;
-using ::google::protobuf::util::status_internal::UnimplementedError;
-using ::google::protobuf::util::status_internal::UnknownError;
-
-}  // namespace util
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
-
-#endif  // GOOGLE_PROTOBUF_STUBS_STATUS_H_
diff --git a/libs/protobuf/src/google/protobuf/stubs/status_macros.h b/libs/protobuf/src/google/protobuf/stubs/status_macros.h
deleted file mode 100644
index 407ff4c..0000000
--- a/libs/protobuf/src/google/protobuf/stubs/status_macros.h
+++ /dev/null
@@ -1,89 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// From: util/task/contrib/status_macros/status_macros.h
-
-#ifndef GOOGLE_PROTOBUF_STUBS_STATUS_MACROS_H_
-#define GOOGLE_PROTOBUF_STUBS_STATUS_MACROS_H_
-
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/stubs/status.h>
-#include <google/protobuf/stubs/statusor.h>
-
-namespace google {
-namespace protobuf {
-namespace util {
-
-// Run a command that returns a util::Status.  If the called code returns an
-// error status, return that status up out of this method too.
-//
-// Example:
-//   RETURN_IF_ERROR(DoThings(4));
-#define RETURN_IF_ERROR(expr)                                                \
-  do {                                                                       \
-    /* Using _status below to avoid capture problems if expr is "status". */ \
-    const PROTOBUF_NAMESPACE_ID::util::Status _status = (expr);              \
-    if (PROTOBUF_PREDICT_FALSE(!_status.ok())) return _status;               \
-  } while (0)
-
-// Internal helper for concatenating macro values.
-#define STATUS_MACROS_CONCAT_NAME_INNER(x, y) x##y
-#define STATUS_MACROS_CONCAT_NAME(x, y) STATUS_MACROS_CONCAT_NAME_INNER(x, y)
-
-template<typename T>
-Status DoAssignOrReturn(T& lhs, StatusOr<T> result) {
-  if (result.ok()) {
-    lhs = result.value();
-  }
-  return result.status();
-}
-
-#define ASSIGN_OR_RETURN_IMPL(status, lhs, rexpr) \
-  Status status = DoAssignOrReturn(lhs, (rexpr)); \
-  if (PROTOBUF_PREDICT_FALSE(!status.ok())) return status;
-
-// Executes an expression that returns a util::StatusOr, extracting its value
-// into the variable defined by lhs (or returning on error).
-//
-// Example: Assigning to an existing value
-//   ValueType value;
-//   ASSIGN_OR_RETURN(value, MaybeGetValue(arg));
-//
-// WARNING: ASSIGN_OR_RETURN expands into multiple statements; it cannot be used
-//  in a single statement (e.g. as the body of an if statement without {})!
-#define ASSIGN_OR_RETURN(lhs, rexpr) \
-  ASSIGN_OR_RETURN_IMPL( \
-      STATUS_MACROS_CONCAT_NAME(_status_or_value, __COUNTER__), lhs, rexpr);
-
-}  // namespace util
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // GOOGLE_PROTOBUF_STUBS_STATUS_H_
diff --git a/libs/protobuf/src/google/protobuf/stubs/status_test.cc b/libs/protobuf/src/google/protobuf/stubs/status_test.cc
deleted file mode 100644
index 9e9edf7..0000000
--- a/libs/protobuf/src/google/protobuf/stubs/status_test.cc
+++ /dev/null
@@ -1,278 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#include <google/protobuf/stubs/status.h>
-
-#include <stdio.h>
-
-#include <google/protobuf/testing/googletest.h>
-#include <gtest/gtest.h>
-
-namespace google {
-namespace protobuf {
-namespace {
-
-TEST(Status, Constructor) {
-  EXPECT_EQ(util::StatusCode::kOk,
-            util::Status(util::StatusCode::kOk, "").code());
-  EXPECT_EQ(util::StatusCode::kCancelled,
-            util::Status(util::StatusCode::kCancelled, "").code());
-  EXPECT_EQ(util::StatusCode::kUnknown,
-            util::Status(util::StatusCode::kUnknown, "").code());
-  EXPECT_EQ(util::StatusCode::kInvalidArgument,
-            util::Status(util::StatusCode::kInvalidArgument, "").code());
-  EXPECT_EQ(util::StatusCode::kDeadlineExceeded,
-            util::Status(util::StatusCode::kDeadlineExceeded, "").code());
-  EXPECT_EQ(util::StatusCode::kNotFound,
-            util::Status(util::StatusCode::kNotFound, "").code());
-  EXPECT_EQ(util::StatusCode::kAlreadyExists,
-            util::Status(util::StatusCode::kAlreadyExists, "").code());
-  EXPECT_EQ(util::StatusCode::kPermissionDenied,
-            util::Status(util::StatusCode::kPermissionDenied, "").code());
-  EXPECT_EQ(util::StatusCode::kUnauthenticated,
-            util::Status(util::StatusCode::kUnauthenticated, "").code());
-  EXPECT_EQ(util::StatusCode::kResourceExhausted,
-            util::Status(util::StatusCode::kResourceExhausted, "").code());
-  EXPECT_EQ(util::StatusCode::kFailedPrecondition,
-            util::Status(util::StatusCode::kFailedPrecondition, "").code());
-  EXPECT_EQ(util::StatusCode::kAborted,
-            util::Status(util::StatusCode::kAborted, "").code());
-  EXPECT_EQ(util::StatusCode::kOutOfRange,
-            util::Status(util::StatusCode::kOutOfRange, "").code());
-  EXPECT_EQ(util::StatusCode::kUnimplemented,
-            util::Status(util::StatusCode::kUnimplemented, "").code());
-  EXPECT_EQ(util::StatusCode::kInternal,
-            util::Status(util::StatusCode::kInternal, "").code());
-  EXPECT_EQ(util::StatusCode::kUnavailable,
-            util::Status(util::StatusCode::kUnavailable, "").code());
-  EXPECT_EQ(util::StatusCode::kDataLoss,
-            util::Status(util::StatusCode::kDataLoss, "").code());
-}
-
-TEST(Status, ConstructorZero) {
-  util::Status status(util::StatusCode::kOk, "msg");
-  EXPECT_TRUE(status.ok());
-  EXPECT_EQ("OK", status.ToString());
-  EXPECT_EQ(util::OkStatus(), status);
-}
-
-TEST(Status, ConvenienceConstructors) {
-  EXPECT_EQ(util::StatusCode::kOk, util::OkStatus().code());
-  EXPECT_EQ("", util::OkStatus().message());
-
-  EXPECT_EQ(util::StatusCode::kCancelled, util::CancelledError("").code());
-  EXPECT_EQ("", util::CancelledError("").message());
-  EXPECT_EQ("foo", util::CancelledError("foo").message());
-  EXPECT_EQ("bar", util::CancelledError("bar").message());
-
-  EXPECT_EQ(util::StatusCode::kUnknown, util::UnknownError("").code());
-  EXPECT_EQ("", util::UnknownError("").message());
-  EXPECT_EQ("foo", util::UnknownError("foo").message());
-  EXPECT_EQ("bar", util::UnknownError("bar").message());
-
-  EXPECT_EQ(util::StatusCode::kInvalidArgument,
-            util::InvalidArgumentError("").code());
-  EXPECT_EQ("", util::InvalidArgumentError("").message());
-  EXPECT_EQ("foo", util::InvalidArgumentError("foo").message());
-  EXPECT_EQ("bar", util::InvalidArgumentError("bar").message());
-
-  EXPECT_EQ(util::StatusCode::kDeadlineExceeded,
-            util::DeadlineExceededError("").code());
-  EXPECT_EQ("", util::DeadlineExceededError("").message());
-  EXPECT_EQ("foo", util::DeadlineExceededError("foo").message());
-  EXPECT_EQ("bar", util::DeadlineExceededError("bar").message());
-
-  EXPECT_EQ(util::StatusCode::kNotFound, util::NotFoundError("").code());
-  EXPECT_EQ("", util::NotFoundError("").message());
-  EXPECT_EQ("foo", util::NotFoundError("foo").message());
-  EXPECT_EQ("bar", util::NotFoundError("bar").message());
-
-  EXPECT_EQ(util::StatusCode::kAlreadyExists,
-            util::AlreadyExistsError("").code());
-  EXPECT_EQ("", util::AlreadyExistsError("").message());
-  EXPECT_EQ("foo", util::AlreadyExistsError("foo").message());
-  EXPECT_EQ("bar", util::AlreadyExistsError("bar").message());
-
-  EXPECT_EQ(util::StatusCode::kPermissionDenied,
-            util::PermissionDeniedError("").code());
-  EXPECT_EQ("", util::PermissionDeniedError("").message());
-  EXPECT_EQ("foo", util::PermissionDeniedError("foo").message());
-  EXPECT_EQ("bar", util::PermissionDeniedError("bar").message());
-
-  EXPECT_EQ(util::StatusCode::kUnauthenticated,
-            util::UnauthenticatedError("").code());
-  EXPECT_EQ("", util::UnauthenticatedError("").message());
-  EXPECT_EQ("foo", util::UnauthenticatedError("foo").message());
-  EXPECT_EQ("bar", util::UnauthenticatedError("bar").message());
-
-  EXPECT_EQ(util::StatusCode::kResourceExhausted,
-            util::ResourceExhaustedError("").code());
-  EXPECT_EQ("", util::ResourceExhaustedError("").message());
-  EXPECT_EQ("foo", util::ResourceExhaustedError("foo").message());
-  EXPECT_EQ("bar", util::ResourceExhaustedError("bar").message());
-
-  EXPECT_EQ(util::StatusCode::kFailedPrecondition,
-            util::FailedPreconditionError("").code());
-  EXPECT_EQ("", util::FailedPreconditionError("").message());
-  EXPECT_EQ("foo", util::FailedPreconditionError("foo").message());
-  EXPECT_EQ("bar", util::FailedPreconditionError("bar").message());
-
-  EXPECT_EQ(util::StatusCode::kAborted, util::AbortedError("").code());
-  EXPECT_EQ("", util::AbortedError("").message());
-  EXPECT_EQ("foo", util::AbortedError("foo").message());
-  EXPECT_EQ("bar", util::AbortedError("bar").message());
-
-  EXPECT_EQ(util::StatusCode::kOutOfRange, util::OutOfRangeError("").code());
-  EXPECT_EQ("", util::OutOfRangeError("").message());
-  EXPECT_EQ("foo", util::OutOfRangeError("foo").message());
-  EXPECT_EQ("bar", util::OutOfRangeError("bar").message());
-
-  EXPECT_EQ(util::StatusCode::kUnimplemented,
-            util::UnimplementedError("").code());
-  EXPECT_EQ("", util::UnimplementedError("").message());
-  EXPECT_EQ("foo", util::UnimplementedError("foo").message());
-  EXPECT_EQ("bar", util::UnimplementedError("bar").message());
-
-  EXPECT_EQ(util::StatusCode::kInternal, util::InternalError("").code());
-  EXPECT_EQ("", util::InternalError("").message());
-  EXPECT_EQ("foo", util::InternalError("foo").message());
-  EXPECT_EQ("bar", util::InternalError("bar").message());
-
-  EXPECT_EQ(util::StatusCode::kUnavailable, util::UnavailableError("").code());
-  EXPECT_EQ("", util::UnavailableError("").message());
-  EXPECT_EQ("foo", util::UnavailableError("foo").message());
-  EXPECT_EQ("bar", util::UnavailableError("bar").message());
-
-  EXPECT_EQ(util::StatusCode::kDataLoss, util::DataLossError("").code());
-  EXPECT_EQ("", util::DataLossError("").message());
-  EXPECT_EQ("foo", util::DataLossError("foo").message());
-  EXPECT_EQ("bar", util::DataLossError("bar").message());
-}
-
-TEST(Status, ConvenienceTests) {
-  EXPECT_TRUE(util::OkStatus().ok());
-  EXPECT_TRUE(util::IsCancelled(util::CancelledError("")));
-  EXPECT_TRUE(util::IsUnknown(util::UnknownError("")));
-  EXPECT_TRUE(util::IsInvalidArgument(util::InvalidArgumentError("")));
-  EXPECT_TRUE(util::IsDeadlineExceeded(util::DeadlineExceededError("")));
-  EXPECT_TRUE(util::IsNotFound(util::NotFoundError("")));
-  EXPECT_TRUE(util::IsAlreadyExists(util::AlreadyExistsError("")));
-  EXPECT_TRUE(util::IsPermissionDenied(util::PermissionDeniedError("")));
-  EXPECT_TRUE(util::IsUnauthenticated(util::UnauthenticatedError("")));
-  EXPECT_TRUE(util::IsResourceExhausted(util::ResourceExhaustedError("")));
-  EXPECT_TRUE(util::IsFailedPrecondition(util::FailedPreconditionError("")));
-  EXPECT_TRUE(util::IsAborted(util::AbortedError("")));
-  EXPECT_TRUE(util::IsOutOfRange(util::OutOfRangeError("")));
-  EXPECT_TRUE(util::IsUnimplemented(util::UnimplementedError("")));
-  EXPECT_TRUE(util::IsInternal(util::InternalError("")));
-  EXPECT_TRUE(util::IsUnavailable(util::UnavailableError("")));
-  EXPECT_TRUE(util::IsDataLoss(util::DataLossError("")));
-}
-
-TEST(Status, Empty) {
-  util::Status status;
-  EXPECT_TRUE(status.ok());
-  EXPECT_EQ(util::OkStatus(), status);
-  EXPECT_EQ(util::StatusCode::kOk, status.code());
-  EXPECT_EQ("OK", status.ToString());
-}
-
-TEST(Status, CheckOK) {
-  util::Status status;
-  GOOGLE_CHECK_OK(status);
-  GOOGLE_CHECK_OK(status) << "Failed";
-  GOOGLE_DCHECK_OK(status) << "Failed";
-}
-
-TEST(Status, ErrorMessage) {
-  util::Status status = util::InvalidArgumentError("");
-  EXPECT_FALSE(status.ok());
-  EXPECT_EQ("", status.message().ToString());
-  EXPECT_EQ("INVALID_ARGUMENT", status.ToString());
-  status = util::InvalidArgumentError("msg");
-  EXPECT_FALSE(status.ok());
-  EXPECT_EQ("msg", status.message().ToString());
-  EXPECT_EQ("INVALID_ARGUMENT:msg", status.ToString());
-  status = util::Status(util::StatusCode::kOk, "msg");
-  EXPECT_TRUE(status.ok());
-  EXPECT_EQ("", status.message().ToString());
-  EXPECT_EQ("OK", status.ToString());
-}
-
-TEST(Status, Copy) {
-  util::Status a = util::UnknownError("message");
-  util::Status b(a);
-  ASSERT_EQ(a.ToString(), b.ToString());
-}
-
-TEST(Status, Assign) {
-  util::Status a = util::UnknownError("message");
-  util::Status b;
-  b = a;
-  ASSERT_EQ(a.ToString(), b.ToString());
-}
-
-TEST(Status, AssignEmpty) {
-  util::Status a = util::UnknownError("message");
-  util::Status b;
-  a = b;
-  ASSERT_EQ(std::string("OK"), a.ToString());
-  ASSERT_TRUE(b.ok());
-  ASSERT_TRUE(a.ok());
-}
-
-TEST(Status, EqualsOK) { ASSERT_EQ(util::OkStatus(), util::Status()); }
-
-TEST(Status, EqualsSame) {
-  const util::Status a = util::CancelledError("message");
-  const util::Status b = util::CancelledError("message");
-  ASSERT_EQ(a, b);
-}
-
-TEST(Status, EqualsCopy) {
-  const util::Status a = util::CancelledError("message");
-  const util::Status b = a;
-  ASSERT_EQ(a, b);
-}
-
-TEST(Status, EqualsDifferentCode) {
-  const util::Status a = util::CancelledError("message");
-  const util::Status b = util::UnknownError("message");
-  ASSERT_NE(a, b);
-}
-
-TEST(Status, EqualsDifferentMessage) {
-  const util::Status a = util::CancelledError("message");
-  const util::Status b = util::CancelledError("another");
-  ASSERT_NE(a, b);
-}
-
-}  // namespace
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/stubs/statusor.cc b/libs/protobuf/src/google/protobuf/stubs/statusor.cc
deleted file mode 100644
index 9c0a178..0000000
--- a/libs/protobuf/src/google/protobuf/stubs/statusor.cc
+++ /dev/null
@@ -1,48 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <google/protobuf/stubs/statusor.h>
-
-#include <google/protobuf/stubs/logging.h>
-
-namespace google {
-namespace protobuf {
-namespace util {
-namespace statusor_internal {
-
-void StatusOrHelper::Crash(const Status& status) {
-  GOOGLE_LOG(FATAL) << "Attempting to fetch value instead of handling error "
-                    << status.ToString();
-}
-
-}  // namespace statusor_internal
-}  // namespace util
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/stubs/statusor.h b/libs/protobuf/src/google/protobuf/stubs/statusor.h
deleted file mode 100644
index 20e603e..0000000
--- a/libs/protobuf/src/google/protobuf/stubs/statusor.h
+++ /dev/null
@@ -1,253 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// StatusOr<T> is the union of a Status object and a T
-// object. StatusOr models the concept of an object that is either a
-// usable value, or an error Status explaining why such a value is
-// not present. To this end, StatusOr<T> does not allow its Status
-// value to be OkStatus(). Further, StatusOr<T*> does not allow the
-// contained pointer to be nullptr.
-//
-// The primary use-case for StatusOr<T> is as the return value of a
-// function which may fail.
-//
-// Example client usage for a StatusOr<T>, where T is not a pointer:
-//
-//  StatusOr<float> result = DoBigCalculationThatCouldFail();
-//  if (result.ok()) {
-//    float answer = result.value();
-//    printf("Big calculation yielded: %f", answer);
-//  } else {
-//    LOG(ERROR) << result.status();
-//  }
-//
-// Example client usage for a StatusOr<T*>:
-//
-//  StatusOr<Foo*> result = FooFactory::MakeNewFoo(arg);
-//  if (result.ok()) {
-//    std::unique_ptr<Foo> foo(result.value());
-//    foo->DoSomethingCool();
-//  } else {
-//    LOG(ERROR) << result.status();
-//  }
-//
-// Example factory implementation returning StatusOr<T*>:
-//
-//  StatusOr<Foo*> FooFactory::MakeNewFoo(int arg) {
-//    if (arg <= 0) {
-//      return InvalidArgumentError("Arg must be positive");
-//    } else {
-//      return new Foo(arg);
-//    }
-//  }
-//
-
-#ifndef GOOGLE_PROTOBUF_STUBS_STATUSOR_H_
-#define GOOGLE_PROTOBUF_STUBS_STATUSOR_H_
-
-#include <new>
-#include <string>
-#include <utility>
-
-#include <google/protobuf/stubs/status.h>
-
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-namespace util {
-namespace statusor_internal {
-
-template<typename T>
-class StatusOr {
-  template<typename U> friend class StatusOr;
-
- public:
-  using value_type = T;
-
-  // Construct a new StatusOr with Status::UNKNOWN status.
-  // Construct a new StatusOr with UnknownError() status.
-  explicit StatusOr();
-
-  // Construct a new StatusOr with the given non-ok status. After calling
-  // this constructor, calls to value() will CHECK-fail.
-  //
-  // NOTE: Not explicit - we want to use StatusOr<T> as a return
-  // value, so it is convenient and sensible to be able to do 'return
-  // Status()' when the return type is StatusOr<T>.
-  //
-  // REQUIRES: status != OkStatus(). This requirement is DCHECKed.
-  // In optimized builds, passing OkStatus() here will have the effect
-  // of passing PosixErrorSpace::EINVAL as a fallback.
-  StatusOr(const Status& status);  // NOLINT
-
-  // Construct a new StatusOr with the given value. If T is a plain pointer,
-  // value must not be nullptr. After calling this constructor, calls to
-  // value() will succeed, and calls to status() will return OK.
-  //
-  // NOTE: Not explicit - we want to use StatusOr<T> as a return type
-  // so it is convenient and sensible to be able to do 'return T()'
-  // when when the return type is StatusOr<T>.
-  //
-  // REQUIRES: if T is a plain pointer, value != nullptr. This requirement is
-  // DCHECKed. In optimized builds, passing a null pointer here will have
-  // the effect of passing PosixErrorSpace::EINVAL as a fallback.
-  StatusOr(const T& value);  // NOLINT
-
-  // Copy constructor.
-  StatusOr(const StatusOr& other);
-
-  // Conversion copy constructor, T must be copy constructible from U
-  template<typename U>
-  StatusOr(const StatusOr<U>& other);
-
-  // Assignment operator.
-  StatusOr& operator=(const StatusOr& other);
-
-  // Conversion assignment operator, T must be assignable from U
-  template<typename U>
-  StatusOr& operator=(const StatusOr<U>& other);
-
-  // Returns a reference to our status. If this contains a T, then
-  // returns OkStatus().
-  const Status& status() const;
-
-  // Returns this->status().ok()
-  bool ok() const;
-
-  // Returns a reference to our current value, or CHECK-fails if !this->ok().
-  const T& value () const;
-
- private:
-  Status status_;
-  T value_;
-};
-
-////////////////////////////////////////////////////////////////////////////////
-// Implementation details for StatusOr<T>
-
-class PROTOBUF_EXPORT StatusOrHelper {
- public:
-  // Move type-agnostic error handling to the .cc.
-  static void Crash(const util::Status& status);
-
-  // Customized behavior for StatusOr<T> vs. StatusOr<T*>
-  template<typename T>
-  struct Specialize;
-};
-
-template<typename T>
-struct StatusOrHelper::Specialize {
-  // For non-pointer T, a reference can never be nullptr.
-  static inline bool IsValueNull(const T& /*t*/) { return false; }
-};
-
-template<typename T>
-struct StatusOrHelper::Specialize<T*> {
-  static inline bool IsValueNull(const T* t) { return t == nullptr; }
-};
-
-template <typename T>
-inline StatusOr<T>::StatusOr() : status_(util::UnknownError("")) {}
-
-template<typename T>
-inline StatusOr<T>::StatusOr(const Status& status) {
-  if (status.ok()) {
-    status_ = util::InternalError("OkStatus() is not a valid argument.");
-  } else {
-    status_ = status;
-  }
-}
-
-template<typename T>
-inline StatusOr<T>::StatusOr(const T& value) {
-  if (StatusOrHelper::Specialize<T>::IsValueNull(value)) {
-    status_ = util::InternalError("nullptr is not a valid argument.");
-  } else {
-    status_ = util::OkStatus();
-    value_ = value;
-  }
-}
-
-template<typename T>
-inline StatusOr<T>::StatusOr(const StatusOr<T>& other)
-    : status_(other.status_), value_(other.value_) {
-}
-
-template<typename T>
-inline StatusOr<T>& StatusOr<T>::operator=(const StatusOr<T>& other) {
-  status_ = other.status_;
-  value_ = other.value_;
-  return *this;
-}
-
-template<typename T>
-template<typename U>
-inline StatusOr<T>::StatusOr(const StatusOr<U>& other)
-    : status_(other.status_), value_(other.status_.ok() ? other.value_ : T()) {
-}
-
-template<typename T>
-template<typename U>
-inline StatusOr<T>& StatusOr<T>::operator=(const StatusOr<U>& other) {
-  status_ = other.status_;
-  if (status_.ok()) value_ = other.value_;
-  return *this;
-}
-
-template<typename T>
-inline const Status& StatusOr<T>::status() const {
-  return status_;
-}
-
-template<typename T>
-inline bool StatusOr<T>::ok() const {
-  return status().ok();
-}
-
-template<typename T>
-inline const T& StatusOr<T>::value() const {
-  if (!status_.ok()) {
-    StatusOrHelper::Crash(status_);
-  }
-  return value_;
-}
-
-}  // namespace statusor_internal
-
-using ::google::protobuf::util::statusor_internal::StatusOr;
-
-}  // namespace util
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
-
-#endif  // GOOGLE_PROTOBUF_STUBS_STATUSOR_H_
diff --git a/libs/protobuf/src/google/protobuf/stubs/statusor_test.cc b/libs/protobuf/src/google/protobuf/stubs/statusor_test.cc
deleted file mode 100644
index 403adcc..0000000
--- a/libs/protobuf/src/google/protobuf/stubs/statusor_test.cc
+++ /dev/null
@@ -1,272 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <google/protobuf/stubs/statusor.h>
-
-#include <errno.h>
-#include <memory>
-
-#include <google/protobuf/testing/googletest.h>
-#include <gtest/gtest.h>
-
-namespace google {
-namespace protobuf {
-namespace util {
-namespace {
-
-class Base1 {
- public:
-  virtual ~Base1() {}
-  int pad;
-};
-
-class Base2 {
- public:
-  virtual ~Base2() {}
-  int yetotherpad;
-};
-
-class Derived : public Base1, public Base2 {
- public:
-  virtual ~Derived() {}
-  int evenmorepad;
-};
-
-class CopyNoAssign {
- public:
-  explicit CopyNoAssign(int value) : foo(value) {}
-  CopyNoAssign(const CopyNoAssign& other) : foo(other.foo) {}
-  int foo;
- private:
-  const CopyNoAssign& operator=(const CopyNoAssign&);
-};
-
-TEST(StatusOr, TestDefaultCtor) {
-  StatusOr<int> thing;
-  EXPECT_FALSE(thing.ok());
-  EXPECT_EQ(util::UnknownError(""), thing.status());
-}
-
-TEST(StatusOr, TestStatusCtor) {
-  StatusOr<int> thing(util::CancelledError(""));
-  EXPECT_FALSE(thing.ok());
-  EXPECT_EQ(util::CancelledError(""), thing.status());
-}
-
-TEST(StatusOr, TestValueCtor) {
-  const int kI = 4;
-  StatusOr<int> thing(kI);
-  EXPECT_TRUE(thing.ok());
-  EXPECT_EQ(kI, thing.value());
-}
-
-TEST(StatusOr, TestCopyCtorStatusOk) {
-  const int kI = 4;
-  StatusOr<int> original(kI);
-  StatusOr<int> copy(original);
-  EXPECT_EQ(original.status(), copy.status());
-  EXPECT_EQ(original.value(), copy.value());
-}
-
-TEST(StatusOr, TestCopyCtorStatusNotOk) {
-  StatusOr<int> original(util::CancelledError(""));
-  StatusOr<int> copy(original);
-  EXPECT_EQ(original.status(), copy.status());
-}
-
-TEST(StatusOr, TestCopyCtorStatusOKConverting) {
-  const int kI = 4;
-  StatusOr<int>    original(kI);
-  StatusOr<double> copy(original);
-  EXPECT_EQ(original.status(), copy.status());
-  EXPECT_EQ(original.value(), copy.value());
-}
-
-TEST(StatusOr, TestCopyCtorStatusNotOkConverting) {
-  StatusOr<int> original(util::CancelledError(""));
-  StatusOr<double> copy(original);
-  EXPECT_EQ(original.status(), copy.status());
-}
-
-TEST(StatusOr, TestAssignmentStatusOk) {
-  const int kI = 4;
-  StatusOr<int> source(kI);
-  StatusOr<int> target;
-  target = source;
-  EXPECT_EQ(source.status(), target.status());
-  EXPECT_EQ(source.value(), target.value());
-}
-
-TEST(StatusOr, TestAssignmentStatusNotOk) {
-  StatusOr<int> source(util::CancelledError(""));
-  StatusOr<int> target;
-  target = source;
-  EXPECT_EQ(source.status(), target.status());
-}
-
-TEST(StatusOr, TestAssignmentStatusOKConverting) {
-  const int kI = 4;
-  StatusOr<int>    source(kI);
-  StatusOr<double> target;
-  target = source;
-  EXPECT_EQ(source.status(), target.status());
-  EXPECT_DOUBLE_EQ(source.value(), target.value());
-}
-
-TEST(StatusOr, TestAssignmentStatusNotOkConverting) {
-  StatusOr<int> source(util::CancelledError(""));
-  StatusOr<double> target;
-  target = source;
-  EXPECT_EQ(source.status(), target.status());
-}
-
-TEST(StatusOr, TestStatus) {
-  StatusOr<int> good(4);
-  EXPECT_TRUE(good.ok());
-  StatusOr<int> bad(util::CancelledError(""));
-  EXPECT_FALSE(bad.ok());
-  EXPECT_EQ(util::CancelledError(""), bad.status());
-}
-
-TEST(StatusOr, TestValue) {
-  const int kI = 4;
-  StatusOr<int> thing(kI);
-  EXPECT_EQ(kI, thing.value());
-}
-
-TEST(StatusOr, TestValueConst) {
-  const int kI = 4;
-  const StatusOr<int> thing(kI);
-  EXPECT_EQ(kI, thing.value());
-}
-
-TEST(StatusOr, TestPointerDefaultCtor) {
-  StatusOr<int*> thing;
-  EXPECT_FALSE(thing.ok());
-  EXPECT_EQ(util::UnknownError(""), thing.status());
-}
-
-TEST(StatusOr, TestPointerStatusCtor) {
-  StatusOr<int*> thing(util::CancelledError(""));
-  EXPECT_FALSE(thing.ok());
-  EXPECT_EQ(util::CancelledError(""), thing.status());
-}
-
-TEST(StatusOr, TestPointerValueCtor) {
-  const int kI = 4;
-  StatusOr<const int*> thing(&kI);
-  EXPECT_TRUE(thing.ok());
-  EXPECT_EQ(&kI, thing.value());
-}
-
-TEST(StatusOr, TestPointerCopyCtorStatusOk) {
-  const int kI = 0;
-  StatusOr<const int*> original(&kI);
-  StatusOr<const int*> copy(original);
-  EXPECT_EQ(original.status(), copy.status());
-  EXPECT_EQ(original.value(), copy.value());
-}
-
-TEST(StatusOr, TestPointerCopyCtorStatusNotOk) {
-  StatusOr<int*> original(util::CancelledError(""));
-  StatusOr<int*> copy(original);
-  EXPECT_EQ(original.status(), copy.status());
-}
-
-TEST(StatusOr, TestPointerCopyCtorStatusOKConverting) {
-  Derived derived;
-  StatusOr<Derived*> original(&derived);
-  StatusOr<Base2*>   copy(original);
-  EXPECT_EQ(original.status(), copy.status());
-  EXPECT_EQ(static_cast<const Base2*>(original.value()), copy.value());
-}
-
-TEST(StatusOr, TestPointerCopyCtorStatusNotOkConverting) {
-  StatusOr<Derived*> original(util::CancelledError(""));
-  StatusOr<Base2*>   copy(original);
-  EXPECT_EQ(original.status(), copy.status());
-}
-
-TEST(StatusOr, TestPointerAssignmentStatusOk) {
-  const int kI = 0;
-  StatusOr<const int*> source(&kI);
-  StatusOr<const int*> target;
-  target = source;
-  EXPECT_EQ(source.status(), target.status());
-  EXPECT_EQ(source.value(), target.value());
-}
-
-TEST(StatusOr, TestPointerAssignmentStatusNotOk) {
-  StatusOr<int*> source(util::CancelledError(""));
-  StatusOr<int*> target;
-  target = source;
-  EXPECT_EQ(source.status(), target.status());
-}
-
-TEST(StatusOr, TestPointerAssignmentStatusOKConverting) {
-  Derived derived;
-  StatusOr<Derived*> source(&derived);
-  StatusOr<Base2*>   target;
-  target = source;
-  EXPECT_EQ(source.status(), target.status());
-  EXPECT_EQ(static_cast<const Base2*>(source.value()), target.value());
-}
-
-TEST(StatusOr, TestPointerAssignmentStatusNotOkConverting) {
-  StatusOr<Derived*> source(util::CancelledError(""));
-  StatusOr<Base2*>   target;
-  target = source;
-  EXPECT_EQ(source.status(), target.status());
-}
-
-TEST(StatusOr, TestPointerStatus) {
-  const int kI = 0;
-  StatusOr<const int*> good(&kI);
-  EXPECT_TRUE(good.ok());
-  StatusOr<const int*> bad(util::CancelledError(""));
-  EXPECT_EQ(util::CancelledError(""), bad.status());
-}
-
-TEST(StatusOr, TestPointerValue) {
-  const int kI = 0;
-  StatusOr<const int*> thing(&kI);
-  EXPECT_EQ(&kI, thing.value());
-}
-
-TEST(StatusOr, TestPointerValueConst) {
-  const int kI = 0;
-  const StatusOr<const int*> thing(&kI);
-  EXPECT_EQ(&kI, thing.value());
-}
-
-}  // namespace
-}  // namespace util
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/stubs/stl_util.h b/libs/protobuf/src/google/protobuf/stubs/stl_util.h
deleted file mode 100644
index e6260d0..0000000
--- a/libs/protobuf/src/google/protobuf/stubs/stl_util.h
+++ /dev/null
@@ -1,90 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// from google3/util/gtl/stl_util.h
-
-#ifndef GOOGLE_PROTOBUF_STUBS_STL_UTIL_H__
-#define GOOGLE_PROTOBUF_STUBS_STL_UTIL_H__
-
-#include <google/protobuf/stubs/common.h>
-
-#include <algorithm>
-
-// Must be last.
-#include <google/protobuf/port_def.inc>  // NOLINT
-
-namespace google {
-namespace protobuf {
-
-// Inside Google, this function implements a horrible, disgusting hack in which
-// we reach into the string's private implementation and resize it without
-// initializing the new bytes.  In some cases doing this can significantly
-// improve performance.  However, since it's totally non-portable it has no
-// place in open source code.  Feel free to fill this function in with your
-// own disgusting hack if you want the perf boost.
-inline void STLStringResizeUninitialized(std::string* s, size_t new_size) {
-  s->resize(new_size);
-}
-
-// As above, but we make sure to follow amortized growth in which we always
-// increase the capacity by at least a constant factor >1.
-inline void STLStringResizeUninitializedAmortized(std::string* s,
-                                                  size_t new_size) {
-  const size_t cap = s->capacity();
-  if (new_size > cap) {
-    // Make sure to always grow by at least a factor of 2x.
-    s->reserve(std::max<size_t>(new_size, 2 * cap));
-  }
-  STLStringResizeUninitialized(s, new_size);
-}
-
-// Return a mutable char* pointing to a string's internal buffer,
-// which may not be null-terminated. Writing through this pointer will
-// modify the string.
-//
-// string_as_array(&str)[i] is valid for 0 <= i < str.size() until the
-// next call to a string method that invalidates iterators.
-//
-// As of 2006-04, there is no standard-blessed way of getting a
-// mutable reference to a string's internal buffer. However, issue 530
-// (http://www.open-std.org/JTC1/SC22/WG21/docs/lwg-active.html#530)
-// proposes this as the method. According to Matt Austern, this should
-// already work on all current implementations.
-inline char* string_as_array(std::string* str) {
-  // DO NOT USE const_cast<char*>(str->data())! See the unittest for why.
-  return str->empty() ? nullptr : &*str->begin();
-}
-
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>  // NOLINT
-
-#endif  // GOOGLE_PROTOBUF_STUBS_STL_UTIL_H__
diff --git a/libs/protobuf/src/google/protobuf/stubs/stringpiece.cc b/libs/protobuf/src/google/protobuf/stubs/stringpiece.cc
deleted file mode 100644
index 7188046..0000000
--- a/libs/protobuf/src/google/protobuf/stubs/stringpiece.cc
+++ /dev/null
@@ -1,256 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#include <google/protobuf/stubs/stringpiece.h>
-
-#include <string.h>
-#include <algorithm>
-#include <climits>
-#include <string>
-#include <ostream>
-
-#include <google/protobuf/stubs/logging.h>
-
-namespace google {
-namespace protobuf {
-namespace stringpiece_internal {
-
-std::ostream& operator<<(std::ostream& o, StringPiece piece) {
-  o.write(piece.data(), piece.size());
-  return o;
-}
-
-void StringPiece::LogFatalSizeTooBig(size_t size, const char* details) {
-  GOOGLE_LOG(FATAL) << "size too big: " << size << " details: " << details;
-}
-
-void StringPiece::CopyToString(std::string* target) const {
-  target->assign(ptr_, length_);
-}
-
-void StringPiece::AppendToString(std::string* target) const {
-  target->append(ptr_, length_);
-}
-
-bool StringPiece::Consume(StringPiece x) {
-  if (starts_with(x)) {
-    ptr_ += x.length_;
-    length_ -= x.length_;
-    return true;
-  }
-  return false;
-}
-
-bool StringPiece::ConsumeFromEnd(StringPiece x) {
-  if (ends_with(x)) {
-    length_ -= x.length_;
-    return true;
-  }
-  return false;
-}
-
-StringPiece::size_type StringPiece::copy(char* buf, size_type n,
-                                         size_type pos) const {
-  size_type ret = std::min(length_ - pos, n);
-  memcpy(buf, ptr_ + pos, ret);
-  return ret;
-}
-
-bool StringPiece::contains(StringPiece s) const {
-  return find(s, 0) != npos;
-}
-
-StringPiece::size_type StringPiece::find(StringPiece s, size_type pos) const {
-  if (length_ <= 0 || pos > static_cast<size_type>(length_)) {
-    if (length_ == 0 && pos == 0 && s.length_ == 0) return 0;
-    return npos;
-  }
-  const char *result = std::search(ptr_ + pos, ptr_ + length_,
-                                   s.ptr_, s.ptr_ + s.length_);
-  return result == ptr_ + length_ ? npos : result - ptr_;
-}
-
-StringPiece::size_type StringPiece::find(char c, size_type pos) const {
-  if (length_ <= 0 || pos >= static_cast<size_type>(length_)) {
-    return npos;
-  }
-  const char* result = static_cast<const char*>(
-      memchr(ptr_ + pos, c, length_ - pos));
-  return result != nullptr ? result - ptr_ : npos;
-}
-
-StringPiece::size_type StringPiece::rfind(StringPiece s, size_type pos) const {
-  if (length_ < s.length_) return npos;
-  const size_t ulen = length_;
-  if (s.length_ == 0) return std::min(ulen, pos);
-
-  const char* last = ptr_ + std::min(ulen - s.length_, pos) + s.length_;
-  const char* result = std::find_end(ptr_, last, s.ptr_, s.ptr_ + s.length_);
-  return result != last ? result - ptr_ : npos;
-}
-
-// Search range is [0..pos] inclusive.  If pos == npos, search everything.
-StringPiece::size_type StringPiece::rfind(char c, size_type pos) const {
-  // Note: memrchr() is not available on Windows.
-  if (empty()) return npos;
-  for (size_type i = std::min(pos, length_ - 1);; --i) {
-    if (ptr_[i] == c) {
-      return i;
-    }
-    if (i == 0) break;
-  }
-  return npos;
-}
-
-// For each character in characters_wanted, sets the index corresponding
-// to the ASCII code of that character to 1 in table.  This is used by
-// the find_.*_of methods below to tell whether or not a character is in
-// the lookup table in constant time.
-// The argument `table' must be an array that is large enough to hold all
-// the possible values of an unsigned char.  Thus it should be be declared
-// as follows:
-//   bool table[UCHAR_MAX + 1]
-static inline void BuildLookupTable(StringPiece characters_wanted,
-                                    bool* table) {
-  const StringPiece::size_type length = characters_wanted.length();
-  const char* const data = characters_wanted.data();
-  for (StringPiece::size_type i = 0; i < length; ++i) {
-    table[static_cast<unsigned char>(data[i])] = true;
-  }
-}
-
-StringPiece::size_type StringPiece::find_first_of(StringPiece s,
-                                                  size_type pos) const {
-  if (empty() || s.empty()) {
-    return npos;
-  }
-  // Avoid the cost of BuildLookupTable() for a single-character search.
-  if (s.length_ == 1) return find_first_of(s.ptr_[0], pos);
-
-  bool lookup[UCHAR_MAX + 1] = { false };
-  BuildLookupTable(s, lookup);
-  for (size_type i = pos; i < length_; ++i) {
-    if (lookup[static_cast<unsigned char>(ptr_[i])]) {
-      return i;
-    }
-  }
-  return npos;
-}
-
-StringPiece::size_type StringPiece::find_first_not_of(StringPiece s,
-                                                      size_type pos) const {
-  if (empty()) return npos;
-  if (s.empty()) return 0;
-  // Avoid the cost of BuildLookupTable() for a single-character search.
-  if (s.length_ == 1) return find_first_not_of(s.ptr_[0], pos);
-
-  bool lookup[UCHAR_MAX + 1] = { false };
-  BuildLookupTable(s, lookup);
-  for (size_type i = pos; i < length_; ++i) {
-    if (!lookup[static_cast<unsigned char>(ptr_[i])]) {
-      return i;
-    }
-  }
-  return npos;
-}
-
-StringPiece::size_type StringPiece::find_first_not_of(char c,
-                                                      size_type pos) const {
-  if (empty()) return npos;
-
-  for (; pos < static_cast<size_type>(length_); ++pos) {
-    if (ptr_[pos] != c) {
-      return pos;
-    }
-  }
-  return npos;
-}
-
-StringPiece::size_type StringPiece::find_last_of(StringPiece s,
-                                                 size_type pos) const {
-  if (empty() || s.empty()) return npos;
-  // Avoid the cost of BuildLookupTable() for a single-character search.
-  if (s.length_ == 1) return find_last_of(s.ptr_[0], pos);
-
-  bool lookup[UCHAR_MAX + 1] = { false };
-  BuildLookupTable(s, lookup);
-  for (size_type i = std::min(pos, length_ - 1);; --i) {
-    if (lookup[static_cast<unsigned char>(ptr_[i])]) {
-      return i;
-    }
-    if (i == 0) break;
-  }
-  return npos;
-}
-
-StringPiece::size_type StringPiece::find_last_not_of(StringPiece s,
-                                                     size_type pos) const {
-  if (empty()) return npos;
-
-  size_type i = std::min(pos, length() - 1);
-  if (s.empty()) return i;
-
-  // Avoid the cost of BuildLookupTable() for a single-character search.
-  if (s.length_ == 1) return find_last_not_of(s.ptr_[0], pos);
-
-  bool lookup[UCHAR_MAX + 1] = { false };
-  BuildLookupTable(s, lookup);
-  for (;; --i) {
-    if (!lookup[static_cast<unsigned char>(ptr_[i])]) {
-      return i;
-    }
-    if (i == 0) break;
-  }
-  return npos;
-}
-
-StringPiece::size_type StringPiece::find_last_not_of(char c,
-                                                     size_type pos) const {
-  if (empty()) return npos;
-  size_type i = std::min(pos, length_ - 1);
-  for (;; --i) {
-    if (ptr_[i] != c) {
-      return i;
-    }
-    if (i == 0) break;
-  }
-  return npos;
-}
-
-StringPiece StringPiece::substr(size_type pos, size_type n) const {
-  if (pos > length()) pos = length();
-  if (n > length_ - pos) n = length() - pos;
-  return StringPiece(ptr_ + pos, n);
-}
-
-const StringPiece::size_type StringPiece::npos = size_type(-1);
-
-}  // namespace stringpiece_internal
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/stubs/stringpiece.h b/libs/protobuf/src/google/protobuf/stubs/stringpiece.h
deleted file mode 100644
index c63e25b..0000000
--- a/libs/protobuf/src/google/protobuf/stubs/stringpiece.h
+++ /dev/null
@@ -1,402 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// A StringPiece points to part or all of a string, Cord, double-quoted string
-// literal, or other string-like object.  A StringPiece does *not* own the
-// string to which it points.  A StringPiece is not null-terminated.
-//
-// You can use StringPiece as a function or method parameter.  A StringPiece
-// parameter can receive a double-quoted string literal argument, a "const
-// char*" argument, a string argument, or a StringPiece argument with no data
-// copying.  Systematic use of StringPiece for arguments reduces data
-// copies and strlen() calls.
-//
-// Prefer passing StringPieces by value:
-//   void MyFunction(StringPiece arg);
-// If circumstances require, you may also pass by const reference:
-//   void MyFunction(const StringPiece& arg);  // not preferred
-// Both of these have the same lifetime semantics.  Passing by value
-// generates slightly smaller code.  For more discussion, see the thread
-// go/stringpiecebyvalue on c-users.
-//
-// StringPiece is also suitable for local variables if you know that
-// the lifetime of the underlying object is longer than the lifetime
-// of your StringPiece variable.
-//
-// Beware of binding a StringPiece to a temporary:
-//   StringPiece sp = obj.MethodReturningString();  // BAD: lifetime problem
-//
-// This code is okay:
-//   string str = obj.MethodReturningString();  // str owns its contents
-//   StringPiece sp(str);  // GOOD, because str outlives sp
-//
-// StringPiece is sometimes a poor choice for a return value and usually a poor
-// choice for a data member.  If you do use a StringPiece this way, it is your
-// responsibility to ensure that the object pointed to by the StringPiece
-// outlives the StringPiece.
-//
-// A StringPiece may represent just part of a string; thus the name "Piece".
-// For example, when splitting a string, vector<StringPiece> is a natural data
-// type for the output.  For another example, a Cord is a non-contiguous,
-// potentially very long string-like object.  The Cord class has an interface
-// that iteratively provides StringPiece objects that point to the
-// successive pieces of a Cord object.
-//
-// A StringPiece is not null-terminated.  If you write code that scans a
-// StringPiece, you must check its length before reading any characters.
-// Common idioms that work on null-terminated strings do not work on
-// StringPiece objects.
-//
-// There are several ways to create a null StringPiece:
-//   StringPiece()
-//   StringPiece(nullptr)
-//   StringPiece(nullptr, 0)
-// For all of the above, sp.data() == nullptr, sp.length() == 0,
-// and sp.empty() == true.  Also, if you create a StringPiece with
-// a non-null pointer then sp.data() != nullptr.  Once created,
-// sp.data() will stay either nullptr or not-nullptr, except if you call
-// sp.clear() or sp.set().
-//
-// Thus, you can use StringPiece(nullptr) to signal an out-of-band value
-// that is different from other StringPiece values.  This is similar
-// to the way that const char* p1 = nullptr; is different from
-// const char* p2 = "";.
-//
-// There are many ways to create an empty StringPiece:
-//   StringPiece()
-//   StringPiece(nullptr)
-//   StringPiece(nullptr, 0)
-//   StringPiece("")
-//   StringPiece("", 0)
-//   StringPiece("abcdef", 0)
-//   StringPiece("abcdef"+6, 0)
-// For all of the above, sp.length() will be 0 and sp.empty() will be true.
-// For some empty StringPiece values, sp.data() will be nullptr.
-// For some empty StringPiece values, sp.data() will not be nullptr.
-//
-// Be careful not to confuse: null StringPiece and empty StringPiece.
-// The set of empty StringPieces properly includes the set of null StringPieces.
-// That is, every null StringPiece is an empty StringPiece,
-// but some non-null StringPieces are empty Stringpieces too.
-//
-// All empty StringPiece values compare equal to each other.
-// Even a null StringPieces compares equal to a non-null empty StringPiece:
-//  StringPiece() == StringPiece("", 0)
-//  StringPiece(nullptr) == StringPiece("abc", 0)
-//  StringPiece(nullptr, 0) == StringPiece("abcdef"+6, 0)
-//
-// Look carefully at this example:
-//   StringPiece("") == nullptr
-// True or false?  TRUE, because StringPiece::operator== converts
-// the right-hand side from nullptr to StringPiece(nullptr),
-// and then compares two zero-length spans of characters.
-// However, we are working to make this example produce a compile error.
-//
-// Suppose you want to write:
-//   bool TestWhat?(StringPiece sp) { return sp == nullptr; }  // BAD
-// Do not do that.  Write one of these instead:
-//   bool TestNull(StringPiece sp) { return sp.data() == nullptr; }
-//   bool TestEmpty(StringPiece sp) { return sp.empty(); }
-// The intent of TestWhat? is unclear.  Did you mean TestNull or TestEmpty?
-// Right now, TestWhat? behaves likes TestEmpty.
-// We are working to make TestWhat? produce a compile error.
-// TestNull is good to test for an out-of-band signal.
-// TestEmpty is good to test for an empty StringPiece.
-//
-// Caveats (again):
-// (1) The lifetime of the pointed-to string (or piece of a string)
-//     must be longer than the lifetime of the StringPiece.
-// (2) There may or may not be a '\0' character after the end of
-//     StringPiece data.
-// (3) A null StringPiece is empty.
-//     An empty StringPiece may or may not be a null StringPiece.
-
-#ifndef GOOGLE_PROTOBUF_STUBS_STRINGPIECE_H_
-#define GOOGLE_PROTOBUF_STUBS_STRINGPIECE_H_
-
-#include <assert.h>
-#include <stddef.h>
-#include <string.h>
-#include <iosfwd>
-#include <limits>
-#include <string>
-
-#if defined(__cpp_lib_string_view)
-#include <string_view>
-#endif
-
-#include <google/protobuf/stubs/hash.h>
-
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-namespace stringpiece_internal {
-
-class PROTOBUF_EXPORT StringPiece {
- public:
-  using traits_type = std::char_traits<char>;
-  using value_type = char;
-  using pointer = char*;
-  using const_pointer = const char*;
-  using reference = char&;
-  using const_reference = const char&;
-  using const_iterator = const char*;
-  using iterator = const_iterator;
-  using const_reverse_iterator = std::reverse_iterator<const_iterator>;
-  using reverse_iterator = const_reverse_iterator;
-  using size_type = size_t;
-  using difference_type = std::ptrdiff_t;
-
- private:
-  const char* ptr_;
-  size_type length_;
-
-  static constexpr size_type kMaxSize =
-      (std::numeric_limits<difference_type>::max)();
-
-  static size_type CheckSize(size_type size) {
-#if !defined(NDEBUG) || defined(_FORTIFY_SOURCE) && _FORTIFY_SOURCE > 0
-    if (PROTOBUF_PREDICT_FALSE(size > kMaxSize)) {
-      // Some people grep for this message in logs
-      // so take care if you ever change it.
-      LogFatalSizeTooBig(size, "string length exceeds max size");
-    }
-#endif
-    return size;
-  }
-
-  // Out-of-line error path.
-  static void LogFatalSizeTooBig(size_type size, const char* details);
-
- public:
-  // We provide non-explicit singleton constructors so users can pass
-  // in a "const char*" or a "string" wherever a "StringPiece" is
-  // expected.
-  //
-  // Style guide exception granted:
-  // http://goto/style-guide-exception-20978288
-  StringPiece() : ptr_(nullptr), length_(0) {}
-
-  StringPiece(const char* str)  // NOLINT(runtime/explicit)
-      : ptr_(str), length_(0) {
-    if (str != nullptr) {
-      length_ = CheckSize(strlen(str));
-    }
-  }
-
-  template <class Allocator>
-  StringPiece(  // NOLINT(runtime/explicit)
-      const std::basic_string<char, std::char_traits<char>, Allocator>& str)
-      : ptr_(str.data()), length_(0) {
-    length_ = CheckSize(str.size());
-  }
-
-#if defined(__cpp_lib_string_view)
-  StringPiece(  // NOLINT(runtime/explicit)
-      std::string_view str)
-      : ptr_(str.data()), length_(0) {
-    length_ = CheckSize(str.size());
-  }
-#endif
-
-  StringPiece(const char* offset, size_type len)
-      : ptr_(offset), length_(CheckSize(len)) {}
-
-  // data() may return a pointer to a buffer with embedded NULs, and the
-  // returned buffer may or may not be null terminated.  Therefore it is
-  // typically a mistake to pass data() to a routine that expects a NUL
-  // terminated string.
-  const_pointer data() const { return ptr_; }
-  size_type size() const { return length_; }
-  size_type length() const { return length_; }
-  bool empty() const { return length_ == 0; }
-
-  char operator[](size_type i) const {
-    assert(i < length_);
-    return ptr_[i];
-  }
-
-  void remove_prefix(size_type n) {
-    assert(length_ >= n);
-    ptr_ += n;
-    length_ -= n;
-  }
-
-  void remove_suffix(size_type n) {
-    assert(length_ >= n);
-    length_ -= n;
-  }
-
-  // returns {-1, 0, 1}
-  int compare(StringPiece x) const {
-    size_type min_size = length_ < x.length_ ? length_ : x.length_;
-    int r = memcmp(ptr_, x.ptr_, static_cast<size_t>(min_size));
-    if (r < 0) return -1;
-    if (r > 0) return 1;
-    if (length_ < x.length_) return -1;
-    if (length_ > x.length_) return 1;
-    return 0;
-  }
-
-  std::string as_string() const { return ToString(); }
-  // We also define ToString() here, since many other string-like
-  // interfaces name the routine that converts to a C++ string
-  // "ToString", and it's confusing to have the method that does that
-  // for a StringPiece be called "as_string()".  We also leave the
-  // "as_string()" method defined here for existing code.
-  std::string ToString() const {
-    if (ptr_ == nullptr) return "";
-    return std::string(data(), static_cast<size_type>(size()));
-  }
-
-  explicit operator std::string() const { return ToString(); }
-
-  void CopyToString(std::string* target) const;
-  void AppendToString(std::string* target) const;
-
-  bool starts_with(StringPiece x) const {
-    return (length_ >= x.length_) &&
-           (memcmp(ptr_, x.ptr_, static_cast<size_t>(x.length_)) == 0);
-  }
-
-  bool ends_with(StringPiece x) const {
-    return ((length_ >= x.length_) &&
-            (memcmp(ptr_ + (length_-x.length_), x.ptr_,
-                 static_cast<size_t>(x.length_)) == 0));
-  }
-
-  // Checks whether StringPiece starts with x and if so advances the beginning
-  // of it to past the match.  It's basically a shortcut for starts_with
-  // followed by remove_prefix.
-  bool Consume(StringPiece x);
-  // Like above but for the end of the string.
-  bool ConsumeFromEnd(StringPiece x);
-
-  // standard STL container boilerplate
-  static const size_type npos;
-  const_iterator begin() const { return ptr_; }
-  const_iterator end() const { return ptr_ + length_; }
-  const_reverse_iterator rbegin() const {
-    return const_reverse_iterator(ptr_ + length_);
-  }
-  const_reverse_iterator rend() const {
-    return const_reverse_iterator(ptr_);
-  }
-  size_type max_size() const { return length_; }
-  size_type capacity() const { return length_; }
-
-  // cpplint.py emits a false positive [build/include_what_you_use]
-  size_type copy(char* buf, size_type n, size_type pos = 0) const;  // NOLINT
-
-  bool contains(StringPiece s) const;
-
-  size_type find(StringPiece s, size_type pos = 0) const;
-  size_type find(char c, size_type pos = 0) const;
-  size_type rfind(StringPiece s, size_type pos = npos) const;
-  size_type rfind(char c, size_type pos = npos) const;
-
-  size_type find_first_of(StringPiece s, size_type pos = 0) const;
-  size_type find_first_of(char c, size_type pos = 0) const {
-    return find(c, pos);
-  }
-  size_type find_first_not_of(StringPiece s, size_type pos = 0) const;
-  size_type find_first_not_of(char c, size_type pos = 0) const;
-  size_type find_last_of(StringPiece s, size_type pos = npos) const;
-  size_type find_last_of(char c, size_type pos = npos) const {
-    return rfind(c, pos);
-  }
-  size_type find_last_not_of(StringPiece s, size_type pos = npos) const;
-  size_type find_last_not_of(char c, size_type pos = npos) const;
-
-  StringPiece substr(size_type pos, size_type n = npos) const;
-};
-
-// This large function is defined inline so that in a fairly common case where
-// one of the arguments is a literal, the compiler can elide a lot of the
-// following comparisons.
-inline bool operator==(StringPiece x, StringPiece y) {
-  StringPiece::size_type len = x.size();
-  if (len != y.size()) {
-    return false;
-  }
-
-  return x.data() == y.data() || len <= 0 ||
-      memcmp(x.data(), y.data(), static_cast<size_t>(len)) == 0;
-}
-
-inline bool operator!=(StringPiece x, StringPiece y) {
-  return !(x == y);
-}
-
-inline bool operator<(StringPiece x, StringPiece y) {
-  const StringPiece::size_type min_size =
-      x.size() < y.size() ? x.size() : y.size();
-  const int r = memcmp(x.data(), y.data(), static_cast<size_t>(min_size));
-  return (r < 0) || (r == 0 && x.size() < y.size());
-}
-
-inline bool operator>(StringPiece x, StringPiece y) {
-  return y < x;
-}
-
-inline bool operator<=(StringPiece x, StringPiece y) {
-  return !(x > y);
-}
-
-inline bool operator>=(StringPiece x, StringPiece y) {
-  return !(x < y);
-}
-
-// allow StringPiece to be logged
-extern std::ostream& operator<<(std::ostream& o, StringPiece piece);
-
-}  // namespace stringpiece_internal
-
-using ::google::protobuf::stringpiece_internal::StringPiece;
-
-}  // namespace protobuf
-}  // namespace google
-
-GOOGLE_PROTOBUF_HASH_NAMESPACE_DECLARATION_START
-template<> struct hash<StringPiece> {
-  size_t operator()(const StringPiece& s) const {
-    size_t result = 0;
-    for (const char *str = s.data(), *end = str + s.size(); str < end; str++) {
-      result = 5 * result + static_cast<size_t>(*str);
-    }
-    return result;
-  }
-};
-GOOGLE_PROTOBUF_HASH_NAMESPACE_DECLARATION_END
-
-#include <google/protobuf/port_undef.inc>
-
-#endif  // STRINGS_STRINGPIECE_H_
diff --git a/libs/protobuf/src/google/protobuf/stubs/stringpiece_unittest.cc b/libs/protobuf/src/google/protobuf/stubs/stringpiece_unittest.cc
deleted file mode 100644
index ba904cb..0000000
--- a/libs/protobuf/src/google/protobuf/stubs/stringpiece_unittest.cc
+++ /dev/null
@@ -1,695 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#include <google/protobuf/stubs/stringpiece.h>
-
-#include <iterator>
-#include <map>
-#include <string>
-#include <utility>
-#include <vector>
-
-#include <google/protobuf/testing/googletest.h>
-#include <google/protobuf/stubs/hash.h>
-#include <gtest/gtest.h>
-
-namespace google {
-namespace protobuf {
-namespace {
-TEST(StringPiece, Ctor) {
-  {
-    // Null.
-    StringPiece s10;
-    EXPECT_TRUE(s10.data() == nullptr);
-    EXPECT_EQ(0, s10.length());
-  }
-
-  {
-    // const char* without length.
-    const char* hello = "hello";
-    StringPiece s20(hello);
-    EXPECT_TRUE(s20.data() == hello);
-    EXPECT_EQ(5, s20.length());
-
-    // const char* with length.
-    StringPiece s21(hello, 4);
-    EXPECT_TRUE(s21.data() == hello);
-    EXPECT_EQ(4, s21.length());
-
-    // Not recommended, but valid C++
-    StringPiece s22(hello, 6);
-    EXPECT_TRUE(s22.data() == hello);
-    EXPECT_EQ(6, s22.length());
-  }
-
-  {
-    // std::string.
-    std::string hola = "hola";
-    StringPiece s30(hola);
-    EXPECT_TRUE(s30.data() == hola.data());
-    EXPECT_EQ(4, s30.length());
-
-    // std::string with embedded '\0'.
-    hola.push_back('\0');
-    hola.append("h2");
-    hola.push_back('\0');
-    StringPiece s31(hola);
-    EXPECT_TRUE(s31.data() == hola.data());
-    EXPECT_EQ(8, s31.length());
-  }
-
-#if defined(HAS_GLOBAL_STRING)
-  {
-    // ::string
-    std::string bonjour = "bonjour";
-    StringPiece s40(bonjour);
-    EXPECT_TRUE(s40.data() == bonjour.data());
-    EXPECT_EQ(7, s40.length());
-  }
-#endif
-
-  // TODO(mec): StringPiece(StringPiece x, int pos);
-  // TODO(mec): StringPiece(StringPiece x, int pos, int len);
-  // TODO(mec): StringPiece(const StringPiece&);
-}
-
-TEST(StringPiece, STLComparator) {
-  std::string s1("foo");
-  std::string s2("bar");
-  std::string s3("baz");
-
-  StringPiece p1(s1);
-  StringPiece p2(s2);
-  StringPiece p3(s3);
-
-  typedef std::map<StringPiece, int> TestMap;
-  TestMap map;
-
-  map.insert(std::make_pair(p1, 0));
-  map.insert(std::make_pair(p2, 1));
-  map.insert(std::make_pair(p3, 2));
-  EXPECT_EQ(map.size(), 3);
-
-  TestMap::const_iterator iter = map.begin();
-  EXPECT_EQ(iter->second, 1);
-  ++iter;
-  EXPECT_EQ(iter->second, 2);
-  ++iter;
-  EXPECT_EQ(iter->second, 0);
-  ++iter;
-  EXPECT_TRUE(iter == map.end());
-
-  TestMap::iterator new_iter = map.find("zot");
-  EXPECT_TRUE(new_iter == map.end());
-
-  new_iter = map.find("bar");
-  EXPECT_TRUE(new_iter != map.end());
-
-  map.erase(new_iter);
-  EXPECT_EQ(map.size(), 2);
-
-  iter = map.begin();
-  EXPECT_EQ(iter->second, 2);
-  ++iter;
-  EXPECT_EQ(iter->second, 0);
-  ++iter;
-  EXPECT_TRUE(iter == map.end());
-}
-
-TEST(StringPiece, ComparisonOperators) {
-#define COMPARE(result, op, x, y) \
-  EXPECT_EQ(result, StringPiece((x)) op StringPiece((y))); \
-  EXPECT_EQ(result, StringPiece((x)).compare(StringPiece((y))) op 0)
-
-  COMPARE(true, ==, "",   "");
-  COMPARE(true, ==, "", nullptr);
-  COMPARE(true, ==, nullptr, "");
-  COMPARE(true, ==, "a",  "a");
-  COMPARE(true, ==, "aa", "aa");
-  COMPARE(false, ==, "a",  "");
-  COMPARE(false, ==, "",   "a");
-  COMPARE(false, ==, "a",  "b");
-  COMPARE(false, ==, "a",  "aa");
-  COMPARE(false, ==, "aa", "a");
-
-  COMPARE(false, !=, "",   "");
-  COMPARE(false, !=, "a",  "a");
-  COMPARE(false, !=, "aa", "aa");
-  COMPARE(true, !=, "a",  "");
-  COMPARE(true, !=, "",   "a");
-  COMPARE(true, !=, "a",  "b");
-  COMPARE(true, !=, "a",  "aa");
-  COMPARE(true, !=, "aa", "a");
-
-  COMPARE(true, <, "a",  "b");
-  COMPARE(true, <, "a",  "aa");
-  COMPARE(true, <, "aa", "b");
-  COMPARE(true, <, "aa", "bb");
-  COMPARE(false, <, "a",  "a");
-  COMPARE(false, <, "b",  "a");
-  COMPARE(false, <, "aa", "a");
-  COMPARE(false, <, "b",  "aa");
-  COMPARE(false, <, "bb", "aa");
-
-  COMPARE(true, <=, "a",  "a");
-  COMPARE(true, <=, "a",  "b");
-  COMPARE(true, <=, "a",  "aa");
-  COMPARE(true, <=, "aa", "b");
-  COMPARE(true, <=, "aa", "bb");
-  COMPARE(false, <=, "b",  "a");
-  COMPARE(false, <=, "aa", "a");
-  COMPARE(false, <=, "b",  "aa");
-  COMPARE(false, <=, "bb", "aa");
-
-  COMPARE(false, >=, "a",  "b");
-  COMPARE(false, >=, "a",  "aa");
-  COMPARE(false, >=, "aa", "b");
-  COMPARE(false, >=, "aa", "bb");
-  COMPARE(true, >=, "a",  "a");
-  COMPARE(true, >=, "b",  "a");
-  COMPARE(true, >=, "aa", "a");
-  COMPARE(true, >=, "b",  "aa");
-  COMPARE(true, >=, "bb", "aa");
-
-  COMPARE(false, >, "a",  "a");
-  COMPARE(false, >, "a",  "b");
-  COMPARE(false, >, "a",  "aa");
-  COMPARE(false, >, "aa", "b");
-  COMPARE(false, >, "aa", "bb");
-  COMPARE(true, >, "b",  "a");
-  COMPARE(true, >, "aa", "a");
-  COMPARE(true, >, "b",  "aa");
-  COMPARE(true, >, "bb", "aa");
-
-  std::string x;
-  for (int i = 0; i < 256; i++) {
-    x += 'a';
-    std::string y = x;
-    COMPARE(true, ==, x, y);
-    for (int j = 0; j < i; j++) {
-      std::string z = x;
-      z[j] = 'b';       // Differs in position 'j'
-      COMPARE(false, ==, x, z);
-      COMPARE(true, <, x, z);
-      COMPARE(true, >, z, x);
-      if (j + 1 < i) {
-        z[j + 1] = 'A';  // Differs in position 'j+1' as well
-        COMPARE(false, ==, x, z);
-        COMPARE(true, <, x, z);
-        COMPARE(true, >, z, x);
-        z[j + 1] = 'z';  // Differs in position 'j+1' as well
-        COMPARE(false, ==, x, z);
-        COMPARE(true, <, x, z);
-        COMPARE(true, >, z, x);
-      }
-    }
-  }
-
-#undef COMPARE
-}
-
-TEST(StringPiece, STL1) {
-  const StringPiece a("abcdefghijklmnopqrstuvwxyz");
-  const StringPiece b("abc");
-  const StringPiece c("xyz");
-  const StringPiece d("foobar");
-  const StringPiece e;
-  std::string temp("123");
-  temp += '\0';
-  temp += "456";
-  const StringPiece f(temp);
-
-  EXPECT_EQ(a[6], 'g');
-  EXPECT_EQ(b[0], 'a');
-  EXPECT_EQ(c[2], 'z');
-  EXPECT_EQ(f[3], '\0');
-  EXPECT_EQ(f[5], '5');
-
-  EXPECT_EQ(*d.data(), 'f');
-  EXPECT_EQ(d.data()[5], 'r');
-  EXPECT_TRUE(e.data() == nullptr);
-
-  EXPECT_EQ(*a.begin(), 'a');
-  EXPECT_EQ(*(b.begin() + 2), 'c');
-  EXPECT_EQ(*(c.end() - 1), 'z');
-
-  EXPECT_EQ(*a.rbegin(), 'z');
-  EXPECT_EQ(*(b.rbegin() + 2), 'a');
-  EXPECT_EQ(*(c.rend() - 1), 'x');
-  EXPECT_TRUE(a.rbegin() + 26 == a.rend());
-
-  EXPECT_EQ(a.size(), 26);
-  EXPECT_EQ(b.size(), 3);
-  EXPECT_EQ(c.size(), 3);
-  EXPECT_EQ(d.size(), 6);
-  EXPECT_EQ(e.size(), 0);
-  EXPECT_EQ(f.size(), 7);
-
-  EXPECT_TRUE(!d.empty());
-  EXPECT_TRUE(d.begin() != d.end());
-  EXPECT_TRUE(d.begin() + 6 == d.end());
-
-  EXPECT_TRUE(e.empty());
-  EXPECT_TRUE(e.begin() == e.end());
-
-  EXPECT_GE(a.max_size(), a.capacity());
-  EXPECT_GE(a.capacity(), a.size());
-
-  char buf[4] = { '%', '%', '%', '%' };
-  EXPECT_EQ(a.copy(buf, 4), 4);
-  EXPECT_EQ(buf[0], a[0]);
-  EXPECT_EQ(buf[1], a[1]);
-  EXPECT_EQ(buf[2], a[2]);
-  EXPECT_EQ(buf[3], a[3]);
-  EXPECT_EQ(a.copy(buf, 3, 7), 3);
-  EXPECT_EQ(buf[0], a[7]);
-  EXPECT_EQ(buf[1], a[8]);
-  EXPECT_EQ(buf[2], a[9]);
-  EXPECT_EQ(buf[3], a[3]);
-  EXPECT_EQ(c.copy(buf, 99), 3);
-  EXPECT_EQ(buf[0], c[0]);
-  EXPECT_EQ(buf[1], c[1]);
-  EXPECT_EQ(buf[2], c[2]);
-  EXPECT_EQ(buf[3], a[3]);
-}
-
-// Separated from STL1() because some compilers produce an overly
-// large stack frame for the combined function.
-TEST(StringPiece, STL2) {
-  const StringPiece a("abcdefghijklmnopqrstuvwxyz");
-  const StringPiece b("abc");
-  const StringPiece c("xyz");
-  const StringPiece e;
-  const StringPiece f("123" "\0" "456", 7);
-
-  EXPECT_EQ(StringPiece::npos, std::string::npos);
-
-  EXPECT_EQ(a.find(b), 0);
-  EXPECT_EQ(a.find(b, 1), StringPiece::npos);
-  EXPECT_EQ(a.find(c), 23);
-  EXPECT_EQ(a.find(c, 9), 23);
-  EXPECT_EQ(a.find(c, StringPiece::npos), StringPiece::npos);
-  EXPECT_EQ(b.find(c), StringPiece::npos);
-  EXPECT_EQ(b.find(c, StringPiece::npos), StringPiece::npos);
-  EXPECT_EQ(a.find(e), 0);
-  EXPECT_EQ(a.find(e, 17), 17);
-  StringPiece g("xx not found bb");
-  EXPECT_EQ(a.find(g), StringPiece::npos);
-  // empty string nonsense
-  EXPECT_EQ(e.find(b), StringPiece::npos);
-  EXPECT_EQ(e.find(b, 7), StringPiece::npos);
-
-  size_t empty_search_pos = std::string().find(std::string());
-  EXPECT_EQ(e.find(e), empty_search_pos);
-  EXPECT_EQ(e.find(e, 4), std::string().find(std::string(), 4));
-
-  EXPECT_EQ(a.find('a'), 0);
-  EXPECT_EQ(a.find('c'), 2);
-  EXPECT_EQ(a.find('z'), 25);
-  EXPECT_EQ(a.find('$'), StringPiece::npos);
-  EXPECT_EQ(a.find('\0'), StringPiece::npos);
-  EXPECT_EQ(f.find('\0'), 3);
-  EXPECT_EQ(f.find('3'), 2);
-  EXPECT_EQ(f.find('5'), 5);
-  EXPECT_EQ(g.find('o'), 4);
-  EXPECT_EQ(g.find('o', 4), 4);
-  EXPECT_EQ(g.find('o', 5), 8);
-  EXPECT_EQ(a.find('b', 5), StringPiece::npos);
-  // empty string nonsense
-  EXPECT_EQ(e.find('\0'), StringPiece::npos);
-  EXPECT_EQ(e.find('\0', 7), StringPiece::npos);
-  EXPECT_EQ(e.find('x'), StringPiece::npos);
-  EXPECT_EQ(e.find('x', 7), StringPiece::npos);
-
-  EXPECT_EQ(a.rfind(b), 0);
-  EXPECT_EQ(a.rfind(b, 1), 0);
-  EXPECT_EQ(a.rfind(c), 23);
-  EXPECT_EQ(a.rfind(c, 22), StringPiece::npos);
-  EXPECT_EQ(a.rfind(c, 1), StringPiece::npos);
-  EXPECT_EQ(a.rfind(c, 0), StringPiece::npos);
-  EXPECT_EQ(b.rfind(c), StringPiece::npos);
-  EXPECT_EQ(b.rfind(c, 0), StringPiece::npos);
-  EXPECT_EQ(a.rfind(e), a.as_string().rfind(std::string()));
-  EXPECT_EQ(a.rfind(e, 17), 17);
-  EXPECT_EQ(a.rfind(g), StringPiece::npos);
-  EXPECT_EQ(e.rfind(b), StringPiece::npos);
-  EXPECT_EQ(e.rfind(b, 7), StringPiece::npos);
-  // empty string nonsense
-  EXPECT_EQ(e.rfind(e, 7), std::string().rfind(std::string()));
-  EXPECT_EQ(e.rfind(e), std::string().rfind(std::string()));
-
-  EXPECT_EQ(g.rfind('o'), 8);
-  EXPECT_EQ(g.rfind('q'), StringPiece::npos);
-  EXPECT_EQ(g.rfind('o', 8), 8);
-  EXPECT_EQ(g.rfind('o', 7), 4);
-  EXPECT_EQ(g.rfind('o', 3), StringPiece::npos);
-  EXPECT_EQ(f.rfind('\0'), 3);
-  EXPECT_EQ(f.rfind('\0', 12), 3);
-  EXPECT_EQ(f.rfind('3'), 2);
-  EXPECT_EQ(f.rfind('5'), 5);
-  // empty string nonsense
-  EXPECT_EQ(e.rfind('o'), StringPiece::npos);
-  EXPECT_EQ(e.rfind('o', 7), StringPiece::npos);
-
-  EXPECT_EQ(a.find_first_of(b), 0);
-  EXPECT_EQ(a.find_first_of(b, 0), 0);
-  EXPECT_EQ(a.find_first_of(b, 1), 1);
-  EXPECT_EQ(a.find_first_of(b, 2), 2);
-  EXPECT_EQ(a.find_first_of(b, 3), StringPiece::npos);
-  EXPECT_EQ(a.find_first_of(c), 23);
-  EXPECT_EQ(a.find_first_of(c, 23), 23);
-  EXPECT_EQ(a.find_first_of(c, 24), 24);
-  EXPECT_EQ(a.find_first_of(c, 25), 25);
-  EXPECT_EQ(a.find_first_of(c, 26), StringPiece::npos);
-  EXPECT_EQ(g.find_first_of(b), 13);
-  EXPECT_EQ(g.find_first_of(c), 0);
-  EXPECT_EQ(a.find_first_of(f), StringPiece::npos);
-  EXPECT_EQ(f.find_first_of(a), StringPiece::npos);
-  // empty string nonsense
-  EXPECT_EQ(a.find_first_of(e), StringPiece::npos);
-  EXPECT_EQ(e.find_first_of(b), StringPiece::npos);
-  EXPECT_EQ(e.find_first_of(e), StringPiece::npos);
-
-  EXPECT_EQ(a.find_first_not_of(b), 3);
-  EXPECT_EQ(a.find_first_not_of(c), 0);
-  EXPECT_EQ(b.find_first_not_of(a), StringPiece::npos);
-  EXPECT_EQ(c.find_first_not_of(a), StringPiece::npos);
-  EXPECT_EQ(f.find_first_not_of(a), 0);
-  EXPECT_EQ(a.find_first_not_of(f), 0);
-  EXPECT_EQ(a.find_first_not_of(e), 0);
-  // empty string nonsense
-  EXPECT_EQ(e.find_first_not_of(a), StringPiece::npos);
-  EXPECT_EQ(e.find_first_not_of(e), StringPiece::npos);
-
-  StringPiece h("====");
-  EXPECT_EQ(h.find_first_not_of('='), StringPiece::npos);
-  EXPECT_EQ(h.find_first_not_of('=', 3), StringPiece::npos);
-  EXPECT_EQ(h.find_first_not_of('\0'), 0);
-  EXPECT_EQ(g.find_first_not_of('x'), 2);
-  EXPECT_EQ(f.find_first_not_of('\0'), 0);
-  EXPECT_EQ(f.find_first_not_of('\0', 3), 4);
-  EXPECT_EQ(f.find_first_not_of('\0', 2), 2);
-  // empty string nonsense
-  EXPECT_EQ(e.find_first_not_of('x'), StringPiece::npos);
-  EXPECT_EQ(e.find_first_not_of('\0'), StringPiece::npos);
-
-  //  StringPiece g("xx not found bb");
-  StringPiece i("56");
-  EXPECT_EQ(h.find_last_of(a), StringPiece::npos);
-  EXPECT_EQ(g.find_last_of(a), g.size()-1);
-  EXPECT_EQ(a.find_last_of(b), 2);
-  EXPECT_EQ(a.find_last_of(c), a.size()-1);
-  EXPECT_EQ(f.find_last_of(i), 6);
-  EXPECT_EQ(a.find_last_of('a'), 0);
-  EXPECT_EQ(a.find_last_of('b'), 1);
-  EXPECT_EQ(a.find_last_of('z'), 25);
-  EXPECT_EQ(a.find_last_of('a', 5), 0);
-  EXPECT_EQ(a.find_last_of('b', 5), 1);
-  EXPECT_EQ(a.find_last_of('b', 0), StringPiece::npos);
-  EXPECT_EQ(a.find_last_of('z', 25), 25);
-  EXPECT_EQ(a.find_last_of('z', 24), StringPiece::npos);
-  EXPECT_EQ(f.find_last_of(i, 5), 5);
-  EXPECT_EQ(f.find_last_of(i, 6), 6);
-  EXPECT_EQ(f.find_last_of(a, 4), StringPiece::npos);
-  // empty string nonsense
-  EXPECT_EQ(f.find_last_of(e), StringPiece::npos);
-  EXPECT_EQ(f.find_last_of(e, 4), StringPiece::npos);
-  EXPECT_EQ(e.find_last_of(e), StringPiece::npos);
-  EXPECT_EQ(e.find_last_of(f), StringPiece::npos);
-  EXPECT_EQ(e.find_last_of(e, 4), StringPiece::npos);
-  EXPECT_EQ(e.find_last_of(f, 4), StringPiece::npos);
-
-  EXPECT_EQ(a.find_last_not_of(b), a.size()-1);
-  EXPECT_EQ(a.find_last_not_of(c), 22);
-  EXPECT_EQ(b.find_last_not_of(a), StringPiece::npos);
-  EXPECT_EQ(b.find_last_not_of(b), StringPiece::npos);
-  EXPECT_EQ(f.find_last_not_of(i), 4);
-  EXPECT_EQ(a.find_last_not_of(c, 24), 22);
-  EXPECT_EQ(a.find_last_not_of(b, 3), 3);
-  EXPECT_EQ(a.find_last_not_of(b, 2), StringPiece::npos);
-  // empty string nonsense
-  EXPECT_EQ(f.find_last_not_of(e), f.size()-1);
-  EXPECT_EQ(f.find_last_not_of(e, 4), 4);
-  EXPECT_EQ(e.find_last_not_of(e), StringPiece::npos);
-  EXPECT_EQ(e.find_last_not_of(f), StringPiece::npos);
-  EXPECT_EQ(e.find_last_not_of(e, 4), StringPiece::npos);
-  EXPECT_EQ(e.find_last_not_of(f, 4), StringPiece::npos);
-
-  EXPECT_EQ(h.find_last_not_of('x'), h.size() - 1);
-  EXPECT_EQ(h.find_last_not_of('='), StringPiece::npos);
-  EXPECT_EQ(b.find_last_not_of('c'), 1);
-  EXPECT_EQ(h.find_last_not_of('x', 2), 2);
-  EXPECT_EQ(h.find_last_not_of('=', 2), StringPiece::npos);
-  EXPECT_EQ(b.find_last_not_of('b', 1), 0);
-  // empty string nonsense
-  EXPECT_EQ(e.find_last_not_of('x'), StringPiece::npos);
-  EXPECT_EQ(e.find_last_not_of('\0'), StringPiece::npos);
-
-  EXPECT_EQ(a.substr(0, 3), b);
-  EXPECT_EQ(a.substr(23), c);
-  EXPECT_EQ(a.substr(23, 3), c);
-  EXPECT_EQ(a.substr(23, 99), c);
-  EXPECT_EQ(a.substr(0), a);
-  EXPECT_EQ(a.substr(3, 2), "de");
-  // empty string nonsense
-  EXPECT_EQ(a.substr(99, 2), e);
-  EXPECT_EQ(e.substr(99), e);
-  EXPECT_EQ(e.substr(0, 99), e);
-  EXPECT_EQ(e.substr(99, 99), e);
-  // use of npos
-  EXPECT_EQ(a.substr(0, StringPiece::npos), a);
-  EXPECT_EQ(a.substr(23, StringPiece::npos), c);
-  EXPECT_EQ(a.substr(StringPiece::npos, 0), e);
-  EXPECT_EQ(a.substr(StringPiece::npos, 1), e);
-  EXPECT_EQ(a.substr(StringPiece::npos, StringPiece::npos), e);
-}
-
-TEST(StringPiece, Custom) {
-  StringPiece a("foobar");
-  std::string s1("123");
-  s1 += '\0';
-  s1 += "456";
-  StringPiece b(s1);
-  StringPiece e;
-  std::string s2;
-
-  // CopyToString
-  a.CopyToString(&s2);
-  EXPECT_EQ(s2.size(), 6);
-  EXPECT_EQ(s2, "foobar");
-  b.CopyToString(&s2);
-  EXPECT_EQ(s2.size(), 7);
-  EXPECT_EQ(s1, s2);
-  e.CopyToString(&s2);
-  EXPECT_TRUE(s2.empty());
-
-  // AppendToString
-  s2.erase();
-  a.AppendToString(&s2);
-  EXPECT_EQ(s2.size(), 6);
-  EXPECT_EQ(s2, "foobar");
-  a.AppendToString(&s2);
-  EXPECT_EQ(s2.size(), 12);
-  EXPECT_EQ(s2, "foobarfoobar");
-
-  // starts_with
-  EXPECT_TRUE(a.starts_with(a));
-  EXPECT_TRUE(a.starts_with("foo"));
-  EXPECT_TRUE(a.starts_with(e));
-  EXPECT_TRUE(b.starts_with(s1));
-  EXPECT_TRUE(b.starts_with(b));
-  EXPECT_TRUE(b.starts_with(e));
-  EXPECT_TRUE(e.starts_with(""));
-  EXPECT_TRUE(!a.starts_with(b));
-  EXPECT_TRUE(!b.starts_with(a));
-  EXPECT_TRUE(!e.starts_with(a));
-
-  // ends with
-  EXPECT_TRUE(a.ends_with(a));
-  EXPECT_TRUE(a.ends_with("bar"));
-  EXPECT_TRUE(a.ends_with(e));
-  EXPECT_TRUE(b.ends_with(s1));
-  EXPECT_TRUE(b.ends_with(b));
-  EXPECT_TRUE(b.ends_with(e));
-  EXPECT_TRUE(e.ends_with(""));
-  EXPECT_TRUE(!a.ends_with(b));
-  EXPECT_TRUE(!b.ends_with(a));
-  EXPECT_TRUE(!e.ends_with(a));
-
-  // remove_prefix
-  StringPiece c(a);
-  c.remove_prefix(3);
-  EXPECT_EQ(c, "bar");
-  c = a;
-  c.remove_prefix(0);
-  EXPECT_EQ(c, a);
-  c.remove_prefix(c.size());
-  EXPECT_EQ(c, e);
-
-  // remove_suffix
-  c = a;
-  c.remove_suffix(3);
-  EXPECT_EQ(c, "foo");
-  c = a;
-  c.remove_suffix(0);
-  EXPECT_EQ(c, a);
-  c.remove_suffix(c.size());
-  EXPECT_EQ(c, e);
-
-  c = StringPiece("foobar", 7);
-
-  // as_string
-  std::string s3(a.as_string().c_str(), 7);
-  EXPECT_EQ(c, s3);
-  std::string s4(e.as_string());
-  EXPECT_TRUE(s4.empty());
-
-  // ToString
-  {
-    std::string s5(a.ToString().c_str(), 7);
-    EXPECT_EQ(c, s5);
-    std::string s6(e.ToString());
-    EXPECT_TRUE(s6.empty());
-  }
-
-  // Consume
-  {
-    StringPiece str("foobar");
-    EXPECT_TRUE(str.Consume("foo"));
-    EXPECT_EQ(str, "bar");
-    EXPECT_FALSE(str.Consume("foo"));
-    EXPECT_FALSE(str.Consume("barbar"));
-    EXPECT_FALSE(str.Consume("ar"));
-    EXPECT_EQ(str, "bar");
-  }
-
-  {
-    StringPiece str("foobar");
-    EXPECT_TRUE(str.ConsumeFromEnd("bar"));
-    EXPECT_EQ(str, "foo");
-    EXPECT_FALSE(str.ConsumeFromEnd("bar"));
-    EXPECT_FALSE(str.ConsumeFromEnd("foofoo"));
-    EXPECT_FALSE(str.ConsumeFromEnd("fo"));
-    EXPECT_EQ(str, "foo");
-  }
-}
-
-TEST(StringPiece, Contains) {
-  StringPiece a("abcdefg");
-  StringPiece b("abcd");
-  StringPiece c("efg");
-  StringPiece d("gh");
-  EXPECT_TRUE(a.contains(b));
-  EXPECT_TRUE(a.contains(c));
-  EXPECT_TRUE(!a.contains(d));
-}
-
-TEST(StringPiece, NullInput) {
-  // we used to crash here, but now we don't.
-  StringPiece s(nullptr);
-  EXPECT_EQ(s.data(), (const char*)nullptr);
-  EXPECT_EQ(s.size(), 0);
-
-  // .ToString() on a StringPiece with nullptr should produce the empty string.
-  EXPECT_EQ("", s.ToString());
-  EXPECT_EQ("", s.as_string());
-}
-
-TEST(StringPiece, Comparisons2) {
-  StringPiece abc("abcdefghijklmnopqrstuvwxyz");
-
-  // check comparison operations on strings longer than 4 bytes.
-  EXPECT_EQ(abc, StringPiece("abcdefghijklmnopqrstuvwxyz"));
-  EXPECT_EQ(abc.compare(StringPiece("abcdefghijklmnopqrstuvwxyz")), 0);
-
-  EXPECT_LT(abc, StringPiece("abcdefghijklmnopqrstuvwxzz"));
-  EXPECT_LT(abc.compare(StringPiece("abcdefghijklmnopqrstuvwxzz")), 0);
-
-  EXPECT_GT(abc, StringPiece("abcdefghijklmnopqrstuvwxyy"));
-  EXPECT_GT(abc.compare(StringPiece("abcdefghijklmnopqrstuvwxyy")), 0);
-
-  // starts_with
-  EXPECT_TRUE(abc.starts_with(abc));
-  EXPECT_TRUE(abc.starts_with("abcdefghijklm"));
-  EXPECT_TRUE(!abc.starts_with("abcdefguvwxyz"));
-
-  // ends_with
-  EXPECT_TRUE(abc.ends_with(abc));
-  EXPECT_TRUE(!abc.ends_with("abcdefguvwxyz"));
-  EXPECT_TRUE(abc.ends_with("nopqrstuvwxyz"));
-}
-
-TEST(ComparisonOpsTest, StringCompareNotAmbiguous) {
-  EXPECT_EQ("hello", std::string("hello"));
-  EXPECT_LT("hello", std::string("world"));
-}
-
-TEST(ComparisonOpsTest, HeterogenousStringPieceEquals) {
-  EXPECT_EQ(StringPiece("hello"), std::string("hello"));
-  EXPECT_EQ("hello", StringPiece("hello"));
-}
-
-TEST(FindOneCharTest, EdgeCases) {
-  StringPiece a("xxyyyxx");
-
-  // Set a = "xyyyx".
-  a.remove_prefix(1);
-  a.remove_suffix(1);
-
-  EXPECT_EQ(0, a.find('x'));
-  EXPECT_EQ(0, a.find('x', 0));
-  EXPECT_EQ(4, a.find('x', 1));
-  EXPECT_EQ(4, a.find('x', 4));
-  EXPECT_EQ(StringPiece::npos, a.find('x', 5));
-
-  EXPECT_EQ(4, a.rfind('x'));
-  EXPECT_EQ(4, a.rfind('x', 5));
-  EXPECT_EQ(4, a.rfind('x', 4));
-  EXPECT_EQ(0, a.rfind('x', 3));
-  EXPECT_EQ(0, a.rfind('x', 0));
-
-  // Set a = "yyy".
-  a.remove_prefix(1);
-  a.remove_suffix(1);
-
-  EXPECT_EQ(StringPiece::npos, a.find('x'));
-  EXPECT_EQ(StringPiece::npos, a.rfind('x'));
-}
-
-#ifdef PROTOBUF_HAS_DEATH_TEST
-#ifndef NDEBUG
-TEST(NonNegativeLenTest, NonNegativeLen) {
-  EXPECT_DEATH(StringPiece("xyz", -1), "string length exceeds max size");
-}
-#endif  // ndef DEBUG
-#endif  // PROTOBUF_HAS_DEATH_TEST
-
-}  // namespace
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/stubs/stringprintf.cc b/libs/protobuf/src/google/protobuf/stubs/stringprintf.cc
deleted file mode 100644
index a6ad4c0..0000000
--- a/libs/protobuf/src/google/protobuf/stubs/stringprintf.cc
+++ /dev/null
@@ -1,175 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2012 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// from google3/base/stringprintf.cc
-
-#include <google/protobuf/stubs/stringprintf.h>
-
-#include <errno.h>
-#include <stdarg.h> // For va_list and related operations
-#include <stdio.h> // MSVC requires this for _vsnprintf
-#include <vector>
-
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/stubs/logging.h>
-
-namespace google {
-namespace protobuf {
-
-#ifdef _MSC_VER
-#ifndef va_copy
-// Define va_copy for MSVC. This is a hack, assuming va_list is simply a
-// pointer into the stack and is safe to copy.
-#define va_copy(dest, src) ((dest) = (src))
-#endif
-#endif
-
-void StringAppendV(std::string* dst, const char* format, va_list ap) {
-  // First try with a small fixed size buffer
-  static const int kSpaceLength = 1024;
-  char space[kSpaceLength];
-
-  // It's possible for methods that use a va_list to invalidate
-  // the data in it upon use.  The fix is to make a copy
-  // of the structure before using it and use that copy instead.
-  va_list backup_ap;
-  va_copy(backup_ap, ap);
-  int result = vsnprintf(space, kSpaceLength, format, backup_ap);
-  va_end(backup_ap);
-
-  if (result < kSpaceLength) {
-    if (result >= 0) {
-      // Normal case -- everything fit.
-      dst->append(space, result);
-      return;
-    }
-
-#ifdef _MSC_VER
-    {
-      // Error or MSVC running out of space.  MSVC 8.0 and higher
-      // can be asked about space needed with the special idiom below:
-      va_copy(backup_ap, ap);
-      result = vsnprintf(nullptr, 0, format, backup_ap);
-      va_end(backup_ap);
-    }
-#endif
-
-    if (result < 0) {
-      // Just an error.
-      return;
-    }
-  }
-
-  // Increase the buffer size to the size requested by vsnprintf,
-  // plus one for the closing \0.
-  int length = result+1;
-  char* buf = new char[length];
-
-  // Restore the va_list before we use it again
-  va_copy(backup_ap, ap);
-  result = vsnprintf(buf, length, format, backup_ap);
-  va_end(backup_ap);
-
-  if (result >= 0 && result < length) {
-    // It fit
-    dst->append(buf, result);
-  }
-  delete[] buf;
-}
-
-std::string StringPrintf(const char* format, ...) {
-  va_list ap;
-  va_start(ap, format);
-  std::string result;
-  StringAppendV(&result, format, ap);
-  va_end(ap);
-  return result;
-}
-
-const std::string& SStringPrintf(std::string* dst, const char* format, ...) {
-  va_list ap;
-  va_start(ap, format);
-  dst->clear();
-  StringAppendV(dst, format, ap);
-  va_end(ap);
-  return *dst;
-}
-
-void StringAppendF(std::string* dst, const char* format, ...) {
-  va_list ap;
-  va_start(ap, format);
-  StringAppendV(dst, format, ap);
-  va_end(ap);
-}
-
-// Max arguments supported by StringPrintVector
-const int kStringPrintfVectorMaxArgs = 32;
-
-// An empty block of zero for filler arguments.  This is const so that if
-// printf tries to write to it (via %n) then the program gets a SIGSEGV
-// and we can fix the problem or protect against an attack.
-static const char string_printf_empty_block[256] = { '\0' };
-
-std::string StringPrintfVector(const char* format,
-                               const std::vector<std::string>& v) {
-  GOOGLE_CHECK_LE(v.size(), kStringPrintfVectorMaxArgs)
-      << "StringPrintfVector currently only supports up to "
-      << kStringPrintfVectorMaxArgs << " arguments. "
-      << "Feel free to add support for more if you need it.";
-
-  // Add filler arguments so that bogus format+args have a harder time
-  // crashing the program, corrupting the program (%n),
-  // or displaying random chunks of memory to users.
-
-  const char* cstr[kStringPrintfVectorMaxArgs];
-  for (int i = 0; i < v.size(); ++i) {
-    cstr[i] = v[i].c_str();
-  }
-  for (int i = v.size(); i < GOOGLE_ARRAYSIZE(cstr); ++i) {
-    cstr[i] = &string_printf_empty_block[0];
-  }
-
-  // I do not know any way to pass kStringPrintfVectorMaxArgs arguments,
-  // or any way to build a va_list by hand, or any API for printf
-  // that accepts an array of arguments.  The best I can do is stick
-  // this COMPILE_ASSERT right next to the actual statement.
-
-  static_assert(kStringPrintfVectorMaxArgs == 32, "arg_count_mismatch");
-  return StringPrintf(format,
-                      cstr[0], cstr[1], cstr[2], cstr[3], cstr[4],
-                      cstr[5], cstr[6], cstr[7], cstr[8], cstr[9],
-                      cstr[10], cstr[11], cstr[12], cstr[13], cstr[14],
-                      cstr[15], cstr[16], cstr[17], cstr[18], cstr[19],
-                      cstr[20], cstr[21], cstr[22], cstr[23], cstr[24],
-                      cstr[25], cstr[26], cstr[27], cstr[28], cstr[29],
-                      cstr[30], cstr[31]);
-}
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/stubs/stringprintf.h b/libs/protobuf/src/google/protobuf/stubs/stringprintf.h
deleted file mode 100644
index e3858be..0000000
--- a/libs/protobuf/src/google/protobuf/stubs/stringprintf.h
+++ /dev/null
@@ -1,85 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2012 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// from google3/base/stringprintf.h
-//
-// Printf variants that place their output in a C++ string.
-//
-// Usage:
-//      string result = StringPrintf("%d %s\n", 10, "hello");
-//      SStringPrintf(&result, "%d %s\n", 10, "hello");
-//      StringAppendF(&result, "%d %s\n", 20, "there");
-
-#ifndef GOOGLE_PROTOBUF_STUBS_STRINGPRINTF_H
-#define GOOGLE_PROTOBUF_STUBS_STRINGPRINTF_H
-
-#include <stdarg.h>
-#include <string>
-#include <vector>
-
-#include <google/protobuf/stubs/common.h>
-
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-
-// Return a C++ string
-PROTOBUF_EXPORT extern std::string StringPrintf(const char* format, ...);
-
-// Store result into a supplied string and return it
-PROTOBUF_EXPORT extern const std::string& SStringPrintf(std::string* dst,
-                                                        const char* format,
-                                                        ...);
-
-// Append result to a supplied string
-PROTOBUF_EXPORT extern void StringAppendF(std::string* dst, const char* format,
-                                          ...);
-
-// Lower-level routine that takes a va_list and appends to a specified
-// string.  All other routines are just convenience wrappers around it.
-PROTOBUF_EXPORT extern void StringAppendV(std::string* dst, const char* format,
-                                          va_list ap);
-
-// The max arguments supported by StringPrintfVector
-PROTOBUF_EXPORT extern const int kStringPrintfVectorMaxArgs;
-
-// You can use this version when all your arguments are strings, but
-// you don't know how many arguments you'll have at compile time.
-// StringPrintfVector will LOG(FATAL) if v.size() > kStringPrintfVectorMaxArgs
-PROTOBUF_EXPORT extern std::string StringPrintfVector(
-    const char* format, const std::vector<std::string>& v);
-
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
-
-#endif  // GOOGLE_PROTOBUF_STUBS_STRINGPRINTF_H
diff --git a/libs/protobuf/src/google/protobuf/stubs/stringprintf_unittest.cc b/libs/protobuf/src/google/protobuf/stubs/stringprintf_unittest.cc
deleted file mode 100644
index dbecd2b..0000000
--- a/libs/protobuf/src/google/protobuf/stubs/stringprintf_unittest.cc
+++ /dev/null
@@ -1,155 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2012 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// from google3/base/stringprintf_unittest.cc
-
-#include <google/protobuf/stubs/stringprintf.h>
-#include <google/protobuf/testing/googletest.h>
-#include <gtest/gtest.h>
-
-#include <array>
-#include <cerrno>
-#include <string>
-
-namespace google {
-namespace protobuf {
-namespace {
-
-TEST(StringPrintfTest, Empty) {
-#if 0
-  // gcc 2.95.3, gcc 4.1.0, and gcc 4.2.2 all warn about this:
-  // warning: zero-length printf format string.
-  // so we do not allow them in google3.
-  EXPECT_EQ("", StringPrintf(""));
-#endif
-  EXPECT_EQ("", StringPrintf("%s", std::string().c_str()));
-  EXPECT_EQ("", StringPrintf("%s", ""));
-}
-
-TEST(StringPrintfTest, Misc) {
-// MSVC and mingw does not support $ format specifier.
-#if !defined(_MSC_VER) && !defined(__MINGW32__)
-  EXPECT_EQ("123hello w", StringPrintf("%3$d%2$s %1$c", 'w', "hello", 123));
-#endif  // !_MSC_VER
-}
-
-TEST(StringAppendFTest, Empty) {
-  std::string value("Hello");
-  const char* empty = "";
-  StringAppendF(&value, "%s", empty);
-  EXPECT_EQ("Hello", value);
-}
-
-TEST(StringAppendFTest, EmptyString) {
-  std::string value("Hello");
-  StringAppendF(&value, "%s", "");
-  EXPECT_EQ("Hello", value);
-}
-
-TEST(StringAppendFTest, String) {
-  std::string value("Hello");
-  StringAppendF(&value, " %s", "World");
-  EXPECT_EQ("Hello World", value);
-}
-
-TEST(StringAppendFTest, Int) {
-  std::string value("Hello");
-  StringAppendF(&value, " %d", 123);
-  EXPECT_EQ("Hello 123", value);
-}
-
-TEST(StringPrintfTest, Multibyte) {
-  // If we are in multibyte mode and feed invalid multibyte sequence,
-  // StringPrintf should return an empty string instead of running
-  // out of memory while trying to determine destination buffer size.
-  // see b/4194543.
-
-  char* old_locale_c = setlocale(LC_CTYPE, nullptr);
-  ASSERT_TRUE(old_locale_c != nullptr);
-  std::string old_locale = old_locale_c;
-  // Push locale with multibyte mode
-  setlocale(LC_CTYPE, "en_US.utf8");
-
-  const char kInvalidCodePoint[] = "\375\067s";
-  std::string value = StringPrintf("%.*s", 3, kInvalidCodePoint);
-
-  // In some versions of glibc (e.g. eglibc-2.11.1, aka GRTEv2), snprintf
-  // returns error given an invalid codepoint. Other versions
-  // (e.g. eglibc-2.15, aka pre-GRTEv3) emit the codepoint verbatim.
-  // We test that the output is one of the above.
-  EXPECT_TRUE(value.empty() || value == kInvalidCodePoint);
-
-  // Repeat with longer string, to make sure that the dynamically
-  // allocated path in StringAppendV is handled correctly.
-  const size_t n = 2048;
-  std::array<char, n + 1> buf;
-  memset(&buf[0], ' ', n - 3);
-  memcpy(&buf[0] + n - 3, kInvalidCodePoint, 4);
-  value = StringPrintf("%.*s", n, &buf[0]);
-  // See GRTEv2 vs. GRTEv3 comment above.
-  EXPECT_TRUE(value.empty() || value == &buf[0]);
-
-  setlocale(LC_CTYPE, old_locale.c_str());
-}
-
-TEST(StringPrintfTest, NoMultibyte) {
-  // No multibyte handling, but the string contains funny chars.
-  char* old_locale_c = setlocale(LC_CTYPE, nullptr);
-  ASSERT_TRUE(old_locale_c != nullptr);
-  std::string old_locale = old_locale_c;
-  setlocale(LC_CTYPE, "POSIX");
-  std::string value = StringPrintf("%.*s", 3, "\375\067s");
-  setlocale(LC_CTYPE, old_locale.c_str());
-  EXPECT_EQ("\375\067s", value);
-}
-
-TEST(StringPrintfTest, DontOverwriteErrno) {
-  // Check that errno isn't overwritten unless we're printing
-  // something significantly larger than what people are normally
-  // printing in their badly written PLOG() statements.
-  errno = ECHILD;
-  std::string value = StringPrintf("Hello, %s!", "World");
-  EXPECT_EQ(ECHILD, errno);
-}
-
-TEST(StringPrintfTest, LargeBuf) {
-  // Check that the large buffer is handled correctly.
-  int n = 2048;
-  char* buf = new char[n+1];
-  memset(buf, ' ', n);
-  buf[n] = 0;
-  std::string value = StringPrintf("%s", buf);
-  EXPECT_EQ(buf, value);
-  delete[] buf;
-}
-
-}  // anonymous namespace
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/stubs/structurally_valid.cc b/libs/protobuf/src/google/protobuf/stubs/structurally_valid.cc
deleted file mode 100644
index a535736..0000000
--- a/libs/protobuf/src/google/protobuf/stubs/structurally_valid.cc
+++ /dev/null
@@ -1,617 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: jrm@google.com (Jim Meehan)
-
-#include <google/protobuf/stubs/common.h>
-
-#include <google/protobuf/stubs/stringpiece.h>
-
-namespace google {
-namespace protobuf {
-namespace internal {
-
-// These four-byte entries compactly encode how many bytes 0..255 to delete
-// in making a string replacement, how many bytes to add 0..255, and the offset
-// 0..64k-1 of the replacement string in remap_string.
-struct RemapEntry {
-  uint8_t delete_bytes;
-  uint8_t add_bytes;
-  uint16_t bytes_offset;
-};
-
-// Exit type codes for state tables. All but the first get stuffed into
-// signed one-byte entries. The first is only generated by executable code.
-// To distinguish from next-state entries, these must be contiguous and
-// all <= kExitNone
-typedef enum {
-  kExitDstSpaceFull = 239,
-  kExitIllegalStructure,  // 240
-  kExitOK,                // 241
-  kExitReject,            // ...
-  kExitReplace1,
-  kExitReplace2,
-  kExitReplace3,
-  kExitReplace21,
-  kExitReplace31,
-  kExitReplace32,
-  kExitReplaceOffset1,
-  kExitReplaceOffset2,
-  kExitReplace1S0,
-  kExitSpecial,
-  kExitDoAgain,
-  kExitRejectAlt,
-  kExitNone               // 255
-} ExitReason;
-
-
-// This struct represents one entire state table. The three initialized byte
-// areas are state_table, remap_base, and remap_string. state0 and state0_size
-// give the byte offset and length within state_table of the initial state --
-// table lookups are expected to start and end in this state, but for
-// truncated UTF-8 strings, may end in a different state. These allow a quick
-// test for that condition. entry_shift is 8 for tables subscripted by a full
-// byte value and 6 for space-optimized tables subscripted by only six
-// significant bits in UTF-8 continuation bytes.
-typedef struct {
-  const uint32_t state0;
-  const uint32_t state0_size;
-  const uint32_t total_size;
-  const int max_expand;
-  const int entry_shift;
-  const int bytes_per_entry;
-  const uint32_t losub;
-  const uint32_t hiadd;
-  const uint8_t* state_table;
-  const RemapEntry* remap_base;
-  const uint8_t* remap_string;
-  const uint8_t* fast_state;
-} UTF8StateMachineObj;
-
-typedef UTF8StateMachineObj UTF8ScanObj;
-
-#define X__ (kExitIllegalStructure)
-#define RJ_ (kExitReject)
-#define S1_ (kExitReplace1)
-#define S2_ (kExitReplace2)
-#define S3_ (kExitReplace3)
-#define S21 (kExitReplace21)
-#define S31 (kExitReplace31)
-#define S32 (kExitReplace32)
-#define T1_ (kExitReplaceOffset1)
-#define T2_ (kExitReplaceOffset2)
-#define S11 (kExitReplace1S0)
-#define SP_ (kExitSpecial)
-#define D__ (kExitDoAgain)
-#define RJA (kExitRejectAlt)
-
-//  Entire table has 9 state blocks of 256 entries each
-static const unsigned int utf8acceptnonsurrogates_STATE0 = 0;     // state[0]
-static const unsigned int utf8acceptnonsurrogates_STATE0_SIZE = 256;  // =[1]
-static const unsigned int utf8acceptnonsurrogates_TOTAL_SIZE = 2304;
-static const unsigned int utf8acceptnonsurrogates_MAX_EXPAND_X4 = 0;
-static const unsigned int utf8acceptnonsurrogates_SHIFT = 8;
-static const unsigned int utf8acceptnonsurrogates_BYTES = 1;
-static const unsigned int utf8acceptnonsurrogates_LOSUB = 0x20202020;
-static const unsigned int utf8acceptnonsurrogates_HIADD = 0x00000000;
-
-static const uint8_t utf8acceptnonsurrogates[] = {
-// state[0] 0x000000 Byte 1
-  0,   0,   0,   0,   0,   0,   0,   0,    0,   0,   0,   0,   0,   0,   0,   0,
-  0,   0,   0,   0,   0,   0,   0,   0,    0,   0,   0,   0,   0,   0,   0,   0,
-  0,   0,   0,   0,   0,   0,   0,   0,    0,   0,   0,   0,   0,   0,   0,   0,
-  0,   0,   0,   0,   0,   0,   0,   0,    0,   0,   0,   0,   0,   0,   0,   0,
-
-  0,   0,   0,   0,   0,   0,   0,   0,    0,   0,   0,   0,   0,   0,   0,   0,
-  0,   0,   0,   0,   0,   0,   0,   0,    0,   0,   0,   0,   0,   0,   0,   0,
-  0,   0,   0,   0,   0,   0,   0,   0,    0,   0,   0,   0,   0,   0,   0,   0,
-  0,   0,   0,   0,   0,   0,   0,   0,    0,   0,   0,   0,   0,   0,   0,   0,
-
-X__, X__, X__, X__, X__, X__, X__, X__,  X__, X__, X__, X__, X__, X__, X__, X__,
-X__, X__, X__, X__, X__, X__, X__, X__,  X__, X__, X__, X__, X__, X__, X__, X__,
-X__, X__, X__, X__, X__, X__, X__, X__,  X__, X__, X__, X__, X__, X__, X__, X__,
-X__, X__, X__, X__, X__, X__, X__, X__,  X__, X__, X__, X__, X__, X__, X__, X__,
-
-X__, X__,   1,   1,   1,   1,   1,   1,    1,   1,   1,   1,   1,   1,   1,   1,
-  1,   1,   1,   1,   1,   1,   1,   1,    1,   1,   1,   1,   1,   1,   1,   1,
-  2,   3,   3,   3,   3,   3,   3,   3,    3,   3,   3,   3,   3,   7,   3,   3,
-  4,   5,   5,   5,   6, X__, X__, X__,  X__, X__, X__, X__, X__, X__, X__, X__,
-
-// state[1] 0x000080 Byte 2 of 2
-X__, X__, X__, X__, X__, X__, X__, X__,  X__, X__, X__, X__, X__, X__, X__, X__,
-X__, X__, X__, X__, X__, X__, X__, X__,  X__, X__, X__, X__, X__, X__, X__, X__,
-X__, X__, X__, X__, X__, X__, X__, X__,  X__, X__, X__, X__, X__, X__, X__, X__,
-X__, X__, X__, X__, X__, X__, X__, X__,  X__, X__, X__, X__, X__, X__, X__, X__,
-
-X__, X__, X__, X__, X__, X__, X__, X__,  X__, X__, X__, X__, X__, X__, X__, X__,
-X__, X__, X__, X__, X__, X__, X__, X__,  X__, X__, X__, X__, X__, X__, X__, X__,
-X__, X__, X__, X__, X__, X__, X__, X__,  X__, X__, X__, X__, X__, X__, X__, X__,
-X__, X__, X__, X__, X__, X__, X__, X__,  X__, X__, X__, X__, X__, X__, X__, X__,
-
-  0,   0,   0,   0,   0,   0,   0,   0,    0,   0,   0,   0,   0,   0,   0,   0,
-  0,   0,   0,   0,   0,   0,   0,   0,    0,   0,   0,   0,   0,   0,   0,   0,
-  0,   0,   0,   0,   0,   0,   0,   0,    0,   0,   0,   0,   0,   0,   0,   0,
-  0,   0,   0,   0,   0,   0,   0,   0,    0,   0,   0,   0,   0,   0,   0,   0,
-
-X__, X__, X__, X__, X__, X__, X__, X__,  X__, X__, X__, X__, X__, X__, X__, X__,
-X__, X__, X__, X__, X__, X__, X__, X__,  X__, X__, X__, X__, X__, X__, X__, X__,
-X__, X__, X__, X__, X__, X__, X__, X__,  X__, X__, X__, X__, X__, X__, X__, X__,
-X__, X__, X__, X__, X__, X__, X__, X__,  X__, X__, X__, X__, X__, X__, X__, X__,
-
-// state[2] 0x000000 Byte 2 of 3
-X__, X__, X__, X__, X__, X__, X__, X__,  X__, X__, X__, X__, X__, X__, X__, X__,
-X__, X__, X__, X__, X__, X__, X__, X__,  X__, X__, X__, X__, X__, X__, X__, X__,
-X__, X__, X__, X__, X__, X__, X__, X__,  X__, X__, X__, X__, X__, X__, X__, X__,
-X__, X__, X__, X__, X__, X__, X__, X__,  X__, X__, X__, X__, X__, X__, X__, X__,
-
-X__, X__, X__, X__, X__, X__, X__, X__,  X__, X__, X__, X__, X__, X__, X__, X__,
-X__, X__, X__, X__, X__, X__, X__, X__,  X__, X__, X__, X__, X__, X__, X__, X__,
-X__, X__, X__, X__, X__, X__, X__, X__,  X__, X__, X__, X__, X__, X__, X__, X__,
-X__, X__, X__, X__, X__, X__, X__, X__,  X__, X__, X__, X__, X__, X__, X__, X__,
-
-X__, X__, X__, X__, X__, X__, X__, X__,  X__, X__, X__, X__, X__, X__, X__, X__,
-X__, X__, X__, X__, X__, X__, X__, X__,  X__, X__, X__, X__, X__, X__, X__, X__,
-  1,   1,   1,   1,   1,   1,   1,   1,    1,   1,   1,   1,   1,   1,   1,   1,
-  1,   1,   1,   1,   1,   1,   1,   1,    1,   1,   1,   1,   1,   1,   1,   1,
-
-X__, X__, X__, X__, X__, X__, X__, X__,  X__, X__, X__, X__, X__, X__, X__, X__,
-X__, X__, X__, X__, X__, X__, X__, X__,  X__, X__, X__, X__, X__, X__, X__, X__,
-X__, X__, X__, X__, X__, X__, X__, X__,  X__, X__, X__, X__, X__, X__, X__, X__,
-X__, X__, X__, X__, X__, X__, X__, X__,  X__, X__, X__, X__, X__, X__, X__, X__,
-
-// state[3] 0x001000 Byte 2 of 3
-X__, X__, X__, X__, X__, X__, X__, X__,  X__, X__, X__, X__, X__, X__, X__, X__,
-X__, X__, X__, X__, X__, X__, X__, X__,  X__, X__, X__, X__, X__, X__, X__, X__,
-X__, X__, X__, X__, X__, X__, X__, X__,  X__, X__, X__, X__, X__, X__, X__, X__,
-X__, X__, X__, X__, X__, X__, X__, X__,  X__, X__, X__, X__, X__, X__, X__, X__,
-
-X__, X__, X__, X__, X__, X__, X__, X__,  X__, X__, X__, X__, X__, X__, X__, X__,
-X__, X__, X__, X__, X__, X__, X__, X__,  X__, X__, X__, X__, X__, X__, X__, X__,
-X__, X__, X__, X__, X__, X__, X__, X__,  X__, X__, X__, X__, X__, X__, X__, X__,
-X__, X__, X__, X__, X__, X__, X__, X__,  X__, X__, X__, X__, X__, X__, X__, X__,
-
-  1,   1,   1,   1,   1,   1,   1,   1,    1,   1,   1,   1,   1,   1,   1,   1,
-  1,   1,   1,   1,   1,   1,   1,   1,    1,   1,   1,   1,   1,   1,   1,   1,
-  1,   1,   1,   1,   1,   1,   1,   1,    1,   1,   1,   1,   1,   1,   1,   1,
-  1,   1,   1,   1,   1,   1,   1,   1,    1,   1,   1,   1,   1,   1,   1,   1,
-
-X__, X__, X__, X__, X__, X__, X__, X__,  X__, X__, X__, X__, X__, X__, X__, X__,
-X__, X__, X__, X__, X__, X__, X__, X__,  X__, X__, X__, X__, X__, X__, X__, X__,
-X__, X__, X__, X__, X__, X__, X__, X__,  X__, X__, X__, X__, X__, X__, X__, X__,
-X__, X__, X__, X__, X__, X__, X__, X__,  X__, X__, X__, X__, X__, X__, X__, X__,
-
-// state[4] 0x000000 Byte 2 of 4
-X__, X__, X__, X__, X__, X__, X__, X__,  X__, X__, X__, X__, X__, X__, X__, X__,
-X__, X__, X__, X__, X__, X__, X__, X__,  X__, X__, X__, X__, X__, X__, X__, X__,
-X__, X__, X__, X__, X__, X__, X__, X__,  X__, X__, X__, X__, X__, X__, X__, X__,
-X__, X__, X__, X__, X__, X__, X__, X__,  X__, X__, X__, X__, X__, X__, X__, X__,
-
-X__, X__, X__, X__, X__, X__, X__, X__,  X__, X__, X__, X__, X__, X__, X__, X__,
-X__, X__, X__, X__, X__, X__, X__, X__,  X__, X__, X__, X__, X__, X__, X__, X__,
-X__, X__, X__, X__, X__, X__, X__, X__,  X__, X__, X__, X__, X__, X__, X__, X__,
-X__, X__, X__, X__, X__, X__, X__, X__,  X__, X__, X__, X__, X__, X__, X__, X__,
-
-X__, X__, X__, X__, X__, X__, X__, X__,  X__, X__, X__, X__, X__, X__, X__, X__,
-  3,   3,   3,   3,   3,   3,   3,   3,    3,   3,   3,   3,   3,   3,   3,   3,
-  3,   3,   3,   3,   3,   3,   3,   3,    3,   3,   3,   3,   3,   3,   3,   3,
-  3,   3,   3,   3,   3,   3,   3,   3,    3,   3,   3,   3,   3,   3,   3,   3,
-
-X__, X__, X__, X__, X__, X__, X__, X__,  X__, X__, X__, X__, X__, X__, X__, X__,
-X__, X__, X__, X__, X__, X__, X__, X__,  X__, X__, X__, X__, X__, X__, X__, X__,
-X__, X__, X__, X__, X__, X__, X__, X__,  X__, X__, X__, X__, X__, X__, X__, X__,
-X__, X__, X__, X__, X__, X__, X__, X__,  X__, X__, X__, X__, X__, X__, X__, X__,
-
-// state[5] 0x040000 Byte 2 of 4
-X__, X__, X__, X__, X__, X__, X__, X__,  X__, X__, X__, X__, X__, X__, X__, X__,
-X__, X__, X__, X__, X__, X__, X__, X__,  X__, X__, X__, X__, X__, X__, X__, X__,
-X__, X__, X__, X__, X__, X__, X__, X__,  X__, X__, X__, X__, X__, X__, X__, X__,
-X__, X__, X__, X__, X__, X__, X__, X__,  X__, X__, X__, X__, X__, X__, X__, X__,
-
-X__, X__, X__, X__, X__, X__, X__, X__,  X__, X__, X__, X__, X__, X__, X__, X__,
-X__, X__, X__, X__, X__, X__, X__, X__,  X__, X__, X__, X__, X__, X__, X__, X__,
-X__, X__, X__, X__, X__, X__, X__, X__,  X__, X__, X__, X__, X__, X__, X__, X__,
-X__, X__, X__, X__, X__, X__, X__, X__,  X__, X__, X__, X__, X__, X__, X__, X__,
-
-  3,   3,   3,   3,   3,   3,   3,   3,    3,   3,   3,   3,   3,   3,   3,   3,
-  3,   3,   3,   3,   3,   3,   3,   3,    3,   3,   3,   3,   3,   3,   3,   3,
-  3,   3,   3,   3,   3,   3,   3,   3,    3,   3,   3,   3,   3,   3,   3,   3,
-  3,   3,   3,   3,   3,   3,   3,   3,    3,   3,   3,   3,   3,   3,   3,   3,
-
-X__, X__, X__, X__, X__, X__, X__, X__,  X__, X__, X__, X__, X__, X__, X__, X__,
-X__, X__, X__, X__, X__, X__, X__, X__,  X__, X__, X__, X__, X__, X__, X__, X__,
-X__, X__, X__, X__, X__, X__, X__, X__,  X__, X__, X__, X__, X__, X__, X__, X__,
-X__, X__, X__, X__, X__, X__, X__, X__,  X__, X__, X__, X__, X__, X__, X__, X__,
-
-// state[6] 0x100000 Byte 2 of 4
-X__, X__, X__, X__, X__, X__, X__, X__,  X__, X__, X__, X__, X__, X__, X__, X__,
-X__, X__, X__, X__, X__, X__, X__, X__,  X__, X__, X__, X__, X__, X__, X__, X__,
-X__, X__, X__, X__, X__, X__, X__, X__,  X__, X__, X__, X__, X__, X__, X__, X__,
-X__, X__, X__, X__, X__, X__, X__, X__,  X__, X__, X__, X__, X__, X__, X__, X__,
-
-X__, X__, X__, X__, X__, X__, X__, X__,  X__, X__, X__, X__, X__, X__, X__, X__,
-X__, X__, X__, X__, X__, X__, X__, X__,  X__, X__, X__, X__, X__, X__, X__, X__,
-X__, X__, X__, X__, X__, X__, X__, X__,  X__, X__, X__, X__, X__, X__, X__, X__,
-X__, X__, X__, X__, X__, X__, X__, X__,  X__, X__, X__, X__, X__, X__, X__, X__,
-
-  3,   3,   3,   3,   3,   3,   3,   3,    3,   3,   3,   3,   3,   3,   3,   3,
-X__, X__, X__, X__, X__, X__, X__, X__,  X__, X__, X__, X__, X__, X__, X__, X__,
-X__, X__, X__, X__, X__, X__, X__, X__,  X__, X__, X__, X__, X__, X__, X__, X__,
-X__, X__, X__, X__, X__, X__, X__, X__,  X__, X__, X__, X__, X__, X__, X__, X__,
-
-X__, X__, X__, X__, X__, X__, X__, X__,  X__, X__, X__, X__, X__, X__, X__, X__,
-X__, X__, X__, X__, X__, X__, X__, X__,  X__, X__, X__, X__, X__, X__, X__, X__,
-X__, X__, X__, X__, X__, X__, X__, X__,  X__, X__, X__, X__, X__, X__, X__, X__,
-X__, X__, X__, X__, X__, X__, X__, X__,  X__, X__, X__, X__, X__, X__, X__, X__,
-
-// state[7] 0x00d000 Byte 2 of 3
-X__, X__, X__, X__, X__, X__, X__, X__,  X__, X__, X__, X__, X__, X__, X__, X__,
-X__, X__, X__, X__, X__, X__, X__, X__,  X__, X__, X__, X__, X__, X__, X__, X__,
-X__, X__, X__, X__, X__, X__, X__, X__,  X__, X__, X__, X__, X__, X__, X__, X__,
-X__, X__, X__, X__, X__, X__, X__, X__,  X__, X__, X__, X__, X__, X__, X__, X__,
-
-X__, X__, X__, X__, X__, X__, X__, X__,  X__, X__, X__, X__, X__, X__, X__, X__,
-X__, X__, X__, X__, X__, X__, X__, X__,  X__, X__, X__, X__, X__, X__, X__, X__,
-X__, X__, X__, X__, X__, X__, X__, X__,  X__, X__, X__, X__, X__, X__, X__, X__,
-X__, X__, X__, X__, X__, X__, X__, X__,  X__, X__, X__, X__, X__, X__, X__, X__,
-
-  1,   1,   1,   1,   1,   1,   1,   1,    1,   1,   1,   1,   1,   1,   1,   1,
-  1,   1,   1,   1,   1,   1,   1,   1,    1,   1,   1,   1,   1,   1,   1,   1,
-  8,   8,   8,   8,   8,   8,   8,   8,    8,   8,   8,   8,   8,   8,   8,   8,
-  8,   8,   8,   8,   8,   8,   8,   8,    8,   8,   8,   8,   8,   8,   8,   8,
-
-X__, X__, X__, X__, X__, X__, X__, X__,  X__, X__, X__, X__, X__, X__, X__, X__,
-X__, X__, X__, X__, X__, X__, X__, X__,  X__, X__, X__, X__, X__, X__, X__, X__,
-X__, X__, X__, X__, X__, X__, X__, X__,  X__, X__, X__, X__, X__, X__, X__, X__,
-X__, X__, X__, X__, X__, X__, X__, X__,  X__, X__, X__, X__, X__, X__, X__, X__,
-
-// state[8] 0x00d800 Byte 3 of 3
-X__, X__, X__, X__, X__, X__, X__, X__,  X__, X__, X__, X__, X__, X__, X__, X__,
-X__, X__, X__, X__, X__, X__, X__, X__,  X__, X__, X__, X__, X__, X__, X__, X__,
-X__, X__, X__, X__, X__, X__, X__, X__,  X__, X__, X__, X__, X__, X__, X__, X__,
-X__, X__, X__, X__, X__, X__, X__, X__,  X__, X__, X__, X__, X__, X__, X__, X__,
-
-X__, X__, X__, X__, X__, X__, X__, X__,  X__, X__, X__, X__, X__, X__, X__, X__,
-X__, X__, X__, X__, X__, X__, X__, X__,  X__, X__, X__, X__, X__, X__, X__, X__,
-X__, X__, X__, X__, X__, X__, X__, X__,  X__, X__, X__, X__, X__, X__, X__, X__,
-X__, X__, X__, X__, X__, X__, X__, X__,  X__, X__, X__, X__, X__, X__, X__, X__,
-
-RJ_, RJ_, RJ_, RJ_, RJ_, RJ_, RJ_, RJ_,  RJ_, RJ_, RJ_, RJ_, RJ_, RJ_, RJ_, RJ_,
-RJ_, RJ_, RJ_, RJ_, RJ_, RJ_, RJ_, RJ_,  RJ_, RJ_, RJ_, RJ_, RJ_, RJ_, RJ_, RJ_,
-RJ_, RJ_, RJ_, RJ_, RJ_, RJ_, RJ_, RJ_,  RJ_, RJ_, RJ_, RJ_, RJ_, RJ_, RJ_, RJ_,
-RJ_, RJ_, RJ_, RJ_, RJ_, RJ_, RJ_, RJ_,  RJ_, RJ_, RJ_, RJ_, RJ_, RJ_, RJ_, RJ_,
-
-X__, X__, X__, X__, X__, X__, X__, X__,  X__, X__, X__, X__, X__, X__, X__, X__,
-X__, X__, X__, X__, X__, X__, X__, X__,  X__, X__, X__, X__, X__, X__, X__, X__,
-X__, X__, X__, X__, X__, X__, X__, X__,  X__, X__, X__, X__, X__, X__, X__, X__,
-X__, X__, X__, X__, X__, X__, X__, X__,  X__, X__, X__, X__, X__, X__, X__, X__,
-};
-
-// Remap base[0] = (del, add, string_offset)
-static const RemapEntry utf8acceptnonsurrogates_remap_base[] = {
-{0, 0, 0} };
-
-// Remap string[0]
-static const unsigned char utf8acceptnonsurrogates_remap_string[] = {
-0 };
-
-static const unsigned char utf8acceptnonsurrogates_fast[256] = {
-0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0,
-0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0,
-0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0,
-0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0,
-
-0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0,
-0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0,
-0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0,
-0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0,
-
-1, 1, 1, 1, 1, 1, 1, 1,  1, 1, 1, 1, 1, 1, 1, 1,
-1, 1, 1, 1, 1, 1, 1, 1,  1, 1, 1, 1, 1, 1, 1, 1,
-1, 1, 1, 1, 1, 1, 1, 1,  1, 1, 1, 1, 1, 1, 1, 1,
-1, 1, 1, 1, 1, 1, 1, 1,  1, 1, 1, 1, 1, 1, 1, 1,
-
-1, 1, 1, 1, 1, 1, 1, 1,  1, 1, 1, 1, 1, 1, 1, 1,
-1, 1, 1, 1, 1, 1, 1, 1,  1, 1, 1, 1, 1, 1, 1, 1,
-1, 1, 1, 1, 1, 1, 1, 1,  1, 1, 1, 1, 1, 1, 1, 1,
-1, 1, 1, 1, 1, 1, 1, 1,  1, 1, 1, 1, 1, 1, 1, 1,
-};
-
-static const UTF8ScanObj utf8acceptnonsurrogates_obj = {
-  utf8acceptnonsurrogates_STATE0,
-  utf8acceptnonsurrogates_STATE0_SIZE,
-  utf8acceptnonsurrogates_TOTAL_SIZE,
-  utf8acceptnonsurrogates_MAX_EXPAND_X4,
-  utf8acceptnonsurrogates_SHIFT,
-  utf8acceptnonsurrogates_BYTES,
-  utf8acceptnonsurrogates_LOSUB,
-  utf8acceptnonsurrogates_HIADD,
-  utf8acceptnonsurrogates,
-  utf8acceptnonsurrogates_remap_base,
-  utf8acceptnonsurrogates_remap_string,
-  utf8acceptnonsurrogates_fast
-};
-
-
-#undef X__
-#undef RJ_
-#undef S1_
-#undef S2_
-#undef S3_
-#undef S21
-#undef S31
-#undef S32
-#undef T1_
-#undef T2_
-#undef S11
-#undef SP_
-#undef D__
-#undef RJA
-
-// Return true if current Tbl pointer is within state0 range
-// Note that unsigned compare checks both ends of range simultaneously
-static inline bool InStateZero(const UTF8ScanObj* st, const uint8_t* Tbl) {
-  const uint8_t* Tbl0 = &st->state_table[st->state0];
-  return (static_cast<uint32_t>(Tbl - Tbl0) < st->state0_size);
-}
-
-namespace {
-
-// Scan a UTF-8 string based on state table.
-// Always scan complete UTF-8 characters
-// Set number of bytes scanned. Return reason for exiting
-int UTF8GenericScan(const UTF8ScanObj* st,
-                    const char * str,
-                    int str_length,
-                    int* bytes_consumed) {
-  *bytes_consumed = 0;
-  if (str_length == 0) return kExitOK;
-
-  int eshift = st->entry_shift;
-  const uint8_t* isrc = reinterpret_cast<const uint8_t*>(str);
-  const uint8_t* src = isrc;
-  const uint8_t* srclimit = isrc + str_length;
-  const uint8_t* srclimit8 = str_length < 7 ? isrc : srclimit - 7;
-  const uint8_t* Tbl_0 = &st->state_table[st->state0];
-
- DoAgain:
-  // Do state-table scan
-  int e = 0;
-  uint8_t c;
-  const uint8_t* Tbl2 = &st->fast_state[0];
-  const uint32_t losub = st->losub;
-  const uint32_t hiadd = st->hiadd;
-  // Check initial few bytes one at a time until 8-byte aligned
-  //----------------------------
-  while ((((uintptr_t)src & 0x07) != 0) &&
-         (src < srclimit) &&
-         Tbl2[src[0]] == 0) {
-    src++;
-  }
-  if (((uintptr_t)src & 0x07) == 0) {
-    // Do fast for groups of 8 identity bytes.
-    // This covers a lot of 7-bit ASCII ~8x faster then the 1-byte loop,
-    // including slowing slightly on cr/lf/ht
-    //----------------------------
-    while (src < srclimit8) {
-      uint32_t s0123 = (reinterpret_cast<const uint32_t *>(src))[0];
-      uint32_t s4567 = (reinterpret_cast<const uint32_t *>(src))[1];
-      src += 8;
-      // This is a fast range check for all bytes in [lowsub..0x80-hiadd)
-      uint32_t temp = (s0123 - losub) | (s0123 + hiadd) |
-                      (s4567 - losub) | (s4567 + hiadd);
-      if ((temp & 0x80808080) != 0) {
-        // We typically end up here on cr/lf/ht; src was incremented
-        int e0123 = (Tbl2[src[-8]] | Tbl2[src[-7]]) |
-                    (Tbl2[src[-6]] | Tbl2[src[-5]]);
-        if (e0123 != 0) {
-          src -= 8;
-          break;
-        }    // Exit on Non-interchange
-        e0123 = (Tbl2[src[-4]] | Tbl2[src[-3]]) |
-                (Tbl2[src[-2]] | Tbl2[src[-1]]);
-        if (e0123 != 0) {
-          src -= 4;
-          break;
-        }    // Exit on Non-interchange
-        // Else OK, go around again
-      }
-    }
-  }
-  //----------------------------
-
-  // Byte-at-a-time scan
-  //----------------------------
-  const uint8_t* Tbl = Tbl_0;
-  while (src < srclimit) {
-    c = *src;
-    e = Tbl[c];
-    src++;
-    if (e >= kExitIllegalStructure) {break;}
-    Tbl = &Tbl_0[e << eshift];
-  }
-  //----------------------------
-
-  // Exit possibilities:
-  //  Some exit code, !state0, back up over last char
-  //  Some exit code, state0, back up one byte exactly
-  //  source consumed, !state0, back up over partial char
-  //  source consumed, state0, exit OK
-  // For illegal byte in state0, avoid backup up over PREVIOUS char
-  // For truncated last char, back up to beginning of it
-
-  if (e >= kExitIllegalStructure) {
-    // Back up over exactly one byte of rejected/illegal UTF-8 character
-    src--;
-    // Back up more if needed
-    if (!InStateZero(st, Tbl)) {
-      do {
-        src--;
-      } while ((src > isrc) && ((src[0] & 0xc0) == 0x80));
-    }
-  } else if (!InStateZero(st, Tbl)) {
-    // Back up over truncated UTF-8 character
-    e = kExitIllegalStructure;
-    do {
-      src--;
-    } while ((src > isrc) && ((src[0] & 0xc0) == 0x80));
-  } else {
-    // Normal termination, source fully consumed
-    e = kExitOK;
-  }
-
-  if (e == kExitDoAgain) {
-    // Loop back up to the fast scan
-    goto DoAgain;
-  }
-
-  *bytes_consumed = src - isrc;
-  return e;
-}
-
-int UTF8GenericScanFastAscii(const UTF8ScanObj* st,
-                    const char * str,
-                    int str_length,
-                    int* bytes_consumed) {
-  *bytes_consumed = 0;
-  if (str_length == 0) return kExitOK;
-
-  const uint8_t* isrc =  reinterpret_cast<const uint8_t*>(str);
-  const uint8_t* src = isrc;
-  const uint8_t* srclimit = isrc + str_length;
-  const uint8_t* srclimit8 = str_length < 7 ? isrc : srclimit - 7;
-  int n;
-  int rest_consumed;
-  int exit_reason;
-  do {
-    // Check initial few bytes one at a time until 8-byte aligned
-    while ((((uintptr_t)src & 0x07) != 0) &&
-           (src < srclimit) && (src[0] < 0x80)) {
-      src++;
-    }
-    if (((uintptr_t)src & 0x07) == 0) {
-      while ((src < srclimit8) &&
-             (((reinterpret_cast<const uint32_t*>(src)[0] |
-                reinterpret_cast<const uint32_t*>(src)[1]) &
-               0x80808080) == 0)) {
-        src += 8;
-      }
-    }
-    while ((src < srclimit) && (src[0] < 0x80)) {
-      src++;
-    }
-    // Run state table on the rest
-    n = src - isrc;
-    exit_reason = UTF8GenericScan(st, str + n, str_length - n, &rest_consumed);
-    src += rest_consumed;
-  } while ( exit_reason == kExitDoAgain );
-
-  *bytes_consumed = src - isrc;
-  return exit_reason;
-}
-
-// Hack:  On some compilers the static tables are initialized at startup.
-//   We can't use them until they are initialized.  However, some Protocol
-//   Buffer parsing happens at static init time and may try to validate
-//   UTF-8 strings.  Since UTF-8 validation is only used for debugging
-//   anyway, we simply always return success if initialization hasn't
-//   occurred yet.
-
-bool module_initialized_ = false;
-
-struct InitDetector {
-  InitDetector() {
-    module_initialized_ = true;
-  }
-};
-InitDetector init_detector;
-
-}  // namespace
-
-bool IsStructurallyValidUTF8(const char* buf, int len) {
-  if (!module_initialized_) return true;
-
-  int bytes_consumed = 0;
-  UTF8GenericScanFastAscii(&utf8acceptnonsurrogates_obj,
-                           buf, len, &bytes_consumed);
-  return (bytes_consumed == len);
-}
-
-int UTF8SpnStructurallyValid(StringPiece str) {
-  if (!module_initialized_) return str.size();
-
-  int bytes_consumed = 0;
-  UTF8GenericScanFastAscii(&utf8acceptnonsurrogates_obj,
-                           str.data(), str.size(), &bytes_consumed);
-  return bytes_consumed;
-}
-
-// Coerce UTF-8 byte string in src_str to be
-// a structurally-valid equal-length string by selectively
-// overwriting illegal bytes with replace_char (typically blank).
-// replace_char must be legal printable 7-bit Ascii 0x20..0x7e.
-// src_str is read-only. If any overwriting is needed, a modified byte string
-// is created in idst, length isrclen.
-//
-// Returns pointer to output buffer, isrc if no changes were made,
-//  or idst if some bytes were changed.
-//
-// Fast case: all is structurally valid and no byte copying is done.
-//
-char* UTF8CoerceToStructurallyValid(StringPiece src_str, char* idst,
-                                    const char replace_char) {
-  const char* isrc = src_str.data();
-  const int len = src_str.length();
-  int n = UTF8SpnStructurallyValid(src_str);
-  if (n == len) {               // Normal case -- all is cool, return
-    return const_cast<char*>(isrc);
-  } else {                      // Unusual case -- copy w/o bad bytes
-    const char* src = isrc;
-    const char* srclimit = isrc + len;
-    char* dst = idst;
-    memmove(dst, src, n);       // Copy initial good chunk
-    src += n;
-    dst += n;
-    while (src < srclimit) {    // src points to bogus byte or is off the end
-      dst[0] = replace_char;                    // replace one bad byte
-      src++;
-      dst++;
-      StringPiece str2(src, srclimit - src);
-      n = UTF8SpnStructurallyValid(str2);       // scan the remainder
-      memmove(dst, src, n);                     // copy next good chunk
-      src += n;
-      dst += n;
-    }
-  }
-  return idst;
-}
-
-}  // namespace internal
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/stubs/structurally_valid_unittest.cc b/libs/protobuf/src/google/protobuf/stubs/structurally_valid_unittest.cc
deleted file mode 100644
index ebd9c42..0000000
--- a/libs/protobuf/src/google/protobuf/stubs/structurally_valid_unittest.cc
+++ /dev/null
@@ -1,71 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Copyright 2008 Google Inc. All Rights Reserved.
-// Author: xpeng@google.com (Peter Peng)
-
-#include <google/protobuf/stubs/common.h>
-#include <gtest/gtest.h>
-
-namespace google {
-namespace protobuf {
-namespace internal {
-namespace {
-
-TEST(StructurallyValidTest, ValidUTF8String) {
-  // On GCC, this string can be written as:
-  //   "abcd 1234 - \u2014\u2013\u2212"
-  // MSVC seems to interpret \u differently.
-  std::string valid_str(
-      "abcd 1234 - \342\200\224\342\200\223\342\210\222 - xyz789");
-  EXPECT_TRUE(IsStructurallyValidUTF8(valid_str.data(),
-                                      valid_str.size()));
-  // Additional check for pointer alignment
-  for (int i = 1; i < 8; ++i) {
-    EXPECT_TRUE(IsStructurallyValidUTF8(valid_str.data() + i,
-                                        valid_str.size() - i));
-  }
-}
-
-TEST(StructurallyValidTest, InvalidUTF8String) {
-  const std::string invalid_str("abcd\xA0\xB0\xA0\xB0\xA0\xB0 - xyz789");
-  EXPECT_FALSE(IsStructurallyValidUTF8(invalid_str.data(),
-                                       invalid_str.size()));
-  // Additional check for pointer alignment
-  for (int i = 1; i < 8; ++i) {
-    EXPECT_FALSE(IsStructurallyValidUTF8(invalid_str.data() + i,
-                                         invalid_str.size() - i));
-  }
-}
-
-}  // namespace
-}  // namespace internal
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/stubs/strutil.cc b/libs/protobuf/src/google/protobuf/stubs/strutil.cc
deleted file mode 100644
index 594c8ea..0000000
--- a/libs/protobuf/src/google/protobuf/stubs/strutil.cc
+++ /dev/null
@@ -1,2479 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// from google3/strings/strutil.cc
-
-#include <google/protobuf/stubs/strutil.h>
-
-#include <errno.h>
-#include <float.h>    // FLT_DIG and DBL_DIG
-#include <limits.h>
-#include <stdio.h>
-#include <cmath>
-#include <iterator>
-#include <limits>
-
-#include <google/protobuf/stubs/logging.h>
-#include <google/protobuf/stubs/stl_util.h>
-
-#ifdef _WIN32
-// MSVC has only _snprintf, not snprintf.
-//
-// MinGW has both snprintf and _snprintf, but they appear to be different
-// functions.  The former is buggy.  When invoked like so:
-//   char buffer[32];
-//   snprintf(buffer, 32, "%.*g\n", FLT_DIG, 1.23e10f);
-// it prints "1.23000e+10".  This is plainly wrong:  %g should never print
-// trailing zeros after the decimal point.  For some reason this bug only
-// occurs with some input values, not all.  In any case, _snprintf does the
-// right thing, so we use it.
-#define snprintf _snprintf
-#endif
-
-namespace google {
-namespace protobuf {
-
-// These are defined as macros on some platforms.  #undef them so that we can
-// redefine them.
-#undef isxdigit
-#undef isprint
-
-// The definitions of these in ctype.h change based on locale.  Since our
-// string manipulation is all in relation to the protocol buffer and C++
-// languages, we always want to use the C locale.  So, we re-define these
-// exactly as we want them.
-inline bool isxdigit(char c) {
-  return ('0' <= c && c <= '9') ||
-         ('a' <= c && c <= 'f') ||
-         ('A' <= c && c <= 'F');
-}
-
-inline bool isprint(char c) {
-  return c >= 0x20 && c <= 0x7E;
-}
-
-// ----------------------------------------------------------------------
-// ReplaceCharacters
-//    Replaces any occurrence of the character 'remove' (or the characters
-//    in 'remove') with the character 'replacewith'.
-// ----------------------------------------------------------------------
-void ReplaceCharacters(std::string *s, const char *remove, char replacewith) {
-  const char *str_start = s->c_str();
-  const char *str = str_start;
-  for (str = strpbrk(str, remove);
-       str != nullptr;
-       str = strpbrk(str + 1, remove)) {
-    (*s)[str - str_start] = replacewith;
-  }
-}
-
-void StripWhitespace(std::string *str) {
-  int str_length = str->length();
-
-  // Strip off leading whitespace.
-  int first = 0;
-  while (first < str_length && ascii_isspace(str->at(first))) {
-    ++first;
-  }
-  // If entire string is white space.
-  if (first == str_length) {
-    str->clear();
-    return;
-  }
-  if (first > 0) {
-    str->erase(0, first);
-    str_length -= first;
-  }
-
-  // Strip off trailing whitespace.
-  int last = str_length - 1;
-  while (last >= 0 && ascii_isspace(str->at(last))) {
-    --last;
-  }
-  if (last != (str_length - 1) && last >= 0) {
-    str->erase(last + 1, std::string::npos);
-  }
-}
-
-// ----------------------------------------------------------------------
-// StringReplace()
-//    Replace the "old" pattern with the "new" pattern in a string,
-//    and append the result to "res".  If replace_all is false,
-//    it only replaces the first instance of "old."
-// ----------------------------------------------------------------------
-
-void StringReplace(const std::string &s, const std::string &oldsub,
-                   const std::string &newsub, bool replace_all,
-                   std::string *res) {
-  if (oldsub.empty()) {
-    res->append(s);  // if empty, append the given string.
-    return;
-  }
-
-  std::string::size_type start_pos = 0;
-  std::string::size_type pos;
-  do {
-    pos = s.find(oldsub, start_pos);
-    if (pos == std::string::npos) {
-      break;
-    }
-    res->append(s, start_pos, pos - start_pos);
-    res->append(newsub);
-    start_pos = pos + oldsub.size();  // start searching again after the "old"
-  } while (replace_all);
-  res->append(s, start_pos, s.length() - start_pos);
-}
-
-// ----------------------------------------------------------------------
-// StringReplace()
-//    Give me a string and two patterns "old" and "new", and I replace
-//    the first instance of "old" in the string with "new", if it
-//    exists.  If "global" is true; call this repeatedly until it
-//    fails.  RETURN a new string, regardless of whether the replacement
-//    happened or not.
-// ----------------------------------------------------------------------
-
-std::string StringReplace(const std::string &s, const std::string &oldsub,
-                          const std::string &newsub, bool replace_all) {
-  std::string ret;
-  StringReplace(s, oldsub, newsub, replace_all, &ret);
-  return ret;
-}
-
-// ----------------------------------------------------------------------
-// SplitStringUsing()
-//    Split a string using a character delimiter. Append the components
-//    to 'result'.
-//
-// Note: For multi-character delimiters, this routine will split on *ANY* of
-// the characters in the string, not the entire string as a single delimiter.
-// ----------------------------------------------------------------------
-template <typename ITR>
-static inline void SplitStringToIteratorUsing(StringPiece full,
-                                              const char *delim, ITR &result) {
-  // Optimize the common case where delim is a single character.
-  if (delim[0] != '\0' && delim[1] == '\0') {
-    char c = delim[0];
-    const char* p = full.data();
-    const char* end = p + full.size();
-    while (p != end) {
-      if (*p == c) {
-        ++p;
-      } else {
-        const char* start = p;
-        while (++p != end && *p != c);
-        *result++ = std::string(start, p - start);
-      }
-    }
-    return;
-  }
-
-  std::string::size_type begin_index, end_index;
-  begin_index = full.find_first_not_of(delim);
-  while (begin_index != std::string::npos) {
-    end_index = full.find_first_of(delim, begin_index);
-    if (end_index == std::string::npos) {
-      *result++ = std::string(full.substr(begin_index));
-      return;
-    }
-    *result++ =
-        std::string(full.substr(begin_index, (end_index - begin_index)));
-    begin_index = full.find_first_not_of(delim, end_index);
-  }
-}
-
-void SplitStringUsing(StringPiece full, const char *delim,
-                      std::vector<std::string> *result) {
-  std::back_insert_iterator<std::vector<std::string> > it(*result);
-  SplitStringToIteratorUsing(full, delim, it);
-}
-
-// Split a string using a character delimiter. Append the components
-// to 'result'.  If there are consecutive delimiters, this function
-// will return corresponding empty strings. The string is split into
-// at most the specified number of pieces greedily. This means that the
-// last piece may possibly be split further. To split into as many pieces
-// as possible, specify 0 as the number of pieces.
-//
-// If "full" is the empty string, yields an empty string as the only value.
-//
-// If "pieces" is negative for some reason, it returns the whole string
-// ----------------------------------------------------------------------
-template <typename ITR>
-static inline void SplitStringToIteratorAllowEmpty(StringPiece full,
-                                                   const char *delim,
-                                                   int pieces, ITR &result) {
-  std::string::size_type begin_index, end_index;
-  begin_index = 0;
-
-  for (int i = 0; (i < pieces-1) || (pieces == 0); i++) {
-    end_index = full.find_first_of(delim, begin_index);
-    if (end_index == std::string::npos) {
-      *result++ = std::string(full.substr(begin_index));
-      return;
-    }
-    *result++ =
-        std::string(full.substr(begin_index, (end_index - begin_index)));
-    begin_index = end_index + 1;
-  }
-  *result++ = std::string(full.substr(begin_index));
-}
-
-void SplitStringAllowEmpty(StringPiece full, const char *delim,
-                           std::vector<std::string> *result) {
-  std::back_insert_iterator<std::vector<std::string> > it(*result);
-  SplitStringToIteratorAllowEmpty(full, delim, 0, it);
-}
-
-// ----------------------------------------------------------------------
-// JoinStrings()
-//    This merges a vector of string components with delim inserted
-//    as separaters between components.
-//
-// ----------------------------------------------------------------------
-template <class ITERATOR>
-static void JoinStringsIterator(const ITERATOR &start, const ITERATOR &end,
-                                const char *delim, std::string *result) {
-  GOOGLE_CHECK(result != nullptr);
-  result->clear();
-  int delim_length = strlen(delim);
-
-  // Precompute resulting length so we can reserve() memory in one shot.
-  int length = 0;
-  for (ITERATOR iter = start; iter != end; ++iter) {
-    if (iter != start) {
-      length += delim_length;
-    }
-    length += iter->size();
-  }
-  result->reserve(length);
-
-  // Now combine everything.
-  for (ITERATOR iter = start; iter != end; ++iter) {
-    if (iter != start) {
-      result->append(delim, delim_length);
-    }
-    result->append(iter->data(), iter->size());
-  }
-}
-
-void JoinStrings(const std::vector<std::string> &components, const char *delim,
-                 std::string *result) {
-  JoinStringsIterator(components.begin(), components.end(), delim, result);
-}
-
-// ----------------------------------------------------------------------
-// UnescapeCEscapeSequences()
-//    This does all the unescaping that C does: \ooo, \r, \n, etc
-//    Returns length of resulting string.
-//    The implementation of \x parses any positive number of hex digits,
-//    but it is an error if the value requires more than 8 bits, and the
-//    result is truncated to 8 bits.
-//
-//    The second call stores its errors in a supplied string vector.
-//    If the string vector pointer is nullptr, it reports the errors with LOG().
-// ----------------------------------------------------------------------
-
-#define IS_OCTAL_DIGIT(c) (((c) >= '0') && ((c) <= '7'))
-
-// Protocol buffers doesn't ever care about errors, but I don't want to remove
-// the code.
-#define LOG_STRING(LEVEL, VECTOR) GOOGLE_LOG_IF(LEVEL, false)
-
-int UnescapeCEscapeSequences(const char* source, char* dest) {
-  return UnescapeCEscapeSequences(source, dest, nullptr);
-}
-
-int UnescapeCEscapeSequences(const char *source, char *dest,
-                             std::vector<std::string> *errors) {
-  GOOGLE_DCHECK(errors == nullptr) << "Error reporting not implemented.";
-
-  char* d = dest;
-  const char* p = source;
-
-  // Small optimization for case where source = dest and there's no escaping
-  while ( p == d && *p != '\0' && *p != '\\' )
-    p++, d++;
-
-  while (*p != '\0') {
-    if (*p != '\\') {
-      *d++ = *p++;
-    } else {
-      switch ( *++p ) {                    // skip past the '\\'
-        case '\0':
-          LOG_STRING(ERROR, errors) << "String cannot end with \\";
-          *d = '\0';
-          return d - dest;   // we're done with p
-        case 'a':  *d++ = '\a';  break;
-        case 'b':  *d++ = '\b';  break;
-        case 'f':  *d++ = '\f';  break;
-        case 'n':  *d++ = '\n';  break;
-        case 'r':  *d++ = '\r';  break;
-        case 't':  *d++ = '\t';  break;
-        case 'v':  *d++ = '\v';  break;
-        case '\\': *d++ = '\\';  break;
-        case '?':  *d++ = '\?';  break;    // \?  Who knew?
-        case '\'': *d++ = '\'';  break;
-        case '"':  *d++ = '\"';  break;
-        case '0': case '1': case '2': case '3':  // octal digit: 1 to 3 digits
-        case '4': case '5': case '6': case '7': {
-          char ch = *p - '0';
-          if ( IS_OCTAL_DIGIT(p[1]) )
-            ch = ch * 8 + *++p - '0';
-          if ( IS_OCTAL_DIGIT(p[1]) )      // safe (and easy) to do this twice
-            ch = ch * 8 + *++p - '0';      // now points at last digit
-          *d++ = ch;
-          break;
-        }
-        case 'x': case 'X': {
-          if (!isxdigit(p[1])) {
-            if (p[1] == '\0') {
-              LOG_STRING(ERROR, errors) << "String cannot end with \\x";
-            } else {
-              LOG_STRING(ERROR, errors) <<
-                "\\x cannot be followed by non-hex digit: \\" << *p << p[1];
-            }
-            break;
-          }
-          unsigned int ch = 0;
-          const char *hex_start = p;
-          while (isxdigit(p[1]))  // arbitrarily many hex digits
-            ch = (ch << 4) + hex_digit_to_int(*++p);
-          if (ch > 0xFF)
-            LOG_STRING(ERROR, errors)
-                << "Value of "
-                << "\\" << std::string(hex_start, p + 1 - hex_start)
-                << " exceeds 8 bits";
-          *d++ = ch;
-          break;
-        }
-#if 0  // TODO(kenton):  Support \u and \U?  Requires runetochar().
-        case 'u': {
-          // \uhhhh => convert 4 hex digits to UTF-8
-          char32 rune = 0;
-          const char *hex_start = p;
-          for (int i = 0; i < 4; ++i) {
-            if (isxdigit(p[1])) {  // Look one char ahead.
-              rune = (rune << 4) + hex_digit_to_int(*++p);  // Advance p.
-            } else {
-              LOG_STRING(ERROR, errors)
-                << "\\u must be followed by 4 hex digits: \\"
-                <<  std::string(hex_start, p+1-hex_start);
-              break;
-            }
-          }
-          d += runetochar(d, &rune);
-          break;
-        }
-        case 'U': {
-          // \Uhhhhhhhh => convert 8 hex digits to UTF-8
-          char32 rune = 0;
-          const char *hex_start = p;
-          for (int i = 0; i < 8; ++i) {
-            if (isxdigit(p[1])) {  // Look one char ahead.
-              // Don't change rune until we're sure this
-              // is within the Unicode limit, but do advance p.
-              char32 newrune = (rune << 4) + hex_digit_to_int(*++p);
-              if (newrune > 0x10FFFF) {
-                LOG_STRING(ERROR, errors)
-                  << "Value of \\"
-                  << std::string(hex_start, p + 1 - hex_start)
-                  << " exceeds Unicode limit (0x10FFFF)";
-                break;
-              } else {
-                rune = newrune;
-              }
-            } else {
-              LOG_STRING(ERROR, errors)
-                << "\\U must be followed by 8 hex digits: \\"
-                <<  std::string(hex_start, p+1-hex_start);
-              break;
-            }
-          }
-          d += runetochar(d, &rune);
-          break;
-        }
-#endif
-        default:
-          LOG_STRING(ERROR, errors) << "Unknown escape sequence: \\" << *p;
-      }
-      p++;                                 // read past letter we escaped
-    }
-  }
-  *d = '\0';
-  return d - dest;
-}
-
-// ----------------------------------------------------------------------
-// UnescapeCEscapeString()
-//    This does the same thing as UnescapeCEscapeSequences, but creates
-//    a new string. The caller does not need to worry about allocating
-//    a dest buffer. This should be used for non performance critical
-//    tasks such as printing debug messages. It is safe for src and dest
-//    to be the same.
-//
-//    The second call stores its errors in a supplied string vector.
-//    If the string vector pointer is nullptr, it reports the errors with LOG().
-//
-//    In the first and second calls, the length of dest is returned. In the
-//    the third call, the new string is returned.
-// ----------------------------------------------------------------------
-int UnescapeCEscapeString(const std::string &src, std::string *dest) {
-  return UnescapeCEscapeString(src, dest, nullptr);
-}
-
-int UnescapeCEscapeString(const std::string &src, std::string *dest,
-                          std::vector<std::string> *errors) {
-  std::unique_ptr<char[]> unescaped(new char[src.size() + 1]);
-  int len = UnescapeCEscapeSequences(src.c_str(), unescaped.get(), errors);
-  GOOGLE_CHECK(dest);
-  dest->assign(unescaped.get(), len);
-  return len;
-}
-
-std::string UnescapeCEscapeString(const std::string &src) {
-  std::unique_ptr<char[]> unescaped(new char[src.size() + 1]);
-  int len = UnescapeCEscapeSequences(src.c_str(), unescaped.get(), nullptr);
-  return std::string(unescaped.get(), len);
-}
-
-// ----------------------------------------------------------------------
-// CEscapeString()
-// CHexEscapeString()
-//    Copies 'src' to 'dest', escaping dangerous characters using
-//    C-style escape sequences. This is very useful for preparing query
-//    flags. 'src' and 'dest' should not overlap. The 'Hex' version uses
-//    hexadecimal rather than octal sequences.
-//    Returns the number of bytes written to 'dest' (not including the \0)
-//    or -1 if there was insufficient space.
-//
-//    Currently only \n, \r, \t, ", ', \ and !isprint() chars are escaped.
-// ----------------------------------------------------------------------
-int CEscapeInternal(const char* src, int src_len, char* dest,
-                    int dest_len, bool use_hex, bool utf8_safe) {
-  const char* src_end = src + src_len;
-  int used = 0;
-  bool last_hex_escape = false; // true if last output char was \xNN
-
-  for (; src < src_end; src++) {
-    if (dest_len - used < 2)   // Need space for two letter escape
-      return -1;
-
-    bool is_hex_escape = false;
-    switch (*src) {
-      case '\n': dest[used++] = '\\'; dest[used++] = 'n';  break;
-      case '\r': dest[used++] = '\\'; dest[used++] = 'r';  break;
-      case '\t': dest[used++] = '\\'; dest[used++] = 't';  break;
-      case '\"': dest[used++] = '\\'; dest[used++] = '\"'; break;
-      case '\'': dest[used++] = '\\'; dest[used++] = '\''; break;
-      case '\\': dest[used++] = '\\'; dest[used++] = '\\'; break;
-      default:
-        // Note that if we emit \xNN and the src character after that is a hex
-        // digit then that digit must be escaped too to prevent it being
-        // interpreted as part of the character code by C.
-        if ((!utf8_safe || static_cast<uint8_t>(*src) < 0x80) &&
-            (!isprint(*src) ||
-             (last_hex_escape && isxdigit(*src)))) {
-          if (dest_len - used < 4) // need space for 4 letter escape
-            return -1;
-          sprintf(dest + used, (use_hex ? "\\x%02x" : "\\%03o"),
-                  static_cast<uint8_t>(*src));
-          is_hex_escape = use_hex;
-          used += 4;
-        } else {
-          dest[used++] = *src; break;
-        }
-    }
-    last_hex_escape = is_hex_escape;
-  }
-
-  if (dest_len - used < 1)   // make sure that there is room for \0
-    return -1;
-
-  dest[used] = '\0';   // doesn't count towards return value though
-  return used;
-}
-
-// Calculates the length of the C-style escaped version of 'src'.
-// Assumes that non-printable characters are escaped using octal sequences, and
-// that UTF-8 bytes are not handled specially.
-static inline size_t CEscapedLength(StringPiece src) {
-  static char c_escaped_len[256] = {
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 2, 2, 4, 4, 2, 4, 4,  // \t, \n, \r
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    1, 1, 2, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1,  // ", '
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  // '0'..'9'
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  // 'A'..'O'
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1,  // 'P'..'Z', '\'
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,  // 'a'..'o'
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 4,  // 'p'..'z', DEL
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-  };
-
-  size_t escaped_len = 0;
-  for (StringPiece::size_type i = 0; i < src.size(); ++i) {
-    unsigned char c = static_cast<unsigned char>(src[i]);
-    escaped_len += c_escaped_len[c];
-  }
-  return escaped_len;
-}
-
-// ----------------------------------------------------------------------
-// Escapes 'src' using C-style escape sequences, and appends the escaped string
-// to 'dest'. This version is faster than calling CEscapeInternal as it computes
-// the required space using a lookup table, and also does not do any special
-// handling for Hex or UTF-8 characters.
-// ----------------------------------------------------------------------
-void CEscapeAndAppend(StringPiece src, std::string *dest) {
-  size_t escaped_len = CEscapedLength(src);
-  if (escaped_len == src.size()) {
-    dest->append(src.data(), src.size());
-    return;
-  }
-
-  size_t cur_dest_len = dest->size();
-  dest->resize(cur_dest_len + escaped_len);
-  char* append_ptr = &(*dest)[cur_dest_len];
-
-  for (StringPiece::size_type i = 0; i < src.size(); ++i) {
-    unsigned char c = static_cast<unsigned char>(src[i]);
-    switch (c) {
-      case '\n': *append_ptr++ = '\\'; *append_ptr++ = 'n'; break;
-      case '\r': *append_ptr++ = '\\'; *append_ptr++ = 'r'; break;
-      case '\t': *append_ptr++ = '\\'; *append_ptr++ = 't'; break;
-      case '\"': *append_ptr++ = '\\'; *append_ptr++ = '\"'; break;
-      case '\'': *append_ptr++ = '\\'; *append_ptr++ = '\''; break;
-      case '\\': *append_ptr++ = '\\'; *append_ptr++ = '\\'; break;
-      default:
-        if (!isprint(c)) {
-          *append_ptr++ = '\\';
-          *append_ptr++ = '0' + c / 64;
-          *append_ptr++ = '0' + (c % 64) / 8;
-          *append_ptr++ = '0' + c % 8;
-        } else {
-          *append_ptr++ = c;
-        }
-        break;
-    }
-  }
-}
-
-std::string CEscape(const std::string &src) {
-  std::string dest;
-  CEscapeAndAppend(src, &dest);
-  return dest;
-}
-
-namespace strings {
-
-std::string Utf8SafeCEscape(const std::string &src) {
-  const int dest_length = src.size() * 4 + 1; // Maximum possible expansion
-  std::unique_ptr<char[]> dest(new char[dest_length]);
-  const int len = CEscapeInternal(src.data(), src.size(),
-                                  dest.get(), dest_length, false, true);
-  GOOGLE_DCHECK_GE(len, 0);
-  return std::string(dest.get(), len);
-}
-
-std::string CHexEscape(const std::string &src) {
-  const int dest_length = src.size() * 4 + 1; // Maximum possible expansion
-  std::unique_ptr<char[]> dest(new char[dest_length]);
-  const int len = CEscapeInternal(src.data(), src.size(),
-                                  dest.get(), dest_length, true, false);
-  GOOGLE_DCHECK_GE(len, 0);
-  return std::string(dest.get(), len);
-}
-
-}  // namespace strings
-
-// ----------------------------------------------------------------------
-// strto32_adaptor()
-// strtou32_adaptor()
-//    Implementation of strto[u]l replacements that have identical
-//    overflow and underflow characteristics for both ILP-32 and LP-64
-//    platforms, including errno preservation in error-free calls.
-// ----------------------------------------------------------------------
-
-int32_t strto32_adaptor(const char *nptr, char **endptr, int base) {
-  const int saved_errno = errno;
-  errno = 0;
-  const long result = strtol(nptr, endptr, base);
-  if (errno == ERANGE && result == LONG_MIN) {
-    return std::numeric_limits<int32_t>::min();
-  } else if (errno == ERANGE && result == LONG_MAX) {
-    return std::numeric_limits<int32_t>::max();
-  } else if (errno == 0 && result < std::numeric_limits<int32_t>::min()) {
-    errno = ERANGE;
-    return std::numeric_limits<int32_t>::min();
-  } else if (errno == 0 && result > std::numeric_limits<int32_t>::max()) {
-    errno = ERANGE;
-    return std::numeric_limits<int32_t>::max();
-  }
-  if (errno == 0)
-    errno = saved_errno;
-  return static_cast<int32_t>(result);
-}
-
-uint32_t strtou32_adaptor(const char *nptr, char **endptr, int base) {
-  const int saved_errno = errno;
-  errno = 0;
-  const unsigned long result = strtoul(nptr, endptr, base);
-  if (errno == ERANGE && result == ULONG_MAX) {
-    return std::numeric_limits<uint32_t>::max();
-  } else if (errno == 0 && result > std::numeric_limits<uint32_t>::max()) {
-    errno = ERANGE;
-    return std::numeric_limits<uint32_t>::max();
-  }
-  if (errno == 0)
-    errno = saved_errno;
-  return static_cast<uint32_t>(result);
-}
-
-inline bool safe_parse_sign(std::string *text /*inout*/,
-                            bool *negative_ptr /*output*/) {
-  const char* start = text->data();
-  const char* end = start + text->size();
-
-  // Consume whitespace.
-  while (start < end && (start[0] == ' ')) {
-    ++start;
-  }
-  while (start < end && (end[-1] == ' ')) {
-    --end;
-  }
-  if (start >= end) {
-    return false;
-  }
-
-  // Consume sign.
-  *negative_ptr = (start[0] == '-');
-  if (*negative_ptr || start[0] == '+') {
-    ++start;
-    if (start >= end) {
-      return false;
-    }
-  }
-  *text = text->substr(start - text->data(), end - start);
-  return true;
-}
-
-template <typename IntType>
-bool safe_parse_positive_int(std::string text, IntType *value_p) {
-  int base = 10;
-  IntType value = 0;
-  const IntType vmax = std::numeric_limits<IntType>::max();
-  assert(vmax > 0);
-  assert(vmax >= base);
-  const IntType vmax_over_base = vmax / base;
-  const char* start = text.data();
-  const char* end = start + text.size();
-  // loop over digits
-  for (; start < end; ++start) {
-    unsigned char c = static_cast<unsigned char>(start[0]);
-    int digit = c - '0';
-    if (digit >= base || digit < 0) {
-      *value_p = value;
-      return false;
-    }
-    if (value > vmax_over_base) {
-      *value_p = vmax;
-      return false;
-    }
-    value *= base;
-    if (value > vmax - digit) {
-      *value_p = vmax;
-      return false;
-    }
-    value += digit;
-  }
-  *value_p = value;
-  return true;
-}
-
-template <typename IntType>
-bool safe_parse_negative_int(const std::string &text, IntType *value_p) {
-  int base = 10;
-  IntType value = 0;
-  const IntType vmin = std::numeric_limits<IntType>::min();
-  assert(vmin < 0);
-  assert(vmin <= 0 - base);
-  IntType vmin_over_base = vmin / base;
-  // 2003 c++ standard [expr.mul]
-  // "... the sign of the remainder is implementation-defined."
-  // Although (vmin/base)*base + vmin%base is always vmin.
-  // 2011 c++ standard tightens the spec but we cannot rely on it.
-  if (vmin % base > 0) {
-    vmin_over_base += 1;
-  }
-  const char* start = text.data();
-  const char* end = start + text.size();
-  // loop over digits
-  for (; start < end; ++start) {
-    unsigned char c = static_cast<unsigned char>(start[0]);
-    int digit = c - '0';
-    if (digit >= base || digit < 0) {
-      *value_p = value;
-      return false;
-    }
-    if (value < vmin_over_base) {
-      *value_p = vmin;
-      return false;
-    }
-    value *= base;
-    if (value < vmin + digit) {
-      *value_p = vmin;
-      return false;
-    }
-    value -= digit;
-  }
-  *value_p = value;
-  return true;
-}
-
-template <typename IntType>
-bool safe_int_internal(std::string text, IntType *value_p) {
-  *value_p = 0;
-  bool negative;
-  if (!safe_parse_sign(&text, &negative)) {
-    return false;
-  }
-  if (!negative) {
-    return safe_parse_positive_int(text, value_p);
-  } else {
-    return safe_parse_negative_int(text, value_p);
-  }
-}
-
-template <typename IntType>
-bool safe_uint_internal(std::string text, IntType *value_p) {
-  *value_p = 0;
-  bool negative;
-  if (!safe_parse_sign(&text, &negative) || negative) {
-    return false;
-  }
-  return safe_parse_positive_int(text, value_p);
-}
-
-// ----------------------------------------------------------------------
-// FastIntToBuffer()
-// FastInt64ToBuffer()
-// FastHexToBuffer()
-// FastHex64ToBuffer()
-// FastHex32ToBuffer()
-// ----------------------------------------------------------------------
-
-// Offset into buffer where FastInt64ToBuffer places the end of string
-// null character.  Also used by FastInt64ToBufferLeft.
-static const int kFastInt64ToBufferOffset = 21;
-
-char *FastInt64ToBuffer(int64_t i, char* buffer) {
-  // We could collapse the positive and negative sections, but that
-  // would be slightly slower for positive numbers...
-  // 22 bytes is enough to store -2**64, -18446744073709551616.
-  char* p = buffer + kFastInt64ToBufferOffset;
-  *p-- = '\0';
-  if (i >= 0) {
-    do {
-      *p-- = '0' + i % 10;
-      i /= 10;
-    } while (i > 0);
-    return p + 1;
-  } else {
-    // On different platforms, % and / have different behaviors for
-    // negative numbers, so we need to jump through hoops to make sure
-    // we don't divide negative numbers.
-    if (i > -10) {
-      i = -i;
-      *p-- = '0' + i;
-      *p = '-';
-      return p;
-    } else {
-      // Make sure we aren't at MIN_INT, in which case we can't say i = -i
-      i = i + 10;
-      i = -i;
-      *p-- = '0' + i % 10;
-      // Undo what we did a moment ago
-      i = i / 10 + 1;
-      do {
-        *p-- = '0' + i % 10;
-        i /= 10;
-      } while (i > 0);
-      *p = '-';
-      return p;
-    }
-  }
-}
-
-// Offset into buffer where FastInt32ToBuffer places the end of string
-// null character.  Also used by FastInt32ToBufferLeft
-static const int kFastInt32ToBufferOffset = 11;
-
-// Yes, this is a duplicate of FastInt64ToBuffer.  But, we need this for the
-// compiler to generate 32 bit arithmetic instructions.  It's much faster, at
-// least with 32 bit binaries.
-char *FastInt32ToBuffer(int32_t i, char* buffer) {
-  // We could collapse the positive and negative sections, but that
-  // would be slightly slower for positive numbers...
-  // 12 bytes is enough to store -2**32, -4294967296.
-  char* p = buffer + kFastInt32ToBufferOffset;
-  *p-- = '\0';
-  if (i >= 0) {
-    do {
-      *p-- = '0' + i % 10;
-      i /= 10;
-    } while (i > 0);
-    return p + 1;
-  } else {
-    // On different platforms, % and / have different behaviors for
-    // negative numbers, so we need to jump through hoops to make sure
-    // we don't divide negative numbers.
-    if (i > -10) {
-      i = -i;
-      *p-- = '0' + i;
-      *p = '-';
-      return p;
-    } else {
-      // Make sure we aren't at MIN_INT, in which case we can't say i = -i
-      i = i + 10;
-      i = -i;
-      *p-- = '0' + i % 10;
-      // Undo what we did a moment ago
-      i = i / 10 + 1;
-      do {
-        *p-- = '0' + i % 10;
-        i /= 10;
-      } while (i > 0);
-      *p = '-';
-      return p;
-    }
-  }
-}
-
-char *FastHexToBuffer(int i, char* buffer) {
-  GOOGLE_CHECK(i >= 0) << "FastHexToBuffer() wants non-negative integers, not " << i;
-
-  static const char *hexdigits = "0123456789abcdef";
-  char *p = buffer + 21;
-  *p-- = '\0';
-  do {
-    *p-- = hexdigits[i & 15];   // mod by 16
-    i >>= 4;                    // divide by 16
-  } while (i > 0);
-  return p + 1;
-}
-
-char *InternalFastHexToBuffer(uint64_t value, char* buffer, int num_byte) {
-  static const char *hexdigits = "0123456789abcdef";
-  buffer[num_byte] = '\0';
-  for (int i = num_byte - 1; i >= 0; i--) {
-#ifdef _M_X64
-    // MSVC x64 platform has a bug optimizing the uint32(value) in the #else
-    // block. Given that the uint32 cast was to improve performance on 32-bit
-    // platforms, we use 64-bit '&' directly.
-    buffer[i] = hexdigits[value & 0xf];
-#else
-    buffer[i] = hexdigits[uint32_t(value) & 0xf];
-#endif
-    value >>= 4;
-  }
-  return buffer;
-}
-
-char *FastHex64ToBuffer(uint64_t value, char* buffer) {
-  return InternalFastHexToBuffer(value, buffer, 16);
-}
-
-char *FastHex32ToBuffer(uint32_t value, char* buffer) {
-  return InternalFastHexToBuffer(value, buffer, 8);
-}
-
-// ----------------------------------------------------------------------
-// FastInt32ToBufferLeft()
-// FastUInt32ToBufferLeft()
-// FastInt64ToBufferLeft()
-// FastUInt64ToBufferLeft()
-//
-// Like the Fast*ToBuffer() functions above, these are intended for speed.
-// Unlike the Fast*ToBuffer() functions, however, these functions write
-// their output to the beginning of the buffer (hence the name, as the
-// output is left-aligned).  The caller is responsible for ensuring that
-// the buffer has enough space to hold the output.
-//
-// Returns a pointer to the end of the string (i.e. the null character
-// terminating the string).
-// ----------------------------------------------------------------------
-
-static const char two_ASCII_digits[100][2] = {
-  {'0','0'}, {'0','1'}, {'0','2'}, {'0','3'}, {'0','4'},
-  {'0','5'}, {'0','6'}, {'0','7'}, {'0','8'}, {'0','9'},
-  {'1','0'}, {'1','1'}, {'1','2'}, {'1','3'}, {'1','4'},
-  {'1','5'}, {'1','6'}, {'1','7'}, {'1','8'}, {'1','9'},
-  {'2','0'}, {'2','1'}, {'2','2'}, {'2','3'}, {'2','4'},
-  {'2','5'}, {'2','6'}, {'2','7'}, {'2','8'}, {'2','9'},
-  {'3','0'}, {'3','1'}, {'3','2'}, {'3','3'}, {'3','4'},
-  {'3','5'}, {'3','6'}, {'3','7'}, {'3','8'}, {'3','9'},
-  {'4','0'}, {'4','1'}, {'4','2'}, {'4','3'}, {'4','4'},
-  {'4','5'}, {'4','6'}, {'4','7'}, {'4','8'}, {'4','9'},
-  {'5','0'}, {'5','1'}, {'5','2'}, {'5','3'}, {'5','4'},
-  {'5','5'}, {'5','6'}, {'5','7'}, {'5','8'}, {'5','9'},
-  {'6','0'}, {'6','1'}, {'6','2'}, {'6','3'}, {'6','4'},
-  {'6','5'}, {'6','6'}, {'6','7'}, {'6','8'}, {'6','9'},
-  {'7','0'}, {'7','1'}, {'7','2'}, {'7','3'}, {'7','4'},
-  {'7','5'}, {'7','6'}, {'7','7'}, {'7','8'}, {'7','9'},
-  {'8','0'}, {'8','1'}, {'8','2'}, {'8','3'}, {'8','4'},
-  {'8','5'}, {'8','6'}, {'8','7'}, {'8','8'}, {'8','9'},
-  {'9','0'}, {'9','1'}, {'9','2'}, {'9','3'}, {'9','4'},
-  {'9','5'}, {'9','6'}, {'9','7'}, {'9','8'}, {'9','9'}
-};
-
-char* FastUInt32ToBufferLeft(uint32_t u, char* buffer) {
-  uint32_t digits;
-  const char *ASCII_digits = nullptr;
-  // The idea of this implementation is to trim the number of divides to as few
-  // as possible by using multiplication and subtraction rather than mod (%),
-  // and by outputting two digits at a time rather than one.
-  // The huge-number case is first, in the hopes that the compiler will output
-  // that case in one branch-free block of code, and only output conditional
-  // branches into it from below.
-  if (u >= 1000000000) {  // >= 1,000,000,000
-    digits = u / 100000000;  // 100,000,000
-    ASCII_digits = two_ASCII_digits[digits];
-    buffer[0] = ASCII_digits[0];
-    buffer[1] = ASCII_digits[1];
-    buffer += 2;
-sublt100_000_000:
-    u -= digits * 100000000;  // 100,000,000
-lt100_000_000:
-    digits = u / 1000000;  // 1,000,000
-    ASCII_digits = two_ASCII_digits[digits];
-    buffer[0] = ASCII_digits[0];
-    buffer[1] = ASCII_digits[1];
-    buffer += 2;
-sublt1_000_000:
-    u -= digits * 1000000;  // 1,000,000
-lt1_000_000:
-    digits = u / 10000;  // 10,000
-    ASCII_digits = two_ASCII_digits[digits];
-    buffer[0] = ASCII_digits[0];
-    buffer[1] = ASCII_digits[1];
-    buffer += 2;
-sublt10_000:
-    u -= digits * 10000;  // 10,000
-lt10_000:
-    digits = u / 100;
-    ASCII_digits = two_ASCII_digits[digits];
-    buffer[0] = ASCII_digits[0];
-    buffer[1] = ASCII_digits[1];
-    buffer += 2;
-sublt100:
-    u -= digits * 100;
-lt100:
-    digits = u;
-    ASCII_digits = two_ASCII_digits[digits];
-    buffer[0] = ASCII_digits[0];
-    buffer[1] = ASCII_digits[1];
-    buffer += 2;
-done:
-    *buffer = 0;
-    return buffer;
-  }
-
-  if (u < 100) {
-    digits = u;
-    if (u >= 10) goto lt100;
-    *buffer++ = '0' + digits;
-    goto done;
-  }
-  if (u  <  10000) {   // 10,000
-    if (u >= 1000) goto lt10_000;
-    digits = u / 100;
-    *buffer++ = '0' + digits;
-    goto sublt100;
-  }
-  if (u  <  1000000) {   // 1,000,000
-    if (u >= 100000) goto lt1_000_000;
-    digits = u / 10000;  //    10,000
-    *buffer++ = '0' + digits;
-    goto sublt10_000;
-  }
-  if (u  <  100000000) {   // 100,000,000
-    if (u >= 10000000) goto lt100_000_000;
-    digits = u / 1000000;  //   1,000,000
-    *buffer++ = '0' + digits;
-    goto sublt1_000_000;
-  }
-  // we already know that u < 1,000,000,000
-  digits = u / 100000000;   // 100,000,000
-  *buffer++ = '0' + digits;
-  goto sublt100_000_000;
-}
-
-char* FastInt32ToBufferLeft(int32_t i, char* buffer) {
-  uint32_t u = 0;
-  if (i < 0) {
-    *buffer++ = '-';
-    u -= i;
-  } else {
-    u = i;
-  }
-  return FastUInt32ToBufferLeft(u, buffer);
-}
-
-char* FastUInt64ToBufferLeft(uint64_t u64, char* buffer) {
-  int digits;
-  const char *ASCII_digits = nullptr;
-
-  uint32_t u = static_cast<uint32_t>(u64);
-  if (u == u64) return FastUInt32ToBufferLeft(u, buffer);
-
-  uint64_t top_11_digits = u64 / 1000000000;
-  buffer = FastUInt64ToBufferLeft(top_11_digits, buffer);
-  u = u64 - (top_11_digits * 1000000000);
-
-  digits = u / 10000000;  // 10,000,000
-  GOOGLE_DCHECK_LT(digits, 100);
-  ASCII_digits = two_ASCII_digits[digits];
-  buffer[0] = ASCII_digits[0];
-  buffer[1] = ASCII_digits[1];
-  buffer += 2;
-  u -= digits * 10000000;  // 10,000,000
-  digits = u / 100000;  // 100,000
-  ASCII_digits = two_ASCII_digits[digits];
-  buffer[0] = ASCII_digits[0];
-  buffer[1] = ASCII_digits[1];
-  buffer += 2;
-  u -= digits * 100000;  // 100,000
-  digits = u / 1000;  // 1,000
-  ASCII_digits = two_ASCII_digits[digits];
-  buffer[0] = ASCII_digits[0];
-  buffer[1] = ASCII_digits[1];
-  buffer += 2;
-  u -= digits * 1000;  // 1,000
-  digits = u / 10;
-  ASCII_digits = two_ASCII_digits[digits];
-  buffer[0] = ASCII_digits[0];
-  buffer[1] = ASCII_digits[1];
-  buffer += 2;
-  u -= digits * 10;
-  digits = u;
-  *buffer++ = '0' + digits;
-  *buffer = 0;
-  return buffer;
-}
-
-char* FastInt64ToBufferLeft(int64_t i, char* buffer) {
-  uint64_t u = 0;
-  if (i < 0) {
-    *buffer++ = '-';
-    u -= i;
-  } else {
-    u = i;
-  }
-  return FastUInt64ToBufferLeft(u, buffer);
-}
-
-// ----------------------------------------------------------------------
-// SimpleItoa()
-//    Description: converts an integer to a string.
-//
-//    Return value: string
-// ----------------------------------------------------------------------
-
-std::string SimpleItoa(int i) {
-  char buffer[kFastToBufferSize];
-  return (sizeof(i) == 4) ?
-    FastInt32ToBuffer(i, buffer) :
-    FastInt64ToBuffer(i, buffer);
-}
-
-std::string SimpleItoa(unsigned int i) {
-  char buffer[kFastToBufferSize];
-  return std::string(buffer, (sizeof(i) == 4)
-                                 ? FastUInt32ToBufferLeft(i, buffer)
-                                 : FastUInt64ToBufferLeft(i, buffer));
-}
-
-std::string SimpleItoa(long i) {
-  char buffer[kFastToBufferSize];
-  return (sizeof(i) == 4) ?
-    FastInt32ToBuffer(i, buffer) :
-    FastInt64ToBuffer(i, buffer);
-}
-
-std::string SimpleItoa(unsigned long i) {
-  char buffer[kFastToBufferSize];
-  return std::string(buffer, (sizeof(i) == 4)
-                                 ? FastUInt32ToBufferLeft(i, buffer)
-                                 : FastUInt64ToBufferLeft(i, buffer));
-}
-
-std::string SimpleItoa(long long i) {
-  char buffer[kFastToBufferSize];
-  return (sizeof(i) == 4) ?
-    FastInt32ToBuffer(i, buffer) :
-    FastInt64ToBuffer(i, buffer);
-}
-
-std::string SimpleItoa(unsigned long long i) {
-  char buffer[kFastToBufferSize];
-  return std::string(buffer, (sizeof(i) == 4)
-                                 ? FastUInt32ToBufferLeft(i, buffer)
-                                 : FastUInt64ToBufferLeft(i, buffer));
-}
-
-// ----------------------------------------------------------------------
-// SimpleDtoa()
-// SimpleFtoa()
-// DoubleToBuffer()
-// FloatToBuffer()
-//    We want to print the value without losing precision, but we also do
-//    not want to print more digits than necessary.  This turns out to be
-//    trickier than it sounds.  Numbers like 0.2 cannot be represented
-//    exactly in binary.  If we print 0.2 with a very large precision,
-//    e.g. "%.50g", we get "0.2000000000000000111022302462515654042363167".
-//    On the other hand, if we set the precision too low, we lose
-//    significant digits when printing numbers that actually need them.
-//    It turns out there is no precision value that does the right thing
-//    for all numbers.
-//
-//    Our strategy is to first try printing with a precision that is never
-//    over-precise, then parse the result with strtod() to see if it
-//    matches.  If not, we print again with a precision that will always
-//    give a precise result, but may use more digits than necessary.
-//
-//    An arguably better strategy would be to use the algorithm described
-//    in "How to Print Floating-Point Numbers Accurately" by Steele &
-//    White, e.g. as implemented by David M. Gay's dtoa().  It turns out,
-//    however, that the following implementation is about as fast as
-//    DMG's code.  Furthermore, DMG's code locks mutexes, which means it
-//    will not scale well on multi-core machines.  DMG's code is slightly
-//    more accurate (in that it will never use more digits than
-//    necessary), but this is probably irrelevant for most users.
-//
-//    Rob Pike and Ken Thompson also have an implementation of dtoa() in
-//    third_party/fmt/fltfmt.cc.  Their implementation is similar to this
-//    one in that it makes guesses and then uses strtod() to check them.
-//    Their implementation is faster because they use their own code to
-//    generate the digits in the first place rather than use snprintf(),
-//    thus avoiding format string parsing overhead.  However, this makes
-//    it considerably more complicated than the following implementation,
-//    and it is embedded in a larger library.  If speed turns out to be
-//    an issue, we could re-implement this in terms of their
-//    implementation.
-// ----------------------------------------------------------------------
-
-std::string SimpleDtoa(double value) {
-  char buffer[kDoubleToBufferSize];
-  return DoubleToBuffer(value, buffer);
-}
-
-std::string SimpleFtoa(float value) {
-  char buffer[kFloatToBufferSize];
-  return FloatToBuffer(value, buffer);
-}
-
-static inline bool IsValidFloatChar(char c) {
-  return ('0' <= c && c <= '9') ||
-         c == 'e' || c == 'E' ||
-         c == '+' || c == '-';
-}
-
-void DelocalizeRadix(char* buffer) {
-  // Fast check:  if the buffer has a normal decimal point, assume no
-  // translation is needed.
-  if (strchr(buffer, '.') != nullptr) return;
-
-  // Find the first unknown character.
-  while (IsValidFloatChar(*buffer)) ++buffer;
-
-  if (*buffer == '\0') {
-    // No radix character found.
-    return;
-  }
-
-  // We are now pointing at the locale-specific radix character.  Replace it
-  // with '.'.
-  *buffer = '.';
-  ++buffer;
-
-  if (!IsValidFloatChar(*buffer) && *buffer != '\0') {
-    // It appears the radix was a multi-byte character.  We need to remove the
-    // extra bytes.
-    char* target = buffer;
-    do { ++buffer; } while (!IsValidFloatChar(*buffer) && *buffer != '\0');
-    memmove(target, buffer, strlen(buffer) + 1);
-  }
-}
-
-char* DoubleToBuffer(double value, char* buffer) {
-  // DBL_DIG is 15 for IEEE-754 doubles, which are used on almost all
-  // platforms these days.  Just in case some system exists where DBL_DIG
-  // is significantly larger -- and risks overflowing our buffer -- we have
-  // this assert.
-  static_assert(DBL_DIG < 20, "DBL_DIG_is_too_big");
-
-  if (value == std::numeric_limits<double>::infinity()) {
-    strcpy(buffer, "inf");
-    return buffer;
-  } else if (value == -std::numeric_limits<double>::infinity()) {
-    strcpy(buffer, "-inf");
-    return buffer;
-  } else if (std::isnan(value)) {
-    strcpy(buffer, "nan");
-    return buffer;
-  }
-
-  int snprintf_result =
-    snprintf(buffer, kDoubleToBufferSize, "%.*g", DBL_DIG, value);
-
-  // The snprintf should never overflow because the buffer is significantly
-  // larger than the precision we asked for.
-  GOOGLE_DCHECK(snprintf_result > 0 && snprintf_result < kDoubleToBufferSize);
-
-  // We need to make parsed_value volatile in order to force the compiler to
-  // write it out to the stack.  Otherwise, it may keep the value in a
-  // register, and if it does that, it may keep it as a long double instead
-  // of a double.  This long double may have extra bits that make it compare
-  // unequal to "value" even though it would be exactly equal if it were
-  // truncated to a double.
-  volatile double parsed_value = internal::NoLocaleStrtod(buffer, nullptr);
-  if (parsed_value != value) {
-    snprintf_result =
-        snprintf(buffer, kDoubleToBufferSize, "%.*g", DBL_DIG + 2, value);
-
-    // Should never overflow; see above.
-    GOOGLE_DCHECK(snprintf_result > 0 && snprintf_result < kDoubleToBufferSize);
-  }
-
-  DelocalizeRadix(buffer);
-  return buffer;
-}
-
-static int memcasecmp(const char *s1, const char *s2, size_t len) {
-  const unsigned char *us1 = reinterpret_cast<const unsigned char *>(s1);
-  const unsigned char *us2 = reinterpret_cast<const unsigned char *>(s2);
-
-  for (size_t i = 0; i < len; i++) {
-    const int diff =
-      static_cast<int>(static_cast<unsigned char>(ascii_tolower(us1[i]))) -
-      static_cast<int>(static_cast<unsigned char>(ascii_tolower(us2[i])));
-    if (diff != 0) return diff;
-  }
-  return 0;
-}
-
-inline bool CaseEqual(StringPiece s1, StringPiece s2) {
-  if (s1.size() != s2.size()) return false;
-  return memcasecmp(s1.data(), s2.data(), s1.size()) == 0;
-}
-
-bool safe_strtob(StringPiece str, bool* value) {
-  GOOGLE_CHECK(value != nullptr) << "nullptr output boolean given.";
-  if (CaseEqual(str, "true") || CaseEqual(str, "t") ||
-      CaseEqual(str, "yes") || CaseEqual(str, "y") ||
-      CaseEqual(str, "1")) {
-    *value = true;
-    return true;
-  }
-  if (CaseEqual(str, "false") || CaseEqual(str, "f") ||
-      CaseEqual(str, "no") || CaseEqual(str, "n") ||
-      CaseEqual(str, "0")) {
-    *value = false;
-    return true;
-  }
-  return false;
-}
-
-bool safe_strtof(const char* str, float* value) {
-  char* endptr;
-  errno = 0;  // errno only gets set on errors
-#if defined(_WIN32) || defined (__hpux)  // has no strtof()
-  *value = internal::NoLocaleStrtod(str, &endptr);
-#else
-  *value = strtof(str, &endptr);
-#endif
-  return *str != 0 && *endptr == 0 && errno == 0;
-}
-
-bool safe_strtod(const char* str, double* value) {
-  char* endptr;
-  *value = internal::NoLocaleStrtod(str, &endptr);
-  if (endptr != str) {
-    while (ascii_isspace(*endptr)) ++endptr;
-  }
-  // Ignore range errors from strtod.  The values it
-  // returns on underflow and overflow are the right
-  // fallback in a robust setting.
-  return *str != '\0' && *endptr == '\0';
-}
-
-bool safe_strto32(const std::string &str, int32_t *value) {
-  return safe_int_internal(str, value);
-}
-
-bool safe_strtou32(const std::string &str, uint32_t *value) {
-  return safe_uint_internal(str, value);
-}
-
-bool safe_strto64(const std::string &str, int64_t *value) {
-  return safe_int_internal(str, value);
-}
-
-bool safe_strtou64(const std::string &str, uint64_t *value) {
-  return safe_uint_internal(str, value);
-}
-
-char* FloatToBuffer(float value, char* buffer) {
-  // FLT_DIG is 6 for IEEE-754 floats, which are used on almost all
-  // platforms these days.  Just in case some system exists where FLT_DIG
-  // is significantly larger -- and risks overflowing our buffer -- we have
-  // this assert.
-  static_assert(FLT_DIG < 10, "FLT_DIG_is_too_big");
-
-  if (value == std::numeric_limits<double>::infinity()) {
-    strcpy(buffer, "inf");
-    return buffer;
-  } else if (value == -std::numeric_limits<double>::infinity()) {
-    strcpy(buffer, "-inf");
-    return buffer;
-  } else if (std::isnan(value)) {
-    strcpy(buffer, "nan");
-    return buffer;
-  }
-
-  int snprintf_result =
-    snprintf(buffer, kFloatToBufferSize, "%.*g", FLT_DIG, value);
-
-  // The snprintf should never overflow because the buffer is significantly
-  // larger than the precision we asked for.
-  GOOGLE_DCHECK(snprintf_result > 0 && snprintf_result < kFloatToBufferSize);
-
-  float parsed_value;
-  if (!safe_strtof(buffer, &parsed_value) || parsed_value != value) {
-    snprintf_result =
-        snprintf(buffer, kFloatToBufferSize, "%.*g", FLT_DIG + 3, value);
-
-    // Should never overflow; see above.
-    GOOGLE_DCHECK(snprintf_result > 0 && snprintf_result < kFloatToBufferSize);
-  }
-
-  DelocalizeRadix(buffer);
-  return buffer;
-}
-
-namespace strings {
-
-AlphaNum::AlphaNum(strings::Hex hex) {
-  char *const end = &digits[kFastToBufferSize];
-  char *writer = end;
-  uint64_t value = hex.value;
-  uint64_t width = hex.spec;
-  // We accomplish minimum width by OR'ing in 0x10000 to the user's value,
-  // where 0x10000 is the smallest hex number that is as wide as the user
-  // asked for.
-  uint64_t mask = (static_cast<uint64_t>(1) << ((width - 1) * 4)) | value;
-  static const char hexdigits[] = "0123456789abcdef";
-  do {
-    *--writer = hexdigits[value & 0xF];
-    value >>= 4;
-    mask >>= 4;
-  } while (mask != 0);
-  piece_data_ = writer;
-  piece_size_ = end - writer;
-}
-
-}  // namespace strings
-
-// ----------------------------------------------------------------------
-// StrCat()
-//    This merges the given strings or integers, with no delimiter.  This
-//    is designed to be the fastest possible way to construct a string out
-//    of a mix of raw C strings, C++ strings, and integer values.
-// ----------------------------------------------------------------------
-
-// Append is merely a version of memcpy that returns the address of the byte
-// after the area just overwritten.  It comes in multiple flavors to minimize
-// call overhead.
-static char *Append1(char *out, const AlphaNum &x) {
-  if (x.size() > 0) {
-    memcpy(out, x.data(), x.size());
-    out += x.size();
-  }
-  return out;
-}
-
-static char *Append2(char *out, const AlphaNum &x1, const AlphaNum &x2) {
-  if (x1.size() > 0) {
-    memcpy(out, x1.data(), x1.size());
-    out += x1.size();
-  }
-  if (x2.size() > 0) {
-    memcpy(out, x2.data(), x2.size());
-    out += x2.size();
-  }
-  return out;
-}
-
-static char *Append4(char *out, const AlphaNum &x1, const AlphaNum &x2,
-                     const AlphaNum &x3, const AlphaNum &x4) {
-  if (x1.size() > 0) {
-    memcpy(out, x1.data(), x1.size());
-    out += x1.size();
-  }
-  if (x2.size() > 0) {
-    memcpy(out, x2.data(), x2.size());
-    out += x2.size();
-  }
-  if (x3.size() > 0) {
-    memcpy(out, x3.data(), x3.size());
-    out += x3.size();
-  }
-  if (x4.size() > 0) {
-    memcpy(out, x4.data(), x4.size());
-    out += x4.size();
-  }
-  return out;
-}
-
-std::string StrCat(const AlphaNum &a, const AlphaNum &b) {
-  std::string result;
-  result.resize(a.size() + b.size());
-  char *const begin = &*result.begin();
-  char *out = Append2(begin, a, b);
-  GOOGLE_DCHECK_EQ(out, begin + result.size());
-  return result;
-}
-
-std::string StrCat(const AlphaNum &a, const AlphaNum &b, const AlphaNum &c) {
-  std::string result;
-  result.resize(a.size() + b.size() + c.size());
-  char *const begin = &*result.begin();
-  char *out = Append2(begin, a, b);
-  out = Append1(out, c);
-  GOOGLE_DCHECK_EQ(out, begin + result.size());
-  return result;
-}
-
-std::string StrCat(const AlphaNum &a, const AlphaNum &b, const AlphaNum &c,
-                   const AlphaNum &d) {
-  std::string result;
-  result.resize(a.size() + b.size() + c.size() + d.size());
-  char *const begin = &*result.begin();
-  char *out = Append4(begin, a, b, c, d);
-  GOOGLE_DCHECK_EQ(out, begin + result.size());
-  return result;
-}
-
-std::string StrCat(const AlphaNum &a, const AlphaNum &b, const AlphaNum &c,
-                   const AlphaNum &d, const AlphaNum &e) {
-  std::string result;
-  result.resize(a.size() + b.size() + c.size() + d.size() + e.size());
-  char *const begin = &*result.begin();
-  char *out = Append4(begin, a, b, c, d);
-  out = Append1(out, e);
-  GOOGLE_DCHECK_EQ(out, begin + result.size());
-  return result;
-}
-
-std::string StrCat(const AlphaNum &a, const AlphaNum &b, const AlphaNum &c,
-                   const AlphaNum &d, const AlphaNum &e, const AlphaNum &f) {
-  std::string result;
-  result.resize(a.size() + b.size() + c.size() + d.size() + e.size() +
-                f.size());
-  char *const begin = &*result.begin();
-  char *out = Append4(begin, a, b, c, d);
-  out = Append2(out, e, f);
-  GOOGLE_DCHECK_EQ(out, begin + result.size());
-  return result;
-}
-
-std::string StrCat(const AlphaNum &a, const AlphaNum &b, const AlphaNum &c,
-                   const AlphaNum &d, const AlphaNum &e, const AlphaNum &f,
-                   const AlphaNum &g) {
-  std::string result;
-  result.resize(a.size() + b.size() + c.size() + d.size() + e.size() +
-                f.size() + g.size());
-  char *const begin = &*result.begin();
-  char *out = Append4(begin, a, b, c, d);
-  out = Append2(out, e, f);
-  out = Append1(out, g);
-  GOOGLE_DCHECK_EQ(out, begin + result.size());
-  return result;
-}
-
-std::string StrCat(const AlphaNum &a, const AlphaNum &b, const AlphaNum &c,
-                   const AlphaNum &d, const AlphaNum &e, const AlphaNum &f,
-                   const AlphaNum &g, const AlphaNum &h) {
-  std::string result;
-  result.resize(a.size() + b.size() + c.size() + d.size() + e.size() +
-                f.size() + g.size() + h.size());
-  char *const begin = &*result.begin();
-  char *out = Append4(begin, a, b, c, d);
-  out = Append4(out, e, f, g, h);
-  GOOGLE_DCHECK_EQ(out, begin + result.size());
-  return result;
-}
-
-std::string StrCat(const AlphaNum &a, const AlphaNum &b, const AlphaNum &c,
-                   const AlphaNum &d, const AlphaNum &e, const AlphaNum &f,
-                   const AlphaNum &g, const AlphaNum &h, const AlphaNum &i) {
-  std::string result;
-  result.resize(a.size() + b.size() + c.size() + d.size() + e.size() +
-                f.size() + g.size() + h.size() + i.size());
-  char *const begin = &*result.begin();
-  char *out = Append4(begin, a, b, c, d);
-  out = Append4(out, e, f, g, h);
-  out = Append1(out, i);
-  GOOGLE_DCHECK_EQ(out, begin + result.size());
-  return result;
-}
-
-// It's possible to call StrAppend with a char * pointer that is partway into
-// the string we're appending to.  However the results of this are random.
-// Therefore, check for this in debug mode.  Use unsigned math so we only have
-// to do one comparison.
-#define GOOGLE_DCHECK_NO_OVERLAP(dest, src) \
-    GOOGLE_DCHECK_GT(uintptr_t((src).data() - (dest).data()), \
-                     uintptr_t((dest).size()))
-
-void StrAppend(std::string *result, const AlphaNum &a) {
-  GOOGLE_DCHECK_NO_OVERLAP(*result, a);
-  result->append(a.data(), a.size());
-}
-
-void StrAppend(std::string *result, const AlphaNum &a, const AlphaNum &b) {
-  GOOGLE_DCHECK_NO_OVERLAP(*result, a);
-  GOOGLE_DCHECK_NO_OVERLAP(*result, b);
-  std::string::size_type old_size = result->size();
-  result->resize(old_size + a.size() + b.size());
-  char *const begin = &*result->begin();
-  char *out = Append2(begin + old_size, a, b);
-  GOOGLE_DCHECK_EQ(out, begin + result->size());
-}
-
-void StrAppend(std::string *result, const AlphaNum &a, const AlphaNum &b,
-               const AlphaNum &c) {
-  GOOGLE_DCHECK_NO_OVERLAP(*result, a);
-  GOOGLE_DCHECK_NO_OVERLAP(*result, b);
-  GOOGLE_DCHECK_NO_OVERLAP(*result, c);
-  std::string::size_type old_size = result->size();
-  result->resize(old_size + a.size() + b.size() + c.size());
-  char *const begin = &*result->begin();
-  char *out = Append2(begin + old_size, a, b);
-  out = Append1(out, c);
-  GOOGLE_DCHECK_EQ(out, begin + result->size());
-}
-
-void StrAppend(std::string *result, const AlphaNum &a, const AlphaNum &b,
-               const AlphaNum &c, const AlphaNum &d) {
-  GOOGLE_DCHECK_NO_OVERLAP(*result, a);
-  GOOGLE_DCHECK_NO_OVERLAP(*result, b);
-  GOOGLE_DCHECK_NO_OVERLAP(*result, c);
-  GOOGLE_DCHECK_NO_OVERLAP(*result, d);
-  std::string::size_type old_size = result->size();
-  result->resize(old_size + a.size() + b.size() + c.size() + d.size());
-  char *const begin = &*result->begin();
-  char *out = Append4(begin + old_size, a, b, c, d);
-  GOOGLE_DCHECK_EQ(out, begin + result->size());
-}
-
-int GlobalReplaceSubstring(const std::string &substring,
-                           const std::string &replacement, std::string *s) {
-  GOOGLE_CHECK(s != nullptr);
-  if (s->empty() || substring.empty())
-    return 0;
-  std::string tmp;
-  int num_replacements = 0;
-  int pos = 0;
-  for (StringPiece::size_type match_pos =
-           s->find(substring.data(), pos, substring.length());
-       match_pos != std::string::npos; pos = match_pos + substring.length(),
-                              match_pos = s->find(substring.data(), pos,
-                                                  substring.length())) {
-    ++num_replacements;
-    // Append the original content before the match.
-    tmp.append(*s, pos, match_pos - pos);
-    // Append the replacement for the match.
-    tmp.append(replacement.begin(), replacement.end());
-  }
-  // Append the content after the last match. If no replacements were made, the
-  // original string is left untouched.
-  if (num_replacements > 0) {
-    tmp.append(*s, pos, s->length() - pos);
-    s->swap(tmp);
-  }
-  return num_replacements;
-}
-
-int CalculateBase64EscapedLen(int input_len, bool do_padding) {
-  // Base64 encodes three bytes of input at a time. If the input is not
-  // divisible by three, we pad as appropriate.
-  //
-  // (from http://tools.ietf.org/html/rfc3548)
-  // Special processing is performed if fewer than 24 bits are available
-  // at the end of the data being encoded.  A full encoding quantum is
-  // always completed at the end of a quantity.  When fewer than 24 input
-  // bits are available in an input group, zero bits are added (on the
-  // right) to form an integral number of 6-bit groups.  Padding at the
-  // end of the data is performed using the '=' character.  Since all base
-  // 64 input is an integral number of octets, only the following cases
-  // can arise:
-
-
-  // Base64 encodes each three bytes of input into four bytes of output.
-  int len = (input_len / 3) * 4;
-
-  if (input_len % 3 == 0) {
-    // (from http://tools.ietf.org/html/rfc3548)
-    // (1) the final quantum of encoding input is an integral multiple of 24
-    // bits; here, the final unit of encoded output will be an integral
-    // multiple of 4 characters with no "=" padding,
-  } else if (input_len % 3 == 1) {
-    // (from http://tools.ietf.org/html/rfc3548)
-    // (2) the final quantum of encoding input is exactly 8 bits; here, the
-    // final unit of encoded output will be two characters followed by two
-    // "=" padding characters, or
-    len += 2;
-    if (do_padding) {
-      len += 2;
-    }
-  } else {  // (input_len % 3 == 2)
-    // (from http://tools.ietf.org/html/rfc3548)
-    // (3) the final quantum of encoding input is exactly 16 bits; here, the
-    // final unit of encoded output will be three characters followed by one
-    // "=" padding character.
-    len += 3;
-    if (do_padding) {
-      len += 1;
-    }
-  }
-
-  assert(len >= input_len);  // make sure we didn't overflow
-  return len;
-}
-
-// Base64Escape does padding, so this calculation includes padding.
-int CalculateBase64EscapedLen(int input_len) {
-  return CalculateBase64EscapedLen(input_len, true);
-}
-
-// ----------------------------------------------------------------------
-// int Base64Unescape() - base64 decoder
-// int Base64Escape() - base64 encoder
-// int WebSafeBase64Unescape() - Google's variation of base64 decoder
-// int WebSafeBase64Escape() - Google's variation of base64 encoder
-//
-// Check out
-// http://tools.ietf.org/html/rfc2045 for formal description, but what we
-// care about is that...
-//   Take the encoded stuff in groups of 4 characters and turn each
-//   character into a code 0 to 63 thus:
-//           A-Z map to 0 to 25
-//           a-z map to 26 to 51
-//           0-9 map to 52 to 61
-//           +(- for WebSafe) maps to 62
-//           /(_ for WebSafe) maps to 63
-//   There will be four numbers, all less than 64 which can be represented
-//   by a 6 digit binary number (aaaaaa, bbbbbb, cccccc, dddddd respectively).
-//   Arrange the 6 digit binary numbers into three bytes as such:
-//   aaaaaabb bbbbcccc ccdddddd
-//   Equals signs (one or two) are used at the end of the encoded block to
-//   indicate that the text was not an integer multiple of three bytes long.
-// ----------------------------------------------------------------------
-
-int Base64UnescapeInternal(const char *src_param, int szsrc,
-                           char *dest, int szdest,
-                           const signed char* unbase64) {
-  static const char kPad64Equals = '=';
-  static const char kPad64Dot = '.';
-
-  int decode = 0;
-  int destidx = 0;
-  int state = 0;
-  unsigned int ch = 0;
-  unsigned int temp = 0;
-
-  // If "char" is signed by default, using *src as an array index results in
-  // accessing negative array elements. Treat the input as a pointer to
-  // unsigned char to avoid this.
-  const unsigned char *src = reinterpret_cast<const unsigned char*>(src_param);
-
-  // The GET_INPUT macro gets the next input character, skipping
-  // over any whitespace, and stopping when we reach the end of the
-  // string or when we read any non-data character.  The arguments are
-  // an arbitrary identifier (used as a label for goto) and the number
-  // of data bytes that must remain in the input to avoid aborting the
-  // loop.
-#define GET_INPUT(label, remain)                 \
-  label:                                         \
-    --szsrc;                                     \
-    ch = *src++;                                 \
-    decode = unbase64[ch];                       \
-    if (decode < 0) {                            \
-      if (ascii_isspace(ch) && szsrc >= remain)  \
-        goto label;                              \
-      state = 4 - remain;                        \
-      break;                                     \
-    }
-
-  // if dest is null, we're just checking to see if it's legal input
-  // rather than producing output.  (I suspect this could just be done
-  // with a regexp...).  We duplicate the loop so this test can be
-  // outside it instead of in every iteration.
-
-  if (dest) {
-    // This loop consumes 4 input bytes and produces 3 output bytes
-    // per iteration.  We can't know at the start that there is enough
-    // data left in the string for a full iteration, so the loop may
-    // break out in the middle; if so 'state' will be set to the
-    // number of input bytes read.
-
-    while (szsrc >= 4)  {
-      // We'll start by optimistically assuming that the next four
-      // bytes of the string (src[0..3]) are four good data bytes
-      // (that is, no nulls, whitespace, padding chars, or illegal
-      // chars).  We need to test src[0..2] for nulls individually
-      // before constructing temp to preserve the property that we
-      // never read past a null in the string (no matter how long
-      // szsrc claims the string is).
-
-      if (!src[0] || !src[1] || !src[2] ||
-          (temp = ((unsigned(unbase64[src[0]]) << 18) |
-                   (unsigned(unbase64[src[1]]) << 12) |
-                   (unsigned(unbase64[src[2]]) << 6) |
-                   (unsigned(unbase64[src[3]])))) & 0x80000000) {
-        // Iff any of those four characters was bad (null, illegal,
-        // whitespace, padding), then temp's high bit will be set
-        // (because unbase64[] is -1 for all bad characters).
-        //
-        // We'll back up and resort to the slower decoder, which knows
-        // how to handle those cases.
-
-        GET_INPUT(first, 4);
-        temp = decode;
-        GET_INPUT(second, 3);
-        temp = (temp << 6) | decode;
-        GET_INPUT(third, 2);
-        temp = (temp << 6) | decode;
-        GET_INPUT(fourth, 1);
-        temp = (temp << 6) | decode;
-      } else {
-        // We really did have four good data bytes, so advance four
-        // characters in the string.
-
-        szsrc -= 4;
-        src += 4;
-        decode = -1;
-        ch = '\0';
-      }
-
-      // temp has 24 bits of input, so write that out as three bytes.
-
-      if (destidx+3 > szdest) return -1;
-      dest[destidx+2] = temp;
-      temp >>= 8;
-      dest[destidx+1] = temp;
-      temp >>= 8;
-      dest[destidx] = temp;
-      destidx += 3;
-    }
-  } else {
-    while (szsrc >= 4)  {
-      if (!src[0] || !src[1] || !src[2] ||
-          (temp = ((unsigned(unbase64[src[0]]) << 18) |
-                   (unsigned(unbase64[src[1]]) << 12) |
-                   (unsigned(unbase64[src[2]]) << 6) |
-                   (unsigned(unbase64[src[3]])))) & 0x80000000) {
-        GET_INPUT(first_no_dest, 4);
-        GET_INPUT(second_no_dest, 3);
-        GET_INPUT(third_no_dest, 2);
-        GET_INPUT(fourth_no_dest, 1);
-      } else {
-        szsrc -= 4;
-        src += 4;
-        decode = -1;
-        ch = '\0';
-      }
-      destidx += 3;
-    }
-  }
-
-#undef GET_INPUT
-
-  // if the loop terminated because we read a bad character, return
-  // now.
-  if (decode < 0 && ch != '\0' &&
-      ch != kPad64Equals && ch != kPad64Dot && !ascii_isspace(ch))
-    return -1;
-
-  if (ch == kPad64Equals || ch == kPad64Dot) {
-    // if we stopped by hitting an '=' or '.', un-read that character -- we'll
-    // look at it again when we count to check for the proper number of
-    // equals signs at the end.
-    ++szsrc;
-    --src;
-  } else {
-    // This loop consumes 1 input byte per iteration.  It's used to
-    // clean up the 0-3 input bytes remaining when the first, faster
-    // loop finishes.  'temp' contains the data from 'state' input
-    // characters read by the first loop.
-    while (szsrc > 0)  {
-      --szsrc;
-      ch = *src++;
-      decode = unbase64[ch];
-      if (decode < 0) {
-        if (ascii_isspace(ch)) {
-          continue;
-        } else if (ch == '\0') {
-          break;
-        } else if (ch == kPad64Equals || ch == kPad64Dot) {
-          // back up one character; we'll read it again when we check
-          // for the correct number of pad characters at the end.
-          ++szsrc;
-          --src;
-          break;
-        } else {
-          return -1;
-        }
-      }
-
-      // Each input character gives us six bits of output.
-      temp = (temp << 6) | decode;
-      ++state;
-      if (state == 4) {
-        // If we've accumulated 24 bits of output, write that out as
-        // three bytes.
-        if (dest) {
-          if (destidx+3 > szdest) return -1;
-          dest[destidx+2] = temp;
-          temp >>= 8;
-          dest[destidx+1] = temp;
-          temp >>= 8;
-          dest[destidx] = temp;
-        }
-        destidx += 3;
-        state = 0;
-        temp = 0;
-      }
-    }
-  }
-
-  // Process the leftover data contained in 'temp' at the end of the input.
-  int expected_equals = 0;
-  switch (state) {
-    case 0:
-      // Nothing left over; output is a multiple of 3 bytes.
-      break;
-
-    case 1:
-      // Bad input; we have 6 bits left over.
-      return -1;
-
-    case 2:
-      // Produce one more output byte from the 12 input bits we have left.
-      if (dest) {
-        if (destidx+1 > szdest) return -1;
-        temp >>= 4;
-        dest[destidx] = temp;
-      }
-      ++destidx;
-      expected_equals = 2;
-      break;
-
-    case 3:
-      // Produce two more output bytes from the 18 input bits we have left.
-      if (dest) {
-        if (destidx+2 > szdest) return -1;
-        temp >>= 2;
-        dest[destidx+1] = temp;
-        temp >>= 8;
-        dest[destidx] = temp;
-      }
-      destidx += 2;
-      expected_equals = 1;
-      break;
-
-    default:
-      // state should have no other values at this point.
-      GOOGLE_LOG(FATAL) << "This can't happen; base64 decoder state = " << state;
-  }
-
-  // The remainder of the string should be all whitespace, mixed with
-  // exactly 0 equals signs, or exactly 'expected_equals' equals
-  // signs.  (Always accepting 0 equals signs is a google extension
-  // not covered in the RFC, as is accepting dot as the pad character.)
-
-  int equals = 0;
-  while (szsrc > 0 && *src) {
-    if (*src == kPad64Equals || *src == kPad64Dot)
-      ++equals;
-    else if (!ascii_isspace(*src))
-      return -1;
-    --szsrc;
-    ++src;
-  }
-
-  return (equals == 0 || equals == expected_equals) ? destidx : -1;
-}
-
-// The arrays below were generated by the following code
-// #include <sys/time.h>
-// #include <stdlib.h>
-// #include <string.h>
-// #include <stdio.h>
-// main()
-// {
-//   static const char Base64[] =
-//     "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-//   const char *pos;
-//   int idx, i, j;
-//   printf("    ");
-//   for (i = 0; i < 255; i += 8) {
-//     for (j = i; j < i + 8; j++) {
-//       pos = strchr(Base64, j);
-//       if ((pos == nullptr) || (j == 0))
-//         idx = -1;
-//       else
-//         idx = pos - Base64;
-//       if (idx == -1)
-//         printf(" %2d,     ", idx);
-//       else
-//         printf(" %2d/""*%c*""/,", idx, j);
-//     }
-//     printf("\n    ");
-//   }
-// }
-//
-// where the value of "Base64[]" was replaced by one of the base-64 conversion
-// tables from the functions below.
-static const signed char kUnBase64[] = {
-  -1,      -1,      -1,      -1,      -1,      -1,      -1,      -1,
-  -1,      -1,      -1,      -1,      -1,      -1,      -1,      -1,
-  -1,      -1,      -1,      -1,      -1,      -1,      -1,      -1,
-  -1,      -1,      -1,      -1,      -1,      -1,      -1,      -1,
-  -1,      -1,      -1,      -1,      -1,      -1,      -1,      -1,
-  -1,      -1,      -1,      62/*+*/, -1,      -1,      -1,      63/*/ */,
-  52/*0*/, 53/*1*/, 54/*2*/, 55/*3*/, 56/*4*/, 57/*5*/, 58/*6*/, 59/*7*/,
-  60/*8*/, 61/*9*/, -1,      -1,      -1,      -1,      -1,      -1,
-  -1,       0/*A*/,  1/*B*/,  2/*C*/,  3/*D*/,  4/*E*/,  5/*F*/,  6/*G*/,
-   7/*H*/,  8/*I*/,  9/*J*/, 10/*K*/, 11/*L*/, 12/*M*/, 13/*N*/, 14/*O*/,
-  15/*P*/, 16/*Q*/, 17/*R*/, 18/*S*/, 19/*T*/, 20/*U*/, 21/*V*/, 22/*W*/,
-  23/*X*/, 24/*Y*/, 25/*Z*/, -1,      -1,      -1,      -1,      -1,
-  -1,      26/*a*/, 27/*b*/, 28/*c*/, 29/*d*/, 30/*e*/, 31/*f*/, 32/*g*/,
-  33/*h*/, 34/*i*/, 35/*j*/, 36/*k*/, 37/*l*/, 38/*m*/, 39/*n*/, 40/*o*/,
-  41/*p*/, 42/*q*/, 43/*r*/, 44/*s*/, 45/*t*/, 46/*u*/, 47/*v*/, 48/*w*/,
-  49/*x*/, 50/*y*/, 51/*z*/, -1,      -1,      -1,      -1,      -1,
-  -1,      -1,      -1,      -1,      -1,      -1,      -1,      -1,
-  -1,      -1,      -1,      -1,      -1,      -1,      -1,      -1,
-  -1,      -1,      -1,      -1,      -1,      -1,      -1,      -1,
-  -1,      -1,      -1,      -1,      -1,      -1,      -1,      -1,
-  -1,      -1,      -1,      -1,      -1,      -1,      -1,      -1,
-  -1,      -1,      -1,      -1,      -1,      -1,      -1,      -1,
-  -1,      -1,      -1,      -1,      -1,      -1,      -1,      -1,
-  -1,      -1,      -1,      -1,      -1,      -1,      -1,      -1,
-  -1,      -1,      -1,      -1,      -1,      -1,      -1,      -1,
-  -1,      -1,      -1,      -1,      -1,      -1,      -1,      -1,
-  -1,      -1,      -1,      -1,      -1,      -1,      -1,      -1,
-  -1,      -1,      -1,      -1,      -1,      -1,      -1,      -1,
-  -1,      -1,      -1,      -1,      -1,      -1,      -1,      -1,
-  -1,      -1,      -1,      -1,      -1,      -1,      -1,      -1,
-  -1,      -1,      -1,      -1,      -1,      -1,      -1,      -1,
-  -1,      -1,      -1,      -1,      -1,      -1,      -1,      -1
-};
-static const signed char kUnWebSafeBase64[] = {
-  -1,      -1,      -1,      -1,      -1,      -1,      -1,      -1,
-  -1,      -1,      -1,      -1,      -1,      -1,      -1,      -1,
-  -1,      -1,      -1,      -1,      -1,      -1,      -1,      -1,
-  -1,      -1,      -1,      -1,      -1,      -1,      -1,      -1,
-  -1,      -1,      -1,      -1,      -1,      -1,      -1,      -1,
-  -1,      -1,      -1,      -1,      -1,      62/*-*/, -1,      -1,
-  52/*0*/, 53/*1*/, 54/*2*/, 55/*3*/, 56/*4*/, 57/*5*/, 58/*6*/, 59/*7*/,
-  60/*8*/, 61/*9*/, -1,      -1,      -1,      -1,      -1,      -1,
-  -1,       0/*A*/,  1/*B*/,  2/*C*/,  3/*D*/,  4/*E*/,  5/*F*/,  6/*G*/,
-   7/*H*/,  8/*I*/,  9/*J*/, 10/*K*/, 11/*L*/, 12/*M*/, 13/*N*/, 14/*O*/,
-  15/*P*/, 16/*Q*/, 17/*R*/, 18/*S*/, 19/*T*/, 20/*U*/, 21/*V*/, 22/*W*/,
-  23/*X*/, 24/*Y*/, 25/*Z*/, -1,      -1,      -1,      -1,      63/*_*/,
-  -1,      26/*a*/, 27/*b*/, 28/*c*/, 29/*d*/, 30/*e*/, 31/*f*/, 32/*g*/,
-  33/*h*/, 34/*i*/, 35/*j*/, 36/*k*/, 37/*l*/, 38/*m*/, 39/*n*/, 40/*o*/,
-  41/*p*/, 42/*q*/, 43/*r*/, 44/*s*/, 45/*t*/, 46/*u*/, 47/*v*/, 48/*w*/,
-  49/*x*/, 50/*y*/, 51/*z*/, -1,      -1,      -1,      -1,      -1,
-  -1,      -1,      -1,      -1,      -1,      -1,      -1,      -1,
-  -1,      -1,      -1,      -1,      -1,      -1,      -1,      -1,
-  -1,      -1,      -1,      -1,      -1,      -1,      -1,      -1,
-  -1,      -1,      -1,      -1,      -1,      -1,      -1,      -1,
-  -1,      -1,      -1,      -1,      -1,      -1,      -1,      -1,
-  -1,      -1,      -1,      -1,      -1,      -1,      -1,      -1,
-  -1,      -1,      -1,      -1,      -1,      -1,      -1,      -1,
-  -1,      -1,      -1,      -1,      -1,      -1,      -1,      -1,
-  -1,      -1,      -1,      -1,      -1,      -1,      -1,      -1,
-  -1,      -1,      -1,      -1,      -1,      -1,      -1,      -1,
-  -1,      -1,      -1,      -1,      -1,      -1,      -1,      -1,
-  -1,      -1,      -1,      -1,      -1,      -1,      -1,      -1,
-  -1,      -1,      -1,      -1,      -1,      -1,      -1,      -1,
-  -1,      -1,      -1,      -1,      -1,      -1,      -1,      -1,
-  -1,      -1,      -1,      -1,      -1,      -1,      -1,      -1,
-  -1,      -1,      -1,      -1,      -1,      -1,      -1,      -1
-};
-
-int WebSafeBase64Unescape(const char *src, int szsrc, char *dest, int szdest) {
-  return Base64UnescapeInternal(src, szsrc, dest, szdest, kUnWebSafeBase64);
-}
-
-static bool Base64UnescapeInternal(const char *src, int slen, std::string *dest,
-                                   const signed char *unbase64) {
-  // Determine the size of the output string.  Base64 encodes every 3 bytes into
-  // 4 characters.  any leftover chars are added directly for good measure.
-  // This is documented in the base64 RFC: http://tools.ietf.org/html/rfc3548
-  const int dest_len = 3 * (slen / 4) + (slen % 4);
-
-  dest->resize(dest_len);
-
-  // We are getting the destination buffer by getting the beginning of the
-  // string and converting it into a char *.
-  const int len = Base64UnescapeInternal(src, slen, string_as_array(dest),
-                                         dest_len, unbase64);
-  if (len < 0) {
-    dest->clear();
-    return false;
-  }
-
-  // could be shorter if there was padding
-  GOOGLE_DCHECK_LE(len, dest_len);
-  dest->erase(len);
-
-  return true;
-}
-
-bool Base64Unescape(StringPiece src, std::string *dest) {
-  return Base64UnescapeInternal(src.data(), src.size(), dest, kUnBase64);
-}
-
-bool WebSafeBase64Unescape(StringPiece src, std::string *dest) {
-  return Base64UnescapeInternal(src.data(), src.size(), dest, kUnWebSafeBase64);
-}
-
-int Base64EscapeInternal(const unsigned char *src, int szsrc,
-                         char *dest, int szdest, const char *base64,
-                         bool do_padding) {
-  static const char kPad64 = '=';
-
-  if (szsrc <= 0) return 0;
-
-  if (szsrc * 4 > szdest * 3) return 0;
-
-  char *cur_dest = dest;
-  const unsigned char *cur_src = src;
-
-  char *limit_dest = dest + szdest;
-  const unsigned char *limit_src = src + szsrc;
-
-  // Three bytes of data encodes to four characters of ciphertext.
-  // So we can pump through three-byte chunks atomically.
-  while (cur_src < limit_src - 3) {  // keep going as long as we have >= 32 bits
-    uint32_t in = BigEndian::Load32(cur_src) >> 8;
-
-    cur_dest[0] = base64[in >> 18];
-    in &= 0x3FFFF;
-    cur_dest[1] = base64[in >> 12];
-    in &= 0xFFF;
-    cur_dest[2] = base64[in >> 6];
-    in &= 0x3F;
-    cur_dest[3] = base64[in];
-
-    cur_dest += 4;
-    cur_src += 3;
-  }
-  // To save time, we didn't update szdest or szsrc in the loop.  So do it now.
-  szdest = limit_dest - cur_dest;
-  szsrc = limit_src - cur_src;
-
-  /* now deal with the tail (<=3 bytes) */
-  switch (szsrc) {
-    case 0:
-      // Nothing left; nothing more to do.
-      break;
-    case 1: {
-      // One byte left: this encodes to two characters, and (optionally)
-      // two pad characters to round out the four-character cipherblock.
-      if ((szdest -= 2) < 0) return 0;
-      uint32_t in = cur_src[0];
-      cur_dest[0] = base64[in >> 2];
-      in &= 0x3;
-      cur_dest[1] = base64[in << 4];
-      cur_dest += 2;
-      if (do_padding) {
-        if ((szdest -= 2) < 0) return 0;
-        cur_dest[0] = kPad64;
-        cur_dest[1] = kPad64;
-        cur_dest += 2;
-      }
-      break;
-    }
-    case 2: {
-      // Two bytes left: this encodes to three characters, and (optionally)
-      // one pad character to round out the four-character cipherblock.
-      if ((szdest -= 3) < 0) return 0;
-      uint32_t in = BigEndian::Load16(cur_src);
-      cur_dest[0] = base64[in >> 10];
-      in &= 0x3FF;
-      cur_dest[1] = base64[in >> 4];
-      in &= 0x00F;
-      cur_dest[2] = base64[in << 2];
-      cur_dest += 3;
-      if (do_padding) {
-        if ((szdest -= 1) < 0) return 0;
-        cur_dest[0] = kPad64;
-        cur_dest += 1;
-      }
-      break;
-    }
-    case 3: {
-      // Three bytes left: same as in the big loop above.  We can't do this in
-      // the loop because the loop above always reads 4 bytes, and the fourth
-      // byte is past the end of the input.
-      if ((szdest -= 4) < 0) return 0;
-      uint32_t in = (cur_src[0] << 16) + BigEndian::Load16(cur_src + 1);
-      cur_dest[0] = base64[in >> 18];
-      in &= 0x3FFFF;
-      cur_dest[1] = base64[in >> 12];
-      in &= 0xFFF;
-      cur_dest[2] = base64[in >> 6];
-      in &= 0x3F;
-      cur_dest[3] = base64[in];
-      cur_dest += 4;
-      break;
-    }
-    default:
-      // Should not be reached: blocks of 4 bytes are handled
-      // in the while loop before this switch statement.
-      GOOGLE_LOG(FATAL) << "Logic problem? szsrc = " << szsrc;
-      break;
-  }
-  return (cur_dest - dest);
-}
-
-static const char kBase64Chars[] =
-"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-
-static const char kWebSafeBase64Chars[] =
-"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_";
-
-int Base64Escape(const unsigned char *src, int szsrc, char *dest, int szdest) {
-  return Base64EscapeInternal(src, szsrc, dest, szdest, kBase64Chars, true);
-}
-int WebSafeBase64Escape(const unsigned char *src, int szsrc, char *dest,
-                        int szdest, bool do_padding) {
-  return Base64EscapeInternal(src, szsrc, dest, szdest,
-                              kWebSafeBase64Chars, do_padding);
-}
-
-void Base64EscapeInternal(const unsigned char *src, int szsrc,
-                          std::string *dest, bool do_padding,
-                          const char *base64_chars) {
-  const int calc_escaped_size =
-    CalculateBase64EscapedLen(szsrc, do_padding);
-  dest->resize(calc_escaped_size);
-  const int escaped_len = Base64EscapeInternal(src, szsrc,
-                                               string_as_array(dest),
-                                               dest->size(),
-                                               base64_chars,
-                                               do_padding);
-  GOOGLE_DCHECK_EQ(calc_escaped_size, escaped_len);
-  dest->erase(escaped_len);
-}
-
-void Base64Escape(const unsigned char *src, int szsrc, std::string *dest,
-                  bool do_padding) {
-  Base64EscapeInternal(src, szsrc, dest, do_padding, kBase64Chars);
-}
-
-void WebSafeBase64Escape(const unsigned char *src, int szsrc, std::string *dest,
-                         bool do_padding) {
-  Base64EscapeInternal(src, szsrc, dest, do_padding, kWebSafeBase64Chars);
-}
-
-void Base64Escape(StringPiece src, std::string *dest) {
-  Base64Escape(reinterpret_cast<const unsigned char*>(src.data()),
-               src.size(), dest, true);
-}
-
-void WebSafeBase64Escape(StringPiece src, std::string *dest) {
-  WebSafeBase64Escape(reinterpret_cast<const unsigned char*>(src.data()),
-                      src.size(), dest, false);
-}
-
-void WebSafeBase64EscapeWithPadding(StringPiece src, std::string *dest) {
-  WebSafeBase64Escape(reinterpret_cast<const unsigned char*>(src.data()),
-                      src.size(), dest, true);
-}
-
-// Helper to append a Unicode code point to a string as UTF8, without bringing
-// in any external dependencies.
-int EncodeAsUTF8Char(uint32_t code_point, char* output) {
-  uint32_t tmp = 0;
-  int len = 0;
-  if (code_point <= 0x7f) {
-    tmp = code_point;
-    len = 1;
-  } else if (code_point <= 0x07ff) {
-    tmp = 0x0000c080 |
-        ((code_point & 0x07c0) << 2) |
-        (code_point & 0x003f);
-    len = 2;
-  } else if (code_point <= 0xffff) {
-    tmp = 0x00e08080 |
-        ((code_point & 0xf000) << 4) |
-        ((code_point & 0x0fc0) << 2) |
-        (code_point & 0x003f);
-    len = 3;
-  } else {
-    // UTF-16 is only defined for code points up to 0x10FFFF, and UTF-8 is
-    // normally only defined up to there as well.
-    tmp = 0xf0808080 |
-        ((code_point & 0x1c0000) << 6) |
-        ((code_point & 0x03f000) << 4) |
-        ((code_point & 0x000fc0) << 2) |
-        (code_point & 0x003f);
-    len = 4;
-  }
-  tmp = ghtonl(tmp);
-  memcpy(output, reinterpret_cast<const char*>(&tmp) + sizeof(tmp) - len, len);
-  return len;
-}
-
-// Table of UTF-8 character lengths, based on first byte
-static const unsigned char kUTF8LenTbl[256] = {
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-    3, 3, 4, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1};
-
-// Return length of a single UTF-8 source character
-int UTF8FirstLetterNumBytes(const char* src, int len) {
-  if (len == 0) {
-    return 0;
-  }
-  return kUTF8LenTbl[*reinterpret_cast<const uint8_t*>(src)];
-}
-
-// ----------------------------------------------------------------------
-// CleanStringLineEndings()
-//   Clean up a multi-line string to conform to Unix line endings.
-//   Reads from src and appends to dst, so usually dst should be empty.
-//
-//   If there is no line ending at the end of a non-empty string, it can
-//   be added automatically.
-//
-//   Four different types of input are correctly handled:
-//
-//     - Unix/Linux files: line ending is LF: pass through unchanged
-//
-//     - DOS/Windows files: line ending is CRLF: convert to LF
-//
-//     - Legacy Mac files: line ending is CR: convert to LF
-//
-//     - Garbled files: random line endings: convert gracefully
-//                      lonely CR, lonely LF, CRLF: convert to LF
-//
-//   @param src The multi-line string to convert
-//   @param dst The converted string is appended to this string
-//   @param auto_end_last_line Automatically terminate the last line
-//
-//   Limitations:
-//
-//     This does not do the right thing for CRCRLF files created by
-//     broken programs that do another Unix->DOS conversion on files
-//     that are already in CRLF format.  For this, a two-pass approach
-//     brute-force would be needed that
-//
-//       (1) determines the presence of LF (first one is ok)
-//       (2) if yes, removes any CR, else convert every CR to LF
-
-void CleanStringLineEndings(const std::string &src, std::string *dst,
-                            bool auto_end_last_line) {
-  if (dst->empty()) {
-    dst->append(src);
-    CleanStringLineEndings(dst, auto_end_last_line);
-  } else {
-    std::string tmp = src;
-    CleanStringLineEndings(&tmp, auto_end_last_line);
-    dst->append(tmp);
-  }
-}
-
-void CleanStringLineEndings(std::string *str, bool auto_end_last_line) {
-  ptrdiff_t output_pos = 0;
-  bool r_seen = false;
-  ptrdiff_t len = str->size();
-
-  char *p = &(*str)[0];
-
-  for (ptrdiff_t input_pos = 0; input_pos < len;) {
-    if (!r_seen && input_pos + 8 < len) {
-      uint64_t v = GOOGLE_UNALIGNED_LOAD64(p + input_pos);
-      // Loop over groups of 8 bytes at a time until we come across
-      // a word that has a byte whose value is less than or equal to
-      // '\r' (i.e. could contain a \n (0x0a) or a \r (0x0d) ).
-      //
-      // We use a has_less macro that quickly tests a whole 64-bit
-      // word to see if any of the bytes has a value < N.
-      //
-      // For more details, see:
-      //   http://graphics.stanford.edu/~seander/bithacks.html#HasLessInWord
-#define has_less(x, n) (((x) - ~0ULL / 255 * (n)) & ~(x) & ~0ULL / 255 * 128)
-      if (!has_less(v, '\r' + 1)) {
-#undef has_less
-        // No byte in this word has a value that could be a \r or a \n
-        if (output_pos != input_pos) {
-          GOOGLE_UNALIGNED_STORE64(p + output_pos, v);
-        }
-        input_pos += 8;
-        output_pos += 8;
-        continue;
-      }
-    }
-    std::string::const_reference in = p[input_pos];
-    if (in == '\r') {
-      if (r_seen) p[output_pos++] = '\n';
-      r_seen = true;
-    } else if (in == '\n') {
-      if (input_pos != output_pos)
-        p[output_pos++] = '\n';
-      else
-        output_pos++;
-      r_seen = false;
-    } else {
-      if (r_seen) p[output_pos++] = '\n';
-      r_seen = false;
-      if (input_pos != output_pos)
-        p[output_pos++] = in;
-      else
-        output_pos++;
-    }
-    input_pos++;
-  }
-  if (r_seen ||
-      (auto_end_last_line && output_pos > 0 && p[output_pos - 1] != '\n')) {
-    str->resize(output_pos + 1);
-    str->operator[](output_pos) = '\n';
-  } else if (output_pos < len) {
-    str->resize(output_pos);
-  }
-}
-
-namespace internal {
-
-// ----------------------------------------------------------------------
-// NoLocaleStrtod()
-//   This code will make you cry.
-// ----------------------------------------------------------------------
-
-namespace {
-
-// Returns a string identical to *input except that the character pointed to
-// by radix_pos (which should be '.') is replaced with the locale-specific
-// radix character.
-std::string LocalizeRadix(const char *input, const char *radix_pos) {
-  // Determine the locale-specific radix character by calling sprintf() to
-  // print the number 1.5, then stripping off the digits.  As far as I can
-  // tell, this is the only portable, thread-safe way to get the C library
-  // to divuldge the locale's radix character.  No, localeconv() is NOT
-  // thread-safe.
-  char temp[16];
-  int size = snprintf(temp, sizeof(temp), "%.1f", 1.5);
-  GOOGLE_CHECK_EQ(temp[0], '1');
-  GOOGLE_CHECK_EQ(temp[size - 1], '5');
-  GOOGLE_CHECK_LE(size, 6);
-
-  // Now replace the '.' in the input with it.
-  std::string result;
-  result.reserve(strlen(input) + size - 3);
-  result.append(input, radix_pos);
-  result.append(temp + 1, size - 2);
-  result.append(radix_pos + 1);
-  return result;
-}
-
-}  // namespace
-
-double NoLocaleStrtod(const char *str, char **endptr) {
-  // We cannot simply set the locale to "C" temporarily with setlocale()
-  // as this is not thread-safe.  Instead, we try to parse in the current
-  // locale first.  If parsing stops at a '.' character, then this is a
-  // pretty good hint that we're actually in some other locale in which
-  // '.' is not the radix character.
-
-  char *temp_endptr;
-  double result = strtod(str, &temp_endptr);
-  if (endptr != NULL) *endptr = temp_endptr;
-  if (*temp_endptr != '.') return result;
-
-  // Parsing halted on a '.'.  Perhaps we're in a different locale?  Let's
-  // try to replace the '.' with a locale-specific radix character and
-  // try again.
-  std::string localized = LocalizeRadix(str, temp_endptr);
-  const char *localized_cstr = localized.c_str();
-  char *localized_endptr;
-  result = strtod(localized_cstr, &localized_endptr);
-  if ((localized_endptr - localized_cstr) > (temp_endptr - str)) {
-    // This attempt got further, so replacing the decimal must have helped.
-    // Update endptr to point at the right location.
-    if (endptr != NULL) {
-      // size_diff is non-zero if the localized radix has multiple bytes.
-      int size_diff = localized.size() - strlen(str);
-      // const_cast is necessary to match the strtod() interface.
-      *endptr = const_cast<char *>(
-          str + (localized_endptr - localized_cstr - size_diff));
-    }
-  }
-
-  return result;
-}
-
-}  // namespace internal
-
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/stubs/strutil.h b/libs/protobuf/src/google/protobuf/stubs/strutil.h
deleted file mode 100644
index 9658abf..0000000
--- a/libs/protobuf/src/google/protobuf/stubs/strutil.h
+++ /dev/null
@@ -1,950 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// from google3/strings/strutil.h
-
-#ifndef GOOGLE_PROTOBUF_STUBS_STRUTIL_H__
-#define GOOGLE_PROTOBUF_STUBS_STRUTIL_H__
-
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/stubs/stringpiece.h>
-#include <stdlib.h>
-
-#include <cstring>
-#include <google/protobuf/port_def.inc>
-#include <vector>
-
-namespace google {
-namespace protobuf {
-
-#if defined(_MSC_VER) && _MSC_VER < 1800
-#define strtoll  _strtoi64
-#define strtoull _strtoui64
-#elif defined(__DECCXX) && defined(__osf__)
-// HP C++ on Tru64 does not have strtoll, but strtol is already 64-bit.
-#define strtoll strtol
-#define strtoull strtoul
-#endif
-
-// ----------------------------------------------------------------------
-// ascii_isalnum()
-//    Check if an ASCII character is alphanumeric.  We can't use ctype's
-//    isalnum() because it is affected by locale.  This function is applied
-//    to identifiers in the protocol buffer language, not to natural-language
-//    strings, so locale should not be taken into account.
-// ascii_isdigit()
-//    Like above, but only accepts digits.
-// ascii_isspace()
-//    Check if the character is a space character.
-// ----------------------------------------------------------------------
-
-inline bool ascii_isalnum(char c) {
-  return ('a' <= c && c <= 'z') ||
-         ('A' <= c && c <= 'Z') ||
-         ('0' <= c && c <= '9');
-}
-
-inline bool ascii_isdigit(char c) {
-  return ('0' <= c && c <= '9');
-}
-
-inline bool ascii_isspace(char c) {
-  return c == ' ' || c == '\t' || c == '\n' || c == '\v' || c == '\f' ||
-      c == '\r';
-}
-
-inline bool ascii_isupper(char c) {
-  return c >= 'A' && c <= 'Z';
-}
-
-inline bool ascii_islower(char c) {
-  return c >= 'a' && c <= 'z';
-}
-
-inline char ascii_toupper(char c) {
-  return ascii_islower(c) ? c - ('a' - 'A') : c;
-}
-
-inline char ascii_tolower(char c) {
-  return ascii_isupper(c) ? c + ('a' - 'A') : c;
-}
-
-inline int hex_digit_to_int(char c) {
-  /* Assume ASCII. */
-  int x = static_cast<unsigned char>(c);
-  if (x > '9') {
-    x += 9;
-  }
-  return x & 0xf;
-}
-
-// ----------------------------------------------------------------------
-// HasPrefixString()
-//    Check if a string begins with a given prefix.
-// StripPrefixString()
-//    Given a string and a putative prefix, returns the string minus the
-//    prefix string if the prefix matches, otherwise the original
-//    string.
-// ----------------------------------------------------------------------
-inline bool HasPrefixString(StringPiece str, StringPiece prefix) {
-  return str.size() >= prefix.size() &&
-         memcmp(str.data(), prefix.data(), prefix.size()) == 0;
-}
-
-inline std::string StripPrefixString(const std::string& str,
-                                     const std::string& prefix) {
-  if (HasPrefixString(str, prefix)) {
-    return str.substr(prefix.size());
-  } else {
-    return str;
-  }
-}
-
-// ----------------------------------------------------------------------
-// HasSuffixString()
-//    Return true if str ends in suffix.
-// StripSuffixString()
-//    Given a string and a putative suffix, returns the string minus the
-//    suffix string if the suffix matches, otherwise the original
-//    string.
-// ----------------------------------------------------------------------
-inline bool HasSuffixString(StringPiece str, StringPiece suffix) {
-  return str.size() >= suffix.size() &&
-         memcmp(str.data() + str.size() - suffix.size(), suffix.data(),
-                suffix.size()) == 0;
-}
-
-inline std::string StripSuffixString(const std::string& str,
-                                     const std::string& suffix) {
-  if (HasSuffixString(str, suffix)) {
-    return str.substr(0, str.size() - suffix.size());
-  } else {
-    return str;
-  }
-}
-
-// ----------------------------------------------------------------------
-// ReplaceCharacters
-//    Replaces any occurrence of the character 'remove' (or the characters
-//    in 'remove') with the character 'replacewith'.
-//    Good for keeping html characters or protocol characters (\t) out
-//    of places where they might cause a problem.
-// StripWhitespace
-//    Removes whitespaces from both ends of the given string.
-// ----------------------------------------------------------------------
-PROTOBUF_EXPORT void ReplaceCharacters(std::string* s, const char* remove,
-                                       char replacewith);
-
-PROTOBUF_EXPORT void StripWhitespace(std::string* s);
-
-// ----------------------------------------------------------------------
-// LowerString()
-// UpperString()
-// ToUpper()
-//    Convert the characters in "s" to lowercase or uppercase.  ASCII-only:
-//    these functions intentionally ignore locale because they are applied to
-//    identifiers used in the Protocol Buffer language, not to natural-language
-//    strings.
-// ----------------------------------------------------------------------
-
-inline void LowerString(std::string* s) {
-  std::string::iterator end = s->end();
-  for (std::string::iterator i = s->begin(); i != end; ++i) {
-    // tolower() changes based on locale.  We don't want this!
-    if ('A' <= *i && *i <= 'Z') *i += 'a' - 'A';
-  }
-}
-
-inline void UpperString(std::string* s) {
-  std::string::iterator end = s->end();
-  for (std::string::iterator i = s->begin(); i != end; ++i) {
-    // toupper() changes based on locale.  We don't want this!
-    if ('a' <= *i && *i <= 'z') *i += 'A' - 'a';
-  }
-}
-
-inline void ToUpper(std::string* s) { UpperString(s); }
-
-inline std::string ToUpper(const std::string& s) {
-  std::string out = s;
-  UpperString(&out);
-  return out;
-}
-
-// ----------------------------------------------------------------------
-// StringReplace()
-//    Give me a string and two patterns "old" and "new", and I replace
-//    the first instance of "old" in the string with "new", if it
-//    exists.  RETURN a new string, regardless of whether the replacement
-//    happened or not.
-// ----------------------------------------------------------------------
-
-PROTOBUF_EXPORT std::string StringReplace(const std::string& s,
-                                          const std::string& oldsub,
-                                          const std::string& newsub,
-                                          bool replace_all);
-
-// ----------------------------------------------------------------------
-// SplitStringUsing()
-//    Split a string using a character delimiter. Append the components
-//    to 'result'.  If there are consecutive delimiters, this function skips
-//    over all of them.
-// ----------------------------------------------------------------------
-PROTOBUF_EXPORT void SplitStringUsing(StringPiece full, const char* delim,
-                                      std::vector<std::string>* res);
-
-// Split a string using one or more byte delimiters, presented
-// as a nul-terminated c string. Append the components to 'result'.
-// If there are consecutive delimiters, this function will return
-// corresponding empty strings.  If you want to drop the empty
-// strings, try SplitStringUsing().
-//
-// If "full" is the empty string, yields an empty string as the only value.
-// ----------------------------------------------------------------------
-PROTOBUF_EXPORT void SplitStringAllowEmpty(StringPiece full, const char* delim,
-                                           std::vector<std::string>* result);
-
-// ----------------------------------------------------------------------
-// Split()
-//    Split a string using a character delimiter.
-// ----------------------------------------------------------------------
-inline std::vector<std::string> Split(StringPiece full, const char* delim,
-                                      bool skip_empty = true) {
-  std::vector<std::string> result;
-  if (skip_empty) {
-    SplitStringUsing(full, delim, &result);
-  } else {
-    SplitStringAllowEmpty(full, delim, &result);
-  }
-  return result;
-}
-
-// ----------------------------------------------------------------------
-// JoinStrings()
-//    These methods concatenate a vector of strings into a C++ string, using
-//    the C-string "delim" as a separator between components. There are two
-//    flavors of the function, one flavor returns the concatenated string,
-//    another takes a pointer to the target string. In the latter case the
-//    target string is cleared and overwritten.
-// ----------------------------------------------------------------------
-PROTOBUF_EXPORT void JoinStrings(const std::vector<std::string>& components,
-                                 const char* delim, std::string* result);
-
-inline std::string JoinStrings(const std::vector<std::string>& components,
-                               const char* delim) {
-  std::string result;
-  JoinStrings(components, delim, &result);
-  return result;
-}
-
-// ----------------------------------------------------------------------
-// UnescapeCEscapeSequences()
-//    Copies "source" to "dest", rewriting C-style escape sequences
-//    -- '\n', '\r', '\\', '\ooo', etc -- to their ASCII
-//    equivalents.  "dest" must be sufficiently large to hold all
-//    the characters in the rewritten string (i.e. at least as large
-//    as strlen(source) + 1 should be safe, since the replacements
-//    are always shorter than the original escaped sequences).  It's
-//    safe for source and dest to be the same.  RETURNS the length
-//    of dest.
-//
-//    It allows hex sequences \xhh, or generally \xhhhhh with an
-//    arbitrary number of hex digits, but all of them together must
-//    specify a value of a single byte (e.g. \x0045 is equivalent
-//    to \x45, and \x1234 is erroneous).
-//
-//    It also allows escape sequences of the form \uhhhh (exactly four
-//    hex digits, upper or lower case) or \Uhhhhhhhh (exactly eight
-//    hex digits, upper or lower case) to specify a Unicode code
-//    point. The dest array will contain the UTF8-encoded version of
-//    that code-point (e.g., if source contains \u2019, then dest will
-//    contain the three bytes 0xE2, 0x80, and 0x99).
-//
-//    Errors: In the first form of the call, errors are reported with
-//    LOG(ERROR). The same is true for the second form of the call if
-//    the pointer to the string std::vector is nullptr; otherwise, error
-//    messages are stored in the std::vector. In either case, the effect on
-//    the dest array is not defined, but rest of the source will be
-//    processed.
-//    ----------------------------------------------------------------------
-
-PROTOBUF_EXPORT int UnescapeCEscapeSequences(const char* source, char* dest);
-PROTOBUF_EXPORT int UnescapeCEscapeSequences(const char* source, char* dest,
-                                             std::vector<std::string>* errors);
-
-// ----------------------------------------------------------------------
-// UnescapeCEscapeString()
-//    This does the same thing as UnescapeCEscapeSequences, but creates
-//    a new string. The caller does not need to worry about allocating
-//    a dest buffer. This should be used for non performance critical
-//    tasks such as printing debug messages. It is safe for src and dest
-//    to be the same.
-//
-//    The second call stores its errors in a supplied string vector.
-//    If the string vector pointer is nullptr, it reports the errors with LOG().
-//
-//    In the first and second calls, the length of dest is returned. In the
-//    the third call, the new string is returned.
-// ----------------------------------------------------------------------
-
-PROTOBUF_EXPORT int UnescapeCEscapeString(const std::string& src,
-                                          std::string* dest);
-PROTOBUF_EXPORT int UnescapeCEscapeString(const std::string& src,
-                                          std::string* dest,
-                                          std::vector<std::string>* errors);
-PROTOBUF_EXPORT std::string UnescapeCEscapeString(const std::string& src);
-
-// ----------------------------------------------------------------------
-// CEscape()
-//    Escapes 'src' using C-style escape sequences and returns the resulting
-//    string.
-//
-//    Escaped chars: \n, \r, \t, ", ', \, and !isprint().
-// ----------------------------------------------------------------------
-PROTOBUF_EXPORT std::string CEscape(const std::string& src);
-
-// ----------------------------------------------------------------------
-// CEscapeAndAppend()
-//    Escapes 'src' using C-style escape sequences, and appends the escaped
-//    string to 'dest'.
-// ----------------------------------------------------------------------
-PROTOBUF_EXPORT void CEscapeAndAppend(StringPiece src, std::string* dest);
-
-namespace strings {
-// Like CEscape() but does not escape bytes with the upper bit set.
-PROTOBUF_EXPORT std::string Utf8SafeCEscape(const std::string& src);
-
-// Like CEscape() but uses hex (\x) escapes instead of octals.
-PROTOBUF_EXPORT std::string CHexEscape(const std::string& src);
-}  // namespace strings
-
-// ----------------------------------------------------------------------
-// strto32()
-// strtou32()
-// strto64()
-// strtou64()
-//    Architecture-neutral plug compatible replacements for strtol() and
-//    strtoul().  Long's have different lengths on ILP-32 and LP-64
-//    platforms, so using these is safer, from the point of view of
-//    overflow behavior, than using the standard libc functions.
-// ----------------------------------------------------------------------
-PROTOBUF_EXPORT int32_t strto32_adaptor(const char* nptr, char** endptr,
-                                        int base);
-PROTOBUF_EXPORT uint32_t strtou32_adaptor(const char* nptr, char** endptr,
-                                          int base);
-
-inline int32_t strto32(const char *nptr, char **endptr, int base) {
-  if (sizeof(int32_t) == sizeof(long))
-    return strtol(nptr, endptr, base);
-  else
-    return strto32_adaptor(nptr, endptr, base);
-}
-
-inline uint32_t strtou32(const char *nptr, char **endptr, int base) {
-  if (sizeof(uint32_t) == sizeof(unsigned long))
-    return strtoul(nptr, endptr, base);
-  else
-    return strtou32_adaptor(nptr, endptr, base);
-}
-
-// For now, long long is 64-bit on all the platforms we care about, so these
-// functions can simply pass the call to strto[u]ll.
-inline int64_t strto64(const char *nptr, char **endptr, int base) {
-  static_assert(sizeof(int64_t) == sizeof(long long),
-                "sizeof int64_t is not sizeof long long");
-  return strtoll(nptr, endptr, base);
-}
-
-inline uint64_t strtou64(const char *nptr, char **endptr, int base) {
-  static_assert(sizeof(uint64_t) == sizeof(unsigned long long),
-                "sizeof uint64_t is not sizeof unsigned long long");
-  return strtoull(nptr, endptr, base);
-}
-
-// ----------------------------------------------------------------------
-// safe_strtob()
-// safe_strto32()
-// safe_strtou32()
-// safe_strto64()
-// safe_strtou64()
-// safe_strtof()
-// safe_strtod()
-// ----------------------------------------------------------------------
-PROTOBUF_EXPORT bool safe_strtob(StringPiece str, bool* value);
-
-PROTOBUF_EXPORT bool safe_strto32(const std::string& str, int32_t* value);
-PROTOBUF_EXPORT bool safe_strtou32(const std::string& str, uint32_t* value);
-inline bool safe_strto32(const char* str, int32_t* value) {
-  return safe_strto32(std::string(str), value);
-}
-inline bool safe_strto32(StringPiece str, int32_t* value) {
-  return safe_strto32(str.ToString(), value);
-}
-inline bool safe_strtou32(const char* str, uint32_t* value) {
-  return safe_strtou32(std::string(str), value);
-}
-inline bool safe_strtou32(StringPiece str, uint32_t* value) {
-  return safe_strtou32(str.ToString(), value);
-}
-
-PROTOBUF_EXPORT bool safe_strto64(const std::string& str, int64_t* value);
-PROTOBUF_EXPORT bool safe_strtou64(const std::string& str, uint64_t* value);
-inline bool safe_strto64(const char* str, int64_t* value) {
-  return safe_strto64(std::string(str), value);
-}
-inline bool safe_strto64(StringPiece str, int64_t* value) {
-  return safe_strto64(str.ToString(), value);
-}
-inline bool safe_strtou64(const char* str, uint64_t* value) {
-  return safe_strtou64(std::string(str), value);
-}
-inline bool safe_strtou64(StringPiece str, uint64_t* value) {
-  return safe_strtou64(str.ToString(), value);
-}
-
-PROTOBUF_EXPORT bool safe_strtof(const char* str, float* value);
-PROTOBUF_EXPORT bool safe_strtod(const char* str, double* value);
-inline bool safe_strtof(const std::string& str, float* value) {
-  return safe_strtof(str.c_str(), value);
-}
-inline bool safe_strtod(const std::string& str, double* value) {
-  return safe_strtod(str.c_str(), value);
-}
-inline bool safe_strtof(StringPiece str, float* value) {
-  return safe_strtof(str.ToString(), value);
-}
-inline bool safe_strtod(StringPiece str, double* value) {
-  return safe_strtod(str.ToString(), value);
-}
-
-// ----------------------------------------------------------------------
-// FastIntToBuffer()
-// FastHexToBuffer()
-// FastHex64ToBuffer()
-// FastHex32ToBuffer()
-// FastTimeToBuffer()
-//    These are intended for speed.  FastIntToBuffer() assumes the
-//    integer is non-negative.  FastHexToBuffer() puts output in
-//    hex rather than decimal.  FastTimeToBuffer() puts the output
-//    into RFC822 format.
-//
-//    FastHex64ToBuffer() puts a 64-bit unsigned value in hex-format,
-//    padded to exactly 16 bytes (plus one byte for '\0')
-//
-//    FastHex32ToBuffer() puts a 32-bit unsigned value in hex-format,
-//    padded to exactly 8 bytes (plus one byte for '\0')
-//
-//       All functions take the output buffer as an arg.
-//    They all return a pointer to the beginning of the output,
-//    which may not be the beginning of the input buffer.
-// ----------------------------------------------------------------------
-
-// Suggested buffer size for FastToBuffer functions.  Also works with
-// DoubleToBuffer() and FloatToBuffer().
-static const int kFastToBufferSize = 32;
-
-PROTOBUF_EXPORT char* FastInt32ToBuffer(int32_t i, char* buffer);
-PROTOBUF_EXPORT char* FastInt64ToBuffer(int64_t i, char* buffer);
-char* FastUInt32ToBuffer(uint32_t i, char* buffer);  // inline below
-char* FastUInt64ToBuffer(uint64_t i, char* buffer);  // inline below
-PROTOBUF_EXPORT char* FastHexToBuffer(int i, char* buffer);
-PROTOBUF_EXPORT char* FastHex64ToBuffer(uint64_t i, char* buffer);
-PROTOBUF_EXPORT char* FastHex32ToBuffer(uint32_t i, char* buffer);
-
-// at least 22 bytes long
-inline char* FastIntToBuffer(int i, char* buffer) {
-  return (sizeof(i) == 4 ?
-          FastInt32ToBuffer(i, buffer) : FastInt64ToBuffer(i, buffer));
-}
-inline char* FastUIntToBuffer(unsigned int i, char* buffer) {
-  return (sizeof(i) == 4 ?
-          FastUInt32ToBuffer(i, buffer) : FastUInt64ToBuffer(i, buffer));
-}
-inline char* FastLongToBuffer(long i, char* buffer) {
-  return (sizeof(i) == 4 ?
-          FastInt32ToBuffer(i, buffer) : FastInt64ToBuffer(i, buffer));
-}
-inline char* FastULongToBuffer(unsigned long i, char* buffer) {
-  return (sizeof(i) == 4 ?
-          FastUInt32ToBuffer(i, buffer) : FastUInt64ToBuffer(i, buffer));
-}
-
-// ----------------------------------------------------------------------
-// FastInt32ToBufferLeft()
-// FastUInt32ToBufferLeft()
-// FastInt64ToBufferLeft()
-// FastUInt64ToBufferLeft()
-//
-// Like the Fast*ToBuffer() functions above, these are intended for speed.
-// Unlike the Fast*ToBuffer() functions, however, these functions write
-// their output to the beginning of the buffer (hence the name, as the
-// output is left-aligned).  The caller is responsible for ensuring that
-// the buffer has enough space to hold the output.
-//
-// Returns a pointer to the end of the string (i.e. the null character
-// terminating the string).
-// ----------------------------------------------------------------------
-
-PROTOBUF_EXPORT char* FastInt32ToBufferLeft(int32_t i, char* buffer);
-PROTOBUF_EXPORT char* FastUInt32ToBufferLeft(uint32_t i, char* buffer);
-PROTOBUF_EXPORT char* FastInt64ToBufferLeft(int64_t i, char* buffer);
-PROTOBUF_EXPORT char* FastUInt64ToBufferLeft(uint64_t i, char* buffer);
-
-// Just define these in terms of the above.
-inline char* FastUInt32ToBuffer(uint32_t i, char* buffer) {
-  FastUInt32ToBufferLeft(i, buffer);
-  return buffer;
-}
-inline char* FastUInt64ToBuffer(uint64_t i, char* buffer) {
-  FastUInt64ToBufferLeft(i, buffer);
-  return buffer;
-}
-
-inline std::string SimpleBtoa(bool value) { return value ? "true" : "false"; }
-
-// ----------------------------------------------------------------------
-// SimpleItoa()
-//    Description: converts an integer to a string.
-//
-//    Return value: string
-// ----------------------------------------------------------------------
-PROTOBUF_EXPORT std::string SimpleItoa(int i);
-PROTOBUF_EXPORT std::string SimpleItoa(unsigned int i);
-PROTOBUF_EXPORT std::string SimpleItoa(long i);
-PROTOBUF_EXPORT std::string SimpleItoa(unsigned long i);
-PROTOBUF_EXPORT std::string SimpleItoa(long long i);
-PROTOBUF_EXPORT std::string SimpleItoa(unsigned long long i);
-
-// ----------------------------------------------------------------------
-// SimpleDtoa()
-// SimpleFtoa()
-// DoubleToBuffer()
-// FloatToBuffer()
-//    Description: converts a double or float to a string which, if
-//    passed to NoLocaleStrtod(), will produce the exact same original double
-//    (except in case of NaN; all NaNs are considered the same value).
-//    We try to keep the string short but it's not guaranteed to be as
-//    short as possible.
-//
-//    DoubleToBuffer() and FloatToBuffer() write the text to the given
-//    buffer and return it.  The buffer must be at least
-//    kDoubleToBufferSize bytes for doubles and kFloatToBufferSize
-//    bytes for floats.  kFastToBufferSize is also guaranteed to be large
-//    enough to hold either.
-//
-//    Return value: string
-// ----------------------------------------------------------------------
-PROTOBUF_EXPORT std::string SimpleDtoa(double value);
-PROTOBUF_EXPORT std::string SimpleFtoa(float value);
-
-PROTOBUF_EXPORT char* DoubleToBuffer(double i, char* buffer);
-PROTOBUF_EXPORT char* FloatToBuffer(float i, char* buffer);
-
-// In practice, doubles should never need more than 24 bytes and floats
-// should never need more than 14 (including null terminators), but we
-// overestimate to be safe.
-static const int kDoubleToBufferSize = 32;
-static const int kFloatToBufferSize = 24;
-
-namespace strings {
-
-enum PadSpec {
-  NO_PAD = 1,
-  ZERO_PAD_2,
-  ZERO_PAD_3,
-  ZERO_PAD_4,
-  ZERO_PAD_5,
-  ZERO_PAD_6,
-  ZERO_PAD_7,
-  ZERO_PAD_8,
-  ZERO_PAD_9,
-  ZERO_PAD_10,
-  ZERO_PAD_11,
-  ZERO_PAD_12,
-  ZERO_PAD_13,
-  ZERO_PAD_14,
-  ZERO_PAD_15,
-  ZERO_PAD_16,
-};
-
-struct Hex {
-  uint64_t value;
-  enum PadSpec spec;
-  template <class Int>
-  explicit Hex(Int v, PadSpec s = NO_PAD)
-      : spec(s) {
-    // Prevent sign-extension by casting integers to
-    // their unsigned counterparts.
-#ifdef LANG_CXX11
-    static_assert(
-        sizeof(v) == 1 || sizeof(v) == 2 || sizeof(v) == 4 || sizeof(v) == 8,
-        "Unknown integer type");
-#endif
-    value = sizeof(v) == 1 ? static_cast<uint8_t>(v)
-          : sizeof(v) == 2 ? static_cast<uint16_t>(v)
-          : sizeof(v) == 4 ? static_cast<uint32_t>(v)
-          : static_cast<uint64_t>(v);
-  }
-};
-
-struct PROTOBUF_EXPORT AlphaNum {
-  const char *piece_data_;  // move these to string_ref eventually
-  size_t piece_size_;       // move these to string_ref eventually
-
-  char digits[kFastToBufferSize];
-
-  // No bool ctor -- bools convert to an integral type.
-  // A bool ctor would also convert incoming pointers (bletch).
-
-  AlphaNum(int i32)
-      : piece_data_(digits),
-        piece_size_(FastInt32ToBufferLeft(i32, digits) - &digits[0]) {}
-  AlphaNum(unsigned int u32)
-      : piece_data_(digits),
-        piece_size_(FastUInt32ToBufferLeft(u32, digits) - &digits[0]) {}
-  AlphaNum(long long i64)
-      : piece_data_(digits),
-        piece_size_(FastInt64ToBufferLeft(i64, digits) - &digits[0]) {}
-  AlphaNum(unsigned long long u64)
-      : piece_data_(digits),
-        piece_size_(FastUInt64ToBufferLeft(u64, digits) - &digits[0]) {}
-
-  // Note: on some architectures, "long" is only 32 bits, not 64, but the
-  // performance hit of using FastInt64ToBufferLeft to handle 32-bit values
-  // is quite minor.
-  AlphaNum(long i64)
-      : piece_data_(digits),
-        piece_size_(FastInt64ToBufferLeft(i64, digits) - &digits[0]) {}
-  AlphaNum(unsigned long u64)
-      : piece_data_(digits),
-        piece_size_(FastUInt64ToBufferLeft(u64, digits) - &digits[0]) {}
-
-  AlphaNum(float f)
-    : piece_data_(digits), piece_size_(strlen(FloatToBuffer(f, digits))) {}
-  AlphaNum(double f)
-    : piece_data_(digits), piece_size_(strlen(DoubleToBuffer(f, digits))) {}
-
-  AlphaNum(Hex hex);
-
-  AlphaNum(const char* c_str)
-      : piece_data_(c_str), piece_size_(strlen(c_str)) {}
-  // TODO: Add a string_ref constructor, eventually
-  // AlphaNum(const StringPiece &pc) : piece(pc) {}
-
-  AlphaNum(const std::string& str)
-      : piece_data_(str.data()), piece_size_(str.size()) {}
-
-  AlphaNum(StringPiece str)
-      : piece_data_(str.data()), piece_size_(str.size()) {}
-
-  size_t size() const { return piece_size_; }
-  const char *data() const { return piece_data_; }
-
- private:
-  // Use ":" not ':'
-  AlphaNum(char c);  // NOLINT(runtime/explicit)
-
-  // Disallow copy and assign.
-  AlphaNum(const AlphaNum&);
-  void operator=(const AlphaNum&);
-};
-
-}  // namespace strings
-
-using strings::AlphaNum;
-
-// ----------------------------------------------------------------------
-// StrCat()
-//    This merges the given strings or numbers, with no delimiter.  This
-//    is designed to be the fastest possible way to construct a string out
-//    of a mix of raw C strings, strings, bool values,
-//    and numeric values.
-//
-//    Don't use this for user-visible strings.  The localization process
-//    works poorly on strings built up out of fragments.
-//
-//    For clarity and performance, don't use StrCat when appending to a
-//    string.  In particular, avoid using any of these (anti-)patterns:
-//      str.append(StrCat(...)
-//      str += StrCat(...)
-//      str = StrCat(str, ...)
-//    where the last is the worse, with the potential to change a loop
-//    from a linear time operation with O(1) dynamic allocations into a
-//    quadratic time operation with O(n) dynamic allocations.  StrAppend
-//    is a better choice than any of the above, subject to the restriction
-//    of StrAppend(&str, a, b, c, ...) that none of the a, b, c, ... may
-//    be a reference into str.
-// ----------------------------------------------------------------------
-
-PROTOBUF_EXPORT std::string StrCat(const AlphaNum& a, const AlphaNum& b);
-PROTOBUF_EXPORT std::string StrCat(const AlphaNum& a, const AlphaNum& b,
-                                   const AlphaNum& c);
-PROTOBUF_EXPORT std::string StrCat(const AlphaNum& a, const AlphaNum& b,
-                                   const AlphaNum& c, const AlphaNum& d);
-PROTOBUF_EXPORT std::string StrCat(const AlphaNum& a, const AlphaNum& b,
-                                   const AlphaNum& c, const AlphaNum& d,
-                                   const AlphaNum& e);
-PROTOBUF_EXPORT std::string StrCat(const AlphaNum& a, const AlphaNum& b,
-                                   const AlphaNum& c, const AlphaNum& d,
-                                   const AlphaNum& e, const AlphaNum& f);
-PROTOBUF_EXPORT std::string StrCat(const AlphaNum& a, const AlphaNum& b,
-                                   const AlphaNum& c, const AlphaNum& d,
-                                   const AlphaNum& e, const AlphaNum& f,
-                                   const AlphaNum& g);
-PROTOBUF_EXPORT std::string StrCat(const AlphaNum& a, const AlphaNum& b,
-                                   const AlphaNum& c, const AlphaNum& d,
-                                   const AlphaNum& e, const AlphaNum& f,
-                                   const AlphaNum& g, const AlphaNum& h);
-PROTOBUF_EXPORT std::string StrCat(const AlphaNum& a, const AlphaNum& b,
-                                   const AlphaNum& c, const AlphaNum& d,
-                                   const AlphaNum& e, const AlphaNum& f,
-                                   const AlphaNum& g, const AlphaNum& h,
-                                   const AlphaNum& i);
-
-inline std::string StrCat(const AlphaNum& a) {
-  return std::string(a.data(), a.size());
-}
-
-// ----------------------------------------------------------------------
-// StrAppend()
-//    Same as above, but adds the output to the given string.
-//    WARNING: For speed, StrAppend does not try to check each of its input
-//    arguments to be sure that they are not a subset of the string being
-//    appended to.  That is, while this will work:
-//
-//    string s = "foo";
-//    s += s;
-//
-//    This will not (necessarily) work:
-//
-//    string s = "foo";
-//    StrAppend(&s, s);
-//
-//    Note: while StrCat supports appending up to 9 arguments, StrAppend
-//    is currently limited to 4.  That's rarely an issue except when
-//    automatically transforming StrCat to StrAppend, and can easily be
-//    worked around as consecutive calls to StrAppend are quite efficient.
-// ----------------------------------------------------------------------
-
-PROTOBUF_EXPORT void StrAppend(std::string* dest, const AlphaNum& a);
-PROTOBUF_EXPORT void StrAppend(std::string* dest, const AlphaNum& a,
-                               const AlphaNum& b);
-PROTOBUF_EXPORT void StrAppend(std::string* dest, const AlphaNum& a,
-                               const AlphaNum& b, const AlphaNum& c);
-PROTOBUF_EXPORT void StrAppend(std::string* dest, const AlphaNum& a,
-                               const AlphaNum& b, const AlphaNum& c,
-                               const AlphaNum& d);
-
-// ----------------------------------------------------------------------
-// Join()
-//    These methods concatenate a range of components into a C++ string, using
-//    the C-string "delim" as a separator between components.
-// ----------------------------------------------------------------------
-template <typename Iterator>
-void Join(Iterator start, Iterator end, const char* delim,
-          std::string* result) {
-  for (Iterator it = start; it != end; ++it) {
-    if (it != start) {
-      result->append(delim);
-    }
-    StrAppend(result, *it);
-  }
-}
-
-template <typename Range>
-std::string Join(const Range& components, const char* delim) {
-  std::string result;
-  Join(components.begin(), components.end(), delim, &result);
-  return result;
-}
-
-// ----------------------------------------------------------------------
-// ToHex()
-//    Return a lower-case hex string representation of the given integer.
-// ----------------------------------------------------------------------
-PROTOBUF_EXPORT std::string ToHex(uint64_t num);
-
-// ----------------------------------------------------------------------
-// GlobalReplaceSubstring()
-//    Replaces all instances of a substring in a string.  Does nothing
-//    if 'substring' is empty.  Returns the number of replacements.
-//
-//    NOTE: The string pieces must not overlap s.
-// ----------------------------------------------------------------------
-PROTOBUF_EXPORT int GlobalReplaceSubstring(const std::string& substring,
-                                           const std::string& replacement,
-                                           std::string* s);
-
-// ----------------------------------------------------------------------
-// Base64Unescape()
-//    Converts "src" which is encoded in Base64 to its binary equivalent and
-//    writes it to "dest". If src contains invalid characters, dest is cleared
-//    and the function returns false. Returns true on success.
-// ----------------------------------------------------------------------
-PROTOBUF_EXPORT bool Base64Unescape(StringPiece src, std::string* dest);
-
-// ----------------------------------------------------------------------
-// WebSafeBase64Unescape()
-//    This is a variation of Base64Unescape which uses '-' instead of '+', and
-//    '_' instead of '/'. src is not null terminated, instead specify len. I
-//    recommend that slen<szdest, but we honor szdest anyway.
-//    RETURNS the length of dest, or -1 if src contains invalid chars.
-
-//    The variation that stores into a string clears the string first, and
-//    returns false (with dest empty) if src contains invalid chars; for
-//    this version src and dest must be different strings.
-// ----------------------------------------------------------------------
-PROTOBUF_EXPORT int WebSafeBase64Unescape(const char* src, int slen, char* dest,
-                                          int szdest);
-PROTOBUF_EXPORT bool WebSafeBase64Unescape(StringPiece src, std::string* dest);
-
-// Return the length to use for the output buffer given to the base64 escape
-// routines. Make sure to use the same value for do_padding in both.
-// This function may return incorrect results if given input_len values that
-// are extremely high, which should happen rarely.
-PROTOBUF_EXPORT int CalculateBase64EscapedLen(int input_len, bool do_padding);
-// Use this version when calling Base64Escape without a do_padding arg.
-PROTOBUF_EXPORT int CalculateBase64EscapedLen(int input_len);
-
-// ----------------------------------------------------------------------
-// Base64Escape()
-// WebSafeBase64Escape()
-//    Encode "src" to "dest" using base64 encoding.
-//    src is not null terminated, instead specify len.
-//    'dest' should have at least CalculateBase64EscapedLen() length.
-//    RETURNS the length of dest.
-//    The WebSafe variation use '-' instead of '+' and '_' instead of '/'
-//    so that we can place the out in the URL or cookies without having
-//    to escape them.  It also has an extra parameter "do_padding",
-//    which when set to false will prevent padding with "=".
-// ----------------------------------------------------------------------
-PROTOBUF_EXPORT int Base64Escape(const unsigned char* src, int slen, char* dest,
-                                 int szdest);
-PROTOBUF_EXPORT int WebSafeBase64Escape(const unsigned char* src, int slen,
-                                        char* dest, int szdest,
-                                        bool do_padding);
-// Encode src into dest with padding.
-PROTOBUF_EXPORT void Base64Escape(StringPiece src, std::string* dest);
-// Encode src into dest web-safely without padding.
-PROTOBUF_EXPORT void WebSafeBase64Escape(StringPiece src, std::string* dest);
-// Encode src into dest web-safely with padding.
-PROTOBUF_EXPORT void WebSafeBase64EscapeWithPadding(StringPiece src,
-                                                    std::string* dest);
-
-PROTOBUF_EXPORT void Base64Escape(const unsigned char* src, int szsrc,
-                                  std::string* dest, bool do_padding);
-PROTOBUF_EXPORT void WebSafeBase64Escape(const unsigned char* src, int szsrc,
-                                         std::string* dest, bool do_padding);
-
-inline bool IsValidCodePoint(uint32_t code_point) {
-  return code_point < 0xD800 ||
-         (code_point >= 0xE000 && code_point <= 0x10FFFF);
-}
-
-static const int UTFmax = 4;
-// ----------------------------------------------------------------------
-// EncodeAsUTF8Char()
-//  Helper to append a Unicode code point to a string as UTF8, without bringing
-//  in any external dependencies. The output buffer must be as least 4 bytes
-//  large.
-// ----------------------------------------------------------------------
-PROTOBUF_EXPORT int EncodeAsUTF8Char(uint32_t code_point, char* output);
-
-// ----------------------------------------------------------------------
-// UTF8FirstLetterNumBytes()
-//   Length of the first UTF-8 character.
-// ----------------------------------------------------------------------
-PROTOBUF_EXPORT int UTF8FirstLetterNumBytes(const char* src, int len);
-
-// From google3/third_party/absl/strings/escaping.h
-
-// ----------------------------------------------------------------------
-// CleanStringLineEndings()
-//   Clean up a multi-line string to conform to Unix line endings.
-//   Reads from src and appends to dst, so usually dst should be empty.
-//
-//   If there is no line ending at the end of a non-empty string, it can
-//   be added automatically.
-//
-//   Four different types of input are correctly handled:
-//
-//     - Unix/Linux files: line ending is LF: pass through unchanged
-//
-//     - DOS/Windows files: line ending is CRLF: convert to LF
-//
-//     - Legacy Mac files: line ending is CR: convert to LF
-//
-//     - Garbled files: random line endings: convert gracefully
-//                      lonely CR, lonely LF, CRLF: convert to LF
-//
-//   @param src The multi-line string to convert
-//   @param dst The converted string is appended to this string
-//   @param auto_end_last_line Automatically terminate the last line
-//
-//   Limitations:
-//
-//     This does not do the right thing for CRCRLF files created by
-//     broken programs that do another Unix->DOS conversion on files
-//     that are already in CRLF format.  For this, a two-pass approach
-//     brute-force would be needed that
-//
-//       (1) determines the presence of LF (first one is ok)
-//       (2) if yes, removes any CR, else convert every CR to LF
-PROTOBUF_EXPORT void CleanStringLineEndings(const std::string& src,
-                                            std::string* dst,
-                                            bool auto_end_last_line);
-
-// Same as above, but transforms the argument in place.
-PROTOBUF_EXPORT void CleanStringLineEndings(std::string* str,
-                                            bool auto_end_last_line);
-
-namespace strings {
-inline bool EndsWith(StringPiece text, StringPiece suffix) {
-  return suffix.empty() ||
-      (text.size() >= suffix.size() &&
-       memcmp(text.data() + (text.size() - suffix.size()), suffix.data(),
-              suffix.size()) == 0);
-}
-}  // namespace strings
-
-namespace internal {
-
-// A locale-independent version of the standard strtod(), which always
-// uses a dot as the decimal separator.
-double NoLocaleStrtod(const char* str, char** endptr);
-
-}  // namespace internal
-
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
-
-#endif  // GOOGLE_PROTOBUF_STUBS_STRUTIL_H__
diff --git a/libs/protobuf/src/google/protobuf/stubs/strutil_unittest.cc b/libs/protobuf/src/google/protobuf/stubs/strutil_unittest.cc
deleted file mode 100644
index 0bb9558..0000000
--- a/libs/protobuf/src/google/protobuf/stubs/strutil_unittest.cc
+++ /dev/null
@@ -1,884 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-
-#include <google/protobuf/stubs/strutil.h>
-
-#include <locale.h>
-
-#include <google/protobuf/stubs/stl_util.h>
-#include <google/protobuf/testing/googletest.h>
-#include <gtest/gtest.h>
-
-#ifdef _WIN32
-#define snprintf _snprintf
-#endif
-
-namespace google {
-namespace protobuf {
-namespace {
-
-// TODO(kenton):  Copy strutil tests from google3?
-
-TEST(StringUtilityTest, ImmuneToLocales) {
-  // Remember the old locale.
-  char* old_locale_cstr = setlocale(LC_NUMERIC, nullptr);
-  ASSERT_TRUE(old_locale_cstr != nullptr);
-  std::string old_locale = old_locale_cstr;
-
-  // Set the locale to "C".
-  ASSERT_TRUE(setlocale(LC_NUMERIC, "C") != nullptr);
-
-  EXPECT_EQ("1.5", SimpleDtoa(1.5));
-  EXPECT_EQ("1.5", SimpleFtoa(1.5));
-
-  if (setlocale(LC_NUMERIC, "es_ES") == nullptr &&
-      setlocale(LC_NUMERIC, "es_ES.utf8") == nullptr) {
-    // Some systems may not have the desired locale available.
-    GOOGLE_LOG(WARNING)
-      << "Couldn't set locale to es_ES.  Skipping this test.";
-  } else {
-    EXPECT_EQ("1.5", SimpleDtoa(1.5));
-    EXPECT_EQ("1.5", SimpleFtoa(1.5));
-  }
-
-  // Return to original locale.
-  setlocale(LC_NUMERIC, old_locale.c_str());
-}
-
-#define EXPECT_EQ_ARRAY(len, x, y, msg)                     \
-  for (int j = 0; j < len; ++j) {                           \
-    EXPECT_EQ(x[j], y[j]) << "" # x << " != " # y           \
-                          << " byte " << j << ": " << msg;  \
-  }
-
-static struct {
-  int plain_length;
-  const char* plaintext;
-  const char* ciphertext;
-} base64_tests[] = {
-  // Empty string.
-  { 0, "", ""},
-
-  // Basic bit patterns;
-  // values obtained with "echo -n '...' | uuencode -m test"
-
-  { 1, "\000", "AA==" },
-  { 1, "\001", "AQ==" },
-  { 1, "\002", "Ag==" },
-  { 1, "\004", "BA==" },
-  { 1, "\010", "CA==" },
-  { 1, "\020", "EA==" },
-  { 1, "\040", "IA==" },
-  { 1, "\100", "QA==" },
-  { 1, "\200", "gA==" },
-
-  { 1, "\377", "/w==" },
-  { 1, "\376", "/g==" },
-  { 1, "\375", "/Q==" },
-  { 1, "\373", "+w==" },
-  { 1, "\367", "9w==" },
-  { 1, "\357", "7w==" },
-  { 1, "\337", "3w==" },
-  { 1, "\277", "vw==" },
-  { 1, "\177", "fw==" },
-  { 2, "\000\000", "AAA=" },
-  { 2, "\000\001", "AAE=" },
-  { 2, "\000\002", "AAI=" },
-  { 2, "\000\004", "AAQ=" },
-  { 2, "\000\010", "AAg=" },
-  { 2, "\000\020", "ABA=" },
-  { 2, "\000\040", "ACA=" },
-  { 2, "\000\100", "AEA=" },
-  { 2, "\000\200", "AIA=" },
-  { 2, "\001\000", "AQA=" },
-  { 2, "\002\000", "AgA=" },
-  { 2, "\004\000", "BAA=" },
-  { 2, "\010\000", "CAA=" },
-  { 2, "\020\000", "EAA=" },
-  { 2, "\040\000", "IAA=" },
-  { 2, "\100\000", "QAA=" },
-  { 2, "\200\000", "gAA=" },
-
-  { 2, "\377\377", "//8=" },
-  { 2, "\377\376", "//4=" },
-  { 2, "\377\375", "//0=" },
-  { 2, "\377\373", "//s=" },
-  { 2, "\377\367", "//c=" },
-  { 2, "\377\357", "/+8=" },
-  { 2, "\377\337", "/98=" },
-  { 2, "\377\277", "/78=" },
-  { 2, "\377\177", "/38=" },
-  { 2, "\376\377", "/v8=" },
-  { 2, "\375\377", "/f8=" },
-  { 2, "\373\377", "+/8=" },
-  { 2, "\367\377", "9/8=" },
-  { 2, "\357\377", "7/8=" },
-  { 2, "\337\377", "3/8=" },
-  { 2, "\277\377", "v/8=" },
-  { 2, "\177\377", "f/8=" },
-
-  { 3, "\000\000\000", "AAAA" },
-  { 3, "\000\000\001", "AAAB" },
-  { 3, "\000\000\002", "AAAC" },
-  { 3, "\000\000\004", "AAAE" },
-  { 3, "\000\000\010", "AAAI" },
-  { 3, "\000\000\020", "AAAQ" },
-  { 3, "\000\000\040", "AAAg" },
-  { 3, "\000\000\100", "AABA" },
-  { 3, "\000\000\200", "AACA" },
-  { 3, "\000\001\000", "AAEA" },
-  { 3, "\000\002\000", "AAIA" },
-  { 3, "\000\004\000", "AAQA" },
-  { 3, "\000\010\000", "AAgA" },
-  { 3, "\000\020\000", "ABAA" },
-  { 3, "\000\040\000", "ACAA" },
-  { 3, "\000\100\000", "AEAA" },
-  { 3, "\000\200\000", "AIAA" },
-  { 3, "\001\000\000", "AQAA" },
-  { 3, "\002\000\000", "AgAA" },
-  { 3, "\004\000\000", "BAAA" },
-  { 3, "\010\000\000", "CAAA" },
-  { 3, "\020\000\000", "EAAA" },
-  { 3, "\040\000\000", "IAAA" },
-  { 3, "\100\000\000", "QAAA" },
-  { 3, "\200\000\000", "gAAA" },
-
-  { 3, "\377\377\377", "////" },
-  { 3, "\377\377\376", "///+" },
-  { 3, "\377\377\375", "///9" },
-  { 3, "\377\377\373", "///7" },
-  { 3, "\377\377\367", "///3" },
-  { 3, "\377\377\357", "///v" },
-  { 3, "\377\377\337", "///f" },
-  { 3, "\377\377\277", "//+/" },
-  { 3, "\377\377\177", "//9/" },
-  { 3, "\377\376\377", "//7/" },
-  { 3, "\377\375\377", "//3/" },
-  { 3, "\377\373\377", "//v/" },
-  { 3, "\377\367\377", "//f/" },
-  { 3, "\377\357\377", "/+//" },
-  { 3, "\377\337\377", "/9//" },
-  { 3, "\377\277\377", "/7//" },
-  { 3, "\377\177\377", "/3//" },
-  { 3, "\376\377\377", "/v//" },
-  { 3, "\375\377\377", "/f//" },
-  { 3, "\373\377\377", "+///" },
-  { 3, "\367\377\377", "9///" },
-  { 3, "\357\377\377", "7///" },
-  { 3, "\337\377\377", "3///" },
-  { 3, "\277\377\377", "v///" },
-  { 3, "\177\377\377", "f///" },
-
-  // Random numbers: values obtained with
-  //
-  //  #! /bin/bash
-  //  dd bs=$1 count=1 if=/dev/random of=/tmp/bar.random
-  //  od -N $1 -t o1 /tmp/bar.random
-  //  uuencode -m test < /tmp/bar.random
-  //
-  // where $1 is the number of bytes (2, 3)
-
-  { 2, "\243\361", "o/E=" },
-  { 2, "\024\167", "FHc=" },
-  { 2, "\313\252", "y6o=" },
-  { 2, "\046\041", "JiE=" },
-  { 2, "\145\236", "ZZ4=" },
-  { 2, "\254\325", "rNU=" },
-  { 2, "\061\330", "Mdg=" },
-  { 2, "\245\032", "pRo=" },
-  { 2, "\006\000", "BgA=" },
-  { 2, "\375\131", "/Vk=" },
-  { 2, "\303\210", "w4g=" },
-  { 2, "\040\037", "IB8=" },
-  { 2, "\261\372", "sfo=" },
-  { 2, "\335\014", "3Qw=" },
-  { 2, "\233\217", "m48=" },
-  { 2, "\373\056", "+y4=" },
-  { 2, "\247\232", "p5o=" },
-  { 2, "\107\053", "Rys=" },
-  { 2, "\204\077", "hD8=" },
-  { 2, "\276\211", "vok=" },
-  { 2, "\313\110", "y0g=" },
-  { 2, "\363\376", "8/4=" },
-  { 2, "\251\234", "qZw=" },
-  { 2, "\103\262", "Q7I=" },
-  { 2, "\142\312", "Yso=" },
-  { 2, "\067\211", "N4k=" },
-  { 2, "\220\001", "kAE=" },
-  { 2, "\152\240", "aqA=" },
-  { 2, "\367\061", "9zE=" },
-  { 2, "\133\255", "W60=" },
-  { 2, "\176\035", "fh0=" },
-  { 2, "\032\231", "Gpk=" },
-
-  { 3, "\013\007\144", "Cwdk" },
-  { 3, "\030\112\106", "GEpG" },
-  { 3, "\047\325\046", "J9Um" },
-  { 3, "\310\160\022", "yHAS" },
-  { 3, "\131\100\237", "WUCf" },
-  { 3, "\064\342\134", "NOJc" },
-  { 3, "\010\177\004", "CH8E" },
-  { 3, "\345\147\205", "5WeF" },
-  { 3, "\300\343\360", "wOPw" },
-  { 3, "\061\240\201", "MaCB" },
-  { 3, "\225\333\044", "ldsk" },
-  { 3, "\215\137\352", "jV/q" },
-  { 3, "\371\147\160", "+Wdw" },
-  { 3, "\030\320\051", "GNAp" },
-  { 3, "\044\174\241", "JHyh" },
-  { 3, "\260\127\037", "sFcf" },
-  { 3, "\111\045\033", "SSUb" },
-  { 3, "\202\114\107", "gkxH" },
-  { 3, "\057\371\042", "L/ki" },
-  { 3, "\223\247\244", "k6ek" },
-  { 3, "\047\216\144", "J45k" },
-  { 3, "\203\070\327", "gzjX" },
-  { 3, "\247\140\072", "p2A6" },
-  { 3, "\124\115\116", "VE1O" },
-  { 3, "\157\162\050", "b3Io" },
-  { 3, "\357\223\004", "75ME" },
-  { 3, "\052\117\156", "Kk9u" },
-  { 3, "\347\154\000", "52wA" },
-  { 3, "\303\012\142", "wwpi" },
-  { 3, "\060\035\362", "MB3y" },
-  { 3, "\130\226\361", "WJbx" },
-  { 3, "\173\013\071", "ews5" },
-  { 3, "\336\004\027", "3gQX" },
-  { 3, "\357\366\234", "7/ac" },
-  { 3, "\353\304\111", "68RJ" },
-  { 3, "\024\264\131", "FLRZ" },
-  { 3, "\075\114\251", "PUyp" },
-  { 3, "\315\031\225", "zRmV" },
-  { 3, "\154\201\276", "bIG+" },
-  { 3, "\200\066\072", "gDY6" },
-  { 3, "\142\350\267", "Yui3" },
-  { 3, "\033\000\166", "GwB2" },
-  { 3, "\210\055\077", "iC0/" },
-  { 3, "\341\037\124", "4R9U" },
-  { 3, "\161\103\152", "cUNq" },
-  { 3, "\270\142\131", "uGJZ" },
-  { 3, "\337\076\074", "3z48" },
-  { 3, "\375\106\362", "/Uby" },
-  { 3, "\227\301\127", "l8FX" },
-  { 3, "\340\002\234", "4AKc" },
-  { 3, "\121\064\033", "UTQb" },
-  { 3, "\157\134\143", "b1xj" },
-  { 3, "\247\055\327", "py3X" },
-  { 3, "\340\142\005", "4GIF" },
-  { 3, "\060\260\143", "MLBj" },
-  { 3, "\075\203\170", "PYN4" },
-  { 3, "\143\160\016", "Y3AO" },
-  { 3, "\313\013\063", "ywsz" },
-  { 3, "\174\236\135", "fJ5d" },
-  { 3, "\103\047\026", "QycW" },
-  { 3, "\365\005\343", "9QXj" },
-  { 3, "\271\160\223", "uXCT" },
-  { 3, "\362\255\172", "8q16" },
-  { 3, "\113\012\015", "SwoN" },
-
-  // various lengths, generated by this python script:
-  //
-  // from string import lowercase as lc
-  // for i in range(27):
-  //   print '{ %2d, "%s",%s "%s" },' % (i, lc[:i], ' ' * (26-i),
-  //                                     lc[:i].encode('base64').strip())
-
-  {  0, "",                           "" },
-  {  1, "a",                          "YQ==" },
-  {  2, "ab",                         "YWI=" },
-  {  3, "abc",                        "YWJj" },
-  {  4, "abcd",                       "YWJjZA==" },
-  {  5, "abcde",                      "YWJjZGU=" },
-  {  6, "abcdef",                     "YWJjZGVm" },
-  {  7, "abcdefg",                    "YWJjZGVmZw==" },
-  {  8, "abcdefgh",                   "YWJjZGVmZ2g=" },
-  {  9, "abcdefghi",                  "YWJjZGVmZ2hp" },
-  { 10, "abcdefghij",                 "YWJjZGVmZ2hpag==" },
-  { 11, "abcdefghijk",                "YWJjZGVmZ2hpams=" },
-  { 12, "abcdefghijkl",               "YWJjZGVmZ2hpamts" },
-  { 13, "abcdefghijklm",              "YWJjZGVmZ2hpamtsbQ==" },
-  { 14, "abcdefghijklmn",             "YWJjZGVmZ2hpamtsbW4=" },
-  { 15, "abcdefghijklmno",            "YWJjZGVmZ2hpamtsbW5v" },
-  { 16, "abcdefghijklmnop",           "YWJjZGVmZ2hpamtsbW5vcA==" },
-  { 17, "abcdefghijklmnopq",          "YWJjZGVmZ2hpamtsbW5vcHE=" },
-  { 18, "abcdefghijklmnopqr",         "YWJjZGVmZ2hpamtsbW5vcHFy" },
-  { 19, "abcdefghijklmnopqrs",        "YWJjZGVmZ2hpamtsbW5vcHFycw==" },
-  { 20, "abcdefghijklmnopqrst",       "YWJjZGVmZ2hpamtsbW5vcHFyc3Q=" },
-  { 21, "abcdefghijklmnopqrstu",      "YWJjZGVmZ2hpamtsbW5vcHFyc3R1" },
-  { 22, "abcdefghijklmnopqrstuv",     "YWJjZGVmZ2hpamtsbW5vcHFyc3R1dg==" },
-  { 23, "abcdefghijklmnopqrstuvw",    "YWJjZGVmZ2hpamtsbW5vcHFyc3R1dnc=" },
-  { 24, "abcdefghijklmnopqrstuvwx",   "YWJjZGVmZ2hpamtsbW5vcHFyc3R1dnd4" },
-  { 25, "abcdefghijklmnopqrstuvwxy",  "YWJjZGVmZ2hpamtsbW5vcHFyc3R1dnd4eQ==" },
-  { 26, "abcdefghijklmnopqrstuvwxyz", "YWJjZGVmZ2hpamtsbW5vcHFyc3R1dnd4eXo=" },
-};
-
-static struct {
-  const char* plaintext;
-  const char* ciphertext;
-} base64_strings[] = {
-    // Some google quotes
-    // Ciphertext created with "uuencode (GNU sharutils) 4.6.3"
-    // (Note that we're testing the websafe encoding, though, so if
-    // you add messages, be sure to run "tr -- '+/' '-_'" on the output)
-    {"I was always good at math and science, and I never realized "
-     "that was unusual or somehow undesirable. So one of the things "
-     "I care a lot about is helping to remove that stigma, "
-     "to show girls that you can be feminine, you can like the things "
-     "that girls like, but you can also be really good at technology. "
-     "You can be really good at building things."
-     " - Marissa Meyer, Newsweek, 2010-12-22"
-     "\n",
-
-     "SSB3YXMgYWx3YXlzIGdvb2QgYXQgbWF0aCBhbmQgc2NpZW5jZSwgYW5kIEkg"
-     "bmV2ZXIgcmVhbGl6ZWQgdGhhdCB3YXMgdW51c3VhbCBvciBzb21laG93IHVu"
-     "ZGVzaXJhYmxlLiBTbyBvbmUgb2YgdGhlIHRoaW5ncyBJIGNhcmUgYSBsb3Qg"
-     "YWJvdXQgaXMgaGVscGluZyB0byByZW1vdmUgdGhhdCBzdGlnbWEsIHRvIHNo"
-     "b3cgZ2lybHMgdGhhdCB5b3UgY2FuIGJlIGZlbWluaW5lLCB5b3UgY2FuIGxp"
-     "a2UgdGhlIHRoaW5ncyB0aGF0IGdpcmxzIGxpa2UsIGJ1dCB5b3UgY2FuIGFs"
-     "c28gYmUgcmVhbGx5IGdvb2QgYXQgdGVjaG5vbG9neS4gWW91IGNhbiBiZSBy"
-     "ZWFsbHkgZ29vZCBhdCBidWlsZGluZyB0aGluZ3MuIC0gTWFyaXNzYSBNZXll"
-     "ciwgTmV3c3dlZWssIDIwMTAtMTItMjIK"},
-
-    {"Typical first year for a new cluster: "
-     "~0.5 overheating "
-     "~1 PDU failure "
-     "~1 rack-move "
-     "~1 network rewiring "
-     "~20 rack failures "
-     "~5 racks go wonky "
-     "~8 network maintenances "
-     "~12 router reloads "
-     "~3 router failures "
-     "~dozens of minor 30-second blips for dns "
-     "~1000 individual machine failures "
-     "~thousands of hard drive failures "
-     "slow disks, bad memory, misconfigured machines, flaky machines, etc."
-     " - Jeff Dean, The Joys of Real Hardware"
-     "\n",
-
-     "VHlwaWNhbCBmaXJzdCB5ZWFyIGZvciBhIG5ldyBjbHVzdGVyOiB-MC41IG92"
-     "ZXJoZWF0aW5nIH4xIFBEVSBmYWlsdXJlIH4xIHJhY2stbW92ZSB-MSBuZXR3"
-     "b3JrIHJld2lyaW5nIH4yMCByYWNrIGZhaWx1cmVzIH41IHJhY2tzIGdvIHdv"
-     "bmt5IH44IG5ldHdvcmsgbWFpbnRlbmFuY2VzIH4xMiByb3V0ZXIgcmVsb2Fk"
-     "cyB-MyByb3V0ZXIgZmFpbHVyZXMgfmRvemVucyBvZiBtaW5vciAzMC1zZWNv"
-     "bmQgYmxpcHMgZm9yIGRucyB-MTAwMCBpbmRpdmlkdWFsIG1hY2hpbmUgZmFp"
-     "bHVyZXMgfnRob3VzYW5kcyBvZiBoYXJkIGRyaXZlIGZhaWx1cmVzIHNsb3cg"
-     "ZGlza3MsIGJhZCBtZW1vcnksIG1pc2NvbmZpZ3VyZWQgbWFjaGluZXMsIGZs"
-     "YWt5IG1hY2hpbmVzLCBldGMuIC0gSmVmZiBEZWFuLCBUaGUgSm95cyBvZiBS"
-     "ZWFsIEhhcmR3YXJlCg"},
-
-    {"I'm the head of the webspam team at Google.  "
-     "That means that if you type your name into Google and get porn back, "
-     "it's my fault. Unless you're a porn star, in which case porn is a "
-     "completely reasonable response."
-     " - Matt Cutts, Google Plus"
-     "\n",
-
-     "SSdtIHRoZSBoZWFkIG9mIHRoZSB3ZWJzcGFtIHRlYW0gYXQgR29vZ2xlLiAg"
-     "VGhhdCBtZWFucyB0aGF0IGlmIHlvdSB0eXBlIHlvdXIgbmFtZSBpbnRvIEdv"
-     "b2dsZSBhbmQgZ2V0IHBvcm4gYmFjaywgaXQncyBteSBmYXVsdC4gVW5sZXNz"
-     "IHlvdSdyZSBhIHBvcm4gc3RhciwgaW4gd2hpY2ggY2FzZSBwb3JuIGlzIGEg"
-     "Y29tcGxldGVseSByZWFzb25hYmxlIHJlc3BvbnNlLiAtIE1hdHQgQ3V0dHMs"
-     "IEdvb2dsZSBQbHVzCg"},
-
-    {"It will still be a long time before machines approach human "
-     "intelligence. "
-     "But luckily, machines don't actually have to be intelligent; "
-     "they just have to fake it. Access to a wealth of information, "
-     "combined with a rudimentary decision-making capacity, "
-     "can often be almost as useful. Of course, the results are better yet "
-     "when coupled with intelligence. A reference librarian with access to "
-     "a good search engine is a formidable tool."
-     " - Craig Silverstein, Siemens Pictures of the Future, Spring 2004"
-     "\n",
-
-     "SXQgd2lsbCBzdGlsbCBiZSBhIGxvbmcgdGltZSBiZWZvcmUgbWFjaGluZXMg"
-     "YXBwcm9hY2ggaHVtYW4gaW50ZWxsaWdlbmNlLiBCdXQgbHVja2lseSwgbWFj"
-     "aGluZXMgZG9uJ3QgYWN0dWFsbHkgaGF2ZSB0byBiZSBpbnRlbGxpZ2VudDsg"
-     "dGhleSBqdXN0IGhhdmUgdG8gZmFrZSBpdC4gQWNjZXNzIHRvIGEgd2VhbHRo"
-     "IG9mIGluZm9ybWF0aW9uLCBjb21iaW5lZCB3aXRoIGEgcnVkaW1lbnRhcnkg"
-     "ZGVjaXNpb24tbWFraW5nIGNhcGFjaXR5LCBjYW4gb2Z0ZW4gYmUgYWxtb3N0"
-     "IGFzIHVzZWZ1bC4gT2YgY291cnNlLCB0aGUgcmVzdWx0cyBhcmUgYmV0dGVy"
-     "IHlldCB3aGVuIGNvdXBsZWQgd2l0aCBpbnRlbGxpZ2VuY2UuIEEgcmVmZXJl"
-     "bmNlIGxpYnJhcmlhbiB3aXRoIGFjY2VzcyB0byBhIGdvb2Qgc2VhcmNoIGVu"
-     "Z2luZSBpcyBhIGZvcm1pZGFibGUgdG9vbC4gLSBDcmFpZyBTaWx2ZXJzdGVp"
-     "biwgU2llbWVucyBQaWN0dXJlcyBvZiB0aGUgRnV0dXJlLCBTcHJpbmcgMjAw"
-     "NAo"},
-
-    // Degenerate edge case
-    {"", ""},
-};
-
-TEST(Base64, EscapeAndUnescape) {
-  // Check the short strings; this tests the math (and boundaries)
-  for (int i = 0; i < sizeof(base64_tests) / sizeof(base64_tests[0]); ++i) {
-    char encode_buffer[100];
-    int encode_length;
-    char decode_buffer[100];
-    int decode_length;
-    int cipher_length;
-    std::string decode_str;
-
-    const unsigned char* unsigned_plaintext =
-      reinterpret_cast<const unsigned char*>(base64_tests[i].plaintext);
-
-    StringPiece plaintext(base64_tests[i].plaintext,
-                          base64_tests[i].plain_length);
-
-    cipher_length = strlen(base64_tests[i].ciphertext);
-
-    // The basic escape function:
-    memset(encode_buffer, 0, sizeof(encode_buffer));
-    encode_length = Base64Escape(unsigned_plaintext,
-                                 base64_tests[i].plain_length,
-                                 encode_buffer,
-                                 sizeof(encode_buffer));
-    //    Is it of the expected length?
-    EXPECT_EQ(encode_length, cipher_length);
-    // Would it have been okay to allocate only CalculateBase64EscapeLen()?
-    EXPECT_EQ(CalculateBase64EscapedLen(base64_tests[i].plain_length),
-              encode_length);
-
-    //    Is it the expected encoded value?
-    ASSERT_STREQ(encode_buffer, base64_tests[i].ciphertext);
-
-    // If we encode it into a buffer of exactly the right length...
-    memset(encode_buffer, 0, sizeof(encode_buffer));
-    encode_length =
-        Base64Escape(unsigned_plaintext, base64_tests[i].plain_length,
-                     encode_buffer, cipher_length);
-    //    Is it still of the expected length?
-    EXPECT_EQ(encode_length, cipher_length);
-
-    //    And is the value still correct?  (i.e., not losing the last byte)
-    EXPECT_STREQ(encode_buffer, base64_tests[i].ciphertext);
-
-    // If we decode it back:
-    decode_str.clear();
-    EXPECT_TRUE(
-        Base64Unescape(StringPiece(encode_buffer, cipher_length), &decode_str));
-
-    //    Is it of the expected length?
-    EXPECT_EQ(base64_tests[i].plain_length, decode_str.length());
-
-    //    Is it the expected decoded value?
-    EXPECT_EQ(plaintext, decode_str);
-
-    // Let's try with a pre-populated string.
-    std::string encoded("this junk should be ignored");
-    Base64Escape(
-        std::string(base64_tests[i].plaintext, base64_tests[i].plain_length),
-        &encoded);
-    EXPECT_EQ(encoded, std::string(encode_buffer, cipher_length));
-
-    std::string decoded("this junk should be ignored");
-    EXPECT_TRUE(
-        Base64Unescape(StringPiece(encode_buffer, cipher_length), &decoded));
-    EXPECT_EQ(decoded.size(), base64_tests[i].plain_length);
-    EXPECT_EQ_ARRAY(decoded.size(), decoded, base64_tests[i].plaintext, i);
-
-    // Our decoder treats the padding '=' characters at the end as
-    // optional (but if there are any, there must be the correct
-    // number of them.)  If encode_buffer has any, run some additional
-    // tests that fiddle with them.
-    char* first_equals = strchr(encode_buffer, '=');
-    if (first_equals) {
-      // How many equals signs does the string start with?
-      int equals = (*(first_equals+1) == '=') ? 2 : 1;
-
-      // Try chopping off the equals sign(s) entirely.  The decoder
-      // should still be okay with this.
-      std::string decoded2("this junk should also be ignored");
-      *first_equals = '\0';
-      EXPECT_TRUE(Base64Unescape(
-          StringPiece(encode_buffer, first_equals - encode_buffer), &decoded2));
-      EXPECT_EQ(decoded.size(), base64_tests[i].plain_length);
-      EXPECT_EQ_ARRAY(decoded.size(), decoded, base64_tests[i].plaintext, i);
-
-      // Now test chopping off the equals sign(s) and adding
-      // whitespace.  Our decoder should still accept this.
-      decoded2.assign("this junk should be ignored");
-      *first_equals = ' ';
-      *(first_equals+1) = '\0';
-      EXPECT_TRUE(Base64Unescape(
-          StringPiece(encode_buffer, first_equals - encode_buffer + 1),
-          &decoded2));
-      EXPECT_EQ(decoded.size(), base64_tests[i].plain_length);
-      EXPECT_EQ_ARRAY(decoded.size(), decoded, base64_tests[i].plaintext, i);
-
-      // Now stick a bad character at the end of the string.  The decoder
-      // should refuse this string.
-      decoded2.assign("this junk should be ignored");
-      *first_equals = '?';
-      *(first_equals+1) = '\0';
-      EXPECT_TRUE(
-          !Base64Unescape(
-              StringPiece(encode_buffer, first_equals - encode_buffer + 1),
-              &decoded2));
-
-      int len;
-
-      // Test whitespace mixed with the padding.  (eg "AA = = ")  The
-      // decoder should accept this.
-      if (equals == 2) {
-        snprintf(first_equals, 6, " = = ");
-        len = first_equals - encode_buffer + 5;
-      } else {
-        snprintf(first_equals, 6, " = ");
-        len = first_equals - encode_buffer + 3;
-      }
-      decoded2.assign("this junk should be ignored");
-      EXPECT_TRUE(
-          Base64Unescape(StringPiece(encode_buffer, len), &decoded2));
-      EXPECT_EQ(decoded.size(), base64_tests[i].plain_length);
-      EXPECT_EQ_ARRAY(decoded.size(), decoded, base64_tests[i].plaintext, i);
-
-      // Test whitespace mixed with the padding, but with the wrong
-      // number of equals signs (eg "AA = ").  The decoder should
-      // refuse these strings.
-      if (equals == 1) {
-        snprintf(first_equals, 6, " = = ");
-        len = first_equals - encode_buffer + 5;
-      } else {
-        snprintf(first_equals, 6, " = ");
-        len = first_equals - encode_buffer + 3;
-      }
-      EXPECT_TRUE(
-          !Base64Unescape(StringPiece(encode_buffer, len), &decoded2));
-    }
-
-    // Cool! the basic Base64 encoder/decoder works.
-    // Let's try the alternate alphabet: tr -- '+/' '-_'
-
-    char websafe[100];
-    memset(websafe, 0, sizeof(websafe));
-    strncpy(websafe, base64_tests[i].ciphertext, cipher_length);
-    for (int c = 0; c < sizeof(websafe); ++c) {
-      if ('+' == websafe[c]) { websafe[c] = '-'; }
-      if ('/' == websafe[c]) { websafe[c] = '_'; }
-    }
-
-    // The websafe escape function:
-    memset(encode_buffer, 0, sizeof(encode_buffer));
-    encode_length = WebSafeBase64Escape(unsigned_plaintext,
-                                                 base64_tests[i].plain_length,
-                                                 encode_buffer,
-                                                 sizeof(encode_buffer),
-                                                 true);
-    //    Is it of the expected length?
-    EXPECT_EQ(encode_length, cipher_length);
-    EXPECT_EQ(
-        CalculateBase64EscapedLen(base64_tests[i].plain_length, true),
-        encode_length);
-
-    //    Is it the expected encoded value?
-    EXPECT_STREQ(encode_buffer, websafe);
-
-    //    If we encode it into a buffer of exactly the right length...
-    memset(encode_buffer, 0, sizeof(encode_buffer));
-    encode_length =
-        WebSafeBase64Escape(unsigned_plaintext, base64_tests[i].plain_length,
-                            encode_buffer, cipher_length, true);
-    //    Is it still of the expected length?
-    EXPECT_EQ(encode_length, cipher_length);
-
-    //    And is the value still correct?  (i.e., not losing the last byte)
-    EXPECT_STREQ(encode_buffer, websafe);
-
-    //    Let's try the string version of the encoder
-    encoded = "this junk should be ignored";
-    WebSafeBase64Escape(
-        unsigned_plaintext, base64_tests[i].plain_length,
-        &encoded, true);
-    EXPECT_EQ(encoded.size(), cipher_length);
-    EXPECT_STREQ(encoded.c_str(), websafe);
-
-    //    If we decode it back:
-    memset(decode_buffer, 0, sizeof(decode_buffer));
-    decode_length = WebSafeBase64Unescape(encode_buffer, cipher_length,
-                                          decode_buffer, sizeof(decode_buffer));
-
-    //    Is it of the expected length?
-    EXPECT_EQ(decode_length, base64_tests[i].plain_length);
-
-    //    Is it the expected decoded value?
-    EXPECT_EQ(0,
-              memcmp(decode_buffer, base64_tests[i].plaintext, decode_length));
-
-    //    If we decode it into a buffer of exactly the right length...
-    memset(decode_buffer, 0, sizeof(decode_buffer));
-    decode_length = WebSafeBase64Unescape(encode_buffer, cipher_length,
-                                          decode_buffer, decode_length);
-
-    //    Is it still of the expected length?
-    EXPECT_EQ(decode_length, base64_tests[i].plain_length);
-
-    //    And is it the expected decoded value?
-    EXPECT_EQ(0,
-              memcmp(decode_buffer, base64_tests[i].plaintext, decode_length));
-
-    // Try using '.' for the pad character.
-    for (int c = cipher_length - 1; c >= 0 && '=' == encode_buffer[c]; --c) {
-      encode_buffer[c] = '.';
-    }
-
-    // If we decode it back:
-    memset(decode_buffer, 0, sizeof(decode_buffer));
-    decode_length = WebSafeBase64Unescape(encode_buffer, cipher_length,
-                                          decode_buffer, sizeof(decode_buffer));
-
-    // Is it of the expected length?
-    EXPECT_EQ(decode_length, base64_tests[i].plain_length);
-
-    // Is it the expected decoded value?
-    EXPECT_EQ(0,
-              memcmp(decode_buffer, base64_tests[i].plaintext, decode_length));
-
-    // If we decode it into a buffer of exactly the right length...
-    memset(decode_buffer, 0, sizeof(decode_buffer));
-    decode_length = WebSafeBase64Unescape(encode_buffer, cipher_length,
-                                          decode_buffer, decode_length);
-
-    // Is it still of the expected length?
-    EXPECT_EQ(decode_length, base64_tests[i].plain_length);
-
-    // And is it the expected decoded value?
-    EXPECT_EQ(0,
-              memcmp(decode_buffer, base64_tests[i].plaintext, decode_length));
-
-    // Let's try the string version of the decoder
-    decoded = "this junk should be ignored";
-    EXPECT_TRUE(WebSafeBase64Unescape(StringPiece(encode_buffer, cipher_length),
-                                      &decoded));
-    EXPECT_EQ(decoded.size(), base64_tests[i].plain_length);
-    EXPECT_EQ_ARRAY(decoded.size(), decoded, base64_tests[i].plaintext, i);
-
-    // Okay! the websafe Base64 encoder/decoder works.
-    // Let's try the unpadded version
-
-    for (int c = 0; c < sizeof(websafe); ++c) {
-      if ('=' == websafe[c]) {
-        websafe[c] = '\0';
-        cipher_length = c;
-        break;
-      }
-    }
-
-    // The websafe escape function:
-    memset(encode_buffer, 0, sizeof(encode_buffer));
-    encode_length = WebSafeBase64Escape(unsigned_plaintext,
-                                                 base64_tests[i].plain_length,
-                                                 encode_buffer,
-                                                 sizeof(encode_buffer),
-                                                 false);
-    //    Is it of the expected length?
-    EXPECT_EQ(encode_length, cipher_length);
-    EXPECT_EQ(
-        CalculateBase64EscapedLen(base64_tests[i].plain_length, false),
-        encode_length);
-
-    //    Is it the expected encoded value?
-    EXPECT_STREQ(encode_buffer, websafe);
-
-    //    If we encode it into a buffer of exactly the right length...
-    memset(encode_buffer, 0, sizeof(encode_buffer));
-    encode_length =
-        WebSafeBase64Escape(unsigned_plaintext, base64_tests[i].plain_length,
-                            encode_buffer, cipher_length, false);
-    //    Is it still of the expected length?
-    EXPECT_EQ(encode_length, cipher_length);
-
-    //    And is the value still correct?  (i.e., not losing the last byte)
-    EXPECT_STREQ(encode_buffer, websafe);
-
-    // Let's try the (other) string version of the encoder
-    std::string plain(base64_tests[i].plaintext, base64_tests[i].plain_length);
-    encoded = "this junk should be ignored";
-    WebSafeBase64Escape(plain, &encoded);
-    EXPECT_EQ(encoded.size(), cipher_length);
-    EXPECT_STREQ(encoded.c_str(), websafe);
-
-    //    If we decode it back:
-    memset(decode_buffer, 0, sizeof(decode_buffer));
-    decode_length = WebSafeBase64Unescape(encode_buffer, cipher_length,
-                                          decode_buffer, sizeof(decode_buffer));
-
-    //    Is it of the expected length?
-    EXPECT_EQ(decode_length, base64_tests[i].plain_length);
-
-    //    Is it the expected decoded value?
-    EXPECT_EQ(0,
-              memcmp(decode_buffer, base64_tests[i].plaintext, decode_length));
-
-    //    If we decode it into a buffer of exactly the right length...
-    memset(decode_buffer, 0, sizeof(decode_buffer));
-    decode_length = WebSafeBase64Unescape(encode_buffer, cipher_length,
-                                          decode_buffer, decode_length);
-
-    //    Is it still of the expected length?
-    EXPECT_EQ(decode_length, base64_tests[i].plain_length);
-
-    //    And is it the expected decoded value?
-    EXPECT_EQ(0,
-              memcmp(decode_buffer, base64_tests[i].plaintext, decode_length));
-
-
-    // Let's try the string version of the decoder
-    decoded = "this junk should be ignored";
-    EXPECT_TRUE(WebSafeBase64Unescape(StringPiece(encode_buffer, cipher_length),
-                                      &decoded));
-    EXPECT_EQ(decoded.size(), base64_tests[i].plain_length);
-    EXPECT_EQ_ARRAY(decoded.size(), decoded, base64_tests[i].plaintext, i);
-
-    // This value works.  Try the next.
-  }
-
-  // Now try the long strings, this tests the streaming
-  for (int i = 0; i < sizeof(base64_strings) / sizeof(base64_strings[0]);
-       ++i) {
-    const unsigned char* unsigned_plaintext =
-      reinterpret_cast<const unsigned char*>(base64_strings[i].plaintext);
-    int plain_length = strlen(base64_strings[i].plaintext);
-    int cipher_length = strlen(base64_strings[i].ciphertext);
-    std::vector<char> buffer(cipher_length + 1);
-    int encode_length = WebSafeBase64Escape(unsigned_plaintext,
-                                                     plain_length,
-                                                     &buffer[0],
-                                                     buffer.size(),
-                                                     false);
-    EXPECT_EQ(cipher_length, encode_length);
-    EXPECT_EQ(
-        CalculateBase64EscapedLen(plain_length, false), encode_length);
-    buffer[ encode_length ] = '\0';
-    EXPECT_STREQ(base64_strings[i].ciphertext, &buffer[0]);
-  }
-
-  // Verify the behavior when decoding bad data
-  {
-    const char* bad_data = "ab-/";
-    std::string buf;
-    EXPECT_FALSE(Base64Unescape(StringPiece(bad_data), &buf));
-    EXPECT_TRUE(!WebSafeBase64Unescape(bad_data, &buf));
-    EXPECT_TRUE(buf.empty());
-  }
-}
-
-// Test StrCat of ints and longs of various sizes and signdedness.
-TEST(StrCat, Ints) {
-  const short s = -1;  // NOLINT(runtime/int)
-  const uint16_t us = 2;
-  const int i = -3;
-  const unsigned int ui = 4;
-  const long l = -5;                 // NOLINT(runtime/int)
-  const unsigned long ul = 6;        // NOLINT(runtime/int)
-  const long long ll = -7;           // NOLINT(runtime/int)
-  const unsigned long long ull = 8;  // NOLINT(runtime/int)
-  const ptrdiff_t ptrdiff = -9;
-  const size_t size = 10;
-  const intptr_t intptr = -12;
-  const uintptr_t uintptr = 13;
-  std::string answer;
-  answer = StrCat(s, us);
-  EXPECT_EQ(answer, "-12");
-  answer = StrCat(i, ui);
-  EXPECT_EQ(answer, "-34");
-  answer = StrCat(l, ul);
-  EXPECT_EQ(answer, "-56");
-  answer = StrCat(ll, ull);
-  EXPECT_EQ(answer, "-78");
-  answer = StrCat(ptrdiff, size);
-  EXPECT_EQ(answer, "-910");
-  answer = StrCat(ptrdiff, intptr);
-  EXPECT_EQ(answer, "-9-12");
-  answer = StrCat(uintptr, 0);
-  EXPECT_EQ(answer, "130");
-}
-
-class ReplaceChars
-    : public ::testing::TestWithParam<
-          std::tuple<std::string, std::string, const char*, char>> {};
-
-TEST_P(ReplaceChars, ReplacesAllOccurencesOfAnyCharInReplaceWithAReplaceChar) {
-  std::string expected = std::get<0>(GetParam());
-  std::string string_to_replace_in = std::get<1>(GetParam());
-  const char* what_to_replace = std::get<2>(GetParam());
-  char replacement = std::get<3>(GetParam());
-  ReplaceCharacters(&string_to_replace_in, what_to_replace, replacement);
-  ASSERT_EQ(expected, string_to_replace_in);
-}
-
-INSTANTIATE_TEST_CASE_P(
-    Replace, ReplaceChars,
-    ::testing::Values(
-        std::make_tuple("", "", "", '_'),    // empty string should remain empty
-        std::make_tuple(" ", " ", "", '_'),  // no replacement string
-        std::make_tuple(" ", " ", "_-abcedf",
-                        '*'),  // replacement character not in string
-        std::make_tuple("replace", "Replace", "R",
-                        'r'),  // replace one character
-        std::make_tuple("not_spaces__", "not\nspaces\t ", " \t\r\n",
-                        '_'),  // replace some special characters
-        std::make_tuple("c++", "cxx", "x",
-                        '+'),  // same character multiple times
-        std::make_tuple("qvvvvvng v T", "queueing a T", "aeiou",
-                        'v')));  // replace all voewls
-
-class StripWs
-    : public ::testing::TestWithParam<std::tuple<std::string, std::string>> {};
-
-TEST_P(StripWs, AlwaysStripsLeadingAndTrailingWhitespace) {
-  std::string expected = std::get<0>(GetParam());
-  std::string string_to_strip = std::get<1>(GetParam());
-  StripWhitespace(&string_to_strip);
-  ASSERT_EQ(expected, string_to_strip);
-}
-
-INSTANTIATE_TEST_CASE_P(
-    Strip, StripWs,
-    ::testing::Values(
-        std::make_tuple("", ""),   // empty string should remain empty
-        std::make_tuple("", " "),  // only ws should become empty
-        std::make_tuple("no whitespace",
-                        " no whitespace"),  // leading ws removed
-        std::make_tuple("no whitespace",
-                        "no whitespace "),  // trailing ws removed
-        std::make_tuple("no whitespace",
-                        " no whitespace "),  // same nb. of leading and trailing
-        std::make_tuple(
-            "no whitespace",
-            "  no whitespace "),  // different nb. of leading/trailing
-        std::make_tuple("no whitespace",
-                        " no whitespace  ")));  // more trailing than leading
-
-}  // anonymous namespace
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/stubs/substitute.cc b/libs/protobuf/src/google/protobuf/stubs/substitute.cc
deleted file mode 100644
index d301682..0000000
--- a/libs/protobuf/src/google/protobuf/stubs/substitute.cc
+++ /dev/null
@@ -1,136 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-
-#include <google/protobuf/stubs/substitute.h>
-
-#include <google/protobuf/stubs/logging.h>
-#include <google/protobuf/stubs/strutil.h>
-#include <google/protobuf/stubs/stl_util.h>
-
-namespace google {
-namespace protobuf {
-namespace strings {
-
-using internal::SubstituteArg;
-
-// Returns the number of args in arg_array which were passed explicitly
-// to Substitute().
-static int CountSubstituteArgs(const SubstituteArg* const* args_array) {
-  int count = 0;
-  while (args_array[count] != nullptr && args_array[count]->size() != -1) {
-    ++count;
-  }
-  return count;
-}
-
-std::string Substitute(const std::string& format, const SubstituteArg& arg0,
-                       const SubstituteArg& arg1, const SubstituteArg& arg2,
-                       const SubstituteArg& arg3, const SubstituteArg& arg4,
-                       const SubstituteArg& arg5, const SubstituteArg& arg6,
-                       const SubstituteArg& arg7, const SubstituteArg& arg8,
-                       const SubstituteArg& arg9) {
-  std::string result;
-  SubstituteAndAppend(&result, format.c_str(), arg0, arg1, arg2, arg3, arg4,
-                      arg5, arg6, arg7, arg8, arg9);
-  return result;
-}
-
-void SubstituteAndAppend(std::string* output, const char* format,
-                         const SubstituteArg& arg0, const SubstituteArg& arg1,
-                         const SubstituteArg& arg2, const SubstituteArg& arg3,
-                         const SubstituteArg& arg4, const SubstituteArg& arg5,
-                         const SubstituteArg& arg6, const SubstituteArg& arg7,
-                         const SubstituteArg& arg8, const SubstituteArg& arg9) {
-  const SubstituteArg* const args_array[] = {
-    &arg0, &arg1, &arg2, &arg3, &arg4, &arg5, &arg6, &arg7, &arg8, &arg9, nullptr
-  };
-
-  // Determine total size needed.
-  int size = 0;
-  for (int i = 0; format[i] != '\0'; i++) {
-    if (format[i] == '$') {
-      if (ascii_isdigit(format[i+1])) {
-        int index = format[i+1] - '0';
-        if (args_array[index]->size() == -1) {
-          GOOGLE_LOG(DFATAL)
-            << "strings::Substitute format string invalid: asked for \"$"
-            << index << "\", but only " << CountSubstituteArgs(args_array)
-            << " args were given.  Full format string was: \""
-            << CEscape(format) << "\".";
-          return;
-        }
-        size += args_array[index]->size();
-        ++i;  // Skip next char.
-      } else if (format[i+1] == '$') {
-        ++size;
-        ++i;  // Skip next char.
-      } else {
-        GOOGLE_LOG(DFATAL)
-          << "Invalid strings::Substitute() format string: \""
-          << CEscape(format) << "\".";
-        return;
-      }
-    } else {
-      ++size;
-    }
-  }
-
-  if (size == 0) return;
-
-  // Build the string.
-  int original_size = output->size();
-  STLStringResizeUninitialized(output, original_size + size);
-  char* target = string_as_array(output) + original_size;
-  for (int i = 0; format[i] != '\0'; i++) {
-    if (format[i] == '$') {
-      if (ascii_isdigit(format[i+1])) {
-        unsigned int index = format[i+1] - '0';
-        assert(index < 10);
-        const SubstituteArg* src = args_array[index];
-        memcpy(target, src->data(), src->size());
-        target += src->size();
-        ++i;  // Skip next char.
-      } else if (format[i+1] == '$') {
-        *target++ = '$';
-        ++i;  // Skip next char.
-      }
-    } else {
-      *target++ = format[i];
-    }
-  }
-
-  GOOGLE_DCHECK_EQ(target - output->data(), output->size());
-}
-
-}  // namespace strings
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/stubs/substitute.h b/libs/protobuf/src/google/protobuf/stubs/substitute.h
deleted file mode 100644
index 0f851de..0000000
--- a/libs/protobuf/src/google/protobuf/stubs/substitute.h
+++ /dev/null
@@ -1,178 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-// from google3/strings/substitute.h
-
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/stubs/stringpiece.h>
-#include <google/protobuf/stubs/strutil.h>
-
-#include <string>
-
-#ifndef GOOGLE_PROTOBUF_STUBS_SUBSTITUTE_H_
-#define GOOGLE_PROTOBUF_STUBS_SUBSTITUTE_H_
-
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-namespace strings {
-
-// ----------------------------------------------------------------------
-// strings::Substitute()
-// strings::SubstituteAndAppend()
-//   Kind of like StringPrintf, but different.
-//
-//   Example:
-//     string GetMessage(string first_name, string last_name, int age) {
-//       return strings::Substitute("My name is $0 $1 and I am $2 years old.",
-//                                  first_name, last_name, age);
-//     }
-//
-//   Differences from StringPrintf:
-//   * The format string does not identify the types of arguments.
-//     Instead, the magic of C++ deals with this for us.  See below
-//     for a list of accepted types.
-//   * Substitutions in the format string are identified by a '$'
-//     followed by a digit.  So, you can use arguments out-of-order and
-//     use the same argument multiple times.
-//   * It's much faster than StringPrintf.
-//
-//   Supported types:
-//   * Strings (const char*, const string&)
-//     * Note that this means you do not have to add .c_str() to all of
-//       your strings.  In fact, you shouldn't; it will be slower.
-//   * int32, int64, uint32, uint64:  Formatted using SimpleItoa().
-//   * float, double:  Formatted using SimpleFtoa() and SimpleDtoa().
-//   * bool:  Printed as "true" or "false".
-//
-//   SubstituteAndAppend() is like Substitute() but appends the result to
-//   *output.  Example:
-//
-//     string str;
-//     strings::SubstituteAndAppend(&str,
-//                                  "My name is $0 $1 and I am $2 years old.",
-//                                  first_name, last_name, age);
-//
-//   Substitute() is significantly faster than StringPrintf().  For very
-//   large strings, it may be orders of magnitude faster.
-// ----------------------------------------------------------------------
-
-namespace internal {  // Implementation details.
-
-class SubstituteArg {
- public:
-  inline SubstituteArg(const char* value)
-    : text_(value), size_(strlen(text_)) {}
-  inline SubstituteArg(const std::string& value)
-      : text_(value.data()), size_(value.size()) {}
-  inline SubstituteArg(const StringPiece value)
-      : text_(value.data()), size_(value.size()) {}
-
-  // Indicates that no argument was given.
-  inline explicit SubstituteArg()
-    : text_(nullptr), size_(-1) {}
-
-  // Primitives
-  // We don't overload for signed and unsigned char because if people are
-  // explicitly declaring their chars as signed or unsigned then they are
-  // probably actually using them as 8-bit integers and would probably
-  // prefer an integer representation.  But, we don't really know.  So, we
-  // make the caller decide what to do.
-  inline SubstituteArg(char value)
-    : text_(scratch_), size_(1) { scratch_[0] = value; }
-  inline SubstituteArg(short value)
-    : text_(FastInt32ToBuffer(value, scratch_)), size_(strlen(text_)) {}
-  inline SubstituteArg(unsigned short value)
-    : text_(FastUInt32ToBuffer(value, scratch_)), size_(strlen(text_)) {}
-  inline SubstituteArg(int value)
-    : text_(FastInt32ToBuffer(value, scratch_)), size_(strlen(text_)) {}
-  inline SubstituteArg(unsigned int value)
-    : text_(FastUInt32ToBuffer(value, scratch_)), size_(strlen(text_)) {}
-  inline SubstituteArg(long value)
-    : text_(FastLongToBuffer(value, scratch_)), size_(strlen(text_)) {}
-  inline SubstituteArg(unsigned long value)
-    : text_(FastULongToBuffer(value, scratch_)), size_(strlen(text_)) {}
-  inline SubstituteArg(long long value)
-    : text_(FastInt64ToBuffer(value, scratch_)), size_(strlen(text_)) {}
-  inline SubstituteArg(unsigned long long value)
-    : text_(FastUInt64ToBuffer(value, scratch_)), size_(strlen(text_)) {}
-  inline SubstituteArg(float value)
-    : text_(FloatToBuffer(value, scratch_)), size_(strlen(text_)) {}
-  inline SubstituteArg(double value)
-    : text_(DoubleToBuffer(value, scratch_)), size_(strlen(text_)) {}
-  inline SubstituteArg(bool value)
-    : text_(value ? "true" : "false"), size_(strlen(text_)) {}
-
-  inline const char* data() const { return text_; }
-  inline int size() const { return size_; }
-
- private:
-  const char* text_;
-  int size_;
-  char scratch_[kFastToBufferSize];
-};
-
-}  // namespace internal
-
-PROTOBUF_EXPORT std::string Substitute(
-    const std::string& format,
-    const internal::SubstituteArg& arg0 = internal::SubstituteArg(),
-    const internal::SubstituteArg& arg1 = internal::SubstituteArg(),
-    const internal::SubstituteArg& arg2 = internal::SubstituteArg(),
-    const internal::SubstituteArg& arg3 = internal::SubstituteArg(),
-    const internal::SubstituteArg& arg4 = internal::SubstituteArg(),
-    const internal::SubstituteArg& arg5 = internal::SubstituteArg(),
-    const internal::SubstituteArg& arg6 = internal::SubstituteArg(),
-    const internal::SubstituteArg& arg7 = internal::SubstituteArg(),
-    const internal::SubstituteArg& arg8 = internal::SubstituteArg(),
-    const internal::SubstituteArg& arg9 = internal::SubstituteArg());
-
-PROTOBUF_EXPORT void SubstituteAndAppend(
-    std::string* output, const char* format,
-    const internal::SubstituteArg& arg0 = internal::SubstituteArg(),
-    const internal::SubstituteArg& arg1 = internal::SubstituteArg(),
-    const internal::SubstituteArg& arg2 = internal::SubstituteArg(),
-    const internal::SubstituteArg& arg3 = internal::SubstituteArg(),
-    const internal::SubstituteArg& arg4 = internal::SubstituteArg(),
-    const internal::SubstituteArg& arg5 = internal::SubstituteArg(),
-    const internal::SubstituteArg& arg6 = internal::SubstituteArg(),
-    const internal::SubstituteArg& arg7 = internal::SubstituteArg(),
-    const internal::SubstituteArg& arg8 = internal::SubstituteArg(),
-    const internal::SubstituteArg& arg9 = internal::SubstituteArg());
-
-}  // namespace strings
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
-
-#endif // GOOGLE_PROTOBUF_STUBS_SUBSTITUTE_H_
diff --git a/libs/protobuf/src/google/protobuf/stubs/template_util.h b/libs/protobuf/src/google/protobuf/stubs/template_util.h
deleted file mode 100644
index feef904..0000000
--- a/libs/protobuf/src/google/protobuf/stubs/template_util.h
+++ /dev/null
@@ -1,138 +0,0 @@
-// Copyright 2005 Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// ----
-// Author: lar@google.com (Laramie Leavitt)
-//
-// Template metaprogramming utility functions.
-//
-// This code is compiled directly on many platforms, including client
-// platforms like Windows, Mac, and embedded systems.  Before making
-// any changes here, make sure that you're not breaking any platforms.
-//
-//
-// The names chosen here reflect those used in tr1 and the boost::mpl
-// library, there are similar operations used in the Loki library as
-// well.  I prefer the boost names for 2 reasons:
-// 1.  I think that portions of the Boost libraries are more likely to
-// be included in the c++ standard.
-// 2.  It is not impossible that some of the boost libraries will be
-// included in our own build in the future.
-// Both of these outcomes means that we may be able to directly replace
-// some of these with boost equivalents.
-//
-#ifndef GOOGLE_PROTOBUF_TEMPLATE_UTIL_H_
-#define GOOGLE_PROTOBUF_TEMPLATE_UTIL_H_
-
-namespace google {
-namespace protobuf {
-namespace internal {
-
-// Types small_ and big_ are guaranteed such that sizeof(small_) <
-// sizeof(big_)
-typedef char small_;
-
-struct big_ {
-  char dummy[2];
-};
-
-// Identity metafunction.
-template <class T>
-struct identity_ {
-  typedef T type;
-};
-
-// integral_constant, defined in tr1, is a wrapper for an integer
-// value. We don't really need this generality; we could get away
-// with hardcoding the integer type to bool. We use the fully
-// general integer_constant for compatibility with tr1.
-
-template<class T, T v>
-struct integral_constant {
-  static const T value = v;
-  typedef T value_type;
-  typedef integral_constant<T, v> type;
-};
-
-template <class T, T v> const T integral_constant<T, v>::value;
-
-
-// Abbreviations: true_type and false_type are structs that represent boolean
-// true and false values. Also define the boost::mpl versions of those names,
-// true_ and false_.
-typedef integral_constant<bool, true>  true_type;
-typedef integral_constant<bool, false> false_type;
-typedef true_type  true_;
-typedef false_type false_;
-
-// if_ is a templatized conditional statement.
-// if_<cond, A, B> is a compile time evaluation of cond.
-// if_<>::type contains A if cond is true, B otherwise.
-template<bool cond, typename A, typename B>
-struct if_{
-  typedef A type;
-};
-
-template<typename A, typename B>
-struct if_<false, A, B> {
-  typedef B type;
-};
-
-
-// type_equals_ is a template type comparator, similar to Loki IsSameType.
-// type_equals_<A, B>::value is true iff "A" is the same type as "B".
-//
-// New code should prefer base::is_same, defined in base/type_traits.h.
-// It is functionally identical, but is_same is the standard spelling.
-template<typename A, typename B>
-struct type_equals_ : public false_ {
-};
-
-template<typename A>
-struct type_equals_<A, A> : public true_ {
-};
-
-// and_ is a template && operator.
-// and_<A, B>::value evaluates "A::value && B::value".
-template<typename A, typename B>
-struct and_ : public integral_constant<bool, (A::value && B::value)> {
-};
-
-// or_ is a template || operator.
-// or_<A, B>::value evaluates "A::value || B::value".
-template<typename A, typename B>
-struct or_ : public integral_constant<bool, (A::value || B::value)> {
-};
-
-
-}  // namespace internal
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // GOOGLE_PROTOBUF_TEMPLATE_UTIL_H_
diff --git a/libs/protobuf/src/google/protobuf/stubs/template_util_unittest.cc b/libs/protobuf/src/google/protobuf/stubs/template_util_unittest.cc
deleted file mode 100644
index b1745e2..0000000
--- a/libs/protobuf/src/google/protobuf/stubs/template_util_unittest.cc
+++ /dev/null
@@ -1,130 +0,0 @@
-// Copyright 2005 Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// ----
-// Author: lar@google.com (Laramie Leavitt)
-//
-// These tests are really compile time tests.
-// If you try to step through this in a debugger
-// you will not see any evaluations, merely that
-// value is assigned true or false sequentially.
-
-#include <google/protobuf/stubs/template_util.h>
-
-#include <google/protobuf/testing/googletest.h>
-#include <gtest/gtest.h>
-
-namespace GOOGLE_NAMESPACE = google::protobuf::internal;
-
-namespace google {
-namespace protobuf {
-namespace internal {
-namespace {
-
-TEST(TemplateUtilTest, TestSize) {
-  EXPECT_GT(sizeof(GOOGLE_NAMESPACE::big_), sizeof(GOOGLE_NAMESPACE::small_));
-}
-
-TEST(TemplateUtilTest, TestIntegralConstants) {
-  // test the built-in types.
-  EXPECT_TRUE(true_type::value);
-  EXPECT_FALSE(false_type::value);
-
-  typedef integral_constant<int, 1> one_type;
-  EXPECT_EQ(1, one_type::value);
-}
-
-TEST(TemplateUtilTest, TestTemplateIf) {
-  typedef if_<true, true_type, false_type>::type if_true;
-  EXPECT_TRUE(if_true::value);
-
-  typedef if_<false, true_type, false_type>::type if_false;
-  EXPECT_FALSE(if_false::value);
-}
-
-TEST(TemplateUtilTest, TestTemplateTypeEquals) {
-  // Check that the TemplateTypeEquals works correctly.
-  bool value = false;
-
-  // Test the same type is true.
-  value = type_equals_<int, int>::value;
-  EXPECT_TRUE(value);
-
-  // Test different types are false.
-  value = type_equals_<float, int>::value;
-  EXPECT_FALSE(value);
-
-  // Test type aliasing.
-  typedef const int foo;
-  value = type_equals_<const foo, const int>::value;
-  EXPECT_TRUE(value);
-}
-
-TEST(TemplateUtilTest, TestTemplateAndOr) {
-  // Check that the TemplateTypeEquals works correctly.
-  bool value = false;
-
-  // Yes && Yes == true.
-  value = and_<true_, true_>::value;
-  EXPECT_TRUE(value);
-  // Yes && No == false.
-  value = and_<true_, false_>::value;
-  EXPECT_FALSE(value);
-  // No && Yes == false.
-  value = and_<false_, true_>::value;
-  EXPECT_FALSE(value);
-  // No && No == false.
-  value = and_<false_, false_>::value;
-  EXPECT_FALSE(value);
-
-  // Yes || Yes == true.
-  value = or_<true_, true_>::value;
-  EXPECT_TRUE(value);
-  // Yes || No == true.
-  value = or_<true_, false_>::value;
-  EXPECT_TRUE(value);
-  // No || Yes == true.
-  value = or_<false_, true_>::value;
-  EXPECT_TRUE(value);
-  // No || No == false.
-  value = or_<false_, false_>::value;
-  EXPECT_FALSE(value);
-}
-
-TEST(TemplateUtilTest, TestIdentity) {
-  EXPECT_TRUE(
-      (type_equals_<GOOGLE_NAMESPACE::identity_<int>::type, int>::value));
-  EXPECT_TRUE(
-      (type_equals_<GOOGLE_NAMESPACE::identity_<void>::type, void>::value));
-}
-
-}  // anonymous namespace
-}  // namespace internal
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/stubs/time.cc b/libs/protobuf/src/google/protobuf/stubs/time.cc
deleted file mode 100644
index 692cb82..0000000
--- a/libs/protobuf/src/google/protobuf/stubs/time.cc
+++ /dev/null
@@ -1,365 +0,0 @@
-#include <google/protobuf/stubs/time.h>
-
-#include <ctime>
-
-#include <google/protobuf/stubs/stringprintf.h>
-#include <google/protobuf/stubs/strutil.h>
-
-namespace google {
-namespace protobuf {
-namespace internal {
-
-namespace {
-static const int64_t kSecondsPerMinute = 60;
-static const int64_t kSecondsPerHour = 3600;
-static const int64_t kSecondsPerDay = kSecondsPerHour * 24;
-static const int64_t kSecondsPer400Years =
-    kSecondsPerDay * (400 * 365 + 400 / 4 - 3);
-// Seconds from 0001-01-01T00:00:00 to 1970-01-01T:00:00:00
-static const int64_t kSecondsFromEraToEpoch = 62135596800LL;
-// The range of timestamp values we support.
-static const int64_t kMinTime = -62135596800LL;  // 0001-01-01T00:00:00
-static const int64_t kMaxTime = 253402300799LL;  // 9999-12-31T23:59:59
-
-static const int kNanosPerMillisecond = 1000000;
-static const int kNanosPerMicrosecond = 1000;
-
-// Count the seconds from the given year (start at Jan 1, 00:00) to 100 years
-// after.
-int64_t SecondsPer100Years(int year) {
-  if (year % 400 == 0 || year % 400 > 300) {
-    return kSecondsPerDay * (100 * 365 + 100 / 4);
-  } else {
-    return kSecondsPerDay * (100 * 365 + 100 / 4 - 1);
-  }
-}
-
-// Count the seconds from the given year (start at Jan 1, 00:00) to 4 years
-// after.
-int64_t SecondsPer4Years(int year) {
-  if ((year % 100 == 0 || year % 100 > 96) &&
-      !(year % 400 == 0 || year % 400 > 396)) {
-    // No leap years.
-    return kSecondsPerDay * (4 * 365);
-  } else {
-    // One leap years.
-    return kSecondsPerDay * (4 * 365 + 1);
-  }
-}
-
-bool IsLeapYear(int year) {
-  return year % 400 == 0 || (year % 4 == 0 && year % 100 != 0);
-}
-
-int64_t SecondsPerYear(int year) {
-  return kSecondsPerDay * (IsLeapYear(year) ? 366 : 365);
-}
-
-static const int kDaysInMonth[13] = {
-  0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31
-};
-
-int64_t SecondsPerMonth(int month, bool leap) {
-  if (month == 2 && leap) {
-    return kSecondsPerDay * (kDaysInMonth[month] + 1);
-  }
-  return kSecondsPerDay * kDaysInMonth[month];
-}
-
-static const int kDaysSinceJan[13] = {
-  0, 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334,
-};
-
-bool ValidateDateTime(const DateTime& time) {
-  if (time.year < 1 || time.year > 9999 ||
-      time.month < 1 || time.month > 12 ||
-      time.day < 1 || time.day > 31 ||
-      time.hour < 0 || time.hour > 23 ||
-      time.minute < 0 || time.minute > 59 ||
-      time.second < 0 || time.second > 59) {
-    return false;
-  }
-  if (time.month == 2 && IsLeapYear(time.year)) {
-    return time.day <= kDaysInMonth[time.month] + 1;
-  } else {
-    return time.day <= kDaysInMonth[time.month];
-  }
-}
-
-// Count the number of seconds elapsed from 0001-01-01T00:00:00 to the given
-// time.
-int64_t SecondsSinceCommonEra(const DateTime& time) {
-  int64_t result = 0;
-  // Years should be between 1 and 9999.
-  assert(time.year >= 1 && time.year <= 9999);
-  int year = 1;
-  if ((time.year - year) >= 400) {
-    int count_400years = (time.year - year) / 400;
-    result += kSecondsPer400Years * count_400years;
-    year += count_400years * 400;
-  }
-  while ((time.year - year) >= 100) {
-    result += SecondsPer100Years(year);
-    year += 100;
-  }
-  while ((time.year - year) >= 4) {
-    result += SecondsPer4Years(year);
-    year += 4;
-  }
-  while (time.year > year) {
-    result += SecondsPerYear(year);
-    ++year;
-  }
-  // Months should be between 1 and 12.
-  assert(time.month >= 1 && time.month <= 12);
-  int month = time.month;
-  result += kSecondsPerDay * kDaysSinceJan[month];
-  if (month > 2 && IsLeapYear(year)) {
-    result += kSecondsPerDay;
-  }
-  assert(time.day >= 1 &&
-         time.day <= (month == 2 && IsLeapYear(year)
-                          ? kDaysInMonth[month] + 1
-                          : kDaysInMonth[month]));
-  result += kSecondsPerDay * (time.day - 1);
-  result += kSecondsPerHour * time.hour +
-      kSecondsPerMinute * time.minute +
-      time.second;
-  return result;
-}
-
-// Format nanoseconds with either 3, 6, or 9 digits depending on the required
-// precision to represent the exact value.
-std::string FormatNanos(int32_t nanos) {
-  if (nanos % kNanosPerMillisecond == 0) {
-    return StringPrintf("%03d", nanos / kNanosPerMillisecond);
-  } else if (nanos % kNanosPerMicrosecond == 0) {
-    return StringPrintf("%06d", nanos / kNanosPerMicrosecond);
-  } else {
-    return StringPrintf("%09d", nanos);
-  }
-}
-
-// Parses an integer from a null-terminated char sequence. The method
-// consumes at most "width" chars. Returns a pointer after the consumed
-// integer, or nullptr if the data does not start with an integer or the
-// integer value does not fall in the range of [min_value, max_value].
-const char* ParseInt(const char* data, int width, int min_value,
-                     int max_value, int* result) {
-  if (!ascii_isdigit(*data)) {
-    return nullptr;
-  }
-  int value = 0;
-  for (int i = 0; i < width; ++i, ++data) {
-    if (ascii_isdigit(*data)) {
-      value = value * 10 + (*data - '0');
-    } else {
-      break;
-    }
-  }
-  if (value >= min_value && value <= max_value) {
-    *result = value;
-    return data;
-  } else {
-    return nullptr;
-  }
-}
-
-// Consumes the fractional parts of a second into nanos. For example,
-// "010" will be parsed to 10000000 nanos.
-const char* ParseNanos(const char* data, int32_t* nanos) {
-  if (!ascii_isdigit(*data)) {
-    return nullptr;
-  }
-  int value = 0;
-  int len = 0;
-  // Consume as many digits as there are but only take the first 9 into
-  // account.
-  while (ascii_isdigit(*data)) {
-    if (len < 9) {
-      value = value * 10 + *data - '0';
-    }
-    ++len;
-    ++data;
-  }
-  while (len < 9) {
-    value = value * 10;
-    ++len;
-  }
-  *nanos = value;
-  return data;
-}
-
-const char* ParseTimezoneOffset(const char* data, int64_t* offset) {
-  // Accept format "HH:MM". E.g., "08:00"
-  int hour;
-  if ((data = ParseInt(data, 2, 0, 23, &hour)) == nullptr) {
-    return nullptr;
-  }
-  if (*data++ != ':') {
-    return nullptr;
-  }
-  int minute;
-  if ((data = ParseInt(data, 2, 0, 59, &minute)) == nullptr) {
-    return nullptr;
-  }
-  *offset = (hour * 60 + minute) * 60;
-  return data;
-}
-}  // namespace
-
-bool SecondsToDateTime(int64_t seconds, DateTime* time) {
-  if (seconds < kMinTime || seconds > kMaxTime) {
-    return false;
-  }
-  // It's easier to calculate the DateTime starting from 0001-01-01T00:00:00
-  seconds = seconds + kSecondsFromEraToEpoch;
-  int year = 1;
-  if (seconds >= kSecondsPer400Years) {
-    int count_400years = seconds / kSecondsPer400Years;
-    year += 400 * count_400years;
-    seconds %= kSecondsPer400Years;
-  }
-  while (seconds >= SecondsPer100Years(year)) {
-    seconds -= SecondsPer100Years(year);
-    year += 100;
-  }
-  while (seconds >= SecondsPer4Years(year)) {
-    seconds -= SecondsPer4Years(year);
-    year += 4;
-  }
-  while (seconds >= SecondsPerYear(year)) {
-    seconds -= SecondsPerYear(year);
-    year += 1;
-  }
-  bool leap = IsLeapYear(year);
-  int month = 1;
-  while (seconds >= SecondsPerMonth(month, leap)) {
-    seconds -= SecondsPerMonth(month, leap);
-    ++month;
-  }
-  int day = 1 + seconds / kSecondsPerDay;
-  seconds %= kSecondsPerDay;
-  int hour = seconds / kSecondsPerHour;
-  seconds %= kSecondsPerHour;
-  int minute = seconds / kSecondsPerMinute;
-  seconds %= kSecondsPerMinute;
-  time->year = year;
-  time->month = month;
-  time->day = day;
-  time->hour = hour;
-  time->minute = minute;
-  time->second = static_cast<int>(seconds);
-  return true;
-}
-
-bool DateTimeToSeconds(const DateTime& time, int64_t* seconds) {
-  if (!ValidateDateTime(time)) {
-    return false;
-  }
-  *seconds = SecondsSinceCommonEra(time) - kSecondsFromEraToEpoch;
-  return true;
-}
-
-void GetCurrentTime(int64_t* seconds, int32_t* nanos) {
-  // TODO(xiaofeng): Improve the accuracy of this implementation (or just
-  // remove this method from protobuf).
-  *seconds = time(nullptr);
-  *nanos = 0;
-}
-
-std::string FormatTime(int64_t seconds, int32_t nanos) {
-  DateTime time;
-  if (nanos < 0 || nanos > 999999999 || !SecondsToDateTime(seconds, &time)) {
-    return "InvalidTime";
-  }
-  std::string result =
-      StringPrintf("%04d-%02d-%02dT%02d:%02d:%02d", time.year, time.month,
-                   time.day, time.hour, time.minute, time.second);
-  if (nanos != 0) {
-    result += "." + FormatNanos(nanos);
-  }
-  return result + "Z";
-}
-
-bool ParseTime(const std::string& value, int64_t* seconds, int32_t* nanos) {
-  DateTime time;
-  const char* data = value.c_str();
-  // We only accept:
-  //   Z-normalized: 2015-05-20T13:29:35.120Z
-  //   With UTC offset: 2015-05-20T13:29:35.120-08:00
-
-  // Parse year
-  if ((data = ParseInt(data, 4, 1, 9999, &time.year)) == nullptr) {
-    return false;
-  }
-  // Expect '-'
-  if (*data++ != '-') return false;
-  // Parse month
-  if ((data = ParseInt(data, 2, 1, 12, &time.month)) == nullptr) {
-    return false;
-  }
-  // Expect '-'
-  if (*data++ != '-') return false;
-  // Parse day
-  if ((data = ParseInt(data, 2, 1, 31, &time.day)) == nullptr) {
-    return false;
-  }
-  // Expect 'T'
-  if (*data++ != 'T') return false;
-  // Parse hour
-  if ((data = ParseInt(data, 2, 0, 23, &time.hour)) == nullptr) {
-    return false;
-  }
-  // Expect ':'
-  if (*data++ != ':') return false;
-  // Parse minute
-  if ((data = ParseInt(data, 2, 0, 59, &time.minute)) == nullptr) {
-    return false;
-  }
-  // Expect ':'
-  if (*data++ != ':') return false;
-  // Parse second
-  if ((data = ParseInt(data, 2, 0, 59, &time.second)) == nullptr) {
-    return false;
-  }
-  if (!DateTimeToSeconds(time, seconds)) {
-    return false;
-  }
-  // Parse nanoseconds.
-  if (*data == '.') {
-    ++data;
-    // Parse nanoseconds.
-    if ((data = ParseNanos(data, nanos)) == nullptr) {
-      return false;
-    }
-  } else {
-    *nanos = 0;
-  }
-  // Parse UTC offsets.
-  if (*data == 'Z') {
-    ++data;
-  } else if (*data == '+') {
-    ++data;
-    int64_t offset;
-    if ((data = ParseTimezoneOffset(data, &offset)) == nullptr) {
-      return false;
-    }
-    *seconds -= offset;
-  } else if (*data == '-') {
-    ++data;
-    int64_t offset;
-    if ((data = ParseTimezoneOffset(data, &offset)) == nullptr) {
-      return false;
-    }
-    *seconds += offset;
-  } else {
-    return false;
-  }
-  // Done with parsing.
-  return *data == 0;
-}
-
-}  // namespace internal
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/stubs/time.h b/libs/protobuf/src/google/protobuf/stubs/time.h
deleted file mode 100644
index 8b6e562..0000000
--- a/libs/protobuf/src/google/protobuf/stubs/time.h
+++ /dev/null
@@ -1,82 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#ifndef GOOGLE_PROTOBUF_STUBS_TIME_H_
-#define GOOGLE_PROTOBUF_STUBS_TIME_H_
-
-#include <cstdint>
-
-#include <google/protobuf/stubs/common.h>
-
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-namespace internal {
-
-struct DateTime {
-  int year;
-  int month;
-  int day;
-  int hour;
-  int minute;
-  int second;
-};
-
-// Converts a timestamp (seconds elapsed since 1970-01-01T00:00:00, could be
-// negative to represent time before 1970-01-01) to DateTime. Returns false
-// if the timestamp is not in the range between 0001-01-01T00:00:00 and
-// 9999-12-31T23:59:59.
-bool PROTOBUF_EXPORT SecondsToDateTime(int64_t seconds, DateTime* time);
-// Converts DateTime to a timestamp (seconds since 1970-01-01T00:00:00).
-// Returns false if the DateTime is not valid or is not in the valid range.
-bool PROTOBUF_EXPORT DateTimeToSeconds(const DateTime& time, int64_t* seconds);
-
-void PROTOBUF_EXPORT GetCurrentTime(int64_t* seconds, int32_t* nanos);
-
-// Formats a time string in RFC3339 format.
-//
-// For example, "2015-05-20T13:29:35.120Z". For nanos, 0, 3, 6 or 9 fractional
-// digits will be used depending on how many are required to represent the exact
-// value.
-//
-// Note that "nanos" must in the range of [0, 999999999].
-std::string PROTOBUF_EXPORT FormatTime(int64_t seconds, int32_t nanos);
-// Parses a time string. This method accepts RFC3339 date/time string with UTC
-// offset. For example, "2015-05-20T13:29:35.120-08:00".
-bool PROTOBUF_EXPORT ParseTime(const std::string& value, int64_t* seconds,
-                               int32_t* nanos);
-
-}  // namespace internal
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
-
-#endif  // GOOGLE_PROTOBUF_STUBS_TIME_H_
diff --git a/libs/protobuf/src/google/protobuf/stubs/time_test.cc b/libs/protobuf/src/google/protobuf/stubs/time_test.cc
deleted file mode 100644
index 1ce0a1c..0000000
--- a/libs/protobuf/src/google/protobuf/stubs/time_test.cc
+++ /dev/null
@@ -1,261 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#include <google/protobuf/stubs/time.h>
-
-#include <google/protobuf/testing/googletest.h>
-#include <gtest/gtest.h>
-
-namespace google {
-namespace protobuf {
-namespace internal {
-namespace {
-static const int64 kSecondsPerDay = 3600 * 24;
-
-// For DateTime, tests will mostly focus on the date part because that's
-// the tricky one.
-int64 CreateTimestamp(int year, int month, int day) {
-  DateTime time;
-  time.year = year;
-  time.month = month;
-  time.day = day;
-  time.hour = time.minute = time.second = 0;
-  int64 result;
-  GOOGLE_CHECK(DateTimeToSeconds(time, &result));
-  // Check that a roundtrip produces the same result.
-  GOOGLE_CHECK(SecondsToDateTime(result, &time));
-  GOOGLE_CHECK(time.year == year);
-  GOOGLE_CHECK(time.month == month);
-  GOOGLE_CHECK(time.day == day);
-  return result;
-}
-
-TEST(DateTimeTest, SimpleTime) {
-  DateTime time;
-  ASSERT_TRUE(SecondsToDateTime(1, &time));
-  EXPECT_EQ(1970, time.year);
-  EXPECT_EQ(1, time.month);
-  EXPECT_EQ(1, time.day);
-  EXPECT_EQ(0, time.hour);
-  EXPECT_EQ(0, time.minute);
-  EXPECT_EQ(1, time.second);
-  int64 seconds;
-  ASSERT_TRUE(DateTimeToSeconds(time, &seconds));
-  EXPECT_EQ(1, seconds);
-
-  ASSERT_TRUE(SecondsToDateTime(-1, &time));
-  EXPECT_EQ(1969, time.year);
-  EXPECT_EQ(12, time.month);
-  EXPECT_EQ(31, time.day);
-  EXPECT_EQ(23, time.hour);
-  EXPECT_EQ(59, time.minute);
-  EXPECT_EQ(59, time.second);
-  ASSERT_TRUE(DateTimeToSeconds(time, &seconds));
-  EXPECT_EQ(-1, seconds);
-
-  DateTime start, end;
-  start.year = 1;
-  start.month = 1;
-  start.day = 1;
-  start.hour = 0;
-  start.minute = 0;
-  start.second = 0;
-  end.year = 9999;
-  end.month = 12;
-  end.day = 31;
-  end.hour = 23;
-  end.minute = 59;
-  end.second = 59;
-  int64 start_time, end_time;
-  ASSERT_TRUE(DateTimeToSeconds(start, &start_time));
-  ASSERT_TRUE(DateTimeToSeconds(end, &end_time));
-  EXPECT_EQ(315537897599LL, end_time - start_time);
-  ASSERT_TRUE(SecondsToDateTime(start_time, &time));
-  ASSERT_TRUE(DateTimeToSeconds(time, &seconds));
-  EXPECT_EQ(start_time, seconds);
-  ASSERT_TRUE(SecondsToDateTime(end_time, &time));
-  ASSERT_TRUE(DateTimeToSeconds(time, &seconds));
-  EXPECT_EQ(end_time, seconds);
-}
-
-TEST(DateTimeTest, DayInMonths) {
-  // Check that month boundaries are handled correctly.
-  EXPECT_EQ(kSecondsPerDay,
-            CreateTimestamp(2015, 1, 1) - CreateTimestamp(2014, 12, 31));
-  EXPECT_EQ(kSecondsPerDay,
-            CreateTimestamp(2015, 2, 1) - CreateTimestamp(2015, 1, 31));
-  EXPECT_EQ(kSecondsPerDay,
-            CreateTimestamp(2015, 3, 1) - CreateTimestamp(2015, 2, 28));
-  EXPECT_EQ(kSecondsPerDay,
-            CreateTimestamp(2015, 4, 1) - CreateTimestamp(2015, 3, 31));
-  EXPECT_EQ(kSecondsPerDay,
-            CreateTimestamp(2015, 5, 1) - CreateTimestamp(2015, 4, 30));
-  EXPECT_EQ(kSecondsPerDay,
-            CreateTimestamp(2015, 6, 1) - CreateTimestamp(2015, 5, 31));
-  EXPECT_EQ(kSecondsPerDay,
-            CreateTimestamp(2015, 7, 1) - CreateTimestamp(2015, 6, 30));
-  EXPECT_EQ(kSecondsPerDay,
-            CreateTimestamp(2015, 8, 1) - CreateTimestamp(2015, 7, 31));
-  EXPECT_EQ(kSecondsPerDay,
-            CreateTimestamp(2015, 9, 1) - CreateTimestamp(2015, 8, 31));
-  EXPECT_EQ(kSecondsPerDay,
-            CreateTimestamp(2015, 10, 1) - CreateTimestamp(2015, 9, 30));
-  EXPECT_EQ(kSecondsPerDay,
-            CreateTimestamp(2015, 11, 1) - CreateTimestamp(2015, 10, 31));
-  EXPECT_EQ(kSecondsPerDay,
-            CreateTimestamp(2015, 12, 1) - CreateTimestamp(2015, 11, 30));
-  EXPECT_EQ(kSecondsPerDay,
-            CreateTimestamp(2016, 1, 1) - CreateTimestamp(2015, 12, 31));
-}
-
-TEST(DateTimeTest, LeapYear) {
-  // Non-leap year.
-  EXPECT_EQ(kSecondsPerDay,
-            CreateTimestamp(2015, 3, 1) - CreateTimestamp(2015, 2, 28));
-  // Leap year.
-  EXPECT_EQ(kSecondsPerDay,
-            CreateTimestamp(2016, 3, 1) - CreateTimestamp(2016, 2, 29));
-  // Non-leap year.
-  EXPECT_EQ(kSecondsPerDay,
-            CreateTimestamp(2100, 3, 1) - CreateTimestamp(2100, 2, 28));
-  // Leap year.
-  EXPECT_EQ(kSecondsPerDay,
-            CreateTimestamp(2400, 3, 1) - CreateTimestamp(2400, 2, 29));
-}
-
-TEST(DateTimeTest, WrongDays) {
-  int64 seconds;
-  DateTime time;
-  time.hour = 0;
-  time.minute = 0;
-  time.second = 0;
-  time.month = 2;
-
-  // Non-leap year.
-  time.year = 2015;
-  time.day = 29;
-  ASSERT_FALSE(DateTimeToSeconds(time, &seconds));
-
-  // Leap year.
-  time.year = 2016;
-  time.day = 29;
-  ASSERT_TRUE(DateTimeToSeconds(time, &seconds));
-  time.day = 30;
-  ASSERT_FALSE(DateTimeToSeconds(time, &seconds));
-
-  // Non-leap year.
-  time.year = 2100;
-  time.day = 29;
-  ASSERT_FALSE(DateTimeToSeconds(time, &seconds));
-
-  // Leap year.
-  time.year = 2400;
-  time.day = 29;
-  ASSERT_TRUE(DateTimeToSeconds(time, &seconds));
-  time.day = 30;
-  ASSERT_FALSE(DateTimeToSeconds(time, &seconds));
-
-  // Non-february
-  time.year = 2015;
-  time.month = 1;
-  time.day = 0;
-  ASSERT_FALSE(DateTimeToSeconds(time, &seconds));
-  time.day = 1;
-  ASSERT_TRUE(DateTimeToSeconds(time, &seconds));
-  time.day = 31;
-  ASSERT_TRUE(DateTimeToSeconds(time, &seconds));
-  time.day = 32;
-  ASSERT_FALSE(DateTimeToSeconds(time, &seconds));
-
-  // Bad month
-  time.year = 2015;
-  time.month = 0;
-  time.day = 1;
-  ASSERT_FALSE(DateTimeToSeconds(time, &seconds));
-  time.month = 13;
-  ASSERT_FALSE(DateTimeToSeconds(time, &seconds));
-}
-
-TEST(DateTimeTest, StringFormat) {
-  DateTime start, end;
-  start.year = 1;
-  start.month = 1;
-  start.day = 1;
-  start.hour = 0;
-  start.minute = 0;
-  start.second = 0;
-  end.year = 9999;
-  end.month = 12;
-  end.day = 31;
-  end.hour = 23;
-  end.minute = 59;
-  end.second = 59;
-  int64 start_time, end_time;
-  ASSERT_TRUE(DateTimeToSeconds(start, &start_time));
-  ASSERT_TRUE(DateTimeToSeconds(end, &end_time));
-
-  EXPECT_EQ("0001-01-01T00:00:00Z", FormatTime(start_time, 0));
-  EXPECT_EQ("9999-12-31T23:59:59Z", FormatTime(end_time, 0));
-
-  // Make sure the nanoseconds part is formatted correctly.
-  EXPECT_EQ("1970-01-01T00:00:00.010Z", FormatTime(0, 10000000));
-  EXPECT_EQ("1970-01-01T00:00:00.000010Z", FormatTime(0, 10000));
-  EXPECT_EQ("1970-01-01T00:00:00.000000010Z", FormatTime(0, 10));
-}
-
-TEST(DateTimeTest, ParseString) {
-  int64 seconds;
-  int32 nanos;
-  ASSERT_TRUE(ParseTime("0001-01-01T00:00:00Z", &seconds, &nanos));
-  EXPECT_EQ("0001-01-01T00:00:00Z", FormatTime(seconds, nanos));
-  ASSERT_TRUE(ParseTime("9999-12-31T23:59:59.999999999Z", &seconds, &nanos));
-  EXPECT_EQ("9999-12-31T23:59:59.999999999Z", FormatTime(seconds, nanos));
-
-  // Test time zone offsets.
-  ASSERT_TRUE(ParseTime("1970-01-01T00:00:00-08:00", &seconds, &nanos));
-  EXPECT_EQ("1970-01-01T08:00:00Z", FormatTime(seconds, nanos));
-  ASSERT_TRUE(ParseTime("1970-01-01T00:00:00+08:00", &seconds, &nanos));
-  EXPECT_EQ("1969-12-31T16:00:00Z", FormatTime(seconds, nanos));
-
-  // Test nanoseconds.
-  ASSERT_TRUE(ParseTime("1970-01-01T00:00:00.01Z", &seconds, &nanos));
-  EXPECT_EQ("1970-01-01T00:00:00.010Z", FormatTime(seconds, nanos));
-  ASSERT_TRUE(ParseTime("1970-01-01T00:00:00.00001-08:00", &seconds, &nanos));
-  EXPECT_EQ("1970-01-01T08:00:00.000010Z", FormatTime(seconds, nanos));
-  ASSERT_TRUE(ParseTime("1970-01-01T00:00:00.00000001+08:00", &seconds, &nanos));
-  EXPECT_EQ("1969-12-31T16:00:00.000000010Z", FormatTime(seconds, nanos));
-  // Fractional parts less than 1 nanosecond will be ignored.
-  ASSERT_TRUE(ParseTime("1970-01-01T00:00:00.0123456789Z", &seconds, &nanos));
-  EXPECT_EQ("1970-01-01T00:00:00.012345678Z", FormatTime(seconds, nanos));
-}
-
-}  // namespace
-}  // namespace internal
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/test_messages_proto2.proto b/libs/protobuf/src/google/protobuf/test_messages_proto2.proto
deleted file mode 100644
index c7b9c48..0000000
--- a/libs/protobuf/src/google/protobuf/test_messages_proto2.proto
+++ /dev/null
@@ -1,297 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// Test schema for proto2 messages.  This test schema is used by:
-//
-// - conformance tests
-//
-
-// LINT: ALLOW_GROUPS
-
-syntax = "proto2";
-
-package protobuf_test_messages.proto2;
-
-option java_package = "com.google.protobuf_test_messages.proto2";
-
-// This is the default, but we specify it here explicitly.
-option optimize_for = SPEED;
-
-option cc_enable_arenas = true;
-
-// This proto includes every type of field in both singular and repeated
-// forms.
-//
-// Also, crucially, all messages and enums in this file are eventually
-// submessages of this message.  So for example, a fuzz test of TestAllTypes
-// could trigger bugs that occur in any message type in this file.  We verify
-// this stays true in a unit test.
-message TestAllTypesProto2 {
-  message NestedMessage {
-    optional int32 a = 1;
-    optional TestAllTypesProto2 corecursive = 2;
-  }
-
-  enum NestedEnum {
-    FOO = 0;
-    BAR = 1;
-    BAZ = 2;
-    NEG = -1;  // Intentionally negative.
-  }
-
-  // Singular
-  optional int32 optional_int32 = 1;
-  optional int64 optional_int64 = 2;
-  optional uint32 optional_uint32 = 3;
-  optional uint64 optional_uint64 = 4;
-  optional sint32 optional_sint32 = 5;
-  optional sint64 optional_sint64 = 6;
-  optional fixed32 optional_fixed32 = 7;
-  optional fixed64 optional_fixed64 = 8;
-  optional sfixed32 optional_sfixed32 = 9;
-  optional sfixed64 optional_sfixed64 = 10;
-  optional float optional_float = 11;
-  optional double optional_double = 12;
-  optional bool optional_bool = 13;
-  optional string optional_string = 14;
-  optional bytes optional_bytes = 15;
-
-  optional NestedMessage optional_nested_message = 18;
-  optional ForeignMessageProto2 optional_foreign_message = 19;
-
-  optional NestedEnum optional_nested_enum = 21;
-  optional ForeignEnumProto2 optional_foreign_enum = 22;
-
-  optional string optional_string_piece = 24 [ctype = STRING_PIECE];
-  optional string optional_cord = 25 [ctype = CORD];
-
-  optional TestAllTypesProto2 recursive_message = 27;
-
-  // Repeated
-  repeated int32 repeated_int32 = 31;
-  repeated int64 repeated_int64 = 32;
-  repeated uint32 repeated_uint32 = 33;
-  repeated uint64 repeated_uint64 = 34;
-  repeated sint32 repeated_sint32 = 35;
-  repeated sint64 repeated_sint64 = 36;
-  repeated fixed32 repeated_fixed32 = 37;
-  repeated fixed64 repeated_fixed64 = 38;
-  repeated sfixed32 repeated_sfixed32 = 39;
-  repeated sfixed64 repeated_sfixed64 = 40;
-  repeated float repeated_float = 41;
-  repeated double repeated_double = 42;
-  repeated bool repeated_bool = 43;
-  repeated string repeated_string = 44;
-  repeated bytes repeated_bytes = 45;
-
-  repeated NestedMessage repeated_nested_message = 48;
-  repeated ForeignMessageProto2 repeated_foreign_message = 49;
-
-  repeated NestedEnum repeated_nested_enum = 51;
-  repeated ForeignEnumProto2 repeated_foreign_enum = 52;
-
-  repeated string repeated_string_piece = 54 [ctype = STRING_PIECE];
-  repeated string repeated_cord = 55 [ctype = CORD];
-
-  // Packed
-  repeated int32 packed_int32 = 75 [packed = true];
-  repeated int64 packed_int64 = 76 [packed = true];
-  repeated uint32 packed_uint32 = 77 [packed = true];
-  repeated uint64 packed_uint64 = 78 [packed = true];
-  repeated sint32 packed_sint32 = 79 [packed = true];
-  repeated sint64 packed_sint64 = 80 [packed = true];
-  repeated fixed32 packed_fixed32 = 81 [packed = true];
-  repeated fixed64 packed_fixed64 = 82 [packed = true];
-  repeated sfixed32 packed_sfixed32 = 83 [packed = true];
-  repeated sfixed64 packed_sfixed64 = 84 [packed = true];
-  repeated float packed_float = 85 [packed = true];
-  repeated double packed_double = 86 [packed = true];
-  repeated bool packed_bool = 87 [packed = true];
-  repeated NestedEnum packed_nested_enum = 88 [packed = true];
-
-  // Unpacked
-  repeated int32 unpacked_int32 = 89 [packed = false];
-  repeated int64 unpacked_int64 = 90 [packed = false];
-  repeated uint32 unpacked_uint32 = 91 [packed = false];
-  repeated uint64 unpacked_uint64 = 92 [packed = false];
-  repeated sint32 unpacked_sint32 = 93 [packed = false];
-  repeated sint64 unpacked_sint64 = 94 [packed = false];
-  repeated fixed32 unpacked_fixed32 = 95 [packed = false];
-  repeated fixed64 unpacked_fixed64 = 96 [packed = false];
-  repeated sfixed32 unpacked_sfixed32 = 97 [packed = false];
-  repeated sfixed64 unpacked_sfixed64 = 98 [packed = false];
-  repeated float unpacked_float = 99 [packed = false];
-  repeated double unpacked_double = 100 [packed = false];
-  repeated bool unpacked_bool = 101 [packed = false];
-  repeated NestedEnum unpacked_nested_enum = 102 [packed = false];
-
-  // Map
-  map<int32, int32> map_int32_int32 = 56;
-  map<int64, int64> map_int64_int64 = 57;
-  map<uint32, uint32> map_uint32_uint32 = 58;
-  map<uint64, uint64> map_uint64_uint64 = 59;
-  map<sint32, sint32> map_sint32_sint32 = 60;
-  map<sint64, sint64> map_sint64_sint64 = 61;
-  map<fixed32, fixed32> map_fixed32_fixed32 = 62;
-  map<fixed64, fixed64> map_fixed64_fixed64 = 63;
-  map<sfixed32, sfixed32> map_sfixed32_sfixed32 = 64;
-  map<sfixed64, sfixed64> map_sfixed64_sfixed64 = 65;
-  map<int32, float> map_int32_float = 66;
-  map<int32, double> map_int32_double = 67;
-  map<bool, bool> map_bool_bool = 68;
-  map<string, string> map_string_string = 69;
-  map<string, bytes> map_string_bytes = 70;
-  map<string, NestedMessage> map_string_nested_message = 71;
-  map<string, ForeignMessageProto2> map_string_foreign_message = 72;
-  map<string, NestedEnum> map_string_nested_enum = 73;
-  map<string, ForeignEnumProto2> map_string_foreign_enum = 74;
-
-  oneof oneof_field {
-    uint32 oneof_uint32 = 111;
-    NestedMessage oneof_nested_message = 112;
-    string oneof_string = 113;
-    bytes oneof_bytes = 114;
-    bool oneof_bool = 115;
-    uint64 oneof_uint64 = 116;
-    float oneof_float = 117;
-    double oneof_double = 118;
-    NestedEnum oneof_enum = 119;
-  }
-
-  // extensions
-  extensions 120 to 200;
-
-  // groups
-  optional group Data = 201 {
-    optional int32 group_int32 = 202;
-    optional uint32 group_uint32 = 203;
-  }
-
-  // default values
-  optional int32 default_int32 = 241 [ default = -123456789];
-  optional int64 default_int64 = 242 [ default = -9123456789123456789];
-  optional uint32 default_uint32 = 243 [ default = 2123456789];
-  optional uint64 default_uint64 = 244 [ default = 10123456789123456789];
-  optional sint32 default_sint32 = 245 [ default = -123456789];
-  optional sint64 default_sint64 = 246 [default = -9123456789123456789];
-  optional fixed32 default_fixed32 = 247 [ default = 2123456789];
-  optional fixed64 default_fixed64 = 248 [ default = 10123456789123456789];
-  optional sfixed32 default_sfixed32 = 249 [ default = -123456789];
-  optional sfixed64 default_sfixed64 = 250 [default = -9123456789123456789];
-  optional float default_float = 251 [ default = 9e9];
-  optional double default_double = 252 [ default = 7e22];
-  optional bool default_bool = 253 [ default = true];
-  optional string default_string = 254 [ default = "Rosebud"];
-  optional bytes default_bytes = 255 [ default = "joshua"];
-
-  // Test field-name-to-JSON-name convention.
-  // (protobuf says names can be any valid C/C++ identifier.)
-  optional int32 fieldname1 = 401;
-  optional int32 field_name2 = 402;
-  optional int32 _field_name3 = 403;
-  optional int32 field__name4_ = 404;
-  optional int32 field0name5 = 405;
-  optional int32 field_0_name6 = 406;
-  optional int32 fieldName7 = 407;
-  optional int32 FieldName8 = 408;
-  optional int32 field_Name9 = 409;
-  optional int32 Field_Name10 = 410;
-  optional int32 FIELD_NAME11 = 411;
-  optional int32 FIELD_name12 = 412;
-  optional int32 __field_name13 = 413;
-  optional int32 __Field_name14 = 414;
-  optional int32 field__name15 = 415;
-  optional int32 field__Name16 = 416;
-  optional int32 field_name17__ = 417;
-  optional int32 Field_name18__ = 418;
-
-  // Reserved for unknown fields test.
-  reserved 1000 to 9999;
-
-  // message_set test case.
-  message MessageSetCorrect {
-    option message_set_wire_format = true;
-
-    extensions 4 to max;
-  }
-
-  message MessageSetCorrectExtension1 {
-    extend MessageSetCorrect {
-      optional MessageSetCorrectExtension1 message_set_extension = 1547769;
-    }
-    optional string str = 25;
-  }
-
-  message MessageSetCorrectExtension2 {
-    extend MessageSetCorrect {
-      optional MessageSetCorrectExtension2 message_set_extension = 4135312;
-    }
-    optional int32 i = 9;
-  }
-}
-
-message ForeignMessageProto2 {
-  optional int32 c = 1;
-}
-
-enum ForeignEnumProto2 {
-  FOREIGN_FOO = 0;
-  FOREIGN_BAR = 1;
-  FOREIGN_BAZ = 2;
-}
-
-extend TestAllTypesProto2 {
-  optional int32 extension_int32 = 120;
-}
-
-message UnknownToTestAllTypes {
-  optional int32 optional_int32 = 1001;
-  optional string optional_string = 1002;
-  optional ForeignMessageProto2 nested_message = 1003;
-  optional group OptionalGroup = 1004 {
-    optional int32 a = 1;
-  }
-  optional bool optional_bool = 1006;
-  repeated int32 repeated_int32 = 1011;
-}
-
-message NullHypothesisProto2 {
-}
-
-message EnumOnlyProto2 {
-  enum Bool {
-    kFalse = 0;
-    kTrue = 1;
-  }
-}
-
-message OneStringProto2 {
-  optional string data = 1;
-}
diff --git a/libs/protobuf/src/google/protobuf/test_messages_proto3.proto b/libs/protobuf/src/google/protobuf/test_messages_proto3.proto
deleted file mode 100644
index 1e1285e..0000000
--- a/libs/protobuf/src/google/protobuf/test_messages_proto3.proto
+++ /dev/null
@@ -1,288 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// Test schema for proto3 messages.  This test schema is used by:
-//
-// - benchmarks
-// - fuzz tests
-// - conformance tests
-//
-
-syntax = "proto3";
-
-package protobuf_test_messages.proto3;
-
-option java_package = "com.google.protobuf_test_messages.proto3";
-option objc_class_prefix = "Proto3";
-
-// This is the default, but we specify it here explicitly.
-option optimize_for = SPEED;
-
-import "google/protobuf/any.proto";
-import "google/protobuf/duration.proto";
-import "google/protobuf/field_mask.proto";
-import "google/protobuf/struct.proto";
-import "google/protobuf/timestamp.proto";
-import "google/protobuf/wrappers.proto";
-
-option cc_enable_arenas = true;
-
-// This proto includes every type of field in both singular and repeated
-// forms.
-//
-// Also, crucially, all messages and enums in this file are eventually
-// submessages of this message.  So for example, a fuzz test of TestAllTypes
-// could trigger bugs that occur in any message type in this file.  We verify
-// this stays true in a unit test.
-message TestAllTypesProto3 {
-  message NestedMessage {
-    int32 a = 1;
-    TestAllTypesProto3 corecursive = 2;
-  }
-
-  enum NestedEnum {
-    FOO = 0;
-    BAR = 1;
-    BAZ = 2;
-    NEG = -1;  // Intentionally negative.
-  }
-
-  enum AliasedEnum {
-    option allow_alias = true;
-
-    ALIAS_FOO = 0;
-    ALIAS_BAR = 1;
-    ALIAS_BAZ = 2;
-    MOO = 2;
-    moo = 2;
-    bAz = 2;
-  }
-
-  // Singular
-  int32 optional_int32 = 1;
-  int64 optional_int64 = 2;
-  uint32 optional_uint32 = 3;
-  uint64 optional_uint64 = 4;
-  sint32 optional_sint32 = 5;
-  sint64 optional_sint64 = 6;
-  fixed32 optional_fixed32 = 7;
-  fixed64 optional_fixed64 = 8;
-  sfixed32 optional_sfixed32 = 9;
-  sfixed64 optional_sfixed64 = 10;
-  float optional_float = 11;
-  double optional_double = 12;
-  bool optional_bool = 13;
-  string optional_string = 14;
-  bytes optional_bytes = 15;
-
-  NestedMessage optional_nested_message = 18;
-  ForeignMessage optional_foreign_message = 19;
-
-  NestedEnum optional_nested_enum = 21;
-  ForeignEnum optional_foreign_enum = 22;
-  AliasedEnum optional_aliased_enum = 23;
-
-  string optional_string_piece = 24 [ctype = STRING_PIECE];
-  string optional_cord = 25 [ctype = CORD];
-
-  TestAllTypesProto3 recursive_message = 27;
-
-  // Repeated
-  repeated int32 repeated_int32 = 31;
-  repeated int64 repeated_int64 = 32;
-  repeated uint32 repeated_uint32 = 33;
-  repeated uint64 repeated_uint64 = 34;
-  repeated sint32 repeated_sint32 = 35;
-  repeated sint64 repeated_sint64 = 36;
-  repeated fixed32 repeated_fixed32 = 37;
-  repeated fixed64 repeated_fixed64 = 38;
-  repeated sfixed32 repeated_sfixed32 = 39;
-  repeated sfixed64 repeated_sfixed64 = 40;
-  repeated float repeated_float = 41;
-  repeated double repeated_double = 42;
-  repeated bool repeated_bool = 43;
-  repeated string repeated_string = 44;
-  repeated bytes repeated_bytes = 45;
-
-  repeated NestedMessage repeated_nested_message = 48;
-  repeated ForeignMessage repeated_foreign_message = 49;
-
-  repeated NestedEnum repeated_nested_enum = 51;
-  repeated ForeignEnum repeated_foreign_enum = 52;
-
-  repeated string repeated_string_piece = 54 [ctype = STRING_PIECE];
-  repeated string repeated_cord = 55 [ctype = CORD];
-
-  // Packed
-  repeated int32 packed_int32 = 75 [packed = true];
-  repeated int64 packed_int64 = 76 [packed = true];
-  repeated uint32 packed_uint32 = 77 [packed = true];
-  repeated uint64 packed_uint64 = 78 [packed = true];
-  repeated sint32 packed_sint32 = 79 [packed = true];
-  repeated sint64 packed_sint64 = 80 [packed = true];
-  repeated fixed32 packed_fixed32 = 81 [packed = true];
-  repeated fixed64 packed_fixed64 = 82 [packed = true];
-  repeated sfixed32 packed_sfixed32 = 83 [packed = true];
-  repeated sfixed64 packed_sfixed64 = 84 [packed = true];
-  repeated float packed_float = 85 [packed = true];
-  repeated double packed_double = 86 [packed = true];
-  repeated bool packed_bool = 87 [packed = true];
-  repeated NestedEnum packed_nested_enum = 88 [packed = true];
-
-  // Unpacked
-  repeated int32 unpacked_int32 = 89 [packed = false];
-  repeated int64 unpacked_int64 = 90 [packed = false];
-  repeated uint32 unpacked_uint32 = 91 [packed = false];
-  repeated uint64 unpacked_uint64 = 92 [packed = false];
-  repeated sint32 unpacked_sint32 = 93 [packed = false];
-  repeated sint64 unpacked_sint64 = 94 [packed = false];
-  repeated fixed32 unpacked_fixed32 = 95 [packed = false];
-  repeated fixed64 unpacked_fixed64 = 96 [packed = false];
-  repeated sfixed32 unpacked_sfixed32 = 97 [packed = false];
-  repeated sfixed64 unpacked_sfixed64 = 98 [packed = false];
-  repeated float unpacked_float = 99 [packed = false];
-  repeated double unpacked_double = 100 [packed = false];
-  repeated bool unpacked_bool = 101 [packed = false];
-  repeated NestedEnum unpacked_nested_enum = 102 [packed = false];
-
-  // Map
-  map<int32, int32> map_int32_int32 = 56;
-  map<int64, int64> map_int64_int64 = 57;
-  map<uint32, uint32> map_uint32_uint32 = 58;
-  map<uint64, uint64> map_uint64_uint64 = 59;
-  map<sint32, sint32> map_sint32_sint32 = 60;
-  map<sint64, sint64> map_sint64_sint64 = 61;
-  map<fixed32, fixed32> map_fixed32_fixed32 = 62;
-  map<fixed64, fixed64> map_fixed64_fixed64 = 63;
-  map<sfixed32, sfixed32> map_sfixed32_sfixed32 = 64;
-  map<sfixed64, sfixed64> map_sfixed64_sfixed64 = 65;
-  map<int32, float> map_int32_float = 66;
-  map<int32, double> map_int32_double = 67;
-  map<bool, bool> map_bool_bool = 68;
-  map<string, string> map_string_string = 69;
-  map<string, bytes> map_string_bytes = 70;
-  map<string, NestedMessage> map_string_nested_message = 71;
-  map<string, ForeignMessage> map_string_foreign_message = 72;
-  map<string, NestedEnum> map_string_nested_enum = 73;
-  map<string, ForeignEnum> map_string_foreign_enum = 74;
-
-  oneof oneof_field {
-    uint32 oneof_uint32 = 111;
-    NestedMessage oneof_nested_message = 112;
-    string oneof_string = 113;
-    bytes oneof_bytes = 114;
-    bool oneof_bool = 115;
-    uint64 oneof_uint64 = 116;
-    float oneof_float = 117;
-    double oneof_double = 118;
-    NestedEnum oneof_enum = 119;
-    google.protobuf.NullValue oneof_null_value = 120;
-  }
-
-  // Well-known types
-  google.protobuf.BoolValue optional_bool_wrapper = 201;
-  google.protobuf.Int32Value optional_int32_wrapper = 202;
-  google.protobuf.Int64Value optional_int64_wrapper = 203;
-  google.protobuf.UInt32Value optional_uint32_wrapper = 204;
-  google.protobuf.UInt64Value optional_uint64_wrapper = 205;
-  google.protobuf.FloatValue optional_float_wrapper = 206;
-  google.protobuf.DoubleValue optional_double_wrapper = 207;
-  google.protobuf.StringValue optional_string_wrapper = 208;
-  google.protobuf.BytesValue optional_bytes_wrapper = 209;
-
-  repeated google.protobuf.BoolValue repeated_bool_wrapper = 211;
-  repeated google.protobuf.Int32Value repeated_int32_wrapper = 212;
-  repeated google.protobuf.Int64Value repeated_int64_wrapper = 213;
-  repeated google.protobuf.UInt32Value repeated_uint32_wrapper = 214;
-  repeated google.protobuf.UInt64Value repeated_uint64_wrapper = 215;
-  repeated google.protobuf.FloatValue repeated_float_wrapper = 216;
-  repeated google.protobuf.DoubleValue repeated_double_wrapper = 217;
-  repeated google.protobuf.StringValue repeated_string_wrapper = 218;
-  repeated google.protobuf.BytesValue repeated_bytes_wrapper = 219;
-
-  google.protobuf.Duration optional_duration = 301;
-  google.protobuf.Timestamp optional_timestamp = 302;
-  google.protobuf.FieldMask optional_field_mask = 303;
-  google.protobuf.Struct optional_struct = 304;
-  google.protobuf.Any optional_any = 305;
-  google.protobuf.Value optional_value = 306;
-  google.protobuf.NullValue optional_null_value = 307;
-
-  repeated google.protobuf.Duration repeated_duration = 311;
-  repeated google.protobuf.Timestamp repeated_timestamp = 312;
-  repeated google.protobuf.FieldMask repeated_fieldmask = 313;
-  repeated google.protobuf.Struct repeated_struct = 324;
-  repeated google.protobuf.Any repeated_any = 315;
-  repeated google.protobuf.Value repeated_value = 316;
-  repeated google.protobuf.ListValue repeated_list_value = 317;
-
-  // Test field-name-to-JSON-name convention.
-  // (protobuf says names can be any valid C/C++ identifier.)
-  int32 fieldname1 = 401;
-  int32 field_name2 = 402;
-  int32 _field_name3 = 403;
-  int32 field__name4_ = 404;
-  int32 field0name5 = 405;
-  int32 field_0_name6 = 406;
-  int32 fieldName7 = 407;
-  int32 FieldName8 = 408;
-  int32 field_Name9 = 409;
-  int32 Field_Name10 = 410;
-  int32 FIELD_NAME11 = 411;
-  int32 FIELD_name12 = 412;
-  int32 __field_name13 = 413;
-  int32 __Field_name14 = 414;
-  int32 field__name15 = 415;
-  int32 field__Name16 = 416;
-  int32 field_name17__ = 417;
-  int32 Field_name18__ = 418;
-
-  // Reserved for testing unknown fields
-  reserved 501 to 510;
-}
-
-message ForeignMessage {
-  int32 c = 1;
-}
-
-enum ForeignEnum {
-  FOREIGN_FOO = 0;
-  FOREIGN_BAR = 1;
-  FOREIGN_BAZ = 2;
-}
-
-message NullHypothesisProto3 {}
-
-message EnumOnlyProto3 {
-  enum Bool {
-    kFalse = 0;
-    kTrue = 1;
-  }
-}
diff --git a/libs/protobuf/src/google/protobuf/test_util.cc b/libs/protobuf/src/google/protobuf/test_util.cc
deleted file mode 100644
index 795cb6a..0000000
--- a/libs/protobuf/src/google/protobuf/test_util.cc
+++ /dev/null
@@ -1,47 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-
-#ifdef _WIN32
-// Verify that #including windows.h does not break anything (e.g. because
-// windows.h #defines GetMessage() as a macro).
-#include <windows.h>
-#endif
-
-#include <google/protobuf/test_util.h>
-
-namespace google {
-namespace protobuf {
-
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/test_util.h b/libs/protobuf/src/google/protobuf/test_util.h
deleted file mode 100644
index b18d7b6..0000000
--- a/libs/protobuf/src/google/protobuf/test_util.h
+++ /dev/null
@@ -1,1277 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-
-#ifndef GOOGLE_PROTOBUF_TEST_UTIL_H__
-#define GOOGLE_PROTOBUF_TEST_UTIL_H__
-
-#include <google/protobuf/unittest.pb.h>
-
-#define UNITTEST ::protobuf_unittest
-#define UNITTEST_IMPORT ::protobuf_unittest_import
-// Must be included when the preprocessor symbols above are defined.
-#include <google/protobuf/test_util.inc>
-#undef UNITTEST
-#undef UNITTEST_IMPORT
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-// This file doesn't use these declarations, but some .cc files do.
-namespace unittest = ::protobuf_unittest;
-namespace unittest_import = ::protobuf_unittest_import;
-
-namespace TestUtil {
-
-class ReflectionTester {
- public:
-  // base_descriptor must be a descriptor for TestAllTypes or
-  // TestAllExtensions.  In the former case, ReflectionTester fetches from
-  // it the FieldDescriptors needed to use the reflection interface.  In
-  // the latter case, ReflectionTester searches for extension fields in
-  // its file.
-  explicit ReflectionTester(const Descriptor* base_descriptor);
-
-  void SetAllFieldsViaReflection(Message* message);
-  void ModifyRepeatedFieldsViaReflection(Message* message);
-  void ExpectAllFieldsSetViaReflection(const Message& message);
-  void ExpectClearViaReflection(const Message& message);
-
-  void SetPackedFieldsViaReflection(Message* message);
-  void ExpectPackedFieldsSetViaReflection(const Message& message);
-
-  void RemoveLastRepeatedsViaReflection(Message* message);
-  void ReleaseLastRepeatedsViaReflection(Message* message,
-                                         bool expect_extensions_notnull);
-  void SwapRepeatedsViaReflection(Message* message);
-  void SetAllocatedOptionalMessageFieldsToNullViaReflection(Message* message);
-  static void SetAllocatedOptionalMessageFieldsToMessageViaReflection(
-      Message* from_message, Message* to_message);
-
-  enum MessageReleaseState {
-    IS_NULL,
-    CAN_BE_NULL,
-    NOT_NULL,
-  };
-  void ExpectMessagesReleasedViaReflection(
-      Message* message, MessageReleaseState expected_release_state);
-
-  // Set and check functions for TestOneof2 messages. No need to construct
-  // the ReflectionTester by TestAllTypes nor TestAllExtensions.
-  static void SetOneofViaReflection(Message* message);
-  static void ExpectOneofSetViaReflection(const Message& message);
-
- private:
-  const FieldDescriptor* F(const std::string& name);
-
-  const Descriptor* base_descriptor_;
-
-  const FieldDescriptor* group_a_;
-  const FieldDescriptor* repeated_group_a_;
-  const FieldDescriptor* nested_b_;
-  const FieldDescriptor* foreign_c_;
-  const FieldDescriptor* import_d_;
-  const FieldDescriptor* import_e_;
-
-  const EnumValueDescriptor* nested_foo_;
-  const EnumValueDescriptor* nested_bar_;
-  const EnumValueDescriptor* nested_baz_;
-  const EnumValueDescriptor* foreign_foo_;
-  const EnumValueDescriptor* foreign_bar_;
-  const EnumValueDescriptor* foreign_baz_;
-  const EnumValueDescriptor* import_foo_;
-  const EnumValueDescriptor* import_bar_;
-  const EnumValueDescriptor* import_baz_;
-
-  // We have to split this into three function otherwise it creates a stack
-  // frame so large that it triggers a warning.
-  void ExpectAllFieldsSetViaReflection1(const Message& message);
-  void ExpectAllFieldsSetViaReflection2(const Message& message);
-  void ExpectAllFieldsSetViaReflection3(const Message& message);
-
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(ReflectionTester);
-};
-
-inline TestUtil::ReflectionTester::ReflectionTester(
-    const Descriptor* base_descriptor)
-    : base_descriptor_(base_descriptor) {
-  const DescriptorPool* pool = base_descriptor->file()->pool();
-  std::string package = base_descriptor->file()->package();
-  const FieldDescriptor* import_descriptor =
-      pool->FindFieldByName(package + ".TestAllTypes.optional_import_message");
-  std::string import_package =
-      import_descriptor->message_type()->file()->package();
-
-  nested_b_ = pool->FindFieldByName(package + ".TestAllTypes.NestedMessage.bb");
-  foreign_c_ = pool->FindFieldByName(package + ".ForeignMessage.c");
-  import_d_ = pool->FindFieldByName(import_package + ".ImportMessage.d");
-  import_e_ = pool->FindFieldByName(import_package + ".PublicImportMessage.e");
-  nested_foo_ = pool->FindEnumValueByName(package + ".TestAllTypes.FOO");
-  nested_bar_ = pool->FindEnumValueByName(package + ".TestAllTypes.BAR");
-  nested_baz_ = pool->FindEnumValueByName(package + ".TestAllTypes.BAZ");
-  foreign_foo_ = pool->FindEnumValueByName(package + ".FOREIGN_FOO");
-  foreign_bar_ = pool->FindEnumValueByName(package + ".FOREIGN_BAR");
-  foreign_baz_ = pool->FindEnumValueByName(package + ".FOREIGN_BAZ");
-  import_foo_ = pool->FindEnumValueByName(import_package + ".IMPORT_FOO");
-  import_bar_ = pool->FindEnumValueByName(import_package + ".IMPORT_BAR");
-  import_baz_ = pool->FindEnumValueByName(import_package + ".IMPORT_BAZ");
-
-  if (base_descriptor_->name() == "TestAllExtensions") {
-    group_a_ = pool->FindFieldByName(package + ".OptionalGroup_extension.a");
-    repeated_group_a_ =
-        pool->FindFieldByName(package + ".RepeatedGroup_extension.a");
-  } else {
-    group_a_ = pool->FindFieldByName(package + ".TestAllTypes.OptionalGroup.a");
-    repeated_group_a_ =
-        pool->FindFieldByName(package + ".TestAllTypes.RepeatedGroup.a");
-  }
-
-  EXPECT_TRUE(group_a_ != nullptr);
-  EXPECT_TRUE(repeated_group_a_ != nullptr);
-  EXPECT_TRUE(nested_b_ != nullptr);
-  EXPECT_TRUE(foreign_c_ != nullptr);
-  EXPECT_TRUE(import_d_ != nullptr);
-  EXPECT_TRUE(import_e_ != nullptr);
-  EXPECT_TRUE(nested_foo_ != nullptr);
-  EXPECT_TRUE(nested_bar_ != nullptr);
-  EXPECT_TRUE(nested_baz_ != nullptr);
-  EXPECT_TRUE(foreign_foo_ != nullptr);
-  EXPECT_TRUE(foreign_bar_ != nullptr);
-  EXPECT_TRUE(foreign_baz_ != nullptr);
-  EXPECT_TRUE(import_foo_ != nullptr);
-  EXPECT_TRUE(import_bar_ != nullptr);
-  EXPECT_TRUE(import_baz_ != nullptr);
-}
-
-// Shorthand to get a FieldDescriptor for a field of TestAllTypes.
-inline const FieldDescriptor* TestUtil::ReflectionTester::F(
-    const std::string& name) {
-  const FieldDescriptor* result = nullptr;
-  if (base_descriptor_->name() == "TestAllExtensions" ||
-      base_descriptor_->name() == "TestPackedExtensions") {
-    result = base_descriptor_->file()->FindExtensionByName(name + "_extension");
-  } else {
-    result = base_descriptor_->FindFieldByName(name);
-  }
-  GOOGLE_CHECK(result != nullptr);
-  return result;
-}
-
-// -------------------------------------------------------------------
-
-inline void TestUtil::ReflectionTester::SetAllFieldsViaReflection(
-    Message* message) {
-  const Reflection* reflection = message->GetReflection();
-  Message* sub_message;
-
-  reflection->SetInt32(message, F("optional_int32"), 101);
-  reflection->SetInt64(message, F("optional_int64"), 102);
-  reflection->SetUInt32(message, F("optional_uint32"), 103);
-  reflection->SetUInt64(message, F("optional_uint64"), 104);
-  reflection->SetInt32(message, F("optional_sint32"), 105);
-  reflection->SetInt64(message, F("optional_sint64"), 106);
-  reflection->SetUInt32(message, F("optional_fixed32"), 107);
-  reflection->SetUInt64(message, F("optional_fixed64"), 108);
-  reflection->SetInt32(message, F("optional_sfixed32"), 109);
-  reflection->SetInt64(message, F("optional_sfixed64"), 110);
-  reflection->SetFloat(message, F("optional_float"), 111);
-  reflection->SetDouble(message, F("optional_double"), 112);
-  reflection->SetBool(message, F("optional_bool"), true);
-  reflection->SetString(message, F("optional_string"), "115");
-  reflection->SetString(message, F("optional_bytes"), "116");
-
-  sub_message = reflection->MutableMessage(message, F("optionalgroup"));
-  sub_message->GetReflection()->SetInt32(sub_message, group_a_, 117);
-  sub_message =
-      reflection->MutableMessage(message, F("optional_nested_message"));
-  sub_message->GetReflection()->SetInt32(sub_message, nested_b_, 118);
-  sub_message =
-      reflection->MutableMessage(message, F("optional_foreign_message"));
-  sub_message->GetReflection()->SetInt32(sub_message, foreign_c_, 119);
-  sub_message =
-      reflection->MutableMessage(message, F("optional_import_message"));
-  sub_message->GetReflection()->SetInt32(sub_message, import_d_, 120);
-
-  reflection->SetEnum(message, F("optional_nested_enum"), nested_baz_);
-  reflection->SetEnum(message, F("optional_foreign_enum"), foreign_baz_);
-  reflection->SetEnum(message, F("optional_import_enum"), import_baz_);
-
-  reflection->SetString(message, F("optional_string_piece"), "124");
-  reflection->SetString(message, F("optional_cord"), "125");
-
-  sub_message =
-      reflection->MutableMessage(message, F("optional_public_import_message"));
-  sub_message->GetReflection()->SetInt32(sub_message, import_e_, 126);
-
-  sub_message = reflection->MutableMessage(message, F("optional_lazy_message"));
-  sub_message->GetReflection()->SetInt32(sub_message, nested_b_, 127);
-
-  sub_message = reflection->MutableMessage(
-      message, F("optional_unverified_lazy_message"));
-  sub_message->GetReflection()->SetInt32(sub_message, nested_b_, 128);
-
-  // -----------------------------------------------------------------
-
-  reflection->AddInt32(message, F("repeated_int32"), 201);
-  reflection->AddInt64(message, F("repeated_int64"), 202);
-  reflection->AddUInt32(message, F("repeated_uint32"), 203);
-  reflection->AddUInt64(message, F("repeated_uint64"), 204);
-  reflection->AddInt32(message, F("repeated_sint32"), 205);
-  reflection->AddInt64(message, F("repeated_sint64"), 206);
-  reflection->AddUInt32(message, F("repeated_fixed32"), 207);
-  reflection->AddUInt64(message, F("repeated_fixed64"), 208);
-  reflection->AddInt32(message, F("repeated_sfixed32"), 209);
-  reflection->AddInt64(message, F("repeated_sfixed64"), 210);
-  reflection->AddFloat(message, F("repeated_float"), 211);
-  reflection->AddDouble(message, F("repeated_double"), 212);
-  reflection->AddBool(message, F("repeated_bool"), true);
-  reflection->AddString(message, F("repeated_string"), "215");
-  reflection->AddString(message, F("repeated_bytes"), "216");
-
-  sub_message = reflection->AddMessage(message, F("repeatedgroup"));
-  sub_message->GetReflection()->SetInt32(sub_message, repeated_group_a_, 217);
-  sub_message = reflection->AddMessage(message, F("repeated_nested_message"));
-  sub_message->GetReflection()->SetInt32(sub_message, nested_b_, 218);
-  sub_message = reflection->AddMessage(message, F("repeated_foreign_message"));
-  sub_message->GetReflection()->SetInt32(sub_message, foreign_c_, 219);
-  sub_message = reflection->AddMessage(message, F("repeated_import_message"));
-  sub_message->GetReflection()->SetInt32(sub_message, import_d_, 220);
-  sub_message = reflection->AddMessage(message, F("repeated_lazy_message"));
-  sub_message->GetReflection()->SetInt32(sub_message, nested_b_, 227);
-
-  reflection->AddEnum(message, F("repeated_nested_enum"), nested_bar_);
-  reflection->AddEnum(message, F("repeated_foreign_enum"), foreign_bar_);
-  reflection->AddEnum(message, F("repeated_import_enum"), import_bar_);
-
-  reflection->AddString(message, F("repeated_string_piece"), "224");
-  reflection->AddString(message, F("repeated_cord"), "225");
-
-  // Add a second one of each field.
-  reflection->AddInt32(message, F("repeated_int32"), 301);
-  reflection->AddInt64(message, F("repeated_int64"), 302);
-  reflection->AddUInt32(message, F("repeated_uint32"), 303);
-  reflection->AddUInt64(message, F("repeated_uint64"), 304);
-  reflection->AddInt32(message, F("repeated_sint32"), 305);
-  reflection->AddInt64(message, F("repeated_sint64"), 306);
-  reflection->AddUInt32(message, F("repeated_fixed32"), 307);
-  reflection->AddUInt64(message, F("repeated_fixed64"), 308);
-  reflection->AddInt32(message, F("repeated_sfixed32"), 309);
-  reflection->AddInt64(message, F("repeated_sfixed64"), 310);
-  reflection->AddFloat(message, F("repeated_float"), 311);
-  reflection->AddDouble(message, F("repeated_double"), 312);
-  reflection->AddBool(message, F("repeated_bool"), false);
-  reflection->AddString(message, F("repeated_string"), "315");
-  reflection->AddString(message, F("repeated_bytes"), "316");
-
-  sub_message = reflection->AddMessage(message, F("repeatedgroup"));
-  sub_message->GetReflection()->SetInt32(sub_message, repeated_group_a_, 317);
-  sub_message = reflection->AddMessage(message, F("repeated_nested_message"));
-  sub_message->GetReflection()->SetInt32(sub_message, nested_b_, 318);
-  sub_message = reflection->AddMessage(message, F("repeated_foreign_message"));
-  sub_message->GetReflection()->SetInt32(sub_message, foreign_c_, 319);
-  sub_message = reflection->AddMessage(message, F("repeated_import_message"));
-  sub_message->GetReflection()->SetInt32(sub_message, import_d_, 320);
-  sub_message = reflection->AddMessage(message, F("repeated_lazy_message"));
-  sub_message->GetReflection()->SetInt32(sub_message, nested_b_, 327);
-
-  reflection->AddEnum(message, F("repeated_nested_enum"), nested_baz_);
-  reflection->AddEnum(message, F("repeated_foreign_enum"), foreign_baz_);
-  reflection->AddEnum(message, F("repeated_import_enum"), import_baz_);
-
-  reflection->AddString(message, F("repeated_string_piece"), "324");
-  reflection->AddString(message, F("repeated_cord"), "325");
-
-  // -----------------------------------------------------------------
-
-  reflection->SetInt32(message, F("default_int32"), 401);
-  reflection->SetInt64(message, F("default_int64"), 402);
-  reflection->SetUInt32(message, F("default_uint32"), 403);
-  reflection->SetUInt64(message, F("default_uint64"), 404);
-  reflection->SetInt32(message, F("default_sint32"), 405);
-  reflection->SetInt64(message, F("default_sint64"), 406);
-  reflection->SetUInt32(message, F("default_fixed32"), 407);
-  reflection->SetUInt64(message, F("default_fixed64"), 408);
-  reflection->SetInt32(message, F("default_sfixed32"), 409);
-  reflection->SetInt64(message, F("default_sfixed64"), 410);
-  reflection->SetFloat(message, F("default_float"), 411);
-  reflection->SetDouble(message, F("default_double"), 412);
-  reflection->SetBool(message, F("default_bool"), false);
-  reflection->SetString(message, F("default_string"), "415");
-  reflection->SetString(message, F("default_bytes"), "416");
-
-  reflection->SetEnum(message, F("default_nested_enum"), nested_foo_);
-  reflection->SetEnum(message, F("default_foreign_enum"), foreign_foo_);
-  reflection->SetEnum(message, F("default_import_enum"), import_foo_);
-
-  reflection->SetString(message, F("default_string_piece"), "424");
-  reflection->SetString(message, F("default_cord"), "425");
-
-  reflection->SetUInt32(message, F("oneof_uint32"), 601);
-  sub_message = reflection->MutableMessage(message, F("oneof_nested_message"));
-  sub_message->GetReflection()->SetInt32(sub_message, nested_b_, 602);
-  reflection->SetString(message, F("oneof_string"), "603");
-  reflection->SetString(message, F("oneof_bytes"), "604");
-}
-
-inline void TestUtil::ReflectionTester::SetOneofViaReflection(
-    Message* message) {
-  const Descriptor* descriptor = message->GetDescriptor();
-  const Reflection* reflection = message->GetReflection();
-  Message* sub_message = reflection->MutableMessage(
-      message, descriptor->FindFieldByName("foo_lazy_message"));
-  sub_message->GetReflection()->SetInt64(
-      sub_message, sub_message->GetDescriptor()->FindFieldByName("moo_int"),
-      100);
-
-  reflection->SetString(message, descriptor->FindFieldByName("bar_cord"),
-                        "101");
-  reflection->SetInt32(message, descriptor->FindFieldByName("baz_int"), 102);
-  reflection->SetString(message, descriptor->FindFieldByName("baz_string"),
-                        "103");
-}
-
-inline void TestUtil::ReflectionTester::ExpectOneofSetViaReflection(
-    const Message& message) {
-  const Descriptor* descriptor = message.GetDescriptor();
-  const Reflection* reflection = message.GetReflection();
-  std::string scratch;
-  EXPECT_TRUE(reflection->HasField(
-      message, descriptor->FindFieldByName("foo_lazy_message")));
-  EXPECT_TRUE(
-      reflection->HasField(message, descriptor->FindFieldByName("bar_cord")));
-  EXPECT_TRUE(
-      reflection->HasField(message, descriptor->FindFieldByName("baz_int")));
-  EXPECT_TRUE(
-      reflection->HasField(message, descriptor->FindFieldByName("baz_string")));
-
-  const Message* sub_message = &reflection->GetMessage(
-      message, descriptor->FindFieldByName("foo_lazy_message"));
-  EXPECT_EQ(100, sub_message->GetReflection()->GetInt64(
-                     *sub_message,
-                     sub_message->GetDescriptor()->FindFieldByName("moo_int")));
-
-  EXPECT_EQ("101", reflection->GetString(
-                       message, descriptor->FindFieldByName("bar_cord")));
-  EXPECT_EQ("101",
-            reflection->GetStringReference(
-                message, descriptor->FindFieldByName("bar_cord"), &scratch));
-
-  EXPECT_EQ(102, reflection->GetInt32(message,
-                                      descriptor->FindFieldByName("baz_int")));
-
-  EXPECT_EQ("103", reflection->GetString(
-                       message, descriptor->FindFieldByName("baz_string")));
-  EXPECT_EQ("103",
-            reflection->GetStringReference(
-                message, descriptor->FindFieldByName("baz_string"), &scratch));
-}
-
-inline void TestUtil::ReflectionTester::SetPackedFieldsViaReflection(
-    Message* message) {
-  const Reflection* reflection = message->GetReflection();
-  reflection->AddInt32(message, F("packed_int32"), 601);
-  reflection->AddInt64(message, F("packed_int64"), 602);
-  reflection->AddUInt32(message, F("packed_uint32"), 603);
-  reflection->AddUInt64(message, F("packed_uint64"), 604);
-  reflection->AddInt32(message, F("packed_sint32"), 605);
-  reflection->AddInt64(message, F("packed_sint64"), 606);
-  reflection->AddUInt32(message, F("packed_fixed32"), 607);
-  reflection->AddUInt64(message, F("packed_fixed64"), 608);
-  reflection->AddInt32(message, F("packed_sfixed32"), 609);
-  reflection->AddInt64(message, F("packed_sfixed64"), 610);
-  reflection->AddFloat(message, F("packed_float"), 611);
-  reflection->AddDouble(message, F("packed_double"), 612);
-  reflection->AddBool(message, F("packed_bool"), true);
-  reflection->AddEnum(message, F("packed_enum"), foreign_bar_);
-
-  reflection->AddInt32(message, F("packed_int32"), 701);
-  reflection->AddInt64(message, F("packed_int64"), 702);
-  reflection->AddUInt32(message, F("packed_uint32"), 703);
-  reflection->AddUInt64(message, F("packed_uint64"), 704);
-  reflection->AddInt32(message, F("packed_sint32"), 705);
-  reflection->AddInt64(message, F("packed_sint64"), 706);
-  reflection->AddUInt32(message, F("packed_fixed32"), 707);
-  reflection->AddUInt64(message, F("packed_fixed64"), 708);
-  reflection->AddInt32(message, F("packed_sfixed32"), 709);
-  reflection->AddInt64(message, F("packed_sfixed64"), 710);
-  reflection->AddFloat(message, F("packed_float"), 711);
-  reflection->AddDouble(message, F("packed_double"), 712);
-  reflection->AddBool(message, F("packed_bool"), false);
-  reflection->AddEnum(message, F("packed_enum"), foreign_baz_);
-}
-
-// -------------------------------------------------------------------
-
-inline void TestUtil::ReflectionTester::ExpectAllFieldsSetViaReflection(
-    const Message& message) {
-  // We have to split this into three function otherwise it creates a stack
-  // frame so large that it triggers a warning.
-  ExpectAllFieldsSetViaReflection1(message);
-  ExpectAllFieldsSetViaReflection2(message);
-  ExpectAllFieldsSetViaReflection3(message);
-}
-
-inline void TestUtil::ReflectionTester::ExpectAllFieldsSetViaReflection1(
-    const Message& message) {
-  const Reflection* reflection = message.GetReflection();
-  std::string scratch;
-  const Message* sub_message;
-
-  EXPECT_TRUE(reflection->HasField(message, F("optional_int32")));
-  EXPECT_TRUE(reflection->HasField(message, F("optional_int64")));
-  EXPECT_TRUE(reflection->HasField(message, F("optional_uint32")));
-  EXPECT_TRUE(reflection->HasField(message, F("optional_uint64")));
-  EXPECT_TRUE(reflection->HasField(message, F("optional_sint32")));
-  EXPECT_TRUE(reflection->HasField(message, F("optional_sint64")));
-  EXPECT_TRUE(reflection->HasField(message, F("optional_fixed32")));
-  EXPECT_TRUE(reflection->HasField(message, F("optional_fixed64")));
-  EXPECT_TRUE(reflection->HasField(message, F("optional_sfixed32")));
-  EXPECT_TRUE(reflection->HasField(message, F("optional_sfixed64")));
-  EXPECT_TRUE(reflection->HasField(message, F("optional_float")));
-  EXPECT_TRUE(reflection->HasField(message, F("optional_double")));
-  EXPECT_TRUE(reflection->HasField(message, F("optional_bool")));
-  EXPECT_TRUE(reflection->HasField(message, F("optional_string")));
-  EXPECT_TRUE(reflection->HasField(message, F("optional_bytes")));
-
-  EXPECT_TRUE(reflection->HasField(message, F("optionalgroup")));
-  EXPECT_TRUE(reflection->HasField(message, F("optional_nested_message")));
-  EXPECT_TRUE(reflection->HasField(message, F("optional_foreign_message")));
-  EXPECT_TRUE(reflection->HasField(message, F("optional_import_message")));
-  EXPECT_TRUE(
-      reflection->HasField(message, F("optional_public_import_message")));
-  EXPECT_TRUE(reflection->HasField(message, F("optional_lazy_message")));
-  EXPECT_TRUE(
-      reflection->HasField(message, F("optional_unverified_lazy_message")));
-
-  sub_message = &reflection->GetMessage(message, F("optionalgroup"));
-  EXPECT_TRUE(sub_message->GetReflection()->HasField(*sub_message, group_a_));
-  sub_message = &reflection->GetMessage(message, F("optional_nested_message"));
-  EXPECT_TRUE(sub_message->GetReflection()->HasField(*sub_message, nested_b_));
-  sub_message = &reflection->GetMessage(message, F("optional_foreign_message"));
-  EXPECT_TRUE(sub_message->GetReflection()->HasField(*sub_message, foreign_c_));
-  sub_message = &reflection->GetMessage(message, F("optional_import_message"));
-  EXPECT_TRUE(sub_message->GetReflection()->HasField(*sub_message, import_d_));
-  sub_message =
-      &reflection->GetMessage(message, F("optional_public_import_message"));
-  EXPECT_TRUE(sub_message->GetReflection()->HasField(*sub_message, import_e_));
-  sub_message = &reflection->GetMessage(message, F("optional_lazy_message"));
-  EXPECT_TRUE(sub_message->GetReflection()->HasField(*sub_message, nested_b_));
-  sub_message =
-      &reflection->GetMessage(message, F("optional_unverified_lazy_message"));
-  EXPECT_TRUE(sub_message->GetReflection()->HasField(*sub_message, nested_b_));
-
-  EXPECT_TRUE(reflection->HasField(message, F("optional_nested_enum")));
-  EXPECT_TRUE(reflection->HasField(message, F("optional_foreign_enum")));
-  EXPECT_TRUE(reflection->HasField(message, F("optional_import_enum")));
-
-  EXPECT_TRUE(reflection->HasField(message, F("optional_string_piece")));
-  EXPECT_TRUE(reflection->HasField(message, F("optional_cord")));
-
-  EXPECT_EQ(101, reflection->GetInt32(message, F("optional_int32")));
-  EXPECT_EQ(102, reflection->GetInt64(message, F("optional_int64")));
-  EXPECT_EQ(103, reflection->GetUInt32(message, F("optional_uint32")));
-  EXPECT_EQ(104, reflection->GetUInt64(message, F("optional_uint64")));
-  EXPECT_EQ(105, reflection->GetInt32(message, F("optional_sint32")));
-  EXPECT_EQ(106, reflection->GetInt64(message, F("optional_sint64")));
-  EXPECT_EQ(107, reflection->GetUInt32(message, F("optional_fixed32")));
-  EXPECT_EQ(108, reflection->GetUInt64(message, F("optional_fixed64")));
-  EXPECT_EQ(109, reflection->GetInt32(message, F("optional_sfixed32")));
-  EXPECT_EQ(110, reflection->GetInt64(message, F("optional_sfixed64")));
-  EXPECT_EQ(111, reflection->GetFloat(message, F("optional_float")));
-  EXPECT_EQ(112, reflection->GetDouble(message, F("optional_double")));
-  EXPECT_TRUE(reflection->GetBool(message, F("optional_bool")));
-  EXPECT_EQ("115", reflection->GetString(message, F("optional_string")));
-  EXPECT_EQ("116", reflection->GetString(message, F("optional_bytes")));
-
-  EXPECT_EQ("115", reflection->GetStringReference(message, F("optional_string"),
-                                                  &scratch));
-  EXPECT_EQ("116", reflection->GetStringReference(message, F("optional_bytes"),
-                                                  &scratch));
-
-  sub_message = &reflection->GetMessage(message, F("optionalgroup"));
-  EXPECT_EQ(117,
-            sub_message->GetReflection()->GetInt32(*sub_message, group_a_));
-  sub_message = &reflection->GetMessage(message, F("optional_nested_message"));
-  EXPECT_EQ(118,
-            sub_message->GetReflection()->GetInt32(*sub_message, nested_b_));
-  sub_message = &reflection->GetMessage(message, F("optional_foreign_message"));
-  EXPECT_EQ(119,
-            sub_message->GetReflection()->GetInt32(*sub_message, foreign_c_));
-  sub_message = &reflection->GetMessage(message, F("optional_import_message"));
-  EXPECT_EQ(120,
-            sub_message->GetReflection()->GetInt32(*sub_message, import_d_));
-  sub_message =
-      &reflection->GetMessage(message, F("optional_public_import_message"));
-  EXPECT_EQ(126,
-            sub_message->GetReflection()->GetInt32(*sub_message, import_e_));
-  sub_message = &reflection->GetMessage(message, F("optional_lazy_message"));
-  EXPECT_EQ(127,
-            sub_message->GetReflection()->GetInt32(*sub_message, nested_b_));
-  sub_message =
-      &reflection->GetMessage(message, F("optional_unverified_lazy_message"));
-  EXPECT_EQ(128,
-            sub_message->GetReflection()->GetInt32(*sub_message, nested_b_));
-
-  EXPECT_EQ(nested_baz_,
-            reflection->GetEnum(message, F("optional_nested_enum")));
-  EXPECT_EQ(foreign_baz_,
-            reflection->GetEnum(message, F("optional_foreign_enum")));
-  EXPECT_EQ(import_baz_,
-            reflection->GetEnum(message, F("optional_import_enum")));
-
-  EXPECT_EQ("124", reflection->GetString(message, F("optional_string_piece")));
-  EXPECT_EQ("124", reflection->GetStringReference(
-                       message, F("optional_string_piece"), &scratch));
-
-  EXPECT_EQ("125", reflection->GetString(message, F("optional_cord")));
-  EXPECT_EQ("125", reflection->GetStringReference(message, F("optional_cord"),
-                                                  &scratch));
-
-  EXPECT_TRUE(reflection->HasField(message, F("oneof_bytes")));
-  EXPECT_EQ("604", reflection->GetString(message, F("oneof_bytes")));
-
-  if (base_descriptor_->name() == "TestAllTypes") {
-    EXPECT_FALSE(reflection->HasField(message, F("oneof_uint32")));
-    EXPECT_FALSE(reflection->HasField(message, F("oneof_string")));
-  } else {
-    EXPECT_TRUE(reflection->HasField(message, F("oneof_uint32")));
-    EXPECT_TRUE(reflection->HasField(message, F("oneof_string")));
-    EXPECT_EQ(601, reflection->GetUInt32(message, F("oneof_uint32")));
-    EXPECT_EQ("603", reflection->GetString(message, F("oneof_string")));
-    sub_message = &reflection->GetMessage(message, F("oneof_nested_message"));
-    EXPECT_EQ(602,
-              sub_message->GetReflection()->GetInt32(*sub_message, nested_b_));
-  }
-}
-
-inline void TestUtil::ReflectionTester::ExpectAllFieldsSetViaReflection2(
-    const Message& message) {
-  const Reflection* reflection = message.GetReflection();
-  std::string scratch;
-  const Message* sub_message;
-
-  // -----------------------------------------------------------------
-
-  ASSERT_EQ(2, reflection->FieldSize(message, F("repeated_int32")));
-  ASSERT_EQ(2, reflection->FieldSize(message, F("repeated_int64")));
-  ASSERT_EQ(2, reflection->FieldSize(message, F("repeated_uint32")));
-  ASSERT_EQ(2, reflection->FieldSize(message, F("repeated_uint64")));
-  ASSERT_EQ(2, reflection->FieldSize(message, F("repeated_sint32")));
-  ASSERT_EQ(2, reflection->FieldSize(message, F("repeated_sint64")));
-  ASSERT_EQ(2, reflection->FieldSize(message, F("repeated_fixed32")));
-  ASSERT_EQ(2, reflection->FieldSize(message, F("repeated_fixed64")));
-  ASSERT_EQ(2, reflection->FieldSize(message, F("repeated_sfixed32")));
-  ASSERT_EQ(2, reflection->FieldSize(message, F("repeated_sfixed64")));
-  ASSERT_EQ(2, reflection->FieldSize(message, F("repeated_float")));
-  ASSERT_EQ(2, reflection->FieldSize(message, F("repeated_double")));
-  ASSERT_EQ(2, reflection->FieldSize(message, F("repeated_bool")));
-  ASSERT_EQ(2, reflection->FieldSize(message, F("repeated_string")));
-  ASSERT_EQ(2, reflection->FieldSize(message, F("repeated_bytes")));
-
-  ASSERT_EQ(2, reflection->FieldSize(message, F("repeatedgroup")));
-  ASSERT_EQ(2, reflection->FieldSize(message, F("repeated_nested_message")));
-  ASSERT_EQ(2, reflection->FieldSize(message, F("repeated_foreign_message")));
-  ASSERT_EQ(2, reflection->FieldSize(message, F("repeated_import_message")));
-  ASSERT_EQ(2, reflection->FieldSize(message, F("repeated_lazy_message")));
-  ASSERT_EQ(2, reflection->FieldSize(message, F("repeated_nested_enum")));
-  ASSERT_EQ(2, reflection->FieldSize(message, F("repeated_foreign_enum")));
-  ASSERT_EQ(2, reflection->FieldSize(message, F("repeated_import_enum")));
-
-  ASSERT_EQ(2, reflection->FieldSize(message, F("repeated_string_piece")));
-  ASSERT_EQ(2, reflection->FieldSize(message, F("repeated_cord")));
-
-  EXPECT_EQ(201, reflection->GetRepeatedInt32(message, F("repeated_int32"), 0));
-  EXPECT_EQ(202, reflection->GetRepeatedInt64(message, F("repeated_int64"), 0));
-  EXPECT_EQ(203,
-            reflection->GetRepeatedUInt32(message, F("repeated_uint32"), 0));
-  EXPECT_EQ(204,
-            reflection->GetRepeatedUInt64(message, F("repeated_uint64"), 0));
-  EXPECT_EQ(205,
-            reflection->GetRepeatedInt32(message, F("repeated_sint32"), 0));
-  EXPECT_EQ(206,
-            reflection->GetRepeatedInt64(message, F("repeated_sint64"), 0));
-  EXPECT_EQ(207,
-            reflection->GetRepeatedUInt32(message, F("repeated_fixed32"), 0));
-  EXPECT_EQ(208,
-            reflection->GetRepeatedUInt64(message, F("repeated_fixed64"), 0));
-  EXPECT_EQ(209,
-            reflection->GetRepeatedInt32(message, F("repeated_sfixed32"), 0));
-  EXPECT_EQ(210,
-            reflection->GetRepeatedInt64(message, F("repeated_sfixed64"), 0));
-  EXPECT_EQ(211, reflection->GetRepeatedFloat(message, F("repeated_float"), 0));
-  EXPECT_EQ(212,
-            reflection->GetRepeatedDouble(message, F("repeated_double"), 0));
-  EXPECT_TRUE(reflection->GetRepeatedBool(message, F("repeated_bool"), 0));
-  EXPECT_EQ("215",
-            reflection->GetRepeatedString(message, F("repeated_string"), 0));
-  EXPECT_EQ("216",
-            reflection->GetRepeatedString(message, F("repeated_bytes"), 0));
-
-  EXPECT_EQ("215", reflection->GetRepeatedStringReference(
-                       message, F("repeated_string"), 0, &scratch));
-  EXPECT_EQ("216", reflection->GetRepeatedStringReference(
-                       message, F("repeated_bytes"), 0, &scratch));
-
-  sub_message = &reflection->GetRepeatedMessage(message, F("repeatedgroup"), 0);
-  EXPECT_EQ(217, sub_message->GetReflection()->GetInt32(*sub_message,
-                                                        repeated_group_a_));
-  sub_message =
-      &reflection->GetRepeatedMessage(message, F("repeated_nested_message"), 0);
-  EXPECT_EQ(218,
-            sub_message->GetReflection()->GetInt32(*sub_message, nested_b_));
-  sub_message = &reflection->GetRepeatedMessage(
-      message, F("repeated_foreign_message"), 0);
-  EXPECT_EQ(219,
-            sub_message->GetReflection()->GetInt32(*sub_message, foreign_c_));
-  sub_message =
-      &reflection->GetRepeatedMessage(message, F("repeated_import_message"), 0);
-  EXPECT_EQ(220,
-            sub_message->GetReflection()->GetInt32(*sub_message, import_d_));
-  sub_message =
-      &reflection->GetRepeatedMessage(message, F("repeated_lazy_message"), 0);
-  EXPECT_EQ(227,
-            sub_message->GetReflection()->GetInt32(*sub_message, nested_b_));
-
-  EXPECT_EQ(nested_bar_,
-            reflection->GetRepeatedEnum(message, F("repeated_nested_enum"), 0));
-  EXPECT_EQ(foreign_bar_, reflection->GetRepeatedEnum(
-                              message, F("repeated_foreign_enum"), 0));
-  EXPECT_EQ(import_bar_,
-            reflection->GetRepeatedEnum(message, F("repeated_import_enum"), 0));
-
-  EXPECT_EQ("224", reflection->GetRepeatedString(
-                       message, F("repeated_string_piece"), 0));
-  EXPECT_EQ("224", reflection->GetRepeatedStringReference(
-                       message, F("repeated_string_piece"), 0, &scratch));
-
-  EXPECT_EQ("225",
-            reflection->GetRepeatedString(message, F("repeated_cord"), 0));
-  EXPECT_EQ("225", reflection->GetRepeatedStringReference(
-                       message, F("repeated_cord"), 0, &scratch));
-
-  EXPECT_EQ(301, reflection->GetRepeatedInt32(message, F("repeated_int32"), 1));
-  EXPECT_EQ(302, reflection->GetRepeatedInt64(message, F("repeated_int64"), 1));
-  EXPECT_EQ(303,
-            reflection->GetRepeatedUInt32(message, F("repeated_uint32"), 1));
-  EXPECT_EQ(304,
-            reflection->GetRepeatedUInt64(message, F("repeated_uint64"), 1));
-  EXPECT_EQ(305,
-            reflection->GetRepeatedInt32(message, F("repeated_sint32"), 1));
-  EXPECT_EQ(306,
-            reflection->GetRepeatedInt64(message, F("repeated_sint64"), 1));
-  EXPECT_EQ(307,
-            reflection->GetRepeatedUInt32(message, F("repeated_fixed32"), 1));
-  EXPECT_EQ(308,
-            reflection->GetRepeatedUInt64(message, F("repeated_fixed64"), 1));
-  EXPECT_EQ(309,
-            reflection->GetRepeatedInt32(message, F("repeated_sfixed32"), 1));
-  EXPECT_EQ(310,
-            reflection->GetRepeatedInt64(message, F("repeated_sfixed64"), 1));
-  EXPECT_EQ(311, reflection->GetRepeatedFloat(message, F("repeated_float"), 1));
-  EXPECT_EQ(312,
-            reflection->GetRepeatedDouble(message, F("repeated_double"), 1));
-  EXPECT_FALSE(reflection->GetRepeatedBool(message, F("repeated_bool"), 1));
-  EXPECT_EQ("315",
-            reflection->GetRepeatedString(message, F("repeated_string"), 1));
-  EXPECT_EQ("316",
-            reflection->GetRepeatedString(message, F("repeated_bytes"), 1));
-
-  EXPECT_EQ("315", reflection->GetRepeatedStringReference(
-                       message, F("repeated_string"), 1, &scratch));
-  EXPECT_EQ("316", reflection->GetRepeatedStringReference(
-                       message, F("repeated_bytes"), 1, &scratch));
-
-  sub_message = &reflection->GetRepeatedMessage(message, F("repeatedgroup"), 1);
-  EXPECT_EQ(317, sub_message->GetReflection()->GetInt32(*sub_message,
-                                                        repeated_group_a_));
-  sub_message =
-      &reflection->GetRepeatedMessage(message, F("repeated_nested_message"), 1);
-  EXPECT_EQ(318,
-            sub_message->GetReflection()->GetInt32(*sub_message, nested_b_));
-  sub_message = &reflection->GetRepeatedMessage(
-      message, F("repeated_foreign_message"), 1);
-  EXPECT_EQ(319,
-            sub_message->GetReflection()->GetInt32(*sub_message, foreign_c_));
-  sub_message =
-      &reflection->GetRepeatedMessage(message, F("repeated_import_message"), 1);
-  EXPECT_EQ(320,
-            sub_message->GetReflection()->GetInt32(*sub_message, import_d_));
-  sub_message =
-      &reflection->GetRepeatedMessage(message, F("repeated_lazy_message"), 1);
-  EXPECT_EQ(327,
-            sub_message->GetReflection()->GetInt32(*sub_message, nested_b_));
-
-  EXPECT_EQ(nested_baz_,
-            reflection->GetRepeatedEnum(message, F("repeated_nested_enum"), 1));
-  EXPECT_EQ(foreign_baz_, reflection->GetRepeatedEnum(
-                              message, F("repeated_foreign_enum"), 1));
-  EXPECT_EQ(import_baz_,
-            reflection->GetRepeatedEnum(message, F("repeated_import_enum"), 1));
-
-  EXPECT_EQ("324", reflection->GetRepeatedString(
-                       message, F("repeated_string_piece"), 1));
-  EXPECT_EQ("324", reflection->GetRepeatedStringReference(
-                       message, F("repeated_string_piece"), 1, &scratch));
-
-  EXPECT_EQ("325",
-            reflection->GetRepeatedString(message, F("repeated_cord"), 1));
-  EXPECT_EQ("325", reflection->GetRepeatedStringReference(
-                       message, F("repeated_cord"), 1, &scratch));
-}
-
-inline void TestUtil::ReflectionTester::ExpectAllFieldsSetViaReflection3(
-    const Message& message) {
-  const Reflection* reflection = message.GetReflection();
-  std::string scratch;
-
-  // -----------------------------------------------------------------
-
-  EXPECT_TRUE(reflection->HasField(message, F("default_int32")));
-  EXPECT_TRUE(reflection->HasField(message, F("default_int64")));
-  EXPECT_TRUE(reflection->HasField(message, F("default_uint32")));
-  EXPECT_TRUE(reflection->HasField(message, F("default_uint64")));
-  EXPECT_TRUE(reflection->HasField(message, F("default_sint32")));
-  EXPECT_TRUE(reflection->HasField(message, F("default_sint64")));
-  EXPECT_TRUE(reflection->HasField(message, F("default_fixed32")));
-  EXPECT_TRUE(reflection->HasField(message, F("default_fixed64")));
-  EXPECT_TRUE(reflection->HasField(message, F("default_sfixed32")));
-  EXPECT_TRUE(reflection->HasField(message, F("default_sfixed64")));
-  EXPECT_TRUE(reflection->HasField(message, F("default_float")));
-  EXPECT_TRUE(reflection->HasField(message, F("default_double")));
-  EXPECT_TRUE(reflection->HasField(message, F("default_bool")));
-  EXPECT_TRUE(reflection->HasField(message, F("default_string")));
-  EXPECT_TRUE(reflection->HasField(message, F("default_bytes")));
-
-  EXPECT_TRUE(reflection->HasField(message, F("default_nested_enum")));
-  EXPECT_TRUE(reflection->HasField(message, F("default_foreign_enum")));
-  EXPECT_TRUE(reflection->HasField(message, F("default_import_enum")));
-
-  EXPECT_TRUE(reflection->HasField(message, F("default_string_piece")));
-  EXPECT_TRUE(reflection->HasField(message, F("default_cord")));
-
-  EXPECT_EQ(401, reflection->GetInt32(message, F("default_int32")));
-  EXPECT_EQ(402, reflection->GetInt64(message, F("default_int64")));
-  EXPECT_EQ(403, reflection->GetUInt32(message, F("default_uint32")));
-  EXPECT_EQ(404, reflection->GetUInt64(message, F("default_uint64")));
-  EXPECT_EQ(405, reflection->GetInt32(message, F("default_sint32")));
-  EXPECT_EQ(406, reflection->GetInt64(message, F("default_sint64")));
-  EXPECT_EQ(407, reflection->GetUInt32(message, F("default_fixed32")));
-  EXPECT_EQ(408, reflection->GetUInt64(message, F("default_fixed64")));
-  EXPECT_EQ(409, reflection->GetInt32(message, F("default_sfixed32")));
-  EXPECT_EQ(410, reflection->GetInt64(message, F("default_sfixed64")));
-  EXPECT_EQ(411, reflection->GetFloat(message, F("default_float")));
-  EXPECT_EQ(412, reflection->GetDouble(message, F("default_double")));
-  EXPECT_FALSE(reflection->GetBool(message, F("default_bool")));
-  EXPECT_EQ("415", reflection->GetString(message, F("default_string")));
-  EXPECT_EQ("416", reflection->GetString(message, F("default_bytes")));
-
-  EXPECT_EQ("415", reflection->GetStringReference(message, F("default_string"),
-                                                  &scratch));
-  EXPECT_EQ("416", reflection->GetStringReference(message, F("default_bytes"),
-                                                  &scratch));
-
-  EXPECT_EQ(nested_foo_,
-            reflection->GetEnum(message, F("default_nested_enum")));
-  EXPECT_EQ(foreign_foo_,
-            reflection->GetEnum(message, F("default_foreign_enum")));
-  EXPECT_EQ(import_foo_,
-            reflection->GetEnum(message, F("default_import_enum")));
-
-  EXPECT_EQ("424", reflection->GetString(message, F("default_string_piece")));
-  EXPECT_EQ("424", reflection->GetStringReference(
-                       message, F("default_string_piece"), &scratch));
-
-  EXPECT_EQ("425", reflection->GetString(message, F("default_cord")));
-  EXPECT_EQ("425", reflection->GetStringReference(message, F("default_cord"),
-                                                  &scratch));
-}
-
-inline void TestUtil::ReflectionTester::ExpectPackedFieldsSetViaReflection(
-    const Message& message) {
-  const Reflection* reflection = message.GetReflection();
-
-  ASSERT_EQ(2, reflection->FieldSize(message, F("packed_int32")));
-  ASSERT_EQ(2, reflection->FieldSize(message, F("packed_int64")));
-  ASSERT_EQ(2, reflection->FieldSize(message, F("packed_uint32")));
-  ASSERT_EQ(2, reflection->FieldSize(message, F("packed_uint64")));
-  ASSERT_EQ(2, reflection->FieldSize(message, F("packed_sint32")));
-  ASSERT_EQ(2, reflection->FieldSize(message, F("packed_sint64")));
-  ASSERT_EQ(2, reflection->FieldSize(message, F("packed_fixed32")));
-  ASSERT_EQ(2, reflection->FieldSize(message, F("packed_fixed64")));
-  ASSERT_EQ(2, reflection->FieldSize(message, F("packed_sfixed32")));
-  ASSERT_EQ(2, reflection->FieldSize(message, F("packed_sfixed64")));
-  ASSERT_EQ(2, reflection->FieldSize(message, F("packed_float")));
-  ASSERT_EQ(2, reflection->FieldSize(message, F("packed_double")));
-  ASSERT_EQ(2, reflection->FieldSize(message, F("packed_bool")));
-  ASSERT_EQ(2, reflection->FieldSize(message, F("packed_enum")));
-
-  EXPECT_EQ(601, reflection->GetRepeatedInt32(message, F("packed_int32"), 0));
-  EXPECT_EQ(602, reflection->GetRepeatedInt64(message, F("packed_int64"), 0));
-  EXPECT_EQ(603, reflection->GetRepeatedUInt32(message, F("packed_uint32"), 0));
-  EXPECT_EQ(604, reflection->GetRepeatedUInt64(message, F("packed_uint64"), 0));
-  EXPECT_EQ(605, reflection->GetRepeatedInt32(message, F("packed_sint32"), 0));
-  EXPECT_EQ(606, reflection->GetRepeatedInt64(message, F("packed_sint64"), 0));
-  EXPECT_EQ(607,
-            reflection->GetRepeatedUInt32(message, F("packed_fixed32"), 0));
-  EXPECT_EQ(608,
-            reflection->GetRepeatedUInt64(message, F("packed_fixed64"), 0));
-  EXPECT_EQ(609,
-            reflection->GetRepeatedInt32(message, F("packed_sfixed32"), 0));
-  EXPECT_EQ(610,
-            reflection->GetRepeatedInt64(message, F("packed_sfixed64"), 0));
-  EXPECT_EQ(611, reflection->GetRepeatedFloat(message, F("packed_float"), 0));
-  EXPECT_EQ(612, reflection->GetRepeatedDouble(message, F("packed_double"), 0));
-  EXPECT_TRUE(reflection->GetRepeatedBool(message, F("packed_bool"), 0));
-  EXPECT_EQ(foreign_bar_,
-            reflection->GetRepeatedEnum(message, F("packed_enum"), 0));
-
-  EXPECT_EQ(701, reflection->GetRepeatedInt32(message, F("packed_int32"), 1));
-  EXPECT_EQ(702, reflection->GetRepeatedInt64(message, F("packed_int64"), 1));
-  EXPECT_EQ(703, reflection->GetRepeatedUInt32(message, F("packed_uint32"), 1));
-  EXPECT_EQ(704, reflection->GetRepeatedUInt64(message, F("packed_uint64"), 1));
-  EXPECT_EQ(705, reflection->GetRepeatedInt32(message, F("packed_sint32"), 1));
-  EXPECT_EQ(706, reflection->GetRepeatedInt64(message, F("packed_sint64"), 1));
-  EXPECT_EQ(707,
-            reflection->GetRepeatedUInt32(message, F("packed_fixed32"), 1));
-  EXPECT_EQ(708,
-            reflection->GetRepeatedUInt64(message, F("packed_fixed64"), 1));
-  EXPECT_EQ(709,
-            reflection->GetRepeatedInt32(message, F("packed_sfixed32"), 1));
-  EXPECT_EQ(710,
-            reflection->GetRepeatedInt64(message, F("packed_sfixed64"), 1));
-  EXPECT_EQ(711, reflection->GetRepeatedFloat(message, F("packed_float"), 1));
-  EXPECT_EQ(712, reflection->GetRepeatedDouble(message, F("packed_double"), 1));
-  EXPECT_FALSE(reflection->GetRepeatedBool(message, F("packed_bool"), 1));
-  EXPECT_EQ(foreign_baz_,
-            reflection->GetRepeatedEnum(message, F("packed_enum"), 1));
-}
-
-// -------------------------------------------------------------------
-
-inline void TestUtil::ReflectionTester::ExpectClearViaReflection(
-    const Message& message) {
-  const Reflection* reflection = message.GetReflection();
-  std::string scratch;
-  const Message* sub_message;
-
-  // has_blah() should initially be false for all optional fields.
-  EXPECT_FALSE(reflection->HasField(message, F("optional_int32")));
-  EXPECT_FALSE(reflection->HasField(message, F("optional_int64")));
-  EXPECT_FALSE(reflection->HasField(message, F("optional_uint32")));
-  EXPECT_FALSE(reflection->HasField(message, F("optional_uint64")));
-  EXPECT_FALSE(reflection->HasField(message, F("optional_sint32")));
-  EXPECT_FALSE(reflection->HasField(message, F("optional_sint64")));
-  EXPECT_FALSE(reflection->HasField(message, F("optional_fixed32")));
-  EXPECT_FALSE(reflection->HasField(message, F("optional_fixed64")));
-  EXPECT_FALSE(reflection->HasField(message, F("optional_sfixed32")));
-  EXPECT_FALSE(reflection->HasField(message, F("optional_sfixed64")));
-  EXPECT_FALSE(reflection->HasField(message, F("optional_float")));
-  EXPECT_FALSE(reflection->HasField(message, F("optional_double")));
-  EXPECT_FALSE(reflection->HasField(message, F("optional_bool")));
-  EXPECT_FALSE(reflection->HasField(message, F("optional_string")));
-  EXPECT_FALSE(reflection->HasField(message, F("optional_bytes")));
-
-  EXPECT_FALSE(reflection->HasField(message, F("optionalgroup")));
-  EXPECT_FALSE(reflection->HasField(message, F("optional_nested_message")));
-  EXPECT_FALSE(reflection->HasField(message, F("optional_foreign_message")));
-  EXPECT_FALSE(reflection->HasField(message, F("optional_import_message")));
-  EXPECT_FALSE(
-      reflection->HasField(message, F("optional_public_import_message")));
-  EXPECT_FALSE(reflection->HasField(message, F("optional_lazy_message")));
-  EXPECT_FALSE(
-      reflection->HasField(message, F("optional_unverified_lazy_message")));
-
-  EXPECT_FALSE(reflection->HasField(message, F("optional_nested_enum")));
-  EXPECT_FALSE(reflection->HasField(message, F("optional_foreign_enum")));
-  EXPECT_FALSE(reflection->HasField(message, F("optional_import_enum")));
-
-  EXPECT_FALSE(reflection->HasField(message, F("optional_string_piece")));
-  EXPECT_FALSE(reflection->HasField(message, F("optional_cord")));
-
-  // Optional fields without defaults are set to zero or something like it.
-  EXPECT_EQ(0, reflection->GetInt32(message, F("optional_int32")));
-  EXPECT_EQ(0, reflection->GetInt64(message, F("optional_int64")));
-  EXPECT_EQ(0, reflection->GetUInt32(message, F("optional_uint32")));
-  EXPECT_EQ(0, reflection->GetUInt64(message, F("optional_uint64")));
-  EXPECT_EQ(0, reflection->GetInt32(message, F("optional_sint32")));
-  EXPECT_EQ(0, reflection->GetInt64(message, F("optional_sint64")));
-  EXPECT_EQ(0, reflection->GetUInt32(message, F("optional_fixed32")));
-  EXPECT_EQ(0, reflection->GetUInt64(message, F("optional_fixed64")));
-  EXPECT_EQ(0, reflection->GetInt32(message, F("optional_sfixed32")));
-  EXPECT_EQ(0, reflection->GetInt64(message, F("optional_sfixed64")));
-  EXPECT_EQ(0, reflection->GetFloat(message, F("optional_float")));
-  EXPECT_EQ(0, reflection->GetDouble(message, F("optional_double")));
-  EXPECT_FALSE(reflection->GetBool(message, F("optional_bool")));
-  EXPECT_EQ("", reflection->GetString(message, F("optional_string")));
-  EXPECT_EQ("", reflection->GetString(message, F("optional_bytes")));
-
-  EXPECT_EQ("", reflection->GetStringReference(message, F("optional_string"),
-                                               &scratch));
-  EXPECT_EQ("", reflection->GetStringReference(message, F("optional_bytes"),
-                                               &scratch));
-
-  // Embedded messages should also be clear.
-  sub_message = &reflection->GetMessage(message, F("optionalgroup"));
-  EXPECT_FALSE(sub_message->GetReflection()->HasField(*sub_message, group_a_));
-  EXPECT_EQ(0, sub_message->GetReflection()->GetInt32(*sub_message, group_a_));
-  sub_message = &reflection->GetMessage(message, F("optional_nested_message"));
-  EXPECT_FALSE(sub_message->GetReflection()->HasField(*sub_message, nested_b_));
-  EXPECT_EQ(0, sub_message->GetReflection()->GetInt32(*sub_message, nested_b_));
-  sub_message = &reflection->GetMessage(message, F("optional_foreign_message"));
-  EXPECT_FALSE(
-      sub_message->GetReflection()->HasField(*sub_message, foreign_c_));
-  EXPECT_EQ(0,
-            sub_message->GetReflection()->GetInt32(*sub_message, foreign_c_));
-  sub_message = &reflection->GetMessage(message, F("optional_import_message"));
-  EXPECT_FALSE(sub_message->GetReflection()->HasField(*sub_message, import_d_));
-  EXPECT_EQ(0, sub_message->GetReflection()->GetInt32(*sub_message, import_d_));
-  sub_message =
-      &reflection->GetMessage(message, F("optional_public_import_message"));
-  EXPECT_FALSE(sub_message->GetReflection()->HasField(*sub_message, import_e_));
-  EXPECT_EQ(0, sub_message->GetReflection()->GetInt32(*sub_message, import_e_));
-  sub_message = &reflection->GetMessage(message, F("optional_lazy_message"));
-  EXPECT_FALSE(sub_message->GetReflection()->HasField(*sub_message, nested_b_));
-  EXPECT_EQ(0, sub_message->GetReflection()->GetInt32(*sub_message, nested_b_));
-  sub_message =
-      &reflection->GetMessage(message, F("optional_unverified_lazy_message"));
-  EXPECT_FALSE(sub_message->GetReflection()->HasField(*sub_message, nested_b_));
-  EXPECT_EQ(0, sub_message->GetReflection()->GetInt32(*sub_message, nested_b_));
-
-  // Enums without defaults are set to the first value in the enum.
-  EXPECT_EQ(nested_foo_,
-            reflection->GetEnum(message, F("optional_nested_enum")));
-  EXPECT_EQ(foreign_foo_,
-            reflection->GetEnum(message, F("optional_foreign_enum")));
-  EXPECT_EQ(import_foo_,
-            reflection->GetEnum(message, F("optional_import_enum")));
-
-  EXPECT_EQ("", reflection->GetString(message, F("optional_string_piece")));
-  EXPECT_EQ("", reflection->GetStringReference(
-                    message, F("optional_string_piece"), &scratch));
-
-  EXPECT_EQ("", reflection->GetString(message, F("optional_cord")));
-  EXPECT_EQ("", reflection->GetStringReference(message, F("optional_cord"),
-                                               &scratch));
-
-  // Repeated fields are empty.
-  EXPECT_EQ(0, reflection->FieldSize(message, F("repeated_int32")));
-  EXPECT_EQ(0, reflection->FieldSize(message, F("repeated_int64")));
-  EXPECT_EQ(0, reflection->FieldSize(message, F("repeated_uint32")));
-  EXPECT_EQ(0, reflection->FieldSize(message, F("repeated_uint64")));
-  EXPECT_EQ(0, reflection->FieldSize(message, F("repeated_sint32")));
-  EXPECT_EQ(0, reflection->FieldSize(message, F("repeated_sint64")));
-  EXPECT_EQ(0, reflection->FieldSize(message, F("repeated_fixed32")));
-  EXPECT_EQ(0, reflection->FieldSize(message, F("repeated_fixed64")));
-  EXPECT_EQ(0, reflection->FieldSize(message, F("repeated_sfixed32")));
-  EXPECT_EQ(0, reflection->FieldSize(message, F("repeated_sfixed64")));
-  EXPECT_EQ(0, reflection->FieldSize(message, F("repeated_float")));
-  EXPECT_EQ(0, reflection->FieldSize(message, F("repeated_double")));
-  EXPECT_EQ(0, reflection->FieldSize(message, F("repeated_bool")));
-  EXPECT_EQ(0, reflection->FieldSize(message, F("repeated_string")));
-  EXPECT_EQ(0, reflection->FieldSize(message, F("repeated_bytes")));
-
-  EXPECT_EQ(0, reflection->FieldSize(message, F("repeatedgroup")));
-  EXPECT_EQ(0, reflection->FieldSize(message, F("repeated_nested_message")));
-  EXPECT_EQ(0, reflection->FieldSize(message, F("repeated_foreign_message")));
-  EXPECT_EQ(0, reflection->FieldSize(message, F("repeated_import_message")));
-  EXPECT_EQ(0, reflection->FieldSize(message, F("repeated_lazy_message")));
-  EXPECT_EQ(0, reflection->FieldSize(message, F("repeated_nested_enum")));
-  EXPECT_EQ(0, reflection->FieldSize(message, F("repeated_foreign_enum")));
-  EXPECT_EQ(0, reflection->FieldSize(message, F("repeated_import_enum")));
-
-  EXPECT_EQ(0, reflection->FieldSize(message, F("repeated_string_piece")));
-  EXPECT_EQ(0, reflection->FieldSize(message, F("repeated_cord")));
-
-  // has_blah() should also be false for all default fields.
-  EXPECT_FALSE(reflection->HasField(message, F("default_int32")));
-  EXPECT_FALSE(reflection->HasField(message, F("default_int64")));
-  EXPECT_FALSE(reflection->HasField(message, F("default_uint32")));
-  EXPECT_FALSE(reflection->HasField(message, F("default_uint64")));
-  EXPECT_FALSE(reflection->HasField(message, F("default_sint32")));
-  EXPECT_FALSE(reflection->HasField(message, F("default_sint64")));
-  EXPECT_FALSE(reflection->HasField(message, F("default_fixed32")));
-  EXPECT_FALSE(reflection->HasField(message, F("default_fixed64")));
-  EXPECT_FALSE(reflection->HasField(message, F("default_sfixed32")));
-  EXPECT_FALSE(reflection->HasField(message, F("default_sfixed64")));
-  EXPECT_FALSE(reflection->HasField(message, F("default_float")));
-  EXPECT_FALSE(reflection->HasField(message, F("default_double")));
-  EXPECT_FALSE(reflection->HasField(message, F("default_bool")));
-  EXPECT_FALSE(reflection->HasField(message, F("default_string")));
-  EXPECT_FALSE(reflection->HasField(message, F("default_bytes")));
-
-  EXPECT_FALSE(reflection->HasField(message, F("default_nested_enum")));
-  EXPECT_FALSE(reflection->HasField(message, F("default_foreign_enum")));
-  EXPECT_FALSE(reflection->HasField(message, F("default_import_enum")));
-
-  EXPECT_FALSE(reflection->HasField(message, F("default_string_piece")));
-  EXPECT_FALSE(reflection->HasField(message, F("default_cord")));
-
-  // Fields with defaults have their default values (duh).
-  EXPECT_EQ(41, reflection->GetInt32(message, F("default_int32")));
-  EXPECT_EQ(42, reflection->GetInt64(message, F("default_int64")));
-  EXPECT_EQ(43, reflection->GetUInt32(message, F("default_uint32")));
-  EXPECT_EQ(44, reflection->GetUInt64(message, F("default_uint64")));
-  EXPECT_EQ(-45, reflection->GetInt32(message, F("default_sint32")));
-  EXPECT_EQ(46, reflection->GetInt64(message, F("default_sint64")));
-  EXPECT_EQ(47, reflection->GetUInt32(message, F("default_fixed32")));
-  EXPECT_EQ(48, reflection->GetUInt64(message, F("default_fixed64")));
-  EXPECT_EQ(49, reflection->GetInt32(message, F("default_sfixed32")));
-  EXPECT_EQ(-50, reflection->GetInt64(message, F("default_sfixed64")));
-  EXPECT_EQ(51.5, reflection->GetFloat(message, F("default_float")));
-  EXPECT_EQ(52e3, reflection->GetDouble(message, F("default_double")));
-  EXPECT_TRUE(reflection->GetBool(message, F("default_bool")));
-  EXPECT_EQ("hello", reflection->GetString(message, F("default_string")));
-  EXPECT_EQ("world", reflection->GetString(message, F("default_bytes")));
-
-  EXPECT_EQ("hello", reflection->GetStringReference(
-                         message, F("default_string"), &scratch));
-  EXPECT_EQ("world", reflection->GetStringReference(message, F("default_bytes"),
-                                                    &scratch));
-
-  EXPECT_EQ(nested_bar_,
-            reflection->GetEnum(message, F("default_nested_enum")));
-  EXPECT_EQ(foreign_bar_,
-            reflection->GetEnum(message, F("default_foreign_enum")));
-  EXPECT_EQ(import_bar_,
-            reflection->GetEnum(message, F("default_import_enum")));
-
-  EXPECT_EQ("abc", reflection->GetString(message, F("default_string_piece")));
-  EXPECT_EQ("abc", reflection->GetStringReference(
-                       message, F("default_string_piece"), &scratch));
-
-  EXPECT_EQ("123", reflection->GetString(message, F("default_cord")));
-  EXPECT_EQ("123", reflection->GetStringReference(message, F("default_cord"),
-                                                  &scratch));
-}
-
-// -------------------------------------------------------------------
-
-inline void TestUtil::ReflectionTester::ModifyRepeatedFieldsViaReflection(
-    Message* message) {
-  const Reflection* reflection = message->GetReflection();
-  Message* sub_message;
-
-  reflection->SetRepeatedInt32(message, F("repeated_int32"), 1, 501);
-  reflection->SetRepeatedInt64(message, F("repeated_int64"), 1, 502);
-  reflection->SetRepeatedUInt32(message, F("repeated_uint32"), 1, 503);
-  reflection->SetRepeatedUInt64(message, F("repeated_uint64"), 1, 504);
-  reflection->SetRepeatedInt32(message, F("repeated_sint32"), 1, 505);
-  reflection->SetRepeatedInt64(message, F("repeated_sint64"), 1, 506);
-  reflection->SetRepeatedUInt32(message, F("repeated_fixed32"), 1, 507);
-  reflection->SetRepeatedUInt64(message, F("repeated_fixed64"), 1, 508);
-  reflection->SetRepeatedInt32(message, F("repeated_sfixed32"), 1, 509);
-  reflection->SetRepeatedInt64(message, F("repeated_sfixed64"), 1, 510);
-  reflection->SetRepeatedFloat(message, F("repeated_float"), 1, 511);
-  reflection->SetRepeatedDouble(message, F("repeated_double"), 1, 512);
-  reflection->SetRepeatedBool(message, F("repeated_bool"), 1, true);
-  reflection->SetRepeatedString(message, F("repeated_string"), 1, "515");
-  reflection->SetRepeatedString(message, F("repeated_bytes"), 1, "516");
-
-  sub_message =
-      reflection->MutableRepeatedMessage(message, F("repeatedgroup"), 1);
-  sub_message->GetReflection()->SetInt32(sub_message, repeated_group_a_, 517);
-  sub_message = reflection->MutableRepeatedMessage(
-      message, F("repeated_nested_message"), 1);
-  sub_message->GetReflection()->SetInt32(sub_message, nested_b_, 518);
-  sub_message = reflection->MutableRepeatedMessage(
-      message, F("repeated_foreign_message"), 1);
-  sub_message->GetReflection()->SetInt32(sub_message, foreign_c_, 519);
-  sub_message = reflection->MutableRepeatedMessage(
-      message, F("repeated_import_message"), 1);
-  sub_message->GetReflection()->SetInt32(sub_message, import_d_, 520);
-  sub_message = reflection->MutableRepeatedMessage(
-      message, F("repeated_lazy_message"), 1);
-  sub_message->GetReflection()->SetInt32(sub_message, nested_b_, 527);
-
-  reflection->SetRepeatedEnum(message, F("repeated_nested_enum"), 1,
-                              nested_foo_);
-  reflection->SetRepeatedEnum(message, F("repeated_foreign_enum"), 1,
-                              foreign_foo_);
-  reflection->SetRepeatedEnum(message, F("repeated_import_enum"), 1,
-                              import_foo_);
-
-  reflection->SetRepeatedString(message, F("repeated_string_piece"), 1, "524");
-  reflection->SetRepeatedString(message, F("repeated_cord"), 1, "525");
-}
-
-inline void TestUtil::ReflectionTester::RemoveLastRepeatedsViaReflection(
-    Message* message) {
-  const Reflection* reflection = message->GetReflection();
-
-  std::vector<const FieldDescriptor*> output;
-  reflection->ListFields(*message, &output);
-  for (int i = 0; i < output.size(); ++i) {
-    const FieldDescriptor* field = output[i];
-    if (!field->is_repeated()) continue;
-
-    reflection->RemoveLast(message, field);
-  }
-}
-
-inline void TestUtil::ReflectionTester::ReleaseLastRepeatedsViaReflection(
-    Message* message, bool expect_extensions_notnull) {
-  const Reflection* reflection = message->GetReflection();
-
-  std::vector<const FieldDescriptor*> output;
-  reflection->ListFields(*message, &output);
-  for (int i = 0; i < output.size(); ++i) {
-    const FieldDescriptor* field = output[i];
-    if (!field->is_repeated()) continue;
-    if (field->cpp_type() != FieldDescriptor::CPPTYPE_MESSAGE) continue;
-
-    Message* released = reflection->ReleaseLast(message, field);
-    if (!field->is_extension() || expect_extensions_notnull) {
-      ASSERT_TRUE(released != nullptr)
-          << "ReleaseLast returned nullptr for: " << field->name();
-    }
-    delete released;
-  }
-}
-
-inline void TestUtil::ReflectionTester::SwapRepeatedsViaReflection(
-    Message* message) {
-  const Reflection* reflection = message->GetReflection();
-
-  std::vector<const FieldDescriptor*> output;
-  reflection->ListFields(*message, &output);
-  for (int i = 0; i < output.size(); ++i) {
-    const FieldDescriptor* field = output[i];
-    if (!field->is_repeated()) continue;
-
-    reflection->SwapElements(message, field, 0, 1);
-  }
-}
-
-inline void TestUtil::ReflectionTester::
-    SetAllocatedOptionalMessageFieldsToNullViaReflection(Message* message) {
-  const Reflection* reflection = message->GetReflection();
-
-  std::vector<const FieldDescriptor*> fields;
-  reflection->ListFields(*message, &fields);
-
-  for (int i = 0; i < fields.size(); ++i) {
-    const FieldDescriptor* field = fields[i];
-    if (!field->is_optional() ||
-        field->cpp_type() != FieldDescriptor::CPPTYPE_MESSAGE)
-      continue;
-
-    reflection->SetAllocatedMessage(message, nullptr, field);
-  }
-}
-
-inline void TestUtil::ReflectionTester::
-    SetAllocatedOptionalMessageFieldsToMessageViaReflection(
-        Message* from_message, Message* to_message) {
-  EXPECT_EQ(from_message->GetDescriptor(), to_message->GetDescriptor());
-  const Reflection* from_reflection = from_message->GetReflection();
-  const Reflection* to_reflection = to_message->GetReflection();
-
-  std::vector<const FieldDescriptor*> fields;
-  from_reflection->ListFields(*from_message, &fields);
-
-  for (int i = 0; i < fields.size(); ++i) {
-    const FieldDescriptor* field = fields[i];
-    if (!field->is_optional() ||
-        field->cpp_type() != FieldDescriptor::CPPTYPE_MESSAGE)
-      continue;
-
-    Message* sub_message = from_reflection->ReleaseMessage(from_message, field);
-    to_reflection->SetAllocatedMessage(to_message, sub_message, field);
-  }
-}
-
-inline void TestUtil::ReflectionTester::ExpectMessagesReleasedViaReflection(
-    Message* message,
-    TestUtil::ReflectionTester::MessageReleaseState expected_release_state) {
-  const Reflection* reflection = message->GetReflection();
-
-  static const char* fields[] = {
-      "optionalgroup",
-      "optional_nested_message",
-      "optional_foreign_message",
-      "optional_import_message",
-  };
-  for (int i = 0; i < GOOGLE_ARRAYSIZE(fields); i++) {
-    Message* released = reflection->ReleaseMessage(message, F(fields[i]));
-    switch (expected_release_state) {
-      case IS_NULL:
-        EXPECT_TRUE(released == nullptr);
-        break;
-      case NOT_NULL:
-        EXPECT_TRUE(released != nullptr);
-        break;
-      case CAN_BE_NULL:
-        break;
-    }
-    delete released;
-    EXPECT_FALSE(reflection->HasField(*message, F(fields[i])));
-  }
-}
-
-// Check that the passed-in serialization is the canonical serialization we
-// expect for a TestFieldOrderings message filled in by
-// SetAllFieldsAndExtensions().
-inline void ExpectAllFieldsAndExtensionsInOrder(const std::string& serialized) {
-  // We set each field individually, serialize separately, and concatenate all
-  // the strings in canonical order to determine the expected serialization.
-  std::string expected;
-  unittest::TestFieldOrderings message;
-  message.set_my_int(1);  // Field 1.
-  message.AppendToString(&expected);
-  message.Clear();
-  message.SetExtension(unittest::my_extension_int, 23);  // Field 5.
-  message.AppendToString(&expected);
-  message.Clear();
-  message.set_my_string("foo");  // Field 11.
-  message.AppendToString(&expected);
-  message.Clear();
-  message.SetExtension(unittest::my_extension_string, "bar");  // Field 50.
-  message.AppendToString(&expected);
-  message.Clear();
-  message.set_my_float(1.0);  // Field 101.
-  message.AppendToString(&expected);
-  message.Clear();
-
-  // We don't EXPECT_EQ() since we don't want to print raw bytes to stdout.
-  EXPECT_TRUE(serialized == expected);
-}
-
-}  // namespace TestUtil
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
-
-#endif  // GOOGLE_PROTOBUF_TEST_UTIL_H__
diff --git a/libs/protobuf/src/google/protobuf/test_util.inc b/libs/protobuf/src/google/protobuf/test_util.inc
deleted file mode 100644
index 8d44afa..0000000
--- a/libs/protobuf/src/google/protobuf/test_util.inc
+++ /dev/null
@@ -1,2434 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-//
-// This file needs to be included as .inc as it depends on the namespaces
-// (unittest and unittest_import) being set up properly. It is also included
-// within an enclosing namespace and requires header files to be included
-// out of this file.
-
-#include <google/protobuf/stubs/logging.h>
-#include <google/protobuf/stubs/common.h>
-#include <gtest/gtest.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/message.h>
-
-namespace google {
-namespace protobuf {
-namespace TestUtil {
-
-// Set every field in the message to a unique value.
-inline void SetAllFields(UNITTEST::TestAllTypes* message);
-inline void SetOptionalFields(UNITTEST::TestAllTypes* message);
-inline void AddRepeatedFields1(UNITTEST::TestAllTypes* message);
-inline void AddRepeatedFields2(UNITTEST::TestAllTypes* message);
-inline void SetDefaultFields(UNITTEST::TestAllTypes* message);
-inline void SetOneofFields(UNITTEST::TestAllTypes* message);
-inline void SetAllExtensions(UNITTEST::TestAllExtensions* message);
-inline void SetOneofFields(UNITTEST::TestAllExtensions* message);
-inline void SetAllFieldsAndExtensions(UNITTEST::TestFieldOrderings* message);
-inline void SetPackedFields(UNITTEST::TestPackedTypes* message);
-inline void SetPackedExtensions(UNITTEST::TestPackedExtensions* message);
-inline void SetUnpackedFields(UNITTEST::TestUnpackedTypes* message);
-inline void SetOneof1(UNITTEST::TestOneof2* message);
-inline void SetOneof2(UNITTEST::TestOneof2* message);
-
-// Use the repeated versions of the set_*() accessors to modify all the
-// repeated fields of the message (which should already have been
-// initialized with Set*Fields()).  Set*Fields() itself only tests
-// the add_*() accessors.
-inline void ModifyRepeatedFields(UNITTEST::TestAllTypes* message);
-inline void ModifyRepeatedExtensions(UNITTEST::TestAllExtensions* message);
-
-// Check that all fields have the values that they should have after
-// Set*Fields() is called.
-inline void ExpectAllFieldsSet(const UNITTEST::TestAllTypes& message);
-inline void ExpectAllExtensionsSet(const UNITTEST::TestAllExtensions& message);
-inline void ExpectPackedFieldsSet(const UNITTEST::TestPackedTypes& message);
-inline void ExpectPackedExtensionsSet(
-    const UNITTEST::TestPackedExtensions& message);
-inline void ExpectUnpackedFieldsSet(const UNITTEST::TestUnpackedTypes& message);
-inline void ExpectUnpackedExtensionsSet(
-    const UNITTEST::TestUnpackedExtensions& message);
-inline void ExpectOneofSet1(const UNITTEST::TestOneof2& message);
-inline void ExpectOneofSet2(const UNITTEST::TestOneof2& message);
-
-// Expect that the message is modified as would be expected from
-// Modify*Fields().
-inline void ExpectRepeatedFieldsModified(const UNITTEST::TestAllTypes& message);
-inline void ExpectRepeatedExtensionsModified(
-    const UNITTEST::TestAllExtensions& message);
-
-// Check that all fields have their default values.
-inline void ExpectClear(const UNITTEST::TestAllTypes& message);
-inline void ExpectExtensionsClear(const UNITTEST::TestAllExtensions& message);
-inline void ExpectOneofClear(const UNITTEST::TestOneof2& message);
-
-// Check that all repeated fields have had their last elements removed.
-inline void ExpectLastRepeatedsRemoved(const UNITTEST::TestAllTypes& message);
-inline void ExpectLastRepeatedExtensionsRemoved(
-    const UNITTEST::TestAllExtensions& message);
-inline void ExpectLastRepeatedsReleased(const UNITTEST::TestAllTypes& message);
-inline void ExpectLastRepeatedExtensionsReleased(
-    const UNITTEST::TestAllExtensions& message);
-
-// Check that all repeated fields have had their first and last elements
-// swapped.
-inline void ExpectRepeatedsSwapped(const UNITTEST::TestAllTypes& message);
-inline void ExpectRepeatedExtensionsSwapped(
-    const UNITTEST::TestAllExtensions& message);
-
-inline void ExpectAtMostOneFieldSetInOneof(const UNITTEST::TestOneof2& message);
-
-}  // namespace TestUtil
-
-inline void TestUtil::SetAllFields(UNITTEST::TestAllTypes* message) {
-  SetOptionalFields(message);
-  AddRepeatedFields1(message);
-  AddRepeatedFields2(message);
-  SetDefaultFields(message);
-  SetOneofFields(message);
-}
-
-inline void TestUtil::SetOptionalFields(UNITTEST::TestAllTypes* message) {
-  message->set_optional_int32(101);
-  message->set_optional_int64(102);
-  message->set_optional_uint32(103);
-  message->set_optional_uint64(104);
-  message->set_optional_sint32(105);
-  message->set_optional_sint64(106);
-  message->set_optional_fixed32(107);
-  message->set_optional_fixed64(108);
-  message->set_optional_sfixed32(109);
-  message->set_optional_sfixed64(110);
-  message->set_optional_float(111);
-  message->set_optional_double(112);
-  message->set_optional_bool(true);
-  message->set_optional_string("115");
-  message->set_optional_bytes("116");
-
-  message->mutable_optionalgroup()->set_a(117);
-  message->mutable_optional_nested_message()->set_bb(118);
-  message->mutable_optional_foreign_message()->set_c(119);
-  message->mutable_optional_import_message()->set_d(120);
-  message->mutable_optional_public_import_message()->set_e(126);
-  message->mutable_optional_lazy_message()->set_bb(127);
-  message->mutable_optional_unverified_lazy_message()->set_bb(128);
-
-  message->set_optional_nested_enum(UNITTEST::TestAllTypes::BAZ);
-  message->set_optional_foreign_enum(UNITTEST::FOREIGN_BAZ);
-  message->set_optional_import_enum(UNITTEST_IMPORT::IMPORT_BAZ);
-
-  // StringPiece and Cord fields are only accessible via reflection in the
-  // open source release; see comments in compiler/cpp/string_field.cc.
-#ifndef PROTOBUF_TEST_NO_DESCRIPTORS
-  message->GetReflection()->SetString(
-      message,
-      message->GetDescriptor()->FindFieldByName("optional_string_piece"),
-      "124");
-  message->GetReflection()->SetString(
-      message, message->GetDescriptor()->FindFieldByName("optional_cord"),
-      "125");
-#endif  // !PROTOBUF_TEST_NO_DESCRIPTORS
-}
-
-// -------------------------------------------------------------------
-
-inline void TestUtil::AddRepeatedFields1(UNITTEST::TestAllTypes* message) {
-  message->add_repeated_int32(201);
-  message->add_repeated_int64(202);
-  message->add_repeated_uint32(203);
-  message->add_repeated_uint64(204);
-  message->add_repeated_sint32(205);
-  message->add_repeated_sint64(206);
-  message->add_repeated_fixed32(207);
-  message->add_repeated_fixed64(208);
-  message->add_repeated_sfixed32(209);
-  message->add_repeated_sfixed64(210);
-  message->add_repeated_float(211);
-  message->add_repeated_double(212);
-  message->add_repeated_bool(true);
-  message->add_repeated_string("215");
-  message->add_repeated_bytes("216");
-
-  message->add_repeatedgroup()->set_a(217);
-  message->add_repeated_nested_message()->set_bb(218);
-  message->add_repeated_foreign_message()->set_c(219);
-  message->add_repeated_import_message()->set_d(220);
-  message->add_repeated_lazy_message()->set_bb(227);
-
-  message->add_repeated_nested_enum(UNITTEST::TestAllTypes::BAR);
-  message->add_repeated_foreign_enum(UNITTEST::FOREIGN_BAR);
-  message->add_repeated_import_enum(UNITTEST_IMPORT::IMPORT_BAR);
-
-#ifndef PROTOBUF_TEST_NO_DESCRIPTORS
-  message->GetReflection()->AddString(
-      message,
-      message->GetDescriptor()->FindFieldByName("repeated_string_piece"),
-      "224");
-  message->GetReflection()->AddString(
-      message, message->GetDescriptor()->FindFieldByName("repeated_cord"),
-      "225");
-#endif  // !PROTOBUF_TEST_NO_DESCRIPTORS
-}
-
-inline void TestUtil::AddRepeatedFields2(UNITTEST::TestAllTypes* message) {
-  // Add a second one of each field.
-  message->add_repeated_int32(301);
-  message->add_repeated_int64(302);
-  message->add_repeated_uint32(303);
-  message->add_repeated_uint64(304);
-  message->add_repeated_sint32(305);
-  message->add_repeated_sint64(306);
-  message->add_repeated_fixed32(307);
-  message->add_repeated_fixed64(308);
-  message->add_repeated_sfixed32(309);
-  message->add_repeated_sfixed64(310);
-  message->add_repeated_float(311);
-  message->add_repeated_double(312);
-  message->add_repeated_bool(false);
-  message->add_repeated_string("315");
-  message->add_repeated_bytes("316");
-
-  message->add_repeatedgroup()->set_a(317);
-  message->add_repeated_nested_message()->set_bb(318);
-  message->add_repeated_foreign_message()->set_c(319);
-  message->add_repeated_import_message()->set_d(320);
-  message->add_repeated_lazy_message()->set_bb(327);
-
-  message->add_repeated_nested_enum(UNITTEST::TestAllTypes::BAZ);
-  message->add_repeated_foreign_enum(UNITTEST::FOREIGN_BAZ);
-  message->add_repeated_import_enum(UNITTEST_IMPORT::IMPORT_BAZ);
-
-#ifndef PROTOBUF_TEST_NO_DESCRIPTORS
-  message->GetReflection()->AddString(
-      message,
-      message->GetDescriptor()->FindFieldByName("repeated_string_piece"),
-      "324");
-  message->GetReflection()->AddString(
-      message, message->GetDescriptor()->FindFieldByName("repeated_cord"),
-      "325");
-#endif  // !PROTOBUF_TEST_NO_DESCRIPTORS
-}
-
-// -------------------------------------------------------------------
-
-inline void TestUtil::SetDefaultFields(UNITTEST::TestAllTypes* message) {
-  message->set_default_int32(401);
-  message->set_default_int64(402);
-  message->set_default_uint32(403);
-  message->set_default_uint64(404);
-  message->set_default_sint32(405);
-  message->set_default_sint64(406);
-  message->set_default_fixed32(407);
-  message->set_default_fixed64(408);
-  message->set_default_sfixed32(409);
-  message->set_default_sfixed64(410);
-  message->set_default_float(411);
-  message->set_default_double(412);
-  message->set_default_bool(false);
-  message->set_default_string("415");
-  message->set_default_bytes("416");
-
-  message->set_default_nested_enum(UNITTEST::TestAllTypes::FOO);
-  message->set_default_foreign_enum(UNITTEST::FOREIGN_FOO);
-  message->set_default_import_enum(UNITTEST_IMPORT::IMPORT_FOO);
-
-#ifndef PROTOBUF_TEST_NO_DESCRIPTORS
-  message->GetReflection()->SetString(
-      message,
-      message->GetDescriptor()->FindFieldByName("default_string_piece"), "424");
-  message->GetReflection()->SetString(
-      message, message->GetDescriptor()->FindFieldByName("default_cord"),
-      "425");
-#endif  // !PROTOBUF_TEST_NO_DESCRIPTORS
-}
-
-// -------------------------------------------------------------------
-
-inline void TestUtil::ModifyRepeatedFields(UNITTEST::TestAllTypes* message) {
-  message->set_repeated_int32(1, 501);
-  message->set_repeated_int64(1, 502);
-  message->set_repeated_uint32(1, 503);
-  message->set_repeated_uint64(1, 504);
-  message->set_repeated_sint32(1, 505);
-  message->set_repeated_sint64(1, 506);
-  message->set_repeated_fixed32(1, 507);
-  message->set_repeated_fixed64(1, 508);
-  message->set_repeated_sfixed32(1, 509);
-  message->set_repeated_sfixed64(1, 510);
-  message->set_repeated_float(1, 511);
-  message->set_repeated_double(1, 512);
-  message->set_repeated_bool(1, true);
-  message->set_repeated_string(1, "515");
-  message->set_repeated_bytes(1, "516");
-
-  message->mutable_repeatedgroup(1)->set_a(517);
-  message->mutable_repeated_nested_message(1)->set_bb(518);
-  message->mutable_repeated_foreign_message(1)->set_c(519);
-  message->mutable_repeated_import_message(1)->set_d(520);
-  message->mutable_repeated_lazy_message(1)->set_bb(527);
-
-  message->set_repeated_nested_enum(1, UNITTEST::TestAllTypes::FOO);
-  message->set_repeated_foreign_enum(1, UNITTEST::FOREIGN_FOO);
-  message->set_repeated_import_enum(1, UNITTEST_IMPORT::IMPORT_FOO);
-
-#ifndef PROTOBUF_TEST_NO_DESCRIPTORS
-  message->GetReflection()->SetRepeatedString(
-      message,
-      message->GetDescriptor()->FindFieldByName("repeated_string_piece"), 1,
-      "524");
-  message->GetReflection()->SetRepeatedString(
-      message, message->GetDescriptor()->FindFieldByName("repeated_cord"), 1,
-      "525");
-#endif  // !PROTOBUF_TEST_NO_DESCRIPTORS
-}
-
-// ------------------------------------------------------------------
-inline void TestUtil::SetOneofFields(UNITTEST::TestAllTypes* message) {
-  message->set_oneof_uint32(601);
-  message->mutable_oneof_nested_message()->set_bb(602);
-  message->set_oneof_string("603");
-  message->set_oneof_bytes("604");
-}
-
-// -------------------------------------------------------------------
-
-inline void TestUtil::ExpectAllFieldsSet(
-    const UNITTEST::TestAllTypes& message) {
-  EXPECT_TRUE(message.has_optional_int32());
-  EXPECT_TRUE(message.has_optional_int64());
-  EXPECT_TRUE(message.has_optional_uint32());
-  EXPECT_TRUE(message.has_optional_uint64());
-  EXPECT_TRUE(message.has_optional_sint32());
-  EXPECT_TRUE(message.has_optional_sint64());
-  EXPECT_TRUE(message.has_optional_fixed32());
-  EXPECT_TRUE(message.has_optional_fixed64());
-  EXPECT_TRUE(message.has_optional_sfixed32());
-  EXPECT_TRUE(message.has_optional_sfixed64());
-  EXPECT_TRUE(message.has_optional_float());
-  EXPECT_TRUE(message.has_optional_double());
-  EXPECT_TRUE(message.has_optional_bool());
-  EXPECT_TRUE(message.has_optional_string());
-  EXPECT_TRUE(message.has_optional_bytes());
-
-  EXPECT_TRUE(message.has_optionalgroup());
-  EXPECT_TRUE(message.has_optional_nested_message());
-  EXPECT_TRUE(message.has_optional_foreign_message());
-  EXPECT_TRUE(message.has_optional_import_message());
-  EXPECT_TRUE(message.has_optional_public_import_message());
-  EXPECT_TRUE(message.has_optional_lazy_message());
-  EXPECT_TRUE(message.has_optional_unverified_lazy_message());
-
-  EXPECT_TRUE(message.optionalgroup().has_a());
-  EXPECT_TRUE(message.optional_nested_message().has_bb());
-  EXPECT_TRUE(message.optional_foreign_message().has_c());
-  EXPECT_TRUE(message.optional_import_message().has_d());
-  EXPECT_TRUE(message.optional_public_import_message().has_e());
-  EXPECT_TRUE(message.optional_lazy_message().has_bb());
-  EXPECT_TRUE(message.optional_unverified_lazy_message().has_bb());
-
-  EXPECT_TRUE(message.has_optional_nested_enum());
-  EXPECT_TRUE(message.has_optional_foreign_enum());
-  EXPECT_TRUE(message.has_optional_import_enum());
-
-#ifndef PROTOBUF_TEST_NO_DESCRIPTORS
-  EXPECT_TRUE(message.has_optional_string_piece());
-  EXPECT_TRUE(message.has_optional_cord());
-#endif
-
-  EXPECT_EQ(101, message.optional_int32());
-  EXPECT_EQ(102, message.optional_int64());
-  EXPECT_EQ(103, message.optional_uint32());
-  EXPECT_EQ(104, message.optional_uint64());
-  EXPECT_EQ(105, message.optional_sint32());
-  EXPECT_EQ(106, message.optional_sint64());
-  EXPECT_EQ(107, message.optional_fixed32());
-  EXPECT_EQ(108, message.optional_fixed64());
-  EXPECT_EQ(109, message.optional_sfixed32());
-  EXPECT_EQ(110, message.optional_sfixed64());
-  EXPECT_EQ(111, message.optional_float());
-  EXPECT_EQ(112, message.optional_double());
-  EXPECT_TRUE(message.optional_bool());
-  EXPECT_EQ("115", message.optional_string());
-  EXPECT_EQ("116", message.optional_bytes());
-
-  EXPECT_EQ(117, message.optionalgroup().a());
-  EXPECT_EQ(118, message.optional_nested_message().bb());
-  EXPECT_EQ(119, message.optional_foreign_message().c());
-  EXPECT_EQ(120, message.optional_import_message().d());
-  EXPECT_EQ(126, message.optional_public_import_message().e());
-  EXPECT_EQ(127, message.optional_lazy_message().bb());
-  EXPECT_EQ(128, message.optional_unverified_lazy_message().bb());
-
-  EXPECT_EQ(UNITTEST::TestAllTypes::BAZ, message.optional_nested_enum());
-  EXPECT_EQ(UNITTEST::FOREIGN_BAZ, message.optional_foreign_enum());
-  EXPECT_EQ(UNITTEST_IMPORT::IMPORT_BAZ, message.optional_import_enum());
-
-
-  // -----------------------------------------------------------------
-
-  ASSERT_EQ(2, message.repeated_int32_size());
-  ASSERT_EQ(2, message.repeated_int64_size());
-  ASSERT_EQ(2, message.repeated_uint32_size());
-  ASSERT_EQ(2, message.repeated_uint64_size());
-  ASSERT_EQ(2, message.repeated_sint32_size());
-  ASSERT_EQ(2, message.repeated_sint64_size());
-  ASSERT_EQ(2, message.repeated_fixed32_size());
-  ASSERT_EQ(2, message.repeated_fixed64_size());
-  ASSERT_EQ(2, message.repeated_sfixed32_size());
-  ASSERT_EQ(2, message.repeated_sfixed64_size());
-  ASSERT_EQ(2, message.repeated_float_size());
-  ASSERT_EQ(2, message.repeated_double_size());
-  ASSERT_EQ(2, message.repeated_bool_size());
-  ASSERT_EQ(2, message.repeated_string_size());
-  ASSERT_EQ(2, message.repeated_bytes_size());
-
-  ASSERT_EQ(2, message.repeatedgroup_size());
-  ASSERT_EQ(2, message.repeated_nested_message_size());
-  ASSERT_EQ(2, message.repeated_foreign_message_size());
-  ASSERT_EQ(2, message.repeated_import_message_size());
-  ASSERT_EQ(2, message.repeated_lazy_message_size());
-  ASSERT_EQ(2, message.repeated_nested_enum_size());
-  ASSERT_EQ(2, message.repeated_foreign_enum_size());
-  ASSERT_EQ(2, message.repeated_import_enum_size());
-
-#ifndef PROTOBUF_TEST_NO_DESCRIPTORS
-  ASSERT_EQ(2, message.repeated_string_piece_size());
-  ASSERT_EQ(2, message.repeated_cord_size());
-#endif
-
-  EXPECT_EQ(201, message.repeated_int32(0));
-  EXPECT_EQ(202, message.repeated_int64(0));
-  EXPECT_EQ(203, message.repeated_uint32(0));
-  EXPECT_EQ(204, message.repeated_uint64(0));
-  EXPECT_EQ(205, message.repeated_sint32(0));
-  EXPECT_EQ(206, message.repeated_sint64(0));
-  EXPECT_EQ(207, message.repeated_fixed32(0));
-  EXPECT_EQ(208, message.repeated_fixed64(0));
-  EXPECT_EQ(209, message.repeated_sfixed32(0));
-  EXPECT_EQ(210, message.repeated_sfixed64(0));
-  EXPECT_EQ(211, message.repeated_float(0));
-  EXPECT_EQ(212, message.repeated_double(0));
-  EXPECT_TRUE(message.repeated_bool(0));
-  EXPECT_EQ("215", message.repeated_string(0));
-  EXPECT_EQ("216", message.repeated_bytes(0));
-
-  EXPECT_EQ(217, message.repeatedgroup(0).a());
-  EXPECT_EQ(218, message.repeated_nested_message(0).bb());
-  EXPECT_EQ(219, message.repeated_foreign_message(0).c());
-  EXPECT_EQ(220, message.repeated_import_message(0).d());
-  EXPECT_EQ(227, message.repeated_lazy_message(0).bb());
-
-
-  EXPECT_EQ(UNITTEST::TestAllTypes::BAR, message.repeated_nested_enum(0));
-  EXPECT_EQ(UNITTEST::FOREIGN_BAR, message.repeated_foreign_enum(0));
-  EXPECT_EQ(UNITTEST_IMPORT::IMPORT_BAR, message.repeated_import_enum(0));
-
-  EXPECT_EQ(301, message.repeated_int32(1));
-  EXPECT_EQ(302, message.repeated_int64(1));
-  EXPECT_EQ(303, message.repeated_uint32(1));
-  EXPECT_EQ(304, message.repeated_uint64(1));
-  EXPECT_EQ(305, message.repeated_sint32(1));
-  EXPECT_EQ(306, message.repeated_sint64(1));
-  EXPECT_EQ(307, message.repeated_fixed32(1));
-  EXPECT_EQ(308, message.repeated_fixed64(1));
-  EXPECT_EQ(309, message.repeated_sfixed32(1));
-  EXPECT_EQ(310, message.repeated_sfixed64(1));
-  EXPECT_EQ(311, message.repeated_float(1));
-  EXPECT_EQ(312, message.repeated_double(1));
-  EXPECT_FALSE(message.repeated_bool(1));
-  EXPECT_EQ("315", message.repeated_string(1));
-  EXPECT_EQ("316", message.repeated_bytes(1));
-
-  EXPECT_EQ(317, message.repeatedgroup(1).a());
-  EXPECT_EQ(318, message.repeated_nested_message(1).bb());
-  EXPECT_EQ(319, message.repeated_foreign_message(1).c());
-  EXPECT_EQ(320, message.repeated_import_message(1).d());
-  EXPECT_EQ(327, message.repeated_lazy_message(1).bb());
-
-  EXPECT_EQ(UNITTEST::TestAllTypes::BAZ, message.repeated_nested_enum(1));
-  EXPECT_EQ(UNITTEST::FOREIGN_BAZ, message.repeated_foreign_enum(1));
-  EXPECT_EQ(UNITTEST_IMPORT::IMPORT_BAZ, message.repeated_import_enum(1));
-
-
-  // -----------------------------------------------------------------
-
-  EXPECT_TRUE(message.has_default_int32());
-  EXPECT_TRUE(message.has_default_int64());
-  EXPECT_TRUE(message.has_default_uint32());
-  EXPECT_TRUE(message.has_default_uint64());
-  EXPECT_TRUE(message.has_default_sint32());
-  EXPECT_TRUE(message.has_default_sint64());
-  EXPECT_TRUE(message.has_default_fixed32());
-  EXPECT_TRUE(message.has_default_fixed64());
-  EXPECT_TRUE(message.has_default_sfixed32());
-  EXPECT_TRUE(message.has_default_sfixed64());
-  EXPECT_TRUE(message.has_default_float());
-  EXPECT_TRUE(message.has_default_double());
-  EXPECT_TRUE(message.has_default_bool());
-  EXPECT_TRUE(message.has_default_string());
-  EXPECT_TRUE(message.has_default_bytes());
-
-  EXPECT_TRUE(message.has_default_nested_enum());
-  EXPECT_TRUE(message.has_default_foreign_enum());
-  EXPECT_TRUE(message.has_default_import_enum());
-
-
-  EXPECT_EQ(401, message.default_int32());
-  EXPECT_EQ(402, message.default_int64());
-  EXPECT_EQ(403, message.default_uint32());
-  EXPECT_EQ(404, message.default_uint64());
-  EXPECT_EQ(405, message.default_sint32());
-  EXPECT_EQ(406, message.default_sint64());
-  EXPECT_EQ(407, message.default_fixed32());
-  EXPECT_EQ(408, message.default_fixed64());
-  EXPECT_EQ(409, message.default_sfixed32());
-  EXPECT_EQ(410, message.default_sfixed64());
-  EXPECT_EQ(411, message.default_float());
-  EXPECT_EQ(412, message.default_double());
-  EXPECT_FALSE(message.default_bool());
-  EXPECT_EQ("415", message.default_string());
-  EXPECT_EQ("416", message.default_bytes());
-
-  EXPECT_EQ(UNITTEST::TestAllTypes::FOO, message.default_nested_enum());
-  EXPECT_EQ(UNITTEST::FOREIGN_FOO, message.default_foreign_enum());
-  EXPECT_EQ(UNITTEST_IMPORT::IMPORT_FOO, message.default_import_enum());
-
-
-  EXPECT_FALSE(message.has_oneof_uint32());
-  EXPECT_FALSE(message.has_oneof_nested_message());
-  EXPECT_FALSE(message.has_oneof_string());
-  EXPECT_TRUE(message.has_oneof_bytes());
-
-  EXPECT_EQ("604", message.oneof_bytes());
-}
-
-// -------------------------------------------------------------------
-
-inline void TestUtil::ExpectClear(const UNITTEST::TestAllTypes& message) {
-  // has_blah() should initially be false for all optional fields.
-  EXPECT_FALSE(message.has_optional_int32());
-  EXPECT_FALSE(message.has_optional_int64());
-  EXPECT_FALSE(message.has_optional_uint32());
-  EXPECT_FALSE(message.has_optional_uint64());
-  EXPECT_FALSE(message.has_optional_sint32());
-  EXPECT_FALSE(message.has_optional_sint64());
-  EXPECT_FALSE(message.has_optional_fixed32());
-  EXPECT_FALSE(message.has_optional_fixed64());
-  EXPECT_FALSE(message.has_optional_sfixed32());
-  EXPECT_FALSE(message.has_optional_sfixed64());
-  EXPECT_FALSE(message.has_optional_float());
-  EXPECT_FALSE(message.has_optional_double());
-  EXPECT_FALSE(message.has_optional_bool());
-  EXPECT_FALSE(message.has_optional_string());
-  EXPECT_FALSE(message.has_optional_bytes());
-
-  EXPECT_FALSE(message.has_optionalgroup());
-  EXPECT_FALSE(message.has_optional_nested_message());
-  EXPECT_FALSE(message.has_optional_foreign_message());
-  EXPECT_FALSE(message.has_optional_import_message());
-  EXPECT_FALSE(message.has_optional_public_import_message());
-  EXPECT_FALSE(message.has_optional_lazy_message());
-  EXPECT_FALSE(message.has_optional_unverified_lazy_message());
-
-  EXPECT_FALSE(message.has_optional_nested_enum());
-  EXPECT_FALSE(message.has_optional_foreign_enum());
-  EXPECT_FALSE(message.has_optional_import_enum());
-
-  EXPECT_FALSE(message.has_optional_string_piece());
-  EXPECT_FALSE(message.has_optional_cord());
-
-  // Optional fields without defaults are set to zero or something like it.
-  EXPECT_EQ(0, message.optional_int32());
-  EXPECT_EQ(0, message.optional_int64());
-  EXPECT_EQ(0, message.optional_uint32());
-  EXPECT_EQ(0, message.optional_uint64());
-  EXPECT_EQ(0, message.optional_sint32());
-  EXPECT_EQ(0, message.optional_sint64());
-  EXPECT_EQ(0, message.optional_fixed32());
-  EXPECT_EQ(0, message.optional_fixed64());
-  EXPECT_EQ(0, message.optional_sfixed32());
-  EXPECT_EQ(0, message.optional_sfixed64());
-  EXPECT_EQ(0, message.optional_float());
-  EXPECT_EQ(0, message.optional_double());
-  EXPECT_FALSE(message.optional_bool());
-  EXPECT_EQ("", message.optional_string());
-  EXPECT_EQ("", message.optional_bytes());
-
-  // Embedded messages should also be clear.
-  EXPECT_FALSE(message.optionalgroup().has_a());
-  EXPECT_FALSE(message.optional_nested_message().has_bb());
-  EXPECT_FALSE(message.optional_foreign_message().has_c());
-  EXPECT_FALSE(message.optional_import_message().has_d());
-  EXPECT_FALSE(message.optional_public_import_message().has_e());
-  EXPECT_FALSE(message.optional_lazy_message().has_bb());
-  EXPECT_FALSE(message.optional_unverified_lazy_message().has_bb());
-
-  EXPECT_EQ(0, message.optionalgroup().a());
-  EXPECT_EQ(0, message.optional_nested_message().bb());
-  EXPECT_EQ(0, message.optional_foreign_message().c());
-  EXPECT_EQ(0, message.optional_import_message().d());
-  EXPECT_EQ(0, message.optional_public_import_message().e());
-  EXPECT_EQ(0, message.optional_lazy_message().bb());
-  EXPECT_EQ(0, message.optional_unverified_lazy_message().bb());
-
-  // Enums without defaults are set to the first value in the enum.
-  EXPECT_EQ(UNITTEST::TestAllTypes::FOO, message.optional_nested_enum());
-  EXPECT_EQ(UNITTEST::FOREIGN_FOO, message.optional_foreign_enum());
-  EXPECT_EQ(UNITTEST_IMPORT::IMPORT_FOO, message.optional_import_enum());
-
-
-  // Repeated fields are empty.
-  EXPECT_EQ(0, message.repeated_int32_size());
-  EXPECT_EQ(0, message.repeated_int64_size());
-  EXPECT_EQ(0, message.repeated_uint32_size());
-  EXPECT_EQ(0, message.repeated_uint64_size());
-  EXPECT_EQ(0, message.repeated_sint32_size());
-  EXPECT_EQ(0, message.repeated_sint64_size());
-  EXPECT_EQ(0, message.repeated_fixed32_size());
-  EXPECT_EQ(0, message.repeated_fixed64_size());
-  EXPECT_EQ(0, message.repeated_sfixed32_size());
-  EXPECT_EQ(0, message.repeated_sfixed64_size());
-  EXPECT_EQ(0, message.repeated_float_size());
-  EXPECT_EQ(0, message.repeated_double_size());
-  EXPECT_EQ(0, message.repeated_bool_size());
-  EXPECT_EQ(0, message.repeated_string_size());
-  EXPECT_EQ(0, message.repeated_bytes_size());
-
-  EXPECT_EQ(0, message.repeatedgroup_size());
-  EXPECT_EQ(0, message.repeated_nested_message_size());
-  EXPECT_EQ(0, message.repeated_foreign_message_size());
-  EXPECT_EQ(0, message.repeated_import_message_size());
-  EXPECT_EQ(0, message.repeated_lazy_message_size());
-  EXPECT_EQ(0, message.repeated_nested_enum_size());
-  EXPECT_EQ(0, message.repeated_foreign_enum_size());
-  EXPECT_EQ(0, message.repeated_import_enum_size());
-
-  EXPECT_EQ(0, message.repeated_string_piece_size());
-  EXPECT_EQ(0, message.repeated_cord_size());
-
-  // has_blah() should also be false for all default fields.
-  EXPECT_FALSE(message.has_default_int32());
-  EXPECT_FALSE(message.has_default_int64());
-  EXPECT_FALSE(message.has_default_uint32());
-  EXPECT_FALSE(message.has_default_uint64());
-  EXPECT_FALSE(message.has_default_sint32());
-  EXPECT_FALSE(message.has_default_sint64());
-  EXPECT_FALSE(message.has_default_fixed32());
-  EXPECT_FALSE(message.has_default_fixed64());
-  EXPECT_FALSE(message.has_default_sfixed32());
-  EXPECT_FALSE(message.has_default_sfixed64());
-  EXPECT_FALSE(message.has_default_float());
-  EXPECT_FALSE(message.has_default_double());
-  EXPECT_FALSE(message.has_default_bool());
-  EXPECT_FALSE(message.has_default_string());
-  EXPECT_FALSE(message.has_default_bytes());
-
-  EXPECT_FALSE(message.has_default_nested_enum());
-  EXPECT_FALSE(message.has_default_foreign_enum());
-  EXPECT_FALSE(message.has_default_import_enum());
-
-
-  // Fields with defaults have their default values (duh).
-  EXPECT_EQ(41, message.default_int32());
-  EXPECT_EQ(42, message.default_int64());
-  EXPECT_EQ(43, message.default_uint32());
-  EXPECT_EQ(44, message.default_uint64());
-  EXPECT_EQ(-45, message.default_sint32());
-  EXPECT_EQ(46, message.default_sint64());
-  EXPECT_EQ(47, message.default_fixed32());
-  EXPECT_EQ(48, message.default_fixed64());
-  EXPECT_EQ(49, message.default_sfixed32());
-  EXPECT_EQ(-50, message.default_sfixed64());
-  EXPECT_EQ(51.5, message.default_float());
-  EXPECT_EQ(52e3, message.default_double());
-  EXPECT_TRUE(message.default_bool());
-  EXPECT_EQ("hello", message.default_string());
-  EXPECT_EQ("world", message.default_bytes());
-
-  EXPECT_EQ(UNITTEST::TestAllTypes::BAR, message.default_nested_enum());
-  EXPECT_EQ(UNITTEST::FOREIGN_BAR, message.default_foreign_enum());
-  EXPECT_EQ(UNITTEST_IMPORT::IMPORT_BAR, message.default_import_enum());
-
-
-  EXPECT_FALSE(message.has_oneof_uint32());
-  EXPECT_FALSE(message.has_oneof_nested_message());
-  EXPECT_FALSE(message.has_oneof_string());
-  EXPECT_FALSE(message.has_oneof_bytes());
-}
-
-// -------------------------------------------------------------------
-
-inline void TestUtil::ExpectRepeatedFieldsModified(
-    const UNITTEST::TestAllTypes& message) {
-  // ModifyRepeatedFields only sets the second repeated element of each
-  // field.  In addition to verifying this, we also verify that the first
-  // element and size were *not* modified.
-  ASSERT_EQ(2, message.repeated_int32_size());
-  ASSERT_EQ(2, message.repeated_int64_size());
-  ASSERT_EQ(2, message.repeated_uint32_size());
-  ASSERT_EQ(2, message.repeated_uint64_size());
-  ASSERT_EQ(2, message.repeated_sint32_size());
-  ASSERT_EQ(2, message.repeated_sint64_size());
-  ASSERT_EQ(2, message.repeated_fixed32_size());
-  ASSERT_EQ(2, message.repeated_fixed64_size());
-  ASSERT_EQ(2, message.repeated_sfixed32_size());
-  ASSERT_EQ(2, message.repeated_sfixed64_size());
-  ASSERT_EQ(2, message.repeated_float_size());
-  ASSERT_EQ(2, message.repeated_double_size());
-  ASSERT_EQ(2, message.repeated_bool_size());
-  ASSERT_EQ(2, message.repeated_string_size());
-  ASSERT_EQ(2, message.repeated_bytes_size());
-
-  ASSERT_EQ(2, message.repeatedgroup_size());
-  ASSERT_EQ(2, message.repeated_nested_message_size());
-  ASSERT_EQ(2, message.repeated_foreign_message_size());
-  ASSERT_EQ(2, message.repeated_import_message_size());
-  ASSERT_EQ(2, message.repeated_lazy_message_size());
-  ASSERT_EQ(2, message.repeated_nested_enum_size());
-  ASSERT_EQ(2, message.repeated_foreign_enum_size());
-  ASSERT_EQ(2, message.repeated_import_enum_size());
-
-#ifndef PROTOBUF_TEST_NO_DESCRIPTORS
-  ASSERT_EQ(2, message.repeated_string_piece_size());
-  ASSERT_EQ(2, message.repeated_cord_size());
-#endif
-
-  EXPECT_EQ(201, message.repeated_int32(0));
-  EXPECT_EQ(202, message.repeated_int64(0));
-  EXPECT_EQ(203, message.repeated_uint32(0));
-  EXPECT_EQ(204, message.repeated_uint64(0));
-  EXPECT_EQ(205, message.repeated_sint32(0));
-  EXPECT_EQ(206, message.repeated_sint64(0));
-  EXPECT_EQ(207, message.repeated_fixed32(0));
-  EXPECT_EQ(208, message.repeated_fixed64(0));
-  EXPECT_EQ(209, message.repeated_sfixed32(0));
-  EXPECT_EQ(210, message.repeated_sfixed64(0));
-  EXPECT_EQ(211, message.repeated_float(0));
-  EXPECT_EQ(212, message.repeated_double(0));
-  EXPECT_TRUE(message.repeated_bool(0));
-  EXPECT_EQ("215", message.repeated_string(0));
-  EXPECT_EQ("216", message.repeated_bytes(0));
-
-  EXPECT_EQ(217, message.repeatedgroup(0).a());
-  EXPECT_EQ(218, message.repeated_nested_message(0).bb());
-  EXPECT_EQ(219, message.repeated_foreign_message(0).c());
-  EXPECT_EQ(220, message.repeated_import_message(0).d());
-  EXPECT_EQ(227, message.repeated_lazy_message(0).bb());
-
-  EXPECT_EQ(UNITTEST::TestAllTypes::BAR, message.repeated_nested_enum(0));
-  EXPECT_EQ(UNITTEST::FOREIGN_BAR, message.repeated_foreign_enum(0));
-  EXPECT_EQ(UNITTEST_IMPORT::IMPORT_BAR, message.repeated_import_enum(0));
-
-
-  // Actually verify the second (modified) elements now.
-  EXPECT_EQ(501, message.repeated_int32(1));
-  EXPECT_EQ(502, message.repeated_int64(1));
-  EXPECT_EQ(503, message.repeated_uint32(1));
-  EXPECT_EQ(504, message.repeated_uint64(1));
-  EXPECT_EQ(505, message.repeated_sint32(1));
-  EXPECT_EQ(506, message.repeated_sint64(1));
-  EXPECT_EQ(507, message.repeated_fixed32(1));
-  EXPECT_EQ(508, message.repeated_fixed64(1));
-  EXPECT_EQ(509, message.repeated_sfixed32(1));
-  EXPECT_EQ(510, message.repeated_sfixed64(1));
-  EXPECT_EQ(511, message.repeated_float(1));
-  EXPECT_EQ(512, message.repeated_double(1));
-  EXPECT_TRUE(message.repeated_bool(1));
-  EXPECT_EQ("515", message.repeated_string(1));
-  EXPECT_EQ("516", message.repeated_bytes(1));
-
-  EXPECT_EQ(517, message.repeatedgroup(1).a());
-  EXPECT_EQ(518, message.repeated_nested_message(1).bb());
-  EXPECT_EQ(519, message.repeated_foreign_message(1).c());
-  EXPECT_EQ(520, message.repeated_import_message(1).d());
-  EXPECT_EQ(527, message.repeated_lazy_message(1).bb());
-
-  EXPECT_EQ(UNITTEST::TestAllTypes::FOO, message.repeated_nested_enum(1));
-  EXPECT_EQ(UNITTEST::FOREIGN_FOO, message.repeated_foreign_enum(1));
-  EXPECT_EQ(UNITTEST_IMPORT::IMPORT_FOO, message.repeated_import_enum(1));
-
-}
-
-// -------------------------------------------------------------------
-
-inline void TestUtil::SetPackedFields(UNITTEST::TestPackedTypes* message) {
-  message->add_packed_int32(601);
-  message->add_packed_int64(602);
-  message->add_packed_uint32(603);
-  message->add_packed_uint64(604);
-  message->add_packed_sint32(605);
-  message->add_packed_sint64(606);
-  message->add_packed_fixed32(607);
-  message->add_packed_fixed64(608);
-  message->add_packed_sfixed32(609);
-  message->add_packed_sfixed64(610);
-  message->add_packed_float(611);
-  message->add_packed_double(612);
-  message->add_packed_bool(true);
-  message->add_packed_enum(UNITTEST::FOREIGN_BAR);
-  // add a second one of each field
-  message->add_packed_int32(701);
-  message->add_packed_int64(702);
-  message->add_packed_uint32(703);
-  message->add_packed_uint64(704);
-  message->add_packed_sint32(705);
-  message->add_packed_sint64(706);
-  message->add_packed_fixed32(707);
-  message->add_packed_fixed64(708);
-  message->add_packed_sfixed32(709);
-  message->add_packed_sfixed64(710);
-  message->add_packed_float(711);
-  message->add_packed_double(712);
-  message->add_packed_bool(false);
-  message->add_packed_enum(UNITTEST::FOREIGN_BAZ);
-}
-
-inline void TestUtil::SetUnpackedFields(UNITTEST::TestUnpackedTypes* message) {
-  // The values applied here must match those of SetPackedFields.
-
-  message->add_unpacked_int32(601);
-  message->add_unpacked_int64(602);
-  message->add_unpacked_uint32(603);
-  message->add_unpacked_uint64(604);
-  message->add_unpacked_sint32(605);
-  message->add_unpacked_sint64(606);
-  message->add_unpacked_fixed32(607);
-  message->add_unpacked_fixed64(608);
-  message->add_unpacked_sfixed32(609);
-  message->add_unpacked_sfixed64(610);
-  message->add_unpacked_float(611);
-  message->add_unpacked_double(612);
-  message->add_unpacked_bool(true);
-  message->add_unpacked_enum(UNITTEST::FOREIGN_BAR);
-  // add a second one of each field
-  message->add_unpacked_int32(701);
-  message->add_unpacked_int64(702);
-  message->add_unpacked_uint32(703);
-  message->add_unpacked_uint64(704);
-  message->add_unpacked_sint32(705);
-  message->add_unpacked_sint64(706);
-  message->add_unpacked_fixed32(707);
-  message->add_unpacked_fixed64(708);
-  message->add_unpacked_sfixed32(709);
-  message->add_unpacked_sfixed64(710);
-  message->add_unpacked_float(711);
-  message->add_unpacked_double(712);
-  message->add_unpacked_bool(false);
-  message->add_unpacked_enum(UNITTEST::FOREIGN_BAZ);
-}
-
-// -------------------------------------------------------------------
-
-inline void TestUtil::ExpectPackedFieldsSet(
-    const UNITTEST::TestPackedTypes& message) {
-  ASSERT_EQ(2, message.packed_int32_size());
-  ASSERT_EQ(2, message.packed_int64_size());
-  ASSERT_EQ(2, message.packed_uint32_size());
-  ASSERT_EQ(2, message.packed_uint64_size());
-  ASSERT_EQ(2, message.packed_sint32_size());
-  ASSERT_EQ(2, message.packed_sint64_size());
-  ASSERT_EQ(2, message.packed_fixed32_size());
-  ASSERT_EQ(2, message.packed_fixed64_size());
-  ASSERT_EQ(2, message.packed_sfixed32_size());
-  ASSERT_EQ(2, message.packed_sfixed64_size());
-  ASSERT_EQ(2, message.packed_float_size());
-  ASSERT_EQ(2, message.packed_double_size());
-  ASSERT_EQ(2, message.packed_bool_size());
-  ASSERT_EQ(2, message.packed_enum_size());
-
-  EXPECT_EQ(601, message.packed_int32(0));
-  EXPECT_EQ(602, message.packed_int64(0));
-  EXPECT_EQ(603, message.packed_uint32(0));
-  EXPECT_EQ(604, message.packed_uint64(0));
-  EXPECT_EQ(605, message.packed_sint32(0));
-  EXPECT_EQ(606, message.packed_sint64(0));
-  EXPECT_EQ(607, message.packed_fixed32(0));
-  EXPECT_EQ(608, message.packed_fixed64(0));
-  EXPECT_EQ(609, message.packed_sfixed32(0));
-  EXPECT_EQ(610, message.packed_sfixed64(0));
-  EXPECT_EQ(611, message.packed_float(0));
-  EXPECT_EQ(612, message.packed_double(0));
-  EXPECT_TRUE(message.packed_bool(0));
-  EXPECT_EQ(UNITTEST::FOREIGN_BAR, message.packed_enum(0));
-
-  EXPECT_EQ(701, message.packed_int32(1));
-  EXPECT_EQ(702, message.packed_int64(1));
-  EXPECT_EQ(703, message.packed_uint32(1));
-  EXPECT_EQ(704, message.packed_uint64(1));
-  EXPECT_EQ(705, message.packed_sint32(1));
-  EXPECT_EQ(706, message.packed_sint64(1));
-  EXPECT_EQ(707, message.packed_fixed32(1));
-  EXPECT_EQ(708, message.packed_fixed64(1));
-  EXPECT_EQ(709, message.packed_sfixed32(1));
-  EXPECT_EQ(710, message.packed_sfixed64(1));
-  EXPECT_EQ(711, message.packed_float(1));
-  EXPECT_EQ(712, message.packed_double(1));
-  EXPECT_FALSE(message.packed_bool(1));
-  EXPECT_EQ(UNITTEST::FOREIGN_BAZ, message.packed_enum(1));
-}
-
-inline void TestUtil::ExpectUnpackedFieldsSet(
-    const UNITTEST::TestUnpackedTypes& message) {
-  // The values expected here must match those of ExpectPackedFieldsSet.
-
-  ASSERT_EQ(2, message.unpacked_int32_size());
-  ASSERT_EQ(2, message.unpacked_int64_size());
-  ASSERT_EQ(2, message.unpacked_uint32_size());
-  ASSERT_EQ(2, message.unpacked_uint64_size());
-  ASSERT_EQ(2, message.unpacked_sint32_size());
-  ASSERT_EQ(2, message.unpacked_sint64_size());
-  ASSERT_EQ(2, message.unpacked_fixed32_size());
-  ASSERT_EQ(2, message.unpacked_fixed64_size());
-  ASSERT_EQ(2, message.unpacked_sfixed32_size());
-  ASSERT_EQ(2, message.unpacked_sfixed64_size());
-  ASSERT_EQ(2, message.unpacked_float_size());
-  ASSERT_EQ(2, message.unpacked_double_size());
-  ASSERT_EQ(2, message.unpacked_bool_size());
-  ASSERT_EQ(2, message.unpacked_enum_size());
-
-  EXPECT_EQ(601, message.unpacked_int32(0));
-  EXPECT_EQ(602, message.unpacked_int64(0));
-  EXPECT_EQ(603, message.unpacked_uint32(0));
-  EXPECT_EQ(604, message.unpacked_uint64(0));
-  EXPECT_EQ(605, message.unpacked_sint32(0));
-  EXPECT_EQ(606, message.unpacked_sint64(0));
-  EXPECT_EQ(607, message.unpacked_fixed32(0));
-  EXPECT_EQ(608, message.unpacked_fixed64(0));
-  EXPECT_EQ(609, message.unpacked_sfixed32(0));
-  EXPECT_EQ(610, message.unpacked_sfixed64(0));
-  EXPECT_EQ(611, message.unpacked_float(0));
-  EXPECT_EQ(612, message.unpacked_double(0));
-  EXPECT_TRUE(message.unpacked_bool(0));
-  EXPECT_EQ(UNITTEST::FOREIGN_BAR, message.unpacked_enum(0));
-
-  EXPECT_EQ(701, message.unpacked_int32(1));
-  EXPECT_EQ(702, message.unpacked_int64(1));
-  EXPECT_EQ(703, message.unpacked_uint32(1));
-  EXPECT_EQ(704, message.unpacked_uint64(1));
-  EXPECT_EQ(705, message.unpacked_sint32(1));
-  EXPECT_EQ(706, message.unpacked_sint64(1));
-  EXPECT_EQ(707, message.unpacked_fixed32(1));
-  EXPECT_EQ(708, message.unpacked_fixed64(1));
-  EXPECT_EQ(709, message.unpacked_sfixed32(1));
-  EXPECT_EQ(710, message.unpacked_sfixed64(1));
-  EXPECT_EQ(711, message.unpacked_float(1));
-  EXPECT_EQ(712, message.unpacked_double(1));
-  EXPECT_FALSE(message.unpacked_bool(1));
-  EXPECT_EQ(UNITTEST::FOREIGN_BAZ, message.unpacked_enum(1));
-}
-
-// ===================================================================
-// Extensions
-//
-// All this code is exactly equivalent to the above code except that it's
-// manipulating extension fields instead of normal ones.
-
-inline void TestUtil::SetAllExtensions(UNITTEST::TestAllExtensions* message) {
-  message->SetExtension(UNITTEST::optional_int32_extension, 101);
-  message->SetExtension(UNITTEST::optional_int64_extension, 102);
-  message->SetExtension(UNITTEST::optional_uint32_extension, 103);
-  message->SetExtension(UNITTEST::optional_uint64_extension, 104);
-  message->SetExtension(UNITTEST::optional_sint32_extension, 105);
-  message->SetExtension(UNITTEST::optional_sint64_extension, 106);
-  message->SetExtension(UNITTEST::optional_fixed32_extension, 107);
-  message->SetExtension(UNITTEST::optional_fixed64_extension, 108);
-  message->SetExtension(UNITTEST::optional_sfixed32_extension, 109);
-  message->SetExtension(UNITTEST::optional_sfixed64_extension, 110);
-  message->SetExtension(UNITTEST::optional_float_extension, 111);
-  message->SetExtension(UNITTEST::optional_double_extension, 112);
-  message->SetExtension(UNITTEST::optional_bool_extension, true);
-  message->SetExtension(UNITTEST::optional_string_extension, "115");
-  message->SetExtension(UNITTEST::optional_bytes_extension, "116");
-
-  message->MutableExtension(UNITTEST::optionalgroup_extension)->set_a(117);
-  message->MutableExtension(UNITTEST::optional_nested_message_extension)
-      ->set_bb(118);
-  message->MutableExtension(UNITTEST::optional_foreign_message_extension)
-      ->set_c(119);
-  message->MutableExtension(UNITTEST::optional_import_message_extension)
-      ->set_d(120);
-
-  message->SetExtension(UNITTEST::optional_nested_enum_extension,
-                        UNITTEST::TestAllTypes::BAZ);
-  message->SetExtension(UNITTEST::optional_foreign_enum_extension,
-                        UNITTEST::FOREIGN_BAZ);
-  message->SetExtension(UNITTEST::optional_import_enum_extension,
-                        UNITTEST_IMPORT::IMPORT_BAZ);
-
-  message->SetExtension(UNITTEST::optional_string_piece_extension, "124");
-  message->SetExtension(UNITTEST::optional_cord_extension, "125");
-
-  message->MutableExtension(UNITTEST::optional_public_import_message_extension)
-      ->set_e(126);
-  message->MutableExtension(UNITTEST::optional_lazy_message_extension)
-      ->set_bb(127);
-  message
-      ->MutableExtension(UNITTEST::optional_unverified_lazy_message_extension)
-      ->set_bb(128);
-
-  // -----------------------------------------------------------------
-
-  message->AddExtension(UNITTEST::repeated_int32_extension, 201);
-  message->AddExtension(UNITTEST::repeated_int64_extension, 202);
-  message->AddExtension(UNITTEST::repeated_uint32_extension, 203);
-  message->AddExtension(UNITTEST::repeated_uint64_extension, 204);
-  message->AddExtension(UNITTEST::repeated_sint32_extension, 205);
-  message->AddExtension(UNITTEST::repeated_sint64_extension, 206);
-  message->AddExtension(UNITTEST::repeated_fixed32_extension, 207);
-  message->AddExtension(UNITTEST::repeated_fixed64_extension, 208);
-  message->AddExtension(UNITTEST::repeated_sfixed32_extension, 209);
-  message->AddExtension(UNITTEST::repeated_sfixed64_extension, 210);
-  message->AddExtension(UNITTEST::repeated_float_extension, 211);
-  message->AddExtension(UNITTEST::repeated_double_extension, 212);
-  message->AddExtension(UNITTEST::repeated_bool_extension, true);
-  message->AddExtension(UNITTEST::repeated_string_extension, "215");
-  message->AddExtension(UNITTEST::repeated_bytes_extension, "216");
-
-  message->AddExtension(UNITTEST::repeatedgroup_extension)->set_a(217);
-  message->AddExtension(UNITTEST::repeated_nested_message_extension)
-      ->set_bb(218);
-  message->AddExtension(UNITTEST::repeated_foreign_message_extension)
-      ->set_c(219);
-  message->AddExtension(UNITTEST::repeated_import_message_extension)
-      ->set_d(220);
-  message->AddExtension(UNITTEST::repeated_lazy_message_extension)->set_bb(227);
-
-  message->AddExtension(UNITTEST::repeated_nested_enum_extension,
-                        UNITTEST::TestAllTypes::BAR);
-  message->AddExtension(UNITTEST::repeated_foreign_enum_extension,
-                        UNITTEST::FOREIGN_BAR);
-  message->AddExtension(UNITTEST::repeated_import_enum_extension,
-                        UNITTEST_IMPORT::IMPORT_BAR);
-
-  message->AddExtension(UNITTEST::repeated_string_piece_extension, "224");
-  message->AddExtension(UNITTEST::repeated_cord_extension, "225");
-
-  // Add a second one of each field.
-  message->AddExtension(UNITTEST::repeated_int32_extension, 301);
-  message->AddExtension(UNITTEST::repeated_int64_extension, 302);
-  message->AddExtension(UNITTEST::repeated_uint32_extension, 303);
-  message->AddExtension(UNITTEST::repeated_uint64_extension, 304);
-  message->AddExtension(UNITTEST::repeated_sint32_extension, 305);
-  message->AddExtension(UNITTEST::repeated_sint64_extension, 306);
-  message->AddExtension(UNITTEST::repeated_fixed32_extension, 307);
-  message->AddExtension(UNITTEST::repeated_fixed64_extension, 308);
-  message->AddExtension(UNITTEST::repeated_sfixed32_extension, 309);
-  message->AddExtension(UNITTEST::repeated_sfixed64_extension, 310);
-  message->AddExtension(UNITTEST::repeated_float_extension, 311);
-  message->AddExtension(UNITTEST::repeated_double_extension, 312);
-  message->AddExtension(UNITTEST::repeated_bool_extension, false);
-  message->AddExtension(UNITTEST::repeated_string_extension, "315");
-  message->AddExtension(UNITTEST::repeated_bytes_extension, "316");
-
-  message->AddExtension(UNITTEST::repeatedgroup_extension)->set_a(317);
-  message->AddExtension(UNITTEST::repeated_nested_message_extension)
-      ->set_bb(318);
-  message->AddExtension(UNITTEST::repeated_foreign_message_extension)
-      ->set_c(319);
-  message->AddExtension(UNITTEST::repeated_import_message_extension)
-      ->set_d(320);
-  message->AddExtension(UNITTEST::repeated_lazy_message_extension)->set_bb(327);
-
-  message->AddExtension(UNITTEST::repeated_nested_enum_extension,
-                        UNITTEST::TestAllTypes::BAZ);
-  message->AddExtension(UNITTEST::repeated_foreign_enum_extension,
-                        UNITTEST::FOREIGN_BAZ);
-  message->AddExtension(UNITTEST::repeated_import_enum_extension,
-                        UNITTEST_IMPORT::IMPORT_BAZ);
-
-  message->AddExtension(UNITTEST::repeated_string_piece_extension, "324");
-  message->AddExtension(UNITTEST::repeated_cord_extension, "325");
-
-  // -----------------------------------------------------------------
-
-  message->SetExtension(UNITTEST::default_int32_extension, 401);
-  message->SetExtension(UNITTEST::default_int64_extension, 402);
-  message->SetExtension(UNITTEST::default_uint32_extension, 403);
-  message->SetExtension(UNITTEST::default_uint64_extension, 404);
-  message->SetExtension(UNITTEST::default_sint32_extension, 405);
-  message->SetExtension(UNITTEST::default_sint64_extension, 406);
-  message->SetExtension(UNITTEST::default_fixed32_extension, 407);
-  message->SetExtension(UNITTEST::default_fixed64_extension, 408);
-  message->SetExtension(UNITTEST::default_sfixed32_extension, 409);
-  message->SetExtension(UNITTEST::default_sfixed64_extension, 410);
-  message->SetExtension(UNITTEST::default_float_extension, 411);
-  message->SetExtension(UNITTEST::default_double_extension, 412);
-  message->SetExtension(UNITTEST::default_bool_extension, false);
-  message->SetExtension(UNITTEST::default_string_extension, "415");
-  message->SetExtension(UNITTEST::default_bytes_extension, "416");
-
-  message->SetExtension(UNITTEST::default_nested_enum_extension,
-                        UNITTEST::TestAllTypes::FOO);
-  message->SetExtension(UNITTEST::default_foreign_enum_extension,
-                        UNITTEST::FOREIGN_FOO);
-  message->SetExtension(UNITTEST::default_import_enum_extension,
-                        UNITTEST_IMPORT::IMPORT_FOO);
-
-  message->SetExtension(UNITTEST::default_string_piece_extension, "424");
-  message->SetExtension(UNITTEST::default_cord_extension, "425");
-
-  SetOneofFields(message);
-}
-
-inline void TestUtil::SetOneofFields(UNITTEST::TestAllExtensions* message) {
-  message->SetExtension(UNITTEST::oneof_uint32_extension, 601);
-  message->MutableExtension(UNITTEST::oneof_nested_message_extension)
-      ->set_bb(602);
-  message->SetExtension(UNITTEST::oneof_string_extension, "603");
-  message->SetExtension(UNITTEST::oneof_bytes_extension, "604");
-}
-
-// -------------------------------------------------------------------
-
-inline void TestUtil::SetAllFieldsAndExtensions(
-    UNITTEST::TestFieldOrderings* message) {
-  GOOGLE_CHECK(message);
-  message->set_my_int(1);
-  message->set_my_string("foo");
-  message->set_my_float(1.0);
-  message->SetExtension(UNITTEST::my_extension_int, 23);
-  message->SetExtension(UNITTEST::my_extension_string, "bar");
-}
-
-// -------------------------------------------------------------------
-
-inline void TestUtil::ModifyRepeatedExtensions(
-    UNITTEST::TestAllExtensions* message) {
-  message->SetExtension(UNITTEST::repeated_int32_extension, 1, 501);
-  message->SetExtension(UNITTEST::repeated_int64_extension, 1, 502);
-  message->SetExtension(UNITTEST::repeated_uint32_extension, 1, 503);
-  message->SetExtension(UNITTEST::repeated_uint64_extension, 1, 504);
-  message->SetExtension(UNITTEST::repeated_sint32_extension, 1, 505);
-  message->SetExtension(UNITTEST::repeated_sint64_extension, 1, 506);
-  message->SetExtension(UNITTEST::repeated_fixed32_extension, 1, 507);
-  message->SetExtension(UNITTEST::repeated_fixed64_extension, 1, 508);
-  message->SetExtension(UNITTEST::repeated_sfixed32_extension, 1, 509);
-  message->SetExtension(UNITTEST::repeated_sfixed64_extension, 1, 510);
-  message->SetExtension(UNITTEST::repeated_float_extension, 1, 511);
-  message->SetExtension(UNITTEST::repeated_double_extension, 1, 512);
-  message->SetExtension(UNITTEST::repeated_bool_extension, 1, true);
-  message->SetExtension(UNITTEST::repeated_string_extension, 1, "515");
-  message->SetExtension(UNITTEST::repeated_bytes_extension, 1, "516");
-
-  message->MutableExtension(UNITTEST::repeatedgroup_extension, 1)->set_a(517);
-  message->MutableExtension(UNITTEST::repeated_nested_message_extension, 1)
-      ->set_bb(518);
-  message->MutableExtension(UNITTEST::repeated_foreign_message_extension, 1)
-      ->set_c(519);
-  message->MutableExtension(UNITTEST::repeated_import_message_extension, 1)
-      ->set_d(520);
-  message->MutableExtension(UNITTEST::repeated_lazy_message_extension, 1)
-      ->set_bb(527);
-
-  message->SetExtension(UNITTEST::repeated_nested_enum_extension, 1,
-                        UNITTEST::TestAllTypes::FOO);
-  message->SetExtension(UNITTEST::repeated_foreign_enum_extension, 1,
-                        UNITTEST::FOREIGN_FOO);
-  message->SetExtension(UNITTEST::repeated_import_enum_extension, 1,
-                        UNITTEST_IMPORT::IMPORT_FOO);
-
-  message->SetExtension(UNITTEST::repeated_string_piece_extension, 1, "524");
-  message->SetExtension(UNITTEST::repeated_cord_extension, 1, "525");
-}
-
-// -------------------------------------------------------------------
-
-inline void TestUtil::ExpectAllExtensionsSet(
-    const UNITTEST::TestAllExtensions& message) {
-  EXPECT_TRUE(message.HasExtension(UNITTEST::optional_int32_extension));
-  EXPECT_TRUE(message.HasExtension(UNITTEST::optional_int64_extension));
-  EXPECT_TRUE(message.HasExtension(UNITTEST::optional_uint32_extension));
-  EXPECT_TRUE(message.HasExtension(UNITTEST::optional_uint64_extension));
-  EXPECT_TRUE(message.HasExtension(UNITTEST::optional_sint32_extension));
-  EXPECT_TRUE(message.HasExtension(UNITTEST::optional_sint64_extension));
-  EXPECT_TRUE(message.HasExtension(UNITTEST::optional_fixed32_extension));
-  EXPECT_TRUE(message.HasExtension(UNITTEST::optional_fixed64_extension));
-  EXPECT_TRUE(message.HasExtension(UNITTEST::optional_sfixed32_extension));
-  EXPECT_TRUE(message.HasExtension(UNITTEST::optional_sfixed64_extension));
-  EXPECT_TRUE(message.HasExtension(UNITTEST::optional_float_extension));
-  EXPECT_TRUE(message.HasExtension(UNITTEST::optional_double_extension));
-  EXPECT_TRUE(message.HasExtension(UNITTEST::optional_bool_extension));
-  EXPECT_TRUE(message.HasExtension(UNITTEST::optional_string_extension));
-  EXPECT_TRUE(message.HasExtension(UNITTEST::optional_bytes_extension));
-
-  EXPECT_TRUE(message.HasExtension(UNITTEST::optionalgroup_extension));
-  EXPECT_TRUE(
-      message.HasExtension(UNITTEST::optional_nested_message_extension));
-  EXPECT_TRUE(
-      message.HasExtension(UNITTEST::optional_foreign_message_extension));
-  EXPECT_TRUE(
-      message.HasExtension(UNITTEST::optional_import_message_extension));
-  EXPECT_TRUE(
-      message.HasExtension(UNITTEST::optional_public_import_message_extension));
-  EXPECT_TRUE(message.HasExtension(UNITTEST::optional_lazy_message_extension));
-  EXPECT_TRUE(message.HasExtension(
-      UNITTEST::optional_unverified_lazy_message_extension));
-
-  EXPECT_TRUE(message.GetExtension(UNITTEST::optionalgroup_extension).has_a());
-  EXPECT_TRUE(message.GetExtension(UNITTEST::optional_nested_message_extension)
-                  .has_bb());
-  EXPECT_TRUE(message.GetExtension(UNITTEST::optional_foreign_message_extension)
-                  .has_c());
-  EXPECT_TRUE(message.GetExtension(UNITTEST::optional_import_message_extension)
-                  .has_d());
-  EXPECT_TRUE(
-      message.GetExtension(UNITTEST::optional_public_import_message_extension)
-          .has_e());
-  EXPECT_TRUE(
-      message.GetExtension(UNITTEST::optional_lazy_message_extension).has_bb());
-  EXPECT_TRUE(
-      message.GetExtension(UNITTEST::optional_unverified_lazy_message_extension)
-          .has_bb());
-
-  EXPECT_TRUE(message.HasExtension(UNITTEST::optional_nested_enum_extension));
-  EXPECT_TRUE(message.HasExtension(UNITTEST::optional_foreign_enum_extension));
-  EXPECT_TRUE(message.HasExtension(UNITTEST::optional_import_enum_extension));
-
-  EXPECT_TRUE(message.HasExtension(UNITTEST::optional_string_piece_extension));
-  EXPECT_TRUE(message.HasExtension(UNITTEST::optional_cord_extension));
-
-  EXPECT_EQ(101, message.GetExtension(UNITTEST::optional_int32_extension));
-  EXPECT_EQ(102, message.GetExtension(UNITTEST::optional_int64_extension));
-  EXPECT_EQ(103, message.GetExtension(UNITTEST::optional_uint32_extension));
-  EXPECT_EQ(104, message.GetExtension(UNITTEST::optional_uint64_extension));
-  EXPECT_EQ(105, message.GetExtension(UNITTEST::optional_sint32_extension));
-  EXPECT_EQ(106, message.GetExtension(UNITTEST::optional_sint64_extension));
-  EXPECT_EQ(107, message.GetExtension(UNITTEST::optional_fixed32_extension));
-  EXPECT_EQ(108, message.GetExtension(UNITTEST::optional_fixed64_extension));
-  EXPECT_EQ(109, message.GetExtension(UNITTEST::optional_sfixed32_extension));
-  EXPECT_EQ(110, message.GetExtension(UNITTEST::optional_sfixed64_extension));
-  EXPECT_EQ(111, message.GetExtension(UNITTEST::optional_float_extension));
-  EXPECT_EQ(112, message.GetExtension(UNITTEST::optional_double_extension));
-  EXPECT_TRUE(message.GetExtension(UNITTEST::optional_bool_extension));
-  EXPECT_EQ("115", message.GetExtension(UNITTEST::optional_string_extension));
-  EXPECT_EQ("116", message.GetExtension(UNITTEST::optional_bytes_extension));
-
-  EXPECT_EQ(117, message.GetExtension(UNITTEST::optionalgroup_extension).a());
-  EXPECT_EQ(
-      118,
-      message.GetExtension(UNITTEST::optional_nested_message_extension).bb());
-  EXPECT_EQ(
-      119,
-      message.GetExtension(UNITTEST::optional_foreign_message_extension).c());
-  EXPECT_EQ(
-      120,
-      message.GetExtension(UNITTEST::optional_import_message_extension).d());
-
-  EXPECT_EQ(UNITTEST::TestAllTypes::BAZ,
-            message.GetExtension(UNITTEST::optional_nested_enum_extension));
-  EXPECT_EQ(UNITTEST::FOREIGN_BAZ,
-            message.GetExtension(UNITTEST::optional_foreign_enum_extension));
-  EXPECT_EQ(UNITTEST_IMPORT::IMPORT_BAZ,
-            message.GetExtension(UNITTEST::optional_import_enum_extension));
-
-  EXPECT_EQ("124",
-            message.GetExtension(UNITTEST::optional_string_piece_extension));
-  EXPECT_EQ("125", message.GetExtension(UNITTEST::optional_cord_extension));
-  EXPECT_EQ(
-      126,
-      message.GetExtension(UNITTEST::optional_public_import_message_extension)
-          .e());
-  EXPECT_EQ(
-      127,
-      message.GetExtension(UNITTEST::optional_lazy_message_extension).bb());
-  EXPECT_EQ(
-      128,
-      message.GetExtension(UNITTEST::optional_unverified_lazy_message_extension)
-          .bb());
-
-  // -----------------------------------------------------------------
-
-  ASSERT_EQ(2, message.ExtensionSize(UNITTEST::repeated_int32_extension));
-  ASSERT_EQ(2, message.ExtensionSize(UNITTEST::repeated_int64_extension));
-  ASSERT_EQ(2, message.ExtensionSize(UNITTEST::repeated_uint32_extension));
-  ASSERT_EQ(2, message.ExtensionSize(UNITTEST::repeated_uint64_extension));
-  ASSERT_EQ(2, message.ExtensionSize(UNITTEST::repeated_sint32_extension));
-  ASSERT_EQ(2, message.ExtensionSize(UNITTEST::repeated_sint64_extension));
-  ASSERT_EQ(2, message.ExtensionSize(UNITTEST::repeated_fixed32_extension));
-  ASSERT_EQ(2, message.ExtensionSize(UNITTEST::repeated_fixed64_extension));
-  ASSERT_EQ(2, message.ExtensionSize(UNITTEST::repeated_sfixed32_extension));
-  ASSERT_EQ(2, message.ExtensionSize(UNITTEST::repeated_sfixed64_extension));
-  ASSERT_EQ(2, message.ExtensionSize(UNITTEST::repeated_float_extension));
-  ASSERT_EQ(2, message.ExtensionSize(UNITTEST::repeated_double_extension));
-  ASSERT_EQ(2, message.ExtensionSize(UNITTEST::repeated_bool_extension));
-  ASSERT_EQ(2, message.ExtensionSize(UNITTEST::repeated_string_extension));
-  ASSERT_EQ(2, message.ExtensionSize(UNITTEST::repeated_bytes_extension));
-
-  ASSERT_EQ(2, message.ExtensionSize(UNITTEST::repeatedgroup_extension));
-  ASSERT_EQ(2,
-            message.ExtensionSize(UNITTEST::repeated_nested_message_extension));
-  ASSERT_EQ(
-      2, message.ExtensionSize(UNITTEST::repeated_foreign_message_extension));
-  ASSERT_EQ(2,
-            message.ExtensionSize(UNITTEST::repeated_import_message_extension));
-  ASSERT_EQ(2,
-            message.ExtensionSize(UNITTEST::repeated_lazy_message_extension));
-  ASSERT_EQ(2, message.ExtensionSize(UNITTEST::repeated_nested_enum_extension));
-  ASSERT_EQ(2,
-            message.ExtensionSize(UNITTEST::repeated_foreign_enum_extension));
-  ASSERT_EQ(2, message.ExtensionSize(UNITTEST::repeated_import_enum_extension));
-
-  ASSERT_EQ(2,
-            message.ExtensionSize(UNITTEST::repeated_string_piece_extension));
-  ASSERT_EQ(2, message.ExtensionSize(UNITTEST::repeated_cord_extension));
-
-  EXPECT_EQ(201, message.GetExtension(UNITTEST::repeated_int32_extension, 0));
-  EXPECT_EQ(202, message.GetExtension(UNITTEST::repeated_int64_extension, 0));
-  EXPECT_EQ(203, message.GetExtension(UNITTEST::repeated_uint32_extension, 0));
-  EXPECT_EQ(204, message.GetExtension(UNITTEST::repeated_uint64_extension, 0));
-  EXPECT_EQ(205, message.GetExtension(UNITTEST::repeated_sint32_extension, 0));
-  EXPECT_EQ(206, message.GetExtension(UNITTEST::repeated_sint64_extension, 0));
-  EXPECT_EQ(207, message.GetExtension(UNITTEST::repeated_fixed32_extension, 0));
-  EXPECT_EQ(208, message.GetExtension(UNITTEST::repeated_fixed64_extension, 0));
-  EXPECT_EQ(209,
-            message.GetExtension(UNITTEST::repeated_sfixed32_extension, 0));
-  EXPECT_EQ(210,
-            message.GetExtension(UNITTEST::repeated_sfixed64_extension, 0));
-  EXPECT_EQ(211, message.GetExtension(UNITTEST::repeated_float_extension, 0));
-  EXPECT_EQ(212, message.GetExtension(UNITTEST::repeated_double_extension, 0));
-  EXPECT_TRUE(message.GetExtension(UNITTEST::repeated_bool_extension, 0));
-  EXPECT_EQ("215",
-            message.GetExtension(UNITTEST::repeated_string_extension, 0));
-  EXPECT_EQ("216", message.GetExtension(UNITTEST::repeated_bytes_extension, 0));
-
-  EXPECT_EQ(217,
-            message.GetExtension(UNITTEST::repeatedgroup_extension, 0).a());
-  EXPECT_EQ(218,
-            message.GetExtension(UNITTEST::repeated_nested_message_extension, 0)
-                .bb());
-  EXPECT_EQ(
-      219, message.GetExtension(UNITTEST::repeated_foreign_message_extension, 0)
-               .c());
-  EXPECT_EQ(
-      220,
-      message.GetExtension(UNITTEST::repeated_import_message_extension, 0).d());
-  EXPECT_EQ(
-      227,
-      message.GetExtension(UNITTEST::repeated_lazy_message_extension, 0).bb());
-
-  EXPECT_EQ(UNITTEST::TestAllTypes::BAR,
-            message.GetExtension(UNITTEST::repeated_nested_enum_extension, 0));
-  EXPECT_EQ(UNITTEST::FOREIGN_BAR,
-            message.GetExtension(UNITTEST::repeated_foreign_enum_extension, 0));
-  EXPECT_EQ(UNITTEST_IMPORT::IMPORT_BAR,
-            message.GetExtension(UNITTEST::repeated_import_enum_extension, 0));
-
-  EXPECT_EQ("224",
-            message.GetExtension(UNITTEST::repeated_string_piece_extension, 0));
-  EXPECT_EQ("225", message.GetExtension(UNITTEST::repeated_cord_extension, 0));
-
-  EXPECT_EQ(301, message.GetExtension(UNITTEST::repeated_int32_extension, 1));
-  EXPECT_EQ(302, message.GetExtension(UNITTEST::repeated_int64_extension, 1));
-  EXPECT_EQ(303, message.GetExtension(UNITTEST::repeated_uint32_extension, 1));
-  EXPECT_EQ(304, message.GetExtension(UNITTEST::repeated_uint64_extension, 1));
-  EXPECT_EQ(305, message.GetExtension(UNITTEST::repeated_sint32_extension, 1));
-  EXPECT_EQ(306, message.GetExtension(UNITTEST::repeated_sint64_extension, 1));
-  EXPECT_EQ(307, message.GetExtension(UNITTEST::repeated_fixed32_extension, 1));
-  EXPECT_EQ(308, message.GetExtension(UNITTEST::repeated_fixed64_extension, 1));
-  EXPECT_EQ(309,
-            message.GetExtension(UNITTEST::repeated_sfixed32_extension, 1));
-  EXPECT_EQ(310,
-            message.GetExtension(UNITTEST::repeated_sfixed64_extension, 1));
-  EXPECT_EQ(311, message.GetExtension(UNITTEST::repeated_float_extension, 1));
-  EXPECT_EQ(312, message.GetExtension(UNITTEST::repeated_double_extension, 1));
-  EXPECT_FALSE(message.GetExtension(UNITTEST::repeated_bool_extension, 1));
-  EXPECT_EQ("315",
-            message.GetExtension(UNITTEST::repeated_string_extension, 1));
-  EXPECT_EQ("316", message.GetExtension(UNITTEST::repeated_bytes_extension, 1));
-
-  EXPECT_EQ(317,
-            message.GetExtension(UNITTEST::repeatedgroup_extension, 1).a());
-  EXPECT_EQ(318,
-            message.GetExtension(UNITTEST::repeated_nested_message_extension, 1)
-                .bb());
-  EXPECT_EQ(
-      319, message.GetExtension(UNITTEST::repeated_foreign_message_extension, 1)
-               .c());
-  EXPECT_EQ(
-      320,
-      message.GetExtension(UNITTEST::repeated_import_message_extension, 1).d());
-  EXPECT_EQ(
-      327,
-      message.GetExtension(UNITTEST::repeated_lazy_message_extension, 1).bb());
-
-  EXPECT_EQ(UNITTEST::TestAllTypes::BAZ,
-            message.GetExtension(UNITTEST::repeated_nested_enum_extension, 1));
-  EXPECT_EQ(UNITTEST::FOREIGN_BAZ,
-            message.GetExtension(UNITTEST::repeated_foreign_enum_extension, 1));
-  EXPECT_EQ(UNITTEST_IMPORT::IMPORT_BAZ,
-            message.GetExtension(UNITTEST::repeated_import_enum_extension, 1));
-
-  EXPECT_EQ("324",
-            message.GetExtension(UNITTEST::repeated_string_piece_extension, 1));
-  EXPECT_EQ("325", message.GetExtension(UNITTEST::repeated_cord_extension, 1));
-
-  // -----------------------------------------------------------------
-
-  EXPECT_TRUE(message.HasExtension(UNITTEST::default_int32_extension));
-  EXPECT_TRUE(message.HasExtension(UNITTEST::default_int64_extension));
-  EXPECT_TRUE(message.HasExtension(UNITTEST::default_uint32_extension));
-  EXPECT_TRUE(message.HasExtension(UNITTEST::default_uint64_extension));
-  EXPECT_TRUE(message.HasExtension(UNITTEST::default_sint32_extension));
-  EXPECT_TRUE(message.HasExtension(UNITTEST::default_sint64_extension));
-  EXPECT_TRUE(message.HasExtension(UNITTEST::default_fixed32_extension));
-  EXPECT_TRUE(message.HasExtension(UNITTEST::default_fixed64_extension));
-  EXPECT_TRUE(message.HasExtension(UNITTEST::default_sfixed32_extension));
-  EXPECT_TRUE(message.HasExtension(UNITTEST::default_sfixed64_extension));
-  EXPECT_TRUE(message.HasExtension(UNITTEST::default_float_extension));
-  EXPECT_TRUE(message.HasExtension(UNITTEST::default_double_extension));
-  EXPECT_TRUE(message.HasExtension(UNITTEST::default_bool_extension));
-  EXPECT_TRUE(message.HasExtension(UNITTEST::default_string_extension));
-  EXPECT_TRUE(message.HasExtension(UNITTEST::default_bytes_extension));
-
-  EXPECT_TRUE(message.HasExtension(UNITTEST::default_nested_enum_extension));
-  EXPECT_TRUE(message.HasExtension(UNITTEST::default_foreign_enum_extension));
-  EXPECT_TRUE(message.HasExtension(UNITTEST::default_import_enum_extension));
-
-  EXPECT_TRUE(message.HasExtension(UNITTEST::default_string_piece_extension));
-  EXPECT_TRUE(message.HasExtension(UNITTEST::default_cord_extension));
-
-  EXPECT_EQ(401, message.GetExtension(UNITTEST::default_int32_extension));
-  EXPECT_EQ(402, message.GetExtension(UNITTEST::default_int64_extension));
-  EXPECT_EQ(403, message.GetExtension(UNITTEST::default_uint32_extension));
-  EXPECT_EQ(404, message.GetExtension(UNITTEST::default_uint64_extension));
-  EXPECT_EQ(405, message.GetExtension(UNITTEST::default_sint32_extension));
-  EXPECT_EQ(406, message.GetExtension(UNITTEST::default_sint64_extension));
-  EXPECT_EQ(407, message.GetExtension(UNITTEST::default_fixed32_extension));
-  EXPECT_EQ(408, message.GetExtension(UNITTEST::default_fixed64_extension));
-  EXPECT_EQ(409, message.GetExtension(UNITTEST::default_sfixed32_extension));
-  EXPECT_EQ(410, message.GetExtension(UNITTEST::default_sfixed64_extension));
-  EXPECT_EQ(411, message.GetExtension(UNITTEST::default_float_extension));
-  EXPECT_EQ(412, message.GetExtension(UNITTEST::default_double_extension));
-  EXPECT_FALSE(message.GetExtension(UNITTEST::default_bool_extension));
-  EXPECT_EQ("415", message.GetExtension(UNITTEST::default_string_extension));
-  EXPECT_EQ("416", message.GetExtension(UNITTEST::default_bytes_extension));
-
-  EXPECT_EQ(UNITTEST::TestAllTypes::FOO,
-            message.GetExtension(UNITTEST::default_nested_enum_extension));
-  EXPECT_EQ(UNITTEST::FOREIGN_FOO,
-            message.GetExtension(UNITTEST::default_foreign_enum_extension));
-  EXPECT_EQ(UNITTEST_IMPORT::IMPORT_FOO,
-            message.GetExtension(UNITTEST::default_import_enum_extension));
-
-  EXPECT_EQ("424",
-            message.GetExtension(UNITTEST::default_string_piece_extension));
-  EXPECT_EQ("425", message.GetExtension(UNITTEST::default_cord_extension));
-
-  EXPECT_TRUE(message.HasExtension(UNITTEST::oneof_uint32_extension));
-  EXPECT_TRUE(
-      message.GetExtension(UNITTEST::oneof_nested_message_extension).has_bb());
-  EXPECT_TRUE(message.HasExtension(UNITTEST::oneof_string_extension));
-  EXPECT_TRUE(message.HasExtension(UNITTEST::oneof_bytes_extension));
-
-  EXPECT_EQ(601, message.GetExtension(UNITTEST::oneof_uint32_extension));
-  EXPECT_EQ(
-      602, message.GetExtension(UNITTEST::oneof_nested_message_extension).bb());
-  EXPECT_EQ("603", message.GetExtension(UNITTEST::oneof_string_extension));
-  EXPECT_EQ("604", message.GetExtension(UNITTEST::oneof_bytes_extension));
-}
-
-// -------------------------------------------------------------------
-
-inline void TestUtil::ExpectExtensionsClear(
-    const UNITTEST::TestAllExtensions& message) {
-  std::string serialized;
-  ASSERT_TRUE(message.SerializeToString(&serialized));
-  EXPECT_EQ("", serialized);
-  EXPECT_EQ(0, message.ByteSizeLong());
-
-  // has_blah() should initially be false for all optional fields.
-  EXPECT_FALSE(message.HasExtension(UNITTEST::optional_int32_extension));
-  EXPECT_FALSE(message.HasExtension(UNITTEST::optional_int64_extension));
-  EXPECT_FALSE(message.HasExtension(UNITTEST::optional_uint32_extension));
-  EXPECT_FALSE(message.HasExtension(UNITTEST::optional_uint64_extension));
-  EXPECT_FALSE(message.HasExtension(UNITTEST::optional_sint32_extension));
-  EXPECT_FALSE(message.HasExtension(UNITTEST::optional_sint64_extension));
-  EXPECT_FALSE(message.HasExtension(UNITTEST::optional_fixed32_extension));
-  EXPECT_FALSE(message.HasExtension(UNITTEST::optional_fixed64_extension));
-  EXPECT_FALSE(message.HasExtension(UNITTEST::optional_sfixed32_extension));
-  EXPECT_FALSE(message.HasExtension(UNITTEST::optional_sfixed64_extension));
-  EXPECT_FALSE(message.HasExtension(UNITTEST::optional_float_extension));
-  EXPECT_FALSE(message.HasExtension(UNITTEST::optional_double_extension));
-  EXPECT_FALSE(message.HasExtension(UNITTEST::optional_bool_extension));
-  EXPECT_FALSE(message.HasExtension(UNITTEST::optional_string_extension));
-  EXPECT_FALSE(message.HasExtension(UNITTEST::optional_bytes_extension));
-
-  EXPECT_FALSE(message.HasExtension(UNITTEST::optionalgroup_extension));
-  EXPECT_FALSE(
-      message.HasExtension(UNITTEST::optional_nested_message_extension));
-  EXPECT_FALSE(
-      message.HasExtension(UNITTEST::optional_foreign_message_extension));
-  EXPECT_FALSE(
-      message.HasExtension(UNITTEST::optional_import_message_extension));
-  EXPECT_FALSE(
-      message.HasExtension(UNITTEST::optional_public_import_message_extension));
-  EXPECT_FALSE(message.HasExtension(UNITTEST::optional_lazy_message_extension));
-  EXPECT_FALSE(message.HasExtension(
-      UNITTEST::optional_unverified_lazy_message_extension));
-
-  EXPECT_FALSE(message.HasExtension(UNITTEST::optional_nested_enum_extension));
-  EXPECT_FALSE(message.HasExtension(UNITTEST::optional_foreign_enum_extension));
-  EXPECT_FALSE(message.HasExtension(UNITTEST::optional_import_enum_extension));
-
-  EXPECT_FALSE(message.HasExtension(UNITTEST::optional_string_piece_extension));
-  EXPECT_FALSE(message.HasExtension(UNITTEST::optional_cord_extension));
-
-  // Optional fields without defaults are set to zero or something like it.
-  EXPECT_EQ(0, message.GetExtension(UNITTEST::optional_int32_extension));
-  EXPECT_EQ(0, message.GetExtension(UNITTEST::optional_int64_extension));
-  EXPECT_EQ(0, message.GetExtension(UNITTEST::optional_uint32_extension));
-  EXPECT_EQ(0, message.GetExtension(UNITTEST::optional_uint64_extension));
-  EXPECT_EQ(0, message.GetExtension(UNITTEST::optional_sint32_extension));
-  EXPECT_EQ(0, message.GetExtension(UNITTEST::optional_sint64_extension));
-  EXPECT_EQ(0, message.GetExtension(UNITTEST::optional_fixed32_extension));
-  EXPECT_EQ(0, message.GetExtension(UNITTEST::optional_fixed64_extension));
-  EXPECT_EQ(0, message.GetExtension(UNITTEST::optional_sfixed32_extension));
-  EXPECT_EQ(0, message.GetExtension(UNITTEST::optional_sfixed64_extension));
-  EXPECT_EQ(0, message.GetExtension(UNITTEST::optional_float_extension));
-  EXPECT_EQ(0, message.GetExtension(UNITTEST::optional_double_extension));
-  EXPECT_FALSE(message.GetExtension(UNITTEST::optional_bool_extension));
-  EXPECT_EQ("", message.GetExtension(UNITTEST::optional_string_extension));
-  EXPECT_EQ("", message.GetExtension(UNITTEST::optional_bytes_extension));
-
-  // Embedded messages should also be clear.
-  EXPECT_FALSE(message.GetExtension(UNITTEST::optionalgroup_extension).has_a());
-  EXPECT_FALSE(message.GetExtension(UNITTEST::optional_nested_message_extension)
-                   .has_bb());
-  EXPECT_FALSE(
-      message.GetExtension(UNITTEST::optional_foreign_message_extension)
-          .has_c());
-  EXPECT_FALSE(message.GetExtension(UNITTEST::optional_import_message_extension)
-                   .has_d());
-  EXPECT_FALSE(
-      message.GetExtension(UNITTEST::optional_public_import_message_extension)
-          .has_e());
-  EXPECT_FALSE(
-      message.GetExtension(UNITTEST::optional_lazy_message_extension).has_bb());
-  EXPECT_FALSE(
-      message.GetExtension(UNITTEST::optional_unverified_lazy_message_extension)
-          .has_bb());
-
-  EXPECT_EQ(0, message.GetExtension(UNITTEST::optionalgroup_extension).a());
-  EXPECT_EQ(
-      0,
-      message.GetExtension(UNITTEST::optional_nested_message_extension).bb());
-  EXPECT_EQ(
-      0,
-      message.GetExtension(UNITTEST::optional_foreign_message_extension).c());
-  EXPECT_EQ(
-      0, message.GetExtension(UNITTEST::optional_import_message_extension).d());
-  EXPECT_EQ(
-      0,
-      message.GetExtension(UNITTEST::optional_public_import_message_extension)
-          .e());
-  EXPECT_EQ(
-      0, message.GetExtension(UNITTEST::optional_lazy_message_extension).bb());
-  EXPECT_EQ(
-      0,
-      message.GetExtension(UNITTEST::optional_unverified_lazy_message_extension)
-          .bb());
-
-  // Enums without defaults are set to the first value in the enum.
-  EXPECT_EQ(UNITTEST::TestAllTypes::FOO,
-            message.GetExtension(UNITTEST::optional_nested_enum_extension));
-  EXPECT_EQ(UNITTEST::FOREIGN_FOO,
-            message.GetExtension(UNITTEST::optional_foreign_enum_extension));
-  EXPECT_EQ(UNITTEST_IMPORT::IMPORT_FOO,
-            message.GetExtension(UNITTEST::optional_import_enum_extension));
-
-  EXPECT_EQ("",
-            message.GetExtension(UNITTEST::optional_string_piece_extension));
-  EXPECT_EQ("", message.GetExtension(UNITTEST::optional_cord_extension));
-
-  // Repeated fields are empty.
-  EXPECT_EQ(0, message.ExtensionSize(UNITTEST::repeated_int32_extension));
-  EXPECT_EQ(0, message.ExtensionSize(UNITTEST::repeated_int64_extension));
-  EXPECT_EQ(0, message.ExtensionSize(UNITTEST::repeated_uint32_extension));
-  EXPECT_EQ(0, message.ExtensionSize(UNITTEST::repeated_uint64_extension));
-  EXPECT_EQ(0, message.ExtensionSize(UNITTEST::repeated_sint32_extension));
-  EXPECT_EQ(0, message.ExtensionSize(UNITTEST::repeated_sint64_extension));
-  EXPECT_EQ(0, message.ExtensionSize(UNITTEST::repeated_fixed32_extension));
-  EXPECT_EQ(0, message.ExtensionSize(UNITTEST::repeated_fixed64_extension));
-  EXPECT_EQ(0, message.ExtensionSize(UNITTEST::repeated_sfixed32_extension));
-  EXPECT_EQ(0, message.ExtensionSize(UNITTEST::repeated_sfixed64_extension));
-  EXPECT_EQ(0, message.ExtensionSize(UNITTEST::repeated_float_extension));
-  EXPECT_EQ(0, message.ExtensionSize(UNITTEST::repeated_double_extension));
-  EXPECT_EQ(0, message.ExtensionSize(UNITTEST::repeated_bool_extension));
-  EXPECT_EQ(0, message.ExtensionSize(UNITTEST::repeated_string_extension));
-  EXPECT_EQ(0, message.ExtensionSize(UNITTEST::repeated_bytes_extension));
-
-  EXPECT_EQ(0, message.ExtensionSize(UNITTEST::repeatedgroup_extension));
-  EXPECT_EQ(0,
-            message.ExtensionSize(UNITTEST::repeated_nested_message_extension));
-  EXPECT_EQ(
-      0, message.ExtensionSize(UNITTEST::repeated_foreign_message_extension));
-  EXPECT_EQ(0,
-            message.ExtensionSize(UNITTEST::repeated_import_message_extension));
-  EXPECT_EQ(0,
-            message.ExtensionSize(UNITTEST::repeated_lazy_message_extension));
-  EXPECT_EQ(0, message.ExtensionSize(UNITTEST::repeated_nested_enum_extension));
-  EXPECT_EQ(0,
-            message.ExtensionSize(UNITTEST::repeated_foreign_enum_extension));
-  EXPECT_EQ(0, message.ExtensionSize(UNITTEST::repeated_import_enum_extension));
-
-  EXPECT_EQ(0,
-            message.ExtensionSize(UNITTEST::repeated_string_piece_extension));
-  EXPECT_EQ(0, message.ExtensionSize(UNITTEST::repeated_cord_extension));
-
-  // has_blah() should also be false for all default fields.
-  EXPECT_FALSE(message.HasExtension(UNITTEST::default_int32_extension));
-  EXPECT_FALSE(message.HasExtension(UNITTEST::default_int64_extension));
-  EXPECT_FALSE(message.HasExtension(UNITTEST::default_uint32_extension));
-  EXPECT_FALSE(message.HasExtension(UNITTEST::default_uint64_extension));
-  EXPECT_FALSE(message.HasExtension(UNITTEST::default_sint32_extension));
-  EXPECT_FALSE(message.HasExtension(UNITTEST::default_sint64_extension));
-  EXPECT_FALSE(message.HasExtension(UNITTEST::default_fixed32_extension));
-  EXPECT_FALSE(message.HasExtension(UNITTEST::default_fixed64_extension));
-  EXPECT_FALSE(message.HasExtension(UNITTEST::default_sfixed32_extension));
-  EXPECT_FALSE(message.HasExtension(UNITTEST::default_sfixed64_extension));
-  EXPECT_FALSE(message.HasExtension(UNITTEST::default_float_extension));
-  EXPECT_FALSE(message.HasExtension(UNITTEST::default_double_extension));
-  EXPECT_FALSE(message.HasExtension(UNITTEST::default_bool_extension));
-  EXPECT_FALSE(message.HasExtension(UNITTEST::default_string_extension));
-  EXPECT_FALSE(message.HasExtension(UNITTEST::default_bytes_extension));
-
-  EXPECT_FALSE(message.HasExtension(UNITTEST::default_nested_enum_extension));
-  EXPECT_FALSE(message.HasExtension(UNITTEST::default_foreign_enum_extension));
-  EXPECT_FALSE(message.HasExtension(UNITTEST::default_import_enum_extension));
-
-  EXPECT_FALSE(message.HasExtension(UNITTEST::default_string_piece_extension));
-  EXPECT_FALSE(message.HasExtension(UNITTEST::default_cord_extension));
-
-  // Fields with defaults have their default values (duh).
-  EXPECT_EQ(41, message.GetExtension(UNITTEST::default_int32_extension));
-  EXPECT_EQ(42, message.GetExtension(UNITTEST::default_int64_extension));
-  EXPECT_EQ(43, message.GetExtension(UNITTEST::default_uint32_extension));
-  EXPECT_EQ(44, message.GetExtension(UNITTEST::default_uint64_extension));
-  EXPECT_EQ(-45, message.GetExtension(UNITTEST::default_sint32_extension));
-  EXPECT_EQ(46, message.GetExtension(UNITTEST::default_sint64_extension));
-  EXPECT_EQ(47, message.GetExtension(UNITTEST::default_fixed32_extension));
-  EXPECT_EQ(48, message.GetExtension(UNITTEST::default_fixed64_extension));
-  EXPECT_EQ(49, message.GetExtension(UNITTEST::default_sfixed32_extension));
-  EXPECT_EQ(-50, message.GetExtension(UNITTEST::default_sfixed64_extension));
-  EXPECT_EQ(51.5, message.GetExtension(UNITTEST::default_float_extension));
-  EXPECT_EQ(52e3, message.GetExtension(UNITTEST::default_double_extension));
-  EXPECT_TRUE(message.GetExtension(UNITTEST::default_bool_extension));
-  EXPECT_EQ("hello", message.GetExtension(UNITTEST::default_string_extension));
-  EXPECT_EQ("world", message.GetExtension(UNITTEST::default_bytes_extension));
-
-  EXPECT_EQ(UNITTEST::TestAllTypes::BAR,
-            message.GetExtension(UNITTEST::default_nested_enum_extension));
-  EXPECT_EQ(UNITTEST::FOREIGN_BAR,
-            message.GetExtension(UNITTEST::default_foreign_enum_extension));
-  EXPECT_EQ(UNITTEST_IMPORT::IMPORT_BAR,
-            message.GetExtension(UNITTEST::default_import_enum_extension));
-
-  EXPECT_EQ("abc",
-            message.GetExtension(UNITTEST::default_string_piece_extension));
-  EXPECT_EQ("123", message.GetExtension(UNITTEST::default_cord_extension));
-
-  EXPECT_FALSE(message.HasExtension(UNITTEST::oneof_uint32_extension));
-  EXPECT_FALSE(
-      message.GetExtension(UNITTEST::oneof_nested_message_extension).has_bb());
-  EXPECT_FALSE(message.HasExtension(UNITTEST::oneof_string_extension));
-  EXPECT_FALSE(message.HasExtension(UNITTEST::oneof_bytes_extension));
-}
-
-// -------------------------------------------------------------------
-
-inline void TestUtil::ExpectRepeatedExtensionsModified(
-    const UNITTEST::TestAllExtensions& message) {
-  // ModifyRepeatedFields only sets the second repeated element of each
-  // field.  In addition to verifying this, we also verify that the first
-  // element and size were *not* modified.
-  ASSERT_EQ(2, message.ExtensionSize(UNITTEST::repeated_int32_extension));
-  ASSERT_EQ(2, message.ExtensionSize(UNITTEST::repeated_int64_extension));
-  ASSERT_EQ(2, message.ExtensionSize(UNITTEST::repeated_uint32_extension));
-  ASSERT_EQ(2, message.ExtensionSize(UNITTEST::repeated_uint64_extension));
-  ASSERT_EQ(2, message.ExtensionSize(UNITTEST::repeated_sint32_extension));
-  ASSERT_EQ(2, message.ExtensionSize(UNITTEST::repeated_sint64_extension));
-  ASSERT_EQ(2, message.ExtensionSize(UNITTEST::repeated_fixed32_extension));
-  ASSERT_EQ(2, message.ExtensionSize(UNITTEST::repeated_fixed64_extension));
-  ASSERT_EQ(2, message.ExtensionSize(UNITTEST::repeated_sfixed32_extension));
-  ASSERT_EQ(2, message.ExtensionSize(UNITTEST::repeated_sfixed64_extension));
-  ASSERT_EQ(2, message.ExtensionSize(UNITTEST::repeated_float_extension));
-  ASSERT_EQ(2, message.ExtensionSize(UNITTEST::repeated_double_extension));
-  ASSERT_EQ(2, message.ExtensionSize(UNITTEST::repeated_bool_extension));
-  ASSERT_EQ(2, message.ExtensionSize(UNITTEST::repeated_string_extension));
-  ASSERT_EQ(2, message.ExtensionSize(UNITTEST::repeated_bytes_extension));
-
-  ASSERT_EQ(2, message.ExtensionSize(UNITTEST::repeatedgroup_extension));
-  ASSERT_EQ(2,
-            message.ExtensionSize(UNITTEST::repeated_nested_message_extension));
-  ASSERT_EQ(
-      2, message.ExtensionSize(UNITTEST::repeated_foreign_message_extension));
-  ASSERT_EQ(2,
-            message.ExtensionSize(UNITTEST::repeated_import_message_extension));
-  ASSERT_EQ(2,
-            message.ExtensionSize(UNITTEST::repeated_lazy_message_extension));
-  ASSERT_EQ(2, message.ExtensionSize(UNITTEST::repeated_nested_enum_extension));
-  ASSERT_EQ(2,
-            message.ExtensionSize(UNITTEST::repeated_foreign_enum_extension));
-  ASSERT_EQ(2, message.ExtensionSize(UNITTEST::repeated_import_enum_extension));
-
-  ASSERT_EQ(2,
-            message.ExtensionSize(UNITTEST::repeated_string_piece_extension));
-  ASSERT_EQ(2, message.ExtensionSize(UNITTEST::repeated_cord_extension));
-
-  EXPECT_EQ(201, message.GetExtension(UNITTEST::repeated_int32_extension, 0));
-  EXPECT_EQ(202, message.GetExtension(UNITTEST::repeated_int64_extension, 0));
-  EXPECT_EQ(203, message.GetExtension(UNITTEST::repeated_uint32_extension, 0));
-  EXPECT_EQ(204, message.GetExtension(UNITTEST::repeated_uint64_extension, 0));
-  EXPECT_EQ(205, message.GetExtension(UNITTEST::repeated_sint32_extension, 0));
-  EXPECT_EQ(206, message.GetExtension(UNITTEST::repeated_sint64_extension, 0));
-  EXPECT_EQ(207, message.GetExtension(UNITTEST::repeated_fixed32_extension, 0));
-  EXPECT_EQ(208, message.GetExtension(UNITTEST::repeated_fixed64_extension, 0));
-  EXPECT_EQ(209,
-            message.GetExtension(UNITTEST::repeated_sfixed32_extension, 0));
-  EXPECT_EQ(210,
-            message.GetExtension(UNITTEST::repeated_sfixed64_extension, 0));
-  EXPECT_EQ(211, message.GetExtension(UNITTEST::repeated_float_extension, 0));
-  EXPECT_EQ(212, message.GetExtension(UNITTEST::repeated_double_extension, 0));
-  EXPECT_TRUE(message.GetExtension(UNITTEST::repeated_bool_extension, 0));
-  EXPECT_EQ("215",
-            message.GetExtension(UNITTEST::repeated_string_extension, 0));
-  EXPECT_EQ("216", message.GetExtension(UNITTEST::repeated_bytes_extension, 0));
-
-  EXPECT_EQ(217,
-            message.GetExtension(UNITTEST::repeatedgroup_extension, 0).a());
-  EXPECT_EQ(218,
-            message.GetExtension(UNITTEST::repeated_nested_message_extension, 0)
-                .bb());
-  EXPECT_EQ(
-      219, message.GetExtension(UNITTEST::repeated_foreign_message_extension, 0)
-               .c());
-  EXPECT_EQ(
-      220,
-      message.GetExtension(UNITTEST::repeated_import_message_extension, 0).d());
-  EXPECT_EQ(
-      227,
-      message.GetExtension(UNITTEST::repeated_lazy_message_extension, 0).bb());
-
-  EXPECT_EQ(UNITTEST::TestAllTypes::BAR,
-            message.GetExtension(UNITTEST::repeated_nested_enum_extension, 0));
-  EXPECT_EQ(UNITTEST::FOREIGN_BAR,
-            message.GetExtension(UNITTEST::repeated_foreign_enum_extension, 0));
-  EXPECT_EQ(UNITTEST_IMPORT::IMPORT_BAR,
-            message.GetExtension(UNITTEST::repeated_import_enum_extension, 0));
-
-  EXPECT_EQ("224",
-            message.GetExtension(UNITTEST::repeated_string_piece_extension, 0));
-  EXPECT_EQ("225", message.GetExtension(UNITTEST::repeated_cord_extension, 0));
-
-  // Actually verify the second (modified) elements now.
-  EXPECT_EQ(501, message.GetExtension(UNITTEST::repeated_int32_extension, 1));
-  EXPECT_EQ(502, message.GetExtension(UNITTEST::repeated_int64_extension, 1));
-  EXPECT_EQ(503, message.GetExtension(UNITTEST::repeated_uint32_extension, 1));
-  EXPECT_EQ(504, message.GetExtension(UNITTEST::repeated_uint64_extension, 1));
-  EXPECT_EQ(505, message.GetExtension(UNITTEST::repeated_sint32_extension, 1));
-  EXPECT_EQ(506, message.GetExtension(UNITTEST::repeated_sint64_extension, 1));
-  EXPECT_EQ(507, message.GetExtension(UNITTEST::repeated_fixed32_extension, 1));
-  EXPECT_EQ(508, message.GetExtension(UNITTEST::repeated_fixed64_extension, 1));
-  EXPECT_EQ(509,
-            message.GetExtension(UNITTEST::repeated_sfixed32_extension, 1));
-  EXPECT_EQ(510,
-            message.GetExtension(UNITTEST::repeated_sfixed64_extension, 1));
-  EXPECT_EQ(511, message.GetExtension(UNITTEST::repeated_float_extension, 1));
-  EXPECT_EQ(512, message.GetExtension(UNITTEST::repeated_double_extension, 1));
-  EXPECT_TRUE(message.GetExtension(UNITTEST::repeated_bool_extension, 1));
-  EXPECT_EQ("515",
-            message.GetExtension(UNITTEST::repeated_string_extension, 1));
-  EXPECT_EQ("516", message.GetExtension(UNITTEST::repeated_bytes_extension, 1));
-
-  EXPECT_EQ(517,
-            message.GetExtension(UNITTEST::repeatedgroup_extension, 1).a());
-  EXPECT_EQ(518,
-            message.GetExtension(UNITTEST::repeated_nested_message_extension, 1)
-                .bb());
-  EXPECT_EQ(
-      519, message.GetExtension(UNITTEST::repeated_foreign_message_extension, 1)
-               .c());
-  EXPECT_EQ(
-      520,
-      message.GetExtension(UNITTEST::repeated_import_message_extension, 1).d());
-  EXPECT_EQ(
-      527,
-      message.GetExtension(UNITTEST::repeated_lazy_message_extension, 1).bb());
-
-  EXPECT_EQ(UNITTEST::TestAllTypes::FOO,
-            message.GetExtension(UNITTEST::repeated_nested_enum_extension, 1));
-  EXPECT_EQ(UNITTEST::FOREIGN_FOO,
-            message.GetExtension(UNITTEST::repeated_foreign_enum_extension, 1));
-  EXPECT_EQ(UNITTEST_IMPORT::IMPORT_FOO,
-            message.GetExtension(UNITTEST::repeated_import_enum_extension, 1));
-
-  EXPECT_EQ("524",
-            message.GetExtension(UNITTEST::repeated_string_piece_extension, 1));
-  EXPECT_EQ("525", message.GetExtension(UNITTEST::repeated_cord_extension, 1));
-}
-
-// -------------------------------------------------------------------
-
-inline void TestUtil::SetPackedExtensions(
-    UNITTEST::TestPackedExtensions* message) {
-  message->AddExtension(UNITTEST::packed_int32_extension, 601);
-  message->AddExtension(UNITTEST::packed_int64_extension, 602);
-  message->AddExtension(UNITTEST::packed_uint32_extension, 603);
-  message->AddExtension(UNITTEST::packed_uint64_extension, 604);
-  message->AddExtension(UNITTEST::packed_sint32_extension, 605);
-  message->AddExtension(UNITTEST::packed_sint64_extension, 606);
-  message->AddExtension(UNITTEST::packed_fixed32_extension, 607);
-  message->AddExtension(UNITTEST::packed_fixed64_extension, 608);
-  message->AddExtension(UNITTEST::packed_sfixed32_extension, 609);
-  message->AddExtension(UNITTEST::packed_sfixed64_extension, 610);
-  message->AddExtension(UNITTEST::packed_float_extension, 611);
-  message->AddExtension(UNITTEST::packed_double_extension, 612);
-  message->AddExtension(UNITTEST::packed_bool_extension, true);
-  message->AddExtension(UNITTEST::packed_enum_extension, UNITTEST::FOREIGN_BAR);
-  // add a second one of each field
-  message->AddExtension(UNITTEST::packed_int32_extension, 701);
-  message->AddExtension(UNITTEST::packed_int64_extension, 702);
-  message->AddExtension(UNITTEST::packed_uint32_extension, 703);
-  message->AddExtension(UNITTEST::packed_uint64_extension, 704);
-  message->AddExtension(UNITTEST::packed_sint32_extension, 705);
-  message->AddExtension(UNITTEST::packed_sint64_extension, 706);
-  message->AddExtension(UNITTEST::packed_fixed32_extension, 707);
-  message->AddExtension(UNITTEST::packed_fixed64_extension, 708);
-  message->AddExtension(UNITTEST::packed_sfixed32_extension, 709);
-  message->AddExtension(UNITTEST::packed_sfixed64_extension, 710);
-  message->AddExtension(UNITTEST::packed_float_extension, 711);
-  message->AddExtension(UNITTEST::packed_double_extension, 712);
-  message->AddExtension(UNITTEST::packed_bool_extension, false);
-  message->AddExtension(UNITTEST::packed_enum_extension, UNITTEST::FOREIGN_BAZ);
-}
-
-// -------------------------------------------------------------------
-
-inline void TestUtil::ExpectPackedExtensionsSet(
-    const UNITTEST::TestPackedExtensions& message) {
-  ASSERT_EQ(2, message.ExtensionSize(UNITTEST::packed_int32_extension));
-  ASSERT_EQ(2, message.ExtensionSize(UNITTEST::packed_int64_extension));
-  ASSERT_EQ(2, message.ExtensionSize(UNITTEST::packed_uint32_extension));
-  ASSERT_EQ(2, message.ExtensionSize(UNITTEST::packed_uint64_extension));
-  ASSERT_EQ(2, message.ExtensionSize(UNITTEST::packed_sint32_extension));
-  ASSERT_EQ(2, message.ExtensionSize(UNITTEST::packed_sint64_extension));
-  ASSERT_EQ(2, message.ExtensionSize(UNITTEST::packed_fixed32_extension));
-  ASSERT_EQ(2, message.ExtensionSize(UNITTEST::packed_fixed64_extension));
-  ASSERT_EQ(2, message.ExtensionSize(UNITTEST::packed_sfixed32_extension));
-  ASSERT_EQ(2, message.ExtensionSize(UNITTEST::packed_sfixed64_extension));
-  ASSERT_EQ(2, message.ExtensionSize(UNITTEST::packed_float_extension));
-  ASSERT_EQ(2, message.ExtensionSize(UNITTEST::packed_double_extension));
-  ASSERT_EQ(2, message.ExtensionSize(UNITTEST::packed_bool_extension));
-  ASSERT_EQ(2, message.ExtensionSize(UNITTEST::packed_enum_extension));
-
-  EXPECT_EQ(601, message.GetExtension(UNITTEST::packed_int32_extension, 0));
-  EXPECT_EQ(602, message.GetExtension(UNITTEST::packed_int64_extension, 0));
-  EXPECT_EQ(603, message.GetExtension(UNITTEST::packed_uint32_extension, 0));
-  EXPECT_EQ(604, message.GetExtension(UNITTEST::packed_uint64_extension, 0));
-  EXPECT_EQ(605, message.GetExtension(UNITTEST::packed_sint32_extension, 0));
-  EXPECT_EQ(606, message.GetExtension(UNITTEST::packed_sint64_extension, 0));
-  EXPECT_EQ(607, message.GetExtension(UNITTEST::packed_fixed32_extension, 0));
-  EXPECT_EQ(608, message.GetExtension(UNITTEST::packed_fixed64_extension, 0));
-  EXPECT_EQ(609, message.GetExtension(UNITTEST::packed_sfixed32_extension, 0));
-  EXPECT_EQ(610, message.GetExtension(UNITTEST::packed_sfixed64_extension, 0));
-  EXPECT_EQ(611, message.GetExtension(UNITTEST::packed_float_extension, 0));
-  EXPECT_EQ(612, message.GetExtension(UNITTEST::packed_double_extension, 0));
-  EXPECT_TRUE(message.GetExtension(UNITTEST::packed_bool_extension, 0));
-  EXPECT_EQ(UNITTEST::FOREIGN_BAR,
-            message.GetExtension(UNITTEST::packed_enum_extension, 0));
-  EXPECT_EQ(701, message.GetExtension(UNITTEST::packed_int32_extension, 1));
-  EXPECT_EQ(702, message.GetExtension(UNITTEST::packed_int64_extension, 1));
-  EXPECT_EQ(703, message.GetExtension(UNITTEST::packed_uint32_extension, 1));
-  EXPECT_EQ(704, message.GetExtension(UNITTEST::packed_uint64_extension, 1));
-  EXPECT_EQ(705, message.GetExtension(UNITTEST::packed_sint32_extension, 1));
-  EXPECT_EQ(706, message.GetExtension(UNITTEST::packed_sint64_extension, 1));
-  EXPECT_EQ(707, message.GetExtension(UNITTEST::packed_fixed32_extension, 1));
-  EXPECT_EQ(708, message.GetExtension(UNITTEST::packed_fixed64_extension, 1));
-  EXPECT_EQ(709, message.GetExtension(UNITTEST::packed_sfixed32_extension, 1));
-  EXPECT_EQ(710, message.GetExtension(UNITTEST::packed_sfixed64_extension, 1));
-  EXPECT_EQ(711, message.GetExtension(UNITTEST::packed_float_extension, 1));
-  EXPECT_EQ(712, message.GetExtension(UNITTEST::packed_double_extension, 1));
-  EXPECT_FALSE(message.GetExtension(UNITTEST::packed_bool_extension, 1));
-  EXPECT_EQ(UNITTEST::FOREIGN_BAZ,
-            message.GetExtension(UNITTEST::packed_enum_extension, 1));
-}
-
-// -------------------------------------------------------------------
-
-inline void TestUtil::ExpectUnpackedExtensionsSet(
-    const UNITTEST::TestUnpackedExtensions& message) {
-  ASSERT_EQ(2, message.ExtensionSize(UNITTEST::unpacked_int32_extension));
-  ASSERT_EQ(2, message.ExtensionSize(UNITTEST::unpacked_int64_extension));
-  ASSERT_EQ(2, message.ExtensionSize(UNITTEST::unpacked_uint32_extension));
-  ASSERT_EQ(2, message.ExtensionSize(UNITTEST::unpacked_uint64_extension));
-  ASSERT_EQ(2, message.ExtensionSize(UNITTEST::unpacked_sint32_extension));
-  ASSERT_EQ(2, message.ExtensionSize(UNITTEST::unpacked_sint64_extension));
-  ASSERT_EQ(2, message.ExtensionSize(UNITTEST::unpacked_fixed32_extension));
-  ASSERT_EQ(2, message.ExtensionSize(UNITTEST::unpacked_fixed64_extension));
-  ASSERT_EQ(2, message.ExtensionSize(UNITTEST::unpacked_sfixed32_extension));
-  ASSERT_EQ(2, message.ExtensionSize(UNITTEST::unpacked_sfixed64_extension));
-  ASSERT_EQ(2, message.ExtensionSize(UNITTEST::unpacked_float_extension));
-  ASSERT_EQ(2, message.ExtensionSize(UNITTEST::unpacked_double_extension));
-  ASSERT_EQ(2, message.ExtensionSize(UNITTEST::unpacked_bool_extension));
-  ASSERT_EQ(2, message.ExtensionSize(UNITTEST::unpacked_enum_extension));
-
-  EXPECT_EQ(601, message.GetExtension(UNITTEST::unpacked_int32_extension, 0));
-  EXPECT_EQ(602, message.GetExtension(UNITTEST::unpacked_int64_extension, 0));
-  EXPECT_EQ(603, message.GetExtension(UNITTEST::unpacked_uint32_extension, 0));
-  EXPECT_EQ(604, message.GetExtension(UNITTEST::unpacked_uint64_extension, 0));
-  EXPECT_EQ(605, message.GetExtension(UNITTEST::unpacked_sint32_extension, 0));
-  EXPECT_EQ(606, message.GetExtension(UNITTEST::unpacked_sint64_extension, 0));
-  EXPECT_EQ(607, message.GetExtension(UNITTEST::unpacked_fixed32_extension, 0));
-  EXPECT_EQ(608, message.GetExtension(UNITTEST::unpacked_fixed64_extension, 0));
-  EXPECT_EQ(609,
-            message.GetExtension(UNITTEST::unpacked_sfixed32_extension, 0));
-  EXPECT_EQ(610,
-            message.GetExtension(UNITTEST::unpacked_sfixed64_extension, 0));
-  EXPECT_EQ(611, message.GetExtension(UNITTEST::unpacked_float_extension, 0));
-  EXPECT_EQ(612, message.GetExtension(UNITTEST::unpacked_double_extension, 0));
-  EXPECT_EQ(true, message.GetExtension(UNITTEST::unpacked_bool_extension, 0));
-  EXPECT_EQ(UNITTEST::FOREIGN_BAR,
-            message.GetExtension(UNITTEST::unpacked_enum_extension, 0));
-  EXPECT_EQ(701, message.GetExtension(UNITTEST::unpacked_int32_extension, 1));
-  EXPECT_EQ(702, message.GetExtension(UNITTEST::unpacked_int64_extension, 1));
-  EXPECT_EQ(703, message.GetExtension(UNITTEST::unpacked_uint32_extension, 1));
-  EXPECT_EQ(704, message.GetExtension(UNITTEST::unpacked_uint64_extension, 1));
-  EXPECT_EQ(705, message.GetExtension(UNITTEST::unpacked_sint32_extension, 1));
-  EXPECT_EQ(706, message.GetExtension(UNITTEST::unpacked_sint64_extension, 1));
-  EXPECT_EQ(707, message.GetExtension(UNITTEST::unpacked_fixed32_extension, 1));
-  EXPECT_EQ(708, message.GetExtension(UNITTEST::unpacked_fixed64_extension, 1));
-  EXPECT_EQ(709,
-            message.GetExtension(UNITTEST::unpacked_sfixed32_extension, 1));
-  EXPECT_EQ(710,
-            message.GetExtension(UNITTEST::unpacked_sfixed64_extension, 1));
-  EXPECT_EQ(711, message.GetExtension(UNITTEST::unpacked_float_extension, 1));
-  EXPECT_EQ(712, message.GetExtension(UNITTEST::unpacked_double_extension, 1));
-  EXPECT_EQ(false, message.GetExtension(UNITTEST::unpacked_bool_extension, 1));
-  EXPECT_EQ(UNITTEST::FOREIGN_BAZ,
-            message.GetExtension(UNITTEST::unpacked_enum_extension, 1));
-}
-
-// -------------------------------------------------------------------
-
-inline void TestUtil::ExpectLastRepeatedsRemoved(
-    const UNITTEST::TestAllTypes& message) {
-  ASSERT_EQ(1, message.repeated_int32_size());
-  ASSERT_EQ(1, message.repeated_int64_size());
-  ASSERT_EQ(1, message.repeated_uint32_size());
-  ASSERT_EQ(1, message.repeated_uint64_size());
-  ASSERT_EQ(1, message.repeated_sint32_size());
-  ASSERT_EQ(1, message.repeated_sint64_size());
-  ASSERT_EQ(1, message.repeated_fixed32_size());
-  ASSERT_EQ(1, message.repeated_fixed64_size());
-  ASSERT_EQ(1, message.repeated_sfixed32_size());
-  ASSERT_EQ(1, message.repeated_sfixed64_size());
-  ASSERT_EQ(1, message.repeated_float_size());
-  ASSERT_EQ(1, message.repeated_double_size());
-  ASSERT_EQ(1, message.repeated_bool_size());
-  ASSERT_EQ(1, message.repeated_string_size());
-  ASSERT_EQ(1, message.repeated_bytes_size());
-
-  ASSERT_EQ(1, message.repeatedgroup_size());
-  ASSERT_EQ(1, message.repeated_nested_message_size());
-  ASSERT_EQ(1, message.repeated_foreign_message_size());
-  ASSERT_EQ(1, message.repeated_import_message_size());
-  ASSERT_EQ(1, message.repeated_import_message_size());
-  ASSERT_EQ(1, message.repeated_nested_enum_size());
-  ASSERT_EQ(1, message.repeated_foreign_enum_size());
-  ASSERT_EQ(1, message.repeated_import_enum_size());
-
-#ifndef PROTOBUF_TEST_NO_DESCRIPTORS
-  ASSERT_EQ(1, message.repeated_string_piece_size());
-  ASSERT_EQ(1, message.repeated_cord_size());
-#endif
-
-  // Test that the remaining element is the correct one.
-  EXPECT_EQ(201, message.repeated_int32(0));
-  EXPECT_EQ(202, message.repeated_int64(0));
-  EXPECT_EQ(203, message.repeated_uint32(0));
-  EXPECT_EQ(204, message.repeated_uint64(0));
-  EXPECT_EQ(205, message.repeated_sint32(0));
-  EXPECT_EQ(206, message.repeated_sint64(0));
-  EXPECT_EQ(207, message.repeated_fixed32(0));
-  EXPECT_EQ(208, message.repeated_fixed64(0));
-  EXPECT_EQ(209, message.repeated_sfixed32(0));
-  EXPECT_EQ(210, message.repeated_sfixed64(0));
-  EXPECT_EQ(211, message.repeated_float(0));
-  EXPECT_EQ(212, message.repeated_double(0));
-  EXPECT_TRUE(message.repeated_bool(0));
-  EXPECT_EQ("215", message.repeated_string(0));
-  EXPECT_EQ("216", message.repeated_bytes(0));
-
-  EXPECT_EQ(217, message.repeatedgroup(0).a());
-  EXPECT_EQ(218, message.repeated_nested_message(0).bb());
-  EXPECT_EQ(219, message.repeated_foreign_message(0).c());
-  EXPECT_EQ(220, message.repeated_import_message(0).d());
-  EXPECT_EQ(220, message.repeated_import_message(0).d());
-
-  EXPECT_EQ(UNITTEST::TestAllTypes::BAR, message.repeated_nested_enum(0));
-  EXPECT_EQ(UNITTEST::FOREIGN_BAR, message.repeated_foreign_enum(0));
-  EXPECT_EQ(UNITTEST_IMPORT::IMPORT_BAR, message.repeated_import_enum(0));
-}
-
-inline void TestUtil::ExpectLastRepeatedExtensionsRemoved(
-    const UNITTEST::TestAllExtensions& message) {
-  // Test that one element was removed.
-  ASSERT_EQ(1, message.ExtensionSize(UNITTEST::repeated_int32_extension));
-  ASSERT_EQ(1, message.ExtensionSize(UNITTEST::repeated_int64_extension));
-  ASSERT_EQ(1, message.ExtensionSize(UNITTEST::repeated_uint32_extension));
-  ASSERT_EQ(1, message.ExtensionSize(UNITTEST::repeated_uint64_extension));
-  ASSERT_EQ(1, message.ExtensionSize(UNITTEST::repeated_sint32_extension));
-  ASSERT_EQ(1, message.ExtensionSize(UNITTEST::repeated_sint64_extension));
-  ASSERT_EQ(1, message.ExtensionSize(UNITTEST::repeated_fixed32_extension));
-  ASSERT_EQ(1, message.ExtensionSize(UNITTEST::repeated_fixed64_extension));
-  ASSERT_EQ(1, message.ExtensionSize(UNITTEST::repeated_sfixed32_extension));
-  ASSERT_EQ(1, message.ExtensionSize(UNITTEST::repeated_sfixed64_extension));
-  ASSERT_EQ(1, message.ExtensionSize(UNITTEST::repeated_float_extension));
-  ASSERT_EQ(1, message.ExtensionSize(UNITTEST::repeated_double_extension));
-  ASSERT_EQ(1, message.ExtensionSize(UNITTEST::repeated_bool_extension));
-  ASSERT_EQ(1, message.ExtensionSize(UNITTEST::repeated_string_extension));
-  ASSERT_EQ(1, message.ExtensionSize(UNITTEST::repeated_bytes_extension));
-
-  ASSERT_EQ(1, message.ExtensionSize(UNITTEST::repeatedgroup_extension));
-  ASSERT_EQ(1,
-            message.ExtensionSize(UNITTEST::repeated_nested_message_extension));
-  ASSERT_EQ(
-      1, message.ExtensionSize(UNITTEST::repeated_foreign_message_extension));
-  ASSERT_EQ(1,
-            message.ExtensionSize(UNITTEST::repeated_import_message_extension));
-  ASSERT_EQ(1,
-            message.ExtensionSize(UNITTEST::repeated_lazy_message_extension));
-  ASSERT_EQ(1, message.ExtensionSize(UNITTEST::repeated_nested_enum_extension));
-  ASSERT_EQ(1,
-            message.ExtensionSize(UNITTEST::repeated_foreign_enum_extension));
-  ASSERT_EQ(1, message.ExtensionSize(UNITTEST::repeated_import_enum_extension));
-
-  ASSERT_EQ(1,
-            message.ExtensionSize(UNITTEST::repeated_string_piece_extension));
-  ASSERT_EQ(1, message.ExtensionSize(UNITTEST::repeated_cord_extension));
-
-  // Test that the remaining element is the correct one.
-  EXPECT_EQ(201, message.GetExtension(UNITTEST::repeated_int32_extension, 0));
-  EXPECT_EQ(202, message.GetExtension(UNITTEST::repeated_int64_extension, 0));
-  EXPECT_EQ(203, message.GetExtension(UNITTEST::repeated_uint32_extension, 0));
-  EXPECT_EQ(204, message.GetExtension(UNITTEST::repeated_uint64_extension, 0));
-  EXPECT_EQ(205, message.GetExtension(UNITTEST::repeated_sint32_extension, 0));
-  EXPECT_EQ(206, message.GetExtension(UNITTEST::repeated_sint64_extension, 0));
-  EXPECT_EQ(207, message.GetExtension(UNITTEST::repeated_fixed32_extension, 0));
-  EXPECT_EQ(208, message.GetExtension(UNITTEST::repeated_fixed64_extension, 0));
-  EXPECT_EQ(209,
-            message.GetExtension(UNITTEST::repeated_sfixed32_extension, 0));
-  EXPECT_EQ(210,
-            message.GetExtension(UNITTEST::repeated_sfixed64_extension, 0));
-  EXPECT_EQ(211, message.GetExtension(UNITTEST::repeated_float_extension, 0));
-  EXPECT_EQ(212, message.GetExtension(UNITTEST::repeated_double_extension, 0));
-  EXPECT_TRUE(message.GetExtension(UNITTEST::repeated_bool_extension, 0));
-  EXPECT_EQ("215",
-            message.GetExtension(UNITTEST::repeated_string_extension, 0));
-  EXPECT_EQ("216", message.GetExtension(UNITTEST::repeated_bytes_extension, 0));
-
-  EXPECT_EQ(217,
-            message.GetExtension(UNITTEST::repeatedgroup_extension, 0).a());
-  EXPECT_EQ(218,
-            message.GetExtension(UNITTEST::repeated_nested_message_extension, 0)
-                .bb());
-  EXPECT_EQ(
-      219, message.GetExtension(UNITTEST::repeated_foreign_message_extension, 0)
-               .c());
-  EXPECT_EQ(
-      220,
-      message.GetExtension(UNITTEST::repeated_import_message_extension, 0).d());
-  EXPECT_EQ(
-      227,
-      message.GetExtension(UNITTEST::repeated_lazy_message_extension, 0).bb());
-
-  EXPECT_EQ(UNITTEST::TestAllTypes::BAR,
-            message.GetExtension(UNITTEST::repeated_nested_enum_extension, 0));
-  EXPECT_EQ(UNITTEST::FOREIGN_BAR,
-            message.GetExtension(UNITTEST::repeated_foreign_enum_extension, 0));
-  EXPECT_EQ(UNITTEST_IMPORT::IMPORT_BAR,
-            message.GetExtension(UNITTEST::repeated_import_enum_extension, 0));
-
-  EXPECT_EQ("224",
-            message.GetExtension(UNITTEST::repeated_string_piece_extension, 0));
-  EXPECT_EQ("225", message.GetExtension(UNITTEST::repeated_cord_extension, 0));
-}
-
-inline void TestUtil::ExpectLastRepeatedsReleased(
-    const UNITTEST::TestAllTypes& message) {
-  ASSERT_EQ(1, message.repeatedgroup_size());
-  ASSERT_EQ(1, message.repeated_nested_message_size());
-  ASSERT_EQ(1, message.repeated_foreign_message_size());
-  ASSERT_EQ(1, message.repeated_import_message_size());
-  ASSERT_EQ(1, message.repeated_import_message_size());
-
-  EXPECT_EQ(217, message.repeatedgroup(0).a());
-  EXPECT_EQ(218, message.repeated_nested_message(0).bb());
-  EXPECT_EQ(219, message.repeated_foreign_message(0).c());
-  EXPECT_EQ(220, message.repeated_import_message(0).d());
-  EXPECT_EQ(220, message.repeated_import_message(0).d());
-}
-
-inline void TestUtil::ExpectLastRepeatedExtensionsReleased(
-    const UNITTEST::TestAllExtensions& message) {
-  ASSERT_EQ(1, message.ExtensionSize(UNITTEST::repeatedgroup_extension));
-  ASSERT_EQ(1,
-            message.ExtensionSize(UNITTEST::repeated_nested_message_extension));
-  ASSERT_EQ(
-      1, message.ExtensionSize(UNITTEST::repeated_foreign_message_extension));
-  ASSERT_EQ(1,
-            message.ExtensionSize(UNITTEST::repeated_import_message_extension));
-  ASSERT_EQ(1,
-            message.ExtensionSize(UNITTEST::repeated_lazy_message_extension));
-
-  EXPECT_EQ(217,
-            message.GetExtension(UNITTEST::repeatedgroup_extension, 0).a());
-  EXPECT_EQ(218,
-            message.GetExtension(UNITTEST::repeated_nested_message_extension, 0)
-                .bb());
-  EXPECT_EQ(
-      219, message.GetExtension(UNITTEST::repeated_foreign_message_extension, 0)
-               .c());
-  EXPECT_EQ(
-      220,
-      message.GetExtension(UNITTEST::repeated_import_message_extension, 0).d());
-  EXPECT_EQ(
-      227,
-      message.GetExtension(UNITTEST::repeated_lazy_message_extension, 0).bb());
-}
-
-inline void TestUtil::ExpectRepeatedsSwapped(
-    const UNITTEST::TestAllTypes& message) {
-  ASSERT_EQ(2, message.repeated_int32_size());
-  ASSERT_EQ(2, message.repeated_int64_size());
-  ASSERT_EQ(2, message.repeated_uint32_size());
-  ASSERT_EQ(2, message.repeated_uint64_size());
-  ASSERT_EQ(2, message.repeated_sint32_size());
-  ASSERT_EQ(2, message.repeated_sint64_size());
-  ASSERT_EQ(2, message.repeated_fixed32_size());
-  ASSERT_EQ(2, message.repeated_fixed64_size());
-  ASSERT_EQ(2, message.repeated_sfixed32_size());
-  ASSERT_EQ(2, message.repeated_sfixed64_size());
-  ASSERT_EQ(2, message.repeated_float_size());
-  ASSERT_EQ(2, message.repeated_double_size());
-  ASSERT_EQ(2, message.repeated_bool_size());
-  ASSERT_EQ(2, message.repeated_string_size());
-  ASSERT_EQ(2, message.repeated_bytes_size());
-
-  ASSERT_EQ(2, message.repeatedgroup_size());
-  ASSERT_EQ(2, message.repeated_nested_message_size());
-  ASSERT_EQ(2, message.repeated_foreign_message_size());
-  ASSERT_EQ(2, message.repeated_import_message_size());
-  ASSERT_EQ(2, message.repeated_import_message_size());
-  ASSERT_EQ(2, message.repeated_nested_enum_size());
-  ASSERT_EQ(2, message.repeated_foreign_enum_size());
-  ASSERT_EQ(2, message.repeated_import_enum_size());
-
-#ifndef PROTOBUF_TEST_NO_DESCRIPTORS
-  ASSERT_EQ(2, message.repeated_string_piece_size());
-  ASSERT_EQ(2, message.repeated_cord_size());
-#endif
-
-  // Test that the first element and second element are flipped.
-  EXPECT_EQ(201, message.repeated_int32(1));
-  EXPECT_EQ(202, message.repeated_int64(1));
-  EXPECT_EQ(203, message.repeated_uint32(1));
-  EXPECT_EQ(204, message.repeated_uint64(1));
-  EXPECT_EQ(205, message.repeated_sint32(1));
-  EXPECT_EQ(206, message.repeated_sint64(1));
-  EXPECT_EQ(207, message.repeated_fixed32(1));
-  EXPECT_EQ(208, message.repeated_fixed64(1));
-  EXPECT_EQ(209, message.repeated_sfixed32(1));
-  EXPECT_EQ(210, message.repeated_sfixed64(1));
-  EXPECT_EQ(211, message.repeated_float(1));
-  EXPECT_EQ(212, message.repeated_double(1));
-  EXPECT_TRUE(message.repeated_bool(1));
-  EXPECT_EQ("215", message.repeated_string(1));
-  EXPECT_EQ("216", message.repeated_bytes(1));
-
-  EXPECT_EQ(217, message.repeatedgroup(1).a());
-  EXPECT_EQ(218, message.repeated_nested_message(1).bb());
-  EXPECT_EQ(219, message.repeated_foreign_message(1).c());
-  EXPECT_EQ(220, message.repeated_import_message(1).d());
-  EXPECT_EQ(220, message.repeated_import_message(1).d());
-
-  EXPECT_EQ(UNITTEST::TestAllTypes::BAR, message.repeated_nested_enum(1));
-  EXPECT_EQ(UNITTEST::FOREIGN_BAR, message.repeated_foreign_enum(1));
-  EXPECT_EQ(UNITTEST_IMPORT::IMPORT_BAR, message.repeated_import_enum(1));
-
-  EXPECT_EQ(301, message.repeated_int32(0));
-  EXPECT_EQ(302, message.repeated_int64(0));
-  EXPECT_EQ(303, message.repeated_uint32(0));
-  EXPECT_EQ(304, message.repeated_uint64(0));
-  EXPECT_EQ(305, message.repeated_sint32(0));
-  EXPECT_EQ(306, message.repeated_sint64(0));
-  EXPECT_EQ(307, message.repeated_fixed32(0));
-  EXPECT_EQ(308, message.repeated_fixed64(0));
-  EXPECT_EQ(309, message.repeated_sfixed32(0));
-  EXPECT_EQ(310, message.repeated_sfixed64(0));
-  EXPECT_EQ(311, message.repeated_float(0));
-  EXPECT_EQ(312, message.repeated_double(0));
-  EXPECT_FALSE(message.repeated_bool(0));
-  EXPECT_EQ("315", message.repeated_string(0));
-  EXPECT_EQ("316", message.repeated_bytes(0));
-
-  EXPECT_EQ(317, message.repeatedgroup(0).a());
-  EXPECT_EQ(318, message.repeated_nested_message(0).bb());
-  EXPECT_EQ(319, message.repeated_foreign_message(0).c());
-  EXPECT_EQ(320, message.repeated_import_message(0).d());
-  EXPECT_EQ(320, message.repeated_import_message(0).d());
-
-  EXPECT_EQ(UNITTEST::TestAllTypes::BAZ, message.repeated_nested_enum(0));
-  EXPECT_EQ(UNITTEST::FOREIGN_BAZ, message.repeated_foreign_enum(0));
-  EXPECT_EQ(UNITTEST_IMPORT::IMPORT_BAZ, message.repeated_import_enum(0));
-}
-
-inline void TestUtil::ExpectRepeatedExtensionsSwapped(
-    const UNITTEST::TestAllExtensions& message) {
-  ASSERT_EQ(2, message.ExtensionSize(UNITTEST::repeated_int32_extension));
-  ASSERT_EQ(2, message.ExtensionSize(UNITTEST::repeated_int64_extension));
-  ASSERT_EQ(2, message.ExtensionSize(UNITTEST::repeated_uint32_extension));
-  ASSERT_EQ(2, message.ExtensionSize(UNITTEST::repeated_uint64_extension));
-  ASSERT_EQ(2, message.ExtensionSize(UNITTEST::repeated_sint32_extension));
-  ASSERT_EQ(2, message.ExtensionSize(UNITTEST::repeated_sint64_extension));
-  ASSERT_EQ(2, message.ExtensionSize(UNITTEST::repeated_fixed32_extension));
-  ASSERT_EQ(2, message.ExtensionSize(UNITTEST::repeated_fixed64_extension));
-  ASSERT_EQ(2, message.ExtensionSize(UNITTEST::repeated_sfixed32_extension));
-  ASSERT_EQ(2, message.ExtensionSize(UNITTEST::repeated_sfixed64_extension));
-  ASSERT_EQ(2, message.ExtensionSize(UNITTEST::repeated_float_extension));
-  ASSERT_EQ(2, message.ExtensionSize(UNITTEST::repeated_double_extension));
-  ASSERT_EQ(2, message.ExtensionSize(UNITTEST::repeated_bool_extension));
-  ASSERT_EQ(2, message.ExtensionSize(UNITTEST::repeated_string_extension));
-  ASSERT_EQ(2, message.ExtensionSize(UNITTEST::repeated_bytes_extension));
-
-  ASSERT_EQ(2, message.ExtensionSize(UNITTEST::repeatedgroup_extension));
-  ASSERT_EQ(2,
-            message.ExtensionSize(UNITTEST::repeated_nested_message_extension));
-  ASSERT_EQ(
-      2, message.ExtensionSize(UNITTEST::repeated_foreign_message_extension));
-  ASSERT_EQ(2,
-            message.ExtensionSize(UNITTEST::repeated_import_message_extension));
-  ASSERT_EQ(2,
-            message.ExtensionSize(UNITTEST::repeated_lazy_message_extension));
-  ASSERT_EQ(2, message.ExtensionSize(UNITTEST::repeated_nested_enum_extension));
-  ASSERT_EQ(2,
-            message.ExtensionSize(UNITTEST::repeated_foreign_enum_extension));
-  ASSERT_EQ(2, message.ExtensionSize(UNITTEST::repeated_import_enum_extension));
-
-  ASSERT_EQ(2,
-            message.ExtensionSize(UNITTEST::repeated_string_piece_extension));
-  ASSERT_EQ(2, message.ExtensionSize(UNITTEST::repeated_cord_extension));
-
-  EXPECT_EQ(201, message.GetExtension(UNITTEST::repeated_int32_extension, 1));
-  EXPECT_EQ(202, message.GetExtension(UNITTEST::repeated_int64_extension, 1));
-  EXPECT_EQ(203, message.GetExtension(UNITTEST::repeated_uint32_extension, 1));
-  EXPECT_EQ(204, message.GetExtension(UNITTEST::repeated_uint64_extension, 1));
-  EXPECT_EQ(205, message.GetExtension(UNITTEST::repeated_sint32_extension, 1));
-  EXPECT_EQ(206, message.GetExtension(UNITTEST::repeated_sint64_extension, 1));
-  EXPECT_EQ(207, message.GetExtension(UNITTEST::repeated_fixed32_extension, 1));
-  EXPECT_EQ(208, message.GetExtension(UNITTEST::repeated_fixed64_extension, 1));
-  EXPECT_EQ(209,
-            message.GetExtension(UNITTEST::repeated_sfixed32_extension, 1));
-  EXPECT_EQ(210,
-            message.GetExtension(UNITTEST::repeated_sfixed64_extension, 1));
-  EXPECT_EQ(211, message.GetExtension(UNITTEST::repeated_float_extension, 1));
-  EXPECT_EQ(212, message.GetExtension(UNITTEST::repeated_double_extension, 1));
-  EXPECT_TRUE(message.GetExtension(UNITTEST::repeated_bool_extension, 1));
-  EXPECT_EQ("215",
-            message.GetExtension(UNITTEST::repeated_string_extension, 1));
-  EXPECT_EQ("216", message.GetExtension(UNITTEST::repeated_bytes_extension, 1));
-
-  EXPECT_EQ(217,
-            message.GetExtension(UNITTEST::repeatedgroup_extension, 1).a());
-  EXPECT_EQ(218,
-            message.GetExtension(UNITTEST::repeated_nested_message_extension, 1)
-                .bb());
-  EXPECT_EQ(
-      219, message.GetExtension(UNITTEST::repeated_foreign_message_extension, 1)
-               .c());
-  EXPECT_EQ(
-      220,
-      message.GetExtension(UNITTEST::repeated_import_message_extension, 1).d());
-  EXPECT_EQ(
-      227,
-      message.GetExtension(UNITTEST::repeated_lazy_message_extension, 1).bb());
-
-  EXPECT_EQ(UNITTEST::TestAllTypes::BAR,
-            message.GetExtension(UNITTEST::repeated_nested_enum_extension, 1));
-  EXPECT_EQ(UNITTEST::FOREIGN_BAR,
-            message.GetExtension(UNITTEST::repeated_foreign_enum_extension, 1));
-  EXPECT_EQ(UNITTEST_IMPORT::IMPORT_BAR,
-            message.GetExtension(UNITTEST::repeated_import_enum_extension, 1));
-
-  EXPECT_EQ("224",
-            message.GetExtension(UNITTEST::repeated_string_piece_extension, 1));
-  EXPECT_EQ("225", message.GetExtension(UNITTEST::repeated_cord_extension, 1));
-
-  EXPECT_EQ(301, message.GetExtension(UNITTEST::repeated_int32_extension, 0));
-  EXPECT_EQ(302, message.GetExtension(UNITTEST::repeated_int64_extension, 0));
-  EXPECT_EQ(303, message.GetExtension(UNITTEST::repeated_uint32_extension, 0));
-  EXPECT_EQ(304, message.GetExtension(UNITTEST::repeated_uint64_extension, 0));
-  EXPECT_EQ(305, message.GetExtension(UNITTEST::repeated_sint32_extension, 0));
-  EXPECT_EQ(306, message.GetExtension(UNITTEST::repeated_sint64_extension, 0));
-  EXPECT_EQ(307, message.GetExtension(UNITTEST::repeated_fixed32_extension, 0));
-  EXPECT_EQ(308, message.GetExtension(UNITTEST::repeated_fixed64_extension, 0));
-  EXPECT_EQ(309,
-            message.GetExtension(UNITTEST::repeated_sfixed32_extension, 0));
-  EXPECT_EQ(310,
-            message.GetExtension(UNITTEST::repeated_sfixed64_extension, 0));
-  EXPECT_EQ(311, message.GetExtension(UNITTEST::repeated_float_extension, 0));
-  EXPECT_EQ(312, message.GetExtension(UNITTEST::repeated_double_extension, 0));
-  EXPECT_FALSE(message.GetExtension(UNITTEST::repeated_bool_extension, 0));
-  EXPECT_EQ("315",
-            message.GetExtension(UNITTEST::repeated_string_extension, 0));
-  EXPECT_EQ("316", message.GetExtension(UNITTEST::repeated_bytes_extension, 0));
-
-  EXPECT_EQ(317,
-            message.GetExtension(UNITTEST::repeatedgroup_extension, 0).a());
-  EXPECT_EQ(318,
-            message.GetExtension(UNITTEST::repeated_nested_message_extension, 0)
-                .bb());
-  EXPECT_EQ(
-      319, message.GetExtension(UNITTEST::repeated_foreign_message_extension, 0)
-               .c());
-  EXPECT_EQ(
-      320,
-      message.GetExtension(UNITTEST::repeated_import_message_extension, 0).d());
-  EXPECT_EQ(
-      327,
-      message.GetExtension(UNITTEST::repeated_lazy_message_extension, 0).bb());
-
-  EXPECT_EQ(UNITTEST::TestAllTypes::BAZ,
-            message.GetExtension(UNITTEST::repeated_nested_enum_extension, 0));
-  EXPECT_EQ(UNITTEST::FOREIGN_BAZ,
-            message.GetExtension(UNITTEST::repeated_foreign_enum_extension, 0));
-  EXPECT_EQ(UNITTEST_IMPORT::IMPORT_BAZ,
-            message.GetExtension(UNITTEST::repeated_import_enum_extension, 0));
-
-  EXPECT_EQ("324",
-            message.GetExtension(UNITTEST::repeated_string_piece_extension, 0));
-  EXPECT_EQ("325", message.GetExtension(UNITTEST::repeated_cord_extension, 0));
-}
-
-inline void TestUtil::SetOneof1(UNITTEST::TestOneof2* message) {
-  message->mutable_foo_lazy_message()->set_moo_int(100);
-  message->set_bar_string("101");
-  message->set_baz_int(102);
-  message->set_baz_string("103");
-}
-
-inline void TestUtil::SetOneof2(UNITTEST::TestOneof2* message) {
-  message->set_foo_int(200);
-  message->set_bar_enum(UNITTEST::TestOneof2::BAZ);
-  message->set_baz_int(202);
-  message->set_baz_string("203");
-}
-
-inline void TestUtil::ExpectOneofSet1(const UNITTEST::TestOneof2& message) {
-  ExpectAtMostOneFieldSetInOneof(message);
-
-  EXPECT_TRUE(message.has_foo_lazy_message());
-  EXPECT_TRUE(message.foo_lazy_message().has_moo_int());
-
-  EXPECT_TRUE(message.has_bar_string());
-  EXPECT_TRUE(message.has_baz_int());
-  EXPECT_TRUE(message.has_baz_string());
-
-  ASSERT_EQ(0, message.foo_lazy_message().corge_int_size());
-
-  EXPECT_EQ(100, message.foo_lazy_message().moo_int());
-  EXPECT_EQ("101", message.bar_string());
-  EXPECT_EQ(102, message.baz_int());
-  EXPECT_EQ("103", message.baz_string());
-}
-
-inline void TestUtil::ExpectOneofSet2(const UNITTEST::TestOneof2& message) {
-  ExpectAtMostOneFieldSetInOneof(message);
-
-  EXPECT_TRUE(message.has_foo_int());
-  EXPECT_TRUE(message.has_bar_enum());
-  EXPECT_TRUE(message.has_baz_int());
-  EXPECT_TRUE(message.has_baz_string());
-
-  EXPECT_EQ(200, message.foo_int());
-  EXPECT_EQ(UNITTEST::TestOneof2::BAZ, message.bar_enum());
-  EXPECT_EQ(202, message.baz_int());
-  EXPECT_EQ("203", message.baz_string());
-}
-
-inline void TestUtil::ExpectOneofClear(const UNITTEST::TestOneof2& message) {
-  EXPECT_FALSE(message.has_foo_int());
-  EXPECT_FALSE(message.has_foo_string());
-  EXPECT_FALSE(message.has_foo_bytes());
-  EXPECT_FALSE(message.has_foo_enum());
-  EXPECT_FALSE(message.has_foo_message());
-  EXPECT_FALSE(message.has_foogroup());
-  EXPECT_FALSE(message.has_foo_lazy_message());
-
-  EXPECT_FALSE(message.has_bar_int());
-  EXPECT_FALSE(message.has_bar_string());
-  EXPECT_FALSE(message.has_bar_bytes());
-  EXPECT_FALSE(message.has_bar_enum());
-
-  EXPECT_FALSE(message.has_baz_int());
-  EXPECT_FALSE(message.has_baz_string());
-
-  EXPECT_EQ(UNITTEST::TestOneof2::FOO_NOT_SET, message.foo_case());
-  EXPECT_EQ(UNITTEST::TestOneof2::BAR_NOT_SET, message.bar_case());
-}
-
-inline void TestUtil::ExpectAtMostOneFieldSetInOneof(
-    const UNITTEST::TestOneof2& message) {
-  int count = 0;
-  if (message.has_foo_int()) count++;
-  if (message.has_foo_string()) count++;
-  if (message.has_foo_bytes()) count++;
-  if (message.has_foo_enum()) count++;
-  if (message.has_foo_message()) count++;
-  if (message.has_foogroup()) count++;
-  if (message.has_foo_lazy_message()) count++;
-  EXPECT_LE(count, 1);
-  count = 0;
-  if (message.has_bar_int()) count++;
-  if (message.has_bar_string()) count++;
-  if (message.has_bar_bytes()) count++;
-  if (message.has_bar_enum()) count++;
-  EXPECT_TRUE(count == 0 || count == 1);
-}
-
-// ===================================================================
-
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/test_util2.h b/libs/protobuf/src/google/protobuf/test_util2.h
deleted file mode 100644
index 540af63..0000000
--- a/libs/protobuf/src/google/protobuf/test_util2.h
+++ /dev/null
@@ -1,106 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef GOOGLE_PROTOBUF_TEST_UTIL2_H__
-#define GOOGLE_PROTOBUF_TEST_UTIL2_H__
-
-#include <google/protobuf/stubs/strutil.h>
-
-#include <google/protobuf/testing/googletest.h>
-#include <google/protobuf/io/zero_copy_stream.h>
-#include <google/protobuf/io/zero_copy_stream_impl_lite.h>
-#include <google/protobuf/util/message_differencer.h>
-
-namespace google {
-namespace protobuf {
-namespace TestUtil {
-
-// Translate net/proto2/* -> google/protobuf/*
-inline std::string TranslatePathToOpensource(const std::string& google3_path) {
-  const std::string prefix = "net/proto2/";
-  GOOGLE_CHECK(google3_path.find(prefix) == 0) << google3_path;
-  std::string path = google3_path.substr(prefix.size());
-
-  path = StringReplace(path, "internal/", "", false);
-  path = StringReplace(path, "proto/", "", false);
-  path = StringReplace(path, "public/", "", false);
-  return "google/protobuf/" + path;
-}
-
-inline std::string MaybeTranslatePath(const std::string& google3_path) {
-  std::string path = google3_path;
-  path = TranslatePathToOpensource(path);
-  return path;
-}
-
-inline std::string TestSourceDir() {
-  return google::protobuf::TestSourceDir();
-}
-
-inline std::string GetTestDataPath(const std::string& google3_path) {
-  return TestSourceDir() + "/" + MaybeTranslatePath(google3_path);
-}
-
-// Checks the equality of "message" and serialized proto of type "ProtoType".
-// Do not directly compare two serialized protos.
-template <typename ProtoType>
-bool EqualsToSerialized(const ProtoType& message, const std::string& data) {
-  ProtoType other;
-  other.ParsePartialFromString(data);
-  return util::MessageDifferencer::Equals(message, other);
-}
-
-// Wraps io::ArrayInputStream while checking against bound. When a blocking
-// stream is used with bounded length, proto parsing must not access beyond the
-// bound. Otherwise, it can result in unintended block, then deadlock.
-class BoundedArrayInputStream : public io::ZeroCopyInputStream {
- public:
-  BoundedArrayInputStream(const void* data, int size)
-      : stream_(data, size), bound_(size) {}
-  ~BoundedArrayInputStream() override {}
-
-  bool Next(const void** data, int* size) override {
-    GOOGLE_CHECK_LT(stream_.ByteCount(), bound_);
-    return stream_.Next(data, size);
-  }
-  void BackUp(int count) override { stream_.BackUp(count); }
-  bool Skip(int count) override { return stream_.Skip(count); }
-  int64_t ByteCount() const override { return stream_.ByteCount(); }
-
- private:
-  io::ArrayInputStream stream_;
-  int bound_;
-};
-
-}  // namespace TestUtil
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // GOOGLE_PROTOBUF_TEST_UTIL2_H__
diff --git a/libs/protobuf/src/google/protobuf/test_util_lite.cc b/libs/protobuf/src/google/protobuf/test_util_lite.cc
deleted file mode 100644
index 628f1a0..0000000
--- a/libs/protobuf/src/google/protobuf/test_util_lite.cc
+++ /dev/null
@@ -1,1991 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-
-#include <google/protobuf/test_util_lite.h>
-
-#include <google/protobuf/stubs/logging.h>
-#include <google/protobuf/stubs/common.h>
-#include <gtest/gtest.h>
-#include <google/protobuf/stubs/strutil.h>
-
-namespace google {
-namespace protobuf {
-
-void TestUtilLite::SetAllFields(unittest::TestAllTypesLite* message) {
-  message->set_optional_int32(101);
-  message->set_optional_int64(102);
-  message->set_optional_uint32(103);
-  message->set_optional_uint64(104);
-  message->set_optional_sint32(105);
-  message->set_optional_sint64(106);
-  message->set_optional_fixed32(107);
-  message->set_optional_fixed64(108);
-  message->set_optional_sfixed32(109);
-  message->set_optional_sfixed64(110);
-  message->set_optional_float(111);
-  message->set_optional_double(112);
-  message->set_optional_bool(true);
-  message->set_optional_string("115");
-  message->set_optional_bytes("116");
-
-  message->mutable_optionalgroup()->set_a(117);
-  message->mutable_optional_nested_message()->set_bb(118);
-  message->mutable_optional_foreign_message()->set_c(119);
-  message->mutable_optional_import_message()->set_d(120);
-  message->mutable_optional_public_import_message()->set_e(126);
-  message->mutable_optional_lazy_message()->set_bb(127);
-  message->mutable_optional_unverified_lazy_message()->set_bb(128);
-
-  message->set_optional_nested_enum(unittest::TestAllTypesLite::BAZ);
-  message->set_optional_foreign_enum(unittest::FOREIGN_LITE_BAZ);
-  message->set_optional_import_enum(unittest_import::IMPORT_LITE_BAZ);
-
-
-  // -----------------------------------------------------------------
-
-  message->add_repeated_int32(201);
-  message->add_repeated_int64(202);
-  message->add_repeated_uint32(203);
-  message->add_repeated_uint64(204);
-  message->add_repeated_sint32(205);
-  message->add_repeated_sint64(206);
-  message->add_repeated_fixed32(207);
-  message->add_repeated_fixed64(208);
-  message->add_repeated_sfixed32(209);
-  message->add_repeated_sfixed64(210);
-  message->add_repeated_float(211);
-  message->add_repeated_double(212);
-  message->add_repeated_bool(true);
-  message->add_repeated_string("215");
-  message->add_repeated_bytes("216");
-
-  message->add_repeatedgroup()->set_a(217);
-  message->add_repeated_nested_message()->set_bb(218);
-  message->add_repeated_foreign_message()->set_c(219);
-  message->add_repeated_import_message()->set_d(220);
-  message->add_repeated_lazy_message()->set_bb(227);
-
-  message->add_repeated_nested_enum(unittest::TestAllTypesLite::BAR);
-  message->add_repeated_foreign_enum(unittest::FOREIGN_LITE_BAR);
-  message->add_repeated_import_enum(unittest_import::IMPORT_LITE_BAR);
-
-
-  // Add a second one of each field.
-  message->add_repeated_int32(301);
-  message->add_repeated_int64(302);
-  message->add_repeated_uint32(303);
-  message->add_repeated_uint64(304);
-  message->add_repeated_sint32(305);
-  message->add_repeated_sint64(306);
-  message->add_repeated_fixed32(307);
-  message->add_repeated_fixed64(308);
-  message->add_repeated_sfixed32(309);
-  message->add_repeated_sfixed64(310);
-  message->add_repeated_float(311);
-  message->add_repeated_double(312);
-  message->add_repeated_bool(false);
-  message->add_repeated_string("315");
-  message->add_repeated_bytes("316");
-
-  message->add_repeatedgroup()->set_a(317);
-  message->add_repeated_nested_message()->set_bb(318);
-  message->add_repeated_foreign_message()->set_c(319);
-  message->add_repeated_import_message()->set_d(320);
-  message->add_repeated_lazy_message()->set_bb(327);
-
-  message->add_repeated_nested_enum(unittest::TestAllTypesLite::BAZ);
-  message->add_repeated_foreign_enum(unittest::FOREIGN_LITE_BAZ);
-  message->add_repeated_import_enum(unittest_import::IMPORT_LITE_BAZ);
-
-
-  // -----------------------------------------------------------------
-
-  message->set_default_int32(401);
-  message->set_default_int64(402);
-  message->set_default_uint32(403);
-  message->set_default_uint64(404);
-  message->set_default_sint32(405);
-  message->set_default_sint64(406);
-  message->set_default_fixed32(407);
-  message->set_default_fixed64(408);
-  message->set_default_sfixed32(409);
-  message->set_default_sfixed64(410);
-  message->set_default_float(411);
-  message->set_default_double(412);
-  message->set_default_bool(false);
-  message->set_default_string("415");
-  message->set_default_bytes("416");
-
-  message->set_default_nested_enum(unittest::TestAllTypesLite::FOO);
-  message->set_default_foreign_enum(unittest::FOREIGN_LITE_FOO);
-  message->set_default_import_enum(unittest_import::IMPORT_LITE_FOO);
-
-
-  message->set_oneof_uint32(601);
-  message->mutable_oneof_nested_message()->set_bb(602);
-  message->set_oneof_string("603");
-  message->set_oneof_bytes("604");
-}
-
-// -------------------------------------------------------------------
-
-void TestUtilLite::ModifyRepeatedFields(unittest::TestAllTypesLite* message) {
-  message->set_repeated_int32(1, 501);
-  message->set_repeated_int64(1, 502);
-  message->set_repeated_uint32(1, 503);
-  message->set_repeated_uint64(1, 504);
-  message->set_repeated_sint32(1, 505);
-  message->set_repeated_sint64(1, 506);
-  message->set_repeated_fixed32(1, 507);
-  message->set_repeated_fixed64(1, 508);
-  message->set_repeated_sfixed32(1, 509);
-  message->set_repeated_sfixed64(1, 510);
-  message->set_repeated_float(1, 511);
-  message->set_repeated_double(1, 512);
-  message->set_repeated_bool(1, true);
-  message->set_repeated_string(1, "515");
-  message->set_repeated_bytes(1, "516");
-
-  message->mutable_repeatedgroup(1)->set_a(517);
-  message->mutable_repeated_nested_message(1)->set_bb(518);
-  message->mutable_repeated_foreign_message(1)->set_c(519);
-  message->mutable_repeated_import_message(1)->set_d(520);
-  message->mutable_repeated_lazy_message(1)->set_bb(527);
-
-  message->set_repeated_nested_enum(1, unittest::TestAllTypesLite::FOO);
-  message->set_repeated_foreign_enum(1, unittest::FOREIGN_LITE_FOO);
-  message->set_repeated_import_enum(1, unittest_import::IMPORT_LITE_FOO);
-
-}
-
-// -------------------------------------------------------------------
-
-void TestUtilLite::ExpectAllFieldsSet(
-    const unittest::TestAllTypesLite& message) {
-  EXPECT_TRUE(message.has_optional_int32());
-  EXPECT_TRUE(message.has_optional_int64());
-  EXPECT_TRUE(message.has_optional_uint32());
-  EXPECT_TRUE(message.has_optional_uint64());
-  EXPECT_TRUE(message.has_optional_sint32());
-  EXPECT_TRUE(message.has_optional_sint64());
-  EXPECT_TRUE(message.has_optional_fixed32());
-  EXPECT_TRUE(message.has_optional_fixed64());
-  EXPECT_TRUE(message.has_optional_sfixed32());
-  EXPECT_TRUE(message.has_optional_sfixed64());
-  EXPECT_TRUE(message.has_optional_float());
-  EXPECT_TRUE(message.has_optional_double());
-  EXPECT_TRUE(message.has_optional_bool());
-  EXPECT_TRUE(message.has_optional_string());
-  EXPECT_TRUE(message.has_optional_bytes());
-
-  EXPECT_TRUE(message.has_optionalgroup());
-  EXPECT_TRUE(message.has_optional_nested_message());
-  EXPECT_TRUE(message.has_optional_foreign_message());
-  EXPECT_TRUE(message.has_optional_import_message());
-  EXPECT_TRUE(message.has_optional_public_import_message());
-  EXPECT_TRUE(message.has_optional_lazy_message());
-  EXPECT_TRUE(message.has_optional_unverified_lazy_message());
-
-  EXPECT_TRUE(message.optionalgroup().has_a());
-  EXPECT_TRUE(message.optional_nested_message().has_bb());
-  EXPECT_TRUE(message.optional_foreign_message().has_c());
-  EXPECT_TRUE(message.optional_import_message().has_d());
-  EXPECT_TRUE(message.optional_public_import_message().has_e());
-  EXPECT_TRUE(message.optional_lazy_message().has_bb());
-  EXPECT_TRUE(message.optional_unverified_lazy_message().has_bb());
-
-  EXPECT_TRUE(message.has_optional_nested_enum());
-  EXPECT_TRUE(message.has_optional_foreign_enum());
-  EXPECT_TRUE(message.has_optional_import_enum());
-
-
-  EXPECT_EQ(101, message.optional_int32());
-  EXPECT_EQ(102, message.optional_int64());
-  EXPECT_EQ(103, message.optional_uint32());
-  EXPECT_EQ(104, message.optional_uint64());
-  EXPECT_EQ(105, message.optional_sint32());
-  EXPECT_EQ(106, message.optional_sint64());
-  EXPECT_EQ(107, message.optional_fixed32());
-  EXPECT_EQ(108, message.optional_fixed64());
-  EXPECT_EQ(109, message.optional_sfixed32());
-  EXPECT_EQ(110, message.optional_sfixed64());
-  EXPECT_EQ(111, message.optional_float());
-  EXPECT_EQ(112, message.optional_double());
-  EXPECT_EQ(true, message.optional_bool());
-  EXPECT_EQ("115", message.optional_string());
-  EXPECT_EQ("116", message.optional_bytes());
-
-  EXPECT_EQ(117, message.optionalgroup().a());
-  EXPECT_EQ(118, message.optional_nested_message().bb());
-  EXPECT_EQ(119, message.optional_foreign_message().c());
-  EXPECT_EQ(120, message.optional_import_message().d());
-  EXPECT_EQ(126, message.optional_public_import_message().e());
-  EXPECT_EQ(127, message.optional_lazy_message().bb());
-  EXPECT_EQ(128, message.optional_unverified_lazy_message().bb());
-
-  EXPECT_EQ(unittest::TestAllTypesLite::BAZ, message.optional_nested_enum());
-  EXPECT_EQ(unittest::FOREIGN_LITE_BAZ, message.optional_foreign_enum());
-  EXPECT_EQ(unittest_import::IMPORT_LITE_BAZ, message.optional_import_enum());
-
-
-  // -----------------------------------------------------------------
-
-  ASSERT_EQ(2, message.repeated_int32_size());
-  ASSERT_EQ(2, message.repeated_int64_size());
-  ASSERT_EQ(2, message.repeated_uint32_size());
-  ASSERT_EQ(2, message.repeated_uint64_size());
-  ASSERT_EQ(2, message.repeated_sint32_size());
-  ASSERT_EQ(2, message.repeated_sint64_size());
-  ASSERT_EQ(2, message.repeated_fixed32_size());
-  ASSERT_EQ(2, message.repeated_fixed64_size());
-  ASSERT_EQ(2, message.repeated_sfixed32_size());
-  ASSERT_EQ(2, message.repeated_sfixed64_size());
-  ASSERT_EQ(2, message.repeated_float_size());
-  ASSERT_EQ(2, message.repeated_double_size());
-  ASSERT_EQ(2, message.repeated_bool_size());
-  ASSERT_EQ(2, message.repeated_string_size());
-  ASSERT_EQ(2, message.repeated_bytes_size());
-
-  ASSERT_EQ(2, message.repeatedgroup_size());
-  ASSERT_EQ(2, message.repeated_nested_message_size());
-  ASSERT_EQ(2, message.repeated_foreign_message_size());
-  ASSERT_EQ(2, message.repeated_import_message_size());
-  ASSERT_EQ(2, message.repeated_lazy_message_size());
-  ASSERT_EQ(2, message.repeated_nested_enum_size());
-  ASSERT_EQ(2, message.repeated_foreign_enum_size());
-  ASSERT_EQ(2, message.repeated_import_enum_size());
-
-
-  EXPECT_EQ(201, message.repeated_int32(0));
-  EXPECT_EQ(202, message.repeated_int64(0));
-  EXPECT_EQ(203, message.repeated_uint32(0));
-  EXPECT_EQ(204, message.repeated_uint64(0));
-  EXPECT_EQ(205, message.repeated_sint32(0));
-  EXPECT_EQ(206, message.repeated_sint64(0));
-  EXPECT_EQ(207, message.repeated_fixed32(0));
-  EXPECT_EQ(208, message.repeated_fixed64(0));
-  EXPECT_EQ(209, message.repeated_sfixed32(0));
-  EXPECT_EQ(210, message.repeated_sfixed64(0));
-  EXPECT_EQ(211, message.repeated_float(0));
-  EXPECT_EQ(212, message.repeated_double(0));
-  EXPECT_EQ(true, message.repeated_bool(0));
-  EXPECT_EQ("215", message.repeated_string(0));
-  EXPECT_EQ("216", message.repeated_bytes(0));
-
-  EXPECT_EQ(217, message.repeatedgroup(0).a());
-  EXPECT_EQ(218, message.repeated_nested_message(0).bb());
-  EXPECT_EQ(219, message.repeated_foreign_message(0).c());
-  EXPECT_EQ(220, message.repeated_import_message(0).d());
-  EXPECT_EQ(227, message.repeated_lazy_message(0).bb());
-
-
-  EXPECT_EQ(unittest::TestAllTypesLite::BAR, message.repeated_nested_enum(0));
-  EXPECT_EQ(unittest::FOREIGN_LITE_BAR, message.repeated_foreign_enum(0));
-  EXPECT_EQ(unittest_import::IMPORT_LITE_BAR, message.repeated_import_enum(0));
-
-  EXPECT_EQ(301, message.repeated_int32(1));
-  EXPECT_EQ(302, message.repeated_int64(1));
-  EXPECT_EQ(303, message.repeated_uint32(1));
-  EXPECT_EQ(304, message.repeated_uint64(1));
-  EXPECT_EQ(305, message.repeated_sint32(1));
-  EXPECT_EQ(306, message.repeated_sint64(1));
-  EXPECT_EQ(307, message.repeated_fixed32(1));
-  EXPECT_EQ(308, message.repeated_fixed64(1));
-  EXPECT_EQ(309, message.repeated_sfixed32(1));
-  EXPECT_EQ(310, message.repeated_sfixed64(1));
-  EXPECT_EQ(311, message.repeated_float(1));
-  EXPECT_EQ(312, message.repeated_double(1));
-  EXPECT_EQ(false, message.repeated_bool(1));
-  EXPECT_EQ("315", message.repeated_string(1));
-  EXPECT_EQ("316", message.repeated_bytes(1));
-
-  EXPECT_EQ(317, message.repeatedgroup(1).a());
-  EXPECT_EQ(318, message.repeated_nested_message(1).bb());
-  EXPECT_EQ(319, message.repeated_foreign_message(1).c());
-  EXPECT_EQ(320, message.repeated_import_message(1).d());
-  EXPECT_EQ(327, message.repeated_lazy_message(1).bb());
-
-  EXPECT_EQ(unittest::TestAllTypesLite::BAZ, message.repeated_nested_enum(1));
-  EXPECT_EQ(unittest::FOREIGN_LITE_BAZ, message.repeated_foreign_enum(1));
-  EXPECT_EQ(unittest_import::IMPORT_LITE_BAZ, message.repeated_import_enum(1));
-
-
-  // -----------------------------------------------------------------
-
-  EXPECT_TRUE(message.has_default_int32());
-  EXPECT_TRUE(message.has_default_int64());
-  EXPECT_TRUE(message.has_default_uint32());
-  EXPECT_TRUE(message.has_default_uint64());
-  EXPECT_TRUE(message.has_default_sint32());
-  EXPECT_TRUE(message.has_default_sint64());
-  EXPECT_TRUE(message.has_default_fixed32());
-  EXPECT_TRUE(message.has_default_fixed64());
-  EXPECT_TRUE(message.has_default_sfixed32());
-  EXPECT_TRUE(message.has_default_sfixed64());
-  EXPECT_TRUE(message.has_default_float());
-  EXPECT_TRUE(message.has_default_double());
-  EXPECT_TRUE(message.has_default_bool());
-  EXPECT_TRUE(message.has_default_string());
-  EXPECT_TRUE(message.has_default_bytes());
-
-  EXPECT_TRUE(message.has_default_nested_enum());
-  EXPECT_TRUE(message.has_default_foreign_enum());
-  EXPECT_TRUE(message.has_default_import_enum());
-
-
-  EXPECT_EQ(401, message.default_int32());
-  EXPECT_EQ(402, message.default_int64());
-  EXPECT_EQ(403, message.default_uint32());
-  EXPECT_EQ(404, message.default_uint64());
-  EXPECT_EQ(405, message.default_sint32());
-  EXPECT_EQ(406, message.default_sint64());
-  EXPECT_EQ(407, message.default_fixed32());
-  EXPECT_EQ(408, message.default_fixed64());
-  EXPECT_EQ(409, message.default_sfixed32());
-  EXPECT_EQ(410, message.default_sfixed64());
-  EXPECT_EQ(411, message.default_float());
-  EXPECT_EQ(412, message.default_double());
-  EXPECT_EQ(false, message.default_bool());
-  EXPECT_EQ("415", message.default_string());
-  EXPECT_EQ("416", message.default_bytes());
-
-  EXPECT_EQ(unittest::TestAllTypesLite::FOO, message.default_nested_enum());
-  EXPECT_EQ(unittest::FOREIGN_LITE_FOO, message.default_foreign_enum());
-  EXPECT_EQ(unittest_import::IMPORT_LITE_FOO, message.default_import_enum());
-
-
-  EXPECT_FALSE(message.has_oneof_uint32());
-  EXPECT_FALSE(message.has_oneof_nested_message());
-  EXPECT_FALSE(message.has_oneof_string());
-  EXPECT_TRUE(message.has_oneof_bytes());
-
-  EXPECT_EQ("604", message.oneof_bytes());
-}
-
-// -------------------------------------------------------------------
-
-void TestUtilLite::ExpectClear(const unittest::TestAllTypesLite& message) {
-  // has_blah() should initially be false for all optional fields.
-  EXPECT_FALSE(message.has_optional_int32());
-  EXPECT_FALSE(message.has_optional_int64());
-  EXPECT_FALSE(message.has_optional_uint32());
-  EXPECT_FALSE(message.has_optional_uint64());
-  EXPECT_FALSE(message.has_optional_sint32());
-  EXPECT_FALSE(message.has_optional_sint64());
-  EXPECT_FALSE(message.has_optional_fixed32());
-  EXPECT_FALSE(message.has_optional_fixed64());
-  EXPECT_FALSE(message.has_optional_sfixed32());
-  EXPECT_FALSE(message.has_optional_sfixed64());
-  EXPECT_FALSE(message.has_optional_float());
-  EXPECT_FALSE(message.has_optional_double());
-  EXPECT_FALSE(message.has_optional_bool());
-  EXPECT_FALSE(message.has_optional_string());
-  EXPECT_FALSE(message.has_optional_bytes());
-
-  EXPECT_FALSE(message.has_optionalgroup());
-  EXPECT_FALSE(message.has_optional_nested_message());
-  EXPECT_FALSE(message.has_optional_foreign_message());
-  EXPECT_FALSE(message.has_optional_import_message());
-  EXPECT_FALSE(message.has_optional_public_import_message());
-  EXPECT_FALSE(message.has_optional_lazy_message());
-  EXPECT_FALSE(message.has_optional_unverified_lazy_message());
-
-  EXPECT_FALSE(message.has_optional_nested_enum());
-  EXPECT_FALSE(message.has_optional_foreign_enum());
-  EXPECT_FALSE(message.has_optional_import_enum());
-
-
-  // Optional fields without defaults are set to zero or something like it.
-  EXPECT_EQ(0, message.optional_int32());
-  EXPECT_EQ(0, message.optional_int64());
-  EXPECT_EQ(0, message.optional_uint32());
-  EXPECT_EQ(0, message.optional_uint64());
-  EXPECT_EQ(0, message.optional_sint32());
-  EXPECT_EQ(0, message.optional_sint64());
-  EXPECT_EQ(0, message.optional_fixed32());
-  EXPECT_EQ(0, message.optional_fixed64());
-  EXPECT_EQ(0, message.optional_sfixed32());
-  EXPECT_EQ(0, message.optional_sfixed64());
-  EXPECT_EQ(0, message.optional_float());
-  EXPECT_EQ(0, message.optional_double());
-  EXPECT_EQ(false, message.optional_bool());
-  EXPECT_EQ("", message.optional_string());
-  EXPECT_EQ("", message.optional_bytes());
-
-  // Embedded messages should also be clear.
-  EXPECT_FALSE(message.optionalgroup().has_a());
-  EXPECT_FALSE(message.optional_nested_message().has_bb());
-  EXPECT_FALSE(message.optional_foreign_message().has_c());
-  EXPECT_FALSE(message.optional_import_message().has_d());
-  EXPECT_FALSE(message.optional_public_import_message().has_e());
-  EXPECT_FALSE(message.optional_lazy_message().has_bb());
-  EXPECT_FALSE(message.optional_unverified_lazy_message().has_bb());
-
-  EXPECT_EQ(0, message.optionalgroup().a());
-  EXPECT_EQ(0, message.optional_nested_message().bb());
-  EXPECT_EQ(0, message.optional_foreign_message().c());
-  EXPECT_EQ(0, message.optional_import_message().d());
-
-  // Enums without defaults are set to the first value in the enum.
-  EXPECT_EQ(unittest::TestAllTypesLite::FOO, message.optional_nested_enum());
-  EXPECT_EQ(unittest::FOREIGN_LITE_FOO, message.optional_foreign_enum());
-  EXPECT_EQ(unittest_import::IMPORT_LITE_FOO, message.optional_import_enum());
-
-
-  // Repeated fields are empty.
-  EXPECT_EQ(0, message.repeated_int32_size());
-  EXPECT_EQ(0, message.repeated_int64_size());
-  EXPECT_EQ(0, message.repeated_uint32_size());
-  EXPECT_EQ(0, message.repeated_uint64_size());
-  EXPECT_EQ(0, message.repeated_sint32_size());
-  EXPECT_EQ(0, message.repeated_sint64_size());
-  EXPECT_EQ(0, message.repeated_fixed32_size());
-  EXPECT_EQ(0, message.repeated_fixed64_size());
-  EXPECT_EQ(0, message.repeated_sfixed32_size());
-  EXPECT_EQ(0, message.repeated_sfixed64_size());
-  EXPECT_EQ(0, message.repeated_float_size());
-  EXPECT_EQ(0, message.repeated_double_size());
-  EXPECT_EQ(0, message.repeated_bool_size());
-  EXPECT_EQ(0, message.repeated_string_size());
-  EXPECT_EQ(0, message.repeated_bytes_size());
-
-  EXPECT_EQ(0, message.repeatedgroup_size());
-  EXPECT_EQ(0, message.repeated_nested_message_size());
-  EXPECT_EQ(0, message.repeated_foreign_message_size());
-  EXPECT_EQ(0, message.repeated_import_message_size());
-  EXPECT_EQ(0, message.repeated_lazy_message_size());
-  EXPECT_EQ(0, message.repeated_nested_enum_size());
-  EXPECT_EQ(0, message.repeated_foreign_enum_size());
-  EXPECT_EQ(0, message.repeated_import_enum_size());
-
-
-  // has_blah() should also be false for all default fields.
-  EXPECT_FALSE(message.has_default_int32());
-  EXPECT_FALSE(message.has_default_int64());
-  EXPECT_FALSE(message.has_default_uint32());
-  EXPECT_FALSE(message.has_default_uint64());
-  EXPECT_FALSE(message.has_default_sint32());
-  EXPECT_FALSE(message.has_default_sint64());
-  EXPECT_FALSE(message.has_default_fixed32());
-  EXPECT_FALSE(message.has_default_fixed64());
-  EXPECT_FALSE(message.has_default_sfixed32());
-  EXPECT_FALSE(message.has_default_sfixed64());
-  EXPECT_FALSE(message.has_default_float());
-  EXPECT_FALSE(message.has_default_double());
-  EXPECT_FALSE(message.has_default_bool());
-  EXPECT_FALSE(message.has_default_string());
-  EXPECT_FALSE(message.has_default_bytes());
-
-  EXPECT_FALSE(message.has_default_nested_enum());
-  EXPECT_FALSE(message.has_default_foreign_enum());
-  EXPECT_FALSE(message.has_default_import_enum());
-
-
-  // Fields with defaults have their default values (duh).
-  EXPECT_EQ(41, message.default_int32());
-  EXPECT_EQ(42, message.default_int64());
-  EXPECT_EQ(43, message.default_uint32());
-  EXPECT_EQ(44, message.default_uint64());
-  EXPECT_EQ(-45, message.default_sint32());
-  EXPECT_EQ(46, message.default_sint64());
-  EXPECT_EQ(47, message.default_fixed32());
-  EXPECT_EQ(48, message.default_fixed64());
-  EXPECT_EQ(49, message.default_sfixed32());
-  EXPECT_EQ(-50, message.default_sfixed64());
-  EXPECT_EQ(51.5, message.default_float());
-  EXPECT_EQ(52e3, message.default_double());
-  EXPECT_EQ(true, message.default_bool());
-  EXPECT_EQ("hello", message.default_string());
-  EXPECT_EQ("world", message.default_bytes());
-
-  EXPECT_EQ(unittest::TestAllTypesLite::BAR, message.default_nested_enum());
-  EXPECT_EQ(unittest::FOREIGN_LITE_BAR, message.default_foreign_enum());
-  EXPECT_EQ(unittest_import::IMPORT_LITE_BAR, message.default_import_enum());
-
-
-  EXPECT_FALSE(message.has_oneof_uint32());
-  EXPECT_FALSE(message.has_oneof_nested_message());
-  EXPECT_FALSE(message.has_oneof_string());
-  EXPECT_FALSE(message.has_oneof_bytes());
-}
-
-// -------------------------------------------------------------------
-
-void TestUtilLite::ExpectRepeatedFieldsModified(
-    const unittest::TestAllTypesLite& message) {
-  // ModifyRepeatedFields only sets the second repeated element of each
-  // field.  In addition to verifying this, we also verify that the first
-  // element and size were *not* modified.
-  ASSERT_EQ(2, message.repeated_int32_size());
-  ASSERT_EQ(2, message.repeated_int64_size());
-  ASSERT_EQ(2, message.repeated_uint32_size());
-  ASSERT_EQ(2, message.repeated_uint64_size());
-  ASSERT_EQ(2, message.repeated_sint32_size());
-  ASSERT_EQ(2, message.repeated_sint64_size());
-  ASSERT_EQ(2, message.repeated_fixed32_size());
-  ASSERT_EQ(2, message.repeated_fixed64_size());
-  ASSERT_EQ(2, message.repeated_sfixed32_size());
-  ASSERT_EQ(2, message.repeated_sfixed64_size());
-  ASSERT_EQ(2, message.repeated_float_size());
-  ASSERT_EQ(2, message.repeated_double_size());
-  ASSERT_EQ(2, message.repeated_bool_size());
-  ASSERT_EQ(2, message.repeated_string_size());
-  ASSERT_EQ(2, message.repeated_bytes_size());
-
-  ASSERT_EQ(2, message.repeatedgroup_size());
-  ASSERT_EQ(2, message.repeated_nested_message_size());
-  ASSERT_EQ(2, message.repeated_foreign_message_size());
-  ASSERT_EQ(2, message.repeated_import_message_size());
-  ASSERT_EQ(2, message.repeated_lazy_message_size());
-  ASSERT_EQ(2, message.repeated_nested_enum_size());
-  ASSERT_EQ(2, message.repeated_foreign_enum_size());
-  ASSERT_EQ(2, message.repeated_import_enum_size());
-
-
-  EXPECT_EQ(201, message.repeated_int32(0));
-  EXPECT_EQ(202, message.repeated_int64(0));
-  EXPECT_EQ(203, message.repeated_uint32(0));
-  EXPECT_EQ(204, message.repeated_uint64(0));
-  EXPECT_EQ(205, message.repeated_sint32(0));
-  EXPECT_EQ(206, message.repeated_sint64(0));
-  EXPECT_EQ(207, message.repeated_fixed32(0));
-  EXPECT_EQ(208, message.repeated_fixed64(0));
-  EXPECT_EQ(209, message.repeated_sfixed32(0));
-  EXPECT_EQ(210, message.repeated_sfixed64(0));
-  EXPECT_EQ(211, message.repeated_float(0));
-  EXPECT_EQ(212, message.repeated_double(0));
-  EXPECT_EQ(true, message.repeated_bool(0));
-  EXPECT_EQ("215", message.repeated_string(0));
-  EXPECT_EQ("216", message.repeated_bytes(0));
-
-  EXPECT_EQ(217, message.repeatedgroup(0).a());
-  EXPECT_EQ(218, message.repeated_nested_message(0).bb());
-  EXPECT_EQ(219, message.repeated_foreign_message(0).c());
-  EXPECT_EQ(220, message.repeated_import_message(0).d());
-  EXPECT_EQ(227, message.repeated_lazy_message(0).bb());
-
-  EXPECT_EQ(unittest::TestAllTypesLite::BAR, message.repeated_nested_enum(0));
-  EXPECT_EQ(unittest::FOREIGN_LITE_BAR, message.repeated_foreign_enum(0));
-  EXPECT_EQ(unittest_import::IMPORT_LITE_BAR, message.repeated_import_enum(0));
-
-
-  // Actually verify the second (modified) elements now.
-  EXPECT_EQ(501, message.repeated_int32(1));
-  EXPECT_EQ(502, message.repeated_int64(1));
-  EXPECT_EQ(503, message.repeated_uint32(1));
-  EXPECT_EQ(504, message.repeated_uint64(1));
-  EXPECT_EQ(505, message.repeated_sint32(1));
-  EXPECT_EQ(506, message.repeated_sint64(1));
-  EXPECT_EQ(507, message.repeated_fixed32(1));
-  EXPECT_EQ(508, message.repeated_fixed64(1));
-  EXPECT_EQ(509, message.repeated_sfixed32(1));
-  EXPECT_EQ(510, message.repeated_sfixed64(1));
-  EXPECT_EQ(511, message.repeated_float(1));
-  EXPECT_EQ(512, message.repeated_double(1));
-  EXPECT_EQ(true, message.repeated_bool(1));
-  EXPECT_EQ("515", message.repeated_string(1));
-  EXPECT_EQ("516", message.repeated_bytes(1));
-
-  EXPECT_EQ(517, message.repeatedgroup(1).a());
-  EXPECT_EQ(518, message.repeated_nested_message(1).bb());
-  EXPECT_EQ(519, message.repeated_foreign_message(1).c());
-  EXPECT_EQ(520, message.repeated_import_message(1).d());
-  EXPECT_EQ(527, message.repeated_lazy_message(1).bb());
-
-  EXPECT_EQ(unittest::TestAllTypesLite::FOO, message.repeated_nested_enum(1));
-  EXPECT_EQ(unittest::FOREIGN_LITE_FOO, message.repeated_foreign_enum(1));
-  EXPECT_EQ(unittest_import::IMPORT_LITE_FOO, message.repeated_import_enum(1));
-
-}
-
-// -------------------------------------------------------------------
-
-void TestUtilLite::SetPackedFields(unittest::TestPackedTypesLite* message) {
-  message->add_packed_int32(601);
-  message->add_packed_int64(602);
-  message->add_packed_uint32(603);
-  message->add_packed_uint64(604);
-  message->add_packed_sint32(605);
-  message->add_packed_sint64(606);
-  message->add_packed_fixed32(607);
-  message->add_packed_fixed64(608);
-  message->add_packed_sfixed32(609);
-  message->add_packed_sfixed64(610);
-  message->add_packed_float(611);
-  message->add_packed_double(612);
-  message->add_packed_bool(true);
-  message->add_packed_enum(unittest::FOREIGN_LITE_BAR);
-  // add a second one of each field
-  message->add_packed_int32(701);
-  message->add_packed_int64(702);
-  message->add_packed_uint32(703);
-  message->add_packed_uint64(704);
-  message->add_packed_sint32(705);
-  message->add_packed_sint64(706);
-  message->add_packed_fixed32(707);
-  message->add_packed_fixed64(708);
-  message->add_packed_sfixed32(709);
-  message->add_packed_sfixed64(710);
-  message->add_packed_float(711);
-  message->add_packed_double(712);
-  message->add_packed_bool(false);
-  message->add_packed_enum(unittest::FOREIGN_LITE_BAZ);
-}
-
-// -------------------------------------------------------------------
-
-void TestUtilLite::ModifyPackedFields(unittest::TestPackedTypesLite* message) {
-  message->set_packed_int32(1, 801);
-  message->set_packed_int64(1, 802);
-  message->set_packed_uint32(1, 803);
-  message->set_packed_uint64(1, 804);
-  message->set_packed_sint32(1, 805);
-  message->set_packed_sint64(1, 806);
-  message->set_packed_fixed32(1, 807);
-  message->set_packed_fixed64(1, 808);
-  message->set_packed_sfixed32(1, 809);
-  message->set_packed_sfixed64(1, 810);
-  message->set_packed_float(1, 811);
-  message->set_packed_double(1, 812);
-  message->set_packed_bool(1, true);
-  message->set_packed_enum(1, unittest::FOREIGN_LITE_FOO);
-}
-
-// -------------------------------------------------------------------
-
-void TestUtilLite::ExpectPackedFieldsSet(
-    const unittest::TestPackedTypesLite& message) {
-  ASSERT_EQ(2, message.packed_int32_size());
-  ASSERT_EQ(2, message.packed_int64_size());
-  ASSERT_EQ(2, message.packed_uint32_size());
-  ASSERT_EQ(2, message.packed_uint64_size());
-  ASSERT_EQ(2, message.packed_sint32_size());
-  ASSERT_EQ(2, message.packed_sint64_size());
-  ASSERT_EQ(2, message.packed_fixed32_size());
-  ASSERT_EQ(2, message.packed_fixed64_size());
-  ASSERT_EQ(2, message.packed_sfixed32_size());
-  ASSERT_EQ(2, message.packed_sfixed64_size());
-  ASSERT_EQ(2, message.packed_float_size());
-  ASSERT_EQ(2, message.packed_double_size());
-  ASSERT_EQ(2, message.packed_bool_size());
-  ASSERT_EQ(2, message.packed_enum_size());
-
-  EXPECT_EQ(601, message.packed_int32(0));
-  EXPECT_EQ(602, message.packed_int64(0));
-  EXPECT_EQ(603, message.packed_uint32(0));
-  EXPECT_EQ(604, message.packed_uint64(0));
-  EXPECT_EQ(605, message.packed_sint32(0));
-  EXPECT_EQ(606, message.packed_sint64(0));
-  EXPECT_EQ(607, message.packed_fixed32(0));
-  EXPECT_EQ(608, message.packed_fixed64(0));
-  EXPECT_EQ(609, message.packed_sfixed32(0));
-  EXPECT_EQ(610, message.packed_sfixed64(0));
-  EXPECT_EQ(611, message.packed_float(0));
-  EXPECT_EQ(612, message.packed_double(0));
-  EXPECT_EQ(true, message.packed_bool(0));
-  EXPECT_EQ(unittest::FOREIGN_LITE_BAR, message.packed_enum(0));
-
-  EXPECT_EQ(701, message.packed_int32(1));
-  EXPECT_EQ(702, message.packed_int64(1));
-  EXPECT_EQ(703, message.packed_uint32(1));
-  EXPECT_EQ(704, message.packed_uint64(1));
-  EXPECT_EQ(705, message.packed_sint32(1));
-  EXPECT_EQ(706, message.packed_sint64(1));
-  EXPECT_EQ(707, message.packed_fixed32(1));
-  EXPECT_EQ(708, message.packed_fixed64(1));
-  EXPECT_EQ(709, message.packed_sfixed32(1));
-  EXPECT_EQ(710, message.packed_sfixed64(1));
-  EXPECT_EQ(711, message.packed_float(1));
-  EXPECT_EQ(712, message.packed_double(1));
-  EXPECT_EQ(false, message.packed_bool(1));
-  EXPECT_EQ(unittest::FOREIGN_LITE_BAZ, message.packed_enum(1));
-}
-
-// -------------------------------------------------------------------
-
-void TestUtilLite::ExpectPackedClear(
-    const unittest::TestPackedTypesLite& message) {
-  // Packed repeated fields are empty.
-  EXPECT_EQ(0, message.packed_int32_size());
-  EXPECT_EQ(0, message.packed_int64_size());
-  EXPECT_EQ(0, message.packed_uint32_size());
-  EXPECT_EQ(0, message.packed_uint64_size());
-  EXPECT_EQ(0, message.packed_sint32_size());
-  EXPECT_EQ(0, message.packed_sint64_size());
-  EXPECT_EQ(0, message.packed_fixed32_size());
-  EXPECT_EQ(0, message.packed_fixed64_size());
-  EXPECT_EQ(0, message.packed_sfixed32_size());
-  EXPECT_EQ(0, message.packed_sfixed64_size());
-  EXPECT_EQ(0, message.packed_float_size());
-  EXPECT_EQ(0, message.packed_double_size());
-  EXPECT_EQ(0, message.packed_bool_size());
-  EXPECT_EQ(0, message.packed_enum_size());
-}
-
-// -------------------------------------------------------------------
-
-void TestUtilLite::ExpectPackedFieldsModified(
-    const unittest::TestPackedTypesLite& message) {
-  // Do the same for packed repeated fields.
-  ASSERT_EQ(2, message.packed_int32_size());
-  ASSERT_EQ(2, message.packed_int64_size());
-  ASSERT_EQ(2, message.packed_uint32_size());
-  ASSERT_EQ(2, message.packed_uint64_size());
-  ASSERT_EQ(2, message.packed_sint32_size());
-  ASSERT_EQ(2, message.packed_sint64_size());
-  ASSERT_EQ(2, message.packed_fixed32_size());
-  ASSERT_EQ(2, message.packed_fixed64_size());
-  ASSERT_EQ(2, message.packed_sfixed32_size());
-  ASSERT_EQ(2, message.packed_sfixed64_size());
-  ASSERT_EQ(2, message.packed_float_size());
-  ASSERT_EQ(2, message.packed_double_size());
-  ASSERT_EQ(2, message.packed_bool_size());
-  ASSERT_EQ(2, message.packed_enum_size());
-
-  EXPECT_EQ(601, message.packed_int32(0));
-  EXPECT_EQ(602, message.packed_int64(0));
-  EXPECT_EQ(603, message.packed_uint32(0));
-  EXPECT_EQ(604, message.packed_uint64(0));
-  EXPECT_EQ(605, message.packed_sint32(0));
-  EXPECT_EQ(606, message.packed_sint64(0));
-  EXPECT_EQ(607, message.packed_fixed32(0));
-  EXPECT_EQ(608, message.packed_fixed64(0));
-  EXPECT_EQ(609, message.packed_sfixed32(0));
-  EXPECT_EQ(610, message.packed_sfixed64(0));
-  EXPECT_EQ(611, message.packed_float(0));
-  EXPECT_EQ(612, message.packed_double(0));
-  EXPECT_EQ(true, message.packed_bool(0));
-  EXPECT_EQ(unittest::FOREIGN_LITE_BAR, message.packed_enum(0));
-  // Actually verify the second (modified) elements now.
-  EXPECT_EQ(801, message.packed_int32(1));
-  EXPECT_EQ(802, message.packed_int64(1));
-  EXPECT_EQ(803, message.packed_uint32(1));
-  EXPECT_EQ(804, message.packed_uint64(1));
-  EXPECT_EQ(805, message.packed_sint32(1));
-  EXPECT_EQ(806, message.packed_sint64(1));
-  EXPECT_EQ(807, message.packed_fixed32(1));
-  EXPECT_EQ(808, message.packed_fixed64(1));
-  EXPECT_EQ(809, message.packed_sfixed32(1));
-  EXPECT_EQ(810, message.packed_sfixed64(1));
-  EXPECT_EQ(811, message.packed_float(1));
-  EXPECT_EQ(812, message.packed_double(1));
-  EXPECT_EQ(true, message.packed_bool(1));
-  EXPECT_EQ(unittest::FOREIGN_LITE_FOO, message.packed_enum(1));
-}
-
-// ===================================================================
-// Extensions
-//
-// All this code is exactly equivalent to the above code except that it's
-// manipulating extension fields instead of normal ones.
-//
-// I gave up on the 80-char limit here.  Sorry.
-
-void TestUtilLite::SetAllExtensions(unittest::TestAllExtensionsLite* message) {
-  message->SetExtension(unittest::optional_int32_extension_lite, 101);
-  message->SetExtension(unittest::optional_int64_extension_lite, 102);
-  message->SetExtension(unittest::optional_uint32_extension_lite, 103);
-  message->SetExtension(unittest::optional_uint64_extension_lite, 104);
-  message->SetExtension(unittest::optional_sint32_extension_lite, 105);
-  message->SetExtension(unittest::optional_sint64_extension_lite, 106);
-  message->SetExtension(unittest::optional_fixed32_extension_lite, 107);
-  message->SetExtension(unittest::optional_fixed64_extension_lite, 108);
-  message->SetExtension(unittest::optional_sfixed32_extension_lite, 109);
-  message->SetExtension(unittest::optional_sfixed64_extension_lite, 110);
-  message->SetExtension(unittest::optional_float_extension_lite, 111);
-  message->SetExtension(unittest::optional_double_extension_lite, 112);
-  message->SetExtension(unittest::optional_bool_extension_lite, true);
-  message->SetExtension(unittest::optional_string_extension_lite, "115");
-  message->SetExtension(unittest::optional_bytes_extension_lite, "116");
-
-  message->MutableExtension(unittest::optionalgroup_extension_lite)->set_a(117);
-  message->MutableExtension(unittest::optional_nested_message_extension_lite)
-      ->set_bb(118);
-  message->MutableExtension(unittest::optional_foreign_message_extension_lite)
-      ->set_c(119);
-  message->MutableExtension(unittest::optional_import_message_extension_lite)
-      ->set_d(120);
-  message
-      ->MutableExtension(
-          unittest::optional_public_import_message_extension_lite)
-      ->set_e(126);
-  message->MutableExtension(unittest::optional_lazy_message_extension_lite)
-      ->set_bb(127);
-  message
-      ->MutableExtension(
-          unittest::optional_unverified_lazy_message_extension_lite)
-      ->set_bb(128);
-
-  message->SetExtension(unittest::optional_nested_enum_extension_lite,
-                        unittest::TestAllTypesLite::BAZ);
-  message->SetExtension(unittest::optional_foreign_enum_extension_lite,
-                        unittest::FOREIGN_LITE_BAZ);
-  message->SetExtension(unittest::optional_import_enum_extension_lite,
-                        unittest_import::IMPORT_LITE_BAZ);
-
-
-  // -----------------------------------------------------------------
-
-  message->AddExtension(unittest::repeated_int32_extension_lite, 201);
-  message->AddExtension(unittest::repeated_int64_extension_lite, 202);
-  message->AddExtension(unittest::repeated_uint32_extension_lite, 203);
-  message->AddExtension(unittest::repeated_uint64_extension_lite, 204);
-  message->AddExtension(unittest::repeated_sint32_extension_lite, 205);
-  message->AddExtension(unittest::repeated_sint64_extension_lite, 206);
-  message->AddExtension(unittest::repeated_fixed32_extension_lite, 207);
-  message->AddExtension(unittest::repeated_fixed64_extension_lite, 208);
-  message->AddExtension(unittest::repeated_sfixed32_extension_lite, 209);
-  message->AddExtension(unittest::repeated_sfixed64_extension_lite, 210);
-  message->AddExtension(unittest::repeated_float_extension_lite, 211);
-  message->AddExtension(unittest::repeated_double_extension_lite, 212);
-  message->AddExtension(unittest::repeated_bool_extension_lite, true);
-  message->AddExtension(unittest::repeated_string_extension_lite, "215");
-  message->AddExtension(unittest::repeated_bytes_extension_lite, "216");
-
-  message->AddExtension(unittest::repeatedgroup_extension_lite)->set_a(217);
-  message->AddExtension(unittest::repeated_nested_message_extension_lite)
-      ->set_bb(218);
-  message->AddExtension(unittest::repeated_foreign_message_extension_lite)
-      ->set_c(219);
-  message->AddExtension(unittest::repeated_import_message_extension_lite)
-      ->set_d(220);
-  message->AddExtension(unittest::repeated_lazy_message_extension_lite)
-      ->set_bb(227);
-
-  message->AddExtension(unittest::repeated_nested_enum_extension_lite,
-                        unittest::TestAllTypesLite::BAR);
-  message->AddExtension(unittest::repeated_foreign_enum_extension_lite,
-                        unittest::FOREIGN_LITE_BAR);
-  message->AddExtension(unittest::repeated_import_enum_extension_lite,
-                        unittest_import::IMPORT_LITE_BAR);
-
-
-  // Add a second one of each field.
-  message->AddExtension(unittest::repeated_int32_extension_lite, 301);
-  message->AddExtension(unittest::repeated_int64_extension_lite, 302);
-  message->AddExtension(unittest::repeated_uint32_extension_lite, 303);
-  message->AddExtension(unittest::repeated_uint64_extension_lite, 304);
-  message->AddExtension(unittest::repeated_sint32_extension_lite, 305);
-  message->AddExtension(unittest::repeated_sint64_extension_lite, 306);
-  message->AddExtension(unittest::repeated_fixed32_extension_lite, 307);
-  message->AddExtension(unittest::repeated_fixed64_extension_lite, 308);
-  message->AddExtension(unittest::repeated_sfixed32_extension_lite, 309);
-  message->AddExtension(unittest::repeated_sfixed64_extension_lite, 310);
-  message->AddExtension(unittest::repeated_float_extension_lite, 311);
-  message->AddExtension(unittest::repeated_double_extension_lite, 312);
-  message->AddExtension(unittest::repeated_bool_extension_lite, false);
-  message->AddExtension(unittest::repeated_string_extension_lite, "315");
-  message->AddExtension(unittest::repeated_bytes_extension_lite, "316");
-
-  message->AddExtension(unittest::repeatedgroup_extension_lite)->set_a(317);
-  message->AddExtension(unittest::repeated_nested_message_extension_lite)
-      ->set_bb(318);
-  message->AddExtension(unittest::repeated_foreign_message_extension_lite)
-      ->set_c(319);
-  message->AddExtension(unittest::repeated_import_message_extension_lite)
-      ->set_d(320);
-  message->AddExtension(unittest::repeated_lazy_message_extension_lite)
-      ->set_bb(327);
-
-  message->AddExtension(unittest::repeated_nested_enum_extension_lite,
-                        unittest::TestAllTypesLite::BAZ);
-  message->AddExtension(unittest::repeated_foreign_enum_extension_lite,
-                        unittest::FOREIGN_LITE_BAZ);
-  message->AddExtension(unittest::repeated_import_enum_extension_lite,
-                        unittest_import::IMPORT_LITE_BAZ);
-
-
-  // -----------------------------------------------------------------
-
-  message->SetExtension(unittest::default_int32_extension_lite, 401);
-  message->SetExtension(unittest::default_int64_extension_lite, 402);
-  message->SetExtension(unittest::default_uint32_extension_lite, 403);
-  message->SetExtension(unittest::default_uint64_extension_lite, 404);
-  message->SetExtension(unittest::default_sint32_extension_lite, 405);
-  message->SetExtension(unittest::default_sint64_extension_lite, 406);
-  message->SetExtension(unittest::default_fixed32_extension_lite, 407);
-  message->SetExtension(unittest::default_fixed64_extension_lite, 408);
-  message->SetExtension(unittest::default_sfixed32_extension_lite, 409);
-  message->SetExtension(unittest::default_sfixed64_extension_lite, 410);
-  message->SetExtension(unittest::default_float_extension_lite, 411);
-  message->SetExtension(unittest::default_double_extension_lite, 412);
-  message->SetExtension(unittest::default_bool_extension_lite, false);
-  message->SetExtension(unittest::default_string_extension_lite, "415");
-  message->SetExtension(unittest::default_bytes_extension_lite, "416");
-
-  message->SetExtension(unittest::default_nested_enum_extension_lite,
-                        unittest::TestAllTypesLite::FOO);
-  message->SetExtension(unittest::default_foreign_enum_extension_lite,
-                        unittest::FOREIGN_LITE_FOO);
-  message->SetExtension(unittest::default_import_enum_extension_lite,
-                        unittest_import::IMPORT_LITE_FOO);
-
-
-  message->SetExtension(unittest::oneof_uint32_extension_lite, 601);
-  message->MutableExtension(unittest::oneof_nested_message_extension_lite)
-      ->set_bb(602);
-  ;
-  message->SetExtension(unittest::oneof_string_extension_lite, "603");
-  message->SetExtension(unittest::oneof_bytes_extension_lite, "604");
-}
-
-// -------------------------------------------------------------------
-
-void TestUtilLite::ModifyRepeatedExtensions(
-    unittest::TestAllExtensionsLite* message) {
-  message->SetExtension(unittest::repeated_int32_extension_lite, 1, 501);
-  message->SetExtension(unittest::repeated_int64_extension_lite, 1, 502);
-  message->SetExtension(unittest::repeated_uint32_extension_lite, 1, 503);
-  message->SetExtension(unittest::repeated_uint64_extension_lite, 1, 504);
-  message->SetExtension(unittest::repeated_sint32_extension_lite, 1, 505);
-  message->SetExtension(unittest::repeated_sint64_extension_lite, 1, 506);
-  message->SetExtension(unittest::repeated_fixed32_extension_lite, 1, 507);
-  message->SetExtension(unittest::repeated_fixed64_extension_lite, 1, 508);
-  message->SetExtension(unittest::repeated_sfixed32_extension_lite, 1, 509);
-  message->SetExtension(unittest::repeated_sfixed64_extension_lite, 1, 510);
-  message->SetExtension(unittest::repeated_float_extension_lite, 1, 511);
-  message->SetExtension(unittest::repeated_double_extension_lite, 1, 512);
-  message->SetExtension(unittest::repeated_bool_extension_lite, 1, true);
-  message->SetExtension(unittest::repeated_string_extension_lite, 1, "515");
-  message->SetExtension(unittest::repeated_bytes_extension_lite, 1, "516");
-
-  message->MutableExtension(unittest::repeatedgroup_extension_lite, 1)
-      ->set_a(517);
-  message->MutableExtension(unittest::repeated_nested_message_extension_lite, 1)
-      ->set_bb(518);
-  message
-      ->MutableExtension(unittest::repeated_foreign_message_extension_lite, 1)
-      ->set_c(519);
-  message->MutableExtension(unittest::repeated_import_message_extension_lite, 1)
-      ->set_d(520);
-  message->MutableExtension(unittest::repeated_lazy_message_extension_lite, 1)
-      ->set_bb(527);
-
-  message->SetExtension(unittest::repeated_nested_enum_extension_lite, 1,
-                        unittest::TestAllTypesLite::FOO);
-  message->SetExtension(unittest::repeated_foreign_enum_extension_lite, 1,
-                        unittest::FOREIGN_LITE_FOO);
-  message->SetExtension(unittest::repeated_import_enum_extension_lite, 1,
-                        unittest_import::IMPORT_LITE_FOO);
-
-}
-
-// -------------------------------------------------------------------
-
-void TestUtilLite::ExpectAllExtensionsSet(
-    const unittest::TestAllExtensionsLite& message) {
-  EXPECT_TRUE(message.HasExtension(unittest::optional_int32_extension_lite));
-  EXPECT_TRUE(message.HasExtension(unittest::optional_int64_extension_lite));
-  EXPECT_TRUE(message.HasExtension(unittest::optional_uint32_extension_lite));
-  EXPECT_TRUE(message.HasExtension(unittest::optional_uint64_extension_lite));
-  EXPECT_TRUE(message.HasExtension(unittest::optional_sint32_extension_lite));
-  EXPECT_TRUE(message.HasExtension(unittest::optional_sint64_extension_lite));
-  EXPECT_TRUE(message.HasExtension(unittest::optional_fixed32_extension_lite));
-  EXPECT_TRUE(message.HasExtension(unittest::optional_fixed64_extension_lite));
-  EXPECT_TRUE(message.HasExtension(unittest::optional_sfixed32_extension_lite));
-  EXPECT_TRUE(message.HasExtension(unittest::optional_sfixed64_extension_lite));
-  EXPECT_TRUE(message.HasExtension(unittest::optional_float_extension_lite));
-  EXPECT_TRUE(message.HasExtension(unittest::optional_double_extension_lite));
-  EXPECT_TRUE(message.HasExtension(unittest::optional_bool_extension_lite));
-  EXPECT_TRUE(message.HasExtension(unittest::optional_string_extension_lite));
-  EXPECT_TRUE(message.HasExtension(unittest::optional_bytes_extension_lite));
-
-  EXPECT_TRUE(message.HasExtension(unittest::optionalgroup_extension_lite));
-  EXPECT_TRUE(
-      message.HasExtension(unittest::optional_nested_message_extension_lite));
-  EXPECT_TRUE(
-      message.HasExtension(unittest::optional_foreign_message_extension_lite));
-  EXPECT_TRUE(
-      message.HasExtension(unittest::optional_import_message_extension_lite));
-  EXPECT_TRUE(message.HasExtension(
-      unittest::optional_public_import_message_extension_lite));
-  EXPECT_TRUE(
-      message.HasExtension(unittest::optional_lazy_message_extension_lite));
-  EXPECT_TRUE(message.HasExtension(
-      unittest::optional_unverified_lazy_message_extension_lite));
-
-  EXPECT_TRUE(
-      message.GetExtension(unittest::optionalgroup_extension_lite).has_a());
-  EXPECT_TRUE(
-      message.GetExtension(unittest::optional_nested_message_extension_lite)
-          .has_bb());
-  EXPECT_TRUE(
-      message.GetExtension(unittest::optional_foreign_message_extension_lite)
-          .has_c());
-  EXPECT_TRUE(
-      message.GetExtension(unittest::optional_import_message_extension_lite)
-          .has_d());
-  EXPECT_TRUE(
-      message
-          .GetExtension(unittest::optional_public_import_message_extension_lite)
-          .has_e());
-  EXPECT_TRUE(
-      message.GetExtension(unittest::optional_lazy_message_extension_lite)
-          .has_bb());
-  EXPECT_TRUE(message
-                  .GetExtension(
-                      unittest::optional_unverified_lazy_message_extension_lite)
-                  .has_bb());
-
-  EXPECT_TRUE(
-      message.HasExtension(unittest::optional_nested_enum_extension_lite));
-  EXPECT_TRUE(
-      message.HasExtension(unittest::optional_foreign_enum_extension_lite));
-  EXPECT_TRUE(
-      message.HasExtension(unittest::optional_import_enum_extension_lite));
-
-
-  EXPECT_EQ(101, message.GetExtension(unittest::optional_int32_extension_lite));
-  EXPECT_EQ(102, message.GetExtension(unittest::optional_int64_extension_lite));
-  EXPECT_EQ(103,
-            message.GetExtension(unittest::optional_uint32_extension_lite));
-  EXPECT_EQ(104,
-            message.GetExtension(unittest::optional_uint64_extension_lite));
-  EXPECT_EQ(105,
-            message.GetExtension(unittest::optional_sint32_extension_lite));
-  EXPECT_EQ(106,
-            message.GetExtension(unittest::optional_sint64_extension_lite));
-  EXPECT_EQ(107,
-            message.GetExtension(unittest::optional_fixed32_extension_lite));
-  EXPECT_EQ(108,
-            message.GetExtension(unittest::optional_fixed64_extension_lite));
-  EXPECT_EQ(109,
-            message.GetExtension(unittest::optional_sfixed32_extension_lite));
-  EXPECT_EQ(110,
-            message.GetExtension(unittest::optional_sfixed64_extension_lite));
-  EXPECT_EQ(111, message.GetExtension(unittest::optional_float_extension_lite));
-  EXPECT_EQ(112,
-            message.GetExtension(unittest::optional_double_extension_lite));
-  EXPECT_EQ(true, message.GetExtension(unittest::optional_bool_extension_lite));
-  EXPECT_EQ("115",
-            message.GetExtension(unittest::optional_string_extension_lite));
-  EXPECT_EQ("116",
-            message.GetExtension(unittest::optional_bytes_extension_lite));
-
-  EXPECT_EQ(117,
-            message.GetExtension(unittest::optionalgroup_extension_lite).a());
-  EXPECT_EQ(
-      118,
-      message.GetExtension(unittest::optional_nested_message_extension_lite)
-          .bb());
-  EXPECT_EQ(
-      119,
-      message.GetExtension(unittest::optional_foreign_message_extension_lite)
-          .c());
-  EXPECT_EQ(
-      120,
-      message.GetExtension(unittest::optional_import_message_extension_lite)
-          .d());
-  EXPECT_EQ(
-      126,
-      message
-          .GetExtension(unittest::optional_public_import_message_extension_lite)
-          .e());
-  EXPECT_EQ(127,
-            message.GetExtension(unittest::optional_lazy_message_extension_lite)
-                .bb());
-  EXPECT_EQ(128,
-            message
-                .GetExtension(
-                    unittest::optional_unverified_lazy_message_extension_lite)
-                .bb());
-
-  EXPECT_EQ(
-      unittest::TestAllTypesLite::BAZ,
-      message.GetExtension(unittest::optional_nested_enum_extension_lite));
-  EXPECT_EQ(
-      unittest::FOREIGN_LITE_BAZ,
-      message.GetExtension(unittest::optional_foreign_enum_extension_lite));
-  EXPECT_EQ(
-      unittest_import::IMPORT_LITE_BAZ,
-      message.GetExtension(unittest::optional_import_enum_extension_lite));
-
-
-  // -----------------------------------------------------------------
-
-  ASSERT_EQ(2, message.ExtensionSize(unittest::repeated_int32_extension_lite));
-  ASSERT_EQ(2, message.ExtensionSize(unittest::repeated_int64_extension_lite));
-  ASSERT_EQ(2, message.ExtensionSize(unittest::repeated_uint32_extension_lite));
-  ASSERT_EQ(2, message.ExtensionSize(unittest::repeated_uint64_extension_lite));
-  ASSERT_EQ(2, message.ExtensionSize(unittest::repeated_sint32_extension_lite));
-  ASSERT_EQ(2, message.ExtensionSize(unittest::repeated_sint64_extension_lite));
-  ASSERT_EQ(2,
-            message.ExtensionSize(unittest::repeated_fixed32_extension_lite));
-  ASSERT_EQ(2,
-            message.ExtensionSize(unittest::repeated_fixed64_extension_lite));
-  ASSERT_EQ(2,
-            message.ExtensionSize(unittest::repeated_sfixed32_extension_lite));
-  ASSERT_EQ(2,
-            message.ExtensionSize(unittest::repeated_sfixed64_extension_lite));
-  ASSERT_EQ(2, message.ExtensionSize(unittest::repeated_float_extension_lite));
-  ASSERT_EQ(2, message.ExtensionSize(unittest::repeated_double_extension_lite));
-  ASSERT_EQ(2, message.ExtensionSize(unittest::repeated_bool_extension_lite));
-  ASSERT_EQ(2, message.ExtensionSize(unittest::repeated_string_extension_lite));
-  ASSERT_EQ(2, message.ExtensionSize(unittest::repeated_bytes_extension_lite));
-
-  ASSERT_EQ(2, message.ExtensionSize(unittest::repeatedgroup_extension_lite));
-  ASSERT_EQ(2, message.ExtensionSize(
-                   unittest::repeated_nested_message_extension_lite));
-  ASSERT_EQ(2, message.ExtensionSize(
-                   unittest::repeated_foreign_message_extension_lite));
-  ASSERT_EQ(2, message.ExtensionSize(
-                   unittest::repeated_import_message_extension_lite));
-  ASSERT_EQ(
-      2, message.ExtensionSize(unittest::repeated_lazy_message_extension_lite));
-  ASSERT_EQ(
-      2, message.ExtensionSize(unittest::repeated_nested_enum_extension_lite));
-  ASSERT_EQ(
-      2, message.ExtensionSize(unittest::repeated_foreign_enum_extension_lite));
-  ASSERT_EQ(
-      2, message.ExtensionSize(unittest::repeated_import_enum_extension_lite));
-
-
-  EXPECT_EQ(201,
-            message.GetExtension(unittest::repeated_int32_extension_lite, 0));
-  EXPECT_EQ(202,
-            message.GetExtension(unittest::repeated_int64_extension_lite, 0));
-  EXPECT_EQ(203,
-            message.GetExtension(unittest::repeated_uint32_extension_lite, 0));
-  EXPECT_EQ(204,
-            message.GetExtension(unittest::repeated_uint64_extension_lite, 0));
-  EXPECT_EQ(205,
-            message.GetExtension(unittest::repeated_sint32_extension_lite, 0));
-  EXPECT_EQ(206,
-            message.GetExtension(unittest::repeated_sint64_extension_lite, 0));
-  EXPECT_EQ(207,
-            message.GetExtension(unittest::repeated_fixed32_extension_lite, 0));
-  EXPECT_EQ(208,
-            message.GetExtension(unittest::repeated_fixed64_extension_lite, 0));
-  EXPECT_EQ(
-      209, message.GetExtension(unittest::repeated_sfixed32_extension_lite, 0));
-  EXPECT_EQ(
-      210, message.GetExtension(unittest::repeated_sfixed64_extension_lite, 0));
-  EXPECT_EQ(211,
-            message.GetExtension(unittest::repeated_float_extension_lite, 0));
-  EXPECT_EQ(212,
-            message.GetExtension(unittest::repeated_double_extension_lite, 0));
-  EXPECT_EQ(true,
-            message.GetExtension(unittest::repeated_bool_extension_lite, 0));
-  EXPECT_EQ("215",
-            message.GetExtension(unittest::repeated_string_extension_lite, 0));
-  EXPECT_EQ("216",
-            message.GetExtension(unittest::repeated_bytes_extension_lite, 0));
-
-  EXPECT_EQ(
-      217, message.GetExtension(unittest::repeatedgroup_extension_lite, 0).a());
-  EXPECT_EQ(
-      218,
-      message.GetExtension(unittest::repeated_nested_message_extension_lite, 0)
-          .bb());
-  EXPECT_EQ(
-      219,
-      message.GetExtension(unittest::repeated_foreign_message_extension_lite, 0)
-          .c());
-  EXPECT_EQ(
-      220,
-      message.GetExtension(unittest::repeated_import_message_extension_lite, 0)
-          .d());
-  EXPECT_EQ(
-      227,
-      message.GetExtension(unittest::repeated_lazy_message_extension_lite, 0)
-          .bb());
-
-  EXPECT_EQ(
-      unittest::TestAllTypesLite::BAR,
-      message.GetExtension(unittest::repeated_nested_enum_extension_lite, 0));
-  EXPECT_EQ(
-      unittest::FOREIGN_LITE_BAR,
-      message.GetExtension(unittest::repeated_foreign_enum_extension_lite, 0));
-  EXPECT_EQ(
-      unittest_import::IMPORT_LITE_BAR,
-      message.GetExtension(unittest::repeated_import_enum_extension_lite, 0));
-
-
-  EXPECT_EQ(301,
-            message.GetExtension(unittest::repeated_int32_extension_lite, 1));
-  EXPECT_EQ(302,
-            message.GetExtension(unittest::repeated_int64_extension_lite, 1));
-  EXPECT_EQ(303,
-            message.GetExtension(unittest::repeated_uint32_extension_lite, 1));
-  EXPECT_EQ(304,
-            message.GetExtension(unittest::repeated_uint64_extension_lite, 1));
-  EXPECT_EQ(305,
-            message.GetExtension(unittest::repeated_sint32_extension_lite, 1));
-  EXPECT_EQ(306,
-            message.GetExtension(unittest::repeated_sint64_extension_lite, 1));
-  EXPECT_EQ(307,
-            message.GetExtension(unittest::repeated_fixed32_extension_lite, 1));
-  EXPECT_EQ(308,
-            message.GetExtension(unittest::repeated_fixed64_extension_lite, 1));
-  EXPECT_EQ(
-      309, message.GetExtension(unittest::repeated_sfixed32_extension_lite, 1));
-  EXPECT_EQ(
-      310, message.GetExtension(unittest::repeated_sfixed64_extension_lite, 1));
-  EXPECT_EQ(311,
-            message.GetExtension(unittest::repeated_float_extension_lite, 1));
-  EXPECT_EQ(312,
-            message.GetExtension(unittest::repeated_double_extension_lite, 1));
-  EXPECT_EQ(false,
-            message.GetExtension(unittest::repeated_bool_extension_lite, 1));
-  EXPECT_EQ("315",
-            message.GetExtension(unittest::repeated_string_extension_lite, 1));
-  EXPECT_EQ("316",
-            message.GetExtension(unittest::repeated_bytes_extension_lite, 1));
-
-  EXPECT_EQ(
-      317, message.GetExtension(unittest::repeatedgroup_extension_lite, 1).a());
-  EXPECT_EQ(
-      318,
-      message.GetExtension(unittest::repeated_nested_message_extension_lite, 1)
-          .bb());
-  EXPECT_EQ(
-      319,
-      message.GetExtension(unittest::repeated_foreign_message_extension_lite, 1)
-          .c());
-  EXPECT_EQ(
-      320,
-      message.GetExtension(unittest::repeated_import_message_extension_lite, 1)
-          .d());
-  EXPECT_EQ(
-      327,
-      message.GetExtension(unittest::repeated_lazy_message_extension_lite, 1)
-          .bb());
-
-  EXPECT_EQ(
-      unittest::TestAllTypesLite::BAZ,
-      message.GetExtension(unittest::repeated_nested_enum_extension_lite, 1));
-  EXPECT_EQ(
-      unittest::FOREIGN_LITE_BAZ,
-      message.GetExtension(unittest::repeated_foreign_enum_extension_lite, 1));
-  EXPECT_EQ(
-      unittest_import::IMPORT_LITE_BAZ,
-      message.GetExtension(unittest::repeated_import_enum_extension_lite, 1));
-
-
-  // -----------------------------------------------------------------
-
-  EXPECT_TRUE(message.HasExtension(unittest::default_int32_extension_lite));
-  EXPECT_TRUE(message.HasExtension(unittest::default_int64_extension_lite));
-  EXPECT_TRUE(message.HasExtension(unittest::default_uint32_extension_lite));
-  EXPECT_TRUE(message.HasExtension(unittest::default_uint64_extension_lite));
-  EXPECT_TRUE(message.HasExtension(unittest::default_sint32_extension_lite));
-  EXPECT_TRUE(message.HasExtension(unittest::default_sint64_extension_lite));
-  EXPECT_TRUE(message.HasExtension(unittest::default_fixed32_extension_lite));
-  EXPECT_TRUE(message.HasExtension(unittest::default_fixed64_extension_lite));
-  EXPECT_TRUE(message.HasExtension(unittest::default_sfixed32_extension_lite));
-  EXPECT_TRUE(message.HasExtension(unittest::default_sfixed64_extension_lite));
-  EXPECT_TRUE(message.HasExtension(unittest::default_float_extension_lite));
-  EXPECT_TRUE(message.HasExtension(unittest::default_double_extension_lite));
-  EXPECT_TRUE(message.HasExtension(unittest::default_bool_extension_lite));
-  EXPECT_TRUE(message.HasExtension(unittest::default_string_extension_lite));
-  EXPECT_TRUE(message.HasExtension(unittest::default_bytes_extension_lite));
-
-  EXPECT_TRUE(
-      message.HasExtension(unittest::default_nested_enum_extension_lite));
-  EXPECT_TRUE(
-      message.HasExtension(unittest::default_foreign_enum_extension_lite));
-  EXPECT_TRUE(
-      message.HasExtension(unittest::default_import_enum_extension_lite));
-
-
-  EXPECT_EQ(401, message.GetExtension(unittest::default_int32_extension_lite));
-  EXPECT_EQ(402, message.GetExtension(unittest::default_int64_extension_lite));
-  EXPECT_EQ(403, message.GetExtension(unittest::default_uint32_extension_lite));
-  EXPECT_EQ(404, message.GetExtension(unittest::default_uint64_extension_lite));
-  EXPECT_EQ(405, message.GetExtension(unittest::default_sint32_extension_lite));
-  EXPECT_EQ(406, message.GetExtension(unittest::default_sint64_extension_lite));
-  EXPECT_EQ(407,
-            message.GetExtension(unittest::default_fixed32_extension_lite));
-  EXPECT_EQ(408,
-            message.GetExtension(unittest::default_fixed64_extension_lite));
-  EXPECT_EQ(409,
-            message.GetExtension(unittest::default_sfixed32_extension_lite));
-  EXPECT_EQ(410,
-            message.GetExtension(unittest::default_sfixed64_extension_lite));
-  EXPECT_EQ(411, message.GetExtension(unittest::default_float_extension_lite));
-  EXPECT_EQ(412, message.GetExtension(unittest::default_double_extension_lite));
-  EXPECT_EQ(false, message.GetExtension(unittest::default_bool_extension_lite));
-  EXPECT_EQ("415",
-            message.GetExtension(unittest::default_string_extension_lite));
-  EXPECT_EQ("416",
-            message.GetExtension(unittest::default_bytes_extension_lite));
-
-  EXPECT_EQ(unittest::TestAllTypesLite::FOO,
-            message.GetExtension(unittest::default_nested_enum_extension_lite));
-  EXPECT_EQ(
-      unittest::FOREIGN_LITE_FOO,
-      message.GetExtension(unittest::default_foreign_enum_extension_lite));
-  EXPECT_EQ(unittest_import::IMPORT_LITE_FOO,
-            message.GetExtension(unittest::default_import_enum_extension_lite));
-
-
-  EXPECT_TRUE(message.HasExtension(unittest::oneof_uint32_extension_lite));
-  EXPECT_TRUE(
-      message.GetExtension(unittest::oneof_nested_message_extension_lite)
-          .has_bb());
-  EXPECT_TRUE(message.HasExtension(unittest::oneof_string_extension_lite));
-  EXPECT_TRUE(message.HasExtension(unittest::oneof_bytes_extension_lite));
-
-  EXPECT_EQ(601, message.GetExtension(unittest::oneof_uint32_extension_lite));
-  EXPECT_EQ(
-      602,
-      message.GetExtension(unittest::oneof_nested_message_extension_lite).bb());
-  EXPECT_EQ("603", message.GetExtension(unittest::oneof_string_extension_lite));
-  EXPECT_EQ("604", message.GetExtension(unittest::oneof_bytes_extension_lite));
-}
-
-// -------------------------------------------------------------------
-
-void TestUtilLite::ExpectExtensionsClear(
-    const unittest::TestAllExtensionsLite& message) {
-  std::string serialized;
-  ASSERT_TRUE(message.SerializeToString(&serialized));
-  EXPECT_EQ("", serialized);
-  EXPECT_EQ(0, message.ByteSizeLong());
-
-  // has_blah() should initially be false for all optional fields.
-  EXPECT_FALSE(message.HasExtension(unittest::optional_int32_extension_lite));
-  EXPECT_FALSE(message.HasExtension(unittest::optional_int64_extension_lite));
-  EXPECT_FALSE(message.HasExtension(unittest::optional_uint32_extension_lite));
-  EXPECT_FALSE(message.HasExtension(unittest::optional_uint64_extension_lite));
-  EXPECT_FALSE(message.HasExtension(unittest::optional_sint32_extension_lite));
-  EXPECT_FALSE(message.HasExtension(unittest::optional_sint64_extension_lite));
-  EXPECT_FALSE(message.HasExtension(unittest::optional_fixed32_extension_lite));
-  EXPECT_FALSE(message.HasExtension(unittest::optional_fixed64_extension_lite));
-  EXPECT_FALSE(
-      message.HasExtension(unittest::optional_sfixed32_extension_lite));
-  EXPECT_FALSE(
-      message.HasExtension(unittest::optional_sfixed64_extension_lite));
-  EXPECT_FALSE(message.HasExtension(unittest::optional_float_extension_lite));
-  EXPECT_FALSE(message.HasExtension(unittest::optional_double_extension_lite));
-  EXPECT_FALSE(message.HasExtension(unittest::optional_bool_extension_lite));
-  EXPECT_FALSE(message.HasExtension(unittest::optional_string_extension_lite));
-  EXPECT_FALSE(message.HasExtension(unittest::optional_bytes_extension_lite));
-
-  EXPECT_FALSE(message.HasExtension(unittest::optionalgroup_extension_lite));
-  EXPECT_FALSE(
-      message.HasExtension(unittest::optional_nested_message_extension_lite));
-  EXPECT_FALSE(
-      message.HasExtension(unittest::optional_foreign_message_extension_lite));
-  EXPECT_FALSE(
-      message.HasExtension(unittest::optional_import_message_extension_lite));
-  EXPECT_FALSE(message.HasExtension(
-      unittest::optional_public_import_message_extension_lite));
-  EXPECT_FALSE(
-      message.HasExtension(unittest::optional_lazy_message_extension_lite));
-
-  EXPECT_FALSE(
-      message.HasExtension(unittest::optional_nested_enum_extension_lite));
-  EXPECT_FALSE(
-      message.HasExtension(unittest::optional_foreign_enum_extension_lite));
-  EXPECT_FALSE(
-      message.HasExtension(unittest::optional_import_enum_extension_lite));
-
-
-  // Optional fields without defaults are set to zero or something like it.
-  EXPECT_EQ(0, message.GetExtension(unittest::optional_int32_extension_lite));
-  EXPECT_EQ(0, message.GetExtension(unittest::optional_int64_extension_lite));
-  EXPECT_EQ(0, message.GetExtension(unittest::optional_uint32_extension_lite));
-  EXPECT_EQ(0, message.GetExtension(unittest::optional_uint64_extension_lite));
-  EXPECT_EQ(0, message.GetExtension(unittest::optional_sint32_extension_lite));
-  EXPECT_EQ(0, message.GetExtension(unittest::optional_sint64_extension_lite));
-  EXPECT_EQ(0, message.GetExtension(unittest::optional_fixed32_extension_lite));
-  EXPECT_EQ(0, message.GetExtension(unittest::optional_fixed64_extension_lite));
-  EXPECT_EQ(0,
-            message.GetExtension(unittest::optional_sfixed32_extension_lite));
-  EXPECT_EQ(0,
-            message.GetExtension(unittest::optional_sfixed64_extension_lite));
-  EXPECT_EQ(0, message.GetExtension(unittest::optional_float_extension_lite));
-  EXPECT_EQ(0, message.GetExtension(unittest::optional_double_extension_lite));
-  EXPECT_EQ(false,
-            message.GetExtension(unittest::optional_bool_extension_lite));
-  EXPECT_EQ("", message.GetExtension(unittest::optional_string_extension_lite));
-  EXPECT_EQ("", message.GetExtension(unittest::optional_bytes_extension_lite));
-
-  // Embedded messages should also be clear.
-  EXPECT_FALSE(
-      message.GetExtension(unittest::optionalgroup_extension_lite).has_a());
-  EXPECT_FALSE(
-      message.GetExtension(unittest::optional_nested_message_extension_lite)
-          .has_bb());
-  EXPECT_FALSE(
-      message.GetExtension(unittest::optional_foreign_message_extension_lite)
-          .has_c());
-  EXPECT_FALSE(
-      message.GetExtension(unittest::optional_import_message_extension_lite)
-          .has_d());
-  EXPECT_FALSE(
-      message
-          .GetExtension(unittest::optional_public_import_message_extension_lite)
-          .has_e());
-  EXPECT_FALSE(
-      message.GetExtension(unittest::optional_lazy_message_extension_lite)
-          .has_bb());
-
-  EXPECT_EQ(0,
-            message.GetExtension(unittest::optionalgroup_extension_lite).a());
-  EXPECT_EQ(
-      0, message.GetExtension(unittest::optional_nested_message_extension_lite)
-             .bb());
-  EXPECT_EQ(
-      0, message.GetExtension(unittest::optional_foreign_message_extension_lite)
-             .c());
-  EXPECT_EQ(
-      0, message.GetExtension(unittest::optional_import_message_extension_lite)
-             .d());
-  EXPECT_EQ(0, message
-                   .GetExtension(
-                       unittest::optional_public_import_message_extension_lite)
-                   .e());
-  EXPECT_EQ(0,
-            message.GetExtension(unittest::optional_lazy_message_extension_lite)
-                .bb());
-
-  // Enums without defaults are set to the first value in the enum.
-  EXPECT_EQ(
-      unittest::TestAllTypesLite::FOO,
-      message.GetExtension(unittest::optional_nested_enum_extension_lite));
-  EXPECT_EQ(
-      unittest::FOREIGN_LITE_FOO,
-      message.GetExtension(unittest::optional_foreign_enum_extension_lite));
-  EXPECT_EQ(
-      unittest_import::IMPORT_LITE_FOO,
-      message.GetExtension(unittest::optional_import_enum_extension_lite));
-
-
-  // Repeated fields are empty.
-  EXPECT_EQ(0, message.ExtensionSize(unittest::repeated_int32_extension_lite));
-  EXPECT_EQ(0, message.ExtensionSize(unittest::repeated_int64_extension_lite));
-  EXPECT_EQ(0, message.ExtensionSize(unittest::repeated_uint32_extension_lite));
-  EXPECT_EQ(0, message.ExtensionSize(unittest::repeated_uint64_extension_lite));
-  EXPECT_EQ(0, message.ExtensionSize(unittest::repeated_sint32_extension_lite));
-  EXPECT_EQ(0, message.ExtensionSize(unittest::repeated_sint64_extension_lite));
-  EXPECT_EQ(0,
-            message.ExtensionSize(unittest::repeated_fixed32_extension_lite));
-  EXPECT_EQ(0,
-            message.ExtensionSize(unittest::repeated_fixed64_extension_lite));
-  EXPECT_EQ(0,
-            message.ExtensionSize(unittest::repeated_sfixed32_extension_lite));
-  EXPECT_EQ(0,
-            message.ExtensionSize(unittest::repeated_sfixed64_extension_lite));
-  EXPECT_EQ(0, message.ExtensionSize(unittest::repeated_float_extension_lite));
-  EXPECT_EQ(0, message.ExtensionSize(unittest::repeated_double_extension_lite));
-  EXPECT_EQ(0, message.ExtensionSize(unittest::repeated_bool_extension_lite));
-  EXPECT_EQ(0, message.ExtensionSize(unittest::repeated_string_extension_lite));
-  EXPECT_EQ(0, message.ExtensionSize(unittest::repeated_bytes_extension_lite));
-
-  EXPECT_EQ(0, message.ExtensionSize(unittest::repeatedgroup_extension_lite));
-  EXPECT_EQ(0, message.ExtensionSize(
-                   unittest::repeated_nested_message_extension_lite));
-  EXPECT_EQ(0, message.ExtensionSize(
-                   unittest::repeated_foreign_message_extension_lite));
-  EXPECT_EQ(0, message.ExtensionSize(
-                   unittest::repeated_import_message_extension_lite));
-  EXPECT_EQ(
-      0, message.ExtensionSize(unittest::repeated_lazy_message_extension_lite));
-  EXPECT_EQ(
-      0, message.ExtensionSize(unittest::repeated_nested_enum_extension_lite));
-  EXPECT_EQ(
-      0, message.ExtensionSize(unittest::repeated_foreign_enum_extension_lite));
-  EXPECT_EQ(
-      0, message.ExtensionSize(unittest::repeated_import_enum_extension_lite));
-
-
-  // has_blah() should also be false for all default fields.
-  EXPECT_FALSE(message.HasExtension(unittest::default_int32_extension_lite));
-  EXPECT_FALSE(message.HasExtension(unittest::default_int64_extension_lite));
-  EXPECT_FALSE(message.HasExtension(unittest::default_uint32_extension_lite));
-  EXPECT_FALSE(message.HasExtension(unittest::default_uint64_extension_lite));
-  EXPECT_FALSE(message.HasExtension(unittest::default_sint32_extension_lite));
-  EXPECT_FALSE(message.HasExtension(unittest::default_sint64_extension_lite));
-  EXPECT_FALSE(message.HasExtension(unittest::default_fixed32_extension_lite));
-  EXPECT_FALSE(message.HasExtension(unittest::default_fixed64_extension_lite));
-  EXPECT_FALSE(message.HasExtension(unittest::default_sfixed32_extension_lite));
-  EXPECT_FALSE(message.HasExtension(unittest::default_sfixed64_extension_lite));
-  EXPECT_FALSE(message.HasExtension(unittest::default_float_extension_lite));
-  EXPECT_FALSE(message.HasExtension(unittest::default_double_extension_lite));
-  EXPECT_FALSE(message.HasExtension(unittest::default_bool_extension_lite));
-  EXPECT_FALSE(message.HasExtension(unittest::default_string_extension_lite));
-  EXPECT_FALSE(message.HasExtension(unittest::default_bytes_extension_lite));
-
-  EXPECT_FALSE(
-      message.HasExtension(unittest::default_nested_enum_extension_lite));
-  EXPECT_FALSE(
-      message.HasExtension(unittest::default_foreign_enum_extension_lite));
-  EXPECT_FALSE(
-      message.HasExtension(unittest::default_import_enum_extension_lite));
-
-
-  // Fields with defaults have their default values (duh).
-  EXPECT_EQ(41, message.GetExtension(unittest::default_int32_extension_lite));
-  EXPECT_EQ(42, message.GetExtension(unittest::default_int64_extension_lite));
-  EXPECT_EQ(43, message.GetExtension(unittest::default_uint32_extension_lite));
-  EXPECT_EQ(44, message.GetExtension(unittest::default_uint64_extension_lite));
-  EXPECT_EQ(-45, message.GetExtension(unittest::default_sint32_extension_lite));
-  EXPECT_EQ(46, message.GetExtension(unittest::default_sint64_extension_lite));
-  EXPECT_EQ(47, message.GetExtension(unittest::default_fixed32_extension_lite));
-  EXPECT_EQ(48, message.GetExtension(unittest::default_fixed64_extension_lite));
-  EXPECT_EQ(49,
-            message.GetExtension(unittest::default_sfixed32_extension_lite));
-  EXPECT_EQ(-50,
-            message.GetExtension(unittest::default_sfixed64_extension_lite));
-  EXPECT_EQ(51.5, message.GetExtension(unittest::default_float_extension_lite));
-  EXPECT_EQ(52e3,
-            message.GetExtension(unittest::default_double_extension_lite));
-  EXPECT_EQ(true, message.GetExtension(unittest::default_bool_extension_lite));
-  EXPECT_EQ("hello",
-            message.GetExtension(unittest::default_string_extension_lite));
-  EXPECT_EQ("world",
-            message.GetExtension(unittest::default_bytes_extension_lite));
-
-  EXPECT_EQ(unittest::TestAllTypesLite::BAR,
-            message.GetExtension(unittest::default_nested_enum_extension_lite));
-  EXPECT_EQ(
-      unittest::FOREIGN_LITE_BAR,
-      message.GetExtension(unittest::default_foreign_enum_extension_lite));
-  EXPECT_EQ(unittest_import::IMPORT_LITE_BAR,
-            message.GetExtension(unittest::default_import_enum_extension_lite));
-
-
-  EXPECT_FALSE(message.HasExtension(unittest::oneof_uint32_extension_lite));
-  EXPECT_FALSE(
-      message.GetExtension(unittest::oneof_nested_message_extension_lite)
-          .has_bb());
-  EXPECT_FALSE(message.HasExtension(unittest::oneof_string_extension_lite));
-  EXPECT_FALSE(message.HasExtension(unittest::oneof_bytes_extension_lite));
-}
-
-// -------------------------------------------------------------------
-
-void TestUtilLite::ExpectRepeatedExtensionsModified(
-    const unittest::TestAllExtensionsLite& message) {
-  // ModifyRepeatedFields only sets the second repeated element of each
-  // field.  In addition to verifying this, we also verify that the first
-  // element and size were *not* modified.
-  ASSERT_EQ(2, message.ExtensionSize(unittest::repeated_int32_extension_lite));
-  ASSERT_EQ(2, message.ExtensionSize(unittest::repeated_int64_extension_lite));
-  ASSERT_EQ(2, message.ExtensionSize(unittest::repeated_uint32_extension_lite));
-  ASSERT_EQ(2, message.ExtensionSize(unittest::repeated_uint64_extension_lite));
-  ASSERT_EQ(2, message.ExtensionSize(unittest::repeated_sint32_extension_lite));
-  ASSERT_EQ(2, message.ExtensionSize(unittest::repeated_sint64_extension_lite));
-  ASSERT_EQ(2,
-            message.ExtensionSize(unittest::repeated_fixed32_extension_lite));
-  ASSERT_EQ(2,
-            message.ExtensionSize(unittest::repeated_fixed64_extension_lite));
-  ASSERT_EQ(2,
-            message.ExtensionSize(unittest::repeated_sfixed32_extension_lite));
-  ASSERT_EQ(2,
-            message.ExtensionSize(unittest::repeated_sfixed64_extension_lite));
-  ASSERT_EQ(2, message.ExtensionSize(unittest::repeated_float_extension_lite));
-  ASSERT_EQ(2, message.ExtensionSize(unittest::repeated_double_extension_lite));
-  ASSERT_EQ(2, message.ExtensionSize(unittest::repeated_bool_extension_lite));
-  ASSERT_EQ(2, message.ExtensionSize(unittest::repeated_string_extension_lite));
-  ASSERT_EQ(2, message.ExtensionSize(unittest::repeated_bytes_extension_lite));
-
-  ASSERT_EQ(2, message.ExtensionSize(unittest::repeatedgroup_extension_lite));
-  ASSERT_EQ(2, message.ExtensionSize(
-                   unittest::repeated_nested_message_extension_lite));
-  ASSERT_EQ(2, message.ExtensionSize(
-                   unittest::repeated_foreign_message_extension_lite));
-  ASSERT_EQ(2, message.ExtensionSize(
-                   unittest::repeated_import_message_extension_lite));
-  ASSERT_EQ(
-      2, message.ExtensionSize(unittest::repeated_lazy_message_extension_lite));
-  ASSERT_EQ(
-      2, message.ExtensionSize(unittest::repeated_nested_enum_extension_lite));
-  ASSERT_EQ(
-      2, message.ExtensionSize(unittest::repeated_foreign_enum_extension_lite));
-  ASSERT_EQ(
-      2, message.ExtensionSize(unittest::repeated_import_enum_extension_lite));
-
-
-  EXPECT_EQ(201,
-            message.GetExtension(unittest::repeated_int32_extension_lite, 0));
-  EXPECT_EQ(202,
-            message.GetExtension(unittest::repeated_int64_extension_lite, 0));
-  EXPECT_EQ(203,
-            message.GetExtension(unittest::repeated_uint32_extension_lite, 0));
-  EXPECT_EQ(204,
-            message.GetExtension(unittest::repeated_uint64_extension_lite, 0));
-  EXPECT_EQ(205,
-            message.GetExtension(unittest::repeated_sint32_extension_lite, 0));
-  EXPECT_EQ(206,
-            message.GetExtension(unittest::repeated_sint64_extension_lite, 0));
-  EXPECT_EQ(207,
-            message.GetExtension(unittest::repeated_fixed32_extension_lite, 0));
-  EXPECT_EQ(208,
-            message.GetExtension(unittest::repeated_fixed64_extension_lite, 0));
-  EXPECT_EQ(
-      209, message.GetExtension(unittest::repeated_sfixed32_extension_lite, 0));
-  EXPECT_EQ(
-      210, message.GetExtension(unittest::repeated_sfixed64_extension_lite, 0));
-  EXPECT_EQ(211,
-            message.GetExtension(unittest::repeated_float_extension_lite, 0));
-  EXPECT_EQ(212,
-            message.GetExtension(unittest::repeated_double_extension_lite, 0));
-  EXPECT_EQ(true,
-            message.GetExtension(unittest::repeated_bool_extension_lite, 0));
-  EXPECT_EQ("215",
-            message.GetExtension(unittest::repeated_string_extension_lite, 0));
-  EXPECT_EQ("216",
-            message.GetExtension(unittest::repeated_bytes_extension_lite, 0));
-
-  EXPECT_EQ(
-      217, message.GetExtension(unittest::repeatedgroup_extension_lite, 0).a());
-  EXPECT_EQ(
-      218,
-      message.GetExtension(unittest::repeated_nested_message_extension_lite, 0)
-          .bb());
-  EXPECT_EQ(
-      219,
-      message.GetExtension(unittest::repeated_foreign_message_extension_lite, 0)
-          .c());
-  EXPECT_EQ(
-      220,
-      message.GetExtension(unittest::repeated_import_message_extension_lite, 0)
-          .d());
-  EXPECT_EQ(
-      227,
-      message.GetExtension(unittest::repeated_lazy_message_extension_lite, 0)
-          .bb());
-
-  EXPECT_EQ(
-      unittest::TestAllTypesLite::BAR,
-      message.GetExtension(unittest::repeated_nested_enum_extension_lite, 0));
-  EXPECT_EQ(
-      unittest::FOREIGN_LITE_BAR,
-      message.GetExtension(unittest::repeated_foreign_enum_extension_lite, 0));
-  EXPECT_EQ(
-      unittest_import::IMPORT_LITE_BAR,
-      message.GetExtension(unittest::repeated_import_enum_extension_lite, 0));
-
-
-  // Actually verify the second (modified) elements now.
-  EXPECT_EQ(501,
-            message.GetExtension(unittest::repeated_int32_extension_lite, 1));
-  EXPECT_EQ(502,
-            message.GetExtension(unittest::repeated_int64_extension_lite, 1));
-  EXPECT_EQ(503,
-            message.GetExtension(unittest::repeated_uint32_extension_lite, 1));
-  EXPECT_EQ(504,
-            message.GetExtension(unittest::repeated_uint64_extension_lite, 1));
-  EXPECT_EQ(505,
-            message.GetExtension(unittest::repeated_sint32_extension_lite, 1));
-  EXPECT_EQ(506,
-            message.GetExtension(unittest::repeated_sint64_extension_lite, 1));
-  EXPECT_EQ(507,
-            message.GetExtension(unittest::repeated_fixed32_extension_lite, 1));
-  EXPECT_EQ(508,
-            message.GetExtension(unittest::repeated_fixed64_extension_lite, 1));
-  EXPECT_EQ(
-      509, message.GetExtension(unittest::repeated_sfixed32_extension_lite, 1));
-  EXPECT_EQ(
-      510, message.GetExtension(unittest::repeated_sfixed64_extension_lite, 1));
-  EXPECT_EQ(511,
-            message.GetExtension(unittest::repeated_float_extension_lite, 1));
-  EXPECT_EQ(512,
-            message.GetExtension(unittest::repeated_double_extension_lite, 1));
-  EXPECT_EQ(true,
-            message.GetExtension(unittest::repeated_bool_extension_lite, 1));
-  EXPECT_EQ("515",
-            message.GetExtension(unittest::repeated_string_extension_lite, 1));
-  EXPECT_EQ("516",
-            message.GetExtension(unittest::repeated_bytes_extension_lite, 1));
-
-  EXPECT_EQ(
-      517, message.GetExtension(unittest::repeatedgroup_extension_lite, 1).a());
-  EXPECT_EQ(
-      518,
-      message.GetExtension(unittest::repeated_nested_message_extension_lite, 1)
-          .bb());
-  EXPECT_EQ(
-      519,
-      message.GetExtension(unittest::repeated_foreign_message_extension_lite, 1)
-          .c());
-  EXPECT_EQ(
-      520,
-      message.GetExtension(unittest::repeated_import_message_extension_lite, 1)
-          .d());
-  EXPECT_EQ(
-      527,
-      message.GetExtension(unittest::repeated_lazy_message_extension_lite, 1)
-          .bb());
-
-  EXPECT_EQ(
-      unittest::TestAllTypesLite::FOO,
-      message.GetExtension(unittest::repeated_nested_enum_extension_lite, 1));
-  EXPECT_EQ(
-      unittest::FOREIGN_LITE_FOO,
-      message.GetExtension(unittest::repeated_foreign_enum_extension_lite, 1));
-  EXPECT_EQ(
-      unittest_import::IMPORT_LITE_FOO,
-      message.GetExtension(unittest::repeated_import_enum_extension_lite, 1));
-
-}
-
-// -------------------------------------------------------------------
-
-void TestUtilLite::SetPackedExtensions(
-    unittest::TestPackedExtensionsLite* message) {
-  message->AddExtension(unittest::packed_int32_extension_lite, 601);
-  message->AddExtension(unittest::packed_int64_extension_lite, 602);
-  message->AddExtension(unittest::packed_uint32_extension_lite, 603);
-  message->AddExtension(unittest::packed_uint64_extension_lite, 604);
-  message->AddExtension(unittest::packed_sint32_extension_lite, 605);
-  message->AddExtension(unittest::packed_sint64_extension_lite, 606);
-  message->AddExtension(unittest::packed_fixed32_extension_lite, 607);
-  message->AddExtension(unittest::packed_fixed64_extension_lite, 608);
-  message->AddExtension(unittest::packed_sfixed32_extension_lite, 609);
-  message->AddExtension(unittest::packed_sfixed64_extension_lite, 610);
-  message->AddExtension(unittest::packed_float_extension_lite, 611);
-  message->AddExtension(unittest::packed_double_extension_lite, 612);
-  message->AddExtension(unittest::packed_bool_extension_lite, true);
-  message->AddExtension(unittest::packed_enum_extension_lite,
-                        unittest::FOREIGN_LITE_BAR);
-  // add a second one of each field
-  message->AddExtension(unittest::packed_int32_extension_lite, 701);
-  message->AddExtension(unittest::packed_int64_extension_lite, 702);
-  message->AddExtension(unittest::packed_uint32_extension_lite, 703);
-  message->AddExtension(unittest::packed_uint64_extension_lite, 704);
-  message->AddExtension(unittest::packed_sint32_extension_lite, 705);
-  message->AddExtension(unittest::packed_sint64_extension_lite, 706);
-  message->AddExtension(unittest::packed_fixed32_extension_lite, 707);
-  message->AddExtension(unittest::packed_fixed64_extension_lite, 708);
-  message->AddExtension(unittest::packed_sfixed32_extension_lite, 709);
-  message->AddExtension(unittest::packed_sfixed64_extension_lite, 710);
-  message->AddExtension(unittest::packed_float_extension_lite, 711);
-  message->AddExtension(unittest::packed_double_extension_lite, 712);
-  message->AddExtension(unittest::packed_bool_extension_lite, false);
-  message->AddExtension(unittest::packed_enum_extension_lite,
-                        unittest::FOREIGN_LITE_BAZ);
-}
-
-// -------------------------------------------------------------------
-
-void TestUtilLite::ModifyPackedExtensions(
-    unittest::TestPackedExtensionsLite* message) {
-  message->SetExtension(unittest::packed_int32_extension_lite, 1, 801);
-  message->SetExtension(unittest::packed_int64_extension_lite, 1, 802);
-  message->SetExtension(unittest::packed_uint32_extension_lite, 1, 803);
-  message->SetExtension(unittest::packed_uint64_extension_lite, 1, 804);
-  message->SetExtension(unittest::packed_sint32_extension_lite, 1, 805);
-  message->SetExtension(unittest::packed_sint64_extension_lite, 1, 806);
-  message->SetExtension(unittest::packed_fixed32_extension_lite, 1, 807);
-  message->SetExtension(unittest::packed_fixed64_extension_lite, 1, 808);
-  message->SetExtension(unittest::packed_sfixed32_extension_lite, 1, 809);
-  message->SetExtension(unittest::packed_sfixed64_extension_lite, 1, 810);
-  message->SetExtension(unittest::packed_float_extension_lite, 1, 811);
-  message->SetExtension(unittest::packed_double_extension_lite, 1, 812);
-  message->SetExtension(unittest::packed_bool_extension_lite, 1, true);
-  message->SetExtension(unittest::packed_enum_extension_lite, 1,
-                        unittest::FOREIGN_LITE_FOO);
-}
-
-// -------------------------------------------------------------------
-
-void TestUtilLite::ExpectPackedExtensionsSet(
-    const unittest::TestPackedExtensionsLite& message) {
-  ASSERT_EQ(2, message.ExtensionSize(unittest::packed_int32_extension_lite));
-  ASSERT_EQ(2, message.ExtensionSize(unittest::packed_int64_extension_lite));
-  ASSERT_EQ(2, message.ExtensionSize(unittest::packed_uint32_extension_lite));
-  ASSERT_EQ(2, message.ExtensionSize(unittest::packed_uint64_extension_lite));
-  ASSERT_EQ(2, message.ExtensionSize(unittest::packed_sint32_extension_lite));
-  ASSERT_EQ(2, message.ExtensionSize(unittest::packed_sint64_extension_lite));
-  ASSERT_EQ(2, message.ExtensionSize(unittest::packed_fixed32_extension_lite));
-  ASSERT_EQ(2, message.ExtensionSize(unittest::packed_fixed64_extension_lite));
-  ASSERT_EQ(2, message.ExtensionSize(unittest::packed_sfixed32_extension_lite));
-  ASSERT_EQ(2, message.ExtensionSize(unittest::packed_sfixed64_extension_lite));
-  ASSERT_EQ(2, message.ExtensionSize(unittest::packed_float_extension_lite));
-  ASSERT_EQ(2, message.ExtensionSize(unittest::packed_double_extension_lite));
-  ASSERT_EQ(2, message.ExtensionSize(unittest::packed_bool_extension_lite));
-  ASSERT_EQ(2, message.ExtensionSize(unittest::packed_enum_extension_lite));
-
-  EXPECT_EQ(601,
-            message.GetExtension(unittest::packed_int32_extension_lite, 0));
-  EXPECT_EQ(602,
-            message.GetExtension(unittest::packed_int64_extension_lite, 0));
-  EXPECT_EQ(603,
-            message.GetExtension(unittest::packed_uint32_extension_lite, 0));
-  EXPECT_EQ(604,
-            message.GetExtension(unittest::packed_uint64_extension_lite, 0));
-  EXPECT_EQ(605,
-            message.GetExtension(unittest::packed_sint32_extension_lite, 0));
-  EXPECT_EQ(606,
-            message.GetExtension(unittest::packed_sint64_extension_lite, 0));
-  EXPECT_EQ(607,
-            message.GetExtension(unittest::packed_fixed32_extension_lite, 0));
-  EXPECT_EQ(608,
-            message.GetExtension(unittest::packed_fixed64_extension_lite, 0));
-  EXPECT_EQ(609,
-            message.GetExtension(unittest::packed_sfixed32_extension_lite, 0));
-  EXPECT_EQ(610,
-            message.GetExtension(unittest::packed_sfixed64_extension_lite, 0));
-  EXPECT_EQ(611,
-            message.GetExtension(unittest::packed_float_extension_lite, 0));
-  EXPECT_EQ(612,
-            message.GetExtension(unittest::packed_double_extension_lite, 0));
-  EXPECT_EQ(true,
-            message.GetExtension(unittest::packed_bool_extension_lite, 0));
-  EXPECT_EQ(unittest::FOREIGN_LITE_BAR,
-            message.GetExtension(unittest::packed_enum_extension_lite, 0));
-  EXPECT_EQ(701,
-            message.GetExtension(unittest::packed_int32_extension_lite, 1));
-  EXPECT_EQ(702,
-            message.GetExtension(unittest::packed_int64_extension_lite, 1));
-  EXPECT_EQ(703,
-            message.GetExtension(unittest::packed_uint32_extension_lite, 1));
-  EXPECT_EQ(704,
-            message.GetExtension(unittest::packed_uint64_extension_lite, 1));
-  EXPECT_EQ(705,
-            message.GetExtension(unittest::packed_sint32_extension_lite, 1));
-  EXPECT_EQ(706,
-            message.GetExtension(unittest::packed_sint64_extension_lite, 1));
-  EXPECT_EQ(707,
-            message.GetExtension(unittest::packed_fixed32_extension_lite, 1));
-  EXPECT_EQ(708,
-            message.GetExtension(unittest::packed_fixed64_extension_lite, 1));
-  EXPECT_EQ(709,
-            message.GetExtension(unittest::packed_sfixed32_extension_lite, 1));
-  EXPECT_EQ(710,
-            message.GetExtension(unittest::packed_sfixed64_extension_lite, 1));
-  EXPECT_EQ(711,
-            message.GetExtension(unittest::packed_float_extension_lite, 1));
-  EXPECT_EQ(712,
-            message.GetExtension(unittest::packed_double_extension_lite, 1));
-  EXPECT_EQ(false,
-            message.GetExtension(unittest::packed_bool_extension_lite, 1));
-  EXPECT_EQ(unittest::FOREIGN_LITE_BAZ,
-            message.GetExtension(unittest::packed_enum_extension_lite, 1));
-}
-
-// -------------------------------------------------------------------
-
-void TestUtilLite::ExpectPackedExtensionsClear(
-    const unittest::TestPackedExtensionsLite& message) {
-  EXPECT_EQ(0, message.ExtensionSize(unittest::packed_int32_extension_lite));
-  EXPECT_EQ(0, message.ExtensionSize(unittest::packed_int64_extension_lite));
-  EXPECT_EQ(0, message.ExtensionSize(unittest::packed_uint32_extension_lite));
-  EXPECT_EQ(0, message.ExtensionSize(unittest::packed_uint64_extension_lite));
-  EXPECT_EQ(0, message.ExtensionSize(unittest::packed_sint32_extension_lite));
-  EXPECT_EQ(0, message.ExtensionSize(unittest::packed_sint64_extension_lite));
-  EXPECT_EQ(0, message.ExtensionSize(unittest::packed_fixed32_extension_lite));
-  EXPECT_EQ(0, message.ExtensionSize(unittest::packed_fixed64_extension_lite));
-  EXPECT_EQ(0, message.ExtensionSize(unittest::packed_sfixed32_extension_lite));
-  EXPECT_EQ(0, message.ExtensionSize(unittest::packed_sfixed64_extension_lite));
-  EXPECT_EQ(0, message.ExtensionSize(unittest::packed_float_extension_lite));
-  EXPECT_EQ(0, message.ExtensionSize(unittest::packed_double_extension_lite));
-  EXPECT_EQ(0, message.ExtensionSize(unittest::packed_bool_extension_lite));
-  EXPECT_EQ(0, message.ExtensionSize(unittest::packed_enum_extension_lite));
-}
-
-// -------------------------------------------------------------------
-
-void TestUtilLite::ExpectPackedExtensionsModified(
-    const unittest::TestPackedExtensionsLite& message) {
-  ASSERT_EQ(2, message.ExtensionSize(unittest::packed_int32_extension_lite));
-  ASSERT_EQ(2, message.ExtensionSize(unittest::packed_int64_extension_lite));
-  ASSERT_EQ(2, message.ExtensionSize(unittest::packed_uint32_extension_lite));
-  ASSERT_EQ(2, message.ExtensionSize(unittest::packed_uint64_extension_lite));
-  ASSERT_EQ(2, message.ExtensionSize(unittest::packed_sint32_extension_lite));
-  ASSERT_EQ(2, message.ExtensionSize(unittest::packed_sint64_extension_lite));
-  ASSERT_EQ(2, message.ExtensionSize(unittest::packed_fixed32_extension_lite));
-  ASSERT_EQ(2, message.ExtensionSize(unittest::packed_fixed64_extension_lite));
-  ASSERT_EQ(2, message.ExtensionSize(unittest::packed_sfixed32_extension_lite));
-  ASSERT_EQ(2, message.ExtensionSize(unittest::packed_sfixed64_extension_lite));
-  ASSERT_EQ(2, message.ExtensionSize(unittest::packed_float_extension_lite));
-  ASSERT_EQ(2, message.ExtensionSize(unittest::packed_double_extension_lite));
-  ASSERT_EQ(2, message.ExtensionSize(unittest::packed_bool_extension_lite));
-  ASSERT_EQ(2, message.ExtensionSize(unittest::packed_enum_extension_lite));
-  EXPECT_EQ(601,
-            message.GetExtension(unittest::packed_int32_extension_lite, 0));
-  EXPECT_EQ(602,
-            message.GetExtension(unittest::packed_int64_extension_lite, 0));
-  EXPECT_EQ(603,
-            message.GetExtension(unittest::packed_uint32_extension_lite, 0));
-  EXPECT_EQ(604,
-            message.GetExtension(unittest::packed_uint64_extension_lite, 0));
-  EXPECT_EQ(605,
-            message.GetExtension(unittest::packed_sint32_extension_lite, 0));
-  EXPECT_EQ(606,
-            message.GetExtension(unittest::packed_sint64_extension_lite, 0));
-  EXPECT_EQ(607,
-            message.GetExtension(unittest::packed_fixed32_extension_lite, 0));
-  EXPECT_EQ(608,
-            message.GetExtension(unittest::packed_fixed64_extension_lite, 0));
-  EXPECT_EQ(609,
-            message.GetExtension(unittest::packed_sfixed32_extension_lite, 0));
-  EXPECT_EQ(610,
-            message.GetExtension(unittest::packed_sfixed64_extension_lite, 0));
-  EXPECT_EQ(611,
-            message.GetExtension(unittest::packed_float_extension_lite, 0));
-  EXPECT_EQ(612,
-            message.GetExtension(unittest::packed_double_extension_lite, 0));
-  EXPECT_EQ(true,
-            message.GetExtension(unittest::packed_bool_extension_lite, 0));
-  EXPECT_EQ(unittest::FOREIGN_LITE_BAR,
-            message.GetExtension(unittest::packed_enum_extension_lite, 0));
-
-  // Actually verify the second (modified) elements now.
-  EXPECT_EQ(801,
-            message.GetExtension(unittest::packed_int32_extension_lite, 1));
-  EXPECT_EQ(802,
-            message.GetExtension(unittest::packed_int64_extension_lite, 1));
-  EXPECT_EQ(803,
-            message.GetExtension(unittest::packed_uint32_extension_lite, 1));
-  EXPECT_EQ(804,
-            message.GetExtension(unittest::packed_uint64_extension_lite, 1));
-  EXPECT_EQ(805,
-            message.GetExtension(unittest::packed_sint32_extension_lite, 1));
-  EXPECT_EQ(806,
-            message.GetExtension(unittest::packed_sint64_extension_lite, 1));
-  EXPECT_EQ(807,
-            message.GetExtension(unittest::packed_fixed32_extension_lite, 1));
-  EXPECT_EQ(808,
-            message.GetExtension(unittest::packed_fixed64_extension_lite, 1));
-  EXPECT_EQ(809,
-            message.GetExtension(unittest::packed_sfixed32_extension_lite, 1));
-  EXPECT_EQ(810,
-            message.GetExtension(unittest::packed_sfixed64_extension_lite, 1));
-  EXPECT_EQ(811,
-            message.GetExtension(unittest::packed_float_extension_lite, 1));
-  EXPECT_EQ(812,
-            message.GetExtension(unittest::packed_double_extension_lite, 1));
-  EXPECT_EQ(true,
-            message.GetExtension(unittest::packed_bool_extension_lite, 1));
-  EXPECT_EQ(unittest::FOREIGN_LITE_FOO,
-            message.GetExtension(unittest::packed_enum_extension_lite, 1));
-}
-
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/test_util_lite.h b/libs/protobuf/src/google/protobuf/test_util_lite.h
deleted file mode 100644
index 34edf94..0000000
--- a/libs/protobuf/src/google/protobuf/test_util_lite.h
+++ /dev/null
@@ -1,101 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-
-#ifndef GOOGLE_PROTOBUF_TEST_UTIL_LITE_H__
-#define GOOGLE_PROTOBUF_TEST_UTIL_LITE_H__
-
-#include <google/protobuf/unittest_lite.pb.h>
-
-namespace google {
-namespace protobuf {
-
-namespace unittest = protobuf_unittest;
-namespace unittest_import = protobuf_unittest_import;
-
-class TestUtilLite {
- public:
-  // Set every field in the message to a unique value.
-  static void SetAllFields(unittest::TestAllTypesLite* message);
-  static void SetAllExtensions(unittest::TestAllExtensionsLite* message);
-  static void SetPackedFields(unittest::TestPackedTypesLite* message);
-  static void SetPackedExtensions(unittest::TestPackedExtensionsLite* message);
-
-  // Use the repeated versions of the set_*() accessors to modify all the
-  // repeated fields of the message (which should already have been
-  // initialized with Set*Fields()).  Set*Fields() itself only tests
-  // the add_*() accessors.
-  static void ModifyRepeatedFields(unittest::TestAllTypesLite* message);
-  static void ModifyRepeatedExtensions(
-      unittest::TestAllExtensionsLite* message);
-  static void ModifyPackedFields(unittest::TestPackedTypesLite* message);
-  static void ModifyPackedExtensions(
-      unittest::TestPackedExtensionsLite* message);
-
-  // Check that all fields have the values that they should have after
-  // Set*Fields() is called.
-  static void ExpectAllFieldsSet(const unittest::TestAllTypesLite& message);
-  static void ExpectAllExtensionsSet(
-      const unittest::TestAllExtensionsLite& message);
-  static void ExpectPackedFieldsSet(
-      const unittest::TestPackedTypesLite& message);
-  static void ExpectPackedExtensionsSet(
-      const unittest::TestPackedExtensionsLite& message);
-
-  // Expect that the message is modified as would be expected from
-  // Modify*Fields().
-  static void ExpectRepeatedFieldsModified(
-      const unittest::TestAllTypesLite& message);
-  static void ExpectRepeatedExtensionsModified(
-      const unittest::TestAllExtensionsLite& message);
-  static void ExpectPackedFieldsModified(
-      const unittest::TestPackedTypesLite& message);
-  static void ExpectPackedExtensionsModified(
-      const unittest::TestPackedExtensionsLite& message);
-
-  // Check that all fields have their default values.
-  static void ExpectClear(const unittest::TestAllTypesLite& message);
-  static void ExpectExtensionsClear(
-      const unittest::TestAllExtensionsLite& message);
-  static void ExpectPackedClear(const unittest::TestPackedTypesLite& message);
-  static void ExpectPackedExtensionsClear(
-      const unittest::TestPackedExtensionsLite& message);
-
- private:
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(TestUtilLite);
-};
-
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // GOOGLE_PROTOBUF_TEST_UTIL_LITE_H__
diff --git a/libs/protobuf/src/google/protobuf/testdata/bad_utf8_string b/libs/protobuf/src/google/protobuf/testdata/bad_utf8_string
deleted file mode 100644
index a1337ec..0000000
--- a/libs/protobuf/src/google/protobuf/testdata/bad_utf8_string
+++ /dev/null
@@ -1 +0,0 @@
-r
ÿ
\ No newline at end of file
diff --git a/libs/protobuf/src/google/protobuf/testdata/golden_message b/libs/protobuf/src/google/protobuf/testdata/golden_message
deleted file mode 100644
index 5825975..0000000
Binary files a/libs/protobuf/src/google/protobuf/testdata/golden_message and /dev/null differ
diff --git a/libs/protobuf/src/google/protobuf/testdata/golden_message_maps b/libs/protobuf/src/google/protobuf/testdata/golden_message_maps
deleted file mode 100644
index c70a4d7..0000000
Binary files a/libs/protobuf/src/google/protobuf/testdata/golden_message_maps and /dev/null differ
diff --git a/libs/protobuf/src/google/protobuf/testdata/golden_message_oneof_implemented b/libs/protobuf/src/google/protobuf/testdata/golden_message_oneof_implemented
deleted file mode 100644
index 794ca5e..0000000
Binary files a/libs/protobuf/src/google/protobuf/testdata/golden_message_oneof_implemented and /dev/null differ
diff --git a/libs/protobuf/src/google/protobuf/testdata/golden_message_proto3 b/libs/protobuf/src/google/protobuf/testdata/golden_message_proto3
deleted file mode 100644
index bd646a0..0000000
Binary files a/libs/protobuf/src/google/protobuf/testdata/golden_message_proto3 and /dev/null differ
diff --git a/libs/protobuf/src/google/protobuf/testdata/golden_packed_fields_message b/libs/protobuf/src/google/protobuf/testdata/golden_packed_fields_message
deleted file mode 100644
index ee28d38..0000000
Binary files a/libs/protobuf/src/google/protobuf/testdata/golden_packed_fields_message and /dev/null differ
diff --git a/libs/protobuf/src/google/protobuf/testdata/map_test_data.txt b/libs/protobuf/src/google/protobuf/testdata/map_test_data.txt
deleted file mode 100644
index bc27232..0000000
--- a/libs/protobuf/src/google/protobuf/testdata/map_test_data.txt
+++ /dev/null
@@ -1,140 +0,0 @@
-map_int32_int32 {
-  key: 0
-  value: 0
-}
-map_int32_int32 {
-  key: 1
-  value: 1
-}
-map_int64_int64 {
-  key: 0
-  value: 0
-}
-map_int64_int64 {
-  key: 1
-  value: 1
-}
-map_uint32_uint32 {
-  key: 0
-  value: 0
-}
-map_uint32_uint32 {
-  key: 1
-  value: 1
-}
-map_uint64_uint64 {
-  key: 0
-  value: 0
-}
-map_uint64_uint64 {
-  key: 1
-  value: 1
-}
-map_sint32_sint32 {
-  key: 0
-  value: 0
-}
-map_sint32_sint32 {
-  key: 1
-  value: 1
-}
-map_sint64_sint64 {
-  key: 0
-  value: 0
-}
-map_sint64_sint64 {
-  key: 1
-  value: 1
-}
-map_fixed32_fixed32 {
-  key: 0
-  value: 0
-}
-map_fixed32_fixed32 {
-  key: 1
-  value: 1
-}
-map_fixed64_fixed64 {
-  key: 0
-  value: 0
-}
-map_fixed64_fixed64 {
-  key: 1
-  value: 1
-}
-map_sfixed32_sfixed32 {
-  key: 0
-  value: 0
-}
-map_sfixed32_sfixed32 {
-  key: 1
-  value: 1
-}
-map_sfixed64_sfixed64 {
-  key: 0
-  value: 0
-}
-map_sfixed64_sfixed64 {
-  key: 1
-  value: 1
-}
-map_int32_float {
-  key: 0
-  value: 0
-}
-map_int32_float {
-  key: 1
-  value: 1
-}
-map_int32_double {
-  key: 0
-  value: 0
-}
-map_int32_double {
-  key: 1
-  value: 1
-}
-map_bool_bool {
-  key: false
-  value: false
-}
-map_bool_bool {
-  key: true
-  value: true
-}
-map_string_string {
-  key: "0"
-  value: "0"
-}
-map_string_string {
-  key: "1"
-  value: "1"
-}
-map_int32_bytes {
-  key: 0
-  value: "0"
-}
-map_int32_bytes {
-  key: 1
-  value: "1"
-}
-map_int32_enum {
-  key: 0
-  value: MAP_ENUM_BAR
-}
-map_int32_enum {
-  key: 1
-  value: MAP_ENUM_BAZ
-}
-map_int32_foreign_message {
-  key: 0
-  value {
-    c: 0
-  }
-}
-map_int32_foreign_message {
-  key: 1
-  value {
-    c: 1
-  }
-}
diff --git a/libs/protobuf/src/google/protobuf/testdata/text_format_unittest_data.txt b/libs/protobuf/src/google/protobuf/testdata/text_format_unittest_data.txt
deleted file mode 100644
index 7a874b5..0000000
--- a/libs/protobuf/src/google/protobuf/testdata/text_format_unittest_data.txt
+++ /dev/null
@@ -1,134 +0,0 @@
-optional_int32: 101
-optional_int64: 102
-optional_uint32: 103
-optional_uint64: 104
-optional_sint32: 105
-optional_sint64: 106
-optional_fixed32: 107
-optional_fixed64: 108
-optional_sfixed32: 109
-optional_sfixed64: 110
-optional_float: 111
-optional_double: 112
-optional_bool: true
-optional_string: "115"
-optional_bytes: "116"
-OptionalGroup {
-  a: 117
-}
-optional_nested_message {
-  bb: 118
-}
-optional_foreign_message {
-  c: 119
-}
-optional_import_message {
-  d: 120
-}
-optional_nested_enum: BAZ
-optional_foreign_enum: FOREIGN_BAZ
-optional_import_enum: IMPORT_BAZ
-optional_string_piece: "124"
-optional_cord: "125"
-optional_public_import_message {
-  e: 126
-}
-optional_lazy_message {
-  bb: 127
-}
-repeated_int32: 201
-repeated_int32: 301
-repeated_int64: 202
-repeated_int64: 302
-repeated_uint32: 203
-repeated_uint32: 303
-repeated_uint64: 204
-repeated_uint64: 304
-repeated_sint32: 205
-repeated_sint32: 305
-repeated_sint64: 206
-repeated_sint64: 306
-repeated_fixed32: 207
-repeated_fixed32: 307
-repeated_fixed64: 208
-repeated_fixed64: 308
-repeated_sfixed32: 209
-repeated_sfixed32: 309
-repeated_sfixed64: 210
-repeated_sfixed64: 310
-repeated_float: 211
-repeated_float: 311
-repeated_double: 212
-repeated_double: 312
-repeated_bool: true
-repeated_bool: false
-repeated_string: "215"
-repeated_string: "315"
-repeated_bytes: "216"
-repeated_bytes: "316"
-RepeatedGroup {
-  a: 217
-}
-RepeatedGroup {
-  a: 317
-}
-repeated_nested_message {
-  bb: 218
-}
-repeated_nested_message {
-  bb: 318
-}
-repeated_foreign_message {
-  c: 219
-}
-repeated_foreign_message {
-  c: 319
-}
-repeated_import_message {
-  d: 220
-}
-repeated_import_message {
-  d: 320
-}
-repeated_nested_enum: BAR
-repeated_nested_enum: BAZ
-repeated_foreign_enum: FOREIGN_BAR
-repeated_foreign_enum: FOREIGN_BAZ
-repeated_import_enum: IMPORT_BAR
-repeated_import_enum: IMPORT_BAZ
-repeated_string_piece: "224"
-repeated_string_piece: "324"
-repeated_cord: "225"
-repeated_cord: "325"
-repeated_lazy_message {
-  bb: 227
-}
-repeated_lazy_message {
-  bb: 327
-}
-default_int32: 401
-default_int64: 402
-default_uint32: 403
-default_uint64: 404
-default_sint32: 405
-default_sint64: 406
-default_fixed32: 407
-default_fixed64: 408
-default_sfixed32: 409
-default_sfixed64: 410
-default_float: 411
-default_double: 412
-default_bool: false
-default_string: "415"
-default_bytes: "416"
-default_nested_enum: FOO
-default_foreign_enum: FOREIGN_FOO
-default_import_enum: IMPORT_FOO
-default_string_piece: "424"
-default_cord: "425"
-oneof_uint32: 601
-oneof_nested_message {
-  bb: 602
-}
-oneof_string: "603"
-oneof_bytes: "604"
diff --git a/libs/protobuf/src/google/protobuf/testdata/text_format_unittest_data_oneof_implemented.txt b/libs/protobuf/src/google/protobuf/testdata/text_format_unittest_data_oneof_implemented.txt
deleted file mode 100644
index 86389c9..0000000
--- a/libs/protobuf/src/google/protobuf/testdata/text_format_unittest_data_oneof_implemented.txt
+++ /dev/null
@@ -1,132 +0,0 @@
-optional_int32: 101
-optional_int64: 102
-optional_uint32: 103
-optional_uint64: 104
-optional_sint32: 105
-optional_sint64: 106
-optional_fixed32: 107
-optional_fixed64: 108
-optional_sfixed32: 109
-optional_sfixed64: 110
-optional_float: 111
-optional_double: 112
-optional_bool: true
-optional_string: "115"
-optional_bytes: "116"
-OptionalGroup {
-  a: 117
-}
-optional_nested_message {
-  bb: 118
-}
-optional_foreign_message {
-  c: 119
-}
-optional_import_message {
-  d: 120
-}
-optional_nested_enum: BAZ
-optional_foreign_enum: FOREIGN_BAZ
-optional_import_enum: IMPORT_BAZ
-optional_string_piece: "124"
-optional_cord: "125"
-optional_public_import_message {
-  e: 126
-}
-optional_lazy_message {
-  bb: 127
-}
-optional_unverified_lazy_message {
-  bb: 128
-}
-repeated_int32: 201
-repeated_int32: 301
-repeated_int64: 202
-repeated_int64: 302
-repeated_uint32: 203
-repeated_uint32: 303
-repeated_uint64: 204
-repeated_uint64: 304
-repeated_sint32: 205
-repeated_sint32: 305
-repeated_sint64: 206
-repeated_sint64: 306
-repeated_fixed32: 207
-repeated_fixed32: 307
-repeated_fixed64: 208
-repeated_fixed64: 308
-repeated_sfixed32: 209
-repeated_sfixed32: 309
-repeated_sfixed64: 210
-repeated_sfixed64: 310
-repeated_float: 211
-repeated_float: 311
-repeated_double: 212
-repeated_double: 312
-repeated_bool: true
-repeated_bool: false
-repeated_string: "215"
-repeated_string: "315"
-repeated_bytes: "216"
-repeated_bytes: "316"
-RepeatedGroup {
-  a: 217
-}
-RepeatedGroup {
-  a: 317
-}
-repeated_nested_message {
-  bb: 218
-}
-repeated_nested_message {
-  bb: 318
-}
-repeated_foreign_message {
-  c: 219
-}
-repeated_foreign_message {
-  c: 319
-}
-repeated_import_message {
-  d: 220
-}
-repeated_import_message {
-  d: 320
-}
-repeated_nested_enum: BAR
-repeated_nested_enum: BAZ
-repeated_foreign_enum: FOREIGN_BAR
-repeated_foreign_enum: FOREIGN_BAZ
-repeated_import_enum: IMPORT_BAR
-repeated_import_enum: IMPORT_BAZ
-repeated_string_piece: "224"
-repeated_string_piece: "324"
-repeated_cord: "225"
-repeated_cord: "325"
-repeated_lazy_message {
-  bb: 227
-}
-repeated_lazy_message {
-  bb: 327
-}
-default_int32: 401
-default_int64: 402
-default_uint32: 403
-default_uint64: 404
-default_sint32: 405
-default_sint64: 406
-default_fixed32: 407
-default_fixed64: 408
-default_sfixed32: 409
-default_sfixed64: 410
-default_float: 411
-default_double: 412
-default_bool: false
-default_string: "415"
-default_bytes: "416"
-default_nested_enum: FOO
-default_foreign_enum: FOREIGN_FOO
-default_import_enum: IMPORT_FOO
-default_string_piece: "424"
-default_cord: "425"
-oneof_bytes: "604"
diff --git a/libs/protobuf/src/google/protobuf/testdata/text_format_unittest_data_pointy.txt b/libs/protobuf/src/google/protobuf/testdata/text_format_unittest_data_pointy.txt
deleted file mode 100644
index 788025c..0000000
--- a/libs/protobuf/src/google/protobuf/testdata/text_format_unittest_data_pointy.txt
+++ /dev/null
@@ -1,137 +0,0 @@
-optional_int32: 101
-optional_int64: 102
-optional_uint32: 103
-optional_uint64: 104
-optional_sint32: 105
-optional_sint64: 106
-optional_fixed32: 107
-optional_fixed64: 108
-optional_sfixed32: 109
-optional_sfixed64: 110
-optional_float: 111
-optional_double: 112
-optional_bool: true
-optional_string: "115"
-optional_bytes: "116"
-OptionalGroup <
-  a: 117
->
-optional_nested_message <
-  bb: 118
->
-optional_foreign_message <
-  c: 119
->
-optional_import_message <
-  d: 120
->
-optional_nested_enum: BAZ
-optional_foreign_enum: FOREIGN_BAZ
-optional_import_enum: IMPORT_BAZ
-optional_string_piece: "124"
-optional_cord: "125"
-optional_public_import_message <
-  e: 126
->
-optional_lazy_message <
-  bb: 127
->
-optional_unverified_lazy_message <
-  bb: 128
->
-repeated_int32: 201
-repeated_int32: 301
-repeated_int64: 202
-repeated_int64: 302
-repeated_uint32: 203
-repeated_uint32: 303
-repeated_uint64: 204
-repeated_uint64: 304
-repeated_sint32: 205
-repeated_sint32: 305
-repeated_sint64: 206
-repeated_sint64: 306
-repeated_fixed32: 207
-repeated_fixed32: 307
-repeated_fixed64: 208
-repeated_fixed64: 308
-repeated_sfixed32: 209
-repeated_sfixed32: 309
-repeated_sfixed64: 210
-repeated_sfixed64: 310
-repeated_float: 211
-repeated_float: 311
-repeated_double: 212
-repeated_double: 312
-repeated_bool: true
-repeated_bool: false
-repeated_string: "215"
-repeated_string: "315"
-repeated_bytes: "216"
-repeated_bytes: "316"
-RepeatedGroup <
-  a: 217
->
-RepeatedGroup <
-  a: 317
->
-repeated_nested_message <
-  bb: 218
->
-repeated_nested_message <
-  bb: 318
->
-repeated_foreign_message <
-  c: 219
->
-repeated_foreign_message <
-  c: 319
->
-repeated_import_message <
-  d: 220
->
-repeated_import_message <
-  d: 320
->
-repeated_nested_enum: BAR
-repeated_nested_enum: BAZ
-repeated_foreign_enum: FOREIGN_BAR
-repeated_foreign_enum: FOREIGN_BAZ
-repeated_import_enum: IMPORT_BAR
-repeated_import_enum: IMPORT_BAZ
-repeated_string_piece: "224"
-repeated_string_piece: "324"
-repeated_cord: "225"
-repeated_cord: "325"
-repeated_lazy_message <
-  bb: 227
->
-repeated_lazy_message <
-  bb: 327
->
-default_int32: 401
-default_int64: 402
-default_uint32: 403
-default_uint64: 404
-default_sint32: 405
-default_sint64: 406
-default_fixed32: 407
-default_fixed64: 408
-default_sfixed32: 409
-default_sfixed64: 410
-default_float: 411
-default_double: 412
-default_bool: false
-default_string: "415"
-default_bytes: "416"
-default_nested_enum: FOO
-default_foreign_enum: FOREIGN_FOO
-default_import_enum: IMPORT_FOO
-default_string_piece: "424"
-default_cord: "425"
-oneof_uint32: 601
-oneof_nested_message <
-  bb: 602
->
-oneof_string: "603"
-oneof_bytes: "604"
diff --git a/libs/protobuf/src/google/protobuf/testdata/text_format_unittest_data_pointy_oneof.txt b/libs/protobuf/src/google/protobuf/testdata/text_format_unittest_data_pointy_oneof.txt
deleted file mode 100644
index b2d3367..0000000
--- a/libs/protobuf/src/google/protobuf/testdata/text_format_unittest_data_pointy_oneof.txt
+++ /dev/null
@@ -1,132 +0,0 @@
-optional_int32: 101
-optional_int64: 102
-optional_uint32: 103
-optional_uint64: 104
-optional_sint32: 105
-optional_sint64: 106
-optional_fixed32: 107
-optional_fixed64: 108
-optional_sfixed32: 109
-optional_sfixed64: 110
-optional_float: 111
-optional_double: 112
-optional_bool: true
-optional_string: "115"
-optional_bytes: "116"
-OptionalGroup <
-  a: 117
->
-optional_nested_message <
-  bb: 118
->
-optional_foreign_message <
-  c: 119
->
-optional_import_message <
-  d: 120
->
-optional_nested_enum: BAZ
-optional_foreign_enum: FOREIGN_BAZ
-optional_import_enum: IMPORT_BAZ
-optional_string_piece: "124"
-optional_cord: "125"
-optional_public_import_message <
-  e: 126
->
-optional_lazy_message <
-  bb: 127
->
-optional_unverified_lazy_message <
-  bb: 128
->
-repeated_int32: 201
-repeated_int32: 301
-repeated_int64: 202
-repeated_int64: 302
-repeated_uint32: 203
-repeated_uint32: 303
-repeated_uint64: 204
-repeated_uint64: 304
-repeated_sint32: 205
-repeated_sint32: 305
-repeated_sint64: 206
-repeated_sint64: 306
-repeated_fixed32: 207
-repeated_fixed32: 307
-repeated_fixed64: 208
-repeated_fixed64: 308
-repeated_sfixed32: 209
-repeated_sfixed32: 309
-repeated_sfixed64: 210
-repeated_sfixed64: 310
-repeated_float: 211
-repeated_float: 311
-repeated_double: 212
-repeated_double: 312
-repeated_bool: true
-repeated_bool: false
-repeated_string: "215"
-repeated_string: "315"
-repeated_bytes: "216"
-repeated_bytes: "316"
-RepeatedGroup <
-  a: 217
->
-RepeatedGroup <
-  a: 317
->
-repeated_nested_message <
-  bb: 218
->
-repeated_nested_message <
-  bb: 318
->
-repeated_foreign_message <
-  c: 219
->
-repeated_foreign_message <
-  c: 319
->
-repeated_import_message <
-  d: 220
->
-repeated_import_message <
-  d: 320
->
-repeated_nested_enum: BAR
-repeated_nested_enum: BAZ
-repeated_foreign_enum: FOREIGN_BAR
-repeated_foreign_enum: FOREIGN_BAZ
-repeated_import_enum: IMPORT_BAR
-repeated_import_enum: IMPORT_BAZ
-repeated_string_piece: "224"
-repeated_string_piece: "324"
-repeated_cord: "225"
-repeated_cord: "325"
-repeated_lazy_message <
-  bb: 227
->
-repeated_lazy_message <
-  bb: 327
->
-default_int32: 401
-default_int64: 402
-default_uint32: 403
-default_uint64: 404
-default_sint32: 405
-default_sint64: 406
-default_fixed32: 407
-default_fixed64: 408
-default_sfixed32: 409
-default_sfixed64: 410
-default_float: 411
-default_double: 412
-default_bool: false
-default_string: "415"
-default_bytes: "416"
-default_nested_enum: FOO
-default_foreign_enum: FOREIGN_FOO
-default_import_enum: IMPORT_FOO
-default_string_piece: "424"
-default_cord: "425"
-oneof_bytes: "604"
diff --git a/libs/protobuf/src/google/protobuf/testdata/text_format_unittest_extensions_data.txt b/libs/protobuf/src/google/protobuf/testdata/text_format_unittest_extensions_data.txt
deleted file mode 100644
index 5c3a03a..0000000
--- a/libs/protobuf/src/google/protobuf/testdata/text_format_unittest_extensions_data.txt
+++ /dev/null
@@ -1,137 +0,0 @@
-[protobuf_unittest.optional_int32_extension]: 101
-[protobuf_unittest.optional_int64_extension]: 102
-[protobuf_unittest.optional_uint32_extension]: 103
-[protobuf_unittest.optional_uint64_extension]: 104
-[protobuf_unittest.optional_sint32_extension]: 105
-[protobuf_unittest.optional_sint64_extension]: 106
-[protobuf_unittest.optional_fixed32_extension]: 107
-[protobuf_unittest.optional_fixed64_extension]: 108
-[protobuf_unittest.optional_sfixed32_extension]: 109
-[protobuf_unittest.optional_sfixed64_extension]: 110
-[protobuf_unittest.optional_float_extension]: 111
-[protobuf_unittest.optional_double_extension]: 112
-[protobuf_unittest.optional_bool_extension]: true
-[protobuf_unittest.optional_string_extension]: "115"
-[protobuf_unittest.optional_bytes_extension]: "116"
-[protobuf_unittest.optionalgroup_extension] {
-  a: 117
-}
-[protobuf_unittest.optional_nested_message_extension] {
-  bb: 118
-}
-[protobuf_unittest.optional_foreign_message_extension] {
-  c: 119
-}
-[protobuf_unittest.optional_import_message_extension] {
-  d: 120
-}
-[protobuf_unittest.optional_nested_enum_extension]: BAZ
-[protobuf_unittest.optional_foreign_enum_extension]: FOREIGN_BAZ
-[protobuf_unittest.optional_import_enum_extension]: IMPORT_BAZ
-[protobuf_unittest.optional_string_piece_extension]: "124"
-[protobuf_unittest.optional_cord_extension]: "125"
-[protobuf_unittest.optional_public_import_message_extension] {
-  e: 126
-}
-[protobuf_unittest.optional_lazy_message_extension] {
-  bb: 127
-}
-[protobuf_unittest.optional_unverified_lazy_message_extension] {
-  bb: 128
-}
-[protobuf_unittest.repeated_int32_extension]: 201
-[protobuf_unittest.repeated_int32_extension]: 301
-[protobuf_unittest.repeated_int64_extension]: 202
-[protobuf_unittest.repeated_int64_extension]: 302
-[protobuf_unittest.repeated_uint32_extension]: 203
-[protobuf_unittest.repeated_uint32_extension]: 303
-[protobuf_unittest.repeated_uint64_extension]: 204
-[protobuf_unittest.repeated_uint64_extension]: 304
-[protobuf_unittest.repeated_sint32_extension]: 205
-[protobuf_unittest.repeated_sint32_extension]: 305
-[protobuf_unittest.repeated_sint64_extension]: 206
-[protobuf_unittest.repeated_sint64_extension]: 306
-[protobuf_unittest.repeated_fixed32_extension]: 207
-[protobuf_unittest.repeated_fixed32_extension]: 307
-[protobuf_unittest.repeated_fixed64_extension]: 208
-[protobuf_unittest.repeated_fixed64_extension]: 308
-[protobuf_unittest.repeated_sfixed32_extension]: 209
-[protobuf_unittest.repeated_sfixed32_extension]: 309
-[protobuf_unittest.repeated_sfixed64_extension]: 210
-[protobuf_unittest.repeated_sfixed64_extension]: 310
-[protobuf_unittest.repeated_float_extension]: 211
-[protobuf_unittest.repeated_float_extension]: 311
-[protobuf_unittest.repeated_double_extension]: 212
-[protobuf_unittest.repeated_double_extension]: 312
-[protobuf_unittest.repeated_bool_extension]: true
-[protobuf_unittest.repeated_bool_extension]: false
-[protobuf_unittest.repeated_string_extension]: "215"
-[protobuf_unittest.repeated_string_extension]: "315"
-[protobuf_unittest.repeated_bytes_extension]: "216"
-[protobuf_unittest.repeated_bytes_extension]: "316"
-[protobuf_unittest.repeatedgroup_extension] {
-  a: 217
-}
-[protobuf_unittest.repeatedgroup_extension] {
-  a: 317
-}
-[protobuf_unittest.repeated_nested_message_extension] {
-  bb: 218
-}
-[protobuf_unittest.repeated_nested_message_extension] {
-  bb: 318
-}
-[protobuf_unittest.repeated_foreign_message_extension] {
-  c: 219
-}
-[protobuf_unittest.repeated_foreign_message_extension] {
-  c: 319
-}
-[protobuf_unittest.repeated_import_message_extension] {
-  d: 220
-}
-[protobuf_unittest.repeated_import_message_extension] {
-  d: 320
-}
-[protobuf_unittest.repeated_nested_enum_extension]: BAR
-[protobuf_unittest.repeated_nested_enum_extension]: BAZ
-[protobuf_unittest.repeated_foreign_enum_extension]: FOREIGN_BAR
-[protobuf_unittest.repeated_foreign_enum_extension]: FOREIGN_BAZ
-[protobuf_unittest.repeated_import_enum_extension]: IMPORT_BAR
-[protobuf_unittest.repeated_import_enum_extension]: IMPORT_BAZ
-[protobuf_unittest.repeated_string_piece_extension]: "224"
-[protobuf_unittest.repeated_string_piece_extension]: "324"
-[protobuf_unittest.repeated_cord_extension]: "225"
-[protobuf_unittest.repeated_cord_extension]: "325"
-[protobuf_unittest.repeated_lazy_message_extension] {
-  bb: 227
-}
-[protobuf_unittest.repeated_lazy_message_extension] {
-  bb: 327
-}
-[protobuf_unittest.default_int32_extension]: 401
-[protobuf_unittest.default_int64_extension]: 402
-[protobuf_unittest.default_uint32_extension]: 403
-[protobuf_unittest.default_uint64_extension]: 404
-[protobuf_unittest.default_sint32_extension]: 405
-[protobuf_unittest.default_sint64_extension]: 406
-[protobuf_unittest.default_fixed32_extension]: 407
-[protobuf_unittest.default_fixed64_extension]: 408
-[protobuf_unittest.default_sfixed32_extension]: 409
-[protobuf_unittest.default_sfixed64_extension]: 410
-[protobuf_unittest.default_float_extension]: 411
-[protobuf_unittest.default_double_extension]: 412
-[protobuf_unittest.default_bool_extension]: false
-[protobuf_unittest.default_string_extension]: "415"
-[protobuf_unittest.default_bytes_extension]: "416"
-[protobuf_unittest.default_nested_enum_extension]: FOO
-[protobuf_unittest.default_foreign_enum_extension]: FOREIGN_FOO
-[protobuf_unittest.default_import_enum_extension]: IMPORT_FOO
-[protobuf_unittest.default_string_piece_extension]: "424"
-[protobuf_unittest.default_cord_extension]: "425"
-[protobuf_unittest.oneof_uint32_extension]: 601
-[protobuf_unittest.oneof_nested_message_extension] {
-  bb: 602
-}
-[protobuf_unittest.oneof_string_extension]: "603"
-[protobuf_unittest.oneof_bytes_extension]: "604"
diff --git a/libs/protobuf/src/google/protobuf/testdata/text_format_unittest_extensions_data_pointy.txt b/libs/protobuf/src/google/protobuf/testdata/text_format_unittest_extensions_data_pointy.txt
deleted file mode 100644
index 4233ca7..0000000
--- a/libs/protobuf/src/google/protobuf/testdata/text_format_unittest_extensions_data_pointy.txt
+++ /dev/null
@@ -1,137 +0,0 @@
-[protobuf_unittest.optional_int32_extension]: 101
-[protobuf_unittest.optional_int64_extension]: 102
-[protobuf_unittest.optional_uint32_extension]: 103
-[protobuf_unittest.optional_uint64_extension]: 104
-[protobuf_unittest.optional_sint32_extension]: 105
-[protobuf_unittest.optional_sint64_extension]: 106
-[protobuf_unittest.optional_fixed32_extension]: 107
-[protobuf_unittest.optional_fixed64_extension]: 108
-[protobuf_unittest.optional_sfixed32_extension]: 109
-[protobuf_unittest.optional_sfixed64_extension]: 110
-[protobuf_unittest.optional_float_extension]: 111
-[protobuf_unittest.optional_double_extension]: 112
-[protobuf_unittest.optional_bool_extension]: true
-[protobuf_unittest.optional_string_extension]: "115"
-[protobuf_unittest.optional_bytes_extension]: "116"
-[protobuf_unittest.optionalgroup_extension] <
-  a: 117
->
-[protobuf_unittest.optional_nested_message_extension] <
-  bb: 118
->
-[protobuf_unittest.optional_foreign_message_extension] <
-  c: 119
->
-[protobuf_unittest.optional_import_message_extension] <
-  d: 120
->
-[protobuf_unittest.optional_nested_enum_extension]: BAZ
-[protobuf_unittest.optional_foreign_enum_extension]: FOREIGN_BAZ
-[protobuf_unittest.optional_import_enum_extension]: IMPORT_BAZ
-[protobuf_unittest.optional_string_piece_extension]: "124"
-[protobuf_unittest.optional_cord_extension]: "125"
-[protobuf_unittest.optional_public_import_message_extension] <
-  e: 126
->
-[protobuf_unittest.optional_lazy_message_extension] <
-  bb: 127
->
-[protobuf_unittest.optional_unverified_lazy_message_extension] <
-  bb: 128
->
-[protobuf_unittest.repeated_int32_extension]: 201
-[protobuf_unittest.repeated_int32_extension]: 301
-[protobuf_unittest.repeated_int64_extension]: 202
-[protobuf_unittest.repeated_int64_extension]: 302
-[protobuf_unittest.repeated_uint32_extension]: 203
-[protobuf_unittest.repeated_uint32_extension]: 303
-[protobuf_unittest.repeated_uint64_extension]: 204
-[protobuf_unittest.repeated_uint64_extension]: 304
-[protobuf_unittest.repeated_sint32_extension]: 205
-[protobuf_unittest.repeated_sint32_extension]: 305
-[protobuf_unittest.repeated_sint64_extension]: 206
-[protobuf_unittest.repeated_sint64_extension]: 306
-[protobuf_unittest.repeated_fixed32_extension]: 207
-[protobuf_unittest.repeated_fixed32_extension]: 307
-[protobuf_unittest.repeated_fixed64_extension]: 208
-[protobuf_unittest.repeated_fixed64_extension]: 308
-[protobuf_unittest.repeated_sfixed32_extension]: 209
-[protobuf_unittest.repeated_sfixed32_extension]: 309
-[protobuf_unittest.repeated_sfixed64_extension]: 210
-[protobuf_unittest.repeated_sfixed64_extension]: 310
-[protobuf_unittest.repeated_float_extension]: 211
-[protobuf_unittest.repeated_float_extension]: 311
-[protobuf_unittest.repeated_double_extension]: 212
-[protobuf_unittest.repeated_double_extension]: 312
-[protobuf_unittest.repeated_bool_extension]: true
-[protobuf_unittest.repeated_bool_extension]: false
-[protobuf_unittest.repeated_string_extension]: "215"
-[protobuf_unittest.repeated_string_extension]: "315"
-[protobuf_unittest.repeated_bytes_extension]: "216"
-[protobuf_unittest.repeated_bytes_extension]: "316"
-[protobuf_unittest.repeatedgroup_extension] <
-  a: 217
->
-[protobuf_unittest.repeatedgroup_extension] <
-  a: 317
->
-[protobuf_unittest.repeated_nested_message_extension] <
-  bb: 218
->
-[protobuf_unittest.repeated_nested_message_extension] <
-  bb: 318
->
-[protobuf_unittest.repeated_foreign_message_extension] <
-  c: 219
->
-[protobuf_unittest.repeated_foreign_message_extension] <
-  c: 319
->
-[protobuf_unittest.repeated_import_message_extension] <
-  d: 220
->
-[protobuf_unittest.repeated_import_message_extension] <
-  d: 320
->
-[protobuf_unittest.repeated_nested_enum_extension]: BAR
-[protobuf_unittest.repeated_nested_enum_extension]: BAZ
-[protobuf_unittest.repeated_foreign_enum_extension]: FOREIGN_BAR
-[protobuf_unittest.repeated_foreign_enum_extension]: FOREIGN_BAZ
-[protobuf_unittest.repeated_import_enum_extension]: IMPORT_BAR
-[protobuf_unittest.repeated_import_enum_extension]: IMPORT_BAZ
-[protobuf_unittest.repeated_string_piece_extension]: "224"
-[protobuf_unittest.repeated_string_piece_extension]: "324"
-[protobuf_unittest.repeated_cord_extension]: "225"
-[protobuf_unittest.repeated_cord_extension]: "325"
-[protobuf_unittest.repeated_lazy_message_extension] <
-  bb: 227
->
-[protobuf_unittest.repeated_lazy_message_extension] <
-  bb: 327
->
-[protobuf_unittest.default_int32_extension]: 401
-[protobuf_unittest.default_int64_extension]: 402
-[protobuf_unittest.default_uint32_extension]: 403
-[protobuf_unittest.default_uint64_extension]: 404
-[protobuf_unittest.default_sint32_extension]: 405
-[protobuf_unittest.default_sint64_extension]: 406
-[protobuf_unittest.default_fixed32_extension]: 407
-[protobuf_unittest.default_fixed64_extension]: 408
-[protobuf_unittest.default_sfixed32_extension]: 409
-[protobuf_unittest.default_sfixed64_extension]: 410
-[protobuf_unittest.default_float_extension]: 411
-[protobuf_unittest.default_double_extension]: 412
-[protobuf_unittest.default_bool_extension]: false
-[protobuf_unittest.default_string_extension]: "415"
-[protobuf_unittest.default_bytes_extension]: "416"
-[protobuf_unittest.default_nested_enum_extension]: FOO
-[protobuf_unittest.default_foreign_enum_extension]: FOREIGN_FOO
-[protobuf_unittest.default_import_enum_extension]: IMPORT_FOO
-[protobuf_unittest.default_string_piece_extension]: "424"
-[protobuf_unittest.default_cord_extension]: "425"
-[protobuf_unittest.oneof_uint32_extension]: 601
-[protobuf_unittest.oneof_nested_message_extension] <
-  bb: 602
->
-[protobuf_unittest.oneof_string_extension]: "603"
-[protobuf_unittest.oneof_bytes_extension]: "604"
diff --git a/libs/protobuf/src/google/protobuf/testing/file.cc b/libs/protobuf/src/google/protobuf/testing/file.cc
deleted file mode 100644
index 7b62887..0000000
--- a/libs/protobuf/src/google/protobuf/testing/file.cc
+++ /dev/null
@@ -1,215 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-// emulates google3/file/base/file.cc
-
-#include <google/protobuf/testing/file.h>
-#include <stdio.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#ifdef _MSC_VER
-#define WIN32_LEAN_AND_MEAN  // yeah, right
-#include <windows.h>         // Find*File().  :(
-// #include <direct.h>
-#else
-#include <dirent.h>
-#include <unistd.h>
-#endif
-#include <errno.h>
-
-#include <google/protobuf/io/io_win32.h>
-#include <google/protobuf/stubs/logging.h>
-
-namespace google {
-namespace protobuf {
-
-#ifdef _WIN32
-// Windows doesn't have symbolic links.
-#define lstat stat
-// DO NOT include <io.h>, instead create functions in io_win32.{h,cc} and import
-// them like we do below.
-#endif
-
-#ifdef _WIN32
-using google::protobuf::io::win32::access;
-using google::protobuf::io::win32::chdir;
-using google::protobuf::io::win32::fopen;
-using google::protobuf::io::win32::mkdir;
-using google::protobuf::io::win32::stat;
-#endif
-
-bool File::Exists(const std::string& name) {
-  return access(name.c_str(), F_OK) == 0;
-}
-
-bool File::ReadFileToString(const std::string& name, std::string* output,
-                            bool text_mode) {
-  char buffer[1024];
-  FILE* file = fopen(name.c_str(), text_mode ? "rt" : "rb");
-  if (file == NULL) return false;
-
-  while (true) {
-    size_t n = fread(buffer, 1, sizeof(buffer), file);
-    if (n <= 0) break;
-    output->append(buffer, n);
-  }
-
-  int error = ferror(file);
-  if (fclose(file) != 0) return false;
-  return error == 0;
-}
-
-void File::ReadFileToStringOrDie(const std::string& name, std::string* output) {
-  GOOGLE_CHECK(ReadFileToString(name, output)) << "Could not read: " << name;
-}
-
-bool File::WriteStringToFile(const std::string& contents,
-                             const std::string& name) {
-  FILE* file = fopen(name.c_str(), "wb");
-  if (file == NULL) {
-    GOOGLE_LOG(ERROR) << "fopen(" << name << ", \"wb\"): " << strerror(errno);
-    return false;
-  }
-
-  if (fwrite(contents.data(), 1, contents.size(), file) != contents.size()) {
-    GOOGLE_LOG(ERROR) << "fwrite(" << name << "): " << strerror(errno);
-    fclose(file);
-    return false;
-  }
-
-  if (fclose(file) != 0) {
-    return false;
-  }
-  return true;
-}
-
-void File::WriteStringToFileOrDie(const std::string& contents,
-                                  const std::string& name) {
-  FILE* file = fopen(name.c_str(), "wb");
-  GOOGLE_CHECK(file != NULL)
-      << "fopen(" << name << ", \"wb\"): " << strerror(errno);
-  GOOGLE_CHECK_EQ(fwrite(contents.data(), 1, contents.size(), file),
-                  contents.size())
-      << "fwrite(" << name << "): " << strerror(errno);
-  GOOGLE_CHECK(fclose(file) == 0)
-      << "fclose(" << name << "): " << strerror(errno);
-}
-
-bool File::CreateDir(const std::string& name, int mode) {
-  if (!name.empty()) {
-    GOOGLE_CHECK_OK(name[name.size() - 1] != '.');
-  }
-  return mkdir(name.c_str(), mode) == 0;
-}
-
-bool File::RecursivelyCreateDir(const std::string& path, int mode) {
-  if (CreateDir(path, mode)) return true;
-
-  if (Exists(path)) return false;
-
-  // Try creating the parent.
-  std::string::size_type slashpos = path.find_last_of('/');
-  if (slashpos == std::string::npos) {
-    // No parent given.
-    return false;
-  }
-
-  return RecursivelyCreateDir(path.substr(0, slashpos), mode) &&
-         CreateDir(path, mode);
-}
-
-void File::DeleteRecursively(const std::string& name, void* dummy1,
-                             void* dummy2) {
-  if (name.empty()) return;
-
-  // We don't care too much about error checking here since this is only used
-  // in tests to delete temporary directories that are under /tmp anyway.
-
-#ifdef _MSC_VER
-  // This interface is so weird.
-  WIN32_FIND_DATAA find_data;
-  HANDLE find_handle = FindFirstFileA((name + "/*").c_str(), &find_data);
-  if (find_handle == INVALID_HANDLE_VALUE) {
-    // Just delete it, whatever it is.
-    DeleteFileA(name.c_str());
-    RemoveDirectoryA(name.c_str());
-    return;
-  }
-
-  do {
-    std::string entry_name = find_data.cFileName;
-    if (entry_name != "." && entry_name != "..") {
-      std::string path = name + "/" + entry_name;
-      if (find_data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) {
-        DeleteRecursively(path, NULL, NULL);
-        RemoveDirectoryA(path.c_str());
-      } else {
-        DeleteFileA(path.c_str());
-      }
-    }
-  } while(FindNextFileA(find_handle, &find_data));
-  FindClose(find_handle);
-
-  RemoveDirectoryA(name.c_str());
-#else
-  // Use opendir()!  Yay!
-  // lstat = Don't follow symbolic links.
-  struct stat stats;
-  if (lstat(name.c_str(), &stats) != 0) return;
-
-  if (S_ISDIR(stats.st_mode)) {
-    DIR* dir = opendir(name.c_str());
-    if (dir != NULL) {
-      while (true) {
-        struct dirent* entry = readdir(dir);
-        if (entry == NULL) break;
-        std::string entry_name = entry->d_name;
-        if (entry_name != "." && entry_name != "..") {
-          DeleteRecursively(name + "/" + entry_name, NULL, NULL);
-        }
-      }
-    }
-
-    closedir(dir);
-    rmdir(name.c_str());
-
-  } else if (S_ISREG(stats.st_mode)) {
-    remove(name.c_str());
-  }
-#endif
-}
-
-bool File::ChangeWorkingDirectory(const std::string& new_working_directory) {
-  return chdir(new_working_directory.c_str()) == 0;
-}
-
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/testing/file.h b/libs/protobuf/src/google/protobuf/testing/file.h
deleted file mode 100644
index f18f685..0000000
--- a/libs/protobuf/src/google/protobuf/testing/file.h
+++ /dev/null
@@ -1,107 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-// emulates google3/file/base/file.h
-
-#ifndef GOOGLE_PROTOBUF_TESTING_FILE_H__
-#define GOOGLE_PROTOBUF_TESTING_FILE_H__
-
-#include <google/protobuf/stubs/common.h>
-
-namespace google {
-namespace protobuf {
-
-const int DEFAULT_FILE_MODE = 0777;
-
-// Protocol buffer code only uses a couple static methods of File, and only
-// in tests.
-class File {
- public:
-  // Check if the file exists.
-  static bool Exists(const std::string& name);
-
-  // Read an entire file to a string.  Return true if successful, false
-  // otherwise.
-  static bool ReadFileToString(const std::string& name, std::string* output,
-                               bool text_mode = false);
-
-  // Same as above, but crash on failure.
-  static void ReadFileToStringOrDie(const std::string& name,
-                                    std::string* output);
-
-  // Create a file and write a string to it.
-  static bool WriteStringToFile(const std::string& contents,
-                                const std::string& name);
-
-  // Same as above, but crash on failure.
-  static void WriteStringToFileOrDie(const std::string& contents,
-                                     const std::string& name);
-
-  // Create a directory.
-  static bool CreateDir(const std::string& name, int mode);
-
-  // Create a directory and all parent directories if necessary.
-  static bool RecursivelyCreateDir(const std::string& path, int mode);
-
-  // If "name" is a file, we delete it.  If it is a directory, we
-  // call DeleteRecursively() for each file or directory (other than
-  // dot and double-dot) within it, and then delete the directory itself.
-  // The "dummy" parameters have a meaning in the original version of this
-  // method but they are not used anywhere in protocol buffers.
-  static void DeleteRecursively(const std::string& name, void* dummy1,
-                                void* dummy2);
-
-  // Change working directory to given directory.
-  static bool ChangeWorkingDirectory(const std::string& new_working_directory);
-
-  static bool GetContents(const std::string& name, std::string* output,
-                          bool /*is_default*/) {
-    return ReadFileToString(name, output);
-  }
-
-  static bool GetContentsAsText(const std::string& name, std::string* output,
-                                bool /*is_default*/) {
-    return ReadFileToString(name, output, true);
-  }
-
-  static bool SetContents(const std::string& name, const std::string& contents,
-                          bool /*is_default*/) {
-    return WriteStringToFile(contents, name);
-  }
-
- private:
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(File);
-};
-
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // GOOGLE_PROTOBUF_TESTING_FILE_H__
diff --git a/libs/protobuf/src/google/protobuf/testing/googletest.cc b/libs/protobuf/src/google/protobuf/testing/googletest.cc
deleted file mode 100644
index 88343f9..0000000
--- a/libs/protobuf/src/google/protobuf/testing/googletest.cc
+++ /dev/null
@@ -1,302 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-// emulates google3/testing/base/public/googletest.cc
-
-#include <google/protobuf/testing/googletest.h>
-#include <google/protobuf/testing/file.h>
-#include <google/protobuf/io/io_win32.h>
-#include <google/protobuf/stubs/strutil.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <errno.h>
-#include <stdlib.h>
-#ifdef _MSC_VER
-// #include <direct.h>
-#else
-#include <unistd.h>
-#endif
-#include <stdio.h>
-#include <fcntl.h>
-#include <iostream>
-#include <fstream>
-
-namespace google {
-namespace protobuf {
-
-#ifdef _WIN32
-// DO NOT include <io.h>, instead create functions in io_win32.{h,cc} and import
-// them like we do below.
-using google::protobuf::io::win32::close;
-using google::protobuf::io::win32::dup2;
-using google::protobuf::io::win32::dup;
-using google::protobuf::io::win32::mkdir;
-using google::protobuf::io::win32::open;
-#endif
-
-#ifndef O_BINARY
-#ifdef _O_BINARY
-#define O_BINARY _O_BINARY
-#else
-#define O_BINARY 0     // If this isn't defined, the platform doesn't need it.
-#endif
-#endif
-
-std::string TestSourceDir() {
-#ifndef GOOGLE_THIRD_PARTY_PROTOBUF
-#ifdef GOOGLE_PROTOBUF_TEST_SOURCE_PATH
-  return GOOGLE_PROTOBUF_TEST_SOURCE_PATH;
-#else
-#ifndef _MSC_VER
-  // automake sets the "srcdir" environment variable.
-  char* result = getenv("srcdir");
-  if (result != NULL) {
-    return result;
-  }
-#endif  // _MSC_VER
-
-  // Look for the "src" directory.
-  std::string prefix = ".";
-
-  // Keep looking further up the directory tree until we find
-  // src/.../descriptor.cc. It is important to look for a particular file,
-  // keeping in mind that with Bazel builds the directory structure under
-  // bazel-bin/ looks similar to the main directory tree in the Git repo.
-  while (!File::Exists(prefix + "/src/google/protobuf/descriptor.cc")) {
-    if (!File::Exists(prefix)) {
-      GOOGLE_LOG(FATAL)
-        << "Could not find protobuf source code.  Please run tests from "
-           "somewhere within the protobuf source package.";
-    }
-    prefix += "/..";
-  }
-  return prefix + "/src";
-#endif  // GOOGLE_PROTOBUF_TEST_SOURCE_PATH
-#else
-  return "third_party/protobuf/src";
-#endif  // GOOGLE_THIRD_PARTY_PROTOBUF
-}
-
-namespace {
-
-std::string GetTemporaryDirectoryName() {
-  // Tests run under Bazel "should not" use /tmp. Bazel sets this environment
-  // variable for tests to use instead.
-  char *from_environment = getenv("TEST_TMPDIR");
-  if (from_environment != NULL && from_environment[0] != '\0') {
-    return std::string(from_environment) + "/protobuf_tmpdir";
-  }
-
-  // tmpnam() is generally not considered safe but we're only using it for
-  // testing.  We cannot use tmpfile() or mkstemp() since we're creating a
-  // directory.
-  char b[L_tmpnam + 1];     // HPUX multithread return 0 if s is 0
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-  std::string result = tmpnam(b);
-#pragma GCC diagnostic pop
-#ifdef _WIN32
-  // Avoid a trailing dot by changing it to an underscore. On Win32 the names of
-  // files and directories can, but should not, end with dot.
-  //
-  // In MS-DOS and FAT16 filesystem the filenames were 8dot3 style so it didn't
-  // make sense to have a name ending in dot without an extension, so the shell
-  // silently ignored trailing dots. To this day the Win32 API still maintains
-  // this behavior and silently ignores trailing dots in path arguments of
-  // functions such as CreateFile{A,W}. Even POSIX API function implementations
-  // seem to wrap the Win32 API functions (e.g. CreateDirectoryA) and behave
-  // this way.
-  // It's possible to avoid this behavior and create files / directories with
-  // trailing dots (using CreateFileW / CreateDirectoryW and prefixing the path
-  // with "\\?\") but these will be degenerate in the sense that you cannot
-  // chdir into such directories (or navigate into them with Windows Explorer)
-  // nor can you open such files with some programs (e.g. Notepad).
-  if (result[result.size() - 1] == '.') {
-    result[result.size() - 1] = '_';
-  }
-  // On Win32, tmpnam() returns a file prefixed with '\', but which is supposed
-  // to be used in the current working directory.  WTF?
-  if (HasPrefixString(result, "\\")) {
-    result.erase(0, 1);
-  }
-  // The Win32 API accepts forward slashes as a path delimiter as long as the
-  // path doesn't use the "\\?\" prefix.
-  // Let's avoid confusion and use only forward slashes.
-  result = StringReplace(result, "\\", "/", true);
-#endif  // _WIN32
-  return result;
-}
-
-// Creates a temporary directory on demand and deletes it when the process
-// quits.
-class TempDirDeleter {
- public:
-  TempDirDeleter() {}
-  ~TempDirDeleter() {
-    if (!name_.empty()) {
-      File::DeleteRecursively(name_, NULL, NULL);
-    }
-  }
-
-  std::string GetTempDir() {
-    if (name_.empty()) {
-      name_ = GetTemporaryDirectoryName();
-      GOOGLE_CHECK(mkdir(name_.c_str(), 0777) == 0) << strerror(errno);
-
-      // Stick a file in the directory that tells people what this is, in case
-      // we abort and don't get a chance to delete it.
-      File::WriteStringToFileOrDie("", name_ + "/TEMP_DIR_FOR_PROTOBUF_TESTS");
-    }
-    return name_;
-  }
-
- private:
-  std::string name_;
-};
-
-TempDirDeleter temp_dir_deleter_;
-
-}  // namespace
-
-std::string TestTempDir() { return temp_dir_deleter_.GetTempDir(); }
-
-// TODO(kenton):  Share duplicated code below.  Too busy/lazy for now.
-
-static std::string stdout_capture_filename_;
-static std::string stderr_capture_filename_;
-static int original_stdout_ = -1;
-static int original_stderr_ = -1;
-
-void CaptureTestStdout() {
-  GOOGLE_CHECK_EQ(original_stdout_, -1) << "Already capturing.";
-
-  stdout_capture_filename_ = TestTempDir() + "/captured_stdout";
-
-  int fd = open(stdout_capture_filename_.c_str(),
-                O_WRONLY | O_CREAT | O_EXCL | O_BINARY, 0777);
-  GOOGLE_CHECK(fd >= 0) << "open: " << strerror(errno);
-
-  original_stdout_ = dup(1);
-  close(1);
-  dup2(fd, 1);
-  close(fd);
-}
-
-void CaptureTestStderr() {
-  GOOGLE_CHECK_EQ(original_stderr_, -1) << "Already capturing.";
-
-  stderr_capture_filename_ = TestTempDir() + "/captured_stderr";
-
-  int fd = open(stderr_capture_filename_.c_str(),
-                O_WRONLY | O_CREAT | O_EXCL | O_BINARY, 0777);
-  GOOGLE_CHECK(fd >= 0) << "open: " << strerror(errno);
-
-  original_stderr_ = dup(2);
-  close(2);
-  dup2(fd, 2);
-  close(fd);
-}
-
-std::string GetCapturedTestStdout() {
-  GOOGLE_CHECK_NE(original_stdout_, -1) << "Not capturing.";
-
-  close(1);
-  dup2(original_stdout_, 1);
-  original_stdout_ = -1;
-
-  std::string result;
-  File::ReadFileToStringOrDie(stdout_capture_filename_, &result);
-
-  remove(stdout_capture_filename_.c_str());
-
-  return result;
-}
-
-std::string GetCapturedTestStderr() {
-  GOOGLE_CHECK_NE(original_stderr_, -1) << "Not capturing.";
-
-  close(2);
-  dup2(original_stderr_, 2);
-  original_stderr_ = -1;
-
-  std::string result;
-  File::ReadFileToStringOrDie(stderr_capture_filename_, &result);
-
-  remove(stderr_capture_filename_.c_str());
-
-  return result;
-}
-
-ScopedMemoryLog* ScopedMemoryLog::active_log_ = NULL;
-
-ScopedMemoryLog::ScopedMemoryLog() {
-  GOOGLE_CHECK(active_log_ == NULL);
-  active_log_ = this;
-  old_handler_ = SetLogHandler(&HandleLog);
-}
-
-ScopedMemoryLog::~ScopedMemoryLog() {
-  SetLogHandler(old_handler_);
-  active_log_ = NULL;
-}
-
-const std::vector<std::string>& ScopedMemoryLog::GetMessages(LogLevel level) {
-  GOOGLE_CHECK(level == ERROR ||
-               level == WARNING);
-  return messages_[level];
-}
-
-void ScopedMemoryLog::HandleLog(LogLevel level, const char* filename, int line,
-                                const std::string& message) {
-  GOOGLE_CHECK(active_log_ != NULL);
-  if (level == ERROR || level == WARNING) {
-    active_log_->messages_[level].push_back(message);
-  }
-}
-
-namespace {
-
-// Force shutdown at process exit so that we can test for memory leaks.  To
-// actually check for leaks, I suggest using the heap checker included with
-// google-perftools.  Set it to "draconian" mode to ensure that every last
-// call to malloc() has a corresponding free().
-struct ForceShutdown {
-  ~ForceShutdown() {
-    ShutdownProtobufLibrary();
-    // Test to shutdown the library twice, which should succeed.
-    ShutdownProtobufLibrary();
-  }
-} force_shutdown;
-
-}  // namespace
-
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/testing/googletest.h b/libs/protobuf/src/google/protobuf/testing/googletest.h
deleted file mode 100644
index 6a0c694..0000000
--- a/libs/protobuf/src/google/protobuf/testing/googletest.h
+++ /dev/null
@@ -1,104 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-// emulates google3/testing/base/public/googletest.h
-
-#ifndef GOOGLE_PROTOBUF_GOOGLETEST_H__
-#define GOOGLE_PROTOBUF_GOOGLETEST_H__
-
-#include <map>
-#include <vector>
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/stubs/logging.h>
-#include <gmock/gmock.h>
-// Disable death tests if we use exceptions in CHECK().
-#if !PROTOBUF_USE_EXCEPTIONS && defined(GTEST_HAS_DEATH_TEST) && \
-    !GTEST_OS_WINDOWS
-#define PROTOBUF_HAS_DEATH_TEST
-#endif
-
-namespace google {
-namespace protobuf {
-
-// When running unittests, get the directory containing the source code.
-std::string TestSourceDir();
-
-// When running unittests, get a directory where temporary files may be
-// placed.
-std::string TestTempDir();
-
-// Capture all text written to stdout or stderr.
-void CaptureTestStdout();
-void CaptureTestStderr();
-
-// Stop capturing stdout or stderr and return the text captured.
-std::string GetCapturedTestStdout();
-std::string GetCapturedTestStderr();
-
-// For use with ScopedMemoryLog::GetMessages().  Inside Google the LogLevel
-// constants don't have the LOGLEVEL_ prefix, so the code that used
-// ScopedMemoryLog refers to LOGLEVEL_ERROR as just ERROR.
-#undef ERROR  // defend against promiscuous windows.h
-static const LogLevel ERROR = LOGLEVEL_ERROR;
-static const LogLevel WARNING = LOGLEVEL_WARNING;
-
-// Receives copies of all LOG(ERROR) messages while in scope.  Sample usage:
-//   {
-//     ScopedMemoryLog log;  // constructor registers object as a log sink
-//     SomeRoutineThatMayLogMessages();
-//     const vector<string>& warnings = log.GetMessages(ERROR);
-//   }  // destructor unregisters object as a log sink
-// This is a dummy implementation which covers only what is used by protocol
-// buffer unit tests.
-class ScopedMemoryLog {
- public:
-  ScopedMemoryLog();
-  virtual ~ScopedMemoryLog();
-
-  // Fetches all messages with the given severity level.
-  const std::vector<std::string>& GetMessages(LogLevel error);
-
- private:
-  std::map<LogLevel, std::vector<std::string> > messages_;
-  LogHandler* old_handler_;
-
-  static void HandleLog(LogLevel level, const char* filename, int line,
-                        const std::string& message);
-
-  static ScopedMemoryLog* active_log_;
-
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(ScopedMemoryLog);
-};
-
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // GOOGLE_PROTOBUF_GOOGLETEST_H__
diff --git a/libs/protobuf/src/google/protobuf/testing/zcgunzip.cc b/libs/protobuf/src/google/protobuf/testing/zcgunzip.cc
deleted file mode 100644
index 68f8172..0000000
--- a/libs/protobuf/src/google/protobuf/testing/zcgunzip.cc
+++ /dev/null
@@ -1,84 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2009 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: brianolson@google.com (Brian Olson)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-//
-// Test program to verify that GzipInputStream is compatible with command line
-// gunzip or java.util.zip.GzipInputStream
-//
-// Reads gzip stream on standard input and writes decompressed data to standard
-// output.
-
-#include <assert.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-#ifdef _WIN32
-#ifndef STDIN_FILENO
-#define STDIN_FILENO 0
-#endif
-#ifndef STDOUT_FILENO
-#define STDOUT_FILENO 1
-#endif
-#endif
-
-#include <google/protobuf/io/gzip_stream.h>
-#include <google/protobuf/io/zero_copy_stream_impl.h>
-
-using google::protobuf::io::FileInputStream;
-using google::protobuf::io::GzipInputStream;
-
-int main(int argc, const char** argv) {
-  FileInputStream fin(STDIN_FILENO);
-  GzipInputStream in(&fin);
-
-  while (true) {
-    const void* inptr;
-    int inlen;
-    bool ok;
-    ok = in.Next(&inptr, &inlen);
-    if (!ok) {
-      break;
-    }
-    if (inlen > 0) {
-      int err = write(STDOUT_FILENO, inptr, inlen);
-      if (err != inlen) {
-        fprintf(stderr, "write unexpectedly returned %d.\n", err);
-        return 1;
-      }
-    }
-  }
-
-  return 0;
-}
diff --git a/libs/protobuf/src/google/protobuf/testing/zcgzip.cc b/libs/protobuf/src/google/protobuf/testing/zcgzip.cc
deleted file mode 100644
index 808d058..0000000
--- a/libs/protobuf/src/google/protobuf/testing/zcgzip.cc
+++ /dev/null
@@ -1,87 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2009 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: brianolson@google.com (Brian Olson)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-//
-// Test program to verify that GzipOutputStream is compatible with command line
-// gzip or java.util.zip.GzipOutputStream
-//
-// Reads data on standard input and writes compressed gzip stream to standard
-// output.
-
-#include <fcntl.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-#ifdef _WIN32
-#ifndef STDIN_FILENO
-#define STDIN_FILENO 0
-#endif
-#ifndef STDOUT_FILENO
-#define STDOUT_FILENO 1
-#endif
-#endif
-
-#include <google/protobuf/io/gzip_stream.h>
-#include <google/protobuf/io/zero_copy_stream_impl.h>
-
-using google::protobuf::io::FileOutputStream;
-using google::protobuf::io::GzipOutputStream;
-
-int main(int argc, const char** argv) {
-  FileOutputStream fout(STDOUT_FILENO);
-  GzipOutputStream out(&fout);
-  int readlen;
-
-  while (true) {
-    void* outptr;
-    int outlen;
-    bool ok;
-    do {
-      ok = out.Next(&outptr, &outlen);
-      if (!ok) {
-        break;
-      }
-    } while (outlen <= 0);
-    readlen = read(STDIN_FILENO, outptr, outlen);
-    if (readlen <= 0) {
-      out.BackUp(outlen);
-      break;
-    }
-    if (readlen < outlen) {
-      out.BackUp(outlen - readlen);
-    }
-  }
-
-  return 0;
-}
diff --git a/libs/protobuf/src/google/protobuf/text_format.cc b/libs/protobuf/src/google/protobuf/text_format.cc
deleted file mode 100644
index 05987d3..0000000
--- a/libs/protobuf/src/google/protobuf/text_format.cc
+++ /dev/null
@@ -1,2746 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: jschorr@google.com (Joseph Schorr)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-
-#include <google/protobuf/text_format.h>
-
-#include <float.h>
-#include <stdio.h>
-
-#include <algorithm>
-#include <atomic>
-#include <climits>
-#include <cmath>
-#include <limits>
-#include <utility>
-#include <vector>
-
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/io/tokenizer.h>
-#include <google/protobuf/io/zero_copy_stream.h>
-#include <google/protobuf/io/zero_copy_stream_impl.h>
-#include <google/protobuf/stubs/strutil.h>
-#include <google/protobuf/any.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/descriptor.pb.h>
-#include <google/protobuf/dynamic_message.h>
-#include <google/protobuf/io/strtod.h>
-#include <google/protobuf/map_field.h>
-#include <google/protobuf/message.h>
-#include <google/protobuf/repeated_field.h>
-#include <google/protobuf/unknown_field_set.h>
-#include <google/protobuf/wire_format_lite.h>
-#include <google/protobuf/stubs/map_util.h>
-#include <google/protobuf/stubs/stl_util.h>
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-
-namespace {
-
-inline bool IsHexNumber(const std::string& str) {
-  return (str.length() >= 2 && str[0] == '0' &&
-          (str[1] == 'x' || str[1] == 'X'));
-}
-
-inline bool IsOctNumber(const std::string& str) {
-  return (str.length() >= 2 && str[0] == '0' &&
-          (str[1] >= '0' && str[1] < '8'));
-}
-
-}  // namespace
-
-namespace internal {
-const char kDebugStringSilentMarker[] = "";
-const char kDebugStringSilentMarkerForDetection[] = "\t ";
-
-// Controls insertion of kDebugStringSilentMarker.
-PROTOBUF_EXPORT std::atomic<bool> enable_debug_text_format_marker;
-}  // namespace internal
-
-std::string Message::DebugString() const {
-  std::string debug_string;
-
-  TextFormat::Printer printer;
-  printer.SetExpandAny(true);
-  printer.SetInsertSilentMarker(internal::enable_debug_text_format_marker.load(
-      std::memory_order_relaxed));
-
-  printer.PrintToString(*this, &debug_string);
-
-  return debug_string;
-}
-
-std::string Message::ShortDebugString() const {
-  std::string debug_string;
-
-  TextFormat::Printer printer;
-  printer.SetSingleLineMode(true);
-  printer.SetExpandAny(true);
-  printer.SetInsertSilentMarker(internal::enable_debug_text_format_marker.load(
-      std::memory_order_relaxed));
-
-  printer.PrintToString(*this, &debug_string);
-  // Single line mode currently might have an extra space at the end.
-  if (!debug_string.empty() && debug_string[debug_string.size() - 1] == ' ') {
-    debug_string.resize(debug_string.size() - 1);
-  }
-
-  return debug_string;
-}
-
-std::string Message::Utf8DebugString() const {
-  std::string debug_string;
-
-  TextFormat::Printer printer;
-  printer.SetUseUtf8StringEscaping(true);
-  printer.SetExpandAny(true);
-  printer.SetInsertSilentMarker(internal::enable_debug_text_format_marker.load(
-      std::memory_order_relaxed));
-
-  printer.PrintToString(*this, &debug_string);
-
-  return debug_string;
-}
-
-void Message::PrintDebugString() const { printf("%s", DebugString().c_str()); }
-
-
-// ===========================================================================
-// Implementation of the parse information tree class.
-void TextFormat::ParseInfoTree::RecordLocation(
-    const FieldDescriptor* field, TextFormat::ParseLocationRange range) {
-  locations_[field].push_back(range);
-}
-
-TextFormat::ParseInfoTree* TextFormat::ParseInfoTree::CreateNested(
-    const FieldDescriptor* field) {
-  // Owned by us in the map.
-  auto& vec = nested_[field];
-  vec.emplace_back(new TextFormat::ParseInfoTree());
-  return vec.back().get();
-}
-
-void CheckFieldIndex(const FieldDescriptor* field, int index) {
-  if (field == nullptr) {
-    return;
-  }
-
-  if (field->is_repeated() && index == -1) {
-    GOOGLE_LOG(DFATAL) << "Index must be in range of repeated field values. "
-                << "Field: " << field->name();
-  } else if (!field->is_repeated() && index != -1) {
-    GOOGLE_LOG(DFATAL) << "Index must be -1 for singular fields."
-                << "Field: " << field->name();
-  }
-}
-
-TextFormat::ParseLocationRange TextFormat::ParseInfoTree::GetLocationRange(
-    const FieldDescriptor* field, int index) const {
-  CheckFieldIndex(field, index);
-  if (index == -1) {
-    index = 0;
-  }
-
-  const std::vector<TextFormat::ParseLocationRange>* locations =
-      FindOrNull(locations_, field);
-  if (locations == nullptr ||
-      index >= static_cast<int64_t>(locations->size())) {
-    return TextFormat::ParseLocationRange();
-  }
-
-  return (*locations)[index];
-}
-
-TextFormat::ParseInfoTree* TextFormat::ParseInfoTree::GetTreeForNested(
-    const FieldDescriptor* field, int index) const {
-  CheckFieldIndex(field, index);
-  if (index == -1) {
-    index = 0;
-  }
-
-  auto it = nested_.find(field);
-  if (it == nested_.end() || index >= static_cast<int64_t>(it->second.size())) {
-    return nullptr;
-  }
-
-  return it->second[index].get();
-}
-
-namespace {
-// These functions implement the behavior of the "default" TextFormat::Finder,
-// they are defined as standalone to be called when finder_ is nullptr.
-const FieldDescriptor* DefaultFinderFindExtension(Message* message,
-                                                  const std::string& name) {
-  const Descriptor* descriptor = message->GetDescriptor();
-  return descriptor->file()->pool()->FindExtensionByPrintableName(descriptor,
-                                                                  name);
-}
-
-const FieldDescriptor* DefaultFinderFindExtensionByNumber(
-    const Descriptor* descriptor, int number) {
-  return descriptor->file()->pool()->FindExtensionByNumber(descriptor, number);
-}
-
-const Descriptor* DefaultFinderFindAnyType(const Message& message,
-                                           const std::string& prefix,
-                                           const std::string& name) {
-  if (prefix != internal::kTypeGoogleApisComPrefix &&
-      prefix != internal::kTypeGoogleProdComPrefix) {
-    return nullptr;
-  }
-  return message.GetDescriptor()->file()->pool()->FindMessageTypeByName(name);
-}
-}  // namespace
-
-// ===========================================================================
-// Internal class for parsing an ASCII representation of a Protocol Message.
-// This class makes use of the Protocol Message compiler's tokenizer found
-// in //net/proto2/io/public/tokenizer.h. Note that class's Parse
-// method is *not* thread-safe and should only be used in a single thread at
-// a time.
-
-// Makes code slightly more readable.  The meaning of "DO(foo)" is
-// "Execute foo and fail if it fails.", where failure is indicated by
-// returning false. Borrowed from parser.cc (Thanks Kenton!).
-#define DO(STATEMENT) \
-  if (STATEMENT) {    \
-  } else {            \
-    return false;     \
-  }
-
-class TextFormat::Parser::ParserImpl {
- public:
-  // Determines if repeated values for non-repeated fields and
-  // oneofs are permitted, e.g., the string "foo: 1 foo: 2" for a
-  // required/optional field named "foo", or "baz: 1 bar: 2"
-  // where "baz" and "bar" are members of the same oneof.
-  enum SingularOverwritePolicy {
-    ALLOW_SINGULAR_OVERWRITES = 0,   // the last value is retained
-    FORBID_SINGULAR_OVERWRITES = 1,  // an error is issued
-  };
-
-  ParserImpl(const Descriptor* root_message_type,
-             io::ZeroCopyInputStream* input_stream,
-             io::ErrorCollector* error_collector,
-             const TextFormat::Finder* finder, ParseInfoTree* parse_info_tree,
-             SingularOverwritePolicy singular_overwrite_policy,
-             bool allow_case_insensitive_field, bool allow_unknown_field,
-             bool allow_unknown_extension, bool allow_unknown_enum,
-             bool allow_field_number, bool allow_relaxed_whitespace,
-             bool allow_partial, int recursion_limit)
-      : error_collector_(error_collector),
-        finder_(finder),
-        parse_info_tree_(parse_info_tree),
-        tokenizer_error_collector_(this),
-        tokenizer_(input_stream, &tokenizer_error_collector_),
-        root_message_type_(root_message_type),
-        singular_overwrite_policy_(singular_overwrite_policy),
-        allow_case_insensitive_field_(allow_case_insensitive_field),
-        allow_unknown_field_(allow_unknown_field),
-        allow_unknown_extension_(allow_unknown_extension),
-        allow_unknown_enum_(allow_unknown_enum),
-        allow_field_number_(allow_field_number),
-        allow_partial_(allow_partial),
-        initial_recursion_limit_(recursion_limit),
-        recursion_limit_(recursion_limit),
-        had_silent_marker_(false),
-        had_errors_(false) {
-    // For backwards-compatibility with proto1, we need to allow the 'f' suffix
-    // for floats.
-    tokenizer_.set_allow_f_after_float(true);
-
-    // '#' starts a comment.
-    tokenizer_.set_comment_style(io::Tokenizer::SH_COMMENT_STYLE);
-
-    if (allow_relaxed_whitespace) {
-      tokenizer_.set_require_space_after_number(false);
-      tokenizer_.set_allow_multiline_strings(true);
-    }
-
-    // Consume the starting token.
-    tokenizer_.Next();
-  }
-  ~ParserImpl() {}
-
-  // Parses the ASCII representation specified in input and saves the
-  // information into the output pointer (a Message). Returns
-  // false if an error occurs (an error will also be logged to
-  // GOOGLE_LOG(ERROR)).
-  bool Parse(Message* output) {
-    // Consume fields until we cannot do so anymore.
-    while (true) {
-      if (LookingAtType(io::Tokenizer::TYPE_END)) {
-        // Ensures recursion limit properly unwinded, but only for success
-        // cases. This implicitly avoids the check when `Parse` returns false
-        // via `DO(...)`.
-        GOOGLE_DCHECK(had_errors_ || recursion_limit_ == initial_recursion_limit_)
-            << "Recursion limit at end of parse should be "
-            << initial_recursion_limit_ << ", but was " << recursion_limit_
-            << ". Difference of " << initial_recursion_limit_ - recursion_limit_
-            << " stack frames not accounted for stack unwind.";
-
-        return !had_errors_;
-      }
-
-      DO(ConsumeField(output));
-    }
-  }
-
-  bool ParseField(const FieldDescriptor* field, Message* output) {
-    bool suc;
-    if (field->cpp_type() == FieldDescriptor::CPPTYPE_MESSAGE) {
-      suc = ConsumeFieldMessage(output, output->GetReflection(), field);
-    } else {
-      suc = ConsumeFieldValue(output, output->GetReflection(), field);
-    }
-    return suc && LookingAtType(io::Tokenizer::TYPE_END);
-  }
-
-  void ReportError(int line, int col, const std::string& message) {
-    had_errors_ = true;
-    if (error_collector_ == nullptr) {
-      if (line >= 0) {
-        GOOGLE_LOG(ERROR) << "Error parsing text-format "
-                   << root_message_type_->full_name() << ": " << (line + 1)
-                   << ":" << (col + 1) << ": " << message;
-      } else {
-        GOOGLE_LOG(ERROR) << "Error parsing text-format "
-                   << root_message_type_->full_name() << ": " << message;
-      }
-    } else {
-      error_collector_->AddError(line, col, message);
-    }
-  }
-
-  void ReportWarning(int line, int col, const std::string& message) {
-    if (error_collector_ == nullptr) {
-      if (line >= 0) {
-        GOOGLE_LOG(WARNING) << "Warning parsing text-format "
-                     << root_message_type_->full_name() << ": " << (line + 1)
-                     << ":" << (col + 1) << ": " << message;
-      } else {
-        GOOGLE_LOG(WARNING) << "Warning parsing text-format "
-                     << root_message_type_->full_name() << ": " << message;
-      }
-    } else {
-      error_collector_->AddWarning(line, col, message);
-    }
-  }
-
- private:
-  static constexpr int32_t kint32max = std::numeric_limits<int32_t>::max();
-  static constexpr uint32_t kuint32max = std::numeric_limits<uint32_t>::max();
-  static constexpr int64_t kint64min = std::numeric_limits<int64_t>::min();
-  static constexpr int64_t kint64max = std::numeric_limits<int64_t>::max();
-  static constexpr uint64_t kuint64max = std::numeric_limits<uint64_t>::max();
-
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(ParserImpl);
-
-  // Reports an error with the given message with information indicating
-  // the position (as derived from the current token).
-  void ReportError(const std::string& message) {
-    ReportError(tokenizer_.current().line, tokenizer_.current().column,
-                message);
-  }
-
-  // Reports a warning with the given message with information indicating
-  // the position (as derived from the current token).
-  void ReportWarning(const std::string& message) {
-    ReportWarning(tokenizer_.current().line, tokenizer_.current().column,
-                  message);
-  }
-
-  // Consumes the specified message with the given starting delimiter.
-  // This method checks to see that the end delimiter at the conclusion of
-  // the consumption matches the starting delimiter passed in here.
-  bool ConsumeMessage(Message* message, const std::string delimiter) {
-    while (!LookingAt(">") && !LookingAt("}")) {
-      DO(ConsumeField(message));
-    }
-
-    // Confirm that we have a valid ending delimiter.
-    DO(Consume(delimiter));
-    return true;
-  }
-
-  // Consume either "<" or "{".
-  bool ConsumeMessageDelimiter(std::string* delimiter) {
-    if (TryConsume("<")) {
-      *delimiter = ">";
-    } else {
-      DO(Consume("{"));
-      *delimiter = "}";
-    }
-    return true;
-  }
-
-
-  // Consumes the current field (as returned by the tokenizer) on the
-  // passed in message.
-  bool ConsumeField(Message* message) {
-    const Reflection* reflection = message->GetReflection();
-    const Descriptor* descriptor = message->GetDescriptor();
-
-    std::string field_name;
-    bool reserved_field = false;
-    const FieldDescriptor* field = nullptr;
-    int start_line = tokenizer_.current().line;
-    int start_column = tokenizer_.current().column;
-
-    const FieldDescriptor* any_type_url_field;
-    const FieldDescriptor* any_value_field;
-    if (internal::GetAnyFieldDescriptors(*message, &any_type_url_field,
-                                         &any_value_field) &&
-        TryConsume("[")) {
-      std::string full_type_name, prefix;
-      DO(ConsumeAnyTypeUrl(&full_type_name, &prefix));
-      std::string prefix_and_full_type_name =
-          StrCat(prefix, full_type_name);
-      DO(ConsumeBeforeWhitespace("]"));
-      TryConsumeWhitespace();
-      // ':' is optional between message labels and values.
-      if (TryConsumeBeforeWhitespace(":")) {
-        TryConsumeWhitespace();
-      }
-      std::string serialized_value;
-      const Descriptor* value_descriptor =
-          finder_ ? finder_->FindAnyType(*message, prefix, full_type_name)
-                  : DefaultFinderFindAnyType(*message, prefix, full_type_name);
-      if (value_descriptor == nullptr) {
-        ReportError("Could not find type \"" + prefix_and_full_type_name +
-                    "\" stored in google.protobuf.Any.");
-        return false;
-      }
-      DO(ConsumeAnyValue(value_descriptor, &serialized_value));
-      if (singular_overwrite_policy_ == FORBID_SINGULAR_OVERWRITES) {
-        // Fail if any_type_url_field has already been specified.
-        if ((!any_type_url_field->is_repeated() &&
-             reflection->HasField(*message, any_type_url_field)) ||
-            (!any_value_field->is_repeated() &&
-             reflection->HasField(*message, any_value_field))) {
-          ReportError("Non-repeated Any specified multiple times.");
-          return false;
-        }
-      }
-      reflection->SetString(message, any_type_url_field,
-                            std::move(prefix_and_full_type_name));
-      reflection->SetString(message, any_value_field,
-                            std::move(serialized_value));
-      return true;
-    }
-    if (TryConsume("[")) {
-      // Extension.
-      DO(ConsumeFullTypeName(&field_name));
-      DO(ConsumeBeforeWhitespace("]"));
-      TryConsumeWhitespace();
-
-      field = finder_ ? finder_->FindExtension(message, field_name)
-                      : DefaultFinderFindExtension(message, field_name);
-
-      if (field == nullptr) {
-        if (!allow_unknown_field_ && !allow_unknown_extension_) {
-          ReportError("Extension \"" + field_name +
-                      "\" is not defined or "
-                      "is not an extension of \"" +
-                      descriptor->full_name() + "\".");
-          return false;
-        } else {
-          ReportWarning("Ignoring extension \"" + field_name +
-                        "\" which is not defined or is not an extension of \"" +
-                        descriptor->full_name() + "\".");
-        }
-      }
-    } else {
-      DO(ConsumeIdentifierBeforeWhitespace(&field_name));
-      TryConsumeWhitespace();
-
-      int32_t field_number;
-      if (allow_field_number_ && safe_strto32(field_name, &field_number)) {
-        if (descriptor->IsExtensionNumber(field_number)) {
-          field = finder_
-                      ? finder_->FindExtensionByNumber(descriptor, field_number)
-                      : DefaultFinderFindExtensionByNumber(descriptor,
-                                                           field_number);
-        } else if (descriptor->IsReservedNumber(field_number)) {
-          reserved_field = true;
-        } else {
-          field = descriptor->FindFieldByNumber(field_number);
-        }
-      } else {
-        field = descriptor->FindFieldByName(field_name);
-        // Group names are expected to be capitalized as they appear in the
-        // .proto file, which actually matches their type names, not their
-        // field names.
-        if (field == nullptr) {
-          std::string lower_field_name = field_name;
-          LowerString(&lower_field_name);
-          field = descriptor->FindFieldByName(lower_field_name);
-          // If the case-insensitive match worked but the field is NOT a group,
-          if (field != nullptr &&
-              field->type() != FieldDescriptor::TYPE_GROUP) {
-            field = nullptr;
-          }
-        }
-        // Again, special-case group names as described above.
-        if (field != nullptr && field->type() == FieldDescriptor::TYPE_GROUP &&
-            field->message_type()->name() != field_name) {
-          field = nullptr;
-        }
-
-        if (field == nullptr && allow_case_insensitive_field_) {
-          std::string lower_field_name = field_name;
-          LowerString(&lower_field_name);
-          field = descriptor->FindFieldByLowercaseName(lower_field_name);
-        }
-
-        if (field == nullptr) {
-          reserved_field = descriptor->IsReservedName(field_name);
-        }
-      }
-
-      if (field == nullptr && !reserved_field) {
-        if (!allow_unknown_field_) {
-          ReportError("Message type \"" + descriptor->full_name() +
-                      "\" has no field named \"" + field_name + "\".");
-          return false;
-        } else {
-          ReportWarning("Message type \"" + descriptor->full_name() +
-                        "\" has no field named \"" + field_name + "\".");
-        }
-      }
-    }
-
-    // Skips unknown or reserved fields.
-    if (field == nullptr) {
-      GOOGLE_CHECK(allow_unknown_field_ || allow_unknown_extension_ || reserved_field);
-
-      // Try to guess the type of this field.
-      // If this field is not a message, there should be a ":" between the
-      // field name and the field value and also the field value should not
-      // start with "{" or "<" which indicates the beginning of a message body.
-      // If there is no ":" or there is a "{" or "<" after ":", this field has
-      // to be a message or the input is ill-formed.
-      if (TryConsumeBeforeWhitespace(":")) {
-        TryConsumeWhitespace();
-        if (!LookingAt("{") && !LookingAt("<")) {
-          return SkipFieldValue();
-        }
-      }
-      return SkipFieldMessage();
-    }
-
-    if (singular_overwrite_policy_ == FORBID_SINGULAR_OVERWRITES) {
-      // Fail if the field is not repeated and it has already been specified.
-      if (!field->is_repeated() && reflection->HasField(*message, field)) {
-        ReportError("Non-repeated field \"" + field_name +
-                    "\" is specified multiple times.");
-        return false;
-      }
-      // Fail if the field is a member of a oneof and another member has already
-      // been specified.
-      const OneofDescriptor* oneof = field->containing_oneof();
-      if (oneof != nullptr && reflection->HasOneof(*message, oneof)) {
-        const FieldDescriptor* other_field =
-            reflection->GetOneofFieldDescriptor(*message, oneof);
-        ReportError("Field \"" + field_name +
-                    "\" is specified along with "
-                    "field \"" +
-                    other_field->name() +
-                    "\", another member "
-                    "of oneof \"" +
-                    oneof->name() + "\".");
-        return false;
-      }
-    }
-
-    // Perform special handling for embedded message types.
-    if (field->cpp_type() == FieldDescriptor::CPPTYPE_MESSAGE) {
-      // ':' is optional here.
-      bool consumed_semicolon = TryConsumeBeforeWhitespace(":");
-      if (consumed_semicolon) {
-        TryConsumeWhitespace();
-      }
-      if (consumed_semicolon && field->options().weak() &&
-          LookingAtType(io::Tokenizer::TYPE_STRING)) {
-        // we are getting a bytes string for a weak field.
-        std::string tmp;
-        DO(ConsumeString(&tmp));
-        MessageFactory* factory =
-            finder_ ? finder_->FindExtensionFactory(field) : nullptr;
-        reflection->MutableMessage(message, field, factory)
-            ->ParseFromString(tmp);
-        goto label_skip_parsing;
-      }
-    } else {
-      // ':' is required here.
-      DO(ConsumeBeforeWhitespace(":"));
-      TryConsumeWhitespace();
-    }
-
-    if (field->is_repeated() && TryConsume("[")) {
-      // Short repeated format, e.g.  "foo: [1, 2, 3]".
-      if (!TryConsume("]")) {
-        // "foo: []" is treated as empty.
-        while (true) {
-          if (field->cpp_type() == FieldDescriptor::CPPTYPE_MESSAGE) {
-            // Perform special handling for embedded message types.
-            DO(ConsumeFieldMessage(message, reflection, field));
-          } else {
-            DO(ConsumeFieldValue(message, reflection, field));
-          }
-          if (TryConsume("]")) {
-            break;
-          }
-          DO(Consume(","));
-        }
-      }
-    } else if (field->cpp_type() == FieldDescriptor::CPPTYPE_MESSAGE) {
-      DO(ConsumeFieldMessage(message, reflection, field));
-    } else {
-      DO(ConsumeFieldValue(message, reflection, field));
-    }
-  label_skip_parsing:
-    // For historical reasons, fields may optionally be separated by commas or
-    // semicolons.
-    TryConsume(";") || TryConsume(",");
-
-    if (field->options().deprecated()) {
-      ReportWarning("text format contains deprecated field \"" + field_name +
-                    "\"");
-    }
-
-    // If a parse info tree exists, add the location for the parsed
-    // field.
-    if (parse_info_tree_ != nullptr) {
-      int end_line = tokenizer_.previous().line;
-      int end_column = tokenizer_.previous().end_column;
-
-      RecordLocation(parse_info_tree_, field,
-                     ParseLocationRange(ParseLocation(start_line, start_column),
-                                        ParseLocation(end_line, end_column)));
-    }
-
-    return true;
-  }
-
-  // Skips the next field including the field's name and value.
-  bool SkipField() {
-    std::string field_name;
-    if (TryConsume("[")) {
-      // Extension name or type URL.
-      DO(ConsumeTypeUrlOrFullTypeName(&field_name));
-      DO(ConsumeBeforeWhitespace("]"));
-    } else {
-      DO(ConsumeIdentifierBeforeWhitespace(&field_name));
-    }
-    TryConsumeWhitespace();
-
-    // Try to guess the type of this field.
-    // If this field is not a message, there should be a ":" between the
-    // field name and the field value and also the field value should not
-    // start with "{" or "<" which indicates the beginning of a message body.
-    // If there is no ":" or there is a "{" or "<" after ":", this field has
-    // to be a message or the input is ill-formed.
-    if (TryConsumeBeforeWhitespace(":")) {
-      TryConsumeWhitespace();
-      if (!LookingAt("{") && !LookingAt("<")) {
-        DO(SkipFieldValue());
-      } else {
-        DO(SkipFieldMessage());
-      }
-    } else {
-      DO(SkipFieldMessage());
-    }
-    // For historical reasons, fields may optionally be separated by commas or
-    // semicolons.
-    TryConsume(";") || TryConsume(",");
-    return true;
-  }
-
-  bool ConsumeFieldMessage(Message* message, const Reflection* reflection,
-                           const FieldDescriptor* field) {
-    if (--recursion_limit_ < 0) {
-      ReportError(
-          StrCat("Message is too deep, the parser exceeded the "
-                       "configured recursion limit of ",
-                       initial_recursion_limit_, "."));
-      return false;
-    }
-    // If the parse information tree is not nullptr, create a nested one
-    // for the nested message.
-    ParseInfoTree* parent = parse_info_tree_;
-    if (parent != nullptr) {
-      parse_info_tree_ = CreateNested(parent, field);
-    }
-
-    std::string delimiter;
-    DO(ConsumeMessageDelimiter(&delimiter));
-    MessageFactory* factory =
-        finder_ ? finder_->FindExtensionFactory(field) : nullptr;
-    if (field->is_repeated()) {
-      DO(ConsumeMessage(reflection->AddMessage(message, field, factory),
-                        delimiter));
-    } else {
-      DO(ConsumeMessage(reflection->MutableMessage(message, field, factory),
-                        delimiter));
-    }
-
-    ++recursion_limit_;
-
-    // Reset the parse information tree.
-    parse_info_tree_ = parent;
-    return true;
-  }
-
-  // Skips the whole body of a message including the beginning delimiter and
-  // the ending delimiter.
-  bool SkipFieldMessage() {
-    if (--recursion_limit_ < 0) {
-      ReportError(
-          StrCat("Message is too deep, the parser exceeded the "
-                       "configured recursion limit of ",
-                       initial_recursion_limit_, "."));
-      return false;
-    }
-
-    std::string delimiter;
-    DO(ConsumeMessageDelimiter(&delimiter));
-    while (!LookingAt(">") && !LookingAt("}")) {
-      DO(SkipField());
-    }
-    DO(Consume(delimiter));
-
-    ++recursion_limit_;
-    return true;
-  }
-
-  bool ConsumeFieldValue(Message* message, const Reflection* reflection,
-                         const FieldDescriptor* field) {
-// Define an easy to use macro for setting fields. This macro checks
-// to see if the field is repeated (in which case we need to use the Add
-// methods or not (in which case we need to use the Set methods).
-#define SET_FIELD(CPPTYPE, VALUE)                    \
-  if (field->is_repeated()) {                        \
-    reflection->Add##CPPTYPE(message, field, VALUE); \
-  } else {                                           \
-    reflection->Set##CPPTYPE(message, field, VALUE); \
-  }
-
-    switch (field->cpp_type()) {
-      case FieldDescriptor::CPPTYPE_INT32: {
-        int64_t value;
-        DO(ConsumeSignedInteger(&value, kint32max));
-        SET_FIELD(Int32, static_cast<int32_t>(value));
-        break;
-      }
-
-      case FieldDescriptor::CPPTYPE_UINT32: {
-        uint64_t value;
-        DO(ConsumeUnsignedInteger(&value, kuint32max));
-        SET_FIELD(UInt32, static_cast<uint32_t>(value));
-        break;
-      }
-
-      case FieldDescriptor::CPPTYPE_INT64: {
-        int64_t value;
-        DO(ConsumeSignedInteger(&value, kint64max));
-        SET_FIELD(Int64, value);
-        break;
-      }
-
-      case FieldDescriptor::CPPTYPE_UINT64: {
-        uint64_t value;
-        DO(ConsumeUnsignedInteger(&value, kuint64max));
-        SET_FIELD(UInt64, value);
-        break;
-      }
-
-      case FieldDescriptor::CPPTYPE_FLOAT: {
-        double value;
-        DO(ConsumeDouble(&value));
-        SET_FIELD(Float, io::SafeDoubleToFloat(value));
-        break;
-      }
-
-      case FieldDescriptor::CPPTYPE_DOUBLE: {
-        double value;
-        DO(ConsumeDouble(&value));
-        SET_FIELD(Double, value);
-        break;
-      }
-
-      case FieldDescriptor::CPPTYPE_STRING: {
-        std::string value;
-        DO(ConsumeString(&value));
-        SET_FIELD(String, std::move(value));
-        break;
-      }
-
-      case FieldDescriptor::CPPTYPE_BOOL: {
-        if (LookingAtType(io::Tokenizer::TYPE_INTEGER)) {
-          uint64_t value;
-          DO(ConsumeUnsignedInteger(&value, 1));
-          SET_FIELD(Bool, value);
-        } else {
-          std::string value;
-          DO(ConsumeIdentifier(&value));
-          if (value == "true" || value == "True" || value == "t") {
-            SET_FIELD(Bool, true);
-          } else if (value == "false" || value == "False" || value == "f") {
-            SET_FIELD(Bool, false);
-          } else {
-            ReportError("Invalid value for boolean field \"" + field->name() +
-                        "\". Value: \"" + value + "\".");
-            return false;
-          }
-        }
-        break;
-      }
-
-      case FieldDescriptor::CPPTYPE_ENUM: {
-        std::string value;
-        int64_t int_value = kint64max;
-        const EnumDescriptor* enum_type = field->enum_type();
-        const EnumValueDescriptor* enum_value = nullptr;
-
-        if (LookingAtType(io::Tokenizer::TYPE_IDENTIFIER)) {
-          DO(ConsumeIdentifier(&value));
-          // Find the enumeration value.
-          enum_value = enum_type->FindValueByName(value);
-
-        } else if (LookingAt("-") ||
-                   LookingAtType(io::Tokenizer::TYPE_INTEGER)) {
-          DO(ConsumeSignedInteger(&int_value, kint32max));
-          value = StrCat(int_value);  // for error reporting
-          enum_value = enum_type->FindValueByNumber(int_value);
-        } else {
-          ReportError("Expected integer or identifier, got: " +
-                      tokenizer_.current().text);
-          return false;
-        }
-
-        if (enum_value == nullptr) {
-          if (int_value != kint64max &&
-              reflection->SupportsUnknownEnumValues()) {
-            SET_FIELD(EnumValue, int_value);
-            return true;
-          } else if (!allow_unknown_enum_) {
-            ReportError("Unknown enumeration value of \"" + value +
-                        "\" for "
-                        "field \"" +
-                        field->name() + "\".");
-            return false;
-          } else {
-            ReportWarning("Unknown enumeration value of \"" + value +
-                          "\" for "
-                          "field \"" +
-                          field->name() + "\".");
-            return true;
-          }
-        }
-
-        SET_FIELD(Enum, enum_value);
-        break;
-      }
-
-      case FieldDescriptor::CPPTYPE_MESSAGE: {
-        // We should never get here. Put here instead of a default
-        // so that if new types are added, we get a nice compiler warning.
-        GOOGLE_LOG(FATAL) << "Reached an unintended state: CPPTYPE_MESSAGE";
-        break;
-      }
-    }
-#undef SET_FIELD
-    return true;
-  }
-
-  bool SkipFieldValue() {
-    if (--recursion_limit_ < 0) {
-      ReportError(
-          StrCat("Message is too deep, the parser exceeded the "
-                       "configured recursion limit of ",
-                       initial_recursion_limit_, "."));
-      return false;
-    }
-
-    if (LookingAtType(io::Tokenizer::TYPE_STRING)) {
-      while (LookingAtType(io::Tokenizer::TYPE_STRING)) {
-        tokenizer_.Next();
-      }
-      ++recursion_limit_;
-      return true;
-    }
-    if (TryConsume("[")) {
-      while (true) {
-        if (!LookingAt("{") && !LookingAt("<")) {
-          DO(SkipFieldValue());
-        } else {
-          DO(SkipFieldMessage());
-        }
-        if (TryConsume("]")) {
-          break;
-        }
-        DO(Consume(","));
-      }
-      ++recursion_limit_;
-      return true;
-    }
-    // Possible field values other than string:
-    //   12345        => TYPE_INTEGER
-    //   -12345       => TYPE_SYMBOL + TYPE_INTEGER
-    //   1.2345       => TYPE_FLOAT
-    //   -1.2345      => TYPE_SYMBOL + TYPE_FLOAT
-    //   inf          => TYPE_IDENTIFIER
-    //   -inf         => TYPE_SYMBOL + TYPE_IDENTIFIER
-    //   TYPE_INTEGER => TYPE_IDENTIFIER
-    // Divides them into two group, one with TYPE_SYMBOL
-    // and the other without:
-    //   Group one:
-    //     12345        => TYPE_INTEGER
-    //     1.2345       => TYPE_FLOAT
-    //     inf          => TYPE_IDENTIFIER
-    //     TYPE_INTEGER => TYPE_IDENTIFIER
-    //   Group two:
-    //     -12345       => TYPE_SYMBOL + TYPE_INTEGER
-    //     -1.2345      => TYPE_SYMBOL + TYPE_FLOAT
-    //     -inf         => TYPE_SYMBOL + TYPE_IDENTIFIER
-    // As we can see, the field value consists of an optional '-' and one of
-    // TYPE_INTEGER, TYPE_FLOAT and TYPE_IDENTIFIER.
-    bool has_minus = TryConsume("-");
-    if (!LookingAtType(io::Tokenizer::TYPE_INTEGER) &&
-        !LookingAtType(io::Tokenizer::TYPE_FLOAT) &&
-        !LookingAtType(io::Tokenizer::TYPE_IDENTIFIER)) {
-      std::string text = tokenizer_.current().text;
-      ReportError("Cannot skip field value, unexpected token: " + text);
-      ++recursion_limit_;
-      return false;
-    }
-    // Combination of '-' and TYPE_IDENTIFIER may result in an invalid field
-    // value while other combinations all generate valid values.
-    // We check if the value of this combination is valid here.
-    // TYPE_IDENTIFIER after a '-' should be one of the float values listed
-    // below:
-    //   inf, inff, infinity, nan
-    if (has_minus && LookingAtType(io::Tokenizer::TYPE_IDENTIFIER)) {
-      std::string text = tokenizer_.current().text;
-      LowerString(&text);
-      if (text != "inf" &&
-          text != "infinity" && text != "nan") {
-        ReportError("Invalid float number: " + text);
-        ++recursion_limit_;
-        return false;
-      }
-    }
-    tokenizer_.Next();
-    ++recursion_limit_;
-    return true;
-  }
-
-  // Returns true if the current token's text is equal to that specified.
-  bool LookingAt(const std::string& text) {
-    return tokenizer_.current().text == text;
-  }
-
-  // Returns true if the current token's type is equal to that specified.
-  bool LookingAtType(io::Tokenizer::TokenType token_type) {
-    return tokenizer_.current().type == token_type;
-  }
-
-  // Consumes an identifier and saves its value in the identifier parameter.
-  // Returns false if the token is not of type IDENTIFIER.
-  bool ConsumeIdentifier(std::string* identifier) {
-    if (LookingAtType(io::Tokenizer::TYPE_IDENTIFIER)) {
-      *identifier = tokenizer_.current().text;
-      tokenizer_.Next();
-      return true;
-    }
-
-    // If allow_field_numer_ or allow_unknown_field_ is true, we should able
-    // to parse integer identifiers.
-    if ((allow_field_number_ || allow_unknown_field_ ||
-         allow_unknown_extension_) &&
-        LookingAtType(io::Tokenizer::TYPE_INTEGER)) {
-      *identifier = tokenizer_.current().text;
-      tokenizer_.Next();
-      return true;
-    }
-
-    ReportError("Expected identifier, got: " + tokenizer_.current().text);
-    return false;
-  }
-
-  // Similar to `ConsumeIdentifier`, but any following whitespace token may
-  // be reported.
-  bool ConsumeIdentifierBeforeWhitespace(std::string* identifier) {
-    tokenizer_.set_report_whitespace(true);
-    bool result = ConsumeIdentifier(identifier);
-    tokenizer_.set_report_whitespace(false);
-    return result;
-  }
-
-  // Consume a string of form "<id1>.<id2>....<idN>".
-  bool ConsumeFullTypeName(std::string* name) {
-    DO(ConsumeIdentifier(name));
-    while (TryConsume(".")) {
-      std::string part;
-      DO(ConsumeIdentifier(&part));
-      *name += ".";
-      *name += part;
-    }
-    return true;
-  }
-
-  bool ConsumeTypeUrlOrFullTypeName(std::string* name) {
-    DO(ConsumeIdentifier(name));
-    while (true) {
-      std::string connector;
-      if (TryConsume(".")) {
-        connector = ".";
-      } else if (TryConsume("/")) {
-        connector = "/";
-      } else {
-        break;
-      }
-      std::string part;
-      DO(ConsumeIdentifier(&part));
-      *name += connector;
-      *name += part;
-    }
-    return true;
-  }
-
-  // Consumes a string and saves its value in the text parameter.
-  // Returns false if the token is not of type STRING.
-  bool ConsumeString(std::string* text) {
-    if (!LookingAtType(io::Tokenizer::TYPE_STRING)) {
-      ReportError("Expected string, got: " + tokenizer_.current().text);
-      return false;
-    }
-
-    text->clear();
-    while (LookingAtType(io::Tokenizer::TYPE_STRING)) {
-      io::Tokenizer::ParseStringAppend(tokenizer_.current().text, text);
-
-      tokenizer_.Next();
-    }
-
-    return true;
-  }
-
-  // Consumes a uint64_t and saves its value in the value parameter.
-  // Returns false if the token is not of type INTEGER.
-  bool ConsumeUnsignedInteger(uint64_t* value, uint64_t max_value) {
-    if (!LookingAtType(io::Tokenizer::TYPE_INTEGER)) {
-      ReportError("Expected integer, got: " + tokenizer_.current().text);
-      return false;
-    }
-
-    if (!io::Tokenizer::ParseInteger(tokenizer_.current().text, max_value,
-                                     value)) {
-      ReportError("Integer out of range (" + tokenizer_.current().text + ")");
-      return false;
-    }
-
-    tokenizer_.Next();
-    return true;
-  }
-
-  // Consumes an int64_t and saves its value in the value parameter.
-  // Note that since the tokenizer does not support negative numbers,
-  // we actually may consume an additional token (for the minus sign) in this
-  // method. Returns false if the token is not an integer
-  // (signed or otherwise).
-  bool ConsumeSignedInteger(int64_t* value, uint64_t max_value) {
-    bool negative = false;
-
-    if (TryConsume("-")) {
-      negative = true;
-      // Two's complement always allows one more negative integer than
-      // positive.
-      ++max_value;
-    }
-
-    uint64_t unsigned_value;
-
-    DO(ConsumeUnsignedInteger(&unsigned_value, max_value));
-
-    if (negative) {
-      if ((static_cast<uint64_t>(kint64max) + 1) == unsigned_value) {
-        *value = kint64min;
-      } else {
-        *value = -static_cast<int64_t>(unsigned_value);
-      }
-    } else {
-      *value = static_cast<int64_t>(unsigned_value);
-    }
-
-    return true;
-  }
-
-  // Consumes a double and saves its value in the value parameter.
-  // Accepts decimal numbers only, rejects hex or oct numbers.
-  bool ConsumeUnsignedDecimalAsDouble(double* value, uint64_t max_value) {
-    if (!LookingAtType(io::Tokenizer::TYPE_INTEGER)) {
-      ReportError("Expected integer, got: " + tokenizer_.current().text);
-      return false;
-    }
-
-    const std::string& text = tokenizer_.current().text;
-    if (IsHexNumber(text) || IsOctNumber(text)) {
-      ReportError("Expect a decimal number, got: " + text);
-      return false;
-    }
-
-    uint64_t uint64_value;
-    if (io::Tokenizer::ParseInteger(text, max_value, &uint64_value)) {
-      *value = static_cast<double>(uint64_value);
-    } else {
-      // Uint64 overflow, attempt to parse as a double instead.
-      *value = io::Tokenizer::ParseFloat(text);
-    }
-
-    tokenizer_.Next();
-    return true;
-  }
-
-  // Consumes a double and saves its value in the value parameter.
-  // Note that since the tokenizer does not support negative numbers,
-  // we actually may consume an additional token (for the minus sign) in this
-  // method. Returns false if the token is not a double
-  // (signed or otherwise).
-  bool ConsumeDouble(double* value) {
-    bool negative = false;
-
-    if (TryConsume("-")) {
-      negative = true;
-    }
-
-    // A double can actually be an integer, according to the tokenizer.
-    // Therefore, we must check both cases here.
-    if (LookingAtType(io::Tokenizer::TYPE_INTEGER)) {
-      // We have found an integer value for the double.
-      DO(ConsumeUnsignedDecimalAsDouble(value, kuint64max));
-    } else if (LookingAtType(io::Tokenizer::TYPE_FLOAT)) {
-      // We have found a float value for the double.
-      *value = io::Tokenizer::ParseFloat(tokenizer_.current().text);
-
-      // Mark the current token as consumed.
-      tokenizer_.Next();
-    } else if (LookingAtType(io::Tokenizer::TYPE_IDENTIFIER)) {
-      std::string text = tokenizer_.current().text;
-      LowerString(&text);
-      if (text == "inf" ||
-          text == "infinity") {
-        *value = std::numeric_limits<double>::infinity();
-        tokenizer_.Next();
-      } else if (text == "nan") {
-        *value = std::numeric_limits<double>::quiet_NaN();
-        tokenizer_.Next();
-      } else {
-        ReportError("Expected double, got: " + text);
-        return false;
-      }
-    } else {
-      ReportError("Expected double, got: " + tokenizer_.current().text);
-      return false;
-    }
-
-    if (negative) {
-      *value = -*value;
-    }
-
-    return true;
-  }
-
-  // Consumes Any::type_url value, of form "type.googleapis.com/full.type.Name"
-  // or "type.googleprod.com/full.type.Name"
-  bool ConsumeAnyTypeUrl(std::string* full_type_name, std::string* prefix) {
-    // TODO(saito) Extend Consume() to consume multiple tokens at once, so that
-    // this code can be written as just DO(Consume(kGoogleApisTypePrefix)).
-    DO(ConsumeIdentifier(prefix));
-    while (TryConsume(".")) {
-      std::string url;
-      DO(ConsumeIdentifier(&url));
-      *prefix += "." + url;
-    }
-    DO(Consume("/"));
-    *prefix += "/";
-    DO(ConsumeFullTypeName(full_type_name));
-
-    return true;
-  }
-
-  // A helper function for reconstructing Any::value. Consumes a text of
-  // full_type_name, then serializes it into serialized_value.
-  bool ConsumeAnyValue(const Descriptor* value_descriptor,
-                       std::string* serialized_value) {
-    DynamicMessageFactory factory;
-    const Message* value_prototype = factory.GetPrototype(value_descriptor);
-    if (value_prototype == nullptr) {
-      return false;
-    }
-    std::unique_ptr<Message> value(value_prototype->New());
-    std::string sub_delimiter;
-    DO(ConsumeMessageDelimiter(&sub_delimiter));
-    DO(ConsumeMessage(value.get(), sub_delimiter));
-
-    if (allow_partial_) {
-      value->AppendPartialToString(serialized_value);
-    } else {
-      if (!value->IsInitialized()) {
-        ReportError(
-            "Value of type \"" + value_descriptor->full_name() +
-            "\" stored in google.protobuf.Any has missing required fields");
-        return false;
-      }
-      value->AppendToString(serialized_value);
-    }
-    return true;
-  }
-
-  // Consumes a token and confirms that it matches that specified in the
-  // value parameter. Returns false if the token found does not match that
-  // which was specified.
-  bool Consume(const std::string& value) {
-    const std::string& current_value = tokenizer_.current().text;
-
-    if (current_value != value) {
-      ReportError("Expected \"" + value + "\", found \"" + current_value +
-                  "\".");
-      return false;
-    }
-
-    tokenizer_.Next();
-
-    return true;
-  }
-
-  // Similar to `Consume`, but the following token may be tokenized as
-  // TYPE_WHITESPACE.
-  bool ConsumeBeforeWhitespace(const std::string& value) {
-    // Report whitespace after this token, but only once.
-    tokenizer_.set_report_whitespace(true);
-    bool result = Consume(value);
-    tokenizer_.set_report_whitespace(false);
-    return result;
-  }
-
-  // Attempts to consume the supplied value. Returns false if a the
-  // token found does not match the value specified.
-  bool TryConsume(const std::string& value) {
-    if (tokenizer_.current().text == value) {
-      tokenizer_.Next();
-      return true;
-    } else {
-      return false;
-    }
-  }
-
-  // Similar to `TryConsume`, but the following token may be tokenized as
-  // TYPE_WHITESPACE.
-  bool TryConsumeBeforeWhitespace(const std::string& value) {
-    // Report whitespace after this token, but only once.
-    tokenizer_.set_report_whitespace(true);
-    bool result = TryConsume(value);
-    tokenizer_.set_report_whitespace(false);
-    return result;
-  }
-
-  bool TryConsumeWhitespace() {
-    had_silent_marker_ = false;
-    if (LookingAtType(io::Tokenizer::TYPE_WHITESPACE)) {
-      if (tokenizer_.current().text ==
-          StrCat(" ", internal::kDebugStringSilentMarkerForDetection)) {
-        had_silent_marker_ = true;
-      }
-      tokenizer_.Next();
-      return true;
-    }
-    return false;
-  }
-
-  // An internal instance of the Tokenizer's error collector, used to
-  // collect any base-level parse errors and feed them to the ParserImpl.
-  class ParserErrorCollector : public io::ErrorCollector {
-   public:
-    explicit ParserErrorCollector(TextFormat::Parser::ParserImpl* parser)
-        : parser_(parser) {}
-
-    ~ParserErrorCollector() override {}
-
-    void AddError(int line, int column, const std::string& message) override {
-      parser_->ReportError(line, column, message);
-    }
-
-    void AddWarning(int line, int column, const std::string& message) override {
-      parser_->ReportWarning(line, column, message);
-    }
-
-   private:
-    GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(ParserErrorCollector);
-    TextFormat::Parser::ParserImpl* parser_;
-  };
-
-  io::ErrorCollector* error_collector_;
-  const TextFormat::Finder* finder_;
-  ParseInfoTree* parse_info_tree_;
-  ParserErrorCollector tokenizer_error_collector_;
-  io::Tokenizer tokenizer_;
-  const Descriptor* root_message_type_;
-  SingularOverwritePolicy singular_overwrite_policy_;
-  const bool allow_case_insensitive_field_;
-  const bool allow_unknown_field_;
-  const bool allow_unknown_extension_;
-  const bool allow_unknown_enum_;
-  const bool allow_field_number_;
-  const bool allow_partial_;
-  const int initial_recursion_limit_;
-  int recursion_limit_;
-  bool had_silent_marker_;
-  bool had_errors_;
-};
-
-// ===========================================================================
-// Internal class for writing text to the io::ZeroCopyOutputStream. Adapted
-// from the Printer found in //net/proto2/io/public/printer.h
-class TextFormat::Printer::TextGenerator
-    : public TextFormat::BaseTextGenerator {
- public:
-  explicit TextGenerator(io::ZeroCopyOutputStream* output,
-                         int initial_indent_level)
-      : output_(output),
-        buffer_(nullptr),
-        buffer_size_(0),
-        at_start_of_line_(true),
-        failed_(false),
-        insert_silent_marker_(false),
-        indent_level_(initial_indent_level),
-        initial_indent_level_(initial_indent_level) {}
-
-  explicit TextGenerator(io::ZeroCopyOutputStream* output,
-                         bool insert_silent_marker, int initial_indent_level)
-      : output_(output),
-        buffer_(nullptr),
-        buffer_size_(0),
-        at_start_of_line_(true),
-        failed_(false),
-        insert_silent_marker_(insert_silent_marker),
-        indent_level_(initial_indent_level),
-        initial_indent_level_(initial_indent_level) {}
-
-  ~TextGenerator() override {
-    // Only BackUp() if we're sure we've successfully called Next() at least
-    // once.
-    if (!failed_) {
-      output_->BackUp(buffer_size_);
-    }
-  }
-
-  // Indent text by two spaces.  After calling Indent(), two spaces will be
-  // inserted at the beginning of each line of text.  Indent() may be called
-  // multiple times to produce deeper indents.
-  void Indent() override { ++indent_level_; }
-
-  // Reduces the current indent level by two spaces, or crashes if the indent
-  // level is zero.
-  void Outdent() override {
-    if (indent_level_ == 0 || indent_level_ < initial_indent_level_) {
-      GOOGLE_LOG(DFATAL) << " Outdent() without matching Indent().";
-      return;
-    }
-
-    --indent_level_;
-  }
-
-  size_t GetCurrentIndentationSize() const override {
-    return 2 * indent_level_;
-  }
-
-  // Print text to the output stream.
-  void Print(const char* text, size_t size) override {
-    if (indent_level_ > 0) {
-      size_t pos = 0;  // The number of bytes we've written so far.
-      for (size_t i = 0; i < size; i++) {
-        if (text[i] == '\n') {
-          // Saw newline.  If there is more text, we may need to insert an
-          // indent here.  So, write what we have so far, including the '\n'.
-          Write(text + pos, i - pos + 1);
-          pos = i + 1;
-
-          // Setting this true will cause the next Write() to insert an indent
-          // first.
-          at_start_of_line_ = true;
-        }
-      }
-      // Write the rest.
-      Write(text + pos, size - pos);
-    } else {
-      Write(text, size);
-      if (size > 0 && text[size - 1] == '\n') {
-        at_start_of_line_ = true;
-      }
-    }
-  }
-
-  // True if any write to the underlying stream failed.  (We don't just
-  // crash in this case because this is an I/O failure, not a programming
-  // error.)
-  bool failed() const { return failed_; }
-
-  void PrintMaybeWithMarker(StringPiece text) {
-    Print(text.data(), text.size());
-    if (ConsumeInsertSilentMarker()) {
-      PrintLiteral(internal::kDebugStringSilentMarker);
-    }
-  }
-
-  void PrintMaybeWithMarker(StringPiece text_head,
-                            StringPiece text_tail) {
-    Print(text_head.data(), text_head.size());
-    if (ConsumeInsertSilentMarker()) {
-      PrintLiteral(internal::kDebugStringSilentMarker);
-    }
-    Print(text_tail.data(), text_tail.size());
-  }
-
- private:
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(TextGenerator);
-
-  void Write(const char* data, size_t size) {
-    if (failed_) return;
-    if (size == 0) return;
-
-    if (at_start_of_line_) {
-      // Insert an indent.
-      at_start_of_line_ = false;
-      WriteIndent();
-      if (failed_) return;
-    }
-
-    while (static_cast<int64_t>(size) > buffer_size_) {
-      // Data exceeds space in the buffer.  Copy what we can and request a
-      // new buffer.
-      if (buffer_size_ > 0) {
-        memcpy(buffer_, data, buffer_size_);
-        data += buffer_size_;
-        size -= buffer_size_;
-      }
-      void* void_buffer = nullptr;
-      failed_ = !output_->Next(&void_buffer, &buffer_size_);
-      if (failed_) return;
-      buffer_ = reinterpret_cast<char*>(void_buffer);
-    }
-
-    // Buffer is big enough to receive the data; copy it.
-    memcpy(buffer_, data, size);
-    buffer_ += size;
-    buffer_size_ -= size;
-  }
-
-  void WriteIndent() {
-    if (indent_level_ == 0) {
-      return;
-    }
-    GOOGLE_DCHECK(!failed_);
-    int size = GetCurrentIndentationSize();
-
-    while (size > buffer_size_) {
-      // Data exceeds space in the buffer. Write what we can and request a new
-      // buffer.
-      if (buffer_size_ > 0) {
-        memset(buffer_, ' ', buffer_size_);
-      }
-      size -= buffer_size_;
-      void* void_buffer;
-      failed_ = !output_->Next(&void_buffer, &buffer_size_);
-      if (failed_) return;
-      buffer_ = reinterpret_cast<char*>(void_buffer);
-    }
-
-    // Buffer is big enough to receive the data; copy it.
-    memset(buffer_, ' ', size);
-    buffer_ += size;
-    buffer_size_ -= size;
-  }
-
-  // Return the current value of insert_silent_marker_. If it is true, set it
-  // to false as we assume that a silent marker is inserted after a call to this
-  // function.
-  bool ConsumeInsertSilentMarker() {
-    if (insert_silent_marker_) {
-      insert_silent_marker_ = false;
-      return true;
-    }
-    return false;
-  }
-
-  io::ZeroCopyOutputStream* const output_;
-  char* buffer_;
-  int buffer_size_;
-  bool at_start_of_line_;
-  bool failed_;
-  // This flag is false when inserting silent marker is disabled or a silent
-  // marker has been inserted.
-  bool insert_silent_marker_;
-
-  int indent_level_;
-  int initial_indent_level_;
-};
-
-// ===========================================================================
-//  An internal field value printer that may insert a silent marker in
-//  DebugStrings.
-class TextFormat::Printer::DebugStringFieldValuePrinter
-    : public TextFormat::FastFieldValuePrinter {
- public:
-  void PrintMessageStart(const Message& /*message*/, int /*field_index*/,
-                         int /*field_count*/, bool single_line_mode,
-                         BaseTextGenerator* generator) const override {
-    // This is safe as only TextGenerator is used with
-    // DebugStringFieldValuePrinter.
-    TextGenerator* text_generator = static_cast<TextGenerator*>(generator);
-    if (single_line_mode) {
-      text_generator->PrintMaybeWithMarker(" ", "{ ");
-    } else {
-      text_generator->PrintMaybeWithMarker(" ", "{\n");
-    }
-  }
-};
-
-// ===========================================================================
-//  An internal field value printer that escape UTF8 strings.
-class TextFormat::Printer::FastFieldValuePrinterUtf8Escaping
-    : public TextFormat::Printer::DebugStringFieldValuePrinter {
- public:
-  void PrintString(const std::string& val,
-                   TextFormat::BaseTextGenerator* generator) const override {
-    generator->PrintLiteral("\"");
-    generator->PrintString(strings::Utf8SafeCEscape(val));
-    generator->PrintLiteral("\"");
-  }
-  void PrintBytes(const std::string& val,
-                  TextFormat::BaseTextGenerator* generator) const override {
-    return FastFieldValuePrinter::PrintString(val, generator);
-  }
-};
-
-// ===========================================================================
-// Implementation of the default Finder for extensions.
-TextFormat::Finder::~Finder() {}
-
-const FieldDescriptor* TextFormat::Finder::FindExtension(
-    Message* message, const std::string& name) const {
-  return DefaultFinderFindExtension(message, name);
-}
-
-const FieldDescriptor* TextFormat::Finder::FindExtensionByNumber(
-    const Descriptor* descriptor, int number) const {
-  return DefaultFinderFindExtensionByNumber(descriptor, number);
-}
-
-const Descriptor* TextFormat::Finder::FindAnyType(
-    const Message& message, const std::string& prefix,
-    const std::string& name) const {
-  return DefaultFinderFindAnyType(message, prefix, name);
-}
-
-MessageFactory* TextFormat::Finder::FindExtensionFactory(
-    const FieldDescriptor* /*field*/) const {
-  return nullptr;
-}
-
-// ===========================================================================
-
-TextFormat::Parser::Parser()
-    : error_collector_(nullptr),
-      finder_(nullptr),
-      parse_info_tree_(nullptr),
-      allow_partial_(false),
-      allow_case_insensitive_field_(false),
-      allow_unknown_field_(false),
-      allow_unknown_extension_(false),
-      allow_unknown_enum_(false),
-      allow_field_number_(false),
-      allow_relaxed_whitespace_(false),
-      allow_singular_overwrites_(false),
-      recursion_limit_(std::numeric_limits<int>::max()) {}
-
-TextFormat::Parser::~Parser() {}
-
-namespace {
-
-bool CheckParseInputSize(StringPiece input,
-                         io::ErrorCollector* error_collector) {
-  if (input.size() > INT_MAX) {
-    error_collector->AddError(
-        -1, 0,
-        StrCat(
-            "Input size too large: ", static_cast<int64_t>(input.size()),
-            " bytes", " > ", INT_MAX, " bytes."));
-    return false;
-  }
-  return true;
-}
-
-}  // namespace
-
-bool TextFormat::Parser::Parse(io::ZeroCopyInputStream* input,
-                               Message* output) {
-  output->Clear();
-
-  ParserImpl::SingularOverwritePolicy overwrites_policy =
-      allow_singular_overwrites_ ? ParserImpl::ALLOW_SINGULAR_OVERWRITES
-                                 : ParserImpl::FORBID_SINGULAR_OVERWRITES;
-
-  ParserImpl parser(output->GetDescriptor(), input, error_collector_, finder_,
-                    parse_info_tree_, overwrites_policy,
-                    allow_case_insensitive_field_, allow_unknown_field_,
-                    allow_unknown_extension_, allow_unknown_enum_,
-                    allow_field_number_, allow_relaxed_whitespace_,
-                    allow_partial_, recursion_limit_);
-  return MergeUsingImpl(input, output, &parser);
-}
-
-bool TextFormat::Parser::ParseFromString(ConstStringParam input,
-                                         Message* output) {
-  DO(CheckParseInputSize(input, error_collector_));
-  io::ArrayInputStream input_stream(input.data(), input.size());
-  return Parse(&input_stream, output);
-}
-
-bool TextFormat::Parser::Merge(io::ZeroCopyInputStream* input,
-                               Message* output) {
-  ParserImpl parser(output->GetDescriptor(), input, error_collector_, finder_,
-                    parse_info_tree_, ParserImpl::ALLOW_SINGULAR_OVERWRITES,
-                    allow_case_insensitive_field_, allow_unknown_field_,
-                    allow_unknown_extension_, allow_unknown_enum_,
-                    allow_field_number_, allow_relaxed_whitespace_,
-                    allow_partial_, recursion_limit_);
-  return MergeUsingImpl(input, output, &parser);
-}
-
-bool TextFormat::Parser::MergeFromString(ConstStringParam input,
-                                         Message* output) {
-  DO(CheckParseInputSize(input, error_collector_));
-  io::ArrayInputStream input_stream(input.data(), input.size());
-  return Merge(&input_stream, output);
-}
-
-bool TextFormat::Parser::MergeUsingImpl(io::ZeroCopyInputStream* /* input */,
-                                        Message* output,
-                                        ParserImpl* parser_impl) {
-  if (!parser_impl->Parse(output)) return false;
-  if (!allow_partial_ && !output->IsInitialized()) {
-    std::vector<std::string> missing_fields;
-    output->FindInitializationErrors(&missing_fields);
-    parser_impl->ReportError(-1, 0,
-                             "Message missing required fields: " +
-                                 Join(missing_fields, ", "));
-    return false;
-  }
-  return true;
-}
-
-bool TextFormat::Parser::ParseFieldValueFromString(const std::string& input,
-                                                   const FieldDescriptor* field,
-                                                   Message* output) {
-  io::ArrayInputStream input_stream(input.data(), input.size());
-  ParserImpl parser(
-      output->GetDescriptor(), &input_stream, error_collector_, finder_,
-      parse_info_tree_, ParserImpl::ALLOW_SINGULAR_OVERWRITES,
-      allow_case_insensitive_field_, allow_unknown_field_,
-      allow_unknown_extension_, allow_unknown_enum_, allow_field_number_,
-      allow_relaxed_whitespace_, allow_partial_, recursion_limit_);
-  return parser.ParseField(field, output);
-}
-
-/* static */ bool TextFormat::Parse(io::ZeroCopyInputStream* input,
-                                    Message* output) {
-  return Parser().Parse(input, output);
-}
-
-/* static */ bool TextFormat::Merge(io::ZeroCopyInputStream* input,
-                                    Message* output) {
-  return Parser().Merge(input, output);
-}
-
-/* static */ bool TextFormat::ParseFromString(ConstStringParam input,
-                                              Message* output) {
-  return Parser().ParseFromString(input, output);
-}
-
-/* static */ bool TextFormat::MergeFromString(ConstStringParam input,
-                                              Message* output) {
-  return Parser().MergeFromString(input, output);
-}
-
-#undef DO
-
-// ===========================================================================
-
-TextFormat::BaseTextGenerator::~BaseTextGenerator() {}
-
-namespace {
-
-// A BaseTextGenerator that writes to a string.
-class StringBaseTextGenerator : public TextFormat::BaseTextGenerator {
- public:
-  void Print(const char* text, size_t size) override {
-    output_.append(text, size);
-  }
-
-// Some compilers do not support ref-qualifiers even in C++11 mode.
-// Disable the optimization for now and revisit it later.
-#if 0  // LANG_CXX11
-  std::string Consume() && { return std::move(output_); }
-#else  // !LANG_CXX11
-  const std::string& Get() { return output_; }
-#endif  // LANG_CXX11
-
- private:
-  std::string output_;
-};
-
-}  // namespace
-
-// The default implementation for FieldValuePrinter. We just delegate the
-// implementation to the default FastFieldValuePrinter to avoid duplicating the
-// logic.
-TextFormat::FieldValuePrinter::FieldValuePrinter() {}
-TextFormat::FieldValuePrinter::~FieldValuePrinter() {}
-
-#if 0  // LANG_CXX11
-#define FORWARD_IMPL(fn, ...)            \
-  StringBaseTextGenerator generator;     \
-  delegate_.fn(__VA_ARGS__, &generator); \
-  return std::move(generator).Consume()
-#else  // !LANG_CXX11
-#define FORWARD_IMPL(fn, ...)            \
-  StringBaseTextGenerator generator;     \
-  delegate_.fn(__VA_ARGS__, &generator); \
-  return generator.Get()
-#endif  // LANG_CXX11
-
-std::string TextFormat::FieldValuePrinter::PrintBool(bool val) const {
-  FORWARD_IMPL(PrintBool, val);
-}
-std::string TextFormat::FieldValuePrinter::PrintInt32(int32_t val) const {
-  FORWARD_IMPL(PrintInt32, val);
-}
-std::string TextFormat::FieldValuePrinter::PrintUInt32(uint32_t val) const {
-  FORWARD_IMPL(PrintUInt32, val);
-}
-std::string TextFormat::FieldValuePrinter::PrintInt64(int64_t val) const {
-  FORWARD_IMPL(PrintInt64, val);
-}
-std::string TextFormat::FieldValuePrinter::PrintUInt64(uint64_t val) const {
-  FORWARD_IMPL(PrintUInt64, val);
-}
-std::string TextFormat::FieldValuePrinter::PrintFloat(float val) const {
-  FORWARD_IMPL(PrintFloat, val);
-}
-std::string TextFormat::FieldValuePrinter::PrintDouble(double val) const {
-  FORWARD_IMPL(PrintDouble, val);
-}
-std::string TextFormat::FieldValuePrinter::PrintString(
-    const std::string& val) const {
-  FORWARD_IMPL(PrintString, val);
-}
-std::string TextFormat::FieldValuePrinter::PrintBytes(
-    const std::string& val) const {
-  return PrintString(val);
-}
-std::string TextFormat::FieldValuePrinter::PrintEnum(
-    int32_t val, const std::string& name) const {
-  FORWARD_IMPL(PrintEnum, val, name);
-}
-std::string TextFormat::FieldValuePrinter::PrintFieldName(
-    const Message& message, const Reflection* reflection,
-    const FieldDescriptor* field) const {
-  FORWARD_IMPL(PrintFieldName, message, reflection, field);
-}
-std::string TextFormat::FieldValuePrinter::PrintMessageStart(
-    const Message& message, int field_index, int field_count,
-    bool single_line_mode) const {
-  FORWARD_IMPL(PrintMessageStart, message, field_index, field_count,
-               single_line_mode);
-}
-std::string TextFormat::FieldValuePrinter::PrintMessageEnd(
-    const Message& message, int field_index, int field_count,
-    bool single_line_mode) const {
-  FORWARD_IMPL(PrintMessageEnd, message, field_index, field_count,
-               single_line_mode);
-}
-#undef FORWARD_IMPL
-
-TextFormat::FastFieldValuePrinter::FastFieldValuePrinter() {}
-TextFormat::FastFieldValuePrinter::~FastFieldValuePrinter() {}
-void TextFormat::FastFieldValuePrinter::PrintBool(
-    bool val, BaseTextGenerator* generator) const {
-  if (val) {
-    generator->PrintLiteral("true");
-  } else {
-    generator->PrintLiteral("false");
-  }
-}
-void TextFormat::FastFieldValuePrinter::PrintInt32(
-    int32_t val, BaseTextGenerator* generator) const {
-  generator->PrintString(StrCat(val));
-}
-void TextFormat::FastFieldValuePrinter::PrintUInt32(
-    uint32_t val, BaseTextGenerator* generator) const {
-  generator->PrintString(StrCat(val));
-}
-void TextFormat::FastFieldValuePrinter::PrintInt64(
-    int64_t val, BaseTextGenerator* generator) const {
-  generator->PrintString(StrCat(val));
-}
-void TextFormat::FastFieldValuePrinter::PrintUInt64(
-    uint64_t val, BaseTextGenerator* generator) const {
-  generator->PrintString(StrCat(val));
-}
-void TextFormat::FastFieldValuePrinter::PrintFloat(
-    float val, BaseTextGenerator* generator) const {
-  generator->PrintString(!std::isnan(val) ? SimpleFtoa(val) : "nan");
-}
-void TextFormat::FastFieldValuePrinter::PrintDouble(
-    double val, BaseTextGenerator* generator) const {
-  generator->PrintString(!std::isnan(val) ? SimpleDtoa(val) : "nan");
-}
-void TextFormat::FastFieldValuePrinter::PrintEnum(
-    int32_t /*val*/, const std::string& name,
-    BaseTextGenerator* generator) const {
-  generator->PrintString(name);
-}
-
-void TextFormat::FastFieldValuePrinter::PrintString(
-    const std::string& val, BaseTextGenerator* generator) const {
-  generator->PrintLiteral("\"");
-  generator->PrintString(CEscape(val));
-  generator->PrintLiteral("\"");
-}
-void TextFormat::FastFieldValuePrinter::PrintBytes(
-    const std::string& val, BaseTextGenerator* generator) const {
-  PrintString(val, generator);
-}
-void TextFormat::FastFieldValuePrinter::PrintFieldName(
-    const Message& message, int /*field_index*/, int /*field_count*/,
-    const Reflection* reflection, const FieldDescriptor* field,
-    BaseTextGenerator* generator) const {
-  PrintFieldName(message, reflection, field, generator);
-}
-void TextFormat::FastFieldValuePrinter::PrintFieldName(
-    const Message& /*message*/, const Reflection* /*reflection*/,
-    const FieldDescriptor* field, BaseTextGenerator* generator) const {
-  if (field->is_extension()) {
-    generator->PrintLiteral("[");
-    generator->PrintString(field->PrintableNameForExtension());
-    generator->PrintLiteral("]");
-  } else if (field->type() == FieldDescriptor::TYPE_GROUP) {
-    // Groups must be serialized with their original capitalization.
-    generator->PrintString(field->message_type()->name());
-  } else {
-    generator->PrintString(field->name());
-  }
-}
-void TextFormat::FastFieldValuePrinter::PrintMessageStart(
-    const Message& /*message*/, int /*field_index*/, int /*field_count*/,
-    bool single_line_mode, BaseTextGenerator* generator) const {
-  if (single_line_mode) {
-    generator->PrintLiteral(" { ");
-  } else {
-    generator->PrintLiteral(" {\n");
-  }
-}
-bool TextFormat::FastFieldValuePrinter::PrintMessageContent(
-    const Message& /*message*/, int /*field_index*/, int /*field_count*/,
-    bool /*single_line_mode*/, BaseTextGenerator* /*generator*/) const {
-  return false;  // Use the default printing function.
-}
-void TextFormat::FastFieldValuePrinter::PrintMessageEnd(
-    const Message& /*message*/, int /*field_index*/, int /*field_count*/,
-    bool single_line_mode, BaseTextGenerator* generator) const {
-  if (single_line_mode) {
-    generator->PrintLiteral("} ");
-  } else {
-    generator->PrintLiteral("}\n");
-  }
-}
-
-namespace {
-
-// A legacy compatibility wrapper. Takes ownership of the delegate.
-class FieldValuePrinterWrapper : public TextFormat::FastFieldValuePrinter {
- public:
-  explicit FieldValuePrinterWrapper(
-      const TextFormat::FieldValuePrinter* delegate)
-      : delegate_(delegate) {}
-
-  void SetDelegate(const TextFormat::FieldValuePrinter* delegate) {
-    delegate_.reset(delegate);
-  }
-
-  void PrintBool(bool val,
-                 TextFormat::BaseTextGenerator* generator) const override {
-    generator->PrintString(delegate_->PrintBool(val));
-  }
-  void PrintInt32(int32_t val,
-                  TextFormat::BaseTextGenerator* generator) const override {
-    generator->PrintString(delegate_->PrintInt32(val));
-  }
-  void PrintUInt32(uint32_t val,
-                   TextFormat::BaseTextGenerator* generator) const override {
-    generator->PrintString(delegate_->PrintUInt32(val));
-  }
-  void PrintInt64(int64_t val,
-                  TextFormat::BaseTextGenerator* generator) const override {
-    generator->PrintString(delegate_->PrintInt64(val));
-  }
-  void PrintUInt64(uint64_t val,
-                   TextFormat::BaseTextGenerator* generator) const override {
-    generator->PrintString(delegate_->PrintUInt64(val));
-  }
-  void PrintFloat(float val,
-                  TextFormat::BaseTextGenerator* generator) const override {
-    generator->PrintString(delegate_->PrintFloat(val));
-  }
-  void PrintDouble(double val,
-                   TextFormat::BaseTextGenerator* generator) const override {
-    generator->PrintString(delegate_->PrintDouble(val));
-  }
-  void PrintString(const std::string& val,
-                   TextFormat::BaseTextGenerator* generator) const override {
-    generator->PrintString(delegate_->PrintString(val));
-  }
-  void PrintBytes(const std::string& val,
-                  TextFormat::BaseTextGenerator* generator) const override {
-    generator->PrintString(delegate_->PrintBytes(val));
-  }
-  void PrintEnum(int32_t val, const std::string& name,
-                 TextFormat::BaseTextGenerator* generator) const override {
-    generator->PrintString(delegate_->PrintEnum(val, name));
-  }
-  void PrintFieldName(const Message& message, int /*field_index*/,
-                      int /*field_count*/, const Reflection* reflection,
-                      const FieldDescriptor* field,
-                      TextFormat::BaseTextGenerator* generator) const override {
-    generator->PrintString(
-        delegate_->PrintFieldName(message, reflection, field));
-  }
-  void PrintFieldName(const Message& message, const Reflection* reflection,
-                      const FieldDescriptor* field,
-                      TextFormat::BaseTextGenerator* generator) const override {
-    generator->PrintString(
-        delegate_->PrintFieldName(message, reflection, field));
-  }
-  void PrintMessageStart(
-      const Message& message, int field_index, int field_count,
-      bool single_line_mode,
-      TextFormat::BaseTextGenerator* generator) const override {
-    generator->PrintString(delegate_->PrintMessageStart(
-        message, field_index, field_count, single_line_mode));
-  }
-  void PrintMessageEnd(
-      const Message& message, int field_index, int field_count,
-      bool single_line_mode,
-      TextFormat::BaseTextGenerator* generator) const override {
-    generator->PrintString(delegate_->PrintMessageEnd(
-        message, field_index, field_count, single_line_mode));
-  }
-
- private:
-  std::unique_ptr<const TextFormat::FieldValuePrinter> delegate_;
-};
-
-}  // namespace
-
-const char* const TextFormat::Printer::kDoNotParse =
-    "DO NOT PARSE: fields may be stripped and missing.\n";
-
-TextFormat::Printer::Printer()
-    : initial_indent_level_(0),
-      single_line_mode_(false),
-      use_field_number_(false),
-      use_short_repeated_primitives_(false),
-      insert_silent_marker_(false),
-      hide_unknown_fields_(false),
-      print_message_fields_in_index_order_(false),
-      expand_any_(false),
-      truncate_string_field_longer_than_(0LL),
-      finder_(nullptr) {
-  SetUseUtf8StringEscaping(false);
-}
-
-void TextFormat::Printer::SetUseUtf8StringEscaping(bool as_utf8) {
-  SetDefaultFieldValuePrinter(as_utf8 ? new FastFieldValuePrinterUtf8Escaping()
-                                      : new DebugStringFieldValuePrinter());
-}
-
-void TextFormat::Printer::SetDefaultFieldValuePrinter(
-    const FieldValuePrinter* printer) {
-  default_field_value_printer_.reset(new FieldValuePrinterWrapper(printer));
-}
-
-void TextFormat::Printer::SetDefaultFieldValuePrinter(
-    const FastFieldValuePrinter* printer) {
-  default_field_value_printer_.reset(printer);
-}
-
-bool TextFormat::Printer::RegisterFieldValuePrinter(
-    const FieldDescriptor* field, const FieldValuePrinter* printer) {
-  if (field == nullptr || printer == nullptr) {
-    return false;
-  }
-  std::unique_ptr<FieldValuePrinterWrapper> wrapper(
-      new FieldValuePrinterWrapper(nullptr));
-  auto pair = custom_printers_.insert(std::make_pair(field, nullptr));
-  if (pair.second) {
-    wrapper->SetDelegate(printer);
-    pair.first->second = std::move(wrapper);
-    return true;
-  } else {
-    return false;
-  }
-}
-
-bool TextFormat::Printer::RegisterFieldValuePrinter(
-    const FieldDescriptor* field, const FastFieldValuePrinter* printer) {
-  if (field == nullptr || printer == nullptr) {
-    return false;
-  }
-  auto pair = custom_printers_.insert(std::make_pair(field, nullptr));
-  if (pair.second) {
-    pair.first->second.reset(printer);
-    return true;
-  } else {
-    return false;
-  }
-}
-
-bool TextFormat::Printer::RegisterMessagePrinter(
-    const Descriptor* descriptor, const MessagePrinter* printer) {
-  if (descriptor == nullptr || printer == nullptr) {
-    return false;
-  }
-  auto pair =
-      custom_message_printers_.insert(std::make_pair(descriptor, nullptr));
-  if (pair.second) {
-    pair.first->second.reset(printer);
-    return true;
-  } else {
-    return false;
-  }
-}
-
-bool TextFormat::Printer::PrintToString(const Message& message,
-                                        std::string* output) const {
-  GOOGLE_DCHECK(output) << "output specified is nullptr";
-
-  output->clear();
-  io::StringOutputStream output_stream(output);
-
-  return Print(message, &output_stream);
-}
-
-bool TextFormat::Printer::PrintUnknownFieldsToString(
-    const UnknownFieldSet& unknown_fields, std::string* output) const {
-  GOOGLE_DCHECK(output) << "output specified is nullptr";
-
-  output->clear();
-  io::StringOutputStream output_stream(output);
-  return PrintUnknownFields(unknown_fields, &output_stream);
-}
-
-bool TextFormat::Printer::Print(const Message& message,
-                                io::ZeroCopyOutputStream* output) const {
-  TextGenerator generator(output, insert_silent_marker_, initial_indent_level_);
-
-  Print(message, &generator);
-
-  // Output false if the generator failed internally.
-  return !generator.failed();
-}
-
-// Maximum recursion depth for heuristically printing out length-delimited
-// unknown fields as messages.
-static constexpr int kUnknownFieldRecursionLimit = 10;
-
-bool TextFormat::Printer::PrintUnknownFields(
-    const UnknownFieldSet& unknown_fields,
-    io::ZeroCopyOutputStream* output) const {
-  TextGenerator generator(output, initial_indent_level_);
-
-  PrintUnknownFields(unknown_fields, &generator, kUnknownFieldRecursionLimit);
-
-  // Output false if the generator failed internally.
-  return !generator.failed();
-}
-
-namespace {
-// Comparison functor for sorting FieldDescriptors by field index.
-// Normal fields have higher precedence than extensions.
-struct FieldIndexSorter {
-  bool operator()(const FieldDescriptor* left,
-                  const FieldDescriptor* right) const {
-    if (left->is_extension() && right->is_extension()) {
-      return left->number() < right->number();
-    } else if (left->is_extension()) {
-      return false;
-    } else if (right->is_extension()) {
-      return true;
-    } else {
-      return left->index() < right->index();
-    }
-  }
-};
-
-}  // namespace
-
-bool TextFormat::Printer::PrintAny(const Message& message,
-                                   TextGenerator* generator) const {
-  const FieldDescriptor* type_url_field;
-  const FieldDescriptor* value_field;
-  if (!internal::GetAnyFieldDescriptors(message, &type_url_field,
-                                        &value_field)) {
-    return false;
-  }
-
-  const Reflection* reflection = message.GetReflection();
-
-  // Extract the full type name from the type_url field.
-  const std::string& type_url = reflection->GetString(message, type_url_field);
-  std::string url_prefix;
-  std::string full_type_name;
-  if (!internal::ParseAnyTypeUrl(type_url, &url_prefix, &full_type_name)) {
-    return false;
-  }
-
-  // Print the "value" in text.
-  const Descriptor* value_descriptor =
-      finder_ ? finder_->FindAnyType(message, url_prefix, full_type_name)
-              : DefaultFinderFindAnyType(message, url_prefix, full_type_name);
-  if (value_descriptor == nullptr) {
-    GOOGLE_LOG(WARNING) << "Can't print proto content: proto type " << type_url
-                 << " not found";
-    return false;
-  }
-  DynamicMessageFactory factory;
-  std::unique_ptr<Message> value_message(
-      factory.GetPrototype(value_descriptor)->New());
-  std::string serialized_value = reflection->GetString(message, value_field);
-  if (!value_message->ParseFromString(serialized_value)) {
-    GOOGLE_LOG(WARNING) << type_url << ": failed to parse contents";
-    return false;
-  }
-  generator->PrintLiteral("[");
-  generator->PrintString(type_url);
-  generator->PrintLiteral("]");
-  const FastFieldValuePrinter* printer = GetFieldPrinter(value_field);
-  printer->PrintMessageStart(message, -1, 0, single_line_mode_, generator);
-  generator->Indent();
-  Print(*value_message, generator);
-  generator->Outdent();
-  printer->PrintMessageEnd(message, -1, 0, single_line_mode_, generator);
-  return true;
-}
-
-void TextFormat::Printer::Print(const Message& message,
-                                TextGenerator* generator) const {
-  const Reflection* reflection = message.GetReflection();
-  if (!reflection) {
-    // This message does not provide any way to describe its structure.
-    // Parse it again in an UnknownFieldSet, and display this instead.
-    UnknownFieldSet unknown_fields;
-    {
-      std::string serialized = message.SerializeAsString();
-      io::ArrayInputStream input(serialized.data(), serialized.size());
-      unknown_fields.ParseFromZeroCopyStream(&input);
-    }
-    PrintUnknownFields(unknown_fields, generator, kUnknownFieldRecursionLimit);
-    return;
-  }
-  const Descriptor* descriptor = message.GetDescriptor();
-  auto itr = custom_message_printers_.find(descriptor);
-  if (itr != custom_message_printers_.end()) {
-    itr->second->Print(message, single_line_mode_, generator);
-    return;
-  }
-  if (descriptor->full_name() == internal::kAnyFullTypeName && expand_any_ &&
-      PrintAny(message, generator)) {
-    return;
-  }
-  std::vector<const FieldDescriptor*> fields;
-  if (descriptor->options().map_entry()) {
-    fields.push_back(descriptor->field(0));
-    fields.push_back(descriptor->field(1));
-  } else {
-    reflection->ListFieldsOmitStripped(message, &fields);
-    if (reflection->IsMessageStripped(message.GetDescriptor())) {
-      generator->Print(kDoNotParse, std::strlen(kDoNotParse));
-    }
-  }
-
-  if (print_message_fields_in_index_order_) {
-    std::sort(fields.begin(), fields.end(), FieldIndexSorter());
-  }
-  for (const FieldDescriptor* field : fields) {
-    PrintField(message, reflection, field, generator);
-  }
-  if (!hide_unknown_fields_) {
-    PrintUnknownFields(reflection->GetUnknownFields(message), generator,
-                       kUnknownFieldRecursionLimit);
-  }
-}
-
-void TextFormat::Printer::PrintFieldValueToString(const Message& message,
-                                                  const FieldDescriptor* field,
-                                                  int index,
-                                                  std::string* output) const {
-  GOOGLE_DCHECK(output) << "output specified is nullptr";
-
-  output->clear();
-  io::StringOutputStream output_stream(output);
-  TextGenerator generator(&output_stream, initial_indent_level_);
-
-  PrintFieldValue(message, message.GetReflection(), field, index, &generator);
-}
-
-class MapEntryMessageComparator {
- public:
-  explicit MapEntryMessageComparator(const Descriptor* descriptor)
-      : field_(descriptor->field(0)) {}
-
-  bool operator()(const Message* a, const Message* b) {
-    const Reflection* reflection = a->GetReflection();
-    switch (field_->cpp_type()) {
-      case FieldDescriptor::CPPTYPE_BOOL: {
-        bool first = reflection->GetBool(*a, field_);
-        bool second = reflection->GetBool(*b, field_);
-        return first < second;
-      }
-      case FieldDescriptor::CPPTYPE_INT32: {
-        int32_t first = reflection->GetInt32(*a, field_);
-        int32_t second = reflection->GetInt32(*b, field_);
-        return first < second;
-      }
-      case FieldDescriptor::CPPTYPE_INT64: {
-        int64_t first = reflection->GetInt64(*a, field_);
-        int64_t second = reflection->GetInt64(*b, field_);
-        return first < second;
-      }
-      case FieldDescriptor::CPPTYPE_UINT32: {
-        uint32_t first = reflection->GetUInt32(*a, field_);
-        uint32_t second = reflection->GetUInt32(*b, field_);
-        return first < second;
-      }
-      case FieldDescriptor::CPPTYPE_UINT64: {
-        uint64_t first = reflection->GetUInt64(*a, field_);
-        uint64_t second = reflection->GetUInt64(*b, field_);
-        return first < second;
-      }
-      case FieldDescriptor::CPPTYPE_STRING: {
-        std::string first = reflection->GetString(*a, field_);
-        std::string second = reflection->GetString(*b, field_);
-        return first < second;
-      }
-      default:
-        GOOGLE_LOG(DFATAL) << "Invalid key for map field.";
-        return true;
-    }
-  }
-
- private:
-  const FieldDescriptor* field_;
-};
-
-namespace internal {
-class MapFieldPrinterHelper {
- public:
-  // DynamicMapSorter::Sort cannot be used because it enforces syncing with
-  // repeated field.
-  static bool SortMap(const Message& message, const Reflection* reflection,
-                      const FieldDescriptor* field,
-                      std::vector<const Message*>* sorted_map_field);
-  static void CopyKey(const MapKey& key, Message* message,
-                      const FieldDescriptor* field_desc);
-  static void CopyValue(const MapValueRef& value, Message* message,
-                        const FieldDescriptor* field_desc);
-};
-
-// Returns true if elements contained in sorted_map_field need to be released.
-bool MapFieldPrinterHelper::SortMap(
-    const Message& message, const Reflection* reflection,
-    const FieldDescriptor* field,
-    std::vector<const Message*>* sorted_map_field) {
-  bool need_release = false;
-  const MapFieldBase& base = *reflection->GetMapData(message, field);
-
-  if (base.IsRepeatedFieldValid()) {
-    const RepeatedPtrField<Message>& map_field =
-        reflection->GetRepeatedPtrFieldInternal<Message>(message, field);
-    for (int i = 0; i < map_field.size(); ++i) {
-      sorted_map_field->push_back(
-          const_cast<RepeatedPtrField<Message>*>(&map_field)->Mutable(i));
-    }
-  } else {
-    // TODO(teboring): For performance, instead of creating map entry message
-    // for each element, just store map keys and sort them.
-    const Descriptor* map_entry_desc = field->message_type();
-    const Message* prototype =
-        reflection->GetMessageFactory()->GetPrototype(map_entry_desc);
-    for (MapIterator iter =
-             reflection->MapBegin(const_cast<Message*>(&message), field);
-         iter != reflection->MapEnd(const_cast<Message*>(&message), field);
-         ++iter) {
-      Message* map_entry_message = prototype->New();
-      CopyKey(iter.GetKey(), map_entry_message, map_entry_desc->field(0));
-      CopyValue(iter.GetValueRef(), map_entry_message,
-                map_entry_desc->field(1));
-      sorted_map_field->push_back(map_entry_message);
-    }
-    need_release = true;
-  }
-
-  MapEntryMessageComparator comparator(field->message_type());
-  std::stable_sort(sorted_map_field->begin(), sorted_map_field->end(),
-                   comparator);
-  return need_release;
-}
-
-void MapFieldPrinterHelper::CopyKey(const MapKey& key, Message* message,
-                                    const FieldDescriptor* field_desc) {
-  const Reflection* reflection = message->GetReflection();
-  switch (field_desc->cpp_type()) {
-    case FieldDescriptor::CPPTYPE_DOUBLE:
-    case FieldDescriptor::CPPTYPE_FLOAT:
-    case FieldDescriptor::CPPTYPE_ENUM:
-    case FieldDescriptor::CPPTYPE_MESSAGE:
-      GOOGLE_LOG(ERROR) << "Not supported.";
-      break;
-    case FieldDescriptor::CPPTYPE_STRING:
-      reflection->SetString(message, field_desc, key.GetStringValue());
-      return;
-    case FieldDescriptor::CPPTYPE_INT64:
-      reflection->SetInt64(message, field_desc, key.GetInt64Value());
-      return;
-    case FieldDescriptor::CPPTYPE_INT32:
-      reflection->SetInt32(message, field_desc, key.GetInt32Value());
-      return;
-    case FieldDescriptor::CPPTYPE_UINT64:
-      reflection->SetUInt64(message, field_desc, key.GetUInt64Value());
-      return;
-    case FieldDescriptor::CPPTYPE_UINT32:
-      reflection->SetUInt32(message, field_desc, key.GetUInt32Value());
-      return;
-    case FieldDescriptor::CPPTYPE_BOOL:
-      reflection->SetBool(message, field_desc, key.GetBoolValue());
-      return;
-  }
-}
-
-void MapFieldPrinterHelper::CopyValue(const MapValueRef& value,
-                                      Message* message,
-                                      const FieldDescriptor* field_desc) {
-  const Reflection* reflection = message->GetReflection();
-  switch (field_desc->cpp_type()) {
-    case FieldDescriptor::CPPTYPE_DOUBLE:
-      reflection->SetDouble(message, field_desc, value.GetDoubleValue());
-      return;
-    case FieldDescriptor::CPPTYPE_FLOAT:
-      reflection->SetFloat(message, field_desc, value.GetFloatValue());
-      return;
-    case FieldDescriptor::CPPTYPE_ENUM:
-      reflection->SetEnumValue(message, field_desc, value.GetEnumValue());
-      return;
-    case FieldDescriptor::CPPTYPE_MESSAGE: {
-      Message* sub_message = value.GetMessageValue().New();
-      sub_message->CopyFrom(value.GetMessageValue());
-      reflection->SetAllocatedMessage(message, sub_message, field_desc);
-      return;
-    }
-    case FieldDescriptor::CPPTYPE_STRING:
-      reflection->SetString(message, field_desc, value.GetStringValue());
-      return;
-    case FieldDescriptor::CPPTYPE_INT64:
-      reflection->SetInt64(message, field_desc, value.GetInt64Value());
-      return;
-    case FieldDescriptor::CPPTYPE_INT32:
-      reflection->SetInt32(message, field_desc, value.GetInt32Value());
-      return;
-    case FieldDescriptor::CPPTYPE_UINT64:
-      reflection->SetUInt64(message, field_desc, value.GetUInt64Value());
-      return;
-    case FieldDescriptor::CPPTYPE_UINT32:
-      reflection->SetUInt32(message, field_desc, value.GetUInt32Value());
-      return;
-    case FieldDescriptor::CPPTYPE_BOOL:
-      reflection->SetBool(message, field_desc, value.GetBoolValue());
-      return;
-  }
-}
-}  // namespace internal
-
-void TextFormat::Printer::PrintField(const Message& message,
-                                     const Reflection* reflection,
-                                     const FieldDescriptor* field,
-                                     TextGenerator* generator) const {
-  if (use_short_repeated_primitives_ && field->is_repeated() &&
-      field->cpp_type() != FieldDescriptor::CPPTYPE_STRING &&
-      field->cpp_type() != FieldDescriptor::CPPTYPE_MESSAGE) {
-    PrintShortRepeatedField(message, reflection, field, generator);
-    return;
-  }
-
-  int count = 0;
-
-  if (field->is_repeated()) {
-    count = reflection->FieldSize(message, field);
-  } else if (reflection->HasField(message, field) ||
-             field->containing_type()->options().map_entry()) {
-    count = 1;
-  }
-
-  std::vector<const Message*> sorted_map_field;
-  bool need_release = false;
-  bool is_map = field->is_map();
-  if (is_map) {
-    need_release = internal::MapFieldPrinterHelper::SortMap(
-        message, reflection, field, &sorted_map_field);
-  }
-
-  for (int j = 0; j < count; ++j) {
-    const int field_index = field->is_repeated() ? j : -1;
-
-    PrintFieldName(message, field_index, count, reflection, field, generator);
-
-    if (field->cpp_type() == FieldDescriptor::CPPTYPE_MESSAGE) {
-      const FastFieldValuePrinter* printer = GetFieldPrinter(field);
-      const Message& sub_message =
-          field->is_repeated()
-              ? (is_map ? *sorted_map_field[j]
-                        : reflection->GetRepeatedMessage(message, field, j))
-              : reflection->GetMessage(message, field);
-      printer->PrintMessageStart(sub_message, field_index, count,
-                                 single_line_mode_, generator);
-      generator->Indent();
-      if (!printer->PrintMessageContent(sub_message, field_index, count,
-                                        single_line_mode_, generator)) {
-        Print(sub_message, generator);
-      }
-      generator->Outdent();
-      printer->PrintMessageEnd(sub_message, field_index, count,
-                               single_line_mode_, generator);
-    } else {
-      generator->PrintMaybeWithMarker(": ");
-      // Write the field value.
-      PrintFieldValue(message, reflection, field, field_index, generator);
-      if (single_line_mode_) {
-        generator->PrintLiteral(" ");
-      } else {
-        generator->PrintLiteral("\n");
-      }
-    }
-  }
-
-  if (need_release) {
-    for (const Message* message_to_delete : sorted_map_field) {
-      delete message_to_delete;
-    }
-  }
-}
-
-void TextFormat::Printer::PrintShortRepeatedField(
-    const Message& message, const Reflection* reflection,
-    const FieldDescriptor* field, TextGenerator* generator) const {
-  // Print primitive repeated field in short form.
-  int size = reflection->FieldSize(message, field);
-  PrintFieldName(message, /*field_index=*/-1, /*field_count=*/size, reflection,
-                 field, generator);
-  generator->PrintMaybeWithMarker(": ", "[");
-  for (int i = 0; i < size; i++) {
-    if (i > 0) generator->PrintLiteral(", ");
-    PrintFieldValue(message, reflection, field, i, generator);
-  }
-  if (single_line_mode_) {
-    generator->PrintLiteral("] ");
-  } else {
-    generator->PrintLiteral("]\n");
-  }
-}
-
-void TextFormat::Printer::PrintFieldName(const Message& message,
-                                         int field_index, int field_count,
-                                         const Reflection* reflection,
-                                         const FieldDescriptor* field,
-                                         TextGenerator* generator) const {
-  // if use_field_number_ is true, prints field number instead
-  // of field name.
-  if (use_field_number_) {
-    generator->PrintString(StrCat(field->number()));
-    return;
-  }
-
-  const FastFieldValuePrinter* printer = GetFieldPrinter(field);
-  printer->PrintFieldName(message, field_index, field_count, reflection, field,
-                          generator);
-}
-
-void TextFormat::Printer::PrintFieldValue(const Message& message,
-                                          const Reflection* reflection,
-                                          const FieldDescriptor* field,
-                                          int index,
-                                          TextGenerator* generator) const {
-  GOOGLE_DCHECK(field->is_repeated() || (index == -1))
-      << "Index must be -1 for non-repeated fields";
-
-  const FastFieldValuePrinter* printer = GetFieldPrinter(field);
-
-  switch (field->cpp_type()) {
-#define OUTPUT_FIELD(CPPTYPE, METHOD)                                \
-  case FieldDescriptor::CPPTYPE_##CPPTYPE:                           \
-    printer->Print##METHOD(                                          \
-        field->is_repeated()                                         \
-            ? reflection->GetRepeated##METHOD(message, field, index) \
-            : reflection->Get##METHOD(message, field),               \
-        generator);                                                  \
-    break
-
-    OUTPUT_FIELD(INT32, Int32);
-    OUTPUT_FIELD(INT64, Int64);
-    OUTPUT_FIELD(UINT32, UInt32);
-    OUTPUT_FIELD(UINT64, UInt64);
-    OUTPUT_FIELD(FLOAT, Float);
-    OUTPUT_FIELD(DOUBLE, Double);
-    OUTPUT_FIELD(BOOL, Bool);
-#undef OUTPUT_FIELD
-
-    case FieldDescriptor::CPPTYPE_STRING: {
-      std::string scratch;
-      const std::string& value =
-          field->is_repeated()
-              ? reflection->GetRepeatedStringReference(message, field, index,
-                                                       &scratch)
-              : reflection->GetStringReference(message, field, &scratch);
-      const std::string* value_to_print = &value;
-      std::string truncated_value;
-      if (truncate_string_field_longer_than_ > 0 &&
-          static_cast<size_t>(truncate_string_field_longer_than_) <
-              value.size()) {
-        truncated_value = value.substr(0, truncate_string_field_longer_than_) +
-                          "...<truncated>...";
-        value_to_print = &truncated_value;
-      }
-      if (field->type() == FieldDescriptor::TYPE_STRING) {
-        printer->PrintString(*value_to_print, generator);
-      } else {
-        GOOGLE_DCHECK_EQ(field->type(), FieldDescriptor::TYPE_BYTES);
-        printer->PrintBytes(*value_to_print, generator);
-      }
-      break;
-    }
-
-    case FieldDescriptor::CPPTYPE_ENUM: {
-      int enum_value =
-          field->is_repeated()
-              ? reflection->GetRepeatedEnumValue(message, field, index)
-              : reflection->GetEnumValue(message, field);
-      const EnumValueDescriptor* enum_desc =
-          field->enum_type()->FindValueByNumber(enum_value);
-      if (enum_desc != nullptr) {
-        printer->PrintEnum(enum_value, enum_desc->name(), generator);
-      } else {
-        // Ordinarily, enum_desc should not be null, because proto2 has the
-        // invariant that set enum field values must be in-range, but with the
-        // new integer-based API for enums (or the RepeatedField<int> loophole),
-        // it is possible for the user to force an unknown integer value.  So we
-        // simply use the integer value itself as the enum value name in this
-        // case.
-        printer->PrintEnum(enum_value, StrCat(enum_value), generator);
-      }
-      break;
-    }
-
-    case FieldDescriptor::CPPTYPE_MESSAGE:
-      Print(field->is_repeated()
-                ? reflection->GetRepeatedMessage(message, field, index)
-                : reflection->GetMessage(message, field),
-            generator);
-      break;
-  }
-}
-
-/* static */ bool TextFormat::Print(const Message& message,
-                                    io::ZeroCopyOutputStream* output) {
-  return Printer().Print(message, output);
-}
-
-/* static */ bool TextFormat::PrintUnknownFields(
-    const UnknownFieldSet& unknown_fields, io::ZeroCopyOutputStream* output) {
-  return Printer().PrintUnknownFields(unknown_fields, output);
-}
-
-/* static */ bool TextFormat::PrintToString(const Message& message,
-                                            std::string* output) {
-  return Printer().PrintToString(message, output);
-}
-
-/* static */ bool TextFormat::PrintUnknownFieldsToString(
-    const UnknownFieldSet& unknown_fields, std::string* output) {
-  return Printer().PrintUnknownFieldsToString(unknown_fields, output);
-}
-
-/* static */ void TextFormat::PrintFieldValueToString(
-    const Message& message, const FieldDescriptor* field, int index,
-    std::string* output) {
-  return Printer().PrintFieldValueToString(message, field, index, output);
-}
-
-/* static */ bool TextFormat::ParseFieldValueFromString(
-    const std::string& input, const FieldDescriptor* field, Message* message) {
-  return Parser().ParseFieldValueFromString(input, field, message);
-}
-
-void TextFormat::Printer::PrintUnknownFields(
-    const UnknownFieldSet& unknown_fields, TextGenerator* generator,
-    int recursion_budget) const {
-  for (int i = 0; i < unknown_fields.field_count(); i++) {
-    const UnknownField& field = unknown_fields.field(i);
-    std::string field_number = StrCat(field.number());
-
-    switch (field.type()) {
-      case UnknownField::TYPE_VARINT:
-        generator->PrintString(field_number);
-        generator->PrintMaybeWithMarker(": ");
-        generator->PrintString(StrCat(field.varint()));
-        if (single_line_mode_) {
-          generator->PrintLiteral(" ");
-        } else {
-          generator->PrintLiteral("\n");
-        }
-        break;
-      case UnknownField::TYPE_FIXED32: {
-        generator->PrintString(field_number);
-        generator->PrintMaybeWithMarker(": ", "0x");
-        generator->PrintString(
-            StrCat(strings::Hex(field.fixed32(), strings::ZERO_PAD_8)));
-        if (single_line_mode_) {
-          generator->PrintLiteral(" ");
-        } else {
-          generator->PrintLiteral("\n");
-        }
-        break;
-      }
-      case UnknownField::TYPE_FIXED64: {
-        generator->PrintString(field_number);
-        generator->PrintMaybeWithMarker(": ", "0x");
-        generator->PrintString(
-            StrCat(strings::Hex(field.fixed64(), strings::ZERO_PAD_16)));
-        if (single_line_mode_) {
-          generator->PrintLiteral(" ");
-        } else {
-          generator->PrintLiteral("\n");
-        }
-        break;
-      }
-      case UnknownField::TYPE_LENGTH_DELIMITED: {
-        generator->PrintString(field_number);
-        const std::string& value = field.length_delimited();
-        // We create a CodedInputStream so that we can adhere to our recursion
-        // budget when we attempt to parse the data. UnknownFieldSet parsing is
-        // recursive because of groups.
-        io::CodedInputStream input_stream(
-            reinterpret_cast<const uint8_t*>(value.data()), value.size());
-        input_stream.SetRecursionLimit(recursion_budget);
-        UnknownFieldSet embedded_unknown_fields;
-        if (!value.empty() && recursion_budget > 0 &&
-            embedded_unknown_fields.ParseFromCodedStream(&input_stream)) {
-          // This field is parseable as a Message.
-          // So it is probably an embedded message.
-          if (single_line_mode_) {
-            generator->PrintMaybeWithMarker(" ", "{ ");
-          } else {
-            generator->PrintMaybeWithMarker(" ", "{\n");
-            generator->Indent();
-          }
-          PrintUnknownFields(embedded_unknown_fields, generator,
-                             recursion_budget - 1);
-          if (single_line_mode_) {
-            generator->PrintLiteral("} ");
-          } else {
-            generator->Outdent();
-            generator->PrintLiteral("}\n");
-          }
-        } else {
-          // This field is not parseable as a Message (or we ran out of
-          // recursion budget). So it is probably just a plain string.
-          generator->PrintMaybeWithMarker(": ", "\"");
-          generator->PrintString(CEscape(value));
-          if (single_line_mode_) {
-            generator->PrintLiteral("\" ");
-          } else {
-            generator->PrintLiteral("\"\n");
-          }
-        }
-        break;
-      }
-      case UnknownField::TYPE_GROUP:
-        generator->PrintString(field_number);
-        if (single_line_mode_) {
-          generator->PrintMaybeWithMarker(" ", "{ ");
-        } else {
-          generator->PrintMaybeWithMarker(" ", "{\n");
-          generator->Indent();
-        }
-        // For groups, we recurse without checking the budget. This is OK,
-        // because if the groups were too deeply nested then we would have
-        // already rejected the message when we originally parsed it.
-        PrintUnknownFields(field.group(), generator, recursion_budget - 1);
-        if (single_line_mode_) {
-          generator->PrintLiteral("} ");
-        } else {
-          generator->Outdent();
-          generator->PrintLiteral("}\n");
-        }
-        break;
-    }
-  }
-}
-
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
diff --git a/libs/protobuf/src/google/protobuf/text_format.h b/libs/protobuf/src/google/protobuf/text_format.h
deleted file mode 100644
index e10bef7..0000000
--- a/libs/protobuf/src/google/protobuf/text_format.h
+++ /dev/null
@@ -1,693 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: jschorr@google.com (Joseph Schorr)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-//
-// Utilities for printing and parsing protocol messages in a human-readable,
-// text-based format.
-
-#ifndef GOOGLE_PROTOBUF_TEXT_FORMAT_H__
-#define GOOGLE_PROTOBUF_TEXT_FORMAT_H__
-
-
-#include <map>
-#include <memory>
-#include <string>
-#include <vector>
-
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/port.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/message.h>
-#include <google/protobuf/message_lite.h>
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-#ifdef SWIG
-#error "You cannot SWIG proto headers"
-#endif
-
-namespace google {
-namespace protobuf {
-
-namespace internal {
-PROTOBUF_EXPORT extern const char kDebugStringSilentMarker[1];
-PROTOBUF_EXPORT extern const char kDebugStringSilentMarkerForDetection[3];
-}  // namespace internal
-
-namespace io {
-class ErrorCollector;  // tokenizer.h
-}
-
-// This class implements protocol buffer text format, colloquially known as text
-// proto.  Printing and parsing protocol messages in text format is useful for
-// debugging and human editing of messages.
-//
-// This class is really a namespace that contains only static methods.
-class PROTOBUF_EXPORT TextFormat {
- public:
-  // Outputs a textual representation of the given message to the given
-  // output stream. Returns false if printing fails.
-  static bool Print(const Message& message, io::ZeroCopyOutputStream* output);
-
-  // Print the fields in an UnknownFieldSet.  They are printed by tag number
-  // only.  Embedded messages are heuristically identified by attempting to
-  // parse them. Returns false if printing fails.
-  static bool PrintUnknownFields(const UnknownFieldSet& unknown_fields,
-                                 io::ZeroCopyOutputStream* output);
-
-  // Like Print(), but outputs directly to a string.
-  // Note: output will be cleared prior to printing, and will be left empty
-  // even if printing fails. Returns false if printing fails.
-  static bool PrintToString(const Message& message, std::string* output);
-
-  // Like PrintUnknownFields(), but outputs directly to a string. Returns
-  // false if printing fails.
-  static bool PrintUnknownFieldsToString(const UnknownFieldSet& unknown_fields,
-                                         std::string* output);
-
-  // Outputs a textual representation of the value of the field supplied on
-  // the message supplied. For non-repeated fields, an index of -1 must
-  // be supplied. Note that this method will print the default value for a
-  // field if it is not set.
-  static void PrintFieldValueToString(const Message& message,
-                                      const FieldDescriptor* field, int index,
-                                      std::string* output);
-
-  class PROTOBUF_EXPORT BaseTextGenerator {
-   public:
-    virtual ~BaseTextGenerator();
-
-    virtual void Indent() {}
-    virtual void Outdent() {}
-    // Returns the current indentation size in characters.
-    virtual size_t GetCurrentIndentationSize() const { return 0; }
-
-    // Print text to the output stream.
-    virtual void Print(const char* text, size_t size) = 0;
-
-    void PrintString(const std::string& str) { Print(str.data(), str.size()); }
-
-    template <size_t n>
-    void PrintLiteral(const char (&text)[n]) {
-      Print(text, n - 1);  // n includes the terminating zero character.
-    }
-  };
-
-  // The default printer that converts scalar values from fields into their
-  // string representation.
-  // You can derive from this FastFieldValuePrinter if you want to have fields
-  // to be printed in a different way and register it at the Printer.
-  class PROTOBUF_EXPORT FastFieldValuePrinter {
-   public:
-    FastFieldValuePrinter();
-    virtual ~FastFieldValuePrinter();
-    virtual void PrintBool(bool val, BaseTextGenerator* generator) const;
-    virtual void PrintInt32(int32_t val, BaseTextGenerator* generator) const;
-    virtual void PrintUInt32(uint32_t val, BaseTextGenerator* generator) const;
-    virtual void PrintInt64(int64_t val, BaseTextGenerator* generator) const;
-    virtual void PrintUInt64(uint64_t val, BaseTextGenerator* generator) const;
-    virtual void PrintFloat(float val, BaseTextGenerator* generator) const;
-    virtual void PrintDouble(double val, BaseTextGenerator* generator) const;
-    virtual void PrintString(const std::string& val,
-                             BaseTextGenerator* generator) const;
-    virtual void PrintBytes(const std::string& val,
-                            BaseTextGenerator* generator) const;
-    virtual void PrintEnum(int32_t val, const std::string& name,
-                           BaseTextGenerator* generator) const;
-    virtual void PrintFieldName(const Message& message, int field_index,
-                                int field_count, const Reflection* reflection,
-                                const FieldDescriptor* field,
-                                BaseTextGenerator* generator) const;
-    virtual void PrintFieldName(const Message& message,
-                                const Reflection* reflection,
-                                const FieldDescriptor* field,
-                                BaseTextGenerator* generator) const;
-    virtual void PrintMessageStart(const Message& message, int field_index,
-                                   int field_count, bool single_line_mode,
-                                   BaseTextGenerator* generator) const;
-    // Allows to override the logic on how to print the content of a message.
-    // Return false to use the default printing logic. Note that it is legal for
-    // this function to print something and then return false to use the default
-    // content printing (although at that point it would behave similarly to
-    // PrintMessageStart).
-    virtual bool PrintMessageContent(const Message& message, int field_index,
-                                     int field_count, bool single_line_mode,
-                                     BaseTextGenerator* generator) const;
-    virtual void PrintMessageEnd(const Message& message, int field_index,
-                                 int field_count, bool single_line_mode,
-                                 BaseTextGenerator* generator) const;
-
-   private:
-    GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(FastFieldValuePrinter);
-  };
-
-  // Deprecated: please use FastFieldValuePrinter instead.
-  class PROTOBUF_EXPORT FieldValuePrinter {
-   public:
-    FieldValuePrinter();
-    virtual ~FieldValuePrinter();
-    virtual std::string PrintBool(bool val) const;
-    virtual std::string PrintInt32(int32_t val) const;
-    virtual std::string PrintUInt32(uint32_t val) const;
-    virtual std::string PrintInt64(int64_t val) const;
-    virtual std::string PrintUInt64(uint64_t val) const;
-    virtual std::string PrintFloat(float val) const;
-    virtual std::string PrintDouble(double val) const;
-    virtual std::string PrintString(const std::string& val) const;
-    virtual std::string PrintBytes(const std::string& val) const;
-    virtual std::string PrintEnum(int32_t val, const std::string& name) const;
-    virtual std::string PrintFieldName(const Message& message,
-                                       const Reflection* reflection,
-                                       const FieldDescriptor* field) const;
-    virtual std::string PrintMessageStart(const Message& message,
-                                          int field_index, int field_count,
-                                          bool single_line_mode) const;
-    virtual std::string PrintMessageEnd(const Message& message, int field_index,
-                                        int field_count,
-                                        bool single_line_mode) const;
-
-   private:
-    FastFieldValuePrinter delegate_;
-    GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(FieldValuePrinter);
-  };
-
-  class PROTOBUF_EXPORT MessagePrinter {
-   public:
-    MessagePrinter() {}
-    virtual ~MessagePrinter() {}
-    virtual void Print(const Message& message, bool single_line_mode,
-                       BaseTextGenerator* generator) const = 0;
-
-   private:
-    GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(MessagePrinter);
-  };
-
-  // Interface that Printers or Parsers can use to find extensions, or types
-  // referenced in Any messages.
-  class PROTOBUF_EXPORT Finder {
-   public:
-    virtual ~Finder();
-
-    // Try to find an extension of *message by fully-qualified field
-    // name.  Returns nullptr if no extension is known for this name or number.
-    // The base implementation uses the extensions already known by the message.
-    virtual const FieldDescriptor* FindExtension(Message* message,
-                                                 const std::string& name) const;
-
-    // Similar to FindExtension, but uses a Descriptor and the extension number
-    // instead of using a Message and the name when doing the look up.
-    virtual const FieldDescriptor* FindExtensionByNumber(
-        const Descriptor* descriptor, int number) const;
-
-    // Find the message type for an Any proto.
-    // Returns nullptr if no message is known for this name.
-    // The base implementation only accepts prefixes of type.googleprod.com/ or
-    // type.googleapis.com/, and searches the DescriptorPool of the parent
-    // message.
-    virtual const Descriptor* FindAnyType(const Message& message,
-                                          const std::string& prefix,
-                                          const std::string& name) const;
-
-    // Find the message factory for the given extension field. This can be used
-    // to generalize the Parser to add extension fields to a message in the same
-    // way as the "input" message for the Parser.
-    virtual MessageFactory* FindExtensionFactory(
-        const FieldDescriptor* field) const;
-  };
-
-  // Class for those users which require more fine-grained control over how
-  // a protobuffer message is printed out.
-  class PROTOBUF_EXPORT Printer {
-   public:
-    Printer();
-
-    // Like TextFormat::Print
-    bool Print(const Message& message, io::ZeroCopyOutputStream* output) const;
-    // Like TextFormat::PrintUnknownFields
-    bool PrintUnknownFields(const UnknownFieldSet& unknown_fields,
-                            io::ZeroCopyOutputStream* output) const;
-    // Like TextFormat::PrintToString
-    bool PrintToString(const Message& message, std::string* output) const;
-    // Like TextFormat::PrintUnknownFieldsToString
-    bool PrintUnknownFieldsToString(const UnknownFieldSet& unknown_fields,
-                                    std::string* output) const;
-    // Like TextFormat::PrintFieldValueToString
-    void PrintFieldValueToString(const Message& message,
-                                 const FieldDescriptor* field, int index,
-                                 std::string* output) const;
-
-    // Adjust the initial indent level of all output.  Each indent level is
-    // equal to two spaces.
-    void SetInitialIndentLevel(int indent_level) {
-      initial_indent_level_ = indent_level;
-    }
-
-    // If printing in single line mode, then the entire message will be output
-    // on a single line with no line breaks.
-    void SetSingleLineMode(bool single_line_mode) {
-      single_line_mode_ = single_line_mode;
-    }
-
-    bool IsInSingleLineMode() const { return single_line_mode_; }
-
-    // If use_field_number is true, uses field number instead of field name.
-    void SetUseFieldNumber(bool use_field_number) {
-      use_field_number_ = use_field_number;
-    }
-
-    // Set true to print repeated primitives in a format like:
-    //   field_name: [1, 2, 3, 4]
-    // instead of printing each value on its own line.  Short format applies
-    // only to primitive values -- i.e. everything except strings and
-    // sub-messages/groups.
-    void SetUseShortRepeatedPrimitives(bool use_short_repeated_primitives) {
-      use_short_repeated_primitives_ = use_short_repeated_primitives;
-    }
-
-    // Set true to output UTF-8 instead of ASCII.  The only difference
-    // is that bytes >= 0x80 in string fields will not be escaped,
-    // because they are assumed to be part of UTF-8 multi-byte
-    // sequences. This will change the default FastFieldValuePrinter.
-    void SetUseUtf8StringEscaping(bool as_utf8);
-
-    // Set the default FastFieldValuePrinter that is used for all fields that
-    // don't have a field-specific printer registered.
-    // Takes ownership of the printer.
-    void SetDefaultFieldValuePrinter(const FastFieldValuePrinter* printer);
-
-    PROTOBUF_DEPRECATED_MSG("Please use FastFieldValuePrinter")
-    void SetDefaultFieldValuePrinter(const FieldValuePrinter* printer);
-
-    // Sets whether we want to hide unknown fields or not.
-    // Usually unknown fields are printed in a generic way that includes the
-    // tag number of the field instead of field name. However, sometimes it
-    // is useful to be able to print the message without unknown fields (e.g.
-    // for the python protobuf version to maintain consistency between its pure
-    // python and c++ implementations).
-    void SetHideUnknownFields(bool hide) { hide_unknown_fields_ = hide; }
-
-    // If print_message_fields_in_index_order is true, fields of a proto message
-    // will be printed using the order defined in source code instead of the
-    // field number, extensions will be printed at the end of the message
-    // and their relative order is determined by the extension number.
-    // By default, use the field number order.
-    void SetPrintMessageFieldsInIndexOrder(
-        bool print_message_fields_in_index_order) {
-      print_message_fields_in_index_order_ =
-          print_message_fields_in_index_order;
-    }
-
-    // If expand==true, expand google.protobuf.Any payloads. The output
-    // will be of form
-    //    [type_url] { <value_printed_in_text> }
-    //
-    // If expand==false, print Any using the default printer. The output will
-    // look like
-    //    type_url: "<type_url>"  value: "serialized_content"
-    void SetExpandAny(bool expand) { expand_any_ = expand; }
-
-    // Set how parser finds message for Any payloads.
-    void SetFinder(const Finder* finder) { finder_ = finder; }
-
-    // If non-zero, we truncate all string fields that are  longer than
-    // this threshold.  This is useful when the proto message has very long
-    // strings, e.g., dump of encoded image file.
-    //
-    // NOTE(hfgong):  Setting a non-zero value breaks round-trip safe
-    // property of TextFormat::Printer.  That is, from the printed message, we
-    // cannot fully recover the original string field any more.
-    void SetTruncateStringFieldLongerThan(
-        const int64_t truncate_string_field_longer_than) {
-      truncate_string_field_longer_than_ = truncate_string_field_longer_than;
-    }
-
-    // Register a custom field-specific FastFieldValuePrinter for fields
-    // with a particular FieldDescriptor.
-    // Returns "true" if the registration succeeded, or "false", if there is
-    // already a printer for that FieldDescriptor.
-    // Takes ownership of the printer on successful registration.
-    bool RegisterFieldValuePrinter(const FieldDescriptor* field,
-                                   const FastFieldValuePrinter* printer);
-
-    PROTOBUF_DEPRECATED_MSG("Please use FastFieldValuePrinter")
-    bool RegisterFieldValuePrinter(const FieldDescriptor* field,
-                                   const FieldValuePrinter* printer);
-
-    // Register a custom message-specific MessagePrinter for messages with a
-    // particular Descriptor.
-    // Returns "true" if the registration succeeded, or "false" if there is
-    // already a printer for that Descriptor.
-    bool RegisterMessagePrinter(const Descriptor* descriptor,
-                                const MessagePrinter* printer);
-
-   private:
-    friend std::string Message::DebugString() const;
-    friend std::string Message::ShortDebugString() const;
-    friend std::string Message::Utf8DebugString() const;
-
-    // Sets whether *DebugString should insert a silent marker.
-    void SetInsertSilentMarker(bool v) { insert_silent_marker_ = v; }
-
-    // Forward declaration of an internal class used to print the text
-    // output to the OutputStream (see text_format.cc for implementation).
-    class TextGenerator;
-
-    // Forward declaration of an internal class used to print field values for
-    // DebugString APIs (see text_format.cc for implementation).
-    class DebugStringFieldValuePrinter;
-
-    // Forward declaration of an internal class used to print UTF-8 escaped
-    // strings (see text_format.cc for implementation).
-    class FastFieldValuePrinterUtf8Escaping;
-
-    static const char* const kDoNotParse;
-
-    // Internal Print method, used for writing to the OutputStream via
-    // the TextGenerator class.
-    void Print(const Message& message, TextGenerator* generator) const;
-
-    // Print a single field.
-    void PrintField(const Message& message, const Reflection* reflection,
-                    const FieldDescriptor* field,
-                    TextGenerator* generator) const;
-
-    // Print a repeated primitive field in short form.
-    void PrintShortRepeatedField(const Message& message,
-                                 const Reflection* reflection,
-                                 const FieldDescriptor* field,
-                                 TextGenerator* generator) const;
-
-    // Print the name of a field -- i.e. everything that comes before the
-    // ':' for a single name/value pair.
-    void PrintFieldName(const Message& message, int field_index,
-                        int field_count, const Reflection* reflection,
-                        const FieldDescriptor* field,
-                        TextGenerator* generator) const;
-
-    // Outputs a textual representation of the value of the field supplied on
-    // the message supplied or the default value if not set.
-    void PrintFieldValue(const Message& message, const Reflection* reflection,
-                         const FieldDescriptor* field, int index,
-                         TextGenerator* generator) const;
-
-    // Print the fields in an UnknownFieldSet.  They are printed by tag number
-    // only.  Embedded messages are heuristically identified by attempting to
-    // parse them (subject to the recursion budget).
-    void PrintUnknownFields(const UnknownFieldSet& unknown_fields,
-                            TextGenerator* generator,
-                            int recursion_budget) const;
-
-    bool PrintAny(const Message& message, TextGenerator* generator) const;
-
-    const FastFieldValuePrinter* GetFieldPrinter(
-        const FieldDescriptor* field) const {
-      auto it = custom_printers_.find(field);
-      return it == custom_printers_.end() ? default_field_value_printer_.get()
-                                          : it->second.get();
-    }
-
-    int initial_indent_level_;
-    bool single_line_mode_;
-    bool use_field_number_;
-    bool use_short_repeated_primitives_;
-    bool insert_silent_marker_;
-    bool hide_unknown_fields_;
-    bool print_message_fields_in_index_order_;
-    bool expand_any_;
-    int64_t truncate_string_field_longer_than_;
-
-    std::unique_ptr<const FastFieldValuePrinter> default_field_value_printer_;
-    typedef std::map<const FieldDescriptor*,
-                     std::unique_ptr<const FastFieldValuePrinter>>
-        CustomPrinterMap;
-    CustomPrinterMap custom_printers_;
-
-    typedef std::map<const Descriptor*, std::unique_ptr<const MessagePrinter>>
-        CustomMessagePrinterMap;
-    CustomMessagePrinterMap custom_message_printers_;
-
-    const Finder* finder_;
-  };
-
-  // Parses a text-format protocol message from the given input stream to
-  // the given message object. This function parses the human-readable
-  // serialization format written by Print(). Returns true on success. The
-  // message is cleared first, even if the function fails -- See Merge() to
-  // avoid this behavior.
-  //
-  // Example input: "user {\n id: 123 extra { gender: MALE language: 'en' }\n}"
-  //
-  // One common use for this function is parsing handwritten strings in test
-  // code.
-  //
-  // If you would like to read a protocol buffer serialized in the
-  // (non-human-readable) binary wire format, see
-  // google::protobuf::MessageLite::ParseFromString().
-  static bool Parse(io::ZeroCopyInputStream* input, Message* output);
-  // Like Parse(), but reads directly from a string.
-  static bool ParseFromString(ConstStringParam input, Message* output);
-
-  // Like Parse(), but the data is merged into the given message, as if
-  // using Message::MergeFrom().
-  static bool Merge(io::ZeroCopyInputStream* input, Message* output);
-  // Like Merge(), but reads directly from a string.
-  static bool MergeFromString(ConstStringParam input, Message* output);
-
-  // Parse the given text as a single field value and store it into the
-  // given field of the given message. If the field is a repeated field,
-  // the new value will be added to the end
-  static bool ParseFieldValueFromString(const std::string& input,
-                                        const FieldDescriptor* field,
-                                        Message* message);
-
-  // A location in the parsed text.
-  struct ParseLocation {
-    int line;
-    int column;
-
-    ParseLocation() : line(-1), column(-1) {}
-    ParseLocation(int line_param, int column_param)
-        : line(line_param), column(column_param) {}
-  };
-
-  // A range of locations in the parsed text, including `start` and excluding
-  // `end`.
-  struct ParseLocationRange {
-    ParseLocation start;
-    ParseLocation end;
-    ParseLocationRange() : start(), end() {}
-    ParseLocationRange(ParseLocation start_param, ParseLocation end_param)
-        : start(start_param), end(end_param) {}
-  };
-
-  // Data structure which is populated with the locations of each field
-  // value parsed from the text.
-  class PROTOBUF_EXPORT ParseInfoTree {
-   public:
-    ParseInfoTree() = default;
-    ParseInfoTree(const ParseInfoTree&) = delete;
-    ParseInfoTree& operator=(const ParseInfoTree&) = delete;
-
-    // Returns the parse location range for index-th value of the field in
-    // the parsed text. If none exists, returns a location with start and end
-    // line -1. Index should be -1 for not-repeated fields.
-    ParseLocationRange GetLocationRange(const FieldDescriptor* field,
-                                        int index) const;
-
-    // Returns the starting parse location for index-th value of the field in
-    // the parsed text. If none exists, returns a location with line = -1. Index
-    // should be -1 for not-repeated fields.
-    ParseLocation GetLocation(const FieldDescriptor* field, int index) const {
-      return GetLocationRange(field, index).start;
-    }
-
-    // Returns the parse info tree for the given field, which must be a message
-    // type. The nested information tree is owned by the root tree and will be
-    // deleted when it is deleted.
-    ParseInfoTree* GetTreeForNested(const FieldDescriptor* field,
-                                    int index) const;
-
-   private:
-    // Allow the text format parser to record information into the tree.
-    friend class TextFormat;
-
-    // Records the starting and ending locations of a single value for a field.
-    void RecordLocation(const FieldDescriptor* field, ParseLocationRange range);
-
-    // Create and records a nested tree for a nested message field.
-    ParseInfoTree* CreateNested(const FieldDescriptor* field);
-
-    // Defines the map from the index-th field descriptor to its parse location.
-    typedef std::map<const FieldDescriptor*, std::vector<ParseLocationRange>>
-        LocationMap;
-
-    // Defines the map from the index-th field descriptor to the nested parse
-    // info tree.
-    typedef std::map<const FieldDescriptor*,
-                     std::vector<std::unique_ptr<ParseInfoTree>>>
-        NestedMap;
-
-    LocationMap locations_;
-    NestedMap nested_;
-  };
-
-  // For more control over parsing, use this class.
-  class PROTOBUF_EXPORT Parser {
-   public:
-    Parser();
-    ~Parser();
-
-    // Like TextFormat::Parse().
-    bool Parse(io::ZeroCopyInputStream* input, Message* output);
-    // Like TextFormat::ParseFromString().
-    bool ParseFromString(ConstStringParam input, Message* output);
-    // Like TextFormat::Merge().
-    bool Merge(io::ZeroCopyInputStream* input, Message* output);
-    // Like TextFormat::MergeFromString().
-    bool MergeFromString(ConstStringParam input, Message* output);
-
-    // Set where to report parse errors.  If nullptr (the default), errors will
-    // be printed to stderr.
-    void RecordErrorsTo(io::ErrorCollector* error_collector) {
-      error_collector_ = error_collector;
-    }
-
-    // Set how parser finds extensions.  If nullptr (the default), the
-    // parser will use the standard Reflection object associated with
-    // the message being parsed.
-    void SetFinder(const Finder* finder) { finder_ = finder; }
-
-    // Sets where location information about the parse will be written. If
-    // nullptr
-    // (the default), then no location will be written.
-    void WriteLocationsTo(ParseInfoTree* tree) { parse_info_tree_ = tree; }
-
-    // Normally parsing fails if, after parsing, output->IsInitialized()
-    // returns false.  Call AllowPartialMessage(true) to skip this check.
-    void AllowPartialMessage(bool allow) { allow_partial_ = allow; }
-
-    // Allow field names to be matched case-insensitively.
-    // This is not advisable if there are fields that only differ in case, or
-    // if you want to enforce writing in the canonical form.
-    // This is 'false' by default.
-    void AllowCaseInsensitiveField(bool allow) {
-      allow_case_insensitive_field_ = allow;
-    }
-
-    // Like TextFormat::ParseFieldValueFromString
-    bool ParseFieldValueFromString(const std::string& input,
-                                   const FieldDescriptor* field,
-                                   Message* output);
-
-    // When an unknown extension is met, parsing will fail if this option is
-    // set to false (the default). If true, unknown extensions will be ignored
-    // and a warning message will be generated.
-    // Beware! Setting this option true may hide some errors (e.g. spelling
-    // error on extension name).  This allows data loss; unlike binary format,
-    // text format cannot preserve unknown extensions.  Avoid using this option
-    // if possible.
-    void AllowUnknownExtension(bool allow) { allow_unknown_extension_ = allow; }
-
-    // When an unknown field is met, parsing will fail if this option is set
-    // to false (the default). If true, unknown fields will be ignored and
-    // a warning message will be generated.
-    // Beware! Setting this option true may hide some errors (e.g. spelling
-    // error on field name). This allows data loss; unlike binary format, text
-    // format cannot preserve unknown fields.  Avoid using this option
-    // if possible.
-    void AllowUnknownField(bool allow) { allow_unknown_field_ = allow; }
-
-
-    void AllowFieldNumber(bool allow) { allow_field_number_ = allow; }
-
-    // Sets maximum recursion depth which parser can use. This is effectively
-    // the maximum allowed nesting of proto messages.
-    void SetRecursionLimit(int limit) { recursion_limit_ = limit; }
-
-   private:
-    // Forward declaration of an internal class used to parse text
-    // representations (see text_format.cc for implementation).
-    class ParserImpl;
-
-    // Like TextFormat::Merge().  The provided implementation is used
-    // to do the parsing.
-    bool MergeUsingImpl(io::ZeroCopyInputStream* input, Message* output,
-                        ParserImpl* parser_impl);
-
-    io::ErrorCollector* error_collector_;
-    const Finder* finder_;
-    ParseInfoTree* parse_info_tree_;
-    bool allow_partial_;
-    bool allow_case_insensitive_field_;
-    bool allow_unknown_field_;
-    bool allow_unknown_extension_;
-    bool allow_unknown_enum_;
-    bool allow_field_number_;
-    bool allow_relaxed_whitespace_;
-    bool allow_singular_overwrites_;
-    int recursion_limit_;
-  };
-
-
- private:
-  // Hack: ParseInfoTree declares TextFormat as a friend which should extend
-  // the friendship to TextFormat::Parser::ParserImpl, but unfortunately some
-  // old compilers (e.g. GCC 3.4.6) don't implement this correctly. We provide
-  // helpers for ParserImpl to call methods of ParseInfoTree.
-  static inline void RecordLocation(ParseInfoTree* info_tree,
-                                    const FieldDescriptor* field,
-                                    ParseLocationRange location);
-  static inline ParseInfoTree* CreateNested(ParseInfoTree* info_tree,
-                                            const FieldDescriptor* field);
-
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(TextFormat);
-};
-
-inline void TextFormat::RecordLocation(ParseInfoTree* info_tree,
-                                       const FieldDescriptor* field,
-                                       ParseLocationRange location) {
-  info_tree->RecordLocation(field, location);
-}
-
-inline TextFormat::ParseInfoTree* TextFormat::CreateNested(
-    ParseInfoTree* info_tree, const FieldDescriptor* field) {
-  return info_tree->CreateNested(field);
-}
-
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
-
-#endif  // GOOGLE_PROTOBUF_TEXT_FORMAT_H__
diff --git a/libs/protobuf/src/google/protobuf/text_format_unittest.cc b/libs/protobuf/src/google/protobuf/text_format_unittest.cc
deleted file mode 100644
index 126f2f3..0000000
--- a/libs/protobuf/src/google/protobuf/text_format_unittest.cc
+++ /dev/null
@@ -1,2280 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: jschorr@google.com (Joseph Schorr)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-
-#include <google/protobuf/text_format.h>
-
-#include <math.h>
-#include <stdlib.h>
-
-#include <atomic>
-#include <limits>
-#include <memory>
-
-#include <google/protobuf/stubs/logging.h>
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/testing/file.h>
-#include <google/protobuf/testing/file.h>
-#include <google/protobuf/any.pb.h>
-#include <google/protobuf/map_unittest.pb.h>
-#include <google/protobuf/unittest.pb.h>
-#include <google/protobuf/unittest_mset.pb.h>
-#include <google/protobuf/unittest_mset_wire_format.pb.h>
-#include <google/protobuf/unittest_proto3.pb.h>
-#include <google/protobuf/io/tokenizer.h>
-#include <google/protobuf/io/zero_copy_stream_impl.h>
-#include <google/protobuf/stubs/strutil.h>
-#include <gmock/gmock.h>
-#include <google/protobuf/testing/googletest.h>
-#include <gtest/gtest.h>
-#include <google/protobuf/stubs/logging.h>
-#include <google/protobuf/stubs/substitute.h>
-#include <google/protobuf/test_util.h>
-#include <google/protobuf/test_util2.h>
-
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-
-namespace internal {
-// Controls insertion of DEBUG_STRING_SILENT_MARKER.
-extern PROTOBUF_EXPORT std::atomic<bool> enable_debug_text_format_marker;
-}  // namespace internal
-
-// Can't use an anonymous namespace here due to brokenness of Tru64 compiler.
-namespace text_format_unittest {
-
-using ::google::protobuf::internal::kDebugStringSilentMarker;
-
-// A basic string with different escapable characters for testing.
-const std::string kEscapeTestString =
-    "\"A string with ' characters \n and \r newlines and \t tabs and \001 "
-    "slashes \\ and  multiple   spaces";
-
-// A representation of the above string with all the characters escaped.
-const std::string kEscapeTestStringEscaped =
-    "\"\\\"A string with \\' characters \\n and \\r newlines "
-    "and \\t tabs and \\001 slashes \\\\ and  multiple   spaces\"";
-
-class TextFormatTest : public testing::Test {
- public:
-  static void SetUpTestSuite() {
-    GOOGLE_CHECK_OK(File::GetContents(
-        TestUtil::GetTestDataPath(
-            "net/proto2/internal/"
-            "testdata/text_format_unittest_data_oneof_implemented.txt"),
-        &static_proto_text_format_, true));
-    CleanStringLineEndings(&static_proto_text_format_, false);
-  }
-
-  TextFormatTest() : proto_text_format_(static_proto_text_format_) {}
-
- protected:
-  // Text format read from text_format_unittest_data.txt.
-  const std::string proto_text_format_;
-  unittest::TestAllTypes proto_;
-
- private:
-  static std::string static_proto_text_format_;
-};
-std::string TextFormatTest::static_proto_text_format_;
-
-class TextFormatExtensionsTest : public testing::Test {
- public:
-  static void SetUpTestSuite() {
-    GOOGLE_CHECK_OK(File::GetContents(
-        TestUtil::GetTestDataPath("net/proto2/internal/testdata/"
-                                  "text_format_unittest_extensions_data.txt"),
-        &static_proto_text_format_, true));
-    CleanStringLineEndings(&static_proto_text_format_, false);
-  }
-
-  TextFormatExtensionsTest() : proto_text_format_(static_proto_text_format_) {}
-
- protected:
-  // Debug string read from text_format_unittest_data.txt.
-  const std::string proto_text_format_;
-  unittest::TestAllExtensions proto_;
-
- private:
-  static std::string static_proto_text_format_;
-};
-std::string TextFormatExtensionsTest::static_proto_text_format_;
-
-TEST_F(TextFormatTest, Basic) {
-  TestUtil::SetAllFields(&proto_);
-  std::string actual_proto_text_format;
-  TextFormat::PrintToString(proto_, &actual_proto_text_format);
-  EXPECT_EQ(actual_proto_text_format, proto_text_format_);
-}
-
-TEST_F(TextFormatExtensionsTest, Extensions) {
-  TestUtil::SetAllExtensions(&proto_);
-  std::string actual_proto_text_format;
-  TextFormat::PrintToString(proto_, &actual_proto_text_format);
-  EXPECT_EQ(actual_proto_text_format, proto_text_format_);
-}
-
-TEST_F(TextFormatTest, ShortDebugString) {
-  proto_.set_optional_int32(1);
-  proto_.set_optional_string("hello");
-  proto_.mutable_optional_nested_message()->set_bb(2);
-  proto_.mutable_optional_foreign_message();
-
-  EXPECT_EQ(proto_.ShortDebugString(),
-            StrCat("optional_int32: ", kDebugStringSilentMarker,
-                         "1 "
-                         "optional_string: \"hello\" "
-                         "optional_nested_message { bb: 2 } "
-                         "optional_foreign_message { }"));
-}
-
-TEST_F(TextFormatTest, ShortPrimitiveRepeateds) {
-  proto_.set_optional_int32(123);
-  proto_.add_repeated_int32(456);
-  proto_.add_repeated_int32(789);
-  proto_.add_repeated_string("foo");
-  proto_.add_repeated_string("bar");
-  proto_.add_repeated_nested_message()->set_bb(2);
-  proto_.add_repeated_nested_message()->set_bb(3);
-  proto_.add_repeated_nested_enum(unittest::TestAllTypes::FOO);
-  proto_.add_repeated_nested_enum(unittest::TestAllTypes::BAR);
-
-  TextFormat::Printer printer;
-  printer.SetUseShortRepeatedPrimitives(true);
-  std::string text;
-  EXPECT_TRUE(printer.PrintToString(proto_, &text));
-
-  EXPECT_EQ(
-      "optional_int32: 123\n"
-      "repeated_int32: [456, 789]\n"
-      "repeated_string: \"foo\"\n"
-      "repeated_string: \"bar\"\n"
-      "repeated_nested_message {\n  bb: 2\n}\n"
-      "repeated_nested_message {\n  bb: 3\n}\n"
-      "repeated_nested_enum: [FOO, BAR]\n",
-      text);
-
-  // Verify that any existing data in the string is cleared when PrintToString()
-  // is called.
-  text = "just some data here...\n\nblah blah";
-  EXPECT_TRUE(printer.PrintToString(proto_, &text));
-
-  EXPECT_EQ(
-      "optional_int32: 123\n"
-      "repeated_int32: [456, 789]\n"
-      "repeated_string: \"foo\"\n"
-      "repeated_string: \"bar\"\n"
-      "repeated_nested_message {\n  bb: 2\n}\n"
-      "repeated_nested_message {\n  bb: 3\n}\n"
-      "repeated_nested_enum: [FOO, BAR]\n",
-      text);
-
-  // Try in single-line mode.
-  printer.SetSingleLineMode(true);
-  EXPECT_TRUE(printer.PrintToString(proto_, &text));
-
-  EXPECT_EQ(
-      "optional_int32: 123 "
-      "repeated_int32: [456, 789] "
-      "repeated_string: \"foo\" "
-      "repeated_string: \"bar\" "
-      "repeated_nested_message { bb: 2 } "
-      "repeated_nested_message { bb: 3 } "
-      "repeated_nested_enum: [FOO, BAR] ",
-      text);
-}
-
-
-TEST_F(TextFormatTest, StringEscape) {
-  // Set the string value to test.
-  proto_.set_optional_string(kEscapeTestString);
-
-  // Get the DebugString from the proto.
-  std::string debug_string = proto_.DebugString();
-  std::string utf8_debug_string = proto_.Utf8DebugString();
-
-  // Hardcode a correct value to test against.
-  std::string correct_string =
-      StrCat("optional_string: ", kDebugStringSilentMarker,
-                   kEscapeTestStringEscaped, "\n");
-
-  // Compare.
-  EXPECT_EQ(correct_string, debug_string);
-  // UTF-8 string is the same as non-UTF-8 because
-  // the protocol buffer contains no UTF-8 text.
-  EXPECT_EQ(correct_string, utf8_debug_string);
-
-  std::string expected_short_debug_string = StrCat(
-      "optional_string: ", kDebugStringSilentMarker, kEscapeTestStringEscaped);
-  EXPECT_EQ(expected_short_debug_string, proto_.ShortDebugString());
-}
-
-TEST_F(TextFormatTest, Utf8DebugString) {
-  // Set the string value to test.
-  proto_.set_optional_string("\350\260\267\346\255\214");
-  proto_.set_optional_bytes("\350\260\267\346\255\214");
-
-  // Get the DebugString from the proto.
-  std::string debug_string = proto_.DebugString();
-  std::string utf8_debug_string = proto_.Utf8DebugString();
-
-  // Hardcode a correct value to test against.
-  std::string correct_utf8_string =
-      StrCat("optional_string: ", kDebugStringSilentMarker,
-                   "\"\350\260\267\346\255\214\"\n"
-                   "optional_bytes: \"\\350\\260\\267\\346\\255\\214\"\n");
-  std::string correct_string =
-      StrCat("optional_string: ", kDebugStringSilentMarker,
-                   "\"\\350\\260\\267\\346\\255\\214\"\n"
-                   "optional_bytes: \"\\350\\260\\267\\346\\255\\214\"\n");
-
-  // Compare.
-  EXPECT_EQ(correct_utf8_string, utf8_debug_string);
-  EXPECT_EQ(correct_string, debug_string);
-}
-
-TEST_F(TextFormatTest, PrintUnknownFields) {
-  // Test printing of unknown fields in a message.
-
-  unittest::TestEmptyMessage message;
-  UnknownFieldSet* unknown_fields = message.mutable_unknown_fields();
-
-  unknown_fields->AddVarint(5, 1);
-  unknown_fields->AddFixed32(5, 2);
-  unknown_fields->AddFixed64(5, 3);
-  unknown_fields->AddLengthDelimited(5, "4");
-  unknown_fields->AddGroup(5)->AddVarint(10, 5);
-
-  unknown_fields->AddVarint(8, 1);
-  unknown_fields->AddVarint(8, 2);
-  unknown_fields->AddVarint(8, 3);
-
-  EXPECT_EQ(StrCat("5: ", kDebugStringSilentMarker,
-                         "1\n"
-                         "5: 0x00000002\n"
-                         "5: 0x0000000000000003\n"
-                         "5: \"4\"\n"
-                         "5 {\n"
-                         "  10: 5\n"
-                         "}\n"
-                         "8: 1\n"
-                         "8: 2\n"
-                         "8: 3\n"),
-            message.DebugString());
-}
-
-TEST_F(TextFormatTest, PrintUnknownFieldsHidden) {
-  // Test printing of unknown fields in a message when suppressed.
-
-  unittest::OneString message;
-  message.set_data("data");
-  UnknownFieldSet* unknown_fields = message.mutable_unknown_fields();
-
-  unknown_fields->AddVarint(5, 1);
-  unknown_fields->AddFixed32(5, 2);
-  unknown_fields->AddFixed64(5, 3);
-  unknown_fields->AddLengthDelimited(5, "4");
-  unknown_fields->AddGroup(5)->AddVarint(10, 5);
-
-  unknown_fields->AddVarint(8, 1);
-  unknown_fields->AddVarint(8, 2);
-  unknown_fields->AddVarint(8, 3);
-
-  TextFormat::Printer printer;
-  printer.SetHideUnknownFields(true);
-  std::string output;
-  printer.PrintToString(message, &output);
-
-  EXPECT_EQ("data: \"data\"\n", output);
-}
-
-TEST_F(TextFormatTest, PrintUnknownMessage) {
-  // Test heuristic printing of messages in an UnknownFieldSet.
-
-  protobuf_unittest::TestAllTypes message;
-
-  // Cases which should not be interpreted as sub-messages.
-
-  // 'a' is a valid FIXED64 tag, so for the string to be parseable as a message
-  // it should be followed by 8 bytes.  Since this string only has two
-  // subsequent bytes, it should be treated as a string.
-  message.add_repeated_string("abc");
-
-  // 'd' happens to be a valid ENDGROUP tag.  So,
-  // UnknownFieldSet::MergeFromCodedStream() will successfully parse "def", but
-  // the ConsumedEntireMessage() check should fail.
-  message.add_repeated_string("def");
-
-  // A zero-length string should never be interpreted as a message even though
-  // it is technically valid as one.
-  message.add_repeated_string("");
-
-  // Case which should be interpreted as a sub-message.
-
-  // An actual nested message with content should always be interpreted as a
-  // nested message.
-  message.add_repeated_nested_message()->set_bb(123);
-
-  std::string data;
-  message.SerializeToString(&data);
-
-  std::string text;
-  UnknownFieldSet unknown_fields;
-  EXPECT_TRUE(unknown_fields.ParseFromString(data));
-  EXPECT_TRUE(TextFormat::PrintUnknownFieldsToString(unknown_fields, &text));
-  // Field 44 and 48 can be printed in any order.
-  EXPECT_THAT(text, testing::HasSubstr("44: \"abc\"\n"
-                                       "44: \"def\"\n"
-                                       "44: \"\"\n"));
-  EXPECT_THAT(text, testing::HasSubstr("48 {\n"
-                                       "  1: 123\n"
-                                       "}\n"));
-}
-
-TEST_F(TextFormatTest, PrintDeeplyNestedUnknownMessage) {
-  // Create a deeply nested message.
-  static constexpr int kNestingDepth = 25000;
-  static constexpr int kUnknownFieldNumber = 1;
-  std::vector<int> lengths;
-  lengths.reserve(kNestingDepth);
-  lengths.push_back(0);
-  for (int i = 0; i < kNestingDepth - 1; ++i) {
-    lengths.push_back(
-        internal::WireFormatLite::TagSize(
-            kUnknownFieldNumber, internal::WireFormatLite::TYPE_BYTES) +
-        internal::WireFormatLite::LengthDelimitedSize(lengths.back()));
-  }
-  std::string serialized;
-  {
-    io::StringOutputStream zero_copy_stream(&serialized);
-    io::CodedOutputStream coded_stream(&zero_copy_stream);
-    for (int i = kNestingDepth - 1; i >= 0; --i) {
-      internal::WireFormatLite::WriteTag(
-          kUnknownFieldNumber,
-          internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED, &coded_stream);
-      coded_stream.WriteVarint32(lengths[i]);
-    }
-  }
-
-  // Parse the data and verify that we can print it without overflowing the
-  // stack.
-  unittest::TestEmptyMessage message;
-  ASSERT_TRUE(message.ParseFromString(serialized));
-  std::string text;
-  EXPECT_TRUE(TextFormat::PrintToString(message, &text));
-}
-
-TEST_F(TextFormatTest, PrintMessageWithIndent) {
-  // Test adding an initial indent to printing.
-
-  protobuf_unittest::TestAllTypes message;
-
-  message.add_repeated_string("abc");
-  message.add_repeated_string("def");
-  message.add_repeated_nested_message()->set_bb(123);
-
-  std::string text;
-  TextFormat::Printer printer;
-  printer.SetInitialIndentLevel(1);
-  EXPECT_TRUE(printer.PrintToString(message, &text));
-  EXPECT_EQ(
-      "  repeated_string: \"abc\"\n"
-      "  repeated_string: \"def\"\n"
-      "  repeated_nested_message {\n"
-      "    bb: 123\n"
-      "  }\n",
-      text);
-}
-
-TEST_F(TextFormatTest, PrintMessageSingleLine) {
-  // Test printing a message on a single line.
-
-  protobuf_unittest::TestAllTypes message;
-
-  message.add_repeated_string("abc");
-  message.add_repeated_string("def");
-  message.add_repeated_nested_message()->set_bb(123);
-
-  std::string text;
-  TextFormat::Printer printer;
-  printer.SetInitialIndentLevel(1);
-  printer.SetSingleLineMode(true);
-  EXPECT_TRUE(printer.PrintToString(message, &text));
-  EXPECT_EQ(
-      "  repeated_string: \"abc\" repeated_string: \"def\" "
-      "repeated_nested_message { bb: 123 } ",
-      text);
-}
-
-TEST_F(TextFormatTest, PrintBufferTooSmall) {
-  // Test printing a message to a buffer that is too small.
-
-  protobuf_unittest::TestAllTypes message;
-
-  message.add_repeated_string("abc");
-  message.add_repeated_string("def");
-
-  char buffer[1] = "";
-  io::ArrayOutputStream output_stream(buffer, 1);
-  EXPECT_FALSE(TextFormat::Print(message, &output_stream));
-  EXPECT_EQ(buffer[0], 'r');
-  EXPECT_EQ(output_stream.ByteCount(), 1);
-}
-
-// A printer that appends 'u' to all unsigned int32.
-class CustomUInt32FieldValuePrinter : public TextFormat::FieldValuePrinter {
- public:
-  std::string PrintUInt32(uint32_t val) const override {
-    return StrCat(FieldValuePrinter::PrintUInt32(val), "u");
-  }
-};
-
-TEST_F(TextFormatTest, DefaultCustomFieldPrinter) {
-  protobuf_unittest::TestAllTypes message;
-
-  message.set_optional_uint32(42);
-  message.add_repeated_uint32(1);
-  message.add_repeated_uint32(2);
-  message.add_repeated_uint32(3);
-
-  TextFormat::Printer printer;
-  printer.SetDefaultFieldValuePrinter(new CustomUInt32FieldValuePrinter());
-  // Let's see if that works well together with the repeated primitives:
-  printer.SetUseShortRepeatedPrimitives(true);
-  std::string text;
-  printer.PrintToString(message, &text);
-  EXPECT_EQ("optional_uint32: 42u\nrepeated_uint32: [1u, 2u, 3u]\n", text);
-}
-
-class CustomInt32FieldValuePrinter : public TextFormat::FieldValuePrinter {
- public:
-  std::string PrintInt32(int32_t val) const override {
-    return StrCat("value-is(", FieldValuePrinter::PrintInt32(val), ")");
-  }
-};
-
-TEST_F(TextFormatTest, FieldSpecificCustomPrinter) {
-  protobuf_unittest::TestAllTypes message;
-
-  message.set_optional_int32(42);  // This will be handled by our Printer.
-  message.add_repeated_int32(42);  // This will be printed as number.
-
-  TextFormat::Printer printer;
-  EXPECT_TRUE(printer.RegisterFieldValuePrinter(
-      message.GetDescriptor()->FindFieldByName("optional_int32"),
-      new CustomInt32FieldValuePrinter()));
-  std::string text;
-  printer.PrintToString(message, &text);
-  EXPECT_EQ("optional_int32: value-is(42)\nrepeated_int32: 42\n", text);
-}
-
-TEST_F(TextFormatTest, FieldSpecificCustomPrinterRegisterSameFieldTwice) {
-  protobuf_unittest::TestAllTypes message;
-  TextFormat::Printer printer;
-  const FieldDescriptor* const field =
-      message.GetDescriptor()->FindFieldByName("optional_int32");
-  ASSERT_TRUE(printer.RegisterFieldValuePrinter(
-      field, new CustomInt32FieldValuePrinter()));
-  const TextFormat::FieldValuePrinter* const rejected =
-      new CustomInt32FieldValuePrinter();
-  ASSERT_FALSE(printer.RegisterFieldValuePrinter(field, rejected));
-  delete rejected;
-}
-
-TEST_F(TextFormatTest, ErrorCasesRegisteringFieldValuePrinterShouldFail) {
-  protobuf_unittest::TestAllTypes message;
-  TextFormat::Printer printer;
-  // nullptr printer.
-  EXPECT_FALSE(printer.RegisterFieldValuePrinter(
-      message.GetDescriptor()->FindFieldByName("optional_int32"),
-      static_cast<const TextFormat::FieldValuePrinter*>(nullptr)));
-  EXPECT_FALSE(printer.RegisterFieldValuePrinter(
-      message.GetDescriptor()->FindFieldByName("optional_int32"),
-      static_cast<const TextFormat::FastFieldValuePrinter*>(nullptr)));
-  // Because registration fails, the ownership of this printer is never taken.
-  TextFormat::FieldValuePrinter my_field_printer;
-  // nullptr field
-  EXPECT_FALSE(printer.RegisterFieldValuePrinter(nullptr, &my_field_printer));
-}
-
-class CustomMessageFieldValuePrinter : public TextFormat::FieldValuePrinter {
- public:
-  std::string PrintInt32(int32_t v) const override {
-    return StrCat(FieldValuePrinter::PrintInt32(v), "  # x",
-                        strings::Hex(v));
-  }
-
-  std::string PrintMessageStart(const Message& message, int field_index,
-                                int field_count,
-                                bool single_line_mode) const override {
-    if (single_line_mode) {
-      return " { ";
-    }
-    return StrCat(" {  # ", message.GetDescriptor()->name(), ": ",
-                        field_index, "\n");
-  }
-};
-
-TEST_F(TextFormatTest, CustomPrinterForComments) {
-  protobuf_unittest::TestAllTypes message;
-  message.mutable_optional_nested_message();
-  message.mutable_optional_import_message()->set_d(42);
-  message.add_repeated_nested_message();
-  message.add_repeated_nested_message();
-  message.add_repeated_import_message()->set_d(43);
-  message.add_repeated_import_message()->set_d(44);
-  TextFormat::Printer printer;
-  CustomMessageFieldValuePrinter my_field_printer;
-  printer.SetDefaultFieldValuePrinter(new CustomMessageFieldValuePrinter());
-  std::string text;
-  printer.PrintToString(message, &text);
-  EXPECT_EQ(
-      "optional_nested_message {  # NestedMessage: -1\n"
-      "}\n"
-      "optional_import_message {  # ImportMessage: -1\n"
-      "  d: 42  # x2a\n"
-      "}\n"
-      "repeated_nested_message {  # NestedMessage: 0\n"
-      "}\n"
-      "repeated_nested_message {  # NestedMessage: 1\n"
-      "}\n"
-      "repeated_import_message {  # ImportMessage: 0\n"
-      "  d: 43  # x2b\n"
-      "}\n"
-      "repeated_import_message {  # ImportMessage: 1\n"
-      "  d: 44  # x2c\n"
-      "}\n",
-      text);
-}
-
-class CustomMessageContentFieldValuePrinter
-    : public TextFormat::FastFieldValuePrinter {
- public:
-  bool PrintMessageContent(
-      const Message& message, int field_index, int field_count,
-      bool single_line_mode,
-      TextFormat::BaseTextGenerator* generator) const override {
-    if (message.ByteSizeLong() > 0) {
-      generator->PrintString(
-          strings::Substitute("# REDACTED, $0 bytes\n", message.ByteSizeLong()));
-    }
-    return true;
-  }
-};
-
-TEST_F(TextFormatTest, CustomPrinterForMessageContent) {
-  protobuf_unittest::TestAllTypes message;
-  message.mutable_optional_nested_message();
-  message.mutable_optional_import_message()->set_d(42);
-  message.add_repeated_nested_message();
-  message.add_repeated_nested_message();
-  message.add_repeated_import_message()->set_d(43);
-  message.add_repeated_import_message()->set_d(44);
-  TextFormat::Printer printer;
-  CustomMessageContentFieldValuePrinter my_field_printer;
-  printer.SetDefaultFieldValuePrinter(
-      new CustomMessageContentFieldValuePrinter());
-  std::string text;
-  printer.PrintToString(message, &text);
-  EXPECT_EQ(
-      "optional_nested_message {\n"
-      "}\n"
-      "optional_import_message {\n"
-      "  # REDACTED, 2 bytes\n"
-      "}\n"
-      "repeated_nested_message {\n"
-      "}\n"
-      "repeated_nested_message {\n"
-      "}\n"
-      "repeated_import_message {\n"
-      "  # REDACTED, 2 bytes\n"
-      "}\n"
-      "repeated_import_message {\n"
-      "  # REDACTED, 2 bytes\n"
-      "}\n",
-      text);
-}
-
-class CustomMultilineCommentPrinter : public TextFormat::FieldValuePrinter {
- public:
-  std::string PrintMessageStart(const Message& message, int field_index,
-                                int field_count,
-                                bool single_line_comment) const override {
-    return StrCat(" {  # 1\n", "  # 2\n");
-  }
-};
-
-TEST_F(TextFormatTest, CustomPrinterForMultilineComments) {
-  protobuf_unittest::TestAllTypes message;
-  message.mutable_optional_nested_message();
-  message.mutable_optional_import_message()->set_d(42);
-  TextFormat::Printer printer;
-  CustomMessageFieldValuePrinter my_field_printer;
-  printer.SetDefaultFieldValuePrinter(new CustomMultilineCommentPrinter());
-  std::string text;
-  printer.PrintToString(message, &text);
-  EXPECT_EQ(
-      "optional_nested_message {  # 1\n"
-      "  # 2\n"
-      "}\n"
-      "optional_import_message {  # 1\n"
-      "  # 2\n"
-      "  d: 42\n"
-      "}\n",
-      text);
-}
-
-// Achieve effects similar to SetUseShortRepeatedPrimitives for messages, using
-// RegisterFieldValuePrinter. Use this to test the version of PrintFieldName
-// that accepts repeated field index and count.
-class CompactRepeatedFieldPrinter : public TextFormat::FastFieldValuePrinter {
- public:
-  void PrintFieldName(const Message& message, int field_index, int field_count,
-                      const Reflection* reflection,
-                      const FieldDescriptor* field,
-                      TextFormat::BaseTextGenerator* generator) const override {
-    if (field_index == 0 || field_index == -1) {
-      generator->PrintString(field->name());
-    }
-  }
-  // To prevent compiler complaining about Woverloaded-virtual
-  void PrintFieldName(const Message& message, const Reflection* reflection,
-                      const FieldDescriptor* field,
-                      TextFormat::BaseTextGenerator* generator) const override {
-  }
-  void PrintMessageStart(
-      const Message& message, int field_index, int field_count,
-      bool single_line_mode,
-      TextFormat::BaseTextGenerator* generator) const override {
-    if (field_index == 0 || field_index == -1) {
-      if (single_line_mode) {
-        generator->PrintLiteral(" { ");
-      } else {
-        generator->PrintLiteral(" {\n");
-      }
-    }
-  }
-  void PrintMessageEnd(
-      const Message& message, int field_index, int field_count,
-      bool single_line_mode,
-      TextFormat::BaseTextGenerator* generator) const override {
-    if (field_index == field_count - 1 || field_index == -1) {
-      if (single_line_mode) {
-        generator->PrintLiteral("} ");
-      } else {
-        generator->PrintLiteral("}\n");
-      }
-    }
-  }
-};
-
-TEST_F(TextFormatTest, CompactRepeatedFieldPrinter) {
-  TextFormat::Printer printer;
-  ASSERT_TRUE(printer.RegisterFieldValuePrinter(
-      unittest::TestAllTypes::default_instance()
-          .descriptor()
-          ->FindFieldByNumber(
-              unittest::TestAllTypes::kRepeatedNestedMessageFieldNumber),
-      new CompactRepeatedFieldPrinter));
-
-  protobuf_unittest::TestAllTypes message;
-  message.add_repeated_nested_message()->set_bb(1);
-  message.add_repeated_nested_message()->set_bb(2);
-  message.add_repeated_nested_message()->set_bb(3);
-
-  std::string text;
-  ASSERT_TRUE(printer.PrintToString(message, &text));
-  EXPECT_EQ(
-      "repeated_nested_message {\n"
-      "  bb: 1\n"
-      "  bb: 2\n"
-      "  bb: 3\n"
-      "}\n",
-      text);
-}
-
-// Print strings into multiple line, with indentation. Use this to test
-// BaseTextGenerator::Indent and BaseTextGenerator::Outdent.
-class MultilineStringPrinter : public TextFormat::FastFieldValuePrinter {
- public:
-  void PrintString(const std::string& val,
-                   TextFormat::BaseTextGenerator* generator) const override {
-    generator->Indent();
-    int last_pos = 0;
-    int newline_pos = val.find('\n');
-    while (newline_pos != std::string::npos) {
-      generator->PrintLiteral("\n");
-      TextFormat::FastFieldValuePrinter::PrintString(
-          val.substr(last_pos, newline_pos + 1 - last_pos), generator);
-      last_pos = newline_pos + 1;
-      newline_pos = val.find('\n', last_pos);
-    }
-    if (last_pos < val.size()) {
-      generator->PrintLiteral("\n");
-      TextFormat::FastFieldValuePrinter::PrintString(val.substr(last_pos),
-                                                     generator);
-    }
-    generator->Outdent();
-  }
-};
-
-TEST_F(TextFormatTest, MultilineStringPrinter) {
-  TextFormat::Printer printer;
-  ASSERT_TRUE(printer.RegisterFieldValuePrinter(
-      unittest::TestAllTypes::default_instance()
-          .descriptor()
-          ->FindFieldByNumber(
-              unittest::TestAllTypes::kOptionalStringFieldNumber),
-      new MultilineStringPrinter));
-
-  protobuf_unittest::TestAllTypes message;
-  message.set_optional_string("first line\nsecond line\nthird line");
-
-  std::string text;
-  ASSERT_TRUE(printer.PrintToString(message, &text));
-  EXPECT_EQ(
-      "optional_string: \n"
-      "  \"first line\\n\"\n"
-      "  \"second line\\n\"\n"
-      "  \"third line\"\n",
-      text);
-}
-
-class CustomNestedMessagePrinter : public TextFormat::MessagePrinter {
- public:
-  CustomNestedMessagePrinter() {}
-  ~CustomNestedMessagePrinter() override {}
-  void Print(const Message& message, bool single_line_mode,
-             TextFormat::BaseTextGenerator* generator) const override {
-    generator->PrintLiteral("custom");
-  }
-};
-
-TEST_F(TextFormatTest, CustomMessagePrinter) {
-  TextFormat::Printer printer;
-  printer.RegisterMessagePrinter(
-      unittest::TestAllTypes::NestedMessage::default_instance().descriptor(),
-      new CustomNestedMessagePrinter);
-
-  unittest::TestAllTypes message;
-  std::string text;
-  EXPECT_TRUE(printer.PrintToString(message, &text));
-  EXPECT_EQ("", text);
-
-  message.mutable_optional_nested_message()->set_bb(1);
-  EXPECT_TRUE(printer.PrintToString(message, &text));
-  EXPECT_EQ("optional_nested_message {\n  custom}\n", text);
-}
-
-TEST_F(TextFormatTest, ParseBasic) {
-  io::ArrayInputStream input_stream(proto_text_format_.data(),
-                                    proto_text_format_.size());
-  TextFormat::Parse(&input_stream, &proto_);
-  TestUtil::ExpectAllFieldsSet(proto_);
-}
-
-TEST_F(TextFormatExtensionsTest, ParseExtensions) {
-  io::ArrayInputStream input_stream(proto_text_format_.data(),
-                                    proto_text_format_.size());
-  TextFormat::Parse(&input_stream, &proto_);
-  TestUtil::ExpectAllExtensionsSet(proto_);
-}
-
-TEST_F(TextFormatTest, ParseEnumFieldFromNumber) {
-  // Create a parse string with a numerical value for an enum field.
-  std::string parse_string =
-      strings::Substitute("optional_nested_enum: $0", unittest::TestAllTypes::BAZ);
-  EXPECT_TRUE(TextFormat::ParseFromString(parse_string, &proto_));
-  EXPECT_TRUE(proto_.has_optional_nested_enum());
-  EXPECT_EQ(unittest::TestAllTypes::BAZ, proto_.optional_nested_enum());
-}
-
-TEST_F(TextFormatTest, ParseEnumFieldFromNegativeNumber) {
-  ASSERT_LT(unittest::SPARSE_E, 0);
-  std::string parse_string =
-      strings::Substitute("sparse_enum: $0", unittest::SPARSE_E);
-  unittest::SparseEnumMessage proto;
-  EXPECT_TRUE(TextFormat::ParseFromString(parse_string, &proto));
-  EXPECT_TRUE(proto.has_sparse_enum());
-  EXPECT_EQ(unittest::SPARSE_E, proto.sparse_enum());
-}
-
-TEST_F(TextFormatTest, PrintUnknownEnumFieldProto3) {
-  proto3_unittest::TestAllTypes proto;
-
-  proto.add_repeated_nested_enum(
-      static_cast<proto3_unittest::TestAllTypes::NestedEnum>(10));
-  proto.add_repeated_nested_enum(
-      static_cast<proto3_unittest::TestAllTypes::NestedEnum>(-10));
-  proto.add_repeated_nested_enum(
-      static_cast<proto3_unittest::TestAllTypes::NestedEnum>(2147483647));
-  proto.add_repeated_nested_enum(
-      static_cast<proto3_unittest::TestAllTypes::NestedEnum>(-2147483648));
-
-  EXPECT_EQ(StrCat("repeated_nested_enum: ", kDebugStringSilentMarker,
-                         "10\n"
-                         "repeated_nested_enum: -10\n"
-                         "repeated_nested_enum: 2147483647\n"
-                         "repeated_nested_enum: -2147483648\n"),
-            proto.DebugString());
-}
-
-TEST_F(TextFormatTest, ParseUnknownEnumFieldProto3) {
-  proto3_unittest::TestAllTypes proto;
-  std::string parse_string =
-      "repeated_nested_enum: [10, -10, 2147483647, -2147483648]";
-  EXPECT_TRUE(TextFormat::ParseFromString(parse_string, &proto));
-  ASSERT_EQ(4, proto.repeated_nested_enum_size());
-  EXPECT_EQ(10, proto.repeated_nested_enum(0));
-  EXPECT_EQ(-10, proto.repeated_nested_enum(1));
-  EXPECT_EQ(2147483647, proto.repeated_nested_enum(2));
-  EXPECT_EQ(-2147483648, proto.repeated_nested_enum(3));
-}
-
-TEST_F(TextFormatTest, ParseStringEscape) {
-  // Create a parse string with escaped characters in it.
-  std::string parse_string =
-      "optional_string: " + kEscapeTestStringEscaped + "\n";
-
-  io::ArrayInputStream input_stream(parse_string.data(), parse_string.size());
-  TextFormat::Parse(&input_stream, &proto_);
-
-  // Compare.
-  EXPECT_EQ(kEscapeTestString, proto_.optional_string());
-}
-
-TEST_F(TextFormatTest, ParseConcatenatedString) {
-  // Create a parse string with multiple parts on one line.
-  std::string parse_string = "optional_string: \"foo\" \"bar\"\n";
-
-  io::ArrayInputStream input_stream1(parse_string.data(), parse_string.size());
-  TextFormat::Parse(&input_stream1, &proto_);
-
-  // Compare.
-  EXPECT_EQ("foobar", proto_.optional_string());
-
-  // Create a parse string with multiple parts on separate lines.
-  parse_string =
-      "optional_string: \"foo\"\n"
-      "\"bar\"\n";
-
-  io::ArrayInputStream input_stream2(parse_string.data(), parse_string.size());
-  TextFormat::Parse(&input_stream2, &proto_);
-
-  // Compare.
-  EXPECT_EQ("foobar", proto_.optional_string());
-}
-
-TEST_F(TextFormatTest, ParseFloatWithSuffix) {
-  // Test that we can parse a floating-point value with 'f' appended to the
-  // end.  This is needed for backwards-compatibility with proto1.
-
-  // Have it parse a float with the 'f' suffix.
-  std::string parse_string = "optional_float: 1.0f\n";
-
-  io::ArrayInputStream input_stream(parse_string.data(), parse_string.size());
-
-  TextFormat::Parse(&input_stream, &proto_);
-
-  // Compare.
-  EXPECT_EQ(1.0, proto_.optional_float());
-}
-
-TEST_F(TextFormatTest, ParseShortRepeatedForm) {
-  std::string parse_string =
-      // Mixed short-form and long-form are simply concatenated.
-      "repeated_int32: 1\n"
-      "repeated_int32: [456, 789]\n"
-      "repeated_nested_enum: [  FOO ,BAR, # comment\n"
-      "                         3]\n"
-      // Note that while the printer won't print repeated strings in short-form,
-      // the parser will accept them.
-      "repeated_string: [ \"foo\", 'bar' ]\n"
-      // Repeated message
-      "repeated_nested_message: [ { bb: 1 }, { bb : 2 }]\n"
-      // Repeated group
-      "RepeatedGroup [{ a: 3 },{ a: 4 }]\n";
-
-  ASSERT_TRUE(TextFormat::ParseFromString(parse_string, &proto_));
-
-  ASSERT_EQ(3, proto_.repeated_int32_size());
-  EXPECT_EQ(1, proto_.repeated_int32(0));
-  EXPECT_EQ(456, proto_.repeated_int32(1));
-  EXPECT_EQ(789, proto_.repeated_int32(2));
-
-  ASSERT_EQ(3, proto_.repeated_nested_enum_size());
-  EXPECT_EQ(unittest::TestAllTypes::FOO, proto_.repeated_nested_enum(0));
-  EXPECT_EQ(unittest::TestAllTypes::BAR, proto_.repeated_nested_enum(1));
-  EXPECT_EQ(unittest::TestAllTypes::BAZ, proto_.repeated_nested_enum(2));
-
-  ASSERT_EQ(2, proto_.repeated_string_size());
-  EXPECT_EQ("foo", proto_.repeated_string(0));
-  EXPECT_EQ("bar", proto_.repeated_string(1));
-
-  ASSERT_EQ(2, proto_.repeated_nested_message_size());
-  EXPECT_EQ(1, proto_.repeated_nested_message(0).bb());
-  EXPECT_EQ(2, proto_.repeated_nested_message(1).bb());
-
-  ASSERT_EQ(2, proto_.repeatedgroup_size());
-  EXPECT_EQ(3, proto_.repeatedgroup(0).a());
-  EXPECT_EQ(4, proto_.repeatedgroup(1).a());
-}
-
-TEST_F(TextFormatTest, ParseShortRepeatedWithTrailingComma) {
-  std::string parse_string = "repeated_int32: [456,]\n";
-  ASSERT_FALSE(TextFormat::ParseFromString(parse_string, &proto_));
-  parse_string = "repeated_nested_enum: [  FOO , ]";
-  ASSERT_FALSE(TextFormat::ParseFromString(parse_string, &proto_));
-  parse_string = "repeated_string: [ \"foo\", ]";
-  ASSERT_FALSE(TextFormat::ParseFromString(parse_string, &proto_));
-  parse_string = "repeated_nested_message: [ { bb: 1 }, ]";
-  ASSERT_FALSE(TextFormat::ParseFromString(parse_string, &proto_));
-  parse_string = "RepeatedGroup [{ a: 3 },]\n";
-}
-
-TEST_F(TextFormatTest, ParseShortRepeatedEmpty) {
-  std::string parse_string =
-      "repeated_int32: []\n"
-      "repeated_nested_enum: []\n"
-      "repeated_string: []\n"
-      "repeated_nested_message: []\n"
-      "RepeatedGroup []\n";
-
-  ASSERT_TRUE(TextFormat::ParseFromString(parse_string, &proto_));
-
-  EXPECT_EQ(0, proto_.repeated_int32_size());
-  EXPECT_EQ(0, proto_.repeated_nested_enum_size());
-  EXPECT_EQ(0, proto_.repeated_string_size());
-  EXPECT_EQ(0, proto_.repeated_nested_message_size());
-  EXPECT_EQ(0, proto_.repeatedgroup_size());
-}
-
-TEST_F(TextFormatTest, ParseShortRepeatedConcatenatedWithEmpty) {
-  std::string parse_string =
-      // Starting with empty [] should have no impact.
-      "repeated_int32: []\n"
-      "repeated_nested_enum: []\n"
-      "repeated_string: []\n"
-      "repeated_nested_message: []\n"
-      "RepeatedGroup []\n"
-      // Mixed short-form and long-form are simply concatenated.
-      "repeated_int32: 1\n"
-      "repeated_int32: [456, 789]\n"
-      "repeated_nested_enum: [  FOO ,BAR, # comment\n"
-      "                         3]\n"
-      // Note that while the printer won't print repeated strings in short-form,
-      // the parser will accept them.
-      "repeated_string: [ \"foo\", 'bar' ]\n"
-      // Repeated message
-      "repeated_nested_message: [ { bb: 1 }, { bb : 2 }]\n"
-      // Repeated group
-      "RepeatedGroup [{ a: 3 },{ a: 4 }]\n"
-      // Adding empty [] should have no impact.
-      "repeated_int32: []\n"
-      "repeated_nested_enum: []\n"
-      "repeated_string: []\n"
-      "repeated_nested_message: []\n"
-      "RepeatedGroup []\n";
-
-  ASSERT_TRUE(TextFormat::ParseFromString(parse_string, &proto_));
-
-  ASSERT_EQ(3, proto_.repeated_int32_size());
-  EXPECT_EQ(1, proto_.repeated_int32(0));
-  EXPECT_EQ(456, proto_.repeated_int32(1));
-  EXPECT_EQ(789, proto_.repeated_int32(2));
-
-  ASSERT_EQ(3, proto_.repeated_nested_enum_size());
-  EXPECT_EQ(unittest::TestAllTypes::FOO, proto_.repeated_nested_enum(0));
-  EXPECT_EQ(unittest::TestAllTypes::BAR, proto_.repeated_nested_enum(1));
-  EXPECT_EQ(unittest::TestAllTypes::BAZ, proto_.repeated_nested_enum(2));
-
-  ASSERT_EQ(2, proto_.repeated_string_size());
-  EXPECT_EQ("foo", proto_.repeated_string(0));
-  EXPECT_EQ("bar", proto_.repeated_string(1));
-
-  ASSERT_EQ(2, proto_.repeated_nested_message_size());
-  EXPECT_EQ(1, proto_.repeated_nested_message(0).bb());
-  EXPECT_EQ(2, proto_.repeated_nested_message(1).bb());
-
-  ASSERT_EQ(2, proto_.repeatedgroup_size());
-  EXPECT_EQ(3, proto_.repeatedgroup(0).a());
-  EXPECT_EQ(4, proto_.repeatedgroup(1).a());
-}
-
-
-TEST_F(TextFormatTest, Comments) {
-  // Test that comments are ignored.
-
-  std::string parse_string =
-      "optional_int32: 1  # a comment\n"
-      "optional_int64: 2  # another comment";
-
-  io::ArrayInputStream input_stream(parse_string.data(), parse_string.size());
-
-  TextFormat::Parse(&input_stream, &proto_);
-
-  // Compare.
-  EXPECT_EQ(1, proto_.optional_int32());
-  EXPECT_EQ(2, proto_.optional_int64());
-}
-
-TEST_F(TextFormatTest, OptionalColon) {
-  // Test that we can place a ':' after the field name of a nested message,
-  // even though we don't have to.
-
-  std::string parse_string = "optional_nested_message: { bb: 1}\n";
-
-  io::ArrayInputStream input_stream(parse_string.data(), parse_string.size());
-
-  TextFormat::Parse(&input_stream, &proto_);
-
-  // Compare.
-  EXPECT_TRUE(proto_.has_optional_nested_message());
-  EXPECT_EQ(1, proto_.optional_nested_message().bb());
-}
-
-// Some platforms (e.g. Windows) insist on padding the exponent to three
-// digits when one or two would be just fine.
-static std::string RemoveRedundantZeros(std::string text) {
-  text = StringReplace(text, "e+0", "e+", true);
-  text = StringReplace(text, "e-0", "e-", true);
-  return text;
-}
-
-TEST_F(TextFormatTest, PrintExotic) {
-  unittest::TestAllTypes message;
-
-  message.add_repeated_int64(int64_t{-9223372036854775807} - 1);
-  message.add_repeated_uint64(uint64_t{18446744073709551615u});
-  message.add_repeated_double(123.456);
-  message.add_repeated_double(1.23e21);
-  message.add_repeated_double(1.23e-18);
-  message.add_repeated_double(std::numeric_limits<double>::infinity());
-  message.add_repeated_double(-std::numeric_limits<double>::infinity());
-  message.add_repeated_double(std::numeric_limits<double>::quiet_NaN());
-  message.add_repeated_double(-std::numeric_limits<double>::quiet_NaN());
-  message.add_repeated_double(std::numeric_limits<double>::signaling_NaN());
-  message.add_repeated_double(-std::numeric_limits<double>::signaling_NaN());
-  message.add_repeated_string(std::string("\000\001\a\b\f\n\r\t\v\\\'\"", 12));
-
-  // Fun story:  We used to use 1.23e22 instead of 1.23e21 above, but this
-  //   seemed to trigger an odd case on MinGW/GCC 3.4.5 where GCC's parsing of
-  //   the value differed from strtod()'s parsing.  That is to say, the
-  //   following assertion fails on MinGW:
-  //     assert(1.23e22 == strtod("1.23e22", nullptr));
-  //   As a result, SimpleDtoa() would print the value as
-  //   "1.2300000000000001e+22" to make sure strtod() produce the exact same
-  //   result.  Our goal is to test runtime parsing, not compile-time parsing,
-  //   so this wasn't our problem.  It was found that using 1.23e21 did not
-  //   have this problem, so we switched to that instead.
-
-  EXPECT_EQ(
-      StrCat("repeated_int64: ", kDebugStringSilentMarker,
-                   "-9223372036854775808\n"
-                   "repeated_uint64: 18446744073709551615\n"
-                   "repeated_double: 123.456\n"
-                   "repeated_double: 1.23e+21\n"
-                   "repeated_double: 1.23e-18\n"
-                   "repeated_double: inf\n"
-                   "repeated_double: -inf\n"
-                   "repeated_double: nan\n"
-                   "repeated_double: nan\n"
-                   "repeated_double: nan\n"
-                   "repeated_double: nan\n"
-                   "repeated_string: "
-                   "\"\\000\\001\\007\\010\\014\\n\\r\\t\\013\\\\\\'\\\"\"\n"),
-      RemoveRedundantZeros(message.DebugString()));
-}
-
-TEST_F(TextFormatTest, PrintFloatPrecision) {
-  unittest::TestAllTypes message;
-
-  message.add_repeated_float(1.0);
-  message.add_repeated_float(1.2);
-  message.add_repeated_float(1.23);
-  message.add_repeated_float(1.234);
-  message.add_repeated_float(1.2345);
-  message.add_repeated_float(1.23456);
-  message.add_repeated_float(1.2e10);
-  message.add_repeated_float(1.23e10);
-  message.add_repeated_float(1.234e10);
-  message.add_repeated_float(1.2345e10);
-  message.add_repeated_float(1.23456e10);
-  message.add_repeated_double(1.2);
-  message.add_repeated_double(1.23);
-  message.add_repeated_double(1.234);
-  message.add_repeated_double(1.2345);
-  message.add_repeated_double(1.23456);
-  message.add_repeated_double(1.234567);
-  message.add_repeated_double(1.2345678);
-  message.add_repeated_double(1.23456789);
-  message.add_repeated_double(1.234567898);
-  message.add_repeated_double(1.2345678987);
-  message.add_repeated_double(1.23456789876);
-  message.add_repeated_double(1.234567898765);
-  message.add_repeated_double(1.2345678987654);
-  message.add_repeated_double(1.23456789876543);
-  message.add_repeated_double(1.2e100);
-  message.add_repeated_double(1.23e100);
-  message.add_repeated_double(1.234e100);
-  message.add_repeated_double(1.2345e100);
-  message.add_repeated_double(1.23456e100);
-  message.add_repeated_double(1.234567e100);
-  message.add_repeated_double(1.2345678e100);
-  message.add_repeated_double(1.23456789e100);
-  message.add_repeated_double(1.234567898e100);
-  message.add_repeated_double(1.2345678987e100);
-  message.add_repeated_double(1.23456789876e100);
-  message.add_repeated_double(1.234567898765e100);
-  message.add_repeated_double(1.2345678987654e100);
-  message.add_repeated_double(1.23456789876543e100);
-
-  EXPECT_EQ(StrCat("repeated_float: ", kDebugStringSilentMarker,
-                         "1\n"
-                         "repeated_float: 1.2\n"
-                         "repeated_float: 1.23\n"
-                         "repeated_float: 1.234\n"
-                         "repeated_float: 1.2345\n"
-                         "repeated_float: 1.23456\n"
-                         "repeated_float: 1.2e+10\n"
-                         "repeated_float: 1.23e+10\n"
-                         "repeated_float: 1.234e+10\n"
-                         "repeated_float: 1.2345e+10\n"
-                         "repeated_float: 1.23456e+10\n"
-                         "repeated_double: 1.2\n"
-                         "repeated_double: 1.23\n"
-                         "repeated_double: 1.234\n"
-                         "repeated_double: 1.2345\n"
-                         "repeated_double: 1.23456\n"
-                         "repeated_double: 1.234567\n"
-                         "repeated_double: 1.2345678\n"
-                         "repeated_double: 1.23456789\n"
-                         "repeated_double: 1.234567898\n"
-                         "repeated_double: 1.2345678987\n"
-                         "repeated_double: 1.23456789876\n"
-                         "repeated_double: 1.234567898765\n"
-                         "repeated_double: 1.2345678987654\n"
-                         "repeated_double: 1.23456789876543\n"
-                         "repeated_double: 1.2e+100\n"
-                         "repeated_double: 1.23e+100\n"
-                         "repeated_double: 1.234e+100\n"
-                         "repeated_double: 1.2345e+100\n"
-                         "repeated_double: 1.23456e+100\n"
-                         "repeated_double: 1.234567e+100\n"
-                         "repeated_double: 1.2345678e+100\n"
-                         "repeated_double: 1.23456789e+100\n"
-                         "repeated_double: 1.234567898e+100\n"
-                         "repeated_double: 1.2345678987e+100\n"
-                         "repeated_double: 1.23456789876e+100\n"
-                         "repeated_double: 1.234567898765e+100\n"
-                         "repeated_double: 1.2345678987654e+100\n"
-                         "repeated_double: 1.23456789876543e+100\n"),
-            RemoveRedundantZeros(message.DebugString()));
-}
-
-TEST_F(TextFormatTest, AllowPartial) {
-  unittest::TestRequired message;
-  TextFormat::Parser parser;
-  parser.AllowPartialMessage(true);
-  EXPECT_TRUE(parser.ParseFromString("a: 1", &message));
-  EXPECT_EQ(1, message.a());
-  EXPECT_FALSE(message.has_b());
-  EXPECT_FALSE(message.has_c());
-}
-
-TEST_F(TextFormatTest, ParseExotic) {
-  unittest::TestAllTypes message;
-  ASSERT_TRUE(TextFormat::ParseFromString(
-      "repeated_int32: -1\n"
-      "repeated_int32: -2147483648\n"
-      "repeated_int64: -1\n"
-      "repeated_int64: -9223372036854775808\n"
-      "repeated_uint32: 4294967295\n"
-      "repeated_uint32: 2147483648\n"
-      "repeated_uint64: 18446744073709551615\n"
-      "repeated_uint64: 9223372036854775808\n"
-      "repeated_double: 123.0\n"
-      "repeated_double: 123.5\n"
-      "repeated_double: 0.125\n"
-      "repeated_double: 1.23E17\n"
-      "repeated_double: 1.235E+22\n"
-      "repeated_double: 1.235e-18\n"
-      "repeated_double: 123.456789\n"
-      "repeated_double: inf\n"
-      "repeated_double: Infinity\n"
-      "repeated_double: -inf\n"
-      "repeated_double: -Infinity\n"
-      "repeated_double: nan\n"
-      "repeated_double: NaN\n"
-      "repeated_string: \"\\000\\001\\a\\b\\f\\n\\r\\t\\v\\\\\\'\\\"\"\n",
-      &message));
-
-  ASSERT_EQ(2, message.repeated_int32_size());
-  EXPECT_EQ(-1, message.repeated_int32(0));
-  EXPECT_EQ(-2147483648, message.repeated_int32(1));
-
-  ASSERT_EQ(2, message.repeated_int64_size());
-  EXPECT_EQ(-1, message.repeated_int64(0));
-  EXPECT_EQ(int64_t{-9223372036854775807} - 1, message.repeated_int64(1));
-
-  ASSERT_EQ(2, message.repeated_uint32_size());
-  EXPECT_EQ(4294967295u, message.repeated_uint32(0));
-  EXPECT_EQ(2147483648u, message.repeated_uint32(1));
-
-  ASSERT_EQ(2, message.repeated_uint64_size());
-  EXPECT_EQ(uint64_t{18446744073709551615u}, message.repeated_uint64(0));
-  EXPECT_EQ(uint64_t{9223372036854775808u}, message.repeated_uint64(1));
-
-  ASSERT_EQ(13, message.repeated_double_size());
-  EXPECT_EQ(123.0, message.repeated_double(0));
-  EXPECT_EQ(123.5, message.repeated_double(1));
-  EXPECT_EQ(0.125, message.repeated_double(2));
-  EXPECT_EQ(1.23E17, message.repeated_double(3));
-  EXPECT_EQ(1.235E22, message.repeated_double(4));
-  EXPECT_EQ(1.235E-18, message.repeated_double(5));
-  EXPECT_EQ(123.456789, message.repeated_double(6));
-  EXPECT_EQ(message.repeated_double(7),
-            std::numeric_limits<double>::infinity());
-  EXPECT_EQ(message.repeated_double(8),
-            std::numeric_limits<double>::infinity());
-  EXPECT_EQ(message.repeated_double(9),
-            -std::numeric_limits<double>::infinity());
-  EXPECT_EQ(message.repeated_double(10),
-            -std::numeric_limits<double>::infinity());
-  EXPECT_TRUE(std::isnan(message.repeated_double(11)));
-  EXPECT_TRUE(std::isnan(message.repeated_double(12)));
-
-  // Note:  Since these string literals have \0's in them, we must explicitly
-  // pass their sizes to string's constructor.
-  ASSERT_EQ(1, message.repeated_string_size());
-  EXPECT_EQ(std::string("\000\001\a\b\f\n\r\t\v\\\'\"", 12),
-            message.repeated_string(0));
-
-  ASSERT_TRUE(
-      TextFormat::ParseFromString("repeated_float: 3.4028235e+38\n"
-                                  "repeated_float: -3.4028235e+38\n"
-                                  "repeated_float: 3.402823567797337e+38\n"
-                                  "repeated_float: -3.402823567797337e+38\n",
-                                  &message));
-  EXPECT_EQ(message.repeated_float(0), std::numeric_limits<float>::max());
-  EXPECT_EQ(message.repeated_float(1), -std::numeric_limits<float>::max());
-  EXPECT_EQ(message.repeated_float(2), std::numeric_limits<float>::infinity());
-  EXPECT_EQ(message.repeated_float(3), -std::numeric_limits<float>::infinity());
-
-}
-
-TEST_F(TextFormatTest, PrintFieldsInIndexOrder) {
-  protobuf_unittest::TestFieldOrderings message;
-  // Fields are listed in index order instead of field number.
-  message.set_my_string("str");  // Field number 11
-  message.set_my_int(12345);     // Field number 1
-  message.set_my_float(0.999);   // Field number 101
-  // Extensions are listed based on the order of extension number.
-  // Extension number 12.
-  message
-      .MutableExtension(
-          protobuf_unittest::TestExtensionOrderings2::test_ext_orderings2)
-      ->set_my_string("ext_str2");
-  // Extension number 13.
-  message
-      .MutableExtension(
-          protobuf_unittest::TestExtensionOrderings1::test_ext_orderings1)
-      ->set_my_string("ext_str1");
-  // Extension number 14.
-  message
-      .MutableExtension(protobuf_unittest::TestExtensionOrderings2::
-                            TestExtensionOrderings3::test_ext_orderings3)
-      ->set_my_string("ext_str3");
-  // Extension number 50.
-  *message.MutableExtension(protobuf_unittest::my_extension_string) = "ext_str0";
-
-  TextFormat::Printer printer;
-  std::string text;
-
-  // By default, print in field number order.
-  // my_int: 12345
-  // my_string: "str"
-  // [protobuf_unittest.TestExtensionOrderings2.test_ext_orderings2] {
-  //   my_string: "ext_str2"
-  // }
-  // [protobuf_unittest.TestExtensionOrderings1.test_ext_orderings1] {
-  //   my_string: "ext_str1"
-  // }
-  // [protobuf_unittest.TestExtensionOrderings2.TestExtensionOrderings3.test_ext_orderings3]
-  // {
-  //   my_string: "ext_str3"
-  // }
-  // [protobuf_unittest.my_extension_string]: "ext_str0"
-  // my_float: 0.999
-  printer.PrintToString(message, &text);
-  EXPECT_EQ(
-      "my_int: 12345\nmy_string: "
-      "\"str\"\n[protobuf_unittest.TestExtensionOrderings2.test_ext_orderings2] "
-      "{\n  my_string: "
-      "\"ext_str2\"\n}\n[protobuf_unittest.TestExtensionOrderings1.test_ext_"
-      "orderings1] {\n  my_string: "
-      "\"ext_str1\"\n}\n[protobuf_unittest.TestExtensionOrderings2."
-      "TestExtensionOrderings3.test_ext_orderings3] {\n  my_string: "
-      "\"ext_str3\"\n}\n[protobuf_unittest.my_extension_string]: "
-      "\"ext_str0\"\nmy_float: 0.999\n",
-      text);
-
-  // Print in index order.
-  // my_string: "str"
-  // my_int: 12345
-  // my_float: 0.999
-  // [protobuf_unittest.TestExtensionOrderings2.test_ext_orderings2] {
-  //   my_string: "ext_str2"
-  // }
-  // [protobuf_unittest.TestExtensionOrderings1.test_ext_orderings1] {
-  //   my_string: "ext_str1"
-  // }
-  // [protobuf_unittest.TestExtensionOrderings2.TestExtensionOrderings3.test_ext_orderings3]
-  // {
-  //   my_string: "ext_str3"
-  // }
-  // [protobuf_unittest.my_extension_string]: "ext_str0"
-  printer.SetPrintMessageFieldsInIndexOrder(true);
-  printer.PrintToString(message, &text);
-  EXPECT_EQ(
-      "my_string: \"str\"\nmy_int: 12345\nmy_float: "
-      "0.999\n[protobuf_unittest.TestExtensionOrderings2.test_ext_orderings2] "
-      "{\n  my_string: "
-      "\"ext_str2\"\n}\n[protobuf_unittest.TestExtensionOrderings1.test_ext_"
-      "orderings1] {\n  my_string: "
-      "\"ext_str1\"\n}\n[protobuf_unittest.TestExtensionOrderings2."
-      "TestExtensionOrderings3.test_ext_orderings3] {\n  my_string: "
-      "\"ext_str3\"\n}\n[protobuf_unittest.my_extension_string]: \"ext_str0\"\n",
-      text);
-}
-
-class TextFormatParserTest : public testing::Test {
- protected:
-  void ExpectFailure(const std::string& input, const std::string& message,
-                     int line, int col) {
-    std::unique_ptr<unittest::TestAllTypes> proto(new unittest::TestAllTypes);
-    ExpectFailure(input, message, line, col, proto.get());
-  }
-
-  void ExpectFailure(const std::string& input, const std::string& message,
-                     int line, int col, Message* proto) {
-    ExpectMessage(input, message, line, col, proto, false);
-  }
-
-  void ExpectMessage(const std::string& input, const std::string& message,
-                     int line, int col, Message* proto, bool expected_result) {
-    MockErrorCollector error_collector;
-    parser_.RecordErrorsTo(&error_collector);
-    EXPECT_EQ(expected_result, parser_.ParseFromString(input, proto))
-        << input << " -> " << proto->DebugString();
-    EXPECT_EQ(StrCat(line, ":", col, ": ", message, "\n"),
-              error_collector.text_);
-    parser_.RecordErrorsTo(nullptr);
-  }
-
-  void ExpectSuccessAndTree(const std::string& input, Message* proto,
-                            TextFormat::ParseInfoTree* info_tree) {
-    MockErrorCollector error_collector;
-    parser_.RecordErrorsTo(&error_collector);
-    parser_.WriteLocationsTo(info_tree);
-    EXPECT_TRUE(parser_.ParseFromString(input, proto));
-    parser_.WriteLocationsTo(nullptr);
-    parser_.RecordErrorsTo(nullptr);
-  }
-
-  void ExpectLocation(TextFormat::ParseInfoTree* tree, const Descriptor* d,
-                      const std::string& field_name, int index, int start_line,
-                      int start_column, int end_line, int end_column) {
-    TextFormat::ParseLocationRange range =
-        tree->GetLocationRange(d->FindFieldByName(field_name), index);
-    EXPECT_EQ(start_line, range.start.line);
-    EXPECT_EQ(start_column, range.start.column);
-    EXPECT_EQ(end_line, range.end.line);
-    EXPECT_EQ(end_column, range.end.column);
-    TextFormat::ParseLocation start_location =
-        tree->GetLocation(d->FindFieldByName(field_name), index);
-    EXPECT_EQ(start_line, start_location.line);
-    EXPECT_EQ(start_column, start_location.column);
-  }
-
-  // An error collector which simply concatenates all its errors into a big
-  // block of text which can be checked.
-  class MockErrorCollector : public io::ErrorCollector {
-   public:
-    MockErrorCollector() {}
-    ~MockErrorCollector() override {}
-
-    std::string text_;
-
-    // implements ErrorCollector -------------------------------------
-    void AddError(int line, int column, const std::string& message) override {
-      strings::SubstituteAndAppend(&text_, "$0:$1: $2\n", line + 1, column + 1,
-                                message);
-    }
-
-    void AddWarning(int line, int column, const std::string& message) override {
-      AddError(line, column, "WARNING:" + message);
-    }
-  };
-
-  TextFormat::Parser parser_;
-};
-
-TEST_F(TextFormatParserTest, ParseInfoTreeBuilding) {
-  std::unique_ptr<unittest::TestAllTypes> message(new unittest::TestAllTypes);
-  const Descriptor* d = message->GetDescriptor();
-
-  std::string stringData =
-      "optional_int32: 1\n"
-      "optional_int64: 2\n"
-      "  optional_double: 2.4\n"
-      "repeated_int32: 5\n"
-      "repeated_int32: 10\n"
-      "optional_nested_message <\n"
-      "  bb: 78\n"
-      ">\n"
-      "repeated_nested_message <\n"
-      "  bb: 79\n"
-      ">\n"
-      "repeated_nested_message <\n"
-      "  bb: 80\n"
-      ">";
-
-  TextFormat::ParseInfoTree tree;
-  ExpectSuccessAndTree(stringData, message.get(), &tree);
-
-  // Verify that the tree has the correct positions.
-  ExpectLocation(&tree, d, "optional_int32", -1, 0, 0, 0, 17);
-  ExpectLocation(&tree, d, "optional_int64", -1, 1, 0, 1, 17);
-  ExpectLocation(&tree, d, "optional_double", -1, 2, 2, 2, 22);
-
-  ExpectLocation(&tree, d, "repeated_int32", 0, 3, 0, 3, 17);
-  ExpectLocation(&tree, d, "repeated_int32", 1, 4, 0, 4, 18);
-
-  ExpectLocation(&tree, d, "optional_nested_message", -1, 5, 0, 7, 1);
-  ExpectLocation(&tree, d, "repeated_nested_message", 0, 8, 0, 10, 1);
-  ExpectLocation(&tree, d, "repeated_nested_message", 1, 11, 0, 13, 1);
-
-  // Check for fields not set. For an invalid field, the start and end locations
-  // returned should be -1, -1.
-  ExpectLocation(&tree, d, "repeated_int64", 0, -1, -1, -1, -1);
-  ExpectLocation(&tree, d, "repeated_int32", 6, -1, -1, -1, -1);
-  ExpectLocation(&tree, d, "some_unknown_field", -1, -1, -1, -1, -1);
-
-  // Verify inside the nested message.
-  const FieldDescriptor* nested_field =
-      d->FindFieldByName("optional_nested_message");
-
-  TextFormat::ParseInfoTree* nested_tree =
-      tree.GetTreeForNested(nested_field, -1);
-  ExpectLocation(nested_tree, nested_field->message_type(), "bb", -1, 6, 2, 6,
-                 8);
-
-  // Verify inside another nested message.
-  nested_field = d->FindFieldByName("repeated_nested_message");
-  nested_tree = tree.GetTreeForNested(nested_field, 0);
-  ExpectLocation(nested_tree, nested_field->message_type(), "bb", -1, 9, 2, 9,
-                 8);
-
-  nested_tree = tree.GetTreeForNested(nested_field, 1);
-  ExpectLocation(nested_tree, nested_field->message_type(), "bb", -1, 12, 2, 12,
-                 8);
-
-  // Verify a nullptr tree for an unknown nested field.
-  TextFormat::ParseInfoTree* unknown_nested_tree =
-      tree.GetTreeForNested(nested_field, 2);
-
-  EXPECT_EQ(nullptr, unknown_nested_tree);
-}
-
-TEST_F(TextFormatParserTest, ParseFieldValueFromString) {
-  std::unique_ptr<unittest::TestAllTypes> message(new unittest::TestAllTypes);
-  const Descriptor* d = message->GetDescriptor();
-
-#define EXPECT_FIELD(name, value, valuestring)                             \
-  EXPECT_TRUE(TextFormat::ParseFieldValueFromString(                       \
-      valuestring, d->FindFieldByName("optional_" #name), message.get())); \
-  EXPECT_EQ(value, message->optional_##name());                            \
-  EXPECT_TRUE(message->has_optional_##name());
-
-#define EXPECT_BOOL_FIELD(name, value, valuestring)                        \
-  EXPECT_TRUE(TextFormat::ParseFieldValueFromString(                       \
-      valuestring, d->FindFieldByName("optional_" #name), message.get())); \
-  EXPECT_TRUE(message->optional_##name() == value);                        \
-  EXPECT_TRUE(message->has_optional_##name());
-
-#define EXPECT_FLOAT_FIELD(name, value, valuestring)                       \
-  EXPECT_TRUE(TextFormat::ParseFieldValueFromString(                       \
-      valuestring, d->FindFieldByName("optional_" #name), message.get())); \
-  EXPECT_FLOAT_EQ(value, message->optional_##name());                      \
-  EXPECT_TRUE(message->has_optional_##name());
-
-#define EXPECT_DOUBLE_FIELD(name, value, valuestring)                      \
-  EXPECT_TRUE(TextFormat::ParseFieldValueFromString(                       \
-      valuestring, d->FindFieldByName("optional_" #name), message.get())); \
-  EXPECT_DOUBLE_EQ(value, message->optional_##name());                     \
-  EXPECT_TRUE(message->has_optional_##name());
-
-#define EXPECT_INVALID(name, valuestring)             \
-  EXPECT_FALSE(TextFormat::ParseFieldValueFromString( \
-      valuestring, d->FindFieldByName("optional_" #name), message.get()));
-
-  // int32
-  EXPECT_FIELD(int32, 1, "1");
-  EXPECT_FIELD(int32, -1, "-1");
-  EXPECT_FIELD(int32, 0x1234, "0x1234");
-  EXPECT_INVALID(int32, "a");
-  EXPECT_INVALID(int32, "999999999999999999999999999999999999");
-  EXPECT_INVALID(int32, "1,2");
-
-  // int64
-  EXPECT_FIELD(int64, 1, "1");
-  EXPECT_FIELD(int64, -1, "-1");
-  EXPECT_FIELD(int64, 0x1234567812345678LL, "0x1234567812345678");
-  EXPECT_INVALID(int64, "a");
-  EXPECT_INVALID(int64, "999999999999999999999999999999999999");
-  EXPECT_INVALID(int64, "1,2");
-
-  // uint64
-  EXPECT_FIELD(uint64, 1, "1");
-  EXPECT_FIELD(uint64, 0xf234567812345678ULL, "0xf234567812345678");
-  EXPECT_INVALID(uint64, "-1");
-  EXPECT_INVALID(uint64, "a");
-  EXPECT_INVALID(uint64, "999999999999999999999999999999999999");
-  EXPECT_INVALID(uint64, "1,2");
-
-  // fixed32
-  EXPECT_FIELD(fixed32, 1, "1");
-  EXPECT_FIELD(fixed32, 0x12345678, "0x12345678");
-  EXPECT_INVALID(fixed32, "-1");
-  EXPECT_INVALID(fixed32, "a");
-  EXPECT_INVALID(fixed32, "999999999999999999999999999999999999");
-  EXPECT_INVALID(fixed32, "1,2");
-
-  // fixed64
-  EXPECT_FIELD(fixed64, 1, "1");
-  EXPECT_FIELD(fixed64, 0x1234567812345678ULL, "0x1234567812345678");
-  EXPECT_INVALID(fixed64, "-1");
-  EXPECT_INVALID(fixed64, "a");
-  EXPECT_INVALID(fixed64, "999999999999999999999999999999999999");
-  EXPECT_INVALID(fixed64, "1,2");
-
-  // bool
-  EXPECT_BOOL_FIELD(bool, true, "true");
-  EXPECT_BOOL_FIELD(bool, false, "false");
-  EXPECT_BOOL_FIELD(bool, true, "1");
-  EXPECT_BOOL_FIELD(bool, true, "t");
-  EXPECT_BOOL_FIELD(bool, false, "0");
-  EXPECT_BOOL_FIELD(bool, false, "f");
-  EXPECT_FIELD(bool, true, "True");
-  EXPECT_FIELD(bool, false, "False");
-  EXPECT_INVALID(bool, "tRue");
-  EXPECT_INVALID(bool, "faLse");
-  EXPECT_INVALID(bool, "2");
-  EXPECT_INVALID(bool, "-0");
-  EXPECT_INVALID(bool, "on");
-  EXPECT_INVALID(bool, "a");
-
-  // float
-  EXPECT_FIELD(float, 1, "1");
-  EXPECT_FLOAT_FIELD(float, 1.5, "1.5");
-  EXPECT_FLOAT_FIELD(float, 1.5e3, "1.5e3");
-  EXPECT_FLOAT_FIELD(float, -4.55, "-4.55");
-  EXPECT_INVALID(float, "a");
-  EXPECT_INVALID(float, "1,2");
-
-  // double
-  EXPECT_FIELD(double, 1, "1");
-  EXPECT_FIELD(double, -1, "-1");
-  EXPECT_DOUBLE_FIELD(double, 2.3, "2.3");
-  EXPECT_DOUBLE_FIELD(double, 3e5, "3e5");
-  EXPECT_INVALID(double, "a");
-  EXPECT_INVALID(double, "1,2");
-  // Rejects hex and oct numbers for a double field.
-  EXPECT_INVALID(double, "0xf");
-  EXPECT_INVALID(double, "012");
-
-  // string
-  EXPECT_FIELD(string, "hello", "\"hello\"");
-  EXPECT_FIELD(string, "-1.87", "'-1.87'");
-  EXPECT_INVALID(string, "hello");  // without quote for value
-
-  // enum
-  EXPECT_FIELD(nested_enum, unittest::TestAllTypes::BAR, "BAR");
-  EXPECT_FIELD(nested_enum, unittest::TestAllTypes::BAZ,
-               StrCat(unittest::TestAllTypes::BAZ));
-  EXPECT_INVALID(nested_enum, "FOOBAR");
-
-  // message
-  EXPECT_TRUE(TextFormat::ParseFieldValueFromString(
-      "<bb:12>", d->FindFieldByName("optional_nested_message"), message.get()));
-  EXPECT_EQ(12, message->optional_nested_message().bb());
-  EXPECT_TRUE(message->has_optional_nested_message());
-  EXPECT_INVALID(nested_message, "any");
-
-#undef EXPECT_FIELD
-#undef EXPECT_BOOL_FIELD
-#undef EXPECT_FLOAT_FIELD
-#undef EXPECT_DOUBLE_FIELD
-#undef EXPECT_INVALID
-}
-
-TEST_F(TextFormatParserTest, InvalidToken) {
-  ExpectFailure("optional_bool: true\n-5\n", "Expected identifier, got: -", 2,
-                1);
-
-  ExpectFailure("optional_bool: true!\n", "Expected identifier, got: !", 1, 20);
-  ExpectFailure("\"some string\"", "Expected identifier, got: \"some string\"",
-                1, 1);
-}
-
-TEST_F(TextFormatParserTest, InvalidFieldName) {
-  ExpectFailure(
-      "invalid_field: somevalue\n",
-      "Message type \"protobuf_unittest.TestAllTypes\" has no field named "
-      "\"invalid_field\".",
-      1, 14);
-}
-
-TEST_F(TextFormatParserTest, InvalidCapitalization) {
-  // We require that group names be exactly as they appear in the .proto.
-  ExpectFailure(
-      "optionalgroup {\na: 15\n}\n",
-      "Message type \"protobuf_unittest.TestAllTypes\" has no field named "
-      "\"optionalgroup\".",
-      1, 15);
-  ExpectFailure(
-      "OPTIONALgroup {\na: 15\n}\n",
-      "Message type \"protobuf_unittest.TestAllTypes\" has no field named "
-      "\"OPTIONALgroup\".",
-      1, 15);
-  ExpectFailure(
-      "Optional_Double: 10.0\n",
-      "Message type \"protobuf_unittest.TestAllTypes\" has no field named "
-      "\"Optional_Double\".",
-      1, 16);
-}
-
-TEST_F(TextFormatParserTest, AllowIgnoreCapitalizationError) {
-  TextFormat::Parser parser;
-  protobuf_unittest::TestAllTypes proto;
-
-  // These fields have a mismatching case.
-  EXPECT_FALSE(parser.ParseFromString("Optional_Double: 10.0", &proto));
-  EXPECT_FALSE(parser.ParseFromString("oPtIoNaLgRoUp { a: 15 }", &proto));
-
-  // ... but are parsed correctly if we match case insensitive.
-  parser.AllowCaseInsensitiveField(true);
-  EXPECT_TRUE(parser.ParseFromString("Optional_Double: 10.0", &proto));
-  EXPECT_EQ(10.0, proto.optional_double());
-  EXPECT_TRUE(parser.ParseFromString("oPtIoNaLgRoUp { a: 15 }", &proto));
-  EXPECT_EQ(15, proto.optionalgroup().a());
-}
-
-TEST_F(TextFormatParserTest, InvalidFieldValues) {
-  // Invalid values for a double/float field.
-  ExpectFailure("optional_double: \"hello\"\n",
-                "Expected double, got: \"hello\"", 1, 18);
-  ExpectFailure("optional_double: true\n", "Expected double, got: true", 1, 18);
-  ExpectFailure("optional_double: !\n", "Expected double, got: !", 1, 18);
-  ExpectFailure("optional_double {\n  \n}\n", "Expected \":\", found \"{\".", 1,
-                17);
-
-  // Invalid values for a signed integer field.
-  ExpectFailure("optional_int32: \"hello\"\n",
-                "Expected integer, got: \"hello\"", 1, 17);
-  ExpectFailure("optional_int32: true\n", "Expected integer, got: true", 1, 17);
-  ExpectFailure("optional_int32: 4.5\n", "Expected integer, got: 4.5", 1, 17);
-  ExpectFailure("optional_int32: !\n", "Expected integer, got: !", 1, 17);
-  ExpectFailure("optional_int32 {\n \n}\n", "Expected \":\", found \"{\".", 1,
-                16);
-  ExpectFailure("optional_int32: 0x80000000\n",
-                "Integer out of range (0x80000000)", 1, 17);
-  ExpectFailure("optional_int64: 0x8000000000000000\n",
-                "Integer out of range (0x8000000000000000)", 1, 17);
-  ExpectFailure("optional_int32: -0x80000001\n",
-                "Integer out of range (0x80000001)", 1, 18);
-  ExpectFailure("optional_int64: -0x8000000000000001\n",
-                "Integer out of range (0x8000000000000001)", 1, 18);
-
-  // Invalid values for an unsigned integer field.
-  ExpectFailure("optional_uint64: \"hello\"\n",
-                "Expected integer, got: \"hello\"", 1, 18);
-  ExpectFailure("optional_uint64: true\n", "Expected integer, got: true", 1,
-                18);
-  ExpectFailure("optional_uint64: 4.5\n", "Expected integer, got: 4.5", 1, 18);
-  ExpectFailure("optional_uint64: -5\n", "Expected integer, got: -", 1, 18);
-  ExpectFailure("optional_uint64: !\n", "Expected integer, got: !", 1, 18);
-  ExpectFailure("optional_uint64 {\n \n}\n", "Expected \":\", found \"{\".", 1,
-                17);
-  ExpectFailure("optional_uint32: 0x100000000\n",
-                "Integer out of range (0x100000000)", 1, 18);
-  ExpectFailure("optional_uint64: 0x10000000000000000\n",
-                "Integer out of range (0x10000000000000000)", 1, 18);
-
-  // Invalid values for a boolean field.
-  ExpectFailure("optional_bool: \"hello\"\n",
-                "Expected identifier, got: \"hello\"", 1, 16);
-  ExpectFailure("optional_bool: 5\n", "Integer out of range (5)", 1, 16);
-  ExpectFailure("optional_bool: -7.5\n", "Expected identifier, got: -", 1, 16);
-  ExpectFailure("optional_bool: !\n", "Expected identifier, got: !", 1, 16);
-
-  ExpectFailure(
-      "optional_bool: meh\n",
-      "Invalid value for boolean field \"optional_bool\". Value: \"meh\".", 2,
-      1);
-
-  ExpectFailure("optional_bool {\n \n}\n", "Expected \":\", found \"{\".", 1,
-                15);
-
-  // Invalid values for a string field.
-  ExpectFailure("optional_string: true\n", "Expected string, got: true", 1, 18);
-  ExpectFailure("optional_string: 5\n", "Expected string, got: 5", 1, 18);
-  ExpectFailure("optional_string: -7.5\n", "Expected string, got: -", 1, 18);
-  ExpectFailure("optional_string: !\n", "Expected string, got: !", 1, 18);
-  ExpectFailure("optional_string {\n \n}\n", "Expected \":\", found \"{\".", 1,
-                17);
-
-  // Invalid values for an enumeration field.
-  ExpectFailure("optional_nested_enum: \"hello\"\n",
-                "Expected integer or identifier, got: \"hello\"", 1, 23);
-
-  // Valid token, but enum value is not defined.
-  ExpectFailure("optional_nested_enum: 5\n",
-                "Unknown enumeration value of \"5\" for field "
-                "\"optional_nested_enum\".",
-                2, 1);
-  // We consume the negative sign, so the error position starts one character
-  // later.
-  ExpectFailure("optional_nested_enum: -7.5\n", "Expected integer, got: 7.5", 1,
-                24);
-  ExpectFailure("optional_nested_enum: !\n",
-                "Expected integer or identifier, got: !", 1, 23);
-
-  ExpectFailure("optional_nested_enum: grah\n",
-                "Unknown enumeration value of \"grah\" for field "
-                "\"optional_nested_enum\".",
-                2, 1);
-
-  ExpectFailure("optional_nested_enum {\n \n}\n",
-                "Expected \":\", found \"{\".", 1, 22);
-}
-
-TEST_F(TextFormatParserTest, MessageDelimiters) {
-  // Non-matching delimiters.
-  ExpectFailure("OptionalGroup <\n \n}\n", "Expected \">\", found \"}\".", 3,
-                1);
-
-  // Invalid delimiters.
-  ExpectFailure("OptionalGroup [\n \n]\n", "Expected \"{\", found \"[\".", 1,
-                15);
-
-  // Unending message.
-  ExpectFailure("optional_nested_message {\n \nbb: 118\n",
-                "Expected identifier, got: ", 4, 1);
-}
-
-TEST_F(TextFormatParserTest, UnknownExtension) {
-  // Non-matching delimiters.
-  ExpectFailure("[blahblah]: 123",
-                "Extension \"blahblah\" is not defined or is not an "
-                "extension of \"protobuf_unittest.TestAllTypes\".",
-                1, 11);
-}
-
-TEST_F(TextFormatParserTest, MissingRequired) {
-  unittest::TestRequired message;
-  ExpectFailure("a: 1", "Message missing required fields: b, c", 0, 1,
-                &message);
-}
-
-TEST_F(TextFormatParserTest, ParseDuplicateRequired) {
-  unittest::TestRequired message;
-  ExpectFailure("a: 1 b: 2 c: 3 a: 1",
-                "Non-repeated field \"a\" is specified multiple times.", 1, 17,
-                &message);
-}
-
-TEST_F(TextFormatParserTest, ParseDuplicateOptional) {
-  unittest::ForeignMessage message;
-  ExpectFailure("c: 1 c: 2",
-                "Non-repeated field \"c\" is specified multiple times.", 1, 7,
-                &message);
-}
-
-TEST_F(TextFormatParserTest, MergeDuplicateRequired) {
-  unittest::TestRequired message;
-  TextFormat::Parser parser;
-  EXPECT_TRUE(parser.MergeFromString("a: 1 b: 2 c: 3 a: 4", &message));
-  EXPECT_EQ(4, message.a());
-}
-
-TEST_F(TextFormatParserTest, MergeDuplicateOptional) {
-  unittest::ForeignMessage message;
-  TextFormat::Parser parser;
-  EXPECT_TRUE(parser.MergeFromString("c: 1 c: 2", &message));
-  EXPECT_EQ(2, message.c());
-}
-
-TEST_F(TextFormatParserTest, ExplicitDelimiters) {
-  unittest::TestRequired message;
-  EXPECT_TRUE(TextFormat::ParseFromString("a:1,b:2;c:3", &message));
-  EXPECT_EQ(1, message.a());
-  EXPECT_EQ(2, message.b());
-  EXPECT_EQ(3, message.c());
-}
-
-TEST_F(TextFormatParserTest, PrintErrorsToStderr) {
-  std::vector<std::string> errors;
-
-  {
-    ScopedMemoryLog log;
-    unittest::TestAllTypes proto;
-    EXPECT_FALSE(TextFormat::ParseFromString("no_such_field: 1", &proto));
-    errors = log.GetMessages(ERROR);
-  }
-
-  ASSERT_EQ(1, errors.size());
-  EXPECT_EQ(
-      "Error parsing text-format protobuf_unittest.TestAllTypes: "
-      "1:14: Message type \"protobuf_unittest.TestAllTypes\" has no field "
-      "named \"no_such_field\".",
-      errors[0]);
-}
-
-TEST_F(TextFormatParserTest, FailsOnTokenizationError) {
-  std::vector<std::string> errors;
-
-  {
-    ScopedMemoryLog log;
-    unittest::TestAllTypes proto;
-    EXPECT_FALSE(TextFormat::ParseFromString("\020", &proto));
-    errors = log.GetMessages(ERROR);
-  }
-
-  ASSERT_EQ(1, errors.size());
-  EXPECT_EQ(
-      "Error parsing text-format protobuf_unittest.TestAllTypes: "
-      "1:1: Invalid control characters encountered in text.",
-      errors[0]);
-}
-
-TEST_F(TextFormatParserTest, ParseDeprecatedField) {
-  unittest::TestDeprecatedFields message;
-  ExpectMessage("deprecated_int32: 42",
-                "WARNING:text format contains deprecated field "
-                "\"deprecated_int32\"",
-                1, 21, &message, true);
-}
-
-TEST_F(TextFormatParserTest, SetRecursionLimit) {
-  const char* format = "child: { $0 }";
-  std::string input;
-  for (int i = 0; i < 100; ++i) input = strings::Substitute(format, input);
-
-  unittest::NestedTestAllTypes message;
-  ExpectSuccessAndTree(input, &message, nullptr);
-
-  input = strings::Substitute(format, input);
-  parser_.SetRecursionLimit(100);
-  ExpectMessage(input,
-                "Message is too deep, the parser exceeded the configured "
-                "recursion limit of 100.",
-                1, 908, &message, false);
-
-  parser_.SetRecursionLimit(101);
-  ExpectSuccessAndTree(input, &message, nullptr);
-}
-
-TEST_F(TextFormatParserTest, SetRecursionLimitUnknownFieldValue) {
-  const char* format = "[$0]";
-  std::string input = "\"test_value\"";
-  for (int i = 0; i < 99; ++i) input = strings::Substitute(format, input);
-  std::string not_deep_input = StrCat("unknown_nested_array: ", input);
-
-  parser_.AllowUnknownField(true);
-  parser_.SetRecursionLimit(100);
-
-  unittest::NestedTestAllTypes message;
-  ExpectSuccessAndTree(not_deep_input, &message, nullptr);
-
-  input = strings::Substitute(format, input);
-  std::string deep_input = StrCat("unknown_nested_array: ", input);
-  ExpectMessage(
-      deep_input,
-      "WARNING:Message type \"protobuf_unittest.NestedTestAllTypes\" has no "
-      "field named \"unknown_nested_array\".\n1:123: Message is too deep, the "
-      "parser exceeded the configured recursion limit of 100.",
-      1, 21, &message, false);
-
-  parser_.SetRecursionLimit(101);
-  ExpectSuccessAndTree(deep_input, &message, nullptr);
-}
-
-TEST_F(TextFormatParserTest, SetRecursionLimitUnknownFieldMessage) {
-  const char* format = "unknown_child: { $0 }";
-  std::string input;
-  for (int i = 0; i < 100; ++i) input = strings::Substitute(format, input);
-
-  parser_.AllowUnknownField(true);
-  parser_.SetRecursionLimit(100);
-
-  unittest::NestedTestAllTypes message;
-  ExpectSuccessAndTree(input, &message, nullptr);
-
-  input = strings::Substitute(format, input);
-  ExpectMessage(
-      input,
-      "WARNING:Message type \"protobuf_unittest.NestedTestAllTypes\" has no "
-      "field named \"unknown_child\".\n1:1716: Message is too deep, the parser "
-      "exceeded the configured recursion limit of 100.",
-      1, 14, &message, false);
-
-  parser_.SetRecursionLimit(101);
-  ExpectSuccessAndTree(input, &message, nullptr);
-}
-
-TEST_F(TextFormatParserTest, ParseAnyFieldWithAdditionalWhiteSpaces) {
-  Any any;
-  std::string parse_string =
-      "[type.googleapis.com/protobuf_unittest.TestAllTypes] \t :  \t {\n"
-      "  optional_int32: 321\n"
-      "  optional_string: \"teststr0\"\n"
-      "}\n";
-
-  ASSERT_TRUE(TextFormat::ParseFromString(parse_string, &any));
-
-  TextFormat::Printer printer;
-  printer.SetExpandAny(true);
-  std::string text;
-  ASSERT_TRUE(printer.PrintToString(any, &text));
-  EXPECT_EQ(text,
-            "[type.googleapis.com/protobuf_unittest.TestAllTypes] {\n"
-            "  optional_int32: 321\n"
-            "  optional_string: \"teststr0\"\n"
-            "}\n");
-}
-
-TEST_F(TextFormatParserTest, ParseExtensionFieldWithAdditionalWhiteSpaces) {
-  unittest::TestAllExtensions proto;
-  std::string parse_string =
-      "[protobuf_unittest.optional_int32_extension]   : \t 101\n"
-      "[protobuf_unittest.optional_int64_extension] \t : 102\n";
-
-  ASSERT_TRUE(TextFormat::ParseFromString(parse_string, &proto));
-
-  TextFormat::Printer printer;
-  std::string text;
-  ASSERT_TRUE(printer.PrintToString(proto, &text));
-  EXPECT_EQ(text,
-            "[protobuf_unittest.optional_int32_extension]: 101\n"
-            "[protobuf_unittest.optional_int64_extension]: 102\n");
-}
-
-TEST_F(TextFormatParserTest, ParseNormalFieldWithAdditionalWhiteSpaces) {
-  unittest::TestAllTypes proto;
-  std::string parse_string =
-      "repeated_int32  : \t 1\n"
-      "repeated_int32: 2\n"
-      "repeated_nested_message: {\n"
-      "  bb: 3\n"
-      "}\n"
-      "repeated_nested_message  : \t {\n"
-      "  bb: 4\n"
-      "}\n"
-      "repeated_nested_message     {\n"
-      "  bb: 5\n"
-      "}\n";
-
-  ASSERT_TRUE(TextFormat::ParseFromString(parse_string, &proto));
-
-  TextFormat::Printer printer;
-  std::string text;
-  ASSERT_TRUE(printer.PrintToString(proto, &text));
-  EXPECT_EQ(text,
-            "repeated_int32: 1\n"
-            "repeated_int32: 2\n"
-            "repeated_nested_message {\n"
-            "  bb: 3\n"
-            "}\n"
-            "repeated_nested_message {\n"
-            "  bb: 4\n"
-            "}\n"
-            "repeated_nested_message {\n"
-            "  bb: 5\n"
-            "}\n");
-}
-
-TEST_F(TextFormatParserTest, ParseSkippedFieldWithAdditionalWhiteSpaces) {
-  protobuf_unittest::TestAllTypes proto;
-  TextFormat::Parser parser;
-  parser.AllowUnknownField(true);
-  EXPECT_TRUE(
-      parser.ParseFromString("optional_int32: 321\n"
-                             "unknown_field1   : \t 12345\n"
-                             "[somewhere.unknown_extension1]   {\n"
-                             "  unknown_field2 \t :   12345\n"
-                             "}\n"
-                             "[somewhere.unknown_extension2]    : \t {\n"
-                             "  unknown_field3     \t :   12345\n"
-                             "  [somewhere.unknown_extension3]    \t :   {\n"
-                             "    unknown_field4:   10\n"
-                             "  }\n"
-                             "  [somewhere.unknown_extension4] \t {\n"
-                             "  }\n"
-                             "}\n",
-                             &proto));
-  std::string text;
-  TextFormat::Printer printer;
-  ASSERT_TRUE(printer.PrintToString(proto, &text));
-  EXPECT_EQ(text, "optional_int32: 321\n");
-}
-
-class TextFormatMessageSetTest : public testing::Test {
- protected:
-  static const char proto_text_format_[];
-};
-const char TextFormatMessageSetTest::proto_text_format_[] =
-    "message_set {\n"
-    "  [protobuf_unittest.TestMessageSetExtension1] {\n"
-    "    i: 23\n"
-    "  }\n"
-    "  [protobuf_unittest.TestMessageSetExtension2] {\n"
-    "    str: \"foo\"\n"
-    "  }\n"
-    "}\n";
-
-TEST_F(TextFormatMessageSetTest, Serialize) {
-  protobuf_unittest::TestMessageSetContainer proto;
-  protobuf_unittest::TestMessageSetExtension1* item_a =
-      proto.mutable_message_set()->MutableExtension(
-          protobuf_unittest::TestMessageSetExtension1::message_set_extension);
-  item_a->set_i(23);
-  protobuf_unittest::TestMessageSetExtension2* item_b =
-      proto.mutable_message_set()->MutableExtension(
-          protobuf_unittest::TestMessageSetExtension2::message_set_extension);
-  item_b->set_str("foo");
-  std::string actual_proto_text_format;
-  TextFormat::PrintToString(proto, &actual_proto_text_format);
-  EXPECT_EQ(proto_text_format_, actual_proto_text_format);
-}
-
-TEST_F(TextFormatMessageSetTest, Deserialize) {
-  protobuf_unittest::TestMessageSetContainer proto;
-  ASSERT_TRUE(TextFormat::ParseFromString(proto_text_format_, &proto));
-  EXPECT_EQ(
-      23,
-      proto.message_set()
-          .GetExtension(
-              protobuf_unittest::TestMessageSetExtension1::message_set_extension)
-          .i());
-  EXPECT_EQ(
-      "foo",
-      proto.message_set()
-          .GetExtension(
-              protobuf_unittest::TestMessageSetExtension2::message_set_extension)
-          .str());
-
-  // Ensure that these are the only entries present.
-  std::vector<const FieldDescriptor*> descriptors;
-  proto.message_set().GetReflection()->ListFields(proto.message_set(),
-                                                  &descriptors);
-  EXPECT_EQ(2, descriptors.size());
-}
-
-TEST(TextFormatUnknownFieldTest, TestUnknownField) {
-  protobuf_unittest::TestAllTypes proto;
-  TextFormat::Parser parser;
-  // Unknown field is not permitted by default.
-  EXPECT_FALSE(parser.ParseFromString("unknown_field: 12345", &proto));
-  EXPECT_FALSE(parser.ParseFromString("12345678: 12345", &proto));
-
-  parser.AllowUnknownField(true);
-  EXPECT_TRUE(parser.ParseFromString("unknown_field: 12345", &proto));
-  EXPECT_TRUE(parser.ParseFromString("unknown_field: -12345", &proto));
-  EXPECT_TRUE(parser.ParseFromString("unknown_field: 1.2345", &proto));
-  EXPECT_TRUE(parser.ParseFromString("unknown_field: -1.2345", &proto));
-  EXPECT_TRUE(parser.ParseFromString("unknown_field: 1.2345f", &proto));
-  EXPECT_TRUE(parser.ParseFromString("unknown_field: -1.2345f", &proto));
-  EXPECT_TRUE(parser.ParseFromString("unknown_field: inf", &proto));
-  EXPECT_TRUE(parser.ParseFromString("unknown_field: -inf", &proto));
-  EXPECT_TRUE(parser.ParseFromString("unknown_field: TYPE_STRING", &proto));
-  EXPECT_TRUE(
-      parser.ParseFromString("unknown_field: \"string value\"", &proto));
-  // Invalid field value
-  EXPECT_FALSE(parser.ParseFromString("unknown_field: -TYPE_STRING", &proto));
-  // Two or more unknown fields
-  EXPECT_TRUE(
-      parser.ParseFromString("unknown_field1: TYPE_STRING\n"
-                             "unknown_field2: 12345",
-                             &proto));
-  // Unknown nested message
-  EXPECT_TRUE(
-      parser.ParseFromString("unknown_message1: {}\n"
-                             "unknown_message2 {\n"
-                             "  unknown_field: 12345\n"
-                             "}\n"
-                             "unknown_message3 <\n"
-                             "  unknown_nested_message {\n"
-                             "    unknown_field: 12345\n"
-                             "  }\n"
-                             ">",
-                             &proto));
-  // Unmatched delimiters for message body
-  EXPECT_FALSE(parser.ParseFromString("unknown_message: {>", &proto));
-  // Unknown extension
-  EXPECT_TRUE(
-      parser.ParseFromString("[somewhere.unknown_extension1]: 12345\n"
-                             "[somewhere.unknown_extension2] {\n"
-                             "  unknown_field: 12345\n"
-                             "}",
-                             &proto));
-  // Unknown fields between known fields
-  ASSERT_TRUE(
-      parser.ParseFromString("optional_int32: 1\n"
-                             "unknown_field: 12345\n"
-                             "optional_string: \"string\"\n"
-                             "unknown_message { unknown: 0 }\n"
-                             "optional_nested_message { bb: 2 }",
-                             &proto));
-  EXPECT_EQ(1, proto.optional_int32());
-  EXPECT_EQ("string", proto.optional_string());
-  EXPECT_EQ(2, proto.optional_nested_message().bb());
-
-  // Unknown field with numeric tag number instead of identifier.
-  EXPECT_TRUE(parser.ParseFromString("12345678: 12345", &proto));
-
-  // Nested unknown extensions.
-  EXPECT_TRUE(
-      parser.ParseFromString("[test.extension1] <\n"
-                             "  unknown_nested_message <\n"
-                             "    [test.extension2] <\n"
-                             "      unknown_field: 12345\n"
-                             "    >\n"
-                             "  >\n"
-                             ">",
-                             &proto));
-  EXPECT_TRUE(
-      parser.ParseFromString("[test.extension1] {\n"
-                             "  unknown_nested_message {\n"
-                             "    [test.extension2] {\n"
-                             "      unknown_field: 12345\n"
-                             "    }\n"
-                             "  }\n"
-                             "}",
-                             &proto));
-  EXPECT_TRUE(
-      parser.ParseFromString("[test.extension1] <\n"
-                             "  some_unknown_fields: <\n"
-                             "    unknown_field: 12345\n"
-                             "  >\n"
-                             ">",
-                             &proto));
-  EXPECT_TRUE(
-      parser.ParseFromString("[test.extension1] {\n"
-                             "  some_unknown_fields: {\n"
-                             "    unknown_field: 12345\n"
-                             "  }\n"
-                             "}",
-                             &proto));
-
-  // Unknown field with compact repetition.
-  EXPECT_TRUE(parser.ParseFromString("unknown_field: [1, 2]", &proto));
-  // Unknown field with compact repetition of some unknown enum.
-  EXPECT_TRUE(parser.ParseFromString("unknown_field: [VAL1, VAL2]", &proto));
-  // Unknown field with compact repetition with sub-message.
-  EXPECT_TRUE(parser.ParseFromString("unknown_field: [{a:1}, <b:2>]", &proto));
-}
-
-TEST(TextFormatUnknownFieldTest, TestAnyInUnknownField) {
-  protobuf_unittest::TestAllTypes proto;
-  TextFormat::Parser parser;
-  parser.AllowUnknownField(true);
-  EXPECT_TRUE(
-      parser.ParseFromString("unknown {\n"
-                             "  [type.googleapis.com/foo.bar] {\n"
-                             "  }\n"
-                             "}",
-                             &proto));
-}
-
-TEST(TextFormatUnknownFieldTest, TestUnknownExtension) {
-  protobuf_unittest::TestAllTypes proto;
-  TextFormat::Parser parser;
-  std::string message_with_ext =
-      "[test.extension1] {\n"
-      "  some_unknown_fields: {\n"
-      "    unknown_field: 12345\n"
-      "  }\n"
-      "}";
-  // Unknown extensions are not permitted by default.
-  EXPECT_FALSE(parser.ParseFromString(message_with_ext, &proto));
-  // AllowUnknownField implies AllowUnknownExtension.
-  parser.AllowUnknownField(true);
-  EXPECT_TRUE(parser.ParseFromString(message_with_ext, &proto));
-
-  parser.AllowUnknownField(false);
-  EXPECT_FALSE(parser.ParseFromString(message_with_ext, &proto));
-  parser.AllowUnknownExtension(true);
-  EXPECT_TRUE(parser.ParseFromString(message_with_ext, &proto));
-  // Unknown fields are still not accepted.
-  EXPECT_FALSE(parser.ParseFromString("unknown_field: 1", &proto));
-}
-
-TEST(TextFormatFloatingPointTest, PreservesNegative0) {
-  proto3_unittest::TestAllTypes in_message;
-  in_message.set_optional_float(-0.0f);
-  in_message.set_optional_double(-0.0);
-  TextFormat::Printer printer;
-  std::string serialized;
-  EXPECT_TRUE(printer.PrintToString(in_message, &serialized));
-  proto3_unittest::TestAllTypes out_message;
-  TextFormat::Parser parser;
-  EXPECT_TRUE(parser.ParseFromString(serialized, &out_message));
-  EXPECT_EQ(in_message.optional_float(), out_message.optional_float());
-  EXPECT_EQ(std::signbit(in_message.optional_float()),
-            std::signbit(out_message.optional_float()));
-  EXPECT_EQ(in_message.optional_double(), out_message.optional_double());
-  EXPECT_EQ(std::signbit(in_message.optional_double()),
-            std::signbit(out_message.optional_double()));
-}
-
-}  // namespace text_format_unittest
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
diff --git a/libs/protobuf/src/google/protobuf/timestamp.pb.cc b/libs/protobuf/src/google/protobuf/timestamp.pb.cc
deleted file mode 100644
index 728a004..0000000
--- a/libs/protobuf/src/google/protobuf/timestamp.pb.cc
+++ /dev/null
@@ -1,307 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/protobuf/timestamp.proto
-
-#include <google/protobuf/timestamp.pb.h>
-
-#include <algorithm>
-
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/extension_set.h>
-#include <google/protobuf/wire_format_lite.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/generated_message_reflection.h>
-#include <google/protobuf/reflection_ops.h>
-#include <google/protobuf/wire_format.h>
-// @@protoc_insertion_point(includes)
-#include <google/protobuf/port_def.inc>
-
-PROTOBUF_PRAGMA_INIT_SEG
-
-namespace _pb = ::PROTOBUF_NAMESPACE_ID;
-namespace _pbi = _pb::internal;
-
-PROTOBUF_NAMESPACE_OPEN
-PROTOBUF_CONSTEXPR Timestamp::Timestamp(
-    ::_pbi::ConstantInitialized): _impl_{
-    /*decltype(_impl_.seconds_)*/int64_t{0}
-  , /*decltype(_impl_.nanos_)*/0
-  , /*decltype(_impl_._cached_size_)*/{}} {}
-struct TimestampDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR TimestampDefaultTypeInternal()
-      : _instance(::_pbi::ConstantInitialized{}) {}
-  ~TimestampDefaultTypeInternal() {}
-  union {
-    Timestamp _instance;
-  };
-};
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 TimestampDefaultTypeInternal _Timestamp_default_instance_;
-PROTOBUF_NAMESPACE_CLOSE
-static ::_pb::Metadata file_level_metadata_google_2fprotobuf_2ftimestamp_2eproto[1];
-static constexpr ::_pb::EnumDescriptor const** file_level_enum_descriptors_google_2fprotobuf_2ftimestamp_2eproto = nullptr;
-static constexpr ::_pb::ServiceDescriptor const** file_level_service_descriptors_google_2fprotobuf_2ftimestamp_2eproto = nullptr;
-
-const uint32_t TableStruct_google_2fprotobuf_2ftimestamp_2eproto::offsets[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = {
-  ~0u,  // no _has_bits_
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Timestamp, _internal_metadata_),
-  ~0u,  // no _extensions_
-  ~0u,  // no _oneof_case_
-  ~0u,  // no _weak_field_map_
-  ~0u,  // no _inlined_string_donated_
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Timestamp, _impl_.seconds_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Timestamp, _impl_.nanos_),
-};
-static const ::_pbi::MigrationSchema schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = {
-  { 0, -1, -1, sizeof(::PROTOBUF_NAMESPACE_ID::Timestamp)},
-};
-
-static const ::_pb::Message* const file_default_instances[] = {
-  &::PROTOBUF_NAMESPACE_ID::_Timestamp_default_instance_._instance,
-};
-
-const char descriptor_table_protodef_google_2fprotobuf_2ftimestamp_2eproto[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) =
-  "\n\037google/protobuf/timestamp.proto\022\017googl"
-  "e.protobuf\"+\n\tTimestamp\022\017\n\007seconds\030\001 \001(\003"
-  "\022\r\n\005nanos\030\002 \001(\005B\205\001\n\023com.google.protobufB"
-  "\016TimestampProtoP\001Z2google.golang.org/pro"
-  "tobuf/types/known/timestamppb\370\001\001\242\002\003GPB\252\002"
-  "\036Google.Protobuf.WellKnownTypesb\006proto3"
-  ;
-static ::_pbi::once_flag descriptor_table_google_2fprotobuf_2ftimestamp_2eproto_once;
-const ::_pbi::DescriptorTable descriptor_table_google_2fprotobuf_2ftimestamp_2eproto = {
-    false, false, 239, descriptor_table_protodef_google_2fprotobuf_2ftimestamp_2eproto,
-    "google/protobuf/timestamp.proto",
-    &descriptor_table_google_2fprotobuf_2ftimestamp_2eproto_once, nullptr, 0, 1,
-    schemas, file_default_instances, TableStruct_google_2fprotobuf_2ftimestamp_2eproto::offsets,
-    file_level_metadata_google_2fprotobuf_2ftimestamp_2eproto, file_level_enum_descriptors_google_2fprotobuf_2ftimestamp_2eproto,
-    file_level_service_descriptors_google_2fprotobuf_2ftimestamp_2eproto,
-};
-PROTOBUF_ATTRIBUTE_WEAK const ::_pbi::DescriptorTable* descriptor_table_google_2fprotobuf_2ftimestamp_2eproto_getter() {
-  return &descriptor_table_google_2fprotobuf_2ftimestamp_2eproto;
-}
-
-// Force running AddDescriptors() at dynamic initialization time.
-PROTOBUF_ATTRIBUTE_INIT_PRIORITY2 static ::_pbi::AddDescriptorsRunner dynamic_init_dummy_google_2fprotobuf_2ftimestamp_2eproto(&descriptor_table_google_2fprotobuf_2ftimestamp_2eproto);
-PROTOBUF_NAMESPACE_OPEN
-
-// ===================================================================
-
-class Timestamp::_Internal {
- public:
-};
-
-Timestamp::Timestamp(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                         bool is_message_owned)
-  : ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned) {
-  SharedCtor(arena, is_message_owned);
-  // @@protoc_insertion_point(arena_constructor:google.protobuf.Timestamp)
-}
-Timestamp::Timestamp(const Timestamp& from)
-  : ::PROTOBUF_NAMESPACE_ID::Message() {
-  Timestamp* const _this = this; (void)_this;
-  new (&_impl_) Impl_{
-      decltype(_impl_.seconds_){}
-    , decltype(_impl_.nanos_){}
-    , /*decltype(_impl_._cached_size_)*/{}};
-
-  _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-  ::memcpy(&_impl_.seconds_, &from._impl_.seconds_,
-    static_cast<size_t>(reinterpret_cast<char*>(&_impl_.nanos_) -
-    reinterpret_cast<char*>(&_impl_.seconds_)) + sizeof(_impl_.nanos_));
-  // @@protoc_insertion_point(copy_constructor:google.protobuf.Timestamp)
-}
-
-inline void Timestamp::SharedCtor(
-    ::_pb::Arena* arena, bool is_message_owned) {
-  (void)arena;
-  (void)is_message_owned;
-  new (&_impl_) Impl_{
-      decltype(_impl_.seconds_){int64_t{0}}
-    , decltype(_impl_.nanos_){0}
-    , /*decltype(_impl_._cached_size_)*/{}
-  };
-}
-
-Timestamp::~Timestamp() {
-  // @@protoc_insertion_point(destructor:google.protobuf.Timestamp)
-  if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) {
-  (void)arena;
-    return;
-  }
-  SharedDtor();
-}
-
-inline void Timestamp::SharedDtor() {
-  GOOGLE_DCHECK(GetArenaForAllocation() == nullptr);
-}
-
-void Timestamp::SetCachedSize(int size) const {
-  _impl_._cached_size_.Set(size);
-}
-
-void Timestamp::Clear() {
-// @@protoc_insertion_point(message_clear_start:google.protobuf.Timestamp)
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  ::memset(&_impl_.seconds_, 0, static_cast<size_t>(
-      reinterpret_cast<char*>(&_impl_.nanos_) -
-      reinterpret_cast<char*>(&_impl_.seconds_)) + sizeof(_impl_.nanos_));
-  _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>();
-}
-
-const char* Timestamp::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) {
-#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure
-  while (!ctx->Done(&ptr)) {
-    uint32_t tag;
-    ptr = ::_pbi::ReadTag(ptr, &tag);
-    switch (tag >> 3) {
-      // int64 seconds = 1;
-      case 1:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 8)) {
-          _impl_.seconds_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr);
-          CHK_(ptr);
-        } else
-          goto handle_unusual;
-        continue;
-      // int32 nanos = 2;
-      case 2:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 16)) {
-          _impl_.nanos_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr);
-          CHK_(ptr);
-        } else
-          goto handle_unusual;
-        continue;
-      default:
-        goto handle_unusual;
-    }  // switch
-  handle_unusual:
-    if ((tag == 0) || ((tag & 7) == 4)) {
-      CHK_(ptr);
-      ctx->SetLastTag(tag);
-      goto message_done;
-    }
-    ptr = UnknownFieldParse(
-        tag,
-        _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(),
-        ptr, ctx);
-    CHK_(ptr != nullptr);
-  }  // while
-message_done:
-  return ptr;
-failure:
-  ptr = nullptr;
-  goto message_done;
-#undef CHK_
-}
-
-uint8_t* Timestamp::_InternalSerialize(
-    uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.Timestamp)
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  // int64 seconds = 1;
-  if (this->_internal_seconds() != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteInt64ToArray(1, this->_internal_seconds(), target);
-  }
-
-  // int32 nanos = 2;
-  if (this->_internal_nanos() != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteInt32ToArray(2, this->_internal_nanos(), target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-        _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.Timestamp)
-  return target;
-}
-
-size_t Timestamp::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:google.protobuf.Timestamp)
-  size_t total_size = 0;
-
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // int64 seconds = 1;
-  if (this->_internal_seconds() != 0) {
-    total_size += ::_pbi::WireFormatLite::Int64SizePlusOne(this->_internal_seconds());
-  }
-
-  // int32 nanos = 2;
-  if (this->_internal_nanos() != 0) {
-    total_size += ::_pbi::WireFormatLite::Int32SizePlusOne(this->_internal_nanos());
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData Timestamp::_class_data_ = {
-    ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck,
-    Timestamp::MergeImpl
-};
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*Timestamp::GetClassData() const { return &_class_data_; }
-
-
-void Timestamp::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) {
-  auto* const _this = static_cast<Timestamp*>(&to_msg);
-  auto& from = static_cast<const Timestamp&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.Timestamp)
-  GOOGLE_DCHECK_NE(&from, _this);
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if (from._internal_seconds() != 0) {
-    _this->_internal_set_seconds(from._internal_seconds());
-  }
-  if (from._internal_nanos() != 0) {
-    _this->_internal_set_nanos(from._internal_nanos());
-  }
-  _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void Timestamp::CopyFrom(const Timestamp& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.Timestamp)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool Timestamp::IsInitialized() const {
-  return true;
-}
-
-void Timestamp::InternalSwap(Timestamp* other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  ::PROTOBUF_NAMESPACE_ID::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(Timestamp, _impl_.nanos_)
-      + sizeof(Timestamp::_impl_.nanos_)
-      - PROTOBUF_FIELD_OFFSET(Timestamp, _impl_.seconds_)>(
-          reinterpret_cast<char*>(&_impl_.seconds_),
-          reinterpret_cast<char*>(&other->_impl_.seconds_));
-}
-
-::PROTOBUF_NAMESPACE_ID::Metadata Timestamp::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_google_2fprotobuf_2ftimestamp_2eproto_getter, &descriptor_table_google_2fprotobuf_2ftimestamp_2eproto_once,
-      file_level_metadata_google_2fprotobuf_2ftimestamp_2eproto[0]);
-}
-
-// @@protoc_insertion_point(namespace_scope)
-PROTOBUF_NAMESPACE_CLOSE
-PROTOBUF_NAMESPACE_OPEN
-template<> PROTOBUF_NOINLINE ::PROTOBUF_NAMESPACE_ID::Timestamp*
-Arena::CreateMaybeMessage< ::PROTOBUF_NAMESPACE_ID::Timestamp >(Arena* arena) {
-  return Arena::CreateMessageInternal< ::PROTOBUF_NAMESPACE_ID::Timestamp >(arena);
-}
-PROTOBUF_NAMESPACE_CLOSE
-
-// @@protoc_insertion_point(global_scope)
-#include <google/protobuf/port_undef.inc>
diff --git a/libs/protobuf/src/google/protobuf/timestamp.pb.h b/libs/protobuf/src/google/protobuf/timestamp.pb.h
deleted file mode 100644
index 540194b..0000000
--- a/libs/protobuf/src/google/protobuf/timestamp.pb.h
+++ /dev/null
@@ -1,278 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/protobuf/timestamp.proto
-
-#ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2ftimestamp_2eproto
-#define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2ftimestamp_2eproto
-
-#include <limits>
-#include <string>
-
-#include <google/protobuf/port_def.inc>
-#if PROTOBUF_VERSION < 3021000
-#error This file was generated by a newer version of protoc which is
-#error incompatible with your Protocol Buffer headers. Please update
-#error your headers.
-#endif
-#if 3021012 < PROTOBUF_MIN_PROTOC_VERSION
-#error This file was generated by an older version of protoc which is
-#error incompatible with your Protocol Buffer headers. Please
-#error regenerate this file with a newer version of protoc.
-#endif
-
-#include <google/protobuf/port_undef.inc>
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/arena.h>
-#include <google/protobuf/arenastring.h>
-#include <google/protobuf/generated_message_util.h>
-#include <google/protobuf/metadata_lite.h>
-#include <google/protobuf/generated_message_reflection.h>
-#include <google/protobuf/message.h>
-#include <google/protobuf/repeated_field.h>  // IWYU pragma: export
-#include <google/protobuf/extension_set.h>  // IWYU pragma: export
-#include <google/protobuf/unknown_field_set.h>
-// @@protoc_insertion_point(includes)
-#include <google/protobuf/port_def.inc>
-#define PROTOBUF_INTERNAL_EXPORT_google_2fprotobuf_2ftimestamp_2eproto PROTOBUF_EXPORT
-PROTOBUF_NAMESPACE_OPEN
-namespace internal {
-class AnyMetadata;
-}  // namespace internal
-PROTOBUF_NAMESPACE_CLOSE
-
-// Internal implementation detail -- do not use these members.
-struct PROTOBUF_EXPORT TableStruct_google_2fprotobuf_2ftimestamp_2eproto {
-  static const uint32_t offsets[];
-};
-PROTOBUF_EXPORT extern const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable descriptor_table_google_2fprotobuf_2ftimestamp_2eproto;
-PROTOBUF_NAMESPACE_OPEN
-class Timestamp;
-struct TimestampDefaultTypeInternal;
-PROTOBUF_EXPORT extern TimestampDefaultTypeInternal _Timestamp_default_instance_;
-PROTOBUF_NAMESPACE_CLOSE
-PROTOBUF_NAMESPACE_OPEN
-template<> PROTOBUF_EXPORT ::PROTOBUF_NAMESPACE_ID::Timestamp* Arena::CreateMaybeMessage<::PROTOBUF_NAMESPACE_ID::Timestamp>(Arena*);
-PROTOBUF_NAMESPACE_CLOSE
-PROTOBUF_NAMESPACE_OPEN
-
-// ===================================================================
-
-class PROTOBUF_EXPORT Timestamp final :
-    public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:google.protobuf.Timestamp) */ {
- public:
-  inline Timestamp() : Timestamp(nullptr) {}
-  ~Timestamp() override;
-  explicit PROTOBUF_CONSTEXPR Timestamp(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
-
-  Timestamp(const Timestamp& from);
-  Timestamp(Timestamp&& from) noexcept
-    : Timestamp() {
-    *this = ::std::move(from);
-  }
-
-  inline Timestamp& operator=(const Timestamp& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline Timestamp& operator=(Timestamp&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetOwningArena() == from.GetOwningArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetOwningArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const Timestamp& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const Timestamp* internal_default_instance() {
-    return reinterpret_cast<const Timestamp*>(
-               &_Timestamp_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    0;
-
-  friend void swap(Timestamp& a, Timestamp& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(Timestamp* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() != nullptr &&
-        GetOwningArena() == other->GetOwningArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() == other->GetOwningArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(Timestamp* other) {
-    if (other == this) return;
-    GOOGLE_DCHECK(GetOwningArena() == other->GetOwningArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  Timestamp* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<Timestamp>(arena);
-  }
-  using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
-  void CopyFrom(const Timestamp& from);
-  using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom( const Timestamp& from) {
-    Timestamp::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  uint8_t* _InternalSerialize(
-      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
-
-  private:
-  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
-  void SharedDtor();
-  void SetCachedSize(int size) const final;
-  void InternalSwap(Timestamp* other);
-
-  private:
-  friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
-  static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
-    return "google.protobuf.Timestamp";
-  }
-  protected:
-  explicit Timestamp(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                       bool is_message_owned = false);
-  public:
-
-  static const ClassData _class_data_;
-  const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*GetClassData() const final;
-
-  ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kSecondsFieldNumber = 1,
-    kNanosFieldNumber = 2,
-  };
-  // int64 seconds = 1;
-  void clear_seconds();
-  int64_t seconds() const;
-  void set_seconds(int64_t value);
-  private:
-  int64_t _internal_seconds() const;
-  void _internal_set_seconds(int64_t value);
-  public:
-
-  // int32 nanos = 2;
-  void clear_nanos();
-  int32_t nanos() const;
-  void set_nanos(int32_t value);
-  private:
-  int32_t _internal_nanos() const;
-  void _internal_set_nanos(int32_t value);
-  public:
-
-  // @@protoc_insertion_point(class_scope:google.protobuf.Timestamp)
- private:
-  class _Internal;
-
-  template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
-  typedef void InternalArenaConstructable_;
-  typedef void DestructorSkippable_;
-  struct Impl_ {
-    int64_t seconds_;
-    int32_t nanos_;
-    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_google_2fprotobuf_2ftimestamp_2eproto;
-};
-// ===================================================================
-
-
-// ===================================================================
-
-#ifdef __GNUC__
-  #pragma GCC diagnostic push
-  #pragma GCC diagnostic ignored "-Wstrict-aliasing"
-#endif  // __GNUC__
-// Timestamp
-
-// int64 seconds = 1;
-inline void Timestamp::clear_seconds() {
-  _impl_.seconds_ = int64_t{0};
-}
-inline int64_t Timestamp::_internal_seconds() const {
-  return _impl_.seconds_;
-}
-inline int64_t Timestamp::seconds() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.Timestamp.seconds)
-  return _internal_seconds();
-}
-inline void Timestamp::_internal_set_seconds(int64_t value) {
-  
-  _impl_.seconds_ = value;
-}
-inline void Timestamp::set_seconds(int64_t value) {
-  _internal_set_seconds(value);
-  // @@protoc_insertion_point(field_set:google.protobuf.Timestamp.seconds)
-}
-
-// int32 nanos = 2;
-inline void Timestamp::clear_nanos() {
-  _impl_.nanos_ = 0;
-}
-inline int32_t Timestamp::_internal_nanos() const {
-  return _impl_.nanos_;
-}
-inline int32_t Timestamp::nanos() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.Timestamp.nanos)
-  return _internal_nanos();
-}
-inline void Timestamp::_internal_set_nanos(int32_t value) {
-  
-  _impl_.nanos_ = value;
-}
-inline void Timestamp::set_nanos(int32_t value) {
-  _internal_set_nanos(value);
-  // @@protoc_insertion_point(field_set:google.protobuf.Timestamp.nanos)
-}
-
-#ifdef __GNUC__
-  #pragma GCC diagnostic pop
-#endif  // __GNUC__
-
-// @@protoc_insertion_point(namespace_scope)
-
-PROTOBUF_NAMESPACE_CLOSE
-
-// @@protoc_insertion_point(global_scope)
-
-#include <google/protobuf/port_undef.inc>
-#endif  // GOOGLE_PROTOBUF_INCLUDED_GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2ftimestamp_2eproto
diff --git a/libs/protobuf/src/google/protobuf/timestamp.proto b/libs/protobuf/src/google/protobuf/timestamp.proto
deleted file mode 100644
index 3b2df6d..0000000
--- a/libs/protobuf/src/google/protobuf/timestamp.proto
+++ /dev/null
@@ -1,147 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto3";
-
-package google.protobuf;
-
-option csharp_namespace = "Google.Protobuf.WellKnownTypes";
-option cc_enable_arenas = true;
-option go_package = "google.golang.org/protobuf/types/known/timestamppb";
-option java_package = "com.google.protobuf";
-option java_outer_classname = "TimestampProto";
-option java_multiple_files = true;
-option objc_class_prefix = "GPB";
-
-// A Timestamp represents a point in time independent of any time zone or local
-// calendar, encoded as a count of seconds and fractions of seconds at
-// nanosecond resolution. The count is relative to an epoch at UTC midnight on
-// January 1, 1970, in the proleptic Gregorian calendar which extends the
-// Gregorian calendar backwards to year one.
-//
-// All minutes are 60 seconds long. Leap seconds are "smeared" so that no leap
-// second table is needed for interpretation, using a [24-hour linear
-// smear](https://developers.google.com/time/smear).
-//
-// The range is from 0001-01-01T00:00:00Z to 9999-12-31T23:59:59.999999999Z. By
-// restricting to that range, we ensure that we can convert to and from [RFC
-// 3339](https://www.ietf.org/rfc/rfc3339.txt) date strings.
-//
-// # Examples
-//
-// Example 1: Compute Timestamp from POSIX `time()`.
-//
-//     Timestamp timestamp;
-//     timestamp.set_seconds(time(NULL));
-//     timestamp.set_nanos(0);
-//
-// Example 2: Compute Timestamp from POSIX `gettimeofday()`.
-//
-//     struct timeval tv;
-//     gettimeofday(&tv, NULL);
-//
-//     Timestamp timestamp;
-//     timestamp.set_seconds(tv.tv_sec);
-//     timestamp.set_nanos(tv.tv_usec * 1000);
-//
-// Example 3: Compute Timestamp from Win32 `GetSystemTimeAsFileTime()`.
-//
-//     FILETIME ft;
-//     GetSystemTimeAsFileTime(&ft);
-//     UINT64 ticks = (((UINT64)ft.dwHighDateTime) << 32) | ft.dwLowDateTime;
-//
-//     // A Windows tick is 100 nanoseconds. Windows epoch 1601-01-01T00:00:00Z
-//     // is 11644473600 seconds before Unix epoch 1970-01-01T00:00:00Z.
-//     Timestamp timestamp;
-//     timestamp.set_seconds((INT64) ((ticks / 10000000) - 11644473600LL));
-//     timestamp.set_nanos((INT32) ((ticks % 10000000) * 100));
-//
-// Example 4: Compute Timestamp from Java `System.currentTimeMillis()`.
-//
-//     long millis = System.currentTimeMillis();
-//
-//     Timestamp timestamp = Timestamp.newBuilder().setSeconds(millis / 1000)
-//         .setNanos((int) ((millis % 1000) * 1000000)).build();
-//
-//
-// Example 5: Compute Timestamp from Java `Instant.now()`.
-//
-//     Instant now = Instant.now();
-//
-//     Timestamp timestamp =
-//         Timestamp.newBuilder().setSeconds(now.getEpochSecond())
-//             .setNanos(now.getNano()).build();
-//
-//
-// Example 6: Compute Timestamp from current time in Python.
-//
-//     timestamp = Timestamp()
-//     timestamp.GetCurrentTime()
-//
-// # JSON Mapping
-//
-// In JSON format, the Timestamp type is encoded as a string in the
-// [RFC 3339](https://www.ietf.org/rfc/rfc3339.txt) format. That is, the
-// format is "{year}-{month}-{day}T{hour}:{min}:{sec}[.{frac_sec}]Z"
-// where {year} is always expressed using four digits while {month}, {day},
-// {hour}, {min}, and {sec} are zero-padded to two digits each. The fractional
-// seconds, which can go up to 9 digits (i.e. up to 1 nanosecond resolution),
-// are optional. The "Z" suffix indicates the timezone ("UTC"); the timezone
-// is required. A proto3 JSON serializer should always use UTC (as indicated by
-// "Z") when printing the Timestamp type and a proto3 JSON parser should be
-// able to accept both UTC and other timezones (as indicated by an offset).
-//
-// For example, "2017-01-15T01:30:15.01Z" encodes 15.01 seconds past
-// 01:30 UTC on January 15, 2017.
-//
-// In JavaScript, one can convert a Date object to this format using the
-// standard
-// [toISOString()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/toISOString)
-// method. In Python, a standard `datetime.datetime` object can be converted
-// to this format using
-// [`strftime`](https://docs.python.org/2/library/time.html#time.strftime) with
-// the time format spec '%Y-%m-%dT%H:%M:%S.%fZ'. Likewise, in Java, one can use
-// the Joda Time's [`ISODateTimeFormat.dateTime()`](
-// http://www.joda.org/joda-time/apidocs/org/joda/time/format/ISODateTimeFormat.html#dateTime%2D%2D
-// ) to obtain a formatter capable of generating timestamps in this format.
-//
-//
-message Timestamp {
-  // Represents seconds of UTC time since Unix epoch
-  // 1970-01-01T00:00:00Z. Must be from 0001-01-01T00:00:00Z to
-  // 9999-12-31T23:59:59Z inclusive.
-  int64 seconds = 1;
-
-  // Non-negative fractions of a second at nanosecond resolution. Negative
-  // second values with fractions must still have non-negative nanos values
-  // that count forward in time. Must be from 0 to 999,999,999
-  // inclusive.
-  int32 nanos = 2;
-}
diff --git a/libs/protobuf/src/google/protobuf/type.pb.cc b/libs/protobuf/src/google/protobuf/type.pb.cc
deleted file mode 100644
index e29bbb8..0000000
--- a/libs/protobuf/src/google/protobuf/type.pb.cc
+++ /dev/null
@@ -1,2157 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/protobuf/type.proto
-
-#include <google/protobuf/type.pb.h>
-
-#include <algorithm>
-
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/extension_set.h>
-#include <google/protobuf/wire_format_lite.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/generated_message_reflection.h>
-#include <google/protobuf/reflection_ops.h>
-#include <google/protobuf/wire_format.h>
-// @@protoc_insertion_point(includes)
-#include <google/protobuf/port_def.inc>
-
-PROTOBUF_PRAGMA_INIT_SEG
-
-namespace _pb = ::PROTOBUF_NAMESPACE_ID;
-namespace _pbi = _pb::internal;
-
-PROTOBUF_NAMESPACE_OPEN
-PROTOBUF_CONSTEXPR Type::Type(
-    ::_pbi::ConstantInitialized): _impl_{
-    /*decltype(_impl_.fields_)*/{}
-  , /*decltype(_impl_.oneofs_)*/{}
-  , /*decltype(_impl_.options_)*/{}
-  , /*decltype(_impl_.name_)*/{&::_pbi::fixed_address_empty_string, ::_pbi::ConstantInitialized{}}
-  , /*decltype(_impl_.source_context_)*/nullptr
-  , /*decltype(_impl_.syntax_)*/0
-  , /*decltype(_impl_._cached_size_)*/{}} {}
-struct TypeDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR TypeDefaultTypeInternal()
-      : _instance(::_pbi::ConstantInitialized{}) {}
-  ~TypeDefaultTypeInternal() {}
-  union {
-    Type _instance;
-  };
-};
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 TypeDefaultTypeInternal _Type_default_instance_;
-PROTOBUF_CONSTEXPR Field::Field(
-    ::_pbi::ConstantInitialized): _impl_{
-    /*decltype(_impl_.options_)*/{}
-  , /*decltype(_impl_.name_)*/{&::_pbi::fixed_address_empty_string, ::_pbi::ConstantInitialized{}}
-  , /*decltype(_impl_.type_url_)*/{&::_pbi::fixed_address_empty_string, ::_pbi::ConstantInitialized{}}
-  , /*decltype(_impl_.json_name_)*/{&::_pbi::fixed_address_empty_string, ::_pbi::ConstantInitialized{}}
-  , /*decltype(_impl_.default_value_)*/{&::_pbi::fixed_address_empty_string, ::_pbi::ConstantInitialized{}}
-  , /*decltype(_impl_.kind_)*/0
-  , /*decltype(_impl_.cardinality_)*/0
-  , /*decltype(_impl_.number_)*/0
-  , /*decltype(_impl_.oneof_index_)*/0
-  , /*decltype(_impl_.packed_)*/false
-  , /*decltype(_impl_._cached_size_)*/{}} {}
-struct FieldDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR FieldDefaultTypeInternal()
-      : _instance(::_pbi::ConstantInitialized{}) {}
-  ~FieldDefaultTypeInternal() {}
-  union {
-    Field _instance;
-  };
-};
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 FieldDefaultTypeInternal _Field_default_instance_;
-PROTOBUF_CONSTEXPR Enum::Enum(
-    ::_pbi::ConstantInitialized): _impl_{
-    /*decltype(_impl_.enumvalue_)*/{}
-  , /*decltype(_impl_.options_)*/{}
-  , /*decltype(_impl_.name_)*/{&::_pbi::fixed_address_empty_string, ::_pbi::ConstantInitialized{}}
-  , /*decltype(_impl_.source_context_)*/nullptr
-  , /*decltype(_impl_.syntax_)*/0
-  , /*decltype(_impl_._cached_size_)*/{}} {}
-struct EnumDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR EnumDefaultTypeInternal()
-      : _instance(::_pbi::ConstantInitialized{}) {}
-  ~EnumDefaultTypeInternal() {}
-  union {
-    Enum _instance;
-  };
-};
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 EnumDefaultTypeInternal _Enum_default_instance_;
-PROTOBUF_CONSTEXPR EnumValue::EnumValue(
-    ::_pbi::ConstantInitialized): _impl_{
-    /*decltype(_impl_.options_)*/{}
-  , /*decltype(_impl_.name_)*/{&::_pbi::fixed_address_empty_string, ::_pbi::ConstantInitialized{}}
-  , /*decltype(_impl_.number_)*/0
-  , /*decltype(_impl_._cached_size_)*/{}} {}
-struct EnumValueDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR EnumValueDefaultTypeInternal()
-      : _instance(::_pbi::ConstantInitialized{}) {}
-  ~EnumValueDefaultTypeInternal() {}
-  union {
-    EnumValue _instance;
-  };
-};
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 EnumValueDefaultTypeInternal _EnumValue_default_instance_;
-PROTOBUF_CONSTEXPR Option::Option(
-    ::_pbi::ConstantInitialized): _impl_{
-    /*decltype(_impl_.name_)*/{&::_pbi::fixed_address_empty_string, ::_pbi::ConstantInitialized{}}
-  , /*decltype(_impl_.value_)*/nullptr
-  , /*decltype(_impl_._cached_size_)*/{}} {}
-struct OptionDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR OptionDefaultTypeInternal()
-      : _instance(::_pbi::ConstantInitialized{}) {}
-  ~OptionDefaultTypeInternal() {}
-  union {
-    Option _instance;
-  };
-};
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 OptionDefaultTypeInternal _Option_default_instance_;
-PROTOBUF_NAMESPACE_CLOSE
-static ::_pb::Metadata file_level_metadata_google_2fprotobuf_2ftype_2eproto[5];
-static const ::_pb::EnumDescriptor* file_level_enum_descriptors_google_2fprotobuf_2ftype_2eproto[3];
-static constexpr ::_pb::ServiceDescriptor const** file_level_service_descriptors_google_2fprotobuf_2ftype_2eproto = nullptr;
-
-const uint32_t TableStruct_google_2fprotobuf_2ftype_2eproto::offsets[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = {
-  ~0u,  // no _has_bits_
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Type, _internal_metadata_),
-  ~0u,  // no _extensions_
-  ~0u,  // no _oneof_case_
-  ~0u,  // no _weak_field_map_
-  ~0u,  // no _inlined_string_donated_
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Type, _impl_.name_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Type, _impl_.fields_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Type, _impl_.oneofs_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Type, _impl_.options_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Type, _impl_.source_context_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Type, _impl_.syntax_),
-  ~0u,  // no _has_bits_
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Field, _internal_metadata_),
-  ~0u,  // no _extensions_
-  ~0u,  // no _oneof_case_
-  ~0u,  // no _weak_field_map_
-  ~0u,  // no _inlined_string_donated_
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Field, _impl_.kind_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Field, _impl_.cardinality_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Field, _impl_.number_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Field, _impl_.name_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Field, _impl_.type_url_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Field, _impl_.oneof_index_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Field, _impl_.packed_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Field, _impl_.options_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Field, _impl_.json_name_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Field, _impl_.default_value_),
-  ~0u,  // no _has_bits_
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Enum, _internal_metadata_),
-  ~0u,  // no _extensions_
-  ~0u,  // no _oneof_case_
-  ~0u,  // no _weak_field_map_
-  ~0u,  // no _inlined_string_donated_
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Enum, _impl_.name_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Enum, _impl_.enumvalue_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Enum, _impl_.options_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Enum, _impl_.source_context_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Enum, _impl_.syntax_),
-  ~0u,  // no _has_bits_
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::EnumValue, _internal_metadata_),
-  ~0u,  // no _extensions_
-  ~0u,  // no _oneof_case_
-  ~0u,  // no _weak_field_map_
-  ~0u,  // no _inlined_string_donated_
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::EnumValue, _impl_.name_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::EnumValue, _impl_.number_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::EnumValue, _impl_.options_),
-  ~0u,  // no _has_bits_
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Option, _internal_metadata_),
-  ~0u,  // no _extensions_
-  ~0u,  // no _oneof_case_
-  ~0u,  // no _weak_field_map_
-  ~0u,  // no _inlined_string_donated_
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Option, _impl_.name_),
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Option, _impl_.value_),
-};
-static const ::_pbi::MigrationSchema schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = {
-  { 0, -1, -1, sizeof(::PROTOBUF_NAMESPACE_ID::Type)},
-  { 12, -1, -1, sizeof(::PROTOBUF_NAMESPACE_ID::Field)},
-  { 28, -1, -1, sizeof(::PROTOBUF_NAMESPACE_ID::Enum)},
-  { 39, -1, -1, sizeof(::PROTOBUF_NAMESPACE_ID::EnumValue)},
-  { 48, -1, -1, sizeof(::PROTOBUF_NAMESPACE_ID::Option)},
-};
-
-static const ::_pb::Message* const file_default_instances[] = {
-  &::PROTOBUF_NAMESPACE_ID::_Type_default_instance_._instance,
-  &::PROTOBUF_NAMESPACE_ID::_Field_default_instance_._instance,
-  &::PROTOBUF_NAMESPACE_ID::_Enum_default_instance_._instance,
-  &::PROTOBUF_NAMESPACE_ID::_EnumValue_default_instance_._instance,
-  &::PROTOBUF_NAMESPACE_ID::_Option_default_instance_._instance,
-};
-
-const char descriptor_table_protodef_google_2fprotobuf_2ftype_2eproto[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) =
-  "\n\032google/protobuf/type.proto\022\017google.pro"
-  "tobuf\032\031google/protobuf/any.proto\032$google"
-  "/protobuf/source_context.proto\"\327\001\n\004Type\022"
-  "\014\n\004name\030\001 \001(\t\022&\n\006fields\030\002 \003(\0132\026.google.p"
-  "rotobuf.Field\022\016\n\006oneofs\030\003 \003(\t\022(\n\007options"
-  "\030\004 \003(\0132\027.google.protobuf.Option\0226\n\016sourc"
-  "e_context\030\005 \001(\0132\036.google.protobuf.Source"
-  "Context\022\'\n\006syntax\030\006 \001(\0162\027.google.protobu"
-  "f.Syntax\"\325\005\n\005Field\022)\n\004kind\030\001 \001(\0162\033.googl"
-  "e.protobuf.Field.Kind\0227\n\013cardinality\030\002 \001"
-  "(\0162\".google.protobuf.Field.Cardinality\022\016"
-  "\n\006number\030\003 \001(\005\022\014\n\004name\030\004 \001(\t\022\020\n\010type_url"
-  "\030\006 \001(\t\022\023\n\013oneof_index\030\007 \001(\005\022\016\n\006packed\030\010 "
-  "\001(\010\022(\n\007options\030\t \003(\0132\027.google.protobuf.O"
-  "ption\022\021\n\tjson_name\030\n \001(\t\022\025\n\rdefault_valu"
-  "e\030\013 \001(\t\"\310\002\n\004Kind\022\020\n\014TYPE_UNKNOWN\020\000\022\017\n\013TY"
-  "PE_DOUBLE\020\001\022\016\n\nTYPE_FLOAT\020\002\022\016\n\nTYPE_INT6"
-  "4\020\003\022\017\n\013TYPE_UINT64\020\004\022\016\n\nTYPE_INT32\020\005\022\020\n\014"
-  "TYPE_FIXED64\020\006\022\020\n\014TYPE_FIXED32\020\007\022\r\n\tTYPE"
-  "_BOOL\020\010\022\017\n\013TYPE_STRING\020\t\022\016\n\nTYPE_GROUP\020\n"
-  "\022\020\n\014TYPE_MESSAGE\020\013\022\016\n\nTYPE_BYTES\020\014\022\017\n\013TY"
-  "PE_UINT32\020\r\022\r\n\tTYPE_ENUM\020\016\022\021\n\rTYPE_SFIXE"
-  "D32\020\017\022\021\n\rTYPE_SFIXED64\020\020\022\017\n\013TYPE_SINT32\020"
-  "\021\022\017\n\013TYPE_SINT64\020\022\"t\n\013Cardinality\022\027\n\023CAR"
-  "DINALITY_UNKNOWN\020\000\022\030\n\024CARDINALITY_OPTION"
-  "AL\020\001\022\030\n\024CARDINALITY_REQUIRED\020\002\022\030\n\024CARDIN"
-  "ALITY_REPEATED\020\003\"\316\001\n\004Enum\022\014\n\004name\030\001 \001(\t\022"
-  "-\n\tenumvalue\030\002 \003(\0132\032.google.protobuf.Enu"
-  "mValue\022(\n\007options\030\003 \003(\0132\027.google.protobu"
-  "f.Option\0226\n\016source_context\030\004 \001(\0132\036.googl"
-  "e.protobuf.SourceContext\022\'\n\006syntax\030\005 \001(\016"
-  "2\027.google.protobuf.Syntax\"S\n\tEnumValue\022\014"
-  "\n\004name\030\001 \001(\t\022\016\n\006number\030\002 \001(\005\022(\n\007options\030"
-  "\003 \003(\0132\027.google.protobuf.Option\";\n\006Option"
-  "\022\014\n\004name\030\001 \001(\t\022#\n\005value\030\002 \001(\0132\024.google.p"
-  "rotobuf.Any*.\n\006Syntax\022\021\n\rSYNTAX_PROTO2\020\000"
-  "\022\021\n\rSYNTAX_PROTO3\020\001B{\n\023com.google.protob"
-  "ufB\tTypeProtoP\001Z-google.golang.org/proto"
-  "buf/types/known/typepb\370\001\001\242\002\003GPB\252\002\036Google"
-  ".Protobuf.WellKnownTypesb\006proto3"
-  ;
-static const ::_pbi::DescriptorTable* const descriptor_table_google_2fprotobuf_2ftype_2eproto_deps[2] = {
-  &::descriptor_table_google_2fprotobuf_2fany_2eproto,
-  &::descriptor_table_google_2fprotobuf_2fsource_5fcontext_2eproto,
-};
-static ::_pbi::once_flag descriptor_table_google_2fprotobuf_2ftype_2eproto_once;
-const ::_pbi::DescriptorTable descriptor_table_google_2fprotobuf_2ftype_2eproto = {
-    false, false, 1592, descriptor_table_protodef_google_2fprotobuf_2ftype_2eproto,
-    "google/protobuf/type.proto",
-    &descriptor_table_google_2fprotobuf_2ftype_2eproto_once, descriptor_table_google_2fprotobuf_2ftype_2eproto_deps, 2, 5,
-    schemas, file_default_instances, TableStruct_google_2fprotobuf_2ftype_2eproto::offsets,
-    file_level_metadata_google_2fprotobuf_2ftype_2eproto, file_level_enum_descriptors_google_2fprotobuf_2ftype_2eproto,
-    file_level_service_descriptors_google_2fprotobuf_2ftype_2eproto,
-};
-PROTOBUF_ATTRIBUTE_WEAK const ::_pbi::DescriptorTable* descriptor_table_google_2fprotobuf_2ftype_2eproto_getter() {
-  return &descriptor_table_google_2fprotobuf_2ftype_2eproto;
-}
-
-// Force running AddDescriptors() at dynamic initialization time.
-PROTOBUF_ATTRIBUTE_INIT_PRIORITY2 static ::_pbi::AddDescriptorsRunner dynamic_init_dummy_google_2fprotobuf_2ftype_2eproto(&descriptor_table_google_2fprotobuf_2ftype_2eproto);
-PROTOBUF_NAMESPACE_OPEN
-const ::PROTOBUF_NAMESPACE_ID::EnumDescriptor* Field_Kind_descriptor() {
-  ::PROTOBUF_NAMESPACE_ID::internal::AssignDescriptors(&descriptor_table_google_2fprotobuf_2ftype_2eproto);
-  return file_level_enum_descriptors_google_2fprotobuf_2ftype_2eproto[0];
-}
-bool Field_Kind_IsValid(int value) {
-  switch (value) {
-    case 0:
-    case 1:
-    case 2:
-    case 3:
-    case 4:
-    case 5:
-    case 6:
-    case 7:
-    case 8:
-    case 9:
-    case 10:
-    case 11:
-    case 12:
-    case 13:
-    case 14:
-    case 15:
-    case 16:
-    case 17:
-    case 18:
-      return true;
-    default:
-      return false;
-  }
-}
-
-#if (__cplusplus < 201703) && (!defined(_MSC_VER) || (_MSC_VER >= 1900 && _MSC_VER < 1912))
-constexpr Field_Kind Field::TYPE_UNKNOWN;
-constexpr Field_Kind Field::TYPE_DOUBLE;
-constexpr Field_Kind Field::TYPE_FLOAT;
-constexpr Field_Kind Field::TYPE_INT64;
-constexpr Field_Kind Field::TYPE_UINT64;
-constexpr Field_Kind Field::TYPE_INT32;
-constexpr Field_Kind Field::TYPE_FIXED64;
-constexpr Field_Kind Field::TYPE_FIXED32;
-constexpr Field_Kind Field::TYPE_BOOL;
-constexpr Field_Kind Field::TYPE_STRING;
-constexpr Field_Kind Field::TYPE_GROUP;
-constexpr Field_Kind Field::TYPE_MESSAGE;
-constexpr Field_Kind Field::TYPE_BYTES;
-constexpr Field_Kind Field::TYPE_UINT32;
-constexpr Field_Kind Field::TYPE_ENUM;
-constexpr Field_Kind Field::TYPE_SFIXED32;
-constexpr Field_Kind Field::TYPE_SFIXED64;
-constexpr Field_Kind Field::TYPE_SINT32;
-constexpr Field_Kind Field::TYPE_SINT64;
-constexpr Field_Kind Field::Kind_MIN;
-constexpr Field_Kind Field::Kind_MAX;
-constexpr int Field::Kind_ARRAYSIZE;
-#endif  // (__cplusplus < 201703) && (!defined(_MSC_VER) || (_MSC_VER >= 1900 && _MSC_VER < 1912))
-const ::PROTOBUF_NAMESPACE_ID::EnumDescriptor* Field_Cardinality_descriptor() {
-  ::PROTOBUF_NAMESPACE_ID::internal::AssignDescriptors(&descriptor_table_google_2fprotobuf_2ftype_2eproto);
-  return file_level_enum_descriptors_google_2fprotobuf_2ftype_2eproto[1];
-}
-bool Field_Cardinality_IsValid(int value) {
-  switch (value) {
-    case 0:
-    case 1:
-    case 2:
-    case 3:
-      return true;
-    default:
-      return false;
-  }
-}
-
-#if (__cplusplus < 201703) && (!defined(_MSC_VER) || (_MSC_VER >= 1900 && _MSC_VER < 1912))
-constexpr Field_Cardinality Field::CARDINALITY_UNKNOWN;
-constexpr Field_Cardinality Field::CARDINALITY_OPTIONAL;
-constexpr Field_Cardinality Field::CARDINALITY_REQUIRED;
-constexpr Field_Cardinality Field::CARDINALITY_REPEATED;
-constexpr Field_Cardinality Field::Cardinality_MIN;
-constexpr Field_Cardinality Field::Cardinality_MAX;
-constexpr int Field::Cardinality_ARRAYSIZE;
-#endif  // (__cplusplus < 201703) && (!defined(_MSC_VER) || (_MSC_VER >= 1900 && _MSC_VER < 1912))
-const ::PROTOBUF_NAMESPACE_ID::EnumDescriptor* Syntax_descriptor() {
-  ::PROTOBUF_NAMESPACE_ID::internal::AssignDescriptors(&descriptor_table_google_2fprotobuf_2ftype_2eproto);
-  return file_level_enum_descriptors_google_2fprotobuf_2ftype_2eproto[2];
-}
-bool Syntax_IsValid(int value) {
-  switch (value) {
-    case 0:
-    case 1:
-      return true;
-    default:
-      return false;
-  }
-}
-
-
-// ===================================================================
-
-class Type::_Internal {
- public:
-  static const ::PROTOBUF_NAMESPACE_ID::SourceContext& source_context(const Type* msg);
-};
-
-const ::PROTOBUF_NAMESPACE_ID::SourceContext&
-Type::_Internal::source_context(const Type* msg) {
-  return *msg->_impl_.source_context_;
-}
-void Type::clear_source_context() {
-  if (GetArenaForAllocation() == nullptr && _impl_.source_context_ != nullptr) {
-    delete _impl_.source_context_;
-  }
-  _impl_.source_context_ = nullptr;
-}
-Type::Type(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                         bool is_message_owned)
-  : ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned) {
-  SharedCtor(arena, is_message_owned);
-  // @@protoc_insertion_point(arena_constructor:google.protobuf.Type)
-}
-Type::Type(const Type& from)
-  : ::PROTOBUF_NAMESPACE_ID::Message() {
-  Type* const _this = this; (void)_this;
-  new (&_impl_) Impl_{
-      decltype(_impl_.fields_){from._impl_.fields_}
-    , decltype(_impl_.oneofs_){from._impl_.oneofs_}
-    , decltype(_impl_.options_){from._impl_.options_}
-    , decltype(_impl_.name_){}
-    , decltype(_impl_.source_context_){nullptr}
-    , decltype(_impl_.syntax_){}
-    , /*decltype(_impl_._cached_size_)*/{}};
-
-  _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-  _impl_.name_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.name_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (!from._internal_name().empty()) {
-    _this->_impl_.name_.Set(from._internal_name(), 
-      _this->GetArenaForAllocation());
-  }
-  if (from._internal_has_source_context()) {
-    _this->_impl_.source_context_ = new ::PROTOBUF_NAMESPACE_ID::SourceContext(*from._impl_.source_context_);
-  }
-  _this->_impl_.syntax_ = from._impl_.syntax_;
-  // @@protoc_insertion_point(copy_constructor:google.protobuf.Type)
-}
-
-inline void Type::SharedCtor(
-    ::_pb::Arena* arena, bool is_message_owned) {
-  (void)arena;
-  (void)is_message_owned;
-  new (&_impl_) Impl_{
-      decltype(_impl_.fields_){arena}
-    , decltype(_impl_.oneofs_){arena}
-    , decltype(_impl_.options_){arena}
-    , decltype(_impl_.name_){}
-    , decltype(_impl_.source_context_){nullptr}
-    , decltype(_impl_.syntax_){0}
-    , /*decltype(_impl_._cached_size_)*/{}
-  };
-  _impl_.name_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.name_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-}
-
-Type::~Type() {
-  // @@protoc_insertion_point(destructor:google.protobuf.Type)
-  if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) {
-  (void)arena;
-    return;
-  }
-  SharedDtor();
-}
-
-inline void Type::SharedDtor() {
-  GOOGLE_DCHECK(GetArenaForAllocation() == nullptr);
-  _impl_.fields_.~RepeatedPtrField();
-  _impl_.oneofs_.~RepeatedPtrField();
-  _impl_.options_.~RepeatedPtrField();
-  _impl_.name_.Destroy();
-  if (this != internal_default_instance()) delete _impl_.source_context_;
-}
-
-void Type::SetCachedSize(int size) const {
-  _impl_._cached_size_.Set(size);
-}
-
-void Type::Clear() {
-// @@protoc_insertion_point(message_clear_start:google.protobuf.Type)
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.fields_.Clear();
-  _impl_.oneofs_.Clear();
-  _impl_.options_.Clear();
-  _impl_.name_.ClearToEmpty();
-  if (GetArenaForAllocation() == nullptr && _impl_.source_context_ != nullptr) {
-    delete _impl_.source_context_;
-  }
-  _impl_.source_context_ = nullptr;
-  _impl_.syntax_ = 0;
-  _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>();
-}
-
-const char* Type::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) {
-#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure
-  while (!ctx->Done(&ptr)) {
-    uint32_t tag;
-    ptr = ::_pbi::ReadTag(ptr, &tag);
-    switch (tag >> 3) {
-      // string name = 1;
-      case 1:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 10)) {
-          auto str = _internal_mutable_name();
-          ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx);
-          CHK_(ptr);
-          CHK_(::_pbi::VerifyUTF8(str, "google.protobuf.Type.name"));
-        } else
-          goto handle_unusual;
-        continue;
-      // repeated .google.protobuf.Field fields = 2;
-      case 2:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 18)) {
-          ptr -= 1;
-          do {
-            ptr += 1;
-            ptr = ctx->ParseMessage(_internal_add_fields(), ptr);
-            CHK_(ptr);
-            if (!ctx->DataAvailable(ptr)) break;
-          } while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<18>(ptr));
-        } else
-          goto handle_unusual;
-        continue;
-      // repeated string oneofs = 3;
-      case 3:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 26)) {
-          ptr -= 1;
-          do {
-            ptr += 1;
-            auto str = _internal_add_oneofs();
-            ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx);
-            CHK_(ptr);
-            CHK_(::_pbi::VerifyUTF8(str, "google.protobuf.Type.oneofs"));
-            if (!ctx->DataAvailable(ptr)) break;
-          } while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<26>(ptr));
-        } else
-          goto handle_unusual;
-        continue;
-      // repeated .google.protobuf.Option options = 4;
-      case 4:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 34)) {
-          ptr -= 1;
-          do {
-            ptr += 1;
-            ptr = ctx->ParseMessage(_internal_add_options(), ptr);
-            CHK_(ptr);
-            if (!ctx->DataAvailable(ptr)) break;
-          } while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<34>(ptr));
-        } else
-          goto handle_unusual;
-        continue;
-      // .google.protobuf.SourceContext source_context = 5;
-      case 5:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 42)) {
-          ptr = ctx->ParseMessage(_internal_mutable_source_context(), ptr);
-          CHK_(ptr);
-        } else
-          goto handle_unusual;
-        continue;
-      // .google.protobuf.Syntax syntax = 6;
-      case 6:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 48)) {
-          uint64_t val = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr);
-          CHK_(ptr);
-          _internal_set_syntax(static_cast<::PROTOBUF_NAMESPACE_ID::Syntax>(val));
-        } else
-          goto handle_unusual;
-        continue;
-      default:
-        goto handle_unusual;
-    }  // switch
-  handle_unusual:
-    if ((tag == 0) || ((tag & 7) == 4)) {
-      CHK_(ptr);
-      ctx->SetLastTag(tag);
-      goto message_done;
-    }
-    ptr = UnknownFieldParse(
-        tag,
-        _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(),
-        ptr, ctx);
-    CHK_(ptr != nullptr);
-  }  // while
-message_done:
-  return ptr;
-failure:
-  ptr = nullptr;
-  goto message_done;
-#undef CHK_
-}
-
-uint8_t* Type::_InternalSerialize(
-    uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.Type)
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  // string name = 1;
-  if (!this->_internal_name().empty()) {
-    ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String(
-      this->_internal_name().data(), static_cast<int>(this->_internal_name().length()),
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE,
-      "google.protobuf.Type.name");
-    target = stream->WriteStringMaybeAliased(
-        1, this->_internal_name(), target);
-  }
-
-  // repeated .google.protobuf.Field fields = 2;
-  for (unsigned i = 0,
-      n = static_cast<unsigned>(this->_internal_fields_size()); i < n; i++) {
-    const auto& repfield = this->_internal_fields(i);
-    target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
-        InternalWriteMessage(2, repfield, repfield.GetCachedSize(), target, stream);
-  }
-
-  // repeated string oneofs = 3;
-  for (int i = 0, n = this->_internal_oneofs_size(); i < n; i++) {
-    const auto& s = this->_internal_oneofs(i);
-    ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String(
-      s.data(), static_cast<int>(s.length()),
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE,
-      "google.protobuf.Type.oneofs");
-    target = stream->WriteString(3, s, target);
-  }
-
-  // repeated .google.protobuf.Option options = 4;
-  for (unsigned i = 0,
-      n = static_cast<unsigned>(this->_internal_options_size()); i < n; i++) {
-    const auto& repfield = this->_internal_options(i);
-    target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
-        InternalWriteMessage(4, repfield, repfield.GetCachedSize(), target, stream);
-  }
-
-  // .google.protobuf.SourceContext source_context = 5;
-  if (this->_internal_has_source_context()) {
-    target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
-      InternalWriteMessage(5, _Internal::source_context(this),
-        _Internal::source_context(this).GetCachedSize(), target, stream);
-  }
-
-  // .google.protobuf.Syntax syntax = 6;
-  if (this->_internal_syntax() != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteEnumToArray(
-      6, this->_internal_syntax(), target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-        _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.Type)
-  return target;
-}
-
-size_t Type::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:google.protobuf.Type)
-  size_t total_size = 0;
-
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // repeated .google.protobuf.Field fields = 2;
-  total_size += 1UL * this->_internal_fields_size();
-  for (const auto& msg : this->_impl_.fields_) {
-    total_size +=
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(msg);
-  }
-
-  // repeated string oneofs = 3;
-  total_size += 1 *
-      ::PROTOBUF_NAMESPACE_ID::internal::FromIntSize(_impl_.oneofs_.size());
-  for (int i = 0, n = _impl_.oneofs_.size(); i < n; i++) {
-    total_size += ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize(
-      _impl_.oneofs_.Get(i));
-  }
-
-  // repeated .google.protobuf.Option options = 4;
-  total_size += 1UL * this->_internal_options_size();
-  for (const auto& msg : this->_impl_.options_) {
-    total_size +=
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(msg);
-  }
-
-  // string name = 1;
-  if (!this->_internal_name().empty()) {
-    total_size += 1 +
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize(
-        this->_internal_name());
-  }
-
-  // .google.protobuf.SourceContext source_context = 5;
-  if (this->_internal_has_source_context()) {
-    total_size += 1 +
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(
-        *_impl_.source_context_);
-  }
-
-  // .google.protobuf.Syntax syntax = 6;
-  if (this->_internal_syntax() != 0) {
-    total_size += 1 +
-      ::_pbi::WireFormatLite::EnumSize(this->_internal_syntax());
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData Type::_class_data_ = {
-    ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck,
-    Type::MergeImpl
-};
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*Type::GetClassData() const { return &_class_data_; }
-
-
-void Type::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) {
-  auto* const _this = static_cast<Type*>(&to_msg);
-  auto& from = static_cast<const Type&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.Type)
-  GOOGLE_DCHECK_NE(&from, _this);
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  _this->_impl_.fields_.MergeFrom(from._impl_.fields_);
-  _this->_impl_.oneofs_.MergeFrom(from._impl_.oneofs_);
-  _this->_impl_.options_.MergeFrom(from._impl_.options_);
-  if (!from._internal_name().empty()) {
-    _this->_internal_set_name(from._internal_name());
-  }
-  if (from._internal_has_source_context()) {
-    _this->_internal_mutable_source_context()->::PROTOBUF_NAMESPACE_ID::SourceContext::MergeFrom(
-        from._internal_source_context());
-  }
-  if (from._internal_syntax() != 0) {
-    _this->_internal_set_syntax(from._internal_syntax());
-  }
-  _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void Type::CopyFrom(const Type& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.Type)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool Type::IsInitialized() const {
-  return true;
-}
-
-void Type::InternalSwap(Type* other) {
-  using std::swap;
-  auto* lhs_arena = GetArenaForAllocation();
-  auto* rhs_arena = other->GetArenaForAllocation();
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  _impl_.fields_.InternalSwap(&other->_impl_.fields_);
-  _impl_.oneofs_.InternalSwap(&other->_impl_.oneofs_);
-  _impl_.options_.InternalSwap(&other->_impl_.options_);
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::InternalSwap(
-      &_impl_.name_, lhs_arena,
-      &other->_impl_.name_, rhs_arena
-  );
-  ::PROTOBUF_NAMESPACE_ID::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(Type, _impl_.syntax_)
-      + sizeof(Type::_impl_.syntax_)
-      - PROTOBUF_FIELD_OFFSET(Type, _impl_.source_context_)>(
-          reinterpret_cast<char*>(&_impl_.source_context_),
-          reinterpret_cast<char*>(&other->_impl_.source_context_));
-}
-
-::PROTOBUF_NAMESPACE_ID::Metadata Type::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_google_2fprotobuf_2ftype_2eproto_getter, &descriptor_table_google_2fprotobuf_2ftype_2eproto_once,
-      file_level_metadata_google_2fprotobuf_2ftype_2eproto[0]);
-}
-
-// ===================================================================
-
-class Field::_Internal {
- public:
-};
-
-Field::Field(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                         bool is_message_owned)
-  : ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned) {
-  SharedCtor(arena, is_message_owned);
-  // @@protoc_insertion_point(arena_constructor:google.protobuf.Field)
-}
-Field::Field(const Field& from)
-  : ::PROTOBUF_NAMESPACE_ID::Message() {
-  Field* const _this = this; (void)_this;
-  new (&_impl_) Impl_{
-      decltype(_impl_.options_){from._impl_.options_}
-    , decltype(_impl_.name_){}
-    , decltype(_impl_.type_url_){}
-    , decltype(_impl_.json_name_){}
-    , decltype(_impl_.default_value_){}
-    , decltype(_impl_.kind_){}
-    , decltype(_impl_.cardinality_){}
-    , decltype(_impl_.number_){}
-    , decltype(_impl_.oneof_index_){}
-    , decltype(_impl_.packed_){}
-    , /*decltype(_impl_._cached_size_)*/{}};
-
-  _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-  _impl_.name_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.name_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (!from._internal_name().empty()) {
-    _this->_impl_.name_.Set(from._internal_name(), 
-      _this->GetArenaForAllocation());
-  }
-  _impl_.type_url_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.type_url_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (!from._internal_type_url().empty()) {
-    _this->_impl_.type_url_.Set(from._internal_type_url(), 
-      _this->GetArenaForAllocation());
-  }
-  _impl_.json_name_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.json_name_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (!from._internal_json_name().empty()) {
-    _this->_impl_.json_name_.Set(from._internal_json_name(), 
-      _this->GetArenaForAllocation());
-  }
-  _impl_.default_value_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.default_value_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (!from._internal_default_value().empty()) {
-    _this->_impl_.default_value_.Set(from._internal_default_value(), 
-      _this->GetArenaForAllocation());
-  }
-  ::memcpy(&_impl_.kind_, &from._impl_.kind_,
-    static_cast<size_t>(reinterpret_cast<char*>(&_impl_.packed_) -
-    reinterpret_cast<char*>(&_impl_.kind_)) + sizeof(_impl_.packed_));
-  // @@protoc_insertion_point(copy_constructor:google.protobuf.Field)
-}
-
-inline void Field::SharedCtor(
-    ::_pb::Arena* arena, bool is_message_owned) {
-  (void)arena;
-  (void)is_message_owned;
-  new (&_impl_) Impl_{
-      decltype(_impl_.options_){arena}
-    , decltype(_impl_.name_){}
-    , decltype(_impl_.type_url_){}
-    , decltype(_impl_.json_name_){}
-    , decltype(_impl_.default_value_){}
-    , decltype(_impl_.kind_){0}
-    , decltype(_impl_.cardinality_){0}
-    , decltype(_impl_.number_){0}
-    , decltype(_impl_.oneof_index_){0}
-    , decltype(_impl_.packed_){false}
-    , /*decltype(_impl_._cached_size_)*/{}
-  };
-  _impl_.name_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.name_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  _impl_.type_url_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.type_url_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  _impl_.json_name_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.json_name_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  _impl_.default_value_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.default_value_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-}
-
-Field::~Field() {
-  // @@protoc_insertion_point(destructor:google.protobuf.Field)
-  if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) {
-  (void)arena;
-    return;
-  }
-  SharedDtor();
-}
-
-inline void Field::SharedDtor() {
-  GOOGLE_DCHECK(GetArenaForAllocation() == nullptr);
-  _impl_.options_.~RepeatedPtrField();
-  _impl_.name_.Destroy();
-  _impl_.type_url_.Destroy();
-  _impl_.json_name_.Destroy();
-  _impl_.default_value_.Destroy();
-}
-
-void Field::SetCachedSize(int size) const {
-  _impl_._cached_size_.Set(size);
-}
-
-void Field::Clear() {
-// @@protoc_insertion_point(message_clear_start:google.protobuf.Field)
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.options_.Clear();
-  _impl_.name_.ClearToEmpty();
-  _impl_.type_url_.ClearToEmpty();
-  _impl_.json_name_.ClearToEmpty();
-  _impl_.default_value_.ClearToEmpty();
-  ::memset(&_impl_.kind_, 0, static_cast<size_t>(
-      reinterpret_cast<char*>(&_impl_.packed_) -
-      reinterpret_cast<char*>(&_impl_.kind_)) + sizeof(_impl_.packed_));
-  _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>();
-}
-
-const char* Field::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) {
-#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure
-  while (!ctx->Done(&ptr)) {
-    uint32_t tag;
-    ptr = ::_pbi::ReadTag(ptr, &tag);
-    switch (tag >> 3) {
-      // .google.protobuf.Field.Kind kind = 1;
-      case 1:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 8)) {
-          uint64_t val = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr);
-          CHK_(ptr);
-          _internal_set_kind(static_cast<::PROTOBUF_NAMESPACE_ID::Field_Kind>(val));
-        } else
-          goto handle_unusual;
-        continue;
-      // .google.protobuf.Field.Cardinality cardinality = 2;
-      case 2:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 16)) {
-          uint64_t val = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr);
-          CHK_(ptr);
-          _internal_set_cardinality(static_cast<::PROTOBUF_NAMESPACE_ID::Field_Cardinality>(val));
-        } else
-          goto handle_unusual;
-        continue;
-      // int32 number = 3;
-      case 3:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 24)) {
-          _impl_.number_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr);
-          CHK_(ptr);
-        } else
-          goto handle_unusual;
-        continue;
-      // string name = 4;
-      case 4:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 34)) {
-          auto str = _internal_mutable_name();
-          ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx);
-          CHK_(ptr);
-          CHK_(::_pbi::VerifyUTF8(str, "google.protobuf.Field.name"));
-        } else
-          goto handle_unusual;
-        continue;
-      // string type_url = 6;
-      case 6:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 50)) {
-          auto str = _internal_mutable_type_url();
-          ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx);
-          CHK_(ptr);
-          CHK_(::_pbi::VerifyUTF8(str, "google.protobuf.Field.type_url"));
-        } else
-          goto handle_unusual;
-        continue;
-      // int32 oneof_index = 7;
-      case 7:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 56)) {
-          _impl_.oneof_index_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr);
-          CHK_(ptr);
-        } else
-          goto handle_unusual;
-        continue;
-      // bool packed = 8;
-      case 8:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 64)) {
-          _impl_.packed_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr);
-          CHK_(ptr);
-        } else
-          goto handle_unusual;
-        continue;
-      // repeated .google.protobuf.Option options = 9;
-      case 9:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 74)) {
-          ptr -= 1;
-          do {
-            ptr += 1;
-            ptr = ctx->ParseMessage(_internal_add_options(), ptr);
-            CHK_(ptr);
-            if (!ctx->DataAvailable(ptr)) break;
-          } while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<74>(ptr));
-        } else
-          goto handle_unusual;
-        continue;
-      // string json_name = 10;
-      case 10:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 82)) {
-          auto str = _internal_mutable_json_name();
-          ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx);
-          CHK_(ptr);
-          CHK_(::_pbi::VerifyUTF8(str, "google.protobuf.Field.json_name"));
-        } else
-          goto handle_unusual;
-        continue;
-      // string default_value = 11;
-      case 11:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 90)) {
-          auto str = _internal_mutable_default_value();
-          ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx);
-          CHK_(ptr);
-          CHK_(::_pbi::VerifyUTF8(str, "google.protobuf.Field.default_value"));
-        } else
-          goto handle_unusual;
-        continue;
-      default:
-        goto handle_unusual;
-    }  // switch
-  handle_unusual:
-    if ((tag == 0) || ((tag & 7) == 4)) {
-      CHK_(ptr);
-      ctx->SetLastTag(tag);
-      goto message_done;
-    }
-    ptr = UnknownFieldParse(
-        tag,
-        _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(),
-        ptr, ctx);
-    CHK_(ptr != nullptr);
-  }  // while
-message_done:
-  return ptr;
-failure:
-  ptr = nullptr;
-  goto message_done;
-#undef CHK_
-}
-
-uint8_t* Field::_InternalSerialize(
-    uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.Field)
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  // .google.protobuf.Field.Kind kind = 1;
-  if (this->_internal_kind() != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteEnumToArray(
-      1, this->_internal_kind(), target);
-  }
-
-  // .google.protobuf.Field.Cardinality cardinality = 2;
-  if (this->_internal_cardinality() != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteEnumToArray(
-      2, this->_internal_cardinality(), target);
-  }
-
-  // int32 number = 3;
-  if (this->_internal_number() != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteInt32ToArray(3, this->_internal_number(), target);
-  }
-
-  // string name = 4;
-  if (!this->_internal_name().empty()) {
-    ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String(
-      this->_internal_name().data(), static_cast<int>(this->_internal_name().length()),
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE,
-      "google.protobuf.Field.name");
-    target = stream->WriteStringMaybeAliased(
-        4, this->_internal_name(), target);
-  }
-
-  // string type_url = 6;
-  if (!this->_internal_type_url().empty()) {
-    ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String(
-      this->_internal_type_url().data(), static_cast<int>(this->_internal_type_url().length()),
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE,
-      "google.protobuf.Field.type_url");
-    target = stream->WriteStringMaybeAliased(
-        6, this->_internal_type_url(), target);
-  }
-
-  // int32 oneof_index = 7;
-  if (this->_internal_oneof_index() != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteInt32ToArray(7, this->_internal_oneof_index(), target);
-  }
-
-  // bool packed = 8;
-  if (this->_internal_packed() != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteBoolToArray(8, this->_internal_packed(), target);
-  }
-
-  // repeated .google.protobuf.Option options = 9;
-  for (unsigned i = 0,
-      n = static_cast<unsigned>(this->_internal_options_size()); i < n; i++) {
-    const auto& repfield = this->_internal_options(i);
-    target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
-        InternalWriteMessage(9, repfield, repfield.GetCachedSize(), target, stream);
-  }
-
-  // string json_name = 10;
-  if (!this->_internal_json_name().empty()) {
-    ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String(
-      this->_internal_json_name().data(), static_cast<int>(this->_internal_json_name().length()),
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE,
-      "google.protobuf.Field.json_name");
-    target = stream->WriteStringMaybeAliased(
-        10, this->_internal_json_name(), target);
-  }
-
-  // string default_value = 11;
-  if (!this->_internal_default_value().empty()) {
-    ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String(
-      this->_internal_default_value().data(), static_cast<int>(this->_internal_default_value().length()),
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE,
-      "google.protobuf.Field.default_value");
-    target = stream->WriteStringMaybeAliased(
-        11, this->_internal_default_value(), target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-        _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.Field)
-  return target;
-}
-
-size_t Field::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:google.protobuf.Field)
-  size_t total_size = 0;
-
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // repeated .google.protobuf.Option options = 9;
-  total_size += 1UL * this->_internal_options_size();
-  for (const auto& msg : this->_impl_.options_) {
-    total_size +=
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(msg);
-  }
-
-  // string name = 4;
-  if (!this->_internal_name().empty()) {
-    total_size += 1 +
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize(
-        this->_internal_name());
-  }
-
-  // string type_url = 6;
-  if (!this->_internal_type_url().empty()) {
-    total_size += 1 +
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize(
-        this->_internal_type_url());
-  }
-
-  // string json_name = 10;
-  if (!this->_internal_json_name().empty()) {
-    total_size += 1 +
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize(
-        this->_internal_json_name());
-  }
-
-  // string default_value = 11;
-  if (!this->_internal_default_value().empty()) {
-    total_size += 1 +
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize(
-        this->_internal_default_value());
-  }
-
-  // .google.protobuf.Field.Kind kind = 1;
-  if (this->_internal_kind() != 0) {
-    total_size += 1 +
-      ::_pbi::WireFormatLite::EnumSize(this->_internal_kind());
-  }
-
-  // .google.protobuf.Field.Cardinality cardinality = 2;
-  if (this->_internal_cardinality() != 0) {
-    total_size += 1 +
-      ::_pbi::WireFormatLite::EnumSize(this->_internal_cardinality());
-  }
-
-  // int32 number = 3;
-  if (this->_internal_number() != 0) {
-    total_size += ::_pbi::WireFormatLite::Int32SizePlusOne(this->_internal_number());
-  }
-
-  // int32 oneof_index = 7;
-  if (this->_internal_oneof_index() != 0) {
-    total_size += ::_pbi::WireFormatLite::Int32SizePlusOne(this->_internal_oneof_index());
-  }
-
-  // bool packed = 8;
-  if (this->_internal_packed() != 0) {
-    total_size += 1 + 1;
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData Field::_class_data_ = {
-    ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck,
-    Field::MergeImpl
-};
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*Field::GetClassData() const { return &_class_data_; }
-
-
-void Field::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) {
-  auto* const _this = static_cast<Field*>(&to_msg);
-  auto& from = static_cast<const Field&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.Field)
-  GOOGLE_DCHECK_NE(&from, _this);
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  _this->_impl_.options_.MergeFrom(from._impl_.options_);
-  if (!from._internal_name().empty()) {
-    _this->_internal_set_name(from._internal_name());
-  }
-  if (!from._internal_type_url().empty()) {
-    _this->_internal_set_type_url(from._internal_type_url());
-  }
-  if (!from._internal_json_name().empty()) {
-    _this->_internal_set_json_name(from._internal_json_name());
-  }
-  if (!from._internal_default_value().empty()) {
-    _this->_internal_set_default_value(from._internal_default_value());
-  }
-  if (from._internal_kind() != 0) {
-    _this->_internal_set_kind(from._internal_kind());
-  }
-  if (from._internal_cardinality() != 0) {
-    _this->_internal_set_cardinality(from._internal_cardinality());
-  }
-  if (from._internal_number() != 0) {
-    _this->_internal_set_number(from._internal_number());
-  }
-  if (from._internal_oneof_index() != 0) {
-    _this->_internal_set_oneof_index(from._internal_oneof_index());
-  }
-  if (from._internal_packed() != 0) {
-    _this->_internal_set_packed(from._internal_packed());
-  }
-  _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void Field::CopyFrom(const Field& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.Field)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool Field::IsInitialized() const {
-  return true;
-}
-
-void Field::InternalSwap(Field* other) {
-  using std::swap;
-  auto* lhs_arena = GetArenaForAllocation();
-  auto* rhs_arena = other->GetArenaForAllocation();
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  _impl_.options_.InternalSwap(&other->_impl_.options_);
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::InternalSwap(
-      &_impl_.name_, lhs_arena,
-      &other->_impl_.name_, rhs_arena
-  );
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::InternalSwap(
-      &_impl_.type_url_, lhs_arena,
-      &other->_impl_.type_url_, rhs_arena
-  );
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::InternalSwap(
-      &_impl_.json_name_, lhs_arena,
-      &other->_impl_.json_name_, rhs_arena
-  );
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::InternalSwap(
-      &_impl_.default_value_, lhs_arena,
-      &other->_impl_.default_value_, rhs_arena
-  );
-  ::PROTOBUF_NAMESPACE_ID::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(Field, _impl_.packed_)
-      + sizeof(Field::_impl_.packed_)
-      - PROTOBUF_FIELD_OFFSET(Field, _impl_.kind_)>(
-          reinterpret_cast<char*>(&_impl_.kind_),
-          reinterpret_cast<char*>(&other->_impl_.kind_));
-}
-
-::PROTOBUF_NAMESPACE_ID::Metadata Field::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_google_2fprotobuf_2ftype_2eproto_getter, &descriptor_table_google_2fprotobuf_2ftype_2eproto_once,
-      file_level_metadata_google_2fprotobuf_2ftype_2eproto[1]);
-}
-
-// ===================================================================
-
-class Enum::_Internal {
- public:
-  static const ::PROTOBUF_NAMESPACE_ID::SourceContext& source_context(const Enum* msg);
-};
-
-const ::PROTOBUF_NAMESPACE_ID::SourceContext&
-Enum::_Internal::source_context(const Enum* msg) {
-  return *msg->_impl_.source_context_;
-}
-void Enum::clear_source_context() {
-  if (GetArenaForAllocation() == nullptr && _impl_.source_context_ != nullptr) {
-    delete _impl_.source_context_;
-  }
-  _impl_.source_context_ = nullptr;
-}
-Enum::Enum(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                         bool is_message_owned)
-  : ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned) {
-  SharedCtor(arena, is_message_owned);
-  // @@protoc_insertion_point(arena_constructor:google.protobuf.Enum)
-}
-Enum::Enum(const Enum& from)
-  : ::PROTOBUF_NAMESPACE_ID::Message() {
-  Enum* const _this = this; (void)_this;
-  new (&_impl_) Impl_{
-      decltype(_impl_.enumvalue_){from._impl_.enumvalue_}
-    , decltype(_impl_.options_){from._impl_.options_}
-    , decltype(_impl_.name_){}
-    , decltype(_impl_.source_context_){nullptr}
-    , decltype(_impl_.syntax_){}
-    , /*decltype(_impl_._cached_size_)*/{}};
-
-  _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-  _impl_.name_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.name_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (!from._internal_name().empty()) {
-    _this->_impl_.name_.Set(from._internal_name(), 
-      _this->GetArenaForAllocation());
-  }
-  if (from._internal_has_source_context()) {
-    _this->_impl_.source_context_ = new ::PROTOBUF_NAMESPACE_ID::SourceContext(*from._impl_.source_context_);
-  }
-  _this->_impl_.syntax_ = from._impl_.syntax_;
-  // @@protoc_insertion_point(copy_constructor:google.protobuf.Enum)
-}
-
-inline void Enum::SharedCtor(
-    ::_pb::Arena* arena, bool is_message_owned) {
-  (void)arena;
-  (void)is_message_owned;
-  new (&_impl_) Impl_{
-      decltype(_impl_.enumvalue_){arena}
-    , decltype(_impl_.options_){arena}
-    , decltype(_impl_.name_){}
-    , decltype(_impl_.source_context_){nullptr}
-    , decltype(_impl_.syntax_){0}
-    , /*decltype(_impl_._cached_size_)*/{}
-  };
-  _impl_.name_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.name_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-}
-
-Enum::~Enum() {
-  // @@protoc_insertion_point(destructor:google.protobuf.Enum)
-  if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) {
-  (void)arena;
-    return;
-  }
-  SharedDtor();
-}
-
-inline void Enum::SharedDtor() {
-  GOOGLE_DCHECK(GetArenaForAllocation() == nullptr);
-  _impl_.enumvalue_.~RepeatedPtrField();
-  _impl_.options_.~RepeatedPtrField();
-  _impl_.name_.Destroy();
-  if (this != internal_default_instance()) delete _impl_.source_context_;
-}
-
-void Enum::SetCachedSize(int size) const {
-  _impl_._cached_size_.Set(size);
-}
-
-void Enum::Clear() {
-// @@protoc_insertion_point(message_clear_start:google.protobuf.Enum)
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.enumvalue_.Clear();
-  _impl_.options_.Clear();
-  _impl_.name_.ClearToEmpty();
-  if (GetArenaForAllocation() == nullptr && _impl_.source_context_ != nullptr) {
-    delete _impl_.source_context_;
-  }
-  _impl_.source_context_ = nullptr;
-  _impl_.syntax_ = 0;
-  _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>();
-}
-
-const char* Enum::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) {
-#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure
-  while (!ctx->Done(&ptr)) {
-    uint32_t tag;
-    ptr = ::_pbi::ReadTag(ptr, &tag);
-    switch (tag >> 3) {
-      // string name = 1;
-      case 1:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 10)) {
-          auto str = _internal_mutable_name();
-          ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx);
-          CHK_(ptr);
-          CHK_(::_pbi::VerifyUTF8(str, "google.protobuf.Enum.name"));
-        } else
-          goto handle_unusual;
-        continue;
-      // repeated .google.protobuf.EnumValue enumvalue = 2;
-      case 2:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 18)) {
-          ptr -= 1;
-          do {
-            ptr += 1;
-            ptr = ctx->ParseMessage(_internal_add_enumvalue(), ptr);
-            CHK_(ptr);
-            if (!ctx->DataAvailable(ptr)) break;
-          } while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<18>(ptr));
-        } else
-          goto handle_unusual;
-        continue;
-      // repeated .google.protobuf.Option options = 3;
-      case 3:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 26)) {
-          ptr -= 1;
-          do {
-            ptr += 1;
-            ptr = ctx->ParseMessage(_internal_add_options(), ptr);
-            CHK_(ptr);
-            if (!ctx->DataAvailable(ptr)) break;
-          } while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<26>(ptr));
-        } else
-          goto handle_unusual;
-        continue;
-      // .google.protobuf.SourceContext source_context = 4;
-      case 4:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 34)) {
-          ptr = ctx->ParseMessage(_internal_mutable_source_context(), ptr);
-          CHK_(ptr);
-        } else
-          goto handle_unusual;
-        continue;
-      // .google.protobuf.Syntax syntax = 5;
-      case 5:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 40)) {
-          uint64_t val = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr);
-          CHK_(ptr);
-          _internal_set_syntax(static_cast<::PROTOBUF_NAMESPACE_ID::Syntax>(val));
-        } else
-          goto handle_unusual;
-        continue;
-      default:
-        goto handle_unusual;
-    }  // switch
-  handle_unusual:
-    if ((tag == 0) || ((tag & 7) == 4)) {
-      CHK_(ptr);
-      ctx->SetLastTag(tag);
-      goto message_done;
-    }
-    ptr = UnknownFieldParse(
-        tag,
-        _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(),
-        ptr, ctx);
-    CHK_(ptr != nullptr);
-  }  // while
-message_done:
-  return ptr;
-failure:
-  ptr = nullptr;
-  goto message_done;
-#undef CHK_
-}
-
-uint8_t* Enum::_InternalSerialize(
-    uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.Enum)
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  // string name = 1;
-  if (!this->_internal_name().empty()) {
-    ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String(
-      this->_internal_name().data(), static_cast<int>(this->_internal_name().length()),
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE,
-      "google.protobuf.Enum.name");
-    target = stream->WriteStringMaybeAliased(
-        1, this->_internal_name(), target);
-  }
-
-  // repeated .google.protobuf.EnumValue enumvalue = 2;
-  for (unsigned i = 0,
-      n = static_cast<unsigned>(this->_internal_enumvalue_size()); i < n; i++) {
-    const auto& repfield = this->_internal_enumvalue(i);
-    target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
-        InternalWriteMessage(2, repfield, repfield.GetCachedSize(), target, stream);
-  }
-
-  // repeated .google.protobuf.Option options = 3;
-  for (unsigned i = 0,
-      n = static_cast<unsigned>(this->_internal_options_size()); i < n; i++) {
-    const auto& repfield = this->_internal_options(i);
-    target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
-        InternalWriteMessage(3, repfield, repfield.GetCachedSize(), target, stream);
-  }
-
-  // .google.protobuf.SourceContext source_context = 4;
-  if (this->_internal_has_source_context()) {
-    target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
-      InternalWriteMessage(4, _Internal::source_context(this),
-        _Internal::source_context(this).GetCachedSize(), target, stream);
-  }
-
-  // .google.protobuf.Syntax syntax = 5;
-  if (this->_internal_syntax() != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteEnumToArray(
-      5, this->_internal_syntax(), target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-        _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.Enum)
-  return target;
-}
-
-size_t Enum::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:google.protobuf.Enum)
-  size_t total_size = 0;
-
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // repeated .google.protobuf.EnumValue enumvalue = 2;
-  total_size += 1UL * this->_internal_enumvalue_size();
-  for (const auto& msg : this->_impl_.enumvalue_) {
-    total_size +=
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(msg);
-  }
-
-  // repeated .google.protobuf.Option options = 3;
-  total_size += 1UL * this->_internal_options_size();
-  for (const auto& msg : this->_impl_.options_) {
-    total_size +=
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(msg);
-  }
-
-  // string name = 1;
-  if (!this->_internal_name().empty()) {
-    total_size += 1 +
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize(
-        this->_internal_name());
-  }
-
-  // .google.protobuf.SourceContext source_context = 4;
-  if (this->_internal_has_source_context()) {
-    total_size += 1 +
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(
-        *_impl_.source_context_);
-  }
-
-  // .google.protobuf.Syntax syntax = 5;
-  if (this->_internal_syntax() != 0) {
-    total_size += 1 +
-      ::_pbi::WireFormatLite::EnumSize(this->_internal_syntax());
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData Enum::_class_data_ = {
-    ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck,
-    Enum::MergeImpl
-};
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*Enum::GetClassData() const { return &_class_data_; }
-
-
-void Enum::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) {
-  auto* const _this = static_cast<Enum*>(&to_msg);
-  auto& from = static_cast<const Enum&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.Enum)
-  GOOGLE_DCHECK_NE(&from, _this);
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  _this->_impl_.enumvalue_.MergeFrom(from._impl_.enumvalue_);
-  _this->_impl_.options_.MergeFrom(from._impl_.options_);
-  if (!from._internal_name().empty()) {
-    _this->_internal_set_name(from._internal_name());
-  }
-  if (from._internal_has_source_context()) {
-    _this->_internal_mutable_source_context()->::PROTOBUF_NAMESPACE_ID::SourceContext::MergeFrom(
-        from._internal_source_context());
-  }
-  if (from._internal_syntax() != 0) {
-    _this->_internal_set_syntax(from._internal_syntax());
-  }
-  _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void Enum::CopyFrom(const Enum& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.Enum)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool Enum::IsInitialized() const {
-  return true;
-}
-
-void Enum::InternalSwap(Enum* other) {
-  using std::swap;
-  auto* lhs_arena = GetArenaForAllocation();
-  auto* rhs_arena = other->GetArenaForAllocation();
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  _impl_.enumvalue_.InternalSwap(&other->_impl_.enumvalue_);
-  _impl_.options_.InternalSwap(&other->_impl_.options_);
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::InternalSwap(
-      &_impl_.name_, lhs_arena,
-      &other->_impl_.name_, rhs_arena
-  );
-  ::PROTOBUF_NAMESPACE_ID::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(Enum, _impl_.syntax_)
-      + sizeof(Enum::_impl_.syntax_)
-      - PROTOBUF_FIELD_OFFSET(Enum, _impl_.source_context_)>(
-          reinterpret_cast<char*>(&_impl_.source_context_),
-          reinterpret_cast<char*>(&other->_impl_.source_context_));
-}
-
-::PROTOBUF_NAMESPACE_ID::Metadata Enum::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_google_2fprotobuf_2ftype_2eproto_getter, &descriptor_table_google_2fprotobuf_2ftype_2eproto_once,
-      file_level_metadata_google_2fprotobuf_2ftype_2eproto[2]);
-}
-
-// ===================================================================
-
-class EnumValue::_Internal {
- public:
-};
-
-EnumValue::EnumValue(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                         bool is_message_owned)
-  : ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned) {
-  SharedCtor(arena, is_message_owned);
-  // @@protoc_insertion_point(arena_constructor:google.protobuf.EnumValue)
-}
-EnumValue::EnumValue(const EnumValue& from)
-  : ::PROTOBUF_NAMESPACE_ID::Message() {
-  EnumValue* const _this = this; (void)_this;
-  new (&_impl_) Impl_{
-      decltype(_impl_.options_){from._impl_.options_}
-    , decltype(_impl_.name_){}
-    , decltype(_impl_.number_){}
-    , /*decltype(_impl_._cached_size_)*/{}};
-
-  _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-  _impl_.name_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.name_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (!from._internal_name().empty()) {
-    _this->_impl_.name_.Set(from._internal_name(), 
-      _this->GetArenaForAllocation());
-  }
-  _this->_impl_.number_ = from._impl_.number_;
-  // @@protoc_insertion_point(copy_constructor:google.protobuf.EnumValue)
-}
-
-inline void EnumValue::SharedCtor(
-    ::_pb::Arena* arena, bool is_message_owned) {
-  (void)arena;
-  (void)is_message_owned;
-  new (&_impl_) Impl_{
-      decltype(_impl_.options_){arena}
-    , decltype(_impl_.name_){}
-    , decltype(_impl_.number_){0}
-    , /*decltype(_impl_._cached_size_)*/{}
-  };
-  _impl_.name_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.name_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-}
-
-EnumValue::~EnumValue() {
-  // @@protoc_insertion_point(destructor:google.protobuf.EnumValue)
-  if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) {
-  (void)arena;
-    return;
-  }
-  SharedDtor();
-}
-
-inline void EnumValue::SharedDtor() {
-  GOOGLE_DCHECK(GetArenaForAllocation() == nullptr);
-  _impl_.options_.~RepeatedPtrField();
-  _impl_.name_.Destroy();
-}
-
-void EnumValue::SetCachedSize(int size) const {
-  _impl_._cached_size_.Set(size);
-}
-
-void EnumValue::Clear() {
-// @@protoc_insertion_point(message_clear_start:google.protobuf.EnumValue)
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.options_.Clear();
-  _impl_.name_.ClearToEmpty();
-  _impl_.number_ = 0;
-  _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>();
-}
-
-const char* EnumValue::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) {
-#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure
-  while (!ctx->Done(&ptr)) {
-    uint32_t tag;
-    ptr = ::_pbi::ReadTag(ptr, &tag);
-    switch (tag >> 3) {
-      // string name = 1;
-      case 1:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 10)) {
-          auto str = _internal_mutable_name();
-          ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx);
-          CHK_(ptr);
-          CHK_(::_pbi::VerifyUTF8(str, "google.protobuf.EnumValue.name"));
-        } else
-          goto handle_unusual;
-        continue;
-      // int32 number = 2;
-      case 2:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 16)) {
-          _impl_.number_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr);
-          CHK_(ptr);
-        } else
-          goto handle_unusual;
-        continue;
-      // repeated .google.protobuf.Option options = 3;
-      case 3:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 26)) {
-          ptr -= 1;
-          do {
-            ptr += 1;
-            ptr = ctx->ParseMessage(_internal_add_options(), ptr);
-            CHK_(ptr);
-            if (!ctx->DataAvailable(ptr)) break;
-          } while (::PROTOBUF_NAMESPACE_ID::internal::ExpectTag<26>(ptr));
-        } else
-          goto handle_unusual;
-        continue;
-      default:
-        goto handle_unusual;
-    }  // switch
-  handle_unusual:
-    if ((tag == 0) || ((tag & 7) == 4)) {
-      CHK_(ptr);
-      ctx->SetLastTag(tag);
-      goto message_done;
-    }
-    ptr = UnknownFieldParse(
-        tag,
-        _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(),
-        ptr, ctx);
-    CHK_(ptr != nullptr);
-  }  // while
-message_done:
-  return ptr;
-failure:
-  ptr = nullptr;
-  goto message_done;
-#undef CHK_
-}
-
-uint8_t* EnumValue::_InternalSerialize(
-    uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.EnumValue)
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  // string name = 1;
-  if (!this->_internal_name().empty()) {
-    ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String(
-      this->_internal_name().data(), static_cast<int>(this->_internal_name().length()),
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE,
-      "google.protobuf.EnumValue.name");
-    target = stream->WriteStringMaybeAliased(
-        1, this->_internal_name(), target);
-  }
-
-  // int32 number = 2;
-  if (this->_internal_number() != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteInt32ToArray(2, this->_internal_number(), target);
-  }
-
-  // repeated .google.protobuf.Option options = 3;
-  for (unsigned i = 0,
-      n = static_cast<unsigned>(this->_internal_options_size()); i < n; i++) {
-    const auto& repfield = this->_internal_options(i);
-    target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
-        InternalWriteMessage(3, repfield, repfield.GetCachedSize(), target, stream);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-        _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.EnumValue)
-  return target;
-}
-
-size_t EnumValue::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:google.protobuf.EnumValue)
-  size_t total_size = 0;
-
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // repeated .google.protobuf.Option options = 3;
-  total_size += 1UL * this->_internal_options_size();
-  for (const auto& msg : this->_impl_.options_) {
-    total_size +=
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(msg);
-  }
-
-  // string name = 1;
-  if (!this->_internal_name().empty()) {
-    total_size += 1 +
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize(
-        this->_internal_name());
-  }
-
-  // int32 number = 2;
-  if (this->_internal_number() != 0) {
-    total_size += ::_pbi::WireFormatLite::Int32SizePlusOne(this->_internal_number());
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData EnumValue::_class_data_ = {
-    ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck,
-    EnumValue::MergeImpl
-};
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*EnumValue::GetClassData() const { return &_class_data_; }
-
-
-void EnumValue::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) {
-  auto* const _this = static_cast<EnumValue*>(&to_msg);
-  auto& from = static_cast<const EnumValue&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.EnumValue)
-  GOOGLE_DCHECK_NE(&from, _this);
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  _this->_impl_.options_.MergeFrom(from._impl_.options_);
-  if (!from._internal_name().empty()) {
-    _this->_internal_set_name(from._internal_name());
-  }
-  if (from._internal_number() != 0) {
-    _this->_internal_set_number(from._internal_number());
-  }
-  _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void EnumValue::CopyFrom(const EnumValue& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.EnumValue)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool EnumValue::IsInitialized() const {
-  return true;
-}
-
-void EnumValue::InternalSwap(EnumValue* other) {
-  using std::swap;
-  auto* lhs_arena = GetArenaForAllocation();
-  auto* rhs_arena = other->GetArenaForAllocation();
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  _impl_.options_.InternalSwap(&other->_impl_.options_);
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::InternalSwap(
-      &_impl_.name_, lhs_arena,
-      &other->_impl_.name_, rhs_arena
-  );
-  swap(_impl_.number_, other->_impl_.number_);
-}
-
-::PROTOBUF_NAMESPACE_ID::Metadata EnumValue::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_google_2fprotobuf_2ftype_2eproto_getter, &descriptor_table_google_2fprotobuf_2ftype_2eproto_once,
-      file_level_metadata_google_2fprotobuf_2ftype_2eproto[3]);
-}
-
-// ===================================================================
-
-class Option::_Internal {
- public:
-  static const ::PROTOBUF_NAMESPACE_ID::Any& value(const Option* msg);
-};
-
-const ::PROTOBUF_NAMESPACE_ID::Any&
-Option::_Internal::value(const Option* msg) {
-  return *msg->_impl_.value_;
-}
-void Option::clear_value() {
-  if (GetArenaForAllocation() == nullptr && _impl_.value_ != nullptr) {
-    delete _impl_.value_;
-  }
-  _impl_.value_ = nullptr;
-}
-Option::Option(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                         bool is_message_owned)
-  : ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned) {
-  SharedCtor(arena, is_message_owned);
-  // @@protoc_insertion_point(arena_constructor:google.protobuf.Option)
-}
-Option::Option(const Option& from)
-  : ::PROTOBUF_NAMESPACE_ID::Message() {
-  Option* const _this = this; (void)_this;
-  new (&_impl_) Impl_{
-      decltype(_impl_.name_){}
-    , decltype(_impl_.value_){nullptr}
-    , /*decltype(_impl_._cached_size_)*/{}};
-
-  _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-  _impl_.name_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.name_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (!from._internal_name().empty()) {
-    _this->_impl_.name_.Set(from._internal_name(), 
-      _this->GetArenaForAllocation());
-  }
-  if (from._internal_has_value()) {
-    _this->_impl_.value_ = new ::PROTOBUF_NAMESPACE_ID::Any(*from._impl_.value_);
-  }
-  // @@protoc_insertion_point(copy_constructor:google.protobuf.Option)
-}
-
-inline void Option::SharedCtor(
-    ::_pb::Arena* arena, bool is_message_owned) {
-  (void)arena;
-  (void)is_message_owned;
-  new (&_impl_) Impl_{
-      decltype(_impl_.name_){}
-    , decltype(_impl_.value_){nullptr}
-    , /*decltype(_impl_._cached_size_)*/{}
-  };
-  _impl_.name_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.name_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-}
-
-Option::~Option() {
-  // @@protoc_insertion_point(destructor:google.protobuf.Option)
-  if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) {
-  (void)arena;
-    return;
-  }
-  SharedDtor();
-}
-
-inline void Option::SharedDtor() {
-  GOOGLE_DCHECK(GetArenaForAllocation() == nullptr);
-  _impl_.name_.Destroy();
-  if (this != internal_default_instance()) delete _impl_.value_;
-}
-
-void Option::SetCachedSize(int size) const {
-  _impl_._cached_size_.Set(size);
-}
-
-void Option::Clear() {
-// @@protoc_insertion_point(message_clear_start:google.protobuf.Option)
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.name_.ClearToEmpty();
-  if (GetArenaForAllocation() == nullptr && _impl_.value_ != nullptr) {
-    delete _impl_.value_;
-  }
-  _impl_.value_ = nullptr;
-  _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>();
-}
-
-const char* Option::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) {
-#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure
-  while (!ctx->Done(&ptr)) {
-    uint32_t tag;
-    ptr = ::_pbi::ReadTag(ptr, &tag);
-    switch (tag >> 3) {
-      // string name = 1;
-      case 1:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 10)) {
-          auto str = _internal_mutable_name();
-          ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx);
-          CHK_(ptr);
-          CHK_(::_pbi::VerifyUTF8(str, "google.protobuf.Option.name"));
-        } else
-          goto handle_unusual;
-        continue;
-      // .google.protobuf.Any value = 2;
-      case 2:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 18)) {
-          ptr = ctx->ParseMessage(_internal_mutable_value(), ptr);
-          CHK_(ptr);
-        } else
-          goto handle_unusual;
-        continue;
-      default:
-        goto handle_unusual;
-    }  // switch
-  handle_unusual:
-    if ((tag == 0) || ((tag & 7) == 4)) {
-      CHK_(ptr);
-      ctx->SetLastTag(tag);
-      goto message_done;
-    }
-    ptr = UnknownFieldParse(
-        tag,
-        _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(),
-        ptr, ctx);
-    CHK_(ptr != nullptr);
-  }  // while
-message_done:
-  return ptr;
-failure:
-  ptr = nullptr;
-  goto message_done;
-#undef CHK_
-}
-
-uint8_t* Option::_InternalSerialize(
-    uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.Option)
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  // string name = 1;
-  if (!this->_internal_name().empty()) {
-    ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String(
-      this->_internal_name().data(), static_cast<int>(this->_internal_name().length()),
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE,
-      "google.protobuf.Option.name");
-    target = stream->WriteStringMaybeAliased(
-        1, this->_internal_name(), target);
-  }
-
-  // .google.protobuf.Any value = 2;
-  if (this->_internal_has_value()) {
-    target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::
-      InternalWriteMessage(2, _Internal::value(this),
-        _Internal::value(this).GetCachedSize(), target, stream);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-        _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.Option)
-  return target;
-}
-
-size_t Option::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:google.protobuf.Option)
-  size_t total_size = 0;
-
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // string name = 1;
-  if (!this->_internal_name().empty()) {
-    total_size += 1 +
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize(
-        this->_internal_name());
-  }
-
-  // .google.protobuf.Any value = 2;
-  if (this->_internal_has_value()) {
-    total_size += 1 +
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(
-        *_impl_.value_);
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData Option::_class_data_ = {
-    ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck,
-    Option::MergeImpl
-};
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*Option::GetClassData() const { return &_class_data_; }
-
-
-void Option::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) {
-  auto* const _this = static_cast<Option*>(&to_msg);
-  auto& from = static_cast<const Option&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.Option)
-  GOOGLE_DCHECK_NE(&from, _this);
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if (!from._internal_name().empty()) {
-    _this->_internal_set_name(from._internal_name());
-  }
-  if (from._internal_has_value()) {
-    _this->_internal_mutable_value()->::PROTOBUF_NAMESPACE_ID::Any::MergeFrom(
-        from._internal_value());
-  }
-  _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void Option::CopyFrom(const Option& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.Option)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool Option::IsInitialized() const {
-  return true;
-}
-
-void Option::InternalSwap(Option* other) {
-  using std::swap;
-  auto* lhs_arena = GetArenaForAllocation();
-  auto* rhs_arena = other->GetArenaForAllocation();
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::InternalSwap(
-      &_impl_.name_, lhs_arena,
-      &other->_impl_.name_, rhs_arena
-  );
-  swap(_impl_.value_, other->_impl_.value_);
-}
-
-::PROTOBUF_NAMESPACE_ID::Metadata Option::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_google_2fprotobuf_2ftype_2eproto_getter, &descriptor_table_google_2fprotobuf_2ftype_2eproto_once,
-      file_level_metadata_google_2fprotobuf_2ftype_2eproto[4]);
-}
-
-// @@protoc_insertion_point(namespace_scope)
-PROTOBUF_NAMESPACE_CLOSE
-PROTOBUF_NAMESPACE_OPEN
-template<> PROTOBUF_NOINLINE ::PROTOBUF_NAMESPACE_ID::Type*
-Arena::CreateMaybeMessage< ::PROTOBUF_NAMESPACE_ID::Type >(Arena* arena) {
-  return Arena::CreateMessageInternal< ::PROTOBUF_NAMESPACE_ID::Type >(arena);
-}
-template<> PROTOBUF_NOINLINE ::PROTOBUF_NAMESPACE_ID::Field*
-Arena::CreateMaybeMessage< ::PROTOBUF_NAMESPACE_ID::Field >(Arena* arena) {
-  return Arena::CreateMessageInternal< ::PROTOBUF_NAMESPACE_ID::Field >(arena);
-}
-template<> PROTOBUF_NOINLINE ::PROTOBUF_NAMESPACE_ID::Enum*
-Arena::CreateMaybeMessage< ::PROTOBUF_NAMESPACE_ID::Enum >(Arena* arena) {
-  return Arena::CreateMessageInternal< ::PROTOBUF_NAMESPACE_ID::Enum >(arena);
-}
-template<> PROTOBUF_NOINLINE ::PROTOBUF_NAMESPACE_ID::EnumValue*
-Arena::CreateMaybeMessage< ::PROTOBUF_NAMESPACE_ID::EnumValue >(Arena* arena) {
-  return Arena::CreateMessageInternal< ::PROTOBUF_NAMESPACE_ID::EnumValue >(arena);
-}
-template<> PROTOBUF_NOINLINE ::PROTOBUF_NAMESPACE_ID::Option*
-Arena::CreateMaybeMessage< ::PROTOBUF_NAMESPACE_ID::Option >(Arena* arena) {
-  return Arena::CreateMessageInternal< ::PROTOBUF_NAMESPACE_ID::Option >(arena);
-}
-PROTOBUF_NAMESPACE_CLOSE
-
-// @@protoc_insertion_point(global_scope)
-#include <google/protobuf/port_undef.inc>
diff --git a/libs/protobuf/src/google/protobuf/type.pb.h b/libs/protobuf/src/google/protobuf/type.pb.h
deleted file mode 100644
index cb8105a..0000000
--- a/libs/protobuf/src/google/protobuf/type.pb.h
+++ /dev/null
@@ -1,2571 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/protobuf/type.proto
-
-#ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2ftype_2eproto
-#define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2ftype_2eproto
-
-#include <limits>
-#include <string>
-
-#include <google/protobuf/port_def.inc>
-#if PROTOBUF_VERSION < 3021000
-#error This file was generated by a newer version of protoc which is
-#error incompatible with your Protocol Buffer headers. Please update
-#error your headers.
-#endif
-#if 3021012 < PROTOBUF_MIN_PROTOC_VERSION
-#error This file was generated by an older version of protoc which is
-#error incompatible with your Protocol Buffer headers. Please
-#error regenerate this file with a newer version of protoc.
-#endif
-
-#include <google/protobuf/port_undef.inc>
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/arena.h>
-#include <google/protobuf/arenastring.h>
-#include <google/protobuf/generated_message_util.h>
-#include <google/protobuf/metadata_lite.h>
-#include <google/protobuf/generated_message_reflection.h>
-#include <google/protobuf/message.h>
-#include <google/protobuf/repeated_field.h>  // IWYU pragma: export
-#include <google/protobuf/extension_set.h>  // IWYU pragma: export
-#include <google/protobuf/generated_enum_reflection.h>
-#include <google/protobuf/unknown_field_set.h>
-#include <google/protobuf/any.pb.h>
-#include <google/protobuf/source_context.pb.h>
-// @@protoc_insertion_point(includes)
-#include <google/protobuf/port_def.inc>
-#define PROTOBUF_INTERNAL_EXPORT_google_2fprotobuf_2ftype_2eproto PROTOBUF_EXPORT
-PROTOBUF_NAMESPACE_OPEN
-namespace internal {
-class AnyMetadata;
-}  // namespace internal
-PROTOBUF_NAMESPACE_CLOSE
-
-// Internal implementation detail -- do not use these members.
-struct PROTOBUF_EXPORT TableStruct_google_2fprotobuf_2ftype_2eproto {
-  static const uint32_t offsets[];
-};
-PROTOBUF_EXPORT extern const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable descriptor_table_google_2fprotobuf_2ftype_2eproto;
-PROTOBUF_NAMESPACE_OPEN
-class Enum;
-struct EnumDefaultTypeInternal;
-PROTOBUF_EXPORT extern EnumDefaultTypeInternal _Enum_default_instance_;
-class EnumValue;
-struct EnumValueDefaultTypeInternal;
-PROTOBUF_EXPORT extern EnumValueDefaultTypeInternal _EnumValue_default_instance_;
-class Field;
-struct FieldDefaultTypeInternal;
-PROTOBUF_EXPORT extern FieldDefaultTypeInternal _Field_default_instance_;
-class Option;
-struct OptionDefaultTypeInternal;
-PROTOBUF_EXPORT extern OptionDefaultTypeInternal _Option_default_instance_;
-class Type;
-struct TypeDefaultTypeInternal;
-PROTOBUF_EXPORT extern TypeDefaultTypeInternal _Type_default_instance_;
-PROTOBUF_NAMESPACE_CLOSE
-PROTOBUF_NAMESPACE_OPEN
-template<> PROTOBUF_EXPORT ::PROTOBUF_NAMESPACE_ID::Enum* Arena::CreateMaybeMessage<::PROTOBUF_NAMESPACE_ID::Enum>(Arena*);
-template<> PROTOBUF_EXPORT ::PROTOBUF_NAMESPACE_ID::EnumValue* Arena::CreateMaybeMessage<::PROTOBUF_NAMESPACE_ID::EnumValue>(Arena*);
-template<> PROTOBUF_EXPORT ::PROTOBUF_NAMESPACE_ID::Field* Arena::CreateMaybeMessage<::PROTOBUF_NAMESPACE_ID::Field>(Arena*);
-template<> PROTOBUF_EXPORT ::PROTOBUF_NAMESPACE_ID::Option* Arena::CreateMaybeMessage<::PROTOBUF_NAMESPACE_ID::Option>(Arena*);
-template<> PROTOBUF_EXPORT ::PROTOBUF_NAMESPACE_ID::Type* Arena::CreateMaybeMessage<::PROTOBUF_NAMESPACE_ID::Type>(Arena*);
-PROTOBUF_NAMESPACE_CLOSE
-PROTOBUF_NAMESPACE_OPEN
-
-enum Field_Kind : int {
-  Field_Kind_TYPE_UNKNOWN = 0,
-  Field_Kind_TYPE_DOUBLE = 1,
-  Field_Kind_TYPE_FLOAT = 2,
-  Field_Kind_TYPE_INT64 = 3,
-  Field_Kind_TYPE_UINT64 = 4,
-  Field_Kind_TYPE_INT32 = 5,
-  Field_Kind_TYPE_FIXED64 = 6,
-  Field_Kind_TYPE_FIXED32 = 7,
-  Field_Kind_TYPE_BOOL = 8,
-  Field_Kind_TYPE_STRING = 9,
-  Field_Kind_TYPE_GROUP = 10,
-  Field_Kind_TYPE_MESSAGE = 11,
-  Field_Kind_TYPE_BYTES = 12,
-  Field_Kind_TYPE_UINT32 = 13,
-  Field_Kind_TYPE_ENUM = 14,
-  Field_Kind_TYPE_SFIXED32 = 15,
-  Field_Kind_TYPE_SFIXED64 = 16,
-  Field_Kind_TYPE_SINT32 = 17,
-  Field_Kind_TYPE_SINT64 = 18,
-  Field_Kind_Field_Kind_INT_MIN_SENTINEL_DO_NOT_USE_ = std::numeric_limits<int32_t>::min(),
-  Field_Kind_Field_Kind_INT_MAX_SENTINEL_DO_NOT_USE_ = std::numeric_limits<int32_t>::max()
-};
-PROTOBUF_EXPORT bool Field_Kind_IsValid(int value);
-constexpr Field_Kind Field_Kind_Kind_MIN = Field_Kind_TYPE_UNKNOWN;
-constexpr Field_Kind Field_Kind_Kind_MAX = Field_Kind_TYPE_SINT64;
-constexpr int Field_Kind_Kind_ARRAYSIZE = Field_Kind_Kind_MAX + 1;
-
-PROTOBUF_EXPORT const ::PROTOBUF_NAMESPACE_ID::EnumDescriptor* Field_Kind_descriptor();
-template<typename T>
-inline const std::string& Field_Kind_Name(T enum_t_value) {
-  static_assert(::std::is_same<T, Field_Kind>::value ||
-    ::std::is_integral<T>::value,
-    "Incorrect type passed to function Field_Kind_Name.");
-  return ::PROTOBUF_NAMESPACE_ID::internal::NameOfEnum(
-    Field_Kind_descriptor(), enum_t_value);
-}
-inline bool Field_Kind_Parse(
-    ::PROTOBUF_NAMESPACE_ID::ConstStringParam name, Field_Kind* value) {
-  return ::PROTOBUF_NAMESPACE_ID::internal::ParseNamedEnum<Field_Kind>(
-    Field_Kind_descriptor(), name, value);
-}
-enum Field_Cardinality : int {
-  Field_Cardinality_CARDINALITY_UNKNOWN = 0,
-  Field_Cardinality_CARDINALITY_OPTIONAL = 1,
-  Field_Cardinality_CARDINALITY_REQUIRED = 2,
-  Field_Cardinality_CARDINALITY_REPEATED = 3,
-  Field_Cardinality_Field_Cardinality_INT_MIN_SENTINEL_DO_NOT_USE_ = std::numeric_limits<int32_t>::min(),
-  Field_Cardinality_Field_Cardinality_INT_MAX_SENTINEL_DO_NOT_USE_ = std::numeric_limits<int32_t>::max()
-};
-PROTOBUF_EXPORT bool Field_Cardinality_IsValid(int value);
-constexpr Field_Cardinality Field_Cardinality_Cardinality_MIN = Field_Cardinality_CARDINALITY_UNKNOWN;
-constexpr Field_Cardinality Field_Cardinality_Cardinality_MAX = Field_Cardinality_CARDINALITY_REPEATED;
-constexpr int Field_Cardinality_Cardinality_ARRAYSIZE = Field_Cardinality_Cardinality_MAX + 1;
-
-PROTOBUF_EXPORT const ::PROTOBUF_NAMESPACE_ID::EnumDescriptor* Field_Cardinality_descriptor();
-template<typename T>
-inline const std::string& Field_Cardinality_Name(T enum_t_value) {
-  static_assert(::std::is_same<T, Field_Cardinality>::value ||
-    ::std::is_integral<T>::value,
-    "Incorrect type passed to function Field_Cardinality_Name.");
-  return ::PROTOBUF_NAMESPACE_ID::internal::NameOfEnum(
-    Field_Cardinality_descriptor(), enum_t_value);
-}
-inline bool Field_Cardinality_Parse(
-    ::PROTOBUF_NAMESPACE_ID::ConstStringParam name, Field_Cardinality* value) {
-  return ::PROTOBUF_NAMESPACE_ID::internal::ParseNamedEnum<Field_Cardinality>(
-    Field_Cardinality_descriptor(), name, value);
-}
-enum Syntax : int {
-  SYNTAX_PROTO2 = 0,
-  SYNTAX_PROTO3 = 1,
-  Syntax_INT_MIN_SENTINEL_DO_NOT_USE_ = std::numeric_limits<int32_t>::min(),
-  Syntax_INT_MAX_SENTINEL_DO_NOT_USE_ = std::numeric_limits<int32_t>::max()
-};
-PROTOBUF_EXPORT bool Syntax_IsValid(int value);
-constexpr Syntax Syntax_MIN = SYNTAX_PROTO2;
-constexpr Syntax Syntax_MAX = SYNTAX_PROTO3;
-constexpr int Syntax_ARRAYSIZE = Syntax_MAX + 1;
-
-PROTOBUF_EXPORT const ::PROTOBUF_NAMESPACE_ID::EnumDescriptor* Syntax_descriptor();
-template<typename T>
-inline const std::string& Syntax_Name(T enum_t_value) {
-  static_assert(::std::is_same<T, Syntax>::value ||
-    ::std::is_integral<T>::value,
-    "Incorrect type passed to function Syntax_Name.");
-  return ::PROTOBUF_NAMESPACE_ID::internal::NameOfEnum(
-    Syntax_descriptor(), enum_t_value);
-}
-inline bool Syntax_Parse(
-    ::PROTOBUF_NAMESPACE_ID::ConstStringParam name, Syntax* value) {
-  return ::PROTOBUF_NAMESPACE_ID::internal::ParseNamedEnum<Syntax>(
-    Syntax_descriptor(), name, value);
-}
-// ===================================================================
-
-class PROTOBUF_EXPORT Type final :
-    public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:google.protobuf.Type) */ {
- public:
-  inline Type() : Type(nullptr) {}
-  ~Type() override;
-  explicit PROTOBUF_CONSTEXPR Type(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
-
-  Type(const Type& from);
-  Type(Type&& from) noexcept
-    : Type() {
-    *this = ::std::move(from);
-  }
-
-  inline Type& operator=(const Type& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline Type& operator=(Type&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetOwningArena() == from.GetOwningArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetOwningArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const Type& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const Type* internal_default_instance() {
-    return reinterpret_cast<const Type*>(
-               &_Type_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    0;
-
-  friend void swap(Type& a, Type& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(Type* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() != nullptr &&
-        GetOwningArena() == other->GetOwningArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() == other->GetOwningArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(Type* other) {
-    if (other == this) return;
-    GOOGLE_DCHECK(GetOwningArena() == other->GetOwningArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  Type* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<Type>(arena);
-  }
-  using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
-  void CopyFrom(const Type& from);
-  using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom( const Type& from) {
-    Type::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  uint8_t* _InternalSerialize(
-      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
-
-  private:
-  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
-  void SharedDtor();
-  void SetCachedSize(int size) const final;
-  void InternalSwap(Type* other);
-
-  private:
-  friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
-  static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
-    return "google.protobuf.Type";
-  }
-  protected:
-  explicit Type(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                       bool is_message_owned = false);
-  public:
-
-  static const ClassData _class_data_;
-  const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*GetClassData() const final;
-
-  ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kFieldsFieldNumber = 2,
-    kOneofsFieldNumber = 3,
-    kOptionsFieldNumber = 4,
-    kNameFieldNumber = 1,
-    kSourceContextFieldNumber = 5,
-    kSyntaxFieldNumber = 6,
-  };
-  // repeated .google.protobuf.Field fields = 2;
-  int fields_size() const;
-  private:
-  int _internal_fields_size() const;
-  public:
-  void clear_fields();
-  ::PROTOBUF_NAMESPACE_ID::Field* mutable_fields(int index);
-  ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::Field >*
-      mutable_fields();
-  private:
-  const ::PROTOBUF_NAMESPACE_ID::Field& _internal_fields(int index) const;
-  ::PROTOBUF_NAMESPACE_ID::Field* _internal_add_fields();
-  public:
-  const ::PROTOBUF_NAMESPACE_ID::Field& fields(int index) const;
-  ::PROTOBUF_NAMESPACE_ID::Field* add_fields();
-  const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::Field >&
-      fields() const;
-
-  // repeated string oneofs = 3;
-  int oneofs_size() const;
-  private:
-  int _internal_oneofs_size() const;
-  public:
-  void clear_oneofs();
-  const std::string& oneofs(int index) const;
-  std::string* mutable_oneofs(int index);
-  void set_oneofs(int index, const std::string& value);
-  void set_oneofs(int index, std::string&& value);
-  void set_oneofs(int index, const char* value);
-  void set_oneofs(int index, const char* value, size_t size);
-  std::string* add_oneofs();
-  void add_oneofs(const std::string& value);
-  void add_oneofs(std::string&& value);
-  void add_oneofs(const char* value);
-  void add_oneofs(const char* value, size_t size);
-  const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string>& oneofs() const;
-  ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string>* mutable_oneofs();
-  private:
-  const std::string& _internal_oneofs(int index) const;
-  std::string* _internal_add_oneofs();
-  public:
-
-  // repeated .google.protobuf.Option options = 4;
-  int options_size() const;
-  private:
-  int _internal_options_size() const;
-  public:
-  void clear_options();
-  ::PROTOBUF_NAMESPACE_ID::Option* mutable_options(int index);
-  ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::Option >*
-      mutable_options();
-  private:
-  const ::PROTOBUF_NAMESPACE_ID::Option& _internal_options(int index) const;
-  ::PROTOBUF_NAMESPACE_ID::Option* _internal_add_options();
-  public:
-  const ::PROTOBUF_NAMESPACE_ID::Option& options(int index) const;
-  ::PROTOBUF_NAMESPACE_ID::Option* add_options();
-  const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::Option >&
-      options() const;
-
-  // string name = 1;
-  void clear_name();
-  const std::string& name() const;
-  template <typename ArgT0 = const std::string&, typename... ArgT>
-  void set_name(ArgT0&& arg0, ArgT... args);
-  std::string* mutable_name();
-  PROTOBUF_NODISCARD std::string* release_name();
-  void set_allocated_name(std::string* name);
-  private:
-  const std::string& _internal_name() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_name(const std::string& value);
-  std::string* _internal_mutable_name();
-  public:
-
-  // .google.protobuf.SourceContext source_context = 5;
-  bool has_source_context() const;
-  private:
-  bool _internal_has_source_context() const;
-  public:
-  void clear_source_context();
-  const ::PROTOBUF_NAMESPACE_ID::SourceContext& source_context() const;
-  PROTOBUF_NODISCARD ::PROTOBUF_NAMESPACE_ID::SourceContext* release_source_context();
-  ::PROTOBUF_NAMESPACE_ID::SourceContext* mutable_source_context();
-  void set_allocated_source_context(::PROTOBUF_NAMESPACE_ID::SourceContext* source_context);
-  private:
-  const ::PROTOBUF_NAMESPACE_ID::SourceContext& _internal_source_context() const;
-  ::PROTOBUF_NAMESPACE_ID::SourceContext* _internal_mutable_source_context();
-  public:
-  void unsafe_arena_set_allocated_source_context(
-      ::PROTOBUF_NAMESPACE_ID::SourceContext* source_context);
-  ::PROTOBUF_NAMESPACE_ID::SourceContext* unsafe_arena_release_source_context();
-
-  // .google.protobuf.Syntax syntax = 6;
-  void clear_syntax();
-  ::PROTOBUF_NAMESPACE_ID::Syntax syntax() const;
-  void set_syntax(::PROTOBUF_NAMESPACE_ID::Syntax value);
-  private:
-  ::PROTOBUF_NAMESPACE_ID::Syntax _internal_syntax() const;
-  void _internal_set_syntax(::PROTOBUF_NAMESPACE_ID::Syntax value);
-  public:
-
-  // @@protoc_insertion_point(class_scope:google.protobuf.Type)
- private:
-  class _Internal;
-
-  template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
-  typedef void InternalArenaConstructable_;
-  typedef void DestructorSkippable_;
-  struct Impl_ {
-    ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::Field > fields_;
-    ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string> oneofs_;
-    ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::Option > options_;
-    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr name_;
-    ::PROTOBUF_NAMESPACE_ID::SourceContext* source_context_;
-    int syntax_;
-    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_google_2fprotobuf_2ftype_2eproto;
-};
-// -------------------------------------------------------------------
-
-class PROTOBUF_EXPORT Field final :
-    public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:google.protobuf.Field) */ {
- public:
-  inline Field() : Field(nullptr) {}
-  ~Field() override;
-  explicit PROTOBUF_CONSTEXPR Field(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
-
-  Field(const Field& from);
-  Field(Field&& from) noexcept
-    : Field() {
-    *this = ::std::move(from);
-  }
-
-  inline Field& operator=(const Field& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline Field& operator=(Field&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetOwningArena() == from.GetOwningArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetOwningArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const Field& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const Field* internal_default_instance() {
-    return reinterpret_cast<const Field*>(
-               &_Field_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    1;
-
-  friend void swap(Field& a, Field& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(Field* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() != nullptr &&
-        GetOwningArena() == other->GetOwningArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() == other->GetOwningArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(Field* other) {
-    if (other == this) return;
-    GOOGLE_DCHECK(GetOwningArena() == other->GetOwningArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  Field* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<Field>(arena);
-  }
-  using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
-  void CopyFrom(const Field& from);
-  using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom( const Field& from) {
-    Field::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  uint8_t* _InternalSerialize(
-      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
-
-  private:
-  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
-  void SharedDtor();
-  void SetCachedSize(int size) const final;
-  void InternalSwap(Field* other);
-
-  private:
-  friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
-  static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
-    return "google.protobuf.Field";
-  }
-  protected:
-  explicit Field(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                       bool is_message_owned = false);
-  public:
-
-  static const ClassData _class_data_;
-  const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*GetClassData() const final;
-
-  ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  typedef Field_Kind Kind;
-  static constexpr Kind TYPE_UNKNOWN =
-    Field_Kind_TYPE_UNKNOWN;
-  static constexpr Kind TYPE_DOUBLE =
-    Field_Kind_TYPE_DOUBLE;
-  static constexpr Kind TYPE_FLOAT =
-    Field_Kind_TYPE_FLOAT;
-  static constexpr Kind TYPE_INT64 =
-    Field_Kind_TYPE_INT64;
-  static constexpr Kind TYPE_UINT64 =
-    Field_Kind_TYPE_UINT64;
-  static constexpr Kind TYPE_INT32 =
-    Field_Kind_TYPE_INT32;
-  static constexpr Kind TYPE_FIXED64 =
-    Field_Kind_TYPE_FIXED64;
-  static constexpr Kind TYPE_FIXED32 =
-    Field_Kind_TYPE_FIXED32;
-  static constexpr Kind TYPE_BOOL =
-    Field_Kind_TYPE_BOOL;
-  static constexpr Kind TYPE_STRING =
-    Field_Kind_TYPE_STRING;
-  static constexpr Kind TYPE_GROUP =
-    Field_Kind_TYPE_GROUP;
-  static constexpr Kind TYPE_MESSAGE =
-    Field_Kind_TYPE_MESSAGE;
-  static constexpr Kind TYPE_BYTES =
-    Field_Kind_TYPE_BYTES;
-  static constexpr Kind TYPE_UINT32 =
-    Field_Kind_TYPE_UINT32;
-  static constexpr Kind TYPE_ENUM =
-    Field_Kind_TYPE_ENUM;
-  static constexpr Kind TYPE_SFIXED32 =
-    Field_Kind_TYPE_SFIXED32;
-  static constexpr Kind TYPE_SFIXED64 =
-    Field_Kind_TYPE_SFIXED64;
-  static constexpr Kind TYPE_SINT32 =
-    Field_Kind_TYPE_SINT32;
-  static constexpr Kind TYPE_SINT64 =
-    Field_Kind_TYPE_SINT64;
-  static inline bool Kind_IsValid(int value) {
-    return Field_Kind_IsValid(value);
-  }
-  static constexpr Kind Kind_MIN =
-    Field_Kind_Kind_MIN;
-  static constexpr Kind Kind_MAX =
-    Field_Kind_Kind_MAX;
-  static constexpr int Kind_ARRAYSIZE =
-    Field_Kind_Kind_ARRAYSIZE;
-  static inline const ::PROTOBUF_NAMESPACE_ID::EnumDescriptor*
-  Kind_descriptor() {
-    return Field_Kind_descriptor();
-  }
-  template<typename T>
-  static inline const std::string& Kind_Name(T enum_t_value) {
-    static_assert(::std::is_same<T, Kind>::value ||
-      ::std::is_integral<T>::value,
-      "Incorrect type passed to function Kind_Name.");
-    return Field_Kind_Name(enum_t_value);
-  }
-  static inline bool Kind_Parse(::PROTOBUF_NAMESPACE_ID::ConstStringParam name,
-      Kind* value) {
-    return Field_Kind_Parse(name, value);
-  }
-
-  typedef Field_Cardinality Cardinality;
-  static constexpr Cardinality CARDINALITY_UNKNOWN =
-    Field_Cardinality_CARDINALITY_UNKNOWN;
-  static constexpr Cardinality CARDINALITY_OPTIONAL =
-    Field_Cardinality_CARDINALITY_OPTIONAL;
-  static constexpr Cardinality CARDINALITY_REQUIRED =
-    Field_Cardinality_CARDINALITY_REQUIRED;
-  static constexpr Cardinality CARDINALITY_REPEATED =
-    Field_Cardinality_CARDINALITY_REPEATED;
-  static inline bool Cardinality_IsValid(int value) {
-    return Field_Cardinality_IsValid(value);
-  }
-  static constexpr Cardinality Cardinality_MIN =
-    Field_Cardinality_Cardinality_MIN;
-  static constexpr Cardinality Cardinality_MAX =
-    Field_Cardinality_Cardinality_MAX;
-  static constexpr int Cardinality_ARRAYSIZE =
-    Field_Cardinality_Cardinality_ARRAYSIZE;
-  static inline const ::PROTOBUF_NAMESPACE_ID::EnumDescriptor*
-  Cardinality_descriptor() {
-    return Field_Cardinality_descriptor();
-  }
-  template<typename T>
-  static inline const std::string& Cardinality_Name(T enum_t_value) {
-    static_assert(::std::is_same<T, Cardinality>::value ||
-      ::std::is_integral<T>::value,
-      "Incorrect type passed to function Cardinality_Name.");
-    return Field_Cardinality_Name(enum_t_value);
-  }
-  static inline bool Cardinality_Parse(::PROTOBUF_NAMESPACE_ID::ConstStringParam name,
-      Cardinality* value) {
-    return Field_Cardinality_Parse(name, value);
-  }
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kOptionsFieldNumber = 9,
-    kNameFieldNumber = 4,
-    kTypeUrlFieldNumber = 6,
-    kJsonNameFieldNumber = 10,
-    kDefaultValueFieldNumber = 11,
-    kKindFieldNumber = 1,
-    kCardinalityFieldNumber = 2,
-    kNumberFieldNumber = 3,
-    kOneofIndexFieldNumber = 7,
-    kPackedFieldNumber = 8,
-  };
-  // repeated .google.protobuf.Option options = 9;
-  int options_size() const;
-  private:
-  int _internal_options_size() const;
-  public:
-  void clear_options();
-  ::PROTOBUF_NAMESPACE_ID::Option* mutable_options(int index);
-  ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::Option >*
-      mutable_options();
-  private:
-  const ::PROTOBUF_NAMESPACE_ID::Option& _internal_options(int index) const;
-  ::PROTOBUF_NAMESPACE_ID::Option* _internal_add_options();
-  public:
-  const ::PROTOBUF_NAMESPACE_ID::Option& options(int index) const;
-  ::PROTOBUF_NAMESPACE_ID::Option* add_options();
-  const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::Option >&
-      options() const;
-
-  // string name = 4;
-  void clear_name();
-  const std::string& name() const;
-  template <typename ArgT0 = const std::string&, typename... ArgT>
-  void set_name(ArgT0&& arg0, ArgT... args);
-  std::string* mutable_name();
-  PROTOBUF_NODISCARD std::string* release_name();
-  void set_allocated_name(std::string* name);
-  private:
-  const std::string& _internal_name() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_name(const std::string& value);
-  std::string* _internal_mutable_name();
-  public:
-
-  // string type_url = 6;
-  void clear_type_url();
-  const std::string& type_url() const;
-  template <typename ArgT0 = const std::string&, typename... ArgT>
-  void set_type_url(ArgT0&& arg0, ArgT... args);
-  std::string* mutable_type_url();
-  PROTOBUF_NODISCARD std::string* release_type_url();
-  void set_allocated_type_url(std::string* type_url);
-  private:
-  const std::string& _internal_type_url() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_type_url(const std::string& value);
-  std::string* _internal_mutable_type_url();
-  public:
-
-  // string json_name = 10;
-  void clear_json_name();
-  const std::string& json_name() const;
-  template <typename ArgT0 = const std::string&, typename... ArgT>
-  void set_json_name(ArgT0&& arg0, ArgT... args);
-  std::string* mutable_json_name();
-  PROTOBUF_NODISCARD std::string* release_json_name();
-  void set_allocated_json_name(std::string* json_name);
-  private:
-  const std::string& _internal_json_name() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_json_name(const std::string& value);
-  std::string* _internal_mutable_json_name();
-  public:
-
-  // string default_value = 11;
-  void clear_default_value();
-  const std::string& default_value() const;
-  template <typename ArgT0 = const std::string&, typename... ArgT>
-  void set_default_value(ArgT0&& arg0, ArgT... args);
-  std::string* mutable_default_value();
-  PROTOBUF_NODISCARD std::string* release_default_value();
-  void set_allocated_default_value(std::string* default_value);
-  private:
-  const std::string& _internal_default_value() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_default_value(const std::string& value);
-  std::string* _internal_mutable_default_value();
-  public:
-
-  // .google.protobuf.Field.Kind kind = 1;
-  void clear_kind();
-  ::PROTOBUF_NAMESPACE_ID::Field_Kind kind() const;
-  void set_kind(::PROTOBUF_NAMESPACE_ID::Field_Kind value);
-  private:
-  ::PROTOBUF_NAMESPACE_ID::Field_Kind _internal_kind() const;
-  void _internal_set_kind(::PROTOBUF_NAMESPACE_ID::Field_Kind value);
-  public:
-
-  // .google.protobuf.Field.Cardinality cardinality = 2;
-  void clear_cardinality();
-  ::PROTOBUF_NAMESPACE_ID::Field_Cardinality cardinality() const;
-  void set_cardinality(::PROTOBUF_NAMESPACE_ID::Field_Cardinality value);
-  private:
-  ::PROTOBUF_NAMESPACE_ID::Field_Cardinality _internal_cardinality() const;
-  void _internal_set_cardinality(::PROTOBUF_NAMESPACE_ID::Field_Cardinality value);
-  public:
-
-  // int32 number = 3;
-  void clear_number();
-  int32_t number() const;
-  void set_number(int32_t value);
-  private:
-  int32_t _internal_number() const;
-  void _internal_set_number(int32_t value);
-  public:
-
-  // int32 oneof_index = 7;
-  void clear_oneof_index();
-  int32_t oneof_index() const;
-  void set_oneof_index(int32_t value);
-  private:
-  int32_t _internal_oneof_index() const;
-  void _internal_set_oneof_index(int32_t value);
-  public:
-
-  // bool packed = 8;
-  void clear_packed();
-  bool packed() const;
-  void set_packed(bool value);
-  private:
-  bool _internal_packed() const;
-  void _internal_set_packed(bool value);
-  public:
-
-  // @@protoc_insertion_point(class_scope:google.protobuf.Field)
- private:
-  class _Internal;
-
-  template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
-  typedef void InternalArenaConstructable_;
-  typedef void DestructorSkippable_;
-  struct Impl_ {
-    ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::Option > options_;
-    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr name_;
-    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr type_url_;
-    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr json_name_;
-    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr default_value_;
-    int kind_;
-    int cardinality_;
-    int32_t number_;
-    int32_t oneof_index_;
-    bool packed_;
-    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_google_2fprotobuf_2ftype_2eproto;
-};
-// -------------------------------------------------------------------
-
-class PROTOBUF_EXPORT Enum final :
-    public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:google.protobuf.Enum) */ {
- public:
-  inline Enum() : Enum(nullptr) {}
-  ~Enum() override;
-  explicit PROTOBUF_CONSTEXPR Enum(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
-
-  Enum(const Enum& from);
-  Enum(Enum&& from) noexcept
-    : Enum() {
-    *this = ::std::move(from);
-  }
-
-  inline Enum& operator=(const Enum& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline Enum& operator=(Enum&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetOwningArena() == from.GetOwningArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetOwningArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const Enum& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const Enum* internal_default_instance() {
-    return reinterpret_cast<const Enum*>(
-               &_Enum_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    2;
-
-  friend void swap(Enum& a, Enum& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(Enum* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() != nullptr &&
-        GetOwningArena() == other->GetOwningArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() == other->GetOwningArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(Enum* other) {
-    if (other == this) return;
-    GOOGLE_DCHECK(GetOwningArena() == other->GetOwningArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  Enum* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<Enum>(arena);
-  }
-  using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
-  void CopyFrom(const Enum& from);
-  using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom( const Enum& from) {
-    Enum::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  uint8_t* _InternalSerialize(
-      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
-
-  private:
-  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
-  void SharedDtor();
-  void SetCachedSize(int size) const final;
-  void InternalSwap(Enum* other);
-
-  private:
-  friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
-  static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
-    return "google.protobuf.Enum";
-  }
-  protected:
-  explicit Enum(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                       bool is_message_owned = false);
-  public:
-
-  static const ClassData _class_data_;
-  const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*GetClassData() const final;
-
-  ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kEnumvalueFieldNumber = 2,
-    kOptionsFieldNumber = 3,
-    kNameFieldNumber = 1,
-    kSourceContextFieldNumber = 4,
-    kSyntaxFieldNumber = 5,
-  };
-  // repeated .google.protobuf.EnumValue enumvalue = 2;
-  int enumvalue_size() const;
-  private:
-  int _internal_enumvalue_size() const;
-  public:
-  void clear_enumvalue();
-  ::PROTOBUF_NAMESPACE_ID::EnumValue* mutable_enumvalue(int index);
-  ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::EnumValue >*
-      mutable_enumvalue();
-  private:
-  const ::PROTOBUF_NAMESPACE_ID::EnumValue& _internal_enumvalue(int index) const;
-  ::PROTOBUF_NAMESPACE_ID::EnumValue* _internal_add_enumvalue();
-  public:
-  const ::PROTOBUF_NAMESPACE_ID::EnumValue& enumvalue(int index) const;
-  ::PROTOBUF_NAMESPACE_ID::EnumValue* add_enumvalue();
-  const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::EnumValue >&
-      enumvalue() const;
-
-  // repeated .google.protobuf.Option options = 3;
-  int options_size() const;
-  private:
-  int _internal_options_size() const;
-  public:
-  void clear_options();
-  ::PROTOBUF_NAMESPACE_ID::Option* mutable_options(int index);
-  ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::Option >*
-      mutable_options();
-  private:
-  const ::PROTOBUF_NAMESPACE_ID::Option& _internal_options(int index) const;
-  ::PROTOBUF_NAMESPACE_ID::Option* _internal_add_options();
-  public:
-  const ::PROTOBUF_NAMESPACE_ID::Option& options(int index) const;
-  ::PROTOBUF_NAMESPACE_ID::Option* add_options();
-  const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::Option >&
-      options() const;
-
-  // string name = 1;
-  void clear_name();
-  const std::string& name() const;
-  template <typename ArgT0 = const std::string&, typename... ArgT>
-  void set_name(ArgT0&& arg0, ArgT... args);
-  std::string* mutable_name();
-  PROTOBUF_NODISCARD std::string* release_name();
-  void set_allocated_name(std::string* name);
-  private:
-  const std::string& _internal_name() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_name(const std::string& value);
-  std::string* _internal_mutable_name();
-  public:
-
-  // .google.protobuf.SourceContext source_context = 4;
-  bool has_source_context() const;
-  private:
-  bool _internal_has_source_context() const;
-  public:
-  void clear_source_context();
-  const ::PROTOBUF_NAMESPACE_ID::SourceContext& source_context() const;
-  PROTOBUF_NODISCARD ::PROTOBUF_NAMESPACE_ID::SourceContext* release_source_context();
-  ::PROTOBUF_NAMESPACE_ID::SourceContext* mutable_source_context();
-  void set_allocated_source_context(::PROTOBUF_NAMESPACE_ID::SourceContext* source_context);
-  private:
-  const ::PROTOBUF_NAMESPACE_ID::SourceContext& _internal_source_context() const;
-  ::PROTOBUF_NAMESPACE_ID::SourceContext* _internal_mutable_source_context();
-  public:
-  void unsafe_arena_set_allocated_source_context(
-      ::PROTOBUF_NAMESPACE_ID::SourceContext* source_context);
-  ::PROTOBUF_NAMESPACE_ID::SourceContext* unsafe_arena_release_source_context();
-
-  // .google.protobuf.Syntax syntax = 5;
-  void clear_syntax();
-  ::PROTOBUF_NAMESPACE_ID::Syntax syntax() const;
-  void set_syntax(::PROTOBUF_NAMESPACE_ID::Syntax value);
-  private:
-  ::PROTOBUF_NAMESPACE_ID::Syntax _internal_syntax() const;
-  void _internal_set_syntax(::PROTOBUF_NAMESPACE_ID::Syntax value);
-  public:
-
-  // @@protoc_insertion_point(class_scope:google.protobuf.Enum)
- private:
-  class _Internal;
-
-  template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
-  typedef void InternalArenaConstructable_;
-  typedef void DestructorSkippable_;
-  struct Impl_ {
-    ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::EnumValue > enumvalue_;
-    ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::Option > options_;
-    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr name_;
-    ::PROTOBUF_NAMESPACE_ID::SourceContext* source_context_;
-    int syntax_;
-    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_google_2fprotobuf_2ftype_2eproto;
-};
-// -------------------------------------------------------------------
-
-class PROTOBUF_EXPORT EnumValue final :
-    public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:google.protobuf.EnumValue) */ {
- public:
-  inline EnumValue() : EnumValue(nullptr) {}
-  ~EnumValue() override;
-  explicit PROTOBUF_CONSTEXPR EnumValue(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
-
-  EnumValue(const EnumValue& from);
-  EnumValue(EnumValue&& from) noexcept
-    : EnumValue() {
-    *this = ::std::move(from);
-  }
-
-  inline EnumValue& operator=(const EnumValue& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline EnumValue& operator=(EnumValue&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetOwningArena() == from.GetOwningArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetOwningArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const EnumValue& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const EnumValue* internal_default_instance() {
-    return reinterpret_cast<const EnumValue*>(
-               &_EnumValue_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    3;
-
-  friend void swap(EnumValue& a, EnumValue& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(EnumValue* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() != nullptr &&
-        GetOwningArena() == other->GetOwningArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() == other->GetOwningArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(EnumValue* other) {
-    if (other == this) return;
-    GOOGLE_DCHECK(GetOwningArena() == other->GetOwningArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  EnumValue* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<EnumValue>(arena);
-  }
-  using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
-  void CopyFrom(const EnumValue& from);
-  using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom( const EnumValue& from) {
-    EnumValue::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  uint8_t* _InternalSerialize(
-      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
-
-  private:
-  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
-  void SharedDtor();
-  void SetCachedSize(int size) const final;
-  void InternalSwap(EnumValue* other);
-
-  private:
-  friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
-  static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
-    return "google.protobuf.EnumValue";
-  }
-  protected:
-  explicit EnumValue(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                       bool is_message_owned = false);
-  public:
-
-  static const ClassData _class_data_;
-  const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*GetClassData() const final;
-
-  ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kOptionsFieldNumber = 3,
-    kNameFieldNumber = 1,
-    kNumberFieldNumber = 2,
-  };
-  // repeated .google.protobuf.Option options = 3;
-  int options_size() const;
-  private:
-  int _internal_options_size() const;
-  public:
-  void clear_options();
-  ::PROTOBUF_NAMESPACE_ID::Option* mutable_options(int index);
-  ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::Option >*
-      mutable_options();
-  private:
-  const ::PROTOBUF_NAMESPACE_ID::Option& _internal_options(int index) const;
-  ::PROTOBUF_NAMESPACE_ID::Option* _internal_add_options();
-  public:
-  const ::PROTOBUF_NAMESPACE_ID::Option& options(int index) const;
-  ::PROTOBUF_NAMESPACE_ID::Option* add_options();
-  const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::Option >&
-      options() const;
-
-  // string name = 1;
-  void clear_name();
-  const std::string& name() const;
-  template <typename ArgT0 = const std::string&, typename... ArgT>
-  void set_name(ArgT0&& arg0, ArgT... args);
-  std::string* mutable_name();
-  PROTOBUF_NODISCARD std::string* release_name();
-  void set_allocated_name(std::string* name);
-  private:
-  const std::string& _internal_name() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_name(const std::string& value);
-  std::string* _internal_mutable_name();
-  public:
-
-  // int32 number = 2;
-  void clear_number();
-  int32_t number() const;
-  void set_number(int32_t value);
-  private:
-  int32_t _internal_number() const;
-  void _internal_set_number(int32_t value);
-  public:
-
-  // @@protoc_insertion_point(class_scope:google.protobuf.EnumValue)
- private:
-  class _Internal;
-
-  template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
-  typedef void InternalArenaConstructable_;
-  typedef void DestructorSkippable_;
-  struct Impl_ {
-    ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::Option > options_;
-    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr name_;
-    int32_t number_;
-    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_google_2fprotobuf_2ftype_2eproto;
-};
-// -------------------------------------------------------------------
-
-class PROTOBUF_EXPORT Option final :
-    public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:google.protobuf.Option) */ {
- public:
-  inline Option() : Option(nullptr) {}
-  ~Option() override;
-  explicit PROTOBUF_CONSTEXPR Option(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
-
-  Option(const Option& from);
-  Option(Option&& from) noexcept
-    : Option() {
-    *this = ::std::move(from);
-  }
-
-  inline Option& operator=(const Option& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline Option& operator=(Option&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetOwningArena() == from.GetOwningArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetOwningArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const Option& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const Option* internal_default_instance() {
-    return reinterpret_cast<const Option*>(
-               &_Option_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    4;
-
-  friend void swap(Option& a, Option& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(Option* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() != nullptr &&
-        GetOwningArena() == other->GetOwningArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() == other->GetOwningArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(Option* other) {
-    if (other == this) return;
-    GOOGLE_DCHECK(GetOwningArena() == other->GetOwningArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  Option* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<Option>(arena);
-  }
-  using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
-  void CopyFrom(const Option& from);
-  using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom( const Option& from) {
-    Option::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  uint8_t* _InternalSerialize(
-      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
-
-  private:
-  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
-  void SharedDtor();
-  void SetCachedSize(int size) const final;
-  void InternalSwap(Option* other);
-
-  private:
-  friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
-  static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
-    return "google.protobuf.Option";
-  }
-  protected:
-  explicit Option(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                       bool is_message_owned = false);
-  public:
-
-  static const ClassData _class_data_;
-  const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*GetClassData() const final;
-
-  ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kNameFieldNumber = 1,
-    kValueFieldNumber = 2,
-  };
-  // string name = 1;
-  void clear_name();
-  const std::string& name() const;
-  template <typename ArgT0 = const std::string&, typename... ArgT>
-  void set_name(ArgT0&& arg0, ArgT... args);
-  std::string* mutable_name();
-  PROTOBUF_NODISCARD std::string* release_name();
-  void set_allocated_name(std::string* name);
-  private:
-  const std::string& _internal_name() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_name(const std::string& value);
-  std::string* _internal_mutable_name();
-  public:
-
-  // .google.protobuf.Any value = 2;
-  bool has_value() const;
-  private:
-  bool _internal_has_value() const;
-  public:
-  void clear_value();
-  const ::PROTOBUF_NAMESPACE_ID::Any& value() const;
-  PROTOBUF_NODISCARD ::PROTOBUF_NAMESPACE_ID::Any* release_value();
-  ::PROTOBUF_NAMESPACE_ID::Any* mutable_value();
-  void set_allocated_value(::PROTOBUF_NAMESPACE_ID::Any* value);
-  private:
-  const ::PROTOBUF_NAMESPACE_ID::Any& _internal_value() const;
-  ::PROTOBUF_NAMESPACE_ID::Any* _internal_mutable_value();
-  public:
-  void unsafe_arena_set_allocated_value(
-      ::PROTOBUF_NAMESPACE_ID::Any* value);
-  ::PROTOBUF_NAMESPACE_ID::Any* unsafe_arena_release_value();
-
-  // @@protoc_insertion_point(class_scope:google.protobuf.Option)
- private:
-  class _Internal;
-
-  template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
-  typedef void InternalArenaConstructable_;
-  typedef void DestructorSkippable_;
-  struct Impl_ {
-    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr name_;
-    ::PROTOBUF_NAMESPACE_ID::Any* value_;
-    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_google_2fprotobuf_2ftype_2eproto;
-};
-// ===================================================================
-
-
-// ===================================================================
-
-#ifdef __GNUC__
-  #pragma GCC diagnostic push
-  #pragma GCC diagnostic ignored "-Wstrict-aliasing"
-#endif  // __GNUC__
-// Type
-
-// string name = 1;
-inline void Type::clear_name() {
-  _impl_.name_.ClearToEmpty();
-}
-inline const std::string& Type::name() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.Type.name)
-  return _internal_name();
-}
-template <typename ArgT0, typename... ArgT>
-inline PROTOBUF_ALWAYS_INLINE
-void Type::set_name(ArgT0&& arg0, ArgT... args) {
- 
- _impl_.name_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
-  // @@protoc_insertion_point(field_set:google.protobuf.Type.name)
-}
-inline std::string* Type::mutable_name() {
-  std::string* _s = _internal_mutable_name();
-  // @@protoc_insertion_point(field_mutable:google.protobuf.Type.name)
-  return _s;
-}
-inline const std::string& Type::_internal_name() const {
-  return _impl_.name_.Get();
-}
-inline void Type::_internal_set_name(const std::string& value) {
-  
-  _impl_.name_.Set(value, GetArenaForAllocation());
-}
-inline std::string* Type::_internal_mutable_name() {
-  
-  return _impl_.name_.Mutable(GetArenaForAllocation());
-}
-inline std::string* Type::release_name() {
-  // @@protoc_insertion_point(field_release:google.protobuf.Type.name)
-  return _impl_.name_.Release();
-}
-inline void Type::set_allocated_name(std::string* name) {
-  if (name != nullptr) {
-    
-  } else {
-    
-  }
-  _impl_.name_.SetAllocated(name, GetArenaForAllocation());
-#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (_impl_.name_.IsDefault()) {
-    _impl_.name_.Set("", GetArenaForAllocation());
-  }
-#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:google.protobuf.Type.name)
-}
-
-// repeated .google.protobuf.Field fields = 2;
-inline int Type::_internal_fields_size() const {
-  return _impl_.fields_.size();
-}
-inline int Type::fields_size() const {
-  return _internal_fields_size();
-}
-inline void Type::clear_fields() {
-  _impl_.fields_.Clear();
-}
-inline ::PROTOBUF_NAMESPACE_ID::Field* Type::mutable_fields(int index) {
-  // @@protoc_insertion_point(field_mutable:google.protobuf.Type.fields)
-  return _impl_.fields_.Mutable(index);
-}
-inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::Field >*
-Type::mutable_fields() {
-  // @@protoc_insertion_point(field_mutable_list:google.protobuf.Type.fields)
-  return &_impl_.fields_;
-}
-inline const ::PROTOBUF_NAMESPACE_ID::Field& Type::_internal_fields(int index) const {
-  return _impl_.fields_.Get(index);
-}
-inline const ::PROTOBUF_NAMESPACE_ID::Field& Type::fields(int index) const {
-  // @@protoc_insertion_point(field_get:google.protobuf.Type.fields)
-  return _internal_fields(index);
-}
-inline ::PROTOBUF_NAMESPACE_ID::Field* Type::_internal_add_fields() {
-  return _impl_.fields_.Add();
-}
-inline ::PROTOBUF_NAMESPACE_ID::Field* Type::add_fields() {
-  ::PROTOBUF_NAMESPACE_ID::Field* _add = _internal_add_fields();
-  // @@protoc_insertion_point(field_add:google.protobuf.Type.fields)
-  return _add;
-}
-inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::Field >&
-Type::fields() const {
-  // @@protoc_insertion_point(field_list:google.protobuf.Type.fields)
-  return _impl_.fields_;
-}
-
-// repeated string oneofs = 3;
-inline int Type::_internal_oneofs_size() const {
-  return _impl_.oneofs_.size();
-}
-inline int Type::oneofs_size() const {
-  return _internal_oneofs_size();
-}
-inline void Type::clear_oneofs() {
-  _impl_.oneofs_.Clear();
-}
-inline std::string* Type::add_oneofs() {
-  std::string* _s = _internal_add_oneofs();
-  // @@protoc_insertion_point(field_add_mutable:google.protobuf.Type.oneofs)
-  return _s;
-}
-inline const std::string& Type::_internal_oneofs(int index) const {
-  return _impl_.oneofs_.Get(index);
-}
-inline const std::string& Type::oneofs(int index) const {
-  // @@protoc_insertion_point(field_get:google.protobuf.Type.oneofs)
-  return _internal_oneofs(index);
-}
-inline std::string* Type::mutable_oneofs(int index) {
-  // @@protoc_insertion_point(field_mutable:google.protobuf.Type.oneofs)
-  return _impl_.oneofs_.Mutable(index);
-}
-inline void Type::set_oneofs(int index, const std::string& value) {
-  _impl_.oneofs_.Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set:google.protobuf.Type.oneofs)
-}
-inline void Type::set_oneofs(int index, std::string&& value) {
-  _impl_.oneofs_.Mutable(index)->assign(std::move(value));
-  // @@protoc_insertion_point(field_set:google.protobuf.Type.oneofs)
-}
-inline void Type::set_oneofs(int index, const char* value) {
-  GOOGLE_DCHECK(value != nullptr);
-  _impl_.oneofs_.Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set_char:google.protobuf.Type.oneofs)
-}
-inline void Type::set_oneofs(int index, const char* value, size_t size) {
-  _impl_.oneofs_.Mutable(index)->assign(
-    reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_set_pointer:google.protobuf.Type.oneofs)
-}
-inline std::string* Type::_internal_add_oneofs() {
-  return _impl_.oneofs_.Add();
-}
-inline void Type::add_oneofs(const std::string& value) {
-  _impl_.oneofs_.Add()->assign(value);
-  // @@protoc_insertion_point(field_add:google.protobuf.Type.oneofs)
-}
-inline void Type::add_oneofs(std::string&& value) {
-  _impl_.oneofs_.Add(std::move(value));
-  // @@protoc_insertion_point(field_add:google.protobuf.Type.oneofs)
-}
-inline void Type::add_oneofs(const char* value) {
-  GOOGLE_DCHECK(value != nullptr);
-  _impl_.oneofs_.Add()->assign(value);
-  // @@protoc_insertion_point(field_add_char:google.protobuf.Type.oneofs)
-}
-inline void Type::add_oneofs(const char* value, size_t size) {
-  _impl_.oneofs_.Add()->assign(reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_add_pointer:google.protobuf.Type.oneofs)
-}
-inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string>&
-Type::oneofs() const {
-  // @@protoc_insertion_point(field_list:google.protobuf.Type.oneofs)
-  return _impl_.oneofs_;
-}
-inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string>*
-Type::mutable_oneofs() {
-  // @@protoc_insertion_point(field_mutable_list:google.protobuf.Type.oneofs)
-  return &_impl_.oneofs_;
-}
-
-// repeated .google.protobuf.Option options = 4;
-inline int Type::_internal_options_size() const {
-  return _impl_.options_.size();
-}
-inline int Type::options_size() const {
-  return _internal_options_size();
-}
-inline void Type::clear_options() {
-  _impl_.options_.Clear();
-}
-inline ::PROTOBUF_NAMESPACE_ID::Option* Type::mutable_options(int index) {
-  // @@protoc_insertion_point(field_mutable:google.protobuf.Type.options)
-  return _impl_.options_.Mutable(index);
-}
-inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::Option >*
-Type::mutable_options() {
-  // @@protoc_insertion_point(field_mutable_list:google.protobuf.Type.options)
-  return &_impl_.options_;
-}
-inline const ::PROTOBUF_NAMESPACE_ID::Option& Type::_internal_options(int index) const {
-  return _impl_.options_.Get(index);
-}
-inline const ::PROTOBUF_NAMESPACE_ID::Option& Type::options(int index) const {
-  // @@protoc_insertion_point(field_get:google.protobuf.Type.options)
-  return _internal_options(index);
-}
-inline ::PROTOBUF_NAMESPACE_ID::Option* Type::_internal_add_options() {
-  return _impl_.options_.Add();
-}
-inline ::PROTOBUF_NAMESPACE_ID::Option* Type::add_options() {
-  ::PROTOBUF_NAMESPACE_ID::Option* _add = _internal_add_options();
-  // @@protoc_insertion_point(field_add:google.protobuf.Type.options)
-  return _add;
-}
-inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::Option >&
-Type::options() const {
-  // @@protoc_insertion_point(field_list:google.protobuf.Type.options)
-  return _impl_.options_;
-}
-
-// .google.protobuf.SourceContext source_context = 5;
-inline bool Type::_internal_has_source_context() const {
-  return this != internal_default_instance() && _impl_.source_context_ != nullptr;
-}
-inline bool Type::has_source_context() const {
-  return _internal_has_source_context();
-}
-inline const ::PROTOBUF_NAMESPACE_ID::SourceContext& Type::_internal_source_context() const {
-  const ::PROTOBUF_NAMESPACE_ID::SourceContext* p = _impl_.source_context_;
-  return p != nullptr ? *p : reinterpret_cast<const ::PROTOBUF_NAMESPACE_ID::SourceContext&>(
-      ::PROTOBUF_NAMESPACE_ID::_SourceContext_default_instance_);
-}
-inline const ::PROTOBUF_NAMESPACE_ID::SourceContext& Type::source_context() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.Type.source_context)
-  return _internal_source_context();
-}
-inline void Type::unsafe_arena_set_allocated_source_context(
-    ::PROTOBUF_NAMESPACE_ID::SourceContext* source_context) {
-  if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.source_context_);
-  }
-  _impl_.source_context_ = source_context;
-  if (source_context) {
-    
-  } else {
-    
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:google.protobuf.Type.source_context)
-}
-inline ::PROTOBUF_NAMESPACE_ID::SourceContext* Type::release_source_context() {
-  
-  ::PROTOBUF_NAMESPACE_ID::SourceContext* temp = _impl_.source_context_;
-  _impl_.source_context_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
-  temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
-  if (GetArenaForAllocation() == nullptr) { delete old; }
-#else  // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArenaForAllocation() != nullptr) {
-    temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return temp;
-}
-inline ::PROTOBUF_NAMESPACE_ID::SourceContext* Type::unsafe_arena_release_source_context() {
-  // @@protoc_insertion_point(field_release:google.protobuf.Type.source_context)
-  
-  ::PROTOBUF_NAMESPACE_ID::SourceContext* temp = _impl_.source_context_;
-  _impl_.source_context_ = nullptr;
-  return temp;
-}
-inline ::PROTOBUF_NAMESPACE_ID::SourceContext* Type::_internal_mutable_source_context() {
-  
-  if (_impl_.source_context_ == nullptr) {
-    auto* p = CreateMaybeMessage<::PROTOBUF_NAMESPACE_ID::SourceContext>(GetArenaForAllocation());
-    _impl_.source_context_ = p;
-  }
-  return _impl_.source_context_;
-}
-inline ::PROTOBUF_NAMESPACE_ID::SourceContext* Type::mutable_source_context() {
-  ::PROTOBUF_NAMESPACE_ID::SourceContext* _msg = _internal_mutable_source_context();
-  // @@protoc_insertion_point(field_mutable:google.protobuf.Type.source_context)
-  return _msg;
-}
-inline void Type::set_allocated_source_context(::PROTOBUF_NAMESPACE_ID::SourceContext* source_context) {
-  ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
-  if (message_arena == nullptr) {
-    delete reinterpret_cast< ::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.source_context_);
-  }
-  if (source_context) {
-    ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(
-                reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(source_context));
-    if (message_arena != submessage_arena) {
-      source_context = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
-          message_arena, source_context, submessage_arena);
-    }
-    
-  } else {
-    
-  }
-  _impl_.source_context_ = source_context;
-  // @@protoc_insertion_point(field_set_allocated:google.protobuf.Type.source_context)
-}
-
-// .google.protobuf.Syntax syntax = 6;
-inline void Type::clear_syntax() {
-  _impl_.syntax_ = 0;
-}
-inline ::PROTOBUF_NAMESPACE_ID::Syntax Type::_internal_syntax() const {
-  return static_cast< ::PROTOBUF_NAMESPACE_ID::Syntax >(_impl_.syntax_);
-}
-inline ::PROTOBUF_NAMESPACE_ID::Syntax Type::syntax() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.Type.syntax)
-  return _internal_syntax();
-}
-inline void Type::_internal_set_syntax(::PROTOBUF_NAMESPACE_ID::Syntax value) {
-  
-  _impl_.syntax_ = value;
-}
-inline void Type::set_syntax(::PROTOBUF_NAMESPACE_ID::Syntax value) {
-  _internal_set_syntax(value);
-  // @@protoc_insertion_point(field_set:google.protobuf.Type.syntax)
-}
-
-// -------------------------------------------------------------------
-
-// Field
-
-// .google.protobuf.Field.Kind kind = 1;
-inline void Field::clear_kind() {
-  _impl_.kind_ = 0;
-}
-inline ::PROTOBUF_NAMESPACE_ID::Field_Kind Field::_internal_kind() const {
-  return static_cast< ::PROTOBUF_NAMESPACE_ID::Field_Kind >(_impl_.kind_);
-}
-inline ::PROTOBUF_NAMESPACE_ID::Field_Kind Field::kind() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.Field.kind)
-  return _internal_kind();
-}
-inline void Field::_internal_set_kind(::PROTOBUF_NAMESPACE_ID::Field_Kind value) {
-  
-  _impl_.kind_ = value;
-}
-inline void Field::set_kind(::PROTOBUF_NAMESPACE_ID::Field_Kind value) {
-  _internal_set_kind(value);
-  // @@protoc_insertion_point(field_set:google.protobuf.Field.kind)
-}
-
-// .google.protobuf.Field.Cardinality cardinality = 2;
-inline void Field::clear_cardinality() {
-  _impl_.cardinality_ = 0;
-}
-inline ::PROTOBUF_NAMESPACE_ID::Field_Cardinality Field::_internal_cardinality() const {
-  return static_cast< ::PROTOBUF_NAMESPACE_ID::Field_Cardinality >(_impl_.cardinality_);
-}
-inline ::PROTOBUF_NAMESPACE_ID::Field_Cardinality Field::cardinality() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.Field.cardinality)
-  return _internal_cardinality();
-}
-inline void Field::_internal_set_cardinality(::PROTOBUF_NAMESPACE_ID::Field_Cardinality value) {
-  
-  _impl_.cardinality_ = value;
-}
-inline void Field::set_cardinality(::PROTOBUF_NAMESPACE_ID::Field_Cardinality value) {
-  _internal_set_cardinality(value);
-  // @@protoc_insertion_point(field_set:google.protobuf.Field.cardinality)
-}
-
-// int32 number = 3;
-inline void Field::clear_number() {
-  _impl_.number_ = 0;
-}
-inline int32_t Field::_internal_number() const {
-  return _impl_.number_;
-}
-inline int32_t Field::number() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.Field.number)
-  return _internal_number();
-}
-inline void Field::_internal_set_number(int32_t value) {
-  
-  _impl_.number_ = value;
-}
-inline void Field::set_number(int32_t value) {
-  _internal_set_number(value);
-  // @@protoc_insertion_point(field_set:google.protobuf.Field.number)
-}
-
-// string name = 4;
-inline void Field::clear_name() {
-  _impl_.name_.ClearToEmpty();
-}
-inline const std::string& Field::name() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.Field.name)
-  return _internal_name();
-}
-template <typename ArgT0, typename... ArgT>
-inline PROTOBUF_ALWAYS_INLINE
-void Field::set_name(ArgT0&& arg0, ArgT... args) {
- 
- _impl_.name_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
-  // @@protoc_insertion_point(field_set:google.protobuf.Field.name)
-}
-inline std::string* Field::mutable_name() {
-  std::string* _s = _internal_mutable_name();
-  // @@protoc_insertion_point(field_mutable:google.protobuf.Field.name)
-  return _s;
-}
-inline const std::string& Field::_internal_name() const {
-  return _impl_.name_.Get();
-}
-inline void Field::_internal_set_name(const std::string& value) {
-  
-  _impl_.name_.Set(value, GetArenaForAllocation());
-}
-inline std::string* Field::_internal_mutable_name() {
-  
-  return _impl_.name_.Mutable(GetArenaForAllocation());
-}
-inline std::string* Field::release_name() {
-  // @@protoc_insertion_point(field_release:google.protobuf.Field.name)
-  return _impl_.name_.Release();
-}
-inline void Field::set_allocated_name(std::string* name) {
-  if (name != nullptr) {
-    
-  } else {
-    
-  }
-  _impl_.name_.SetAllocated(name, GetArenaForAllocation());
-#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (_impl_.name_.IsDefault()) {
-    _impl_.name_.Set("", GetArenaForAllocation());
-  }
-#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:google.protobuf.Field.name)
-}
-
-// string type_url = 6;
-inline void Field::clear_type_url() {
-  _impl_.type_url_.ClearToEmpty();
-}
-inline const std::string& Field::type_url() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.Field.type_url)
-  return _internal_type_url();
-}
-template <typename ArgT0, typename... ArgT>
-inline PROTOBUF_ALWAYS_INLINE
-void Field::set_type_url(ArgT0&& arg0, ArgT... args) {
- 
- _impl_.type_url_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
-  // @@protoc_insertion_point(field_set:google.protobuf.Field.type_url)
-}
-inline std::string* Field::mutable_type_url() {
-  std::string* _s = _internal_mutable_type_url();
-  // @@protoc_insertion_point(field_mutable:google.protobuf.Field.type_url)
-  return _s;
-}
-inline const std::string& Field::_internal_type_url() const {
-  return _impl_.type_url_.Get();
-}
-inline void Field::_internal_set_type_url(const std::string& value) {
-  
-  _impl_.type_url_.Set(value, GetArenaForAllocation());
-}
-inline std::string* Field::_internal_mutable_type_url() {
-  
-  return _impl_.type_url_.Mutable(GetArenaForAllocation());
-}
-inline std::string* Field::release_type_url() {
-  // @@protoc_insertion_point(field_release:google.protobuf.Field.type_url)
-  return _impl_.type_url_.Release();
-}
-inline void Field::set_allocated_type_url(std::string* type_url) {
-  if (type_url != nullptr) {
-    
-  } else {
-    
-  }
-  _impl_.type_url_.SetAllocated(type_url, GetArenaForAllocation());
-#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (_impl_.type_url_.IsDefault()) {
-    _impl_.type_url_.Set("", GetArenaForAllocation());
-  }
-#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:google.protobuf.Field.type_url)
-}
-
-// int32 oneof_index = 7;
-inline void Field::clear_oneof_index() {
-  _impl_.oneof_index_ = 0;
-}
-inline int32_t Field::_internal_oneof_index() const {
-  return _impl_.oneof_index_;
-}
-inline int32_t Field::oneof_index() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.Field.oneof_index)
-  return _internal_oneof_index();
-}
-inline void Field::_internal_set_oneof_index(int32_t value) {
-  
-  _impl_.oneof_index_ = value;
-}
-inline void Field::set_oneof_index(int32_t value) {
-  _internal_set_oneof_index(value);
-  // @@protoc_insertion_point(field_set:google.protobuf.Field.oneof_index)
-}
-
-// bool packed = 8;
-inline void Field::clear_packed() {
-  _impl_.packed_ = false;
-}
-inline bool Field::_internal_packed() const {
-  return _impl_.packed_;
-}
-inline bool Field::packed() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.Field.packed)
-  return _internal_packed();
-}
-inline void Field::_internal_set_packed(bool value) {
-  
-  _impl_.packed_ = value;
-}
-inline void Field::set_packed(bool value) {
-  _internal_set_packed(value);
-  // @@protoc_insertion_point(field_set:google.protobuf.Field.packed)
-}
-
-// repeated .google.protobuf.Option options = 9;
-inline int Field::_internal_options_size() const {
-  return _impl_.options_.size();
-}
-inline int Field::options_size() const {
-  return _internal_options_size();
-}
-inline void Field::clear_options() {
-  _impl_.options_.Clear();
-}
-inline ::PROTOBUF_NAMESPACE_ID::Option* Field::mutable_options(int index) {
-  // @@protoc_insertion_point(field_mutable:google.protobuf.Field.options)
-  return _impl_.options_.Mutable(index);
-}
-inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::Option >*
-Field::mutable_options() {
-  // @@protoc_insertion_point(field_mutable_list:google.protobuf.Field.options)
-  return &_impl_.options_;
-}
-inline const ::PROTOBUF_NAMESPACE_ID::Option& Field::_internal_options(int index) const {
-  return _impl_.options_.Get(index);
-}
-inline const ::PROTOBUF_NAMESPACE_ID::Option& Field::options(int index) const {
-  // @@protoc_insertion_point(field_get:google.protobuf.Field.options)
-  return _internal_options(index);
-}
-inline ::PROTOBUF_NAMESPACE_ID::Option* Field::_internal_add_options() {
-  return _impl_.options_.Add();
-}
-inline ::PROTOBUF_NAMESPACE_ID::Option* Field::add_options() {
-  ::PROTOBUF_NAMESPACE_ID::Option* _add = _internal_add_options();
-  // @@protoc_insertion_point(field_add:google.protobuf.Field.options)
-  return _add;
-}
-inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::Option >&
-Field::options() const {
-  // @@protoc_insertion_point(field_list:google.protobuf.Field.options)
-  return _impl_.options_;
-}
-
-// string json_name = 10;
-inline void Field::clear_json_name() {
-  _impl_.json_name_.ClearToEmpty();
-}
-inline const std::string& Field::json_name() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.Field.json_name)
-  return _internal_json_name();
-}
-template <typename ArgT0, typename... ArgT>
-inline PROTOBUF_ALWAYS_INLINE
-void Field::set_json_name(ArgT0&& arg0, ArgT... args) {
- 
- _impl_.json_name_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
-  // @@protoc_insertion_point(field_set:google.protobuf.Field.json_name)
-}
-inline std::string* Field::mutable_json_name() {
-  std::string* _s = _internal_mutable_json_name();
-  // @@protoc_insertion_point(field_mutable:google.protobuf.Field.json_name)
-  return _s;
-}
-inline const std::string& Field::_internal_json_name() const {
-  return _impl_.json_name_.Get();
-}
-inline void Field::_internal_set_json_name(const std::string& value) {
-  
-  _impl_.json_name_.Set(value, GetArenaForAllocation());
-}
-inline std::string* Field::_internal_mutable_json_name() {
-  
-  return _impl_.json_name_.Mutable(GetArenaForAllocation());
-}
-inline std::string* Field::release_json_name() {
-  // @@protoc_insertion_point(field_release:google.protobuf.Field.json_name)
-  return _impl_.json_name_.Release();
-}
-inline void Field::set_allocated_json_name(std::string* json_name) {
-  if (json_name != nullptr) {
-    
-  } else {
-    
-  }
-  _impl_.json_name_.SetAllocated(json_name, GetArenaForAllocation());
-#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (_impl_.json_name_.IsDefault()) {
-    _impl_.json_name_.Set("", GetArenaForAllocation());
-  }
-#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:google.protobuf.Field.json_name)
-}
-
-// string default_value = 11;
-inline void Field::clear_default_value() {
-  _impl_.default_value_.ClearToEmpty();
-}
-inline const std::string& Field::default_value() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.Field.default_value)
-  return _internal_default_value();
-}
-template <typename ArgT0, typename... ArgT>
-inline PROTOBUF_ALWAYS_INLINE
-void Field::set_default_value(ArgT0&& arg0, ArgT... args) {
- 
- _impl_.default_value_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
-  // @@protoc_insertion_point(field_set:google.protobuf.Field.default_value)
-}
-inline std::string* Field::mutable_default_value() {
-  std::string* _s = _internal_mutable_default_value();
-  // @@protoc_insertion_point(field_mutable:google.protobuf.Field.default_value)
-  return _s;
-}
-inline const std::string& Field::_internal_default_value() const {
-  return _impl_.default_value_.Get();
-}
-inline void Field::_internal_set_default_value(const std::string& value) {
-  
-  _impl_.default_value_.Set(value, GetArenaForAllocation());
-}
-inline std::string* Field::_internal_mutable_default_value() {
-  
-  return _impl_.default_value_.Mutable(GetArenaForAllocation());
-}
-inline std::string* Field::release_default_value() {
-  // @@protoc_insertion_point(field_release:google.protobuf.Field.default_value)
-  return _impl_.default_value_.Release();
-}
-inline void Field::set_allocated_default_value(std::string* default_value) {
-  if (default_value != nullptr) {
-    
-  } else {
-    
-  }
-  _impl_.default_value_.SetAllocated(default_value, GetArenaForAllocation());
-#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (_impl_.default_value_.IsDefault()) {
-    _impl_.default_value_.Set("", GetArenaForAllocation());
-  }
-#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:google.protobuf.Field.default_value)
-}
-
-// -------------------------------------------------------------------
-
-// Enum
-
-// string name = 1;
-inline void Enum::clear_name() {
-  _impl_.name_.ClearToEmpty();
-}
-inline const std::string& Enum::name() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.Enum.name)
-  return _internal_name();
-}
-template <typename ArgT0, typename... ArgT>
-inline PROTOBUF_ALWAYS_INLINE
-void Enum::set_name(ArgT0&& arg0, ArgT... args) {
- 
- _impl_.name_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
-  // @@protoc_insertion_point(field_set:google.protobuf.Enum.name)
-}
-inline std::string* Enum::mutable_name() {
-  std::string* _s = _internal_mutable_name();
-  // @@protoc_insertion_point(field_mutable:google.protobuf.Enum.name)
-  return _s;
-}
-inline const std::string& Enum::_internal_name() const {
-  return _impl_.name_.Get();
-}
-inline void Enum::_internal_set_name(const std::string& value) {
-  
-  _impl_.name_.Set(value, GetArenaForAllocation());
-}
-inline std::string* Enum::_internal_mutable_name() {
-  
-  return _impl_.name_.Mutable(GetArenaForAllocation());
-}
-inline std::string* Enum::release_name() {
-  // @@protoc_insertion_point(field_release:google.protobuf.Enum.name)
-  return _impl_.name_.Release();
-}
-inline void Enum::set_allocated_name(std::string* name) {
-  if (name != nullptr) {
-    
-  } else {
-    
-  }
-  _impl_.name_.SetAllocated(name, GetArenaForAllocation());
-#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (_impl_.name_.IsDefault()) {
-    _impl_.name_.Set("", GetArenaForAllocation());
-  }
-#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:google.protobuf.Enum.name)
-}
-
-// repeated .google.protobuf.EnumValue enumvalue = 2;
-inline int Enum::_internal_enumvalue_size() const {
-  return _impl_.enumvalue_.size();
-}
-inline int Enum::enumvalue_size() const {
-  return _internal_enumvalue_size();
-}
-inline void Enum::clear_enumvalue() {
-  _impl_.enumvalue_.Clear();
-}
-inline ::PROTOBUF_NAMESPACE_ID::EnumValue* Enum::mutable_enumvalue(int index) {
-  // @@protoc_insertion_point(field_mutable:google.protobuf.Enum.enumvalue)
-  return _impl_.enumvalue_.Mutable(index);
-}
-inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::EnumValue >*
-Enum::mutable_enumvalue() {
-  // @@protoc_insertion_point(field_mutable_list:google.protobuf.Enum.enumvalue)
-  return &_impl_.enumvalue_;
-}
-inline const ::PROTOBUF_NAMESPACE_ID::EnumValue& Enum::_internal_enumvalue(int index) const {
-  return _impl_.enumvalue_.Get(index);
-}
-inline const ::PROTOBUF_NAMESPACE_ID::EnumValue& Enum::enumvalue(int index) const {
-  // @@protoc_insertion_point(field_get:google.protobuf.Enum.enumvalue)
-  return _internal_enumvalue(index);
-}
-inline ::PROTOBUF_NAMESPACE_ID::EnumValue* Enum::_internal_add_enumvalue() {
-  return _impl_.enumvalue_.Add();
-}
-inline ::PROTOBUF_NAMESPACE_ID::EnumValue* Enum::add_enumvalue() {
-  ::PROTOBUF_NAMESPACE_ID::EnumValue* _add = _internal_add_enumvalue();
-  // @@protoc_insertion_point(field_add:google.protobuf.Enum.enumvalue)
-  return _add;
-}
-inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::EnumValue >&
-Enum::enumvalue() const {
-  // @@protoc_insertion_point(field_list:google.protobuf.Enum.enumvalue)
-  return _impl_.enumvalue_;
-}
-
-// repeated .google.protobuf.Option options = 3;
-inline int Enum::_internal_options_size() const {
-  return _impl_.options_.size();
-}
-inline int Enum::options_size() const {
-  return _internal_options_size();
-}
-inline void Enum::clear_options() {
-  _impl_.options_.Clear();
-}
-inline ::PROTOBUF_NAMESPACE_ID::Option* Enum::mutable_options(int index) {
-  // @@protoc_insertion_point(field_mutable:google.protobuf.Enum.options)
-  return _impl_.options_.Mutable(index);
-}
-inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::Option >*
-Enum::mutable_options() {
-  // @@protoc_insertion_point(field_mutable_list:google.protobuf.Enum.options)
-  return &_impl_.options_;
-}
-inline const ::PROTOBUF_NAMESPACE_ID::Option& Enum::_internal_options(int index) const {
-  return _impl_.options_.Get(index);
-}
-inline const ::PROTOBUF_NAMESPACE_ID::Option& Enum::options(int index) const {
-  // @@protoc_insertion_point(field_get:google.protobuf.Enum.options)
-  return _internal_options(index);
-}
-inline ::PROTOBUF_NAMESPACE_ID::Option* Enum::_internal_add_options() {
-  return _impl_.options_.Add();
-}
-inline ::PROTOBUF_NAMESPACE_ID::Option* Enum::add_options() {
-  ::PROTOBUF_NAMESPACE_ID::Option* _add = _internal_add_options();
-  // @@protoc_insertion_point(field_add:google.protobuf.Enum.options)
-  return _add;
-}
-inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::Option >&
-Enum::options() const {
-  // @@protoc_insertion_point(field_list:google.protobuf.Enum.options)
-  return _impl_.options_;
-}
-
-// .google.protobuf.SourceContext source_context = 4;
-inline bool Enum::_internal_has_source_context() const {
-  return this != internal_default_instance() && _impl_.source_context_ != nullptr;
-}
-inline bool Enum::has_source_context() const {
-  return _internal_has_source_context();
-}
-inline const ::PROTOBUF_NAMESPACE_ID::SourceContext& Enum::_internal_source_context() const {
-  const ::PROTOBUF_NAMESPACE_ID::SourceContext* p = _impl_.source_context_;
-  return p != nullptr ? *p : reinterpret_cast<const ::PROTOBUF_NAMESPACE_ID::SourceContext&>(
-      ::PROTOBUF_NAMESPACE_ID::_SourceContext_default_instance_);
-}
-inline const ::PROTOBUF_NAMESPACE_ID::SourceContext& Enum::source_context() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.Enum.source_context)
-  return _internal_source_context();
-}
-inline void Enum::unsafe_arena_set_allocated_source_context(
-    ::PROTOBUF_NAMESPACE_ID::SourceContext* source_context) {
-  if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.source_context_);
-  }
-  _impl_.source_context_ = source_context;
-  if (source_context) {
-    
-  } else {
-    
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:google.protobuf.Enum.source_context)
-}
-inline ::PROTOBUF_NAMESPACE_ID::SourceContext* Enum::release_source_context() {
-  
-  ::PROTOBUF_NAMESPACE_ID::SourceContext* temp = _impl_.source_context_;
-  _impl_.source_context_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
-  temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
-  if (GetArenaForAllocation() == nullptr) { delete old; }
-#else  // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArenaForAllocation() != nullptr) {
-    temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return temp;
-}
-inline ::PROTOBUF_NAMESPACE_ID::SourceContext* Enum::unsafe_arena_release_source_context() {
-  // @@protoc_insertion_point(field_release:google.protobuf.Enum.source_context)
-  
-  ::PROTOBUF_NAMESPACE_ID::SourceContext* temp = _impl_.source_context_;
-  _impl_.source_context_ = nullptr;
-  return temp;
-}
-inline ::PROTOBUF_NAMESPACE_ID::SourceContext* Enum::_internal_mutable_source_context() {
-  
-  if (_impl_.source_context_ == nullptr) {
-    auto* p = CreateMaybeMessage<::PROTOBUF_NAMESPACE_ID::SourceContext>(GetArenaForAllocation());
-    _impl_.source_context_ = p;
-  }
-  return _impl_.source_context_;
-}
-inline ::PROTOBUF_NAMESPACE_ID::SourceContext* Enum::mutable_source_context() {
-  ::PROTOBUF_NAMESPACE_ID::SourceContext* _msg = _internal_mutable_source_context();
-  // @@protoc_insertion_point(field_mutable:google.protobuf.Enum.source_context)
-  return _msg;
-}
-inline void Enum::set_allocated_source_context(::PROTOBUF_NAMESPACE_ID::SourceContext* source_context) {
-  ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
-  if (message_arena == nullptr) {
-    delete reinterpret_cast< ::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.source_context_);
-  }
-  if (source_context) {
-    ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(
-                reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(source_context));
-    if (message_arena != submessage_arena) {
-      source_context = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
-          message_arena, source_context, submessage_arena);
-    }
-    
-  } else {
-    
-  }
-  _impl_.source_context_ = source_context;
-  // @@protoc_insertion_point(field_set_allocated:google.protobuf.Enum.source_context)
-}
-
-// .google.protobuf.Syntax syntax = 5;
-inline void Enum::clear_syntax() {
-  _impl_.syntax_ = 0;
-}
-inline ::PROTOBUF_NAMESPACE_ID::Syntax Enum::_internal_syntax() const {
-  return static_cast< ::PROTOBUF_NAMESPACE_ID::Syntax >(_impl_.syntax_);
-}
-inline ::PROTOBUF_NAMESPACE_ID::Syntax Enum::syntax() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.Enum.syntax)
-  return _internal_syntax();
-}
-inline void Enum::_internal_set_syntax(::PROTOBUF_NAMESPACE_ID::Syntax value) {
-  
-  _impl_.syntax_ = value;
-}
-inline void Enum::set_syntax(::PROTOBUF_NAMESPACE_ID::Syntax value) {
-  _internal_set_syntax(value);
-  // @@protoc_insertion_point(field_set:google.protobuf.Enum.syntax)
-}
-
-// -------------------------------------------------------------------
-
-// EnumValue
-
-// string name = 1;
-inline void EnumValue::clear_name() {
-  _impl_.name_.ClearToEmpty();
-}
-inline const std::string& EnumValue::name() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.EnumValue.name)
-  return _internal_name();
-}
-template <typename ArgT0, typename... ArgT>
-inline PROTOBUF_ALWAYS_INLINE
-void EnumValue::set_name(ArgT0&& arg0, ArgT... args) {
- 
- _impl_.name_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
-  // @@protoc_insertion_point(field_set:google.protobuf.EnumValue.name)
-}
-inline std::string* EnumValue::mutable_name() {
-  std::string* _s = _internal_mutable_name();
-  // @@protoc_insertion_point(field_mutable:google.protobuf.EnumValue.name)
-  return _s;
-}
-inline const std::string& EnumValue::_internal_name() const {
-  return _impl_.name_.Get();
-}
-inline void EnumValue::_internal_set_name(const std::string& value) {
-  
-  _impl_.name_.Set(value, GetArenaForAllocation());
-}
-inline std::string* EnumValue::_internal_mutable_name() {
-  
-  return _impl_.name_.Mutable(GetArenaForAllocation());
-}
-inline std::string* EnumValue::release_name() {
-  // @@protoc_insertion_point(field_release:google.protobuf.EnumValue.name)
-  return _impl_.name_.Release();
-}
-inline void EnumValue::set_allocated_name(std::string* name) {
-  if (name != nullptr) {
-    
-  } else {
-    
-  }
-  _impl_.name_.SetAllocated(name, GetArenaForAllocation());
-#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (_impl_.name_.IsDefault()) {
-    _impl_.name_.Set("", GetArenaForAllocation());
-  }
-#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:google.protobuf.EnumValue.name)
-}
-
-// int32 number = 2;
-inline void EnumValue::clear_number() {
-  _impl_.number_ = 0;
-}
-inline int32_t EnumValue::_internal_number() const {
-  return _impl_.number_;
-}
-inline int32_t EnumValue::number() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.EnumValue.number)
-  return _internal_number();
-}
-inline void EnumValue::_internal_set_number(int32_t value) {
-  
-  _impl_.number_ = value;
-}
-inline void EnumValue::set_number(int32_t value) {
-  _internal_set_number(value);
-  // @@protoc_insertion_point(field_set:google.protobuf.EnumValue.number)
-}
-
-// repeated .google.protobuf.Option options = 3;
-inline int EnumValue::_internal_options_size() const {
-  return _impl_.options_.size();
-}
-inline int EnumValue::options_size() const {
-  return _internal_options_size();
-}
-inline void EnumValue::clear_options() {
-  _impl_.options_.Clear();
-}
-inline ::PROTOBUF_NAMESPACE_ID::Option* EnumValue::mutable_options(int index) {
-  // @@protoc_insertion_point(field_mutable:google.protobuf.EnumValue.options)
-  return _impl_.options_.Mutable(index);
-}
-inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::Option >*
-EnumValue::mutable_options() {
-  // @@protoc_insertion_point(field_mutable_list:google.protobuf.EnumValue.options)
-  return &_impl_.options_;
-}
-inline const ::PROTOBUF_NAMESPACE_ID::Option& EnumValue::_internal_options(int index) const {
-  return _impl_.options_.Get(index);
-}
-inline const ::PROTOBUF_NAMESPACE_ID::Option& EnumValue::options(int index) const {
-  // @@protoc_insertion_point(field_get:google.protobuf.EnumValue.options)
-  return _internal_options(index);
-}
-inline ::PROTOBUF_NAMESPACE_ID::Option* EnumValue::_internal_add_options() {
-  return _impl_.options_.Add();
-}
-inline ::PROTOBUF_NAMESPACE_ID::Option* EnumValue::add_options() {
-  ::PROTOBUF_NAMESPACE_ID::Option* _add = _internal_add_options();
-  // @@protoc_insertion_point(field_add:google.protobuf.EnumValue.options)
-  return _add;
-}
-inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::PROTOBUF_NAMESPACE_ID::Option >&
-EnumValue::options() const {
-  // @@protoc_insertion_point(field_list:google.protobuf.EnumValue.options)
-  return _impl_.options_;
-}
-
-// -------------------------------------------------------------------
-
-// Option
-
-// string name = 1;
-inline void Option::clear_name() {
-  _impl_.name_.ClearToEmpty();
-}
-inline const std::string& Option::name() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.Option.name)
-  return _internal_name();
-}
-template <typename ArgT0, typename... ArgT>
-inline PROTOBUF_ALWAYS_INLINE
-void Option::set_name(ArgT0&& arg0, ArgT... args) {
- 
- _impl_.name_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
-  // @@protoc_insertion_point(field_set:google.protobuf.Option.name)
-}
-inline std::string* Option::mutable_name() {
-  std::string* _s = _internal_mutable_name();
-  // @@protoc_insertion_point(field_mutable:google.protobuf.Option.name)
-  return _s;
-}
-inline const std::string& Option::_internal_name() const {
-  return _impl_.name_.Get();
-}
-inline void Option::_internal_set_name(const std::string& value) {
-  
-  _impl_.name_.Set(value, GetArenaForAllocation());
-}
-inline std::string* Option::_internal_mutable_name() {
-  
-  return _impl_.name_.Mutable(GetArenaForAllocation());
-}
-inline std::string* Option::release_name() {
-  // @@protoc_insertion_point(field_release:google.protobuf.Option.name)
-  return _impl_.name_.Release();
-}
-inline void Option::set_allocated_name(std::string* name) {
-  if (name != nullptr) {
-    
-  } else {
-    
-  }
-  _impl_.name_.SetAllocated(name, GetArenaForAllocation());
-#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (_impl_.name_.IsDefault()) {
-    _impl_.name_.Set("", GetArenaForAllocation());
-  }
-#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:google.protobuf.Option.name)
-}
-
-// .google.protobuf.Any value = 2;
-inline bool Option::_internal_has_value() const {
-  return this != internal_default_instance() && _impl_.value_ != nullptr;
-}
-inline bool Option::has_value() const {
-  return _internal_has_value();
-}
-inline const ::PROTOBUF_NAMESPACE_ID::Any& Option::_internal_value() const {
-  const ::PROTOBUF_NAMESPACE_ID::Any* p = _impl_.value_;
-  return p != nullptr ? *p : reinterpret_cast<const ::PROTOBUF_NAMESPACE_ID::Any&>(
-      ::PROTOBUF_NAMESPACE_ID::_Any_default_instance_);
-}
-inline const ::PROTOBUF_NAMESPACE_ID::Any& Option::value() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.Option.value)
-  return _internal_value();
-}
-inline void Option::unsafe_arena_set_allocated_value(
-    ::PROTOBUF_NAMESPACE_ID::Any* value) {
-  if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.value_);
-  }
-  _impl_.value_ = value;
-  if (value) {
-    
-  } else {
-    
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:google.protobuf.Option.value)
-}
-inline ::PROTOBUF_NAMESPACE_ID::Any* Option::release_value() {
-  
-  ::PROTOBUF_NAMESPACE_ID::Any* temp = _impl_.value_;
-  _impl_.value_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
-  temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
-  if (GetArenaForAllocation() == nullptr) { delete old; }
-#else  // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArenaForAllocation() != nullptr) {
-    temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return temp;
-}
-inline ::PROTOBUF_NAMESPACE_ID::Any* Option::unsafe_arena_release_value() {
-  // @@protoc_insertion_point(field_release:google.protobuf.Option.value)
-  
-  ::PROTOBUF_NAMESPACE_ID::Any* temp = _impl_.value_;
-  _impl_.value_ = nullptr;
-  return temp;
-}
-inline ::PROTOBUF_NAMESPACE_ID::Any* Option::_internal_mutable_value() {
-  
-  if (_impl_.value_ == nullptr) {
-    auto* p = CreateMaybeMessage<::PROTOBUF_NAMESPACE_ID::Any>(GetArenaForAllocation());
-    _impl_.value_ = p;
-  }
-  return _impl_.value_;
-}
-inline ::PROTOBUF_NAMESPACE_ID::Any* Option::mutable_value() {
-  ::PROTOBUF_NAMESPACE_ID::Any* _msg = _internal_mutable_value();
-  // @@protoc_insertion_point(field_mutable:google.protobuf.Option.value)
-  return _msg;
-}
-inline void Option::set_allocated_value(::PROTOBUF_NAMESPACE_ID::Any* value) {
-  ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
-  if (message_arena == nullptr) {
-    delete reinterpret_cast< ::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.value_);
-  }
-  if (value) {
-    ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(
-                reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(value));
-    if (message_arena != submessage_arena) {
-      value = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
-          message_arena, value, submessage_arena);
-    }
-    
-  } else {
-    
-  }
-  _impl_.value_ = value;
-  // @@protoc_insertion_point(field_set_allocated:google.protobuf.Option.value)
-}
-
-#ifdef __GNUC__
-  #pragma GCC diagnostic pop
-#endif  // __GNUC__
-// -------------------------------------------------------------------
-
-// -------------------------------------------------------------------
-
-// -------------------------------------------------------------------
-
-// -------------------------------------------------------------------
-
-
-// @@protoc_insertion_point(namespace_scope)
-
-PROTOBUF_NAMESPACE_CLOSE
-
-PROTOBUF_NAMESPACE_OPEN
-
-template <> struct is_proto_enum< ::PROTOBUF_NAMESPACE_ID::Field_Kind> : ::std::true_type {};
-template <>
-inline const EnumDescriptor* GetEnumDescriptor< ::PROTOBUF_NAMESPACE_ID::Field_Kind>() {
-  return ::PROTOBUF_NAMESPACE_ID::Field_Kind_descriptor();
-}
-template <> struct is_proto_enum< ::PROTOBUF_NAMESPACE_ID::Field_Cardinality> : ::std::true_type {};
-template <>
-inline const EnumDescriptor* GetEnumDescriptor< ::PROTOBUF_NAMESPACE_ID::Field_Cardinality>() {
-  return ::PROTOBUF_NAMESPACE_ID::Field_Cardinality_descriptor();
-}
-template <> struct is_proto_enum< ::PROTOBUF_NAMESPACE_ID::Syntax> : ::std::true_type {};
-template <>
-inline const EnumDescriptor* GetEnumDescriptor< ::PROTOBUF_NAMESPACE_ID::Syntax>() {
-  return ::PROTOBUF_NAMESPACE_ID::Syntax_descriptor();
-}
-
-PROTOBUF_NAMESPACE_CLOSE
-
-// @@protoc_insertion_point(global_scope)
-
-#include <google/protobuf/port_undef.inc>
-#endif  // GOOGLE_PROTOBUF_INCLUDED_GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2ftype_2eproto
diff --git a/libs/protobuf/src/google/protobuf/type.proto b/libs/protobuf/src/google/protobuf/type.proto
deleted file mode 100644
index d3f6a68..0000000
--- a/libs/protobuf/src/google/protobuf/type.proto
+++ /dev/null
@@ -1,187 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto3";
-
-package google.protobuf;
-
-import "google/protobuf/any.proto";
-import "google/protobuf/source_context.proto";
-
-option csharp_namespace = "Google.Protobuf.WellKnownTypes";
-option cc_enable_arenas = true;
-option java_package = "com.google.protobuf";
-option java_outer_classname = "TypeProto";
-option java_multiple_files = true;
-option objc_class_prefix = "GPB";
-option go_package = "google.golang.org/protobuf/types/known/typepb";
-
-// A protocol buffer message type.
-message Type {
-  // The fully qualified message name.
-  string name = 1;
-  // The list of fields.
-  repeated Field fields = 2;
-  // The list of types appearing in `oneof` definitions in this type.
-  repeated string oneofs = 3;
-  // The protocol buffer options.
-  repeated Option options = 4;
-  // The source context.
-  SourceContext source_context = 5;
-  // The source syntax.
-  Syntax syntax = 6;
-}
-
-// A single field of a message type.
-message Field {
-  // Basic field types.
-  enum Kind {
-    // Field type unknown.
-    TYPE_UNKNOWN = 0;
-    // Field type double.
-    TYPE_DOUBLE = 1;
-    // Field type float.
-    TYPE_FLOAT = 2;
-    // Field type int64.
-    TYPE_INT64 = 3;
-    // Field type uint64.
-    TYPE_UINT64 = 4;
-    // Field type int32.
-    TYPE_INT32 = 5;
-    // Field type fixed64.
-    TYPE_FIXED64 = 6;
-    // Field type fixed32.
-    TYPE_FIXED32 = 7;
-    // Field type bool.
-    TYPE_BOOL = 8;
-    // Field type string.
-    TYPE_STRING = 9;
-    // Field type group. Proto2 syntax only, and deprecated.
-    TYPE_GROUP = 10;
-    // Field type message.
-    TYPE_MESSAGE = 11;
-    // Field type bytes.
-    TYPE_BYTES = 12;
-    // Field type uint32.
-    TYPE_UINT32 = 13;
-    // Field type enum.
-    TYPE_ENUM = 14;
-    // Field type sfixed32.
-    TYPE_SFIXED32 = 15;
-    // Field type sfixed64.
-    TYPE_SFIXED64 = 16;
-    // Field type sint32.
-    TYPE_SINT32 = 17;
-    // Field type sint64.
-    TYPE_SINT64 = 18;
-  }
-
-  // Whether a field is optional, required, or repeated.
-  enum Cardinality {
-    // For fields with unknown cardinality.
-    CARDINALITY_UNKNOWN = 0;
-    // For optional fields.
-    CARDINALITY_OPTIONAL = 1;
-    // For required fields. Proto2 syntax only.
-    CARDINALITY_REQUIRED = 2;
-    // For repeated fields.
-    CARDINALITY_REPEATED = 3;
-  }
-
-  // The field type.
-  Kind kind = 1;
-  // The field cardinality.
-  Cardinality cardinality = 2;
-  // The field number.
-  int32 number = 3;
-  // The field name.
-  string name = 4;
-  // The field type URL, without the scheme, for message or enumeration
-  // types. Example: `"type.googleapis.com/google.protobuf.Timestamp"`.
-  string type_url = 6;
-  // The index of the field type in `Type.oneofs`, for message or enumeration
-  // types. The first type has index 1; zero means the type is not in the list.
-  int32 oneof_index = 7;
-  // Whether to use alternative packed wire representation.
-  bool packed = 8;
-  // The protocol buffer options.
-  repeated Option options = 9;
-  // The field JSON name.
-  string json_name = 10;
-  // The string value of the default value of this field. Proto2 syntax only.
-  string default_value = 11;
-}
-
-// Enum type definition.
-message Enum {
-  // Enum type name.
-  string name = 1;
-  // Enum value definitions.
-  repeated EnumValue enumvalue = 2;
-  // Protocol buffer options.
-  repeated Option options = 3;
-  // The source context.
-  SourceContext source_context = 4;
-  // The source syntax.
-  Syntax syntax = 5;
-}
-
-// Enum value definition.
-message EnumValue {
-  // Enum value name.
-  string name = 1;
-  // Enum value number.
-  int32 number = 2;
-  // Protocol buffer options.
-  repeated Option options = 3;
-}
-
-// A protocol buffer option, which can be attached to a message, field,
-// enumeration, etc.
-message Option {
-  // The option's name. For protobuf built-in options (options defined in
-  // descriptor.proto), this is the short name. For example, `"map_entry"`.
-  // For custom options, it should be the fully-qualified name. For example,
-  // `"google.api.http"`.
-  string name = 1;
-  // The option's value packed in an Any message. If the value is a primitive,
-  // the corresponding wrapper type defined in google/protobuf/wrappers.proto
-  // should be used. If the value is an enum, it should be stored as an int32
-  // value using the google.protobuf.Int32Value type.
-  Any value = 2;
-}
-
-// The syntax in which a protocol buffer element is defined.
-enum Syntax {
-  // Syntax `proto2`.
-  SYNTAX_PROTO2 = 0;
-  // Syntax `proto3`.
-  SYNTAX_PROTO3 = 1;
-}
diff --git a/libs/protobuf/src/google/protobuf/unittest.proto b/libs/protobuf/src/google/protobuf/unittest.proto
deleted file mode 100644
index f1b0bd0..0000000
--- a/libs/protobuf/src/google/protobuf/unittest.proto
+++ /dev/null
@@ -1,1418 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-//
-// A proto file we will use for unit testing.
-//
-// LINT: ALLOW_GROUPS, LEGACY_NAMES
-
-syntax = "proto2";
-
-// Some generic_services option(s) added automatically.
-// See:  http://go/proto2-generic-services-default
-option cc_generic_services = true;     // auto-added
-option java_generic_services = true;   // auto-added
-option py_generic_services = true;     // auto-added
-option cc_enable_arenas = true;
-
-import "google/protobuf/unittest_import.proto";
-
-// We don't put this in a package within proto2 because we need to make sure
-// that the generated code doesn't depend on being in the proto2 namespace.
-// In test_util.h we do "using namespace unittest = protobuf_unittest".
-package protobuf_unittest;
-
-// Protos optimized for SPEED use a strict superset of the generated code
-// of equivalent ones optimized for CODE_SIZE, so we should optimize all our
-// tests for speed unless explicitly testing code size optimization.
-option optimize_for = SPEED;
-
-option java_outer_classname = "UnittestProto";
-
-// This proto includes every type of field in both singular and repeated
-// forms.
-message TestAllTypes {
-  message NestedMessage {
-    // The field name "b" fails to compile in proto1 because it conflicts with
-    // a local variable named "b" in one of the generated methods.  Doh.
-    // This file needs to compile in proto1 to test backwards-compatibility.
-    optional int32 bb = 1;
-  }
-
-  enum NestedEnum {
-    FOO = 1;
-    BAR = 2;
-    BAZ = 3;
-    NEG = -1;  // Intentionally negative.
-  }
-
-  // Singular
-  optional    int32 optional_int32    =  1;
-  optional    int64 optional_int64    =  2;
-  optional   uint32 optional_uint32   =  3;
-  optional   uint64 optional_uint64   =  4;
-  optional   sint32 optional_sint32   =  5;
-  optional   sint64 optional_sint64   =  6;
-  optional  fixed32 optional_fixed32  =  7;
-  optional  fixed64 optional_fixed64  =  8;
-  optional sfixed32 optional_sfixed32 =  9;
-  optional sfixed64 optional_sfixed64 = 10;
-  optional    float optional_float    = 11;
-  optional   double optional_double   = 12;
-  optional     bool optional_bool     = 13;
-  optional   string optional_string   = 14;
-  optional    bytes optional_bytes    = 15;
-
-  optional group OptionalGroup = 16 {
-    optional int32 a = 17;
-  }
-
-  optional NestedMessage                        optional_nested_message  = 18;
-  optional ForeignMessage                       optional_foreign_message = 19;
-  optional protobuf_unittest_import.ImportMessage optional_import_message  = 20;
-
-  optional NestedEnum                           optional_nested_enum     = 21;
-  optional ForeignEnum                          optional_foreign_enum    = 22;
-  optional protobuf_unittest_import.ImportEnum    optional_import_enum     = 23;
-
-  optional string optional_string_piece = 24 [ctype=STRING_PIECE];
-  optional string optional_cord = 25 [ctype=CORD];
-
-  // Defined in unittest_import_public.proto
-  optional protobuf_unittest_import.PublicImportMessage
-      optional_public_import_message = 26;
-
-  optional NestedMessage optional_lazy_message = 27 [lazy=true];
-  optional NestedMessage optional_unverified_lazy_message = 28 [unverified_lazy=true];
-
-  // Repeated
-  repeated    int32 repeated_int32    = 31;
-  repeated    int64 repeated_int64    = 32;
-  repeated   uint32 repeated_uint32   = 33;
-  repeated   uint64 repeated_uint64   = 34;
-  repeated   sint32 repeated_sint32   = 35;
-  repeated   sint64 repeated_sint64   = 36;
-  repeated  fixed32 repeated_fixed32  = 37;
-  repeated  fixed64 repeated_fixed64  = 38;
-  repeated sfixed32 repeated_sfixed32 = 39;
-  repeated sfixed64 repeated_sfixed64 = 40;
-  repeated    float repeated_float    = 41;
-  repeated   double repeated_double   = 42;
-  repeated     bool repeated_bool     = 43;
-  repeated   string repeated_string   = 44;
-  repeated    bytes repeated_bytes    = 45;
-
-  repeated group RepeatedGroup = 46 {
-    optional int32 a = 47;
-  }
-
-  repeated NestedMessage                        repeated_nested_message  = 48;
-  repeated ForeignMessage                       repeated_foreign_message = 49;
-  repeated protobuf_unittest_import.ImportMessage repeated_import_message  = 50;
-
-  repeated NestedEnum                           repeated_nested_enum     = 51;
-  repeated ForeignEnum                          repeated_foreign_enum    = 52;
-  repeated protobuf_unittest_import.ImportEnum    repeated_import_enum     = 53;
-
-  repeated string repeated_string_piece = 54 [ctype=STRING_PIECE];
-  repeated string repeated_cord = 55 [ctype=CORD];
-
-  repeated NestedMessage repeated_lazy_message = 57 [lazy=true];
-
-  // Singular with defaults
-  optional    int32 default_int32    = 61 [default =  41    ];
-  optional    int64 default_int64    = 62 [default =  42    ];
-  optional   uint32 default_uint32   = 63 [default =  43    ];
-  optional   uint64 default_uint64   = 64 [default =  44    ];
-  optional   sint32 default_sint32   = 65 [default = -45    ];
-  optional   sint64 default_sint64   = 66 [default =  46    ];
-  optional  fixed32 default_fixed32  = 67 [default =  47    ];
-  optional  fixed64 default_fixed64  = 68 [default =  48    ];
-  optional sfixed32 default_sfixed32 = 69 [default =  49    ];
-  optional sfixed64 default_sfixed64 = 70 [default = -50    ];
-  optional    float default_float    = 71 [default =  51.5  ];
-  optional   double default_double   = 72 [default =  52e3  ];
-  optional     bool default_bool     = 73 [default = true   ];
-  optional   string default_string   = 74 [default = "hello"];
-  optional    bytes default_bytes    = 75 [default = "world"];
-
-  optional NestedEnum  default_nested_enum  = 81 [default = BAR        ];
-  optional ForeignEnum default_foreign_enum = 82 [default = FOREIGN_BAR];
-  optional protobuf_unittest_import.ImportEnum
-      default_import_enum = 83 [default = IMPORT_BAR];
-
-  optional string default_string_piece = 84 [ctype=STRING_PIECE,default="abc"];
-  optional string default_cord = 85 [ctype=CORD,default="123"];
-
-  // For oneof test
-  oneof oneof_field {
-    uint32 oneof_uint32 = 111;
-    NestedMessage oneof_nested_message = 112;
-    string oneof_string = 113;
-    bytes oneof_bytes = 114;
-  }
-}
-
-// This proto includes a recursively nested message.
-message NestedTestAllTypes {
-  optional NestedTestAllTypes child = 1;
-  optional TestAllTypes payload = 2;
-  repeated NestedTestAllTypes repeated_child = 3;
-  optional NestedTestAllTypes lazy_child = 4 [lazy=true];
-  optional TestAllTypes eager_child = 5 [lazy=false];
-}
-
-message TestDeprecatedFields {
-  optional int32 deprecated_int32 = 1 [deprecated=true];
-  oneof oneof_fields {
-    int32 deprecated_int32_in_oneof = 2 [deprecated=true];
-  }
-}
-
-message TestDeprecatedMessage {
-  option deprecated = true;
-}
-
-// Define these after TestAllTypes to make sure the compiler can handle
-// that.
-message ForeignMessage {
-  optional int32 c = 1;
-  optional int32 d = 2;
-}
-
-enum ForeignEnum {
-  FOREIGN_FOO = 4;
-  FOREIGN_BAR = 5;
-  FOREIGN_BAZ = 6;
-}
-
-message TestReservedFields {
-  reserved 2, 15, 9 to 11;
-  reserved "bar", "baz";
-}
-
-message TestAllExtensions {
-  extensions 1 to max;
-}
-
-extend TestAllExtensions {
-  // Singular
-  optional    int32 optional_int32_extension    =  1;
-  optional    int64 optional_int64_extension    =  2;
-  optional   uint32 optional_uint32_extension   =  3;
-  optional   uint64 optional_uint64_extension   =  4;
-  optional   sint32 optional_sint32_extension   =  5;
-  optional   sint64 optional_sint64_extension   =  6;
-  optional  fixed32 optional_fixed32_extension  =  7;
-  optional  fixed64 optional_fixed64_extension  =  8;
-  optional sfixed32 optional_sfixed32_extension =  9;
-  optional sfixed64 optional_sfixed64_extension = 10;
-  optional    float optional_float_extension    = 11;
-  optional   double optional_double_extension   = 12;
-  optional     bool optional_bool_extension     = 13;
-  optional   string optional_string_extension   = 14;
-  optional    bytes optional_bytes_extension    = 15;
-
-  optional group OptionalGroup_extension = 16 {
-    optional int32 a = 17;
-  }
-
-  optional TestAllTypes.NestedMessage optional_nested_message_extension = 18;
-  optional ForeignMessage optional_foreign_message_extension = 19;
-  optional protobuf_unittest_import.ImportMessage
-    optional_import_message_extension = 20;
-
-  optional TestAllTypes.NestedEnum optional_nested_enum_extension = 21;
-  optional ForeignEnum optional_foreign_enum_extension = 22;
-  optional protobuf_unittest_import.ImportEnum
-    optional_import_enum_extension = 23;
-
-  optional string optional_string_piece_extension = 24 [ctype=STRING_PIECE];
-  optional string optional_cord_extension = 25 [ctype=CORD];
-
-  optional protobuf_unittest_import.PublicImportMessage
-    optional_public_import_message_extension = 26;
-
-  optional TestAllTypes.NestedMessage
-    optional_lazy_message_extension = 27 [lazy=true];
-  optional TestAllTypes.NestedMessage
-    optional_unverified_lazy_message_extension = 28 [unverified_lazy=true];
-
-  // Repeated
-  repeated    int32 repeated_int32_extension    = 31;
-  repeated    int64 repeated_int64_extension    = 32;
-  repeated   uint32 repeated_uint32_extension   = 33;
-  repeated   uint64 repeated_uint64_extension   = 34;
-  repeated   sint32 repeated_sint32_extension   = 35;
-  repeated   sint64 repeated_sint64_extension   = 36;
-  repeated  fixed32 repeated_fixed32_extension  = 37;
-  repeated  fixed64 repeated_fixed64_extension  = 38;
-  repeated sfixed32 repeated_sfixed32_extension = 39;
-  repeated sfixed64 repeated_sfixed64_extension = 40;
-  repeated    float repeated_float_extension    = 41;
-  repeated   double repeated_double_extension   = 42;
-  repeated     bool repeated_bool_extension     = 43;
-  repeated   string repeated_string_extension   = 44;
-  repeated    bytes repeated_bytes_extension    = 45;
-
-  repeated group RepeatedGroup_extension = 46 {
-    optional int32 a = 47;
-  }
-
-  repeated TestAllTypes.NestedMessage repeated_nested_message_extension = 48;
-  repeated ForeignMessage repeated_foreign_message_extension = 49;
-  repeated protobuf_unittest_import.ImportMessage
-    repeated_import_message_extension = 50;
-
-  repeated TestAllTypes.NestedEnum repeated_nested_enum_extension = 51;
-  repeated ForeignEnum repeated_foreign_enum_extension = 52;
-  repeated protobuf_unittest_import.ImportEnum
-    repeated_import_enum_extension = 53;
-
-  repeated string repeated_string_piece_extension = 54 [ctype=STRING_PIECE];
-  repeated string repeated_cord_extension = 55 [ctype=CORD];
-
-  repeated TestAllTypes.NestedMessage
-    repeated_lazy_message_extension = 57 [lazy=true];
-
-  // Singular with defaults
-  optional    int32 default_int32_extension    = 61 [default =  41    ];
-  optional    int64 default_int64_extension    = 62 [default =  42    ];
-  optional   uint32 default_uint32_extension   = 63 [default =  43    ];
-  optional   uint64 default_uint64_extension   = 64 [default =  44    ];
-  optional   sint32 default_sint32_extension   = 65 [default = -45    ];
-  optional   sint64 default_sint64_extension   = 66 [default =  46    ];
-  optional  fixed32 default_fixed32_extension  = 67 [default =  47    ];
-  optional  fixed64 default_fixed64_extension  = 68 [default =  48    ];
-  optional sfixed32 default_sfixed32_extension = 69 [default =  49    ];
-  optional sfixed64 default_sfixed64_extension = 70 [default = -50    ];
-  optional    float default_float_extension    = 71 [default =  51.5  ];
-  optional   double default_double_extension   = 72 [default =  52e3  ];
-  optional     bool default_bool_extension     = 73 [default = true   ];
-  optional   string default_string_extension   = 74 [default = "hello"];
-  optional    bytes default_bytes_extension    = 75 [default = "world"];
-
-  optional TestAllTypes.NestedEnum
-    default_nested_enum_extension = 81 [default = BAR];
-  optional ForeignEnum
-    default_foreign_enum_extension = 82 [default = FOREIGN_BAR];
-  optional protobuf_unittest_import.ImportEnum
-    default_import_enum_extension = 83 [default = IMPORT_BAR];
-
-  optional string default_string_piece_extension = 84 [ctype=STRING_PIECE,
-                                                       default="abc"];
-  optional string default_cord_extension = 85 [ctype=CORD, default="123"];
-
-  // For oneof test
-  optional uint32 oneof_uint32_extension = 111;
-  optional TestAllTypes.NestedMessage oneof_nested_message_extension = 112;
-  optional string oneof_string_extension = 113;
-  optional bytes oneof_bytes_extension = 114;
-}
-
-message TestGroup {
-  optional group OptionalGroup = 16 {
-    optional int32 a = 17;
-  }
-  optional ForeignEnum optional_foreign_enum = 22;
-}
-
-message TestGroupExtension {
-  extensions 1 to max;
-}
-
-message TestNestedExtension {
-  extend TestAllExtensions {
-    // Check for bug where string extensions declared in tested scope did not
-    // compile.
-    optional string test = 1002 [default="test"];
-    // Used to test if generated extension name is correct when there are
-    // underscores.
-    optional string nested_string_extension = 1003;
-  }
-
-  extend TestGroupExtension {
-    optional group OptionalGroup_extension = 16 {
-      optional int32 a = 17;
-    }
-    optional ForeignEnum optional_foreign_enum_extension = 22;
-  }
-}
-
-message TestChildExtension {
-  optional string a = 1;
-  optional string b = 2;
-  optional TestAllExtensions optional_extension = 3;
-}
-
-// Emulates wireformat data of TestChildExtension with dynamic extension
-// (DynamicExtension).
-message TestChildExtensionData {
-  message NestedTestAllExtensionsData {
-    message NestedDynamicExtensions {
-      optional int32 a = 1;
-      optional int32 b = 2;
-    }
-    optional NestedDynamicExtensions dynamic = 409707008;
-  }
-  optional string a = 1;
-  optional string b = 2;
-  optional NestedTestAllExtensionsData optional_extension = 3;
-}
-
-message TestNestedChildExtension {
-  optional int32 a = 1;
-  optional TestChildExtension child = 2;
-}
-
-// Emulates wireformat data of TestNestedChildExtension with dynamic extension
-// (DynamicExtension).
-message TestNestedChildExtensionData {
-  optional int32 a = 1;
-  optional TestChildExtensionData child = 2;
-}
-
-// We have separate messages for testing required fields because it's
-// annoying to have to fill in required fields in TestProto in order to
-// do anything with it.  Note that we don't need to test every type of
-// required filed because the code output is basically identical to
-// optional fields for all types.
-message TestRequired {
-  required int32 a = 1;
-  optional int32 dummy2 = 2;
-  required int32 b = 3;
-
-  extend TestAllExtensions {
-    optional TestRequired single = 1000;
-    repeated TestRequired multi  = 1001;
-  }
-
-  // Pad the field count to 32 so that we can test that IsInitialized()
-  // properly checks multiple elements of has_bits_.
-  optional int32 dummy4  =  4;
-  optional int32 dummy5  =  5;
-  optional int32 dummy6  =  6;
-  optional int32 dummy7  =  7;
-  optional int32 dummy8  =  8;
-  optional int32 dummy9  =  9;
-  optional int32 dummy10 = 10;
-  optional int32 dummy11 = 11;
-  optional int32 dummy12 = 12;
-  optional int32 dummy13 = 13;
-  optional int32 dummy14 = 14;
-  optional int32 dummy15 = 15;
-  optional int32 dummy16 = 16;
-  optional int32 dummy17 = 17;
-  optional int32 dummy18 = 18;
-  optional int32 dummy19 = 19;
-  optional int32 dummy20 = 20;
-  optional int32 dummy21 = 21;
-  optional int32 dummy22 = 22;
-  optional int32 dummy23 = 23;
-  optional int32 dummy24 = 24;
-  optional int32 dummy25 = 25;
-  optional int32 dummy26 = 26;
-  optional int32 dummy27 = 27;
-  optional int32 dummy28 = 28;
-  optional int32 dummy29 = 29;
-  optional int32 dummy30 = 30;
-  optional int32 dummy31 = 31;
-  optional int32 dummy32 = 32;
-
-  required int32 c = 33;
-
-  // Add an optional child message to make this non-trivial for go/pdlazy.
-  optional ForeignMessage optional_foreign = 34;
-}
-
-message TestRequiredForeign {
-  optional TestRequired optional_message = 1;
-  repeated TestRequired repeated_message = 2;
-  optional int32 dummy = 3;
-}
-
-message TestRequiredMessage {
-  optional TestRequired optional_message = 1;
-  repeated TestRequired repeated_message = 2;
-  required TestRequired required_message = 3;
-}
-
-message TestNestedRequiredForeign {
-  optional TestNestedRequiredForeign child = 1;
-  optional TestRequiredForeign payload = 2;
-  optional int32 dummy = 3;
-}
-
-// Test that we can use NestedMessage from outside TestAllTypes.
-message TestForeignNested {
-  optional TestAllTypes.NestedMessage foreign_nested = 1;
-}
-
-// TestEmptyMessage is used to test unknown field support.
-message TestEmptyMessage {
-}
-
-// Like above, but declare all field numbers as potential extensions.  No
-// actual extensions should ever be defined for this type.
-message TestEmptyMessageWithExtensions {
-  extensions 1 to max;
-}
-
-// Needed for a Python test.
-message TestPickleNestedMessage {
-  message NestedMessage {
-    optional int32 bb = 1;
-    message NestedNestedMessage {
-      optional int32 cc = 1;
-    }
-  }
-}
-
-message TestMultipleExtensionRanges {
-  extensions 42;
-  extensions 4143 to 4243;
-  extensions 65536 to max;
-}
-
-// Test that really large tag numbers don't break anything.
-message TestReallyLargeTagNumber {
-  // The largest possible tag number is 2^28 - 1, since the wire format uses
-  // three bits to communicate wire type.
-  optional int32 a = 1;
-  optional int32 bb = 268435455;
-}
-
-message TestRecursiveMessage {
-  optional TestRecursiveMessage a = 1;
-  optional int32 i = 2;
-}
-
-// Test that mutual recursion works.
-message TestMutualRecursionA {
-  message SubMessage {
-    optional TestMutualRecursionB b = 1;
-  }
-  optional TestMutualRecursionB bb = 1;
-  optional group SubGroup = 2 {
-    optional SubMessage sub_message = 3;  // Needed because of bug in javatest
-    optional TestAllTypes not_in_this_scc = 4;
-  }
-}
-
-message TestMutualRecursionB {
-  optional TestMutualRecursionA a = 1;
-  optional int32 optional_int32 = 2;
-}
-
-message TestIsInitialized {
-  message SubMessage {
-    optional group SubGroup = 1 {
-      required int32 i = 2;
-    }
-  }
-  optional SubMessage sub_message = 1;
-}
-
-// Test that groups have disjoint field numbers from their siblings and
-// parents.  This is NOT possible in proto1; only google.protobuf.  When attempting
-// to compile with proto1, this will emit an error; so we only include it
-// in protobuf_unittest_proto.
-message TestDupFieldNumber {                        // NO_PROTO1
-  optional int32 a = 1;                             // NO_PROTO1
-  optional group Foo = 2 { optional int32 a = 1; }  // NO_PROTO1
-  optional group Bar = 3 { optional int32 a = 1; }  // NO_PROTO1
-}                                                   // NO_PROTO1
-
-// Additional messages for testing lazy fields.
-message TestEagerMessage {
-  optional TestAllTypes sub_message = 1 [lazy=false];
-}
-message TestLazyMessage {
-  optional TestAllTypes sub_message = 1 [lazy=true];
-}
-message TestEagerMaybeLazy {
-  message NestedMessage {
-    optional TestPackedTypes packed = 1;
-  }
-  optional TestAllTypes message_foo = 1;
-  optional TestAllTypes message_bar = 2;
-  optional NestedMessage message_baz = 3;
-}
-// Needed for a Python test.
-message TestNestedMessageHasBits {
-  message NestedMessage {
-    repeated int32 nestedmessage_repeated_int32 = 1;
-    repeated ForeignMessage nestedmessage_repeated_foreignmessage = 2;
-  }
-  optional NestedMessage optional_nested_message = 1;
-}
-
-
-// Test an enum that has multiple values with the same number.
-enum TestEnumWithDupValue {
-  option allow_alias = true;
-
-  FOO1 = 1;
-  BAR1 = 2;
-  BAZ = 3;
-  FOO2 = 1;
-  BAR2 = 2;
-}
-
-// Test an enum with large, unordered values.
-enum TestSparseEnum {
-  SPARSE_A = 123;
-  SPARSE_B = 62374;
-  SPARSE_C = 12589234;
-  SPARSE_D = -15;
-  SPARSE_E = -53452;
-  SPARSE_F = 0;
-  SPARSE_G = 2;
-}
-
-// Test message with CamelCase field names.  This violates Protocol Buffer
-// standard style.
-message TestCamelCaseFieldNames {
-  optional int32 PrimitiveField = 1;
-  optional string StringField = 2;
-  optional ForeignEnum EnumField = 3;
-  optional ForeignMessage MessageField = 4;
-  optional string StringPieceField = 5 [ctype=STRING_PIECE];
-  optional string CordField = 6 [ctype=CORD];
-
-  repeated int32 RepeatedPrimitiveField = 7;
-  repeated string RepeatedStringField = 8;
-  repeated ForeignEnum RepeatedEnumField = 9;
-  repeated ForeignMessage RepeatedMessageField = 10;
-  repeated string RepeatedStringPieceField = 11 [ctype=STRING_PIECE];
-  repeated string RepeatedCordField = 12 [ctype=CORD];
-}
-
-
-// We list fields out of order, to ensure that we're using field number and not
-// field index to determine serialization order.
-message TestFieldOrderings {
-  optional string my_string = 11;
-  extensions 2 to 10;
-  optional int64 my_int = 1;
-  extensions 12 to 100;
-  optional float my_float = 101;
-  message NestedMessage {
-    optional int64 oo = 2;
-    // The field name "b" fails to compile in proto1 because it conflicts with
-    // a local variable named "b" in one of the generated methods.  Doh.
-    // This file needs to compile in proto1 to test backwards-compatibility.
-    optional int32 bb = 1;
-  }
-
-  optional NestedMessage optional_nested_message  = 200;
-}
-
-extend TestFieldOrderings {
-  optional string my_extension_string = 50;
-  optional int32 my_extension_int = 5;
-}
-
-message TestExtensionOrderings1 {
-  extend TestFieldOrderings {
-    optional TestExtensionOrderings1 test_ext_orderings1 = 13;
-  }
-  optional string my_string = 1;
-}
-
-message TestExtensionOrderings2 {
-  extend TestFieldOrderings {
-    optional TestExtensionOrderings2 test_ext_orderings2 = 12;
-  }
-  message TestExtensionOrderings3 {
-    extend TestFieldOrderings {
-      optional TestExtensionOrderings3 test_ext_orderings3 = 14;
-    }
-    optional string my_string = 1;
-  }
-  optional string my_string = 1;
-}
-
-message TestExtremeDefaultValues {
-  optional bytes escaped_bytes = 1 [default = "\0\001\a\b\f\n\r\t\v\\\'\"\xfe"];
-  optional uint32 large_uint32 = 2 [default = 0xFFFFFFFF];
-  optional uint64 large_uint64 = 3 [default = 0xFFFFFFFFFFFFFFFF];
-  optional  int32 small_int32  = 4 [default = -0x7FFFFFFF];
-  optional  int64 small_int64  = 5 [default = -0x7FFFFFFFFFFFFFFF];
-  optional  int32 really_small_int32 = 21 [default = -0x80000000];
-  optional  int64 really_small_int64 = 22 [default = -0x8000000000000000];
-
-  // The default value here is UTF-8 for "\u1234".  (We could also just type
-  // the UTF-8 text directly into this text file rather than escape it, but
-  // lots of people use editors that would be confused by this.)
-  optional string utf8_string = 6 [default = "\341\210\264"];
-
-  // Tests for single-precision floating-point values.
-  optional float zero_float = 7 [default = 0];
-  optional float one_float = 8 [default = 1];
-  optional float small_float = 9 [default = 1.5];
-  optional float negative_one_float = 10 [default = -1];
-  optional float negative_float = 11 [default = -1.5];
-  // Using exponents
-  optional float large_float = 12 [default = 2E8];
-  optional float small_negative_float = 13 [default = -8e-28];
-
-  // Text for nonfinite floating-point values.
-  optional double inf_double = 14 [default = inf];
-  optional double neg_inf_double = 15 [default = -inf];
-  optional double nan_double = 16 [default = nan];
-  optional float inf_float = 17 [default = inf];
-  optional float neg_inf_float = 18 [default = -inf];
-  optional float nan_float = 19 [default = nan];
-
-  // Tests for C++ trigraphs.
-  // Trigraphs should be escaped in C++ generated files, but they should not be
-  // escaped for other languages.
-  // Note that in .proto file, "\?" is a valid way to escape ? in string
-  // literals.
-  optional string cpp_trigraph = 20 [default = "? \? ?? \?? \??? ??/ ?\?-"];
-
-  // String defaults containing the character '\000'
-  optional string string_with_zero       = 23 [default = "hel\000lo"];
-  optional  bytes bytes_with_zero        = 24 [default = "wor\000ld"];
-  optional string string_piece_with_zero = 25 [ctype=STRING_PIECE,
-                                               default="ab\000c"];
-  optional string cord_with_zero         = 26 [ctype=CORD,
-                                               default="12\0003"];
-  optional string replacement_string     = 27 [default="${unknown}"];
-}
-
-message SparseEnumMessage {
-  optional TestSparseEnum sparse_enum = 1;
-}
-
-// Test String and Bytes: string is for valid UTF-8 strings
-message OneString {
-  optional string data = 1;
-}
-
-message MoreString {
-  repeated string data = 1;
-}
-
-message OneBytes {
-  optional bytes data = 1;
-}
-
-message MoreBytes {
-  repeated bytes data = 1;
-}
-
-message ManyOptionalString {
-  optional string str1 = 1;
-  optional string str2 = 2;
-  optional string str3 = 3;
-  optional string str4 = 4;
-  optional string str5 = 5;
-  optional string str6 = 6;
-  optional string str7 = 7;
-  optional string str8 = 8;
-  optional string str9 = 9;
-  optional string str10 = 10;
-  optional string str11 = 11;
-  optional string str12 = 12;
-  optional string str13 = 13;
-  optional string str14 = 14;
-  optional string str15 = 15;
-  optional string str16 = 16;
-  optional string str17 = 17;
-  optional string str18 = 18;
-  optional string str19 = 19;
-  optional string str20 = 20;
-  optional string str21 = 21;
-  optional string str22 = 22;
-  optional string str23 = 23;
-  optional string str24 = 24;
-  optional string str25 = 25;
-  optional string str26 = 26;
-  optional string str27 = 27;
-  optional string str28 = 28;
-  optional string str29 = 29;
-  optional string str30 = 30;
-  optional string str31 = 31;
-  optional string str32 = 32;
-}
-
-// Test int32, uint32, int64, uint64, and bool are all compatible
-message Int32Message {
-  optional int32 data = 1;
-}
-
-message Uint32Message {
-  optional uint32 data = 1;
-}
-
-message Int64Message {
-  optional int64 data = 1;
-}
-
-message Uint64Message {
-  optional uint64 data = 1;
-}
-
-message BoolMessage {
-  optional bool data = 1;
-}
-
-// Test oneofs.
-message TestOneof {
-  oneof foo {
-    int32 foo_int = 1;
-    string foo_string = 2;
-    TestAllTypes foo_message = 3;
-    group FooGroup = 4 {
-      optional int32 a = 5;
-      optional string b = 6;
-    }
-  }
-}
-
-message TestOneofBackwardsCompatible {
-  optional int32 foo_int = 1;
-  optional string foo_string = 2;
-  optional TestAllTypes foo_message = 3;
-  optional group FooGroup = 4 {
-    optional int32 a = 5;
-    optional string b = 6;
-  }
-}
-
-message TestOneof2 {
-  oneof foo {
-    int32 foo_int = 1;
-    string foo_string = 2;
-    string foo_cord = 3 [ctype=CORD];
-    string foo_string_piece = 4 [ctype=STRING_PIECE];
-    bytes foo_bytes = 5;
-    NestedEnum foo_enum = 6;
-    NestedMessage foo_message = 7;
-    group FooGroup = 8 {
-      optional int32 a = 9;
-      optional string b = 10;
-    }
-    NestedMessage foo_lazy_message = 11 [lazy=true];
-  }
-
-  oneof bar {
-    int32 bar_int = 12 [default = 5];
-    string bar_string = 13 [default = "STRING"];
-    string bar_cord = 14 [ctype=CORD, default = "CORD"];
-    string bar_string_piece = 15 [ctype=STRING_PIECE, default = "SPIECE"];
-    bytes bar_bytes = 16 [default = "BYTES"];
-    NestedEnum bar_enum = 17 [default = BAR];
-    string bar_string_with_empty_default = 20 [default = ""];
-    string bar_cord_with_empty_default = 21 [ctype=CORD, default = ""];
-    string bar_string_piece_with_empty_default = 22 [ctype=STRING_PIECE, default = ""];
-    bytes bar_bytes_with_empty_default = 23 [default = ""];
-  }
-
-  optional int32 baz_int = 18;
-  optional string baz_string = 19 [default = "BAZ"];
-
-  message NestedMessage {
-    optional int64 moo_int = 1;
-    repeated int32 corge_int = 2;
-  }
-
-  enum NestedEnum {
-    FOO = 1;
-    BAR = 2;
-    BAZ = 3;
-  }
-}
-
-message TestRequiredOneof {
-  oneof foo {
-    int32 foo_int = 1;
-    string foo_string = 2;
-    NestedMessage foo_message = 3;
-  }
-  message NestedMessage {
-    required double required_double = 1;
-  }
-}
-
-
-// Test messages for packed fields
-
-message TestPackedTypes {
-  repeated    int32 packed_int32    =  90 [packed = true];
-  repeated    int64 packed_int64    =  91 [packed = true];
-  repeated   uint32 packed_uint32   =  92 [packed = true];
-  repeated   uint64 packed_uint64   =  93 [packed = true];
-  repeated   sint32 packed_sint32   =  94 [packed = true];
-  repeated   sint64 packed_sint64   =  95 [packed = true];
-  repeated  fixed32 packed_fixed32  =  96 [packed = true];
-  repeated  fixed64 packed_fixed64  =  97 [packed = true];
-  repeated sfixed32 packed_sfixed32 =  98 [packed = true];
-  repeated sfixed64 packed_sfixed64 =  99 [packed = true];
-  repeated    float packed_float    = 100 [packed = true];
-  repeated   double packed_double   = 101 [packed = true];
-  repeated     bool packed_bool     = 102 [packed = true];
-  repeated ForeignEnum packed_enum  = 103 [packed = true];
-}
-
-// A message with the same fields as TestPackedTypes, but without packing. Used
-// to test packed <-> unpacked wire compatibility.
-message TestUnpackedTypes {
-  repeated    int32 unpacked_int32    =  90 [packed = false];
-  repeated    int64 unpacked_int64    =  91 [packed = false];
-  repeated   uint32 unpacked_uint32   =  92 [packed = false];
-  repeated   uint64 unpacked_uint64   =  93 [packed = false];
-  repeated   sint32 unpacked_sint32   =  94 [packed = false];
-  repeated   sint64 unpacked_sint64   =  95 [packed = false];
-  repeated  fixed32 unpacked_fixed32  =  96 [packed = false];
-  repeated  fixed64 unpacked_fixed64  =  97 [packed = false];
-  repeated sfixed32 unpacked_sfixed32 =  98 [packed = false];
-  repeated sfixed64 unpacked_sfixed64 =  99 [packed = false];
-  repeated    float unpacked_float    = 100 [packed = false];
-  repeated   double unpacked_double   = 101 [packed = false];
-  repeated     bool unpacked_bool     = 102 [packed = false];
-  repeated ForeignEnum unpacked_enum  = 103 [packed = false];
-}
-
-message TestPackedExtensions {
-  extensions 1 to max;
-}
-
-extend TestPackedExtensions {
-  repeated    int32 packed_int32_extension    =  90 [packed = true];
-  repeated    int64 packed_int64_extension    =  91 [packed = true];
-  repeated   uint32 packed_uint32_extension   =  92 [packed = true];
-  repeated   uint64 packed_uint64_extension   =  93 [packed = true];
-  repeated   sint32 packed_sint32_extension   =  94 [packed = true];
-  repeated   sint64 packed_sint64_extension   =  95 [packed = true];
-  repeated  fixed32 packed_fixed32_extension  =  96 [packed = true];
-  repeated  fixed64 packed_fixed64_extension  =  97 [packed = true];
-  repeated sfixed32 packed_sfixed32_extension =  98 [packed = true];
-  repeated sfixed64 packed_sfixed64_extension =  99 [packed = true];
-  repeated    float packed_float_extension    = 100 [packed = true];
-  repeated   double packed_double_extension   = 101 [packed = true];
-  repeated     bool packed_bool_extension     = 102 [packed = true];
-  repeated ForeignEnum packed_enum_extension  = 103 [packed = true];
-}
-
-message TestUnpackedExtensions {
-  extensions 1 to max;
-}
-
-extend TestUnpackedExtensions {
-  repeated    int32 unpacked_int32_extension    =  90 [packed = false];
-  repeated    int64 unpacked_int64_extension    =  91 [packed = false];
-  repeated   uint32 unpacked_uint32_extension   =  92 [packed = false];
-  repeated   uint64 unpacked_uint64_extension   =  93 [packed = false];
-  repeated   sint32 unpacked_sint32_extension   =  94 [packed = false];
-  repeated   sint64 unpacked_sint64_extension   =  95 [packed = false];
-  repeated  fixed32 unpacked_fixed32_extension  =  96 [packed = false];
-  repeated  fixed64 unpacked_fixed64_extension  =  97 [packed = false];
-  repeated sfixed32 unpacked_sfixed32_extension =  98 [packed = false];
-  repeated sfixed64 unpacked_sfixed64_extension =  99 [packed = false];
-  repeated    float unpacked_float_extension    = 100 [packed = false];
-  repeated   double unpacked_double_extension   = 101 [packed = false];
-  repeated     bool unpacked_bool_extension     = 102 [packed = false];
-  repeated ForeignEnum unpacked_enum_extension  = 103 [packed = false];
-}
-
-// Used by ExtensionSetTest/DynamicExtensions.  The test actually builds
-// a set of extensions to TestAllExtensions dynamically, based on the fields
-// of this message type.
-message TestDynamicExtensions {
-  enum DynamicEnumType {
-    DYNAMIC_FOO = 2200;
-    DYNAMIC_BAR = 2201;
-    DYNAMIC_BAZ = 2202;
-  }
-  message DynamicMessageType {
-    optional int32 dynamic_field = 2100;
-  }
-
-  optional fixed32 scalar_extension = 2000;
-  optional ForeignEnum enum_extension = 2001;
-  optional DynamicEnumType dynamic_enum_extension = 2002;
-
-  optional ForeignMessage message_extension = 2003;
-  optional DynamicMessageType dynamic_message_extension = 2004;
-
-  repeated string repeated_extension = 2005;
-  repeated sint32 packed_extension = 2006 [packed = true];
-}
-
-message TestRepeatedScalarDifferentTagSizes {
-  // Parsing repeated fixed size values used to fail. This message needs to be
-  // used in order to get a tag of the right size; all of the repeated fields
-  // in TestAllTypes didn't trigger the check.
-  repeated fixed32 repeated_fixed32 = 12;
-  // Check for a varint type, just for good measure.
-  repeated int32   repeated_int32   = 13;
-
-  // These have two-byte tags.
-  repeated fixed64 repeated_fixed64 = 2046;
-  repeated int64   repeated_int64   = 2047;
-
-  // Three byte tags.
-  repeated float   repeated_float   = 262142;
-  repeated uint64  repeated_uint64  = 262143;
-}
-
-// Test that if an optional or required message/group field appears multiple
-// times in the input, they need to be merged.
-message TestParsingMerge {
-  // RepeatedFieldsGenerator defines matching field types as TestParsingMerge,
-  // except that all fields are repeated. In the tests, we will serialize the
-  // RepeatedFieldsGenerator to bytes, and parse the bytes to TestParsingMerge.
-  // Repeated fields in RepeatedFieldsGenerator are expected to be merged into
-  // the corresponding required/optional fields in TestParsingMerge.
-  message RepeatedFieldsGenerator {
-    repeated TestAllTypes field1 = 1;
-    repeated TestAllTypes field2 = 2;
-    repeated TestAllTypes field3 = 3;
-    repeated group Group1 = 10 {
-      optional TestAllTypes field1 = 11;
-    }
-    repeated group Group2 = 20 {
-      optional TestAllTypes field1 = 21;
-    }
-    repeated TestAllTypes ext1 = 1000;
-    repeated TestAllTypes ext2 = 1001;
-  }
-  required TestAllTypes required_all_types = 1;
-  optional TestAllTypes optional_all_types = 2;
-  repeated TestAllTypes repeated_all_types = 3;
-  optional group OptionalGroup = 10 {
-    optional TestAllTypes optional_group_all_types = 11;
-  }
-  repeated group RepeatedGroup = 20 {
-    optional TestAllTypes repeated_group_all_types = 21;
-  }
-  extensions 1000 to max;
-  extend TestParsingMerge {
-    optional TestAllTypes optional_ext = 1000;
-    repeated TestAllTypes repeated_ext = 1001;
-  }
-}
-
-// Test that the correct exception is thrown by parseFrom in a corner case
-// involving merging, extensions, and required fields.
-message TestMergeException {
-  optional TestAllExtensions all_extensions = 1;
-}
-
-message TestCommentInjectionMessage {
-  // */ <- This should not close the generated doc comment
-  optional string a = 1 [default="*/ <- Neither should this."];
-}
-
-// Used to check that the c++ code generator re-orders messages to reduce
-// padding.
-message TestMessageSize {
-  optional bool m1 = 1;
-  optional int64 m2 = 2;
-  optional bool m3 = 3;
-  optional string m4 = 4;
-  optional int32 m5 = 5;
-  optional int64 m6 = 6;
-}
-
-
-// Test that RPC services work.
-message FooRequest  {}
-message FooResponse {}
-
-message FooClientMessage {}
-message FooServerMessage{}
-
-service TestService {
-  rpc Foo(FooRequest) returns (FooResponse);
-  rpc Bar(BarRequest) returns (BarResponse);
-}
-
-
-message BarRequest  {}
-message BarResponse {}
-
-message TestJsonName {
-  optional int32 field_name1 = 1;
-  optional int32 fieldName2 = 2;
-  optional int32 FieldName3 = 3;
-  optional int32 _field_name4 = 4;
-  optional int32 FIELD_NAME5 = 5;
-  optional int32 field_name6 = 6 [json_name = "@type"];
-  optional int32 fieldname7 = 7;
-}
-
-message TestHugeFieldNumbers {
-  optional int32 optional_int32 = 536870000;
-  optional int32 fixed_32 = 536870001;
-  repeated int32 repeated_int32 = 536870002 [packed = false];
-  repeated int32 packed_int32 = 536870003 [packed = true];
-
-  optional ForeignEnum optional_enum = 536870004;
-  optional string optional_string = 536870005;
-  optional bytes optional_bytes = 536870006;
-  optional ForeignMessage optional_message = 536870007;
-
-  optional group OptionalGroup = 536870008 {
-    optional int32 group_a = 536870009;
-  }
-
-  map<string, string> string_string_map = 536870010;
-
-  oneof oneof_field {
-    uint32 oneof_uint32 = 536870011;
-    TestAllTypes oneof_test_all_types = 536870012;
-    string oneof_string = 536870013;
-    bytes oneof_bytes = 536870014;
-  }
-
-  extensions  536860000 to 536869999;
-}
-
-extend TestHugeFieldNumbers {
-  optional TestAllTypes test_all_types = 536860000;
-}
-
-message TestExtensionInsideTable {
-  optional int32 field1 = 1;
-  optional int32 field2 = 2;
-  optional int32 field3 = 3;
-  optional int32 field4 = 4;
-  extensions 5 to 5;
-  optional int32 field6 = 6;
-  optional int32 field7 = 7;
-  optional int32 field8 = 8;
-  optional int32 field9 = 9;
-  optional int32 field10 = 10;
-}
-
-extend TestExtensionInsideTable {
-  optional int32 test_extension_inside_table_extension = 5;
-}
-
-// NOTE(b/202996544): Intentionally nested to mirror go/glep.
-message TestNestedGroupExtensionOuter {
-  optional group Layer1OptionalGroup = 1 {
-    repeated group Layer2RepeatedGroup = 2 {
-      extensions 3
-        // NOTE: extension metadata is not supported due to targets such as
-        // `//third_party/protobuf_legacy_opensource/src:shell_scripts_test`,
-        // eee https://screenshot.googleplex.com/Axz2QD8nxjdpyFF
-        //[metadata = {
-        // NOTE: can't write type there due to some clever build gen code at
-        // http://google3/net/proto2/internal/BUILD;l=1247;rcl=411090862
-        // type: "protobuf_unittest.TestNestedGroupExtensionInnerExtension",
-        // name: "inner",
-        // }]
-        ;
-      optional string another_field = 6;
-    }
-    repeated group Layer2AnotherOptionalRepeatedGroup = 4 {
-      optional string but_why_tho = 5;
-    }
-  }
-}
-
-message TestNestedGroupExtensionInnerExtension {
-  optional string inner_name= 1;
-}
-
-extend TestNestedGroupExtensionOuter.Layer1OptionalGroup.Layer2RepeatedGroup {
-  optional TestNestedGroupExtensionInnerExtension inner = 3;
-}
-
-enum VeryLargeEnum {
-  ENUM_LABEL_DEFAULT = 0;
-  ENUM_LABEL_1 = 1;
-  ENUM_LABEL_2 = 2;
-  ENUM_LABEL_3 = 3;
-  ENUM_LABEL_4 = 4;
-  ENUM_LABEL_5 = 5;
-  ENUM_LABEL_6 = 6;
-  ENUM_LABEL_7 = 7;
-  ENUM_LABEL_8 = 8;
-  ENUM_LABEL_9 = 9;
-  ENUM_LABEL_10 = 10;
-  ENUM_LABEL_11 = 11;
-  ENUM_LABEL_12 = 12;
-  ENUM_LABEL_13 = 13;
-  ENUM_LABEL_14 = 14;
-  ENUM_LABEL_15 = 15;
-  ENUM_LABEL_16 = 16;
-  ENUM_LABEL_17 = 17;
-  ENUM_LABEL_18 = 18;
-  ENUM_LABEL_19 = 19;
-  ENUM_LABEL_20 = 20;
-  ENUM_LABEL_21 = 21;
-  ENUM_LABEL_22 = 22;
-  ENUM_LABEL_23 = 23;
-  ENUM_LABEL_24 = 24;
-  ENUM_LABEL_25 = 25;
-  ENUM_LABEL_26 = 26;
-  ENUM_LABEL_27 = 27;
-  ENUM_LABEL_28 = 28;
-  ENUM_LABEL_29 = 29;
-  ENUM_LABEL_30 = 30;
-  ENUM_LABEL_31 = 31;
-  ENUM_LABEL_32 = 32;
-  ENUM_LABEL_33 = 33;
-  ENUM_LABEL_34 = 34;
-  ENUM_LABEL_35 = 35;
-  ENUM_LABEL_36 = 36;
-  ENUM_LABEL_37 = 37;
-  ENUM_LABEL_38 = 38;
-  ENUM_LABEL_39 = 39;
-  ENUM_LABEL_40 = 40;
-  ENUM_LABEL_41 = 41;
-  ENUM_LABEL_42 = 42;
-  ENUM_LABEL_43 = 43;
-  ENUM_LABEL_44 = 44;
-  ENUM_LABEL_45 = 45;
-  ENUM_LABEL_46 = 46;
-  ENUM_LABEL_47 = 47;
-  ENUM_LABEL_48 = 48;
-  ENUM_LABEL_49 = 49;
-  ENUM_LABEL_50 = 50;
-  ENUM_LABEL_51 = 51;
-  ENUM_LABEL_52 = 52;
-  ENUM_LABEL_53 = 53;
-  ENUM_LABEL_54 = 54;
-  ENUM_LABEL_55 = 55;
-  ENUM_LABEL_56 = 56;
-  ENUM_LABEL_57 = 57;
-  ENUM_LABEL_58 = 58;
-  ENUM_LABEL_59 = 59;
-  ENUM_LABEL_60 = 60;
-  ENUM_LABEL_61 = 61;
-  ENUM_LABEL_62 = 62;
-  ENUM_LABEL_63 = 63;
-  ENUM_LABEL_64 = 64;
-  ENUM_LABEL_65 = 65;
-  ENUM_LABEL_66 = 66;
-  ENUM_LABEL_67 = 67;
-  ENUM_LABEL_68 = 68;
-  ENUM_LABEL_69 = 69;
-  ENUM_LABEL_70 = 70;
-  ENUM_LABEL_71 = 71;
-  ENUM_LABEL_72 = 72;
-  ENUM_LABEL_73 = 73;
-  ENUM_LABEL_74 = 74;
-  ENUM_LABEL_75 = 75;
-  ENUM_LABEL_76 = 76;
-  ENUM_LABEL_77 = 77;
-  ENUM_LABEL_78 = 78;
-  ENUM_LABEL_79 = 79;
-  ENUM_LABEL_80 = 80;
-  ENUM_LABEL_81 = 81;
-  ENUM_LABEL_82 = 82;
-  ENUM_LABEL_83 = 83;
-  ENUM_LABEL_84 = 84;
-  ENUM_LABEL_85 = 85;
-  ENUM_LABEL_86 = 86;
-  ENUM_LABEL_87 = 87;
-  ENUM_LABEL_88 = 88;
-  ENUM_LABEL_89 = 89;
-  ENUM_LABEL_90 = 90;
-  ENUM_LABEL_91 = 91;
-  ENUM_LABEL_92 = 92;
-  ENUM_LABEL_93 = 93;
-  ENUM_LABEL_94 = 94;
-  ENUM_LABEL_95 = 95;
-  ENUM_LABEL_96 = 96;
-  ENUM_LABEL_97 = 97;
-  ENUM_LABEL_98 = 98;
-  ENUM_LABEL_99 = 99;
-  ENUM_LABEL_100 = 100;
-};
-
-message TestExtensionRangeSerialize {
-  optional int32 foo_one = 1;
-
-  extensions 2 to 2;
-  extensions 3 to 4;
-
-  optional int32 foo_two = 6;
-  optional int32 foo_three = 7;
-
-  extensions 9 to 10;
-
-  optional int32 foo_four = 13;
-
-  extensions 15 to 15;
-  extensions 17 to 17;
-  extensions 19 to 19;
-
-  extend TestExtensionRangeSerialize {
-    optional int32 bar_one = 2;
-    optional int32 bar_two = 4;
-
-    optional int32 bar_three = 10;
-
-    optional int32 bar_four = 15;
-    optional int32 bar_five = 19;
-  }
-}
-
-message TestVerifyInt32Simple {
-    optional int32 optional_int32_1 = 1;
-    optional int32 optional_int32_2 = 2;
-    optional int32 optional_int32_63 = 63;
-    optional int32 optional_int32_64 = 64;
-}
-
-message TestVerifyInt32 {
-    optional int32 optional_int32_1 = 1;
-    optional int32 optional_int32_2 = 2;
-    optional int32 optional_int32_63 = 63;
-    optional int32 optional_int32_64 = 64;
-
-    optional TestAllTypes optional_all_types = 9;
-    repeated TestAllTypes repeated_all_types = 10;
-}
-
-message TestVerifyMostlyInt32 {
-    optional int64 optional_int64_30 = 30;
-
-    optional int32 optional_int32_1 = 1;
-    optional int32 optional_int32_2 = 2;
-    optional int32 optional_int32_3 = 3;
-    optional int32 optional_int32_4 = 4;
-    optional int32 optional_int32_63 = 63;
-    optional int32 optional_int32_64 = 64;
-
-    optional TestAllTypes optional_all_types = 9;
-    repeated TestAllTypes repeated_all_types = 10;
-}
-
-message TestVerifyMostlyInt32BigFieldNumber {
-    optional int64 optional_int64_30 = 30;
-    optional int32 optional_int32_300 = 300;
-
-    optional int32 optional_int32_1 = 1;
-    optional int32 optional_int32_2 = 2;
-    optional int32 optional_int32_3 = 3;
-    optional int32 optional_int32_4 = 4;
-    optional int32 optional_int32_63 = 63;
-    optional int32 optional_int32_64 = 64;
-
-    optional TestAllTypes optional_all_types = 9;
-    repeated TestAllTypes repeated_all_types = 10;
-}
-
-message TestVerifyUint32Simple {
-    optional uint32 optional_uint32_1 = 1;
-    optional uint32 optional_uint32_2 = 2;
-    optional uint32 optional_uint32_63 = 63;
-    optional uint32 optional_uint32_64 = 64;
-}
-
-message TestVerifyUint32 {
-    optional uint32 optional_uint32_1 = 1;
-    optional uint32 optional_uint32_2 = 2;
-    optional uint32 optional_uint32_63 = 63;
-    optional uint32 optional_uint32_64 = 64;
-
-    optional TestAllTypes optional_all_types = 9;
-    repeated TestAllTypes repeated_all_types = 10;
-}
-
-message TestVerifyOneUint32 {
-    optional uint32 optional_uint32_1 = 1;
-    optional int32 optional_int32_2 = 2;
-    optional int32 optional_int32_63 = 63;
-    optional int32 optional_int32_64 = 64;
-
-    optional TestAllTypes optional_all_types = 9;
-    repeated TestAllTypes repeated_all_types = 10;
-}
-
-message TestVerifyOneInt32BigFieldNumber {
-    optional int32 optional_int32_65 = 65;
-
-    optional int64 optional_int64_1 = 1;
-    optional int64 optional_int64_2 = 2;
-    optional int64 optional_int64_63 = 63;
-    optional int64 optional_int64_64 = 64;
-
-    optional TestAllTypes optional_all_types = 9;
-    repeated TestAllTypes repeated_all_types = 10;
-}
-
-message TestVerifyInt32BigFieldNumber {
-    optional int32 optional_int32_1000 = 1000;
-    optional int32 optional_int32_65 = 65;
-
-    optional int32 optional_int32_1 = 1;
-    optional int32 optional_int32_2 = 2;
-    optional int32 optional_int32_63 = 63;
-    optional int32 optional_int32_64 = 64;
-
-    optional TestAllTypes optional_all_types = 9;
-    repeated TestAllTypes repeated_all_types = 10;
-}
-
-message TestVerifyUint32BigFieldNumber {
-    optional uint32 optional_uint32_1000 = 1000;
-    optional uint32 optional_uint32_65 = 65;
-
-    optional uint32 optional_uint32_1 = 1;
-    optional uint32 optional_uint32_2 = 2;
-    optional uint32 optional_uint32_63 = 63;
-    optional uint32 optional_uint32_64 = 64;
-
-    optional TestAllTypes optional_all_types = 9;
-    repeated TestAllTypes repeated_all_types = 10;
-}
-
-message TestVerifyBigFieldNumberUint32 {
-  message Nested {
-    optional uint32 optional_uint32_5000 = 5000;
-    optional uint32 optional_uint32_1000 = 1000;
-    optional uint32 optional_uint32_66 = 66;
-    optional uint32 optional_uint32_65 = 65;
-
-    optional uint32 optional_uint32_1 = 1;
-    optional uint32 optional_uint32_2 = 2;
-    optional uint32 optional_uint32_63 = 63;
-    optional uint32 optional_uint32_64 = 64;
-
-    optional Nested optional_nested = 9;
-    repeated Nested repeated_nested = 10;
-  }
-  optional Nested optional_nested = 1;
-}
-
-
diff --git a/libs/protobuf/src/google/protobuf/unittest_arena.proto b/libs/protobuf/src/google/protobuf/unittest_arena.proto
deleted file mode 100644
index 7b31739..0000000
--- a/libs/protobuf/src/google/protobuf/unittest_arena.proto
+++ /dev/null
@@ -1,43 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto2";
-
-package proto2_arena_unittest;
-
-option cc_enable_arenas = true;
-
-message NestedMessage {
-  optional int32 d = 1;
-}
-
-message ArenaMessage {
-  repeated NestedMessage repeated_nested_message = 1;
-}
diff --git a/libs/protobuf/src/google/protobuf/unittest_custom_options.proto b/libs/protobuf/src/google/protobuf/unittest_custom_options.proto
deleted file mode 100644
index d741661..0000000
--- a/libs/protobuf/src/google/protobuf/unittest_custom_options.proto
+++ /dev/null
@@ -1,466 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: benjy@google.com (Benjy Weinberger)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-//
-// A proto file used to test the "custom options" feature of google.protobuf.
-
-syntax = "proto2";
-
-// Some generic_services option(s) added automatically.
-// See:  http://go/proto2-generic-services-default
-option cc_generic_services = true;    // auto-added
-option java_generic_services = true;  // auto-added
-option py_generic_services = true;
-
-// A custom file option (defined below).
-option (file_opt1) = 9876543210;
-
-import "google/protobuf/any.proto";
-import "google/protobuf/descriptor.proto";
-
-// We don't put this in a package within proto2 because we need to make sure
-// that the generated code doesn't depend on being in the proto2 namespace.
-package protobuf_unittest;
-
-// Some simple test custom options of various types.
-
-extend google.protobuf.FileOptions {
-  optional uint64 file_opt1 = 7736974;
-}
-
-extend google.protobuf.MessageOptions {
-  optional int32 message_opt1 = 7739036;
-}
-
-extend google.protobuf.FieldOptions {
-  optional fixed64 field_opt1 = 7740936;
-  // This is useful for testing that we correctly register default values for
-  // extension options.
-  optional int32 field_opt2 = 7753913 [default = 42];
-}
-
-extend google.protobuf.OneofOptions {
-  optional int32 oneof_opt1 = 7740111;
-}
-
-extend google.protobuf.EnumOptions {
-  optional sfixed32 enum_opt1 = 7753576;
-}
-
-extend google.protobuf.EnumValueOptions {
-  optional int32 enum_value_opt1 = 1560678;
-}
-
-extend google.protobuf.ServiceOptions {
-  optional sint64 service_opt1 = 7887650;
-}
-
-enum MethodOpt1 {
-  METHODOPT1_VAL1 = 1;
-  METHODOPT1_VAL2 = 2;
-}
-
-extend google.protobuf.MethodOptions {
-  optional MethodOpt1 method_opt1 = 7890860;
-}
-
-// A test message with custom options at all possible locations (and also some
-// regular options, to make sure they interact nicely).
-message TestMessageWithCustomOptions {
-  option message_set_wire_format = false;
-  option (message_opt1) = -56;
-
-  optional string field1 = 1 [ctype = CORD, (field_opt1) = 8765432109];
-
-  oneof AnOneof {
-    option (oneof_opt1) = -99;
-
-    int32 oneof_field = 2;
-  }
-
-  map<string, string> map_field = 3 [(field_opt1) = 12345];
-
-  enum AnEnum {
-    option (enum_opt1) = -789;
-
-    ANENUM_VAL1 = 1;
-    ANENUM_VAL2 = 2 [(enum_value_opt1) = 123];
-  }
-}
-
-// A test RPC service with custom options at all possible locations (and also
-// some regular options, to make sure they interact nicely).
-message CustomOptionFooRequest {}
-
-message CustomOptionFooResponse {}
-
-message CustomOptionFooClientMessage {}
-
-message CustomOptionFooServerMessage {}
-
-service TestServiceWithCustomOptions {
-  option (service_opt1) = -9876543210;
-
-  rpc Foo(CustomOptionFooRequest) returns (CustomOptionFooResponse) {
-    option (method_opt1) = METHODOPT1_VAL2;
-  }
-}
-
-// Options of every possible field type, so we can test them all exhaustively.
-
-message DummyMessageContainingEnum {
-  enum TestEnumType {
-    TEST_OPTION_ENUM_TYPE1 = 22;
-    TEST_OPTION_ENUM_TYPE2 = -23;
-  }
-}
-
-message DummyMessageInvalidAsOptionType {}
-
-extend google.protobuf.MessageOptions {
-  optional bool bool_opt = 7706090;
-  optional int32 int32_opt = 7705709;
-  optional int64 int64_opt = 7705542;
-  optional uint32 uint32_opt = 7704880;
-  optional uint64 uint64_opt = 7702367;
-  optional sint32 sint32_opt = 7701568;
-  optional sint64 sint64_opt = 7700863;
-  optional fixed32 fixed32_opt = 7700307;
-  optional fixed64 fixed64_opt = 7700194;
-  optional sfixed32 sfixed32_opt = 7698645;
-  optional sfixed64 sfixed64_opt = 7685475;
-  optional float float_opt = 7675390;
-  optional double double_opt = 7673293;
-  optional string string_opt = 7673285;
-  optional bytes bytes_opt = 7673238;
-  optional DummyMessageContainingEnum.TestEnumType enum_opt = 7673233;
-  optional DummyMessageInvalidAsOptionType message_type_opt = 7665967;
-}
-
-message CustomOptionMinIntegerValues {
-  option (bool_opt) = false;
-  option (int32_opt) = -0x80000000;
-  option (int64_opt) = -0x8000000000000000;
-  option (uint32_opt) = 0;
-  option (uint64_opt) = 0;
-  option (sint32_opt) = -0x80000000;
-  option (sint64_opt) = -0x8000000000000000;
-  option (fixed32_opt) = 0;
-  option (fixed64_opt) = 0;
-  option (sfixed32_opt) = -0x80000000;
-  option (sfixed64_opt) = -0x8000000000000000;
-}
-
-message CustomOptionMaxIntegerValues {
-  option (bool_opt) = true;
-  option (int32_opt) = 0x7FFFFFFF;
-  option (int64_opt) = 0x7FFFFFFFFFFFFFFF;
-  option (uint32_opt) = 0xFFFFFFFF;
-  option (uint64_opt) = 0xFFFFFFFFFFFFFFFF;
-  option (sint32_opt) = 0x7FFFFFFF;
-  option (sint64_opt) = 0x7FFFFFFFFFFFFFFF;
-  option (fixed32_opt) = 0xFFFFFFFF;
-  option (fixed64_opt) = 0xFFFFFFFFFFFFFFFF;
-  option (sfixed32_opt) = 0x7FFFFFFF;
-  option (sfixed64_opt) = 0x7FFFFFFFFFFFFFFF;
-}
-
-message CustomOptionOtherValues {
-  option (int32_opt) = -100;  // To test sign-extension.
-  option (float_opt) = 12.3456789;
-  option (double_opt) = 1.234567890123456789;
-  option (string_opt) = "Hello, \"World\"";
-  option (bytes_opt) = "Hello\0World";
-  option (enum_opt) = TEST_OPTION_ENUM_TYPE2;
-}
-
-message SettingRealsFromPositiveInts {
-  option (float_opt) = 12;
-  option (double_opt) = 154;
-}
-
-message SettingRealsFromNegativeInts {
-  option (float_opt) = -12;
-  option (double_opt) = -154;
-}
-
-// Options of complex message types, themselves combined and extended in
-// various ways.
-
-message ComplexOptionType1 {
-  optional int32 foo = 1;
-  optional int32 foo2 = 2;
-  optional int32 foo3 = 3;
-  repeated int32 foo4 = 4;
-
-  extensions 100 to max;
-}
-
-message ComplexOptionType2 {
-  optional ComplexOptionType1 bar = 1;
-  optional int32 baz = 2;
-
-  message ComplexOptionType4 {
-    optional int32 waldo = 1;
-
-    extend google.protobuf.MessageOptions {
-      optional ComplexOptionType4 complex_opt4 = 7633546;
-    }
-  }
-
-  optional ComplexOptionType4 fred = 3;
-  repeated ComplexOptionType4 barney = 4;
-
-  extensions 100 to max;
-}
-
-message ComplexOptionType3 {
-  optional int32 moo = 1;
-
-  optional group ComplexOptionType5 = 2 {
-    optional int32 plugh = 3;
-  }
-}
-
-extend ComplexOptionType1 {
-  optional int32 mooo = 7663707;
-  optional ComplexOptionType3 corge = 7663442;
-}
-
-extend ComplexOptionType2 {
-  optional int32 grault = 7650927;
-  optional ComplexOptionType1 garply = 7649992;
-}
-
-extend google.protobuf.MessageOptions {
-  optional protobuf_unittest.ComplexOptionType1 complex_opt1 = 7646756;
-  optional ComplexOptionType2 complex_opt2 = 7636949;
-  optional ComplexOptionType3 complex_opt3 = 7636463;
-  optional group ComplexOpt6 = 7595468 {
-    optional int32 xyzzy = 7593951;
-  }
-}
-
-// Note that we try various different ways of naming the same extension.
-message VariousComplexOptions {
-  option (.protobuf_unittest.complex_opt1).foo = 42;
-  option (protobuf_unittest.complex_opt1).(.protobuf_unittest.mooo) = 324;
-  option (.protobuf_unittest.complex_opt1).(protobuf_unittest.corge).moo = 876;
-  option (protobuf_unittest.complex_opt1).foo4 = 99;
-  option (protobuf_unittest.complex_opt1).foo4 = 88;
-  option (complex_opt2).baz = 987;
-  option (complex_opt2).(grault) = 654;
-  option (complex_opt2).bar.foo = 743;
-  option (complex_opt2).bar.(mooo) = 1999;
-  option (complex_opt2).bar.(protobuf_unittest.corge).moo = 2008;
-  option (complex_opt2).(garply).foo = 741;
-  option (complex_opt2).(garply).(.protobuf_unittest.mooo) = 1998;
-  option (complex_opt2).(protobuf_unittest.garply).(corge).moo = 2121;
-  option (ComplexOptionType2.ComplexOptionType4.complex_opt4).waldo = 1971;
-  option (complex_opt2).fred.waldo = 321;
-  option (complex_opt2).barney = {
-    waldo: 101
-  };
-  option (complex_opt2).barney = {
-    waldo: 212
-  };
-  option (protobuf_unittest.complex_opt3).moo = 9;
-  option (complex_opt3).complexoptiontype5.plugh = 22;
-  option (complexopt6).xyzzy = 24;
-}
-
-// ------------------------------------------------------
-// Definitions for testing aggregate option parsing.
-// See descriptor_unittest.cc.
-
-message AggregateMessageSet {
-  option message_set_wire_format = true;
-
-  extensions 4 to max;
-}
-
-message AggregateMessageSetElement {
-  extend AggregateMessageSet {
-    optional AggregateMessageSetElement message_set_extension = 15447542;
-  }
-  optional string s = 1;
-}
-
-// A helper type used to test aggregate option parsing
-message Aggregate {
-  optional int32 i = 1;
-  optional string s = 2;
-
-  // A nested object
-  optional Aggregate sub = 3;
-
-  // To test the parsing of extensions inside aggregate values
-  optional google.protobuf.FileOptions file = 4;
-  extend google.protobuf.FileOptions {
-    optional Aggregate nested = 15476903;
-  }
-
-  // An embedded message set
-  optional AggregateMessageSet mset = 5;
-
-  // An any
-  optional google.protobuf.Any any = 6;
-}
-
-// Allow Aggregate to be used as an option at all possible locations
-// in the .proto grammar.
-extend google.protobuf.FileOptions {
-  optional Aggregate fileopt = 15478479;
-}
-extend google.protobuf.MessageOptions {
-  optional Aggregate msgopt = 15480088;
-}
-extend google.protobuf.FieldOptions {
-  optional Aggregate fieldopt = 15481374;
-}
-extend google.protobuf.EnumOptions {
-  optional Aggregate enumopt = 15483218;
-}
-extend google.protobuf.EnumValueOptions {
-  optional Aggregate enumvalopt = 15486921;
-}
-extend google.protobuf.ServiceOptions {
-  optional Aggregate serviceopt = 15497145;
-}
-extend google.protobuf.MethodOptions {
-  optional Aggregate methodopt = 15512713;
-}
-
-// Try using AggregateOption at different points in the proto grammar
-option (fileopt) = {
-  s: 'FileAnnotation'
-  // Also test the handling of comments
-  /* of both types */
-  i: 100
-
-  sub { s: 'NestedFileAnnotation' }
-
-  // Include a google.protobuf.FileOptions and recursively extend it with
-  // another fileopt.
-  file {
-    [protobuf_unittest.fileopt] { s: 'FileExtensionAnnotation' }
-  }
-
-  // A message set inside an option value
-  mset {
-    [protobuf_unittest.AggregateMessageSetElement.message_set_extension] {
-      s: 'EmbeddedMessageSetElement'
-    }
-  }
-
-  any {
-    [type.googleapis.com/protobuf_unittest.AggregateMessageSetElement] {
-      s: 'EmbeddedMessageSetElement'
-    }
-  }
-};
-
-message AggregateMessage {
-  option (msgopt) = {
-    i: 101
-    s: 'MessageAnnotation'
-  };
-
-  optional int32 fieldname = 1 [(fieldopt) = { s: 'FieldAnnotation' }];
-}
-
-service AggregateService {
-  option (serviceopt) = {
-    s: 'ServiceAnnotation'
-  };
-
-  rpc Method(AggregateMessage) returns (AggregateMessage) {
-    option (methodopt) = {
-      s: 'MethodAnnotation'
-    };
-  }
-}
-
-enum AggregateEnum {
-  option (enumopt) = {
-    s: 'EnumAnnotation'
-  };
-
-  VALUE = 1 [(enumvalopt) = { s: 'EnumValueAnnotation' }];
-}
-
-// Test custom options for nested type.
-message NestedOptionType {
-  message NestedMessage {
-    option (message_opt1) = 1001;
-
-    optional int32 nested_field = 1 [(field_opt1) = 1002];
-  }
-  enum NestedEnum {
-    option (enum_opt1) = 1003;
-
-    NESTED_ENUM_VALUE = 1 [(enum_value_opt1) = 1004];
-  }
-  extend google.protobuf.FileOptions {
-    optional int32 nested_extension = 7912573 [(field_opt2) = 1005];
-  }
-}
-
-// Custom message option that has a required enum field.
-// WARNING: this is strongly discouraged!
-message OldOptionType {
-  enum TestEnum {
-    OLD_VALUE = 0;
-  }
-  required TestEnum value = 1;
-}
-
-// Updated version of the custom option above.
-message NewOptionType {
-  enum TestEnum {
-    OLD_VALUE = 0;
-    NEW_VALUE = 1;
-  }
-  required TestEnum value = 1;
-}
-
-extend google.protobuf.MessageOptions {
-  optional OldOptionType required_enum_opt = 106161807;
-}
-
-// Test message using the "required_enum_opt" option defined above.
-message TestMessageWithRequiredEnumOption {
-  option (required_enum_opt) = {
-    value: OLD_VALUE
-  };
-}
diff --git a/libs/protobuf/src/google/protobuf/unittest_drop_unknown_fields.proto b/libs/protobuf/src/google/protobuf/unittest_drop_unknown_fields.proto
deleted file mode 100644
index a8a98ad..0000000
--- a/libs/protobuf/src/google/protobuf/unittest_drop_unknown_fields.proto
+++ /dev/null
@@ -1,58 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto3";
-
-package unittest_drop_unknown_fields;
-
-option objc_class_prefix = "DropUnknowns";
-option csharp_namespace = "Google.Protobuf.TestProtos";
-
-message Foo {
-  enum NestedEnum {
-    FOO = 0;
-    BAR = 1;
-    BAZ = 2;
-  }
-  int32 int32_value = 1;
-  NestedEnum enum_value = 2;
-}
-
-message FooWithExtraFields {
-  enum NestedEnum {
-    FOO = 0;
-    BAR = 1;
-    BAZ = 2;
-    MOO = 3;
-  }
-  int32 int32_value = 1;
-  NestedEnum enum_value = 2;
-  int32 extra_int32_value = 3;
-}
diff --git a/libs/protobuf/src/google/protobuf/unittest_embed_optimize_for.proto b/libs/protobuf/src/google/protobuf/unittest_embed_optimize_for.proto
deleted file mode 100644
index d8b0f9b..0000000
--- a/libs/protobuf/src/google/protobuf/unittest_embed_optimize_for.proto
+++ /dev/null
@@ -1,51 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-//
-// A proto file which imports a proto file that uses optimize_for = CODE_SIZE.
-
-syntax = "proto2";
-import "google/protobuf/unittest_optimize_for.proto";
-
-package protobuf_unittest;
-
-// We optimize for speed here, but we are importing a proto that is optimized
-// for code size.
-option optimize_for = SPEED;
-
-message TestEmbedOptimizedForSize {
-  // Test that embedding a message which has optimize_for = CODE_SIZE into
-  // one optimized for speed works.
-  optional TestOptimizedForSize optional_message = 1;
-  repeated TestOptimizedForSize repeated_message = 2;
-}
diff --git a/libs/protobuf/src/google/protobuf/unittest_empty.proto b/libs/protobuf/src/google/protobuf/unittest_empty.proto
deleted file mode 100644
index 36443e7..0000000
--- a/libs/protobuf/src/google/protobuf/unittest_empty.proto
+++ /dev/null
@@ -1,38 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-//
-// This file intentionally left blank.  (At one point this wouldn't compile
-// correctly.)
-
-syntax = "proto2";
diff --git a/libs/protobuf/src/google/protobuf/unittest_enormous_descriptor.proto b/libs/protobuf/src/google/protobuf/unittest_enormous_descriptor.proto
deleted file mode 100644
index c700a27..0000000
--- a/libs/protobuf/src/google/protobuf/unittest_enormous_descriptor.proto
+++ /dev/null
@@ -1,1048 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-//
-// A proto file that has an extremely large descriptor.  Used to test that
-// descriptors over 64k don't break language-specific limits in generated code,
-// such as the string literal length limit in Java.
-
-syntax = "proto2";
-
-package protobuf_unittest;
-option java_package = "com.google.protobuf";
-
-// Avoid generating insanely long methods.
-option optimize_for = CODE_SIZE;
-
-message TestEnormousDescriptor {
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_1 = 1 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_2 = 2 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_3 = 3 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_4 = 4 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_5 = 5 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_6 = 6 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_7 = 7 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_8 = 8 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_9 = 9 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_10 = 10 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_11 = 11 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_12 = 12 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_13 = 13 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_14 = 14 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_15 = 15 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_16 = 16 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_17 = 17 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_18 = 18 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_19 = 19 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_20 = 20 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_21 = 21 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_22 = 22 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_23 = 23 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_24 = 24 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_25 = 25 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_26 = 26 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_27 = 27 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_28 = 28 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_29 = 29 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_30 = 30 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_31 = 31 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_32 = 32 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_33 = 33 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_34 = 34 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_35 = 35 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_36 = 36 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_37 = 37 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_38 = 38 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_39 = 39 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_40 = 40 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_41 = 41 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_42 = 42 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_43 = 43 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_44 = 44 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_45 = 45 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_46 = 46 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_47 = 47 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_48 = 48 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_49 = 49 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_50 = 50 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_51 = 51 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_52 = 52 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_53 = 53 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_54 = 54 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_55 = 55 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_56 = 56 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_57 = 57 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_58 = 58 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_59 = 59 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_60 = 60 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_61 = 61 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_62 = 62 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_63 = 63 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_64 = 64 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_65 = 65 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_66 = 66 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_67 = 67 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_68 = 68 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_69 = 69 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_70 = 70 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_71 = 71 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_72 = 72 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_73 = 73 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_74 = 74 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_75 = 75 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_76 = 76 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_77 = 77 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_78 = 78 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_79 = 79 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_80 = 80 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_81 = 81 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_82 = 82 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_83 = 83 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_84 = 84 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_85 = 85 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_86 = 86 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_87 = 87 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_88 = 88 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_89 = 89 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_90 = 90 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_91 = 91 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_92 = 92 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_93 = 93 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_94 = 94 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_95 = 95 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_96 = 96 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_97 = 97 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_98 = 98 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_99 = 99 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_100 = 100 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_101 = 101 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_102 = 102 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_103 = 103 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_104 = 104 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_105 = 105 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_106 = 106 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_107 = 107 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_108 = 108 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_109 = 109 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_110 = 110 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_111 = 111 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_112 = 112 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_113 = 113 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_114 = 114 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_115 = 115 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_116 = 116 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_117 = 117 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_118 = 118 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_119 = 119 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_120 = 120 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_121 = 121 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_122 = 122 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_123 = 123 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_124 = 124 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_125 = 125 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_126 = 126 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_127 = 127 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_128 = 128 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_129 = 129 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_130 = 130 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_131 = 131 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_132 = 132 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_133 = 133 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_134 = 134 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_135 = 135 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_136 = 136 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_137 = 137 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_138 = 138 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_139 = 139 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_140 = 140 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_141 = 141 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_142 = 142 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_143 = 143 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_144 = 144 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_145 = 145 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_146 = 146 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_147 = 147 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_148 = 148 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_149 = 149 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_150 = 150 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_151 = 151 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_152 = 152 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_153 = 153 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_154 = 154 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_155 = 155 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_156 = 156 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_157 = 157 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_158 = 158 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_159 = 159 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_160 = 160 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_161 = 161 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_162 = 162 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_163 = 163 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_164 = 164 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_165 = 165 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_166 = 166 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_167 = 167 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_168 = 168 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_169 = 169 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_170 = 170 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_171 = 171 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_172 = 172 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_173 = 173 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_174 = 174 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_175 = 175 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_176 = 176 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_177 = 177 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_178 = 178 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_179 = 179 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_180 = 180 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_181 = 181 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_182 = 182 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_183 = 183 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_184 = 184 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_185 = 185 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_186 = 186 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_187 = 187 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_188 = 188 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_189 = 189 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_190 = 190 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_191 = 191 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_192 = 192 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_193 = 193 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_194 = 194 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_195 = 195 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_196 = 196 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_197 = 197 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_198 = 198 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_199 = 199 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_200 = 200 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_201 = 201 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_202 = 202 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_203 = 203 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_204 = 204 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_205 = 205 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_206 = 206 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_207 = 207 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_208 = 208 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_209 = 209 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_210 = 210 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_211 = 211 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_212 = 212 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_213 = 213 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_214 = 214 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_215 = 215 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_216 = 216 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_217 = 217 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_218 = 218 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_219 = 219 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_220 = 220 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_221 = 221 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_222 = 222 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_223 = 223 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_224 = 224 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_225 = 225 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_226 = 226 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_227 = 227 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_228 = 228 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_229 = 229 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_230 = 230 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_231 = 231 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_232 = 232 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_233 = 233 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_234 = 234 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_235 = 235 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_236 = 236 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_237 = 237 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_238 = 238 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_239 = 239 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_240 = 240 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_241 = 241 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_242 = 242 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_243 = 243 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_244 = 244 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_245 = 245 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_246 = 246 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_247 = 247 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_248 = 248 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_249 = 249 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_250 = 250 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_251 = 251 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_252 = 252 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_253 = 253 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_254 = 254 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_255 = 255 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_256 = 256 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_257 = 257 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_258 = 258 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_259 = 259 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_260 = 260 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_261 = 261 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_262 = 262 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_263 = 263 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_264 = 264 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_265 = 265 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_266 = 266 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_267 = 267 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_268 = 268 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_269 = 269 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_270 = 270 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_271 = 271 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_272 = 272 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_273 = 273 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_274 = 274 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_275 = 275 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_276 = 276 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_277 = 277 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_278 = 278 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_279 = 279 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_280 = 280 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_281 = 281 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_282 = 282 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_283 = 283 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_284 = 284 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_285 = 285 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_286 = 286 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_287 = 287 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_288 = 288 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_289 = 289 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_290 = 290 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_291 = 291 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_292 = 292 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_293 = 293 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_294 = 294 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_295 = 295 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_296 = 296 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_297 = 297 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_298 = 298 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_299 = 299 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_300 = 300 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_301 = 301 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_302 = 302 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_303 = 303 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_304 = 304 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_305 = 305 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_306 = 306 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_307 = 307 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_308 = 308 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_309 = 309 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_310 = 310 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_311 = 311 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_312 = 312 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_313 = 313 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_314 = 314 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_315 = 315 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_316 = 316 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_317 = 317 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_318 = 318 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_319 = 319 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_320 = 320 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_321 = 321 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_322 = 322 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_323 = 323 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_324 = 324 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_325 = 325 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_326 = 326 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_327 = 327 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_328 = 328 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_329 = 329 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_330 = 330 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_331 = 331 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_332 = 332 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_333 = 333 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_334 = 334 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_335 = 335 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_336 = 336 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_337 = 337 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_338 = 338 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_339 = 339 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_340 = 340 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_341 = 341 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_342 = 342 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_343 = 343 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_344 = 344 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_345 = 345 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_346 = 346 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_347 = 347 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_348 = 348 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_349 = 349 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_350 = 350 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_351 = 351 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_352 = 352 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_353 = 353 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_354 = 354 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_355 = 355 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_356 = 356 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_357 = 357 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_358 = 358 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_359 = 359 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_360 = 360 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_361 = 361 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_362 = 362 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_363 = 363 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_364 = 364 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_365 = 365 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_366 = 366 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_367 = 367 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_368 = 368 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_369 = 369 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_370 = 370 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_371 = 371 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_372 = 372 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_373 = 373 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_374 = 374 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_375 = 375 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_376 = 376 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_377 = 377 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_378 = 378 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_379 = 379 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_380 = 380 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_381 = 381 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_382 = 382 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_383 = 383 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_384 = 384 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_385 = 385 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_386 = 386 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_387 = 387 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_388 = 388 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_389 = 389 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_390 = 390 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_391 = 391 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_392 = 392 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_393 = 393 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_394 = 394 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_395 = 395 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_396 = 396 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_397 = 397 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_398 = 398 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_399 = 399 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_400 = 400 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_401 = 401 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_402 = 402 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_403 = 403 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_404 = 404 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_405 = 405 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_406 = 406 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_407 = 407 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_408 = 408 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_409 = 409 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_410 = 410 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_411 = 411 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_412 = 412 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_413 = 413 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_414 = 414 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_415 = 415 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_416 = 416 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_417 = 417 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_418 = 418 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_419 = 419 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_420 = 420 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_421 = 421 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_422 = 422 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_423 = 423 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_424 = 424 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_425 = 425 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_426 = 426 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_427 = 427 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_428 = 428 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_429 = 429 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_430 = 430 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_431 = 431 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_432 = 432 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_433 = 433 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_434 = 434 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_435 = 435 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_436 = 436 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_437 = 437 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_438 = 438 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_439 = 439 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_440 = 440 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_441 = 441 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_442 = 442 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_443 = 443 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_444 = 444 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_445 = 445 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_446 = 446 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_447 = 447 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_448 = 448 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_449 = 449 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_450 = 450 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_451 = 451 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_452 = 452 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_453 = 453 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_454 = 454 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_455 = 455 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_456 = 456 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_457 = 457 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_458 = 458 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_459 = 459 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_460 = 460 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_461 = 461 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_462 = 462 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_463 = 463 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_464 = 464 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_465 = 465 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_466 = 466 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_467 = 467 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_468 = 468 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_469 = 469 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_470 = 470 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_471 = 471 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_472 = 472 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_473 = 473 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_474 = 474 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_475 = 475 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_476 = 476 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_477 = 477 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_478 = 478 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_479 = 479 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_480 = 480 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_481 = 481 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_482 = 482 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_483 = 483 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_484 = 484 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_485 = 485 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_486 = 486 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_487 = 487 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_488 = 488 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_489 = 489 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_490 = 490 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_491 = 491 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_492 = 492 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_493 = 493 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_494 = 494 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_495 = 495 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_496 = 496 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_497 = 497 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_498 = 498 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_499 = 499 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_500 = 500 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_501 = 501 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_502 = 502 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_503 = 503 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_504 = 504 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_505 = 505 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_506 = 506 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_507 = 507 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_508 = 508 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_509 = 509 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_510 = 510 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_511 = 511 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_512 = 512 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_513 = 513 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_514 = 514 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_515 = 515 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_516 = 516 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_517 = 517 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_518 = 518 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_519 = 519 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_520 = 520 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_521 = 521 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_522 = 522 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_523 = 523 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_524 = 524 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_525 = 525 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_526 = 526 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_527 = 527 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_528 = 528 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_529 = 529 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_530 = 530 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_531 = 531 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_532 = 532 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_533 = 533 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_534 = 534 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_535 = 535 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_536 = 536 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_537 = 537 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_538 = 538 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_539 = 539 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_540 = 540 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_541 = 541 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_542 = 542 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_543 = 543 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_544 = 544 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_545 = 545 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_546 = 546 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_547 = 547 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_548 = 548 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_549 = 549 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_550 = 550 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_551 = 551 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_552 = 552 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_553 = 553 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_554 = 554 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_555 = 555 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_556 = 556 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_557 = 557 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_558 = 558 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_559 = 559 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_560 = 560 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_561 = 561 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_562 = 562 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_563 = 563 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_564 = 564 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_565 = 565 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_566 = 566 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_567 = 567 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_568 = 568 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_569 = 569 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_570 = 570 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_571 = 571 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_572 = 572 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_573 = 573 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_574 = 574 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_575 = 575 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_576 = 576 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_577 = 577 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_578 = 578 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_579 = 579 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_580 = 580 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_581 = 581 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_582 = 582 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_583 = 583 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_584 = 584 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_585 = 585 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_586 = 586 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_587 = 587 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_588 = 588 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_589 = 589 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_590 = 590 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_591 = 591 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_592 = 592 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_593 = 593 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_594 = 594 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_595 = 595 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_596 = 596 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_597 = 597 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_598 = 598 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_599 = 599 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_600 = 600 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_601 = 601 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_602 = 602 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_603 = 603 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_604 = 604 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_605 = 605 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_606 = 606 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_607 = 607 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_608 = 608 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_609 = 609 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_610 = 610 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_611 = 611 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_612 = 612 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_613 = 613 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_614 = 614 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_615 = 615 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_616 = 616 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_617 = 617 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_618 = 618 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_619 = 619 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_620 = 620 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_621 = 621 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_622 = 622 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_623 = 623 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_624 = 624 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_625 = 625 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_626 = 626 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_627 = 627 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_628 = 628 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_629 = 629 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_630 = 630 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_631 = 631 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_632 = 632 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_633 = 633 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_634 = 634 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_635 = 635 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_636 = 636 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_637 = 637 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_638 = 638 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_639 = 639 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_640 = 640 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_641 = 641 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_642 = 642 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_643 = 643 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_644 = 644 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_645 = 645 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_646 = 646 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_647 = 647 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_648 = 648 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_649 = 649 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_650 = 650 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_651 = 651 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_652 = 652 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_653 = 653 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_654 = 654 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_655 = 655 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_656 = 656 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_657 = 657 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_658 = 658 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_659 = 659 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_660 = 660 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_661 = 661 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_662 = 662 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_663 = 663 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_664 = 664 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_665 = 665 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_666 = 666 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_667 = 667 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_668 = 668 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_669 = 669 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_670 = 670 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_671 = 671 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_672 = 672 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_673 = 673 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_674 = 674 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_675 = 675 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_676 = 676 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_677 = 677 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_678 = 678 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_679 = 679 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_680 = 680 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_681 = 681 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_682 = 682 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_683 = 683 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_684 = 684 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_685 = 685 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_686 = 686 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_687 = 687 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_688 = 688 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_689 = 689 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_690 = 690 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_691 = 691 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_692 = 692 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_693 = 693 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_694 = 694 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_695 = 695 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_696 = 696 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_697 = 697 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_698 = 698 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_699 = 699 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_700 = 700 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_701 = 701 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_702 = 702 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_703 = 703 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_704 = 704 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_705 = 705 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_706 = 706 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_707 = 707 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_708 = 708 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_709 = 709 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_710 = 710 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_711 = 711 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_712 = 712 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_713 = 713 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_714 = 714 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_715 = 715 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_716 = 716 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_717 = 717 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_718 = 718 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_719 = 719 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_720 = 720 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_721 = 721 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_722 = 722 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_723 = 723 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_724 = 724 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_725 = 725 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_726 = 726 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_727 = 727 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_728 = 728 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_729 = 729 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_730 = 730 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_731 = 731 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_732 = 732 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_733 = 733 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_734 = 734 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_735 = 735 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_736 = 736 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_737 = 737 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_738 = 738 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_739 = 739 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_740 = 740 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_741 = 741 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_742 = 742 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_743 = 743 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_744 = 744 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_745 = 745 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_746 = 746 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_747 = 747 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_748 = 748 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_749 = 749 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_750 = 750 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_751 = 751 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_752 = 752 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_753 = 753 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_754 = 754 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_755 = 755 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_756 = 756 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_757 = 757 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_758 = 758 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_759 = 759 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_760 = 760 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_761 = 761 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_762 = 762 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_763 = 763 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_764 = 764 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_765 = 765 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_766 = 766 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_767 = 767 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_768 = 768 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_769 = 769 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_770 = 770 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_771 = 771 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_772 = 772 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_773 = 773 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_774 = 774 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_775 = 775 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_776 = 776 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_777 = 777 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_778 = 778 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_779 = 779 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_780 = 780 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_781 = 781 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_782 = 782 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_783 = 783 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_784 = 784 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_785 = 785 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_786 = 786 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_787 = 787 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_788 = 788 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_789 = 789 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_790 = 790 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_791 = 791 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_792 = 792 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_793 = 793 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_794 = 794 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_795 = 795 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_796 = 796 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_797 = 797 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_798 = 798 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_799 = 799 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_800 = 800 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_801 = 801 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_802 = 802 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_803 = 803 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_804 = 804 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_805 = 805 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_806 = 806 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_807 = 807 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_808 = 808 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_809 = 809 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_810 = 810 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_811 = 811 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_812 = 812 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_813 = 813 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_814 = 814 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_815 = 815 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_816 = 816 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_817 = 817 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_818 = 818 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_819 = 819 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_820 = 820 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_821 = 821 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_822 = 822 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_823 = 823 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_824 = 824 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_825 = 825 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_826 = 826 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_827 = 827 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_828 = 828 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_829 = 829 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_830 = 830 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_831 = 831 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_832 = 832 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_833 = 833 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_834 = 834 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_835 = 835 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_836 = 836 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_837 = 837 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_838 = 838 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_839 = 839 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_840 = 840 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_841 = 841 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_842 = 842 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_843 = 843 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_844 = 844 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_845 = 845 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_846 = 846 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_847 = 847 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_848 = 848 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_849 = 849 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_850 = 850 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_851 = 851 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_852 = 852 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_853 = 853 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_854 = 854 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_855 = 855 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_856 = 856 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_857 = 857 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_858 = 858 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_859 = 859 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_860 = 860 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_861 = 861 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_862 = 862 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_863 = 863 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_864 = 864 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_865 = 865 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_866 = 866 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_867 = 867 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_868 = 868 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_869 = 869 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_870 = 870 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_871 = 871 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_872 = 872 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_873 = 873 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_874 = 874 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_875 = 875 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_876 = 876 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_877 = 877 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_878 = 878 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_879 = 879 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_880 = 880 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_881 = 881 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_882 = 882 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_883 = 883 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_884 = 884 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_885 = 885 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_886 = 886 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_887 = 887 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_888 = 888 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_889 = 889 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_890 = 890 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_891 = 891 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_892 = 892 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_893 = 893 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_894 = 894 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_895 = 895 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_896 = 896 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_897 = 897 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_898 = 898 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_899 = 899 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_900 = 900 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_901 = 901 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_902 = 902 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_903 = 903 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_904 = 904 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_905 = 905 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_906 = 906 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_907 = 907 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_908 = 908 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_909 = 909 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_910 = 910 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_911 = 911 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_912 = 912 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_913 = 913 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_914 = 914 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_915 = 915 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_916 = 916 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_917 = 917 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_918 = 918 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_919 = 919 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_920 = 920 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_921 = 921 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_922 = 922 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_923 = 923 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_924 = 924 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_925 = 925 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_926 = 926 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_927 = 927 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_928 = 928 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_929 = 929 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_930 = 930 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_931 = 931 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_932 = 932 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_933 = 933 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_934 = 934 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_935 = 935 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_936 = 936 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_937 = 937 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_938 = 938 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_939 = 939 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_940 = 940 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_941 = 941 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_942 = 942 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_943 = 943 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_944 = 944 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_945 = 945 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_946 = 946 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_947 = 947 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_948 = 948 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_949 = 949 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_950 = 950 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_951 = 951 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_952 = 952 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_953 = 953 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_954 = 954 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_955 = 955 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_956 = 956 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_957 = 957 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_958 = 958 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_959 = 959 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_960 = 960 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_961 = 961 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_962 = 962 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_963 = 963 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_964 = 964 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_965 = 965 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_966 = 966 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_967 = 967 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_968 = 968 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_969 = 969 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_970 = 970 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_971 = 971 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_972 = 972 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_973 = 973 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_974 = 974 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_975 = 975 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_976 = 976 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_977 = 977 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_978 = 978 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_979 = 979 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_980 = 980 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_981 = 981 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_982 = 982 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_983 = 983 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_984 = 984 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_985 = 985 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_986 = 986 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_987 = 987 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_988 = 988 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_989 = 989 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_990 = 990 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_991 = 991 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_992 = 992 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_993 = 993 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_994 = 994 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_995 = 995 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_996 = 996 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_997 = 997 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_998 = 998 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_999 = 999 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-  optional string long_field_name_is_looooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong_1000 = 1000 [default="long default value is also loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"];
-}
diff --git a/libs/protobuf/src/google/protobuf/unittest_import.proto b/libs/protobuf/src/google/protobuf/unittest_import.proto
deleted file mode 100644
index 8d03e38..0000000
--- a/libs/protobuf/src/google/protobuf/unittest_import.proto
+++ /dev/null
@@ -1,73 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-//
-// A proto file which is imported by unittest.proto to test importing.
-
-syntax = "proto2";
-
-// We don't put this in a package within proto2 because we need to make sure
-// that the generated code doesn't depend on being in the proto2 namespace.
-// In test_util.h we do
-// "using namespace unittest_import = protobuf_unittest_import".
-package protobuf_unittest_import;
-
-option optimize_for = SPEED;
-option cc_enable_arenas = true;
-
-// Exercise the java_package option.
-option java_package = "com.google.protobuf.test";
-
-// Do not set a java_outer_classname here to verify that Proto2 works without
-// one.
-
-// Test public import
-import public "google/protobuf/unittest_import_public.proto";
-
-message ImportMessage {
-  optional int32 d = 1;
-}
-
-enum ImportEnum {
-  IMPORT_FOO = 7;
-  IMPORT_BAR = 8;
-  IMPORT_BAZ = 9;
-}
-
-
-// To use an enum in a map, it must has the first value as 0.
-enum ImportEnumForMap {
-  UNKNOWN = 0;
-  FOO = 1;
-  BAR = 2;
-}
diff --git a/libs/protobuf/src/google/protobuf/unittest_import_lite.proto b/libs/protobuf/src/google/protobuf/unittest_import_lite.proto
deleted file mode 100644
index a7afa45..0000000
--- a/libs/protobuf/src/google/protobuf/unittest_import_lite.proto
+++ /dev/null
@@ -1,52 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//
-// This is like unittest_import.proto but with optimize_for = LITE_RUNTIME.
-
-syntax = "proto2";
-package protobuf_unittest_import;
-
-option optimize_for = LITE_RUNTIME;
-
-option java_package = "com.google.protobuf";
-
-import public "google/protobuf/unittest_import_public_lite.proto";
-
-message ImportMessageLite {
-  optional int32 d = 1;
-}
-
-enum ImportEnumLite {
-  IMPORT_LITE_FOO = 7;
-  IMPORT_LITE_BAR = 8;
-  IMPORT_LITE_BAZ = 9;
-}
diff --git a/libs/protobuf/src/google/protobuf/unittest_import_public.proto b/libs/protobuf/src/google/protobuf/unittest_import_public.proto
deleted file mode 100644
index ffaf773..0000000
--- a/libs/protobuf/src/google/protobuf/unittest_import_public.proto
+++ /dev/null
@@ -1,41 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: liujisi@google.com (Pherl Liu)
-
-syntax = "proto2";
-
-package protobuf_unittest_import;
-
-option java_package = "com.google.protobuf.test";
-
-message PublicImportMessage {
-  optional int32 e = 1;
-}
diff --git a/libs/protobuf/src/google/protobuf/unittest_import_public_lite.proto b/libs/protobuf/src/google/protobuf/unittest_import_public_lite.proto
deleted file mode 100644
index 33549c2..0000000
--- a/libs/protobuf/src/google/protobuf/unittest_import_public_lite.proto
+++ /dev/null
@@ -1,43 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: liujisi@google.com (Pherl Liu)
-
-syntax = "proto2";
-
-package protobuf_unittest_import;
-
-option optimize_for = LITE_RUNTIME;
-
-option java_package = "com.google.protobuf";
-
-message PublicImportMessageLite {
-  optional int32 e = 1;
-}
diff --git a/libs/protobuf/src/google/protobuf/unittest_lazy_dependencies.proto b/libs/protobuf/src/google/protobuf/unittest_lazy_dependencies.proto
deleted file mode 100644
index 2f5efd2..0000000
--- a/libs/protobuf/src/google/protobuf/unittest_lazy_dependencies.proto
+++ /dev/null
@@ -1,75 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: trafacz@google.com (Todd Rafacz)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-//
-// A proto file we will use for unit testing.
-
-syntax = "proto2";
-
-import "google/protobuf/unittest_lazy_dependencies_custom_option.proto";
-
-// Some generic_services option(s) added automatically.
-// See:  http://go/proto2-generic-services-default
-option cc_generic_services = true;   // auto-added
-option java_generic_services = true; // auto-added
-option py_generic_services = true;   // auto-added
-option cc_enable_arenas = true;
-
-// We don't put this in a package within proto2 because we need to make sure
-// that the generated code doesn't depend on being in the proto2 namespace.
-// In test_util.h we do "using namespace unittest = protobuf_unittest".
-package protobuf_unittest.lazy_imports;
-
-// Protos optimized for SPEED use a strict superset of the generated code
-// of equivalent ones optimized for CODE_SIZE, so we should optimize all our
-// tests for speed unless explicitly testing code size optimization.
-option optimize_for = SPEED;
-
-option java_outer_classname = "UnittestLazyImportsProto";
-
-// The following are used to test that the proto file
-// with the definition of the following field types is
-// not built when this proto file is built. Then test
-// that calling message_type() etc will build the correct
-// descriptor lazily and return it.
-
-message ImportedMessage {
-  optional LazyMessage lazy_message = 1;
-}
-
-message MessageCustomOption {
-}
-
-message MessageCustomOption2 {
-  option (lazy_enum_option) = LAZY_ENUM_0;
-}
diff --git a/libs/protobuf/src/google/protobuf/unittest_lazy_dependencies_custom_option.proto b/libs/protobuf/src/google/protobuf/unittest_lazy_dependencies_custom_option.proto
deleted file mode 100644
index 2243825..0000000
--- a/libs/protobuf/src/google/protobuf/unittest_lazy_dependencies_custom_option.proto
+++ /dev/null
@@ -1,67 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: trafacz@google.com (Todd Rafacz)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-//
-// A proto file we will use for unit testing.
-
-syntax = "proto2";
-
-import "google/protobuf/unittest_lazy_dependencies_enum.proto";
-import "google/protobuf/descriptor.proto";
-
-// Some generic_services option(s) added automatically.
-// See:  http://go/proto2-generic-services-default
-option cc_generic_services = true;   // auto-added
-option java_generic_services = true; // auto-added
-option py_generic_services = true;   // auto-added
-option cc_enable_arenas = true;
-
-// We don't put this in a package within proto2 because we need to make sure
-// that the generated code doesn't depend on being in the proto2 namespace.
-// In test_util.h we do "using namespace unittest = protobuf_unittest".
-package protobuf_unittest.lazy_imports;
-
-// Protos optimized for SPEED use a strict superset of the generated code
-// of equivalent ones optimized for CODE_SIZE, so we should optimize all our
-// tests for speed unless explicitly testing code size optimization.
-option optimize_for = SPEED;
-
-option java_outer_classname = "UnittestLazyImportsCustomOptionProto";
-
-message LazyMessage {
-  optional int32 a = 1;
-}
-
-extend google.protobuf.MessageOptions {
-  optional LazyEnum lazy_enum_option = 138596335 [default = LAZY_ENUM_1];
-}
diff --git a/libs/protobuf/src/google/protobuf/unittest_lazy_dependencies_enum.proto b/libs/protobuf/src/google/protobuf/unittest_lazy_dependencies_enum.proto
deleted file mode 100644
index 9be64d8..0000000
--- a/libs/protobuf/src/google/protobuf/unittest_lazy_dependencies_enum.proto
+++ /dev/null
@@ -1,61 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: trafacz@google.com (Todd Rafacz)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-//
-// A proto file we will use for unit testing.
-
-syntax = "proto2";
-
-// Some generic_services option(s) added automatically.
-// See:  http://go/proto2-generic-services-default
-option cc_generic_services = true;   // auto-added
-option java_generic_services = true; // auto-added
-option py_generic_services = true;   // auto-added
-option cc_enable_arenas = true;
-
-// We don't put this in a package within proto2 because we need to make sure
-// that the generated code doesn't depend on being in the proto2 namespace.
-// In test_util.h we do "using namespace unittest = protobuf_unittest".
-package protobuf_unittest.lazy_imports;
-
-// Protos optimized for SPEED use a strict superset of the generated code
-// of equivalent ones optimized for CODE_SIZE, so we should optimize all our
-// tests for speed unless explicitly testing code size optimization.
-option optimize_for = SPEED;
-
-option java_outer_classname = "UnittestLazyImportsEnumProto";
-
-enum LazyEnum {
-  LAZY_ENUM_0 = 0;
-  LAZY_ENUM_1 = 1;
-}
diff --git a/libs/protobuf/src/google/protobuf/unittest_lite.proto b/libs/protobuf/src/google/protobuf/unittest_lite.proto
deleted file mode 100644
index 010d4a9..0000000
--- a/libs/protobuf/src/google/protobuf/unittest_lite.proto
+++ /dev/null
@@ -1,520 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//
-// This is like unittest.proto but with optimize_for = LITE_RUNTIME.
-
-syntax = "proto2";
-
-package protobuf_unittest;
-
-import "google/protobuf/unittest_import_lite.proto";
-
-option cc_enable_arenas = true;
-option optimize_for = LITE_RUNTIME;
-option java_package = "com.google.protobuf";
-
-// Same as TestAllTypes but with the lite runtime.
-message TestAllTypesLite {
-  message NestedMessage {
-    optional int32 bb = 1;
-    optional int64 cc = 2;
-  }
-
-  message NestedMessage2 {
-    optional int32 dd = 1;
-  }
-
-  enum NestedEnum {
-    FOO = 1;
-    BAR = 2;
-    BAZ = 3;
-  }
-
-  // Singular
-  optional int32 optional_int32 = 1;
-  optional int64 optional_int64 = 2;
-  optional uint32 optional_uint32 = 3;
-  optional uint64 optional_uint64 = 4;
-  optional sint32 optional_sint32 = 5;
-  optional sint64 optional_sint64 = 6;
-  optional fixed32 optional_fixed32 = 7;
-  optional fixed64 optional_fixed64 = 8;
-  optional sfixed32 optional_sfixed32 = 9;
-  optional sfixed64 optional_sfixed64 = 10;
-  optional float optional_float = 11;
-  optional double optional_double = 12;
-  optional bool optional_bool = 13;
-  optional string optional_string = 14;
-  optional bytes optional_bytes = 15;
-
-  optional group OptionalGroup = 16 {
-    optional int32 a = 17;
-  }
-
-  optional NestedMessage optional_nested_message = 18;
-  optional ForeignMessageLite optional_foreign_message = 19;
-  optional protobuf_unittest_import.ImportMessageLite optional_import_message =
-      20;
-
-  optional NestedEnum optional_nested_enum = 21;
-  optional ForeignEnumLite optional_foreign_enum = 22;
-  optional protobuf_unittest_import.ImportEnumLite optional_import_enum = 23;
-
-  optional string optional_string_piece = 24 [ctype = STRING_PIECE];
-  optional string optional_cord = 25 [ctype = CORD];
-
-  // Defined in unittest_import_public.proto
-  optional protobuf_unittest_import.PublicImportMessageLite
-      optional_public_import_message = 26;
-
-  optional NestedMessage optional_lazy_message = 27 [lazy = true];
-  optional NestedMessage optional_unverified_lazy_message = 28
-      [unverified_lazy = true];
-
-  // Repeated
-  repeated int32 repeated_int32 = 31;
-  repeated int64 repeated_int64 = 32;
-  repeated uint32 repeated_uint32 = 33;
-  repeated uint64 repeated_uint64 = 34;
-  repeated sint32 repeated_sint32 = 35;
-  repeated sint64 repeated_sint64 = 36;
-  repeated fixed32 repeated_fixed32 = 37;
-  repeated fixed64 repeated_fixed64 = 38;
-  repeated sfixed32 repeated_sfixed32 = 39;
-  repeated sfixed64 repeated_sfixed64 = 40;
-  repeated float repeated_float = 41;
-  repeated double repeated_double = 42;
-  repeated bool repeated_bool = 43;
-  repeated string repeated_string = 44;
-  repeated bytes repeated_bytes = 45;
-
-  repeated group RepeatedGroup = 46 {
-    optional int32 a = 47;
-  }
-
-  repeated NestedMessage repeated_nested_message = 48;
-  repeated ForeignMessageLite repeated_foreign_message = 49;
-  repeated protobuf_unittest_import.ImportMessageLite repeated_import_message =
-      50;
-
-  repeated NestedEnum repeated_nested_enum = 51;
-  repeated ForeignEnumLite repeated_foreign_enum = 52;
-  repeated protobuf_unittest_import.ImportEnumLite repeated_import_enum = 53;
-
-  repeated string repeated_string_piece = 54 [ctype = STRING_PIECE];
-  repeated string repeated_cord = 55 [ctype = CORD];
-
-  repeated NestedMessage repeated_lazy_message = 57 [lazy = true];
-
-  // Singular with defaults
-  optional int32 default_int32 = 61 [default = 41];
-  optional int64 default_int64 = 62 [default = 42];
-  optional uint32 default_uint32 = 63 [default = 43];
-  optional uint64 default_uint64 = 64 [default = 44];
-  optional sint32 default_sint32 = 65 [default = -45];
-  optional sint64 default_sint64 = 66 [default = 46];
-  optional fixed32 default_fixed32 = 67 [default = 47];
-  optional fixed64 default_fixed64 = 68 [default = 48];
-  optional sfixed32 default_sfixed32 = 69 [default = 49];
-  optional sfixed64 default_sfixed64 = 70 [default = -50];
-  optional float default_float = 71 [default = 51.5];
-  optional double default_double = 72 [default = 52e3];
-  optional bool default_bool = 73 [default = true];
-  optional string default_string = 74 [default = "hello"];
-  optional bytes default_bytes = 75 [default = "world"];
-
-  optional NestedEnum default_nested_enum = 81 [default = BAR];
-  optional ForeignEnumLite default_foreign_enum = 82
-      [default = FOREIGN_LITE_BAR];
-  optional protobuf_unittest_import.ImportEnumLite default_import_enum = 83
-      [default = IMPORT_LITE_BAR];
-
-  optional string default_string_piece = 84
-      [ctype = STRING_PIECE, default = "abc"];
-  optional string default_cord = 85 [ctype = CORD, default = "123"];
-
-  // For oneof test
-  oneof oneof_field {
-    uint32 oneof_uint32 = 111;
-    NestedMessage oneof_nested_message = 112;
-    string oneof_string = 113;
-    bytes oneof_bytes = 114;
-    NestedMessage oneof_lazy_nested_message = 115 [lazy = true];
-    NestedMessage2 oneof_nested_message2 = 117;
-  }
-
-  // Tests toString for non-repeated fields with a list suffix
-  optional int32 deceptively_named_list = 116;
-}
-
-message ForeignMessageLite {
-  optional int32 c = 1;
-}
-
-enum ForeignEnumLite {
-  FOREIGN_LITE_FOO = 4;
-  FOREIGN_LITE_BAZ = 6;
-  FOREIGN_LITE_BAR = 5;
-}
-
-message TestPackedTypesLite {
-  repeated int32 packed_int32 = 90 [packed = true];
-  repeated int64 packed_int64 = 91 [packed = true];
-  repeated uint32 packed_uint32 = 92 [packed = true];
-  repeated uint64 packed_uint64 = 93 [packed = true];
-  repeated sint32 packed_sint32 = 94 [packed = true];
-  repeated sint64 packed_sint64 = 95 [packed = true];
-  repeated fixed32 packed_fixed32 = 96 [packed = true];
-  repeated fixed64 packed_fixed64 = 97 [packed = true];
-  repeated sfixed32 packed_sfixed32 = 98 [packed = true];
-  repeated sfixed64 packed_sfixed64 = 99 [packed = true];
-  repeated float packed_float = 100 [packed = true];
-  repeated double packed_double = 101 [packed = true];
-  repeated bool packed_bool = 102 [packed = true];
-  repeated ForeignEnumLite packed_enum = 103 [packed = true];
-}
-
-message TestAllExtensionsLite {
-  extensions 1 to max;
-}
-
-extend TestAllExtensionsLite {
-  // Singular
-  optional int32 optional_int32_extension_lite = 1;
-  optional int64 optional_int64_extension_lite = 2;
-  optional uint32 optional_uint32_extension_lite = 3;
-  optional uint64 optional_uint64_extension_lite = 4;
-  optional sint32 optional_sint32_extension_lite = 5;
-  optional sint64 optional_sint64_extension_lite = 6;
-  optional fixed32 optional_fixed32_extension_lite = 7;
-  optional fixed64 optional_fixed64_extension_lite = 8;
-  optional sfixed32 optional_sfixed32_extension_lite = 9;
-  optional sfixed64 optional_sfixed64_extension_lite = 10;
-  optional float optional_float_extension_lite = 11;
-  optional double optional_double_extension_lite = 12;
-  optional bool optional_bool_extension_lite = 13;
-  optional string optional_string_extension_lite = 14;
-  optional bytes optional_bytes_extension_lite = 15;
-
-  optional group OptionalGroup_extension_lite = 16 {
-    optional int32 a = 17;
-  }
-
-  optional TestAllTypesLite.NestedMessage
-      optional_nested_message_extension_lite = 18;
-  optional ForeignMessageLite optional_foreign_message_extension_lite = 19;
-  optional protobuf_unittest_import.ImportMessageLite
-      optional_import_message_extension_lite = 20;
-
-  optional TestAllTypesLite.NestedEnum optional_nested_enum_extension_lite = 21;
-  optional ForeignEnumLite optional_foreign_enum_extension_lite = 22;
-  optional protobuf_unittest_import.ImportEnumLite
-      optional_import_enum_extension_lite = 23;
-
-  optional string optional_string_piece_extension_lite = 24
-      [ctype = STRING_PIECE];
-  optional string optional_cord_extension_lite = 25 [ctype = CORD];
-
-  optional protobuf_unittest_import.PublicImportMessageLite
-      optional_public_import_message_extension_lite = 26;
-
-  optional TestAllTypesLite.NestedMessage optional_lazy_message_extension_lite =
-      27 [lazy = true];
-  optional TestAllTypesLite.NestedMessage
-      optional_unverified_lazy_message_extension_lite = 28
-      [unverified_lazy = true];
-
-  // Repeated
-  repeated int32 repeated_int32_extension_lite = 31;
-  repeated int64 repeated_int64_extension_lite = 32;
-  repeated uint32 repeated_uint32_extension_lite = 33;
-  repeated uint64 repeated_uint64_extension_lite = 34;
-  repeated sint32 repeated_sint32_extension_lite = 35;
-  repeated sint64 repeated_sint64_extension_lite = 36;
-  repeated fixed32 repeated_fixed32_extension_lite = 37;
-  repeated fixed64 repeated_fixed64_extension_lite = 38;
-  repeated sfixed32 repeated_sfixed32_extension_lite = 39;
-  repeated sfixed64 repeated_sfixed64_extension_lite = 40;
-  repeated float repeated_float_extension_lite = 41;
-  repeated double repeated_double_extension_lite = 42;
-  repeated bool repeated_bool_extension_lite = 43;
-  repeated string repeated_string_extension_lite = 44;
-  repeated bytes repeated_bytes_extension_lite = 45;
-
-  repeated group RepeatedGroup_extension_lite = 46 {
-    optional int32 a = 47;
-  }
-
-  repeated TestAllTypesLite.NestedMessage
-      repeated_nested_message_extension_lite = 48;
-  repeated ForeignMessageLite repeated_foreign_message_extension_lite = 49;
-  repeated protobuf_unittest_import.ImportMessageLite
-      repeated_import_message_extension_lite = 50;
-
-  repeated TestAllTypesLite.NestedEnum repeated_nested_enum_extension_lite = 51;
-  repeated ForeignEnumLite repeated_foreign_enum_extension_lite = 52;
-  repeated protobuf_unittest_import.ImportEnumLite
-      repeated_import_enum_extension_lite = 53;
-
-  repeated string repeated_string_piece_extension_lite = 54
-      [ctype = STRING_PIECE];
-  repeated string repeated_cord_extension_lite = 55 [ctype = CORD];
-
-  repeated TestAllTypesLite.NestedMessage repeated_lazy_message_extension_lite =
-      57 [lazy = true];
-
-  // Singular with defaults
-  optional int32 default_int32_extension_lite = 61 [default = 41];
-  optional int64 default_int64_extension_lite = 62 [default = 42];
-  optional uint32 default_uint32_extension_lite = 63 [default = 43];
-  optional uint64 default_uint64_extension_lite = 64 [default = 44];
-  optional sint32 default_sint32_extension_lite = 65 [default = -45];
-  optional sint64 default_sint64_extension_lite = 66 [default = 46];
-  optional fixed32 default_fixed32_extension_lite = 67 [default = 47];
-  optional fixed64 default_fixed64_extension_lite = 68 [default = 48];
-  optional sfixed32 default_sfixed32_extension_lite = 69 [default = 49];
-  optional sfixed64 default_sfixed64_extension_lite = 70 [default = -50];
-  optional float default_float_extension_lite = 71 [default = 51.5];
-  optional double default_double_extension_lite = 72 [default = 52e3];
-  optional bool default_bool_extension_lite = 73 [default = true];
-  optional string default_string_extension_lite = 74 [default = "hello"];
-  optional bytes default_bytes_extension_lite = 75 [default = "world"];
-
-  optional TestAllTypesLite.NestedEnum default_nested_enum_extension_lite = 81
-      [default = BAR];
-  optional ForeignEnumLite default_foreign_enum_extension_lite = 82
-      [default = FOREIGN_LITE_BAR];
-  optional protobuf_unittest_import.ImportEnumLite
-      default_import_enum_extension_lite = 83 [default = IMPORT_LITE_BAR];
-
-  optional string default_string_piece_extension_lite = 84
-      [ctype = STRING_PIECE, default = "abc"];
-  optional string default_cord_extension_lite = 85
-      [ctype = CORD, default = "123"];
-
-  // For oneof test
-  optional uint32 oneof_uint32_extension_lite = 111;
-  optional TestAllTypesLite.NestedMessage oneof_nested_message_extension_lite =
-      112;
-  optional string oneof_string_extension_lite = 113;
-  optional bytes oneof_bytes_extension_lite = 114;
-}
-
-message TestPackedExtensionsLite {
-  extensions 1 to max;
-}
-
-extend TestPackedExtensionsLite {
-  repeated int32 packed_int32_extension_lite = 90 [packed = true];
-  repeated int64 packed_int64_extension_lite = 91 [packed = true];
-  repeated uint32 packed_uint32_extension_lite = 92 [packed = true];
-  repeated uint64 packed_uint64_extension_lite = 93 [packed = true];
-  repeated sint32 packed_sint32_extension_lite = 94 [packed = true];
-  repeated sint64 packed_sint64_extension_lite = 95 [packed = true];
-  repeated fixed32 packed_fixed32_extension_lite = 96 [packed = true];
-  repeated fixed64 packed_fixed64_extension_lite = 97 [packed = true];
-  repeated sfixed32 packed_sfixed32_extension_lite = 98 [packed = true];
-  repeated sfixed64 packed_sfixed64_extension_lite = 99 [packed = true];
-  repeated float packed_float_extension_lite = 100 [packed = true];
-  repeated double packed_double_extension_lite = 101 [packed = true];
-  repeated bool packed_bool_extension_lite = 102 [packed = true];
-  repeated ForeignEnumLite packed_enum_extension_lite = 103 [packed = true];
-}
-
-message TestNestedExtensionLite {
-  extend TestAllExtensionsLite {
-    optional int32 nested_extension = 12345;
-  }
-}
-
-// Test that deprecated fields work.  We only verify that they compile (at one
-// point this failed).
-message TestDeprecatedLite {
-  optional int32 deprecated_field = 1 [deprecated = true];
-  required int32 deprecated_field2 = 2 [deprecated = true];
-  optional string deprecated_field3 = 3 [deprecated = true];
-  optional TestDeprecatedLite deprecated_field4 = 4 [deprecated = true];
-}
-
-// See the comments of the same type in unittest.proto.
-message TestParsingMergeLite {
-  message RepeatedFieldsGenerator {
-    repeated TestAllTypesLite field1 = 1;
-    repeated TestAllTypesLite field2 = 2;
-    repeated TestAllTypesLite field3 = 3;
-    repeated group Group1 = 10 {
-      optional TestAllTypesLite field1 = 11;
-    }
-    repeated group Group2 = 20 {
-      optional TestAllTypesLite field1 = 21;
-    }
-    repeated TestAllTypesLite ext1 = 1000;
-    repeated TestAllTypesLite ext2 = 1001;
-  }
-  required TestAllTypesLite required_all_types = 1;
-  optional TestAllTypesLite optional_all_types = 2;
-  repeated TestAllTypesLite repeated_all_types = 3;
-  optional group OptionalGroup = 10 {
-    optional TestAllTypesLite optional_group_all_types = 11;
-  }
-  repeated group RepeatedGroup = 20 {
-    optional TestAllTypesLite repeated_group_all_types = 21;
-  }
-  extensions 1000 to max;
-  extend TestParsingMergeLite {
-    optional TestAllTypesLite optional_ext = 1000;
-    repeated TestAllTypesLite repeated_ext = 1001;
-  }
-}
-
-// Test that the correct exception is thrown by parseFrom in a corner case
-// involving merging, extensions, and required fields.
-message TestMergeExceptionLite {
-  optional TestAllExtensionsLite all_extensions = 1;
-}
-
-// TestEmptyMessageLite is used to test unknown fields support in lite mode.
-message TestEmptyMessageLite {}
-
-// Like above, but declare all field numbers as potential extensions.  No
-// actual extensions should ever be defined for this type.
-message TestEmptyMessageWithExtensionsLite {
-  extensions 1 to max;
-}
-
-enum V1EnumLite {
-  V1_FIRST = 1;
-}
-
-enum V2EnumLite {
-  V2_FIRST = 1;
-  V2_SECOND = 2;
-}
-
-message V1MessageLite {
-  required int32 int_field = 1;
-  optional V1EnumLite enum_field = 2 [default = V1_FIRST];
-}
-
-message V2MessageLite {
-  required int32 int_field = 1;
-  optional V2EnumLite enum_field = 2 [default = V2_FIRST];
-}
-
-message TestHugeFieldNumbersLite {
-  optional int32 optional_int32 = 536870000;
-  optional int32 fixed_32 = 536870001;
-  repeated int32 repeated_int32 = 536870002 [packed = false];
-  repeated int32 packed_int32 = 536870003 [packed = true];
-
-  optional ForeignEnumLite optional_enum = 536870004;
-  optional string optional_string = 536870005;
-  optional bytes optional_bytes = 536870006;
-  optional ForeignMessageLite optional_message = 536870007;
-
-  optional group OptionalGroup = 536870008 {
-    optional int32 group_a = 536870009;
-  }
-
-  map<string, string> string_string_map = 536870010;
-
-  oneof oneof_field {
-    uint32 oneof_uint32 = 536870011;
-    TestAllTypesLite oneof_test_all_types = 536870012;
-    string oneof_string = 536870013;
-    bytes oneof_bytes = 536870014;
-  }
-
-  extensions 536860000 to 536869999;
-}
-
-extend TestHugeFieldNumbersLite {
-  optional TestAllTypesLite test_all_types_lite = 536860000;
-}
-
-message TestOneofParsingLite {
-  oneof oneof_field {
-    int32 oneof_int32 = 1;
-    TestAllTypesLite oneof_submessage = 2;
-    string oneof_string = 3;
-    bytes oneof_bytes = 4 [default = "default bytes"];
-    string oneof_string_cord = 5 [ctype = CORD, default = "default Cord"];
-    bytes oneof_bytes_cord = 6 [ctype = CORD];
-    string oneof_string_string_piece = 7 [ctype = STRING_PIECE];
-    bytes oneof_bytes_string_piece = 8
-        [ctype = STRING_PIECE, default = "default StringPiece"];
-    V2EnumLite oneof_enum = 9;
-  }
-}
-
-message TestMessageSetLite {
-  option message_set_wire_format = true;
-
-  extensions 100 to max;
-}
-
-// The following four messages are set up to test for wire compatibility between
-// packed and non-packed repeated fields. We use the field number 2048, because
-// that is large enough to require a 3-byte varint for the tag.
-message PackedInt32 {
-  repeated int32 repeated_int32 = 2048 [packed = true];
-}
-
-message NonPackedInt32 {
-  repeated int32 repeated_int32 = 2048;
-}
-
-message PackedFixed32 {
-  repeated fixed32 repeated_fixed32 = 2048 [packed = true];
-}
-
-message NonPackedFixed32 {
-  repeated fixed32 repeated_fixed32 = 2048;
-}
-
-// Test an enum that has multiple values with the same number.
-message DupEnum {
-  enum TestEnumWithDupValueLite {
-    option allow_alias = true;
-
-    FOO1 = 1;
-    BAR1 = 2;
-    BAZ = 3;
-    FOO2 = 1;
-    BAR2 = 2;
-  }
-}
-
-message RecursiveMessage {
-  optional RecursiveMessage recurse = 1;
-  optional bytes payload = 2;
-}
diff --git a/libs/protobuf/src/google/protobuf/unittest_lite_imports_nonlite.proto b/libs/protobuf/src/google/protobuf/unittest_lite_imports_nonlite.proto
deleted file mode 100644
index 8a47016..0000000
--- a/libs/protobuf/src/google/protobuf/unittest_lite_imports_nonlite.proto
+++ /dev/null
@@ -1,47 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//
-// Tests that a "lite" message can import a regular message.
-
-syntax = "proto2";
-package protobuf_unittest;
-
-import "google/protobuf/unittest.proto";
-
-option optimize_for = LITE_RUNTIME;
-
-message TestLiteImportsNonlite {
-  optional TestAllTypes message = 1;
-
-  // Verifies that transitive required fields generates valid code.
-  optional TestRequired message_with_required = 2;
-}
diff --git a/libs/protobuf/src/google/protobuf/unittest_mset.proto b/libs/protobuf/src/google/protobuf/unittest_mset.proto
deleted file mode 100644
index 3294994..0000000
--- a/libs/protobuf/src/google/protobuf/unittest_mset.proto
+++ /dev/null
@@ -1,101 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-//
-// This file is similar to unittest_mset_wire_format.proto, but does not
-// have a TestMessageSet, so it can be downgraded to proto1.
-
-syntax = "proto2";
-
-import "google/protobuf/unittest_mset_wire_format.proto";
-
-package protobuf_unittest;
-
-option cc_enable_arenas = true;
-option optimize_for = SPEED;
-
-message TestMessageSetContainer {
-  optional proto2_wireformat_unittest.TestMessageSet message_set = 1;
-}
-
-message NestedTestMessageSetContainer {
-  optional TestMessageSetContainer container = 1;
-  optional NestedTestMessageSetContainer child = 2;
-}
-
-message TestMessageSetExtension1 {
-  extend proto2_wireformat_unittest.TestMessageSet {
-    optional TestMessageSetExtension1 message_set_extension = 1545008;
-  }
-  optional int32 i = 15;
-  optional proto2_wireformat_unittest.TestMessageSet recursive = 16;
-  optional string test_aliasing = 17 [ctype = STRING_PIECE];
-}
-
-message TestMessageSetExtension2 {
-  extend proto2_wireformat_unittest.TestMessageSet {
-    optional TestMessageSetExtension2 message_set_extension = 1547769;
-  }
-  optional string str = 25;
-}
-
-message NestedTestInt {
-  optional fixed32 a = 1;
-  optional NestedTestInt child = 2;
-}
-
-message TestMessageSetExtension3 {
-  extend proto2_wireformat_unittest.TestMessageSet {
-    optional TestMessageSetExtension3 message_set_extension = 195273129;
-  }
-  optional NestedTestInt msg = 35;
-}
-
-// This message was used to generate
-// //net/proto2/python/internal/testdata/message_set_message, but is commented
-// out since it must not actually exist in code, to simulate an "unknown"
-// extension.
-// message TestMessageSetUnknownExtension {
-//   extend TestMessageSet {
-//     optional TestMessageSetUnknownExtension message_set_extension = 56141421;
-//   }
-//   optional int64 a = 1;
-// }
-
-// MessageSet wire format is equivalent to this.
-message RawMessageSet {
-  repeated group Item = 1 {
-    required int32 type_id = 2;
-    required bytes message = 3;
-  }
-}
diff --git a/libs/protobuf/src/google/protobuf/unittest_mset_wire_format.proto b/libs/protobuf/src/google/protobuf/unittest_mset_wire_format.proto
deleted file mode 100644
index 04e4352..0000000
--- a/libs/protobuf/src/google/protobuf/unittest_mset_wire_format.proto
+++ /dev/null
@@ -1,52 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-//
-// This file contains messages for testing message_set_wire_format.
-
-syntax = "proto2";
-package proto2_wireformat_unittest;
-
-option cc_enable_arenas = true;
-option optimize_for = SPEED;
-option csharp_namespace = "Google.ProtocolBuffers.TestProtos";
-
-// A message with message_set_wire_format.
-message TestMessageSet {
-  option message_set_wire_format = true;
-  extensions 4 to max;
-}
-
-message TestMessageSetWireFormatContainer {
-  optional TestMessageSet message_set = 1;
-}
diff --git a/libs/protobuf/src/google/protobuf/unittest_no_field_presence.proto b/libs/protobuf/src/google/protobuf/unittest_no_field_presence.proto
deleted file mode 100644
index 994afff..0000000
--- a/libs/protobuf/src/google/protobuf/unittest_no_field_presence.proto
+++ /dev/null
@@ -1,138 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// A proto file used to test a message type with no explicit field presence.
-
-syntax = "proto3";
-
-// We want to test embedded proto2 messages, so include some proto2 types.
-import "google/protobuf/unittest.proto";
-
-package proto2_nofieldpresence_unittest;
-
-// This proto includes every type of field in both singular and repeated
-// forms.
-message TestAllTypes {
-  message NestedMessage {
-    int32 bb = 1;
-  }
-
-  enum NestedEnum {
-    FOO = 0;
-    BAR = 1;
-    BAZ = 2;
-  }
-
-  // Singular
-  // TODO: remove 'optional' labels as soon as CL 69188077 is LGTM'd to make
-  // 'optional' optional.
-     int32 optional_int32    =  1;
-     int64 optional_int64    =  2;
-    uint32 optional_uint32   =  3;
-    uint64 optional_uint64   =  4;
-    sint32 optional_sint32   =  5;
-    sint64 optional_sint64   =  6;
-   fixed32 optional_fixed32  =  7;
-   fixed64 optional_fixed64  =  8;
-  sfixed32 optional_sfixed32 =  9;
-  sfixed64 optional_sfixed64 = 10;
-     float optional_float    = 11;
-    double optional_double   = 12;
-      bool optional_bool     = 13;
-    string optional_string   = 14;
-     bytes optional_bytes    = 15;
-
-  NestedMessage                        optional_nested_message  = 18;
-  ForeignMessage                       optional_foreign_message = 19;
-  protobuf_unittest.TestAllTypes         optional_proto2_message = 20;
-
-  NestedEnum                           optional_nested_enum     = 21;
-  ForeignEnum                          optional_foreign_enum    = 22;
-  // N.B.: proto2-enum-type fields not allowed, because their default values
-  // might not be zero.
-  //optional protobuf_unittest.ForeignEnum          optional_proto2_enum     = 23;
-
-  string optional_string_piece = 24 [ctype=STRING_PIECE];
-  string optional_cord = 25 [ctype=CORD];
-
-  NestedMessage optional_lazy_message = 30 [lazy=true];
-
-  // Repeated
-  repeated    int32 repeated_int32    = 31;
-  repeated    int64 repeated_int64    = 32;
-  repeated   uint32 repeated_uint32   = 33;
-  repeated   uint64 repeated_uint64   = 34;
-  repeated   sint32 repeated_sint32   = 35;
-  repeated   sint64 repeated_sint64   = 36;
-  repeated  fixed32 repeated_fixed32  = 37;
-  repeated  fixed64 repeated_fixed64  = 38;
-  repeated sfixed32 repeated_sfixed32 = 39;
-  repeated sfixed64 repeated_sfixed64 = 40;
-  repeated    float repeated_float    = 41;
-  repeated   double repeated_double   = 42;
-  repeated     bool repeated_bool     = 43;
-  repeated   string repeated_string   = 44;
-  repeated    bytes repeated_bytes    = 45;
-
-  repeated NestedMessage                        repeated_nested_message  = 48;
-  repeated ForeignMessage                       repeated_foreign_message = 49;
-  repeated protobuf_unittest.TestAllTypes         repeated_proto2_message  = 50;
-
-  repeated NestedEnum                           repeated_nested_enum     = 51;
-  repeated ForeignEnum                          repeated_foreign_enum    = 52;
-
-  repeated string repeated_string_piece = 54 [ctype=STRING_PIECE];
-  repeated string repeated_cord = 55 [ctype=CORD];
-
-  repeated NestedMessage repeated_lazy_message = 57 [lazy=true];
-
-  oneof oneof_field {
-    uint32 oneof_uint32 = 111;
-    NestedMessage oneof_nested_message = 112;
-    string oneof_string = 113;
-    NestedEnum oneof_enum = 114;
-  }
-}
-
-message TestProto2Required {
-  protobuf_unittest.TestRequired proto2 = 1;
-}
-
-// Define these after TestAllTypes to make sure the compiler can handle
-// that.
-message ForeignMessage {
-  int32 c = 1;
-}
-
-enum ForeignEnum {
-  FOREIGN_FOO = 0;
-  FOREIGN_BAR = 1;
-  FOREIGN_BAZ = 2;
-}
diff --git a/libs/protobuf/src/google/protobuf/unittest_no_generic_services.proto b/libs/protobuf/src/google/protobuf/unittest_no_generic_services.proto
deleted file mode 100644
index 57a0d16..0000000
--- a/libs/protobuf/src/google/protobuf/unittest_no_generic_services.proto
+++ /dev/null
@@ -1,53 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-
-syntax = "proto2";
-
-package protobuf_unittest.no_generic_services_test;
-
-
-// *_generic_services are false by default.
-
-message TestMessage {
-  optional int32 a = 1;
-  extensions 1000 to max;
-}
-
-enum TestEnum { FOO = 1; }
-
-extend TestMessage {
-  optional int32 test_extension = 1000;
-}
-
-service TestService {
-  rpc Foo(TestMessage) returns (TestMessage);
-}
diff --git a/libs/protobuf/src/google/protobuf/unittest_optimize_for.proto b/libs/protobuf/src/google/protobuf/unittest_optimize_for.proto
deleted file mode 100644
index ee9cc7b..0000000
--- a/libs/protobuf/src/google/protobuf/unittest_optimize_for.proto
+++ /dev/null
@@ -1,67 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-//
-// A proto file which uses optimize_for = CODE_SIZE.
-
-syntax = "proto2";
-import "google/protobuf/unittest.proto";
-
-package protobuf_unittest;
-
-option optimize_for = CODE_SIZE;
-
-message TestOptimizedForSize {
-  optional int32 i = 1;
-  optional ForeignMessage msg = 19;
-
-  extensions 1000 to max;
-
-  extend TestOptimizedForSize {
-    optional int32 test_extension = 1234;
-    optional TestRequiredOptimizedForSize test_extension2 = 1235;
-  }
-
-  oneof foo {
-    int32 integer_field = 2;
-    string string_field = 3;
-  }
-}
-
-message TestRequiredOptimizedForSize {
-  required int32 x = 1;
-}
-
-message TestOptionalOptimizedForSize {
-  optional TestRequiredOptimizedForSize o = 1;
-}
diff --git a/libs/protobuf/src/google/protobuf/unittest_preserve_unknown_enum.proto b/libs/protobuf/src/google/protobuf/unittest_preserve_unknown_enum.proto
deleted file mode 100644
index 2f91332..0000000
--- a/libs/protobuf/src/google/protobuf/unittest_preserve_unknown_enum.proto
+++ /dev/null
@@ -1,71 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto3";
-
-package proto3_preserve_unknown_enum_unittest;
-option objc_class_prefix = "UnknownEnums";
-
-option csharp_namespace = "Google.Protobuf.TestProtos";
-
-enum MyEnum {
-  FOO = 0;
-  BAR = 1;
-  BAZ = 2;
-}
-
-enum MyEnumPlusExtra {
-  E_FOO = 0;
-  E_BAR = 1;
-  E_BAZ = 2;
-  E_EXTRA = 3;
-}
-
-message MyMessage {
-  MyEnum e = 1;
-  repeated MyEnum repeated_e = 2;
-  repeated MyEnum repeated_packed_e = 3 [packed=true];
-  repeated MyEnumPlusExtra repeated_packed_unexpected_e = 4;  // not packed
-  oneof o {
-    MyEnum oneof_e_1 = 5;
-    MyEnum oneof_e_2 = 6;
-  }
-}
-
-message MyMessagePlusExtra {
-  MyEnumPlusExtra e = 1;
-  repeated MyEnumPlusExtra repeated_e = 2;
-  repeated MyEnumPlusExtra repeated_packed_e = 3 [packed=true];
-  repeated MyEnumPlusExtra repeated_packed_unexpected_e = 4 [packed=true];
-  oneof o {
-    MyEnumPlusExtra oneof_e_1 = 5;
-    MyEnumPlusExtra oneof_e_2 = 6;
-  }
-}
diff --git a/libs/protobuf/src/google/protobuf/unittest_preserve_unknown_enum2.proto b/libs/protobuf/src/google/protobuf/unittest_preserve_unknown_enum2.proto
deleted file mode 100644
index adf4296..0000000
--- a/libs/protobuf/src/google/protobuf/unittest_preserve_unknown_enum2.proto
+++ /dev/null
@@ -1,50 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto2";
-
-package proto2_preserve_unknown_enum_unittest;
-
-enum MyEnum {
-  FOO = 0;
-  BAR = 1;
-  BAZ = 2;
-}
-
-message MyMessage {
-  optional MyEnum e = 1;
-  repeated MyEnum repeated_e = 2;
-  repeated MyEnum repeated_packed_e = 3 [packed=true];
-  repeated MyEnum repeated_packed_unexpected_e = 4;  // not packed
-  oneof o {
-    MyEnum oneof_e_1 = 5;
-    MyEnum oneof_e_2 = 6;
-  }
-}
diff --git a/libs/protobuf/src/google/protobuf/unittest_proto3.proto b/libs/protobuf/src/google/protobuf/unittest_proto3.proto
deleted file mode 100644
index 910f401..0000000
--- a/libs/protobuf/src/google/protobuf/unittest_proto3.proto
+++ /dev/null
@@ -1,229 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto3";
-
-package proto3_unittest;
-
-import "google/protobuf/unittest_import.proto";
-
-option optimize_for = SPEED;
-
-// This proto includes every type of field in both singular and repeated
-// forms.
-message TestAllTypes {
-  message NestedMessage {
-    // The field name "b" fails to compile in proto1 because it conflicts with
-    // a local variable named "b" in one of the generated methods.  Doh.
-    // This file needs to compile in proto1 to test backwards-compatibility.
-    int32 bb = 1;
-  }
-
-  enum NestedEnum {
-    ZERO = 0;
-    FOO = 1;
-    BAR = 2;
-    BAZ = 3;
-    NEG = -1;  // Intentionally negative.
-  }
-
-  // Singular
-  int32 optional_int32 = 1;
-  int64 optional_int64 = 2;
-  uint32 optional_uint32 = 3;
-  uint64 optional_uint64 = 4;
-  sint32 optional_sint32 = 5;
-  sint64 optional_sint64 = 6;
-  fixed32 optional_fixed32 = 7;
-  fixed64 optional_fixed64 = 8;
-  sfixed32 optional_sfixed32 = 9;
-  sfixed64 optional_sfixed64 = 10;
-  float optional_float = 11;
-  double optional_double = 12;
-  bool optional_bool = 13;
-  string optional_string = 14;
-  bytes optional_bytes = 15;
-
-  // Groups are not allowed in proto3.
-  // optional group OptionalGroup = 16 {
-  //   optional int32 a = 17;
-  // }
-
-  optional NestedMessage optional_nested_message = 18;
-  ForeignMessage optional_foreign_message = 19;
-  protobuf_unittest_import.ImportMessage optional_import_message = 20;
-
-  NestedEnum optional_nested_enum = 21;
-  ForeignEnum optional_foreign_enum = 22;
-
-  // Omitted (compared to unittest.proto) because proto2 enums are not allowed
-  // inside proto2 messages.
-  //
-  // optional protobuf_unittest_import.ImportEnum    optional_import_enum  = 23;
-
-  string optional_string_piece = 24 [ctype = STRING_PIECE];
-  string optional_cord = 25 [ctype = CORD];
-
-  // Defined in unittest_import_public.proto
-  protobuf_unittest_import.PublicImportMessage optional_public_import_message =
-      26;
-
-  NestedMessage optional_lazy_message = 27 [lazy = true];
-  NestedMessage optional_unverified_lazy_message = 28 [unverified_lazy = true];
-  protobuf_unittest_import.ImportMessage optional_lazy_import_message = 115
-      [lazy = true];
-
-  // Repeated
-  repeated int32 repeated_int32 = 31;
-  repeated int64 repeated_int64 = 32;
-  repeated uint32 repeated_uint32 = 33;
-  repeated uint64 repeated_uint64 = 34;
-  repeated sint32 repeated_sint32 = 35;
-  repeated sint64 repeated_sint64 = 36;
-  repeated fixed32 repeated_fixed32 = 37;
-  repeated fixed64 repeated_fixed64 = 38;
-  repeated sfixed32 repeated_sfixed32 = 39;
-  repeated sfixed64 repeated_sfixed64 = 40;
-  repeated float repeated_float = 41;
-  repeated double repeated_double = 42;
-  repeated bool repeated_bool = 43;
-  repeated string repeated_string = 44;
-  repeated bytes repeated_bytes = 45;
-
-  // Groups are not allowed in proto3.
-  // repeated group RepeatedGroup = 46 {
-  //   optional int32 a = 47;
-  // }
-
-  repeated NestedMessage repeated_nested_message = 48;
-  repeated ForeignMessage repeated_foreign_message = 49;
-  repeated protobuf_unittest_import.ImportMessage repeated_import_message = 50;
-
-  repeated NestedEnum repeated_nested_enum = 51;
-  repeated ForeignEnum repeated_foreign_enum = 52;
-
-  // Omitted (compared to unittest.proto) because proto2 enums are not allowed
-  // inside proto2 messages.
-  //
-  // repeated protobuf_unittest_import.ImportEnum    repeated_import_enum  = 53;
-
-  repeated string repeated_string_piece = 54 [ctype = STRING_PIECE];
-  repeated string repeated_cord = 55 [ctype = CORD];
-
-  repeated NestedMessage repeated_lazy_message = 57 [lazy = true];
-
-  oneof oneof_field {
-    uint32 oneof_uint32 = 111;
-    NestedMessage oneof_nested_message = 112;
-    string oneof_string = 113;
-    bytes oneof_bytes = 114;
-  }
-}
-
-// Test messages for packed fields
-
-message TestPackedTypes {
-  repeated int32 packed_int32 = 90 [packed = true];
-  repeated int64 packed_int64 = 91 [packed = true];
-  repeated uint32 packed_uint32 = 92 [packed = true];
-  repeated uint64 packed_uint64 = 93 [packed = true];
-  repeated sint32 packed_sint32 = 94 [packed = true];
-  repeated sint64 packed_sint64 = 95 [packed = true];
-  repeated fixed32 packed_fixed32 = 96 [packed = true];
-  repeated fixed64 packed_fixed64 = 97 [packed = true];
-  repeated sfixed32 packed_sfixed32 = 98 [packed = true];
-  repeated sfixed64 packed_sfixed64 = 99 [packed = true];
-  repeated float packed_float = 100 [packed = true];
-  repeated double packed_double = 101 [packed = true];
-  repeated bool packed_bool = 102 [packed = true];
-  repeated ForeignEnum packed_enum = 103 [packed = true];
-}
-
-// Explicitly set packed to false
-message TestUnpackedTypes {
-  repeated int32 repeated_int32 = 1 [packed = false];
-  repeated int64 repeated_int64 = 2 [packed = false];
-  repeated uint32 repeated_uint32 = 3 [packed = false];
-  repeated uint64 repeated_uint64 = 4 [packed = false];
-  repeated sint32 repeated_sint32 = 5 [packed = false];
-  repeated sint64 repeated_sint64 = 6 [packed = false];
-  repeated fixed32 repeated_fixed32 = 7 [packed = false];
-  repeated fixed64 repeated_fixed64 = 8 [packed = false];
-  repeated sfixed32 repeated_sfixed32 = 9 [packed = false];
-  repeated sfixed64 repeated_sfixed64 = 10 [packed = false];
-  repeated float repeated_float = 11 [packed = false];
-  repeated double repeated_double = 12 [packed = false];
-  repeated bool repeated_bool = 13 [packed = false];
-  repeated TestAllTypes.NestedEnum repeated_nested_enum = 14 [packed = false];
-}
-
-// This proto includes a recursively nested message.
-message NestedTestAllTypes {
-  NestedTestAllTypes child = 1;
-  TestAllTypes payload = 2;
-}
-
-// Define these after TestAllTypes to make sure the compiler can handle
-// that.
-message ForeignMessage {
-  int32 c = 1;
-}
-
-enum ForeignEnum {
-  FOREIGN_ZERO = 0;
-  FOREIGN_FOO = 4;
-  FOREIGN_BAR = 5;
-  FOREIGN_BAZ = 6;
-}
-
-// TestEmptyMessage is used to test behavior of unknown fields.
-message TestEmptyMessage {}
-
-// TestMessageWithDummy is also used to test behavior of unknown fields.
-message TestMessageWithDummy {
-  // This field is only here for triggering copy-on-write; it's not intended to
-  // be serialized.
-  bool dummy = 536870911;
-}
-
-// Same layout as TestOneof2 in unittest.proto to test unknown enum value
-// parsing behavior in oneof.
-message TestOneof2 {
-  oneof foo {
-    NestedEnum foo_enum = 6;
-  }
-
-  enum NestedEnum {
-    UNKNOWN = 0;
-    FOO = 1;
-    BAR = 2;
-    BAZ = 3;
-  }
-}
diff --git a/libs/protobuf/src/google/protobuf/unittest_proto3_arena.proto b/libs/protobuf/src/google/protobuf/unittest_proto3_arena.proto
deleted file mode 100644
index 7dc6cd0..0000000
--- a/libs/protobuf/src/google/protobuf/unittest_proto3_arena.proto
+++ /dev/null
@@ -1,236 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto3";
-
-option cc_enable_arenas = true;
-
-import "google/protobuf/unittest_import.proto";
-
-package proto3_arena_unittest;
-
-// This proto includes every type of field in both singular and repeated
-// forms.
-message TestAllTypes {
-  message NestedMessage {
-    // The field name "b" fails to compile in proto1 because it conflicts with
-    // a local variable named "b" in one of the generated methods.  Doh.
-    // This file needs to compile in proto1 to test backwards-compatibility.
-    int32 bb = 1;
-  }
-
-  enum NestedEnum {
-    ZERO = 0;
-    FOO = 1;
-    BAR = 2;
-    BAZ = 3;
-    NEG = -1;  // Intentionally negative.
-  }
-
-  // Singular
-     int32 optional_int32    =  1;
-     int64 optional_int64    =  2;
-    uint32 optional_uint32   =  3;
-    uint64 optional_uint64   =  4;
-    sint32 optional_sint32   =  5;
-    sint64 optional_sint64   =  6;
-   fixed32 optional_fixed32  =  7;
-   fixed64 optional_fixed64  =  8;
-  sfixed32 optional_sfixed32 =  9;
-  sfixed64 optional_sfixed64 = 10;
-     float optional_float    = 11;
-    double optional_double   = 12;
-      bool optional_bool     = 13;
-    string optional_string   = 14;
-     bytes optional_bytes    = 15;
-
-  // Groups are not allowed in proto3.
-  // optional group OptionalGroup = 16 {
-  //   optional int32 a = 17;
-  // }
-
-  NestedMessage                        optional_nested_message  = 18;
-  ForeignMessage                       optional_foreign_message = 19;
-  protobuf_unittest_import.ImportMessage optional_import_message  = 20;
-
-  NestedEnum                           optional_nested_enum     = 21;
-  ForeignEnum                          optional_foreign_enum    = 22;
-
-  // Omitted (compared to unittest.proto) because proto2 enums are not allowed
-  // inside proto2 messages.
-  //
-  // optional protobuf_unittest_import.ImportEnum    optional_import_enum  = 23;
-
-  string optional_string_piece = 24 [ctype=STRING_PIECE];
-  string optional_cord = 25 [ctype=CORD];
-
-  // Defined in unittest_import_public.proto
-  protobuf_unittest_import.PublicImportMessage
-      optional_public_import_message = 26;
-
-  NestedMessage optional_lazy_message = 27 [lazy=true];
-  NestedMessage optional_unverified_lazy_message = 28 [unverified_lazy=true];
-  protobuf_unittest_import.ImportMessage optional_lazy_import_message = 115
-      [lazy = true];
-
-  // Repeated
-  repeated    int32 repeated_int32    = 31;
-  repeated    int64 repeated_int64    = 32;
-  repeated   uint32 repeated_uint32   = 33;
-  repeated   uint64 repeated_uint64   = 34;
-  repeated   sint32 repeated_sint32   = 35;
-  repeated   sint64 repeated_sint64   = 36;
-  repeated  fixed32 repeated_fixed32  = 37;
-  repeated  fixed64 repeated_fixed64  = 38;
-  repeated sfixed32 repeated_sfixed32 = 39;
-  repeated sfixed64 repeated_sfixed64 = 40;
-  repeated    float repeated_float    = 41;
-  repeated   double repeated_double   = 42;
-  repeated     bool repeated_bool     = 43;
-  repeated   string repeated_string   = 44;
-  repeated    bytes repeated_bytes    = 45;
-
-  // Optional
-  optional    int32 proto3_optional_int32    = 116;
-  optional    int64 proto3_optional_int64    = 117;
-  optional   uint32 proto3_optional_uint32   = 118;
-  optional   uint64 proto3_optional_uint64   = 119;
-  optional   sint32 proto3_optional_sint32   = 120;
-  optional   sint64 proto3_optional_sint64   = 121;
-  optional  fixed32 proto3_optional_fixed32  = 122;
-  optional  fixed64 proto3_optional_fixed64  = 123;
-  optional sfixed32 proto3_optional_sfixed32 = 124;
-  optional sfixed64 proto3_optional_sfixed64 = 125;
-  optional    float proto3_optional_float    = 126;
-  optional   double proto3_optional_double   = 127;
-  optional     bool proto3_optional_bool     = 128;
-  optional   string proto3_optional_string   = 129;
-  optional    bytes proto3_optional_bytes    = 130;
-
-  // Groups are not allowed in proto3.
-  // repeated group RepeatedGroup = 46 {
-  //   optional int32 a = 47;
-  // }
-
-  repeated NestedMessage                        repeated_nested_message  = 48;
-  repeated ForeignMessage                       repeated_foreign_message = 49;
-  repeated protobuf_unittest_import.ImportMessage repeated_import_message  = 50;
-
-  repeated NestedEnum                           repeated_nested_enum     = 51;
-  repeated ForeignEnum                          repeated_foreign_enum    = 52;
-
-  // Omitted (compared to unittest.proto) because proto2 enums are not allowed
-  // inside proto2 messages.
-  //
-  // repeated protobuf_unittest_import.ImportEnum    repeated_import_enum  = 53;
-
-  repeated string repeated_string_piece = 54 [ctype=STRING_PIECE];
-  repeated string repeated_cord = 55 [ctype=CORD];
-
-  repeated NestedMessage repeated_lazy_message = 57 [lazy=true];
-
-  oneof oneof_field {
-    uint32 oneof_uint32 = 111;
-    NestedMessage oneof_nested_message = 112;
-    string oneof_string = 113;
-    bytes oneof_bytes = 114;
-  }
-}
-
-// Test messages for packed fields
-
-message TestPackedTypes {
-  repeated    int32 packed_int32    =  90 [packed = true];
-  repeated    int64 packed_int64    =  91 [packed = true];
-  repeated   uint32 packed_uint32   =  92 [packed = true];
-  repeated   uint64 packed_uint64   =  93 [packed = true];
-  repeated   sint32 packed_sint32   =  94 [packed = true];
-  repeated   sint64 packed_sint64   =  95 [packed = true];
-  repeated  fixed32 packed_fixed32  =  96 [packed = true];
-  repeated  fixed64 packed_fixed64  =  97 [packed = true];
-  repeated sfixed32 packed_sfixed32 =  98 [packed = true];
-  repeated sfixed64 packed_sfixed64 =  99 [packed = true];
-  repeated    float packed_float    = 100 [packed = true];
-  repeated   double packed_double   = 101 [packed = true];
-  repeated     bool packed_bool     = 102 [packed = true];
-  repeated ForeignEnum packed_enum  = 103 [packed = true];
-}
-
-// Explicitly set packed to false
-message TestUnpackedTypes {
-  repeated    int32 repeated_int32    =  1 [packed = false];
-  repeated    int64 repeated_int64    =  2 [packed = false];
-  repeated   uint32 repeated_uint32   =  3 [packed = false];
-  repeated   uint64 repeated_uint64   =  4 [packed = false];
-  repeated   sint32 repeated_sint32   =  5 [packed = false];
-  repeated   sint64 repeated_sint64   =  6 [packed = false];
-  repeated  fixed32 repeated_fixed32  =  7 [packed = false];
-  repeated  fixed64 repeated_fixed64  =  8 [packed = false];
-  repeated sfixed32 repeated_sfixed32 =  9 [packed = false];
-  repeated sfixed64 repeated_sfixed64 = 10 [packed = false];
-  repeated    float repeated_float    = 11 [packed = false];
-  repeated   double repeated_double   = 12 [packed = false];
-  repeated     bool repeated_bool     = 13 [packed = false];
-  repeated TestAllTypes.NestedEnum repeated_nested_enum = 14 [packed = false];
-}
-
-// This proto includes a recursively nested message.
-message NestedTestAllTypes {
-  NestedTestAllTypes child = 1;
-  TestAllTypes payload = 2;
-  repeated NestedTestAllTypes repeated_child = 3;
-}
-
-// Define these after TestAllTypes to make sure the compiler can handle
-// that.
-message ForeignMessage {
-  int32 c = 1;
-}
-
-enum ForeignEnum {
-  FOREIGN_ZERO = 0;
-  FOREIGN_FOO = 4;
-  FOREIGN_BAR = 5;
-  FOREIGN_BAZ = 6;
-}
-
-// TestEmptyMessage is used to test behavior of unknown fields.
-message TestEmptyMessage {
-}
-
-// Needed for a Python test.
-message TestPickleNestedMessage {
-  message NestedMessage {
-    int32 bb = 1;
-    message NestedNestedMessage {
-      int32 cc = 1;
-    }
-  }
-}
diff --git a/libs/protobuf/src/google/protobuf/unittest_proto3_arena_lite.proto b/libs/protobuf/src/google/protobuf/unittest_proto3_arena_lite.proto
deleted file mode 100644
index 0d4218b..0000000
--- a/libs/protobuf/src/google/protobuf/unittest_proto3_arena_lite.proto
+++ /dev/null
@@ -1,205 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto3";
-
-package proto3_arena_lite_unittest;
-
-import "google/protobuf/unittest_import.proto";
-
-option cc_enable_arenas = true;
-option optimize_for = LITE_RUNTIME;
-
-// This proto includes every type of field in both singular and repeated
-// forms.
-message TestAllTypes {
-  message NestedMessage {
-    // The field name "b" fails to compile in proto1 because it conflicts with
-    // a local variable named "b" in one of the generated methods.  Doh.
-    // This file needs to compile in proto1 to test backwards-compatibility.
-    int32 bb = 1;
-  }
-
-  enum NestedEnum {
-    ZERO = 0;
-    FOO = 1;
-    BAR = 2;
-    BAZ = 3;
-    NEG = -1;  // Intentionally negative.
-  }
-
-  // Singular
-  int32 optional_int32 = 1;
-  int64 optional_int64 = 2;
-  uint32 optional_uint32 = 3;
-  uint64 optional_uint64 = 4;
-  sint32 optional_sint32 = 5;
-  sint64 optional_sint64 = 6;
-  fixed32 optional_fixed32 = 7;
-  fixed64 optional_fixed64 = 8;
-  sfixed32 optional_sfixed32 = 9;
-  sfixed64 optional_sfixed64 = 10;
-  float optional_float = 11;
-  double optional_double = 12;
-  bool optional_bool = 13;
-  string optional_string = 14;
-  bytes optional_bytes = 15;
-
-  // Groups are not allowed in proto3.
-  // optional group OptionalGroup = 16 {
-  //   optional int32 a = 17;
-  // }
-
-  NestedMessage optional_nested_message = 18;
-  ForeignMessage optional_foreign_message = 19;
-  protobuf_unittest_import.ImportMessage optional_import_message = 20;
-
-  NestedEnum optional_nested_enum = 21;
-  ForeignEnum optional_foreign_enum = 22;
-
-  // Omitted (compared to unittest.proto) because proto2 enums are not allowed
-  // inside proto2 messages.
-  //
-  // optional protobuf_unittest_import.ImportEnum    optional_import_enum  = 23;
-
-  string optional_string_piece = 24 [ctype = STRING_PIECE];
-  string optional_cord = 25 [ctype = CORD];
-
-  // Defined in unittest_import_public.proto
-  protobuf_unittest_import.PublicImportMessage optional_public_import_message =
-      26;
-
-  NestedMessage optional_lazy_message = 27 [lazy = true];
-
-  // Repeated
-  repeated int32 repeated_int32 = 31;
-  repeated int64 repeated_int64 = 32;
-  repeated uint32 repeated_uint32 = 33;
-  repeated uint64 repeated_uint64 = 34;
-  repeated sint32 repeated_sint32 = 35;
-  repeated sint64 repeated_sint64 = 36;
-  repeated fixed32 repeated_fixed32 = 37;
-  repeated fixed64 repeated_fixed64 = 38;
-  repeated sfixed32 repeated_sfixed32 = 39;
-  repeated sfixed64 repeated_sfixed64 = 40;
-  repeated float repeated_float = 41;
-  repeated double repeated_double = 42;
-  repeated bool repeated_bool = 43;
-  repeated string repeated_string = 44;
-  repeated bytes repeated_bytes = 45;
-
-  // Groups are not allowed in proto3.
-  // repeated group RepeatedGroup = 46 {
-  //   optional int32 a = 47;
-  // }
-
-  repeated NestedMessage repeated_nested_message = 48;
-  repeated ForeignMessage repeated_foreign_message = 49;
-  repeated protobuf_unittest_import.ImportMessage repeated_import_message = 50;
-
-  repeated NestedEnum repeated_nested_enum = 51;
-  repeated ForeignEnum repeated_foreign_enum = 52;
-
-  // Omitted (compared to unittest.proto) because proto2 enums are not allowed
-  // inside proto2 messages.
-  //
-  // repeated protobuf_unittest_import.ImportEnum    repeated_import_enum  = 53;
-
-  repeated string repeated_string_piece = 54 [ctype = STRING_PIECE];
-  repeated string repeated_cord = 55 [ctype = CORD];
-
-  repeated NestedMessage repeated_lazy_message = 57 [lazy = true];
-
-  oneof oneof_field {
-    uint32 oneof_uint32 = 111;
-    NestedMessage oneof_nested_message = 112;
-    string oneof_string = 113;
-    bytes oneof_bytes = 114;
-  }
-}
-
-// Test messages for packed fields
-
-message TestPackedTypes {
-  repeated int32 packed_int32 = 90 [packed = true];
-  repeated int64 packed_int64 = 91 [packed = true];
-  repeated uint32 packed_uint32 = 92 [packed = true];
-  repeated uint64 packed_uint64 = 93 [packed = true];
-  repeated sint32 packed_sint32 = 94 [packed = true];
-  repeated sint64 packed_sint64 = 95 [packed = true];
-  repeated fixed32 packed_fixed32 = 96 [packed = true];
-  repeated fixed64 packed_fixed64 = 97 [packed = true];
-  repeated sfixed32 packed_sfixed32 = 98 [packed = true];
-  repeated sfixed64 packed_sfixed64 = 99 [packed = true];
-  repeated float packed_float = 100 [packed = true];
-  repeated double packed_double = 101 [packed = true];
-  repeated bool packed_bool = 102 [packed = true];
-  repeated ForeignEnum packed_enum = 103 [packed = true];
-}
-
-// Explicitly set packed to false
-message TestUnpackedTypes {
-  repeated int32 repeated_int32 = 1 [packed = false];
-  repeated int64 repeated_int64 = 2 [packed = false];
-  repeated uint32 repeated_uint32 = 3 [packed = false];
-  repeated uint64 repeated_uint64 = 4 [packed = false];
-  repeated sint32 repeated_sint32 = 5 [packed = false];
-  repeated sint64 repeated_sint64 = 6 [packed = false];
-  repeated fixed32 repeated_fixed32 = 7 [packed = false];
-  repeated fixed64 repeated_fixed64 = 8 [packed = false];
-  repeated sfixed32 repeated_sfixed32 = 9 [packed = false];
-  repeated sfixed64 repeated_sfixed64 = 10 [packed = false];
-  repeated float repeated_float = 11 [packed = false];
-  repeated double repeated_double = 12 [packed = false];
-  repeated bool repeated_bool = 13 [packed = false];
-  repeated TestAllTypes.NestedEnum repeated_nested_enum = 14 [packed = false];
-}
-
-// This proto includes a recursively nested message.
-message NestedTestAllTypes {
-  NestedTestAllTypes child = 1;
-  TestAllTypes payload = 2;
-}
-
-// Define these after TestAllTypes to make sure the compiler can handle
-// that.
-message ForeignMessage {
-  int32 c = 1;
-}
-
-enum ForeignEnum {
-  FOREIGN_ZERO = 0;
-  FOREIGN_FOO = 4;
-  FOREIGN_BAR = 5;
-  FOREIGN_BAZ = 6;
-}
-
-// TestEmptyMessage is used to test behavior of unknown fields.
-message TestEmptyMessage {}
diff --git a/libs/protobuf/src/google/protobuf/unittest_proto3_lite.proto b/libs/protobuf/src/google/protobuf/unittest_proto3_lite.proto
deleted file mode 100644
index 837bb03..0000000
--- a/libs/protobuf/src/google/protobuf/unittest_proto3_lite.proto
+++ /dev/null
@@ -1,204 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto3";
-
-package proto3_lite_unittest;
-
-import "google/protobuf/unittest_import.proto";
-
-option optimize_for = LITE_RUNTIME;
-
-// This proto includes every type of field in both singular and repeated
-// forms.
-message TestAllTypes {
-  message NestedMessage {
-    // The field name "b" fails to compile in proto1 because it conflicts with
-    // a local variable named "b" in one of the generated methods.  Doh.
-    // This file needs to compile in proto1 to test backwards-compatibility.
-    int32 bb = 1;
-  }
-
-  enum NestedEnum {
-    ZERO = 0;
-    FOO = 1;
-    BAR = 2;
-    BAZ = 3;
-    NEG = -1;  // Intentionally negative.
-  }
-
-  // Singular
-  int32 optional_int32 = 1;
-  int64 optional_int64 = 2;
-  uint32 optional_uint32 = 3;
-  uint64 optional_uint64 = 4;
-  sint32 optional_sint32 = 5;
-  sint64 optional_sint64 = 6;
-  fixed32 optional_fixed32 = 7;
-  fixed64 optional_fixed64 = 8;
-  sfixed32 optional_sfixed32 = 9;
-  sfixed64 optional_sfixed64 = 10;
-  float optional_float = 11;
-  double optional_double = 12;
-  bool optional_bool = 13;
-  string optional_string = 14;
-  bytes optional_bytes = 15;
-
-  // Groups are not allowed in proto3.
-  // optional group OptionalGroup = 16 {
-  //   optional int32 a = 17;
-  // }
-
-  NestedMessage optional_nested_message = 18;
-  ForeignMessage optional_foreign_message = 19;
-  protobuf_unittest_import.ImportMessage optional_import_message = 20;
-
-  NestedEnum optional_nested_enum = 21;
-  ForeignEnum optional_foreign_enum = 22;
-
-  // Omitted (compared to unittest.proto) because proto2 enums are not allowed
-  // inside proto2 messages.
-  //
-  // optional protobuf_unittest_import.ImportEnum    optional_import_enum  = 23;
-
-  string optional_string_piece = 24 [ctype = STRING_PIECE];
-  string optional_cord = 25 [ctype = CORD];
-
-  // Defined in unittest_import_public.proto
-  protobuf_unittest_import.PublicImportMessage optional_public_import_message =
-      26;
-
-  NestedMessage optional_lazy_message = 27 [lazy = true];
-
-  // Repeated
-  repeated int32 repeated_int32 = 31;
-  repeated int64 repeated_int64 = 32;
-  repeated uint32 repeated_uint32 = 33;
-  repeated uint64 repeated_uint64 = 34;
-  repeated sint32 repeated_sint32 = 35;
-  repeated sint64 repeated_sint64 = 36;
-  repeated fixed32 repeated_fixed32 = 37;
-  repeated fixed64 repeated_fixed64 = 38;
-  repeated sfixed32 repeated_sfixed32 = 39;
-  repeated sfixed64 repeated_sfixed64 = 40;
-  repeated float repeated_float = 41;
-  repeated double repeated_double = 42;
-  repeated bool repeated_bool = 43;
-  repeated string repeated_string = 44;
-  repeated bytes repeated_bytes = 45;
-
-  // Groups are not allowed in proto3.
-  // repeated group RepeatedGroup = 46 {
-  //   optional int32 a = 47;
-  // }
-
-  repeated NestedMessage repeated_nested_message = 48;
-  repeated ForeignMessage repeated_foreign_message = 49;
-  repeated protobuf_unittest_import.ImportMessage repeated_import_message = 50;
-
-  repeated NestedEnum repeated_nested_enum = 51;
-  repeated ForeignEnum repeated_foreign_enum = 52;
-
-  // Omitted (compared to unittest.proto) because proto2 enums are not allowed
-  // inside proto2 messages.
-  //
-  // repeated protobuf_unittest_import.ImportEnum    repeated_import_enum  = 53;
-
-  repeated string repeated_string_piece = 54 [ctype = STRING_PIECE];
-  repeated string repeated_cord = 55 [ctype = CORD];
-
-  repeated NestedMessage repeated_lazy_message = 57 [lazy = true];
-
-  oneof oneof_field {
-    uint32 oneof_uint32 = 111;
-    NestedMessage oneof_nested_message = 112;
-    string oneof_string = 113;
-    bytes oneof_bytes = 114;
-  }
-}
-
-// Test messages for packed fields
-
-message TestPackedTypes {
-  repeated int32 packed_int32 = 90 [packed = true];
-  repeated int64 packed_int64 = 91 [packed = true];
-  repeated uint32 packed_uint32 = 92 [packed = true];
-  repeated uint64 packed_uint64 = 93 [packed = true];
-  repeated sint32 packed_sint32 = 94 [packed = true];
-  repeated sint64 packed_sint64 = 95 [packed = true];
-  repeated fixed32 packed_fixed32 = 96 [packed = true];
-  repeated fixed64 packed_fixed64 = 97 [packed = true];
-  repeated sfixed32 packed_sfixed32 = 98 [packed = true];
-  repeated sfixed64 packed_sfixed64 = 99 [packed = true];
-  repeated float packed_float = 100 [packed = true];
-  repeated double packed_double = 101 [packed = true];
-  repeated bool packed_bool = 102 [packed = true];
-  repeated ForeignEnum packed_enum = 103 [packed = true];
-}
-
-// Explicitly set packed to false
-message TestUnpackedTypes {
-  repeated int32 repeated_int32 = 1 [packed = false];
-  repeated int64 repeated_int64 = 2 [packed = false];
-  repeated uint32 repeated_uint32 = 3 [packed = false];
-  repeated uint64 repeated_uint64 = 4 [packed = false];
-  repeated sint32 repeated_sint32 = 5 [packed = false];
-  repeated sint64 repeated_sint64 = 6 [packed = false];
-  repeated fixed32 repeated_fixed32 = 7 [packed = false];
-  repeated fixed64 repeated_fixed64 = 8 [packed = false];
-  repeated sfixed32 repeated_sfixed32 = 9 [packed = false];
-  repeated sfixed64 repeated_sfixed64 = 10 [packed = false];
-  repeated float repeated_float = 11 [packed = false];
-  repeated double repeated_double = 12 [packed = false];
-  repeated bool repeated_bool = 13 [packed = false];
-  repeated TestAllTypes.NestedEnum repeated_nested_enum = 14 [packed = false];
-}
-
-// This proto includes a recursively nested message.
-message NestedTestAllTypes {
-  NestedTestAllTypes child = 1;
-  TestAllTypes payload = 2;
-}
-
-// Define these after TestAllTypes to make sure the compiler can handle
-// that.
-message ForeignMessage {
-  int32 c = 1;
-}
-
-enum ForeignEnum {
-  FOREIGN_ZERO = 0;
-  FOREIGN_FOO = 4;
-  FOREIGN_BAR = 5;
-  FOREIGN_BAZ = 6;
-}
-
-// TestEmptyMessage is used to test behavior of unknown fields.
-message TestEmptyMessage {}
diff --git a/libs/protobuf/src/google/protobuf/unittest_proto3_optional.proto b/libs/protobuf/src/google/protobuf/unittest_proto3_optional.proto
deleted file mode 100644
index 09d1718..0000000
--- a/libs/protobuf/src/google/protobuf/unittest_proto3_optional.proto
+++ /dev/null
@@ -1,100 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto3";
-
-package protobuf_unittest;
-
-import "google/protobuf/descriptor.proto";
-
-option java_multiple_files = true;
-option java_package = "com.google.protobuf.testing.proto";
-
-message TestProto3Optional {
-  message NestedMessage {
-    // The field name "b" fails to compile in proto1 because it conflicts with
-    // a local variable named "b" in one of the generated methods.  Doh.
-    // This file needs to compile in proto1 to test backwards-compatibility.
-    optional int32 bb = 1;
-  }
-
-  enum NestedEnum {
-    UNSPECIFIED = 0;
-    FOO = 1;
-    BAR = 2;
-    BAZ = 3;
-    NEG = -1;  // Intentionally negative.
-  }
-
-  // Singular
-  optional int32 optional_int32 = 1;
-  optional int64 optional_int64 = 2;
-  optional uint32 optional_uint32 = 3;
-  optional uint64 optional_uint64 = 4;
-  optional sint32 optional_sint32 = 5;
-  optional sint64 optional_sint64 = 6;
-  optional fixed32 optional_fixed32 = 7;
-  optional fixed64 optional_fixed64 = 8;
-  optional sfixed32 optional_sfixed32 = 9;
-  optional sfixed64 optional_sfixed64 = 10;
-  optional float optional_float = 11;
-  optional double optional_double = 12;
-  optional bool optional_bool = 13;
-  optional string optional_string = 14;
-  optional bytes optional_bytes = 15;
-  optional string optional_cord = 16 [ctype = CORD];
-
-  optional NestedMessage optional_nested_message = 18;
-  optional NestedMessage lazy_nested_message = 19 [lazy = true];
-  optional NestedEnum optional_nested_enum = 21;
-
-  // Add some non-optional fields to verify we can mix them.
-  int32 singular_int32 = 22;
-  int64 singular_int64 = 23;
-}
-
-message TestProto3OptionalMessage {
-  message NestedMessage {
-    string s = 1;
-  }
-
-  NestedMessage nested_message = 1;
-  optional NestedMessage optional_nested_message = 2;
-}
-
-message Proto3OptionalExtensions {
-  option (protobuf_unittest.Proto3OptionalExtensions.ext_no_optional) = 8;
-  option (protobuf_unittest.Proto3OptionalExtensions.ext_with_optional) = 16;
-
-  extend google.protobuf.MessageOptions {
-    int32 ext_no_optional = 355886728;
-    optional int32 ext_with_optional = 355886729;
-  }
-}
diff --git a/libs/protobuf/src/google/protobuf/unittest_well_known_types.proto b/libs/protobuf/src/google/protobuf/unittest_well_known_types.proto
deleted file mode 100644
index c907524..0000000
--- a/libs/protobuf/src/google/protobuf/unittest_well_known_types.proto
+++ /dev/null
@@ -1,114 +0,0 @@
-syntax = "proto3";
-
-package protobuf_unittest;
-
-option csharp_namespace = "Google.Protobuf.TestProtos";
-option java_multiple_files = true;
-option java_package = "com.google.protobuf.test";
-
-import "google/protobuf/any.proto";
-import "google/protobuf/api.proto";
-import "google/protobuf/duration.proto";
-import "google/protobuf/empty.proto";
-import "google/protobuf/field_mask.proto";
-import "google/protobuf/source_context.proto";
-import "google/protobuf/struct.proto";
-import "google/protobuf/timestamp.proto";
-import "google/protobuf/type.proto";
-import "google/protobuf/wrappers.proto";
-
-// Test that we can include all well-known types.
-// Each wrapper type is included separately, as languages
-// map handle different wrappers in different ways.
-message TestWellKnownTypes {
-  google.protobuf.Any any_field = 1;
-  google.protobuf.Api api_field = 2;
-  google.protobuf.Duration duration_field = 3;
-  google.protobuf.Empty empty_field = 4;
-  google.protobuf.FieldMask field_mask_field = 5;
-  google.protobuf.SourceContext source_context_field = 6;
-  google.protobuf.Struct struct_field = 7;
-  google.protobuf.Timestamp timestamp_field = 8;
-  google.protobuf.Type type_field = 9;
-  google.protobuf.DoubleValue double_field = 10;
-  google.protobuf.FloatValue float_field = 11;
-  google.protobuf.Int64Value int64_field = 12;
-  google.protobuf.UInt64Value uint64_field = 13;
-  google.protobuf.Int32Value int32_field = 14;
-  google.protobuf.UInt32Value uint32_field = 15;
-  google.protobuf.BoolValue bool_field = 16;
-  google.protobuf.StringValue string_field = 17;
-  google.protobuf.BytesValue bytes_field = 18;
-  // Part of struct, but useful to be able to test separately
-  google.protobuf.Value value_field = 19;
-}
-
-// A repeated field for each well-known type.
-message RepeatedWellKnownTypes {
-  repeated google.protobuf.Any any_field = 1;
-  repeated google.protobuf.Api api_field = 2;
-  repeated google.protobuf.Duration duration_field = 3;
-  repeated google.protobuf.Empty empty_field = 4;
-  repeated google.protobuf.FieldMask field_mask_field = 5;
-  repeated google.protobuf.SourceContext source_context_field = 6;
-  repeated google.protobuf.Struct struct_field = 7;
-  repeated google.protobuf.Timestamp timestamp_field = 8;
-  repeated google.protobuf.Type type_field = 9;
-  // These don't actually make a lot of sense, but they're not prohibited...
-  repeated google.protobuf.DoubleValue double_field = 10;
-  repeated google.protobuf.FloatValue float_field = 11;
-  repeated google.protobuf.Int64Value int64_field = 12;
-  repeated google.protobuf.UInt64Value uint64_field = 13;
-  repeated google.protobuf.Int32Value int32_field = 14;
-  repeated google.protobuf.UInt32Value uint32_field = 15;
-  repeated google.protobuf.BoolValue bool_field = 16;
-  repeated google.protobuf.StringValue string_field = 17;
-  repeated google.protobuf.BytesValue bytes_field = 18;
-}
-
-message OneofWellKnownTypes {
-  oneof oneof_field {
-    google.protobuf.Any any_field = 1;
-    google.protobuf.Api api_field = 2;
-    google.protobuf.Duration duration_field = 3;
-    google.protobuf.Empty empty_field = 4;
-    google.protobuf.FieldMask field_mask_field = 5;
-    google.protobuf.SourceContext source_context_field = 6;
-    google.protobuf.Struct struct_field = 7;
-    google.protobuf.Timestamp timestamp_field = 8;
-    google.protobuf.Type type_field = 9;
-    google.protobuf.DoubleValue double_field = 10;
-    google.protobuf.FloatValue float_field = 11;
-    google.protobuf.Int64Value int64_field = 12;
-    google.protobuf.UInt64Value uint64_field = 13;
-    google.protobuf.Int32Value int32_field = 14;
-    google.protobuf.UInt32Value uint32_field = 15;
-    google.protobuf.BoolValue bool_field = 16;
-    google.protobuf.StringValue string_field = 17;
-    google.protobuf.BytesValue bytes_field = 18;
-  }
-}
-
-// A map field for each well-known type. We only
-// need to worry about the value part of the map being the
-// well-known types, as messages can't be map keys.
-message MapWellKnownTypes {
-  map<int32,google.protobuf.Any> any_field = 1;
-  map<int32,google.protobuf.Api> api_field = 2;
-  map<int32,google.protobuf.Duration> duration_field = 3;
-  map<int32,google.protobuf.Empty> empty_field = 4;
-  map<int32,google.protobuf.FieldMask> field_mask_field = 5;
-  map<int32,google.protobuf.SourceContext> source_context_field = 6;
-  map<int32,google.protobuf.Struct> struct_field = 7;
-  map<int32,google.protobuf.Timestamp> timestamp_field = 8;
-  map<int32,google.protobuf.Type> type_field = 9;
-  map<int32,google.protobuf.DoubleValue> double_field = 10;
-  map<int32,google.protobuf.FloatValue> float_field = 11;
-  map<int32,google.protobuf.Int64Value> int64_field = 12;
-  map<int32,google.protobuf.UInt64Value> uint64_field = 13;
-  map<int32,google.protobuf.Int32Value> int32_field = 14;
-  map<int32,google.protobuf.UInt32Value> uint32_field = 15;
-  map<int32,google.protobuf.BoolValue> bool_field = 16;
-  map<int32,google.protobuf.StringValue> string_field = 17;
-  map<int32,google.protobuf.BytesValue> bytes_field = 18;
-}
diff --git a/libs/protobuf/src/google/protobuf/unknown_field_set.cc b/libs/protobuf/src/google/protobuf/unknown_field_set.cc
deleted file mode 100644
index 74c358e..0000000
--- a/libs/protobuf/src/google/protobuf/unknown_field_set.cc
+++ /dev/null
@@ -1,350 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-
-#include <google/protobuf/unknown_field_set.h>
-
-#include <google/protobuf/stubs/logging.h>
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/io/zero_copy_stream.h>
-#include <google/protobuf/io/zero_copy_stream_impl.h>
-#include <google/protobuf/io/zero_copy_stream_impl_lite.h>
-#include <google/protobuf/extension_set.h>
-#include <google/protobuf/generated_message_tctable_decl.h>
-#include <google/protobuf/generated_message_tctable_impl.h>
-#include <google/protobuf/parse_context.h>
-#include <google/protobuf/wire_format.h>
-#include <google/protobuf/wire_format_lite.h>
-#include <google/protobuf/stubs/stl_util.h>
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-
-const UnknownFieldSet& UnknownFieldSet::default_instance() {
-  static auto instance = internal::OnShutdownDelete(new UnknownFieldSet());
-  return *instance;
-}
-
-void UnknownFieldSet::ClearFallback() {
-  GOOGLE_DCHECK(!fields_.empty());
-  int n = fields_.size();
-  do {
-    (fields_)[--n].Delete();
-  } while (n > 0);
-  fields_.clear();
-}
-
-void UnknownFieldSet::InternalMergeFrom(const UnknownFieldSet& other) {
-  int other_field_count = other.field_count();
-  if (other_field_count > 0) {
-    fields_.reserve(fields_.size() + other_field_count);
-    for (int i = 0; i < other_field_count; i++) {
-      fields_.push_back((other.fields_)[i]);
-      fields_.back().DeepCopy((other.fields_)[i]);
-    }
-  }
-}
-
-void UnknownFieldSet::MergeFrom(const UnknownFieldSet& other) {
-  int other_field_count = other.field_count();
-  if (other_field_count > 0) {
-    fields_.reserve(fields_.size() + other_field_count);
-    for (int i = 0; i < other_field_count; i++) {
-      fields_.push_back((other.fields_)[i]);
-      fields_.back().DeepCopy((other.fields_)[i]);
-    }
-  }
-}
-
-// A specialized MergeFrom for performance when we are merging from an UFS that
-// is temporary and can be destroyed in the process.
-void UnknownFieldSet::MergeFromAndDestroy(UnknownFieldSet* other) {
-  if (fields_.empty()) {
-    fields_ = std::move(other->fields_);
-  } else {
-    fields_.insert(fields_.end(),
-                   std::make_move_iterator(other->fields_.begin()),
-                   std::make_move_iterator(other->fields_.end()));
-  }
-  other->fields_.clear();
-}
-
-void UnknownFieldSet::MergeToInternalMetadata(
-    const UnknownFieldSet& other, internal::InternalMetadata* metadata) {
-  metadata->mutable_unknown_fields<UnknownFieldSet>()->MergeFrom(other);
-}
-
-size_t UnknownFieldSet::SpaceUsedExcludingSelfLong() const {
-  if (fields_.empty()) return 0;
-
-  size_t total_size = sizeof(UnknownField) * fields_.capacity();
-
-  for (const UnknownField& field : fields_) {
-    switch (field.type()) {
-      case UnknownField::TYPE_LENGTH_DELIMITED:
-        total_size += sizeof(*field.data_.length_delimited_.string_value) +
-                      internal::StringSpaceUsedExcludingSelfLong(
-                          *field.data_.length_delimited_.string_value);
-        break;
-      case UnknownField::TYPE_GROUP:
-        total_size += field.data_.group_->SpaceUsedLong();
-        break;
-      default:
-        break;
-    }
-  }
-  return total_size;
-}
-
-size_t UnknownFieldSet::SpaceUsedLong() const {
-  return sizeof(*this) + SpaceUsedExcludingSelf();
-}
-
-void UnknownFieldSet::AddVarint(int number, uint64_t value) {
-  UnknownField field;
-  field.number_ = number;
-  field.SetType(UnknownField::TYPE_VARINT);
-  field.data_.varint_ = value;
-  fields_.push_back(field);
-}
-
-void UnknownFieldSet::AddFixed32(int number, uint32_t value) {
-  UnknownField field;
-  field.number_ = number;
-  field.SetType(UnknownField::TYPE_FIXED32);
-  field.data_.fixed32_ = value;
-  fields_.push_back(field);
-}
-
-void UnknownFieldSet::AddFixed64(int number, uint64_t value) {
-  UnknownField field;
-  field.number_ = number;
-  field.SetType(UnknownField::TYPE_FIXED64);
-  field.data_.fixed64_ = value;
-  fields_.push_back(field);
-}
-
-std::string* UnknownFieldSet::AddLengthDelimited(int number) {
-  UnknownField field;
-  field.number_ = number;
-  field.SetType(UnknownField::TYPE_LENGTH_DELIMITED);
-  field.data_.length_delimited_.string_value = new std::string;
-  fields_.push_back(field);
-  return field.data_.length_delimited_.string_value;
-}
-
-
-UnknownFieldSet* UnknownFieldSet::AddGroup(int number) {
-  UnknownField field;
-  field.number_ = number;
-  field.SetType(UnknownField::TYPE_GROUP);
-  field.data_.group_ = new UnknownFieldSet;
-  fields_.push_back(field);
-  return field.data_.group_;
-}
-
-void UnknownFieldSet::AddField(const UnknownField& field) {
-  fields_.push_back(field);
-  fields_.back().DeepCopy(field);
-}
-
-void UnknownFieldSet::DeleteSubrange(int start, int num) {
-  // Delete the specified fields.
-  for (int i = 0; i < num; ++i) {
-    (fields_)[i + start].Delete();
-  }
-  // Slide down the remaining fields.
-  for (size_t i = start + num; i < fields_.size(); ++i) {
-    (fields_)[i - num] = (fields_)[i];
-  }
-  // Pop off the # of deleted fields.
-  for (int i = 0; i < num; ++i) {
-    fields_.pop_back();
-  }
-}
-
-void UnknownFieldSet::DeleteByNumber(int number) {
-  size_t left = 0;  // The number of fields left after deletion.
-  for (size_t i = 0; i < fields_.size(); ++i) {
-    UnknownField* field = &(fields_)[i];
-    if (field->number() == number) {
-      field->Delete();
-    } else {
-      if (i != left) {
-        (fields_)[left] = (fields_)[i];
-      }
-      ++left;
-    }
-  }
-  fields_.resize(left);
-}
-
-bool UnknownFieldSet::MergeFromCodedStream(io::CodedInputStream* input) {
-  UnknownFieldSet other;
-  if (internal::WireFormat::SkipMessage(input, &other) &&
-      input->ConsumedEntireMessage()) {
-    MergeFromAndDestroy(&other);
-    return true;
-  } else {
-    return false;
-  }
-}
-
-bool UnknownFieldSet::ParseFromCodedStream(io::CodedInputStream* input) {
-  Clear();
-  return MergeFromCodedStream(input);
-}
-
-bool UnknownFieldSet::ParseFromZeroCopyStream(io::ZeroCopyInputStream* input) {
-  io::CodedInputStream coded_input(input);
-  return (ParseFromCodedStream(&coded_input) &&
-          coded_input.ConsumedEntireMessage());
-}
-
-bool UnknownFieldSet::ParseFromArray(const void* data, int size) {
-  io::ArrayInputStream input(data, size);
-  return ParseFromZeroCopyStream(&input);
-}
-
-bool UnknownFieldSet::SerializeToString(std::string* output) const {
-  const size_t size =
-      google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(*this);
-  STLStringResizeUninitializedAmortized(output, size);
-  google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
-      *this, reinterpret_cast<uint8_t*>(const_cast<char*>(output->data())));
-  return true;
-}
-
-bool UnknownFieldSet::SerializeToCodedStream(
-    io::CodedOutputStream* output) const {
-  google::protobuf::internal::WireFormat::SerializeUnknownFields(*this, output);
-  return !output->HadError();
-}
-void UnknownField::Delete() {
-  switch (type()) {
-    case UnknownField::TYPE_LENGTH_DELIMITED:
-      delete data_.length_delimited_.string_value;
-      break;
-    case UnknownField::TYPE_GROUP:
-      delete data_.group_;
-      break;
-    default:
-      break;
-  }
-}
-
-void UnknownField::DeepCopy(const UnknownField& other) {
-  (void)other;  // Parameter is used by Google-internal code.
-  switch (type()) {
-    case UnknownField::TYPE_LENGTH_DELIMITED:
-      data_.length_delimited_.string_value =
-          new std::string(*data_.length_delimited_.string_value);
-      break;
-    case UnknownField::TYPE_GROUP: {
-      UnknownFieldSet* group = new UnknownFieldSet();
-      group->InternalMergeFrom(*data_.group_);
-      data_.group_ = group;
-      break;
-    }
-    default:
-      break;
-  }
-}
-
-
-uint8_t* UnknownField::InternalSerializeLengthDelimitedNoTag(
-    uint8_t* target, io::EpsCopyOutputStream* stream) const {
-  GOOGLE_DCHECK_EQ(TYPE_LENGTH_DELIMITED, type());
-  const std::string& data = *data_.length_delimited_.string_value;
-  target = io::CodedOutputStream::WriteVarint32ToArray(data.size(), target);
-  target = stream->WriteRaw(data.data(), data.size(), target);
-  return target;
-}
-
-namespace internal {
-
-class UnknownFieldParserHelper {
- public:
-  explicit UnknownFieldParserHelper(UnknownFieldSet* unknown)
-      : unknown_(unknown) {}
-
-  void AddVarint(uint32_t num, uint64_t value) {
-    unknown_->AddVarint(num, value);
-  }
-  void AddFixed64(uint32_t num, uint64_t value) {
-    unknown_->AddFixed64(num, value);
-  }
-  const char* ParseLengthDelimited(uint32_t num, const char* ptr,
-                                   ParseContext* ctx) {
-    std::string* s = unknown_->AddLengthDelimited(num);
-    int size = ReadSize(&ptr);
-    GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
-    return ctx->ReadString(ptr, size, s);
-  }
-  const char* ParseGroup(uint32_t num, const char* ptr, ParseContext* ctx) {
-    UnknownFieldParserHelper child(unknown_->AddGroup(num));
-    return ctx->ParseGroup(&child, ptr, num * 8 + 3);
-  }
-  void AddFixed32(uint32_t num, uint32_t value) {
-    unknown_->AddFixed32(num, value);
-  }
-
-  const char* _InternalParse(const char* ptr, ParseContext* ctx) {
-    return WireFormatParser(*this, ptr, ctx);
-  }
-
- private:
-  UnknownFieldSet* unknown_;
-};
-
-const char* UnknownGroupParse(UnknownFieldSet* unknown, const char* ptr,
-                              ParseContext* ctx) {
-  UnknownFieldParserHelper field_parser(unknown);
-  return WireFormatParser(field_parser, ptr, ctx);
-}
-
-const char* UnknownFieldParse(uint64_t tag, UnknownFieldSet* unknown,
-                              const char* ptr, ParseContext* ctx) {
-  UnknownFieldParserHelper field_parser(unknown);
-  return FieldParser(tag, field_parser, ptr, ctx);
-}
-
-}  // namespace internal
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
diff --git a/libs/protobuf/src/google/protobuf/unknown_field_set.h b/libs/protobuf/src/google/protobuf/unknown_field_set.h
deleted file mode 100644
index 9aa2cbb..0000000
--- a/libs/protobuf/src/google/protobuf/unknown_field_set.h
+++ /dev/null
@@ -1,407 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-//
-// Contains classes used to keep track of unrecognized fields seen while
-// parsing a protocol message.
-
-#ifndef GOOGLE_PROTOBUF_UNKNOWN_FIELD_SET_H__
-#define GOOGLE_PROTOBUF_UNKNOWN_FIELD_SET_H__
-
-
-#include <assert.h>
-
-#include <string>
-#include <vector>
-
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/stubs/logging.h>
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/io/zero_copy_stream_impl_lite.h>
-#include <google/protobuf/port.h>
-#include <google/protobuf/message_lite.h>
-#include <google/protobuf/parse_context.h>
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-#ifdef SWIG
-#error "You cannot SWIG proto headers"
-#endif
-
-namespace google {
-namespace protobuf {
-namespace internal {
-class InternalMetadata;           // metadata_lite.h
-class WireFormat;                 // wire_format.h
-class MessageSetFieldSkipperUsingCord;
-// extension_set_heavy.cc
-}  // namespace internal
-
-class Message;       // message.h
-class UnknownField;  // below
-
-// An UnknownFieldSet contains fields that were encountered while parsing a
-// message but were not defined by its type.  Keeping track of these can be
-// useful, especially in that they may be written if the message is serialized
-// again without being cleared in between.  This means that software which
-// simply receives messages and forwards them to other servers does not need
-// to be updated every time a new field is added to the message definition.
-//
-// To get the UnknownFieldSet attached to any message, call
-// Reflection::GetUnknownFields().
-//
-// This class is necessarily tied to the protocol buffer wire format, unlike
-// the Reflection interface which is independent of any serialization scheme.
-class PROTOBUF_EXPORT UnknownFieldSet {
- public:
-  UnknownFieldSet();
-  ~UnknownFieldSet();
-
-  // Remove all fields.
-  inline void Clear();
-
-  // Remove all fields and deallocate internal data objects
-  void ClearAndFreeMemory();
-
-  // Is this set empty?
-  inline bool empty() const;
-
-  // Merge the contents of some other UnknownFieldSet with this one.
-  void MergeFrom(const UnknownFieldSet& other);
-
-  // Similar to above, but this function will destroy the contents of other.
-  void MergeFromAndDestroy(UnknownFieldSet* other);
-
-  // Merge the contents an UnknownFieldSet with the UnknownFieldSet in
-  // *metadata, if there is one.  If *metadata doesn't have an UnknownFieldSet
-  // then add one to it and make it be a copy of the first arg.
-  static void MergeToInternalMetadata(const UnknownFieldSet& other,
-                                      internal::InternalMetadata* metadata);
-
-  // Swaps the contents of some other UnknownFieldSet with this one.
-  inline void Swap(UnknownFieldSet* x);
-
-  // Computes (an estimate of) the total number of bytes currently used for
-  // storing the unknown fields in memory. Does NOT include
-  // sizeof(*this) in the calculation.
-  size_t SpaceUsedExcludingSelfLong() const;
-
-  int SpaceUsedExcludingSelf() const {
-    return internal::ToIntSize(SpaceUsedExcludingSelfLong());
-  }
-
-  // Version of SpaceUsed() including sizeof(*this).
-  size_t SpaceUsedLong() const;
-
-  int SpaceUsed() const { return internal::ToIntSize(SpaceUsedLong()); }
-
-  // Returns the number of fields present in the UnknownFieldSet.
-  inline int field_count() const;
-  // Get a field in the set, where 0 <= index < field_count().  The fields
-  // appear in the order in which they were added.
-  inline const UnknownField& field(int index) const;
-  // Get a mutable pointer to a field in the set, where
-  // 0 <= index < field_count().  The fields appear in the order in which
-  // they were added.
-  inline UnknownField* mutable_field(int index);
-
-  // Adding fields ---------------------------------------------------
-
-  void AddVarint(int number, uint64_t value);
-  void AddFixed32(int number, uint32_t value);
-  void AddFixed64(int number, uint64_t value);
-  void AddLengthDelimited(int number, const std::string& value);
-  std::string* AddLengthDelimited(int number);
-  UnknownFieldSet* AddGroup(int number);
-
-  // Adds an unknown field from another set.
-  void AddField(const UnknownField& field);
-
-  // Delete fields with indices in the range [start .. start+num-1].
-  // Caution: implementation moves all fields with indices [start+num .. ].
-  void DeleteSubrange(int start, int num);
-
-  // Delete all fields with a specific field number. The order of left fields
-  // is preserved.
-  // Caution: implementation moves all fields after the first deleted field.
-  void DeleteByNumber(int number);
-
-  // Parsing helpers -------------------------------------------------
-  // These work exactly like the similarly-named methods of Message.
-
-  bool MergeFromCodedStream(io::CodedInputStream* input);
-  bool ParseFromCodedStream(io::CodedInputStream* input);
-  bool ParseFromZeroCopyStream(io::ZeroCopyInputStream* input);
-  bool ParseFromArray(const void* data, int size);
-  inline bool ParseFromString(const std::string& data) {
-    return ParseFromArray(data.data(), static_cast<int>(data.size()));
-  }
-
-  // Merges this message's unknown field data (if any).  This works whether
-  // the message is a lite or full proto (for legacy reasons, lite and full
-  // return different types for MessageType::unknown_fields()).
-  template <typename MessageType>
-  bool MergeFromMessage(const MessageType& message);
-
-  // Serialization.
-  bool SerializeToString(std::string* output) const;
-  bool SerializeToCodedStream(io::CodedOutputStream* output) const;
-  static const UnknownFieldSet& default_instance();
-
- private:
-  // For InternalMergeFrom
-  friend class UnknownField;
-  // Merges from other UnknownFieldSet. This method assumes, that this object
-  // is newly created and has no fields.
-  void InternalMergeFrom(const UnknownFieldSet& other);
-  void ClearFallback();
-
-  template <typename MessageType,
-            typename std::enable_if<
-                std::is_base_of<Message, MessageType>::value, int>::type = 0>
-  bool InternalMergeFromMessage(const MessageType& message) {
-    MergeFrom(message.GetReflection()->GetUnknownFields(message));
-    return true;
-  }
-
-  template <typename MessageType,
-            typename std::enable_if<
-                std::is_base_of<MessageLite, MessageType>::value &&
-                    !std::is_base_of<Message, MessageType>::value,
-                int>::type = 0>
-  bool InternalMergeFromMessage(const MessageType& message) {
-    const auto& unknown_fields = message.unknown_fields();
-    io::ArrayInputStream array_stream(unknown_fields.data(),
-                                      unknown_fields.size());
-    io::CodedInputStream coded_stream(&array_stream);
-    return MergeFromCodedStream(&coded_stream);
-  }
-
-  std::vector<UnknownField> fields_;
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(UnknownFieldSet);
-};
-
-namespace internal {
-
-inline void WriteVarint(uint32_t num, uint64_t val, UnknownFieldSet* unknown) {
-  unknown->AddVarint(num, val);
-}
-inline void WriteLengthDelimited(uint32_t num, StringPiece val,
-                                 UnknownFieldSet* unknown) {
-  unknown->AddLengthDelimited(num)->assign(val.data(), val.size());
-}
-
-PROTOBUF_EXPORT
-const char* UnknownGroupParse(UnknownFieldSet* unknown, const char* ptr,
-                              ParseContext* ctx);
-PROTOBUF_EXPORT
-const char* UnknownFieldParse(uint64_t tag, UnknownFieldSet* unknown,
-                              const char* ptr, ParseContext* ctx);
-
-}  // namespace internal
-
-// Represents one field in an UnknownFieldSet.
-class PROTOBUF_EXPORT UnknownField {
- public:
-  enum Type {
-    TYPE_VARINT,
-    TYPE_FIXED32,
-    TYPE_FIXED64,
-    TYPE_LENGTH_DELIMITED,
-    TYPE_GROUP
-  };
-
-  // The field's field number, as seen on the wire.
-  inline int number() const;
-
-  // The field type.
-  inline Type type() const;
-
-  // Accessors -------------------------------------------------------
-  // Each method works only for UnknownFields of the corresponding type.
-
-  inline uint64_t varint() const;
-  inline uint32_t fixed32() const;
-  inline uint64_t fixed64() const;
-  inline const std::string& length_delimited() const;
-  inline const UnknownFieldSet& group() const;
-
-  inline void set_varint(uint64_t value);
-  inline void set_fixed32(uint32_t value);
-  inline void set_fixed64(uint64_t value);
-  inline void set_length_delimited(const std::string& value);
-  inline std::string* mutable_length_delimited();
-  inline UnknownFieldSet* mutable_group();
-
-  inline size_t GetLengthDelimitedSize() const;
-  uint8_t* InternalSerializeLengthDelimitedNoTag(
-      uint8_t* target, io::EpsCopyOutputStream* stream) const;
-
-
-  // If this UnknownField contains a pointer, delete it.
-  void Delete();
-
-  // Make a deep copy of any pointers in this UnknownField.
-  void DeepCopy(const UnknownField& other);
-
-  // Set the wire type of this UnknownField. Should only be used when this
-  // UnknownField is being created.
-  inline void SetType(Type type);
-
-  union LengthDelimited {
-    std::string* string_value;
-  };
-
-  uint32_t number_;
-  uint32_t type_;
-  union {
-    uint64_t varint_;
-    uint32_t fixed32_;
-    uint64_t fixed64_;
-    mutable union LengthDelimited length_delimited_;
-    UnknownFieldSet* group_;
-  } data_;
-};
-
-// ===================================================================
-// inline implementations
-
-inline UnknownFieldSet::UnknownFieldSet() {}
-
-inline UnknownFieldSet::~UnknownFieldSet() { Clear(); }
-
-inline void UnknownFieldSet::ClearAndFreeMemory() { Clear(); }
-
-inline void UnknownFieldSet::Clear() {
-  if (!fields_.empty()) {
-    ClearFallback();
-  }
-}
-
-inline bool UnknownFieldSet::empty() const { return fields_.empty(); }
-
-inline void UnknownFieldSet::Swap(UnknownFieldSet* x) {
-  fields_.swap(x->fields_);
-}
-
-inline int UnknownFieldSet::field_count() const {
-  return static_cast<int>(fields_.size());
-}
-inline const UnknownField& UnknownFieldSet::field(int index) const {
-  return (fields_)[static_cast<size_t>(index)];
-}
-inline UnknownField* UnknownFieldSet::mutable_field(int index) {
-  return &(fields_)[static_cast<size_t>(index)];
-}
-
-inline void UnknownFieldSet::AddLengthDelimited(int number,
-                                                const std::string& value) {
-  AddLengthDelimited(number)->assign(value);
-}
-
-
-
-
-inline int UnknownField::number() const { return static_cast<int>(number_); }
-inline UnknownField::Type UnknownField::type() const {
-  return static_cast<Type>(type_);
-}
-
-inline uint64_t UnknownField::varint() const {
-  assert(type() == TYPE_VARINT);
-  return data_.varint_;
-}
-inline uint32_t UnknownField::fixed32() const {
-  assert(type() == TYPE_FIXED32);
-  return data_.fixed32_;
-}
-inline uint64_t UnknownField::fixed64() const {
-  assert(type() == TYPE_FIXED64);
-  return data_.fixed64_;
-}
-inline const std::string& UnknownField::length_delimited() const {
-  assert(type() == TYPE_LENGTH_DELIMITED);
-  return *data_.length_delimited_.string_value;
-}
-inline const UnknownFieldSet& UnknownField::group() const {
-  assert(type() == TYPE_GROUP);
-  return *data_.group_;
-}
-
-inline void UnknownField::set_varint(uint64_t value) {
-  assert(type() == TYPE_VARINT);
-  data_.varint_ = value;
-}
-inline void UnknownField::set_fixed32(uint32_t value) {
-  assert(type() == TYPE_FIXED32);
-  data_.fixed32_ = value;
-}
-inline void UnknownField::set_fixed64(uint64_t value) {
-  assert(type() == TYPE_FIXED64);
-  data_.fixed64_ = value;
-}
-inline void UnknownField::set_length_delimited(const std::string& value) {
-  assert(type() == TYPE_LENGTH_DELIMITED);
-  data_.length_delimited_.string_value->assign(value);
-}
-inline std::string* UnknownField::mutable_length_delimited() {
-  assert(type() == TYPE_LENGTH_DELIMITED);
-  return data_.length_delimited_.string_value;
-}
-inline UnknownFieldSet* UnknownField::mutable_group() {
-  assert(type() == TYPE_GROUP);
-  return data_.group_;
-}
-template <typename MessageType>
-bool UnknownFieldSet::MergeFromMessage(const MessageType& message) {
-  // SFINAE will route to the right version.
-  return InternalMergeFromMessage(message);
-}
-
-
-inline size_t UnknownField::GetLengthDelimitedSize() const {
-  GOOGLE_DCHECK_EQ(TYPE_LENGTH_DELIMITED, type());
-  return data_.length_delimited_.string_value->size();
-}
-
-inline void UnknownField::SetType(Type type) {
-  type_ = type;
-}
-
-
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
-#endif  // GOOGLE_PROTOBUF_UNKNOWN_FIELD_SET_H__
diff --git a/libs/protobuf/src/google/protobuf/unknown_field_set_unittest.cc b/libs/protobuf/src/google/protobuf/unknown_field_set_unittest.cc
deleted file mode 100644
index 7f9a598..0000000
--- a/libs/protobuf/src/google/protobuf/unknown_field_set_unittest.cc
+++ /dev/null
@@ -1,685 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-//
-// This test is testing a lot more than just the UnknownFieldSet class.  It
-// tests handling of unknown fields throughout the system.
-
-#include <google/protobuf/unknown_field_set.h>
-
-#include <string>
-#include <unordered_set>
-#include <vector>
-
-#include <google/protobuf/stubs/callback.h>
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/stubs/logging.h>
-#include <google/protobuf/unittest.pb.h>
-#include <google/protobuf/unittest_lite.pb.h>
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/io/zero_copy_stream_impl.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/stubs/mutex.h>
-#include <google/protobuf/text_format.h>
-#include <google/protobuf/wire_format.h>
-#include <gmock/gmock.h>
-#include <google/protobuf/testing/googletest.h>
-#include <gtest/gtest.h>
-#include <google/protobuf/stubs/time.h>
-#include <google/protobuf/test_util.h>
-#include <google/protobuf/stubs/stl_util.h>
-
-namespace google {
-namespace protobuf {
-
-using internal::WireFormat;
-
-class UnknownFieldSetTest : public testing::Test {
- protected:
-  void SetUp() override {
-    descriptor_ = unittest::TestAllTypes::descriptor();
-    TestUtil::SetAllFields(&all_fields_);
-    all_fields_.SerializeToString(&all_fields_data_);
-    ASSERT_TRUE(empty_message_.ParseFromString(all_fields_data_));
-    unknown_fields_ = empty_message_.mutable_unknown_fields();
-  }
-
-  const UnknownField* GetField(const std::string& name) {
-    const FieldDescriptor* field = descriptor_->FindFieldByName(name);
-    if (field == nullptr) return nullptr;
-    for (int i = 0; i < unknown_fields_->field_count(); i++) {
-      if (unknown_fields_->field(i).number() == field->number()) {
-        return &unknown_fields_->field(i);
-      }
-    }
-    return nullptr;
-  }
-
-  // Constructs a protocol buffer which contains fields with all the same
-  // numbers as all_fields_data_ except that each field is some other wire
-  // type.
-  std::string GetBizarroData() {
-    unittest::TestEmptyMessage bizarro_message;
-    UnknownFieldSet* bizarro_unknown_fields =
-        bizarro_message.mutable_unknown_fields();
-    for (int i = 0; i < unknown_fields_->field_count(); i++) {
-      const UnknownField& unknown_field = unknown_fields_->field(i);
-      if (unknown_field.type() == UnknownField::TYPE_VARINT) {
-        bizarro_unknown_fields->AddFixed32(unknown_field.number(), 1);
-      } else {
-        bizarro_unknown_fields->AddVarint(unknown_field.number(), 1);
-      }
-    }
-
-    std::string data;
-    EXPECT_TRUE(bizarro_message.SerializeToString(&data));
-    return data;
-  }
-
-  const Descriptor* descriptor_;
-  unittest::TestAllTypes all_fields_;
-  std::string all_fields_data_;
-
-  // An empty message that has been parsed from all_fields_data_.  So, it has
-  // unknown fields of every type.
-  unittest::TestEmptyMessage empty_message_;
-  UnknownFieldSet* unknown_fields_;
-};
-
-namespace {
-
-TEST_F(UnknownFieldSetTest, AllFieldsPresent) {
-  // Verifies the following:
-  // --all unknown tags belong to TestAllTypes.
-  // --all fields in TestAllTypes is present in UnknownFieldSet except unset
-  //   oneof fields.
-  //
-  // Should handle repeated fields that may appear multiple times in
-  // UnknownFieldSet.
-
-  int non_oneof_count = 0;
-  for (int i = 0; i < descriptor_->field_count(); i++) {
-    if (!descriptor_->field(i)->containing_oneof()) {
-      non_oneof_count++;
-    }
-  }
-
-  std::unordered_set<uint32_t> unknown_tags;
-  for (int i = 0; i < unknown_fields_->field_count(); i++) {
-    unknown_tags.insert(unknown_fields_->field(i).number());
-  }
-
-  for (uint32_t t : unknown_tags) {
-    EXPECT_NE(descriptor_->FindFieldByNumber(t), nullptr);
-  }
-
-  EXPECT_EQ(non_oneof_count + descriptor_->oneof_decl_count(),
-            unknown_tags.size());
-}
-
-TEST_F(UnknownFieldSetTest, Varint) {
-  const UnknownField* field = GetField("optional_int32");
-  ASSERT_TRUE(field != nullptr);
-
-  ASSERT_EQ(UnknownField::TYPE_VARINT, field->type());
-  EXPECT_EQ(all_fields_.optional_int32(), field->varint());
-}
-
-TEST_F(UnknownFieldSetTest, Fixed32) {
-  const UnknownField* field = GetField("optional_fixed32");
-  ASSERT_TRUE(field != nullptr);
-
-  ASSERT_EQ(UnknownField::TYPE_FIXED32, field->type());
-  EXPECT_EQ(all_fields_.optional_fixed32(), field->fixed32());
-}
-
-TEST_F(UnknownFieldSetTest, Fixed64) {
-  const UnknownField* field = GetField("optional_fixed64");
-  ASSERT_TRUE(field != nullptr);
-
-  ASSERT_EQ(UnknownField::TYPE_FIXED64, field->type());
-  EXPECT_EQ(all_fields_.optional_fixed64(), field->fixed64());
-}
-
-TEST_F(UnknownFieldSetTest, LengthDelimited) {
-  const UnknownField* field = GetField("optional_string");
-  ASSERT_TRUE(field != nullptr);
-
-  ASSERT_EQ(UnknownField::TYPE_LENGTH_DELIMITED, field->type());
-  EXPECT_EQ(all_fields_.optional_string(), field->length_delimited());
-}
-
-TEST_F(UnknownFieldSetTest, Group) {
-  const UnknownField* field = GetField("optionalgroup");
-  ASSERT_TRUE(field != nullptr);
-
-  ASSERT_EQ(UnknownField::TYPE_GROUP, field->type());
-  ASSERT_EQ(1, field->group().field_count());
-
-  const UnknownField& nested_field = field->group().field(0);
-  const FieldDescriptor* nested_field_descriptor =
-      unittest::TestAllTypes::OptionalGroup::descriptor()->FindFieldByName("a");
-  ASSERT_TRUE(nested_field_descriptor != nullptr);
-
-  EXPECT_EQ(nested_field_descriptor->number(), nested_field.number());
-  ASSERT_EQ(UnknownField::TYPE_VARINT, nested_field.type());
-  EXPECT_EQ(all_fields_.optionalgroup().a(), nested_field.varint());
-}
-
-TEST_F(UnknownFieldSetTest, SerializeFastAndSlowAreEquivalent) {
-  int size =
-      WireFormat::ComputeUnknownFieldsSize(empty_message_.unknown_fields());
-  std::string slow_buffer;
-  std::string fast_buffer;
-  slow_buffer.resize(size);
-  fast_buffer.resize(size);
-
-  uint8_t* target =
-      reinterpret_cast<uint8_t*>(::google::protobuf::string_as_array(&fast_buffer));
-  uint8_t* result = WireFormat::SerializeUnknownFieldsToArray(
-      empty_message_.unknown_fields(), target);
-  EXPECT_EQ(size, result - target);
-
-  {
-    io::ArrayOutputStream raw_stream(::google::protobuf::string_as_array(&slow_buffer), size,
-                                     1);
-    io::CodedOutputStream output_stream(&raw_stream);
-    WireFormat::SerializeUnknownFields(empty_message_.unknown_fields(),
-                                       &output_stream);
-    ASSERT_FALSE(output_stream.HadError());
-  }
-  EXPECT_TRUE(fast_buffer == slow_buffer);
-}
-
-TEST_F(UnknownFieldSetTest, Serialize) {
-  // Check that serializing the UnknownFieldSet produces the original data
-  // again.
-
-  std::string data;
-  empty_message_.SerializeToString(&data);
-
-  // Don't use EXPECT_EQ because we don't want to dump raw binary data to
-  // stdout.
-  EXPECT_TRUE(data == all_fields_data_);
-}
-
-TEST_F(UnknownFieldSetTest, ParseViaReflection) {
-  // Make sure fields are properly parsed to the UnknownFieldSet when parsing
-  // via reflection.
-
-  unittest::TestEmptyMessage message;
-  io::ArrayInputStream raw_input(all_fields_data_.data(),
-                                 all_fields_data_.size());
-  io::CodedInputStream input(&raw_input);
-  ASSERT_TRUE(WireFormat::ParseAndMergePartial(&input, &message));
-
-  EXPECT_EQ(message.DebugString(), empty_message_.DebugString());
-}
-
-TEST_F(UnknownFieldSetTest, SerializeViaReflection) {
-  // Make sure fields are properly written from the UnknownFieldSet when
-  // serializing via reflection.
-
-  std::string data;
-
-  {
-    io::StringOutputStream raw_output(&data);
-    io::CodedOutputStream output(&raw_output);
-    size_t size = WireFormat::ByteSize(empty_message_);
-    WireFormat::SerializeWithCachedSizes(empty_message_, size, &output);
-    ASSERT_FALSE(output.HadError());
-  }
-
-  // Don't use EXPECT_EQ because we don't want to dump raw binary data to
-  // stdout.
-  EXPECT_TRUE(data == all_fields_data_);
-}
-
-TEST_F(UnknownFieldSetTest, CopyFrom) {
-  unittest::TestEmptyMessage message;
-
-  message.CopyFrom(empty_message_);
-
-  EXPECT_EQ(empty_message_.DebugString(), message.DebugString());
-}
-
-TEST_F(UnknownFieldSetTest, Swap) {
-  unittest::TestEmptyMessage other_message;
-  ASSERT_TRUE(other_message.ParseFromString(GetBizarroData()));
-
-  EXPECT_GT(empty_message_.unknown_fields().field_count(), 0);
-  EXPECT_GT(other_message.unknown_fields().field_count(), 0);
-  const std::string debug_string = empty_message_.DebugString();
-  const std::string other_debug_string = other_message.DebugString();
-  EXPECT_NE(debug_string, other_debug_string);
-
-  empty_message_.Swap(&other_message);
-  EXPECT_EQ(debug_string, other_message.DebugString());
-  EXPECT_EQ(other_debug_string, empty_message_.DebugString());
-}
-
-TEST_F(UnknownFieldSetTest, SwapWithSelf) {
-  const std::string debug_string = empty_message_.DebugString();
-  EXPECT_GT(empty_message_.unknown_fields().field_count(), 0);
-
-  empty_message_.Swap(&empty_message_);
-  EXPECT_GT(empty_message_.unknown_fields().field_count(), 0);
-  EXPECT_EQ(debug_string, empty_message_.DebugString());
-}
-
-TEST_F(UnknownFieldSetTest, MergeFrom) {
-  unittest::TestEmptyMessage source, destination;
-
-  destination.mutable_unknown_fields()->AddVarint(1, 1);
-  destination.mutable_unknown_fields()->AddVarint(3, 2);
-  source.mutable_unknown_fields()->AddVarint(2, 3);
-  source.mutable_unknown_fields()->AddVarint(3, 4);
-
-  destination.MergeFrom(source);
-
-  std::string destination_text;
-  TextFormat::PrintToString(destination, &destination_text);
-  EXPECT_EQ(
-      // Note:  The ordering of fields here depends on the ordering of adds
-      //   and merging, above.
-      "1: 1\n"
-      "3: 2\n"
-      "2: 3\n"
-      "3: 4\n",
-      destination_text);
-}
-
-TEST_F(UnknownFieldSetTest, MergeFromMessage) {
-  unittest::TestEmptyMessage source, destination;
-
-  destination.mutable_unknown_fields()->AddVarint(1, 1);
-  destination.mutable_unknown_fields()->AddVarint(3, 2);
-  source.mutable_unknown_fields()->AddVarint(2, 3);
-  source.mutable_unknown_fields()->AddVarint(3, 4);
-
-  destination.mutable_unknown_fields()->MergeFromMessage(source);
-
-  std::string destination_text;
-  TextFormat::PrintToString(destination, &destination_text);
-  EXPECT_EQ(
-      // Note:  The ordering of fields here depends on the ordering of adds
-      //   and merging, above.
-      "1: 1\n"
-      "3: 2\n"
-      "2: 3\n"
-      "3: 4\n",
-      destination_text);
-}
-
-TEST_F(UnknownFieldSetTest, MergeFromMessageLite) {
-  unittest::TestAllTypesLite source;
-  unittest::TestEmptyMessageLite destination;
-
-  source.set_optional_fixed32(42);
-  destination.ParseFromString(source.SerializeAsString());
-
-  UnknownFieldSet unknown_field_set;
-  EXPECT_TRUE(unknown_field_set.MergeFromMessage(destination));
-  EXPECT_EQ(unknown_field_set.field_count(), 1);
-
-  const UnknownField& unknown_field = unknown_field_set.field(0);
-  EXPECT_EQ(unknown_field.number(), 7);
-  EXPECT_EQ(unknown_field.fixed32(), 42);
-}
-
-
-TEST_F(UnknownFieldSetTest, Clear) {
-  // Clear the set.
-  empty_message_.Clear();
-  EXPECT_EQ(0, unknown_fields_->field_count());
-}
-
-TEST_F(UnknownFieldSetTest, ClearAndFreeMemory) {
-  EXPECT_GT(unknown_fields_->field_count(), 0);
-  unknown_fields_->ClearAndFreeMemory();
-  EXPECT_EQ(0, unknown_fields_->field_count());
-  unknown_fields_->AddVarint(123456, 654321);
-  EXPECT_EQ(1, unknown_fields_->field_count());
-}
-
-TEST_F(UnknownFieldSetTest, ParseKnownAndUnknown) {
-  // Test mixing known and unknown fields when parsing.
-
-  unittest::TestEmptyMessage source;
-  source.mutable_unknown_fields()->AddVarint(123456, 654321);
-  std::string data;
-  ASSERT_TRUE(source.SerializeToString(&data));
-
-  unittest::TestAllTypes destination;
-  ASSERT_TRUE(destination.ParseFromString(all_fields_data_ + data));
-
-  TestUtil::ExpectAllFieldsSet(destination);
-  ASSERT_EQ(1, destination.unknown_fields().field_count());
-  ASSERT_EQ(UnknownField::TYPE_VARINT,
-            destination.unknown_fields().field(0).type());
-  EXPECT_EQ(654321, destination.unknown_fields().field(0).varint());
-}
-
-TEST_F(UnknownFieldSetTest, WrongTypeTreatedAsUnknown) {
-  // Test that fields of the wrong wire type are treated like unknown fields
-  // when parsing.
-
-  unittest::TestAllTypes all_types_message;
-  unittest::TestEmptyMessage empty_message;
-  std::string bizarro_data = GetBizarroData();
-  ASSERT_TRUE(all_types_message.ParseFromString(bizarro_data));
-  ASSERT_TRUE(empty_message.ParseFromString(bizarro_data));
-
-  // All fields should have been interpreted as unknown, so the debug strings
-  // should be the same.
-  EXPECT_EQ(empty_message.DebugString(), all_types_message.DebugString());
-}
-
-TEST_F(UnknownFieldSetTest, WrongTypeTreatedAsUnknownViaReflection) {
-  // Same as WrongTypeTreatedAsUnknown but via the reflection interface.
-
-  unittest::TestAllTypes all_types_message;
-  unittest::TestEmptyMessage empty_message;
-  std::string bizarro_data = GetBizarroData();
-  io::ArrayInputStream raw_input(bizarro_data.data(), bizarro_data.size());
-  io::CodedInputStream input(&raw_input);
-  ASSERT_TRUE(WireFormat::ParseAndMergePartial(&input, &all_types_message));
-  ASSERT_TRUE(empty_message.ParseFromString(bizarro_data));
-
-  EXPECT_EQ(empty_message.DebugString(), all_types_message.DebugString());
-}
-
-TEST_F(UnknownFieldSetTest, UnknownExtensions) {
-  // Make sure fields are properly parsed to the UnknownFieldSet even when
-  // they are declared as extension numbers.
-
-  unittest::TestEmptyMessageWithExtensions message;
-  ASSERT_TRUE(message.ParseFromString(all_fields_data_));
-
-  EXPECT_EQ(message.DebugString(), empty_message_.DebugString());
-}
-
-TEST_F(UnknownFieldSetTest, UnknownExtensionsReflection) {
-  // Same as UnknownExtensions except parsing via reflection.
-
-  unittest::TestEmptyMessageWithExtensions message;
-  io::ArrayInputStream raw_input(all_fields_data_.data(),
-                                 all_fields_data_.size());
-  io::CodedInputStream input(&raw_input);
-  ASSERT_TRUE(WireFormat::ParseAndMergePartial(&input, &message));
-
-  EXPECT_EQ(message.DebugString(), empty_message_.DebugString());
-}
-
-TEST_F(UnknownFieldSetTest, WrongExtensionTypeTreatedAsUnknown) {
-  // Test that fields of the wrong wire type are treated like unknown fields
-  // when parsing extensions.
-
-  unittest::TestAllExtensions all_extensions_message;
-  unittest::TestEmptyMessage empty_message;
-  std::string bizarro_data = GetBizarroData();
-  ASSERT_TRUE(all_extensions_message.ParseFromString(bizarro_data));
-  ASSERT_TRUE(empty_message.ParseFromString(bizarro_data));
-
-  // All fields should have been interpreted as unknown, so the debug strings
-  // should be the same.
-  EXPECT_EQ(empty_message.DebugString(), all_extensions_message.DebugString());
-}
-
-TEST_F(UnknownFieldSetTest, UnknownEnumValue) {
-  using unittest::TestAllExtensions;
-  using unittest::TestAllTypes;
-  using unittest::TestEmptyMessage;
-
-  const FieldDescriptor* singular_field =
-      TestAllTypes::descriptor()->FindFieldByName("optional_nested_enum");
-  const FieldDescriptor* repeated_field =
-      TestAllTypes::descriptor()->FindFieldByName("repeated_nested_enum");
-  ASSERT_TRUE(singular_field != nullptr);
-  ASSERT_TRUE(repeated_field != nullptr);
-
-  std::string data;
-
-  {
-    TestEmptyMessage empty_message;
-    UnknownFieldSet* unknown_fields = empty_message.mutable_unknown_fields();
-    unknown_fields->AddVarint(singular_field->number(), TestAllTypes::BAR);
-    unknown_fields->AddVarint(singular_field->number(), 5);  // not valid
-    unknown_fields->AddVarint(repeated_field->number(), TestAllTypes::FOO);
-    unknown_fields->AddVarint(repeated_field->number(), 4);  // not valid
-    unknown_fields->AddVarint(repeated_field->number(), TestAllTypes::BAZ);
-    unknown_fields->AddVarint(repeated_field->number(), 6);  // not valid
-    empty_message.SerializeToString(&data);
-  }
-
-  {
-    TestAllTypes message;
-    ASSERT_TRUE(message.ParseFromString(data));
-    EXPECT_EQ(TestAllTypes::BAR, message.optional_nested_enum());
-    ASSERT_EQ(2, message.repeated_nested_enum_size());
-    EXPECT_EQ(TestAllTypes::FOO, message.repeated_nested_enum(0));
-    EXPECT_EQ(TestAllTypes::BAZ, message.repeated_nested_enum(1));
-
-    const UnknownFieldSet& unknown_fields = message.unknown_fields();
-    ASSERT_EQ(3, unknown_fields.field_count());
-
-    EXPECT_EQ(singular_field->number(), unknown_fields.field(0).number());
-    ASSERT_EQ(UnknownField::TYPE_VARINT, unknown_fields.field(0).type());
-    EXPECT_EQ(5, unknown_fields.field(0).varint());
-
-    EXPECT_EQ(repeated_field->number(), unknown_fields.field(1).number());
-    ASSERT_EQ(UnknownField::TYPE_VARINT, unknown_fields.field(1).type());
-    EXPECT_EQ(4, unknown_fields.field(1).varint());
-
-    EXPECT_EQ(repeated_field->number(), unknown_fields.field(2).number());
-    ASSERT_EQ(UnknownField::TYPE_VARINT, unknown_fields.field(2).type());
-    EXPECT_EQ(6, unknown_fields.field(2).varint());
-  }
-
-  {
-    using unittest::optional_nested_enum_extension;
-    using unittest::repeated_nested_enum_extension;
-
-    TestAllExtensions message;
-    ASSERT_TRUE(message.ParseFromString(data));
-    EXPECT_EQ(TestAllTypes::BAR,
-              message.GetExtension(optional_nested_enum_extension));
-    ASSERT_EQ(2, message.ExtensionSize(repeated_nested_enum_extension));
-    EXPECT_EQ(TestAllTypes::FOO,
-              message.GetExtension(repeated_nested_enum_extension, 0));
-    EXPECT_EQ(TestAllTypes::BAZ,
-              message.GetExtension(repeated_nested_enum_extension, 1));
-
-    const UnknownFieldSet& unknown_fields = message.unknown_fields();
-    ASSERT_EQ(3, unknown_fields.field_count());
-
-    EXPECT_EQ(singular_field->number(), unknown_fields.field(0).number());
-    ASSERT_EQ(UnknownField::TYPE_VARINT, unknown_fields.field(0).type());
-    EXPECT_EQ(5, unknown_fields.field(0).varint());
-
-    EXPECT_EQ(repeated_field->number(), unknown_fields.field(1).number());
-    ASSERT_EQ(UnknownField::TYPE_VARINT, unknown_fields.field(1).type());
-    EXPECT_EQ(4, unknown_fields.field(1).varint());
-
-    EXPECT_EQ(repeated_field->number(), unknown_fields.field(2).number());
-    ASSERT_EQ(UnknownField::TYPE_VARINT, unknown_fields.field(2).type());
-    EXPECT_EQ(6, unknown_fields.field(2).varint());
-  }
-}
-
-TEST_F(UnknownFieldSetTest, SpaceUsedExcludingSelf) {
-  UnknownFieldSet empty;
-  empty.AddVarint(1, 0);
-  EXPECT_EQ(sizeof(UnknownField), empty.SpaceUsedExcludingSelf());
-}
-
-TEST_F(UnknownFieldSetTest, SpaceUsed) {
-  // Keep shadow vectors to avoid making assumptions about its capacity growth.
-  // We imitate the push back calls here to determine the expected capacity.
-  std::vector<UnknownField> shadow_vector, shadow_vector_group;
-  unittest::TestEmptyMessage empty_message;
-
-  // Make sure an unknown field set has zero space used until a field is
-  // actually added.
-  const size_t base = empty_message.SpaceUsedLong();
-  std::string* str = nullptr;
-  UnknownFieldSet* group = nullptr;
-  const auto total = [&] {
-    size_t result = base;
-    result += shadow_vector.capacity() * sizeof(UnknownField);
-    result += shadow_vector_group.capacity() * sizeof(UnknownField);
-    if (str != nullptr) {
-      result += sizeof(std::string);
-      static const size_t sso_capacity = std::string().capacity();
-      if (str->capacity() > sso_capacity) result += str->capacity();
-    }
-    if (group != nullptr) {
-      result += sizeof(UnknownFieldSet);
-    }
-    return result;
-  };
-
-  UnknownFieldSet* unknown_fields = empty_message.mutable_unknown_fields();
-  EXPECT_EQ(total(), empty_message.SpaceUsedLong());
-
-  // Make sure each thing we add to the set increases the SpaceUsedLong().
-  unknown_fields->AddVarint(1, 0);
-  shadow_vector.emplace_back();
-  EXPECT_EQ(total(), empty_message.SpaceUsedLong()) << "Var";
-
-  str = unknown_fields->AddLengthDelimited(1);
-  shadow_vector.emplace_back();
-  EXPECT_EQ(total(), empty_message.SpaceUsedLong()) << "Str";
-
-  str->assign(sizeof(std::string) + 1, 'x');
-  EXPECT_EQ(total(), empty_message.SpaceUsedLong()) << "Str2";
-
-  group = unknown_fields->AddGroup(1);
-  shadow_vector.emplace_back();
-  EXPECT_EQ(total(), empty_message.SpaceUsedLong()) << "Group";
-
-  group->AddVarint(1, 0);
-  shadow_vector_group.emplace_back();
-  EXPECT_EQ(total(), empty_message.SpaceUsedLong()) << "Group2";
-
-  unknown_fields->AddVarint(1, 0);
-  shadow_vector.emplace_back();
-  EXPECT_EQ(total(), empty_message.SpaceUsedLong()) << "Var2";
-}
-
-
-TEST_F(UnknownFieldSetTest, Empty) {
-  UnknownFieldSet unknown_fields;
-  EXPECT_TRUE(unknown_fields.empty());
-  unknown_fields.AddVarint(6, 123);
-  EXPECT_FALSE(unknown_fields.empty());
-  unknown_fields.Clear();
-  EXPECT_TRUE(unknown_fields.empty());
-}
-
-TEST_F(UnknownFieldSetTest, DeleteSubrange) {
-  // Exhaustively test the deletion of every possible subrange in arrays of all
-  // sizes from 0 through 9.
-  for (int size = 0; size < 10; ++size) {
-    for (int num = 0; num <= size; ++num) {
-      for (int start = 0; start < size - num; ++start) {
-        // Create a set with "size" fields.
-        UnknownFieldSet unknown;
-        for (int i = 0; i < size; ++i) {
-          unknown.AddFixed32(i, i);
-        }
-        // Delete the specified subrange.
-        unknown.DeleteSubrange(start, num);
-        // Make sure the resulting field values are still correct.
-        EXPECT_EQ(size - num, unknown.field_count());
-        for (int i = 0; i < unknown.field_count(); ++i) {
-          if (i < start) {
-            EXPECT_EQ(i, unknown.field(i).fixed32());
-          } else {
-            EXPECT_EQ(i + num, unknown.field(i).fixed32());
-          }
-        }
-      }
-    }
-  }
-}
-
-void CheckDeleteByNumber(const std::vector<int>& field_numbers,
-                         int deleted_number,
-                         const std::vector<int>& expected_field_nubmers) {
-  UnknownFieldSet unknown_fields;
-  for (int i = 0; i < field_numbers.size(); ++i) {
-    unknown_fields.AddFixed32(field_numbers[i], i);
-  }
-  unknown_fields.DeleteByNumber(deleted_number);
-  ASSERT_EQ(expected_field_nubmers.size(), unknown_fields.field_count());
-  for (int i = 0; i < expected_field_nubmers.size(); ++i) {
-    EXPECT_EQ(expected_field_nubmers[i], unknown_fields.field(i).number());
-  }
-}
-
-#define MAKE_VECTOR(x) std::vector<int>(x, x + GOOGLE_ARRAYSIZE(x))
-TEST_F(UnknownFieldSetTest, DeleteByNumber) {
-  CheckDeleteByNumber(std::vector<int>(), 1, std::vector<int>());
-  static const int kTestFieldNumbers1[] = {1, 2, 3};
-  static const int kFieldNumberToDelete1 = 1;
-  static const int kExpectedFieldNumbers1[] = {2, 3};
-  CheckDeleteByNumber(MAKE_VECTOR(kTestFieldNumbers1), kFieldNumberToDelete1,
-                      MAKE_VECTOR(kExpectedFieldNumbers1));
-  static const int kTestFieldNumbers2[] = {1, 2, 3};
-  static const int kFieldNumberToDelete2 = 2;
-  static const int kExpectedFieldNumbers2[] = {1, 3};
-  CheckDeleteByNumber(MAKE_VECTOR(kTestFieldNumbers2), kFieldNumberToDelete2,
-                      MAKE_VECTOR(kExpectedFieldNumbers2));
-  static const int kTestFieldNumbers3[] = {1, 2, 3};
-  static const int kFieldNumberToDelete3 = 3;
-  static const int kExpectedFieldNumbers3[] = {1, 2};
-  CheckDeleteByNumber(MAKE_VECTOR(kTestFieldNumbers3), kFieldNumberToDelete3,
-                      MAKE_VECTOR(kExpectedFieldNumbers3));
-  static const int kTestFieldNumbers4[] = {1, 2, 1, 4, 1};
-  static const int kFieldNumberToDelete4 = 1;
-  static const int kExpectedFieldNumbers4[] = {2, 4};
-  CheckDeleteByNumber(MAKE_VECTOR(kTestFieldNumbers4), kFieldNumberToDelete4,
-                      MAKE_VECTOR(kExpectedFieldNumbers4));
-  static const int kTestFieldNumbers5[] = {1, 2, 3, 4, 5};
-  static const int kFieldNumberToDelete5 = 6;
-  static const int kExpectedFieldNumbers5[] = {1, 2, 3, 4, 5};
-  CheckDeleteByNumber(MAKE_VECTOR(kTestFieldNumbers5), kFieldNumberToDelete5,
-                      MAKE_VECTOR(kExpectedFieldNumbers5));
-}
-#undef MAKE_VECTOR
-
-}  // namespace
-
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/util/delimited_message_util.cc b/libs/protobuf/src/google/protobuf/util/delimited_message_util.cc
deleted file mode 100644
index fdc633f..0000000
--- a/libs/protobuf/src/google/protobuf/util/delimited_message_util.cc
+++ /dev/null
@@ -1,128 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Adapted from the patch of kenton@google.com (Kenton Varda)
-// See https://github.com/protocolbuffers/protobuf/pull/710 for details.
-
-#include <google/protobuf/util/delimited_message_util.h>
-#include <google/protobuf/io/coded_stream.h>
-
-namespace google {
-namespace protobuf {
-namespace util {
-
-bool SerializeDelimitedToFileDescriptor(const MessageLite& message,
-                                        int file_descriptor) {
-  io::FileOutputStream output(file_descriptor);
-  return SerializeDelimitedToZeroCopyStream(message, &output);
-}
-
-bool SerializeDelimitedToOstream(const MessageLite& message,
-                                 std::ostream* output) {
-  {
-    io::OstreamOutputStream zero_copy_output(output);
-    if (!SerializeDelimitedToZeroCopyStream(message, &zero_copy_output))
-      return false;
-  }
-  return output->good();
-}
-
-bool ParseDelimitedFromZeroCopyStream(MessageLite* message,
-                                      io::ZeroCopyInputStream* input,
-                                      bool* clean_eof) {
-  io::CodedInputStream coded_input(input);
-  return ParseDelimitedFromCodedStream(message, &coded_input, clean_eof);
-}
-
-bool ParseDelimitedFromCodedStream(MessageLite* message,
-                                   io::CodedInputStream* input,
-                                   bool* clean_eof) {
-  if (clean_eof != nullptr) *clean_eof = false;
-  int start = input->CurrentPosition();
-
-  // Read the size.
-  uint32_t size;
-  if (!input->ReadVarint32(&size)) {
-    if (clean_eof != nullptr) *clean_eof = input->CurrentPosition() == start;
-    return false;
-  }
-
-  // Get the position after any size bytes have been read (and only the message
-  // itself remains).
-  int position_after_size = input->CurrentPosition();
-
-  // Tell the stream not to read beyond that size.
-  io::CodedInputStream::Limit limit = input->PushLimit(static_cast<int>(size));
-
-  // Parse the message.
-  if (!message->MergeFromCodedStream(input)) return false;
-  if (!input->ConsumedEntireMessage()) return false;
-  if (input->CurrentPosition() - position_after_size != static_cast<int>(size))
-    return false;
-
-  // Release the limit.
-  input->PopLimit(limit);
-
-  return true;
-}
-
-bool SerializeDelimitedToZeroCopyStream(const MessageLite& message,
-                                        io::ZeroCopyOutputStream* output) {
-  io::CodedOutputStream coded_output(output);
-  return SerializeDelimitedToCodedStream(message, &coded_output);
-}
-
-bool SerializeDelimitedToCodedStream(const MessageLite& message,
-                                     io::CodedOutputStream* output) {
-  // Write the size.
-  size_t size = message.ByteSizeLong();
-  if (size > INT_MAX) return false;
-
-  output->WriteVarint32(static_cast<uint32_t>(size));
-
-  // Write the content.
-  uint8_t* buffer =
-      output->GetDirectBufferForNBytesAndAdvance(static_cast<int>(size));
-  if (buffer != nullptr) {
-    // Optimization: The message fits in one buffer, so use the faster
-    // direct-to-array serialization path.
-    message.SerializeWithCachedSizesToArray(buffer);
-  } else {
-    // Slightly-slower path when the message is multiple buffers.
-    message.SerializeWithCachedSizes(output);
-    if (output->HadError()) return false;
-  }
-
-  return true;
-}
-
-}  // namespace util
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/util/delimited_message_util.h b/libs/protobuf/src/google/protobuf/util/delimited_message_util.h
deleted file mode 100644
index 78625cf..0000000
--- a/libs/protobuf/src/google/protobuf/util/delimited_message_util.h
+++ /dev/null
@@ -1,109 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Adapted from the patch of kenton@google.com (Kenton Varda)
-// See https://github.com/protocolbuffers/protobuf/pull/710 for details.
-
-#ifndef GOOGLE_PROTOBUF_UTIL_DELIMITED_MESSAGE_UTIL_H__
-#define GOOGLE_PROTOBUF_UTIL_DELIMITED_MESSAGE_UTIL_H__
-
-
-#include <ostream>
-
-#include <google/protobuf/message_lite.h>
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/io/zero_copy_stream_impl.h>
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-namespace util {
-
-// Write a single size-delimited message from the given stream. Delimited
-// format allows a single file or stream to contain multiple messages,
-// whereas normally writing multiple non-delimited messages to the same
-// stream would cause them to be merged. A delimited message is a varint
-// encoding the message size followed by a message of exactly that size.
-//
-// Note that if you want to *read* a delimited message from a file descriptor
-// or istream, you will need to construct an io::FileInputStream or
-// io::OstreamInputStream (implementations of io::ZeroCopyStream) and use the
-// utility function ParseDelimitedFromZeroCopyStream(). You must then
-// continue to use the same ZeroCopyInputStream to read all further data from
-// the stream until EOF. This is because these ZeroCopyInputStream
-// implementations are buffered: they read a big chunk of data at a time,
-// then parse it. As a result, they may read past the end of the delimited
-// message. There is no way for them to push the extra data back into the
-// underlying source, so instead you must keep using the same stream object.
-bool PROTOBUF_EXPORT SerializeDelimitedToFileDescriptor(
-    const MessageLite& message, int file_descriptor);
-
-bool PROTOBUF_EXPORT SerializeDelimitedToOstream(const MessageLite& message,
-                                                 std::ostream* output);
-
-// Read a single size-delimited message from the given stream. Delimited
-// format allows a single file or stream to contain multiple messages,
-// whereas normally parsing consumes the entire input. A delimited message
-// is a varint encoding the message size followed by a message of exactly
-// that size.
-//
-// If |clean_eof| is not NULL, then it will be set to indicate whether the
-// stream ended cleanly. That is, if the stream ends without this method
-// having read any data at all from it, then *clean_eof will be set true,
-// otherwise it will be set false. Note that these methods return false
-// on EOF, but they also return false on other errors, so |clean_eof| is
-// needed to distinguish a clean end from errors.
-bool PROTOBUF_EXPORT ParseDelimitedFromZeroCopyStream(
-    MessageLite* message, io::ZeroCopyInputStream* input, bool* clean_eof);
-
-bool PROTOBUF_EXPORT ParseDelimitedFromCodedStream(MessageLite* message,
-                                                   io::CodedInputStream* input,
-                                                   bool* clean_eof);
-
-// Write a single size-delimited message from the given stream. Delimited
-// format allows a single file or stream to contain multiple messages,
-// whereas normally writing multiple non-delimited messages to the same
-// stream would cause them to be merged. A delimited message is a varint
-// encoding the message size followed by a message of exactly that size.
-bool PROTOBUF_EXPORT SerializeDelimitedToZeroCopyStream(
-    const MessageLite& message, io::ZeroCopyOutputStream* output);
-
-bool PROTOBUF_EXPORT SerializeDelimitedToCodedStream(
-    const MessageLite& message, io::CodedOutputStream* output);
-
-}  // namespace util
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
-
-#endif  // GOOGLE_PROTOBUF_UTIL_DELIMITED_MESSAGE_UTIL_H__
diff --git a/libs/protobuf/src/google/protobuf/util/delimited_message_util_test.cc b/libs/protobuf/src/google/protobuf/util/delimited_message_util_test.cc
deleted file mode 100644
index 9483a64..0000000
--- a/libs/protobuf/src/google/protobuf/util/delimited_message_util_test.cc
+++ /dev/null
@@ -1,116 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Adapted from the patch of kenton@google.com (Kenton Varda)
-// See https://github.com/protocolbuffers/protobuf/pull/710 for details.
-
-#include <google/protobuf/util/delimited_message_util.h>
-
-#include <sstream>
-
-#include <google/protobuf/test_util.h>
-#include <google/protobuf/unittest.pb.h>
-#include <google/protobuf/testing/googletest.h>
-#include <gtest/gtest.h>
-
-namespace google {
-namespace protobuf {
-namespace util {
-
-TEST(DelimitedMessageUtilTest, DelimitedMessages) {
-  std::stringstream stream;
-
-  {
-    protobuf_unittest::TestAllTypes message1;
-    TestUtil::SetAllFields(&message1);
-    EXPECT_TRUE(SerializeDelimitedToOstream(message1, &stream));
-
-    protobuf_unittest::TestPackedTypes message2;
-    TestUtil::SetPackedFields(&message2);
-    EXPECT_TRUE(SerializeDelimitedToOstream(message2, &stream));
-  }
-
-  {
-    bool clean_eof;
-    io::IstreamInputStream zstream(&stream);
-
-    protobuf_unittest::TestAllTypes message1;
-    clean_eof = true;
-    EXPECT_TRUE(ParseDelimitedFromZeroCopyStream(&message1,
-        &zstream, &clean_eof));
-    EXPECT_FALSE(clean_eof);
-    TestUtil::ExpectAllFieldsSet(message1);
-
-    protobuf_unittest::TestPackedTypes message2;
-    clean_eof = true;
-    EXPECT_TRUE(ParseDelimitedFromZeroCopyStream(&message2,
-        &zstream, &clean_eof));
-    EXPECT_FALSE(clean_eof);
-    TestUtil::ExpectPackedFieldsSet(message2);
-
-    clean_eof = false;
-    EXPECT_FALSE(ParseDelimitedFromZeroCopyStream(&message2,
-        &zstream, &clean_eof));
-    EXPECT_TRUE(clean_eof);
-  }
-}
-
-TEST(DelimitedMessageUtilTest, FailsAtEndOfStream) {
-  std::stringstream full_stream;
-  std::stringstream partial_stream;
-
-  {
-    protobuf_unittest::ForeignMessage message;
-    message.set_c(42);
-    message.set_d(24);
-    EXPECT_TRUE(SerializeDelimitedToOstream(message, &full_stream));
-
-    std::string full_output = full_stream.str();
-    ASSERT_GT(full_output.size(), size_t{2});
-    ASSERT_EQ(full_output[0], 4);
-
-    partial_stream << full_output[0] << full_output[1] << full_output[2];
-  }
-
-  {
-    bool clean_eof;
-    io::IstreamInputStream zstream(&partial_stream);
-
-    protobuf_unittest::ForeignMessage message;
-    clean_eof = true;
-    EXPECT_FALSE(ParseDelimitedFromZeroCopyStream(&message,
-        &zstream, &clean_eof));
-    EXPECT_FALSE(clean_eof);
-  }
-}
-
-}  // namespace util
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/util/field_comparator.cc b/libs/protobuf/src/google/protobuf/util/field_comparator.cc
deleted file mode 100644
index 5d8e865..0000000
--- a/libs/protobuf/src/google/protobuf/util/field_comparator.cc
+++ /dev/null
@@ -1,210 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: ksroka@google.com (Krzysztof Sroka)
-
-#include <google/protobuf/util/field_comparator.h>
-
-#include <limits>
-#include <string>
-
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/message.h>
-#include <google/protobuf/util/message_differencer.h>
-#include <google/protobuf/stubs/map_util.h>
-#include <google/protobuf/stubs/mathutil.h>
-
-namespace google {
-namespace protobuf {
-namespace util {
-
-FieldComparator::FieldComparator() {}
-FieldComparator::~FieldComparator() {}
-
-SimpleFieldComparator::SimpleFieldComparator()
-    : float_comparison_(EXACT),
-      treat_nan_as_equal_(false),
-      has_default_tolerance_(false) {}
-
-SimpleFieldComparator::~SimpleFieldComparator() {}
-
-FieldComparator::ComparisonResult SimpleFieldComparator::SimpleCompare(
-    const Message& message_1, const Message& message_2,
-    const FieldDescriptor* field, int index_1, int index_2,
-    const util::FieldContext* /*field_context*/) {
-  const Reflection* reflection_1 = message_1.GetReflection();
-  const Reflection* reflection_2 = message_2.GetReflection();
-
-  switch (field->cpp_type()) {
-#define COMPARE_FIELD(METHOD)                                                 \
-  if (field->is_repeated()) {                                                 \
-    return ResultFromBoolean(Compare##METHOD(                                 \
-        *field, reflection_1->GetRepeated##METHOD(message_1, field, index_1), \
-        reflection_2->GetRepeated##METHOD(message_2, field, index_2)));       \
-  } else {                                                                    \
-    return ResultFromBoolean(                                                 \
-        Compare##METHOD(*field, reflection_1->Get##METHOD(message_1, field),  \
-                        reflection_2->Get##METHOD(message_2, field)));        \
-  }                                                                           \
-  break;  // Make sure no fall-through is introduced.
-
-    case FieldDescriptor::CPPTYPE_BOOL:
-      COMPARE_FIELD(Bool);
-    case FieldDescriptor::CPPTYPE_DOUBLE:
-      COMPARE_FIELD(Double);
-    case FieldDescriptor::CPPTYPE_ENUM:
-      COMPARE_FIELD(Enum);
-    case FieldDescriptor::CPPTYPE_FLOAT:
-      COMPARE_FIELD(Float);
-    case FieldDescriptor::CPPTYPE_INT32:
-      COMPARE_FIELD(Int32);
-    case FieldDescriptor::CPPTYPE_INT64:
-      COMPARE_FIELD(Int64);
-    case FieldDescriptor::CPPTYPE_STRING:
-      if (field->is_repeated()) {
-        // Allocate scratch strings to store the result if a conversion is
-        // needed.
-        std::string scratch1;
-        std::string scratch2;
-        return ResultFromBoolean(
-            CompareString(*field,
-                          reflection_1->GetRepeatedStringReference(
-                              message_1, field, index_1, &scratch1),
-                          reflection_2->GetRepeatedStringReference(
-                              message_2, field, index_2, &scratch2)));
-      } else {
-        // Allocate scratch strings to store the result if a conversion is
-        // needed.
-        std::string scratch1;
-        std::string scratch2;
-        return ResultFromBoolean(CompareString(
-            *field,
-            reflection_1->GetStringReference(message_1, field, &scratch1),
-            reflection_2->GetStringReference(message_2, field, &scratch2)));
-      }
-      break;
-    case FieldDescriptor::CPPTYPE_UINT32:
-      COMPARE_FIELD(UInt32);
-    case FieldDescriptor::CPPTYPE_UINT64:
-      COMPARE_FIELD(UInt64);
-
-#undef COMPARE_FIELD
-
-    case FieldDescriptor::CPPTYPE_MESSAGE:
-      return RECURSE;
-
-    default:
-      GOOGLE_LOG(FATAL) << "No comparison code for field " << field->full_name()
-                 << " of CppType = " << field->cpp_type();
-      return DIFFERENT;
-  }
-}
-
-bool SimpleFieldComparator::CompareWithDifferencer(
-    MessageDifferencer* differencer, const Message& message1,
-    const Message& message2, const util::FieldContext* field_context) {
-  return differencer->Compare(message1, message2,
-                              field_context->parent_fields());
-}
-
-void SimpleFieldComparator::SetDefaultFractionAndMargin(double fraction,
-                                                        double margin) {
-  default_tolerance_ = Tolerance(fraction, margin);
-  has_default_tolerance_ = true;
-}
-
-void SimpleFieldComparator::SetFractionAndMargin(const FieldDescriptor* field,
-                                                 double fraction,
-                                                 double margin) {
-  GOOGLE_CHECK(FieldDescriptor::CPPTYPE_FLOAT == field->cpp_type() ||
-        FieldDescriptor::CPPTYPE_DOUBLE == field->cpp_type())
-      << "Field has to be float or double type. Field name is: "
-      << field->full_name();
-  map_tolerance_[field] = Tolerance(fraction, margin);
-}
-
-bool SimpleFieldComparator::CompareDouble(const FieldDescriptor& field,
-                                          double value_1, double value_2) {
-  return CompareDoubleOrFloat(field, value_1, value_2);
-}
-
-bool SimpleFieldComparator::CompareEnum(const FieldDescriptor& /*field*/,
-                                        const EnumValueDescriptor* value_1,
-                                        const EnumValueDescriptor* value_2) {
-  return value_1->number() == value_2->number();
-}
-
-bool SimpleFieldComparator::CompareFloat(const FieldDescriptor& field,
-                                         float value_1, float value_2) {
-  return CompareDoubleOrFloat(field, value_1, value_2);
-}
-
-template <typename T>
-bool SimpleFieldComparator::CompareDoubleOrFloat(const FieldDescriptor& field,
-                                                 T value_1, T value_2) {
-  if (value_1 == value_2) {
-    // Covers +inf and -inf (which are not within margin or fraction of
-    // themselves), and is a shortcut for finite values.
-    return true;
-  } else if (float_comparison_ == EXACT) {
-    if (treat_nan_as_equal_ && std::isnan(value_1) && std::isnan(value_2)) {
-      return true;
-    }
-    return false;
-  } else {
-    if (treat_nan_as_equal_ && std::isnan(value_1) && std::isnan(value_2)) {
-      return true;
-    }
-    // float_comparison_ == APPROXIMATE covers two use cases.
-    Tolerance* tolerance = FindOrNull(map_tolerance_, &field);
-    if (tolerance == NULL && has_default_tolerance_) {
-      tolerance = &default_tolerance_;
-    }
-    if (tolerance == NULL) {
-      return MathUtil::AlmostEquals(value_1, value_2);
-    } else {
-      // Use user-provided fraction and margin. Since they are stored as
-      // doubles, we explicitly cast them to types of values provided. This
-      // is very likely to fail if provided values are not numeric.
-      return MathUtil::WithinFractionOrMargin(
-          value_1, value_2, static_cast<T>(tolerance->fraction),
-          static_cast<T>(tolerance->margin));
-    }
-  }
-}
-
-FieldComparator::ComparisonResult SimpleFieldComparator::ResultFromBoolean(
-    bool boolean_result) const {
-  return boolean_result ? FieldComparator::SAME : FieldComparator::DIFFERENT;
-}
-
-}  // namespace util
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/util/field_comparator.h b/libs/protobuf/src/google/protobuf/util/field_comparator.h
deleted file mode 100644
index 5706da3..0000000
--- a/libs/protobuf/src/google/protobuf/util/field_comparator.h
+++ /dev/null
@@ -1,288 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Defines classes for field comparison.
-
-#ifndef GOOGLE_PROTOBUF_UTIL_FIELD_COMPARATOR_H__
-#define GOOGLE_PROTOBUF_UTIL_FIELD_COMPARATOR_H__
-
-
-#include <cstdint>
-#include <map>
-#include <string>
-#include <vector>
-
-#include <google/protobuf/stubs/common.h>
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-
-class Message;
-class EnumValueDescriptor;
-class FieldDescriptor;
-
-namespace util {
-
-class FieldContext;
-class MessageDifferencer;
-
-// Base class specifying the interface for comparing protocol buffer fields.
-// Regular users should consider using or subclassing DefaultFieldComparator
-// rather than this interface.
-// Currently, this does not support comparing unknown fields.
-class PROTOBUF_EXPORT FieldComparator {
- public:
-  FieldComparator();
-  virtual ~FieldComparator();
-
-  enum ComparisonResult {
-    SAME,       // Compared fields are equal. In case of comparing submessages,
-                // user should not recursively compare their contents.
-    DIFFERENT,  // Compared fields are different. In case of comparing
-                // submessages, user should not recursively compare their
-                // contents.
-    RECURSE,    // Compared submessages need to be compared recursively.
-                // FieldComparator does not specify the semantics of recursive
-                // comparison. This value should not be returned for simple
-                // values.
-  };
-
-  // Compares the values of a field in two protocol buffer messages.
-  // Returns SAME or DIFFERENT for simple values, and SAME, DIFFERENT or RECURSE
-  // for submessages. Returning RECURSE for fields not being submessages is
-  // illegal.
-  // In case the given FieldDescriptor points to a repeated field, the indices
-  // need to be valid. Otherwise they should be ignored.
-  //
-  // FieldContext contains information about the specific instances of the
-  // fields being compared, versus FieldDescriptor which only contains general
-  // type information about the fields.
-  virtual ComparisonResult Compare(const Message& message_1,
-                                   const Message& message_2,
-                                   const FieldDescriptor* field, int index_1,
-                                   int index_2,
-                                   const util::FieldContext* field_context) = 0;
-
- private:
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(FieldComparator);
-};
-
-// Basic implementation of FieldComparator.  Supports three modes of floating
-// point value comparison: exact, approximate using MathUtil::AlmostEqual
-// method, and arbitrarily precise using MathUtil::WithinFractionOrMargin.
-class PROTOBUF_EXPORT SimpleFieldComparator : public FieldComparator {
- public:
-  enum FloatComparison {
-    EXACT,        // Floats and doubles are compared exactly.
-    APPROXIMATE,  // Floats and doubles are compared using the
-                  // MathUtil::AlmostEqual method or
-                  // MathUtil::WithinFractionOrMargin method.
-    // TODO(ksroka): Introduce third value to differentiate uses of AlmostEqual
-    //               and WithinFractionOrMargin.
-  };
-
-  // Creates new comparator with float comparison set to EXACT.
-  SimpleFieldComparator();
-
-  ~SimpleFieldComparator() override;
-
-  void set_float_comparison(FloatComparison float_comparison) {
-    float_comparison_ = float_comparison;
-  }
-
-  FloatComparison float_comparison() const { return float_comparison_; }
-
-  // Set whether the FieldComparator shall treat floats or doubles that are both
-  // NaN as equal (treat_nan_as_equal = true) or as different
-  // (treat_nan_as_equal = false). Default is treating NaNs always as different.
-  void set_treat_nan_as_equal(bool treat_nan_as_equal) {
-    treat_nan_as_equal_ = treat_nan_as_equal;
-  }
-
-  bool treat_nan_as_equal() const { return treat_nan_as_equal_; }
-
-  // Sets the fraction and margin for the float comparison of a given field.
-  // Uses MathUtil::WithinFractionOrMargin to compare the values.
-  //
-  // REQUIRES: field->cpp_type == FieldDescriptor::CPPTYPE_DOUBLE or
-  //           field->cpp_type == FieldDescriptor::CPPTYPE_FLOAT
-  // REQUIRES: float_comparison_ == APPROXIMATE
-  void SetFractionAndMargin(const FieldDescriptor* field, double fraction,
-                            double margin);
-
-  // Sets the fraction and margin for the float comparison of all float and
-  // double fields, unless a field has been given a specific setting via
-  // SetFractionAndMargin() above.
-  // Uses MathUtil::WithinFractionOrMargin to compare the values.
-  //
-  // REQUIRES: float_comparison_ == APPROXIMATE
-  void SetDefaultFractionAndMargin(double fraction, double margin);
-
- protected:
-  // Returns the comparison result for the given field in two messages.
-  //
-  // This function is called directly by DefaultFieldComparator::Compare.
-  // Subclasses can call this function to compare fields they do not need to
-  // handle specially.
-  ComparisonResult SimpleCompare(const Message& message_1,
-                                 const Message& message_2,
-                                 const FieldDescriptor* field, int index_1,
-                                 int index_2,
-                                 const util::FieldContext* field_context);
-
-  // Compare using the provided message_differencer. For example, a subclass can
-  // use this method to compare some field in a certain way using the same
-  // message_differencer instance and the field context.
-  bool CompareWithDifferencer(MessageDifferencer* differencer,
-                              const Message& message1, const Message& message2,
-                              const util::FieldContext* field_context);
-
-  // Returns FieldComparator::SAME if boolean_result is true and
-  // FieldComparator::DIFFERENT otherwise.
-  ComparisonResult ResultFromBoolean(bool boolean_result) const;
-
- private:
-  // Defines the tolerance for floating point comparison (fraction and margin).
-  struct Tolerance {
-    double fraction;
-    double margin;
-    Tolerance() : fraction(0.0), margin(0.0) {}
-    Tolerance(double f, double m) : fraction(f), margin(m) {}
-  };
-
-  // Defines the map to store the tolerances for floating point comparison.
-  typedef std::map<const FieldDescriptor*, Tolerance> ToleranceMap;
-
-  friend class MessageDifferencer;
-  // The following methods get executed when CompareFields is called for the
-  // basic types (instead of submessages). They return true on success. One
-  // can use ResultFromBoolean() to convert that boolean to a ComparisonResult
-  // value.
-  bool CompareBool(const FieldDescriptor& /* unused */, bool value_1,
-                   bool value_2) {
-    return value_1 == value_2;
-  }
-
-  // Uses CompareDoubleOrFloat, a helper function used by both CompareDouble and
-  // CompareFloat.
-  bool CompareDouble(const FieldDescriptor& field, double value_1,
-                     double value_2);
-
-  bool CompareEnum(const FieldDescriptor& field,
-                   const EnumValueDescriptor* value_1,
-                   const EnumValueDescriptor* value_2);
-
-  // Uses CompareDoubleOrFloat, a helper function used by both CompareDouble and
-  // CompareFloat.
-  bool CompareFloat(const FieldDescriptor& field, float value_1, float value_2);
-
-  bool CompareInt32(const FieldDescriptor& /* unused */, int32_t value_1,
-                    int32_t value_2) {
-    return value_1 == value_2;
-  }
-
-  bool CompareInt64(const FieldDescriptor& /* unused */, int64_t value_1,
-                    int64_t value_2) {
-    return value_1 == value_2;
-  }
-
-  bool CompareString(const FieldDescriptor& /* unused */,
-                     const std::string& value_1, const std::string& value_2) {
-    return value_1 == value_2;
-  }
-
-  bool CompareUInt32(const FieldDescriptor& /* unused */, uint32_t value_1,
-                     uint32_t value_2) {
-    return value_1 == value_2;
-  }
-
-  bool CompareUInt64(const FieldDescriptor& /* unused */, uint64_t value_1,
-                     uint64_t value_2) {
-    return value_1 == value_2;
-  }
-
-  // This function is used by CompareDouble and CompareFloat to avoid code
-  // duplication. There are no checks done against types of the values passed,
-  // but it's likely to fail if passed non-numeric arguments.
-  template <typename T>
-  bool CompareDoubleOrFloat(const FieldDescriptor& field, T value_1, T value_2);
-
-  FloatComparison float_comparison_;
-
-  // If true, floats and doubles that are both NaN are considered to be
-  // equal. Otherwise, two floats or doubles that are NaN are considered to be
-  // different.
-  bool treat_nan_as_equal_;
-
-  // True iff default_tolerance_ has been explicitly set.
-  //
-  // If false, then the default tolerance for floats and doubles is that which
-  // is used by MathUtil::AlmostEquals().
-  bool has_default_tolerance_;
-
-  // Default float/double tolerance. Only meaningful if
-  // has_default_tolerance_ == true.
-  Tolerance default_tolerance_;
-
-  // Field-specific float/double tolerances, which override any default for
-  // those particular fields.
-  ToleranceMap map_tolerance_;
-
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(SimpleFieldComparator);
-};
-
-// Default field comparison: use the basic implementation of FieldComparator.
-#ifdef PROTOBUF_FUTURE_BREAKING_CHANGES
-class PROTOBUF_EXPORT DefaultFieldComparator final
-    : public SimpleFieldComparator
-#else   // PROTOBUF_FUTURE_BREAKING_CHANGES
-class PROTOBUF_EXPORT DefaultFieldComparator : public SimpleFieldComparator
-#endif  // PROTOBUF_FUTURE_BREAKING_CHANGES
-{
- public:
-  ComparisonResult Compare(const Message& message_1, const Message& message_2,
-                           const FieldDescriptor* field, int index_1,
-                           int index_2,
-                           const util::FieldContext* field_context) override {
-    return SimpleCompare(message_1, message_2, field, index_1, index_2,
-                         field_context);
-  }
-};
-
-}  // namespace util
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
-
-#endif  // GOOGLE_PROTOBUF_UTIL_FIELD_COMPARATOR_H__
diff --git a/libs/protobuf/src/google/protobuf/util/field_comparator_test.cc b/libs/protobuf/src/google/protobuf/util/field_comparator_test.cc
deleted file mode 100644
index b680277..0000000
--- a/libs/protobuf/src/google/protobuf/util/field_comparator_test.cc
+++ /dev/null
@@ -1,505 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: ksroka@google.com (Krzysztof Sroka)
-
-#include <google/protobuf/util/field_comparator.h>
-
-#include <limits>
-
-#include <google/protobuf/unittest.pb.h>
-#include <google/protobuf/descriptor.h>
-#include <gtest/gtest.h>
-#include <google/protobuf/stubs/mathutil.h>
-
-namespace google {
-namespace protobuf {
-namespace util {
-namespace {
-
-using protobuf_unittest::TestAllTypes;
-
-class DefaultFieldComparatorTest : public ::testing::Test {
- protected:
-  void SetUp() override { descriptor_ = TestAllTypes::descriptor(); }
-
-  const Descriptor* descriptor_;
-  DefaultFieldComparator comparator_;
-  TestAllTypes message_1_;
-  TestAllTypes message_2_;
-};
-
-TEST_F(DefaultFieldComparatorTest, RecursesIntoGroup) {
-  const FieldDescriptor* field = descriptor_->FindFieldByName("optionalgroup");
-  EXPECT_EQ(
-      FieldComparator::RECURSE,
-      comparator_.Compare(message_1_, message_2_, field, -1, -1, nullptr));
-}
-
-TEST_F(DefaultFieldComparatorTest, RecursesIntoNestedMessage) {
-  const FieldDescriptor* field =
-      descriptor_->FindFieldByName("optional_nested_message");
-  EXPECT_EQ(
-      FieldComparator::RECURSE,
-      comparator_.Compare(message_1_, message_2_, field, -1, -1, nullptr));
-}
-
-TEST_F(DefaultFieldComparatorTest, RecursesIntoForeignMessage) {
-  const FieldDescriptor* field =
-      descriptor_->FindFieldByName("optional_foreign_message");
-  EXPECT_EQ(
-      FieldComparator::RECURSE,
-      comparator_.Compare(message_1_, message_2_, field, -1, -1, nullptr));
-}
-
-TEST_F(DefaultFieldComparatorTest, Int32Comparison) {
-  const FieldDescriptor* field = descriptor_->FindFieldByName("optional_int32");
-  message_1_.set_optional_int32(1);
-  message_2_.set_optional_int32(1);
-
-  EXPECT_EQ(FieldComparator::SAME, comparator_.Compare(message_1_, message_2_,
-                                                       field, -1, -1, nullptr));
-
-  message_2_.set_optional_int32(-1);
-  EXPECT_EQ(
-      FieldComparator::DIFFERENT,
-      comparator_.Compare(message_1_, message_2_, field, -1, -1, nullptr));
-}
-
-TEST_F(DefaultFieldComparatorTest, Int64Comparison) {
-  const FieldDescriptor* field = descriptor_->FindFieldByName("optional_int64");
-  message_1_.set_optional_int64(1L);
-  message_2_.set_optional_int64(1L);
-
-  EXPECT_EQ(FieldComparator::SAME, comparator_.Compare(message_1_, message_2_,
-                                                       field, -1, -1, nullptr));
-
-  message_2_.set_optional_int64(-1L);
-  EXPECT_EQ(
-      FieldComparator::DIFFERENT,
-      comparator_.Compare(message_1_, message_2_, field, -1, -1, nullptr));
-}
-
-TEST_F(DefaultFieldComparatorTest, UInt32Comparison) {
-  const FieldDescriptor* field =
-      descriptor_->FindFieldByName("optional_uint32");
-  message_1_.set_optional_uint32(1);
-  message_2_.set_optional_uint32(1);
-
-  EXPECT_EQ(FieldComparator::SAME, comparator_.Compare(message_1_, message_2_,
-                                                       field, -1, -1, nullptr));
-
-  message_2_.set_optional_uint32(2);
-  EXPECT_EQ(
-      FieldComparator::DIFFERENT,
-      comparator_.Compare(message_1_, message_2_, field, -1, -1, nullptr));
-}
-
-TEST_F(DefaultFieldComparatorTest, UInt64Comparison) {
-  const FieldDescriptor* field =
-      descriptor_->FindFieldByName("optional_uint64");
-  message_1_.set_optional_uint64(1L);
-  message_2_.set_optional_uint64(1L);
-
-  EXPECT_EQ(FieldComparator::SAME, comparator_.Compare(message_1_, message_2_,
-                                                       field, -1, -1, nullptr));
-
-  message_2_.set_optional_uint64(2L);
-  EXPECT_EQ(
-      FieldComparator::DIFFERENT,
-      comparator_.Compare(message_1_, message_2_, field, -1, -1, nullptr));
-}
-
-TEST_F(DefaultFieldComparatorTest, BooleanComparison) {
-  const FieldDescriptor* field = descriptor_->FindFieldByName("optional_bool");
-  message_1_.set_optional_bool(true);
-  message_2_.set_optional_bool(true);
-
-  EXPECT_EQ(FieldComparator::SAME, comparator_.Compare(message_1_, message_2_,
-                                                       field, -1, -1, nullptr));
-
-  message_2_.set_optional_bool(false);
-  EXPECT_EQ(
-      FieldComparator::DIFFERENT,
-      comparator_.Compare(message_1_, message_2_, field, -1, -1, nullptr));
-}
-
-TEST_F(DefaultFieldComparatorTest, EnumComparison) {
-  const FieldDescriptor* field =
-      descriptor_->FindFieldByName("optional_nested_enum");
-  message_1_.set_optional_nested_enum(TestAllTypes::BAR);
-  message_2_.set_optional_nested_enum(TestAllTypes::BAR);
-
-  EXPECT_EQ(FieldComparator::SAME, comparator_.Compare(message_1_, message_2_,
-                                                       field, -1, -1, nullptr));
-
-  message_2_.set_optional_nested_enum(TestAllTypes::BAZ);
-  EXPECT_EQ(
-      FieldComparator::DIFFERENT,
-      comparator_.Compare(message_1_, message_2_, field, -1, -1, nullptr));
-}
-
-TEST_F(DefaultFieldComparatorTest, StringComparison) {
-  const FieldDescriptor* field =
-      descriptor_->FindFieldByName("optional_string");
-  message_1_.set_optional_string("foo");
-  message_2_.set_optional_string("foo");
-
-  EXPECT_EQ(FieldComparator::SAME, comparator_.Compare(message_1_, message_2_,
-                                                       field, -1, -1, nullptr));
-
-  message_2_.set_optional_string("bar");
-  EXPECT_EQ(
-      FieldComparator::DIFFERENT,
-      comparator_.Compare(message_1_, message_2_, field, -1, -1, nullptr));
-}
-
-TEST_F(DefaultFieldComparatorTest, FloatingPointComparisonExact) {
-  const FieldDescriptor* field_float =
-      descriptor_->FindFieldByName("optional_float");
-  const FieldDescriptor* field_double =
-      descriptor_->FindFieldByName("optional_double");
-
-  message_1_.set_optional_float(0.1f);
-  message_2_.set_optional_float(0.1f);
-  message_1_.set_optional_double(0.1);
-  message_2_.set_optional_double(0.1);
-
-  EXPECT_EQ(FieldComparator::SAME,
-            comparator_.Compare(message_1_, message_2_, field_float, -1, -1,
-                                nullptr));
-  EXPECT_EQ(FieldComparator::SAME,
-            comparator_.Compare(message_1_, message_2_, field_double, -1, -1,
-                                nullptr));
-
-  message_2_.set_optional_float(0.2f);
-  message_2_.set_optional_double(0.2);
-
-  EXPECT_EQ(FieldComparator::DIFFERENT,
-            comparator_.Compare(message_1_, message_2_, field_float, -1, -1,
-                                nullptr));
-  EXPECT_EQ(FieldComparator::DIFFERENT,
-            comparator_.Compare(message_1_, message_2_, field_double, -1, -1,
-                                nullptr));
-}
-
-TEST_F(DefaultFieldComparatorTest, FloatingPointComparisonApproximate) {
-  const FieldDescriptor* field_float =
-      descriptor_->FindFieldByName("optional_float");
-  const FieldDescriptor* field_double =
-      descriptor_->FindFieldByName("optional_double");
-
-  message_1_.set_optional_float(2.300005f);
-  message_2_.set_optional_float(2.300006f);
-  message_1_.set_optional_double(2.3000000000000003);
-  message_2_.set_optional_double(2.3000000000000007);
-
-  // Approximate comparison depends on MathUtil, so we assert on MathUtil
-  // results first to check if that's where the failure was introduced.
-  ASSERT_NE(message_1_.optional_float(), message_2_.optional_float());
-  ASSERT_NE(message_1_.optional_double(), message_2_.optional_double());
-  ASSERT_TRUE(MathUtil::AlmostEquals(message_1_.optional_float(),
-                                     message_2_.optional_float()));
-  ASSERT_TRUE(MathUtil::AlmostEquals(message_1_.optional_double(),
-                                     message_2_.optional_double()));
-
-  // DefaultFieldComparator's default float comparison mode is EXACT.
-  ASSERT_EQ(DefaultFieldComparator::EXACT, comparator_.float_comparison());
-  EXPECT_EQ(FieldComparator::DIFFERENT,
-            comparator_.Compare(message_1_, message_2_, field_float, -1, -1,
-                                nullptr));
-  EXPECT_EQ(FieldComparator::DIFFERENT,
-            comparator_.Compare(message_1_, message_2_, field_double, -1, -1,
-                                nullptr));
-
-  comparator_.set_float_comparison(DefaultFieldComparator::APPROXIMATE);
-
-  EXPECT_EQ(FieldComparator::SAME,
-            comparator_.Compare(message_1_, message_2_, field_float, -1, -1,
-                                nullptr));
-  EXPECT_EQ(FieldComparator::SAME,
-            comparator_.Compare(message_1_, message_2_, field_double, -1, -1,
-                                nullptr));
-}
-
-TEST_F(DefaultFieldComparatorTest, FloatingPointComparisonTreatNaNsAsEqual) {
-  const FieldDescriptor* field_float =
-      descriptor_->FindFieldByName("optional_float");
-  const FieldDescriptor* field_double =
-      descriptor_->FindFieldByName("optional_double");
-
-  message_1_.set_optional_float(std::numeric_limits<float>::quiet_NaN());
-  message_2_.set_optional_float(std::numeric_limits<float>::quiet_NaN());
-  message_1_.set_optional_double(std::numeric_limits<double>::quiet_NaN());
-  message_2_.set_optional_double(std::numeric_limits<double>::quiet_NaN());
-
-  // DefaultFieldComparator's default float comparison mode is EXACT with
-  // treating NaNs as different.
-  ASSERT_EQ(DefaultFieldComparator::EXACT, comparator_.float_comparison());
-  ASSERT_EQ(false, comparator_.treat_nan_as_equal());
-  EXPECT_EQ(FieldComparator::DIFFERENT,
-            comparator_.Compare(message_1_, message_2_, field_float, -1, -1,
-                                nullptr));
-  EXPECT_EQ(FieldComparator::DIFFERENT,
-            comparator_.Compare(message_1_, message_2_, field_double, -1, -1,
-                                nullptr));
-  comparator_.set_float_comparison(DefaultFieldComparator::APPROXIMATE);
-  EXPECT_EQ(FieldComparator::DIFFERENT,
-            comparator_.Compare(message_1_, message_2_, field_float, -1, -1,
-                                nullptr));
-  EXPECT_EQ(FieldComparator::DIFFERENT,
-            comparator_.Compare(message_1_, message_2_, field_double, -1, -1,
-                                nullptr));
-
-  comparator_.set_treat_nan_as_equal(true);
-  ASSERT_EQ(true, comparator_.treat_nan_as_equal());
-  comparator_.set_float_comparison(DefaultFieldComparator::EXACT);
-  EXPECT_EQ(FieldComparator::SAME,
-            comparator_.Compare(message_1_, message_2_, field_float, -1, -1,
-                                nullptr));
-  EXPECT_EQ(FieldComparator::SAME,
-            comparator_.Compare(message_1_, message_2_, field_double, -1, -1,
-                                nullptr));
-  comparator_.set_float_comparison(DefaultFieldComparator::APPROXIMATE);
-  EXPECT_EQ(FieldComparator::SAME,
-            comparator_.Compare(message_1_, message_2_, field_float, -1, -1,
-                                nullptr));
-  EXPECT_EQ(FieldComparator::SAME,
-            comparator_.Compare(message_1_, message_2_, field_double, -1, -1,
-                                nullptr));
-}
-
-TEST_F(DefaultFieldComparatorTest,
-       FloatingPointComparisonWithinFractionOrMargin) {
-  const FieldDescriptor* field_float =
-      descriptor_->FindFieldByName("optional_float");
-  const FieldDescriptor* field_double =
-      descriptor_->FindFieldByName("optional_double");
-
-  message_1_.set_optional_float(100.0f);
-  message_2_.set_optional_float(109.9f);
-  message_1_.set_optional_double(100.0);
-  message_2_.set_optional_double(109.9);
-
-  comparator_.set_float_comparison(DefaultFieldComparator::APPROXIMATE);
-  EXPECT_EQ(FieldComparator::DIFFERENT,
-            comparator_.Compare(message_1_, message_2_, field_float, -1, -1,
-                                nullptr));
-  EXPECT_EQ(FieldComparator::DIFFERENT,
-            comparator_.Compare(message_1_, message_2_, field_double, -1, -1,
-                                nullptr));
-
-  // Should fail since the fraction is too low.
-  comparator_.SetFractionAndMargin(field_float, 0.01, 0.0);
-  comparator_.SetFractionAndMargin(field_double, 0.01, 0.0);
-
-  EXPECT_EQ(FieldComparator::DIFFERENT,
-            comparator_.Compare(message_1_, message_2_, field_float, -1, -1,
-                                nullptr));
-  EXPECT_EQ(FieldComparator::DIFFERENT,
-            comparator_.Compare(message_1_, message_2_, field_double, -1, -1,
-                                nullptr));
-
-  // Should fail since the margin is too low.
-  comparator_.SetFractionAndMargin(field_float, 0.0, 9.0);
-  comparator_.SetFractionAndMargin(field_double, 0.0, 9.0);
-  EXPECT_EQ(FieldComparator::DIFFERENT,
-            comparator_.Compare(message_1_, message_2_, field_float, -1, -1,
-                                nullptr));
-  EXPECT_EQ(FieldComparator::DIFFERENT,
-            comparator_.Compare(message_1_, message_2_, field_double, -1, -1,
-                                nullptr));
-
-  // Should succeed since the fraction is high enough.
-  comparator_.SetFractionAndMargin(field_float, 0.2, 0.0);
-  comparator_.SetFractionAndMargin(field_double, 0.2, 0.0);
-  EXPECT_EQ(FieldComparator::SAME,
-            comparator_.Compare(message_1_, message_2_, field_float, -1, -1,
-                                nullptr));
-  EXPECT_EQ(FieldComparator::SAME,
-            comparator_.Compare(message_1_, message_2_, field_double, -1, -1,
-                                nullptr));
-
-  // Should succeed since the margin is high enough.
-  comparator_.SetFractionAndMargin(field_float, 0.0, 10.0);
-  comparator_.SetFractionAndMargin(field_double, 0.0, 10.0);
-  EXPECT_EQ(FieldComparator::SAME,
-            comparator_.Compare(message_1_, message_2_, field_float, -1, -1,
-                                nullptr));
-  EXPECT_EQ(FieldComparator::SAME,
-            comparator_.Compare(message_1_, message_2_, field_double, -1, -1,
-                                nullptr));
-
-  // Setting values for one of the fields should not affect the other.
-  comparator_.SetFractionAndMargin(field_double, 0.0, 0.0);
-  EXPECT_EQ(FieldComparator::SAME,
-            comparator_.Compare(message_1_, message_2_, field_float, -1, -1,
-                                nullptr));
-  EXPECT_EQ(FieldComparator::DIFFERENT,
-            comparator_.Compare(message_1_, message_2_, field_double, -1, -1,
-                                nullptr));
-
-  // +inf should be equal even though they are not technically within margin or
-  // fraction.
-  message_1_.set_optional_float(std::numeric_limits<float>::infinity());
-  message_2_.set_optional_float(std::numeric_limits<float>::infinity());
-  message_1_.set_optional_double(std::numeric_limits<double>::infinity());
-  message_2_.set_optional_double(std::numeric_limits<double>::infinity());
-  comparator_.SetFractionAndMargin(field_float, 0.0, 0.0);
-  comparator_.SetFractionAndMargin(field_double, 0.0, 0.0);
-  EXPECT_EQ(FieldComparator::SAME,
-            comparator_.Compare(message_1_, message_2_, field_float, -1, -1,
-                                nullptr));
-  EXPECT_EQ(FieldComparator::SAME,
-            comparator_.Compare(message_1_, message_2_, field_double, -1, -1,
-                                nullptr));
-
-  // -inf should be equal even though they are not technically within margin or
-  // fraction.
-  message_1_.set_optional_float(-std::numeric_limits<float>::infinity());
-  message_2_.set_optional_float(-std::numeric_limits<float>::infinity());
-  message_1_.set_optional_double(-std::numeric_limits<double>::infinity());
-  message_2_.set_optional_double(-std::numeric_limits<double>::infinity());
-  comparator_.SetFractionAndMargin(field_float, 0.0, 0.0);
-  comparator_.SetFractionAndMargin(field_double, 0.0, 0.0);
-  EXPECT_EQ(FieldComparator::SAME,
-            comparator_.Compare(message_1_, message_2_, field_float, -1, -1,
-                                nullptr));
-  EXPECT_EQ(FieldComparator::SAME,
-            comparator_.Compare(message_1_, message_2_, field_double, -1, -1,
-                                nullptr));
-
-  // Finite values and inf should not be equal, even for a positive fraction.
-  message_1_.set_optional_float(std::numeric_limits<float>::infinity());
-  message_2_.set_optional_float(0.0f);
-  message_1_.set_optional_double(std::numeric_limits<double>::infinity());
-  message_2_.set_optional_double(0.0);
-  comparator_.SetFractionAndMargin(field_float, 0.1, 0.0);
-  comparator_.SetFractionAndMargin(field_double, 0.1, 0.0);
-  EXPECT_EQ(FieldComparator::DIFFERENT,
-            comparator_.Compare(message_1_, message_2_, field_float, -1, -1,
-                                nullptr));
-  EXPECT_EQ(FieldComparator::DIFFERENT,
-            comparator_.Compare(message_1_, message_2_, field_double, -1, -1,
-                                nullptr));
-}
-
-TEST_F(DefaultFieldComparatorTest,
-       FloatingPointComparisonWithinDefaultFractionOrMargin) {
-  const FieldDescriptor* field_float =
-      descriptor_->FindFieldByName("optional_float");
-  const FieldDescriptor* field_double =
-      descriptor_->FindFieldByName("optional_double");
-
-  message_1_.set_optional_float(100.0f);
-  message_2_.set_optional_float(109.9f);
-  message_1_.set_optional_double(100.0);
-  message_2_.set_optional_double(109.9);
-
-  comparator_.set_float_comparison(DefaultFieldComparator::APPROXIMATE);
-  EXPECT_EQ(FieldComparator::DIFFERENT,
-            comparator_.Compare(message_1_, message_2_, field_float, -1, -1,
-                                nullptr));
-  EXPECT_EQ(FieldComparator::DIFFERENT,
-            comparator_.Compare(message_1_, message_2_, field_double, -1, -1,
-                                nullptr));
-
-  // Set default fraction and margin.
-  comparator_.SetDefaultFractionAndMargin(0.01, 0.0);
-
-  // Float comparisons should fail since the fraction is too low.
-  EXPECT_EQ(FieldComparator::DIFFERENT,
-            comparator_.Compare(message_1_, message_2_, field_float, -1, -1,
-                                nullptr));
-  EXPECT_EQ(FieldComparator::DIFFERENT,
-            comparator_.Compare(message_1_, message_2_, field_double, -1, -1,
-                                nullptr));
-
-  // Set field-specific fraction and margin for one field (field_float) but not
-  // the other (field_double)
-  comparator_.SetFractionAndMargin(field_float, 0.2, 0.0);
-
-  // The field with the override should succeed, since its field-specific
-  // fraction is high enough.
-  EXPECT_EQ(FieldComparator::SAME,
-            comparator_.Compare(message_1_, message_2_, field_float, -1, -1,
-                                nullptr));
-  // The field with no override should fail, since the default fraction is too
-  // low
-  EXPECT_EQ(FieldComparator::DIFFERENT,
-            comparator_.Compare(message_1_, message_2_, field_double, -1, -1,
-                                nullptr));
-
-  // Set the default fraction and margin high enough so that fields that use
-  // the default should succeed
-  comparator_.SetDefaultFractionAndMargin(0.2, 0.0);
-  EXPECT_EQ(FieldComparator::SAME,
-            comparator_.Compare(message_1_, message_2_, field_double, -1, -1,
-                                nullptr));
-
-  // The field with an override should still be OK
-  EXPECT_EQ(FieldComparator::SAME,
-            comparator_.Compare(message_1_, message_2_, field_float, -1, -1,
-                                nullptr));
-
-  // Set fraction and margin for the field with an override to be too low
-  comparator_.SetFractionAndMargin(field_float, 0.01, 0.0);
-
-  // Now our default is high enough but field_float's override is too low.
-  EXPECT_EQ(FieldComparator::DIFFERENT,
-            comparator_.Compare(message_1_, message_2_, field_float, -1, -1,
-                                nullptr));
-  EXPECT_EQ(FieldComparator::SAME,
-            comparator_.Compare(message_1_, message_2_, field_double, -1, -1,
-                                nullptr));
-}
-
-// Simple test checking whether we compare values at correct indices.
-TEST_F(DefaultFieldComparatorTest, RepeatedFieldComparison) {
-  const FieldDescriptor* field =
-      descriptor_->FindFieldByName("repeated_string");
-
-  message_1_.add_repeated_string("foo");
-  message_1_.add_repeated_string("bar");
-  message_2_.add_repeated_string("bar");
-  message_2_.add_repeated_string("baz");
-
-  EXPECT_EQ(FieldComparator::DIFFERENT,
-            comparator_.Compare(message_1_, message_2_, field, 0, 0, nullptr));
-  EXPECT_EQ(FieldComparator::DIFFERENT,
-            comparator_.Compare(message_1_, message_2_, field, 1, 1, nullptr));
-  EXPECT_EQ(FieldComparator::SAME,
-            comparator_.Compare(message_1_, message_2_, field, 1, 0, nullptr));
-}
-
-}  // namespace
-}  // namespace util
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/util/field_mask_util.cc b/libs/protobuf/src/google/protobuf/util/field_mask_util.cc
deleted file mode 100644
index 700e590..0000000
--- a/libs/protobuf/src/google/protobuf/util/field_mask_util.cc
+++ /dev/null
@@ -1,720 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <google/protobuf/util/field_mask_util.h>
-
-#include <cstdint>
-
-#include <google/protobuf/stubs/strutil.h>
-#include <google/protobuf/message.h>
-#include <google/protobuf/stubs/map_util.h>
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-namespace util {
-
-using google::protobuf::FieldMask;
-
-std::string FieldMaskUtil::ToString(const FieldMask& mask) {
-  return Join(mask.paths(), ",");
-}
-
-void FieldMaskUtil::FromString(StringPiece str, FieldMask* out) {
-  out->Clear();
-  std::vector<std::string> paths = Split(str, ",");
-  for (const std::string& path : paths) {
-    if (path.empty()) continue;
-    out->add_paths(path);
-  }
-}
-
-bool FieldMaskUtil::SnakeCaseToCamelCase(StringPiece input,
-                                         std::string* output) {
-  output->clear();
-  bool after_underscore = false;
-  for (char input_char : input) {
-    if (input_char >= 'A' && input_char <= 'Z') {
-      // The field name must not contain uppercase letters.
-      return false;
-    }
-    if (after_underscore) {
-      if (input_char >= 'a' && input_char <= 'z') {
-        output->push_back(input_char + 'A' - 'a');
-        after_underscore = false;
-      } else {
-        // The character after a "_" must be a lowercase letter.
-        return false;
-      }
-    } else if (input_char == '_') {
-      after_underscore = true;
-    } else {
-      output->push_back(input_char);
-    }
-  }
-  if (after_underscore) {
-    // Trailing "_".
-    return false;
-  }
-  return true;
-}
-
-bool FieldMaskUtil::CamelCaseToSnakeCase(StringPiece input,
-                                         std::string* output) {
-  output->clear();
-  for (const char c : input) {
-    if (c == '_') {
-      // The field name must not contain "_"s.
-      return false;
-    }
-    if (c >= 'A' && c <= 'Z') {
-      output->push_back('_');
-      output->push_back(c + 'a' - 'A');
-    } else {
-      output->push_back(c);
-    }
-  }
-  return true;
-}
-
-bool FieldMaskUtil::ToJsonString(const FieldMask& mask, std::string* out) {
-  out->clear();
-  for (int i = 0; i < mask.paths_size(); ++i) {
-    const std::string& path = mask.paths(i);
-    std::string camelcase_path;
-    if (!SnakeCaseToCamelCase(path, &camelcase_path)) {
-      return false;
-    }
-    if (i > 0) {
-      out->push_back(',');
-    }
-    out->append(camelcase_path);
-  }
-  return true;
-}
-
-bool FieldMaskUtil::FromJsonString(StringPiece str, FieldMask* out) {
-  out->Clear();
-  std::vector<std::string> paths = Split(str, ",");
-  for (const std::string& path : paths) {
-    if (path.empty()) continue;
-    std::string snakecase_path;
-    if (!CamelCaseToSnakeCase(path, &snakecase_path)) {
-      return false;
-    }
-    out->add_paths(snakecase_path);
-  }
-  return true;
-}
-
-bool FieldMaskUtil::GetFieldDescriptors(
-    const Descriptor* descriptor, StringPiece path,
-    std::vector<const FieldDescriptor*>* field_descriptors) {
-  if (field_descriptors != nullptr) {
-    field_descriptors->clear();
-  }
-  std::vector<std::string> parts = Split(path, ".");
-  for (const std::string& field_name : parts) {
-    if (descriptor == nullptr) {
-      return false;
-    }
-    const FieldDescriptor* field = descriptor->FindFieldByName(field_name);
-    if (field == nullptr) {
-      return false;
-    }
-    if (field_descriptors != nullptr) {
-      field_descriptors->push_back(field);
-    }
-    if (!field->is_repeated() &&
-        field->cpp_type() == FieldDescriptor::CPPTYPE_MESSAGE) {
-      descriptor = field->message_type();
-    } else {
-      descriptor = nullptr;
-    }
-  }
-  return true;
-}
-
-void FieldMaskUtil::GetFieldMaskForAllFields(const Descriptor* descriptor,
-                                             FieldMask* out) {
-  for (int i = 0; i < descriptor->field_count(); ++i) {
-    out->add_paths(descriptor->field(i)->name());
-  }
-}
-
-namespace {
-// A FieldMaskTree represents a FieldMask in a tree structure. For example,
-// given a FieldMask "foo.bar,foo.baz,bar.baz", the FieldMaskTree will be:
-//
-//   [root] -+- foo -+- bar
-//           |       |
-//           |       +- baz
-//           |
-//           +- bar --- baz
-//
-// In the tree, each leaf node represents a field path.
-class FieldMaskTree {
- public:
-  FieldMaskTree();
-  ~FieldMaskTree();
-
-  void MergeFromFieldMask(const FieldMask& mask);
-  void MergeToFieldMask(FieldMask* mask);
-
-  // Add a field path into the tree. In a FieldMask, each field path matches
-  // the specified field and also all its sub-fields. If the field path to
-  // add is a sub-path of an existing field path in the tree (i.e., a leaf
-  // node), it means the tree already matches the given path so nothing will
-  // be added to the tree. If the path matches an existing non-leaf node in the
-  // tree, that non-leaf node will be turned into a leaf node with all its
-  // children removed because the path matches all the node's children.
-  void AddPath(const std::string& path);
-
-  // Remove a path from the tree.
-  // If the path is a sub-path of an existing field path in the tree, it means
-  // we need remove the existing field path and add all sub-paths except
-  // specified path. If the path matches an existing node in the tree, this node
-  // will be moved.
-  void RemovePath(const std::string& path, const Descriptor* descriptor);
-
-  // Calculate the intersection part of a field path with this tree and add
-  // the intersection field path into out.
-  void IntersectPath(const std::string& path, FieldMaskTree* out);
-
-  // Merge all fields specified by this tree from one message to another.
-  void MergeMessage(const Message& source,
-                    const FieldMaskUtil::MergeOptions& options,
-                    Message* destination) {
-    // Do nothing if the tree is empty.
-    if (root_.children.empty()) {
-      return;
-    }
-    MergeMessage(&root_, source, options, destination);
-  }
-
-  // Add required field path of the message to this tree based on current tree
-  // structure. If a message is present in the tree, add the path of its
-  // required field to the tree. This is to make sure that after trimming a
-  // message with required fields are set, check IsInitialized() will not fail.
-  void AddRequiredFieldPath(const Descriptor* descriptor) {
-    // Do nothing if the tree is empty.
-    if (root_.children.empty()) {
-      return;
-    }
-    AddRequiredFieldPath(&root_, descriptor);
-  }
-
-  // Trims all fields not specified by this tree from the given message.
-  // Returns true if the message is modified.
-  bool TrimMessage(Message* message) {
-    // Do nothing if the tree is empty.
-    if (root_.children.empty()) {
-      return false;
-    }
-    return TrimMessage(&root_, message);
-  }
-
- private:
-  struct Node {
-    Node() {}
-
-    ~Node() { ClearChildren(); }
-
-    void ClearChildren() {
-      for (std::map<std::string, Node*>::iterator it = children.begin();
-           it != children.end(); ++it) {
-        delete it->second;
-      }
-      children.clear();
-    }
-
-    std::map<std::string, Node*> children;
-
-   private:
-    GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(Node);
-  };
-
-  // Merge a sub-tree to mask. This method adds the field paths represented
-  // by all leaf nodes descended from "node" to mask.
-  void MergeToFieldMask(const std::string& prefix, const Node* node,
-                        FieldMask* out);
-
-  // Merge all leaf nodes of a sub-tree to another tree.
-  void MergeLeafNodesToTree(const std::string& prefix, const Node* node,
-                            FieldMaskTree* out);
-
-  // Merge all fields specified by a sub-tree from one message to another.
-  void MergeMessage(const Node* node, const Message& source,
-                    const FieldMaskUtil::MergeOptions& options,
-                    Message* destination);
-
-  // Add required field path of the message to this tree based on current tree
-  // structure. If a message is present in the tree, add the path of its
-  // required field to the tree. This is to make sure that after trimming a
-  // message with required fields are set, check IsInitialized() will not fail.
-  void AddRequiredFieldPath(Node* node, const Descriptor* descriptor);
-
-  // Trims all fields not specified by this sub-tree from the given message.
-  // Returns true if the message is actually modified
-  bool TrimMessage(const Node* node, Message* message);
-
-  Node root_;
-
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(FieldMaskTree);
-};
-
-FieldMaskTree::FieldMaskTree() {}
-
-FieldMaskTree::~FieldMaskTree() {}
-
-void FieldMaskTree::MergeFromFieldMask(const FieldMask& mask) {
-  for (int i = 0; i < mask.paths_size(); ++i) {
-    AddPath(mask.paths(i));
-  }
-}
-
-void FieldMaskTree::MergeToFieldMask(FieldMask* mask) {
-  MergeToFieldMask("", &root_, mask);
-}
-
-void FieldMaskTree::MergeToFieldMask(const std::string& prefix,
-                                     const Node* node, FieldMask* out) {
-  if (node->children.empty()) {
-    if (prefix.empty()) {
-      // This is the root node.
-      return;
-    }
-    out->add_paths(prefix);
-    return;
-  }
-  for (std::map<std::string, Node*>::const_iterator it = node->children.begin();
-       it != node->children.end(); ++it) {
-    std::string current_path =
-        prefix.empty() ? it->first : prefix + "." + it->first;
-    MergeToFieldMask(current_path, it->second, out);
-  }
-}
-
-void FieldMaskTree::AddPath(const std::string& path) {
-  std::vector<std::string> parts = Split(path, ".");
-  if (parts.empty()) {
-    return;
-  }
-  bool new_branch = false;
-  Node* node = &root_;
-  for (const std::string& node_name : parts) {
-    if (!new_branch && node != &root_ && node->children.empty()) {
-      // Path matches an existing leaf node. This means the path is already
-      // covered by this tree (for example, adding "foo.bar.baz" to a tree
-      // which already contains "foo.bar").
-      return;
-    }
-    Node*& child = node->children[node_name];
-    if (child == nullptr) {
-      new_branch = true;
-      child = new Node();
-    }
-    node = child;
-  }
-  if (!node->children.empty()) {
-    node->ClearChildren();
-  }
-}
-
-void FieldMaskTree::RemovePath(const std::string& path,
-                               const Descriptor* descriptor) {
-  if (root_.children.empty()) {
-    // Nothing to be removed from an empty tree. We shortcut it here so an empty
-    // tree won't be interpreted as a field mask containing all fields by the
-    // code below.
-    return;
-  }
-  std::vector<std::string> parts = Split(path, ".");
-  if (parts.empty()) {
-    return;
-  }
-  std::vector<Node*> nodes(parts.size());
-  Node* node = &root_;
-  const Descriptor* current_descriptor = descriptor;
-  Node* new_branch_node = nullptr;
-  for (int i = 0; i < parts.size(); ++i) {
-    nodes[i] = node;
-    const FieldDescriptor* field_descriptor =
-        current_descriptor->FindFieldByName(parts[i]);
-    if (field_descriptor == nullptr ||
-        (field_descriptor->cpp_type() != FieldDescriptor::CPPTYPE_MESSAGE &&
-         i != parts.size() - 1)) {
-      // Invalid path.
-      if (new_branch_node != nullptr) {
-        // If add any new nodes, cleanup.
-        new_branch_node->ClearChildren();
-      }
-      return;
-    }
-
-    if (node->children.empty()) {
-      if (new_branch_node == nullptr) {
-        new_branch_node = node;
-      }
-      for (int j = 0; j < current_descriptor->field_count(); ++j) {
-        node->children[current_descriptor->field(j)->name()] = new Node();
-      }
-    }
-    if (ContainsKey(node->children, parts[i])) {
-      node = node->children[parts[i]];
-      if (field_descriptor->cpp_type() == FieldDescriptor::CPPTYPE_MESSAGE) {
-        current_descriptor = field_descriptor->message_type();
-      }
-    } else {
-      // Path does not exist.
-      return;
-    }
-  }
-  // Remove path.
-  for (int i = parts.size() - 1; i >= 0; i--) {
-    delete nodes[i]->children[parts[i]];
-    nodes[i]->children.erase(parts[i]);
-    if (!nodes[i]->children.empty()) {
-      break;
-    }
-  }
-}
-
-void FieldMaskTree::IntersectPath(const std::string& path, FieldMaskTree* out) {
-  std::vector<std::string> parts = Split(path, ".");
-  if (parts.empty()) {
-    return;
-  }
-  const Node* node = &root_;
-  for (const std::string& node_name : parts) {
-    if (node->children.empty()) {
-      if (node != &root_) {
-        out->AddPath(path);
-      }
-      return;
-    }
-    const Node* result = FindPtrOrNull(node->children, node_name);
-    if (result == nullptr) {
-      // No intersection found.
-      return;
-    }
-    node = result;
-  }
-  // Now we found a matching node with the given path. Add all leaf nodes
-  // to out.
-  MergeLeafNodesToTree(path, node, out);
-}
-
-void FieldMaskTree::MergeLeafNodesToTree(const std::string& prefix,
-                                         const Node* node, FieldMaskTree* out) {
-  if (node->children.empty()) {
-    out->AddPath(prefix);
-  }
-  for (std::map<std::string, Node*>::const_iterator it = node->children.begin();
-       it != node->children.end(); ++it) {
-    std::string current_path =
-        prefix.empty() ? it->first : prefix + "." + it->first;
-    MergeLeafNodesToTree(current_path, it->second, out);
-  }
-}
-
-void FieldMaskTree::MergeMessage(const Node* node, const Message& source,
-                                 const FieldMaskUtil::MergeOptions& options,
-                                 Message* destination) {
-  GOOGLE_DCHECK(!node->children.empty());
-  const Reflection* source_reflection = source.GetReflection();
-  const Reflection* destination_reflection = destination->GetReflection();
-  const Descriptor* descriptor = source.GetDescriptor();
-  for (std::map<std::string, Node*>::const_iterator it = node->children.begin();
-       it != node->children.end(); ++it) {
-    const std::string& field_name = it->first;
-    const Node* child = it->second;
-    const FieldDescriptor* field = descriptor->FindFieldByName(field_name);
-    if (field == nullptr) {
-      GOOGLE_LOG(ERROR) << "Cannot find field \"" << field_name << "\" in message "
-                 << descriptor->full_name();
-      continue;
-    }
-    if (!child->children.empty()) {
-      // Sub-paths are only allowed for singular message fields.
-      if (field->is_repeated() ||
-          field->cpp_type() != FieldDescriptor::CPPTYPE_MESSAGE) {
-        GOOGLE_LOG(ERROR) << "Field \"" << field_name << "\" in message "
-                   << descriptor->full_name()
-                   << " is not a singular message field and cannot "
-                   << "have sub-fields.";
-        continue;
-      }
-      MergeMessage(child, source_reflection->GetMessage(source, field), options,
-                   destination_reflection->MutableMessage(destination, field));
-      continue;
-    }
-    if (!field->is_repeated()) {
-      switch (field->cpp_type()) {
-#define COPY_VALUE(TYPE, Name)                                              \
-  case FieldDescriptor::CPPTYPE_##TYPE: {                                   \
-    if (source_reflection->HasField(source, field)) {                       \
-      destination_reflection->Set##Name(                                    \
-          destination, field, source_reflection->Get##Name(source, field)); \
-    } else {                                                                \
-      destination_reflection->ClearField(destination, field);               \
-    }                                                                       \
-    break;                                                                  \
-  }
-        COPY_VALUE(BOOL, Bool)
-        COPY_VALUE(INT32, Int32)
-        COPY_VALUE(INT64, Int64)
-        COPY_VALUE(UINT32, UInt32)
-        COPY_VALUE(UINT64, UInt64)
-        COPY_VALUE(FLOAT, Float)
-        COPY_VALUE(DOUBLE, Double)
-        COPY_VALUE(ENUM, Enum)
-        COPY_VALUE(STRING, String)
-#undef COPY_VALUE
-        case FieldDescriptor::CPPTYPE_MESSAGE: {
-          if (options.replace_message_fields()) {
-            destination_reflection->ClearField(destination, field);
-          }
-          if (source_reflection->HasField(source, field)) {
-            destination_reflection->MutableMessage(destination, field)
-                ->MergeFrom(source_reflection->GetMessage(source, field));
-          }
-          break;
-        }
-      }
-    } else {
-      if (options.replace_repeated_fields()) {
-        destination_reflection->ClearField(destination, field);
-      }
-      switch (field->cpp_type()) {
-#define COPY_REPEATED_VALUE(TYPE, Name)                            \
-  case FieldDescriptor::CPPTYPE_##TYPE: {                          \
-    int size = source_reflection->FieldSize(source, field);        \
-    for (int i = 0; i < size; ++i) {                               \
-      destination_reflection->Add##Name(                           \
-          destination, field,                                      \
-          source_reflection->GetRepeated##Name(source, field, i)); \
-    }                                                              \
-    break;                                                         \
-  }
-        COPY_REPEATED_VALUE(BOOL, Bool)
-        COPY_REPEATED_VALUE(INT32, Int32)
-        COPY_REPEATED_VALUE(INT64, Int64)
-        COPY_REPEATED_VALUE(UINT32, UInt32)
-        COPY_REPEATED_VALUE(UINT64, UInt64)
-        COPY_REPEATED_VALUE(FLOAT, Float)
-        COPY_REPEATED_VALUE(DOUBLE, Double)
-        COPY_REPEATED_VALUE(ENUM, Enum)
-        COPY_REPEATED_VALUE(STRING, String)
-#undef COPY_REPEATED_VALUE
-        case FieldDescriptor::CPPTYPE_MESSAGE: {
-          int size = source_reflection->FieldSize(source, field);
-          for (int i = 0; i < size; ++i) {
-            destination_reflection->AddMessage(destination, field)
-                ->MergeFrom(
-                    source_reflection->GetRepeatedMessage(source, field, i));
-          }
-          break;
-        }
-      }
-    }
-  }
-}
-
-void FieldMaskTree::AddRequiredFieldPath(Node* node,
-                                         const Descriptor* descriptor) {
-  const int32_t field_count = descriptor->field_count();
-  for (int index = 0; index < field_count; ++index) {
-    const FieldDescriptor* field = descriptor->field(index);
-    if (field->is_required()) {
-      const std::string& node_name = field->name();
-      Node*& child = node->children[node_name];
-      if (child == nullptr) {
-        // Add required field path to the tree
-        child = new Node();
-      } else if (child->children.empty()) {
-        // If the required field is in the tree and does not have any children,
-        // do nothing.
-        continue;
-      }
-      // Add required field in the children to the tree if the field is message.
-      if (field->cpp_type() == FieldDescriptor::CPPTYPE_MESSAGE) {
-        AddRequiredFieldPath(child, field->message_type());
-      }
-    } else if (field->cpp_type() == FieldDescriptor::CPPTYPE_MESSAGE) {
-      std::map<std::string, Node*>::const_iterator it =
-          node->children.find(field->name());
-      if (it != node->children.end()) {
-        // Add required fields in the children to the
-        // tree if the field is a message and present in the tree.
-        Node* child = it->second;
-        if (!child->children.empty()) {
-          AddRequiredFieldPath(child, field->message_type());
-        }
-      }
-    }
-  }
-}
-
-bool FieldMaskTree::TrimMessage(const Node* node, Message* message) {
-  GOOGLE_DCHECK(!node->children.empty());
-  const Reflection* reflection = message->GetReflection();
-  const Descriptor* descriptor = message->GetDescriptor();
-  const int32_t field_count = descriptor->field_count();
-  bool modified = false;
-  for (int index = 0; index < field_count; ++index) {
-    const FieldDescriptor* field = descriptor->field(index);
-    std::map<std::string, Node*>::const_iterator it =
-        node->children.find(field->name());
-    if (it == node->children.end()) {
-      if (field->is_repeated()) {
-        if (reflection->FieldSize(*message, field) != 0) {
-          modified = true;
-        }
-      } else {
-        if (reflection->HasField(*message, field)) {
-          modified = true;
-        }
-      }
-      reflection->ClearField(message, field);
-    } else {
-      if (field->cpp_type() == FieldDescriptor::CPPTYPE_MESSAGE) {
-        Node* child = it->second;
-        if (!child->children.empty() && reflection->HasField(*message, field)) {
-          bool nestedMessageChanged =
-              TrimMessage(child, reflection->MutableMessage(message, field));
-          modified = nestedMessageChanged || modified;
-        }
-      }
-    }
-  }
-  return modified;
-}
-
-}  // namespace
-
-void FieldMaskUtil::ToCanonicalForm(const FieldMask& mask, FieldMask* out) {
-  FieldMaskTree tree;
-  tree.MergeFromFieldMask(mask);
-  out->Clear();
-  tree.MergeToFieldMask(out);
-}
-
-void FieldMaskUtil::Union(const FieldMask& mask1, const FieldMask& mask2,
-                          FieldMask* out) {
-  FieldMaskTree tree;
-  tree.MergeFromFieldMask(mask1);
-  tree.MergeFromFieldMask(mask2);
-  out->Clear();
-  tree.MergeToFieldMask(out);
-}
-
-void FieldMaskUtil::Intersect(const FieldMask& mask1, const FieldMask& mask2,
-                              FieldMask* out) {
-  FieldMaskTree tree, intersection;
-  tree.MergeFromFieldMask(mask1);
-  for (int i = 0; i < mask2.paths_size(); ++i) {
-    tree.IntersectPath(mask2.paths(i), &intersection);
-  }
-  out->Clear();
-  intersection.MergeToFieldMask(out);
-}
-
-void FieldMaskUtil::Subtract(const Descriptor* descriptor,
-                             const FieldMask& mask1, const FieldMask& mask2,
-                             FieldMask* out) {
-  if (mask1.paths().empty()) {
-    out->Clear();
-    return;
-  }
-  FieldMaskTree tree;
-  tree.MergeFromFieldMask(mask1);
-  for (int i = 0; i < mask2.paths_size(); ++i) {
-    tree.RemovePath(mask2.paths(i), descriptor);
-  }
-  out->Clear();
-  tree.MergeToFieldMask(out);
-}
-
-bool FieldMaskUtil::IsPathInFieldMask(StringPiece path,
-                                      const FieldMask& mask) {
-  for (int i = 0; i < mask.paths_size(); ++i) {
-    const std::string& mask_path = mask.paths(i);
-    if (path == mask_path) {
-      return true;
-    } else if (mask_path.length() < path.length()) {
-      // Also check whether mask.paths(i) is a prefix of path.
-      if (path.substr(0, mask_path.length() + 1).compare(mask_path + ".") ==
-          0) {
-        return true;
-      }
-    }
-  }
-  return false;
-}
-
-void FieldMaskUtil::MergeMessageTo(const Message& source, const FieldMask& mask,
-                                   const MergeOptions& options,
-                                   Message* destination) {
-  GOOGLE_CHECK(source.GetDescriptor() == destination->GetDescriptor());
-  // Build a FieldMaskTree and walk through the tree to merge all specified
-  // fields.
-  FieldMaskTree tree;
-  tree.MergeFromFieldMask(mask);
-  tree.MergeMessage(source, options, destination);
-}
-
-bool FieldMaskUtil::TrimMessage(const FieldMask& mask, Message* message) {
-  // Build a FieldMaskTree and walk through the tree to merge all specified
-  // fields.
-  FieldMaskTree tree;
-  tree.MergeFromFieldMask(mask);
-  return tree.TrimMessage(GOOGLE_CHECK_NOTNULL(message));
-}
-
-bool FieldMaskUtil::TrimMessage(const FieldMask& mask, Message* message,
-                                const TrimOptions& options) {
-  // Build a FieldMaskTree and walk through the tree to merge all specified
-  // fields.
-  FieldMaskTree tree;
-  tree.MergeFromFieldMask(mask);
-  // If keep_required_fields is true, implicitly add required fields of
-  // a message present in the tree to prevent from trimming.
-  if (options.keep_required_fields()) {
-    tree.AddRequiredFieldPath(GOOGLE_CHECK_NOTNULL(message->GetDescriptor()));
-  }
-  return tree.TrimMessage(GOOGLE_CHECK_NOTNULL(message));
-}
-
-}  // namespace util
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/util/field_mask_util.h b/libs/protobuf/src/google/protobuf/util/field_mask_util.h
deleted file mode 100644
index d51a332..0000000
--- a/libs/protobuf/src/google/protobuf/util/field_mask_util.h
+++ /dev/null
@@ -1,263 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Defines utilities for the FieldMask well known type.
-
-#ifndef GOOGLE_PROTOBUF_UTIL_FIELD_MASK_UTIL_H__
-#define GOOGLE_PROTOBUF_UTIL_FIELD_MASK_UTIL_H__
-
-#include <cstdint>
-#include <string>
-
-#include <google/protobuf/field_mask.pb.h>
-#include <google/protobuf/stubs/strutil.h>
-#include <google/protobuf/descriptor.h>
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-namespace util {
-
-class PROTOBUF_EXPORT FieldMaskUtil {
-  typedef google::protobuf::FieldMask FieldMask;
-
- public:
-  // Converts FieldMask to/from string, formatted by separating each path
-  // with a comma (e.g., "foo_bar,baz.quz").
-  static std::string ToString(const FieldMask& mask);
-  static void FromString(StringPiece str, FieldMask* out);
-
-  // Populates the FieldMask with the paths corresponding to the fields with the
-  // given numbers, after checking that all field numbers are valid.
-  template <typename T>
-  static void FromFieldNumbers(const std::vector<int64_t>& field_numbers,
-                               FieldMask* out) {
-    for (const auto field_number : field_numbers) {
-      const FieldDescriptor* field_desc =
-          T::descriptor()->FindFieldByNumber(field_number);
-      GOOGLE_CHECK(field_desc != nullptr)
-          << "Invalid field number for " << T::descriptor()->full_name() << ": "
-          << field_number;
-      AddPathToFieldMask<T>(field_desc->lowercase_name(), out);
-    }
-  }
-
-  // Converts FieldMask to/from string, formatted according to proto3 JSON
-  // spec for FieldMask (e.g., "fooBar,baz.quz"). If the field name is not
-  // style conforming (i.e., not snake_case when converted to string, or not
-  // camelCase when converted from string), the conversion will fail.
-  static bool ToJsonString(const FieldMask& mask, std::string* out);
-  static bool FromJsonString(StringPiece str, FieldMask* out);
-
-  // Get the descriptors of the fields which the given path from the message
-  // descriptor traverses, if field_descriptors is not null.
-  // Return false if the path is not valid, and the content of field_descriptors
-  // is unspecified.
-  static bool GetFieldDescriptors(
-      const Descriptor* descriptor, StringPiece path,
-      std::vector<const FieldDescriptor*>* field_descriptors);
-
-  // Checks whether the given path is valid for type T.
-  template <typename T>
-  static bool IsValidPath(StringPiece path) {
-    return GetFieldDescriptors(T::descriptor(), path, nullptr);
-  }
-
-  // Checks whether the given FieldMask is valid for type T.
-  template <typename T>
-  static bool IsValidFieldMask(const FieldMask& mask) {
-    for (int i = 0; i < mask.paths_size(); ++i) {
-      if (!GetFieldDescriptors(T::descriptor(), mask.paths(i), nullptr)) {
-        return false;
-      }
-    }
-    return true;
-  }
-
-  // Adds a path to FieldMask after checking whether the given path is valid.
-  // This method check-fails if the path is not a valid path for type T.
-  template <typename T>
-  static void AddPathToFieldMask(StringPiece path, FieldMask* mask) {
-    GOOGLE_CHECK(IsValidPath<T>(path)) << path;
-    mask->add_paths(std::string(path));
-  }
-
-  // Creates a FieldMask with all fields of type T. This FieldMask only
-  // contains fields of T but not any sub-message fields.
-  template <typename T>
-  static FieldMask GetFieldMaskForAllFields() {
-    FieldMask out;
-    GetFieldMaskForAllFields(T::descriptor(), &out);
-    return out;
-  }
-  template <typename T>
-  PROTOBUF_DEPRECATED_MSG("Use *out = GetFieldMaskForAllFields() instead")
-  static void GetFieldMaskForAllFields(FieldMask* out) {
-    GetFieldMaskForAllFields(T::descriptor(), out);
-  }
-  // This flavor takes the protobuf type descriptor as an argument.
-  // Useful when the type is not known at compile time.
-  static void GetFieldMaskForAllFields(const Descriptor* descriptor,
-                                       FieldMask* out);
-
-  // Converts a FieldMask to the canonical form. It will:
-  //   1. Remove paths that are covered by another path. For example,
-  //      "foo.bar" is covered by "foo" and will be removed if "foo"
-  //      is also in the FieldMask.
-  //   2. Sort all paths in alphabetical order.
-  static void ToCanonicalForm(const FieldMask& mask, FieldMask* out);
-
-  // Creates an union of two FieldMasks.
-  static void Union(const FieldMask& mask1, const FieldMask& mask2,
-                    FieldMask* out);
-
-  // Creates an intersection of two FieldMasks.
-  static void Intersect(const FieldMask& mask1, const FieldMask& mask2,
-                        FieldMask* out);
-
-  // Subtracts mask2 from mask1 base of type T.
-  template <typename T>
-  static void Subtract(const FieldMask& mask1, const FieldMask& mask2,
-                       FieldMask* out) {
-    Subtract(T::descriptor(), mask1, mask2, out);
-  }
-  // This flavor takes the protobuf type descriptor as an argument.
-  // Useful when the type is not known at compile time.
-  static void Subtract(const Descriptor* descriptor, const FieldMask& mask1,
-                       const FieldMask& mask2, FieldMask* out);
-
-  // Returns true if path is covered by the given FieldMask. Note that path
-  // "foo.bar" covers all paths like "foo.bar.baz", "foo.bar.quz.x", etc.
-  // Also note that parent paths are not covered by explicit child path, i.e.
-  // "foo.bar" does NOT cover "foo", even if "bar" is the only child.
-  static bool IsPathInFieldMask(StringPiece path, const FieldMask& mask);
-
-  class MergeOptions;
-  // Merges fields specified in a FieldMask into another message.
-  static void MergeMessageTo(const Message& source, const FieldMask& mask,
-                             const MergeOptions& options, Message* destination);
-
-  class TrimOptions;
-  // Removes from 'message' any field that is not represented in the given
-  // FieldMask. If the FieldMask is empty, does nothing.
-  // Returns true if the message is modified.
-  static bool TrimMessage(const FieldMask& mask, Message* message);
-
-  // Removes from 'message' any field that is not represented in the given
-  // FieldMask with customized TrimOptions.
-  // If the FieldMask is empty, does nothing.
-  // Returns true if the message is modified.
-  static bool TrimMessage(const FieldMask& mask, Message* message,
-                          const TrimOptions& options);
-
- private:
-  friend class SnakeCaseCamelCaseTest;
-  // Converts a field name from snake_case to camelCase:
-  //   1. Every character after "_" will be converted to uppercase.
-  //   2. All "_"s are removed.
-  // The conversion will fail if:
-  //   1. The field name contains uppercase letters.
-  //   2. Any character after a "_" is not a lowercase letter.
-  // If the conversion succeeds, it's guaranteed that the resulted
-  // camelCase name will yield the original snake_case name when
-  // converted using CamelCaseToSnakeCase().
-  //
-  // Note that the input can contain characters not allowed in C identifiers.
-  // For example, "foo_bar,baz_quz" will be converted to "fooBar,bazQuz"
-  // successfully.
-  static bool SnakeCaseToCamelCase(StringPiece input,
-                                   std::string* output);
-  // Converts a field name from camelCase to snake_case:
-  //   1. Every uppercase letter is converted to lowercase with an additional
-  //      preceding "_".
-  // The conversion will fail if:
-  //   1. The field name contains "_"s.
-  // If the conversion succeeds, it's guaranteed that the resulted
-  // snake_case name will yield the original camelCase name when
-  // converted using SnakeCaseToCamelCase().
-  //
-  // Note that the input can contain characters not allowed in C identifiers.
-  // For example, "fooBar,bazQuz" will be converted to "foo_bar,baz_quz"
-  // successfully.
-  static bool CamelCaseToSnakeCase(StringPiece input,
-                                   std::string* output);
-};
-
-class PROTOBUF_EXPORT FieldMaskUtil::MergeOptions {
- public:
-  MergeOptions()
-      : replace_message_fields_(false), replace_repeated_fields_(false) {}
-  // When merging message fields, the default behavior is to merge the
-  // content of two message fields together. If you instead want to use
-  // the field from the source message to replace the corresponding field
-  // in the destination message, set this flag to true. When this flag is set,
-  // specified submessage fields that are missing in source will be cleared in
-  // destination.
-  void set_replace_message_fields(bool value) {
-    replace_message_fields_ = value;
-  }
-  bool replace_message_fields() const { return replace_message_fields_; }
-  // The default merging behavior will append entries from the source
-  // repeated field to the destination repeated field. If you only want
-  // to keep the entries from the source repeated field, set this flag
-  // to true.
-  void set_replace_repeated_fields(bool value) {
-    replace_repeated_fields_ = value;
-  }
-  bool replace_repeated_fields() const { return replace_repeated_fields_; }
-
- private:
-  bool replace_message_fields_;
-  bool replace_repeated_fields_;
-};
-
-class PROTOBUF_EXPORT FieldMaskUtil::TrimOptions {
- public:
-  TrimOptions() : keep_required_fields_(false) {}
-  // When trimming message fields, the default behavior is to trim required
-  // fields of the present message if they are not specified in the field mask.
-  // If you instead want to keep required fields of the present message even
-  // when they are not specified in the field mask, set this flag to true.
-  void set_keep_required_fields(bool value) { keep_required_fields_ = value; }
-  bool keep_required_fields() const { return keep_required_fields_; }
-
- private:
-  bool keep_required_fields_;
-};
-
-}  // namespace util
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
-
-#endif  // GOOGLE_PROTOBUF_UTIL_FIELD_MASK_UTIL_H__
diff --git a/libs/protobuf/src/google/protobuf/util/field_mask_util_test.cc b/libs/protobuf/src/google/protobuf/util/field_mask_util_test.cc
deleted file mode 100644
index bcad739..0000000
--- a/libs/protobuf/src/google/protobuf/util/field_mask_util_test.cc
+++ /dev/null
@@ -1,836 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <google/protobuf/util/field_mask_util.h>
-
-#include <algorithm>
-#include <cstdint>
-#include <vector>
-
-#include <google/protobuf/field_mask.pb.h>
-#include <google/protobuf/test_util.h>
-#include <google/protobuf/unittest.pb.h>
-#include <gtest/gtest.h>
-#include <google/protobuf/stubs/logging.h>
-#include <google/protobuf/stubs/common.h>
-
-namespace google {
-namespace protobuf {
-namespace util {
-
-class SnakeCaseCamelCaseTest : public ::testing::Test {
- protected:
-  std::string SnakeCaseToCamelCase(const std::string& input) {
-    std::string output;
-    if (FieldMaskUtil::SnakeCaseToCamelCase(input, &output)) {
-      return output;
-    } else {
-      return "#FAIL#";
-    }
-  }
-
-  std::string CamelCaseToSnakeCase(const std::string& input) {
-    std::string output;
-    if (FieldMaskUtil::CamelCaseToSnakeCase(input, &output)) {
-      return output;
-    } else {
-      return "#FAIL#";
-    }
-  }
-};
-
-namespace {
-
-TEST_F(SnakeCaseCamelCaseTest, SnakeToCamel) {
-  EXPECT_EQ("fooBar", SnakeCaseToCamelCase("foo_bar"));
-  EXPECT_EQ("FooBar", SnakeCaseToCamelCase("_foo_bar"));
-  EXPECT_EQ("foo3Bar", SnakeCaseToCamelCase("foo3_bar"));
-  // No uppercase letter is allowed.
-  EXPECT_EQ("#FAIL#", SnakeCaseToCamelCase("Foo"));
-  // Any character after a "_" must be a lowercase letter.
-  //   1. "_" cannot be followed by another "_".
-  //   2. "_" cannot be followed by a digit.
-  //   3. "_" cannot appear as the last character.
-  EXPECT_EQ("#FAIL#", SnakeCaseToCamelCase("foo__bar"));
-  EXPECT_EQ("#FAIL#", SnakeCaseToCamelCase("foo_3bar"));
-  EXPECT_EQ("#FAIL#", SnakeCaseToCamelCase("foo_bar_"));
-}
-
-TEST_F(SnakeCaseCamelCaseTest, CamelToSnake) {
-  EXPECT_EQ("foo_bar", CamelCaseToSnakeCase("fooBar"));
-  EXPECT_EQ("_foo_bar", CamelCaseToSnakeCase("FooBar"));
-  EXPECT_EQ("foo3_bar", CamelCaseToSnakeCase("foo3Bar"));
-  // "_"s are not allowed.
-  EXPECT_EQ("#FAIL#", CamelCaseToSnakeCase("foo_bar"));
-}
-
-TEST_F(SnakeCaseCamelCaseTest, RoundTripTest) {
-  // Enumerates all possible snake_case names and test that converting it to
-  // camelCase and then to snake_case again will yield the original name.
-  std::string name = "___abc123";
-  std::sort(name.begin(), name.end());
-  do {
-    std::string camelName = SnakeCaseToCamelCase(name);
-    if (camelName != "#FAIL#") {
-      EXPECT_EQ(name, CamelCaseToSnakeCase(camelName));
-    }
-  } while (std::next_permutation(name.begin(), name.end()));
-
-  // Enumerates all possible camelCase names and test that converting it to
-  // snake_case and then to camelCase again will yield the original name.
-  name = "abcABC123";
-  std::sort(name.begin(), name.end());
-  do {
-    std::string camelName = CamelCaseToSnakeCase(name);
-    if (camelName != "#FAIL#") {
-      EXPECT_EQ(name, SnakeCaseToCamelCase(camelName));
-    }
-  } while (std::next_permutation(name.begin(), name.end()));
-}
-
-using google::protobuf::FieldMask;
-using protobuf_unittest::NestedTestAllTypes;
-using protobuf_unittest::TestAllTypes;
-using protobuf_unittest::TestRequired;
-using protobuf_unittest::TestRequiredMessage;
-
-TEST(FieldMaskUtilTest, StringFormat) {
-  FieldMask mask;
-  EXPECT_EQ("", FieldMaskUtil::ToString(mask));
-  mask.add_paths("foo_bar");
-  EXPECT_EQ("foo_bar", FieldMaskUtil::ToString(mask));
-  mask.add_paths("baz_quz");
-  EXPECT_EQ("foo_bar,baz_quz", FieldMaskUtil::ToString(mask));
-
-  FieldMaskUtil::FromString("", &mask);
-  EXPECT_EQ(0, mask.paths_size());
-  FieldMaskUtil::FromString("fooBar", &mask);
-  EXPECT_EQ(1, mask.paths_size());
-  EXPECT_EQ("fooBar", mask.paths(0));
-  FieldMaskUtil::FromString("fooBar,bazQuz", &mask);
-  EXPECT_EQ(2, mask.paths_size());
-  EXPECT_EQ("fooBar", mask.paths(0));
-  EXPECT_EQ("bazQuz", mask.paths(1));
-}
-
-TEST(FieldMaskUtilTest, JsonStringFormat) {
-  FieldMask mask;
-  std::string value;
-  EXPECT_TRUE(FieldMaskUtil::ToJsonString(mask, &value));
-  EXPECT_EQ("", value);
-  mask.add_paths("foo_bar");
-  EXPECT_TRUE(FieldMaskUtil::ToJsonString(mask, &value));
-  EXPECT_EQ("fooBar", value);
-  mask.add_paths("bar_quz");
-  EXPECT_TRUE(FieldMaskUtil::ToJsonString(mask, &value));
-  EXPECT_EQ("fooBar,barQuz", value);
-
-  FieldMaskUtil::FromJsonString("", &mask);
-  EXPECT_EQ(0, mask.paths_size());
-  FieldMaskUtil::FromJsonString("fooBar", &mask);
-  EXPECT_EQ(1, mask.paths_size());
-  EXPECT_EQ("foo_bar", mask.paths(0));
-  FieldMaskUtil::FromJsonString("fooBar,bazQuz", &mask);
-  EXPECT_EQ(2, mask.paths_size());
-  EXPECT_EQ("foo_bar", mask.paths(0));
-  EXPECT_EQ("baz_quz", mask.paths(1));
-}
-
-TEST(FieldMaskUtilTest, FromFieldNumbers) {
-  FieldMask mask;
-  std::vector<int64_t> field_numbers = {
-      TestAllTypes::kOptionalInt64FieldNumber,
-      TestAllTypes::kOptionalBoolFieldNumber,
-      TestAllTypes::kRepeatedStringFieldNumber,
-  };
-  FieldMaskUtil::FromFieldNumbers<TestAllTypes>(field_numbers, &mask);
-  ASSERT_EQ(3, mask.paths_size());
-  EXPECT_EQ("optional_int64", mask.paths(0));
-  EXPECT_EQ("optional_bool", mask.paths(1));
-  EXPECT_EQ("repeated_string", mask.paths(2));
-}
-
-TEST(FieldMaskUtilTest, GetFieldDescriptors) {
-  std::vector<const FieldDescriptor*> field_descriptors;
-  EXPECT_TRUE(FieldMaskUtil::GetFieldDescriptors(
-      TestAllTypes::descriptor(), "optional_int32", &field_descriptors));
-  EXPECT_EQ(1, field_descriptors.size());
-  EXPECT_EQ("optional_int32", field_descriptors[0]->name());
-  EXPECT_FALSE(FieldMaskUtil::GetFieldDescriptors(
-      TestAllTypes::descriptor(), "optional_nonexist", nullptr));
-  EXPECT_TRUE(FieldMaskUtil::GetFieldDescriptors(TestAllTypes::descriptor(),
-                                                 "optional_nested_message.bb",
-                                                 &field_descriptors));
-  EXPECT_EQ(2, field_descriptors.size());
-  EXPECT_EQ("optional_nested_message", field_descriptors[0]->name());
-  EXPECT_EQ("bb", field_descriptors[1]->name());
-  EXPECT_FALSE(FieldMaskUtil::GetFieldDescriptors(
-      TestAllTypes::descriptor(), "optional_nested_message.nonexist", nullptr));
-  // FieldMask cannot be used to specify sub-fields of a repeated message.
-  EXPECT_FALSE(FieldMaskUtil::GetFieldDescriptors(
-      TestAllTypes::descriptor(), "repeated_nested_message.bb", nullptr));
-}
-
-TEST(FieldMaskUtilTest, TestIsVaildPath) {
-  EXPECT_TRUE(FieldMaskUtil::IsValidPath<TestAllTypes>("optional_int32"));
-  EXPECT_FALSE(FieldMaskUtil::IsValidPath<TestAllTypes>("optional_nonexist"));
-  EXPECT_TRUE(
-      FieldMaskUtil::IsValidPath<TestAllTypes>("optional_nested_message.bb"));
-  EXPECT_FALSE(FieldMaskUtil::IsValidPath<TestAllTypes>(
-      "optional_nested_message.nonexist"));
-  // FieldMask cannot be used to specify sub-fields of a repeated message.
-  EXPECT_FALSE(
-      FieldMaskUtil::IsValidPath<TestAllTypes>("repeated_nested_message.bb"));
-}
-
-TEST(FieldMaskUtilTest, TestIsValidFieldMask) {
-  FieldMask mask;
-  FieldMaskUtil::FromString("optional_int32,optional_nested_message.bb", &mask);
-  EXPECT_TRUE(FieldMaskUtil::IsValidFieldMask<TestAllTypes>(mask));
-
-  FieldMaskUtil::FromString(
-      "optional_int32,optional_nested_message.bb,optional_nonexist", &mask);
-  EXPECT_FALSE(FieldMaskUtil::IsValidFieldMask<TestAllTypes>(mask));
-}
-
-TEST(FieldMaskUtilTest, TestGetFieldMaskForAllFields) {
-  FieldMask mask;
-  mask = FieldMaskUtil::GetFieldMaskForAllFields<TestAllTypes::NestedMessage>();
-  EXPECT_EQ(1, mask.paths_size());
-  EXPECT_TRUE(FieldMaskUtil::IsPathInFieldMask("bb", mask));
-
-  mask = FieldMaskUtil::GetFieldMaskForAllFields<TestAllTypes>();
-  EXPECT_EQ(76, mask.paths_size());
-  EXPECT_TRUE(FieldMaskUtil::IsPathInFieldMask("optional_int32", mask));
-  EXPECT_TRUE(FieldMaskUtil::IsPathInFieldMask("optional_int64", mask));
-  EXPECT_TRUE(FieldMaskUtil::IsPathInFieldMask("optional_uint32", mask));
-  EXPECT_TRUE(FieldMaskUtil::IsPathInFieldMask("optional_uint64", mask));
-  EXPECT_TRUE(FieldMaskUtil::IsPathInFieldMask("optional_sint32", mask));
-  EXPECT_TRUE(FieldMaskUtil::IsPathInFieldMask("optional_sint64", mask));
-  EXPECT_TRUE(FieldMaskUtil::IsPathInFieldMask("optional_fixed32", mask));
-  EXPECT_TRUE(FieldMaskUtil::IsPathInFieldMask("optional_fixed64", mask));
-  EXPECT_TRUE(FieldMaskUtil::IsPathInFieldMask("optional_sfixed32", mask));
-  EXPECT_TRUE(FieldMaskUtil::IsPathInFieldMask("optional_sfixed64", mask));
-  EXPECT_TRUE(FieldMaskUtil::IsPathInFieldMask("optional_float", mask));
-  EXPECT_TRUE(FieldMaskUtil::IsPathInFieldMask("optional_double", mask));
-  EXPECT_TRUE(FieldMaskUtil::IsPathInFieldMask("optional_bool", mask));
-  EXPECT_TRUE(FieldMaskUtil::IsPathInFieldMask("optional_string", mask));
-  EXPECT_TRUE(FieldMaskUtil::IsPathInFieldMask("optional_bytes", mask));
-  EXPECT_TRUE(
-      FieldMaskUtil::IsPathInFieldMask("optional_nested_message", mask));
-  EXPECT_TRUE(
-      FieldMaskUtil::IsPathInFieldMask("optional_foreign_message", mask));
-  EXPECT_TRUE(
-      FieldMaskUtil::IsPathInFieldMask("optional_import_message", mask));
-  EXPECT_TRUE(FieldMaskUtil::IsPathInFieldMask("optional_nested_enum", mask));
-  EXPECT_TRUE(FieldMaskUtil::IsPathInFieldMask("optional_foreign_enum", mask));
-  EXPECT_TRUE(FieldMaskUtil::IsPathInFieldMask("optional_import_enum", mask));
-  EXPECT_TRUE(FieldMaskUtil::IsPathInFieldMask("repeated_int32", mask));
-  EXPECT_TRUE(FieldMaskUtil::IsPathInFieldMask("repeated_int64", mask));
-  EXPECT_TRUE(FieldMaskUtil::IsPathInFieldMask("repeated_uint32", mask));
-  EXPECT_TRUE(FieldMaskUtil::IsPathInFieldMask("repeated_uint64", mask));
-  EXPECT_TRUE(FieldMaskUtil::IsPathInFieldMask("repeated_sint32", mask));
-  EXPECT_TRUE(FieldMaskUtil::IsPathInFieldMask("repeated_sint64", mask));
-  EXPECT_TRUE(FieldMaskUtil::IsPathInFieldMask("repeated_fixed32", mask));
-  EXPECT_TRUE(FieldMaskUtil::IsPathInFieldMask("repeated_fixed64", mask));
-  EXPECT_TRUE(FieldMaskUtil::IsPathInFieldMask("repeated_sfixed32", mask));
-  EXPECT_TRUE(FieldMaskUtil::IsPathInFieldMask("repeated_sfixed64", mask));
-  EXPECT_TRUE(FieldMaskUtil::IsPathInFieldMask("repeated_float", mask));
-  EXPECT_TRUE(FieldMaskUtil::IsPathInFieldMask("repeated_double", mask));
-  EXPECT_TRUE(FieldMaskUtil::IsPathInFieldMask("repeated_bool", mask));
-  EXPECT_TRUE(FieldMaskUtil::IsPathInFieldMask("repeated_string", mask));
-  EXPECT_TRUE(FieldMaskUtil::IsPathInFieldMask("repeated_bytes", mask));
-  EXPECT_TRUE(
-      FieldMaskUtil::IsPathInFieldMask("repeated_nested_message", mask));
-  EXPECT_TRUE(
-      FieldMaskUtil::IsPathInFieldMask("repeated_foreign_message", mask));
-  EXPECT_TRUE(
-      FieldMaskUtil::IsPathInFieldMask("repeated_import_message", mask));
-  EXPECT_TRUE(FieldMaskUtil::IsPathInFieldMask("repeated_nested_enum", mask));
-  EXPECT_TRUE(FieldMaskUtil::IsPathInFieldMask("repeated_foreign_enum", mask));
-  EXPECT_TRUE(FieldMaskUtil::IsPathInFieldMask("repeated_import_enum", mask));
-}
-
-TEST(FieldMaskUtilTest, TestToCanonicalForm) {
-  FieldMask in, out;
-  // Paths will be sorted.
-  FieldMaskUtil::FromString("baz.quz,bar,foo", &in);
-  FieldMaskUtil::ToCanonicalForm(in, &out);
-  EXPECT_EQ("bar,baz.quz,foo", FieldMaskUtil::ToString(out));
-  // Duplicated paths will be removed.
-  FieldMaskUtil::FromString("foo,bar,foo", &in);
-  FieldMaskUtil::ToCanonicalForm(in, &out);
-  EXPECT_EQ("bar,foo", FieldMaskUtil::ToString(out));
-  // Sub-paths of other paths will be removed.
-  FieldMaskUtil::FromString("foo.b1,bar.b1,foo.b2,bar", &in);
-  FieldMaskUtil::ToCanonicalForm(in, &out);
-  EXPECT_EQ("bar,foo.b1,foo.b2", FieldMaskUtil::ToString(out));
-
-  // Test more deeply nested cases.
-  FieldMaskUtil::FromString(
-      "foo.bar.baz1,"
-      "foo.bar.baz2.quz,"
-      "foo.bar.baz2",
-      &in);
-  FieldMaskUtil::ToCanonicalForm(in, &out);
-  EXPECT_EQ("foo.bar.baz1,foo.bar.baz2", FieldMaskUtil::ToString(out));
-  FieldMaskUtil::FromString(
-      "foo.bar.baz1,"
-      "foo.bar.baz2,"
-      "foo.bar.baz2.quz",
-      &in);
-  FieldMaskUtil::ToCanonicalForm(in, &out);
-  EXPECT_EQ("foo.bar.baz1,foo.bar.baz2", FieldMaskUtil::ToString(out));
-  FieldMaskUtil::FromString(
-      "foo.bar.baz1,"
-      "foo.bar.baz2,"
-      "foo.bar.baz2.quz,"
-      "foo.bar",
-      &in);
-  FieldMaskUtil::ToCanonicalForm(in, &out);
-  EXPECT_EQ("foo.bar", FieldMaskUtil::ToString(out));
-  FieldMaskUtil::FromString(
-      "foo.bar.baz1,"
-      "foo.bar.baz2,"
-      "foo.bar.baz2.quz,"
-      "foo",
-      &in);
-  FieldMaskUtil::ToCanonicalForm(in, &out);
-  EXPECT_EQ("foo", FieldMaskUtil::ToString(out));
-}
-
-TEST(FieldMaskUtilTest, TestUnion) {
-  FieldMask mask1, mask2, out;
-  // Test cases without overlapping.
-  FieldMaskUtil::FromString("foo,baz", &mask1);
-  FieldMaskUtil::FromString("bar,quz", &mask2);
-  FieldMaskUtil::Union(mask1, mask2, &out);
-  EXPECT_EQ("bar,baz,foo,quz", FieldMaskUtil::ToString(out));
-  // Overlap with duplicated paths.
-  FieldMaskUtil::FromString("foo,baz.bb", &mask1);
-  FieldMaskUtil::FromString("baz.bb,quz", &mask2);
-  FieldMaskUtil::Union(mask1, mask2, &out);
-  EXPECT_EQ("baz.bb,foo,quz", FieldMaskUtil::ToString(out));
-  // Overlap with paths covering some other paths.
-  FieldMaskUtil::FromString("foo.bar.baz,quz", &mask1);
-  FieldMaskUtil::FromString("foo.bar,bar", &mask2);
-  FieldMaskUtil::Union(mask1, mask2, &out);
-  EXPECT_EQ("bar,foo.bar,quz", FieldMaskUtil::ToString(out));
-}
-
-TEST(FieldMaskUtilTest, TestIntersect) {
-  FieldMask mask1, mask2, out;
-  // Test cases without overlapping.
-  FieldMaskUtil::FromString("foo,baz", &mask1);
-  FieldMaskUtil::FromString("bar,quz", &mask2);
-  FieldMaskUtil::Intersect(mask1, mask2, &out);
-  EXPECT_EQ("", FieldMaskUtil::ToString(out));
-  // Overlap with duplicated paths.
-  FieldMaskUtil::FromString("foo,baz.bb", &mask1);
-  FieldMaskUtil::FromString("baz.bb,quz", &mask2);
-  FieldMaskUtil::Intersect(mask1, mask2, &out);
-  EXPECT_EQ("baz.bb", FieldMaskUtil::ToString(out));
-  // Overlap with paths covering some other paths.
-  FieldMaskUtil::FromString("foo.bar.baz,quz", &mask1);
-  FieldMaskUtil::FromString("foo.bar,bar", &mask2);
-  FieldMaskUtil::Intersect(mask1, mask2, &out);
-  EXPECT_EQ("foo.bar.baz", FieldMaskUtil::ToString(out));
-}
-
-TEST(FieldMaskUtilTest, TestSubtract) {
-  FieldMask mask1, mask2, out;
-  // Normal case.
-  FieldMaskUtil::FromString(
-      "optional_int32,optional_uint64,optional_nested_message,optional_foreign_"
-      "message,repeated_int32,repeated_foreign_message,repeated_nested_message."
-      "bb",
-      &mask1);
-
-  FieldMaskUtil::FromString(
-      "optional_int32,optional_nested_message.bb,optional_foreign_message.c,"
-      "repeated_int32,repeated_nested_message.bb,repeated_foreign_message.f,"
-      "repeated_foreign_message.d,repeated_nested_message.bb,repeated_uint32",
-      &mask2);
-
-  FieldMaskUtil::Subtract<TestAllTypes>(mask1, mask2, &out);
-  EXPECT_EQ(
-      "optional_foreign_message.d,optional_uint64,repeated_foreign_message.c",
-      FieldMaskUtil::ToString(out));
-
-  // mask1 is empty.
-  FieldMaskUtil::FromString("", &mask1);
-  FieldMaskUtil::Subtract<TestAllTypes>(mask1, mask2, &out);
-  EXPECT_EQ("", FieldMaskUtil::ToString(out));
-
-  // mask1 is "optional_nested_message" and mask2 is
-  // "optional_nested_message.nonexist_field".
-  FieldMaskUtil::FromString("optional_nested_message", &mask1);
-  FieldMaskUtil::FromString("optional_nested_message.nonexist_field", &mask2);
-  FieldMaskUtil::Subtract<TestAllTypes>(mask1, mask2, &out);
-  EXPECT_EQ("optional_nested_message", FieldMaskUtil::ToString(out));
-
-  // mask1 is "optional_nested_message" and mask2 is
-  // "optional_nested_message".
-  FieldMaskUtil::FromString("optional_nested_message", &mask1);
-  FieldMaskUtil::FromString("optional_nested_message", &mask2);
-  FieldMaskUtil::Subtract<TestAllTypes>(mask1, mask2, &out);
-  EXPECT_EQ("", FieldMaskUtil::ToString(out));
-
-  // Regression test for b/72727550
-  FieldMaskUtil::FromString("optional_foreign_message.c", &mask1);
-  FieldMaskUtil::FromString("optional_foreign_message,optional_nested_message",
-                            &mask2);
-  FieldMaskUtil::Subtract<TestAllTypes>(mask1, mask2, &out);
-  EXPECT_EQ("", FieldMaskUtil::ToString(out));
-}
-
-TEST(FieldMaskUtilTest, TestIspathInFieldMask) {
-  FieldMask mask;
-  FieldMaskUtil::FromString("foo.bar", &mask);
-  EXPECT_FALSE(FieldMaskUtil::IsPathInFieldMask("", mask));
-  EXPECT_FALSE(FieldMaskUtil::IsPathInFieldMask("foo", mask));
-  EXPECT_TRUE(FieldMaskUtil::IsPathInFieldMask("foo.bar", mask));
-  EXPECT_TRUE(FieldMaskUtil::IsPathInFieldMask("foo.bar.baz", mask));
-  EXPECT_FALSE(FieldMaskUtil::IsPathInFieldMask("foo.bar0.baz", mask));
-}
-
-TEST(FieldMaskUtilTest, MergeMessage) {
-  TestAllTypes src, dst;
-  TestUtil::SetAllFields(&src);
-  FieldMaskUtil::MergeOptions options;
-
-#define TEST_MERGE_ONE_PRIMITIVE_FIELD(field_name)           \
-  {                                                          \
-    TestAllTypes tmp;                                        \
-    tmp.set_##field_name(src.field_name());                  \
-    FieldMask mask;                                          \
-    mask.add_paths(#field_name);                             \
-    dst.Clear();                                             \
-    FieldMaskUtil::MergeMessageTo(src, mask, options, &dst); \
-    EXPECT_EQ(tmp.DebugString(), dst.DebugString());         \
-    src.clear_##field_name();                                \
-    tmp.clear_##field_name();                                \
-    FieldMaskUtil::MergeMessageTo(src, mask, options, &dst); \
-    EXPECT_EQ(tmp.DebugString(), dst.DebugString());         \
-  }
-  TEST_MERGE_ONE_PRIMITIVE_FIELD(optional_int32)
-  TEST_MERGE_ONE_PRIMITIVE_FIELD(optional_int64)
-  TEST_MERGE_ONE_PRIMITIVE_FIELD(optional_uint32)
-  TEST_MERGE_ONE_PRIMITIVE_FIELD(optional_uint64)
-  TEST_MERGE_ONE_PRIMITIVE_FIELD(optional_sint32)
-  TEST_MERGE_ONE_PRIMITIVE_FIELD(optional_sint64)
-  TEST_MERGE_ONE_PRIMITIVE_FIELD(optional_fixed32)
-  TEST_MERGE_ONE_PRIMITIVE_FIELD(optional_fixed64)
-  TEST_MERGE_ONE_PRIMITIVE_FIELD(optional_sfixed32)
-  TEST_MERGE_ONE_PRIMITIVE_FIELD(optional_sfixed64)
-  TEST_MERGE_ONE_PRIMITIVE_FIELD(optional_float)
-  TEST_MERGE_ONE_PRIMITIVE_FIELD(optional_double)
-  TEST_MERGE_ONE_PRIMITIVE_FIELD(optional_bool)
-  TEST_MERGE_ONE_PRIMITIVE_FIELD(optional_string)
-  TEST_MERGE_ONE_PRIMITIVE_FIELD(optional_bytes)
-  TEST_MERGE_ONE_PRIMITIVE_FIELD(optional_nested_enum)
-  TEST_MERGE_ONE_PRIMITIVE_FIELD(optional_foreign_enum)
-  TEST_MERGE_ONE_PRIMITIVE_FIELD(optional_import_enum)
-#undef TEST_MERGE_ONE_PRIMITIVE_FIELD
-
-#define TEST_MERGE_ONE_FIELD(field_name)                     \
-  {                                                          \
-    TestAllTypes tmp;                                        \
-    *tmp.mutable_##field_name() = src.field_name();          \
-    FieldMask mask;                                          \
-    mask.add_paths(#field_name);                             \
-    dst.Clear();                                             \
-    FieldMaskUtil::MergeMessageTo(src, mask, options, &dst); \
-    EXPECT_EQ(tmp.DebugString(), dst.DebugString());         \
-  }
-  TEST_MERGE_ONE_FIELD(optional_nested_message)
-  TEST_MERGE_ONE_FIELD(optional_foreign_message)
-  TEST_MERGE_ONE_FIELD(optional_import_message)
-
-  TEST_MERGE_ONE_FIELD(repeated_int32)
-  TEST_MERGE_ONE_FIELD(repeated_int64)
-  TEST_MERGE_ONE_FIELD(repeated_uint32)
-  TEST_MERGE_ONE_FIELD(repeated_uint64)
-  TEST_MERGE_ONE_FIELD(repeated_sint32)
-  TEST_MERGE_ONE_FIELD(repeated_sint64)
-  TEST_MERGE_ONE_FIELD(repeated_fixed32)
-  TEST_MERGE_ONE_FIELD(repeated_fixed64)
-  TEST_MERGE_ONE_FIELD(repeated_sfixed32)
-  TEST_MERGE_ONE_FIELD(repeated_sfixed64)
-  TEST_MERGE_ONE_FIELD(repeated_float)
-  TEST_MERGE_ONE_FIELD(repeated_double)
-  TEST_MERGE_ONE_FIELD(repeated_bool)
-  TEST_MERGE_ONE_FIELD(repeated_string)
-  TEST_MERGE_ONE_FIELD(repeated_bytes)
-  TEST_MERGE_ONE_FIELD(repeated_nested_message)
-  TEST_MERGE_ONE_FIELD(repeated_foreign_message)
-  TEST_MERGE_ONE_FIELD(repeated_import_message)
-  TEST_MERGE_ONE_FIELD(repeated_nested_enum)
-  TEST_MERGE_ONE_FIELD(repeated_foreign_enum)
-  TEST_MERGE_ONE_FIELD(repeated_import_enum)
-#undef TEST_MERGE_ONE_FIELD
-
-  // Test merge nested fields.
-  NestedTestAllTypes nested_src, nested_dst;
-  nested_src.mutable_child()->mutable_payload()->set_optional_int32(1234);
-  nested_src.mutable_child()
-      ->mutable_child()
-      ->mutable_payload()
-      ->set_optional_int32(5678);
-  FieldMask mask;
-  FieldMaskUtil::FromString("child.payload", &mask);
-  FieldMaskUtil::MergeMessageTo(nested_src, mask, options, &nested_dst);
-  EXPECT_EQ(1234, nested_dst.child().payload().optional_int32());
-  EXPECT_EQ(0, nested_dst.child().child().payload().optional_int32());
-
-  FieldMaskUtil::FromString("child.child.payload", &mask);
-  FieldMaskUtil::MergeMessageTo(nested_src, mask, options, &nested_dst);
-  EXPECT_EQ(1234, nested_dst.child().payload().optional_int32());
-  EXPECT_EQ(5678, nested_dst.child().child().payload().optional_int32());
-
-  nested_dst.Clear();
-  FieldMaskUtil::FromString("child.child.payload", &mask);
-  FieldMaskUtil::MergeMessageTo(nested_src, mask, options, &nested_dst);
-  EXPECT_EQ(0, nested_dst.child().payload().optional_int32());
-  EXPECT_EQ(5678, nested_dst.child().child().payload().optional_int32());
-
-  nested_dst.Clear();
-  FieldMaskUtil::FromString("child", &mask);
-  FieldMaskUtil::MergeMessageTo(nested_src, mask, options, &nested_dst);
-  EXPECT_EQ(1234, nested_dst.child().payload().optional_int32());
-  EXPECT_EQ(5678, nested_dst.child().child().payload().optional_int32());
-
-  // Test MergeOptions.
-
-  nested_dst.Clear();
-  nested_dst.mutable_child()->mutable_payload()->set_optional_int64(4321);
-  // Message fields will be merged by default.
-  FieldMaskUtil::FromString("child.payload", &mask);
-  FieldMaskUtil::MergeMessageTo(nested_src, mask, options, &nested_dst);
-  EXPECT_EQ(1234, nested_dst.child().payload().optional_int32());
-  EXPECT_EQ(4321, nested_dst.child().payload().optional_int64());
-  // Change the behavior to replace message fields.
-  options.set_replace_message_fields(true);
-  FieldMaskUtil::FromString("child.payload", &mask);
-  FieldMaskUtil::MergeMessageTo(nested_src, mask, options, &nested_dst);
-  EXPECT_EQ(1234, nested_dst.child().payload().optional_int32());
-  EXPECT_EQ(0, nested_dst.child().payload().optional_int64());
-
-  // By default, fields missing in source are not cleared in destination.
-  options.set_replace_message_fields(false);
-  nested_dst.mutable_payload();
-  EXPECT_TRUE(nested_dst.has_payload());
-  FieldMaskUtil::FromString("payload", &mask);
-  FieldMaskUtil::MergeMessageTo(nested_src, mask, options, &nested_dst);
-  EXPECT_TRUE(nested_dst.has_payload());
-  // But they are cleared when replacing message fields.
-  options.set_replace_message_fields(true);
-  nested_dst.Clear();
-  nested_dst.mutable_payload();
-  FieldMaskUtil::FromString("payload", &mask);
-  FieldMaskUtil::MergeMessageTo(nested_src, mask, options, &nested_dst);
-  EXPECT_FALSE(nested_dst.has_payload());
-
-  nested_src.mutable_payload()->add_repeated_int32(1234);
-  nested_dst.mutable_payload()->add_repeated_int32(5678);
-  // Repeated fields will be appended by default.
-  FieldMaskUtil::FromString("payload.repeated_int32", &mask);
-  FieldMaskUtil::MergeMessageTo(nested_src, mask, options, &nested_dst);
-  ASSERT_EQ(2, nested_dst.payload().repeated_int32_size());
-  EXPECT_EQ(5678, nested_dst.payload().repeated_int32(0));
-  EXPECT_EQ(1234, nested_dst.payload().repeated_int32(1));
-  // Change the behavior to replace repeated fields.
-  options.set_replace_repeated_fields(true);
-  FieldMaskUtil::FromString("payload.repeated_int32", &mask);
-  FieldMaskUtil::MergeMessageTo(nested_src, mask, options, &nested_dst);
-  ASSERT_EQ(1, nested_dst.payload().repeated_int32_size());
-  EXPECT_EQ(1234, nested_dst.payload().repeated_int32(0));
-}
-
-TEST(FieldMaskUtilTest, TrimMessage) {
-#define TEST_TRIM_ONE_PRIMITIVE_FIELD(field_name)    \
-  {                                                  \
-    TestAllTypes msg;                                \
-    TestUtil::SetAllFields(&msg);                    \
-    TestAllTypes tmp;                                \
-    tmp.set_##field_name(msg.field_name());          \
-    FieldMask mask;                                  \
-    mask.add_paths(#field_name);                     \
-    FieldMaskUtil::TrimMessage(mask, &msg);          \
-    EXPECT_EQ(tmp.DebugString(), msg.DebugString()); \
-  }
-  TEST_TRIM_ONE_PRIMITIVE_FIELD(optional_int32)
-  TEST_TRIM_ONE_PRIMITIVE_FIELD(optional_int64)
-  TEST_TRIM_ONE_PRIMITIVE_FIELD(optional_uint32)
-  TEST_TRIM_ONE_PRIMITIVE_FIELD(optional_uint64)
-  TEST_TRIM_ONE_PRIMITIVE_FIELD(optional_sint32)
-  TEST_TRIM_ONE_PRIMITIVE_FIELD(optional_sint64)
-  TEST_TRIM_ONE_PRIMITIVE_FIELD(optional_fixed32)
-  TEST_TRIM_ONE_PRIMITIVE_FIELD(optional_fixed64)
-  TEST_TRIM_ONE_PRIMITIVE_FIELD(optional_sfixed32)
-  TEST_TRIM_ONE_PRIMITIVE_FIELD(optional_sfixed64)
-  TEST_TRIM_ONE_PRIMITIVE_FIELD(optional_float)
-  TEST_TRIM_ONE_PRIMITIVE_FIELD(optional_double)
-  TEST_TRIM_ONE_PRIMITIVE_FIELD(optional_bool)
-  TEST_TRIM_ONE_PRIMITIVE_FIELD(optional_string)
-  TEST_TRIM_ONE_PRIMITIVE_FIELD(optional_bytes)
-  TEST_TRIM_ONE_PRIMITIVE_FIELD(optional_nested_enum)
-  TEST_TRIM_ONE_PRIMITIVE_FIELD(optional_foreign_enum)
-  TEST_TRIM_ONE_PRIMITIVE_FIELD(optional_import_enum)
-#undef TEST_TRIM_ONE_PRIMITIVE_FIELD
-
-#define TEST_TRIM_ONE_FIELD(field_name)              \
-  {                                                  \
-    TestAllTypes msg;                                \
-    TestUtil::SetAllFields(&msg);                    \
-    TestAllTypes tmp;                                \
-    *tmp.mutable_##field_name() = msg.field_name();  \
-    FieldMask mask;                                  \
-    mask.add_paths(#field_name);                     \
-    FieldMaskUtil::TrimMessage(mask, &msg);          \
-    EXPECT_EQ(tmp.DebugString(), msg.DebugString()); \
-  }
-  TEST_TRIM_ONE_FIELD(optional_nested_message)
-  TEST_TRIM_ONE_FIELD(optional_foreign_message)
-  TEST_TRIM_ONE_FIELD(optional_import_message)
-
-  TEST_TRIM_ONE_FIELD(repeated_int32)
-  TEST_TRIM_ONE_FIELD(repeated_int64)
-  TEST_TRIM_ONE_FIELD(repeated_uint32)
-  TEST_TRIM_ONE_FIELD(repeated_uint64)
-  TEST_TRIM_ONE_FIELD(repeated_sint32)
-  TEST_TRIM_ONE_FIELD(repeated_sint64)
-  TEST_TRIM_ONE_FIELD(repeated_fixed32)
-  TEST_TRIM_ONE_FIELD(repeated_fixed64)
-  TEST_TRIM_ONE_FIELD(repeated_sfixed32)
-  TEST_TRIM_ONE_FIELD(repeated_sfixed64)
-  TEST_TRIM_ONE_FIELD(repeated_float)
-  TEST_TRIM_ONE_FIELD(repeated_double)
-  TEST_TRIM_ONE_FIELD(repeated_bool)
-  TEST_TRIM_ONE_FIELD(repeated_string)
-  TEST_TRIM_ONE_FIELD(repeated_bytes)
-  TEST_TRIM_ONE_FIELD(repeated_nested_message)
-  TEST_TRIM_ONE_FIELD(repeated_foreign_message)
-  TEST_TRIM_ONE_FIELD(repeated_import_message)
-  TEST_TRIM_ONE_FIELD(repeated_nested_enum)
-  TEST_TRIM_ONE_FIELD(repeated_foreign_enum)
-  TEST_TRIM_ONE_FIELD(repeated_import_enum)
-#undef TEST_TRIM_ONE_FIELD
-
-  // Test trim nested fields.
-  NestedTestAllTypes nested_msg;
-  nested_msg.mutable_child()->mutable_payload()->set_optional_int32(1234);
-  nested_msg.mutable_child()
-      ->mutable_child()
-      ->mutable_payload()
-      ->set_optional_int32(5678);
-  NestedTestAllTypes trimmed_msg(nested_msg);
-  FieldMask mask;
-  FieldMaskUtil::FromString("child.payload", &mask);
-  FieldMaskUtil::TrimMessage(mask, &trimmed_msg);
-  EXPECT_EQ(1234, trimmed_msg.child().payload().optional_int32());
-  EXPECT_EQ(0, trimmed_msg.child().child().payload().optional_int32());
-
-  trimmed_msg = nested_msg;
-  FieldMaskUtil::FromString("child.child.payload", &mask);
-  FieldMaskUtil::TrimMessage(mask, &trimmed_msg);
-  EXPECT_EQ(0, trimmed_msg.child().payload().optional_int32());
-  EXPECT_EQ(5678, trimmed_msg.child().child().payload().optional_int32());
-
-  trimmed_msg = nested_msg;
-  FieldMaskUtil::FromString("child", &mask);
-  FieldMaskUtil::TrimMessage(mask, &trimmed_msg);
-  EXPECT_EQ(1234, trimmed_msg.child().payload().optional_int32());
-  EXPECT_EQ(5678, trimmed_msg.child().child().payload().optional_int32());
-
-  trimmed_msg = nested_msg;
-  FieldMaskUtil::FromString("child.child", &mask);
-  FieldMaskUtil::TrimMessage(mask, &trimmed_msg);
-  EXPECT_EQ(0, trimmed_msg.child().payload().optional_int32());
-  EXPECT_EQ(5678, trimmed_msg.child().child().payload().optional_int32());
-
-  // Verify than an empty FieldMask trims nothing
-  TestAllTypes all_types_msg;
-  TestUtil::SetAllFields(&all_types_msg);
-  TestAllTypes trimmed_all_types(all_types_msg);
-  FieldMask empty_mask;
-  FieldMaskUtil::TrimMessage(empty_mask, &trimmed_all_types);
-  EXPECT_EQ(trimmed_all_types.DebugString(), all_types_msg.DebugString());
-
-  // Test trim required fields with keep_required_fields is set true.
-  FieldMaskUtil::TrimOptions options;
-  TestRequired required_msg_1;
-  required_msg_1.set_a(1234);
-  required_msg_1.set_b(3456);
-  required_msg_1.set_c(5678);
-  TestRequired trimmed_required_msg_1(required_msg_1);
-  FieldMaskUtil::FromString("dummy2", &mask);
-  options.set_keep_required_fields(true);
-  FieldMaskUtil::TrimMessage(mask, &trimmed_required_msg_1, options);
-  EXPECT_EQ(trimmed_required_msg_1.DebugString(), required_msg_1.DebugString());
-
-  // Test trim required fields with keep_required_fields is set false.
-  required_msg_1.clear_a();
-  required_msg_1.clear_b();
-  required_msg_1.clear_c();
-  options.set_keep_required_fields(false);
-  FieldMaskUtil::TrimMessage(mask, &trimmed_required_msg_1, options);
-  EXPECT_EQ(trimmed_required_msg_1.DebugString(), required_msg_1.DebugString());
-
-  // Test trim required message with keep_required_fields is set true.
-  TestRequiredMessage required_msg_2;
-  required_msg_2.mutable_optional_message()->set_a(1234);
-  required_msg_2.mutable_optional_message()->set_b(3456);
-  required_msg_2.mutable_optional_message()->set_c(5678);
-  required_msg_2.mutable_required_message()->set_a(1234);
-  required_msg_2.mutable_required_message()->set_b(3456);
-  required_msg_2.mutable_required_message()->set_c(5678);
-  required_msg_2.mutable_required_message()->set_dummy2(7890);
-  TestRequired* repeated_msg = required_msg_2.add_repeated_message();
-  repeated_msg->set_a(1234);
-  repeated_msg->set_b(3456);
-  repeated_msg->set_c(5678);
-  TestRequiredMessage trimmed_required_msg_2(required_msg_2);
-  FieldMaskUtil::FromString("optional_message.dummy2", &mask);
-  options.set_keep_required_fields(true);
-  required_msg_2.clear_repeated_message();
-  required_msg_2.mutable_required_message()->clear_dummy2();
-  FieldMaskUtil::TrimMessage(mask, &trimmed_required_msg_2, options);
-  EXPECT_EQ(trimmed_required_msg_2.DebugString(), required_msg_2.DebugString());
-
-  FieldMaskUtil::FromString("required_message", &mask);
-  required_msg_2.mutable_required_message()->set_dummy2(7890);
-  trimmed_required_msg_2.mutable_required_message()->set_dummy2(7890);
-  required_msg_2.clear_optional_message();
-  FieldMaskUtil::TrimMessage(mask, &trimmed_required_msg_2, options);
-  EXPECT_EQ(trimmed_required_msg_2.DebugString(), required_msg_2.DebugString());
-
-  // Test trim required message with keep_required_fields is set false.
-  FieldMaskUtil::FromString("required_message.dummy2", &mask);
-  required_msg_2.mutable_required_message()->clear_a();
-  required_msg_2.mutable_required_message()->clear_b();
-  required_msg_2.mutable_required_message()->clear_c();
-  options.set_keep_required_fields(false);
-  FieldMaskUtil::TrimMessage(mask, &trimmed_required_msg_2, options);
-  EXPECT_EQ(trimmed_required_msg_2.DebugString(), required_msg_2.DebugString());
-
-  // Verify that trimming an empty message has no effect. In particular, fields
-  // mentioned in the field mask should not be created or changed.
-  TestAllTypes empty_msg;
-  FieldMaskUtil::FromString(
-      "optional_int32,optional_bytes,optional_nested_message.bb", &mask);
-  FieldMaskUtil::TrimMessage(mask, &empty_msg);
-  EXPECT_FALSE(empty_msg.has_optional_int32());
-  EXPECT_FALSE(empty_msg.has_optional_bytes());
-  EXPECT_FALSE(empty_msg.has_optional_nested_message());
-
-  // Verify trimming of oneof fields. This should work as expected even if
-  // multiple elements of the same oneof are included in the FieldMask.
-  TestAllTypes oneof_msg;
-  oneof_msg.set_oneof_uint32(11);
-  FieldMaskUtil::FromString("oneof_uint32,oneof_nested_message.bb", &mask);
-  FieldMaskUtil::TrimMessage(mask, &oneof_msg);
-  EXPECT_EQ(11, oneof_msg.oneof_uint32());
-}
-
-TEST(FieldMaskUtilTest, TrimMessageReturnValue) {
-  FieldMask mask;
-  TestAllTypes trimed_msg;
-  TestAllTypes default_msg;
-
-  // Field mask on optional field.
-  FieldMaskUtil::FromString("optional_int32", &mask);
-
-  // Verify that if a message is updated by FieldMaskUtil::TrimMessage(), the
-  // function returns true.
-  // Test on primary field.
-  trimed_msg.set_optional_string("abc");
-  EXPECT_TRUE(FieldMaskUtil::TrimMessage(mask, &trimed_msg));
-  EXPECT_EQ(trimed_msg.DebugString(), default_msg.DebugString());
-  trimed_msg.Clear();
-
-  // Test on repeated primary field.
-  trimed_msg.add_repeated_string("abc");
-  trimed_msg.add_repeated_string("def");
-  EXPECT_TRUE(FieldMaskUtil::TrimMessage(mask, &trimed_msg));
-  EXPECT_EQ(trimed_msg.DebugString(), default_msg.DebugString());
-  trimed_msg.Clear();
-
-  // Test on nested message.
-  trimed_msg.mutable_optional_nested_message()->set_bb(123);
-  EXPECT_TRUE(FieldMaskUtil::TrimMessage(mask, &trimed_msg));
-  EXPECT_EQ(trimed_msg.DebugString(), default_msg.DebugString());
-  trimed_msg.Clear();
-
-  // Test on repeated nested message.
-  trimed_msg.add_repeated_nested_message()->set_bb(123);
-  trimed_msg.add_repeated_nested_message()->set_bb(456);
-  EXPECT_TRUE(FieldMaskUtil::TrimMessage(mask, &trimed_msg));
-  EXPECT_EQ(trimed_msg.DebugString(), default_msg.DebugString());
-  trimed_msg.Clear();
-
-  // Test on oneof field.
-  trimed_msg.set_oneof_uint32(123);
-  EXPECT_TRUE(FieldMaskUtil::TrimMessage(mask, &trimed_msg));
-  EXPECT_EQ(trimed_msg.DebugString(), default_msg.DebugString());
-  trimed_msg.Clear();
-
-  // If there is no field set other then those whitelisted,
-  // FieldMaskUtil::TrimMessage() should return false.
-  trimed_msg.set_optional_int32(123);
-  EXPECT_FALSE(FieldMaskUtil::TrimMessage(mask, &trimed_msg));
-  EXPECT_EQ(trimed_msg.optional_int32(), 123);
-  trimed_msg.Clear();
-
-  // Field mask on repeated field.
-  FieldMaskUtil::FromString("repeated_string", &mask);
-  trimed_msg.add_repeated_string("abc");
-  trimed_msg.add_repeated_string("def");
-  EXPECT_FALSE(FieldMaskUtil::TrimMessage(mask, &trimed_msg));
-  EXPECT_EQ(trimed_msg.repeated_string(0), "abc");
-  EXPECT_EQ(trimed_msg.repeated_string(1), "def");
-  trimed_msg.Clear();
-
-  // Field mask on nested message.
-  FieldMaskUtil::FromString("optional_nested_message.bb", &mask);
-  trimed_msg.mutable_optional_nested_message()->set_bb(123);
-  EXPECT_FALSE(FieldMaskUtil::TrimMessage(mask, &trimed_msg));
-  EXPECT_EQ(trimed_msg.optional_nested_message().bb(), 123);
-  trimed_msg.Clear();
-
-  // TODO(b/32443320): field mask on repeated nested message is not yet
-  // supported.
-}
-
-
-}  // namespace
-}  // namespace util
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/util/internal/constants.h b/libs/protobuf/src/google/protobuf/util/internal/constants.h
deleted file mode 100644
index 8bded86..0000000
--- a/libs/protobuf/src/google/protobuf/util/internal/constants.h
+++ /dev/null
@@ -1,101 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef GOOGLE_PROTOBUF_UTIL_INTERNAL_CONSTANTS_H__
-#define GOOGLE_PROTOBUF_UTIL_INTERNAL_CONSTANTS_H__
-
-#include <cstdint>
-
-#include <google/protobuf/stubs/common.h>
-
-// This file contains constants used by //net/proto2/util/converter.
-
-namespace google {
-namespace protobuf {
-namespace util {
-namespace converter {
-// Prefix for type URLs.
-const char kTypeServiceBaseUrl[] = "type.googleapis.com";
-
-// Format string for RFC3339 timestamp formatting.
-const char kRfc3339TimeFormat[] = "%E4Y-%m-%dT%H:%M:%S";
-
-// Same as above, but the year value is not zero-padded i.e. this accepts
-// timestamps like "1-01-0001T23:59:59Z" instead of "0001-01-0001T23:59:59Z".
-const char kRfc3339TimeFormatNoPadding[] = "%Y-%m-%dT%H:%M:%S";
-
-// Minimum seconds allowed in a google.protobuf.Timestamp value.
-const int64_t kTimestampMinSeconds = -62135596800LL;
-
-// Maximum seconds allowed in a google.protobuf.Timestamp value.
-const int64_t kTimestampMaxSeconds = 253402300799LL;
-
-// Minimum seconds allowed in a google.protobuf.Duration value.
-const int64_t kDurationMinSeconds = -315576000000LL;
-
-// Maximum seconds allowed in a google.protobuf.Duration value.
-const int64_t kDurationMaxSeconds = 315576000000LL;
-
-// Nano seconds in a second.
-const int32_t kNanosPerSecond = 1000000000;
-
-// Type url representing NULL values in google.protobuf.Struct type.
-const char kStructNullValueTypeUrl[] =
-    "type.googleapis.com/google.protobuf.NullValue";
-
-// Type string for google.protobuf.Struct
-const char kStructType[] = "google.protobuf.Struct";
-
-// Type string for struct.proto's google.protobuf.Value value type.
-const char kStructValueType[] = "google.protobuf.Value";
-
-// Type string for struct.proto's google.protobuf.ListValue value type.
-const char kStructListValueType[] = "google.protobuf.ListValue";
-
-// Type string for google.protobuf.Timestamp
-const char kTimestampType[] = "google.protobuf.Timestamp";
-
-// Type string for google.protobuf.Duration
-const char kDurationType[] = "google.protobuf.Duration";
-
-// Type URL for struct value type google.protobuf.Value
-const char kStructValueTypeUrl[] = "type.googleapis.com/google.protobuf.Value";
-
-// Type string for google.protobuf.Any
-const char kAnyType[] = "google.protobuf.Any";
-
-// The protobuf option name of jspb.message_id;
-const char kOptionJspbMessageId[] = "jspb.message_id";
-
-}  // namespace converter
-}  // namespace util
-}  // namespace protobuf
-}  // namespace google
-#endif  // GOOGLE_PROTOBUF_UTIL_INTERNAL_CONSTANTS_H__
diff --git a/libs/protobuf/src/google/protobuf/util/internal/datapiece.cc b/libs/protobuf/src/google/protobuf/util/internal/datapiece.cc
deleted file mode 100644
index 3e7aa84..0000000
--- a/libs/protobuf/src/google/protobuf/util/internal/datapiece.cc
+++ /dev/null
@@ -1,441 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <google/protobuf/util/internal/datapiece.h>
-
-#include <cmath>
-#include <cstdint>
-#include <limits>
-
-#include <google/protobuf/struct.pb.h>
-#include <google/protobuf/type.pb.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/stubs/status.h>
-#include <google/protobuf/stubs/strutil.h>
-#include <google/protobuf/util/internal/utility.h>
-#include <google/protobuf/stubs/mathutil.h>
-
-namespace google {
-namespace protobuf {
-namespace util {
-namespace converter {
-
-using util::Status;
-
-namespace {
-
-template <typename To, typename From>
-util::StatusOr<To> ValidateNumberConversion(To after, From before) {
-  if (after == before &&
-      MathUtil::Sign<From>(before) == MathUtil::Sign<To>(after)) {
-    return after;
-  } else {
-    return util::InvalidArgumentError(
-        std::is_integral<From>::value       ? ValueAsString(before)
-        : std::is_same<From, double>::value ? DoubleAsString(before)
-                                            : FloatAsString(before));
-  }
-}
-
-// For general conversion between
-//     int32, int64, uint32, uint64, double and float
-// except conversion between double and float.
-template <typename To, typename From>
-util::StatusOr<To> NumberConvertAndCheck(From before) {
-  if (std::is_same<From, To>::value) return before;
-
-  To after = static_cast<To>(before);
-  return ValidateNumberConversion(after, before);
-}
-
-// For conversion to integer types (int32, int64, uint32, uint64) from floating
-// point types (double, float) only.
-template <typename To, typename From>
-util::StatusOr<To> FloatingPointToIntConvertAndCheck(From before) {
-  if (std::is_same<From, To>::value) return before;
-
-  To after = static_cast<To>(before);
-  return ValidateNumberConversion(after, before);
-}
-
-// For conversion between double and float only.
-util::StatusOr<double> FloatToDouble(float before) {
-  // Casting float to double should just work as double has more precision
-  // than float.
-  return static_cast<double>(before);
-}
-
-util::StatusOr<float> DoubleToFloat(double before) {
-  if (std::isnan(before)) {
-    return std::numeric_limits<float>::quiet_NaN();
-  } else if (!std::isfinite(before)) {
-    // Converting a double +inf/-inf to float should just work.
-    return static_cast<float>(before);
-  } else if (before > std::numeric_limits<float>::max() ||
-             before < -std::numeric_limits<float>::max()) {
-    // Some doubles are larger than the largest float, but after
-    // rounding they will be equal to the largest float.
-    // We can't just attempt the conversion because that has UB if
-    // the value really is out-of-range.
-    // Here we take advantage that 1/2-ing a large floating point
-    // will not lose precision.
-    double half_before = before * 0.5;
-    if (half_before < std::numeric_limits<float>::max() &&
-        half_before > -std::numeric_limits<float>::max()) {
-      const float half_fmax = std::numeric_limits<float>::max() * 0.5f;
-      // If after being cut in half, the value is less than the largest float,
-      // then it's safe to convert it to float.  Importantly, this conversion
-      // rounds in the same way that the original does.
-      float half_after = static_cast<float>(half_before);
-      if (half_after <= half_fmax && half_after >= -half_fmax) {
-        return half_after + half_after;
-      }
-    }
-    // Double value outside of the range of float.
-    return util::InvalidArgumentError(DoubleAsString(before));
-  } else {
-    return static_cast<float>(before);
-  }
-}
-
-}  // namespace
-
-util::StatusOr<int32_t> DataPiece::ToInt32() const {
-  if (type_ == TYPE_STRING)
-    return StringToNumber<int32_t>(safe_strto32);
-
-  if (type_ == TYPE_DOUBLE)
-    return FloatingPointToIntConvertAndCheck<int32_t, double>(double_);
-
-  if (type_ == TYPE_FLOAT)
-    return FloatingPointToIntConvertAndCheck<int32_t, float>(float_);
-
-  return GenericConvert<int32_t>();
-}
-
-util::StatusOr<uint32_t> DataPiece::ToUint32() const {
-  if (type_ == TYPE_STRING)
-    return StringToNumber<uint32_t>(safe_strtou32);
-
-  if (type_ == TYPE_DOUBLE)
-    return FloatingPointToIntConvertAndCheck<uint32_t, double>(double_);
-
-  if (type_ == TYPE_FLOAT)
-    return FloatingPointToIntConvertAndCheck<uint32_t, float>(float_);
-
-  return GenericConvert<uint32_t>();
-}
-
-util::StatusOr<int64_t> DataPiece::ToInt64() const {
-  if (type_ == TYPE_STRING)
-    return StringToNumber<int64_t>(safe_strto64);
-
-  if (type_ == TYPE_DOUBLE)
-    return FloatingPointToIntConvertAndCheck<int64_t, double>(double_);
-
-  if (type_ == TYPE_FLOAT)
-    return FloatingPointToIntConvertAndCheck<int64_t, float>(float_);
-
-  return GenericConvert<int64_t>();
-}
-
-util::StatusOr<uint64_t> DataPiece::ToUint64() const {
-  if (type_ == TYPE_STRING)
-    return StringToNumber<uint64_t>(safe_strtou64);
-
-  if (type_ == TYPE_DOUBLE)
-    return FloatingPointToIntConvertAndCheck<uint64_t, double>(double_);
-
-  if (type_ == TYPE_FLOAT)
-    return FloatingPointToIntConvertAndCheck<uint64_t, float>(float_);
-
-  return GenericConvert<uint64_t>();
-}
-
-util::StatusOr<double> DataPiece::ToDouble() const {
-  if (type_ == TYPE_FLOAT) {
-    return FloatToDouble(float_);
-  }
-  if (type_ == TYPE_STRING) {
-    if (str_ == "Infinity") return std::numeric_limits<double>::infinity();
-    if (str_ == "-Infinity") return -std::numeric_limits<double>::infinity();
-    if (str_ == "NaN") return std::numeric_limits<double>::quiet_NaN();
-    util::StatusOr<double> value = StringToNumber<double>(safe_strtod);
-    if (value.ok() && !std::isfinite(value.value())) {
-      // safe_strtod converts out-of-range values to +inf/-inf, but we want
-      // to report them as errors.
-      return util::InvalidArgumentError(StrCat("\"", str_, "\""));
-    } else {
-      return value;
-    }
-  }
-  return GenericConvert<double>();
-}
-
-util::StatusOr<float> DataPiece::ToFloat() const {
-  if (type_ == TYPE_DOUBLE) {
-    return DoubleToFloat(double_);
-  }
-  if (type_ == TYPE_STRING) {
-    if (str_ == "Infinity") return std::numeric_limits<float>::infinity();
-    if (str_ == "-Infinity") return -std::numeric_limits<float>::infinity();
-    if (str_ == "NaN") return std::numeric_limits<float>::quiet_NaN();
-    // SafeStrToFloat() is used instead of safe_strtof() because the later
-    // does not fail on inputs like SimpleDtoa(DBL_MAX).
-    return StringToNumber<float>(SafeStrToFloat);
-  }
-  return GenericConvert<float>();
-}
-
-util::StatusOr<bool> DataPiece::ToBool() const {
-  switch (type_) {
-    case TYPE_BOOL:
-      return bool_;
-    case TYPE_STRING:
-      return StringToNumber<bool>(safe_strtob);
-    default:
-      return util::InvalidArgumentError(
-          ValueAsStringOrDefault("Wrong type. Cannot convert to Bool."));
-  }
-}
-
-util::StatusOr<std::string> DataPiece::ToString() const {
-  switch (type_) {
-    case TYPE_STRING:
-      return std::string(str_);
-    case TYPE_BYTES: {
-      std::string base64;
-      Base64Escape(str_, &base64);
-      return base64;
-    }
-    default:
-      return util::InvalidArgumentError(
-          ValueAsStringOrDefault("Cannot convert to string."));
-  }
-}
-
-std::string DataPiece::ValueAsStringOrDefault(
-    StringPiece default_string) const {
-  switch (type_) {
-    case TYPE_INT32:
-      return StrCat(i32_);
-    case TYPE_INT64:
-      return StrCat(i64_);
-    case TYPE_UINT32:
-      return StrCat(u32_);
-    case TYPE_UINT64:
-      return StrCat(u64_);
-    case TYPE_DOUBLE:
-      return DoubleAsString(double_);
-    case TYPE_FLOAT:
-      return FloatAsString(float_);
-    case TYPE_BOOL:
-      return SimpleBtoa(bool_);
-    case TYPE_STRING:
-      return StrCat("\"", str_.ToString(), "\"");
-    case TYPE_BYTES: {
-      std::string base64;
-      WebSafeBase64Escape(str_, &base64);
-      return StrCat("\"", base64, "\"");
-    }
-    case TYPE_NULL:
-      return "null";
-    default:
-      return std::string(default_string);
-  }
-}
-
-util::StatusOr<std::string> DataPiece::ToBytes() const {
-  if (type_ == TYPE_BYTES) return str_.ToString();
-  if (type_ == TYPE_STRING) {
-    std::string decoded;
-    if (!DecodeBase64(str_, &decoded)) {
-      return util::InvalidArgumentError(
-          ValueAsStringOrDefault("Invalid data in input."));
-    }
-    return decoded;
-  } else {
-    return util::InvalidArgumentError(ValueAsStringOrDefault(
-        "Wrong type. Only String or Bytes can be converted to Bytes."));
-  }
-}
-
-util::StatusOr<int> DataPiece::ToEnum(const google::protobuf::Enum* enum_type,
-                                      bool use_lower_camel_for_enums,
-                                      bool case_insensitive_enum_parsing,
-                                      bool ignore_unknown_enum_values,
-                                      bool* is_unknown_enum_value) const {
-  if (type_ == TYPE_NULL) return google::protobuf::NULL_VALUE;
-
-  if (type_ == TYPE_STRING) {
-    // First try the given value as a name.
-    std::string enum_name = std::string(str_);
-    const google::protobuf::EnumValue* value =
-        FindEnumValueByNameOrNull(enum_type, enum_name);
-    if (value != nullptr) return value->number();
-
-    // Check if int version of enum is sent as string.
-    util::StatusOr<int32_t> int_value = ToInt32();
-    if (int_value.ok()) {
-      if (const google::protobuf::EnumValue* enum_value =
-              FindEnumValueByNumberOrNull(enum_type, int_value.value())) {
-        return enum_value->number();
-      }
-    }
-
-    // Next try a normalized name.
-    bool should_normalize_enum =
-        case_insensitive_enum_parsing || use_lower_camel_for_enums;
-    if (should_normalize_enum) {
-      for (std::string::iterator it = enum_name.begin(); it != enum_name.end();
-           ++it) {
-        *it = *it == '-' ? '_' : ascii_toupper(*it);
-      }
-      value = FindEnumValueByNameOrNull(enum_type, enum_name);
-      if (value != nullptr) return value->number();
-    }
-
-    // If use_lower_camel_for_enums is true try with enum name without
-    // underscore. This will also accept camel case names as the enum_name has
-    // been normalized before.
-    if (use_lower_camel_for_enums) {
-      value = FindEnumValueByNameWithoutUnderscoreOrNull(enum_type, enum_name);
-      if (value != nullptr) return value->number();
-    }
-
-    // If ignore_unknown_enum_values is true an unknown enum value is ignored.
-    if (ignore_unknown_enum_values) {
-      *is_unknown_enum_value = true;
-      if (enum_type->enumvalue_size() > 0) {
-        return enum_type->enumvalue(0).number();
-      }
-    }
-  } else {
-    // We don't need to check whether the value is actually declared in the
-    // enum because we preserve unknown enum values as well.
-    return ToInt32();
-  }
-  return util::InvalidArgumentError(
-      ValueAsStringOrDefault("Cannot find enum with given value."));
-}
-
-template <typename To>
-util::StatusOr<To> DataPiece::GenericConvert() const {
-  switch (type_) {
-    case TYPE_INT32:
-      return NumberConvertAndCheck<To, int32_t>(i32_);
-    case TYPE_INT64:
-      return NumberConvertAndCheck<To, int64_t>(i64_);
-    case TYPE_UINT32:
-      return NumberConvertAndCheck<To, uint32_t>(u32_);
-    case TYPE_UINT64:
-      return NumberConvertAndCheck<To, uint64_t>(u64_);
-    case TYPE_DOUBLE:
-      return NumberConvertAndCheck<To, double>(double_);
-    case TYPE_FLOAT:
-      return NumberConvertAndCheck<To, float>(float_);
-    default:  // TYPE_ENUM, TYPE_STRING, TYPE_CORD, TYPE_BOOL
-      return util::InvalidArgumentError(ValueAsStringOrDefault(
-          "Wrong type. Bool, Enum, String and Cord not supported in "
-          "GenericConvert."));
-  }
-}
-
-template <typename To>
-util::StatusOr<To> DataPiece::StringToNumber(bool (*func)(StringPiece,
-                                                          To*)) const {
-  if (str_.size() > 0 && (str_[0] == ' ' || str_[str_.size() - 1] == ' ')) {
-    return util::InvalidArgumentError(StrCat("\"", str_, "\""));
-  }
-  To result;
-  if (func(str_, &result)) return result;
-  return util::InvalidArgumentError(
-      StrCat("\"", std::string(str_), "\""));
-}
-
-bool DataPiece::DecodeBase64(StringPiece src, std::string* dest) const {
-  // Try web-safe decode first, if it fails, try the non-web-safe decode.
-  if (WebSafeBase64Unescape(src, dest)) {
-    if (use_strict_base64_decoding_) {
-      // In strict mode, check if the escaped version gives us the same value as
-      // unescaped.
-      std::string encoded;
-      // WebSafeBase64Escape does no padding by default.
-      WebSafeBase64Escape(*dest, &encoded);
-      // Remove trailing padding '=' characters before comparison.
-      StringPiece src_no_padding = StringPiece(src).substr(
-          0, HasSuffixString(src, "=") ? src.find_last_not_of('=') + 1
-                                      : src.length());
-      return encoded == src_no_padding;
-    }
-    return true;
-  }
-
-  if (Base64Unescape(src, dest)) {
-    if (use_strict_base64_decoding_) {
-      std::string encoded;
-      Base64Escape(reinterpret_cast<const unsigned char*>(dest->data()),
-                         dest->length(), &encoded, false);
-      StringPiece src_no_padding = StringPiece(src).substr(
-          0, HasSuffixString(src, "=") ? src.find_last_not_of('=') + 1
-                                      : src.length());
-      return encoded == src_no_padding;
-    }
-    return true;
-  }
-
-  return false;
-}
-
-void DataPiece::InternalCopy(const DataPiece& other) {
-  type_ = other.type_;
-  use_strict_base64_decoding_ = other.use_strict_base64_decoding_;
-  switch (type_) {
-    case TYPE_INT32:
-    case TYPE_INT64:
-    case TYPE_UINT32:
-    case TYPE_UINT64:
-    case TYPE_DOUBLE:
-    case TYPE_FLOAT:
-    case TYPE_BOOL:
-    case TYPE_ENUM:
-    case TYPE_NULL:
-    case TYPE_BYTES:
-    case TYPE_STRING: {
-      str_ = other.str_;
-      break;
-    }
-  }
-}
-
-}  // namespace converter
-}  // namespace util
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/util/internal/datapiece.h b/libs/protobuf/src/google/protobuf/util/internal/datapiece.h
deleted file mode 100644
index 6d08349..0000000
--- a/libs/protobuf/src/google/protobuf/util/internal/datapiece.h
+++ /dev/null
@@ -1,219 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef GOOGLE_PROTOBUF_UTIL_INTERNAL_DATAPIECE_H__
-#define GOOGLE_PROTOBUF_UTIL_INTERNAL_DATAPIECE_H__
-
-#include <cstdint>
-#include <string>
-
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/stubs/logging.h>
-#include <google/protobuf/type.pb.h>
-#include <google/protobuf/stubs/statusor.h>
-#include <google/protobuf/stubs/strutil.h>
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-namespace util {
-namespace converter {
-class ProtoWriter;
-
-// Container for a single piece of data together with its data type.
-//
-// For primitive types (int32, int64, uint32, uint64, double, float, bool),
-// the data is stored by value.
-//
-// For string, a StringPiece is stored. For Cord, a pointer to Cord is stored.
-// Just like StringPiece, the DataPiece class does not own the storage for
-// the actual string or Cord, so it is the user's responsibility to guarantee
-// that the underlying storage is still valid when the DataPiece is accessed.
-class PROTOBUF_EXPORT DataPiece {
- public:
-  // Identifies data type of the value.
-  // These are the types supported by DataPiece.
-  enum Type {
-    TYPE_INT32 = 1,
-    TYPE_INT64 = 2,
-    TYPE_UINT32 = 3,
-    TYPE_UINT64 = 4,
-    TYPE_DOUBLE = 5,
-    TYPE_FLOAT = 6,
-    TYPE_BOOL = 7,
-    TYPE_ENUM = 8,
-    TYPE_STRING = 9,
-    TYPE_BYTES = 10,
-    TYPE_NULL = 11,  // explicit NULL type
-  };
-
-  // Constructors and Destructor
-  explicit DataPiece(const int32_t value)
-      : type_(TYPE_INT32), i32_(value), use_strict_base64_decoding_(false) {}
-  explicit DataPiece(const int64_t value)
-      : type_(TYPE_INT64), i64_(value), use_strict_base64_decoding_(false) {}
-  explicit DataPiece(const uint32_t value)
-      : type_(TYPE_UINT32), u32_(value), use_strict_base64_decoding_(false) {}
-  explicit DataPiece(const uint64_t value)
-      : type_(TYPE_UINT64), u64_(value), use_strict_base64_decoding_(false) {}
-  explicit DataPiece(const double value)
-      : type_(TYPE_DOUBLE),
-        double_(value),
-        use_strict_base64_decoding_(false) {}
-  explicit DataPiece(const float value)
-      : type_(TYPE_FLOAT), float_(value), use_strict_base64_decoding_(false) {}
-  explicit DataPiece(const bool value)
-      : type_(TYPE_BOOL), bool_(value), use_strict_base64_decoding_(false) {}
-  DataPiece(StringPiece value, bool use_strict_base64_decoding)
-      : type_(TYPE_STRING),
-        str_(value),
-        use_strict_base64_decoding_(use_strict_base64_decoding) {}
-  // Constructor for bytes. The second parameter is not used.
-  DataPiece(StringPiece value, bool /*dummy*/, bool use_strict_base64_decoding)
-      : type_(TYPE_BYTES),
-        str_(value),
-        use_strict_base64_decoding_(use_strict_base64_decoding) {}
-
-  DataPiece(const DataPiece& r) : type_(r.type_) { InternalCopy(r); }
-
-  DataPiece& operator=(const DataPiece& x) {
-    InternalCopy(x);
-    return *this;
-  }
-
-  static DataPiece NullData() { return DataPiece(TYPE_NULL, 0); }
-
-  virtual ~DataPiece() {
-  }
-
-  // Accessors
-  Type type() const { return type_; }
-
-  bool use_strict_base64_decoding() { return use_strict_base64_decoding_; }
-
-  StringPiece str() const {
-    GOOGLE_LOG_IF(DFATAL, type_ != TYPE_STRING) << "Not a string type.";
-    return str_;
-  }
-
-
-  // Parses, casts or converts the value stored in the DataPiece into an int32.
-  util::StatusOr<int32_t> ToInt32() const;
-
-  // Parses, casts or converts the value stored in the DataPiece into a uint32.
-  util::StatusOr<uint32_t> ToUint32() const;
-
-  // Parses, casts or converts the value stored in the DataPiece into an int64.
-  util::StatusOr<int64_t> ToInt64() const;
-
-  // Parses, casts or converts the value stored in the DataPiece into a uint64.
-  util::StatusOr<uint64_t> ToUint64() const;
-
-  // Parses, casts or converts the value stored in the DataPiece into a double.
-  util::StatusOr<double> ToDouble() const;
-
-  // Parses, casts or converts the value stored in the DataPiece into a float.
-  util::StatusOr<float> ToFloat() const;
-
-  // Parses, casts or converts the value stored in the DataPiece into a bool.
-  util::StatusOr<bool> ToBool() const;
-
-  // Parses, casts or converts the value stored in the DataPiece into a string.
-  util::StatusOr<std::string> ToString() const;
-
-  // Tries to convert the value contained in this datapiece to string. If the
-  // conversion fails, it returns the default_string.
-  std::string ValueAsStringOrDefault(StringPiece default_string) const;
-
-  util::StatusOr<std::string> ToBytes() const;
-
- private:
-  friend class ProtoWriter;
-
-  // Disallow implicit constructor.
-  DataPiece();
-
-  // Helper to create NULL or ENUM types.
-  DataPiece(Type type, int32_t val)
-      : type_(type), i32_(val), use_strict_base64_decoding_(false) {}
-
-  // Same as the ToEnum() method above but with additional flag to ignore
-  // unknown enum values.
-  util::StatusOr<int> ToEnum(const google::protobuf::Enum* enum_type,
-                             bool use_lower_camel_for_enums,
-                             bool case_insensitive_enum_parsing,
-                             bool ignore_unknown_enum_values,
-                             bool* is_unknown_enum_value) const;
-
-  // For numeric conversion between
-  //     int32, int64, uint32, uint64, double, float and bool
-  template <typename To>
-  util::StatusOr<To> GenericConvert() const;
-
-  // For conversion from string to
-  //     int32, int64, uint32, uint64, double, float and bool
-  template <typename To>
-  util::StatusOr<To> StringToNumber(bool (*func)(StringPiece, To*)) const;
-
-  // Decodes a base64 string. Returns true on success.
-  bool DecodeBase64(StringPiece src, std::string* dest) const;
-
-  // Helper function to initialize this DataPiece with 'other'.
-  void InternalCopy(const DataPiece& other);
-
-  // Data type for this piece of data.
-  Type type_;
-
-  // Stored piece of data.
-  union {
-    int32_t i32_;
-    int64_t i64_;
-    uint32_t u32_;
-    uint64_t u64_;
-    double double_;
-    float float_;
-    bool bool_;
-    StringPiece str_;
-  };
-
-  // Uses a stricter version of base64 decoding for byte fields.
-  bool use_strict_base64_decoding_;
-};
-
-}  // namespace converter
-}  // namespace util
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
-
-#endif  // GOOGLE_PROTOBUF_UTIL_INTERNAL_DATAPIECE_H__
diff --git a/libs/protobuf/src/google/protobuf/util/internal/default_value_objectwriter.cc b/libs/protobuf/src/google/protobuf/util/internal/default_value_objectwriter.cc
deleted file mode 100644
index 7f61cda..0000000
--- a/libs/protobuf/src/google/protobuf/util/internal/default_value_objectwriter.cc
+++ /dev/null
@@ -1,642 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <google/protobuf/util/internal/default_value_objectwriter.h>
-
-#include <cstdint>
-#include <unordered_map>
-
-#include <google/protobuf/util/internal/constants.h>
-#include <google/protobuf/util/internal/utility.h>
-#include <google/protobuf/stubs/map_util.h>
-
-namespace google {
-namespace protobuf {
-namespace util {
-namespace converter {
-
-namespace {
-// Helper function to convert string value to given data type by calling the
-// passed converter function on the DataPiece created from "value" argument.
-// If value is empty or if conversion fails, the default_value is returned.
-template <typename T>
-T ConvertTo(StringPiece value,
-            util::StatusOr<T> (DataPiece::*converter_fn)() const,
-            T default_value) {
-  if (value.empty()) return default_value;
-  util::StatusOr<T> result = (DataPiece(value, true).*converter_fn)();
-  return result.ok() ? result.value() : default_value;
-}
-}  // namespace
-
-DefaultValueObjectWriter::DefaultValueObjectWriter(
-    TypeResolver* type_resolver, const google::protobuf::Type& type,
-    ObjectWriter* ow)
-    : typeinfo_(TypeInfo::NewTypeInfo(type_resolver)),
-      own_typeinfo_(true),
-      type_(type),
-      current_(nullptr),
-      root_(nullptr),
-      suppress_empty_list_(false),
-      preserve_proto_field_names_(false),
-      use_ints_for_enums_(false),
-      ow_(ow) {}
-
-DefaultValueObjectWriter::~DefaultValueObjectWriter() {
-  if (own_typeinfo_) {
-    delete typeinfo_;
-  }
-}
-
-DefaultValueObjectWriter* DefaultValueObjectWriter::RenderBool(
-    StringPiece name, bool value) {
-  if (current_ == nullptr) {
-    ow_->RenderBool(name, value);
-  } else {
-    RenderDataPiece(name, DataPiece(value));
-  }
-  return this;
-}
-
-DefaultValueObjectWriter* DefaultValueObjectWriter::RenderInt32(
-    StringPiece name, int32_t value) {
-  if (current_ == nullptr) {
-    ow_->RenderInt32(name, value);
-  } else {
-    RenderDataPiece(name, DataPiece(value));
-  }
-  return this;
-}
-
-DefaultValueObjectWriter* DefaultValueObjectWriter::RenderUint32(
-    StringPiece name, uint32_t value) {
-  if (current_ == nullptr) {
-    ow_->RenderUint32(name, value);
-  } else {
-    RenderDataPiece(name, DataPiece(value));
-  }
-  return this;
-}
-
-DefaultValueObjectWriter* DefaultValueObjectWriter::RenderInt64(
-    StringPiece name, int64_t value) {
-  if (current_ == nullptr) {
-    ow_->RenderInt64(name, value);
-  } else {
-    RenderDataPiece(name, DataPiece(value));
-  }
-  return this;
-}
-
-DefaultValueObjectWriter* DefaultValueObjectWriter::RenderUint64(
-    StringPiece name, uint64_t value) {
-  if (current_ == nullptr) {
-    ow_->RenderUint64(name, value);
-  } else {
-    RenderDataPiece(name, DataPiece(value));
-  }
-  return this;
-}
-
-DefaultValueObjectWriter* DefaultValueObjectWriter::RenderDouble(
-    StringPiece name, double value) {
-  if (current_ == nullptr) {
-    ow_->RenderDouble(name, value);
-  } else {
-    RenderDataPiece(name, DataPiece(value));
-  }
-  return this;
-}
-
-DefaultValueObjectWriter* DefaultValueObjectWriter::RenderFloat(
-    StringPiece name, float value) {
-  if (current_ == nullptr) {
-    ow_->RenderBool(name, value);
-  } else {
-    RenderDataPiece(name, DataPiece(value));
-  }
-  return this;
-}
-
-DefaultValueObjectWriter* DefaultValueObjectWriter::RenderString(
-    StringPiece name, StringPiece value) {
-  if (current_ == nullptr) {
-    ow_->RenderString(name, value);
-  } else {
-    // Since StringPiece is essentially a pointer, takes a copy of "value" to
-    // avoid ownership issues.
-    string_values_.emplace_back(new std::string(value));
-    RenderDataPiece(name, DataPiece(*string_values_.back(), true));
-  }
-  return this;
-}
-
-DefaultValueObjectWriter* DefaultValueObjectWriter::RenderBytes(
-    StringPiece name, StringPiece value) {
-  if (current_ == nullptr) {
-    ow_->RenderBytes(name, value);
-  } else {
-    // Since StringPiece is essentially a pointer, takes a copy of "value" to
-    // avoid ownership issues.
-    string_values_.emplace_back(new std::string(value));
-    RenderDataPiece(name, DataPiece(*string_values_.back(), false, true));
-  }
-  return this;
-}
-
-DefaultValueObjectWriter* DefaultValueObjectWriter::RenderNull(
-    StringPiece name) {
-  if (current_ == nullptr) {
-    ow_->RenderNull(name);
-  } else {
-    RenderDataPiece(name, DataPiece::NullData());
-  }
-  return this;
-}
-
-void DefaultValueObjectWriter::RegisterFieldScrubCallBack(
-    FieldScrubCallBack field_scrub_callback) {
-  field_scrub_callback_ = std::move(field_scrub_callback);
-}
-
-DefaultValueObjectWriter::Node* DefaultValueObjectWriter::CreateNewNode(
-    const std::string& name, const google::protobuf::Type* type, NodeKind kind,
-    const DataPiece& data, bool is_placeholder,
-    const std::vector<std::string>& path, bool suppress_empty_list,
-    bool preserve_proto_field_names, bool use_ints_for_enums,
-    FieldScrubCallBack field_scrub_callback) {
-  return new Node(name, type, kind, data, is_placeholder, path,
-                  suppress_empty_list, preserve_proto_field_names,
-                  use_ints_for_enums, std::move(field_scrub_callback));
-}
-
-DefaultValueObjectWriter::Node::Node(
-    const std::string& name, const google::protobuf::Type* type, NodeKind kind,
-    const DataPiece& data, bool is_placeholder,
-    const std::vector<std::string>& path, bool suppress_empty_list,
-    bool preserve_proto_field_names, bool use_ints_for_enums,
-    FieldScrubCallBack field_scrub_callback)
-    : name_(name),
-      type_(type),
-      kind_(kind),
-      is_any_(false),
-      data_(data),
-      is_placeholder_(is_placeholder),
-      path_(path),
-      suppress_empty_list_(suppress_empty_list),
-      preserve_proto_field_names_(preserve_proto_field_names),
-      use_ints_for_enums_(use_ints_for_enums),
-      field_scrub_callback_(std::move(field_scrub_callback)) {}
-
-DefaultValueObjectWriter::Node* DefaultValueObjectWriter::Node::FindChild(
-    StringPiece name) {
-  if (name.empty() || kind_ != OBJECT) {
-    return nullptr;
-  }
-  for (Node* child : children_) {
-    if (child->name() == name) {
-      return child;
-    }
-  }
-  return nullptr;
-}
-
-void DefaultValueObjectWriter::Node::WriteTo(ObjectWriter* ow) {
-  if (kind_ == PRIMITIVE) {
-    ObjectWriter::RenderDataPieceTo(data_, name_, ow);
-    return;
-  }
-
-  // Render maps. Empty maps are rendered as "{}".
-  if (kind_ == MAP) {
-    ow->StartObject(name_);
-    WriteChildren(ow);
-    ow->EndObject();
-    return;
-  }
-
-  // Write out lists. If we didn't have any list in response, write out empty
-  // list.
-  if (kind_ == LIST) {
-    // Suppress empty lists if requested.
-    if (suppress_empty_list_ && is_placeholder_) return;
-
-    ow->StartList(name_);
-    WriteChildren(ow);
-    ow->EndList();
-    return;
-  }
-
-  // If is_placeholder_ = true, we didn't see this node in the response, so
-  // skip output.
-  if (is_placeholder_) return;
-
-  ow->StartObject(name_);
-  WriteChildren(ow);
-  ow->EndObject();
-}
-
-void DefaultValueObjectWriter::Node::WriteChildren(ObjectWriter* ow) {
-  for (Node* child : children_) {
-    child->WriteTo(ow);
-  }
-}
-
-const google::protobuf::Type* DefaultValueObjectWriter::Node::GetMapValueType(
-    const google::protobuf::Type& found_type, const TypeInfo* typeinfo) {
-  // If this field is a map, we should use the type of its "Value" as
-  // the type of the child node.
-  for (int i = 0; i < found_type.fields_size(); ++i) {
-    const google::protobuf::Field& sub_field = found_type.fields(i);
-    if (sub_field.number() != 2) {
-      continue;
-    }
-    if (sub_field.kind() != google::protobuf::Field::TYPE_MESSAGE) {
-      // This map's value type is not a message type. We don't need to
-      // get the field_type in this case.
-      break;
-    }
-    util::StatusOr<const google::protobuf::Type*> sub_type =
-        typeinfo->ResolveTypeUrl(sub_field.type_url());
-    if (!sub_type.ok()) {
-      GOOGLE_LOG(WARNING) << "Cannot resolve type '" << sub_field.type_url() << "'.";
-    } else {
-      return sub_type.value();
-    }
-    break;
-  }
-  return nullptr;
-}
-
-void DefaultValueObjectWriter::Node::PopulateChildren(
-    const TypeInfo* typeinfo) {
-  // Ignores well known types that don't require automatically populating their
-  // primitive children. For type "Any", we only populate its children when the
-  // "@type" field is set.
-  // TODO(tsun): remove "kStructValueType" from the list. It's being checked
-  //     now because of a bug in the tool-chain that causes the "oneof_index"
-  //     of kStructValueType to not be set correctly.
-  if (type_ == nullptr || type_->name() == kAnyType ||
-      type_->name() == kStructType || type_->name() == kTimestampType ||
-      type_->name() == kDurationType || type_->name() == kStructValueType) {
-    return;
-  }
-  std::vector<Node*> new_children;
-  std::unordered_map<std::string, int> orig_children_map;
-
-  // Creates a map of child nodes to speed up lookup.
-  for (int i = 0; i < children_.size(); ++i) {
-    InsertIfNotPresent(&orig_children_map, children_[i]->name_, i);
-  }
-
-  for (int i = 0; i < type_->fields_size(); ++i) {
-    const google::protobuf::Field& field = type_->fields(i);
-
-    // This code is checking if the field to be added to the tree should be
-    // scrubbed or not by calling the field_scrub_callback_ callback function.
-    std::vector<std::string> path;
-    if (!path_.empty()) {
-      path.insert(path.begin(), path_.begin(), path_.end());
-    }
-    path.push_back(field.name());
-    if (field_scrub_callback_ && field_scrub_callback_(path, &field)) {
-      continue;
-    }
-
-    std::unordered_map<std::string, int>::iterator found =
-        orig_children_map.find(field.name());
-    // If the child field has already been set, we just add it to the new list
-    // of children.
-    if (found != orig_children_map.end()) {
-      new_children.push_back(children_[found->second]);
-      children_[found->second] = nullptr;
-      continue;
-    }
-
-    const google::protobuf::Type* field_type = nullptr;
-    bool is_map = false;
-    NodeKind kind = PRIMITIVE;
-
-    if (field.kind() == google::protobuf::Field::TYPE_MESSAGE) {
-      kind = OBJECT;
-      util::StatusOr<const google::protobuf::Type*> found_result =
-          typeinfo->ResolveTypeUrl(field.type_url());
-      if (!found_result.ok()) {
-        // "field" is of an unknown type.
-        GOOGLE_LOG(WARNING) << "Cannot resolve type '" << field.type_url() << "'.";
-      } else {
-        const google::protobuf::Type* found_type = found_result.value();
-        is_map = IsMap(field, *found_type);
-
-        if (!is_map) {
-          field_type = found_type;
-        } else {
-          // If this field is a map, we should use the type of its "Value" as
-          // the type of the child node.
-          field_type = GetMapValueType(*found_type, typeinfo);
-          kind = MAP;
-        }
-      }
-    }
-
-    if (!is_map &&
-        field.cardinality() == google::protobuf::Field::CARDINALITY_REPEATED) {
-      kind = LIST;
-    }
-
-    // If oneof_index() != 0, the child field is part of a "oneof", which means
-    // the child field is optional and we shouldn't populate its default
-    // primitive value.
-    if (field.oneof_index() != 0 && kind == PRIMITIVE) continue;
-
-    // If the child field is of primitive type, sets its data to the default
-    // value of its type.
-    std::unique_ptr<Node> child(
-        new Node(preserve_proto_field_names_ ? field.name() : field.json_name(),
-                 field_type, kind,
-                 kind == PRIMITIVE ? CreateDefaultDataPieceForField(
-                                         field, typeinfo, use_ints_for_enums_)
-                                   : DataPiece::NullData(),
-                 true, path, suppress_empty_list_, preserve_proto_field_names_,
-                 use_ints_for_enums_, field_scrub_callback_));
-    new_children.push_back(child.release());
-  }
-  // Adds all leftover nodes in children_ to the beginning of new_child.
-  for (int i = 0; i < children_.size(); ++i) {
-    if (children_[i] == nullptr) {
-      continue;
-    }
-    new_children.insert(new_children.begin(), children_[i]);
-    children_[i] = nullptr;
-  }
-  children_.swap(new_children);
-}
-
-void DefaultValueObjectWriter::MaybePopulateChildrenOfAny(Node* node) {
-  // If this is an "Any" node with "@type" already given and no other children
-  // have been added, populates its children.
-  if (node != nullptr && node->is_any() && node->type() != nullptr &&
-      node->type()->name() != kAnyType && node->number_of_children() == 1) {
-    node->PopulateChildren(typeinfo_);
-  }
-}
-
-DataPiece DefaultValueObjectWriter::FindEnumDefault(
-    const google::protobuf::Field& field, const TypeInfo* typeinfo,
-    bool use_ints_for_enums) {
-  const google::protobuf::Enum* enum_type =
-      typeinfo->GetEnumByTypeUrl(field.type_url());
-  if (!enum_type) {
-    GOOGLE_LOG(WARNING) << "Could not find enum with type '" << field.type_url()
-                 << "'";
-    return DataPiece::NullData();
-  }
-  if (!field.default_value().empty()) {
-    if (!use_ints_for_enums) {
-      return DataPiece(field.default_value(), true);
-    } else {
-      const std::string& enum_default_value_name = field.default_value();
-      for (int enum_index = 0; enum_index < enum_type->enumvalue_size();
-           ++enum_index) {
-        auto& enum_value = enum_type->enumvalue(enum_index);
-        if (enum_value.name() == enum_default_value_name)
-          return DataPiece(enum_value.number());
-      }
-      GOOGLE_LOG(WARNING) << "Could not find enum value '" << enum_default_value_name
-                   << "' with type '" << field.type_url() << "'";
-      return DataPiece::NullData();
-    }
-  }
-  // We treat the first value as the default if none is specified.
-  return enum_type->enumvalue_size() > 0
-             ? (use_ints_for_enums
-                    ? DataPiece(enum_type->enumvalue(0).number())
-                    : DataPiece(enum_type->enumvalue(0).name(), true))
-             : DataPiece::NullData();
-}
-
-DataPiece DefaultValueObjectWriter::CreateDefaultDataPieceForField(
-    const google::protobuf::Field& field, const TypeInfo* typeinfo,
-    bool use_ints_for_enums) {
-  switch (field.kind()) {
-    case google::protobuf::Field::TYPE_DOUBLE: {
-      return DataPiece(ConvertTo<double>(
-          field.default_value(), &DataPiece::ToDouble, static_cast<double>(0)));
-    }
-    case google::protobuf::Field::TYPE_FLOAT: {
-      return DataPiece(ConvertTo<float>(
-          field.default_value(), &DataPiece::ToFloat, static_cast<float>(0)));
-    }
-    case google::protobuf::Field::TYPE_INT64:
-    case google::protobuf::Field::TYPE_SINT64:
-    case google::protobuf::Field::TYPE_SFIXED64: {
-      return DataPiece(ConvertTo<int64_t>(
-          field.default_value(), &DataPiece::ToInt64, static_cast<int64_t>(0)));
-    }
-    case google::protobuf::Field::TYPE_UINT64:
-    case google::protobuf::Field::TYPE_FIXED64: {
-      return DataPiece(ConvertTo<uint64_t>(field.default_value(),
-                                           &DataPiece::ToUint64,
-                                           static_cast<uint64_t>(0)));
-    }
-    case google::protobuf::Field::TYPE_INT32:
-    case google::protobuf::Field::TYPE_SINT32:
-    case google::protobuf::Field::TYPE_SFIXED32: {
-      return DataPiece(ConvertTo<int32_t>(
-          field.default_value(), &DataPiece::ToInt32, static_cast<int32_t>(0)));
-    }
-    case google::protobuf::Field::TYPE_BOOL: {
-      return DataPiece(
-          ConvertTo<bool>(field.default_value(), &DataPiece::ToBool, false));
-    }
-    case google::protobuf::Field::TYPE_STRING: {
-      return DataPiece(field.default_value(), true);
-    }
-    case google::protobuf::Field::TYPE_BYTES: {
-      return DataPiece(field.default_value(), false, true);
-    }
-    case google::protobuf::Field::TYPE_UINT32:
-    case google::protobuf::Field::TYPE_FIXED32: {
-      return DataPiece(ConvertTo<uint32_t>(field.default_value(),
-                                           &DataPiece::ToUint32,
-                                           static_cast<uint32_t>(0)));
-    }
-    case google::protobuf::Field::TYPE_ENUM: {
-      return FindEnumDefault(field, typeinfo, use_ints_for_enums);
-    }
-    default: {
-      return DataPiece::NullData();
-    }
-  }
-}
-
-DefaultValueObjectWriter* DefaultValueObjectWriter::StartObject(
-    StringPiece name) {
-  if (current_ == nullptr) {
-    std::vector<std::string> path;
-    root_.reset(CreateNewNode(std::string(name), &type_, OBJECT,
-                              DataPiece::NullData(), false, path,
-                              suppress_empty_list_, preserve_proto_field_names_,
-                              use_ints_for_enums_, field_scrub_callback_));
-    root_->PopulateChildren(typeinfo_);
-    current_ = root_.get();
-    return this;
-  }
-  MaybePopulateChildrenOfAny(current_);
-  Node* child = current_->FindChild(name);
-  if (current_->kind() == LIST || current_->kind() == MAP || child == nullptr) {
-    // If current_ is a list or a map node, we should create a new child and use
-    // the type of current_ as the type of the new child.
-    std::unique_ptr<Node> node(
-        CreateNewNode(std::string(name),
-                      ((current_->kind() == LIST || current_->kind() == MAP)
-                           ? current_->type()
-                           : nullptr),
-                      OBJECT, DataPiece::NullData(), false,
-                      child == nullptr ? current_->path() : child->path(),
-                      suppress_empty_list_, preserve_proto_field_names_,
-                      use_ints_for_enums_, field_scrub_callback_));
-    child = node.get();
-    current_->AddChild(node.release());
-  }
-
-  child->set_is_placeholder(false);
-  if (child->kind() == OBJECT && child->number_of_children() == 0) {
-    child->PopulateChildren(typeinfo_);
-  }
-
-  stack_.push(current_);
-  current_ = child;
-  return this;
-}
-
-DefaultValueObjectWriter* DefaultValueObjectWriter::EndObject() {
-  if (stack_.empty()) {
-    // The root object ends here. Writes out the tree.
-    WriteRoot();
-    return this;
-  }
-  current_ = stack_.top();
-  stack_.pop();
-  return this;
-}
-
-DefaultValueObjectWriter* DefaultValueObjectWriter::StartList(
-    StringPiece name) {
-  if (current_ == nullptr) {
-    std::vector<std::string> path;
-    root_.reset(CreateNewNode(std::string(name), &type_, LIST,
-                              DataPiece::NullData(), false, path,
-                              suppress_empty_list_, preserve_proto_field_names_,
-                              use_ints_for_enums_, field_scrub_callback_));
-    current_ = root_.get();
-    return this;
-  }
-  MaybePopulateChildrenOfAny(current_);
-  Node* child = current_->FindChild(name);
-  if (child == nullptr || child->kind() != LIST) {
-    std::unique_ptr<Node> node(CreateNewNode(
-        std::string(name), nullptr, LIST, DataPiece::NullData(), false,
-        child == nullptr ? current_->path() : child->path(),
-        suppress_empty_list_, preserve_proto_field_names_, use_ints_for_enums_,
-        field_scrub_callback_));
-    child = node.get();
-    current_->AddChild(node.release());
-  }
-  child->set_is_placeholder(false);
-
-  stack_.push(current_);
-  current_ = child;
-  return this;
-}
-
-void DefaultValueObjectWriter::WriteRoot() {
-  root_->WriteTo(ow_);
-  root_.reset(nullptr);
-  current_ = nullptr;
-}
-
-DefaultValueObjectWriter* DefaultValueObjectWriter::EndList() {
-  if (stack_.empty()) {
-    WriteRoot();
-    return this;
-  }
-  current_ = stack_.top();
-  stack_.pop();
-  return this;
-}
-
-void DefaultValueObjectWriter::RenderDataPiece(StringPiece name,
-                                               const DataPiece& data) {
-  MaybePopulateChildrenOfAny(current_);
-  if (current_->type() != nullptr && current_->type()->name() == kAnyType &&
-      name == "@type") {
-    util::StatusOr<std::string> data_string = data.ToString();
-    if (data_string.ok()) {
-      const std::string& string_value = data_string.value();
-      // If the type of current_ is "Any" and its "@type" field is being set
-      // here, sets the type of current_ to be the type specified by the
-      // "@type".
-      util::StatusOr<const google::protobuf::Type*> found_type =
-          typeinfo_->ResolveTypeUrl(string_value);
-      if (!found_type.ok()) {
-        GOOGLE_LOG(WARNING) << "Failed to resolve type '" << string_value << "'.";
-      } else {
-        current_->set_type(found_type.value());
-      }
-      current_->set_is_any(true);
-      // If the "@type" field is placed after other fields, we should populate
-      // other children of primitive type now. Otherwise, we should wait until
-      // the first value field is rendered before we populate the children,
-      // because the "value" field of a Any message could be omitted.
-      if (current_->number_of_children() > 1 && current_->type() != nullptr) {
-        current_->PopulateChildren(typeinfo_);
-      }
-    }
-  }
-  Node* child = current_->FindChild(name);
-  if (child == nullptr || child->kind() != PRIMITIVE) {
-    // No children are found, creates a new child.
-    std::unique_ptr<Node> node(
-        CreateNewNode(std::string(name), nullptr, PRIMITIVE, data, false,
-                      child == nullptr ? current_->path() : child->path(),
-                      suppress_empty_list_, preserve_proto_field_names_,
-                      use_ints_for_enums_, field_scrub_callback_));
-    current_->AddChild(node.release());
-  } else {
-    child->set_data(data);
-    child->set_is_placeholder(false);
-  }
-}
-
-}  // namespace converter
-}  // namespace util
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/util/internal/default_value_objectwriter.h b/libs/protobuf/src/google/protobuf/util/internal/default_value_objectwriter.h
deleted file mode 100644
index a9e1673..0000000
--- a/libs/protobuf/src/google/protobuf/util/internal/default_value_objectwriter.h
+++ /dev/null
@@ -1,332 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef GOOGLE_PROTOBUF_UTIL_INTERNAL_DEFAULT_VALUE_OBJECTWRITER_H__
-#define GOOGLE_PROTOBUF_UTIL_INTERNAL_DEFAULT_VALUE_OBJECTWRITER_H__
-
-#include <cstdint>
-#include <functional>
-#include <memory>
-#include <stack>
-#include <vector>
-
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/stubs/strutil.h>
-#include <google/protobuf/util/internal/datapiece.h>
-#include <google/protobuf/util/internal/object_writer.h>
-#include <google/protobuf/util/internal/type_info.h>
-#include <google/protobuf/util/internal/utility.h>
-#include <google/protobuf/util/type_resolver.h>
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-namespace util {
-namespace converter {
-
-// An ObjectWriter that renders non-repeated primitive fields of proto messages
-// with their default values. DefaultValueObjectWriter holds objects, lists and
-// fields it receives in a tree structure and writes them out to another
-// ObjectWriter when EndObject() is called on the root object. It also writes
-// out all non-repeated primitive fields that haven't been explicitly rendered
-// with their default values (0 for numbers, "" for strings, etc).
-class PROTOBUF_EXPORT DefaultValueObjectWriter : public ObjectWriter {
- public:
-  // A Callback function to check whether a field needs to be scrubbed.
-  //
-  // Returns true if the field should not be present in the output. Returns
-  // false otherwise.
-  //
-  // The 'path' parameter is a vector of path to the field from root. For
-  // example: if a nested field "a.b.c" (b is the parent message field of c and
-  // a is the parent message field of b), then the vector should contain { "a",
-  // "b", "c" }.
-  //
-  // The Field* should point to the google::protobuf::Field of "c".
-  typedef std::function<bool(
-      const std::vector<std::string>& /*path of the field*/,
-      const google::protobuf::Field* /*field*/)>
-      FieldScrubCallBack;
-
-  DefaultValueObjectWriter(TypeResolver* type_resolver,
-                           const google::protobuf::Type& type,
-                           ObjectWriter* ow);
-
-  ~DefaultValueObjectWriter() override;
-
-  // ObjectWriter methods.
-  DefaultValueObjectWriter* StartObject(StringPiece name) override;
-
-  DefaultValueObjectWriter* EndObject() override;
-
-  DefaultValueObjectWriter* StartList(StringPiece name) override;
-
-  DefaultValueObjectWriter* EndList() override;
-
-  DefaultValueObjectWriter* RenderBool(StringPiece name,
-                                       bool value) override;
-
-  DefaultValueObjectWriter* RenderInt32(StringPiece name,
-                                        int32_t value) override;
-
-  DefaultValueObjectWriter* RenderUint32(StringPiece name,
-                                         uint32_t value) override;
-
-  DefaultValueObjectWriter* RenderInt64(StringPiece name,
-                                        int64_t value) override;
-
-  DefaultValueObjectWriter* RenderUint64(StringPiece name,
-                                         uint64_t value) override;
-
-  DefaultValueObjectWriter* RenderDouble(StringPiece name,
-                                         double value) override;
-
-  DefaultValueObjectWriter* RenderFloat(StringPiece name,
-                                        float value) override;
-
-  DefaultValueObjectWriter* RenderString(StringPiece name,
-                                         StringPiece value) override;
-  DefaultValueObjectWriter* RenderBytes(StringPiece name,
-                                        StringPiece value) override;
-
-  DefaultValueObjectWriter* RenderNull(StringPiece name) override;
-
-  // Register the callback for scrubbing of fields.
-  void RegisterFieldScrubCallBack(FieldScrubCallBack field_scrub_callback);
-
-  // If set to true, empty lists are suppressed from output when default values
-  // are written.
-  void set_suppress_empty_list(bool value) { suppress_empty_list_ = value; }
-
-  // If set to true, original proto field names are used
-  void set_preserve_proto_field_names(bool value) {
-    preserve_proto_field_names_ = value;
-  }
-
-  // If set to true, enums are rendered as ints from output when default values
-  // are written.
-  void set_print_enums_as_ints(bool value) { use_ints_for_enums_ = value; }
-
- protected:
-  enum NodeKind {
-    PRIMITIVE = 0,
-    OBJECT = 1,
-    LIST = 2,
-    MAP = 3,
-  };
-
-  // "Node" represents a node in the tree that holds the input of
-  // DefaultValueObjectWriter.
-  class PROTOBUF_EXPORT Node {
-   public:
-    Node(const std::string& name, const google::protobuf::Type* type,
-         NodeKind kind, const DataPiece& data, bool is_placeholder,
-         const std::vector<std::string>& path, bool suppress_empty_list,
-         bool preserve_proto_field_names, bool use_ints_for_enums,
-         FieldScrubCallBack field_scrub_callback);
-    virtual ~Node() {
-      for (int i = 0; i < children_.size(); ++i) {
-        delete children_[i];
-      }
-    }
-
-    // Adds a child to this node. Takes ownership of this child.
-    void AddChild(Node* child) { children_.push_back(child); }
-
-    // Finds the child given its name.
-    Node* FindChild(StringPiece name);
-
-    // Populates children of this Node based on its type. If there are already
-    // children created, they will be merged to the result. Caller should pass
-    // in TypeInfo for looking up types of the children.
-    virtual void PopulateChildren(const TypeInfo* typeinfo);
-
-    // If this node is a leaf (has data), writes the current node to the
-    // ObjectWriter; if not, then recursively writes the children to the
-    // ObjectWriter.
-    virtual void WriteTo(ObjectWriter* ow);
-
-    // Accessors
-    const std::string& name() const { return name_; }
-
-    const std::vector<std::string>& path() const { return path_; }
-
-    const google::protobuf::Type* type() const { return type_; }
-
-    void set_type(const google::protobuf::Type* type) { type_ = type; }
-
-    NodeKind kind() const { return kind_; }
-
-    int number_of_children() const { return children_.size(); }
-
-    void set_data(const DataPiece& data) { data_ = data; }
-
-    bool is_any() const { return is_any_; }
-
-    void set_is_any(bool is_any) { is_any_ = is_any; }
-
-    void set_is_placeholder(bool is_placeholder) {
-      is_placeholder_ = is_placeholder;
-    }
-
-   protected:
-    // Returns the Value Type of a map given the Type of the map entry and a
-    // TypeInfo instance.
-    const google::protobuf::Type* GetMapValueType(
-        const google::protobuf::Type& found_type, const TypeInfo* typeinfo);
-
-    // Calls WriteTo() on every child in children_.
-    void WriteChildren(ObjectWriter* ow);
-
-    // The name of this node.
-    std::string name_;
-    // google::protobuf::Type of this node. Owned by TypeInfo.
-    const google::protobuf::Type* type_;
-    // The kind of this node.
-    NodeKind kind_;
-    // Whether this is a node for "Any".
-    bool is_any_;
-    // The data of this node when it is a leaf node.
-    DataPiece data_;
-    // Children of this node.
-    std::vector<Node*> children_;
-    // Whether this node is a placeholder for an object or list automatically
-    // generated when creating the parent node. Should be set to false after
-    // the parent node's StartObject()/StartList() method is called with this
-    // node's name.
-    bool is_placeholder_;
-
-    // Path of the field of this node
-    std::vector<std::string> path_;
-
-    // Whether to suppress empty list output.
-    bool suppress_empty_list_;
-
-    // Whether to preserve original proto field names
-    bool preserve_proto_field_names_;
-
-    // Whether to always print enums as ints
-    bool use_ints_for_enums_;
-
-    // Function for determining whether a field needs to be scrubbed or not.
-    FieldScrubCallBack field_scrub_callback_;
-
-   private:
-    GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(Node);
-  };
-
-  // Creates a new Node and returns it. Caller owns memory of returned object.
-  virtual Node* CreateNewNode(const std::string& name,
-                              const google::protobuf::Type* type, NodeKind kind,
-                              const DataPiece& data, bool is_placeholder,
-                              const std::vector<std::string>& path,
-                              bool suppress_empty_list,
-                              bool preserve_proto_field_names,
-                              bool use_ints_for_enums,
-                              FieldScrubCallBack field_scrub_callback);
-
-  // Creates a DataPiece containing the default value of the type of the field.
-  static DataPiece CreateDefaultDataPieceForField(
-      const google::protobuf::Field& field, const TypeInfo* typeinfo) {
-    return CreateDefaultDataPieceForField(field, typeinfo, false);
-  }
-
-  // Same as the above but with a flag to use ints instead of enum names.
-  static DataPiece CreateDefaultDataPieceForField(
-      const google::protobuf::Field& field, const TypeInfo* typeinfo,
-      bool use_ints_for_enums);
-
- protected:
-  // Returns a pointer to current Node in tree.
-  Node* current() { return current_; }
-
- private:
-  // Populates children of "node" if it is an "any" Node and its real type has
-  // been given.
-  void MaybePopulateChildrenOfAny(Node* node);
-
-  // Writes the root_ node to ow_ and resets the root_ and current_ pointer to
-  // nullptr.
-  void WriteRoot();
-
-  // Adds or replaces the data_ of a primitive child node.
-  void RenderDataPiece(StringPiece name, const DataPiece& data);
-
-  // Returns the default enum value as a DataPiece, or the first enum value if
-  // there is no default. For proto3, where we cannot specify an explicit
-  // default, a zero value will always be returned.
-  static DataPiece FindEnumDefault(const google::protobuf::Field& field,
-                                   const TypeInfo* typeinfo,
-                                   bool use_ints_for_enums);
-
-  // Type information for all the types used in the descriptor. Used to find
-  // google::protobuf::Type of nested messages/enums.
-  const TypeInfo* typeinfo_;
-  // Whether the TypeInfo object is owned by this class.
-  bool own_typeinfo_;
-  // google::protobuf::Type of the root message type.
-  const google::protobuf::Type& type_;
-  // Holds copies of strings passed to RenderString.
-  std::vector<std::unique_ptr<std::string>> string_values_;
-
-  // The current Node. Owned by its parents.
-  Node* current_;
-  // The root Node.
-  std::unique_ptr<Node> root_;
-  // The stack to hold the path of Nodes from current_ to root_;
-  std::stack<Node*> stack_;
-
-  // Whether to suppress output of empty lists.
-  bool suppress_empty_list_;
-
-  // Whether to preserve original proto field names
-  bool preserve_proto_field_names_;
-
-  // Whether to always print enums as ints
-  bool use_ints_for_enums_;
-
-  // Function for determining whether a field needs to be scrubbed or not.
-  FieldScrubCallBack field_scrub_callback_;
-
-  ObjectWriter* ow_;
-
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(DefaultValueObjectWriter);
-};
-
-}  // namespace converter
-}  // namespace util
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
-
-#endif  // GOOGLE_PROTOBUF_UTIL_INTERNAL_DEFAULT_VALUE_OBJECTWRITER_H__
diff --git a/libs/protobuf/src/google/protobuf/util/internal/default_value_objectwriter_test.cc b/libs/protobuf/src/google/protobuf/util/internal/default_value_objectwriter_test.cc
deleted file mode 100644
index 96b14db..0000000
--- a/libs/protobuf/src/google/protobuf/util/internal/default_value_objectwriter_test.cc
+++ /dev/null
@@ -1,191 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <google/protobuf/util/internal/default_value_objectwriter.h>
-
-#include <google/protobuf/util/internal/expecting_objectwriter.h>
-#include <google/protobuf/util/internal/testdata/default_value_test.pb.h>
-#include <google/protobuf/util/internal/constants.h>
-#include <google/protobuf/util/internal/type_info_test_helper.h>
-#include <gtest/gtest.h>
-
-namespace google {
-namespace protobuf {
-namespace util {
-namespace converter {
-namespace testing {
-
-using proto_util_converter::testing::DefaultValueTest;
-
-// Base class for setting up required state for running default values tests on
-// different descriptors.
-class BaseDefaultValueObjectWriterTest
-    : public ::testing::TestWithParam<testing::TypeInfoSource> {
- protected:
-  explicit BaseDefaultValueObjectWriterTest(const Descriptor* descriptor)
-      : helper_(GetParam()), mock_(), expects_(&mock_) {
-    helper_.ResetTypeInfo(descriptor);
-    testing_.reset(helper_.NewDefaultValueWriter(
-        std::string(kTypeServiceBaseUrl) + "/" + descriptor->full_name(),
-        &mock_));
-  }
-
-  ~BaseDefaultValueObjectWriterTest() override {}
-
-  TypeInfoTestHelper helper_;
-  MockObjectWriter mock_;
-  ExpectingObjectWriter expects_;
-  std::unique_ptr<DefaultValueObjectWriter> testing_;
-};
-
-// Tests to cover some basic DefaultValueObjectWriter use cases. More tests are
-// in the marshalling_test.cc and translator_integration_test.cc.
-class DefaultValueObjectWriterTest : public BaseDefaultValueObjectWriterTest {
- protected:
-  DefaultValueObjectWriterTest()
-      : BaseDefaultValueObjectWriterTest(DefaultValueTest::descriptor()) {}
-  ~DefaultValueObjectWriterTest() override {}
-};
-
-INSTANTIATE_TEST_SUITE_P(DifferentTypeInfoSourceTest,
-                         DefaultValueObjectWriterTest,
-                         ::testing::Values(
-                             testing::USE_TYPE_RESOLVER));
-
-TEST_P(DefaultValueObjectWriterTest, Empty) {
-  // Set expectation
-  expects_.StartObject("")
-      ->RenderDouble("doubleValue", 0.0)
-      ->StartList("repeatedDouble")
-      ->EndList()
-      ->RenderFloat("floatValue", 0.0)
-      ->RenderInt64("int64Value", 0)
-      ->RenderUint64("uint64Value", 0)
-      ->RenderInt32("int32Value", 0)
-      ->RenderUint32("uint32Value", 0)
-      ->RenderBool("boolValue", false)
-      ->RenderString("stringValue", "")
-      ->RenderBytes("bytesValue", "")
-      ->RenderString("enumValue", "ENUM_FIRST")
-      ->EndObject();
-
-  // Actual testing
-  testing_->StartObject("")->EndObject();
-}
-
-TEST_P(DefaultValueObjectWriterTest, NonDefaultDouble) {
-  // Set expectation
-  expects_.StartObject("")
-      ->RenderDouble("doubleValue", 1.0)
-      ->StartList("repeatedDouble")
-      ->EndList()
-      ->RenderFloat("floatValue", 0.0)
-      ->RenderInt64("int64Value", 0)
-      ->RenderUint64("uint64Value", 0)
-      ->RenderInt32("int32Value", 0)
-      ->RenderUint32("uint32Value", 0)
-      ->RenderBool("boolValue", false)
-      ->RenderString("stringValue", "")
-      ->RenderString("enumValue", "ENUM_FIRST")
-      ->EndObject();
-
-  // Actual testing
-  testing_->StartObject("")->RenderDouble("doubleValue", 1.0)->EndObject();
-}
-
-TEST_P(DefaultValueObjectWriterTest, ShouldRetainUnknownField) {
-  // Set expectation
-  expects_.StartObject("")
-      ->RenderDouble("doubleValue", 1.0)
-      ->StartList("repeatedDouble")
-      ->EndList()
-      ->RenderFloat("floatValue", 0.0)
-      ->RenderInt64("int64Value", 0)
-      ->RenderUint64("uint64Value", 0)
-      ->RenderInt32("int32Value", 0)
-      ->RenderUint32("uint32Value", 0)
-      ->RenderBool("boolValue", false)
-      ->RenderString("stringValue", "")
-      ->RenderString("unknown", "abc")
-      ->StartObject("unknownObject")
-      ->RenderString("unknown", "def")
-      ->EndObject()
-      ->RenderString("enumValue", "ENUM_FIRST")
-      ->EndObject();
-
-  // Actual testing
-  testing_->StartObject("")
-      ->RenderDouble("doubleValue", 1.0)
-      ->RenderString("unknown", "abc")
-      ->StartObject("unknownObject")
-      ->RenderString("unknown", "def")
-      ->EndObject()
-      ->EndObject();
-}
-
-
-class DefaultValueObjectWriterSuppressListTest
-    : public BaseDefaultValueObjectWriterTest {
- protected:
-  DefaultValueObjectWriterSuppressListTest()
-      : BaseDefaultValueObjectWriterTest(DefaultValueTest::descriptor()) {
-    testing_->set_suppress_empty_list(true);
-  }
-  ~DefaultValueObjectWriterSuppressListTest() override {}
-};
-
-INSTANTIATE_TEST_SUITE_P(DifferentTypeInfoSourceTest,
-                         DefaultValueObjectWriterSuppressListTest,
-                         ::testing::Values(
-                             testing::USE_TYPE_RESOLVER));
-
-TEST_P(DefaultValueObjectWriterSuppressListTest, Empty) {
-  // Set expectation. Empty lists should be suppressed.
-  expects_.StartObject("")
-      ->RenderDouble("doubleValue", 0.0)
-      ->RenderFloat("floatValue", 0.0)
-      ->RenderInt64("int64Value", 0)
-      ->RenderUint64("uint64Value", 0)
-      ->RenderInt32("int32Value", 0)
-      ->RenderUint32("uint32Value", 0)
-      ->RenderBool("boolValue", false)
-      ->RenderString("stringValue", "")
-      ->RenderBytes("bytesValue", "")
-      ->RenderString("enumValue", "ENUM_FIRST")
-      ->EndObject();
-
-  // Actual testing
-  testing_->StartObject("")->EndObject();
-}
-}  // namespace testing
-}  // namespace converter
-}  // namespace util
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/util/internal/error_listener.cc b/libs/protobuf/src/google/protobuf/util/internal/error_listener.cc
deleted file mode 100644
index 538307b..0000000
--- a/libs/protobuf/src/google/protobuf/util/internal/error_listener.cc
+++ /dev/null
@@ -1,42 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <google/protobuf/util/internal/error_listener.h>
-
-namespace google {
-namespace protobuf {
-namespace util {
-namespace converter {
-
-
-}  // namespace converter
-}  // namespace util
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/util/internal/error_listener.h b/libs/protobuf/src/google/protobuf/util/internal/error_listener.h
deleted file mode 100644
index 8c9c501..0000000
--- a/libs/protobuf/src/google/protobuf/util/internal/error_listener.h
+++ /dev/null
@@ -1,109 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef GOOGLE_PROTOBUF_UTIL_INTERNAL_ERROR_LISTENER_H__
-#define GOOGLE_PROTOBUF_UTIL_INTERNAL_ERROR_LISTENER_H__
-
-#include <algorithm>
-#include <memory>
-#include <string>
-#include <vector>
-
-#include <google/protobuf/stubs/callback.h>
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/stubs/logging.h>
-#include <google/protobuf/stubs/strutil.h>
-#include <google/protobuf/util/internal/location_tracker.h>
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-namespace util {
-namespace converter {
-
-// Interface for error listener.
-class PROTOBUF_EXPORT ErrorListener {
- public:
-  virtual ~ErrorListener() {}
-
-  // Reports an invalid name at the given location.
-  virtual void InvalidName(const LocationTrackerInterface& loc,
-                           StringPiece invalid_name,
-                           StringPiece message) = 0;
-
-  // Reports an invalid value for a field.
-  virtual void InvalidValue(const LocationTrackerInterface& loc,
-                            StringPiece type_name,
-                            StringPiece value) = 0;
-
-  // Reports a missing required field.
-  virtual void MissingField(const LocationTrackerInterface& loc,
-                            StringPiece missing_name) = 0;
-
- protected:
-  ErrorListener() {}
-
- private:
-  // Do not add any data members to this class.
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(ErrorListener);
-};
-
-// An error listener that ignores all errors.
-class PROTOBUF_EXPORT NoopErrorListener : public ErrorListener {
- public:
-  NoopErrorListener() {}
-  ~NoopErrorListener() override {}
-
-  void InvalidName(const LocationTrackerInterface& /*loc*/,
-                   StringPiece /* invalid_name */,
-                   StringPiece /* message */) override {}
-
-  void InvalidValue(const LocationTrackerInterface& /*loc*/,
-                    StringPiece /* type_name */,
-                    StringPiece /* value */) override {}
-
-  void MissingField(const LocationTrackerInterface& /* loc */,
-                    StringPiece /* missing_name */) override {}
-
- private:
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(NoopErrorListener);
-};
-
-
-}  // namespace converter
-}  // namespace util
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
-
-#endif  // GOOGLE_PROTOBUF_UTIL_INTERNAL_ERROR_LISTENER_H__
diff --git a/libs/protobuf/src/google/protobuf/util/internal/expecting_objectwriter.h b/libs/protobuf/src/google/protobuf/util/internal/expecting_objectwriter.h
deleted file mode 100644
index 76fe2b6..0000000
--- a/libs/protobuf/src/google/protobuf/util/internal/expecting_objectwriter.h
+++ /dev/null
@@ -1,250 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef GOOGLE_PROTOBUF_UTIL_INTERNAL_EXPECTING_OBJECTWRITER_H__
-#define GOOGLE_PROTOBUF_UTIL_INTERNAL_EXPECTING_OBJECTWRITER_H__
-
-// An implementation of ObjectWriter that automatically sets the
-// gmock expectations for the response to a method. Every method
-// returns the object itself for chaining.
-//
-// Usage:
-//   // Setup
-//   MockObjectWriter mock;
-//   ExpectingObjectWriter ow(&mock);
-//
-//   // Set expectation
-//   ow.StartObject("")
-//       ->RenderString("key", "value")
-//     ->EndObject();
-//
-//   // Actual testing
-//   mock.StartObject(StringPiece())
-//         ->RenderString("key", "value")
-//       ->EndObject();
-
-#include <cstdint>
-
-#include <google/protobuf/stubs/common.h>
-#include <gmock/gmock.h>
-#include <google/protobuf/stubs/strutil.h>
-#include <google/protobuf/util/internal/object_writer.h>
-
-namespace google {
-namespace protobuf {
-namespace util {
-namespace converter {
-
-using testing::Eq;
-using testing::IsEmpty;
-using testing::NanSensitiveDoubleEq;
-using testing::NanSensitiveFloatEq;
-using testing::Return;
-using testing::StrEq;
-using testing::TypedEq;
-
-class MockObjectWriter : public ObjectWriter {
- public:
-  MockObjectWriter() {}
-
-  MOCK_METHOD(ObjectWriter*, StartObject, (StringPiece), (override));
-  MOCK_METHOD(ObjectWriter*, EndObject, (), (override));
-  MOCK_METHOD(ObjectWriter*, StartList, (StringPiece), (override));
-  MOCK_METHOD(ObjectWriter*, EndList, (), (override));
-  MOCK_METHOD(ObjectWriter*, RenderBool, (StringPiece, bool), (override));
-  MOCK_METHOD(ObjectWriter*, RenderInt32, (StringPiece, int32_t),
-              (override));
-  MOCK_METHOD(ObjectWriter*, RenderUint32, (StringPiece, uint32_t),
-              (override));
-  MOCK_METHOD(ObjectWriter*, RenderInt64, (StringPiece, int64_t),
-              (override));
-  MOCK_METHOD(ObjectWriter*, RenderUint64, (StringPiece, uint64_t),
-              (override));
-  MOCK_METHOD(ObjectWriter*, RenderDouble, (StringPiece, double),
-              (override));
-  MOCK_METHOD(ObjectWriter*, RenderFloat, (StringPiece, float),
-              (override));
-  MOCK_METHOD(ObjectWriter*, RenderString,
-              (StringPiece, StringPiece), (override));
-  MOCK_METHOD(ObjectWriter*, RenderBytes, (StringPiece, StringPiece),
-              (override));
-  MOCK_METHOD(ObjectWriter*, RenderNull, (StringPiece), (override));
-};
-
-class ExpectingObjectWriter : public ObjectWriter {
- public:
-  explicit ExpectingObjectWriter(MockObjectWriter* mock) : mock_(mock) {}
-
-  ObjectWriter* StartObject(StringPiece name) override {
-    (name.empty() ? EXPECT_CALL(*mock_, StartObject(IsEmpty()))
-                  : EXPECT_CALL(*mock_, StartObject(Eq(std::string(name)))))
-        .WillOnce(Return(mock_))
-        .RetiresOnSaturation();
-    return this;
-  }
-
-  ObjectWriter* EndObject() override {
-    EXPECT_CALL(*mock_, EndObject())
-        .WillOnce(Return(mock_))
-        .RetiresOnSaturation();
-    return this;
-  }
-
-  ObjectWriter* StartList(StringPiece name) override {
-    (name.empty() ? EXPECT_CALL(*mock_, StartList(IsEmpty()))
-                  : EXPECT_CALL(*mock_, StartList(Eq(std::string(name)))))
-        .WillOnce(Return(mock_))
-        .RetiresOnSaturation();
-    return this;
-  }
-
-  ObjectWriter* EndList() override {
-    EXPECT_CALL(*mock_, EndList())
-        .WillOnce(Return(mock_))
-        .RetiresOnSaturation();
-    return this;
-  }
-
-  ObjectWriter* RenderBool(StringPiece name, bool value) override {
-    (name.empty()
-         ? EXPECT_CALL(*mock_, RenderBool(IsEmpty(), TypedEq<bool>(value)))
-         : EXPECT_CALL(*mock_,
-                       RenderBool(Eq(std::string(name)), TypedEq<bool>(value))))
-        .WillOnce(Return(mock_))
-        .RetiresOnSaturation();
-    return this;
-  }
-
-  ObjectWriter* RenderInt32(StringPiece name, int32_t value) override {
-    (name.empty()
-         ? EXPECT_CALL(*mock_, RenderInt32(IsEmpty(), TypedEq<int32_t>(value)))
-         : EXPECT_CALL(*mock_, RenderInt32(Eq(std::string(name)),
-                                           TypedEq<int32_t>(value))))
-        .WillOnce(Return(mock_))
-        .RetiresOnSaturation();
-    return this;
-  }
-
-  ObjectWriter* RenderUint32(StringPiece name, uint32_t value) override {
-    (name.empty() ? EXPECT_CALL(*mock_, RenderUint32(IsEmpty(),
-                                                     TypedEq<uint32_t>(value)))
-                  : EXPECT_CALL(*mock_, RenderUint32(Eq(std::string(name)),
-                                                     TypedEq<uint32_t>(value))))
-        .WillOnce(Return(mock_))
-        .RetiresOnSaturation();
-    return this;
-  }
-
-  ObjectWriter* RenderInt64(StringPiece name, int64_t value) override {
-    (name.empty()
-         ? EXPECT_CALL(*mock_, RenderInt64(IsEmpty(), TypedEq<int64_t>(value)))
-         : EXPECT_CALL(*mock_, RenderInt64(Eq(std::string(name)),
-                                           TypedEq<int64_t>(value))))
-        .WillOnce(Return(mock_))
-        .RetiresOnSaturation();
-    return this;
-  }
-
-  ObjectWriter* RenderUint64(StringPiece name, uint64_t value) override {
-    (name.empty() ? EXPECT_CALL(*mock_, RenderUint64(IsEmpty(),
-                                                     TypedEq<uint64_t>(value)))
-                  : EXPECT_CALL(*mock_, RenderUint64(Eq(std::string(name)),
-                                                     TypedEq<uint64_t>(value))))
-        .WillOnce(Return(mock_))
-        .RetiresOnSaturation();
-    return this;
-  }
-
-  ObjectWriter* RenderDouble(StringPiece name, double value) override {
-    (name.empty()
-         ? EXPECT_CALL(*mock_,
-                       RenderDouble(IsEmpty(), NanSensitiveDoubleEq(value)))
-         : EXPECT_CALL(*mock_, RenderDouble(Eq(std::string(name)),
-                                            NanSensitiveDoubleEq(value))))
-        .WillOnce(Return(mock_))
-        .RetiresOnSaturation();
-    return this;
-  }
-
-  ObjectWriter* RenderFloat(StringPiece name, float value) override {
-    (name.empty()
-         ? EXPECT_CALL(*mock_,
-                       RenderFloat(IsEmpty(), NanSensitiveFloatEq(value)))
-         : EXPECT_CALL(*mock_, RenderFloat(Eq(std::string(name)),
-                                           NanSensitiveFloatEq(value))))
-        .WillOnce(Return(mock_))
-        .RetiresOnSaturation();
-    return this;
-  }
-
-  ObjectWriter* RenderString(StringPiece name,
-                             StringPiece value) override {
-    (name.empty() ? EXPECT_CALL(*mock_, RenderString(IsEmpty(),
-                                                     TypedEq<StringPiece>(
-                                                         std::string(value))))
-                  : EXPECT_CALL(*mock_, RenderString(Eq(std::string(name)),
-                                                     TypedEq<StringPiece>(
-                                                         std::string(value)))))
-        .WillOnce(Return(mock_))
-        .RetiresOnSaturation();
-    return this;
-  }
-  virtual ObjectWriter* RenderBytes(StringPiece name, StringPiece value) {
-    (name.empty()
-         ? EXPECT_CALL(*mock_, RenderBytes(IsEmpty(), TypedEq<StringPiece>(
-                                                          value.ToString())))
-         : EXPECT_CALL(*mock_,
-                       RenderBytes(Eq(std::string(name)),
-                                   TypedEq<StringPiece>(value.ToString()))))
-        .WillOnce(Return(mock_))
-        .RetiresOnSaturation();
-    return this;
-  }
-
-  ObjectWriter* RenderNull(StringPiece name) override {
-    (name.empty() ? EXPECT_CALL(*mock_, RenderNull(IsEmpty()))
-                  : EXPECT_CALL(*mock_, RenderNull(Eq(std::string(name))))
-                        .WillOnce(Return(mock_))
-                        .RetiresOnSaturation());
-    return this;
-  }
-
- private:
-  MockObjectWriter* mock_;
-
-  GOOGLE_DISALLOW_IMPLICIT_CONSTRUCTORS(ExpectingObjectWriter);
-};
-
-}  // namespace converter
-}  // namespace util
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // GOOGLE_PROTOBUF_UTIL_INTERNAL_EXPECTING_OBJECTWRITER_H__
diff --git a/libs/protobuf/src/google/protobuf/util/internal/field_mask_utility.cc b/libs/protobuf/src/google/protobuf/util/internal/field_mask_utility.cc
deleted file mode 100644
index 521bf48..0000000
--- a/libs/protobuf/src/google/protobuf/util/internal/field_mask_utility.cc
+++ /dev/null
@@ -1,218 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <google/protobuf/util/internal/field_mask_utility.h>
-
-#include <google/protobuf/stubs/status.h>
-#include <google/protobuf/stubs/strutil.h>
-#include <google/protobuf/util/internal/utility.h>
-#include <google/protobuf/stubs/status_macros.h>
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-namespace util {
-namespace converter {
-
-namespace {
-
-// Appends a FieldMask path segment to a prefix.
-std::string AppendPathSegmentToPrefix(StringPiece prefix,
-                                      StringPiece segment) {
-  if (prefix.empty()) {
-    return std::string(segment);
-  }
-  if (segment.empty()) {
-    return std::string(prefix);
-  }
-  // If the segment is a map key, appends it to the prefix without the ".".
-  if (HasPrefixString(segment, "[\"")) {
-    return StrCat(prefix, segment);
-  }
-  return StrCat(prefix, ".", segment);
-}
-
-}  // namespace
-
-std::string ConvertFieldMaskPath(const StringPiece path,
-                                 ConverterCallback converter) {
-  std::string result;
-  result.reserve(path.size() << 1);
-
-  bool is_quoted = false;
-  bool is_escaping = false;
-  int current_segment_start = 0;
-
-  // Loops until 1 passed the end of the input to make handling the last
-  // segment easier.
-  for (size_t i = 0; i <= path.size(); ++i) {
-    // Outputs quoted string as-is.
-    if (is_quoted) {
-      if (i == path.size()) {
-        break;
-      }
-      result.push_back(path[i]);
-      if (is_escaping) {
-        is_escaping = false;
-      } else if (path[i] == '\\') {
-        is_escaping = true;
-      } else if (path[i] == '\"') {
-        current_segment_start = i + 1;
-        is_quoted = false;
-      }
-      continue;
-    }
-    if (i == path.size() || path[i] == '.' || path[i] == '(' ||
-        path[i] == ')' || path[i] == '\"') {
-      result += converter(
-          path.substr(current_segment_start, i - current_segment_start));
-      if (i < path.size()) {
-        result.push_back(path[i]);
-      }
-      current_segment_start = i + 1;
-    }
-    if (i < path.size() && path[i] == '\"') {
-      is_quoted = true;
-    }
-  }
-  return result;
-}
-
-util::Status DecodeCompactFieldMaskPaths(StringPiece paths,
-                                         PathSinkCallback path_sink) {
-  std::stack<std::string> prefix;
-  int length = paths.length();
-  int previous_position = 0;
-  bool in_map_key = false;
-  bool is_escaping = false;
-  // Loops until 1 passed the end of the input to make the handle of the last
-  // segment easier.
-  for (int i = 0; i <= length; ++i) {
-    if (i != length) {
-      // Skips everything in a map key until we hit the end of it, which is
-      // marked by an un-escaped '"' immediately followed by a ']'.
-      if (in_map_key) {
-        if (is_escaping) {
-          is_escaping = false;
-          continue;
-        }
-        if (paths[i] == '\\') {
-          is_escaping = true;
-          continue;
-        }
-        if (paths[i] != '\"') {
-          continue;
-        }
-        // Un-escaped '"' must be followed with a ']'.
-        if (i >= length - 1 || paths[i + 1] != ']') {
-          return util::InvalidArgumentError(StrCat(
-              "Invalid FieldMask '", paths,
-              "'. Map keys should be represented as [\"some_key\"]."));
-        }
-        // The end of the map key ("\"]") has been found.
-        in_map_key = false;
-        // Skips ']'.
-        i++;
-        // Checks whether the key ends at the end of a path segment.
-        if (i < length - 1 && paths[i + 1] != '.' && paths[i + 1] != ',' &&
-            paths[i + 1] != ')' && paths[i + 1] != '(') {
-          return util::InvalidArgumentError(StrCat(
-              "Invalid FieldMask '", paths,
-              "'. Map keys should be at the end of a path segment."));
-        }
-        is_escaping = false;
-        continue;
-      }
-
-      // We are not in a map key, look for the start of one.
-      if (paths[i] == '[') {
-        if (i >= length - 1 || paths[i + 1] != '\"') {
-          return util::InvalidArgumentError(StrCat(
-              "Invalid FieldMask '", paths,
-              "'. Map keys should be represented as [\"some_key\"]."));
-        }
-        // "[\"" starts a map key.
-        in_map_key = true;
-        i++;  // Skips the '\"'.
-        continue;
-      }
-      // If the current character is not a special character (',', '(' or ')'),
-      // continue to the next.
-      if (paths[i] != ',' && paths[i] != ')' && paths[i] != '(') {
-        continue;
-      }
-    }
-    // Gets the current segment - sub-string between previous position (after
-    // '(', ')', ',', or the beginning of the input) and the current position.
-    StringPiece segment =
-        paths.substr(previous_position, i - previous_position);
-    std::string current_prefix = prefix.empty() ? "" : prefix.top();
-
-    if (i < length && paths[i] == '(') {
-      // Builds a prefix and save it into the stack.
-      prefix.push(AppendPathSegmentToPrefix(current_prefix, segment));
-    } else if (!segment.empty()) {
-      // When the current character is ')', ',' or the current position has
-      // passed the end of the input, builds and outputs a new paths by
-      // concatenating the last prefix with the current segment.
-      RETURN_IF_ERROR(
-          path_sink(AppendPathSegmentToPrefix(current_prefix, segment)));
-    }
-
-    // Removes the last prefix after seeing a ')'.
-    if (i < length && paths[i] == ')') {
-      if (prefix.empty()) {
-        return util::InvalidArgumentError(
-            StrCat("Invalid FieldMask '", paths,
-                         "'. Cannot find matching '(' for all ')'."));
-      }
-      prefix.pop();
-    }
-    previous_position = i + 1;
-  }
-  if (in_map_key) {
-    return util::InvalidArgumentError(
-        StrCat("Invalid FieldMask '", paths,
-                     "'. Cannot find matching ']' for all '['."));
-  }
-  if (!prefix.empty()) {
-    return util::InvalidArgumentError(
-        StrCat("Invalid FieldMask '", paths,
-                     "'. Cannot find matching ')' for all '('."));
-  }
-  return util::Status();
-}
-
-}  // namespace converter
-}  // namespace util
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/util/internal/field_mask_utility.h b/libs/protobuf/src/google/protobuf/util/internal/field_mask_utility.h
deleted file mode 100644
index 1882333..0000000
--- a/libs/protobuf/src/google/protobuf/util/internal/field_mask_utility.h
+++ /dev/null
@@ -1,74 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// FieldMask related utility methods.
-
-#ifndef GOOGLE_PROTOBUF_UTIL_INTERNAL_FIELD_MASK_UTILITY_H__
-#define GOOGLE_PROTOBUF_UTIL_INTERNAL_FIELD_MASK_UTILITY_H__
-
-#include <functional>
-#include <stack>
-
-#include <google/protobuf/stubs/callback.h>
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/stubs/status.h>
-#include <google/protobuf/stubs/strutil.h>
-#include <google/protobuf/stubs/status.h>
-
-namespace google {
-namespace protobuf {
-namespace util {
-namespace converter {
-
-typedef std::function<std::string(StringPiece)> ConverterCallback;
-typedef std::function<util::Status(StringPiece)> PathSinkCallback;
-
-// Applies a 'converter' to each segment of a FieldMask path and returns the
-// result. Quoted strings in the 'path' are copied to the output as-is without
-// converting their content. Escaping is supported within quoted strings.
-// For example, "ab\"_c" will be returned as "ab\"_c" without any changes.
-std::string ConvertFieldMaskPath(const StringPiece path,
-                                 ConverterCallback converter);
-
-// Decodes a compact list of FieldMasks. For example, "a.b,a.c.d,a.c.e" will be
-// decoded into a list of field paths - "a.b", "a.c.d", "a.c.e". And the results
-// will be sent to 'path_sink', i.e. 'path_sink' will be called once per
-// resulting path.
-// Note that we also support Apiary style FieldMask form. The above example in
-// the Apiary style will look like "a.b,a.c(d,e)".
-util::Status DecodeCompactFieldMaskPaths(StringPiece paths,
-                                         PathSinkCallback path_sink);
-
-}  // namespace converter
-}  // namespace util
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // GOOGLE_PROTOBUF_UTIL_INTERNAL_FIELD_MASK_UTILITY_H__
diff --git a/libs/protobuf/src/google/protobuf/util/internal/json_escaping.cc b/libs/protobuf/src/google/protobuf/util/internal/json_escaping.cc
deleted file mode 100644
index e4fa8cf..0000000
--- a/libs/protobuf/src/google/protobuf/util/internal/json_escaping.cc
+++ /dev/null
@@ -1,372 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <google/protobuf/util/internal/json_escaping.h>
-
-#include <cstdint>
-
-#include <google/protobuf/stubs/logging.h>
-#include <google/protobuf/stubs/common.h>
-
-namespace google {
-namespace protobuf {
-namespace util {
-namespace converter {
-
-namespace {
-
-// Array of hex characters for conversion to hex.
-static const char kHex[] = "0123456789abcdef";
-
-// Characters 0x00 to 0x9f are very commonly used, so we provide a special
-// table lookup.
-//
-// For unicode code point ch < 0xa0:
-// kCommonEscapes[ch] is the escaped string of ch, if escaping is needed;
-//                    or an empty string, if escaping is not needed.
-static const char kCommonEscapes[160][7] = {
-    // C0 (ASCII and derivatives) control characters
-    "\\u0000", "\\u0001", "\\u0002", "\\u0003",  // 0x00
-    "\\u0004", "\\u0005", "\\u0006", "\\u0007", "\\b", "\\t", "\\n", "\\u000b",
-    "\\f", "\\r", "\\u000e", "\\u000f", "\\u0010", "\\u0011", "\\u0012",
-    "\\u0013",  // 0x10
-    "\\u0014", "\\u0015", "\\u0016", "\\u0017", "\\u0018", "\\u0019", "\\u001a",
-    "\\u001b", "\\u001c", "\\u001d", "\\u001e", "\\u001f",
-    // Escaping of " and \ are required by www.json.org string definition.
-    // Escaping of < and > are required for HTML security.
-    "", "", "\\\"", "", "", "", "", "",                              // 0x20
-    "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "",  // 0x30
-    "", "", "", "", "\\u003c", "", "\\u003e", "", "", "", "", "", "", "", "",
-    "",                                                                  // 0x40
-    "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "",      // 0x50
-    "", "", "", "", "\\\\", "", "", "", "", "", "", "", "", "", "", "",  // 0x60
-    "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "",      // 0x70
-    "", "", "", "", "", "", "", "\\u007f",
-    // C1 (ISO 8859 and Unicode) extended control characters
-    "\\u0080", "\\u0081", "\\u0082", "\\u0083",  // 0x80
-    "\\u0084", "\\u0085", "\\u0086", "\\u0087", "\\u0088", "\\u0089", "\\u008a",
-    "\\u008b", "\\u008c", "\\u008d", "\\u008e", "\\u008f", "\\u0090", "\\u0091",
-    "\\u0092", "\\u0093",  // 0x90
-    "\\u0094", "\\u0095", "\\u0096", "\\u0097", "\\u0098", "\\u0099", "\\u009a",
-    "\\u009b", "\\u009c", "\\u009d", "\\u009e", "\\u009f"};
-
-// Determines if the given char value is a unicode surrogate code unit (either
-// high-surrogate or low-surrogate).
-inline bool IsSurrogate(uint32_t c) {
-  // Optimized form of:
-  // return c >= kMinHighSurrogate && c <= kMaxLowSurrogate;
-  // (Reduced from 3 ALU instructions to 2 ALU instructions)
-  return (c & 0xfffff800) == JsonEscaping::kMinHighSurrogate;
-}
-
-// Returns true if the given unicode code point cp is a valid
-// unicode code point (i.e. in the range 0 <= cp <= kMaxCodePoint).
-inline bool IsValidCodePoint(uint32_t cp) {
-  return cp <= JsonEscaping::kMaxCodePoint;
-}
-
-// Returns the low surrogate for the given unicode code point. The result is
-// meaningless if the given code point is not a supplementary character.
-inline uint16_t ToLowSurrogate(uint32_t cp) {
-  return (cp &
-          (JsonEscaping::kMaxLowSurrogate - JsonEscaping::kMinLowSurrogate)) +
-         JsonEscaping::kMinLowSurrogate;
-}
-
-// Returns the high surrogate for the given unicode code point. The result is
-// meaningless if the given code point is not a supplementary character.
-inline uint16_t ToHighSurrogate(uint32_t cp) {
-  return (cp >> 10) + (JsonEscaping::kMinHighSurrogate -
-                       (JsonEscaping::kMinSupplementaryCodePoint >> 10));
-}
-
-// Input str is encoded in UTF-8. A unicode code point could be encoded in
-// UTF-8 using anywhere from 1 to 4 characters, and it could span multiple
-// reads of the ByteSource.
-//
-// This function reads the next unicode code point from the input (str) at
-// the given position (index), taking into account any left-over partial
-// code point from the previous iteration (cp), together with the number
-// of characters left to read to complete this code point (num_left).
-//
-// This function assumes that the input (str) is valid at the given position
-// (index). In order words, at least one character could be read successfully.
-//
-// The code point read (partial or complete) is stored in (cp). Upon return,
-// (num_left) stores the number of characters that has yet to be read in
-// order to complete the current unicode code point. If the read is complete,
-// then (num_left) is 0. Also, (num_read) is the number of characters read.
-//
-// Returns false if we encounter an invalid UTF-8 string. Returns true
-// otherwise, including the case when we reach the end of the input (str)
-// before a complete unicode code point is read.
-bool ReadCodePoint(StringPiece str, int index, uint32_t* cp,
-                   int* num_left, int* num_read) {
-  if (*num_left == 0) {
-    // Last read was complete. Start reading a new unicode code point.
-    *cp = static_cast<uint8_t>(str[index++]);
-    *num_read = 1;
-    // The length of the code point is determined from reading the first byte.
-    //
-    // If the first byte is between:
-    //    0..0x7f: that's the value of the code point.
-    // 0x80..0xbf: <invalid>
-    // 0xc0..0xdf: 11-bit code point encoded in 2 bytes.
-    //                                   bit 10-6, bit 5-0
-    // 0xe0..0xef: 16-bit code point encoded in 3 bytes.
-    //                        bit 15-12, bit 11-6, bit 5-0
-    // 0xf0..0xf7: 21-bit code point encoded in 4 bytes.
-    //             bit 20-18, bit 17-12, bit 11-6, bit 5-0
-    // 0xf8..0xff: <invalid>
-    //
-    // Meaning of each bit:
-    // <msb> bit 7: 0 - single byte code point: bits 6-0 are values.
-    //              1 - multibyte code point
-    //       bit 6: 0 - subsequent bytes of multibyte code point:
-    //                  bits 5-0 are values.
-    //              1 - first byte of multibyte code point
-    //       bit 5: 0 - first byte of 2-byte code point: bits 4-0 are values.
-    //              1 - first byte of code point with >= 3 bytes.
-    //       bit 4: 0 - first byte of 3-byte code point: bits 3-0 are values.
-    //              1 - first byte of code point with >= 4 bytes.
-    //       bit 3: 0 - first byte of 4-byte code point: bits 2-0 are values.
-    //              1 - reserved for future expansion.
-    if (*cp <= 0x7f) {
-      return true;
-    } else if (*cp <= 0xbf) {
-      return false;
-    } else if (*cp <= 0xdf) {
-      *cp &= 0x1f;
-      *num_left = 1;
-    } else if (*cp <= 0xef) {
-      *cp &= 0x0f;
-      *num_left = 2;
-    } else if (*cp <= 0xf7) {
-      *cp &= 0x07;
-      *num_left = 3;
-    } else {
-      return false;
-    }
-  } else {
-    // Last read was partial. Initialize num_read to 0 and continue reading
-    // the last unicode code point.
-    *num_read = 0;
-  }
-  while (*num_left > 0 && index < str.size()) {
-    uint32_t ch = static_cast<uint8_t>(str[index++]);
-    --(*num_left);
-    ++(*num_read);
-    *cp = (*cp << 6) | (ch & 0x3f);
-    if (ch < 0x80 || ch > 0xbf) return false;
-  }
-  return *num_left > 0 || (!IsSurrogate(*cp) && IsValidCodePoint(*cp));
-}
-
-// Stores the 16-bit unicode code point as its hexadecimal digits in buffer
-// and returns a StringPiece that points to this buffer. The input buffer needs
-// to be at least 6 bytes long.
-StringPiece ToHex(uint16_t cp, char* buffer) {
-  buffer[5] = kHex[cp & 0x0f];
-  cp >>= 4;
-  buffer[4] = kHex[cp & 0x0f];
-  cp >>= 4;
-  buffer[3] = kHex[cp & 0x0f];
-  cp >>= 4;
-  buffer[2] = kHex[cp & 0x0f];
-  return StringPiece(buffer, 6);
-}
-
-// Stores the 32-bit unicode code point as its hexadecimal digits in buffer
-// and returns a StringPiece that points to this buffer. The input buffer needs
-// to be at least 12 bytes long.
-StringPiece ToSurrogateHex(uint32_t cp, char* buffer) {
-  uint16_t low = ToLowSurrogate(cp);
-  uint16_t high = ToHighSurrogate(cp);
-
-  buffer[11] = kHex[low & 0x0f];
-  low >>= 4;
-  buffer[10] = kHex[low & 0x0f];
-  low >>= 4;
-  buffer[9] = kHex[low & 0x0f];
-  low >>= 4;
-  buffer[8] = kHex[low & 0x0f];
-
-  buffer[5] = kHex[high & 0x0f];
-  high >>= 4;
-  buffer[4] = kHex[high & 0x0f];
-  high >>= 4;
-  buffer[3] = kHex[high & 0x0f];
-  high >>= 4;
-  buffer[2] = kHex[high & 0x0f];
-
-  return StringPiece(buffer, 12);
-}
-
-// If the given unicode code point needs escaping, then returns the
-// escaped form. The returned StringPiece either points to statically
-// pre-allocated char[] or to the given buffer. The input buffer needs
-// to be at least 12 bytes long.
-//
-// If the given unicode code point does not need escaping, an empty
-// StringPiece is returned.
-StringPiece EscapeCodePoint(uint32_t cp, char* buffer) {
-  if (cp < 0xa0) return kCommonEscapes[cp];
-  switch (cp) {
-    // These are not required by json spec
-    // but used to prevent security bugs in javascript.
-    case 0xfeff:  // Zero width no-break space
-    case 0xfff9:  // Interlinear annotation anchor
-    case 0xfffa:  // Interlinear annotation separator
-    case 0xfffb:  // Interlinear annotation terminator
-
-    case 0x00ad:  // Soft-hyphen
-    case 0x06dd:  // Arabic end of ayah
-    case 0x070f:  // Syriac abbreviation mark
-    case 0x17b4:  // Khmer vowel inherent Aq
-    case 0x17b5:  // Khmer vowel inherent Aa
-      return ToHex(cp, buffer);
-
-    default:
-      if ((cp >= 0x0600 && cp <= 0x0603) ||  // Arabic signs
-          (cp >= 0x200b && cp <= 0x200f) ||  // Zero width etc.
-          (cp >= 0x2028 && cp <= 0x202e) ||  // Separators etc.
-          (cp >= 0x2060 && cp <= 0x2064) ||  // Invisible etc.
-          (cp >= 0x206a && cp <= 0x206f)) {  // Shaping etc.
-        return ToHex(cp, buffer);
-      }
-
-      if (cp == 0x000e0001 ||                        // Language tag
-          (cp >= 0x0001d173 && cp <= 0x0001d17a) ||  // Music formatting
-          (cp >= 0x000e0020 && cp <= 0x000e007f)) {  // TAG symbols
-        return ToSurrogateHex(cp, buffer);
-      }
-  }
-  return StringPiece();
-}
-
-// Tries to escape the given code point first. If the given code point
-// does not need to be escaped, but force_output is true, then render
-// the given multi-byte code point in UTF8 in the buffer and returns it.
-StringPiece EscapeCodePoint(uint32_t cp, char* buffer,
-                                  bool force_output) {
-  StringPiece sp = EscapeCodePoint(cp, buffer);
-  if (force_output && sp.empty()) {
-    buffer[5] = (cp & 0x3f) | 0x80;
-    cp >>= 6;
-    if (cp <= 0x1f) {
-      buffer[4] = cp | 0xc0;
-      sp = StringPiece(buffer + 4, 2);
-      return sp;
-    }
-    buffer[4] = (cp & 0x3f) | 0x80;
-    cp >>= 6;
-    if (cp <= 0x0f) {
-      buffer[3] = cp | 0xe0;
-      sp = StringPiece(buffer + 3, 3);
-      return sp;
-    }
-    buffer[3] = (cp & 0x3f) | 0x80;
-    buffer[2] = ((cp >> 6) & 0x07) | 0xf0;
-    sp = StringPiece(buffer + 2, 4);
-  }
-  return sp;
-}
-
-}  // namespace
-
-void JsonEscaping::Escape(strings::ByteSource* input,
-                          strings::ByteSink* output) {
-  char buffer[12] = "\\udead\\ubee";
-  uint32_t cp = 0;   // Current unicode code point.
-  int num_left = 0;  // Num of chars to read to complete the code point.
-  while (input->Available() > 0) {
-    StringPiece str = input->Peek();
-    StringPiece escaped;
-    int i = 0;
-    int num_read;
-    bool ok;
-    bool cp_was_split = num_left > 0;
-    // Loop until we encounter either
-    //   i) a code point that needs to be escaped; or
-    //  ii) a split code point is completely read; or
-    // iii) a character that is not a valid utf8; or
-    //  iv) end of the StringPiece str is reached.
-    do {
-      ok = ReadCodePoint(str, i, &cp, &num_left, &num_read);
-      if (num_left > 0 || !ok) break;  // case iii or iv
-      escaped = EscapeCodePoint(cp, buffer, cp_was_split);
-      if (!escaped.empty()) break;  // case i or ii
-      i += num_read;
-      num_read = 0;
-    } while (i < str.length());  // case iv
-    // First copy the un-escaped prefix, if any, to the output ByteSink.
-    if (i > 0) input->CopyTo(output, i);
-    if (num_read > 0) input->Skip(num_read);
-    if (!ok) {
-      // Case iii: Report error.
-      // TODO(wpoon): Add error reporting.
-      num_left = 0;
-    } else if (num_left == 0 && !escaped.empty()) {
-      // Case i or ii: Append the escaped code point to the output ByteSink.
-      output->Append(escaped.data(), escaped.size());
-    }
-  }
-  if (num_left > 0) {
-    // Treat as case iii: report error.
-    // TODO(wpoon): Add error reporting.
-  }
-}
-
-void JsonEscaping::Escape(StringPiece input, strings::ByteSink* output) {
-  const size_t len = input.length();
-  const char* p = input.data();
-
-  bool can_skip_escaping = true;
-  for (int i = 0; i < len; i++) {
-    char c = p[i];
-    if (c < 0x20 || c >= 0x7F || c == '"' || c == '<' || c == '>' ||
-        c == '\\') {
-      can_skip_escaping = false;
-      break;
-    }
-  }
-
-  if (can_skip_escaping) {
-    output->Append(input.data(), input.length());
-  } else {
-    strings::ArrayByteSource source(input);
-    Escape(&source, output);
-  }
-}
-
-}  // namespace converter
-}  // namespace util
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/util/internal/json_escaping.h b/libs/protobuf/src/google/protobuf/util/internal/json_escaping.h
deleted file mode 100644
index 7d54f22..0000000
--- a/libs/protobuf/src/google/protobuf/util/internal/json_escaping.h
+++ /dev/null
@@ -1,98 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef GOOGLE_PROTOBUF_UTIL_INTERNAL_JSON_ESCAPING_H__
-#define GOOGLE_PROTOBUF_UTIL_INTERNAL_JSON_ESCAPING_H__
-
-#include <cstdint>
-
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/stubs/bytestream.h>
-
-namespace google {
-namespace protobuf {
-namespace util {
-namespace converter {
-
-class JsonEscaping {
- public:
-  // The minimum value of a unicode high-surrogate code unit in the utf-16
-  // encoding. A high-surrogate is also known as a leading-surrogate.
-  // See http://www.unicode.org/glossary/#high_surrogate_code_unit
-  static constexpr uint16_t kMinHighSurrogate = 0xd800;
-
-  // The maximum value of a unicide high-surrogate code unit in the utf-16
-  // encoding. A high-surrogate is also known as a leading-surrogate.
-  // See http://www.unicode.org/glossary/#high_surrogate_code_unit
-  static constexpr uint16_t kMaxHighSurrogate = 0xdbff;
-
-  // The minimum value of a unicode low-surrogate code unit in the utf-16
-  // encoding. A low-surrogate is also known as a trailing-surrogate.
-  // See http://www.unicode.org/glossary/#low_surrogate_code_unit
-  static constexpr uint16_t kMinLowSurrogate = 0xdc00;
-
-  // The maximum value of a unicode low-surrogate code unit in the utf-16
-  // encoding. A low-surrogate is also known as a trailing surrogate.
-  // See http://www.unicode.org/glossary/#low_surrogate_code_unit
-  static constexpr uint16_t kMaxLowSurrogate = 0xdfff;
-
-  // The minimum value of a unicode supplementary code point.
-  // See http://www.unicode.org/glossary/#supplementary_code_point
-  static constexpr uint32_t kMinSupplementaryCodePoint = 0x010000;
-
-  // The minimum value of a unicode code point.
-  // See http://www.unicode.org/glossary/#code_point
-  static constexpr uint32_t kMinCodePoint = 0x000000;
-
-  // The maximum value of a unicode code point.
-  // See http://www.unicode.org/glossary/#code_point
-  static constexpr uint32_t kMaxCodePoint = 0x10ffff;
-
-  JsonEscaping() {}
-  virtual ~JsonEscaping() {}
-
-  // Escape the given ByteSource to the given ByteSink.
-  static void Escape(strings::ByteSource* input, strings::ByteSink* output);
-
-  // Escape the given ByteSource to the given ByteSink.
-  // This is optimized for the case where the string is all printable 7-bit
-  // ASCII and does not contain a few other characters (such as quotes).
-  static void Escape(StringPiece input, strings::ByteSink* output);
-
- private:
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(JsonEscaping);
-};
-
-}  // namespace converter
-}  // namespace util
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // GOOGLE_PROTOBUF_UTIL_INTERNAL_JSON_ESCAPING_H__
diff --git a/libs/protobuf/src/google/protobuf/util/internal/json_objectwriter.cc b/libs/protobuf/src/google/protobuf/util/internal/json_objectwriter.cc
deleted file mode 100644
index 1a86f00..0000000
--- a/libs/protobuf/src/google/protobuf/util/internal/json_objectwriter.cc
+++ /dev/null
@@ -1,190 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <google/protobuf/util/internal/json_objectwriter.h>
-
-#include <cmath>
-#include <cstdint>
-#include <limits>
-
-#include <google/protobuf/stubs/casts.h>
-#include <google/protobuf/stubs/logging.h>
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/util/internal/utility.h>
-#include <google/protobuf/stubs/strutil.h>
-#include <google/protobuf/util/internal/json_escaping.h>
-
-namespace google {
-namespace protobuf {
-namespace util {
-namespace converter {
-
-
-JsonObjectWriter::~JsonObjectWriter() {
-  if (element_ && !element_->is_root()) {
-    GOOGLE_LOG(WARNING) << "JsonObjectWriter was not fully closed.";
-  }
-}
-
-JsonObjectWriter* JsonObjectWriter::StartObject(StringPiece name) {
-  WritePrefix(name);
-  WriteChar('{');
-  PushObject();
-  return this;
-}
-
-JsonObjectWriter* JsonObjectWriter::EndObject() {
-  Pop();
-  WriteChar('}');
-  if (element() && element()->is_root()) NewLine();
-  return this;
-}
-
-JsonObjectWriter* JsonObjectWriter::StartList(StringPiece name) {
-  WritePrefix(name);
-  WriteChar('[');
-  PushArray();
-  return this;
-}
-
-JsonObjectWriter* JsonObjectWriter::EndList() {
-  Pop();
-  WriteChar(']');
-  if (element()->is_root()) NewLine();
-  return this;
-}
-
-JsonObjectWriter* JsonObjectWriter::RenderBool(StringPiece name,
-                                               bool value) {
-  return RenderSimple(name, value ? "true" : "false");
-}
-
-JsonObjectWriter* JsonObjectWriter::RenderInt32(StringPiece name,
-                                                int32_t value) {
-  return RenderSimple(name, StrCat(value));
-}
-
-JsonObjectWriter* JsonObjectWriter::RenderUint32(StringPiece name,
-                                                 uint32_t value) {
-  return RenderSimple(name, StrCat(value));
-}
-
-JsonObjectWriter* JsonObjectWriter::RenderInt64(StringPiece name,
-                                                int64_t value) {
-  WritePrefix(name);
-  WriteChar('"');
-  WriteRawString(StrCat(value));
-  WriteChar('"');
-  return this;
-}
-
-JsonObjectWriter* JsonObjectWriter::RenderUint64(StringPiece name,
-                                                 uint64_t value) {
-  WritePrefix(name);
-  WriteChar('"');
-  WriteRawString(StrCat(value));
-  WriteChar('"');
-  return this;
-}
-
-JsonObjectWriter* JsonObjectWriter::RenderDouble(StringPiece name,
-                                                 double value) {
-  if (std::isfinite(value)) {
-    return RenderSimple(name, SimpleDtoa(value));
-  }
-
-  // Render quoted with NaN/Infinity-aware DoubleAsString.
-  return RenderString(name, DoubleAsString(value));
-}
-
-JsonObjectWriter* JsonObjectWriter::RenderFloat(StringPiece name,
-                                                float value) {
-  if (std::isfinite(value)) {
-    return RenderSimple(name, SimpleFtoa(value));
-  }
-
-  // Render quoted with NaN/Infinity-aware FloatAsString.
-  return RenderString(name, FloatAsString(value));
-}
-
-JsonObjectWriter* JsonObjectWriter::RenderString(StringPiece name,
-                                                 StringPiece value) {
-  WritePrefix(name);
-  WriteChar('"');
-  JsonEscaping::Escape(value, &sink_);
-  WriteChar('"');
-  return this;
-}
-
-JsonObjectWriter* JsonObjectWriter::RenderBytes(StringPiece name,
-                                                StringPiece value) {
-  WritePrefix(name);
-  std::string base64;
-
-  if (use_websafe_base64_for_bytes_)
-    WebSafeBase64EscapeWithPadding(std::string(value), &base64);
-  else
-    Base64Escape(value, &base64);
-
-  WriteChar('"');
-  // TODO(wpoon): Consider a ByteSink solution that writes the base64 bytes
-  //              directly to the stream, rather than first putting them
-  //              into a string and then writing them to the stream.
-  stream_->WriteRaw(base64.data(), base64.size());
-  WriteChar('"');
-  return this;
-}
-
-JsonObjectWriter* JsonObjectWriter::RenderNull(StringPiece name) {
-  return RenderSimple(name, "null");
-}
-
-JsonObjectWriter* JsonObjectWriter::RenderNullAsEmpty(StringPiece name) {
-  return RenderSimple(name, "");
-}
-
-void JsonObjectWriter::WritePrefix(StringPiece name) {
-  bool not_first = !element()->is_first();
-  if (not_first) WriteChar(',');
-  if (not_first || !element()->is_root()) NewLine();
-  if (!name.empty() || element()->is_json_object()) {
-    WriteChar('"');
-    if (!name.empty()) {
-      JsonEscaping::Escape(name, &sink_);
-    }
-    WriteRawString("\":");
-    if (!indent_string_.empty()) WriteChar(' ');
-  }
-}
-
-}  // namespace converter
-}  // namespace util
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/util/internal/json_objectwriter.h b/libs/protobuf/src/google/protobuf/util/internal/json_objectwriter.h
deleted file mode 100644
index cb7dff6..0000000
--- a/libs/protobuf/src/google/protobuf/util/internal/json_objectwriter.h
+++ /dev/null
@@ -1,278 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef GOOGLE_PROTOBUF_UTIL_INTERNAL_JSON_OBJECTWRITER_H__
-#define GOOGLE_PROTOBUF_UTIL_INTERNAL_JSON_OBJECTWRITER_H__
-
-#include <cstdint>
-#include <memory>
-#include <string>
-
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/stubs/bytestream.h>
-#include <google/protobuf/util/internal/structured_objectwriter.h>
-
-// clang-format off
-#include <google/protobuf/port_def.inc>
-// clang-format on
-
-namespace google {
-namespace protobuf {
-namespace util {
-namespace converter {
-
-
-// An ObjectWriter implementation that outputs JSON. This ObjectWriter
-// supports writing a compact form or a pretty printed form.
-//
-// Sample usage:
-//   string output;
-//   StringOutputStream* str_stream = new StringOutputStream(&output);
-//   CodedOutputStream* out_stream = new CodedOutputStream(str_stream);
-//   JsonObjectWriter* ow = new JsonObjectWriter("  ", out_stream);
-//   ow->StartObject("")
-//       ->RenderString("name", "value")
-//       ->RenderString("emptystring", string())
-//       ->StartObject("nested")
-//         ->RenderInt64("light", 299792458);
-//         ->RenderDouble("pi", 3.141592653589793);
-//       ->EndObject()
-//       ->StartList("empty")
-//       ->EndList()
-//     ->EndObject();
-//
-// And then the output string would become:
-// {
-//   "name": "value",
-//   "emptystring": "",
-//   "nested": {
-//     "light": "299792458",
-//     "pi": 3.141592653589793
-//   },
-//   "empty": []
-// }
-//
-// JsonObjectWriter does not validate if calls actually result in valid JSON.
-// For example, passing an empty name when one would be required won't result
-// in an error, just an invalid output.
-//
-// Note that all int64 and uint64 are rendered as strings instead of numbers.
-// This is because JavaScript parses numbers as 64-bit float thus int64 and
-// uint64 would lose precision if rendered as numbers.
-//
-// JsonObjectWriter is thread-unsafe.
-class PROTOBUF_EXPORT JsonObjectWriter : public StructuredObjectWriter {
- public:
-  JsonObjectWriter(StringPiece indent_string, io::CodedOutputStream* out)
-      : element_(new Element(/*parent=*/nullptr, /*is_json_object=*/false)),
-        stream_(out),
-        sink_(out),
-        indent_string_(indent_string),
-        indent_char_('\0'),
-        indent_count_(0),
-        use_websafe_base64_for_bytes_(false) {
-    // See if we have a trivial sequence of indent characters.
-    if (!indent_string.empty()) {
-      indent_char_ = indent_string[0];
-      indent_count_ = indent_string.length();
-      for (int i = 1; i < indent_string.length(); i++) {
-        if (indent_char_ != indent_string_[i]) {
-          indent_char_ = '\0';
-          indent_count_ = 0;
-          break;
-        }
-      }
-    }
-  }
-  ~JsonObjectWriter() override;
-
-  // ObjectWriter methods.
-  JsonObjectWriter* StartObject(StringPiece name) override;
-  JsonObjectWriter* EndObject() override;
-  JsonObjectWriter* StartList(StringPiece name) override;
-  JsonObjectWriter* EndList() override;
-  JsonObjectWriter* RenderBool(StringPiece name, bool value) override;
-  JsonObjectWriter* RenderInt32(StringPiece name, int32_t value) override;
-  JsonObjectWriter* RenderUint32(StringPiece name,
-                                 uint32_t value) override;
-  JsonObjectWriter* RenderInt64(StringPiece name, int64_t value) override;
-  JsonObjectWriter* RenderUint64(StringPiece name,
-                                 uint64_t value) override;
-  JsonObjectWriter* RenderDouble(StringPiece name, double value) override;
-  JsonObjectWriter* RenderFloat(StringPiece name, float value) override;
-  JsonObjectWriter* RenderString(StringPiece name,
-                                 StringPiece value) override;
-  JsonObjectWriter* RenderBytes(StringPiece name, StringPiece value) override;
-  JsonObjectWriter* RenderNull(StringPiece name) override;
-  virtual JsonObjectWriter* RenderNullAsEmpty(StringPiece name);
-
-  void set_use_websafe_base64_for_bytes(bool value) {
-    use_websafe_base64_for_bytes_ = value;
-  }
-
- protected:
-  class PROTOBUF_EXPORT Element : public BaseElement {
-   public:
-    Element(Element* parent, bool is_json_object)
-        : BaseElement(parent),
-          is_first_(true),
-          is_json_object_(is_json_object) {}
-
-    // Called before each field of the Element is to be processed.
-    // Returns true if this is the first call (processing the first field).
-    bool is_first() {
-      if (is_first_) {
-        is_first_ = false;
-        return true;
-      }
-      return false;
-    }
-
-    // Whether we are currently rendering inside a JSON object (i.e., between
-    // StartObject() and EndObject()).
-    bool is_json_object() const { return is_json_object_; }
-
-   private:
-    bool is_first_;
-    bool is_json_object_;
-
-    GOOGLE_DISALLOW_IMPLICIT_CONSTRUCTORS(Element);
-  };
-
-  Element* element() override { return element_.get(); }
-
- private:
-  class PROTOBUF_EXPORT ByteSinkWrapper : public strings::ByteSink {
-   public:
-    explicit ByteSinkWrapper(io::CodedOutputStream* stream) : stream_(stream) {}
-    ~ByteSinkWrapper() override {}
-
-    // ByteSink methods.
-    void Append(const char* bytes, size_t n) override {
-      stream_->WriteRaw(bytes, n);
-    }
-
-   private:
-    io::CodedOutputStream* stream_;
-
-    GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(ByteSinkWrapper);
-  };
-
-  // Renders a simple value as a string. By default all non-string Render
-  // methods convert their argument to a string and call this method. This
-  // method can then be used to render the simple value without escaping it.
-  JsonObjectWriter* RenderSimple(StringPiece name,
-                                 StringPiece value) {
-    WritePrefix(name);
-    WriteRawString(value);
-    return this;
-  }
-
-  // Pushes a new JSON array element to the stack.
-  void PushArray() {
-    element_.reset(new Element(element_.release(), /*is_json_object=*/false));
-  }
-
-  // Pushes a new JSON object element to the stack.
-  void PushObject() {
-    element_.reset(new Element(element_.release(), /*is_json_object=*/true));
-  }
-
-  // Pops an element off of the stack and deletes the popped element.
-  void Pop() {
-    bool needs_newline = !element_->is_first();
-    element_.reset(element_->pop<Element>());
-    if (needs_newline) NewLine();
-  }
-
-  // If pretty printing is enabled, this will write a newline to the output,
-  // followed by optional indentation. Otherwise this method is a noop.
-  void NewLine() {
-    if (!indent_string_.empty()) {
-      size_t len = sizeof('\n') + (indent_string_.size() * element()->level());
-
-      // Take the slow-path if we don't have sufficient characters remaining in
-      // our buffer or we have a non-trivial indent string which would prevent
-      // us from using memset.
-      uint8_t* out = nullptr;
-      if (indent_count_ > 0) {
-        out = stream_->GetDirectBufferForNBytesAndAdvance(len);
-      }
-
-      if (out != nullptr) {
-        out[0] = '\n';
-        memset(&out[1], indent_char_, len - 1);
-      } else {
-        // Slow path, no contiguous output buffer available.
-        WriteChar('\n');
-        for (int i = 0; i < element()->level(); i++) {
-          stream_->WriteRaw(indent_string_.c_str(), indent_string_.length());
-        }
-      }
-    }
-  }
-
-  // Writes a prefix. This will write out any pretty printing and
-  // commas that are required, followed by the name and a ':' if
-  // the name is not null.
-  void WritePrefix(StringPiece name);
-
-  // Writes an individual character to the output.
-  void WriteChar(const char c) { stream_->WriteRaw(&c, sizeof(c)); }
-
-  // Writes a string to the output.
-  void WriteRawString(StringPiece s) {
-    stream_->WriteRaw(s.data(), s.length());
-  }
-
-  std::unique_ptr<Element> element_;
-  io::CodedOutputStream* stream_;
-  ByteSinkWrapper sink_;
-  const std::string indent_string_;
-
-  // For the common case of indent being a single character repeated.
-  char indent_char_;
-  int indent_count_;
-
-  // Whether to use regular or websafe base64 encoding for byte fields. Defaults
-  // to regular base64 encoding.
-  bool use_websafe_base64_for_bytes_;
-
-  GOOGLE_DISALLOW_IMPLICIT_CONSTRUCTORS(JsonObjectWriter);
-};
-
-}  // namespace converter
-}  // namespace util
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
-
-#endif  // GOOGLE_PROTOBUF_UTIL_INTERNAL_JSON_OBJECTWRITER_H__
diff --git a/libs/protobuf/src/google/protobuf/util/internal/json_objectwriter_test.cc b/libs/protobuf/src/google/protobuf/util/internal/json_objectwriter_test.cc
deleted file mode 100644
index 8acf2c5..0000000
--- a/libs/protobuf/src/google/protobuf/util/internal/json_objectwriter_test.cc
+++ /dev/null
@@ -1,315 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <google/protobuf/util/internal/json_objectwriter.h>
-
-#include <cstdint>
-
-#include <google/protobuf/io/zero_copy_stream_impl_lite.h>
-#include <gtest/gtest.h>
-#include <google/protobuf/util/internal/utility.h>
-
-namespace google {
-namespace protobuf {
-namespace util {
-namespace converter {
-
-using io::CodedOutputStream;
-using io::StringOutputStream;
-
-class JsonObjectWriterTest : public ::testing::Test {
- protected:
-  JsonObjectWriterTest()
-      : str_stream_(new StringOutputStream(&output_)),
-        out_stream_(new CodedOutputStream(str_stream_)),
-        ow_(nullptr) {}
-
-  ~JsonObjectWriterTest() override { delete ow_; }
-
-  std::string CloseStreamAndGetString() {
-    delete out_stream_;
-    delete str_stream_;
-    return output_;
-  }
-
-  std::string output_;
-  StringOutputStream* const str_stream_;
-  CodedOutputStream* const out_stream_;
-  JsonObjectWriter* ow_;
-};
-
-TEST_F(JsonObjectWriterTest, EmptyRootObject) {
-  ow_ = new JsonObjectWriter("", out_stream_);
-  ow_->StartObject("")->EndObject();
-  EXPECT_EQ("{}", CloseStreamAndGetString());
-}
-
-TEST_F(JsonObjectWriterTest, EmptyObject) {
-  ow_ = new JsonObjectWriter("", out_stream_);
-  ow_->StartObject("")
-      ->RenderString("test", "value")
-      ->StartObject("empty")
-      ->EndObject()
-      ->EndObject();
-  EXPECT_EQ("{\"test\":\"value\",\"empty\":{}}", CloseStreamAndGetString());
-}
-
-TEST_F(JsonObjectWriterTest, EmptyRootList) {
-  ow_ = new JsonObjectWriter("", out_stream_);
-  ow_->StartList("")->EndList();
-  EXPECT_EQ("[]", CloseStreamAndGetString());
-}
-
-TEST_F(JsonObjectWriterTest, EmptyList) {
-  ow_ = new JsonObjectWriter("", out_stream_);
-  ow_->StartObject("")
-      ->RenderString("test", "value")
-      ->StartList("empty")
-      ->EndList()
-      ->EndObject();
-  EXPECT_EQ("{\"test\":\"value\",\"empty\":[]}", CloseStreamAndGetString());
-}
-
-TEST_F(JsonObjectWriterTest, EmptyObjectKey) {
-  ow_ = new JsonObjectWriter("", out_stream_);
-  ow_->StartObject("")->RenderString("", "value")->EndObject();
-  EXPECT_EQ("{\"\":\"value\"}", CloseStreamAndGetString());
-}
-
-TEST_F(JsonObjectWriterTest, ObjectInObject) {
-  ow_ = new JsonObjectWriter("", out_stream_);
-  ow_->StartObject("")
-      ->StartObject("nested")
-      ->RenderString("field", "value")
-      ->EndObject()
-      ->EndObject();
-  EXPECT_EQ("{\"nested\":{\"field\":\"value\"}}", CloseStreamAndGetString());
-}
-
-TEST_F(JsonObjectWriterTest, ListInObject) {
-  ow_ = new JsonObjectWriter("", out_stream_);
-  ow_->StartObject("")
-      ->StartList("nested")
-      ->RenderString("", "value")
-      ->EndList()
-      ->EndObject();
-  EXPECT_EQ("{\"nested\":[\"value\"]}", CloseStreamAndGetString());
-}
-
-TEST_F(JsonObjectWriterTest, ObjectInList) {
-  ow_ = new JsonObjectWriter("", out_stream_);
-  ow_->StartList("")
-      ->StartObject("")
-      ->RenderString("field", "value")
-      ->EndObject()
-      ->EndList();
-  EXPECT_EQ("[{\"field\":\"value\"}]", CloseStreamAndGetString());
-}
-
-TEST_F(JsonObjectWriterTest, ListInList) {
-  ow_ = new JsonObjectWriter("", out_stream_);
-  ow_->StartList("")
-      ->StartList("")
-      ->RenderString("", "value")
-      ->EndList()
-      ->EndList();
-  EXPECT_EQ("[[\"value\"]]", CloseStreamAndGetString());
-}
-
-TEST_F(JsonObjectWriterTest, RenderPrimitives) {
-  ow_ = new JsonObjectWriter("", out_stream_);
-  ow_->StartObject("")
-      ->RenderBool("bool", true)
-      ->RenderDouble("double", std::numeric_limits<double>::max())
-      ->RenderFloat("float", std::numeric_limits<float>::max())
-      ->RenderInt32("int", std::numeric_limits<int32_t>::min())
-      ->RenderInt64("long", std::numeric_limits<int64_t>::min())
-      ->RenderBytes("bytes", "abracadabra")
-      ->RenderString("string", "string")
-      ->RenderBytes("emptybytes", "")
-      ->RenderString("emptystring", std::string())
-      ->EndObject();
-  EXPECT_EQ(
-      "{\"bool\":true,"
-      "\"double\":" +
-          ValueAsString<double>(std::numeric_limits<double>::max()) +
-          ","
-          "\"float\":" +
-          ValueAsString<float>(std::numeric_limits<float>::max()) +
-          ","
-          "\"int\":-2147483648,"
-          "\"long\":\"-9223372036854775808\","
-          "\"bytes\":\"YWJyYWNhZGFicmE=\","
-          "\"string\":\"string\","
-          "\"emptybytes\":\"\","
-          "\"emptystring\":\"\"}",
-      CloseStreamAndGetString());
-}
-
-TEST_F(JsonObjectWriterTest, BytesEncodesAsNonWebSafeBase64) {
-  std::string s;
-  s.push_back('\377');
-  s.push_back('\357');
-  ow_ = new JsonObjectWriter("", out_stream_);
-  ow_->StartObject("")->RenderBytes("bytes", s)->EndObject();
-  // Non-web-safe would encode this as "/+8="
-  EXPECT_EQ("{\"bytes\":\"/+8=\"}", CloseStreamAndGetString());
-}
-
-TEST_F(JsonObjectWriterTest, PrettyPrintList) {
-  ow_ = new JsonObjectWriter(" ", out_stream_);
-  ow_->StartObject("")
-      ->StartList("items")
-      ->RenderString("", "item1")
-      ->RenderString("", "item2")
-      ->RenderString("", "item3")
-      ->EndList()
-      ->StartList("empty")
-      ->EndList()
-      ->EndObject();
-  EXPECT_EQ(
-      "{\n"
-      " \"items\": [\n"
-      "  \"item1\",\n"
-      "  \"item2\",\n"
-      "  \"item3\"\n"
-      " ],\n"
-      " \"empty\": []\n"
-      "}\n",
-      CloseStreamAndGetString());
-}
-
-TEST_F(JsonObjectWriterTest, PrettyPrintObject) {
-  ow_ = new JsonObjectWriter(" ", out_stream_);
-  ow_->StartObject("")
-      ->StartObject("items")
-      ->RenderString("key1", "item1")
-      ->RenderString("key2", "item2")
-      ->RenderString("key3", "item3")
-      ->EndObject()
-      ->StartObject("empty")
-      ->EndObject()
-      ->EndObject();
-  EXPECT_EQ(
-      "{\n"
-      " \"items\": {\n"
-      "  \"key1\": \"item1\",\n"
-      "  \"key2\": \"item2\",\n"
-      "  \"key3\": \"item3\"\n"
-      " },\n"
-      " \"empty\": {}\n"
-      "}\n",
-      CloseStreamAndGetString());
-}
-
-TEST_F(JsonObjectWriterTest, PrettyPrintEmptyObjectInEmptyList) {
-  ow_ = new JsonObjectWriter(" ", out_stream_);
-  ow_->StartObject("")
-      ->StartList("list")
-      ->StartObject("")
-      ->EndObject()
-      ->EndList()
-      ->EndObject();
-  EXPECT_EQ(
-      "{\n"
-      " \"list\": [\n"
-      "  {}\n"
-      " ]\n"
-      "}\n",
-      CloseStreamAndGetString());
-}
-
-TEST_F(JsonObjectWriterTest, PrettyPrintDoubleIndent) {
-  ow_ = new JsonObjectWriter("  ", out_stream_);
-  ow_->StartObject("")
-      ->RenderBool("bool", true)
-      ->RenderInt32("int", 42)
-      ->EndObject();
-  EXPECT_EQ(
-      "{\n"
-      "  \"bool\": true,\n"
-      "  \"int\": 42\n"
-      "}\n",
-      CloseStreamAndGetString());
-}
-
-TEST_F(JsonObjectWriterTest, StringsEscapedAndEnclosedInDoubleQuotes) {
-  ow_ = new JsonObjectWriter("", out_stream_);
-  ow_->StartObject("")->RenderString("string", "'<>&amp;\\\"\r\n")->EndObject();
-  EXPECT_EQ("{\"string\":\"'\\u003c\\u003e&amp;\\\\\\\"\\r\\n\"}",
-            CloseStreamAndGetString());
-}
-
-TEST_F(JsonObjectWriterTest, Stringification) {
-  ow_ = new JsonObjectWriter("", out_stream_);
-  ow_->StartObject("")
-      ->RenderDouble("double_nan", std::numeric_limits<double>::quiet_NaN())
-      ->RenderFloat("float_nan", std::numeric_limits<float>::quiet_NaN())
-      ->RenderDouble("double_pos", std::numeric_limits<double>::infinity())
-      ->RenderFloat("float_pos", std::numeric_limits<float>::infinity())
-      ->RenderDouble("double_neg", -std::numeric_limits<double>::infinity())
-      ->RenderFloat("float_neg", -std::numeric_limits<float>::infinity())
-      ->EndObject();
-  EXPECT_EQ(
-      "{\"double_nan\":\"NaN\","
-      "\"float_nan\":\"NaN\","
-      "\"double_pos\":\"Infinity\","
-      "\"float_pos\":\"Infinity\","
-      "\"double_neg\":\"-Infinity\","
-      "\"float_neg\":\"-Infinity\"}",
-      CloseStreamAndGetString());
-}
-
-TEST_F(JsonObjectWriterTest, TestRegularByteEncoding) {
-  ow_ = new JsonObjectWriter("", out_stream_);
-  ow_->StartObject("")
-      ->RenderBytes("bytes", "\x03\xef\xc0")
-      ->EndObject();
-
-  // Test that we get regular (non websafe) base64 encoding on byte fields by
-  // default.
-  EXPECT_EQ("{\"bytes\":\"A+/A\"}", CloseStreamAndGetString());
-}
-
-TEST_F(JsonObjectWriterTest, TestWebsafeByteEncoding) {
-  ow_ = new JsonObjectWriter("", out_stream_);
-  ow_->set_use_websafe_base64_for_bytes(true);
-  ow_->StartObject("")
-      ->RenderBytes("bytes", "\x03\xef\xc0\x10")
-      ->EndObject();
-
-  // Test that we get websafe base64 encoding when explicitly asked.
-  EXPECT_EQ("{\"bytes\":\"A-_AEA==\"}", CloseStreamAndGetString());
-}
-
-}  // namespace converter
-}  // namespace util
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/util/internal/json_stream_parser.cc b/libs/protobuf/src/google/protobuf/util/internal/json_stream_parser.cc
deleted file mode 100644
index 5c34dbc..0000000
--- a/libs/protobuf/src/google/protobuf/util/internal/json_stream_parser.cc
+++ /dev/null
@@ -1,995 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <google/protobuf/util/internal/json_stream_parser.h>
-
-#include <algorithm>
-#include <cctype>
-#include <cmath>
-#include <memory>
-#include <stack>
-#include <string>
-
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/stubs/logging.h>
-#include <google/protobuf/stubs/strutil.h>
-#include <google/protobuf/stubs/status.h>
-#include <google/protobuf/util/internal/object_writer.h>
-#include <google/protobuf/util/internal/json_escaping.h>
-
-
-namespace google {
-namespace protobuf {
-namespace util {
-
-namespace converter {
-
-// Number of digits in an escaped UTF-16 code unit ('\\' 'u' X X X X)
-static const int kUnicodeEscapedLength = 6;
-
-static const int kDefaultMaxRecursionDepth = 100;
-
-// These cannot be constexpr for portability with VS2015.
-static const StringPiece kKeywordTrue = "true";
-static const StringPiece kKeywordFalse = "false";
-static const StringPiece kKeywordNull = "null";
-
-inline bool IsLetter(char c) {
-  return ('a' <= c && c <= 'z') || ('A' <= c && c <= 'Z') || (c == '_') ||
-         (c == '$');
-}
-
-inline bool IsAlphanumeric(char c) {
-  return IsLetter(c) || ('0' <= c && c <= '9');
-}
-
-// Indicates a character may not be part of an unquoted key.
-inline bool IsKeySeparator(char c) {
-  return (ascii_isspace(c) || c == '"' || c == '\'' || c == '{' ||
-          c == '}' || c == '[' || c == ']' || c == ':' || c == ',');
-}
-
-inline void ReplaceInvalidCodePoints(StringPiece str,
-                                     const std::string& replacement,
-                                     std::string* dst) {
-  while (!str.empty()) {
-    int n_valid_bytes = internal::UTF8SpnStructurallyValid(str);
-    StringPiece valid_part = str.substr(0, n_valid_bytes);
-    StrAppend(dst, valid_part);
-
-    if (n_valid_bytes == str.size()) {
-      break;
-    }
-
-    // Append replacement value.
-    StrAppend(dst, replacement);
-
-    // Move past valid bytes + one invalid byte.
-    str.remove_prefix(n_valid_bytes + 1);
-  }
-}
-
-static bool ConsumeKey(StringPiece* input, StringPiece* key) {
-  if (input->empty() || !IsLetter((*input)[0])) return false;
-  int len = 1;
-  for (; len < input->size(); ++len) {
-    if (!IsAlphanumeric((*input)[len])) {
-      break;
-    }
-  }
-  *key = StringPiece(input->data(), len);
-  *input = StringPiece(input->data() + len, input->size() - len);
-  return true;
-}
-
-// Same as 'ConsumeKey', but allows a widened set of key characters.
-static bool ConsumeKeyPermissive(StringPiece* input,
-                                 StringPiece* key) {
-  if (input->empty() || !IsLetter((*input)[0])) return false;
-  int len = 1;
-  for (; len < input->size(); ++len) {
-    if (IsKeySeparator((*input)[len])) {
-      break;
-    }
-  }
-  *key = StringPiece(input->data(), len);
-  *input = StringPiece(input->data() + len, input->size() - len);
-  return true;
-}
-
-static bool MatchKey(StringPiece input) {
-  return !input.empty() && IsLetter(input[0]);
-}
-
-JsonStreamParser::JsonStreamParser(ObjectWriter* ow)
-    : ow_(ow),
-      stack_(),
-      leftover_(),
-      json_(),
-      p_(),
-      key_(),
-      key_storage_(),
-      finishing_(false),
-      seen_non_whitespace_(false),
-      allow_no_root_element_(false),
-      parsed_(),
-      parsed_storage_(),
-      string_open_(0),
-      chunk_storage_(),
-      coerce_to_utf8_(false),
-      utf8_replacement_character_(" "),
-      allow_empty_null_(false),
-      allow_permissive_key_naming_(false),
-      loose_float_number_conversion_(false),
-      recursion_depth_(0),
-      max_recursion_depth_(kDefaultMaxRecursionDepth) {
-  // Initialize the stack with a single value to be parsed.
-  stack_.push(VALUE);
-}
-
-JsonStreamParser::~JsonStreamParser() {}
-
-
-util::Status JsonStreamParser::Parse(StringPiece json) {
-  StringPiece chunk = json;
-  // If we have leftovers from a previous chunk, append the new chunk to it
-  // and create a new StringPiece pointing at the string's data. This could
-  // be large but we rely on the chunks to be small, assuming they are
-  // fragments of a Cord.
-  if (!leftover_.empty()) {
-    // Don't point chunk to leftover_ because leftover_ will be updated in
-    // ParseChunk(chunk).
-    chunk_storage_.swap(leftover_);
-    StrAppend(&chunk_storage_, json);
-    chunk = StringPiece(chunk_storage_);
-  }
-
-  // Find the structurally valid UTF8 prefix and parse only that.
-  int n = internal::UTF8SpnStructurallyValid(chunk);
-  if (n > 0) {
-    util::Status status = ParseChunk(chunk.substr(0, n));
-
-    // Any leftover characters are stashed in leftover_ for later parsing when
-    // there is more data available.
-    StrAppend(&leftover_, chunk.substr(n));
-    return status;
-  } else {
-    leftover_.assign(chunk.data(), chunk.size());
-    return util::Status();
-  }
-}
-
-util::Status JsonStreamParser::FinishParse() {
-  // If we do not expect anything and there is nothing left to parse we're all
-  // done.
-  if (stack_.empty() && leftover_.empty()) {
-    return util::Status();
-  }
-
-  // Lifetime needs to last until RunParser returns, so keep this variable
-  // outside of the coerce_to_utf8 block.
-  std::unique_ptr<std::string> scratch;
-
-  bool is_valid_utf8 = internal::IsStructurallyValidUTF8(leftover_);
-  if (coerce_to_utf8_ && !is_valid_utf8) {
-    scratch.reset(new std::string);
-    scratch->reserve(leftover_.size() * utf8_replacement_character_.size());
-    ReplaceInvalidCodePoints(leftover_, utf8_replacement_character_,
-                             scratch.get());
-    p_ = json_ = *scratch;
-  } else {
-    p_ = json_ = leftover_;
-    if (!is_valid_utf8) {
-      return ReportFailure("Encountered non UTF-8 code points.",
-                           ParseErrorType::NON_UTF_8);
-    }
-  }
-
-  // Parse the remainder in finishing mode, which reports errors for things like
-  // unterminated strings or unknown tokens that would normally be retried.
-  finishing_ = true;
-  util::Status result = RunParser();
-  if (result.ok()) {
-    SkipWhitespace();
-    if (!p_.empty()) {
-      result =
-          ReportFailure("Parsing terminated before end of input.",
-                        ParseErrorType::PARSING_TERMINATED_BEFORE_END_OF_INPUT);
-    }
-  }
-  return result;
-}
-
-util::Status JsonStreamParser::ParseChunk(StringPiece chunk) {
-  // Do not do any work if the chunk is empty.
-  if (chunk.empty()) return util::Status();
-
-  p_ = json_ = chunk;
-
-  finishing_ = false;
-  util::Status result = RunParser();
-  if (!result.ok()) return result;
-
-  SkipWhitespace();
-  if (p_.empty()) {
-    // If we parsed everything we had, clear the leftover.
-    leftover_.clear();
-  } else {
-    // If we do not expect anything i.e. stack is empty, and we have non-empty
-    // string left to parse, we report an error.
-    if (stack_.empty()) {
-      return ReportFailure(
-          "Parsing terminated before end of input.",
-          ParseErrorType::PARSING_TERMINATED_BEFORE_END_OF_INPUT);
-    }
-    // If we expect future data i.e. stack is non-empty, and we have some
-    // unparsed data left, we save it for later parse.
-    leftover_ = std::string(p_);
-  }
-  return util::Status();
-}
-
-bool JsonStreamParser::IsInputAllWhiteSpaces(TokenType type) {
-  // Conclude the whole input is full of white spaces by:
-  // - it is at the finishing stage
-  // - we have run out of the input data
-  // - haven't seen non-whitespace char so far
-  if (finishing_ && p_.empty() && type == UNKNOWN && !seen_non_whitespace_) {
-    return true;
-  }
-  return false;
-}
-
-util::Status JsonStreamParser::RunParser() {
-  while (!stack_.empty()) {
-    ParseType type = stack_.top();
-    TokenType t = (string_open_ == 0) ? GetNextTokenType() : BEGIN_STRING;
-    stack_.pop();
-    util::Status result;
-    switch (type) {
-      case VALUE:
-        if (allow_no_root_element_ && IsInputAllWhiteSpaces(t)) {
-          return util::Status();
-        }
-        result = ParseValue(t);
-        break;
-
-      case OBJ_MID:
-        result = ParseObjectMid(t);
-        break;
-
-      case ENTRY:
-        result = ParseEntry(t);
-        break;
-
-      case ENTRY_MID:
-        result = ParseEntryMid(t);
-        break;
-
-      case ARRAY_VALUE:
-        result = ParseArrayValue(t);
-        break;
-
-      case ARRAY_MID:
-        result = ParseArrayMid(t);
-        break;
-
-      default:
-        result =
-            util::InternalError(StrCat("Unknown parse type: ", type));
-        break;
-    }
-    if (!result.ok()) {
-      // If we were cancelled, save our state and try again later.
-      if (!finishing_ && util::IsCancelled(result)) {
-        stack_.push(type);
-        // If we have a key we still need to render, make sure to save off the
-        // contents in our own storage.
-        if (!key_.empty() && key_storage_.empty()) {
-          StrAppend(&key_storage_, key_);
-          key_ = StringPiece(key_storage_);
-        }
-        result = util::Status();
-      }
-      return result;
-    }
-  }
-  return util::Status();
-}
-
-util::Status JsonStreamParser::ParseValue(TokenType type) {
-  switch (type) {
-    case BEGIN_OBJECT:
-      return HandleBeginObject();
-    case BEGIN_ARRAY:
-      return HandleBeginArray();
-    case BEGIN_STRING:
-      return ParseString();
-    case BEGIN_NUMBER:
-      return ParseNumber();
-    case BEGIN_TRUE:
-      return ParseTrue();
-    case BEGIN_FALSE:
-      return ParseFalse();
-    case BEGIN_NULL:
-      return ParseNull();
-    case UNKNOWN:
-      return ReportUnknown("Expected a value.", ParseErrorType::EXPECTED_VALUE);
-    default: {
-      // Special case for having been cut off while parsing, wait for more data.
-      // This handles things like 'fals' being at the end of the string, we
-      // don't know if the next char would be e, completing it, or something
-      // else, making it invalid.
-      if (!finishing_ && p_.length() < kKeywordFalse.length()) {
-        return util::CancelledError("");
-      }
-
-      if (allow_empty_null_ && IsEmptyNullAllowed(type)) {
-        return ParseEmptyNull();
-      }
-      return ReportFailure("Unexpected token.",
-                           ParseErrorType::UNEXPECTED_TOKEN);
-    }
-  }
-}
-
-util::Status JsonStreamParser::ParseString() {
-  util::Status result = ParseStringHelper();
-  if (result.ok()) {
-    ow_->RenderString(key_, parsed_);
-    key_ = StringPiece();
-    parsed_ = StringPiece();
-    parsed_storage_.clear();
-  }
-  return result;
-}
-
-util::Status JsonStreamParser::ParseStringHelper() {
-  // If we haven't seen the start quote, grab it and remember it for later.
-  if (string_open_ == 0) {
-    string_open_ = *p_.data();
-    GOOGLE_DCHECK(string_open_ == '\"' || string_open_ == '\'');
-    Advance();
-  }
-  // Track where we last copied data from so we can minimize copying.
-  const char* last = p_.data();
-  while (!p_.empty()) {
-    const char* data = p_.data();
-    if (*data == '\\') {
-      // We're about to handle an escape, copy all bytes from last to data.
-      if (last < data) {
-        parsed_storage_.append(last, data - last);
-      }
-      // If we ran out of string after the \, cancel or report an error
-      // depending on if we expect more data later.
-      if (p_.length() == 1) {
-        if (!finishing_) {
-          return util::CancelledError("");
-        }
-        return ReportFailure("Closing quote expected in string.",
-                             ParseErrorType::EXPECTED_CLOSING_QUOTE);
-      }
-      // Parse a unicode escape if we found \u in the string.
-      if (data[1] == 'u') {
-        util::Status result = ParseUnicodeEscape();
-        if (!result.ok()) {
-          return result;
-        }
-        // Move last pointer past the unicode escape and continue.
-        last = p_.data();
-        continue;
-      }
-      // Handle the standard set of backslash-escaped characters.
-      switch (data[1]) {
-        case 'b':
-          parsed_storage_.push_back('\b');
-          break;
-        case 'f':
-          parsed_storage_.push_back('\f');
-          break;
-        case 'n':
-          parsed_storage_.push_back('\n');
-          break;
-        case 'r':
-          parsed_storage_.push_back('\r');
-          break;
-        case 't':
-          parsed_storage_.push_back('\t');
-          break;
-        case 'v':
-          parsed_storage_.push_back('\v');
-          break;
-        default:
-          parsed_storage_.push_back(data[1]);
-      }
-      // We handled two characters, so advance past them and continue.
-      p_.remove_prefix(2);
-      last = p_.data();
-      continue;
-    }
-    // If we found the closing quote note it, advance past it, and return.
-    if (*data == string_open_) {
-      // If we didn't copy anything, reuse the input buffer.
-      if (parsed_storage_.empty()) {
-        parsed_ = StringPiece(last, data - last);
-      } else {
-        if (last < data) {
-          parsed_storage_.append(last, data - last);
-        }
-        parsed_ = StringPiece(parsed_storage_);
-      }
-      // Clear the quote char so next time we try to parse a string we'll
-      // start fresh.
-      string_open_ = 0;
-      Advance();
-      return util::Status();
-    }
-    // Normal character, just advance past it.
-    Advance();
-  }
-  // If we ran out of characters, copy over what we have so far.
-  if (last < p_.data()) {
-    parsed_storage_.append(last, p_.data() - last);
-  }
-  // If we didn't find the closing quote but we expect more data, cancel for now
-  if (!finishing_) {
-    return util::CancelledError("");
-  }
-  // End of string reached without a closing quote, report an error.
-  string_open_ = 0;
-  return ReportFailure("Closing quote expected in string.",
-                       ParseErrorType::EXPECTED_CLOSING_QUOTE);
-}
-
-// Converts a unicode escaped character to a decimal value stored in a char32
-// for use in UTF8 encoding utility.  We assume that str begins with \uhhhh and
-// convert that from the hex number to a decimal value.
-//
-// There are some security exploits with UTF-8 that we should be careful of:
-//   - http://www.unicode.org/reports/tr36/#UTF-8_Exploit
-//   - http://sites/intl-eng/design-guide/core-application
-util::Status JsonStreamParser::ParseUnicodeEscape() {
-  if (p_.length() < kUnicodeEscapedLength) {
-    if (!finishing_) {
-      return util::CancelledError("");
-    }
-    return ReportFailure("Illegal hex string.",
-                         ParseErrorType::ILLEGAL_HEX_STRING);
-  }
-  GOOGLE_DCHECK_EQ('\\', p_.data()[0]);
-  GOOGLE_DCHECK_EQ('u', p_.data()[1]);
-  uint32_t code = 0;
-  for (int i = 2; i < kUnicodeEscapedLength; ++i) {
-    if (!isxdigit(p_.data()[i])) {
-      return ReportFailure("Invalid escape sequence.",
-                           ParseErrorType::INVALID_ESCAPE_SEQUENCE);
-    }
-    code = (code << 4) + hex_digit_to_int(p_.data()[i]);
-  }
-  if (code >= JsonEscaping::kMinHighSurrogate &&
-      code <= JsonEscaping::kMaxHighSurrogate) {
-    if (p_.length() < 2 * kUnicodeEscapedLength) {
-      if (!finishing_) {
-        return util::CancelledError("");
-      }
-      if (!coerce_to_utf8_) {
-        return ReportFailure("Missing low surrogate.",
-                             ParseErrorType::MISSING_LOW_SURROGATE);
-      }
-    } else if (p_.data()[kUnicodeEscapedLength] == '\\' &&
-               p_.data()[kUnicodeEscapedLength + 1] == 'u') {
-      uint32_t low_code = 0;
-      for (int i = kUnicodeEscapedLength + 2; i < 2 * kUnicodeEscapedLength;
-           ++i) {
-        if (!isxdigit(p_.data()[i])) {
-          return ReportFailure("Invalid escape sequence.",
-                               ParseErrorType::INVALID_ESCAPE_SEQUENCE);
-        }
-        low_code = (low_code << 4) + hex_digit_to_int(p_.data()[i]);
-      }
-      if (low_code >= JsonEscaping::kMinLowSurrogate &&
-          low_code <= JsonEscaping::kMaxLowSurrogate) {
-        // Convert UTF-16 surrogate pair to 21-bit Unicode codepoint.
-        code = (((code & 0x3FF) << 10) | (low_code & 0x3FF)) +
-               JsonEscaping::kMinSupplementaryCodePoint;
-        // Advance past the first code unit escape.
-        p_.remove_prefix(kUnicodeEscapedLength);
-      } else if (!coerce_to_utf8_) {
-        return ReportFailure("Invalid low surrogate.",
-                             ParseErrorType::INVALID_LOW_SURROGATE);
-      }
-    } else if (!coerce_to_utf8_) {
-      return ReportFailure("Missing low surrogate.",
-                           ParseErrorType::MISSING_LOW_SURROGATE);
-    }
-  }
-  if (!coerce_to_utf8_ && !IsValidCodePoint(code)) {
-    return ReportFailure("Invalid unicode code point.",
-                         ParseErrorType::INVALID_UNICODE);
-  }
-  char buf[UTFmax];
-  int len = EncodeAsUTF8Char(code, buf);
-  // Advance past the [final] code unit escape.
-  p_.remove_prefix(kUnicodeEscapedLength);
-  parsed_storage_.append(buf, len);
-  return util::Status();
-}
-
-util::Status JsonStreamParser::ParseNumber() {
-  NumberResult number;
-  util::Status result = ParseNumberHelper(&number);
-  if (result.ok()) {
-    switch (number.type) {
-      case NumberResult::DOUBLE:
-        ow_->RenderDouble(key_, number.double_val);
-        key_ = StringPiece();
-        break;
-
-      case NumberResult::INT:
-        ow_->RenderInt64(key_, number.int_val);
-        key_ = StringPiece();
-        break;
-
-      case NumberResult::UINT:
-        ow_->RenderUint64(key_, number.uint_val);
-        key_ = StringPiece();
-        break;
-
-      default:
-        return ReportFailure("Unable to parse number.",
-                             ParseErrorType::UNABLE_TO_PARSE_NUMBER);
-    }
-  }
-  return result;
-}
-
-util::Status JsonStreamParser::ParseDoubleHelper(const std::string& number,
-                                                 NumberResult* result) {
-  if (!safe_strtod(number, &result->double_val)) {
-    return ReportFailure("Unable to parse number.",
-                         ParseErrorType::UNABLE_TO_PARSE_NUMBER);
-  }
-  if (!loose_float_number_conversion_ && !std::isfinite(result->double_val)) {
-    return ReportFailure("Number exceeds the range of double.",
-                         ParseErrorType::NUMBER_EXCEEDS_RANGE_DOUBLE);
-  }
-  result->type = NumberResult::DOUBLE;
-  return util::Status();
-}
-
-util::Status JsonStreamParser::ParseNumberHelper(NumberResult* result) {
-  const char* data = p_.data();
-  int length = p_.length();
-
-  // Look for the first non-numeric character, or the end of the string.
-  int index = 0;
-  bool floating = false;
-  bool negative = data[index] == '-';
-  // Find the first character that cannot be part of the number. Along the way
-  // detect if the number needs to be parsed as a double.
-  // Note that this restricts numbers to the JSON specification, so for example
-  // we do not support hex or octal notations.
-  for (; index < length; ++index) {
-    char c = data[index];
-    if (isdigit(c)) continue;
-    if (c == '.' || c == 'e' || c == 'E') {
-      floating = true;
-      continue;
-    }
-    if (c == '+' || c == '-' || c == 'x') continue;
-    // Not a valid number character, break out.
-    break;
-  }
-
-  // If the entire input is a valid number, and we may have more content in the
-  // future, we abort for now and resume when we know more.
-  if (index == length && !finishing_) {
-    return util::CancelledError("");
-  }
-
-  // Create a string containing just the number, so we can use safe_strtoX
-  std::string number = std::string(p_.substr(0, index));
-
-  // Floating point number, parse as a double.
-  if (floating) {
-    util::Status status = ParseDoubleHelper(number, result);
-    if (status.ok()) {
-      p_.remove_prefix(index);
-    }
-    return status;
-  }
-
-  // Positive non-floating point number, parse as a uint64_t.
-  if (!negative) {
-    // Octal/Hex numbers are not valid JSON values.
-    if (number.length() >= 2 && number[0] == '0') {
-      return ReportFailure(
-          "Octal/hex numbers are not valid JSON values.",
-          ParseErrorType::OCTAL_OR_HEX_ARE_NOT_VALID_JSON_VALUES);
-    }
-    if (safe_strtou64(number, &result->uint_val)) {
-      result->type = NumberResult::UINT;
-      p_.remove_prefix(index);
-      return util::Status();
-    } else {
-      // If the value is too large, parse it as double.
-      util::Status status = ParseDoubleHelper(number, result);
-      if (status.ok()) {
-        p_.remove_prefix(index);
-      }
-      return status;
-    }
-  }
-
-  // Octal/Hex numbers are not valid JSON values.
-  if (number.length() >= 3 && number[1] == '0') {
-    return ReportFailure(
-        "Octal/hex numbers are not valid JSON values.",
-        ParseErrorType::OCTAL_OR_HEX_ARE_NOT_VALID_JSON_VALUES);
-  }
-  // Negative non-floating point number, parse as an int64_t.
-  if (safe_strto64(number, &result->int_val)) {
-    result->type = NumberResult::INT;
-    p_.remove_prefix(index);
-    return util::Status();
-  } else {
-    // If the value is too large, parse it as double.
-    util::Status status = ParseDoubleHelper(number, result);
-    if (status.ok()) {
-      p_.remove_prefix(index);
-    }
-    return status;
-  }
-}
-
-util::Status JsonStreamParser::HandleBeginObject() {
-  GOOGLE_DCHECK_EQ('{', *p_.data());
-  Advance();
-  ow_->StartObject(key_);
-  auto status = IncrementRecursionDepth(key_);
-  if (!status.ok()) {
-    return status;
-  }
-  key_ = StringPiece();
-  stack_.push(ENTRY);
-  return util::Status();
-}
-
-util::Status JsonStreamParser::ParseObjectMid(TokenType type) {
-  if (type == UNKNOWN) {
-    return ReportUnknown("Expected , or } after key:value pair.",
-                         ParseErrorType::EXPECTED_COMMA_OR_BRACES);
-  }
-
-  // Object is complete, advance past the comma and render the EndObject.
-  if (type == END_OBJECT) {
-    Advance();
-    ow_->EndObject();
-    --recursion_depth_;
-    return util::Status();
-  }
-  // Found a comma, advance past it and get ready for an entry.
-  if (type == VALUE_SEPARATOR) {
-    Advance();
-    stack_.push(ENTRY);
-    return util::Status();
-  }
-  // Illegal token after key:value pair.
-  return ReportFailure("Expected , or } after key:value pair.",
-                       ParseErrorType::EXPECTED_COMMA_OR_BRACES);
-}
-
-util::Status JsonStreamParser::ParseEntry(TokenType type) {
-  if (type == UNKNOWN) {
-    return ReportUnknown("Expected an object key or }.",
-                         ParseErrorType::EXPECTED_OBJECT_KEY_OR_BRACES);
-  }
-
-  // Close the object and return. This allows for trailing commas.
-  if (type == END_OBJECT) {
-    ow_->EndObject();
-    Advance();
-    --recursion_depth_;
-    return util::Status();
-  }
-
-  util::Status result;
-  if (type == BEGIN_STRING) {
-    // Key is a string (standard JSON), parse it and store the string.
-    result = ParseStringHelper();
-    if (result.ok()) {
-      key_storage_.clear();
-      if (!parsed_storage_.empty()) {
-        parsed_storage_.swap(key_storage_);
-        key_ = StringPiece(key_storage_);
-      } else {
-        key_ = parsed_;
-      }
-      parsed_ = StringPiece();
-    }
-  } else if (type == BEGIN_KEY) {
-    // Key is a bare key (back compat), create a StringPiece pointing to it.
-    result = ParseKey();
-  } else if (type == BEGIN_NULL || type == BEGIN_TRUE || type == BEGIN_FALSE) {
-    // Key may be a bare key that begins with a reserved word.
-    result = ParseKey();
-    if (result.ok() && (key_ == kKeywordNull || key_ == kKeywordTrue ||
-                        key_ == kKeywordFalse)) {
-      result = ReportFailure("Expected an object key or }.",
-                             ParseErrorType::EXPECTED_OBJECT_KEY_OR_BRACES);
-    }
-  } else {
-    // Unknown key type, report an error.
-    result = ReportFailure("Expected an object key or }.",
-                           ParseErrorType::EXPECTED_OBJECT_KEY_OR_BRACES);
-  }
-  // On success we next expect an entry mid ':' then an object mid ',' or '}'
-  if (result.ok()) {
-    stack_.push(OBJ_MID);
-    stack_.push(ENTRY_MID);
-  }
-  return result;
-}
-
-util::Status JsonStreamParser::ParseEntryMid(TokenType type) {
-  if (type == UNKNOWN) {
-    return ReportUnknown("Expected : between key:value pair.",
-                         ParseErrorType::EXPECTED_COLON);
-  }
-  if (type == ENTRY_SEPARATOR) {
-    Advance();
-    stack_.push(VALUE);
-    return util::Status();
-  }
-  return ReportFailure("Expected : between key:value pair.",
-                       ParseErrorType::EXPECTED_COLON);
-}
-
-util::Status JsonStreamParser::HandleBeginArray() {
-  GOOGLE_DCHECK_EQ('[', *p_.data());
-  Advance();
-  ow_->StartList(key_);
-  key_ = StringPiece();
-  stack_.push(ARRAY_VALUE);
-  return util::Status();
-}
-
-util::Status JsonStreamParser::ParseArrayValue(TokenType type) {
-  if (type == UNKNOWN) {
-    return ReportUnknown("Expected a value or ] within an array.",
-                         ParseErrorType::EXPECTED_VALUE_OR_BRACKET);
-  }
-
-  if (type == END_ARRAY) {
-    ow_->EndList();
-    Advance();
-    return util::Status();
-  }
-
-  // The ParseValue call may push something onto the stack so we need to make
-  // sure an ARRAY_MID is after it, so we push it on now. Also, the parsing of
-  // empty-null array value is relying on this ARRAY_MID token.
-  stack_.push(ARRAY_MID);
-  util::Status result = ParseValue(type);
-  if (util::IsCancelled(result)) {
-    // If we were cancelled, pop back off the ARRAY_MID so we don't try to
-    // push it on again when we try over.
-    stack_.pop();
-  }
-  return result;
-}
-
-util::Status JsonStreamParser::ParseArrayMid(TokenType type) {
-  if (type == UNKNOWN) {
-    return ReportUnknown("Expected , or ] after array value.",
-                         ParseErrorType::EXPECTED_COMMA_OR_BRACKET);
-  }
-
-  if (type == END_ARRAY) {
-    ow_->EndList();
-    Advance();
-    return util::Status();
-  }
-
-  // Found a comma, advance past it and expect an array value next.
-  if (type == VALUE_SEPARATOR) {
-    Advance();
-    stack_.push(ARRAY_VALUE);
-    return util::Status();
-  }
-  // Illegal token after array value.
-  return ReportFailure("Expected , or ] after array value.",
-                       ParseErrorType::EXPECTED_COMMA_OR_BRACKET);
-}
-
-util::Status JsonStreamParser::ParseTrue() {
-  ow_->RenderBool(key_, true);
-  key_ = StringPiece();
-  p_.remove_prefix(kKeywordTrue.length());
-  return util::Status();
-}
-
-util::Status JsonStreamParser::ParseFalse() {
-  ow_->RenderBool(key_, false);
-  key_ = StringPiece();
-  p_.remove_prefix(kKeywordFalse.length());
-  return util::Status();
-}
-
-util::Status JsonStreamParser::ParseNull() {
-  ow_->RenderNull(key_);
-  key_ = StringPiece();
-  p_.remove_prefix(kKeywordNull.length());
-  return util::Status();
-}
-
-util::Status JsonStreamParser::ParseEmptyNull() {
-  ow_->RenderNull(key_);
-  key_ = StringPiece();
-  return util::Status();
-}
-
-bool JsonStreamParser::IsEmptyNullAllowed(TokenType type) {
-  if (stack_.empty()) return false;
-  return (stack_.top() == ARRAY_MID && type == VALUE_SEPARATOR) ||
-         stack_.top() == OBJ_MID;
-}
-
-util::Status JsonStreamParser::ReportFailure(StringPiece message,
-                                             ParseErrorType parse_code) {
-  (void)parse_code;  // Parameter is used in Google-internal code.
-  static const int kContextLength = 20;
-  const char* p_start = p_.data();
-  const char* json_start = json_.data();
-  const char* begin = std::max(p_start - kContextLength, json_start);
-  const char* end =
-      std::min(p_start + kContextLength, json_start + json_.size());
-  StringPiece segment(begin, end - begin);
-  std::string location(p_start - begin, ' ');
-  location.push_back('^');
-  auto status = util::InvalidArgumentError(
-      StrCat(message, "\n", segment, "\n", location));
-  return status;
-}
-
-util::Status JsonStreamParser::ReportUnknown(StringPiece message,
-                                             ParseErrorType parse_code) {
-  // If we aren't finishing the parse, cancel parsing and try later.
-  if (!finishing_) {
-    return util::CancelledError("");
-  }
-  if (p_.empty()) {
-    return ReportFailure(StrCat("Unexpected end of string. ", message),
-                         parse_code);
-  }
-  return ReportFailure(message, parse_code);
-}
-
-util::Status JsonStreamParser::IncrementRecursionDepth(
-    StringPiece key) const {
-  if (++recursion_depth_ > max_recursion_depth_) {
-    return util::InvalidArgumentError(StrCat(
-        "Message too deep. Max recursion depth reached for key '", key, "'"));
-  }
-  return util::Status();
-}
-
-void JsonStreamParser::SkipWhitespace() {
-  while (!p_.empty() && ascii_isspace(*p_.data())) {
-    Advance();
-  }
-  if (!p_.empty() && !ascii_isspace(*p_.data())) {
-    seen_non_whitespace_ = true;
-  }
-}
-
-void JsonStreamParser::Advance() {
-  // Advance by moving one UTF8 character while making sure we don't go beyond
-  // the length of StringPiece.
-  p_.remove_prefix(std::min<int>(
-      p_.length(), UTF8FirstLetterNumBytes(p_.data(), p_.length())));
-}
-
-util::Status JsonStreamParser::ParseKey() {
-  StringPiece original = p_;
-
-  if (allow_permissive_key_naming_) {
-    if (!ConsumeKeyPermissive(&p_, &key_)) {
-      return ReportFailure("Invalid key or variable name.",
-                           ParseErrorType::INVALID_KEY_OR_VARIABLE_NAME);
-    }
-  } else {
-    if (!ConsumeKey(&p_, &key_)) {
-      return ReportFailure("Invalid key or variable name.",
-                           ParseErrorType::INVALID_KEY_OR_VARIABLE_NAME);
-    }
-  }
-
-  // If we consumed everything but expect more data, reset p_ and cancel since
-  // we can't know if the key was complete or not.
-  if (!finishing_ && p_.empty()) {
-    p_ = original;
-    return util::CancelledError("");
-  }
-  // Since we aren't using the key storage, clear it out.
-  key_storage_.clear();
-  return util::Status();
-}
-
-JsonStreamParser::TokenType JsonStreamParser::GetNextTokenType() {
-  SkipWhitespace();
-
-  int size = p_.size();
-  if (size == 0) {
-    // If we ran out of data, report unknown and we'll place the previous parse
-    // type onto the stack and try again when we have more data.
-    return UNKNOWN;
-  }
-  // TODO(sven): Split this method based on context since different contexts
-  // support different tokens. Would slightly speed up processing?
-  const char* data = p_.data();
-  StringPiece data_view = StringPiece(data, size);
-  if (*data == '\"' || *data == '\'') return BEGIN_STRING;
-  if (*data == '-' || ('0' <= *data && *data <= '9')) {
-    return BEGIN_NUMBER;
-  }
-  if (size >= kKeywordTrue.length() &&
-      HasPrefixString(data_view, kKeywordTrue)) {
-    return BEGIN_TRUE;
-  }
-  if (size >= kKeywordFalse.length() &&
-      HasPrefixString(data_view, kKeywordFalse)) {
-    return BEGIN_FALSE;
-  }
-  if (size >= kKeywordNull.length() &&
-      HasPrefixString(data_view, kKeywordNull)) {
-    return BEGIN_NULL;
-  }
-  if (*data == '{') return BEGIN_OBJECT;
-  if (*data == '}') return END_OBJECT;
-  if (*data == '[') return BEGIN_ARRAY;
-  if (*data == ']') return END_ARRAY;
-  if (*data == ':') return ENTRY_SEPARATOR;
-  if (*data == ',') return VALUE_SEPARATOR;
-  if (MatchKey(p_)) {
-    return BEGIN_KEY;
-  }
-
-  // We don't know that we necessarily have an invalid token here, just that we
-  // can't parse what we have so far. So we don't report an error and just
-  // return UNKNOWN so we can try again later when we have more data, or if we
-  // finish and we have leftovers.
-  return UNKNOWN;
-}
-
-}  // namespace converter
-}  // namespace util
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/util/internal/json_stream_parser.h b/libs/protobuf/src/google/protobuf/util/internal/json_stream_parser.h
deleted file mode 100644
index 09f17ad..0000000
--- a/libs/protobuf/src/google/protobuf/util/internal/json_stream_parser.h
+++ /dev/null
@@ -1,350 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef GOOGLE_PROTOBUF_UTIL_INTERNAL_JSON_STREAM_PARSER_H__
-#define GOOGLE_PROTOBUF_UTIL_INTERNAL_JSON_STREAM_PARSER_H__
-
-#include <cstdint>
-#include <stack>
-#include <string>
-
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/stubs/status.h>
-#include <google/protobuf/stubs/strutil.h>
-#include <google/protobuf/stubs/status.h>
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-namespace util {
-namespace converter {
-
-
-class ObjectWriter;
-
-// A JSON parser that can parse a stream of JSON chunks rather than needing the
-// entire JSON string up front. It is a modified version of the parser in
-// //net/proto/json/json-parser.h that has been changed in the following ways:
-// - Changed from recursion to an explicit stack to allow resumption
-// - Added support for int64 and uint64 numbers
-// - Removed support for octal and decimal escapes
-// - Removed support for numeric keys
-// - Removed support for functions (javascript)
-// - Removed some lax-comma support (but kept trailing comma support)
-// - Writes directly to an ObjectWriter rather than using subclassing
-//
-// Here is an example usage:
-// JsonStreamParser parser(ow_.get());
-// util::Status result = parser.Parse(chunk1);
-// result.Update(parser.Parse(chunk2));
-// result.Update(parser.FinishParse());
-// GOOGLE_DCHECK(result.ok()) << "Failed to parse JSON";
-//
-// This parser is thread-compatible as long as only one thread is calling a
-// Parse() method at a time.
-class PROTOBUF_EXPORT JsonStreamParser {
- public:
-  // Creates a JsonStreamParser that will write to the given ObjectWriter.
-  explicit JsonStreamParser(ObjectWriter* ow);
-  virtual ~JsonStreamParser();
-
-  // Parses a UTF-8 encoded JSON string from a StringPiece. If the returned
-  // status is non-ok, the status might contain a payload ParseErrorType with
-  // type_url kParseErrorTypeUrl and a payload containing string snippet of the
-  // error with type_url kParseErrorSnippetUrl.
-  util::Status Parse(StringPiece json);
-
-
-  // Finish parsing the JSON string. If the returned status is non-ok, the
-  // status might contain a payload ParseErrorType with type_url
-  // kParseErrorTypeUrl and a payload containing string snippet of the error
-  // with type_url kParseErrorSnippetUrl.
-  util::Status FinishParse();
-
-
-  // Sets the max recursion depth of JSON message to be deserialized. JSON
-  // messages over this depth will fail to be deserialized.
-  // Default value is 100.
-  void set_max_recursion_depth(int max_depth) {
-    max_recursion_depth_ = max_depth;
-  }
-
-  // Denotes the cause of error.
-  enum ParseErrorType {
-    UNKNOWN_PARSE_ERROR,
-    OCTAL_OR_HEX_ARE_NOT_VALID_JSON_VALUES,
-    EXPECTED_COLON,
-    EXPECTED_COMMA_OR_BRACKET,
-    EXPECTED_VALUE,
-    EXPECTED_COMMA_OR_BRACES,
-    EXPECTED_OBJECT_KEY_OR_BRACES,
-    EXPECTED_VALUE_OR_BRACKET,
-    INVALID_KEY_OR_VARIABLE_NAME,
-    NON_UTF_8,
-    PARSING_TERMINATED_BEFORE_END_OF_INPUT,
-    UNEXPECTED_TOKEN,
-    EXPECTED_CLOSING_QUOTE,
-    ILLEGAL_HEX_STRING,
-    INVALID_ESCAPE_SEQUENCE,
-    MISSING_LOW_SURROGATE,
-    INVALID_LOW_SURROGATE,
-    INVALID_UNICODE,
-    UNABLE_TO_PARSE_NUMBER,
-    NUMBER_EXCEEDS_RANGE_DOUBLE
-  };
-
- private:
-  friend class JsonStreamParserTest;
-  // Return the current recursion depth.
-  int recursion_depth() { return recursion_depth_; }
-
-  enum TokenType {
-    BEGIN_STRING,     // " or '
-    BEGIN_NUMBER,     // - or digit
-    BEGIN_TRUE,       // true
-    BEGIN_FALSE,      // false
-    BEGIN_NULL,       // null
-    BEGIN_OBJECT,     // {
-    END_OBJECT,       // }
-    BEGIN_ARRAY,      // [
-    END_ARRAY,        // ]
-    ENTRY_SEPARATOR,  // :
-    VALUE_SEPARATOR,  // ,
-    BEGIN_KEY,        // letter, _, $ or digit.  Must begin with non-digit
-    UNKNOWN           // Unknown token or we ran out of the stream.
-  };
-
-  enum ParseType {
-    VALUE,        // Expects a {, [, true, false, null, string or number
-    OBJ_MID,      // Expects a ',' or }
-    ENTRY,        // Expects a key or }
-    ENTRY_MID,    // Expects a :
-    ARRAY_VALUE,  // Expects a value or ]
-    ARRAY_MID     // Expects a ',' or ]
-  };
-
-  // Holds the result of parsing a number
-  struct NumberResult {
-    enum Type { DOUBLE, INT, UINT };
-    Type type;
-    union {
-      double double_val;
-      int64_t int_val;
-      uint64_t uint_val;
-    };
-  };
-
-  // Parses a single chunk of JSON, returning an error if the JSON was invalid.
-  util::Status ParseChunk(StringPiece chunk);
-
-  // Runs the parser based on stack_ and p_, until the stack is empty or p_ runs
-  // out of data. If we unexpectedly run out of p_ we push the latest back onto
-  // the stack and return.
-  util::Status RunParser();
-
-  // Parses a value from p_ and writes it to ow_.
-  // A value may be an object, array, true, false, null, string or number.
-  util::Status ParseValue(TokenType type);
-
-  // Parses a string and writes it out to the ow_.
-  util::Status ParseString();
-
-  // Parses a string, storing the result in parsed_.
-  util::Status ParseStringHelper();
-
-  // This function parses unicode escape sequences in strings. It returns an
-  // error when there's a parsing error, either the size is not the expected
-  // size or a character is not a hex digit.  When it returns str will contain
-  // what has been successfully parsed so far.
-  util::Status ParseUnicodeEscape();
-
-  // Expects p_ to point to a JSON number, writes the number to the writer using
-  // the appropriate Render method based on the type of number.
-  util::Status ParseNumber();
-
-  // Parse a number into a NumberResult, reporting an error if no number could
-  // be parsed. This method will try to parse into a uint64, int64, or double
-  // based on whether the number was positive or negative or had a decimal
-  // component.
-  util::Status ParseNumberHelper(NumberResult* result);
-
-  // Parse a number as double into a NumberResult.
-  util::Status ParseDoubleHelper(const std::string& number,
-                                 NumberResult* result);
-
-  // Handles a { during parsing of a value.
-  util::Status HandleBeginObject();
-
-  // Parses from the ENTRY state.
-  util::Status ParseEntry(TokenType type);
-
-  // Parses from the ENTRY_MID state.
-  util::Status ParseEntryMid(TokenType type);
-
-  // Parses from the OBJ_MID state.
-  util::Status ParseObjectMid(TokenType type);
-
-  // Handles a [ during parsing of a value.
-  util::Status HandleBeginArray();
-
-  // Parses from the ARRAY_VALUE state.
-  util::Status ParseArrayValue(TokenType type);
-
-  // Parses from the ARRAY_MID state.
-  util::Status ParseArrayMid(TokenType type);
-
-  // Expects p_ to point to an unquoted literal
-  util::Status ParseTrue();
-  util::Status ParseFalse();
-  util::Status ParseNull();
-  util::Status ParseEmptyNull();
-
-  // Whether an empty-null is allowed in the current state.
-  bool IsEmptyNullAllowed(TokenType type);
-
-  // Whether the whole input is all whitespaces.
-  bool IsInputAllWhiteSpaces(TokenType type);
-
-  // Report a failure as a util::Status.
-  util::Status ReportFailure(StringPiece message,
-                             ParseErrorType parse_code);
-
-  // Report a failure due to an UNKNOWN token type. We check if we hit the
-  // end of the stream and if we're finishing or not to detect what type of
-  // status to return in this case.
-  util::Status ReportUnknown(StringPiece message,
-                             ParseErrorType parse_code);
-
-  // Helper function to check recursion depth and increment it. It will return
-  // OkStatus() if the current depth is allowed. Otherwise an error is returned.
-  // key is used for error reporting.
-  util::Status IncrementRecursionDepth(StringPiece key) const;
-
-  // Advance p_ past all whitespace or until the end of the string.
-  void SkipWhitespace();
-
-  // Advance p_ one UTF-8 character
-  void Advance();
-
-  // Expects p_ to point to the beginning of a key.
-  util::Status ParseKey();
-
-  // Return the type of the next token at p_.
-  TokenType GetNextTokenType();
-
-  // The object writer to write parse events to.
-  ObjectWriter* ow_;
-
-  // The stack of parsing we still need to do. When the stack runs empty we will
-  // have parsed a single value from the root (e.g. an object or list).
-  std::stack<ParseType> stack_;
-
-  // Contains any leftover text from a previous chunk that we weren't able to
-  // fully parse, for example the start of a key or number.
-  std::string leftover_;
-
-  // The current chunk of JSON being parsed. Primarily used for providing
-  // context during error reporting.
-  StringPiece json_;
-
-  // A pointer within the current JSON being parsed, used to track location.
-  StringPiece p_;
-
-  // Stores the last key read, as we separate parsing of keys and values.
-  StringPiece key_;
-
-  // Storage for key_ if we need to keep ownership, for example between chunks
-  // or if the key was unescaped from a JSON string.
-  std::string key_storage_;
-
-  // True during the FinishParse() call, so we know that any errors are fatal.
-  // For example an unterminated string will normally result in cancelling and
-  // trying during the next chunk, but during FinishParse() it is an error.
-  bool finishing_;
-
-  // Whether non whitespace tokens have been seen during parsing.
-  // It is used to handle the case of a pure whitespace stream input.
-  bool seen_non_whitespace_;
-
-  // The JsonStreamParser requires a root element by default and it will raise
-  // error if the root element is missing. If `allow_no_root_element_` is true,
-  // the JsonStreamParser can also handle this case.
-  bool allow_no_root_element_;
-
-  // String we parsed during a call to ParseStringHelper().
-  StringPiece parsed_;
-
-  // Storage for the string we parsed. This may be empty if the string was able
-  // to be parsed directly from the input.
-  std::string parsed_storage_;
-
-  // The character that opened the string, either ' or ".
-  // A value of 0 indicates that string parsing is not in process.
-  char string_open_;
-
-  // Storage for the chunk that are being parsed in ParseChunk().
-  std::string chunk_storage_;
-
-  // Whether to allow non UTF-8 encoded input and replace invalid code points.
-  bool coerce_to_utf8_;
-
-  // Replacement character for invalid UTF-8 code points.
-  std::string utf8_replacement_character_;
-
-  // Whether allows empty string represented null array value or object entry
-  // value.
-  bool allow_empty_null_;
-
-  // Whether unquoted object keys can contain embedded non-alphanumeric
-  // characters when this is unambiguous for parsing.
-  bool allow_permissive_key_naming_;
-
-  // Whether allows out-of-range floating point numbers or reject them.
-  bool loose_float_number_conversion_;
-
-  // Tracks current recursion depth.
-  mutable int recursion_depth_;
-
-  // Maximum allowed recursion depth.
-  int max_recursion_depth_;
-
-  GOOGLE_DISALLOW_IMPLICIT_CONSTRUCTORS(JsonStreamParser);
-};
-
-}  // namespace converter
-}  // namespace util
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
-
-#endif  // GOOGLE_PROTOBUF_UTIL_INTERNAL_JSON_STREAM_PARSER_H__
diff --git a/libs/protobuf/src/google/protobuf/util/internal/json_stream_parser_test.cc b/libs/protobuf/src/google/protobuf/util/internal/json_stream_parser_test.cc
deleted file mode 100644
index 40157a2..0000000
--- a/libs/protobuf/src/google/protobuf/util/internal/json_stream_parser_test.cc
+++ /dev/null
@@ -1,979 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <google/protobuf/util/internal/json_stream_parser.h>
-
-#include <cstdint>
-
-#include <google/protobuf/stubs/logging.h>
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/util/internal/expecting_objectwriter.h>
-#include <gtest/gtest.h>
-#include <google/protobuf/stubs/time.h>
-#include <google/protobuf/util/internal/object_writer.h>
-#include <google/protobuf/stubs/status.h>
-
-
-namespace google {
-namespace protobuf {
-namespace util {
-namespace converter {
-
-using ParseErrorType =
-    ::google::protobuf::util::converter::JsonStreamParser::ParseErrorType;
-
-
-// Tests for the JSON Stream Parser. These tests are intended to be
-// comprehensive and cover the following:
-//
-// Positive tests:
-// - true, false, null
-// - empty object or array.
-// - negative and positive double and int, unsigned int
-// - single and double quoted strings
-// - string key, unquoted key, numeric key
-// - array containing array, object, value
-// - object containing array, object, value
-// - unicode handling in strings
-// - ascii escaping (\b, \f, \n, \r, \t, \v)
-// - trailing commas
-//
-// Negative tests:
-// - illegal literals
-// - mismatched quotes failure on strings
-// - unterminated string failure
-// - unexpected end of string failure
-// - mismatched object and array closing
-// - Failure to close array or object
-// - numbers too large
-// - invalid unicode escapes.
-// - invalid unicode sequences.
-// - numbers as keys
-//
-// For each test we split the input string on every possible character to ensure
-// the parser is able to handle arbitrarily split input for all cases. We also
-// do a final test of the entire test case one character at a time.
-//
-// It is verified that expected calls to the mocked objects are in sequence.
-class JsonStreamParserTest : public ::testing::Test {
- protected:
-  JsonStreamParserTest() : mock_(), ow_(&mock_) {}
-  ~JsonStreamParserTest() override {}
-
-  util::Status RunTest(StringPiece json, int split,
-                       std::function<void(JsonStreamParser*)> setup) {
-    JsonStreamParser parser(&mock_);
-    setup(&parser);
-
-    // Special case for split == length, test parsing one character at a time.
-    if (split == json.length()) {
-      GOOGLE_LOG(INFO) << "Testing split every char: " << json;
-      for (int i = 0; i < json.length(); ++i) {
-        StringPiece single = json.substr(i, 1);
-        util::Status result = parser.Parse(single);
-        if (!result.ok()) {
-          return result;
-        }
-      }
-      return parser.FinishParse();
-    }
-
-    // Normal case, split at the split point and parse two substrings.
-    StringPiece first = json.substr(0, split);
-    StringPiece rest = json.substr(split);
-    GOOGLE_LOG(INFO) << "Testing split: " << first << "><" << rest;
-    util::Status result = parser.Parse(first);
-    if (result.ok()) {
-      result = parser.Parse(rest);
-      if (result.ok()) {
-        result = parser.FinishParse();
-      }
-    }
-    if (result.ok()) {
-      EXPECT_EQ(parser.recursion_depth(), 0);
-    }
-    return result;
-  }
-
-  void DoTest(
-      StringPiece json, int split,
-      std::function<void(JsonStreamParser*)> setup = [](JsonStreamParser* p) {
-      }) {
-    util::Status result = RunTest(json, split, setup);
-    if (!result.ok()) {
-      GOOGLE_LOG(WARNING) << result;
-    }
-    EXPECT_TRUE(result.ok());
-  }
-
-  void DoErrorTest(
-      StringPiece json, int split, StringPiece error_prefix,
-      std::function<void(JsonStreamParser*)> setup = [](JsonStreamParser* p) {
-      }) {
-    util::Status result = RunTest(json, split, setup);
-    EXPECT_TRUE(util::IsInvalidArgument(result));
-    StringPiece error_message(result.message());
-    EXPECT_EQ(error_prefix, error_message.substr(0, error_prefix.size()));
-  }
-
-  void DoErrorTest(
-      StringPiece json, int split, StringPiece error_prefix,
-      ParseErrorType expected_parse_error_type,
-      std::function<void(JsonStreamParser*)> setup = [](JsonStreamParser* p) {
-      }) {
-    util::Status result = RunTest(json, split, setup);
-    EXPECT_TRUE(util::IsInvalidArgument(result));
-    StringPiece error_message(result.message());
-    EXPECT_EQ(error_prefix, error_message.substr(0, error_prefix.size()));
-  }
-
-
-#ifndef _MSC_VER
-  // TODO(xiaofeng): We have to disable InSequence check for MSVC because it
-  // causes stack overflow due to its use of a linked list that is destructed
-  // recursively.
-  ::testing::InSequence in_sequence_;
-#endif  // !_MSC_VER
-  MockObjectWriter mock_;
-  ExpectingObjectWriter ow_;
-};
-
-
-// Positive tests
-
-// - true, false, null
-TEST_F(JsonStreamParserTest, SimpleTrue) {
-  StringPiece str = "true";
-  for (int i = 0; i <= str.length(); ++i) {
-    ow_.RenderBool("", true);
-    DoTest(str, i);
-  }
-}
-
-TEST_F(JsonStreamParserTest, SimpleFalse) {
-  StringPiece str = "false";
-  for (int i = 0; i <= str.length(); ++i) {
-    ow_.RenderBool("", false);
-    DoTest(str, i);
-  }
-}
-
-TEST_F(JsonStreamParserTest, SimpleNull) {
-  StringPiece str = "null";
-  for (int i = 0; i <= str.length(); ++i) {
-    ow_.RenderNull("");
-    DoTest(str, i);
-  }
-}
-
-// - empty object and array.
-TEST_F(JsonStreamParserTest, EmptyObject) {
-  StringPiece str = "{}";
-  for (int i = 0; i <= str.length(); ++i) {
-    ow_.StartObject("")->EndObject();
-    DoTest(str, i);
-  }
-}
-
-TEST_F(JsonStreamParserTest, EmptyList) {
-  StringPiece str = "[]";
-  for (int i = 0; i <= str.length(); ++i) {
-    ow_.StartList("")->EndList();
-    DoTest(str, i);
-  }
-}
-
-// - negative and positive double and int, unsigned int
-TEST_F(JsonStreamParserTest, SimpleDouble) {
-  StringPiece str = "42.5";
-  for (int i = 0; i <= str.length(); ++i) {
-    ow_.RenderDouble("", 42.5);
-    DoTest(str, i);
-  }
-}
-
-TEST_F(JsonStreamParserTest, ScientificDouble) {
-  StringPiece str = "1.2345e-10";
-  for (int i = 0; i < str.length(); ++i) {
-    ow_.RenderDouble("", 1.2345e-10);
-    DoTest(str, i);
-  }
-}
-
-TEST_F(JsonStreamParserTest, SimpleNegativeDouble) {
-  StringPiece str = "-1045.235";
-  for (int i = 0; i <= str.length(); ++i) {
-    ow_.RenderDouble("", -1045.235);
-    DoTest(str, i);
-  }
-}
-
-TEST_F(JsonStreamParserTest, SimpleInt) {
-  StringPiece str = "123456";
-  for (int i = 0; i <= str.length(); ++i) {
-    ow_.RenderUint64("", 123456);
-    DoTest(str, i);
-  }
-}
-
-TEST_F(JsonStreamParserTest, SimpleNegativeInt) {
-  StringPiece str = "-79497823553162765";
-  for (int i = 0; i <= str.length(); ++i) {
-    ow_.RenderInt64("", int64_t{-79497823553162765});
-    DoTest(str, i);
-  }
-}
-
-TEST_F(JsonStreamParserTest, SimpleUnsignedInt) {
-  StringPiece str = "11779497823553162765";
-  for (int i = 0; i <= str.length(); ++i) {
-    ow_.RenderUint64("", uint64_t{11779497823553162765u});
-    DoTest(str, i);
-  }
-}
-
-TEST_F(JsonStreamParserTest, OctalNumberIsInvalid) {
-  StringPiece str = "01234";
-  for (int i = 0; i <= str.length(); ++i) {
-    DoErrorTest(str, i, "Octal/hex numbers are not valid JSON values.",
-                ParseErrorType::OCTAL_OR_HEX_ARE_NOT_VALID_JSON_VALUES);
-  }
-  str = "-01234";
-  for (int i = 0; i <= str.length(); ++i) {
-    DoErrorTest(str, i, "Octal/hex numbers are not valid JSON values.",
-                ParseErrorType::OCTAL_OR_HEX_ARE_NOT_VALID_JSON_VALUES);
-  }
-}
-
-TEST_F(JsonStreamParserTest, HexNumberIsInvalid) {
-  StringPiece str = "0x1234";
-  for (int i = 0; i <= str.length(); ++i) {
-    DoErrorTest(str, i, "Octal/hex numbers are not valid JSON values.",
-                ParseErrorType::OCTAL_OR_HEX_ARE_NOT_VALID_JSON_VALUES);
-  }
-  str = "-0x1234";
-  for (int i = 0; i <= str.length(); ++i) {
-    DoErrorTest(str, i, "Octal/hex numbers are not valid JSON values.",
-                ParseErrorType::OCTAL_OR_HEX_ARE_NOT_VALID_JSON_VALUES);
-  }
-  str = "12x34";
-  for (int i = 0; i <= str.length(); ++i) {
-    DoErrorTest(str, i, "Unable to parse number.",
-                ParseErrorType::UNABLE_TO_PARSE_NUMBER);
-  }
-}
-
-// - single and double quoted strings
-TEST_F(JsonStreamParserTest, EmptyDoubleQuotedString) {
-  StringPiece str = "\"\"";
-  for (int i = 0; i <= str.length(); ++i) {
-    ow_.RenderString("", "");
-    DoTest(str, i);
-  }
-}
-
-TEST_F(JsonStreamParserTest, EmptySingleQuotedString) {
-  StringPiece str = "''";
-  for (int i = 0; i <= str.length(); ++i) {
-    ow_.RenderString("", "");
-    DoTest(str, i);
-  }
-}
-
-TEST_F(JsonStreamParserTest, SimpleDoubleQuotedString) {
-  StringPiece str = "\"Some String\"";
-  for (int i = 0; i <= str.length(); ++i) {
-    ow_.RenderString("", "Some String");
-    DoTest(str, i);
-  }
-}
-
-TEST_F(JsonStreamParserTest, SimpleSingleQuotedString) {
-  StringPiece str = "'Another String'";
-  for (int i = 0; i <= str.length(); ++i) {
-    ow_.RenderString("", "Another String");
-    DoTest(str, i);
-  }
-}
-
-// - string key, unquoted key, numeric key
-TEST_F(JsonStreamParserTest, ObjectKeyTypes) {
-  StringPiece str =
-      "{'s': true, \"d\": false, key: null, snake_key: [], camelKey: {}}";
-  for (int i = 0; i <= str.length(); ++i) {
-    ow_.StartObject("")
-        ->RenderBool("s", true)
-        ->RenderBool("d", false)
-        ->RenderNull("key")
-        ->StartList("snake_key")
-        ->EndList()
-        ->StartObject("camelKey")
-        ->EndObject()
-        ->EndObject();
-    DoTest(str, i);
-  }
-}
-
-TEST_F(JsonStreamParserTest, UnquotedObjectKeyWithReservedPrefxes) {
-  StringPiece str = "{ nullkey: \"a\", truekey: \"b\", falsekey: \"c\"}";
-  for (int i = 0; i <= str.length(); ++i) {
-    ow_.StartObject("")
-        ->RenderString("nullkey", "a")
-        ->RenderString("truekey", "b")
-        ->RenderString("falsekey", "c")
-        ->EndObject();
-    DoTest(str, i);
-  }
-}
-
-TEST_F(JsonStreamParserTest, UnquotedObjectKeyWithReservedKeyword) {
-  StringPiece str = "{ null: \"a\", true: \"b\", false: \"c\"}";
-  for (int i = 0; i <= str.length(); ++i) {
-    DoErrorTest(str, i, "Expected an object key or }.",
-                ParseErrorType::EXPECTED_OBJECT_KEY_OR_BRACES);
-  }
-}
-
-TEST_F(JsonStreamParserTest, UnquotedObjectKeyWithEmbeddedNonAlphanumeric) {
-  StringPiece str = "{ foo-bar-baz: \"a\"}";
-  for (int i = 0; i <= str.length(); ++i) {
-    DoErrorTest(str, i, "Expected : between key:value pair.",
-                ParseErrorType::EXPECTED_COLON);
-  }
-}
-
-
-// - array containing primitive values (true, false, null, num, string)
-TEST_F(JsonStreamParserTest, ArrayPrimitiveValues) {
-  StringPiece str = "[true, false, null, 'one', \"two\"]";
-  for (int i = 0; i <= str.length(); ++i) {
-    ow_.StartList("")
-        ->RenderBool("", true)
-        ->RenderBool("", false)
-        ->RenderNull("")
-        ->RenderString("", "one")
-        ->RenderString("", "two")
-        ->EndList();
-    DoTest(str, i);
-  }
-}
-
-// - array containing array, object
-TEST_F(JsonStreamParserTest, ArrayComplexValues) {
-  StringPiece str =
-      "[[22, -127, 45.3, -1056.4, 11779497823553162765], {'key': true}]";
-  for (int i = 0; i <= str.length(); ++i) {
-    ow_.StartList("")
-        ->StartList("")
-        ->RenderUint64("", 22)
-        ->RenderInt64("", -127)
-        ->RenderDouble("", 45.3)
-        ->RenderDouble("", -1056.4)
-        ->RenderUint64("", uint64_t{11779497823553162765u})
-        ->EndList()
-        ->StartObject("")
-        ->RenderBool("key", true)
-        ->EndObject()
-        ->EndList();
-    DoTest(str, i);
-  }
-}
-
-
-// - object containing array, object, value (true, false, null, num, string)
-TEST_F(JsonStreamParserTest, ObjectValues) {
-  StringPiece str =
-      "{t: true, f: false, n: null, s: 'a string', d: \"another string\", pi: "
-      "22, ni: -127, pd: 45.3, nd: -1056.4, pl: 11779497823553162765, l: [[]], "
-      "o: {'key': true}}";
-  for (int i = 0; i <= str.length(); ++i) {
-    ow_.StartObject("")
-        ->RenderBool("t", true)
-        ->RenderBool("f", false)
-        ->RenderNull("n")
-        ->RenderString("s", "a string")
-        ->RenderString("d", "another string")
-        ->RenderUint64("pi", 22)
-        ->RenderInt64("ni", -127)
-        ->RenderDouble("pd", 45.3)
-        ->RenderDouble("nd", -1056.4)
-        ->RenderUint64("pl", uint64_t{11779497823553162765u})
-        ->StartList("l")
-        ->StartList("")
-        ->EndList()
-        ->EndList()
-        ->StartObject("o")
-        ->RenderBool("key", true)
-        ->EndObject()
-        ->EndObject();
-    DoTest(str, i);
-  }
-}
-
-
-TEST_F(JsonStreamParserTest, RejectNonUtf8WhenNotCoerced) {
-  StringPiece json = "{\"address\":\xFF\"חרושת 23, רעננה, ישר�ל\"}";
-  for (int i = 0; i <= json.length(); ++i) {
-    DoErrorTest(json, i, "Encountered non UTF-8 code points.",
-                ParseErrorType::NON_UTF_8);
-  }
-  json = "{\"address\": \"חרושת 23,\xFFרעננה, ישר�ל\"}";
-  for (int i = 0; i <= json.length(); ++i) {
-    DoErrorTest(json, i, "Encountered non UTF-8 code points.",
-                ParseErrorType::NON_UTF_8);
-  }
-  DoErrorTest("\xFF{}", 0, "Encountered non UTF-8 code points.",
-              ParseErrorType::NON_UTF_8);
-}
-
-// - unicode handling in strings
-TEST_F(JsonStreamParserTest, UnicodeEscaping) {
-  StringPiece str = "[\"\\u0639\\u0631\\u0628\\u0649\"]";
-  for (int i = 0; i <= str.length(); ++i) {
-    ow_.StartList("")
-        ->RenderString("", "\xD8\xB9\xD8\xB1\xD8\xA8\xD9\x89")
-        ->EndList();
-    DoTest(str, i);
-  }
-}
-
-// - unicode UTF-16 surrogate pair handling in strings
-TEST_F(JsonStreamParserTest, UnicodeSurrogatePairEscaping) {
-  StringPiece str =
-      "[\"\\u0bee\\ud800\\uddf1\\uD80C\\uDDA4\\uD83d\\udC1D\\uD83C\\uDF6F\"]";
-  for (int i = 0; i <= str.length(); ++i) {
-    ow_.StartList("")
-        ->RenderString("",
-                       "\xE0\xAF\xAE\xF0\x90\x87\xB1\xF0\x93\x86\xA4\xF0"
-                       "\x9F\x90\x9D\xF0\x9F\x8D\xAF")
-        ->EndList();
-    DoTest(str, i);
-  }
-}
-
-
-TEST_F(JsonStreamParserTest, UnicodeEscapingInvalidCodePointWhenNotCoerced) {
-  // A low surrogate alone.
-  StringPiece str = "[\"\\ude36\"]";
-  for (int i = 0; i <= str.length(); ++i) {
-    DoErrorTest(str, i, "Invalid unicode code point.",
-                ParseErrorType::INVALID_UNICODE);
-  }
-}
-
-TEST_F(JsonStreamParserTest, UnicodeEscapingMissingLowSurrogateWhenNotCoerced) {
-  // A high surrogate alone.
-  StringPiece str = "[\"\\ud83d\"]";
-  for (int i = 0; i <= str.length(); ++i) {
-    DoErrorTest(str, i, "Missing low surrogate.",
-                ParseErrorType::MISSING_LOW_SURROGATE);
-  }
-  // A high surrogate with some trailing characters.
-  str = "[\"\\ud83d|ude36\"]";
-  for (int i = 0; i <= str.length(); ++i) {
-    DoErrorTest(str, i, "Missing low surrogate.",
-                ParseErrorType::MISSING_LOW_SURROGATE);
-  }
-  // A high surrogate with half a low surrogate.
-  str = "[\"\\ud83d\\ude--\"]";
-  for (int i = 0; i <= str.length(); ++i) {
-    DoErrorTest(str, i, "Invalid escape sequence.",
-                ParseErrorType::INVALID_ESCAPE_SEQUENCE);
-  }
-  // Two high surrogates.
-  str = "[\"\\ud83d\\ud83d\"]";
-  for (int i = 0; i <= str.length(); ++i) {
-    DoErrorTest(str, i, "Invalid low surrogate.",
-                ParseErrorType::INVALID_LOW_SURROGATE);
-  }
-}
-
-// - ascii escaping (\b, \f, \n, \r, \t, \v)
-TEST_F(JsonStreamParserTest, AsciiEscaping) {
-  StringPiece str =
-      "[\"\\b\", \"\\ning\", \"test\\f\", \"\\r\\t\", \"test\\\\\\ving\"]";
-  for (int i = 0; i <= str.length(); ++i) {
-    ow_.StartList("")
-        ->RenderString("", "\b")
-        ->RenderString("", "\ning")
-        ->RenderString("", "test\f")
-        ->RenderString("", "\r\t")
-        ->RenderString("", "test\\\ving")
-        ->EndList();
-    DoTest(str, i);
-  }
-}
-
-// - trailing commas, we support a single trailing comma but no internal commas.
-TEST_F(JsonStreamParserTest, TrailingCommas) {
-  StringPiece str = "[['a',true,], {b: null,},]";
-  for (int i = 0; i <= str.length(); ++i) {
-    ow_.StartList("")
-        ->StartList("")
-        ->RenderString("", "a")
-        ->RenderBool("", true)
-        ->EndList()
-        ->StartObject("")
-        ->RenderNull("b")
-        ->EndObject()
-        ->EndList();
-    DoTest(str, i);
-  }
-}
-
-// Negative tests
-
-// illegal literals
-TEST_F(JsonStreamParserTest, ExtraTextAfterTrue) {
-  StringPiece str = "truee";
-  for (int i = 0; i <= str.length(); ++i) {
-    ow_.RenderBool("", true);
-    DoErrorTest(str, i, "Parsing terminated before end of input.",
-                ParseErrorType::PARSING_TERMINATED_BEFORE_END_OF_INPUT);
-  }
-}
-
-TEST_F(JsonStreamParserTest, InvalidNumberDashOnly) {
-  StringPiece str = "-";
-  for (int i = 0; i <= str.length(); ++i) {
-    DoErrorTest(str, i, "Unable to parse number.",
-                ParseErrorType::UNABLE_TO_PARSE_NUMBER);
-  }
-}
-
-TEST_F(JsonStreamParserTest, InvalidNumberDashName) {
-  StringPiece str = "-foo";
-  for (int i = 0; i <= str.length(); ++i) {
-    DoErrorTest(str, i, "Unable to parse number.",
-                ParseErrorType::UNABLE_TO_PARSE_NUMBER);
-  }
-}
-
-TEST_F(JsonStreamParserTest, InvalidLiteralInArray) {
-  StringPiece str = "[nule]";
-  for (int i = 0; i <= str.length(); ++i) {
-    ow_.StartList("");
-    DoErrorTest(str, i, "Unexpected token.", ParseErrorType::UNEXPECTED_TOKEN);
-  }
-}
-
-TEST_F(JsonStreamParserTest, InvalidLiteralInObject) {
-  StringPiece str = "{123false}";
-  for (int i = 0; i <= str.length(); ++i) {
-    ow_.StartObject("");
-    DoErrorTest(str, i, "Expected an object key or }.",
-                ParseErrorType::EXPECTED_OBJECT_KEY_OR_BRACES);
-  }
-}
-
-// mismatched quotes failure on strings
-TEST_F(JsonStreamParserTest, MismatchedSingleQuotedLiteral) {
-  StringPiece str = "'Some str\"";
-  for (int i = 0; i <= str.length(); ++i) {
-    DoErrorTest(str, i, "Closing quote expected in string.",
-                ParseErrorType::EXPECTED_CLOSING_QUOTE);
-  }
-}
-
-TEST_F(JsonStreamParserTest, MismatchedDoubleQuotedLiteral) {
-  StringPiece str = "\"Another string that ends poorly!'";
-  for (int i = 0; i <= str.length(); ++i) {
-    DoErrorTest(str, i, "Closing quote expected in string.",
-                ParseErrorType::EXPECTED_CLOSING_QUOTE);
-  }
-}
-
-// unterminated strings
-TEST_F(JsonStreamParserTest, UnterminatedLiteralString) {
-  StringPiece str = "\"Forgot the rest of i";
-  for (int i = 0; i <= str.length(); ++i) {
-    DoErrorTest(str, i, "Closing quote expected in string.",
-                ParseErrorType::EXPECTED_CLOSING_QUOTE);
-  }
-}
-
-TEST_F(JsonStreamParserTest, UnterminatedStringEscape) {
-  StringPiece str = "\"Forgot the rest of \\";
-  for (int i = 0; i <= str.length(); ++i) {
-    DoErrorTest(str, i, "Closing quote expected in string.",
-                ParseErrorType::EXPECTED_CLOSING_QUOTE);
-  }
-}
-
-TEST_F(JsonStreamParserTest, UnterminatedStringInArray) {
-  StringPiece str = "[\"Forgot to close the string]";
-  for (int i = 0; i <= str.length(); ++i) {
-    ow_.StartList("");
-    DoErrorTest(str, i, "Closing quote expected in string.",
-                ParseErrorType::EXPECTED_CLOSING_QUOTE);
-  }
-}
-
-TEST_F(JsonStreamParserTest, UnterminatedStringInObject) {
-  StringPiece str = "{f: \"Forgot to close the string}";
-  for (int i = 0; i <= str.length(); ++i) {
-    ow_.StartObject("");
-    DoErrorTest(str, i, "Closing quote expected in string.",
-                ParseErrorType::EXPECTED_CLOSING_QUOTE);
-  }
-}
-
-TEST_F(JsonStreamParserTest, UnterminatedObject) {
-  StringPiece str = "{";
-  for (int i = 0; i <= str.length(); ++i) {
-    ow_.StartObject("");
-    DoErrorTest(str, i, "Unexpected end of string.",
-                ParseErrorType::EXPECTED_OBJECT_KEY_OR_BRACES);
-  }
-}
-
-
-// mismatched object and array closing
-TEST_F(JsonStreamParserTest, MismatchedCloseObject) {
-  StringPiece str = "{'key': true]";
-  for (int i = 0; i <= str.length(); ++i) {
-    ow_.StartObject("")->RenderBool("key", true);
-    DoErrorTest(str, i, "Expected , or } after key:value pair.",
-                ParseErrorType::EXPECTED_COMMA_OR_BRACES);
-  }
-}
-
-TEST_F(JsonStreamParserTest, MismatchedCloseArray) {
-  StringPiece str = "[true, null}";
-  for (int i = 0; i <= str.length(); ++i) {
-    ow_.StartList("")->RenderBool("", true)->RenderNull("");
-    DoErrorTest(str, i, "Expected , or ] after array value.",
-                ParseErrorType::EXPECTED_COMMA_OR_BRACKET);
-  }
-}
-
-// Invalid object keys.
-TEST_F(JsonStreamParserTest, InvalidNumericObjectKey) {
-  StringPiece str = "{42: true}";
-  for (int i = 0; i <= str.length(); ++i) {
-    ow_.StartObject("");
-    DoErrorTest(str, i, "Expected an object key or }.",
-                ParseErrorType::EXPECTED_OBJECT_KEY_OR_BRACES);
-  }
-}
-
-TEST_F(JsonStreamParserTest, InvalidLiteralObjectInObject) {
-  StringPiece str = "{{bob: true}}";
-  for (int i = 0; i <= str.length(); ++i) {
-    ow_.StartObject("");
-    DoErrorTest(str, i, "Expected an object key or }.",
-                ParseErrorType::EXPECTED_OBJECT_KEY_OR_BRACES);
-  }
-}
-
-TEST_F(JsonStreamParserTest, InvalidLiteralArrayInObject) {
-  StringPiece str = "{[null]}";
-  for (int i = 0; i <= str.length(); ++i) {
-    ow_.StartObject("");
-    DoErrorTest(str, i, "Expected an object key or }.",
-                ParseErrorType::EXPECTED_OBJECT_KEY_OR_BRACES);
-  }
-}
-
-TEST_F(JsonStreamParserTest, InvalidLiteralValueInObject) {
-  StringPiece str = "{false}";
-  for (int i = 0; i <= str.length(); ++i) {
-    ow_.StartObject("");
-    DoErrorTest(str, i, "Expected an object key or }.",
-                ParseErrorType::EXPECTED_OBJECT_KEY_OR_BRACES);
-  }
-}
-
-TEST_F(JsonStreamParserTest, MissingColonAfterStringInObject) {
-  StringPiece str = "{\"key\"}";
-  for (int i = 0; i <= str.length(); ++i) {
-    ow_.StartObject("");
-    DoErrorTest(str, i, "Expected : between key:value pair.",
-                ParseErrorType::EXPECTED_COLON);
-  }
-}
-
-TEST_F(JsonStreamParserTest, MissingColonAfterKeyInObject) {
-  StringPiece str = "{key}";
-  for (int i = 0; i <= str.length(); ++i) {
-    ow_.StartObject("");
-    DoErrorTest(str, i, "Expected : between key:value pair.",
-                ParseErrorType::EXPECTED_COLON);
-  }
-}
-
-TEST_F(JsonStreamParserTest, EndOfTextAfterKeyInObject) {
-  StringPiece str = "{key";
-  for (int i = 0; i <= str.length(); ++i) {
-    ow_.StartObject("");
-    DoErrorTest(str, i, "Unexpected end of string.",
-                ParseErrorType::EXPECTED_COLON);
-  }
-}
-
-TEST_F(JsonStreamParserTest, MissingValueAfterColonInObject) {
-  StringPiece str = "{key:}";
-  for (int i = 0; i <= str.length(); ++i) {
-    ow_.StartObject("");
-    DoErrorTest(str, i, "Unexpected token.", ParseErrorType::UNEXPECTED_TOKEN);
-  }
-}
-
-TEST_F(JsonStreamParserTest, MissingCommaBetweenObjectEntries) {
-  StringPiece str = "{key:20 'hello': true}";
-  for (int i = 0; i <= str.length(); ++i) {
-    ow_.StartObject("")->RenderUint64("key", 20);
-    DoErrorTest(str, i, "Expected , or } after key:value pair.",
-                ParseErrorType::EXPECTED_COMMA_OR_BRACES);
-  }
-}
-
-TEST_F(JsonStreamParserTest, InvalidLiteralAsObjectKey) {
-  StringPiece str = "{false: 20}";
-  for (int i = 0; i <= str.length(); ++i) {
-    ow_.StartObject("");
-    DoErrorTest(str, i, "Expected an object key or }.",
-                ParseErrorType::EXPECTED_OBJECT_KEY_OR_BRACES);
-  }
-}
-
-TEST_F(JsonStreamParserTest, ExtraCharactersAfterObject) {
-  StringPiece str = "{}}";
-  for (int i = 0; i <= str.length(); ++i) {
-    ow_.StartObject("")->EndObject();
-    DoErrorTest(str, i, "Parsing terminated before end of input.",
-                ParseErrorType::PARSING_TERMINATED_BEFORE_END_OF_INPUT);
-  }
-}
-
-TEST_F(JsonStreamParserTest, PositiveNumberTooBigIsDouble) {
-  StringPiece str = "18446744073709551616";  // 2^64
-  for (int i = 0; i <= str.length(); ++i) {
-    ow_.RenderDouble("", 18446744073709552000.0);
-    DoTest(str, i);
-  }
-}
-
-TEST_F(JsonStreamParserTest, NegativeNumberTooBigIsDouble) {
-  StringPiece str = "-18446744073709551616";
-  for (int i = 0; i <= str.length(); ++i) {
-    ow_.RenderDouble("", -18446744073709551616.0);
-    DoTest(str, i);
-  }
-}
-
-TEST_F(JsonStreamParserTest, DoubleTooBig) {
-  StringPiece str = "[1.89769e+308]";
-  for (int i = 0; i <= str.length(); ++i) {
-    ow_.StartList("");
-    DoErrorTest(str, i, "Number exceeds the range of double.",
-                ParseErrorType::NUMBER_EXCEEDS_RANGE_DOUBLE);
-  }
-  str = "[-1.89769e+308]";
-  for (int i = 0; i <= str.length(); ++i) {
-    ow_.StartList("");
-    DoErrorTest(str, i, "Number exceeds the range of double.",
-                ParseErrorType::NUMBER_EXCEEDS_RANGE_DOUBLE);
-  }
-}
-
-
-// invalid bare backslash.
-TEST_F(JsonStreamParserTest, UnfinishedEscape) {
-  StringPiece str = "\"\\";
-  for (int i = 0; i <= str.length(); ++i) {
-    DoErrorTest(str, i, "Closing quote expected in string.",
-                ParseErrorType::EXPECTED_CLOSING_QUOTE);
-  }
-}
-
-// invalid bare backslash u.
-TEST_F(JsonStreamParserTest, UnfinishedUnicodeEscape) {
-  StringPiece str = "\"\\u";
-  for (int i = 0; i <= str.length(); ++i) {
-    DoErrorTest(str, i, "Illegal hex string.",
-                ParseErrorType::ILLEGAL_HEX_STRING);
-  }
-}
-
-// invalid unicode sequence.
-TEST_F(JsonStreamParserTest, UnicodeEscapeCutOff) {
-  StringPiece str = "\"\\u12";
-  for (int i = 0; i <= str.length(); ++i) {
-    DoErrorTest(str, i, "Illegal hex string.",
-                ParseErrorType::ILLEGAL_HEX_STRING);
-  }
-}
-
-// invalid unicode sequence (valid in modern EcmaScript but not in JSON).
-TEST_F(JsonStreamParserTest, BracketedUnicodeEscape) {
-  StringPiece str = "\"\\u{1f36f}\"";
-  for (int i = 0; i <= str.length(); ++i) {
-    DoErrorTest(str, i, "Invalid escape sequence.",
-                ParseErrorType::INVALID_ESCAPE_SEQUENCE);
-  }
-}
-
-
-TEST_F(JsonStreamParserTest, UnicodeEscapeInvalidCharacters) {
-  StringPiece str = "\"\\u12$4hello";
-  for (int i = 0; i <= str.length(); ++i) {
-    DoErrorTest(str, i, "Invalid escape sequence.",
-                ParseErrorType::INVALID_ESCAPE_SEQUENCE);
-  }
-}
-
-// invalid unicode sequence in low half surrogate: g is not a hex digit.
-TEST_F(JsonStreamParserTest, UnicodeEscapeLowHalfSurrogateInvalidCharacters) {
-  StringPiece str = "\"\\ud800\\udcfg\"";
-  for (int i = 0; i <= str.length(); ++i) {
-    DoErrorTest(str, i, "Invalid escape sequence.",
-                ParseErrorType::INVALID_ESCAPE_SEQUENCE);
-  }
-}
-
-// Extra commas with an object or array.
-TEST_F(JsonStreamParserTest, ExtraCommaInObject) {
-  StringPiece str = "{'k1': true,,'k2': false}";
-  for (int i = 0; i <= str.length(); ++i) {
-    ow_.StartObject("")->RenderBool("k1", true);
-    DoErrorTest(str, i, "Expected an object key or }.",
-                ParseErrorType::EXPECTED_OBJECT_KEY_OR_BRACES);
-  }
-}
-
-TEST_F(JsonStreamParserTest, ExtraCommaInArray) {
-  StringPiece str = "[true,,false}";
-  for (int i = 0; i <= str.length(); ++i) {
-    ow_.StartList("")->RenderBool("", true);
-    DoErrorTest(str, i, "Unexpected token.", ParseErrorType::UNEXPECTED_TOKEN);
-  }
-}
-
-// Extra text beyond end of value.
-TEST_F(JsonStreamParserTest, ExtraTextAfterLiteral) {
-  StringPiece str = "'hello', 'world'";
-  for (int i = 0; i <= str.length(); ++i) {
-    ow_.RenderString("", "hello");
-    DoErrorTest(str, i, "Parsing terminated before end of input.",
-                ParseErrorType::PARSING_TERMINATED_BEFORE_END_OF_INPUT);
-  }
-}
-
-TEST_F(JsonStreamParserTest, ExtraTextAfterObject) {
-  StringPiece str = "{'key': true} 'oops'";
-  for (int i = 0; i <= str.length(); ++i) {
-    ow_.StartObject("")->RenderBool("key", true)->EndObject();
-    DoErrorTest(str, i, "Parsing terminated before end of input.",
-                ParseErrorType::PARSING_TERMINATED_BEFORE_END_OF_INPUT);
-  }
-}
-
-TEST_F(JsonStreamParserTest, ExtraTextAfterArray) {
-  StringPiece str = "[null] 'oops'";
-  for (int i = 0; i <= str.length(); ++i) {
-    ow_.StartList("")->RenderNull("")->EndList();
-    DoErrorTest(str, i, "Parsing terminated before end of input.",
-                ParseErrorType::PARSING_TERMINATED_BEFORE_END_OF_INPUT);
-  }
-}
-
-// Random unknown text in the value.
-TEST_F(JsonStreamParserTest, UnknownCharactersAsValue) {
-  StringPiece str = "*&#25";
-  for (int i = 0; i <= str.length(); ++i) {
-    DoErrorTest(str, i, "Expected a value.", ParseErrorType::EXPECTED_VALUE);
-  }
-}
-
-TEST_F(JsonStreamParserTest, UnknownCharactersInArray) {
-  StringPiece str = "[*&#25]";
-  for (int i = 0; i <= str.length(); ++i) {
-    ow_.StartList("");
-    DoErrorTest(str, i, "Expected a value or ] within an array.",
-                ParseErrorType::EXPECTED_VALUE_OR_BRACKET);
-  }
-}
-
-TEST_F(JsonStreamParserTest, UnknownCharactersInObject) {
-  StringPiece str = "{'key': *&#25}";
-  for (int i = 0; i <= str.length(); ++i) {
-    ow_.StartObject("");
-    DoErrorTest(str, i, "Expected a value.", ParseErrorType::EXPECTED_VALUE);
-  }
-}
-
-TEST_F(JsonStreamParserTest, DeepNestJsonNotExceedLimit) {
-  int count = 99;
-  std::string str;
-  for (int i = 0; i < count; ++i) {
-    StrAppend(&str, "{'a':");
-  }
-  StrAppend(&str, "{'nest64':'v1', 'nest64': false, 'nest64': ['v2']}");
-  for (int i = 0; i < count; ++i) {
-    StrAppend(&str, "}");
-  }
-  ow_.StartObject("");
-  for (int i = 0; i < count; ++i) {
-    ow_.StartObject("a");
-  }
-  ow_.RenderString("nest64", "v1")
-      ->RenderBool("nest64", false)
-      ->StartList("nest64")
-      ->RenderString("", "v2")
-      ->EndList();
-  for (int i = 0; i < count; ++i) {
-    ow_.EndObject();
-  }
-  ow_.EndObject();
-  DoTest(str, 0);
-}
-
-TEST_F(JsonStreamParserTest, DeepNestJsonExceedLimit) {
-  int count = 98;
-  std::string str;
-  for (int i = 0; i < count; ++i) {
-    StrAppend(&str, "{'a':");
-  }
-  // Supports trailing commas.
-  StrAppend(&str,
-                  "{'nest11' : [{'nest12' : null,},],"
-                  "'nest21' : {'nest22' : {'nest23' : false}}}");
-  for (int i = 0; i < count; ++i) {
-    StrAppend(&str, "}");
-  }
-  DoErrorTest(str, 0,
-              "Message too deep. Max recursion depth reached for key 'nest22'");
-}
-
-}  // namespace converter
-}  // namespace util
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/util/internal/location_tracker.h b/libs/protobuf/src/google/protobuf/util/internal/location_tracker.h
deleted file mode 100644
index 68fefcc..0000000
--- a/libs/protobuf/src/google/protobuf/util/internal/location_tracker.h
+++ /dev/null
@@ -1,70 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef GOOGLE_PROTOBUF_UTIL_INTERNAL_LOCATION_TRACKER_H__
-#define GOOGLE_PROTOBUF_UTIL_INTERNAL_LOCATION_TRACKER_H__
-
-#include <string>
-
-#include <google/protobuf/stubs/common.h>
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-namespace util {
-namespace converter {
-
-// LocationTrackerInterface is an interface for classes that track
-// the location information for the purpose of error reporting.
-class PROTOBUF_EXPORT LocationTrackerInterface {
- public:
-  virtual ~LocationTrackerInterface() {}
-
-  // Returns the object location as human readable string.
-  virtual std::string ToString() const = 0;
-
- protected:
-  LocationTrackerInterface() {}
-
- private:
-  // Please do not add any data members to this class.
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(LocationTrackerInterface);
-};
-
-}  // namespace converter
-}  // namespace util
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
-
-#endif  // GOOGLE_PROTOBUF_UTIL_INTERNAL_LOCATION_TRACKER_H__
diff --git a/libs/protobuf/src/google/protobuf/util/internal/mock_error_listener.h b/libs/protobuf/src/google/protobuf/util/internal/mock_error_listener.h
deleted file mode 100644
index 3fbdd88..0000000
--- a/libs/protobuf/src/google/protobuf/util/internal/mock_error_listener.h
+++ /dev/null
@@ -1,68 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef GOOGLE_PROTOBUF_UTIL_INTERNAL_MOCK_ERROR_LISTENER_H__
-#define GOOGLE_PROTOBUF_UTIL_INTERNAL_MOCK_ERROR_LISTENER_H__
-
-#include <gmock/gmock.h>
-#include <google/protobuf/stubs/strutil.h>
-#include <google/protobuf/util/internal/error_listener.h>
-#include <google/protobuf/util/internal/location_tracker.h>
-
-namespace google {
-namespace protobuf {
-namespace util {
-namespace converter {
-
-class MockErrorListener : public ErrorListener {
- public:
-  MockErrorListener() {}
-  ~MockErrorListener() override {}
-
-  MOCK_METHOD(void, InvalidName,
-              (const LocationTrackerInterface& loc,
-               StringPiece unknown_name, StringPiece message),
-              (override));
-  MOCK_METHOD(void, InvalidValue,
-              (const LocationTrackerInterface& loc, StringPiece type_name,
-               StringPiece value),
-              (override));
-  MOCK_METHOD(void, MissingField,
-              (const LocationTrackerInterface& loc,
-               StringPiece missing_name),
-              (override));
-};
-
-}  // namespace converter
-}  // namespace util
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // GOOGLE_PROTOBUF_UTIL_INTERNAL_MOCK_ERROR_LISTENER_H__
diff --git a/libs/protobuf/src/google/protobuf/util/internal/object_location_tracker.h b/libs/protobuf/src/google/protobuf/util/internal/object_location_tracker.h
deleted file mode 100644
index 47821e6..0000000
--- a/libs/protobuf/src/google/protobuf/util/internal/object_location_tracker.h
+++ /dev/null
@@ -1,64 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef GOOGLE_PROTOBUF_UTIL_INTERNAL_OBJECT_LOCATION_TRACKER_H__
-#define GOOGLE_PROTOBUF_UTIL_INTERNAL_OBJECT_LOCATION_TRACKER_H__
-
-#include <string>
-
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/util/internal/location_tracker.h>
-
-namespace google {
-namespace protobuf {
-namespace util {
-namespace converter {
-
-// An empty concrete implementation of LocationTrackerInterface.
-class ObjectLocationTracker : public LocationTrackerInterface {
- public:
-  // Creates an empty location tracker.
-  ObjectLocationTracker() {}
-
-  ~ObjectLocationTracker() override {}
-
-  // Returns empty because nothing is tracked.
-  std::string ToString() const override { return ""; }
-
- private:
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(ObjectLocationTracker);
-};
-
-}  // namespace converter
-}  // namespace util
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // GOOGLE_PROTOBUF_UTIL_INTERNAL_OBJECT_LOCATION_TRACKER_H__
diff --git a/libs/protobuf/src/google/protobuf/util/internal/object_source.h b/libs/protobuf/src/google/protobuf/util/internal/object_source.h
deleted file mode 100644
index fc7672e..0000000
--- a/libs/protobuf/src/google/protobuf/util/internal/object_source.h
+++ /dev/null
@@ -1,85 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef GOOGLE_PROTOBUF_UTIL_INTERNAL_OBJECT_SOURCE_H__
-#define GOOGLE_PROTOBUF_UTIL_INTERNAL_OBJECT_SOURCE_H__
-
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/stubs/status.h>
-#include <google/protobuf/stubs/strutil.h>
-#include <google/protobuf/stubs/status.h>
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-namespace util {
-namespace converter {
-
-class ObjectWriter;
-
-// An ObjectSource is anything that can write to an ObjectWriter.
-// Implementation of this interface typically provide constructors or
-// factory methods to create an instance based on some source data, for
-// example, a character stream, or protobuf.
-//
-// Derived classes could be thread-unsafe.
-class PROTOBUF_EXPORT ObjectSource {
- public:
-  virtual ~ObjectSource() {}
-
-  // Writes to the ObjectWriter
-  virtual util::Status WriteTo(ObjectWriter* ow) const {
-    return NamedWriteTo("", ow);
-  }
-
-  // Writes to the ObjectWriter with a custom name for the message.
-  // This is useful when you chain ObjectSource together by embedding one
-  // within another.
-  virtual util::Status NamedWriteTo(StringPiece name,
-                                    ObjectWriter* ow) const = 0;
-
- protected:
-  ObjectSource() {}
-
- private:
-  // Do not add any data members to this class.
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(ObjectSource);
-};
-
-}  // namespace converter
-}  // namespace util
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
-
-#endif  // GOOGLE_PROTOBUF_UTIL_INTERNAL_OBJECT_SOURCE_H__
diff --git a/libs/protobuf/src/google/protobuf/util/internal/object_writer.cc b/libs/protobuf/src/google/protobuf/util/internal/object_writer.cc
deleted file mode 100644
index 4dabd37..0000000
--- a/libs/protobuf/src/google/protobuf/util/internal/object_writer.cc
+++ /dev/null
@@ -1,93 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <google/protobuf/util/internal/object_writer.h>
-
-#include <google/protobuf/util/internal/datapiece.h>
-
-namespace google {
-namespace protobuf {
-namespace util {
-namespace converter {
-
-// static
-void ObjectWriter::RenderDataPieceTo(const DataPiece& data,
-                                     StringPiece name, ObjectWriter* ow) {
-  switch (data.type()) {
-    case DataPiece::TYPE_INT32: {
-      ow->RenderInt32(name, data.ToInt32().value());
-      break;
-    }
-    case DataPiece::TYPE_INT64: {
-      ow->RenderInt64(name, data.ToInt64().value());
-      break;
-    }
-    case DataPiece::TYPE_UINT32: {
-      ow->RenderUint32(name, data.ToUint32().value());
-      break;
-    }
-    case DataPiece::TYPE_UINT64: {
-      ow->RenderUint64(name, data.ToUint64().value());
-      break;
-    }
-    case DataPiece::TYPE_DOUBLE: {
-      ow->RenderDouble(name, data.ToDouble().value());
-      break;
-    }
-    case DataPiece::TYPE_FLOAT: {
-      ow->RenderFloat(name, data.ToFloat().value());
-      break;
-    }
-    case DataPiece::TYPE_BOOL: {
-      ow->RenderBool(name, data.ToBool().value());
-      break;
-    }
-    case DataPiece::TYPE_STRING: {
-      ow->RenderString(name, data.ToString().value());
-      break;
-    }
-    case DataPiece::TYPE_BYTES: {
-      ow->RenderBytes(name, data.ToBytes().value());
-      break;
-    }
-    case DataPiece::TYPE_NULL: {
-      ow->RenderNull(name);
-      break;
-    }
-    default:
-      break;
-  }
-}
-
-
-}  // namespace converter
-}  // namespace util
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/util/internal/object_writer.h b/libs/protobuf/src/google/protobuf/util/internal/object_writer.h
deleted file mode 100644
index bc4095b..0000000
--- a/libs/protobuf/src/google/protobuf/util/internal/object_writer.h
+++ /dev/null
@@ -1,151 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef GOOGLE_PROTOBUF_UTIL_INTERNAL_OBJECT_WRITER_H__
-#define GOOGLE_PROTOBUF_UTIL_INTERNAL_OBJECT_WRITER_H__
-
-#include <cstdint>
-
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/stubs/strutil.h>
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-namespace util {
-namespace converter {
-
-
-class DataPiece;
-
-// An ObjectWriter is an interface for writing a stream of events
-// representing objects and collections. Implementation of this
-// interface can be used to write an object stream to an in-memory
-// structure, protobufs, JSON, XML, or any other output format
-// desired. The ObjectSource interface is typically used as the
-// source of an object stream.
-//
-// See JsonObjectWriter for a sample implementation of ObjectWriter
-// and its use.
-//
-// Derived classes could be thread-unsafe.
-//
-// TODO(xinb): seems like a prime candidate to apply the RAII paradigm
-// and get rid the need to call EndXXX().
-class PROTOBUF_EXPORT ObjectWriter {
- public:
-  virtual ~ObjectWriter() {}
-
-  // Starts an object. If the name is empty, the object will not be named.
-  virtual ObjectWriter* StartObject(StringPiece name) = 0;
-
-  // Ends an object.
-  virtual ObjectWriter* EndObject() = 0;
-
-  // Starts a list. If the name is empty, the list will not be named.
-  virtual ObjectWriter* StartList(StringPiece name) = 0;
-
-  // Ends a list.
-  virtual ObjectWriter* EndList() = 0;
-
-  // Renders a boolean value.
-  virtual ObjectWriter* RenderBool(StringPiece name, bool value) = 0;
-
-  // Renders an 32-bit integer value.
-  virtual ObjectWriter* RenderInt32(StringPiece name, int32_t value) = 0;
-
-  // Renders an 32-bit unsigned integer value.
-  virtual ObjectWriter* RenderUint32(StringPiece name,
-                                     uint32_t value) = 0;
-
-  // Renders a 64-bit integer value.
-  virtual ObjectWriter* RenderInt64(StringPiece name, int64_t value) = 0;
-
-  // Renders an 64-bit unsigned integer value.
-  virtual ObjectWriter* RenderUint64(StringPiece name,
-                                     uint64_t value) = 0;
-
-
-  // Renders a double value.
-  virtual ObjectWriter* RenderDouble(StringPiece name, double value) = 0;
-  // Renders a float value.
-  virtual ObjectWriter* RenderFloat(StringPiece name, float value) = 0;
-
-  // Renders a StringPiece value. This is for rendering strings.
-  virtual ObjectWriter* RenderString(StringPiece name,
-                                     StringPiece value) = 0;
-
-  // Renders a bytes value.
-  virtual ObjectWriter* RenderBytes(StringPiece name, StringPiece value) = 0;
-
-  // Renders a Null value.
-  virtual ObjectWriter* RenderNull(StringPiece name) = 0;
-
-
-  // Renders a DataPiece object to a ObjectWriter.
-  static void RenderDataPieceTo(const DataPiece& data, StringPiece name,
-                                ObjectWriter* ow);
-
-
-  // Indicates whether this ObjectWriter has completed writing the root message,
-  // usually this means writing of one complete object. Subclasses must override
-  // this behavior appropriately.
-  virtual bool done() { return false; }
-
-  void set_use_strict_base64_decoding(bool value) {
-    use_strict_base64_decoding_ = value;
-  }
-
-  bool use_strict_base64_decoding() const {
-    return use_strict_base64_decoding_;
-  }
-
- protected:
-  ObjectWriter() : use_strict_base64_decoding_(true) {}
-
- private:
-  // If set to true, we use the stricter version of base64 decoding for byte
-  // fields by making sure decoded version encodes back to the original string.
-  bool use_strict_base64_decoding_;
-
-  // Do not add any data members to this class.
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(ObjectWriter);
-};
-
-}  // namespace converter
-}  // namespace util
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
-
-#endif  // GOOGLE_PROTOBUF_UTIL_INTERNAL_OBJECT_WRITER_H__
diff --git a/libs/protobuf/src/google/protobuf/util/internal/proto_writer.cc b/libs/protobuf/src/google/protobuf/util/internal/proto_writer.cc
deleted file mode 100644
index afa5e2e..0000000
--- a/libs/protobuf/src/google/protobuf/util/internal/proto_writer.cc
+++ /dev/null
@@ -1,827 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <google/protobuf/util/internal/proto_writer.h>
-
-#include <cstdint>
-#include <functional>
-#include <stack>
-#include <unordered_set>
-
-#include <google/protobuf/stubs/once.h>
-#include <google/protobuf/wire_format_lite.h>
-#include <google/protobuf/stubs/strutil.h>
-#include <google/protobuf/stubs/statusor.h>
-#include <google/protobuf/stubs/time.h>
-#include <google/protobuf/util/internal/constants.h>
-#include <google/protobuf/util/internal/field_mask_utility.h>
-#include <google/protobuf/util/internal/object_location_tracker.h>
-#include <google/protobuf/util/internal/utility.h>
-#include <google/protobuf/stubs/map_util.h>
-
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-namespace util {
-namespace converter {
-
-using io::CodedOutputStream;
-using ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite;
-
-ProtoWriter::ProtoWriter(TypeResolver* type_resolver,
-                         const google::protobuf::Type& type,
-                         strings::ByteSink* output, ErrorListener* listener)
-    : master_type_(type),
-      typeinfo_(TypeInfo::NewTypeInfo(type_resolver)),
-      own_typeinfo_(true),
-      done_(false),
-      ignore_unknown_fields_(false),
-      ignore_unknown_enum_values_(false),
-      use_lower_camel_for_enums_(false),
-      case_insensitive_enum_parsing_(true),
-      use_json_name_in_missing_fields_(false),
-      element_(nullptr),
-      size_insert_(),
-      output_(output),
-      buffer_(),
-      adapter_(&buffer_),
-      stream_(new CodedOutputStream(&adapter_)),
-      listener_(listener),
-      invalid_depth_(0),
-      tracker_(new ObjectLocationTracker()) {}
-
-ProtoWriter::ProtoWriter(const TypeInfo* typeinfo,
-                         const google::protobuf::Type& type,
-                         strings::ByteSink* output, ErrorListener* listener)
-    : master_type_(type),
-      typeinfo_(typeinfo),
-      own_typeinfo_(false),
-      done_(false),
-      ignore_unknown_fields_(false),
-      ignore_unknown_enum_values_(false),
-      use_lower_camel_for_enums_(false),
-      case_insensitive_enum_parsing_(true),
-      use_json_name_in_missing_fields_(false),
-      element_(nullptr),
-      size_insert_(),
-      output_(output),
-      buffer_(),
-      adapter_(&buffer_),
-      stream_(new CodedOutputStream(&adapter_)),
-      listener_(listener),
-      invalid_depth_(0),
-      tracker_(new ObjectLocationTracker()) {}
-
-ProtoWriter::~ProtoWriter() {
-  if (own_typeinfo_) {
-    delete typeinfo_;
-  }
-  if (element_ == nullptr) return;
-  // Cleanup explicitly in order to avoid destructor stack overflow when input
-  // is deeply nested.
-  // Cast to BaseElement to avoid doing additional checks (like missing fields)
-  // during pop().
-  std::unique_ptr<BaseElement> element(
-      static_cast<BaseElement*>(element_.get())->pop<BaseElement>());
-  while (element != nullptr) {
-    element.reset(element->pop<BaseElement>());
-  }
-}
-
-namespace {
-
-// Writes an INT32 field, including tag to the stream.
-inline util::Status WriteInt32(int field_number, const DataPiece& data,
-                               CodedOutputStream* stream) {
-  util::StatusOr<int32_t> i32 = data.ToInt32();
-  if (i32.ok()) {
-    WireFormatLite::WriteInt32(field_number, i32.value(), stream);
-  }
-  return i32.status();
-}
-
-// writes an SFIXED32 field, including tag, to the stream.
-inline util::Status WriteSFixed32(int field_number, const DataPiece& data,
-                                  CodedOutputStream* stream) {
-  util::StatusOr<int32_t> i32 = data.ToInt32();
-  if (i32.ok()) {
-    WireFormatLite::WriteSFixed32(field_number, i32.value(), stream);
-  }
-  return i32.status();
-}
-
-// Writes an SINT32 field, including tag, to the stream.
-inline util::Status WriteSInt32(int field_number, const DataPiece& data,
-                                CodedOutputStream* stream) {
-  util::StatusOr<int32_t> i32 = data.ToInt32();
-  if (i32.ok()) {
-    WireFormatLite::WriteSInt32(field_number, i32.value(), stream);
-  }
-  return i32.status();
-}
-
-// Writes a FIXED32 field, including tag, to the stream.
-inline util::Status WriteFixed32(int field_number, const DataPiece& data,
-                                 CodedOutputStream* stream) {
-  util::StatusOr<uint32_t> u32 = data.ToUint32();
-  if (u32.ok()) {
-    WireFormatLite::WriteFixed32(field_number, u32.value(), stream);
-  }
-  return u32.status();
-}
-
-// Writes a UINT32 field, including tag, to the stream.
-inline util::Status WriteUInt32(int field_number, const DataPiece& data,
-                                CodedOutputStream* stream) {
-  util::StatusOr<uint32_t> u32 = data.ToUint32();
-  if (u32.ok()) {
-    WireFormatLite::WriteUInt32(field_number, u32.value(), stream);
-  }
-  return u32.status();
-}
-
-// Writes an INT64 field, including tag, to the stream.
-inline util::Status WriteInt64(int field_number, const DataPiece& data,
-                               CodedOutputStream* stream) {
-  util::StatusOr<int64_t> i64 = data.ToInt64();
-  if (i64.ok()) {
-    WireFormatLite::WriteInt64(field_number, i64.value(), stream);
-  }
-  return i64.status();
-}
-
-// Writes an SFIXED64 field, including tag, to the stream.
-inline util::Status WriteSFixed64(int field_number, const DataPiece& data,
-                                  CodedOutputStream* stream) {
-  util::StatusOr<int64_t> i64 = data.ToInt64();
-  if (i64.ok()) {
-    WireFormatLite::WriteSFixed64(field_number, i64.value(), stream);
-  }
-  return i64.status();
-}
-
-// Writes an SINT64 field, including tag, to the stream.
-inline util::Status WriteSInt64(int field_number, const DataPiece& data,
-                                CodedOutputStream* stream) {
-  util::StatusOr<int64_t> i64 = data.ToInt64();
-  if (i64.ok()) {
-    WireFormatLite::WriteSInt64(field_number, i64.value(), stream);
-  }
-  return i64.status();
-}
-
-// Writes a FIXED64 field, including tag, to the stream.
-inline util::Status WriteFixed64(int field_number, const DataPiece& data,
-                                 CodedOutputStream* stream) {
-  util::StatusOr<uint64_t> u64 = data.ToUint64();
-  if (u64.ok()) {
-    WireFormatLite::WriteFixed64(field_number, u64.value(), stream);
-  }
-  return u64.status();
-}
-
-// Writes a UINT64 field, including tag, to the stream.
-inline util::Status WriteUInt64(int field_number, const DataPiece& data,
-                                CodedOutputStream* stream) {
-  util::StatusOr<uint64_t> u64 = data.ToUint64();
-  if (u64.ok()) {
-    WireFormatLite::WriteUInt64(field_number, u64.value(), stream);
-  }
-  return u64.status();
-}
-
-// Writes a DOUBLE field, including tag, to the stream.
-inline util::Status WriteDouble(int field_number, const DataPiece& data,
-                                CodedOutputStream* stream) {
-  util::StatusOr<double> d = data.ToDouble();
-  if (d.ok()) {
-    WireFormatLite::WriteDouble(field_number, d.value(), stream);
-  }
-  return d.status();
-}
-
-// Writes a FLOAT field, including tag, to the stream.
-inline util::Status WriteFloat(int field_number, const DataPiece& data,
-                               CodedOutputStream* stream) {
-  util::StatusOr<float> f = data.ToFloat();
-  if (f.ok()) {
-    WireFormatLite::WriteFloat(field_number, f.value(), stream);
-  }
-  return f.status();
-}
-
-// Writes a BOOL field, including tag, to the stream.
-inline util::Status WriteBool(int field_number, const DataPiece& data,
-                              CodedOutputStream* stream) {
-  util::StatusOr<bool> b = data.ToBool();
-  if (b.ok()) {
-    WireFormatLite::WriteBool(field_number, b.value(), stream);
-  }
-  return b.status();
-}
-
-// Writes a BYTES field, including tag, to the stream.
-inline util::Status WriteBytes(int field_number, const DataPiece& data,
-                               CodedOutputStream* stream) {
-  util::StatusOr<std::string> c = data.ToBytes();
-  if (c.ok()) {
-    WireFormatLite::WriteBytes(field_number, c.value(), stream);
-  }
-  return c.status();
-}
-
-// Writes a STRING field, including tag, to the stream.
-inline util::Status WriteString(int field_number, const DataPiece& data,
-                                CodedOutputStream* stream) {
-  util::StatusOr<std::string> s = data.ToString();
-  if (s.ok()) {
-    WireFormatLite::WriteString(field_number, s.value(), stream);
-  }
-  return s.status();
-}
-
-// Given a google::protobuf::Type, returns the set of all required fields.
-std::unordered_set<const google::protobuf::Field*> GetRequiredFields(
-    const google::protobuf::Type& type) {
-  std::unordered_set<const google::protobuf::Field*> required;
-  for (int i = 0; i < type.fields_size(); i++) {
-    const google::protobuf::Field& field = type.fields(i);
-    if (field.cardinality() == google::protobuf::Field::CARDINALITY_REQUIRED) {
-      required.insert(&field);
-    }
-  }
-  return required;
-}
-
-}  // namespace
-
-ProtoWriter::ProtoElement::ProtoElement(const TypeInfo* typeinfo,
-                                        const google::protobuf::Type& type,
-                                        ProtoWriter* enclosing)
-    : BaseElement(nullptr),
-      ow_(enclosing),
-      parent_field_(nullptr),
-      typeinfo_(typeinfo),
-      proto3_(type.syntax() == google::protobuf::SYNTAX_PROTO3),
-      type_(type),
-      size_index_(-1),
-      array_index_(-1),
-      // oneof_indices_ values are 1-indexed (0 means not present).
-      oneof_indices_(type.oneofs_size() + 1) {
-  if (!proto3_) {
-    required_fields_ = GetRequiredFields(type_);
-  }
-}
-
-ProtoWriter::ProtoElement::ProtoElement(ProtoWriter::ProtoElement* parent,
-                                        const google::protobuf::Field* field,
-                                        const google::protobuf::Type& type,
-                                        bool is_list)
-    : BaseElement(parent),
-      ow_(this->parent()->ow_),
-      parent_field_(field),
-      typeinfo_(this->parent()->typeinfo_),
-      proto3_(type.syntax() == google::protobuf::SYNTAX_PROTO3),
-      type_(type),
-      size_index_(!is_list &&
-                          field->kind() == google::protobuf::Field::TYPE_MESSAGE
-                      ? ow_->size_insert_.size()
-                      : -1),
-      array_index_(is_list ? 0 : -1),
-      // oneof_indices_ values are 1-indexed (0 means not present).
-      oneof_indices_(type_.oneofs_size() + 1) {
-  if (!is_list) {
-    if (ow_->IsRepeated(*field)) {
-      // Update array_index_ if it is an explicit list.
-      if (this->parent()->array_index_ >= 0) this->parent()->array_index_++;
-    } else if (!proto3_) {
-      // For required fields tracking.
-      this->parent()->RegisterField(field);
-    }
-
-    if (field->kind() == google::protobuf::Field::TYPE_MESSAGE) {
-      if (!proto3_) {
-        required_fields_ = GetRequiredFields(type_);
-      }
-      int start_pos = ow_->stream_->ByteCount();
-      // length of serialized message is the final buffer position minus
-      // starting buffer position, plus length adjustments for size fields
-      // of any nested messages. We start with -start_pos here, so we only
-      // need to add the final buffer position to it at the end.
-      SizeInfo info = {start_pos, -start_pos};
-      ow_->size_insert_.push_back(info);
-    }
-  }
-}
-
-ProtoWriter::ProtoElement* ProtoWriter::ProtoElement::pop() {
-  if (!proto3_) {
-    // Calls the registered error listener for any required field(s) not yet
-    // seen.
-    for (std::unordered_set<const google::protobuf::Field*>::iterator it =
-             required_fields_.begin();
-         it != required_fields_.end(); ++it) {
-      ow_->MissingField(ow_->use_json_name_in_missing_fields_
-                            ? (*it)->json_name()
-                            : (*it)->name());
-    }
-  }
-  // Computes the total number of proto bytes used by a message, also adjusts
-  // the size of all parent messages by the length of this size field.
-  // If size_index_ < 0, this is not a message, so no size field is added.
-  if (size_index_ >= 0) {
-    // Add the final buffer position to compute the total length of this
-    // serialized message. The stored value (before this addition) already
-    // contains the total length of the size fields of all nested messages
-    // minus the initial buffer position.
-    ow_->size_insert_[size_index_].size += ow_->stream_->ByteCount();
-    // Calculate the length required to serialize the size field of the
-    // message, and propagate this additional size information upward to
-    // all enclosing messages.
-    int size = ow_->size_insert_[size_index_].size;
-    int length = CodedOutputStream::VarintSize32(size);
-    for (ProtoElement* e = parent(); e != nullptr; e = e->parent()) {
-      // Only nested messages have size field, lists do not have size field.
-      if (e->size_index_ >= 0) {
-        ow_->size_insert_[e->size_index_].size += length;
-      }
-    }
-  }
-  return BaseElement::pop<ProtoElement>();
-}
-
-void ProtoWriter::ProtoElement::RegisterField(
-    const google::protobuf::Field* field) {
-  if (!required_fields_.empty() &&
-      field->cardinality() == google::protobuf::Field::CARDINALITY_REQUIRED) {
-    required_fields_.erase(field);
-  }
-}
-
-std::string ProtoWriter::ProtoElement::ToString() const {
-  std::string loc = "";
-
-  // first populate a stack with the nodes since we need to process them
-  // from root to leaf when generating the string location
-  const ProtoWriter::ProtoElement* now = this;
-  std::stack<const ProtoWriter::ProtoElement*> element_stack;
-  while (now->parent() != nullptr) {
-    element_stack.push(now);
-    now = now->parent();
-  }
-
-  // now pop each node from the stack and append to the location string
-  while (!element_stack.empty()) {
-    now = element_stack.top();
-    element_stack.pop();
-
-    if (!ow_->IsRepeated(*(now->parent_field_)) ||
-        now->parent()->parent_field_ != now->parent_field_) {
-      std::string name = now->parent_field_->name();
-      int i = 0;
-      while (i < name.size() &&
-             (ascii_isalnum(name[i]) || name[i] == '_'))
-        ++i;
-      if (i > 0 && i == name.size()) {  // safe field name
-        if (loc.empty()) {
-          loc = name;
-        } else {
-          StrAppend(&loc, ".", name);
-        }
-      } else {
-        StrAppend(&loc, "[\"", CEscape(name), "\"]");
-      }
-    }
-
-    int array_index_now = now->array_index_;
-    if (ow_->IsRepeated(*(now->parent_field_)) && array_index_now > 0) {
-      StrAppend(&loc, "[", array_index_now - 1, "]");
-    }
-  }
-
-  return loc;
-}
-
-bool ProtoWriter::ProtoElement::IsOneofIndexTaken(int32_t index) {
-  return oneof_indices_[index];
-}
-
-void ProtoWriter::ProtoElement::TakeOneofIndex(int32_t index) {
-  oneof_indices_[index] = true;
-}
-
-void ProtoWriter::InvalidName(StringPiece unknown_name,
-                              StringPiece message) {
-  listener_->InvalidName(location(), unknown_name, message);
-}
-
-void ProtoWriter::InvalidValue(StringPiece type_name,
-                               StringPiece value) {
-  listener_->InvalidValue(location(), type_name, value);
-}
-
-void ProtoWriter::MissingField(StringPiece missing_name) {
-  listener_->MissingField(location(), missing_name);
-}
-
-ProtoWriter* ProtoWriter::StartObject(
-    StringPiece name) {
-  // Starting the root message. Create the root ProtoElement and return.
-  if (element_ == nullptr) {
-    if (!name.empty()) {
-      InvalidName(name, "Root element should not be named.");
-    }
-    element_.reset(new ProtoElement(typeinfo_, master_type_, this));
-    return this;
-  }
-
-  const google::protobuf::Field* field = BeginNamed(name, false);
-
-  if (field == nullptr) return this;
-
-  // Check to see if this field is a oneof and that no oneof in that group has
-  // already been set.
-  if (!ValidOneof(*field, name)) {
-    ++invalid_depth_;
-    return this;
-  }
-
-  const google::protobuf::Type* type = LookupType(field);
-  if (type == nullptr) {
-    ++invalid_depth_;
-    InvalidName(name, StrCat("Missing descriptor for field: ",
-                                   field->type_url()));
-    return this;
-  }
-
-  return StartObjectField(*field, *type);
-}
-
-
-ProtoWriter* ProtoWriter::EndObject() {
-  if (invalid_depth_ > 0) {
-    --invalid_depth_;
-    return this;
-  }
-
-  if (element_ != nullptr) {
-    element_.reset(element_->pop());
-  }
-
-
-  // If ending the root element,
-  // then serialize the full message with calculated sizes.
-  if (element_ == nullptr) {
-    WriteRootMessage();
-  }
-  return this;
-}
-
-ProtoWriter* ProtoWriter::StartList(
-    StringPiece name) {
-
-  const google::protobuf::Field* field = BeginNamed(name, true);
-
-  if (field == nullptr) return this;
-
-  if (!ValidOneof(*field, name)) {
-    ++invalid_depth_;
-    return this;
-  }
-
-  const google::protobuf::Type* type = LookupType(field);
-  if (type == nullptr) {
-    ++invalid_depth_;
-    InvalidName(name, StrCat("Missing descriptor for field: ",
-                                   field->type_url()));
-    return this;
-  }
-
-  return StartListField(*field, *type);
-}
-
-
-ProtoWriter* ProtoWriter::EndList() {
-  if (invalid_depth_ > 0) {
-    --invalid_depth_;
-  } else if (element_ != nullptr) {
-    element_.reset(element_->pop());
-  }
-  return this;
-}
-
-ProtoWriter* ProtoWriter::RenderDataPiece(
-    StringPiece name, const DataPiece& data) {
-  util::Status status;
-  if (invalid_depth_ > 0) return this;
-
-  const google::protobuf::Field* field = Lookup(name);
-
-  if (field == nullptr) return this;
-
-  if (!ValidOneof(*field, name)) return this;
-
-  const google::protobuf::Type* type = LookupType(field);
-  if (type == nullptr) {
-    InvalidName(name, StrCat("Missing descriptor for field: ",
-                                   field->type_url()));
-    return this;
-  }
-
-  return RenderPrimitiveField(*field, *type, data);
-}
-
-bool ProtoWriter::ValidOneof(const google::protobuf::Field& field,
-                             StringPiece unnormalized_name) {
-  if (element_ == nullptr) return true;
-
-  if (field.oneof_index() > 0) {
-    if (element_->IsOneofIndexTaken(field.oneof_index())) {
-      InvalidValue(
-          "oneof",
-          StrCat(
-              "oneof field '", element_->type().oneofs(field.oneof_index() - 1),
-              "' is already set. Cannot set '", unnormalized_name, "'"));
-      return false;
-    }
-    element_->TakeOneofIndex(field.oneof_index());
-  }
-  return true;
-}
-
-bool ProtoWriter::IsRepeated(const google::protobuf::Field& field) {
-  return field.cardinality() == google::protobuf::Field::CARDINALITY_REPEATED;
-}
-
-ProtoWriter* ProtoWriter::StartObjectField(const google::protobuf::Field& field,
-                                           const google::protobuf::Type& type) {
-    WriteTag(field);
-  element_.reset(new ProtoElement(element_.release(), &field, type, false));
-  return this;
-}
-
-ProtoWriter* ProtoWriter::StartListField(const google::protobuf::Field& field,
-                                         const google::protobuf::Type& type) {
-  element_.reset(new ProtoElement(element_.release(), &field, type, true));
-  return this;
-}
-
-util::Status ProtoWriter::WriteEnum(int field_number, const DataPiece& data,
-                                    const google::protobuf::Enum* enum_type,
-                                    CodedOutputStream* stream,
-                                    bool use_lower_camel_for_enums,
-                                    bool case_insensitive_enum_parsing,
-                                    bool ignore_unknown_values) {
-  bool is_unknown_enum_value = false;
-  util::StatusOr<int> e = data.ToEnum(
-      enum_type, use_lower_camel_for_enums, case_insensitive_enum_parsing,
-      ignore_unknown_values, &is_unknown_enum_value);
-  if (e.ok() && !is_unknown_enum_value) {
-    WireFormatLite::WriteEnum(field_number, e.value(), stream);
-  }
-  return e.status();
-}
-
-ProtoWriter* ProtoWriter::RenderPrimitiveField(
-    const google::protobuf::Field& field, const google::protobuf::Type& type,
-    const DataPiece& data) {
-  util::Status status;
-
-  // Pushing a ProtoElement and then pop it off at the end for 2 purposes:
-  // error location reporting and required field accounting.
-  //
-  // For proto3, since there is no required field tracking, we only need to
-  // push ProtoElement for error cases.
-  if (!element_->proto3()) {
-    element_.reset(new ProtoElement(element_.release(), &field, type, false));
-  }
-
-  switch (field.kind()) {
-    case google::protobuf::Field::TYPE_INT32: {
-      status = WriteInt32(field.number(), data, stream_.get());
-      break;
-    }
-    case google::protobuf::Field::TYPE_SFIXED32: {
-      status = WriteSFixed32(field.number(), data, stream_.get());
-      break;
-    }
-    case google::protobuf::Field::TYPE_SINT32: {
-      status = WriteSInt32(field.number(), data, stream_.get());
-      break;
-    }
-    case google::protobuf::Field::TYPE_FIXED32: {
-      status = WriteFixed32(field.number(), data, stream_.get());
-      break;
-    }
-    case google::protobuf::Field::TYPE_UINT32: {
-      status = WriteUInt32(field.number(), data, stream_.get());
-      break;
-    }
-    case google::protobuf::Field::TYPE_INT64: {
-      status = WriteInt64(field.number(), data, stream_.get());
-      break;
-    }
-    case google::protobuf::Field::TYPE_SFIXED64: {
-      status = WriteSFixed64(field.number(), data, stream_.get());
-      break;
-    }
-    case google::protobuf::Field::TYPE_SINT64: {
-      status = WriteSInt64(field.number(), data, stream_.get());
-      break;
-    }
-    case google::protobuf::Field::TYPE_FIXED64: {
-      status = WriteFixed64(field.number(), data, stream_.get());
-      break;
-    }
-    case google::protobuf::Field::TYPE_UINT64: {
-      status = WriteUInt64(field.number(), data, stream_.get());
-      break;
-    }
-    case google::protobuf::Field::TYPE_DOUBLE: {
-      status = WriteDouble(field.number(), data, stream_.get());
-      break;
-    }
-    case google::protobuf::Field::TYPE_FLOAT: {
-      status = WriteFloat(field.number(), data, stream_.get());
-      break;
-    }
-    case google::protobuf::Field::TYPE_BOOL: {
-      status = WriteBool(field.number(), data, stream_.get());
-      break;
-    }
-    case google::protobuf::Field::TYPE_BYTES: {
-      status = WriteBytes(field.number(), data, stream_.get());
-      break;
-    }
-    case google::protobuf::Field::TYPE_STRING: {
-      status = WriteString(field.number(), data, stream_.get());
-      break;
-    }
-    case google::protobuf::Field::TYPE_ENUM: {
-      status = WriteEnum(
-          field.number(), data, typeinfo_->GetEnumByTypeUrl(field.type_url()),
-          stream_.get(), use_lower_camel_for_enums_,
-          case_insensitive_enum_parsing_, ignore_unknown_enum_values_);
-      break;
-    }
-    default:  // TYPE_GROUP, TYPE_MESSAGE, TYPE_UNKNOWN.
-      status = util::InvalidArgumentError(data.ValueAsStringOrDefault(""));
-  }
-
-  if (!status.ok()) {
-    // Push a ProtoElement for location reporting purposes.
-    if (element_->proto3()) {
-      element_.reset(new ProtoElement(element_.release(), &field, type, false));
-    }
-    InvalidValue(field.type_url().empty()
-                     ? google::protobuf::Field_Kind_Name(field.kind())
-                     : field.type_url(),
-                 status.message());
-    element_.reset(element()->pop());
-    return this;
-  }
-
-  if (!element_->proto3()) element_.reset(element()->pop());
-
-  return this;
-}
-
-const google::protobuf::Field* ProtoWriter::BeginNamed(StringPiece name,
-                                                       bool is_list) {
-  if (invalid_depth_ > 0) {
-    ++invalid_depth_;
-    return nullptr;
-  }
-  const google::protobuf::Field* field = Lookup(name);
-  if (field == nullptr) {
-    ++invalid_depth_;
-    // InvalidName() already called in Lookup().
-    return nullptr;
-  }
-  if (is_list && !IsRepeated(*field)) {
-    ++invalid_depth_;
-    InvalidName(name, "Proto field is not repeating, cannot start list.");
-    return nullptr;
-  }
-  return field;
-}
-
-const google::protobuf::Field* ProtoWriter::Lookup(
-    StringPiece unnormalized_name) {
-  ProtoElement* e = element();
-  if (e == nullptr) {
-    InvalidName(unnormalized_name, "Root element must be a message.");
-    return nullptr;
-  }
-  if (unnormalized_name.empty()) {
-    // Objects in repeated field inherit the same field descriptor.
-    if (e->parent_field() == nullptr) {
-      InvalidName(unnormalized_name, "Proto fields must have a name.");
-    } else if (!IsRepeated(*e->parent_field())) {
-      InvalidName(unnormalized_name, "Proto fields must have a name.");
-      return nullptr;
-    }
-    return e->parent_field();
-  }
-  const google::protobuf::Field* field =
-      typeinfo_->FindField(&e->type(), unnormalized_name);
-  if (field == nullptr && !ignore_unknown_fields_) {
-    InvalidName(unnormalized_name, "Cannot find field.");
-  }
-  return field;
-}
-
-const google::protobuf::Type* ProtoWriter::LookupType(
-    const google::protobuf::Field* field) {
-  return ((field->kind() == google::protobuf::Field::TYPE_MESSAGE ||
-           field->kind() == google::protobuf::Field::TYPE_GROUP)
-              ? typeinfo_->GetTypeByTypeUrl(field->type_url())
-              : &element_->type());
-}
-
-void ProtoWriter::WriteRootMessage() {
-  GOOGLE_DCHECK(!done_);
-  int curr_pos = 0;
-  // Calls the destructor of CodedOutputStream to remove any uninitialized
-  // memory from the Cord before we read it.
-  stream_.reset(nullptr);
-  const void* data;
-  int length;
-  io::ArrayInputStream input_stream(buffer_.data(), buffer_.size());
-  while (input_stream.Next(&data, &length)) {
-    if (length == 0) continue;
-    int num_bytes = length;
-    // Write up to where we need to insert the size field.
-    // The number of bytes we may write is the smaller of:
-    //   - the current fragment size
-    //   - the distance to the next position where a size field needs to be
-    //     inserted.
-    if (!size_insert_.empty() &&
-        size_insert_.front().pos - curr_pos < num_bytes) {
-      num_bytes = size_insert_.front().pos - curr_pos;
-    }
-    output_->Append(static_cast<const char*>(data), num_bytes);
-    if (num_bytes < length) {
-      input_stream.BackUp(length - num_bytes);
-    }
-    curr_pos += num_bytes;
-    // Insert the size field.
-    //   size_insert_.front():      the next <index, size> pair to be written.
-    //   size_insert_.front().pos:  position of the size field.
-    //   size_insert_.front().size: the size (integer) to be inserted.
-    if (!size_insert_.empty() && curr_pos == size_insert_.front().pos) {
-      // Varint32 occupies at most 10 bytes.
-      uint8_t insert_buffer[10];
-      uint8_t* insert_buffer_pos = CodedOutputStream::WriteVarint32ToArray(
-          size_insert_.front().size, insert_buffer);
-      output_->Append(reinterpret_cast<const char*>(insert_buffer),
-                      insert_buffer_pos - insert_buffer);
-      size_insert_.pop_front();
-    }
-  }
-  output_->Flush();
-  stream_.reset(new CodedOutputStream(&adapter_));
-  done_ = true;
-}
-
-void ProtoWriter::WriteTag(const google::protobuf::Field& field) {
-  WireFormatLite::WireType wire_type = WireFormatLite::WireTypeForFieldType(
-      static_cast<WireFormatLite::FieldType>(field.kind()));
-  stream_->WriteTag(WireFormatLite::MakeTag(field.number(), wire_type));
-}
-
-
-}  // namespace converter
-}  // namespace util
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/util/internal/proto_writer.h b/libs/protobuf/src/google/protobuf/util/internal/proto_writer.h
deleted file mode 100644
index a7cf6ac..0000000
--- a/libs/protobuf/src/google/protobuf/util/internal/proto_writer.h
+++ /dev/null
@@ -1,389 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef GOOGLE_PROTOBUF_UTIL_INTERNAL_PROTO_WRITER_H__
-#define GOOGLE_PROTOBUF_UTIL_INTERNAL_PROTO_WRITER_H__
-
-#include <cstdint>
-#include <deque>
-#include <string>
-#include <unordered_set>
-#include <vector>
-
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/type.pb.h>
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/io/zero_copy_stream_impl.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/stubs/bytestream.h>
-#include <google/protobuf/stubs/status.h>
-#include <google/protobuf/util/internal/datapiece.h>
-#include <google/protobuf/util/internal/error_listener.h>
-#include <google/protobuf/util/internal/structured_objectwriter.h>
-#include <google/protobuf/util/internal/type_info.h>
-#include <google/protobuf/util/type_resolver.h>
-#include <google/protobuf/stubs/hash.h>
-#include <google/protobuf/stubs/status.h>
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-namespace util {
-namespace converter {
-
-
-class ObjectLocationTracker;
-
-// An ObjectWriter that can write protobuf bytes directly from writer events.
-// This class does not support special types like Struct or Map. However, since
-// this class supports raw protobuf, it can be used to provide support for
-// special types by inheriting from it or by wrapping it.
-//
-// It also supports streaming.
-class PROTOBUF_EXPORT ProtoWriter : public StructuredObjectWriter {
- public:
-// Constructor. Does not take ownership of any parameter passed in.
-  ProtoWriter(TypeResolver* type_resolver, const google::protobuf::Type& type,
-              strings::ByteSink* output, ErrorListener* listener);
-  ~ProtoWriter() override;
-
-  // ObjectWriter methods.
-  ProtoWriter* StartObject(StringPiece name) override;
-  ProtoWriter* EndObject() override;
-  ProtoWriter* StartList(StringPiece name) override;
-  ProtoWriter* EndList() override;
-  ProtoWriter* RenderBool(StringPiece name, bool value) override {
-    return RenderDataPiece(name, DataPiece(value));
-  }
-  ProtoWriter* RenderInt32(StringPiece name, int32_t value) override {
-    return RenderDataPiece(name, DataPiece(value));
-  }
-  ProtoWriter* RenderUint32(StringPiece name, uint32_t value) override {
-    return RenderDataPiece(name, DataPiece(value));
-  }
-  ProtoWriter* RenderInt64(StringPiece name, int64_t value) override {
-    return RenderDataPiece(name, DataPiece(value));
-  }
-  ProtoWriter* RenderUint64(StringPiece name, uint64_t value) override {
-    return RenderDataPiece(name, DataPiece(value));
-  }
-  ProtoWriter* RenderDouble(StringPiece name, double value) override {
-    return RenderDataPiece(name, DataPiece(value));
-  }
-  ProtoWriter* RenderFloat(StringPiece name, float value) override {
-    return RenderDataPiece(name, DataPiece(value));
-  }
-  ProtoWriter* RenderString(StringPiece name,
-                            StringPiece value) override {
-    return RenderDataPiece(name,
-                           DataPiece(value, use_strict_base64_decoding()));
-  }
-
-  ProtoWriter* RenderBytes(StringPiece name, StringPiece value) override {
-    return RenderDataPiece(
-        name, DataPiece(value, false, use_strict_base64_decoding()));
-  }
-
-  ProtoWriter* RenderNull(StringPiece name) override {
-    return RenderDataPiece(name, DataPiece::NullData());
-  }
-
-
-  // Renders a DataPiece 'value' into a field whose wire type is determined
-  // from the given field 'name'.
-  virtual ProtoWriter* RenderDataPiece(StringPiece name,
-                                       const DataPiece& data);
-
-
-  // Returns the location tracker to use for tracking locations for errors.
-  const LocationTrackerInterface& location() {
-    return element_ != nullptr ? *element_ : *tracker_;
-  }
-
-  // When true, we finished writing to output a complete message.
-  bool done() override { return done_; }
-
-  // Returns the proto stream object.
-  io::CodedOutputStream* stream() { return stream_.get(); }
-
-  // Getters and mutators of invalid_depth_.
-  void IncrementInvalidDepth() { ++invalid_depth_; }
-  void DecrementInvalidDepth() { --invalid_depth_; }
-  int invalid_depth() { return invalid_depth_; }
-
-  ErrorListener* listener() { return listener_; }
-
-  const TypeInfo* typeinfo() { return typeinfo_; }
-
-  void set_ignore_unknown_fields(bool ignore_unknown_fields) {
-    ignore_unknown_fields_ = ignore_unknown_fields;
-  }
-
-  bool ignore_unknown_fields() { return ignore_unknown_fields_; }
-
-  void set_ignore_unknown_enum_values(bool ignore_unknown_enum_values) {
-    ignore_unknown_enum_values_ = ignore_unknown_enum_values;
-  }
-
-  void set_use_lower_camel_for_enums(bool use_lower_camel_for_enums) {
-    use_lower_camel_for_enums_ = use_lower_camel_for_enums;
-  }
-
-  void set_case_insensitive_enum_parsing(bool case_insensitive_enum_parsing) {
-    case_insensitive_enum_parsing_ = case_insensitive_enum_parsing;
-  }
-
-  void set_use_json_name_in_missing_fields(
-      bool use_json_name_in_missing_fields) {
-    use_json_name_in_missing_fields_ = use_json_name_in_missing_fields;
-  }
-
- protected:
-  class PROTOBUF_EXPORT ProtoElement : public BaseElement,
-                                       public LocationTrackerInterface {
-   public:
-    // Constructor for the root element. No parent nor field.
-    ProtoElement(const TypeInfo* typeinfo, const google::protobuf::Type& type,
-                 ProtoWriter* enclosing);
-
-    // Constructor for a field of an element.
-    ProtoElement(ProtoElement* parent, const google::protobuf::Field* field,
-                 const google::protobuf::Type& type, bool is_list);
-
-    ~ProtoElement() override {}
-
-    // Called just before the destructor for clean up:
-    //   - reports any missing required fields
-    //   - computes the space needed by the size field, and augment the
-    //     length of all parent messages by this additional space.
-    //   - releases and returns the parent pointer.
-    ProtoElement* pop();
-
-    // Accessors
-    // parent_field() may be nullptr if we are at root.
-    const google::protobuf::Field* parent_field() const {
-      return parent_field_;
-    }
-    const google::protobuf::Type& type() const { return type_; }
-
-    // Registers field for accounting required fields.
-    void RegisterField(const google::protobuf::Field* field);
-
-    // To report location on error messages.
-    std::string ToString() const override;
-
-    ProtoElement* parent() const override {
-      return static_cast<ProtoElement*>(BaseElement::parent());
-    }
-
-    // Returns true if the index is already taken by a preceding oneof input.
-    bool IsOneofIndexTaken(int32_t index);
-
-    // Marks the oneof 'index' as taken. Future inputs to this oneof will
-    // generate an error.
-    void TakeOneofIndex(int32_t index);
-
-    bool proto3() { return proto3_; }
-
-   private:
-    // Used for access to variables of the enclosing instance of
-    // ProtoWriter.
-    ProtoWriter* ow_;
-
-    // Describes the element as a field in the parent message.
-    // parent_field_ is nullptr if and only if this element is the root element.
-    const google::protobuf::Field* parent_field_;
-
-    // TypeInfo to lookup types.
-    const TypeInfo* typeinfo_;
-
-    // Whether the type_ is proto3 or not.
-    bool proto3_;
-
-    // Additional variables if this element is a message:
-    // (Root element is always a message).
-    // type_             : the type of this element.
-    // required_fields_  : set of required fields.
-    // size_index_       : index into ProtoWriter::size_insert_
-    //                     for later insertion of serialized message length.
-    const google::protobuf::Type& type_;
-    std::unordered_set<const google::protobuf::Field*> required_fields_;
-    const int size_index_;
-
-    // Tracks position in repeated fields, needed for LocationTrackerInterface.
-    int array_index_;
-
-    // Set of oneof indices already seen for the type_. Used to validate
-    // incoming messages so no more than one oneof is set.
-    std::vector<bool> oneof_indices_;
-
-    GOOGLE_DISALLOW_IMPLICIT_CONSTRUCTORS(ProtoElement);
-  };
-
-  // Container for inserting 'size' information at the 'pos' position.
-  struct SizeInfo {
-    const int pos;
-    int size;
-  };
-
-  ProtoWriter(const TypeInfo* typeinfo, const google::protobuf::Type& type,
-              strings::ByteSink* output, ErrorListener* listener);
-
-  ProtoElement* element() override { return element_.get(); }
-
-  // Helper methods for calling ErrorListener. See error_listener.h.
-  void InvalidName(StringPiece unknown_name, StringPiece message);
-  void InvalidValue(StringPiece type_name, StringPiece value);
-  void MissingField(StringPiece missing_name);
-
-  // Common code for BeginObject() and BeginList() that does invalid_depth_
-  // bookkeeping associated with name lookup.
-  const google::protobuf::Field* BeginNamed(StringPiece name,
-                                            bool is_list);
-
-  // Lookup the field in the current element. Looks in the base descriptor
-  // and in any extension. This will report an error if the field cannot be
-  // found when ignore_unknown_names_ is false or if multiple matching
-  // extensions are found.
-  const google::protobuf::Field* Lookup(StringPiece name);
-
-  // Lookup the field type in the type descriptor. Returns nullptr if the type
-  // is not known.
-  const google::protobuf::Type* LookupType(
-      const google::protobuf::Field* field);
-
-  // Write serialized output to the final output ByteSink, inserting all
-  // the size information for nested messages that are missing from the
-  // intermediate Cord buffer.
-  void WriteRootMessage();
-
-  // Helper method to write proto tags based on the given field.
-  void WriteTag(const google::protobuf::Field& field);
-
-
-  // Returns true if the field for type_ can be set as a oneof. If field is not
-  // a oneof type, this function does nothing and returns true.
-  // If another field for this oneof is already set, this function returns
-  // false. It also calls the appropriate error callback.
-  // unnormalized_name is used for error string.
-  bool ValidOneof(const google::protobuf::Field& field,
-                  StringPiece unnormalized_name);
-
-  // Returns true if the field is repeated.
-  bool IsRepeated(const google::protobuf::Field& field);
-
-  // Starts an object given the field and the enclosing type.
-  ProtoWriter* StartObjectField(const google::protobuf::Field& field,
-                                const google::protobuf::Type& type);
-
-  // Starts a list given the field and the enclosing type.
-  ProtoWriter* StartListField(const google::protobuf::Field& field,
-                              const google::protobuf::Type& type);
-
-  // Renders a primitive field given the field and the enclosing type.
-  ProtoWriter* RenderPrimitiveField(const google::protobuf::Field& field,
-                                    const google::protobuf::Type& type,
-                                    const DataPiece& data);
-
- private:
-  // Writes an ENUM field, including tag, to the stream.
-  static util::Status WriteEnum(int field_number, const DataPiece& data,
-                                const google::protobuf::Enum* enum_type,
-                                io::CodedOutputStream* stream,
-                                bool use_lower_camel_for_enums,
-                                bool case_insensitive_enum_parsing,
-                                bool ignore_unknown_values);
-
-  // Variables for describing the structure of the input tree:
-  // master_type_: descriptor for the whole protobuf message.
-  // typeinfo_ : the TypeInfo object to lookup types.
-  const google::protobuf::Type& master_type_;
-  const TypeInfo* typeinfo_;
-  // Whether we own the typeinfo_ object.
-  bool own_typeinfo_;
-
-  // Indicates whether we finished writing root message completely.
-  bool done_;
-
-  // If true, don't report unknown field names to the listener.
-  bool ignore_unknown_fields_;
-
-  // If true, don't report unknown enum values to the listener.
-  bool ignore_unknown_enum_values_;
-
-  // If true, check if enum name in camel case or without underscore matches the
-  // field name.
-  bool use_lower_camel_for_enums_;
-
-  // If true, check if enum name in UPPER_CASE matches the field name.
-  bool case_insensitive_enum_parsing_;
-
-  // If true, use the json name in missing fields errors.
-  bool use_json_name_in_missing_fields_;
-
-  // Variable for internal state processing:
-  // element_    : the current element.
-  // size_insert_: sizes of nested messages.
-  //               pos  - position to insert the size field.
-  //               size - size value to be inserted.
-  std::unique_ptr<ProtoElement> element_;
-  std::deque<SizeInfo> size_insert_;
-
-  // Variables for output generation:
-  // output_  : pointer to an external ByteSink for final user-visible output.
-  // buffer_  : buffer holding partial message before being ready for output_.
-  // adapter_ : internal adapter between CodedOutputStream and buffer_.
-  // stream_  : wrapper for writing tags and other encodings in wire format.
-  strings::ByteSink* output_;
-  std::string buffer_;
-  io::StringOutputStream adapter_;
-  std::unique_ptr<io::CodedOutputStream> stream_;
-
-  // Variables for error tracking and reporting:
-  // listener_     : a place to report any errors found.
-  // invalid_depth_: number of enclosing invalid nested messages.
-  // tracker_      : the root location tracker interface.
-  ErrorListener* listener_;
-  int invalid_depth_;
-  std::unique_ptr<LocationTrackerInterface> tracker_;
-
-  GOOGLE_DISALLOW_IMPLICIT_CONSTRUCTORS(ProtoWriter);
-};
-
-}  // namespace converter
-}  // namespace util
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
-
-#endif  // GOOGLE_PROTOBUF_UTIL_INTERNAL_PROTO_WRITER_H__
diff --git a/libs/protobuf/src/google/protobuf/util/internal/protostream_objectsource.cc b/libs/protobuf/src/google/protobuf/util/internal/protostream_objectsource.cc
deleted file mode 100644
index cf6c99a..0000000
--- a/libs/protobuf/src/google/protobuf/util/internal/protostream_objectsource.cc
+++ /dev/null
@@ -1,1114 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <google/protobuf/util/internal/protostream_objectsource.h>
-
-#include <cstdint>
-#include <unordered_map>
-#include <utility>
-
-#include <google/protobuf/stubs/logging.h>
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/io/zero_copy_stream_impl.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/stubs/once.h>
-#include <google/protobuf/unknown_field_set.h>
-#include <google/protobuf/wire_format.h>
-#include <google/protobuf/wire_format_lite.h>
-#include <google/protobuf/stubs/strutil.h>
-#include <google/protobuf/stubs/casts.h>
-#include <google/protobuf/stubs/status.h>
-#include <google/protobuf/stubs/stringprintf.h>
-#include <google/protobuf/stubs/time.h>
-#include <google/protobuf/util/internal/constants.h>
-#include <google/protobuf/util/internal/field_mask_utility.h>
-#include <google/protobuf/util/internal/utility.h>
-#include <google/protobuf/stubs/map_util.h>
-#include <google/protobuf/stubs/status_macros.h>
-
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-
-namespace google {
-namespace protobuf {
-namespace util {
-namespace converter {
-
-using ::PROTOBUF_NAMESPACE_ID::internal::WireFormat;
-using ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite;
-
-namespace {
-
-static int kDefaultMaxRecursionDepth = 64;
-
-// Finds a field with the given number. nullptr if none found.
-const google::protobuf::Field* FindFieldByNumber(
-    const google::protobuf::Type& type, int number);
-
-// Returns true if the field is packable.
-bool IsPackable(const google::protobuf::Field& field);
-
-// Finds an enum value with the given number. nullptr if none found.
-const google::protobuf::EnumValue* FindEnumValueByNumber(
-    const google::protobuf::Enum& tech_enum, int number);
-
-// Utility function to format nanos.
-const std::string FormatNanos(uint32_t nanos, bool with_trailing_zeros);
-
-util::StatusOr<std::string> MapKeyDefaultValueAsString(
-    const google::protobuf::Field& field) {
-  switch (field.kind()) {
-    case google::protobuf::Field::TYPE_BOOL:
-      return std::string("false");
-    case google::protobuf::Field::TYPE_INT32:
-    case google::protobuf::Field::TYPE_INT64:
-    case google::protobuf::Field::TYPE_UINT32:
-    case google::protobuf::Field::TYPE_UINT64:
-    case google::protobuf::Field::TYPE_SINT32:
-    case google::protobuf::Field::TYPE_SINT64:
-    case google::protobuf::Field::TYPE_SFIXED32:
-    case google::protobuf::Field::TYPE_SFIXED64:
-    case google::protobuf::Field::TYPE_FIXED32:
-    case google::protobuf::Field::TYPE_FIXED64:
-      return std::string("0");
-    case google::protobuf::Field::TYPE_STRING:
-      return std::string();
-    default:
-      return util::InternalError("Invalid map key type.");
-  }
-}
-}  // namespace
-
-
-ProtoStreamObjectSource::ProtoStreamObjectSource(
-    io::CodedInputStream* stream, TypeResolver* type_resolver,
-    const google::protobuf::Type& type, const RenderOptions& render_options)
-    : stream_(stream),
-      typeinfo_(TypeInfo::NewTypeInfo(type_resolver)),
-      own_typeinfo_(true),
-      type_(type),
-      render_options_(render_options),
-      recursion_depth_(0),
-      max_recursion_depth_(kDefaultMaxRecursionDepth) {
-  GOOGLE_LOG_IF(DFATAL, stream == nullptr) << "Input stream is nullptr.";
-}
-
-ProtoStreamObjectSource::ProtoStreamObjectSource(
-    io::CodedInputStream* stream, const TypeInfo* typeinfo,
-    const google::protobuf::Type& type, const RenderOptions& render_options)
-    : stream_(stream),
-      typeinfo_(typeinfo),
-      own_typeinfo_(false),
-      type_(type),
-      render_options_(render_options),
-      recursion_depth_(0),
-      max_recursion_depth_(kDefaultMaxRecursionDepth) {
-  GOOGLE_LOG_IF(DFATAL, stream == nullptr) << "Input stream is nullptr.";
-}
-
-ProtoStreamObjectSource::~ProtoStreamObjectSource() {
-  if (own_typeinfo_) {
-    delete typeinfo_;
-  }
-}
-
-util::Status ProtoStreamObjectSource::NamedWriteTo(StringPiece name,
-                                                   ObjectWriter* ow) const {
-  return WriteMessage(type_, name, 0, true, ow);
-}
-
-const google::protobuf::Field* ProtoStreamObjectSource::FindAndVerifyField(
-    const google::protobuf::Type& type, uint32_t tag) const {
-  // Lookup the new field in the type by tag number.
-  const google::protobuf::Field* field = FindFieldByNumber(type, tag >> 3);
-  // Verify if the field corresponds to the wire type in tag.
-  // If there is any discrepancy, mark the field as not found.
-  if (field != nullptr) {
-    WireFormatLite::WireType expected_type =
-        WireFormatLite::WireTypeForFieldType(
-            static_cast<WireFormatLite::FieldType>(field->kind()));
-    WireFormatLite::WireType actual_type = WireFormatLite::GetTagWireType(tag);
-    if (actual_type != expected_type &&
-        (!IsPackable(*field) ||
-         actual_type != WireFormatLite::WIRETYPE_LENGTH_DELIMITED)) {
-      field = nullptr;
-    }
-  }
-  return field;
-}
-
-util::Status ProtoStreamObjectSource::WriteMessage(
-    const google::protobuf::Type& type, StringPiece name,
-    const uint32_t end_tag, bool include_start_and_end,
-    ObjectWriter* ow) const {
-
-  const TypeRenderer* type_renderer = FindTypeRenderer(type.name());
-  if (type_renderer != nullptr) {
-    return (*type_renderer)(this, type, name, ow);
-  }
-
-  const google::protobuf::Field* field = nullptr;
-  std::string field_name;
-  // last_tag set to dummy value that is different from tag.
-  uint32_t tag = stream_->ReadTag(), last_tag = tag + 1;
-  UnknownFieldSet unknown_fields;
-
-
-  if (include_start_and_end) {
-    ow->StartObject(name);
-  }
-  while (tag != end_tag && tag != 0) {
-    if (tag != last_tag) {  // Update field only if tag is changed.
-      last_tag = tag;
-      field = FindAndVerifyField(type, tag);
-      if (field != nullptr) {
-        if (render_options_.preserve_proto_field_names) {
-          field_name = field->name();
-        } else {
-          field_name = field->json_name();
-        }
-      }
-    }
-    if (field == nullptr) {
-      // If we didn't find a field, skip this unknown tag.
-      // TODO(wpoon): Check return boolean value.
-      WireFormat::SkipField(
-          stream_, tag,
-                                                nullptr);
-      tag = stream_->ReadTag();
-      continue;
-    }
-
-    if (field->cardinality() == google::protobuf::Field::CARDINALITY_REPEATED) {
-      if (IsMap(*field)) {
-        ow->StartObject(field_name);
-        ASSIGN_OR_RETURN(tag, RenderMap(field, field_name, tag, ow));
-        ow->EndObject();
-      } else {
-        ASSIGN_OR_RETURN(tag, RenderList(field, field_name, tag, ow));
-      }
-    } else {
-      // Render the field.
-      RETURN_IF_ERROR(RenderField(field, field_name, ow));
-      tag = stream_->ReadTag();
-    }
-  }
-
-
-  if (include_start_and_end) {
-    ow->EndObject();
-  }
-  return util::Status();
-}
-
-util::StatusOr<uint32_t> ProtoStreamObjectSource::RenderList(
-    const google::protobuf::Field* field, StringPiece name,
-    uint32_t list_tag, ObjectWriter* ow) const {
-  uint32_t tag_to_return = 0;
-  ow->StartList(name);
-  if (IsPackable(*field) &&
-      list_tag ==
-          WireFormatLite::MakeTag(field->number(),
-                                  WireFormatLite::WIRETYPE_LENGTH_DELIMITED)) {
-    RETURN_IF_ERROR(RenderPacked(field, ow));
-    // Since packed fields have a single tag, read another tag from stream to
-    // return.
-    tag_to_return = stream_->ReadTag();
-  } else {
-    do {
-      RETURN_IF_ERROR(RenderField(field, "", ow));
-    } while ((tag_to_return = stream_->ReadTag()) == list_tag);
-  }
-  ow->EndList();
-  return tag_to_return;
-}
-
-util::StatusOr<uint32_t> ProtoStreamObjectSource::RenderMap(
-    const google::protobuf::Field* field, StringPiece /* name */,
-    uint32_t list_tag, ObjectWriter* ow) const {
-  const google::protobuf::Type* field_type =
-      typeinfo_->GetTypeByTypeUrl(field->type_url());
-  uint32_t tag_to_return = 0;
-  do {
-    // Render map entry message type.
-    uint32_t buffer32;
-    stream_->ReadVarint32(&buffer32);  // message length
-    int old_limit = stream_->PushLimit(buffer32);
-    std::string map_key;
-    for (uint32_t tag = stream_->ReadTag(); tag != 0;
-         tag = stream_->ReadTag()) {
-      const google::protobuf::Field* map_entry_field =
-          FindAndVerifyField(*field_type, tag);
-      if (map_entry_field == nullptr) {
-        WireFormat::SkipField(stream_, tag, nullptr);
-        continue;
-      }
-      // Map field numbers are key = 1 and value = 2
-      if (map_entry_field->number() == 1) {
-        map_key = ReadFieldValueAsString(*map_entry_field);
-      } else if (map_entry_field->number() == 2) {
-        if (map_key.empty()) {
-          // An absent map key is treated as the default.
-          const google::protobuf::Field* key_field =
-              FindFieldByNumber(*field_type, 1);
-          if (key_field == nullptr) {
-            // The Type info for this map entry is incorrect. It should always
-            // have a field named "key" and with field number 1.
-            return util::InternalError("Invalid map entry.");
-          }
-          ASSIGN_OR_RETURN(map_key, MapKeyDefaultValueAsString(*key_field));
-        }
-        RETURN_IF_ERROR(RenderField(map_entry_field, map_key, ow));
-      } else {
-        // The Type info for this map entry is incorrect. It should contain
-        // exactly two fields with field number 1 and 2.
-        return util::InternalError("Invalid map entry.");
-      }
-    }
-    stream_->PopLimit(old_limit);
-  } while ((tag_to_return = stream_->ReadTag()) == list_tag);
-  return tag_to_return;
-}
-
-util::Status ProtoStreamObjectSource::RenderPacked(
-    const google::protobuf::Field* field, ObjectWriter* ow) const {
-  uint32_t length;
-  stream_->ReadVarint32(&length);
-  int old_limit = stream_->PushLimit(length);
-  while (stream_->BytesUntilLimit() > 0) {
-    RETURN_IF_ERROR(RenderField(field, StringPiece(), ow));
-  }
-  stream_->PopLimit(old_limit);
-  return util::Status();
-}
-
-util::Status ProtoStreamObjectSource::RenderTimestamp(
-    const ProtoStreamObjectSource* os, const google::protobuf::Type& type,
-    StringPiece field_name, ObjectWriter* ow) {
-  std::pair<int64_t, int32_t> p = os->ReadSecondsAndNanos(type);
-  int64_t seconds = p.first;
-  int32_t nanos = p.second;
-  if (seconds > kTimestampMaxSeconds || seconds < kTimestampMinSeconds) {
-    return util::InternalError(StrCat(
-        "Timestamp seconds exceeds limit for field: ", field_name));
-  }
-
-  if (nanos < 0 || nanos >= kNanosPerSecond) {
-    return util::InternalError(
-        StrCat("Timestamp nanos exceeds limit for field: ", field_name));
-  }
-
-  ow->RenderString(field_name,
-                   ::google::protobuf::internal::FormatTime(seconds, nanos));
-
-  return util::Status();
-}
-
-util::Status ProtoStreamObjectSource::RenderDuration(
-    const ProtoStreamObjectSource* os, const google::protobuf::Type& type,
-    StringPiece field_name, ObjectWriter* ow) {
-  std::pair<int64_t, int32_t> p = os->ReadSecondsAndNanos(type);
-  int64_t seconds = p.first;
-  int32_t nanos = p.second;
-  if (seconds > kDurationMaxSeconds || seconds < kDurationMinSeconds) {
-    return util::InternalError(
-        StrCat("Duration seconds exceeds limit for field: ", field_name));
-  }
-
-  if (nanos <= -kNanosPerSecond || nanos >= kNanosPerSecond) {
-    return util::InternalError(
-        StrCat("Duration nanos exceeds limit for field: ", field_name));
-  }
-
-  std::string sign = "";
-  if (seconds < 0) {
-    if (nanos > 0) {
-      return util::InternalError(
-          StrCat("Duration nanos is non-negative, but seconds is "
-                       "negative for field: ",
-                       field_name));
-    }
-    sign = "-";
-    seconds = -seconds;
-    nanos = -nanos;
-  } else if (seconds == 0 && nanos < 0) {
-    sign = "-";
-    nanos = -nanos;
-  }
-  std::string formatted_duration = StringPrintf(
-      "%s%lld%ss", sign.c_str(), static_cast<long long>(seconds),  // NOLINT
-      FormatNanos(
-          nanos,
-          false
-          )
-          .c_str());
-  ow->RenderString(field_name, formatted_duration);
-  return util::Status();
-}
-
-util::Status ProtoStreamObjectSource::RenderDouble(
-    const ProtoStreamObjectSource* os, const google::protobuf::Type& /*type*/,
-    StringPiece field_name, ObjectWriter* ow) {
-  uint32_t tag = os->stream_->ReadTag();
-  uint64_t buffer64 = 0;  // default value of Double wrapper value
-  if (tag != 0) {
-    os->stream_->ReadLittleEndian64(&buffer64);
-    os->stream_->ReadTag();
-  }
-  ow->RenderDouble(field_name, bit_cast<double>(buffer64));
-  return util::Status();
-}
-
-util::Status ProtoStreamObjectSource::RenderFloat(
-    const ProtoStreamObjectSource* os, const google::protobuf::Type& /*type*/,
-    StringPiece field_name, ObjectWriter* ow) {
-  uint32_t tag = os->stream_->ReadTag();
-  uint32_t buffer32 = 0;  // default value of Float wrapper value
-  if (tag != 0) {
-    os->stream_->ReadLittleEndian32(&buffer32);
-    os->stream_->ReadTag();
-  }
-  ow->RenderFloat(field_name, bit_cast<float>(buffer32));
-  return util::Status();
-}
-
-util::Status ProtoStreamObjectSource::RenderInt64(
-    const ProtoStreamObjectSource* os, const google::protobuf::Type& /*type*/,
-    StringPiece field_name, ObjectWriter* ow) {
-  uint32_t tag = os->stream_->ReadTag();
-  uint64_t buffer64 = 0;  // default value of Int64 wrapper value
-  if (tag != 0) {
-    os->stream_->ReadVarint64(&buffer64);
-    os->stream_->ReadTag();
-  }
-  ow->RenderInt64(field_name, bit_cast<int64_t>(buffer64));
-  return util::Status();
-}
-
-util::Status ProtoStreamObjectSource::RenderUInt64(
-    const ProtoStreamObjectSource* os, const google::protobuf::Type& /*type*/,
-    StringPiece field_name, ObjectWriter* ow) {
-  uint32_t tag = os->stream_->ReadTag();
-  uint64_t buffer64 = 0;  // default value of UInt64 wrapper value
-  if (tag != 0) {
-    os->stream_->ReadVarint64(&buffer64);
-    os->stream_->ReadTag();
-  }
-  ow->RenderUint64(field_name, bit_cast<uint64_t>(buffer64));
-  return util::Status();
-}
-
-util::Status ProtoStreamObjectSource::RenderInt32(
-    const ProtoStreamObjectSource* os, const google::protobuf::Type& /*type*/,
-    StringPiece field_name, ObjectWriter* ow) {
-  uint32_t tag = os->stream_->ReadTag();
-  uint32_t buffer32 = 0;  // default value of Int32 wrapper value
-  if (tag != 0) {
-    os->stream_->ReadVarint32(&buffer32);
-    os->stream_->ReadTag();
-  }
-  ow->RenderInt32(field_name, bit_cast<int32_t>(buffer32));
-  return util::Status();
-}
-
-util::Status ProtoStreamObjectSource::RenderUInt32(
-    const ProtoStreamObjectSource* os, const google::protobuf::Type& /*type*/,
-    StringPiece field_name, ObjectWriter* ow) {
-  uint32_t tag = os->stream_->ReadTag();
-  uint32_t buffer32 = 0;  // default value of UInt32 wrapper value
-  if (tag != 0) {
-    os->stream_->ReadVarint32(&buffer32);
-    os->stream_->ReadTag();
-  }
-  ow->RenderUint32(field_name, bit_cast<uint32_t>(buffer32));
-  return util::Status();
-}
-
-util::Status ProtoStreamObjectSource::RenderBool(
-    const ProtoStreamObjectSource* os, const google::protobuf::Type& /*type*/,
-    StringPiece field_name, ObjectWriter* ow) {
-  uint32_t tag = os->stream_->ReadTag();
-  uint64_t buffer64 = 0;  // results in 'false' value as default, which is the
-                          // default value of Bool wrapper
-  if (tag != 0) {
-    os->stream_->ReadVarint64(&buffer64);
-    os->stream_->ReadTag();
-  }
-  ow->RenderBool(field_name, buffer64 != 0);
-  return util::Status();
-}
-
-util::Status ProtoStreamObjectSource::RenderString(
-    const ProtoStreamObjectSource* os, const google::protobuf::Type& /*type*/,
-    StringPiece field_name, ObjectWriter* ow) {
-  uint32_t tag = os->stream_->ReadTag();
-  uint32_t buffer32;
-  std::string str;  // default value of empty for String wrapper
-  if (tag != 0) {
-    os->stream_->ReadVarint32(&buffer32);  // string size.
-    os->stream_->ReadString(&str, buffer32);
-    os->stream_->ReadTag();
-  }
-  ow->RenderString(field_name, str);
-  return util::Status();
-}
-
-util::Status ProtoStreamObjectSource::RenderBytes(
-    const ProtoStreamObjectSource* os, const google::protobuf::Type& /*type*/,
-    StringPiece field_name, ObjectWriter* ow) {
-  uint32_t tag = os->stream_->ReadTag();
-  uint32_t buffer32;
-  std::string str;
-  if (tag != 0) {
-    os->stream_->ReadVarint32(&buffer32);
-    os->stream_->ReadString(&str, buffer32);
-    os->stream_->ReadTag();
-  }
-  ow->RenderBytes(field_name, str);
-  return util::Status();
-}
-
-util::Status ProtoStreamObjectSource::RenderStruct(
-    const ProtoStreamObjectSource* os, const google::protobuf::Type& type,
-    StringPiece field_name, ObjectWriter* ow) {
-  const google::protobuf::Field* field = nullptr;
-  uint32_t tag = os->stream_->ReadTag();
-  ow->StartObject(field_name);
-  while (tag != 0) {
-    field = os->FindAndVerifyField(type, tag);
-    if (field == nullptr) {
-      WireFormat::SkipField(os->stream_, tag, nullptr);
-      tag = os->stream_->ReadTag();
-      continue;
-    }
-    // google.protobuf.Struct has only one field that is a map. Hence we use
-    // RenderMap to render that field.
-    if (os->IsMap(*field)) {
-      ASSIGN_OR_RETURN(tag, os->RenderMap(field, field_name, tag, ow));
-    }
-  }
-  ow->EndObject();
-  return util::Status();
-}
-
-util::Status ProtoStreamObjectSource::RenderStructValue(
-    const ProtoStreamObjectSource* os, const google::protobuf::Type& type,
-    StringPiece field_name, ObjectWriter* ow) {
-  const google::protobuf::Field* field = nullptr;
-  for (uint32_t tag = os->stream_->ReadTag(); tag != 0;
-       tag = os->stream_->ReadTag()) {
-    field = os->FindAndVerifyField(type, tag);
-    if (field == nullptr) {
-      WireFormat::SkipField(os->stream_, tag, nullptr);
-      continue;
-    }
-    RETURN_IF_ERROR(os->RenderField(field, field_name, ow));
-  }
-  return util::Status();
-}
-
-// TODO(skarvaje): Avoid code duplication of for loops and SkipField logic.
-util::Status ProtoStreamObjectSource::RenderStructListValue(
-    const ProtoStreamObjectSource* os, const google::protobuf::Type& type,
-    StringPiece field_name, ObjectWriter* ow) {
-  uint32_t tag = os->stream_->ReadTag();
-
-  // Render empty list when we find empty ListValue message.
-  if (tag == 0) {
-    ow->StartList(field_name);
-    ow->EndList();
-    return util::Status();
-  }
-
-  while (tag != 0) {
-    const google::protobuf::Field* field = os->FindAndVerifyField(type, tag);
-    if (field == nullptr) {
-      WireFormat::SkipField(os->stream_, tag, nullptr);
-      tag = os->stream_->ReadTag();
-      continue;
-    }
-    ASSIGN_OR_RETURN(tag, os->RenderList(field, field_name, tag, ow));
-  }
-  return util::Status();
-}
-
-util::Status ProtoStreamObjectSource::RenderAny(
-    const ProtoStreamObjectSource* os, const google::protobuf::Type& type,
-    StringPiece field_name, ObjectWriter* ow) {
-  // An Any is of the form { string type_url = 1; bytes value = 2; }
-  uint32_t tag;
-  std::string type_url;
-  std::string value;
-
-  // First read out the type_url and value from the proto stream
-  for (tag = os->stream_->ReadTag(); tag != 0; tag = os->stream_->ReadTag()) {
-    const google::protobuf::Field* field = os->FindAndVerifyField(type, tag);
-    if (field == nullptr) {
-      WireFormat::SkipField(os->stream_, tag, nullptr);
-      continue;
-    }
-    // 'type_url' has field number of 1 and 'value' has field number 2
-    // //google/protobuf/any.proto
-    if (field->number() == 1) {
-      // read type_url
-      uint32_t type_url_size;
-      os->stream_->ReadVarint32(&type_url_size);
-      os->stream_->ReadString(&type_url, type_url_size);
-    } else if (field->number() == 2) {
-      // read value
-      uint32_t value_size;
-      os->stream_->ReadVarint32(&value_size);
-      os->stream_->ReadString(&value, value_size);
-    }
-  }
-
-  // If there is no value, we don't lookup the type, we just output it (if
-  // present). If both type and value are empty we output an empty object.
-  if (value.empty()) {
-    ow->StartObject(field_name);
-    if (!type_url.empty()) {
-      ow->RenderString("@type", type_url);
-    }
-    ow->EndObject();
-    return util::Status();
-  }
-
-  // If there is a value but no type, we cannot render it, so report an error.
-  if (type_url.empty()) {
-    // TODO(sven): Add an external message once those are ready.
-    return util::InternalError("Invalid Any, the type_url is missing.");
-  }
-
-  util::StatusOr<const google::protobuf::Type*> resolved_type =
-      os->typeinfo_->ResolveTypeUrl(type_url);
-
-  if (!resolved_type.ok()) {
-    // Convert into an internal error, since this means the backend gave us
-    // an invalid response (missing or invalid type information).
-    return util::InternalError(resolved_type.status().message());
-  }
-  // nested_type cannot be null at this time.
-  const google::protobuf::Type* nested_type = resolved_type.value();
-
-  io::ArrayInputStream zero_copy_stream(value.data(), value.size());
-  io::CodedInputStream in_stream(&zero_copy_stream);
-  // We know the type so we can render it. Recursively parse the nested stream
-  // using a nested ProtoStreamObjectSource using our nested type information.
-  ProtoStreamObjectSource nested_os(&in_stream, os->typeinfo_, *nested_type,
-                                    os->render_options_);
-
-  // We manually call start and end object here so we can inject the @type.
-  ow->StartObject(field_name);
-  ow->RenderString("@type", type_url);
-  util::Status result =
-      nested_os.WriteMessage(nested_os.type_, "value", 0, false, ow);
-  ow->EndObject();
-  return result;
-}
-
-util::Status ProtoStreamObjectSource::RenderFieldMask(
-    const ProtoStreamObjectSource* os, const google::protobuf::Type& type,
-    StringPiece field_name, ObjectWriter* ow) {
-  std::string combined;
-  uint32_t buffer32;
-  uint32_t paths_field_tag = 0;
-  for (uint32_t tag = os->stream_->ReadTag(); tag != 0;
-       tag = os->stream_->ReadTag()) {
-    if (paths_field_tag == 0) {
-      const google::protobuf::Field* field = os->FindAndVerifyField(type, tag);
-      if (field != nullptr && field->number() == 1 &&
-          field->name() == "paths") {
-        paths_field_tag = tag;
-      }
-    }
-    if (paths_field_tag != tag) {
-      return util::InternalError("Invalid FieldMask, unexpected field.");
-    }
-    std::string str;
-    os->stream_->ReadVarint32(&buffer32);  // string size.
-    os->stream_->ReadString(&str, buffer32);
-    if (!combined.empty()) {
-      combined.append(",");
-    }
-    combined.append(ConvertFieldMaskPath(str, &ToCamelCase));
-  }
-  ow->RenderString(field_name, combined);
-  return util::Status();
-}
-
-
-std::unordered_map<std::string, ProtoStreamObjectSource::TypeRenderer>*
-    ProtoStreamObjectSource::renderers_ = nullptr;
-PROTOBUF_NAMESPACE_ID::internal::once_flag source_renderers_init_;
-
-
-void ProtoStreamObjectSource::InitRendererMap() {
-  renderers_ = new std::unordered_map<std::string,
-                                      ProtoStreamObjectSource::TypeRenderer>();
-  (*renderers_)["google.protobuf.Timestamp"] =
-      &ProtoStreamObjectSource::RenderTimestamp;
-  (*renderers_)["google.protobuf.Duration"] =
-      &ProtoStreamObjectSource::RenderDuration;
-  (*renderers_)["google.protobuf.DoubleValue"] =
-      &ProtoStreamObjectSource::RenderDouble;
-  (*renderers_)["google.protobuf.FloatValue"] =
-      &ProtoStreamObjectSource::RenderFloat;
-  (*renderers_)["google.protobuf.Int64Value"] =
-      &ProtoStreamObjectSource::RenderInt64;
-  (*renderers_)["google.protobuf.UInt64Value"] =
-      &ProtoStreamObjectSource::RenderUInt64;
-  (*renderers_)["google.protobuf.Int32Value"] =
-      &ProtoStreamObjectSource::RenderInt32;
-  (*renderers_)["google.protobuf.UInt32Value"] =
-      &ProtoStreamObjectSource::RenderUInt32;
-  (*renderers_)["google.protobuf.BoolValue"] =
-      &ProtoStreamObjectSource::RenderBool;
-  (*renderers_)["google.protobuf.StringValue"] =
-      &ProtoStreamObjectSource::RenderString;
-  (*renderers_)["google.protobuf.BytesValue"] =
-      &ProtoStreamObjectSource::RenderBytes;
-  (*renderers_)["google.protobuf.Any"] = &ProtoStreamObjectSource::RenderAny;
-  (*renderers_)["google.protobuf.Struct"] =
-      &ProtoStreamObjectSource::RenderStruct;
-  (*renderers_)["google.protobuf.Value"] =
-      &ProtoStreamObjectSource::RenderStructValue;
-  (*renderers_)["google.protobuf.ListValue"] =
-      &ProtoStreamObjectSource::RenderStructListValue;
-  (*renderers_)["google.protobuf.FieldMask"] =
-      &ProtoStreamObjectSource::RenderFieldMask;
-  ::google::protobuf::internal::OnShutdown(&DeleteRendererMap);
-}
-
-void ProtoStreamObjectSource::DeleteRendererMap() {
-  delete ProtoStreamObjectSource::renderers_;
-  renderers_ = nullptr;
-}
-
-// static
-ProtoStreamObjectSource::TypeRenderer*
-ProtoStreamObjectSource::FindTypeRenderer(const std::string& type_url) {
-  PROTOBUF_NAMESPACE_ID::internal::call_once(source_renderers_init_,
-                                             InitRendererMap);
-  return FindOrNull(*renderers_, type_url);
-}
-
-util::Status ProtoStreamObjectSource::RenderField(
-    const google::protobuf::Field* field, StringPiece field_name,
-    ObjectWriter* ow) const {
-  // Short-circuit message types as it tends to call WriteMessage recursively
-  // and ends up using a lot of stack space. Keep the stack usage of this
-  // message small in order to preserve stack space and not crash.
-  if (field->kind() == google::protobuf::Field::TYPE_MESSAGE) {
-    uint32_t buffer32;
-    stream_->ReadVarint32(&buffer32);  // message length
-    int old_limit = stream_->PushLimit(buffer32);
-    // Get the nested message type for this field.
-    const google::protobuf::Type* type =
-        typeinfo_->GetTypeByTypeUrl(field->type_url());
-    if (type == nullptr) {
-      return util::InternalError(
-          StrCat("Invalid configuration. Could not find the type: ",
-                       field->type_url()));
-    }
-
-    // Short-circuit any special type rendering to save call-stack space.
-    const TypeRenderer* type_renderer = FindTypeRenderer(type->name());
-
-    RETURN_IF_ERROR(IncrementRecursionDepth(type->name(), field_name));
-    if (type_renderer != nullptr) {
-      RETURN_IF_ERROR((*type_renderer)(this, *type, field_name, ow));
-    } else {
-      RETURN_IF_ERROR(WriteMessage(*type, field_name, 0, true, ow));
-    }
-    --recursion_depth_;
-
-    if (!stream_->ConsumedEntireMessage()) {
-      return util::InvalidArgumentError(
-          "Nested protocol message not parsed in its entirety.");
-    }
-    stream_->PopLimit(old_limit);
-  } else {
-    // Render all other non-message types.
-    return RenderNonMessageField(field, field_name, ow);
-  }
-  return util::Status();
-}
-
-util::Status ProtoStreamObjectSource::RenderNonMessageField(
-    const google::protobuf::Field* field, StringPiece field_name,
-    ObjectWriter* ow) const {
-  // Temporary buffers of different types.
-  uint32_t buffer32 = 0;
-  uint64_t buffer64 = 0;
-  std::string strbuffer;
-  switch (field->kind()) {
-    case google::protobuf::Field::TYPE_BOOL: {
-      stream_->ReadVarint64(&buffer64);
-      ow->RenderBool(field_name, buffer64 != 0);
-      break;
-    }
-    case google::protobuf::Field::TYPE_INT32: {
-      stream_->ReadVarint32(&buffer32);
-      ow->RenderInt32(field_name, bit_cast<int32_t>(buffer32));
-      break;
-    }
-    case google::protobuf::Field::TYPE_INT64: {
-      stream_->ReadVarint64(&buffer64);
-      ow->RenderInt64(field_name, bit_cast<int64_t>(buffer64));
-      break;
-    }
-    case google::protobuf::Field::TYPE_UINT32: {
-      stream_->ReadVarint32(&buffer32);
-      ow->RenderUint32(field_name, bit_cast<uint32_t>(buffer32));
-      break;
-    }
-    case google::protobuf::Field::TYPE_UINT64: {
-      stream_->ReadVarint64(&buffer64);
-      ow->RenderUint64(field_name, bit_cast<uint64_t>(buffer64));
-      break;
-    }
-    case google::protobuf::Field::TYPE_SINT32: {
-      stream_->ReadVarint32(&buffer32);
-      ow->RenderInt32(field_name, WireFormatLite::ZigZagDecode32(buffer32));
-      break;
-    }
-    case google::protobuf::Field::TYPE_SINT64: {
-      stream_->ReadVarint64(&buffer64);
-      ow->RenderInt64(field_name, WireFormatLite::ZigZagDecode64(buffer64));
-      break;
-    }
-    case google::protobuf::Field::TYPE_SFIXED32: {
-      stream_->ReadLittleEndian32(&buffer32);
-      ow->RenderInt32(field_name, bit_cast<int32_t>(buffer32));
-      break;
-    }
-    case google::protobuf::Field::TYPE_SFIXED64: {
-      stream_->ReadLittleEndian64(&buffer64);
-      ow->RenderInt64(field_name, bit_cast<int64_t>(buffer64));
-      break;
-    }
-    case google::protobuf::Field::TYPE_FIXED32: {
-      stream_->ReadLittleEndian32(&buffer32);
-      ow->RenderUint32(field_name, bit_cast<uint32_t>(buffer32));
-      break;
-    }
-    case google::protobuf::Field::TYPE_FIXED64: {
-      stream_->ReadLittleEndian64(&buffer64);
-      ow->RenderUint64(field_name, bit_cast<uint64_t>(buffer64));
-      break;
-    }
-    case google::protobuf::Field::TYPE_FLOAT: {
-      stream_->ReadLittleEndian32(&buffer32);
-      ow->RenderFloat(field_name, bit_cast<float>(buffer32));
-      break;
-    }
-    case google::protobuf::Field::TYPE_DOUBLE: {
-      stream_->ReadLittleEndian64(&buffer64);
-      ow->RenderDouble(field_name, bit_cast<double>(buffer64));
-      break;
-    }
-    case google::protobuf::Field::TYPE_ENUM: {
-      stream_->ReadVarint32(&buffer32);
-
-      // If the field represents an explicit NULL value, render null.
-      if (field->type_url() == kStructNullValueTypeUrl) {
-        ow->RenderNull(field_name);
-        break;
-      }
-
-      // Get the nested enum type for this field.
-      // TODO(skarvaje): Avoid string manipulation. Find ways to speed this
-      // up.
-      const google::protobuf::Enum* en =
-          typeinfo_->GetEnumByTypeUrl(field->type_url());
-      // Lookup the name of the enum, and render that. Unknown enum values
-      // are printed as integers.
-      if (en != nullptr) {
-        const google::protobuf::EnumValue* enum_value =
-            FindEnumValueByNumber(*en, buffer32);
-        if (enum_value != nullptr) {
-          if (render_options_.use_ints_for_enums) {
-            ow->RenderInt32(field_name, buffer32);
-          } else if (render_options_.use_lower_camel_for_enums) {
-            ow->RenderString(field_name,
-                             EnumValueNameToLowerCamelCase(enum_value->name()));
-          } else {
-            ow->RenderString(field_name, enum_value->name());
-          }
-        } else {
-            ow->RenderInt32(field_name, buffer32);
-        }
-      } else {
-          ow->RenderInt32(field_name, buffer32);
-      }
-      break;
-    }
-    case google::protobuf::Field::TYPE_STRING: {
-      stream_->ReadVarint32(&buffer32);  // string size.
-      stream_->ReadString(&strbuffer, buffer32);
-      ow->RenderString(field_name, strbuffer);
-      break;
-    }
-    case google::protobuf::Field::TYPE_BYTES: {
-      stream_->ReadVarint32(&buffer32);  // bytes size.
-      stream_->ReadString(&strbuffer, buffer32);
-      ow->RenderBytes(field_name, strbuffer);
-      break;
-    }
-    default:
-      break;
-  }
-  return util::Status();
-}
-
-// TODO(skarvaje): Fix this to avoid code duplication.
-const std::string ProtoStreamObjectSource::ReadFieldValueAsString(
-    const google::protobuf::Field& field) const {
-  std::string result;
-  switch (field.kind()) {
-    case google::protobuf::Field::TYPE_BOOL: {
-      uint64_t buffer64;
-      stream_->ReadVarint64(&buffer64);
-      result = buffer64 != 0 ? "true" : "false";
-      break;
-    }
-    case google::protobuf::Field::TYPE_INT32: {
-      uint32_t buffer32;
-      stream_->ReadVarint32(&buffer32);
-      result = StrCat(bit_cast<int32_t>(buffer32));
-      break;
-    }
-    case google::protobuf::Field::TYPE_INT64: {
-      uint64_t buffer64;
-      stream_->ReadVarint64(&buffer64);
-      result = StrCat(bit_cast<int64_t>(buffer64));
-      break;
-    }
-    case google::protobuf::Field::TYPE_UINT32: {
-      uint32_t buffer32;
-      stream_->ReadVarint32(&buffer32);
-      result = StrCat(bit_cast<uint32_t>(buffer32));
-      break;
-    }
-    case google::protobuf::Field::TYPE_UINT64: {
-      uint64_t buffer64;
-      stream_->ReadVarint64(&buffer64);
-      result = StrCat(bit_cast<uint64_t>(buffer64));
-      break;
-    }
-    case google::protobuf::Field::TYPE_SINT32: {
-      uint32_t buffer32;
-      stream_->ReadVarint32(&buffer32);
-      result = StrCat(WireFormatLite::ZigZagDecode32(buffer32));
-      break;
-    }
-    case google::protobuf::Field::TYPE_SINT64: {
-      uint64_t buffer64;
-      stream_->ReadVarint64(&buffer64);
-      result = StrCat(WireFormatLite::ZigZagDecode64(buffer64));
-      break;
-    }
-    case google::protobuf::Field::TYPE_SFIXED32: {
-      uint32_t buffer32;
-      stream_->ReadLittleEndian32(&buffer32);
-      result = StrCat(bit_cast<int32_t>(buffer32));
-      break;
-    }
-    case google::protobuf::Field::TYPE_SFIXED64: {
-      uint64_t buffer64;
-      stream_->ReadLittleEndian64(&buffer64);
-      result = StrCat(bit_cast<int64_t>(buffer64));
-      break;
-    }
-    case google::protobuf::Field::TYPE_FIXED32: {
-      uint32_t buffer32;
-      stream_->ReadLittleEndian32(&buffer32);
-      result = StrCat(bit_cast<uint32_t>(buffer32));
-      break;
-    }
-    case google::protobuf::Field::TYPE_FIXED64: {
-      uint64_t buffer64;
-      stream_->ReadLittleEndian64(&buffer64);
-      result = StrCat(bit_cast<uint64_t>(buffer64));
-      break;
-    }
-    case google::protobuf::Field::TYPE_FLOAT: {
-      uint32_t buffer32;
-      stream_->ReadLittleEndian32(&buffer32);
-      result = SimpleFtoa(bit_cast<float>(buffer32));
-      break;
-    }
-    case google::protobuf::Field::TYPE_DOUBLE: {
-      uint64_t buffer64;
-      stream_->ReadLittleEndian64(&buffer64);
-      result = SimpleDtoa(bit_cast<double>(buffer64));
-      break;
-    }
-    case google::protobuf::Field::TYPE_ENUM: {
-      uint32_t buffer32;
-      stream_->ReadVarint32(&buffer32);
-      // Get the nested enum type for this field.
-      // TODO(skarvaje): Avoid string manipulation. Find ways to speed this
-      // up.
-      const google::protobuf::Enum* en =
-          typeinfo_->GetEnumByTypeUrl(field.type_url());
-      // Lookup the name of the enum, and render that. Skips unknown enums.
-      if (en != nullptr) {
-        const google::protobuf::EnumValue* enum_value =
-            FindEnumValueByNumber(*en, buffer32);
-        if (enum_value != nullptr) {
-          result = enum_value->name();
-        }
-      }
-      break;
-    }
-    case google::protobuf::Field::TYPE_STRING: {
-      uint32_t buffer32;
-      stream_->ReadVarint32(&buffer32);  // string size.
-      stream_->ReadString(&result, buffer32);
-      break;
-    }
-    case google::protobuf::Field::TYPE_BYTES: {
-      uint32_t buffer32;
-      stream_->ReadVarint32(&buffer32);  // bytes size.
-      stream_->ReadString(&result, buffer32);
-      break;
-    }
-    default:
-      break;
-  }
-  return result;
-}
-
-// Field is a map if it is a repeated message and it has an option "map_type".
-// TODO(skarvaje): Consider pre-computing the IsMap() into Field directly.
-bool ProtoStreamObjectSource::IsMap(
-    const google::protobuf::Field& field) const {
-  const google::protobuf::Type* field_type =
-      typeinfo_->GetTypeByTypeUrl(field.type_url());
-  return field.kind() == google::protobuf::Field::TYPE_MESSAGE &&
-         util::converter::IsMap(field, *field_type);
-}
-
-std::pair<int64_t, int32_t> ProtoStreamObjectSource::ReadSecondsAndNanos(
-    const google::protobuf::Type& type) const {
-  uint64_t seconds = 0;
-  uint32_t nanos = 0;
-  uint32_t tag = 0;
-  int64_t signed_seconds = 0;
-  int32_t signed_nanos = 0;
-
-  for (tag = stream_->ReadTag(); tag != 0; tag = stream_->ReadTag()) {
-    const google::protobuf::Field* field = FindAndVerifyField(type, tag);
-    if (field == nullptr) {
-      WireFormat::SkipField(stream_, tag, nullptr);
-      continue;
-    }
-    // 'seconds' has field number of 1 and 'nanos' has field number 2
-    // //google/protobuf/timestamp.proto & duration.proto
-    if (field->number() == 1) {
-      // read seconds
-      stream_->ReadVarint64(&seconds);
-      signed_seconds = bit_cast<int64_t>(seconds);
-    } else if (field->number() == 2) {
-      // read nanos
-      stream_->ReadVarint32(&nanos);
-      signed_nanos = bit_cast<int32_t>(nanos);
-    }
-  }
-  return std::pair<int64_t, int32_t>(signed_seconds, signed_nanos);
-}
-
-util::Status ProtoStreamObjectSource::IncrementRecursionDepth(
-    StringPiece type_name, StringPiece field_name) const {
-  if (++recursion_depth_ > max_recursion_depth_) {
-    return util::InvalidArgumentError(
-        StrCat("Message too deep. Max recursion depth reached for type '",
-                     type_name, "', field '", field_name, "'"));
-  }
-  return util::Status();
-}
-
-namespace {
-// TODO(skarvaje): Speed this up by not doing a linear scan.
-const google::protobuf::Field* FindFieldByNumber(
-    const google::protobuf::Type& type, int number) {
-  for (int i = 0; i < type.fields_size(); ++i) {
-    if (type.fields(i).number() == number) {
-      return &type.fields(i);
-    }
-  }
-  return nullptr;
-}
-
-// TODO(skarvaje): Replace FieldDescriptor by implementing IsTypePackable()
-// using tech Field.
-bool IsPackable(const google::protobuf::Field& field) {
-  return field.cardinality() == google::protobuf::Field::CARDINALITY_REPEATED &&
-         FieldDescriptor::IsTypePackable(
-             static_cast<FieldDescriptor::Type>(field.kind()));
-}
-
-// TODO(skarvaje): Speed this up by not doing a linear scan.
-const google::protobuf::EnumValue* FindEnumValueByNumber(
-    const google::protobuf::Enum& tech_enum, int number) {
-  for (int i = 0; i < tech_enum.enumvalue_size(); ++i) {
-    const google::protobuf::EnumValue& ev = tech_enum.enumvalue(i);
-    if (ev.number() == number) {
-      return &ev;
-    }
-  }
-  return nullptr;
-}
-
-// TODO(skarvaje): Look into optimizing this by not doing computation on
-// double.
-const std::string FormatNanos(uint32_t nanos, bool with_trailing_zeros) {
-  if (nanos == 0) {
-    return with_trailing_zeros ? ".000" : "";
-  }
-
-  const int precision = (nanos % 1000 != 0)      ? 9
-                        : (nanos % 1000000 != 0) ? 6
-                                                 : 3;
-  std::string formatted = StringPrintf(
-      "%.*f", precision, static_cast<double>(nanos) / kNanosPerSecond);
-  // remove the leading 0 before decimal.
-  return formatted.substr(1);
-}
-}  // namespace
-
-}  // namespace converter
-}  // namespace util
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/util/internal/protostream_objectsource.h b/libs/protobuf/src/google/protobuf/util/internal/protostream_objectsource.h
deleted file mode 100644
index 8ed2ca9..0000000
--- a/libs/protobuf/src/google/protobuf/util/internal/protostream_objectsource.h
+++ /dev/null
@@ -1,329 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef GOOGLE_PROTOBUF_UTIL_INTERNAL_PROTOSTREAM_OBJECTSOURCE_H__
-#define GOOGLE_PROTOBUF_UTIL_INTERNAL_PROTOSTREAM_OBJECTSOURCE_H__
-
-#include <cstdint>
-#include <functional>
-#include <string>
-#include <unordered_map>
-
-#include <google/protobuf/stubs/status.h>
-
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/type.pb.h>
-#include <google/protobuf/stubs/statusor.h>
-#include <google/protobuf/stubs/strutil.h>
-#include <google/protobuf/util/internal/object_source.h>
-#include <google/protobuf/util/internal/object_writer.h>
-#include <google/protobuf/util/internal/type_info.h>
-#include <google/protobuf/util/type_resolver.h>
-#include <google/protobuf/stubs/hash.h>
-#include <google/protobuf/stubs/status.h>
-
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-namespace util {
-namespace converter {
-
-class TypeInfo;
-
-// An ObjectSource that can parse a stream of bytes as a protocol buffer.
-// Its WriteTo() method can be given an ObjectWriter.
-// This implementation uses a google.protobuf.Type for tag and name lookup.
-// The field names are converted into lower camel-case when writing to the
-// ObjectWriter.
-//
-// Sample usage: (suppose input is: string proto)
-//   ArrayInputStream arr_stream(proto.data(), proto.size());
-//   CodedInputStream in_stream(&arr_stream);
-//   ProtoStreamObjectSource os(&in_stream, /*ServiceTypeInfo*/ typeinfo,
-//                              <your message google::protobuf::Type>);
-//
-//   Status status = os.WriteTo(<some ObjectWriter>);
-class PROTOBUF_EXPORT ProtoStreamObjectSource : public ObjectSource {
- public:
-
-  struct RenderOptions {
-    RenderOptions() = default;
-    RenderOptions(const RenderOptions&) = default;
-
-    // Sets whether or not to use lowerCamelCase casing for enum values. If set
-    // to false, enum values are output without any case conversions.
-    //
-    // For example, if we have an enum:
-    // enum Type {
-    //   ACTION_AND_ADVENTURE = 1;
-    // }
-    // Type type = 20;
-    //
-    // And this option is set to true. Then the rendered "type" field will have
-    // the string "actionAndAdventure".
-    // {
-    //   ...
-    //   "type": "actionAndAdventure",
-    //   ...
-    // }
-    //
-    // If set to false, the rendered "type" field will have the string
-    // "ACTION_AND_ADVENTURE".
-    // {
-    //   ...
-    //   "type": "ACTION_AND_ADVENTURE",
-    //   ...
-    // }
-    bool use_lower_camel_for_enums = false;
-
-    // Sets whether to always output enums as ints, by default this is off, and
-    // enums are rendered as strings.
-    bool use_ints_for_enums = false;
-
-    // Whether to preserve proto field names
-    bool preserve_proto_field_names = false;
-
-  };
-
-  ProtoStreamObjectSource(io::CodedInputStream* stream,
-                          TypeResolver* type_resolver,
-                          const google::protobuf::Type& type)
-      : ProtoStreamObjectSource(stream, type_resolver, type, RenderOptions()) {}
-  ProtoStreamObjectSource(io::CodedInputStream* stream,
-                          TypeResolver* type_resolver,
-                          const google::protobuf::Type& type,
-                          const RenderOptions& render_options);
-
-  ~ProtoStreamObjectSource() override;
-
-  util::Status NamedWriteTo(StringPiece name,
-                            ObjectWriter* ow) const override;
-
-  // Sets the max recursion depth of proto message to be deserialized. Proto
-  // messages over this depth will fail to be deserialized.
-  // Default value is 64.
-  void set_max_recursion_depth(int max_depth) {
-    max_recursion_depth_ = max_depth;
-  }
-
- protected:
-  // Writes a proto2 Message to the ObjectWriter. When the given end_tag is
-  // found this method will complete, allowing it to be used for parsing both
-  // nested messages (end with 0) and nested groups (end with group end tag).
-  // The include_start_and_end parameter allows this method to be called when
-  // already inside of an object, and skip calling StartObject and EndObject.
-  virtual util::Status WriteMessage(const google::protobuf::Type& type,
-                                    StringPiece name,
-                                    const uint32_t end_tag,
-                                    bool include_start_and_end,
-                                    ObjectWriter* ow) const;
-
-  // Renders a repeating field (packed or unpacked).  Returns the next tag after
-  // reading all sequential repeating elements. The caller should use this tag
-  // before reading more tags from the stream.
-  virtual util::StatusOr<uint32_t> RenderList(
-      const google::protobuf::Field* field, StringPiece name,
-      uint32_t list_tag, ObjectWriter* ow) const;
-
-  // Looks up a field and verify its consistency with wire type in tag.
-  const google::protobuf::Field* FindAndVerifyField(
-      const google::protobuf::Type& type, uint32_t tag) const;
-
-  // Renders a field value to the ObjectWriter.
-  virtual util::Status RenderField(const google::protobuf::Field* field,
-                                   StringPiece field_name,
-                                   ObjectWriter* ow) const;
-
-  // Reads field value according to Field spec in 'field' and returns the read
-  // value as string. This only works for primitive datatypes (no message
-  // types).
-  const std::string ReadFieldValueAsString(
-      const google::protobuf::Field& field) const;
-
-
-  // Returns the input stream.
-  io::CodedInputStream* stream() const { return stream_; }
-
- private:
-  ProtoStreamObjectSource(io::CodedInputStream* stream,
-                          const TypeInfo* typeinfo,
-                          const google::protobuf::Type& type,
-                          const RenderOptions& render_options);
-  // Function that renders a well known type with a modified behavior.
-  typedef util::Status (*TypeRenderer)(const ProtoStreamObjectSource*,
-                                       const google::protobuf::Type&,
-                                       StringPiece, ObjectWriter*);
-
-  // TODO(skarvaje): Mark these methods as non-const as they modify internal
-  // state (stream_).
-  //
-  // Renders a NWP map.
-  // Returns the next tag after reading all map entries. The caller should use
-  // this tag before reading more tags from the stream.
-  util::StatusOr<uint32_t> RenderMap(const google::protobuf::Field* field,
-                                     StringPiece name, uint32_t list_tag,
-                                     ObjectWriter* ow) const;
-
-  // Renders a packed repeating field. A packed field is stored as:
-  // {tag length item1 item2 item3} instead of the less efficient
-  // {tag item1 tag item2 tag item3}.
-  util::Status RenderPacked(const google::protobuf::Field* field,
-                            ObjectWriter* ow) const;
-
-  // Renders a google.protobuf.Timestamp value to ObjectWriter
-  static util::Status RenderTimestamp(const ProtoStreamObjectSource* os,
-                                      const google::protobuf::Type& type,
-                                      StringPiece name, ObjectWriter* ow);
-
-  // Renders a google.protobuf.Duration value to ObjectWriter
-  static util::Status RenderDuration(const ProtoStreamObjectSource* os,
-                                     const google::protobuf::Type& type,
-                                     StringPiece name, ObjectWriter* ow);
-
-  // Following RenderTYPE functions render well known types in
-  // google/protobuf/wrappers.proto corresponding to TYPE.
-  static util::Status RenderDouble(const ProtoStreamObjectSource* os,
-                                   const google::protobuf::Type& type,
-                                   StringPiece name, ObjectWriter* ow);
-  static util::Status RenderFloat(const ProtoStreamObjectSource* os,
-                                  const google::protobuf::Type& type,
-                                  StringPiece name, ObjectWriter* ow);
-  static util::Status RenderInt64(const ProtoStreamObjectSource* os,
-                                  const google::protobuf::Type& type,
-                                  StringPiece name, ObjectWriter* ow);
-  static util::Status RenderUInt64(const ProtoStreamObjectSource* os,
-                                   const google::protobuf::Type& type,
-                                   StringPiece name, ObjectWriter* ow);
-  static util::Status RenderInt32(const ProtoStreamObjectSource* os,
-                                  const google::protobuf::Type& type,
-                                  StringPiece name, ObjectWriter* ow);
-  static util::Status RenderUInt32(const ProtoStreamObjectSource* os,
-                                   const google::protobuf::Type& type,
-                                   StringPiece name, ObjectWriter* ow);
-  static util::Status RenderBool(const ProtoStreamObjectSource* os,
-                                 const google::protobuf::Type& type,
-                                 StringPiece name, ObjectWriter* ow);
-  static util::Status RenderString(const ProtoStreamObjectSource* os,
-                                   const google::protobuf::Type& type,
-                                   StringPiece name, ObjectWriter* ow);
-  static util::Status RenderBytes(const ProtoStreamObjectSource* os,
-                                  const google::protobuf::Type& type,
-                                  StringPiece name, ObjectWriter* ow);
-
-  // Renders a google.protobuf.Struct to ObjectWriter.
-  static util::Status RenderStruct(const ProtoStreamObjectSource* os,
-                                   const google::protobuf::Type& type,
-                                   StringPiece name, ObjectWriter* ow);
-
-  // Helper to render google.protobuf.Struct's Value fields to ObjectWriter.
-  static util::Status RenderStructValue(const ProtoStreamObjectSource* os,
-                                        const google::protobuf::Type& type,
-                                        StringPiece name,
-                                        ObjectWriter* ow);
-
-  // Helper to render google.protobuf.Struct's ListValue fields to ObjectWriter.
-  static util::Status RenderStructListValue(const ProtoStreamObjectSource* os,
-                                            const google::protobuf::Type& type,
-                                            StringPiece name,
-                                            ObjectWriter* ow);
-
-  // Render the "Any" type.
-  static util::Status RenderAny(const ProtoStreamObjectSource* os,
-                                const google::protobuf::Type& type,
-                                StringPiece name, ObjectWriter* ow);
-
-  // Render the "FieldMask" type.
-  static util::Status RenderFieldMask(const ProtoStreamObjectSource* os,
-                                      const google::protobuf::Type& type,
-                                      StringPiece name, ObjectWriter* ow);
-
-  static std::unordered_map<std::string, TypeRenderer>* renderers_;
-  static void InitRendererMap();
-  static void DeleteRendererMap();
-  static TypeRenderer* FindTypeRenderer(const std::string& type_url);
-
-  // Same as above but renders all non-message field types. Callers don't call
-  // this function directly. They just use RenderField.
-  util::Status RenderNonMessageField(const google::protobuf::Field* field,
-                                     StringPiece field_name,
-                                     ObjectWriter* ow) const;
-
-
-  // Utility function to detect proto maps. The 'field' MUST be repeated.
-  bool IsMap(const google::protobuf::Field& field) const;
-
-  // Utility to read int64 and int32 values from a message type in stream_.
-  // Used for reading google.protobuf.Timestamp and Duration messages.
-  std::pair<int64_t, int32_t> ReadSecondsAndNanos(
-      const google::protobuf::Type& type) const;
-
-  // Helper function to check recursion depth and increment it. It will return
-  // OkStatus() if the current depth is allowed. Otherwise an error is returned.
-  // type_name and field_name are used for error reporting.
-  util::Status IncrementRecursionDepth(StringPiece type_name,
-                                       StringPiece field_name) const;
-
-  // Input stream to read from. Ownership rests with the caller.
-  mutable io::CodedInputStream* stream_;
-
-  // Type information for all the types used in the descriptor. Used to find
-  // google::protobuf::Type of nested messages/enums.
-  const TypeInfo* typeinfo_;
-
-  // Whether this class owns the typeinfo_ object. If true the typeinfo_ object
-  // should be deleted in the destructor.
-  bool own_typeinfo_;
-
-  // google::protobuf::Type of the message source.
-  const google::protobuf::Type& type_;
-
-
-  const RenderOptions render_options_;
-
-  // Tracks current recursion depth.
-  mutable int recursion_depth_;
-
-  // Maximum allowed recursion depth.
-  int max_recursion_depth_;
-
-  GOOGLE_DISALLOW_IMPLICIT_CONSTRUCTORS(ProtoStreamObjectSource);
-};
-
-}  // namespace converter
-}  // namespace util
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
-
-#endif  // GOOGLE_PROTOBUF_UTIL_INTERNAL_PROTOSTREAM_OBJECTSOURCE_H__
diff --git a/libs/protobuf/src/google/protobuf/util/internal/protostream_objectsource_test.cc b/libs/protobuf/src/google/protobuf/util/internal/protostream_objectsource_test.cc
deleted file mode 100644
index e16db78..0000000
--- a/libs/protobuf/src/google/protobuf/util/internal/protostream_objectsource_test.cc
+++ /dev/null
@@ -1,1165 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <google/protobuf/util/internal/protostream_objectsource.h>
-
-#include <cstdint>
-#include <memory>
-#include <sstream>
-
-#include <google/protobuf/any.pb.h>
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/io/zero_copy_stream_impl_lite.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/util/internal/expecting_objectwriter.h>
-#include <google/protobuf/util/internal/testdata/anys.pb.h>
-#include <google/protobuf/util/internal/testdata/books.pb.h>
-#include <google/protobuf/util/internal/testdata/field_mask.pb.h>
-#include <google/protobuf/util/internal/testdata/maps.pb.h>
-#include <google/protobuf/util/internal/testdata/proto3.pb.h>
-#include <google/protobuf/util/internal/testdata/struct.pb.h>
-#include <google/protobuf/util/internal/testdata/timestamp_duration.pb.h>
-#include <gtest/gtest.h>
-#include <google/protobuf/stubs/casts.h>
-#include <google/protobuf/stubs/status.h>
-#include <google/protobuf/util/internal/constants.h>
-#include <google/protobuf/util/internal/type_info_test_helper.h>
-
-
-namespace google {
-namespace protobuf {
-namespace util {
-namespace converter {
-
-using ::google::protobuf::Any;
-using io::ArrayInputStream;
-using io::CodedInputStream;
-using proto_util_converter::testing::AnyM;
-using proto_util_converter::testing::AnyOut;
-using proto_util_converter::testing::Author;
-using proto_util_converter::testing::BadAuthor;
-using proto_util_converter::testing::BadNestedBook;
-using proto_util_converter::testing::Book;
-using proto_util_converter::testing::Book_Label;
-using proto_util_converter::testing::Cyclic;
-using proto_util_converter::testing::FieldMaskTest;
-using proto_util_converter::testing::MapOut;
-using proto_util_converter::testing::MapOutWireFormat;
-using proto_util_converter::testing::NestedBook;
-using proto_util_converter::testing::NestedFieldMask;
-using proto_util_converter::testing::PackedPrimitive;
-using proto_util_converter::testing::Primitive;
-using proto_util_converter::testing::Proto3Message;
-using proto_util_converter::testing::StructType;
-using proto_util_converter::testing::TimestampDuration;
-using ::testing::_;
-
-
-namespace {
-std::string GetTypeUrl(const Descriptor* descriptor) {
-  return std::string(kTypeServiceBaseUrl) + "/" + descriptor->full_name();
-}
-}  // namespace
-
-class ProtostreamObjectSourceTest
-    : public ::testing::TestWithParam<testing::TypeInfoSource> {
- protected:
-  ProtostreamObjectSourceTest()
-      : helper_(GetParam()),
-        mock_(),
-        ow_(&mock_),
-        use_lower_camel_for_enums_(false),
-        use_ints_for_enums_(false),
-        use_preserve_proto_field_names_(false),
-        add_trailing_zeros_(false),
-        render_unknown_enum_values_(true) {
-    helper_.ResetTypeInfo(Book::descriptor(), Proto3Message::descriptor());
-  }
-
-  ~ProtostreamObjectSourceTest() override {}
-
-  void DoTest(const Message& msg, const Descriptor* descriptor) {
-    util::Status status = ExecuteTest(msg, descriptor);
-    EXPECT_EQ(util::Status(), status);
-  }
-
-  util::Status ExecuteTest(const Message& msg, const Descriptor* descriptor) {
-    std::ostringstream oss;
-    msg.SerializePartialToOstream(&oss);
-    std::string proto = oss.str();
-    ArrayInputStream arr_stream(proto.data(), proto.size());
-    CodedInputStream in_stream(&arr_stream);
-
-    ProtoStreamObjectSource::RenderOptions render_options;
-    render_options.use_lower_camel_for_enums = use_lower_camel_for_enums_;
-    render_options.use_ints_for_enums = use_ints_for_enums_;
-    render_options.preserve_proto_field_names = use_preserve_proto_field_names_;
-    std::unique_ptr<ProtoStreamObjectSource> os(helper_.NewProtoSource(
-        &in_stream, GetTypeUrl(descriptor), render_options));
-    os->set_max_recursion_depth(64);
-    return os->WriteTo(&mock_);
-  }
-
-  void PrepareExpectingObjectWriterForRepeatedPrimitive() {
-    ow_.StartObject("")
-        ->StartList("repFix32")
-        ->RenderUint32("", bit_cast<uint32_t>(3201))
-        ->RenderUint32("", bit_cast<uint32_t>(0))
-        ->RenderUint32("", bit_cast<uint32_t>(3202))
-        ->EndList()
-        ->StartList("repU32")
-        ->RenderUint32("", bit_cast<uint32_t>(3203))
-        ->RenderUint32("", bit_cast<uint32_t>(0))
-        ->EndList()
-        ->StartList("repI32")
-        ->RenderInt32("", 0)
-        ->RenderInt32("", 3204)
-        ->RenderInt32("", 3205)
-        ->EndList()
-        ->StartList("repSf32")
-        ->RenderInt32("", 3206)
-        ->RenderInt32("", 0)
-        ->EndList()
-        ->StartList("repS32")
-        ->RenderInt32("", 0)
-        ->RenderInt32("", 3207)
-        ->RenderInt32("", 3208)
-        ->EndList()
-        ->StartList("repFix64")
-        ->RenderUint64("", bit_cast<uint64_t>(int64_t{6401}))
-        ->RenderUint64("", bit_cast<uint64_t>(int64_t{0}))
-        ->EndList()
-        ->StartList("repU64")
-        ->RenderUint64("", bit_cast<uint64_t>(int64_t{0}))
-        ->RenderUint64("", bit_cast<uint64_t>(int64_t{6402}))
-        ->RenderUint64("", bit_cast<uint64_t>(int64_t{6403}))
-        ->EndList()
-        ->StartList("repI64")
-        ->RenderInt64("", 6404L)
-        ->RenderInt64("", 0L)
-        ->EndList()
-        ->StartList("repSf64")
-        ->RenderInt64("", 0L)
-        ->RenderInt64("", 6405L)
-        ->RenderInt64("", 6406L)
-        ->EndList()
-        ->StartList("repS64")
-        ->RenderInt64("", 6407L)
-        ->RenderInt64("", 0L)
-        ->EndList()
-        ->StartList("repFloat")
-        ->RenderFloat("", 0.0f)
-        ->RenderFloat("", 32.1f)
-        ->RenderFloat("", 32.2f)
-        ->EndList()
-        ->StartList("repDouble")
-        ->RenderDouble("", 64.1L)
-        ->RenderDouble("", 0.0L)
-        ->EndList()
-        ->StartList("repBool")
-        ->RenderBool("", true)
-        ->RenderBool("", false)
-        ->EndList()
-        ->EndObject();
-  }
-
-  Primitive PrepareRepeatedPrimitive() {
-    Primitive primitive;
-    primitive.add_rep_fix32(3201);
-    primitive.add_rep_fix32(0);
-    primitive.add_rep_fix32(3202);
-    primitive.add_rep_u32(3203);
-    primitive.add_rep_u32(0);
-    primitive.add_rep_i32(0);
-    primitive.add_rep_i32(3204);
-    primitive.add_rep_i32(3205);
-    primitive.add_rep_sf32(3206);
-    primitive.add_rep_sf32(0);
-    primitive.add_rep_s32(0);
-    primitive.add_rep_s32(3207);
-    primitive.add_rep_s32(3208);
-    primitive.add_rep_fix64(6401L);
-    primitive.add_rep_fix64(0L);
-    primitive.add_rep_u64(0L);
-    primitive.add_rep_u64(6402L);
-    primitive.add_rep_u64(6403L);
-    primitive.add_rep_i64(6404L);
-    primitive.add_rep_i64(0L);
-    primitive.add_rep_sf64(0L);
-    primitive.add_rep_sf64(6405L);
-    primitive.add_rep_sf64(6406L);
-    primitive.add_rep_s64(6407L);
-    primitive.add_rep_s64(0L);
-    primitive.add_rep_float(0.0f);
-    primitive.add_rep_float(32.1f);
-    primitive.add_rep_float(32.2f);
-    primitive.add_rep_double(64.1L);
-    primitive.add_rep_double(0.0);
-    primitive.add_rep_bool(true);
-    primitive.add_rep_bool(false);
-
-    PrepareExpectingObjectWriterForRepeatedPrimitive();
-    return primitive;
-  }
-
-  PackedPrimitive PreparePackedPrimitive() {
-    PackedPrimitive primitive;
-    primitive.add_rep_fix32(3201);
-    primitive.add_rep_fix32(0);
-    primitive.add_rep_fix32(3202);
-    primitive.add_rep_u32(3203);
-    primitive.add_rep_u32(0);
-    primitive.add_rep_i32(0);
-    primitive.add_rep_i32(3204);
-    primitive.add_rep_i32(3205);
-    primitive.add_rep_sf32(3206);
-    primitive.add_rep_sf32(0);
-    primitive.add_rep_s32(0);
-    primitive.add_rep_s32(3207);
-    primitive.add_rep_s32(3208);
-    primitive.add_rep_fix64(6401L);
-    primitive.add_rep_fix64(0L);
-    primitive.add_rep_u64(0L);
-    primitive.add_rep_u64(6402L);
-    primitive.add_rep_u64(6403L);
-    primitive.add_rep_i64(6404L);
-    primitive.add_rep_i64(0L);
-    primitive.add_rep_sf64(0L);
-    primitive.add_rep_sf64(6405L);
-    primitive.add_rep_sf64(6406L);
-    primitive.add_rep_s64(6407L);
-    primitive.add_rep_s64(0L);
-    primitive.add_rep_float(0.0f);
-    primitive.add_rep_float(32.1f);
-    primitive.add_rep_float(32.2f);
-    primitive.add_rep_double(64.1L);
-    primitive.add_rep_double(0.0);
-    primitive.add_rep_bool(true);
-    primitive.add_rep_bool(false);
-
-    PrepareExpectingObjectWriterForRepeatedPrimitive();
-    return primitive;
-  }
-
-  void UseLowerCamelForEnums() { use_lower_camel_for_enums_ = true; }
-
-  void UseIntsForEnums() { use_ints_for_enums_ = true; }
-
-  void UsePreserveProtoFieldNames() { use_preserve_proto_field_names_ = true; }
-
-  void AddTrailingZeros() { add_trailing_zeros_ = true; }
-
-  void SetRenderUnknownEnumValues(bool value) {
-    render_unknown_enum_values_ = value;
-  }
-
-  testing::TypeInfoTestHelper helper_;
-
-  ::testing::NiceMock<MockObjectWriter> mock_;
-  ExpectingObjectWriter ow_;
-  bool use_lower_camel_for_enums_;
-  bool use_ints_for_enums_;
-  bool use_preserve_proto_field_names_;
-  bool add_trailing_zeros_;
-  bool render_unknown_enum_values_;
-};
-
-INSTANTIATE_TEST_SUITE_P(DifferentTypeInfoSourceTest,
-                         ProtostreamObjectSourceTest,
-                         ::testing::Values(
-                             testing::USE_TYPE_RESOLVER));
-
-TEST_P(ProtostreamObjectSourceTest, EmptyMessage) {
-  Book empty;
-  ow_.StartObject("")->EndObject();
-  DoTest(empty, Book::descriptor());
-}
-
-TEST_P(ProtostreamObjectSourceTest, Primitives) {
-  Primitive primitive;
-  primitive.set_fix32(3201);
-  primitive.set_u32(3202);
-  primitive.set_i32(3203);
-  primitive.set_sf32(3204);
-  primitive.set_s32(3205);
-  primitive.set_fix64(6401L);
-  primitive.set_u64(6402L);
-  primitive.set_i64(6403L);
-  primitive.set_sf64(6404L);
-  primitive.set_s64(6405L);
-  primitive.set_str("String Value");
-  primitive.set_bytes("Some Bytes");
-  primitive.set_float_(32.1f);
-  primitive.set_double_(64.1L);
-  primitive.set_bool_(true);
-
-  ow_.StartObject("")
-      ->RenderUint32("fix32", bit_cast<uint32_t>(3201))
-      ->RenderUint32("u32", bit_cast<uint32_t>(3202))
-      ->RenderInt32("i32", 3203)
-      ->RenderInt32("sf32", 3204)
-      ->RenderInt32("s32", 3205)
-      ->RenderUint64("fix64", bit_cast<uint64_t>(int64_t{6401}))
-      ->RenderUint64("u64", bit_cast<uint64_t>(int64_t{6402}))
-      ->RenderInt64("i64", 6403L)
-      ->RenderInt64("sf64", 6404L)
-      ->RenderInt64("s64", 6405L)
-      ->RenderString("str", "String Value")
-      ->RenderBytes("bytes", "Some Bytes")
-      ->RenderFloat("float", 32.1f)
-      ->RenderDouble("double", 64.1L)
-      ->RenderBool("bool", true)
-      ->EndObject();
-  DoTest(primitive, Primitive::descriptor());
-}
-
-TEST_P(ProtostreamObjectSourceTest, RepeatingPrimitives) {
-  Primitive primitive = PrepareRepeatedPrimitive();
-  primitive.add_rep_str("String One");
-  primitive.add_rep_str("String Two");
-  primitive.add_rep_bytes("Some Bytes");
-
-  ow_.StartList("repStr")
-      ->RenderString("", "String One")
-      ->RenderString("", "String Two")
-      ->EndList()
-      ->StartList("repBytes")
-      ->RenderBytes("", "Some Bytes")
-      ->EndList();
-  DoTest(primitive, Primitive::descriptor());
-}
-
-TEST_P(ProtostreamObjectSourceTest, CustomJsonName) {
-  Author author;
-  author.set_id(12345);
-
-  ow_.StartObject("")->RenderUint64("@id", 12345)->EndObject();
-  DoTest(author, Author::descriptor());
-}
-
-TEST_P(ProtostreamObjectSourceTest, NestedMessage) {
-  Author* author = new Author();
-  author->set_name("Tolstoy");
-  Book book;
-  book.set_title("My Book");
-  book.set_allocated_author(author);
-
-  ow_.StartObject("")
-      ->RenderString("title", "My Book")
-      ->StartObject("author")
-      ->RenderString("name", "Tolstoy")
-      ->EndObject()
-      ->EndObject();
-  DoTest(book, Book::descriptor());
-}
-
-TEST_P(ProtostreamObjectSourceTest, RepeatingField) {
-  Author author;
-  author.set_alive(false);
-  author.set_name("john");
-  author.add_pseudonym("phil");
-  author.add_pseudonym("bob");
-
-  ow_.StartObject("")
-      ->RenderBool("alive", false)
-      ->RenderString("name", "john")
-      ->StartList("pseudonym")
-      ->RenderString("", "phil")
-      ->RenderString("", "bob")
-      ->EndList()
-      ->EndObject();
-  DoTest(author, Author::descriptor());
-}
-
-TEST_P(ProtostreamObjectSourceTest, PackedRepeatingFields) {
-  DoTest(PreparePackedPrimitive(), PackedPrimitive::descriptor());
-}
-
-TEST_P(ProtostreamObjectSourceTest, NonPackedPackableFieldsActuallyPacked) {
-  // Protostream is packed, but parse with non-packed Primitive.
-  DoTest(PreparePackedPrimitive(), Primitive::descriptor());
-}
-
-TEST_P(ProtostreamObjectSourceTest, PackedPackableFieldNotActuallyPacked) {
-  // Protostream is not packed, but parse with PackedPrimitive.
-  DoTest(PrepareRepeatedPrimitive(), PackedPrimitive::descriptor());
-}
-
-TEST_P(ProtostreamObjectSourceTest, BadAuthor) {
-  Author author;
-  author.set_alive(false);
-  author.set_name("john");
-  author.set_id(1234L);
-  author.add_pseudonym("phil");
-  author.add_pseudonym("bob");
-
-  ow_.StartObject("")
-      ->StartList("alive")
-      ->RenderBool("", false)
-      ->EndList()
-      ->StartList("name")
-      ->RenderUint64("", static_cast<uint64_t>('j'))
-      ->RenderUint64("", static_cast<uint64_t>('o'))
-      ->RenderUint64("", static_cast<uint64_t>('h'))
-      ->RenderUint64("", static_cast<uint64_t>('n'))
-      ->EndList()
-      ->RenderString("pseudonym", "phil")
-      ->RenderString("pseudonym", "bob")
-      ->EndObject();
-  // Protostream created with Author, but parsed with BadAuthor.
-  DoTest(author, BadAuthor::descriptor());
-}
-
-TEST_P(ProtostreamObjectSourceTest, NestedBookToBadNestedBook) {
-  Book* book = new Book();
-  book->set_length(250);
-  book->set_published(2014L);
-  NestedBook nested;
-  nested.set_allocated_book(book);
-
-  ow_.StartObject("")
-      ->StartList("book")
-      ->RenderUint32("", 24)  // tag for field length (3 << 3)
-      ->RenderUint32("", 250)
-      ->RenderUint32("", 32)  // tag for field published (4 << 3)
-      ->RenderUint32("", 2014)
-      ->EndList()
-      ->EndObject();
-  // Protostream created with NestedBook, but parsed with BadNestedBook.
-  DoTest(nested, BadNestedBook::descriptor());
-}
-
-TEST_P(ProtostreamObjectSourceTest, BadNestedBookToNestedBook) {
-  BadNestedBook nested;
-  nested.add_book(1);
-  nested.add_book(2);
-  nested.add_book(3);
-  nested.add_book(4);
-  nested.add_book(5);
-  nested.add_book(6);
-  nested.add_book(7);
-
-  ow_.StartObject("")->StartObject("book")->EndObject()->EndObject();
-  // Protostream created with BadNestedBook, but parsed with NestedBook.
-  DoTest(nested, NestedBook::descriptor());
-}
-
-TEST_P(ProtostreamObjectSourceTest,
-       LongRepeatedListDoesNotBreakIntoMultipleJsonLists) {
-  Book book;
-
-  int repeat = 10000;
-  for (int i = 0; i < repeat; ++i) {
-    Book_Label* label = book.add_labels();
-    label->set_key(StrCat("i", i));
-    label->set_value(StrCat("v", i));
-  }
-
-  // Make sure StartList and EndList are called exactly once (see b/18227499 for
-  // problems when this doesn't happen)
-  EXPECT_CALL(mock_, StartList(_)).Times(1);
-  EXPECT_CALL(mock_, EndList()).Times(1);
-
-  DoTest(book, Book::descriptor());
-}
-
-TEST_P(ProtostreamObjectSourceTest, LowerCamelEnumOutputMacroCase) {
-  Book book;
-  book.set_type(Book::ACTION_AND_ADVENTURE);
-
-  UseLowerCamelForEnums();
-
-  ow_.StartObject("")->RenderString("type", "actionAndAdventure")->EndObject();
-  DoTest(book, Book::descriptor());
-}
-
-TEST_P(ProtostreamObjectSourceTest, LowerCamelEnumOutputSnakeCase) {
-  Book book;
-  book.set_type(Book::arts_and_photography);
-
-  UseLowerCamelForEnums();
-
-  ow_.StartObject("")->RenderString("type", "artsAndPhotography")->EndObject();
-  DoTest(book, Book::descriptor());
-}
-
-TEST_P(ProtostreamObjectSourceTest, LowerCamelEnumOutputWithNumber) {
-  Book book;
-  book.set_type(Book::I18N_Tech);
-
-  UseLowerCamelForEnums();
-
-  ow_.StartObject("")->RenderString("type", "i18nTech")->EndObject();
-  DoTest(book, Book::descriptor());
-}
-
-TEST_P(ProtostreamObjectSourceTest, EnumCaseIsUnchangedByDefault) {
-  Book book;
-  book.set_type(Book::ACTION_AND_ADVENTURE);
-  ow_.StartObject("")
-      ->RenderString("type", "ACTION_AND_ADVENTURE")
-      ->EndObject();
-  DoTest(book, Book::descriptor());
-}
-
-TEST_P(ProtostreamObjectSourceTest, UseIntsForEnumsTest) {
-  Book book;
-  book.set_type(Book::ACTION_AND_ADVENTURE);
-
-  UseIntsForEnums();
-
-  ow_.StartObject("")->RenderInt32("type", 3)->EndObject();
-  DoTest(book, Book::descriptor());
-}
-
-TEST_P(ProtostreamObjectSourceTest, UsePreserveProtoFieldNames) {
-  Book book;
-  book.set_snake_field("foo");
-
-  UsePreserveProtoFieldNames();
-
-  ow_.StartObject("")->RenderString("snake_field", "foo")->EndObject();
-  DoTest(book, Book::descriptor());
-}
-
-TEST_P(ProtostreamObjectSourceTest,
-       UnknownEnumAreDroppedWhenRenderUnknownEnumValuesIsUnset) {
-  Proto3Message message;
-  message.set_enum_value(static_cast<Proto3Message::NestedEnum>(1234));
-
-  SetRenderUnknownEnumValues(false);
-
-  // Unknown enum values are not output.
-  ow_.StartObject("")->EndObject();
-  DoTest(message, Proto3Message::descriptor());
-}
-
-TEST_P(ProtostreamObjectSourceTest,
-       UnknownEnumAreOutputWhenRenderUnknownEnumValuesIsSet) {
-  Proto3Message message;
-  message.set_enum_value(static_cast<Proto3Message::NestedEnum>(1234));
-
-  SetRenderUnknownEnumValues(true);
-
-  // Unknown enum values are output.
-  ow_.StartObject("")->RenderInt32("enumValue", 1234)->EndObject();
-  DoTest(message, Proto3Message::descriptor());
-}
-
-TEST_P(ProtostreamObjectSourceTest, CyclicMessageDepthTest) {
-  Cyclic cyclic;
-  cyclic.set_m_int(123);
-
-  Book* book = cyclic.mutable_m_book();
-  book->set_title("book title");
-  Cyclic* current = cyclic.mutable_m_cyclic();
-  Author* current_author = cyclic.add_m_author();
-  for (int i = 0; i < 63; ++i) {
-    Author* next = current_author->add_friend_();
-    next->set_id(i);
-    next->set_name(StrCat("author_name_", i));
-    next->set_alive(true);
-    current_author = next;
-  }
-
-  // Recursive message with depth (65) > max (max is 64).
-  for (int i = 0; i < 64; ++i) {
-    Cyclic* next = current->mutable_m_cyclic();
-    next->set_m_str(StrCat("count_", i));
-    current = next;
-  }
-
-  util::Status status = ExecuteTest(cyclic, Cyclic::descriptor());
-  EXPECT_TRUE(util::IsInvalidArgument(status));
-}
-
-class ProtostreamObjectSourceMapsTest : public ProtostreamObjectSourceTest {
- protected:
-  ProtostreamObjectSourceMapsTest() {
-    helper_.ResetTypeInfo(MapOut::descriptor());
-  }
-};
-
-INSTANTIATE_TEST_SUITE_P(DifferentTypeInfoSourceTest,
-                         ProtostreamObjectSourceMapsTest,
-                         ::testing::Values(
-                             testing::USE_TYPE_RESOLVER));
-
-// Tests JSON map.
-//
-// This is the example expected output.
-// {
-//   "map1": {
-//     "key1": {
-//       "foo": "foovalue"
-//     },
-//     "key2": {
-//       "foo": "barvalue"
-//     }
-//   },
-//   "map2": {
-//     "nestedself": {
-//       "map1": {
-//         "nested_key1": {
-//           "foo": "nested_foo"
-//         }
-//       },
-//       "bar": "nested_bar_string"
-//     }
-//   },
-//   "map3": {
-//     "111": "one one one"
-//   },
-//   "bar": "top bar"
-// }
-TEST_P(ProtostreamObjectSourceMapsTest, MapsTest) {
-  MapOut out;
-  (*out.mutable_map1())["key1"].set_foo("foovalue");
-  (*out.mutable_map1())["key2"].set_foo("barvalue");
-
-  MapOut* nested_value = &(*out.mutable_map2())["nestedself"];
-  (*nested_value->mutable_map1())["nested_key1"].set_foo("nested_foo");
-  nested_value->set_bar("nested_bar_string");
-
-  (*out.mutable_map3())[111] = "one one one";
-
-  out.set_bar("top bar");
-
-  ow_.StartObject("")
-      ->StartObject("map1")
-      ->StartObject("key1")
-      ->RenderString("foo", "foovalue")
-      ->EndObject()
-      ->StartObject("key2")
-      ->RenderString("foo", "barvalue")
-      ->EndObject()
-      ->StartObject("map2")
-      ->StartObject("nestedself")
-      ->StartObject("map1")
-      ->StartObject("nested_key1")
-      ->RenderString("foo", "nested_foo")
-      ->EndObject()
-      ->EndObject()
-      ->RenderString("bar", "nested_bar_string")
-      ->EndObject()
-      ->EndObject()
-      ->StartObject("map3")
-      ->RenderString("111", "one one one")
-      ->EndObject()
-      ->EndObject()
-      ->RenderString("bar", "top bar")
-      ->EndObject();
-
-  DoTest(out, MapOut::descriptor());
-}
-
-TEST_P(ProtostreamObjectSourceMapsTest, MissingKeysTest) {
-  // MapOutWireFormat has the same wire representation with MapOut but uses
-  // repeated message fields to represent map fields so we can intentionally
-  // leave out the key field or the value field of a map entry.
-  MapOutWireFormat out;
-  // Create some map entries without keys. They will be rendered with the
-  // default values ("" for strings, "0" for integers, etc.).
-  // {
-  //   "map1": {
-  //     "": {
-  //       "foo": "foovalue"
-  //     }
-  //   },
-  //   "map2": {
-  //     "": {
-  //       "map1": {
-  //         "nested_key1": {
-  //           "foo": "nested_foo"
-  //         }
-  //       }
-  //     }
-  //   },
-  //   "map3": {
-  //     "0": "one one one"
-  //   },
-  //   "map4": {
-  //     "false": "bool"
-  //   }
-  // }
-  out.add_map1()->mutable_value()->set_foo("foovalue");
-  MapOut* nested = out.add_map2()->mutable_value();
-  (*nested->mutable_map1())["nested_key1"].set_foo("nested_foo");
-  out.add_map3()->set_value("one one one");
-  out.add_map4()->set_value("bool");
-
-  ow_.StartObject("")
-      ->StartObject("map1")
-      ->StartObject("")
-      ->RenderString("foo", "foovalue")
-      ->EndObject()
-      ->EndObject()
-      ->StartObject("map2")
-      ->StartObject("")
-      ->StartObject("map1")
-      ->StartObject("nested_key1")
-      ->RenderString("foo", "nested_foo")
-      ->EndObject()
-      ->EndObject()
-      ->EndObject()
-      ->EndObject()
-      ->StartObject("map3")
-      ->RenderString("0", "one one one")
-      ->EndObject()
-      ->StartObject("map4")
-      ->RenderString("false", "bool")
-      ->EndObject()
-      ->EndObject();
-
-  DoTest(out, MapOut::descriptor());
-}
-
-class ProtostreamObjectSourceAnysTest : public ProtostreamObjectSourceTest {
- protected:
-  ProtostreamObjectSourceAnysTest() {
-    helper_.ResetTypeInfo({AnyOut::descriptor(), Book::descriptor(),
-                           google::protobuf::Any::descriptor()});
-  }
-};
-
-INSTANTIATE_TEST_SUITE_P(DifferentTypeInfoSourceTest,
-                         ProtostreamObjectSourceAnysTest,
-                         ::testing::Values(
-                             testing::USE_TYPE_RESOLVER));
-
-// Tests JSON any support.
-//
-// This is the example expected output.
-// {
-//   "any": {
-//     "@type": "type.googleapis.com/google.protobuf.testing.AnyM"
-//     "foo": "foovalue"
-//   }
-// }
-TEST_P(ProtostreamObjectSourceAnysTest, BasicAny) {
-  AnyOut out;
-  ::google::protobuf::Any* any = out.mutable_any();
-
-  AnyM m;
-  m.set_foo("foovalue");
-  any->PackFrom(m);
-
-  ow_.StartObject("")
-      ->StartObject("any")
-      ->RenderString("@type",
-                     "type.googleapis.com/proto_util_converter.testing.AnyM")
-      ->RenderString("foo", "foovalue")
-      ->EndObject()
-      ->EndObject();
-
-  DoTest(out, AnyOut::descriptor());
-}
-
-TEST_P(ProtostreamObjectSourceAnysTest, LowerCamelEnumOutputSnakeCase) {
-  AnyOut out;
-  ::google::protobuf::Any* any = out.mutable_any();
-
-  Book book;
-  book.set_type(Book::arts_and_photography);
-  any->PackFrom(book);
-
-  UseLowerCamelForEnums();
-
-  ow_.StartObject("")
-      ->StartObject("any")
-      ->RenderString("@type",
-                     "type.googleapis.com/proto_util_converter.testing.Book")
-      ->RenderString("type", "artsAndPhotography")
-      ->EndObject()
-      ->EndObject();
-
-  DoTest(out, AnyOut::descriptor());
-}
-
-TEST_P(ProtostreamObjectSourceAnysTest, UseIntsForEnumsTest) {
-  AnyOut out;
-  ::google::protobuf::Any* any = out.mutable_any();
-
-  Book book;
-  book.set_type(Book::ACTION_AND_ADVENTURE);
-  any->PackFrom(book);
-
-  UseIntsForEnums();
-
-  ow_.StartObject("")
-      ->StartObject("any")
-      ->RenderString("@type",
-                     "type.googleapis.com/proto_util_converter.testing.Book")
-      ->RenderInt32("type", 3)
-      ->EndObject()
-      ->EndObject();
-
-  DoTest(out, AnyOut::descriptor());
-}
-
-TEST_P(ProtostreamObjectSourceAnysTest, UsePreserveProtoFieldNames) {
-  AnyOut out;
-  ::google::protobuf::Any* any = out.mutable_any();
-
-  Book book;
-  book.set_snake_field("foo");
-  any->PackFrom(book);
-
-  UsePreserveProtoFieldNames();
-
-  ow_.StartObject("")
-      ->StartObject("any")
-      ->RenderString("@type",
-                     "type.googleapis.com/proto_util_converter.testing.Book")
-      ->RenderString("snake_field", "foo")
-      ->EndObject()
-      ->EndObject();
-
-  DoTest(out, AnyOut::descriptor());
-}
-
-TEST_P(ProtostreamObjectSourceAnysTest, RecursiveAny) {
-  AnyOut out;
-  ::google::protobuf::Any* any = out.mutable_any();
-  any->set_type_url("type.googleapis.com/google.protobuf.Any");
-
-  ::google::protobuf::Any nested_any;
-  nested_any.set_type_url(
-      "type.googleapis.com/proto_util_converter.testing.AnyM");
-
-  AnyM m;
-  m.set_foo("foovalue");
-  nested_any.set_value(m.SerializeAsString());
-
-  any->set_value(nested_any.SerializeAsString());
-
-  ow_.StartObject("")
-      ->StartObject("any")
-      ->RenderString("@type", "type.googleapis.com/google.protobuf.Any")
-      ->StartObject("value")
-      ->RenderString("@type",
-                     "type.googleapis.com/proto_util_converter.testing.AnyM")
-      ->RenderString("foo", "foovalue")
-      ->EndObject()
-      ->EndObject()
-      ->EndObject();
-
-  DoTest(out, AnyOut::descriptor());
-}
-
-TEST_P(ProtostreamObjectSourceAnysTest, DoubleRecursiveAny) {
-  AnyOut out;
-  ::google::protobuf::Any* any = out.mutable_any();
-  any->set_type_url("type.googleapis.com/google.protobuf.Any");
-
-  ::google::protobuf::Any nested_any;
-  nested_any.set_type_url("type.googleapis.com/google.protobuf.Any");
-
-  ::google::protobuf::Any second_nested_any;
-  second_nested_any.set_type_url(
-      "type.googleapis.com/proto_util_converter.testing.AnyM");
-
-  AnyM m;
-  m.set_foo("foovalue");
-  second_nested_any.set_value(m.SerializeAsString());
-  nested_any.set_value(second_nested_any.SerializeAsString());
-  any->set_value(nested_any.SerializeAsString());
-
-  ow_.StartObject("")
-      ->StartObject("any")
-      ->RenderString("@type", "type.googleapis.com/google.protobuf.Any")
-      ->StartObject("value")
-      ->RenderString("@type", "type.googleapis.com/google.protobuf.Any")
-      ->StartObject("value")
-      ->RenderString("@type",
-                     "type.googleapis.com/proto_util_converter.testing.AnyM")
-      ->RenderString("foo", "foovalue")
-      ->EndObject()
-      ->EndObject()
-      ->EndObject()
-      ->EndObject();
-
-  DoTest(out, AnyOut::descriptor());
-}
-
-TEST_P(ProtostreamObjectSourceAnysTest, EmptyAnyOutputsEmptyObject) {
-  AnyOut out;
-  out.mutable_any();
-
-  ow_.StartObject("")->StartObject("any")->EndObject()->EndObject();
-
-  DoTest(out, AnyOut::descriptor());
-}
-
-TEST_P(ProtostreamObjectSourceAnysTest, EmptyWithTypeAndNoValueOutputsType) {
-  AnyOut out;
-  out.mutable_any()->set_type_url("foo.googleapis.com/my.Type");
-
-  ow_.StartObject("")
-      ->StartObject("any")
-      ->RenderString("@type", "foo.googleapis.com/my.Type")
-      ->EndObject()
-      ->EndObject();
-
-  DoTest(out, AnyOut::descriptor());
-}
-
-TEST_P(ProtostreamObjectSourceAnysTest, MissingTypeUrlError) {
-  AnyOut out;
-  ::google::protobuf::Any* any = out.mutable_any();
-
-  AnyM m;
-  m.set_foo("foovalue");
-  any->set_value(m.SerializeAsString());
-
-  // We start the "AnyOut" part and then fail when we hit the Any object.
-  ow_.StartObject("");
-
-  util::Status status = ExecuteTest(out, AnyOut::descriptor());
-  EXPECT_TRUE(util::IsInternal(status));
-}
-
-TEST_P(ProtostreamObjectSourceAnysTest, UnknownTypeServiceError) {
-  AnyOut out;
-  ::google::protobuf::Any* any = out.mutable_any();
-  any->set_type_url("foo.googleapis.com/my.own.Type");
-
-  AnyM m;
-  m.set_foo("foovalue");
-  any->set_value(m.SerializeAsString());
-
-  // We start the "AnyOut" part and then fail when we hit the Any object.
-  ow_.StartObject("");
-
-  util::Status status = ExecuteTest(out, AnyOut::descriptor());
-  EXPECT_TRUE(util::IsInternal(status));
-}
-
-TEST_P(ProtostreamObjectSourceAnysTest, UnknownTypeError) {
-  AnyOut out;
-  ::google::protobuf::Any* any = out.mutable_any();
-  any->set_type_url("type.googleapis.com/unknown.Type");
-
-  AnyM m;
-  m.set_foo("foovalue");
-  any->set_value(m.SerializeAsString());
-
-  // We start the "AnyOut" part and then fail when we hit the Any object.
-  ow_.StartObject("");
-
-  util::Status status = ExecuteTest(out, AnyOut::descriptor());
-  EXPECT_TRUE(util::IsInternal(status));
-}
-
-class ProtostreamObjectSourceStructTest : public ProtostreamObjectSourceTest {
- protected:
-  ProtostreamObjectSourceStructTest() {
-    helper_.ResetTypeInfo(StructType::descriptor(),
-                          google::protobuf::Struct::descriptor());
-  }
-};
-
-INSTANTIATE_TEST_SUITE_P(DifferentTypeInfoSourceTest,
-                         ProtostreamObjectSourceStructTest,
-                         ::testing::Values(
-                             testing::USE_TYPE_RESOLVER));
-
-// Tests struct
-//
-//  "object": {
-//    "k1": 123,
-//    "k2": true
-//  }
-TEST_P(ProtostreamObjectSourceStructTest, StructRenderSuccess) {
-  StructType out;
-  google::protobuf::Struct* s = out.mutable_object();
-  s->mutable_fields()->operator[]("k1").set_number_value(123);
-  s->mutable_fields()->operator[]("k2").set_bool_value(true);
-
-  ow_.StartObject("")
-      ->StartObject("object")
-      ->RenderDouble("k1", 123)
-      ->RenderBool("k2", true)
-      ->EndObject()
-      ->EndObject();
-
-  DoTest(out, StructType::descriptor());
-}
-
-TEST_P(ProtostreamObjectSourceStructTest, MissingValueSkipsField) {
-  StructType out;
-  google::protobuf::Struct* s = out.mutable_object();
-  s->mutable_fields()->operator[]("k1");
-
-  ow_.StartObject("")->StartObject("object")->EndObject()->EndObject();
-
-  DoTest(out, StructType::descriptor());
-}
-
-class ProtostreamObjectSourceFieldMaskTest
-    : public ProtostreamObjectSourceTest {
- protected:
-  ProtostreamObjectSourceFieldMaskTest() {
-    helper_.ResetTypeInfo(FieldMaskTest::descriptor(),
-                          google::protobuf::FieldMask::descriptor());
-  }
-};
-
-INSTANTIATE_TEST_SUITE_P(DifferentTypeInfoSourceTest,
-                         ProtostreamObjectSourceFieldMaskTest,
-                         ::testing::Values(
-                             testing::USE_TYPE_RESOLVER));
-
-TEST_P(ProtostreamObjectSourceFieldMaskTest, FieldMaskRenderSuccess) {
-  FieldMaskTest out;
-  out.set_id("1");
-  out.mutable_single_mask()->add_paths("path1");
-  out.mutable_single_mask()->add_paths("snake_case_path2");
-  ::google::protobuf::FieldMask* mask = out.add_repeated_mask();
-  mask->add_paths("path3");
-  mask = out.add_repeated_mask();
-  mask->add_paths("snake_case_path4");
-  mask->add_paths("path5");
-  NestedFieldMask* nested = out.add_nested_mask();
-  nested->set_data("data");
-  nested->mutable_single_mask()->add_paths("nested.path1");
-  nested->mutable_single_mask()->add_paths("nested_field.snake_case_path2");
-  mask = nested->add_repeated_mask();
-  mask->add_paths("nested_field.path3");
-  mask->add_paths("nested.snake_case_path4");
-  mask = nested->add_repeated_mask();
-  mask->add_paths("nested.path5");
-  mask = nested->add_repeated_mask();
-  mask->add_paths(
-      "snake_case.map_field[\"map_key_should_be_ignored\"].nested_snake_case."
-      "map_field[\"map_key_sho\\\"uld_be_ignored\"]");
-
-  ow_.StartObject("")
-      ->RenderString("id", "1")
-      ->RenderString("singleMask", "path1,snakeCasePath2")
-      ->StartList("repeatedMask")
-      ->RenderString("", "path3")
-      ->RenderString("", "snakeCasePath4,path5")
-      ->EndList()
-      ->StartList("nestedMask")
-      ->StartObject("")
-      ->RenderString("data", "data")
-      ->RenderString("singleMask", "nested.path1,nestedField.snakeCasePath2")
-      ->StartList("repeatedMask")
-      ->RenderString("", "nestedField.path3,nested.snakeCasePath4")
-      ->RenderString("", "nested.path5")
-      ->RenderString("",
-                     "snakeCase.mapField[\"map_key_should_be_ignored\"]."
-                     "nestedSnakeCase.mapField[\"map_key_sho\\\"uld_be_"
-                     "ignored\"]")
-      ->EndList()
-      ->EndObject()
-      ->EndList()
-      ->EndObject();
-
-  DoTest(out, FieldMaskTest::descriptor());
-}
-
-class ProtostreamObjectSourceTimestampTest
-    : public ProtostreamObjectSourceTest {
- protected:
-  ProtostreamObjectSourceTimestampTest() {
-    helper_.ResetTypeInfo(TimestampDuration::descriptor());
-  }
-};
-
-INSTANTIATE_TEST_SUITE_P(DifferentTypeInfoSourceTest,
-                         ProtostreamObjectSourceTimestampTest,
-                         ::testing::Values(
-                             testing::USE_TYPE_RESOLVER));
-
-TEST_P(ProtostreamObjectSourceTimestampTest, InvalidTimestampBelowMinTest) {
-  TimestampDuration out;
-  google::protobuf::Timestamp* ts = out.mutable_ts();
-  // Min allowed seconds - 1
-  ts->set_seconds(kTimestampMinSeconds - 1);
-  ow_.StartObject("");
-
-  util::Status status = ExecuteTest(out, TimestampDuration::descriptor());
-  EXPECT_TRUE(util::IsInternal(status));
-}
-
-TEST_P(ProtostreamObjectSourceTimestampTest, InvalidTimestampAboveMaxTest) {
-  TimestampDuration out;
-  google::protobuf::Timestamp* ts = out.mutable_ts();
-  // Max allowed seconds + 1
-  ts->set_seconds(kTimestampMaxSeconds + 1);
-  ow_.StartObject("");
-
-  util::Status status = ExecuteTest(out, TimestampDuration::descriptor());
-  EXPECT_TRUE(util::IsInternal(status));
-}
-
-TEST_P(ProtostreamObjectSourceTimestampTest, InvalidDurationBelowMinTest) {
-  TimestampDuration out;
-  google::protobuf::Duration* dur = out.mutable_dur();
-  // Min allowed seconds - 1
-  dur->set_seconds(kDurationMinSeconds - 1);
-  ow_.StartObject("");
-
-  util::Status status = ExecuteTest(out, TimestampDuration::descriptor());
-  EXPECT_TRUE(util::IsInternal(status));
-}
-
-TEST_P(ProtostreamObjectSourceTimestampTest, InvalidDurationAboveMaxTest) {
-  TimestampDuration out;
-  google::protobuf::Duration* dur = out.mutable_dur();
-  // Min allowed seconds + 1
-  dur->set_seconds(kDurationMaxSeconds + 1);
-  ow_.StartObject("");
-
-  util::Status status = ExecuteTest(out, TimestampDuration::descriptor());
-  EXPECT_TRUE(util::IsInternal(status));
-}
-
-TEST_P(ProtostreamObjectSourceTimestampTest, TimestampDurationDefaultValue) {
-  TimestampDuration out;
-  out.mutable_ts()->set_seconds(0);
-  out.mutable_dur()->set_seconds(0);
-
-  ow_.StartObject("")
-      ->RenderString("ts", "1970-01-01T00:00:00Z")
-      ->RenderString("dur", "0s")
-      ->EndObject();
-
-  DoTest(out, TimestampDuration::descriptor());
-}
-
-
-
-}  // namespace converter
-}  // namespace util
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/util/internal/protostream_objectwriter.cc b/libs/protobuf/src/google/protobuf/util/internal/protostream_objectwriter.cc
deleted file mode 100644
index ecb219e..0000000
--- a/libs/protobuf/src/google/protobuf/util/internal/protostream_objectwriter.cc
+++ /dev/null
@@ -1,1401 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <google/protobuf/util/internal/protostream_objectwriter.h>
-
-#include <cstdint>
-#include <functional>
-#include <stack>
-#include <unordered_map>
-#include <unordered_set>
-
-#include <google/protobuf/stubs/once.h>
-#include <google/protobuf/wire_format_lite.h>
-#include <google/protobuf/stubs/strutil.h>
-#include <google/protobuf/stubs/status.h>
-#include <google/protobuf/stubs/statusor.h>
-#include <google/protobuf/stubs/time.h>
-#include <google/protobuf/util/internal/constants.h>
-#include <google/protobuf/util/internal/field_mask_utility.h>
-#include <google/protobuf/util/internal/object_location_tracker.h>
-#include <google/protobuf/util/internal/utility.h>
-#include <google/protobuf/stubs/map_util.h>
-
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-namespace util {
-namespace converter {
-
-using util::Status;
-using ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite;
-using std::placeholders::_1;
-
-
-ProtoStreamObjectWriter::ProtoStreamObjectWriter(
-    TypeResolver* type_resolver, const google::protobuf::Type& type,
-    strings::ByteSink* output, ErrorListener* listener,
-    const ProtoStreamObjectWriter::Options& options)
-    : ProtoWriter(type_resolver, type, output, listener),
-      master_type_(type),
-      current_(nullptr),
-      options_(options) {
-  set_ignore_unknown_fields(options_.ignore_unknown_fields);
-  set_ignore_unknown_enum_values(options_.ignore_unknown_enum_values);
-  set_use_lower_camel_for_enums(options_.use_lower_camel_for_enums);
-  set_case_insensitive_enum_parsing(options_.case_insensitive_enum_parsing);
-  set_use_json_name_in_missing_fields(options.use_json_name_in_missing_fields);
-}
-
-ProtoStreamObjectWriter::ProtoStreamObjectWriter(
-    const TypeInfo* typeinfo, const google::protobuf::Type& type,
-    strings::ByteSink* output, ErrorListener* listener,
-    const ProtoStreamObjectWriter::Options& options)
-    : ProtoWriter(typeinfo, type, output, listener),
-      master_type_(type),
-      current_(nullptr),
-      options_(options) {
-  set_ignore_unknown_fields(options_.ignore_unknown_fields);
-  set_use_lower_camel_for_enums(options.use_lower_camel_for_enums);
-  set_case_insensitive_enum_parsing(options_.case_insensitive_enum_parsing);
-  set_use_json_name_in_missing_fields(options.use_json_name_in_missing_fields);
-}
-
-ProtoStreamObjectWriter::ProtoStreamObjectWriter(
-    const TypeInfo* typeinfo, const google::protobuf::Type& type,
-    strings::ByteSink* output, ErrorListener* listener)
-    : ProtoWriter(typeinfo, type, output, listener),
-      master_type_(type),
-      current_(nullptr),
-      options_(ProtoStreamObjectWriter::Options::Defaults()) {}
-
-ProtoStreamObjectWriter::~ProtoStreamObjectWriter() {
-  if (current_ == nullptr) return;
-  // Cleanup explicitly in order to avoid destructor stack overflow when input
-  // is deeply nested.
-  // Cast to BaseElement to avoid doing additional checks (like missing fields)
-  // during pop().
-  std::unique_ptr<BaseElement> element(
-      static_cast<BaseElement*>(current_.get())->pop<BaseElement>());
-  while (element != nullptr) {
-    element.reset(element->pop<BaseElement>());
-  }
-}
-
-namespace {
-// Utility method to split a string representation of Timestamp or Duration and
-// return the parts.
-void SplitSecondsAndNanos(StringPiece input, StringPiece* seconds,
-                          StringPiece* nanos) {
-  size_t idx = input.rfind('.');
-  if (idx != std::string::npos) {
-    *seconds = input.substr(0, idx);
-    *nanos = input.substr(idx + 1);
-  } else {
-    *seconds = input;
-    *nanos = StringPiece();
-  }
-}
-
-Status GetNanosFromStringPiece(StringPiece s_nanos,
-                               const char* parse_failure_message,
-                               const char* exceeded_limit_message,
-                               int32_t* nanos) {
-  *nanos = 0;
-
-  // Count the number of leading 0s and consume them.
-  int num_leading_zeros = 0;
-  while (s_nanos.Consume("0")) {
-    num_leading_zeros++;
-  }
-  int32_t i_nanos = 0;
-  // 's_nanos' contains fractional seconds -- i.e. 'nanos' is equal to
-  // "0." + s_nanos.ToString() seconds. An int32_t is used for the
-  // conversion to 'nanos', rather than a double, so that there is no
-  // loss of precision.
-  if (!s_nanos.empty() && !safe_strto32(s_nanos, &i_nanos)) {
-    return util::InvalidArgumentError(parse_failure_message);
-  }
-  if (i_nanos > kNanosPerSecond || i_nanos < 0) {
-    return util::InvalidArgumentError(exceeded_limit_message);
-  }
-  // s_nanos should only have digits. No whitespace.
-  if (s_nanos.find_first_not_of("0123456789") != StringPiece::npos) {
-    return util::InvalidArgumentError(parse_failure_message);
-  }
-
-  if (i_nanos > 0) {
-    // 'scale' is the number of digits to the right of the decimal
-    // point in "0." + s_nanos.ToString()
-    int32_t scale = num_leading_zeros + s_nanos.size();
-    // 'conversion' converts i_nanos into nanoseconds.
-    // conversion = kNanosPerSecond / static_cast<int32_t>(std::pow(10, scale))
-    // For efficiency, we precompute the conversion factor.
-    int32_t conversion = 0;
-    switch (scale) {
-      case 1:
-        conversion = 100000000;
-        break;
-      case 2:
-        conversion = 10000000;
-        break;
-      case 3:
-        conversion = 1000000;
-        break;
-      case 4:
-        conversion = 100000;
-        break;
-      case 5:
-        conversion = 10000;
-        break;
-      case 6:
-        conversion = 1000;
-        break;
-      case 7:
-        conversion = 100;
-        break;
-      case 8:
-        conversion = 10;
-        break;
-      case 9:
-        conversion = 1;
-        break;
-      default:
-        return util::InvalidArgumentError(exceeded_limit_message);
-    }
-    *nanos = i_nanos * conversion;
-  }
-
-  return Status();
-}
-
-}  // namespace
-
-ProtoStreamObjectWriter::AnyWriter::AnyWriter(ProtoStreamObjectWriter* parent)
-    : parent_(parent),
-      ow_(),
-      invalid_(false),
-      data_(),
-      output_(&data_),
-      depth_(0),
-      is_well_known_type_(false),
-      well_known_type_render_(nullptr) {}
-
-ProtoStreamObjectWriter::AnyWriter::~AnyWriter() {}
-
-void ProtoStreamObjectWriter::AnyWriter::StartObject(StringPiece name) {
-  ++depth_;
-  // If an object writer is absent, that means we have not called StartAny()
-  // before reaching here, which happens when we have data before the "@type"
-  // field.
-  if (ow_ == nullptr) {
-    // Save data before the "@type" field for later replay.
-    uninterpreted_events_.push_back(Event(Event::START_OBJECT, name));
-  } else if (is_well_known_type_ && depth_ == 1) {
-    // For well-known types, the only other field besides "@type" should be a
-    // "value" field.
-    if (name != "value" && !invalid_) {
-      parent_->InvalidValue("Any",
-                            "Expect a \"value\" field for well-known types.");
-      invalid_ = true;
-    }
-    ow_->StartObject("");
-  } else {
-    // Forward the call to the child writer if:
-    //   1. the type is not a well-known type.
-    //   2. or, we are in a nested Any, Struct, or Value object.
-    ow_->StartObject(name);
-  }
-}
-
-bool ProtoStreamObjectWriter::AnyWriter::EndObject() {
-  --depth_;
-  if (ow_ == nullptr) {
-    if (depth_ >= 0) {
-      // Save data before the "@type" field for later replay.
-      uninterpreted_events_.push_back(Event(Event::END_OBJECT));
-    }
-  } else if (depth_ >= 0 || !is_well_known_type_) {
-    // As long as depth_ >= 0, we know we haven't reached the end of Any.
-    // Propagate these EndObject() calls to the contained ow_. For regular
-    // message types, we propagate the end of Any as well.
-    ow_->EndObject();
-  }
-  // A negative depth_ implies that we have reached the end of Any
-  // object. Now we write out its contents.
-  if (depth_ < 0) {
-    WriteAny();
-    return false;
-  }
-  return true;
-}
-
-void ProtoStreamObjectWriter::AnyWriter::StartList(StringPiece name) {
-  ++depth_;
-  if (ow_ == nullptr) {
-    // Save data before the "@type" field for later replay.
-    uninterpreted_events_.push_back(Event(Event::START_LIST, name));
-  } else if (is_well_known_type_ && depth_ == 1) {
-    if (name != "value" && !invalid_) {
-      parent_->InvalidValue("Any",
-                            "Expect a \"value\" field for well-known types.");
-      invalid_ = true;
-    }
-    ow_->StartList("");
-  } else {
-    ow_->StartList(name);
-  }
-}
-
-void ProtoStreamObjectWriter::AnyWriter::EndList() {
-  --depth_;
-  if (depth_ < 0) {
-    GOOGLE_LOG(DFATAL) << "Mismatched EndList found, should not be possible";
-    depth_ = 0;
-  }
-  if (ow_ == nullptr) {
-    // Save data before the "@type" field for later replay.
-    uninterpreted_events_.push_back(Event(Event::END_LIST));
-  } else {
-    ow_->EndList();
-  }
-}
-
-void ProtoStreamObjectWriter::AnyWriter::RenderDataPiece(
-    StringPiece name, const DataPiece& value) {
-  // Start an Any only at depth_ 0. Other RenderDataPiece calls with "@type"
-  // should go to the contained ow_ as they indicate nested Anys.
-  if (depth_ == 0 && ow_ == nullptr && name == "@type") {
-    StartAny(value);
-  } else if (ow_ == nullptr) {
-    // Save data before the "@type" field.
-    uninterpreted_events_.push_back(Event(name, value));
-  } else if (depth_ == 0 && is_well_known_type_) {
-    if (name != "value" && !invalid_) {
-      parent_->InvalidValue("Any",
-                            "Expect a \"value\" field for well-known types.");
-      invalid_ = true;
-    }
-    if (well_known_type_render_ == nullptr) {
-      // Only Any and Struct don't have a special type render but both of
-      // them expect a JSON object (i.e., a StartObject() call).
-      if (value.type() != DataPiece::TYPE_NULL && !invalid_) {
-        parent_->InvalidValue("Any", "Expect a JSON object.");
-        invalid_ = true;
-      }
-    } else {
-      ow_->ProtoWriter::StartObject("");
-      Status status = (*well_known_type_render_)(ow_.get(), value);
-      if (!status.ok()) ow_->InvalidValue("Any", status.message());
-      ow_->ProtoWriter::EndObject();
-    }
-  } else {
-    ow_->RenderDataPiece(name, value);
-  }
-}
-
-void ProtoStreamObjectWriter::AnyWriter::StartAny(const DataPiece& value) {
-  // Figure out the type url. This is a copy-paste from WriteString but we also
-  // need the value, so we can't just call through to that.
-  if (value.type() == DataPiece::TYPE_STRING) {
-    type_url_ = std::string(value.str());
-  } else {
-    util::StatusOr<std::string> s = value.ToString();
-    if (!s.ok()) {
-      parent_->InvalidValue("String", s.status().message());
-      invalid_ = true;
-      return;
-    }
-    type_url_ = s.value();
-  }
-  // Resolve the type url, and report an error if we failed to resolve it.
-  util::StatusOr<const google::protobuf::Type*> resolved_type =
-      parent_->typeinfo()->ResolveTypeUrl(type_url_);
-  if (!resolved_type.ok()) {
-    parent_->InvalidValue("Any", resolved_type.status().message());
-    invalid_ = true;
-    return;
-  }
-  // At this point, type is never null.
-  const google::protobuf::Type* type = resolved_type.value();
-
-  well_known_type_render_ = FindTypeRenderer(type_url_);
-  if (well_known_type_render_ != nullptr ||
-      // Explicitly list Any and Struct here because they don't have a
-      // custom renderer.
-      type->name() == kAnyType || type->name() == kStructType) {
-    is_well_known_type_ = true;
-  }
-
-  // Create our object writer and initialize it with the first StartObject
-  // call.
-  ow_.reset(new ProtoStreamObjectWriter(parent_->typeinfo(), *type, &output_,
-                                        parent_->listener(),
-                                        parent_->options_));
-
-  // Don't call StartObject() for well-known types yet. Depending on the
-  // type of actual data, we may not need to call StartObject(). For
-  // example:
-  // {
-  //   "@type": "type.googleapis.com/google.protobuf.Value",
-  //   "value": [1, 2, 3],
-  // }
-  // With the above JSON representation, we will only call StartList() on the
-  // contained ow_.
-  if (!is_well_known_type_) {
-    ow_->StartObject("");
-  }
-
-  // Now we know the proto type and can interpret all data fields we gathered
-  // before the "@type" field.
-  for (int i = 0; i < uninterpreted_events_.size(); ++i) {
-    uninterpreted_events_[i].Replay(this);
-  }
-}
-
-void ProtoStreamObjectWriter::AnyWriter::WriteAny() {
-  if (ow_ == nullptr) {
-    if (uninterpreted_events_.empty()) {
-      // We never got any content, so just return immediately, which is
-      // equivalent to writing an empty Any.
-      return;
-    } else {
-      // There are uninterpreted data, but we never got a "@type" field.
-      if (!invalid_) {
-        parent_->InvalidValue("Any",
-                              StrCat("Missing @type for any field in ",
-                                           parent_->master_type_.name()));
-        invalid_ = true;
-      }
-      return;
-    }
-  }
-  // Render the type_url and value fields directly to the stream.
-  // type_url has tag 1 and value has tag 2.
-  WireFormatLite::WriteString(1, type_url_, parent_->stream());
-  if (!data_.empty()) {
-    WireFormatLite::WriteBytes(2, data_, parent_->stream());
-  }
-}
-
-void ProtoStreamObjectWriter::AnyWriter::Event::Replay(
-    AnyWriter* writer) const {
-  switch (type_) {
-    case START_OBJECT:
-      writer->StartObject(name_);
-      break;
-    case END_OBJECT:
-      writer->EndObject();
-      break;
-    case START_LIST:
-      writer->StartList(name_);
-      break;
-    case END_LIST:
-      writer->EndList();
-      break;
-    case RENDER_DATA_PIECE:
-      writer->RenderDataPiece(name_, value_);
-      break;
-  }
-}
-
-void ProtoStreamObjectWriter::AnyWriter::Event::DeepCopy() {
-  // DataPiece only contains a string reference. To make sure the referenced
-  // string value stays valid, we make a copy of the string value and update
-  // DataPiece to reference our own copy.
-  if (value_.type() == DataPiece::TYPE_STRING) {
-    StrAppend(&value_storage_, value_.str());
-    value_ = DataPiece(value_storage_, value_.use_strict_base64_decoding());
-  } else if (value_.type() == DataPiece::TYPE_BYTES) {
-    value_storage_ = value_.ToBytes().value();
-    value_ =
-        DataPiece(value_storage_, true, value_.use_strict_base64_decoding());
-  }
-}
-
-ProtoStreamObjectWriter::Item::Item(ProtoStreamObjectWriter* enclosing,
-                                    ItemType item_type, bool is_placeholder,
-                                    bool is_list)
-    : BaseElement(nullptr),
-      ow_(enclosing),
-      any_(),
-      item_type_(item_type),
-      is_placeholder_(is_placeholder),
-      is_list_(is_list) {
-  if (item_type_ == ANY) {
-    any_.reset(new AnyWriter(ow_));
-  }
-  if (item_type == MAP) {
-    map_keys_.reset(new std::unordered_set<std::string>);
-  }
-}
-
-ProtoStreamObjectWriter::Item::Item(ProtoStreamObjectWriter::Item* parent,
-                                    ItemType item_type, bool is_placeholder,
-                                    bool is_list)
-    : BaseElement(parent),
-      ow_(this->parent()->ow_),
-      any_(),
-      item_type_(item_type),
-      is_placeholder_(is_placeholder),
-      is_list_(is_list) {
-  if (item_type == ANY) {
-    any_.reset(new AnyWriter(ow_));
-  }
-  if (item_type == MAP) {
-    map_keys_.reset(new std::unordered_set<std::string>);
-  }
-}
-
-bool ProtoStreamObjectWriter::Item::InsertMapKeyIfNotPresent(
-    StringPiece map_key) {
-  return InsertIfNotPresent(map_keys_.get(), std::string(map_key));
-}
-
-
-ProtoStreamObjectWriter* ProtoStreamObjectWriter::StartObject(
-    StringPiece name) {
-  if (invalid_depth() > 0) {
-    IncrementInvalidDepth();
-    return this;
-  }
-
-  // Starting the root message. Create the root Item and return.
-  // ANY message type does not need special handling, just set the ItemType
-  // to ANY.
-  if (current_ == nullptr) {
-    ProtoWriter::StartObject(name);
-    current_.reset(new Item(
-        this, master_type_.name() == kAnyType ? Item::ANY : Item::MESSAGE,
-        false, false));
-
-    // If master type is a special type that needs extra values to be written to
-    // stream, we write those values.
-    if (master_type_.name() == kStructType) {
-      // Struct has a map<string, Value> field called "fields".
-      // https://github.com/protocolbuffers/protobuf/blob/main/src/google/protobuf/struct.proto
-      // "fields": [
-      Push("fields", Item::MAP, true, true);
-      return this;
-    }
-
-    if (master_type_.name() == kStructValueType) {
-      // We got a StartObject call with google.protobuf.Value field. The only
-      // object within that type is a struct type. So start a struct.
-      //
-      // The struct field in Value type is named "struct_value"
-      // https://github.com/protocolbuffers/protobuf/blob/main/src/google/protobuf/struct.proto
-      // Also start the map field "fields" within the struct.
-      // "struct_value": {
-      //   "fields": [
-      Push("struct_value", Item::MESSAGE, true, false);
-      Push("fields", Item::MAP, true, true);
-      return this;
-    }
-
-    if (master_type_.name() == kStructListValueType) {
-      InvalidValue(kStructListValueType,
-                   "Cannot start root message with ListValue.");
-    }
-
-    return this;
-  }
-
-  // Send all ANY events to AnyWriter.
-  if (current_->IsAny()) {
-    current_->any()->StartObject(name);
-    return this;
-  }
-
-  // If we are within a map, we render name as keys and send StartObject to the
-  // value field.
-  if (current_->IsMap()) {
-    if (!ValidMapKey(name)) {
-      IncrementInvalidDepth();
-      return this;
-    }
-
-    // Map is a repeated field of message type with a "key" and a "value" field.
-    // https://developers.google.com/protocol-buffers/docs/proto3?hl=en#maps
-    // message MapFieldEntry {
-    //   key_type key = 1;
-    //   value_type value = 2;
-    // }
-    //
-    // repeated MapFieldEntry map_field = N;
-    //
-    // That means, we render the following element within a list (hence no
-    // name):
-    // { "key": "<name>", "value": {
-    Push("", Item::MESSAGE, false, false);
-    ProtoWriter::RenderDataPiece("key",
-                                 DataPiece(name, use_strict_base64_decoding()));
-    Push("value", IsAny(*Lookup("value")) ? Item::ANY : Item::MESSAGE, true,
-         false);
-
-    // Make sure we are valid so far after starting map fields.
-    if (invalid_depth() > 0) return this;
-
-    // If top of stack is g.p.Struct type, start the struct the map field within
-    // it.
-    if (element() != nullptr && IsStruct(*element()->parent_field())) {
-      // Render "fields": [
-      Push("fields", Item::MAP, true, true);
-      return this;
-    }
-
-    // If top of stack is g.p.Value type, start the Struct within it.
-    if (element() != nullptr && IsStructValue(*element()->parent_field())) {
-      // Render
-      // "struct_value": {
-      //   "fields": [
-      Push("struct_value", Item::MESSAGE, true, false);
-      Push("fields", Item::MAP, true, true);
-    }
-    return this;
-  }
-
-  const google::protobuf::Field* field = BeginNamed(name, false);
-
-  if (field == nullptr) return this;
-
-  // Legacy JSON map is a list of key value pairs. Starts a map entry object.
-  if (options_.use_legacy_json_map_format && name.empty()) {
-    Push(name, IsAny(*field) ? Item::ANY : Item::MESSAGE, false, false);
-    return this;
-  }
-
-  if (IsMap(*field)) {
-    // Begin a map. A map is triggered by a StartObject() call if the current
-    // field has a map type.
-    // A map type is always repeated, hence set is_list to true.
-    // Render
-    // "<name>": [
-    Push(name, Item::MAP, false, true);
-    return this;
-  }
-
-  if (options_.disable_implicit_message_list) {
-    // If the incoming object is repeated, the top-level object on stack should
-    // be list. Report an error otherwise.
-    if (IsRepeated(*field) && !current_->is_list()) {
-      IncrementInvalidDepth();
-
-      if (!options_.suppress_implicit_message_list_error) {
-        InvalidValue(
-            field->name(),
-            "Starting an object in a repeated field but the parent object "
-            "is not a list");
-      }
-      return this;
-    }
-  }
-
-  if (IsStruct(*field)) {
-    // Start a struct object.
-    // Render
-    // "<name>": {
-    //   "fields": {
-    Push(name, Item::MESSAGE, false, false);
-    Push("fields", Item::MAP, true, true);
-    return this;
-  }
-
-  if (IsStructValue(*field)) {
-    // We got a StartObject call with google.protobuf.Value field.  The only
-    // object within that type is a struct type. So start a struct.
-    // Render
-    // "<name>": {
-    //   "struct_value": {
-    //     "fields": {
-    Push(name, Item::MESSAGE, false, false);
-    Push("struct_value", Item::MESSAGE, true, false);
-    Push("fields", Item::MAP, true, true);
-    return this;
-  }
-
-  if (field->kind() != google::protobuf::Field::TYPE_GROUP &&
-      field->kind() != google::protobuf::Field::TYPE_MESSAGE) {
-    IncrementInvalidDepth();
-    if (!options_.suppress_object_to_scalar_error) {
-      InvalidValue(field->name(), "Starting an object on a scalar field");
-    }
-
-    return this;
-  }
-
-  // A regular message type. Pass it directly to ProtoWriter.
-  // Render
-  // "<name>": {
-  Push(name, IsAny(*field) ? Item::ANY : Item::MESSAGE, false, false);
-  return this;
-}
-
-ProtoStreamObjectWriter* ProtoStreamObjectWriter::EndObject() {
-  if (invalid_depth() > 0) {
-    DecrementInvalidDepth();
-    return this;
-  }
-
-  if (current_ == nullptr) return this;
-
-  if (current_->IsAny()) {
-    if (current_->any()->EndObject()) return this;
-  }
-
-  Pop();
-
-  return this;
-}
-
-
-ProtoStreamObjectWriter* ProtoStreamObjectWriter::StartList(
-    StringPiece name) {
-  if (invalid_depth() > 0) {
-    IncrementInvalidDepth();
-    return this;
-  }
-
-  // Since we cannot have a top-level repeated item in protobuf, the only way
-  // this is valid is if we start a special type google.protobuf.ListValue or
-  // google.protobuf.Value.
-  if (current_ == nullptr) {
-    if (!name.empty()) {
-      InvalidName(name, "Root element should not be named.");
-      IncrementInvalidDepth();
-      return this;
-    }
-
-    // If master type is a special type that needs extra values to be written to
-    // stream, we write those values.
-    if (master_type_.name() == kStructValueType) {
-      // We got a StartList with google.protobuf.Value master type. This means
-      // we have to start the "list_value" within google.protobuf.Value.
-      //
-      // See
-      // https://github.com/protocolbuffers/protobuf/blob/main/src/google/protobuf/struct.proto
-      //
-      // Render
-      // "<name>": {
-      //   "list_value": {
-      //     "values": [  // Start this list.
-      ProtoWriter::StartObject(name);
-      current_.reset(new Item(this, Item::MESSAGE, false, false));
-      Push("list_value", Item::MESSAGE, true, false);
-      Push("values", Item::MESSAGE, true, true);
-      return this;
-    }
-
-    if (master_type_.name() == kStructListValueType) {
-      // We got a StartList with google.protobuf.ListValue master type. This
-      // means we have to start the "values" within google.protobuf.ListValue.
-      //
-      // Render
-      // "<name>": {
-      //   "values": [  // Start this list.
-      ProtoWriter::StartObject(name);
-      current_.reset(new Item(this, Item::MESSAGE, false, false));
-      Push("values", Item::MESSAGE, true, true);
-      return this;
-    }
-
-    // Send the event to ProtoWriter so proper errors can be reported.
-    //
-    // Render a regular list:
-    // "<name>": [
-    ProtoWriter::StartList(name);
-    current_.reset(new Item(this, Item::MESSAGE, false, true));
-    return this;
-  }
-
-  if (current_->IsAny()) {
-    current_->any()->StartList(name);
-    return this;
-  }
-
-  // If the top of stack is a map, we are starting a list value within a map.
-  // Since map does not allow repeated values, this can only happen when the map
-  // value is of a special type that renders a list in JSON.  These can be one
-  // of 3 cases:
-  // i. We are rendering a list value within google.protobuf.Struct
-  // ii. We are rendering a list value within google.protobuf.Value
-  // iii. We are rendering a list value with type google.protobuf.ListValue.
-  if (current_->IsMap()) {
-    if (!ValidMapKey(name)) {
-      IncrementInvalidDepth();
-      return this;
-    }
-
-    // Start the repeated map entry object.
-    // Render
-    // { "key": "<name>", "value": {
-    Push("", Item::MESSAGE, false, false);
-    ProtoWriter::RenderDataPiece("key",
-                                 DataPiece(name, use_strict_base64_decoding()));
-    Push("value", Item::MESSAGE, true, false);
-
-    // Make sure we are valid after pushing all above items.
-    if (invalid_depth() > 0) return this;
-
-    // case i and ii above. Start "list_value" field within g.p.Value
-    if (element() != nullptr && element()->parent_field() != nullptr) {
-      // Render
-      // "list_value": {
-      //   "values": [  // Start this list
-      if (IsStructValue(*element()->parent_field())) {
-        Push("list_value", Item::MESSAGE, true, false);
-        Push("values", Item::MESSAGE, true, true);
-        return this;
-      }
-
-      // Render
-      // "values": [
-      if (IsStructListValue(*element()->parent_field())) {
-        // case iii above. Bind directly to g.p.ListValue
-        Push("values", Item::MESSAGE, true, true);
-        return this;
-      }
-    }
-
-    // Report an error.
-    InvalidValue("Map", StrCat("Cannot have repeated items ('", name,
-                                     "') within a map."));
-    return this;
-  }
-
-  // When name is empty and stack is not empty, we are rendering an item within
-  // a list.
-  if (name.empty()) {
-    if (element() != nullptr && element()->parent_field() != nullptr) {
-      if (IsStructValue(*element()->parent_field())) {
-        // Since it is g.p.Value, we bind directly to the list_value.
-        // Render
-        // {  // g.p.Value item within the list
-        //   "list_value": {
-        //     "values": [
-        Push("", Item::MESSAGE, false, false);
-        Push("list_value", Item::MESSAGE, true, false);
-        Push("values", Item::MESSAGE, true, true);
-        return this;
-      }
-
-      if (IsStructListValue(*element()->parent_field())) {
-        // Since it is g.p.ListValue, we bind to it directly.
-        // Render
-        // {  // g.p.ListValue item within the list
-        //   "values": [
-        Push("", Item::MESSAGE, false, false);
-        Push("values", Item::MESSAGE, true, true);
-        return this;
-      }
-    }
-
-    // Pass the event to underlying ProtoWriter.
-    Push(name, Item::MESSAGE, false, true);
-    return this;
-  }
-
-  // name is not empty
-  const google::protobuf::Field* field = Lookup(name);
-
-  if (field == nullptr) {
-    IncrementInvalidDepth();
-    return this;
-  }
-
-  if (IsStructValue(*field)) {
-    // If g.p.Value is repeated, start that list. Otherwise, start the
-    // "list_value" within it.
-    if (IsRepeated(*field)) {
-      // Render it just like a regular repeated field.
-      // "<name>": [
-      Push(name, Item::MESSAGE, false, true);
-      return this;
-    }
-
-    // Start the "list_value" field.
-    // Render
-    // "<name>": {
-    //   "list_value": {
-    //     "values": [
-    Push(name, Item::MESSAGE, false, false);
-    Push("list_value", Item::MESSAGE, true, false);
-    Push("values", Item::MESSAGE, true, true);
-    return this;
-  }
-
-  if (IsStructListValue(*field)) {
-    // If g.p.ListValue is repeated, start that list. Otherwise, start the
-    // "values" within it.
-    if (IsRepeated(*field)) {
-      // Render it just like a regular repeated field.
-      // "<name>": [
-      Push(name, Item::MESSAGE, false, true);
-      return this;
-    }
-
-    // Start the "values" field within g.p.ListValue.
-    // Render
-    // "<name>": {
-    //   "values": [
-    Push(name, Item::MESSAGE, false, false);
-    Push("values", Item::MESSAGE, true, true);
-    return this;
-  }
-
-  // If we are here, the field should be repeated. Report an error otherwise.
-  if (!IsRepeated(*field)) {
-    IncrementInvalidDepth();
-    InvalidName(name, "Proto field is not repeating, cannot start list.");
-    return this;
-  }
-
-  if (IsMap(*field)) {
-    if (options_.use_legacy_json_map_format) {
-      Push(name, Item::MESSAGE, false, true);
-      return this;
-    }
-    InvalidValue("Map", StrCat("Cannot bind a list to map for field '",
-                                     name, "'."));
-    IncrementInvalidDepth();
-    return this;
-  }
-
-  // Pass the event to ProtoWriter.
-  // Render
-  // "<name>": [
-  Push(name, Item::MESSAGE, false, true);
-  return this;
-}
-
-ProtoStreamObjectWriter* ProtoStreamObjectWriter::EndList() {
-  if (invalid_depth() > 0) {
-    DecrementInvalidDepth();
-    return this;
-  }
-
-  if (current_ == nullptr) return this;
-
-  if (current_->IsAny()) {
-    current_->any()->EndList();
-    return this;
-  }
-
-  Pop();
-  return this;
-}
-
-Status ProtoStreamObjectWriter::RenderStructValue(ProtoStreamObjectWriter* ow,
-                                                  const DataPiece& data) {
-  std::string struct_field_name;
-  switch (data.type()) {
-    case DataPiece::TYPE_INT32: {
-      if (ow->options_.struct_integers_as_strings) {
-        util::StatusOr<int32_t> int_value = data.ToInt32();
-        if (int_value.ok()) {
-          ow->ProtoWriter::RenderDataPiece(
-              "string_value",
-              DataPiece(SimpleDtoa(int_value.value()), true));
-          return Status();
-        }
-      }
-      struct_field_name = "number_value";
-      break;
-    }
-    case DataPiece::TYPE_UINT32: {
-      if (ow->options_.struct_integers_as_strings) {
-        util::StatusOr<uint32_t> int_value = data.ToUint32();
-        if (int_value.ok()) {
-          ow->ProtoWriter::RenderDataPiece(
-              "string_value",
-              DataPiece(SimpleDtoa(int_value.value()), true));
-          return Status();
-        }
-      }
-      struct_field_name = "number_value";
-      break;
-    }
-    case DataPiece::TYPE_INT64: {
-      // If the option to treat integers as strings is set, then render them as
-      // strings. Otherwise, fallback to rendering them as double.
-      if (ow->options_.struct_integers_as_strings) {
-        util::StatusOr<int64_t> int_value = data.ToInt64();
-        if (int_value.ok()) {
-          ow->ProtoWriter::RenderDataPiece(
-              "string_value", DataPiece(StrCat(int_value.value()), true));
-          return Status();
-        }
-      }
-      struct_field_name = "number_value";
-      break;
-    }
-    case DataPiece::TYPE_UINT64: {
-      // If the option to treat integers as strings is set, then render them as
-      // strings. Otherwise, fallback to rendering them as double.
-      if (ow->options_.struct_integers_as_strings) {
-        util::StatusOr<uint64_t> int_value = data.ToUint64();
-        if (int_value.ok()) {
-          ow->ProtoWriter::RenderDataPiece(
-              "string_value", DataPiece(StrCat(int_value.value()), true));
-          return Status();
-        }
-      }
-      struct_field_name = "number_value";
-      break;
-    }
-    case DataPiece::TYPE_FLOAT: {
-      if (ow->options_.struct_integers_as_strings) {
-        util::StatusOr<float> float_value = data.ToFloat();
-        if (float_value.ok()) {
-          ow->ProtoWriter::RenderDataPiece(
-              "string_value",
-              DataPiece(SimpleDtoa(float_value.value()), true));
-          return Status();
-        }
-      }
-      struct_field_name = "number_value";
-      break;
-    }
-    case DataPiece::TYPE_DOUBLE: {
-      if (ow->options_.struct_integers_as_strings) {
-        util::StatusOr<double> double_value = data.ToDouble();
-        if (double_value.ok()) {
-          ow->ProtoWriter::RenderDataPiece(
-              "string_value",
-              DataPiece(SimpleDtoa(double_value.value()), true));
-          return Status();
-        }
-      }
-      struct_field_name = "number_value";
-      break;
-    }
-    case DataPiece::TYPE_STRING: {
-      struct_field_name = "string_value";
-      break;
-    }
-    case DataPiece::TYPE_BOOL: {
-      struct_field_name = "bool_value";
-      break;
-    }
-    case DataPiece::TYPE_NULL: {
-      struct_field_name = "null_value";
-      break;
-    }
-    default: {
-      return util::InvalidArgumentError(
-          "Invalid struct data type. Only number, string, boolean or  null "
-          "values are supported.");
-    }
-  }
-  ow->ProtoWriter::RenderDataPiece(struct_field_name, data);
-  return Status();
-}
-
-Status ProtoStreamObjectWriter::RenderTimestamp(ProtoStreamObjectWriter* ow,
-                                                const DataPiece& data) {
-  if (data.type() == DataPiece::TYPE_NULL) return Status();
-  if (data.type() != DataPiece::TYPE_STRING) {
-    return util::InvalidArgumentError(
-        StrCat("Invalid data type for timestamp, value is ",
-                     data.ValueAsStringOrDefault("")));
-  }
-
-  StringPiece value(data.str());
-
-  int64_t seconds;
-  int32_t nanos;
-  if (!::google::protobuf::internal::ParseTime(value.ToString(), &seconds,
-                                               &nanos)) {
-    return util::InvalidArgumentError(StrCat("Invalid time format: ", value));
-  }
-
-
-  ow->ProtoWriter::RenderDataPiece("seconds", DataPiece(seconds));
-  ow->ProtoWriter::RenderDataPiece("nanos", DataPiece(nanos));
-  return Status();
-}
-
-static inline util::Status RenderOneFieldPath(ProtoStreamObjectWriter* ow,
-                                              StringPiece path) {
-  ow->ProtoWriter::RenderDataPiece(
-      "paths", DataPiece(ConvertFieldMaskPath(path, &ToSnakeCase), true));
-  return Status();
-}
-
-Status ProtoStreamObjectWriter::RenderFieldMask(ProtoStreamObjectWriter* ow,
-                                                const DataPiece& data) {
-  if (data.type() == DataPiece::TYPE_NULL) return Status();
-  if (data.type() != DataPiece::TYPE_STRING) {
-    return util::InvalidArgumentError(
-        StrCat("Invalid data type for field mask, value is ",
-                     data.ValueAsStringOrDefault("")));
-  }
-
-  // TODO(tsun): figure out how to do proto descriptor based snake case
-  // conversions as much as possible. Because ToSnakeCase sometimes returns the
-  // wrong value.
-  return DecodeCompactFieldMaskPaths(data.str(),
-                                     std::bind(&RenderOneFieldPath, ow, _1));
-}
-
-Status ProtoStreamObjectWriter::RenderDuration(ProtoStreamObjectWriter* ow,
-                                               const DataPiece& data) {
-  if (data.type() == DataPiece::TYPE_NULL) return Status();
-  if (data.type() != DataPiece::TYPE_STRING) {
-    return util::InvalidArgumentError(
-        StrCat("Invalid data type for duration, value is ",
-                     data.ValueAsStringOrDefault("")));
-  }
-
-  StringPiece value(data.str());
-
-  if (!HasSuffixString(value, "s")) {
-    return util::InvalidArgumentError(
-        "Illegal duration format; duration must end with 's'");
-  }
-  value = value.substr(0, value.size() - 1);
-  int sign = 1;
-  if (HasPrefixString(value, "-")) {
-    sign = -1;
-    value = value.substr(1);
-  }
-
-  StringPiece s_secs, s_nanos;
-  SplitSecondsAndNanos(value, &s_secs, &s_nanos);
-  uint64_t unsigned_seconds;
-  if (!safe_strtou64(s_secs, &unsigned_seconds)) {
-    return util::InvalidArgumentError(
-        "Invalid duration format, failed to parse seconds");
-  }
-
-  int32_t nanos = 0;
-  Status nanos_status = GetNanosFromStringPiece(
-      s_nanos, "Invalid duration format, failed to parse nano seconds",
-      "Duration value exceeds limits", &nanos);
-  if (!nanos_status.ok()) {
-    return nanos_status;
-  }
-  nanos = sign * nanos;
-
-  int64_t seconds = sign * unsigned_seconds;
-  if (seconds > kDurationMaxSeconds || seconds < kDurationMinSeconds ||
-      nanos <= -kNanosPerSecond || nanos >= kNanosPerSecond) {
-    return util::InvalidArgumentError("Duration value exceeds limits");
-  }
-
-  ow->ProtoWriter::RenderDataPiece("seconds", DataPiece(seconds));
-  ow->ProtoWriter::RenderDataPiece("nanos", DataPiece(nanos));
-  return Status();
-}
-
-Status ProtoStreamObjectWriter::RenderWrapperType(ProtoStreamObjectWriter* ow,
-                                                  const DataPiece& data) {
-  if (data.type() == DataPiece::TYPE_NULL) return Status();
-  ow->ProtoWriter::RenderDataPiece("value", data);
-  return Status();
-}
-
-ProtoStreamObjectWriter* ProtoStreamObjectWriter::RenderDataPiece(
-    StringPiece name, const DataPiece& data) {
-  Status status;
-  if (invalid_depth() > 0) return this;
-
-  if (current_ == nullptr) {
-    const TypeRenderer* type_renderer =
-        FindTypeRenderer(GetFullTypeWithUrl(master_type_.name()));
-    if (type_renderer == nullptr) {
-      InvalidName(name, "Root element must be a message.");
-      return this;
-    }
-    // Render the special type.
-    // "<name>": {
-    //   ... Render special type ...
-    // }
-    ProtoWriter::StartObject(name);
-    status = (*type_renderer)(this, data);
-    if (!status.ok()) {
-      InvalidValue(master_type_.name(),
-                   StrCat("Field '", name, "', ", status.message()));
-    }
-    ProtoWriter::EndObject();
-    return this;
-  }
-
-  if (current_->IsAny()) {
-    current_->any()->RenderDataPiece(name, data);
-    return this;
-  }
-
-  const google::protobuf::Field* field = nullptr;
-  if (current_->IsMap()) {
-    if (!ValidMapKey(name)) return this;
-
-    field = Lookup("value");
-    if (field == nullptr) {
-      GOOGLE_LOG(DFATAL) << "Map does not have a value field.";
-      return this;
-    }
-
-    if (options_.ignore_null_value_map_entry) {
-      // If we are rendering explicit null values and the backend proto field is
-      // not of the google.protobuf.NullType type, interpret null as absence.
-      if (data.type() == DataPiece::TYPE_NULL &&
-          field->type_url() != kStructNullValueTypeUrl) {
-        return this;
-      }
-    }
-
-    // Render an item in repeated map list.
-    // { "key": "<name>", "value":
-    Push("", Item::MESSAGE, false, false);
-    ProtoWriter::RenderDataPiece("key",
-                                 DataPiece(name, use_strict_base64_decoding()));
-
-    const TypeRenderer* type_renderer = FindTypeRenderer(field->type_url());
-    if (type_renderer != nullptr) {
-      // Map's value type is a special type. Render it like a message:
-      // "value": {
-      //   ... Render special type ...
-      // }
-      Push("value", Item::MESSAGE, true, false);
-      status = (*type_renderer)(this, data);
-      if (!status.ok()) {
-        InvalidValue(field->type_url(),
-                     StrCat("Field '", name, "', ", status.message()));
-      }
-      Pop();
-      return this;
-    }
-
-    // If we are rendering explicit null values and the backend proto field is
-    // not of the google.protobuf.NullType type, we do nothing.
-    if (data.type() == DataPiece::TYPE_NULL &&
-        field->type_url() != kStructNullValueTypeUrl) {
-      Pop();
-      return this;
-    }
-
-    // Render the map value as a primitive type.
-    ProtoWriter::RenderDataPiece("value", data);
-    Pop();
-    return this;
-  }
-
-  field = Lookup(name);
-  if (field == nullptr) return this;
-
-  // Check if the field is of special type. Render it accordingly if so.
-  const TypeRenderer* type_renderer = FindTypeRenderer(field->type_url());
-  if (type_renderer != nullptr) {
-    // Pass through null value only for google.protobuf.Value. For other
-    // types we ignore null value just like for regular field types.
-    if (data.type() != DataPiece::TYPE_NULL ||
-        field->type_url() == kStructValueTypeUrl) {
-      Push(name, Item::MESSAGE, false, false);
-      status = (*type_renderer)(this, data);
-      if (!status.ok()) {
-        InvalidValue(field->type_url(),
-                     StrCat("Field '", name, "', ", status.message()));
-      }
-      Pop();
-    }
-    return this;
-  }
-
-  // If we are rendering explicit null values and the backend proto field is
-  // not of the google.protobuf.NullType type, we do nothing.
-  if (data.type() == DataPiece::TYPE_NULL &&
-      field->type_url() != kStructNullValueTypeUrl) {
-    return this;
-  }
-
-  if (IsRepeated(*field) && !current_->is_list()) {
-    if (options_.disable_implicit_scalar_list) {
-      if (!options_.suppress_implicit_scalar_list_error) {
-        InvalidValue(
-            field->name(),
-            "Starting an primitive in a repeated field but the parent field "
-            "is not a list");
-      }
-
-      return this;
-    }
-  }
-
-  ProtoWriter::RenderDataPiece(name, data);
-  return this;
-}
-
-// Map of functions that are responsible for rendering well known type
-// represented by the key.
-std::unordered_map<std::string, ProtoStreamObjectWriter::TypeRenderer>*
-    ProtoStreamObjectWriter::renderers_ = nullptr;
-PROTOBUF_NAMESPACE_ID::internal::once_flag writer_renderers_init_;
-
-void ProtoStreamObjectWriter::InitRendererMap() {
-  renderers_ = new std::unordered_map<std::string,
-                                      ProtoStreamObjectWriter::TypeRenderer>();
-  (*renderers_)["type.googleapis.com/google.protobuf.Timestamp"] =
-      &ProtoStreamObjectWriter::RenderTimestamp;
-  (*renderers_)["type.googleapis.com/google.protobuf.Duration"] =
-      &ProtoStreamObjectWriter::RenderDuration;
-  (*renderers_)["type.googleapis.com/google.protobuf.FieldMask"] =
-      &ProtoStreamObjectWriter::RenderFieldMask;
-  (*renderers_)["type.googleapis.com/google.protobuf.Double"] =
-      &ProtoStreamObjectWriter::RenderWrapperType;
-  (*renderers_)["type.googleapis.com/google.protobuf.Float"] =
-      &ProtoStreamObjectWriter::RenderWrapperType;
-  (*renderers_)["type.googleapis.com/google.protobuf.Int64"] =
-      &ProtoStreamObjectWriter::RenderWrapperType;
-  (*renderers_)["type.googleapis.com/google.protobuf.UInt64"] =
-      &ProtoStreamObjectWriter::RenderWrapperType;
-  (*renderers_)["type.googleapis.com/google.protobuf.Int32"] =
-      &ProtoStreamObjectWriter::RenderWrapperType;
-  (*renderers_)["type.googleapis.com/google.protobuf.UInt32"] =
-      &ProtoStreamObjectWriter::RenderWrapperType;
-  (*renderers_)["type.googleapis.com/google.protobuf.Bool"] =
-      &ProtoStreamObjectWriter::RenderWrapperType;
-  (*renderers_)["type.googleapis.com/google.protobuf.String"] =
-      &ProtoStreamObjectWriter::RenderWrapperType;
-  (*renderers_)["type.googleapis.com/google.protobuf.Bytes"] =
-      &ProtoStreamObjectWriter::RenderWrapperType;
-  (*renderers_)["type.googleapis.com/google.protobuf.DoubleValue"] =
-      &ProtoStreamObjectWriter::RenderWrapperType;
-  (*renderers_)["type.googleapis.com/google.protobuf.FloatValue"] =
-      &ProtoStreamObjectWriter::RenderWrapperType;
-  (*renderers_)["type.googleapis.com/google.protobuf.Int64Value"] =
-      &ProtoStreamObjectWriter::RenderWrapperType;
-  (*renderers_)["type.googleapis.com/google.protobuf.UInt64Value"] =
-      &ProtoStreamObjectWriter::RenderWrapperType;
-  (*renderers_)["type.googleapis.com/google.protobuf.Int32Value"] =
-      &ProtoStreamObjectWriter::RenderWrapperType;
-  (*renderers_)["type.googleapis.com/google.protobuf.UInt32Value"] =
-      &ProtoStreamObjectWriter::RenderWrapperType;
-  (*renderers_)["type.googleapis.com/google.protobuf.BoolValue"] =
-      &ProtoStreamObjectWriter::RenderWrapperType;
-  (*renderers_)["type.googleapis.com/google.protobuf.StringValue"] =
-      &ProtoStreamObjectWriter::RenderWrapperType;
-  (*renderers_)["type.googleapis.com/google.protobuf.BytesValue"] =
-      &ProtoStreamObjectWriter::RenderWrapperType;
-  (*renderers_)["type.googleapis.com/google.protobuf.Value"] =
-      &ProtoStreamObjectWriter::RenderStructValue;
-  ::google::protobuf::internal::OnShutdown(&DeleteRendererMap);
-}
-
-void ProtoStreamObjectWriter::DeleteRendererMap() {
-  delete ProtoStreamObjectWriter::renderers_;
-  renderers_ = nullptr;
-}
-
-ProtoStreamObjectWriter::TypeRenderer*
-ProtoStreamObjectWriter::FindTypeRenderer(const std::string& type_url) {
-  PROTOBUF_NAMESPACE_ID::internal::call_once(writer_renderers_init_,
-                                             InitRendererMap);
-  return FindOrNull(*renderers_, type_url);
-}
-
-bool ProtoStreamObjectWriter::ValidMapKey(StringPiece unnormalized_name) {
-  if (current_ == nullptr) return true;
-
-  if (!current_->InsertMapKeyIfNotPresent(unnormalized_name)) {
-    listener()->InvalidName(
-        location(), unnormalized_name,
-        StrCat("Repeated map key: '", unnormalized_name,
-                     "' is already set."));
-    return false;
-  }
-
-  return true;
-}
-
-void ProtoStreamObjectWriter::Push(
-    StringPiece name, Item::ItemType item_type, bool is_placeholder,
-    bool is_list) {
-  is_list ? ProtoWriter::StartList(name) : ProtoWriter::StartObject(name);
-
-  // invalid_depth == 0 means it is a successful StartObject or StartList.
-  if (invalid_depth() == 0)
-    current_.reset(
-        new Item(current_.release(), item_type, is_placeholder, is_list));
-}
-
-void ProtoStreamObjectWriter::Pop() {
-  // Pop all placeholder items sending StartObject or StartList events to
-  // ProtoWriter according to is_list value.
-  while (current_ != nullptr && current_->is_placeholder()) {
-    PopOneElement();
-  }
-  if (current_ != nullptr) {
-    PopOneElement();
-  }
-}
-
-void ProtoStreamObjectWriter::PopOneElement() {
-  current_->is_list() ? ProtoWriter::EndList() : ProtoWriter::EndObject();
-  current_.reset(current_->pop<Item>());
-}
-
-bool ProtoStreamObjectWriter::IsMap(const google::protobuf::Field& field) {
-  if (field.type_url().empty() ||
-      field.kind() != google::protobuf::Field::TYPE_MESSAGE ||
-      field.cardinality() != google::protobuf::Field::CARDINALITY_REPEATED) {
-    return false;
-  }
-  const google::protobuf::Type* field_type =
-      typeinfo()->GetTypeByTypeUrl(field.type_url());
-
-  return converter::IsMap(field, *field_type);
-}
-
-bool ProtoStreamObjectWriter::IsAny(const google::protobuf::Field& field) {
-  return GetTypeWithoutUrl(field.type_url()) == kAnyType;
-}
-
-bool ProtoStreamObjectWriter::IsStruct(const google::protobuf::Field& field) {
-  return GetTypeWithoutUrl(field.type_url()) == kStructType;
-}
-
-bool ProtoStreamObjectWriter::IsStructValue(
-    const google::protobuf::Field& field) {
-  return GetTypeWithoutUrl(field.type_url()) == kStructValueType;
-}
-
-bool ProtoStreamObjectWriter::IsStructListValue(
-    const google::protobuf::Field& field) {
-  return GetTypeWithoutUrl(field.type_url()) == kStructListValueType;
-}
-
-}  // namespace converter
-}  // namespace util
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/util/internal/protostream_objectwriter.h b/libs/protobuf/src/google/protobuf/util/internal/protostream_objectwriter.h
deleted file mode 100644
index ce2517f..0000000
--- a/libs/protobuf/src/google/protobuf/util/internal/protostream_objectwriter.h
+++ /dev/null
@@ -1,453 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef GOOGLE_PROTOBUF_UTIL_INTERNAL_PROTOSTREAM_OBJECTWRITER_H__
-#define GOOGLE_PROTOBUF_UTIL_INTERNAL_PROTOSTREAM_OBJECTWRITER_H__
-
-#include <deque>
-#include <string>
-#include <unordered_map>
-#include <unordered_set>
-
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/type.pb.h>
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/io/zero_copy_stream_impl.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/stubs/bytestream.h>
-#include <google/protobuf/stubs/status.h>
-#include <google/protobuf/util/internal/datapiece.h>
-#include <google/protobuf/util/internal/error_listener.h>
-#include <google/protobuf/util/internal/proto_writer.h>
-#include <google/protobuf/util/internal/structured_objectwriter.h>
-#include <google/protobuf/util/internal/type_info.h>
-#include <google/protobuf/util/type_resolver.h>
-#include <google/protobuf/stubs/hash.h>
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-namespace util {
-namespace converter {
-
-class ObjectLocationTracker;
-
-// An ObjectWriter that can write protobuf bytes directly from writer events.
-// This class supports all special types like Struct and Map. It uses
-// the ProtoWriter class to write raw proto bytes.
-//
-// It also supports streaming.
-class PROTOBUF_EXPORT ProtoStreamObjectWriter : public ProtoWriter {
- public:
-  // Options that control ProtoStreamObjectWriter class's behavior.
-  struct Options {
-    // Treats numeric inputs in google.protobuf.Struct as strings. Normally,
-    // numeric values are returned in double field "number_value" of
-    // google.protobuf.Struct. However, this can cause precision loss for
-    // int64/uint64/double inputs. This option is provided for cases that want
-    // to preserve number precision.
-    //
-    // TODO(skarvaje): Rename to struct_numbers_as_strings as it covers double
-    // as well.
-    bool struct_integers_as_strings;
-
-    // Not treat unknown fields as an error. If there is an unknown fields,
-    // just ignore it and continue to process the rest. Note that this doesn't
-    // apply to unknown enum values.
-    bool ignore_unknown_fields;
-
-    // Ignore unknown enum values.
-    bool ignore_unknown_enum_values;
-
-    // If true, check if enum name in camel case or without underscore matches
-    // the field name.
-    bool use_lower_camel_for_enums;
-
-    // If true, check if enum name in UPPER_CASE matches the field name.
-    bool case_insensitive_enum_parsing;
-
-    // If true, skips rendering the map entry if map value is null unless the
-    // value type is google.protobuf.NullType.
-    bool ignore_null_value_map_entry;
-
-    // If true, accepts repeated key/value pair for a map proto field.
-    bool use_legacy_json_map_format;
-
-    // If true, disable implicitly creating message list.
-    bool disable_implicit_message_list;
-
-    // If true, suppress the error of implicitly creating message list when it
-    // is disabled.
-    bool suppress_implicit_message_list_error;
-
-    // If true, disable implicitly creating scalar list.
-    bool disable_implicit_scalar_list;
-
-    // If true, suppress the error of implicitly creating scalar list when it
-    // is disabled.
-    bool suppress_implicit_scalar_list_error;
-
-    // If true, suppress the error of rendering scalar field if the source is an
-    // object.
-    bool suppress_object_to_scalar_error;
-
-    // If true, use the json name in missing fields errors.
-    bool use_json_name_in_missing_fields;
-
-    Options()
-        : struct_integers_as_strings(false),
-          ignore_unknown_fields(false),
-          ignore_unknown_enum_values(false),
-          use_lower_camel_for_enums(false),
-          case_insensitive_enum_parsing(false),
-          ignore_null_value_map_entry(false),
-          use_legacy_json_map_format(false),
-          disable_implicit_message_list(false),
-          suppress_implicit_message_list_error(false),
-          disable_implicit_scalar_list(false),
-          suppress_implicit_scalar_list_error(false),
-          suppress_object_to_scalar_error(false),
-          use_json_name_in_missing_fields(false) {}
-
-    // Default instance of Options with all options set to defaults.
-    static const Options& Defaults() {
-      static Options defaults;
-      return defaults;
-    }
-  };
-
-  // Constructor. Does not take ownership of any parameter passed in.
-  ProtoStreamObjectWriter(TypeResolver* type_resolver,
-                          const google::protobuf::Type& type,
-                          strings::ByteSink* output, ErrorListener* listener,
-                          const ProtoStreamObjectWriter::Options& options =
-                              ProtoStreamObjectWriter::Options::Defaults());
-  ~ProtoStreamObjectWriter() override;
-
-  // ObjectWriter methods.
-  ProtoStreamObjectWriter* StartObject(StringPiece name) override;
-  ProtoStreamObjectWriter* EndObject() override;
-  ProtoStreamObjectWriter* StartList(StringPiece name) override;
-  ProtoStreamObjectWriter* EndList() override;
-
-  // Renders a DataPiece 'value' into a field whose wire type is determined
-  // from the given field 'name'.
-  ProtoStreamObjectWriter* RenderDataPiece(StringPiece name,
-                                           const DataPiece& data) override;
-
- protected:
-  // Function that renders a well known type with modified behavior.
-  typedef util::Status (*TypeRenderer)(ProtoStreamObjectWriter*,
-                                       const DataPiece&);
-
-  // Handles writing Anys out using nested object writers and the like.
-  class PROTOBUF_EXPORT AnyWriter {
-   public:
-    explicit AnyWriter(ProtoStreamObjectWriter* parent);
-    ~AnyWriter();
-
-    // Passes a StartObject call through to the Any writer.
-    void StartObject(StringPiece name);
-
-    // Passes an EndObject call through to the Any. Returns true if the any
-    // handled the EndObject call, false if the Any is now all done and is no
-    // longer needed.
-    bool EndObject();
-
-    // Passes a StartList call through to the Any writer.
-    void StartList(StringPiece name);
-
-    // Passes an EndList call through to the Any writer.
-    void EndList();
-
-    // Renders a data piece on the any.
-    void RenderDataPiece(StringPiece name, const DataPiece& value);
-
-   private:
-    // Before the "@type" field is encountered, we store all incoming data
-    // into this Event struct and replay them after we get the "@type" field.
-    class PROTOBUF_EXPORT Event {
-     public:
-      enum Type {
-        START_OBJECT = 0,
-        END_OBJECT = 1,
-        START_LIST = 2,
-        END_LIST = 3,
-        RENDER_DATA_PIECE = 4,
-      };
-
-      // Constructor for END_OBJECT and END_LIST events.
-      explicit Event(Type type) : type_(type), value_(DataPiece::NullData()) {}
-
-      // Constructor for START_OBJECT and START_LIST events.
-      explicit Event(Type type, StringPiece name)
-          : type_(type), name_(name), value_(DataPiece::NullData()) {}
-
-      // Constructor for RENDER_DATA_PIECE events.
-      explicit Event(StringPiece name, const DataPiece& value)
-          : type_(RENDER_DATA_PIECE), name_(name), value_(value) {
-        DeepCopy();
-      }
-
-      Event(const Event& other)
-          : type_(other.type_), name_(other.name_), value_(other.value_) {
-        DeepCopy();
-      }
-
-      Event& operator=(const Event& other) {
-        type_ = other.type_;
-        name_ = other.name_;
-        value_ = other.value_;
-        DeepCopy();
-        return *this;
-      }
-
-      void Replay(AnyWriter* writer) const;
-
-     private:
-      void DeepCopy();
-
-      Type type_;
-      std::string name_;
-      DataPiece value_;
-      std::string value_storage_;
-    };
-
-    // Handles starting up the any once we have a type.
-    void StartAny(const DataPiece& value);
-
-    // Writes the Any out to the parent writer in its serialized form.
-    void WriteAny();
-
-    // The parent of this writer, needed for various bits such as type info and
-    // the listeners.
-    ProtoStreamObjectWriter* parent_;
-
-    // The nested object writer, used to write events.
-    std::unique_ptr<ProtoStreamObjectWriter> ow_;
-
-    // The type_url_ that this Any represents.
-    std::string type_url_;
-
-    // Whether this any is invalid. This allows us to only report an invalid
-    // Any message a single time rather than every time we get a nested field.
-    bool invalid_;
-
-    // The output data and wrapping ByteSink.
-    std::string data_;
-    strings::StringByteSink output_;
-
-    // The depth within the Any, so we can track when we're done.
-    int depth_;
-
-    // True if the type is a well-known type. Well-known types in Any
-    // has a special formatting:
-    // {
-    //   "@type": "type.googleapis.com/google.protobuf.XXX",
-    //   "value": <JSON representation of the type>,
-    // }
-    bool is_well_known_type_;
-    TypeRenderer* well_known_type_render_;
-
-    // Store data before the "@type" field.
-    std::vector<Event> uninterpreted_events_;
-  };
-
-  // Represents an item in a stack of items used to keep state between
-  // ObjectWrier events.
-  class PROTOBUF_EXPORT Item : public BaseElement {
-   public:
-    // Indicates the type of item.
-    enum ItemType {
-      MESSAGE,  // Simple message
-      MAP,      // Proto3 map type
-      ANY,      // Proto3 Any type
-    };
-
-    // Constructor for the root item.
-    Item(ProtoStreamObjectWriter* enclosing, ItemType item_type,
-         bool is_placeholder, bool is_list);
-
-    // Constructor for a field of a message.
-    Item(Item* parent, ItemType item_type, bool is_placeholder, bool is_list);
-
-    ~Item() override {}
-
-    // These functions return true if the element type is corresponding to the
-    // type in function name.
-    bool IsMap() { return item_type_ == MAP; }
-    bool IsAny() { return item_type_ == ANY; }
-
-    AnyWriter* any() const { return any_.get(); }
-
-    Item* parent() const override {
-      return static_cast<Item*>(BaseElement::parent());
-    }
-
-    // Inserts map key into hash set if and only if the key did NOT already
-    // exist in hash set.
-    // The hash set (map_keys_) is ONLY used to keep track of map keys.
-    // Return true if insert successfully; returns false if the map key was
-    // already present.
-    bool InsertMapKeyIfNotPresent(StringPiece map_key);
-
-    bool is_placeholder() const { return is_placeholder_; }
-    bool is_list() const { return is_list_; }
-
-   private:
-    // Used for access to variables of the enclosing instance of
-    // ProtoStreamObjectWriter.
-    ProtoStreamObjectWriter* ow_;
-
-    // A writer for Any objects, handles all Any-related nonsense.
-    std::unique_ptr<AnyWriter> any_;
-
-    // The type of this element, see enum for permissible types.
-    ItemType item_type_;
-
-    // Set of map keys already seen for the type_. Used to validate incoming
-    // messages so no map key appears more than once.
-    std::unique_ptr<std::unordered_set<std::string> > map_keys_;
-
-    // Conveys whether this Item is a placeholder or not. Placeholder items are
-    // pushed to stack to account for special types.
-    bool is_placeholder_;
-
-    // Conveys whether this Item is a list or not. This is used to send
-    // StartList or EndList calls to underlying ObjectWriter.
-    bool is_list_;
-
-    GOOGLE_DISALLOW_IMPLICIT_CONSTRUCTORS(Item);
-  };
-
-  ProtoStreamObjectWriter(const TypeInfo* typeinfo,
-                          const google::protobuf::Type& type,
-                          strings::ByteSink* output, ErrorListener* listener);
-
-  ProtoStreamObjectWriter(const TypeInfo* typeinfo,
-                          const google::protobuf::Type& type,
-                          strings::ByteSink* output, ErrorListener* listener,
-                          const ProtoStreamObjectWriter::Options& options);
-
-  // Returns true if the field is a map.
-  inline bool IsMap(const google::protobuf::Field& field);
-
-  // Returns true if the field is an any.
-  inline bool IsAny(const google::protobuf::Field& field);
-
-  // Returns true if the field is google.protobuf.Struct.
-  inline bool IsStruct(const google::protobuf::Field& field);
-
-  // Returns true if the field is google.protobuf.Value.
-  inline bool IsStructValue(const google::protobuf::Field& field);
-
-  // Returns true if the field is google.protobuf.ListValue.
-  inline bool IsStructListValue(const google::protobuf::Field& field);
-
-  // Renders google.protobuf.Value in struct.proto. It picks the right oneof
-  // type based on value's type.
-  static util::Status RenderStructValue(ProtoStreamObjectWriter* ow,
-                                        const DataPiece& data);
-
-  // Renders google.protobuf.Timestamp value.
-  static util::Status RenderTimestamp(ProtoStreamObjectWriter* ow,
-                                      const DataPiece& data);
-
-  // Renders google.protobuf.FieldMask value.
-  static util::Status RenderFieldMask(ProtoStreamObjectWriter* ow,
-                                      const DataPiece& data);
-
-  // Renders google.protobuf.Duration value.
-  static util::Status RenderDuration(ProtoStreamObjectWriter* ow,
-                                     const DataPiece& data);
-
-  // Renders wrapper message types for primitive types in
-  // google/protobuf/wrappers.proto.
-  static util::Status RenderWrapperType(ProtoStreamObjectWriter* ow,
-                                        const DataPiece& data);
-
-  static void InitRendererMap();
-  static void DeleteRendererMap();
-  static TypeRenderer* FindTypeRenderer(const std::string& type_url);
-
-  // Returns true if the map key for type_ is not duplicated key.
-  // If map key is duplicated key, this function returns false.
-  // Note that caller should make sure that the current proto element (current_)
-  // is of element type MAP or STRUCT_MAP.
-  // It also calls the appropriate error callback and unnormalzied_name is used
-  // for error string.
-  bool ValidMapKey(StringPiece unnormalized_name);
-
-  // Pushes an item on to the stack. Also calls either StartObject or StartList
-  // on the underlying ObjectWriter depending on whether is_list is false or
-  // not.
-  // is_placeholder conveys whether the item is a placeholder item or not.
-  // Placeholder items are pushed when adding auxiliary types' StartObject or
-  // StartList calls.
-  void Push(StringPiece name, Item::ItemType item_type,
-            bool is_placeholder, bool is_list);
-
-
-  // Pops items from the stack. All placeholder items are popped until a
-  // non-placeholder item is found.
-  void Pop();
-
-  // Pops one element from the stack. Calls EndObject() or EndList() on the
-  // underlying ObjectWriter depending on the value of is_list_.
-  void PopOneElement();
-
- private:
-  // Helper functions to create the map and find functions responsible for
-  // rendering well known types, keyed by type URL.
-  static std::unordered_map<std::string, TypeRenderer>* renderers_;
-
-  // Variables for describing the structure of the input tree:
-  // master_type_: descriptor for the whole protobuf message.
-  const google::protobuf::Type& master_type_;
-
-  // The current element, variable for internal state processing.
-  std::unique_ptr<Item> current_;
-
-  // Reference to the options that control this class's behavior.
-  const ProtoStreamObjectWriter::Options options_;
-
-  GOOGLE_DISALLOW_IMPLICIT_CONSTRUCTORS(ProtoStreamObjectWriter);
-};
-
-}  // namespace converter
-}  // namespace util
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
-
-#endif  // GOOGLE_PROTOBUF_UTIL_INTERNAL_PROTOSTREAM_OBJECTWRITER_H__
diff --git a/libs/protobuf/src/google/protobuf/util/internal/protostream_objectwriter_test.cc b/libs/protobuf/src/google/protobuf/util/internal/protostream_objectwriter_test.cc
deleted file mode 100644
index 3348999..0000000
--- a/libs/protobuf/src/google/protobuf/util/internal/protostream_objectwriter_test.cc
+++ /dev/null
@@ -1,3032 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <google/protobuf/util/internal/protostream_objectwriter.h>
-
-#include <stddef.h>  // For size_t
-
-#include <google/protobuf/field_mask.pb.h>
-#include <google/protobuf/timestamp.pb.h>
-#include <google/protobuf/type.pb.h>
-#include <google/protobuf/wrappers.pb.h>
-#include <google/protobuf/io/zero_copy_stream_impl_lite.h>
-#include <google/protobuf/descriptor.pb.h>
-#include <google/protobuf/message.h>
-#include <google/protobuf/util/internal/mock_error_listener.h>
-#include <google/protobuf/util/internal/testdata/anys.pb.h>
-#include <google/protobuf/util/internal/testdata/books.pb.h>
-#include <google/protobuf/util/internal/testdata/field_mask.pb.h>
-#include <google/protobuf/util/internal/testdata/maps.pb.h>
-#include <google/protobuf/util/internal/testdata/oneofs.pb.h>
-#include <google/protobuf/util/internal/testdata/proto3.pb.h>
-#include <google/protobuf/util/internal/testdata/struct.pb.h>
-#include <google/protobuf/util/internal/testdata/timestamp_duration.pb.h>
-#include <google/protobuf/util/internal/testdata/wrappers.pb.h>
-#include <google/protobuf/stubs/bytestream.h>
-#include <google/protobuf/stubs/strutil.h>
-#include <gtest/gtest.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/dynamic_message.h>
-#include <google/protobuf/util/internal/constants.h>
-#include <google/protobuf/util/internal/type_info_test_helper.h>
-#include <google/protobuf/util/message_differencer.h>
-#include <google/protobuf/util/type_resolver_util.h>
-
-
-namespace google {
-namespace protobuf {
-namespace util {
-namespace converter {
-
-
-using proto_util_converter::testing::AnyM;
-using proto_util_converter::testing::AnyOut;
-using proto_util_converter::testing::Author;
-using proto_util_converter::testing::Book;
-using proto_util_converter::testing::FieldMaskTest;
-using proto_util_converter::testing::Int32Wrapper;
-using proto_util_converter::testing::MapIn;
-using proto_util_converter::testing::Primitive;
-using proto_util_converter::testing::Proto3Message;
-using proto_util_converter::testing::Publisher;
-using proto_util_converter::testing::StructType;
-using proto_util_converter::testing::TestJsonName1;
-using proto_util_converter::testing::TestJsonName2;
-using proto_util_converter::testing::TimestampDuration;
-using proto_util_converter::testing::ValueWrapper;
-using proto_util_converter::testing::oneofs::OneOfsRequest;
-using strings::GrowingArrayByteSink;
-using ::testing::_;
-using ::testing::Args;
-
-
-namespace {
-std::string GetTypeUrl(const Descriptor* descriptor) {
-  return std::string(kTypeServiceBaseUrl) + "/" + descriptor->full_name();
-}
-}  // namespace
-
-class BaseProtoStreamObjectWriterTest
-    : public ::testing::TestWithParam<testing::TypeInfoSource> {
- protected:
-  BaseProtoStreamObjectWriterTest()
-      : helper_(GetParam()),
-        listener_(),
-        output_(new GrowingArrayByteSink(1000)),
-        ow_() {}
-
-  explicit BaseProtoStreamObjectWriterTest(const Descriptor* descriptor)
-      : helper_(GetParam()),
-        listener_(),
-        output_(new GrowingArrayByteSink(1000)),
-        ow_() {
-    std::vector<const Descriptor*> descriptors;
-    descriptors.push_back(descriptor);
-    ResetTypeInfo(descriptors);
-  }
-
-  explicit BaseProtoStreamObjectWriterTest(
-      std::vector<const Descriptor*> descriptors)
-      : helper_(GetParam()),
-        listener_(),
-        output_(new GrowingArrayByteSink(1000)),
-        ow_() {
-    ResetTypeInfo(descriptors);
-  }
-
-  void ResetTypeInfo(std::vector<const Descriptor*> descriptors) {
-    GOOGLE_CHECK(!descriptors.empty()) << "Must have at least one descriptor!";
-    helper_.ResetTypeInfo(descriptors);
-    ow_.reset(helper_.NewProtoWriter(GetTypeUrl(descriptors[0]), output_.get(),
-                                     &listener_, options_));
-  }
-
-  void ResetTypeInfo(const Descriptor* descriptor) {
-    std::vector<const Descriptor*> descriptors;
-    descriptors.push_back(descriptor);
-    ResetTypeInfo(descriptors);
-  }
-
-  ~BaseProtoStreamObjectWriterTest() override {}
-
-  void CheckOutput(const Message& expected, int expected_length) {
-    size_t nbytes;
-    std::unique_ptr<char[]> buffer(output_->GetBuffer(&nbytes));
-    if (expected_length >= 0) {
-      EXPECT_EQ(expected_length, nbytes);
-    }
-    std::string str(buffer.get(), nbytes);
-
-    std::stringbuf str_buf(str, std::ios_base::in);
-    std::istream istream(&str_buf);
-    std::unique_ptr<Message> message(expected.New());
-    message->ParsePartialFromIstream(&istream);
-
-    if (!MessageDifferencer::Equivalent(expected, *message)) {
-      EXPECT_EQ(expected.DebugString(), message->DebugString());
-    }
-  }
-
-  void CheckOutput(const Message& expected) { CheckOutput(expected, -1); }
-
-  testing::TypeInfoTestHelper helper_;
-  MockErrorListener listener_;
-  std::unique_ptr<GrowingArrayByteSink> output_;
-  std::unique_ptr<ProtoStreamObjectWriter> ow_;
-  ProtoStreamObjectWriter::Options options_;
-};
-
-MATCHER_P(HasObjectLocation, expected,
-          "Verifies the expected object location") {
-  std::string actual = std::get<0>(arg).ToString();
-  if (actual == expected) return true;
-  *result_listener << "actual location is: " << actual;
-  return false;
-}
-
-class ProtoStreamObjectWriterTest : public BaseProtoStreamObjectWriterTest {
- protected:
-  ProtoStreamObjectWriterTest()
-      : BaseProtoStreamObjectWriterTest(Book::descriptor()) {}
-
-  void ResetProtoWriter() { ResetTypeInfo(Book::descriptor()); }
-
-  ~ProtoStreamObjectWriterTest() override {}
-};
-
-INSTANTIATE_TEST_SUITE_P(DifferentTypeInfoSourceTest,
-                         ProtoStreamObjectWriterTest,
-                         ::testing::Values(
-                             testing::USE_TYPE_RESOLVER));
-
-TEST_P(ProtoStreamObjectWriterTest, EmptyObject) {
-  Book empty;
-  ow_->StartObject("")->EndObject();
-  CheckOutput(empty, 0);
-}
-
-TEST_P(ProtoStreamObjectWriterTest, SimpleObject) {
-  std::string content("My content");
-
-  Book book;
-  book.set_title("My Title");
-  book.set_length(222);
-  book.set_content(content);
-
-  ow_->StartObject("")
-      ->RenderString("title", "My Title")
-      ->RenderInt32("length", 222)
-      ->RenderBytes("content", content)
-      ->EndObject();
-  CheckOutput(book);
-}
-
-TEST_P(ProtoStreamObjectWriterTest, SimpleMessage) {
-  Book book;
-  book.set_title("Some Book");
-  book.set_length(102);
-  Publisher* publisher = book.mutable_publisher();
-  publisher->set_name("My Publisher");
-  Author* robert = book.mutable_author();
-  robert->set_alive(true);
-  robert->set_name("robert");
-  robert->add_pseudonym("bob");
-  robert->add_pseudonym("bobby");
-  robert->add_friend_()->set_name("john");
-
-  ow_->StartObject("")
-      ->RenderString("title", "Some Book")
-      ->RenderInt32("length", 102)
-      ->StartObject("publisher")
-      ->RenderString("name", "My Publisher")
-      ->EndObject()
-      ->StartObject("author")
-      ->RenderBool("alive", true)
-      ->RenderString("name", "robert")
-      ->StartList("pseudonym")
-      ->RenderString("", "bob")
-      ->RenderString("", "bobby")
-      ->EndList()
-      ->StartList("friend")
-      ->StartObject("")
-      ->RenderString("name", "john")
-      ->EndObject()
-      ->EndList()
-      ->EndObject()
-      ->EndObject();
-  CheckOutput(book);
-}
-
-TEST_P(ProtoStreamObjectWriterTest, CustomJsonName) {
-  Book book;
-  Author* robert = book.mutable_author();
-  robert->set_id(12345);
-  robert->set_name("robert");
-
-  ow_->StartObject("")
-      ->StartObject("author")
-      ->RenderUint64("@id", 12345)
-      ->RenderString("name", "robert")
-      ->EndObject()
-      ->EndObject();
-  CheckOutput(book);
-}
-
-// Test that two messages can have different fields mapped to the same JSON
-// name. See: https://github.com/protocolbuffers/protobuf/issues/1415
-TEST_P(ProtoStreamObjectWriterTest, ConflictingJsonName) {
-  ResetTypeInfo(TestJsonName1::descriptor());
-  TestJsonName1 message1;
-  message1.set_one_value(12345);
-  ow_->StartObject("")->RenderInt32("value", 12345)->EndObject();
-  CheckOutput(message1);
-
-  ResetTypeInfo(TestJsonName2::descriptor());
-  TestJsonName2 message2;
-  message2.set_another_value(12345);
-  ow_->StartObject("")->RenderInt32("value", 12345)->EndObject();
-  CheckOutput(message2);
-}
-
-
-TEST_P(ProtoStreamObjectWriterTest, IntEnumValuesAreAccepted) {
-  Book book;
-  book.set_title("Some Book");
-  book.set_type(proto_util_converter::testing::Book::KIDS);
-  Author* robert = book.mutable_author();
-  robert->set_name("robert");
-
-  ow_->StartObject("")
-      ->RenderString("title", "Some Book")
-      ->RenderString("type", "2")
-      ->StartObject("author")
-      ->RenderString("name", "robert")
-      ->EndObject()
-      ->EndObject();
-  CheckOutput(book);
-}
-
-TEST_P(ProtoStreamObjectWriterTest, EnumValuesWithDifferentCaseIsRejected) {
-  Book book;
-  book.set_title("Some Book");
-  Author* robert = book.mutable_author();
-  robert->set_name("robert");
-
-  options_.case_insensitive_enum_parsing = false;
-  ResetProtoWriter();
-
-  ow_->StartObject("")
-      ->RenderString("title", "Some Book")
-      ->RenderString("type", "action_and_adventure")
-      ->StartObject("author")
-      ->RenderString("name", "robert")
-      ->EndObject()
-      ->EndObject();
-  CheckOutput(book);
-}
-
-TEST_P(ProtoStreamObjectWriterTest, EnumValuesWithSameCaseIsAccepted) {
-  Book book;
-  book.set_title("Some Book");
-  book.set_type(proto_util_converter::testing::Book::ACTION_AND_ADVENTURE);
-  Author* robert = book.mutable_author();
-  robert->set_name("robert");
-
-  options_.case_insensitive_enum_parsing = false;
-  ResetProtoWriter();
-
-  ow_->StartObject("")
-      ->RenderString("title", "Some Book")
-      ->RenderString("type", "ACTION_AND_ADVENTURE")
-      ->StartObject("author")
-      ->RenderString("name", "robert")
-      ->EndObject()
-      ->EndObject();
-  CheckOutput(book);
-}
-
-TEST_P(ProtoStreamObjectWriterTest, EnumValuesWithDifferentCaseIsAccepted) {
-  Book book;
-  book.set_title("Some Book");
-  book.set_type(proto_util_converter::testing::Book::ACTION_AND_ADVENTURE);
-  Author* robert = book.mutable_author();
-  robert->set_name("robert");
-
-  options_.case_insensitive_enum_parsing = true;
-  ResetProtoWriter();
-
-  ow_->StartObject("")
-      ->RenderString("title", "Some Book")
-      ->RenderString("type", "action_AND_adventure")
-      ->StartObject("author")
-      ->RenderString("name", "robert")
-      ->EndObject()
-      ->EndObject();
-  CheckOutput(book);
-}
-
-TEST_P(ProtoStreamObjectWriterTest, EnumValuesWithoutUnderscoreAreAccepted) {
-  Book book;
-  book.set_title("Some Book");
-  book.set_type(proto_util_converter::testing::Book::ACTION_AND_ADVENTURE);
-  Author* robert = book.mutable_author();
-  robert->set_name("robert");
-
-  options_.use_lower_camel_for_enums = true;
-  ResetProtoWriter();
-
-  ow_->StartObject("")
-      ->RenderString("title", "Some Book")
-      ->RenderString("type", "ACTIONANDADVENTURE")
-      ->StartObject("author")
-      ->RenderString("name", "robert")
-      ->EndObject()
-      ->EndObject();
-  CheckOutput(book);
-}
-
-TEST_P(ProtoStreamObjectWriterTest, EnumValuesInCamelCaseAreAccepted) {
-  Book book;
-  book.set_title("Some Book");
-  book.set_type(proto_util_converter::testing::Book::ACTION_AND_ADVENTURE);
-  Author* robert = book.mutable_author();
-  robert->set_name("robert");
-
-  options_.use_lower_camel_for_enums = true;
-  ResetProtoWriter();
-
-  ow_->StartObject("")
-      ->RenderString("title", "Some Book")
-      ->RenderString("type", "actionAndAdventure")
-      ->StartObject("author")
-      ->RenderString("name", "robert")
-      ->EndObject()
-      ->EndObject();
-  CheckOutput(book);
-}
-
-TEST_P(ProtoStreamObjectWriterTest,
-       EnumValuesInCamelCaseRemoveDashAndUnderscoreAreAccepted) {
-  Book book;
-  book.set_title("Some Book");
-  book.set_type(proto_util_converter::testing::Book::ACTION_AND_ADVENTURE);
-  Author* robert = book.mutable_author();
-  robert->set_name("robert");
-
-  options_.use_lower_camel_for_enums = true;
-  options_.case_insensitive_enum_parsing = false;
-  ResetProtoWriter();
-
-  ow_->StartObject("")
-      ->RenderString("title", "Some Book")
-      ->RenderString("type", "action-And_Adventure")
-      ->StartObject("author")
-      ->RenderString("name", "robert")
-      ->EndObject()
-      ->EndObject();
-  CheckOutput(book);
-}
-
-TEST_P(ProtoStreamObjectWriterTest,
-       EnumValuesInCamelCaseWithNameNotUppercaseAreAccepted) {
-  Book book;
-  book.set_title("Some Book");
-  book.set_type(proto_util_converter::testing::Book::arts_and_photography);
-  Author* robert = book.mutable_author();
-  robert->set_name("robert");
-
-  options_.use_lower_camel_for_enums = true;
-  ResetProtoWriter();
-
-  ow_->StartObject("")
-      ->RenderString("title", "Some Book")
-      ->RenderString("type", "artsAndPhotography")
-      ->StartObject("author")
-      ->RenderString("name", "robert")
-      ->EndObject()
-      ->EndObject();
-  CheckOutput(book);
-}
-
-TEST_P(ProtoStreamObjectWriterTest, PrimitiveFromStringConversion) {
-  Primitive full;
-  full.set_fix32(101);
-  full.set_u32(102);
-  full.set_i32(-103);
-  full.set_sf32(-104);
-  full.set_s32(-105);
-  full.set_fix64(40000000001L);
-  full.set_u64(40000000002L);
-  full.set_i64(-40000000003L);
-  full.set_sf64(-40000000004L);
-  full.set_s64(-40000000005L);
-  full.set_str("string1");
-  full.set_bytes("Some Bytes");
-  full.set_float_(3.14f);
-  full.set_double_(-4.05L);
-  full.set_bool_(true);
-  full.add_rep_fix32(201);
-  full.add_rep_u32(202);
-  full.add_rep_i32(-203);
-  full.add_rep_sf32(-204);
-  full.add_rep_s32(-205);
-  full.add_rep_fix64(80000000001L);
-  full.add_rep_u64(80000000002L);
-  full.add_rep_i64(-80000000003L);
-  full.add_rep_sf64(-80000000004L);
-  full.add_rep_s64(-80000000005L);
-  full.add_rep_str("string2");
-  full.add_rep_bytes("More Bytes");
-  full.add_rep_float(6.14f);
-  full.add_rep_double(-8.05L);
-  full.add_rep_bool(false);
-
-  ResetTypeInfo(Primitive::descriptor());
-
-  ow_->StartObject("")
-      ->RenderString("fix32", "101")
-      ->RenderString("u32", "102")
-      ->RenderString("i32", "-103")
-      ->RenderString("sf32", "-104")
-      ->RenderString("s32", "-105")
-      ->RenderString("fix64", "40000000001")
-      ->RenderString("u64", "40000000002")
-      ->RenderString("i64", "-40000000003")
-      ->RenderString("sf64", "-40000000004")
-      ->RenderString("s64", "-40000000005")
-      ->RenderString("str", "string1")
-      ->RenderString("bytes", "U29tZSBCeXRlcw==")  // "Some Bytes"
-      ->RenderString("float", "3.14")
-      ->RenderString("double", "-4.05")
-      ->RenderString("bool", "true")
-      ->StartList("rep_fix32")
-      ->RenderString("", "201")
-      ->EndList()
-      ->StartList("rep_u32")
-      ->RenderString("", "202")
-      ->EndList()
-      ->StartList("rep_i32")
-      ->RenderString("", "-203")
-      ->EndList()
-      ->StartList("rep_sf32")
-      ->RenderString("", "-204")
-      ->EndList()
-      ->StartList("rep_s32")
-      ->RenderString("", "-205")
-      ->EndList()
-      ->StartList("rep_fix64")
-      ->RenderString("", "80000000001")
-      ->EndList()
-      ->StartList("rep_u64")
-      ->RenderString("", "80000000002")
-      ->EndList()
-      ->StartList("rep_i64")
-      ->RenderString("", "-80000000003")
-      ->EndList()
-      ->StartList("rep_sf64")
-      ->RenderString("", "-80000000004")
-      ->EndList()
-      ->StartList("rep_s64")
-      ->RenderString("", "-80000000005")
-      ->EndList()
-      ->StartList("rep_str")
-      ->RenderString("", "string2")
-      ->EndList()
-      ->StartList("rep_bytes")
-      ->RenderString("", "TW9yZSBCeXRlcw==")  // "More Bytes"
-      ->EndList()
-      ->StartList("rep_float")
-      ->RenderString("", "6.14")
-      ->EndList()
-      ->StartList("rep_double")
-      ->RenderString("", "-8.05")
-      ->EndList()
-      ->StartList("rep_bool")
-      ->RenderString("", "false")
-      ->EndList()
-      ->EndObject();
-  CheckOutput(full);
-}
-
-TEST_P(ProtoStreamObjectWriterTest, InfinityInputTest) {
-  Primitive full;
-  full.set_double_(std::numeric_limits<double>::infinity());
-  full.set_float_(std::numeric_limits<float>::infinity());
-  full.set_str("-Infinity");
-
-  ResetTypeInfo(Primitive::descriptor());
-
-  EXPECT_CALL(listener_, InvalidValue(_, StringPiece("TYPE_INT32"),
-                                      StringPiece("\"Infinity\"")))
-      .With(Args<0>(HasObjectLocation("i32")));
-  EXPECT_CALL(listener_, InvalidValue(_, StringPiece("TYPE_UINT32"),
-                                      StringPiece("\"Infinity\"")))
-      .With(Args<0>(HasObjectLocation("u32")));
-  EXPECT_CALL(listener_, InvalidValue(_, StringPiece("TYPE_SFIXED64"),
-                                      StringPiece("\"-Infinity\"")))
-      .With(Args<0>(HasObjectLocation("sf64")));
-  EXPECT_CALL(listener_, InvalidValue(_, StringPiece("TYPE_BOOL"),
-                                      StringPiece("\"Infinity\"")))
-      .With(Args<0>(HasObjectLocation("bool")));
-
-  ow_->StartObject("")
-      ->RenderString("double", "Infinity")
-      ->RenderString("float", "Infinity")
-      ->RenderString("i32", "Infinity")
-      ->RenderString("u32", "Infinity")
-      ->RenderString("sf64", "-Infinity")
-      ->RenderString("str", "-Infinity")
-      ->RenderString("bool", "Infinity")
-      ->EndObject();
-  CheckOutput(full);
-}
-
-TEST_P(ProtoStreamObjectWriterTest, NaNInputTest) {
-  Primitive full;
-  full.set_double_(std::numeric_limits<double>::quiet_NaN());
-  full.set_float_(std::numeric_limits<float>::quiet_NaN());
-  full.set_str("NaN");
-
-  ResetTypeInfo(Primitive::descriptor());
-
-  EXPECT_CALL(listener_, InvalidValue(_, StringPiece("TYPE_INT32"),
-                                      StringPiece("\"NaN\"")))
-      .With(Args<0>(HasObjectLocation("i32")));
-  EXPECT_CALL(listener_, InvalidValue(_, StringPiece("TYPE_UINT32"),
-                                      StringPiece("\"NaN\"")))
-      .With(Args<0>(HasObjectLocation("u32")));
-  EXPECT_CALL(listener_, InvalidValue(_, StringPiece("TYPE_SFIXED64"),
-                                      StringPiece("\"NaN\"")))
-      .With(Args<0>(HasObjectLocation("sf64")));
-  EXPECT_CALL(listener_, InvalidValue(_, StringPiece("TYPE_BOOL"),
-                                      StringPiece("\"NaN\"")))
-      .With(Args<0>(HasObjectLocation("bool")));
-
-  ow_->StartObject("")
-      ->RenderString("double", "NaN")
-      ->RenderString("float", "NaN")
-      ->RenderString("i32", "NaN")
-      ->RenderString("u32", "NaN")
-      ->RenderString("sf64", "NaN")
-      ->RenderString("str", "NaN")
-      ->RenderString("bool", "NaN")
-      ->EndObject();
-
-  CheckOutput(full);
-}
-
-TEST_P(ProtoStreamObjectWriterTest, ImplicitPrimitiveList) {
-  Book expected;
-  Author* author = expected.mutable_author();
-  author->set_name("The Author");
-  author->add_pseudonym("first");
-  author->add_pseudonym("second");
-
-  ow_->StartObject("")
-      ->StartObject("author")
-      ->RenderString("name", "The Author")
-      ->RenderString("pseudonym", "first")
-      ->RenderString("pseudonym", "second")
-      ->EndObject()
-      ->EndObject();
-  CheckOutput(expected);
-}
-
-TEST_P(ProtoStreamObjectWriterTest,
-       LastWriteWinsOnNonRepeatedPrimitiveFieldWithDuplicates) {
-  Book expected;
-  Author* author = expected.mutable_author();
-  author->set_name("second");
-
-  ow_->StartObject("")
-      ->StartObject("author")
-      ->RenderString("name", "first")
-      ->RenderString("name", "second")
-      ->EndObject()
-      ->EndObject();
-  CheckOutput(expected);
-}
-
-TEST_P(ProtoStreamObjectWriterTest, ExplicitPrimitiveList) {
-  Book expected;
-  Author* author = expected.mutable_author();
-  author->set_name("The Author");
-  author->add_pseudonym("first");
-  author->add_pseudonym("second");
-
-  ow_->StartObject("")
-      ->StartObject("author")
-      ->RenderString("name", "The Author")
-      ->StartList("pseudonym")
-      ->RenderString("", "first")
-      ->RenderString("", "second")
-      ->EndList()
-      ->EndObject()
-      ->EndObject();
-  CheckOutput(expected);
-}
-
-TEST_P(ProtoStreamObjectWriterTest, NonRepeatedExplicitPrimitiveList) {
-  Book expected;
-  expected.set_allocated_author(new Author());
-
-  EXPECT_CALL(
-      listener_,
-      InvalidName(_, StringPiece("name"),
-                  StringPiece(
-                      "Proto field is not repeating, cannot start list.")))
-      .With(Args<0>(HasObjectLocation("author")));
-  ow_->StartObject("")
-      ->StartObject("author")
-      ->StartList("name")
-      ->RenderString("", "first")
-      ->RenderString("", "second")
-      ->EndList()
-      ->EndObject()
-      ->EndObject();
-  CheckOutput(expected);
-}
-
-TEST_P(ProtoStreamObjectWriterTest, ImplicitMessageList) {
-  Book expected;
-  Author* outer = expected.mutable_author();
-  outer->set_name("outer");
-  outer->set_alive(true);
-  Author* first = outer->add_friend_();
-  first->set_name("first");
-  Author* second = outer->add_friend_();
-  second->set_name("second");
-
-  ow_->StartObject("")
-      ->StartObject("author")
-      ->RenderString("name", "outer")
-      ->RenderBool("alive", true)
-      ->StartObject("friend")
-      ->RenderString("name", "first")
-      ->EndObject()
-      ->StartObject("friend")
-      ->RenderString("name", "second")
-      ->EndObject()
-      ->EndObject()
-      ->EndObject();
-  CheckOutput(expected);
-}
-
-TEST_P(ProtoStreamObjectWriterTest, DisableImplicitMessageList) {
-  options_.disable_implicit_message_list = true;
-  options_.suppress_implicit_message_list_error = true;
-  ResetProtoWriter();
-
-  Book expected;
-  // The repeated friend field of the author is empty.
-  expected.mutable_author();
-
-  EXPECT_CALL(listener_, InvalidValue(_, _, _)).Times(0);
-
-  ow_->StartObject("")
-      ->StartObject("author")
-      ->StartObject("friend")
-      ->RenderString("name", "first")
-      ->EndObject()
-      ->StartObject("friend")
-      ->RenderString("name", "second")
-      ->EndObject()
-      ->EndObject()
-      ->EndObject();
-  CheckOutput(expected);
-}
-
-TEST_P(ProtoStreamObjectWriterTest,
-       DisableImplicitMessageListWithoutErrorSuppressed) {
-  options_.disable_implicit_message_list = true;
-  ResetProtoWriter();
-
-  Book expected;
-  // The repeated friend field of the author is empty.
-  expected.mutable_author();
-  EXPECT_CALL(
-      listener_,
-      InvalidValue(
-          _, StringPiece("friend"),
-          StringPiece(
-              "Starting an object in a repeated field but the parent object "
-              "is not a list")))
-      .With(Args<0>(HasObjectLocation("author")))
-      .Times(2);
-
-  ow_->StartObject("")
-      ->StartObject("author")
-      ->StartObject("friend")
-      ->RenderString("name", "first")
-      ->EndObject()
-      ->StartObject("friend")
-      ->RenderString("name", "second")
-      ->EndObject()
-      ->EndObject()
-      ->EndObject();
-  CheckOutput(expected);
-}
-
-TEST_P(ProtoStreamObjectWriterTest,
-       LastWriteWinsOnNonRepeatedMessageFieldWithDuplicates) {
-  Book expected;
-  Author* author = expected.mutable_author();
-  author->set_name("The Author");
-  Publisher* publisher = expected.mutable_publisher();
-  publisher->set_name("second");
-
-  ow_->StartObject("")
-      ->StartObject("author")
-      ->RenderString("name", "The Author")
-      ->EndObject()
-      ->StartObject("publisher")
-      ->RenderString("name", "first")
-      ->EndObject()
-      ->StartObject("publisher")
-      ->RenderString("name", "second")
-      ->EndObject()
-      ->EndObject();
-  CheckOutput(expected);
-}
-
-TEST_P(ProtoStreamObjectWriterTest, ExplicitMessageList) {
-  Book expected;
-  Author* outer = expected.mutable_author();
-  outer->set_name("outer");
-  outer->set_alive(true);
-  Author* first = outer->add_friend_();
-  first->set_name("first");
-  Author* second = outer->add_friend_();
-  second->set_name("second");
-
-  ow_->StartObject("")
-      ->StartObject("author")
-      ->RenderString("name", "outer")
-      ->RenderBool("alive", true)
-      ->StartList("friend")
-      ->StartObject("")
-      ->RenderString("name", "first")
-      ->EndObject()
-      ->StartObject("")
-      ->RenderString("name", "second")
-      ->EndObject()
-      ->EndList()
-      ->EndObject()
-      ->EndObject();
-  CheckOutput(expected);
-}
-
-TEST_P(ProtoStreamObjectWriterTest, NonRepeatedExplicitMessageList) {
-  Book expected;
-  Author* author = expected.mutable_author();
-  author->set_name("The Author");
-
-  EXPECT_CALL(
-      listener_,
-      InvalidName(_, StringPiece("publisher"),
-                  StringPiece(
-                      "Proto field is not repeating, cannot start list.")))
-      .With(Args<0>(HasObjectLocation("")));
-  ow_->StartObject("")
-      ->StartObject("author")
-      ->RenderString("name", "The Author")
-      ->EndObject()
-      ->StartList("publisher")
-      ->StartObject("")
-      ->RenderString("name", "first")
-      ->EndObject()
-      ->StartObject("")
-      ->RenderString("name", "second")
-      ->EndObject()
-      ->EndList()
-      ->EndObject();
-  CheckOutput(expected);
-}
-
-TEST_P(ProtoStreamObjectWriterTest, UnknownFieldAtRoot) {
-  Book empty;
-
-  EXPECT_CALL(listener_, InvalidName(_, StringPiece("unknown"),
-                                     StringPiece("Cannot find field.")))
-      .With(Args<0>(HasObjectLocation("")));
-  ow_->StartObject("")->RenderString("unknown", "Nope!")->EndObject();
-  CheckOutput(empty, 0);
-}
-
-TEST_P(ProtoStreamObjectWriterTest, UnknownFieldAtAuthorFriend) {
-  Book expected;
-  Author* paul = expected.mutable_author();
-  paul->set_name("Paul");
-  Author* mark = paul->add_friend_();
-  mark->set_name("Mark");
-  Author* john = paul->add_friend_();
-  john->set_name("John");
-  Author* luke = paul->add_friend_();
-  luke->set_name("Luke");
-
-  EXPECT_CALL(listener_, InvalidName(_, StringPiece("address"),
-                                     StringPiece("Cannot find field.")))
-      .With(Args<0>(HasObjectLocation("author.friend[1]")));
-  ow_->StartObject("")
-      ->StartObject("author")
-      ->RenderString("name", "Paul")
-      ->StartList("friend")
-      ->StartObject("")
-      ->RenderString("name", "Mark")
-      ->EndObject()
-      ->StartObject("")
-      ->RenderString("name", "John")
-      ->RenderString("address", "Patmos")
-      ->EndObject()
-      ->StartObject("")
-      ->RenderString("name", "Luke")
-      ->EndObject()
-      ->EndList()
-      ->EndObject()
-      ->EndObject();
-  CheckOutput(expected);
-}
-
-TEST_P(ProtoStreamObjectWriterTest, UnknownObjectAtRoot) {
-  Book empty;
-
-  EXPECT_CALL(listener_, InvalidName(_, StringPiece("unknown"),
-                                     StringPiece("Cannot find field.")))
-      .With(Args<0>(HasObjectLocation("")));
-  ow_->StartObject("")->StartObject("unknown")->EndObject()->EndObject();
-  CheckOutput(empty, 0);
-}
-
-TEST_P(ProtoStreamObjectWriterTest, UnknownObjectAtAuthor) {
-  Book expected;
-  Author* author = expected.mutable_author();
-  author->set_name("William");
-  author->add_pseudonym("Bill");
-
-  EXPECT_CALL(listener_, InvalidName(_, StringPiece("wife"),
-                                     StringPiece("Cannot find field.")))
-      .With(Args<0>(HasObjectLocation("author")));
-  ow_->StartObject("")
-      ->StartObject("author")
-      ->RenderString("name", "William")
-      ->StartObject("wife")
-      ->RenderString("name", "Hilary")
-      ->EndObject()
-      ->RenderString("pseudonym", "Bill")
-      ->EndObject()
-      ->EndObject();
-  CheckOutput(expected);
-}
-
-TEST_P(ProtoStreamObjectWriterTest, UnknownListAtRoot) {
-  Book empty;
-
-  EXPECT_CALL(listener_, InvalidName(_, StringPiece("unknown"),
-                                     StringPiece("Cannot find field.")))
-      .With(Args<0>(HasObjectLocation("")));
-  ow_->StartObject("")->StartList("unknown")->EndList()->EndObject();
-  CheckOutput(empty, 0);
-}
-
-TEST_P(ProtoStreamObjectWriterTest, UnknownListAtPublisher) {
-  Book expected;
-  expected.set_title("Brainwashing");
-  Publisher* publisher = expected.mutable_publisher();
-  publisher->set_name("propaganda");
-
-  EXPECT_CALL(listener_, InvalidName(_, StringPiece("alliance"),
-                                     StringPiece("Cannot find field.")))
-      .With(Args<0>(HasObjectLocation("publisher")));
-  ow_->StartObject("")
-      ->StartObject("publisher")
-      ->RenderString("name", "propaganda")
-      ->StartList("alliance")
-      ->EndList()
-      ->EndObject()
-      ->RenderString("title", "Brainwashing")
-      ->EndObject();
-  CheckOutput(expected);
-}
-
-TEST_P(ProtoStreamObjectWriterTest, IgnoreUnknownFieldAtRoot) {
-  Book empty;
-
-  options_.ignore_unknown_fields = true;
-  ResetProtoWriter();
-
-  EXPECT_CALL(listener_, InvalidName(_, _, _)).Times(0);
-  ow_->StartObject("")->RenderString("unknown", "Nope!")->EndObject();
-  CheckOutput(empty, 0);
-}
-
-TEST_P(ProtoStreamObjectWriterTest, IgnoreUnknownFieldAtAuthorFriend) {
-  Book expected;
-  Author* paul = expected.mutable_author();
-  paul->set_name("Paul");
-  Author* mark = paul->add_friend_();
-  mark->set_name("Mark");
-  Author* john = paul->add_friend_();
-  john->set_name("John");
-  Author* luke = paul->add_friend_();
-  luke->set_name("Luke");
-
-  options_.ignore_unknown_fields = true;
-  ResetProtoWriter();
-
-  EXPECT_CALL(listener_, InvalidName(_, _, _)).Times(0);
-  ow_->StartObject("")
-      ->StartObject("author")
-      ->RenderString("name", "Paul")
-      ->StartList("friend")
-      ->StartObject("")
-      ->RenderString("name", "Mark")
-      ->EndObject()
-      ->StartObject("")
-      ->RenderString("name", "John")
-      ->RenderString("address", "Patmos")
-      ->EndObject()
-      ->StartObject("")
-      ->RenderString("name", "Luke")
-      ->EndObject()
-      ->EndList()
-      ->EndObject()
-      ->EndObject();
-  CheckOutput(expected);
-}
-
-TEST_P(ProtoStreamObjectWriterTest, IgnoreUnknownObjectAtRoot) {
-  Book empty;
-
-  options_.ignore_unknown_fields = true;
-  ResetProtoWriter();
-
-  EXPECT_CALL(listener_, InvalidName(_, StringPiece("unknown"),
-                                     StringPiece("Cannot find field.")))
-      .Times(0);
-  ow_->StartObject("")->StartObject("unknown")->EndObject()->EndObject();
-  CheckOutput(empty, 0);
-}
-
-TEST_P(ProtoStreamObjectWriterTest, IgnoreUnknownObjectAtAuthor) {
-  Book expected;
-  Author* author = expected.mutable_author();
-  author->set_name("William");
-  author->add_pseudonym("Bill");
-
-  options_.ignore_unknown_fields = true;
-  ResetProtoWriter();
-
-  EXPECT_CALL(listener_, InvalidName(_, _, _)).Times(0);
-  ow_->StartObject("")
-      ->StartObject("author")
-      ->RenderString("name", "William")
-      ->StartObject("wife")
-      ->RenderString("name", "Hilary")
-      ->EndObject()
-      ->RenderString("pseudonym", "Bill")
-      ->EndObject()
-      ->EndObject();
-  CheckOutput(expected);
-}
-
-TEST_P(ProtoStreamObjectWriterTest, IgnoreUnknownListAtRoot) {
-  Book empty;
-
-  options_.ignore_unknown_fields = true;
-  ResetProtoWriter();
-
-  EXPECT_CALL(listener_, InvalidName(_, _, _)).Times(0);
-  ow_->StartObject("")->StartList("unknown")->EndList()->EndObject();
-  CheckOutput(empty, 0);
-}
-
-TEST_P(ProtoStreamObjectWriterTest, IgnoreUnknownListAtPublisher) {
-  Book expected;
-  expected.set_title("Brainwashing");
-  Publisher* publisher = expected.mutable_publisher();
-  publisher->set_name("propaganda");
-
-  options_.ignore_unknown_fields = true;
-  ResetProtoWriter();
-
-  EXPECT_CALL(listener_, InvalidName(_, _, _)).Times(0);
-  ow_->StartObject("")
-      ->StartObject("publisher")
-      ->RenderString("name", "propaganda")
-      ->StartList("alliance")
-      ->EndList()
-      ->EndObject()
-      ->RenderString("title", "Brainwashing")
-      ->EndObject();
-  CheckOutput(expected);
-}
-
-TEST_P(ProtoStreamObjectWriterTest,
-       IgnoreUnknownFieldsDontIgnoreUnknownEnumValues) {
-  ResetTypeInfo(Proto3Message::descriptor());
-
-  Proto3Message expected;
-  EXPECT_CALL(
-      listener_,
-      InvalidValue(_,
-                   StringPiece(
-                       "type.googleapis.com/"
-                       "proto_util_converter.testing.Proto3Message.NestedEnum"),
-                   StringPiece("\"someunknownvalueyouwillneverknow\"")))
-      .With(Args<0>(HasObjectLocation("enum_value")));
-  ow_->StartObject("")
-      ->RenderString("enumValue", "someunknownvalueyouwillneverknow")
-      ->EndObject();
-  CheckOutput(expected);
-}
-
-TEST_P(ProtoStreamObjectWriterTest, AcceptUnknownEnumValue) {
-  ResetTypeInfo(Proto3Message::descriptor());
-
-  Proto3Message expected;
-  expected.set_enum_value(static_cast<Proto3Message::NestedEnum>(12345));
-
-  EXPECT_CALL(listener_, InvalidValue(_, _, _)).Times(0);
-  ow_->StartObject("")->RenderInt32("enumValue", 12345)->EndObject();
-  CheckOutput(expected);
-}
-
-TEST_P(ProtoStreamObjectWriterTest, MissingRequiredField) {
-  Book expected;
-  expected.set_title("My Title");
-  expected.set_allocated_publisher(new Publisher());
-
-  EXPECT_CALL(listener_, MissingField(_, StringPiece("name")))
-      .With(Args<0>(HasObjectLocation("publisher")));
-  ow_->StartObject("")
-      ->StartObject("publisher")
-      ->EndObject()
-      ->RenderString("title", "My Title")
-      ->EndObject();
-  CheckOutput(expected);
-}
-
-TEST_P(ProtoStreamObjectWriterTest, InvalidFieldValueAtRoot) {
-  Book empty;
-
-  EXPECT_CALL(listener_, InvalidValue(_, StringPiece("TYPE_UINT32"),
-                                      StringPiece("\"garbage\"")))
-      .With(Args<0>(HasObjectLocation("length")));
-  ow_->StartObject("")->RenderString("length", "garbage")->EndObject();
-  CheckOutput(empty, 0);
-}
-
-TEST_P(ProtoStreamObjectWriterTest, MultipleInvalidFieldValues) {
-  Book expected;
-  expected.set_title("My Title");
-
-  EXPECT_CALL(listener_, InvalidValue(_, StringPiece("TYPE_UINT32"),
-                                      StringPiece("\"-400\"")))
-      .With(Args<0>(HasObjectLocation("length")));
-  EXPECT_CALL(listener_, InvalidValue(_, StringPiece("TYPE_INT64"),
-                                      StringPiece("\"3.14\"")))
-      .With(Args<0>(HasObjectLocation("published")));
-  ow_->StartObject("")
-      ->RenderString("length", "-400")
-      ->RenderString("published", "3.14")
-      ->RenderString("title", "My Title")
-      ->EndObject();
-  CheckOutput(expected);
-}
-
-TEST_P(ProtoStreamObjectWriterTest, UnnamedFieldAtRoot) {
-  Book empty;
-
-  EXPECT_CALL(listener_,
-              InvalidName(_, StringPiece(""),
-                          StringPiece("Proto fields must have a name.")))
-      .With(Args<0>(HasObjectLocation("")));
-  ow_->StartObject("")->RenderFloat("", 3.14)->EndObject();
-  CheckOutput(empty, 0);
-}
-
-TEST_P(ProtoStreamObjectWriterTest, UnnamedFieldAtAuthor) {
-  Book expected;
-  expected.set_title("noname");
-  expected.set_allocated_author(new Author());
-
-  EXPECT_CALL(listener_,
-              InvalidName(_, StringPiece(""),
-                          StringPiece("Proto fields must have a name.")))
-      .With(Args<0>(HasObjectLocation("author")));
-  ow_->StartObject("")
-      ->StartObject("author")
-      ->RenderInt32("", 123)
-      ->EndObject()
-      ->RenderString("title", "noname")
-      ->EndObject();
-  CheckOutput(expected);
-}
-
-TEST_P(ProtoStreamObjectWriterTest, UnnamedListAtRoot) {
-  Book expected;
-  expected.set_title("noname");
-
-  EXPECT_CALL(listener_,
-              InvalidName(_, StringPiece(""),
-                          StringPiece("Proto fields must have a name.")))
-      .With(Args<0>(HasObjectLocation("")));
-  ow_->StartObject("")
-      ->StartList("")
-      ->EndList()
-      ->RenderString("title", "noname")
-      ->EndObject();
-  CheckOutput(expected);
-}
-
-TEST_P(ProtoStreamObjectWriterTest, RootNamedObject) {
-  Book expected;
-  expected.set_title("Annie");
-
-  EXPECT_CALL(
-      listener_,
-      InvalidName(_, StringPiece("oops"),
-                  StringPiece("Root element should not be named.")))
-      .With(Args<0>(HasObjectLocation("")));
-  ow_->StartObject("oops")->RenderString("title", "Annie")->EndObject();
-  CheckOutput(expected, 7);
-}
-
-TEST_P(ProtoStreamObjectWriterTest, RootNamedList) {
-  Book empty;
-
-  EXPECT_CALL(
-      listener_,
-      InvalidName(_, StringPiece("oops"),
-                  StringPiece("Root element should not be named.")))
-      .With(Args<0>(HasObjectLocation("")));
-  ow_->StartList("oops")->RenderString("", "item")->EndList();
-  CheckOutput(empty, 0);
-}
-
-TEST_P(ProtoStreamObjectWriterTest, RootUnnamedField) {
-  Book empty;
-
-  EXPECT_CALL(listener_,
-              InvalidName(_, StringPiece(""),
-                          StringPiece("Root element must be a message.")))
-      .With(Args<0>(HasObjectLocation("")));
-  ow_->RenderBool("", true);
-  CheckOutput(empty, 0);
-}
-
-TEST_P(ProtoStreamObjectWriterTest, RootNamedField) {
-  Book empty;
-
-  EXPECT_CALL(listener_,
-              InvalidName(_, StringPiece("oops"),
-                          StringPiece("Root element must be a message.")))
-      .With(Args<0>(HasObjectLocation("")));
-  ow_->RenderBool("oops", true);
-  CheckOutput(empty, 0);
-}
-
-TEST_P(ProtoStreamObjectWriterTest, NullValue) {
-  Book empty;
-
-  ow_->RenderNull("");
-  CheckOutput(empty, 0);
-}
-
-TEST_P(ProtoStreamObjectWriterTest, NullValueForMessageField) {
-  Book empty;
-
-  ow_->RenderNull("author");
-  CheckOutput(empty, 0);
-}
-
-TEST_P(ProtoStreamObjectWriterTest, NullValueForPrimitiveField) {
-  Book empty;
-
-  ow_->RenderNull("length");
-  CheckOutput(empty, 0);
-}
-
-class ProtoStreamObjectWriterTimestampDurationTest
-    : public BaseProtoStreamObjectWriterTest {
- protected:
-  ProtoStreamObjectWriterTimestampDurationTest() {
-    std::vector<const Descriptor*> descriptors;
-    descriptors.push_back(TimestampDuration::descriptor());
-    descriptors.push_back(google::protobuf::Timestamp::descriptor());
-    descriptors.push_back(google::protobuf::Duration::descriptor());
-    ResetTypeInfo(descriptors);
-  }
-};
-
-INSTANTIATE_TEST_SUITE_P(DifferentTypeInfoSourceTest,
-                         ProtoStreamObjectWriterTimestampDurationTest,
-                         ::testing::Values(
-                             testing::USE_TYPE_RESOLVER));
-
-TEST_P(ProtoStreamObjectWriterTimestampDurationTest, ParseTimestamp) {
-  TimestampDuration timestamp;
-  google::protobuf::Timestamp* ts = timestamp.mutable_ts();
-  ts->set_seconds(1448249855);
-  ts->set_nanos(33155000);
-
-  ow_->StartObject("")
-      ->RenderString("ts", "2015-11-23T03:37:35.033155Z")
-      ->EndObject();
-  CheckOutput(timestamp);
-}
-
-TEST_P(ProtoStreamObjectWriterTimestampDurationTest,
-       ParseTimestampYearNotZeroPadded) {
-  TimestampDuration timestamp;
-  google::protobuf::Timestamp* ts = timestamp.mutable_ts();
-  ts->set_seconds(-61665654145);
-  ts->set_nanos(33155000);
-
-  ow_->StartObject("")
-      ->RenderString("ts", "15-11-23T03:37:35.033155Z")
-      ->EndObject();
-  CheckOutput(timestamp);
-}
-
-TEST_P(ProtoStreamObjectWriterTimestampDurationTest,
-       ParseTimestampYearZeroPadded) {
-  TimestampDuration timestamp;
-  google::protobuf::Timestamp* ts = timestamp.mutable_ts();
-  ts->set_seconds(-61665654145);
-  ts->set_nanos(33155000);
-
-  ow_->StartObject("")
-      ->RenderString("ts", "0015-11-23T03:37:35.033155Z")
-      ->EndObject();
-  CheckOutput(timestamp);
-}
-
-TEST_P(ProtoStreamObjectWriterTimestampDurationTest,
-       ParseTimestampWithPositiveOffset) {
-  TimestampDuration timestamp;
-  google::protobuf::Timestamp* ts = timestamp.mutable_ts();
-  ts->set_seconds(1448249855);
-  ts->set_nanos(33155000);
-
-  ow_->StartObject("")
-      ->RenderString("ts", "2015-11-23T11:47:35.033155+08:10")
-      ->EndObject();
-  CheckOutput(timestamp);
-}
-
-TEST_P(ProtoStreamObjectWriterTimestampDurationTest,
-       ParseTimestampWithNegativeOffset) {
-  TimestampDuration timestamp;
-  google::protobuf::Timestamp* ts = timestamp.mutable_ts();
-  ts->set_seconds(1448249855);
-  ts->set_nanos(33155000);
-
-  ow_->StartObject("")
-      ->RenderString("ts", "2015-11-22T19:47:35.033155-07:50")
-      ->EndObject();
-  CheckOutput(timestamp);
-}
-
-TEST_P(ProtoStreamObjectWriterTimestampDurationTest,
-       TimestampWithInvalidOffset1) {
-  TimestampDuration timestamp;
-
-  EXPECT_CALL(
-      listener_,
-      InvalidValue(
-          _, StringPiece("type.googleapis.com/google.protobuf.Timestamp"),
-          StringPiece("Field 'ts', Invalid time format: "
-                      "2016-03-07T15:14:23+")));
-
-  ow_->StartObject("")->RenderString("ts", "2016-03-07T15:14:23+")->EndObject();
-  CheckOutput(timestamp);
-}
-
-TEST_P(ProtoStreamObjectWriterTimestampDurationTest,
-       TimestampWithInvalidOffset2) {
-  TimestampDuration timestamp;
-
-  EXPECT_CALL(
-      listener_,
-      InvalidValue(
-          _, StringPiece("type.googleapis.com/google.protobuf.Timestamp"),
-          StringPiece("Field 'ts', Invalid time format: "
-                      "2016-03-07T15:14:23+08-10")));
-
-  ow_->StartObject("")
-      ->RenderString("ts", "2016-03-07T15:14:23+08-10")
-      ->EndObject();
-  CheckOutput(timestamp);
-}
-
-TEST_P(ProtoStreamObjectWriterTimestampDurationTest,
-       TimestampWithInvalidOffset3) {
-  TimestampDuration timestamp;
-
-  EXPECT_CALL(
-      listener_,
-      InvalidValue(
-          _, StringPiece("type.googleapis.com/google.protobuf.Timestamp"),
-          StringPiece("Field 'ts', Invalid time format: "
-                      "2016-03-07T15:14:23+24:10")));
-
-  ow_->StartObject("")
-      ->RenderString("ts", "2016-03-07T15:14:23+24:10")
-      ->EndObject();
-  CheckOutput(timestamp);
-}
-
-TEST_P(ProtoStreamObjectWriterTimestampDurationTest,
-       TimestampWithInvalidOffset4) {
-  TimestampDuration timestamp;
-
-  EXPECT_CALL(
-      listener_,
-      InvalidValue(
-          _, StringPiece("type.googleapis.com/google.protobuf.Timestamp"),
-          StringPiece("Field 'ts', Invalid time format: "
-                      "2016-03-07T15:14:23+04:60")));
-
-  ow_->StartObject("")
-      ->RenderString("ts", "2016-03-07T15:14:23+04:60")
-      ->EndObject();
-  CheckOutput(timestamp);
-}
-
-TEST_P(ProtoStreamObjectWriterTimestampDurationTest, InvalidTimestampError1) {
-  TimestampDuration timestamp;
-
-  EXPECT_CALL(
-      listener_,
-      InvalidValue(
-          _, StringPiece("type.googleapis.com/google.protobuf.Timestamp"),
-          StringPiece("Field 'ts', Invalid time format: ")));
-
-  ow_->StartObject("")->RenderString("ts", "")->EndObject();
-  CheckOutput(timestamp);
-}
-
-TEST_P(ProtoStreamObjectWriterTimestampDurationTest, InvalidTimestampError2) {
-  TimestampDuration timestamp;
-
-  EXPECT_CALL(
-      listener_,
-      InvalidValue(
-          _, StringPiece("type.googleapis.com/google.protobuf.Timestamp"),
-          StringPiece("Field 'ts', Invalid time format: Z")));
-
-  ow_->StartObject("")->RenderString("ts", "Z")->EndObject();
-  CheckOutput(timestamp);
-}
-
-TEST_P(ProtoStreamObjectWriterTimestampDurationTest, InvalidTimestampError3) {
-  TimestampDuration timestamp;
-
-  EXPECT_CALL(
-      listener_,
-      InvalidValue(
-          _, StringPiece("type.googleapis.com/google.protobuf.Timestamp"),
-          StringPiece("Field 'ts', Invalid time format: "
-                      "1970-01-01T00:00:00.ABZ")));
-
-  ow_->StartObject("")
-      ->RenderString("ts", "1970-01-01T00:00:00.ABZ")
-      ->EndObject();
-  CheckOutput(timestamp);
-}
-
-TEST_P(ProtoStreamObjectWriterTimestampDurationTest, InvalidTimestampError4) {
-  TimestampDuration timestamp;
-
-  EXPECT_CALL(
-      listener_,
-      InvalidValue(
-          _, StringPiece("type.googleapis.com/google.protobuf.Timestamp"),
-          StringPiece("Field 'ts', Invalid time format: "
-                      "-8031-10-18T00:00:00.000Z")));
-
-  ow_->StartObject("")
-      ->RenderString("ts", "-8031-10-18T00:00:00.000Z")
-      ->EndObject();
-  CheckOutput(timestamp);
-}
-
-TEST_P(ProtoStreamObjectWriterTimestampDurationTest, InvalidTimestampError5) {
-  TimestampDuration timestamp;
-
-  EXPECT_CALL(
-      listener_,
-      InvalidValue(
-          _, StringPiece("type.googleapis.com/google.protobuf.Timestamp"),
-          StringPiece("Field 'ts', Invalid time format: "
-                      "2015-11-23T03:37:35.033155   Z")));
-
-  ow_->StartObject("")
-      // Whitespace in the Timestamp nanos is not allowed.
-      ->RenderString("ts", "2015-11-23T03:37:35.033155   Z")
-      ->EndObject();
-  CheckOutput(timestamp);
-}
-
-TEST_P(ProtoStreamObjectWriterTimestampDurationTest, InvalidTimestampError6) {
-  TimestampDuration timestamp;
-
-  EXPECT_CALL(
-      listener_,
-      InvalidValue(
-          _, StringPiece("type.googleapis.com/google.protobuf.Timestamp"),
-          StringPiece("Field 'ts', Invalid time format: "
-                      "2015-11-23T03:37:35.033155 1234Z")));
-
-  ow_->StartObject("")
-      // Whitespace in the Timestamp nanos is not allowed.
-      ->RenderString("ts", "2015-11-23T03:37:35.033155 1234Z")
-      ->EndObject();
-  CheckOutput(timestamp);
-}
-
-TEST_P(ProtoStreamObjectWriterTimestampDurationTest, InvalidTimestampError7) {
-  TimestampDuration timestamp;
-
-  EXPECT_CALL(
-      listener_,
-      InvalidValue(
-          _, StringPiece("type.googleapis.com/google.protobuf.Timestamp"),
-          StringPiece("Field 'ts', Invalid time format: "
-                      "2015-11-23T03:37:35.033abc155Z")));
-
-  ow_->StartObject("")
-      // Non-numeric characters in the Timestamp nanos is not allowed.
-      ->RenderString("ts", "2015-11-23T03:37:35.033abc155Z")
-      ->EndObject();
-  CheckOutput(timestamp);
-}
-
-TEST_P(ProtoStreamObjectWriterTimestampDurationTest, InvalidTimestampError8) {
-  TimestampDuration timestamp;
-
-  EXPECT_CALL(
-      listener_,
-      InvalidValue(
-          _, StringPiece("type.googleapis.com/google.protobuf.Timestamp"),
-          StringPiece("Field 'ts', Invalid time format: "
-                      "0-12-31T23:59:59.000Z")));
-
-  ow_->StartObject("")
-      ->RenderString("ts", "0-12-31T23:59:59.000Z")
-      ->EndObject();
-  CheckOutput(timestamp);
-}
-
-TEST_P(ProtoStreamObjectWriterTimestampDurationTest, ParseDuration) {
-  TimestampDuration duration;
-  google::protobuf::Duration* dur = duration.mutable_dur();
-  dur->set_seconds(1448216930);
-  dur->set_nanos(132262000);
-
-  ow_->StartObject("")->RenderString("dur", "1448216930.132262s")->EndObject();
-  CheckOutput(duration);
-}
-
-TEST_P(ProtoStreamObjectWriterTimestampDurationTest, InvalidDurationError1) {
-  TimestampDuration duration;
-
-  EXPECT_CALL(
-      listener_,
-      InvalidValue(
-          _, StringPiece("type.googleapis.com/google.protobuf.Duration"),
-          StringPiece(
-              "Field 'dur', Illegal duration format; duration must "
-              "end with 's'")));
-
-  ow_->StartObject("")->RenderString("dur", "")->EndObject();
-  CheckOutput(duration);
-}
-
-TEST_P(ProtoStreamObjectWriterTimestampDurationTest, InvalidDurationError2) {
-  TimestampDuration duration;
-
-  EXPECT_CALL(
-      listener_,
-      InvalidValue(
-          _, StringPiece("type.googleapis.com/google.protobuf.Duration"),
-          StringPiece(
-              "Field 'dur', Invalid duration format, failed to parse "
-              "seconds")));
-
-  ow_->StartObject("")->RenderString("dur", "s")->EndObject();
-  CheckOutput(duration);
-}
-
-TEST_P(ProtoStreamObjectWriterTimestampDurationTest, InvalidDurationError3) {
-  TimestampDuration duration;
-
-  EXPECT_CALL(
-      listener_,
-      InvalidValue(
-          _, StringPiece("type.googleapis.com/google.protobuf.Duration"),
-          StringPiece("Field 'dur', Invalid duration format, failed to "
-                            "parse nano seconds")));
-
-  ow_->StartObject("")->RenderString("dur", "123.DEFs")->EndObject();
-  CheckOutput(duration);
-}
-
-TEST_P(ProtoStreamObjectWriterTimestampDurationTest, InvalidDurationError4) {
-  TimestampDuration duration;
-
-  EXPECT_CALL(
-      listener_,
-      InvalidValue(
-          _, StringPiece("type.googleapis.com/google.protobuf.Duration"),
-          StringPiece("Field 'dur', Duration value exceeds limits")));
-
-  ow_->StartObject("")->RenderString("dur", "315576000002s")->EndObject();
-  CheckOutput(duration);
-}
-
-TEST_P(ProtoStreamObjectWriterTimestampDurationTest, InvalidDurationError5) {
-  TimestampDuration duration;
-
-  EXPECT_CALL(
-      listener_,
-      InvalidValue(
-          _, StringPiece("type.googleapis.com/google.protobuf.Duration"),
-          StringPiece("Field 'dur', Duration value exceeds limits")));
-
-  ow_->StartObject("")->RenderString("dur", "0.1000000001s")->EndObject();
-  CheckOutput(duration);
-}
-
-TEST_P(ProtoStreamObjectWriterTimestampDurationTest,
-       MismatchedTimestampTypeInput) {
-  TimestampDuration timestamp;
-  EXPECT_CALL(
-      listener_,
-      InvalidValue(
-          _, StringPiece("type.googleapis.com/google.protobuf.Timestamp"),
-          StringPiece(
-              "Field 'ts', Invalid data type for timestamp, value is 1")))
-      .With(Args<0>(HasObjectLocation("ts")));
-  ow_->StartObject("")->RenderInt32("ts", 1)->EndObject();
-  CheckOutput(timestamp);
-}
-
-TEST_P(ProtoStreamObjectWriterTimestampDurationTest,
-       MismatchedDurationTypeInput) {
-  TimestampDuration duration;
-  EXPECT_CALL(
-      listener_,
-      InvalidValue(
-          _, StringPiece("type.googleapis.com/google.protobuf.Duration"),
-          StringPiece(
-              "Field 'dur', Invalid data type for duration, value is 1")))
-      .With(Args<0>(HasObjectLocation("dur")));
-  ow_->StartObject("")->RenderInt32("dur", 1)->EndObject();
-  CheckOutput(duration);
-}
-
-TEST_P(ProtoStreamObjectWriterTimestampDurationTest, TimestampAcceptsNull) {
-  TimestampDuration timestamp;
-  EXPECT_CALL(listener_, InvalidValue(_, _, _)).Times(0);
-  ow_->StartObject("")->RenderNull("ts")->EndObject();
-  CheckOutput(timestamp);
-}
-
-TEST_P(ProtoStreamObjectWriterTimestampDurationTest, DurationAcceptsNull) {
-  TimestampDuration duration;
-  EXPECT_CALL(listener_, InvalidValue(_, _, _)).Times(0);
-  ow_->StartObject("")->RenderNull("dur")->EndObject();
-  CheckOutput(duration);
-}
-
-class ProtoStreamObjectWriterStructTest
-    : public BaseProtoStreamObjectWriterTest {
- protected:
-  ProtoStreamObjectWriterStructTest() { ResetProtoWriter(); }
-
-  // Resets ProtoWriter with current set of options and other state.
-  void ResetProtoWriter() {
-    std::vector<const Descriptor*> descriptors;
-    descriptors.push_back(StructType::descriptor());
-    descriptors.push_back(google::protobuf::Struct::descriptor());
-    ResetTypeInfo(descriptors);
-  }
-};
-
-INSTANTIATE_TEST_SUITE_P(DifferentTypeInfoSourceTest,
-                         ProtoStreamObjectWriterStructTest,
-                         ::testing::Values(
-                             testing::USE_TYPE_RESOLVER));
-
-// TODO(skarvaje): Write tests for failure cases.
-TEST_P(ProtoStreamObjectWriterStructTest, StructRenderSuccess) {
-  StructType struct_type;
-  google::protobuf::Struct* s = struct_type.mutable_object();
-  s->mutable_fields()->operator[]("k1").set_number_value(123);
-  s->mutable_fields()->operator[]("k2").set_bool_value(true);
-
-  ow_->StartObject("")
-      ->StartObject("object")
-      ->RenderDouble("k1", 123)
-      ->RenderBool("k2", true)
-      ->EndObject()
-      ->EndObject();
-  CheckOutput(struct_type);
-}
-
-TEST_P(ProtoStreamObjectWriterStructTest, StructNullInputSuccess) {
-  StructType struct_type;
-  EXPECT_CALL(listener_,
-              InvalidName(_, StringPiece(""),
-                          StringPiece("Proto fields must have a name.")))
-      .With(Args<0>(HasObjectLocation("")));
-  ow_->StartObject("")->RenderNull("")->EndObject();
-  CheckOutput(struct_type);
-}
-
-TEST_P(ProtoStreamObjectWriterStructTest, StructInvalidInputFailure) {
-  StructType struct_type;
-  EXPECT_CALL(
-      listener_,
-      InvalidValue(
-          _, StringPiece("type.googleapis.com/google.protobuf.Struct"),
-          StringPiece("true")))
-      .With(Args<0>(HasObjectLocation("object")));
-
-  ow_->StartObject("")->RenderBool("object", true)->EndObject();
-  CheckOutput(struct_type);
-}
-
-TEST_P(ProtoStreamObjectWriterStructTest, StructAcceptsNull) {
-  StructType struct_type;
-  EXPECT_CALL(listener_, InvalidValue(_, _, _)).Times(0);
-
-  ow_->StartObject("")->RenderNull("object")->EndObject();
-  CheckOutput(struct_type);
-}
-
-TEST_P(ProtoStreamObjectWriterStructTest, StructValuePreservesNull) {
-  StructType struct_type;
-  (*struct_type.mutable_object()->mutable_fields())["key"].set_null_value(
-      google::protobuf::NULL_VALUE);
-  EXPECT_CALL(listener_, InvalidValue(_, _, _)).Times(0);
-
-  ow_->StartObject("")
-      ->StartObject("object")
-      ->RenderNull("key")
-      ->EndObject()
-      ->EndObject();
-  CheckOutput(struct_type);
-}
-
-TEST_P(ProtoStreamObjectWriterStructTest, SimpleRepeatedStructMapKeyTest) {
-  EXPECT_CALL(listener_,
-              InvalidName(_, StringPiece("gBike"),
-                          StringPiece(
-                              "Repeated map key: 'gBike' is already set.")));
-  ow_->StartObject("")
-      ->StartObject("object")
-      ->RenderString("gBike", "v1")
-      ->RenderString("gBike", "v2")
-      ->EndObject()
-      ->EndObject();
-}
-
-TEST_P(ProtoStreamObjectWriterStructTest, RepeatedStructMapListKeyTest) {
-  EXPECT_CALL(
-      listener_,
-      InvalidName(_, StringPiece("k1"),
-                  StringPiece("Repeated map key: 'k1' is already set.")));
-  ow_->StartObject("")
-      ->StartObject("object")
-      ->RenderString("k1", "v1")
-      ->StartList("k1")
-      ->RenderString("", "v2")
-      ->EndList()
-      ->EndObject()
-      ->EndObject();
-}
-
-TEST_P(ProtoStreamObjectWriterStructTest, RepeatedStructMapObjectKeyTest) {
-  EXPECT_CALL(
-      listener_,
-      InvalidName(_, StringPiece("k1"),
-                  StringPiece("Repeated map key: 'k1' is already set.")));
-  ow_->StartObject("")
-      ->StartObject("object")
-      ->StartObject("k1")
-      ->RenderString("sub_k1", "v1")
-      ->EndObject()
-      ->StartObject("k1")
-      ->RenderString("sub_k2", "v2")
-      ->EndObject()
-      ->EndObject()
-      ->EndObject();
-}
-
-TEST_P(ProtoStreamObjectWriterStructTest, OptionStructIntAsStringsTest) {
-  StructType struct_type;
-  google::protobuf::Struct* s = struct_type.mutable_object();
-  s->mutable_fields()->operator[]("k1").set_string_value("123");
-  s->mutable_fields()->operator[]("k2").set_bool_value(true);
-  s->mutable_fields()->operator[]("k3").set_string_value("-222222222");
-  s->mutable_fields()->operator[]("k4").set_string_value("33333333");
-
-  options_.struct_integers_as_strings = true;
-  ResetProtoWriter();
-
-  ow_->StartObject("")
-      ->StartObject("object")
-      ->RenderDouble("k1", 123)
-      ->RenderBool("k2", true)
-      ->RenderInt64("k3", -222222222)
-      ->RenderUint64("k4", 33333333)
-      ->EndObject()
-      ->EndObject();
-  CheckOutput(struct_type);
-}
-
-TEST_P(ProtoStreamObjectWriterStructTest, Struct32BitIntsAndFloatsTest) {
-  StructType struct_type;
-  google::protobuf::Struct* s = struct_type.mutable_object();
-  s->mutable_fields()->operator[]("k1").set_number_value(1.5);
-  s->mutable_fields()->operator[]("k2").set_number_value(100);
-  s->mutable_fields()->operator[]("k3").set_number_value(100);
-  ResetProtoWriter();
-
-  ow_->StartObject("")
-      ->StartObject("object")
-      ->RenderFloat("k1", 1.5)
-      ->RenderInt32("k2", 100)
-      ->RenderUint32("k3", 100)
-      ->EndObject()
-      ->EndObject();
-  CheckOutput(struct_type);
-}
-
-TEST_P(ProtoStreamObjectWriterStructTest,
-       Struct32BitIntsAndFloatsAsStringsTest) {
-  StructType struct_type;
-  google::protobuf::Struct* s = struct_type.mutable_object();
-  s->mutable_fields()->operator[]("k1").set_string_value("1.5");
-  s->mutable_fields()->operator[]("k2").set_string_value("100");
-  s->mutable_fields()->operator[]("k3").set_string_value("100");
-
-  options_.struct_integers_as_strings = true;
-  ResetProtoWriter();
-
-  ow_->StartObject("")
-      ->StartObject("object")
-      ->RenderFloat("k1", 1.5)
-      ->RenderInt32("k2", 100)
-      ->RenderUint32("k3", 100)
-      ->EndObject()
-      ->EndObject();
-  CheckOutput(struct_type);
-}
-
-TEST_P(ProtoStreamObjectWriterStructTest, ValuePreservesNull) {
-  ValueWrapper value;
-  value.mutable_value()->set_null_value(google::protobuf::NULL_VALUE);
-
-  EXPECT_CALL(listener_, InvalidValue(_, _, _)).Times(0);
-  ow_->StartObject("")->RenderNull("value")->EndObject();
-  CheckOutput(value);
-}
-
-class ProtoStreamObjectWriterMapTest : public BaseProtoStreamObjectWriterTest {
- protected:
-  ProtoStreamObjectWriterMapTest() {
-    std::vector<const Descriptor*> descriptors;
-    descriptors.push_back(MapIn::descriptor());
-    descriptors.push_back(google::protobuf::DoubleValue::descriptor());
-    ResetTypeInfo(descriptors);
-  }
-};
-
-INSTANTIATE_TEST_SUITE_P(DifferentTypeInfoSourceTest,
-                         ProtoStreamObjectWriterMapTest,
-                         ::testing::Values(
-                             testing::USE_TYPE_RESOLVER));
-
-TEST_P(ProtoStreamObjectWriterMapTest, MapShouldNotAcceptList) {
-  MapIn mm;
-  EXPECT_CALL(
-      listener_,
-      InvalidValue(_, StringPiece("Map"),
-                   StringPiece(
-                       "Cannot bind a list to map for field 'map_input'.")));
-  ow_->StartObject("")
-      ->StartList("map_input")
-      ->RenderString("a", "b")
-      ->EndList()
-      ->EndObject();
-  CheckOutput(mm);
-}
-
-TEST_P(ProtoStreamObjectWriterMapTest, MapAcceptsNullValue) {
-  // Null should not be a valid map value.
-  // See http://go/proto3-json-spec#heading=h.r2ddatp7y4vi
-  // This test is added for backward compatibility.
-  MapIn mm;
-  (*mm.mutable_map_input())["a"] = "b";
-  (*mm.mutable_map_input())["x"] = "";
-  ow_->StartObject("")
-      ->StartObject("map_input")
-      ->RenderString("a", "b")
-      ->RenderNull("x")
-      ->EndObject()
-      ->EndObject();
-  CheckOutput(mm);
-}
-
-TEST_P(ProtoStreamObjectWriterMapTest, MapShouldIgnoreNullValueEntry) {
-  options_.ignore_null_value_map_entry = true;
-  ResetTypeInfo(MapIn::descriptor());
-  MapIn mm;
-  (*mm.mutable_map_input())["a"] = "b";
-  ow_->StartObject("")
-      ->StartObject("map_input")
-      ->RenderString("a", "b")
-      ->RenderNull("x")
-      ->EndObject()
-      ->EndObject();
-  CheckOutput(mm);
-}
-
-TEST_P(ProtoStreamObjectWriterMapTest, RepeatedMapKeyTest) {
-  EXPECT_CALL(
-      listener_,
-      InvalidName(_, StringPiece("k1"),
-                  StringPiece("Repeated map key: 'k1' is already set.")));
-  ow_->StartObject("")
-      ->RenderString("other", "test")
-      ->StartObject("map_input")
-      ->RenderString("k1", "v1")
-      ->RenderString("k1", "v2")
-      ->EndObject()
-      ->EndObject();
-}
-
-TEST_P(ProtoStreamObjectWriterMapTest, AnyInMap) {
-  MapIn mm;
-  google::protobuf::DoubleValue d;
-  d.set_value(40.2);
-  (*mm.mutable_map_any())["foo"].PackFrom(d);
-  ow_->StartObject("")
-      ->StartObject("map_any")
-      ->StartObject("foo")
-      ->RenderString("@type", "type.googleapis.com/google.protobuf.DoubleValue")
-      ->RenderDouble("value", 40.2)
-      ->EndObject()
-      ->EndObject()
-      ->EndObject();
-  CheckOutput(mm);
-}
-
-class ProtoStreamObjectWriterAnyTest : public BaseProtoStreamObjectWriterTest {
- protected:
-  ProtoStreamObjectWriterAnyTest() {
-    std::vector<const Descriptor*> descriptors;
-    descriptors.push_back(AnyOut::descriptor());
-    descriptors.push_back(Book::descriptor());
-    descriptors.push_back(google::protobuf::Any::descriptor());
-    descriptors.push_back(google::protobuf::DoubleValue::descriptor());
-    descriptors.push_back(google::protobuf::FieldMask::descriptor());
-    descriptors.push_back(google::protobuf::Int32Value::descriptor());
-    descriptors.push_back(google::protobuf::Struct::descriptor());
-    descriptors.push_back(google::protobuf::Timestamp::descriptor());
-    descriptors.push_back(google::protobuf::Value::descriptor());
-    ResetTypeInfo(descriptors);
-  }
-};
-
-INSTANTIATE_TEST_SUITE_P(DifferentTypeInfoSourceTest,
-                         ProtoStreamObjectWriterAnyTest,
-                         ::testing::Values(
-                             testing::USE_TYPE_RESOLVER));
-
-TEST_P(ProtoStreamObjectWriterAnyTest, AnyRenderSuccess) {
-  AnyOut any;
-  google::protobuf::Any* any_type = any.mutable_any();
-  any_type->set_type_url("type.googleapis.com/google.protobuf.DoubleValue");
-  google::protobuf::DoubleValue d;
-  d.set_value(40.2);
-  any_type->set_value(d.SerializeAsString());
-
-  ow_->StartObject("")
-      ->StartObject("any")
-      ->RenderString("@type", "type.googleapis.com/google.protobuf.DoubleValue")
-      ->RenderDouble("value", 40.2)
-      ->EndObject()
-      ->EndObject();
-  CheckOutput(any);
-}
-
-TEST_P(ProtoStreamObjectWriterAnyTest, RecursiveAny) {
-  AnyOut out;
-  ::google::protobuf::Any* any = out.mutable_any();
-  any->set_type_url("type.googleapis.com/google.protobuf.Any");
-
-  ::google::protobuf::Any nested_any;
-  nested_any.set_type_url(
-      "type.googleapis.com/proto_util_converter.testing.AnyM");
-
-  AnyM m;
-  m.set_foo("foovalue");
-  nested_any.set_value(m.SerializeAsString());
-
-  any->set_value(nested_any.SerializeAsString());
-
-  ow_->StartObject("")
-      ->StartObject("any")
-      ->RenderString("@type", "type.googleapis.com/google.protobuf.Any")
-      ->StartObject("value")
-      ->RenderString("@type",
-                     "type.googleapis.com/proto_util_converter.testing.AnyM")
-      ->RenderString("foo", "foovalue")
-      ->EndObject()
-      ->EndObject()
-      ->EndObject();
-  CheckOutput(out, 112);
-}
-
-TEST_P(ProtoStreamObjectWriterAnyTest, DoubleRecursiveAny) {
-  AnyOut out;
-  ::google::protobuf::Any* any = out.mutable_any();
-  any->set_type_url("type.googleapis.com/google.protobuf.Any");
-
-  ::google::protobuf::Any nested_any;
-  nested_any.set_type_url("type.googleapis.com/google.protobuf.Any");
-
-  ::google::protobuf::Any second_nested_any;
-  second_nested_any.set_type_url(
-      "type.googleapis.com/proto_util_converter.testing.AnyM");
-
-  AnyM m;
-  m.set_foo("foovalue");
-  second_nested_any.set_value(m.SerializeAsString());
-
-  nested_any.set_value(second_nested_any.SerializeAsString());
-  any->set_value(nested_any.SerializeAsString());
-
-  ow_->StartObject("")
-      ->StartObject("any")
-      ->RenderString("@type", "type.googleapis.com/google.protobuf.Any")
-      ->StartObject("value")
-      ->RenderString("@type", "type.googleapis.com/google.protobuf.Any")
-      ->StartObject("value")
-      ->RenderString("@type",
-                     "type.googleapis.com/proto_util_converter.testing.AnyM")
-      ->RenderString("foo", "foovalue")
-      ->EndObject()
-      ->EndObject()
-      ->EndObject()
-      ->EndObject();
-  CheckOutput(out, 156);
-}
-
-TEST_P(ProtoStreamObjectWriterAnyTest, TypeUrlAtEnd) {
-  Book book;
-  book.set_title("C++");
-  book.set_length(1234);
-  book.set_content("Hello World!");
-
-  ::google::protobuf::Any any;
-  any.PackFrom(book);
-
-  ::google::protobuf::Any outer_any;
-  outer_any.PackFrom(any);
-
-  AnyOut out;
-  out.mutable_any()->PackFrom(outer_any);
-
-  // Put the @type field at the end of each Any message. Parsers should
-  // be able to accept that.
-  ow_->StartObject("")
-      ->StartObject("any")
-      ->StartObject("value")
-      ->StartObject("value")
-      ->RenderString("title", "C++")
-      ->RenderInt32("length", 1234)
-      ->RenderBytes("content", "Hello World!")
-      ->RenderString("@type",
-                     "type.googleapis.com/proto_util_converter.testing.Book")
-      ->EndObject()
-      ->RenderString("@type", "type.googleapis.com/google.protobuf.Any")
-      ->EndObject()
-      ->RenderString("@type", "type.googleapis.com/google.protobuf.Any")
-      ->EndObject()
-      ->EndObject();
-  CheckOutput(out);
-}
-
-// Same as TypeUrlAtEnd, but use temporary string values to make sure we don't
-// mistakenly store StringPiece objects pointing to invalid memory.
-TEST_P(ProtoStreamObjectWriterAnyTest, TypeUrlAtEndWithTemporaryStrings) {
-  Book book;
-  book.set_title("C++");
-  book.set_length(1234);
-  book.set_content("Hello World!");
-
-  ::google::protobuf::Any any;
-  any.PackFrom(book);
-
-  ::google::protobuf::Any outer_any;
-  outer_any.PackFrom(any);
-
-  AnyOut out;
-  out.mutable_any()->PackFrom(outer_any);
-
-  std::string name, value;
-  // Put the @type field at the end of each Any message. Parsers should
-  // be able to accept that.
-  ow_->StartObject("")->StartObject("any");
-  {
-    ow_->StartObject("value");
-    {
-      ow_->StartObject("value");
-      {
-        name = "title";
-        value = "C++";
-        ow_->RenderString(name, value);
-        name = "length";
-        ow_->RenderInt32(name, 1234);
-        name = "content";
-        value = "Hello World!";
-        ow_->RenderBytes(name, value);
-        name = "@type";
-        value = "type.googleapis.com/proto_util_converter.testing.Book";
-        ow_->RenderString(name, value);
-      }
-      ow_->EndObject();
-
-      name = "@type";
-      value = "type.googleapis.com/google.protobuf.Any";
-      ow_->RenderString(name, value);
-    }
-    ow_->EndObject();
-
-    name = "@type";
-    value = "type.googleapis.com/google.protobuf.Any";
-    ow_->RenderString(name, value);
-  }
-  ow_->EndObject()->EndObject();
-  CheckOutput(out);
-}
-
-TEST_P(ProtoStreamObjectWriterAnyTest, EmptyAnyFromEmptyObject) {
-  AnyOut out;
-  out.mutable_any();
-
-  EXPECT_CALL(listener_, InvalidValue(_, _, _)).Times(0);
-
-  ow_->StartObject("")->StartObject("any")->EndObject()->EndObject();
-
-  CheckOutput(out, 2);
-}
-
-TEST_P(ProtoStreamObjectWriterAnyTest, AnyWithoutTypeUrlFails1) {
-  AnyOut any;
-
-  EXPECT_CALL(
-      listener_,
-      InvalidValue(_, StringPiece("Any"),
-                   StringPiece("Missing @type for any field in "
-                                     "proto_util_converter.testing.AnyOut")));
-
-  ow_->StartObject("")
-      ->StartObject("any")
-      ->StartObject("another")
-      ->EndObject()
-      ->EndObject()
-      ->EndObject();
-  CheckOutput(any);
-}
-
-TEST_P(ProtoStreamObjectWriterAnyTest, AnyWithoutTypeUrlFails2) {
-  AnyOut any;
-
-  EXPECT_CALL(
-      listener_,
-      InvalidValue(_, StringPiece("Any"),
-                   StringPiece("Missing @type for any field in "
-                                     "proto_util_converter.testing.AnyOut")));
-
-  ow_->StartObject("")
-      ->StartObject("any")
-      ->StartList("another")
-      ->EndObject()
-      ->EndObject()
-      ->EndObject();
-  CheckOutput(any);
-}
-
-TEST_P(ProtoStreamObjectWriterAnyTest, AnyWithoutTypeUrlFails3) {
-  AnyOut any;
-
-  EXPECT_CALL(
-      listener_,
-      InvalidValue(_, StringPiece("Any"),
-                   StringPiece("Missing @type for any field in "
-                                     "proto_util_converter.testing.AnyOut")));
-
-  ow_->StartObject("")
-      ->StartObject("any")
-      ->RenderString("value", "somevalue")
-      ->EndObject()
-      ->EndObject();
-  CheckOutput(any);
-}
-
-TEST_P(ProtoStreamObjectWriterAnyTest, AnyWithInvalidTypeUrlFails) {
-  AnyOut any;
-
-  EXPECT_CALL(
-      listener_,
-      InvalidValue(
-          _, StringPiece("Any"),
-          StringPiece("Invalid type URL, type URLs must be of the form "
-                            "'type.googleapis.com/<typename>', got: "
-                            "type.other.com/some.Type")));
-
-  ow_->StartObject("")
-      ->StartObject("any")
-      ->RenderString("@type", "type.other.com/some.Type")
-      ->RenderDouble("value", 40.2)
-      ->EndObject()
-      ->EndObject();
-  CheckOutput(any);
-}
-
-TEST_P(ProtoStreamObjectWriterAnyTest, AnyWithUnknownTypeFails) {
-  AnyOut any;
-
-  EXPECT_CALL(listener_,
-              InvalidValue(_, StringPiece("Any"),
-                           StringPiece(
-                               "Invalid type URL, unknown type: some.Type")));
-  ow_->StartObject("")
-      ->StartObject("any")
-      ->RenderString("@type", "type.googleapis.com/some.Type")
-      ->RenderDouble("value", 40.2)
-      ->EndObject()
-      ->EndObject();
-  CheckOutput(any);
-}
-
-TEST_P(ProtoStreamObjectWriterAnyTest, AnyIncorrectInputTypeFails) {
-  AnyOut any;
-
-  EXPECT_CALL(
-      listener_,
-      InvalidValue(_,
-                   StringPiece("type.googleapis.com/google.protobuf.Any"),
-                   StringPiece("1")));
-  ow_->StartObject("")->RenderInt32("any", 1)->EndObject();
-  CheckOutput(any);
-}
-
-TEST_P(ProtoStreamObjectWriterAnyTest, AnyAcceptsNull) {
-  AnyOut any;
-
-  EXPECT_CALL(listener_, InvalidValue(_, _, _)).Times(0);
-  ow_->StartObject("")->RenderNull("any")->EndObject();
-  CheckOutput(any);
-}
-
-TEST_P(ProtoStreamObjectWriterAnyTest, AnyWellKnownTypeErrorTest) {
-  EXPECT_CALL(listener_, InvalidValue(_, StringPiece("Any"),
-                                      StringPiece("Invalid time format: ")));
-
-  AnyOut any;
-  google::protobuf::Any* any_type = any.mutable_any();
-  any_type->set_type_url("type.googleapis.com/google.protobuf.Timestamp");
-
-  ow_->StartObject("")
-      ->StartObject("any")
-      ->RenderString("@type", "type.googleapis.com/google.protobuf.Timestamp")
-      ->RenderString("value", "")
-      ->EndObject()
-      ->EndObject();
-  CheckOutput(any);
-}
-
-// Test the following case:
-//
-// {
-//   "any": {
-//     "@type": "type.googleapis.com/google.protobuf.Value",
-//     "value": "abc"
-//   }
-// }
-TEST_P(ProtoStreamObjectWriterAnyTest, AnyWithNestedPrimitiveValue) {
-  AnyOut out;
-  ::google::protobuf::Any* any = out.mutable_any();
-
-  ::google::protobuf::Value value;
-  value.set_string_value("abc");
-  any->PackFrom(value);
-
-  ow_->StartObject("")
-      ->StartObject("any")
-      ->RenderString("@type", "type.googleapis.com/google.protobuf.Value")
-      ->RenderString("value", "abc")
-      ->EndObject()
-      ->EndObject();
-  CheckOutput(out);
-}
-
-// Test the following case:
-//
-// {
-//   "any": {
-//     "@type": "type.googleapis.com/google.protobuf.Value",
-//     "value": {
-//       "foo": "abc"
-//     }
-//   }
-// }
-TEST_P(ProtoStreamObjectWriterAnyTest, AnyWithNestedObjectValue) {
-  AnyOut out;
-  ::google::protobuf::Any* any = out.mutable_any();
-
-  ::google::protobuf::Value value;
-  (*value.mutable_struct_value()->mutable_fields())["foo"].set_string_value(
-      "abc");
-  any->PackFrom(value);
-
-  ow_->StartObject("")
-      ->StartObject("any")
-      ->RenderString("@type", "type.googleapis.com/google.protobuf.Value")
-      ->StartObject("value")
-      ->RenderString("foo", "abc")
-      ->EndObject()
-      ->EndObject()
-      ->EndObject();
-  CheckOutput(out);
-}
-
-// Test the following case:
-//
-// {
-//   "any": {
-//     "@type": "type.googleapis.com/google.protobuf.Value",
-//     "value": ["hello"],
-//   }
-// }
-TEST_P(ProtoStreamObjectWriterAnyTest, AnyWithNestedArrayValue) {
-  AnyOut out;
-  ::google::protobuf::Any* any = out.mutable_any();
-
-  ::google::protobuf::Value value;
-  value.mutable_list_value()->add_values()->set_string_value("hello");
-  any->PackFrom(value);
-
-  ow_->StartObject("")
-      ->StartObject("any")
-      ->RenderString("@type", "type.googleapis.com/google.protobuf.Value")
-      ->StartList("value")
-      ->RenderString("", "hello")
-      ->EndList()
-      ->EndObject()
-      ->EndObject()
-      ->EndObject();
-  CheckOutput(out);
-}
-
-// Test the following case:
-//
-// {
-//   "any": {
-//     "@type": "type.googleapis.com/google.protobuf.Value",
-//     "not_value": ""
-//   }
-// }
-TEST_P(ProtoStreamObjectWriterAnyTest,
-       AnyWellKnownTypesNoValueFieldForPrimitive) {
-  EXPECT_CALL(
-      listener_,
-      InvalidValue(
-          _, StringPiece("Any"),
-          StringPiece("Expect a \"value\" field for well-known types.")));
-  AnyOut any;
-  google::protobuf::Any* any_type = any.mutable_any();
-  any_type->set_type_url("type.googleapis.com/google.protobuf.Value");
-
-  ow_->StartObject("")
-      ->StartObject("any")
-      ->RenderString("@type", "type.googleapis.com/google.protobuf.Value")
-      ->RenderString("not_value", "")
-      ->EndObject()
-      ->EndObject();
-  CheckOutput(any);
-}
-
-// Test the following case:
-//
-// {
-//   "any": {
-//     "@type": "type.googleapis.com/google.protobuf.Value",
-//     "not_value": {}
-//   }
-// }
-TEST_P(ProtoStreamObjectWriterAnyTest, AnyWellKnownTypesNoValueFieldForObject) {
-  EXPECT_CALL(
-      listener_,
-      InvalidValue(
-          _, StringPiece("Any"),
-          StringPiece("Expect a \"value\" field for well-known types.")));
-  AnyOut any;
-  google::protobuf::Any* any_type = any.mutable_any();
-  any_type->set_type_url("type.googleapis.com/google.protobuf.Value");
-
-  ow_->StartObject("")
-      ->StartObject("any")
-      ->RenderString("@type", "type.googleapis.com/google.protobuf.Value")
-      ->StartObject("not_value")
-      ->EndObject()
-      ->EndObject()
-      ->EndObject();
-  CheckOutput(any);
-}
-
-// Test the following case:
-//
-// {
-//   "any": {
-//     "@type": "type.googleapis.com/google.protobuf.Value",
-//     "not_value": [],
-//   }
-// }
-TEST_P(ProtoStreamObjectWriterAnyTest, AnyWellKnownTypesNoValueFieldForArray) {
-  EXPECT_CALL(
-      listener_,
-      InvalidValue(
-          _, StringPiece("Any"),
-          StringPiece("Expect a \"value\" field for well-known types.")));
-  AnyOut any;
-  google::protobuf::Any* any_type = any.mutable_any();
-  any_type->set_type_url("type.googleapis.com/google.protobuf.Value");
-
-  ow_->StartObject("")
-      ->StartObject("any")
-      ->RenderString("@type", "type.googleapis.com/google.protobuf.Value")
-      ->StartList("not_value")
-      ->EndList()
-      ->EndObject()
-      ->EndObject()
-      ->EndObject();
-  CheckOutput(any);
-}
-
-// Test the following case:
-//
-// {
-//   "any": {
-//     "@type": "type.googleapis.com/google.protobuf.Struct",
-//     "value": "",
-//   }
-// }
-TEST_P(ProtoStreamObjectWriterAnyTest, AnyWellKnownTypesExpectObjectForStruct) {
-  EXPECT_CALL(listener_,
-              InvalidValue(_, StringPiece("Any"),
-                           StringPiece("Expect a JSON object.")));
-  AnyOut any;
-  google::protobuf::Any* any_type = any.mutable_any();
-  any_type->set_type_url("type.googleapis.com/google.protobuf.Struct");
-
-  ow_->StartObject("")
-      ->StartObject("any")
-      ->RenderString("@type", "type.googleapis.com/google.protobuf.Struct")
-      ->RenderString("value", "")
-      ->EndObject()
-      ->EndObject();
-  CheckOutput(any);
-}
-
-// Test the following case:
-//
-// {
-//   "any": {
-//     "@type": "type.googleapis.com/google.protobuf.Any",
-//     "value": "",
-//   }
-// }
-TEST_P(ProtoStreamObjectWriterAnyTest, AnyWellKnownTypesExpectObjectForAny) {
-  EXPECT_CALL(listener_,
-              InvalidValue(_, StringPiece("Any"),
-                           StringPiece("Expect a JSON object.")));
-  AnyOut any;
-  google::protobuf::Any* any_type = any.mutable_any();
-  any_type->set_type_url("type.googleapis.com/google.protobuf.Any");
-
-  ow_->StartObject("")
-      ->StartObject("any")
-      ->RenderString("@type", "type.googleapis.com/google.protobuf.Any")
-      ->RenderString("value", "")
-      ->EndObject()
-      ->EndObject();
-  CheckOutput(any);
-}
-
-// {
-//   "any": {
-//     "@type": "type.googleapis.com/google.protobuf.Any",
-//     "value": null
-//   }
-// }
-TEST_P(ProtoStreamObjectWriterAnyTest, AnyInAnyAcceptsNull) {
-  AnyOut out;
-  google::protobuf::Any empty;
-  out.mutable_any()->PackFrom(empty);
-
-  EXPECT_CALL(listener_, InvalidValue(_, _, _)).Times(0);
-  ow_->StartObject("")
-      ->StartObject("any")
-      ->RenderString("@type", "type.googleapis.com/google.protobuf.Any")
-      ->RenderNull("value")
-      ->EndObject()
-      ->EndObject();
-  CheckOutput(out);
-}
-
-// {
-//   "any": {
-//     "@type": "type.googleapis.com/google.protobuf.Timestamp",
-//     "value": null
-//   }
-// }
-TEST_P(ProtoStreamObjectWriterAnyTest, TimestampInAnyAcceptsNull) {
-  AnyOut out;
-  google::protobuf::Timestamp empty;
-  out.mutable_any()->PackFrom(empty);
-
-  EXPECT_CALL(listener_, InvalidValue(_, _, _)).Times(0);
-  ow_->StartObject("")
-      ->StartObject("any")
-      ->RenderString("@type", "type.googleapis.com/google.protobuf.Timestamp")
-      ->RenderNull("value")
-      ->EndObject()
-      ->EndObject();
-  CheckOutput(out);
-}
-
-// {
-//   "any": {
-//     "@type": "type.googleapis.com/google.protobuf.Duration",
-//     "value": null
-//   }
-// }
-TEST_P(ProtoStreamObjectWriterAnyTest, DurationInAnyAcceptsNull) {
-  AnyOut out;
-  google::protobuf::Duration empty;
-  out.mutable_any()->PackFrom(empty);
-
-  EXPECT_CALL(listener_, InvalidValue(_, _, _)).Times(0);
-  ow_->StartObject("")
-      ->StartObject("any")
-      ->RenderString("@type", "type.googleapis.com/google.protobuf.Duration")
-      ->RenderNull("value")
-      ->EndObject()
-      ->EndObject();
-  CheckOutput(out);
-}
-
-// {
-//   "any": {
-//     "@type": "type.googleapis.com/google.protobuf.FieldMask",
-//     "value": null
-//   }
-// }
-TEST_P(ProtoStreamObjectWriterAnyTest, FieldMaskInAnyAcceptsNull) {
-  AnyOut out;
-  google::protobuf::FieldMask empty;
-  out.mutable_any()->PackFrom(empty);
-
-  EXPECT_CALL(listener_, InvalidValue(_, _, _)).Times(0);
-  ow_->StartObject("")
-      ->StartObject("any")
-      ->RenderString("@type", "type.googleapis.com/google.protobuf.FieldMask")
-      ->RenderNull("value")
-      ->EndObject()
-      ->EndObject();
-  CheckOutput(out);
-}
-
-// {
-//   "any": {
-//     "@type": "type.googleapis.com/google.protobuf.Int32Value",
-//     "value": null
-//   }
-// }
-TEST_P(ProtoStreamObjectWriterAnyTest, WrapperInAnyAcceptsNull) {
-  AnyOut out;
-  google::protobuf::Int32Value empty;
-  out.mutable_any()->PackFrom(empty);
-
-  EXPECT_CALL(listener_, InvalidValue(_, _, _)).Times(0);
-  ow_->StartObject("")
-      ->StartObject("any")
-      ->RenderString("@type", "type.googleapis.com/google.protobuf.Int32Value")
-      ->RenderNull("value")
-      ->EndObject()
-      ->EndObject();
-  CheckOutput(out);
-}
-
-class ProtoStreamObjectWriterFieldMaskTest
-    : public BaseProtoStreamObjectWriterTest {
- protected:
-  ProtoStreamObjectWriterFieldMaskTest() {
-    std::vector<const Descriptor*> descriptors;
-    descriptors.push_back(FieldMaskTest::descriptor());
-    descriptors.push_back(google::protobuf::FieldMask::descriptor());
-    ResetTypeInfo(descriptors);
-  }
-};
-
-INSTANTIATE_TEST_SUITE_P(DifferentTypeInfoSourceTest,
-                         ProtoStreamObjectWriterFieldMaskTest,
-                         ::testing::Values(
-                             testing::USE_TYPE_RESOLVER));
-
-TEST_P(ProtoStreamObjectWriterFieldMaskTest, SimpleFieldMaskTest) {
-  FieldMaskTest expected;
-  expected.set_id("1");
-  expected.mutable_single_mask()->add_paths("path1");
-
-  ow_->StartObject("");
-  ow_->RenderString("id", "1");
-  ow_->RenderString("single_mask", "path1");
-  ow_->EndObject();
-
-  CheckOutput(expected);
-}
-
-TEST_P(ProtoStreamObjectWriterFieldMaskTest, MultipleMasksInCompactForm) {
-  FieldMaskTest expected;
-  expected.set_id("1");
-  expected.mutable_single_mask()->add_paths("camel_case1");
-  expected.mutable_single_mask()->add_paths("camel_case2");
-  expected.mutable_single_mask()->add_paths("camel_case3");
-
-  ow_->StartObject("");
-  ow_->RenderString("id", "1");
-  ow_->RenderString("single_mask", "camelCase1,camelCase2,camelCase3");
-  ow_->EndObject();
-
-  CheckOutput(expected);
-}
-
-TEST_P(ProtoStreamObjectWriterFieldMaskTest, RepeatedFieldMaskTest) {
-  FieldMaskTest expected;
-  expected.set_id("1");
-  google::protobuf::FieldMask* mask = expected.add_repeated_mask();
-  mask->add_paths("field1");
-  mask->add_paths("field2");
-  expected.add_repeated_mask()->add_paths("field3");
-
-  ow_->StartObject("");
-  ow_->RenderString("id", "1");
-  ow_->StartList("repeated_mask");
-  ow_->RenderString("", "field1,field2");
-  ow_->RenderString("", "field3");
-  ow_->EndList();
-  ow_->EndObject();
-
-  CheckOutput(expected);
-}
-
-TEST_P(ProtoStreamObjectWriterFieldMaskTest, EmptyFieldMaskTest) {
-  FieldMaskTest expected;
-  expected.set_id("1");
-
-  ow_->StartObject("");
-  ow_->RenderString("id", "1");
-  ow_->RenderString("single_mask", "");
-  ow_->EndObject();
-
-  CheckOutput(expected);
-}
-
-TEST_P(ProtoStreamObjectWriterFieldMaskTest, MaskUsingApiaryStyleShouldWork) {
-  FieldMaskTest expected;
-  expected.set_id("1");
-
-  ow_->StartObject("");
-  ow_->RenderString("id", "1");
-  // Case1
-  ow_->RenderString("single_mask",
-                    "outerField(camelCase1,camelCase2,camelCase3)");
-  expected.mutable_single_mask()->add_paths("outer_field.camel_case1");
-  expected.mutable_single_mask()->add_paths("outer_field.camel_case2");
-  expected.mutable_single_mask()->add_paths("outer_field.camel_case3");
-
-  ow_->StartList("repeated_mask");
-
-  ow_->RenderString("", "a(field1,field2)");
-  google::protobuf::FieldMask* mask = expected.add_repeated_mask();
-  mask->add_paths("a.field1");
-  mask->add_paths("a.field2");
-
-  ow_->RenderString("", "a(field3)");
-  mask = expected.add_repeated_mask();
-  mask->add_paths("a.field3");
-
-  ow_->RenderString("", "a()");
-  expected.add_repeated_mask();
-
-  ow_->RenderString("", "a(,)");
-  expected.add_repeated_mask();
-
-  ow_->RenderString("", "a(field1(field2(field3)))");
-  mask = expected.add_repeated_mask();
-  mask->add_paths("a.field1.field2.field3");
-
-  ow_->RenderString("", "a(field1(field2(field3,field4),field5),field6)");
-  mask = expected.add_repeated_mask();
-  mask->add_paths("a.field1.field2.field3");
-  mask->add_paths("a.field1.field2.field4");
-  mask->add_paths("a.field1.field5");
-  mask->add_paths("a.field6");
-
-  ow_->RenderString("", "a(id,field1(id,field2(field3,field4),field5),field6)");
-  mask = expected.add_repeated_mask();
-  mask->add_paths("a.id");
-  mask->add_paths("a.field1.id");
-  mask->add_paths("a.field1.field2.field3");
-  mask->add_paths("a.field1.field2.field4");
-  mask->add_paths("a.field1.field5");
-  mask->add_paths("a.field6");
-
-  ow_->RenderString("", "a(((field3,field4)))");
-  mask = expected.add_repeated_mask();
-  mask->add_paths("a.field3");
-  mask->add_paths("a.field4");
-
-  ow_->EndList();
-  ow_->EndObject();
-
-  CheckOutput(expected);
-}
-
-TEST_P(ProtoStreamObjectWriterFieldMaskTest, MoreCloseThanOpenParentheses) {
-  EXPECT_CALL(
-      listener_,
-      InvalidValue(
-          _, StringPiece("type.googleapis.com/google.protobuf.FieldMask"),
-          StringPiece("Field 'single_mask', Invalid FieldMask 'a(b,c))'. "
-                            "Cannot find matching '(' for all ')'.")));
-
-  ow_->StartObject("");
-  ow_->RenderString("id", "1");
-  ow_->RenderString("single_mask", "a(b,c))");
-  ow_->EndObject();
-}
-
-TEST_P(ProtoStreamObjectWriterFieldMaskTest, MoreOpenThanCloseParentheses) {
-  EXPECT_CALL(
-      listener_,
-      InvalidValue(
-          _, StringPiece("type.googleapis.com/google.protobuf.FieldMask"),
-          StringPiece(
-              "Field 'single_mask', Invalid FieldMask 'a(((b,c)'. Cannot "
-              "find matching ')' for all '('.")));
-
-  ow_->StartObject("");
-  ow_->RenderString("id", "1");
-  ow_->RenderString("single_mask", "a(((b,c)");
-  ow_->EndObject();
-}
-
-TEST_P(ProtoStreamObjectWriterFieldMaskTest, PathWithMapKeyShouldWork) {
-  FieldMaskTest expected;
-  expected.mutable_single_mask()->add_paths("path.to.map[\"key1\"]");
-  expected.mutable_single_mask()->add_paths(
-      "path.to.map[\"e\\\"[]][scape\\\"\"]");
-  expected.mutable_single_mask()->add_paths("path.to.map[\"key2\"]");
-
-  ow_->StartObject("");
-  ow_->RenderString("single_mask",
-                    "path.to.map[\"key1\"],path.to.map[\"e\\\"[]][scape\\\"\"],"
-                    "path.to.map[\"key2\"]");
-  ow_->EndObject();
-
-  CheckOutput(expected);
-}
-
-TEST_P(ProtoStreamObjectWriterFieldMaskTest,
-       MapKeyMustBeAtTheEndOfAPathSegment) {
-  EXPECT_CALL(
-      listener_,
-      InvalidValue(
-          _, StringPiece("type.googleapis.com/google.protobuf.FieldMask"),
-          StringPiece(
-              "Field 'single_mask', Invalid FieldMask "
-              "'path.to.map[\"key1\"]a,path.to.map[\"key2\"]'. "
-              "Map keys should be at the end of a path segment.")));
-
-  ow_->StartObject("");
-  ow_->RenderString("single_mask",
-                    "path.to.map[\"key1\"]a,path.to.map[\"key2\"]");
-  ow_->EndObject();
-}
-
-TEST_P(ProtoStreamObjectWriterFieldMaskTest, MapKeyMustEnd) {
-  EXPECT_CALL(
-      listener_,
-      InvalidValue(
-          _, StringPiece("type.googleapis.com/google.protobuf.FieldMask"),
-          StringPiece("Field 'single_mask', Invalid FieldMask "
-                            "'path.to.map[\"key1\"'. Map keys should be "
-                            "represented as [\"some_key\"].")));
-
-  ow_->StartObject("");
-  ow_->RenderString("single_mask", "path.to.map[\"key1\"");
-  ow_->EndObject();
-}
-
-TEST_P(ProtoStreamObjectWriterFieldMaskTest, MapKeyMustBeEscapedCorrectly) {
-  EXPECT_CALL(
-      listener_,
-      InvalidValue(
-          _, StringPiece("type.googleapis.com/google.protobuf.FieldMask"),
-          StringPiece("Field 'single_mask', Invalid FieldMask "
-                            "'path.to.map[\"ke\"y1\"]'. Map keys should be "
-                            "represented as [\"some_key\"].")));
-
-  ow_->StartObject("");
-  ow_->RenderString("single_mask", "path.to.map[\"ke\"y1\"]");
-  ow_->EndObject();
-}
-
-TEST_P(ProtoStreamObjectWriterFieldMaskTest, MapKeyCanContainAnyChars) {
-  FieldMaskTest expected;
-  expected.mutable_single_mask()->add_paths(
-      // \xE5\xAD\x99 is the UTF-8 byte sequence for chinese character å­™.
-      // We cannot embed non-ASCII characters in the code directly because
-      // some windows compilers will try to interpret them using the system's
-      // current encoding and end up with invalid UTF-8 byte sequence.
-      "path.to.map[\"(),[],\\\"'!@#$%^&*123_|War\xE5\xAD\x99,./?><\\\\\"]");
-  expected.mutable_single_mask()->add_paths("path.to.map[\"key2\"]");
-
-  ow_->StartObject("");
-  ow_->RenderString(
-      "single_mask",
-      "path.to.map[\"(),[],\\\"'!@#$%^&*123_|War\xE5\xAD\x99,./?><\\\\\"],"
-      "path.to.map[\"key2\"]");
-  ow_->EndObject();
-
-  CheckOutput(expected);
-}
-
-TEST_P(ProtoStreamObjectWriterFieldMaskTest, FieldMaskAcceptsNull) {
-  FieldMaskTest expected;
-  EXPECT_CALL(listener_, InvalidValue(_, _, _)).Times(0);
-  ow_->StartObject("")->RenderNull("single_mask")->EndObject();
-  CheckOutput(expected);
-}
-
-class ProtoStreamObjectWriterWrappersTest
-    : public BaseProtoStreamObjectWriterTest {
- protected:
-  ProtoStreamObjectWriterWrappersTest() {
-    std::vector<const Descriptor*> descriptors;
-    descriptors.push_back(Int32Wrapper::descriptor());
-    descriptors.push_back(google::protobuf::Int32Value::descriptor());
-    ResetTypeInfo(descriptors);
-  }
-};
-
-INSTANTIATE_TEST_SUITE_P(DifferentTypeInfoSourceTest,
-                         ProtoStreamObjectWriterWrappersTest,
-                         ::testing::Values(
-                             testing::USE_TYPE_RESOLVER));
-
-TEST_P(ProtoStreamObjectWriterWrappersTest, WrapperAcceptsNull) {
-  Int32Wrapper wrapper;
-  EXPECT_CALL(listener_, InvalidName(_, _, _)).Times(0);
-  ow_->StartObject("")->RenderNull("int32")->EndObject();
-  CheckOutput(wrapper);
-}
-
-class ProtoStreamObjectWriterOneOfsTest
-    : public BaseProtoStreamObjectWriterTest {
- protected:
-  ProtoStreamObjectWriterOneOfsTest() {
-    std::vector<const Descriptor*> descriptors;
-    descriptors.push_back(OneOfsRequest::descriptor());
-    descriptors.push_back(google::protobuf::Struct::descriptor());
-    ResetTypeInfo(descriptors);
-  }
-};
-
-INSTANTIATE_TEST_SUITE_P(DifferentTypeInfoSourceTest,
-                         ProtoStreamObjectWriterOneOfsTest,
-                         ::testing::Values(
-                             testing::USE_TYPE_RESOLVER));
-
-TEST_P(ProtoStreamObjectWriterOneOfsTest,
-       MultipleOneofsFailForPrimitiveTypesTest) {
-  EXPECT_CALL(
-      listener_,
-      InvalidValue(
-          _, StringPiece("oneof"),
-          StringPiece(
-              "oneof field 'data' is already set. Cannot set 'intData'")));
-
-  ow_->StartObject("");
-  ow_->RenderString("strData", "blah");
-  ow_->RenderString("intData", "123");
-  ow_->EndObject();
-}
-
-TEST_P(ProtoStreamObjectWriterOneOfsTest,
-       MultipleOneofsFailForMessageTypesPrimitiveFirstTest) {
-  // Test for setting primitive oneof field first and then message field.
-  EXPECT_CALL(listener_, InvalidValue(_, StringPiece("oneof"),
-                                      StringPiece(
-                                          "oneof field 'data' is already set. "
-                                          "Cannot set 'messageData'")));
-
-  // JSON: { "strData": "blah", "messageData": { "dataValue": 123 } }
-  ow_->StartObject("");
-  ow_->RenderString("strData", "blah");
-  ow_->StartObject("messageData");
-  ow_->RenderInt32("dataValue", 123);
-  ow_->EndObject();
-  ow_->EndObject();
-}
-
-TEST_P(ProtoStreamObjectWriterOneOfsTest,
-       MultipleOneofsFailForMessageTypesMessageFirstTest) {
-  // Test for setting message oneof field first and then primitive field.
-  EXPECT_CALL(listener_, InvalidValue(_, StringPiece("oneof"),
-                                      StringPiece(
-                                          "oneof field 'data' is already set. "
-                                          "Cannot set 'strData'")));
-
-  // JSON: { "messageData": { "dataValue": 123 }, "strData": "blah" }
-  ow_->StartObject("");
-  ow_->StartObject("messageData");
-  ow_->RenderInt32("dataValue", 123);
-  ow_->EndObject();
-  ow_->RenderString("strData", "blah");
-  ow_->EndObject();
-}
-
-TEST_P(ProtoStreamObjectWriterOneOfsTest,
-       MultipleOneofsFailForStructTypesPrimitiveFirstTest) {
-  EXPECT_CALL(listener_, InvalidValue(_, StringPiece("oneof"),
-                                      StringPiece(
-                                          "oneof field 'data' is already set. "
-                                          "Cannot set 'structData'")));
-
-  // JSON: { "strData": "blah", "structData": { "a": "b" } }
-  ow_->StartObject("");
-  ow_->RenderString("strData", "blah");
-  ow_->StartObject("structData");
-  ow_->RenderString("a", "b");
-  ow_->EndObject();
-  ow_->EndObject();
-}
-
-TEST_P(ProtoStreamObjectWriterOneOfsTest,
-       MultipleOneofsFailForStructTypesStructFirstTest) {
-  EXPECT_CALL(listener_, InvalidValue(_, StringPiece("oneof"),
-                                      StringPiece(
-                                          "oneof field 'data' is already set. "
-                                          "Cannot set 'strData'")));
-
-  // JSON: { "structData": { "a": "b" }, "strData": "blah" }
-  ow_->StartObject("");
-  ow_->StartObject("structData");
-  ow_->RenderString("a", "b");
-  ow_->EndObject();
-  ow_->RenderString("strData", "blah");
-  ow_->EndObject();
-}
-
-TEST_P(ProtoStreamObjectWriterOneOfsTest,
-       MultipleOneofsFailForStructValueTypesTest) {
-  EXPECT_CALL(listener_, InvalidValue(_, StringPiece("oneof"),
-                                      StringPiece(
-                                          "oneof field 'data' is already set. "
-                                          "Cannot set 'valueData'")));
-
-  // JSON: { "messageData": { "dataValue": 123 }, "valueData": { "a": "b" } }
-  ow_->StartObject("");
-  ow_->StartObject("messageData");
-  ow_->RenderInt32("dataValue", 123);
-  ow_->EndObject();
-  ow_->StartObject("valueData");
-  ow_->RenderString("a", "b");
-  ow_->EndObject();
-  ow_->EndObject();
-}
-
-TEST_P(ProtoStreamObjectWriterOneOfsTest,
-       MultipleOneofsFailForWellKnownTypesPrimitiveFirstTest) {
-  EXPECT_CALL(listener_, InvalidValue(_, StringPiece("oneof"),
-                                      StringPiece(
-                                          "oneof field 'data' is already set. "
-                                          "Cannot set 'tsData'")));
-
-  // JSON: { "intData": 123, "tsData": "1970-01-02T01:00:00.000Z" }
-  ow_->StartObject("");
-  ow_->RenderInt32("intData", 123);
-  ow_->RenderString("tsData", "1970-01-02T01:00:00.000Z");
-  ow_->EndObject();
-}
-
-TEST_P(ProtoStreamObjectWriterOneOfsTest,
-       MultipleOneofsFailForWellKnownTypesWktFirstTest) {
-  EXPECT_CALL(listener_, InvalidValue(_, StringPiece("oneof"),
-                                      StringPiece(
-                                          "oneof field 'data' is already set. "
-                                          "Cannot set 'intData'")));
-
-  // JSON: { "tsData": "1970-01-02T01:00:00.000Z", "intData": 123 }
-  ow_->StartObject("");
-  ow_->RenderString("tsData", "1970-01-02T01:00:00.000Z");
-  ow_->RenderInt32("intData", 123);
-  ow_->EndObject();
-}
-
-TEST_P(ProtoStreamObjectWriterOneOfsTest,
-       MultipleOneofsFailForWellKnownTypesAndMessageTest) {
-  EXPECT_CALL(listener_, InvalidValue(_, StringPiece("oneof"),
-                                      StringPiece(
-                                          "oneof field 'data' is already set. "
-                                          "Cannot set 'messageData'")));
-
-  // JSON: { "tsData": "1970-01-02T01:00:00.000Z",
-  //         "messageData": { "dataValue": 123 } }
-  ow_->StartObject("");
-  ow_->RenderString("tsData", "1970-01-02T01:00:00.000Z");
-  ow_->StartObject("messageData");
-  ow_->RenderInt32("dataValue", 123);
-  ow_->EndObject();
-  ow_->EndObject();
-}
-
-TEST_P(ProtoStreamObjectWriterOneOfsTest,
-       MultipleOneofsFailForOneofWithinAnyTest) {
-  EXPECT_CALL(listener_, InvalidValue(_, StringPiece("oneof"),
-                                      StringPiece(
-                                          "oneof field 'data' is already set. "
-                                          "Cannot set 'intData'")));
-
-  // JSON:
-  // { "anyData":
-  //    { "@type":
-  //       "type.googleapis.com/proto_util_converter.testing.oneofs.OneOfsRequest",
-  //     "strData": "blah",
-  //     "intData": 123
-  //    }
-  // }
-  ow_->StartObject("");
-  ow_->StartObject("anyData");
-  ow_->RenderString(
-      "@type",
-      "type.googleapis.com/proto_util_converter.testing.oneofs.OneOfsRequest");
-  ow_->RenderString("strData", "blah");
-  ow_->RenderInt32("intData", 123);
-  ow_->EndObject();
-  ow_->EndObject();
-}
-
-}  // namespace converter
-}  // namespace util
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/util/internal/structured_objectwriter.h b/libs/protobuf/src/google/protobuf/util/internal/structured_objectwriter.h
deleted file mode 100644
index f6f7c89..0000000
--- a/libs/protobuf/src/google/protobuf/util/internal/structured_objectwriter.h
+++ /dev/null
@@ -1,121 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef GOOGLE_PROTOBUF_UTIL_INTERNAL_STRUCTURED_OBJECTWRITER_H__
-#define GOOGLE_PROTOBUF_UTIL_INTERNAL_STRUCTURED_OBJECTWRITER_H__
-
-#include <memory>
-
-#include <google/protobuf/stubs/casts.h>
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/util/internal/object_writer.h>
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-namespace util {
-namespace converter {
-
-// An StructuredObjectWriter is an ObjectWriter for writing
-// tree-structured data in a stream of events representing objects
-// and collections. Implementation of this interface can be used to
-// write an object stream to an in-memory structure, protobufs,
-// JSON, XML, or any other output format desired. The ObjectSource
-// interface is typically used as the source of an object stream.
-//
-// See JsonObjectWriter for a sample implementation of
-// StructuredObjectWriter and its use.
-//
-// Derived classes could be thread-unsafe.
-class PROTOBUF_EXPORT StructuredObjectWriter : public ObjectWriter {
- public:
-  ~StructuredObjectWriter() override {}
-
- protected:
-  // A base element class for subclasses to extend, makes tracking state easier.
-  //
-  // StructuredObjectWriter behaves as a visitor. BaseElement represents a node
-  // in the input tree. Implementation of StructuredObjectWriter should also
-  // extend BaseElement to keep track of the location in the input tree.
-  class PROTOBUF_EXPORT BaseElement {
-   public:
-    // Takes ownership of the parent Element.
-    explicit BaseElement(BaseElement* parent)
-        : parent_(parent),
-          level_(parent == nullptr ? 0 : parent->level() + 1) {}
-    virtual ~BaseElement() {}
-
-    // Releases ownership of the parent and returns a pointer to it.
-    template <typename ElementType>
-    ElementType* pop() {
-      return down_cast<ElementType*>(parent_.release());
-    }
-
-    // Returns true if this element is the root.
-    bool is_root() const { return parent_ == nullptr; }
-
-    // Returns the number of hops from this element to the root element.
-    int level() const { return level_; }
-
-   protected:
-    // Returns pointer to parent element without releasing ownership.
-    virtual BaseElement* parent() const { return parent_.get(); }
-
-   private:
-    // Pointer to the parent Element.
-    std::unique_ptr<BaseElement> parent_;
-
-    // Number of hops to the root Element.
-    // The root Element has nullptr parent_ and a level_ of 0.
-    const int level_;
-
-    GOOGLE_DISALLOW_IMPLICIT_CONSTRUCTORS(BaseElement);
-  };
-
-  StructuredObjectWriter() {}
-
-  // Returns the current element. Used for indentation and name overrides.
-  virtual BaseElement* element() = 0;
-
- private:
-  // Do not add any data members to this class.
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(StructuredObjectWriter);
-};
-
-}  // namespace converter
-}  // namespace util
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
-
-#endif  // GOOGLE_PROTOBUF_UTIL_INTERNAL_STRUCTURED_OBJECTWRITER_H__
diff --git a/libs/protobuf/src/google/protobuf/util/internal/testdata/anys.proto b/libs/protobuf/src/google/protobuf/util/internal/testdata/anys.proto
deleted file mode 100644
index b6fc3f6..0000000
--- a/libs/protobuf/src/google/protobuf/util/internal/testdata/anys.proto
+++ /dev/null
@@ -1,118 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto3";
-
-package proto_util_converter.testing;
-
-import "google/protobuf/any.proto";
-import "google/protobuf/duration.proto";
-import "google/protobuf/empty.proto";
-import "google/protobuf/struct.proto";
-import "google/protobuf/timestamp.proto";
-import "google/protobuf/wrappers.proto";
-
-// Top-level test cases proto used by MarshallingTest. See description
-// at the top of the class MarshallingTest for details on how to write
-// test cases.
-message AnyTestCases {
-  AnyWrapper empty_any = 1;
-  AnyWrapper type_only_any = 2;
-  AnyWrapper wrapper_any = 3;
-  AnyWrapper any_with_timestamp_value = 4;
-  AnyWrapper any_with_duration_value = 5;
-  AnyWrapper any_with_struct_value = 6;
-  AnyWrapper recursive_any = 7;
-  AnyWrapper any_with_message_value = 8;
-  AnyWrapper any_with_nested_message = 9;
-  AnyWrapper any_with_message_with_wrapper_type = 10;
-  AnyWrapper any_with_message_with_timestamp = 11;
-  AnyWrapper any_with_message_containing_map = 12;
-  AnyWrapper any_with_message_containing_struct = 13;
-  AnyWrapper any_with_message_containing_repeated_message = 14;
-  AnyWrapper recursive_any_with_type_field_at_end = 15;
-  AnyWrapper repeated_any = 16;
-  AnyWrapper empty_any_with_null_type_url = 17;
-  AnyWrapper any_with_empty = 18;
-  AnyWrapper any_with_default_timestamp = 19;
-
-  google.protobuf.Any top_level_any = 50;
-  google.protobuf.Any top_level_any_with_type_field_at_end = 51;
-  google.protobuf.Any top_level_any_with_pivot_one = 52;
-  google.protobuf.Any top_level_any_with_pivot_two = 53;
-  google.protobuf.Any top_level_any_unordered = 54;
-}
-
-message AnyWrapper {
-  google.protobuf.Any any = 1;
-}
-
-// Hack to make sure the types we put into the any are included in the types.
-// Real solution is to add these types to the service config.
-message Imports {
-  google.protobuf.DoubleValue dbl = 1;
-  google.protobuf.Struct struct = 2;
-  google.protobuf.Timestamp timestamp = 3;
-  google.protobuf.Duration duration = 4;
-  google.protobuf.Int32Value i32 = 5;
-  google.protobuf.Empty empty = 6;
-  Data data = 100;
-}
-
-message Data {
-  int32 attr = 1;
-  string str = 2;
-  repeated string msgs = 3;
-  Data nested_data = 4;
-  google.protobuf.Int32Value int_wrapper = 5;
-  google.protobuf.Timestamp time = 6;
-  map<string, string> map_data = 7;
-  google.protobuf.Struct struct_data = 8;
-  repeated Data repeated_data = 9;
-  repeated google.protobuf.Any repeated_any = 10;
-}
-
-service AnyTestService {
-  rpc Call(AnyTestCases) returns (AnyTestCases);
-  rpc Call1(Imports) returns (Imports);
-}
-
-message AnyIn {
-  string something = 1;
-  google.protobuf.Any any = 2;
-}
-
-message AnyOut {
-  google.protobuf.Any any = 1;
-}
-
-message AnyM {
-  string foo = 1;
-}
diff --git a/libs/protobuf/src/google/protobuf/util/internal/testdata/books.proto b/libs/protobuf/src/google/protobuf/util/internal/testdata/books.proto
deleted file mode 100644
index 328c5ce..0000000
--- a/libs/protobuf/src/google/protobuf/util/internal/testdata/books.proto
+++ /dev/null
@@ -1,251 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: sven@google.com (Sven Mawson)
-//
-// Sample protos for testing.
-
-// Some of the older enums don't use CAPITALS_WITH_UNDERSCORES for testing.
-// LINT: LEGACY_NAMES
-// LINT: ALLOW_GROUPS
-
-syntax = "proto2";
-
-package proto_util_converter.testing;
-
-import "google/protobuf/util/internal/testdata/anys.proto";
-
-// A book
-message Book {
-  optional string title = 1;
-  optional Author author = 2;
-  optional uint32 length = 3;
-  optional int64 published = 4;
-  optional bytes content = 5;
-
-  optional group Data = 6 {
-    optional uint32 year = 7;
-    optional string copyright = 8;
-  }
-
-  message Label {
-    optional string key = 1;
-    optional string value = 2;
-  }
-
-  optional Publisher publisher = 9;
-  repeated Label labels = 10;
-
-  enum Type {
-    FICTION = 1;
-    KIDS = 2;
-    ACTION_AND_ADVENTURE = 3;
-    arts_and_photography = 4;
-    I18N_Tech = 5;
-  }
-  optional Type type = 11;
-
-  // Useful for testing JSON snake/camel-case conversions.
-  optional string snake_field = 12;
-
-  // Used to test type not found in type info. Messages defined in other files
-  // are not added when adding Book to type info.
-  optional AnyWrapper type_not_found = 13;
-
-  // Used to test invalid value inside of primitive repeated fields.
-  repeated int32 primitive_repeated = 14;
-
-  extensions 200 to 499;
-}
-
-// A publisher of a book, tests required fields.
-message Publisher {
-  required string name = 1;
-}
-
-// An author of a book
-message Author {
-  optional uint64 id = 1 [json_name = "@id"];
-  optional string name = 2;
-  repeated string pseudonym = 3;
-  optional bool alive = 4;
-  repeated Author friend = 5;
-}
-
-// For testing resiliency of our protostream parser.
-// Field numbers of Author are reused for something else.
-message BadAuthor {
-  optional string id = 1;         // non-length-delimited to length-delimited.
-  repeated uint64 name = 2;       // string to repeated (both length-delimited).
-  optional string pseudonym = 3;  // Repeated to optional.
-  repeated bool alive = 4 [packed = true];  // Optional to repeated.
-}
-
-// All primitive types
-message Primitive {
-  // 32 bit numbers:
-  optional fixed32 fix32 = 1;
-  optional uint32 u32 = 2;
-  optional int32 i32 = 3;
-  optional sfixed32 sf32 = 4;
-  optional sint32 s32 = 5;
-
-  // 64 bit numbers:
-  optional fixed64 fix64 = 6;
-  optional uint64 u64 = 7;
-  optional int64 i64 = 8;
-  optional sfixed64 sf64 = 9;
-  optional sint64 s64 = 10;
-
-  // The other stuff.
-  optional string str = 11;
-  optional bytes bytes = 12;
-  optional float float = 13;
-  optional double double = 14;
-  optional bool bool = 15;
-
-  // repeated 32 bit numbers:
-  repeated fixed32 rep_fix32 = 16;
-  repeated uint32 rep_u32 = 17;
-  repeated int32 rep_i32 = 18;
-  repeated sfixed32 rep_sf32 = 19;
-  repeated sint32 rep_s32 = 20;
-
-  // repeated 64 bit numbers:
-  repeated fixed64 rep_fix64 = 21;
-  repeated uint64 rep_u64 = 22;
-  repeated int64 rep_i64 = 23;
-  repeated sfixed64 rep_sf64 = 24;
-  repeated sint64 rep_s64 = 25;
-
-  // repeated other stuff:
-  repeated string rep_str = 26;
-  repeated bytes rep_bytes = 27;
-  repeated float rep_float = 28;
-  repeated double rep_double = 29;
-  repeated bool rep_bool = 30;
-}
-
-// Test packed versions of all repeated primitives.
-// The field numbers should match their non-packed version in Primitive message.
-message PackedPrimitive {
-  // repeated 32 bit numbers:
-  repeated fixed32 rep_fix32 = 16 [packed = true];
-  repeated uint32 rep_u32 = 17 [packed = true];
-  repeated int32 rep_i32 = 18 [packed = true];
-  repeated sfixed32 rep_sf32 = 19 [packed = true];
-  repeated sint32 rep_s32 = 20 [packed = true];
-
-  // repeated 64 bit numbers:
-  repeated fixed64 rep_fix64 = 21 [packed = true];
-  repeated uint64 rep_u64 = 22 [packed = true];
-  repeated int64 rep_i64 = 23 [packed = true];
-  repeated sfixed64 rep_sf64 = 24 [packed = true];
-  repeated sint64 rep_s64 = 25 [packed = true];
-
-  // repeated other stuff:
-  repeated float rep_float = 28 [packed = true];
-  repeated double rep_double = 29 [packed = true];
-  repeated bool rep_bool = 30 [packed = true];
-}
-
-// Test extensions.
-extend Book {
-  repeated Author more_author = 201;
-}
-
-// Test nested extensions.
-message NestedBook {
-  extend Book {
-    optional NestedBook another_book = 301;
-  }
-  // Recurse
-  optional Book book = 1;
-}
-
-// For testing resiliency of our protostream parser.
-// Field number of NestedBook is reused for something else.
-message BadNestedBook {
-  repeated uint32 book = 1 [packed = true];  // Packed to optional message.
-}
-
-// A recursively defined message.
-message Cyclic {
-  optional int32 m_int = 1;
-  optional string m_str = 2;
-  optional Book m_book = 3;
-  repeated Author m_author = 5;
-  optional Cyclic m_cyclic = 4;
-}
-
-// Test that two messages can have different fields mapped to the same JSON
-// name. See: https://github.com/protocolbuffers/protobuf/issues/1415
-message TestJsonName1 {
-  optional int32 one_value = 1 [json_name = "value"];
-}
-message TestJsonName2 {
-  optional int32 another_value = 1 [json_name = "value"];
-}
-
-message TestPrimitiveFieldsWithSameJsonName {
-  optional string val_str1 = 1;
-  optional string val_str_1 = 2;
-
-  optional int32 val_int321 = 3;
-  optional int32 val_int32_1 = 4;
-
-  optional uint32 val_uint321 = 5;
-  optional uint32 val_uint32_1 = 6;
-
-  optional int64 val_int641 = 7;
-  optional int64 val_int64_1 = 8;
-
-  optional uint64 val_uint641 = 9;
-  optional uint64 val_uint64_1 = 10;
-
-  optional bool val_bool1 = 11;
-  optional bool val_bool_1 = 12;
-
-  optional double val_double1 = 13;
-  optional double val_double_1 = 14;
-
-  optional float val_float1 = 15;
-  optional float val_float_1 = 16;
-}
-
-message TestRepeatedFieldsWithSameJsonName {
-  repeated string rep_str1 = 1;
-  repeated string rep_str_1 = 2;
-}
-
-message TestMessageFieldsWithSameJsonName {
-  optional Primitive prim1 = 1;
-  optional Primitive prim_1 = 2;
-}
diff --git a/libs/protobuf/src/google/protobuf/util/internal/testdata/default_value.proto b/libs/protobuf/src/google/protobuf/util/internal/testdata/default_value.proto
deleted file mode 100644
index 79ce144..0000000
--- a/libs/protobuf/src/google/protobuf/util/internal/testdata/default_value.proto
+++ /dev/null
@@ -1,170 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto3";
-
-package proto_util_converter.testing;
-
-import "google/protobuf/any.proto";
-import "google/protobuf/struct.proto";
-import "google/protobuf/wrappers.proto";
-
-message DefaultValueTestCases {
-  DoubleMessage empty_double = 1;
-  DoubleMessage double_with_default_value = 2;
-  DoubleMessage double_with_nondefault_value = 3;
-  DoubleMessage repeated_double = 4;
-  DoubleMessage nested_message = 5;
-  DoubleMessage repeated_nested_message = 6;
-  DoubleMessage double_message_with_oneof = 7;
-  StructMessage empty_struct = 201;
-  StructMessage empty_struct2 = 202;
-  StructMessage struct_with_null_value = 203;
-  StructMessage struct_with_values = 204;
-  StructMessage struct_with_nested_struct = 205;
-  StructMessage struct_with_nested_list = 206;
-  StructMessage struct_with_list_of_nulls = 207;
-  StructMessage struct_with_list_of_lists = 208;
-  StructMessage struct_with_list_of_structs = 209;
-  google.protobuf.Struct top_level_struct = 210;
-  ValueMessage value_wrapper_simple = 212;
-  ValueMessage value_wrapper_with_struct = 213;
-  ValueMessage value_wrapper_with_list = 214;
-  ListValueMessage list_value_wrapper = 215;
-  google.protobuf.Value top_level_value_simple = 216;
-  google.protobuf.Value top_level_value_with_struct = 217;
-  google.protobuf.Value top_level_value_with_list = 218;
-  google.protobuf.ListValue top_level_listvalue = 219;
-  AnyMessage empty_any = 301;
-  AnyMessage type_only_any = 302;
-  AnyMessage recursive_any = 303;
-  AnyMessage any_with_message_value = 304;
-  AnyMessage any_with_nested_message = 305;
-  AnyMessage any_with_message_containing_map = 306;
-  AnyMessage any_with_message_containing_struct = 307;
-  google.protobuf.Any top_level_any = 308;
-  StringtoIntMap empty_map = 401;
-  StringtoIntMap string_to_int = 402;
-  IntToStringMap int_to_string = 403;
-  MixedMap mixed1 = 404;
-  MixedMap2 mixed2 = 405;
-  MixedMap2 empty_mixed2 = 406;
-  MessageMap map_of_objects = 407;
-  MixedMap mixed_empty = 408;
-  MessageMap message_map_empty = 409;
-  DoubleValueMessage double_value = 501;
-  DoubleValueMessage double_value_default = 502;
-}
-
-message DoubleMessage {
-  double double_value = 1;
-  repeated double repeated_double = 2;
-  DoubleMessage nested_message = 3;
-  repeated DoubleMessage repeated_nested_message = 4;
-  google.protobuf.DoubleValue double_wrapper = 100;
-  oneof value {
-    string str_value = 112;
-    int64 num_value = 113;
-  }
-}
-
-message StructMessage {
-  google.protobuf.Struct struct = 1;
-}
-
-message ValueMessage {
-  google.protobuf.Value value = 1;
-}
-
-message ListValueMessage {
-  google.protobuf.ListValue shopping_list = 1;
-}
-message RequestMessage {
-  string content = 1;
-}
-
-// A test service.
-service DefaultValueTestService {
-  // A test method.
-  rpc Call(RequestMessage) returns (DefaultValueTestCases);
-}
-
-message AnyMessage {
-  google.protobuf.Any any = 1;
-  AnyData data = 2;
-}
-
-message AnyData {
-  int32 attr = 1;
-  string str = 2;
-  repeated string msgs = 3;
-  AnyData nested_data = 4;
-  map<string, string> map_data = 7;
-  google.protobuf.Struct struct_data = 8;
-  repeated AnyData repeated_data = 9;
-}
-
-message StringtoIntMap {
-  map<string, int32> map = 1;
-}
-
-message IntToStringMap {
-  map<int32, string> map = 1;
-}
-
-message MixedMap {
-  string msg = 1;
-  map<string, float> map = 2;
-  int32 int_value = 3;
-}
-
-message MixedMap2 {
-  enum E {
-    E0 = 0;
-    E1 = 1;
-    E2 = 2;
-    E3 = 3;
-  }
-  map<int32, bool> map = 1;
-  E ee = 2;
-  string msg = 4;
-}
-
-message MessageMap {
-  message M {
-    int32 inner_int = 1;
-    string inner_text = 2;
-  }
-  map<string, M> map = 1;
-}
-
-message DoubleValueMessage {
-  google.protobuf.DoubleValue double = 1;
-}
diff --git a/libs/protobuf/src/google/protobuf/util/internal/testdata/default_value_test.proto b/libs/protobuf/src/google/protobuf/util/internal/testdata/default_value_test.proto
deleted file mode 100644
index af755d3..0000000
--- a/libs/protobuf/src/google/protobuf/util/internal/testdata/default_value_test.proto
+++ /dev/null
@@ -1,53 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto3";
-
-package proto_util_converter.testing;
-
-message DefaultValueTest {
-  double double_value = 1;
-  repeated double repeated_double = 2;
-  float float_value = 3;
-  int64 int64_value = 5;
-  uint64 uint64_value = 7;
-  int32 int32_value = 9;
-  uint32 uint32_value = 11;
-  bool bool_value = 13;
-  string string_value = 15;
-  bytes bytes_value = 17 [ctype = CORD];
-
-  enum EnumDefault {
-    ENUM_FIRST = 0;
-    ENUM_SECOND = 1;
-    ENUM_THIRD = 2;
-  }
-  EnumDefault enum_value = 18;
-}
diff --git a/libs/protobuf/src/google/protobuf/util/internal/testdata/field_mask.proto b/libs/protobuf/src/google/protobuf/util/internal/testdata/field_mask.proto
deleted file mode 100644
index 9d2bc40..0000000
--- a/libs/protobuf/src/google/protobuf/util/internal/testdata/field_mask.proto
+++ /dev/null
@@ -1,71 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto3";
-
-package proto_util_converter.testing;
-
-import "google/protobuf/field_mask.proto";
-
-message NestedFieldMask {
-  string data = 1;
-  google.protobuf.FieldMask single_mask = 2;
-  repeated google.protobuf.FieldMask repeated_mask = 3;
-}
-
-message FieldMaskTest {
-  string id = 1;
-  google.protobuf.FieldMask single_mask = 2;
-  repeated google.protobuf.FieldMask repeated_mask = 3;
-  repeated NestedFieldMask nested_mask = 4;
-}
-
-message FieldMaskTestCases {
-  FieldMaskWrapper single_mask = 1;
-  FieldMaskWrapper multiple_mask = 2;
-  FieldMaskWrapper snake_camel = 3;
-  FieldMaskWrapper empty_field = 4;
-  FieldMaskWrapper apiary_format1 = 5;
-  FieldMaskWrapper apiary_format2 = 6;
-  FieldMaskWrapper apiary_format3 = 7;
-  FieldMaskWrapper map_key1 = 8;
-  FieldMaskWrapper map_key2 = 9;
-  FieldMaskWrapper map_key3 = 10;
-  FieldMaskWrapper map_key4 = 11;
-  FieldMaskWrapper map_key5 = 12;
-}
-
-message FieldMaskWrapper {
-  google.protobuf.FieldMask mask = 1;
-}
-
-service FieldMaskTestService {
-  rpc Call(FieldMaskTestCases) returns (FieldMaskTestCases);
-}
diff --git a/libs/protobuf/src/google/protobuf/util/internal/testdata/maps.proto b/libs/protobuf/src/google/protobuf/util/internal/testdata/maps.proto
deleted file mode 100644
index a9fdbe6..0000000
--- a/libs/protobuf/src/google/protobuf/util/internal/testdata/maps.proto
+++ /dev/null
@@ -1,148 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto3";
-
-package proto_util_converter.testing;
-
-import "google/protobuf/any.proto";
-
-// Top-level test cases proto used by MarshallingTest. See description
-// at the top of the class MarshallingTest for details on how to write
-// test cases.
-message MapsTestCases {
-  EmptyMap empty_map = 1;
-  StringtoInt string_to_int = 2;
-  IntToString int_to_string = 3;
-  Mixed1 mixed1 = 4;
-  Mixed2 mixed2 = 5;
-  MapOfObjects map_of_objects = 6;
-
-  // Empty key tests
-  StringtoInt empty_key_string_to_int1 = 7;
-  StringtoInt empty_key_string_to_int2 = 8;
-  StringtoInt empty_key_string_to_int3 = 9;
-  BoolToString empty_key_bool_to_string = 10;
-  IntToString empty_key_int_to_string = 11;
-  Mixed1 empty_key_mixed = 12;
-  MapOfObjects empty_key_map_objects = 13;
-}
-
-message EmptyMap {
-  map<int32, int32> map = 1;
-}
-
-message StringtoInt {
-  map<string, int32> map = 1;
-}
-
-message IntToString {
-  map<int32, string> map = 1;
-}
-
-message BoolToString {
-  map<bool, string> map = 1;
-}
-
-message Mixed1 {
-  string msg = 1;
-  map<string, float> map = 2;
-}
-
-message Mixed2 {
-  enum E {
-    E0 = 0;
-    E1 = 1;
-    E2 = 2;
-    E3 = 3;
-  }
-  map<int32, bool> map = 1;
-  E ee = 2;
-}
-
-message MapOfObjects {
-  message M {
-    string inner_text = 1;
-  }
-  map<string, M> map = 1;
-}
-
-message DummyRequest {}
-
-service MapsTestService {
-  rpc Call(DummyRequest) returns (MapsTestCases);
-}
-
-message MapIn {
-  string other = 1;
-  repeated string things = 2;
-  map<string, string> map_input = 3;
-  map<string, google.protobuf.Any> map_any = 4;
-}
-
-message MapOut {
-  map<string, MapM> map1 = 1;
-  map<string, MapOut> map2 = 2;
-  map<int32, string> map3 = 3;
-  map<bool, string> map4 = 5;
-  string bar = 4;
-}
-
-// A message with exactly the same wire representation as MapOut, but using
-// repeated message fields instead of map fields. We use this message to test
-// the wire-format compatibility of the JSON transcoder (e.g., whether it
-// handles missing keys correctly).
-message MapOutWireFormat {
-  message Map1Entry {
-    string key = 1;
-    MapM value = 2;
-  }
-  repeated Map1Entry map1 = 1;
-  message Map2Entry {
-    string key = 1;
-    MapOut value = 2;
-  }
-  repeated Map2Entry map2 = 2;
-  message Map3Entry {
-    int32 key = 1;
-    string value = 2;
-  }
-  repeated Map3Entry map3 = 3;
-  message Map4Entry {
-    bool key = 1;
-    string value = 2;
-  }
-  repeated Map4Entry map4 = 5;
-  string bar = 4;
-}
-
-message MapM {
-  string foo = 1;
-}
diff --git a/libs/protobuf/src/google/protobuf/util/internal/testdata/oneofs.proto b/libs/protobuf/src/google/protobuf/util/internal/testdata/oneofs.proto
deleted file mode 100644
index 7706af0..0000000
--- a/libs/protobuf/src/google/protobuf/util/internal/testdata/oneofs.proto
+++ /dev/null
@@ -1,77 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Proto to test proto3 oneofs.
-syntax = "proto3";
-
-package proto_util_converter.testing.oneofs;
-
-import "google/protobuf/any.proto";
-import "google/protobuf/struct.proto";
-import "google/protobuf/timestamp.proto";
-
-message OneOfsRequest {
-  string value = 1;
-  oneof data {
-    string str_data = 2;
-    int32 int_data = 3;
-    // Simple message
-    Data message_data = 4;
-    MoreData more_data = 5;
-    // Well known types
-    google.protobuf.Struct struct_data = 6;
-    google.protobuf.Value value_data = 7;
-    google.protobuf.ListValue list_value_data = 8;
-    google.protobuf.Timestamp ts_data = 9;
-  }
-  google.protobuf.Any any_data = 19;
-}
-
-message RequestWithSimpleOneof {
-  string value = 1;
-  oneof data {
-    string str_data = 2;
-    int32 int_data = 3;
-    Data message_data = 4;
-    MoreData more_data = 5;
-  }
-}
-
-message Data {
-  int32 data_value = 1;
-}
-
-message MoreData {
-  string str_value = 1;
-}
-
-message Response {
-  string value = 1;
-}
diff --git a/libs/protobuf/src/google/protobuf/util/internal/testdata/proto3.proto b/libs/protobuf/src/google/protobuf/util/internal/testdata/proto3.proto
deleted file mode 100644
index 01434b0..0000000
--- a/libs/protobuf/src/google/protobuf/util/internal/testdata/proto3.proto
+++ /dev/null
@@ -1,42 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto3";
-
-package proto_util_converter.testing;
-
-message Proto3Message {
-  enum NestedEnum {
-    FOO = 0;
-    BAR = 1;
-    BAZ = 2;
-  }
-  NestedEnum enum_value = 1;
-}
diff --git a/libs/protobuf/src/google/protobuf/util/internal/testdata/struct.proto b/libs/protobuf/src/google/protobuf/util/internal/testdata/struct.proto
deleted file mode 100644
index a50ea87..0000000
--- a/libs/protobuf/src/google/protobuf/util/internal/testdata/struct.proto
+++ /dev/null
@@ -1,117 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto3";
-
-package proto_util_converter.testing;
-
-import "google/protobuf/struct.proto";
-
-message StructTestCases {
-  StructWrapper empty_value = 1;
-  StructWrapper empty_value2 = 2;
-  StructWrapper null_value = 3;
-  StructWrapper simple_struct = 4;
-  StructWrapper longer_struct = 5;
-  StructWrapper struct_with_nested_struct = 6;
-  StructWrapper struct_with_nested_list = 7;
-  StructWrapper struct_with_list_of_nulls = 8;
-  StructWrapper struct_with_list_of_lists = 9;
-  StructWrapper struct_with_list_of_structs = 10;
-  StructWrapper struct_with_empty_list = 11;
-  StructWrapper struct_with_list_with_empty_struct = 12;
-  google.protobuf.Struct top_level_struct = 13;
-  google.protobuf.Struct top_level_struct_with_empty_list = 14;
-  google.protobuf.Struct top_level_struct_with_list_with_empty_struct = 15;
-  ValueWrapper value_wrapper_simple = 16;
-  ValueWrapper value_wrapper_with_struct = 17;
-  ValueWrapper value_wrapper_with_list = 18;
-  ValueWrapper value_wrapper_with_empty_list = 19;
-  ValueWrapper value_wrapper_with_list_with_empty_struct = 20;
-  ListValueWrapper list_value_wrapper = 21;
-  ListValueWrapper list_value_wrapper_with_empty_list = 22;
-  ListValueWrapper list_value_wrapper_with_list_with_empty_struct = 23;
-  google.protobuf.Value top_level_value_simple = 24;
-  google.protobuf.Value top_level_value_with_struct = 25;
-  google.protobuf.Value top_level_value_with_list = 26;
-  google.protobuf.Value top_level_value_with_empty_list = 27;
-  google.protobuf.Value top_level_value_with_list_with_empty_struct = 28;
-  google.protobuf.ListValue top_level_listvalue = 29;
-  google.protobuf.ListValue top_level_empty_listvalue = 30;
-  google.protobuf.ListValue top_level_listvalue_with_empty_struct = 31;
-  RepeatedValueWrapper repeated_value = 32;
-  RepeatedValueWrapper repeated_value_nested_list = 33;
-  RepeatedValueWrapper repeated_value_nested_list2 = 34;
-  RepeatedValueWrapper repeated_value_nested_list3 = 35;
-  RepeatedListValueWrapper repeated_listvalue = 36;
-  MapOfStruct map_of_struct = 37;
-  MapOfStruct map_of_struct_value = 38;
-  MapOfStruct map_of_listvalue = 39;
-}
-
-message StructWrapper {
-  google.protobuf.Struct struct = 1;
-}
-
-message ValueWrapper {
-  google.protobuf.Value value = 1;
-}
-
-message RepeatedValueWrapper {
-  repeated google.protobuf.Value values = 1;
-}
-
-message ListValueWrapper {
-  google.protobuf.ListValue shopping_list = 1;
-}
-
-message RepeatedListValueWrapper {
-  repeated google.protobuf.ListValue dimensions = 1;
-}
-
-message MapOfStruct {
-  map<string, google.protobuf.Struct> struct_map = 1;
-  map<string, google.protobuf.Value> value_map = 2;
-  map<string, google.protobuf.ListValue> listvalue_map = 3;
-}
-
-// Hack to test return types with Struct as top-level message. Struct typers
-// cannot be directly used in API requests. Hence using Dummy as request type.
-message Dummy {
-  string text = 1;
-}
-
-service StructTestService {
-  rpc Call(Dummy) returns (StructTestCases);
-}
-
-message StructType {
-  google.protobuf.Struct object = 1;
-}
diff --git a/libs/protobuf/src/google/protobuf/util/internal/testdata/timestamp_duration.proto b/libs/protobuf/src/google/protobuf/util/internal/testdata/timestamp_duration.proto
deleted file mode 100644
index 8e87bdd..0000000
--- a/libs/protobuf/src/google/protobuf/util/internal/testdata/timestamp_duration.proto
+++ /dev/null
@@ -1,80 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto3";
-
-package proto_util_converter.testing;
-
-import "google/protobuf/duration.proto";
-import "google/protobuf/timestamp.proto";
-
-message TimestampDurationTestCases {
-  // Timestamp tests
-  TimeStampType epoch = 1;
-  TimeStampType epoch2 = 2;
-  TimeStampType mintime = 3;
-  TimeStampType maxtime = 4;
-  TimeStampType timeval1 = 5;
-  TimeStampType timeval2 = 6;
-  TimeStampType timeval3 = 7;
-  TimeStampType timeval4 = 8;
-  TimeStampType timeval5 = 9;
-  TimeStampType timeval6 = 10;
-  TimeStampType timeval7 = 11;
-  google.protobuf.Timestamp timeval8 = 12;
-
-  // Duration tests
-  DurationType zero_duration = 101;
-  DurationType min_duration = 102;
-  DurationType max_duration = 103;
-  DurationType duration1 = 104;
-  DurationType duration2 = 105;
-  DurationType duration3 = 106;
-  DurationType duration4 = 107;
-  google.protobuf.Duration duration5 = 108;
-}
-
-message TimeStampType {
-  google.protobuf.Timestamp timestamp = 1;
-}
-
-message DurationType {
-  google.protobuf.Duration duration = 1;
-}
-
-service TimestampDurationTestService {
-  rpc Call(TimestampDurationTestCases) returns (TimestampDurationTestCases);
-}
-
-message TimestampDuration {
-  google.protobuf.Timestamp ts = 1;
-  google.protobuf.Duration dur = 2;
-  repeated google.protobuf.Timestamp rep_ts = 3;
-}
diff --git a/libs/protobuf/src/google/protobuf/util/internal/testdata/wrappers.proto b/libs/protobuf/src/google/protobuf/util/internal/testdata/wrappers.proto
deleted file mode 100644
index e7a0541..0000000
--- a/libs/protobuf/src/google/protobuf/util/internal/testdata/wrappers.proto
+++ /dev/null
@@ -1,100 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto3";
-
-package proto_util_converter.testing;
-
-import "google/protobuf/wrappers.proto";
-
-// Top-level test cases proto used by MarshallingTest. See description
-// at the top of the class MarshallingTest for details on how to write
-// test cases.
-message WrappersTestCases {
-  DoubleWrapper double_wrapper = 1;
-  FloatWrapper float_wrapper = 2;
-  Int64Wrapper int64_wrapper = 3;
-  UInt64Wrapper uint64_wrapper = 4;
-  Int32Wrapper int32_wrapper = 5;
-  UInt32Wrapper uint32_wrapper = 6;
-  BoolWrapper bool_wrapper = 7;
-  StringWrapper string_wrapper = 8;
-  BytesWrapper bytes_wrapper = 9;
-
-  DoubleWrapper double_wrapper_default = 10;
-  FloatWrapper float_wrapper_default = 11;
-  Int64Wrapper int64_wrapper_default = 12;
-  UInt64Wrapper uint64_wrapper_default = 13;
-  Int32Wrapper int32_wrapper_default = 14;
-  UInt32Wrapper uint32_wrapper_default = 15;
-  BoolWrapper bool_wrapper_default = 16;
-  StringWrapper string_wrapper_default = 17;
-  BytesWrapper bytes_wrapper_default = 18;
-}
-
-message DoubleWrapper {
-  google.protobuf.DoubleValue double = 1;
-}
-
-message FloatWrapper {
-  google.protobuf.FloatValue float = 1;
-}
-
-message Int64Wrapper {
-  google.protobuf.Int64Value int64 = 1;
-}
-
-message UInt64Wrapper {
-  google.protobuf.UInt64Value uint64 = 1;
-}
-
-message Int32Wrapper {
-  google.protobuf.Int32Value int32 = 1;
-}
-
-message UInt32Wrapper {
-  google.protobuf.UInt32Value uint32 = 1;
-}
-
-message BoolWrapper {
-  google.protobuf.BoolValue bool = 1;
-}
-
-message StringWrapper {
-  google.protobuf.StringValue string = 1;
-}
-
-message BytesWrapper {
-  google.protobuf.BytesValue bytes = 1;
-}
-
-service WrappersTestService {
-  rpc Call(WrappersTestCases) returns (WrappersTestCases);
-}
diff --git a/libs/protobuf/src/google/protobuf/util/internal/type_info.cc b/libs/protobuf/src/google/protobuf/util/internal/type_info.cc
deleted file mode 100644
index b6cf536..0000000
--- a/libs/protobuf/src/google/protobuf/util/internal/type_info.cc
+++ /dev/null
@@ -1,182 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <google/protobuf/util/internal/type_info.h>
-
-#include <map>
-#include <set>
-
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/type.pb.h>
-#include <google/protobuf/stubs/status.h>
-#include <google/protobuf/stubs/statusor.h>
-#include <google/protobuf/stubs/strutil.h>
-#include <google/protobuf/util/internal/utility.h>
-#include <google/protobuf/stubs/map_util.h>
-#include <google/protobuf/stubs/status.h>
-
-namespace google {
-namespace protobuf {
-namespace util {
-namespace converter {
-
-namespace {
-// A TypeInfo that looks up information provided by a TypeResolver.
-class TypeInfoForTypeResolver : public TypeInfo {
- public:
-  explicit TypeInfoForTypeResolver(TypeResolver* type_resolver)
-      : type_resolver_(type_resolver) {}
-
-  ~TypeInfoForTypeResolver() override {
-    DeleteCachedTypes(&cached_types_);
-    DeleteCachedTypes(&cached_enums_);
-  }
-
-  util::StatusOr<const google::protobuf::Type*> ResolveTypeUrl(
-      StringPiece type_url) const override {
-    std::map<StringPiece, StatusOrType>::iterator it =
-        cached_types_.find(type_url);
-    if (it != cached_types_.end()) {
-      return it->second;
-    }
-    // Stores the string value so it can be referenced using StringPiece in the
-    // cached_types_ map.
-    const std::string& string_type_url =
-        *string_storage_.insert(std::string(type_url)).first;
-    std::unique_ptr<google::protobuf::Type> type(new google::protobuf::Type());
-    util::Status status =
-        type_resolver_->ResolveMessageType(string_type_url, type.get());
-    StatusOrType result =
-        status.ok() ? StatusOrType(type.release()) : StatusOrType(status);
-    cached_types_[string_type_url] = result;
-    return result;
-  }
-
-  const google::protobuf::Type* GetTypeByTypeUrl(
-      StringPiece type_url) const override {
-    StatusOrType result = ResolveTypeUrl(type_url);
-    return result.ok() ? result.value() : NULL;
-  }
-
-  const google::protobuf::Enum* GetEnumByTypeUrl(
-      StringPiece type_url) const override {
-    std::map<StringPiece, StatusOrEnum>::iterator it =
-        cached_enums_.find(type_url);
-    if (it != cached_enums_.end()) {
-      return it->second.ok() ? it->second.value() : NULL;
-    }
-    // Stores the string value so it can be referenced using StringPiece in the
-    // cached_enums_ map.
-    const std::string& string_type_url =
-        *string_storage_.insert(std::string(type_url)).first;
-    std::unique_ptr<google::protobuf::Enum> enum_type(
-        new google::protobuf::Enum());
-    util::Status status =
-        type_resolver_->ResolveEnumType(string_type_url, enum_type.get());
-    StatusOrEnum result =
-        status.ok() ? StatusOrEnum(enum_type.release()) : StatusOrEnum(status);
-    cached_enums_[string_type_url] = result;
-    return result.ok() ? result.value() : NULL;
-  }
-
-  const google::protobuf::Field* FindField(
-      const google::protobuf::Type* type,
-      StringPiece camel_case_name) const override {
-    std::map<const google::protobuf::Type*, CamelCaseNameTable>::const_iterator
-        it = indexed_types_.find(type);
-    const CamelCaseNameTable& camel_case_name_table =
-        (it == indexed_types_.end())
-            ? PopulateNameLookupTable(type, &indexed_types_[type])
-            : it->second;
-    StringPiece name = FindWithDefault(
-        camel_case_name_table, camel_case_name, StringPiece());
-    if (name.empty()) {
-      // Didn't find a mapping. Use whatever provided.
-      name = camel_case_name;
-    }
-    return FindFieldInTypeOrNull(type, name);
-  }
-
- private:
-  typedef util::StatusOr<const google::protobuf::Type*> StatusOrType;
-  typedef util::StatusOr<const google::protobuf::Enum*> StatusOrEnum;
-  typedef std::map<StringPiece, StringPiece> CamelCaseNameTable;
-
-  template <typename T>
-  static void DeleteCachedTypes(std::map<StringPiece, T>* cached_types) {
-    for (typename std::map<StringPiece, T>::iterator it =
-             cached_types->begin();
-         it != cached_types->end(); ++it) {
-      if (it->second.ok()) {
-        delete it->second.value();
-      }
-    }
-  }
-
-  const CamelCaseNameTable& PopulateNameLookupTable(
-      const google::protobuf::Type* type,
-      CamelCaseNameTable* camel_case_name_table) const {
-    for (int i = 0; i < type->fields_size(); ++i) {
-      const google::protobuf::Field& field = type->fields(i);
-      StringPiece name = field.name();
-      StringPiece camel_case_name = field.json_name();
-      const StringPiece* existing = InsertOrReturnExisting(
-          camel_case_name_table, camel_case_name, name);
-      if (existing && *existing != name) {
-        GOOGLE_LOG(WARNING) << "Field '" << name << "' and '" << *existing
-                     << "' map to the same camel case name '" << camel_case_name
-                     << "'.";
-      }
-    }
-    return *camel_case_name_table;
-  }
-
-  TypeResolver* type_resolver_;
-
-  // Stores string values that will be referenced by StringPieces in
-  // cached_types_, cached_enums_.
-  mutable std::set<std::string> string_storage_;
-
-  mutable std::map<StringPiece, StatusOrType> cached_types_;
-  mutable std::map<StringPiece, StatusOrEnum> cached_enums_;
-
-  mutable std::map<const google::protobuf::Type*, CamelCaseNameTable>
-      indexed_types_;
-};
-}  // namespace
-
-TypeInfo* TypeInfo::NewTypeInfo(TypeResolver* type_resolver) {
-  return new TypeInfoForTypeResolver(type_resolver);
-}
-
-}  // namespace converter
-}  // namespace util
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/util/internal/type_info.h b/libs/protobuf/src/google/protobuf/util/internal/type_info.h
deleted file mode 100644
index 257df5b..0000000
--- a/libs/protobuf/src/google/protobuf/util/internal/type_info.h
+++ /dev/null
@@ -1,97 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef GOOGLE_PROTOBUF_UTIL_INTERNAL_TYPE_INFO_H__
-#define GOOGLE_PROTOBUF_UTIL_INTERNAL_TYPE_INFO_H__
-
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/type.pb.h>
-#include <google/protobuf/stubs/statusor.h>
-#include <google/protobuf/stubs/strutil.h>
-#include <google/protobuf/util/type_resolver.h>
-#include <google/protobuf/stubs/status.h>
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-namespace util {
-namespace converter {
-// Internal helper class for type resolving. Note that this class is not
-// thread-safe and should only be accessed in one thread.
-class PROTOBUF_EXPORT TypeInfo {
- public:
-  TypeInfo() {}
-  virtual ~TypeInfo() {}
-
-  // Resolves a type url into a Type. If the type url is invalid, returns
-  // INVALID_ARGUMENT error status. If the type url is valid but the
-  // corresponding type cannot be found, returns a NOT_FOUND error status.
-  //
-  // This TypeInfo class retains the ownership of the returned pointer.
-  virtual util::StatusOr<const google::protobuf::Type*> ResolveTypeUrl(
-      StringPiece type_url) const = 0;
-
-  // Resolves a type url into a Type. Like ResolveTypeUrl() but returns
-  // NULL if the type url is invalid or the type cannot be found.
-  //
-  // This TypeInfo class retains the ownership of the returned pointer.
-  virtual const google::protobuf::Type* GetTypeByTypeUrl(
-      StringPiece type_url) const = 0;
-
-  // Resolves a type url for an enum. Returns NULL if the type url is
-  // invalid or the type cannot be found.
-  //
-  // This TypeInfo class retains the ownership of the returned pointer.
-  virtual const google::protobuf::Enum* GetEnumByTypeUrl(
-      StringPiece type_url) const = 0;
-
-  // Looks up a field in the specified type given a CamelCase name.
-  virtual const google::protobuf::Field* FindField(
-      const google::protobuf::Type* type,
-      StringPiece camel_case_name) const = 0;
-
-  // Creates a TypeInfo object that looks up type information from a
-  // TypeResolver. Caller takes ownership of the returned pointer.
-  static TypeInfo* NewTypeInfo(TypeResolver* type_resolver);
-
- private:
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(TypeInfo);
-};
-
-}  // namespace converter
-}  // namespace util
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
-
-#endif  // GOOGLE_PROTOBUF_UTIL_INTERNAL_TYPE_INFO_H__
diff --git a/libs/protobuf/src/google/protobuf/util/internal/type_info_test_helper.cc b/libs/protobuf/src/google/protobuf/util/internal/type_info_test_helper.cc
deleted file mode 100644
index 088f412..0000000
--- a/libs/protobuf/src/google/protobuf/util/internal/type_info_test_helper.cc
+++ /dev/null
@@ -1,132 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <google/protobuf/util/internal/type_info_test_helper.h>
-
-#include <memory>
-#include <vector>
-
-#include <google/protobuf/stubs/logging.h>
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/util/internal/constants.h>
-#include <google/protobuf/util/internal/default_value_objectwriter.h>
-#include <google/protobuf/util/internal/protostream_objectsource.h>
-#include <google/protobuf/util/internal/protostream_objectwriter.h>
-#include <google/protobuf/util/internal/type_info.h>
-#include <google/protobuf/util/type_resolver.h>
-#include <google/protobuf/util/type_resolver_util.h>
-
-namespace google {
-namespace protobuf {
-namespace util {
-namespace converter {
-namespace testing {
-
-
-void TypeInfoTestHelper::ResetTypeInfo(
-    const std::vector<const Descriptor*>& descriptors) {
-  switch (type_) {
-    case USE_TYPE_RESOLVER: {
-      const DescriptorPool* pool = descriptors[0]->file()->pool();
-      for (int i = 1; i < descriptors.size(); ++i) {
-        GOOGLE_CHECK(pool == descriptors[i]->file()->pool())
-            << "Descriptors from different pools are not supported.";
-      }
-      type_resolver_.reset(
-          NewTypeResolverForDescriptorPool(kTypeServiceBaseUrl, pool));
-      typeinfo_.reset(TypeInfo::NewTypeInfo(type_resolver_.get()));
-      return;
-    }
-  }
-  GOOGLE_LOG(FATAL) << "Can not reach here.";
-}
-
-void TypeInfoTestHelper::ResetTypeInfo(const Descriptor* descriptor) {
-  std::vector<const Descriptor*> descriptors;
-  descriptors.push_back(descriptor);
-  ResetTypeInfo(descriptors);
-}
-
-void TypeInfoTestHelper::ResetTypeInfo(const Descriptor* descriptor1,
-                                       const Descriptor* descriptor2) {
-  std::vector<const Descriptor*> descriptors;
-  descriptors.push_back(descriptor1);
-  descriptors.push_back(descriptor2);
-  ResetTypeInfo(descriptors);
-}
-
-TypeInfo* TypeInfoTestHelper::GetTypeInfo() { return typeinfo_.get(); }
-
-ProtoStreamObjectSource* TypeInfoTestHelper::NewProtoSource(
-    io::CodedInputStream* coded_input, const std::string& type_url,
-    ProtoStreamObjectSource::RenderOptions render_options) {
-  const google::protobuf::Type* type = typeinfo_->GetTypeByTypeUrl(type_url);
-  switch (type_) {
-    case USE_TYPE_RESOLVER: {
-      return new ProtoStreamObjectSource(coded_input, type_resolver_.get(),
-                                         *type, render_options);
-    }
-  }
-  GOOGLE_LOG(FATAL) << "Can not reach here.";
-  return nullptr;
-}
-
-ProtoStreamObjectWriter* TypeInfoTestHelper::NewProtoWriter(
-    const std::string& type_url, strings::ByteSink* output,
-    ErrorListener* listener, const ProtoStreamObjectWriter::Options& options) {
-  const google::protobuf::Type* type = typeinfo_->GetTypeByTypeUrl(type_url);
-  switch (type_) {
-    case USE_TYPE_RESOLVER: {
-      return new ProtoStreamObjectWriter(type_resolver_.get(), *type, output,
-                                         listener, options);
-    }
-  }
-  GOOGLE_LOG(FATAL) << "Can not reach here.";
-  return nullptr;
-}
-
-DefaultValueObjectWriter* TypeInfoTestHelper::NewDefaultValueWriter(
-    const std::string& type_url, ObjectWriter* writer) {
-  const google::protobuf::Type* type = typeinfo_->GetTypeByTypeUrl(type_url);
-  switch (type_) {
-    case USE_TYPE_RESOLVER: {
-      return new DefaultValueObjectWriter(type_resolver_.get(), *type, writer);
-    }
-  }
-  GOOGLE_LOG(FATAL) << "Can not reach here.";
-  return nullptr;
-}
-
-}  // namespace testing
-}  // namespace converter
-}  // namespace util
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/util/internal/type_info_test_helper.h b/libs/protobuf/src/google/protobuf/util/internal/type_info_test_helper.h
deleted file mode 100644
index 1110a34..0000000
--- a/libs/protobuf/src/google/protobuf/util/internal/type_info_test_helper.h
+++ /dev/null
@@ -1,96 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef GOOGLE_PROTOBUF_UTIL_INTERNAL_TYPE_INFO_TEST_HELPER_H__
-#define GOOGLE_PROTOBUF_UTIL_INTERNAL_TYPE_INFO_TEST_HELPER_H__
-
-#include <memory>
-#include <vector>
-
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/util/internal/default_value_objectwriter.h>
-#include <google/protobuf/util/internal/protostream_objectsource.h>
-#include <google/protobuf/util/internal/protostream_objectwriter.h>
-#include <google/protobuf/util/internal/type_info.h>
-#include <google/protobuf/util/type_resolver.h>
-
-namespace google {
-namespace protobuf {
-namespace util {
-namespace converter {
-namespace testing {
-
-enum TypeInfoSource {
-  USE_TYPE_RESOLVER,
-};
-
-// In the unit-tests we want to test two scenarios: one with type info from
-// ServiceTypeInfo, the other with type info from TypeResolver. This class
-// wraps the detail of where the type info is from and provides the same
-// interface so the same unit-test code can test both scenarios.
-class TypeInfoTestHelper {
- public:
-  explicit TypeInfoTestHelper(TypeInfoSource type) : type_(type) {}
-
-  // Creates a TypeInfo object for the given set of descriptors.
-  void ResetTypeInfo(const std::vector<const Descriptor*>& descriptors);
-
-  // Convenient overloads.
-  void ResetTypeInfo(const Descriptor* descriptor);
-  void ResetTypeInfo(const Descriptor* descriptor1,
-                     const Descriptor* descriptor2);
-
-  // Returns the TypeInfo created after ResetTypeInfo.
-  TypeInfo* GetTypeInfo();
-
-  ProtoStreamObjectSource* NewProtoSource(
-      io::CodedInputStream* coded_input, const std::string& type_url,
-      ProtoStreamObjectSource::RenderOptions render_options = {});
-
-  ProtoStreamObjectWriter* NewProtoWriter(
-      const std::string& type_url, strings::ByteSink* output,
-      ErrorListener* listener, const ProtoStreamObjectWriter::Options& options);
-
-  DefaultValueObjectWriter* NewDefaultValueWriter(const std::string& type_url,
-                                                  ObjectWriter* writer);
-
- private:
-  TypeInfoSource type_;
-  std::unique_ptr<TypeInfo> typeinfo_;
-  std::unique_ptr<TypeResolver> type_resolver_;
-};
-}  // namespace testing
-}  // namespace converter
-}  // namespace util
-}  // namespace protobuf
-}  // namespace google
-
-#endif  // GOOGLE_PROTOBUF_UTIL_INTERNAL_TYPE_INFO_TEST_HELPER_H__
diff --git a/libs/protobuf/src/google/protobuf/util/internal/utility.cc b/libs/protobuf/src/google/protobuf/util/internal/utility.cc
deleted file mode 100644
index 918ee17..0000000
--- a/libs/protobuf/src/google/protobuf/util/internal/utility.cc
+++ /dev/null
@@ -1,416 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <google/protobuf/util/internal/utility.h>
-
-#include <algorithm>
-#include <cmath>
-#include <cstdint>
-#include <limits>
-
-#include <google/protobuf/stubs/callback.h>
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/stubs/logging.h>
-#include <google/protobuf/wrappers.pb.h>
-#include <google/protobuf/descriptor.pb.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/stubs/strutil.h>
-#include <google/protobuf/util/internal/constants.h>
-#include <google/protobuf/stubs/map_util.h>
-
-// clang-format off
-#include <google/protobuf/port_def.inc>
-// clang-format on
-
-namespace google {
-namespace protobuf {
-namespace util {
-namespace converter {
-
-bool GetBoolOptionOrDefault(
-    const RepeatedPtrField<google::protobuf::Option>& options,
-    StringPiece option_name, bool default_value) {
-  const google::protobuf::Option* opt = FindOptionOrNull(options, option_name);
-  if (opt == nullptr) {
-    return default_value;
-  }
-  return GetBoolFromAny(opt->value());
-}
-
-int64_t GetInt64OptionOrDefault(
-    const RepeatedPtrField<google::protobuf::Option>& options,
-    StringPiece option_name, int64_t default_value) {
-  const google::protobuf::Option* opt = FindOptionOrNull(options, option_name);
-  if (opt == nullptr) {
-    return default_value;
-  }
-  return GetInt64FromAny(opt->value());
-}
-
-double GetDoubleOptionOrDefault(
-    const RepeatedPtrField<google::protobuf::Option>& options,
-    StringPiece option_name, double default_value) {
-  const google::protobuf::Option* opt = FindOptionOrNull(options, option_name);
-  if (opt == nullptr) {
-    return default_value;
-  }
-  return GetDoubleFromAny(opt->value());
-}
-
-std::string GetStringOptionOrDefault(
-    const RepeatedPtrField<google::protobuf::Option>& options,
-    StringPiece option_name, StringPiece default_value) {
-  const google::protobuf::Option* opt = FindOptionOrNull(options, option_name);
-  if (opt == nullptr) {
-    return std::string(default_value);
-  }
-  return GetStringFromAny(opt->value());
-}
-
-template <typename T>
-void ParseFromAny(const std::string& data, T* result) {
-  result->ParseFromString(data);
-}
-
-// Returns a boolean value contained in Any type.
-// TODO(skarvaje): Add type checking & error messages here.
-bool GetBoolFromAny(const google::protobuf::Any& any) {
-  google::protobuf::BoolValue b;
-  ParseFromAny(any.value(), &b);
-  return b.value();
-}
-
-int64_t GetInt64FromAny(const google::protobuf::Any& any) {
-  google::protobuf::Int64Value i;
-  ParseFromAny(any.value(), &i);
-  return i.value();
-}
-
-double GetDoubleFromAny(const google::protobuf::Any& any) {
-  google::protobuf::DoubleValue i;
-  ParseFromAny(any.value(), &i);
-  return i.value();
-}
-
-std::string GetStringFromAny(const google::protobuf::Any& any) {
-  google::protobuf::StringValue s;
-  ParseFromAny(any.value(), &s);
-  return s.value();
-}
-
-const StringPiece GetTypeWithoutUrl(StringPiece type_url) {
-  if (type_url.size() > kTypeUrlSize && type_url[kTypeUrlSize] == '/') {
-    return type_url.substr(kTypeUrlSize + 1);
-  } else {
-    size_t idx = type_url.rfind('/');
-    if (idx != type_url.npos) {
-      type_url.remove_prefix(idx + 1);
-    }
-    return type_url;
-  }
-}
-
-const std::string GetFullTypeWithUrl(StringPiece simple_type) {
-  return StrCat(kTypeServiceBaseUrl, "/", simple_type);
-}
-
-const google::protobuf::Option* FindOptionOrNull(
-    const RepeatedPtrField<google::protobuf::Option>& options,
-    StringPiece option_name) {
-  for (int i = 0; i < options.size(); ++i) {
-    const google::protobuf::Option& opt = options.Get(i);
-    if (opt.name() == option_name) {
-      return &opt;
-    }
-  }
-  return nullptr;
-}
-
-const google::protobuf::Field* FindFieldInTypeOrNull(
-    const google::protobuf::Type* type, StringPiece field_name) {
-  if (type != nullptr) {
-    for (int i = 0; i < type->fields_size(); ++i) {
-      const google::protobuf::Field& field = type->fields(i);
-      if (field.name() == field_name) {
-        return &field;
-      }
-    }
-  }
-  return nullptr;
-}
-
-const google::protobuf::Field* FindJsonFieldInTypeOrNull(
-    const google::protobuf::Type* type, StringPiece json_name) {
-  if (type != nullptr) {
-    for (int i = 0; i < type->fields_size(); ++i) {
-      const google::protobuf::Field& field = type->fields(i);
-      if (field.json_name() == json_name) {
-        return &field;
-      }
-    }
-  }
-  return nullptr;
-}
-
-const google::protobuf::Field* FindFieldInTypeByNumberOrNull(
-    const google::protobuf::Type* type, int32_t number) {
-  if (type != nullptr) {
-    for (int i = 0; i < type->fields_size(); ++i) {
-      const google::protobuf::Field& field = type->fields(i);
-      if (field.number() == number) {
-        return &field;
-      }
-    }
-  }
-  return nullptr;
-}
-
-const google::protobuf::EnumValue* FindEnumValueByNameOrNull(
-    const google::protobuf::Enum* enum_type, StringPiece enum_name) {
-  if (enum_type != nullptr) {
-    for (int i = 0; i < enum_type->enumvalue_size(); ++i) {
-      const google::protobuf::EnumValue& enum_value = enum_type->enumvalue(i);
-      if (enum_value.name() == enum_name) {
-        return &enum_value;
-      }
-    }
-  }
-  return nullptr;
-}
-
-const google::protobuf::EnumValue* FindEnumValueByNumberOrNull(
-    const google::protobuf::Enum* enum_type, int32_t value) {
-  if (enum_type != nullptr) {
-    for (int i = 0; i < enum_type->enumvalue_size(); ++i) {
-      const google::protobuf::EnumValue& enum_value = enum_type->enumvalue(i);
-      if (enum_value.number() == value) {
-        return &enum_value;
-      }
-    }
-  }
-  return nullptr;
-}
-
-const google::protobuf::EnumValue* FindEnumValueByNameWithoutUnderscoreOrNull(
-    const google::protobuf::Enum* enum_type, StringPiece enum_name) {
-  if (enum_type != nullptr) {
-    for (int i = 0; i < enum_type->enumvalue_size(); ++i) {
-      const google::protobuf::EnumValue& enum_value = enum_type->enumvalue(i);
-      std::string enum_name_without_underscore = enum_value.name();
-
-      // Remove underscore from the name.
-      enum_name_without_underscore.erase(
-          std::remove(enum_name_without_underscore.begin(),
-                      enum_name_without_underscore.end(), '_'),
-          enum_name_without_underscore.end());
-      // Make the name uppercase.
-      for (std::string::iterator it = enum_name_without_underscore.begin();
-           it != enum_name_without_underscore.end(); ++it) {
-        *it = ascii_toupper(*it);
-      }
-
-      if (enum_name_without_underscore == enum_name) {
-        return &enum_value;
-      }
-    }
-  }
-  return nullptr;
-}
-
-std::string EnumValueNameToLowerCamelCase(StringPiece input) {
-  std::string input_string(input);
-  std::transform(input_string.begin(), input_string.end(), input_string.begin(),
-                 ::tolower);
-  return ToCamelCase(input_string);
-}
-
-std::string ToCamelCase(StringPiece input) {
-  bool capitalize_next = false;
-  bool was_cap = true;
-  bool is_cap = false;
-  bool first_word = true;
-  std::string result;
-  result.reserve(input.size());
-
-  for (size_t i = 0; i < input.size(); ++i, was_cap = is_cap) {
-    is_cap = ascii_isupper(input[i]);
-    if (input[i] == '_') {
-      capitalize_next = true;
-      if (!result.empty()) first_word = false;
-      continue;
-    } else if (first_word) {
-      // Consider when the current character B is capitalized,
-      // first word ends when:
-      // 1) following a lowercase:   "...aB..."
-      // 2) followed by a lowercase: "...ABc..."
-      if (!result.empty() && is_cap &&
-          (!was_cap ||
-           (i + 1 < input.size() && ascii_islower(input[i + 1])))) {
-        first_word = false;
-        result.push_back(input[i]);
-      } else {
-        result.push_back(ascii_tolower(input[i]));
-        continue;
-      }
-    } else if (capitalize_next) {
-      capitalize_next = false;
-      if (ascii_islower(input[i])) {
-        result.push_back(ascii_toupper(input[i]));
-        continue;
-      } else {
-        result.push_back(input[i]);
-        continue;
-      }
-    } else {
-      result.push_back(ascii_tolower(input[i]));
-    }
-  }
-  return result;
-}
-
-std::string ToSnakeCase(StringPiece input) {
-  bool was_not_underscore = false;  // Initialize to false for case 1 (below)
-  bool was_not_cap = false;
-  std::string result;
-  result.reserve(input.size() << 1);
-
-  for (size_t i = 0; i < input.size(); ++i) {
-    if (ascii_isupper(input[i])) {
-      // Consider when the current character B is capitalized:
-      // 1) At beginning of input:   "B..." => "b..."
-      //    (e.g. "Biscuit" => "biscuit")
-      // 2) Following a lowercase:   "...aB..." => "...a_b..."
-      //    (e.g. "gBike" => "g_bike")
-      // 3) At the end of input:     "...AB" => "...ab"
-      //    (e.g. "GoogleLAB" => "google_lab")
-      // 4) Followed by a lowercase: "...ABc..." => "...a_bc..."
-      //    (e.g. "GBike" => "g_bike")
-      if (was_not_underscore &&                     //            case 1 out
-          (was_not_cap ||                           // case 2 in, case 3 out
-           (i + 1 < input.size() &&                 //            case 3 out
-            ascii_islower(input[i + 1])))) {  // case 4 in
-        // We add an underscore for case 2 and case 4.
-        result.push_back('_');
-      }
-      result.push_back(ascii_tolower(input[i]));
-      was_not_underscore = true;
-      was_not_cap = false;
-    } else {
-      result.push_back(input[i]);
-      was_not_underscore = input[i] != '_';
-      was_not_cap = true;
-    }
-  }
-  return result;
-}
-
-std::set<std::string>* well_known_types_ = nullptr;
-PROTOBUF_NAMESPACE_ID::internal::once_flag well_known_types_init_;
-const char* well_known_types_name_array_[] = {
-    "google.protobuf.Timestamp",   "google.protobuf.Duration",
-    "google.protobuf.DoubleValue", "google.protobuf.FloatValue",
-    "google.protobuf.Int64Value",  "google.protobuf.UInt64Value",
-    "google.protobuf.Int32Value",  "google.protobuf.UInt32Value",
-    "google.protobuf.BoolValue",   "google.protobuf.StringValue",
-    "google.protobuf.BytesValue",  "google.protobuf.FieldMask"};
-
-void DeleteWellKnownTypes() { delete well_known_types_; }
-
-void InitWellKnownTypes() {
-  well_known_types_ = new std::set<std::string>;
-  for (int i = 0; i < GOOGLE_ARRAYSIZE(well_known_types_name_array_); ++i) {
-    well_known_types_->insert(well_known_types_name_array_[i]);
-  }
-  google::protobuf::internal::OnShutdown(&DeleteWellKnownTypes);
-}
-
-bool IsWellKnownType(const std::string& type_name) {
-  PROTOBUF_NAMESPACE_ID::internal::call_once(well_known_types_init_,
-                                             InitWellKnownTypes);
-  return ContainsKey(*well_known_types_, type_name);
-}
-
-bool IsValidBoolString(StringPiece bool_string) {
-  return bool_string == "true" || bool_string == "false" ||
-         bool_string == "1" || bool_string == "0";
-}
-
-bool IsMap(const google::protobuf::Field& field,
-           const google::protobuf::Type& type) {
-  return field.cardinality() == google::protobuf::Field::CARDINALITY_REPEATED &&
-         (GetBoolOptionOrDefault(type.options(), "map_entry", false) ||
-          GetBoolOptionOrDefault(type.options(),
-                                 "google.protobuf.MessageOptions.map_entry",
-                                 false));
-}
-
-bool IsMessageSetWireFormat(const google::protobuf::Type& type) {
-  return GetBoolOptionOrDefault(type.options(), "message_set_wire_format",
-                                false) ||
-         GetBoolOptionOrDefault(
-             type.options(),
-             "google.protobuf.MessageOptions.message_set_wire_format", false);
-}
-
-std::string DoubleAsString(double value) {
-  if (value == std::numeric_limits<double>::infinity()) return "Infinity";
-  if (value == -std::numeric_limits<double>::infinity()) return "-Infinity";
-  if (std::isnan(value)) return "NaN";
-
-  return SimpleDtoa(value);
-}
-
-std::string FloatAsString(float value) {
-  if (std::isfinite(value)) return SimpleFtoa(value);
-  return DoubleAsString(value);
-}
-
-bool SafeStrToFloat(StringPiece str, float* value) {
-  double double_value;
-  if (!safe_strtod(str, &double_value)) {
-    return false;
-  }
-
-  if (std::isinf(double_value) || std::isnan(double_value)) return false;
-
-  // Fail if the value is not representable in float.
-  if (double_value > std::numeric_limits<float>::max() ||
-      double_value < -std::numeric_limits<float>::max()) {
-    return false;
-  }
-
-  *value = static_cast<float>(double_value);
-  return true;
-}
-
-}  // namespace converter
-}  // namespace util
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/util/internal/utility.h b/libs/protobuf/src/google/protobuf/util/internal/utility.h
deleted file mode 100644
index 79d6779..0000000
--- a/libs/protobuf/src/google/protobuf/util/internal/utility.h
+++ /dev/null
@@ -1,204 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef GOOGLE_PROTOBUF_UTIL_INTERNAL_UTILITY_H__
-#define GOOGLE_PROTOBUF_UTIL_INTERNAL_UTILITY_H__
-
-#include <cstdint>
-#include <memory>
-#include <string>
-#include <utility>
-
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/stubs/logging.h>
-#include <google/protobuf/any.pb.h>
-#include <google/protobuf/type.pb.h>
-#include <google/protobuf/repeated_field.h>
-#include <google/protobuf/stubs/strutil.h>
-#include <google/protobuf/stubs/statusor.h>
-#include <google/protobuf/stubs/status.h>
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-namespace util {
-namespace converter {
-
-// Size of "type.googleapis.com"
-static const int64_t kTypeUrlSize = 19;
-
-// Finds the tech option identified by option_name. Parses the boolean value and
-// returns it.
-// When the option with the given name is not found, default_value is returned.
-PROTOBUF_EXPORT bool GetBoolOptionOrDefault(
-    const RepeatedPtrField<google::protobuf::Option>& options,
-    StringPiece option_name, bool default_value);
-
-// Returns int64 option value. If the option isn't found, returns the
-// default_value.
-PROTOBUF_EXPORT int64_t GetInt64OptionOrDefault(
-    const RepeatedPtrField<google::protobuf::Option>& options,
-    StringPiece option_name, int64_t default_value);
-
-// Returns double option value. If the option isn't found, returns the
-// default_value.
-PROTOBUF_EXPORT double GetDoubleOptionOrDefault(
-    const RepeatedPtrField<google::protobuf::Option>& options,
-    StringPiece option_name, double default_value);
-
-// Returns string option value. If the option isn't found, returns the
-// default_value.
-PROTOBUF_EXPORT std::string GetStringOptionOrDefault(
-    const RepeatedPtrField<google::protobuf::Option>& options,
-    StringPiece option_name, StringPiece default_value);
-
-// Returns a boolean value contained in Any type.
-// TODO(skarvaje): Make these utilities dealing with Any types more generic,
-// add more error checking and move to a more public/shareable location so
-// others can use.
-PROTOBUF_EXPORT bool GetBoolFromAny(const google::protobuf::Any& any);
-
-// Returns int64 value contained in Any type.
-PROTOBUF_EXPORT int64_t GetInt64FromAny(const google::protobuf::Any& any);
-
-// Returns double value contained in Any type.
-PROTOBUF_EXPORT double GetDoubleFromAny(const google::protobuf::Any& any);
-
-// Returns string value contained in Any type.
-PROTOBUF_EXPORT std::string GetStringFromAny(const google::protobuf::Any& any);
-
-// Returns the type string without the url prefix. e.g.: If the passed type is
-// 'type.googleapis.com/tech.type.Bool', the returned value is 'tech.type.Bool'.
-PROTOBUF_EXPORT const StringPiece GetTypeWithoutUrl(
-    StringPiece type_url);
-
-// Returns the simple_type with the base type url (kTypeServiceBaseUrl)
-// prefixed.
-//
-// E.g:
-// GetFullTypeWithUrl("google.protobuf.Timestamp") returns the string
-// "type.googleapis.com/google.protobuf.Timestamp".
-PROTOBUF_EXPORT const std::string GetFullTypeWithUrl(
-    StringPiece simple_type);
-
-// Finds and returns option identified by name and option_name within the
-// provided map. Returns nullptr if none found.
-const google::protobuf::Option* FindOptionOrNull(
-    const RepeatedPtrField<google::protobuf::Option>& options,
-    StringPiece option_name);
-
-// Finds and returns the field identified by field_name in the passed tech Type
-// object. Returns nullptr if none found.
-const google::protobuf::Field* FindFieldInTypeOrNull(
-    const google::protobuf::Type* type, StringPiece field_name);
-
-// Similar to FindFieldInTypeOrNull, but this looks up fields with given
-// json_name.
-const google::protobuf::Field* FindJsonFieldInTypeOrNull(
-    const google::protobuf::Type* type, StringPiece json_name);
-
-// Similar to FindFieldInTypeOrNull, but this looks up fields by number.
-const google::protobuf::Field* FindFieldInTypeByNumberOrNull(
-    const google::protobuf::Type* type, int32_t number);
-
-// Finds and returns the EnumValue identified by enum_name in the passed tech
-// Enum object. Returns nullptr if none found.
-const google::protobuf::EnumValue* FindEnumValueByNameOrNull(
-    const google::protobuf::Enum* enum_type, StringPiece enum_name);
-
-// Finds and returns the EnumValue identified by value in the passed tech
-// Enum object. Returns nullptr if none found.
-const google::protobuf::EnumValue* FindEnumValueByNumberOrNull(
-    const google::protobuf::Enum* enum_type, int32_t value);
-
-// Finds and returns the EnumValue identified by enum_name without underscore in
-// the passed tech Enum object. Returns nullptr if none found.
-// For Ex. if enum_name is ACTIONANDADVENTURE it can get accepted if
-// EnumValue's name is action_and_adventure or ACTION_AND_ADVENTURE.
-const google::protobuf::EnumValue* FindEnumValueByNameWithoutUnderscoreOrNull(
-    const google::protobuf::Enum* enum_type, StringPiece enum_name);
-
-// Converts input to camel-case and returns it.
-PROTOBUF_EXPORT std::string ToCamelCase(const StringPiece input);
-
-// Converts enum name string to camel-case and returns it.
-std::string EnumValueNameToLowerCamelCase(const StringPiece input);
-
-// Converts input to snake_case and returns it.
-PROTOBUF_EXPORT std::string ToSnakeCase(StringPiece input);
-
-// Returns true if type_name represents a well-known type.
-PROTOBUF_EXPORT bool IsWellKnownType(const std::string& type_name);
-
-// Returns true if 'bool_string' represents a valid boolean value. Only "true",
-// "false", "0" and "1" are allowed.
-PROTOBUF_EXPORT bool IsValidBoolString(StringPiece bool_string);
-
-// Returns true if "field" is a protobuf map field based on its type.
-PROTOBUF_EXPORT bool IsMap(const google::protobuf::Field& field,
-                           const google::protobuf::Type& type);
-
-// Returns true if the given type has special MessageSet wire format.
-bool IsMessageSetWireFormat(const google::protobuf::Type& type);
-
-// Infinity/NaN-aware conversion to string.
-PROTOBUF_EXPORT std::string DoubleAsString(double value);
-PROTOBUF_EXPORT std::string FloatAsString(float value);
-
-// Convert from int32, int64, uint32, uint64, double or float to string.
-template <typename T>
-std::string ValueAsString(T value) {
-  return StrCat(value);
-}
-
-template <>
-inline std::string ValueAsString(float value) {
-  return FloatAsString(value);
-}
-
-template <>
-inline std::string ValueAsString(double value) {
-  return DoubleAsString(value);
-}
-
-// Converts a string to float. Unlike safe_strtof, conversion will fail if the
-// value fits into double but not float (e.g., DBL_MAX).
-PROTOBUF_EXPORT bool SafeStrToFloat(StringPiece str, float* value);
-
-}  // namespace converter
-}  // namespace util
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
-
-#endif  // GOOGLE_PROTOBUF_UTIL_INTERNAL_UTILITY_H__
diff --git a/libs/protobuf/src/google/protobuf/util/json_format.proto b/libs/protobuf/src/google/protobuf/util/json_format.proto
deleted file mode 100644
index 7b7100d..0000000
--- a/libs/protobuf/src/google/protobuf/util/json_format.proto
+++ /dev/null
@@ -1,140 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-//
-// A proto file we will use for unit testing.
-
-syntax = "proto2";
-
-package protobuf_unittest;
-
-message TestFlagsAndStrings {
-  required int32 A = 1;
-  repeated group RepeatedGroup = 2 {
-    required string f = 3;
-  }
-}
-
-message TestBase64ByteArrays {
-  required bytes a = 1;
-}
-
-message TestJavaScriptJSON {
-  optional int32 a = 1;
-  optional float final = 2;
-  optional string in = 3;
-  optional string Var = 4;
-}
-
-message TestJavaScriptOrderJSON1 {
-  optional int32 d = 1;
-  optional int32 c = 2;
-  optional bool x = 3;
-  optional int32 b = 4;
-  optional int32 a = 5;
-}
-
-message TestJavaScriptOrderJSON2 {
-  optional int32 d = 1;
-  optional int32 c = 2;
-  optional bool x = 3;
-  optional int32 b = 4;
-  optional int32 a = 5;
-  repeated TestJavaScriptOrderJSON1 z = 6;
-}
-
-message TestLargeInt {
-  required int64 a = 1;
-  required uint64 b = 2;
-}
-
-message TestNumbers {
-  enum MyType {
-    OK = 0;
-    WARNING = 1;
-    ERROR = 2;
-  }
-  optional MyType a = 1;
-  optional int32 b = 2;
-  optional float c = 3;
-  optional bool d = 4;
-  optional double e = 5;
-  optional uint32 f = 6;
-}
-
-
-message TestCamelCase {
-  optional string normal_field = 1;
-  optional int32 CAPITAL_FIELD = 2;
-  optional int32 CamelCaseField = 3;
-}
-
-message TestBoolMap {
-  map<bool, int32> bool_map = 1;
-}
-
-message TestRecursion {
-  optional int32 value = 1;
-  optional TestRecursion child = 2;
-}
-
-message TestStringMap {
-  map<string, string> string_map = 1;
-}
-
-message TestStringSerializer {
-  optional string scalar_string = 1;
-  repeated string repeated_string = 2;
-  map<string, string> string_map = 3;
-}
-
-message TestMessageWithExtension {
-  extensions 100 to max;
-}
-
-message TestExtension {
-  extend TestMessageWithExtension {
-    optional TestExtension ext = 100;
-  }
-  optional string value = 1;
-}
-
-enum EnumValue {
-  PROTOCOL = 0;
-  BUFFER = 1;
-  DEFAULT = 2;
-}
-
-message TestDefaultEnumValue {
-  optional EnumValue enum_value = 1 [default = DEFAULT];
-}
diff --git a/libs/protobuf/src/google/protobuf/util/json_format_proto3.proto b/libs/protobuf/src/google/protobuf/util/json_format_proto3.proto
deleted file mode 100644
index 0eec9da..0000000
--- a/libs/protobuf/src/google/protobuf/util/json_format_proto3.proto
+++ /dev/null
@@ -1,194 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto3";
-
-package proto3;
-
-import "google/protobuf/any.proto";
-import "google/protobuf/duration.proto";
-import "google/protobuf/field_mask.proto";
-import "google/protobuf/struct.proto";
-import "google/protobuf/timestamp.proto";
-import "google/protobuf/wrappers.proto";
-import "google/protobuf/unittest.proto";
-
-option java_package = "com.google.protobuf.util";
-option java_outer_classname = "JsonFormatProto3";
-
-enum EnumType {
-  FOO = 0;
-  BAR = 1;
-}
-
-message MessageType {
-  int32 value = 1;
-}
-
-message TestMessage {
-  bool bool_value = 1;
-  int32 int32_value = 2;
-  int64 int64_value = 3;
-  uint32 uint32_value = 4;
-  uint64 uint64_value = 5;
-  float float_value = 6;
-  double double_value = 7;
-  string string_value = 8;
-  bytes bytes_value = 9;
-  EnumType enum_value = 10;
-  MessageType message_value = 11;
-
-  repeated bool repeated_bool_value = 21;
-  repeated int32 repeated_int32_value = 22;
-  repeated int64 repeated_int64_value = 23;
-  repeated uint32 repeated_uint32_value = 24;
-  repeated uint64 repeated_uint64_value = 25;
-  repeated float repeated_float_value = 26;
-  repeated double repeated_double_value = 27;
-  repeated string repeated_string_value = 28;
-  repeated bytes repeated_bytes_value = 29;
-  repeated EnumType repeated_enum_value = 30;
-  repeated MessageType repeated_message_value = 31;
-}
-
-message TestOneof {
-  // In JSON format oneof fields behave mostly the same as optional
-  // fields except that:
-  //   1. Oneof fields have field presence information and will be
-  //      printed if it's set no matter whether it's the default value.
-  //   2. Multiple oneof fields in the same oneof cannot appear at the
-  //      same time in the input.
-  oneof oneof_value {
-    int32 oneof_int32_value = 1;
-    string oneof_string_value = 2;
-    bytes oneof_bytes_value = 3;
-    EnumType oneof_enum_value = 4;
-    MessageType oneof_message_value = 5;
-    google.protobuf.NullValue oneof_null_value = 6;
-  }
-}
-
-message TestMap {
-  map<bool, int32> bool_map = 1;
-  map<int32, int32> int32_map = 2;
-  map<int64, int32> int64_map = 3;
-  map<uint32, int32> uint32_map = 4;
-  map<uint64, int32> uint64_map = 5;
-  map<string, int32> string_map = 6;
-}
-
-message TestNestedMap {
-  map<bool, int32> bool_map = 1;
-  map<int32, int32> int32_map = 2;
-  map<int64, int32> int64_map = 3;
-  map<uint32, int32> uint32_map = 4;
-  map<uint64, int32> uint64_map = 5;
-  map<string, int32> string_map = 6;
-  map<string, TestNestedMap> map_map = 7;
-}
-
-message TestStringMap {
-  map<string, string> string_map = 1;
-}
-
-message TestWrapper {
-  google.protobuf.BoolValue bool_value = 1;
-  google.protobuf.Int32Value int32_value = 2;
-  google.protobuf.Int64Value int64_value = 3;
-  google.protobuf.UInt32Value uint32_value = 4;
-  google.protobuf.UInt64Value uint64_value = 5;
-  google.protobuf.FloatValue float_value = 6;
-  google.protobuf.DoubleValue double_value = 7;
-  google.protobuf.StringValue string_value = 8;
-  google.protobuf.BytesValue bytes_value = 9;
-
-  repeated google.protobuf.BoolValue repeated_bool_value = 11;
-  repeated google.protobuf.Int32Value repeated_int32_value = 12;
-  repeated google.protobuf.Int64Value repeated_int64_value = 13;
-  repeated google.protobuf.UInt32Value repeated_uint32_value = 14;
-  repeated google.protobuf.UInt64Value repeated_uint64_value = 15;
-  repeated google.protobuf.FloatValue repeated_float_value = 16;
-  repeated google.protobuf.DoubleValue repeated_double_value = 17;
-  repeated google.protobuf.StringValue repeated_string_value = 18;
-  repeated google.protobuf.BytesValue repeated_bytes_value = 19;
-}
-
-message TestTimestamp {
-  google.protobuf.Timestamp value = 1;
-  repeated google.protobuf.Timestamp repeated_value = 2;
-}
-
-message TestDuration {
-  google.protobuf.Duration value = 1;
-  repeated google.protobuf.Duration repeated_value = 2;
-}
-
-message TestFieldMask {
-  google.protobuf.FieldMask value = 1;
-}
-
-message TestStruct {
-  google.protobuf.Struct value = 1;
-  repeated google.protobuf.Struct repeated_value = 2;
-}
-
-message TestAny {
-  google.protobuf.Any value = 1;
-  repeated google.protobuf.Any repeated_value = 2;
-}
-
-message TestValue {
-  google.protobuf.Value value = 1;
-  repeated google.protobuf.Value repeated_value = 2;
-}
-
-message TestListValue {
-  google.protobuf.ListValue value = 1;
-  repeated google.protobuf.ListValue repeated_value = 2;
-}
-
-message TestBoolValue {
-  bool bool_value = 1;
-  map<bool, int32> bool_map = 2;
-}
-
-message TestCustomJsonName {
-  int32 value = 1 [json_name = "@value"];
-}
-
-message TestExtensions {
-  .protobuf_unittest.TestAllExtensions extensions = 1;
-}
-
-message TestEnumValue {
-  EnumType enum_value1 = 1;
-  EnumType enum_value2 = 2;
-  EnumType enum_value3 = 3;
-}
diff --git a/libs/protobuf/src/google/protobuf/util/json_util.cc b/libs/protobuf/src/google/protobuf/util/json_util.cc
deleted file mode 100644
index c39c10d..0000000
--- a/libs/protobuf/src/google/protobuf/util/json_util.cc
+++ /dev/null
@@ -1,284 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <google/protobuf/util/json_util.h>
-
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/stubs/once.h>
-#include <google/protobuf/stubs/status.h>
-#include <google/protobuf/stubs/bytestream.h>
-#include <google/protobuf/stubs/strutil.h>
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/io/zero_copy_stream.h>
-#include <google/protobuf/util/internal/default_value_objectwriter.h>
-#include <google/protobuf/util/internal/error_listener.h>
-#include <google/protobuf/util/internal/json_objectwriter.h>
-#include <google/protobuf/util/internal/json_stream_parser.h>
-#include <google/protobuf/util/internal/protostream_objectsource.h>
-#include <google/protobuf/util/internal/protostream_objectwriter.h>
-#include <google/protobuf/util/type_resolver.h>
-#include <google/protobuf/util/type_resolver_util.h>
-#include <google/protobuf/stubs/status_macros.h>
-
-// clang-format off
-#include <google/protobuf/port_def.inc>
-// clang-format on
-
-namespace google {
-namespace protobuf {
-namespace util {
-
-namespace internal {
-ZeroCopyStreamByteSink::~ZeroCopyStreamByteSink() {
-  if (buffer_size_ > 0) {
-    stream_->BackUp(buffer_size_);
-  }
-}
-
-void ZeroCopyStreamByteSink::Append(const char* bytes, size_t len) {
-  while (true) {
-    if (len <= buffer_size_) {  // NOLINT
-      memcpy(buffer_, bytes, len);
-      buffer_ = static_cast<char*>(buffer_) + len;
-      buffer_size_ -= len;
-      return;
-    }
-    if (buffer_size_ > 0) {
-      memcpy(buffer_, bytes, buffer_size_);
-      bytes += buffer_size_;
-      len -= buffer_size_;
-    }
-    if (!stream_->Next(&buffer_, &buffer_size_)) {
-      // There isn't a way for ByteSink to report errors.
-      buffer_size_ = 0;
-      return;
-    }
-  }
-}
-}  // namespace internal
-
-util::Status BinaryToJsonStream(TypeResolver* resolver,
-                                const std::string& type_url,
-                                io::ZeroCopyInputStream* binary_input,
-                                io::ZeroCopyOutputStream* json_output,
-                                const JsonPrintOptions& options) {
-  io::CodedInputStream in_stream(binary_input);
-  google::protobuf::Type type;
-  RETURN_IF_ERROR(resolver->ResolveMessageType(type_url, &type));
-  converter::ProtoStreamObjectSource::RenderOptions render_options;
-  render_options.use_ints_for_enums = options.always_print_enums_as_ints;
-  render_options.preserve_proto_field_names =
-      options.preserve_proto_field_names;
-  converter::ProtoStreamObjectSource proto_source(&in_stream, resolver, type,
-                                                  render_options);
-  io::CodedOutputStream out_stream(json_output);
-  converter::JsonObjectWriter json_writer(options.add_whitespace ? " " : "",
-                                          &out_stream);
-  if (options.always_print_primitive_fields) {
-    converter::DefaultValueObjectWriter default_value_writer(resolver, type,
-                                                             &json_writer);
-    default_value_writer.set_preserve_proto_field_names(
-        options.preserve_proto_field_names);
-    default_value_writer.set_print_enums_as_ints(
-        options.always_print_enums_as_ints);
-    return proto_source.WriteTo(&default_value_writer);
-  } else {
-    return proto_source.WriteTo(&json_writer);
-  }
-}
-
-util::Status BinaryToJsonString(TypeResolver* resolver,
-                                const std::string& type_url,
-                                const std::string& binary_input,
-                                std::string* json_output,
-                                const JsonPrintOptions& options) {
-  io::ArrayInputStream input_stream(binary_input.data(), binary_input.size());
-  io::StringOutputStream output_stream(json_output);
-  return BinaryToJsonStream(resolver, type_url, &input_stream, &output_stream,
-                            options);
-}
-
-namespace {
-class StatusErrorListener : public converter::ErrorListener {
- public:
-  StatusErrorListener() {}
-  ~StatusErrorListener() override {}
-
-  util::Status GetStatus() { return status_; }
-
-  void InvalidName(const converter::LocationTrackerInterface& loc,
-                   StringPiece unknown_name,
-                   StringPiece message) override {
-    std::string loc_string = GetLocString(loc);
-    if (!loc_string.empty()) {
-      loc_string.append(" ");
-    }
-    status_ = util::InvalidArgumentError(
-        StrCat(loc_string, unknown_name, ": ", message));
-  }
-
-  void InvalidValue(const converter::LocationTrackerInterface& loc,
-                    StringPiece type_name,
-                    StringPiece value) override {
-    status_ = util::InvalidArgumentError(
-        StrCat(GetLocString(loc), ": invalid value ", std::string(value),
-                     " for type ", std::string(type_name)));
-  }
-
-  void MissingField(const converter::LocationTrackerInterface& loc,
-                    StringPiece missing_name) override {
-    status_ = util::InvalidArgumentError(StrCat(
-        GetLocString(loc), ": missing field ", std::string(missing_name)));
-  }
-
- private:
-  util::Status status_;
-
-  std::string GetLocString(const converter::LocationTrackerInterface& loc) {
-    std::string loc_string = loc.ToString();
-    StripWhitespace(&loc_string);
-    if (!loc_string.empty()) {
-      loc_string = StrCat("(", loc_string, ")");
-    }
-    return loc_string;
-  }
-
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(StatusErrorListener);
-};
-}  // namespace
-
-util::Status JsonToBinaryStream(TypeResolver* resolver,
-                                const std::string& type_url,
-                                io::ZeroCopyInputStream* json_input,
-                                io::ZeroCopyOutputStream* binary_output,
-                                const JsonParseOptions& options) {
-  google::protobuf::Type type;
-  RETURN_IF_ERROR(resolver->ResolveMessageType(type_url, &type));
-  internal::ZeroCopyStreamByteSink sink(binary_output);
-  StatusErrorListener listener;
-  converter::ProtoStreamObjectWriter::Options proto_writer_options;
-  proto_writer_options.ignore_unknown_fields = options.ignore_unknown_fields;
-  proto_writer_options.ignore_unknown_enum_values =
-      options.ignore_unknown_fields;
-  proto_writer_options.case_insensitive_enum_parsing =
-      options.case_insensitive_enum_parsing;
-  converter::ProtoStreamObjectWriter proto_writer(
-      resolver, type, &sink, &listener, proto_writer_options);
-
-  converter::JsonStreamParser parser(&proto_writer);
-  const void* buffer;
-  int length;
-  while (json_input->Next(&buffer, &length)) {
-    if (length == 0) continue;
-    RETURN_IF_ERROR(parser.Parse(
-        StringPiece(static_cast<const char*>(buffer), length)));
-  }
-  RETURN_IF_ERROR(parser.FinishParse());
-
-  return listener.GetStatus();
-}
-
-util::Status JsonToBinaryString(TypeResolver* resolver,
-                                const std::string& type_url,
-                                StringPiece json_input,
-                                std::string* binary_output,
-                                const JsonParseOptions& options) {
-  io::ArrayInputStream input_stream(json_input.data(), json_input.size());
-  io::StringOutputStream output_stream(binary_output);
-  return JsonToBinaryStream(resolver, type_url, &input_stream, &output_stream,
-                            options);
-}
-
-namespace {
-const char* kTypeUrlPrefix = "type.googleapis.com";
-TypeResolver* generated_type_resolver_ = nullptr;
-PROTOBUF_NAMESPACE_ID::internal::once_flag generated_type_resolver_init_;
-
-std::string GetTypeUrl(const Message& message) {
-  return std::string(kTypeUrlPrefix) + "/" +
-         message.GetDescriptor()->full_name();
-}
-
-void DeleteGeneratedTypeResolver() {  // NOLINT
-  delete generated_type_resolver_;
-}
-
-void InitGeneratedTypeResolver() {
-  generated_type_resolver_ = NewTypeResolverForDescriptorPool(
-      kTypeUrlPrefix, DescriptorPool::generated_pool());
-  ::google::protobuf::internal::OnShutdown(&DeleteGeneratedTypeResolver);
-}
-
-TypeResolver* GetGeneratedTypeResolver() {
-  PROTOBUF_NAMESPACE_ID::internal::call_once(generated_type_resolver_init_,
-                                             InitGeneratedTypeResolver);
-  return generated_type_resolver_;
-}
-}  // namespace
-
-util::Status MessageToJsonString(const Message& message, std::string* output,
-                                 const JsonOptions& options) {
-  const DescriptorPool* pool = message.GetDescriptor()->file()->pool();
-  TypeResolver* resolver =
-      pool == DescriptorPool::generated_pool()
-          ? GetGeneratedTypeResolver()
-          : NewTypeResolverForDescriptorPool(kTypeUrlPrefix, pool);
-  util::Status result =
-      BinaryToJsonString(resolver, GetTypeUrl(message),
-                         message.SerializeAsString(), output, options);
-  if (pool != DescriptorPool::generated_pool()) {
-    delete resolver;
-  }
-  return result;
-}
-
-util::Status JsonStringToMessage(StringPiece input, Message* message,
-                                 const JsonParseOptions& options) {
-  const DescriptorPool* pool = message->GetDescriptor()->file()->pool();
-  TypeResolver* resolver =
-      pool == DescriptorPool::generated_pool()
-          ? GetGeneratedTypeResolver()
-          : NewTypeResolverForDescriptorPool(kTypeUrlPrefix, pool);
-  std::string binary;
-  util::Status result = JsonToBinaryString(resolver, GetTypeUrl(*message),
-                                           input, &binary, options);
-  if (result.ok() && !message->ParseFromString(binary)) {
-    result = util::InvalidArgumentError(
-        "JSON transcoder produced invalid protobuf output.");
-  }
-  if (pool != DescriptorPool::generated_pool()) {
-    delete resolver;
-  }
-  return result;
-}
-
-}  // namespace util
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/util/json_util.h b/libs/protobuf/src/google/protobuf/util/json_util.h
deleted file mode 100644
index 0f1c4d8..0000000
--- a/libs/protobuf/src/google/protobuf/util/json_util.h
+++ /dev/null
@@ -1,204 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Utility functions to convert between protobuf binary format and proto3 JSON
-// format.
-#ifndef GOOGLE_PROTOBUF_UTIL_JSON_UTIL_H__
-#define GOOGLE_PROTOBUF_UTIL_JSON_UTIL_H__
-
-#include <google/protobuf/stubs/bytestream.h>
-#include <google/protobuf/stubs/status.h>
-#include <google/protobuf/stubs/strutil.h>
-#include <google/protobuf/message.h>
-#include <google/protobuf/util/type_resolver.h>
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-namespace io {
-class ZeroCopyInputStream;
-class ZeroCopyOutputStream;
-}  // namespace io
-namespace util {
-
-struct JsonParseOptions {
-  // Whether to ignore unknown JSON fields during parsing
-  bool ignore_unknown_fields;
-
-  // If true, when a lowercase enum value fails to parse, try convert it to
-  // UPPER_CASE and see if it matches a valid enum.
-  // WARNING: This option exists only to preserve legacy behavior. Avoid using
-  // this option. If your enum needs to support different casing, consider using
-  // allow_alias instead.
-  bool case_insensitive_enum_parsing;
-
-  JsonParseOptions()
-      : ignore_unknown_fields(false), case_insensitive_enum_parsing(false) {}
-};
-
-struct JsonPrintOptions {
-  // Whether to add spaces, line breaks and indentation to make the JSON output
-  // easy to read.
-  bool add_whitespace;
-  // Whether to always print primitive fields. By default proto3 primitive
-  // fields with default values will be omitted in JSON output. For example, an
-  // int32 field set to 0 will be omitted. Set this flag to true will override
-  // the default behavior and print primitive fields regardless of their values.
-  bool always_print_primitive_fields;
-  // Whether to always print enums as ints. By default they are rendered as
-  // strings.
-  bool always_print_enums_as_ints;
-  // Whether to preserve proto field names
-  bool preserve_proto_field_names;
-
-  JsonPrintOptions()
-      : add_whitespace(false),
-        always_print_primitive_fields(false),
-        always_print_enums_as_ints(false),
-        preserve_proto_field_names(false) {}
-};
-
-// DEPRECATED. Use JsonPrintOptions instead.
-typedef JsonPrintOptions JsonOptions;
-
-// Converts from protobuf message to JSON and appends it to |output|. This is a
-// simple wrapper of BinaryToJsonString(). It will use the DescriptorPool of the
-// passed-in message to resolve Any types.
-PROTOBUF_EXPORT util::Status MessageToJsonString(const Message& message,
-                                                 std::string* output,
-                                                 const JsonOptions& options);
-
-inline util::Status MessageToJsonString(const Message& message,
-                                        std::string* output) {
-  return MessageToJsonString(message, output, JsonOptions());
-}
-
-// Converts from JSON to protobuf message. This is a simple wrapper of
-// JsonStringToBinary(). It will use the DescriptorPool of the passed-in
-// message to resolve Any types.
-PROTOBUF_EXPORT util::Status JsonStringToMessage(
-    StringPiece input, Message* message, const JsonParseOptions& options);
-
-inline util::Status JsonStringToMessage(StringPiece input,
-                                        Message* message) {
-  return JsonStringToMessage(input, message, JsonParseOptions());
-}
-
-// Converts protobuf binary data to JSON.
-// The conversion will fail if:
-//   1. TypeResolver fails to resolve a type.
-//   2. input is not valid protobuf wire format, or conflicts with the type
-//      information returned by TypeResolver.
-// Note that unknown fields will be discarded silently.
-PROTOBUF_EXPORT util::Status BinaryToJsonStream(
-    TypeResolver* resolver, const std::string& type_url,
-    io::ZeroCopyInputStream* binary_input,
-    io::ZeroCopyOutputStream* json_output, const JsonPrintOptions& options);
-
-inline util::Status BinaryToJsonStream(TypeResolver* resolver,
-                                       const std::string& type_url,
-                                       io::ZeroCopyInputStream* binary_input,
-                                       io::ZeroCopyOutputStream* json_output) {
-  return BinaryToJsonStream(resolver, type_url, binary_input, json_output,
-                            JsonPrintOptions());
-}
-
-PROTOBUF_EXPORT util::Status BinaryToJsonString(
-    TypeResolver* resolver, const std::string& type_url,
-    const std::string& binary_input, std::string* json_output,
-    const JsonPrintOptions& options);
-
-inline util::Status BinaryToJsonString(TypeResolver* resolver,
-                                       const std::string& type_url,
-                                       const std::string& binary_input,
-                                       std::string* json_output) {
-  return BinaryToJsonString(resolver, type_url, binary_input, json_output,
-                            JsonPrintOptions());
-}
-
-// Converts JSON data to protobuf binary format.
-// The conversion will fail if:
-//   1. TypeResolver fails to resolve a type.
-//   2. input is not valid JSON format, or conflicts with the type
-//      information returned by TypeResolver.
-PROTOBUF_EXPORT util::Status JsonToBinaryStream(
-    TypeResolver* resolver, const std::string& type_url,
-    io::ZeroCopyInputStream* json_input,
-    io::ZeroCopyOutputStream* binary_output, const JsonParseOptions& options);
-
-inline util::Status JsonToBinaryStream(
-    TypeResolver* resolver, const std::string& type_url,
-    io::ZeroCopyInputStream* json_input,
-    io::ZeroCopyOutputStream* binary_output) {
-  return JsonToBinaryStream(resolver, type_url, json_input, binary_output,
-                            JsonParseOptions());
-}
-
-PROTOBUF_EXPORT util::Status JsonToBinaryString(
-    TypeResolver* resolver, const std::string& type_url,
-    StringPiece json_input, std::string* binary_output,
-    const JsonParseOptions& options);
-
-inline util::Status JsonToBinaryString(TypeResolver* resolver,
-                                       const std::string& type_url,
-                                       StringPiece json_input,
-                                       std::string* binary_output) {
-  return JsonToBinaryString(resolver, type_url, json_input, binary_output,
-                            JsonParseOptions());
-}
-
-namespace internal {
-// Internal helper class. Put in the header so we can write unit-tests for it.
-class PROTOBUF_EXPORT ZeroCopyStreamByteSink : public strings::ByteSink {
- public:
-  explicit ZeroCopyStreamByteSink(io::ZeroCopyOutputStream* stream)
-      : stream_(stream), buffer_(nullptr), buffer_size_(0) {}
-  ~ZeroCopyStreamByteSink() override;
-
-  void Append(const char* bytes, size_t len) override;
-
- private:
-  io::ZeroCopyOutputStream* stream_;
-  void* buffer_;
-  int buffer_size_;
-
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(ZeroCopyStreamByteSink);
-};
-}  // namespace internal
-
-}  // namespace util
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
-
-#endif  // GOOGLE_PROTOBUF_UTIL_JSON_UTIL_H__
diff --git a/libs/protobuf/src/google/protobuf/util/json_util_test.cc b/libs/protobuf/src/google/protobuf/util/json_util_test.cc
deleted file mode 100644
index 7216199..0000000
--- a/libs/protobuf/src/google/protobuf/util/json_util_test.cc
+++ /dev/null
@@ -1,672 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <google/protobuf/util/json_util.h>
-
-#include <cstdint>
-#include <list>
-#include <string>
-
-#include <google/protobuf/util/internal/testdata/maps.pb.h>
-#include <google/protobuf/util/json_format.pb.h>
-#include <google/protobuf/util/json_format_proto3.pb.h>
-#include <gtest/gtest.h>
-#include <google/protobuf/descriptor_database.h>
-#include <google/protobuf/dynamic_message.h>
-#include <google/protobuf/io/zero_copy_stream.h>
-#include <google/protobuf/io/zero_copy_stream_impl.h>
-#include <google/protobuf/util/type_resolver.h>
-#include <google/protobuf/util/type_resolver_util.h>
-
-namespace google {
-namespace protobuf {
-namespace util {
-namespace {
-
-using proto3::BAR;
-using proto3::FOO;
-using proto3::TestAny;
-using proto3::TestEnumValue;
-using proto3::TestMap;
-using proto3::TestMessage;
-using proto3::TestOneof;
-using proto_util_converter::testing::MapIn;
-
-// As functions defined in json_util.h are just thin wrappers around the
-// JSON conversion code in //net/proto2/util/converter, in this test we
-// only cover some very basic cases to make sure the wrappers have forwarded
-// parameters to the underlying implementation correctly. More detailed
-// tests are contained in the //net/proto2/util/converter directory.
-class JsonUtilTest : public ::testing::Test {
- protected:
-  JsonUtilTest() {}
-
-  std::string ToJson(const Message& message, const JsonPrintOptions& options) {
-    std::string result;
-    GOOGLE_CHECK_OK(MessageToJsonString(message, &result, options));
-    return result;
-  }
-
-  bool FromJson(const std::string& json, Message* message,
-                const JsonParseOptions& options) {
-    return JsonStringToMessage(json, message, options).ok();
-  }
-
-  bool FromJson(const std::string& json, Message* message) {
-    return FromJson(json, message, JsonParseOptions());
-  }
-
-  std::unique_ptr<TypeResolver> resolver_;
-};
-
-TEST_F(JsonUtilTest, TestWhitespaces) {
-  TestMessage m;
-  m.mutable_message_value();
-
-  JsonPrintOptions options;
-  EXPECT_EQ("{\"messageValue\":{}}", ToJson(m, options));
-  options.add_whitespace = true;
-  EXPECT_EQ(
-      "{\n"
-      " \"messageValue\": {}\n"
-      "}\n",
-      ToJson(m, options));
-}
-
-TEST_F(JsonUtilTest, TestDefaultValues) {
-  TestMessage m;
-  JsonPrintOptions options;
-  EXPECT_EQ("{}", ToJson(m, options));
-  options.always_print_primitive_fields = true;
-  EXPECT_EQ(
-      "{\"boolValue\":false,"
-      "\"int32Value\":0,"
-      "\"int64Value\":\"0\","
-      "\"uint32Value\":0,"
-      "\"uint64Value\":\"0\","
-      "\"floatValue\":0,"
-      "\"doubleValue\":0,"
-      "\"stringValue\":\"\","
-      "\"bytesValue\":\"\","
-      "\"enumValue\":\"FOO\","
-      "\"repeatedBoolValue\":[],"
-      "\"repeatedInt32Value\":[],"
-      "\"repeatedInt64Value\":[],"
-      "\"repeatedUint32Value\":[],"
-      "\"repeatedUint64Value\":[],"
-      "\"repeatedFloatValue\":[],"
-      "\"repeatedDoubleValue\":[],"
-      "\"repeatedStringValue\":[],"
-      "\"repeatedBytesValue\":[],"
-      "\"repeatedEnumValue\":[],"
-      "\"repeatedMessageValue\":[]"
-      "}",
-      ToJson(m, options));
-
-  options.always_print_primitive_fields = true;
-  m.set_string_value("i am a test string value");
-  m.set_bytes_value("i am a test bytes value");
-  EXPECT_EQ(
-      "{\"boolValue\":false,"
-      "\"int32Value\":0,"
-      "\"int64Value\":\"0\","
-      "\"uint32Value\":0,"
-      "\"uint64Value\":\"0\","
-      "\"floatValue\":0,"
-      "\"doubleValue\":0,"
-      "\"stringValue\":\"i am a test string value\","
-      "\"bytesValue\":\"aSBhbSBhIHRlc3QgYnl0ZXMgdmFsdWU=\","
-      "\"enumValue\":\"FOO\","
-      "\"repeatedBoolValue\":[],"
-      "\"repeatedInt32Value\":[],"
-      "\"repeatedInt64Value\":[],"
-      "\"repeatedUint32Value\":[],"
-      "\"repeatedUint64Value\":[],"
-      "\"repeatedFloatValue\":[],"
-      "\"repeatedDoubleValue\":[],"
-      "\"repeatedStringValue\":[],"
-      "\"repeatedBytesValue\":[],"
-      "\"repeatedEnumValue\":[],"
-      "\"repeatedMessageValue\":[]"
-      "}",
-      ToJson(m, options));
-
-  options.preserve_proto_field_names = true;
-  m.set_string_value("i am a test string value");
-  m.set_bytes_value("i am a test bytes value");
-  EXPECT_EQ(
-      "{\"bool_value\":false,"
-      "\"int32_value\":0,"
-      "\"int64_value\":\"0\","
-      "\"uint32_value\":0,"
-      "\"uint64_value\":\"0\","
-      "\"float_value\":0,"
-      "\"double_value\":0,"
-      "\"string_value\":\"i am a test string value\","
-      "\"bytes_value\":\"aSBhbSBhIHRlc3QgYnl0ZXMgdmFsdWU=\","
-      "\"enum_value\":\"FOO\","
-      "\"repeated_bool_value\":[],"
-      "\"repeated_int32_value\":[],"
-      "\"repeated_int64_value\":[],"
-      "\"repeated_uint32_value\":[],"
-      "\"repeated_uint64_value\":[],"
-      "\"repeated_float_value\":[],"
-      "\"repeated_double_value\":[],"
-      "\"repeated_string_value\":[],"
-      "\"repeated_bytes_value\":[],"
-      "\"repeated_enum_value\":[],"
-      "\"repeated_message_value\":[]"
-      "}",
-      ToJson(m, options));
-}
-
-TEST_F(JsonUtilTest, TestPreserveProtoFieldNames) {
-  TestMessage m;
-  m.mutable_message_value();
-
-  JsonPrintOptions options;
-  options.preserve_proto_field_names = true;
-  EXPECT_EQ("{\"message_value\":{}}", ToJson(m, options));
-}
-
-TEST_F(JsonUtilTest, TestAlwaysPrintEnumsAsInts) {
-  TestMessage orig;
-  orig.set_enum_value(proto3::BAR);
-  orig.add_repeated_enum_value(proto3::FOO);
-  orig.add_repeated_enum_value(proto3::BAR);
-
-  JsonPrintOptions print_options;
-  print_options.always_print_enums_as_ints = true;
-
-  std::string expected_json = "{\"enumValue\":1,\"repeatedEnumValue\":[0,1]}";
-  EXPECT_EQ(expected_json, ToJson(orig, print_options));
-
-  TestMessage parsed;
-  JsonParseOptions parse_options;
-  ASSERT_TRUE(FromJson(expected_json, &parsed, parse_options));
-
-  EXPECT_EQ(proto3::BAR, parsed.enum_value());
-  EXPECT_EQ(2, parsed.repeated_enum_value_size());
-  EXPECT_EQ(proto3::FOO, parsed.repeated_enum_value(0));
-  EXPECT_EQ(proto3::BAR, parsed.repeated_enum_value(1));
-}
-
-TEST_F(JsonUtilTest, TestPrintEnumsAsIntsWithDefaultValue) {
-  TestEnumValue orig;
-  // orig.set_enum_value1(proto3::FOO)
-  orig.set_enum_value2(proto3::FOO);
-  orig.set_enum_value3(proto3::BAR);
-
-  JsonPrintOptions print_options;
-  print_options.always_print_enums_as_ints = true;
-  print_options.always_print_primitive_fields = true;
-
-  std::string expected_json =
-      "{\"enumValue1\":0,\"enumValue2\":0,\"enumValue3\":1}";
-  EXPECT_EQ(expected_json, ToJson(orig, print_options));
-
-  TestEnumValue parsed;
-  JsonParseOptions parse_options;
-  ASSERT_TRUE(FromJson(expected_json, &parsed, parse_options));
-
-  EXPECT_EQ(proto3::FOO, parsed.enum_value1());
-  EXPECT_EQ(proto3::FOO, parsed.enum_value2());
-  EXPECT_EQ(proto3::BAR, parsed.enum_value3());
-}
-
-TEST_F(JsonUtilTest, TestPrintProto2EnumAsIntWithDefaultValue) {
-  protobuf_unittest::TestDefaultEnumValue orig;
-
-  JsonPrintOptions print_options;
-  // use enum as int
-  print_options.always_print_enums_as_ints = true;
-  print_options.always_print_primitive_fields = true;
-
-  // result should be int rather than string
-  std::string expected_json = "{\"enumValue\":2}";
-  EXPECT_EQ(expected_json, ToJson(orig, print_options));
-
-  protobuf_unittest::TestDefaultEnumValue parsed;
-  JsonParseOptions parse_options;
-  ASSERT_TRUE(FromJson(expected_json, &parsed, parse_options));
-
-  EXPECT_EQ(protobuf_unittest::DEFAULT, parsed.enum_value());
-}
-
-TEST_F(JsonUtilTest, ParseMessage) {
-  // Some random message but good enough to verify that the parsing wrapper
-  // functions are working properly.
-  std::string input =
-      "{\n"
-      "  \"int32Value\": 1234567891,\n"
-      "  \"int64Value\": 5302428716536692736,\n"
-      "  \"floatValue\": 3.4028235e+38,\n"
-      "  \"repeatedInt32Value\": [1, 2],\n"
-      "  \"messageValue\": {\n"
-      "    \"value\": 2048\n"
-      "  },\n"
-      "  \"repeatedMessageValue\": [\n"
-      "    {\"value\": 40}, {\"value\": 96}\n"
-      "  ]\n"
-      "}\n";
-  JsonParseOptions options;
-  TestMessage m;
-  ASSERT_TRUE(FromJson(input, &m, options));
-  EXPECT_EQ(1234567891, m.int32_value());
-  EXPECT_EQ(5302428716536692736, m.int64_value());
-  EXPECT_EQ(3.402823466e+38f, m.float_value());
-  ASSERT_EQ(2, m.repeated_int32_value_size());
-  EXPECT_EQ(1, m.repeated_int32_value(0));
-  EXPECT_EQ(2, m.repeated_int32_value(1));
-  EXPECT_EQ(2048, m.message_value().value());
-  ASSERT_EQ(2, m.repeated_message_value_size());
-  EXPECT_EQ(40, m.repeated_message_value(0).value());
-  EXPECT_EQ(96, m.repeated_message_value(1).value());
-}
-
-TEST_F(JsonUtilTest, ParseMap) {
-  TestMap message;
-  (*message.mutable_string_map())["hello"] = 1234;
-  JsonPrintOptions print_options;
-  JsonParseOptions parse_options;
-  EXPECT_EQ("{\"stringMap\":{\"hello\":1234}}", ToJson(message, print_options));
-  TestMap other;
-  ASSERT_TRUE(FromJson(ToJson(message, print_options), &other, parse_options));
-  EXPECT_EQ(message.DebugString(), other.DebugString());
-}
-
-TEST_F(JsonUtilTest, ParsePrimitiveMapIn) {
-  MapIn message;
-  JsonPrintOptions print_options;
-  print_options.always_print_primitive_fields = true;
-  JsonParseOptions parse_options;
-  EXPECT_EQ("{\"other\":\"\",\"things\":[],\"mapInput\":{},\"mapAny\":{}}",
-            ToJson(message, print_options));
-  MapIn other;
-  ASSERT_TRUE(FromJson(ToJson(message, print_options), &other, parse_options));
-  EXPECT_EQ(message.DebugString(), other.DebugString());
-}
-
-TEST_F(JsonUtilTest, PrintPrimitiveOneof) {
-  TestOneof message;
-  JsonPrintOptions options;
-  options.always_print_primitive_fields = true;
-  message.mutable_oneof_message_value();
-  EXPECT_EQ("{\"oneofMessageValue\":{\"value\":0}}", ToJson(message, options));
-
-  message.set_oneof_int32_value(1);
-  EXPECT_EQ("{\"oneofInt32Value\":1}", ToJson(message, options));
-}
-
-TEST_F(JsonUtilTest, TestParseIgnoreUnknownFields) {
-  TestMessage m;
-  JsonParseOptions options;
-  options.ignore_unknown_fields = true;
-  EXPECT_TRUE(FromJson("{\"unknownName\":0}", &m, options));
-}
-
-TEST_F(JsonUtilTest, TestParseErrors) {
-  TestMessage m;
-  JsonParseOptions options;
-  // Parsing should fail if the field name can not be recognized.
-  EXPECT_FALSE(FromJson("{\"unknownName\":0}", &m, options));
-  // Parsing should fail if the value is invalid.
-  EXPECT_FALSE(FromJson("{\"int32Value\":2147483648}", &m, options));
-}
-
-TEST_F(JsonUtilTest, TestDynamicMessage) {
-  // Some random message but good enough to test the wrapper functions.
-  std::string input =
-      "{\n"
-      "  \"int32Value\": 1024,\n"
-      "  \"repeatedInt32Value\": [1, 2],\n"
-      "  \"messageValue\": {\n"
-      "    \"value\": 2048\n"
-      "  },\n"
-      "  \"repeatedMessageValue\": [\n"
-      "    {\"value\": 40}, {\"value\": 96}\n"
-      "  ]\n"
-      "}\n";
-
-  // Create a new DescriptorPool with the same protos as the generated one.
-  DescriptorPoolDatabase database(*DescriptorPool::generated_pool());
-  DescriptorPool pool(&database);
-  // A dynamic version of the test proto.
-  DynamicMessageFactory factory;
-  std::unique_ptr<Message> message(
-      factory.GetPrototype(pool.FindMessageTypeByName("proto3.TestMessage"))
-          ->New());
-  EXPECT_TRUE(FromJson(input, message.get()));
-
-  // Convert to generated message for easy inspection.
-  TestMessage generated;
-  EXPECT_TRUE(generated.ParseFromString(message->SerializeAsString()));
-  EXPECT_EQ(1024, generated.int32_value());
-  ASSERT_EQ(2, generated.repeated_int32_value_size());
-  EXPECT_EQ(1, generated.repeated_int32_value(0));
-  EXPECT_EQ(2, generated.repeated_int32_value(1));
-  EXPECT_EQ(2048, generated.message_value().value());
-  ASSERT_EQ(2, generated.repeated_message_value_size());
-  EXPECT_EQ(40, generated.repeated_message_value(0).value());
-  EXPECT_EQ(96, generated.repeated_message_value(1).value());
-
-  JsonOptions options;
-  EXPECT_EQ(ToJson(generated, options), ToJson(*message, options));
-}
-
-TEST_F(JsonUtilTest, TestParsingUnknownAnyFields) {
-  std::string input =
-      "{\n"
-      "  \"value\": {\n"
-      "    \"@type\": \"type.googleapis.com/proto3.TestMessage\",\n"
-      "    \"unknown_field\": \"UNKNOWN_VALUE\",\n"
-      "    \"string_value\": \"expected_value\"\n"
-      "  }\n"
-      "}";
-
-  TestAny m;
-  JsonParseOptions options;
-  EXPECT_FALSE(FromJson(input, &m, options));
-
-  options.ignore_unknown_fields = true;
-  EXPECT_TRUE(FromJson(input, &m, options));
-
-  TestMessage t;
-  EXPECT_TRUE(m.value().UnpackTo(&t));
-  EXPECT_EQ("expected_value", t.string_value());
-}
-
-TEST_F(JsonUtilTest, TestParsingUnknownEnumsProto2) {
-  std::string input =
-      "{\n"
-      "  \"a\": \"UNKNOWN_VALUE\"\n"
-      "}";
-  protobuf_unittest::TestNumbers m;
-  JsonParseOptions options;
-  EXPECT_FALSE(FromJson(input, &m, options));
-
-  options.ignore_unknown_fields = true;
-  EXPECT_TRUE(FromJson(input, &m, options));
-  EXPECT_FALSE(m.has_a());
-}
-
-TEST_F(JsonUtilTest, TestParsingUnknownEnumsProto3) {
-  TestMessage m;
-  {
-    JsonParseOptions options;
-    ASSERT_FALSE(options.ignore_unknown_fields);
-    std::string input =
-        "{\n"
-        "  \"enum_value\":\"UNKNOWN_VALUE\"\n"
-        "}";
-    m.set_enum_value(proto3::BAR);
-    EXPECT_FALSE(FromJson(input, &m, options));
-    ASSERT_EQ(proto3::BAR, m.enum_value());  // Keep previous value
-
-    options.ignore_unknown_fields = true;
-    EXPECT_TRUE(FromJson(input, &m, options));
-    EXPECT_EQ(0, m.enum_value());  // Unknown enum value must be decoded as 0
-  }
-  // Integer values are read as usual
-  {
-    JsonParseOptions options;
-    std::string input =
-        "{\n"
-        "  \"enum_value\":12345\n"
-        "}";
-    m.set_enum_value(proto3::BAR);
-    EXPECT_TRUE(FromJson(input, &m, options));
-    ASSERT_EQ(12345, m.enum_value());
-
-    options.ignore_unknown_fields = true;
-    EXPECT_TRUE(FromJson(input, &m, options));
-    EXPECT_EQ(12345, m.enum_value());
-  }
-
-  // Trying to pass an object as an enum field value is always treated as an
-  // error
-  {
-    JsonParseOptions options;
-    std::string input =
-        "{\n"
-        "  \"enum_value\":{}\n"
-        "}";
-    options.ignore_unknown_fields = true;
-    EXPECT_FALSE(FromJson(input, &m, options));
-    options.ignore_unknown_fields = false;
-    EXPECT_FALSE(FromJson(input, &m, options));
-  }
-  // Trying to pass an array as an enum field value is always treated as an
-  // error
-  {
-    JsonParseOptions options;
-    std::string input =
-        "{\n"
-        "  \"enum_value\":[]\n"
-        "}";
-    EXPECT_FALSE(FromJson(input, &m, options));
-    options.ignore_unknown_fields = true;
-    EXPECT_FALSE(FromJson(input, &m, options));
-  }
-}
-
-TEST_F(JsonUtilTest, TestParsingEnumIgnoreCase) {
-  TestMessage m;
-  {
-    JsonParseOptions options;
-    std::string input =
-        "{\n"
-        "  \"enum_value\":\"bar\"\n"
-        "}";
-    m.set_enum_value(proto3::FOO);
-    EXPECT_FALSE(FromJson(input, &m, options));
-    // Default behavior is case-sensitive, so keep previous value.
-    ASSERT_EQ(proto3::FOO, m.enum_value());
-  }
-  {
-    JsonParseOptions options;
-    options.case_insensitive_enum_parsing = false;
-    std::string input =
-        "{\n"
-        "  \"enum_value\":\"bar\"\n"
-        "}";
-    m.set_enum_value(proto3::FOO);
-    EXPECT_FALSE(FromJson(input, &m, options));
-    ASSERT_EQ(proto3::FOO, m.enum_value());  // Keep previous value
-  }
-  {
-    JsonParseOptions options;
-    options.case_insensitive_enum_parsing = true;
-    std::string input =
-        "{\n"
-        "  \"enum_value\":\"bar\"\n"
-        "}";
-    m.set_enum_value(proto3::FOO);
-    EXPECT_TRUE(FromJson(input, &m, options));
-    ASSERT_EQ(proto3::BAR, m.enum_value());
-  }
-}
-
-typedef std::pair<char*, int> Segment;
-// A ZeroCopyOutputStream that writes to multiple buffers.
-class SegmentedZeroCopyOutputStream : public io::ZeroCopyOutputStream {
- public:
-  explicit SegmentedZeroCopyOutputStream(std::list<Segment> segments)
-      : segments_(segments),
-        last_segment_(static_cast<char*>(NULL), 0),
-        byte_count_(0) {}
-
-  bool Next(void** buffer, int* length) override {
-    if (segments_.empty()) {
-      return false;
-    }
-    last_segment_ = segments_.front();
-    segments_.pop_front();
-    *buffer = last_segment_.first;
-    *length = last_segment_.second;
-    byte_count_ += *length;
-    return true;
-  }
-
-  void BackUp(int length) override {
-    GOOGLE_CHECK(length <= last_segment_.second);
-    segments_.push_front(
-        Segment(last_segment_.first + last_segment_.second - length, length));
-    last_segment_ = Segment(last_segment_.first, last_segment_.second - length);
-    byte_count_ -= length;
-  }
-
-  int64_t ByteCount() const override { return byte_count_; }
-
- private:
-  std::list<Segment> segments_;
-  Segment last_segment_;
-  int64_t byte_count_;
-};
-
-// This test splits the output buffer and also the input data into multiple
-// segments and checks that the implementation of ZeroCopyStreamByteSink
-// handles all possible cases correctly.
-TEST(ZeroCopyStreamByteSinkTest, TestAllInputOutputPatterns) {
-  static const int kOutputBufferLength = 10;
-  // An exhaustive test takes too long, skip some combinations to make the test
-  // run faster.
-  static const int kSkippedPatternCount = 7;
-
-  char buffer[kOutputBufferLength];
-  for (int split_pattern = 0; split_pattern < (1 << (kOutputBufferLength - 1));
-       split_pattern += kSkippedPatternCount) {
-    // Split the buffer into small segments according to the split_pattern.
-    std::list<Segment> segments;
-    int segment_start = 0;
-    for (int i = 0; i < kOutputBufferLength - 1; ++i) {
-      if (split_pattern & (1 << i)) {
-        segments.push_back(
-            Segment(buffer + segment_start, i - segment_start + 1));
-        segment_start = i + 1;
-      }
-    }
-    segments.push_back(
-        Segment(buffer + segment_start, kOutputBufferLength - segment_start));
-
-    // Write exactly 10 bytes through the ByteSink.
-    std::string input_data = "0123456789";
-    for (int input_pattern = 0; input_pattern < (1 << (input_data.size() - 1));
-         input_pattern += kSkippedPatternCount) {
-      memset(buffer, 0, sizeof(buffer));
-      {
-        SegmentedZeroCopyOutputStream output_stream(segments);
-        internal::ZeroCopyStreamByteSink byte_sink(&output_stream);
-        int start = 0;
-        for (int j = 0; j < input_data.length() - 1; ++j) {
-          if (input_pattern & (1 << j)) {
-            byte_sink.Append(&input_data[start], j - start + 1);
-            start = j + 1;
-          }
-        }
-        byte_sink.Append(&input_data[start], input_data.length() - start);
-      }
-      EXPECT_EQ(input_data, std::string(buffer, input_data.length()));
-    }
-
-    // Write only 9 bytes through the ByteSink.
-    input_data = "012345678";
-    for (int input_pattern = 0; input_pattern < (1 << (input_data.size() - 1));
-         input_pattern += kSkippedPatternCount) {
-      memset(buffer, 0, sizeof(buffer));
-      {
-        SegmentedZeroCopyOutputStream output_stream(segments);
-        internal::ZeroCopyStreamByteSink byte_sink(&output_stream);
-        int start = 0;
-        for (int j = 0; j < input_data.length() - 1; ++j) {
-          if (input_pattern & (1 << j)) {
-            byte_sink.Append(&input_data[start], j - start + 1);
-            start = j + 1;
-          }
-        }
-        byte_sink.Append(&input_data[start], input_data.length() - start);
-      }
-      EXPECT_EQ(input_data, std::string(buffer, input_data.length()));
-      EXPECT_EQ(0, buffer[input_data.length()]);
-    }
-
-    // Write 11 bytes through the ByteSink. The extra byte will just
-    // be ignored.
-    input_data = "0123456789A";
-    for (int input_pattern = 0; input_pattern < (1 << (input_data.size() - 1));
-         input_pattern += kSkippedPatternCount) {
-      memset(buffer, 0, sizeof(buffer));
-      {
-        SegmentedZeroCopyOutputStream output_stream(segments);
-        internal::ZeroCopyStreamByteSink byte_sink(&output_stream);
-        int start = 0;
-        for (int j = 0; j < input_data.length() - 1; ++j) {
-          if (input_pattern & (1 << j)) {
-            byte_sink.Append(&input_data[start], j - start + 1);
-            start = j + 1;
-          }
-        }
-        byte_sink.Append(&input_data[start], input_data.length() - start);
-      }
-      EXPECT_EQ(input_data.substr(0, kOutputBufferLength),
-                std::string(buffer, kOutputBufferLength));
-    }
-  }
-}
-
-TEST_F(JsonUtilTest, TestWrongJsonInput) {
-  const char json[] = "{\"unknown_field\":\"some_value\"}";
-  io::ArrayInputStream input_stream(json, strlen(json));
-  char proto_buffer[10000];
-  io::ArrayOutputStream output_stream(proto_buffer, sizeof(proto_buffer));
-  std::string message_type = "type.googleapis.com/proto3.TestMessage";
-  TypeResolver* resolver = NewTypeResolverForDescriptorPool(
-      "type.googleapis.com", DescriptorPool::generated_pool());
-
-  auto result_status = util::JsonToBinaryStream(resolver, message_type,
-                                                &input_stream, &output_stream);
-
-  delete resolver;
-
-  EXPECT_FALSE(result_status.ok());
-  EXPECT_TRUE(util::IsInvalidArgument(result_status));
-}
-
-TEST_F(JsonUtilTest, HtmlEscape) {
-  TestMessage m;
-  m.set_string_value("</script>");
-  JsonPrintOptions options;
-  EXPECT_EQ("{\"stringValue\":\"\\u003c/script\\u003e\"}", ToJson(m, options));
-}
-
-}  // namespace
-}  // namespace util
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/util/message_differencer.cc b/libs/protobuf/src/google/protobuf/util/message_differencer.cc
deleted file mode 100644
index 30560ed..0000000
--- a/libs/protobuf/src/google/protobuf/util/message_differencer.cc
+++ /dev/null
@@ -1,2246 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: jschorr@google.com (Joseph Schorr)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-
-#include <google/protobuf/util/message_differencer.h>
-
-#include <algorithm>
-#include <cstddef>
-#include <cstdint>
-#include <functional>
-#include <limits>
-#include <memory>
-#include <utility>
-
-#include <google/protobuf/stubs/logging.h>
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/io/printer.h>
-#include <google/protobuf/io/zero_copy_stream.h>
-#include <google/protobuf/io/zero_copy_stream_impl.h>
-#include <google/protobuf/descriptor.pb.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/dynamic_message.h>
-#include <google/protobuf/generated_enum_reflection.h>
-#include <google/protobuf/map_field.h>
-#include <google/protobuf/message.h>
-#include <google/protobuf/text_format.h>
-#include <google/protobuf/stubs/strutil.h>
-#include <google/protobuf/stubs/stringprintf.h>
-#include <google/protobuf/util/field_comparator.h>
-
-// Always include as last one, otherwise it can break compilation
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-
-namespace util {
-
-namespace {
-
-std::string PrintShortTextFormat(const google::protobuf::Message& message) {
-  std::string debug_string;
-
-  google::protobuf::TextFormat::Printer printer;
-  printer.SetSingleLineMode(true);
-  printer.SetExpandAny(true);
-
-  printer.PrintToString(message, &debug_string);
-  // Single line mode currently might have an extra space at the end.
-  if (!debug_string.empty() && debug_string[debug_string.size() - 1] == ' ') {
-    debug_string.resize(debug_string.size() - 1);
-  }
-
-  return debug_string;
-}
-
-}  // namespace
-
-// A reporter to report the total number of diffs.
-// TODO(ykzhu): we can improve this to take into account the value differencers.
-class NumDiffsReporter : public google::protobuf::util::MessageDifferencer::Reporter {
- public:
-  NumDiffsReporter() : num_diffs_(0) {}
-
-  // Returns the total number of diffs.
-  int32_t GetNumDiffs() const { return num_diffs_; }
-  void Reset() { num_diffs_ = 0; }
-
-  // Report that a field has been added into Message2.
-  void ReportAdded(
-      const google::protobuf::Message& /* message1 */,
-      const google::protobuf::Message& /* message2 */,
-      const std::vector<google::protobuf::util::MessageDifferencer::SpecificField>&
-      /*field_path*/) override {
-    ++num_diffs_;
-  }
-
-  // Report that a field has been deleted from Message1.
-  void ReportDeleted(
-      const google::protobuf::Message& /* message1 */,
-      const google::protobuf::Message& /* message2 */,
-      const std::vector<google::protobuf::util::MessageDifferencer::SpecificField>&
-      /*field_path*/) override {
-    ++num_diffs_;
-  }
-
-  // Report that the value of a field has been modified.
-  void ReportModified(
-      const google::protobuf::Message& /* message1 */,
-      const google::protobuf::Message& /* message2 */,
-      const std::vector<google::protobuf::util::MessageDifferencer::SpecificField>&
-      /*field_path*/) override {
-    ++num_diffs_;
-  }
-
- private:
-  int32_t num_diffs_;
-};
-
-// When comparing a repeated field as map, MultipleFieldMapKeyComparator can
-// be used to specify multiple fields as key for key comparison.
-// Two elements of a repeated field will be regarded as having the same key
-// iff they have the same value for every specified key field.
-// Note that you can also specify only one field as key.
-class MessageDifferencer::MultipleFieldsMapKeyComparator
-    : public MessageDifferencer::MapKeyComparator {
- public:
-  MultipleFieldsMapKeyComparator(
-      MessageDifferencer* message_differencer,
-      const std::vector<std::vector<const FieldDescriptor*> >& key_field_paths)
-      : message_differencer_(message_differencer),
-        key_field_paths_(key_field_paths) {
-    GOOGLE_CHECK(!key_field_paths_.empty());
-    for (const auto& path : key_field_paths_) {
-      GOOGLE_CHECK(!path.empty());
-    }
-  }
-  MultipleFieldsMapKeyComparator(MessageDifferencer* message_differencer,
-                                 const FieldDescriptor* key)
-      : message_differencer_(message_differencer) {
-    std::vector<const FieldDescriptor*> key_field_path;
-    key_field_path.push_back(key);
-    key_field_paths_.push_back(key_field_path);
-  }
-  bool IsMatch(const Message& message1, const Message& message2,
-               const std::vector<SpecificField>& parent_fields) const override {
-    for (const auto& path : key_field_paths_) {
-      if (!IsMatchInternal(message1, message2, parent_fields, path, 0)) {
-        return false;
-      }
-    }
-    return true;
-  }
-
- private:
-  bool IsMatchInternal(
-      const Message& message1, const Message& message2,
-      const std::vector<SpecificField>& parent_fields,
-      const std::vector<const FieldDescriptor*>& key_field_path,
-      int path_index) const {
-    const FieldDescriptor* field = key_field_path[path_index];
-    std::vector<SpecificField> current_parent_fields(parent_fields);
-    if (path_index == static_cast<int64_t>(key_field_path.size() - 1)) {
-      if (field->is_map()) {
-        return message_differencer_->CompareMapField(message1, message2, field,
-                                                     &current_parent_fields);
-      } else if (field->is_repeated()) {
-        return message_differencer_->CompareRepeatedField(
-            message1, message2, field, &current_parent_fields);
-      } else {
-        return message_differencer_->CompareFieldValueUsingParentFields(
-            message1, message2, field, -1, -1, &current_parent_fields);
-      }
-    } else {
-      const Reflection* reflection1 = message1.GetReflection();
-      const Reflection* reflection2 = message2.GetReflection();
-      bool has_field1 = reflection1->HasField(message1, field);
-      bool has_field2 = reflection2->HasField(message2, field);
-      if (!has_field1 && !has_field2) {
-        return true;
-      }
-      if (has_field1 != has_field2) {
-        return false;
-      }
-      SpecificField specific_field;
-      specific_field.field = field;
-      current_parent_fields.push_back(specific_field);
-      return IsMatchInternal(reflection1->GetMessage(message1, field),
-                             reflection2->GetMessage(message2, field),
-                             current_parent_fields, key_field_path,
-                             path_index + 1);
-    }
-  }
-  MessageDifferencer* message_differencer_;
-  std::vector<std::vector<const FieldDescriptor*> > key_field_paths_;
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(MultipleFieldsMapKeyComparator);
-};
-
-// Preserve the order when treating repeated field as SMART_LIST. The current
-// implementation is to find the longest matching sequence from the first
-// element. The optimal solution requires to use //util/diff/lcs.h, which is
-// not open sourced yet. Overwrite this method if you want to have that.
-// TODO(ykzhu): change to use LCS once it is open sourced.
-void MatchIndicesPostProcessorForSmartList(std::vector<int>* match_list1,
-                                           std::vector<int>* match_list2) {
-  int last_matched_index = -1;
-  for (size_t i = 0; i < match_list1->size(); ++i) {
-    if (match_list1->at(i) < 0) {
-      continue;
-    }
-    if (last_matched_index < 0 || match_list1->at(i) > last_matched_index) {
-      last_matched_index = match_list1->at(i);
-    } else {
-      match_list2->at(match_list1->at(i)) = -1;
-      match_list1->at(i) = -1;
-    }
-  }
-}
-
-void AddSpecificIndex(
-    google::protobuf::util::MessageDifferencer::SpecificField* specific_field,
-    const Message& message, const FieldDescriptor* field, int index) {
-  if (field->is_map()) {
-    const Reflection* reflection = message.GetReflection();
-    specific_field->map_entry1 =
-        &reflection->GetRepeatedMessage(message, field, index);
-  }
-  specific_field->index = index;
-}
-
-void AddSpecificNewIndex(
-    google::protobuf::util::MessageDifferencer::SpecificField* specific_field,
-    const Message& message, const FieldDescriptor* field, int index) {
-  if (field->is_map()) {
-    const Reflection* reflection = message.GetReflection();
-    specific_field->map_entry2 =
-        &reflection->GetRepeatedMessage(message, field, index);
-  }
-  specific_field->new_index = index;
-}
-
-MessageDifferencer::MapEntryKeyComparator::MapEntryKeyComparator(
-    MessageDifferencer* message_differencer)
-    : message_differencer_(message_differencer) {}
-
-bool MessageDifferencer::MapEntryKeyComparator::IsMatch(
-    const Message& message1, const Message& message2,
-    const std::vector<SpecificField>& parent_fields) const {
-  // Map entry has its key in the field with tag 1.  See the comment for
-  // map_entry in MessageOptions.
-  const FieldDescriptor* key = message1.GetDescriptor()->FindFieldByNumber(1);
-  // If key is not present in message1 and we're doing partial comparison or if
-  // map key is explicitly ignored treat the field as set instead,
-  const bool treat_as_set =
-      (message_differencer_->scope() == PARTIAL &&
-       !message1.GetReflection()->HasField(message1, key)) ||
-      message_differencer_->IsIgnored(message1, message2, key, parent_fields);
-
-  std::vector<SpecificField> current_parent_fields(parent_fields);
-  if (treat_as_set) {
-    return message_differencer_->Compare(message1, message2,
-                                         &current_parent_fields);
-  }
-  return message_differencer_->CompareFieldValueUsingParentFields(
-      message1, message2, key, -1, -1, &current_parent_fields);
-}
-
-bool MessageDifferencer::Equals(const Message& message1,
-                                const Message& message2) {
-  MessageDifferencer differencer;
-
-  return differencer.Compare(message1, message2);
-}
-
-bool MessageDifferencer::Equivalent(const Message& message1,
-                                    const Message& message2) {
-  MessageDifferencer differencer;
-  differencer.set_message_field_comparison(MessageDifferencer::EQUIVALENT);
-
-  return differencer.Compare(message1, message2);
-}
-
-bool MessageDifferencer::ApproximatelyEquals(const Message& message1,
-                                             const Message& message2) {
-  MessageDifferencer differencer;
-  differencer.set_float_comparison(MessageDifferencer::APPROXIMATE);
-
-  return differencer.Compare(message1, message2);
-}
-
-bool MessageDifferencer::ApproximatelyEquivalent(const Message& message1,
-                                                 const Message& message2) {
-  MessageDifferencer differencer;
-  differencer.set_message_field_comparison(MessageDifferencer::EQUIVALENT);
-  differencer.set_float_comparison(MessageDifferencer::APPROXIMATE);
-
-  return differencer.Compare(message1, message2);
-}
-
-// ===========================================================================
-
-MessageDifferencer::MessageDifferencer()
-    : reporter_(NULL),
-      message_field_comparison_(EQUAL),
-      scope_(FULL),
-      repeated_field_comparison_(AS_LIST),
-      map_entry_key_comparator_(this),
-      report_matches_(false),
-      report_moves_(true),
-      report_ignores_(true),
-      output_string_(nullptr),
-      match_indices_for_smart_list_callback_(
-          MatchIndicesPostProcessorForSmartList) {}
-
-MessageDifferencer::~MessageDifferencer() {
-  for (MapKeyComparator* comparator : owned_key_comparators_) {
-    delete comparator;
-  }
-  for (IgnoreCriteria* criteria : ignore_criteria_) {
-    delete criteria;
-  }
-}
-
-void MessageDifferencer::set_field_comparator(FieldComparator* comparator) {
-  GOOGLE_CHECK(comparator) << "Field comparator can't be NULL.";
-  field_comparator_kind_ = kFCBase;
-  field_comparator_.base = comparator;
-}
-
-#ifdef PROTOBUF_FUTURE_BREAKING_CHANGES
-void MessageDifferencer::set_field_comparator(
-    DefaultFieldComparator* comparator) {
-  GOOGLE_CHECK(comparator) << "Field comparator can't be NULL.";
-  field_comparator_kind_ = kFCDefault;
-  field_comparator_.default_impl = comparator;
-}
-#endif  // PROTOBUF_FUTURE_BREAKING_CHANGES
-
-void MessageDifferencer::set_message_field_comparison(
-    MessageFieldComparison comparison) {
-  message_field_comparison_ = comparison;
-}
-
-MessageDifferencer::MessageFieldComparison
-MessageDifferencer::message_field_comparison() const {
-  return message_field_comparison_;
-}
-
-void MessageDifferencer::set_scope(Scope scope) { scope_ = scope; }
-
-MessageDifferencer::Scope MessageDifferencer::scope() const { return scope_; }
-
-void MessageDifferencer::set_float_comparison(FloatComparison comparison) {
-  default_field_comparator_.set_float_comparison(
-      comparison == EXACT ? DefaultFieldComparator::EXACT
-                          : DefaultFieldComparator::APPROXIMATE);
-}
-
-void MessageDifferencer::set_repeated_field_comparison(
-    RepeatedFieldComparison comparison) {
-  repeated_field_comparison_ = comparison;
-}
-
-MessageDifferencer::RepeatedFieldComparison
-MessageDifferencer::repeated_field_comparison() const {
-  return repeated_field_comparison_;
-}
-
-void MessageDifferencer::CheckRepeatedFieldComparisons(
-    const FieldDescriptor* field,
-    const RepeatedFieldComparison& new_comparison) {
-  GOOGLE_CHECK(field->is_repeated())
-      << "Field must be repeated: " << field->full_name();
-  const MapKeyComparator* key_comparator = GetMapKeyComparator(field);
-  GOOGLE_CHECK(key_comparator == NULL)
-      << "Cannot treat this repeated field as both MAP and " << new_comparison
-      << " for comparison.  Field name is: " << field->full_name();
-}
-
-void MessageDifferencer::TreatAsSet(const FieldDescriptor* field) {
-  CheckRepeatedFieldComparisons(field, AS_SET);
-  repeated_field_comparisons_[field] = AS_SET;
-}
-
-void MessageDifferencer::TreatAsSmartSet(const FieldDescriptor* field) {
-  CheckRepeatedFieldComparisons(field, AS_SMART_SET);
-  repeated_field_comparisons_[field] = AS_SMART_SET;
-}
-
-void MessageDifferencer::SetMatchIndicesForSmartListCallback(
-    std::function<void(std::vector<int>*, std::vector<int>*)> callback) {
-  match_indices_for_smart_list_callback_ = callback;
-}
-
-void MessageDifferencer::TreatAsList(const FieldDescriptor* field) {
-  CheckRepeatedFieldComparisons(field, AS_LIST);
-  repeated_field_comparisons_[field] = AS_LIST;
-}
-
-void MessageDifferencer::TreatAsSmartList(const FieldDescriptor* field) {
-  CheckRepeatedFieldComparisons(field, AS_SMART_LIST);
-  repeated_field_comparisons_[field] = AS_SMART_LIST;
-}
-
-void MessageDifferencer::TreatAsMap(const FieldDescriptor* field,
-                                    const FieldDescriptor* key) {
-  GOOGLE_CHECK_EQ(FieldDescriptor::CPPTYPE_MESSAGE, field->cpp_type())
-      << "Field has to be message type.  Field name is: " << field->full_name();
-  GOOGLE_CHECK(key->containing_type() == field->message_type())
-      << key->full_name()
-      << " must be a direct subfield within the repeated field "
-      << field->full_name() << ", not " << key->containing_type()->full_name();
-  GOOGLE_CHECK(repeated_field_comparisons_.find(field) ==
-        repeated_field_comparisons_.end())
-      << "Cannot treat the same field as both "
-      << repeated_field_comparisons_[field]
-      << " and MAP. Field name is: " << field->full_name();
-  MapKeyComparator* key_comparator =
-      new MultipleFieldsMapKeyComparator(this, key);
-  owned_key_comparators_.push_back(key_comparator);
-  map_field_key_comparator_[field] = key_comparator;
-}
-
-void MessageDifferencer::TreatAsMapWithMultipleFieldsAsKey(
-    const FieldDescriptor* field,
-    const std::vector<const FieldDescriptor*>& key_fields) {
-  std::vector<std::vector<const FieldDescriptor*> > key_field_paths;
-  for (const FieldDescriptor* key_filed : key_fields) {
-    std::vector<const FieldDescriptor*> key_field_path;
-    key_field_path.push_back(key_filed);
-    key_field_paths.push_back(key_field_path);
-  }
-  TreatAsMapWithMultipleFieldPathsAsKey(field, key_field_paths);
-}
-
-void MessageDifferencer::TreatAsMapWithMultipleFieldPathsAsKey(
-    const FieldDescriptor* field,
-    const std::vector<std::vector<const FieldDescriptor*> >& key_field_paths) {
-  GOOGLE_CHECK(field->is_repeated())
-      << "Field must be repeated: " << field->full_name();
-  GOOGLE_CHECK_EQ(FieldDescriptor::CPPTYPE_MESSAGE, field->cpp_type())
-      << "Field has to be message type.  Field name is: " << field->full_name();
-  for (const auto& key_field_path : key_field_paths) {
-    for (size_t j = 0; j < key_field_path.size(); ++j) {
-      const FieldDescriptor* parent_field =
-          j == 0 ? field : key_field_path[j - 1];
-      const FieldDescriptor* child_field = key_field_path[j];
-      GOOGLE_CHECK(child_field->containing_type() == parent_field->message_type())
-          << child_field->full_name()
-          << " must be a direct subfield within the field: "
-          << parent_field->full_name();
-      if (j != 0) {
-        GOOGLE_CHECK_EQ(FieldDescriptor::CPPTYPE_MESSAGE, parent_field->cpp_type())
-            << parent_field->full_name() << " has to be of type message.";
-        GOOGLE_CHECK(!parent_field->is_repeated())
-            << parent_field->full_name() << " cannot be a repeated field.";
-      }
-    }
-  }
-  GOOGLE_CHECK(repeated_field_comparisons_.find(field) ==
-        repeated_field_comparisons_.end())
-      << "Cannot treat the same field as both "
-      << repeated_field_comparisons_[field]
-      << " and MAP. Field name is: " << field->full_name();
-  MapKeyComparator* key_comparator =
-      new MultipleFieldsMapKeyComparator(this, key_field_paths);
-  owned_key_comparators_.push_back(key_comparator);
-  map_field_key_comparator_[field] = key_comparator;
-}
-
-void MessageDifferencer::TreatAsMapUsingKeyComparator(
-    const FieldDescriptor* field, const MapKeyComparator* key_comparator) {
-  GOOGLE_CHECK(field->is_repeated())
-      << "Field must be repeated: " << field->full_name();
-  GOOGLE_CHECK(repeated_field_comparisons_.find(field) ==
-        repeated_field_comparisons_.end())
-      << "Cannot treat the same field as both "
-      << repeated_field_comparisons_[field]
-      << " and MAP. Field name is: " << field->full_name();
-  map_field_key_comparator_[field] = key_comparator;
-}
-
-void MessageDifferencer::AddIgnoreCriteria(IgnoreCriteria* ignore_criteria) {
-  ignore_criteria_.push_back(ignore_criteria);
-}
-
-void MessageDifferencer::IgnoreField(const FieldDescriptor* field) {
-  ignored_fields_.insert(field);
-}
-
-void MessageDifferencer::SetFractionAndMargin(const FieldDescriptor* field,
-                                              double fraction, double margin) {
-  default_field_comparator_.SetFractionAndMargin(field, fraction, margin);
-}
-
-void MessageDifferencer::ReportDifferencesToString(std::string* output) {
-  GOOGLE_DCHECK(output) << "Specified output string was NULL";
-
-  output_string_ = output;
-  output_string_->clear();
-}
-
-void MessageDifferencer::ReportDifferencesTo(Reporter* reporter) {
-  // If an output string is set, clear it to prevent
-  // it superseding the specified reporter.
-  if (output_string_) {
-    output_string_ = NULL;
-  }
-
-  reporter_ = reporter;
-}
-
-bool MessageDifferencer::FieldBefore(const FieldDescriptor* field1,
-                                     const FieldDescriptor* field2) {
-  // Handle sentinel values (i.e. make sure NULLs are always ordered
-  // at the end of the list).
-  if (field1 == NULL) {
-    return false;
-  }
-
-  if (field2 == NULL) {
-    return true;
-  }
-
-  // Always order fields by their tag number
-  return (field1->number() < field2->number());
-}
-
-bool MessageDifferencer::Compare(const Message& message1,
-                                 const Message& message2) {
-  std::vector<SpecificField> parent_fields;
-
-  bool result = false;
-  // Setup the internal reporter if need be.
-  if (output_string_) {
-    io::StringOutputStream output_stream(output_string_);
-    StreamReporter reporter(&output_stream);
-    reporter.SetMessages(message1, message2);
-    reporter_ = &reporter;
-    result = Compare(message1, message2, &parent_fields);
-    reporter_ = NULL;
-  } else {
-    result = Compare(message1, message2, &parent_fields);
-  }
-  return result;
-}
-
-bool MessageDifferencer::CompareWithFields(
-    const Message& message1, const Message& message2,
-    const std::vector<const FieldDescriptor*>& message1_fields_arg,
-    const std::vector<const FieldDescriptor*>& message2_fields_arg) {
-  if (message1.GetDescriptor() != message2.GetDescriptor()) {
-    GOOGLE_LOG(DFATAL) << "Comparison between two messages with different "
-                << "descriptors.";
-    return false;
-  }
-
-  std::vector<SpecificField> parent_fields;
-
-  bool result = false;
-
-  FieldDescriptorArray message1_fields(message1_fields_arg.size() + 1);
-  FieldDescriptorArray message2_fields(message2_fields_arg.size() + 1);
-
-  std::copy(message1_fields_arg.cbegin(), message1_fields_arg.cend(),
-            message1_fields.begin());
-  std::copy(message2_fields_arg.cbegin(), message2_fields_arg.cend(),
-            message2_fields.begin());
-
-  // Append sentinel values.
-  message1_fields[message1_fields_arg.size()] = nullptr;
-  message2_fields[message2_fields_arg.size()] = nullptr;
-
-  std::sort(message1_fields.begin(), message1_fields.end(), FieldBefore);
-  std::sort(message2_fields.begin(), message2_fields.end(), FieldBefore);
-
-  // Setup the internal reporter if need be.
-  if (output_string_) {
-    io::StringOutputStream output_stream(output_string_);
-    StreamReporter reporter(&output_stream);
-    reporter_ = &reporter;
-    result = CompareRequestedFieldsUsingSettings(
-        message1, message2, message1_fields, message2_fields, &parent_fields);
-    reporter_ = NULL;
-  } else {
-    result = CompareRequestedFieldsUsingSettings(
-        message1, message2, message1_fields, message2_fields, &parent_fields);
-  }
-
-  return result;
-}
-
-bool MessageDifferencer::Compare(const Message& message1,
-                                 const Message& message2,
-                                 std::vector<SpecificField>* parent_fields) {
-  const Descriptor* descriptor1 = message1.GetDescriptor();
-  const Descriptor* descriptor2 = message2.GetDescriptor();
-  if (descriptor1 != descriptor2) {
-    GOOGLE_LOG(DFATAL) << "Comparison between two messages with different "
-                << "descriptors. " << descriptor1->full_name() << " vs "
-                << descriptor2->full_name();
-    return false;
-  }
-
-  // Expand google.protobuf.Any payload if possible.
-  if (descriptor1->full_name() == internal::kAnyFullTypeName) {
-    std::unique_ptr<Message> data1;
-    std::unique_ptr<Message> data2;
-    if (unpack_any_field_.UnpackAny(message1, &data1) &&
-        unpack_any_field_.UnpackAny(message2, &data2)) {
-      // Avoid DFATAL for different descriptors in google.protobuf.Any payloads.
-      if (data1->GetDescriptor() != data2->GetDescriptor()) {
-        return false;
-      }
-      return Compare(*data1, *data2, parent_fields);
-    }
-  }
-  const Reflection* reflection1 = message1.GetReflection();
-  const Reflection* reflection2 = message2.GetReflection();
-
-  bool unknown_compare_result = true;
-  // Ignore unknown fields in EQUIVALENT mode
-  if (message_field_comparison_ != EQUIVALENT) {
-    const UnknownFieldSet& unknown_field_set1 =
-        reflection1->GetUnknownFields(message1);
-    const UnknownFieldSet& unknown_field_set2 =
-        reflection2->GetUnknownFields(message2);
-    if (!CompareUnknownFields(message1, message2, unknown_field_set1,
-                              unknown_field_set2, parent_fields)) {
-      if (reporter_ == NULL) {
-        return false;
-      }
-      unknown_compare_result = false;
-    }
-  }
-
-  FieldDescriptorArray message1_fields = RetrieveFields(message1, true);
-  FieldDescriptorArray message2_fields = RetrieveFields(message2, false);
-
-  return CompareRequestedFieldsUsingSettings(message1, message2,
-                                             message1_fields, message2_fields,
-                                             parent_fields) &&
-         unknown_compare_result;
-}
-
-FieldDescriptorArray MessageDifferencer::RetrieveFields(const Message& message,
-                                                        bool base_message) {
-  const Descriptor* descriptor = message.GetDescriptor();
-
-  tmp_message_fields_.clear();
-  tmp_message_fields_.reserve(descriptor->field_count() + 1);
-
-  const Reflection* reflection = message.GetReflection();
-  if (descriptor->options().map_entry()) {
-    if (this->scope_ == PARTIAL && base_message) {
-      reflection->ListFields(message, &tmp_message_fields_);
-    } else {
-      // Map entry fields are always considered present.
-      for (int i = 0; i < descriptor->field_count(); i++) {
-        tmp_message_fields_.push_back(descriptor->field(i));
-      }
-    }
-  } else {
-    reflection->ListFields(message, &tmp_message_fields_);
-  }
-  // Add sentinel values to deal with the
-  // case where the number of the fields in
-  // each list are different.
-  tmp_message_fields_.push_back(nullptr);
-
-  FieldDescriptorArray message_fields(tmp_message_fields_.begin(),
-                                      tmp_message_fields_.end());
-
-  return message_fields;
-}
-
-bool MessageDifferencer::CompareRequestedFieldsUsingSettings(
-    const Message& message1, const Message& message2,
-    const FieldDescriptorArray& message1_fields,
-    const FieldDescriptorArray& message2_fields,
-    std::vector<SpecificField>* parent_fields) {
-  if (scope_ == FULL) {
-    if (message_field_comparison_ == EQUIVALENT) {
-      // We need to merge the field lists of both messages (i.e.
-      // we are merely checking for a difference in field values,
-      // rather than the addition or deletion of fields).
-      FieldDescriptorArray fields_union =
-          CombineFields(message1_fields, FULL, message2_fields, FULL);
-      return CompareWithFieldsInternal(message1, message2, fields_union,
-                                       fields_union, parent_fields);
-    } else {
-      // Simple equality comparison, use the unaltered field lists.
-      return CompareWithFieldsInternal(message1, message2, message1_fields,
-                                       message2_fields, parent_fields);
-    }
-  } else {
-    if (message_field_comparison_ == EQUIVALENT) {
-      // We use the list of fields for message1 for both messages when
-      // comparing.  This way, extra fields in message2 are ignored,
-      // and missing fields in message2 use their default value.
-      return CompareWithFieldsInternal(message1, message2, message1_fields,
-                                       message1_fields, parent_fields);
-    } else {
-      // We need to consider the full list of fields for message1
-      // but only the intersection for message2.  This way, any fields
-      // only present in message2 will be ignored, but any fields only
-      // present in message1 will be marked as a difference.
-      FieldDescriptorArray fields_intersection =
-          CombineFields(message1_fields, PARTIAL, message2_fields, PARTIAL);
-      return CompareWithFieldsInternal(message1, message2, message1_fields,
-                                       fields_intersection, parent_fields);
-    }
-  }
-}
-
-FieldDescriptorArray MessageDifferencer::CombineFields(
-    const FieldDescriptorArray& fields1, Scope fields1_scope,
-    const FieldDescriptorArray& fields2, Scope fields2_scope) {
-  size_t index1 = 0;
-  size_t index2 = 0;
-
-  tmp_message_fields_.clear();
-
-  while (index1 < fields1.size() && index2 < fields2.size()) {
-    const FieldDescriptor* field1 = fields1[index1];
-    const FieldDescriptor* field2 = fields2[index2];
-
-    if (FieldBefore(field1, field2)) {
-      if (fields1_scope == FULL) {
-        tmp_message_fields_.push_back(fields1[index1]);
-      }
-      ++index1;
-    } else if (FieldBefore(field2, field1)) {
-      if (fields2_scope == FULL) {
-        tmp_message_fields_.push_back(fields2[index2]);
-      }
-      ++index2;
-    } else {
-      tmp_message_fields_.push_back(fields1[index1]);
-      ++index1;
-      ++index2;
-    }
-  }
-
-  tmp_message_fields_.push_back(nullptr);
-
-  FieldDescriptorArray combined_fields(tmp_message_fields_.begin(),
-                                       tmp_message_fields_.end());
-
-  return combined_fields;
-}
-
-bool MessageDifferencer::CompareWithFieldsInternal(
-    const Message& message1, const Message& message2,
-    const FieldDescriptorArray& message1_fields,
-    const FieldDescriptorArray& message2_fields,
-    std::vector<SpecificField>* parent_fields) {
-  bool isDifferent = false;
-  int field_index1 = 0;
-  int field_index2 = 0;
-
-  const Reflection* reflection1 = message1.GetReflection();
-  const Reflection* reflection2 = message2.GetReflection();
-
-  while (true) {
-    const FieldDescriptor* field1 = message1_fields[field_index1];
-    const FieldDescriptor* field2 = message2_fields[field_index2];
-
-    // Once we have reached sentinel values, we are done the comparison.
-    if (field1 == NULL && field2 == NULL) {
-      break;
-    }
-
-    // Check for differences in the field itself.
-    if (FieldBefore(field1, field2)) {
-      // Field 1 is not in the field list for message 2.
-      if (IsIgnored(message1, message2, field1, *parent_fields)) {
-        // We are ignoring field1. Report the ignore and move on to
-        // the next field in message1_fields.
-        if (reporter_ != NULL) {
-          SpecificField specific_field;
-          specific_field.field = field1;
-          parent_fields->push_back(specific_field);
-          if (report_ignores_) {
-            reporter_->ReportIgnored(message1, message2, *parent_fields);
-          }
-          parent_fields->pop_back();
-        }
-        ++field_index1;
-        continue;
-      }
-
-      if (reporter_ != NULL) {
-        assert(field1 != NULL);
-        int count = field1->is_repeated()
-                        ? reflection1->FieldSize(message1, field1)
-                        : 1;
-
-        for (int i = 0; i < count; ++i) {
-          SpecificField specific_field;
-          specific_field.field = field1;
-          if (field1->is_repeated()) {
-            AddSpecificIndex(&specific_field, message1, field1, i);
-          } else {
-            specific_field.index = -1;
-          }
-
-          parent_fields->push_back(specific_field);
-          reporter_->ReportDeleted(message1, message2, *parent_fields);
-          parent_fields->pop_back();
-        }
-
-        isDifferent = true;
-      } else {
-        return false;
-      }
-
-      ++field_index1;
-      continue;
-    } else if (FieldBefore(field2, field1)) {
-      // Field 2 is not in the field list for message 1.
-      if (IsIgnored(message1, message2, field2, *parent_fields)) {
-        // We are ignoring field2. Report the ignore and move on to
-        // the next field in message2_fields.
-        if (reporter_ != NULL) {
-          SpecificField specific_field;
-          specific_field.field = field2;
-          parent_fields->push_back(specific_field);
-          if (report_ignores_) {
-            reporter_->ReportIgnored(message1, message2, *parent_fields);
-          }
-          parent_fields->pop_back();
-        }
-        ++field_index2;
-        continue;
-      }
-
-      if (reporter_ != NULL) {
-        int count = field2->is_repeated()
-                        ? reflection2->FieldSize(message2, field2)
-                        : 1;
-
-        for (int i = 0; i < count; ++i) {
-          SpecificField specific_field;
-          specific_field.field = field2;
-          if (field2->is_repeated()) {
-            specific_field.index = i;
-            AddSpecificNewIndex(&specific_field, message2, field2, i);
-          } else {
-            specific_field.index = -1;
-            specific_field.new_index = -1;
-          }
-
-          parent_fields->push_back(specific_field);
-          reporter_->ReportAdded(message1, message2, *parent_fields);
-          parent_fields->pop_back();
-        }
-
-        isDifferent = true;
-      } else {
-        return false;
-      }
-
-      ++field_index2;
-      continue;
-    }
-
-    // By this point, field1 and field2 are guaranteed to point to the same
-    // field, so we can now compare the values.
-    if (IsIgnored(message1, message2, field1, *parent_fields)) {
-      // Ignore this field. Report and move on.
-      if (reporter_ != NULL) {
-        SpecificField specific_field;
-        specific_field.field = field1;
-        parent_fields->push_back(specific_field);
-        if (report_ignores_) {
-          reporter_->ReportIgnored(message1, message2, *parent_fields);
-        }
-        parent_fields->pop_back();
-      }
-
-      ++field_index1;
-      ++field_index2;
-      continue;
-    }
-
-    bool fieldDifferent = false;
-    assert(field1 != NULL);
-    if (field1->is_map()) {
-      fieldDifferent =
-          !CompareMapField(message1, message2, field1, parent_fields);
-    } else if (field1->is_repeated()) {
-      fieldDifferent =
-          !CompareRepeatedField(message1, message2, field1, parent_fields);
-    } else {
-      fieldDifferent = !CompareFieldValueUsingParentFields(
-          message1, message2, field1, -1, -1, parent_fields);
-
-      if (reporter_ != nullptr) {
-        SpecificField specific_field;
-        specific_field.field = field1;
-        parent_fields->push_back(specific_field);
-        if (fieldDifferent) {
-          reporter_->ReportModified(message1, message2, *parent_fields);
-          isDifferent = true;
-        } else if (report_matches_) {
-          reporter_->ReportMatched(message1, message2, *parent_fields);
-        }
-        parent_fields->pop_back();
-      }
-    }
-    if (fieldDifferent) {
-      if (reporter_ == nullptr) return false;
-      isDifferent = true;
-    }
-    // Increment the field indices.
-    ++field_index1;
-    ++field_index2;
-  }
-
-  return !isDifferent;
-}
-
-bool MessageDifferencer::IsMatch(
-    const FieldDescriptor* repeated_field,
-    const MapKeyComparator* key_comparator, const Message* message1,
-    const Message* message2, const std::vector<SpecificField>& parent_fields,
-    Reporter* reporter, int index1, int index2) {
-  std::vector<SpecificField> current_parent_fields(parent_fields);
-  if (repeated_field->cpp_type() != FieldDescriptor::CPPTYPE_MESSAGE) {
-    return CompareFieldValueUsingParentFields(*message1, *message2,
-                                              repeated_field, index1, index2,
-                                              &current_parent_fields);
-  }
-  // Back up the Reporter and output_string_.  They will be reset in the
-  // following code.
-  Reporter* backup_reporter = reporter_;
-  std::string* output_string = output_string_;
-  reporter_ = reporter;
-  output_string_ = NULL;
-  bool match;
-
-  if (key_comparator == NULL) {
-    match = CompareFieldValueUsingParentFields(*message1, *message2,
-                                               repeated_field, index1, index2,
-                                               &current_parent_fields);
-  } else {
-    const Reflection* reflection1 = message1->GetReflection();
-    const Reflection* reflection2 = message2->GetReflection();
-    const Message& m1 =
-        reflection1->GetRepeatedMessage(*message1, repeated_field, index1);
-    const Message& m2 =
-        reflection2->GetRepeatedMessage(*message2, repeated_field, index2);
-    SpecificField specific_field;
-    specific_field.field = repeated_field;
-    if (repeated_field->is_map()) {
-      specific_field.map_entry1 = &m1;
-      specific_field.map_entry2 = &m2;
-    }
-    specific_field.index = index1;
-    specific_field.new_index = index2;
-    current_parent_fields.push_back(specific_field);
-    match = key_comparator->IsMatch(m1, m2, current_parent_fields);
-  }
-
-  reporter_ = backup_reporter;
-  output_string_ = output_string;
-  return match;
-}
-
-bool MessageDifferencer::CompareMapFieldByMapReflection(
-    const Message& message1, const Message& message2,
-    const FieldDescriptor* map_field, std::vector<SpecificField>* parent_fields,
-    DefaultFieldComparator* comparator) {
-  GOOGLE_DCHECK_EQ(nullptr, reporter_);
-  GOOGLE_DCHECK(map_field->is_map());
-  GOOGLE_DCHECK(map_field_key_comparator_.find(map_field) ==
-         map_field_key_comparator_.end());
-  GOOGLE_DCHECK_EQ(repeated_field_comparison_, AS_LIST);
-  const Reflection* reflection1 = message1.GetReflection();
-  const Reflection* reflection2 = message2.GetReflection();
-  const int count1 = reflection1->MapSize(message1, map_field);
-  const int count2 = reflection2->MapSize(message2, map_field);
-  const bool treated_as_subset = IsTreatedAsSubset(map_field);
-  if (count1 != count2 && !treated_as_subset) {
-    return false;
-  }
-  if (count1 > count2) {
-    return false;
-  }
-
-  // First pass: check whether the same keys are present.
-  for (MapIterator it = reflection1->MapBegin(const_cast<Message*>(&message1),
-                                              map_field),
-                   it_end = reflection1->MapEnd(const_cast<Message*>(&message1),
-                                                map_field);
-       it != it_end; ++it) {
-    if (!reflection2->ContainsMapKey(message2, map_field, it.GetKey())) {
-      return false;
-    }
-  }
-
-  // Second pass: compare values for matching keys.
-  const FieldDescriptor* val_des = map_field->message_type()->map_value();
-  switch (val_des->cpp_type()) {
-#define HANDLE_TYPE(CPPTYPE, METHOD, COMPAREMETHOD)                           \
-  case FieldDescriptor::CPPTYPE_##CPPTYPE: {                                  \
-    for (MapIterator it = reflection1->MapBegin(                              \
-                         const_cast<Message*>(&message1), map_field),         \
-                     it_end = reflection1->MapEnd(                            \
-                         const_cast<Message*>(&message1), map_field);         \
-         it != it_end; ++it) {                                                \
-      MapValueConstRef value2;                                                \
-      reflection2->LookupMapValue(message2, map_field, it.GetKey(), &value2); \
-      if (!comparator->Compare##COMPAREMETHOD(*val_des,                       \
-                                              it.GetValueRef().Get##METHOD(), \
-                                              value2.Get##METHOD())) {        \
-        return false;                                                         \
-      }                                                                       \
-    }                                                                         \
-    break;                                                                    \
-  }
-    HANDLE_TYPE(INT32, Int32Value, Int32);
-    HANDLE_TYPE(INT64, Int64Value, Int64);
-    HANDLE_TYPE(UINT32, UInt32Value, UInt32);
-    HANDLE_TYPE(UINT64, UInt64Value, UInt64);
-    HANDLE_TYPE(DOUBLE, DoubleValue, Double);
-    HANDLE_TYPE(FLOAT, FloatValue, Float);
-    HANDLE_TYPE(BOOL, BoolValue, Bool);
-    HANDLE_TYPE(STRING, StringValue, String);
-    HANDLE_TYPE(ENUM, EnumValue, Int32);
-#undef HANDLE_TYPE
-    case FieldDescriptor::CPPTYPE_MESSAGE: {
-      for (MapIterator it = reflection1->MapBegin(
-               const_cast<Message*>(&message1), map_field);
-           it !=
-           reflection1->MapEnd(const_cast<Message*>(&message1), map_field);
-           ++it) {
-        if (!reflection2->ContainsMapKey(message2, map_field, it.GetKey())) {
-          return false;
-        }
-        bool compare_result;
-        MapValueConstRef value2;
-        reflection2->LookupMapValue(message2, map_field, it.GetKey(), &value2);
-        // Append currently compared field to the end of parent_fields.
-        SpecificField specific_value_field;
-        specific_value_field.field = val_des;
-        parent_fields->push_back(specific_value_field);
-        compare_result = Compare(it.GetValueRef().GetMessageValue(),
-                                 value2.GetMessageValue(), parent_fields);
-        parent_fields->pop_back();
-        if (!compare_result) {
-          return false;
-        }
-      }
-      break;
-    }
-  }
-  return true;
-}
-
-bool MessageDifferencer::CompareMapField(
-    const Message& message1, const Message& message2,
-    const FieldDescriptor* repeated_field,
-    std::vector<SpecificField>* parent_fields) {
-  GOOGLE_DCHECK(repeated_field->is_map());
-
-  // the input FieldDescriptor is guaranteed to be repeated field.
-  const Reflection* reflection1 = message1.GetReflection();
-  const Reflection* reflection2 = message2.GetReflection();
-
-  // When both map fields are on map, do not sync to repeated field.
-  if (reflection1->GetMapData(message1, repeated_field)->IsMapValid() &&
-      reflection2->GetMapData(message2, repeated_field)->IsMapValid() &&
-      // TODO(jieluo): Add support for reporter
-      reporter_ == nullptr &&
-      // Users didn't set custom map field key comparator
-      map_field_key_comparator_.find(repeated_field) ==
-          map_field_key_comparator_.end() &&
-      // Users didn't set repeated field comparison
-      repeated_field_comparison_ == AS_LIST &&
-      // Users didn't set their own FieldComparator implementation
-      field_comparator_kind_ == kFCDefault) {
-    const FieldDescriptor* key_des = repeated_field->message_type()->map_key();
-    const FieldDescriptor* val_des =
-        repeated_field->message_type()->map_value();
-    std::vector<SpecificField> current_parent_fields(*parent_fields);
-    SpecificField specific_field;
-    specific_field.field = repeated_field;
-    current_parent_fields.push_back(specific_field);
-    if (!IsIgnored(message1, message2, key_des, current_parent_fields) &&
-        !IsIgnored(message1, message2, val_des, current_parent_fields)) {
-      return CompareMapFieldByMapReflection(message1, message2, repeated_field,
-                                            &current_parent_fields,
-                                            field_comparator_.default_impl);
-    }
-  }
-
-  return CompareRepeatedRep(message1, message2, repeated_field, parent_fields);
-}
-
-bool MessageDifferencer::CompareRepeatedField(
-    const Message& message1, const Message& message2,
-    const FieldDescriptor* repeated_field,
-    std::vector<SpecificField>* parent_fields) {
-  GOOGLE_DCHECK(!repeated_field->is_map());
-  return CompareRepeatedRep(message1, message2, repeated_field, parent_fields);
-}
-
-bool MessageDifferencer::CompareRepeatedRep(
-    const Message& message1, const Message& message2,
-    const FieldDescriptor* repeated_field,
-    std::vector<SpecificField>* parent_fields) {
-  // the input FieldDescriptor is guaranteed to be repeated field.
-  GOOGLE_DCHECK(repeated_field->is_repeated());
-  const Reflection* reflection1 = message1.GetReflection();
-  const Reflection* reflection2 = message2.GetReflection();
-
-  const int count1 = reflection1->FieldSize(message1, repeated_field);
-  const int count2 = reflection2->FieldSize(message2, repeated_field);
-  const bool treated_as_subset = IsTreatedAsSubset(repeated_field);
-
-  // If the field is not treated as subset and no detailed reports is needed,
-  // we do a quick check on the number of the elements to avoid unnecessary
-  // comparison.
-  if (count1 != count2 && reporter_ == NULL && !treated_as_subset) {
-    return false;
-  }
-  // A match can never be found if message1 has more items than message2.
-  if (count1 > count2 && reporter_ == NULL) {
-    return false;
-  }
-
-  // These two list are used for store the index of the correspondent
-  // element in peer repeated field.
-  std::vector<int> match_list1;
-  std::vector<int> match_list2;
-
-  const MapKeyComparator* key_comparator = GetMapKeyComparator(repeated_field);
-  bool smart_list = IsTreatedAsSmartList(repeated_field);
-  bool simple_list = key_comparator == nullptr &&
-                     !IsTreatedAsSet(repeated_field) &&
-                     !IsTreatedAsSmartSet(repeated_field) && !smart_list;
-
-  // For simple lists, we avoid matching repeated field indices, saving the
-  // memory allocations that would otherwise be needed for match_list1 and
-  // match_list2.
-  if (!simple_list) {
-    // Try to match indices of the repeated fields. Return false if match fails.
-    if (!MatchRepeatedFieldIndices(message1, message2, repeated_field,
-                                   key_comparator, *parent_fields, &match_list1,
-                                   &match_list2) &&
-        reporter_ == nullptr) {
-      return false;
-    }
-  }
-
-  bool fieldDifferent = false;
-  SpecificField specific_field;
-  specific_field.field = repeated_field;
-
-  // At this point, we have already matched pairs of fields (with the reporting
-  // to be done later). Now to check if the paired elements are different.
-  int next_unmatched_index = 0;
-  for (int i = 0; i < count1; i++) {
-    if (simple_list && i >= count2) {
-      break;
-    }
-    if (!simple_list && match_list1[i] == -1) {
-      if (smart_list) {
-        if (reporter_ == nullptr) return false;
-        AddSpecificIndex(&specific_field, message1, repeated_field, i);
-        parent_fields->push_back(specific_field);
-        reporter_->ReportDeleted(message1, message2, *parent_fields);
-        parent_fields->pop_back();
-        fieldDifferent = true;
-        // Use -2 to mark this element has been reported.
-        match_list1[i] = -2;
-      }
-      continue;
-    }
-    if (smart_list) {
-      for (int j = next_unmatched_index; j < match_list1[i]; ++j) {
-        GOOGLE_CHECK_LE(0, j);
-        if (reporter_ == nullptr) return false;
-        specific_field.index = j;
-        AddSpecificNewIndex(&specific_field, message2, repeated_field, j);
-        parent_fields->push_back(specific_field);
-        reporter_->ReportAdded(message1, message2, *parent_fields);
-        parent_fields->pop_back();
-        fieldDifferent = true;
-        // Use -2 to mark this element has been reported.
-        match_list2[j] = -2;
-      }
-    }
-    AddSpecificIndex(&specific_field, message1, repeated_field, i);
-    if (simple_list) {
-      AddSpecificNewIndex(&specific_field, message2, repeated_field, i);
-    } else {
-      AddSpecificNewIndex(&specific_field, message2, repeated_field,
-                          match_list1[i]);
-      next_unmatched_index = match_list1[i] + 1;
-    }
-
-    const bool result = CompareFieldValueUsingParentFields(
-        message1, message2, repeated_field, i, specific_field.new_index,
-        parent_fields);
-
-    // If we have found differences, either report them or terminate if
-    // no reporter is present. Note that ReportModified, ReportMoved, and
-    // ReportMatched are all mutually exclusive.
-    if (!result) {
-      if (reporter_ == NULL) return false;
-      parent_fields->push_back(specific_field);
-      reporter_->ReportModified(message1, message2, *parent_fields);
-      parent_fields->pop_back();
-      fieldDifferent = true;
-    } else if (reporter_ != NULL &&
-               specific_field.index != specific_field.new_index &&
-               !specific_field.field->is_map() && report_moves_) {
-      parent_fields->push_back(specific_field);
-      reporter_->ReportMoved(message1, message2, *parent_fields);
-      parent_fields->pop_back();
-    } else if (report_matches_ && reporter_ != NULL) {
-      parent_fields->push_back(specific_field);
-      reporter_->ReportMatched(message1, message2, *parent_fields);
-      parent_fields->pop_back();
-    }
-  }
-
-  // Report any remaining additions or deletions.
-  for (int i = 0; i < count2; ++i) {
-    if (!simple_list && match_list2[i] != -1) continue;
-    if (simple_list && i < count1) continue;
-    if (!treated_as_subset) {
-      fieldDifferent = true;
-    }
-
-    if (reporter_ == NULL) continue;
-    specific_field.index = i;
-    AddSpecificNewIndex(&specific_field, message2, repeated_field, i);
-    parent_fields->push_back(specific_field);
-    reporter_->ReportAdded(message1, message2, *parent_fields);
-    parent_fields->pop_back();
-  }
-
-  for (int i = 0; i < count1; ++i) {
-    if (!simple_list && match_list1[i] != -1) continue;
-    if (simple_list && i < count2) continue;
-    assert(reporter_ != NULL);
-    AddSpecificIndex(&specific_field, message1, repeated_field, i);
-    parent_fields->push_back(specific_field);
-    reporter_->ReportDeleted(message1, message2, *parent_fields);
-    parent_fields->pop_back();
-    fieldDifferent = true;
-  }
-  return !fieldDifferent;
-}
-
-bool MessageDifferencer::CompareFieldValue(const Message& message1,
-                                           const Message& message2,
-                                           const FieldDescriptor* field,
-                                           int index1, int index2) {
-  return CompareFieldValueUsingParentFields(message1, message2, field, index1,
-                                            index2, NULL);
-}
-
-bool MessageDifferencer::CompareFieldValueUsingParentFields(
-    const Message& message1, const Message& message2,
-    const FieldDescriptor* field, int index1, int index2,
-    std::vector<SpecificField>* parent_fields) {
-  FieldContext field_context(parent_fields);
-  FieldComparator::ComparisonResult result = GetFieldComparisonResult(
-      message1, message2, field, index1, index2, &field_context);
-
-  if (field->cpp_type() == FieldDescriptor::CPPTYPE_MESSAGE &&
-      result == FieldComparator::RECURSE) {
-    // Get the nested messages and compare them using one of the Compare
-    // methods.
-    const Reflection* reflection1 = message1.GetReflection();
-    const Reflection* reflection2 = message2.GetReflection();
-    const Message& m1 =
-        field->is_repeated()
-            ? reflection1->GetRepeatedMessage(message1, field, index1)
-            : reflection1->GetMessage(message1, field);
-    const Message& m2 =
-        field->is_repeated()
-            ? reflection2->GetRepeatedMessage(message2, field, index2)
-            : reflection2->GetMessage(message2, field);
-
-    // parent_fields is used in calls to Reporter methods.
-    if (parent_fields != NULL) {
-      // Append currently compared field to the end of parent_fields.
-      SpecificField specific_field;
-      specific_field.field = field;
-      AddSpecificIndex(&specific_field, message1, field, index1);
-      AddSpecificNewIndex(&specific_field, message2, field, index2);
-      parent_fields->push_back(specific_field);
-      const bool compare_result = Compare(m1, m2, parent_fields);
-      parent_fields->pop_back();
-      return compare_result;
-    } else {
-      // Recreates parent_fields as if m1 and m2 had no parents.
-      return Compare(m1, m2);
-    }
-  } else {
-    return (result == FieldComparator::SAME);
-  }
-}
-
-bool MessageDifferencer::CheckPathChanged(
-    const std::vector<SpecificField>& field_path) {
-  for (const SpecificField& specific_field : field_path) {
-    // Don't check indexes for map entries -- maps are unordered.
-    if (specific_field.field != nullptr && specific_field.field->is_map())
-      continue;
-    if (specific_field.index != specific_field.new_index) return true;
-  }
-  return false;
-}
-
-bool MessageDifferencer::IsTreatedAsSet(const FieldDescriptor* field) {
-  if (!field->is_repeated()) return false;
-  if (repeated_field_comparisons_.find(field) !=
-      repeated_field_comparisons_.end()) {
-    return repeated_field_comparisons_[field] == AS_SET;
-  }
-  return GetMapKeyComparator(field) == nullptr &&
-         repeated_field_comparison_ == AS_SET;
-}
-
-bool MessageDifferencer::IsTreatedAsSmartSet(const FieldDescriptor* field) {
-  if (!field->is_repeated()) return false;
-  if (repeated_field_comparisons_.find(field) !=
-      repeated_field_comparisons_.end()) {
-    return repeated_field_comparisons_[field] == AS_SMART_SET;
-  }
-  return GetMapKeyComparator(field) == nullptr &&
-         repeated_field_comparison_ == AS_SMART_SET;
-}
-
-bool MessageDifferencer::IsTreatedAsSmartList(const FieldDescriptor* field) {
-  if (!field->is_repeated()) return false;
-  if (repeated_field_comparisons_.find(field) !=
-      repeated_field_comparisons_.end()) {
-    return repeated_field_comparisons_[field] == AS_SMART_LIST;
-  }
-  return GetMapKeyComparator(field) == nullptr &&
-         repeated_field_comparison_ == AS_SMART_LIST;
-}
-
-bool MessageDifferencer::IsTreatedAsSubset(const FieldDescriptor* field) {
-  return scope_ == PARTIAL &&
-         (IsTreatedAsSet(field) || GetMapKeyComparator(field) != NULL);
-}
-
-bool MessageDifferencer::IsIgnored(
-    const Message& message1, const Message& message2,
-    const FieldDescriptor* field,
-    const std::vector<SpecificField>& parent_fields) {
-  if (ignored_fields_.find(field) != ignored_fields_.end()) {
-    return true;
-  }
-  for (IgnoreCriteria* criteria : ignore_criteria_) {
-    if (criteria->IsIgnored(message1, message2, field, parent_fields)) {
-      return true;
-    }
-  }
-  return false;
-}
-
-bool MessageDifferencer::IsUnknownFieldIgnored(
-    const Message& message1, const Message& message2,
-    const SpecificField& field,
-    const std::vector<SpecificField>& parent_fields) {
-  for (IgnoreCriteria* criteria : ignore_criteria_) {
-    if (criteria->IsUnknownFieldIgnored(message1, message2, field,
-                                        parent_fields)) {
-      return true;
-    }
-  }
-  return false;
-}
-
-const MessageDifferencer::MapKeyComparator*
-MessageDifferencer ::GetMapKeyComparator(const FieldDescriptor* field) const {
-  if (!field->is_repeated()) return NULL;
-  FieldKeyComparatorMap::const_iterator it =
-      map_field_key_comparator_.find(field);
-  if (it != map_field_key_comparator_.end()) {
-    return it->second;
-  }
-  if (field->is_map()) {
-    // field cannot already be treated as list or set since TreatAsList() and
-    // TreatAsSet() call GetMapKeyComparator() and fail if it returns non-NULL.
-    return &map_entry_key_comparator_;
-  }
-  return NULL;
-}
-
-namespace {
-
-typedef std::pair<int, const UnknownField*> IndexUnknownFieldPair;
-
-struct UnknownFieldOrdering {
-  inline bool operator()(const IndexUnknownFieldPair& a,
-                         const IndexUnknownFieldPair& b) const {
-    if (a.second->number() < b.second->number()) return true;
-    if (a.second->number() > b.second->number()) return false;
-    return a.second->type() < b.second->type();
-  }
-};
-
-}  // namespace
-
-bool MessageDifferencer::UnpackAnyField::UnpackAny(
-    const Message& any, std::unique_ptr<Message>* data) {
-  const Reflection* reflection = any.GetReflection();
-  const FieldDescriptor* type_url_field;
-  const FieldDescriptor* value_field;
-  if (!internal::GetAnyFieldDescriptors(any, &type_url_field, &value_field)) {
-    return false;
-  }
-  const std::string& type_url = reflection->GetString(any, type_url_field);
-  std::string full_type_name;
-  if (!internal::ParseAnyTypeUrl(type_url, &full_type_name)) {
-    return false;
-  }
-
-  const Descriptor* desc =
-      any.GetDescriptor()->file()->pool()->FindMessageTypeByName(
-          full_type_name);
-  if (desc == NULL) {
-    GOOGLE_LOG(INFO) << "Proto type '" << full_type_name << "' not found";
-    return false;
-  }
-
-  if (dynamic_message_factory_ == NULL) {
-    dynamic_message_factory_.reset(new DynamicMessageFactory());
-  }
-  data->reset(dynamic_message_factory_->GetPrototype(desc)->New());
-  std::string serialized_value = reflection->GetString(any, value_field);
-  if (!(*data)->ParsePartialFromString(serialized_value)) {
-    GOOGLE_DLOG(ERROR) << "Failed to parse value for " << full_type_name;
-    return false;
-  }
-  return true;
-}
-
-bool MessageDifferencer::CompareUnknownFields(
-    const Message& message1, const Message& message2,
-    const UnknownFieldSet& unknown_field_set1,
-    const UnknownFieldSet& unknown_field_set2,
-    std::vector<SpecificField>* parent_field) {
-  // Ignore unknown fields in EQUIVALENT mode.
-  if (message_field_comparison_ == EQUIVALENT) return true;
-
-  if (unknown_field_set1.empty() && unknown_field_set2.empty()) {
-    return true;
-  }
-
-  bool is_different = false;
-
-  // We first sort the unknown fields by field number and type (in other words,
-  // in tag order), making sure to preserve ordering of values with the same
-  // tag.  This allows us to report only meaningful differences between the
-  // two sets -- that is, differing values for the same tag.  We use
-  // IndexUnknownFieldPairs to keep track of the field's original index for
-  // reporting purposes.
-  std::vector<IndexUnknownFieldPair> fields1;  // unknown_field_set1, sorted
-  std::vector<IndexUnknownFieldPair> fields2;  // unknown_field_set2, sorted
-  fields1.reserve(unknown_field_set1.field_count());
-  fields2.reserve(unknown_field_set2.field_count());
-
-  for (int i = 0; i < unknown_field_set1.field_count(); i++) {
-    fields1.push_back(std::make_pair(i, &unknown_field_set1.field(i)));
-  }
-  for (int i = 0; i < unknown_field_set2.field_count(); i++) {
-    fields2.push_back(std::make_pair(i, &unknown_field_set2.field(i)));
-  }
-
-  UnknownFieldOrdering is_before;
-  std::stable_sort(fields1.begin(), fields1.end(), is_before);
-  std::stable_sort(fields2.begin(), fields2.end(), is_before);
-
-  // In order to fill in SpecificField::index, we have to keep track of how
-  // many values we've seen with the same field number and type.
-  // current_repeated points at the first field in this range, and
-  // current_repeated_start{1,2} are the indexes of the first field in the
-  // range within fields1 and fields2.
-  const UnknownField* current_repeated = NULL;
-  int current_repeated_start1 = 0;
-  int current_repeated_start2 = 0;
-
-  // Now that we have two sorted lists, we can detect fields which appear only
-  // in one list or the other by traversing them simultaneously.
-  size_t index1 = 0;
-  size_t index2 = 0;
-  while (index1 < fields1.size() || index2 < fields2.size()) {
-    enum {
-      ADDITION,
-      DELETION,
-      MODIFICATION,
-      COMPARE_GROUPS,
-      NO_CHANGE
-    } change_type;
-
-    // focus_field is the field we're currently reporting on.  (In the case
-    // of a modification, it's the field on the left side.)
-    const UnknownField* focus_field;
-    bool match = false;
-
-    if (index2 == fields2.size() ||
-        (index1 < fields1.size() &&
-         is_before(fields1[index1], fields2[index2]))) {
-      // fields1[index1] is not present in fields2.
-      change_type = DELETION;
-      focus_field = fields1[index1].second;
-    } else if (index1 == fields1.size() ||
-               is_before(fields2[index2], fields1[index1])) {
-      // fields2[index2] is not present in fields1.
-      if (scope_ == PARTIAL) {
-        // Ignore.
-        ++index2;
-        continue;
-      }
-      change_type = ADDITION;
-      focus_field = fields2[index2].second;
-    } else {
-      // Field type and number are the same.  See if the values differ.
-      change_type = MODIFICATION;
-      focus_field = fields1[index1].second;
-
-      switch (focus_field->type()) {
-        case UnknownField::TYPE_VARINT:
-          match = fields1[index1].second->varint() ==
-                  fields2[index2].second->varint();
-          break;
-        case UnknownField::TYPE_FIXED32:
-          match = fields1[index1].second->fixed32() ==
-                  fields2[index2].second->fixed32();
-          break;
-        case UnknownField::TYPE_FIXED64:
-          match = fields1[index1].second->fixed64() ==
-                  fields2[index2].second->fixed64();
-          break;
-        case UnknownField::TYPE_LENGTH_DELIMITED:
-          match = fields1[index1].second->length_delimited() ==
-                  fields2[index2].second->length_delimited();
-          break;
-        case UnknownField::TYPE_GROUP:
-          // We must deal with this later, after building the SpecificField.
-          change_type = COMPARE_GROUPS;
-          break;
-      }
-      if (match && change_type != COMPARE_GROUPS) {
-        change_type = NO_CHANGE;
-      }
-    }
-
-    if (current_repeated == NULL ||
-        focus_field->number() != current_repeated->number() ||
-        focus_field->type() != current_repeated->type()) {
-      // We've started a new repeated field.
-      current_repeated = focus_field;
-      current_repeated_start1 = index1;
-      current_repeated_start2 = index2;
-    }
-
-    if (change_type == NO_CHANGE && reporter_ == NULL) {
-      // Fields were already compared and matched and we have no reporter.
-      ++index1;
-      ++index2;
-      continue;
-    }
-
-    // Build the SpecificField.  This is slightly complicated.
-    SpecificField specific_field;
-    specific_field.unknown_field_number = focus_field->number();
-    specific_field.unknown_field_type = focus_field->type();
-
-    specific_field.unknown_field_set1 = &unknown_field_set1;
-    specific_field.unknown_field_set2 = &unknown_field_set2;
-
-    if (change_type != ADDITION) {
-      specific_field.unknown_field_index1 = fields1[index1].first;
-    }
-    if (change_type != DELETION) {
-      specific_field.unknown_field_index2 = fields2[index2].first;
-    }
-
-    // Calculate the field index.
-    if (change_type == ADDITION) {
-      specific_field.index = index2 - current_repeated_start2;
-      specific_field.new_index = index2 - current_repeated_start2;
-    } else {
-      specific_field.index = index1 - current_repeated_start1;
-      specific_field.new_index = index2 - current_repeated_start2;
-    }
-
-    if (IsUnknownFieldIgnored(message1, message2, specific_field,
-                              *parent_field)) {
-      if (report_ignores_ && reporter_ != NULL) {
-        parent_field->push_back(specific_field);
-        reporter_->ReportUnknownFieldIgnored(message1, message2, *parent_field);
-        parent_field->pop_back();
-      }
-      if (change_type != ADDITION) ++index1;
-      if (change_type != DELETION) ++index2;
-      continue;
-    }
-
-    if (change_type == ADDITION || change_type == DELETION ||
-        change_type == MODIFICATION) {
-      if (reporter_ == NULL) {
-        // We found a difference and we have no reporter.
-        return false;
-      }
-      is_different = true;
-    }
-
-    parent_field->push_back(specific_field);
-
-    switch (change_type) {
-      case ADDITION:
-        reporter_->ReportAdded(message1, message2, *parent_field);
-        ++index2;
-        break;
-      case DELETION:
-        reporter_->ReportDeleted(message1, message2, *parent_field);
-        ++index1;
-        break;
-      case MODIFICATION:
-        reporter_->ReportModified(message1, message2, *parent_field);
-        ++index1;
-        ++index2;
-        break;
-      case COMPARE_GROUPS:
-        if (!CompareUnknownFields(
-                message1, message2, fields1[index1].second->group(),
-                fields2[index2].second->group(), parent_field)) {
-          if (reporter_ == NULL) return false;
-          is_different = true;
-          reporter_->ReportModified(message1, message2, *parent_field);
-        }
-        ++index1;
-        ++index2;
-        break;
-      case NO_CHANGE:
-        ++index1;
-        ++index2;
-        if (report_matches_) {
-          reporter_->ReportMatched(message1, message2, *parent_field);
-        }
-    }
-
-    parent_field->pop_back();
-  }
-
-  return !is_different;
-}
-
-namespace {
-
-// Find maximum bipartite matching using the argumenting path algorithm.
-class MaximumMatcher {
- public:
-  typedef std::function<bool(int, int)> NodeMatchCallback;
-  // MaximumMatcher takes ownership of the passed in callback and uses it to
-  // determine whether a node on the left side of the bipartial graph matches
-  // a node on the right side. count1 is the number of nodes on the left side
-  // of the graph and count2 to is the number of nodes on the right side.
-  // Every node is referred to using 0-based indices.
-  // If a maximum match is found, the result will be stored in match_list1 and
-  // match_list2. match_list1[i] == j means the i-th node on the left side is
-  // matched to the j-th node on the right side and match_list2[x] == y means
-  // the x-th node on the right side is matched to y-th node on the left side.
-  // match_list1[i] == -1 means the node is not matched. Same with match_list2.
-  MaximumMatcher(int count1, int count2, NodeMatchCallback callback,
-                 std::vector<int>* match_list1, std::vector<int>* match_list2);
-  // Find a maximum match and return the number of matched node pairs.
-  // If early_return is true, this method will return 0 immediately when it
-  // finds that not all nodes on the left side can be matched.
-  int FindMaximumMatch(bool early_return);
-
- private:
-  // Determines whether the node on the left side of the bipartial graph
-  // matches the one on the right side.
-  bool Match(int left, int right);
-  // Find an argumenting path starting from the node v on the left side. If a
-  // path can be found, update match_list2_ to reflect the path and return
-  // true.
-  bool FindArgumentPathDFS(int v, std::vector<bool>* visited);
-
-  int count1_;
-  int count2_;
-  NodeMatchCallback match_callback_;
-  std::map<std::pair<int, int>, bool> cached_match_results_;
-  std::vector<int>* match_list1_;
-  std::vector<int>* match_list2_;
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(MaximumMatcher);
-};
-
-MaximumMatcher::MaximumMatcher(int count1, int count2,
-                               NodeMatchCallback callback,
-                               std::vector<int>* match_list1,
-                               std::vector<int>* match_list2)
-    : count1_(count1),
-      count2_(count2),
-      match_callback_(std::move(callback)),
-      match_list1_(match_list1),
-      match_list2_(match_list2) {
-  match_list1_->assign(count1, -1);
-  match_list2_->assign(count2, -1);
-}
-
-int MaximumMatcher::FindMaximumMatch(bool early_return) {
-  int result = 0;
-  for (int i = 0; i < count1_; ++i) {
-    std::vector<bool> visited(count1_);
-    if (FindArgumentPathDFS(i, &visited)) {
-      ++result;
-    } else if (early_return) {
-      return 0;
-    }
-  }
-  // Backfill match_list1_ as we only filled match_list2_ when finding
-  // argumenting paths.
-  for (int i = 0; i < count2_; ++i) {
-    if ((*match_list2_)[i] != -1) {
-      (*match_list1_)[(*match_list2_)[i]] = i;
-    }
-  }
-  return result;
-}
-
-bool MaximumMatcher::Match(int left, int right) {
-  std::pair<int, int> p(left, right);
-  std::map<std::pair<int, int>, bool>::iterator it =
-      cached_match_results_.find(p);
-  if (it != cached_match_results_.end()) {
-    return it->second;
-  }
-  cached_match_results_[p] = match_callback_(left, right);
-  return cached_match_results_[p];
-}
-
-bool MaximumMatcher::FindArgumentPathDFS(int v, std::vector<bool>* visited) {
-  (*visited)[v] = true;
-  // We try to match those un-matched nodes on the right side first. This is
-  // the step that the naive greedy matching algorithm uses. In the best cases
-  // where the greedy algorithm can find a maximum matching, we will always
-  // find a match in this step and the performance will be identical to the
-  // greedy algorithm.
-  for (int i = 0; i < count2_; ++i) {
-    int matched = (*match_list2_)[i];
-    if (matched == -1 && Match(v, i)) {
-      (*match_list2_)[i] = v;
-      return true;
-    }
-  }
-  // Then we try those already matched nodes and see if we can find an
-  // alternative match for the node matched to them.
-  // The greedy algorithm will stop before this and fail to produce the
-  // correct result.
-  for (int i = 0; i < count2_; ++i) {
-    int matched = (*match_list2_)[i];
-    if (matched != -1 && Match(v, i)) {
-      if (!(*visited)[matched] && FindArgumentPathDFS(matched, visited)) {
-        (*match_list2_)[i] = v;
-        return true;
-      }
-    }
-  }
-  return false;
-}
-
-}  // namespace
-
-bool MessageDifferencer::MatchRepeatedFieldIndices(
-    const Message& message1, const Message& message2,
-    const FieldDescriptor* repeated_field,
-    const MapKeyComparator* key_comparator,
-    const std::vector<SpecificField>& parent_fields,
-    std::vector<int>* match_list1, std::vector<int>* match_list2) {
-  const int count1 =
-      message1.GetReflection()->FieldSize(message1, repeated_field);
-  const int count2 =
-      message2.GetReflection()->FieldSize(message2, repeated_field);
-  const bool is_treated_as_smart_set = IsTreatedAsSmartSet(repeated_field);
-
-  match_list1->assign(count1, -1);
-  match_list2->assign(count2, -1);
-  // Ensure that we don't report differences during the matching process. Since
-  // field comparators could potentially use this message differencer object to
-  // perform further comparisons, turn off reporting here and re-enable it
-  // before returning.
-  Reporter* reporter = reporter_;
-  reporter_ = NULL;
-  NumDiffsReporter num_diffs_reporter;
-  std::vector<int32_t> num_diffs_list1;
-  if (is_treated_as_smart_set) {
-    num_diffs_list1.assign(count1, std::numeric_limits<int32_t>::max());
-  }
-
-  bool success = true;
-  // Find potential match if this is a special repeated field.
-  if (scope_ == PARTIAL) {
-    // When partial matching is enabled, Compare(a, b) && Compare(a, c)
-    // doesn't necessarily imply Compare(b, c). Therefore a naive greedy
-    // algorithm will fail to find a maximum matching.
-    // Here we use the augmenting path algorithm.
-    auto callback = [&](int i1, int i2) {
-      return IsMatch(repeated_field, key_comparator, &message1, &message2,
-                     parent_fields, nullptr, i1, i2);
-    };
-    MaximumMatcher matcher(count1, count2, std::move(callback), match_list1,
-                           match_list2);
-    // If diff info is not needed, we should end the matching process as
-    // soon as possible if not all items can be matched.
-    bool early_return = (reporter == nullptr);
-    int match_count = matcher.FindMaximumMatch(early_return);
-    if (match_count != count1 && early_return) return false;
-    success = success && (match_count == count1);
-  } else {
-    int start_offset = 0;
-    // If the two repeated fields are treated as sets, optimize for the case
-    // where both start with same items stored in the same order.
-    if (IsTreatedAsSet(repeated_field) || is_treated_as_smart_set ||
-        IsTreatedAsSmartList(repeated_field)) {
-      start_offset = std::min(count1, count2);
-      for (int i = 0; i < count1 && i < count2; i++) {
-        if (IsMatch(repeated_field, key_comparator, &message1, &message2,
-                    parent_fields, nullptr, i, i)) {
-          match_list1->at(i) = i;
-          match_list2->at(i) = i;
-        } else {
-          start_offset = i;
-          break;
-        }
-      }
-    }
-    for (int i = start_offset; i < count1; ++i) {
-      // Indicates any matched elements for this repeated field.
-      bool match = false;
-      int matched_j = -1;
-
-      for (int j = start_offset; j < count2; j++) {
-        if (match_list2->at(j) != -1) {
-          if (!is_treated_as_smart_set || num_diffs_list1[i] == 0 ||
-              num_diffs_list1[match_list2->at(j)] == 0) {
-            continue;
-          }
-        }
-
-        if (is_treated_as_smart_set) {
-          num_diffs_reporter.Reset();
-          match = IsMatch(repeated_field, key_comparator, &message1, &message2,
-                          parent_fields, &num_diffs_reporter, i, j);
-        } else {
-          match = IsMatch(repeated_field, key_comparator, &message1, &message2,
-                          parent_fields, nullptr, i, j);
-        }
-
-        if (is_treated_as_smart_set) {
-          if (match) {
-            num_diffs_list1[i] = 0;
-          } else if (repeated_field->cpp_type() ==
-                     FieldDescriptor::CPPTYPE_MESSAGE) {
-            // Replace with the one with fewer diffs.
-            const int32_t num_diffs = num_diffs_reporter.GetNumDiffs();
-            if (num_diffs < num_diffs_list1[i]) {
-              // If j has been already matched to some element, ensure the
-              // current num_diffs is smaller.
-              if (match_list2->at(j) == -1 ||
-                  num_diffs < num_diffs_list1[match_list2->at(j)]) {
-                num_diffs_list1[i] = num_diffs;
-                match = true;
-              }
-            }
-          }
-        }
-
-        if (match) {
-          matched_j = j;
-          if (!is_treated_as_smart_set || num_diffs_list1[i] == 0) {
-            break;
-          }
-        }
-      }
-
-      match = (matched_j != -1);
-      if (match) {
-        if (is_treated_as_smart_set && match_list2->at(matched_j) != -1) {
-          // This is to revert the previously matched index in list2.
-          match_list1->at(match_list2->at(matched_j)) = -1;
-          match = false;
-        }
-        match_list1->at(i) = matched_j;
-        match_list2->at(matched_j) = i;
-      }
-      if (!match && reporter == nullptr) return false;
-      success = success && match;
-    }
-  }
-
-  if (IsTreatedAsSmartList(repeated_field)) {
-    match_indices_for_smart_list_callback_(match_list1, match_list2);
-  }
-
-  reporter_ = reporter;
-
-  return success;
-}
-
-FieldComparator::ComparisonResult MessageDifferencer::GetFieldComparisonResult(
-    const Message& message1, const Message& message2,
-    const FieldDescriptor* field, int index1, int index2,
-    const FieldContext* field_context) {
-  FieldComparator* comparator = field_comparator_kind_ == kFCBase
-                                    ? field_comparator_.base
-                                    : field_comparator_.default_impl;
-  return comparator->Compare(message1, message2, field, index1, index2,
-                             field_context);
-}
-
-// ===========================================================================
-
-MessageDifferencer::Reporter::Reporter() {}
-MessageDifferencer::Reporter::~Reporter() {}
-
-// ===========================================================================
-
-MessageDifferencer::MapKeyComparator::MapKeyComparator() {}
-MessageDifferencer::MapKeyComparator::~MapKeyComparator() {}
-
-// ===========================================================================
-
-MessageDifferencer::IgnoreCriteria::IgnoreCriteria() {}
-MessageDifferencer::IgnoreCriteria::~IgnoreCriteria() {}
-
-// ===========================================================================
-
-// Note that the printer's delimiter is not used, because if we are given a
-// printer, we don't know its delimiter.
-MessageDifferencer::StreamReporter::StreamReporter(
-    io::ZeroCopyOutputStream* output)
-    : printer_(new io::Printer(output, '$')),
-      delete_printer_(true),
-      report_modified_aggregates_(false),
-      message1_(nullptr),
-      message2_(nullptr) {}
-
-MessageDifferencer::StreamReporter::StreamReporter(io::Printer* printer)
-    : printer_(printer),
-      delete_printer_(false),
-      report_modified_aggregates_(false),
-      message1_(nullptr),
-      message2_(nullptr) {}
-
-MessageDifferencer::StreamReporter::~StreamReporter() {
-  if (delete_printer_) delete printer_;
-}
-
-void MessageDifferencer::StreamReporter::PrintPath(
-    const std::vector<SpecificField>& field_path, bool left_side) {
-  for (size_t i = 0; i < field_path.size(); ++i) {
-    SpecificField specific_field = field_path[i];
-
-    if (specific_field.field != nullptr &&
-        specific_field.field->name() == "value") {
-      // check to see if this the value label of a map value.  If so, skip it
-      // because it isn't meaningful
-      if (i > 0 && field_path[i - 1].field->is_map()) {
-        continue;
-      }
-    }
-    if (i > 0) {
-      printer_->Print(".");
-    }
-    if (specific_field.field != NULL) {
-      if (specific_field.field->is_extension()) {
-        printer_->Print("($name$)", "name", specific_field.field->full_name());
-      } else {
-        printer_->PrintRaw(specific_field.field->name());
-      }
-
-      if (specific_field.field->is_map()) {
-        PrintMapKey(left_side, specific_field);
-        continue;
-      }
-    } else {
-      printer_->PrintRaw(StrCat(specific_field.unknown_field_number));
-    }
-    if (left_side && specific_field.index >= 0) {
-      printer_->Print("[$name$]", "name", StrCat(specific_field.index));
-    }
-    if (!left_side && specific_field.new_index >= 0) {
-      printer_->Print("[$name$]", "name",
-                      StrCat(specific_field.new_index));
-    }
-  }
-}
-
-
-void MessageDifferencer::StreamReporter::PrintValue(
-    const Message& message, const std::vector<SpecificField>& field_path,
-    bool left_side) {
-  const SpecificField& specific_field = field_path.back();
-  const FieldDescriptor* field = specific_field.field;
-  if (field != NULL) {
-    std::string output;
-    int index = left_side ? specific_field.index : specific_field.new_index;
-    if (field->cpp_type() == FieldDescriptor::CPPTYPE_MESSAGE) {
-      const Reflection* reflection = message.GetReflection();
-      const Message& field_message =
-          field->is_repeated()
-              ? reflection->GetRepeatedMessage(message, field, index)
-              : reflection->GetMessage(message, field);
-      const FieldDescriptor* fd = nullptr;
-
-      if (field->is_map() && message1_ != nullptr && message2_ != nullptr) {
-        fd = field_message.GetDescriptor()->field(1);
-        if (fd->cpp_type() == FieldDescriptor::CPPTYPE_MESSAGE) {
-          output = PrintShortTextFormat(
-              field_message.GetReflection()->GetMessage(field_message, fd));
-        } else {
-          TextFormat::PrintFieldValueToString(field_message, fd, -1, &output);
-        }
-      } else {
-        output = PrintShortTextFormat(field_message);
-      }
-      if (output.empty()) {
-        printer_->Print("{ }");
-      } else {
-        if ((fd != nullptr) &&
-            (fd->cpp_type() != FieldDescriptor::CPPTYPE_MESSAGE)) {
-          printer_->PrintRaw(output);
-        } else {
-          printer_->Print("{ $name$ }", "name", output);
-        }
-      }
-    } else {
-      TextFormat::PrintFieldValueToString(message, field, index, &output);
-      printer_->PrintRaw(output);
-    }
-  } else {
-    const UnknownFieldSet* unknown_fields =
-        (left_side ? specific_field.unknown_field_set1
-                   : specific_field.unknown_field_set2);
-    const UnknownField* unknown_field =
-        &unknown_fields->field(left_side ? specific_field.unknown_field_index1
-                                         : specific_field.unknown_field_index2);
-    PrintUnknownFieldValue(unknown_field);
-  }
-}
-
-void MessageDifferencer::StreamReporter::PrintUnknownFieldValue(
-    const UnknownField* unknown_field) {
-  GOOGLE_CHECK(unknown_field != NULL) << " Cannot print NULL unknown_field.";
-
-  std::string output;
-  switch (unknown_field->type()) {
-    case UnknownField::TYPE_VARINT:
-      output = StrCat(unknown_field->varint());
-      break;
-    case UnknownField::TYPE_FIXED32:
-      output = StrCat(
-          "0x", strings::Hex(unknown_field->fixed32(), strings::ZERO_PAD_8));
-      break;
-    case UnknownField::TYPE_FIXED64:
-      output = StrCat(
-          "0x", strings::Hex(unknown_field->fixed64(), strings::ZERO_PAD_16));
-      break;
-    case UnknownField::TYPE_LENGTH_DELIMITED:
-      output = StringPrintf(
-          "\"%s\"", CEscape(unknown_field->length_delimited()).c_str());
-      break;
-    case UnknownField::TYPE_GROUP:
-      // TODO(kenton):  Print the contents of the group like we do for
-      //   messages.  Requires an equivalent of ShortDebugString() for
-      //   UnknownFieldSet.
-      output = "{ ... }";
-      break;
-  }
-  printer_->PrintRaw(output);
-}
-
-void MessageDifferencer::StreamReporter::Print(const std::string& str) {
-  printer_->Print(str.c_str());
-}
-
-void MessageDifferencer::StreamReporter::PrintMapKey(
-    bool left_side, const SpecificField& specific_field) {
-  if (message1_ == nullptr || message2_ == nullptr) {
-    GOOGLE_LOG(INFO) << "PrintPath cannot log map keys; "
-                 "use SetMessages to provide the messages "
-                 "being compared prior to any processing.";
-    return;
-  }
-
-  const Message* found_message =
-      left_side ? specific_field.map_entry1 : specific_field.map_entry2;
-  std::string key_string = "";
-  if (found_message != nullptr) {
-    // NB: the map key is always the first field
-    const FieldDescriptor* fd = found_message->GetDescriptor()->field(0);
-    if (fd->cpp_type() == FieldDescriptor::CPPTYPE_STRING) {
-      // Not using PrintFieldValueToString for strings to avoid extra
-      // characters
-      key_string = found_message->GetReflection()->GetString(
-          *found_message, found_message->GetDescriptor()->field(0));
-    } else {
-      TextFormat::PrintFieldValueToString(*found_message, fd, -1, &key_string);
-    }
-    if (key_string.empty()) {
-      key_string = "''";
-    }
-    printer_->PrintRaw(StrCat("[", key_string, "]"));
-  }
-}
-
-void MessageDifferencer::StreamReporter::ReportAdded(
-    const Message& /*message1*/, const Message& message2,
-    const std::vector<SpecificField>& field_path) {
-  printer_->Print("added: ");
-  PrintPath(field_path, false);
-  printer_->Print(": ");
-  PrintValue(message2, field_path, false);
-  printer_->Print("\n");  // Print for newlines.
-}
-
-void MessageDifferencer::StreamReporter::ReportDeleted(
-    const Message& message1, const Message& /*message2*/,
-    const std::vector<SpecificField>& field_path) {
-  printer_->Print("deleted: ");
-  PrintPath(field_path, true);
-  printer_->Print(": ");
-  PrintValue(message1, field_path, true);
-  printer_->Print("\n");  // Print for newlines
-}
-
-void MessageDifferencer::StreamReporter::ReportModified(
-    const Message& message1, const Message& message2,
-    const std::vector<SpecificField>& field_path) {
-  if (!report_modified_aggregates_ && field_path.back().field == NULL) {
-    if (field_path.back().unknown_field_type == UnknownField::TYPE_GROUP) {
-      // Any changes to the subfields have already been printed.
-      return;
-    }
-  } else if (!report_modified_aggregates_) {
-    if (field_path.back().field->cpp_type() ==
-        FieldDescriptor::CPPTYPE_MESSAGE) {
-      // Any changes to the subfields have already been printed.
-      return;
-    }
-  }
-
-  printer_->Print("modified: ");
-  PrintPath(field_path, true);
-  if (CheckPathChanged(field_path)) {
-    printer_->Print(" -> ");
-    PrintPath(field_path, false);
-  }
-  printer_->Print(": ");
-  PrintValue(message1, field_path, true);
-  printer_->Print(" -> ");
-  PrintValue(message2, field_path, false);
-  printer_->Print("\n");  // Print for newlines.
-}
-
-void MessageDifferencer::StreamReporter::ReportMoved(
-    const Message& message1, const Message& /*message2*/,
-    const std::vector<SpecificField>& field_path) {
-  printer_->Print("moved: ");
-  PrintPath(field_path, true);
-  printer_->Print(" -> ");
-  PrintPath(field_path, false);
-  printer_->Print(" : ");
-  PrintValue(message1, field_path, true);
-  printer_->Print("\n");  // Print for newlines.
-}
-
-void MessageDifferencer::StreamReporter::ReportMatched(
-    const Message& message1, const Message& /*message2*/,
-    const std::vector<SpecificField>& field_path) {
-  printer_->Print("matched: ");
-  PrintPath(field_path, true);
-  if (CheckPathChanged(field_path)) {
-    printer_->Print(" -> ");
-    PrintPath(field_path, false);
-  }
-  printer_->Print(" : ");
-  PrintValue(message1, field_path, true);
-  printer_->Print("\n");  // Print for newlines.
-}
-
-void MessageDifferencer::StreamReporter::ReportIgnored(
-    const Message& /*message1*/, const Message& /*message2*/,
-    const std::vector<SpecificField>& field_path) {
-  printer_->Print("ignored: ");
-  PrintPath(field_path, true);
-  if (CheckPathChanged(field_path)) {
-    printer_->Print(" -> ");
-    PrintPath(field_path, false);
-  }
-  printer_->Print("\n");  // Print for newlines.
-}
-
-void MessageDifferencer::StreamReporter::SetMessages(const Message& message1,
-                                                     const Message& message2) {
-  message1_ = &message1;
-  message2_ = &message2;
-}
-
-void MessageDifferencer::StreamReporter::ReportUnknownFieldIgnored(
-    const Message& /*message1*/, const Message& /*message2*/,
-    const std::vector<SpecificField>& field_path) {
-  printer_->Print("ignored: ");
-  PrintPath(field_path, true);
-  if (CheckPathChanged(field_path)) {
-    printer_->Print(" -> ");
-    PrintPath(field_path, false);
-  }
-  printer_->Print("\n");  // Print for newlines.
-}
-
-MessageDifferencer::MapKeyComparator*
-MessageDifferencer::CreateMultipleFieldsMapKeyComparator(
-    const std::vector<std::vector<const FieldDescriptor*> >& key_field_paths) {
-  return new MultipleFieldsMapKeyComparator(this, key_field_paths);
-}
-
-}  // namespace util
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/util/message_differencer.h b/libs/protobuf/src/google/protobuf/util/message_differencer.h
deleted file mode 100644
index f63cd54..0000000
--- a/libs/protobuf/src/google/protobuf/util/message_differencer.h
+++ /dev/null
@@ -1,980 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: jschorr@google.com (Joseph Schorr)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-//
-// This file defines static methods and classes for comparing Protocol
-// Messages.
-//
-// Aug. 2008: Added Unknown Fields Comparison for messages.
-// Aug. 2009: Added different options to compare repeated fields.
-// Apr. 2010: Moved field comparison to FieldComparator
-// Sep. 2020: Added option to output map keys in path
-
-#ifndef GOOGLE_PROTOBUF_UTIL_MESSAGE_DIFFERENCER_H__
-#define GOOGLE_PROTOBUF_UTIL_MESSAGE_DIFFERENCER_H__
-
-
-#include <functional>
-#include <map>
-#include <memory>
-#include <set>
-#include <string>
-#include <vector>
-
-#include <google/protobuf/descriptor.h>  // FieldDescriptor
-#include <google/protobuf/message.h>     // Message
-#include <google/protobuf/unknown_field_set.h>
-#include <google/protobuf/util/field_comparator.h>
-
-// Always include as last one, otherwise it can break compilation
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-
-class DynamicMessageFactory;
-class FieldDescriptor;
-
-namespace io {
-class ZeroCopyOutputStream;
-class Printer;
-}  // namespace io
-
-namespace util {
-
-class DefaultFieldComparator;
-class FieldContext;  // declared below MessageDifferencer
-
-// Defines a collection of field descriptors.
-// In case of internal google codebase we are using absl::FixedArray instead
-// of vector. It significantly speeds up proto comparison (by ~30%) by
-// reducing the number of malloc/free operations
-typedef std::vector<const FieldDescriptor*> FieldDescriptorArray;
-
-// A basic differencer that can be used to determine
-// the differences between two specified Protocol Messages. If any differences
-// are found, the Compare method will return false, and any differencer reporter
-// specified via ReportDifferencesTo will have its reporting methods called (see
-// below for implementation of the report). Based off of the original
-// ProtocolDifferencer implementation in //net/proto/protocol-differencer.h
-// (Thanks Todd!).
-//
-// MessageDifferencer REQUIRES that compared messages be the same type, defined
-// as messages that share the same descriptor.  If not, the behavior of this
-// class is undefined.
-//
-// People disagree on what MessageDifferencer should do when asked to compare
-// messages with different descriptors.  Some people think it should always
-// return false.  Others expect it to try to look for similar fields and
-// compare them anyway -- especially if the descriptors happen to be identical.
-// If we chose either of these behaviors, some set of people would find it
-// surprising, and could end up writing code expecting the other behavior
-// without realizing their error.  Therefore, we forbid that usage.
-//
-// This class is implemented based on the proto2 reflection. The performance
-// should be good enough for normal usages. However, for places where the
-// performance is extremely sensitive, there are several alternatives:
-// - Comparing serialized string
-// Downside: false negatives (there are messages that are the same but their
-// serialized strings are different).
-// - Equals code generator by compiler plugin (net/proto2/contrib/equals_plugin)
-// Downside: more generated code; maintenance overhead for the additional rule
-// (must be in sync with the original proto_library).
-//
-// Note on handling of google.protobuf.Any: MessageDifferencer automatically
-// unpacks Any::value into a Message and compares its individual fields.
-// Messages encoded in a repeated Any cannot be compared using TreatAsMap.
-//
-// Note on thread-safety: MessageDifferencer is *not* thread-safe. You need to
-// guard it with a lock to use the same MessageDifferencer instance from
-// multiple threads. Note that it's fine to call static comparison methods
-// (like MessageDifferencer::Equals) concurrently, but it's not recommended for
-// performance critical code as it leads to extra allocations.
-class PROTOBUF_EXPORT MessageDifferencer {
- public:
-  // Determines whether the supplied messages are equal. Equality is defined as
-  // all fields within the two messages being set to the same value. Primitive
-  // fields and strings are compared by value while embedded messages/groups
-  // are compared as if via a recursive call. Use Compare() with IgnoreField()
-  // if some fields should be ignored in the comparison. Use Compare() with
-  // TreatAsSet() if there are repeated fields where ordering does not matter.
-  //
-  // This method REQUIRES that the two messages have the same
-  // Descriptor (message1.GetDescriptor() == message2.GetDescriptor()).
-  static bool Equals(const Message& message1, const Message& message2);
-
-  // Determines whether the supplied messages are equivalent. Equivalency is
-  // defined as all fields within the two messages having the same value. This
-  // differs from the Equals method above in that fields with default values
-  // are considered set to said value automatically. For details on how default
-  // values are defined for each field type, see:
-  // https://developers.google.com/protocol-buffers/docs/proto?csw=1#optional.
-  // Also, Equivalent() ignores unknown fields. Use IgnoreField() and Compare()
-  // if some fields should be ignored in the comparison.
-  //
-  // This method REQUIRES that the two messages have the same
-  // Descriptor (message1.GetDescriptor() == message2.GetDescriptor()).
-  static bool Equivalent(const Message& message1, const Message& message2);
-
-  // Determines whether the supplied messages are approximately equal.
-  // Approximate equality is defined as all fields within the two messages
-  // being approximately equal.  Primitive (non-float) fields and strings are
-  // compared by value, floats are compared using MathUtil::AlmostEquals() and
-  // embedded messages/groups are compared as if via a recursive call. Use
-  // IgnoreField() and Compare() if some fields should be ignored in the
-  // comparison.
-  //
-  // This method REQUIRES that the two messages have the same
-  // Descriptor (message1.GetDescriptor() == message2.GetDescriptor()).
-  static bool ApproximatelyEquals(const Message& message1,
-                                  const Message& message2);
-
-  // Determines whether the supplied messages are approximately equivalent.
-  // Approximate equivalency is defined as all fields within the two messages
-  // being approximately equivalent. As in
-  // MessageDifferencer::ApproximatelyEquals, primitive (non-float) fields and
-  // strings are compared by value, floats are compared using
-  // MathUtil::AlmostEquals() and embedded messages/groups are compared as if
-  // via a recursive call. However, fields with default values are considered
-  // set to said value, as per MessageDiffencer::Equivalent. Use IgnoreField()
-  // and Compare() if some fields should be ignored in the comparison.
-  //
-  // This method REQUIRES that the two messages have the same
-  // Descriptor (message1.GetDescriptor() == message2.GetDescriptor()).
-  static bool ApproximatelyEquivalent(const Message& message1,
-                                      const Message& message2);
-
-  // Identifies an individual field in a message instance.  Used for field_path,
-  // below.
-  struct SpecificField {
-    // For known fields, "field" is filled in and "unknown_field_number" is -1.
-    // For unknown fields, "field" is NULL, "unknown_field_number" is the field
-    // number, and "unknown_field_type" is its type.
-    const FieldDescriptor* field = nullptr;
-    int unknown_field_number = -1;
-    UnknownField::Type unknown_field_type = UnknownField::Type::TYPE_VARINT;
-
-    // If this a repeated field, "index" is the index within it.  For unknown
-    // fields, this is the index of the field among all unknown fields of the
-    // same field number and type.
-    int index = -1;
-
-    // If "field" is a repeated field which is being treated as a map or
-    // a set (see TreatAsMap() and TreatAsSet(), below), new_index indicates
-    // the index the position to which the element has moved.  If the element
-    // has not moved, "new_index" will have the same value as "index".
-    int new_index = -1;
-
-    // If "field" is a map field, point to the map entry.
-    const Message* map_entry1 = nullptr;
-    const Message* map_entry2 = nullptr;
-
-    // For unknown fields, these are the pointers to the UnknownFieldSet
-    // containing the unknown fields. In certain cases (e.g. proto1's
-    // MessageSet, or nested groups of unknown fields), these may differ from
-    // the messages' internal UnknownFieldSets.
-    const UnknownFieldSet* unknown_field_set1 = nullptr;
-    const UnknownFieldSet* unknown_field_set2 = nullptr;
-
-    // For unknown fields, these are the index of the field within the
-    // UnknownFieldSets. One or the other will be -1 when
-    // reporting an addition or deletion.
-    int unknown_field_index1 = -1;
-    int unknown_field_index2 = -1;
-  };
-
-  // Abstract base class from which all MessageDifferencer
-  // reporters derive. The five Report* methods below will be called when
-  // a field has been added, deleted, modified, moved, or matched. The third
-  // argument is a vector of FieldDescriptor pointers which describes the chain
-  // of fields that was taken to find the current field. For example, for a
-  // field found in an embedded message, the vector will contain two
-  // FieldDescriptors. The first will be the field of the embedded message
-  // itself and the second will be the actual field in the embedded message
-  // that was added/deleted/modified.
-  // Fields will be reported in PostTraversalOrder.
-  // For example, given following proto, if both baz and mooo are changed.
-  // foo {
-  //   bar {
-  //     baz: 1
-  //     mooo: 2
-  //   }
-  // }
-  // ReportModified will be invoked with following order:
-  // 1. foo.bar.baz or foo.bar.mooo
-  // 2. foo.bar.mooo or foo.bar.baz
-  // 2. foo.bar
-  // 3. foo
-  class PROTOBUF_EXPORT Reporter {
-   public:
-    Reporter();
-    virtual ~Reporter();
-
-    // Reports that a field has been added into Message2.
-    virtual void ReportAdded(const Message& message1, const Message& message2,
-                             const std::vector<SpecificField>& field_path) = 0;
-
-    // Reports that a field has been deleted from Message1.
-    virtual void ReportDeleted(
-        const Message& message1, const Message& message2,
-        const std::vector<SpecificField>& field_path) = 0;
-
-    // Reports that the value of a field has been modified.
-    virtual void ReportModified(
-        const Message& message1, const Message& message2,
-        const std::vector<SpecificField>& field_path) = 0;
-
-    // Reports that a repeated field has been moved to another location.  This
-    // only applies when using TreatAsSet or TreatAsMap()  -- see below. Also
-    // note that for any given field, ReportModified and ReportMoved are
-    // mutually exclusive. If a field has been both moved and modified, then
-    // only ReportModified will be called.
-    virtual void ReportMoved(
-        const Message& /* message1 */, const Message& /* message2 */,
-        const std::vector<SpecificField>& /* field_path */) {}
-
-    // Reports that two fields match. Useful for doing side-by-side diffs.
-    // This function is mutually exclusive with ReportModified and ReportMoved.
-    // Note that you must call set_report_matches(true) before calling Compare
-    // to make use of this function.
-    virtual void ReportMatched(
-        const Message& /* message1 */, const Message& /* message2 */,
-        const std::vector<SpecificField>& /* field_path */) {}
-
-    // Reports that two fields would have been compared, but the
-    // comparison has been skipped because the field was marked as
-    // 'ignored' using IgnoreField().  This function is mutually
-    // exclusive with all the other Report() functions.
-    //
-    // The contract of ReportIgnored is slightly different than the
-    // other Report() functions, in that |field_path.back().index| is
-    // always equal to -1, even if the last field is repeated. This is
-    // because while the other Report() functions indicate where in a
-    // repeated field the action (Addition, Deletion, etc...)
-    // happened, when a repeated field is 'ignored', the differencer
-    // simply calls ReportIgnored on the repeated field as a whole and
-    // moves on without looking at its individual elements.
-    //
-    // Furthermore, ReportIgnored() does not indicate whether the
-    // fields were in fact equal or not, as Compare() does not inspect
-    // these fields at all. It is up to the Reporter to decide whether
-    // the fields are equal or not (perhaps with a second call to
-    // Compare()), if it cares.
-    virtual void ReportIgnored(
-        const Message& /* message1 */, const Message& /* message2 */,
-        const std::vector<SpecificField>& /* field_path */) {}
-
-    // Report that an unknown field is ignored. (see comment above).
-    // Note this is a different function since the last SpecificField in field
-    // path has a null field.  This could break existing Reporter.
-    virtual void ReportUnknownFieldIgnored(
-        const Message& /* message1 */, const Message& /* message2 */,
-        const std::vector<SpecificField>& /* field_path */) {}
-
-   private:
-    GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(Reporter);
-  };
-
-  // MapKeyComparator is used to determine if two elements have the same key
-  // when comparing elements of a repeated field as a map.
-  class PROTOBUF_EXPORT MapKeyComparator {
-   public:
-    MapKeyComparator();
-    virtual ~MapKeyComparator();
-
-    virtual bool IsMatch(
-        const Message& /* message1 */, const Message& /* message2 */,
-        const std::vector<SpecificField>& /* parent_fields */) const {
-      GOOGLE_CHECK(false) << "IsMatch() is not implemented.";
-      return false;
-    }
-
-   private:
-    GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(MapKeyComparator);
-  };
-
-  // Abstract base class from which all IgnoreCriteria derive.
-  // By adding IgnoreCriteria more complex ignore logic can be implemented.
-  // IgnoreCriteria are registered with AddIgnoreCriteria. For each compared
-  // field IsIgnored is called on each added IgnoreCriteria until one returns
-  // true or all return false.
-  // IsIgnored is called for fields where at least one side has a value.
-  class PROTOBUF_EXPORT IgnoreCriteria {
-   public:
-    IgnoreCriteria();
-    virtual ~IgnoreCriteria();
-
-    // Returns true if the field should be ignored.
-    virtual bool IsIgnored(
-        const Message& /* message1 */, const Message& /* message2 */,
-        const FieldDescriptor* /* field */,
-        const std::vector<SpecificField>& /* parent_fields */) = 0;
-
-    // Returns true if the unknown field should be ignored.
-    // Note: This will be called for unknown fields as well in which case
-    //       field.field will be null.
-    virtual bool IsUnknownFieldIgnored(
-        const Message& /* message1 */, const Message& /* message2 */,
-        const SpecificField& /* field */,
-        const std::vector<SpecificField>& /* parent_fields */) {
-      return false;
-    }
-  };
-
-  // To add a Reporter, construct default here, then use ReportDifferencesTo or
-  // ReportDifferencesToString.
-  explicit MessageDifferencer();
-
-  ~MessageDifferencer();
-
-  enum MessageFieldComparison {
-    EQUAL,       // Fields must be present in both messages
-                 // for the messages to be considered the same.
-    EQUIVALENT,  // Fields with default values are considered set
-                 // for comparison purposes even if not explicitly
-                 // set in the messages themselves.  Unknown fields
-                 // are ignored.
-  };
-
-  enum Scope {
-    FULL,    // All fields of both messages are considered in the comparison.
-    PARTIAL  // Only fields present in the first message are considered; fields
-             // set only in the second message will be skipped during
-             // comparison.
-  };
-
-  // DEPRECATED. Use FieldComparator::FloatComparison instead.
-  enum FloatComparison {
-    EXACT,       // Floats and doubles are compared exactly.
-    APPROXIMATE  // Floats and doubles are compared using the
-                 // MathUtil::AlmostEquals method.
-  };
-
-  enum RepeatedFieldComparison {
-    AS_LIST,  // Repeated fields are compared in order.  Differing values at
-              // the same index are reported using ReportModified().  If the
-              // repeated fields have different numbers of elements, the
-              // unpaired elements are reported using ReportAdded() or
-              // ReportDeleted().
-    AS_SET,   // Treat all the repeated fields as sets.
-              // See TreatAsSet(), as below.
-    AS_SMART_LIST,  // Similar to AS_SET, but preserve the order and find the
-                    // longest matching sequence from the first matching
-                    // element. To use an optimal solution, call
-                    // SetMatchIndicesForSmartListCallback() to pass it in.
-    AS_SMART_SET,   // Similar to AS_SET, but match elements with fewest diffs.
-  };
-
-  // The elements of the given repeated field will be treated as a set for
-  // diffing purposes, so different orderings of the same elements will be
-  // considered equal.  Elements which are present on both sides of the
-  // comparison but which have changed position will be reported with
-  // ReportMoved().  Elements which only exist on one side or the other are
-  // reported with ReportAdded() and ReportDeleted() regardless of their
-  // positions.  ReportModified() is never used for this repeated field.  If
-  // the only differences between the compared messages is that some fields
-  // have been moved, then the comparison returns true.
-  //
-  // Note that despite the name of this method, this is really
-  // comparison as multisets: if one side of the comparison has a duplicate
-  // in the repeated field but the other side doesn't, this will count as
-  // a mismatch.
-  //
-  // If the scope of comparison is set to PARTIAL, then in addition to what's
-  // above, extra values added to repeated fields of the second message will
-  // not cause the comparison to fail.
-  //
-  // Note that set comparison is currently O(k * n^2) (where n is the total
-  // number of elements, and k is the average size of each element). In theory
-  // it could be made O(n * k) with a more complex hashing implementation. Feel
-  // free to contribute one if the current implementation is too slow for you.
-  // If partial matching is also enabled, the time complexity will be O(k * n^2
-  // + n^3) in which n^3 is the time complexity of the maximum matching
-  // algorithm.
-  //
-  // REQUIRES: field->is_repeated() and field not registered with TreatAsMap*
-  void TreatAsSet(const FieldDescriptor* field);
-  void TreatAsSmartSet(const FieldDescriptor* field);
-
-  // The elements of the given repeated field will be treated as a list for
-  // diffing purposes, so different orderings of the same elements will NOT be
-  // considered equal.
-  //
-  // REQUIRES: field->is_repeated() and field not registered with TreatAsMap*
-  void TreatAsList(const FieldDescriptor* field);
-  // Note that the complexity is similar to treating as SET.
-  void TreatAsSmartList(const FieldDescriptor* field);
-
-  // The elements of the given repeated field will be treated as a map for
-  // diffing purposes, with |key| being the map key.  Thus, elements with the
-  // same key will be compared even if they do not appear at the same index.
-  // Differences are reported similarly to TreatAsSet(), except that
-  // ReportModified() is used to report elements with the same key but
-  // different values.  Note that if an element is both moved and modified,
-  // only ReportModified() will be called.  As with TreatAsSet, if the only
-  // differences between the compared messages is that some fields have been
-  // moved, then the comparison returns true. See TreatAsSet for notes on
-  // performance.
-  //
-  // REQUIRES:  field->is_repeated()
-  // REQUIRES:  field->cpp_type() == FieldDescriptor::CPPTYPE_MESSAGE
-  // REQUIRES:  key->containing_type() == field->message_type()
-  void TreatAsMap(const FieldDescriptor* field, const FieldDescriptor* key);
-  // Same as TreatAsMap except that this method will use multiple fields as
-  // the key in comparison. All specified fields in 'key_fields' should be
-  // present in the compared elements. Two elements will be treated as having
-  // the same key iff they have the same value for every specified field. There
-  // are two steps in the comparison process. The first one is key matching.
-  // Every element from one message will be compared to every element from
-  // the other message. Only fields in 'key_fields' are compared in this step
-  // to decide if two elements have the same key. The second step is value
-  // comparison. Those pairs of elements with the same key (with equal value
-  // for every field in 'key_fields') will be compared in this step.
-  // Time complexity of the first step is O(s * m * n ^ 2) where s is the
-  // average size of the fields specified in 'key_fields', m is the number of
-  // fields in 'key_fields' and n is the number of elements. If partial
-  // matching is enabled, an extra O(n^3) will be incured by the maximum
-  // matching algorithm. The second step is O(k * n) where k is the average
-  // size of each element.
-  void TreatAsMapWithMultipleFieldsAsKey(
-      const FieldDescriptor* field,
-      const std::vector<const FieldDescriptor*>& key_fields);
-  // Same as TreatAsMapWithMultipleFieldsAsKey, except that each of the field
-  // do not necessarily need to be a direct subfield. Each element in
-  // key_field_paths indicate a path from the message being compared, listing
-  // successive subfield to reach the key field.
-  //
-  // REQUIRES:
-  //   for key_field_path in key_field_paths:
-  //     key_field_path[0]->containing_type() == field->message_type()
-  //     for i in [0, key_field_path.size() - 1):
-  //       key_field_path[i+1]->containing_type() ==
-  //           key_field_path[i]->message_type()
-  //       key_field_path[i]->cpp_type() == FieldDescriptor::CPPTYPE_MESSAGE
-  //       !key_field_path[i]->is_repeated()
-  void TreatAsMapWithMultipleFieldPathsAsKey(
-      const FieldDescriptor* field,
-      const std::vector<std::vector<const FieldDescriptor*> >& key_field_paths);
-
-  // Uses a custom MapKeyComparator to determine if two elements have the same
-  // key when comparing a repeated field as a map.
-  // The caller is responsible to delete the key_comparator.
-  // This method varies from TreatAsMapWithMultipleFieldsAsKey only in the
-  // first key matching step. Rather than comparing some specified fields, it
-  // will invoke the IsMatch method of the given 'key_comparator' to decide if
-  // two elements have the same key.
-  void TreatAsMapUsingKeyComparator(const FieldDescriptor* field,
-                                    const MapKeyComparator* key_comparator);
-
-  // Initiates and returns a new instance of MultipleFieldsMapKeyComparator.
-  MapKeyComparator* CreateMultipleFieldsMapKeyComparator(
-      const std::vector<std::vector<const FieldDescriptor*> >& key_field_paths);
-
-  // Add a custom ignore criteria that is evaluated in addition to the
-  // ignored fields added with IgnoreField.
-  // Takes ownership of ignore_criteria.
-  void AddIgnoreCriteria(IgnoreCriteria* ignore_criteria);
-
-  // Indicates that any field with the given descriptor should be
-  // ignored for the purposes of comparing two messages. This applies
-  // to fields nested in the message structure as well as top level
-  // ones. When the MessageDifferencer encounters an ignored field,
-  // ReportIgnored is called on the reporter, if one is specified.
-  //
-  // The only place where the field's 'ignored' status is not applied is when
-  // it is being used as a key in a field passed to TreatAsMap or is one of
-  // the fields passed to TreatAsMapWithMultipleFieldsAsKey.
-  // In this case it is compared in key matching but after that it's ignored
-  // in value comparison.
-  void IgnoreField(const FieldDescriptor* field);
-
-  // Sets the field comparator used to determine differences between protocol
-  // buffer fields. By default it's set to a DefaultFieldComparator instance.
-  // MessageDifferencer doesn't take ownership over the passed object.
-  // Note that this method must be called before Compare for the comparator to
-  // be used.
-  void set_field_comparator(FieldComparator* comparator);
-#ifdef PROTOBUF_FUTURE_BREAKING_CHANGES
-  void set_field_comparator(DefaultFieldComparator* comparator);
-#endif  // PROTOBUF_FUTURE_BREAKING_CHANGES
-
-  // DEPRECATED. Pass a DefaultFieldComparator instance instead.
-  // Sets the fraction and margin for the float comparison of a given field.
-  // Uses MathUtil::WithinFractionOrMargin to compare the values.
-  // NOTE: this method does nothing if differencer's field comparator has been
-  //       set to a custom object.
-  //
-  // REQUIRES: field->cpp_type == FieldDescriptor::CPPTYPE_DOUBLE or
-  //           field->cpp_type == FieldDescriptor::CPPTYPE_FLOAT
-  // REQUIRES: float_comparison_ == APPROXIMATE
-  void SetFractionAndMargin(const FieldDescriptor* field, double fraction,
-                            double margin);
-
-  // Sets the type of comparison (as defined in the MessageFieldComparison
-  // enumeration above) that is used by this differencer when determining how
-  // to compare fields in messages.
-  void set_message_field_comparison(MessageFieldComparison comparison);
-
-  // Returns the current message field comparison used in this differencer.
-  MessageFieldComparison message_field_comparison() const;
-
-  // Tells the differencer whether or not to report matches. This method must
-  // be called before Compare. The default for a new differencer is false.
-  void set_report_matches(bool report_matches) {
-    report_matches_ = report_matches;
-  }
-
-  // Tells the differencer whether or not to report moves (in a set or map
-  // repeated field). This method must be called before Compare. The default for
-  // a new differencer is true.
-  void set_report_moves(bool report_moves) { report_moves_ = report_moves; }
-
-  // Tells the differencer whether or not to report ignored values. This method
-  // must be called before Compare. The default for a new differencer is true.
-  void set_report_ignores(bool report_ignores) {
-    report_ignores_ = report_ignores;
-  }
-
-  // Sets the scope of the comparison (as defined in the Scope enumeration
-  // above) that is used by this differencer when determining which fields to
-  // compare between the messages.
-  void set_scope(Scope scope);
-
-  // Returns the current scope used by this differencer.
-  Scope scope() const;
-
-  // DEPRECATED. Pass a DefaultFieldComparator instance instead.
-  // Sets the type of comparison (as defined in the FloatComparison enumeration
-  // above) that is used by this differencer when comparing float (and double)
-  // fields in messages.
-  // NOTE: this method does nothing if differencer's field comparator has been
-  //       set to a custom object.
-  void set_float_comparison(FloatComparison comparison);
-
-  // Sets the type of comparison for repeated field (as defined in the
-  // RepeatedFieldComparison enumeration above) that is used by this
-  // differencer when compare repeated fields in messages.
-  void set_repeated_field_comparison(RepeatedFieldComparison comparison);
-
-  // Returns the current repeated field comparison used by this differencer.
-  RepeatedFieldComparison repeated_field_comparison() const;
-
-  // Compares the two specified messages, returning true if they are the same,
-  // false otherwise. If this method returns false, any changes between the
-  // two messages will be reported if a Reporter was specified via
-  // ReportDifferencesTo (see also ReportDifferencesToString).
-  //
-  // This method REQUIRES that the two messages have the same
-  // Descriptor (message1.GetDescriptor() == message2.GetDescriptor()).
-  bool Compare(const Message& message1, const Message& message2);
-
-  // Same as above, except comparing only the list of fields specified by the
-  // two vectors of FieldDescriptors.
-  bool CompareWithFields(
-      const Message& message1, const Message& message2,
-      const std::vector<const FieldDescriptor*>& message1_fields,
-      const std::vector<const FieldDescriptor*>& message2_fields);
-
-  // Automatically creates a reporter that will output the differences
-  // found (if any) to the specified output string pointer. Note that this
-  // method must be called before Compare.
-  void ReportDifferencesToString(std::string* output);
-
-  // Tells the MessageDifferencer to report differences via the specified
-  // reporter. Note that this method must be called before Compare for
-  // the reporter to be used. It is the responsibility of the caller to delete
-  // this object.
-  // If the provided pointer equals NULL, the MessageDifferencer stops reporting
-  // differences to any previously set reporters or output strings.
-  void ReportDifferencesTo(Reporter* reporter);
-
- private:
-  // Class for processing Any deserialization.  This logic is used by both the
-  // MessageDifferencer and StreamReporter classes.
-  class UnpackAnyField {
-   private:
-    std::unique_ptr<DynamicMessageFactory> dynamic_message_factory_;
-
-   public:
-    UnpackAnyField() = default;
-    ~UnpackAnyField() = default;
-    // If "any" is of type google.protobuf.Any, extract its payload using
-    // DynamicMessageFactory and store in "data".
-    bool UnpackAny(const Message& any, std::unique_ptr<Message>* data);
-  };
-
- public:
-  // An implementation of the MessageDifferencer Reporter that outputs
-  // any differences found in human-readable form to the supplied
-  // ZeroCopyOutputStream or Printer. If a printer is used, the delimiter
-  // *must* be '$'.
-  //
-  // WARNING: this reporter does not necessarily flush its output until it is
-  // destroyed. As a result, it is not safe to assume the output is valid or
-  // complete until after you destroy the reporter. For example, if you use a
-  // StreamReporter to write to a StringOutputStream, the target string may
-  // contain uninitialized data until the reporter is destroyed.
-  class PROTOBUF_EXPORT StreamReporter : public Reporter {
-   public:
-    explicit StreamReporter(io::ZeroCopyOutputStream* output);
-    explicit StreamReporter(io::Printer* printer);  // delimiter '$'
-    ~StreamReporter() override;
-
-    // When set to true, the stream reporter will also output aggregates nodes
-    // (i.e. messages and groups) whose subfields have been modified. When
-    // false, will only report the individual subfields. Defaults to false.
-    void set_report_modified_aggregates(bool report) {
-      report_modified_aggregates_ = report;
-    }
-
-    // The following are implementations of the methods described above.
-
-    void ReportAdded(const Message& message1, const Message& message2,
-                     const std::vector<SpecificField>& field_path) override;
-
-    void ReportDeleted(const Message& message1, const Message& message2,
-                       const std::vector<SpecificField>& field_path) override;
-
-    void ReportModified(const Message& message1, const Message& message2,
-                        const std::vector<SpecificField>& field_path) override;
-
-    void ReportMoved(const Message& message1, const Message& message2,
-                     const std::vector<SpecificField>& field_path) override;
-
-    void ReportMatched(const Message& message1, const Message& message2,
-                       const std::vector<SpecificField>& field_path) override;
-
-    void ReportIgnored(const Message& message1, const Message& message2,
-                       const std::vector<SpecificField>& field_path) override;
-
-    void ReportUnknownFieldIgnored(
-        const Message& message1, const Message& message2,
-        const std::vector<SpecificField>& field_path) override;
-
-    // Messages that are being compared must be provided to StreamReporter prior
-    // to processing
-    void SetMessages(const Message& message1, const Message& message2);
-
-   protected:
-    // Prints the specified path of fields to the buffer.
-    virtual void PrintPath(const std::vector<SpecificField>& field_path,
-                           bool left_side);
-
-    // Prints the value of fields to the buffer.  left_side is true if the
-    // given message is from the left side of the comparison, false if it
-    // was the right.  This is relevant only to decide whether to follow
-    // unknown_field_index1 or unknown_field_index2 when an unknown field
-    // is encountered in field_path.
-    virtual void PrintValue(const Message& message,
-                            const std::vector<SpecificField>& field_path,
-                            bool left_side);
-
-    // Prints the specified path of unknown fields to the buffer.
-    virtual void PrintUnknownFieldValue(const UnknownField* unknown_field);
-
-    // Just print a string
-    void Print(const std::string& str);
-
-   private:
-    // helper function for PrintPath that contains logic for printing maps
-    void PrintMapKey(bool left_side, const SpecificField& specific_field);
-
-    io::Printer* printer_;
-    bool delete_printer_;
-    bool report_modified_aggregates_;
-    const Message* message1_;
-    const Message* message2_;
-    MessageDifferencer::UnpackAnyField unpack_any_field_;
-    GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(StreamReporter);
-  };
-
- private:
-  friend class SimpleFieldComparator;
-
-  // A MapKeyComparator to be used in TreatAsMapUsingKeyComparator.
-  // Implementation of this class needs to do field value comparison which
-  // relies on some private methods of MessageDifferencer. That's why this
-  // class is declared as a nested class of MessageDifferencer.
-  class MultipleFieldsMapKeyComparator;
-
-  // A MapKeyComparator for use with map_entries.
-  class PROTOBUF_EXPORT MapEntryKeyComparator : public MapKeyComparator {
-   public:
-    explicit MapEntryKeyComparator(MessageDifferencer* message_differencer);
-    bool IsMatch(
-        const Message& message1, const Message& message2,
-        const std::vector<SpecificField>& parent_fields) const override;
-
-   private:
-    MessageDifferencer* message_differencer_;
-  };
-
-  // Returns true if field1's number() is less than field2's.
-  static bool FieldBefore(const FieldDescriptor* field1,
-                          const FieldDescriptor* field2);
-
-  // Retrieve all the set fields, including extensions.
-  FieldDescriptorArray RetrieveFields(const Message& message,
-                                      bool base_message);
-
-  // Combine the two lists of fields into the combined_fields output vector.
-  // All fields present in both lists will always be included in the combined
-  // list.  Fields only present in one of the lists will only appear in the
-  // combined list if the corresponding fields_scope option is set to FULL.
-  FieldDescriptorArray CombineFields(const FieldDescriptorArray& fields1,
-                                     Scope fields1_scope,
-                                     const FieldDescriptorArray& fields2,
-                                     Scope fields2_scope);
-
-  // Internal version of the Compare method which performs the actual
-  // comparison. The parent_fields vector is a vector containing field
-  // descriptors of all fields accessed to get to this comparison operation
-  // (i.e. if the current message is an embedded message, the parent_fields
-  // vector will contain the field that has this embedded message).
-  bool Compare(const Message& message1, const Message& message2,
-               std::vector<SpecificField>* parent_fields);
-
-  // Compares all the unknown fields in two messages.
-  bool CompareUnknownFields(const Message& message1, const Message& message2,
-                            const UnknownFieldSet&, const UnknownFieldSet&,
-                            std::vector<SpecificField>* parent_fields);
-
-  // Compares the specified messages for the requested field lists. The field
-  // lists are modified depending on comparison settings, and then passed to
-  // CompareWithFieldsInternal.
-  bool CompareRequestedFieldsUsingSettings(
-      const Message& message1, const Message& message2,
-      const FieldDescriptorArray& message1_fields,
-      const FieldDescriptorArray& message2_fields,
-      std::vector<SpecificField>* parent_fields);
-
-  // Compares the specified messages with the specified field lists.
-  bool CompareWithFieldsInternal(const Message& message1,
-                                 const Message& message2,
-                                 const FieldDescriptorArray& message1_fields,
-                                 const FieldDescriptorArray& message2_fields,
-                                 std::vector<SpecificField>* parent_fields);
-
-  // Compares the repeated fields, and report the error.
-  bool CompareRepeatedField(const Message& message1, const Message& message2,
-                            const FieldDescriptor* field,
-                            std::vector<SpecificField>* parent_fields);
-
-  // Compares map fields, and report the error.
-  bool CompareMapField(const Message& message1, const Message& message2,
-                       const FieldDescriptor* field,
-                       std::vector<SpecificField>* parent_fields);
-
-  // Helper for CompareRepeatedField and CompareMapField: compares and reports
-  // differences element-wise. This is the implementation for non-map fields,
-  // and can also compare map fields by using the underlying representation.
-  bool CompareRepeatedRep(const Message& message1, const Message& message2,
-                          const FieldDescriptor* field,
-                          std::vector<SpecificField>* parent_fields);
-
-  // Helper for CompareMapField: compare the map fields using map reflection
-  // instead of sync to repeated.
-  bool CompareMapFieldByMapReflection(const Message& message1,
-                                      const Message& message2,
-                                      const FieldDescriptor* field,
-                                      std::vector<SpecificField>* parent_fields,
-                                      DefaultFieldComparator* comparator);
-
-  // Shorthand for CompareFieldValueUsingParentFields with NULL parent_fields.
-  bool CompareFieldValue(const Message& message1, const Message& message2,
-                         const FieldDescriptor* field, int index1, int index2);
-
-  // Compares the specified field on the two messages, returning
-  // true if they are the same, false otherwise. For repeated fields,
-  // this method only compares the value in the specified index. This method
-  // uses Compare functions to recurse into submessages.
-  // The parent_fields vector is used in calls to a Reporter instance calls.
-  // It can be NULL, in which case the MessageDifferencer will create new
-  // list of parent messages if it needs to recursively compare the given field.
-  // To avoid confusing users you should not set it to NULL unless you modified
-  // Reporter to handle the change of parent_fields correctly.
-  bool CompareFieldValueUsingParentFields(
-      const Message& message1, const Message& message2,
-      const FieldDescriptor* field, int index1, int index2,
-      std::vector<SpecificField>* parent_fields);
-
-  // Compares the specified field on the two messages, returning comparison
-  // result, as returned by appropriate FieldComparator.
-  FieldComparator::ComparisonResult GetFieldComparisonResult(
-      const Message& message1, const Message& message2,
-      const FieldDescriptor* field, int index1, int index2,
-      const FieldContext* field_context);
-
-  // Check if the two elements in the repeated field are match to each other.
-  // if the key_comprator is NULL, this function returns true when the two
-  // elements are equal.
-  bool IsMatch(const FieldDescriptor* repeated_field,
-               const MapKeyComparator* key_comparator, const Message* message1,
-               const Message* message2,
-               const std::vector<SpecificField>& parent_fields,
-               Reporter* reporter, int index1, int index2);
-
-  // Returns true when this repeated field has been configured to be treated
-  // as a Set / SmartSet / SmartList.
-  bool IsTreatedAsSet(const FieldDescriptor* field);
-  bool IsTreatedAsSmartSet(const FieldDescriptor* field);
-
-  bool IsTreatedAsSmartList(const FieldDescriptor* field);
-  // When treating as SMART_LIST, it uses MatchIndicesPostProcessorForSmartList
-  // by default to find the longest matching sequence from the first matching
-  // element. The callback takes two vectors showing the matching indices from
-  // the other vector, where -1 means an unmatch.
-  void SetMatchIndicesForSmartListCallback(
-      std::function<void(std::vector<int>*, std::vector<int>*)> callback);
-
-  // Returns true when this repeated field is to be compared as a subset, ie.
-  // has been configured to be treated as a set or map and scope is set to
-  // PARTIAL.
-  bool IsTreatedAsSubset(const FieldDescriptor* field);
-
-  // Returns true if this field is to be ignored when this
-  // MessageDifferencer compares messages.
-  bool IsIgnored(const Message& message1, const Message& message2,
-                 const FieldDescriptor* field,
-                 const std::vector<SpecificField>& parent_fields);
-
-  // Returns true if this unknown field is to be ignored when this
-  // MessageDifferencer compares messages.
-  bool IsUnknownFieldIgnored(const Message& message1, const Message& message2,
-                             const SpecificField& field,
-                             const std::vector<SpecificField>& parent_fields);
-
-  // Returns MapKeyComparator* when this field has been configured to be treated
-  // as a map or its is_map() return true.  If not, returns NULL.
-  const MapKeyComparator* GetMapKeyComparator(
-      const FieldDescriptor* field) const;
-
-  // Attempts to match indices of a repeated field, so that the contained values
-  // match. Clears output vectors and sets their values to indices of paired
-  // messages, ie. if message1[0] matches message2[1], then match_list1[0] == 1
-  // and match_list2[1] == 0. The unmatched indices are indicated by -1.
-  // Assumes the repeated field is not treated as a simple list.
-  // This method returns false if the match failed. However, it doesn't mean
-  // that the comparison succeeds when this method returns true (you need to
-  // double-check in this case).
-  bool MatchRepeatedFieldIndices(
-      const Message& message1, const Message& message2,
-      const FieldDescriptor* repeated_field,
-      const MapKeyComparator* key_comparator,
-      const std::vector<SpecificField>& parent_fields,
-      std::vector<int>* match_list1, std::vector<int>* match_list2);
-
-  // Checks if index is equal to new_index in all the specific fields.
-  static bool CheckPathChanged(const std::vector<SpecificField>& parent_fields);
-
-  // CHECKs that the given repeated field can be compared according to
-  // new_comparison.
-  void CheckRepeatedFieldComparisons(
-      const FieldDescriptor* field,
-      const RepeatedFieldComparison& new_comparison);
-
-  // Defines a map between field descriptors and their MapKeyComparators.
-  // Used for repeated fields when they are configured as TreatAsMap.
-  typedef std::map<const FieldDescriptor*, const MapKeyComparator*>
-      FieldKeyComparatorMap;
-
-  // Defines a set to store field descriptors.  Used for repeated fields when
-  // they are configured as TreatAsSet.
-  typedef std::set<const FieldDescriptor*> FieldSet;
-  typedef std::map<const FieldDescriptor*, RepeatedFieldComparison> FieldMap;
-
-  Reporter* reporter_;
-  DefaultFieldComparator default_field_comparator_;
-  MessageFieldComparison message_field_comparison_;
-  Scope scope_;
-  RepeatedFieldComparison repeated_field_comparison_;
-
-  FieldMap repeated_field_comparisons_;
-  // Keeps track of MapKeyComparators that are created within
-  // MessageDifferencer. These MapKeyComparators should be deleted
-  // before MessageDifferencer is destroyed.
-  // When TreatAsMap or TreatAsMapWithMultipleFieldsAsKey is called, we don't
-  // store the supplied FieldDescriptors directly. Instead, a new
-  // MapKeyComparator is created for comparison purpose.
-  std::vector<MapKeyComparator*> owned_key_comparators_;
-  FieldKeyComparatorMap map_field_key_comparator_;
-  MapEntryKeyComparator map_entry_key_comparator_;
-  std::vector<IgnoreCriteria*> ignore_criteria_;
-  // Reused multiple times in RetrieveFields to avoid extra allocations
-  std::vector<const FieldDescriptor*> tmp_message_fields_;
-
-  FieldSet ignored_fields_;
-
-  union {
-    DefaultFieldComparator* default_impl;
-    FieldComparator* base;
-  } field_comparator_ = {&default_field_comparator_};
-  enum { kFCDefault, kFCBase } field_comparator_kind_ = kFCDefault;
-
-  bool report_matches_;
-  bool report_moves_;
-  bool report_ignores_;
-
-  std::string* output_string_;
-
-  // Callback to post-process the matched indices to support SMART_LIST.
-  std::function<void(std::vector<int>*, std::vector<int>*)>
-      match_indices_for_smart_list_callback_;
-
-  MessageDifferencer::UnpackAnyField unpack_any_field_;
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(MessageDifferencer);
-};
-
-// This class provides extra information to the FieldComparator::Compare
-// function.
-class PROTOBUF_EXPORT FieldContext {
- public:
-  explicit FieldContext(
-      std::vector<MessageDifferencer::SpecificField>* parent_fields)
-      : parent_fields_(parent_fields) {}
-
-  std::vector<MessageDifferencer::SpecificField>* parent_fields() const {
-    return parent_fields_;
-  }
-
- private:
-  std::vector<MessageDifferencer::SpecificField>* parent_fields_;
-};
-
-}  // namespace util
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
-
-#endif  // GOOGLE_PROTOBUF_UTIL_MESSAGE_DIFFERENCER_H__
diff --git a/libs/protobuf/src/google/protobuf/util/message_differencer_unittest.cc b/libs/protobuf/src/google/protobuf/util/message_differencer_unittest.cc
deleted file mode 100644
index f8e44df..0000000
--- a/libs/protobuf/src/google/protobuf/util/message_differencer_unittest.cc
+++ /dev/null
@@ -1,3809 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: jschorr@google.com (Joseph Schorr)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-//
-// TODO(ksroka): Move some of these tests to field_comparator_test.cc.
-
-#include <algorithm>
-#include <random>
-#include <string>
-#include <vector>
-
-#include <google/protobuf/stubs/common.h>
-
-#include <google/protobuf/stubs/strutil.h>
-
-#include <google/protobuf/stubs/logging.h>
-#include <google/protobuf/any_test.pb.h>
-#include <google/protobuf/map_test_util.h>
-#include <google/protobuf/map_unittest.pb.h>
-#include <google/protobuf/test_util.h>
-#include <google/protobuf/unittest.pb.h>
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/io/zero_copy_stream_impl.h>
-#include <google/protobuf/text_format.h>
-#include <google/protobuf/wire_format.h>
-#include <google/protobuf/util/message_differencer_unittest.pb.h>
-#include <google/protobuf/util/field_comparator.h>
-#include <google/protobuf/util/message_differencer.h>
-#include <google/protobuf/testing/googletest.h>
-#include <gtest/gtest.h>
-
-namespace google {
-namespace protobuf {
-
-namespace {
-
-
-const FieldDescriptor* GetFieldDescriptor(const Message& message,
-                                          const std::string& field_name) {
-  std::vector<std::string> field_path =
-      Split(field_name, ".", true);
-  const Descriptor* descriptor = message.GetDescriptor();
-  const FieldDescriptor* field = nullptr;
-  for (int i = 0; i < field_path.size(); i++) {
-    field = descriptor->FindFieldByName(field_path[i]);
-    descriptor = field->message_type();
-  }
-  return field;
-}
-
-void ExpectEqualsWithDifferencer(util::MessageDifferencer* differencer,
-                                 const Message& msg1, const Message& msg2) {
-  differencer->set_scope(util::MessageDifferencer::FULL);
-  EXPECT_TRUE(differencer->Compare(msg1, msg2));
-
-  differencer->set_scope(util::MessageDifferencer::PARTIAL);
-  EXPECT_TRUE(differencer->Compare(msg1, msg2));
-}
-
-TEST(MessageDifferencerTest, BasicEqualityTest) {
-  // Create the testing protos
-  unittest::TestAllTypes msg1;
-  unittest::TestAllTypes msg2;
-
-  TestUtil::SetAllFields(&msg1);
-  TestUtil::SetAllFields(&msg2);
-
-  // Compare
-  EXPECT_TRUE(util::MessageDifferencer::Equals(msg1, msg2));
-}
-
-TEST(MessageDifferencerTest, BasicInequalityTest) {
-  // Create the testing protos
-  unittest::TestAllTypes msg1;
-  unittest::TestAllTypes msg2;
-
-  TestUtil::SetAllFields(&msg1);
-  TestUtil::SetAllFields(&msg2);
-
-  msg1.set_optional_int32(-1);
-
-  // Compare
-  EXPECT_FALSE(util::MessageDifferencer::Equals(msg1, msg2));
-}
-
-TEST(MessageDifferencerTest, RepeatedFieldInequalityTest) {
-  // Create the testing protos
-  unittest::TestAllTypes msg1;
-  unittest::TestAllTypes msg2;
-
-  TestUtil::SetAllFields(&msg1);
-  TestUtil::SetAllFields(&msg2);
-
-  msg1.add_repeated_int32(-1);
-
-  // Compare
-  EXPECT_FALSE(util::MessageDifferencer::Equals(msg1, msg2));
-}
-
-TEST(MessageDifferencerTest, RepeatedFieldSetOptimizationTest) {
-  util::MessageDifferencer differencer;
-  protobuf_unittest::TestDiffMessage msg1;
-  protobuf_unittest::TestDiffMessage msg2;
-  protobuf_unittest::TestDiffMessage::Item* item1 = msg1.add_item();
-  protobuf_unittest::TestDiffMessage::Item* item2 = msg2.add_item();
-  differencer.TreatAsSet(item1->GetDescriptor()->FindFieldByName("ra"));
-  differencer.TreatAsSet(item2->GetDescriptor()->FindFieldByName("ra"));
-  for (int i = 0; i < 1000; i++) {
-    item1->add_ra(i);
-    item2->add_ra(i);
-  }
-  EXPECT_TRUE(differencer.Compare(msg1, msg2));
-  item2->add_ra(1001);
-  EXPECT_FALSE(differencer.Compare(msg1, msg2));
-  item1->add_ra(1001);
-  EXPECT_TRUE(differencer.Compare(msg1, msg2));
-  item1->add_ra(1002);
-  EXPECT_FALSE(differencer.Compare(msg1, msg2));
-}
-
-TEST(MessageDifferencerTest, MapFieldEqualityTest) {
-  // Create the testing protos
-  unittest::TestMap msg1;
-  unittest::TestMap msg2;
-
-  MapReflectionTester tester(unittest::TestMap::descriptor());
-  tester.SetMapFieldsViaReflection(&msg1);
-  tester.SetMapFieldsViaReflection(&msg2);
-  tester.SwapMapsViaReflection(&msg1);
-
-  // Compare
-  EXPECT_TRUE(util::MessageDifferencer::Equals(msg1, msg2));
-
-  // Get map entries by index will sync map to repeated field
-  MapTestUtil::GetMapEntries(msg1, 0);
-  EXPECT_TRUE(util::MessageDifferencer::Equals(msg1, msg2));
-
-  // Compare values not match
-  (*msg1.mutable_map_int32_int32())[1] = 2;
-  (*msg2.mutable_map_int32_int32())[1] = 3;
-  EXPECT_FALSE(util::MessageDifferencer::Equals(msg1, msg2));
-
-  // Compare keys not match
-  msg1.Clear();
-  msg2.Clear();
-  (*msg1.mutable_map_string_string())["1"] = "";
-  (*msg2.mutable_map_string_string())["2"] = "";
-  EXPECT_FALSE(util::MessageDifferencer::Equals(msg1, msg2));
-
-  // Compare message values not match
-  msg1.Clear();
-  msg2.Clear();
-  (*msg1.mutable_map_int32_foreign_message())[1].set_c(1);
-  (*msg2.mutable_map_int32_foreign_message())[1].set_c(2);
-  EXPECT_FALSE(util::MessageDifferencer::Equals(msg1, msg2));
-}
-
-TEST(MessageDifferencerTest, BasicPartialEqualityTest) {
-  // Create the testing protos
-  unittest::TestAllTypes msg1;
-  unittest::TestAllTypes msg2;
-
-  TestUtil::SetAllFields(&msg1);
-  TestUtil::SetAllFields(&msg2);
-
-  // Compare
-  util::MessageDifferencer differencer;
-  differencer.set_scope(util::MessageDifferencer::PARTIAL);
-  EXPECT_TRUE(differencer.Compare(msg1, msg2));
-}
-
-TEST(MessageDifferencerTest, PartialEqualityTestExtraField) {
-  // Create the testing protos
-  unittest::TestAllTypes msg1;
-  unittest::TestAllTypes msg2;
-
-  TestUtil::SetAllFields(&msg1);
-  TestUtil::SetAllFields(&msg2);
-
-  msg1.clear_optional_int32();
-
-  // Compare
-  util::MessageDifferencer differencer;
-  differencer.set_scope(util::MessageDifferencer::PARTIAL);
-  EXPECT_TRUE(differencer.Compare(msg1, msg2));
-}
-
-TEST(MessageDifferencerTest, PartialEqualityTestSkipRequiredField) {
-  // Create the testing protos
-  unittest::TestRequired msg1;
-  unittest::TestRequired msg2;
-
-  msg1.set_a(401);
-  msg2.set_a(401);
-  msg2.set_b(402);
-
-  // Compare
-  util::MessageDifferencer differencer;
-  differencer.set_scope(util::MessageDifferencer::PARTIAL);
-  EXPECT_TRUE(differencer.Compare(msg1, msg2));
-}
-
-TEST(MessageDifferencerTest, BasicPartialInequalityTest) {
-  // Create the testing protos
-  unittest::TestAllTypes msg1;
-  unittest::TestAllTypes msg2;
-
-  TestUtil::SetAllFields(&msg1);
-  TestUtil::SetAllFields(&msg2);
-
-  msg1.set_optional_int32(-1);
-
-  // Compare
-  util::MessageDifferencer differencer;
-  differencer.set_scope(util::MessageDifferencer::PARTIAL);
-  EXPECT_FALSE(differencer.Compare(msg1, msg2));
-}
-
-TEST(MessageDifferencerTest, PartialInequalityMissingFieldTest) {
-  // Create the testing protos
-  unittest::TestAllTypes msg1;
-  unittest::TestAllTypes msg2;
-
-  TestUtil::SetAllFields(&msg1);
-  TestUtil::SetAllFields(&msg2);
-
-  msg2.clear_optional_int32();
-
-  // Compare
-  util::MessageDifferencer differencer;
-  differencer.set_scope(util::MessageDifferencer::PARTIAL);
-  EXPECT_FALSE(differencer.Compare(msg1, msg2));
-}
-
-TEST(MessageDifferencerTest, RepeatedFieldPartialInequalityTest) {
-  // Create the testing protos
-  unittest::TestAllTypes msg1;
-  unittest::TestAllTypes msg2;
-
-  TestUtil::SetAllFields(&msg1);
-  TestUtil::SetAllFields(&msg2);
-
-  msg1.add_repeated_int32(-1);
-
-  // Compare
-  util::MessageDifferencer differencer;
-  differencer.set_scope(util::MessageDifferencer::PARTIAL);
-  EXPECT_FALSE(differencer.Compare(msg1, msg2));
-}
-
-TEST(MessageDifferencerTest, BasicEquivalencyTest) {
-  // Create the testing protos
-  unittest::TestAllTypes msg1;
-  unittest::TestAllTypes msg2;
-
-  TestUtil::SetAllFields(&msg1);
-  TestUtil::SetAllFields(&msg2);
-
-  // Compare
-  EXPECT_TRUE(util::MessageDifferencer::Equivalent(msg1, msg2));
-}
-
-TEST(MessageDifferencerTest, EquivalencyNotEqualTest) {
-  // Create the testing protos
-  unittest::TestAllTypes msg1;
-  unittest::TestAllTypes msg2;
-
-  TestUtil::SetAllFields(&msg1);
-  TestUtil::SetAllFields(&msg2);
-
-  msg1.clear_optional_int32();
-  msg2.set_optional_int32(0);
-
-  // Compare
-  EXPECT_FALSE(util::MessageDifferencer::Equals(msg1, msg2));
-  EXPECT_TRUE(util::MessageDifferencer::Equivalent(msg1, msg2));
-}
-
-TEST(MessageDifferencerTest, BasicInequivalencyTest) {
-  // Create the testing protos
-  unittest::TestAllTypes msg1;
-  unittest::TestAllTypes msg2;
-
-  TestUtil::SetAllFields(&msg1);
-  TestUtil::SetAllFields(&msg2);
-
-  msg1.set_optional_int32(-1);
-
-  // Compare
-  EXPECT_FALSE(util::MessageDifferencer::Equivalent(msg1, msg2));
-}
-
-TEST(MessageDifferencerTest, BasicEquivalencyNonSetTest) {
-  // Create the testing protos
-  unittest::TestAllTypes msg1;
-  unittest::TestAllTypes msg2;
-
-  // Compare
-  EXPECT_TRUE(util::MessageDifferencer::Equivalent(msg1, msg2));
-}
-
-TEST(MessageDifferencerTest, BasicInequivalencyNonSetTest) {
-  // Create the testing protos
-  unittest::TestAllTypes msg1;
-  unittest::TestAllTypes msg2;
-
-  msg1.set_optional_int32(-1);
-
-  // Compare
-  EXPECT_FALSE(util::MessageDifferencer::Equivalent(msg1, msg2));
-}
-
-TEST(MessageDifferencerTest, BasicPartialEquivalencyTest) {
-  // Create the testing protos
-  unittest::TestAllTypes msg1;
-  unittest::TestAllTypes msg2;
-
-  TestUtil::SetAllFields(&msg1);
-  TestUtil::SetAllFields(&msg2);
-
-  // Compare
-  util::MessageDifferencer differencer;
-  differencer.set_message_field_comparison(
-      util::MessageDifferencer::EQUIVALENT);
-  differencer.set_scope(util::MessageDifferencer::PARTIAL);
-  EXPECT_TRUE(differencer.Compare(msg1, msg2));
-}
-
-TEST(MessageDifferencerTest, PartialEquivalencyNotEqualTest) {
-  // Create the testing protos
-  unittest::TestAllTypes msg1;
-  unittest::TestAllTypes msg2;
-
-  TestUtil::SetAllFields(&msg1);
-  TestUtil::SetAllFields(&msg2);
-
-  msg1.set_optional_int32(0);
-  msg2.clear_optional_int32();
-
-  // Compare
-  EXPECT_FALSE(util::MessageDifferencer::Equals(msg1, msg2));
-  util::MessageDifferencer differencer;
-  differencer.set_message_field_comparison(
-      util::MessageDifferencer::EQUIVALENT);
-  differencer.set_scope(util::MessageDifferencer::PARTIAL);
-  EXPECT_TRUE(differencer.Compare(msg1, msg2));
-}
-
-TEST(MessageDifferencerTest, PartialEquivalencyTestExtraField) {
-  // Create the testing protos
-  unittest::TestAllTypes msg1;
-  unittest::TestAllTypes msg2;
-
-  TestUtil::SetAllFields(&msg1);
-  TestUtil::SetAllFields(&msg2);
-
-  msg1.clear_optional_int32();
-
-  // Compare
-  util::MessageDifferencer differencer;
-  differencer.set_message_field_comparison(
-      util::MessageDifferencer::EQUIVALENT);
-  differencer.set_scope(util::MessageDifferencer::PARTIAL);
-  EXPECT_TRUE(differencer.Compare(msg1, msg2));
-}
-
-TEST(MessageDifferencerTest, PartialEquivalencyTestSkipRequiredField) {
-  // Create the testing protos
-  unittest::TestRequired msg1;
-  unittest::TestRequired msg2;
-
-  msg1.set_a(401);
-  msg2.set_a(401);
-  msg2.set_b(402);
-
-  // Compare
-  util::MessageDifferencer differencer;
-  differencer.set_message_field_comparison(
-      util::MessageDifferencer::EQUIVALENT);
-  differencer.set_scope(util::MessageDifferencer::PARTIAL);
-  EXPECT_TRUE(differencer.Compare(msg1, msg2));
-}
-
-TEST(MessageDifferencerTest, BasicPartialInequivalencyTest) {
-  // Create the testing protos
-  unittest::TestAllTypes msg1;
-  unittest::TestAllTypes msg2;
-
-  TestUtil::SetAllFields(&msg1);
-  TestUtil::SetAllFields(&msg2);
-
-  msg1.set_optional_int32(-1);
-
-  // Compare
-  util::MessageDifferencer differencer;
-  differencer.set_message_field_comparison(
-      util::MessageDifferencer::EQUIVALENT);
-  differencer.set_scope(util::MessageDifferencer::PARTIAL);
-  EXPECT_FALSE(differencer.Compare(msg1, msg2));
-}
-
-TEST(MessageDifferencerTest, BasicPartialEquivalencyNonSetTest) {
-  // Create the testing protos
-  unittest::TestAllTypes msg1;
-  unittest::TestAllTypes msg2;
-
-  // Compare
-  util::MessageDifferencer differencer;
-  differencer.set_message_field_comparison(
-      util::MessageDifferencer::EQUIVALENT);
-  differencer.set_scope(util::MessageDifferencer::PARTIAL);
-  EXPECT_TRUE(differencer.Compare(msg1, msg2));
-}
-
-TEST(MessageDifferencerTest, BasicPartialInequivalencyNonSetTest) {
-  // Create the testing protos
-  unittest::TestAllTypes msg1;
-  unittest::TestAllTypes msg2;
-
-  msg1.set_optional_int32(-1);
-
-  // Compare
-  util::MessageDifferencer differencer;
-  differencer.set_message_field_comparison(
-      util::MessageDifferencer::EQUIVALENT);
-  differencer.set_scope(util::MessageDifferencer::PARTIAL);
-  EXPECT_FALSE(differencer.Compare(msg1, msg2));
-}
-
-TEST(MessageDifferencerTest, ApproximateEqualityTest) {
-  // Create the testing protos
-  unittest::TestAllTypes msg1;
-  unittest::TestAllTypes msg2;
-
-  TestUtil::SetAllFields(&msg1);
-  TestUtil::SetAllFields(&msg2);
-
-  // Compare
-  EXPECT_TRUE(util::MessageDifferencer::ApproximatelyEquals(msg1, msg2));
-}
-
-TEST(MessageDifferencerTest, ApproximateModifiedEqualityTest) {
-  // Create the testing protos
-  unittest::TestAllTypes msg1;
-  unittest::TestAllTypes msg2;
-
-  TestUtil::SetAllFields(&msg1);
-  TestUtil::SetAllFields(&msg2);
-
-  const float v1 = 2.300005f;
-  const float v2 = 2.300006f;
-  msg1.set_optional_float(v1);
-  msg2.set_optional_float(v2);
-
-  // Compare
-  ASSERT_NE(v1, v2) << "Should not be the same: " << v1 << ", " << v2;
-  ASSERT_FLOAT_EQ(v1, v2) << "Should be approx. equal: " << v1 << ", " << v2;
-  EXPECT_FALSE(util::MessageDifferencer::Equals(msg1, msg2));
-  EXPECT_TRUE(util::MessageDifferencer::ApproximatelyEquals(msg1, msg2));
-}
-
-TEST(MessageDifferencerTest, ApproximateEquivalencyTest) {
-  // Create the testing protos
-  unittest::TestAllTypes msg1;
-  unittest::TestAllTypes msg2;
-
-  TestUtil::SetAllFields(&msg1);
-  TestUtil::SetAllFields(&msg2);
-
-  // Compare
-  EXPECT_TRUE(util::MessageDifferencer::ApproximatelyEquivalent(msg1, msg2));
-}
-
-TEST(MessageDifferencerTest, ApproximateModifiedEquivalencyTest) {
-  // Create the testing protos
-  unittest::TestAllTypes msg1;
-  unittest::TestAllTypes msg2;
-
-  TestUtil::SetAllFields(&msg1);
-  TestUtil::SetAllFields(&msg2);
-
-  // Modify the approximateness requirement
-  const float v1 = 2.300005f;
-  const float v2 = 2.300006f;
-  msg1.set_optional_float(v1);
-  msg2.set_optional_float(v2);
-
-  // Compare
-  ASSERT_NE(v1, v2) << "Should not be the same: " << v1 << ", " << v2;
-  ASSERT_FLOAT_EQ(v1, v2) << "Should be approx. equal: " << v1 << ", " << v2;
-  EXPECT_FALSE(util::MessageDifferencer::Equals(msg1, msg2));
-  EXPECT_TRUE(util::MessageDifferencer::ApproximatelyEquivalent(msg1, msg2));
-
-  // Modify the equivalency requirement too
-  msg1.clear_optional_int32();
-  msg2.set_optional_int32(0);
-
-  // Compare. Now should only pass on ApproximatelyEquivalent
-  EXPECT_FALSE(util::MessageDifferencer::Equals(msg1, msg2));
-  EXPECT_FALSE(util::MessageDifferencer::Equivalent(msg1, msg2));
-  EXPECT_FALSE(util::MessageDifferencer::ApproximatelyEquals(msg1, msg2));
-  EXPECT_TRUE(util::MessageDifferencer::ApproximatelyEquivalent(msg1, msg2));
-}
-
-TEST(MessageDifferencerTest, ApproximateInequivalencyTest) {
-  // Create the testing protos
-  unittest::TestAllTypes msg1;
-  unittest::TestAllTypes msg2;
-
-  TestUtil::SetAllFields(&msg1);
-  TestUtil::SetAllFields(&msg2);
-
-  // Should fail on equivalency
-  msg1.set_optional_int32(-1);
-  EXPECT_FALSE(util::MessageDifferencer::ApproximatelyEquivalent(msg1, msg2));
-
-  // Make these fields the same again.
-  msg1.set_optional_int32(0);
-  msg2.set_optional_int32(0);
-  EXPECT_TRUE(util::MessageDifferencer::ApproximatelyEquivalent(msg1, msg2));
-
-  // Should fail on approximate equality check
-  const float v1 = 2.3f;
-  const float v2 = 9.3f;
-  msg1.set_optional_float(v1);
-  msg2.set_optional_float(v2);
-  EXPECT_FALSE(util::MessageDifferencer::ApproximatelyEquivalent(msg1, msg2));
-}
-
-TEST(MessageDifferencerTest, WithinFractionOrMarginFloatTest) {
-  // Create the testing protos
-  unittest::TestAllTypes msg1;
-  unittest::TestAllTypes msg2;
-
-  TestUtil::SetAllFields(&msg1);
-  TestUtil::SetAllFields(&msg2);
-
-  // Should fail on approximate equality check
-  const float v1 = 100.0f;
-  const float v2 = 109.9f;
-  msg1.set_optional_float(v1);
-  msg2.set_optional_float(v2);
-
-  // Compare
-  util::MessageDifferencer differencer;
-  EXPECT_FALSE(differencer.Compare(msg1, msg2));
-  const FieldDescriptor* fd =
-      msg1.GetDescriptor()->FindFieldByName("optional_float");
-
-  // Set float comparison to exact, margin and fraction value should not matter.
-  differencer.set_float_comparison(util::MessageDifferencer::EXACT);
-  // Set margin for float comparison.
-  differencer.SetFractionAndMargin(fd, 0.0, 10.0);
-  EXPECT_FALSE(differencer.Compare(msg1, msg2));
-
-  // Margin and fraction float comparison is activated when float comparison is
-  // set to approximate.
-  differencer.set_float_comparison(util::MessageDifferencer::APPROXIMATE);
-  EXPECT_TRUE(differencer.Compare(msg1, msg2));
-
-  // Test out float comparison with fraction.
-  differencer.SetFractionAndMargin(fd, 0.2, 0.0);
-  EXPECT_TRUE(differencer.Compare(msg1, msg2));
-
-  // Should fail since the fraction is smaller than error.
-  differencer.SetFractionAndMargin(fd, 0.01, 0.0);
-  EXPECT_FALSE(differencer.Compare(msg1, msg2));
-
-  // Should pass if either fraction or margin are satisfied.
-  differencer.SetFractionAndMargin(fd, 0.01, 10.0);
-  EXPECT_TRUE(differencer.Compare(msg1, msg2));
-
-  // Make sure that the margin and fraction only affects the field that it was
-  // set for.
-  msg1.set_default_float(v1);
-  msg2.set_default_float(v2);
-  EXPECT_FALSE(differencer.Compare(msg1, msg2));
-  msg1.set_default_float(v1);
-  msg2.set_default_float(v1);
-  EXPECT_TRUE(differencer.Compare(msg1, msg2));
-}
-
-TEST(MessageDifferencerTest, WithinFractionOrMarginDoubleTest) {
-  // Create the testing protos
-  unittest::TestAllTypes msg1;
-  unittest::TestAllTypes msg2;
-
-  TestUtil::SetAllFields(&msg1);
-  TestUtil::SetAllFields(&msg2);
-
-  // Should fail on approximate equality check
-  const double v1 = 100.0;
-  const double v2 = 109.9;
-  msg1.set_optional_double(v1);
-  msg2.set_optional_double(v2);
-
-  // Compare
-  util::MessageDifferencer differencer;
-  EXPECT_FALSE(differencer.Compare(msg1, msg2));
-
-  // Set comparison to exact, margin and fraction value should not matter.
-  differencer.set_float_comparison(util::MessageDifferencer::EXACT);
-  // Set margin for float comparison.
-  const FieldDescriptor* fd =
-      msg1.GetDescriptor()->FindFieldByName("optional_double");
-  differencer.SetFractionAndMargin(fd, 0.0, 10.0);
-  EXPECT_FALSE(differencer.Compare(msg1, msg2));
-
-  // Margin and fraction comparison is activated when float comparison is
-  // set to approximate.
-  differencer.set_float_comparison(util::MessageDifferencer::APPROXIMATE);
-  EXPECT_TRUE(differencer.Compare(msg1, msg2));
-
-  // Test out comparison with fraction.
-  differencer.SetFractionAndMargin(fd, 0.2, 0.0);
-  EXPECT_TRUE(differencer.Compare(msg1, msg2));
-
-  // Should fail since the fraction is smaller than error.
-  differencer.SetFractionAndMargin(fd, 0.01, 0.0);
-  EXPECT_FALSE(differencer.Compare(msg1, msg2));
-
-  // Should pass if either fraction or margin are satisfied.
-  differencer.SetFractionAndMargin(fd, 0.01, 10.0);
-  EXPECT_TRUE(differencer.Compare(msg1, msg2));
-
-  // Make sure that the margin and fraction only affects the field that it was
-  // set for.
-  msg1.set_default_double(v1);
-  msg2.set_default_double(v2);
-  EXPECT_FALSE(differencer.Compare(msg1, msg2));
-  msg1.set_default_double(v1);
-  msg2.set_default_double(v1);
-  EXPECT_TRUE(differencer.Compare(msg1, msg2));
-}
-
-TEST(MessageDifferencerTest, WithinDefaultFractionOrMarginDoubleTest) {
-  // Create the testing protos
-  unittest::TestAllTypes msg1;
-  unittest::TestAllTypes msg2;
-
-  TestUtil::SetAllFields(&msg1);
-  TestUtil::SetAllFields(&msg2);
-
-  // Should fail on approximate equality check
-  const double v1 = 100.0;
-  const double v2 = 109.9;
-  msg1.set_optional_double(v1);
-  msg2.set_optional_double(v2);
-
-  util::MessageDifferencer differencer;
-
-  // Compare
-  EXPECT_FALSE(differencer.Compare(msg1, msg2));
-
-  // Set up a custom field comparator, with a default fraction and margin for
-  // float and double comparison.
-  util::DefaultFieldComparator field_comparator;
-  field_comparator.SetDefaultFractionAndMargin(0.0, 10.0);
-  differencer.set_field_comparator(&field_comparator);
-
-  // Set comparison to exact, margin and fraction value should not matter.
-  field_comparator.set_float_comparison(util::DefaultFieldComparator::EXACT);
-  EXPECT_FALSE(differencer.Compare(msg1, msg2));
-
-  // Margin and fraction comparison is activated when float comparison is
-  // set to approximate.
-  field_comparator.set_float_comparison(
-      util::DefaultFieldComparator::APPROXIMATE);
-  EXPECT_TRUE(differencer.Compare(msg1, msg2));
-
-  // Test out comparison with fraction.
-  field_comparator.SetDefaultFractionAndMargin(0.2, 0.0);
-  EXPECT_TRUE(differencer.Compare(msg1, msg2));
-
-  // Should fail since the fraction is smaller than error.
-  field_comparator.SetDefaultFractionAndMargin(0.01, 0.0);
-  EXPECT_FALSE(differencer.Compare(msg1, msg2));
-
-  // Should pass if either fraction or margin are satisfied.
-  field_comparator.SetDefaultFractionAndMargin(0.01, 10.0);
-  EXPECT_TRUE(differencer.Compare(msg1, msg2));
-
-  // Make sure that the default margin and fraction affects all fields
-  msg1.set_default_double(v1);
-  msg2.set_default_double(v2);
-  EXPECT_TRUE(differencer.Compare(msg1, msg2));
-}
-
-TEST(MessageDifferencerTest, BasicFieldOrderingsTest) {
-  // Create the testing protos
-  unittest::TestFieldOrderings msg1;
-  unittest::TestFieldOrderings msg2;
-
-  TestUtil::SetAllFieldsAndExtensions(&msg1);
-  TestUtil::SetAllFieldsAndExtensions(&msg2);
-
-  // Compare
-  EXPECT_TRUE(util::MessageDifferencer::Equals(msg1, msg2));
-}
-
-TEST(MessageDifferencerTest, BasicFieldOrderingInequalityTest) {
-  // Create the testing protos
-  unittest::TestFieldOrderings msg1;
-  unittest::TestFieldOrderings msg2;
-
-  TestUtil::SetAllFieldsAndExtensions(&msg1);
-  TestUtil::SetAllFieldsAndExtensions(&msg2);
-
-  msg1.set_my_float(15.00);
-  msg2.set_my_float(16.00);
-
-  // Compare
-  EXPECT_FALSE(util::MessageDifferencer::Equals(msg1, msg2));
-}
-
-TEST(MessageDifferencerTest, BasicExtensionTest) {
-  // Create the testing protos
-  unittest::TestAllExtensions msg1;
-  unittest::TestAllExtensions msg2;
-
-  TestUtil::SetAllExtensions(&msg1);
-  TestUtil::SetAllExtensions(&msg2);
-
-  // Compare
-  EXPECT_TRUE(util::MessageDifferencer::Equals(msg1, msg2));
-}
-
-TEST(MessageDifferencerTest, BasicExtensionInequalityTest) {
-  // Create the testing protos
-  unittest::TestAllExtensions msg1;
-  unittest::TestAllExtensions msg2;
-
-  TestUtil::SetAllExtensions(&msg1);
-  TestUtil::SetAllExtensions(&msg2);
-
-  msg1.SetExtension(unittest::optional_int32_extension, 101);
-  msg2.SetExtension(unittest::optional_int32_extension, 102);
-
-  // Compare
-  EXPECT_FALSE(util::MessageDifferencer::Equals(msg1, msg2));
-}
-
-TEST(MessageDifferencerTest, OneofTest) {
-  // Create the testing protos
-  unittest::TestOneof2 msg1;
-  unittest::TestOneof2 msg2;
-
-  TestUtil::SetOneof1(&msg1);
-  TestUtil::SetOneof1(&msg2);
-
-  // Compare
-  EXPECT_TRUE(util::MessageDifferencer::Equals(msg1, msg2));
-}
-
-TEST(MessageDifferencerTest, OneofInequalityTest) {
-  // Create the testing protos
-  unittest::TestOneof2 msg1;
-  unittest::TestOneof2 msg2;
-
-  TestUtil::SetOneof1(&msg1);
-  TestUtil::SetOneof2(&msg2);
-
-  // Compare
-  EXPECT_FALSE(util::MessageDifferencer::Equals(msg1, msg2));
-}
-
-TEST(MessageDifferencerTest, UnknownFieldPartialEqualTest) {
-  unittest::TestEmptyMessage empty1;
-  unittest::TestEmptyMessage empty2;
-
-  UnknownFieldSet* unknown1 = empty1.mutable_unknown_fields();
-  UnknownFieldSet* unknown2 = empty2.mutable_unknown_fields();
-
-  unknown1->AddVarint(243, 122);
-  unknown1->AddLengthDelimited(245, "abc");
-  unknown1->AddGroup(246)->AddFixed32(248, 1);
-  unknown1->mutable_field(2)->mutable_group()->AddFixed32(248, 2);
-
-  unknown2->AddVarint(243, 122);
-  unknown2->AddLengthDelimited(245, "abc");
-  unknown2->AddGroup(246)->AddFixed32(248, 1);
-  unknown2->mutable_field(2)->mutable_group()->AddFixed32(248, 2);
-
-  util::MessageDifferencer differencer;
-  differencer.set_scope(util::MessageDifferencer::PARTIAL);
-  EXPECT_TRUE(differencer.Compare(empty1, empty2));
-}
-
-TEST(MessageDifferencerTest, SpecifiedFieldsEqualityAllTest) {
-  unittest::TestAllTypes msg1;
-  unittest::TestAllTypes msg2;
-
-  TestUtil::SetAllFields(&msg1);
-  TestUtil::SetAllFields(&msg2);
-
-  std::vector<const FieldDescriptor*> fields1;
-  std::vector<const FieldDescriptor*> fields2;
-  msg1.GetReflection()->ListFields(msg1, &fields1);
-  msg2.GetReflection()->ListFields(msg2, &fields2);
-
-  util::MessageDifferencer differencer;
-  EXPECT_TRUE(differencer.CompareWithFields(msg1, msg2, fields1, fields2));
-}
-
-TEST(MessageDifferencerTest, SpecifiedFieldsInequalityAllTest) {
-  unittest::TestAllTypes msg1;
-  unittest::TestAllTypes msg2;
-
-  TestUtil::SetAllFields(&msg1);
-
-  std::vector<const FieldDescriptor*> fields1;
-  std::vector<const FieldDescriptor*> fields2;
-  msg1.GetReflection()->ListFields(msg1, &fields1);
-  msg2.GetReflection()->ListFields(msg2, &fields2);
-
-  util::MessageDifferencer differencer;
-  EXPECT_FALSE(differencer.CompareWithFields(msg1, msg2, fields1, fields2));
-}
-
-TEST(MessageDifferencerTest, SpecifiedFieldsEmptyListAlwaysSucceeds) {
-  unittest::TestAllTypes msg1;
-  unittest::TestAllTypes msg2;
-
-  TestUtil::SetAllFields(&msg1);
-
-  std::vector<const FieldDescriptor*> empty_fields;
-
-  util::MessageDifferencer differencer;
-  EXPECT_TRUE(
-      differencer.CompareWithFields(msg1, msg2, empty_fields, empty_fields));
-
-  TestUtil::SetAllFields(&msg2);
-  EXPECT_TRUE(
-      differencer.CompareWithFields(msg1, msg2, empty_fields, empty_fields));
-}
-
-TEST(MessageDifferencerTest, SpecifiedFieldsCompareWithSelf) {
-  unittest::TestAllTypes msg1;
-  TestUtil::SetAllFields(&msg1);
-
-  std::vector<const FieldDescriptor*> fields;
-  msg1.GetReflection()->ListFields(msg1, &fields);
-
-  util::MessageDifferencer differencer;
-  EXPECT_TRUE(differencer.CompareWithFields(msg1, msg1, fields, fields));
-
-  {
-    // Compare with a subset of fields.
-    std::vector<const FieldDescriptor*> compare_fields;
-    for (int i = 0; i < fields.size(); ++i) {
-      if (i % 2 == 0) {
-        compare_fields.push_back(fields[i]);
-      }
-    }
-    EXPECT_TRUE(differencer.CompareWithFields(msg1, msg1, compare_fields,
-                                              compare_fields));
-  }
-  {
-    // Specify a different set of fields to compare, even though we're using the
-    // same message. This should fail, since we are explicitly saying that the
-    // set of fields are different.
-    std::vector<const FieldDescriptor*> compare_fields1;
-    std::vector<const FieldDescriptor*> compare_fields2;
-    for (int i = 0; i < fields.size(); ++i) {
-      if (i % 2 == 0) {
-        compare_fields1.push_back(fields[i]);
-      } else {
-        compare_fields2.push_back(fields[i]);
-      }
-    }
-    EXPECT_FALSE(differencer.CompareWithFields(msg1, msg1, compare_fields1,
-                                               compare_fields2));
-  }
-}
-
-TEST(MessageDifferencerTest, SpecifiedFieldsEqualityAllShuffledTest) {
-  // This is a public function, so make sure there are no assumptions about the
-  // list of fields. Randomly shuffle them to make sure that they are properly
-  // ordered for comparison.
-  unittest::TestAllTypes msg1;
-  unittest::TestAllTypes msg2;
-
-  TestUtil::SetAllFields(&msg1);
-  TestUtil::SetAllFields(&msg2);
-
-  std::vector<const FieldDescriptor*> fields1;
-  std::vector<const FieldDescriptor*> fields2;
-  msg1.GetReflection()->ListFields(msg1, &fields1);
-  msg2.GetReflection()->ListFields(msg2, &fields2);
-
-  std::default_random_engine rng;
-  std::shuffle(fields1.begin(), fields1.end(), rng);
-  std::shuffle(fields2.begin(), fields2.end(), rng);
-
-  util::MessageDifferencer differencer;
-  EXPECT_TRUE(differencer.CompareWithFields(msg1, msg2, fields1, fields2));
-}
-
-TEST(MessageDifferencerTest, SpecifiedFieldsSubsetEqualityTest) {
-  // Specify a set of fields to compare. All the fields are equal.
-  unittest::TestAllTypes msg1;
-  unittest::TestAllTypes msg2;
-  TestUtil::SetAllFields(&msg1);
-  TestUtil::SetAllFields(&msg2);
-
-  std::vector<const FieldDescriptor*> fields1;
-  msg1.GetReflection()->ListFields(msg1, &fields1);
-
-  std::vector<const FieldDescriptor*> compare_fields;
-  // Only compare the field descriptors with even indices.
-  for (int i = 0; i < fields1.size(); ++i) {
-    if (i % 2 == 0) {
-      compare_fields.push_back(fields1[i]);
-    }
-  }
-
-  util::MessageDifferencer differencer;
-  EXPECT_TRUE(differencer.CompareWithFields(msg1, msg2, compare_fields,
-                                            compare_fields));
-}
-
-TEST(MessageDifferencerTest,
-     SpecifiedFieldsSubsetIgnoresOtherFieldDifferencesTest) {
-  // Specify a set of fields to compare, but clear all the other fields in one
-  // of the messages. This should fail a regular compare, but CompareWithFields
-  // should succeed.
-  unittest::TestAllTypes msg1;
-  unittest::TestAllTypes msg2;
-  TestUtil::SetAllFields(&msg1);
-  TestUtil::SetAllFields(&msg2);
-
-  std::vector<const FieldDescriptor*> fields1;
-  const Reflection* reflection = msg1.GetReflection();
-  reflection->ListFields(msg1, &fields1);
-
-  std::vector<const FieldDescriptor*> compare_fields;
-  // Only compare the field descriptors with even indices.
-  for (int i = 0; i < fields1.size(); ++i) {
-    if (i % 2 == 0) {
-      compare_fields.push_back(fields1[i]);
-    } else {
-      reflection->ClearField(&msg2, fields1[i]);
-    }
-  }
-
-  util::MessageDifferencer differencer;
-  EXPECT_FALSE(differencer.Compare(msg1, msg2));
-  EXPECT_TRUE(differencer.CompareWithFields(msg1, msg2, compare_fields,
-                                            compare_fields));
-}
-
-TEST(MessageDifferencerTest, SpecifiedFieldsDetectsDifferencesTest) {
-  // Change all of the repeated fields in one of the messages, and use only
-  // those fields for comparison.
-  unittest::TestAllTypes msg1;
-  unittest::TestAllTypes msg2;
-  TestUtil::SetAllFields(&msg1);
-  TestUtil::SetAllFields(&msg2);
-  TestUtil::ModifyRepeatedFields(&msg2);
-
-  std::vector<const FieldDescriptor*> fields1;
-  msg1.GetReflection()->ListFields(msg1, &fields1);
-
-  std::vector<const FieldDescriptor*> compare_fields;
-  // Only compare the repeated field descriptors.
-  for (int i = 0; i < fields1.size(); ++i) {
-    if (fields1[i]->is_repeated()) {
-      compare_fields.push_back(fields1[i]);
-    }
-  }
-
-  util::MessageDifferencer differencer;
-  EXPECT_FALSE(differencer.CompareWithFields(msg1, msg2, compare_fields,
-                                             compare_fields));
-}
-
-TEST(MessageDifferencerTest, SpecifiedFieldsEquivalenceAllTest) {
-  unittest::TestAllTypes msg1;
-  unittest::TestAllTypes msg2;
-
-  TestUtil::SetAllFields(&msg1);
-  TestUtil::SetAllFields(&msg2);
-
-  std::vector<const FieldDescriptor*> fields1;
-  std::vector<const FieldDescriptor*> fields2;
-  msg1.GetReflection()->ListFields(msg1, &fields1);
-  msg2.GetReflection()->ListFields(msg2, &fields2);
-
-  util::MessageDifferencer differencer;
-  differencer.set_message_field_comparison(
-      util::MessageDifferencer::EQUIVALENT);
-  EXPECT_TRUE(differencer.CompareWithFields(msg1, msg2, fields1, fields2));
-}
-
-TEST(MessageDifferencerTest,
-     SpecifiedFieldsEquivalenceIgnoresOtherFieldDifferencesTest) {
-  unittest::TestAllTypes msg1;
-  unittest::TestAllTypes msg2;
-  const Descriptor* desc = msg1.GetDescriptor();
-
-  const FieldDescriptor* optional_int32_desc =
-      desc->FindFieldByName("optional_int32");
-  const FieldDescriptor* optional_int64_desc =
-      desc->FindFieldByName("optional_int64");
-  const FieldDescriptor* default_int64_desc =
-      desc->FindFieldByName("default_int64");
-  ASSERT_TRUE(optional_int32_desc != nullptr);
-  ASSERT_TRUE(optional_int64_desc != nullptr);
-  ASSERT_TRUE(default_int64_desc != nullptr);
-  msg1.set_optional_int32(0);
-  msg2.set_optional_int64(0);
-  msg1.set_default_int64(default_int64_desc->default_value_int64());
-
-  // Set a field to a non-default value so we know that field selection is
-  // actually doing something.
-  msg2.set_optional_uint64(23);
-
-  std::vector<const FieldDescriptor*> fields1;
-  std::vector<const FieldDescriptor*> fields2;
-  fields1.push_back(optional_int32_desc);
-  fields1.push_back(default_int64_desc);
-
-  fields2.push_back(optional_int64_desc);
-
-  util::MessageDifferencer differencer;
-  EXPECT_FALSE(differencer.CompareWithFields(msg1, msg2, fields1, fields2));
-  differencer.set_message_field_comparison(
-      util::MessageDifferencer::EQUIVALENT);
-  EXPECT_FALSE(differencer.Compare(msg1, msg2));
-  EXPECT_TRUE(differencer.CompareWithFields(msg1, msg2, fields1, fields2));
-}
-
-TEST(MessageDifferencerTest, RepeatedFieldTreatmentChangeListToSet) {
-  protobuf_unittest::TestDiffMessage msg1;
-  protobuf_unittest::TestDiffMessage msg2;
-
-  msg1.add_rv(1);
-  msg1.add_rv(2);
-  msg2.add_rv(2);
-  msg2.add_rv(1);
-
-  util::MessageDifferencer differencer;
-  differencer.TreatAsList(
-      protobuf_unittest::TestDiffMessage::descriptor()->FindFieldByName("rv"));
-  differencer.TreatAsSet(
-      protobuf_unittest::TestDiffMessage::descriptor()->FindFieldByName("rv"));
-
-  EXPECT_TRUE(differencer.Compare(msg1, msg2));
-}
-
-TEST(MessageDifferencerTest, RepeatedFieldTreatmentChangeSetToList) {
-  protobuf_unittest::TestDiffMessage msg1;
-  protobuf_unittest::TestDiffMessage msg2;
-
-  msg1.add_rv(1);
-  msg1.add_rv(2);
-  msg2.add_rv(2);
-  msg2.add_rv(1);
-
-  util::MessageDifferencer differencer;
-  differencer.TreatAsSet(
-      protobuf_unittest::TestDiffMessage::descriptor()->FindFieldByName("rv"));
-  differencer.TreatAsList(
-      protobuf_unittest::TestDiffMessage::descriptor()->FindFieldByName("rv"));
-
-  EXPECT_FALSE(differencer.Compare(msg1, msg2));
-}
-
-TEST(MessageDifferencerTest, RepeatedFieldSmartListTest) {
-  // Create the testing protos
-  protobuf_unittest::TestDiffMessage msg1;
-  protobuf_unittest::TestDiffMessage msg2;
-
-  msg1.add_rv(1);
-  msg1.add_rv(2);
-  msg1.add_rv(3);
-  msg1.add_rv(9);
-  msg1.add_rv(4);
-  msg1.add_rv(5);
-  msg1.add_rv(7);
-  msg1.add_rv(2);
-  msg2.add_rv(9);
-  msg2.add_rv(0);
-  msg2.add_rv(2);
-  msg2.add_rv(7);
-  msg2.add_rv(3);
-  msg2.add_rv(4);
-  msg2.add_rv(5);
-  msg2.add_rv(6);
-  msg2.add_rv(2);
-  // Compare
-  // a: 1,      2,    3, 9, 4, 5, 7,   2
-  // b:   9, 0, 2, 7, 3,    4, 5,   6, 2
-  std::string diff_report;
-  util::MessageDifferencer differencer;
-  differencer.ReportDifferencesToString(&diff_report);
-  differencer.set_repeated_field_comparison(
-      util::MessageDifferencer::AS_SMART_LIST);
-  EXPECT_FALSE(differencer.Compare(msg1, msg2));
-  EXPECT_EQ(
-      "deleted: rv[0]: 1\n"
-      "added: rv[0]: 9\n"
-      "added: rv[1]: 0\n"
-      "moved: rv[1] -> rv[2] : 2\n"
-      "added: rv[3]: 7\n"
-      "moved: rv[2] -> rv[4] : 3\n"
-      "deleted: rv[3]: 9\n"
-      "moved: rv[4] -> rv[5] : 4\n"
-      "moved: rv[5] -> rv[6] : 5\n"
-      "deleted: rv[6]: 7\n"
-      "added: rv[7]: 6\n"
-      "moved: rv[7] -> rv[8] : 2\n",
-      diff_report);
-
-  // Compare two sub messages
-  // a: 1, 2, 3,    4, 5
-  // b:    2,    6, 4,
-  msg1.Clear();
-  msg2.Clear();
-  msg1.add_rm()->set_a(1);
-  msg1.add_rm()->set_a(2);
-  msg1.add_rm()->set_a(3);
-  msg1.add_rm()->set_a(4);
-  msg1.add_rm()->set_a(5);
-  msg2.add_rm()->set_a(2);
-  msg2.add_rm()->set_a(6);
-  msg2.add_rm()->set_a(4);
-  differencer.ReportDifferencesToString(&diff_report);
-  differencer.set_repeated_field_comparison(
-      util::MessageDifferencer::AS_SMART_LIST);
-  EXPECT_FALSE(differencer.Compare(msg1, msg2));
-  EXPECT_EQ(
-      "deleted: rm[0]: { a: 1 }\n"
-      "moved: rm[1] -> rm[0] : { a: 2 }\n"
-      "deleted: rm[2]: { a: 3 }\n"
-      "added: rm[1]: { a: 6 }\n"
-      "moved: rm[3] -> rm[2] : { a: 4 }\n"
-      "deleted: rm[4]: { a: 5 }\n",
-      diff_report);
-}
-
-TEST(MessageDifferencerTest, RepeatedFieldSmartSetTest) {
-  // Create the testing protos
-  protobuf_unittest::TestDiffMessage msg1;
-  protobuf_unittest::TestDiffMessage msg2;
-  protobuf_unittest::TestField elem1_1, elem2_1, elem3_1;
-  protobuf_unittest::TestField elem1_2, elem2_2, elem3_2;
-
-  // Only one field is different for each pair of elememts
-  elem1_1.set_a(1);
-  elem1_2.set_a(0);
-  elem1_1.set_b(1);
-  elem1_2.set_b(1);
-  elem1_1.set_c(1);
-  elem1_2.set_c(1);
-  elem2_1.set_a(2);
-  elem2_2.set_a(2);
-  elem2_1.set_b(2);
-  elem2_2.set_b(0);
-  elem2_1.set_c(2);
-  elem2_2.set_c(2);
-  elem3_1.set_a(3);
-  elem3_2.set_a(3);
-  elem3_1.set_b(3);
-  elem3_2.set_b(0);
-  elem3_1.set_c(3);
-  elem3_2.set_c(3);
-
-  *msg1.add_rm() = elem1_1;
-  *msg1.add_rm() = elem2_1;
-  *msg1.add_rm() = elem3_1;
-  // Change the order of those elements for the second message.
-  *msg2.add_rm() = elem3_2;
-  *msg2.add_rm() = elem1_2;
-  *msg2.add_rm() = elem2_2;
-
-  std::string diff_report;
-  util::MessageDifferencer differencer;
-  differencer.ReportDifferencesToString(&diff_report);
-  differencer.set_repeated_field_comparison(
-      util::MessageDifferencer::AS_SMART_SET);
-  EXPECT_FALSE(differencer.Compare(msg1, msg2));
-  EXPECT_EQ(
-      "modified: rm[0].a -> rm[1].a: 1 -> 0\n"
-      "modified: rm[1].b -> rm[2].b: 2 -> 0\n"
-      "modified: rm[2].b -> rm[0].b: 3 -> 0\n",
-      diff_report);
-}
-
-TEST(MessageDifferencerTest, RepeatedFieldSmartSetTest_IdenticalElements) {
-  // Create the testing protos
-  protobuf_unittest::TestDiffMessage msg1;
-  protobuf_unittest::TestDiffMessage msg2;
-  protobuf_unittest::TestField elem;
-
-  elem.set_a(1);
-  elem.set_b(1);
-  elem.set_c(1);
-
-  *msg1.add_rm() = elem;
-  *msg1.add_rm() = elem;
-  *msg2.add_rm() = elem;
-  *msg2.add_rm() = elem;
-
-  util::MessageDifferencer differencer;
-  differencer.set_repeated_field_comparison(
-      util::MessageDifferencer::AS_SMART_SET);
-  EXPECT_TRUE(differencer.Compare(msg1, msg2));
-}
-
-TEST(MessageDifferencerTest, RepeatedFieldSmartSetTest_PreviouslyMatch) {
-  // Create the testing protos
-  protobuf_unittest::TestDiffMessage msg1;
-  protobuf_unittest::TestDiffMessage msg2;
-  protobuf_unittest::TestField elem1_1, elem1_2;
-  protobuf_unittest::TestField elem2_1, elem2_2;
-
-  elem1_1.set_a(1);
-  elem1_1.set_b(1);
-  elem1_1.set_c(1);
-  elem1_2.set_a(1);
-  elem1_2.set_b(1);
-  elem1_2.set_c(0);
-
-  elem2_1.set_a(1);
-  elem2_1.set_b(1);
-  elem2_1.set_c(1);
-  elem2_2.set_a(1);
-  elem2_2.set_b(0);
-  elem2_2.set_c(1);
-
-  *msg1.add_rm() = elem1_1;
-  *msg1.add_rm() = elem2_1;
-  *msg2.add_rm() = elem1_2;
-  *msg2.add_rm() = elem2_2;
-
-  std::string diff_report;
-  util::MessageDifferencer differencer;
-  differencer.ReportDifferencesToString(&diff_report);
-  differencer.set_repeated_field_comparison(
-      util::MessageDifferencer::AS_SMART_SET);
-  EXPECT_FALSE(differencer.Compare(msg1, msg2));
-  EXPECT_EQ(
-      "modified: rm[0].c: 1 -> 0\n"
-      "modified: rm[1].b: 1 -> 0\n",
-      diff_report);
-}
-
-TEST(MessageDifferencerTest, RepeatedFieldSmartSet_MultipleMatches) {
-  // Create the testing protos
-  protobuf_unittest::TestDiffMessage msg1;
-  protobuf_unittest::TestDiffMessage msg2;
-  protobuf_unittest::TestField elem1_1, elem2_1, elem3_1;
-  protobuf_unittest::TestField elem2_2, elem3_2;
-
-  // Only one field is different for each pair of elememts
-  elem1_1.set_a(1);
-  elem1_1.set_b(1);
-  elem1_1.set_c(1);
-  elem2_1.set_a(2);
-  elem2_2.set_a(2);
-  elem2_1.set_b(2);
-  elem2_2.set_b(0);
-  elem2_1.set_c(2);
-  elem2_2.set_c(2);
-  elem3_1.set_a(3);
-  elem3_2.set_a(3);
-  elem3_1.set_b(3);
-  elem3_2.set_b(0);
-  elem3_1.set_c(3);
-  elem3_2.set_c(3);
-
-  // In this testcase, elem1_1 will match with elem2_2 first and then get
-  // reverted because elem2_1 matches with elem2_2 later.
-  *msg1.add_rm() = elem1_1;
-  *msg1.add_rm() = elem2_1;
-  *msg1.add_rm() = elem3_1;
-  *msg2.add_rm() = elem2_2;
-  *msg2.add_rm() = elem3_2;
-
-  std::string diff_report;
-  util::MessageDifferencer differencer;
-  differencer.ReportDifferencesToString(&diff_report);
-  differencer.set_repeated_field_comparison(
-      util::MessageDifferencer::AS_SMART_SET);
-  EXPECT_FALSE(differencer.Compare(msg1, msg2));
-  EXPECT_EQ(
-      "modified: rm[1].b -> rm[0].b: 2 -> 0\n"
-      "modified: rm[2].b -> rm[1].b: 3 -> 0\n"
-      "deleted: rm[0]: { c: 1 a: 1 b: 1 }\n",
-      diff_report);
-}
-
-TEST(MessageDifferencerTest, RepeatedFieldSmartSet_MultipleMatchesNoReporter) {
-  protobuf_unittest::TestDiffMessage msg1;
-  protobuf_unittest::TestDiffMessage msg2;
-  protobuf_unittest::TestField elem1, elem2, elem3, elem4;
-  elem1.set_a(1);
-  elem2.set_a(2);
-  elem3.set_a(3);
-  elem4.set_a(4);
-
-  *msg1.add_rm() = elem1;
-  *msg1.add_rm() = elem2;
-  *msg1.add_rm() = elem3;
-  *msg2.add_rm() = elem2;
-  *msg2.add_rm() = elem3;
-  *msg2.add_rm() = elem4;
-
-  util::MessageDifferencer differencer;
-  differencer.set_repeated_field_comparison(
-      util::MessageDifferencer::AS_SMART_SET);
-  EXPECT_FALSE(differencer.Compare(msg1, msg2));
-}
-
-TEST(MessageDifferencerTest, RepeatedFieldSmartSet_NonMessageTypeTest) {
-  // Create the testing protos
-  protobuf_unittest::TestDiffMessage msg1;
-  protobuf_unittest::TestDiffMessage msg2;
-
-  // Create 3 elements, but in different order.
-  msg1.add_rw("b");
-  msg2.add_rw("a");
-  msg1.add_rw("x");
-  msg2.add_rw("x");
-  msg1.add_rw("a");
-  msg2.add_rw("b");
-
-  std::string diff_report;
-  util::MessageDifferencer differencer;
-  differencer.ReportDifferencesToString(&diff_report);
-  differencer.set_repeated_field_comparison(
-      util::MessageDifferencer::AS_SMART_SET);
-  EXPECT_TRUE(differencer.Compare(msg1, msg2));
-  EXPECT_EQ(
-      "moved: rw[0] -> rw[2] : \"b\"\n"
-      "moved: rw[2] -> rw[0] : \"a\"\n",
-      diff_report);
-}
-
-TEST(MessageDifferencerTest, RepeatedFieldSetTest_SetOfSet) {
-  // Create the testing protos
-  protobuf_unittest::TestDiffMessage msg1;
-  protobuf_unittest::TestDiffMessage msg2;
-
-  protobuf_unittest::TestDiffMessage::Item* item = msg1.add_item();
-  item->add_ra(1);
-  item->add_ra(2);
-  item->add_ra(3);
-  item = msg1.add_item();
-  item->add_ra(5);
-  item->add_ra(6);
-  item = msg1.add_item();
-  item->add_ra(1);
-  item->add_ra(3);
-  item = msg1.add_item();
-  item->add_ra(6);
-  item->add_ra(7);
-  item->add_ra(8);
-
-  item = msg2.add_item();
-  item->add_ra(6);
-  item->add_ra(5);
-  item = msg2.add_item();
-  item->add_ra(6);
-  item->add_ra(8);
-  item->add_ra(7);
-  item = msg2.add_item();
-  item->add_ra(1);
-  item->add_ra(3);
-  item = msg2.add_item();
-  item->add_ra(3);
-  item->add_ra(2);
-  item->add_ra(1);
-
-  // Compare
-  util::MessageDifferencer differencer;
-  differencer.set_repeated_field_comparison(util::MessageDifferencer::AS_SET);
-  EXPECT_TRUE(differencer.Compare(msg1, msg2));
-}
-
-TEST(MessageDifferencerTest, RepeatedFieldSetTest_Combination) {
-  // Create the testing protos
-  protobuf_unittest::TestDiffMessage msg1;
-  protobuf_unittest::TestDiffMessage msg2;
-  // Treat "item" as Map, with key = "a"
-  // Treat "item.ra" also as Set
-  // Treat "rv" as Set
-  // Treat "rw" as List
-  protobuf_unittest::TestDiffMessage::Item* item = msg1.add_item();
-  item->set_a(3);
-  item->add_ra(1);
-  item->add_ra(2);
-  item->add_ra(3);
-  item = msg1.add_item();
-  item->set_a(4);
-  item->add_ra(5);
-  item->add_ra(6);
-  item = msg1.add_item();
-  item->set_a(1);
-  item->add_ra(1);
-  item->add_ra(3);
-  item = msg1.add_item();
-  item->set_a(2);
-  item->add_ra(6);
-  item->add_ra(7);
-  item->add_ra(8);
-
-  item = msg2.add_item();
-  item->set_a(4);
-  item->add_ra(6);
-  item->add_ra(5);
-  item = msg2.add_item();
-  item->set_a(2);
-  item->add_ra(6);
-  item->add_ra(8);
-  item->add_ra(7);
-  item = msg2.add_item();
-  item->set_a(1);
-  item->add_ra(1);
-  item->add_ra(3);
-  item = msg2.add_item();
-  item->set_a(3);
-  item->add_ra(3);
-  item->add_ra(2);
-  item->add_ra(1);
-
-  msg1.add_rv(3);
-  msg1.add_rv(4);
-  msg1.add_rv(7);
-  msg1.add_rv(0);
-  msg2.add_rv(4);
-  msg2.add_rv(3);
-  msg2.add_rv(0);
-  msg2.add_rv(7);
-
-  msg1.add_rw("nothing");
-  msg2.add_rw("nothing");
-  msg1.add_rw("should");
-  msg2.add_rw("should");
-  msg1.add_rw("change");
-  msg2.add_rw("change");
-
-  // Compare
-  util::MessageDifferencer differencer1;
-  differencer1.TreatAsMap(msg1.GetDescriptor()->FindFieldByName("item"),
-                          item->GetDescriptor()->FindFieldByName("a"));
-  differencer1.TreatAsSet(msg1.GetDescriptor()->FindFieldByName("rv"));
-  differencer1.TreatAsSet(item->GetDescriptor()->FindFieldByName("ra"));
-  EXPECT_TRUE(differencer1.Compare(msg1, msg2));
-
-  util::MessageDifferencer differencer2;
-  differencer2.TreatAsMap(msg1.GetDescriptor()->FindFieldByName("item"),
-                          item->GetDescriptor()->FindFieldByName("a"));
-  differencer2.set_repeated_field_comparison(util::MessageDifferencer::AS_SET);
-  differencer2.TreatAsList(msg1.GetDescriptor()->FindFieldByName("rw"));
-  EXPECT_TRUE(differencer2.Compare(msg1, msg2));
-}
-
-TEST(MessageDifferencerTest, RepeatedFieldMapTest_Partial) {
-  protobuf_unittest::TestDiffMessage msg1;
-  // message msg1 {
-  //   item { a: 1; b: "11" }
-  // }
-  protobuf_unittest::TestDiffMessage::Item* item = msg1.add_item();
-  item->set_a(1);
-  item->set_b("11");
-
-  protobuf_unittest::TestDiffMessage msg2;
-  // message msg2 {
-  //   item { a: 2; b: "22" }
-  //   item { a: 1; b: "11" }
-  // }
-  item = msg2.add_item();
-  item->set_a(2);
-  item->set_b("22");
-  item = msg2.add_item();
-  item->set_a(1);
-  item->set_b("11");
-
-  // Compare
-  util::MessageDifferencer differencer;
-  differencer.TreatAsMap(GetFieldDescriptor(msg1, "item"),
-                         GetFieldDescriptor(msg1, "item.a"));
-  differencer.set_scope(util::MessageDifferencer::PARTIAL);
-  EXPECT_TRUE(differencer.Compare(msg1, msg2));
-}
-
-TEST(MessageDifferencerTest, RepeatedFieldSetTest_Duplicates) {
-  protobuf_unittest::TestDiffMessage a, b, c;
-  // message a: {
-  //   rv: 0
-  //   rv: 1
-  //   rv: 0
-  // }
-  a.add_rv(0);
-  a.add_rv(1);
-  a.add_rv(0);
-  // message b: {
-  //   rv: 0
-  //   rv: 0
-  //   rv: 1
-  // }
-  b.add_rv(0);
-  b.add_rv(0);
-  b.add_rv(1);
-  // message c: {
-  //   rv: 0
-  //   rv: 1
-  // }
-  c.add_rv(0);
-  c.add_rv(1);
-  util::MessageDifferencer differencer;
-  differencer.TreatAsSet(GetFieldDescriptor(a, "rv"));
-  EXPECT_TRUE(differencer.Compare(b, a));
-  EXPECT_FALSE(differencer.Compare(c, a));
-
-  util::MessageDifferencer differencer1;
-  differencer1.set_repeated_field_comparison(util::MessageDifferencer::AS_SET);
-  EXPECT_TRUE(differencer1.Compare(b, a));
-  EXPECT_FALSE(differencer1.Compare(c, a));
-}
-
-TEST(MessageDifferencerTest, RepeatedFieldSetTest_PartialSimple) {
-  protobuf_unittest::TestDiffMessage a, b, c;
-  // message a: {
-  //   rm { c: 1 }
-  //   rm { c: 0 }
-  // }
-  a.add_rm()->set_c(1);
-  a.add_rm()->set_c(0);
-  // message b: {
-  //   rm { c: 1 }
-  //   rm {}
-  // }
-  b.add_rm()->set_c(1);
-  b.add_rm();
-  // message c: {
-  //   rm {}
-  //   rm { c: 1 }
-  // }
-  c.add_rm();
-  c.add_rm()->set_c(1);
-  util::MessageDifferencer differencer;
-  differencer.set_scope(util::MessageDifferencer::PARTIAL);
-  differencer.TreatAsSet(GetFieldDescriptor(a, "rm"));
-  EXPECT_TRUE(differencer.Compare(b, a));
-  EXPECT_TRUE(differencer.Compare(c, a));
-}
-
-TEST(MessageDifferencerTest, RepeatedFieldSetTest_Partial) {
-  protobuf_unittest::TestDiffMessage msg1, msg2;
-  // message msg1: {
-  //   rm { a: 1 }
-  //   rm { b: 2 }
-  //   rm { c: 3 }
-  // }
-  msg1.add_rm()->set_a(1);
-  msg1.add_rm()->set_b(2);
-  msg1.add_rm()->set_c(3);
-  // message msg2: {
-  //   rm { a: 1; c: 3 }
-  //   rm { b: 2; c: 3 }
-  //   rm { b: 2 }
-  // }
-  protobuf_unittest::TestField* field = msg2.add_rm();
-  field->set_a(1);
-  field->set_c(3);
-  field = msg2.add_rm();
-  field->set_b(2);
-  field->set_c(3);
-  field = msg2.add_rm();
-  field->set_b(2);
-
-  util::MessageDifferencer differencer;
-  differencer.set_scope(util::MessageDifferencer::PARTIAL);
-  differencer.TreatAsSet(GetFieldDescriptor(msg1, "rm"));
-  EXPECT_TRUE(differencer.Compare(msg1, msg2));
-}
-
-TEST(MessageDifferencerTest, RepeatedFieldMapTest_MultipleFieldsAsKey) {
-  protobuf_unittest::TestDiffMessage msg1;
-  protobuf_unittest::TestDiffMessage msg2;
-  // Treat "item" as Map, with key = ("a", "ra")
-  // Treat "item.ra" as Set
-  protobuf_unittest::TestDiffMessage::Item* item = msg1.add_item();
-  // key => value: (1, {2, 3}) => "a"
-  item->set_a(1);
-  item->add_ra(2);
-  item->add_ra(3);
-  item->set_b("a");
-  item = msg1.add_item();
-  // key => value: (2, {1, 3}) => "b"
-  item->set_a(2);
-  item->add_ra(1);
-  item->add_ra(3);
-  item->set_b("b");
-  item = msg1.add_item();
-  // key => value: (1, {1, 3}) => "c"
-  item->set_a(1);
-  item->add_ra(1);
-  item->add_ra(3);
-  item->set_b("c");
-
-  item = msg2.add_item();
-  // key => value: (1, {1, 3}) => "c"
-  item->set_a(1);
-  item->add_ra(3);
-  item->add_ra(1);
-  item->set_b("c");
-  item = msg2.add_item();
-  // key => value: (1, {2, 3}) => "a"
-  item->set_a(1);
-  item->add_ra(3);
-  item->add_ra(2);
-  item->set_b("a");
-  item = msg2.add_item();
-  // key => value: (2, {1, 3}) => "b"
-  item->set_a(2);
-  item->add_ra(3);
-  item->add_ra(1);
-  item->set_b("b");
-
-  // Compare
-  util::MessageDifferencer differencer;
-  differencer.TreatAsSet(GetFieldDescriptor(msg1, "item.ra"));
-  EXPECT_FALSE(differencer.Compare(msg1, msg2));
-  std::vector<const FieldDescriptor*> key_fields;
-  key_fields.push_back(GetFieldDescriptor(msg1, "item.a"));
-  key_fields.push_back(GetFieldDescriptor(msg1, "item.ra"));
-  differencer.TreatAsMapWithMultipleFieldsAsKey(
-      GetFieldDescriptor(msg1, "item"), key_fields);
-  EXPECT_TRUE(differencer.Compare(msg1, msg2));
-
-  // Introduce some differences.
-  msg1.clear_item();
-  msg2.clear_item();
-  item = msg1.add_item();
-  item->set_a(4);
-  item->add_ra(5);
-  item->add_ra(6);
-  item->set_b("hello");
-  item = msg2.add_item();
-  item->set_a(4);
-  item->add_ra(6);
-  item->add_ra(5);
-  item->set_b("world");
-  std::string output;
-  differencer.ReportDifferencesToString(&output);
-  EXPECT_FALSE(differencer.Compare(msg1, msg2));
-  EXPECT_EQ(
-      "moved: item[0].ra[0] -> item[0].ra[1] : 5\n"
-      "moved: item[0].ra[1] -> item[0].ra[0] : 6\n"
-      "modified: item[0].b: \"hello\" -> \"world\"\n",
-      output);
-}
-
-TEST(MessageDifferencerTest, RepeatedFieldMapTest_MultipleFieldPathsAsKey) {
-  protobuf_unittest::TestDiffMessage msg1;
-  protobuf_unittest::TestDiffMessage msg2;
-  // Treat "item" as Map, with key = ("m.a", "m.rc")
-  // Treat "item.m.rc" as Set
-  protobuf_unittest::TestDiffMessage::Item* item = msg1.add_item();
-  // key => value: (1, {2, 3}) => "a"
-  item->mutable_m()->set_a(1);
-  item->mutable_m()->add_rc(2);
-  item->mutable_m()->add_rc(3);
-  item->set_b("a");
-  item = msg1.add_item();
-  // key => value: (2, {1, 3}) => "b"
-  item->mutable_m()->set_a(2);
-  item->mutable_m()->add_rc(1);
-  item->mutable_m()->add_rc(3);
-  item->set_b("b");
-  item = msg1.add_item();
-  // key => value: (1, {1, 3}) => "c"
-  item->mutable_m()->set_a(1);
-  item->mutable_m()->add_rc(1);
-  item->mutable_m()->add_rc(3);
-  item->set_b("c");
-
-  item = msg2.add_item();
-  // key => value: (1, {1, 3}) => "c"
-  item->mutable_m()->set_a(1);
-  item->mutable_m()->add_rc(3);
-  item->mutable_m()->add_rc(1);
-  item->set_b("c");
-  item = msg2.add_item();
-  // key => value: (1, {2, 3}) => "a"
-  item->mutable_m()->set_a(1);
-  item->mutable_m()->add_rc(3);
-  item->mutable_m()->add_rc(2);
-  item->set_b("a");
-  item = msg2.add_item();
-  // key => value: (2, {1, 3}) => "b"
-  item->mutable_m()->set_a(2);
-  item->mutable_m()->add_rc(3);
-  item->mutable_m()->add_rc(1);
-  item->set_b("b");
-
-  // Compare
-  util::MessageDifferencer differencer;
-  differencer.TreatAsSet(GetFieldDescriptor(msg1, "item.m.rc"));
-  EXPECT_FALSE(differencer.Compare(msg1, msg2));
-  std::vector<std::vector<const FieldDescriptor*> > key_field_paths;
-  std::vector<const FieldDescriptor*> key_field_path1;
-  key_field_path1.push_back(GetFieldDescriptor(msg1, "item.m"));
-  key_field_path1.push_back(GetFieldDescriptor(msg1, "item.m.a"));
-  std::vector<const FieldDescriptor*> key_field_path2;
-  key_field_path2.push_back(GetFieldDescriptor(msg1, "item.m"));
-  key_field_path2.push_back(GetFieldDescriptor(msg1, "item.m.rc"));
-  key_field_paths.push_back(key_field_path1);
-  key_field_paths.push_back(key_field_path2);
-  differencer.TreatAsMapWithMultipleFieldPathsAsKey(
-      GetFieldDescriptor(msg1, "item"), key_field_paths);
-  EXPECT_TRUE(differencer.Compare(msg1, msg2));
-
-  // Introduce some differences.
-  msg1.clear_item();
-  msg2.clear_item();
-  item = msg1.add_item();
-  item->mutable_m()->set_a(4);
-  item->mutable_m()->add_rc(5);
-  item->mutable_m()->add_rc(6);
-  item->set_b("hello");
-  item = msg2.add_item();
-  item->mutable_m()->set_a(4);
-  item->mutable_m()->add_rc(6);
-  item->mutable_m()->add_rc(5);
-  item->set_b("world");
-  std::string output;
-  differencer.ReportDifferencesToString(&output);
-  EXPECT_FALSE(differencer.Compare(msg1, msg2));
-  EXPECT_EQ(
-      "modified: item[0].b: \"hello\" -> \"world\"\n"
-      "moved: item[0].m.rc[0] -> item[0].m.rc[1] : 5\n"
-      "moved: item[0].m.rc[1] -> item[0].m.rc[0] : 6\n",
-      output);
-}
-
-TEST(MessageDifferencerTest, RepeatedFieldMapTest_IgnoredKeyFields) {
-  protobuf_unittest::TestDiffMessage msg1;
-  protobuf_unittest::TestDiffMessage msg2;
-  // Treat "item" as Map, with key = ("a", "ra")
-  protobuf_unittest::TestDiffMessage::Item* item = msg1.add_item();
-  item->set_a(1);
-  item->add_ra(2);
-  item->set_b("hello");
-  item = msg2.add_item();
-  item->set_a(1);
-  item->add_ra(3);
-  item->set_b("world");
-  // Compare
-  util::MessageDifferencer differencer;
-  std::vector<const FieldDescriptor*> key_fields;
-  key_fields.push_back(GetFieldDescriptor(msg1, "item.a"));
-  key_fields.push_back(GetFieldDescriptor(msg1, "item.ra"));
-  differencer.TreatAsMapWithMultipleFieldsAsKey(
-      GetFieldDescriptor(msg1, "item"), key_fields);
-  std::string output;
-  differencer.ReportDifferencesToString(&output);
-  EXPECT_FALSE(differencer.Compare(msg1, msg2));
-  EXPECT_EQ(
-      "added: item[0]: { a: 1 ra: 3 b: \"world\" }\n"
-      "deleted: item[0]: { a: 1 ra: 2 b: \"hello\" }\n",
-      output);
-  // Ignored fields that are listed as parts of the key are still used
-  // in key comparison, but they're not used in value comparison.
-  differencer.IgnoreField(GetFieldDescriptor(msg1, "item.ra"));
-  output.clear();
-  EXPECT_FALSE(differencer.Compare(msg1, msg2));
-  EXPECT_EQ(
-      "added: item[0]: { a: 1 ra: 3 b: \"world\" }\n"
-      "deleted: item[0]: { a: 1 ra: 2 b: \"hello\" }\n",
-      output);
-  // Ignoring a field in the key is different from treating the left fields
-  // as key. That is:
-  //   (key = ("a", "ra") && ignore "ra") != (key = ("a") && ignore "ra")
-  util::MessageDifferencer differencer2;
-  differencer2.TreatAsMap(GetFieldDescriptor(msg1, "item"),
-                          GetFieldDescriptor(msg1, "item.a"));
-  differencer2.IgnoreField(GetFieldDescriptor(msg1, "item.ra"));
-  output.clear();
-  differencer2.ReportDifferencesToString(&output);
-  EXPECT_FALSE(differencer2.Compare(msg1, msg2));
-  EXPECT_EQ(
-      "ignored: item[0].ra\n"
-      "modified: item[0].b: \"hello\" -> \"world\"\n",
-      output);
-}
-
-TEST(MessageDifferencerTest, PrintMapKeysTest) {
-  // Note that because map is unordered, the comparison
-  // output string for test evaluation cannot assume order of
-  // output of fields (IOW if two fields are deleted
-  // one cannot assume which deleted field log will be printed first).
-  // Test currently just has a single record per operation to address this.
-  // This should only be a limitation for EXPECT_EQ evaluation.
-  protobuf_unittest::TestDiffMessage msg1;
-  protobuf_unittest::TestDiffMessage msg2;
-  protobuf_unittest::TestDiffMessage::Item* item = msg1.add_item();
-  item->mutable_mp()->insert({{"key_a", 1}, {"key_b", 2}, {"key_c", 3}});
-  item = msg2.add_item();
-  item->mutable_mp()->insert({{"key_a", 1}, {"key_b", 3}, {"key_d", 4}});
-
-  util::MessageDifferencer differencer;
-  std::string diff;
-  differencer.ReportDifferencesToString(&diff);
-  EXPECT_FALSE(differencer.Compare(msg1, msg2));
-  EXPECT_EQ(
-      "modified: item[0].mp[key_b]: 2 -> 3\n"
-      "added: item[0].mp[key_d]: 4\n"
-      "deleted: item[0].mp[key_c]: 3\n",
-      diff);
-
-  google::protobuf::Any any1, any2;
-  any1.PackFrom(msg1);
-  any2.PackFrom(msg2);
-  std::string diff_with_any;
-  differencer.ReportDifferencesToString(&diff_with_any);
-  EXPECT_FALSE(differencer.Compare(any1, any2));
-  EXPECT_EQ(
-      "modified: item[0].mp[key_b]: 2 -> 3\n"
-      "added: item[0].mp[key_d]: 4\n"
-      "deleted: item[0].mp[key_c]: 3\n",
-      diff_with_any);
-}
-
-static const char* const kIgnoredFields[] = {"rm.b", "rm.m.b"};
-
-class TestIgnorer : public util::MessageDifferencer::IgnoreCriteria {
- public:
-  bool IsIgnored(const Message& message1, const Message& message2,
-                 const FieldDescriptor* field,
-                 const std::vector<util::MessageDifferencer::SpecificField>&
-                     parent_fields) override {
-    std::string name = "";
-    for (int i = 0; i < parent_fields.size(); ++i) {
-      name += parent_fields[i].field->name() + ".";
-    }
-    name += field->name();
-    for (int i = 0; i < GOOGLE_ARRAYSIZE(kIgnoredFields); ++i) {
-      if (name.compare(kIgnoredFields[i]) == 0) {
-        return true;
-      }
-    }
-    return false;
-  }
-};
-
-TEST(MessageDifferencerTest, TreatRepeatedFieldAsSetWithIgnoredFields) {
-  protobuf_unittest::TestDiffMessage msg1;
-  protobuf_unittest::TestDiffMessage msg2;
-  TextFormat::MergeFromString("rm { a: 11\n b: 12 }", &msg1);
-  TextFormat::MergeFromString("rm { a: 11\n b: 13 }", &msg2);
-  util::MessageDifferencer differ;
-  differ.TreatAsSet(GetFieldDescriptor(msg1, "rm"));
-  differ.AddIgnoreCriteria(new TestIgnorer);
-  EXPECT_TRUE(differ.Compare(msg1, msg2));
-}
-
-TEST(MessageDifferencerTest, TreatRepeatedFieldAsMapWithIgnoredKeyFields) {
-  protobuf_unittest::TestDiffMessage msg1;
-  protobuf_unittest::TestDiffMessage msg2;
-  TextFormat::MergeFromString("rm { a: 11\n m { a: 12\n b: 13\n } }", &msg1);
-  TextFormat::MergeFromString("rm { a: 11\n m { a: 12\n b: 14\n } }", &msg2);
-  util::MessageDifferencer differ;
-  differ.TreatAsMap(GetFieldDescriptor(msg1, "rm"),
-                    GetFieldDescriptor(msg1, "rm.m"));
-  differ.AddIgnoreCriteria(new TestIgnorer);
-  EXPECT_TRUE(differ.Compare(msg1, msg2));
-}
-
-// Takes the product of all elements of item.ra as the key for key comparison.
-class ValueProductMapKeyComparator
-    : public util::MessageDifferencer::MapKeyComparator {
- public:
-  typedef util::MessageDifferencer::SpecificField SpecificField;
-  bool IsMatch(const Message& message1, const Message& message2,
-               const std::vector<SpecificField>& parent_fields) const override {
-    const Reflection* reflection1 = message1.GetReflection();
-    const Reflection* reflection2 = message2.GetReflection();
-    // FieldDescriptor for item.ra
-    const FieldDescriptor* ra_field =
-        message1.GetDescriptor()->FindFieldByName("ra");
-    // Get the product of all elements in item.ra
-    int result1 = 1, result2 = 1;
-    for (int i = 0; i < reflection1->FieldSize(message1, ra_field); ++i) {
-      result1 *= reflection1->GetRepeatedInt32(message1, ra_field, i);
-    }
-    for (int i = 0; i < reflection2->FieldSize(message2, ra_field); ++i) {
-      result2 *= reflection2->GetRepeatedInt32(message2, ra_field, i);
-    }
-    return result1 == result2;
-  }
-};
-
-TEST(MessageDifferencerTest, RepeatedFieldMapTest_CustomMapKeyComparator) {
-  protobuf_unittest::TestDiffMessage msg1;
-  protobuf_unittest::TestDiffMessage msg2;
-  // Treat "item" as Map, using custom key comparator to determine if two
-  // elements have the same key.
-  protobuf_unittest::TestDiffMessage::Item* item = msg1.add_item();
-  item->add_ra(6);
-  item->add_ra(35);
-  item->set_b("hello");
-  item = msg2.add_item();
-  item->add_ra(10);
-  item->add_ra(21);
-  item->set_b("hello");
-  util::MessageDifferencer differencer;
-  ValueProductMapKeyComparator key_comparator;
-  differencer.TreatAsMapUsingKeyComparator(GetFieldDescriptor(msg1, "item"),
-                                           &key_comparator);
-  std::string output;
-  differencer.ReportDifferencesToString(&output);
-  // Though the above two messages have different values for item.ra, they
-  // are regarded as having the same key because 6 * 35 == 10 * 21. That's
-  // how the key comparator determines if the two have the same key.
-  // However, in value comparison, all fields of the message are taken into
-  // consideration, so they are different because their item.ra fields have
-  // different values using normal value comparison.
-  EXPECT_FALSE(differencer.Compare(msg1, msg2));
-  EXPECT_EQ(
-      "modified: item[0].ra[0]: 6 -> 10\n"
-      "modified: item[0].ra[1]: 35 -> 21\n",
-      output);
-  differencer.IgnoreField(GetFieldDescriptor(msg1, "item.ra"));
-  output.clear();
-  // item.ra is ignored in value comparison, so the two messages equal.
-  EXPECT_TRUE(differencer.Compare(msg1, msg2));
-  EXPECT_EQ("ignored: item[0].ra\n", output);
-}
-
-// Compares fields by their index offset by one, so index 0 matches with 1, etc.
-class OffsetByOneMapKeyComparator
-    : public util::MessageDifferencer::MapKeyComparator {
- public:
-  typedef util::MessageDifferencer::SpecificField SpecificField;
-  bool IsMatch(const Message& message1, const Message& message2,
-               const std::vector<SpecificField>& parent_fields) const override {
-    return parent_fields.back().index + 1 == parent_fields.back().new_index;
-  }
-};
-
-TEST(MessageDifferencerTest, RepeatedFieldMapTest_CustomIndexMapKeyComparator) {
-  protobuf_unittest::TestDiffMessage msg1;
-  protobuf_unittest::TestDiffMessage msg2;
-  // Treat "item" as Map, using custom key comparator to determine if two
-  // elements have the same key.
-  protobuf_unittest::TestDiffMessage::Item* item = msg1.add_item();
-  item->set_b("one");
-  item = msg2.add_item();
-  item->set_b("zero");
-  item = msg2.add_item();
-  item->set_b("one");
-  util::MessageDifferencer differencer;
-  OffsetByOneMapKeyComparator key_comparator;
-  differencer.TreatAsMapUsingKeyComparator(GetFieldDescriptor(msg1, "item"),
-                                           &key_comparator);
-  std::string output;
-  differencer.ReportDifferencesToString(&output);
-  // With the offset by one comparator msg1.item[0] should be compared to
-  // msg2.item[1] and thus be moved, msg2.item[0] should be marked as added.
-  EXPECT_FALSE(differencer.Compare(msg1, msg2));
-  EXPECT_EQ(
-      "moved: item[0] -> item[1] : { b: \"one\" }\n"
-      "added: item[0]: { b: \"zero\" }\n",
-      output);
-}
-
-TEST(MessageDifferencerTest, RepeatedFieldSetTest_Subset) {
-  protobuf_unittest::TestDiffMessage msg1;
-  protobuf_unittest::TestDiffMessage msg2;
-
-  msg1.add_rv(3);
-  msg1.add_rv(8);
-  msg1.add_rv(2);
-  msg2.add_rv(2);
-  msg2.add_rv(3);
-  msg2.add_rv(5);
-  msg2.add_rv(8);
-
-  util::MessageDifferencer differencer;
-
-  // Fail with only partial scope set.
-  differencer.set_scope(util::MessageDifferencer::PARTIAL);
-  differencer.set_repeated_field_comparison(util::MessageDifferencer::AS_LIST);
-  EXPECT_FALSE(differencer.Compare(msg1, msg2));
-
-  // Fail with only set-like comparison set.
-  differencer.set_scope(util::MessageDifferencer::FULL);
-  differencer.set_repeated_field_comparison(util::MessageDifferencer::AS_SET);
-  EXPECT_FALSE(differencer.Compare(msg1, msg2));
-
-  // Succeed with scope and repeated field comparison set properly.
-  differencer.set_scope(util::MessageDifferencer::PARTIAL);
-  differencer.set_repeated_field_comparison(util::MessageDifferencer::AS_SET);
-  EXPECT_TRUE(differencer.Compare(msg1, msg2));
-}
-
-TEST(MessageDifferencerTest, IgnoreField_Single) {
-  protobuf_unittest::TestField msg1;
-  protobuf_unittest::TestField msg2;
-
-  msg1.set_c(3);
-  msg1.add_rc(1);
-
-  msg2.set_c(5);
-  msg2.add_rc(1);
-
-  util::MessageDifferencer differencer;
-  differencer.IgnoreField(GetFieldDescriptor(msg1, "c"));
-
-  ExpectEqualsWithDifferencer(&differencer, msg1, msg2);
-}
-
-TEST(MessageDifferencerTest, IgnoreField_Repeated) {
-  protobuf_unittest::TestField msg1;
-  protobuf_unittest::TestField msg2;
-
-  msg1.set_c(3);
-  msg1.add_rc(1);
-  msg1.add_rc(2);
-
-  msg2.set_c(3);
-  msg2.add_rc(1);
-  msg2.add_rc(3);
-
-  util::MessageDifferencer differencer;
-  differencer.IgnoreField(GetFieldDescriptor(msg1, "rc"));
-
-  ExpectEqualsWithDifferencer(&differencer, msg1, msg2);
-}
-
-TEST(MessageDifferencerTest, IgnoreField_Message) {
-  protobuf_unittest::TestDiffMessage msg1;
-  protobuf_unittest::TestDiffMessage msg2;
-
-  protobuf_unittest::TestField* field;
-
-  field = msg1.add_rm();
-  field->set_c(3);
-
-  field = msg2.add_rm();
-  field->set_c(4);
-
-  util::MessageDifferencer differencer;
-  differencer.IgnoreField(GetFieldDescriptor(msg1, "rm"));
-
-  ExpectEqualsWithDifferencer(&differencer, msg1, msg2);
-}
-
-TEST(MessageDifferencerTest, IgnoreField_Group) {
-  protobuf_unittest::TestDiffMessage msg1;
-  protobuf_unittest::TestDiffMessage msg2;
-
-  protobuf_unittest::TestDiffMessage::Item* item;
-
-  item = msg1.add_item();
-  item->set_a(3);
-
-  item = msg2.add_item();
-  item->set_a(4);
-
-  util::MessageDifferencer differencer;
-  differencer.IgnoreField(GetFieldDescriptor(msg1, "item"));
-
-  ExpectEqualsWithDifferencer(&differencer, msg1, msg2);
-}
-
-TEST(MessageDifferencerTest, IgnoreField_Missing) {
-  protobuf_unittest::TestField msg1;
-  protobuf_unittest::TestField msg2;
-
-  msg1.set_c(3);
-  msg1.add_rc(1);
-
-  msg2.add_rc(1);
-
-  util::MessageDifferencer differencer;
-  differencer.IgnoreField(GetFieldDescriptor(msg1, "c"));
-
-  ExpectEqualsWithDifferencer(&differencer, msg1, msg2);
-  ExpectEqualsWithDifferencer(&differencer, msg2, msg1);
-}
-
-TEST(MessageDifferencerTest, IgnoreField_Multiple) {
-  protobuf_unittest::TestField msg1;
-  protobuf_unittest::TestField msg2;
-
-  msg1.set_c(3);
-  msg1.add_rc(1);
-  msg1.add_rc(2);
-
-  msg2.set_c(5);
-  msg2.add_rc(1);
-  msg2.add_rc(3);
-
-  const FieldDescriptor* c = GetFieldDescriptor(msg1, "c");
-  const FieldDescriptor* rc = GetFieldDescriptor(msg1, "rc");
-
-  {  // Ignore c
-    util::MessageDifferencer differencer;
-    differencer.IgnoreField(c);
-
-    EXPECT_FALSE(differencer.Compare(msg1, msg2));
-  }
-  {  // Ignore rc
-    util::MessageDifferencer differencer;
-    differencer.IgnoreField(rc);
-
-    EXPECT_FALSE(differencer.Compare(msg1, msg2));
-  }
-  {  // Ignore both
-    util::MessageDifferencer differencer;
-    differencer.IgnoreField(c);
-    differencer.IgnoreField(rc);
-
-    ExpectEqualsWithDifferencer(&differencer, msg1, msg2);
-  }
-}
-
-TEST(MessageDifferencerTest, IgnoreField_NestedMessage) {
-  protobuf_unittest::TestDiffMessage msg1;
-  protobuf_unittest::TestDiffMessage msg2;
-
-  protobuf_unittest::TestField* field;
-
-  field = msg1.add_rm();
-  field->set_c(3);
-  field->add_rc(1);
-
-  field = msg2.add_rm();
-  field->set_c(4);
-  field->add_rc(1);
-
-  util::MessageDifferencer differencer;
-  differencer.IgnoreField(GetFieldDescriptor(msg1, "rm.c"));
-
-  ExpectEqualsWithDifferencer(&differencer, msg1, msg2);
-}
-
-TEST(MessageDifferencerTest, IgnoreField_NestedGroup) {
-  protobuf_unittest::TestDiffMessage msg1;
-  protobuf_unittest::TestDiffMessage msg2;
-
-  protobuf_unittest::TestDiffMessage::Item* item;
-
-  item = msg1.add_item();
-  item->set_a(3);
-  item->set_b("foo");
-
-  item = msg2.add_item();
-  item->set_a(4);
-  item->set_b("foo");
-
-  util::MessageDifferencer differencer;
-  differencer.IgnoreField(GetFieldDescriptor(msg1, "item.a"));
-
-  ExpectEqualsWithDifferencer(&differencer, msg1, msg2);
-}
-
-TEST(MessageDifferencerTest, IgnoreField_InsideSet) {
-  protobuf_unittest::TestDiffMessage msg1;
-  protobuf_unittest::TestDiffMessage msg2;
-
-  protobuf_unittest::TestDiffMessage::Item* item;
-
-  item = msg1.add_item();
-  item->set_a(1);
-  item->set_b("foo");
-  item->add_ra(1);
-
-  item = msg1.add_item();
-  item->set_a(2);
-  item->set_b("bar");
-  item->add_ra(2);
-
-  item = msg2.add_item();
-  item->set_a(2);
-  item->set_b("bar");
-  item->add_ra(2);
-
-  item = msg2.add_item();
-  item->set_a(1);
-  item->set_b("baz");
-  item->add_ra(1);
-
-  const FieldDescriptor* item_desc = GetFieldDescriptor(msg1, "item");
-  const FieldDescriptor* b = GetFieldDescriptor(msg1, "item.b");
-
-  util::MessageDifferencer differencer;
-  differencer.IgnoreField(b);
-  differencer.TreatAsSet(item_desc);
-
-  ExpectEqualsWithDifferencer(&differencer, msg1, msg2);
-}
-
-TEST(MessageDifferencerTest, IgnoreField_InsideMap) {
-  protobuf_unittest::TestDiffMessage msg1;
-  protobuf_unittest::TestDiffMessage msg2;
-
-  protobuf_unittest::TestDiffMessage::Item* item;
-
-  item = msg1.add_item();
-  item->set_a(1);
-  item->set_b("foo");
-  item->add_ra(1);
-
-  item = msg1.add_item();
-  item->set_a(2);
-  item->set_b("bar");
-  item->add_ra(2);
-
-  item = msg2.add_item();
-  item->set_a(2);
-  item->set_b("bar");
-  item->add_ra(2);
-
-  item = msg2.add_item();
-  item->set_a(1);
-  item->set_b("baz");
-  item->add_ra(1);
-
-  const FieldDescriptor* item_desc = GetFieldDescriptor(msg1, "item");
-  const FieldDescriptor* a = GetFieldDescriptor(msg1, "item.a");
-  const FieldDescriptor* b = GetFieldDescriptor(msg1, "item.b");
-
-  util::MessageDifferencer differencer;
-  differencer.IgnoreField(b);
-  differencer.TreatAsMap(item_desc, a);
-
-  ExpectEqualsWithDifferencer(&differencer, msg1, msg2);
-}
-
-TEST(MessageDifferencerTest, IgnoreField_DoesNotIgnoreKey) {
-  protobuf_unittest::TestDiffMessage msg1;
-  protobuf_unittest::TestDiffMessage msg2;
-
-  protobuf_unittest::TestDiffMessage::Item* item;
-
-  item = msg1.add_item();
-  item->set_a(1);
-  item->set_b("foo");
-  item->add_ra(1);
-
-  item = msg2.add_item();
-  item->set_a(2);
-  item->set_b("foo");
-  item->add_ra(1);
-
-  const FieldDescriptor* item_desc = GetFieldDescriptor(msg1, "item");
-  const FieldDescriptor* a = GetFieldDescriptor(msg1, "item.a");
-
-  util::MessageDifferencer differencer;
-  differencer.IgnoreField(a);
-  differencer.TreatAsMap(item_desc, a);
-
-  EXPECT_FALSE(differencer.Compare(msg1, msg2));
-}
-
-TEST(MessageDifferencerTest, IgnoreField_TrumpsCompareWithFields) {
-  protobuf_unittest::TestField msg1;
-  protobuf_unittest::TestField msg2;
-
-  msg1.set_c(3);
-  msg1.add_rc(1);
-  msg1.add_rc(2);
-
-  msg2.set_c(3);
-  msg2.add_rc(1);
-  msg2.add_rc(3);
-
-  const FieldDescriptor* c = GetFieldDescriptor(msg1, "c");
-  const FieldDescriptor* rc = GetFieldDescriptor(msg1, "rc");
-
-  std::vector<const FieldDescriptor*> fields;
-  fields.push_back(c);
-  fields.push_back(rc);
-
-  util::MessageDifferencer differencer;
-  differencer.IgnoreField(rc);
-
-  differencer.set_scope(util::MessageDifferencer::FULL);
-  EXPECT_TRUE(differencer.CompareWithFields(msg1, msg2, fields, fields));
-
-  differencer.set_scope(util::MessageDifferencer::PARTIAL);
-  EXPECT_TRUE(differencer.CompareWithFields(msg1, msg2, fields, fields));
-}
-
-TEST(MessageDifferencerTest, IgnoreField_SetReportIgnoresFalse) {
-  protobuf_unittest::TestField msg1;
-  protobuf_unittest::TestField msg2;
-
-  msg1.set_a(1);
-  msg1.set_b(2);
-  msg1.set_c(3);
-  msg1.add_rc(1);
-  msg1.add_rc(2);
-
-  msg2.set_a(1);
-  msg2.set_b(1);
-
-  const FieldDescriptor* a = GetFieldDescriptor(msg1, "a");
-  const FieldDescriptor* b = GetFieldDescriptor(msg1, "b");
-  const FieldDescriptor* c = GetFieldDescriptor(msg1, "c");
-  const FieldDescriptor* rc = GetFieldDescriptor(msg1, "rc");
-
-  std::vector<const FieldDescriptor*> fields;
-  fields.push_back(a);
-  fields.push_back(b);
-  fields.push_back(c);
-  fields.push_back(rc);
-
-  std::string diff_report;
-  util::MessageDifferencer differencer;
-  differencer.set_report_ignores(false);
-  differencer.set_report_matches(true);
-  differencer.ReportDifferencesToString(&diff_report);
-  differencer.IgnoreField(c);
-  differencer.IgnoreField(rc);
-  differencer.set_scope(util::MessageDifferencer::FULL);
-  EXPECT_FALSE(differencer.CompareWithFields(msg1, msg2, fields, fields));
-
-  EXPECT_EQ(diff_report,
-            "matched: a : 1\n"
-            "modified: b: 2 -> 1\n");
-}
-
-
-// Test class to save a copy of the last field_context.parent_fields() vector
-// passed to the comparison function.
-class ParentSavingFieldComparator : public util::FieldComparator {
- public:
-  ParentSavingFieldComparator() {}
-
-  ComparisonResult Compare(const Message& message_1, const Message& message_2,
-                           const FieldDescriptor* field, int index_1,
-                           int index_2,
-                           const util::FieldContext* field_context) override {
-    if (field_context) parent_fields_ = *(field_context->parent_fields());
-    if (field->cpp_type() == FieldDescriptor::CPPTYPE_MESSAGE) {
-      return RECURSE;
-    } else {
-      return SAME;
-    }
-  }
-
-  std::vector<util::MessageDifferencer::SpecificField> parent_fields() {
-    return parent_fields_;
-  }
-
- private:
-  std::vector<util::MessageDifferencer::SpecificField> parent_fields_;
-};
-
-// Tests if MessageDifferencer sends the parent fields in the FieldContext
-// parameter.
-TEST(MessageDifferencerTest, FieldContextParentFieldsTest) {
-  protobuf_unittest::TestDiffMessage msg1;
-  msg1.add_rm()->set_c(1);
-  protobuf_unittest::TestDiffMessage msg2;
-  msg2.add_rm()->set_c(1);
-
-  ParentSavingFieldComparator field_comparator;
-  util::MessageDifferencer differencer;
-  differencer.set_field_comparator(&field_comparator);
-  differencer.Compare(msg1, msg2);
-
-  // We want only one parent with the name "rm"
-  ASSERT_EQ(1, field_comparator.parent_fields().size());
-  EXPECT_EQ("rm", field_comparator.parent_fields()[0].field->name());
-}
-
-
-class ComparisonTest : public testing::Test {
- protected:
-  ComparisonTest() : use_equivalency_(false), repeated_field_as_set_(false) {
-    // Setup the test.
-    TestUtil::SetAllFields(&proto1_);
-    TestUtil::SetAllFields(&proto2_);
-
-    TestUtil::SetAllExtensions(&proto1ex_);
-    TestUtil::SetAllExtensions(&proto2ex_);
-
-    TestUtil::SetAllFieldsAndExtensions(&orderings_proto1_);
-    TestUtil::SetAllFieldsAndExtensions(&orderings_proto2_);
-
-    unknown1_ = empty1_.mutable_unknown_fields();
-    unknown2_ = empty2_.mutable_unknown_fields();
-  }
-
-  ~ComparisonTest() override {}
-
-  void SetSpecialFieldOption(const Message& message,
-                             util::MessageDifferencer* d) {
-    if (!ignored_field_.empty()) {
-      d->IgnoreField(GetFieldDescriptor(message, ignored_field_));
-    }
-
-    if (repeated_field_as_set_) {
-      d->set_repeated_field_comparison(util::MessageDifferencer::AS_SET);
-    }
-
-    if (!set_field_.empty()) {
-      d->TreatAsSet(GetFieldDescriptor(message, set_field_));
-    }
-
-    if (!map_field_.empty() && !map_key_.empty()) {
-      d->TreatAsMap(GetFieldDescriptor(message, map_field_),
-                    GetFieldDescriptor(message, map_field_ + "." + map_key_));
-    }
-  }
-
-  std::string Run(const Message& msg1, const Message& msg2) {
-    std::string output;
-
-    // Setup the comparison.
-    util::MessageDifferencer differencer;
-    differencer.ReportDifferencesToString(&output);
-
-    if (use_equivalency_) {
-      differencer.set_message_field_comparison(
-          util::MessageDifferencer::EQUIVALENT);
-    }
-
-    SetSpecialFieldOption(msg1, &differencer);
-
-    // Conduct the comparison.
-    EXPECT_FALSE(differencer.Compare(msg1, msg2));
-
-    return output;
-  }
-
-  std::string Run() { return Run(proto1_, proto2_); }
-
-  std::string RunOrder() { return Run(orderings_proto1_, orderings_proto2_); }
-
-  std::string RunEx() { return Run(proto1ex_, proto2ex_); }
-
-  std::string RunDiff() { return Run(proto1diff_, proto2diff_); }
-
-  std::string RunUn() { return Run(empty1_, empty2_); }
-
-  void use_equivalency() { use_equivalency_ = true; }
-
-  void repeated_field_as_set() { repeated_field_as_set_ = true; }
-
-  void field_as_set(const std::string& field) { set_field_ = field; }
-
-  void field_as_map(const std::string& field, const std::string& key) {
-    map_field_ = field;
-    map_key_ = key;
-  }
-
-  void ignore_field(const std::string& field) { ignored_field_ = field; }
-
-  unittest::TestAllTypes proto1_;
-  unittest::TestAllTypes proto2_;
-
-  unittest::TestFieldOrderings orderings_proto1_;
-  unittest::TestFieldOrderings orderings_proto2_;
-
-  unittest::TestAllExtensions proto1ex_;
-  unittest::TestAllExtensions proto2ex_;
-
-  unittest::TestDiffMessage proto1diff_;
-  unittest::TestDiffMessage proto2diff_;
-
-  unittest::TestEmptyMessage empty1_;
-  unittest::TestEmptyMessage empty2_;
-
-  unittest::TestMap map_proto1_;
-  unittest::TestMap map_proto2_;
-
-  UnknownFieldSet* unknown1_;
-  UnknownFieldSet* unknown2_;
-
-  bool use_equivalency_;
-  bool repeated_field_as_set_;
-
-  std::string set_field_;
-  std::string map_field_;
-  std::string map_key_;
-  std::string ignored_field_;
-};
-
-// Basic tests.
-TEST_F(ComparisonTest, AdditionTest) {
-  proto1_.clear_optional_int32();
-
-  EXPECT_EQ("added: optional_int32: 101\n", Run());
-}
-
-TEST_F(ComparisonTest, Addition_OrderTest) {
-  orderings_proto1_.clear_my_int();
-
-  EXPECT_EQ("added: my_int: 1\n", RunOrder());
-}
-
-TEST_F(ComparisonTest, DeletionTest) {
-  proto2_.clear_optional_int32();
-
-  EXPECT_EQ("deleted: optional_int32: 101\n", Run());
-}
-
-TEST_F(ComparisonTest, Deletion_OrderTest) {
-  orderings_proto2_.clear_my_string();
-
-  EXPECT_EQ("deleted: my_string: \"foo\"\n", RunOrder());
-}
-
-TEST_F(ComparisonTest, RepeatedDeletionTest) {
-  proto2_.clear_repeated_int32();
-
-  EXPECT_EQ(
-      "deleted: repeated_int32[0]: 201\n"
-      "deleted: repeated_int32[1]: 301\n",
-      Run());
-}
-
-TEST_F(ComparisonTest, ModificationTest) {
-  proto1_.set_optional_int32(-1);
-
-  EXPECT_EQ("modified: optional_int32: -1 -> 101\n", Run());
-}
-
-// Basic equivalency tests.
-TEST_F(ComparisonTest, EquivalencyAdditionTest) {
-  use_equivalency();
-
-  proto1_.clear_optional_int32();
-
-  EXPECT_EQ("modified: optional_int32: 0 -> 101\n", Run());
-}
-
-TEST_F(ComparisonTest, EquivalencyDeletionTest) {
-  use_equivalency();
-
-  proto2_.clear_optional_int32();
-
-  EXPECT_EQ("modified: optional_int32: 101 -> 0\n", Run());
-}
-
-// Group tests.
-TEST_F(ComparisonTest, GroupAdditionTest) {
-  proto1_.mutable_optionalgroup()->clear_a();
-
-  EXPECT_EQ("added: optionalgroup.a: 117\n", Run());
-}
-
-TEST_F(ComparisonTest, GroupDeletionTest) {
-  proto2_.mutable_optionalgroup()->clear_a();
-
-  EXPECT_EQ("deleted: optionalgroup.a: 117\n", Run());
-}
-
-TEST_F(ComparisonTest, GroupModificationTest) {
-  proto1_.mutable_optionalgroup()->set_a(2);
-
-  EXPECT_EQ("modified: optionalgroup.a: 2 -> 117\n", Run());
-}
-
-TEST_F(ComparisonTest, GroupFullAdditionTest) {
-  proto1_.clear_optionalgroup();
-
-  // Note the difference in the output between this and GroupAdditionTest.
-  EXPECT_EQ("added: optionalgroup: { a: 117 }\n", Run());
-}
-
-TEST_F(ComparisonTest, GroupFullDeletionTest) {
-  proto2_.clear_optionalgroup();
-
-  EXPECT_EQ("deleted: optionalgroup: { a: 117 }\n", Run());
-}
-
-TEST_F(ComparisonTest, RepeatedSetOptionTest) {
-  repeated_field_as_set();
-
-  proto2_.clear_repeatedgroup();
-  proto1_.clear_repeatedgroup();
-  proto1_.add_repeatedgroup()->set_a(317);
-  proto2_.add_repeatedgroup()->set_a(909);
-  proto2_.add_repeatedgroup()->set_a(907);
-  proto1_.add_repeatedgroup()->set_a(904);
-  proto1_.add_repeatedgroup()->set_a(907);
-  proto1_.add_repeatedgroup()->set_a(909);
-
-  EXPECT_EQ(
-      "moved: repeatedgroup[2] -> repeatedgroup[1] : { a: 907 }\n"
-      "moved: repeatedgroup[3] -> repeatedgroup[0] : { a: 909 }\n"
-      "deleted: repeatedgroup[0]: { a: 317 }\n"
-      "deleted: repeatedgroup[1]: { a: 904 }\n",
-      Run());
-}
-
-TEST_F(ComparisonTest, RepeatedSetOptionTest_Ex) {
-  repeated_field_as_set();
-
-  proto1ex_.ClearExtension(protobuf_unittest::repeated_nested_message_extension);
-  proto2ex_.ClearExtension(protobuf_unittest::repeated_nested_message_extension);
-  proto2ex_.AddExtension(protobuf_unittest::repeated_nested_message_extension)
-      ->set_bb(909);
-  proto2ex_.AddExtension(protobuf_unittest::repeated_nested_message_extension)
-      ->set_bb(907);
-  proto1ex_.AddExtension(protobuf_unittest::repeated_nested_message_extension)
-      ->set_bb(904);
-  proto1ex_.AddExtension(protobuf_unittest::repeated_nested_message_extension)
-      ->set_bb(907);
-  proto1ex_.AddExtension(protobuf_unittest::repeated_nested_message_extension)
-      ->set_bb(909);
-
-  EXPECT_EQ(
-      "moved: (protobuf_unittest.repeated_nested_message_extension)[2] ->"
-      " (protobuf_unittest.repeated_nested_message_extension)[0] :"
-      " { bb: 909 }\n"
-      "deleted: (protobuf_unittest.repeated_nested_message_extension)[0]:"
-      " { bb: 904 }\n",
-      RunEx());
-}
-
-TEST_F(ComparisonTest, RepeatedMapFieldTest_Group) {
-  field_as_map("repeatedgroup", "a");
-  proto1_.clear_repeatedgroup();
-  proto2_.clear_repeatedgroup();
-
-  proto1_.add_repeatedgroup()->set_a(317);  // deleted
-  proto1_.add_repeatedgroup()->set_a(904);  // deleted
-  proto1_.add_repeatedgroup()->set_a(907);  // moved from
-  proto1_.add_repeatedgroup()->set_a(909);  // moved from
-
-  proto2_.add_repeatedgroup()->set_a(909);  // moved to
-  proto2_.add_repeatedgroup()->set_a(318);  // added
-  proto2_.add_repeatedgroup()->set_a(907);  // moved to
-
-  EXPECT_EQ(
-      "moved: repeatedgroup[3] -> repeatedgroup[0] : { a: 909 }\n"
-      "added: repeatedgroup[1]: { a: 318 }\n"
-      "deleted: repeatedgroup[0]: { a: 317 }\n"
-      "deleted: repeatedgroup[1]: { a: 904 }\n",
-      Run());
-}
-
-TEST_F(ComparisonTest, RepeatedMapFieldTest_MessageKey) {
-  // Use m as key, but use b as value.
-  field_as_map("item", "m");
-
-  protobuf_unittest::TestDiffMessage msg1;
-  protobuf_unittest::TestDiffMessage msg2;
-  protobuf_unittest::TestDiffMessage::Item* item = msg1.add_item();
-
-  // The following code creates one deletion, one addition and two moved fields
-  // on the messages.
-  item->mutable_m()->set_c(0);
-  item->set_b("first");
-  item = msg1.add_item();
-  item->mutable_m()->set_c(2);
-  item->set_b("second");
-  item = msg1.add_item();
-  item->set_b("null");  // empty key moved
-  item = msg1.add_item();
-  item->mutable_m()->set_c(3);
-  item->set_b("third");  // deletion
-  item = msg1.add_item();
-  item->mutable_m()->set_c(2);
-  item->set_b("second");  // duplicated key ( deletion )
-  item = msg2.add_item();
-  item->mutable_m()->set_c(2);
-  item->set_b("second");  // modification
-  item = msg2.add_item();
-  item->mutable_m()->set_c(4);
-  item->set_b("fourth");  // addition
-  item = msg2.add_item();
-  item->mutable_m()->set_c(0);
-  item->set_b("fist");  // move with change
-  item = msg2.add_item();
-  item->set_b("null");
-
-  EXPECT_EQ(
-      "modified: item[0].b -> item[2].b: \"first\" -> \"fist\"\n"
-      "moved: item[1] -> item[0] : { b: \"second\" m { c: 2 } }\n"
-      "moved: item[2] -> item[3] : { b: \"null\" }\n"
-      "added: item[1]: { b: \"fourth\" m { c: 4 } }\n"
-      "deleted: item[3]: { b: \"third\" m { c: 3 } }\n"
-      "deleted: item[4]: { b: \"second\" m { c: 2 } }\n",
-      Run(msg1, msg2));
-}
-
-TEST_F(ComparisonTest, RepeatedFieldSetTest_SetOfSet) {
-  repeated_field_as_set();
-  // Create the testing protos
-  protobuf_unittest::TestDiffMessage msg1;
-  protobuf_unittest::TestDiffMessage msg2;
-
-  protobuf_unittest::TestDiffMessage::Item* item = msg1.add_item();
-  item->add_ra(1);
-  item->add_ra(2);
-  item->add_ra(3);
-  item = msg1.add_item();
-  item->add_ra(5);
-  item->add_ra(6);
-  item = msg1.add_item();
-  item->add_ra(1);
-  item->add_ra(3);
-  item = msg1.add_item();
-  item->add_ra(6);
-  item->add_ra(7);
-  item->add_ra(8);
-
-  item = msg2.add_item();
-  item->add_ra(6);
-  item->add_ra(5);
-  item = msg2.add_item();
-  item->add_ra(6);
-  item->add_ra(8);
-  item = msg2.add_item();
-  item->add_ra(1);
-  item->add_ra(3);
-  item = msg2.add_item();
-  item->add_ra(3);
-  item->add_ra(2);
-  item->add_ra(1);
-
-  // Compare
-  EXPECT_EQ(
-      "moved: item[0].ra[0] -> item[3].ra[2] : 1\n"
-      "moved: item[0].ra[2] -> item[3].ra[0] : 3\n"
-      "moved: item[0] -> item[3] : { ra: 1 ra: 2 ra: 3 }\n"
-      "moved: item[1].ra[0] -> item[0].ra[1] : 5\n"
-      "moved: item[1].ra[1] -> item[0].ra[0] : 6\n"
-      "moved: item[1] -> item[0] : { ra: 5 ra: 6 }\n"
-      "added: item[1]: { ra: 6 ra: 8 }\n"
-      "deleted: item[3]: { ra: 6 ra: 7 ra: 8 }\n",
-      Run(msg1, msg2));
-}
-
-TEST_F(ComparisonTest, RepeatedMapFieldTest_RepeatedKey) {
-  // used rb as a key, but b is the value.
-  repeated_field_as_set();
-  field_as_map("item", "rb");
-
-  protobuf_unittest::TestDiffMessage msg1;
-  protobuf_unittest::TestDiffMessage msg2;
-  protobuf_unittest::TestDiffMessage::Item* item = msg1.add_item();
-  item->add_rb("a");
-  item->add_rb("b");
-  item->set_b("first");
-
-  item = msg2.add_item();
-  item->add_rb("c");
-  item->set_b("second");
-
-  item = msg2.add_item();
-  item->add_rb("b");
-  item->add_rb("a");
-  item->set_b("fist");
-
-  EXPECT_EQ(
-      "modified: item[0].b -> item[1].b: \"first\" -> \"fist\"\n"
-      "moved: item[0].rb[0] -> item[1].rb[1] : \"a\"\n"
-      "moved: item[0].rb[1] -> item[1].rb[0] : \"b\"\n"
-      "added: item[0]: { b: \"second\" rb: \"c\" }\n",
-      Run(msg1, msg2));
-}
-
-TEST_F(ComparisonTest, RepeatedMapFieldTest_RepeatedMessageKey) {
-  field_as_map("item", "rm");
-
-  protobuf_unittest::TestDiffMessage msg1;
-  protobuf_unittest::TestDiffMessage msg2;
-  protobuf_unittest::TestDiffMessage::Item* item = msg1.add_item();
-  protobuf_unittest::TestField* key = item->add_rm();
-  key->set_c(2);
-  key->add_rc(10);
-  key->add_rc(10);
-  item = msg1.add_item();
-  key = item->add_rm();
-  key->set_c(0);
-  key->add_rc(1);
-  key->add_rc(2);
-  key = item->add_rm();
-  key->set_c(0);
-  item->add_rb("first");
-
-  item = msg2.add_item();
-  item->CopyFrom(msg1.item(1));
-  item->add_rb("second");
-
-  EXPECT_EQ(
-      "added: item[0].rb[1]: \"second\"\n"
-      "deleted: item[0]: { rm { c: 2 rc: 10 rc: 10 } }\n",
-      Run(msg1, msg2));
-}
-
-TEST_F(ComparisonTest, RepeatedSetOptionTest_Unknown) {
-  // Currently, as_set option doesn't have affects on unknown field.
-  // If needed, this feature will be added by request.
-  repeated_field_as_set();
-  unknown1_->AddGroup(245)->AddFixed32(248, 1);
-  unknown2_->AddGroup(245)->AddFixed32(248, 3);
-  unknown2_->AddGroup(245)->AddFixed32(248, 1);
-
-  // We expect it behaves the same as normal comparison.
-  EXPECT_EQ(
-      "modified: 245[0].248[0]: 0x00000001 -> 0x00000003\n"
-      "added: 245[1]: { ... }\n",
-      RunUn());
-}
-
-TEST_F(ComparisonTest, Matching_Unknown) {
-  unknown1_->AddGroup(245)->AddFixed32(248, 1);
-  unknown2_->AddGroup(245)->AddFixed32(248, 1);
-  unknown1_->AddGroup(245)->AddFixed32(248, 3);
-  unknown2_->AddGroup(245)->AddFixed32(248, 3);
-  unknown2_->AddLengthDelimited(242, "cat");
-  unknown2_->AddGroup(246)->AddFixed32(248, 4);
-
-  // report_match is false so only added/modified fields are expected.
-  EXPECT_EQ(
-      "added: 242[0]: \"cat\"\n"
-      "added: 246[0]: { ... }\n",
-      RunUn());
-}
-
-TEST_F(ComparisonTest, RepeatedSetFieldTest) {
-  field_as_set("repeatedgroup");
-
-  proto1_.clear_repeatedgroup();
-  proto2_.clear_repeatedgroup();
-  proto2_.add_repeatedgroup()->set_a(909);
-  proto2_.add_repeatedgroup()->set_a(907);
-  proto1_.add_repeatedgroup()->set_a(317);
-  proto1_.add_repeatedgroup()->set_a(904);
-  proto1_.add_repeatedgroup()->set_a(907);
-  proto1_.add_repeatedgroup()->set_a(909);
-
-  EXPECT_EQ(
-      "moved: repeatedgroup[2] -> repeatedgroup[1] : { a: 907 }\n"
-      "moved: repeatedgroup[3] -> repeatedgroup[0] : { a: 909 }\n"
-      "deleted: repeatedgroup[0]: { a: 317 }\n"
-      "deleted: repeatedgroup[1]: { a: 904 }\n",
-      Run());
-}
-
-// Embedded message tests.
-TEST_F(ComparisonTest, EmbeddedAdditionTest) {
-  proto1_.mutable_optional_nested_message()->clear_bb();
-
-  EXPECT_EQ("added: optional_nested_message.bb: 118\n", Run());
-}
-
-TEST_F(ComparisonTest, EmbeddedDeletionTest) {
-  proto2_.mutable_optional_nested_message()->clear_bb();
-
-  EXPECT_EQ("deleted: optional_nested_message.bb: 118\n", Run());
-}
-
-TEST_F(ComparisonTest, EmbeddedModificationTest) {
-  proto1_.mutable_optional_nested_message()->set_bb(2);
-
-  EXPECT_EQ("modified: optional_nested_message.bb: 2 -> 118\n", Run());
-}
-
-TEST_F(ComparisonTest, EmbeddedFullAdditionTest) {
-  proto1_.clear_optional_nested_message();
-
-  EXPECT_EQ("added: optional_nested_message: { bb: 118 }\n", Run());
-}
-
-TEST_F(ComparisonTest, EmbeddedPartialAdditionTest) {
-  proto1_.clear_optional_nested_message();
-  proto2_.mutable_optional_nested_message()->clear_bb();
-
-  EXPECT_EQ("added: optional_nested_message: { }\n", Run());
-}
-
-TEST_F(ComparisonTest, EmbeddedFullDeletionTest) {
-  proto2_.clear_optional_nested_message();
-
-  EXPECT_EQ("deleted: optional_nested_message: { bb: 118 }\n", Run());
-}
-
-// Repeated element tests.
-TEST_F(ComparisonTest, BasicRepeatedTest) {
-  proto1_.clear_repeated_int32();
-  proto2_.clear_repeated_int32();
-
-  proto1_.add_repeated_int32(500);
-  proto1_.add_repeated_int32(501);
-  proto1_.add_repeated_int32(502);
-  proto1_.add_repeated_int32(503);
-  proto1_.add_repeated_int32(500);
-
-  proto2_.add_repeated_int32(500);
-  proto2_.add_repeated_int32(509);
-  proto2_.add_repeated_int32(502);
-  proto2_.add_repeated_int32(504);
-
-  EXPECT_EQ(
-      "modified: repeated_int32[1]: 501 -> 509\n"
-      "modified: repeated_int32[3]: 503 -> 504\n"
-      "deleted: repeated_int32[4]: 500\n",
-      Run());
-}
-
-TEST_F(ComparisonTest, BasicRepeatedTest_SetOption) {
-  repeated_field_as_set();
-  proto1_.clear_repeated_int32();
-  proto2_.clear_repeated_int32();
-
-  proto1_.add_repeated_int32(501);
-  proto1_.add_repeated_int32(502);
-  proto1_.add_repeated_int32(503);
-  proto1_.add_repeated_int32(500);
-  proto1_.add_repeated_int32(500);
-
-  proto2_.add_repeated_int32(500);
-  proto2_.add_repeated_int32(509);
-  proto2_.add_repeated_int32(503);
-  proto2_.add_repeated_int32(502);
-  proto2_.add_repeated_int32(504);
-
-  EXPECT_EQ(
-      "moved: repeated_int32[1] -> repeated_int32[3] : 502\n"
-      "moved: repeated_int32[3] -> repeated_int32[0] : 500\n"
-      "added: repeated_int32[1]: 509\n"
-      "added: repeated_int32[4]: 504\n"
-      "deleted: repeated_int32[0]: 501\n"
-      "deleted: repeated_int32[4]: 500\n",
-      Run());
-}
-
-TEST_F(ComparisonTest, BasicRepeatedTest_SetField) {
-  field_as_set("repeated_int32");
-  proto1_.clear_repeated_int32();
-  proto2_.clear_repeated_int32();
-
-  proto1_.add_repeated_int32(501);
-  proto1_.add_repeated_int32(502);
-  proto1_.add_repeated_int32(503);
-  proto1_.add_repeated_int32(500);
-  proto1_.add_repeated_int32(500);
-
-  proto2_.add_repeated_int32(500);
-  proto2_.add_repeated_int32(509);
-  proto2_.add_repeated_int32(503);
-  proto2_.add_repeated_int32(502);
-  proto2_.add_repeated_int32(504);
-
-  EXPECT_EQ(
-      "moved: repeated_int32[1] -> repeated_int32[3] : 502\n"
-      "moved: repeated_int32[3] -> repeated_int32[0] : 500\n"
-      "added: repeated_int32[1]: 509\n"
-      "added: repeated_int32[4]: 504\n"
-      "deleted: repeated_int32[0]: 501\n"
-      "deleted: repeated_int32[4]: 500\n",
-      Run());
-}
-
-// Multiple action tests.
-TEST_F(ComparisonTest, AddDeleteTest) {
-  proto1_.clear_optional_int32();
-  proto2_.clear_optional_int64();
-
-  EXPECT_EQ(
-      "added: optional_int32: 101\n"
-      "deleted: optional_int64: 102\n",
-      Run());
-}
-
-TEST_F(ComparisonTest, AddDelete_FieldOrderingTest) {
-  orderings_proto1_.ClearExtension(unittest::my_extension_string);
-  orderings_proto2_.clear_my_int();
-
-  EXPECT_EQ(
-      "deleted: my_int: 1\n"
-      "added: (protobuf_unittest.my_extension_string): \"bar\"\n",
-      RunOrder());
-}
-
-TEST_F(ComparisonTest, AllThreeTest) {
-  proto1_.clear_optional_int32();
-  proto2_.clear_optional_float();
-  proto2_.set_optional_string("hello world!");
-
-  EXPECT_EQ(
-      "added: optional_int32: 101\n"
-      "deleted: optional_float: 111\n"
-      "modified: optional_string: \"115\" -> \"hello world!\"\n",
-      Run());
-}
-
-TEST_F(ComparisonTest, SandwhichTest) {
-  proto1_.clear_optional_int64();
-  proto1_.clear_optional_uint32();
-
-  proto2_.clear_optional_uint64();
-
-  EXPECT_EQ(
-      "added: optional_int64: 102\n"
-      "added: optional_uint32: 103\n"
-      "deleted: optional_uint64: 104\n",
-      Run());
-}
-
-TEST_F(ComparisonTest, IgnoredNoChangeTest) {
-  proto1diff_.set_v(3);
-  proto2diff_.set_v(3);
-  proto2diff_.set_w("foo");
-
-  ignore_field("v");
-
-  EXPECT_EQ(
-      "ignored: v\n"
-      "added: w: \"foo\"\n",
-      RunDiff());
-}
-
-TEST_F(ComparisonTest, IgnoredAddTest) {
-  proto2diff_.set_v(3);
-  proto2diff_.set_w("foo");
-
-  ignore_field("v");
-
-  EXPECT_EQ(
-      "ignored: v\n"
-      "added: w: \"foo\"\n",
-      RunDiff());
-}
-
-TEST_F(ComparisonTest, IgnoredDeleteTest) {
-  proto1diff_.set_v(3);
-  proto2diff_.set_w("foo");
-
-  ignore_field("v");
-
-  EXPECT_EQ(
-      "ignored: v\n"
-      "added: w: \"foo\"\n",
-      RunDiff());
-}
-
-TEST_F(ComparisonTest, IgnoredModifyTest) {
-  proto1diff_.set_v(3);
-  proto2diff_.set_v(4);
-  proto2diff_.set_w("foo");
-
-  ignore_field("v");
-
-  EXPECT_EQ(
-      "ignored: v\n"
-      "added: w: \"foo\"\n",
-      RunDiff());
-}
-
-TEST_F(ComparisonTest, IgnoredRepeatedAddTest) {
-  proto1diff_.add_rv(3);
-  proto1diff_.add_rv(4);
-
-  proto2diff_.add_rv(3);
-  proto2diff_.add_rv(4);
-  proto2diff_.add_rv(5);
-
-  proto2diff_.set_w("foo");
-
-  ignore_field("rv");
-
-  EXPECT_EQ(
-      "ignored: rv\n"
-      "added: w: \"foo\"\n",
-      RunDiff());
-}
-
-TEST_F(ComparisonTest, IgnoredRepeatedDeleteTest) {
-  proto1diff_.add_rv(3);
-  proto1diff_.add_rv(4);
-  proto1diff_.add_rv(5);
-
-  proto2diff_.add_rv(3);
-  proto2diff_.add_rv(4);
-
-  proto2diff_.set_w("foo");
-
-  ignore_field("rv");
-
-  EXPECT_EQ(
-      "ignored: rv\n"
-      "added: w: \"foo\"\n",
-      RunDiff());
-}
-
-TEST_F(ComparisonTest, IgnoredRepeatedModifyTest) {
-  proto1diff_.add_rv(3);
-  proto1diff_.add_rv(4);
-
-  proto2diff_.add_rv(3);
-  proto2diff_.add_rv(5);
-
-  proto2diff_.set_w("foo");
-
-  ignore_field("rv");
-
-  EXPECT_EQ(
-      "ignored: rv\n"
-      "added: w: \"foo\"\n",
-      RunDiff());
-}
-
-TEST_F(ComparisonTest, IgnoredWholeNestedMessage) {
-  proto1diff_.mutable_m()->set_c(3);
-  proto2diff_.mutable_m()->set_c(4);
-
-  proto2diff_.set_w("foo");
-
-  ignore_field("m");
-
-  EXPECT_EQ(
-      "added: w: \"foo\"\n"
-      "ignored: m\n",
-      RunDiff());
-}
-
-TEST_F(ComparisonTest, IgnoredNestedField) {
-  proto1diff_.mutable_m()->set_c(3);
-  proto2diff_.mutable_m()->set_c(4);
-
-  proto2diff_.set_w("foo");
-
-  ignore_field("m.c");
-
-  EXPECT_EQ(
-      "added: w: \"foo\"\n"
-      "ignored: m.c\n",
-      RunDiff());
-}
-
-TEST_F(ComparisonTest, IgnoredRepeatedNested) {
-  proto1diff_.add_rm()->set_c(0);
-  proto1diff_.add_rm()->set_c(1);
-  proto2diff_.add_rm()->set_c(2);
-  proto2diff_.add_rm()->set_c(3);
-
-  proto2diff_.set_w("foo");
-
-  ignore_field("rm.c");
-
-  EXPECT_EQ(
-      "ignored: rm[0].c\n"
-      "ignored: rm[1].c\n"
-      "added: w: \"foo\"\n",
-      RunDiff());
-}
-
-TEST_F(ComparisonTest, IgnoredNestedRepeated) {
-  proto1diff_.mutable_m()->add_rc(23);
-  proto1diff_.mutable_m()->add_rc(24);
-  proto2diff_.mutable_m()->add_rc(25);
-
-  proto2diff_.set_w("foo");
-
-  ignore_field("m.rc");
-
-  EXPECT_EQ(
-      "added: w: \"foo\"\n"
-      "ignored: m.rc\n",
-      RunDiff());
-}
-
-TEST_F(ComparisonTest, ExtensionTest) {
-  proto1ex_.SetExtension(unittest::optional_int32_extension, 401);
-  proto2ex_.SetExtension(unittest::optional_int32_extension, 402);
-
-  proto1ex_.ClearExtension(unittest::optional_int64_extension);
-  proto2ex_.SetExtension(unittest::optional_int64_extension, 403);
-
-  EXPECT_EQ(
-      "modified: (protobuf_unittest.optional_int32_extension): 401 -> 402\n"
-      "added: (protobuf_unittest.optional_int64_extension): 403\n",
-      RunEx());
-}
-
-TEST_F(ComparisonTest, MatchedUnknownFieldTagTest) {
-  unknown1_->AddVarint(240, 122);
-  unknown2_->AddVarint(240, 121);
-  unknown1_->AddFixed32(241, 1);
-  unknown2_->AddFixed64(241, 2);
-  unknown1_->AddLengthDelimited(242, "cat");
-  unknown2_->AddLengthDelimited(242, "dog");
-
-  EXPECT_EQ(
-      "modified: 240[0]: 122 -> 121\n"
-      "deleted: 241[0]: 0x00000001\n"
-      "added: 241[0]: 0x0000000000000002\n"
-      "modified: 242[0]: \"cat\" -> \"dog\"\n",
-      RunUn());
-}
-
-TEST_F(ComparisonTest, UnmatchedUnknownFieldTagTest) {
-  unknown1_->AddFixed32(243, 1);
-  unknown2_->AddVarint(244, 2);
-  unknown2_->AddVarint(244, 4);
-
-  EXPECT_EQ(
-      "deleted: 243[0]: 0x00000001\n"
-      "added: 244[0]: 2\n"
-      "added: 244[1]: 4\n",
-      RunUn());
-}
-
-TEST_F(ComparisonTest, DifferentSizedUnknownFieldTest) {
-  unknown1_->AddVarint(240, 1);
-  unknown1_->AddVarint(240, 3);
-  unknown1_->AddVarint(240, 4);
-  unknown2_->AddVarint(240, 2);
-  unknown2_->AddVarint(240, 3);
-  unknown2_->AddVarint(240, 2);
-  unknown2_->AddVarint(240, 5);
-
-  EXPECT_EQ(
-      "modified: 240[0]: 1 -> 2\n"
-      "modified: 240[2]: 4 -> 2\n"
-      "added: 240[3]: 5\n",
-      RunUn());
-}
-
-TEST_F(ComparisonTest, UnknownFieldsAll) {
-  unknown1_->AddVarint(243, 122);
-  unknown1_->AddFixed64(244, 0x0172356);
-  unknown1_->AddFixed64(244, 0x098);
-  unknown1_->AddGroup(245)->AddFixed32(248, 1);
-  unknown1_->mutable_field(3)->mutable_group()->AddFixed32(248, 2);
-  unknown1_->AddGroup(249)->AddFixed64(250, 1);
-
-  unknown2_->AddVarint(243, 121);
-  unknown2_->AddLengthDelimited(73882, "test 123");
-  unknown2_->AddGroup(245)->AddFixed32(248, 3);
-  unknown2_->AddGroup(247);
-
-  EXPECT_EQ(
-      "modified: 243[0]: 122 -> 121\n"
-      "deleted: 244[0]: 0x0000000000172356\n"
-      "deleted: 244[1]: 0x0000000000000098\n"
-      "modified: 245[0].248[0]: 0x00000001 -> 0x00000003\n"
-      "deleted: 245[0].248[1]: 0x00000002\n"
-      "added: 247[0]: { ... }\n"
-      "deleted: 249[0]: { ... }\n"
-      "added: 73882[0]: \"test 123\"\n",
-      RunUn());
-}
-
-TEST_F(ComparisonTest, EquivalentIgnoresUnknown) {
-  unittest::ForeignMessage message1, message2;
-
-  message1.set_c(5);
-  message1.mutable_unknown_fields()->AddVarint(123, 456);
-  message2.set_c(5);
-  message2.mutable_unknown_fields()->AddVarint(321, 654);
-
-  EXPECT_FALSE(util::MessageDifferencer::Equals(message1, message2));
-  EXPECT_TRUE(util::MessageDifferencer::Equivalent(message1, message2));
-}
-
-TEST_F(ComparisonTest, MapTest) {
-  Map<std::string, std::string>& map1 =
-      *map_proto1_.mutable_map_string_string();
-  map1["key1"] = "1";
-  map1["key2"] = "2";
-  map1["key3"] = "3";
-  Map<std::string, std::string>& map2 =
-      *map_proto2_.mutable_map_string_string();
-  map2["key3"] = "0";
-  map2["key2"] = "2";
-  map2["key1"] = "1";
-
-  EXPECT_EQ("modified: map_string_string[key3]: \"3\" -> \"0\"\n",
-            Run(map_proto1_, map_proto2_));
-}
-
-TEST_F(ComparisonTest, MapIgnoreKeyTest) {
-  Map<std::string, std::string>& map1 =
-      *map_proto1_.mutable_map_string_string();
-  map1["key1"] = "1";
-  map1["key2"] = "2";
-  map1["key3"] = "3";
-  Map<std::string, std::string>& map2 =
-      *map_proto2_.mutable_map_string_string();
-  map2["key4"] = "2";
-  map2["key5"] = "3";
-  map2["key6"] = "1";
-
-  util::MessageDifferencer differencer;
-  differencer.IgnoreField(
-      GetFieldDescriptor(map_proto1_, "map_string_string.key"));
-  EXPECT_TRUE(differencer.Compare(map_proto1_, map_proto2_));
-}
-
-TEST_F(ComparisonTest, MapRoundTripSyncTest) {
-  TextFormat::Parser parser;
-  unittest::TestMap map_reflection1;
-
-  // By setting via reflection, data exists in repeated field.
-  ASSERT_TRUE(parser.ParseFromString("map_int32_foreign_message { key: 1 }",
-                                     &map_reflection1));
-
-  // During copy, data is synced from repeated field to map.
-  unittest::TestMap map_reflection2 = map_reflection1;
-
-  // During comparison, data is synced from map to repeated field.
-  EXPECT_TRUE(
-      util::MessageDifferencer::Equals(map_reflection1, map_reflection2));
-}
-
-TEST_F(ComparisonTest, MapEntryPartialTest) {
-  TextFormat::Parser parser;
-  unittest::TestMap map1;
-  unittest::TestMap map2;
-
-  std::string output;
-  util::MessageDifferencer differencer;
-  differencer.set_scope(util::MessageDifferencer::PARTIAL);
-  differencer.ReportDifferencesToString(&output);
-
-  ASSERT_TRUE(parser.ParseFromString(
-      "map_int32_foreign_message { key: 1 value { c: 1 } }", &map1));
-  ASSERT_TRUE(parser.ParseFromString(
-      "map_int32_foreign_message { key: 1 value { c: 2 }}", &map2));
-  EXPECT_FALSE(differencer.Compare(map1, map2));
-  EXPECT_EQ("modified: map_int32_foreign_message[1].c: 1 -> 2\n", output);
-
-  ASSERT_TRUE(
-      parser.ParseFromString("map_int32_foreign_message { key: 1 }", &map1));
-  EXPECT_TRUE(differencer.Compare(map1, map2));
-}
-
-TEST_F(ComparisonTest, MapEntryPartialEmptyKeyTest) {
-  TextFormat::Parser parser;
-  unittest::TestMap map1;
-  unittest::TestMap map2;
-  ASSERT_TRUE(parser.ParseFromString("map_int32_foreign_message {}", &map1));
-  ASSERT_TRUE(
-      parser.ParseFromString("map_int32_foreign_message { key: 1 }", &map2));
-
-  util::MessageDifferencer differencer;
-  differencer.set_scope(util::MessageDifferencer::PARTIAL);
-  // TODO(jieluo): Remove the round trip
-  std::string serialized_value;
-  map1.SerializeToString(&serialized_value);
-  map1.ParseFromString(serialized_value);
-  EXPECT_FALSE(differencer.Compare(map1, map2));
-}
-
-TEST_F(ComparisonTest, MapEntryMissingEmptyFieldIsOkTest) {
-  TextFormat::Parser parser;
-  protobuf_unittest::TestMap msg1;
-  protobuf_unittest::TestMap msg2;
-
-  ASSERT_TRUE(parser.ParseFromString(
-      "map_string_foreign_message { key: 'key1' value {}}", &msg1));
-  ASSERT_TRUE(parser.ParseFromString(
-      "map_string_foreign_message { key: 'key1' }", &msg2));
-
-  util::MessageDifferencer differencer;
-  differencer.set_scope(util::MessageDifferencer::PARTIAL);
-
-  ASSERT_TRUE(differencer.Compare(msg1, msg2));
-}
-
-// Considers strings keys as equal if they have equal lengths.
-class LengthMapKeyComparator
-    : public util::MessageDifferencer::MapKeyComparator {
- public:
-  typedef util::MessageDifferencer::SpecificField SpecificField;
-  bool IsMatch(const Message& message1, const Message& message2,
-               const std::vector<SpecificField>& parent_fields) const override {
-    const Reflection* reflection1 = message1.GetReflection();
-    const Reflection* reflection2 = message2.GetReflection();
-    const FieldDescriptor* key_field = message1.GetDescriptor()->map_key();
-    return reflection1->GetString(message1, key_field).size() ==
-           reflection2->GetString(message2, key_field).size();
-  }
-};
-
-TEST_F(ComparisonTest, MapEntryCustomMapKeyComparator) {
-  TextFormat::Parser parser;
-  protobuf_unittest::TestMap msg1;
-  protobuf_unittest::TestMap msg2;
-
-  ASSERT_TRUE(parser.ParseFromString(
-      "map_string_foreign_message { key: 'key1' value { c: 1 }}", &msg1));
-  ASSERT_TRUE(parser.ParseFromString(
-      "map_string_foreign_message { key: 'key2' value { c: 1 }}", &msg2));
-
-  util::MessageDifferencer differencer;
-  LengthMapKeyComparator key_comparator;
-  differencer.TreatAsMapUsingKeyComparator(
-      GetFieldDescriptor(msg1, "map_string_foreign_message"), &key_comparator);
-  std::string output;
-  differencer.ReportDifferencesToString(&output);
-  // Though the above two messages have different keys for their map entries,
-  // they are considered the same by key_comparator because their lengths are
-  // equal.  However, in value comparison, all fields of the message are taken
-  // into consideration, so they are reported as different.
-  EXPECT_FALSE(differencer.Compare(msg1, msg2));
-  EXPECT_EQ(
-      "modified: map_string_foreign_message[key1].key: \"key1\" -> \"key2\"\n",
-      output);
-  differencer.IgnoreField(
-      GetFieldDescriptor(msg1, "map_string_foreign_message.key"));
-  output.clear();
-  EXPECT_TRUE(differencer.Compare(msg1, msg2));
-  EXPECT_EQ("ignored: map_string_foreign_message[key1].key\n", output);
-}
-
-class MatchingTest : public testing::Test {
- public:
-  typedef util::MessageDifferencer MessageDifferencer;
-
- protected:
-  MatchingTest() {}
-
-  ~MatchingTest() override {}
-
-  std::string RunWithResult(MessageDifferencer* differencer,
-                            const Message& msg1, const Message& msg2,
-                            bool result) {
-    std::string output;
-    {
-      // Before we return the "output" string, we must make sure the
-      // StreamReporter is destructored because its destructor will
-      // flush the stream.
-      io::StringOutputStream output_stream(&output);
-      MessageDifferencer::StreamReporter reporter(&output_stream);
-      reporter.set_report_modified_aggregates(true);
-      differencer->set_report_matches(true);
-      differencer->ReportDifferencesTo(&reporter);
-      if (result) {
-        EXPECT_TRUE(differencer->Compare(msg1, msg2));
-      } else {
-        EXPECT_FALSE(differencer->Compare(msg1, msg2));
-      }
-    }
-    return output;
-  }
-
- private:
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(MatchingTest);
-};
-
-TEST_F(MatchingTest, StreamReporterMatching) {
-  protobuf_unittest::TestField msg1, msg2;
-  msg1.set_c(72);
-  msg2.set_c(72);
-  msg1.add_rc(13);
-  msg2.add_rc(13);
-  msg1.add_rc(17);
-  msg2.add_rc(17);
-  std::string output;
-  MessageDifferencer differencer;
-  differencer.set_report_matches(true);
-  differencer.ReportDifferencesToString(&output);
-  EXPECT_TRUE(differencer.Compare(msg1, msg2));
-  EXPECT_EQ(
-      "matched: c : 72\n"
-      "matched: rc[0] : 13\n"
-      "matched: rc[1] : 17\n",
-      output);
-}
-
-TEST_F(MatchingTest, DontReportMatchedWhenIgnoring) {
-  protobuf_unittest::TestField msg1, msg2;
-  msg1.set_c(72);
-  msg2.set_c(72);
-  msg1.add_rc(13);
-  msg2.add_rc(13);
-  msg1.add_rc(17);
-  msg2.add_rc(17);
-  std::string output;
-  MessageDifferencer differencer;
-  differencer.set_report_matches(true);
-  differencer.ReportDifferencesToString(&output);
-
-  differencer.IgnoreField(msg1.GetDescriptor()->FindFieldByName("c"));
-
-  EXPECT_TRUE(differencer.Compare(msg1, msg2));
-  EXPECT_EQ(
-      "ignored: c\n"
-      "matched: rc[0] : 13\n"
-      "matched: rc[1] : 17\n",
-      output);
-}
-
-TEST_F(MatchingTest, ReportMatchedForMovedFields) {
-  protobuf_unittest::TestDiffMessage msg1, msg2;
-  protobuf_unittest::TestDiffMessage::Item* item = msg1.add_item();
-  item->set_a(53);
-  item->set_b("hello");
-  item = msg2.add_item();
-  item->set_a(27);
-  item = msg2.add_item();
-  item->set_a(53);
-  item->set_b("hello");
-  item = msg1.add_item();
-  item->set_a(27);
-  MessageDifferencer differencer;
-  const FieldDescriptor* desc;
-  desc = msg1.GetDescriptor()->FindFieldByName("item");
-  differencer.TreatAsSet(desc);
-
-  EXPECT_EQ(
-      "matched: item[0].a -> item[1].a : 53\n"
-      "matched: item[0].b -> item[1].b : \"hello\"\n"
-      "moved: item[0] -> item[1] : { a: 53 b: \"hello\" }\n"
-      "matched: item[1].a -> item[0].a : 27\n"
-      "moved: item[1] -> item[0] : { a: 27 }\n",
-      RunWithResult(&differencer, msg1, msg2, true));
-}
-
-
-TEST_F(MatchingTest, MatchesAppearInPostTraversalOrderForMovedFields) {
-  protobuf_unittest::TestDiffMessage msg1, msg2;
-  protobuf_unittest::TestDiffMessage::Item* item;
-  protobuf_unittest::TestField* field;
-
-  const FieldDescriptor* desc;
-  const FieldDescriptor* nested_desc;
-  const FieldDescriptor* double_nested_desc;
-  desc = msg1.GetDescriptor()->FindFieldByName("item");
-  nested_desc = desc->message_type()->FindFieldByName("rm");
-  double_nested_desc = nested_desc->message_type()->FindFieldByName("rc");
-  MessageDifferencer differencer;
-  differencer.TreatAsSet(desc);
-  differencer.TreatAsSet(nested_desc);
-  differencer.TreatAsSet(double_nested_desc);
-
-  item = msg1.add_item();
-  field = item->add_rm();
-  field->set_c(1);
-  field->add_rc(2);
-  field->add_rc(3);
-  field = item->add_rm();
-  field->set_c(4);
-  field->add_rc(5);
-  field->add_rc(6);
-  field->add_rc(7);
-  item = msg2.add_item();
-  field = item->add_rm();
-  field->set_c(4);
-  field->add_rc(7);
-  field->add_rc(6);
-  field->add_rc(5);
-  field = item->add_rm();
-  field->set_c(1);
-  field->add_rc(3);
-  field->add_rc(2);
-  item = msg1.add_item();
-  field = item->add_rm();
-  field->set_c(8);
-  field->add_rc(10);
-  field->add_rc(11);
-  field->add_rc(9);
-  item = msg2.add_item();
-  field = item->add_rm();
-  field->set_c(8);
-  field->add_rc(9);
-  field->add_rc(10);
-  field->add_rc(11);
-
-  EXPECT_EQ(
-      "matched: item[0].rm[0].c -> item[0].rm[1].c : 1\n"
-      "moved: item[0].rm[0].rc[0] -> item[0].rm[1].rc[1] : 2\n"
-      "moved: item[0].rm[0].rc[1] -> item[0].rm[1].rc[0] : 3\n"
-      "moved: item[0].rm[0] -> item[0].rm[1] : { c: 1 rc: 2 rc: 3 }\n"
-      "matched: item[0].rm[1].c -> item[0].rm[0].c : 4\n"
-      "moved: item[0].rm[1].rc[0] -> item[0].rm[0].rc[2] : 5\n"
-      "matched: item[0].rm[1].rc[1] -> item[0].rm[0].rc[1] : 6\n"
-      "moved: item[0].rm[1].rc[2] -> item[0].rm[0].rc[0] : 7\n"
-      "moved: item[0].rm[1] -> item[0].rm[0] : { c: 4 rc: 5 rc: 6 rc: 7 }\n"
-      "matched: item[0] : { rm { c: 1 rc: 2 rc: 3 }"
-      " rm { c: 4 rc: 5 rc: 6 rc: 7 } }\n"
-      "matched: item[1].rm[0].c : 8\n"
-      "moved: item[1].rm[0].rc[0] -> item[1].rm[0].rc[1] : 10\n"
-      "moved: item[1].rm[0].rc[1] -> item[1].rm[0].rc[2] : 11\n"
-      "moved: item[1].rm[0].rc[2] -> item[1].rm[0].rc[0] : 9\n"
-      "matched: item[1].rm[0] : { c: 8 rc: 10 rc: 11 rc: 9 }\n"
-      "matched: item[1] : { rm { c: 8 rc: 10 rc: 11 rc: 9 } }\n",
-      RunWithResult(&differencer, msg1, msg2, true));
-}
-
-TEST_F(MatchingTest, MatchAndModifiedInterleaveProperly) {
-  protobuf_unittest::TestDiffMessage msg1, msg2;
-  protobuf_unittest::TestDiffMessage::Item* item;
-  protobuf_unittest::TestField* field;
-
-  const FieldDescriptor* desc;
-  const FieldDescriptor* nested_key;
-  const FieldDescriptor* nested_desc;
-  const FieldDescriptor* double_nested_key;
-  const FieldDescriptor* double_nested_desc;
-  desc = msg1.GetDescriptor()->FindFieldByName("item");
-  nested_key = desc->message_type()->FindFieldByName("a");
-  nested_desc = desc->message_type()->FindFieldByName("rm");
-  double_nested_key = nested_desc->message_type()->FindFieldByName("c");
-  double_nested_desc = nested_desc->message_type()->FindFieldByName("rc");
-
-  MessageDifferencer differencer;
-  differencer.TreatAsMap(desc, nested_key);
-  differencer.TreatAsMap(nested_desc, double_nested_key);
-  differencer.TreatAsSet(double_nested_desc);
-
-  item = msg1.add_item();
-  item->set_a(1);
-  field = item->add_rm();
-  field->set_c(2);
-  field->add_rc(3);
-  field->add_rc(4);
-  field = item->add_rm();
-  field->set_c(5);
-  field->add_rc(6);
-  field->add_rc(7);
-  field->add_rc(8);
-  item = msg1.add_item();
-  item->set_a(9);
-  field = item->add_rm();
-  field->set_c(10);
-  field->add_rc(11);
-  field->add_rc(12);
-  field = item->add_rm();
-  field->set_c(13);
-
-  item = msg2.add_item();
-  item->set_a(1);
-  field = item->add_rm();
-  field->set_c(5);
-  field->add_rc(8);
-  field->add_rc(8);
-  field->add_rc(6);
-  field = item->add_rm();
-  field->set_c(3);
-  field->add_rc(2);
-  field->add_rc(4);
-  item = msg2.add_item();
-  item->set_a(9);
-  field = item->add_rm();
-  field->set_c(10);
-  field->add_rc(12);
-  field->add_rc(11);
-  field = item->add_rm();
-  field->set_c(13);
-
-  EXPECT_EQ(
-      "matched: item[0].a : 1\n"
-      "matched: item[0].rm[1].c -> item[0].rm[0].c : 5\n"
-      "moved: item[0].rm[1].rc[0] -> item[0].rm[0].rc[2] : 6\n"
-      "moved: item[0].rm[1].rc[2] -> item[0].rm[0].rc[0] : 8\n"
-      "added: item[0].rm[0].rc[1]: 8\n"
-      "deleted: item[0].rm[1].rc[1]: 7\n"
-      "modified: item[0].rm[1] -> item[0].rm[0]: { c: 5 rc: 6 rc: 7 rc: 8 } ->"
-      " { c: 5 rc: 8 rc: 8 rc: 6 }\n"
-      "added: item[0].rm[1]: { c: 3 rc: 2 rc: 4 }\n"
-      "deleted: item[0].rm[0]: { c: 2 rc: 3 rc: 4 }\n"
-      "modified: item[0]: { a: 1 rm { c: 2 rc: 3 rc: 4 }"
-      " rm { c: 5 rc: 6 rc: 7 rc: 8 } } ->"
-      " { a: 1 rm { c: 5 rc: 8 rc: 8 rc: 6 }"
-      " rm { c: 3 rc: 2 rc: 4 } }\n"
-      "matched: item[1].a : 9\n"
-      "matched: item[1].rm[0].c : 10\n"
-      "moved: item[1].rm[0].rc[0] -> item[1].rm[0].rc[1] : 11\n"
-      "moved: item[1].rm[0].rc[1] -> item[1].rm[0].rc[0] : 12\n"
-      "matched: item[1].rm[0] : { c: 10 rc: 11 rc: 12 }\n"
-      "matched: item[1].rm[1].c : 13\n"
-      "matched: item[1].rm[1] : { c: 13 }\n"
-      "matched: item[1] : { a: 9 rm { c: 10 rc: 11 rc: 12 } rm { c: 13 } }\n",
-      RunWithResult(&differencer, msg1, msg2, false));
-}
-
-TEST_F(MatchingTest, MatchingWorksWithExtensions) {
-  protobuf_unittest::TestAllExtensions msg1, msg2;
-  protobuf_unittest::TestAllTypes::NestedMessage* nested;
-  using protobuf_unittest::repeated_nested_message_extension;
-
-  const FileDescriptor* descriptor;
-  const FieldDescriptor* desc;
-  const FieldDescriptor* nested_key;
-  descriptor = msg1.GetDescriptor()->file();
-  desc = descriptor->FindExtensionByName("repeated_nested_message_extension");
-  ASSERT_FALSE(desc == nullptr);
-  nested_key = desc->message_type()->FindFieldByName("bb");
-
-  MessageDifferencer differencer;
-  differencer.TreatAsMap(desc, nested_key);
-
-  nested = msg1.AddExtension(repeated_nested_message_extension);
-  nested->set_bb(7);
-  nested = msg1.AddExtension(repeated_nested_message_extension);
-  nested->set_bb(13);
-  nested = msg1.AddExtension(repeated_nested_message_extension);
-  nested->set_bb(11);
-  nested = msg2.AddExtension(repeated_nested_message_extension);
-  nested->set_bb(11);
-  nested = msg2.AddExtension(repeated_nested_message_extension);
-  nested->set_bb(13);
-  nested = msg2.AddExtension(repeated_nested_message_extension);
-  nested->set_bb(7);
-
-  EXPECT_EQ(
-      "matched: (protobuf_unittest.repeated_nested_message_extension)[0].bb ->"
-      " (protobuf_unittest.repeated_nested_message_extension)[2].bb : 7\n"
-      "moved: (protobuf_unittest.repeated_nested_message_extension)[0] ->"
-      " (protobuf_unittest.repeated_nested_message_extension)[2] :"
-      " { bb: 7 }\n"
-      "matched: (protobuf_unittest.repeated_nested_message_extension)[1].bb :"
-      " 13\n"
-      "matched: (protobuf_unittest.repeated_nested_message_extension)[1] :"
-      " { bb: 13 }\n"
-      "matched: (protobuf_unittest.repeated_nested_message_extension)[2].bb ->"
-      " (protobuf_unittest.repeated_nested_message_extension)[0].bb :"
-      " 11\n"
-      "moved: (protobuf_unittest.repeated_nested_message_extension)[2] ->"
-      " (protobuf_unittest.repeated_nested_message_extension)[0] :"
-      " { bb: 11 }\n",
-      RunWithResult(&differencer, msg1, msg2, true));
-}
-
-TEST(AnyTest, Simple) {
-  protobuf_unittest::TestField value1, value2;
-  value1.set_a(20);
-  value2.set_a(21);
-
-  protobuf_unittest::TestAny m1, m2;
-  m1.mutable_any_value()->PackFrom(value1);
-  m2.mutable_any_value()->PackFrom(value2);
-  util::MessageDifferencer message_differencer;
-  std::string difference_string;
-  message_differencer.ReportDifferencesToString(&difference_string);
-  EXPECT_FALSE(message_differencer.Compare(m1, m2));
-  EXPECT_EQ("modified: any_value.a: 20 -> 21\n", difference_string);
-}
-
-TEST(Anytest, TreatAsSet) {
-  protobuf_unittest::TestField value1, value2;
-  value1.set_a(20);
-  value1.set_b(30);
-  value2.set_a(20);
-  value2.set_b(31);
-
-  protobuf_unittest::TestAny m1, m2;
-  m1.add_repeated_any_value()->PackFrom(value1);
-  m1.add_repeated_any_value()->PackFrom(value2);
-  m2.add_repeated_any_value()->PackFrom(value2);
-  m2.add_repeated_any_value()->PackFrom(value1);
-
-  util::MessageDifferencer message_differencer;
-  message_differencer.TreatAsSet(GetFieldDescriptor(m1, "repeated_any_value"));
-  EXPECT_TRUE(message_differencer.Compare(m1, m2));
-}
-
-TEST(Anytest, TreatAsSet_DifferentType) {
-  protobuf_unittest::TestField value1;
-  value1.set_a(20);
-  value1.set_b(30);
-  protobuf_unittest::TestDiffMessage value2;
-  value2.add_rv(40);
-
-  protobuf_unittest::TestAny m1, m2;
-  m1.add_repeated_any_value()->PackFrom(value1);
-  m1.add_repeated_any_value()->PackFrom(value2);
-  m2.add_repeated_any_value()->PackFrom(value2);
-  m2.add_repeated_any_value()->PackFrom(value1);
-
-  util::MessageDifferencer message_differencer;
-  message_differencer.TreatAsSet(GetFieldDescriptor(m1, "repeated_any_value"));
-  EXPECT_TRUE(message_differencer.Compare(m1, m2));
-}
-
-
-}  // namespace
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/util/message_differencer_unittest.proto b/libs/protobuf/src/google/protobuf/util/message_differencer_unittest.proto
deleted file mode 100644
index 0ad6792..0000000
--- a/libs/protobuf/src/google/protobuf/util/message_differencer_unittest.proto
+++ /dev/null
@@ -1,79 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-//
-// This file contains messages for testing repeated field comparison
-// LINT: ALLOW_GROUPS
-
-syntax = "proto2";
-
-package protobuf_unittest;
-
-import "google/protobuf/any.proto";
-
-option optimize_for = SPEED;
-
-message TestField {
-  optional int32 a = 3;
-  optional int32 b = 4;
-  optional int32 c = 1;
-  repeated int32 rc = 2;
-  optional TestField m = 5;
-
-  extend TestDiffMessage {
-    optional TestField tf = 100;
-  }
-}
-
-message TestDiffMessage {
-  repeated group Item = 1 {
-    optional int32 a = 2;       // Test basic repeated field comparison.
-    optional string b = 4;      // Test basic repeated field comparison.
-    repeated int32 ra = 3;      // Test SetOfSet Comparison.
-    repeated string rb = 5;     // Test TreatAsMap when key is repeated
-    optional TestField m = 6;   // Test TreatAsMap when key is a message
-    repeated TestField rm = 7;  // Test TreatAsMap when key is a repeated
-                                // message
-    map<string, int32> mp = 8;  // Test for map comparisons
-  }
-
-  optional int32 v = 13 [deprecated = true];
-  optional string w = 14;
-  optional TestField m = 15;
-  repeated int32 rv = 11;                          // Test for combinations
-  repeated string rw = 10;                         // Test for combinations
-  repeated TestField rm = 12 [deprecated = true];  // Test for combinations
-  repeated google.protobuf.Any rany =
-      16;  // Test for repeated Any type resolution
-  extensions 100 to 199;
-}
diff --git a/libs/protobuf/src/google/protobuf/util/package_info.h b/libs/protobuf/src/google/protobuf/util/package_info.h
deleted file mode 100644
index 9601920..0000000
--- a/libs/protobuf/src/google/protobuf/util/package_info.h
+++ /dev/null
@@ -1,46 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// This file exists solely to document the google::protobuf::util namespace.
-// It is not compiled into anything, but it may be read by an automated
-// documentation generator.
-
-namespace google {
-
-namespace protobuf {
-
-// Utility classes.
-//
-// This package contains various utilities for message comparison, JSON
-// conversion, well known types, etc.
-namespace util {}
-
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/util/time_util.cc b/libs/protobuf/src/google/protobuf/util/time_util.cc
deleted file mode 100644
index 9893aa3..0000000
--- a/libs/protobuf/src/google/protobuf/util/time_util.cc
+++ /dev/null
@@ -1,514 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <google/protobuf/util/time_util.h>
-
-#include <cstdint>
-
-#include <google/protobuf/stubs/strutil.h>
-#include <google/protobuf/duration.pb.h>
-#include <google/protobuf/timestamp.pb.h>
-#include <google/protobuf/stubs/int128.h>
-#include <google/protobuf/stubs/stringprintf.h>
-#include <google/protobuf/stubs/time.h>
-
-// Must go after other includes.
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-namespace util {
-
-using google::protobuf::Duration;
-using google::protobuf::Timestamp;
-
-namespace {
-static const int kNanosPerSecond = 1000000000;
-static const int kMicrosPerSecond = 1000000;
-static const int kMillisPerSecond = 1000;
-static const int kNanosPerMillisecond = 1000000;
-static const int kNanosPerMicrosecond = 1000;
-static const int kSecondsPerMinute = 60;  // Note that we ignore leap seconds.
-static const int kSecondsPerHour = 3600;
-
-template <typename T>
-T CreateNormalized(int64_t seconds, int64_t nanos);
-
-template <>
-Timestamp CreateNormalized(int64_t seconds, int64_t nanos) {
-  // Make sure nanos is in the range.
-  if (nanos <= -kNanosPerSecond || nanos >= kNanosPerSecond) {
-    seconds += nanos / kNanosPerSecond;
-    nanos = nanos % kNanosPerSecond;
-  }
-  // For Timestamp nanos should be in the range [0, 999999999]
-  if (nanos < 0) {
-    seconds -= 1;
-    nanos += kNanosPerSecond;
-  }
-  GOOGLE_DCHECK(seconds >= TimeUtil::kTimestampMinSeconds &&
-         seconds <= TimeUtil::kTimestampMaxSeconds);
-  Timestamp result;
-  result.set_seconds(seconds);
-  result.set_nanos(static_cast<int32_t>(nanos));
-  return result;
-}
-
-template <>
-Duration CreateNormalized(int64_t seconds, int64_t nanos) {
-  // Make sure nanos is in the range.
-  if (nanos <= -kNanosPerSecond || nanos >= kNanosPerSecond) {
-    seconds += nanos / kNanosPerSecond;
-    nanos = nanos % kNanosPerSecond;
-  }
-  // nanos should have the same sign as seconds.
-  if (seconds < 0 && nanos > 0) {
-    seconds += 1;
-    nanos -= kNanosPerSecond;
-  } else if (seconds > 0 && nanos < 0) {
-    seconds -= 1;
-    nanos += kNanosPerSecond;
-  }
-  GOOGLE_DCHECK(seconds >= TimeUtil::kDurationMinSeconds &&
-         seconds <= TimeUtil::kDurationMaxSeconds);
-  Duration result;
-  result.set_seconds(seconds);
-  result.set_nanos(static_cast<int32_t>(nanos));
-  return result;
-}
-
-// Format nanoseconds with either 3, 6, or 9 digits depending on the required
-// precision to represent the exact value.
-std::string FormatNanos(int32_t nanos) {
-  if (nanos % kNanosPerMillisecond == 0) {
-    return StringPrintf("%03d", nanos / kNanosPerMillisecond);
-  } else if (nanos % kNanosPerMicrosecond == 0) {
-    return StringPrintf("%06d", nanos / kNanosPerMicrosecond);
-  } else {
-    return StringPrintf("%09d", nanos);
-  }
-}
-
-std::string FormatTime(int64_t seconds, int32_t nanos) {
-  return ::google::protobuf::internal::FormatTime(seconds, nanos);
-}
-
-bool ParseTime(const std::string& value, int64_t* seconds, int32_t* nanos) {
-  return ::google::protobuf::internal::ParseTime(value, seconds, nanos);
-}
-
-void CurrentTime(int64_t* seconds, int32_t* nanos) {
-  return ::google::protobuf::internal::GetCurrentTime(seconds, nanos);
-}
-
-// Truncates the remainder part after division.
-int64_t RoundTowardZero(int64_t value, int64_t divider) {
-  int64_t result = value / divider;
-  int64_t remainder = value % divider;
-  // Before C++11, the sign of the remainder is implementation dependent if
-  // any of the operands is negative. Here we try to enforce C++11's "rounded
-  // toward zero" semantics. For example, for (-5) / 2 an implementation may
-  // give -3 as the result with the remainder being 1. This function ensures
-  // we always return -2 (closer to zero) regardless of the implementation.
-  if (result < 0 && remainder > 0) {
-    return result + 1;
-  } else {
-    return result;
-  }
-}
-}  // namespace
-
-// Actually define these static const integers. Required by C++ standard (but
-// some compilers don't like it).
-#ifndef _MSC_VER
-const int64_t TimeUtil::kTimestampMinSeconds;
-const int64_t TimeUtil::kTimestampMaxSeconds;
-const int64_t TimeUtil::kDurationMaxSeconds;
-const int64_t TimeUtil::kDurationMinSeconds;
-#endif  // !_MSC_VER
-
-std::string TimeUtil::ToString(const Timestamp& timestamp) {
-  return FormatTime(timestamp.seconds(), timestamp.nanos());
-}
-
-bool TimeUtil::FromString(const std::string& value, Timestamp* timestamp) {
-  int64_t seconds;
-  int32_t nanos;
-  if (!ParseTime(value, &seconds, &nanos)) {
-    return false;
-  }
-  *timestamp = CreateNormalized<Timestamp>(seconds, nanos);
-  return true;
-}
-
-Timestamp TimeUtil::GetCurrentTime() {
-  int64_t seconds;
-  int32_t nanos;
-  CurrentTime(&seconds, &nanos);
-  return CreateNormalized<Timestamp>(seconds, nanos);
-}
-
-Timestamp TimeUtil::GetEpoch() { return Timestamp(); }
-
-std::string TimeUtil::ToString(const Duration& duration) {
-  std::string result;
-  int64_t seconds = duration.seconds();
-  int32_t nanos = duration.nanos();
-  if (seconds < 0 || nanos < 0) {
-    result += "-";
-    seconds = -seconds;
-    nanos = -nanos;
-  }
-  result += StrCat(seconds);
-  if (nanos != 0) {
-    result += "." + FormatNanos(nanos);
-  }
-  result += "s";
-  return result;
-}
-
-static int64_t Pow(int64_t x, int y) {
-  int64_t result = 1;
-  for (int i = 0; i < y; ++i) {
-    result *= x;
-  }
-  return result;
-}
-
-bool TimeUtil::FromString(const std::string& value, Duration* duration) {
-  if (value.length() <= 1 || value[value.length() - 1] != 's') {
-    return false;
-  }
-  bool negative = (value[0] == '-');
-  size_t sign_length = (negative ? 1 : 0);
-  // Parse the duration value as two integers rather than a float value
-  // to avoid precision loss.
-  std::string seconds_part, nanos_part;
-  size_t pos = value.find_last_of('.');
-  if (pos == std::string::npos) {
-    seconds_part = value.substr(sign_length, value.length() - 1 - sign_length);
-    nanos_part = "0";
-  } else {
-    seconds_part = value.substr(sign_length, pos - sign_length);
-    nanos_part = value.substr(pos + 1, value.length() - pos - 2);
-  }
-  char* end;
-  int64_t seconds = strto64(seconds_part.c_str(), &end, 10);
-  if (end != seconds_part.c_str() + seconds_part.length()) {
-    return false;
-  }
-  int64_t nanos = strto64(nanos_part.c_str(), &end, 10);
-  if (end != nanos_part.c_str() + nanos_part.length()) {
-    return false;
-  }
-  nanos = nanos * Pow(10, static_cast<int>(9 - nanos_part.length()));
-  if (negative) {
-    // If a Duration is negative, both seconds and nanos should be negative.
-    seconds = -seconds;
-    nanos = -nanos;
-  }
-  duration->set_seconds(seconds);
-  duration->set_nanos(static_cast<int32_t>(nanos));
-  return true;
-}
-
-Duration TimeUtil::NanosecondsToDuration(int64_t nanos) {
-  return CreateNormalized<Duration>(nanos / kNanosPerSecond,
-                                    nanos % kNanosPerSecond);
-}
-
-Duration TimeUtil::MicrosecondsToDuration(int64_t micros) {
-  return CreateNormalized<Duration>(
-      micros / kMicrosPerSecond,
-      (micros % kMicrosPerSecond) * kNanosPerMicrosecond);
-}
-
-Duration TimeUtil::MillisecondsToDuration(int64_t millis) {
-  return CreateNormalized<Duration>(
-      millis / kMillisPerSecond,
-      (millis % kMillisPerSecond) * kNanosPerMillisecond);
-}
-
-Duration TimeUtil::SecondsToDuration(int64_t seconds) {
-  return CreateNormalized<Duration>(seconds, 0);
-}
-
-Duration TimeUtil::MinutesToDuration(int64_t minutes) {
-  return CreateNormalized<Duration>(minutes * kSecondsPerMinute, 0);
-}
-
-Duration TimeUtil::HoursToDuration(int64_t hours) {
-  return CreateNormalized<Duration>(hours * kSecondsPerHour, 0);
-}
-
-int64_t TimeUtil::DurationToNanoseconds(const Duration& duration) {
-  return duration.seconds() * kNanosPerSecond + duration.nanos();
-}
-
-int64_t TimeUtil::DurationToMicroseconds(const Duration& duration) {
-  return duration.seconds() * kMicrosPerSecond +
-         RoundTowardZero(duration.nanos(), kNanosPerMicrosecond);
-}
-
-int64_t TimeUtil::DurationToMilliseconds(const Duration& duration) {
-  return duration.seconds() * kMillisPerSecond +
-         RoundTowardZero(duration.nanos(), kNanosPerMillisecond);
-}
-
-int64_t TimeUtil::DurationToSeconds(const Duration& duration) {
-  return duration.seconds();
-}
-
-int64_t TimeUtil::DurationToMinutes(const Duration& duration) {
-  return RoundTowardZero(duration.seconds(), kSecondsPerMinute);
-}
-
-int64_t TimeUtil::DurationToHours(const Duration& duration) {
-  return RoundTowardZero(duration.seconds(), kSecondsPerHour);
-}
-
-Timestamp TimeUtil::NanosecondsToTimestamp(int64_t nanos) {
-  return CreateNormalized<Timestamp>(nanos / kNanosPerSecond,
-                                     nanos % kNanosPerSecond);
-}
-
-Timestamp TimeUtil::MicrosecondsToTimestamp(int64_t micros) {
-  return CreateNormalized<Timestamp>(
-      micros / kMicrosPerSecond,
-      micros % kMicrosPerSecond * kNanosPerMicrosecond);
-}
-
-Timestamp TimeUtil::MillisecondsToTimestamp(int64_t millis) {
-  return CreateNormalized<Timestamp>(
-      millis / kMillisPerSecond,
-      millis % kMillisPerSecond * kNanosPerMillisecond);
-}
-
-Timestamp TimeUtil::SecondsToTimestamp(int64_t seconds) {
-  return CreateNormalized<Timestamp>(seconds, 0);
-}
-
-int64_t TimeUtil::TimestampToNanoseconds(const Timestamp& timestamp) {
-  return timestamp.seconds() * kNanosPerSecond + timestamp.nanos();
-}
-
-int64_t TimeUtil::TimestampToMicroseconds(const Timestamp& timestamp) {
-  return timestamp.seconds() * kMicrosPerSecond +
-         RoundTowardZero(timestamp.nanos(), kNanosPerMicrosecond);
-}
-
-int64_t TimeUtil::TimestampToMilliseconds(const Timestamp& timestamp) {
-  return timestamp.seconds() * kMillisPerSecond +
-         RoundTowardZero(timestamp.nanos(), kNanosPerMillisecond);
-}
-
-int64_t TimeUtil::TimestampToSeconds(const Timestamp& timestamp) {
-  return timestamp.seconds();
-}
-
-Timestamp TimeUtil::TimeTToTimestamp(time_t value) {
-  return CreateNormalized<Timestamp>(static_cast<int64_t>(value), 0);
-}
-
-time_t TimeUtil::TimestampToTimeT(const Timestamp& value) {
-  return static_cast<time_t>(value.seconds());
-}
-
-Timestamp TimeUtil::TimevalToTimestamp(const timeval& value) {
-  return CreateNormalized<Timestamp>(value.tv_sec,
-                                     value.tv_usec * kNanosPerMicrosecond);
-}
-
-timeval TimeUtil::TimestampToTimeval(const Timestamp& value) {
-  timeval result;
-  result.tv_sec = value.seconds();
-  result.tv_usec = RoundTowardZero(value.nanos(), kNanosPerMicrosecond);
-  return result;
-}
-
-Duration TimeUtil::TimevalToDuration(const timeval& value) {
-  return CreateNormalized<Duration>(value.tv_sec,
-                                    value.tv_usec * kNanosPerMicrosecond);
-}
-
-timeval TimeUtil::DurationToTimeval(const Duration& value) {
-  timeval result;
-  result.tv_sec = value.seconds();
-  result.tv_usec = RoundTowardZero(value.nanos(), kNanosPerMicrosecond);
-  // timeval.tv_usec's range is [0, 1000000)
-  if (result.tv_usec < 0) {
-    result.tv_sec -= 1;
-    result.tv_usec += kMicrosPerSecond;
-  }
-  return result;
-}
-
-}  // namespace util
-}  // namespace protobuf
-}  // namespace google
-
-namespace google {
-namespace protobuf {
-namespace {
-using ::PROTOBUF_NAMESPACE_ID::util::CreateNormalized;
-using ::PROTOBUF_NAMESPACE_ID::util::kNanosPerSecond;
-
-// Convert a Duration to uint128.
-void ToUint128(const Duration& value, uint128* result, bool* negative) {
-  if (value.seconds() < 0 || value.nanos() < 0) {
-    *negative = true;
-    *result = static_cast<uint64_t>(-value.seconds());
-    *result = *result * kNanosPerSecond + static_cast<uint32_t>(-value.nanos());
-  } else {
-    *negative = false;
-    *result = static_cast<uint64_t>(value.seconds());
-    *result = *result * kNanosPerSecond + static_cast<uint32_t>(value.nanos());
-  }
-}
-
-void ToDuration(const uint128& value, bool negative, Duration* duration) {
-  int64_t seconds =
-      static_cast<int64_t>(Uint128Low64(value / kNanosPerSecond));
-  int32_t nanos =
-      static_cast<int32_t>(Uint128Low64(value % kNanosPerSecond));
-  if (negative) {
-    seconds = -seconds;
-    nanos = -nanos;
-  }
-  duration->set_seconds(seconds);
-  duration->set_nanos(nanos);
-}
-}  // namespace
-
-Duration& operator+=(Duration& d1, const Duration& d2) {
-  d1 = CreateNormalized<Duration>(d1.seconds() + d2.seconds(),
-                                  d1.nanos() + d2.nanos());
-  return d1;
-}
-
-Duration& operator-=(Duration& d1, const Duration& d2) {  // NOLINT
-  d1 = CreateNormalized<Duration>(d1.seconds() - d2.seconds(),
-                                  d1.nanos() - d2.nanos());
-  return d1;
-}
-
-Duration& operator*=(Duration& d, int64_t r) {  // NOLINT
-  bool negative;
-  uint128 value;
-  ToUint128(d, &value, &negative);
-  if (r > 0) {
-    value *= static_cast<uint64_t>(r);
-  } else {
-    negative = !negative;
-    value *= static_cast<uint64_t>(-r);
-  }
-  ToDuration(value, negative, &d);
-  return d;
-}
-
-Duration& operator*=(Duration& d, double r) {  // NOLINT
-  double result =
-      (static_cast<double>(d.seconds()) + d.nanos() * (1.0 / kNanosPerSecond)) *
-      r;
-  int64_t seconds = static_cast<int64_t>(result);
-  int32_t nanos = static_cast<int32_t>((result - static_cast<double>(seconds)) *
-                                       kNanosPerSecond);
-  // Note that we normalize here not just because nanos can have a different
-  // sign from seconds but also that nanos can be any arbitrary value when
-  // overflow happens (i.e., the result is a much larger value than what
-  // int64 can represent).
-  d = CreateNormalized<Duration>(seconds, nanos);
-  return d;
-}
-
-Duration& operator/=(Duration& d, int64_t r) {  // NOLINT
-  bool negative;
-  uint128 value;
-  ToUint128(d, &value, &negative);
-  if (r > 0) {
-    value /= static_cast<uint64_t>(r);
-  } else {
-    negative = !negative;
-    value /= static_cast<uint64_t>(-r);
-  }
-  ToDuration(value, negative, &d);
-  return d;
-}
-
-Duration& operator/=(Duration& d, double r) {  // NOLINT
-  return d *= 1.0 / r;
-}
-
-Duration& operator%=(Duration& d1, const Duration& d2) {  // NOLINT
-  bool negative1, negative2;
-  uint128 value1, value2;
-  ToUint128(d1, &value1, &negative1);
-  ToUint128(d2, &value2, &negative2);
-  uint128 result = value1 % value2;
-  // When negative values are involved in division, we round the division
-  // result towards zero. With this semantics, sign of the remainder is the
-  // same as the dividend. For example:
-  //     -5 / 10    = 0, -5 % 10    = -5
-  //     -5 / (-10) = 0, -5 % (-10) = -5
-  //      5 / (-10) = 0,  5 % (-10) = 5
-  ToDuration(result, negative1, &d1);
-  return d1;
-}
-
-int64_t operator/(const Duration& d1, const Duration& d2) {
-  bool negative1, negative2;
-  uint128 value1, value2;
-  ToUint128(d1, &value1, &negative1);
-  ToUint128(d2, &value2, &negative2);
-  int64_t result = Uint128Low64(value1 / value2);
-  if (negative1 != negative2) {
-    result = -result;
-  }
-  return result;
-}
-
-Timestamp& operator+=(Timestamp& t, const Duration& d) {  // NOLINT
-  t = CreateNormalized<Timestamp>(t.seconds() + d.seconds(),
-                                  t.nanos() + d.nanos());
-  return t;
-}
-
-Timestamp& operator-=(Timestamp& t, const Duration& d) {  // NOLINT
-  t = CreateNormalized<Timestamp>(t.seconds() - d.seconds(),
-                                  t.nanos() - d.nanos());
-  return t;
-}
-
-Duration operator-(const Timestamp& t1, const Timestamp& t2) {
-  return CreateNormalized<Duration>(t1.seconds() - t2.seconds(),
-                                    t1.nanos() - t2.nanos());
-}
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/util/time_util.h b/libs/protobuf/src/google/protobuf/util/time_util.h
deleted file mode 100644
index 709527e..0000000
--- a/libs/protobuf/src/google/protobuf/util/time_util.h
+++ /dev/null
@@ -1,314 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Defines utilities for the Timestamp and Duration well known types.
-
-#ifndef GOOGLE_PROTOBUF_UTIL_TIME_UTIL_H__
-#define GOOGLE_PROTOBUF_UTIL_TIME_UTIL_H__
-
-#include <cstdint>
-#include <ctime>
-#include <ostream>
-#include <string>
-#ifdef _MSC_VER
-#ifdef _XBOX_ONE
-struct timeval {
-  int64_t tv_sec;  /* seconds */
-  int64_t tv_usec; /* and microseconds */
-};
-#else
-#include <winsock2.h>
-#endif  // _XBOX_ONE
-#else
-#include <sys/time.h>
-#endif
-
-#include <google/protobuf/duration.pb.h>
-#include <google/protobuf/timestamp.pb.h>
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-namespace util {
-
-// Utility functions for Timestamp and Duration.
-class PROTOBUF_EXPORT TimeUtil {
-  typedef google::protobuf::Timestamp Timestamp;
-  typedef google::protobuf::Duration Duration;
-
- public:
-  // The min/max Timestamp/Duration values we support.
-  //
-  // For "0001-01-01T00:00:00Z".
-  static const int64_t kTimestampMinSeconds = -62135596800LL;
-  // For "9999-12-31T23:59:59.999999999Z".
-  static const int64_t kTimestampMaxSeconds = 253402300799LL;
-  static const int64_t kDurationMinSeconds = -315576000000LL;
-  static const int64_t kDurationMaxSeconds = 315576000000LL;
-
-  // Converts Timestamp to/from RFC 3339 date string format.
-  // Generated output will always be Z-normalized and uses 3, 6 or 9
-  // fractional digits as required to represent the exact time. When
-  // parsing, any fractional digits (or none) and any offset are
-  // accepted as long as they fit into nano-seconds precision.
-  // Note that Timestamp can only represent time from
-  // 0001-01-01T00:00:00Z to 9999-12-31T23:59:59.999999999Z. Converting
-  // a Timestamp outside of this range is undefined behavior.
-  // See https://www.ietf.org/rfc/rfc3339.txt
-  //
-  // Example of generated format:
-  //   "1972-01-01T10:00:20.021Z"
-  //
-  // Example of accepted format:
-  //   "1972-01-01T10:00:20.021-05:00"
-  static std::string ToString(const Timestamp& timestamp);
-  static bool FromString(const std::string& value, Timestamp* timestamp);
-
-  // Converts Duration to/from string format. The string format will contains
-  // 3, 6, or 9 fractional digits depending on the precision required to
-  // represent the exact Duration value. For example:
-  //   "1s", "1.010s", "1.000000100s", "-3.100s"
-  // The range that can be represented by Duration is from -315,576,000,000
-  // to +315,576,000,000 inclusive (in seconds).
-  static std::string ToString(const Duration& duration);
-  static bool FromString(const std::string& value, Duration* timestamp);
-
-#ifdef GetCurrentTime
-#undef GetCurrentTime  // Visual Studio has macro GetCurrentTime
-#endif
-  // Gets the current UTC time.
-  static Timestamp GetCurrentTime();
-  // Returns the Time representing "1970-01-01 00:00:00".
-  static Timestamp GetEpoch();
-
-  // Converts between Duration and integer types. The behavior is undefined if
-  // the input value is not in the valid range of Duration.
-  static Duration NanosecondsToDuration(int64_t nanos);
-  static Duration MicrosecondsToDuration(int64_t micros);
-  static Duration MillisecondsToDuration(int64_t millis);
-  static Duration SecondsToDuration(int64_t seconds);
-  static Duration MinutesToDuration(int64_t minutes);
-  static Duration HoursToDuration(int64_t hours);
-  // Result will be truncated towards zero. For example, "-1.5s" will be
-  // truncated to "-1s", and "1.5s" to "1s" when converting to seconds.
-  // It's undefined behavior if the input duration is not valid or the result
-  // exceeds the range of int64. A duration is not valid if it's not in the
-  // valid range of Duration, or have an invalid nanos value (i.e., larger
-  // than 999999999, less than -999999999, or have a different sign from the
-  // seconds part).
-  static int64_t DurationToNanoseconds(const Duration& duration);
-  static int64_t DurationToMicroseconds(const Duration& duration);
-  static int64_t DurationToMilliseconds(const Duration& duration);
-  static int64_t DurationToSeconds(const Duration& duration);
-  static int64_t DurationToMinutes(const Duration& duration);
-  static int64_t DurationToHours(const Duration& duration);
-  // Creates Timestamp from integer types. The integer value indicates the
-  // time elapsed from Epoch time. The behavior is undefined if the input
-  // value is not in the valid range of Timestamp.
-  static Timestamp NanosecondsToTimestamp(int64_t nanos);
-  static Timestamp MicrosecondsToTimestamp(int64_t micros);
-  static Timestamp MillisecondsToTimestamp(int64_t millis);
-  static Timestamp SecondsToTimestamp(int64_t seconds);
-  // Result will be truncated down to the nearest integer value. For example,
-  // with "1969-12-31T23:59:59.9Z", TimestampToMilliseconds() returns -100
-  // and TimestampToSeconds() returns -1. It's undefined behavior if the input
-  // Timestamp is not valid (i.e., its seconds part or nanos part does not fall
-  // in the valid range) or the return value doesn't fit into int64.
-  static int64_t TimestampToNanoseconds(const Timestamp& timestamp);
-  static int64_t TimestampToMicroseconds(const Timestamp& timestamp);
-  static int64_t TimestampToMilliseconds(const Timestamp& timestamp);
-  static int64_t TimestampToSeconds(const Timestamp& timestamp);
-
-  // Conversion to/from other time/date types. Note that these types may
-  // have a different precision and time range from Timestamp/Duration.
-  // When converting to a lower precision type, the value will be truncated
-  // to the nearest value that can be represented. If the value is
-  // out of the range of the result type, the return value is undefined.
-  //
-  // Conversion to/from time_t
-  static Timestamp TimeTToTimestamp(time_t value);
-  static time_t TimestampToTimeT(const Timestamp& value);
-
-  // Conversion to/from timeval
-  static Timestamp TimevalToTimestamp(const timeval& value);
-  static timeval TimestampToTimeval(const Timestamp& value);
-  static Duration TimevalToDuration(const timeval& value);
-  static timeval DurationToTimeval(const Duration& value);
-};
-
-}  // namespace util
-}  // namespace protobuf
-}  // namespace google
-
-namespace google {
-namespace protobuf {
-// Overloaded operators for Duration.
-//
-// Assignment operators.
-PROTOBUF_EXPORT Duration& operator+=(Duration& d1,
-                                     const Duration& d2);  // NOLINT
-PROTOBUF_EXPORT Duration& operator-=(Duration& d1,
-                                     const Duration& d2);     // NOLINT
-PROTOBUF_EXPORT Duration& operator*=(Duration& d, int64_t r);  // NOLINT
-PROTOBUF_EXPORT Duration& operator*=(Duration& d, double r);  // NOLINT
-PROTOBUF_EXPORT Duration& operator/=(Duration& d, int64_t r);  // NOLINT
-PROTOBUF_EXPORT Duration& operator/=(Duration& d, double r);  // NOLINT
-// Overload for other integer types.
-template <typename T>
-Duration& operator*=(Duration& d, T r) {  // NOLINT
-  int64_t x = r;
-  return d *= x;
-}
-template <typename T>
-Duration& operator/=(Duration& d, T r) {  // NOLINT
-  int64_t x = r;
-  return d /= x;
-}
-PROTOBUF_EXPORT Duration& operator%=(Duration& d1,
-                                     const Duration& d2);  // NOLINT
-// Relational operators.
-inline bool operator<(const Duration& d1, const Duration& d2) {
-  if (d1.seconds() == d2.seconds()) {
-    return d1.nanos() < d2.nanos();
-  }
-  return d1.seconds() < d2.seconds();
-}
-inline bool operator>(const Duration& d1, const Duration& d2) {
-  return d2 < d1;
-}
-inline bool operator>=(const Duration& d1, const Duration& d2) {
-  return !(d1 < d2);
-}
-inline bool operator<=(const Duration& d1, const Duration& d2) {
-  return !(d2 < d1);
-}
-inline bool operator==(const Duration& d1, const Duration& d2) {
-  return d1.seconds() == d2.seconds() && d1.nanos() == d2.nanos();
-}
-inline bool operator!=(const Duration& d1, const Duration& d2) {
-  return !(d1 == d2);
-}
-// Additive operators
-inline Duration operator-(const Duration& d) {
-  Duration result;
-  result.set_seconds(-d.seconds());
-  result.set_nanos(-d.nanos());
-  return result;
-}
-inline Duration operator+(const Duration& d1, const Duration& d2) {
-  Duration result = d1;
-  return result += d2;
-}
-inline Duration operator-(const Duration& d1, const Duration& d2) {
-  Duration result = d1;
-  return result -= d2;
-}
-// Multiplicative operators
-template <typename T>
-inline Duration operator*(Duration d, T r) {
-  return d *= r;
-}
-template <typename T>
-inline Duration operator*(T r, Duration d) {
-  return d *= r;
-}
-template <typename T>
-inline Duration operator/(Duration d, T r) {
-  return d /= r;
-}
-PROTOBUF_EXPORT int64_t operator/(const Duration& d1, const Duration& d2);
-
-inline Duration operator%(const Duration& d1, const Duration& d2) {
-  Duration result = d1;
-  return result %= d2;
-}
-
-inline std::ostream& operator<<(std::ostream& out, const Duration& d) {
-  out << ::PROTOBUF_NAMESPACE_ID::util::TimeUtil::ToString(d);
-  return out;
-}
-
-// Overloaded operators for Timestamp
-//
-// Assignment operators.
-PROTOBUF_EXPORT Timestamp& operator+=(Timestamp& t,
-                                      const Duration& d);  // NOLINT
-PROTOBUF_EXPORT Timestamp& operator-=(Timestamp& t,
-                                      const Duration& d);  // NOLINT
-// Relational operators.
-inline bool operator<(const Timestamp& t1, const Timestamp& t2) {
-  if (t1.seconds() == t2.seconds()) {
-    return t1.nanos() < t2.nanos();
-  }
-  return t1.seconds() < t2.seconds();
-}
-inline bool operator>(const Timestamp& t1, const Timestamp& t2) {
-  return t2 < t1;
-}
-inline bool operator>=(const Timestamp& t1, const Timestamp& t2) {
-  return !(t1 < t2);
-}
-inline bool operator<=(const Timestamp& t1, const Timestamp& t2) {
-  return !(t2 < t1);
-}
-inline bool operator==(const Timestamp& t1, const Timestamp& t2) {
-  return t1.seconds() == t2.seconds() && t1.nanos() == t2.nanos();
-}
-inline bool operator!=(const Timestamp& t1, const Timestamp& t2) {
-  return !(t1 == t2);
-}
-// Additive operators.
-inline Timestamp operator+(const Timestamp& t, const Duration& d) {
-  Timestamp result = t;
-  return result += d;
-}
-inline Timestamp operator+(const Duration& d, const Timestamp& t) {
-  Timestamp result = t;
-  return result += d;
-}
-inline Timestamp operator-(const Timestamp& t, const Duration& d) {
-  Timestamp result = t;
-  return result -= d;
-}
-PROTOBUF_EXPORT Duration operator-(const Timestamp& t1, const Timestamp& t2);
-
-inline std::ostream& operator<<(std::ostream& out, const Timestamp& t) {
-  out << ::PROTOBUF_NAMESPACE_ID::util::TimeUtil::ToString(t);
-  return out;
-}
-
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
-
-#endif  // GOOGLE_PROTOBUF_UTIL_TIME_UTIL_H__
diff --git a/libs/protobuf/src/google/protobuf/util/time_util_test.cc b/libs/protobuf/src/google/protobuf/util/time_util_test.cc
deleted file mode 100644
index 79e2427..0000000
--- a/libs/protobuf/src/google/protobuf/util/time_util_test.cc
+++ /dev/null
@@ -1,384 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <google/protobuf/util/time_util.h>
-
-#include <cstdint>
-#include <ctime>
-
-#include <google/protobuf/duration.pb.h>
-#include <google/protobuf/timestamp.pb.h>
-#include <google/protobuf/testing/googletest.h>
-#include <gtest/gtest.h>
-
-namespace google {
-namespace protobuf {
-namespace util {
-
-using google::protobuf::Duration;
-using google::protobuf::Timestamp;
-
-namespace {
-
-TEST(TimeUtilTest, TimestampStringFormat) {
-  Timestamp begin, end;
-  EXPECT_TRUE(TimeUtil::FromString("0001-01-01T00:00:00Z", &begin));
-  EXPECT_EQ(TimeUtil::kTimestampMinSeconds, begin.seconds());
-  EXPECT_EQ(0, begin.nanos());
-  EXPECT_TRUE(TimeUtil::FromString("9999-12-31T23:59:59.999999999Z", &end));
-  EXPECT_EQ(TimeUtil::kTimestampMaxSeconds, end.seconds());
-  EXPECT_EQ(999999999, end.nanos());
-  EXPECT_EQ("0001-01-01T00:00:00Z", TimeUtil::ToString(begin));
-  EXPECT_EQ("9999-12-31T23:59:59.999999999Z", TimeUtil::ToString(end));
-
-  // Test negative timestamps.
-  Timestamp time = TimeUtil::NanosecondsToTimestamp(-1);
-  EXPECT_EQ(-1, time.seconds());
-  // Timestamp's nano part is always non-negative.
-  EXPECT_EQ(999999999, time.nanos());
-  EXPECT_EQ("1969-12-31T23:59:59.999999999Z", TimeUtil::ToString(time));
-
-  // Generated output should contain 3, 6, or 9 fractional digits.
-  EXPECT_EQ("1970-01-01T00:00:00Z",
-            TimeUtil::ToString(TimeUtil::NanosecondsToTimestamp(0)));
-  EXPECT_EQ("1970-01-01T00:00:00.010Z",
-            TimeUtil::ToString(TimeUtil::NanosecondsToTimestamp(10000000)));
-  EXPECT_EQ("1970-01-01T00:00:00.000010Z",
-            TimeUtil::ToString(TimeUtil::NanosecondsToTimestamp(10000)));
-  EXPECT_EQ("1970-01-01T00:00:00.000000010Z",
-            TimeUtil::ToString(TimeUtil::NanosecondsToTimestamp(10)));
-
-  // Parsing accepts an fractional digits as long as they fit into nano
-  // precision.
-  EXPECT_TRUE(TimeUtil::FromString("1970-01-01T00:00:00.1Z", &time));
-  EXPECT_EQ(100000000, TimeUtil::TimestampToNanoseconds(time));
-  EXPECT_TRUE(TimeUtil::FromString("1970-01-01T00:00:00.0001Z", &time));
-  EXPECT_EQ(100000, TimeUtil::TimestampToNanoseconds(time));
-  EXPECT_TRUE(TimeUtil::FromString("1970-01-01T00:00:00.0000001Z", &time));
-  EXPECT_EQ(100, TimeUtil::TimestampToNanoseconds(time));
-
-  // Also accepts offsets.
-  EXPECT_TRUE(TimeUtil::FromString("1970-01-01T00:00:00-08:00", &time));
-  EXPECT_EQ(8 * 3600, TimeUtil::TimestampToSeconds(time));
-}
-
-TEST(TimeUtilTest, DurationStringFormat) {
-  Timestamp begin, end;
-  EXPECT_TRUE(TimeUtil::FromString("0001-01-01T00:00:00Z", &begin));
-  EXPECT_TRUE(TimeUtil::FromString("9999-12-31T23:59:59.999999999Z", &end));
-
-  EXPECT_EQ("315537897599.999999999s", TimeUtil::ToString(end - begin));
-  EXPECT_EQ(999999999, (end - begin).nanos());
-  EXPECT_EQ("-315537897599.999999999s", TimeUtil::ToString(begin - end));
-  EXPECT_EQ(-999999999, (begin - end).nanos());
-
-  // Generated output should contain 3, 6, or 9 fractional digits.
-  EXPECT_EQ("1s", TimeUtil::ToString(TimeUtil::SecondsToDuration(1)));
-  EXPECT_EQ("0.010s", TimeUtil::ToString(TimeUtil::MillisecondsToDuration(10)));
-  EXPECT_EQ("0.000010s",
-            TimeUtil::ToString(TimeUtil::MicrosecondsToDuration(10)));
-  EXPECT_EQ("0.000000010s",
-            TimeUtil::ToString(TimeUtil::NanosecondsToDuration(10)));
-
-  // Parsing accepts an fractional digits as long as they fit into nano
-  // precision.
-  Duration d;
-  EXPECT_TRUE(TimeUtil::FromString("0.1s", &d));
-  EXPECT_EQ(100, TimeUtil::DurationToMilliseconds(d));
-  EXPECT_TRUE(TimeUtil::FromString("0.0001s", &d));
-  EXPECT_EQ(100, TimeUtil::DurationToMicroseconds(d));
-  EXPECT_TRUE(TimeUtil::FromString("0.0000001s", &d));
-  EXPECT_EQ(100, TimeUtil::DurationToNanoseconds(d));
-
-  // Duration must support range from -315,576,000,000s to +315576000000s
-  // which includes negative values.
-  EXPECT_TRUE(TimeUtil::FromString("315576000000.999999999s", &d));
-  EXPECT_EQ(int64_t{315576000000}, d.seconds());
-  EXPECT_EQ(999999999, d.nanos());
-  EXPECT_TRUE(TimeUtil::FromString("-315576000000.999999999s", &d));
-  EXPECT_EQ(int64_t{-315576000000}, d.seconds());
-  EXPECT_EQ(-999999999, d.nanos());
-}
-
-TEST(TimeUtilTest, GetEpoch) {
-  EXPECT_EQ(0, TimeUtil::TimestampToNanoseconds(TimeUtil::GetEpoch()));
-}
-
-TEST(TimeUtilTest, DurationIntegerConversion) {
-  EXPECT_EQ("0.000000001s",
-            TimeUtil::ToString(TimeUtil::NanosecondsToDuration(1)));
-  EXPECT_EQ("-0.000000001s",
-            TimeUtil::ToString(TimeUtil::NanosecondsToDuration(-1)));
-  EXPECT_EQ("0.000001s",
-            TimeUtil::ToString(TimeUtil::MicrosecondsToDuration(1)));
-  EXPECT_EQ("-0.000001s",
-            TimeUtil::ToString(TimeUtil::MicrosecondsToDuration(-1)));
-  EXPECT_EQ("0.001s", TimeUtil::ToString(TimeUtil::MillisecondsToDuration(1)));
-  EXPECT_EQ("-0.001s",
-            TimeUtil::ToString(TimeUtil::MillisecondsToDuration(-1)));
-  EXPECT_EQ("1s", TimeUtil::ToString(TimeUtil::SecondsToDuration(1)));
-  EXPECT_EQ("-1s", TimeUtil::ToString(TimeUtil::SecondsToDuration(-1)));
-  EXPECT_EQ("60s", TimeUtil::ToString(TimeUtil::MinutesToDuration(1)));
-  EXPECT_EQ("-60s", TimeUtil::ToString(TimeUtil::MinutesToDuration(-1)));
-  EXPECT_EQ("3600s", TimeUtil::ToString(TimeUtil::HoursToDuration(1)));
-  EXPECT_EQ("-3600s", TimeUtil::ToString(TimeUtil::HoursToDuration(-1)));
-
-  EXPECT_EQ(
-      1, TimeUtil::DurationToNanoseconds(TimeUtil::NanosecondsToDuration(1)));
-  EXPECT_EQ(
-      -1, TimeUtil::DurationToNanoseconds(TimeUtil::NanosecondsToDuration(-1)));
-  EXPECT_EQ(
-      1, TimeUtil::DurationToMicroseconds(TimeUtil::MicrosecondsToDuration(1)));
-  EXPECT_EQ(-1, TimeUtil::DurationToMicroseconds(
-                    TimeUtil::MicrosecondsToDuration(-1)));
-  EXPECT_EQ(
-      1, TimeUtil::DurationToMilliseconds(TimeUtil::MillisecondsToDuration(1)));
-  EXPECT_EQ(-1, TimeUtil::DurationToMilliseconds(
-                    TimeUtil::MillisecondsToDuration(-1)));
-  EXPECT_EQ(1, TimeUtil::DurationToSeconds(TimeUtil::SecondsToDuration(1)));
-  EXPECT_EQ(-1, TimeUtil::DurationToSeconds(TimeUtil::SecondsToDuration(-1)));
-  EXPECT_EQ(1, TimeUtil::DurationToMinutes(TimeUtil::MinutesToDuration(1)));
-  EXPECT_EQ(-1, TimeUtil::DurationToMinutes(TimeUtil::MinutesToDuration(-1)));
-  EXPECT_EQ(1, TimeUtil::DurationToHours(TimeUtil::HoursToDuration(1)));
-  EXPECT_EQ(-1, TimeUtil::DurationToHours(TimeUtil::HoursToDuration(-1)));
-
-  // Test truncation behavior.
-  EXPECT_EQ(1, TimeUtil::DurationToMicroseconds(
-                   TimeUtil::NanosecondsToDuration(1999)));
-  // For negative values, Duration will be rounded towards 0.
-  EXPECT_EQ(-1, TimeUtil::DurationToMicroseconds(
-                    TimeUtil::NanosecondsToDuration(-1999)));
-}
-
-TEST(TestUtilTest, TimestampIntegerConversion) {
-  EXPECT_EQ("1970-01-01T00:00:00.000000001Z",
-            TimeUtil::ToString(TimeUtil::NanosecondsToTimestamp(1)));
-  EXPECT_EQ("1969-12-31T23:59:59.999999999Z",
-            TimeUtil::ToString(TimeUtil::NanosecondsToTimestamp(-1)));
-  EXPECT_EQ("1970-01-01T00:00:00.000001Z",
-            TimeUtil::ToString(TimeUtil::MicrosecondsToTimestamp(1)));
-  EXPECT_EQ("1969-12-31T23:59:59.999999Z",
-            TimeUtil::ToString(TimeUtil::MicrosecondsToTimestamp(-1)));
-  EXPECT_EQ("1970-01-01T00:00:00.001Z",
-            TimeUtil::ToString(TimeUtil::MillisecondsToTimestamp(1)));
-  EXPECT_EQ("1969-12-31T23:59:59.999Z",
-            TimeUtil::ToString(TimeUtil::MillisecondsToTimestamp(-1)));
-  EXPECT_EQ("1970-01-01T00:00:01Z",
-            TimeUtil::ToString(TimeUtil::SecondsToTimestamp(1)));
-  EXPECT_EQ("1969-12-31T23:59:59Z",
-            TimeUtil::ToString(TimeUtil::SecondsToTimestamp(-1)));
-
-  EXPECT_EQ(
-      1, TimeUtil::TimestampToNanoseconds(TimeUtil::NanosecondsToTimestamp(1)));
-  EXPECT_EQ(-1, TimeUtil::TimestampToNanoseconds(
-                    TimeUtil::NanosecondsToTimestamp(-1)));
-  EXPECT_EQ(1, TimeUtil::TimestampToMicroseconds(
-                   TimeUtil::MicrosecondsToTimestamp(1)));
-  EXPECT_EQ(-1, TimeUtil::TimestampToMicroseconds(
-                    TimeUtil::MicrosecondsToTimestamp(-1)));
-  EXPECT_EQ(1, TimeUtil::TimestampToMilliseconds(
-                   TimeUtil::MillisecondsToTimestamp(1)));
-  EXPECT_EQ(-1, TimeUtil::TimestampToMilliseconds(
-                    TimeUtil::MillisecondsToTimestamp(-1)));
-  EXPECT_EQ(1, TimeUtil::TimestampToSeconds(TimeUtil::SecondsToTimestamp(1)));
-  EXPECT_EQ(-1, TimeUtil::TimestampToSeconds(TimeUtil::SecondsToTimestamp(-1)));
-
-  // Test truncation behavior.
-  EXPECT_EQ(1, TimeUtil::TimestampToMicroseconds(
-                   TimeUtil::NanosecondsToTimestamp(1999)));
-  // For negative values, Timestamp will be rounded down.
-  // For example, "1969-12-31T23:59:59.5Z" (i.e., -0.5s) rounded to seconds
-  // will be "1969-12-31T23:59:59Z" (i.e., -1s) rather than
-  // "1970-01-01T00:00:00Z" (i.e., 0s).
-  EXPECT_EQ(-2, TimeUtil::TimestampToMicroseconds(
-                    TimeUtil::NanosecondsToTimestamp(-1999)));
-}
-
-TEST(TimeUtilTest, TimeTConversion) {
-  time_t value = time(nullptr);
-  EXPECT_EQ(value,
-            TimeUtil::TimestampToTimeT(TimeUtil::TimeTToTimestamp(value)));
-  EXPECT_EQ(
-      1, TimeUtil::TimestampToTimeT(TimeUtil::MillisecondsToTimestamp(1999)));
-}
-
-TEST(TimeUtilTest, TimevalConversion) {
-  timeval value = TimeUtil::TimestampToTimeval(
-      TimeUtil::NanosecondsToTimestamp(1999999999));
-  EXPECT_EQ(1, value.tv_sec);
-  EXPECT_EQ(999999, value.tv_usec);
-  value = TimeUtil::TimestampToTimeval(
-      TimeUtil::NanosecondsToTimestamp(-1999999999));
-  EXPECT_EQ(-2, value.tv_sec);
-  EXPECT_EQ(0, value.tv_usec);
-
-  value =
-      TimeUtil::DurationToTimeval(TimeUtil::NanosecondsToDuration(1999999999));
-  EXPECT_EQ(1, value.tv_sec);
-  EXPECT_EQ(999999, value.tv_usec);
-  value =
-      TimeUtil::DurationToTimeval(TimeUtil::NanosecondsToDuration(-1999999999));
-  EXPECT_EQ(-2, value.tv_sec);
-  EXPECT_EQ(1, value.tv_usec);
-}
-
-TEST(TimeUtilTest, DurationOperators) {
-  Duration one_second = TimeUtil::SecondsToDuration(1);
-  Duration one_nano = TimeUtil::NanosecondsToDuration(1);
-
-  // Test +/-
-  Duration a = one_second;
-  a += one_second;
-  a -= one_nano;
-  EXPECT_EQ("1.999999999s", TimeUtil::ToString(a));
-  Duration b = -a;
-  EXPECT_EQ("-1.999999999s", TimeUtil::ToString(b));
-  EXPECT_EQ("3.999999998s", TimeUtil::ToString(a + a));
-  EXPECT_EQ("0s", TimeUtil::ToString(a + b));
-  EXPECT_EQ("0s", TimeUtil::ToString(b + a));
-  EXPECT_EQ("-3.999999998s", TimeUtil::ToString(b + b));
-  EXPECT_EQ("3.999999998s", TimeUtil::ToString(a - b));
-  EXPECT_EQ("0s", TimeUtil::ToString(a - a));
-  EXPECT_EQ("0s", TimeUtil::ToString(b - b));
-  EXPECT_EQ("-3.999999998s", TimeUtil::ToString(b - a));
-
-  // Test *
-  EXPECT_EQ(a + a, a * 2);
-  EXPECT_EQ(b + b, a * (-2));
-  EXPECT_EQ(b + b, b * 2);
-  EXPECT_EQ(a + a, b * (-2));
-  EXPECT_EQ("0.999999999s", TimeUtil::ToString(a * 0.5));
-  EXPECT_EQ("-0.999999999s", TimeUtil::ToString(b * 0.5));
-  // Multiplication should not overflow if the result fits into the supported
-  // range of Duration (intermediate result may be larger than int64).
-  EXPECT_EQ("315575999684.424s", TimeUtil::ToString((one_second - one_nano) *
-                                                    int64_t{315576000000}));
-  EXPECT_EQ("-315575999684.424s", TimeUtil::ToString((one_nano - one_second) *
-                                                     int64_t{315576000000}));
-  EXPECT_EQ("-315575999684.424s", TimeUtil::ToString((one_second - one_nano) *
-                                                     (int64_t{-315576000000})));
-
-  // Test / and %
-  EXPECT_EQ("0.999999999s", TimeUtil::ToString(a / 2));
-  EXPECT_EQ("-0.999999999s", TimeUtil::ToString(b / 2));
-  Duration large =
-      TimeUtil::SecondsToDuration(int64_t{315576000000}) - one_nano;
-  // We have to handle division with values beyond 64 bits.
-  EXPECT_EQ("0.999999999s", TimeUtil::ToString(large / int64_t{315576000000}));
-  EXPECT_EQ("-0.999999999s",
-            TimeUtil::ToString((-large) / int64_t{315576000000}));
-  EXPECT_EQ("-0.999999999s",
-            TimeUtil::ToString(large / (int64_t{-315576000000})));
-  Duration large2 = large + one_nano;
-  EXPECT_EQ(large, large % large2);
-  EXPECT_EQ(-large, (-large) % large2);
-  EXPECT_EQ(large, large % (-large2));
-  EXPECT_EQ(one_nano, large2 % large);
-  EXPECT_EQ(-one_nano, (-large2) % large);
-  EXPECT_EQ(one_nano, large2 % (-large));
-  // Some corner cases about negative values.
-  //
-  // (-5) / 2 = -2, remainder = -1
-  // (-5) / (-2) = 2, remainder = -1
-  a = TimeUtil::NanosecondsToDuration(-5);
-  EXPECT_EQ(TimeUtil::NanosecondsToDuration(-2), a / 2);
-  EXPECT_EQ(TimeUtil::NanosecondsToDuration(2), a / (-2));
-  b = TimeUtil::NanosecondsToDuration(2);
-  EXPECT_EQ(-2, a / b);
-  EXPECT_EQ(TimeUtil::NanosecondsToDuration(-1), a % b);
-  EXPECT_EQ(2, a / (-b));
-  EXPECT_EQ(TimeUtil::NanosecondsToDuration(-1), a % (-b));
-
-  // Test relational operators.
-  EXPECT_TRUE(one_nano < one_second);
-  EXPECT_FALSE(one_second < one_second);
-  EXPECT_FALSE(one_second < one_nano);
-  EXPECT_FALSE(-one_nano < -one_second);
-  EXPECT_FALSE(-one_second < -one_second);
-  EXPECT_TRUE(-one_second < -one_nano);
-  EXPECT_TRUE(-one_nano < one_nano);
-  EXPECT_FALSE(one_nano < -one_nano);
-
-  EXPECT_FALSE(one_nano > one_second);
-  EXPECT_FALSE(one_nano > one_nano);
-  EXPECT_TRUE(one_second > one_nano);
-
-  EXPECT_FALSE(one_nano >= one_second);
-  EXPECT_TRUE(one_nano >= one_nano);
-  EXPECT_TRUE(one_second >= one_nano);
-
-  EXPECT_TRUE(one_nano <= one_second);
-  EXPECT_TRUE(one_nano <= one_nano);
-  EXPECT_FALSE(one_second <= one_nano);
-
-  EXPECT_TRUE(one_nano == one_nano);
-  EXPECT_FALSE(one_nano == one_second);
-
-  EXPECT_FALSE(one_nano != one_nano);
-  EXPECT_TRUE(one_nano != one_second);
-}
-
-TEST(TimeUtilTest, TimestampOperators) {
-  Timestamp begin, end;
-  EXPECT_TRUE(TimeUtil::FromString("0001-01-01T00:00:00Z", &begin));
-  EXPECT_TRUE(TimeUtil::FromString("9999-12-31T23:59:59.999999999Z", &end));
-  Duration d = end - begin;
-  EXPECT_TRUE(end == begin + d);
-  EXPECT_TRUE(end == d + begin);
-  EXPECT_TRUE(begin == end - d);
-
-  // Test relational operators
-  Timestamp t1 = begin + d / 4;
-  Timestamp t2 = end - d / 4;
-  EXPECT_TRUE(t1 < t2);
-  EXPECT_FALSE(t1 < t1);
-  EXPECT_FALSE(t2 < t1);
-  EXPECT_FALSE(t1 > t2);
-  EXPECT_FALSE(t1 > t1);
-  EXPECT_TRUE(t2 > t1);
-  EXPECT_FALSE(t1 >= t2);
-  EXPECT_TRUE(t1 >= t1);
-  EXPECT_TRUE(t2 >= t1);
-  EXPECT_TRUE(t1 <= t2);
-  EXPECT_TRUE(t1 <= t1);
-  EXPECT_FALSE(t2 <= t1);
-
-  EXPECT_FALSE(t1 == t2);
-  EXPECT_TRUE(t1 == t1);
-  EXPECT_FALSE(t2 == t1);
-  EXPECT_TRUE(t1 != t2);
-  EXPECT_FALSE(t1 != t1);
-  EXPECT_TRUE(t2 != t1);
-}
-
-}  // namespace
-}  // namespace util
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/util/type_resolver.h b/libs/protobuf/src/google/protobuf/util/type_resolver.h
deleted file mode 100644
index b2e7b43..0000000
--- a/libs/protobuf/src/google/protobuf/util/type_resolver.h
+++ /dev/null
@@ -1,77 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Defines a TypeResolver for the Any message.
-
-#ifndef GOOGLE_PROTOBUF_UTIL_TYPE_RESOLVER_H__
-#define GOOGLE_PROTOBUF_UTIL_TYPE_RESOLVER_H__
-
-#include <string>
-
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/type.pb.h>
-#include <google/protobuf/stubs/status.h>
-#include <google/protobuf/stubs/status.h>
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-class DescriptorPool;
-namespace util {
-
-// Abstract interface for a type resolver.
-//
-// Implementations of this interface must be thread-safe.
-class PROTOBUF_EXPORT TypeResolver {
- public:
-  TypeResolver() {}
-  virtual ~TypeResolver() {}
-
-  // Resolves a type url for a message type.
-  virtual util::Status ResolveMessageType(
-      const std::string& type_url, google::protobuf::Type* message_type) = 0;
-
-  // Resolves a type url for an enum type.
-  virtual util::Status ResolveEnumType(const std::string& type_url,
-                                       google::protobuf::Enum* enum_type) = 0;
-
- private:
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(TypeResolver);
-};
-
-}  // namespace util
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
-
-#endif  // GOOGLE_PROTOBUF_UTIL_TYPE_RESOLVER_H__
diff --git a/libs/protobuf/src/google/protobuf/util/type_resolver_util.cc b/libs/protobuf/src/google/protobuf/util/type_resolver_util.cc
deleted file mode 100644
index 8be0efb..0000000
--- a/libs/protobuf/src/google/protobuf/util/type_resolver_util.cc
+++ /dev/null
@@ -1,370 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <google/protobuf/util/type_resolver_util.h>
-
-#include <google/protobuf/type.pb.h>
-#include <google/protobuf/wrappers.pb.h>
-#include <google/protobuf/descriptor.pb.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/stubs/strutil.h>
-#include <google/protobuf/stubs/status.h>
-#include <google/protobuf/util/internal/utility.h>
-#include <google/protobuf/util/type_resolver.h>
-#include <google/protobuf/stubs/status.h>
-
-// clang-format off
-#include <google/protobuf/port_def.inc>
-// clang-format on
-
-namespace google {
-namespace protobuf {
-namespace util {
-namespace {
-using google::protobuf::Any;
-using google::protobuf::BoolValue;
-using google::protobuf::BytesValue;
-using google::protobuf::DoubleValue;
-using google::protobuf::Enum;
-using google::protobuf::EnumValue;
-using google::protobuf::Field;
-using google::protobuf::FloatValue;
-using google::protobuf::Int32Value;
-using google::protobuf::Int64Value;
-using google::protobuf::Option;
-using google::protobuf::StringValue;
-using google::protobuf::Type;
-using google::protobuf::UInt32Value;
-using google::protobuf::UInt64Value;
-
-class DescriptorPoolTypeResolver : public TypeResolver {
- public:
-  DescriptorPoolTypeResolver(const std::string& url_prefix,
-                             const DescriptorPool* pool)
-      : url_prefix_(url_prefix), pool_(pool) {}
-
-  util::Status ResolveMessageType(const std::string& type_url,
-                                  Type* type) override {
-    std::string type_name;
-    util::Status status = ParseTypeUrl(type_url, &type_name);
-    if (!status.ok()) {
-      return status;
-    }
-
-    const Descriptor* descriptor = pool_->FindMessageTypeByName(type_name);
-    if (descriptor == NULL) {
-      return util::NotFoundError("Invalid type URL, unknown type: " +
-                                 type_name);
-    }
-    ConvertDescriptor(descriptor, type);
-    return util::Status();
-  }
-
-  util::Status ResolveEnumType(const std::string& type_url,
-                               Enum* enum_type) override {
-    std::string type_name;
-    util::Status status = ParseTypeUrl(type_url, &type_name);
-    if (!status.ok()) {
-      return status;
-    }
-
-    const EnumDescriptor* descriptor = pool_->FindEnumTypeByName(type_name);
-    if (descriptor == NULL) {
-      return util::InvalidArgumentError("Invalid type URL, unknown type: " +
-                                        type_name);
-    }
-    ConvertEnumDescriptor(descriptor, enum_type);
-    return util::Status();
-  }
-
- private:
-  void ConvertDescriptor(const Descriptor* descriptor, Type* type) {
-    type->Clear();
-    type->set_name(descriptor->full_name());
-    for (int i = 0; i < descriptor->field_count(); ++i) {
-      ConvertFieldDescriptor(descriptor->field(i), type->add_fields());
-    }
-    for (int i = 0; i < descriptor->oneof_decl_count(); ++i) {
-      type->add_oneofs(descriptor->oneof_decl(i)->name());
-    }
-    type->mutable_source_context()->set_file_name(descriptor->file()->name());
-    ConvertMessageOptions(descriptor->options(), type->mutable_options());
-  }
-
-  void ConvertMessageOptions(const MessageOptions& options,
-                             RepeatedPtrField<Option>* output) {
-    return ConvertOptionsInternal(options, output);
-  }
-
-  void ConvertFieldOptions(const FieldOptions& options,
-                           RepeatedPtrField<Option>* output) {
-    return ConvertOptionsInternal(options, output);
-  }
-
-  void ConvertEnumOptions(const EnumOptions& options,
-                          RepeatedPtrField<Option>* output) {
-    return ConvertOptionsInternal(options, output);
-  }
-
-  void ConvertEnumValueOptions(const EnumValueOptions& options,
-                               RepeatedPtrField<Option>* output) {
-    return ConvertOptionsInternal(options, output);
-  }
-
-  // Implementation details for Convert*Options.
-  void ConvertOptionsInternal(const Message& options,
-                              RepeatedPtrField<Option>* output) {
-    const Reflection* reflection = options.GetReflection();
-    std::vector<const FieldDescriptor*> fields;
-    reflection->ListFields(options, &fields);
-    for (const FieldDescriptor* field : fields) {
-      if (field->is_repeated()) {
-        const int size = reflection->FieldSize(options, field);
-        for (int i = 0; i < size; i++) {
-          ConvertOptionField(reflection, options, field, i, output->Add());
-        }
-      } else {
-        ConvertOptionField(reflection, options, field, -1, output->Add());
-      }
-    }
-  }
-
-  static void ConvertOptionField(const Reflection* reflection,
-                                 const Message& options,
-                                 const FieldDescriptor* field, int index,
-                                 Option* out) {
-    out->set_name(field->is_extension() ? field->full_name() : field->name());
-    Any* value = out->mutable_value();
-    switch (field->cpp_type()) {
-      case FieldDescriptor::CPPTYPE_MESSAGE:
-        value->PackFrom(
-            field->is_repeated()
-                ? reflection->GetRepeatedMessage(options, field, index)
-                : reflection->GetMessage(options, field));
-        return;
-      case FieldDescriptor::CPPTYPE_DOUBLE:
-        value->PackFrom(WrapValue<DoubleValue>(
-            field->is_repeated()
-                ? reflection->GetRepeatedDouble(options, field, index)
-                : reflection->GetDouble(options, field)));
-        return;
-      case FieldDescriptor::CPPTYPE_FLOAT:
-        value->PackFrom(WrapValue<FloatValue>(
-            field->is_repeated()
-                ? reflection->GetRepeatedFloat(options, field, index)
-                : reflection->GetFloat(options, field)));
-        return;
-      case FieldDescriptor::CPPTYPE_INT64:
-        value->PackFrom(WrapValue<Int64Value>(
-            field->is_repeated()
-                ? reflection->GetRepeatedInt64(options, field, index)
-                : reflection->GetInt64(options, field)));
-        return;
-      case FieldDescriptor::CPPTYPE_UINT64:
-        value->PackFrom(WrapValue<UInt64Value>(
-            field->is_repeated()
-                ? reflection->GetRepeatedUInt64(options, field, index)
-                : reflection->GetUInt64(options, field)));
-        return;
-      case FieldDescriptor::CPPTYPE_INT32:
-        value->PackFrom(WrapValue<Int32Value>(
-            field->is_repeated()
-                ? reflection->GetRepeatedInt32(options, field, index)
-                : reflection->GetInt32(options, field)));
-        return;
-      case FieldDescriptor::CPPTYPE_UINT32:
-        value->PackFrom(WrapValue<UInt32Value>(
-            field->is_repeated()
-                ? reflection->GetRepeatedUInt32(options, field, index)
-                : reflection->GetUInt32(options, field)));
-        return;
-      case FieldDescriptor::CPPTYPE_BOOL:
-        value->PackFrom(WrapValue<BoolValue>(
-            field->is_repeated()
-                ? reflection->GetRepeatedBool(options, field, index)
-                : reflection->GetBool(options, field)));
-        return;
-      case FieldDescriptor::CPPTYPE_STRING: {
-        const std::string& val =
-            field->is_repeated()
-                ? reflection->GetRepeatedString(options, field, index)
-                : reflection->GetString(options, field);
-        if (field->type() == FieldDescriptor::TYPE_STRING) {
-          value->PackFrom(WrapValue<StringValue>(val));
-        } else {
-          value->PackFrom(WrapValue<BytesValue>(val));
-        }
-        return;
-      }
-      case FieldDescriptor::CPPTYPE_ENUM: {
-        const EnumValueDescriptor* val =
-            field->is_repeated()
-                ? reflection->GetRepeatedEnum(options, field, index)
-                : reflection->GetEnum(options, field);
-        value->PackFrom(WrapValue<Int32Value>(val->number()));
-        return;
-      }
-    }
-  }
-
-  template <typename WrapperT, typename T>
-  static WrapperT WrapValue(T value) {
-    WrapperT wrapper;
-    wrapper.set_value(value);
-    return wrapper;
-  }
-
-  void ConvertFieldDescriptor(const FieldDescriptor* descriptor, Field* field) {
-    field->set_kind(static_cast<Field::Kind>(descriptor->type()));
-    switch (descriptor->label()) {
-      case FieldDescriptor::LABEL_OPTIONAL:
-        field->set_cardinality(Field::CARDINALITY_OPTIONAL);
-        break;
-      case FieldDescriptor::LABEL_REPEATED:
-        field->set_cardinality(Field::CARDINALITY_REPEATED);
-        break;
-      case FieldDescriptor::LABEL_REQUIRED:
-        field->set_cardinality(Field::CARDINALITY_REQUIRED);
-        break;
-    }
-    field->set_number(descriptor->number());
-    field->set_name(descriptor->name());
-    field->set_json_name(descriptor->json_name());
-    if (descriptor->has_default_value()) {
-      field->set_default_value(DefaultValueAsString(descriptor));
-    }
-    if (descriptor->type() == FieldDescriptor::TYPE_MESSAGE ||
-        descriptor->type() == FieldDescriptor::TYPE_GROUP) {
-      field->set_type_url(GetTypeUrl(descriptor->message_type()));
-    } else if (descriptor->type() == FieldDescriptor::TYPE_ENUM) {
-      field->set_type_url(GetTypeUrl(descriptor->enum_type()));
-    }
-    if (descriptor->containing_oneof() != NULL) {
-      field->set_oneof_index(descriptor->containing_oneof()->index() + 1);
-    }
-    if (descriptor->is_packed()) {
-      field->set_packed(true);
-    }
-
-    ConvertFieldOptions(descriptor->options(), field->mutable_options());
-  }
-
-  void ConvertEnumDescriptor(const EnumDescriptor* descriptor,
-                             Enum* enum_type) {
-    enum_type->Clear();
-    enum_type->set_name(descriptor->full_name());
-    enum_type->mutable_source_context()->set_file_name(
-        descriptor->file()->name());
-    for (int i = 0; i < descriptor->value_count(); ++i) {
-      const EnumValueDescriptor* value_descriptor = descriptor->value(i);
-      EnumValue* value = enum_type->mutable_enumvalue()->Add();
-      value->set_name(value_descriptor->name());
-      value->set_number(value_descriptor->number());
-
-      ConvertEnumValueOptions(value_descriptor->options(),
-                              value->mutable_options());
-    }
-
-    ConvertEnumOptions(descriptor->options(), enum_type->mutable_options());
-  }
-
-  std::string GetTypeUrl(const Descriptor* descriptor) {
-    return url_prefix_ + "/" + descriptor->full_name();
-  }
-
-  std::string GetTypeUrl(const EnumDescriptor* descriptor) {
-    return url_prefix_ + "/" + descriptor->full_name();
-  }
-
-  util::Status ParseTypeUrl(const std::string& type_url,
-                            std::string* type_name) {
-    if (type_url.substr(0, url_prefix_.size() + 1) != url_prefix_ + "/") {
-      return util::InvalidArgumentError(
-          StrCat("Invalid type URL, type URLs must be of the form '",
-                       url_prefix_, "/<typename>', got: ", type_url));
-    }
-    *type_name = type_url.substr(url_prefix_.size() + 1);
-    return util::Status();
-  }
-
-  std::string DefaultValueAsString(const FieldDescriptor* descriptor) {
-    switch (descriptor->cpp_type()) {
-      case FieldDescriptor::CPPTYPE_INT32:
-        return StrCat(descriptor->default_value_int32());
-        break;
-      case FieldDescriptor::CPPTYPE_INT64:
-        return StrCat(descriptor->default_value_int64());
-        break;
-      case FieldDescriptor::CPPTYPE_UINT32:
-        return StrCat(descriptor->default_value_uint32());
-        break;
-      case FieldDescriptor::CPPTYPE_UINT64:
-        return StrCat(descriptor->default_value_uint64());
-        break;
-      case FieldDescriptor::CPPTYPE_FLOAT:
-        return SimpleFtoa(descriptor->default_value_float());
-        break;
-      case FieldDescriptor::CPPTYPE_DOUBLE:
-        return SimpleDtoa(descriptor->default_value_double());
-        break;
-      case FieldDescriptor::CPPTYPE_BOOL:
-        return descriptor->default_value_bool() ? "true" : "false";
-        break;
-      case FieldDescriptor::CPPTYPE_STRING:
-        if (descriptor->type() == FieldDescriptor::TYPE_BYTES) {
-          return CEscape(descriptor->default_value_string());
-        } else {
-          return descriptor->default_value_string();
-        }
-        break;
-      case FieldDescriptor::CPPTYPE_ENUM:
-        return descriptor->default_value_enum()->name();
-        break;
-      case FieldDescriptor::CPPTYPE_MESSAGE:
-        GOOGLE_LOG(DFATAL) << "Messages can't have default values!";
-        break;
-    }
-    return "";
-  }
-
-  std::string url_prefix_;
-  const DescriptorPool* pool_;
-};
-
-}  // namespace
-
-TypeResolver* NewTypeResolverForDescriptorPool(const std::string& url_prefix,
-                                               const DescriptorPool* pool) {
-  return new DescriptorPoolTypeResolver(url_prefix, pool);
-}
-
-}  // namespace util
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/util/type_resolver_util.h b/libs/protobuf/src/google/protobuf/util/type_resolver_util.h
deleted file mode 100644
index 7f6a4b9..0000000
--- a/libs/protobuf/src/google/protobuf/util/type_resolver_util.h
+++ /dev/null
@@ -1,58 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Defines utilities for the TypeResolver.
-
-#ifndef GOOGLE_PROTOBUF_UTIL_TYPE_RESOLVER_UTIL_H__
-#define GOOGLE_PROTOBUF_UTIL_TYPE_RESOLVER_UTIL_H__
-
-#include <string>
-
-namespace google {
-namespace protobuf {
-class DescriptorPool;
-namespace util {
-class TypeResolver;
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-// Creates a TypeResolver that serves type information in the given descriptor
-// pool. Caller takes ownership of the returned TypeResolver.
-PROTOBUF_EXPORT TypeResolver* NewTypeResolverForDescriptorPool(
-    const std::string& url_prefix, const DescriptorPool* pool);
-
-}  // namespace util
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
-
-#endif  // GOOGLE_PROTOBUF_UTIL_TYPE_RESOLVER_UTIL_H__
diff --git a/libs/protobuf/src/google/protobuf/util/type_resolver_util_test.cc b/libs/protobuf/src/google/protobuf/util/type_resolver_util_test.cc
deleted file mode 100644
index 2780a39..0000000
--- a/libs/protobuf/src/google/protobuf/util/type_resolver_util_test.cc
+++ /dev/null
@@ -1,438 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#include <google/protobuf/util/type_resolver_util.h>
-
-#include <cstdint>
-#include <limits>
-#include <memory>
-#include <string>
-#include <vector>
-
-#include <google/protobuf/type.pb.h>
-#include <google/protobuf/wrappers.pb.h>
-#include <google/protobuf/map_unittest.pb.h>
-#include <google/protobuf/test_util.h>
-#include <google/protobuf/unittest.pb.h>
-#include <google/protobuf/unittest_custom_options.pb.h>
-#include <google/protobuf/util/json_format_proto3.pb.h>
-#include <google/protobuf/util/type_resolver.h>
-#include <google/protobuf/testing/googletest.h>
-#include <gtest/gtest.h>
-
-namespace google {
-namespace protobuf {
-namespace util {
-namespace {
-using google::protobuf::BoolValue;
-using google::protobuf::Enum;
-using google::protobuf::EnumValue;
-using google::protobuf::Field;
-using google::protobuf::Int32Value;
-using google::protobuf::Option;
-using google::protobuf::Type;
-using google::protobuf::UInt64Value;
-
-static const char kUrlPrefix[] = "type.googleapis.com";
-
-class DescriptorPoolTypeResolverTest : public testing::Test {
- public:
-  DescriptorPoolTypeResolverTest() {
-    resolver_.reset(NewTypeResolverForDescriptorPool(
-        kUrlPrefix, DescriptorPool::generated_pool()));
-  }
-
-  const Field* FindField(const Type& type, const std::string& name) {
-    for (int i = 0; i < type.fields_size(); ++i) {
-      const Field& field = type.fields(i);
-      if (field.name() == name) {
-        return &field;
-      }
-    }
-    return nullptr;
-  }
-
-  bool HasField(const Type& type, Field::Cardinality cardinality,
-                Field::Kind kind, const std::string& name, int number) {
-    const Field* field = FindField(type, name);
-    if (field == nullptr) {
-      return false;
-    }
-    return field->cardinality() == cardinality && field->kind() == kind &&
-           field->number() == number;
-  }
-
-  bool CheckFieldTypeUrl(const Type& type, const std::string& name,
-                         const std::string& type_url) {
-    const Field* field = FindField(type, name);
-    if (field == nullptr) {
-      return false;
-    }
-    return field->type_url() == type_url;
-  }
-
-  bool FieldInOneof(const Type& type, const std::string& name,
-                    const std::string& oneof_name) {
-    const Field* field = FindField(type, name);
-    if (field == nullptr || field->oneof_index() <= 0 ||
-        field->oneof_index() > type.oneofs_size()) {
-      return false;
-    }
-    return type.oneofs(field->oneof_index() - 1) == oneof_name;
-  }
-
-  bool IsPacked(const Type& type, const std::string& name) {
-    const Field* field = FindField(type, name);
-    if (field == nullptr) {
-      return false;
-    }
-    return field->packed();
-  }
-
-  const EnumValue* FindEnumValue(const Enum& type, const std::string& name) {
-    for (const EnumValue& value : type.enumvalue()) {
-      if (value.name() == name) {
-        return &value;
-      }
-    }
-    return nullptr;
-  }
-
-  bool EnumHasValue(const Enum& type, const std::string& name, int number) {
-    const EnumValue* value = FindEnumValue(type, name);
-    return value != nullptr && value->number() == number;
-  }
-
-  bool HasBoolOption(const RepeatedPtrField<Option>& options,
-                     const std::string& name, bool value) {
-    return HasOption<BoolValue>(options, name, value);
-  }
-
-  bool HasInt32Option(const RepeatedPtrField<Option>& options,
-                      const std::string& name, int32_t value) {
-    return HasOption<Int32Value>(options, name, value);
-  }
-
-  bool HasUInt64Option(const RepeatedPtrField<Option>& options,
-                       const std::string& name, uint64_t value) {
-    return HasOption<UInt64Value>(options, name, value);
-  }
-
-  template <typename WrapperT, typename T>
-  bool HasOption(const RepeatedPtrField<Option>& options,
-                 const std::string& name, T value) {
-    for (const Option& option : options) {
-      if (option.name() == name) {
-        WrapperT wrapper;
-        if (option.value().UnpackTo(&wrapper) && wrapper.value() == value) {
-          return true;
-        }
-      }
-    }
-    return false;
-  }
-
-  std::string GetTypeUrl(std::string full_name) {
-    return kUrlPrefix + std::string("/") + full_name;
-  }
-
-  template <typename T>
-  std::string GetTypeUrl() {
-    return GetTypeUrl(T::descriptor()->full_name());
-  }
-
- protected:
-  std::unique_ptr<TypeResolver> resolver_;
-};
-
-TEST_F(DescriptorPoolTypeResolverTest, TestAllTypes) {
-  Type type;
-  ASSERT_TRUE(resolver_
-                  ->ResolveMessageType(
-                      GetTypeUrl<protobuf_unittest::TestAllTypes>(), &type)
-                  .ok());
-  // Check all optional fields.
-  EXPECT_TRUE(HasField(type, Field::CARDINALITY_OPTIONAL, Field::TYPE_INT32,
-                       "optional_int32", 1));
-  EXPECT_TRUE(HasField(type, Field::CARDINALITY_OPTIONAL, Field::TYPE_INT64,
-                       "optional_int64", 2));
-  EXPECT_TRUE(HasField(type, Field::CARDINALITY_OPTIONAL, Field::TYPE_UINT32,
-                       "optional_uint32", 3));
-  EXPECT_TRUE(HasField(type, Field::CARDINALITY_OPTIONAL, Field::TYPE_UINT64,
-                       "optional_uint64", 4));
-  EXPECT_TRUE(HasField(type, Field::CARDINALITY_OPTIONAL, Field::TYPE_SINT32,
-                       "optional_sint32", 5));
-  EXPECT_TRUE(HasField(type, Field::CARDINALITY_OPTIONAL, Field::TYPE_SINT64,
-                       "optional_sint64", 6));
-  EXPECT_TRUE(HasField(type, Field::CARDINALITY_OPTIONAL, Field::TYPE_FIXED32,
-                       "optional_fixed32", 7));
-  EXPECT_TRUE(HasField(type, Field::CARDINALITY_OPTIONAL, Field::TYPE_FIXED64,
-                       "optional_fixed64", 8));
-  EXPECT_TRUE(HasField(type, Field::CARDINALITY_OPTIONAL, Field::TYPE_SFIXED32,
-                       "optional_sfixed32", 9));
-  EXPECT_TRUE(HasField(type, Field::CARDINALITY_OPTIONAL, Field::TYPE_SFIXED64,
-                       "optional_sfixed64", 10));
-  EXPECT_TRUE(HasField(type, Field::CARDINALITY_OPTIONAL, Field::TYPE_FLOAT,
-                       "optional_float", 11));
-  EXPECT_TRUE(HasField(type, Field::CARDINALITY_OPTIONAL, Field::TYPE_DOUBLE,
-                       "optional_double", 12));
-  EXPECT_TRUE(HasField(type, Field::CARDINALITY_OPTIONAL, Field::TYPE_BOOL,
-                       "optional_bool", 13));
-  EXPECT_TRUE(HasField(type, Field::CARDINALITY_OPTIONAL, Field::TYPE_STRING,
-                       "optional_string", 14));
-  EXPECT_TRUE(HasField(type, Field::CARDINALITY_OPTIONAL, Field::TYPE_BYTES,
-                       "optional_bytes", 15));
-
-  EXPECT_TRUE(HasField(type, Field::CARDINALITY_OPTIONAL, Field::TYPE_GROUP,
-                       "optionalgroup", 16));
-
-  EXPECT_TRUE(CheckFieldTypeUrl(
-      type, "optionalgroup",
-      GetTypeUrl<protobuf_unittest::TestAllTypes::OptionalGroup>()));
-
-  EXPECT_TRUE(HasField(type, Field::CARDINALITY_OPTIONAL, Field::TYPE_MESSAGE,
-                       "optional_nested_message", 18));
-  EXPECT_TRUE(HasField(type, Field::CARDINALITY_OPTIONAL, Field::TYPE_MESSAGE,
-                       "optional_foreign_message", 19));
-
-  EXPECT_TRUE(CheckFieldTypeUrl(
-      type, "optional_nested_message",
-      GetTypeUrl<protobuf_unittest::TestAllTypes::NestedMessage>()));
-  EXPECT_TRUE(CheckFieldTypeUrl(type, "optional_foreign_message",
-                                GetTypeUrl<protobuf_unittest::ForeignMessage>()));
-
-  EXPECT_TRUE(HasField(type, Field::CARDINALITY_OPTIONAL, Field::TYPE_ENUM,
-                       "optional_nested_enum", 21));
-  EXPECT_TRUE(HasField(type, Field::CARDINALITY_OPTIONAL, Field::TYPE_ENUM,
-                       "optional_foreign_enum", 22));
-
-  EXPECT_TRUE(
-      CheckFieldTypeUrl(type, "optional_nested_enum",
-                        GetTypeUrl("protobuf_unittest.TestAllTypes.NestedEnum")));
-  EXPECT_TRUE(CheckFieldTypeUrl(type, "optional_foreign_enum",
-                                GetTypeUrl("protobuf_unittest.ForeignEnum")));
-
-  // Check all repeated fields.
-  EXPECT_TRUE(HasField(type, Field::CARDINALITY_REPEATED, Field::TYPE_INT32,
-                       "repeated_int32", 31));
-  EXPECT_TRUE(HasField(type, Field::CARDINALITY_REPEATED, Field::TYPE_INT64,
-                       "repeated_int64", 32));
-  EXPECT_TRUE(HasField(type, Field::CARDINALITY_REPEATED, Field::TYPE_UINT32,
-                       "repeated_uint32", 33));
-  EXPECT_TRUE(HasField(type, Field::CARDINALITY_REPEATED, Field::TYPE_UINT64,
-                       "repeated_uint64", 34));
-  EXPECT_TRUE(HasField(type, Field::CARDINALITY_REPEATED, Field::TYPE_SINT32,
-                       "repeated_sint32", 35));
-  EXPECT_TRUE(HasField(type, Field::CARDINALITY_REPEATED, Field::TYPE_SINT64,
-                       "repeated_sint64", 36));
-  EXPECT_TRUE(HasField(type, Field::CARDINALITY_REPEATED, Field::TYPE_FIXED32,
-                       "repeated_fixed32", 37));
-  EXPECT_TRUE(HasField(type, Field::CARDINALITY_REPEATED, Field::TYPE_FIXED64,
-                       "repeated_fixed64", 38));
-  EXPECT_TRUE(HasField(type, Field::CARDINALITY_REPEATED, Field::TYPE_SFIXED32,
-                       "repeated_sfixed32", 39));
-  EXPECT_TRUE(HasField(type, Field::CARDINALITY_REPEATED, Field::TYPE_SFIXED64,
-                       "repeated_sfixed64", 40));
-  EXPECT_TRUE(HasField(type, Field::CARDINALITY_REPEATED, Field::TYPE_FLOAT,
-                       "repeated_float", 41));
-  EXPECT_TRUE(HasField(type, Field::CARDINALITY_REPEATED, Field::TYPE_DOUBLE,
-                       "repeated_double", 42));
-  EXPECT_TRUE(HasField(type, Field::CARDINALITY_REPEATED, Field::TYPE_BOOL,
-                       "repeated_bool", 43));
-  EXPECT_TRUE(HasField(type, Field::CARDINALITY_REPEATED, Field::TYPE_STRING,
-                       "repeated_string", 44));
-  EXPECT_TRUE(HasField(type, Field::CARDINALITY_REPEATED, Field::TYPE_BYTES,
-                       "repeated_bytes", 45));
-
-  EXPECT_TRUE(HasField(type, Field::CARDINALITY_REPEATED, Field::TYPE_GROUP,
-                       "repeatedgroup", 46));
-
-  EXPECT_TRUE(CheckFieldTypeUrl(
-      type, "repeatedgroup",
-      GetTypeUrl<protobuf_unittest::TestAllTypes::RepeatedGroup>()));
-
-  EXPECT_TRUE(HasField(type, Field::CARDINALITY_REPEATED, Field::TYPE_MESSAGE,
-                       "repeated_nested_message", 48));
-  EXPECT_TRUE(HasField(type, Field::CARDINALITY_REPEATED, Field::TYPE_MESSAGE,
-                       "repeated_foreign_message", 49));
-
-  EXPECT_TRUE(CheckFieldTypeUrl(
-      type, "repeated_nested_message",
-      GetTypeUrl<protobuf_unittest::TestAllTypes::NestedMessage>()));
-  EXPECT_TRUE(CheckFieldTypeUrl(type, "repeated_foreign_message",
-                                GetTypeUrl<protobuf_unittest::ForeignMessage>()));
-
-  EXPECT_TRUE(HasField(type, Field::CARDINALITY_REPEATED, Field::TYPE_ENUM,
-                       "repeated_nested_enum", 51));
-  EXPECT_TRUE(HasField(type, Field::CARDINALITY_REPEATED, Field::TYPE_ENUM,
-                       "repeated_foreign_enum", 52));
-
-  EXPECT_TRUE(
-      CheckFieldTypeUrl(type, "repeated_nested_enum",
-                        GetTypeUrl("protobuf_unittest.TestAllTypes.NestedEnum")));
-  EXPECT_TRUE(CheckFieldTypeUrl(type, "repeated_foreign_enum",
-                                GetTypeUrl("protobuf_unittest.ForeignEnum")));
-}
-
-TEST_F(DescriptorPoolTypeResolverTest, TestPackedField) {
-  Type type;
-  ASSERT_TRUE(resolver_
-                  ->ResolveMessageType(
-                      GetTypeUrl<protobuf_unittest::TestPackedTypes>(), &type)
-                  .ok());
-  EXPECT_TRUE(HasField(type, Field::CARDINALITY_REPEATED, Field::TYPE_INT32,
-                       "packed_int32", 90));
-  EXPECT_TRUE(IsPacked(type, "packed_int32"));
-}
-
-TEST_F(DescriptorPoolTypeResolverTest, TestOneof) {
-  Type type;
-  ASSERT_TRUE(resolver_
-                  ->ResolveMessageType(
-                      GetTypeUrl<protobuf_unittest::TestAllTypes>(), &type)
-                  .ok());
-  EXPECT_TRUE(HasField(type, Field::CARDINALITY_OPTIONAL, Field::TYPE_UINT32,
-                       "oneof_uint32", 111));
-  EXPECT_TRUE(HasField(type, Field::CARDINALITY_OPTIONAL, Field::TYPE_MESSAGE,
-                       "oneof_nested_message", 112));
-  EXPECT_TRUE(HasField(type, Field::CARDINALITY_OPTIONAL, Field::TYPE_STRING,
-                       "oneof_string", 113));
-  EXPECT_TRUE(HasField(type, Field::CARDINALITY_OPTIONAL, Field::TYPE_BYTES,
-                       "oneof_bytes", 114));
-  EXPECT_TRUE(FieldInOneof(type, "oneof_uint32", "oneof_field"));
-  EXPECT_TRUE(FieldInOneof(type, "oneof_nested_message", "oneof_field"));
-  EXPECT_TRUE(FieldInOneof(type, "oneof_string", "oneof_field"));
-  EXPECT_TRUE(FieldInOneof(type, "oneof_bytes", "oneof_field"));
-}
-
-TEST_F(DescriptorPoolTypeResolverTest, TestMap) {
-  Type type;
-  ASSERT_TRUE(
-      resolver_
-          ->ResolveMessageType(GetTypeUrl<protobuf_unittest::TestMap>(), &type)
-          .ok());
-  EXPECT_TRUE(HasField(type, Field::CARDINALITY_REPEATED, Field::TYPE_MESSAGE,
-                       "map_int32_int32", 1));
-  EXPECT_TRUE(CheckFieldTypeUrl(
-      type, "map_int32_int32",
-      GetTypeUrl("protobuf_unittest.TestMap.MapInt32Int32Entry")));
-
-  ASSERT_TRUE(
-      resolver_
-          ->ResolveMessageType(
-              GetTypeUrl("protobuf_unittest.TestMap.MapInt32Int32Entry"), &type)
-          .ok());
-  EXPECT_TRUE(HasBoolOption(type.options(), "map_entry", true));
-}
-
-TEST_F(DescriptorPoolTypeResolverTest, TestCustomMessageOptions) {
-  Type type;
-  ASSERT_TRUE(
-      resolver_
-          ->ResolveMessageType(
-              GetTypeUrl<protobuf_unittest::TestMessageWithCustomOptions>(),
-              &type)
-          .ok());
-  EXPECT_TRUE(
-      HasInt32Option(type.options(), "protobuf_unittest.message_opt1", -56));
-}
-
-TEST_F(DescriptorPoolTypeResolverTest, TestCustomFieldOptions) {
-  Type type;
-  ASSERT_TRUE(
-      resolver_
-          ->ResolveMessageType(
-              GetTypeUrl<protobuf_unittest::TestMessageWithCustomOptions>(),
-              &type)
-          .ok());
-  const Field* field = FindField(type, "field1");
-  ASSERT_TRUE(field != nullptr);
-  EXPECT_TRUE(HasUInt64Option(field->options(), "protobuf_unittest.field_opt1",
-                              8765432109));
-}
-
-TEST_F(DescriptorPoolTypeResolverTest, TestEnum) {
-  Enum type;
-  ASSERT_TRUE(
-      resolver_
-          ->ResolveEnumType(
-              GetTypeUrl("protobuf_unittest.TestAllTypes.NestedEnum"), &type)
-          .ok());
-  EnumHasValue(type, "FOO", 1);
-  EnumHasValue(type, "BAR", 2);
-  EnumHasValue(type, "BAZ", 3);
-  EnumHasValue(type, "NEG", -1);
-}
-
-TEST_F(DescriptorPoolTypeResolverTest, TestCustomEnumOptions) {
-  Enum type;
-  ASSERT_TRUE(
-      resolver_
-          ->ResolveEnumType(
-              GetTypeUrl("protobuf_unittest.TestMessageWithCustomOptions.AnEnum"),
-              &type)
-          .ok());
-  ASSERT_TRUE(
-      HasInt32Option(type.options(), "protobuf_unittest.enum_opt1", -789));
-}
-
-TEST_F(DescriptorPoolTypeResolverTest, TestCustomValueOptions) {
-  Enum type;
-  ASSERT_TRUE(
-      resolver_
-          ->ResolveEnumType(
-              GetTypeUrl("protobuf_unittest.TestMessageWithCustomOptions.AnEnum"),
-              &type)
-          .ok());
-  const EnumValue* value = FindEnumValue(type, "ANENUM_VAL2");
-  ASSERT_TRUE(value != nullptr);
-  ASSERT_TRUE(
-      HasInt32Option(value->options(), "protobuf_unittest.enum_value_opt1", 123));
-}
-
-TEST_F(DescriptorPoolTypeResolverTest, TestJsonName) {
-  Type type;
-  ASSERT_TRUE(resolver_
-                  ->ResolveMessageType(
-                      GetTypeUrl<protobuf_unittest::TestAllTypes>(), &type)
-                  .ok());
-  EXPECT_EQ("optionalInt32", FindField(type, "optional_int32")->json_name());
-
-  ASSERT_TRUE(
-      resolver_
-          ->ResolveMessageType(GetTypeUrl<proto3::TestCustomJsonName>(), &type)
-          .ok());
-  EXPECT_EQ("@value", FindField(type, "value")->json_name());
-}
-
-}  // namespace
-}  // namespace util
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/well_known_types_unittest.cc b/libs/protobuf/src/google/protobuf/well_known_types_unittest.cc
deleted file mode 100644
index c9a9aa1..0000000
--- a/libs/protobuf/src/google/protobuf/well_known_types_unittest.cc
+++ /dev/null
@@ -1,60 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#include <google/protobuf/unittest_well_known_types.pb.h>
-
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/testing/googletest.h>
-#include <gtest/gtest.h>
-#include <google/protobuf/stubs/stl_util.h>
-
-namespace google {
-namespace protobuf {
-namespace {
-
-// This test only checks whether well-known types are included in protobuf
-// runtime library. The test passes if it compiles.
-TEST(WellKnownTypesTest, AllKnownTypesAreIncluded) {
-  protobuf_unittest::TestWellKnownTypes message;
-  EXPECT_EQ(0, message.any_field().ByteSize());
-  EXPECT_EQ(0, message.api_field().ByteSize());
-  EXPECT_EQ(0, message.duration_field().ByteSize());
-  EXPECT_EQ(0, message.empty_field().ByteSize());
-  EXPECT_EQ(0, message.field_mask_field().ByteSize());
-  EXPECT_EQ(0, message.source_context_field().ByteSize());
-  EXPECT_EQ(0, message.struct_field().ByteSize());
-  EXPECT_EQ(0, message.timestamp_field().ByteSize());
-  EXPECT_EQ(0, message.type_field().ByteSize());
-  EXPECT_EQ(0, message.int32_field().ByteSize());
-}
-
-}  // namespace
-
-}  // namespace protobuf
-}  // namespace google
diff --git a/libs/protobuf/src/google/protobuf/wire_format.cc b/libs/protobuf/src/google/protobuf/wire_format.cc
deleted file mode 100644
index 6fe63c8..0000000
--- a/libs/protobuf/src/google/protobuf/wire_format.cc
+++ /dev/null
@@ -1,1768 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-
-#include <google/protobuf/wire_format.h>
-
-#include <stack>
-#include <string>
-#include <vector>
-
-#include <google/protobuf/stubs/logging.h>
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/io/zero_copy_stream.h>
-#include <google/protobuf/io/zero_copy_stream_impl.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/descriptor.pb.h>
-#include <google/protobuf/dynamic_message.h>
-#include <google/protobuf/map_field.h>
-#include <google/protobuf/map_field_inl.h>
-#include <google/protobuf/message.h>
-#include <google/protobuf/message_lite.h>
-#include <google/protobuf/parse_context.h>
-#include <google/protobuf/unknown_field_set.h>
-
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-const size_t kMapEntryTagByteSize = 2;
-
-namespace google {
-namespace protobuf {
-namespace internal {
-
-// Forward declare static functions
-static size_t MapValueRefDataOnlyByteSize(const FieldDescriptor* field,
-                                          const MapValueConstRef& value);
-
-// ===================================================================
-
-bool UnknownFieldSetFieldSkipper::SkipField(io::CodedInputStream* input,
-                                            uint32_t tag) {
-  return WireFormat::SkipField(input, tag, unknown_fields_);
-}
-
-bool UnknownFieldSetFieldSkipper::SkipMessage(io::CodedInputStream* input) {
-  return WireFormat::SkipMessage(input, unknown_fields_);
-}
-
-void UnknownFieldSetFieldSkipper::SkipUnknownEnum(int field_number, int value) {
-  unknown_fields_->AddVarint(field_number, value);
-}
-
-bool WireFormat::SkipField(io::CodedInputStream* input, uint32_t tag,
-                           UnknownFieldSet* unknown_fields) {
-  int number = WireFormatLite::GetTagFieldNumber(tag);
-  // Field number 0 is illegal.
-  if (number == 0) return false;
-
-  switch (WireFormatLite::GetTagWireType(tag)) {
-    case WireFormatLite::WIRETYPE_VARINT: {
-      uint64_t value;
-      if (!input->ReadVarint64(&value)) return false;
-      if (unknown_fields != nullptr) unknown_fields->AddVarint(number, value);
-      return true;
-    }
-    case WireFormatLite::WIRETYPE_FIXED64: {
-      uint64_t value;
-      if (!input->ReadLittleEndian64(&value)) return false;
-      if (unknown_fields != nullptr) unknown_fields->AddFixed64(number, value);
-      return true;
-    }
-    case WireFormatLite::WIRETYPE_LENGTH_DELIMITED: {
-      uint32_t length;
-      if (!input->ReadVarint32(&length)) return false;
-      if (unknown_fields == nullptr) {
-        if (!input->Skip(length)) return false;
-      } else {
-        if (!input->ReadString(unknown_fields->AddLengthDelimited(number),
-                               length)) {
-          return false;
-        }
-      }
-      return true;
-    }
-    case WireFormatLite::WIRETYPE_START_GROUP: {
-      if (!input->IncrementRecursionDepth()) return false;
-      if (!SkipMessage(input, (unknown_fields == nullptr)
-                                  ? nullptr
-                                  : unknown_fields->AddGroup(number))) {
-        return false;
-      }
-      input->DecrementRecursionDepth();
-      // Check that the ending tag matched the starting tag.
-      if (!input->LastTagWas(
-              WireFormatLite::MakeTag(WireFormatLite::GetTagFieldNumber(tag),
-                                      WireFormatLite::WIRETYPE_END_GROUP))) {
-        return false;
-      }
-      return true;
-    }
-    case WireFormatLite::WIRETYPE_END_GROUP: {
-      return false;
-    }
-    case WireFormatLite::WIRETYPE_FIXED32: {
-      uint32_t value;
-      if (!input->ReadLittleEndian32(&value)) return false;
-      if (unknown_fields != nullptr) unknown_fields->AddFixed32(number, value);
-      return true;
-    }
-    default: {
-      return false;
-    }
-  }
-}
-
-bool WireFormat::SkipMessage(io::CodedInputStream* input,
-                             UnknownFieldSet* unknown_fields) {
-  while (true) {
-    uint32_t tag = input->ReadTag();
-    if (tag == 0) {
-      // End of input.  This is a valid place to end, so return true.
-      return true;
-    }
-
-    WireFormatLite::WireType wire_type = WireFormatLite::GetTagWireType(tag);
-
-    if (wire_type == WireFormatLite::WIRETYPE_END_GROUP) {
-      // Must be the end of the message.
-      return true;
-    }
-
-    if (!SkipField(input, tag, unknown_fields)) return false;
-  }
-}
-
-bool WireFormat::ReadPackedEnumPreserveUnknowns(io::CodedInputStream* input,
-                                                uint32_t field_number,
-                                                bool (*is_valid)(int),
-                                                UnknownFieldSet* unknown_fields,
-                                                RepeatedField<int>* values) {
-  uint32_t length;
-  if (!input->ReadVarint32(&length)) return false;
-  io::CodedInputStream::Limit limit = input->PushLimit(length);
-  while (input->BytesUntilLimit() > 0) {
-    int value;
-    if (!WireFormatLite::ReadPrimitive<int, WireFormatLite::TYPE_ENUM>(
-            input, &value)) {
-      return false;
-    }
-    if (is_valid == nullptr || is_valid(value)) {
-      values->Add(value);
-    } else {
-      unknown_fields->AddVarint(field_number, value);
-    }
-  }
-  input->PopLimit(limit);
-  return true;
-}
-
-uint8_t* WireFormat::InternalSerializeUnknownFieldsToArray(
-    const UnknownFieldSet& unknown_fields, uint8_t* target,
-    io::EpsCopyOutputStream* stream) {
-  for (int i = 0; i < unknown_fields.field_count(); i++) {
-    const UnknownField& field = unknown_fields.field(i);
-
-    target = stream->EnsureSpace(target);
-    switch (field.type()) {
-      case UnknownField::TYPE_VARINT:
-        target = WireFormatLite::WriteUInt64ToArray(field.number(),
-                                                    field.varint(), target);
-        break;
-      case UnknownField::TYPE_FIXED32:
-        target = WireFormatLite::WriteFixed32ToArray(field.number(),
-                                                     field.fixed32(), target);
-        break;
-      case UnknownField::TYPE_FIXED64:
-        target = WireFormatLite::WriteFixed64ToArray(field.number(),
-                                                     field.fixed64(), target);
-        break;
-      case UnknownField::TYPE_LENGTH_DELIMITED:
-        target = stream->WriteString(field.number(), field.length_delimited(),
-                                     target);
-        break;
-      case UnknownField::TYPE_GROUP:
-        target = WireFormatLite::WriteTagToArray(
-            field.number(), WireFormatLite::WIRETYPE_START_GROUP, target);
-        target = InternalSerializeUnknownFieldsToArray(field.group(), target,
-                                                       stream);
-        target = stream->EnsureSpace(target);
-        target = WireFormatLite::WriteTagToArray(
-            field.number(), WireFormatLite::WIRETYPE_END_GROUP, target);
-        break;
-    }
-  }
-  return target;
-}
-
-uint8_t* WireFormat::InternalSerializeUnknownMessageSetItemsToArray(
-    const UnknownFieldSet& unknown_fields, uint8_t* target,
-    io::EpsCopyOutputStream* stream) {
-  for (int i = 0; i < unknown_fields.field_count(); i++) {
-    const UnknownField& field = unknown_fields.field(i);
-
-    // The only unknown fields that are allowed to exist in a MessageSet are
-    // messages, which are length-delimited.
-    if (field.type() == UnknownField::TYPE_LENGTH_DELIMITED) {
-      target = stream->EnsureSpace(target);
-      // Start group.
-      target = io::CodedOutputStream::WriteTagToArray(
-          WireFormatLite::kMessageSetItemStartTag, target);
-
-      // Write type ID.
-      target = io::CodedOutputStream::WriteTagToArray(
-          WireFormatLite::kMessageSetTypeIdTag, target);
-      target =
-          io::CodedOutputStream::WriteVarint32ToArray(field.number(), target);
-
-      // Write message.
-      target = io::CodedOutputStream::WriteTagToArray(
-          WireFormatLite::kMessageSetMessageTag, target);
-
-      target = field.InternalSerializeLengthDelimitedNoTag(target, stream);
-
-      target = stream->EnsureSpace(target);
-      // End group.
-      target = io::CodedOutputStream::WriteTagToArray(
-          WireFormatLite::kMessageSetItemEndTag, target);
-    }
-  }
-
-  return target;
-}
-
-size_t WireFormat::ComputeUnknownFieldsSize(
-    const UnknownFieldSet& unknown_fields) {
-  size_t size = 0;
-  for (int i = 0; i < unknown_fields.field_count(); i++) {
-    const UnknownField& field = unknown_fields.field(i);
-
-    switch (field.type()) {
-      case UnknownField::TYPE_VARINT:
-        size += io::CodedOutputStream::VarintSize32(WireFormatLite::MakeTag(
-            field.number(), WireFormatLite::WIRETYPE_VARINT));
-        size += io::CodedOutputStream::VarintSize64(field.varint());
-        break;
-      case UnknownField::TYPE_FIXED32:
-        size += io::CodedOutputStream::VarintSize32(WireFormatLite::MakeTag(
-            field.number(), WireFormatLite::WIRETYPE_FIXED32));
-        size += sizeof(int32_t);
-        break;
-      case UnknownField::TYPE_FIXED64:
-        size += io::CodedOutputStream::VarintSize32(WireFormatLite::MakeTag(
-            field.number(), WireFormatLite::WIRETYPE_FIXED64));
-        size += sizeof(int64_t);
-        break;
-      case UnknownField::TYPE_LENGTH_DELIMITED:
-        size += io::CodedOutputStream::VarintSize32(WireFormatLite::MakeTag(
-            field.number(), WireFormatLite::WIRETYPE_LENGTH_DELIMITED));
-        size += io::CodedOutputStream::VarintSize32(
-            field.length_delimited().size());
-        size += field.length_delimited().size();
-        break;
-      case UnknownField::TYPE_GROUP:
-        size += io::CodedOutputStream::VarintSize32(WireFormatLite::MakeTag(
-            field.number(), WireFormatLite::WIRETYPE_START_GROUP));
-        size += ComputeUnknownFieldsSize(field.group());
-        size += io::CodedOutputStream::VarintSize32(WireFormatLite::MakeTag(
-            field.number(), WireFormatLite::WIRETYPE_END_GROUP));
-        break;
-    }
-  }
-
-  return size;
-}
-
-size_t WireFormat::ComputeUnknownMessageSetItemsSize(
-    const UnknownFieldSet& unknown_fields) {
-  size_t size = 0;
-  for (int i = 0; i < unknown_fields.field_count(); i++) {
-    const UnknownField& field = unknown_fields.field(i);
-
-    // The only unknown fields that are allowed to exist in a MessageSet are
-    // messages, which are length-delimited.
-    if (field.type() == UnknownField::TYPE_LENGTH_DELIMITED) {
-      size += WireFormatLite::kMessageSetItemTagsSize;
-      size += io::CodedOutputStream::VarintSize32(field.number());
-
-      int field_size = field.GetLengthDelimitedSize();
-      size += io::CodedOutputStream::VarintSize32(field_size);
-      size += field_size;
-    }
-  }
-
-  return size;
-}
-
-// ===================================================================
-
-bool WireFormat::ParseAndMergePartial(io::CodedInputStream* input,
-                                      Message* message) {
-  const Descriptor* descriptor = message->GetDescriptor();
-  const Reflection* message_reflection = message->GetReflection();
-
-  while (true) {
-    uint32_t tag = input->ReadTag();
-    if (tag == 0) {
-      // End of input.  This is a valid place to end, so return true.
-      return true;
-    }
-
-    if (WireFormatLite::GetTagWireType(tag) ==
-        WireFormatLite::WIRETYPE_END_GROUP) {
-      // Must be the end of the message.
-      return true;
-    }
-
-    const FieldDescriptor* field = nullptr;
-
-    if (descriptor != nullptr) {
-      int field_number = WireFormatLite::GetTagFieldNumber(tag);
-      field = descriptor->FindFieldByNumber(field_number);
-
-      // If that failed, check if the field is an extension.
-      if (field == nullptr && descriptor->IsExtensionNumber(field_number)) {
-        if (input->GetExtensionPool() == nullptr) {
-          field = message_reflection->FindKnownExtensionByNumber(field_number);
-        } else {
-          field = input->GetExtensionPool()->FindExtensionByNumber(
-              descriptor, field_number);
-        }
-      }
-
-      // If that failed, but we're a MessageSet, and this is the tag for a
-      // MessageSet item, then parse that.
-      if (field == nullptr && descriptor->options().message_set_wire_format() &&
-          tag == WireFormatLite::kMessageSetItemStartTag) {
-        if (!ParseAndMergeMessageSetItem(input, message)) {
-          return false;
-        }
-        continue;  // Skip ParseAndMergeField(); already taken care of.
-      }
-    }
-
-    if (!ParseAndMergeField(tag, field, message, input)) {
-      return false;
-    }
-  }
-}
-
-bool WireFormat::SkipMessageSetField(io::CodedInputStream* input,
-                                     uint32_t field_number,
-                                     UnknownFieldSet* unknown_fields) {
-  uint32_t length;
-  if (!input->ReadVarint32(&length)) return false;
-  return input->ReadString(unknown_fields->AddLengthDelimited(field_number),
-                           length);
-}
-
-bool WireFormat::ParseAndMergeMessageSetField(uint32_t field_number,
-                                              const FieldDescriptor* field,
-                                              Message* message,
-                                              io::CodedInputStream* input) {
-  const Reflection* message_reflection = message->GetReflection();
-  if (field == nullptr) {
-    // We store unknown MessageSet extensions as groups.
-    return SkipMessageSetField(
-        input, field_number, message_reflection->MutableUnknownFields(message));
-  } else if (field->is_repeated() ||
-             field->type() != FieldDescriptor::TYPE_MESSAGE) {
-    // This shouldn't happen as we only allow optional message extensions to
-    // MessageSet.
-    GOOGLE_LOG(ERROR) << "Extensions of MessageSets must be optional messages.";
-    return false;
-  } else {
-    Message* sub_message = message_reflection->MutableMessage(
-        message, field, input->GetExtensionFactory());
-    return WireFormatLite::ReadMessage(input, sub_message);
-  }
-}
-
-static bool StrictUtf8Check(const FieldDescriptor* field) {
-  return field->file()->syntax() == FileDescriptor::SYNTAX_PROTO3;
-}
-
-bool WireFormat::ParseAndMergeField(
-    uint32_t tag,
-    const FieldDescriptor* field,  // May be nullptr for unknown
-    Message* message, io::CodedInputStream* input) {
-  const Reflection* message_reflection = message->GetReflection();
-
-  enum { UNKNOWN, NORMAL_FORMAT, PACKED_FORMAT } value_format;
-
-  if (field == nullptr) {
-    value_format = UNKNOWN;
-  } else if (WireFormatLite::GetTagWireType(tag) ==
-             WireTypeForFieldType(field->type())) {
-    value_format = NORMAL_FORMAT;
-  } else if (field->is_packable() &&
-             WireFormatLite::GetTagWireType(tag) ==
-                 WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-    value_format = PACKED_FORMAT;
-  } else {
-    // We don't recognize this field. Either the field number is unknown
-    // or the wire type doesn't match. Put it in our unknown field set.
-    value_format = UNKNOWN;
-  }
-
-  if (value_format == UNKNOWN) {
-    return SkipField(input, tag,
-                     message_reflection->MutableUnknownFields(message));
-  } else if (value_format == PACKED_FORMAT) {
-    uint32_t length;
-    if (!input->ReadVarint32(&length)) return false;
-    io::CodedInputStream::Limit limit = input->PushLimit(length);
-
-    switch (field->type()) {
-#define HANDLE_PACKED_TYPE(TYPE, CPPTYPE, CPPTYPE_METHOD)                      \
-  case FieldDescriptor::TYPE_##TYPE: {                                         \
-    while (input->BytesUntilLimit() > 0) {                                     \
-      CPPTYPE value;                                                           \
-      if (!WireFormatLite::ReadPrimitive<CPPTYPE,                              \
-                                         WireFormatLite::TYPE_##TYPE>(input,   \
-                                                                      &value)) \
-        return false;                                                          \
-      message_reflection->Add##CPPTYPE_METHOD(message, field, value);          \
-    }                                                                          \
-    break;                                                                     \
-  }
-
-      HANDLE_PACKED_TYPE(INT32, int32_t, Int32)
-      HANDLE_PACKED_TYPE(INT64, int64_t, Int64)
-      HANDLE_PACKED_TYPE(SINT32, int32_t, Int32)
-      HANDLE_PACKED_TYPE(SINT64, int64_t, Int64)
-      HANDLE_PACKED_TYPE(UINT32, uint32_t, UInt32)
-      HANDLE_PACKED_TYPE(UINT64, uint64_t, UInt64)
-
-      HANDLE_PACKED_TYPE(FIXED32, uint32_t, UInt32)
-      HANDLE_PACKED_TYPE(FIXED64, uint64_t, UInt64)
-      HANDLE_PACKED_TYPE(SFIXED32, int32_t, Int32)
-      HANDLE_PACKED_TYPE(SFIXED64, int64_t, Int64)
-
-      HANDLE_PACKED_TYPE(FLOAT, float, Float)
-      HANDLE_PACKED_TYPE(DOUBLE, double, Double)
-
-      HANDLE_PACKED_TYPE(BOOL, bool, Bool)
-#undef HANDLE_PACKED_TYPE
-
-      case FieldDescriptor::TYPE_ENUM: {
-        while (input->BytesUntilLimit() > 0) {
-          int value;
-          if (!WireFormatLite::ReadPrimitive<int, WireFormatLite::TYPE_ENUM>(
-                  input, &value))
-            return false;
-          if (message->GetDescriptor()->file()->syntax() ==
-              FileDescriptor::SYNTAX_PROTO3) {
-            message_reflection->AddEnumValue(message, field, value);
-          } else {
-            const EnumValueDescriptor* enum_value =
-                field->enum_type()->FindValueByNumber(value);
-            if (enum_value != nullptr) {
-              message_reflection->AddEnum(message, field, enum_value);
-            } else {
-              // The enum value is not one of the known values.  Add it to the
-              // UnknownFieldSet.
-              int64_t sign_extended_value = static_cast<int64_t>(value);
-              message_reflection->MutableUnknownFields(message)->AddVarint(
-                  WireFormatLite::GetTagFieldNumber(tag), sign_extended_value);
-            }
-          }
-        }
-
-        break;
-      }
-
-      case FieldDescriptor::TYPE_STRING:
-      case FieldDescriptor::TYPE_GROUP:
-      case FieldDescriptor::TYPE_MESSAGE:
-      case FieldDescriptor::TYPE_BYTES:
-        // Can't have packed fields of these types: these should be caught by
-        // the protocol compiler.
-        return false;
-        break;
-    }
-
-    input->PopLimit(limit);
-  } else {
-    // Non-packed value (value_format == NORMAL_FORMAT)
-    switch (field->type()) {
-#define HANDLE_TYPE(TYPE, CPPTYPE, CPPTYPE_METHOD)                            \
-  case FieldDescriptor::TYPE_##TYPE: {                                        \
-    CPPTYPE value;                                                            \
-    if (!WireFormatLite::ReadPrimitive<CPPTYPE, WireFormatLite::TYPE_##TYPE>( \
-            input, &value))                                                   \
-      return false;                                                           \
-    if (field->is_repeated()) {                                               \
-      message_reflection->Add##CPPTYPE_METHOD(message, field, value);         \
-    } else {                                                                  \
-      message_reflection->Set##CPPTYPE_METHOD(message, field, value);         \
-    }                                                                         \
-    break;                                                                    \
-  }
-
-      HANDLE_TYPE(INT32, int32_t, Int32)
-      HANDLE_TYPE(INT64, int64_t, Int64)
-      HANDLE_TYPE(SINT32, int32_t, Int32)
-      HANDLE_TYPE(SINT64, int64_t, Int64)
-      HANDLE_TYPE(UINT32, uint32_t, UInt32)
-      HANDLE_TYPE(UINT64, uint64_t, UInt64)
-
-      HANDLE_TYPE(FIXED32, uint32_t, UInt32)
-      HANDLE_TYPE(FIXED64, uint64_t, UInt64)
-      HANDLE_TYPE(SFIXED32, int32_t, Int32)
-      HANDLE_TYPE(SFIXED64, int64_t, Int64)
-
-      HANDLE_TYPE(FLOAT, float, Float)
-      HANDLE_TYPE(DOUBLE, double, Double)
-
-      HANDLE_TYPE(BOOL, bool, Bool)
-#undef HANDLE_TYPE
-
-      case FieldDescriptor::TYPE_ENUM: {
-        int value;
-        if (!WireFormatLite::ReadPrimitive<int, WireFormatLite::TYPE_ENUM>(
-                input, &value))
-          return false;
-        if (field->is_repeated()) {
-          message_reflection->AddEnumValue(message, field, value);
-        } else {
-          message_reflection->SetEnumValue(message, field, value);
-        }
-        break;
-      }
-
-      // Handle strings separately so that we can optimize the ctype=CORD case.
-      case FieldDescriptor::TYPE_STRING: {
-        bool strict_utf8_check = StrictUtf8Check(field);
-        std::string value;
-        if (!WireFormatLite::ReadString(input, &value)) return false;
-        if (strict_utf8_check) {
-          if (!WireFormatLite::VerifyUtf8String(value.data(), value.length(),
-                                                WireFormatLite::PARSE,
-                                                field->full_name().c_str())) {
-            return false;
-          }
-        } else {
-          VerifyUTF8StringNamedField(value.data(), value.length(), PARSE,
-                                     field->full_name().c_str());
-        }
-        if (field->is_repeated()) {
-          message_reflection->AddString(message, field, value);
-        } else {
-          message_reflection->SetString(message, field, value);
-        }
-        break;
-      }
-
-      case FieldDescriptor::TYPE_BYTES: {
-        std::string value;
-        if (!WireFormatLite::ReadBytes(input, &value)) return false;
-        if (field->is_repeated()) {
-          message_reflection->AddString(message, field, value);
-        } else {
-          message_reflection->SetString(message, field, value);
-        }
-        break;
-      }
-
-      case FieldDescriptor::TYPE_GROUP: {
-        Message* sub_message;
-        if (field->is_repeated()) {
-          sub_message = message_reflection->AddMessage(
-              message, field, input->GetExtensionFactory());
-        } else {
-          sub_message = message_reflection->MutableMessage(
-              message, field, input->GetExtensionFactory());
-        }
-
-        if (!WireFormatLite::ReadGroup(WireFormatLite::GetTagFieldNumber(tag),
-                                       input, sub_message))
-          return false;
-        break;
-      }
-
-      case FieldDescriptor::TYPE_MESSAGE: {
-        Message* sub_message;
-        if (field->is_repeated()) {
-          sub_message = message_reflection->AddMessage(
-              message, field, input->GetExtensionFactory());
-        } else {
-          sub_message = message_reflection->MutableMessage(
-              message, field, input->GetExtensionFactory());
-        }
-
-        if (!WireFormatLite::ReadMessage(input, sub_message)) return false;
-        break;
-      }
-    }
-  }
-
-  return true;
-}
-
-bool WireFormat::ParseAndMergeMessageSetItem(io::CodedInputStream* input,
-                                             Message* message) {
-  struct MSReflective {
-    bool ParseField(int type_id, io::CodedInputStream* input) {
-      const FieldDescriptor* field =
-          message_reflection->FindKnownExtensionByNumber(type_id);
-      return ParseAndMergeMessageSetField(type_id, field, message, input);
-    }
-
-    bool SkipField(uint32_t tag, io::CodedInputStream* input) {
-      return WireFormat::SkipField(input, tag, nullptr);
-    }
-
-    const Reflection* message_reflection;
-    Message* message;
-  };
-
-  return ParseMessageSetItemImpl(
-      input, MSReflective{message->GetReflection(), message});
-}
-
-struct WireFormat::MessageSetParser {
-  const char* _InternalParse(const char* ptr, internal::ParseContext* ctx) {
-    // Parse a MessageSetItem
-    auto metadata = reflection->MutableInternalMetadata(msg);
-    enum class State { kNoTag, kHasType, kHasPayload, kDone };
-    State state = State::kNoTag;
-
-    std::string payload;
-    uint32_t type_id = 0;
-    while (!ctx->Done(&ptr)) {
-      // We use 64 bit tags in order to allow typeid's that span the whole
-      // range of 32 bit numbers.
-      uint32_t tag = static_cast<uint8_t>(*ptr++);
-      if (tag == WireFormatLite::kMessageSetTypeIdTag) {
-        uint64_t tmp;
-        ptr = ParseBigVarint(ptr, &tmp);
-        GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
-        if (state == State::kNoTag) {
-          type_id = tmp;
-          state = State::kHasType;
-        } else if (state == State::kHasPayload) {
-          type_id = tmp;
-          const FieldDescriptor* field;
-          if (ctx->data().pool == nullptr) {
-            field = reflection->FindKnownExtensionByNumber(type_id);
-          } else {
-            field =
-                ctx->data().pool->FindExtensionByNumber(descriptor, type_id);
-          }
-          if (field == nullptr || field->message_type() == nullptr) {
-            WriteLengthDelimited(
-                type_id, payload,
-                metadata->mutable_unknown_fields<UnknownFieldSet>());
-          } else {
-            Message* value =
-                field->is_repeated()
-                    ? reflection->AddMessage(msg, field, ctx->data().factory)
-                    : reflection->MutableMessage(msg, field,
-                                                 ctx->data().factory);
-            const char* p;
-            // We can't use regular parse from string as we have to track
-            // proper recursion depth and descriptor pools.
-            ParseContext tmp_ctx(ctx->depth(), false, &p, payload);
-            tmp_ctx.data().pool = ctx->data().pool;
-            tmp_ctx.data().factory = ctx->data().factory;
-            GOOGLE_PROTOBUF_PARSER_ASSERT(value->_InternalParse(p, &tmp_ctx) &&
-                                           tmp_ctx.EndedAtLimit());
-          }
-          state = State::kDone;
-        }
-        continue;
-      } else if (tag == WireFormatLite::kMessageSetMessageTag) {
-        if (state == State::kNoTag) {
-          int32_t size = ReadSize(&ptr);
-          GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
-          ptr = ctx->ReadString(ptr, size, &payload);
-          GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
-          state = State::kHasPayload;
-        } else if (state == State::kHasType) {
-          // We're now parsing the payload
-          const FieldDescriptor* field = nullptr;
-          if (descriptor->IsExtensionNumber(type_id)) {
-            if (ctx->data().pool == nullptr) {
-              field = reflection->FindKnownExtensionByNumber(type_id);
-            } else {
-              field =
-                  ctx->data().pool->FindExtensionByNumber(descriptor, type_id);
-            }
-          }
-          ptr = WireFormat::_InternalParseAndMergeField(
-              msg, ptr, ctx, static_cast<uint64_t>(type_id) * 8 + 2, reflection,
-              field);
-          state = State::kDone;
-        } else {
-          int32_t size = ReadSize(&ptr);
-          GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
-          ptr = ctx->Skip(ptr, size);
-          GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
-        }
-      } else {
-        // An unknown field in MessageSetItem.
-        ptr = ReadTag(ptr - 1, &tag);
-        if (tag == 0 || (tag & 7) == WireFormatLite::WIRETYPE_END_GROUP) {
-          ctx->SetLastTag(tag);
-          return ptr;
-        }
-        // Skip field.
-        ptr = internal::UnknownFieldParse(
-            tag, static_cast<std::string*>(nullptr), ptr, ctx);
-      }
-      GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
-    }
-    return ptr;
-  }
-
-  const char* ParseMessageSet(const char* ptr, internal::ParseContext* ctx) {
-    while (!ctx->Done(&ptr)) {
-      uint32_t tag;
-      ptr = ReadTag(ptr, &tag);
-      if (PROTOBUF_PREDICT_FALSE(ptr == nullptr)) return nullptr;
-      if (tag == 0 || (tag & 7) == WireFormatLite::WIRETYPE_END_GROUP) {
-        ctx->SetLastTag(tag);
-        break;
-      }
-      if (tag == WireFormatLite::kMessageSetItemStartTag) {
-        // A message set item starts
-        ptr = ctx->ParseGroup(this, ptr, tag);
-      } else {
-        // Parse other fields as normal extensions.
-        int field_number = WireFormatLite::GetTagFieldNumber(tag);
-        const FieldDescriptor* field = nullptr;
-        if (descriptor->IsExtensionNumber(field_number)) {
-          if (ctx->data().pool == nullptr) {
-            field = reflection->FindKnownExtensionByNumber(field_number);
-          } else {
-            field = ctx->data().pool->FindExtensionByNumber(descriptor,
-                                                            field_number);
-          }
-        }
-        ptr = WireFormat::_InternalParseAndMergeField(msg, ptr, ctx, tag,
-                                                      reflection, field);
-      }
-      if (PROTOBUF_PREDICT_FALSE(ptr == nullptr)) return nullptr;
-    }
-    return ptr;
-  }
-
-  Message* msg;
-  const Descriptor* descriptor;
-  const Reflection* reflection;
-};
-
-const char* WireFormat::_InternalParse(Message* msg, const char* ptr,
-                                       internal::ParseContext* ctx) {
-  const Descriptor* descriptor = msg->GetDescriptor();
-  const Reflection* reflection = msg->GetReflection();
-  GOOGLE_DCHECK(descriptor);
-  GOOGLE_DCHECK(reflection);
-  if (descriptor->options().message_set_wire_format()) {
-    MessageSetParser message_set{msg, descriptor, reflection};
-    return message_set.ParseMessageSet(ptr, ctx);
-  }
-  while (!ctx->Done(&ptr)) {
-    uint32_t tag;
-    ptr = ReadTag(ptr, &tag);
-    if (PROTOBUF_PREDICT_FALSE(ptr == nullptr)) return nullptr;
-    if (tag == 0 || (tag & 7) == WireFormatLite::WIRETYPE_END_GROUP) {
-      ctx->SetLastTag(tag);
-      break;
-    }
-    const FieldDescriptor* field = nullptr;
-
-    int field_number = WireFormatLite::GetTagFieldNumber(tag);
-    field = descriptor->FindFieldByNumber(field_number);
-
-    // If that failed, check if the field is an extension.
-    if (field == nullptr && descriptor->IsExtensionNumber(field_number)) {
-      if (ctx->data().pool == nullptr) {
-        field = reflection->FindKnownExtensionByNumber(field_number);
-      } else {
-        field =
-            ctx->data().pool->FindExtensionByNumber(descriptor, field_number);
-      }
-    }
-
-    ptr = _InternalParseAndMergeField(msg, ptr, ctx, tag, reflection, field);
-    if (PROTOBUF_PREDICT_FALSE(ptr == nullptr)) return nullptr;
-  }
-  return ptr;
-}
-
-const char* WireFormat::_InternalParseAndMergeField(
-    Message* msg, const char* ptr, internal::ParseContext* ctx, uint64_t tag,
-    const Reflection* reflection, const FieldDescriptor* field) {
-  if (field == nullptr) {
-    // unknown field set parser takes 64bit tags, because message set type ids
-    // span the full 32 bit range making the tag span [0, 2^35) range.
-    return internal::UnknownFieldParse(
-        tag, reflection->MutableUnknownFields(msg), ptr, ctx);
-  }
-  if (WireFormatLite::GetTagWireType(tag) !=
-      WireTypeForFieldType(field->type())) {
-    if (field->is_packable() && WireFormatLite::GetTagWireType(tag) ==
-                                    WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-      switch (field->type()) {
-#define HANDLE_PACKED_TYPE(TYPE, CPPTYPE, CPPTYPE_METHOD)                   \
-  case FieldDescriptor::TYPE_##TYPE: {                                      \
-    ptr = internal::Packed##CPPTYPE_METHOD##Parser(                         \
-        reflection->MutableRepeatedFieldInternal<CPPTYPE>(msg, field), ptr, \
-        ctx);                                                               \
-    return ptr;                                                             \
-  }
-
-        HANDLE_PACKED_TYPE(INT32, int32_t, Int32)
-        HANDLE_PACKED_TYPE(INT64, int64_t, Int64)
-        HANDLE_PACKED_TYPE(SINT32, int32_t, SInt32)
-        HANDLE_PACKED_TYPE(SINT64, int64_t, SInt64)
-        HANDLE_PACKED_TYPE(UINT32, uint32_t, UInt32)
-        HANDLE_PACKED_TYPE(UINT64, uint64_t, UInt64)
-
-        HANDLE_PACKED_TYPE(FIXED32, uint32_t, Fixed32)
-        HANDLE_PACKED_TYPE(FIXED64, uint64_t, Fixed64)
-        HANDLE_PACKED_TYPE(SFIXED32, int32_t, SFixed32)
-        HANDLE_PACKED_TYPE(SFIXED64, int64_t, SFixed64)
-
-        HANDLE_PACKED_TYPE(FLOAT, float, Float)
-        HANDLE_PACKED_TYPE(DOUBLE, double, Double)
-
-        HANDLE_PACKED_TYPE(BOOL, bool, Bool)
-#undef HANDLE_PACKED_TYPE
-
-        case FieldDescriptor::TYPE_ENUM: {
-          auto rep_enum =
-              reflection->MutableRepeatedFieldInternal<int>(msg, field);
-          bool open_enum = false;
-          if (field->file()->syntax() == FileDescriptor::SYNTAX_PROTO3 ||
-              open_enum) {
-            ptr = internal::PackedEnumParser(rep_enum, ptr, ctx);
-          } else {
-            return ctx->ReadPackedVarint(
-                ptr, [rep_enum, field, reflection, msg](uint64_t val) {
-                  if (field->enum_type()->FindValueByNumber(val) != nullptr) {
-                    rep_enum->Add(val);
-                  } else {
-                    WriteVarint(field->number(), val,
-                                reflection->MutableUnknownFields(msg));
-                  }
-                });
-          }
-          return ptr;
-        }
-
-        case FieldDescriptor::TYPE_STRING:
-        case FieldDescriptor::TYPE_GROUP:
-        case FieldDescriptor::TYPE_MESSAGE:
-        case FieldDescriptor::TYPE_BYTES:
-          GOOGLE_LOG(FATAL) << "Can't reach";
-          return nullptr;
-      }
-    } else {
-      // mismatched wiretype;
-      return internal::UnknownFieldParse(
-          tag, reflection->MutableUnknownFields(msg), ptr, ctx);
-    }
-  }
-
-  // Non-packed value
-  bool utf8_check = false;
-  bool strict_utf8_check = false;
-  switch (field->type()) {
-#define HANDLE_TYPE(TYPE, CPPTYPE, CPPTYPE_METHOD)        \
-  case FieldDescriptor::TYPE_##TYPE: {                    \
-    CPPTYPE value;                                        \
-    ptr = VarintParse(ptr, &value);                       \
-    if (ptr == nullptr) return nullptr;                   \
-    if (field->is_repeated()) {                           \
-      reflection->Add##CPPTYPE_METHOD(msg, field, value); \
-    } else {                                              \
-      reflection->Set##CPPTYPE_METHOD(msg, field, value); \
-    }                                                     \
-    return ptr;                                           \
-  }
-
-    HANDLE_TYPE(BOOL, uint64_t, Bool)
-    HANDLE_TYPE(INT32, uint32_t, Int32)
-    HANDLE_TYPE(INT64, uint64_t, Int64)
-    HANDLE_TYPE(UINT32, uint32_t, UInt32)
-    HANDLE_TYPE(UINT64, uint64_t, UInt64)
-
-    case FieldDescriptor::TYPE_SINT32: {
-      int32_t value = ReadVarintZigZag32(&ptr);
-      if (ptr == nullptr) return nullptr;
-      if (field->is_repeated()) {
-        reflection->AddInt32(msg, field, value);
-      } else {
-        reflection->SetInt32(msg, field, value);
-      }
-      return ptr;
-    }
-    case FieldDescriptor::TYPE_SINT64: {
-      int64_t value = ReadVarintZigZag64(&ptr);
-      if (ptr == nullptr) return nullptr;
-      if (field->is_repeated()) {
-        reflection->AddInt64(msg, field, value);
-      } else {
-        reflection->SetInt64(msg, field, value);
-      }
-      return ptr;
-    }
-#undef HANDLE_TYPE
-#define HANDLE_TYPE(TYPE, CPPTYPE, CPPTYPE_METHOD)        \
-  case FieldDescriptor::TYPE_##TYPE: {                    \
-    CPPTYPE value;                                        \
-    value = UnalignedLoad<CPPTYPE>(ptr);                  \
-    ptr += sizeof(CPPTYPE);                               \
-    if (field->is_repeated()) {                           \
-      reflection->Add##CPPTYPE_METHOD(msg, field, value); \
-    } else {                                              \
-      reflection->Set##CPPTYPE_METHOD(msg, field, value); \
-    }                                                     \
-    return ptr;                                           \
-  }
-
-      HANDLE_TYPE(FIXED32, uint32_t, UInt32)
-      HANDLE_TYPE(FIXED64, uint64_t, UInt64)
-      HANDLE_TYPE(SFIXED32, int32_t, Int32)
-      HANDLE_TYPE(SFIXED64, int64_t, Int64)
-
-      HANDLE_TYPE(FLOAT, float, Float)
-      HANDLE_TYPE(DOUBLE, double, Double)
-
-#undef HANDLE_TYPE
-
-    case FieldDescriptor::TYPE_ENUM: {
-      uint32_t value;
-      ptr = VarintParse(ptr, &value);
-      if (ptr == nullptr) return nullptr;
-      if (field->is_repeated()) {
-        reflection->AddEnumValue(msg, field, value);
-      } else {
-        reflection->SetEnumValue(msg, field, value);
-      }
-      return ptr;
-    }
-
-    // Handle strings separately so that we can optimize the ctype=CORD case.
-    case FieldDescriptor::TYPE_STRING:
-      utf8_check = true;
-      strict_utf8_check = StrictUtf8Check(field);
-      PROTOBUF_FALLTHROUGH_INTENDED;
-    case FieldDescriptor::TYPE_BYTES: {
-      int size = ReadSize(&ptr);
-      if (ptr == nullptr) return nullptr;
-      std::string value;
-      ptr = ctx->ReadString(ptr, size, &value);
-      if (ptr == nullptr) return nullptr;
-      if (utf8_check) {
-        if (strict_utf8_check) {
-          if (!WireFormatLite::VerifyUtf8String(value.data(), value.length(),
-                                                WireFormatLite::PARSE,
-                                                field->full_name().c_str())) {
-            return nullptr;
-          }
-        } else {
-          VerifyUTF8StringNamedField(value.data(), value.length(), PARSE,
-                                     field->full_name().c_str());
-        }
-      }
-      if (field->is_repeated()) {
-        reflection->AddString(msg, field, std::move(value));
-      } else {
-        reflection->SetString(msg, field, std::move(value));
-      }
-      return ptr;
-    }
-
-    case FieldDescriptor::TYPE_GROUP: {
-      Message* sub_message;
-      if (field->is_repeated()) {
-        sub_message = reflection->AddMessage(msg, field, ctx->data().factory);
-      } else {
-        sub_message =
-            reflection->MutableMessage(msg, field, ctx->data().factory);
-      }
-
-      return ctx->ParseGroup(sub_message, ptr, tag);
-    }
-
-    case FieldDescriptor::TYPE_MESSAGE: {
-      Message* sub_message;
-      if (field->is_repeated()) {
-        sub_message = reflection->AddMessage(msg, field, ctx->data().factory);
-      } else {
-        sub_message =
-            reflection->MutableMessage(msg, field, ctx->data().factory);
-      }
-      return ctx->ParseMessage(sub_message, ptr);
-    }
-  }
-
-  // GCC 8 complains about control reaching end of non-void function here.
-  // Let's keep it happy by returning a nullptr.
-  return nullptr;
-}
-
-// ===================================================================
-
-uint8_t* WireFormat::_InternalSerialize(const Message& message, uint8_t* target,
-                                        io::EpsCopyOutputStream* stream) {
-  const Descriptor* descriptor = message.GetDescriptor();
-  const Reflection* message_reflection = message.GetReflection();
-
-  std::vector<const FieldDescriptor*> fields;
-
-  // Fields of map entry should always be serialized.
-  if (descriptor->options().map_entry()) {
-    for (int i = 0; i < descriptor->field_count(); i++) {
-      fields.push_back(descriptor->field(i));
-    }
-  } else {
-    message_reflection->ListFields(message, &fields);
-  }
-
-  for (auto field : fields) {
-    target = InternalSerializeField(field, message, target, stream);
-  }
-
-  if (descriptor->options().message_set_wire_format()) {
-    return InternalSerializeUnknownMessageSetItemsToArray(
-        message_reflection->GetUnknownFields(message), target, stream);
-  } else {
-    return InternalSerializeUnknownFieldsToArray(
-        message_reflection->GetUnknownFields(message), target, stream);
-  }
-}
-
-uint8_t* SerializeMapKeyWithCachedSizes(const FieldDescriptor* field,
-                                        const MapKey& value, uint8_t* target,
-                                        io::EpsCopyOutputStream* stream) {
-  target = stream->EnsureSpace(target);
-  switch (field->type()) {
-    case FieldDescriptor::TYPE_DOUBLE:
-    case FieldDescriptor::TYPE_FLOAT:
-    case FieldDescriptor::TYPE_GROUP:
-    case FieldDescriptor::TYPE_MESSAGE:
-    case FieldDescriptor::TYPE_BYTES:
-    case FieldDescriptor::TYPE_ENUM:
-      GOOGLE_LOG(FATAL) << "Unsupported";
-      break;
-#define CASE_TYPE(FieldType, CamelFieldType, CamelCppType)   \
-  case FieldDescriptor::TYPE_##FieldType:                    \
-    target = WireFormatLite::Write##CamelFieldType##ToArray( \
-        1, value.Get##CamelCppType##Value(), target);        \
-    break;
-      CASE_TYPE(INT64, Int64, Int64)
-      CASE_TYPE(UINT64, UInt64, UInt64)
-      CASE_TYPE(INT32, Int32, Int32)
-      CASE_TYPE(FIXED64, Fixed64, UInt64)
-      CASE_TYPE(FIXED32, Fixed32, UInt32)
-      CASE_TYPE(BOOL, Bool, Bool)
-      CASE_TYPE(UINT32, UInt32, UInt32)
-      CASE_TYPE(SFIXED32, SFixed32, Int32)
-      CASE_TYPE(SFIXED64, SFixed64, Int64)
-      CASE_TYPE(SINT32, SInt32, Int32)
-      CASE_TYPE(SINT64, SInt64, Int64)
-#undef CASE_TYPE
-    case FieldDescriptor::TYPE_STRING:
-      target = stream->WriteString(1, value.GetStringValue(), target);
-      break;
-  }
-  return target;
-}
-
-static uint8_t* SerializeMapValueRefWithCachedSizes(
-    const FieldDescriptor* field, const MapValueConstRef& value,
-    uint8_t* target, io::EpsCopyOutputStream* stream) {
-  target = stream->EnsureSpace(target);
-  switch (field->type()) {
-#define CASE_TYPE(FieldType, CamelFieldType, CamelCppType)   \
-  case FieldDescriptor::TYPE_##FieldType:                    \
-    target = WireFormatLite::Write##CamelFieldType##ToArray( \
-        2, value.Get##CamelCppType##Value(), target);        \
-    break;
-    CASE_TYPE(INT64, Int64, Int64)
-    CASE_TYPE(UINT64, UInt64, UInt64)
-    CASE_TYPE(INT32, Int32, Int32)
-    CASE_TYPE(FIXED64, Fixed64, UInt64)
-    CASE_TYPE(FIXED32, Fixed32, UInt32)
-    CASE_TYPE(BOOL, Bool, Bool)
-    CASE_TYPE(UINT32, UInt32, UInt32)
-    CASE_TYPE(SFIXED32, SFixed32, Int32)
-    CASE_TYPE(SFIXED64, SFixed64, Int64)
-    CASE_TYPE(SINT32, SInt32, Int32)
-    CASE_TYPE(SINT64, SInt64, Int64)
-    CASE_TYPE(ENUM, Enum, Enum)
-    CASE_TYPE(DOUBLE, Double, Double)
-    CASE_TYPE(FLOAT, Float, Float)
-#undef CASE_TYPE
-    case FieldDescriptor::TYPE_STRING:
-    case FieldDescriptor::TYPE_BYTES:
-      target = stream->WriteString(2, value.GetStringValue(), target);
-      break;
-    case FieldDescriptor::TYPE_MESSAGE: {
-      auto& msg = value.GetMessageValue();
-      target = WireFormatLite::InternalWriteMessage(2, msg, msg.GetCachedSize(),
-                                                    target, stream);
-    } break;
-    case FieldDescriptor::TYPE_GROUP:
-      target = WireFormatLite::InternalWriteGroup(2, value.GetMessageValue(),
-                                                  target, stream);
-      break;
-  }
-  return target;
-}
-
-class MapKeySorter {
- public:
-  static std::vector<MapKey> SortKey(const Message& message,
-                                     const Reflection* reflection,
-                                     const FieldDescriptor* field) {
-    std::vector<MapKey> sorted_key_list;
-    for (MapIterator it =
-             reflection->MapBegin(const_cast<Message*>(&message), field);
-         it != reflection->MapEnd(const_cast<Message*>(&message), field);
-         ++it) {
-      sorted_key_list.push_back(it.GetKey());
-    }
-    MapKeyComparator comparator;
-    std::sort(sorted_key_list.begin(), sorted_key_list.end(), comparator);
-    return sorted_key_list;
-  }
-
- private:
-  class MapKeyComparator {
-   public:
-    bool operator()(const MapKey& a, const MapKey& b) const {
-      GOOGLE_DCHECK(a.type() == b.type());
-      switch (a.type()) {
-#define CASE_TYPE(CppType, CamelCppType)                                \
-  case FieldDescriptor::CPPTYPE_##CppType: {                            \
-    return a.Get##CamelCppType##Value() < b.Get##CamelCppType##Value(); \
-  }
-        CASE_TYPE(STRING, String)
-        CASE_TYPE(INT64, Int64)
-        CASE_TYPE(INT32, Int32)
-        CASE_TYPE(UINT64, UInt64)
-        CASE_TYPE(UINT32, UInt32)
-        CASE_TYPE(BOOL, Bool)
-#undef CASE_TYPE
-
-        default:
-          GOOGLE_LOG(DFATAL) << "Invalid key for map field.";
-          return true;
-      }
-    }
-  };
-};
-
-static uint8_t* InternalSerializeMapEntry(const FieldDescriptor* field,
-                                          const MapKey& key,
-                                          const MapValueConstRef& value,
-                                          uint8_t* target,
-                                          io::EpsCopyOutputStream* stream) {
-  const FieldDescriptor* key_field = field->message_type()->field(0);
-  const FieldDescriptor* value_field = field->message_type()->field(1);
-
-  size_t size = kMapEntryTagByteSize;
-  size += MapKeyDataOnlyByteSize(key_field, key);
-  size += MapValueRefDataOnlyByteSize(value_field, value);
-  target = stream->EnsureSpace(target);
-  target = WireFormatLite::WriteTagToArray(
-      field->number(), WireFormatLite::WIRETYPE_LENGTH_DELIMITED, target);
-  target = io::CodedOutputStream::WriteVarint32ToArray(size, target);
-  target = SerializeMapKeyWithCachedSizes(key_field, key, target, stream);
-  target =
-      SerializeMapValueRefWithCachedSizes(value_field, value, target, stream);
-  return target;
-}
-
-uint8_t* WireFormat::InternalSerializeField(const FieldDescriptor* field,
-                                            const Message& message,
-                                            uint8_t* target,
-                                            io::EpsCopyOutputStream* stream) {
-  const Reflection* message_reflection = message.GetReflection();
-
-  if (field->is_extension() &&
-      field->containing_type()->options().message_set_wire_format() &&
-      field->cpp_type() == FieldDescriptor::CPPTYPE_MESSAGE &&
-      !field->is_repeated()) {
-    return InternalSerializeMessageSetItem(field, message, target, stream);
-  }
-
-  // For map fields, we can use either repeated field reflection or map
-  // reflection.  Our choice has some subtle effects.  If we use repeated field
-  // reflection here, then the repeated field representation becomes
-  // authoritative for this field: any existing references that came from map
-  // reflection remain valid for reading, but mutations to them are lost and
-  // will be overwritten next time we call map reflection!
-  //
-  // So far this mainly affects Python, which keeps long-term references to map
-  // values around, and always uses map reflection.  See: b/35918691
-  //
-  // Here we choose to use map reflection API as long as the internal
-  // map is valid. In this way, the serialization doesn't change map field's
-  // internal state and existing references that came from map reflection remain
-  // valid for both reading and writing.
-  if (field->is_map()) {
-    const MapFieldBase* map_field =
-        message_reflection->GetMapData(message, field);
-    if (map_field->IsMapValid()) {
-      if (stream->IsSerializationDeterministic()) {
-        std::vector<MapKey> sorted_key_list =
-            MapKeySorter::SortKey(message, message_reflection, field);
-        for (std::vector<MapKey>::iterator it = sorted_key_list.begin();
-             it != sorted_key_list.end(); ++it) {
-          MapValueConstRef map_value;
-          message_reflection->LookupMapValue(message, field, *it, &map_value);
-          target =
-              InternalSerializeMapEntry(field, *it, map_value, target, stream);
-        }
-      } else {
-        for (MapIterator it = message_reflection->MapBegin(
-                 const_cast<Message*>(&message), field);
-             it !=
-             message_reflection->MapEnd(const_cast<Message*>(&message), field);
-             ++it) {
-          target = InternalSerializeMapEntry(field, it.GetKey(),
-                                             it.GetValueRef(), target, stream);
-        }
-      }
-
-      return target;
-    }
-  }
-  int count = 0;
-
-  if (field->is_repeated()) {
-    count = message_reflection->FieldSize(message, field);
-  } else if (field->containing_type()->options().map_entry()) {
-    // Map entry fields always need to be serialized.
-    count = 1;
-  } else if (message_reflection->HasField(message, field)) {
-    count = 1;
-  }
-
-  // map_entries is for maps that'll be deterministically serialized.
-  std::vector<const Message*> map_entries;
-  if (count > 1 && field->is_map() && stream->IsSerializationDeterministic()) {
-    map_entries =
-        DynamicMapSorter::Sort(message, count, message_reflection, field);
-  }
-
-  if (field->is_packed()) {
-    if (count == 0) return target;
-    target = stream->EnsureSpace(target);
-    switch (field->type()) {
-#define HANDLE_PRIMITIVE_TYPE(TYPE, CPPTYPE, TYPE_METHOD, CPPTYPE_METHOD)      \
-  case FieldDescriptor::TYPE_##TYPE: {                                         \
-    auto r =                                                                   \
-        message_reflection->GetRepeatedFieldInternal<CPPTYPE>(message, field); \
-    target = stream->Write##TYPE_METHOD##Packed(                               \
-        field->number(), r, FieldDataOnlyByteSize(field, message), target);    \
-    break;                                                                     \
-  }
-
-      HANDLE_PRIMITIVE_TYPE(INT32, int32_t, Int32, Int32)
-      HANDLE_PRIMITIVE_TYPE(INT64, int64_t, Int64, Int64)
-      HANDLE_PRIMITIVE_TYPE(SINT32, int32_t, SInt32, Int32)
-      HANDLE_PRIMITIVE_TYPE(SINT64, int64_t, SInt64, Int64)
-      HANDLE_PRIMITIVE_TYPE(UINT32, uint32_t, UInt32, UInt32)
-      HANDLE_PRIMITIVE_TYPE(UINT64, uint64_t, UInt64, UInt64)
-      HANDLE_PRIMITIVE_TYPE(ENUM, int, Enum, Enum)
-
-#undef HANDLE_PRIMITIVE_TYPE
-#define HANDLE_PRIMITIVE_TYPE(TYPE, CPPTYPE, TYPE_METHOD, CPPTYPE_METHOD)      \
-  case FieldDescriptor::TYPE_##TYPE: {                                         \
-    auto r =                                                                   \
-        message_reflection->GetRepeatedFieldInternal<CPPTYPE>(message, field); \
-    target = stream->WriteFixedPacked(field->number(), r, target);             \
-    break;                                                                     \
-  }
-
-      HANDLE_PRIMITIVE_TYPE(FIXED32, uint32_t, Fixed32, UInt32)
-      HANDLE_PRIMITIVE_TYPE(FIXED64, uint64_t, Fixed64, UInt64)
-      HANDLE_PRIMITIVE_TYPE(SFIXED32, int32_t, SFixed32, Int32)
-      HANDLE_PRIMITIVE_TYPE(SFIXED64, int64_t, SFixed64, Int64)
-
-      HANDLE_PRIMITIVE_TYPE(FLOAT, float, Float, Float)
-      HANDLE_PRIMITIVE_TYPE(DOUBLE, double, Double, Double)
-
-      HANDLE_PRIMITIVE_TYPE(BOOL, bool, Bool, Bool)
-#undef HANDLE_PRIMITIVE_TYPE
-      default:
-        GOOGLE_LOG(FATAL) << "Invalid descriptor";
-    }
-    return target;
-  }
-
-  auto get_message_from_field = [&message, &map_entries, message_reflection](
-                                    const FieldDescriptor* field, int j) {
-    if (!field->is_repeated()) {
-      return &message_reflection->GetMessage(message, field);
-    }
-    if (!map_entries.empty()) {
-      return map_entries[j];
-    }
-    return &message_reflection->GetRepeatedMessage(message, field, j);
-  };
-  for (int j = 0; j < count; j++) {
-    target = stream->EnsureSpace(target);
-    switch (field->type()) {
-#define HANDLE_PRIMITIVE_TYPE(TYPE, CPPTYPE, TYPE_METHOD, CPPTYPE_METHOD)     \
-  case FieldDescriptor::TYPE_##TYPE: {                                        \
-    const CPPTYPE value =                                                     \
-        field->is_repeated()                                                  \
-            ? message_reflection->GetRepeated##CPPTYPE_METHOD(message, field, \
-                                                              j)              \
-            : message_reflection->Get##CPPTYPE_METHOD(message, field);        \
-    target = WireFormatLite::Write##TYPE_METHOD##ToArray(field->number(),     \
-                                                         value, target);      \
-    break;                                                                    \
-  }
-
-      HANDLE_PRIMITIVE_TYPE(INT32, int32_t, Int32, Int32)
-      HANDLE_PRIMITIVE_TYPE(INT64, int64_t, Int64, Int64)
-      HANDLE_PRIMITIVE_TYPE(SINT32, int32_t, SInt32, Int32)
-      HANDLE_PRIMITIVE_TYPE(SINT64, int64_t, SInt64, Int64)
-      HANDLE_PRIMITIVE_TYPE(UINT32, uint32_t, UInt32, UInt32)
-      HANDLE_PRIMITIVE_TYPE(UINT64, uint64_t, UInt64, UInt64)
-
-      HANDLE_PRIMITIVE_TYPE(FIXED32, uint32_t, Fixed32, UInt32)
-      HANDLE_PRIMITIVE_TYPE(FIXED64, uint64_t, Fixed64, UInt64)
-      HANDLE_PRIMITIVE_TYPE(SFIXED32, int32_t, SFixed32, Int32)
-      HANDLE_PRIMITIVE_TYPE(SFIXED64, int64_t, SFixed64, Int64)
-
-      HANDLE_PRIMITIVE_TYPE(FLOAT, float, Float, Float)
-      HANDLE_PRIMITIVE_TYPE(DOUBLE, double, Double, Double)
-
-      HANDLE_PRIMITIVE_TYPE(BOOL, bool, Bool, Bool)
-#undef HANDLE_PRIMITIVE_TYPE
-
-      case FieldDescriptor::TYPE_GROUP: {
-        auto* msg = get_message_from_field(field, j);
-        target = WireFormatLite::InternalWriteGroup(field->number(), *msg,
-                                                    target, stream);
-      } break;
-
-      case FieldDescriptor::TYPE_MESSAGE: {
-        auto* msg = get_message_from_field(field, j);
-        target = WireFormatLite::InternalWriteMessage(
-            field->number(), *msg, msg->GetCachedSize(), target, stream);
-      } break;
-
-      case FieldDescriptor::TYPE_ENUM: {
-        const EnumValueDescriptor* value =
-            field->is_repeated()
-                ? message_reflection->GetRepeatedEnum(message, field, j)
-                : message_reflection->GetEnum(message, field);
-        target = WireFormatLite::WriteEnumToArray(field->number(),
-                                                  value->number(), target);
-        break;
-      }
-
-      // Handle strings separately so that we can get string references
-      // instead of copying.
-      case FieldDescriptor::TYPE_STRING: {
-        bool strict_utf8_check = StrictUtf8Check(field);
-        std::string scratch;
-        const std::string& value =
-            field->is_repeated()
-                ? message_reflection->GetRepeatedStringReference(message, field,
-                                                                 j, &scratch)
-                : message_reflection->GetStringReference(message, field,
-                                                         &scratch);
-        if (strict_utf8_check) {
-          WireFormatLite::VerifyUtf8String(value.data(), value.length(),
-                                           WireFormatLite::SERIALIZE,
-                                           field->full_name().c_str());
-        } else {
-          VerifyUTF8StringNamedField(value.data(), value.length(), SERIALIZE,
-                                     field->full_name().c_str());
-        }
-        target = stream->WriteString(field->number(), value, target);
-        break;
-      }
-
-      case FieldDescriptor::TYPE_BYTES: {
-        std::string scratch;
-        const std::string& value =
-            field->is_repeated()
-                ? message_reflection->GetRepeatedStringReference(message, field,
-                                                                 j, &scratch)
-                : message_reflection->GetStringReference(message, field,
-                                                         &scratch);
-        target = stream->WriteString(field->number(), value, target);
-        break;
-      }
-    }
-  }
-  return target;
-}
-
-uint8_t* WireFormat::InternalSerializeMessageSetItem(
-    const FieldDescriptor* field, const Message& message, uint8_t* target,
-    io::EpsCopyOutputStream* stream) {
-  const Reflection* message_reflection = message.GetReflection();
-
-  target = stream->EnsureSpace(target);
-  // Start group.
-  target = io::CodedOutputStream::WriteTagToArray(
-      WireFormatLite::kMessageSetItemStartTag, target);
-  // Write type ID.
-  target = WireFormatLite::WriteUInt32ToArray(
-      WireFormatLite::kMessageSetTypeIdNumber, field->number(), target);
-  // Write message.
-  auto& msg = message_reflection->GetMessage(message, field);
-  target = WireFormatLite::InternalWriteMessage(
-      WireFormatLite::kMessageSetMessageNumber, msg, msg.GetCachedSize(),
-      target, stream);
-  // End group.
-  target = stream->EnsureSpace(target);
-  target = io::CodedOutputStream::WriteTagToArray(
-      WireFormatLite::kMessageSetItemEndTag, target);
-  return target;
-}
-
-// ===================================================================
-
-size_t WireFormat::ByteSize(const Message& message) {
-  const Descriptor* descriptor = message.GetDescriptor();
-  const Reflection* message_reflection = message.GetReflection();
-
-  size_t our_size = 0;
-
-  std::vector<const FieldDescriptor*> fields;
-
-  // Fields of map entry should always be serialized.
-  if (descriptor->options().map_entry()) {
-    for (int i = 0; i < descriptor->field_count(); i++) {
-      fields.push_back(descriptor->field(i));
-    }
-  } else {
-    message_reflection->ListFields(message, &fields);
-  }
-
-  for (const FieldDescriptor* field : fields) {
-    our_size += FieldByteSize(field, message);
-  }
-
-  if (descriptor->options().message_set_wire_format()) {
-    our_size += ComputeUnknownMessageSetItemsSize(
-        message_reflection->GetUnknownFields(message));
-  } else {
-    our_size +=
-        ComputeUnknownFieldsSize(message_reflection->GetUnknownFields(message));
-  }
-
-  return our_size;
-}
-
-size_t WireFormat::FieldByteSize(const FieldDescriptor* field,
-                                 const Message& message) {
-  const Reflection* message_reflection = message.GetReflection();
-
-  if (field->is_extension() &&
-      field->containing_type()->options().message_set_wire_format() &&
-      field->cpp_type() == FieldDescriptor::CPPTYPE_MESSAGE &&
-      !field->is_repeated()) {
-    return MessageSetItemByteSize(field, message);
-  }
-
-  size_t count = 0;
-  if (field->is_repeated()) {
-    if (field->is_map()) {
-      const MapFieldBase* map_field =
-          message_reflection->GetMapData(message, field);
-      if (map_field->IsMapValid()) {
-        count = FromIntSize(map_field->size());
-      } else {
-        count = FromIntSize(message_reflection->FieldSize(message, field));
-      }
-    } else {
-      count = FromIntSize(message_reflection->FieldSize(message, field));
-    }
-  } else if (field->containing_type()->options().map_entry()) {
-    // Map entry fields always need to be serialized.
-    count = 1;
-  } else if (message_reflection->HasField(message, field)) {
-    count = 1;
-  }
-
-  const size_t data_size = FieldDataOnlyByteSize(field, message);
-  size_t our_size = data_size;
-  if (field->is_packed()) {
-    if (data_size > 0) {
-      // Packed fields get serialized like a string, not their native type.
-      // Technically this doesn't really matter; the size only changes if it's
-      // a GROUP
-      our_size += TagSize(field->number(), FieldDescriptor::TYPE_STRING);
-      our_size += io::CodedOutputStream::VarintSize32(data_size);
-    }
-  } else {
-    our_size += count * TagSize(field->number(), field->type());
-  }
-  return our_size;
-}
-
-size_t MapKeyDataOnlyByteSize(const FieldDescriptor* field,
-                              const MapKey& value) {
-  GOOGLE_DCHECK_EQ(FieldDescriptor::TypeToCppType(field->type()), value.type());
-  switch (field->type()) {
-    case FieldDescriptor::TYPE_DOUBLE:
-    case FieldDescriptor::TYPE_FLOAT:
-    case FieldDescriptor::TYPE_GROUP:
-    case FieldDescriptor::TYPE_MESSAGE:
-    case FieldDescriptor::TYPE_BYTES:
-    case FieldDescriptor::TYPE_ENUM:
-      GOOGLE_LOG(FATAL) << "Unsupported";
-      return 0;
-#define CASE_TYPE(FieldType, CamelFieldType, CamelCppType) \
-  case FieldDescriptor::TYPE_##FieldType:                  \
-    return WireFormatLite::CamelFieldType##Size(           \
-        value.Get##CamelCppType##Value());
-
-#define FIXED_CASE_TYPE(FieldType, CamelFieldType) \
-  case FieldDescriptor::TYPE_##FieldType:          \
-    return WireFormatLite::k##CamelFieldType##Size;
-
-      CASE_TYPE(INT32, Int32, Int32);
-      CASE_TYPE(INT64, Int64, Int64);
-      CASE_TYPE(UINT32, UInt32, UInt32);
-      CASE_TYPE(UINT64, UInt64, UInt64);
-      CASE_TYPE(SINT32, SInt32, Int32);
-      CASE_TYPE(SINT64, SInt64, Int64);
-      CASE_TYPE(STRING, String, String);
-      FIXED_CASE_TYPE(FIXED32, Fixed32);
-      FIXED_CASE_TYPE(FIXED64, Fixed64);
-      FIXED_CASE_TYPE(SFIXED32, SFixed32);
-      FIXED_CASE_TYPE(SFIXED64, SFixed64);
-      FIXED_CASE_TYPE(BOOL, Bool);
-
-#undef CASE_TYPE
-#undef FIXED_CASE_TYPE
-  }
-  GOOGLE_LOG(FATAL) << "Cannot get here";
-  return 0;
-}
-
-static size_t MapValueRefDataOnlyByteSize(const FieldDescriptor* field,
-                                          const MapValueConstRef& value) {
-  switch (field->type()) {
-    case FieldDescriptor::TYPE_GROUP:
-      GOOGLE_LOG(FATAL) << "Unsupported";
-      return 0;
-#define CASE_TYPE(FieldType, CamelFieldType, CamelCppType) \
-  case FieldDescriptor::TYPE_##FieldType:                  \
-    return WireFormatLite::CamelFieldType##Size(           \
-        value.Get##CamelCppType##Value());
-
-#define FIXED_CASE_TYPE(FieldType, CamelFieldType) \
-  case FieldDescriptor::TYPE_##FieldType:          \
-    return WireFormatLite::k##CamelFieldType##Size;
-
-      CASE_TYPE(INT32, Int32, Int32);
-      CASE_TYPE(INT64, Int64, Int64);
-      CASE_TYPE(UINT32, UInt32, UInt32);
-      CASE_TYPE(UINT64, UInt64, UInt64);
-      CASE_TYPE(SINT32, SInt32, Int32);
-      CASE_TYPE(SINT64, SInt64, Int64);
-      CASE_TYPE(STRING, String, String);
-      CASE_TYPE(BYTES, Bytes, String);
-      CASE_TYPE(ENUM, Enum, Enum);
-      CASE_TYPE(MESSAGE, Message, Message);
-      FIXED_CASE_TYPE(FIXED32, Fixed32);
-      FIXED_CASE_TYPE(FIXED64, Fixed64);
-      FIXED_CASE_TYPE(SFIXED32, SFixed32);
-      FIXED_CASE_TYPE(SFIXED64, SFixed64);
-      FIXED_CASE_TYPE(DOUBLE, Double);
-      FIXED_CASE_TYPE(FLOAT, Float);
-      FIXED_CASE_TYPE(BOOL, Bool);
-
-#undef CASE_TYPE
-#undef FIXED_CASE_TYPE
-  }
-  GOOGLE_LOG(FATAL) << "Cannot get here";
-  return 0;
-}
-
-size_t WireFormat::FieldDataOnlyByteSize(const FieldDescriptor* field,
-                                         const Message& message) {
-  const Reflection* message_reflection = message.GetReflection();
-
-  size_t data_size = 0;
-
-  if (field->is_map()) {
-    const MapFieldBase* map_field =
-        message_reflection->GetMapData(message, field);
-    if (map_field->IsMapValid()) {
-      MapIterator iter(const_cast<Message*>(&message), field);
-      MapIterator end(const_cast<Message*>(&message), field);
-      const FieldDescriptor* key_field = field->message_type()->field(0);
-      const FieldDescriptor* value_field = field->message_type()->field(1);
-      for (map_field->MapBegin(&iter), map_field->MapEnd(&end); iter != end;
-           ++iter) {
-        size_t size = kMapEntryTagByteSize;
-        size += MapKeyDataOnlyByteSize(key_field, iter.GetKey());
-        size += MapValueRefDataOnlyByteSize(value_field, iter.GetValueRef());
-        data_size += WireFormatLite::LengthDelimitedSize(size);
-      }
-      return data_size;
-    }
-  }
-
-  size_t count = 0;
-  if (field->is_repeated()) {
-    count =
-        internal::FromIntSize(message_reflection->FieldSize(message, field));
-  } else if (field->containing_type()->options().map_entry()) {
-    // Map entry fields always need to be serialized.
-    count = 1;
-  } else if (message_reflection->HasField(message, field)) {
-    count = 1;
-  }
-
-  switch (field->type()) {
-#define HANDLE_TYPE(TYPE, TYPE_METHOD, CPPTYPE_METHOD)                      \
-  case FieldDescriptor::TYPE_##TYPE:                                        \
-    if (field->is_repeated()) {                                             \
-      for (size_t j = 0; j < count; j++) {                                  \
-        data_size += WireFormatLite::TYPE_METHOD##Size(                     \
-            message_reflection->GetRepeated##CPPTYPE_METHOD(message, field, \
-                                                            j));            \
-      }                                                                     \
-    } else {                                                                \
-      data_size += WireFormatLite::TYPE_METHOD##Size(                       \
-          message_reflection->Get##CPPTYPE_METHOD(message, field));         \
-    }                                                                       \
-    break;
-
-#define HANDLE_FIXED_TYPE(TYPE, TYPE_METHOD)                   \
-  case FieldDescriptor::TYPE_##TYPE:                           \
-    data_size += count * WireFormatLite::k##TYPE_METHOD##Size; \
-    break;
-
-    HANDLE_TYPE(INT32, Int32, Int32)
-    HANDLE_TYPE(INT64, Int64, Int64)
-    HANDLE_TYPE(SINT32, SInt32, Int32)
-    HANDLE_TYPE(SINT64, SInt64, Int64)
-    HANDLE_TYPE(UINT32, UInt32, UInt32)
-    HANDLE_TYPE(UINT64, UInt64, UInt64)
-
-    HANDLE_FIXED_TYPE(FIXED32, Fixed32)
-    HANDLE_FIXED_TYPE(FIXED64, Fixed64)
-    HANDLE_FIXED_TYPE(SFIXED32, SFixed32)
-    HANDLE_FIXED_TYPE(SFIXED64, SFixed64)
-
-    HANDLE_FIXED_TYPE(FLOAT, Float)
-    HANDLE_FIXED_TYPE(DOUBLE, Double)
-
-    HANDLE_FIXED_TYPE(BOOL, Bool)
-
-    HANDLE_TYPE(GROUP, Group, Message)
-    HANDLE_TYPE(MESSAGE, Message, Message)
-#undef HANDLE_TYPE
-#undef HANDLE_FIXED_TYPE
-
-    case FieldDescriptor::TYPE_ENUM: {
-      if (field->is_repeated()) {
-        for (size_t j = 0; j < count; j++) {
-          data_size += WireFormatLite::EnumSize(
-              message_reflection->GetRepeatedEnum(message, field, j)->number());
-        }
-      } else {
-        data_size += WireFormatLite::EnumSize(
-            message_reflection->GetEnum(message, field)->number());
-      }
-      break;
-    }
-
-    // Handle strings separately so that we can get string references
-    // instead of copying.
-    case FieldDescriptor::TYPE_STRING:
-    case FieldDescriptor::TYPE_BYTES: {
-      for (size_t j = 0; j < count; j++) {
-        std::string scratch;
-        const std::string& value =
-            field->is_repeated()
-                ? message_reflection->GetRepeatedStringReference(message, field,
-                                                                 j, &scratch)
-                : message_reflection->GetStringReference(message, field,
-                                                         &scratch);
-        data_size += WireFormatLite::StringSize(value);
-      }
-      break;
-    }
-  }
-  return data_size;
-}
-
-size_t WireFormat::MessageSetItemByteSize(const FieldDescriptor* field,
-                                          const Message& message) {
-  const Reflection* message_reflection = message.GetReflection();
-
-  size_t our_size = WireFormatLite::kMessageSetItemTagsSize;
-
-  // type_id
-  our_size += io::CodedOutputStream::VarintSize32(field->number());
-
-  // message
-  const Message& sub_message = message_reflection->GetMessage(message, field);
-  size_t message_size = sub_message.ByteSizeLong();
-
-  our_size += io::CodedOutputStream::VarintSize32(message_size);
-  our_size += message_size;
-
-  return our_size;
-}
-
-// Compute the size of the UnknownFieldSet on the wire.
-size_t ComputeUnknownFieldsSize(const InternalMetadata& metadata,
-                                size_t total_size, CachedSize* cached_size) {
-  total_size += WireFormat::ComputeUnknownFieldsSize(
-      metadata.unknown_fields<UnknownFieldSet>(
-          UnknownFieldSet::default_instance));
-  cached_size->Set(ToCachedSize(total_size));
-  return total_size;
-}
-
-}  // namespace internal
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
diff --git a/libs/protobuf/src/google/protobuf/wire_format.h b/libs/protobuf/src/google/protobuf/wire_format.h
deleted file mode 100644
index 1acbf9e..0000000
--- a/libs/protobuf/src/google/protobuf/wire_format.h
+++ /dev/null
@@ -1,414 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//         atenasio@google.com (Chris Atenasio) (ZigZag transform)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-//
-// This header is logically internal, but is made public because it is used
-// from protocol-compiler-generated code, which may reside in other components.
-
-#ifndef GOOGLE_PROTOBUF_WIRE_FORMAT_H__
-#define GOOGLE_PROTOBUF_WIRE_FORMAT_H__
-
-
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/stubs/casts.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/generated_message_util.h>
-#include <google/protobuf/message.h>
-#include <google/protobuf/metadata_lite.h>
-#include <google/protobuf/parse_context.h>
-#include <google/protobuf/wire_format_lite.h>
-
-#ifdef SWIG
-#error "You cannot SWIG proto headers"
-#endif
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-class MapKey;           // map_field.h
-class UnknownFieldSet;  // unknown_field_set.h
-}  // namespace protobuf
-}  // namespace google
-
-namespace google {
-namespace protobuf {
-namespace internal {
-
-// This class is for internal use by the protocol buffer library and by
-// protocol-compiler-generated message classes.  It must not be called
-// directly by clients.
-//
-// This class contains code for implementing the binary protocol buffer
-// wire format via reflection.  The WireFormatLite class implements the
-// non-reflection based routines.
-//
-// This class is really a namespace that contains only static methods
-class PROTOBUF_EXPORT WireFormat {
- public:
-  // Given a field return its WireType
-  static inline WireFormatLite::WireType WireTypeForField(
-      const FieldDescriptor* field);
-
-  // Given a FieldDescriptor::Type return its WireType
-  static inline WireFormatLite::WireType WireTypeForFieldType(
-      FieldDescriptor::Type type);
-
-  // Compute the byte size of a tag.  For groups, this includes both the start
-  // and end tags.
-  static inline size_t TagSize(int field_number, FieldDescriptor::Type type);
-
-  // These procedures can be used to implement the methods of Message which
-  // handle parsing and serialization of the protocol buffer wire format
-  // using only the Reflection interface.  When you ask the protocol
-  // compiler to optimize for code size rather than speed, it will implement
-  // those methods in terms of these procedures.  Of course, these are much
-  // slower than the specialized implementations which the protocol compiler
-  // generates when told to optimize for speed.
-
-  // Read a message in protocol buffer wire format.
-  //
-  // This procedure reads either to the end of the input stream or through
-  // a WIRETYPE_END_GROUP tag ending the message, whichever comes first.
-  // It returns false if the input is invalid.
-  //
-  // Required fields are NOT checked by this method.  You must call
-  // IsInitialized() on the resulting message yourself.
-  static bool ParseAndMergePartial(io::CodedInputStream* input,
-                                   Message* message);
-
-  // This is meant for internal protobuf use (WireFormat is an internal class).
-  // This is the reflective implementation of the _InternalParse functionality.
-  static const char* _InternalParse(Message* msg, const char* ptr,
-                                    internal::ParseContext* ctx);
-
-  // Serialize a message in protocol buffer wire format.
-  //
-  // Any embedded messages within the message must have their correct sizes
-  // cached.  However, the top-level message need not; its size is passed as
-  // a parameter to this procedure.
-  //
-  // These return false iff the underlying stream returns a write error.
-  static void SerializeWithCachedSizes(const Message& message, int size,
-                                       io::CodedOutputStream* output) {
-    int expected_endpoint = output->ByteCount() + size;
-    output->SetCur(
-        _InternalSerialize(message, output->Cur(), output->EpsCopy()));
-    GOOGLE_CHECK_EQ(output->ByteCount(), expected_endpoint)
-        << ": Protocol message serialized to a size different from what was "
-           "originally expected.  Perhaps it was modified by another thread "
-           "during serialization?";
-  }
-  static uint8_t* _InternalSerialize(const Message& message, uint8_t* target,
-                                     io::EpsCopyOutputStream* stream);
-
-  // Implements Message::ByteSize() via reflection.  WARNING:  The result
-  // of this method is *not* cached anywhere.  However, all embedded messages
-  // will have their ByteSize() methods called, so their sizes will be cached.
-  // Therefore, calling this method is sufficient to allow you to call
-  // WireFormat::SerializeWithCachedSizes() on the same object.
-  static size_t ByteSize(const Message& message);
-
-  // -----------------------------------------------------------------
-  // Helpers for dealing with unknown fields
-
-  // Skips a field value of the given WireType.  The input should start
-  // positioned immediately after the tag.  If unknown_fields is non-nullptr,
-  // the contents of the field will be added to it.
-  static bool SkipField(io::CodedInputStream* input, uint32_t tag,
-                        UnknownFieldSet* unknown_fields);
-
-  // Reads and ignores a message from the input.  If unknown_fields is
-  // non-nullptr, the contents will be added to it.
-  static bool SkipMessage(io::CodedInputStream* input,
-                          UnknownFieldSet* unknown_fields);
-
-  // Read a packed enum field. If the is_valid function is not nullptr, values
-  // for which is_valid(value) returns false are appended to
-  // unknown_fields_stream.
-  static bool ReadPackedEnumPreserveUnknowns(io::CodedInputStream* input,
-                                             uint32_t field_number,
-                                             bool (*is_valid)(int),
-                                             UnknownFieldSet* unknown_fields,
-                                             RepeatedField<int>* values);
-
-  // Write the contents of an UnknownFieldSet to the output.
-  static void SerializeUnknownFields(const UnknownFieldSet& unknown_fields,
-                                     io::CodedOutputStream* output) {
-    output->SetCur(InternalSerializeUnknownFieldsToArray(
-        unknown_fields, output->Cur(), output->EpsCopy()));
-  }
-  // Same as above, except writing directly to the provided buffer.
-  // Requires that the buffer have sufficient capacity for
-  // ComputeUnknownFieldsSize(unknown_fields).
-  //
-  // Returns a pointer past the last written byte.
-  static uint8_t* SerializeUnknownFieldsToArray(
-      const UnknownFieldSet& unknown_fields, uint8_t* target) {
-    io::EpsCopyOutputStream stream(
-        target, static_cast<int>(ComputeUnknownFieldsSize(unknown_fields)),
-        io::CodedOutputStream::IsDefaultSerializationDeterministic());
-    return InternalSerializeUnknownFieldsToArray(unknown_fields, target,
-                                                 &stream);
-  }
-  static uint8_t* InternalSerializeUnknownFieldsToArray(
-      const UnknownFieldSet& unknown_fields, uint8_t* target,
-      io::EpsCopyOutputStream* stream);
-
-  // Same thing except for messages that have the message_set_wire_format
-  // option.
-  static void SerializeUnknownMessageSetItems(
-      const UnknownFieldSet& unknown_fields, io::CodedOutputStream* output) {
-    output->SetCur(InternalSerializeUnknownMessageSetItemsToArray(
-        unknown_fields, output->Cur(), output->EpsCopy()));
-  }
-  // Same as above, except writing directly to the provided buffer.
-  // Requires that the buffer have sufficient capacity for
-  // ComputeUnknownMessageSetItemsSize(unknown_fields).
-  //
-  // Returns a pointer past the last written byte.
-  static uint8_t* SerializeUnknownMessageSetItemsToArray(
-      const UnknownFieldSet& unknown_fields, uint8_t* target);
-  static uint8_t* InternalSerializeUnknownMessageSetItemsToArray(
-      const UnknownFieldSet& unknown_fields, uint8_t* target,
-      io::EpsCopyOutputStream* stream);
-
-  // Compute the size of the UnknownFieldSet on the wire.
-  static size_t ComputeUnknownFieldsSize(const UnknownFieldSet& unknown_fields);
-
-  // Same thing except for messages that have the message_set_wire_format
-  // option.
-  static size_t ComputeUnknownMessageSetItemsSize(
-      const UnknownFieldSet& unknown_fields);
-
-  // Helper functions for encoding and decoding tags.  (Inlined below and in
-  // _inl.h)
-  //
-  // This is different from MakeTag(field->number(), field->type()) in the
-  // case of packed repeated fields.
-  static uint32_t MakeTag(const FieldDescriptor* field);
-
-  // Parse a single field.  The input should start out positioned immediately
-  // after the tag.
-  static bool ParseAndMergeField(
-      uint32_t tag,
-      const FieldDescriptor* field,  // May be nullptr for unknown
-      Message* message, io::CodedInputStream* input);
-
-  // Serialize a single field.
-  static void SerializeFieldWithCachedSizes(
-      const FieldDescriptor* field,  // Cannot be nullptr
-      const Message& message, io::CodedOutputStream* output) {
-    output->SetCur(InternalSerializeField(field, message, output->Cur(),
-                                          output->EpsCopy()));
-  }
-  static uint8_t* InternalSerializeField(
-      const FieldDescriptor* field,  // Cannot be nullptr
-      const Message& message, uint8_t* target, io::EpsCopyOutputStream* stream);
-
-  // Compute size of a single field.  If the field is a message type, this
-  // will call ByteSize() for the embedded message, insuring that it caches
-  // its size.
-  static size_t FieldByteSize(const FieldDescriptor* field,  // Can't be nullptr
-                              const Message& message);
-
-  // Parse/serialize a MessageSet::Item group.  Used with messages that use
-  // option message_set_wire_format = true.
-  static bool ParseAndMergeMessageSetItem(io::CodedInputStream* input,
-                                          Message* message);
-  static void SerializeMessageSetItemWithCachedSizes(
-      const FieldDescriptor* field, const Message& message,
-      io::CodedOutputStream* output) {
-    output->SetCur(InternalSerializeMessageSetItem(
-        field, message, output->Cur(), output->EpsCopy()));
-  }
-  static uint8_t* InternalSerializeMessageSetItem(
-      const FieldDescriptor* field, const Message& message, uint8_t* target,
-      io::EpsCopyOutputStream* stream);
-  static size_t MessageSetItemByteSize(const FieldDescriptor* field,
-                                       const Message& message);
-
-  // Computes the byte size of a field, excluding tags. For packed fields, it
-  // only includes the size of the raw data, and not the size of the total
-  // length, but for other length-delimited types, the size of the length is
-  // included.
-  static size_t FieldDataOnlyByteSize(
-      const FieldDescriptor* field,  // Cannot be nullptr
-      const Message& message);
-
-  enum Operation {
-    PARSE = 0,
-    SERIALIZE = 1,
-  };
-
-  // Verifies that a string field is valid UTF8, logging an error if not.
-  // This function will not be called by newly generated protobuf code
-  // but remains present to support existing code.
-  static void VerifyUTF8String(const char* data, int size, Operation op);
-  // The NamedField variant takes a field name in order to produce an
-  // informative error message if verification fails.
-  static void VerifyUTF8StringNamedField(const char* data, int size,
-                                         Operation op, const char* field_name);
-
- private:
-  struct MessageSetParser;
-  // Skip a MessageSet field.
-  static bool SkipMessageSetField(io::CodedInputStream* input,
-                                  uint32_t field_number,
-                                  UnknownFieldSet* unknown_fields);
-
-  // Parse a MessageSet field.
-  static bool ParseAndMergeMessageSetField(uint32_t field_number,
-                                           const FieldDescriptor* field,
-                                           Message* message,
-                                           io::CodedInputStream* input);
-  // Parses the value from the wire that belongs to tag.
-  static const char* _InternalParseAndMergeField(Message* msg, const char* ptr,
-                                                 internal::ParseContext* ctx,
-                                                 uint64_t tag,
-                                                 const Reflection* reflection,
-                                                 const FieldDescriptor* field);
-
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(WireFormat);
-};
-
-// Subclass of FieldSkipper which saves skipped fields to an UnknownFieldSet.
-class PROTOBUF_EXPORT UnknownFieldSetFieldSkipper : public FieldSkipper {
- public:
-  UnknownFieldSetFieldSkipper(UnknownFieldSet* unknown_fields)
-      : unknown_fields_(unknown_fields) {}
-  ~UnknownFieldSetFieldSkipper() override {}
-
-  // implements FieldSkipper -----------------------------------------
-  bool SkipField(io::CodedInputStream* input, uint32_t tag) override;
-  bool SkipMessage(io::CodedInputStream* input) override;
-  void SkipUnknownEnum(int field_number, int value) override;
-
- protected:
-  UnknownFieldSet* unknown_fields_;
-};
-
-// inline methods ====================================================
-
-inline WireFormatLite::WireType WireFormat::WireTypeForField(
-    const FieldDescriptor* field) {
-  if (field->is_packed()) {
-    return WireFormatLite::WIRETYPE_LENGTH_DELIMITED;
-  } else {
-    return WireTypeForFieldType(field->type());
-  }
-}
-
-inline WireFormatLite::WireType WireFormat::WireTypeForFieldType(
-    FieldDescriptor::Type type) {
-  // Some compilers don't like enum -> enum casts, so we implicit_cast to
-  // int first.
-  return WireFormatLite::WireTypeForFieldType(
-      static_cast<WireFormatLite::FieldType>(implicit_cast<int>(type)));
-}
-
-inline uint32_t WireFormat::MakeTag(const FieldDescriptor* field) {
-  return WireFormatLite::MakeTag(field->number(), WireTypeForField(field));
-}
-
-inline size_t WireFormat::TagSize(int field_number,
-                                  FieldDescriptor::Type type) {
-  // Some compilers don't like enum -> enum casts, so we implicit_cast to
-  // int first.
-  return WireFormatLite::TagSize(
-      field_number,
-      static_cast<WireFormatLite::FieldType>(implicit_cast<int>(type)));
-}
-
-inline void WireFormat::VerifyUTF8String(const char* data, int size,
-                                         WireFormat::Operation op) {
-#ifdef GOOGLE_PROTOBUF_UTF8_VALIDATION_ENABLED
-  WireFormatLite::VerifyUtf8String(
-      data, size, static_cast<WireFormatLite::Operation>(op), nullptr);
-#else
-  // Avoid the compiler warning about unused variables.
-  (void)data;
-  (void)size;
-  (void)op;
-#endif
-}
-
-inline void WireFormat::VerifyUTF8StringNamedField(const char* data, int size,
-                                                   WireFormat::Operation op,
-                                                   const char* field_name) {
-#ifdef GOOGLE_PROTOBUF_UTF8_VALIDATION_ENABLED
-  WireFormatLite::VerifyUtf8String(
-      data, size, static_cast<WireFormatLite::Operation>(op), field_name);
-#else
-  // Avoid the compiler warning about unused variables.
-  (void)data;
-  (void)size;
-  (void)op;
-  (void)field_name;
-#endif
-}
-
-
-inline uint8_t* InternalSerializeUnknownMessageSetItemsToArray(
-    const UnknownFieldSet& unknown_fields, uint8_t* target,
-    io::EpsCopyOutputStream* stream) {
-  return WireFormat::InternalSerializeUnknownMessageSetItemsToArray(
-      unknown_fields, target, stream);
-}
-
-inline size_t ComputeUnknownMessageSetItemsSize(
-    const UnknownFieldSet& unknown_fields) {
-  return WireFormat::ComputeUnknownMessageSetItemsSize(unknown_fields);
-}
-
-// Compute the size of the UnknownFieldSet on the wire.
-PROTOBUF_EXPORT
-size_t ComputeUnknownFieldsSize(const InternalMetadata& metadata, size_t size,
-                                CachedSize* cached_size);
-
-size_t MapKeyDataOnlyByteSize(const FieldDescriptor* field,
-                              const MapKey& value);
-
-uint8_t* SerializeMapKeyWithCachedSizes(const FieldDescriptor* field,
-                                        const MapKey& value, uint8_t* target,
-                                        io::EpsCopyOutputStream* stream);
-}  // namespace internal
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
-
-#endif  // GOOGLE_PROTOBUF_WIRE_FORMAT_H__
diff --git a/libs/protobuf/src/google/protobuf/wire_format_lite.cc b/libs/protobuf/src/google/protobuf/wire_format_lite.cc
deleted file mode 100644
index 5ab1ca1..0000000
--- a/libs/protobuf/src/google/protobuf/wire_format_lite.cc
+++ /dev/null
@@ -1,818 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-
-#include <google/protobuf/wire_format_lite.h>
-
-#include <limits>
-#include <stack>
-#include <string>
-#include <vector>
-
-#include <google/protobuf/stubs/logging.h>
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/io/zero_copy_stream.h>
-#include <google/protobuf/io/zero_copy_stream_impl_lite.h>
-#include <google/protobuf/stubs/stringprintf.h>
-
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-namespace internal {
-
-#if !defined(_MSC_VER) || (_MSC_VER >= 1900 && _MSC_VER < 1912)
-// Old version of MSVC doesn't like definitions of inline constants, GCC
-// requires them.
-const int WireFormatLite::kMessageSetItemStartTag;
-const int WireFormatLite::kMessageSetItemEndTag;
-const int WireFormatLite::kMessageSetTypeIdTag;
-const int WireFormatLite::kMessageSetMessageTag;
-
-#endif
-
-// IBM xlC requires prefixing constants with WireFormatLite::
-const size_t WireFormatLite::kMessageSetItemTagsSize =
-    io::CodedOutputStream::StaticVarintSize32<
-        WireFormatLite::kMessageSetItemStartTag>::value +
-    io::CodedOutputStream::StaticVarintSize32<
-        WireFormatLite::kMessageSetItemEndTag>::value +
-    io::CodedOutputStream::StaticVarintSize32<
-        WireFormatLite::kMessageSetTypeIdTag>::value +
-    io::CodedOutputStream::StaticVarintSize32<
-        WireFormatLite::kMessageSetMessageTag>::value;
-
-const WireFormatLite::CppType
-    WireFormatLite::kFieldTypeToCppTypeMap[MAX_FIELD_TYPE + 1] = {
-        static_cast<CppType>(0),  // 0 is reserved for errors
-
-        CPPTYPE_DOUBLE,   // TYPE_DOUBLE
-        CPPTYPE_FLOAT,    // TYPE_FLOAT
-        CPPTYPE_INT64,    // TYPE_INT64
-        CPPTYPE_UINT64,   // TYPE_UINT64
-        CPPTYPE_INT32,    // TYPE_INT32
-        CPPTYPE_UINT64,   // TYPE_FIXED64
-        CPPTYPE_UINT32,   // TYPE_FIXED32
-        CPPTYPE_BOOL,     // TYPE_BOOL
-        CPPTYPE_STRING,   // TYPE_STRING
-        CPPTYPE_MESSAGE,  // TYPE_GROUP
-        CPPTYPE_MESSAGE,  // TYPE_MESSAGE
-        CPPTYPE_STRING,   // TYPE_BYTES
-        CPPTYPE_UINT32,   // TYPE_UINT32
-        CPPTYPE_ENUM,     // TYPE_ENUM
-        CPPTYPE_INT32,    // TYPE_SFIXED32
-        CPPTYPE_INT64,    // TYPE_SFIXED64
-        CPPTYPE_INT32,    // TYPE_SINT32
-        CPPTYPE_INT64,    // TYPE_SINT64
-};
-
-const WireFormatLite::WireType
-    WireFormatLite::kWireTypeForFieldType[MAX_FIELD_TYPE + 1] = {
-        static_cast<WireFormatLite::WireType>(-1),  // invalid
-        WireFormatLite::WIRETYPE_FIXED64,           // TYPE_DOUBLE
-        WireFormatLite::WIRETYPE_FIXED32,           // TYPE_FLOAT
-        WireFormatLite::WIRETYPE_VARINT,            // TYPE_INT64
-        WireFormatLite::WIRETYPE_VARINT,            // TYPE_UINT64
-        WireFormatLite::WIRETYPE_VARINT,            // TYPE_INT32
-        WireFormatLite::WIRETYPE_FIXED64,           // TYPE_FIXED64
-        WireFormatLite::WIRETYPE_FIXED32,           // TYPE_FIXED32
-        WireFormatLite::WIRETYPE_VARINT,            // TYPE_BOOL
-        WireFormatLite::WIRETYPE_LENGTH_DELIMITED,  // TYPE_STRING
-        WireFormatLite::WIRETYPE_START_GROUP,       // TYPE_GROUP
-        WireFormatLite::WIRETYPE_LENGTH_DELIMITED,  // TYPE_MESSAGE
-        WireFormatLite::WIRETYPE_LENGTH_DELIMITED,  // TYPE_BYTES
-        WireFormatLite::WIRETYPE_VARINT,            // TYPE_UINT32
-        WireFormatLite::WIRETYPE_VARINT,            // TYPE_ENUM
-        WireFormatLite::WIRETYPE_FIXED32,           // TYPE_SFIXED32
-        WireFormatLite::WIRETYPE_FIXED64,           // TYPE_SFIXED64
-        WireFormatLite::WIRETYPE_VARINT,            // TYPE_SINT32
-        WireFormatLite::WIRETYPE_VARINT,            // TYPE_SINT64
-};
-
-bool WireFormatLite::SkipField(io::CodedInputStream* input, uint32_t tag) {
-  // Field number 0 is illegal.
-  if (WireFormatLite::GetTagFieldNumber(tag) == 0) return false;
-  switch (WireFormatLite::GetTagWireType(tag)) {
-    case WireFormatLite::WIRETYPE_VARINT: {
-      uint64_t value;
-      if (!input->ReadVarint64(&value)) return false;
-      return true;
-    }
-    case WireFormatLite::WIRETYPE_FIXED64: {
-      uint64_t value;
-      if (!input->ReadLittleEndian64(&value)) return false;
-      return true;
-    }
-    case WireFormatLite::WIRETYPE_LENGTH_DELIMITED: {
-      uint32_t length;
-      if (!input->ReadVarint32(&length)) return false;
-      if (!input->Skip(length)) return false;
-      return true;
-    }
-    case WireFormatLite::WIRETYPE_START_GROUP: {
-      if (!input->IncrementRecursionDepth()) return false;
-      if (!SkipMessage(input)) return false;
-      input->DecrementRecursionDepth();
-      // Check that the ending tag matched the starting tag.
-      if (!input->LastTagWas(
-              WireFormatLite::MakeTag(WireFormatLite::GetTagFieldNumber(tag),
-                                      WireFormatLite::WIRETYPE_END_GROUP))) {
-        return false;
-      }
-      return true;
-    }
-    case WireFormatLite::WIRETYPE_END_GROUP: {
-      return false;
-    }
-    case WireFormatLite::WIRETYPE_FIXED32: {
-      uint32_t value;
-      if (!input->ReadLittleEndian32(&value)) return false;
-      return true;
-    }
-    default: {
-      return false;
-    }
-  }
-}
-
-bool WireFormatLite::SkipField(io::CodedInputStream* input, uint32_t tag,
-                               io::CodedOutputStream* output) {
-  // Field number 0 is illegal.
-  if (WireFormatLite::GetTagFieldNumber(tag) == 0) return false;
-  switch (WireFormatLite::GetTagWireType(tag)) {
-    case WireFormatLite::WIRETYPE_VARINT: {
-      uint64_t value;
-      if (!input->ReadVarint64(&value)) return false;
-      output->WriteVarint32(tag);
-      output->WriteVarint64(value);
-      return true;
-    }
-    case WireFormatLite::WIRETYPE_FIXED64: {
-      uint64_t value;
-      if (!input->ReadLittleEndian64(&value)) return false;
-      output->WriteVarint32(tag);
-      output->WriteLittleEndian64(value);
-      return true;
-    }
-    case WireFormatLite::WIRETYPE_LENGTH_DELIMITED: {
-      uint32_t length;
-      if (!input->ReadVarint32(&length)) return false;
-      output->WriteVarint32(tag);
-      output->WriteVarint32(length);
-      // TODO(mkilavuz): Provide API to prevent extra string copying.
-      std::string temp;
-      if (!input->ReadString(&temp, length)) return false;
-      output->WriteString(temp);
-      return true;
-    }
-    case WireFormatLite::WIRETYPE_START_GROUP: {
-      output->WriteVarint32(tag);
-      if (!input->IncrementRecursionDepth()) return false;
-      if (!SkipMessage(input, output)) return false;
-      input->DecrementRecursionDepth();
-      // Check that the ending tag matched the starting tag.
-      if (!input->LastTagWas(
-              WireFormatLite::MakeTag(WireFormatLite::GetTagFieldNumber(tag),
-                                      WireFormatLite::WIRETYPE_END_GROUP))) {
-        return false;
-      }
-      return true;
-    }
-    case WireFormatLite::WIRETYPE_END_GROUP: {
-      return false;
-    }
-    case WireFormatLite::WIRETYPE_FIXED32: {
-      uint32_t value;
-      if (!input->ReadLittleEndian32(&value)) return false;
-      output->WriteVarint32(tag);
-      output->WriteLittleEndian32(value);
-      return true;
-    }
-    default: {
-      return false;
-    }
-  }
-}
-
-bool WireFormatLite::SkipMessage(io::CodedInputStream* input) {
-  while (true) {
-    uint32_t tag = input->ReadTag();
-    if (tag == 0) {
-      // End of input.  This is a valid place to end, so return true.
-      return true;
-    }
-
-    WireFormatLite::WireType wire_type = WireFormatLite::GetTagWireType(tag);
-
-    if (wire_type == WireFormatLite::WIRETYPE_END_GROUP) {
-      // Must be the end of the message.
-      return true;
-    }
-
-    if (!SkipField(input, tag)) return false;
-  }
-}
-
-bool WireFormatLite::SkipMessage(io::CodedInputStream* input,
-                                 io::CodedOutputStream* output) {
-  while (true) {
-    uint32_t tag = input->ReadTag();
-    if (tag == 0) {
-      // End of input.  This is a valid place to end, so return true.
-      return true;
-    }
-
-    WireFormatLite::WireType wire_type = WireFormatLite::GetTagWireType(tag);
-
-    if (wire_type == WireFormatLite::WIRETYPE_END_GROUP) {
-      output->WriteVarint32(tag);
-      // Must be the end of the message.
-      return true;
-    }
-
-    if (!SkipField(input, tag, output)) return false;
-  }
-}
-
-bool FieldSkipper::SkipField(io::CodedInputStream* input, uint32_t tag) {
-  return WireFormatLite::SkipField(input, tag);
-}
-
-bool FieldSkipper::SkipMessage(io::CodedInputStream* input) {
-  return WireFormatLite::SkipMessage(input);
-}
-
-void FieldSkipper::SkipUnknownEnum(int /* field_number */, int /* value */) {
-  // Nothing.
-}
-
-bool CodedOutputStreamFieldSkipper::SkipField(io::CodedInputStream* input,
-                                              uint32_t tag) {
-  return WireFormatLite::SkipField(input, tag, unknown_fields_);
-}
-
-bool CodedOutputStreamFieldSkipper::SkipMessage(io::CodedInputStream* input) {
-  return WireFormatLite::SkipMessage(input, unknown_fields_);
-}
-
-void CodedOutputStreamFieldSkipper::SkipUnknownEnum(int field_number,
-                                                    int value) {
-  unknown_fields_->WriteVarint32(field_number);
-  unknown_fields_->WriteVarint64(value);
-}
-
-bool WireFormatLite::ReadPackedEnumPreserveUnknowns(
-    io::CodedInputStream* input, int field_number, bool (*is_valid)(int),
-    io::CodedOutputStream* unknown_fields_stream, RepeatedField<int>* values) {
-  uint32_t length;
-  if (!input->ReadVarint32(&length)) return false;
-  io::CodedInputStream::Limit limit = input->PushLimit(length);
-  while (input->BytesUntilLimit() > 0) {
-    int value;
-    if (!ReadPrimitive<int, WireFormatLite::TYPE_ENUM>(input, &value)) {
-      return false;
-    }
-    if (is_valid == nullptr || is_valid(value)) {
-      values->Add(value);
-    } else {
-      uint32_t tag = WireFormatLite::MakeTag(field_number,
-                                             WireFormatLite::WIRETYPE_VARINT);
-      unknown_fields_stream->WriteVarint32(tag);
-      unknown_fields_stream->WriteVarint32(value);
-    }
-  }
-  input->PopLimit(limit);
-  return true;
-}
-
-#if !defined(PROTOBUF_LITTLE_ENDIAN)
-
-namespace {
-void EncodeFixedSizeValue(float v, uint8_t* dest) {
-  WireFormatLite::WriteFloatNoTagToArray(v, dest);
-}
-
-void EncodeFixedSizeValue(double v, uint8_t* dest) {
-  WireFormatLite::WriteDoubleNoTagToArray(v, dest);
-}
-
-void EncodeFixedSizeValue(uint32_t v, uint8_t* dest) {
-  WireFormatLite::WriteFixed32NoTagToArray(v, dest);
-}
-
-void EncodeFixedSizeValue(uint64_t v, uint8_t* dest) {
-  WireFormatLite::WriteFixed64NoTagToArray(v, dest);
-}
-
-void EncodeFixedSizeValue(int32_t v, uint8_t* dest) {
-  WireFormatLite::WriteSFixed32NoTagToArray(v, dest);
-}
-
-void EncodeFixedSizeValue(int64_t v, uint8_t* dest) {
-  WireFormatLite::WriteSFixed64NoTagToArray(v, dest);
-}
-
-void EncodeFixedSizeValue(bool v, uint8_t* dest) {
-  WireFormatLite::WriteBoolNoTagToArray(v, dest);
-}
-}  // anonymous namespace
-
-#endif  // !defined(PROTOBUF_LITTLE_ENDIAN)
-
-template <typename CType>
-static void WriteArray(const CType* a, int n, io::CodedOutputStream* output) {
-#if defined(PROTOBUF_LITTLE_ENDIAN)
-  output->WriteRaw(reinterpret_cast<const char*>(a), n * sizeof(a[0]));
-#else
-  const int kAtATime = 128;
-  uint8_t buf[sizeof(CType) * kAtATime];
-  for (int i = 0; i < n; i += kAtATime) {
-    int to_do = std::min(kAtATime, n - i);
-    uint8_t* ptr = buf;
-    for (int j = 0; j < to_do; j++) {
-      EncodeFixedSizeValue(a[i + j], ptr);
-      ptr += sizeof(a[0]);
-    }
-    output->WriteRaw(buf, to_do * sizeof(a[0]));
-  }
-#endif
-}
-
-void WireFormatLite::WriteFloatArray(const float* a, int n,
-                                     io::CodedOutputStream* output) {
-  WriteArray<float>(a, n, output);
-}
-
-void WireFormatLite::WriteDoubleArray(const double* a, int n,
-                                      io::CodedOutputStream* output) {
-  WriteArray<double>(a, n, output);
-}
-
-void WireFormatLite::WriteFixed32Array(const uint32_t* a, int n,
-                                       io::CodedOutputStream* output) {
-  WriteArray<uint32_t>(a, n, output);
-}
-
-void WireFormatLite::WriteFixed64Array(const uint64_t* a, int n,
-                                       io::CodedOutputStream* output) {
-  WriteArray<uint64_t>(a, n, output);
-}
-
-void WireFormatLite::WriteSFixed32Array(const int32_t* a, int n,
-                                        io::CodedOutputStream* output) {
-  WriteArray<int32_t>(a, n, output);
-}
-
-void WireFormatLite::WriteSFixed64Array(const int64_t* a, int n,
-                                        io::CodedOutputStream* output) {
-  WriteArray<int64_t>(a, n, output);
-}
-
-void WireFormatLite::WriteBoolArray(const bool* a, int n,
-                                    io::CodedOutputStream* output) {
-  WriteArray<bool>(a, n, output);
-}
-
-void WireFormatLite::WriteInt32(int field_number, int32_t value,
-                                io::CodedOutputStream* output) {
-  WriteTag(field_number, WIRETYPE_VARINT, output);
-  WriteInt32NoTag(value, output);
-}
-void WireFormatLite::WriteInt64(int field_number, int64_t value,
-                                io::CodedOutputStream* output) {
-  WriteTag(field_number, WIRETYPE_VARINT, output);
-  WriteInt64NoTag(value, output);
-}
-void WireFormatLite::WriteUInt32(int field_number, uint32_t value,
-                                 io::CodedOutputStream* output) {
-  WriteTag(field_number, WIRETYPE_VARINT, output);
-  WriteUInt32NoTag(value, output);
-}
-void WireFormatLite::WriteUInt64(int field_number, uint64_t value,
-                                 io::CodedOutputStream* output) {
-  WriteTag(field_number, WIRETYPE_VARINT, output);
-  WriteUInt64NoTag(value, output);
-}
-void WireFormatLite::WriteSInt32(int field_number, int32_t value,
-                                 io::CodedOutputStream* output) {
-  WriteTag(field_number, WIRETYPE_VARINT, output);
-  WriteSInt32NoTag(value, output);
-}
-void WireFormatLite::WriteSInt64(int field_number, int64_t value,
-                                 io::CodedOutputStream* output) {
-  WriteTag(field_number, WIRETYPE_VARINT, output);
-  WriteSInt64NoTag(value, output);
-}
-void WireFormatLite::WriteFixed32(int field_number, uint32_t value,
-                                  io::CodedOutputStream* output) {
-  WriteTag(field_number, WIRETYPE_FIXED32, output);
-  WriteFixed32NoTag(value, output);
-}
-void WireFormatLite::WriteFixed64(int field_number, uint64_t value,
-                                  io::CodedOutputStream* output) {
-  WriteTag(field_number, WIRETYPE_FIXED64, output);
-  WriteFixed64NoTag(value, output);
-}
-void WireFormatLite::WriteSFixed32(int field_number, int32_t value,
-                                   io::CodedOutputStream* output) {
-  WriteTag(field_number, WIRETYPE_FIXED32, output);
-  WriteSFixed32NoTag(value, output);
-}
-void WireFormatLite::WriteSFixed64(int field_number, int64_t value,
-                                   io::CodedOutputStream* output) {
-  WriteTag(field_number, WIRETYPE_FIXED64, output);
-  WriteSFixed64NoTag(value, output);
-}
-void WireFormatLite::WriteFloat(int field_number, float value,
-                                io::CodedOutputStream* output) {
-  WriteTag(field_number, WIRETYPE_FIXED32, output);
-  WriteFloatNoTag(value, output);
-}
-void WireFormatLite::WriteDouble(int field_number, double value,
-                                 io::CodedOutputStream* output) {
-  WriteTag(field_number, WIRETYPE_FIXED64, output);
-  WriteDoubleNoTag(value, output);
-}
-void WireFormatLite::WriteBool(int field_number, bool value,
-                               io::CodedOutputStream* output) {
-  WriteTag(field_number, WIRETYPE_VARINT, output);
-  WriteBoolNoTag(value, output);
-}
-void WireFormatLite::WriteEnum(int field_number, int value,
-                               io::CodedOutputStream* output) {
-  WriteTag(field_number, WIRETYPE_VARINT, output);
-  WriteEnumNoTag(value, output);
-}
-
-constexpr size_t kInt32MaxSize = std::numeric_limits<int32_t>::max();
-
-void WireFormatLite::WriteString(int field_number, const std::string& value,
-                                 io::CodedOutputStream* output) {
-  // String is for UTF-8 text only
-  WriteTag(field_number, WIRETYPE_LENGTH_DELIMITED, output);
-  GOOGLE_CHECK_LE(value.size(), kInt32MaxSize);
-  output->WriteVarint32(value.size());
-  output->WriteString(value);
-}
-void WireFormatLite::WriteStringMaybeAliased(int field_number,
-                                             const std::string& value,
-                                             io::CodedOutputStream* output) {
-  // String is for UTF-8 text only
-  WriteTag(field_number, WIRETYPE_LENGTH_DELIMITED, output);
-  GOOGLE_CHECK_LE(value.size(), kInt32MaxSize);
-  output->WriteVarint32(value.size());
-  output->WriteRawMaybeAliased(value.data(), value.size());
-}
-void WireFormatLite::WriteBytes(int field_number, const std::string& value,
-                                io::CodedOutputStream* output) {
-  WriteTag(field_number, WIRETYPE_LENGTH_DELIMITED, output);
-  GOOGLE_CHECK_LE(value.size(), kInt32MaxSize);
-  output->WriteVarint32(value.size());
-  output->WriteString(value);
-}
-void WireFormatLite::WriteBytesMaybeAliased(int field_number,
-                                            const std::string& value,
-                                            io::CodedOutputStream* output) {
-  WriteTag(field_number, WIRETYPE_LENGTH_DELIMITED, output);
-  GOOGLE_CHECK_LE(value.size(), kInt32MaxSize);
-  output->WriteVarint32(value.size());
-  output->WriteRawMaybeAliased(value.data(), value.size());
-}
-
-
-void WireFormatLite::WriteGroup(int field_number, const MessageLite& value,
-                                io::CodedOutputStream* output) {
-  WriteTag(field_number, WIRETYPE_START_GROUP, output);
-  value.SerializeWithCachedSizes(output);
-  WriteTag(field_number, WIRETYPE_END_GROUP, output);
-}
-
-void WireFormatLite::WriteMessage(int field_number, const MessageLite& value,
-                                  io::CodedOutputStream* output) {
-  WriteTag(field_number, WIRETYPE_LENGTH_DELIMITED, output);
-  const int size = value.GetCachedSize();
-  output->WriteVarint32(size);
-  value.SerializeWithCachedSizes(output);
-}
-
-uint8_t* WireFormatLite::InternalWriteGroup(int field_number,
-                                            const MessageLite& value,
-                                            uint8_t* target,
-                                            io::EpsCopyOutputStream* stream) {
-  target = stream->EnsureSpace(target);
-  target = WriteTagToArray(field_number, WIRETYPE_START_GROUP, target);
-  target = value._InternalSerialize(target, stream);
-  target = stream->EnsureSpace(target);
-  return WriteTagToArray(field_number, WIRETYPE_END_GROUP, target);
-}
-
-uint8_t* WireFormatLite::InternalWriteMessage(int field_number,
-                                              const MessageLite& value,
-                                              int cached_size, uint8_t* target,
-                                              io::EpsCopyOutputStream* stream) {
-  target = stream->EnsureSpace(target);
-  target = WriteTagToArray(field_number, WIRETYPE_LENGTH_DELIMITED, target);
-  target = io::CodedOutputStream::WriteVarint32ToArray(
-      static_cast<uint32_t>(cached_size), target);
-  return value._InternalSerialize(target, stream);
-}
-
-void WireFormatLite::WriteSubMessageMaybeToArray(
-    int /*size*/, const MessageLite& value, io::CodedOutputStream* output) {
-  output->SetCur(value._InternalSerialize(output->Cur(), output->EpsCopy()));
-}
-
-void WireFormatLite::WriteGroupMaybeToArray(int field_number,
-                                            const MessageLite& value,
-                                            io::CodedOutputStream* output) {
-  WriteTag(field_number, WIRETYPE_START_GROUP, output);
-  const int size = value.GetCachedSize();
-  WriteSubMessageMaybeToArray(size, value, output);
-  WriteTag(field_number, WIRETYPE_END_GROUP, output);
-}
-
-void WireFormatLite::WriteMessageMaybeToArray(int field_number,
-                                              const MessageLite& value,
-                                              io::CodedOutputStream* output) {
-  WriteTag(field_number, WIRETYPE_LENGTH_DELIMITED, output);
-  const int size = value.GetCachedSize();
-  output->WriteVarint32(size);
-  WriteSubMessageMaybeToArray(size, value, output);
-}
-
-PROTOBUF_NDEBUG_INLINE static bool ReadBytesToString(
-    io::CodedInputStream* input, std::string* value);
-inline static bool ReadBytesToString(io::CodedInputStream* input,
-                                     std::string* value) {
-  uint32_t length;
-  return input->ReadVarint32(&length) && input->ReadString(value, length);
-}
-
-bool WireFormatLite::ReadBytes(io::CodedInputStream* input,
-                               std::string* value) {
-  return ReadBytesToString(input, value);
-}
-
-bool WireFormatLite::ReadBytes(io::CodedInputStream* input, std::string** p) {
-  if (*p == &GetEmptyStringAlreadyInited()) {
-    *p = new std::string();
-  }
-  return ReadBytesToString(input, *p);
-}
-
-void PrintUTF8ErrorLog(StringPiece message_name,
-                       StringPiece field_name, const char* operation_str,
-                       bool emit_stacktrace) {
-  std::string stacktrace;
-  (void)emit_stacktrace;  // Parameter is used by Google-internal code.
-  std::string quoted_field_name = "";
-  if (!field_name.empty()) {
-    if (!message_name.empty()) {
-      quoted_field_name =
-          StrCat(" '", message_name, ".", field_name, "'");
-    } else {
-      quoted_field_name = StrCat(" '", field_name, "'");
-    }
-  }
-  std::string error_message =
-      StrCat("String field", quoted_field_name,
-                   " contains invalid UTF-8 data "
-                   "when ",
-                   operation_str,
-                   " a protocol buffer. Use the 'bytes' type if you intend to "
-                   "send raw bytes. ",
-                   stacktrace);
-  GOOGLE_LOG(ERROR) << error_message;
-}
-
-bool WireFormatLite::VerifyUtf8String(const char* data, int size, Operation op,
-                                      const char* field_name) {
-  if (!IsStructurallyValidUTF8(data, size)) {
-    const char* operation_str = nullptr;
-    switch (op) {
-      case PARSE:
-        operation_str = "parsing";
-        break;
-      case SERIALIZE:
-        operation_str = "serializing";
-        break;
-        // no default case: have the compiler warn if a case is not covered.
-    }
-    PrintUTF8ErrorLog("", field_name, operation_str, false);
-    return false;
-  }
-  return true;
-}
-
-// this code is deliberately written such that clang makes it into really
-// efficient SSE code.
-template <bool ZigZag, bool SignExtended, typename T>
-static size_t VarintSize(const T* data, const int n) {
-  static_assert(sizeof(T) == 4, "This routine only works for 32 bit integers");
-  // is_unsigned<T> => !ZigZag
-  static_assert(
-      (std::is_unsigned<T>::value ^ ZigZag) || std::is_signed<T>::value,
-      "Cannot ZigZag encode unsigned types");
-  // is_unsigned<T> => !SignExtended
-  static_assert(
-      (std::is_unsigned<T>::value ^ SignExtended) || std::is_signed<T>::value,
-      "Cannot SignExtended unsigned types");
-  static_assert(!(SignExtended && ZigZag),
-                "Cannot SignExtended and ZigZag on the same type");
-  uint32_t sum = n;
-  uint32_t msb_sum = 0;
-  for (int i = 0; i < n; i++) {
-    uint32_t x = data[i];
-    if (ZigZag) {
-      x = WireFormatLite::ZigZagEncode32(x);
-    } else if (SignExtended) {
-      msb_sum += x >> 31;
-    }
-    // clang is so smart that it produces optimal SSE sequence unrolling
-    // the loop 8 ints at a time. With a sequence of 4
-    // cmpres = cmpgt x, sizeclass  ( -1 or 0)
-    // sum = sum - cmpres
-    if (x > 0x7F) sum++;
-    if (x > 0x3FFF) sum++;
-    if (x > 0x1FFFFF) sum++;
-    if (x > 0xFFFFFFF) sum++;
-  }
-  if (SignExtended) sum += msb_sum * 5;
-  return sum;
-}
-
-template <bool ZigZag, typename T>
-static size_t VarintSize64(const T* data, const int n) {
-  static_assert(sizeof(T) == 8, "This routine only works for 64 bit integers");
-  // is_unsigned<T> => !ZigZag
-  static_assert(!ZigZag || !std::is_unsigned<T>::value,
-                "Cannot ZigZag encode unsigned types");
-  uint64_t sum = n;
-  for (int i = 0; i < n; i++) {
-    uint64_t x = data[i];
-    if (ZigZag) {
-      x = WireFormatLite::ZigZagEncode64(x);
-    }
-    // First step is a binary search, we can't branch in sse so we use the
-    // result of the compare to adjust sum and appropriately. This code is
-    // written to make clang recognize the vectorization.
-    uint64_t tmp = x >= (static_cast<uint64_t>(1) << 35) ? -1 : 0;
-    sum += 5 & tmp;
-    x >>= 35 & tmp;
-    if (x > 0x7F) sum++;
-    if (x > 0x3FFF) sum++;
-    if (x > 0x1FFFFF) sum++;
-    if (x > 0xFFFFFFF) sum++;
-  }
-  return sum;
-}
-
-// GCC does not recognize the vectorization opportunity
-// and other platforms are untested, in those cases using the optimized
-// varint size routine for each element is faster.
-// Hence we enable it only for clang
-#if defined(__SSE__) && defined(__clang__)
-size_t WireFormatLite::Int32Size(const RepeatedField<int32_t>& value) {
-  return VarintSize<false, true>(value.data(), value.size());
-}
-
-size_t WireFormatLite::UInt32Size(const RepeatedField<uint32_t>& value) {
-  return VarintSize<false, false>(value.data(), value.size());
-}
-
-size_t WireFormatLite::SInt32Size(const RepeatedField<int32_t>& value) {
-  return VarintSize<true, false>(value.data(), value.size());
-}
-
-size_t WireFormatLite::EnumSize(const RepeatedField<int>& value) {
-  // On ILP64, sizeof(int) == 8, which would require a different template.
-  return VarintSize<false, true>(value.data(), value.size());
-}
-
-#else  // !(defined(__SSE4_1__) && defined(__clang__))
-
-size_t WireFormatLite::Int32Size(const RepeatedField<int32_t>& value) {
-  size_t out = 0;
-  const int n = value.size();
-  for (int i = 0; i < n; i++) {
-    out += Int32Size(value.Get(i));
-  }
-  return out;
-}
-
-size_t WireFormatLite::UInt32Size(const RepeatedField<uint32_t>& value) {
-  size_t out = 0;
-  const int n = value.size();
-  for (int i = 0; i < n; i++) {
-    out += UInt32Size(value.Get(i));
-  }
-  return out;
-}
-
-size_t WireFormatLite::SInt32Size(const RepeatedField<int32_t>& value) {
-  size_t out = 0;
-  const int n = value.size();
-  for (int i = 0; i < n; i++) {
-    out += SInt32Size(value.Get(i));
-  }
-  return out;
-}
-
-size_t WireFormatLite::EnumSize(const RepeatedField<int>& value) {
-  size_t out = 0;
-  const int n = value.size();
-  for (int i = 0; i < n; i++) {
-    out += EnumSize(value.Get(i));
-  }
-  return out;
-}
-
-#endif
-
-// Micro benchmarks show that the SSE improved loop only starts beating
-// the normal loop on Haswell platforms and then only for >32 ints. We
-// disable this for now. Some specialized users might find it worthwhile to
-// enable this.
-#define USE_SSE_FOR_64_BIT_INTEGER_ARRAYS 0
-#if USE_SSE_FOR_64_BIT_INTEGER_ARRAYS
-size_t WireFormatLite::Int64Size(const RepeatedField<int64_t>& value) {
-  return VarintSize64<false>(value.data(), value.size());
-}
-
-size_t WireFormatLite::UInt64Size(const RepeatedField<uint64_t>& value) {
-  return VarintSize64<false>(value.data(), value.size());
-}
-
-size_t WireFormatLite::SInt64Size(const RepeatedField<int64_t>& value) {
-  return VarintSize64<true>(value.data(), value.size());
-}
-
-#else
-
-size_t WireFormatLite::Int64Size(const RepeatedField<int64_t>& value) {
-  size_t out = 0;
-  const int n = value.size();
-  for (int i = 0; i < n; i++) {
-    out += Int64Size(value.Get(i));
-  }
-  return out;
-}
-
-size_t WireFormatLite::UInt64Size(const RepeatedField<uint64_t>& value) {
-  size_t out = 0;
-  const int n = value.size();
-  for (int i = 0; i < n; i++) {
-    out += UInt64Size(value.Get(i));
-  }
-  return out;
-}
-
-size_t WireFormatLite::SInt64Size(const RepeatedField<int64_t>& value) {
-  size_t out = 0;
-  const int n = value.size();
-  for (int i = 0; i < n; i++) {
-    out += SInt64Size(value.Get(i));
-  }
-  return out;
-}
-
-#endif
-
-}  // namespace internal
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
diff --git a/libs/protobuf/src/google/protobuf/wire_format_lite.h b/libs/protobuf/src/google/protobuf/wire_format_lite.h
deleted file mode 100644
index 80d3961..0000000
--- a/libs/protobuf/src/google/protobuf/wire_format_lite.h
+++ /dev/null
@@ -1,1908 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//         atenasio@google.com (Chris Atenasio) (ZigZag transform)
-//         wink@google.com (Wink Saville) (refactored from wire_format.h)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-//
-// This header is logically internal, but is made public because it is used
-// from protocol-compiler-generated code, which may reside in other components.
-
-#ifndef GOOGLE_PROTOBUF_WIRE_FORMAT_LITE_H__
-#define GOOGLE_PROTOBUF_WIRE_FORMAT_LITE_H__
-
-
-#include <limits>
-#include <string>
-
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/stubs/logging.h>
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/port.h>
-#include <google/protobuf/stubs/casts.h>
-#include <google/protobuf/arenastring.h>
-#include <google/protobuf/message_lite.h>
-#include <google/protobuf/repeated_field.h>
-
-// Do UTF-8 validation on string type in Debug build only
-#ifndef NDEBUG
-#define GOOGLE_PROTOBUF_UTF8_VALIDATION_ENABLED
-#endif
-
-// Avoid conflict with iOS where <ConditionalMacros.h> #defines TYPE_BOOL.
-//
-// If some one needs the macro TYPE_BOOL in a file that includes this header,
-// it's possible to bring it back using push/pop_macro as follows.
-//
-// #pragma push_macro("TYPE_BOOL")
-// #include this header and/or all headers that need the macro to be undefined.
-// #pragma pop_macro("TYPE_BOOL")
-#undef TYPE_BOOL
-
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-namespace internal {
-
-// This class is for internal use by the protocol buffer library and by
-// protocol-compiler-generated message classes.  It must not be called
-// directly by clients.
-//
-// This class contains helpers for implementing the binary protocol buffer
-// wire format without the need for reflection. Use WireFormat when using
-// reflection.
-//
-// This class is really a namespace that contains only static methods.
-class PROTOBUF_EXPORT WireFormatLite {
- public:
-  // -----------------------------------------------------------------
-  // Helper constants and functions related to the format.  These are
-  // mostly meant for internal and generated code to use.
-
-  // The wire format is composed of a sequence of tag/value pairs, each
-  // of which contains the value of one field (or one element of a repeated
-  // field).  Each tag is encoded as a varint.  The lower bits of the tag
-  // identify its wire type, which specifies the format of the data to follow.
-  // The rest of the bits contain the field number.  Each type of field (as
-  // declared by FieldDescriptor::Type, in descriptor.h) maps to one of
-  // these wire types.  Immediately following each tag is the field's value,
-  // encoded in the format specified by the wire type.  Because the tag
-  // identifies the encoding of this data, it is possible to skip
-  // unrecognized fields for forwards compatibility.
-
-  enum WireType {
-    WIRETYPE_VARINT = 0,
-    WIRETYPE_FIXED64 = 1,
-    WIRETYPE_LENGTH_DELIMITED = 2,
-    WIRETYPE_START_GROUP = 3,
-    WIRETYPE_END_GROUP = 4,
-    WIRETYPE_FIXED32 = 5,
-  };
-
-  // Lite alternative to FieldDescriptor::Type.  Must be kept in sync.
-  enum FieldType {
-    TYPE_DOUBLE = 1,
-    TYPE_FLOAT = 2,
-    TYPE_INT64 = 3,
-    TYPE_UINT64 = 4,
-    TYPE_INT32 = 5,
-    TYPE_FIXED64 = 6,
-    TYPE_FIXED32 = 7,
-    TYPE_BOOL = 8,
-    TYPE_STRING = 9,
-    TYPE_GROUP = 10,
-    TYPE_MESSAGE = 11,
-    TYPE_BYTES = 12,
-    TYPE_UINT32 = 13,
-    TYPE_ENUM = 14,
-    TYPE_SFIXED32 = 15,
-    TYPE_SFIXED64 = 16,
-    TYPE_SINT32 = 17,
-    TYPE_SINT64 = 18,
-    MAX_FIELD_TYPE = 18,
-  };
-
-  // Lite alternative to FieldDescriptor::CppType.  Must be kept in sync.
-  enum CppType {
-    CPPTYPE_INT32 = 1,
-    CPPTYPE_INT64 = 2,
-    CPPTYPE_UINT32 = 3,
-    CPPTYPE_UINT64 = 4,
-    CPPTYPE_DOUBLE = 5,
-    CPPTYPE_FLOAT = 6,
-    CPPTYPE_BOOL = 7,
-    CPPTYPE_ENUM = 8,
-    CPPTYPE_STRING = 9,
-    CPPTYPE_MESSAGE = 10,
-    MAX_CPPTYPE = 10,
-  };
-
-  // Helper method to get the CppType for a particular Type.
-  static CppType FieldTypeToCppType(FieldType type);
-
-  // Given a FieldDescriptor::Type return its WireType
-  static inline WireFormatLite::WireType WireTypeForFieldType(
-      WireFormatLite::FieldType type) {
-    return kWireTypeForFieldType[type];
-  }
-
-  // Number of bits in a tag which identify the wire type.
-  static constexpr int kTagTypeBits = 3;
-  // Mask for those bits.
-  static constexpr uint32_t kTagTypeMask = (1 << kTagTypeBits) - 1;
-
-  // Helper functions for encoding and decoding tags.  (Inlined below and in
-  // _inl.h)
-  //
-  // This is different from MakeTag(field->number(), field->type()) in the
-  // case of packed repeated fields.
-  constexpr static uint32_t MakeTag(int field_number, WireType type);
-  static WireType GetTagWireType(uint32_t tag);
-  static int GetTagFieldNumber(uint32_t tag);
-
-  // Compute the byte size of a tag.  For groups, this includes both the start
-  // and end tags.
-  static inline size_t TagSize(int field_number,
-                               WireFormatLite::FieldType type);
-
-  // Skips a field value with the given tag.  The input should start
-  // positioned immediately after the tag.  Skipped values are simply
-  // discarded, not recorded anywhere.  See WireFormat::SkipField() for a
-  // version that records to an UnknownFieldSet.
-  static bool SkipField(io::CodedInputStream* input, uint32_t tag);
-
-  // Skips a field value with the given tag.  The input should start
-  // positioned immediately after the tag. Skipped values are recorded to a
-  // CodedOutputStream.
-  static bool SkipField(io::CodedInputStream* input, uint32_t tag,
-                        io::CodedOutputStream* output);
-
-  // Reads and ignores a message from the input.  Skipped values are simply
-  // discarded, not recorded anywhere.  See WireFormat::SkipMessage() for a
-  // version that records to an UnknownFieldSet.
-  static bool SkipMessage(io::CodedInputStream* input);
-
-  // Reads and ignores a message from the input.  Skipped values are recorded
-  // to a CodedOutputStream.
-  static bool SkipMessage(io::CodedInputStream* input,
-                          io::CodedOutputStream* output);
-
-  // This macro does the same thing as WireFormatLite::MakeTag(), but the
-  // result is usable as a compile-time constant, which makes it usable
-  // as a switch case or a template input.  WireFormatLite::MakeTag() is more
-  // type-safe, though, so prefer it if possible.
-#define GOOGLE_PROTOBUF_WIRE_FORMAT_MAKE_TAG(FIELD_NUMBER, TYPE) \
-  static_cast<uint32_t>((static_cast<uint32_t>(FIELD_NUMBER) << 3) | (TYPE))
-
-  // These are the tags for the old MessageSet format, which was defined as:
-  //   message MessageSet {
-  //     repeated group Item = 1 {
-  //       required int32 type_id = 2;
-  //       required string message = 3;
-  //     }
-  //   }
-  static constexpr int kMessageSetItemNumber = 1;
-  static constexpr int kMessageSetTypeIdNumber = 2;
-  static constexpr int kMessageSetMessageNumber = 3;
-  static const int kMessageSetItemStartTag = GOOGLE_PROTOBUF_WIRE_FORMAT_MAKE_TAG(
-      kMessageSetItemNumber, WireFormatLite::WIRETYPE_START_GROUP);
-  static const int kMessageSetItemEndTag = GOOGLE_PROTOBUF_WIRE_FORMAT_MAKE_TAG(
-      kMessageSetItemNumber, WireFormatLite::WIRETYPE_END_GROUP);
-  static const int kMessageSetTypeIdTag = GOOGLE_PROTOBUF_WIRE_FORMAT_MAKE_TAG(
-      kMessageSetTypeIdNumber, WireFormatLite::WIRETYPE_VARINT);
-  static const int kMessageSetMessageTag = GOOGLE_PROTOBUF_WIRE_FORMAT_MAKE_TAG(
-      kMessageSetMessageNumber, WireFormatLite::WIRETYPE_LENGTH_DELIMITED);
-
-  // Byte size of all tags of a MessageSet::Item combined.
-  static const size_t kMessageSetItemTagsSize;
-
-  // Helper functions for converting between floats/doubles and IEEE-754
-  // uint32s/uint64s so that they can be written.  (Assumes your platform
-  // uses IEEE-754 floats.)
-  static uint32_t EncodeFloat(float value);
-  static float DecodeFloat(uint32_t value);
-  static uint64_t EncodeDouble(double value);
-  static double DecodeDouble(uint64_t value);
-
-  // Helper functions for mapping signed integers to unsigned integers in
-  // such a way that numbers with small magnitudes will encode to smaller
-  // varints.  If you simply static_cast a negative number to an unsigned
-  // number and varint-encode it, it will always take 10 bytes, defeating
-  // the purpose of varint.  So, for the "sint32" and "sint64" field types,
-  // we ZigZag-encode the values.
-  static uint32_t ZigZagEncode32(int32_t n);
-  static int32_t ZigZagDecode32(uint32_t n);
-  static uint64_t ZigZagEncode64(int64_t n);
-  static int64_t ZigZagDecode64(uint64_t n);
-
-  // =================================================================
-  // Methods for reading/writing individual field.
-
-  // Read fields, not including tags.  The assumption is that you already
-  // read the tag to determine what field to read.
-
-  // For primitive fields, we just use a templatized routine parameterized by
-  // the represented type and the FieldType. These are specialized with the
-  // appropriate definition for each declared type.
-  template <typename CType, enum FieldType DeclaredType>
-  PROTOBUF_NDEBUG_INLINE static bool ReadPrimitive(io::CodedInputStream* input,
-                                                   CType* value);
-
-  // Reads repeated primitive values, with optimizations for repeats.
-  // tag_size and tag should both be compile-time constants provided by the
-  // protocol compiler.
-  template <typename CType, enum FieldType DeclaredType>
-  PROTOBUF_NDEBUG_INLINE static bool ReadRepeatedPrimitive(
-      int tag_size, uint32_t tag, io::CodedInputStream* input,
-      RepeatedField<CType>* value);
-
-  // Identical to ReadRepeatedPrimitive, except will not inline the
-  // implementation.
-  template <typename CType, enum FieldType DeclaredType>
-  static bool ReadRepeatedPrimitiveNoInline(int tag_size, uint32_t tag,
-                                            io::CodedInputStream* input,
-                                            RepeatedField<CType>* value);
-
-  // Reads a primitive value directly from the provided buffer. It returns a
-  // pointer past the segment of data that was read.
-  //
-  // This is only implemented for the types with fixed wire size, e.g.
-  // float, double, and the (s)fixed* types.
-  template <typename CType, enum FieldType DeclaredType>
-  PROTOBUF_NDEBUG_INLINE static const uint8_t* ReadPrimitiveFromArray(
-      const uint8_t* buffer, CType* value);
-
-  // Reads a primitive packed field.
-  //
-  // This is only implemented for packable types.
-  template <typename CType, enum FieldType DeclaredType>
-  PROTOBUF_NDEBUG_INLINE static bool ReadPackedPrimitive(
-      io::CodedInputStream* input, RepeatedField<CType>* value);
-
-  // Identical to ReadPackedPrimitive, except will not inline the
-  // implementation.
-  template <typename CType, enum FieldType DeclaredType>
-  static bool ReadPackedPrimitiveNoInline(io::CodedInputStream* input,
-                                          RepeatedField<CType>* value);
-
-  // Read a packed enum field. If the is_valid function is not nullptr, values
-  // for which is_valid(value) returns false are silently dropped.
-  static bool ReadPackedEnumNoInline(io::CodedInputStream* input,
-                                     bool (*is_valid)(int),
-                                     RepeatedField<int>* values);
-
-  // Read a packed enum field. If the is_valid function is not nullptr, values
-  // for which is_valid(value) returns false are appended to
-  // unknown_fields_stream.
-  static bool ReadPackedEnumPreserveUnknowns(
-      io::CodedInputStream* input, int field_number, bool (*is_valid)(int),
-      io::CodedOutputStream* unknown_fields_stream, RepeatedField<int>* values);
-
-  // Read a string.  ReadString(..., std::string* value) requires an
-  // existing std::string.
-  static inline bool ReadString(io::CodedInputStream* input,
-                                std::string* value);
-  // ReadString(..., std::string** p) is internal-only, and should only be
-  // called from generated code. It starts by setting *p to "new std::string" if
-  // *p == &GetEmptyStringAlreadyInited().  It then invokes
-  // ReadString(io::CodedInputStream* input, *p).  This is useful for reducing
-  // code size.
-  static inline bool ReadString(io::CodedInputStream* input, std::string** p);
-  // Analogous to ReadString().
-  static bool ReadBytes(io::CodedInputStream* input, std::string* value);
-  static bool ReadBytes(io::CodedInputStream* input, std::string** p);
-
-  enum Operation {
-    PARSE = 0,
-    SERIALIZE = 1,
-  };
-
-  // Returns true if the data is valid UTF-8.
-  static bool VerifyUtf8String(const char* data, int size, Operation op,
-                               const char* field_name);
-
-  template <typename MessageType>
-  static inline bool ReadGroup(int field_number, io::CodedInputStream* input,
-                               MessageType* value);
-
-  template <typename MessageType>
-  static inline bool ReadMessage(io::CodedInputStream* input,
-                                 MessageType* value);
-
-  template <typename MessageType>
-  static inline bool ReadMessageNoVirtual(io::CodedInputStream* input,
-                                          MessageType* value) {
-    return ReadMessage(input, value);
-  }
-
-  // Write a tag.  The Write*() functions typically include the tag, so
-  // normally there's no need to call this unless using the Write*NoTag()
-  // variants.
-  PROTOBUF_NDEBUG_INLINE static void WriteTag(int field_number, WireType type,
-                                              io::CodedOutputStream* output);
-
-  // Write fields, without tags.
-  PROTOBUF_NDEBUG_INLINE static void WriteInt32NoTag(
-      int32_t value, io::CodedOutputStream* output);
-  PROTOBUF_NDEBUG_INLINE static void WriteInt64NoTag(
-      int64_t value, io::CodedOutputStream* output);
-  PROTOBUF_NDEBUG_INLINE static void WriteUInt32NoTag(
-      uint32_t value, io::CodedOutputStream* output);
-  PROTOBUF_NDEBUG_INLINE static void WriteUInt64NoTag(
-      uint64_t value, io::CodedOutputStream* output);
-  PROTOBUF_NDEBUG_INLINE static void WriteSInt32NoTag(
-      int32_t value, io::CodedOutputStream* output);
-  PROTOBUF_NDEBUG_INLINE static void WriteSInt64NoTag(
-      int64_t value, io::CodedOutputStream* output);
-  PROTOBUF_NDEBUG_INLINE static void WriteFixed32NoTag(
-      uint32_t value, io::CodedOutputStream* output);
-  PROTOBUF_NDEBUG_INLINE static void WriteFixed64NoTag(
-      uint64_t value, io::CodedOutputStream* output);
-  PROTOBUF_NDEBUG_INLINE static void WriteSFixed32NoTag(
-      int32_t value, io::CodedOutputStream* output);
-  PROTOBUF_NDEBUG_INLINE static void WriteSFixed64NoTag(
-      int64_t value, io::CodedOutputStream* output);
-  PROTOBUF_NDEBUG_INLINE static void WriteFloatNoTag(
-      float value, io::CodedOutputStream* output);
-  PROTOBUF_NDEBUG_INLINE static void WriteDoubleNoTag(
-      double value, io::CodedOutputStream* output);
-  PROTOBUF_NDEBUG_INLINE static void WriteBoolNoTag(
-      bool value, io::CodedOutputStream* output);
-  PROTOBUF_NDEBUG_INLINE static void WriteEnumNoTag(
-      int value, io::CodedOutputStream* output);
-
-  // Write array of primitive fields, without tags
-  static void WriteFloatArray(const float* a, int n,
-                              io::CodedOutputStream* output);
-  static void WriteDoubleArray(const double* a, int n,
-                               io::CodedOutputStream* output);
-  static void WriteFixed32Array(const uint32_t* a, int n,
-                                io::CodedOutputStream* output);
-  static void WriteFixed64Array(const uint64_t* a, int n,
-                                io::CodedOutputStream* output);
-  static void WriteSFixed32Array(const int32_t* a, int n,
-                                 io::CodedOutputStream* output);
-  static void WriteSFixed64Array(const int64_t* a, int n,
-                                 io::CodedOutputStream* output);
-  static void WriteBoolArray(const bool* a, int n,
-                             io::CodedOutputStream* output);
-
-  // Write fields, including tags.
-  static void WriteInt32(int field_number, int32_t value,
-                         io::CodedOutputStream* output);
-  static void WriteInt64(int field_number, int64_t value,
-                         io::CodedOutputStream* output);
-  static void WriteUInt32(int field_number, uint32_t value,
-                          io::CodedOutputStream* output);
-  static void WriteUInt64(int field_number, uint64_t value,
-                          io::CodedOutputStream* output);
-  static void WriteSInt32(int field_number, int32_t value,
-                          io::CodedOutputStream* output);
-  static void WriteSInt64(int field_number, int64_t value,
-                          io::CodedOutputStream* output);
-  static void WriteFixed32(int field_number, uint32_t value,
-                           io::CodedOutputStream* output);
-  static void WriteFixed64(int field_number, uint64_t value,
-                           io::CodedOutputStream* output);
-  static void WriteSFixed32(int field_number, int32_t value,
-                            io::CodedOutputStream* output);
-  static void WriteSFixed64(int field_number, int64_t value,
-                            io::CodedOutputStream* output);
-  static void WriteFloat(int field_number, float value,
-                         io::CodedOutputStream* output);
-  static void WriteDouble(int field_number, double value,
-                          io::CodedOutputStream* output);
-  static void WriteBool(int field_number, bool value,
-                        io::CodedOutputStream* output);
-  static void WriteEnum(int field_number, int value,
-                        io::CodedOutputStream* output);
-
-  static void WriteString(int field_number, const std::string& value,
-                          io::CodedOutputStream* output);
-  static void WriteBytes(int field_number, const std::string& value,
-                         io::CodedOutputStream* output);
-  static void WriteStringMaybeAliased(int field_number,
-                                      const std::string& value,
-                                      io::CodedOutputStream* output);
-  static void WriteBytesMaybeAliased(int field_number, const std::string& value,
-                                     io::CodedOutputStream* output);
-
-  static void WriteGroup(int field_number, const MessageLite& value,
-                         io::CodedOutputStream* output);
-  static void WriteMessage(int field_number, const MessageLite& value,
-                           io::CodedOutputStream* output);
-  // Like above, but these will check if the output stream has enough
-  // space to write directly to a flat array.
-  static void WriteGroupMaybeToArray(int field_number, const MessageLite& value,
-                                     io::CodedOutputStream* output);
-  static void WriteMessageMaybeToArray(int field_number,
-                                       const MessageLite& value,
-                                       io::CodedOutputStream* output);
-
-  // Like above, but de-virtualize the call to SerializeWithCachedSizes().  The
-  // pointer must point at an instance of MessageType, *not* a subclass (or
-  // the subclass must not override SerializeWithCachedSizes()).
-  template <typename MessageType>
-  static inline void WriteGroupNoVirtual(int field_number,
-                                         const MessageType& value,
-                                         io::CodedOutputStream* output);
-  template <typename MessageType>
-  static inline void WriteMessageNoVirtual(int field_number,
-                                           const MessageType& value,
-                                           io::CodedOutputStream* output);
-
-  // Like above, but use only *ToArray methods of CodedOutputStream.
-  PROTOBUF_NDEBUG_INLINE static uint8_t* WriteTagToArray(int field_number,
-                                                         WireType type,
-                                                         uint8_t* target);
-
-  // Write fields, without tags.
-  PROTOBUF_NDEBUG_INLINE static uint8_t* WriteInt32NoTagToArray(
-      int32_t value, uint8_t* target);
-  PROTOBUF_NDEBUG_INLINE static uint8_t* WriteInt64NoTagToArray(
-      int64_t value, uint8_t* target);
-  PROTOBUF_NDEBUG_INLINE static uint8_t* WriteUInt32NoTagToArray(
-      uint32_t value, uint8_t* target);
-  PROTOBUF_NDEBUG_INLINE static uint8_t* WriteUInt64NoTagToArray(
-      uint64_t value, uint8_t* target);
-  PROTOBUF_NDEBUG_INLINE static uint8_t* WriteSInt32NoTagToArray(
-      int32_t value, uint8_t* target);
-  PROTOBUF_NDEBUG_INLINE static uint8_t* WriteSInt64NoTagToArray(
-      int64_t value, uint8_t* target);
-  PROTOBUF_NDEBUG_INLINE static uint8_t* WriteFixed32NoTagToArray(
-      uint32_t value, uint8_t* target);
-  PROTOBUF_NDEBUG_INLINE static uint8_t* WriteFixed64NoTagToArray(
-      uint64_t value, uint8_t* target);
-  PROTOBUF_NDEBUG_INLINE static uint8_t* WriteSFixed32NoTagToArray(
-      int32_t value, uint8_t* target);
-  PROTOBUF_NDEBUG_INLINE static uint8_t* WriteSFixed64NoTagToArray(
-      int64_t value, uint8_t* target);
-  PROTOBUF_NDEBUG_INLINE static uint8_t* WriteFloatNoTagToArray(
-      float value, uint8_t* target);
-  PROTOBUF_NDEBUG_INLINE static uint8_t* WriteDoubleNoTagToArray(
-      double value, uint8_t* target);
-  PROTOBUF_NDEBUG_INLINE static uint8_t* WriteBoolNoTagToArray(bool value,
-                                                               uint8_t* target);
-  PROTOBUF_NDEBUG_INLINE static uint8_t* WriteEnumNoTagToArray(int value,
-                                                               uint8_t* target);
-
-  // Write fields, without tags.  These require that value.size() > 0.
-  template <typename T>
-  PROTOBUF_NDEBUG_INLINE static uint8_t* WritePrimitiveNoTagToArray(
-      const RepeatedField<T>& value, uint8_t* (*Writer)(T, uint8_t*),
-      uint8_t* target);
-  template <typename T>
-  PROTOBUF_NDEBUG_INLINE static uint8_t* WriteFixedNoTagToArray(
-      const RepeatedField<T>& value, uint8_t* (*Writer)(T, uint8_t*),
-      uint8_t* target);
-
-  PROTOBUF_NDEBUG_INLINE static uint8_t* WriteInt32NoTagToArray(
-      const RepeatedField<int32_t>& value, uint8_t* output);
-  PROTOBUF_NDEBUG_INLINE static uint8_t* WriteInt64NoTagToArray(
-      const RepeatedField<int64_t>& value, uint8_t* output);
-  PROTOBUF_NDEBUG_INLINE static uint8_t* WriteUInt32NoTagToArray(
-      const RepeatedField<uint32_t>& value, uint8_t* output);
-  PROTOBUF_NDEBUG_INLINE static uint8_t* WriteUInt64NoTagToArray(
-      const RepeatedField<uint64_t>& value, uint8_t* output);
-  PROTOBUF_NDEBUG_INLINE static uint8_t* WriteSInt32NoTagToArray(
-      const RepeatedField<int32_t>& value, uint8_t* output);
-  PROTOBUF_NDEBUG_INLINE static uint8_t* WriteSInt64NoTagToArray(
-      const RepeatedField<int64_t>& value, uint8_t* output);
-  PROTOBUF_NDEBUG_INLINE static uint8_t* WriteFixed32NoTagToArray(
-      const RepeatedField<uint32_t>& value, uint8_t* output);
-  PROTOBUF_NDEBUG_INLINE static uint8_t* WriteFixed64NoTagToArray(
-      const RepeatedField<uint64_t>& value, uint8_t* output);
-  PROTOBUF_NDEBUG_INLINE static uint8_t* WriteSFixed32NoTagToArray(
-      const RepeatedField<int32_t>& value, uint8_t* output);
-  PROTOBUF_NDEBUG_INLINE static uint8_t* WriteSFixed64NoTagToArray(
-      const RepeatedField<int64_t>& value, uint8_t* output);
-  PROTOBUF_NDEBUG_INLINE static uint8_t* WriteFloatNoTagToArray(
-      const RepeatedField<float>& value, uint8_t* output);
-  PROTOBUF_NDEBUG_INLINE static uint8_t* WriteDoubleNoTagToArray(
-      const RepeatedField<double>& value, uint8_t* output);
-  PROTOBUF_NDEBUG_INLINE static uint8_t* WriteBoolNoTagToArray(
-      const RepeatedField<bool>& value, uint8_t* output);
-  PROTOBUF_NDEBUG_INLINE static uint8_t* WriteEnumNoTagToArray(
-      const RepeatedField<int>& value, uint8_t* output);
-
-  // Write fields, including tags.
-  PROTOBUF_NDEBUG_INLINE static uint8_t* WriteInt32ToArray(int field_number,
-                                                           int32_t value,
-                                                           uint8_t* target);
-  PROTOBUF_NDEBUG_INLINE static uint8_t* WriteInt64ToArray(int field_number,
-                                                           int64_t value,
-                                                           uint8_t* target);
-  PROTOBUF_NDEBUG_INLINE static uint8_t* WriteUInt32ToArray(int field_number,
-                                                            uint32_t value,
-                                                            uint8_t* target);
-  PROTOBUF_NDEBUG_INLINE static uint8_t* WriteUInt64ToArray(int field_number,
-                                                            uint64_t value,
-                                                            uint8_t* target);
-  PROTOBUF_NDEBUG_INLINE static uint8_t* WriteSInt32ToArray(int field_number,
-                                                            int32_t value,
-                                                            uint8_t* target);
-  PROTOBUF_NDEBUG_INLINE static uint8_t* WriteSInt64ToArray(int field_number,
-                                                            int64_t value,
-                                                            uint8_t* target);
-  PROTOBUF_NDEBUG_INLINE static uint8_t* WriteFixed32ToArray(int field_number,
-                                                             uint32_t value,
-                                                             uint8_t* target);
-  PROTOBUF_NDEBUG_INLINE static uint8_t* WriteFixed64ToArray(int field_number,
-                                                             uint64_t value,
-                                                             uint8_t* target);
-  PROTOBUF_NDEBUG_INLINE static uint8_t* WriteSFixed32ToArray(int field_number,
-                                                              int32_t value,
-                                                              uint8_t* target);
-  PROTOBUF_NDEBUG_INLINE static uint8_t* WriteSFixed64ToArray(int field_number,
-                                                              int64_t value,
-                                                              uint8_t* target);
-  PROTOBUF_NDEBUG_INLINE static uint8_t* WriteFloatToArray(int field_number,
-                                                           float value,
-                                                           uint8_t* target);
-  PROTOBUF_NDEBUG_INLINE static uint8_t* WriteDoubleToArray(int field_number,
-                                                            double value,
-                                                            uint8_t* target);
-  PROTOBUF_NDEBUG_INLINE static uint8_t* WriteBoolToArray(int field_number,
-                                                          bool value,
-                                                          uint8_t* target);
-  PROTOBUF_NDEBUG_INLINE static uint8_t* WriteEnumToArray(int field_number,
-                                                          int value,
-                                                          uint8_t* target);
-
-  template <typename T>
-  PROTOBUF_NDEBUG_INLINE static uint8_t* WritePrimitiveToArray(
-      int field_number, const RepeatedField<T>& value,
-      uint8_t* (*Writer)(int, T, uint8_t*), uint8_t* target);
-
-  PROTOBUF_NDEBUG_INLINE static uint8_t* WriteInt32ToArray(
-      int field_number, const RepeatedField<int32_t>& value, uint8_t* output);
-  PROTOBUF_NDEBUG_INLINE static uint8_t* WriteInt64ToArray(
-      int field_number, const RepeatedField<int64_t>& value, uint8_t* output);
-  PROTOBUF_NDEBUG_INLINE static uint8_t* WriteUInt32ToArray(
-      int field_number, const RepeatedField<uint32_t>& value, uint8_t* output);
-  PROTOBUF_NDEBUG_INLINE static uint8_t* WriteUInt64ToArray(
-      int field_number, const RepeatedField<uint64_t>& value, uint8_t* output);
-  PROTOBUF_NDEBUG_INLINE static uint8_t* WriteSInt32ToArray(
-      int field_number, const RepeatedField<int32_t>& value, uint8_t* output);
-  PROTOBUF_NDEBUG_INLINE static uint8_t* WriteSInt64ToArray(
-      int field_number, const RepeatedField<int64_t>& value, uint8_t* output);
-  PROTOBUF_NDEBUG_INLINE static uint8_t* WriteFixed32ToArray(
-      int field_number, const RepeatedField<uint32_t>& value, uint8_t* output);
-  PROTOBUF_NDEBUG_INLINE static uint8_t* WriteFixed64ToArray(
-      int field_number, const RepeatedField<uint64_t>& value, uint8_t* output);
-  PROTOBUF_NDEBUG_INLINE static uint8_t* WriteSFixed32ToArray(
-      int field_number, const RepeatedField<int32_t>& value, uint8_t* output);
-  PROTOBUF_NDEBUG_INLINE static uint8_t* WriteSFixed64ToArray(
-      int field_number, const RepeatedField<int64_t>& value, uint8_t* output);
-  PROTOBUF_NDEBUG_INLINE static uint8_t* WriteFloatToArray(
-      int field_number, const RepeatedField<float>& value, uint8_t* output);
-  PROTOBUF_NDEBUG_INLINE static uint8_t* WriteDoubleToArray(
-      int field_number, const RepeatedField<double>& value, uint8_t* output);
-  PROTOBUF_NDEBUG_INLINE static uint8_t* WriteBoolToArray(
-      int field_number, const RepeatedField<bool>& value, uint8_t* output);
-  PROTOBUF_NDEBUG_INLINE static uint8_t* WriteEnumToArray(
-      int field_number, const RepeatedField<int>& value, uint8_t* output);
-
-  PROTOBUF_NDEBUG_INLINE static uint8_t* WriteStringToArray(
-      int field_number, const std::string& value, uint8_t* target);
-  PROTOBUF_NDEBUG_INLINE static uint8_t* WriteBytesToArray(
-      int field_number, const std::string& value, uint8_t* target);
-
-  // Whether to serialize deterministically (e.g., map keys are
-  // sorted) is a property of a CodedOutputStream, and in the process
-  // of serialization, the "ToArray" variants may be invoked.  But they don't
-  // have a CodedOutputStream available, so they get an additional parameter
-  // telling them whether to serialize deterministically.
-  static uint8_t* InternalWriteGroup(int field_number, const MessageLite& value,
-                                     uint8_t* target,
-                                     io::EpsCopyOutputStream* stream);
-  static uint8_t* InternalWriteMessage(int field_number,
-                                       const MessageLite& value,
-                                       int cached_size, uint8_t* target,
-                                       io::EpsCopyOutputStream* stream);
-
-  // Like above, but de-virtualize the call to SerializeWithCachedSizes().  The
-  // pointer must point at an instance of MessageType, *not* a subclass (or
-  // the subclass must not override SerializeWithCachedSizes()).
-  template <typename MessageType>
-  PROTOBUF_NDEBUG_INLINE static uint8_t* InternalWriteGroupNoVirtualToArray(
-      int field_number, const MessageType& value, uint8_t* target);
-  template <typename MessageType>
-  PROTOBUF_NDEBUG_INLINE static uint8_t* InternalWriteMessageNoVirtualToArray(
-      int field_number, const MessageType& value, uint8_t* target);
-
-  // For backward-compatibility, the last four methods also have versions
-  // that are non-deterministic always.
-  PROTOBUF_NDEBUG_INLINE static uint8_t* WriteGroupToArray(
-      int field_number, const MessageLite& value, uint8_t* target) {
-    io::EpsCopyOutputStream stream(
-        target,
-        value.GetCachedSize() +
-            static_cast<int>(2 * io::CodedOutputStream::VarintSize32(
-                                     static_cast<uint32_t>(field_number) << 3)),
-        io::CodedOutputStream::IsDefaultSerializationDeterministic());
-    return InternalWriteGroup(field_number, value, target, &stream);
-  }
-  PROTOBUF_NDEBUG_INLINE static uint8_t* WriteMessageToArray(
-      int field_number, const MessageLite& value, uint8_t* target) {
-    int size = value.GetCachedSize();
-    io::EpsCopyOutputStream stream(
-        target,
-        size + static_cast<int>(io::CodedOutputStream::VarintSize32(
-                                    static_cast<uint32_t>(field_number) << 3) +
-                                io::CodedOutputStream::VarintSize32(size)),
-        io::CodedOutputStream::IsDefaultSerializationDeterministic());
-    return InternalWriteMessage(field_number, value, value.GetCachedSize(),
-                                target, &stream);
-  }
-
-  // Compute the byte size of a field.  The XxSize() functions do NOT include
-  // the tag, so you must also call TagSize().  (This is because, for repeated
-  // fields, you should only call TagSize() once and multiply it by the element
-  // count, but you may have to call XxSize() for each individual element.)
-  static inline size_t Int32Size(int32_t value);
-  static inline size_t Int64Size(int64_t value);
-  static inline size_t UInt32Size(uint32_t value);
-  static inline size_t UInt64Size(uint64_t value);
-  static inline size_t SInt32Size(int32_t value);
-  static inline size_t SInt64Size(int64_t value);
-  static inline size_t EnumSize(int value);
-  static inline size_t Int32SizePlusOne(int32_t value);
-  static inline size_t Int64SizePlusOne(int64_t value);
-  static inline size_t UInt32SizePlusOne(uint32_t value);
-  static inline size_t UInt64SizePlusOne(uint64_t value);
-  static inline size_t SInt32SizePlusOne(int32_t value);
-  static inline size_t SInt64SizePlusOne(int64_t value);
-  static inline size_t EnumSizePlusOne(int value);
-
-  static size_t Int32Size(const RepeatedField<int32_t>& value);
-  static size_t Int64Size(const RepeatedField<int64_t>& value);
-  static size_t UInt32Size(const RepeatedField<uint32_t>& value);
-  static size_t UInt64Size(const RepeatedField<uint64_t>& value);
-  static size_t SInt32Size(const RepeatedField<int32_t>& value);
-  static size_t SInt64Size(const RepeatedField<int64_t>& value);
-  static size_t EnumSize(const RepeatedField<int>& value);
-
-  // These types always have the same size.
-  static constexpr size_t kFixed32Size = 4;
-  static constexpr size_t kFixed64Size = 8;
-  static constexpr size_t kSFixed32Size = 4;
-  static constexpr size_t kSFixed64Size = 8;
-  static constexpr size_t kFloatSize = 4;
-  static constexpr size_t kDoubleSize = 8;
-  static constexpr size_t kBoolSize = 1;
-
-  static inline size_t StringSize(const std::string& value);
-  static inline size_t BytesSize(const std::string& value);
-
-  template <typename MessageType>
-  static inline size_t GroupSize(const MessageType& value);
-  template <typename MessageType>
-  static inline size_t MessageSize(const MessageType& value);
-
-  // Like above, but de-virtualize the call to ByteSize().  The
-  // pointer must point at an instance of MessageType, *not* a subclass (or
-  // the subclass must not override ByteSize()).
-  template <typename MessageType>
-  static inline size_t GroupSizeNoVirtual(const MessageType& value);
-  template <typename MessageType>
-  static inline size_t MessageSizeNoVirtual(const MessageType& value);
-
-  // Given the length of data, calculate the byte size of the data on the
-  // wire if we encode the data as a length delimited field.
-  static inline size_t LengthDelimitedSize(size_t length);
-
- private:
-  // A helper method for the repeated primitive reader. This method has
-  // optimizations for primitive types that have fixed size on the wire, and
-  // can be read using potentially faster paths.
-  template <typename CType, enum FieldType DeclaredType>
-  PROTOBUF_NDEBUG_INLINE static bool ReadRepeatedFixedSizePrimitive(
-      int tag_size, uint32_t tag, io::CodedInputStream* input,
-      RepeatedField<CType>* value);
-
-  // Like ReadRepeatedFixedSizePrimitive but for packed primitive fields.
-  template <typename CType, enum FieldType DeclaredType>
-  PROTOBUF_NDEBUG_INLINE static bool ReadPackedFixedSizePrimitive(
-      io::CodedInputStream* input, RepeatedField<CType>* value);
-
-  static const CppType kFieldTypeToCppTypeMap[];
-  static const WireFormatLite::WireType kWireTypeForFieldType[];
-  static void WriteSubMessageMaybeToArray(int size, const MessageLite& value,
-                                          io::CodedOutputStream* output);
-
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(WireFormatLite);
-};
-
-// A class which deals with unknown values.  The default implementation just
-// discards them.  WireFormat defines a subclass which writes to an
-// UnknownFieldSet.  This class is used by ExtensionSet::ParseField(), since
-// ExtensionSet is part of the lite library but UnknownFieldSet is not.
-class PROTOBUF_EXPORT FieldSkipper {
- public:
-  FieldSkipper() {}
-  virtual ~FieldSkipper() {}
-
-  // Skip a field whose tag has already been consumed.
-  virtual bool SkipField(io::CodedInputStream* input, uint32_t tag);
-
-  // Skip an entire message or group, up to an end-group tag (which is consumed)
-  // or end-of-stream.
-  virtual bool SkipMessage(io::CodedInputStream* input);
-
-  // Deal with an already-parsed unrecognized enum value.  The default
-  // implementation does nothing, but the UnknownFieldSet-based implementation
-  // saves it as an unknown varint.
-  virtual void SkipUnknownEnum(int field_number, int value);
-};
-
-// Subclass of FieldSkipper which saves skipped fields to a CodedOutputStream.
-
-class PROTOBUF_EXPORT CodedOutputStreamFieldSkipper : public FieldSkipper {
- public:
-  explicit CodedOutputStreamFieldSkipper(io::CodedOutputStream* unknown_fields)
-      : unknown_fields_(unknown_fields) {}
-  ~CodedOutputStreamFieldSkipper() override {}
-
-  // implements FieldSkipper -----------------------------------------
-  bool SkipField(io::CodedInputStream* input, uint32_t tag) override;
-  bool SkipMessage(io::CodedInputStream* input) override;
-  void SkipUnknownEnum(int field_number, int value) override;
-
- protected:
-  io::CodedOutputStream* unknown_fields_;
-};
-
-// inline methods ====================================================
-
-inline WireFormatLite::CppType WireFormatLite::FieldTypeToCppType(
-    FieldType type) {
-  return kFieldTypeToCppTypeMap[type];
-}
-
-constexpr inline uint32_t WireFormatLite::MakeTag(int field_number,
-                                                  WireType type) {
-  return GOOGLE_PROTOBUF_WIRE_FORMAT_MAKE_TAG(field_number, type);
-}
-
-inline WireFormatLite::WireType WireFormatLite::GetTagWireType(uint32_t tag) {
-  return static_cast<WireType>(tag & kTagTypeMask);
-}
-
-inline int WireFormatLite::GetTagFieldNumber(uint32_t tag) {
-  return static_cast<int>(tag >> kTagTypeBits);
-}
-
-inline size_t WireFormatLite::TagSize(int field_number,
-                                      WireFormatLite::FieldType type) {
-  size_t result = io::CodedOutputStream::VarintSize32(
-      static_cast<uint32_t>(field_number << kTagTypeBits));
-  if (type == TYPE_GROUP) {
-    // Groups have both a start and an end tag.
-    return result * 2;
-  } else {
-    return result;
-  }
-}
-
-inline uint32_t WireFormatLite::EncodeFloat(float value) {
-  return bit_cast<uint32_t>(value);
-}
-
-inline float WireFormatLite::DecodeFloat(uint32_t value) {
-  return bit_cast<float>(value);
-}
-
-inline uint64_t WireFormatLite::EncodeDouble(double value) {
-  return bit_cast<uint64_t>(value);
-}
-
-inline double WireFormatLite::DecodeDouble(uint64_t value) {
-  return bit_cast<double>(value);
-}
-
-// ZigZag Transform:  Encodes signed integers so that they can be
-// effectively used with varint encoding.
-//
-// varint operates on unsigned integers, encoding smaller numbers into
-// fewer bytes.  If you try to use it on a signed integer, it will treat
-// this number as a very large unsigned integer, which means that even
-// small signed numbers like -1 will take the maximum number of bytes
-// (10) to encode.  ZigZagEncode() maps signed integers to unsigned
-// in such a way that those with a small absolute value will have smaller
-// encoded values, making them appropriate for encoding using varint.
-//
-//       int32_t ->     uint32_t
-// -------------------------
-//           0 ->          0
-//          -1 ->          1
-//           1 ->          2
-//          -2 ->          3
-//         ... ->        ...
-//  2147483647 -> 4294967294
-// -2147483648 -> 4294967295
-//
-//        >> encode >>
-//        << decode <<
-
-inline uint32_t WireFormatLite::ZigZagEncode32(int32_t n) {
-  // Note:  the right-shift must be arithmetic
-  // Note:  left shift must be unsigned because of overflow
-  return (static_cast<uint32_t>(n) << 1) ^ static_cast<uint32_t>(n >> 31);
-}
-
-inline int32_t WireFormatLite::ZigZagDecode32(uint32_t n) {
-  // Note:  Using unsigned types prevent undefined behavior
-  return static_cast<int32_t>((n >> 1) ^ (~(n & 1) + 1));
-}
-
-inline uint64_t WireFormatLite::ZigZagEncode64(int64_t n) {
-  // Note:  the right-shift must be arithmetic
-  // Note:  left shift must be unsigned because of overflow
-  return (static_cast<uint64_t>(n) << 1) ^ static_cast<uint64_t>(n >> 63);
-}
-
-inline int64_t WireFormatLite::ZigZagDecode64(uint64_t n) {
-  // Note:  Using unsigned types prevent undefined behavior
-  return static_cast<int64_t>((n >> 1) ^ (~(n & 1) + 1));
-}
-
-// String is for UTF-8 text only, but, even so, ReadString() can simply
-// call ReadBytes().
-
-inline bool WireFormatLite::ReadString(io::CodedInputStream* input,
-                                       std::string* value) {
-  return ReadBytes(input, value);
-}
-
-inline bool WireFormatLite::ReadString(io::CodedInputStream* input,
-                                       std::string** p) {
-  return ReadBytes(input, p);
-}
-
-inline uint8_t* InternalSerializeUnknownMessageSetItemsToArray(
-    const std::string& unknown_fields, uint8_t* target,
-    io::EpsCopyOutputStream* stream) {
-  return stream->WriteRaw(unknown_fields.data(),
-                          static_cast<int>(unknown_fields.size()), target);
-}
-
-inline size_t ComputeUnknownMessageSetItemsSize(
-    const std::string& unknown_fields) {
-  return unknown_fields.size();
-}
-
-// Implementation details of ReadPrimitive.
-
-template <>
-inline bool WireFormatLite::ReadPrimitive<int32_t, WireFormatLite::TYPE_INT32>(
-    io::CodedInputStream* input, int32_t* value) {
-  uint32_t temp;
-  if (!input->ReadVarint32(&temp)) return false;
-  *value = static_cast<int32_t>(temp);
-  return true;
-}
-template <>
-inline bool WireFormatLite::ReadPrimitive<int64_t, WireFormatLite::TYPE_INT64>(
-    io::CodedInputStream* input, int64_t* value) {
-  uint64_t temp;
-  if (!input->ReadVarint64(&temp)) return false;
-  *value = static_cast<int64_t>(temp);
-  return true;
-}
-template <>
-inline bool
-WireFormatLite::ReadPrimitive<uint32_t, WireFormatLite::TYPE_UINT32>(
-    io::CodedInputStream* input, uint32_t* value) {
-  return input->ReadVarint32(value);
-}
-template <>
-inline bool
-WireFormatLite::ReadPrimitive<uint64_t, WireFormatLite::TYPE_UINT64>(
-    io::CodedInputStream* input, uint64_t* value) {
-  return input->ReadVarint64(value);
-}
-template <>
-inline bool WireFormatLite::ReadPrimitive<int32_t, WireFormatLite::TYPE_SINT32>(
-    io::CodedInputStream* input, int32_t* value) {
-  uint32_t temp;
-  if (!input->ReadVarint32(&temp)) return false;
-  *value = ZigZagDecode32(temp);
-  return true;
-}
-template <>
-inline bool WireFormatLite::ReadPrimitive<int64_t, WireFormatLite::TYPE_SINT64>(
-    io::CodedInputStream* input, int64_t* value) {
-  uint64_t temp;
-  if (!input->ReadVarint64(&temp)) return false;
-  *value = ZigZagDecode64(temp);
-  return true;
-}
-template <>
-inline bool
-WireFormatLite::ReadPrimitive<uint32_t, WireFormatLite::TYPE_FIXED32>(
-    io::CodedInputStream* input, uint32_t* value) {
-  return input->ReadLittleEndian32(value);
-}
-template <>
-inline bool
-WireFormatLite::ReadPrimitive<uint64_t, WireFormatLite::TYPE_FIXED64>(
-    io::CodedInputStream* input, uint64_t* value) {
-  return input->ReadLittleEndian64(value);
-}
-template <>
-inline bool
-WireFormatLite::ReadPrimitive<int32_t, WireFormatLite::TYPE_SFIXED32>(
-    io::CodedInputStream* input, int32_t* value) {
-  uint32_t temp;
-  if (!input->ReadLittleEndian32(&temp)) return false;
-  *value = static_cast<int32_t>(temp);
-  return true;
-}
-template <>
-inline bool
-WireFormatLite::ReadPrimitive<int64_t, WireFormatLite::TYPE_SFIXED64>(
-    io::CodedInputStream* input, int64_t* value) {
-  uint64_t temp;
-  if (!input->ReadLittleEndian64(&temp)) return false;
-  *value = static_cast<int64_t>(temp);
-  return true;
-}
-template <>
-inline bool WireFormatLite::ReadPrimitive<float, WireFormatLite::TYPE_FLOAT>(
-    io::CodedInputStream* input, float* value) {
-  uint32_t temp;
-  if (!input->ReadLittleEndian32(&temp)) return false;
-  *value = DecodeFloat(temp);
-  return true;
-}
-template <>
-inline bool WireFormatLite::ReadPrimitive<double, WireFormatLite::TYPE_DOUBLE>(
-    io::CodedInputStream* input, double* value) {
-  uint64_t temp;
-  if (!input->ReadLittleEndian64(&temp)) return false;
-  *value = DecodeDouble(temp);
-  return true;
-}
-template <>
-inline bool WireFormatLite::ReadPrimitive<bool, WireFormatLite::TYPE_BOOL>(
-    io::CodedInputStream* input, bool* value) {
-  uint64_t temp;
-  if (!input->ReadVarint64(&temp)) return false;
-  *value = temp != 0;
-  return true;
-}
-template <>
-inline bool WireFormatLite::ReadPrimitive<int, WireFormatLite::TYPE_ENUM>(
-    io::CodedInputStream* input, int* value) {
-  uint32_t temp;
-  if (!input->ReadVarint32(&temp)) return false;
-  *value = static_cast<int>(temp);
-  return true;
-}
-
-template <>
-inline const uint8_t*
-WireFormatLite::ReadPrimitiveFromArray<uint32_t, WireFormatLite::TYPE_FIXED32>(
-    const uint8_t* buffer, uint32_t* value) {
-  return io::CodedInputStream::ReadLittleEndian32FromArray(buffer, value);
-}
-template <>
-inline const uint8_t*
-WireFormatLite::ReadPrimitiveFromArray<uint64_t, WireFormatLite::TYPE_FIXED64>(
-    const uint8_t* buffer, uint64_t* value) {
-  return io::CodedInputStream::ReadLittleEndian64FromArray(buffer, value);
-}
-template <>
-inline const uint8_t*
-WireFormatLite::ReadPrimitiveFromArray<int32_t, WireFormatLite::TYPE_SFIXED32>(
-    const uint8_t* buffer, int32_t* value) {
-  uint32_t temp;
-  buffer = io::CodedInputStream::ReadLittleEndian32FromArray(buffer, &temp);
-  *value = static_cast<int32_t>(temp);
-  return buffer;
-}
-template <>
-inline const uint8_t*
-WireFormatLite::ReadPrimitiveFromArray<int64_t, WireFormatLite::TYPE_SFIXED64>(
-    const uint8_t* buffer, int64_t* value) {
-  uint64_t temp;
-  buffer = io::CodedInputStream::ReadLittleEndian64FromArray(buffer, &temp);
-  *value = static_cast<int64_t>(temp);
-  return buffer;
-}
-template <>
-inline const uint8_t*
-WireFormatLite::ReadPrimitiveFromArray<float, WireFormatLite::TYPE_FLOAT>(
-    const uint8_t* buffer, float* value) {
-  uint32_t temp;
-  buffer = io::CodedInputStream::ReadLittleEndian32FromArray(buffer, &temp);
-  *value = DecodeFloat(temp);
-  return buffer;
-}
-template <>
-inline const uint8_t*
-WireFormatLite::ReadPrimitiveFromArray<double, WireFormatLite::TYPE_DOUBLE>(
-    const uint8_t* buffer, double* value) {
-  uint64_t temp;
-  buffer = io::CodedInputStream::ReadLittleEndian64FromArray(buffer, &temp);
-  *value = DecodeDouble(temp);
-  return buffer;
-}
-
-template <typename CType, enum WireFormatLite::FieldType DeclaredType>
-inline bool WireFormatLite::ReadRepeatedPrimitive(
-    int,  // tag_size, unused.
-    uint32_t tag, io::CodedInputStream* input, RepeatedField<CType>* values) {
-  CType value;
-  if (!ReadPrimitive<CType, DeclaredType>(input, &value)) return false;
-  values->Add(value);
-  int elements_already_reserved = values->Capacity() - values->size();
-  while (elements_already_reserved > 0 && input->ExpectTag(tag)) {
-    if (!ReadPrimitive<CType, DeclaredType>(input, &value)) return false;
-    values->AddAlreadyReserved(value);
-    elements_already_reserved--;
-  }
-  return true;
-}
-
-template <typename CType, enum WireFormatLite::FieldType DeclaredType>
-inline bool WireFormatLite::ReadRepeatedFixedSizePrimitive(
-    int tag_size, uint32_t tag, io::CodedInputStream* input,
-    RepeatedField<CType>* values) {
-  GOOGLE_DCHECK_EQ(UInt32Size(tag), static_cast<size_t>(tag_size));
-  CType value;
-  if (!ReadPrimitive<CType, DeclaredType>(input, &value)) return false;
-  values->Add(value);
-
-  // For fixed size values, repeated values can be read more quickly by
-  // reading directly from a raw array.
-  //
-  // We can get a tight loop by only reading as many elements as can be
-  // added to the RepeatedField without having to do any resizing. Additionally,
-  // we only try to read as many elements as are available from the current
-  // buffer space. Doing so avoids having to perform boundary checks when
-  // reading the value: the maximum number of elements that can be read is
-  // known outside of the loop.
-  const void* void_pointer;
-  int size;
-  input->GetDirectBufferPointerInline(&void_pointer, &size);
-  if (size > 0) {
-    const uint8_t* buffer = reinterpret_cast<const uint8_t*>(void_pointer);
-    // The number of bytes each type occupies on the wire.
-    const int per_value_size = tag_size + static_cast<int>(sizeof(value));
-
-    // parentheses around (std::min) prevents macro expansion of min(...)
-    int elements_available =
-        (std::min)(values->Capacity() - values->size(), size / per_value_size);
-    int num_read = 0;
-    while (num_read < elements_available &&
-           (buffer = io::CodedInputStream::ExpectTagFromArray(buffer, tag)) !=
-               nullptr) {
-      buffer = ReadPrimitiveFromArray<CType, DeclaredType>(buffer, &value);
-      values->AddAlreadyReserved(value);
-      ++num_read;
-    }
-    const int read_bytes = num_read * per_value_size;
-    if (read_bytes > 0) {
-      input->Skip(read_bytes);
-    }
-  }
-  return true;
-}
-
-// Specializations of ReadRepeatedPrimitive for the fixed size types, which use
-// the optimized code path.
-#define READ_REPEATED_FIXED_SIZE_PRIMITIVE(CPPTYPE, DECLARED_TYPE)        \
-  template <>                                                             \
-  inline bool WireFormatLite::ReadRepeatedPrimitive<                      \
-      CPPTYPE, WireFormatLite::DECLARED_TYPE>(                            \
-      int tag_size, uint32_t tag, io::CodedInputStream* input,            \
-      RepeatedField<CPPTYPE>* values) {                                   \
-    return ReadRepeatedFixedSizePrimitive<CPPTYPE,                        \
-                                          WireFormatLite::DECLARED_TYPE>( \
-        tag_size, tag, input, values);                                    \
-  }
-
-READ_REPEATED_FIXED_SIZE_PRIMITIVE(uint32_t, TYPE_FIXED32)
-READ_REPEATED_FIXED_SIZE_PRIMITIVE(uint64_t, TYPE_FIXED64)
-READ_REPEATED_FIXED_SIZE_PRIMITIVE(int32_t, TYPE_SFIXED32)
-READ_REPEATED_FIXED_SIZE_PRIMITIVE(int64_t, TYPE_SFIXED64)
-READ_REPEATED_FIXED_SIZE_PRIMITIVE(float, TYPE_FLOAT)
-READ_REPEATED_FIXED_SIZE_PRIMITIVE(double, TYPE_DOUBLE)
-
-#undef READ_REPEATED_FIXED_SIZE_PRIMITIVE
-
-template <typename CType, enum WireFormatLite::FieldType DeclaredType>
-bool WireFormatLite::ReadRepeatedPrimitiveNoInline(
-    int tag_size, uint32_t tag, io::CodedInputStream* input,
-    RepeatedField<CType>* value) {
-  return ReadRepeatedPrimitive<CType, DeclaredType>(tag_size, tag, input,
-                                                    value);
-}
-
-template <typename CType, enum WireFormatLite::FieldType DeclaredType>
-inline bool WireFormatLite::ReadPackedPrimitive(io::CodedInputStream* input,
-                                                RepeatedField<CType>* values) {
-  int length;
-  if (!input->ReadVarintSizeAsInt(&length)) return false;
-  io::CodedInputStream::Limit limit = input->PushLimit(length);
-  while (input->BytesUntilLimit() > 0) {
-    CType value;
-    if (!ReadPrimitive<CType, DeclaredType>(input, &value)) return false;
-    values->Add(value);
-  }
-  input->PopLimit(limit);
-  return true;
-}
-
-template <typename CType, enum WireFormatLite::FieldType DeclaredType>
-inline bool WireFormatLite::ReadPackedFixedSizePrimitive(
-    io::CodedInputStream* input, RepeatedField<CType>* values) {
-  int length;
-  if (!input->ReadVarintSizeAsInt(&length)) return false;
-  const int old_entries = values->size();
-  const int new_entries = length / static_cast<int>(sizeof(CType));
-  const int new_bytes = new_entries * static_cast<int>(sizeof(CType));
-  if (new_bytes != length) return false;
-  // We would *like* to pre-allocate the buffer to write into (for
-  // speed), but *must* avoid performing a very large allocation due
-  // to a malicious user-supplied "length" above.  So we have a fast
-  // path that pre-allocates when the "length" is less than a bound.
-  // We determine the bound by calling BytesUntilTotalBytesLimit() and
-  // BytesUntilLimit().  These return -1 to mean "no limit set".
-  // There are four cases:
-  // TotalBytesLimit  Limit
-  // -1               -1     Use slow path.
-  // -1               >= 0   Use fast path if length <= Limit.
-  // >= 0             -1     Use slow path.
-  // >= 0             >= 0   Use fast path if length <= min(both limits).
-  int64_t bytes_limit = input->BytesUntilTotalBytesLimit();
-  if (bytes_limit == -1) {
-    bytes_limit = input->BytesUntilLimit();
-  } else {
-    // parentheses around (std::min) prevents macro expansion of min(...)
-    bytes_limit =
-        (std::min)(bytes_limit, static_cast<int64_t>(input->BytesUntilLimit()));
-  }
-  if (bytes_limit >= new_bytes) {
-    // Fast-path that pre-allocates *values to the final size.
-#if defined(PROTOBUF_LITTLE_ENDIAN)
-    values->Resize(old_entries + new_entries, 0);
-    // values->mutable_data() may change after Resize(), so do this after:
-    void* dest = reinterpret_cast<void*>(values->mutable_data() + old_entries);
-    if (!input->ReadRaw(dest, new_bytes)) {
-      values->Truncate(old_entries);
-      return false;
-    }
-#else
-    values->Reserve(old_entries + new_entries);
-    CType value;
-    for (int i = 0; i < new_entries; ++i) {
-      if (!ReadPrimitive<CType, DeclaredType>(input, &value)) return false;
-      values->AddAlreadyReserved(value);
-    }
-#endif
-  } else {
-    // This is the slow-path case where "length" may be too large to
-    // safely allocate.  We read as much as we can into *values
-    // without pre-allocating "length" bytes.
-    CType value;
-    for (int i = 0; i < new_entries; ++i) {
-      if (!ReadPrimitive<CType, DeclaredType>(input, &value)) return false;
-      values->Add(value);
-    }
-  }
-  return true;
-}
-
-// Specializations of ReadPackedPrimitive for the fixed size types, which use
-// an optimized code path.
-#define READ_REPEATED_PACKED_FIXED_SIZE_PRIMITIVE(CPPTYPE, DECLARED_TYPE)      \
-  template <>                                                                  \
-  inline bool                                                                  \
-  WireFormatLite::ReadPackedPrimitive<CPPTYPE, WireFormatLite::DECLARED_TYPE>( \
-      io::CodedInputStream * input, RepeatedField<CPPTYPE> * values) {         \
-    return ReadPackedFixedSizePrimitive<CPPTYPE,                               \
-                                        WireFormatLite::DECLARED_TYPE>(        \
-        input, values);                                                        \
-  }
-
-READ_REPEATED_PACKED_FIXED_SIZE_PRIMITIVE(uint32_t, TYPE_FIXED32)
-READ_REPEATED_PACKED_FIXED_SIZE_PRIMITIVE(uint64_t, TYPE_FIXED64)
-READ_REPEATED_PACKED_FIXED_SIZE_PRIMITIVE(int32_t, TYPE_SFIXED32)
-READ_REPEATED_PACKED_FIXED_SIZE_PRIMITIVE(int64_t, TYPE_SFIXED64)
-READ_REPEATED_PACKED_FIXED_SIZE_PRIMITIVE(float, TYPE_FLOAT)
-READ_REPEATED_PACKED_FIXED_SIZE_PRIMITIVE(double, TYPE_DOUBLE)
-
-#undef READ_REPEATED_PACKED_FIXED_SIZE_PRIMITIVE
-
-template <typename CType, enum WireFormatLite::FieldType DeclaredType>
-bool WireFormatLite::ReadPackedPrimitiveNoInline(io::CodedInputStream* input,
-                                                 RepeatedField<CType>* values) {
-  return ReadPackedPrimitive<CType, DeclaredType>(input, values);
-}
-
-
-template <typename MessageType>
-inline bool WireFormatLite::ReadGroup(int field_number,
-                                      io::CodedInputStream* input,
-                                      MessageType* value) {
-  if (!input->IncrementRecursionDepth()) return false;
-  if (!value->MergePartialFromCodedStream(input)) return false;
-  input->UnsafeDecrementRecursionDepth();
-  // Make sure the last thing read was an end tag for this group.
-  if (!input->LastTagWas(MakeTag(field_number, WIRETYPE_END_GROUP))) {
-    return false;
-  }
-  return true;
-}
-template <typename MessageType>
-inline bool WireFormatLite::ReadMessage(io::CodedInputStream* input,
-                                        MessageType* value) {
-  int length;
-  if (!input->ReadVarintSizeAsInt(&length)) return false;
-  std::pair<io::CodedInputStream::Limit, int> p =
-      input->IncrementRecursionDepthAndPushLimit(length);
-  if (p.second < 0 || !value->MergePartialFromCodedStream(input)) return false;
-  // Make sure that parsing stopped when the limit was hit, not at an endgroup
-  // tag.
-  return input->DecrementRecursionDepthAndPopLimit(p.first);
-}
-
-// ===================================================================
-
-inline void WireFormatLite::WriteTag(int field_number, WireType type,
-                                     io::CodedOutputStream* output) {
-  output->WriteTag(MakeTag(field_number, type));
-}
-
-inline void WireFormatLite::WriteInt32NoTag(int32_t value,
-                                            io::CodedOutputStream* output) {
-  output->WriteVarint32SignExtended(value);
-}
-inline void WireFormatLite::WriteInt64NoTag(int64_t value,
-                                            io::CodedOutputStream* output) {
-  output->WriteVarint64(static_cast<uint64_t>(value));
-}
-inline void WireFormatLite::WriteUInt32NoTag(uint32_t value,
-                                             io::CodedOutputStream* output) {
-  output->WriteVarint32(value);
-}
-inline void WireFormatLite::WriteUInt64NoTag(uint64_t value,
-                                             io::CodedOutputStream* output) {
-  output->WriteVarint64(value);
-}
-inline void WireFormatLite::WriteSInt32NoTag(int32_t value,
-                                             io::CodedOutputStream* output) {
-  output->WriteVarint32(ZigZagEncode32(value));
-}
-inline void WireFormatLite::WriteSInt64NoTag(int64_t value,
-                                             io::CodedOutputStream* output) {
-  output->WriteVarint64(ZigZagEncode64(value));
-}
-inline void WireFormatLite::WriteFixed32NoTag(uint32_t value,
-                                              io::CodedOutputStream* output) {
-  output->WriteLittleEndian32(value);
-}
-inline void WireFormatLite::WriteFixed64NoTag(uint64_t value,
-                                              io::CodedOutputStream* output) {
-  output->WriteLittleEndian64(value);
-}
-inline void WireFormatLite::WriteSFixed32NoTag(int32_t value,
-                                               io::CodedOutputStream* output) {
-  output->WriteLittleEndian32(static_cast<uint32_t>(value));
-}
-inline void WireFormatLite::WriteSFixed64NoTag(int64_t value,
-                                               io::CodedOutputStream* output) {
-  output->WriteLittleEndian64(static_cast<uint64_t>(value));
-}
-inline void WireFormatLite::WriteFloatNoTag(float value,
-                                            io::CodedOutputStream* output) {
-  output->WriteLittleEndian32(EncodeFloat(value));
-}
-inline void WireFormatLite::WriteDoubleNoTag(double value,
-                                             io::CodedOutputStream* output) {
-  output->WriteLittleEndian64(EncodeDouble(value));
-}
-inline void WireFormatLite::WriteBoolNoTag(bool value,
-                                           io::CodedOutputStream* output) {
-  output->WriteVarint32(value ? 1 : 0);
-}
-inline void WireFormatLite::WriteEnumNoTag(int value,
-                                           io::CodedOutputStream* output) {
-  output->WriteVarint32SignExtended(value);
-}
-
-// See comment on ReadGroupNoVirtual to understand the need for this template
-// parameter name.
-template <typename MessageType_WorkAroundCppLookupDefect>
-inline void WireFormatLite::WriteGroupNoVirtual(
-    int field_number, const MessageType_WorkAroundCppLookupDefect& value,
-    io::CodedOutputStream* output) {
-  WriteTag(field_number, WIRETYPE_START_GROUP, output);
-  value.MessageType_WorkAroundCppLookupDefect::SerializeWithCachedSizes(output);
-  WriteTag(field_number, WIRETYPE_END_GROUP, output);
-}
-template <typename MessageType_WorkAroundCppLookupDefect>
-inline void WireFormatLite::WriteMessageNoVirtual(
-    int field_number, const MessageType_WorkAroundCppLookupDefect& value,
-    io::CodedOutputStream* output) {
-  WriteTag(field_number, WIRETYPE_LENGTH_DELIMITED, output);
-  output->WriteVarint32(
-      value.MessageType_WorkAroundCppLookupDefect::GetCachedSize());
-  value.MessageType_WorkAroundCppLookupDefect::SerializeWithCachedSizes(output);
-}
-
-// ===================================================================
-
-inline uint8_t* WireFormatLite::WriteTagToArray(int field_number, WireType type,
-                                                uint8_t* target) {
-  return io::CodedOutputStream::WriteTagToArray(MakeTag(field_number, type),
-                                                target);
-}
-
-inline uint8_t* WireFormatLite::WriteInt32NoTagToArray(int32_t value,
-                                                       uint8_t* target) {
-  return io::CodedOutputStream::WriteVarint32SignExtendedToArray(value, target);
-}
-inline uint8_t* WireFormatLite::WriteInt64NoTagToArray(int64_t value,
-                                                       uint8_t* target) {
-  return io::CodedOutputStream::WriteVarint64ToArray(
-      static_cast<uint64_t>(value), target);
-}
-inline uint8_t* WireFormatLite::WriteUInt32NoTagToArray(uint32_t value,
-                                                        uint8_t* target) {
-  return io::CodedOutputStream::WriteVarint32ToArray(value, target);
-}
-inline uint8_t* WireFormatLite::WriteUInt64NoTagToArray(uint64_t value,
-                                                        uint8_t* target) {
-  return io::CodedOutputStream::WriteVarint64ToArray(value, target);
-}
-inline uint8_t* WireFormatLite::WriteSInt32NoTagToArray(int32_t value,
-                                                        uint8_t* target) {
-  return io::CodedOutputStream::WriteVarint32ToArray(ZigZagEncode32(value),
-                                                     target);
-}
-inline uint8_t* WireFormatLite::WriteSInt64NoTagToArray(int64_t value,
-                                                        uint8_t* target) {
-  return io::CodedOutputStream::WriteVarint64ToArray(ZigZagEncode64(value),
-                                                     target);
-}
-inline uint8_t* WireFormatLite::WriteFixed32NoTagToArray(uint32_t value,
-                                                         uint8_t* target) {
-  return io::CodedOutputStream::WriteLittleEndian32ToArray(value, target);
-}
-inline uint8_t* WireFormatLite::WriteFixed64NoTagToArray(uint64_t value,
-                                                         uint8_t* target) {
-  return io::CodedOutputStream::WriteLittleEndian64ToArray(value, target);
-}
-inline uint8_t* WireFormatLite::WriteSFixed32NoTagToArray(int32_t value,
-                                                          uint8_t* target) {
-  return io::CodedOutputStream::WriteLittleEndian32ToArray(
-      static_cast<uint32_t>(value), target);
-}
-inline uint8_t* WireFormatLite::WriteSFixed64NoTagToArray(int64_t value,
-                                                          uint8_t* target) {
-  return io::CodedOutputStream::WriteLittleEndian64ToArray(
-      static_cast<uint64_t>(value), target);
-}
-inline uint8_t* WireFormatLite::WriteFloatNoTagToArray(float value,
-                                                       uint8_t* target) {
-  return io::CodedOutputStream::WriteLittleEndian32ToArray(EncodeFloat(value),
-                                                           target);
-}
-inline uint8_t* WireFormatLite::WriteDoubleNoTagToArray(double value,
-                                                        uint8_t* target) {
-  return io::CodedOutputStream::WriteLittleEndian64ToArray(EncodeDouble(value),
-                                                           target);
-}
-inline uint8_t* WireFormatLite::WriteBoolNoTagToArray(bool value,
-                                                      uint8_t* target) {
-  return io::CodedOutputStream::WriteVarint32ToArray(value ? 1 : 0, target);
-}
-inline uint8_t* WireFormatLite::WriteEnumNoTagToArray(int value,
-                                                      uint8_t* target) {
-  return io::CodedOutputStream::WriteVarint32SignExtendedToArray(value, target);
-}
-
-template <typename T>
-inline uint8_t* WireFormatLite::WritePrimitiveNoTagToArray(
-    const RepeatedField<T>& value, uint8_t* (*Writer)(T, uint8_t*),
-    uint8_t* target) {
-  const int n = value.size();
-  GOOGLE_DCHECK_GT(n, 0);
-
-  const T* ii = value.data();
-  int i = 0;
-  do {
-    target = Writer(ii[i], target);
-  } while (++i < n);
-
-  return target;
-}
-
-template <typename T>
-inline uint8_t* WireFormatLite::WriteFixedNoTagToArray(
-    const RepeatedField<T>& value, uint8_t* (*Writer)(T, uint8_t*),
-    uint8_t* target) {
-#if defined(PROTOBUF_LITTLE_ENDIAN)
-  (void)Writer;
-
-  const int n = value.size();
-  GOOGLE_DCHECK_GT(n, 0);
-
-  const T* ii = value.data();
-  const int bytes = n * static_cast<int>(sizeof(ii[0]));
-  memcpy(target, ii, static_cast<size_t>(bytes));
-  return target + bytes;
-#else
-  return WritePrimitiveNoTagToArray(value, Writer, target);
-#endif
-}
-
-inline uint8_t* WireFormatLite::WriteInt32NoTagToArray(
-    const RepeatedField<int32_t>& value, uint8_t* target) {
-  return WritePrimitiveNoTagToArray(value, WriteInt32NoTagToArray, target);
-}
-inline uint8_t* WireFormatLite::WriteInt64NoTagToArray(
-    const RepeatedField<int64_t>& value, uint8_t* target) {
-  return WritePrimitiveNoTagToArray(value, WriteInt64NoTagToArray, target);
-}
-inline uint8_t* WireFormatLite::WriteUInt32NoTagToArray(
-    const RepeatedField<uint32_t>& value, uint8_t* target) {
-  return WritePrimitiveNoTagToArray(value, WriteUInt32NoTagToArray, target);
-}
-inline uint8_t* WireFormatLite::WriteUInt64NoTagToArray(
-    const RepeatedField<uint64_t>& value, uint8_t* target) {
-  return WritePrimitiveNoTagToArray(value, WriteUInt64NoTagToArray, target);
-}
-inline uint8_t* WireFormatLite::WriteSInt32NoTagToArray(
-    const RepeatedField<int32_t>& value, uint8_t* target) {
-  return WritePrimitiveNoTagToArray(value, WriteSInt32NoTagToArray, target);
-}
-inline uint8_t* WireFormatLite::WriteSInt64NoTagToArray(
-    const RepeatedField<int64_t>& value, uint8_t* target) {
-  return WritePrimitiveNoTagToArray(value, WriteSInt64NoTagToArray, target);
-}
-inline uint8_t* WireFormatLite::WriteFixed32NoTagToArray(
-    const RepeatedField<uint32_t>& value, uint8_t* target) {
-  return WriteFixedNoTagToArray(value, WriteFixed32NoTagToArray, target);
-}
-inline uint8_t* WireFormatLite::WriteFixed64NoTagToArray(
-    const RepeatedField<uint64_t>& value, uint8_t* target) {
-  return WriteFixedNoTagToArray(value, WriteFixed64NoTagToArray, target);
-}
-inline uint8_t* WireFormatLite::WriteSFixed32NoTagToArray(
-    const RepeatedField<int32_t>& value, uint8_t* target) {
-  return WriteFixedNoTagToArray(value, WriteSFixed32NoTagToArray, target);
-}
-inline uint8_t* WireFormatLite::WriteSFixed64NoTagToArray(
-    const RepeatedField<int64_t>& value, uint8_t* target) {
-  return WriteFixedNoTagToArray(value, WriteSFixed64NoTagToArray, target);
-}
-inline uint8_t* WireFormatLite::WriteFloatNoTagToArray(
-    const RepeatedField<float>& value, uint8_t* target) {
-  return WriteFixedNoTagToArray(value, WriteFloatNoTagToArray, target);
-}
-inline uint8_t* WireFormatLite::WriteDoubleNoTagToArray(
-    const RepeatedField<double>& value, uint8_t* target) {
-  return WriteFixedNoTagToArray(value, WriteDoubleNoTagToArray, target);
-}
-inline uint8_t* WireFormatLite::WriteBoolNoTagToArray(
-    const RepeatedField<bool>& value, uint8_t* target) {
-  return WritePrimitiveNoTagToArray(value, WriteBoolNoTagToArray, target);
-}
-inline uint8_t* WireFormatLite::WriteEnumNoTagToArray(
-    const RepeatedField<int>& value, uint8_t* target) {
-  return WritePrimitiveNoTagToArray(value, WriteEnumNoTagToArray, target);
-}
-
-inline uint8_t* WireFormatLite::WriteInt32ToArray(int field_number,
-                                                  int32_t value,
-                                                  uint8_t* target) {
-  target = WriteTagToArray(field_number, WIRETYPE_VARINT, target);
-  return WriteInt32NoTagToArray(value, target);
-}
-inline uint8_t* WireFormatLite::WriteInt64ToArray(int field_number,
-                                                  int64_t value,
-                                                  uint8_t* target) {
-  target = WriteTagToArray(field_number, WIRETYPE_VARINT, target);
-  return WriteInt64NoTagToArray(value, target);
-}
-inline uint8_t* WireFormatLite::WriteUInt32ToArray(int field_number,
-                                                   uint32_t value,
-                                                   uint8_t* target) {
-  target = WriteTagToArray(field_number, WIRETYPE_VARINT, target);
-  return WriteUInt32NoTagToArray(value, target);
-}
-inline uint8_t* WireFormatLite::WriteUInt64ToArray(int field_number,
-                                                   uint64_t value,
-                                                   uint8_t* target) {
-  target = WriteTagToArray(field_number, WIRETYPE_VARINT, target);
-  return WriteUInt64NoTagToArray(value, target);
-}
-inline uint8_t* WireFormatLite::WriteSInt32ToArray(int field_number,
-                                                   int32_t value,
-                                                   uint8_t* target) {
-  target = WriteTagToArray(field_number, WIRETYPE_VARINT, target);
-  return WriteSInt32NoTagToArray(value, target);
-}
-inline uint8_t* WireFormatLite::WriteSInt64ToArray(int field_number,
-                                                   int64_t value,
-                                                   uint8_t* target) {
-  target = WriteTagToArray(field_number, WIRETYPE_VARINT, target);
-  return WriteSInt64NoTagToArray(value, target);
-}
-inline uint8_t* WireFormatLite::WriteFixed32ToArray(int field_number,
-                                                    uint32_t value,
-                                                    uint8_t* target) {
-  target = WriteTagToArray(field_number, WIRETYPE_FIXED32, target);
-  return WriteFixed32NoTagToArray(value, target);
-}
-inline uint8_t* WireFormatLite::WriteFixed64ToArray(int field_number,
-                                                    uint64_t value,
-                                                    uint8_t* target) {
-  target = WriteTagToArray(field_number, WIRETYPE_FIXED64, target);
-  return WriteFixed64NoTagToArray(value, target);
-}
-inline uint8_t* WireFormatLite::WriteSFixed32ToArray(int field_number,
-                                                     int32_t value,
-                                                     uint8_t* target) {
-  target = WriteTagToArray(field_number, WIRETYPE_FIXED32, target);
-  return WriteSFixed32NoTagToArray(value, target);
-}
-inline uint8_t* WireFormatLite::WriteSFixed64ToArray(int field_number,
-                                                     int64_t value,
-                                                     uint8_t* target) {
-  target = WriteTagToArray(field_number, WIRETYPE_FIXED64, target);
-  return WriteSFixed64NoTagToArray(value, target);
-}
-inline uint8_t* WireFormatLite::WriteFloatToArray(int field_number, float value,
-                                                  uint8_t* target) {
-  target = WriteTagToArray(field_number, WIRETYPE_FIXED32, target);
-  return WriteFloatNoTagToArray(value, target);
-}
-inline uint8_t* WireFormatLite::WriteDoubleToArray(int field_number,
-                                                   double value,
-                                                   uint8_t* target) {
-  target = WriteTagToArray(field_number, WIRETYPE_FIXED64, target);
-  return WriteDoubleNoTagToArray(value, target);
-}
-inline uint8_t* WireFormatLite::WriteBoolToArray(int field_number, bool value,
-                                                 uint8_t* target) {
-  target = WriteTagToArray(field_number, WIRETYPE_VARINT, target);
-  return WriteBoolNoTagToArray(value, target);
-}
-inline uint8_t* WireFormatLite::WriteEnumToArray(int field_number, int value,
-                                                 uint8_t* target) {
-  target = WriteTagToArray(field_number, WIRETYPE_VARINT, target);
-  return WriteEnumNoTagToArray(value, target);
-}
-
-template <typename T>
-inline uint8_t* WireFormatLite::WritePrimitiveToArray(
-    int field_number, const RepeatedField<T>& value,
-    uint8_t* (*Writer)(int, T, uint8_t*), uint8_t* target) {
-  const int n = value.size();
-  if (n == 0) {
-    return target;
-  }
-
-  const T* ii = value.data();
-  int i = 0;
-  do {
-    target = Writer(field_number, ii[i], target);
-  } while (++i < n);
-
-  return target;
-}
-
-inline uint8_t* WireFormatLite::WriteInt32ToArray(
-    int field_number, const RepeatedField<int32_t>& value, uint8_t* target) {
-  return WritePrimitiveToArray(field_number, value, WriteInt32ToArray, target);
-}
-inline uint8_t* WireFormatLite::WriteInt64ToArray(
-    int field_number, const RepeatedField<int64_t>& value, uint8_t* target) {
-  return WritePrimitiveToArray(field_number, value, WriteInt64ToArray, target);
-}
-inline uint8_t* WireFormatLite::WriteUInt32ToArray(
-    int field_number, const RepeatedField<uint32_t>& value, uint8_t* target) {
-  return WritePrimitiveToArray(field_number, value, WriteUInt32ToArray, target);
-}
-inline uint8_t* WireFormatLite::WriteUInt64ToArray(
-    int field_number, const RepeatedField<uint64_t>& value, uint8_t* target) {
-  return WritePrimitiveToArray(field_number, value, WriteUInt64ToArray, target);
-}
-inline uint8_t* WireFormatLite::WriteSInt32ToArray(
-    int field_number, const RepeatedField<int32_t>& value, uint8_t* target) {
-  return WritePrimitiveToArray(field_number, value, WriteSInt32ToArray, target);
-}
-inline uint8_t* WireFormatLite::WriteSInt64ToArray(
-    int field_number, const RepeatedField<int64_t>& value, uint8_t* target) {
-  return WritePrimitiveToArray(field_number, value, WriteSInt64ToArray, target);
-}
-inline uint8_t* WireFormatLite::WriteFixed32ToArray(
-    int field_number, const RepeatedField<uint32_t>& value, uint8_t* target) {
-  return WritePrimitiveToArray(field_number, value, WriteFixed32ToArray,
-                               target);
-}
-inline uint8_t* WireFormatLite::WriteFixed64ToArray(
-    int field_number, const RepeatedField<uint64_t>& value, uint8_t* target) {
-  return WritePrimitiveToArray(field_number, value, WriteFixed64ToArray,
-                               target);
-}
-inline uint8_t* WireFormatLite::WriteSFixed32ToArray(
-    int field_number, const RepeatedField<int32_t>& value, uint8_t* target) {
-  return WritePrimitiveToArray(field_number, value, WriteSFixed32ToArray,
-                               target);
-}
-inline uint8_t* WireFormatLite::WriteSFixed64ToArray(
-    int field_number, const RepeatedField<int64_t>& value, uint8_t* target) {
-  return WritePrimitiveToArray(field_number, value, WriteSFixed64ToArray,
-                               target);
-}
-inline uint8_t* WireFormatLite::WriteFloatToArray(
-    int field_number, const RepeatedField<float>& value, uint8_t* target) {
-  return WritePrimitiveToArray(field_number, value, WriteFloatToArray, target);
-}
-inline uint8_t* WireFormatLite::WriteDoubleToArray(
-    int field_number, const RepeatedField<double>& value, uint8_t* target) {
-  return WritePrimitiveToArray(field_number, value, WriteDoubleToArray, target);
-}
-inline uint8_t* WireFormatLite::WriteBoolToArray(
-    int field_number, const RepeatedField<bool>& value, uint8_t* target) {
-  return WritePrimitiveToArray(field_number, value, WriteBoolToArray, target);
-}
-inline uint8_t* WireFormatLite::WriteEnumToArray(
-    int field_number, const RepeatedField<int>& value, uint8_t* target) {
-  return WritePrimitiveToArray(field_number, value, WriteEnumToArray, target);
-}
-inline uint8_t* WireFormatLite::WriteStringToArray(int field_number,
-                                                   const std::string& value,
-                                                   uint8_t* target) {
-  // String is for UTF-8 text only
-  // WARNING:  In wire_format.cc, both strings and bytes are handled by
-  //   WriteString() to avoid code duplication.  If the implementations become
-  //   different, you will need to update that usage.
-  target = WriteTagToArray(field_number, WIRETYPE_LENGTH_DELIMITED, target);
-  return io::CodedOutputStream::WriteStringWithSizeToArray(value, target);
-}
-inline uint8_t* WireFormatLite::WriteBytesToArray(int field_number,
-                                                  const std::string& value,
-                                                  uint8_t* target) {
-  target = WriteTagToArray(field_number, WIRETYPE_LENGTH_DELIMITED, target);
-  return io::CodedOutputStream::WriteStringWithSizeToArray(value, target);
-}
-
-
-// See comment on ReadGroupNoVirtual to understand the need for this template
-// parameter name.
-template <typename MessageType_WorkAroundCppLookupDefect>
-inline uint8_t* WireFormatLite::InternalWriteGroupNoVirtualToArray(
-    int field_number, const MessageType_WorkAroundCppLookupDefect& value,
-    uint8_t* target) {
-  target = WriteTagToArray(field_number, WIRETYPE_START_GROUP, target);
-  target = value.MessageType_WorkAroundCppLookupDefect::
-               SerializeWithCachedSizesToArray(target);
-  return WriteTagToArray(field_number, WIRETYPE_END_GROUP, target);
-}
-template <typename MessageType_WorkAroundCppLookupDefect>
-inline uint8_t* WireFormatLite::InternalWriteMessageNoVirtualToArray(
-    int field_number, const MessageType_WorkAroundCppLookupDefect& value,
-    uint8_t* target) {
-  target = WriteTagToArray(field_number, WIRETYPE_LENGTH_DELIMITED, target);
-  target = io::CodedOutputStream::WriteVarint32ToArray(
-      static_cast<uint32_t>(
-          value.MessageType_WorkAroundCppLookupDefect::GetCachedSize()),
-      target);
-  return value
-      .MessageType_WorkAroundCppLookupDefect::SerializeWithCachedSizesToArray(
-          target);
-}
-
-// ===================================================================
-
-inline size_t WireFormatLite::Int32Size(int32_t value) {
-  return io::CodedOutputStream::VarintSize32SignExtended(value);
-}
-inline size_t WireFormatLite::Int64Size(int64_t value) {
-  return io::CodedOutputStream::VarintSize64(static_cast<uint64_t>(value));
-}
-inline size_t WireFormatLite::UInt32Size(uint32_t value) {
-  return io::CodedOutputStream::VarintSize32(value);
-}
-inline size_t WireFormatLite::UInt64Size(uint64_t value) {
-  return io::CodedOutputStream::VarintSize64(value);
-}
-inline size_t WireFormatLite::SInt32Size(int32_t value) {
-  return io::CodedOutputStream::VarintSize32(ZigZagEncode32(value));
-}
-inline size_t WireFormatLite::SInt64Size(int64_t value) {
-  return io::CodedOutputStream::VarintSize64(ZigZagEncode64(value));
-}
-inline size_t WireFormatLite::EnumSize(int value) {
-  return io::CodedOutputStream::VarintSize32SignExtended(value);
-}
-inline size_t WireFormatLite::Int32SizePlusOne(int32_t value) {
-  return io::CodedOutputStream::VarintSize32SignExtendedPlusOne(value);
-}
-inline size_t WireFormatLite::Int64SizePlusOne(int64_t value) {
-  return io::CodedOutputStream::VarintSize64PlusOne(
-      static_cast<uint64_t>(value));
-}
-inline size_t WireFormatLite::UInt32SizePlusOne(uint32_t value) {
-  return io::CodedOutputStream::VarintSize32PlusOne(value);
-}
-inline size_t WireFormatLite::UInt64SizePlusOne(uint64_t value) {
-  return io::CodedOutputStream::VarintSize64PlusOne(value);
-}
-inline size_t WireFormatLite::SInt32SizePlusOne(int32_t value) {
-  return io::CodedOutputStream::VarintSize32PlusOne(ZigZagEncode32(value));
-}
-inline size_t WireFormatLite::SInt64SizePlusOne(int64_t value) {
-  return io::CodedOutputStream::VarintSize64PlusOne(ZigZagEncode64(value));
-}
-inline size_t WireFormatLite::EnumSizePlusOne(int value) {
-  return io::CodedOutputStream::VarintSize32SignExtendedPlusOne(value);
-}
-
-inline size_t WireFormatLite::StringSize(const std::string& value) {
-  return LengthDelimitedSize(value.size());
-}
-inline size_t WireFormatLite::BytesSize(const std::string& value) {
-  return LengthDelimitedSize(value.size());
-}
-
-
-template <typename MessageType>
-inline size_t WireFormatLite::GroupSize(const MessageType& value) {
-  return value.ByteSizeLong();
-}
-template <typename MessageType>
-inline size_t WireFormatLite::MessageSize(const MessageType& value) {
-  return LengthDelimitedSize(value.ByteSizeLong());
-}
-
-// See comment on ReadGroupNoVirtual to understand the need for this template
-// parameter name.
-template <typename MessageType_WorkAroundCppLookupDefect>
-inline size_t WireFormatLite::GroupSizeNoVirtual(
-    const MessageType_WorkAroundCppLookupDefect& value) {
-  return value.MessageType_WorkAroundCppLookupDefect::ByteSizeLong();
-}
-template <typename MessageType_WorkAroundCppLookupDefect>
-inline size_t WireFormatLite::MessageSizeNoVirtual(
-    const MessageType_WorkAroundCppLookupDefect& value) {
-  return LengthDelimitedSize(
-      value.MessageType_WorkAroundCppLookupDefect::ByteSizeLong());
-}
-
-inline size_t WireFormatLite::LengthDelimitedSize(size_t length) {
-  // The static_cast here prevents an error in certain compiler configurations
-  // but is not technically correct--if length is too large to fit in a uint32_t
-  // then it will be silently truncated. We will need to fix this if we ever
-  // decide to start supporting serialized messages greater than 2 GiB in size.
-  return length +
-         io::CodedOutputStream::VarintSize32(static_cast<uint32_t>(length));
-}
-
-template <typename MS>
-bool ParseMessageSetItemImpl(io::CodedInputStream* input, MS ms) {
-  // This method parses a group which should contain two fields:
-  //   required int32 type_id = 2;
-  //   required data message = 3;
-
-  uint32_t last_type_id = 0;
-
-  // If we see message data before the type_id, we'll append it to this so
-  // we can parse it later.
-  std::string message_data;
-
-  enum class State { kNoTag, kHasType, kHasPayload, kDone };
-  State state = State::kNoTag;
-
-  while (true) {
-    const uint32_t tag = input->ReadTagNoLastTag();
-    if (tag == 0) return false;
-
-    switch (tag) {
-      case WireFormatLite::kMessageSetTypeIdTag: {
-        uint32_t type_id;
-        if (!input->ReadVarint32(&type_id)) return false;
-        if (state == State::kNoTag) {
-          last_type_id = type_id;
-          state = State::kHasType;
-        } else if (state == State::kHasPayload) {
-          // We saw some message data before the type_id.  Have to parse it
-          // now.
-          io::CodedInputStream sub_input(
-              reinterpret_cast<const uint8_t*>(message_data.data()),
-              static_cast<int>(message_data.size()));
-          sub_input.SetRecursionLimit(input->RecursionBudget());
-          if (!ms.ParseField(type_id, &sub_input)) {
-            return false;
-          }
-          message_data.clear();
-          state = State::kDone;
-        }
-
-        break;
-      }
-
-      case WireFormatLite::kMessageSetMessageTag: {
-        if (state == State::kHasType) {
-          // Already saw type_id, so we can parse this directly.
-          if (!ms.ParseField(last_type_id, input)) {
-            return false;
-          }
-          state = State::kDone;
-        } else if (state == State::kNoTag) {
-          // We haven't seen a type_id yet.  Append this data to message_data.
-          uint32_t length;
-          if (!input->ReadVarint32(&length)) return false;
-          if (static_cast<int32_t>(length) < 0) return false;
-          uint32_t size = static_cast<uint32_t>(
-              length + io::CodedOutputStream::VarintSize32(length));
-          message_data.resize(size);
-          auto ptr = reinterpret_cast<uint8_t*>(&message_data[0]);
-          ptr = io::CodedOutputStream::WriteVarint32ToArray(length, ptr);
-          if (!input->ReadRaw(ptr, length)) return false;
-          state = State::kHasPayload;
-        } else {
-          if (!ms.SkipField(tag, input)) return false;
-        }
-
-        break;
-      }
-
-      case WireFormatLite::kMessageSetItemEndTag: {
-        return true;
-      }
-
-      default: {
-        if (!ms.SkipField(tag, input)) return false;
-      }
-    }
-  }
-}
-
-}  // namespace internal
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
-
-#endif  // GOOGLE_PROTOBUF_WIRE_FORMAT_LITE_H__
diff --git a/libs/protobuf/src/google/protobuf/wire_format_unittest.cc b/libs/protobuf/src/google/protobuf/wire_format_unittest.cc
deleted file mode 100644
index f1ed951..0000000
--- a/libs/protobuf/src/google/protobuf/wire_format_unittest.cc
+++ /dev/null
@@ -1,70 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-
-#include <google/protobuf/wire_format.h>
-
-#include <google/protobuf/unittest.pb.h>
-#include <google/protobuf/unittest_mset.pb.h>
-#include <google/protobuf/unittest_mset_wire_format.pb.h>
-#include <google/protobuf/unittest_proto3_arena.pb.h>
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
-#define UNITTEST ::protobuf_unittest
-#define UNITTEST_IMPORT ::protobuf_unittest_import
-#define UNITTEST_PACKAGE_NAME "protobuf_unittest"
-#define PROTO2_WIREFORMAT_UNITTEST ::proto2_wireformat_unittest
-#define PROTO3_ARENA_UNITTEST ::proto3_arena_unittest
-
-// Must include after defining UNITTEST, etc.
-// clang-format off
-#include <google/protobuf/test_util.inc>
-#include <google/protobuf/wire_format_unittest.inc>
-// clang-format on
-
-// Must be included last.
-#include <google/protobuf/port_def.inc>
-
-namespace google {
-namespace protobuf {
-namespace internal {
-namespace {
-
-
-}  // namespace
-}  // namespace internal
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
diff --git a/libs/protobuf/src/google/protobuf/wire_format_unittest.inc b/libs/protobuf/src/google/protobuf/wire_format_unittest.inc
deleted file mode 100644
index 0e3869c..0000000
--- a/libs/protobuf/src/google/protobuf/wire_format_unittest.inc
+++ /dev/null
@@ -1,1709 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-
-#include <google/protobuf/stubs/logging.h>
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/io/zero_copy_stream_impl.h>
-#include <google/protobuf/io/zero_copy_stream_impl_lite.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/wire_format.h>
-#include <google/protobuf/wire_format_lite.h>
-#include <gmock/gmock.h>
-#include <google/protobuf/testing/googletest.h>
-#include <gtest/gtest.h>
-#include <google/protobuf/stubs/casts.h>
-#include <google/protobuf/stubs/logging.h>
-#include <google/protobuf/stubs/strutil.h>
-#include <google/protobuf/dynamic_message.h>
-#include <google/protobuf/test_util2.h>
-#include <google/protobuf/stubs/stl_util.h>
-
-// clang-format off
-#include <google/protobuf/port_def.inc>
-// clang-format on
-
-namespace google {
-namespace protobuf {
-namespace internal {
-namespace {
-
-TEST(WireFormatTest, EnumsInSync) {
-  // Verify that WireFormatLite::FieldType and WireFormatLite::CppType match
-  // FieldDescriptor::Type and FieldDescriptor::CppType.
-
-  EXPECT_EQ(implicit_cast<int>(FieldDescriptor::MAX_TYPE),
-            implicit_cast<int>(WireFormatLite::MAX_FIELD_TYPE));
-  EXPECT_EQ(implicit_cast<int>(FieldDescriptor::MAX_CPPTYPE),
-            implicit_cast<int>(WireFormatLite::MAX_CPPTYPE));
-
-  for (int i = 1; i <= WireFormatLite::MAX_FIELD_TYPE; i++) {
-    EXPECT_EQ(implicit_cast<int>(FieldDescriptor::TypeToCppType(
-                  static_cast<FieldDescriptor::Type>(i))),
-              implicit_cast<int>(WireFormatLite::FieldTypeToCppType(
-                  static_cast<WireFormatLite::FieldType>(i))));
-  }
-}
-
-TEST(WireFormatTest, MaxFieldNumber) {
-  // Make sure the max field number constant is accurate.
-  EXPECT_EQ((1 << (32 - WireFormatLite::kTagTypeBits)) - 1,
-            FieldDescriptor::kMaxNumber);
-}
-
-TEST(WireFormatTest, Parse) {
-  UNITTEST::TestAllTypes source, dest;
-  std::string data;
-
-  // Serialize using the generated code.
-  TestUtil::SetAllFields(&source);
-  source.SerializeToString(&data);
-
-  // Parse using WireFormat.
-  io::ArrayInputStream raw_input(data.data(), data.size());
-  io::CodedInputStream input(&raw_input);
-  WireFormat::ParseAndMergePartial(&input, &dest);
-
-  // Check.
-  TestUtil::ExpectAllFieldsSet(dest);
-}
-
-TEST(WireFormatTest, ParseExtensions) {
-  UNITTEST::TestAllExtensions source, dest;
-  std::string data;
-
-  // Serialize using the generated code.
-  TestUtil::SetAllExtensions(&source);
-  source.SerializeToString(&data);
-
-  // Parse using WireFormat.
-  io::ArrayInputStream raw_input(data.data(), data.size());
-  io::CodedInputStream input(&raw_input);
-  WireFormat::ParseAndMergePartial(&input, &dest);
-
-  // Check.
-  TestUtil::ExpectAllExtensionsSet(dest);
-}
-
-TEST(WireFormatTest, ParsePacked) {
-  UNITTEST::TestPackedTypes source, dest;
-  std::string data;
-
-  // Serialize using the generated code.
-  TestUtil::SetPackedFields(&source);
-  source.SerializeToString(&data);
-
-  // Parse using WireFormat.
-  io::ArrayInputStream raw_input(data.data(), data.size());
-  io::CodedInputStream input(&raw_input);
-  WireFormat::ParseAndMergePartial(&input, &dest);
-
-  // Check.
-  TestUtil::ExpectPackedFieldsSet(dest);
-}
-
-TEST(WireFormatTest, ParsePackedFromUnpacked) {
-  // Serialize using the generated code.
-  UNITTEST::TestUnpackedTypes source;
-  TestUtil::SetUnpackedFields(&source);
-  std::string data = source.SerializeAsString();
-
-  // Parse using WireFormat.
-  UNITTEST::TestPackedTypes dest;
-  io::ArrayInputStream raw_input(data.data(), data.size());
-  io::CodedInputStream input(&raw_input);
-  WireFormat::ParseAndMergePartial(&input, &dest);
-
-  // Check.
-  TestUtil::ExpectPackedFieldsSet(dest);
-}
-
-TEST(WireFormatTest, ParseUnpackedFromPacked) {
-  // Serialize using the generated code.
-  UNITTEST::TestPackedTypes source;
-  TestUtil::SetPackedFields(&source);
-  std::string data = source.SerializeAsString();
-
-  // Parse using WireFormat.
-  UNITTEST::TestUnpackedTypes dest;
-  io::ArrayInputStream raw_input(data.data(), data.size());
-  io::CodedInputStream input(&raw_input);
-  WireFormat::ParseAndMergePartial(&input, &dest);
-
-  // Check.
-  TestUtil::ExpectUnpackedFieldsSet(dest);
-}
-
-TEST(WireFormatTest, ParsePackedExtensions) {
-  UNITTEST::TestPackedExtensions source, dest;
-  std::string data;
-
-  // Serialize using the generated code.
-  TestUtil::SetPackedExtensions(&source);
-  source.SerializeToString(&data);
-
-  // Parse using WireFormat.
-  io::ArrayInputStream raw_input(data.data(), data.size());
-  io::CodedInputStream input(&raw_input);
-  WireFormat::ParseAndMergePartial(&input, &dest);
-
-  // Check.
-  TestUtil::ExpectPackedExtensionsSet(dest);
-}
-
-TEST(WireFormatTest, ParseOneof) {
-  UNITTEST::TestOneof2 source, dest;
-  std::string data;
-
-  // Serialize using the generated code.
-  TestUtil::SetOneof1(&source);
-  source.SerializeToString(&data);
-
-  // Parse using WireFormat.
-  io::ArrayInputStream raw_input(data.data(), data.size());
-  io::CodedInputStream input(&raw_input);
-  WireFormat::ParseAndMergePartial(&input, &dest);
-
-  // Check.
-  TestUtil::ExpectOneofSet1(dest);
-}
-
-TEST(WireFormatTest, OneofOnlySetLast) {
-  UNITTEST::TestOneofBackwardsCompatible source;
-  UNITTEST::TestOneof oneof_dest;
-  std::string data;
-
-  // Set two fields
-  source.set_foo_int(100);
-  source.set_foo_string("101");
-
-  // Serialize and parse to oneof message. Generated serializer may not order
-  // fields in tag order. Use WireFormat::SerializeWithCachedSizes instead as
-  // it sorts fields beforehand.
-  {
-    io::StringOutputStream raw_output(&data);
-    io::CodedOutputStream output(&raw_output);
-    WireFormat::SerializeWithCachedSizes(source, source.ByteSizeLong(),
-                                         &output);
-    ASSERT_FALSE(output.HadError());
-  }
-  io::ArrayInputStream raw_input(data.data(), data.size());
-  io::CodedInputStream input(&raw_input);
-  WireFormat::ParseAndMergePartial(&input, &oneof_dest);
-
-  // Only the last field is set.
-  EXPECT_FALSE(oneof_dest.has_foo_int());
-  EXPECT_TRUE(oneof_dest.has_foo_string());
-}
-
-TEST(WireFormatTest, ByteSize) {
-  UNITTEST::TestAllTypes message;
-  TestUtil::SetAllFields(&message);
-
-  EXPECT_EQ(message.ByteSizeLong(), WireFormat::ByteSize(message));
-  message.Clear();
-  EXPECT_EQ(0, message.ByteSizeLong());
-  EXPECT_EQ(0, WireFormat::ByteSize(message));
-}
-
-TEST(WireFormatTest, ByteSizeExtensions) {
-  UNITTEST::TestAllExtensions message;
-  TestUtil::SetAllExtensions(&message);
-
-  EXPECT_EQ(message.ByteSizeLong(), WireFormat::ByteSize(message));
-  message.Clear();
-  EXPECT_EQ(0, message.ByteSizeLong());
-  EXPECT_EQ(0, WireFormat::ByteSize(message));
-}
-
-TEST(WireFormatTest, ByteSizePacked) {
-  UNITTEST::TestPackedTypes message;
-  TestUtil::SetPackedFields(&message);
-
-  EXPECT_EQ(message.ByteSizeLong(), WireFormat::ByteSize(message));
-  message.Clear();
-  EXPECT_EQ(0, message.ByteSizeLong());
-  EXPECT_EQ(0, WireFormat::ByteSize(message));
-}
-
-TEST(WireFormatTest, ByteSizePackedExtensions) {
-  UNITTEST::TestPackedExtensions message;
-  TestUtil::SetPackedExtensions(&message);
-
-  EXPECT_EQ(message.ByteSizeLong(), WireFormat::ByteSize(message));
-  message.Clear();
-  EXPECT_EQ(0, message.ByteSizeLong());
-  EXPECT_EQ(0, WireFormat::ByteSize(message));
-}
-
-TEST(WireFormatTest, ByteSizeOneof) {
-  UNITTEST::TestOneof2 message;
-  TestUtil::SetOneof1(&message);
-
-  EXPECT_EQ(message.ByteSizeLong(), WireFormat::ByteSize(message));
-  message.Clear();
-
-  EXPECT_EQ(0, message.ByteSizeLong());
-  EXPECT_EQ(0, WireFormat::ByteSize(message));
-}
-
-TEST(WireFormatTest, Serialize) {
-  UNITTEST::TestAllTypes message;
-  std::string generated_data;
-  std::string dynamic_data;
-
-  TestUtil::SetAllFields(&message);
-  size_t size = message.ByteSizeLong();
-
-  // Serialize using the generated code.
-  {
-    io::StringOutputStream raw_output(&generated_data);
-    io::CodedOutputStream output(&raw_output);
-    message.SerializeWithCachedSizes(&output);
-    ASSERT_FALSE(output.HadError());
-  }
-
-  // Serialize using WireFormat.
-  {
-    io::StringOutputStream raw_output(&dynamic_data);
-    io::CodedOutputStream output(&raw_output);
-    WireFormat::SerializeWithCachedSizes(message, size, &output);
-    ASSERT_FALSE(output.HadError());
-  }
-
-  // Should parse to the same message.
-  EXPECT_TRUE(TestUtil::EqualsToSerialized(message, generated_data));
-  EXPECT_TRUE(TestUtil::EqualsToSerialized(message, dynamic_data));
-}
-
-TEST(WireFormatTest, SerializeExtensions) {
-  UNITTEST::TestAllExtensions message;
-  std::string generated_data;
-  std::string dynamic_data;
-
-  TestUtil::SetAllExtensions(&message);
-  size_t size = message.ByteSizeLong();
-
-  // Serialize using the generated code.
-  {
-    io::StringOutputStream raw_output(&generated_data);
-    io::CodedOutputStream output(&raw_output);
-    message.SerializeWithCachedSizes(&output);
-    ASSERT_FALSE(output.HadError());
-  }
-
-  // Serialize using WireFormat.
-  {
-    io::StringOutputStream raw_output(&dynamic_data);
-    io::CodedOutputStream output(&raw_output);
-    WireFormat::SerializeWithCachedSizes(message, size, &output);
-    ASSERT_FALSE(output.HadError());
-  }
-
-  // Should parse to the same message.
-  EXPECT_TRUE(TestUtil::EqualsToSerialized(message, generated_data));
-  EXPECT_TRUE(TestUtil::EqualsToSerialized(message, dynamic_data));
-}
-
-TEST(WireFormatTest, SerializeFieldsAndExtensions) {
-  UNITTEST::TestFieldOrderings message;
-  std::string generated_data;
-  std::string dynamic_data;
-
-  TestUtil::SetAllFieldsAndExtensions(&message);
-  size_t size = message.ByteSizeLong();
-
-  // Serialize using the generated code.
-  {
-    io::StringOutputStream raw_output(&generated_data);
-    io::CodedOutputStream output(&raw_output);
-    message.SerializeWithCachedSizes(&output);
-    ASSERT_FALSE(output.HadError());
-  }
-
-  // Serialize using WireFormat.
-  {
-    io::StringOutputStream raw_output(&dynamic_data);
-    io::CodedOutputStream output(&raw_output);
-    WireFormat::SerializeWithCachedSizes(message, size, &output);
-    ASSERT_FALSE(output.HadError());
-  }
-
-  // Should parse to the same message.
-  EXPECT_TRUE(TestUtil::EqualsToSerialized(message, generated_data));
-  EXPECT_TRUE(TestUtil::EqualsToSerialized(message, dynamic_data));
-}
-
-TEST(WireFormatTest, SerializeOneof) {
-  UNITTEST::TestOneof2 message;
-  std::string generated_data;
-  std::string dynamic_data;
-
-  TestUtil::SetOneof1(&message);
-  size_t size = message.ByteSizeLong();
-
-  // Serialize using the generated code.
-  {
-    io::StringOutputStream raw_output(&generated_data);
-    io::CodedOutputStream output(&raw_output);
-    message.SerializeWithCachedSizes(&output);
-    ASSERT_FALSE(output.HadError());
-  }
-
-  // Serialize using WireFormat.
-  {
-    io::StringOutputStream raw_output(&dynamic_data);
-    io::CodedOutputStream output(&raw_output);
-    WireFormat::SerializeWithCachedSizes(message, size, &output);
-    ASSERT_FALSE(output.HadError());
-  }
-
-  // Should parse to the same message.
-  EXPECT_TRUE(TestUtil::EqualsToSerialized(message, generated_data));
-  EXPECT_TRUE(TestUtil::EqualsToSerialized(message, dynamic_data));
-}
-
-TEST(WireFormatTest, ParseMultipleExtensionRanges) {
-  // Make sure we can parse a message that contains multiple extensions ranges.
-  UNITTEST::TestFieldOrderings source;
-  std::string data;
-
-  TestUtil::SetAllFieldsAndExtensions(&source);
-  source.SerializeToString(&data);
-
-  {
-    UNITTEST::TestFieldOrderings dest;
-    EXPECT_TRUE(dest.ParseFromString(data));
-    EXPECT_EQ(source.DebugString(), dest.DebugString());
-  }
-
-  // Also test using reflection-based parsing.
-  {
-    UNITTEST::TestFieldOrderings dest;
-    io::ArrayInputStream raw_input(data.data(), data.size());
-    io::CodedInputStream coded_input(&raw_input);
-    EXPECT_TRUE(WireFormat::ParseAndMergePartial(&coded_input, &dest));
-    EXPECT_EQ(source.DebugString(), dest.DebugString());
-  }
-}
-
-const int kUnknownTypeId = 1550055;
-
-TEST(WireFormatTest, SerializeMessageSet) {
-  // Set up a TestMessageSet with two known messages and an unknown one.
-  PROTO2_WIREFORMAT_UNITTEST::TestMessageSet message_set;
-  message_set
-      .MutableExtension(
-          UNITTEST::TestMessageSetExtension1::message_set_extension)
-      ->set_i(123);
-  message_set
-      .MutableExtension(
-          UNITTEST::TestMessageSetExtension2::message_set_extension)
-      ->set_str("foo");
-  message_set.mutable_unknown_fields()->AddLengthDelimited(kUnknownTypeId,
-                                                           "bar");
-
-  std::string data;
-  ASSERT_TRUE(message_set.SerializeToString(&data));
-
-  // Parse back using RawMessageSet and check the contents.
-  UNITTEST::RawMessageSet raw;
-  ASSERT_TRUE(raw.ParseFromString(data));
-
-  EXPECT_EQ(0, raw.unknown_fields().field_count());
-
-  ASSERT_EQ(3, raw.item_size());
-  EXPECT_EQ(
-      UNITTEST::TestMessageSetExtension1::descriptor()->extension(0)->number(),
-      raw.item(0).type_id());
-  EXPECT_EQ(
-      UNITTEST::TestMessageSetExtension2::descriptor()->extension(0)->number(),
-      raw.item(1).type_id());
-  EXPECT_EQ(kUnknownTypeId, raw.item(2).type_id());
-
-  UNITTEST::TestMessageSetExtension1 message1;
-  EXPECT_TRUE(message1.ParseFromString(raw.item(0).message()));
-  EXPECT_EQ(123, message1.i());
-
-  UNITTEST::TestMessageSetExtension2 message2;
-  EXPECT_TRUE(message2.ParseFromString(raw.item(1).message()));
-  EXPECT_EQ("foo", message2.str());
-
-  EXPECT_EQ("bar", raw.item(2).message());
-}
-
-TEST(WireFormatTest, SerializeMessageSetVariousWaysAreEqual) {
-  // Serialize a MessageSet to a stream and to a flat array using generated
-  // code, and also using WireFormat, and check that the results are equal.
-  // Set up a TestMessageSet with two known messages and an unknown one, as
-  // above.
-
-  PROTO2_WIREFORMAT_UNITTEST::TestMessageSet message_set;
-  message_set
-      .MutableExtension(
-          UNITTEST::TestMessageSetExtension1::message_set_extension)
-      ->set_i(123);
-  message_set
-      .MutableExtension(
-          UNITTEST::TestMessageSetExtension2::message_set_extension)
-      ->set_str("foo");
-  message_set.mutable_unknown_fields()->AddLengthDelimited(kUnknownTypeId,
-                                                           "bar");
-
-  size_t size = message_set.ByteSizeLong();
-  EXPECT_EQ(size, message_set.GetCachedSize());
-  ASSERT_EQ(size, WireFormat::ByteSize(message_set));
-
-  std::string flat_data;
-  std::string stream_data;
-  std::string dynamic_data;
-  flat_data.resize(size);
-  stream_data.resize(size);
-
-  // Serialize to flat array
-  {
-    uint8_t* target =
-        reinterpret_cast<uint8_t*>(::google::protobuf::string_as_array(&flat_data));
-    uint8_t* end = message_set.SerializeWithCachedSizesToArray(target);
-    EXPECT_EQ(size, end - target);
-  }
-
-  // Serialize to buffer
-  {
-    io::ArrayOutputStream array_stream(::google::protobuf::string_as_array(&stream_data), size,
-                                       1);
-    io::CodedOutputStream output_stream(&array_stream);
-    message_set.SerializeWithCachedSizes(&output_stream);
-    ASSERT_FALSE(output_stream.HadError());
-  }
-
-  // Serialize to buffer with WireFormat.
-  {
-    io::StringOutputStream string_stream(&dynamic_data);
-    io::CodedOutputStream output_stream(&string_stream);
-    WireFormat::SerializeWithCachedSizes(message_set, size, &output_stream);
-    ASSERT_FALSE(output_stream.HadError());
-  }
-
-  EXPECT_TRUE(flat_data == stream_data);
-  EXPECT_TRUE(flat_data == dynamic_data);
-}
-
-TEST(WireFormatTest, ParseMessageSet) {
-  // Set up a RawMessageSet with two known messages and an unknown one.
-  UNITTEST::RawMessageSet raw;
-
-  {
-    UNITTEST::RawMessageSet::Item* item = raw.add_item();
-    item->set_type_id(UNITTEST::TestMessageSetExtension1::descriptor()
-                          ->extension(0)
-                          ->number());
-    UNITTEST::TestMessageSetExtension1 message;
-    message.set_i(123);
-    message.SerializeToString(item->mutable_message());
-  }
-
-  {
-    UNITTEST::RawMessageSet::Item* item = raw.add_item();
-    item->set_type_id(UNITTEST::TestMessageSetExtension2::descriptor()
-                          ->extension(0)
-                          ->number());
-    UNITTEST::TestMessageSetExtension2 message;
-    message.set_str("foo");
-    message.SerializeToString(item->mutable_message());
-  }
-
-  {
-    UNITTEST::RawMessageSet::Item* item = raw.add_item();
-    item->set_type_id(kUnknownTypeId);
-    item->set_message("bar");
-  }
-
-  std::string data;
-  ASSERT_TRUE(raw.SerializeToString(&data));
-
-  // Parse as a TestMessageSet and check the contents.
-  PROTO2_WIREFORMAT_UNITTEST::TestMessageSet message_set;
-  ASSERT_TRUE(message_set.ParseFromString(data));
-
-  EXPECT_EQ(123,
-            message_set
-                .GetExtension(
-                    UNITTEST::TestMessageSetExtension1::message_set_extension)
-                .i());
-  EXPECT_EQ("foo",
-            message_set
-                .GetExtension(
-                    UNITTEST::TestMessageSetExtension2::message_set_extension)
-                .str());
-
-  ASSERT_EQ(1, message_set.unknown_fields().field_count());
-  ASSERT_EQ(UnknownField::TYPE_LENGTH_DELIMITED,
-            message_set.unknown_fields().field(0).type());
-  EXPECT_EQ("bar", message_set.unknown_fields().field(0).length_delimited());
-
-  // Also parse using WireFormat.
-  PROTO2_WIREFORMAT_UNITTEST::TestMessageSet dynamic_message_set;
-  io::CodedInputStream input(reinterpret_cast<const uint8_t*>(data.data()),
-                             data.size());
-  ASSERT_TRUE(WireFormat::ParseAndMergePartial(&input, &dynamic_message_set));
-  EXPECT_EQ(message_set.DebugString(), dynamic_message_set.DebugString());
-}
-
-namespace {
-std::string BuildMessageSetItemStart() {
-  std::string data;
-  {
-    io::StringOutputStream output_stream(&data);
-    io::CodedOutputStream coded_output(&output_stream);
-    coded_output.WriteTag(WireFormatLite::kMessageSetItemStartTag);
-  }
-  return data;
-}
-std::string BuildMessageSetItemEnd() {
-  std::string data;
-  {
-    io::StringOutputStream output_stream(&data);
-    io::CodedOutputStream coded_output(&output_stream);
-    coded_output.WriteTag(WireFormatLite::kMessageSetItemEndTag);
-  }
-  return data;
-}
-std::string BuildMessageSetTestExtension1(int value = 123) {
-  std::string data;
-  {
-    UNITTEST::TestMessageSetExtension1 message;
-    message.set_i(value);
-    io::StringOutputStream output_stream(&data);
-    io::CodedOutputStream coded_output(&output_stream);
-    // Write the message content first.
-    WireFormatLite::WriteTag(WireFormatLite::kMessageSetMessageNumber,
-                             WireFormatLite::WIRETYPE_LENGTH_DELIMITED,
-                             &coded_output);
-    coded_output.WriteVarint32(message.ByteSizeLong());
-    message.SerializeWithCachedSizes(&coded_output);
-  }
-  return data;
-}
-std::string BuildMessageSetItemTypeId(int extension_number) {
-  std::string data;
-  {
-    io::StringOutputStream output_stream(&data);
-    io::CodedOutputStream coded_output(&output_stream);
-    WireFormatLite::WriteUInt32(WireFormatLite::kMessageSetTypeIdNumber,
-                                extension_number, &coded_output);
-  }
-  return data;
-}
-void ValidateTestMessageSet(const std::string& test_case,
-                            const std::string& data) {
-  SCOPED_TRACE(test_case);
-  {
-    PROTO2_WIREFORMAT_UNITTEST::TestMessageSet message_set;
-    ASSERT_TRUE(message_set.ParseFromString(data));
-
-    EXPECT_EQ(123,
-              message_set
-                  .GetExtension(
-                      UNITTEST::TestMessageSetExtension1::message_set_extension)
-                  .i());
-
-    // Make sure it does not contain anything else.
-    message_set.ClearExtension(
-        UNITTEST::TestMessageSetExtension1::message_set_extension);
-    EXPECT_EQ(message_set.SerializeAsString(), "");
-  }
-  {
-    // Test parse the message via Reflection.
-    PROTO2_WIREFORMAT_UNITTEST::TestMessageSet message_set;
-    io::CodedInputStream input(reinterpret_cast<const uint8_t*>(data.data()),
-                               data.size());
-    EXPECT_TRUE(WireFormat::ParseAndMergePartial(&input, &message_set));
-    EXPECT_TRUE(input.ConsumedEntireMessage());
-
-    EXPECT_EQ(123,
-              message_set
-                  .GetExtension(
-                      UNITTEST::TestMessageSetExtension1::message_set_extension)
-                  .i());
-  }
-  {
-    // Test parse the message via DynamicMessage.
-    DynamicMessageFactory factory;
-    std::unique_ptr<Message> msg(
-        factory
-            .GetPrototype(
-                PROTO2_WIREFORMAT_UNITTEST::TestMessageSet::descriptor())
-            ->New());
-    msg->ParseFromString(data);
-    auto* reflection = msg->GetReflection();
-    std::vector<const FieldDescriptor*> fields;
-    reflection->ListFields(*msg, &fields);
-    ASSERT_EQ(fields.size(), 1);
-    const auto& sub = reflection->GetMessage(*msg, fields[0]);
-    reflection = sub.GetReflection();
-    EXPECT_EQ(123, reflection->GetInt32(
-                       sub, sub.GetDescriptor()->FindFieldByName("i")));
-  }
-}
-}  // namespace
-
-TEST(WireFormatTest, ParseMessageSetWithAnyTagOrder) {
-  std::string start = BuildMessageSetItemStart();
-  std::string end = BuildMessageSetItemEnd();
-  std::string id = BuildMessageSetItemTypeId(
-      UNITTEST::TestMessageSetExtension1::descriptor()->extension(0)->number());
-  std::string message = BuildMessageSetTestExtension1();
-
-  ValidateTestMessageSet("id + message", start + id + message + end);
-  ValidateTestMessageSet("message + id", start + message + id + end);
-}
-
-TEST(WireFormatTest, ParseMessageSetWithDuplicateTags) {
-  std::string start = BuildMessageSetItemStart();
-  std::string end = BuildMessageSetItemEnd();
-  std::string id = BuildMessageSetItemTypeId(
-      UNITTEST::TestMessageSetExtension1::descriptor()->extension(0)->number());
-  std::string other_id = BuildMessageSetItemTypeId(123456);
-  std::string message = BuildMessageSetTestExtension1();
-  std::string other_message = BuildMessageSetTestExtension1(321);
-
-  // Double id
-  ValidateTestMessageSet("id + other_id + message",
-                         start + id + other_id + message + end);
-  ValidateTestMessageSet("id + message + other_id",
-                         start + id + message + other_id + end);
-  ValidateTestMessageSet("message + id + other_id",
-                         start + message + id + other_id + end);
-  // Double message
-  ValidateTestMessageSet("id + message + other_message",
-                         start + id + message + other_message + end);
-  ValidateTestMessageSet("message + id + other_message",
-                         start + message + id + other_message + end);
-  ValidateTestMessageSet("message + other_message + id",
-                         start + message + other_message + id + end);
-}
-
-void SerializeReverseOrder(
-    const PROTO2_WIREFORMAT_UNITTEST::TestMessageSet& mset,
-    io::CodedOutputStream* coded_output);
-
-void SerializeReverseOrder(const UNITTEST::TestMessageSetExtension1& message,
-                           io::CodedOutputStream* coded_output) {
-  WireFormatLite::WriteTag(15,  // i
-                           WireFormatLite::WIRETYPE_VARINT, coded_output);
-  coded_output->WriteVarint64(message.i());
-  WireFormatLite::WriteTag(16,  // recursive
-                           WireFormatLite::WIRETYPE_LENGTH_DELIMITED,
-                           coded_output);
-  coded_output->WriteVarint32(message.recursive().GetCachedSize());
-  SerializeReverseOrder(message.recursive(), coded_output);
-}
-
-void SerializeReverseOrder(
-    const PROTO2_WIREFORMAT_UNITTEST::TestMessageSet& mset,
-    io::CodedOutputStream* coded_output) {
-  if (!mset.HasExtension(
-          UNITTEST::TestMessageSetExtension1::message_set_extension))
-    return;
-  coded_output->WriteTag(WireFormatLite::kMessageSetItemStartTag);
-  // Write the message content first.
-  WireFormatLite::WriteTag(WireFormatLite::kMessageSetMessageNumber,
-                           WireFormatLite::WIRETYPE_LENGTH_DELIMITED,
-                           coded_output);
-  auto& message = mset.GetExtension(
-      UNITTEST::TestMessageSetExtension1::message_set_extension);
-  coded_output->WriteVarint32(message.GetCachedSize());
-  SerializeReverseOrder(message, coded_output);
-  // Write the type id.
-  uint32_t type_id = message.GetDescriptor()->extension(0)->number();
-  WireFormatLite::WriteUInt32(WireFormatLite::kMessageSetTypeIdNumber, type_id,
-                              coded_output);
-  coded_output->WriteTag(WireFormatLite::kMessageSetItemEndTag);
-}
-
-TEST(WireFormatTest, ParseMessageSetWithDeepRecReverseOrder) {
-  std::string data;
-  {
-    PROTO2_WIREFORMAT_UNITTEST::TestMessageSet message_set;
-    PROTO2_WIREFORMAT_UNITTEST::TestMessageSet* mset = &message_set;
-    for (int i = 0; i < 200; i++) {
-      auto m = mset->MutableExtension(
-          UNITTEST::TestMessageSetExtension1::message_set_extension);
-      m->set_i(i);
-      mset = m->mutable_recursive();
-    }
-    message_set.ByteSizeLong();
-    // Serialize with reverse payload tag order
-    io::StringOutputStream output_stream(&data);
-    io::CodedOutputStream coded_output(&output_stream);
-    SerializeReverseOrder(message_set, &coded_output);
-  }
-  PROTO2_WIREFORMAT_UNITTEST::TestMessageSet message_set;
-  EXPECT_FALSE(message_set.ParseFromString(data));
-}
-
-TEST(WireFormatTest, ParseFailMalformedMessageSet) {
-  constexpr int kDepth = 5;
-  std::string data;
-  {
-    PROTO2_WIREFORMAT_UNITTEST::TestMessageSet message_set;
-    PROTO2_WIREFORMAT_UNITTEST::TestMessageSet* mset = &message_set;
-    for (int i = 0; i < kDepth; i++) {
-      auto m = mset->MutableExtension(
-          UNITTEST::TestMessageSetExtension1::message_set_extension);
-      m->set_i(i);
-      mset = m->mutable_recursive();
-    }
-    auto m = mset->MutableExtension(
-        UNITTEST::TestMessageSetExtension1::message_set_extension);
-    // -1 becomes \xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\x1
-    m->set_i(-1);
-
-    EXPECT_TRUE(message_set.SerializeToString(&data));
-    // Make the proto mal-formed.
-    data[data.size() - 2 - kDepth] = 0xFF;
-  }
-
-  PROTO2_WIREFORMAT_UNITTEST::TestMessageSet message_set;
-  EXPECT_FALSE(message_set.ParseFromString(data));
-}
-
-TEST(WireFormatTest, ParseFailMalformedMessageSetReverseOrder) {
-  constexpr int kDepth = 5;
-  std::string data;
-  {
-    PROTO2_WIREFORMAT_UNITTEST::TestMessageSet message_set;
-    PROTO2_WIREFORMAT_UNITTEST::TestMessageSet* mset = &message_set;
-    for (int i = 0; i < kDepth; i++) {
-      auto m = mset->MutableExtension(
-          UNITTEST::TestMessageSetExtension1::message_set_extension);
-      m->set_i(i);
-      mset = m->mutable_recursive();
-    }
-    auto m = mset->MutableExtension(
-        UNITTEST::TestMessageSetExtension1::message_set_extension);
-    // -1 becomes \xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\x1
-    m->set_i(-1);
-    // SerializeReverseOrder() assumes "recursive" is always present.
-    m->mutable_recursive();
-
-    message_set.ByteSizeLong();
-
-    // Serialize with reverse payload tag order
-    io::StringOutputStream output_stream(&data);
-    io::CodedOutputStream coded_output(&output_stream);
-    SerializeReverseOrder(message_set, &coded_output);
-  }
-
-  // Make varint for -1 malformed.
-  data[data.size() - 5 * (kDepth + 1) - 4] = 0xFF;
-
-  PROTO2_WIREFORMAT_UNITTEST::TestMessageSet message_set;
-  EXPECT_FALSE(message_set.ParseFromString(data));
-}
-
-TEST(WireFormatTest, ParseBrokenMessageSet) {
-  PROTO2_WIREFORMAT_UNITTEST::TestMessageSet message_set;
-  std::string input("goodbye");  // Invalid wire format data.
-  EXPECT_FALSE(message_set.ParseFromString(input));
-}
-
-TEST(WireFormatTest, RecursionLimit) {
-  UNITTEST::TestRecursiveMessage message;
-  message.mutable_a()->mutable_a()->mutable_a()->mutable_a()->set_i(1);
-  std::string data;
-  message.SerializeToString(&data);
-
-  {
-    io::ArrayInputStream raw_input(data.data(), data.size());
-    io::CodedInputStream input(&raw_input);
-    input.SetRecursionLimit(4);
-    UNITTEST::TestRecursiveMessage message2;
-    EXPECT_TRUE(message2.ParseFromCodedStream(&input));
-  }
-
-  {
-    io::ArrayInputStream raw_input(data.data(), data.size());
-    io::CodedInputStream input(&raw_input);
-    input.SetRecursionLimit(3);
-    UNITTEST::TestRecursiveMessage message2;
-    EXPECT_FALSE(message2.ParseFromCodedStream(&input));
-  }
-}
-
-TEST(WireFormatTest, LargeRecursionLimit) {
-  const int kLargeLimit = io::CodedInputStream::GetDefaultRecursionLimit() + 50;
-  UNITTEST::TestRecursiveMessage src, dst, *a;
-  a = src.mutable_a();
-  for (int i = 0; i < kLargeLimit - 1; i++) {
-    a = a->mutable_a();
-  }
-  a->set_i(1);
-
-  std::string data = src.SerializeAsString();
-  {
-    // Parse with default recursion limit. Should fail.
-    io::ArrayInputStream raw_input(data.data(), data.size());
-    io::CodedInputStream input(&raw_input);
-    ASSERT_FALSE(dst.ParseFromCodedStream(&input));
-  }
-
-  {
-    // Parse with custom recursion limit. Should pass.
-    io::ArrayInputStream raw_input(data.data(), data.size());
-    io::CodedInputStream input(&raw_input);
-    input.SetRecursionLimit(kLargeLimit);
-    ASSERT_TRUE(dst.ParseFromCodedStream(&input));
-  }
-
-  // Verifies the recursion depth.
-  int depth = 1;
-  a = dst.mutable_a();
-  while (a->has_a()) {
-    a = a->mutable_a();
-    depth++;
-  }
-
-  EXPECT_EQ(a->i(), 1);
-  EXPECT_EQ(depth, kLargeLimit);
-}
-
-TEST(WireFormatTest, UnknownFieldRecursionLimit) {
-  UNITTEST::TestEmptyMessage message;
-  message.mutable_unknown_fields()
-      ->AddGroup(1234)
-      ->AddGroup(1234)
-      ->AddGroup(1234)
-      ->AddGroup(1234)
-      ->AddVarint(1234, 123);
-  std::string data;
-  message.SerializeToString(&data);
-
-  {
-    io::ArrayInputStream raw_input(data.data(), data.size());
-    io::CodedInputStream input(&raw_input);
-    input.SetRecursionLimit(4);
-    UNITTEST::TestEmptyMessage message2;
-    EXPECT_TRUE(message2.ParseFromCodedStream(&input));
-  }
-
-  {
-    io::ArrayInputStream raw_input(data.data(), data.size());
-    io::CodedInputStream input(&raw_input);
-    input.SetRecursionLimit(3);
-    UNITTEST::TestEmptyMessage message2;
-    EXPECT_FALSE(message2.ParseFromCodedStream(&input));
-  }
-}
-
-TEST(WireFormatTest, ZigZag) {
-// avoid line-wrapping
-#define LL(x) static_cast<int64_t>(ULL(x))
-#define ULL(x) uint64_t{x##u}
-#define ZigZagEncode32(x) WireFormatLite::ZigZagEncode32(x)
-#define ZigZagDecode32(x) WireFormatLite::ZigZagDecode32(x)
-#define ZigZagEncode64(x) WireFormatLite::ZigZagEncode64(x)
-#define ZigZagDecode64(x) WireFormatLite::ZigZagDecode64(x)
-
-  EXPECT_EQ(0u, ZigZagEncode32(0));
-  EXPECT_EQ(1u, ZigZagEncode32(-1));
-  EXPECT_EQ(2u, ZigZagEncode32(1));
-  EXPECT_EQ(3u, ZigZagEncode32(-2));
-  EXPECT_EQ(0x7FFFFFFEu, ZigZagEncode32(0x3FFFFFFF));
-  EXPECT_EQ(0x7FFFFFFFu, ZigZagEncode32(0xC0000000));
-  EXPECT_EQ(0xFFFFFFFEu, ZigZagEncode32(0x7FFFFFFF));
-  EXPECT_EQ(0xFFFFFFFFu, ZigZagEncode32(0x80000000));
-
-  EXPECT_EQ(0, ZigZagDecode32(0u));
-  EXPECT_EQ(-1, ZigZagDecode32(1u));
-  EXPECT_EQ(1, ZigZagDecode32(2u));
-  EXPECT_EQ(-2, ZigZagDecode32(3u));
-  EXPECT_EQ(0x3FFFFFFF, ZigZagDecode32(0x7FFFFFFEu));
-  EXPECT_EQ(0xC0000000, ZigZagDecode32(0x7FFFFFFFu));
-  EXPECT_EQ(0x7FFFFFFF, ZigZagDecode32(0xFFFFFFFEu));
-  EXPECT_EQ(0x80000000, ZigZagDecode32(0xFFFFFFFFu));
-
-  EXPECT_EQ(0u, ZigZagEncode64(0));
-  EXPECT_EQ(1u, ZigZagEncode64(-1));
-  EXPECT_EQ(2u, ZigZagEncode64(1));
-  EXPECT_EQ(3u, ZigZagEncode64(-2));
-  EXPECT_EQ(ULL(0x000000007FFFFFFE), ZigZagEncode64(LL(0x000000003FFFFFFF)));
-  EXPECT_EQ(ULL(0x000000007FFFFFFF), ZigZagEncode64(LL(0xFFFFFFFFC0000000)));
-  EXPECT_EQ(ULL(0x00000000FFFFFFFE), ZigZagEncode64(LL(0x000000007FFFFFFF)));
-  EXPECT_EQ(ULL(0x00000000FFFFFFFF), ZigZagEncode64(LL(0xFFFFFFFF80000000)));
-  EXPECT_EQ(ULL(0xFFFFFFFFFFFFFFFE), ZigZagEncode64(LL(0x7FFFFFFFFFFFFFFF)));
-  EXPECT_EQ(ULL(0xFFFFFFFFFFFFFFFF), ZigZagEncode64(LL(0x8000000000000000)));
-
-  EXPECT_EQ(0, ZigZagDecode64(0u));
-  EXPECT_EQ(-1, ZigZagDecode64(1u));
-  EXPECT_EQ(1, ZigZagDecode64(2u));
-  EXPECT_EQ(-2, ZigZagDecode64(3u));
-  EXPECT_EQ(LL(0x000000003FFFFFFF), ZigZagDecode64(ULL(0x000000007FFFFFFE)));
-  EXPECT_EQ(LL(0xFFFFFFFFC0000000), ZigZagDecode64(ULL(0x000000007FFFFFFF)));
-  EXPECT_EQ(LL(0x000000007FFFFFFF), ZigZagDecode64(ULL(0x00000000FFFFFFFE)));
-  EXPECT_EQ(LL(0xFFFFFFFF80000000), ZigZagDecode64(ULL(0x00000000FFFFFFFF)));
-  EXPECT_EQ(LL(0x7FFFFFFFFFFFFFFF), ZigZagDecode64(ULL(0xFFFFFFFFFFFFFFFE)));
-  EXPECT_EQ(LL(0x8000000000000000), ZigZagDecode64(ULL(0xFFFFFFFFFFFFFFFF)));
-
-  // Some easier-to-verify round-trip tests.  The inputs (other than 0, 1, -1)
-  // were chosen semi-randomly via keyboard bashing.
-  EXPECT_EQ(0, ZigZagDecode32(ZigZagEncode32(0)));
-  EXPECT_EQ(1, ZigZagDecode32(ZigZagEncode32(1)));
-  EXPECT_EQ(-1, ZigZagDecode32(ZigZagEncode32(-1)));
-  EXPECT_EQ(14927, ZigZagDecode32(ZigZagEncode32(14927)));
-  EXPECT_EQ(-3612, ZigZagDecode32(ZigZagEncode32(-3612)));
-
-  EXPECT_EQ(0, ZigZagDecode64(ZigZagEncode64(0)));
-  EXPECT_EQ(1, ZigZagDecode64(ZigZagEncode64(1)));
-  EXPECT_EQ(-1, ZigZagDecode64(ZigZagEncode64(-1)));
-  EXPECT_EQ(14927, ZigZagDecode64(ZigZagEncode64(14927)));
-  EXPECT_EQ(-3612, ZigZagDecode64(ZigZagEncode64(-3612)));
-
-  EXPECT_EQ(LL(856912304801416),
-            ZigZagDecode64(ZigZagEncode64(LL(856912304801416))));
-  EXPECT_EQ(LL(-75123905439571256),
-            ZigZagDecode64(ZigZagEncode64(LL(-75123905439571256))));
-}
-
-TEST(WireFormatTest, RepeatedScalarsDifferentTagSizes) {
-  // At one point checks would trigger when parsing repeated fixed scalar
-  // fields.
-  UNITTEST::TestRepeatedScalarDifferentTagSizes msg1, msg2;
-  for (int i = 0; i < 100; ++i) {
-    msg1.add_repeated_fixed32(i);
-    msg1.add_repeated_int32(i);
-    msg1.add_repeated_fixed64(i);
-    msg1.add_repeated_int64(i);
-    msg1.add_repeated_float(i);
-    msg1.add_repeated_uint64(i);
-  }
-
-  // Make sure that we have a variety of tag sizes.
-  const Descriptor* desc = msg1.GetDescriptor();
-  const FieldDescriptor* field;
-  field = desc->FindFieldByName("repeated_fixed32");
-  ASSERT_TRUE(field != nullptr);
-  ASSERT_EQ(1, WireFormat::TagSize(field->number(), field->type()));
-  field = desc->FindFieldByName("repeated_int32");
-  ASSERT_TRUE(field != nullptr);
-  ASSERT_EQ(1, WireFormat::TagSize(field->number(), field->type()));
-  field = desc->FindFieldByName("repeated_fixed64");
-  ASSERT_TRUE(field != nullptr);
-  ASSERT_EQ(2, WireFormat::TagSize(field->number(), field->type()));
-  field = desc->FindFieldByName("repeated_int64");
-  ASSERT_TRUE(field != nullptr);
-  ASSERT_EQ(2, WireFormat::TagSize(field->number(), field->type()));
-  field = desc->FindFieldByName("repeated_float");
-  ASSERT_TRUE(field != nullptr);
-  ASSERT_EQ(3, WireFormat::TagSize(field->number(), field->type()));
-  field = desc->FindFieldByName("repeated_uint64");
-  ASSERT_TRUE(field != nullptr);
-  ASSERT_EQ(3, WireFormat::TagSize(field->number(), field->type()));
-
-  EXPECT_TRUE(msg2.ParseFromString(msg1.SerializeAsString()));
-  EXPECT_EQ(msg1.DebugString(), msg2.DebugString());
-}
-
-TEST(WireFormatTest, CompatibleTypes) {
-  const int64_t data = 0x100000000LL;
-  UNITTEST::Int64Message msg1;
-  msg1.set_data(data);
-  std::string serialized;
-  msg1.SerializeToString(&serialized);
-
-  // Test int64 is compatible with bool
-  UNITTEST::BoolMessage msg2;
-  ASSERT_TRUE(msg2.ParseFromString(serialized));
-  ASSERT_EQ(static_cast<bool>(data), msg2.data());
-
-  // Test int64 is compatible with uint64
-  UNITTEST::Uint64Message msg3;
-  ASSERT_TRUE(msg3.ParseFromString(serialized));
-  ASSERT_EQ(static_cast<uint64_t>(data), msg3.data());
-
-  // Test int64 is compatible with int32
-  UNITTEST::Int32Message msg4;
-  ASSERT_TRUE(msg4.ParseFromString(serialized));
-  ASSERT_EQ(static_cast<int32_t>(data), msg4.data());
-
-  // Test int64 is compatible with uint32
-  UNITTEST::Uint32Message msg5;
-  ASSERT_TRUE(msg5.ParseFromString(serialized));
-  ASSERT_EQ(static_cast<uint32_t>(data), msg5.data());
-}
-
-class Proto3PrimitiveRepeatedWireFormatTest : public ::testing::Test {
- protected:
-  Proto3PrimitiveRepeatedWireFormatTest()
-      : packedTestAllTypes_(
-            "\xFA\x01\x01\x01"
-            "\x82\x02\x01\x01"
-            "\x8A\x02\x01\x01"
-            "\x92\x02\x01\x01"
-            "\x9A\x02\x01\x02"
-            "\xA2\x02\x01\x02"
-            "\xAA\x02\x04\x01\x00\x00\x00"
-            "\xB2\x02\x08\x01\x00\x00\x00\x00\x00\x00\x00"
-            "\xBA\x02\x04\x01\x00\x00\x00"
-            "\xC2\x02\x08\x01\x00\x00\x00\x00\x00\x00\x00"
-            "\xCA\x02\x04\x00\x00\x80\x3f"
-            "\xD2\x02\x08\x00\x00\x00\x00\x00\x00\xf0\x3f"
-            "\xDA\x02\x01\x01"
-            "\x9A\x03\x01\x01",
-            86),
-        packedTestUnpackedTypes_(
-            "\x0A\x01\x01"
-            "\x12\x01\x01"
-            "\x1A\x01\x01"
-            "\x22\x01\x01"
-            "\x2A\x01\x02"
-            "\x32\x01\x02"
-            "\x3A\x04\x01\x00\x00\x00"
-            "\x42\x08\x01\x00\x00\x00\x00\x00\x00\x00"
-            "\x4A\x04\x01\x00\x00\x00"
-            "\x52\x08\x01\x00\x00\x00\x00\x00\x00\x00"
-            "\x5A\x04\x00\x00\x80\x3f"
-            "\x62\x08\x00\x00\x00\x00\x00\x00\xf0\x3f"
-            "\x6A\x01\x01"
-            "\x72\x01\x01",
-            72),
-        unpackedTestAllTypes_(
-            "\xF8\x01\x01"
-            "\x80\x02\x01"
-            "\x88\x02\x01"
-            "\x90\x02\x01"
-            "\x98\x02\x02"
-            "\xA0\x02\x02"
-            "\xAD\x02\x01\x00\x00\x00"
-            "\xB1\x02\x01\x00\x00\x00\x00\x00\x00\x00"
-            "\xBD\x02\x01\x00\x00\x00"
-            "\xC1\x02\x01\x00\x00\x00\x00\x00\x00\x00"
-            "\xCD\x02\x00\x00\x80\x3f"
-            "\xD1\x02\x00\x00\x00\x00\x00\x00\xf0\x3f"
-            "\xD8\x02\x01"
-            "\x98\x03\x01",
-            72),
-        unpackedTestUnpackedTypes_(
-            "\x08\x01"
-            "\x10\x01"
-            "\x18\x01"
-            "\x20\x01"
-            "\x28\x02"
-            "\x30\x02"
-            "\x3D\x01\x00\x00\x00"
-            "\x41\x01\x00\x00\x00\x00\x00\x00\x00"
-            "\x4D\x01\x00\x00\x00"
-            "\x51\x01\x00\x00\x00\x00\x00\x00\x00"
-            "\x5D\x00\x00\x80\x3f"
-            "\x61\x00\x00\x00\x00\x00\x00\xf0\x3f"
-            "\x68\x01"
-            "\x70\x01",
-            58) {}
-  template <class Proto>
-  void SetProto3PrimitiveRepeatedFields(Proto* message) {
-    message->add_repeated_int32(1);
-    message->add_repeated_int64(1);
-    message->add_repeated_uint32(1);
-    message->add_repeated_uint64(1);
-    message->add_repeated_sint32(1);
-    message->add_repeated_sint64(1);
-    message->add_repeated_fixed32(1);
-    message->add_repeated_fixed64(1);
-    message->add_repeated_sfixed32(1);
-    message->add_repeated_sfixed64(1);
-    message->add_repeated_float(1.0);
-    message->add_repeated_double(1.0);
-    message->add_repeated_bool(true);
-    message->add_repeated_nested_enum(PROTO3_ARENA_UNITTEST::TestAllTypes::FOO);
-  }
-
-  template <class Proto>
-  void ExpectProto3PrimitiveRepeatedFieldsSet(const Proto& message) {
-    EXPECT_EQ(1, message.repeated_int32(0));
-    EXPECT_EQ(1, message.repeated_int64(0));
-    EXPECT_EQ(1, message.repeated_uint32(0));
-    EXPECT_EQ(1, message.repeated_uint64(0));
-    EXPECT_EQ(1, message.repeated_sint32(0));
-    EXPECT_EQ(1, message.repeated_sint64(0));
-    EXPECT_EQ(1, message.repeated_fixed32(0));
-    EXPECT_EQ(1, message.repeated_fixed64(0));
-    EXPECT_EQ(1, message.repeated_sfixed32(0));
-    EXPECT_EQ(1, message.repeated_sfixed64(0));
-    EXPECT_EQ(1.0, message.repeated_float(0));
-    EXPECT_EQ(1.0, message.repeated_double(0));
-    EXPECT_EQ(true, message.repeated_bool(0));
-    EXPECT_EQ(PROTO3_ARENA_UNITTEST::TestAllTypes::FOO,
-              message.repeated_nested_enum(0));
-  }
-
-  template <class Proto>
-  void TestSerialization(Proto* message, const std::string& expected) {
-    SetProto3PrimitiveRepeatedFields(message);
-
-    size_t size = message->ByteSizeLong();
-
-    // Serialize using the generated code.
-    std::string generated_data;
-    {
-      io::StringOutputStream raw_output(&generated_data);
-      io::CodedOutputStream output(&raw_output);
-      message->SerializeWithCachedSizes(&output);
-      ASSERT_FALSE(output.HadError());
-    }
-    EXPECT_TRUE(TestUtil::EqualsToSerialized(*message, generated_data));
-
-    // Serialize using the dynamic code.
-    std::string dynamic_data;
-    {
-      io::StringOutputStream raw_output(&dynamic_data);
-      io::CodedOutputStream output(&raw_output);
-      WireFormat::SerializeWithCachedSizes(*message, size, &output);
-      ASSERT_FALSE(output.HadError());
-    }
-    EXPECT_TRUE(expected == dynamic_data);
-  }
-
-  template <class Proto>
-  void TestParsing(Proto* message, const std::string& compatible_data) {
-    message->Clear();
-    message->ParseFromString(compatible_data);
-    ExpectProto3PrimitiveRepeatedFieldsSet(*message);
-
-    message->Clear();
-    io::CodedInputStream input(
-        reinterpret_cast<const uint8_t*>(compatible_data.data()),
-        compatible_data.size());
-    WireFormat::ParseAndMergePartial(&input, message);
-    ExpectProto3PrimitiveRepeatedFieldsSet(*message);
-  }
-
-  const std::string packedTestAllTypes_;
-  const std::string packedTestUnpackedTypes_;
-  const std::string unpackedTestAllTypes_;
-  const std::string unpackedTestUnpackedTypes_;
-};
-
-TEST_F(Proto3PrimitiveRepeatedWireFormatTest, Proto3PrimitiveRepeated) {
-  PROTO3_ARENA_UNITTEST::TestAllTypes packed_message;
-  PROTO3_ARENA_UNITTEST::TestUnpackedTypes unpacked_message;
-  TestSerialization(&packed_message, packedTestAllTypes_);
-  TestParsing(&packed_message, packedTestAllTypes_);
-  TestParsing(&packed_message, unpackedTestAllTypes_);
-  TestSerialization(&unpacked_message, unpackedTestUnpackedTypes_);
-  TestParsing(&unpacked_message, packedTestUnpackedTypes_);
-  TestParsing(&unpacked_message, unpackedTestUnpackedTypes_);
-}
-
-class WireFormatInvalidInputTest : public testing::Test {
- protected:
-  // Make a serialized TestAllTypes in which the field optional_nested_message
-  // contains exactly the given bytes, which may be invalid.
-  std::string MakeInvalidEmbeddedMessage(const char* bytes, int size) {
-    const FieldDescriptor* field =
-        UNITTEST::TestAllTypes::descriptor()->FindFieldByName(
-            "optional_nested_message");
-    GOOGLE_CHECK(field != nullptr);
-
-    std::string result;
-
-    {
-      io::StringOutputStream raw_output(&result);
-      io::CodedOutputStream output(&raw_output);
-
-      WireFormatLite::WriteBytes(field->number(), std::string(bytes, size),
-                                 &output);
-    }
-
-    return result;
-  }
-
-  // Make a serialized TestAllTypes in which the field optionalgroup
-  // contains exactly the given bytes -- which may be invalid -- and
-  // possibly no end tag.
-  std::string MakeInvalidGroup(const char* bytes, int size,
-                               bool include_end_tag) {
-    const FieldDescriptor* field =
-        UNITTEST::TestAllTypes::descriptor()->FindFieldByName("optionalgroup");
-    GOOGLE_CHECK(field != nullptr);
-
-    std::string result;
-
-    {
-      io::StringOutputStream raw_output(&result);
-      io::CodedOutputStream output(&raw_output);
-
-      output.WriteVarint32(WireFormat::MakeTag(field));
-      output.WriteString(std::string(bytes, size));
-      if (include_end_tag) {
-        output.WriteVarint32(WireFormatLite::MakeTag(
-            field->number(), WireFormatLite::WIRETYPE_END_GROUP));
-      }
-    }
-
-    return result;
-  }
-};
-
-TEST_F(WireFormatInvalidInputTest, InvalidSubMessage) {
-  UNITTEST::TestAllTypes message;
-
-  // Control case.
-  EXPECT_TRUE(message.ParseFromString(MakeInvalidEmbeddedMessage("", 0)));
-
-  // The byte is a valid varint, but not a valid tag (zero).
-  EXPECT_FALSE(message.ParseFromString(MakeInvalidEmbeddedMessage("\0", 1)));
-
-  // The byte is a malformed varint.
-  EXPECT_FALSE(message.ParseFromString(MakeInvalidEmbeddedMessage("\200", 1)));
-
-  // The byte is an endgroup tag, but we aren't parsing a group.
-  EXPECT_FALSE(message.ParseFromString(MakeInvalidEmbeddedMessage("\014", 1)));
-
-  // The byte is a valid varint but not a valid tag (bad wire type).
-  EXPECT_FALSE(message.ParseFromString(MakeInvalidEmbeddedMessage("\017", 1)));
-}
-
-TEST_F(WireFormatInvalidInputTest, InvalidMessageWithExtraZero) {
-  std::string data;
-  {
-    // Serialize a valid proto
-    UNITTEST::TestAllTypes message;
-    message.set_optional_int32(1);
-    message.SerializeToString(&data);
-    data.push_back(0);  // Append invalid zero tag
-  }
-
-  // Control case.
-  {
-    io::ArrayInputStream ais(data.data(), data.size());
-    io::CodedInputStream is(&ais);
-    UNITTEST::TestAllTypes message;
-    // It should fail but currently passes.
-    EXPECT_TRUE(message.MergePartialFromCodedStream(&is));
-    // Parsing from the string should fail.
-    EXPECT_FALSE(message.ParseFromString(data));
-  }
-}
-
-TEST_F(WireFormatInvalidInputTest, InvalidGroup) {
-  UNITTEST::TestAllTypes message;
-
-  // Control case.
-  EXPECT_TRUE(message.ParseFromString(MakeInvalidGroup("", 0, true)));
-
-  // Missing end tag.  Groups cannot end at EOF.
-  EXPECT_FALSE(message.ParseFromString(MakeInvalidGroup("", 0, false)));
-
-  // The byte is a valid varint, but not a valid tag (zero).
-  EXPECT_FALSE(message.ParseFromString(MakeInvalidGroup("\0", 1, false)));
-
-  // The byte is a malformed varint.
-  EXPECT_FALSE(message.ParseFromString(MakeInvalidGroup("\200", 1, false)));
-
-  // The byte is an endgroup tag, but not the right one for this group.
-  EXPECT_FALSE(message.ParseFromString(MakeInvalidGroup("\014", 1, false)));
-
-  // The byte is a valid varint but not a valid tag (bad wire type).
-  EXPECT_FALSE(message.ParseFromString(MakeInvalidGroup("\017", 1, true)));
-}
-
-TEST_F(WireFormatInvalidInputTest, InvalidUnknownGroup) {
-  // Use TestEmptyMessage so that the group made by MakeInvalidGroup will not
-  // be a known tag number.
-  UNITTEST::TestEmptyMessage message;
-
-  // Control case.
-  EXPECT_TRUE(message.ParseFromString(MakeInvalidGroup("", 0, true)));
-
-  // Missing end tag.  Groups cannot end at EOF.
-  EXPECT_FALSE(message.ParseFromString(MakeInvalidGroup("", 0, false)));
-
-  // The byte is a valid varint, but not a valid tag (zero).
-  EXPECT_FALSE(message.ParseFromString(MakeInvalidGroup("\0", 1, false)));
-
-  // The byte is a malformed varint.
-  EXPECT_FALSE(message.ParseFromString(MakeInvalidGroup("\200", 1, false)));
-
-  // The byte is an endgroup tag, but not the right one for this group.
-  EXPECT_FALSE(message.ParseFromString(MakeInvalidGroup("\014", 1, false)));
-
-  // The byte is a valid varint but not a valid tag (bad wire type).
-  EXPECT_FALSE(message.ParseFromString(MakeInvalidGroup("\017", 1, true)));
-}
-
-TEST_F(WireFormatInvalidInputTest, InvalidStringInUnknownGroup) {
-  // Test a bug fix:  SkipMessage should fail if the message contains a
-  // string whose length would extend beyond the message end.
-
-  UNITTEST::TestAllTypes message;
-  message.set_optional_string("foo foo foo foo");
-  std::string data;
-  message.SerializeToString(&data);
-
-  // Chop some bytes off the end.
-  data.resize(data.size() - 4);
-
-  // Try to skip it.  Note that the bug was only present when parsing to an
-  // UnknownFieldSet.
-  io::ArrayInputStream raw_input(data.data(), data.size());
-  io::CodedInputStream coded_input(&raw_input);
-  UnknownFieldSet unknown_fields;
-  EXPECT_FALSE(WireFormat::SkipMessage(&coded_input, &unknown_fields));
-}
-
-// Test differences between string and bytes.
-// Value of a string type must be valid UTF-8 string.  When UTF-8
-// validation is enabled (GOOGLE_PROTOBUF_UTF8_VALIDATION_ENABLED):
-// WriteInvalidUTF8String:  see error message.
-// ReadInvalidUTF8String:  see error message.
-// WriteValidUTF8String: fine.
-// ReadValidUTF8String:  fine.
-// WriteAnyBytes: fine.
-// ReadAnyBytes: fine.
-const char* kInvalidUTF8String = "Invalid UTF-8: \xA0\xB0\xC0\xD0";
-// This used to be "Valid UTF-8: \x01\x02\u8C37\u6B4C", but MSVC seems to
-// interpret \u differently from GCC.
-const char* kValidUTF8String = "Valid UTF-8: \x01\x02\350\260\267\346\255\214";
-
-template <typename T>
-bool WriteMessage(const char* value, T* message, std::string* wire_buffer) {
-  message->set_data(value);
-  wire_buffer->clear();
-  message->AppendToString(wire_buffer);
-  return (wire_buffer->size() > 0);
-}
-
-template <typename T>
-bool ReadMessage(const std::string& wire_buffer, T* message) {
-  return message->ParseFromArray(wire_buffer.data(), wire_buffer.size());
-}
-
-class Utf8ValidationTest : public ::testing::Test {
- protected:
-  Utf8ValidationTest() {}
-  ~Utf8ValidationTest() override {}
-  void SetUp() override {
-  }
-
-};
-
-TEST_F(Utf8ValidationTest, WriteInvalidUTF8String) {
-  std::string wire_buffer;
-  UNITTEST::OneString input;
-  std::vector<std::string> errors;
-  {
-    ScopedMemoryLog log;
-    WriteMessage(kInvalidUTF8String, &input, &wire_buffer);
-    errors = log.GetMessages(ERROR);
-  }
-#ifdef GOOGLE_PROTOBUF_UTF8_VALIDATION_ENABLED
-  EXPECT_THAT(errors,
-              testing::ElementsAre(
-                  "String field '" + std::string(UNITTEST_PACKAGE_NAME) +
-                  ".OneString.data' "
-                  "contains invalid UTF-8 data when "
-                  "serializing a protocol buffer. Use the "
-                  "'bytes' type if you intend to send raw bytes. "));
-#else
-  ASSERT_EQ(0, errors.size());
-#endif  // GOOGLE_PROTOBUF_UTF8_VALIDATION_ENABLED
-}
-
-
-TEST_F(Utf8ValidationTest, ReadInvalidUTF8String) {
-  std::string wire_buffer;
-  UNITTEST::OneString input;
-  WriteMessage(kInvalidUTF8String, &input, &wire_buffer);
-  UNITTEST::OneString output;
-  std::vector<std::string> errors;
-  {
-    ScopedMemoryLog log;
-    ReadMessage(wire_buffer, &output);
-    errors = log.GetMessages(ERROR);
-  }
-#ifdef GOOGLE_PROTOBUF_UTF8_VALIDATION_ENABLED
-  EXPECT_THAT(errors,
-              testing::ElementsAre(
-                  "String field '" + std::string(UNITTEST_PACKAGE_NAME) +
-                  ".OneString.data' "
-                  "contains invalid UTF-8 data when "
-                  "parsing a protocol buffer. Use the "
-                  "'bytes' type if you intend to send raw bytes. "));
-
-#else
-  ASSERT_EQ(0, errors.size());
-#endif  // GOOGLE_PROTOBUF_UTF8_VALIDATION_ENABLED
-}
-
-
-TEST_F(Utf8ValidationTest, WriteValidUTF8String) {
-  std::string wire_buffer;
-  UNITTEST::OneString input;
-  std::vector<std::string> errors;
-  {
-    ScopedMemoryLog log;
-    WriteMessage(kValidUTF8String, &input, &wire_buffer);
-    errors = log.GetMessages(ERROR);
-  }
-  ASSERT_EQ(0, errors.size());
-}
-
-TEST_F(Utf8ValidationTest, ReadValidUTF8String) {
-  std::string wire_buffer;
-  UNITTEST::OneString input;
-  WriteMessage(kValidUTF8String, &input, &wire_buffer);
-  UNITTEST::OneString output;
-  std::vector<std::string> errors;
-  {
-    ScopedMemoryLog log;
-    ReadMessage(wire_buffer, &output);
-    errors = log.GetMessages(ERROR);
-  }
-  ASSERT_EQ(0, errors.size());
-  EXPECT_EQ(input.data(), output.data());
-}
-
-// Bytes: anything can pass as bytes, use invalid UTF-8 string to test
-TEST_F(Utf8ValidationTest, WriteArbitraryBytes) {
-  std::string wire_buffer;
-  UNITTEST::OneBytes input;
-  std::vector<std::string> errors;
-  {
-    ScopedMemoryLog log;
-    WriteMessage(kInvalidUTF8String, &input, &wire_buffer);
-    errors = log.GetMessages(ERROR);
-  }
-  ASSERT_EQ(0, errors.size());
-}
-
-TEST_F(Utf8ValidationTest, ReadArbitraryBytes) {
-  std::string wire_buffer;
-  UNITTEST::OneBytes input;
-  WriteMessage(kInvalidUTF8String, &input, &wire_buffer);
-  UNITTEST::OneBytes output;
-  std::vector<std::string> errors;
-  {
-    ScopedMemoryLog log;
-    ReadMessage(wire_buffer, &output);
-    errors = log.GetMessages(ERROR);
-  }
-  ASSERT_EQ(0, errors.size());
-  EXPECT_EQ(input.data(), output.data());
-}
-
-TEST_F(Utf8ValidationTest, ParseRepeatedString) {
-  UNITTEST::MoreBytes input;
-  input.add_data(kValidUTF8String);
-  input.add_data(kInvalidUTF8String);
-  input.add_data(kInvalidUTF8String);
-  std::string wire_buffer = input.SerializeAsString();
-
-  UNITTEST::MoreString output;
-  std::vector<std::string> errors;
-  {
-    ScopedMemoryLog log;
-    ReadMessage(wire_buffer, &output);
-    errors = log.GetMessages(ERROR);
-  }
-#ifdef GOOGLE_PROTOBUF_UTF8_VALIDATION_ENABLED
-  ASSERT_EQ(2, errors.size());
-#else
-  ASSERT_EQ(0, errors.size());
-#endif  // GOOGLE_PROTOBUF_UTF8_VALIDATION_ENABLED
-  EXPECT_EQ(wire_buffer, output.SerializeAsString());
-}
-
-// Test the old VerifyUTF8String() function, which may still be called by old
-// generated code.
-TEST_F(Utf8ValidationTest, OldVerifyUTF8String) {
-  std::string data(kInvalidUTF8String);
-
-  std::vector<std::string> errors;
-  {
-    ScopedMemoryLog log;
-    WireFormat::VerifyUTF8String(data.data(), data.size(),
-                                 WireFormat::SERIALIZE);
-    errors = log.GetMessages(ERROR);
-  }
-#ifdef GOOGLE_PROTOBUF_UTF8_VALIDATION_ENABLED
-  ASSERT_EQ(1, errors.size());
-  EXPECT_TRUE(
-      HasPrefixString(errors[0],
-                       "String field contains invalid UTF-8 data when "
-                       "serializing a protocol buffer. Use the "
-                       "'bytes' type if you intend to send raw bytes."));
-#else
-  ASSERT_EQ(0, errors.size());
-#endif
-}
-
-
-TEST(RepeatedVarint, Int32) {
-  RepeatedField<int32_t> v;
-
-  // Insert -2^n, 2^n and 2^n-1.
-  for (int n = 0; n < 10; n++) {
-    v.Add(-(1 << n));
-    v.Add(1 << n);
-    v.Add((1 << n) - 1);
-  }
-
-  // Check consistency with the scalar Int32Size.
-  size_t expected = 0;
-  for (int i = 0; i < v.size(); i++) {
-    expected += WireFormatLite::Int32Size(v[i]);
-  }
-
-  EXPECT_EQ(expected, WireFormatLite::Int32Size(v));
-}
-
-TEST(RepeatedVarint, Int64) {
-  RepeatedField<int64_t> v;
-
-  // Insert -2^n, 2^n and 2^n-1.
-  for (int n = 0; n < 10; n++) {
-    v.Add(-(1 << n));
-    v.Add(1 << n);
-    v.Add((1 << n) - 1);
-  }
-
-  // Check consistency with the scalar Int64Size.
-  size_t expected = 0;
-  for (int i = 0; i < v.size(); i++) {
-    expected += WireFormatLite::Int64Size(v[i]);
-  }
-
-  EXPECT_EQ(expected, WireFormatLite::Int64Size(v));
-}
-
-TEST(RepeatedVarint, SInt32) {
-  RepeatedField<int32_t> v;
-
-  // Insert -2^n, 2^n and 2^n-1.
-  for (int n = 0; n < 10; n++) {
-    v.Add(-(1 << n));
-    v.Add(1 << n);
-    v.Add((1 << n) - 1);
-  }
-
-  // Check consistency with the scalar SInt32Size.
-  size_t expected = 0;
-  for (int i = 0; i < v.size(); i++) {
-    expected += WireFormatLite::SInt32Size(v[i]);
-  }
-
-  EXPECT_EQ(expected, WireFormatLite::SInt32Size(v));
-}
-
-TEST(RepeatedVarint, SInt64) {
-  RepeatedField<int64_t> v;
-
-  // Insert -2^n, 2^n and 2^n-1.
-  for (int n = 0; n < 10; n++) {
-    v.Add(-(1 << n));
-    v.Add(1 << n);
-    v.Add((1 << n) - 1);
-  }
-
-  // Check consistency with the scalar SInt64Size.
-  size_t expected = 0;
-  for (int i = 0; i < v.size(); i++) {
-    expected += WireFormatLite::SInt64Size(v[i]);
-  }
-
-  EXPECT_EQ(expected, WireFormatLite::SInt64Size(v));
-}
-
-TEST(RepeatedVarint, UInt32) {
-  RepeatedField<uint32_t> v;
-
-  // Insert 2^n and 2^n-1.
-  for (int n = 0; n < 10; n++) {
-    v.Add(1 << n);
-    v.Add((1 << n) - 1);
-  }
-
-  // Check consistency with the scalar UInt32Size.
-  size_t expected = 0;
-  for (int i = 0; i < v.size(); i++) {
-    expected += WireFormatLite::UInt32Size(v[i]);
-  }
-
-  EXPECT_EQ(expected, WireFormatLite::UInt32Size(v));
-}
-
-TEST(RepeatedVarint, UInt64) {
-  RepeatedField<uint64_t> v;
-
-  // Insert 2^n and 2^n-1.
-  for (int n = 0; n < 10; n++) {
-    v.Add(1 << n);
-    v.Add((1 << n) - 1);
-  }
-
-  // Check consistency with the scalar UInt64Size.
-  size_t expected = 0;
-  for (int i = 0; i < v.size(); i++) {
-    expected += WireFormatLite::UInt64Size(v[i]);
-  }
-
-  EXPECT_EQ(expected, WireFormatLite::UInt64Size(v));
-}
-
-TEST(RepeatedVarint, Enum) {
-  RepeatedField<int> v;
-
-  // Insert 2^n and 2^n-1.
-  for (int n = 0; n < 10; n++) {
-    v.Add(1 << n);
-    v.Add((1 << n) - 1);
-  }
-
-  // Check consistency with the scalar EnumSize.
-  size_t expected = 0;
-  for (int i = 0; i < v.size(); i++) {
-    expected += WireFormatLite::EnumSize(v[i]);
-  }
-
-  EXPECT_EQ(expected, WireFormatLite::EnumSize(v));
-}
-
-
-}  // namespace
-}  // namespace internal
-}  // namespace protobuf
-}  // namespace google
-
-#include <google/protobuf/port_undef.inc>
diff --git a/libs/protobuf/src/google/protobuf/wrappers.pb.cc b/libs/protobuf/src/google/protobuf/wrappers.pb.cc
deleted file mode 100644
index 40ba60a..0000000
--- a/libs/protobuf/src/google/protobuf/wrappers.pb.cc
+++ /dev/null
@@ -1,1979 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/protobuf/wrappers.proto
-
-#include <google/protobuf/wrappers.pb.h>
-
-#include <algorithm>
-
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/extension_set.h>
-#include <google/protobuf/wire_format_lite.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/generated_message_reflection.h>
-#include <google/protobuf/reflection_ops.h>
-#include <google/protobuf/wire_format.h>
-// @@protoc_insertion_point(includes)
-#include <google/protobuf/port_def.inc>
-
-PROTOBUF_PRAGMA_INIT_SEG
-
-namespace _pb = ::PROTOBUF_NAMESPACE_ID;
-namespace _pbi = _pb::internal;
-
-PROTOBUF_NAMESPACE_OPEN
-PROTOBUF_CONSTEXPR DoubleValue::DoubleValue(
-    ::_pbi::ConstantInitialized): _impl_{
-    /*decltype(_impl_.value_)*/0
-  , /*decltype(_impl_._cached_size_)*/{}} {}
-struct DoubleValueDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR DoubleValueDefaultTypeInternal()
-      : _instance(::_pbi::ConstantInitialized{}) {}
-  ~DoubleValueDefaultTypeInternal() {}
-  union {
-    DoubleValue _instance;
-  };
-};
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 DoubleValueDefaultTypeInternal _DoubleValue_default_instance_;
-PROTOBUF_CONSTEXPR FloatValue::FloatValue(
-    ::_pbi::ConstantInitialized): _impl_{
-    /*decltype(_impl_.value_)*/0
-  , /*decltype(_impl_._cached_size_)*/{}} {}
-struct FloatValueDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR FloatValueDefaultTypeInternal()
-      : _instance(::_pbi::ConstantInitialized{}) {}
-  ~FloatValueDefaultTypeInternal() {}
-  union {
-    FloatValue _instance;
-  };
-};
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 FloatValueDefaultTypeInternal _FloatValue_default_instance_;
-PROTOBUF_CONSTEXPR Int64Value::Int64Value(
-    ::_pbi::ConstantInitialized): _impl_{
-    /*decltype(_impl_.value_)*/int64_t{0}
-  , /*decltype(_impl_._cached_size_)*/{}} {}
-struct Int64ValueDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR Int64ValueDefaultTypeInternal()
-      : _instance(::_pbi::ConstantInitialized{}) {}
-  ~Int64ValueDefaultTypeInternal() {}
-  union {
-    Int64Value _instance;
-  };
-};
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 Int64ValueDefaultTypeInternal _Int64Value_default_instance_;
-PROTOBUF_CONSTEXPR UInt64Value::UInt64Value(
-    ::_pbi::ConstantInitialized): _impl_{
-    /*decltype(_impl_.value_)*/uint64_t{0u}
-  , /*decltype(_impl_._cached_size_)*/{}} {}
-struct UInt64ValueDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR UInt64ValueDefaultTypeInternal()
-      : _instance(::_pbi::ConstantInitialized{}) {}
-  ~UInt64ValueDefaultTypeInternal() {}
-  union {
-    UInt64Value _instance;
-  };
-};
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 UInt64ValueDefaultTypeInternal _UInt64Value_default_instance_;
-PROTOBUF_CONSTEXPR Int32Value::Int32Value(
-    ::_pbi::ConstantInitialized): _impl_{
-    /*decltype(_impl_.value_)*/0
-  , /*decltype(_impl_._cached_size_)*/{}} {}
-struct Int32ValueDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR Int32ValueDefaultTypeInternal()
-      : _instance(::_pbi::ConstantInitialized{}) {}
-  ~Int32ValueDefaultTypeInternal() {}
-  union {
-    Int32Value _instance;
-  };
-};
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 Int32ValueDefaultTypeInternal _Int32Value_default_instance_;
-PROTOBUF_CONSTEXPR UInt32Value::UInt32Value(
-    ::_pbi::ConstantInitialized): _impl_{
-    /*decltype(_impl_.value_)*/0u
-  , /*decltype(_impl_._cached_size_)*/{}} {}
-struct UInt32ValueDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR UInt32ValueDefaultTypeInternal()
-      : _instance(::_pbi::ConstantInitialized{}) {}
-  ~UInt32ValueDefaultTypeInternal() {}
-  union {
-    UInt32Value _instance;
-  };
-};
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 UInt32ValueDefaultTypeInternal _UInt32Value_default_instance_;
-PROTOBUF_CONSTEXPR BoolValue::BoolValue(
-    ::_pbi::ConstantInitialized): _impl_{
-    /*decltype(_impl_.value_)*/false
-  , /*decltype(_impl_._cached_size_)*/{}} {}
-struct BoolValueDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR BoolValueDefaultTypeInternal()
-      : _instance(::_pbi::ConstantInitialized{}) {}
-  ~BoolValueDefaultTypeInternal() {}
-  union {
-    BoolValue _instance;
-  };
-};
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 BoolValueDefaultTypeInternal _BoolValue_default_instance_;
-PROTOBUF_CONSTEXPR StringValue::StringValue(
-    ::_pbi::ConstantInitialized): _impl_{
-    /*decltype(_impl_.value_)*/{&::_pbi::fixed_address_empty_string, ::_pbi::ConstantInitialized{}}
-  , /*decltype(_impl_._cached_size_)*/{}} {}
-struct StringValueDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR StringValueDefaultTypeInternal()
-      : _instance(::_pbi::ConstantInitialized{}) {}
-  ~StringValueDefaultTypeInternal() {}
-  union {
-    StringValue _instance;
-  };
-};
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 StringValueDefaultTypeInternal _StringValue_default_instance_;
-PROTOBUF_CONSTEXPR BytesValue::BytesValue(
-    ::_pbi::ConstantInitialized): _impl_{
-    /*decltype(_impl_.value_)*/{&::_pbi::fixed_address_empty_string, ::_pbi::ConstantInitialized{}}
-  , /*decltype(_impl_._cached_size_)*/{}} {}
-struct BytesValueDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR BytesValueDefaultTypeInternal()
-      : _instance(::_pbi::ConstantInitialized{}) {}
-  ~BytesValueDefaultTypeInternal() {}
-  union {
-    BytesValue _instance;
-  };
-};
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 BytesValueDefaultTypeInternal _BytesValue_default_instance_;
-PROTOBUF_NAMESPACE_CLOSE
-static ::_pb::Metadata file_level_metadata_google_2fprotobuf_2fwrappers_2eproto[9];
-static constexpr ::_pb::EnumDescriptor const** file_level_enum_descriptors_google_2fprotobuf_2fwrappers_2eproto = nullptr;
-static constexpr ::_pb::ServiceDescriptor const** file_level_service_descriptors_google_2fprotobuf_2fwrappers_2eproto = nullptr;
-
-const uint32_t TableStruct_google_2fprotobuf_2fwrappers_2eproto::offsets[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = {
-  ~0u,  // no _has_bits_
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::DoubleValue, _internal_metadata_),
-  ~0u,  // no _extensions_
-  ~0u,  // no _oneof_case_
-  ~0u,  // no _weak_field_map_
-  ~0u,  // no _inlined_string_donated_
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::DoubleValue, _impl_.value_),
-  ~0u,  // no _has_bits_
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::FloatValue, _internal_metadata_),
-  ~0u,  // no _extensions_
-  ~0u,  // no _oneof_case_
-  ~0u,  // no _weak_field_map_
-  ~0u,  // no _inlined_string_donated_
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::FloatValue, _impl_.value_),
-  ~0u,  // no _has_bits_
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Int64Value, _internal_metadata_),
-  ~0u,  // no _extensions_
-  ~0u,  // no _oneof_case_
-  ~0u,  // no _weak_field_map_
-  ~0u,  // no _inlined_string_donated_
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Int64Value, _impl_.value_),
-  ~0u,  // no _has_bits_
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::UInt64Value, _internal_metadata_),
-  ~0u,  // no _extensions_
-  ~0u,  // no _oneof_case_
-  ~0u,  // no _weak_field_map_
-  ~0u,  // no _inlined_string_donated_
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::UInt64Value, _impl_.value_),
-  ~0u,  // no _has_bits_
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Int32Value, _internal_metadata_),
-  ~0u,  // no _extensions_
-  ~0u,  // no _oneof_case_
-  ~0u,  // no _weak_field_map_
-  ~0u,  // no _inlined_string_donated_
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::Int32Value, _impl_.value_),
-  ~0u,  // no _has_bits_
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::UInt32Value, _internal_metadata_),
-  ~0u,  // no _extensions_
-  ~0u,  // no _oneof_case_
-  ~0u,  // no _weak_field_map_
-  ~0u,  // no _inlined_string_donated_
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::UInt32Value, _impl_.value_),
-  ~0u,  // no _has_bits_
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::BoolValue, _internal_metadata_),
-  ~0u,  // no _extensions_
-  ~0u,  // no _oneof_case_
-  ~0u,  // no _weak_field_map_
-  ~0u,  // no _inlined_string_donated_
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::BoolValue, _impl_.value_),
-  ~0u,  // no _has_bits_
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::StringValue, _internal_metadata_),
-  ~0u,  // no _extensions_
-  ~0u,  // no _oneof_case_
-  ~0u,  // no _weak_field_map_
-  ~0u,  // no _inlined_string_donated_
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::StringValue, _impl_.value_),
-  ~0u,  // no _has_bits_
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::BytesValue, _internal_metadata_),
-  ~0u,  // no _extensions_
-  ~0u,  // no _oneof_case_
-  ~0u,  // no _weak_field_map_
-  ~0u,  // no _inlined_string_donated_
-  PROTOBUF_FIELD_OFFSET(::PROTOBUF_NAMESPACE_ID::BytesValue, _impl_.value_),
-};
-static const ::_pbi::MigrationSchema schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = {
-  { 0, -1, -1, sizeof(::PROTOBUF_NAMESPACE_ID::DoubleValue)},
-  { 7, -1, -1, sizeof(::PROTOBUF_NAMESPACE_ID::FloatValue)},
-  { 14, -1, -1, sizeof(::PROTOBUF_NAMESPACE_ID::Int64Value)},
-  { 21, -1, -1, sizeof(::PROTOBUF_NAMESPACE_ID::UInt64Value)},
-  { 28, -1, -1, sizeof(::PROTOBUF_NAMESPACE_ID::Int32Value)},
-  { 35, -1, -1, sizeof(::PROTOBUF_NAMESPACE_ID::UInt32Value)},
-  { 42, -1, -1, sizeof(::PROTOBUF_NAMESPACE_ID::BoolValue)},
-  { 49, -1, -1, sizeof(::PROTOBUF_NAMESPACE_ID::StringValue)},
-  { 56, -1, -1, sizeof(::PROTOBUF_NAMESPACE_ID::BytesValue)},
-};
-
-static const ::_pb::Message* const file_default_instances[] = {
-  &::PROTOBUF_NAMESPACE_ID::_DoubleValue_default_instance_._instance,
-  &::PROTOBUF_NAMESPACE_ID::_FloatValue_default_instance_._instance,
-  &::PROTOBUF_NAMESPACE_ID::_Int64Value_default_instance_._instance,
-  &::PROTOBUF_NAMESPACE_ID::_UInt64Value_default_instance_._instance,
-  &::PROTOBUF_NAMESPACE_ID::_Int32Value_default_instance_._instance,
-  &::PROTOBUF_NAMESPACE_ID::_UInt32Value_default_instance_._instance,
-  &::PROTOBUF_NAMESPACE_ID::_BoolValue_default_instance_._instance,
-  &::PROTOBUF_NAMESPACE_ID::_StringValue_default_instance_._instance,
-  &::PROTOBUF_NAMESPACE_ID::_BytesValue_default_instance_._instance,
-};
-
-const char descriptor_table_protodef_google_2fprotobuf_2fwrappers_2eproto[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) =
-  "\n\036google/protobuf/wrappers.proto\022\017google"
-  ".protobuf\"\034\n\013DoubleValue\022\r\n\005value\030\001 \001(\001\""
-  "\033\n\nFloatValue\022\r\n\005value\030\001 \001(\002\"\033\n\nInt64Val"
-  "ue\022\r\n\005value\030\001 \001(\003\"\034\n\013UInt64Value\022\r\n\005valu"
-  "e\030\001 \001(\004\"\033\n\nInt32Value\022\r\n\005value\030\001 \001(\005\"\034\n\013"
-  "UInt32Value\022\r\n\005value\030\001 \001(\r\"\032\n\tBoolValue\022"
-  "\r\n\005value\030\001 \001(\010\"\034\n\013StringValue\022\r\n\005value\030\001"
-  " \001(\t\"\033\n\nBytesValue\022\r\n\005value\030\001 \001(\014B\203\001\n\023co"
-  "m.google.protobufB\rWrappersProtoP\001Z1goog"
-  "le.golang.org/protobuf/types/known/wrapp"
-  "erspb\370\001\001\242\002\003GPB\252\002\036Google.Protobuf.WellKno"
-  "wnTypesb\006proto3"
-  ;
-static ::_pbi::once_flag descriptor_table_google_2fprotobuf_2fwrappers_2eproto_once;
-const ::_pbi::DescriptorTable descriptor_table_google_2fprotobuf_2fwrappers_2eproto = {
-    false, false, 455, descriptor_table_protodef_google_2fprotobuf_2fwrappers_2eproto,
-    "google/protobuf/wrappers.proto",
-    &descriptor_table_google_2fprotobuf_2fwrappers_2eproto_once, nullptr, 0, 9,
-    schemas, file_default_instances, TableStruct_google_2fprotobuf_2fwrappers_2eproto::offsets,
-    file_level_metadata_google_2fprotobuf_2fwrappers_2eproto, file_level_enum_descriptors_google_2fprotobuf_2fwrappers_2eproto,
-    file_level_service_descriptors_google_2fprotobuf_2fwrappers_2eproto,
-};
-PROTOBUF_ATTRIBUTE_WEAK const ::_pbi::DescriptorTable* descriptor_table_google_2fprotobuf_2fwrappers_2eproto_getter() {
-  return &descriptor_table_google_2fprotobuf_2fwrappers_2eproto;
-}
-
-// Force running AddDescriptors() at dynamic initialization time.
-PROTOBUF_ATTRIBUTE_INIT_PRIORITY2 static ::_pbi::AddDescriptorsRunner dynamic_init_dummy_google_2fprotobuf_2fwrappers_2eproto(&descriptor_table_google_2fprotobuf_2fwrappers_2eproto);
-PROTOBUF_NAMESPACE_OPEN
-
-// ===================================================================
-
-class DoubleValue::_Internal {
- public:
-};
-
-DoubleValue::DoubleValue(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                         bool is_message_owned)
-  : ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned) {
-  SharedCtor(arena, is_message_owned);
-  // @@protoc_insertion_point(arena_constructor:google.protobuf.DoubleValue)
-}
-DoubleValue::DoubleValue(const DoubleValue& from)
-  : ::PROTOBUF_NAMESPACE_ID::Message() {
-  DoubleValue* const _this = this; (void)_this;
-  new (&_impl_) Impl_{
-      decltype(_impl_.value_){}
-    , /*decltype(_impl_._cached_size_)*/{}};
-
-  _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-  _this->_impl_.value_ = from._impl_.value_;
-  // @@protoc_insertion_point(copy_constructor:google.protobuf.DoubleValue)
-}
-
-inline void DoubleValue::SharedCtor(
-    ::_pb::Arena* arena, bool is_message_owned) {
-  (void)arena;
-  (void)is_message_owned;
-  new (&_impl_) Impl_{
-      decltype(_impl_.value_){0}
-    , /*decltype(_impl_._cached_size_)*/{}
-  };
-}
-
-DoubleValue::~DoubleValue() {
-  // @@protoc_insertion_point(destructor:google.protobuf.DoubleValue)
-  if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) {
-  (void)arena;
-    return;
-  }
-  SharedDtor();
-}
-
-inline void DoubleValue::SharedDtor() {
-  GOOGLE_DCHECK(GetArenaForAllocation() == nullptr);
-}
-
-void DoubleValue::SetCachedSize(int size) const {
-  _impl_._cached_size_.Set(size);
-}
-
-void DoubleValue::Clear() {
-// @@protoc_insertion_point(message_clear_start:google.protobuf.DoubleValue)
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.value_ = 0;
-  _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>();
-}
-
-const char* DoubleValue::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) {
-#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure
-  while (!ctx->Done(&ptr)) {
-    uint32_t tag;
-    ptr = ::_pbi::ReadTag(ptr, &tag);
-    switch (tag >> 3) {
-      // double value = 1;
-      case 1:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 9)) {
-          _impl_.value_ = ::PROTOBUF_NAMESPACE_ID::internal::UnalignedLoad<double>(ptr);
-          ptr += sizeof(double);
-        } else
-          goto handle_unusual;
-        continue;
-      default:
-        goto handle_unusual;
-    }  // switch
-  handle_unusual:
-    if ((tag == 0) || ((tag & 7) == 4)) {
-      CHK_(ptr);
-      ctx->SetLastTag(tag);
-      goto message_done;
-    }
-    ptr = UnknownFieldParse(
-        tag,
-        _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(),
-        ptr, ctx);
-    CHK_(ptr != nullptr);
-  }  // while
-message_done:
-  return ptr;
-failure:
-  ptr = nullptr;
-  goto message_done;
-#undef CHK_
-}
-
-uint8_t* DoubleValue::_InternalSerialize(
-    uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.DoubleValue)
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  // double value = 1;
-  static_assert(sizeof(uint64_t) == sizeof(double), "Code assumes uint64_t and double are the same size.");
-  double tmp_value = this->_internal_value();
-  uint64_t raw_value;
-  memcpy(&raw_value, &tmp_value, sizeof(tmp_value));
-  if (raw_value != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteDoubleToArray(1, this->_internal_value(), target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-        _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.DoubleValue)
-  return target;
-}
-
-size_t DoubleValue::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:google.protobuf.DoubleValue)
-  size_t total_size = 0;
-
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // double value = 1;
-  static_assert(sizeof(uint64_t) == sizeof(double), "Code assumes uint64_t and double are the same size.");
-  double tmp_value = this->_internal_value();
-  uint64_t raw_value;
-  memcpy(&raw_value, &tmp_value, sizeof(tmp_value));
-  if (raw_value != 0) {
-    total_size += 1 + 8;
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData DoubleValue::_class_data_ = {
-    ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck,
-    DoubleValue::MergeImpl
-};
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*DoubleValue::GetClassData() const { return &_class_data_; }
-
-
-void DoubleValue::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) {
-  auto* const _this = static_cast<DoubleValue*>(&to_msg);
-  auto& from = static_cast<const DoubleValue&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.DoubleValue)
-  GOOGLE_DCHECK_NE(&from, _this);
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  static_assert(sizeof(uint64_t) == sizeof(double), "Code assumes uint64_t and double are the same size.");
-  double tmp_value = from._internal_value();
-  uint64_t raw_value;
-  memcpy(&raw_value, &tmp_value, sizeof(tmp_value));
-  if (raw_value != 0) {
-    _this->_internal_set_value(from._internal_value());
-  }
-  _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void DoubleValue::CopyFrom(const DoubleValue& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.DoubleValue)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool DoubleValue::IsInitialized() const {
-  return true;
-}
-
-void DoubleValue::InternalSwap(DoubleValue* other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_.value_, other->_impl_.value_);
-}
-
-::PROTOBUF_NAMESPACE_ID::Metadata DoubleValue::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_google_2fprotobuf_2fwrappers_2eproto_getter, &descriptor_table_google_2fprotobuf_2fwrappers_2eproto_once,
-      file_level_metadata_google_2fprotobuf_2fwrappers_2eproto[0]);
-}
-
-// ===================================================================
-
-class FloatValue::_Internal {
- public:
-};
-
-FloatValue::FloatValue(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                         bool is_message_owned)
-  : ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned) {
-  SharedCtor(arena, is_message_owned);
-  // @@protoc_insertion_point(arena_constructor:google.protobuf.FloatValue)
-}
-FloatValue::FloatValue(const FloatValue& from)
-  : ::PROTOBUF_NAMESPACE_ID::Message() {
-  FloatValue* const _this = this; (void)_this;
-  new (&_impl_) Impl_{
-      decltype(_impl_.value_){}
-    , /*decltype(_impl_._cached_size_)*/{}};
-
-  _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-  _this->_impl_.value_ = from._impl_.value_;
-  // @@protoc_insertion_point(copy_constructor:google.protobuf.FloatValue)
-}
-
-inline void FloatValue::SharedCtor(
-    ::_pb::Arena* arena, bool is_message_owned) {
-  (void)arena;
-  (void)is_message_owned;
-  new (&_impl_) Impl_{
-      decltype(_impl_.value_){0}
-    , /*decltype(_impl_._cached_size_)*/{}
-  };
-}
-
-FloatValue::~FloatValue() {
-  // @@protoc_insertion_point(destructor:google.protobuf.FloatValue)
-  if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) {
-  (void)arena;
-    return;
-  }
-  SharedDtor();
-}
-
-inline void FloatValue::SharedDtor() {
-  GOOGLE_DCHECK(GetArenaForAllocation() == nullptr);
-}
-
-void FloatValue::SetCachedSize(int size) const {
-  _impl_._cached_size_.Set(size);
-}
-
-void FloatValue::Clear() {
-// @@protoc_insertion_point(message_clear_start:google.protobuf.FloatValue)
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.value_ = 0;
-  _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>();
-}
-
-const char* FloatValue::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) {
-#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure
-  while (!ctx->Done(&ptr)) {
-    uint32_t tag;
-    ptr = ::_pbi::ReadTag(ptr, &tag);
-    switch (tag >> 3) {
-      // float value = 1;
-      case 1:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 13)) {
-          _impl_.value_ = ::PROTOBUF_NAMESPACE_ID::internal::UnalignedLoad<float>(ptr);
-          ptr += sizeof(float);
-        } else
-          goto handle_unusual;
-        continue;
-      default:
-        goto handle_unusual;
-    }  // switch
-  handle_unusual:
-    if ((tag == 0) || ((tag & 7) == 4)) {
-      CHK_(ptr);
-      ctx->SetLastTag(tag);
-      goto message_done;
-    }
-    ptr = UnknownFieldParse(
-        tag,
-        _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(),
-        ptr, ctx);
-    CHK_(ptr != nullptr);
-  }  // while
-message_done:
-  return ptr;
-failure:
-  ptr = nullptr;
-  goto message_done;
-#undef CHK_
-}
-
-uint8_t* FloatValue::_InternalSerialize(
-    uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.FloatValue)
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  // float value = 1;
-  static_assert(sizeof(uint32_t) == sizeof(float), "Code assumes uint32_t and float are the same size.");
-  float tmp_value = this->_internal_value();
-  uint32_t raw_value;
-  memcpy(&raw_value, &tmp_value, sizeof(tmp_value));
-  if (raw_value != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteFloatToArray(1, this->_internal_value(), target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-        _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.FloatValue)
-  return target;
-}
-
-size_t FloatValue::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:google.protobuf.FloatValue)
-  size_t total_size = 0;
-
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // float value = 1;
-  static_assert(sizeof(uint32_t) == sizeof(float), "Code assumes uint32_t and float are the same size.");
-  float tmp_value = this->_internal_value();
-  uint32_t raw_value;
-  memcpy(&raw_value, &tmp_value, sizeof(tmp_value));
-  if (raw_value != 0) {
-    total_size += 1 + 4;
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData FloatValue::_class_data_ = {
-    ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck,
-    FloatValue::MergeImpl
-};
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*FloatValue::GetClassData() const { return &_class_data_; }
-
-
-void FloatValue::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) {
-  auto* const _this = static_cast<FloatValue*>(&to_msg);
-  auto& from = static_cast<const FloatValue&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.FloatValue)
-  GOOGLE_DCHECK_NE(&from, _this);
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  static_assert(sizeof(uint32_t) == sizeof(float), "Code assumes uint32_t and float are the same size.");
-  float tmp_value = from._internal_value();
-  uint32_t raw_value;
-  memcpy(&raw_value, &tmp_value, sizeof(tmp_value));
-  if (raw_value != 0) {
-    _this->_internal_set_value(from._internal_value());
-  }
-  _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void FloatValue::CopyFrom(const FloatValue& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.FloatValue)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool FloatValue::IsInitialized() const {
-  return true;
-}
-
-void FloatValue::InternalSwap(FloatValue* other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_.value_, other->_impl_.value_);
-}
-
-::PROTOBUF_NAMESPACE_ID::Metadata FloatValue::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_google_2fprotobuf_2fwrappers_2eproto_getter, &descriptor_table_google_2fprotobuf_2fwrappers_2eproto_once,
-      file_level_metadata_google_2fprotobuf_2fwrappers_2eproto[1]);
-}
-
-// ===================================================================
-
-class Int64Value::_Internal {
- public:
-};
-
-Int64Value::Int64Value(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                         bool is_message_owned)
-  : ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned) {
-  SharedCtor(arena, is_message_owned);
-  // @@protoc_insertion_point(arena_constructor:google.protobuf.Int64Value)
-}
-Int64Value::Int64Value(const Int64Value& from)
-  : ::PROTOBUF_NAMESPACE_ID::Message() {
-  Int64Value* const _this = this; (void)_this;
-  new (&_impl_) Impl_{
-      decltype(_impl_.value_){}
-    , /*decltype(_impl_._cached_size_)*/{}};
-
-  _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-  _this->_impl_.value_ = from._impl_.value_;
-  // @@protoc_insertion_point(copy_constructor:google.protobuf.Int64Value)
-}
-
-inline void Int64Value::SharedCtor(
-    ::_pb::Arena* arena, bool is_message_owned) {
-  (void)arena;
-  (void)is_message_owned;
-  new (&_impl_) Impl_{
-      decltype(_impl_.value_){int64_t{0}}
-    , /*decltype(_impl_._cached_size_)*/{}
-  };
-}
-
-Int64Value::~Int64Value() {
-  // @@protoc_insertion_point(destructor:google.protobuf.Int64Value)
-  if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) {
-  (void)arena;
-    return;
-  }
-  SharedDtor();
-}
-
-inline void Int64Value::SharedDtor() {
-  GOOGLE_DCHECK(GetArenaForAllocation() == nullptr);
-}
-
-void Int64Value::SetCachedSize(int size) const {
-  _impl_._cached_size_.Set(size);
-}
-
-void Int64Value::Clear() {
-// @@protoc_insertion_point(message_clear_start:google.protobuf.Int64Value)
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.value_ = int64_t{0};
-  _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>();
-}
-
-const char* Int64Value::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) {
-#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure
-  while (!ctx->Done(&ptr)) {
-    uint32_t tag;
-    ptr = ::_pbi::ReadTag(ptr, &tag);
-    switch (tag >> 3) {
-      // int64 value = 1;
-      case 1:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 8)) {
-          _impl_.value_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr);
-          CHK_(ptr);
-        } else
-          goto handle_unusual;
-        continue;
-      default:
-        goto handle_unusual;
-    }  // switch
-  handle_unusual:
-    if ((tag == 0) || ((tag & 7) == 4)) {
-      CHK_(ptr);
-      ctx->SetLastTag(tag);
-      goto message_done;
-    }
-    ptr = UnknownFieldParse(
-        tag,
-        _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(),
-        ptr, ctx);
-    CHK_(ptr != nullptr);
-  }  // while
-message_done:
-  return ptr;
-failure:
-  ptr = nullptr;
-  goto message_done;
-#undef CHK_
-}
-
-uint8_t* Int64Value::_InternalSerialize(
-    uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.Int64Value)
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  // int64 value = 1;
-  if (this->_internal_value() != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteInt64ToArray(1, this->_internal_value(), target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-        _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.Int64Value)
-  return target;
-}
-
-size_t Int64Value::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:google.protobuf.Int64Value)
-  size_t total_size = 0;
-
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // int64 value = 1;
-  if (this->_internal_value() != 0) {
-    total_size += ::_pbi::WireFormatLite::Int64SizePlusOne(this->_internal_value());
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData Int64Value::_class_data_ = {
-    ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck,
-    Int64Value::MergeImpl
-};
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*Int64Value::GetClassData() const { return &_class_data_; }
-
-
-void Int64Value::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) {
-  auto* const _this = static_cast<Int64Value*>(&to_msg);
-  auto& from = static_cast<const Int64Value&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.Int64Value)
-  GOOGLE_DCHECK_NE(&from, _this);
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if (from._internal_value() != 0) {
-    _this->_internal_set_value(from._internal_value());
-  }
-  _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void Int64Value::CopyFrom(const Int64Value& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.Int64Value)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool Int64Value::IsInitialized() const {
-  return true;
-}
-
-void Int64Value::InternalSwap(Int64Value* other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_.value_, other->_impl_.value_);
-}
-
-::PROTOBUF_NAMESPACE_ID::Metadata Int64Value::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_google_2fprotobuf_2fwrappers_2eproto_getter, &descriptor_table_google_2fprotobuf_2fwrappers_2eproto_once,
-      file_level_metadata_google_2fprotobuf_2fwrappers_2eproto[2]);
-}
-
-// ===================================================================
-
-class UInt64Value::_Internal {
- public:
-};
-
-UInt64Value::UInt64Value(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                         bool is_message_owned)
-  : ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned) {
-  SharedCtor(arena, is_message_owned);
-  // @@protoc_insertion_point(arena_constructor:google.protobuf.UInt64Value)
-}
-UInt64Value::UInt64Value(const UInt64Value& from)
-  : ::PROTOBUF_NAMESPACE_ID::Message() {
-  UInt64Value* const _this = this; (void)_this;
-  new (&_impl_) Impl_{
-      decltype(_impl_.value_){}
-    , /*decltype(_impl_._cached_size_)*/{}};
-
-  _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-  _this->_impl_.value_ = from._impl_.value_;
-  // @@protoc_insertion_point(copy_constructor:google.protobuf.UInt64Value)
-}
-
-inline void UInt64Value::SharedCtor(
-    ::_pb::Arena* arena, bool is_message_owned) {
-  (void)arena;
-  (void)is_message_owned;
-  new (&_impl_) Impl_{
-      decltype(_impl_.value_){uint64_t{0u}}
-    , /*decltype(_impl_._cached_size_)*/{}
-  };
-}
-
-UInt64Value::~UInt64Value() {
-  // @@protoc_insertion_point(destructor:google.protobuf.UInt64Value)
-  if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) {
-  (void)arena;
-    return;
-  }
-  SharedDtor();
-}
-
-inline void UInt64Value::SharedDtor() {
-  GOOGLE_DCHECK(GetArenaForAllocation() == nullptr);
-}
-
-void UInt64Value::SetCachedSize(int size) const {
-  _impl_._cached_size_.Set(size);
-}
-
-void UInt64Value::Clear() {
-// @@protoc_insertion_point(message_clear_start:google.protobuf.UInt64Value)
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.value_ = uint64_t{0u};
-  _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>();
-}
-
-const char* UInt64Value::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) {
-#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure
-  while (!ctx->Done(&ptr)) {
-    uint32_t tag;
-    ptr = ::_pbi::ReadTag(ptr, &tag);
-    switch (tag >> 3) {
-      // uint64 value = 1;
-      case 1:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 8)) {
-          _impl_.value_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr);
-          CHK_(ptr);
-        } else
-          goto handle_unusual;
-        continue;
-      default:
-        goto handle_unusual;
-    }  // switch
-  handle_unusual:
-    if ((tag == 0) || ((tag & 7) == 4)) {
-      CHK_(ptr);
-      ctx->SetLastTag(tag);
-      goto message_done;
-    }
-    ptr = UnknownFieldParse(
-        tag,
-        _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(),
-        ptr, ctx);
-    CHK_(ptr != nullptr);
-  }  // while
-message_done:
-  return ptr;
-failure:
-  ptr = nullptr;
-  goto message_done;
-#undef CHK_
-}
-
-uint8_t* UInt64Value::_InternalSerialize(
-    uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.UInt64Value)
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  // uint64 value = 1;
-  if (this->_internal_value() != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteUInt64ToArray(1, this->_internal_value(), target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-        _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.UInt64Value)
-  return target;
-}
-
-size_t UInt64Value::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:google.protobuf.UInt64Value)
-  size_t total_size = 0;
-
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // uint64 value = 1;
-  if (this->_internal_value() != 0) {
-    total_size += ::_pbi::WireFormatLite::UInt64SizePlusOne(this->_internal_value());
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData UInt64Value::_class_data_ = {
-    ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck,
-    UInt64Value::MergeImpl
-};
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*UInt64Value::GetClassData() const { return &_class_data_; }
-
-
-void UInt64Value::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) {
-  auto* const _this = static_cast<UInt64Value*>(&to_msg);
-  auto& from = static_cast<const UInt64Value&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.UInt64Value)
-  GOOGLE_DCHECK_NE(&from, _this);
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if (from._internal_value() != 0) {
-    _this->_internal_set_value(from._internal_value());
-  }
-  _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void UInt64Value::CopyFrom(const UInt64Value& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.UInt64Value)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool UInt64Value::IsInitialized() const {
-  return true;
-}
-
-void UInt64Value::InternalSwap(UInt64Value* other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_.value_, other->_impl_.value_);
-}
-
-::PROTOBUF_NAMESPACE_ID::Metadata UInt64Value::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_google_2fprotobuf_2fwrappers_2eproto_getter, &descriptor_table_google_2fprotobuf_2fwrappers_2eproto_once,
-      file_level_metadata_google_2fprotobuf_2fwrappers_2eproto[3]);
-}
-
-// ===================================================================
-
-class Int32Value::_Internal {
- public:
-};
-
-Int32Value::Int32Value(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                         bool is_message_owned)
-  : ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned) {
-  SharedCtor(arena, is_message_owned);
-  // @@protoc_insertion_point(arena_constructor:google.protobuf.Int32Value)
-}
-Int32Value::Int32Value(const Int32Value& from)
-  : ::PROTOBUF_NAMESPACE_ID::Message() {
-  Int32Value* const _this = this; (void)_this;
-  new (&_impl_) Impl_{
-      decltype(_impl_.value_){}
-    , /*decltype(_impl_._cached_size_)*/{}};
-
-  _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-  _this->_impl_.value_ = from._impl_.value_;
-  // @@protoc_insertion_point(copy_constructor:google.protobuf.Int32Value)
-}
-
-inline void Int32Value::SharedCtor(
-    ::_pb::Arena* arena, bool is_message_owned) {
-  (void)arena;
-  (void)is_message_owned;
-  new (&_impl_) Impl_{
-      decltype(_impl_.value_){0}
-    , /*decltype(_impl_._cached_size_)*/{}
-  };
-}
-
-Int32Value::~Int32Value() {
-  // @@protoc_insertion_point(destructor:google.protobuf.Int32Value)
-  if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) {
-  (void)arena;
-    return;
-  }
-  SharedDtor();
-}
-
-inline void Int32Value::SharedDtor() {
-  GOOGLE_DCHECK(GetArenaForAllocation() == nullptr);
-}
-
-void Int32Value::SetCachedSize(int size) const {
-  _impl_._cached_size_.Set(size);
-}
-
-void Int32Value::Clear() {
-// @@protoc_insertion_point(message_clear_start:google.protobuf.Int32Value)
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.value_ = 0;
-  _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>();
-}
-
-const char* Int32Value::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) {
-#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure
-  while (!ctx->Done(&ptr)) {
-    uint32_t tag;
-    ptr = ::_pbi::ReadTag(ptr, &tag);
-    switch (tag >> 3) {
-      // int32 value = 1;
-      case 1:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 8)) {
-          _impl_.value_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr);
-          CHK_(ptr);
-        } else
-          goto handle_unusual;
-        continue;
-      default:
-        goto handle_unusual;
-    }  // switch
-  handle_unusual:
-    if ((tag == 0) || ((tag & 7) == 4)) {
-      CHK_(ptr);
-      ctx->SetLastTag(tag);
-      goto message_done;
-    }
-    ptr = UnknownFieldParse(
-        tag,
-        _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(),
-        ptr, ctx);
-    CHK_(ptr != nullptr);
-  }  // while
-message_done:
-  return ptr;
-failure:
-  ptr = nullptr;
-  goto message_done;
-#undef CHK_
-}
-
-uint8_t* Int32Value::_InternalSerialize(
-    uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.Int32Value)
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  // int32 value = 1;
-  if (this->_internal_value() != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteInt32ToArray(1, this->_internal_value(), target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-        _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.Int32Value)
-  return target;
-}
-
-size_t Int32Value::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:google.protobuf.Int32Value)
-  size_t total_size = 0;
-
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // int32 value = 1;
-  if (this->_internal_value() != 0) {
-    total_size += ::_pbi::WireFormatLite::Int32SizePlusOne(this->_internal_value());
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData Int32Value::_class_data_ = {
-    ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck,
-    Int32Value::MergeImpl
-};
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*Int32Value::GetClassData() const { return &_class_data_; }
-
-
-void Int32Value::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) {
-  auto* const _this = static_cast<Int32Value*>(&to_msg);
-  auto& from = static_cast<const Int32Value&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.Int32Value)
-  GOOGLE_DCHECK_NE(&from, _this);
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if (from._internal_value() != 0) {
-    _this->_internal_set_value(from._internal_value());
-  }
-  _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void Int32Value::CopyFrom(const Int32Value& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.Int32Value)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool Int32Value::IsInitialized() const {
-  return true;
-}
-
-void Int32Value::InternalSwap(Int32Value* other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_.value_, other->_impl_.value_);
-}
-
-::PROTOBUF_NAMESPACE_ID::Metadata Int32Value::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_google_2fprotobuf_2fwrappers_2eproto_getter, &descriptor_table_google_2fprotobuf_2fwrappers_2eproto_once,
-      file_level_metadata_google_2fprotobuf_2fwrappers_2eproto[4]);
-}
-
-// ===================================================================
-
-class UInt32Value::_Internal {
- public:
-};
-
-UInt32Value::UInt32Value(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                         bool is_message_owned)
-  : ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned) {
-  SharedCtor(arena, is_message_owned);
-  // @@protoc_insertion_point(arena_constructor:google.protobuf.UInt32Value)
-}
-UInt32Value::UInt32Value(const UInt32Value& from)
-  : ::PROTOBUF_NAMESPACE_ID::Message() {
-  UInt32Value* const _this = this; (void)_this;
-  new (&_impl_) Impl_{
-      decltype(_impl_.value_){}
-    , /*decltype(_impl_._cached_size_)*/{}};
-
-  _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-  _this->_impl_.value_ = from._impl_.value_;
-  // @@protoc_insertion_point(copy_constructor:google.protobuf.UInt32Value)
-}
-
-inline void UInt32Value::SharedCtor(
-    ::_pb::Arena* arena, bool is_message_owned) {
-  (void)arena;
-  (void)is_message_owned;
-  new (&_impl_) Impl_{
-      decltype(_impl_.value_){0u}
-    , /*decltype(_impl_._cached_size_)*/{}
-  };
-}
-
-UInt32Value::~UInt32Value() {
-  // @@protoc_insertion_point(destructor:google.protobuf.UInt32Value)
-  if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) {
-  (void)arena;
-    return;
-  }
-  SharedDtor();
-}
-
-inline void UInt32Value::SharedDtor() {
-  GOOGLE_DCHECK(GetArenaForAllocation() == nullptr);
-}
-
-void UInt32Value::SetCachedSize(int size) const {
-  _impl_._cached_size_.Set(size);
-}
-
-void UInt32Value::Clear() {
-// @@protoc_insertion_point(message_clear_start:google.protobuf.UInt32Value)
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.value_ = 0u;
-  _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>();
-}
-
-const char* UInt32Value::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) {
-#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure
-  while (!ctx->Done(&ptr)) {
-    uint32_t tag;
-    ptr = ::_pbi::ReadTag(ptr, &tag);
-    switch (tag >> 3) {
-      // uint32 value = 1;
-      case 1:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 8)) {
-          _impl_.value_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr);
-          CHK_(ptr);
-        } else
-          goto handle_unusual;
-        continue;
-      default:
-        goto handle_unusual;
-    }  // switch
-  handle_unusual:
-    if ((tag == 0) || ((tag & 7) == 4)) {
-      CHK_(ptr);
-      ctx->SetLastTag(tag);
-      goto message_done;
-    }
-    ptr = UnknownFieldParse(
-        tag,
-        _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(),
-        ptr, ctx);
-    CHK_(ptr != nullptr);
-  }  // while
-message_done:
-  return ptr;
-failure:
-  ptr = nullptr;
-  goto message_done;
-#undef CHK_
-}
-
-uint8_t* UInt32Value::_InternalSerialize(
-    uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.UInt32Value)
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  // uint32 value = 1;
-  if (this->_internal_value() != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteUInt32ToArray(1, this->_internal_value(), target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-        _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.UInt32Value)
-  return target;
-}
-
-size_t UInt32Value::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:google.protobuf.UInt32Value)
-  size_t total_size = 0;
-
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // uint32 value = 1;
-  if (this->_internal_value() != 0) {
-    total_size += ::_pbi::WireFormatLite::UInt32SizePlusOne(this->_internal_value());
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData UInt32Value::_class_data_ = {
-    ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck,
-    UInt32Value::MergeImpl
-};
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*UInt32Value::GetClassData() const { return &_class_data_; }
-
-
-void UInt32Value::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) {
-  auto* const _this = static_cast<UInt32Value*>(&to_msg);
-  auto& from = static_cast<const UInt32Value&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.UInt32Value)
-  GOOGLE_DCHECK_NE(&from, _this);
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if (from._internal_value() != 0) {
-    _this->_internal_set_value(from._internal_value());
-  }
-  _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void UInt32Value::CopyFrom(const UInt32Value& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.UInt32Value)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool UInt32Value::IsInitialized() const {
-  return true;
-}
-
-void UInt32Value::InternalSwap(UInt32Value* other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_.value_, other->_impl_.value_);
-}
-
-::PROTOBUF_NAMESPACE_ID::Metadata UInt32Value::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_google_2fprotobuf_2fwrappers_2eproto_getter, &descriptor_table_google_2fprotobuf_2fwrappers_2eproto_once,
-      file_level_metadata_google_2fprotobuf_2fwrappers_2eproto[5]);
-}
-
-// ===================================================================
-
-class BoolValue::_Internal {
- public:
-};
-
-BoolValue::BoolValue(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                         bool is_message_owned)
-  : ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned) {
-  SharedCtor(arena, is_message_owned);
-  // @@protoc_insertion_point(arena_constructor:google.protobuf.BoolValue)
-}
-BoolValue::BoolValue(const BoolValue& from)
-  : ::PROTOBUF_NAMESPACE_ID::Message() {
-  BoolValue* const _this = this; (void)_this;
-  new (&_impl_) Impl_{
-      decltype(_impl_.value_){}
-    , /*decltype(_impl_._cached_size_)*/{}};
-
-  _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-  _this->_impl_.value_ = from._impl_.value_;
-  // @@protoc_insertion_point(copy_constructor:google.protobuf.BoolValue)
-}
-
-inline void BoolValue::SharedCtor(
-    ::_pb::Arena* arena, bool is_message_owned) {
-  (void)arena;
-  (void)is_message_owned;
-  new (&_impl_) Impl_{
-      decltype(_impl_.value_){false}
-    , /*decltype(_impl_._cached_size_)*/{}
-  };
-}
-
-BoolValue::~BoolValue() {
-  // @@protoc_insertion_point(destructor:google.protobuf.BoolValue)
-  if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) {
-  (void)arena;
-    return;
-  }
-  SharedDtor();
-}
-
-inline void BoolValue::SharedDtor() {
-  GOOGLE_DCHECK(GetArenaForAllocation() == nullptr);
-}
-
-void BoolValue::SetCachedSize(int size) const {
-  _impl_._cached_size_.Set(size);
-}
-
-void BoolValue::Clear() {
-// @@protoc_insertion_point(message_clear_start:google.protobuf.BoolValue)
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.value_ = false;
-  _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>();
-}
-
-const char* BoolValue::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) {
-#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure
-  while (!ctx->Done(&ptr)) {
-    uint32_t tag;
-    ptr = ::_pbi::ReadTag(ptr, &tag);
-    switch (tag >> 3) {
-      // bool value = 1;
-      case 1:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 8)) {
-          _impl_.value_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr);
-          CHK_(ptr);
-        } else
-          goto handle_unusual;
-        continue;
-      default:
-        goto handle_unusual;
-    }  // switch
-  handle_unusual:
-    if ((tag == 0) || ((tag & 7) == 4)) {
-      CHK_(ptr);
-      ctx->SetLastTag(tag);
-      goto message_done;
-    }
-    ptr = UnknownFieldParse(
-        tag,
-        _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(),
-        ptr, ctx);
-    CHK_(ptr != nullptr);
-  }  // while
-message_done:
-  return ptr;
-failure:
-  ptr = nullptr;
-  goto message_done;
-#undef CHK_
-}
-
-uint8_t* BoolValue::_InternalSerialize(
-    uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.BoolValue)
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  // bool value = 1;
-  if (this->_internal_value() != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteBoolToArray(1, this->_internal_value(), target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-        _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.BoolValue)
-  return target;
-}
-
-size_t BoolValue::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:google.protobuf.BoolValue)
-  size_t total_size = 0;
-
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // bool value = 1;
-  if (this->_internal_value() != 0) {
-    total_size += 1 + 1;
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData BoolValue::_class_data_ = {
-    ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck,
-    BoolValue::MergeImpl
-};
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*BoolValue::GetClassData() const { return &_class_data_; }
-
-
-void BoolValue::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) {
-  auto* const _this = static_cast<BoolValue*>(&to_msg);
-  auto& from = static_cast<const BoolValue&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.BoolValue)
-  GOOGLE_DCHECK_NE(&from, _this);
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if (from._internal_value() != 0) {
-    _this->_internal_set_value(from._internal_value());
-  }
-  _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void BoolValue::CopyFrom(const BoolValue& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.BoolValue)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool BoolValue::IsInitialized() const {
-  return true;
-}
-
-void BoolValue::InternalSwap(BoolValue* other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_.value_, other->_impl_.value_);
-}
-
-::PROTOBUF_NAMESPACE_ID::Metadata BoolValue::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_google_2fprotobuf_2fwrappers_2eproto_getter, &descriptor_table_google_2fprotobuf_2fwrappers_2eproto_once,
-      file_level_metadata_google_2fprotobuf_2fwrappers_2eproto[6]);
-}
-
-// ===================================================================
-
-class StringValue::_Internal {
- public:
-};
-
-StringValue::StringValue(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                         bool is_message_owned)
-  : ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned) {
-  SharedCtor(arena, is_message_owned);
-  // @@protoc_insertion_point(arena_constructor:google.protobuf.StringValue)
-}
-StringValue::StringValue(const StringValue& from)
-  : ::PROTOBUF_NAMESPACE_ID::Message() {
-  StringValue* const _this = this; (void)_this;
-  new (&_impl_) Impl_{
-      decltype(_impl_.value_){}
-    , /*decltype(_impl_._cached_size_)*/{}};
-
-  _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-  _impl_.value_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.value_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (!from._internal_value().empty()) {
-    _this->_impl_.value_.Set(from._internal_value(), 
-      _this->GetArenaForAllocation());
-  }
-  // @@protoc_insertion_point(copy_constructor:google.protobuf.StringValue)
-}
-
-inline void StringValue::SharedCtor(
-    ::_pb::Arena* arena, bool is_message_owned) {
-  (void)arena;
-  (void)is_message_owned;
-  new (&_impl_) Impl_{
-      decltype(_impl_.value_){}
-    , /*decltype(_impl_._cached_size_)*/{}
-  };
-  _impl_.value_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.value_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-}
-
-StringValue::~StringValue() {
-  // @@protoc_insertion_point(destructor:google.protobuf.StringValue)
-  if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) {
-  (void)arena;
-    return;
-  }
-  SharedDtor();
-}
-
-inline void StringValue::SharedDtor() {
-  GOOGLE_DCHECK(GetArenaForAllocation() == nullptr);
-  _impl_.value_.Destroy();
-}
-
-void StringValue::SetCachedSize(int size) const {
-  _impl_._cached_size_.Set(size);
-}
-
-void StringValue::Clear() {
-// @@protoc_insertion_point(message_clear_start:google.protobuf.StringValue)
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.value_.ClearToEmpty();
-  _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>();
-}
-
-const char* StringValue::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) {
-#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure
-  while (!ctx->Done(&ptr)) {
-    uint32_t tag;
-    ptr = ::_pbi::ReadTag(ptr, &tag);
-    switch (tag >> 3) {
-      // string value = 1;
-      case 1:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 10)) {
-          auto str = _internal_mutable_value();
-          ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx);
-          CHK_(ptr);
-          CHK_(::_pbi::VerifyUTF8(str, "google.protobuf.StringValue.value"));
-        } else
-          goto handle_unusual;
-        continue;
-      default:
-        goto handle_unusual;
-    }  // switch
-  handle_unusual:
-    if ((tag == 0) || ((tag & 7) == 4)) {
-      CHK_(ptr);
-      ctx->SetLastTag(tag);
-      goto message_done;
-    }
-    ptr = UnknownFieldParse(
-        tag,
-        _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(),
-        ptr, ctx);
-    CHK_(ptr != nullptr);
-  }  // while
-message_done:
-  return ptr;
-failure:
-  ptr = nullptr;
-  goto message_done;
-#undef CHK_
-}
-
-uint8_t* StringValue::_InternalSerialize(
-    uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.StringValue)
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  // string value = 1;
-  if (!this->_internal_value().empty()) {
-    ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String(
-      this->_internal_value().data(), static_cast<int>(this->_internal_value().length()),
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE,
-      "google.protobuf.StringValue.value");
-    target = stream->WriteStringMaybeAliased(
-        1, this->_internal_value(), target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-        _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.StringValue)
-  return target;
-}
-
-size_t StringValue::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:google.protobuf.StringValue)
-  size_t total_size = 0;
-
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // string value = 1;
-  if (!this->_internal_value().empty()) {
-    total_size += 1 +
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize(
-        this->_internal_value());
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData StringValue::_class_data_ = {
-    ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck,
-    StringValue::MergeImpl
-};
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*StringValue::GetClassData() const { return &_class_data_; }
-
-
-void StringValue::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) {
-  auto* const _this = static_cast<StringValue*>(&to_msg);
-  auto& from = static_cast<const StringValue&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.StringValue)
-  GOOGLE_DCHECK_NE(&from, _this);
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if (!from._internal_value().empty()) {
-    _this->_internal_set_value(from._internal_value());
-  }
-  _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void StringValue::CopyFrom(const StringValue& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.StringValue)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool StringValue::IsInitialized() const {
-  return true;
-}
-
-void StringValue::InternalSwap(StringValue* other) {
-  using std::swap;
-  auto* lhs_arena = GetArenaForAllocation();
-  auto* rhs_arena = other->GetArenaForAllocation();
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::InternalSwap(
-      &_impl_.value_, lhs_arena,
-      &other->_impl_.value_, rhs_arena
-  );
-}
-
-::PROTOBUF_NAMESPACE_ID::Metadata StringValue::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_google_2fprotobuf_2fwrappers_2eproto_getter, &descriptor_table_google_2fprotobuf_2fwrappers_2eproto_once,
-      file_level_metadata_google_2fprotobuf_2fwrappers_2eproto[7]);
-}
-
-// ===================================================================
-
-class BytesValue::_Internal {
- public:
-};
-
-BytesValue::BytesValue(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                         bool is_message_owned)
-  : ::PROTOBUF_NAMESPACE_ID::Message(arena, is_message_owned) {
-  SharedCtor(arena, is_message_owned);
-  // @@protoc_insertion_point(arena_constructor:google.protobuf.BytesValue)
-}
-BytesValue::BytesValue(const BytesValue& from)
-  : ::PROTOBUF_NAMESPACE_ID::Message() {
-  BytesValue* const _this = this; (void)_this;
-  new (&_impl_) Impl_{
-      decltype(_impl_.value_){}
-    , /*decltype(_impl_._cached_size_)*/{}};
-
-  _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-  _impl_.value_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.value_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (!from._internal_value().empty()) {
-    _this->_impl_.value_.Set(from._internal_value(), 
-      _this->GetArenaForAllocation());
-  }
-  // @@protoc_insertion_point(copy_constructor:google.protobuf.BytesValue)
-}
-
-inline void BytesValue::SharedCtor(
-    ::_pb::Arena* arena, bool is_message_owned) {
-  (void)arena;
-  (void)is_message_owned;
-  new (&_impl_) Impl_{
-      decltype(_impl_.value_){}
-    , /*decltype(_impl_._cached_size_)*/{}
-  };
-  _impl_.value_.InitDefault();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-    _impl_.value_.Set("", GetArenaForAllocation());
-  #endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-}
-
-BytesValue::~BytesValue() {
-  // @@protoc_insertion_point(destructor:google.protobuf.BytesValue)
-  if (auto *arena = _internal_metadata_.DeleteReturnArena<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>()) {
-  (void)arena;
-    return;
-  }
-  SharedDtor();
-}
-
-inline void BytesValue::SharedDtor() {
-  GOOGLE_DCHECK(GetArenaForAllocation() == nullptr);
-  _impl_.value_.Destroy();
-}
-
-void BytesValue::SetCachedSize(int size) const {
-  _impl_._cached_size_.Set(size);
-}
-
-void BytesValue::Clear() {
-// @@protoc_insertion_point(message_clear_start:google.protobuf.BytesValue)
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.value_.ClearToEmpty();
-  _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>();
-}
-
-const char* BytesValue::_InternalParse(const char* ptr, ::_pbi::ParseContext* ctx) {
-#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure
-  while (!ctx->Done(&ptr)) {
-    uint32_t tag;
-    ptr = ::_pbi::ReadTag(ptr, &tag);
-    switch (tag >> 3) {
-      // bytes value = 1;
-      case 1:
-        if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 10)) {
-          auto str = _internal_mutable_value();
-          ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx);
-          CHK_(ptr);
-        } else
-          goto handle_unusual;
-        continue;
-      default:
-        goto handle_unusual;
-    }  // switch
-  handle_unusual:
-    if ((tag == 0) || ((tag & 7) == 4)) {
-      CHK_(ptr);
-      ctx->SetLastTag(tag);
-      goto message_done;
-    }
-    ptr = UnknownFieldParse(
-        tag,
-        _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(),
-        ptr, ctx);
-    CHK_(ptr != nullptr);
-  }  // while
-message_done:
-  return ptr;
-failure:
-  ptr = nullptr;
-  goto message_done;
-#undef CHK_
-}
-
-uint8_t* BytesValue::_InternalSerialize(
-    uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:google.protobuf.BytesValue)
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  // bytes value = 1;
-  if (!this->_internal_value().empty()) {
-    target = stream->WriteBytesMaybeAliased(
-        1, this->_internal_value(), target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-        _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:google.protobuf.BytesValue)
-  return target;
-}
-
-size_t BytesValue::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:google.protobuf.BytesValue)
-  size_t total_size = 0;
-
-  uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // bytes value = 1;
-  if (!this->_internal_value().empty()) {
-    total_size += 1 +
-      ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::BytesSize(
-        this->_internal_value());
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData BytesValue::_class_data_ = {
-    ::PROTOBUF_NAMESPACE_ID::Message::CopyWithSourceCheck,
-    BytesValue::MergeImpl
-};
-const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*BytesValue::GetClassData() const { return &_class_data_; }
-
-
-void BytesValue::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg) {
-  auto* const _this = static_cast<BytesValue*>(&to_msg);
-  auto& from = static_cast<const BytesValue&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:google.protobuf.BytesValue)
-  GOOGLE_DCHECK_NE(&from, _this);
-  uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if (!from._internal_value().empty()) {
-    _this->_internal_set_value(from._internal_value());
-  }
-  _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void BytesValue::CopyFrom(const BytesValue& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:google.protobuf.BytesValue)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool BytesValue::IsInitialized() const {
-  return true;
-}
-
-void BytesValue::InternalSwap(BytesValue* other) {
-  using std::swap;
-  auto* lhs_arena = GetArenaForAllocation();
-  auto* rhs_arena = other->GetArenaForAllocation();
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::InternalSwap(
-      &_impl_.value_, lhs_arena,
-      &other->_impl_.value_, rhs_arena
-  );
-}
-
-::PROTOBUF_NAMESPACE_ID::Metadata BytesValue::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_google_2fprotobuf_2fwrappers_2eproto_getter, &descriptor_table_google_2fprotobuf_2fwrappers_2eproto_once,
-      file_level_metadata_google_2fprotobuf_2fwrappers_2eproto[8]);
-}
-
-// @@protoc_insertion_point(namespace_scope)
-PROTOBUF_NAMESPACE_CLOSE
-PROTOBUF_NAMESPACE_OPEN
-template<> PROTOBUF_NOINLINE ::PROTOBUF_NAMESPACE_ID::DoubleValue*
-Arena::CreateMaybeMessage< ::PROTOBUF_NAMESPACE_ID::DoubleValue >(Arena* arena) {
-  return Arena::CreateMessageInternal< ::PROTOBUF_NAMESPACE_ID::DoubleValue >(arena);
-}
-template<> PROTOBUF_NOINLINE ::PROTOBUF_NAMESPACE_ID::FloatValue*
-Arena::CreateMaybeMessage< ::PROTOBUF_NAMESPACE_ID::FloatValue >(Arena* arena) {
-  return Arena::CreateMessageInternal< ::PROTOBUF_NAMESPACE_ID::FloatValue >(arena);
-}
-template<> PROTOBUF_NOINLINE ::PROTOBUF_NAMESPACE_ID::Int64Value*
-Arena::CreateMaybeMessage< ::PROTOBUF_NAMESPACE_ID::Int64Value >(Arena* arena) {
-  return Arena::CreateMessageInternal< ::PROTOBUF_NAMESPACE_ID::Int64Value >(arena);
-}
-template<> PROTOBUF_NOINLINE ::PROTOBUF_NAMESPACE_ID::UInt64Value*
-Arena::CreateMaybeMessage< ::PROTOBUF_NAMESPACE_ID::UInt64Value >(Arena* arena) {
-  return Arena::CreateMessageInternal< ::PROTOBUF_NAMESPACE_ID::UInt64Value >(arena);
-}
-template<> PROTOBUF_NOINLINE ::PROTOBUF_NAMESPACE_ID::Int32Value*
-Arena::CreateMaybeMessage< ::PROTOBUF_NAMESPACE_ID::Int32Value >(Arena* arena) {
-  return Arena::CreateMessageInternal< ::PROTOBUF_NAMESPACE_ID::Int32Value >(arena);
-}
-template<> PROTOBUF_NOINLINE ::PROTOBUF_NAMESPACE_ID::UInt32Value*
-Arena::CreateMaybeMessage< ::PROTOBUF_NAMESPACE_ID::UInt32Value >(Arena* arena) {
-  return Arena::CreateMessageInternal< ::PROTOBUF_NAMESPACE_ID::UInt32Value >(arena);
-}
-template<> PROTOBUF_NOINLINE ::PROTOBUF_NAMESPACE_ID::BoolValue*
-Arena::CreateMaybeMessage< ::PROTOBUF_NAMESPACE_ID::BoolValue >(Arena* arena) {
-  return Arena::CreateMessageInternal< ::PROTOBUF_NAMESPACE_ID::BoolValue >(arena);
-}
-template<> PROTOBUF_NOINLINE ::PROTOBUF_NAMESPACE_ID::StringValue*
-Arena::CreateMaybeMessage< ::PROTOBUF_NAMESPACE_ID::StringValue >(Arena* arena) {
-  return Arena::CreateMessageInternal< ::PROTOBUF_NAMESPACE_ID::StringValue >(arena);
-}
-template<> PROTOBUF_NOINLINE ::PROTOBUF_NAMESPACE_ID::BytesValue*
-Arena::CreateMaybeMessage< ::PROTOBUF_NAMESPACE_ID::BytesValue >(Arena* arena) {
-  return Arena::CreateMessageInternal< ::PROTOBUF_NAMESPACE_ID::BytesValue >(arena);
-}
-PROTOBUF_NAMESPACE_CLOSE
-
-// @@protoc_insertion_point(global_scope)
-#include <google/protobuf/port_undef.inc>
diff --git a/libs/protobuf/src/google/protobuf/wrappers.pb.h b/libs/protobuf/src/google/protobuf/wrappers.pb.h
deleted file mode 100644
index 0f4b835..0000000
--- a/libs/protobuf/src/google/protobuf/wrappers.pb.h
+++ /dev/null
@@ -1,1741 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/protobuf/wrappers.proto
-
-#ifndef GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fwrappers_2eproto
-#define GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fwrappers_2eproto
-
-#include <limits>
-#include <string>
-
-#include <google/protobuf/port_def.inc>
-#if PROTOBUF_VERSION < 3021000
-#error This file was generated by a newer version of protoc which is
-#error incompatible with your Protocol Buffer headers. Please update
-#error your headers.
-#endif
-#if 3021012 < PROTOBUF_MIN_PROTOC_VERSION
-#error This file was generated by an older version of protoc which is
-#error incompatible with your Protocol Buffer headers. Please
-#error regenerate this file with a newer version of protoc.
-#endif
-
-#include <google/protobuf/port_undef.inc>
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/arena.h>
-#include <google/protobuf/arenastring.h>
-#include <google/protobuf/generated_message_util.h>
-#include <google/protobuf/metadata_lite.h>
-#include <google/protobuf/generated_message_reflection.h>
-#include <google/protobuf/message.h>
-#include <google/protobuf/repeated_field.h>  // IWYU pragma: export
-#include <google/protobuf/extension_set.h>  // IWYU pragma: export
-#include <google/protobuf/unknown_field_set.h>
-// @@protoc_insertion_point(includes)
-#include <google/protobuf/port_def.inc>
-#define PROTOBUF_INTERNAL_EXPORT_google_2fprotobuf_2fwrappers_2eproto PROTOBUF_EXPORT
-PROTOBUF_NAMESPACE_OPEN
-namespace internal {
-class AnyMetadata;
-}  // namespace internal
-PROTOBUF_NAMESPACE_CLOSE
-
-// Internal implementation detail -- do not use these members.
-struct PROTOBUF_EXPORT TableStruct_google_2fprotobuf_2fwrappers_2eproto {
-  static const uint32_t offsets[];
-};
-PROTOBUF_EXPORT extern const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable descriptor_table_google_2fprotobuf_2fwrappers_2eproto;
-PROTOBUF_NAMESPACE_OPEN
-class BoolValue;
-struct BoolValueDefaultTypeInternal;
-PROTOBUF_EXPORT extern BoolValueDefaultTypeInternal _BoolValue_default_instance_;
-class BytesValue;
-struct BytesValueDefaultTypeInternal;
-PROTOBUF_EXPORT extern BytesValueDefaultTypeInternal _BytesValue_default_instance_;
-class DoubleValue;
-struct DoubleValueDefaultTypeInternal;
-PROTOBUF_EXPORT extern DoubleValueDefaultTypeInternal _DoubleValue_default_instance_;
-class FloatValue;
-struct FloatValueDefaultTypeInternal;
-PROTOBUF_EXPORT extern FloatValueDefaultTypeInternal _FloatValue_default_instance_;
-class Int32Value;
-struct Int32ValueDefaultTypeInternal;
-PROTOBUF_EXPORT extern Int32ValueDefaultTypeInternal _Int32Value_default_instance_;
-class Int64Value;
-struct Int64ValueDefaultTypeInternal;
-PROTOBUF_EXPORT extern Int64ValueDefaultTypeInternal _Int64Value_default_instance_;
-class StringValue;
-struct StringValueDefaultTypeInternal;
-PROTOBUF_EXPORT extern StringValueDefaultTypeInternal _StringValue_default_instance_;
-class UInt32Value;
-struct UInt32ValueDefaultTypeInternal;
-PROTOBUF_EXPORT extern UInt32ValueDefaultTypeInternal _UInt32Value_default_instance_;
-class UInt64Value;
-struct UInt64ValueDefaultTypeInternal;
-PROTOBUF_EXPORT extern UInt64ValueDefaultTypeInternal _UInt64Value_default_instance_;
-PROTOBUF_NAMESPACE_CLOSE
-PROTOBUF_NAMESPACE_OPEN
-template<> PROTOBUF_EXPORT ::PROTOBUF_NAMESPACE_ID::BoolValue* Arena::CreateMaybeMessage<::PROTOBUF_NAMESPACE_ID::BoolValue>(Arena*);
-template<> PROTOBUF_EXPORT ::PROTOBUF_NAMESPACE_ID::BytesValue* Arena::CreateMaybeMessage<::PROTOBUF_NAMESPACE_ID::BytesValue>(Arena*);
-template<> PROTOBUF_EXPORT ::PROTOBUF_NAMESPACE_ID::DoubleValue* Arena::CreateMaybeMessage<::PROTOBUF_NAMESPACE_ID::DoubleValue>(Arena*);
-template<> PROTOBUF_EXPORT ::PROTOBUF_NAMESPACE_ID::FloatValue* Arena::CreateMaybeMessage<::PROTOBUF_NAMESPACE_ID::FloatValue>(Arena*);
-template<> PROTOBUF_EXPORT ::PROTOBUF_NAMESPACE_ID::Int32Value* Arena::CreateMaybeMessage<::PROTOBUF_NAMESPACE_ID::Int32Value>(Arena*);
-template<> PROTOBUF_EXPORT ::PROTOBUF_NAMESPACE_ID::Int64Value* Arena::CreateMaybeMessage<::PROTOBUF_NAMESPACE_ID::Int64Value>(Arena*);
-template<> PROTOBUF_EXPORT ::PROTOBUF_NAMESPACE_ID::StringValue* Arena::CreateMaybeMessage<::PROTOBUF_NAMESPACE_ID::StringValue>(Arena*);
-template<> PROTOBUF_EXPORT ::PROTOBUF_NAMESPACE_ID::UInt32Value* Arena::CreateMaybeMessage<::PROTOBUF_NAMESPACE_ID::UInt32Value>(Arena*);
-template<> PROTOBUF_EXPORT ::PROTOBUF_NAMESPACE_ID::UInt64Value* Arena::CreateMaybeMessage<::PROTOBUF_NAMESPACE_ID::UInt64Value>(Arena*);
-PROTOBUF_NAMESPACE_CLOSE
-PROTOBUF_NAMESPACE_OPEN
-
-// ===================================================================
-
-class PROTOBUF_EXPORT DoubleValue final :
-    public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:google.protobuf.DoubleValue) */ {
- public:
-  inline DoubleValue() : DoubleValue(nullptr) {}
-  ~DoubleValue() override;
-  explicit PROTOBUF_CONSTEXPR DoubleValue(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
-
-  DoubleValue(const DoubleValue& from);
-  DoubleValue(DoubleValue&& from) noexcept
-    : DoubleValue() {
-    *this = ::std::move(from);
-  }
-
-  inline DoubleValue& operator=(const DoubleValue& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline DoubleValue& operator=(DoubleValue&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetOwningArena() == from.GetOwningArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetOwningArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const DoubleValue& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const DoubleValue* internal_default_instance() {
-    return reinterpret_cast<const DoubleValue*>(
-               &_DoubleValue_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    0;
-
-  friend void swap(DoubleValue& a, DoubleValue& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(DoubleValue* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() != nullptr &&
-        GetOwningArena() == other->GetOwningArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() == other->GetOwningArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(DoubleValue* other) {
-    if (other == this) return;
-    GOOGLE_DCHECK(GetOwningArena() == other->GetOwningArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  DoubleValue* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<DoubleValue>(arena);
-  }
-  using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
-  void CopyFrom(const DoubleValue& from);
-  using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom( const DoubleValue& from) {
-    DoubleValue::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  uint8_t* _InternalSerialize(
-      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
-
-  private:
-  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
-  void SharedDtor();
-  void SetCachedSize(int size) const final;
-  void InternalSwap(DoubleValue* other);
-
-  private:
-  friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
-  static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
-    return "google.protobuf.DoubleValue";
-  }
-  protected:
-  explicit DoubleValue(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                       bool is_message_owned = false);
-  public:
-
-  static const ClassData _class_data_;
-  const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*GetClassData() const final;
-
-  ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kValueFieldNumber = 1,
-  };
-  // double value = 1;
-  void clear_value();
-  double value() const;
-  void set_value(double value);
-  private:
-  double _internal_value() const;
-  void _internal_set_value(double value);
-  public:
-
-  // @@protoc_insertion_point(class_scope:google.protobuf.DoubleValue)
- private:
-  class _Internal;
-
-  template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
-  typedef void InternalArenaConstructable_;
-  typedef void DestructorSkippable_;
-  struct Impl_ {
-    double value_;
-    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_google_2fprotobuf_2fwrappers_2eproto;
-};
-// -------------------------------------------------------------------
-
-class PROTOBUF_EXPORT FloatValue final :
-    public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:google.protobuf.FloatValue) */ {
- public:
-  inline FloatValue() : FloatValue(nullptr) {}
-  ~FloatValue() override;
-  explicit PROTOBUF_CONSTEXPR FloatValue(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
-
-  FloatValue(const FloatValue& from);
-  FloatValue(FloatValue&& from) noexcept
-    : FloatValue() {
-    *this = ::std::move(from);
-  }
-
-  inline FloatValue& operator=(const FloatValue& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline FloatValue& operator=(FloatValue&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetOwningArena() == from.GetOwningArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetOwningArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const FloatValue& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const FloatValue* internal_default_instance() {
-    return reinterpret_cast<const FloatValue*>(
-               &_FloatValue_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    1;
-
-  friend void swap(FloatValue& a, FloatValue& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(FloatValue* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() != nullptr &&
-        GetOwningArena() == other->GetOwningArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() == other->GetOwningArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(FloatValue* other) {
-    if (other == this) return;
-    GOOGLE_DCHECK(GetOwningArena() == other->GetOwningArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  FloatValue* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<FloatValue>(arena);
-  }
-  using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
-  void CopyFrom(const FloatValue& from);
-  using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom( const FloatValue& from) {
-    FloatValue::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  uint8_t* _InternalSerialize(
-      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
-
-  private:
-  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
-  void SharedDtor();
-  void SetCachedSize(int size) const final;
-  void InternalSwap(FloatValue* other);
-
-  private:
-  friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
-  static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
-    return "google.protobuf.FloatValue";
-  }
-  protected:
-  explicit FloatValue(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                       bool is_message_owned = false);
-  public:
-
-  static const ClassData _class_data_;
-  const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*GetClassData() const final;
-
-  ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kValueFieldNumber = 1,
-  };
-  // float value = 1;
-  void clear_value();
-  float value() const;
-  void set_value(float value);
-  private:
-  float _internal_value() const;
-  void _internal_set_value(float value);
-  public:
-
-  // @@protoc_insertion_point(class_scope:google.protobuf.FloatValue)
- private:
-  class _Internal;
-
-  template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
-  typedef void InternalArenaConstructable_;
-  typedef void DestructorSkippable_;
-  struct Impl_ {
-    float value_;
-    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_google_2fprotobuf_2fwrappers_2eproto;
-};
-// -------------------------------------------------------------------
-
-class PROTOBUF_EXPORT Int64Value final :
-    public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:google.protobuf.Int64Value) */ {
- public:
-  inline Int64Value() : Int64Value(nullptr) {}
-  ~Int64Value() override;
-  explicit PROTOBUF_CONSTEXPR Int64Value(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
-
-  Int64Value(const Int64Value& from);
-  Int64Value(Int64Value&& from) noexcept
-    : Int64Value() {
-    *this = ::std::move(from);
-  }
-
-  inline Int64Value& operator=(const Int64Value& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline Int64Value& operator=(Int64Value&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetOwningArena() == from.GetOwningArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetOwningArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const Int64Value& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const Int64Value* internal_default_instance() {
-    return reinterpret_cast<const Int64Value*>(
-               &_Int64Value_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    2;
-
-  friend void swap(Int64Value& a, Int64Value& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(Int64Value* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() != nullptr &&
-        GetOwningArena() == other->GetOwningArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() == other->GetOwningArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(Int64Value* other) {
-    if (other == this) return;
-    GOOGLE_DCHECK(GetOwningArena() == other->GetOwningArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  Int64Value* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<Int64Value>(arena);
-  }
-  using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
-  void CopyFrom(const Int64Value& from);
-  using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom( const Int64Value& from) {
-    Int64Value::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  uint8_t* _InternalSerialize(
-      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
-
-  private:
-  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
-  void SharedDtor();
-  void SetCachedSize(int size) const final;
-  void InternalSwap(Int64Value* other);
-
-  private:
-  friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
-  static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
-    return "google.protobuf.Int64Value";
-  }
-  protected:
-  explicit Int64Value(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                       bool is_message_owned = false);
-  public:
-
-  static const ClassData _class_data_;
-  const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*GetClassData() const final;
-
-  ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kValueFieldNumber = 1,
-  };
-  // int64 value = 1;
-  void clear_value();
-  int64_t value() const;
-  void set_value(int64_t value);
-  private:
-  int64_t _internal_value() const;
-  void _internal_set_value(int64_t value);
-  public:
-
-  // @@protoc_insertion_point(class_scope:google.protobuf.Int64Value)
- private:
-  class _Internal;
-
-  template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
-  typedef void InternalArenaConstructable_;
-  typedef void DestructorSkippable_;
-  struct Impl_ {
-    int64_t value_;
-    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_google_2fprotobuf_2fwrappers_2eproto;
-};
-// -------------------------------------------------------------------
-
-class PROTOBUF_EXPORT UInt64Value final :
-    public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:google.protobuf.UInt64Value) */ {
- public:
-  inline UInt64Value() : UInt64Value(nullptr) {}
-  ~UInt64Value() override;
-  explicit PROTOBUF_CONSTEXPR UInt64Value(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
-
-  UInt64Value(const UInt64Value& from);
-  UInt64Value(UInt64Value&& from) noexcept
-    : UInt64Value() {
-    *this = ::std::move(from);
-  }
-
-  inline UInt64Value& operator=(const UInt64Value& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline UInt64Value& operator=(UInt64Value&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetOwningArena() == from.GetOwningArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetOwningArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const UInt64Value& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const UInt64Value* internal_default_instance() {
-    return reinterpret_cast<const UInt64Value*>(
-               &_UInt64Value_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    3;
-
-  friend void swap(UInt64Value& a, UInt64Value& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(UInt64Value* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() != nullptr &&
-        GetOwningArena() == other->GetOwningArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() == other->GetOwningArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(UInt64Value* other) {
-    if (other == this) return;
-    GOOGLE_DCHECK(GetOwningArena() == other->GetOwningArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  UInt64Value* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<UInt64Value>(arena);
-  }
-  using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
-  void CopyFrom(const UInt64Value& from);
-  using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom( const UInt64Value& from) {
-    UInt64Value::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  uint8_t* _InternalSerialize(
-      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
-
-  private:
-  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
-  void SharedDtor();
-  void SetCachedSize(int size) const final;
-  void InternalSwap(UInt64Value* other);
-
-  private:
-  friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
-  static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
-    return "google.protobuf.UInt64Value";
-  }
-  protected:
-  explicit UInt64Value(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                       bool is_message_owned = false);
-  public:
-
-  static const ClassData _class_data_;
-  const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*GetClassData() const final;
-
-  ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kValueFieldNumber = 1,
-  };
-  // uint64 value = 1;
-  void clear_value();
-  uint64_t value() const;
-  void set_value(uint64_t value);
-  private:
-  uint64_t _internal_value() const;
-  void _internal_set_value(uint64_t value);
-  public:
-
-  // @@protoc_insertion_point(class_scope:google.protobuf.UInt64Value)
- private:
-  class _Internal;
-
-  template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
-  typedef void InternalArenaConstructable_;
-  typedef void DestructorSkippable_;
-  struct Impl_ {
-    uint64_t value_;
-    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_google_2fprotobuf_2fwrappers_2eproto;
-};
-// -------------------------------------------------------------------
-
-class PROTOBUF_EXPORT Int32Value final :
-    public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:google.protobuf.Int32Value) */ {
- public:
-  inline Int32Value() : Int32Value(nullptr) {}
-  ~Int32Value() override;
-  explicit PROTOBUF_CONSTEXPR Int32Value(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
-
-  Int32Value(const Int32Value& from);
-  Int32Value(Int32Value&& from) noexcept
-    : Int32Value() {
-    *this = ::std::move(from);
-  }
-
-  inline Int32Value& operator=(const Int32Value& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline Int32Value& operator=(Int32Value&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetOwningArena() == from.GetOwningArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetOwningArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const Int32Value& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const Int32Value* internal_default_instance() {
-    return reinterpret_cast<const Int32Value*>(
-               &_Int32Value_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    4;
-
-  friend void swap(Int32Value& a, Int32Value& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(Int32Value* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() != nullptr &&
-        GetOwningArena() == other->GetOwningArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() == other->GetOwningArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(Int32Value* other) {
-    if (other == this) return;
-    GOOGLE_DCHECK(GetOwningArena() == other->GetOwningArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  Int32Value* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<Int32Value>(arena);
-  }
-  using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
-  void CopyFrom(const Int32Value& from);
-  using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom( const Int32Value& from) {
-    Int32Value::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  uint8_t* _InternalSerialize(
-      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
-
-  private:
-  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
-  void SharedDtor();
-  void SetCachedSize(int size) const final;
-  void InternalSwap(Int32Value* other);
-
-  private:
-  friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
-  static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
-    return "google.protobuf.Int32Value";
-  }
-  protected:
-  explicit Int32Value(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                       bool is_message_owned = false);
-  public:
-
-  static const ClassData _class_data_;
-  const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*GetClassData() const final;
-
-  ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kValueFieldNumber = 1,
-  };
-  // int32 value = 1;
-  void clear_value();
-  int32_t value() const;
-  void set_value(int32_t value);
-  private:
-  int32_t _internal_value() const;
-  void _internal_set_value(int32_t value);
-  public:
-
-  // @@protoc_insertion_point(class_scope:google.protobuf.Int32Value)
- private:
-  class _Internal;
-
-  template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
-  typedef void InternalArenaConstructable_;
-  typedef void DestructorSkippable_;
-  struct Impl_ {
-    int32_t value_;
-    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_google_2fprotobuf_2fwrappers_2eproto;
-};
-// -------------------------------------------------------------------
-
-class PROTOBUF_EXPORT UInt32Value final :
-    public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:google.protobuf.UInt32Value) */ {
- public:
-  inline UInt32Value() : UInt32Value(nullptr) {}
-  ~UInt32Value() override;
-  explicit PROTOBUF_CONSTEXPR UInt32Value(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
-
-  UInt32Value(const UInt32Value& from);
-  UInt32Value(UInt32Value&& from) noexcept
-    : UInt32Value() {
-    *this = ::std::move(from);
-  }
-
-  inline UInt32Value& operator=(const UInt32Value& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline UInt32Value& operator=(UInt32Value&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetOwningArena() == from.GetOwningArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetOwningArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const UInt32Value& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const UInt32Value* internal_default_instance() {
-    return reinterpret_cast<const UInt32Value*>(
-               &_UInt32Value_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    5;
-
-  friend void swap(UInt32Value& a, UInt32Value& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(UInt32Value* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() != nullptr &&
-        GetOwningArena() == other->GetOwningArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() == other->GetOwningArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(UInt32Value* other) {
-    if (other == this) return;
-    GOOGLE_DCHECK(GetOwningArena() == other->GetOwningArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  UInt32Value* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<UInt32Value>(arena);
-  }
-  using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
-  void CopyFrom(const UInt32Value& from);
-  using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom( const UInt32Value& from) {
-    UInt32Value::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  uint8_t* _InternalSerialize(
-      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
-
-  private:
-  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
-  void SharedDtor();
-  void SetCachedSize(int size) const final;
-  void InternalSwap(UInt32Value* other);
-
-  private:
-  friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
-  static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
-    return "google.protobuf.UInt32Value";
-  }
-  protected:
-  explicit UInt32Value(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                       bool is_message_owned = false);
-  public:
-
-  static const ClassData _class_data_;
-  const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*GetClassData() const final;
-
-  ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kValueFieldNumber = 1,
-  };
-  // uint32 value = 1;
-  void clear_value();
-  uint32_t value() const;
-  void set_value(uint32_t value);
-  private:
-  uint32_t _internal_value() const;
-  void _internal_set_value(uint32_t value);
-  public:
-
-  // @@protoc_insertion_point(class_scope:google.protobuf.UInt32Value)
- private:
-  class _Internal;
-
-  template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
-  typedef void InternalArenaConstructable_;
-  typedef void DestructorSkippable_;
-  struct Impl_ {
-    uint32_t value_;
-    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_google_2fprotobuf_2fwrappers_2eproto;
-};
-// -------------------------------------------------------------------
-
-class PROTOBUF_EXPORT BoolValue final :
-    public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:google.protobuf.BoolValue) */ {
- public:
-  inline BoolValue() : BoolValue(nullptr) {}
-  ~BoolValue() override;
-  explicit PROTOBUF_CONSTEXPR BoolValue(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
-
-  BoolValue(const BoolValue& from);
-  BoolValue(BoolValue&& from) noexcept
-    : BoolValue() {
-    *this = ::std::move(from);
-  }
-
-  inline BoolValue& operator=(const BoolValue& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline BoolValue& operator=(BoolValue&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetOwningArena() == from.GetOwningArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetOwningArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const BoolValue& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const BoolValue* internal_default_instance() {
-    return reinterpret_cast<const BoolValue*>(
-               &_BoolValue_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    6;
-
-  friend void swap(BoolValue& a, BoolValue& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(BoolValue* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() != nullptr &&
-        GetOwningArena() == other->GetOwningArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() == other->GetOwningArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(BoolValue* other) {
-    if (other == this) return;
-    GOOGLE_DCHECK(GetOwningArena() == other->GetOwningArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  BoolValue* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<BoolValue>(arena);
-  }
-  using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
-  void CopyFrom(const BoolValue& from);
-  using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom( const BoolValue& from) {
-    BoolValue::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  uint8_t* _InternalSerialize(
-      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
-
-  private:
-  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
-  void SharedDtor();
-  void SetCachedSize(int size) const final;
-  void InternalSwap(BoolValue* other);
-
-  private:
-  friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
-  static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
-    return "google.protobuf.BoolValue";
-  }
-  protected:
-  explicit BoolValue(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                       bool is_message_owned = false);
-  public:
-
-  static const ClassData _class_data_;
-  const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*GetClassData() const final;
-
-  ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kValueFieldNumber = 1,
-  };
-  // bool value = 1;
-  void clear_value();
-  bool value() const;
-  void set_value(bool value);
-  private:
-  bool _internal_value() const;
-  void _internal_set_value(bool value);
-  public:
-
-  // @@protoc_insertion_point(class_scope:google.protobuf.BoolValue)
- private:
-  class _Internal;
-
-  template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
-  typedef void InternalArenaConstructable_;
-  typedef void DestructorSkippable_;
-  struct Impl_ {
-    bool value_;
-    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_google_2fprotobuf_2fwrappers_2eproto;
-};
-// -------------------------------------------------------------------
-
-class PROTOBUF_EXPORT StringValue final :
-    public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:google.protobuf.StringValue) */ {
- public:
-  inline StringValue() : StringValue(nullptr) {}
-  ~StringValue() override;
-  explicit PROTOBUF_CONSTEXPR StringValue(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
-
-  StringValue(const StringValue& from);
-  StringValue(StringValue&& from) noexcept
-    : StringValue() {
-    *this = ::std::move(from);
-  }
-
-  inline StringValue& operator=(const StringValue& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline StringValue& operator=(StringValue&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetOwningArena() == from.GetOwningArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetOwningArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const StringValue& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const StringValue* internal_default_instance() {
-    return reinterpret_cast<const StringValue*>(
-               &_StringValue_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    7;
-
-  friend void swap(StringValue& a, StringValue& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(StringValue* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() != nullptr &&
-        GetOwningArena() == other->GetOwningArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() == other->GetOwningArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(StringValue* other) {
-    if (other == this) return;
-    GOOGLE_DCHECK(GetOwningArena() == other->GetOwningArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  StringValue* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<StringValue>(arena);
-  }
-  using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
-  void CopyFrom(const StringValue& from);
-  using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom( const StringValue& from) {
-    StringValue::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  uint8_t* _InternalSerialize(
-      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
-
-  private:
-  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
-  void SharedDtor();
-  void SetCachedSize(int size) const final;
-  void InternalSwap(StringValue* other);
-
-  private:
-  friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
-  static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
-    return "google.protobuf.StringValue";
-  }
-  protected:
-  explicit StringValue(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                       bool is_message_owned = false);
-  public:
-
-  static const ClassData _class_data_;
-  const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*GetClassData() const final;
-
-  ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kValueFieldNumber = 1,
-  };
-  // string value = 1;
-  void clear_value();
-  const std::string& value() const;
-  template <typename ArgT0 = const std::string&, typename... ArgT>
-  void set_value(ArgT0&& arg0, ArgT... args);
-  std::string* mutable_value();
-  PROTOBUF_NODISCARD std::string* release_value();
-  void set_allocated_value(std::string* value);
-  private:
-  const std::string& _internal_value() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_value(const std::string& value);
-  std::string* _internal_mutable_value();
-  public:
-
-  // @@protoc_insertion_point(class_scope:google.protobuf.StringValue)
- private:
-  class _Internal;
-
-  template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
-  typedef void InternalArenaConstructable_;
-  typedef void DestructorSkippable_;
-  struct Impl_ {
-    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr value_;
-    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_google_2fprotobuf_2fwrappers_2eproto;
-};
-// -------------------------------------------------------------------
-
-class PROTOBUF_EXPORT BytesValue final :
-    public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:google.protobuf.BytesValue) */ {
- public:
-  inline BytesValue() : BytesValue(nullptr) {}
-  ~BytesValue() override;
-  explicit PROTOBUF_CONSTEXPR BytesValue(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
-
-  BytesValue(const BytesValue& from);
-  BytesValue(BytesValue&& from) noexcept
-    : BytesValue() {
-    *this = ::std::move(from);
-  }
-
-  inline BytesValue& operator=(const BytesValue& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline BytesValue& operator=(BytesValue&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetOwningArena() == from.GetOwningArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetOwningArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const BytesValue& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const BytesValue* internal_default_instance() {
-    return reinterpret_cast<const BytesValue*>(
-               &_BytesValue_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    8;
-
-  friend void swap(BytesValue& a, BytesValue& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(BytesValue* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() != nullptr &&
-        GetOwningArena() == other->GetOwningArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetOwningArena() == other->GetOwningArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(BytesValue* other) {
-    if (other == this) return;
-    GOOGLE_DCHECK(GetOwningArena() == other->GetOwningArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  BytesValue* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<BytesValue>(arena);
-  }
-  using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
-  void CopyFrom(const BytesValue& from);
-  using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom( const BytesValue& from) {
-    BytesValue::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  uint8_t* _InternalSerialize(
-      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
-
-  private:
-  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
-  void SharedDtor();
-  void SetCachedSize(int size) const final;
-  void InternalSwap(BytesValue* other);
-
-  private:
-  friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
-  static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
-    return "google.protobuf.BytesValue";
-  }
-  protected:
-  explicit BytesValue(::PROTOBUF_NAMESPACE_ID::Arena* arena,
-                       bool is_message_owned = false);
-  public:
-
-  static const ClassData _class_data_;
-  const ::PROTOBUF_NAMESPACE_ID::Message::ClassData*GetClassData() const final;
-
-  ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kValueFieldNumber = 1,
-  };
-  // bytes value = 1;
-  void clear_value();
-  const std::string& value() const;
-  template <typename ArgT0 = const std::string&, typename... ArgT>
-  void set_value(ArgT0&& arg0, ArgT... args);
-  std::string* mutable_value();
-  PROTOBUF_NODISCARD std::string* release_value();
-  void set_allocated_value(std::string* value);
-  private:
-  const std::string& _internal_value() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_value(const std::string& value);
-  std::string* _internal_mutable_value();
-  public:
-
-  // @@protoc_insertion_point(class_scope:google.protobuf.BytesValue)
- private:
-  class _Internal;
-
-  template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
-  typedef void InternalArenaConstructable_;
-  typedef void DestructorSkippable_;
-  struct Impl_ {
-    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr value_;
-    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_google_2fprotobuf_2fwrappers_2eproto;
-};
-// ===================================================================
-
-
-// ===================================================================
-
-#ifdef __GNUC__
-  #pragma GCC diagnostic push
-  #pragma GCC diagnostic ignored "-Wstrict-aliasing"
-#endif  // __GNUC__
-// DoubleValue
-
-// double value = 1;
-inline void DoubleValue::clear_value() {
-  _impl_.value_ = 0;
-}
-inline double DoubleValue::_internal_value() const {
-  return _impl_.value_;
-}
-inline double DoubleValue::value() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.DoubleValue.value)
-  return _internal_value();
-}
-inline void DoubleValue::_internal_set_value(double value) {
-  
-  _impl_.value_ = value;
-}
-inline void DoubleValue::set_value(double value) {
-  _internal_set_value(value);
-  // @@protoc_insertion_point(field_set:google.protobuf.DoubleValue.value)
-}
-
-// -------------------------------------------------------------------
-
-// FloatValue
-
-// float value = 1;
-inline void FloatValue::clear_value() {
-  _impl_.value_ = 0;
-}
-inline float FloatValue::_internal_value() const {
-  return _impl_.value_;
-}
-inline float FloatValue::value() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.FloatValue.value)
-  return _internal_value();
-}
-inline void FloatValue::_internal_set_value(float value) {
-  
-  _impl_.value_ = value;
-}
-inline void FloatValue::set_value(float value) {
-  _internal_set_value(value);
-  // @@protoc_insertion_point(field_set:google.protobuf.FloatValue.value)
-}
-
-// -------------------------------------------------------------------
-
-// Int64Value
-
-// int64 value = 1;
-inline void Int64Value::clear_value() {
-  _impl_.value_ = int64_t{0};
-}
-inline int64_t Int64Value::_internal_value() const {
-  return _impl_.value_;
-}
-inline int64_t Int64Value::value() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.Int64Value.value)
-  return _internal_value();
-}
-inline void Int64Value::_internal_set_value(int64_t value) {
-  
-  _impl_.value_ = value;
-}
-inline void Int64Value::set_value(int64_t value) {
-  _internal_set_value(value);
-  // @@protoc_insertion_point(field_set:google.protobuf.Int64Value.value)
-}
-
-// -------------------------------------------------------------------
-
-// UInt64Value
-
-// uint64 value = 1;
-inline void UInt64Value::clear_value() {
-  _impl_.value_ = uint64_t{0u};
-}
-inline uint64_t UInt64Value::_internal_value() const {
-  return _impl_.value_;
-}
-inline uint64_t UInt64Value::value() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.UInt64Value.value)
-  return _internal_value();
-}
-inline void UInt64Value::_internal_set_value(uint64_t value) {
-  
-  _impl_.value_ = value;
-}
-inline void UInt64Value::set_value(uint64_t value) {
-  _internal_set_value(value);
-  // @@protoc_insertion_point(field_set:google.protobuf.UInt64Value.value)
-}
-
-// -------------------------------------------------------------------
-
-// Int32Value
-
-// int32 value = 1;
-inline void Int32Value::clear_value() {
-  _impl_.value_ = 0;
-}
-inline int32_t Int32Value::_internal_value() const {
-  return _impl_.value_;
-}
-inline int32_t Int32Value::value() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.Int32Value.value)
-  return _internal_value();
-}
-inline void Int32Value::_internal_set_value(int32_t value) {
-  
-  _impl_.value_ = value;
-}
-inline void Int32Value::set_value(int32_t value) {
-  _internal_set_value(value);
-  // @@protoc_insertion_point(field_set:google.protobuf.Int32Value.value)
-}
-
-// -------------------------------------------------------------------
-
-// UInt32Value
-
-// uint32 value = 1;
-inline void UInt32Value::clear_value() {
-  _impl_.value_ = 0u;
-}
-inline uint32_t UInt32Value::_internal_value() const {
-  return _impl_.value_;
-}
-inline uint32_t UInt32Value::value() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.UInt32Value.value)
-  return _internal_value();
-}
-inline void UInt32Value::_internal_set_value(uint32_t value) {
-  
-  _impl_.value_ = value;
-}
-inline void UInt32Value::set_value(uint32_t value) {
-  _internal_set_value(value);
-  // @@protoc_insertion_point(field_set:google.protobuf.UInt32Value.value)
-}
-
-// -------------------------------------------------------------------
-
-// BoolValue
-
-// bool value = 1;
-inline void BoolValue::clear_value() {
-  _impl_.value_ = false;
-}
-inline bool BoolValue::_internal_value() const {
-  return _impl_.value_;
-}
-inline bool BoolValue::value() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.BoolValue.value)
-  return _internal_value();
-}
-inline void BoolValue::_internal_set_value(bool value) {
-  
-  _impl_.value_ = value;
-}
-inline void BoolValue::set_value(bool value) {
-  _internal_set_value(value);
-  // @@protoc_insertion_point(field_set:google.protobuf.BoolValue.value)
-}
-
-// -------------------------------------------------------------------
-
-// StringValue
-
-// string value = 1;
-inline void StringValue::clear_value() {
-  _impl_.value_.ClearToEmpty();
-}
-inline const std::string& StringValue::value() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.StringValue.value)
-  return _internal_value();
-}
-template <typename ArgT0, typename... ArgT>
-inline PROTOBUF_ALWAYS_INLINE
-void StringValue::set_value(ArgT0&& arg0, ArgT... args) {
- 
- _impl_.value_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
-  // @@protoc_insertion_point(field_set:google.protobuf.StringValue.value)
-}
-inline std::string* StringValue::mutable_value() {
-  std::string* _s = _internal_mutable_value();
-  // @@protoc_insertion_point(field_mutable:google.protobuf.StringValue.value)
-  return _s;
-}
-inline const std::string& StringValue::_internal_value() const {
-  return _impl_.value_.Get();
-}
-inline void StringValue::_internal_set_value(const std::string& value) {
-  
-  _impl_.value_.Set(value, GetArenaForAllocation());
-}
-inline std::string* StringValue::_internal_mutable_value() {
-  
-  return _impl_.value_.Mutable(GetArenaForAllocation());
-}
-inline std::string* StringValue::release_value() {
-  // @@protoc_insertion_point(field_release:google.protobuf.StringValue.value)
-  return _impl_.value_.Release();
-}
-inline void StringValue::set_allocated_value(std::string* value) {
-  if (value != nullptr) {
-    
-  } else {
-    
-  }
-  _impl_.value_.SetAllocated(value, GetArenaForAllocation());
-#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (_impl_.value_.IsDefault()) {
-    _impl_.value_.Set("", GetArenaForAllocation());
-  }
-#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:google.protobuf.StringValue.value)
-}
-
-// -------------------------------------------------------------------
-
-// BytesValue
-
-// bytes value = 1;
-inline void BytesValue::clear_value() {
-  _impl_.value_.ClearToEmpty();
-}
-inline const std::string& BytesValue::value() const {
-  // @@protoc_insertion_point(field_get:google.protobuf.BytesValue.value)
-  return _internal_value();
-}
-template <typename ArgT0, typename... ArgT>
-inline PROTOBUF_ALWAYS_INLINE
-void BytesValue::set_value(ArgT0&& arg0, ArgT... args) {
- 
- _impl_.value_.SetBytes(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
-  // @@protoc_insertion_point(field_set:google.protobuf.BytesValue.value)
-}
-inline std::string* BytesValue::mutable_value() {
-  std::string* _s = _internal_mutable_value();
-  // @@protoc_insertion_point(field_mutable:google.protobuf.BytesValue.value)
-  return _s;
-}
-inline const std::string& BytesValue::_internal_value() const {
-  return _impl_.value_.Get();
-}
-inline void BytesValue::_internal_set_value(const std::string& value) {
-  
-  _impl_.value_.Set(value, GetArenaForAllocation());
-}
-inline std::string* BytesValue::_internal_mutable_value() {
-  
-  return _impl_.value_.Mutable(GetArenaForAllocation());
-}
-inline std::string* BytesValue::release_value() {
-  // @@protoc_insertion_point(field_release:google.protobuf.BytesValue.value)
-  return _impl_.value_.Release();
-}
-inline void BytesValue::set_allocated_value(std::string* value) {
-  if (value != nullptr) {
-    
-  } else {
-    
-  }
-  _impl_.value_.SetAllocated(value, GetArenaForAllocation());
-#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  if (_impl_.value_.IsDefault()) {
-    _impl_.value_.Set("", GetArenaForAllocation());
-  }
-#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:google.protobuf.BytesValue.value)
-}
-
-#ifdef __GNUC__
-  #pragma GCC diagnostic pop
-#endif  // __GNUC__
-// -------------------------------------------------------------------
-
-// -------------------------------------------------------------------
-
-// -------------------------------------------------------------------
-
-// -------------------------------------------------------------------
-
-// -------------------------------------------------------------------
-
-// -------------------------------------------------------------------
-
-// -------------------------------------------------------------------
-
-// -------------------------------------------------------------------
-
-
-// @@protoc_insertion_point(namespace_scope)
-
-PROTOBUF_NAMESPACE_CLOSE
-
-// @@protoc_insertion_point(global_scope)
-
-#include <google/protobuf/port_undef.inc>
-#endif  // GOOGLE_PROTOBUF_INCLUDED_GOOGLE_PROTOBUF_INCLUDED_google_2fprotobuf_2fwrappers_2eproto
diff --git a/libs/protobuf/src/google/protobuf/wrappers.proto b/libs/protobuf/src/google/protobuf/wrappers.proto
deleted file mode 100644
index d49dd53..0000000
--- a/libs/protobuf/src/google/protobuf/wrappers.proto
+++ /dev/null
@@ -1,123 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Wrappers for primitive (non-message) types. These types are useful
-// for embedding primitives in the `google.protobuf.Any` type and for places
-// where we need to distinguish between the absence of a primitive
-// typed field and its default value.
-//
-// These wrappers have no meaningful use within repeated fields as they lack
-// the ability to detect presence on individual elements.
-// These wrappers have no meaningful use within a map or a oneof since
-// individual entries of a map or fields of a oneof can already detect presence.
-
-syntax = "proto3";
-
-package google.protobuf;
-
-option csharp_namespace = "Google.Protobuf.WellKnownTypes";
-option cc_enable_arenas = true;
-option go_package = "google.golang.org/protobuf/types/known/wrapperspb";
-option java_package = "com.google.protobuf";
-option java_outer_classname = "WrappersProto";
-option java_multiple_files = true;
-option objc_class_prefix = "GPB";
-
-// Wrapper message for `double`.
-//
-// The JSON representation for `DoubleValue` is JSON number.
-message DoubleValue {
-  // The double value.
-  double value = 1;
-}
-
-// Wrapper message for `float`.
-//
-// The JSON representation for `FloatValue` is JSON number.
-message FloatValue {
-  // The float value.
-  float value = 1;
-}
-
-// Wrapper message for `int64`.
-//
-// The JSON representation for `Int64Value` is JSON string.
-message Int64Value {
-  // The int64 value.
-  int64 value = 1;
-}
-
-// Wrapper message for `uint64`.
-//
-// The JSON representation for `UInt64Value` is JSON string.
-message UInt64Value {
-  // The uint64 value.
-  uint64 value = 1;
-}
-
-// Wrapper message for `int32`.
-//
-// The JSON representation for `Int32Value` is JSON number.
-message Int32Value {
-  // The int32 value.
-  int32 value = 1;
-}
-
-// Wrapper message for `uint32`.
-//
-// The JSON representation for `UInt32Value` is JSON number.
-message UInt32Value {
-  // The uint32 value.
-  uint32 value = 1;
-}
-
-// Wrapper message for `bool`.
-//
-// The JSON representation for `BoolValue` is JSON `true` and `false`.
-message BoolValue {
-  // The bool value.
-  bool value = 1;
-}
-
-// Wrapper message for `string`.
-//
-// The JSON representation for `StringValue` is JSON string.
-message StringValue {
-  // The string value.
-  string value = 1;
-}
-
-// Wrapper message for `bytes`.
-//
-// The JSON representation for `BytesValue` is JSON string.
-message BytesValue {
-  // The bytes value.
-  bytes value = 1;
-}
diff --git a/libs/protobuf/src/libprotobuf-lite.map b/libs/protobuf/src/libprotobuf-lite.map
deleted file mode 100644
index 3915546..0000000
--- a/libs/protobuf/src/libprotobuf-lite.map
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  global:
-    extern "C++" {
-      *google*;
-    };
-
-  local:
-    *;
-};
diff --git a/libs/protobuf/src/libprotobuf.map b/libs/protobuf/src/libprotobuf.map
deleted file mode 100644
index 3915546..0000000
--- a/libs/protobuf/src/libprotobuf.map
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  global:
-    extern "C++" {
-      *google*;
-    };
-
-  local:
-    *;
-};
diff --git a/libs/protobuf/src/libprotoc.map b/libs/protobuf/src/libprotoc.map
deleted file mode 100644
index 3915546..0000000
--- a/libs/protobuf/src/libprotoc.map
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  global:
-    extern "C++" {
-      *google*;
-    };
-
-  local:
-    *;
-};
diff --git a/libs/protobuf/src/solaris/libstdc++.la b/libs/protobuf/src/solaris/libstdc++.la
deleted file mode 100644
index 3edf425..0000000
--- a/libs/protobuf/src/solaris/libstdc++.la
+++ /dev/null
@@ -1,51 +0,0 @@
-# libstdc++.la - a libtool library file
-# Generated by ltmain.sh - GNU libtool 1.4a-GCC3.0 (1.641.2.256 2001/05/28 20:09:07 with GCC-local changes)
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# ---
-# NOTE: This file lives in /usr/sfw/lib on Solaris 10.  Unfortunately,
-# due to an apparent bug in the Solaris 10 6/06 release,
-# /usr/sfw/lib/libstdc++.la is empty.  Below is the correct content,
-# according to
-#    http://forum.java.sun.com/thread.jspa?threadID=5073150
-# By passing LDFLAGS='-Lsrc/solaris' to configure, make will pick up
-# this copy of the file rather than the empty copy in /usr/sfw/lib.
-#
-# Also see
-#   http://www.technicalarticles.org/index.php/Compiling_MySQL_5.0_on_Solaris_10
-#
-# Note: this is for 32-bit systems.  If you have a 64-bit system,
-# uncomment the appropriate dependency_libs line below.
-# ----
-
-# The name that we can dlopen(3).
-dlname='libstdc++.so.6'
-
-# Names of this library.
-library_names='libstdc++.so.6.0.3 libstdc++.so.6 libstdc++.so'
-
-# The name of the static archive.
-old_library='libstdc++.a'
-
-# Libraries that this one depends upon.
-# 32-bit version:
-dependency_libs='-lc -lm -L/usr/sfw/lib -lgcc_s'
-# 64-bit version:
-#dependency_libs='-L/lib/64 -lc -lm -L/usr/sfw/lib/64 -lgcc_s'
-
-# Version information for libstdc++.
-current=6
-age=0
-revision=3
-
-# Is this an already installed library?
-installed=yes
-
-# Files to dlopen/dlpreopen
-dlopen=''
-dlpreopen=''
-
-# Directory that this library needs to be installed in:
-libdir='/usr/sfw/lib'
diff --git a/libs/protobuf/tests.sh b/libs/protobuf/tests.sh
deleted file mode 100755
index 180b870..0000000
--- a/libs/protobuf/tests.sh
+++ /dev/null
@@ -1,611 +0,0 @@
-#!/bin/bash
-#
-# Build and run tests for the protobuf project. We use this script to run
-# tests on kokoro (Ubuntu and MacOS). It can run locally as well but you
-# need to make sure the required compilers/tools are available.
-
-internal_build_cpp() {
-  if [ -f src/protoc ]; then
-    # Already built.
-    return
-  fi
-
-  # Initialize any submodules.
-  git submodule update --init --recursive
-
-  ./autogen.sh
-  ./configure CXXFLAGS="-fPIC -std=c++11"  # -fPIC is needed for python cpp test.
-                                           # See python/setup.py for more details
-  make -j$(nproc)
-}
-
-build_cpp() {
-  internal_build_cpp
-  make check -j$(nproc) || (cat src/test-suite.log; false)
-  cd conformance && make test_cpp && cd ..
-}
-
-build_cpp_tcmalloc() {
-  internal_build_cpp
-  ./configure LIBS=-ltcmalloc && make clean && make \
-      PTHREAD_CFLAGS='-pthread -DGOOGLE_PROTOBUF_HEAP_CHECK_DRACONIAN' \
-      check
-  cd src
-  PPROF_PATH=/usr/bin/google-pprof HEAPCHECK=strict ./protobuf-test
-}
-
-build_cpp_distcheck() {
-  grep -q -- "-Og" src/Makefile.am &&
-    echo "The -Og flag is incompatible with Clang versions older than 4.0." &&
-    exit 1
-
-  # Initialize any submodules.
-  git submodule update --init --recursive
-  ./autogen.sh
-  ./configure
-  make dist
-
-  # List all files that should be included in the distribution package.
-  git ls-files | grep "^\(java\|python\|objectivec\|csharp\|ruby\|php\|cmake\|examples\|src/google/protobuf/.*\.proto\)" |\
-    grep -v ".gitignore" | grep -v "java/lite/proguard.pgcfg" |\
-    grep -v "python/compatibility_tests" | grep -v "python/docs" | grep -v "python/.repo-metadata.json" |\
-    grep -v "python/protobuf_distutils" | grep -v "csharp/compatibility_tests" > dist.lst
-  # Unzip the dist tar file.
-  DIST=`ls *.tar.gz`
-  tar -xf $DIST
-  cd ${DIST//.tar.gz}
-  # Check if every file exists in the dist tar file.
-  FILES_MISSING=""
-  for FILE in $(<../dist.lst); do
-    [ -f "$FILE" ] || {
-      echo "$FILE is not found!"
-      FILES_MISSING="$FILE $FILES_MISSING"
-    }
-  done
-  cd ..
-  if [ ! -z "$FILES_MISSING" ]; then
-    echo "Missing files in EXTRA_DIST: $FILES_MISSING"
-    exit 1
-  fi
-
-  # Do the regular dist-check for C++.
-  make distcheck -j$(nproc)
-}
-
-build_dist_install() {
-  # Create a symlink pointing to python2 and put it at the beginning of $PATH.
-  # This is necessary because the googletest build system involves a Python
-  # script that is not compatible with Python 3. More recent googletest
-  # versions have fixed this, but they have also removed the autotools build
-  # system support that we rely on. This is a temporary workaround to keep the
-  # googletest build working when the default python binary is Python 3.
-  mkdir tmp || true
-  pushd tmp
-  ln -s /usr/bin/python2 ./python
-  popd
-  PATH=$PWD/tmp:$PATH
-
-  # Initialize any submodules.
-  git submodule update --init --recursive
-  ./autogen.sh
-  ./configure
-  make dist
-
-  # Unzip the dist tar file and install it.
-  DIST=`ls *.tar.gz`
-  tar -xf $DIST
-  pushd ${DIST//.tar.gz}
-  ./configure && make check -j4 && make install
-
-  export LD_LIBRARY_PATH=/usr/local/lib
-
-  # Try to install Java
-  pushd java
-  use_java jdk11
-  $MVN install
-  popd
-
-  # Try to install Python
-  python3 -m venv venv
-  source venv/bin/activate
-  pushd python
-  python3 setup.py clean build sdist
-  pip3 install dist/protobuf-*.tar.gz
-  popd
-  deactivate
-  rm -rf python/venv
-}
-
-build_csharp() {
-  # Required for conformance tests and to regenerate protos.
-  internal_build_cpp
-  NUGET=/usr/local/bin/nuget.exe
-
-  # Disable some unwanted dotnet options
-  export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=true
-  export DOTNET_CLI_TELEMETRY_OPTOUT=true
-
-  # TODO(jtattermusch): is this still needed with "first time experience"
-  # disabled?
-  # Perform "dotnet new" once to get the setup preprocessing out of the
-  # way. That spews a lot of output (including backspaces) into logs
-  # otherwise, and can cause problems. It doesn't matter if this step
-  # is performed multiple times; it's cheap after the first time anyway.
-  # (It also doesn't matter if it's unnecessary, which it will be on some
-  # systems. It's necessary on Jenkins in order to avoid unprintable
-  # characters appearing in the JUnit output.)
-  mkdir dotnettmp
-  (cd dotnettmp; dotnet new > /dev/null)
-  rm -rf dotnettmp
-
-  # Check that the protos haven't broken C# codegen.
-  # TODO(jonskeet): Fail if regenerating creates any changes.
-  csharp/generate_protos.sh
-
-  csharp/buildall.sh
-  cd conformance && make test_csharp && cd ..
-
-  # Run csharp compatibility test between 3.0.0 and the current version.
-  csharp/compatibility_tests/v3.0.0/test.sh 3.0.0
-  
-  # Regression test for https://github.com/protocolbuffers/protobuf/issues/9526
-  # - all line endings in .proto and .cs (and .csproj) files should be LF.
-  if git ls-files --eol csharp | grep -E '\.cs|\.proto' | grep -v w/lf
-  then
-    echo "The files listed above have mixed or CRLF line endings; please change to LF."
-    exit 1
-  fi
-}
-
-build_golang() {
-  # Go build needs `protoc`.
-  internal_build_cpp
-  # Add protoc to the path so that the examples build finds it.
-  export PATH="`pwd`/src:$PATH"
-
-  export GOPATH="$HOME/gocode"
-  mkdir -p "$GOPATH/src/github.com/protocolbuffers"
-  mkdir -p "$GOPATH/src/github.com/golang"
-  rm -f "$GOPATH/src/github.com/protocolbuffers/protobuf"
-  rm -f "$GOPATH/src/github.com/golang/protobuf"
-  ln -s "`pwd`" "$GOPATH/src/github.com/protocolbuffers/protobuf"
-  export PATH="$GOPATH/bin:$PATH"
-  (cd $GOPATH/src/github.com/golang && git clone https://github.com/golang/protobuf.git && cd protobuf && git checkout v1.3.5)
-  go install github.com/golang/protobuf/protoc-gen-go
-
-  cd examples && PROTO_PATH="-I../src -I." make gotest && cd ..
-}
-
-use_java() {
-  version=$1
-  case "$version" in
-    jdk17)
-      export PATH=/usr/lib/jvm/java-17-openjdk-amd64/bin:$PATH
-      export JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64
-      ;;
-    jdk11)
-      export PATH=/usr/lib/jvm/java-11-openjdk-amd64/bin:$PATH
-      export JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64
-      ;;
-    jdk8)
-      export PATH=/usr/lib/jvm/java-8-openjdk-amd64/bin:$PATH
-      export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
-      ;;
-    jdk7)
-      export PATH=/usr/lib/jvm/java-7-openjdk-amd64/bin:$PATH
-      export JAVA_HOME=/usr/lib/jvm/java-7-openjdk-amd64
-      ;;
-    oracle7)
-      export PATH=/usr/lib/jvm/java-7-oracle/bin:$PATH
-      export JAVA_HOME=/usr/lib/jvm/java-7-openjdk-amd64
-      ;;
-  esac
-
-  MAVEN_LOCAL_REPOSITORY=/var/maven_local_repository
-  MVN="$MVN -e --quiet -Dhttps.protocols=TLSv1.2 -Dmaven.repo.local=$MAVEN_LOCAL_REPOSITORY"
-
-  which java
-  java -version
-  $MVN -version
-}
-
-# --batch-mode suppresses download progress output that spams the logs.
-MVN="mvn --batch-mode"
-
-internal_build_java() {
-  version=$1
-  dir=java_$version
-  # Java build needs `protoc`.
-  internal_build_cpp
-  cp -r java $dir
-  cd $dir && $MVN clean
-  # Skip tests here - callers will decide what tests they want to run
-  $MVN install -Dmaven.test.skip=true
-}
-
-build_java() {
-  version=$1
-  internal_build_java $version
-  # Skip the Kotlin tests on Oracle 7
-  if [ "$version" == "oracle7" ]; then
-    $MVN test -pl bom,lite,core,util
-  else
-    $MVN test
-  fi
-  cd ../..
-}
-
-# The conformance tests are hard-coded to work with the $ROOT/java directory.
-# So this can't run in parallel with two different sets of tests.
-build_java_with_conformance_tests() {
-  # Java build needs `protoc`.
-  internal_build_cpp
-  # This local installation avoids the problem caused by a new version not yet in Maven Central
-  cd java/bom && $MVN install
-  cd ../..
-  cd java/core && $MVN test && $MVN install
-  cd ../lite && $MVN test && $MVN install
-  cd ../util && $MVN test && $MVN install && $MVN package assembly:single
-  if [ "$version" == "jdk8" ]; then
-    cd ../kotlin && $MVN test && $MVN install
-    cd ../kotlin-lite && $MVN test && $MVN install
-  fi
-  cd ../..
-  cd conformance && make test_java && cd ..
-}
-
-build_java_jdk7() {
-  use_java jdk7
-  build_java_with_conformance_tests
-}
-
-build_java_oracle7() {
-  use_java oracle7
-  build_java oracle7
-}
-
-build_java_jdk8() {
-  use_java jdk8
-  build_java_with_conformance_tests
-}
-
-build_java_jdk11() {
-  use_java jdk11
-  build_java
-}
-
-build_java_jdk17() {
-  use_java jdk17
-  build_java
-}
-
-build_java_linkage_monitor() {
-  # Linkage Monitor checks compatibility with other Google libraries
-  # https://github.com/GoogleCloudPlatform/cloud-opensource-java/tree/master/linkage-monitor
-
-  use_java jdk11
-  internal_build_cpp
-
-  # Linkage Monitor uses $HOME/.m2 local repository
-  MVN="mvn -e -B -Dhttps.protocols=TLSv1.2"
-  cd java
-  # Installs the snapshot version locally
-  $MVN install -Dmaven.test.skip=true
-
-  # Linkage Monitor uses the snapshot versions installed in $HOME/.m2 to verify compatibility
-  JAR=linkage-monitor-latest-all-deps.jar
-  curl -v -O "https://storage.googleapis.com/cloud-opensource-java-linkage-monitor/${JAR}"
-  # Fails if there's new linkage errors compared with baseline
-  java -jar $JAR com.google.cloud:libraries-bom
-}
-
-build_objectivec_ios() {
-  # Reused the build script that takes care of configuring and ensuring things
-  # are up to date.  The OS X test runs the objc conformance test, so skip it
-  # here.
-  objectivec/DevTools/full_mac_build.sh \
-      --core-only --skip-xcode-osx --skip-xcode-tvos --skip-objc-conformance "$@"
-}
-
-build_objectivec_ios_debug() {
-  build_objectivec_ios --skip-xcode-release
-}
-
-build_objectivec_ios_release() {
-  build_objectivec_ios --skip-xcode-debug
-}
-
-build_objectivec_osx() {
-  # Reused the build script that takes care of configuring and ensuring things
-  # are up to date.
-  objectivec/DevTools/full_mac_build.sh \
-      --core-only --skip-xcode-ios --skip-xcode-tvos
-}
-
-build_objectivec_tvos() {
-  # Reused the build script that takes care of configuring and ensuring things
-  # are up to date.  The OS X test runs the objc conformance test, so skip it
-  # here.
-  objectivec/DevTools/full_mac_build.sh \
-      --core-only --skip-xcode-ios --skip-xcode-osx --skip-objc-conformance "$@"
-}
-
-build_objectivec_tvos_debug() {
-  build_objectivec_tvos --skip-xcode-release
-}
-
-build_objectivec_tvos_release() {
-  build_objectivec_tvos --skip-xcode-debug
-}
-
-build_python() {
-  internal_build_cpp
-  cd python
-  tox --skip-missing-interpreters
-  cd ..
-}
-
-build_python_version() {
-  internal_build_cpp
-  cd python
-  envlist=$1
-  tox -e $envlist
-  cd ..
-}
-
-build_python37() {
-  build_python_version py37-python
-}
-
-build_python38() {
-  build_python_version py38-python
-}
-
-build_python39() {
-  build_python_version py39-python
-}
-
-build_python310() {
-  build_python_version py310-python
-}
-
-build_python_cpp() {
-  internal_build_cpp
-  export LD_LIBRARY_PATH=../src/.libs # for Linux
-  export DYLD_LIBRARY_PATH=../src/.libs # for OS X
-  cd python
-  tox --skip-missing-interpreters
-  cd ..
-}
-
-build_python_cpp_version() {
-  internal_build_cpp
-  export LD_LIBRARY_PATH=../src/.libs # for Linux
-  export DYLD_LIBRARY_PATH=../src/.libs # for OS X
-  cd python
-  envlist=$1
-  tox -e $envlist
-  cd ..
-}
-
-build_python37_cpp() {
-  build_python_cpp_version py37-cpp
-}
-
-build_python38_cpp() {
-  build_python_cpp_version py38-cpp
-}
-
-build_python39_cpp() {
-  build_python_cpp_version py39-cpp
-}
-
-build_python310_cpp() {
-  build_python_cpp_version py310-cpp
-}
-
-build_ruby23() {
-  internal_build_cpp  # For conformance tests.
-  cd ruby && bash travis-test.sh ruby-2.3.8 && cd ..
-}
-build_ruby24() {
-  internal_build_cpp  # For conformance tests.
-  cd ruby && bash travis-test.sh ruby-2.4 && cd ..
-}
-build_ruby25() {
-  internal_build_cpp  # For conformance tests.
-  cd ruby && bash travis-test.sh ruby-2.5.1 && cd ..
-}
-build_ruby26() {
-  internal_build_cpp  # For conformance tests.
-  cd ruby && bash travis-test.sh ruby-2.6.0 && cd ..
-}
-build_ruby27() {
-  internal_build_cpp  # For conformance tests.
-  cd ruby && bash travis-test.sh ruby-2.7.0 && cd ..
-}
-build_ruby30() {
-  internal_build_cpp  # For conformance tests.
-  cd ruby && bash travis-test.sh ruby-3.0.2 && cd ..
-}
-build_ruby31() {
-  internal_build_cpp  # For conformance tests.
-  cd ruby && bash travis-test.sh ruby-3.1.0 && cd ..
-}
-
-build_jruby92() {
-  internal_build_cpp                # For conformance tests.
-  internal_build_java jdk8 && cd .. # For Maven protobuf jar with local changes
-  cd ruby && bash travis-test.sh jruby-9.2.20.1 && cd ..
-}
-
-build_jruby93() {
-  internal_build_cpp                # For conformance tests.
-  internal_build_java jdk8 && cd .. # For Maven protobuf jar with local changes
-  cd ruby && bash travis-test.sh jruby-9.3.4.0 && cd ..
-}
-
-use_php() {
-  VERSION=$1
-  export PATH=/usr/local/php-${VERSION}/bin:$PATH
-  internal_build_cpp
-}
-
-build_php() {
-  use_php $1
-  pushd php
-  rm -rf vendor
-  php -v
-  php -m
-  composer update
-  composer test
-  popd
-  (cd conformance && make test_php)
-}
-
-test_php_c() {
-  pushd php
-  rm -rf vendor
-  php -v
-  php -m
-  composer update
-  composer test_c
-  popd
-  (cd conformance && make test_php_c)
-}
-
-build_php_c() {
-  use_php $1
-  test_php_c
-}
-
-build_php7.0_mac() {
-  internal_build_cpp
-  # Install PHP
-  curl -s https://php-osx.liip.ch/install.sh | bash -s 7.0
-  PHP_FOLDER=`find /usr/local -type d -name "php5-7.0*"`  # The folder name may change upon time
-  test ! -z "$PHP_FOLDER"
-  export PATH="$PHP_FOLDER/bin:$PATH"
-
-  # Install Composer
-  wget https://getcomposer.org/download/2.0.13/composer.phar --progress=dot:mega -O /usr/local/bin/composer
-  chmod a+x /usr/local/bin/composer
-
-  # Install valgrind
-  echo "#! /bin/bash" > valgrind
-  chmod ug+x valgrind
-  sudo mv valgrind /usr/local/bin/valgrind
-
-  # Test
-  test_php_c
-}
-
-build_php7.3_mac() {
-  internal_build_cpp
-  # Install PHP
-  # We can't test PHP 7.4 with these binaries yet:
-  #   https://github.com/liip/php-osx/issues/276
-  curl -s https://php-osx.liip.ch/install.sh | bash -s 7.3
-  PHP_FOLDER=`find /usr/local -type d -name "php5-7.3*"`  # The folder name may change upon time
-  test ! -z "$PHP_FOLDER"
-  export PATH="$PHP_FOLDER/bin:$PATH"
-
-  # Install Composer
-  wget https://getcomposer.org/download/2.0.13/composer.phar --progress=dot:mega -O /usr/local/bin/composer
-  chmod a+x /usr/local/bin/composer
-
-  # Install valgrind
-  echo "#! /bin/bash" > valgrind
-  chmod ug+x valgrind
-  sudo mv valgrind /usr/local/bin/valgrind
-
-  # Test
-  test_php_c
-}
-
-build_php_compatibility() {
-  internal_build_cpp
-}
-
-build_php_multirequest() {
-  use_php 7.4
-  php/tests/multirequest.sh
-}
-
-build_php8.0_all() {
-  build_php 8.0
-  build_php 8.1
-  build_php_c 8.0
-  build_php_c 8.1
-}
-
-build_php_all_32() {
-  build_php 7.0
-  build_php 7.1
-  build_php 7.4
-  build_php_c 7.0
-  build_php_c 7.1
-  build_php_c 7.4
-  build_php_c 7.1-zts
-  build_php_c 7.2-zts
-  build_php_c 7.5-zts
-}
-
-build_php_all() {
-  build_php_all_32
-  build_php_multirequest
-  build_php_compatibility
-}
-
-build_benchmark() {
-  use_php 7.2
-  cd kokoro/linux/benchmark && ./run.sh
-}
-
-# -------- main --------
-
-if [ "$#" -ne 1 ]; then
-  echo "
-Usage: $0 { cpp |
-            cpp_distcheck |
-            csharp |
-            java_jdk7 |
-            java_oracle7 |
-            java_jdk8 |
-            java_jdk11 |
-            java_jdk17 |
-            java_linkage_monitor |
-            objectivec_ios |
-            objectivec_ios_debug |
-            objectivec_ios_release |
-            objectivec_osx |
-            objectivec_tvos |
-            objectivec_tvos_debug |
-            objectivec_tvos_release |
-            python |
-            python_cpp |
-            python_compatibility |
-            ruby23 |
-            ruby24 |
-            ruby25 |
-            ruby26 |
-            ruby27 |
-            ruby30 |
-            ruby31 |
-            jruby92 |
-            jruby93 |
-            ruby_all |
-            php_all |
-            php_all_32 |
-            php7.0_mac |
-            php7.3_mac |
-            dist_install |
-            benchmark }
-"
-  exit 1
-fi
-
-set -e  # exit immediately on error
-set -x  # display all commands
-cd $(dirname $0)
-eval "build_$1"
diff --git a/libs/protobuf/third_party/BUILD.bazel b/libs/protobuf/third_party/BUILD.bazel
deleted file mode 100644
index d12b3e3..0000000
--- a/libs/protobuf/third_party/BUILD.bazel
+++ /dev/null
@@ -1,4 +0,0 @@
-exports_files([
-    "BUILD.bazel",
-    "zlib.BUILD",
-])
diff --git a/libs/protobuf/third_party/googletest b/libs/protobuf/third_party/googletest
deleted file mode 160000
index 46db91e..0000000
--- a/libs/protobuf/third_party/googletest
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 46db91ef6ffcc128b2d5f31118ae1108109e3400
diff --git a/libs/protobuf/third_party/utf8_range b/libs/protobuf/third_party/utf8_range
deleted file mode 160000
index 45fbf54..0000000
--- a/libs/protobuf/third_party/utf8_range
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 45fbf543fec00020a08650791a37575319a3ea1d
diff --git a/libs/protobuf/third_party/zlib.BUILD b/libs/protobuf/third_party/zlib.BUILD
deleted file mode 100644
index 187bec2..0000000
--- a/libs/protobuf/third_party/zlib.BUILD
+++ /dev/null
@@ -1,69 +0,0 @@
-load("@rules_cc//cc:defs.bzl", "cc_library")
-
-licenses(["notice"])  # BSD/MIT-like license (for zlib)
-
-exports_files(["zlib.BUILD"])
-
-_ZLIB_HEADERS = [
-    "crc32.h",
-    "deflate.h",
-    "gzguts.h",
-    "inffast.h",
-    "inffixed.h",
-    "inflate.h",
-    "inftrees.h",
-    "trees.h",
-    "zconf.h",
-    "zlib.h",
-    "zutil.h",
-]
-
-_ZLIB_PREFIXED_HEADERS = ["zlib/include/" + hdr for hdr in _ZLIB_HEADERS]
-
-# In order to limit the damage from the `includes` propagation
-# via `:zlib`, copy the public headers to a subdirectory and
-# expose those.
-genrule(
-    name = "copy_public_headers",
-    srcs = _ZLIB_HEADERS,
-    outs = _ZLIB_PREFIXED_HEADERS,
-    cmd_bash = "cp $(SRCS) $(@D)/zlib/include/",
-    cmd_bat = " && ".join(
-        ["@copy /Y $(location %s) $(@D)\\zlib\\include\\  >NUL" %
-         s for s in _ZLIB_HEADERS],
-    ),
-)
-
-cc_library(
-    name = "zlib",
-    srcs = [
-        "adler32.c",
-        "compress.c",
-        "crc32.c",
-        "deflate.c",
-        "gzclose.c",
-        "gzlib.c",
-        "gzread.c",
-        "gzwrite.c",
-        "infback.c",
-        "inffast.c",
-        "inflate.c",
-        "inftrees.c",
-        "trees.c",
-        "uncompr.c",
-        "zutil.c",
-        # Include the un-prefixed headers in srcs to work
-        # around the fact that zlib isn't consistent in its
-        # choice of <> or "" delimiter when including itself.
-    ] + _ZLIB_HEADERS,
-    hdrs = _ZLIB_PREFIXED_HEADERS,
-    copts = select({
-        "@bazel_tools//src/conditions:windows": [],
-        "//conditions:default": [
-            "-Wno-unused-variable",
-            "-Wno-implicit-function-declaration",
-        ],
-    }),
-    includes = ["zlib/include/"],
-    visibility = ["//visibility:public"],
-)
diff --git a/libs/protobuf/toolchain/BUILD.bazel b/libs/protobuf/toolchain/BUILD.bazel
deleted file mode 100644
index 5bc8c8a..0000000
--- a/libs/protobuf/toolchain/BUILD.bazel
+++ /dev/null
@@ -1,159 +0,0 @@
-load(":cc_toolchain_config.bzl", "cc_toolchain_config")
-
-package(default_visibility = ["//visibility:public"])
-
-filegroup(name = "empty")
-
-TOOLCHAINS = {
-    "osx-x86_64": "cc-compiler-osx-x86_64",
-    "osx-aarch_64": "cc-compiler-osx-aarch_64",
-    "linux-aarch_64": "cc-compiler-linux-aarch_64",
-    "linux-ppcle_64": "cc-compiler-linux-ppcle_64",
-    "linux-s390_64": "cc-compiler-linux-s390_64",
-    "linux-x86_32": "cc-compiler-linux-x86_32",
-    "linux-x86_64": "cc-compiler-linux-x86_64",
-    "win32": "cc-compiler-windows-x86_32",
-    "win64": "cc-compiler-windows-x86_64",
-    "k8": "cc-compiler-k8",
-}
-
-cc_toolchain_suite(
-    name = "clang_suite",
-    toolchains = TOOLCHAINS
-)
-
-[
-    cc_toolchain(
-        name = toolchain,
-        all_files = ":empty",
-        compiler_files = ":empty",
-        dwp_files = ":empty",
-        dynamic_runtime_lib = ":empty",
-        linker_files = ":empty",
-        objcopy_files = ":empty",
-        output_licenses = ["restricted"],
-        static_runtime_lib = ":empty",
-        strip_files = ":empty",
-        toolchain_config = ":" + cpu + "-config",
-        toolchain_identifier = toolchain,
-    )
-    for cpu, toolchain in TOOLCHAINS.items()
-]
-
-cc_toolchain_config(
-    name = "k8-config",
-    linker_path = "/usr/bin/ld",
-    sysroot = "/opt/manylinux/2014/x86_64",
-    target_cpu = "x86_64",
-    target_full_name = "x86_64-linux-gnu",
-)
-
-cc_toolchain_config(
-    name = "linux-aarch_64-config",
-    sysroot = "/opt/manylinux/2014/aarch64",
-    linker_path = "/usr/bin/ld",
-    target_cpu = "aarch64",
-    target_full_name = "aarch64-linux-gnu",
-)
-
-cc_toolchain_config(
-    name = "linux-ppcle_64-config",
-    linker_path = "/usr/bin/ld",
-    sysroot = "/opt/manylinux/2014/ppc64le",
-    target_cpu = "ppc64",
-    target_full_name = "powerpc64le-linux-gnu",
-)
-
-cc_toolchain_config(
-    name = "linux-s390_64-config",
-    linker_path = "/usr/bin/ld",
-    sysroot = "/opt/manylinux/2014/s390x",
-    target_cpu = "systemz",
-    target_full_name = "s390x-linux-gnu",
-)
-
-cc_toolchain_config(
-    name = "linux-x86_32-config",
-    linker_path = "/usr/bin/ld",
-    sysroot = "/opt/manylinux/2014/i686",
-    target_cpu = "x86_32",
-    target_full_name = "i386-linux-gnu",
-)
-
-cc_toolchain_config(
-    name = "linux-x86_64-config",
-    linker_path = "/usr/bin/ld",
-    sysroot = "/opt/manylinux/2014/x86_64",
-    target_cpu = "x86_64",
-    target_full_name = "x86_64-linux-gnu",
-)
-
-cc_toolchain_config(
-    name = "osx-aarch_64-config",
-    extra_compiler_flags = [
-        "-I/usr/tools/xcode_14_0/macosx/usr/include/c++/v1",
-        "-I/usr/tools/xcode_14_0/macosx/usr/include",
-        "-F/usr/tools/xcode_14_0/macosx/System/Library/Frameworks",
-        "-Wno-error=nullability-completeness",
-        "-Wno-error=availability",
-        "-Wno-error=elaborated-enum-base",
-    ],
-    extra_linker_flags = ["-framework CoreFoundation"],
-    linker_path = "/usr/tools",
-    sysroot = "/usr/tools/xcode_14_0/macosx",
-    target_cpu = "aarch64",
-    target_full_name = "aarch64-apple-macosx10.9",
-)
-
-cc_toolchain_config(
-    name = "osx-x86_64-config",
-    extra_compiler_flags = [
-        "-I/usr/tools/xcode_14_0/macosx/usr/include/c++/v1",
-        "-I/usr/tools/xcode_14_0/macosx/usr/include",
-        "-F/usr/tools/xcode_14_0/macosx/System/Library/Frameworks",
-        "-Wno-error=nullability-completeness",
-        "-Wno-error=availability",
-        "-Wno-error=elaborated-enum-base",
-    ],
-    extra_linker_flags = ["-framework CoreFoundation"],
-    linker_path = "/usr/tools",
-    sysroot = "/usr/tools/xcode_14_0/macosx",
-    target_cpu = "x86_64",
-    target_full_name = "x86_64-apple-macosx10.9",
-)
-
-cc_toolchain_config(
-    name = "win32-config",
-    extra_compiler_flags = [
-        "-isystem/usr/lib/gcc/i686-w64-mingw32/8.3-posix/include/c++",
-        "-isystem/usr/lib/gcc/i686-w64-mingw32/8.3-posix/include/c++/i686-w64-mingw32",
-        "-fsjlj-exceptions",
-    ],
-    extra_include = "/usr/lib/gcc/i686-w64-mingw32",
-    extra_linker_flags = [
-        "-L/usr/lib/gcc/i686-w64-mingw32/8.3-posix",
-        "-ldbghelp",
-        "-pthread",
-    ],
-    linker_path = "/usr/bin/ld",
-    sysroot = "/usr/i686-w64-mingw32",
-    target_cpu = "x86_32",
-    target_full_name = "i686-w64-mingw32",
-)
-
-cc_toolchain_config(
-    name = "win64-config",
-    extra_compiler_flags = [
-        "-isystem/usr/lib/gcc/x86_64-w64-mingw32/8.3-posix/include/c++/",
-        "-isystem/usr/lib/gcc/x86_64-w64-mingw32/8.3-posix/include/c++/x86_64-w64-mingw32",
-    ],
-    extra_include = "/usr/lib/gcc/x86_64-w64-mingw32/8.3-posix/include",
-    extra_linker_flags = [
-        "-L/usr/lib/gcc/x86_64-w64-mingw32/8.3-posix",
-        "-ldbghelp",
-    ],
-    linker_path = "/usr/bin/ld",
-    sysroot = "/usr/x86_64-w64-mingw32",
-    target_cpu = "x86_64",
-    target_full_name = "x86_64-w64-mingw32",
-)
diff --git a/libs/protobuf/toolchain/cc_toolchain_config.bzl b/libs/protobuf/toolchain/cc_toolchain_config.bzl
deleted file mode 100644
index 2599477..0000000
--- a/libs/protobuf/toolchain/cc_toolchain_config.bzl
+++ /dev/null
@@ -1,233 +0,0 @@
-load("@bazel_tools//tools/build_defs/cc:action_names.bzl", "ACTION_NAMES")
-load(
-    "@bazel_tools//tools/cpp:cc_toolchain_config_lib.bzl",
-    "artifact_name_pattern",
-    "feature",
-    "flag_group",
-    "flag_set",
-    "tool_path",
-    "with_feature_set",
-)
-
-all_link_actions = [
-    ACTION_NAMES.cpp_link_executable,
-    ACTION_NAMES.cpp_link_dynamic_library,
-    ACTION_NAMES.cpp_link_nodeps_dynamic_library,
-]
-
-all_compile_actions = [
-    ACTION_NAMES.assemble,
-    ACTION_NAMES.preprocess_assemble,
-    ACTION_NAMES.linkstamp_compile,
-    ACTION_NAMES.c_compile,
-    ACTION_NAMES.cpp_compile,
-    ACTION_NAMES.cpp_header_parsing,
-    ACTION_NAMES.cpp_module_codegen,
-    ACTION_NAMES.cpp_module_compile,
-    ACTION_NAMES.clif_match,
-    ACTION_NAMES.lto_backend,
-]
-
-def _impl(ctx):
-  if "mingw" in ctx.attr.target_full_name:
-      artifact_name_patterns = [
-          artifact_name_pattern(
-              category_name = "executable",
-              prefix = "",
-              extension = ".exe",
-          ),
-      ]
-  else:
-      artifact_name_patterns = []
-
-  tool_paths = [
-      tool_path(
-          name = "gcc",
-          path = "/usr/local/bin/clang",
-      ),
-      tool_path(
-          name = "ld",
-          path = ctx.attr.linker_path,
-      ),
-      tool_path(
-          name = "ar",
-          path = "/usr/local/bin/llvm-ar",
-      ),
-      tool_path(
-          name = "compat-ld",
-          path = ctx.attr.linker_path,
-      ),
-      tool_path(
-          name = "cpp",
-          path = "/bin/false",
-      ),
-      tool_path(
-          name = "dwp",
-          path = "/bin/false",
-      ),
-      tool_path(
-          name = "gcov",
-          path = "/bin/false",
-      ),
-      tool_path(
-          name = "nm",
-          path = "/bin/false",
-      ),
-      tool_path(
-          name = "objcopy",
-          path = "/bin/false",
-      ),
-      tool_path(
-          name = "objdump",
-          path = "/bin/false",
-      ),
-      tool_path(
-          name = "strip",
-          path = "/bin/false",
-      ),
-  ]
-
-  linker_flags = feature(
-      name = "default_linker_flags",
-      enabled = True,
-      flag_sets = [
-          flag_set(
-              actions = all_link_actions,
-              flag_groups = [
-                  flag_group(
-                      flags = [
-                          "-B" + ctx.attr.linker_path,
-                          "-lstdc++",
-                          "--target=" + ctx.attr.target_full_name,
-                      ] + ctx.attr.extra_linker_flags,
-                  ),
-              ],
-          ),
-      ],
-  )
-
-  if "osx" in ctx.attr.target_full_name:
-    sysroot_action_set = all_link_actions
-  else:
-    sysroot_action_set = all_link_actions + all_compile_actions
-
-  sysroot_flags = feature(
-      name = "sysroot_flags",
-      #Only enable this if a sysroot was specified
-      enabled = (ctx.attr.sysroot != ""),
-      flag_sets = [
-          flag_set(
-              actions = sysroot_action_set,
-              flag_groups = [
-                  flag_group(
-                      flags = [
-                          "--sysroot",
-                          ctx.attr.sysroot,
-                      ],
-                  ),
-              ],
-          ),
-      ],
-  )
-
-  if ctx.attr.target_cpu == "x86_32":
-    bit_flag = "-m32"
-  else:
-    bit_flag = "-m64"
-  compiler_flags = feature(
-      name = "default_compile_flags",
-      enabled = True,
-      flag_sets = [
-          flag_set(
-              actions = all_compile_actions,
-              flag_groups = [
-                  flag_group(
-                      flags = [
-                          bit_flag,
-                          "-Wall",
-                          "-no-canonical-prefixes",
-                          "--target=" + ctx.attr.target_full_name,
-                          "-fvisibility=hidden",
-                      ] + ctx.attr.extra_compiler_flags + [
-                          "-isystem",
-                          ctx.attr.sysroot,
-                      ],
-                  ),
-              ],
-          ),
-          flag_set(
-              actions = all_compile_actions,
-              flag_groups = [flag_group(flags = ["-DNDEBUG", "-O3"])],
-              with_features = [with_feature_set(features = ["opt"])],
-          ),
-          flag_set(
-              actions = all_compile_actions,
-              flag_groups = [flag_group(flags = ["-g"])],
-              with_features = [with_feature_set(features = ["dbg"])],
-          ),
-          flag_set(
-              actions = all_compile_actions,
-              flag_groups = [flag_group(flags = ["-O1"])],
-              with_features = [with_feature_set(features = ["fastbuild"])],
-          ),
-      ],
-  )
-
-  features = [
-      linker_flags,
-      compiler_flags,
-      sysroot_flags,
-      feature(name = "dbg"),
-      feature(name = "opt"),
-  ]
-
-  if "mingw" in ctx.attr.target_full_name:
-      features.append(
-          feature(
-              name = "targets_windows",
-              enabled = True,
-          )
-      )
-  else:
-      features.append(
-          feature(
-              name = "supports_pic",
-              enabled = True
-          )
-      )
-
-  return cc_common.create_cc_toolchain_config_info(
-      abi_libc_version = ctx.attr.abi_version,
-      abi_version = ctx.attr.abi_version,
-      artifact_name_patterns = artifact_name_patterns,
-      ctx = ctx,
-      compiler = "clang",
-      cxx_builtin_include_directories = [
-          ctx.attr.sysroot,
-          ctx.attr.extra_include,
-          "/usr/local/include",
-          "/usr/local/lib/clang",
-      ],
-      features = features,
-      host_system_name = "local",
-      target_cpu = ctx.attr.target_cpu,
-      target_libc = ctx.attr.target_cpu,
-      target_system_name = ctx.attr.target_full_name,
-      toolchain_identifier = ctx.attr.target_full_name,
-      tool_paths = tool_paths,
-  )
-
-cc_toolchain_config = rule(
-    implementation = _impl,
-    attrs = {
-        "abi_version": attr.string(default = "local"),
-        "extra_compiler_flags": attr.string_list(),
-        "extra_include": attr.string(mandatory = False),
-        "extra_linker_flags": attr.string_list(),
-        "linker_path": attr.string(mandatory = True),
-        "sysroot": attr.string(mandatory = False),
-        "target_cpu": attr.string(mandatory = True, values = ["aarch64", "ppc64", "systemz", "x86_32", "x86_64"]),
-        "target_full_name": attr.string(mandatory = True),
-    },
-    provides = [CcToolchainConfigInfo],
-)
diff --git a/libs/protobuf/toolchain/toolchains.bazelrc b/libs/protobuf/toolchain/toolchains.bazelrc
deleted file mode 100644
index fbd655b..0000000
--- a/libs/protobuf/toolchain/toolchains.bazelrc
+++ /dev/null
@@ -1,12 +0,0 @@
-build:cross_config --crosstool_top=//toolchain:clang_suite
-build:cross_config --host_crosstool_top=@bazel_tools//tools/cpp:toolchain
-
-build:linux-aarch_64 --config=cross_config --cpu=linux-aarch_64
-build:linux-ppcle_64 --config=cross_config --cpu=linux-ppcle_64
-build:linux-s390_64 --config=cross_config --cpu=linux-s390_64
-build:linux-x86_32 --config=cross_config --cpu=linux-x86_32
-build:linux-x86_64 --config=cross_config --cpu=linux-x86_64
-build:osx-aarch_64 --config=cross_config --action_env=MACOSX_DEPLOYMENT_TARGET=10.9 --cpu=osx-aarch_64
-build:osx-x86_64 --config=cross_config --action_env=MACOSX_DEPLOYMENT_TARGET=10.9 --cpu=osx-x86_64
-build:win32 --config=cross_config --cpu=win32
-build:win64 --config=cross_config --cpu=win64
diff --git a/libs/protobuf/update_compatibility_version.py b/libs/protobuf/update_compatibility_version.py
deleted file mode 100755
index f93479b..0000000
--- a/libs/protobuf/update_compatibility_version.py
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/usr/bin/env python
-"""Compatibility tests between last released and the current version.
-
-Usage: ./update_compatibility_version.py <MAJOR>.<MINOR>.<MICRO> [<RC version>]
-Example: ./update_compatibility_version.py 3.7.1
-"""
-
-from __future__ import print_function
-import re
-import sys
-
-if len(sys.argv) < 2 or len(sys.argv) > 3:
-  print("""
-[ERROR] Please specify a version.
-
-./update_compatibility_version.py.py <MAJOR>.<MINOR>.<MICRO> [<RC version>]
-
-Example:
-./update_compatibility_version.py.py 3.7.1 2
-""")
-  exit(1)
-
-NEW_VERSION = sys.argv[1]
-NEW_VERSION_INFO = NEW_VERSION.split('.')
-if len(NEW_VERSION_INFO) != 3:
-  print("""
-[ERROR] Version must be in the format <MAJOR>.<MINOR>.<MICRO>
-
-Example:
-./update_compatibility_version.py.py 3.7.3
-""")
-  exit(1)
-
-if len(sys.argv) > 2:
-  RC_VERSION = int(sys.argv[2])
-  # Do not update compatibility versions for rc release
-  if RC_VERSION != 0:
-    exit(0)
-
-
-def RewriteTextFile(filename, line_rewriter):
-  lines = open(filename, 'r').readlines()
-  updated_lines = []
-  for line in lines:
-    updated_lines.append(line_rewriter(line))
-  if lines == updated_lines:
-    print('%s was not updated. Please double check.' % filename)
-  f = open(filename, 'w')
-  f.write(''.join(updated_lines))
-  f.close()
-
-
-def ReplaceVersion(line):
-  return re.sub(r'LAST_RELEASED=.*$', 'LAST_RELEASED=%s' % NEW_VERSION, line)
-
-RewriteTextFile('tests.sh', ReplaceVersion)
diff --git a/libs/protobuf/update_file_lists.sh b/libs/protobuf/update_file_lists.sh
deleted file mode 100755
index 3ef366d..0000000
--- a/libs/protobuf/update_file_lists.sh
+++ /dev/null
@@ -1,195 +0,0 @@
-#!/bin/bash -u
-
-# This script copies source file lists from src/Makefile.am to cmake files.
-
-get_variable_value() {
-  local FILENAME=$1
-  local VARNAME=$2
-  awk "
-    BEGIN { start = 0; }
-    /^$VARNAME =/ { start = 1; }
-    { if (start) { print \$0; } }
-    /\\\\\$/ { next; }
-    { start = 0; }
-  " $FILENAME \
-    | sed "s/^$VARNAME =//" \
-    | sed "s/[ \\]//g" \
-    | grep -v "^\\$" \
-    | grep -v "^$" \
-    | LC_ALL=C sort | uniq
-}
-
-get_header_files() {
-  get_variable_value $@ | grep '\.h$'
-}
-
-get_source_files() {
-  get_variable_value $@ | grep "cc$\|inc$"
-}
-
-get_proto_files() {
-  get_variable_value $@ | grep "pb.cc$" | sed "s/pb.cc/proto/"
-}
-
-sort_files() {
-  for FILE in $@; do
-    echo $FILE
-  done | LC_ALL=C sort | uniq
-}
-
-MAKEFILE=src/Makefile.am
-
-[ -f "$MAKEFILE" ] || {
-  echo "Cannot find: $MAKEFILE"
-  exit 1
-}
-
-# Extract file lists from src/Makefile.am
-GZHEADERS=$(get_variable_value $MAKEFILE GZHEADERS)
-LIBPROTOBUF_HEADERS=$(get_variable_value $MAKEFILE nobase_include_HEADERS | grep -v /compiler/)
-LIBPROTOBUF_HEADERS=$(sort_files $GZHEADERS $LIBPROTOBUF_HEADERS)
-LIBPROTOBUF_LITE_SOURCES=$(get_source_files $MAKEFILE libprotobuf_lite_la_SOURCES)
-LIBPROTOBUF_SOURCES=$(get_source_files $MAKEFILE libprotobuf_la_SOURCES)
-LIBPROTOC_SOURCES=$(get_source_files $MAKEFILE libprotoc_la_SOURCES)
-LIBPROTOC_HEADERS=$(get_variable_value $MAKEFILE nobase_include_HEADERS | grep /compiler/)
-LITE_PROTOS=$(get_proto_files $MAKEFILE protoc_lite_outputs)
-PROTOS=$(get_proto_files $MAKEFILE protoc_outputs)
-WKT_PROTOS=$(get_variable_value $MAKEFILE nobase_dist_proto_DATA)
-COMMON_TEST_SOURCES=$(get_source_files $MAKEFILE COMMON_TEST_SOURCES)
-COMMON_LITE_TEST_SOURCES=$(get_source_files $MAKEFILE COMMON_LITE_TEST_SOURCES)
-TEST_SOURCES=$(get_source_files $MAKEFILE protobuf_test_SOURCES)
-NON_MSVC_TEST_SOURCES=$(get_source_files $MAKEFILE NON_MSVC_TEST_SOURCES)
-LITE_TEST_SOURCES=$(get_source_files $MAKEFILE protobuf_lite_test_SOURCES)
-LITE_ARENA_TEST_SOURCES=$(get_source_files $MAKEFILE protobuf_lite_arena_test_SOURCES)
-TEST_PLUGIN_SOURCES=$(get_source_files $MAKEFILE test_plugin_SOURCES)
-
-################################################################################
-# Update cmake files.
-################################################################################
-
-CMAKE_DIR=cmake
-EXTRACT_INCLUDES_BAT=cmake/extract_includes.bat.in
-[ -d "$CMAKE_DIR" ] || {
-  echo "Cannot find: $CMAKE_DIR"
-  exit 1
-}
-
-[ -f "$EXTRACT_INCLUDES_BAT" ] || {
-  echo "Cannot find: $EXTRACT_INCLUDES_BAT"
-  exit 1
-}
-
-set_cmake_value() {
-  local FILENAME=$1
-  local VARNAME=$2
-  local PREFIX=$3
-  shift
-  shift
-  shift
-  awk -v values="$*" -v prefix="$PREFIX" "
-    BEGIN { start = 0; }
-    /^set\\($VARNAME/ {
-      start = 1;
-      print \$0;
-      len = split(values, vlist, \" \");
-      for (i = 1; i <= len; ++i) {
-        printf(\"  \");
-        if (vlist[i] !~ /^\\\$/) {
-          printf(\"%s\", prefix);
-        }
-        printf(\"%s\\n\", vlist[i]);
-      }
-      next;
-    }
-    start && /^\\)/ {
-      start = 0;
-    }
-    !start {
-      print \$0;
-    }
-  " $FILENAME > /tmp/$$
-  cp /tmp/$$ $FILENAME
-}
-
-
-# Replace file lists in cmake files.
-CMAKE_PREFIX="\${protobuf_SOURCE_DIR}/src/"
-set_cmake_value $CMAKE_DIR/libprotobuf-lite.cmake libprotobuf_lite_files $CMAKE_PREFIX $LIBPROTOBUF_LITE_SOURCES
-set_cmake_value $CMAKE_DIR/libprotobuf.cmake libprotobuf_files $CMAKE_PREFIX $LIBPROTOBUF_SOURCES
-set_cmake_value $CMAKE_DIR/libprotoc.cmake libprotoc_files $CMAKE_PREFIX $LIBPROTOC_SOURCES
-set_cmake_value $CMAKE_DIR/libprotoc.cmake libprotoc_headers $CMAKE_PREFIX $LIBPROTOC_HEADERS
-set_cmake_value $CMAKE_DIR/tests.cmake lite_test_protos "" $LITE_PROTOS
-set_cmake_value $CMAKE_DIR/tests.cmake tests_protos "" $PROTOS
-set_cmake_value $CMAKE_DIR/tests.cmake common_test_files $CMAKE_PREFIX '${common_lite_test_files}' $COMMON_TEST_SOURCES
-set_cmake_value $CMAKE_DIR/tests.cmake common_lite_test_files $CMAKE_PREFIX $COMMON_LITE_TEST_SOURCES
-set_cmake_value $CMAKE_DIR/tests.cmake tests_files $CMAKE_PREFIX $TEST_SOURCES
-set_cmake_value $CMAKE_DIR/tests.cmake non_msvc_tests_files $CMAKE_PREFIX $NON_MSVC_TEST_SOURCES
-set_cmake_value $CMAKE_DIR/tests.cmake lite_test_files $CMAKE_PREFIX $LITE_TEST_SOURCES
-set_cmake_value $CMAKE_DIR/tests.cmake lite_arena_test_files $CMAKE_PREFIX $LITE_ARENA_TEST_SOURCES
-
-# Generate extract_includes.bat
-echo "mkdir include" > $EXTRACT_INCLUDES_BAT
-for INCLUDE in $LIBPROTOBUF_HEADERS $LIBPROTOC_HEADERS $WKT_PROTOS; do
-  INCLUDE_DIR=$(dirname "$INCLUDE")
-  while [ ! "$INCLUDE_DIR" = "." ]; do
-    echo "mkdir include\\${INCLUDE_DIR//\//\\}"
-    INCLUDE_DIR=$(dirname "$INCLUDE_DIR")
-  done
-done | sort | uniq >> $EXTRACT_INCLUDES_BAT
-for INCLUDE in $(sort_files $LIBPROTOBUF_HEADERS $LIBPROTOC_HEADERS) $WKT_PROTOS; do
-  WINPATH=${INCLUDE//\//\\}
-  echo "copy \"\${PROTOBUF_SOURCE_WIN32_PATH}\\..\\src\\$WINPATH\" include\\$WINPATH" >> $EXTRACT_INCLUDES_BAT
-done
-
-################################################################################
-# Update bazel BUILD files.
-################################################################################
-
-set_bazel_value() {
-  local FILENAME=$1
-  local VARNAME=$2
-  local PREFIX=$3
-  shift
-  shift
-  shift
-  awk -v values="$*" -v prefix="$PREFIX" "
-    BEGIN { start = 0; }
-    /# AUTOGEN\\($VARNAME\\)/ {
-      start = 1;
-      print \$0;
-      # replace \$0 with indent.
-      sub(/#.*/, \"\", \$0)
-      len = split(values, vlist, \" \");
-      for (i = 1; i <= len; ++i) {
-        printf(\"%s\\\"%s%s\\\",\n\", \$0, prefix, vlist[i]);
-      }
-      next;
-    }
-    start && /\]/ {
-      start = 0
-    }
-    !start {
-      print \$0;
-    }
-  " $FILENAME > /tmp/$$
-  cp /tmp/$$ $FILENAME
-}
-
-
-BAZEL_BUILD=./BUILD
-BAZEL_PREFIX="src/"
-if [ -f "$BAZEL_BUILD" ]; then
-  set_bazel_value $BAZEL_BUILD protobuf_lite_srcs $BAZEL_PREFIX $LIBPROTOBUF_LITE_SOURCES
-  set_bazel_value $BAZEL_BUILD protobuf_srcs $BAZEL_PREFIX $LIBPROTOBUF_SOURCES
-  set_bazel_value $BAZEL_BUILD protoc_lib_srcs $BAZEL_PREFIX $LIBPROTOC_SOURCES
-  set_bazel_value $BAZEL_BUILD lite_test_protos "" $LITE_PROTOS
-  set_bazel_value $BAZEL_BUILD well_known_protos "" $WKT_PROTOS
-  set_bazel_value $BAZEL_BUILD test_protos "" $PROTOS
-  set_bazel_value $BAZEL_BUILD common_test_srcs $BAZEL_PREFIX $COMMON_LITE_TEST_SOURCES $COMMON_TEST_SOURCES
-  set_bazel_value $BAZEL_BUILD test_srcs $BAZEL_PREFIX $TEST_SOURCES
-  set_bazel_value $BAZEL_BUILD non_msvc_test_srcs $BAZEL_PREFIX $NON_MSVC_TEST_SOURCES
-  set_bazel_value $BAZEL_BUILD test_plugin_srcs $BAZEL_PREFIX $TEST_PLUGIN_SOURCES
-else
-  echo "Skipped BUILD file update."
-fi
-
diff --git a/libs/protobuf/update_version.py b/libs/protobuf/update_version.py
deleted file mode 100755
index cb9f4db..0000000
--- a/libs/protobuf/update_version.py
+++ /dev/null
@@ -1,405 +0,0 @@
-#!/usr/bin/env python3
-# Usage: ./update_version.py <MAJOR>.<MINOR>.<MICRO> [<RC version>]
-#
-# Example:
-# ./update_version.py 3.7.1 2
-#   => Version will become 3.7.1-rc-2 (beta)
-# ./update_version.py 3.7.1
-#   => Version will become 3.7.1 (stable)
-
-import datetime
-import re
-import sys
-from xml.dom import minidom
-
-if len(sys.argv) < 2 or len(sys.argv) > 3:
-  print("""
-[ERROR] Please specify a version.
-
-./update_version.py <MAJOR>.<MINOR>.<MICRO> [<RC version>]
-
-Example:
-./update_version.py 3.7.1 2
-""")
-  exit(1)
-
-NEW_VERSION = sys.argv[1]
-NEW_VERSION_INFO = [int(x) for x in NEW_VERSION.split('.')]
-if len(NEW_VERSION_INFO) != 3:
-  print("""
-[ERROR] Version must be in the format <MAJOR>.<MINOR>.<MICRO>
-
-Example:
-./update_version.py 3.7.3
-""")
-  exit(1)
-
-RC_VERSION = -1
-if len(sys.argv) > 2:
-  RC_VERSION = int(sys.argv[2])
-
-
-def Find(elem, tagname):
-  for child in elem.childNodes:
-    if child.nodeName == tagname:
-      return child
-  return None
-
-
-def FindAndClone(elem, tagname):
-  return Find(elem, tagname).cloneNode(True)
-
-
-def ReplaceText(elem, text):
-  elem.firstChild.replaceWholeText(text)
-
-
-def GetFullVersion(rc_suffix = '-rc-'):
-  if RC_VERSION < 0:
-    return NEW_VERSION
-  else:
-    return '%s%s%s' % (NEW_VERSION, rc_suffix, RC_VERSION)
-
-
-def GetSharedObjectVersion():
-  protobuf_version_offset = 11
-  expected_major_version = 3
-  if NEW_VERSION_INFO[0] != expected_major_version:
-    print("""[ERROR] Major protobuf version has changed. Please update
-update_version.py to readjust the protobuf_version_offset and
-expected_major_version such that the PROTOBUF_VERSION in src/Makefile.am is
-always increasing.
-    """)
-    exit(1)
-  return [NEW_VERSION_INFO[1] + protobuf_version_offset, NEW_VERSION_INFO[2], 0]
-
-
-def RewriteXml(filename, rewriter, add_xml_prefix=True):
-  document = minidom.parse(filename)
-  rewriter(document)
-  # document.toxml() always prepend the XML version without inserting new line.
-  # We wants to preserve as much of the original formatting as possible, so we
-  # will remove the default XML version and replace it with our custom one when
-  # wherever necessary.
-  content = document.toxml().replace('<?xml version="1.0" ?>', '')
-  file_handle = open(filename, 'wb')
-  if add_xml_prefix:
-    file_handle.write(b'<?xml version="1.0" encoding="UTF-8"?>\n')
-  file_handle.write(content.encode('utf-8'))
-  file_handle.write(b'\n')
-  file_handle.close()
-
-
-def RewriteTextFile(filename, line_rewriter):
-  lines = open(filename, 'r').readlines()
-  updated_lines = []
-  for line in lines:
-    updated_lines.append(line_rewriter(line))
-  if lines == updated_lines:
-    print('%s was not updated. Please double check.' % filename)
-  f = open(filename, 'w')
-  f.write(''.join(updated_lines))
-  f.close()
-
-
-def UpdateCMake():
-  cmake_files = (
-    'cmake/libprotobuf.cmake',
-    'cmake/libprotobuf-lite.cmake',
-    'cmake/libprotoc.cmake'
-  )
-  for cmake_file in cmake_files:
-    RewriteTextFile(cmake_file,
-      lambda line : re.sub(
-        r'SOVERSION ([0-9]+)$',
-        'SOVERSION %s' % GetSharedObjectVersion()[0],
-        line))
-
-
-def UpdateConfigure():
-  RewriteTextFile('configure.ac',
-    lambda line : re.sub(
-      r'^AC_INIT\(\[Protocol Buffers\],\[.*\],\[protobuf@googlegroups.com\],\[protobuf\]\)$',
-      ('AC_INIT([Protocol Buffers],[%s],[protobuf@googlegroups.com],[protobuf])'
-        % GetFullVersion()),
-      line))
-
-
-def UpdateCpp():
-  cpp_version = '%d%03d%03d' % (
-    NEW_VERSION_INFO[0], NEW_VERSION_INFO[1], NEW_VERSION_INFO[2])
-  version_suffix = ''
-  if RC_VERSION != -1:
-    version_suffix = '-rc%s' % RC_VERSION
-  def RewriteCommon(line):
-    line = re.sub(
-      r'^#define GOOGLE_PROTOBUF_VERSION .*$',
-      '#define GOOGLE_PROTOBUF_VERSION %s' % cpp_version,
-      line)
-    line = re.sub(
-      r'^#define PROTOBUF_VERSION .*$',
-      '#define PROTOBUF_VERSION %s' % cpp_version,
-      line)
-    line = re.sub(
-        r'^#define GOOGLE_PROTOBUF_VERSION_SUFFIX .*$',
-        '#define GOOGLE_PROTOBUF_VERSION_SUFFIX "%s"' % version_suffix,
-        line)
-    line = re.sub(
-        r'^#define PROTOBUF_VERSION_SUFFIX .*$',
-        '#define PROTOBUF_VERSION_SUFFIX "%s"' % version_suffix,
-        line)
-    if NEW_VERSION_INFO[2] == 0:
-      line = re.sub(
-        r'^#define PROTOBUF_MIN_HEADER_VERSION_FOR_PROTOC .*$',
-        '#define PROTOBUF_MIN_HEADER_VERSION_FOR_PROTOC %s' % cpp_version,
-        line)
-      line = re.sub(
-        r'^#define GOOGLE_PROTOBUF_MIN_PROTOC_VERSION .*$',
-        '#define GOOGLE_PROTOBUF_MIN_PROTOC_VERSION %s' % cpp_version,
-        line)
-      line = re.sub(
-        r'^static const int kMinHeaderVersionForLibrary = .*$',
-        'static const int kMinHeaderVersionForLibrary = %s;' % cpp_version,
-        line)
-      line = re.sub(
-        r'^static const int kMinHeaderVersionForProtoc = .*$',
-        'static const int kMinHeaderVersionForProtoc = %s;' % cpp_version,
-        line)
-    return line
-
-  def RewritePortDef(line):
-    line = re.sub(
-      r'^#define PROTOBUF_VERSION .*$',
-      '#define PROTOBUF_VERSION %s' % cpp_version,
-      line)
-    line = re.sub(
-        r'^#define PROTOBUF_VERSION_SUFFIX .*$',
-        '#define PROTOBUF_VERSION_SUFFIX "%s"' % version_suffix,
-        line)
-    if NEW_VERSION_INFO[2] == 0:
-      line = re.sub(
-        r'^#define PROTOBUF_MIN_HEADER_VERSION_FOR_PROTOC .*$',
-        '#define PROTOBUF_MIN_HEADER_VERSION_FOR_PROTOC %s' % cpp_version,
-        line)
-      line = re.sub(
-        r'^#define PROTOBUF_MIN_PROTOC_VERSION .*$',
-        '#define PROTOBUF_MIN_PROTOC_VERSION %s' % cpp_version,
-        line)
-      line = re.sub(
-        r'^#define GOOGLE_PROTOBUF_MIN_LIBRARY_VERSION .*$',
-        '#define GOOGLE_PROTOBUF_MIN_LIBRARY_VERSION %s' % cpp_version,
-        line)
-    return line
-
-  def RewritePbH(line):
-    line = re.sub(
-        r'^#if PROTOBUF_VERSION < .*$',
-        '#if PROTOBUF_VERSION < %s' % cpp_version,
-        line)
-    line = re.sub(
-        r'^#if .* < PROTOBUF_MIN_PROTOC_VERSION$',
-        '#if %s < PROTOBUF_MIN_PROTOC_VERSION' % cpp_version,
-        line)
-    return line
-
-  RewriteTextFile('src/google/protobuf/stubs/common.h', RewriteCommon)
-  RewriteTextFile('src/google/protobuf/port_def.inc', RewritePortDef)
-  RewriteTextFile('src/google/protobuf/any.pb.h', RewritePbH)
-  RewriteTextFile('src/google/protobuf/api.pb.h', RewritePbH)
-  RewriteTextFile('src/google/protobuf/descriptor.pb.h', RewritePbH)
-  RewriteTextFile('src/google/protobuf/duration.pb.h', RewritePbH)
-  RewriteTextFile('src/google/protobuf/empty.pb.h', RewritePbH)
-  RewriteTextFile('src/google/protobuf/field_mask.pb.h', RewritePbH)
-  RewriteTextFile('src/google/protobuf/source_context.pb.h', RewritePbH)
-  RewriteTextFile('src/google/protobuf/struct.pb.h', RewritePbH)
-  RewriteTextFile('src/google/protobuf/timestamp.pb.h', RewritePbH)
-  RewriteTextFile('src/google/protobuf/type.pb.h', RewritePbH)
-  RewriteTextFile('src/google/protobuf/wrappers.pb.h', RewritePbH)
-  RewriteTextFile('src/google/protobuf/compiler/plugin.pb.h', RewritePbH)
-
-
-def UpdateCsharp():
-  RewriteXml('csharp/src/Google.Protobuf/Google.Protobuf.csproj',
-    lambda document : ReplaceText(
-      Find(Find(document.documentElement, 'PropertyGroup'), 'VersionPrefix'),
-      GetFullVersion(rc_suffix = '-rc')),
-    add_xml_prefix=False)
-
-  RewriteXml('csharp/Google.Protobuf.Tools.nuspec',
-    lambda document : ReplaceText(
-      Find(Find(document.documentElement, 'metadata'), 'version'),
-      GetFullVersion(rc_suffix = '-rc')))
-
-
-def UpdateJava():
-  RewriteXml('java/pom.xml',
-    lambda document : ReplaceText(
-      Find(document.documentElement, 'version'), GetFullVersion()))
-
-  RewriteXml('java/bom/pom.xml',
-    lambda document : ReplaceText(
-      Find(document.documentElement, 'version'), GetFullVersion()))
-
-  RewriteXml('java/core/pom.xml',
-    lambda document : ReplaceText(
-      Find(Find(document.documentElement, 'parent'), 'version'),
-      GetFullVersion()))
-
-  RewriteXml('java/lite/pom.xml',
-    lambda document : ReplaceText(
-      Find(Find(document.documentElement, 'parent'), 'version'),
-      GetFullVersion()))
-
-  RewriteXml('java/util/pom.xml',
-    lambda document : ReplaceText(
-      Find(Find(document.documentElement, 'parent'), 'version'),
-      GetFullVersion()))
-
-  RewriteXml('java/kotlin/pom.xml',
-    lambda document : ReplaceText(
-      Find(Find(document.documentElement, 'parent'), 'version'),
-      GetFullVersion()))
-
-  RewriteXml('java/kotlin-lite/pom.xml',
-    lambda document : ReplaceText(
-      Find(Find(document.documentElement, 'parent'), 'version'),
-      GetFullVersion()))
-
-  RewriteXml('protoc-artifacts/pom.xml',
-    lambda document : ReplaceText(
-      Find(document.documentElement, 'version'), GetFullVersion()))
-
-  RewriteTextFile('java/README.md',
-    lambda line : re.sub(
-      r'<version>.*</version>',
-      '<version>%s</version>' % GetFullVersion(),
-      line))
-
-  RewriteTextFile('java/README.md',
-    lambda line : re.sub(
-      r'implementation \'com.google.protobuf:protobuf-java:.*\'',
-      'implementation \'com.google.protobuf:protobuf-java:%s\'' % GetFullVersion(),
-      line))
-
-  RewriteTextFile('java/lite.md',
-    lambda line : re.sub(
-      r'<version>.*</version>',
-      '<version>%s</version>' % GetFullVersion(),
-      line))
-
-
-def UpdateMakefile():
-  RewriteTextFile('src/Makefile.am',
-    lambda line : re.sub(
-      r'^PROTOBUF_VERSION = .*$',
-      'PROTOBUF_VERSION = %s' % ":".join(map(str,GetSharedObjectVersion())),
-      line))
-
-
-def UpdateObjectiveC():
-  RewriteTextFile('Protobuf.podspec',
-    lambda line : re.sub(
-      r"^  s.version  = '.*'$",
-      "  s.version  = '%s'" % GetFullVersion(rc_suffix = '-rc'),
-      line))
-  RewriteTextFile('Protobuf-C++.podspec',
-    lambda line : re.sub(
-      r"^  s.version  = '.*'$",
-      "  s.version  = '%s'" % GetFullVersion(rc_suffix = '-rc'),
-      line))
-
-
-def UpdatePhp():
-  def Callback(document):
-    def CreateNode(tagname, indent, children):
-      elem = document.createElement(tagname)
-      indent += 1
-      for child in children:
-        elem.appendChild(document.createTextNode('\n' + (' ' * indent)))
-        elem.appendChild(child)
-      indent -= 1
-      elem.appendChild(document.createTextNode('\n' + (' ' * indent)))
-      return elem
-
-    root = document.documentElement
-    now = datetime.datetime.now()
-    ReplaceText(Find(root, 'date'), now.strftime('%Y-%m-%d'))
-    ReplaceText(Find(root, 'time'), now.strftime('%H:%M:%S'))
-    version = Find(root, 'version')
-    ReplaceText(Find(version, 'release'), GetFullVersion(rc_suffix = 'RC'))
-    ReplaceText(Find(version, 'api'), NEW_VERSION)
-    stability = Find(root, 'stability')
-    ReplaceText(Find(stability, 'release'),
-        'stable' if RC_VERSION < 0 else 'beta')
-    ReplaceText(Find(stability, 'api'), 'stable' if RC_VERSION < 0 else 'beta')
-    changelog = Find(root, 'changelog')
-    for old_version in changelog.getElementsByTagName('version'):
-      if Find(old_version, 'release').firstChild.nodeValue == NEW_VERSION:
-        print ('[WARNING] Version %s already exists in the change log.'
-          % NEW_VERSION)
-        return
-    if RC_VERSION != 0:
-      changelog.appendChild(document.createTextNode(' '))
-      release = CreateNode('release', 2, [
-          CreateNode('version', 3, [
-            FindAndClone(version, 'release'),
-            FindAndClone(version, 'api')
-          ]),
-          CreateNode('stability', 3, [
-            FindAndClone(stability, 'release'),
-            FindAndClone(stability, 'api')
-          ]),
-          FindAndClone(root, 'date'),
-          FindAndClone(root, 'time'),
-          FindAndClone(root, 'license'),
-          CreateNode('notes', 3, []),
-        ])
-      changelog.appendChild(release)
-      changelog.appendChild(document.createTextNode('\n '))
-  RewriteXml('php/ext/google/protobuf/package.xml', Callback)
-  RewriteTextFile('php/ext/google/protobuf/protobuf.h',
-    lambda line : re.sub(
-      r"^#define PHP_PROTOBUF_VERSION .*$",
-      "#define PHP_PROTOBUF_VERSION \"%s\"" % GetFullVersion(rc_suffix = 'RC'),
-      line))
-
-def UpdatePython():
-  RewriteTextFile('python/google/protobuf/__init__.py',
-    lambda line : re.sub(
-      r"^__version__ = '.*'$",
-      "__version__ = '%s'" % GetFullVersion(rc_suffix = 'rc'),
-      line))
-
-def UpdateRuby():
-  RewriteXml('ruby/pom.xml',
-             lambda document : ReplaceText(
-                 Find(document.documentElement, 'version'), GetFullVersion()))
-  RewriteXml('ruby/pom.xml',
-             lambda document : ReplaceText(
-                 Find(Find(Find(document.documentElement, 'dependencies'), 'dependency'), 'version'),
-                 GetFullVersion()))
-  RewriteTextFile('ruby/google-protobuf.gemspec',
-    lambda line : re.sub(
-      r'^  s.version     = ".*"$',
-      '  s.version     = "%s"' % GetFullVersion(rc_suffix = '.rc.'),
-      line))
-
-def UpdateBazel():
-  RewriteTextFile('protobuf_version.bzl',
-    lambda line : re.sub(
-     r"^PROTOBUF_VERSION = '.*'$",
-     "PROTOBUF_VERSION = '%s'" % GetFullVersion(),
-     line))
-
-
-UpdateCMake()
-UpdateConfigure()
-UpdateCsharp()
-UpdateCpp()
-UpdateJava()
-UpdateMakefile()
-UpdateObjectiveC()
-UpdatePhp()
-UpdatePython()
-UpdateRuby()
-UpdateBazel()
diff --git a/libs/protobuf/util/python/BUILD.bazel b/libs/protobuf/util/python/BUILD.bazel
deleted file mode 100644
index 071efd2..0000000
--- a/libs/protobuf/util/python/BUILD.bazel
+++ /dev/null
@@ -1,22 +0,0 @@
-load("@rules_cc//cc:defs.bzl", "cc_library")
-
-exports_files(["BUILD.bazel"])
-
-# This is a placeholder for python headers. Projects needing to use
-# fast cpp protos in protobuf's python interface should build with
-# --define=use_fast_cpp_protos=true, and in addition, provide
-# //external:python_headers dependency that in turn provides Python.h.
-#
-# Projects that include protobuf using a Bazel external repository will need to
-# add a workspace rule to their WORKSPACE files to add an external workspace
-# that includes the Python headers. For example, the protobuf WORKSPACE file
-# includes the following local_repository rule that points to this directory:
-#
-# new_local_repository(
-#   name = "python_headers",
-#   path = __workspace_dir__ + "/util/python",
-# )
-cc_library(
-    name = "python_headers",
-    visibility = ["//visibility:public"],
-)
diff --git a/libs/protobuf/version.json b/libs/protobuf/version.json
deleted file mode 100644
index fad4094..0000000
--- a/libs/protobuf/version.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "21.x": {
-        "protoc_version": "21.12",
-        "lts": false,
-        "date": "2022-12-12",
-        "languages": {
-            "cpp": "3.21.12",
-            "csharp": "3.21.12",
-            "java": "3.21.12",
-            "javascript": "3.21.12",
-            "objectivec": "3.21.12",
-            "php": "3.21.12",
-            "python": "4.21.12",
-            "ruby": "3.21.12"
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/WHISPER/InternalUDPListener.cpp b/src/WHISPER/InternalUDPListener.cpp
index cf41680..c2dd188 100644
--- a/src/WHISPER/InternalUDPListener.cpp
+++ b/src/WHISPER/InternalUDPListener.cpp
@@ -1,4 +1,4 @@
-#include "WHISPER/Messages/Message.hpp"
+#include <WHISPER/Messages/Message.hpp>
 #include <WHISPER/InternalUDPListener.hpp>
 #include <memory>
 #include <netinet/in.h>